diff --git a/asm/nonmatchings/world/area_arn/arn_02/func_80240160_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/func_80240160_BDD1B0.s deleted file mode 100644 index f7f84afc10..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_02/func_80240160_BDD1B0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240160_BDD310 -/* BDD310 80240160 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BDD314 80240164 AFB10014 */ sw $s1, 0x14($sp) -/* BDD318 80240168 0080882D */ daddu $s1, $a0, $zero -/* BDD31C 8024016C AFBF001C */ sw $ra, 0x1c($sp) -/* BDD320 80240170 AFB20018 */ sw $s2, 0x18($sp) -/* BDD324 80240174 AFB00010 */ sw $s0, 0x10($sp) -/* BDD328 80240178 8E320148 */ lw $s2, 0x148($s1) -/* BDD32C 8024017C 0C00EABB */ jal get_npc_unsafe -/* BDD330 80240180 86440008 */ lh $a0, 8($s2) -/* BDD334 80240184 0040802D */ daddu $s0, $v0, $zero -/* BDD338 80240188 0C00EAFF */ jal disable_npc_shadow -/* BDD33C 8024018C 0200202D */ daddu $a0, $s0, $zero -/* BDD340 80240190 24020016 */ addiu $v0, $zero, 0x16 -/* BDD344 80240194 A60200A8 */ sh $v0, 0xa8($s0) -/* BDD348 80240198 24020018 */ addiu $v0, $zero, 0x18 -/* BDD34C 8024019C A60200A6 */ sh $v0, 0xa6($s0) -/* BDD350 802401A0 AE200074 */ sw $zero, 0x74($s1) -/* BDD354 802401A4 A600008E */ sh $zero, 0x8e($s0) -/* BDD358 802401A8 8E4200CC */ lw $v0, 0xcc($s2) -/* BDD35C 802401AC 8C420020 */ lw $v0, 0x20($v0) -/* BDD360 802401B0 AE020028 */ sw $v0, 0x28($s0) -/* BDD364 802401B4 24020001 */ addiu $v0, $zero, 1 -/* BDD368 802401B8 AE220070 */ sw $v0, 0x70($s1) -/* BDD36C 802401BC 8FBF001C */ lw $ra, 0x1c($sp) -/* BDD370 802401C0 8FB20018 */ lw $s2, 0x18($sp) -/* BDD374 802401C4 8FB10014 */ lw $s1, 0x14($sp) -/* BDD378 802401C8 8FB00010 */ lw $s0, 0x10($sp) -/* BDD37C 802401CC 03E00008 */ jr $ra -/* BDD380 802401D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_02/func_802401D4_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/func_802401D4_BDD1B0.s deleted file mode 100644 index e7e57a0bb9..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_02/func_802401D4_BDD1B0.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D4_BDD384 -/* BDD384 802401D4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BDD388 802401D8 AFB3003C */ sw $s3, 0x3c($sp) -/* BDD38C 802401DC 0080982D */ daddu $s3, $a0, $zero -/* BDD390 802401E0 AFBF0044 */ sw $ra, 0x44($sp) -/* BDD394 802401E4 AFB40040 */ sw $s4, 0x40($sp) -/* BDD398 802401E8 AFB20038 */ sw $s2, 0x38($sp) -/* BDD39C 802401EC AFB10034 */ sw $s1, 0x34($sp) -/* BDD3A0 802401F0 AFB00030 */ sw $s0, 0x30($sp) -/* BDD3A4 802401F4 8E700148 */ lw $s0, 0x148($s3) -/* BDD3A8 802401F8 00A0902D */ daddu $s2, $a1, $zero -/* BDD3AC 802401FC 86040008 */ lh $a0, 8($s0) -/* BDD3B0 80240200 0C00EABB */ jal get_npc_unsafe -/* BDD3B4 80240204 00C0A02D */ daddu $s4, $a2, $zero -/* BDD3B8 80240208 8E630074 */ lw $v1, 0x74($s3) -/* BDD3BC 8024020C 1C600032 */ bgtz $v1, .L802402D8 -/* BDD3C0 80240210 0040882D */ daddu $s1, $v0, $zero -/* BDD3C4 80240214 8E420014 */ lw $v0, 0x14($s2) -/* BDD3C8 80240218 AE620074 */ sw $v0, 0x74($s3) -/* BDD3CC 8024021C C640000C */ lwc1 $f0, 0xc($s2) -/* BDD3D0 80240220 3C018024 */ lui $at, 0x8024 -/* BDD3D4 80240224 D4221AF0 */ ldc1 $f2, 0x1af0($at) -/* BDD3D8 80240228 46000021 */ cvt.d.s $f0, $f0 -/* BDD3DC 8024022C 46220002 */ mul.d $f0, $f0, $f2 -/* BDD3E0 80240230 00000000 */ nop -/* BDD3E4 80240234 0280202D */ daddu $a0, $s4, $zero -/* BDD3E8 80240238 AFA00010 */ sw $zero, 0x10($sp) -/* BDD3EC 8024023C 8E470010 */ lw $a3, 0x10($s2) -/* BDD3F0 80240240 46200020 */ cvt.s.d $f0, $f0 -/* BDD3F4 80240244 44060000 */ mfc1 $a2, $f0 -/* BDD3F8 80240248 0C01242D */ jal func_800490B4 -/* BDD3FC 8024024C 0200282D */ daddu $a1, $s0, $zero -/* BDD400 80240250 10400021 */ beqz $v0, .L802402D8 -/* BDD404 80240254 0000202D */ daddu $a0, $zero, $zero -/* BDD408 80240258 0220282D */ daddu $a1, $s1, $zero -/* BDD40C 8024025C 0000302D */ daddu $a2, $zero, $zero -/* BDD410 80240260 8E0200CC */ lw $v0, 0xcc($s0) -/* BDD414 80240264 3C013F80 */ lui $at, 0x3f80 -/* BDD418 80240268 44810000 */ mtc1 $at, $f0 -/* BDD41C 8024026C 3C014000 */ lui $at, 0x4000 -/* BDD420 80240270 44811000 */ mtc1 $at, $f2 -/* BDD424 80240274 8C430024 */ lw $v1, 0x24($v0) -/* BDD428 80240278 862200A8 */ lh $v0, 0xa8($s1) -/* BDD42C 8024027C 3C01C1A0 */ lui $at, 0xc1a0 -/* BDD430 80240280 44812000 */ mtc1 $at, $f4 -/* BDD434 80240284 44823000 */ mtc1 $v0, $f6 -/* BDD438 80240288 00000000 */ nop -/* BDD43C 8024028C 468031A0 */ cvt.s.w $f6, $f6 -/* BDD440 80240290 44073000 */ mfc1 $a3, $f6 -/* BDD444 80240294 2402000F */ addiu $v0, $zero, 0xf -/* BDD448 80240298 AE230028 */ sw $v1, 0x28($s1) -/* BDD44C 8024029C AFA2001C */ sw $v0, 0x1c($sp) -/* BDD450 802402A0 27A20028 */ addiu $v0, $sp, 0x28 -/* BDD454 802402A4 E7A00010 */ swc1 $f0, 0x10($sp) -/* BDD458 802402A8 E7A20014 */ swc1 $f2, 0x14($sp) -/* BDD45C 802402AC E7A40018 */ swc1 $f4, 0x18($sp) -/* BDD460 802402B0 0C01BFA4 */ jal fx_emote -/* BDD464 802402B4 AFA20020 */ sw $v0, 0x20($sp) -/* BDD468 802402B8 0220202D */ daddu $a0, $s1, $zero -/* BDD46C 802402BC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BDD470 802402C0 0C012530 */ jal func_800494C0 -/* BDD474 802402C4 3C060020 */ lui $a2, 0x20 -/* BDD478 802402C8 2402000C */ addiu $v0, $zero, 0xc -/* BDD47C 802402CC A622008E */ sh $v0, 0x8e($s1) -/* BDD480 802402D0 24020002 */ addiu $v0, $zero, 2 -/* BDD484 802402D4 AE620070 */ sw $v0, 0x70($s3) -.L802402D8: -/* BDD488 802402D8 8E620074 */ lw $v0, 0x74($s3) -/* BDD48C 802402DC 2442FFFF */ addiu $v0, $v0, -1 -/* BDD490 802402E0 AE620074 */ sw $v0, 0x74($s3) -/* BDD494 802402E4 8FBF0044 */ lw $ra, 0x44($sp) -/* BDD498 802402E8 8FB40040 */ lw $s4, 0x40($sp) -/* BDD49C 802402EC 8FB3003C */ lw $s3, 0x3c($sp) -/* BDD4A0 802402F0 8FB20038 */ lw $s2, 0x38($sp) -/* BDD4A4 802402F4 8FB10034 */ lw $s1, 0x34($sp) -/* BDD4A8 802402F8 8FB00030 */ lw $s0, 0x30($sp) -/* BDD4AC 802402FC 03E00008 */ jr $ra -/* BDD4B0 80240300 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_arn/arn_02/func_80240304_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/func_80240304_BDD1B0.s deleted file mode 100644 index d6535fb50d..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_02/func_80240304_BDD1B0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240304_BDD4B4 -/* BDD4B4 80240304 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BDD4B8 80240308 AFB20018 */ sw $s2, 0x18($sp) -/* BDD4BC 8024030C 0080902D */ daddu $s2, $a0, $zero -/* BDD4C0 80240310 AFBF001C */ sw $ra, 0x1c($sp) -/* BDD4C4 80240314 AFB10014 */ sw $s1, 0x14($sp) -/* BDD4C8 80240318 AFB00010 */ sw $s0, 0x10($sp) -/* BDD4CC 8024031C 8E510148 */ lw $s1, 0x148($s2) -/* BDD4D0 80240320 0C00EABB */ jal get_npc_unsafe -/* BDD4D4 80240324 86240008 */ lh $a0, 8($s1) -/* BDD4D8 80240328 0040802D */ daddu $s0, $v0, $zero -/* BDD4DC 8024032C 9602008E */ lhu $v0, 0x8e($s0) -/* BDD4E0 80240330 2442FFFF */ addiu $v0, $v0, -1 -/* BDD4E4 80240334 A602008E */ sh $v0, 0x8e($s0) -/* BDD4E8 80240338 00021400 */ sll $v0, $v0, 0x10 -/* BDD4EC 8024033C 1C400012 */ bgtz $v0, .L80240388 -/* BDD4F0 80240340 00000000 */ nop -/* BDD4F4 80240344 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BDD4F8 80240348 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BDD4FC 8024034C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BDD500 80240350 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BDD504 80240354 8C460028 */ lw $a2, 0x28($v0) -/* BDD508 80240358 0C00A720 */ jal atan2 -/* BDD50C 8024035C 8C470030 */ lw $a3, 0x30($v0) -/* BDD510 80240360 0200202D */ daddu $a0, $s0, $zero -/* BDD514 80240364 0C00EAE8 */ jal enable_npc_shadow -/* BDD518 80240368 E600000C */ swc1 $f0, 0xc($s0) -/* BDD51C 8024036C 8E2200CC */ lw $v0, 0xcc($s1) -/* BDD520 80240370 8C430028 */ lw $v1, 0x28($v0) -/* BDD524 80240374 24020008 */ addiu $v0, $zero, 8 -/* BDD528 80240378 A602008E */ sh $v0, 0x8e($s0) -/* BDD52C 8024037C 24020003 */ addiu $v0, $zero, 3 -/* BDD530 80240380 AE030028 */ sw $v1, 0x28($s0) -/* BDD534 80240384 AE420070 */ sw $v0, 0x70($s2) -.L80240388: -/* BDD538 80240388 8FBF001C */ lw $ra, 0x1c($sp) -/* BDD53C 8024038C 8FB20018 */ lw $s2, 0x18($sp) -/* BDD540 80240390 8FB10014 */ lw $s1, 0x14($sp) -/* BDD544 80240394 8FB00010 */ lw $s0, 0x10($sp) -/* BDD548 80240398 03E00008 */ jr $ra -/* BDD54C 8024039C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_02/func_802403A0_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/func_802403A0_BDD1B0.s deleted file mode 100644 index 4930e6e2c3..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_02/func_802403A0_BDD1B0.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403A0_BDD550 -/* BDD550 802403A0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BDD554 802403A4 AFB10014 */ sw $s1, 0x14($sp) -/* BDD558 802403A8 0080882D */ daddu $s1, $a0, $zero -/* BDD55C 802403AC AFBF0018 */ sw $ra, 0x18($sp) -/* BDD560 802403B0 AFB00010 */ sw $s0, 0x10($sp) -/* BDD564 802403B4 8E220148 */ lw $v0, 0x148($s1) -/* BDD568 802403B8 0C00EABB */ jal get_npc_unsafe -/* BDD56C 802403BC 84440008 */ lh $a0, 8($v0) -/* BDD570 802403C0 0040802D */ daddu $s0, $v0, $zero -/* BDD574 802403C4 9602008E */ lhu $v0, 0x8e($s0) -/* BDD578 802403C8 2442FFFF */ addiu $v0, $v0, -1 -/* BDD57C 802403CC A602008E */ sh $v0, 0x8e($s0) -/* BDD580 802403D0 00021400 */ sll $v0, $v0, 0x10 -/* BDD584 802403D4 1C40000F */ bgtz $v0, .L80240414 -/* BDD588 802403D8 00000000 */ nop -/* BDD58C 802403DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BDD590 802403E0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BDD594 802403E4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BDD598 802403E8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BDD59C 802403EC 8C460028 */ lw $a2, 0x28($v0) -/* BDD5A0 802403F0 0C00A720 */ jal atan2 -/* BDD5A4 802403F4 8C470030 */ lw $a3, 0x30($v0) -/* BDD5A8 802403F8 2402001A */ addiu $v0, $zero, 0x1a -/* BDD5AC 802403FC A60200A8 */ sh $v0, 0xa8($s0) -/* BDD5B0 80240400 24020018 */ addiu $v0, $zero, 0x18 -/* BDD5B4 80240404 A60200A6 */ sh $v0, 0xa6($s0) -/* BDD5B8 80240408 24020004 */ addiu $v0, $zero, 4 -/* BDD5BC 8024040C E600000C */ swc1 $f0, 0xc($s0) -/* BDD5C0 80240410 AE220070 */ sw $v0, 0x70($s1) -.L80240414: -/* BDD5C4 80240414 8FBF0018 */ lw $ra, 0x18($sp) -/* BDD5C8 80240418 8FB10014 */ lw $s1, 0x14($sp) -/* BDD5CC 8024041C 8FB00010 */ lw $s0, 0x10($sp) -/* BDD5D0 80240420 03E00008 */ jr $ra -/* BDD5D4 80240424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_02/func_80240428_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/func_80240428_BDD1B0.s deleted file mode 100644 index 0d5bfb5781..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_02/func_80240428_BDD1B0.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240428_BDD5D8 -/* BDD5D8 80240428 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BDD5DC 8024042C AFB10014 */ sw $s1, 0x14($sp) -/* BDD5E0 80240430 0080882D */ daddu $s1, $a0, $zero -/* BDD5E4 80240434 AFBF001C */ sw $ra, 0x1c($sp) -/* BDD5E8 80240438 AFB20018 */ sw $s2, 0x18($sp) -/* BDD5EC 8024043C AFB00010 */ sw $s0, 0x10($sp) -/* BDD5F0 80240440 8E320148 */ lw $s2, 0x148($s1) -/* BDD5F4 80240444 0C00EABB */ jal get_npc_unsafe -/* BDD5F8 80240448 86440008 */ lh $a0, 8($s2) -/* BDD5FC 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* BDD600 80240450 0C00A67F */ jal rand_int -/* BDD604 80240454 0040802D */ daddu $s0, $v0, $zero -/* BDD608 80240458 C60C000C */ lwc1 $f12, 0xc($s0) -/* BDD60C 8024045C 44820000 */ mtc1 $v0, $f0 -/* BDD610 80240460 00000000 */ nop -/* BDD614 80240464 46800020 */ cvt.s.w $f0, $f0 -/* BDD618 80240468 46006300 */ add.s $f12, $f12, $f0 -/* BDD61C 8024046C 3C0142B4 */ lui $at, 0x42b4 -/* BDD620 80240470 44810000 */ mtc1 $at, $f0 -/* BDD624 80240474 0C00A6C9 */ jal clamp_angle -/* BDD628 80240478 46006301 */ sub.s $f12, $f12, $f0 -/* BDD62C 8024047C E600000C */ swc1 $f0, 0xc($s0) -/* BDD630 80240480 8E4200CC */ lw $v0, 0xcc($s2) -/* BDD634 80240484 8C420000 */ lw $v0, ($v0) -/* BDD638 80240488 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BDD63C 8024048C 0C00A67F */ jal rand_int -/* BDD640 80240490 AE020028 */ sw $v0, 0x28($s0) -/* BDD644 80240494 00021FC2 */ srl $v1, $v0, 0x1f -/* BDD648 80240498 00431821 */ addu $v1, $v0, $v1 -/* BDD64C 8024049C 00031843 */ sra $v1, $v1, 1 -/* BDD650 802404A0 00031840 */ sll $v1, $v1, 1 -/* BDD654 802404A4 00431023 */ subu $v0, $v0, $v1 -/* BDD658 802404A8 24420002 */ addiu $v0, $v0, 2 -/* BDD65C 802404AC AE220074 */ sw $v0, 0x74($s1) -/* BDD660 802404B0 24020005 */ addiu $v0, $zero, 5 -/* BDD664 802404B4 AE220070 */ sw $v0, 0x70($s1) -/* BDD668 802404B8 8FBF001C */ lw $ra, 0x1c($sp) -/* BDD66C 802404BC 8FB20018 */ lw $s2, 0x18($sp) -/* BDD670 802404C0 8FB10014 */ lw $s1, 0x14($sp) -/* BDD674 802404C4 8FB00010 */ lw $s0, 0x10($sp) -/* BDD678 802404C8 03E00008 */ jr $ra -/* BDD67C 802404CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_02/func_802404D0_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/func_802404D0_BDD1B0.s deleted file mode 100644 index 0dde830877..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_02/func_802404D0_BDD1B0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404D0_BDD680 -/* BDD680 802404D0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BDD684 802404D4 AFB3003C */ sw $s3, 0x3c($sp) -/* BDD688 802404D8 0080982D */ daddu $s3, $a0, $zero -/* BDD68C 802404DC AFBF0040 */ sw $ra, 0x40($sp) -/* BDD690 802404E0 AFB20038 */ sw $s2, 0x38($sp) -/* BDD694 802404E4 AFB10034 */ sw $s1, 0x34($sp) -/* BDD698 802404E8 AFB00030 */ sw $s0, 0x30($sp) -/* BDD69C 802404EC 8E700148 */ lw $s0, 0x148($s3) -/* BDD6A0 802404F0 00A0902D */ daddu $s2, $a1, $zero -/* BDD6A4 802404F4 86040008 */ lh $a0, 8($s0) -/* BDD6A8 802404F8 0C00EABB */ jal get_npc_unsafe -/* BDD6AC 802404FC 00C0882D */ daddu $s1, $a2, $zero -/* BDD6B0 80240500 0220202D */ daddu $a0, $s1, $zero -/* BDD6B4 80240504 0200282D */ daddu $a1, $s0, $zero -/* BDD6B8 80240508 AFA00010 */ sw $zero, 0x10($sp) -/* BDD6BC 8024050C 8E460024 */ lw $a2, 0x24($s2) -/* BDD6C0 80240510 8E470028 */ lw $a3, 0x28($s2) -/* BDD6C4 80240514 0C01242D */ jal func_800490B4 -/* BDD6C8 80240518 0040802D */ daddu $s0, $v0, $zero -/* BDD6CC 8024051C 1040000B */ beqz $v0, .L8024054C -/* BDD6D0 80240520 00000000 */ nop -/* BDD6D4 80240524 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BDD6D8 80240528 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BDD6DC 8024052C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BDD6E0 80240530 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BDD6E4 80240534 8C460028 */ lw $a2, 0x28($v0) -/* BDD6E8 80240538 0C00A720 */ jal atan2 -/* BDD6EC 8024053C 8C470030 */ lw $a3, 0x30($v0) -/* BDD6F0 80240540 2402000C */ addiu $v0, $zero, 0xc -/* BDD6F4 80240544 08090189 */ j .L80240624 -/* BDD6F8 80240548 E600000C */ swc1 $f0, 0xc($s0) -.L8024054C: -/* BDD6FC 8024054C 9602008E */ lhu $v0, 0x8e($s0) -/* BDD700 80240550 2442FFFF */ addiu $v0, $v0, -1 -/* BDD704 80240554 A602008E */ sh $v0, 0x8e($s0) -/* BDD708 80240558 00021400 */ sll $v0, $v0, 0x10 -/* BDD70C 8024055C 1C400032 */ bgtz $v0, .L80240628 -/* BDD710 80240560 00000000 */ nop -/* BDD714 80240564 8E620074 */ lw $v0, 0x74($s3) -/* BDD718 80240568 2442FFFF */ addiu $v0, $v0, -1 -/* BDD71C 8024056C 18400014 */ blez $v0, .L802405C0 -/* BDD720 80240570 AE620074 */ sw $v0, 0x74($s3) -/* BDD724 80240574 C600000C */ lwc1 $f0, 0xc($s0) -/* BDD728 80240578 3C014334 */ lui $at, 0x4334 -/* BDD72C 8024057C 44816000 */ mtc1 $at, $f12 -/* BDD730 80240580 0C00A6C9 */ jal clamp_angle -/* BDD734 80240584 460C0300 */ add.s $f12, $f0, $f12 -/* BDD738 80240588 E600000C */ swc1 $f0, 0xc($s0) -/* BDD73C 8024058C 8E440008 */ lw $a0, 8($s2) -/* BDD740 80240590 000417C2 */ srl $v0, $a0, 0x1f -/* BDD744 80240594 00822021 */ addu $a0, $a0, $v0 -/* BDD748 80240598 00042043 */ sra $a0, $a0, 1 -/* BDD74C 8024059C 0C00A67F */ jal rand_int -/* BDD750 802405A0 24840001 */ addiu $a0, $a0, 1 -/* BDD754 802405A4 8E430008 */ lw $v1, 8($s2) -/* BDD758 802405A8 000327C2 */ srl $a0, $v1, 0x1f -/* BDD75C 802405AC 00641821 */ addu $v1, $v1, $a0 -/* BDD760 802405B0 00031843 */ sra $v1, $v1, 1 -/* BDD764 802405B4 00621821 */ addu $v1, $v1, $v0 -/* BDD768 802405B8 0809018A */ j .L80240628 -/* BDD76C 802405BC A603008E */ sh $v1, 0x8e($s0) -.L802405C0: -/* BDD770 802405C0 24040002 */ addiu $a0, $zero, 2 -/* BDD774 802405C4 0200282D */ daddu $a1, $s0, $zero -/* BDD778 802405C8 0000302D */ daddu $a2, $zero, $zero -/* BDD77C 802405CC 860300A8 */ lh $v1, 0xa8($s0) -/* BDD780 802405D0 3C013F80 */ lui $at, 0x3f80 -/* BDD784 802405D4 44810000 */ mtc1 $at, $f0 -/* BDD788 802405D8 3C014000 */ lui $at, 0x4000 -/* BDD78C 802405DC 44811000 */ mtc1 $at, $f2 -/* BDD790 802405E0 3C01C1A0 */ lui $at, 0xc1a0 -/* BDD794 802405E4 44812000 */ mtc1 $at, $f4 -/* BDD798 802405E8 2402000C */ addiu $v0, $zero, 0xc -/* BDD79C 802405EC AFA2001C */ sw $v0, 0x1c($sp) -/* BDD7A0 802405F0 44833000 */ mtc1 $v1, $f6 -/* BDD7A4 802405F4 00000000 */ nop -/* BDD7A8 802405F8 468031A0 */ cvt.s.w $f6, $f6 -/* BDD7AC 802405FC 44073000 */ mfc1 $a3, $f6 -/* BDD7B0 80240600 27A20028 */ addiu $v0, $sp, 0x28 -/* BDD7B4 80240604 AFA20020 */ sw $v0, 0x20($sp) -/* BDD7B8 80240608 E7A00010 */ swc1 $f0, 0x10($sp) -/* BDD7BC 8024060C E7A20014 */ swc1 $f2, 0x14($sp) -/* BDD7C0 80240610 0C01BFA4 */ jal fx_emote -/* BDD7C4 80240614 E7A40018 */ swc1 $f4, 0x18($sp) -/* BDD7C8 80240618 2402000F */ addiu $v0, $zero, 0xf -/* BDD7CC 8024061C A602008E */ sh $v0, 0x8e($s0) -/* BDD7D0 80240620 24020028 */ addiu $v0, $zero, 0x28 -.L80240624: -/* BDD7D4 80240624 AE620070 */ sw $v0, 0x70($s3) -.L80240628: -/* BDD7D8 80240628 8FBF0040 */ lw $ra, 0x40($sp) -/* BDD7DC 8024062C 8FB3003C */ lw $s3, 0x3c($sp) -/* BDD7E0 80240630 8FB20038 */ lw $s2, 0x38($sp) -/* BDD7E4 80240634 8FB10034 */ lw $s1, 0x34($sp) -/* BDD7E8 80240638 8FB00030 */ lw $s0, 0x30($sp) -/* BDD7EC 8024063C 03E00008 */ jr $ra -/* BDD7F0 80240640 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_arn/arn_02/func_80240644_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/func_80240644_BDD1B0.s deleted file mode 100644 index 2d02a1b51e..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_02/func_80240644_BDD1B0.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240644_BDD7F4 -/* BDD7F4 80240644 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BDD7F8 80240648 AFB10014 */ sw $s1, 0x14($sp) -/* BDD7FC 8024064C 0080882D */ daddu $s1, $a0, $zero -/* BDD800 80240650 AFBF0018 */ sw $ra, 0x18($sp) -/* BDD804 80240654 AFB00010 */ sw $s0, 0x10($sp) -/* BDD808 80240658 8E300148 */ lw $s0, 0x148($s1) -/* BDD80C 8024065C 0C00EABB */ jal get_npc_unsafe -/* BDD810 80240660 86040008 */ lh $a0, 8($s0) -/* BDD814 80240664 96030096 */ lhu $v1, 0x96($s0) -/* BDD818 80240668 A443008E */ sh $v1, 0x8e($v0) -/* BDD81C 8024066C 8E0300CC */ lw $v1, 0xcc($s0) -/* BDD820 80240670 8C630034 */ lw $v1, 0x34($v1) -/* BDD824 80240674 AC430028 */ sw $v1, 0x28($v0) -/* BDD828 80240678 24020015 */ addiu $v0, $zero, 0x15 -/* BDD82C 8024067C AE220070 */ sw $v0, 0x70($s1) -/* BDD830 80240680 8FBF0018 */ lw $ra, 0x18($sp) -/* BDD834 80240684 8FB10014 */ lw $s1, 0x14($sp) -/* BDD838 80240688 8FB00010 */ lw $s0, 0x10($sp) -/* BDD83C 8024068C 03E00008 */ jr $ra -/* BDD840 80240690 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_02/func_80240694_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/func_80240694_BDD1B0.s deleted file mode 100644 index 3f6953e769..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_02/func_80240694_BDD1B0.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240694_BDD844 -/* BDD844 80240694 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BDD848 80240698 AFB30024 */ sw $s3, 0x24($sp) -/* BDD84C 8024069C 0080982D */ daddu $s3, $a0, $zero -/* BDD850 802406A0 AFBF002C */ sw $ra, 0x2c($sp) -/* BDD854 802406A4 AFB40028 */ sw $s4, 0x28($sp) -/* BDD858 802406A8 AFB20020 */ sw $s2, 0x20($sp) -/* BDD85C 802406AC AFB1001C */ sw $s1, 0x1c($sp) -/* BDD860 802406B0 AFB00018 */ sw $s0, 0x18($sp) -/* BDD864 802406B4 8E710148 */ lw $s1, 0x148($s3) -/* BDD868 802406B8 86240008 */ lh $a0, 8($s1) -/* BDD86C 802406BC 0C00EABB */ jal get_npc_unsafe -/* BDD870 802406C0 00A0A02D */ daddu $s4, $a1, $zero -/* BDD874 802406C4 0040802D */ daddu $s0, $v0, $zero -/* BDD878 802406C8 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* BDD87C 802406CC 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* BDD880 802406D0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BDD884 802406D4 8E420000 */ lw $v0, ($s2) -/* BDD888 802406D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BDD88C 802406DC 8C460028 */ lw $a2, 0x28($v0) -/* BDD890 802406E0 0C00A720 */ jal atan2 -/* BDD894 802406E4 8C470030 */ lw $a3, 0x30($v0) -/* BDD898 802406E8 3C025555 */ lui $v0, 0x5555 -/* BDD89C 802406EC 9603008E */ lhu $v1, 0x8e($s0) -/* BDD8A0 802406F0 34425556 */ ori $v0, $v0, 0x5556 -/* BDD8A4 802406F4 00031C00 */ sll $v1, $v1, 0x10 -/* BDD8A8 802406F8 00032403 */ sra $a0, $v1, 0x10 -/* BDD8AC 802406FC 00820018 */ mult $a0, $v0 -/* BDD8B0 80240700 00031FC3 */ sra $v1, $v1, 0x1f -/* BDD8B4 80240704 00004010 */ mfhi $t0 -/* BDD8B8 80240708 01031823 */ subu $v1, $t0, $v1 -/* BDD8BC 8024070C 00031040 */ sll $v0, $v1, 1 -/* BDD8C0 80240710 00431021 */ addu $v0, $v0, $v1 -/* BDD8C4 80240714 00822023 */ subu $a0, $a0, $v0 -/* BDD8C8 80240718 00042400 */ sll $a0, $a0, 0x10 -/* BDD8CC 8024071C 1480000C */ bnez $a0, .L80240750 -/* BDD8D0 80240720 E600000C */ swc1 $f0, 0xc($s0) -/* BDD8D4 80240724 C6020040 */ lwc1 $f2, 0x40($s0) -/* BDD8D8 80240728 3C014000 */ lui $at, 0x4000 -/* BDD8DC 8024072C 44810000 */ mtc1 $at, $f0 -/* BDD8E0 80240730 AFA00010 */ sw $zero, 0x10($sp) -/* BDD8E4 80240734 AFA00014 */ sw $zero, 0x14($sp) -/* BDD8E8 80240738 46001080 */ add.s $f2, $f2, $f0 -/* BDD8EC 8024073C 8E06003C */ lw $a2, 0x3c($s0) -/* BDD8F0 80240740 8E050038 */ lw $a1, 0x38($s0) -/* BDD8F4 80240744 44071000 */ mfc1 $a3, $f2 -/* BDD8F8 80240748 0C01BECC */ jal fx_walk_normal -/* BDD8FC 8024074C 24040002 */ addiu $a0, $zero, 2 -.L80240750: -/* BDD900 80240750 9602008E */ lhu $v0, 0x8e($s0) -/* BDD904 80240754 2442FFFF */ addiu $v0, $v0, -1 -/* BDD908 80240758 A602008E */ sh $v0, 0x8e($s0) -/* BDD90C 8024075C 00021400 */ sll $v0, $v0, 0x10 -/* BDD910 80240760 1C40002C */ bgtz $v0, .L80240814 -/* BDD914 80240764 00000000 */ nop -/* BDD918 80240768 C6000038 */ lwc1 $f0, 0x38($s0) -/* BDD91C 8024076C 4600010D */ trunc.w.s $f4, $f0 -/* BDD920 80240770 44022000 */ mfc1 $v0, $f4 -/* BDD924 80240774 00000000 */ nop -/* BDD928 80240778 A6220010 */ sh $v0, 0x10($s1) -/* BDD92C 8024077C C600003C */ lwc1 $f0, 0x3c($s0) -/* BDD930 80240780 4600010D */ trunc.w.s $f4, $f0 -/* BDD934 80240784 44022000 */ mfc1 $v0, $f4 -/* BDD938 80240788 00000000 */ nop -/* BDD93C 8024078C A6220012 */ sh $v0, 0x12($s1) -/* BDD940 80240790 C6000040 */ lwc1 $f0, 0x40($s0) -/* BDD944 80240794 24020001 */ addiu $v0, $zero, 1 -/* BDD948 80240798 A2220007 */ sb $v0, 7($s1) -/* BDD94C 8024079C 4600010D */ trunc.w.s $f4, $f0 -/* BDD950 802407A0 44022000 */ mfc1 $v0, $f4 -/* BDD954 802407A4 00000000 */ nop -/* BDD958 802407A8 A6220014 */ sh $v0, 0x14($s1) -/* BDD95C 802407AC C6800018 */ lwc1 $f0, 0x18($s4) -/* BDD960 802407B0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BDD964 802407B4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BDD968 802407B8 8E420000 */ lw $v0, ($s2) -/* BDD96C 802407BC E6000018 */ swc1 $f0, 0x18($s0) -/* BDD970 802407C0 8C460028 */ lw $a2, 0x28($v0) -/* BDD974 802407C4 0C00A7B5 */ jal dist2D -/* BDD978 802407C8 8C470030 */ lw $a3, 0x30($v0) -/* BDD97C 802407CC C6020018 */ lwc1 $f2, 0x18($s0) -/* BDD980 802407D0 46020003 */ div.s $f0, $f0, $f2 -/* BDD984 802407D4 3C018024 */ lui $at, 0x8024 -/* BDD988 802407D8 D4221AF8 */ ldc1 $f2, 0x1af8($at) -/* BDD98C 802407DC 46000021 */ cvt.d.s $f0, $f0 -/* BDD990 802407E0 46220000 */ add.d $f0, $f0, $f2 -/* BDD994 802407E4 4620010D */ trunc.w.d $f4, $f0 -/* BDD998 802407E8 44022000 */ mfc1 $v0, $f4 -/* BDD99C 802407EC 00000000 */ nop -/* BDD9A0 802407F0 A602008E */ sh $v0, 0x8e($s0) -/* BDD9A4 802407F4 00021400 */ sll $v0, $v0, 0x10 -/* BDD9A8 802407F8 00021403 */ sra $v0, $v0, 0x10 -/* BDD9AC 802407FC 2842000F */ slti $v0, $v0, 0xf -/* BDD9B0 80240800 10400002 */ beqz $v0, .L8024080C -/* BDD9B4 80240804 2402000F */ addiu $v0, $zero, 0xf -/* BDD9B8 80240808 A602008E */ sh $v0, 0x8e($s0) -.L8024080C: -/* BDD9BC 8024080C 24020016 */ addiu $v0, $zero, 0x16 -/* BDD9C0 80240810 AE620070 */ sw $v0, 0x70($s3) -.L80240814: -/* BDD9C4 80240814 8FBF002C */ lw $ra, 0x2c($sp) -/* BDD9C8 80240818 8FB40028 */ lw $s4, 0x28($sp) -/* BDD9CC 8024081C 8FB30024 */ lw $s3, 0x24($sp) -/* BDD9D0 80240820 8FB20020 */ lw $s2, 0x20($sp) -/* BDD9D4 80240824 8FB1001C */ lw $s1, 0x1c($sp) -/* BDD9D8 80240828 8FB00018 */ lw $s0, 0x18($sp) -/* BDD9DC 8024082C 03E00008 */ jr $ra -/* BDD9E0 80240830 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_arn/arn_02/func_80240834_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/func_80240834_BDD1B0.s deleted file mode 100644 index d22491cc9a..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_02/func_80240834_BDD1B0.s +++ /dev/null @@ -1,91 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240834_BDD9E4 -/* BDD9E4 80240834 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BDD9E8 80240838 AFB3003C */ sw $s3, 0x3c($sp) -/* BDD9EC 8024083C 0080982D */ daddu $s3, $a0, $zero -/* BDD9F0 80240840 AFBF0040 */ sw $ra, 0x40($sp) -/* BDD9F4 80240844 AFB20038 */ sw $s2, 0x38($sp) -/* BDD9F8 80240848 AFB10034 */ sw $s1, 0x34($sp) -/* BDD9FC 8024084C AFB00030 */ sw $s0, 0x30($sp) -/* BDDA00 80240850 8E720148 */ lw $s2, 0x148($s3) -/* BDDA04 80240854 0C00EABB */ jal get_npc_unsafe -/* BDDA08 80240858 86440008 */ lh $a0, 8($s2) -/* BDDA0C 8024085C 0040802D */ daddu $s0, $v0, $zero -/* BDDA10 80240860 0200202D */ daddu $a0, $s0, $zero -/* BDDA14 80240864 0C00F598 */ jal func_8003D660 -/* BDDA18 80240868 24050001 */ addiu $a1, $zero, 1 -/* BDDA1C 8024086C 8E050018 */ lw $a1, 0x18($s0) -/* BDDA20 80240870 8E06000C */ lw $a2, 0xc($s0) -/* BDDA24 80240874 0C00EA95 */ jal npc_move_heading -/* BDDA28 80240878 0200202D */ daddu $a0, $s0, $zero -/* BDDA2C 8024087C 8E4300D0 */ lw $v1, 0xd0($s2) -/* BDDA30 80240880 C6000040 */ lwc1 $f0, 0x40($s0) -/* BDDA34 80240884 C462001C */ lwc1 $f2, 0x1c($v1) -/* BDDA38 80240888 468010A0 */ cvt.s.w $f2, $f2 -/* BDDA3C 8024088C C4640024 */ lwc1 $f4, 0x24($v1) -/* BDDA40 80240890 46802120 */ cvt.s.w $f4, $f4 -/* BDDA44 80240894 E7A00010 */ swc1 $f0, 0x10($sp) -/* BDDA48 80240898 8E4200D0 */ lw $v0, 0xd0($s2) -/* BDDA4C 8024089C 44051000 */ mfc1 $a1, $f2 -/* BDDA50 802408A0 C4400028 */ lwc1 $f0, 0x28($v0) -/* BDDA54 802408A4 46800020 */ cvt.s.w $f0, $f0 -/* BDDA58 802408A8 E7A00014 */ swc1 $f0, 0x14($sp) -/* BDDA5C 802408AC 8E4200D0 */ lw $v0, 0xd0($s2) -/* BDDA60 802408B0 44062000 */ mfc1 $a2, $f4 -/* BDDA64 802408B4 C440002C */ lwc1 $f0, 0x2c($v0) -/* BDDA68 802408B8 46800020 */ cvt.s.w $f0, $f0 -/* BDDA6C 802408BC E7A00018 */ swc1 $f0, 0x18($sp) -/* BDDA70 802408C0 8C640030 */ lw $a0, 0x30($v1) -/* BDDA74 802408C4 0C0123F5 */ jal is_point_within_region -/* BDDA78 802408C8 8E070038 */ lw $a3, 0x38($s0) -/* BDDA7C 802408CC C6000038 */ lwc1 $f0, 0x38($s0) -/* BDDA80 802408D0 C602003C */ lwc1 $f2, 0x3c($s0) -/* BDDA84 802408D4 C6040040 */ lwc1 $f4, 0x40($s0) -/* BDDA88 802408D8 3C013F80 */ lui $at, 0x3f80 -/* BDDA8C 802408DC 44813000 */ mtc1 $at, $f6 -/* BDDA90 802408E0 E7A00020 */ swc1 $f0, 0x20($sp) -/* BDDA94 802408E4 E7A20024 */ swc1 $f2, 0x24($sp) -/* BDDA98 802408E8 E7A40028 */ swc1 $f4, 0x28($sp) -/* BDDA9C 802408EC E7A60010 */ swc1 $f6, 0x10($sp) -/* BDDAA0 802408F0 C600000C */ lwc1 $f0, 0xc($s0) -/* BDDAA4 802408F4 0002882B */ sltu $s1, $zero, $v0 -/* BDDAA8 802408F8 E7A00014 */ swc1 $f0, 0x14($sp) -/* BDDAAC 802408FC 860200A8 */ lh $v0, 0xa8($s0) -/* BDDAB0 80240900 27A50020 */ addiu $a1, $sp, 0x20 -/* BDDAB4 80240904 44820000 */ mtc1 $v0, $f0 -/* BDDAB8 80240908 00000000 */ nop -/* BDDABC 8024090C 46800020 */ cvt.s.w $f0, $f0 -/* BDDAC0 80240910 E7A00018 */ swc1 $f0, 0x18($sp) -/* BDDAC4 80240914 860200A6 */ lh $v0, 0xa6($s0) -/* BDDAC8 80240918 27A60024 */ addiu $a2, $sp, 0x24 -/* BDDACC 8024091C 44820000 */ mtc1 $v0, $f0 -/* BDDAD0 80240920 00000000 */ nop -/* BDDAD4 80240924 46800020 */ cvt.s.w $f0, $f0 -/* BDDAD8 80240928 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BDDADC 8024092C 8E040080 */ lw $a0, 0x80($s0) -/* BDDAE0 80240930 0C037711 */ jal func_800DDC44 -/* BDDAE4 80240934 27A70028 */ addiu $a3, $sp, 0x28 -/* BDDAE8 80240938 54400001 */ bnel $v0, $zero, .L80240940 -/* BDDAEC 8024093C 24110001 */ addiu $s1, $zero, 1 -.L80240940: -/* BDDAF0 80240940 9602008E */ lhu $v0, 0x8e($s0) -/* BDDAF4 80240944 2442FFFF */ addiu $v0, $v0, -1 -/* BDDAF8 80240948 A602008E */ sh $v0, 0x8e($s0) -/* BDDAFC 8024094C 00021400 */ sll $v0, $v0, 0x10 -/* BDDB00 80240950 58400001 */ blezl $v0, .L80240958 -/* BDDB04 80240954 24110001 */ addiu $s1, $zero, 1 -.L80240958: -/* BDDB08 80240958 12200003 */ beqz $s1, .L80240968 -/* BDDB0C 8024095C 24020004 */ addiu $v0, $zero, 4 -/* BDDB10 80240960 AE620070 */ sw $v0, 0x70($s3) -/* BDDB14 80240964 A2400007 */ sb $zero, 7($s2) -.L80240968: -/* BDDB18 80240968 8FBF0040 */ lw $ra, 0x40($sp) -/* BDDB1C 8024096C 8FB3003C */ lw $s3, 0x3c($sp) -/* BDDB20 80240970 8FB20038 */ lw $s2, 0x38($sp) -/* BDDB24 80240974 8FB10034 */ lw $s1, 0x34($sp) -/* BDDB28 80240978 8FB00030 */ lw $s0, 0x30($sp) -/* BDDB2C 8024097C 03E00008 */ jr $ra -/* BDDB30 80240980 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_arn/arn_02/func_80240984_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/func_80240984_BDD1B0.s deleted file mode 100644 index 2e8db50bd4..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_02/func_80240984_BDD1B0.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240984_BDDB34 -/* BDDB34 80240984 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BDDB38 80240988 AFB20018 */ sw $s2, 0x18($sp) -/* BDDB3C 8024098C 0080902D */ daddu $s2, $a0, $zero -/* BDDB40 80240990 AFBF001C */ sw $ra, 0x1c($sp) -/* BDDB44 80240994 AFB10014 */ sw $s1, 0x14($sp) -/* BDDB48 80240998 AFB00010 */ sw $s0, 0x10($sp) -/* BDDB4C 8024099C 8E500148 */ lw $s0, 0x148($s2) -/* BDDB50 802409A0 86040008 */ lh $a0, 8($s0) -/* BDDB54 802409A4 0C00EABB */ jal get_npc_unsafe -/* BDDB58 802409A8 00A0882D */ daddu $s1, $a1, $zero -/* BDDB5C 802409AC 0040182D */ daddu $v1, $v0, $zero -/* BDDB60 802409B0 9462008E */ lhu $v0, 0x8e($v1) -/* BDDB64 802409B4 2442FFFF */ addiu $v0, $v0, -1 -/* BDDB68 802409B8 A462008E */ sh $v0, 0x8e($v1) -/* BDDB6C 802409BC 00021400 */ sll $v0, $v0, 0x10 -/* BDDB70 802409C0 1C400015 */ bgtz $v0, .L80240A18 -/* BDDB74 802409C4 00000000 */ nop -/* BDDB78 802409C8 8E0200CC */ lw $v0, 0xcc($s0) -/* BDDB7C 802409CC 8C420004 */ lw $v0, 4($v0) -/* BDDB80 802409D0 AC620028 */ sw $v0, 0x28($v1) -/* BDDB84 802409D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* BDDB88 802409D8 8C420014 */ lw $v0, 0x14($v0) -/* BDDB8C 802409DC 04410004 */ bgez $v0, .L802409F0 -/* BDDB90 802409E0 00000000 */ nop -/* BDDB94 802409E4 C6200000 */ lwc1 $f0, ($s1) -/* BDDB98 802409E8 08090284 */ j .L80240A10 -/* BDDB9C 802409EC E4600018 */ swc1 $f0, 0x18($v1) -.L802409F0: -/* BDDBA0 802409F0 3C018024 */ lui $at, 0x8024 -/* BDDBA4 802409F4 D4221B00 */ ldc1 $f2, 0x1b00($at) -/* BDDBA8 802409F8 44820000 */ mtc1 $v0, $f0 -/* BDDBAC 802409FC 00000000 */ nop -/* BDDBB0 80240A00 46800021 */ cvt.d.w $f0, $f0 -/* BDDBB4 80240A04 46220003 */ div.d $f0, $f0, $f2 -/* BDDBB8 80240A08 46200020 */ cvt.s.d $f0, $f0 -/* BDDBBC 80240A0C E4600018 */ swc1 $f0, 0x18($v1) -.L80240A10: -/* BDDBC0 80240A10 24020029 */ addiu $v0, $zero, 0x29 -/* BDDBC4 80240A14 AE420070 */ sw $v0, 0x70($s2) -.L80240A18: -/* BDDBC8 80240A18 8FBF001C */ lw $ra, 0x1c($sp) -/* BDDBCC 80240A1C 8FB20018 */ lw $s2, 0x18($sp) -/* BDDBD0 80240A20 8FB10014 */ lw $s1, 0x14($sp) -/* BDDBD4 80240A24 8FB00010 */ lw $s0, 0x10($sp) -/* BDDBD8 80240A28 03E00008 */ jr $ra -/* BDDBDC 80240A2C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_02/func_80240A30_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/func_80240A30_BDD1B0.s deleted file mode 100644 index 2353e92521..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_02/func_80240A30_BDD1B0.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A30_BDDBE0 -/* BDDBE0 80240A30 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BDDBE4 80240A34 AFB30024 */ sw $s3, 0x24($sp) -/* BDDBE8 80240A38 0080982D */ daddu $s3, $a0, $zero -/* BDDBEC 80240A3C AFBF0028 */ sw $ra, 0x28($sp) -/* BDDBF0 80240A40 AFB20020 */ sw $s2, 0x20($sp) -/* BDDBF4 80240A44 AFB1001C */ sw $s1, 0x1c($sp) -/* BDDBF8 80240A48 AFB00018 */ sw $s0, 0x18($sp) -/* BDDBFC 80240A4C 8E720148 */ lw $s2, 0x148($s3) -/* BDDC00 80240A50 00A0882D */ daddu $s1, $a1, $zero -/* BDDC04 80240A54 86440008 */ lh $a0, 8($s2) -/* BDDC08 80240A58 0C00EABB */ jal get_npc_unsafe -/* BDDC0C 80240A5C 00C0802D */ daddu $s0, $a2, $zero -/* BDDC10 80240A60 0200202D */ daddu $a0, $s0, $zero -/* BDDC14 80240A64 0240282D */ daddu $a1, $s2, $zero -/* BDDC18 80240A68 AFA00010 */ sw $zero, 0x10($sp) -/* BDDC1C 80240A6C 8E260024 */ lw $a2, 0x24($s1) -/* BDDC20 80240A70 8E270028 */ lw $a3, 0x28($s1) -/* BDDC24 80240A74 0C01242D */ jal func_800490B4 -/* BDDC28 80240A78 0040802D */ daddu $s0, $v0, $zero -/* BDDC2C 80240A7C 1040000C */ beqz $v0, .L80240AB0 -/* BDDC30 80240A80 00000000 */ nop -/* BDDC34 80240A84 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BDDC38 80240A88 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BDDC3C 80240A8C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BDDC40 80240A90 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BDDC44 80240A94 8C460028 */ lw $a2, 0x28($v0) -/* BDDC48 80240A98 0C00A720 */ jal atan2 -/* BDDC4C 80240A9C 8C470030 */ lw $a3, 0x30($v0) -/* BDDC50 80240AA0 2402000C */ addiu $v0, $zero, 0xc -/* BDDC54 80240AA4 E600000C */ swc1 $f0, 0xc($s0) -/* BDDC58 80240AA8 080902D3 */ j .L80240B4C -/* BDDC5C 80240AAC AE620070 */ sw $v0, 0x70($s3) -.L80240AB0: -/* BDDC60 80240AB0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BDDC64 80240AB4 8E4200D0 */ lw $v0, 0xd0($s2) -/* BDDC68 80240AB8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BDDC6C 80240ABC C4440000 */ lwc1 $f4, ($v0) -/* BDDC70 80240AC0 46802120 */ cvt.s.w $f4, $f4 -/* BDDC74 80240AC4 44062000 */ mfc1 $a2, $f4 -/* BDDC78 80240AC8 C4440008 */ lwc1 $f4, 8($v0) -/* BDDC7C 80240ACC 46802120 */ cvt.s.w $f4, $f4 -/* BDDC80 80240AD0 44072000 */ mfc1 $a3, $f4 -/* BDDC84 80240AD4 0C00A7B5 */ jal dist2D -/* BDDC88 80240AD8 00000000 */ nop -/* BDDC8C 80240ADC C6020018 */ lwc1 $f2, 0x18($s0) -/* BDDC90 80240AE0 4602003E */ c.le.s $f0, $f2 -/* BDDC94 80240AE4 00000000 */ nop -/* BDDC98 80240AE8 45000005 */ bc1f .L80240B00 -/* BDDC9C 80240AEC 2402000A */ addiu $v0, $zero, 0xa -/* BDDCA0 80240AF0 A602008E */ sh $v0, 0x8e($s0) -/* BDDCA4 80240AF4 24020032 */ addiu $v0, $zero, 0x32 -/* BDDCA8 80240AF8 080902D3 */ j .L80240B4C -/* BDDCAC 80240AFC AE620070 */ sw $v0, 0x70($s3) -.L80240B00: -/* BDDCB0 80240B00 8602008C */ lh $v0, 0x8c($s0) -/* BDDCB4 80240B04 14400011 */ bnez $v0, .L80240B4C -/* BDDCB8 80240B08 00000000 */ nop -/* BDDCBC 80240B0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BDDCC0 80240B10 8E4200D0 */ lw $v0, 0xd0($s2) -/* BDDCC4 80240B14 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BDDCC8 80240B18 C4440000 */ lwc1 $f4, ($v0) -/* BDDCCC 80240B1C 46802120 */ cvt.s.w $f4, $f4 -/* BDDCD0 80240B20 44062000 */ mfc1 $a2, $f4 -/* BDDCD4 80240B24 C4440008 */ lwc1 $f4, 8($v0) -/* BDDCD8 80240B28 46802120 */ cvt.s.w $f4, $f4 -/* BDDCDC 80240B2C 44072000 */ mfc1 $a3, $f4 -/* BDDCE0 80240B30 0C00A720 */ jal atan2 -/* BDDCE4 80240B34 00000000 */ nop -/* BDDCE8 80240B38 8E050018 */ lw $a1, 0x18($s0) -/* BDDCEC 80240B3C 44060000 */ mfc1 $a2, $f0 -/* BDDCF0 80240B40 0200202D */ daddu $a0, $s0, $zero -/* BDDCF4 80240B44 0C00EA95 */ jal npc_move_heading -/* BDDCF8 80240B48 AC86000C */ sw $a2, 0xc($a0) -.L80240B4C: -/* BDDCFC 80240B4C 8FBF0028 */ lw $ra, 0x28($sp) -/* BDDD00 80240B50 8FB30024 */ lw $s3, 0x24($sp) -/* BDDD04 80240B54 8FB20020 */ lw $s2, 0x20($sp) -/* BDDD08 80240B58 8FB1001C */ lw $s1, 0x1c($sp) -/* BDDD0C 80240B5C 8FB00018 */ lw $s0, 0x18($sp) -/* BDDD10 80240B60 03E00008 */ jr $ra -/* BDDD14 80240B64 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_arn/arn_02/func_80240B68_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/func_80240B68_BDD1B0.s deleted file mode 100644 index 10d5336bca..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_02/func_80240B68_BDD1B0.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B68_BDDD18 -/* BDDD18 80240B68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BDDD1C 80240B6C AFB10014 */ sw $s1, 0x14($sp) -/* BDDD20 80240B70 0080882D */ daddu $s1, $a0, $zero -/* BDDD24 80240B74 AFBF0018 */ sw $ra, 0x18($sp) -/* BDDD28 80240B78 AFB00010 */ sw $s0, 0x10($sp) -/* BDDD2C 80240B7C 8E300148 */ lw $s0, 0x148($s1) -/* BDDD30 80240B80 0C00EABB */ jal get_npc_unsafe -/* BDDD34 80240B84 86040008 */ lh $a0, 8($s0) -/* BDDD38 80240B88 0040202D */ daddu $a0, $v0, $zero -/* BDDD3C 80240B8C 8482008E */ lh $v0, 0x8e($a0) -/* BDDD40 80240B90 9483008E */ lhu $v1, 0x8e($a0) -/* BDDD44 80240B94 18400002 */ blez $v0, .L80240BA0 -/* BDDD48 80240B98 2462FFFF */ addiu $v0, $v1, -1 -/* BDDD4C 80240B9C A482008E */ sh $v0, 0x8e($a0) -.L80240BA0: -/* BDDD50 80240BA0 8482008C */ lh $v0, 0x8c($a0) -/* BDDD54 80240BA4 1440000A */ bnez $v0, .L80240BD0 -/* BDDD58 80240BA8 00000000 */ nop -/* BDDD5C 80240BAC 8482008E */ lh $v0, 0x8e($a0) -/* BDDD60 80240BB0 1C400007 */ bgtz $v0, .L80240BD0 -/* BDDD64 80240BB4 24020008 */ addiu $v0, $zero, 8 -/* BDDD68 80240BB8 A482008E */ sh $v0, 0x8e($a0) -/* BDDD6C 80240BBC 8E0200CC */ lw $v0, 0xcc($s0) -/* BDDD70 80240BC0 8C42002C */ lw $v0, 0x2c($v0) -/* BDDD74 80240BC4 AC820028 */ sw $v0, 0x28($a0) -/* BDDD78 80240BC8 24020033 */ addiu $v0, $zero, 0x33 -/* BDDD7C 80240BCC AE220070 */ sw $v0, 0x70($s1) -.L80240BD0: -/* BDDD80 80240BD0 8FBF0018 */ lw $ra, 0x18($sp) -/* BDDD84 80240BD4 8FB10014 */ lw $s1, 0x14($sp) -/* BDDD88 80240BD8 8FB00010 */ lw $s0, 0x10($sp) -/* BDDD8C 80240BDC 03E00008 */ jr $ra -/* BDDD90 80240BE0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_02/func_80240BE4_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/func_80240BE4_BDD1B0.s deleted file mode 100644 index 76b96cbbd0..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_02/func_80240BE4_BDD1B0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BE4_BDDD94 -/* BDDD94 80240BE4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BDDD98 80240BE8 AFB10014 */ sw $s1, 0x14($sp) -/* BDDD9C 80240BEC 0080882D */ daddu $s1, $a0, $zero -/* BDDDA0 80240BF0 AFBF0018 */ sw $ra, 0x18($sp) -/* BDDDA4 80240BF4 AFB00010 */ sw $s0, 0x10($sp) -/* BDDDA8 80240BF8 8E300148 */ lw $s0, 0x148($s1) -/* BDDDAC 80240BFC 0C00EABB */ jal get_npc_unsafe -/* BDDDB0 80240C00 86040008 */ lh $a0, 8($s0) -/* BDDDB4 80240C04 0040182D */ daddu $v1, $v0, $zero -/* BDDDB8 80240C08 9462008E */ lhu $v0, 0x8e($v1) -/* BDDDBC 80240C0C 2442FFFF */ addiu $v0, $v0, -1 -/* BDDDC0 80240C10 A462008E */ sh $v0, 0x8e($v1) -/* BDDDC4 80240C14 00021400 */ sll $v0, $v0, 0x10 -/* BDDDC8 80240C18 1C400007 */ bgtz $v0, .L80240C38 -/* BDDDCC 80240C1C 24020008 */ addiu $v0, $zero, 8 -/* BDDDD0 80240C20 A462008E */ sh $v0, 0x8e($v1) -/* BDDDD4 80240C24 8E0200CC */ lw $v0, 0xcc($s0) -/* BDDDD8 80240C28 8C420038 */ lw $v0, 0x38($v0) -/* BDDDDC 80240C2C AC620028 */ sw $v0, 0x28($v1) -/* BDDDE0 80240C30 24020034 */ addiu $v0, $zero, 0x34 -/* BDDDE4 80240C34 AE220070 */ sw $v0, 0x70($s1) -.L80240C38: -/* BDDDE8 80240C38 8FBF0018 */ lw $ra, 0x18($sp) -/* BDDDEC 80240C3C 8FB10014 */ lw $s1, 0x14($sp) -/* BDDDF0 80240C40 8FB00010 */ lw $s0, 0x10($sp) -/* BDDDF4 80240C44 03E00008 */ jr $ra -/* BDDDF8 80240C48 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_02/func_80240C4C_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/func_80240C4C_BDD1B0.s deleted file mode 100644 index 61c1126312..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_02/func_80240C4C_BDD1B0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_BDDDFC -/* BDDDFC 80240C4C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BDDE00 80240C50 AFB00010 */ sw $s0, 0x10($sp) -/* BDDE04 80240C54 0080802D */ daddu $s0, $a0, $zero -/* BDDE08 80240C58 AFBF0014 */ sw $ra, 0x14($sp) -/* BDDE0C 80240C5C 8E020148 */ lw $v0, 0x148($s0) -/* BDDE10 80240C60 0C00EABB */ jal get_npc_unsafe -/* BDDE14 80240C64 84440008 */ lh $a0, 8($v0) -/* BDDE18 80240C68 9443008E */ lhu $v1, 0x8e($v0) -/* BDDE1C 80240C6C 2463FFFF */ addiu $v1, $v1, -1 -/* BDDE20 80240C70 A443008E */ sh $v1, 0x8e($v0) -/* BDDE24 80240C74 00031C00 */ sll $v1, $v1, 0x10 -/* BDDE28 80240C78 58600001 */ blezl $v1, .L80240C80 -/* BDDE2C 80240C7C AE000070 */ sw $zero, 0x70($s0) -.L80240C80: -/* BDDE30 80240C80 8FBF0014 */ lw $ra, 0x14($sp) -/* BDDE34 80240C84 8FB00010 */ lw $s0, 0x10($sp) -/* BDDE38 80240C88 03E00008 */ jr $ra -/* BDDE3C 80240C8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_02/func_80240C90_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/func_80240C90_BDD1B0.s deleted file mode 100644 index d9a557046d..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_02/func_80240C90_BDD1B0.s +++ /dev/null @@ -1,223 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C90_BDDE40 -/* BDDE40 80240C90 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BDDE44 80240C94 AFB3003C */ sw $s3, 0x3c($sp) -/* BDDE48 80240C98 0080982D */ daddu $s3, $a0, $zero -/* BDDE4C 80240C9C AFBF0048 */ sw $ra, 0x48($sp) -/* BDDE50 80240CA0 AFB50044 */ sw $s5, 0x44($sp) -/* BDDE54 80240CA4 AFB40040 */ sw $s4, 0x40($sp) -/* BDDE58 80240CA8 AFB20038 */ sw $s2, 0x38($sp) -/* BDDE5C 80240CAC AFB10034 */ sw $s1, 0x34($sp) -/* BDDE60 80240CB0 AFB00030 */ sw $s0, 0x30($sp) -/* BDDE64 80240CB4 8E720148 */ lw $s2, 0x148($s3) -/* BDDE68 80240CB8 86440008 */ lh $a0, 8($s2) -/* BDDE6C 80240CBC 0C00EABB */ jal get_npc_unsafe -/* BDDE70 80240CC0 00A0882D */ daddu $s1, $a1, $zero -/* BDDE74 80240CC4 0260202D */ daddu $a0, $s3, $zero -/* BDDE78 80240CC8 8E70000C */ lw $s0, 0xc($s3) -/* BDDE7C 80240CCC 0040A82D */ daddu $s5, $v0, $zero -/* BDDE80 80240CD0 8E050000 */ lw $a1, ($s0) -/* BDDE84 80240CD4 0C0B1EAF */ jal get_variable -/* BDDE88 80240CD8 26100004 */ addiu $s0, $s0, 4 -/* BDDE8C 80240CDC 0260202D */ daddu $a0, $s3, $zero -/* BDDE90 80240CE0 8E050000 */ lw $a1, ($s0) -/* BDDE94 80240CE4 0C0B1EAF */ jal get_variable -/* BDDE98 80240CE8 0040A02D */ daddu $s4, $v0, $zero -/* BDDE9C 80240CEC AE420094 */ sw $v0, 0x94($s2) -/* BDDEA0 80240CF0 AFA00010 */ sw $zero, 0x10($sp) -/* BDDEA4 80240CF4 8E4200D0 */ lw $v0, 0xd0($s2) -/* BDDEA8 80240CF8 8C420030 */ lw $v0, 0x30($v0) -/* BDDEAC 80240CFC AFA20014 */ sw $v0, 0x14($sp) -/* BDDEB0 80240D00 8E4200D0 */ lw $v0, 0xd0($s2) -/* BDDEB4 80240D04 8C42001C */ lw $v0, 0x1c($v0) -/* BDDEB8 80240D08 AFA20018 */ sw $v0, 0x18($sp) -/* BDDEBC 80240D0C 8E4200D0 */ lw $v0, 0xd0($s2) -/* BDDEC0 80240D10 8C420024 */ lw $v0, 0x24($v0) -/* BDDEC4 80240D14 AFA2001C */ sw $v0, 0x1c($sp) -/* BDDEC8 80240D18 8E4200D0 */ lw $v0, 0xd0($s2) -/* BDDECC 80240D1C 8C420028 */ lw $v0, 0x28($v0) -/* BDDED0 80240D20 AFA20020 */ sw $v0, 0x20($sp) -/* BDDED4 80240D24 8E4200D0 */ lw $v0, 0xd0($s2) -/* BDDED8 80240D28 3C014220 */ lui $at, 0x4220 -/* BDDEDC 80240D2C 44810000 */ mtc1 $at, $f0 -/* BDDEE0 80240D30 8C42002C */ lw $v0, 0x2c($v0) -/* BDDEE4 80240D34 27B00010 */ addiu $s0, $sp, 0x10 -/* BDDEE8 80240D38 E7A00028 */ swc1 $f0, 0x28($sp) -/* BDDEEC 80240D3C A7A0002C */ sh $zero, 0x2c($sp) -/* BDDEF0 80240D40 12200012 */ beqz $s1, .L80240D8C -/* BDDEF4 80240D44 AFA20024 */ sw $v0, 0x24($sp) -/* BDDEF8 80240D48 AE600070 */ sw $zero, 0x70($s3) -/* BDDEFC 80240D4C 8EA30000 */ lw $v1, ($s5) -/* BDDF00 80240D50 2402F7FF */ addiu $v0, $zero, -0x801 -/* BDDF04 80240D54 A6A0008E */ sh $zero, 0x8e($s5) -/* BDDF08 80240D58 00621824 */ and $v1, $v1, $v0 -/* BDDF0C 80240D5C AEA30000 */ sw $v1, ($s5) -/* BDDF10 80240D60 8E4200D0 */ lw $v0, 0xd0($s2) -/* BDDF14 80240D64 8C420034 */ lw $v0, 0x34($v0) -/* BDDF18 80240D68 54400005 */ bnel $v0, $zero, .L80240D80 -/* BDDF1C 80240D6C 2402FDFF */ addiu $v0, $zero, -0x201 -/* BDDF20 80240D70 34620200 */ ori $v0, $v1, 0x200 -/* BDDF24 80240D74 2403FFF7 */ addiu $v1, $zero, -9 -/* BDDF28 80240D78 08090362 */ j .L80240D88 -/* BDDF2C 80240D7C 00431024 */ and $v0, $v0, $v1 -.L80240D80: -/* BDDF30 80240D80 00621024 */ and $v0, $v1, $v0 -/* BDDF34 80240D84 34420008 */ ori $v0, $v0, 8 -.L80240D88: -/* BDDF38 80240D88 AEA20000 */ sw $v0, ($s5) -.L80240D8C: -/* BDDF3C 80240D8C 8E4300B0 */ lw $v1, 0xb0($s2) -/* BDDF40 80240D90 30620004 */ andi $v0, $v1, 4 -/* BDDF44 80240D94 10400007 */ beqz $v0, .L80240DB4 -/* BDDF48 80240D98 00000000 */ nop -/* BDDF4C 80240D9C 824200B4 */ lb $v0, 0xb4($s2) -/* BDDF50 80240DA0 14400086 */ bnez $v0, .L80240FBC -/* BDDF54 80240DA4 0000102D */ daddu $v0, $zero, $zero -/* BDDF58 80240DA8 2402FFFB */ addiu $v0, $zero, -5 -/* BDDF5C 80240DAC 00621024 */ and $v0, $v1, $v0 -/* BDDF60 80240DB0 AE4200B0 */ sw $v0, 0xb0($s2) -.L80240DB4: -/* BDDF64 80240DB4 8E620070 */ lw $v0, 0x70($s3) -/* BDDF68 80240DB8 2442FFF4 */ addiu $v0, $v0, -0xc -/* BDDF6C 80240DBC 2C420003 */ sltiu $v0, $v0, 3 -/* BDDF70 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* BDDF74 80240DC4 0260202D */ daddu $a0, $s3, $zero -/* BDDF78 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* BDDF7C 80240DCC 0C090000 */ jal func_80240000 -/* BDDF80 80240DD0 0200302D */ daddu $a2, $s0, $zero -/* BDDF84 80240DD4 10400002 */ beqz $v0, .L80240DE0 -/* BDDF88 80240DD8 24020014 */ addiu $v0, $zero, 0x14 -/* BDDF8C 80240DDC AE620070 */ sw $v0, 0x70($s3) -.L80240DE0: -/* BDDF90 80240DE0 8E630070 */ lw $v1, 0x70($s3) -/* BDDF94 80240DE4 2C620035 */ sltiu $v0, $v1, 0x35 -/* BDDF98 80240DE8 10400073 */ beqz $v0, .L80240FB8 -/* BDDF9C 80240DEC 00031080 */ sll $v0, $v1, 2 -/* BDDFA0 80240DF0 3C018024 */ lui $at, 0x8024 -/* BDDFA4 80240DF4 00220821 */ addu $at, $at, $v0 -/* BDDFA8 80240DF8 8C221B08 */ lw $v0, 0x1b08($at) -/* BDDFAC 80240DFC 00400008 */ jr $v0 -/* BDDFB0 80240E00 00000000 */ nop -/* BDDFB4 80240E04 0260202D */ daddu $a0, $s3, $zero -/* BDDFB8 80240E08 0280282D */ daddu $a1, $s4, $zero -/* BDDFBC 80240E0C 0C090058 */ jal func_80240160 -/* BDDFC0 80240E10 0200302D */ daddu $a2, $s0, $zero -/* BDDFC4 80240E14 0260202D */ daddu $a0, $s3, $zero -/* BDDFC8 80240E18 0280282D */ daddu $a1, $s4, $zero -/* BDDFCC 80240E1C 0C090075 */ jal func_802401D4 -/* BDDFD0 80240E20 0200302D */ daddu $a2, $s0, $zero -/* BDDFD4 80240E24 8E630070 */ lw $v1, 0x70($s3) -/* BDDFD8 80240E28 24020002 */ addiu $v0, $zero, 2 -/* BDDFDC 80240E2C 14620063 */ bne $v1, $v0, .L80240FBC -/* BDDFE0 80240E30 0000102D */ daddu $v0, $zero, $zero -/* BDDFE4 80240E34 0260202D */ daddu $a0, $s3, $zero -/* BDDFE8 80240E38 0280282D */ daddu $a1, $s4, $zero -/* BDDFEC 80240E3C 0C0900C1 */ jal func_80240304 -/* BDDFF0 80240E40 0200302D */ daddu $a2, $s0, $zero -/* BDDFF4 80240E44 8E630070 */ lw $v1, 0x70($s3) -/* BDDFF8 80240E48 24020003 */ addiu $v0, $zero, 3 -/* BDDFFC 80240E4C 1462005B */ bne $v1, $v0, .L80240FBC -/* BDE000 80240E50 0000102D */ daddu $v0, $zero, $zero -/* BDE004 80240E54 0260202D */ daddu $a0, $s3, $zero -/* BDE008 80240E58 0280282D */ daddu $a1, $s4, $zero -/* BDE00C 80240E5C 0C0900E8 */ jal func_802403A0 -/* BDE010 80240E60 0200302D */ daddu $a2, $s0, $zero -/* BDE014 80240E64 8E630070 */ lw $v1, 0x70($s3) -/* BDE018 80240E68 24020004 */ addiu $v0, $zero, 4 -/* BDE01C 80240E6C 14620053 */ bne $v1, $v0, .L80240FBC -/* BDE020 80240E70 0000102D */ daddu $v0, $zero, $zero -/* BDE024 80240E74 0260202D */ daddu $a0, $s3, $zero -/* BDE028 80240E78 0280282D */ daddu $a1, $s4, $zero -/* BDE02C 80240E7C 0C09010A */ jal func_80240428 -/* BDE030 80240E80 0200302D */ daddu $a2, $s0, $zero -/* BDE034 80240E84 0260202D */ daddu $a0, $s3, $zero -/* BDE038 80240E88 0280282D */ daddu $a1, $s4, $zero -/* BDE03C 80240E8C 0C090134 */ jal func_802404D0 -/* BDE040 80240E90 0200302D */ daddu $a2, $s0, $zero -/* BDE044 80240E94 080903EF */ j .L80240FBC -/* BDE048 80240E98 0000102D */ daddu $v0, $zero, $zero -/* BDE04C 80240E9C 0260202D */ daddu $a0, $s3, $zero -/* BDE050 80240EA0 0280282D */ daddu $a1, $s4, $zero -/* BDE054 80240EA4 0C0127DF */ jal func_80049F7C -/* BDE058 80240EA8 0200302D */ daddu $a2, $s0, $zero -/* BDE05C 80240EAC 8E630070 */ lw $v1, 0x70($s3) -/* BDE060 80240EB0 2402000D */ addiu $v0, $zero, 0xd -/* BDE064 80240EB4 14620041 */ bne $v1, $v0, .L80240FBC -/* BDE068 80240EB8 0000102D */ daddu $v0, $zero, $zero -/* BDE06C 80240EBC 0260202D */ daddu $a0, $s3, $zero -/* BDE070 80240EC0 0280282D */ daddu $a1, $s4, $zero -/* BDE074 80240EC4 0C012849 */ jal func_8004A124 -/* BDE078 80240EC8 0200302D */ daddu $a2, $s0, $zero -/* BDE07C 80240ECC 8E630070 */ lw $v1, 0x70($s3) -/* BDE080 80240ED0 2402000E */ addiu $v0, $zero, 0xe -/* BDE084 80240ED4 14620039 */ bne $v1, $v0, .L80240FBC -/* BDE088 80240ED8 0000102D */ daddu $v0, $zero, $zero -/* BDE08C 80240EDC 96A2008E */ lhu $v0, 0x8e($s5) -/* BDE090 80240EE0 2442FFFF */ addiu $v0, $v0, -1 -/* BDE094 80240EE4 A6A2008E */ sh $v0, 0x8e($s5) -/* BDE098 80240EE8 00021400 */ sll $v0, $v0, 0x10 -/* BDE09C 80240EEC 14400033 */ bnez $v0, .L80240FBC -/* BDE0A0 80240EF0 0000102D */ daddu $v0, $zero, $zero -/* BDE0A4 80240EF4 24020028 */ addiu $v0, $zero, 0x28 -/* BDE0A8 80240EF8 080903EE */ j .L80240FB8 -/* BDE0AC 80240EFC AE620070 */ sw $v0, 0x70($s3) -/* BDE0B0 80240F00 0260202D */ daddu $a0, $s3, $zero -/* BDE0B4 80240F04 0280282D */ daddu $a1, $s4, $zero -/* BDE0B8 80240F08 0C090191 */ jal func_80240644 -/* BDE0BC 80240F0C 0200302D */ daddu $a2, $s0, $zero -/* BDE0C0 80240F10 0260202D */ daddu $a0, $s3, $zero -/* BDE0C4 80240F14 0280282D */ daddu $a1, $s4, $zero -/* BDE0C8 80240F18 0C0901A5 */ jal func_80240694 -/* BDE0CC 80240F1C 0200302D */ daddu $a2, $s0, $zero -/* BDE0D0 80240F20 080903EF */ j .L80240FBC -/* BDE0D4 80240F24 0000102D */ daddu $v0, $zero, $zero -/* BDE0D8 80240F28 0260202D */ daddu $a0, $s3, $zero -/* BDE0DC 80240F2C 0280282D */ daddu $a1, $s4, $zero -/* BDE0E0 80240F30 0C09020D */ jal func_80240834 -/* BDE0E4 80240F34 0200302D */ daddu $a2, $s0, $zero -/* BDE0E8 80240F38 080903EF */ j .L80240FBC -/* BDE0EC 80240F3C 0000102D */ daddu $v0, $zero, $zero -/* BDE0F0 80240F40 0260202D */ daddu $a0, $s3, $zero -/* BDE0F4 80240F44 0280282D */ daddu $a1, $s4, $zero -/* BDE0F8 80240F48 0C090261 */ jal func_80240984 -/* BDE0FC 80240F4C 0200302D */ daddu $a2, $s0, $zero -/* BDE100 80240F50 8E630070 */ lw $v1, 0x70($s3) -/* BDE104 80240F54 24020029 */ addiu $v0, $zero, 0x29 -/* BDE108 80240F58 14620018 */ bne $v1, $v0, .L80240FBC -/* BDE10C 80240F5C 0000102D */ daddu $v0, $zero, $zero -/* BDE110 80240F60 0260202D */ daddu $a0, $s3, $zero -/* BDE114 80240F64 0280282D */ daddu $a1, $s4, $zero -/* BDE118 80240F68 0C09028C */ jal func_80240A30 -/* BDE11C 80240F6C 0200302D */ daddu $a2, $s0, $zero -/* BDE120 80240F70 080903EF */ j .L80240FBC -/* BDE124 80240F74 0000102D */ daddu $v0, $zero, $zero -/* BDE128 80240F78 0260202D */ daddu $a0, $s3, $zero -/* BDE12C 80240F7C 0280282D */ daddu $a1, $s4, $zero -/* BDE130 80240F80 0C0902DA */ jal func_80240B68 -/* BDE134 80240F84 0200302D */ daddu $a2, $s0, $zero -/* BDE138 80240F88 0260202D */ daddu $a0, $s3, $zero -/* BDE13C 80240F8C 0280282D */ daddu $a1, $s4, $zero -/* BDE140 80240F90 0C0902F9 */ jal func_80240BE4 -/* BDE144 80240F94 0200302D */ daddu $a2, $s0, $zero -/* BDE148 80240F98 8E630070 */ lw $v1, 0x70($s3) -/* BDE14C 80240F9C 24020034 */ addiu $v0, $zero, 0x34 -/* BDE150 80240FA0 14620006 */ bne $v1, $v0, .L80240FBC -/* BDE154 80240FA4 0000102D */ daddu $v0, $zero, $zero -/* BDE158 80240FA8 0260202D */ daddu $a0, $s3, $zero -/* BDE15C 80240FAC 0280282D */ daddu $a1, $s4, $zero -/* BDE160 80240FB0 0C090313 */ jal func_80240C4C -/* BDE164 80240FB4 0200302D */ daddu $a2, $s0, $zero -.L80240FB8: -/* BDE168 80240FB8 0000102D */ daddu $v0, $zero, $zero -.L80240FBC: -/* BDE16C 80240FBC 8FBF0048 */ lw $ra, 0x48($sp) -/* BDE170 80240FC0 8FB50044 */ lw $s5, 0x44($sp) -/* BDE174 80240FC4 8FB40040 */ lw $s4, 0x40($sp) -/* BDE178 80240FC8 8FB3003C */ lw $s3, 0x3c($sp) -/* BDE17C 80240FCC 8FB20038 */ lw $s2, 0x38($sp) -/* BDE180 80240FD0 8FB10034 */ lw $s1, 0x34($sp) -/* BDE184 80240FD4 8FB00030 */ lw $s0, 0x30($sp) -/* BDE188 80240FD8 03E00008 */ jr $ra -/* BDE18C 80240FDC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_80240158_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_80240158_BDED90.s deleted file mode 100644 index 9e98c73e50..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_80240158_BDED90.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_BDEEE8 -/* BDEEE8 80240158 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* BDEEEC 8024015C AFB20038 */ sw $s2, 0x38($sp) -/* BDEEF0 80240160 0080902D */ daddu $s2, $a0, $zero -/* BDEEF4 80240164 AFBF0044 */ sw $ra, 0x44($sp) -/* BDEEF8 80240168 AFB40040 */ sw $s4, 0x40($sp) -/* BDEEFC 8024016C AFB3003C */ sw $s3, 0x3c($sp) -/* BDEF00 80240170 AFB10034 */ sw $s1, 0x34($sp) -/* BDEF04 80240174 AFB00030 */ sw $s0, 0x30($sp) -/* BDEF08 80240178 F7B60050 */ sdc1 $f22, 0x50($sp) -/* BDEF0C 8024017C F7B40048 */ sdc1 $f20, 0x48($sp) -/* BDEF10 80240180 8E510148 */ lw $s1, 0x148($s2) -/* BDEF14 80240184 00A0982D */ daddu $s3, $a1, $zero -/* BDEF18 80240188 86240008 */ lh $a0, 8($s1) -/* BDEF1C 8024018C 0C00EABB */ jal get_npc_unsafe -/* BDEF20 80240190 00C0A02D */ daddu $s4, $a2, $zero -/* BDEF24 80240194 8E630014 */ lw $v1, 0x14($s3) -/* BDEF28 80240198 04600030 */ bltz $v1, .L8024025C -/* BDEF2C 8024019C 0040802D */ daddu $s0, $v0, $zero -/* BDEF30 802401A0 8E420074 */ lw $v0, 0x74($s2) -/* BDEF34 802401A4 1C40002C */ bgtz $v0, .L80240258 -/* BDEF38 802401A8 2442FFFF */ addiu $v0, $v0, -1 -/* BDEF3C 802401AC 0280202D */ daddu $a0, $s4, $zero -/* BDEF40 802401B0 AE430074 */ sw $v1, 0x74($s2) -/* BDEF44 802401B4 AFA00010 */ sw $zero, 0x10($sp) -/* BDEF48 802401B8 8E66000C */ lw $a2, 0xc($s3) -/* BDEF4C 802401BC 8E670010 */ lw $a3, 0x10($s3) -/* BDEF50 802401C0 0C01242D */ jal func_800490B4 -/* BDEF54 802401C4 0220282D */ daddu $a1, $s1, $zero -/* BDEF58 802401C8 10400021 */ beqz $v0, .L80240250 -/* BDEF5C 802401CC 0000202D */ daddu $a0, $zero, $zero -/* BDEF60 802401D0 0200282D */ daddu $a1, $s0, $zero -/* BDEF64 802401D4 0000302D */ daddu $a2, $zero, $zero -/* BDEF68 802401D8 860300A8 */ lh $v1, 0xa8($s0) -/* BDEF6C 802401DC 3C013F80 */ lui $at, 0x3f80 -/* BDEF70 802401E0 44810000 */ mtc1 $at, $f0 -/* BDEF74 802401E4 3C014000 */ lui $at, 0x4000 -/* BDEF78 802401E8 44811000 */ mtc1 $at, $f2 -/* BDEF7C 802401EC 3C01C1A0 */ lui $at, 0xc1a0 -/* BDEF80 802401F0 44812000 */ mtc1 $at, $f4 -/* BDEF84 802401F4 2402000F */ addiu $v0, $zero, 0xf -/* BDEF88 802401F8 AFA2001C */ sw $v0, 0x1c($sp) -/* BDEF8C 802401FC 44833000 */ mtc1 $v1, $f6 -/* BDEF90 80240200 00000000 */ nop -/* BDEF94 80240204 468031A0 */ cvt.s.w $f6, $f6 -/* BDEF98 80240208 44073000 */ mfc1 $a3, $f6 -/* BDEF9C 8024020C 27A20028 */ addiu $v0, $sp, 0x28 -/* BDEFA0 80240210 AFA20020 */ sw $v0, 0x20($sp) -/* BDEFA4 80240214 E7A00010 */ swc1 $f0, 0x10($sp) -/* BDEFA8 80240218 E7A20014 */ swc1 $f2, 0x14($sp) -/* BDEFAC 8024021C 0C01BFA4 */ jal fx_emote -/* BDEFB0 80240220 E7A40018 */ swc1 $f4, 0x18($sp) -/* BDEFB4 80240224 0200202D */ daddu $a0, $s0, $zero -/* BDEFB8 80240228 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BDEFBC 8024022C 0C012530 */ jal func_800494C0 -/* BDEFC0 80240230 3C060020 */ lui $a2, 0x20 -/* BDEFC4 80240234 8E220018 */ lw $v0, 0x18($s1) -/* BDEFC8 80240238 9442002A */ lhu $v0, 0x2a($v0) -/* BDEFCC 8024023C 30420001 */ andi $v0, $v0, 1 -/* BDEFD0 80240240 14400064 */ bnez $v0, .L802403D4 -/* BDEFD4 80240244 2402000A */ addiu $v0, $zero, 0xa -/* BDEFD8 80240248 080900F5 */ j .L802403D4 -/* BDEFDC 8024024C 2402000C */ addiu $v0, $zero, 0xc -.L80240250: -/* BDEFE0 80240250 8E420074 */ lw $v0, 0x74($s2) -/* BDEFE4 80240254 2442FFFF */ addiu $v0, $v0, -1 -.L80240258: -/* BDEFE8 80240258 AE420074 */ sw $v0, 0x74($s2) -.L8024025C: -/* BDEFEC 8024025C 8602008C */ lh $v0, 0x8c($s0) -/* BDEFF0 80240260 1440005D */ bnez $v0, .L802403D8 -/* BDEFF4 80240264 00000000 */ nop -/* BDEFF8 80240268 C6000018 */ lwc1 $f0, 0x18($s0) -/* BDEFFC 8024026C 3C014010 */ lui $at, 0x4010 -/* BDF000 80240270 44811800 */ mtc1 $at, $f3 -/* BDF004 80240274 44801000 */ mtc1 $zero, $f2 -/* BDF008 80240278 46000021 */ cvt.d.s $f0, $f0 -/* BDF00C 8024027C 4622003C */ c.lt.d $f0, $f2 -/* BDF010 80240280 00000000 */ nop -/* BDF014 80240284 45000003 */ bc1f .L80240294 -/* BDF018 80240288 0200202D */ daddu $a0, $s0, $zero -/* BDF01C 8024028C 080900A6 */ j .L80240298 -/* BDF020 80240290 0000282D */ daddu $a1, $zero, $zero -.L80240294: -/* BDF024 80240294 24050001 */ addiu $a1, $zero, 1 -.L80240298: -/* BDF028 80240298 0C00F598 */ jal func_8003D660 -/* BDF02C 8024029C 00000000 */ nop -/* BDF030 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BDF034 802402A4 8E430078 */ lw $v1, 0x78($s2) -/* BDF038 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BDF03C 802402AC 00031040 */ sll $v0, $v1, 1 -/* BDF040 802402B0 00431021 */ addu $v0, $v0, $v1 -/* BDF044 802402B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* BDF048 802402B8 00021080 */ sll $v0, $v0, 2 -/* BDF04C 802402BC 00431021 */ addu $v0, $v0, $v1 -/* BDF050 802402C0 C4560004 */ lwc1 $f22, 4($v0) -/* BDF054 802402C4 4680B5A0 */ cvt.s.w $f22, $f22 -/* BDF058 802402C8 C454000C */ lwc1 $f20, 0xc($v0) -/* BDF05C 802402CC 4680A520 */ cvt.s.w $f20, $f20 -/* BDF060 802402D0 4406B000 */ mfc1 $a2, $f22 -/* BDF064 802402D4 4407A000 */ mfc1 $a3, $f20 -/* BDF068 802402D8 0C00A720 */ jal atan2 -/* BDF06C 802402DC 00000000 */ nop -/* BDF070 802402E0 8E050018 */ lw $a1, 0x18($s0) -/* BDF074 802402E4 44060000 */ mfc1 $a2, $f0 -/* BDF078 802402E8 0200202D */ daddu $a0, $s0, $zero -/* BDF07C 802402EC 0C00EA95 */ jal npc_move_heading -/* BDF080 802402F0 AE06000C */ sw $a2, 0xc($s0) -/* BDF084 802402F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BDF088 802402F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BDF08C 802402FC 4406B000 */ mfc1 $a2, $f22 -/* BDF090 80240300 4407A000 */ mfc1 $a3, $f20 -/* BDF094 80240304 0C00A7B5 */ jal dist2D -/* BDF098 80240308 00000000 */ nop -/* BDF09C 8024030C C6020018 */ lwc1 $f2, 0x18($s0) -/* BDF0A0 80240310 4602003E */ c.le.s $f0, $f2 -/* BDF0A4 80240314 00000000 */ nop -/* BDF0A8 80240318 4500002F */ bc1f .L802403D8 -/* BDF0AC 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BDF0B0 80240320 24020002 */ addiu $v0, $zero, 2 -/* BDF0B4 80240324 0C00A67F */ jal rand_int -/* BDF0B8 80240328 AE420070 */ sw $v0, 0x70($s2) -/* BDF0BC 8024032C 3C035555 */ lui $v1, 0x5555 -/* BDF0C0 80240330 34635556 */ ori $v1, $v1, 0x5556 -/* BDF0C4 80240334 00430018 */ mult $v0, $v1 -/* BDF0C8 80240338 000227C3 */ sra $a0, $v0, 0x1f -/* BDF0CC 8024033C 00004010 */ mfhi $t0 -/* BDF0D0 80240340 01042023 */ subu $a0, $t0, $a0 -/* BDF0D4 80240344 00041840 */ sll $v1, $a0, 1 -/* BDF0D8 80240348 00641821 */ addu $v1, $v1, $a0 -/* BDF0DC 8024034C 00431023 */ subu $v0, $v0, $v1 -/* BDF0E0 80240350 24430002 */ addiu $v1, $v0, 2 -/* BDF0E4 80240354 AE430074 */ sw $v1, 0x74($s2) -/* BDF0E8 80240358 8E62002C */ lw $v0, 0x2c($s3) -/* BDF0EC 8024035C 18400009 */ blez $v0, .L80240384 -/* BDF0F0 80240360 24020004 */ addiu $v0, $zero, 4 -/* BDF0F4 80240364 8E620004 */ lw $v0, 4($s3) -/* BDF0F8 80240368 18400006 */ blez $v0, .L80240384 -/* BDF0FC 8024036C 24020004 */ addiu $v0, $zero, 4 -/* BDF100 80240370 8E620008 */ lw $v0, 8($s3) -/* BDF104 80240374 18400003 */ blez $v0, .L80240384 -/* BDF108 80240378 24020004 */ addiu $v0, $zero, 4 -/* BDF10C 8024037C 14600002 */ bnez $v1, .L80240388 -/* BDF110 80240380 00000000 */ nop -.L80240384: -/* BDF114 80240384 AE420070 */ sw $v0, 0x70($s2) -.L80240388: -/* BDF118 80240388 0C00A67F */ jal rand_int -/* BDF11C 8024038C 24042710 */ addiu $a0, $zero, 0x2710 -/* BDF120 80240390 3C0351EB */ lui $v1, 0x51eb -/* BDF124 80240394 3463851F */ ori $v1, $v1, 0x851f -/* BDF128 80240398 00430018 */ mult $v0, $v1 -/* BDF12C 8024039C 00021FC3 */ sra $v1, $v0, 0x1f -/* BDF130 802403A0 00004010 */ mfhi $t0 -/* BDF134 802403A4 00082143 */ sra $a0, $t0, 5 -/* BDF138 802403A8 00832023 */ subu $a0, $a0, $v1 -/* BDF13C 802403AC 00041840 */ sll $v1, $a0, 1 -/* BDF140 802403B0 00641821 */ addu $v1, $v1, $a0 -/* BDF144 802403B4 000318C0 */ sll $v1, $v1, 3 -/* BDF148 802403B8 00641821 */ addu $v1, $v1, $a0 -/* BDF14C 802403BC 00031880 */ sll $v1, $v1, 2 -/* BDF150 802403C0 8E640004 */ lw $a0, 4($s3) -/* BDF154 802403C4 00431023 */ subu $v0, $v0, $v1 -/* BDF158 802403C8 0044102A */ slt $v0, $v0, $a0 -/* BDF15C 802403CC 10400002 */ beqz $v0, .L802403D8 -/* BDF160 802403D0 24020004 */ addiu $v0, $zero, 4 -.L802403D4: -/* BDF164 802403D4 AE420070 */ sw $v0, 0x70($s2) -.L802403D8: -/* BDF168 802403D8 8FBF0044 */ lw $ra, 0x44($sp) -/* BDF16C 802403DC 8FB40040 */ lw $s4, 0x40($sp) -/* BDF170 802403E0 8FB3003C */ lw $s3, 0x3c($sp) -/* BDF174 802403E4 8FB20038 */ lw $s2, 0x38($sp) -/* BDF178 802403E8 8FB10034 */ lw $s1, 0x34($sp) -/* BDF17C 802403EC 8FB00030 */ lw $s0, 0x30($sp) -/* BDF180 802403F0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* BDF184 802403F4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* BDF188 802403F8 03E00008 */ jr $ra -/* BDF18C 802403FC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_80240400_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_80240400_BDED90.s deleted file mode 100644 index 6f1e670abb..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_80240400_BDED90.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_BDF190 -/* BDF190 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BDF194 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* BDF198 80240408 0080982D */ daddu $s3, $a0, $zero -/* BDF19C 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* BDF1A0 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* BDF1A4 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* BDF1A8 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* BDF1AC 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* BDF1B0 80240420 86440008 */ lh $a0, 8($s2) -/* BDF1B4 80240424 0C00EABB */ jal get_npc_unsafe -/* BDF1B8 80240428 00A0882D */ daddu $s1, $a1, $zero -/* BDF1BC 8024042C 8E240008 */ lw $a0, 8($s1) -/* BDF1C0 80240430 0040802D */ daddu $s0, $v0, $zero -/* BDF1C4 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* BDF1C8 80240438 00832021 */ addu $a0, $a0, $v1 -/* BDF1CC 8024043C 00042043 */ sra $a0, $a0, 1 -/* BDF1D0 80240440 0C00A67F */ jal rand_int -/* BDF1D4 80240444 24840001 */ addiu $a0, $a0, 1 -/* BDF1D8 80240448 8E230008 */ lw $v1, 8($s1) -/* BDF1DC 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* BDF1E0 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* BDF1E4 80240454 00651821 */ addu $v1, $v1, $a1 -/* BDF1E8 80240458 00031843 */ sra $v1, $v1, 1 -/* BDF1EC 8024045C 00621821 */ addu $v1, $v1, $v0 -/* BDF1F0 80240460 0C00A67F */ jal rand_int -/* BDF1F4 80240464 A603008E */ sh $v1, 0x8e($s0) -/* BDF1F8 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* BDF1FC 8024046C 44820000 */ mtc1 $v0, $f0 -/* BDF200 80240470 00000000 */ nop -/* BDF204 80240474 46800020 */ cvt.s.w $f0, $f0 -/* BDF208 80240478 46006300 */ add.s $f12, $f12, $f0 -/* BDF20C 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* BDF210 80240480 44810000 */ mtc1 $at, $f0 -/* BDF214 80240484 0C00A6C9 */ jal clamp_angle -/* BDF218 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* BDF21C 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* BDF220 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* BDF224 80240494 8C420000 */ lw $v0, ($v0) -/* BDF228 80240498 AE020028 */ sw $v0, 0x28($s0) -/* BDF22C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* BDF230 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* BDF234 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* BDF238 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* BDF23C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* BDF240 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* BDF244 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* BDF248 802404B8 03E00008 */ jr $ra -/* BDF24C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_802404C0_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_802404C0_BDED90.s deleted file mode 100644 index da82cfdae0..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_802404C0_BDED90.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_BDF250 -/* BDF250 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BDF254 802404C4 AFB40040 */ sw $s4, 0x40($sp) -/* BDF258 802404C8 0080A02D */ daddu $s4, $a0, $zero -/* BDF25C 802404CC AFBF0044 */ sw $ra, 0x44($sp) -/* BDF260 802404D0 AFB3003C */ sw $s3, 0x3c($sp) -/* BDF264 802404D4 AFB20038 */ sw $s2, 0x38($sp) -/* BDF268 802404D8 AFB10034 */ sw $s1, 0x34($sp) -/* BDF26C 802404DC AFB00030 */ sw $s0, 0x30($sp) -/* BDF270 802404E0 8E910148 */ lw $s1, 0x148($s4) -/* BDF274 802404E4 00A0902D */ daddu $s2, $a1, $zero -/* BDF278 802404E8 86240008 */ lh $a0, 8($s1) -/* BDF27C 802404EC 0C00EABB */ jal get_npc_unsafe -/* BDF280 802404F0 00C0982D */ daddu $s3, $a2, $zero -/* BDF284 802404F4 8E430014 */ lw $v1, 0x14($s2) -/* BDF288 802404F8 04600031 */ bltz $v1, .L802405C0 -/* BDF28C 802404FC 0040802D */ daddu $s0, $v0, $zero -/* BDF290 80240500 0260202D */ daddu $a0, $s3, $zero -/* BDF294 80240504 AFA00010 */ sw $zero, 0x10($sp) -/* BDF298 80240508 8E460024 */ lw $a2, 0x24($s2) -/* BDF29C 8024050C 8E470028 */ lw $a3, 0x28($s2) -/* BDF2A0 80240510 0C01242D */ jal func_800490B4 -/* BDF2A4 80240514 0220282D */ daddu $a1, $s1, $zero -/* BDF2A8 80240518 10400029 */ beqz $v0, .L802405C0 -/* BDF2AC 8024051C 0000202D */ daddu $a0, $zero, $zero -/* BDF2B0 80240520 0200282D */ daddu $a1, $s0, $zero -/* BDF2B4 80240524 0000302D */ daddu $a2, $zero, $zero -/* BDF2B8 80240528 860300A8 */ lh $v1, 0xa8($s0) -/* BDF2BC 8024052C 3C013F80 */ lui $at, 0x3f80 -/* BDF2C0 80240530 44810000 */ mtc1 $at, $f0 -/* BDF2C4 80240534 3C014000 */ lui $at, 0x4000 -/* BDF2C8 80240538 44811000 */ mtc1 $at, $f2 -/* BDF2CC 8024053C 3C01C1A0 */ lui $at, 0xc1a0 -/* BDF2D0 80240540 44812000 */ mtc1 $at, $f4 -/* BDF2D4 80240544 2402000F */ addiu $v0, $zero, 0xf -/* BDF2D8 80240548 AFA2001C */ sw $v0, 0x1c($sp) -/* BDF2DC 8024054C 44833000 */ mtc1 $v1, $f6 -/* BDF2E0 80240550 00000000 */ nop -/* BDF2E4 80240554 468031A0 */ cvt.s.w $f6, $f6 -/* BDF2E8 80240558 44073000 */ mfc1 $a3, $f6 -/* BDF2EC 8024055C 27A20028 */ addiu $v0, $sp, 0x28 -/* BDF2F0 80240560 AFA20020 */ sw $v0, 0x20($sp) -/* BDF2F4 80240564 E7A00010 */ swc1 $f0, 0x10($sp) -/* BDF2F8 80240568 E7A20014 */ swc1 $f2, 0x14($sp) -/* BDF2FC 8024056C 0C01BFA4 */ jal fx_emote -/* BDF300 80240570 E7A40018 */ swc1 $f4, 0x18($sp) -/* BDF304 80240574 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BDF308 80240578 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BDF30C 8024057C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BDF310 80240580 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BDF314 80240584 8C460028 */ lw $a2, 0x28($v0) -/* BDF318 80240588 0C00A720 */ jal atan2 -/* BDF31C 8024058C 8C470030 */ lw $a3, 0x30($v0) -/* BDF320 80240590 0200202D */ daddu $a0, $s0, $zero -/* BDF324 80240594 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BDF328 80240598 3C060020 */ lui $a2, 0x20 -/* BDF32C 8024059C 0C012530 */ jal func_800494C0 -/* BDF330 802405A0 E480000C */ swc1 $f0, 0xc($a0) -/* BDF334 802405A4 8E220018 */ lw $v0, 0x18($s1) -/* BDF338 802405A8 9442002A */ lhu $v0, 0x2a($v0) -/* BDF33C 802405AC 30420001 */ andi $v0, $v0, 1 -/* BDF340 802405B0 14400029 */ bnez $v0, .L80240658 -/* BDF344 802405B4 2402000A */ addiu $v0, $zero, 0xa -/* BDF348 802405B8 08090196 */ j .L80240658 -/* BDF34C 802405BC 2402000C */ addiu $v0, $zero, 0xc -.L802405C0: -/* BDF350 802405C0 8602008C */ lh $v0, 0x8c($s0) -/* BDF354 802405C4 14400025 */ bnez $v0, .L8024065C -/* BDF358 802405C8 00000000 */ nop -/* BDF35C 802405CC 9602008E */ lhu $v0, 0x8e($s0) -/* BDF360 802405D0 2442FFFF */ addiu $v0, $v0, -1 -/* BDF364 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* BDF368 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* BDF36C 802405DC 1440001F */ bnez $v0, .L8024065C -/* BDF370 802405E0 00000000 */ nop -/* BDF374 802405E4 8E820074 */ lw $v0, 0x74($s4) -/* BDF378 802405E8 2442FFFF */ addiu $v0, $v0, -1 -/* BDF37C 802405EC 10400019 */ beqz $v0, .L80240654 -/* BDF380 802405F0 AE820074 */ sw $v0, 0x74($s4) -/* BDF384 802405F4 8E220018 */ lw $v0, 0x18($s1) -/* BDF388 802405F8 9442002A */ lhu $v0, 0x2a($v0) -/* BDF38C 802405FC 30420010 */ andi $v0, $v0, 0x10 -/* BDF390 80240600 14400007 */ bnez $v0, .L80240620 -/* BDF394 80240604 00000000 */ nop -/* BDF398 80240608 C600000C */ lwc1 $f0, 0xc($s0) -/* BDF39C 8024060C 3C014334 */ lui $at, 0x4334 -/* BDF3A0 80240610 44816000 */ mtc1 $at, $f12 -/* BDF3A4 80240614 0C00A6C9 */ jal clamp_angle -/* BDF3A8 80240618 460C0300 */ add.s $f12, $f0, $f12 -/* BDF3AC 8024061C E600000C */ swc1 $f0, 0xc($s0) -.L80240620: -/* BDF3B0 80240620 8E440008 */ lw $a0, 8($s2) -/* BDF3B4 80240624 000417C2 */ srl $v0, $a0, 0x1f -/* BDF3B8 80240628 00822021 */ addu $a0, $a0, $v0 -/* BDF3BC 8024062C 00042043 */ sra $a0, $a0, 1 -/* BDF3C0 80240630 0C00A67F */ jal rand_int -/* BDF3C4 80240634 24840001 */ addiu $a0, $a0, 1 -/* BDF3C8 80240638 8E430008 */ lw $v1, 8($s2) -/* BDF3CC 8024063C 000327C2 */ srl $a0, $v1, 0x1f -/* BDF3D0 80240640 00641821 */ addu $v1, $v1, $a0 -/* BDF3D4 80240644 00031843 */ sra $v1, $v1, 1 -/* BDF3D8 80240648 00621821 */ addu $v1, $v1, $v0 -/* BDF3DC 8024064C 08090197 */ j .L8024065C -/* BDF3E0 80240650 A603008E */ sh $v1, 0x8e($s0) -.L80240654: -/* BDF3E4 80240654 24020004 */ addiu $v0, $zero, 4 -.L80240658: -/* BDF3E8 80240658 AE820070 */ sw $v0, 0x70($s4) -.L8024065C: -/* BDF3EC 8024065C 8FBF0044 */ lw $ra, 0x44($sp) -/* BDF3F0 80240660 8FB40040 */ lw $s4, 0x40($sp) -/* BDF3F4 80240664 8FB3003C */ lw $s3, 0x3c($sp) -/* BDF3F8 80240668 8FB20038 */ lw $s2, 0x38($sp) -/* BDF3FC 8024066C 8FB10034 */ lw $s1, 0x34($sp) -/* BDF400 80240670 8FB00030 */ lw $s0, 0x30($sp) -/* BDF404 80240674 03E00008 */ jr $ra -/* BDF408 80240678 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_8024067C_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_8024067C_BDED90.s deleted file mode 100644 index 85bf04de01..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_8024067C_BDED90.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024067C_BDF40C -/* BDF40C 8024067C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BDF410 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* BDF414 80240684 0080882D */ daddu $s1, $a0, $zero -/* BDF418 80240688 AFBF001C */ sw $ra, 0x1c($sp) -/* BDF41C 8024068C AFB20018 */ sw $s2, 0x18($sp) -/* BDF420 80240690 AFB00010 */ sw $s0, 0x10($sp) -/* BDF424 80240694 8E300148 */ lw $s0, 0x148($s1) -/* BDF428 80240698 86040008 */ lh $a0, 8($s0) -/* BDF42C 8024069C 0C00EABB */ jal get_npc_unsafe -/* BDF430 802406A0 00A0902D */ daddu $s2, $a1, $zero -/* BDF434 802406A4 8E230078 */ lw $v1, 0x78($s1) -/* BDF438 802406A8 24630001 */ addiu $v1, $v1, 1 -/* BDF43C 802406AC AE230078 */ sw $v1, 0x78($s1) -/* BDF440 802406B0 8E0400D0 */ lw $a0, 0xd0($s0) -/* BDF444 802406B4 8C840000 */ lw $a0, ($a0) -/* BDF448 802406B8 0064182A */ slt $v1, $v1, $a0 -/* BDF44C 802406BC 14600002 */ bnez $v1, .L802406C8 -/* BDF450 802406C0 0040282D */ daddu $a1, $v0, $zero -/* BDF454 802406C4 AE200078 */ sw $zero, 0x78($s1) -.L802406C8: -/* BDF458 802406C8 8E0200CC */ lw $v0, 0xcc($s0) -/* BDF45C 802406CC 8C420004 */ lw $v0, 4($v0) -/* BDF460 802406D0 ACA20028 */ sw $v0, 0x28($a1) -/* BDF464 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* BDF468 802406D8 8C42007C */ lw $v0, 0x7c($v0) -/* BDF46C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* BDF470 802406E0 00000000 */ nop -/* BDF474 802406E4 C6400000 */ lwc1 $f0, ($s2) -/* BDF478 802406E8 080901C4 */ j .L80240710 -/* BDF47C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) -.L802406F0: -/* BDF480 802406F0 3C018024 */ lui $at, 0x8024 -/* BDF484 802406F4 D4224868 */ ldc1 $f2, 0x4868($at) -/* BDF488 802406F8 44820000 */ mtc1 $v0, $f0 -/* BDF48C 802406FC 00000000 */ nop -/* BDF490 80240700 46800021 */ cvt.d.w $f0, $f0 -/* BDF494 80240704 46220003 */ div.d $f0, $f0, $f2 -/* BDF498 80240708 46200020 */ cvt.s.d $f0, $f0 -/* BDF49C 8024070C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240710: -/* BDF4A0 80240710 24020001 */ addiu $v0, $zero, 1 -/* BDF4A4 80240714 AE220070 */ sw $v0, 0x70($s1) -/* BDF4A8 80240718 8FBF001C */ lw $ra, 0x1c($sp) -/* BDF4AC 8024071C 8FB20018 */ lw $s2, 0x18($sp) -/* BDF4B0 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* BDF4B4 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* BDF4B8 80240728 03E00008 */ jr $ra -/* BDF4BC 8024072C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_80240730_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_80240730_BDED90.s deleted file mode 100644 index 16e0c0b97b..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_80240730_BDED90.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_BDF4C0 -/* BDF4C0 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BDF4C4 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* BDF4C8 80240738 0080882D */ daddu $s1, $a0, $zero -/* BDF4CC 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* BDF4D0 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* BDF4D4 80240744 8E300148 */ lw $s0, 0x148($s1) -/* BDF4D8 80240748 0C00EABB */ jal get_npc_unsafe -/* BDF4DC 8024074C 86040008 */ lh $a0, 8($s0) -/* BDF4E0 80240750 8E0300CC */ lw $v1, 0xcc($s0) -/* BDF4E4 80240754 3C014120 */ lui $at, 0x4120 -/* BDF4E8 80240758 44812000 */ mtc1 $at, $f4 -/* BDF4EC 8024075C 3C014000 */ lui $at, 0x4000 -/* BDF4F0 80240760 44810000 */ mtc1 $at, $f0 -/* BDF4F4 80240764 C442003C */ lwc1 $f2, 0x3c($v0) -/* BDF4F8 80240768 8C640010 */ lw $a0, 0x10($v1) -/* BDF4FC 8024076C 8C430000 */ lw $v1, ($v0) -/* BDF500 80240770 E444001C */ swc1 $f4, 0x1c($v0) -/* BDF504 80240774 E4400014 */ swc1 $f0, 0x14($v0) -/* BDF508 80240778 E4420064 */ swc1 $f2, 0x64($v0) -/* BDF50C 8024077C 34630800 */ ori $v1, $v1, 0x800 -/* BDF510 80240780 AC430000 */ sw $v1, ($v0) -/* BDF514 80240784 AC440028 */ sw $a0, 0x28($v0) -/* BDF518 80240788 2402000B */ addiu $v0, $zero, 0xb -/* BDF51C 8024078C AE220070 */ sw $v0, 0x70($s1) -/* BDF520 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* BDF524 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* BDF528 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* BDF52C 8024079C 03E00008 */ jr $ra -/* BDF530 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_802407A4_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_802407A4_BDED90.s deleted file mode 100644 index 4e7f57e80c..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_802407A4_BDED90.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4_BDF534 -/* BDF534 802407A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BDF538 802407A8 AFB00010 */ sw $s0, 0x10($sp) -/* BDF53C 802407AC 0080802D */ daddu $s0, $a0, $zero -/* BDF540 802407B0 AFBF0014 */ sw $ra, 0x14($sp) -/* BDF544 802407B4 8E020148 */ lw $v0, 0x148($s0) -/* BDF548 802407B8 0C00EABB */ jal get_npc_unsafe -/* BDF54C 802407BC 84440008 */ lh $a0, 8($v0) -/* BDF550 802407C0 0040202D */ daddu $a0, $v0, $zero -/* BDF554 802407C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* BDF558 802407C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* BDF55C 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* BDF560 802407D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* BDF564 802407D4 46040001 */ sub.s $f0, $f0, $f4 -/* BDF568 802407D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* BDF56C 802407DC 4602203C */ c.lt.s $f4, $f2 -/* BDF570 802407E0 E482003C */ swc1 $f2, 0x3c($a0) -/* BDF574 802407E4 45010009 */ bc1t .L8024080C -/* BDF578 802407E8 E480001C */ swc1 $f0, 0x1c($a0) -/* BDF57C 802407EC 8C820000 */ lw $v0, ($a0) -/* BDF580 802407F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* BDF584 802407F4 E484003C */ swc1 $f4, 0x3c($a0) -/* BDF588 802407F8 AC80001C */ sw $zero, 0x1c($a0) -/* BDF58C 802407FC 00431024 */ and $v0, $v0, $v1 -/* BDF590 80240800 AC820000 */ sw $v0, ($a0) -/* BDF594 80240804 2402000C */ addiu $v0, $zero, 0xc -/* BDF598 80240808 AE020070 */ sw $v0, 0x70($s0) -.L8024080C: -/* BDF59C 8024080C 8FBF0014 */ lw $ra, 0x14($sp) -/* BDF5A0 80240810 8FB00010 */ lw $s0, 0x10($sp) -/* BDF5A4 80240814 03E00008 */ jr $ra -/* BDF5A8 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_8024081C_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_8024081C_BDED90.s deleted file mode 100644 index b4280deb74..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_8024081C_BDED90.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024081C_BDF5AC -/* BDF5AC 8024081C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BDF5B0 80240820 AFB3001C */ sw $s3, 0x1c($sp) -/* BDF5B4 80240824 0080982D */ daddu $s3, $a0, $zero -/* BDF5B8 80240828 AFBF0020 */ sw $ra, 0x20($sp) -/* BDF5BC 8024082C AFB20018 */ sw $s2, 0x18($sp) -/* BDF5C0 80240830 AFB10014 */ sw $s1, 0x14($sp) -/* BDF5C4 80240834 AFB00010 */ sw $s0, 0x10($sp) -/* BDF5C8 80240838 F7B40028 */ sdc1 $f20, 0x28($sp) -/* BDF5CC 8024083C 8E710148 */ lw $s1, 0x148($s3) -/* BDF5D0 80240840 86240008 */ lh $a0, 8($s1) -/* BDF5D4 80240844 0C00EABB */ jal get_npc_unsafe -/* BDF5D8 80240848 00A0802D */ daddu $s0, $a1, $zero -/* BDF5DC 8024084C 8E040020 */ lw $a0, 0x20($s0) -/* BDF5E0 80240850 0040902D */ daddu $s2, $v0, $zero -/* BDF5E4 80240854 00041FC2 */ srl $v1, $a0, 0x1f -/* BDF5E8 80240858 00832021 */ addu $a0, $a0, $v1 -/* BDF5EC 8024085C 00042043 */ sra $a0, $a0, 1 -/* BDF5F0 80240860 0C00A67F */ jal rand_int -/* BDF5F4 80240864 24840001 */ addiu $a0, $a0, 1 -/* BDF5F8 80240868 8E030020 */ lw $v1, 0x20($s0) -/* BDF5FC 8024086C C64C0038 */ lwc1 $f12, 0x38($s2) -/* BDF600 80240870 000327C2 */ srl $a0, $v1, 0x1f -/* BDF604 80240874 00641821 */ addu $v1, $v1, $a0 -/* BDF608 80240878 00031843 */ sra $v1, $v1, 1 -/* BDF60C 8024087C 00621821 */ addu $v1, $v1, $v0 -/* BDF610 80240880 A643008E */ sh $v1, 0x8e($s2) -/* BDF614 80240884 8E2200CC */ lw $v0, 0xcc($s1) -/* BDF618 80240888 C64E0040 */ lwc1 $f14, 0x40($s2) -/* BDF61C 8024088C 8C42000C */ lw $v0, 0xc($v0) -/* BDF620 80240890 AE420028 */ sw $v0, 0x28($s2) -/* BDF624 80240894 C6000018 */ lwc1 $f0, 0x18($s0) -/* BDF628 80240898 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BDF62C 8024089C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BDF630 802408A0 E6400018 */ swc1 $f0, 0x18($s2) -/* BDF634 802408A4 8C460028 */ lw $a2, 0x28($v0) -/* BDF638 802408A8 0C00A720 */ jal atan2 -/* BDF63C 802408AC 8C470030 */ lw $a3, 0x30($v0) -/* BDF640 802408B0 46000506 */ mov.s $f20, $f0 -/* BDF644 802408B4 C64C000C */ lwc1 $f12, 0xc($s2) -/* BDF648 802408B8 0C00A70A */ jal get_clamped_angle_diff -/* BDF64C 802408BC 4600A386 */ mov.s $f14, $f20 -/* BDF650 802408C0 46000086 */ mov.s $f2, $f0 -/* BDF654 802408C4 8E02001C */ lw $v0, 0x1c($s0) -/* BDF658 802408C8 46001005 */ abs.s $f0, $f2 -/* BDF65C 802408CC 44822000 */ mtc1 $v0, $f4 -/* BDF660 802408D0 00000000 */ nop -/* BDF664 802408D4 46802120 */ cvt.s.w $f4, $f4 -/* BDF668 802408D8 4600203C */ c.lt.s $f4, $f0 -/* BDF66C 802408DC 00000000 */ nop -/* BDF670 802408E0 4500000D */ bc1f .L80240918 -/* BDF674 802408E4 00000000 */ nop -/* BDF678 802408E8 44800000 */ mtc1 $zero, $f0 -/* BDF67C 802408EC C654000C */ lwc1 $f20, 0xc($s2) -/* BDF680 802408F0 4600103C */ c.lt.s $f2, $f0 -/* BDF684 802408F4 00000000 */ nop -/* BDF688 802408F8 45000006 */ bc1f .L80240914 -/* BDF68C 802408FC 00021023 */ negu $v0, $v0 -/* BDF690 80240900 44820000 */ mtc1 $v0, $f0 -/* BDF694 80240904 00000000 */ nop -/* BDF698 80240908 46800020 */ cvt.s.w $f0, $f0 -/* BDF69C 8024090C 08090246 */ j .L80240918 -/* BDF6A0 80240910 4600A500 */ add.s $f20, $f20, $f0 -.L80240914: -/* BDF6A4 80240914 4604A500 */ add.s $f20, $f20, $f4 -.L80240918: -/* BDF6A8 80240918 0C00A6C9 */ jal clamp_angle -/* BDF6AC 8024091C 4600A306 */ mov.s $f12, $f20 -/* BDF6B0 80240920 2402000D */ addiu $v0, $zero, 0xd -/* BDF6B4 80240924 E640000C */ swc1 $f0, 0xc($s2) -/* BDF6B8 80240928 AE620070 */ sw $v0, 0x70($s3) -/* BDF6BC 8024092C 8FBF0020 */ lw $ra, 0x20($sp) -/* BDF6C0 80240930 8FB3001C */ lw $s3, 0x1c($sp) -/* BDF6C4 80240934 8FB20018 */ lw $s2, 0x18($sp) -/* BDF6C8 80240938 8FB10014 */ lw $s1, 0x14($sp) -/* BDF6CC 8024093C 8FB00010 */ lw $s0, 0x10($sp) -/* BDF6D0 80240940 D7B40028 */ ldc1 $f20, 0x28($sp) -/* BDF6D4 80240944 03E00008 */ jr $ra -/* BDF6D8 80240948 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_8024094C_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_8024094C_BDED90.s deleted file mode 100644 index efa17c818a..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_8024094C_BDED90.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024094C_BDF6DC -/* BDF6DC 8024094C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BDF6E0 80240950 AFB3003C */ sw $s3, 0x3c($sp) -/* BDF6E4 80240954 0080982D */ daddu $s3, $a0, $zero -/* BDF6E8 80240958 AFBF0040 */ sw $ra, 0x40($sp) -/* BDF6EC 8024095C AFB20038 */ sw $s2, 0x38($sp) -/* BDF6F0 80240960 AFB10034 */ sw $s1, 0x34($sp) -/* BDF6F4 80240964 AFB00030 */ sw $s0, 0x30($sp) -/* BDF6F8 80240968 8E720148 */ lw $s2, 0x148($s3) -/* BDF6FC 8024096C 00A0882D */ daddu $s1, $a1, $zero -/* BDF700 80240970 86440008 */ lh $a0, 8($s2) -/* BDF704 80240974 0C00EABB */ jal get_npc_unsafe -/* BDF708 80240978 00C0802D */ daddu $s0, $a2, $zero -/* BDF70C 8024097C 0200202D */ daddu $a0, $s0, $zero -/* BDF710 80240980 0240282D */ daddu $a1, $s2, $zero -/* BDF714 80240984 24030001 */ addiu $v1, $zero, 1 -/* BDF718 80240988 AFA30010 */ sw $v1, 0x10($sp) -/* BDF71C 8024098C 8E260024 */ lw $a2, 0x24($s1) -/* BDF720 80240990 8E270028 */ lw $a3, 0x28($s1) -/* BDF724 80240994 0C01242D */ jal func_800490B4 -/* BDF728 80240998 0040802D */ daddu $s0, $v0, $zero -/* BDF72C 8024099C 1440001E */ bnez $v0, .L80240A18 -/* BDF730 802409A0 0200202D */ daddu $a0, $s0, $zero -/* BDF734 802409A4 24040002 */ addiu $a0, $zero, 2 -/* BDF738 802409A8 0200282D */ daddu $a1, $s0, $zero -/* BDF73C 802409AC 0000302D */ daddu $a2, $zero, $zero -/* BDF740 802409B0 860300A8 */ lh $v1, 0xa8($s0) -/* BDF744 802409B4 3C013F80 */ lui $at, 0x3f80 -/* BDF748 802409B8 44810000 */ mtc1 $at, $f0 -/* BDF74C 802409BC 3C014000 */ lui $at, 0x4000 -/* BDF750 802409C0 44811000 */ mtc1 $at, $f2 -/* BDF754 802409C4 3C01C1A0 */ lui $at, 0xc1a0 -/* BDF758 802409C8 44812000 */ mtc1 $at, $f4 -/* BDF75C 802409CC 2402000F */ addiu $v0, $zero, 0xf -/* BDF760 802409D0 AFA2001C */ sw $v0, 0x1c($sp) -/* BDF764 802409D4 44833000 */ mtc1 $v1, $f6 -/* BDF768 802409D8 00000000 */ nop -/* BDF76C 802409DC 468031A0 */ cvt.s.w $f6, $f6 -/* BDF770 802409E0 44073000 */ mfc1 $a3, $f6 -/* BDF774 802409E4 27A20028 */ addiu $v0, $sp, 0x28 -/* BDF778 802409E8 AFA20020 */ sw $v0, 0x20($sp) -/* BDF77C 802409EC E7A00010 */ swc1 $f0, 0x10($sp) -/* BDF780 802409F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* BDF784 802409F4 0C01BFA4 */ jal fx_emote -/* BDF788 802409F8 E7A40018 */ swc1 $f4, 0x18($sp) -/* BDF78C 802409FC 8E4200CC */ lw $v0, 0xcc($s2) -/* BDF790 80240A00 8C430000 */ lw $v1, ($v0) -/* BDF794 80240A04 24020019 */ addiu $v0, $zero, 0x19 -/* BDF798 80240A08 A602008E */ sh $v0, 0x8e($s0) -/* BDF79C 80240A0C 2402000E */ addiu $v0, $zero, 0xe -/* BDF7A0 80240A10 08090293 */ j .L80240A4C -/* BDF7A4 80240A14 AE030028 */ sw $v1, 0x28($s0) -.L80240A18: -/* BDF7A8 80240A18 0C00F598 */ jal func_8003D660 -/* BDF7AC 80240A1C 24050001 */ addiu $a1, $zero, 1 -/* BDF7B0 80240A20 8E050018 */ lw $a1, 0x18($s0) -/* BDF7B4 80240A24 8E06000C */ lw $a2, 0xc($s0) -/* BDF7B8 80240A28 0C00EA95 */ jal npc_move_heading -/* BDF7BC 80240A2C 0200202D */ daddu $a0, $s0, $zero -/* BDF7C0 80240A30 8602008E */ lh $v0, 0x8e($s0) -/* BDF7C4 80240A34 9603008E */ lhu $v1, 0x8e($s0) -/* BDF7C8 80240A38 18400003 */ blez $v0, .L80240A48 -/* BDF7CC 80240A3C 2462FFFF */ addiu $v0, $v1, -1 -/* BDF7D0 80240A40 08090294 */ j .L80240A50 -/* BDF7D4 80240A44 A602008E */ sh $v0, 0x8e($s0) -.L80240A48: -/* BDF7D8 80240A48 2402000C */ addiu $v0, $zero, 0xc -.L80240A4C: -/* BDF7DC 80240A4C AE620070 */ sw $v0, 0x70($s3) -.L80240A50: -/* BDF7E0 80240A50 8FBF0040 */ lw $ra, 0x40($sp) -/* BDF7E4 80240A54 8FB3003C */ lw $s3, 0x3c($sp) -/* BDF7E8 80240A58 8FB20038 */ lw $s2, 0x38($sp) -/* BDF7EC 80240A5C 8FB10034 */ lw $s1, 0x34($sp) -/* BDF7F0 80240A60 8FB00030 */ lw $s0, 0x30($sp) -/* BDF7F4 80240A64 03E00008 */ jr $ra -/* BDF7F8 80240A68 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_80240A6C_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_80240A6C_BDED90.s deleted file mode 100644 index aceb159907..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_80240A6C_BDED90.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_BDF7FC -/* BDF7FC 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BDF800 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* BDF804 80240A74 0080882D */ daddu $s1, $a0, $zero -/* BDF808 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* BDF80C 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* BDF810 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* BDF814 80240A84 0C00EABB */ jal get_npc_unsafe -/* BDF818 80240A88 86040008 */ lh $a0, 8($s0) -/* BDF81C 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* BDF820 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* BDF824 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* BDF828 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* BDF82C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* BDF830 80240AA0 00000000 */ nop -/* BDF834 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* BDF838 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* BDF83C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* BDF840 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* BDF844 80240AB4 080902B0 */ j .L80240AC0 -/* BDF848 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* BDF84C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* BDF850 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* BDF854 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* BDF858 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* BDF85C 80240ACC 03E00008 */ jr $ra -/* BDF860 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_80240AD4_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_80240AD4_BDED90.s deleted file mode 100644 index e5b5afb9fd..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_80240AD4_BDED90.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD4_BDF864 -/* BDF864 80240AD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BDF868 80240AD8 AFB10014 */ sw $s1, 0x14($sp) -/* BDF86C 80240ADC 0080882D */ daddu $s1, $a0, $zero -/* BDF870 80240AE0 AFBF001C */ sw $ra, 0x1c($sp) -/* BDF874 80240AE4 AFB20018 */ sw $s2, 0x18($sp) -/* BDF878 80240AE8 AFB00010 */ sw $s0, 0x10($sp) -/* BDF87C 80240AEC 8E300148 */ lw $s0, 0x148($s1) -/* BDF880 80240AF0 86040008 */ lh $a0, 8($s0) -/* BDF884 80240AF4 0C00EABB */ jal get_npc_unsafe -/* BDF888 80240AF8 00A0902D */ daddu $s2, $a1, $zero -/* BDF88C 80240AFC 8E0300D0 */ lw $v1, 0xd0($s0) -/* BDF890 80240B00 8E240078 */ lw $a0, 0x78($s1) -/* BDF894 80240B04 8C630000 */ lw $v1, ($v1) -/* BDF898 80240B08 0083182A */ slt $v1, $a0, $v1 -/* BDF89C 80240B0C 10600013 */ beqz $v1, .L80240B5C -/* BDF8A0 80240B10 0040302D */ daddu $a2, $v0, $zero -/* BDF8A4 80240B14 00041040 */ sll $v0, $a0, 1 -/* BDF8A8 80240B18 00441021 */ addu $v0, $v0, $a0 -/* BDF8AC 80240B1C 00022880 */ sll $a1, $v0, 2 -.L80240B20: -/* BDF8B0 80240B20 8E0300D0 */ lw $v1, 0xd0($s0) -/* BDF8B4 80240B24 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* BDF8B8 80240B28 00A31021 */ addu $v0, $a1, $v1 -/* BDF8BC 80240B2C C4400008 */ lwc1 $f0, 8($v0) -/* BDF8C0 80240B30 46800020 */ cvt.s.w $f0, $f0 -/* BDF8C4 80240B34 4602003E */ c.le.s $f0, $f2 -/* BDF8C8 80240B38 00000000 */ nop -/* BDF8CC 80240B3C 45020003 */ bc1fl .L80240B4C -/* BDF8D0 80240B40 24840001 */ addiu $a0, $a0, 1 -/* BDF8D4 80240B44 080902D7 */ j .L80240B5C -/* BDF8D8 80240B48 AE240078 */ sw $a0, 0x78($s1) -.L80240B4C: -/* BDF8DC 80240B4C 8C620000 */ lw $v0, ($v1) -/* BDF8E0 80240B50 0082102A */ slt $v0, $a0, $v0 -/* BDF8E4 80240B54 1440FFF2 */ bnez $v0, .L80240B20 -/* BDF8E8 80240B58 24A5000C */ addiu $a1, $a1, 0xc -.L80240B5C: -/* BDF8EC 80240B5C C6400000 */ lwc1 $f0, ($s2) -/* BDF8F0 80240B60 E4C00018 */ swc1 $f0, 0x18($a2) -/* BDF8F4 80240B64 8E0200CC */ lw $v0, 0xcc($s0) -/* BDF8F8 80240B68 8C420004 */ lw $v0, 4($v0) -/* BDF8FC 80240B6C ACC20028 */ sw $v0, 0x28($a2) -/* BDF900 80240B70 24020001 */ addiu $v0, $zero, 1 -/* BDF904 80240B74 AE200074 */ sw $zero, 0x74($s1) -/* BDF908 80240B78 AE220070 */ sw $v0, 0x70($s1) -/* BDF90C 80240B7C 8FBF001C */ lw $ra, 0x1c($sp) -/* BDF910 80240B80 8FB20018 */ lw $s2, 0x18($sp) -/* BDF914 80240B84 8FB10014 */ lw $s1, 0x14($sp) -/* BDF918 80240B88 8FB00010 */ lw $s0, 0x10($sp) -/* BDF91C 80240B8C 03E00008 */ jr $ra -/* BDF920 80240B90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_80240B94_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_80240B94_BDED90.s deleted file mode 100644 index b0a0413e29..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_80240B94_BDED90.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B94_BDF924 -/* BDF924 80240B94 27BDFF98 */ addiu $sp, $sp, -0x68 -/* BDF928 80240B98 AFB40058 */ sw $s4, 0x58($sp) -/* BDF92C 80240B9C 0080A02D */ daddu $s4, $a0, $zero -/* BDF930 80240BA0 AFBF0060 */ sw $ra, 0x60($sp) -/* BDF934 80240BA4 AFB5005C */ sw $s5, 0x5c($sp) -/* BDF938 80240BA8 AFB30054 */ sw $s3, 0x54($sp) -/* BDF93C 80240BAC AFB20050 */ sw $s2, 0x50($sp) -/* BDF940 80240BB0 AFB1004C */ sw $s1, 0x4c($sp) -/* BDF944 80240BB4 AFB00048 */ sw $s0, 0x48($sp) -/* BDF948 80240BB8 8E910148 */ lw $s1, 0x148($s4) -/* BDF94C 80240BBC 86240008 */ lh $a0, 8($s1) -/* BDF950 80240BC0 0C00EABB */ jal get_npc_unsafe -/* BDF954 80240BC4 00A0802D */ daddu $s0, $a1, $zero -/* BDF958 80240BC8 8E83000C */ lw $v1, 0xc($s4) -/* BDF95C 80240BCC 0280202D */ daddu $a0, $s4, $zero -/* BDF960 80240BD0 8C650000 */ lw $a1, ($v1) -/* BDF964 80240BD4 0C0B1EAF */ jal get_variable -/* BDF968 80240BD8 0040902D */ daddu $s2, $v0, $zero -/* BDF96C 80240BDC AFA00018 */ sw $zero, 0x18($sp) -/* BDF970 80240BE0 8E2300D0 */ lw $v1, 0xd0($s1) -/* BDF974 80240BE4 8C630094 */ lw $v1, 0x94($v1) -/* BDF978 80240BE8 AFA3001C */ sw $v1, 0x1c($sp) -/* BDF97C 80240BEC 8E2300D0 */ lw $v1, 0xd0($s1) -/* BDF980 80240BF0 8C630080 */ lw $v1, 0x80($v1) -/* BDF984 80240BF4 AFA30020 */ sw $v1, 0x20($sp) -/* BDF988 80240BF8 8E2300D0 */ lw $v1, 0xd0($s1) -/* BDF98C 80240BFC 8C630088 */ lw $v1, 0x88($v1) -/* BDF990 80240C00 AFA30024 */ sw $v1, 0x24($sp) -/* BDF994 80240C04 8E2300D0 */ lw $v1, 0xd0($s1) -/* BDF998 80240C08 8C63008C */ lw $v1, 0x8c($v1) -/* BDF99C 80240C0C 27B50018 */ addiu $s5, $sp, 0x18 -/* BDF9A0 80240C10 AFA30028 */ sw $v1, 0x28($sp) -/* BDF9A4 80240C14 8E2300D0 */ lw $v1, 0xd0($s1) -/* BDF9A8 80240C18 3C014282 */ lui $at, 0x4282 -/* BDF9AC 80240C1C 44810000 */ mtc1 $at, $f0 -/* BDF9B0 80240C20 8C630090 */ lw $v1, 0x90($v1) -/* BDF9B4 80240C24 0040982D */ daddu $s3, $v0, $zero -/* BDF9B8 80240C28 E7A00030 */ swc1 $f0, 0x30($sp) -/* BDF9BC 80240C2C A7A00034 */ sh $zero, 0x34($sp) -/* BDF9C0 80240C30 16000005 */ bnez $s0, .L80240C48 -/* BDF9C4 80240C34 AFA3002C */ sw $v1, 0x2c($sp) -/* BDF9C8 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) -/* BDF9CC 80240C3C 30420004 */ andi $v0, $v0, 4 -/* BDF9D0 80240C40 10400044 */ beqz $v0, .L80240D54 -/* BDF9D4 80240C44 00000000 */ nop -.L80240C48: -/* BDF9D8 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 -/* BDF9DC 80240C4C AE800070 */ sw $zero, 0x70($s4) -/* BDF9E0 80240C50 A640008E */ sh $zero, 0x8e($s2) -/* BDF9E4 80240C54 8E2200CC */ lw $v0, 0xcc($s1) -/* BDF9E8 80240C58 8E430000 */ lw $v1, ($s2) -/* BDF9EC 80240C5C 8C420000 */ lw $v0, ($v0) -/* BDF9F0 80240C60 00641824 */ and $v1, $v1, $a0 -/* BDF9F4 80240C64 AE430000 */ sw $v1, ($s2) -/* BDF9F8 80240C68 AE420028 */ sw $v0, 0x28($s2) -/* BDF9FC 80240C6C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BDFA00 80240C70 8C420098 */ lw $v0, 0x98($v0) -/* BDFA04 80240C74 54400005 */ bnel $v0, $zero, .L80240C8C -/* BDFA08 80240C78 2402FDFF */ addiu $v0, $zero, -0x201 -/* BDFA0C 80240C7C 34620200 */ ori $v0, $v1, 0x200 -/* BDFA10 80240C80 2403FFF7 */ addiu $v1, $zero, -9 -/* BDFA14 80240C84 08090325 */ j .L80240C94 -/* BDFA18 80240C88 00431024 */ and $v0, $v0, $v1 -.L80240C8C: -/* BDFA1C 80240C8C 00621024 */ and $v0, $v1, $v0 -/* BDFA20 80240C90 34420008 */ ori $v0, $v0, 8 -.L80240C94: -/* BDFA24 80240C94 AE420000 */ sw $v0, ($s2) -/* BDFA28 80240C98 8E2200B0 */ lw $v0, 0xb0($s1) -/* BDFA2C 80240C9C 30420004 */ andi $v0, $v0, 4 -/* BDFA30 80240CA0 10400008 */ beqz $v0, .L80240CC4 -/* BDFA34 80240CA4 24020063 */ addiu $v0, $zero, 0x63 -/* BDFA38 80240CA8 AE820070 */ sw $v0, 0x70($s4) -/* BDFA3C 80240CAC AE800074 */ sw $zero, 0x74($s4) -/* BDFA40 80240CB0 8E2200B0 */ lw $v0, 0xb0($s1) -/* BDFA44 80240CB4 2403FFFB */ addiu $v1, $zero, -5 -/* BDFA48 80240CB8 00431024 */ and $v0, $v0, $v1 -/* BDFA4C 80240CBC 0809033C */ j .L80240CF0 -/* BDFA50 80240CC0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240CC4: -/* BDFA54 80240CC4 8E220000 */ lw $v0, ($s1) -/* BDFA58 80240CC8 3C034000 */ lui $v1, 0x4000 -/* BDFA5C 80240CCC 00431024 */ and $v0, $v0, $v1 -/* BDFA60 80240CD0 10400007 */ beqz $v0, .L80240CF0 -/* BDFA64 80240CD4 3C03BFFF */ lui $v1, 0xbfff -/* BDFA68 80240CD8 2402000C */ addiu $v0, $zero, 0xc -/* BDFA6C 80240CDC AE820070 */ sw $v0, 0x70($s4) -/* BDFA70 80240CE0 8E220000 */ lw $v0, ($s1) -/* BDFA74 80240CE4 3463FFFF */ ori $v1, $v1, 0xffff -/* BDFA78 80240CE8 00431024 */ and $v0, $v0, $v1 -/* BDFA7C 80240CEC AE220000 */ sw $v0, ($s1) -.L80240CF0: -/* BDFA80 80240CF0 27A50038 */ addiu $a1, $sp, 0x38 -/* BDFA84 80240CF4 27A6003C */ addiu $a2, $sp, 0x3c -/* BDFA88 80240CF8 C6400038 */ lwc1 $f0, 0x38($s2) -/* BDFA8C 80240CFC 864200A8 */ lh $v0, 0xa8($s2) -/* BDFA90 80240D00 3C0142C8 */ lui $at, 0x42c8 -/* BDFA94 80240D04 44812000 */ mtc1 $at, $f4 -/* BDFA98 80240D08 44823000 */ mtc1 $v0, $f6 -/* BDFA9C 80240D0C 00000000 */ nop -/* BDFAA0 80240D10 468031A0 */ cvt.s.w $f6, $f6 -/* BDFAA4 80240D14 27A20044 */ addiu $v0, $sp, 0x44 -/* BDFAA8 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) -/* BDFAAC 80240D1C C640003C */ lwc1 $f0, 0x3c($s2) -/* BDFAB0 80240D20 C6420040 */ lwc1 $f2, 0x40($s2) -/* BDFAB4 80240D24 46060000 */ add.s $f0, $f0, $f6 -/* BDFAB8 80240D28 E7A40044 */ swc1 $f4, 0x44($sp) -/* BDFABC 80240D2C E7A20040 */ swc1 $f2, 0x40($sp) -/* BDFAC0 80240D30 E7A0003C */ swc1 $f0, 0x3c($sp) -/* BDFAC4 80240D34 AFA20010 */ sw $v0, 0x10($sp) -/* BDFAC8 80240D38 8E440080 */ lw $a0, 0x80($s2) -/* BDFACC 80240D3C 0C0372DF */ jal func_800DCB7C -/* BDFAD0 80240D40 27A70040 */ addiu $a3, $sp, 0x40 -/* BDFAD4 80240D44 10400003 */ beqz $v0, .L80240D54 -/* BDFAD8 80240D48 00000000 */ nop -/* BDFADC 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* BDFAE0 80240D50 E640003C */ swc1 $f0, 0x3c($s2) -.L80240D54: -/* BDFAE4 80240D54 8E830070 */ lw $v1, 0x70($s4) -/* BDFAE8 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* BDFAEC 80240D5C 10400042 */ beqz $v0, .L80240E68 -/* BDFAF0 80240D60 00031080 */ sll $v0, $v1, 2 -/* BDFAF4 80240D64 3C018024 */ lui $at, 0x8024 -/* BDFAF8 80240D68 00220821 */ addu $at, $at, $v0 -/* BDFAFC 80240D6C 8C224870 */ lw $v0, 0x4870($at) -/* BDFB00 80240D70 00400008 */ jr $v0 -/* BDFB04 80240D74 00000000 */ nop -/* BDFB08 80240D78 0280202D */ daddu $a0, $s4, $zero -/* BDFB0C 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* BDFB10 80240D80 0C090000 */ jal func_80240000 -/* BDFB14 80240D84 02A0302D */ daddu $a2, $s5, $zero -/* BDFB18 80240D88 0280202D */ daddu $a0, $s4, $zero -/* BDFB1C 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* BDFB20 80240D90 0C090056 */ jal func_80240158 -/* BDFB24 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* BDFB28 80240D98 0809039A */ j .L80240E68 -/* BDFB2C 80240D9C 00000000 */ nop -/* BDFB30 80240DA0 0280202D */ daddu $a0, $s4, $zero -/* BDFB34 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* BDFB38 80240DA8 0C090100 */ jal func_80240400 -/* BDFB3C 80240DAC 02A0302D */ daddu $a2, $s5, $zero -/* BDFB40 80240DB0 0280202D */ daddu $a0, $s4, $zero -/* BDFB44 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* BDFB48 80240DB8 0C090130 */ jal func_802404C0 -/* BDFB4C 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* BDFB50 80240DC0 0809039A */ j .L80240E68 -/* BDFB54 80240DC4 00000000 */ nop -/* BDFB58 80240DC8 0280202D */ daddu $a0, $s4, $zero -/* BDFB5C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* BDFB60 80240DD0 0C09019F */ jal func_8024067C -/* BDFB64 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* BDFB68 80240DD8 0809039A */ j .L80240E68 -/* BDFB6C 80240DDC 00000000 */ nop -/* BDFB70 80240DE0 0280202D */ daddu $a0, $s4, $zero -/* BDFB74 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* BDFB78 80240DE8 0C0901CC */ jal func_80240730 -/* BDFB7C 80240DEC 02A0302D */ daddu $a2, $s5, $zero -/* BDFB80 80240DF0 0280202D */ daddu $a0, $s4, $zero -/* BDFB84 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* BDFB88 80240DF8 0C0901E9 */ jal func_802407A4 -/* BDFB8C 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* BDFB90 80240E00 0809039A */ j .L80240E68 -/* BDFB94 80240E04 00000000 */ nop -/* BDFB98 80240E08 0280202D */ daddu $a0, $s4, $zero -/* BDFB9C 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* BDFBA0 80240E10 0C090207 */ jal func_8024081C -/* BDFBA4 80240E14 02A0302D */ daddu $a2, $s5, $zero -/* BDFBA8 80240E18 0280202D */ daddu $a0, $s4, $zero -/* BDFBAC 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* BDFBB0 80240E20 0C090253 */ jal func_8024094C -/* BDFBB4 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* BDFBB8 80240E28 0809039A */ j .L80240E68 -/* BDFBBC 80240E2C 00000000 */ nop -/* BDFBC0 80240E30 0280202D */ daddu $a0, $s4, $zero -/* BDFBC4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BDFBC8 80240E38 0C09029B */ jal func_80240A6C -/* BDFBCC 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* BDFBD0 80240E40 0809039A */ j .L80240E68 -/* BDFBD4 80240E44 00000000 */ nop -/* BDFBD8 80240E48 0280202D */ daddu $a0, $s4, $zero -/* BDFBDC 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* BDFBE0 80240E50 0C0902B5 */ jal func_80240AD4 -/* BDFBE4 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* BDFBE8 80240E58 0809039A */ j .L80240E68 -/* BDFBEC 80240E5C 00000000 */ nop -/* BDFBF0 80240E60 0C0129CF */ jal func_8004A73C -/* BDFBF4 80240E64 0280202D */ daddu $a0, $s4, $zero -.L80240E68: -/* BDFBF8 80240E68 8FBF0060 */ lw $ra, 0x60($sp) -/* BDFBFC 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) -/* BDFC00 80240E70 8FB40058 */ lw $s4, 0x58($sp) -/* BDFC04 80240E74 8FB30054 */ lw $s3, 0x54($sp) -/* BDFC08 80240E78 8FB20050 */ lw $s2, 0x50($sp) -/* BDFC0C 80240E7C 8FB1004C */ lw $s1, 0x4c($sp) -/* BDFC10 80240E80 8FB00048 */ lw $s0, 0x48($sp) -/* BDFC14 80240E84 0000102D */ daddu $v0, $zero, $zero -/* BDFC18 80240E88 03E00008 */ jr $ra -/* BDFC1C 80240E8C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_80240E90_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_80240E90_BDED90.s deleted file mode 100644 index f7a47c4e5c..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_80240E90_BDED90.s +++ /dev/null @@ -1,126 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E90_BDFC20 -/* BDFC20 80240E90 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BDFC24 80240E94 AFB20030 */ sw $s2, 0x30($sp) -/* BDFC28 80240E98 0080902D */ daddu $s2, $a0, $zero -/* BDFC2C 80240E9C AFBF0034 */ sw $ra, 0x34($sp) -/* BDFC30 80240EA0 AFB1002C */ sw $s1, 0x2c($sp) -/* BDFC34 80240EA4 AFB00028 */ sw $s0, 0x28($sp) -/* BDFC38 80240EA8 F7B60040 */ sdc1 $f22, 0x40($sp) -/* BDFC3C 80240EAC F7B40038 */ sdc1 $f20, 0x38($sp) -/* BDFC40 80240EB0 8E500148 */ lw $s0, 0x148($s2) -/* BDFC44 80240EB4 0C00EABB */ jal get_npc_unsafe -/* BDFC48 80240EB8 86040008 */ lh $a0, 8($s0) -/* BDFC4C 80240EBC 0040882D */ daddu $s1, $v0, $zero -/* BDFC50 80240EC0 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BDFC54 80240EC4 8E430078 */ lw $v1, 0x78($s2) -/* BDFC58 80240EC8 C62E0040 */ lwc1 $f14, 0x40($s1) -/* BDFC5C 80240ECC 00031040 */ sll $v0, $v1, 1 -/* BDFC60 80240ED0 00431021 */ addu $v0, $v0, $v1 -/* BDFC64 80240ED4 8E0300D0 */ lw $v1, 0xd0($s0) -/* BDFC68 80240ED8 00021080 */ sll $v0, $v0, 2 -/* BDFC6C 80240EDC 00431021 */ addu $v0, $v0, $v1 -/* BDFC70 80240EE0 C4560004 */ lwc1 $f22, 4($v0) -/* BDFC74 80240EE4 4680B5A0 */ cvt.s.w $f22, $f22 -/* BDFC78 80240EE8 C454000C */ lwc1 $f20, 0xc($v0) -/* BDFC7C 80240EEC 4680A520 */ cvt.s.w $f20, $f20 -/* BDFC80 80240EF0 4406B000 */ mfc1 $a2, $f22 -/* BDFC84 80240EF4 4407A000 */ mfc1 $a3, $f20 -/* BDFC88 80240EF8 E7AC0018 */ swc1 $f12, 0x18($sp) -/* BDFC8C 80240EFC 0C00A720 */ jal atan2 -/* BDFC90 80240F00 E7AE0020 */ swc1 $f14, 0x20($sp) -/* BDFC94 80240F04 8E250018 */ lw $a1, 0x18($s1) -/* BDFC98 80240F08 44060000 */ mfc1 $a2, $f0 -/* BDFC9C 80240F0C 0220202D */ daddu $a0, $s1, $zero -/* BDFCA0 80240F10 0C00EA95 */ jal npc_move_heading -/* BDFCA4 80240F14 AE26000C */ sw $a2, 0xc($s1) -/* BDFCA8 80240F18 27A50018 */ addiu $a1, $sp, 0x18 -/* BDFCAC 80240F1C 27A6001C */ addiu $a2, $sp, 0x1c -/* BDFCB0 80240F20 C6200038 */ lwc1 $f0, 0x38($s1) -/* BDFCB4 80240F24 8E430078 */ lw $v1, 0x78($s2) -/* BDFCB8 80240F28 3C01447A */ lui $at, 0x447a -/* BDFCBC 80240F2C 44812000 */ mtc1 $at, $f4 -/* BDFCC0 80240F30 00031040 */ sll $v0, $v1, 1 -/* BDFCC4 80240F34 00431021 */ addu $v0, $v0, $v1 -/* BDFCC8 80240F38 00021080 */ sll $v0, $v0, 2 -/* BDFCCC 80240F3C E7A00018 */ swc1 $f0, 0x18($sp) -/* BDFCD0 80240F40 8E0300D0 */ lw $v1, 0xd0($s0) -/* BDFCD4 80240F44 C620003C */ lwc1 $f0, 0x3c($s1) -/* BDFCD8 80240F48 C6220040 */ lwc1 $f2, 0x40($s1) -/* BDFCDC 80240F4C 00431021 */ addu $v0, $v0, $v1 -/* BDFCE0 80240F50 C4460008 */ lwc1 $f6, 8($v0) -/* BDFCE4 80240F54 468031A0 */ cvt.s.w $f6, $f6 -/* BDFCE8 80240F58 27A20024 */ addiu $v0, $sp, 0x24 -/* BDFCEC 80240F5C 46060000 */ add.s $f0, $f0, $f6 -/* BDFCF0 80240F60 E7A20020 */ swc1 $f2, 0x20($sp) -/* BDFCF4 80240F64 E7A40024 */ swc1 $f4, 0x24($sp) -/* BDFCF8 80240F68 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BDFCFC 80240F6C AFA20010 */ sw $v0, 0x10($sp) -/* BDFD00 80240F70 8E240080 */ lw $a0, 0x80($s1) -/* BDFD04 80240F74 0C0372DF */ jal func_800DCB7C -/* BDFD08 80240F78 27A70020 */ addiu $a3, $sp, 0x20 -/* BDFD0C 80240F7C 8E430078 */ lw $v1, 0x78($s2) -/* BDFD10 80240F80 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* BDFD14 80240F84 00031040 */ sll $v0, $v1, 1 -/* BDFD18 80240F88 00431021 */ addu $v0, $v0, $v1 -/* BDFD1C 80240F8C 8E0300D0 */ lw $v1, 0xd0($s0) -/* BDFD20 80240F90 00021080 */ sll $v0, $v0, 2 -/* BDFD24 80240F94 00431021 */ addu $v0, $v0, $v1 -/* BDFD28 80240F98 C4400008 */ lwc1 $f0, 8($v0) -/* BDFD2C 80240F9C 46800020 */ cvt.s.w $f0, $f0 -/* BDFD30 80240FA0 46001080 */ add.s $f2, $f2, $f0 -/* BDFD34 80240FA4 C620003C */ lwc1 $f0, 0x3c($s1) -/* BDFD38 80240FA8 3C014000 */ lui $at, 0x4000 -/* BDFD3C 80240FAC 44813800 */ mtc1 $at, $f7 -/* BDFD40 80240FB0 44803000 */ mtc1 $zero, $f6 -/* BDFD44 80240FB4 46001001 */ sub.s $f0, $f2, $f0 -/* BDFD48 80240FB8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* BDFD4C 80240FBC 46000121 */ cvt.d.s $f4, $f0 -/* BDFD50 80240FC0 4624303C */ c.lt.d $f6, $f4 -/* BDFD54 80240FC4 00000000 */ nop -/* BDFD58 80240FC8 45000005 */ bc1f .L80240FE0 -/* BDFD5C 80240FCC E7A00024 */ swc1 $f0, 0x24($sp) -/* BDFD60 80240FD0 C620003C */ lwc1 $f0, 0x3c($s1) -/* BDFD64 80240FD4 46000021 */ cvt.d.s $f0, $f0 -/* BDFD68 80240FD8 08090403 */ j .L8024100C -/* BDFD6C 80240FDC 46260000 */ add.d $f0, $f0, $f6 -.L80240FE0: -/* BDFD70 80240FE0 3C01C000 */ lui $at, 0xc000 -/* BDFD74 80240FE4 44810800 */ mtc1 $at, $f1 -/* BDFD78 80240FE8 44800000 */ mtc1 $zero, $f0 -/* BDFD7C 80240FEC 00000000 */ nop -/* BDFD80 80240FF0 4620203C */ c.lt.d $f4, $f0 -/* BDFD84 80240FF4 00000000 */ nop -/* BDFD88 80240FF8 45020006 */ bc1fl .L80241014 -/* BDFD8C 80240FFC E622003C */ swc1 $f2, 0x3c($s1) -/* BDFD90 80241000 C620003C */ lwc1 $f0, 0x3c($s1) -/* BDFD94 80241004 46000021 */ cvt.d.s $f0, $f0 -/* BDFD98 80241008 46260001 */ sub.d $f0, $f0, $f6 -.L8024100C: -/* BDFD9C 8024100C 46200020 */ cvt.s.d $f0, $f0 -/* BDFDA0 80241010 E620003C */ swc1 $f0, 0x3c($s1) -.L80241014: -/* BDFDA4 80241014 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BDFDA8 80241018 C62E0040 */ lwc1 $f14, 0x40($s1) -/* BDFDAC 8024101C 4406B000 */ mfc1 $a2, $f22 -/* BDFDB0 80241020 4407A000 */ mfc1 $a3, $f20 -/* BDFDB4 80241024 0C00A7B5 */ jal dist2D -/* BDFDB8 80241028 00000000 */ nop -/* BDFDBC 8024102C C6220018 */ lwc1 $f2, 0x18($s1) -/* BDFDC0 80241030 4600103C */ c.lt.s $f2, $f0 -/* BDFDC4 80241034 00000000 */ nop -/* BDFDC8 80241038 45010003 */ bc1t .L80241048 -/* BDFDCC 8024103C E7A00024 */ swc1 $f0, 0x24($sp) -/* BDFDD0 80241040 24020002 */ addiu $v0, $zero, 2 -/* BDFDD4 80241044 AE420070 */ sw $v0, 0x70($s2) -.L80241048: -/* BDFDD8 80241048 8FBF0034 */ lw $ra, 0x34($sp) -/* BDFDDC 8024104C 8FB20030 */ lw $s2, 0x30($sp) -/* BDFDE0 80241050 8FB1002C */ lw $s1, 0x2c($sp) -/* BDFDE4 80241054 8FB00028 */ lw $s0, 0x28($sp) -/* BDFDE8 80241058 D7B60040 */ ldc1 $f22, 0x40($sp) -/* BDFDEC 8024105C D7B40038 */ ldc1 $f20, 0x38($sp) -/* BDFDF0 80241060 03E00008 */ jr $ra -/* BDFDF4 80241064 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_8024113C_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_8024113C_BDED90.s deleted file mode 100644 index 54476641ea..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_8024113C_BDED90.s +++ /dev/null @@ -1,99 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024113C_BDFECC -/* BDFECC 8024113C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BDFED0 80241140 AFB40040 */ sw $s4, 0x40($sp) -/* BDFED4 80241144 0080A02D */ daddu $s4, $a0, $zero -/* BDFED8 80241148 AFBF0048 */ sw $ra, 0x48($sp) -/* BDFEDC 8024114C AFB50044 */ sw $s5, 0x44($sp) -/* BDFEE0 80241150 AFB3003C */ sw $s3, 0x3c($sp) -/* BDFEE4 80241154 AFB20038 */ sw $s2, 0x38($sp) -/* BDFEE8 80241158 AFB10034 */ sw $s1, 0x34($sp) -/* BDFEEC 8024115C AFB00030 */ sw $s0, 0x30($sp) -/* BDFEF0 80241160 8E930148 */ lw $s3, 0x148($s4) -/* BDFEF4 80241164 86640008 */ lh $a0, 8($s3) -/* BDFEF8 80241168 8E90000C */ lw $s0, 0xc($s4) -/* BDFEFC 8024116C 0C00EABB */ jal get_npc_unsafe -/* BDFF00 80241170 00A0882D */ daddu $s1, $a1, $zero -/* BDFF04 80241174 0280202D */ daddu $a0, $s4, $zero -/* BDFF08 80241178 8E050000 */ lw $a1, ($s0) -/* BDFF0C 8024117C 0C0B1EAF */ jal get_variable -/* BDFF10 80241180 0040A82D */ daddu $s5, $v0, $zero -/* BDFF14 80241184 AFA00010 */ sw $zero, 0x10($sp) -/* BDFF18 80241188 8E6300D0 */ lw $v1, 0xd0($s3) -/* BDFF1C 8024118C 8C630094 */ lw $v1, 0x94($v1) -/* BDFF20 80241190 AFA30014 */ sw $v1, 0x14($sp) -/* BDFF24 80241194 8E6300D0 */ lw $v1, 0xd0($s3) -/* BDFF28 80241198 8C630080 */ lw $v1, 0x80($v1) -/* BDFF2C 8024119C AFA30018 */ sw $v1, 0x18($sp) -/* BDFF30 802411A0 8E6300D0 */ lw $v1, 0xd0($s3) -/* BDFF34 802411A4 8C630088 */ lw $v1, 0x88($v1) -/* BDFF38 802411A8 AFA3001C */ sw $v1, 0x1c($sp) -/* BDFF3C 802411AC 8E6300D0 */ lw $v1, 0xd0($s3) -/* BDFF40 802411B0 8C63008C */ lw $v1, 0x8c($v1) -/* BDFF44 802411B4 27B20010 */ addiu $s2, $sp, 0x10 -/* BDFF48 802411B8 AFA30020 */ sw $v1, 0x20($sp) -/* BDFF4C 802411BC 8E6300D0 */ lw $v1, 0xd0($s3) -/* BDFF50 802411C0 3C0142C8 */ lui $at, 0x42c8 -/* BDFF54 802411C4 44810000 */ mtc1 $at, $f0 -/* BDFF58 802411C8 8C630090 */ lw $v1, 0x90($v1) -/* BDFF5C 802411CC 0040802D */ daddu $s0, $v0, $zero -/* BDFF60 802411D0 E7A00028 */ swc1 $f0, 0x28($sp) -/* BDFF64 802411D4 A7A0002C */ sh $zero, 0x2c($sp) -/* BDFF68 802411D8 12200007 */ beqz $s1, .L802411F8 -/* BDFF6C 802411DC AFA30024 */ sw $v1, 0x24($sp) -/* BDFF70 802411E0 AE800070 */ sw $zero, 0x70($s4) -/* BDFF74 802411E4 8EA20000 */ lw $v0, ($s5) -/* BDFF78 802411E8 2403F7FF */ addiu $v1, $zero, -0x801 -/* BDFF7C 802411EC A6A0008E */ sh $zero, 0x8e($s5) -/* BDFF80 802411F0 00431024 */ and $v0, $v0, $v1 -/* BDFF84 802411F4 AEA20000 */ sw $v0, ($s5) -.L802411F8: -/* BDFF88 802411F8 8E830070 */ lw $v1, 0x70($s4) -/* BDFF8C 802411FC 2C620005 */ sltiu $v0, $v1, 5 -/* BDFF90 80241200 1040001E */ beqz $v0, .L8024127C -/* BDFF94 80241204 00031080 */ sll $v0, $v1, 2 -/* BDFF98 80241208 3C018024 */ lui $at, 0x8024 -/* BDFF9C 8024120C 00220821 */ addu $at, $at, $v0 -/* BDFFA0 80241210 8C224A00 */ lw $v0, 0x4a00($at) -/* BDFFA4 80241214 00400008 */ jr $v0 -/* BDFFA8 80241218 00000000 */ nop -/* BDFFAC 8024121C 0280202D */ daddu $a0, $s4, $zero -/* BDFFB0 80241220 0200282D */ daddu $a1, $s0, $zero -/* BDFFB4 80241224 0C090000 */ jal func_80240000 -/* BDFFB8 80241228 0240302D */ daddu $a2, $s2, $zero -/* BDFFBC 8024122C 0280202D */ daddu $a0, $s4, $zero -/* BDFFC0 80241230 0200282D */ daddu $a1, $s0, $zero -/* BDFFC4 80241234 0C0903A4 */ jal func_80240E90 -/* BDFFC8 80241238 0240302D */ daddu $a2, $s2, $zero -/* BDFFCC 8024123C 0809049F */ j .L8024127C -/* BDFFD0 80241240 00000000 */ nop -/* BDFFD4 80241244 0280202D */ daddu $a0, $s4, $zero -/* BDFFD8 80241248 0200282D */ daddu $a1, $s0, $zero -/* BDFFDC 8024124C 0C090100 */ jal func_80240400 -/* BDFFE0 80241250 0240302D */ daddu $a2, $s2, $zero -/* BDFFE4 80241254 0280202D */ daddu $a0, $s4, $zero -/* BDFFE8 80241258 0200282D */ daddu $a1, $s0, $zero -/* BDFFEC 8024125C 0C09041A */ jal func_80241068 -/* BDFFF0 80241260 0240302D */ daddu $a2, $s2, $zero -/* BDFFF4 80241264 0809049F */ j .L8024127C -/* BDFFF8 80241268 00000000 */ nop -/* BDFFFC 8024126C 0280202D */ daddu $a0, $s4, $zero -/* BE0000 80241270 0200282D */ daddu $a1, $s0, $zero -/* BE0004 80241274 0C09019F */ jal func_8024067C -/* BE0008 80241278 0240302D */ daddu $a2, $s2, $zero -.L8024127C: -/* BE000C 8024127C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* BE0010 80241280 4600008D */ trunc.w.s $f2, $f0 -/* BE0014 80241284 E662006C */ swc1 $f2, 0x6c($s3) -/* BE0018 80241288 8FBF0048 */ lw $ra, 0x48($sp) -/* BE001C 8024128C 8FB50044 */ lw $s5, 0x44($sp) -/* BE0020 80241290 8FB40040 */ lw $s4, 0x40($sp) -/* BE0024 80241294 8FB3003C */ lw $s3, 0x3c($sp) -/* BE0028 80241298 8FB20038 */ lw $s2, 0x38($sp) -/* BE002C 8024129C 8FB10034 */ lw $s1, 0x34($sp) -/* BE0030 802412A0 8FB00030 */ lw $s0, 0x30($sp) -/* BE0034 802412A4 0000102D */ daddu $v0, $zero, $zero -/* BE0038 802412A8 03E00008 */ jr $ra -/* BE003C 802412AC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_802412B0_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_802412B0_BDED90.s deleted file mode 100644 index 2bad8cfa74..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_802412B0_BDED90.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412B0_BE0040 -/* BE0040 802412B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE0044 802412B4 AFB00010 */ sw $s0, 0x10($sp) -/* BE0048 802412B8 3C108024 */ lui $s0, 0x8024 -/* BE004C 802412BC 26101C68 */ addiu $s0, $s0, 0x1c68 -/* BE0050 802412C0 AFBF0018 */ sw $ra, 0x18($sp) -/* BE0054 802412C4 AFB10014 */ sw $s1, 0x14($sp) -/* BE0058 802412C8 8E020000 */ lw $v0, ($s0) -/* BE005C 802412CC 14400010 */ bnez $v0, .L80241310 -/* BE0060 802412D0 0080882D */ daddu $s1, $a0, $zero -/* BE0064 802412D4 0C00AB39 */ jal heap_malloc -/* BE0068 802412D8 24040040 */ addiu $a0, $zero, 0x40 -/* BE006C 802412DC AE020000 */ sw $v0, ($s0) -/* BE0070 802412E0 0000182D */ daddu $v1, $zero, $zero -/* BE0074 802412E4 0040282D */ daddu $a1, $v0, $zero -/* BE0078 802412E8 0220202D */ daddu $a0, $s1, $zero -.L802412EC: -/* BE007C 802412EC 8C820084 */ lw $v0, 0x84($a0) -/* BE0080 802412F0 24840004 */ addiu $a0, $a0, 4 -/* BE0084 802412F4 24630001 */ addiu $v1, $v1, 1 -/* BE0088 802412F8 ACA20000 */ sw $v0, ($a1) -/* BE008C 802412FC 28620010 */ slti $v0, $v1, 0x10 -/* BE0090 80241300 1440FFFA */ bnez $v0, .L802412EC -/* BE0094 80241304 24A50004 */ addiu $a1, $a1, 4 -/* BE0098 80241308 080904D3 */ j .L8024134C -/* BE009C 8024130C 00000000 */ nop -.L80241310: -/* BE00A0 80241310 0000182D */ daddu $v1, $zero, $zero -/* BE00A4 80241314 0040282D */ daddu $a1, $v0, $zero -/* BE00A8 80241318 0220202D */ daddu $a0, $s1, $zero -.L8024131C: -/* BE00AC 8024131C 8CA20000 */ lw $v0, ($a1) -/* BE00B0 80241320 24A50004 */ addiu $a1, $a1, 4 -/* BE00B4 80241324 24630001 */ addiu $v1, $v1, 1 -/* BE00B8 80241328 AC820084 */ sw $v0, 0x84($a0) -/* BE00BC 8024132C 28620010 */ slti $v0, $v1, 0x10 -/* BE00C0 80241330 1440FFFA */ bnez $v0, .L8024131C -/* BE00C4 80241334 24840004 */ addiu $a0, $a0, 4 -/* BE00C8 80241338 3C108024 */ lui $s0, 0x8024 -/* BE00CC 8024133C 26101C68 */ addiu $s0, $s0, 0x1c68 -/* BE00D0 80241340 0C00AB4B */ jal heap_free -/* BE00D4 80241344 8E040000 */ lw $a0, ($s0) -/* BE00D8 80241348 AE000000 */ sw $zero, ($s0) -.L8024134C: -/* BE00DC 8024134C 8FBF0018 */ lw $ra, 0x18($sp) -/* BE00E0 80241350 8FB10014 */ lw $s1, 0x14($sp) -/* BE00E4 80241354 8FB00010 */ lw $s0, 0x10($sp) -/* BE00E8 80241358 24020002 */ addiu $v0, $zero, 2 -/* BE00EC 8024135C 03E00008 */ jr $ra -/* BE00F0 80241360 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_80241364_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_80241364_BDED90.s deleted file mode 100644 index 548e6c4f91..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_80241364_BDED90.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241364_BE00F4 -/* BE00F4 80241364 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE00F8 80241368 AFB00010 */ sw $s0, 0x10($sp) -/* BE00FC 8024136C 0080802D */ daddu $s0, $a0, $zero -/* BE0100 80241370 AFBF0018 */ sw $ra, 0x18($sp) -/* BE0104 80241374 AFB10014 */ sw $s1, 0x14($sp) -/* BE0108 80241378 8E02000C */ lw $v0, 0xc($s0) -/* BE010C 8024137C 8C510000 */ lw $s1, ($v0) -/* BE0110 80241380 0C0B1EAF */ jal get_variable -/* BE0114 80241384 0220282D */ daddu $a1, $s1, $zero -/* BE0118 80241388 3C03FFF0 */ lui $v1, 0xfff0 -/* BE011C 8024138C 3463FFFF */ ori $v1, $v1, 0xffff -/* BE0120 80241390 0200202D */ daddu $a0, $s0, $zero -/* BE0124 80241394 00431024 */ and $v0, $v0, $v1 -/* BE0128 80241398 00021140 */ sll $v0, $v0, 5 -/* BE012C 8024139C 3C068008 */ lui $a2, %hi(gItemTable) -/* BE0130 802413A0 00C23021 */ addu $a2, $a2, $v0 -/* BE0134 802413A4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* BE0138 802413A8 0C0B2026 */ jal set_variable -/* BE013C 802413AC 0220282D */ daddu $a1, $s1, $zero -/* BE0140 802413B0 8FBF0018 */ lw $ra, 0x18($sp) -/* BE0144 802413B4 8FB10014 */ lw $s1, 0x14($sp) -/* BE0148 802413B8 8FB00010 */ lw $s0, 0x10($sp) -/* BE014C 802413BC 24020002 */ addiu $v0, $zero, 2 -/* BE0150 802413C0 03E00008 */ jr $ra -/* BE0154 802413C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_80241424_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_80241424_BDED90.s deleted file mode 100644 index f9ed50d1c2..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_80241424_BDED90.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241424_BE01B4 -/* BE01B4 80241424 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BE01B8 80241428 AFB10014 */ sw $s1, 0x14($sp) -/* BE01BC 8024142C 0080882D */ daddu $s1, $a0, $zero -/* BE01C0 80241430 AFBF0024 */ sw $ra, 0x24($sp) -/* BE01C4 80241434 AFB40020 */ sw $s4, 0x20($sp) -/* BE01C8 80241438 AFB3001C */ sw $s3, 0x1c($sp) -/* BE01CC 8024143C AFB20018 */ sw $s2, 0x18($sp) -/* BE01D0 80241440 AFB00010 */ sw $s0, 0x10($sp) -/* BE01D4 80241444 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* BE01D8 80241448 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* BE01DC 8024144C F7B80038 */ sdc1 $f24, 0x38($sp) -/* BE01E0 80241450 F7B60030 */ sdc1 $f22, 0x30($sp) -/* BE01E4 80241454 F7B40028 */ sdc1 $f20, 0x28($sp) -/* BE01E8 80241458 8E30000C */ lw $s0, 0xc($s1) -/* BE01EC 8024145C 8E130000 */ lw $s3, ($s0) -/* BE01F0 80241460 26100004 */ addiu $s0, $s0, 4 -/* BE01F4 80241464 0C0B1EAF */ jal get_variable -/* BE01F8 80241468 0260282D */ daddu $a1, $s3, $zero -/* BE01FC 8024146C 4482E000 */ mtc1 $v0, $f28 -/* BE0200 80241470 00000000 */ nop -/* BE0204 80241474 4680E720 */ cvt.s.w $f28, $f28 -/* BE0208 80241478 8E140000 */ lw $s4, ($s0) -/* BE020C 8024147C 26100004 */ addiu $s0, $s0, 4 -/* BE0210 80241480 0220202D */ daddu $a0, $s1, $zero -/* BE0214 80241484 0C0B1EAF */ jal get_variable -/* BE0218 80241488 0280282D */ daddu $a1, $s4, $zero -/* BE021C 8024148C 4482D000 */ mtc1 $v0, $f26 -/* BE0220 80241490 00000000 */ nop -/* BE0224 80241494 4680D6A0 */ cvt.s.w $f26, $f26 -/* BE0228 80241498 8E100000 */ lw $s0, ($s0) -/* BE022C 8024149C 0220202D */ daddu $a0, $s1, $zero -/* BE0230 802414A0 0C0B1EAF */ jal get_variable -/* BE0234 802414A4 0200282D */ daddu $a1, $s0, $zero -/* BE0238 802414A8 4482C000 */ mtc1 $v0, $f24 -/* BE023C 802414AC 00000000 */ nop -/* BE0240 802414B0 4680C620 */ cvt.s.w $f24, $f24 -/* BE0244 802414B4 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* BE0248 802414B8 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* BE024C 802414BC 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* BE0250 802414C0 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* BE0254 802414C4 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* BE0258 802414C8 44800000 */ mtc1 $zero, $f0 -/* BE025C 802414CC 00031080 */ sll $v0, $v1, 2 -/* BE0260 802414D0 00431021 */ addu $v0, $v0, $v1 -/* BE0264 802414D4 00021080 */ sll $v0, $v0, 2 -/* BE0268 802414D8 00431023 */ subu $v0, $v0, $v1 -/* BE026C 802414DC 000218C0 */ sll $v1, $v0, 3 -/* BE0270 802414E0 00431021 */ addu $v0, $v0, $v1 -/* BE0274 802414E4 000210C0 */ sll $v0, $v0, 3 -/* BE0278 802414E8 46001032 */ c.eq.s $f2, $f0 -/* BE027C 802414EC 3C01800B */ lui $at, 0x800b -/* BE0280 802414F0 00220821 */ addu $at, $at, $v0 -/* BE0284 802414F4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* BE0288 802414F8 45000005 */ bc1f .L80241510 -/* BE028C 802414FC 00000000 */ nop -/* BE0290 80241500 3C0142C8 */ lui $at, 0x42c8 -/* BE0294 80241504 44810000 */ mtc1 $at, $f0 -/* BE0298 80241508 08090548 */ j .L80241520 -/* BE029C 8024150C 4600B581 */ sub.s $f22, $f22, $f0 -.L80241510: -/* BE02A0 80241510 3C0142C8 */ lui $at, 0x42c8 -/* BE02A4 80241514 44810000 */ mtc1 $at, $f0 -/* BE02A8 80241518 00000000 */ nop -/* BE02AC 8024151C 4600B580 */ add.s $f22, $f22, $f0 -.L80241520: -/* BE02B0 80241520 0C00A6C9 */ jal clamp_angle -/* BE02B4 80241524 4600B306 */ mov.s $f12, $f22 -/* BE02B8 80241528 46000586 */ mov.s $f22, $f0 -/* BE02BC 8024152C 3C014170 */ lui $at, 0x4170 -/* BE02C0 80241530 4481A000 */ mtc1 $at, $f20 -/* BE02C4 80241534 0C00A8BB */ jal sin_deg -/* BE02C8 80241538 4600B306 */ mov.s $f12, $f22 -/* BE02CC 8024153C 46140002 */ mul.s $f0, $f0, $f20 -/* BE02D0 80241540 00000000 */ nop -/* BE02D4 80241544 864200B0 */ lh $v0, 0xb0($s2) -/* BE02D8 80241548 3C013F00 */ lui $at, 0x3f00 -/* BE02DC 8024154C 44812000 */ mtc1 $at, $f4 -/* BE02E0 80241550 44821000 */ mtc1 $v0, $f2 -/* BE02E4 80241554 00000000 */ nop -/* BE02E8 80241558 468010A0 */ cvt.s.w $f2, $f2 -/* BE02EC 8024155C 46041082 */ mul.s $f2, $f2, $f4 -/* BE02F0 80241560 00000000 */ nop -/* BE02F4 80241564 4600E700 */ add.s $f28, $f28, $f0 -/* BE02F8 80241568 4602D680 */ add.s $f26, $f26, $f2 -/* BE02FC 8024156C 0C00A8D4 */ jal cos_deg -/* BE0300 80241570 4600B306 */ mov.s $f12, $f22 -/* BE0304 80241574 46140002 */ mul.s $f0, $f0, $f20 -/* BE0308 80241578 00000000 */ nop -/* BE030C 8024157C 0220202D */ daddu $a0, $s1, $zero -/* BE0310 80241580 0260282D */ daddu $a1, $s3, $zero -/* BE0314 80241584 4600E18D */ trunc.w.s $f6, $f28 -/* BE0318 80241588 44063000 */ mfc1 $a2, $f6 -/* BE031C 8024158C 0C0B2026 */ jal set_variable -/* BE0320 80241590 4600C601 */ sub.s $f24, $f24, $f0 -/* BE0324 80241594 0220202D */ daddu $a0, $s1, $zero -/* BE0328 80241598 4600D18D */ trunc.w.s $f6, $f26 -/* BE032C 8024159C 44063000 */ mfc1 $a2, $f6 -/* BE0330 802415A0 0C0B2026 */ jal set_variable -/* BE0334 802415A4 0280282D */ daddu $a1, $s4, $zero -/* BE0338 802415A8 0220202D */ daddu $a0, $s1, $zero -/* BE033C 802415AC 4600C18D */ trunc.w.s $f6, $f24 -/* BE0340 802415B0 44063000 */ mfc1 $a2, $f6 -/* BE0344 802415B4 0C0B2026 */ jal set_variable -/* BE0348 802415B8 0200282D */ daddu $a1, $s0, $zero -/* BE034C 802415BC 8FBF0024 */ lw $ra, 0x24($sp) -/* BE0350 802415C0 8FB40020 */ lw $s4, 0x20($sp) -/* BE0354 802415C4 8FB3001C */ lw $s3, 0x1c($sp) -/* BE0358 802415C8 8FB20018 */ lw $s2, 0x18($sp) -/* BE035C 802415CC 8FB10014 */ lw $s1, 0x14($sp) -/* BE0360 802415D0 8FB00010 */ lw $s0, 0x10($sp) -/* BE0364 802415D4 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* BE0368 802415D8 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* BE036C 802415DC D7B80038 */ ldc1 $f24, 0x38($sp) -/* BE0370 802415E0 D7B60030 */ ldc1 $f22, 0x30($sp) -/* BE0374 802415E4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* BE0378 802415E8 24020002 */ addiu $v0, $zero, 2 -/* BE037C 802415EC 03E00008 */ jr $ra -/* BE0380 802415F0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_802415F4_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_802415F4_BDED90.s deleted file mode 100644 index d9c5671f2b..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_802415F4_BDED90.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415F4_BE0384 -/* BE0384 802415F4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BE0388 802415F8 AFBF0010 */ sw $ra, 0x10($sp) -/* BE038C 802415FC 10A00003 */ beqz $a1, .L8024160C -/* BE0390 80241600 8C86000C */ lw $a2, 0xc($a0) -/* BE0394 80241604 3C018024 */ lui $at, 0x8024 -/* BE0398 80241608 AC201CCC */ sw $zero, 0x1ccc($at) -.L8024160C: -/* BE039C 8024160C 3C038024 */ lui $v1, 0x8024 -/* BE03A0 80241610 24631CCC */ addiu $v1, $v1, 0x1ccc -/* BE03A4 80241614 8C620000 */ lw $v0, ($v1) -/* BE03A8 80241618 54400003 */ bnel $v0, $zero, .L80241628 -/* BE03AC 8024161C AC600000 */ sw $zero, ($v1) -/* BE03B0 80241620 0809058F */ j .L8024163C -/* BE03B4 80241624 0000102D */ daddu $v0, $zero, $zero -.L80241628: -/* BE03B8 80241628 8CC50000 */ lw $a1, ($a2) -/* BE03BC 8024162C 3C068024 */ lui $a2, 0x8024 -/* BE03C0 80241630 0C0B2026 */ jal set_variable -/* BE03C4 80241634 8CC61CD0 */ lw $a2, 0x1cd0($a2) -/* BE03C8 80241638 24020002 */ addiu $v0, $zero, 2 -.L8024163C: -/* BE03CC 8024163C 8FBF0010 */ lw $ra, 0x10($sp) -/* BE03D0 80241640 03E00008 */ jr $ra -/* BE03D4 80241644 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_03/func_80241680_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/func_80241680_BDED90.s deleted file mode 100644 index bc4568857d..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/func_80241680_BDED90.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241680_BE0410 -/* BE0410 80241680 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BE0414 80241684 AFBF0010 */ sw $ra, 0x10($sp) -/* BE0418 80241688 8C82000C */ lw $v0, 0xc($a0) -/* BE041C 8024168C 0C0B1EAF */ jal get_variable -/* BE0420 80241690 8C450000 */ lw $a1, ($v0) -/* BE0424 80241694 0040182D */ daddu $v1, $v0, $zero -/* BE0428 80241698 10600012 */ beqz $v1, .L802416E4 -/* BE042C 8024169C 0000202D */ daddu $a0, $zero, $zero -/* BE0430 802416A0 8C620000 */ lw $v0, ($v1) -/* BE0434 802416A4 5040000A */ beql $v0, $zero, .L802416D0 -/* BE0438 802416A8 00041080 */ sll $v0, $a0, 2 -/* BE043C 802416AC 3C058024 */ lui $a1, 0x8024 -/* BE0440 802416B0 24A54A20 */ addiu $a1, $a1, 0x4a20 -.L802416B4: -/* BE0444 802416B4 24630004 */ addiu $v1, $v1, 4 -/* BE0448 802416B8 24840001 */ addiu $a0, $a0, 1 -/* BE044C 802416BC ACA20000 */ sw $v0, ($a1) -/* BE0450 802416C0 8C620000 */ lw $v0, ($v1) -/* BE0454 802416C4 1440FFFB */ bnez $v0, .L802416B4 -/* BE0458 802416C8 24A50004 */ addiu $a1, $a1, 4 -/* BE045C 802416CC 00041080 */ sll $v0, $a0, 2 -.L802416D0: -/* BE0460 802416D0 3C018024 */ lui $at, 0x8024 -/* BE0464 802416D4 00220821 */ addu $at, $at, $v0 -/* BE0468 802416D8 AC204A20 */ sw $zero, 0x4a20($at) -/* BE046C 802416DC 080905C3 */ j .L8024170C -/* BE0470 802416E0 00000000 */ nop -.L802416E4: -/* BE0474 802416E4 3C038024 */ lui $v1, 0x8024 -/* BE0478 802416E8 24634A20 */ addiu $v1, $v1, 0x4a20 -/* BE047C 802416EC 0060282D */ daddu $a1, $v1, $zero -.L802416F0: -/* BE0480 802416F0 24820010 */ addiu $v0, $a0, 0x10 -/* BE0484 802416F4 AC620000 */ sw $v0, ($v1) -/* BE0488 802416F8 24630004 */ addiu $v1, $v1, 4 -/* BE048C 802416FC 24840001 */ addiu $a0, $a0, 1 -/* BE0490 80241700 28820070 */ slti $v0, $a0, 0x70 -/* BE0494 80241704 1440FFFA */ bnez $v0, .L802416F0 -/* BE0498 80241708 ACA001C0 */ sw $zero, 0x1c0($a1) -.L8024170C: -/* BE049C 8024170C 8FBF0010 */ lw $ra, 0x10($sp) -/* BE04A0 80241710 24020002 */ addiu $v0, $zero, 2 -/* BE04A4 80241714 03E00008 */ jr $ra -/* BE04A8 80241718 27BD0018 */ addiu $sp, $sp, 0x18 -/* BE04AC 8024171C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_80240158_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_80240158_BE37B0.s deleted file mode 100644 index 21dfde5b6a..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_80240158_BE37B0.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_BE3908 -/* BE3908 80240158 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* BE390C 8024015C AFB20038 */ sw $s2, 0x38($sp) -/* BE3910 80240160 0080902D */ daddu $s2, $a0, $zero -/* BE3914 80240164 AFBF0044 */ sw $ra, 0x44($sp) -/* BE3918 80240168 AFB40040 */ sw $s4, 0x40($sp) -/* BE391C 8024016C AFB3003C */ sw $s3, 0x3c($sp) -/* BE3920 80240170 AFB10034 */ sw $s1, 0x34($sp) -/* BE3924 80240174 AFB00030 */ sw $s0, 0x30($sp) -/* BE3928 80240178 F7B60050 */ sdc1 $f22, 0x50($sp) -/* BE392C 8024017C F7B40048 */ sdc1 $f20, 0x48($sp) -/* BE3930 80240180 8E510148 */ lw $s1, 0x148($s2) -/* BE3934 80240184 00A0982D */ daddu $s3, $a1, $zero -/* BE3938 80240188 86240008 */ lh $a0, 8($s1) -/* BE393C 8024018C 0C00EABB */ jal get_npc_unsafe -/* BE3940 80240190 00C0A02D */ daddu $s4, $a2, $zero -/* BE3944 80240194 8E630014 */ lw $v1, 0x14($s3) -/* BE3948 80240198 04600030 */ bltz $v1, .L8024025C -/* BE394C 8024019C 0040802D */ daddu $s0, $v0, $zero -/* BE3950 802401A0 8E420074 */ lw $v0, 0x74($s2) -/* BE3954 802401A4 1C40002C */ bgtz $v0, .L80240258 -/* BE3958 802401A8 2442FFFF */ addiu $v0, $v0, -1 -/* BE395C 802401AC 0280202D */ daddu $a0, $s4, $zero -/* BE3960 802401B0 AE430074 */ sw $v1, 0x74($s2) -/* BE3964 802401B4 AFA00010 */ sw $zero, 0x10($sp) -/* BE3968 802401B8 8E66000C */ lw $a2, 0xc($s3) -/* BE396C 802401BC 8E670010 */ lw $a3, 0x10($s3) -/* BE3970 802401C0 0C01242D */ jal func_800490B4 -/* BE3974 802401C4 0220282D */ daddu $a1, $s1, $zero -/* BE3978 802401C8 10400021 */ beqz $v0, .L80240250 -/* BE397C 802401CC 0000202D */ daddu $a0, $zero, $zero -/* BE3980 802401D0 0200282D */ daddu $a1, $s0, $zero -/* BE3984 802401D4 0000302D */ daddu $a2, $zero, $zero -/* BE3988 802401D8 860300A8 */ lh $v1, 0xa8($s0) -/* BE398C 802401DC 3C013F80 */ lui $at, 0x3f80 -/* BE3990 802401E0 44810000 */ mtc1 $at, $f0 -/* BE3994 802401E4 3C014000 */ lui $at, 0x4000 -/* BE3998 802401E8 44811000 */ mtc1 $at, $f2 -/* BE399C 802401EC 3C01C1A0 */ lui $at, 0xc1a0 -/* BE39A0 802401F0 44812000 */ mtc1 $at, $f4 -/* BE39A4 802401F4 2402000F */ addiu $v0, $zero, 0xf -/* BE39A8 802401F8 AFA2001C */ sw $v0, 0x1c($sp) -/* BE39AC 802401FC 44833000 */ mtc1 $v1, $f6 -/* BE39B0 80240200 00000000 */ nop -/* BE39B4 80240204 468031A0 */ cvt.s.w $f6, $f6 -/* BE39B8 80240208 44073000 */ mfc1 $a3, $f6 -/* BE39BC 8024020C 27A20028 */ addiu $v0, $sp, 0x28 -/* BE39C0 80240210 AFA20020 */ sw $v0, 0x20($sp) -/* BE39C4 80240214 E7A00010 */ swc1 $f0, 0x10($sp) -/* BE39C8 80240218 E7A20014 */ swc1 $f2, 0x14($sp) -/* BE39CC 8024021C 0C01BFA4 */ jal fx_emote -/* BE39D0 80240220 E7A40018 */ swc1 $f4, 0x18($sp) -/* BE39D4 80240224 0200202D */ daddu $a0, $s0, $zero -/* BE39D8 80240228 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BE39DC 8024022C 0C012530 */ jal func_800494C0 -/* BE39E0 80240230 3C060020 */ lui $a2, 0x20 -/* BE39E4 80240234 8E220018 */ lw $v0, 0x18($s1) -/* BE39E8 80240238 9442002A */ lhu $v0, 0x2a($v0) -/* BE39EC 8024023C 30420001 */ andi $v0, $v0, 1 -/* BE39F0 80240240 14400064 */ bnez $v0, .L802403D4 -/* BE39F4 80240244 2402000A */ addiu $v0, $zero, 0xa -/* BE39F8 80240248 080900F5 */ j .L802403D4 -/* BE39FC 8024024C 2402000C */ addiu $v0, $zero, 0xc -.L80240250: -/* BE3A00 80240250 8E420074 */ lw $v0, 0x74($s2) -/* BE3A04 80240254 2442FFFF */ addiu $v0, $v0, -1 -.L80240258: -/* BE3A08 80240258 AE420074 */ sw $v0, 0x74($s2) -.L8024025C: -/* BE3A0C 8024025C 8602008C */ lh $v0, 0x8c($s0) -/* BE3A10 80240260 1440005D */ bnez $v0, .L802403D8 -/* BE3A14 80240264 00000000 */ nop -/* BE3A18 80240268 C6000018 */ lwc1 $f0, 0x18($s0) -/* BE3A1C 8024026C 3C014010 */ lui $at, 0x4010 -/* BE3A20 80240270 44811800 */ mtc1 $at, $f3 -/* BE3A24 80240274 44801000 */ mtc1 $zero, $f2 -/* BE3A28 80240278 46000021 */ cvt.d.s $f0, $f0 -/* BE3A2C 8024027C 4622003C */ c.lt.d $f0, $f2 -/* BE3A30 80240280 00000000 */ nop -/* BE3A34 80240284 45000003 */ bc1f .L80240294 -/* BE3A38 80240288 0200202D */ daddu $a0, $s0, $zero -/* BE3A3C 8024028C 080900A6 */ j .L80240298 -/* BE3A40 80240290 0000282D */ daddu $a1, $zero, $zero -.L80240294: -/* BE3A44 80240294 24050001 */ addiu $a1, $zero, 1 -.L80240298: -/* BE3A48 80240298 0C00F598 */ jal func_8003D660 -/* BE3A4C 8024029C 00000000 */ nop -/* BE3A50 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE3A54 802402A4 8E430078 */ lw $v1, 0x78($s2) -/* BE3A58 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE3A5C 802402AC 00031040 */ sll $v0, $v1, 1 -/* BE3A60 802402B0 00431021 */ addu $v0, $v0, $v1 -/* BE3A64 802402B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* BE3A68 802402B8 00021080 */ sll $v0, $v0, 2 -/* BE3A6C 802402BC 00431021 */ addu $v0, $v0, $v1 -/* BE3A70 802402C0 C4560004 */ lwc1 $f22, 4($v0) -/* BE3A74 802402C4 4680B5A0 */ cvt.s.w $f22, $f22 -/* BE3A78 802402C8 C454000C */ lwc1 $f20, 0xc($v0) -/* BE3A7C 802402CC 4680A520 */ cvt.s.w $f20, $f20 -/* BE3A80 802402D0 4406B000 */ mfc1 $a2, $f22 -/* BE3A84 802402D4 4407A000 */ mfc1 $a3, $f20 -/* BE3A88 802402D8 0C00A720 */ jal atan2 -/* BE3A8C 802402DC 00000000 */ nop -/* BE3A90 802402E0 8E050018 */ lw $a1, 0x18($s0) -/* BE3A94 802402E4 44060000 */ mfc1 $a2, $f0 -/* BE3A98 802402E8 0200202D */ daddu $a0, $s0, $zero -/* BE3A9C 802402EC 0C00EA95 */ jal npc_move_heading -/* BE3AA0 802402F0 AE06000C */ sw $a2, 0xc($s0) -/* BE3AA4 802402F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE3AA8 802402F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE3AAC 802402FC 4406B000 */ mfc1 $a2, $f22 -/* BE3AB0 80240300 4407A000 */ mfc1 $a3, $f20 -/* BE3AB4 80240304 0C00A7B5 */ jal dist2D -/* BE3AB8 80240308 00000000 */ nop -/* BE3ABC 8024030C C6020018 */ lwc1 $f2, 0x18($s0) -/* BE3AC0 80240310 4602003E */ c.le.s $f0, $f2 -/* BE3AC4 80240314 00000000 */ nop -/* BE3AC8 80240318 4500002F */ bc1f .L802403D8 -/* BE3ACC 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BE3AD0 80240320 24020002 */ addiu $v0, $zero, 2 -/* BE3AD4 80240324 0C00A67F */ jal rand_int -/* BE3AD8 80240328 AE420070 */ sw $v0, 0x70($s2) -/* BE3ADC 8024032C 3C035555 */ lui $v1, 0x5555 -/* BE3AE0 80240330 34635556 */ ori $v1, $v1, 0x5556 -/* BE3AE4 80240334 00430018 */ mult $v0, $v1 -/* BE3AE8 80240338 000227C3 */ sra $a0, $v0, 0x1f -/* BE3AEC 8024033C 00004010 */ mfhi $t0 -/* BE3AF0 80240340 01042023 */ subu $a0, $t0, $a0 -/* BE3AF4 80240344 00041840 */ sll $v1, $a0, 1 -/* BE3AF8 80240348 00641821 */ addu $v1, $v1, $a0 -/* BE3AFC 8024034C 00431023 */ subu $v0, $v0, $v1 -/* BE3B00 80240350 24430002 */ addiu $v1, $v0, 2 -/* BE3B04 80240354 AE430074 */ sw $v1, 0x74($s2) -/* BE3B08 80240358 8E62002C */ lw $v0, 0x2c($s3) -/* BE3B0C 8024035C 18400009 */ blez $v0, .L80240384 -/* BE3B10 80240360 24020004 */ addiu $v0, $zero, 4 -/* BE3B14 80240364 8E620004 */ lw $v0, 4($s3) -/* BE3B18 80240368 18400006 */ blez $v0, .L80240384 -/* BE3B1C 8024036C 24020004 */ addiu $v0, $zero, 4 -/* BE3B20 80240370 8E620008 */ lw $v0, 8($s3) -/* BE3B24 80240374 18400003 */ blez $v0, .L80240384 -/* BE3B28 80240378 24020004 */ addiu $v0, $zero, 4 -/* BE3B2C 8024037C 14600002 */ bnez $v1, .L80240388 -/* BE3B30 80240380 00000000 */ nop -.L80240384: -/* BE3B34 80240384 AE420070 */ sw $v0, 0x70($s2) -.L80240388: -/* BE3B38 80240388 0C00A67F */ jal rand_int -/* BE3B3C 8024038C 24042710 */ addiu $a0, $zero, 0x2710 -/* BE3B40 80240390 3C0351EB */ lui $v1, 0x51eb -/* BE3B44 80240394 3463851F */ ori $v1, $v1, 0x851f -/* BE3B48 80240398 00430018 */ mult $v0, $v1 -/* BE3B4C 8024039C 00021FC3 */ sra $v1, $v0, 0x1f -/* BE3B50 802403A0 00004010 */ mfhi $t0 -/* BE3B54 802403A4 00082143 */ sra $a0, $t0, 5 -/* BE3B58 802403A8 00832023 */ subu $a0, $a0, $v1 -/* BE3B5C 802403AC 00041840 */ sll $v1, $a0, 1 -/* BE3B60 802403B0 00641821 */ addu $v1, $v1, $a0 -/* BE3B64 802403B4 000318C0 */ sll $v1, $v1, 3 -/* BE3B68 802403B8 00641821 */ addu $v1, $v1, $a0 -/* BE3B6C 802403BC 00031880 */ sll $v1, $v1, 2 -/* BE3B70 802403C0 8E640004 */ lw $a0, 4($s3) -/* BE3B74 802403C4 00431023 */ subu $v0, $v0, $v1 -/* BE3B78 802403C8 0044102A */ slt $v0, $v0, $a0 -/* BE3B7C 802403CC 10400002 */ beqz $v0, .L802403D8 -/* BE3B80 802403D0 24020004 */ addiu $v0, $zero, 4 -.L802403D4: -/* BE3B84 802403D4 AE420070 */ sw $v0, 0x70($s2) -.L802403D8: -/* BE3B88 802403D8 8FBF0044 */ lw $ra, 0x44($sp) -/* BE3B8C 802403DC 8FB40040 */ lw $s4, 0x40($sp) -/* BE3B90 802403E0 8FB3003C */ lw $s3, 0x3c($sp) -/* BE3B94 802403E4 8FB20038 */ lw $s2, 0x38($sp) -/* BE3B98 802403E8 8FB10034 */ lw $s1, 0x34($sp) -/* BE3B9C 802403EC 8FB00030 */ lw $s0, 0x30($sp) -/* BE3BA0 802403F0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* BE3BA4 802403F4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* BE3BA8 802403F8 03E00008 */ jr $ra -/* BE3BAC 802403FC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_80240400_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_80240400_BE37B0.s deleted file mode 100644 index 868f370745..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_80240400_BE37B0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_BE3BB0 -/* BE3BB0 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BE3BB4 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* BE3BB8 80240408 0080982D */ daddu $s3, $a0, $zero -/* BE3BBC 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* BE3BC0 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* BE3BC4 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* BE3BC8 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* BE3BCC 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* BE3BD0 80240420 86440008 */ lh $a0, 8($s2) -/* BE3BD4 80240424 0C00EABB */ jal get_npc_unsafe -/* BE3BD8 80240428 00A0882D */ daddu $s1, $a1, $zero -/* BE3BDC 8024042C 8E240008 */ lw $a0, 8($s1) -/* BE3BE0 80240430 0040802D */ daddu $s0, $v0, $zero -/* BE3BE4 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* BE3BE8 80240438 00832021 */ addu $a0, $a0, $v1 -/* BE3BEC 8024043C 00042043 */ sra $a0, $a0, 1 -/* BE3BF0 80240440 0C00A67F */ jal rand_int -/* BE3BF4 80240444 24840001 */ addiu $a0, $a0, 1 -/* BE3BF8 80240448 8E230008 */ lw $v1, 8($s1) -/* BE3BFC 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* BE3C00 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* BE3C04 80240454 00651821 */ addu $v1, $v1, $a1 -/* BE3C08 80240458 00031843 */ sra $v1, $v1, 1 -/* BE3C0C 8024045C 00621821 */ addu $v1, $v1, $v0 -/* BE3C10 80240460 0C00A67F */ jal rand_int -/* BE3C14 80240464 A603008E */ sh $v1, 0x8e($s0) -/* BE3C18 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* BE3C1C 8024046C 44820000 */ mtc1 $v0, $f0 -/* BE3C20 80240470 00000000 */ nop -/* BE3C24 80240474 46800020 */ cvt.s.w $f0, $f0 -/* BE3C28 80240478 46006300 */ add.s $f12, $f12, $f0 -/* BE3C2C 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* BE3C30 80240480 44810000 */ mtc1 $at, $f0 -/* BE3C34 80240484 0C00A6C9 */ jal clamp_angle -/* BE3C38 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* BE3C3C 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* BE3C40 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* BE3C44 80240494 8C420000 */ lw $v0, ($v0) -/* BE3C48 80240498 AE020028 */ sw $v0, 0x28($s0) -/* BE3C4C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* BE3C50 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* BE3C54 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* BE3C58 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* BE3C5C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* BE3C60 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* BE3C64 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* BE3C68 802404B8 03E00008 */ jr $ra -/* BE3C6C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_802404C0_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_802404C0_BE37B0.s deleted file mode 100644 index ce11e3c80c..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_802404C0_BE37B0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_BE3C70 -/* BE3C70 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BE3C74 802404C4 AFB40040 */ sw $s4, 0x40($sp) -/* BE3C78 802404C8 0080A02D */ daddu $s4, $a0, $zero -/* BE3C7C 802404CC AFBF0044 */ sw $ra, 0x44($sp) -/* BE3C80 802404D0 AFB3003C */ sw $s3, 0x3c($sp) -/* BE3C84 802404D4 AFB20038 */ sw $s2, 0x38($sp) -/* BE3C88 802404D8 AFB10034 */ sw $s1, 0x34($sp) -/* BE3C8C 802404DC AFB00030 */ sw $s0, 0x30($sp) -/* BE3C90 802404E0 8E910148 */ lw $s1, 0x148($s4) -/* BE3C94 802404E4 00A0902D */ daddu $s2, $a1, $zero -/* BE3C98 802404E8 86240008 */ lh $a0, 8($s1) -/* BE3C9C 802404EC 0C00EABB */ jal get_npc_unsafe -/* BE3CA0 802404F0 00C0982D */ daddu $s3, $a2, $zero -/* BE3CA4 802404F4 8E430014 */ lw $v1, 0x14($s2) -/* BE3CA8 802404F8 04600031 */ bltz $v1, .L802405C0 -/* BE3CAC 802404FC 0040802D */ daddu $s0, $v0, $zero -/* BE3CB0 80240500 0260202D */ daddu $a0, $s3, $zero -/* BE3CB4 80240504 AFA00010 */ sw $zero, 0x10($sp) -/* BE3CB8 80240508 8E460024 */ lw $a2, 0x24($s2) -/* BE3CBC 8024050C 8E470028 */ lw $a3, 0x28($s2) -/* BE3CC0 80240510 0C01242D */ jal func_800490B4 -/* BE3CC4 80240514 0220282D */ daddu $a1, $s1, $zero -/* BE3CC8 80240518 10400029 */ beqz $v0, .L802405C0 -/* BE3CCC 8024051C 0000202D */ daddu $a0, $zero, $zero -/* BE3CD0 80240520 0200282D */ daddu $a1, $s0, $zero -/* BE3CD4 80240524 0000302D */ daddu $a2, $zero, $zero -/* BE3CD8 80240528 860300A8 */ lh $v1, 0xa8($s0) -/* BE3CDC 8024052C 3C013F80 */ lui $at, 0x3f80 -/* BE3CE0 80240530 44810000 */ mtc1 $at, $f0 -/* BE3CE4 80240534 3C014000 */ lui $at, 0x4000 -/* BE3CE8 80240538 44811000 */ mtc1 $at, $f2 -/* BE3CEC 8024053C 3C01C1A0 */ lui $at, 0xc1a0 -/* BE3CF0 80240540 44812000 */ mtc1 $at, $f4 -/* BE3CF4 80240544 2402000F */ addiu $v0, $zero, 0xf -/* BE3CF8 80240548 AFA2001C */ sw $v0, 0x1c($sp) -/* BE3CFC 8024054C 44833000 */ mtc1 $v1, $f6 -/* BE3D00 80240550 00000000 */ nop -/* BE3D04 80240554 468031A0 */ cvt.s.w $f6, $f6 -/* BE3D08 80240558 44073000 */ mfc1 $a3, $f6 -/* BE3D0C 8024055C 27A20028 */ addiu $v0, $sp, 0x28 -/* BE3D10 80240560 AFA20020 */ sw $v0, 0x20($sp) -/* BE3D14 80240564 E7A00010 */ swc1 $f0, 0x10($sp) -/* BE3D18 80240568 E7A20014 */ swc1 $f2, 0x14($sp) -/* BE3D1C 8024056C 0C01BFA4 */ jal fx_emote -/* BE3D20 80240570 E7A40018 */ swc1 $f4, 0x18($sp) -/* BE3D24 80240574 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BE3D28 80240578 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BE3D2C 8024057C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE3D30 80240580 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE3D34 80240584 8C460028 */ lw $a2, 0x28($v0) -/* BE3D38 80240588 0C00A720 */ jal atan2 -/* BE3D3C 8024058C 8C470030 */ lw $a3, 0x30($v0) -/* BE3D40 80240590 0200202D */ daddu $a0, $s0, $zero -/* BE3D44 80240594 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BE3D48 80240598 3C060020 */ lui $a2, 0x20 -/* BE3D4C 8024059C 0C012530 */ jal func_800494C0 -/* BE3D50 802405A0 E480000C */ swc1 $f0, 0xc($a0) -/* BE3D54 802405A4 8E220018 */ lw $v0, 0x18($s1) -/* BE3D58 802405A8 9442002A */ lhu $v0, 0x2a($v0) -/* BE3D5C 802405AC 30420001 */ andi $v0, $v0, 1 -/* BE3D60 802405B0 14400029 */ bnez $v0, .L80240658 -/* BE3D64 802405B4 2402000A */ addiu $v0, $zero, 0xa -/* BE3D68 802405B8 08090196 */ j .L80240658 -/* BE3D6C 802405BC 2402000C */ addiu $v0, $zero, 0xc -.L802405C0: -/* BE3D70 802405C0 8602008C */ lh $v0, 0x8c($s0) -/* BE3D74 802405C4 14400025 */ bnez $v0, .L8024065C -/* BE3D78 802405C8 00000000 */ nop -/* BE3D7C 802405CC 9602008E */ lhu $v0, 0x8e($s0) -/* BE3D80 802405D0 2442FFFF */ addiu $v0, $v0, -1 -/* BE3D84 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* BE3D88 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* BE3D8C 802405DC 1440001F */ bnez $v0, .L8024065C -/* BE3D90 802405E0 00000000 */ nop -/* BE3D94 802405E4 8E820074 */ lw $v0, 0x74($s4) -/* BE3D98 802405E8 2442FFFF */ addiu $v0, $v0, -1 -/* BE3D9C 802405EC 10400019 */ beqz $v0, .L80240654 -/* BE3DA0 802405F0 AE820074 */ sw $v0, 0x74($s4) -/* BE3DA4 802405F4 8E220018 */ lw $v0, 0x18($s1) -/* BE3DA8 802405F8 9442002A */ lhu $v0, 0x2a($v0) -/* BE3DAC 802405FC 30420010 */ andi $v0, $v0, 0x10 -/* BE3DB0 80240600 14400007 */ bnez $v0, .L80240620 -/* BE3DB4 80240604 00000000 */ nop -/* BE3DB8 80240608 C600000C */ lwc1 $f0, 0xc($s0) -/* BE3DBC 8024060C 3C014334 */ lui $at, 0x4334 -/* BE3DC0 80240610 44816000 */ mtc1 $at, $f12 -/* BE3DC4 80240614 0C00A6C9 */ jal clamp_angle -/* BE3DC8 80240618 460C0300 */ add.s $f12, $f0, $f12 -/* BE3DCC 8024061C E600000C */ swc1 $f0, 0xc($s0) -.L80240620: -/* BE3DD0 80240620 8E440008 */ lw $a0, 8($s2) -/* BE3DD4 80240624 000417C2 */ srl $v0, $a0, 0x1f -/* BE3DD8 80240628 00822021 */ addu $a0, $a0, $v0 -/* BE3DDC 8024062C 00042043 */ sra $a0, $a0, 1 -/* BE3DE0 80240630 0C00A67F */ jal rand_int -/* BE3DE4 80240634 24840001 */ addiu $a0, $a0, 1 -/* BE3DE8 80240638 8E430008 */ lw $v1, 8($s2) -/* BE3DEC 8024063C 000327C2 */ srl $a0, $v1, 0x1f -/* BE3DF0 80240640 00641821 */ addu $v1, $v1, $a0 -/* BE3DF4 80240644 00031843 */ sra $v1, $v1, 1 -/* BE3DF8 80240648 00621821 */ addu $v1, $v1, $v0 -/* BE3DFC 8024064C 08090197 */ j .L8024065C -/* BE3E00 80240650 A603008E */ sh $v1, 0x8e($s0) -.L80240654: -/* BE3E04 80240654 24020004 */ addiu $v0, $zero, 4 -.L80240658: -/* BE3E08 80240658 AE820070 */ sw $v0, 0x70($s4) -.L8024065C: -/* BE3E0C 8024065C 8FBF0044 */ lw $ra, 0x44($sp) -/* BE3E10 80240660 8FB40040 */ lw $s4, 0x40($sp) -/* BE3E14 80240664 8FB3003C */ lw $s3, 0x3c($sp) -/* BE3E18 80240668 8FB20038 */ lw $s2, 0x38($sp) -/* BE3E1C 8024066C 8FB10034 */ lw $s1, 0x34($sp) -/* BE3E20 80240670 8FB00030 */ lw $s0, 0x30($sp) -/* BE3E24 80240674 03E00008 */ jr $ra -/* BE3E28 80240678 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_8024067C_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_8024067C_BE37B0.s deleted file mode 100644 index 3ac7359e2c..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_8024067C_BE37B0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024067C_BE3E2C -/* BE3E2C 8024067C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE3E30 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* BE3E34 80240684 0080882D */ daddu $s1, $a0, $zero -/* BE3E38 80240688 AFBF001C */ sw $ra, 0x1c($sp) -/* BE3E3C 8024068C AFB20018 */ sw $s2, 0x18($sp) -/* BE3E40 80240690 AFB00010 */ sw $s0, 0x10($sp) -/* BE3E44 80240694 8E300148 */ lw $s0, 0x148($s1) -/* BE3E48 80240698 86040008 */ lh $a0, 8($s0) -/* BE3E4C 8024069C 0C00EABB */ jal get_npc_unsafe -/* BE3E50 802406A0 00A0902D */ daddu $s2, $a1, $zero -/* BE3E54 802406A4 8E230078 */ lw $v1, 0x78($s1) -/* BE3E58 802406A8 24630001 */ addiu $v1, $v1, 1 -/* BE3E5C 802406AC AE230078 */ sw $v1, 0x78($s1) -/* BE3E60 802406B0 8E0400D0 */ lw $a0, 0xd0($s0) -/* BE3E64 802406B4 8C840000 */ lw $a0, ($a0) -/* BE3E68 802406B8 0064182A */ slt $v1, $v1, $a0 -/* BE3E6C 802406BC 14600002 */ bnez $v1, .L802406C8 -/* BE3E70 802406C0 0040282D */ daddu $a1, $v0, $zero -/* BE3E74 802406C4 AE200078 */ sw $zero, 0x78($s1) -.L802406C8: -/* BE3E78 802406C8 8E0200CC */ lw $v0, 0xcc($s0) -/* BE3E7C 802406CC 8C420004 */ lw $v0, 4($v0) -/* BE3E80 802406D0 ACA20028 */ sw $v0, 0x28($a1) -/* BE3E84 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* BE3E88 802406D8 8C42007C */ lw $v0, 0x7c($v0) -/* BE3E8C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* BE3E90 802406E0 00000000 */ nop -/* BE3E94 802406E4 C6400000 */ lwc1 $f0, ($s2) -/* BE3E98 802406E8 080901C4 */ j .L80240710 -/* BE3E9C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) -.L802406F0: -/* BE3EA0 802406F0 3C018024 */ lui $at, 0x8024 -/* BE3EA4 802406F4 D4224138 */ ldc1 $f2, 0x4138($at) -/* BE3EA8 802406F8 44820000 */ mtc1 $v0, $f0 -/* BE3EAC 802406FC 00000000 */ nop -/* BE3EB0 80240700 46800021 */ cvt.d.w $f0, $f0 -/* BE3EB4 80240704 46220003 */ div.d $f0, $f0, $f2 -/* BE3EB8 80240708 46200020 */ cvt.s.d $f0, $f0 -/* BE3EBC 8024070C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240710: -/* BE3EC0 80240710 24020001 */ addiu $v0, $zero, 1 -/* BE3EC4 80240714 AE220070 */ sw $v0, 0x70($s1) -/* BE3EC8 80240718 8FBF001C */ lw $ra, 0x1c($sp) -/* BE3ECC 8024071C 8FB20018 */ lw $s2, 0x18($sp) -/* BE3ED0 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* BE3ED4 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* BE3ED8 80240728 03E00008 */ jr $ra -/* BE3EDC 8024072C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_80240730_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_80240730_BE37B0.s deleted file mode 100644 index 89dd223ba0..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_80240730_BE37B0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_BE3EE0 -/* BE3EE0 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE3EE4 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* BE3EE8 80240738 0080882D */ daddu $s1, $a0, $zero -/* BE3EEC 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* BE3EF0 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* BE3EF4 80240744 8E300148 */ lw $s0, 0x148($s1) -/* BE3EF8 80240748 0C00EABB */ jal get_npc_unsafe -/* BE3EFC 8024074C 86040008 */ lh $a0, 8($s0) -/* BE3F00 80240750 8E0300CC */ lw $v1, 0xcc($s0) -/* BE3F04 80240754 3C014120 */ lui $at, 0x4120 -/* BE3F08 80240758 44812000 */ mtc1 $at, $f4 -/* BE3F0C 8024075C 3C014000 */ lui $at, 0x4000 -/* BE3F10 80240760 44810000 */ mtc1 $at, $f0 -/* BE3F14 80240764 C442003C */ lwc1 $f2, 0x3c($v0) -/* BE3F18 80240768 8C640010 */ lw $a0, 0x10($v1) -/* BE3F1C 8024076C 8C430000 */ lw $v1, ($v0) -/* BE3F20 80240770 E444001C */ swc1 $f4, 0x1c($v0) -/* BE3F24 80240774 E4400014 */ swc1 $f0, 0x14($v0) -/* BE3F28 80240778 E4420064 */ swc1 $f2, 0x64($v0) -/* BE3F2C 8024077C 34630800 */ ori $v1, $v1, 0x800 -/* BE3F30 80240780 AC430000 */ sw $v1, ($v0) -/* BE3F34 80240784 AC440028 */ sw $a0, 0x28($v0) -/* BE3F38 80240788 2402000B */ addiu $v0, $zero, 0xb -/* BE3F3C 8024078C AE220070 */ sw $v0, 0x70($s1) -/* BE3F40 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* BE3F44 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* BE3F48 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* BE3F4C 8024079C 03E00008 */ jr $ra -/* BE3F50 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_802407A4_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_802407A4_BE37B0.s deleted file mode 100644 index 2d808f5d49..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_802407A4_BE37B0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4_BE3F54 -/* BE3F54 802407A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BE3F58 802407A8 AFB00010 */ sw $s0, 0x10($sp) -/* BE3F5C 802407AC 0080802D */ daddu $s0, $a0, $zero -/* BE3F60 802407B0 AFBF0014 */ sw $ra, 0x14($sp) -/* BE3F64 802407B4 8E020148 */ lw $v0, 0x148($s0) -/* BE3F68 802407B8 0C00EABB */ jal get_npc_unsafe -/* BE3F6C 802407BC 84440008 */ lh $a0, 8($v0) -/* BE3F70 802407C0 0040202D */ daddu $a0, $v0, $zero -/* BE3F74 802407C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* BE3F78 802407C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* BE3F7C 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* BE3F80 802407D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* BE3F84 802407D4 46040001 */ sub.s $f0, $f0, $f4 -/* BE3F88 802407D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* BE3F8C 802407DC 4602203C */ c.lt.s $f4, $f2 -/* BE3F90 802407E0 E482003C */ swc1 $f2, 0x3c($a0) -/* BE3F94 802407E4 45010009 */ bc1t .L8024080C -/* BE3F98 802407E8 E480001C */ swc1 $f0, 0x1c($a0) -/* BE3F9C 802407EC 8C820000 */ lw $v0, ($a0) -/* BE3FA0 802407F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* BE3FA4 802407F4 E484003C */ swc1 $f4, 0x3c($a0) -/* BE3FA8 802407F8 AC80001C */ sw $zero, 0x1c($a0) -/* BE3FAC 802407FC 00431024 */ and $v0, $v0, $v1 -/* BE3FB0 80240800 AC820000 */ sw $v0, ($a0) -/* BE3FB4 80240804 2402000C */ addiu $v0, $zero, 0xc -/* BE3FB8 80240808 AE020070 */ sw $v0, 0x70($s0) -.L8024080C: -/* BE3FBC 8024080C 8FBF0014 */ lw $ra, 0x14($sp) -/* BE3FC0 80240810 8FB00010 */ lw $s0, 0x10($sp) -/* BE3FC4 80240814 03E00008 */ jr $ra -/* BE3FC8 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_8024081C_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_8024081C_BE37B0.s deleted file mode 100644 index f98bc29ef2..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_8024081C_BE37B0.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024081C_BE3FCC -/* BE3FCC 8024081C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BE3FD0 80240820 AFB3001C */ sw $s3, 0x1c($sp) -/* BE3FD4 80240824 0080982D */ daddu $s3, $a0, $zero -/* BE3FD8 80240828 AFBF0020 */ sw $ra, 0x20($sp) -/* BE3FDC 8024082C AFB20018 */ sw $s2, 0x18($sp) -/* BE3FE0 80240830 AFB10014 */ sw $s1, 0x14($sp) -/* BE3FE4 80240834 AFB00010 */ sw $s0, 0x10($sp) -/* BE3FE8 80240838 F7B40028 */ sdc1 $f20, 0x28($sp) -/* BE3FEC 8024083C 8E710148 */ lw $s1, 0x148($s3) -/* BE3FF0 80240840 86240008 */ lh $a0, 8($s1) -/* BE3FF4 80240844 0C00EABB */ jal get_npc_unsafe -/* BE3FF8 80240848 00A0802D */ daddu $s0, $a1, $zero -/* BE3FFC 8024084C 8E040020 */ lw $a0, 0x20($s0) -/* BE4000 80240850 0040902D */ daddu $s2, $v0, $zero -/* BE4004 80240854 00041FC2 */ srl $v1, $a0, 0x1f -/* BE4008 80240858 00832021 */ addu $a0, $a0, $v1 -/* BE400C 8024085C 00042043 */ sra $a0, $a0, 1 -/* BE4010 80240860 0C00A67F */ jal rand_int -/* BE4014 80240864 24840001 */ addiu $a0, $a0, 1 -/* BE4018 80240868 8E030020 */ lw $v1, 0x20($s0) -/* BE401C 8024086C C64C0038 */ lwc1 $f12, 0x38($s2) -/* BE4020 80240870 000327C2 */ srl $a0, $v1, 0x1f -/* BE4024 80240874 00641821 */ addu $v1, $v1, $a0 -/* BE4028 80240878 00031843 */ sra $v1, $v1, 1 -/* BE402C 8024087C 00621821 */ addu $v1, $v1, $v0 -/* BE4030 80240880 A643008E */ sh $v1, 0x8e($s2) -/* BE4034 80240884 8E2200CC */ lw $v0, 0xcc($s1) -/* BE4038 80240888 C64E0040 */ lwc1 $f14, 0x40($s2) -/* BE403C 8024088C 8C42000C */ lw $v0, 0xc($v0) -/* BE4040 80240890 AE420028 */ sw $v0, 0x28($s2) -/* BE4044 80240894 C6000018 */ lwc1 $f0, 0x18($s0) -/* BE4048 80240898 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BE404C 8024089C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BE4050 802408A0 E6400018 */ swc1 $f0, 0x18($s2) -/* BE4054 802408A4 8C460028 */ lw $a2, 0x28($v0) -/* BE4058 802408A8 0C00A720 */ jal atan2 -/* BE405C 802408AC 8C470030 */ lw $a3, 0x30($v0) -/* BE4060 802408B0 46000506 */ mov.s $f20, $f0 -/* BE4064 802408B4 C64C000C */ lwc1 $f12, 0xc($s2) -/* BE4068 802408B8 0C00A70A */ jal get_clamped_angle_diff -/* BE406C 802408BC 4600A386 */ mov.s $f14, $f20 -/* BE4070 802408C0 46000086 */ mov.s $f2, $f0 -/* BE4074 802408C4 8E02001C */ lw $v0, 0x1c($s0) -/* BE4078 802408C8 46001005 */ abs.s $f0, $f2 -/* BE407C 802408CC 44822000 */ mtc1 $v0, $f4 -/* BE4080 802408D0 00000000 */ nop -/* BE4084 802408D4 46802120 */ cvt.s.w $f4, $f4 -/* BE4088 802408D8 4600203C */ c.lt.s $f4, $f0 -/* BE408C 802408DC 00000000 */ nop -/* BE4090 802408E0 4500000D */ bc1f .L80240918 -/* BE4094 802408E4 00000000 */ nop -/* BE4098 802408E8 44800000 */ mtc1 $zero, $f0 -/* BE409C 802408EC C654000C */ lwc1 $f20, 0xc($s2) -/* BE40A0 802408F0 4600103C */ c.lt.s $f2, $f0 -/* BE40A4 802408F4 00000000 */ nop -/* BE40A8 802408F8 45000006 */ bc1f .L80240914 -/* BE40AC 802408FC 00021023 */ negu $v0, $v0 -/* BE40B0 80240900 44820000 */ mtc1 $v0, $f0 -/* BE40B4 80240904 00000000 */ nop -/* BE40B8 80240908 46800020 */ cvt.s.w $f0, $f0 -/* BE40BC 8024090C 08090246 */ j .L80240918 -/* BE40C0 80240910 4600A500 */ add.s $f20, $f20, $f0 -.L80240914: -/* BE40C4 80240914 4604A500 */ add.s $f20, $f20, $f4 -.L80240918: -/* BE40C8 80240918 0C00A6C9 */ jal clamp_angle -/* BE40CC 8024091C 4600A306 */ mov.s $f12, $f20 -/* BE40D0 80240920 2402000D */ addiu $v0, $zero, 0xd -/* BE40D4 80240924 E640000C */ swc1 $f0, 0xc($s2) -/* BE40D8 80240928 AE620070 */ sw $v0, 0x70($s3) -/* BE40DC 8024092C 8FBF0020 */ lw $ra, 0x20($sp) -/* BE40E0 80240930 8FB3001C */ lw $s3, 0x1c($sp) -/* BE40E4 80240934 8FB20018 */ lw $s2, 0x18($sp) -/* BE40E8 80240938 8FB10014 */ lw $s1, 0x14($sp) -/* BE40EC 8024093C 8FB00010 */ lw $s0, 0x10($sp) -/* BE40F0 80240940 D7B40028 */ ldc1 $f20, 0x28($sp) -/* BE40F4 80240944 03E00008 */ jr $ra -/* BE40F8 80240948 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_8024094C_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_8024094C_BE37B0.s deleted file mode 100644 index 1fe9217499..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_8024094C_BE37B0.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024094C_BE40FC -/* BE40FC 8024094C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BE4100 80240950 AFB3003C */ sw $s3, 0x3c($sp) -/* BE4104 80240954 0080982D */ daddu $s3, $a0, $zero -/* BE4108 80240958 AFBF0040 */ sw $ra, 0x40($sp) -/* BE410C 8024095C AFB20038 */ sw $s2, 0x38($sp) -/* BE4110 80240960 AFB10034 */ sw $s1, 0x34($sp) -/* BE4114 80240964 AFB00030 */ sw $s0, 0x30($sp) -/* BE4118 80240968 8E720148 */ lw $s2, 0x148($s3) -/* BE411C 8024096C 00A0882D */ daddu $s1, $a1, $zero -/* BE4120 80240970 86440008 */ lh $a0, 8($s2) -/* BE4124 80240974 0C00EABB */ jal get_npc_unsafe -/* BE4128 80240978 00C0802D */ daddu $s0, $a2, $zero -/* BE412C 8024097C 0200202D */ daddu $a0, $s0, $zero -/* BE4130 80240980 0240282D */ daddu $a1, $s2, $zero -/* BE4134 80240984 24030001 */ addiu $v1, $zero, 1 -/* BE4138 80240988 AFA30010 */ sw $v1, 0x10($sp) -/* BE413C 8024098C 8E260024 */ lw $a2, 0x24($s1) -/* BE4140 80240990 8E270028 */ lw $a3, 0x28($s1) -/* BE4144 80240994 0C01242D */ jal func_800490B4 -/* BE4148 80240998 0040802D */ daddu $s0, $v0, $zero -/* BE414C 8024099C 1440001E */ bnez $v0, .L80240A18 -/* BE4150 802409A0 0200202D */ daddu $a0, $s0, $zero -/* BE4154 802409A4 24040002 */ addiu $a0, $zero, 2 -/* BE4158 802409A8 0200282D */ daddu $a1, $s0, $zero -/* BE415C 802409AC 0000302D */ daddu $a2, $zero, $zero -/* BE4160 802409B0 860300A8 */ lh $v1, 0xa8($s0) -/* BE4164 802409B4 3C013F80 */ lui $at, 0x3f80 -/* BE4168 802409B8 44810000 */ mtc1 $at, $f0 -/* BE416C 802409BC 3C014000 */ lui $at, 0x4000 -/* BE4170 802409C0 44811000 */ mtc1 $at, $f2 -/* BE4174 802409C4 3C01C1A0 */ lui $at, 0xc1a0 -/* BE4178 802409C8 44812000 */ mtc1 $at, $f4 -/* BE417C 802409CC 2402000F */ addiu $v0, $zero, 0xf -/* BE4180 802409D0 AFA2001C */ sw $v0, 0x1c($sp) -/* BE4184 802409D4 44833000 */ mtc1 $v1, $f6 -/* BE4188 802409D8 00000000 */ nop -/* BE418C 802409DC 468031A0 */ cvt.s.w $f6, $f6 -/* BE4190 802409E0 44073000 */ mfc1 $a3, $f6 -/* BE4194 802409E4 27A20028 */ addiu $v0, $sp, 0x28 -/* BE4198 802409E8 AFA20020 */ sw $v0, 0x20($sp) -/* BE419C 802409EC E7A00010 */ swc1 $f0, 0x10($sp) -/* BE41A0 802409F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* BE41A4 802409F4 0C01BFA4 */ jal fx_emote -/* BE41A8 802409F8 E7A40018 */ swc1 $f4, 0x18($sp) -/* BE41AC 802409FC 8E4200CC */ lw $v0, 0xcc($s2) -/* BE41B0 80240A00 8C430000 */ lw $v1, ($v0) -/* BE41B4 80240A04 24020019 */ addiu $v0, $zero, 0x19 -/* BE41B8 80240A08 A602008E */ sh $v0, 0x8e($s0) -/* BE41BC 80240A0C 2402000E */ addiu $v0, $zero, 0xe -/* BE41C0 80240A10 08090293 */ j .L80240A4C -/* BE41C4 80240A14 AE030028 */ sw $v1, 0x28($s0) -.L80240A18: -/* BE41C8 80240A18 0C00F598 */ jal func_8003D660 -/* BE41CC 80240A1C 24050001 */ addiu $a1, $zero, 1 -/* BE41D0 80240A20 8E050018 */ lw $a1, 0x18($s0) -/* BE41D4 80240A24 8E06000C */ lw $a2, 0xc($s0) -/* BE41D8 80240A28 0C00EA95 */ jal npc_move_heading -/* BE41DC 80240A2C 0200202D */ daddu $a0, $s0, $zero -/* BE41E0 80240A30 8602008E */ lh $v0, 0x8e($s0) -/* BE41E4 80240A34 9603008E */ lhu $v1, 0x8e($s0) -/* BE41E8 80240A38 18400003 */ blez $v0, .L80240A48 -/* BE41EC 80240A3C 2462FFFF */ addiu $v0, $v1, -1 -/* BE41F0 80240A40 08090294 */ j .L80240A50 -/* BE41F4 80240A44 A602008E */ sh $v0, 0x8e($s0) -.L80240A48: -/* BE41F8 80240A48 2402000C */ addiu $v0, $zero, 0xc -.L80240A4C: -/* BE41FC 80240A4C AE620070 */ sw $v0, 0x70($s3) -.L80240A50: -/* BE4200 80240A50 8FBF0040 */ lw $ra, 0x40($sp) -/* BE4204 80240A54 8FB3003C */ lw $s3, 0x3c($sp) -/* BE4208 80240A58 8FB20038 */ lw $s2, 0x38($sp) -/* BE420C 80240A5C 8FB10034 */ lw $s1, 0x34($sp) -/* BE4210 80240A60 8FB00030 */ lw $s0, 0x30($sp) -/* BE4214 80240A64 03E00008 */ jr $ra -/* BE4218 80240A68 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_80240A6C_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_80240A6C_BE37B0.s deleted file mode 100644 index c67d13c240..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_80240A6C_BE37B0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_BE421C -/* BE421C 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE4220 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* BE4224 80240A74 0080882D */ daddu $s1, $a0, $zero -/* BE4228 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* BE422C 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* BE4230 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* BE4234 80240A84 0C00EABB */ jal get_npc_unsafe -/* BE4238 80240A88 86040008 */ lh $a0, 8($s0) -/* BE423C 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* BE4240 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* BE4244 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* BE4248 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* BE424C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* BE4250 80240AA0 00000000 */ nop -/* BE4254 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* BE4258 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* BE425C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* BE4260 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* BE4264 80240AB4 080902B0 */ j .L80240AC0 -/* BE4268 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* BE426C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* BE4270 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* BE4274 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* BE4278 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* BE427C 80240ACC 03E00008 */ jr $ra -/* BE4280 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_80240AD4_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_80240AD4_BE37B0.s deleted file mode 100644 index f8dad3c5dd..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_80240AD4_BE37B0.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD4_BE4284 -/* BE4284 80240AD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE4288 80240AD8 AFB10014 */ sw $s1, 0x14($sp) -/* BE428C 80240ADC 0080882D */ daddu $s1, $a0, $zero -/* BE4290 80240AE0 AFBF001C */ sw $ra, 0x1c($sp) -/* BE4294 80240AE4 AFB20018 */ sw $s2, 0x18($sp) -/* BE4298 80240AE8 AFB00010 */ sw $s0, 0x10($sp) -/* BE429C 80240AEC 8E300148 */ lw $s0, 0x148($s1) -/* BE42A0 80240AF0 86040008 */ lh $a0, 8($s0) -/* BE42A4 80240AF4 0C00EABB */ jal get_npc_unsafe -/* BE42A8 80240AF8 00A0902D */ daddu $s2, $a1, $zero -/* BE42AC 80240AFC 8E0300D0 */ lw $v1, 0xd0($s0) -/* BE42B0 80240B00 8E240078 */ lw $a0, 0x78($s1) -/* BE42B4 80240B04 8C630000 */ lw $v1, ($v1) -/* BE42B8 80240B08 0083182A */ slt $v1, $a0, $v1 -/* BE42BC 80240B0C 10600013 */ beqz $v1, .L80240B5C -/* BE42C0 80240B10 0040302D */ daddu $a2, $v0, $zero -/* BE42C4 80240B14 00041040 */ sll $v0, $a0, 1 -/* BE42C8 80240B18 00441021 */ addu $v0, $v0, $a0 -/* BE42CC 80240B1C 00022880 */ sll $a1, $v0, 2 -.L80240B20: -/* BE42D0 80240B20 8E0300D0 */ lw $v1, 0xd0($s0) -/* BE42D4 80240B24 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* BE42D8 80240B28 00A31021 */ addu $v0, $a1, $v1 -/* BE42DC 80240B2C C4400008 */ lwc1 $f0, 8($v0) -/* BE42E0 80240B30 46800020 */ cvt.s.w $f0, $f0 -/* BE42E4 80240B34 4602003E */ c.le.s $f0, $f2 -/* BE42E8 80240B38 00000000 */ nop -/* BE42EC 80240B3C 45020003 */ bc1fl .L80240B4C -/* BE42F0 80240B40 24840001 */ addiu $a0, $a0, 1 -/* BE42F4 80240B44 080902D7 */ j .L80240B5C -/* BE42F8 80240B48 AE240078 */ sw $a0, 0x78($s1) -.L80240B4C: -/* BE42FC 80240B4C 8C620000 */ lw $v0, ($v1) -/* BE4300 80240B50 0082102A */ slt $v0, $a0, $v0 -/* BE4304 80240B54 1440FFF2 */ bnez $v0, .L80240B20 -/* BE4308 80240B58 24A5000C */ addiu $a1, $a1, 0xc -.L80240B5C: -/* BE430C 80240B5C C6400000 */ lwc1 $f0, ($s2) -/* BE4310 80240B60 E4C00018 */ swc1 $f0, 0x18($a2) -/* BE4314 80240B64 8E0200CC */ lw $v0, 0xcc($s0) -/* BE4318 80240B68 8C420004 */ lw $v0, 4($v0) -/* BE431C 80240B6C ACC20028 */ sw $v0, 0x28($a2) -/* BE4320 80240B70 24020001 */ addiu $v0, $zero, 1 -/* BE4324 80240B74 AE200074 */ sw $zero, 0x74($s1) -/* BE4328 80240B78 AE220070 */ sw $v0, 0x70($s1) -/* BE432C 80240B7C 8FBF001C */ lw $ra, 0x1c($sp) -/* BE4330 80240B80 8FB20018 */ lw $s2, 0x18($sp) -/* BE4334 80240B84 8FB10014 */ lw $s1, 0x14($sp) -/* BE4338 80240B88 8FB00010 */ lw $s0, 0x10($sp) -/* BE433C 80240B8C 03E00008 */ jr $ra -/* BE4340 80240B90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_80240B94_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_80240B94_BE37B0.s deleted file mode 100644 index 2b985e7f92..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_80240B94_BE37B0.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B94_BE4344 -/* BE4344 80240B94 27BDFF98 */ addiu $sp, $sp, -0x68 -/* BE4348 80240B98 AFB40058 */ sw $s4, 0x58($sp) -/* BE434C 80240B9C 0080A02D */ daddu $s4, $a0, $zero -/* BE4350 80240BA0 AFBF0060 */ sw $ra, 0x60($sp) -/* BE4354 80240BA4 AFB5005C */ sw $s5, 0x5c($sp) -/* BE4358 80240BA8 AFB30054 */ sw $s3, 0x54($sp) -/* BE435C 80240BAC AFB20050 */ sw $s2, 0x50($sp) -/* BE4360 80240BB0 AFB1004C */ sw $s1, 0x4c($sp) -/* BE4364 80240BB4 AFB00048 */ sw $s0, 0x48($sp) -/* BE4368 80240BB8 8E910148 */ lw $s1, 0x148($s4) -/* BE436C 80240BBC 86240008 */ lh $a0, 8($s1) -/* BE4370 80240BC0 0C00EABB */ jal get_npc_unsafe -/* BE4374 80240BC4 00A0802D */ daddu $s0, $a1, $zero -/* BE4378 80240BC8 8E83000C */ lw $v1, 0xc($s4) -/* BE437C 80240BCC 0280202D */ daddu $a0, $s4, $zero -/* BE4380 80240BD0 8C650000 */ lw $a1, ($v1) -/* BE4384 80240BD4 0C0B1EAF */ jal get_variable -/* BE4388 80240BD8 0040902D */ daddu $s2, $v0, $zero -/* BE438C 80240BDC AFA00018 */ sw $zero, 0x18($sp) -/* BE4390 80240BE0 8E2300D0 */ lw $v1, 0xd0($s1) -/* BE4394 80240BE4 8C630094 */ lw $v1, 0x94($v1) -/* BE4398 80240BE8 AFA3001C */ sw $v1, 0x1c($sp) -/* BE439C 80240BEC 8E2300D0 */ lw $v1, 0xd0($s1) -/* BE43A0 80240BF0 8C630080 */ lw $v1, 0x80($v1) -/* BE43A4 80240BF4 AFA30020 */ sw $v1, 0x20($sp) -/* BE43A8 80240BF8 8E2300D0 */ lw $v1, 0xd0($s1) -/* BE43AC 80240BFC 8C630088 */ lw $v1, 0x88($v1) -/* BE43B0 80240C00 AFA30024 */ sw $v1, 0x24($sp) -/* BE43B4 80240C04 8E2300D0 */ lw $v1, 0xd0($s1) -/* BE43B8 80240C08 8C63008C */ lw $v1, 0x8c($v1) -/* BE43BC 80240C0C 27B50018 */ addiu $s5, $sp, 0x18 -/* BE43C0 80240C10 AFA30028 */ sw $v1, 0x28($sp) -/* BE43C4 80240C14 8E2300D0 */ lw $v1, 0xd0($s1) -/* BE43C8 80240C18 3C014282 */ lui $at, 0x4282 -/* BE43CC 80240C1C 44810000 */ mtc1 $at, $f0 -/* BE43D0 80240C20 8C630090 */ lw $v1, 0x90($v1) -/* BE43D4 80240C24 0040982D */ daddu $s3, $v0, $zero -/* BE43D8 80240C28 E7A00030 */ swc1 $f0, 0x30($sp) -/* BE43DC 80240C2C A7A00034 */ sh $zero, 0x34($sp) -/* BE43E0 80240C30 16000005 */ bnez $s0, .L80240C48 -/* BE43E4 80240C34 AFA3002C */ sw $v1, 0x2c($sp) -/* BE43E8 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) -/* BE43EC 80240C3C 30420004 */ andi $v0, $v0, 4 -/* BE43F0 80240C40 10400044 */ beqz $v0, .L80240D54 -/* BE43F4 80240C44 00000000 */ nop -.L80240C48: -/* BE43F8 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 -/* BE43FC 80240C4C AE800070 */ sw $zero, 0x70($s4) -/* BE4400 80240C50 A640008E */ sh $zero, 0x8e($s2) -/* BE4404 80240C54 8E2200CC */ lw $v0, 0xcc($s1) -/* BE4408 80240C58 8E430000 */ lw $v1, ($s2) -/* BE440C 80240C5C 8C420000 */ lw $v0, ($v0) -/* BE4410 80240C60 00641824 */ and $v1, $v1, $a0 -/* BE4414 80240C64 AE430000 */ sw $v1, ($s2) -/* BE4418 80240C68 AE420028 */ sw $v0, 0x28($s2) -/* BE441C 80240C6C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BE4420 80240C70 8C420098 */ lw $v0, 0x98($v0) -/* BE4424 80240C74 54400005 */ bnel $v0, $zero, .L80240C8C -/* BE4428 80240C78 2402FDFF */ addiu $v0, $zero, -0x201 -/* BE442C 80240C7C 34620200 */ ori $v0, $v1, 0x200 -/* BE4430 80240C80 2403FFF7 */ addiu $v1, $zero, -9 -/* BE4434 80240C84 08090325 */ j .L80240C94 -/* BE4438 80240C88 00431024 */ and $v0, $v0, $v1 -.L80240C8C: -/* BE443C 80240C8C 00621024 */ and $v0, $v1, $v0 -/* BE4440 80240C90 34420008 */ ori $v0, $v0, 8 -.L80240C94: -/* BE4444 80240C94 AE420000 */ sw $v0, ($s2) -/* BE4448 80240C98 8E2200B0 */ lw $v0, 0xb0($s1) -/* BE444C 80240C9C 30420004 */ andi $v0, $v0, 4 -/* BE4450 80240CA0 10400008 */ beqz $v0, .L80240CC4 -/* BE4454 80240CA4 24020063 */ addiu $v0, $zero, 0x63 -/* BE4458 80240CA8 AE820070 */ sw $v0, 0x70($s4) -/* BE445C 80240CAC AE800074 */ sw $zero, 0x74($s4) -/* BE4460 80240CB0 8E2200B0 */ lw $v0, 0xb0($s1) -/* BE4464 80240CB4 2403FFFB */ addiu $v1, $zero, -5 -/* BE4468 80240CB8 00431024 */ and $v0, $v0, $v1 -/* BE446C 80240CBC 0809033C */ j .L80240CF0 -/* BE4470 80240CC0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240CC4: -/* BE4474 80240CC4 8E220000 */ lw $v0, ($s1) -/* BE4478 80240CC8 3C034000 */ lui $v1, 0x4000 -/* BE447C 80240CCC 00431024 */ and $v0, $v0, $v1 -/* BE4480 80240CD0 10400007 */ beqz $v0, .L80240CF0 -/* BE4484 80240CD4 3C03BFFF */ lui $v1, 0xbfff -/* BE4488 80240CD8 2402000C */ addiu $v0, $zero, 0xc -/* BE448C 80240CDC AE820070 */ sw $v0, 0x70($s4) -/* BE4490 80240CE0 8E220000 */ lw $v0, ($s1) -/* BE4494 80240CE4 3463FFFF */ ori $v1, $v1, 0xffff -/* BE4498 80240CE8 00431024 */ and $v0, $v0, $v1 -/* BE449C 80240CEC AE220000 */ sw $v0, ($s1) -.L80240CF0: -/* BE44A0 80240CF0 27A50038 */ addiu $a1, $sp, 0x38 -/* BE44A4 80240CF4 27A6003C */ addiu $a2, $sp, 0x3c -/* BE44A8 80240CF8 C6400038 */ lwc1 $f0, 0x38($s2) -/* BE44AC 80240CFC 864200A8 */ lh $v0, 0xa8($s2) -/* BE44B0 80240D00 3C0142C8 */ lui $at, 0x42c8 -/* BE44B4 80240D04 44812000 */ mtc1 $at, $f4 -/* BE44B8 80240D08 44823000 */ mtc1 $v0, $f6 -/* BE44BC 80240D0C 00000000 */ nop -/* BE44C0 80240D10 468031A0 */ cvt.s.w $f6, $f6 -/* BE44C4 80240D14 27A20044 */ addiu $v0, $sp, 0x44 -/* BE44C8 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) -/* BE44CC 80240D1C C640003C */ lwc1 $f0, 0x3c($s2) -/* BE44D0 80240D20 C6420040 */ lwc1 $f2, 0x40($s2) -/* BE44D4 80240D24 46060000 */ add.s $f0, $f0, $f6 -/* BE44D8 80240D28 E7A40044 */ swc1 $f4, 0x44($sp) -/* BE44DC 80240D2C E7A20040 */ swc1 $f2, 0x40($sp) -/* BE44E0 80240D30 E7A0003C */ swc1 $f0, 0x3c($sp) -/* BE44E4 80240D34 AFA20010 */ sw $v0, 0x10($sp) -/* BE44E8 80240D38 8E440080 */ lw $a0, 0x80($s2) -/* BE44EC 80240D3C 0C0372DF */ jal func_800DCB7C -/* BE44F0 80240D40 27A70040 */ addiu $a3, $sp, 0x40 -/* BE44F4 80240D44 10400003 */ beqz $v0, .L80240D54 -/* BE44F8 80240D48 00000000 */ nop -/* BE44FC 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* BE4500 80240D50 E640003C */ swc1 $f0, 0x3c($s2) -.L80240D54: -/* BE4504 80240D54 8E830070 */ lw $v1, 0x70($s4) -/* BE4508 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* BE450C 80240D5C 10400042 */ beqz $v0, .L80240E68 -/* BE4510 80240D60 00031080 */ sll $v0, $v1, 2 -/* BE4514 80240D64 3C018024 */ lui $at, 0x8024 -/* BE4518 80240D68 00220821 */ addu $at, $at, $v0 -/* BE451C 80240D6C 8C224140 */ lw $v0, 0x4140($at) -/* BE4520 80240D70 00400008 */ jr $v0 -/* BE4524 80240D74 00000000 */ nop -/* BE4528 80240D78 0280202D */ daddu $a0, $s4, $zero -/* BE452C 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* BE4530 80240D80 0C090000 */ jal func_80240000 -/* BE4534 80240D84 02A0302D */ daddu $a2, $s5, $zero -/* BE4538 80240D88 0280202D */ daddu $a0, $s4, $zero -/* BE453C 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* BE4540 80240D90 0C090056 */ jal func_80240158 -/* BE4544 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* BE4548 80240D98 0809039A */ j .L80240E68 -/* BE454C 80240D9C 00000000 */ nop -/* BE4550 80240DA0 0280202D */ daddu $a0, $s4, $zero -/* BE4554 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* BE4558 80240DA8 0C090100 */ jal func_80240400 -/* BE455C 80240DAC 02A0302D */ daddu $a2, $s5, $zero -/* BE4560 80240DB0 0280202D */ daddu $a0, $s4, $zero -/* BE4564 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* BE4568 80240DB8 0C090130 */ jal func_802404C0 -/* BE456C 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* BE4570 80240DC0 0809039A */ j .L80240E68 -/* BE4574 80240DC4 00000000 */ nop -/* BE4578 80240DC8 0280202D */ daddu $a0, $s4, $zero -/* BE457C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* BE4580 80240DD0 0C09019F */ jal func_8024067C -/* BE4584 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* BE4588 80240DD8 0809039A */ j .L80240E68 -/* BE458C 80240DDC 00000000 */ nop -/* BE4590 80240DE0 0280202D */ daddu $a0, $s4, $zero -/* BE4594 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* BE4598 80240DE8 0C0901CC */ jal func_80240730 -/* BE459C 80240DEC 02A0302D */ daddu $a2, $s5, $zero -/* BE45A0 80240DF0 0280202D */ daddu $a0, $s4, $zero -/* BE45A4 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* BE45A8 80240DF8 0C0901E9 */ jal func_802407A4 -/* BE45AC 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* BE45B0 80240E00 0809039A */ j .L80240E68 -/* BE45B4 80240E04 00000000 */ nop -/* BE45B8 80240E08 0280202D */ daddu $a0, $s4, $zero -/* BE45BC 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* BE45C0 80240E10 0C090207 */ jal func_8024081C -/* BE45C4 80240E14 02A0302D */ daddu $a2, $s5, $zero -/* BE45C8 80240E18 0280202D */ daddu $a0, $s4, $zero -/* BE45CC 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* BE45D0 80240E20 0C090253 */ jal func_8024094C -/* BE45D4 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* BE45D8 80240E28 0809039A */ j .L80240E68 -/* BE45DC 80240E2C 00000000 */ nop -/* BE45E0 80240E30 0280202D */ daddu $a0, $s4, $zero -/* BE45E4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BE45E8 80240E38 0C09029B */ jal func_80240A6C -/* BE45EC 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* BE45F0 80240E40 0809039A */ j .L80240E68 -/* BE45F4 80240E44 00000000 */ nop -/* BE45F8 80240E48 0280202D */ daddu $a0, $s4, $zero -/* BE45FC 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* BE4600 80240E50 0C0902B5 */ jal func_80240AD4 -/* BE4604 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* BE4608 80240E58 0809039A */ j .L80240E68 -/* BE460C 80240E5C 00000000 */ nop -/* BE4610 80240E60 0C0129CF */ jal func_8004A73C -/* BE4614 80240E64 0280202D */ daddu $a0, $s4, $zero -.L80240E68: -/* BE4618 80240E68 8FBF0060 */ lw $ra, 0x60($sp) -/* BE461C 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) -/* BE4620 80240E70 8FB40058 */ lw $s4, 0x58($sp) -/* BE4624 80240E74 8FB30054 */ lw $s3, 0x54($sp) -/* BE4628 80240E78 8FB20050 */ lw $s2, 0x50($sp) -/* BE462C 80240E7C 8FB1004C */ lw $s1, 0x4c($sp) -/* BE4630 80240E80 8FB00048 */ lw $s0, 0x48($sp) -/* BE4634 80240E84 0000102D */ daddu $v0, $zero, $zero -/* BE4638 80240E88 03E00008 */ jr $ra -/* BE463C 80240E8C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_80240E90_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_80240E90_BE37B0.s deleted file mode 100644 index 1a7054a081..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_80240E90_BE37B0.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E90_BE4640 -/* BE4640 80240E90 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* BE4644 80240E94 AFB3002C */ sw $s3, 0x2c($sp) -/* BE4648 80240E98 0080982D */ daddu $s3, $a0, $zero -/* BE464C 80240E9C AFBF0030 */ sw $ra, 0x30($sp) -/* BE4650 80240EA0 AFB20028 */ sw $s2, 0x28($sp) -/* BE4654 80240EA4 AFB10024 */ sw $s1, 0x24($sp) -/* BE4658 80240EA8 AFB00020 */ sw $s0, 0x20($sp) -/* BE465C 80240EAC 8E710148 */ lw $s1, 0x148($s3) -/* BE4660 80240EB0 86240008 */ lh $a0, 8($s1) -/* BE4664 80240EB4 0C00EABB */ jal get_npc_unsafe -/* BE4668 80240EB8 00A0902D */ daddu $s2, $a1, $zero -/* BE466C 80240EBC 8E440004 */ lw $a0, 4($s2) -/* BE4670 80240EC0 0040802D */ daddu $s0, $v0, $zero -/* BE4674 80240EC4 00041FC2 */ srl $v1, $a0, 0x1f -/* BE4678 80240EC8 00832021 */ addu $a0, $a0, $v1 -/* BE467C 80240ECC 00042043 */ sra $a0, $a0, 1 -/* BE4680 80240ED0 0C00A67F */ jal rand_int -/* BE4684 80240ED4 24840001 */ addiu $a0, $a0, 1 -/* BE4688 80240ED8 8E430004 */ lw $v1, 4($s2) -/* BE468C 80240EDC 000327C2 */ srl $a0, $v1, 0x1f -/* BE4690 80240EE0 00641821 */ addu $v1, $v1, $a0 -/* BE4694 80240EE4 00031843 */ sra $v1, $v1, 1 -/* BE4698 80240EE8 00621821 */ addu $v1, $v1, $v0 -/* BE469C 80240EEC A603008E */ sh $v1, 0x8e($s0) -/* BE46A0 80240EF0 8E2300D0 */ lw $v1, 0xd0($s1) -/* BE46A4 80240EF4 C6000040 */ lwc1 $f0, 0x40($s0) -/* BE46A8 80240EF8 C4640000 */ lwc1 $f4, ($v1) -/* BE46AC 80240EFC 46802120 */ cvt.s.w $f4, $f4 -/* BE46B0 80240F00 C4620008 */ lwc1 $f2, 8($v1) -/* BE46B4 80240F04 468010A0 */ cvt.s.w $f2, $f2 -/* BE46B8 80240F08 E7A00010 */ swc1 $f0, 0x10($sp) -/* BE46BC 80240F0C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BE46C0 80240F10 44061000 */ mfc1 $a2, $f2 -/* BE46C4 80240F14 C440000C */ lwc1 $f0, 0xc($v0) -/* BE46C8 80240F18 46800020 */ cvt.s.w $f0, $f0 -/* BE46CC 80240F1C E7A00014 */ swc1 $f0, 0x14($sp) -/* BE46D0 80240F20 8E2200D0 */ lw $v0, 0xd0($s1) -/* BE46D4 80240F24 44052000 */ mfc1 $a1, $f4 -/* BE46D8 80240F28 C4400010 */ lwc1 $f0, 0x10($v0) -/* BE46DC 80240F2C 46800020 */ cvt.s.w $f0, $f0 -/* BE46E0 80240F30 E7A00018 */ swc1 $f0, 0x18($sp) -/* BE46E4 80240F34 8C640018 */ lw $a0, 0x18($v1) -/* BE46E8 80240F38 0C0123F5 */ jal is_point_within_region -/* BE46EC 80240F3C 8E070038 */ lw $a3, 0x38($s0) -/* BE46F0 80240F40 1040000E */ beqz $v0, .L80240F7C -/* BE46F4 80240F44 00000000 */ nop -/* BE46F8 80240F48 8E2200D0 */ lw $v0, 0xd0($s1) -/* BE46FC 80240F4C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE4700 80240F50 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE4704 80240F54 C4460000 */ lwc1 $f6, ($v0) -/* BE4708 80240F58 468031A0 */ cvt.s.w $f6, $f6 -/* BE470C 80240F5C 44063000 */ mfc1 $a2, $f6 -/* BE4710 80240F60 C4460008 */ lwc1 $f6, 8($v0) -/* BE4714 80240F64 468031A0 */ cvt.s.w $f6, $f6 -/* BE4718 80240F68 44073000 */ mfc1 $a3, $f6 -/* BE471C 80240F6C 0C00A720 */ jal atan2 -/* BE4720 80240F70 00000000 */ nop -/* BE4724 80240F74 080903EB */ j .L80240FAC -/* BE4728 80240F78 E600000C */ swc1 $f0, 0xc($s0) -.L80240F7C: -/* BE472C 80240F7C 0C00A67F */ jal rand_int -/* BE4730 80240F80 2404003C */ addiu $a0, $zero, 0x3c -/* BE4734 80240F84 C60C000C */ lwc1 $f12, 0xc($s0) -/* BE4738 80240F88 44820000 */ mtc1 $v0, $f0 -/* BE473C 80240F8C 00000000 */ nop -/* BE4740 80240F90 46800020 */ cvt.s.w $f0, $f0 -/* BE4744 80240F94 46006300 */ add.s $f12, $f12, $f0 -/* BE4748 80240F98 3C0141F0 */ lui $at, 0x41f0 -/* BE474C 80240F9C 44810000 */ mtc1 $at, $f0 -/* BE4750 80240FA0 0C00A6C9 */ jal clamp_angle -/* BE4754 80240FA4 46006301 */ sub.s $f12, $f12, $f0 -/* BE4758 80240FA8 E600000C */ swc1 $f0, 0xc($s0) -.L80240FAC: -/* BE475C 80240FAC 8E2200CC */ lw $v0, 0xcc($s1) -/* BE4760 80240FB0 8C420004 */ lw $v0, 4($v0) -/* BE4764 80240FB4 AE020028 */ sw $v0, 0x28($s0) -/* BE4768 80240FB8 AE600074 */ sw $zero, 0x74($s3) -/* BE476C 80240FBC 8E2200D0 */ lw $v0, 0xd0($s1) -/* BE4770 80240FC0 8C420014 */ lw $v0, 0x14($v0) -/* BE4774 80240FC4 04410004 */ bgez $v0, .L80240FD8 -/* BE4778 80240FC8 00000000 */ nop -/* BE477C 80240FCC C6400000 */ lwc1 $f0, ($s2) -/* BE4780 80240FD0 080903FE */ j .L80240FF8 -/* BE4784 80240FD4 E6000018 */ swc1 $f0, 0x18($s0) -.L80240FD8: -/* BE4788 80240FD8 3C018024 */ lui $at, 0x8024 -/* BE478C 80240FDC D42242D0 */ ldc1 $f2, 0x42d0($at) -/* BE4790 80240FE0 44820000 */ mtc1 $v0, $f0 -/* BE4794 80240FE4 00000000 */ nop -/* BE4798 80240FE8 46800021 */ cvt.d.w $f0, $f0 -/* BE479C 80240FEC 46220003 */ div.d $f0, $f0, $f2 -/* BE47A0 80240FF0 46200020 */ cvt.s.d $f0, $f0 -/* BE47A4 80240FF4 E6000018 */ swc1 $f0, 0x18($s0) -.L80240FF8: -/* BE47A8 80240FF8 C600003C */ lwc1 $f0, 0x3c($s0) -/* BE47AC 80240FFC 3C014059 */ lui $at, 0x4059 -/* BE47B0 80241000 44811800 */ mtc1 $at, $f3 -/* BE47B4 80241004 44801000 */ mtc1 $zero, $f2 -/* BE47B8 80241008 46000021 */ cvt.d.s $f0, $f0 -/* BE47BC 8024100C 46220002 */ mul.d $f0, $f0, $f2 -/* BE47C0 80241010 00000000 */ nop -/* BE47C4 80241014 24020001 */ addiu $v0, $zero, 1 -/* BE47C8 80241018 4620018D */ trunc.w.d $f6, $f0 -/* BE47CC 8024101C E626007C */ swc1 $f6, 0x7c($s1) -/* BE47D0 80241020 AE620070 */ sw $v0, 0x70($s3) -/* BE47D4 80241024 8FBF0030 */ lw $ra, 0x30($sp) -/* BE47D8 80241028 8FB3002C */ lw $s3, 0x2c($sp) -/* BE47DC 8024102C 8FB20028 */ lw $s2, 0x28($sp) -/* BE47E0 80241030 8FB10024 */ lw $s1, 0x24($sp) -/* BE47E4 80241034 8FB00020 */ lw $s0, 0x20($sp) -/* BE47E8 80241038 03E00008 */ jr $ra -/* BE47EC 8024103C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_80241040_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_80241040_BE37B0.s deleted file mode 100644 index 40041abec7..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_80241040_BE37B0.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241040_BE47F0 -/* BE47F0 80241040 27BDFF80 */ addiu $sp, $sp, -0x80 -/* BE47F4 80241044 AFB3004C */ sw $s3, 0x4c($sp) -/* BE47F8 80241048 0080982D */ daddu $s3, $a0, $zero -/* BE47FC 8024104C AFBF0058 */ sw $ra, 0x58($sp) -/* BE4800 80241050 AFB50054 */ sw $s5, 0x54($sp) -/* BE4804 80241054 AFB40050 */ sw $s4, 0x50($sp) -/* BE4808 80241058 AFB20048 */ sw $s2, 0x48($sp) -/* BE480C 8024105C AFB10044 */ sw $s1, 0x44($sp) -/* BE4810 80241060 AFB00040 */ sw $s0, 0x40($sp) -/* BE4814 80241064 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* BE4818 80241068 F7B80070 */ sdc1 $f24, 0x70($sp) -/* BE481C 8024106C F7B60068 */ sdc1 $f22, 0x68($sp) -/* BE4820 80241070 F7B40060 */ sdc1 $f20, 0x60($sp) -/* BE4824 80241074 8E710148 */ lw $s1, 0x148($s3) -/* BE4828 80241078 00A0902D */ daddu $s2, $a1, $zero -/* BE482C 8024107C 86240008 */ lh $a0, 8($s1) -/* BE4830 80241080 0C00EABB */ jal get_npc_unsafe -/* BE4834 80241084 00C0A82D */ daddu $s5, $a2, $zero -/* BE4838 80241088 0040802D */ daddu $s0, $v0, $zero -/* BE483C 8024108C 0000A02D */ daddu $s4, $zero, $zero -/* BE4840 80241090 C624007C */ lwc1 $f4, 0x7c($s1) -/* BE4844 80241094 46802120 */ cvt.s.w $f4, $f4 -/* BE4848 80241098 C6220088 */ lwc1 $f2, 0x88($s1) -/* BE484C 8024109C 468010A0 */ cvt.s.w $f2, $f2 -/* BE4850 802410A0 460010A1 */ cvt.d.s $f2, $f2 -/* BE4854 802410A4 46002121 */ cvt.d.s $f4, $f4 -/* BE4858 802410A8 C600003C */ lwc1 $f0, 0x3c($s0) -/* BE485C 802410AC 3C014059 */ lui $at, 0x4059 -/* BE4860 802410B0 44813800 */ mtc1 $at, $f7 -/* BE4864 802410B4 44803000 */ mtc1 $zero, $f6 -/* BE4868 802410B8 46000021 */ cvt.d.s $f0, $f0 -/* BE486C 802410BC 46260002 */ mul.d $f0, $f0, $f6 -/* BE4870 802410C0 00000000 */ nop -/* BE4874 802410C4 24020001 */ addiu $v0, $zero, 1 -/* BE4878 802410C8 8E24006C */ lw $a0, 0x6c($s1) -/* BE487C 802410CC 46261083 */ div.d $f2, $f2, $f6 -/* BE4880 802410D0 462010A0 */ cvt.s.d $f2, $f2 -/* BE4884 802410D4 46262103 */ div.d $f4, $f4, $f6 -/* BE4888 802410D8 46202520 */ cvt.s.d $f20, $f4 -/* BE488C 802410DC 30830011 */ andi $v1, $a0, 0x11 -/* BE4890 802410E0 4620020D */ trunc.w.d $f8, $f0 -/* BE4894 802410E4 E628007C */ swc1 $f8, 0x7c($s1) -/* BE4898 802410E8 C6200078 */ lwc1 $f0, 0x78($s1) -/* BE489C 802410EC 46800020 */ cvt.s.w $f0, $f0 -/* BE48A0 802410F0 46000021 */ cvt.d.s $f0, $f0 -/* BE48A4 802410F4 46260003 */ div.d $f0, $f0, $f6 -/* BE48A8 802410F8 462006A0 */ cvt.s.d $f26, $f0 -/* BE48AC 802410FC C6200070 */ lwc1 $f0, 0x70($s1) -/* BE48B0 80241100 46800020 */ cvt.s.w $f0, $f0 -/* BE48B4 80241104 46000021 */ cvt.d.s $f0, $f0 -/* BE48B8 80241108 46260003 */ div.d $f0, $f0, $f6 -/* BE48BC 8024110C 462005A0 */ cvt.s.d $f22, $f0 -/* BE48C0 80241110 14620025 */ bne $v1, $v0, .L802411A8 -/* BE48C4 80241114 4602D600 */ add.s $f24, $f26, $f2 -/* BE48C8 80241118 8E020000 */ lw $v0, ($s0) -/* BE48CC 8024111C 30420008 */ andi $v0, $v0, 8 -/* BE48D0 80241120 10400009 */ beqz $v0, .L80241148 -/* BE48D4 80241124 27A50028 */ addiu $a1, $sp, 0x28 -/* BE48D8 80241128 C600003C */ lwc1 $f0, 0x3c($s0) -/* BE48DC 8024112C 4600C001 */ sub.s $f0, $f24, $f0 -/* BE48E0 80241130 4600B03C */ c.lt.s $f22, $f0 -/* BE48E4 80241134 00000000 */ nop -/* BE48E8 80241138 4500001B */ bc1f .L802411A8 -/* BE48EC 8024113C 34820010 */ ori $v0, $a0, 0x10 -/* BE48F0 80241140 0809046A */ j .L802411A8 -/* BE48F4 80241144 AE22006C */ sw $v0, 0x6c($s1) -.L80241148: -/* BE48F8 80241148 27A6002C */ addiu $a2, $sp, 0x2c -/* BE48FC 8024114C C6000038 */ lwc1 $f0, 0x38($s0) -/* BE4900 80241150 C602003C */ lwc1 $f2, 0x3c($s0) -/* BE4904 80241154 C6040040 */ lwc1 $f4, 0x40($s0) -/* BE4908 80241158 3C01447A */ lui $at, 0x447a -/* BE490C 8024115C 44813000 */ mtc1 $at, $f6 -/* BE4910 80241160 27A20034 */ addiu $v0, $sp, 0x34 -/* BE4914 80241164 E7A00028 */ swc1 $f0, 0x28($sp) -/* BE4918 80241168 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BE491C 8024116C E7A40030 */ swc1 $f4, 0x30($sp) -/* BE4920 80241170 E7A60034 */ swc1 $f6, 0x34($sp) -/* BE4924 80241174 AFA20010 */ sw $v0, 0x10($sp) -/* BE4928 80241178 8E040080 */ lw $a0, 0x80($s0) -/* BE492C 8024117C 0C0372DF */ jal func_800DCB7C -/* BE4930 80241180 27A70030 */ addiu $a3, $sp, 0x30 -/* BE4934 80241184 C7A00034 */ lwc1 $f0, 0x34($sp) -/* BE4938 80241188 4600D001 */ sub.s $f0, $f26, $f0 -/* BE493C 8024118C 4600B03C */ c.lt.s $f22, $f0 -/* BE4940 80241190 00000000 */ nop -/* BE4944 80241194 45000004 */ bc1f .L802411A8 -/* BE4948 80241198 00000000 */ nop -/* BE494C 8024119C 8E22006C */ lw $v0, 0x6c($s1) -/* BE4950 802411A0 34420010 */ ori $v0, $v0, 0x10 -/* BE4954 802411A4 AE22006C */ sw $v0, 0x6c($s1) -.L802411A8: -/* BE4958 802411A8 8E22006C */ lw $v0, 0x6c($s1) -/* BE495C 802411AC 24030011 */ addiu $v1, $zero, 0x11 -/* BE4960 802411B0 30420011 */ andi $v0, $v0, 0x11 -/* BE4964 802411B4 14430039 */ bne $v0, $v1, .L8024129C -/* BE4968 802411B8 00000000 */ nop -/* BE496C 802411BC 8E020000 */ lw $v0, ($s0) -/* BE4970 802411C0 30420008 */ andi $v0, $v0, 8 -/* BE4974 802411C4 1040000A */ beqz $v0, .L802411F0 -/* BE4978 802411C8 4600C106 */ mov.s $f4, $f24 -/* BE497C 802411CC 4614C081 */ sub.s $f2, $f24, $f20 -/* BE4980 802411D0 3C018024 */ lui $at, 0x8024 -/* BE4984 802411D4 D42042D8 */ ldc1 $f0, 0x42d8($at) -/* BE4988 802411D8 460010A1 */ cvt.d.s $f2, $f2 -/* BE498C 802411DC 46201082 */ mul.d $f2, $f2, $f0 -/* BE4990 802411E0 00000000 */ nop -/* BE4994 802411E4 4600A021 */ cvt.d.s $f0, $f20 -/* BE4998 802411E8 08090495 */ j .L80241254 -/* BE499C 802411EC 46220000 */ add.d $f0, $f0, $f2 -.L802411F0: -/* BE49A0 802411F0 27A50028 */ addiu $a1, $sp, 0x28 -/* BE49A4 802411F4 27A6002C */ addiu $a2, $sp, 0x2c -/* BE49A8 802411F8 C6000038 */ lwc1 $f0, 0x38($s0) -/* BE49AC 802411FC C6020040 */ lwc1 $f2, 0x40($s0) -/* BE49B0 80241200 3C01447A */ lui $at, 0x447a -/* BE49B4 80241204 44812000 */ mtc1 $at, $f4 -/* BE49B8 80241208 27A20034 */ addiu $v0, $sp, 0x34 -/* BE49BC 8024120C E7B4002C */ swc1 $f20, 0x2c($sp) -/* BE49C0 80241210 E7A00028 */ swc1 $f0, 0x28($sp) -/* BE49C4 80241214 E7A20030 */ swc1 $f2, 0x30($sp) -/* BE49C8 80241218 E7A40034 */ swc1 $f4, 0x34($sp) -/* BE49CC 8024121C AFA20010 */ sw $v0, 0x10($sp) -/* BE49D0 80241220 8E040080 */ lw $a0, 0x80($s0) -/* BE49D4 80241224 0C0372DF */ jal func_800DCB7C -/* BE49D8 80241228 27A70030 */ addiu $a3, $sp, 0x30 -/* BE49DC 8024122C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* BE49E0 80241230 461A2100 */ add.s $f4, $f4, $f26 -/* BE49E4 80241234 46142081 */ sub.s $f2, $f4, $f20 -/* BE49E8 80241238 3C018024 */ lui $at, 0x8024 -/* BE49EC 8024123C D42042E0 */ ldc1 $f0, 0x42e0($at) -/* BE49F0 80241240 460010A1 */ cvt.d.s $f2, $f2 -/* BE49F4 80241244 46201082 */ mul.d $f2, $f2, $f0 -/* BE49F8 80241248 00000000 */ nop -/* BE49FC 8024124C 4600A021 */ cvt.d.s $f0, $f20 -/* BE4A00 80241250 46220000 */ add.d $f0, $f0, $f2 -.L80241254: -/* BE4A04 80241254 46200020 */ cvt.s.d $f0, $f0 -/* BE4A08 80241258 E600003C */ swc1 $f0, 0x3c($s0) -/* BE4A0C 8024125C C600003C */ lwc1 $f0, 0x3c($s0) -/* BE4A10 80241260 46002001 */ sub.s $f0, $f4, $f0 -/* BE4A14 80241264 3C013FF0 */ lui $at, 0x3ff0 -/* BE4A18 80241268 44811800 */ mtc1 $at, $f3 -/* BE4A1C 8024126C 44801000 */ mtc1 $zero, $f2 -/* BE4A20 80241270 46000005 */ abs.s $f0, $f0 -/* BE4A24 80241274 46000021 */ cvt.d.s $f0, $f0 -/* BE4A28 80241278 4622003C */ c.lt.d $f0, $f2 -/* BE4A2C 8024127C 00000000 */ nop -/* BE4A30 80241280 45000036 */ bc1f .L8024135C -/* BE4A34 80241284 2403FFEF */ addiu $v1, $zero, -0x11 -/* BE4A38 80241288 E604003C */ swc1 $f4, 0x3c($s0) -/* BE4A3C 8024128C 8E22006C */ lw $v0, 0x6c($s1) -/* BE4A40 80241290 00431024 */ and $v0, $v0, $v1 -/* BE4A44 80241294 080904D7 */ j .L8024135C -/* BE4A48 80241298 AE22006C */ sw $v0, 0x6c($s1) -.L8024129C: -/* BE4A4C 8024129C 8E220070 */ lw $v0, 0x70($s1) -/* BE4A50 802412A0 1840002E */ blez $v0, .L8024135C -/* BE4A54 802412A4 00000000 */ nop -/* BE4A58 802412A8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* BE4A5C 802412AC 0C00A8BB */ jal sin_deg -/* BE4A60 802412B0 46806320 */ cvt.s.w $f12, $f12 -/* BE4A64 802412B4 8E020000 */ lw $v0, ($s0) -/* BE4A68 802412B8 30420008 */ andi $v0, $v0, 8 -/* BE4A6C 802412BC 10400003 */ beqz $v0, .L802412CC -/* BE4A70 802412C0 46000506 */ mov.s $f20, $f0 -/* BE4A74 802412C4 080904C3 */ j .L8024130C -/* BE4A78 802412C8 0000102D */ daddu $v0, $zero, $zero -.L802412CC: -/* BE4A7C 802412CC 27A50028 */ addiu $a1, $sp, 0x28 -/* BE4A80 802412D0 27A6002C */ addiu $a2, $sp, 0x2c -/* BE4A84 802412D4 C6000038 */ lwc1 $f0, 0x38($s0) -/* BE4A88 802412D8 C602003C */ lwc1 $f2, 0x3c($s0) -/* BE4A8C 802412DC C6040040 */ lwc1 $f4, 0x40($s0) -/* BE4A90 802412E0 3C01447A */ lui $at, 0x447a -/* BE4A94 802412E4 44813000 */ mtc1 $at, $f6 -/* BE4A98 802412E8 27A20034 */ addiu $v0, $sp, 0x34 -/* BE4A9C 802412EC E7A00028 */ swc1 $f0, 0x28($sp) -/* BE4AA0 802412F0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BE4AA4 802412F4 E7A40030 */ swc1 $f4, 0x30($sp) -/* BE4AA8 802412F8 E7A60034 */ swc1 $f6, 0x34($sp) -/* BE4AAC 802412FC AFA20010 */ sw $v0, 0x10($sp) -/* BE4AB0 80241300 8E040080 */ lw $a0, 0x80($s0) -/* BE4AB4 80241304 0C0372DF */ jal func_800DCB7C -/* BE4AB8 80241308 27A70030 */ addiu $a3, $sp, 0x30 -.L8024130C: -/* BE4ABC 8024130C 10400007 */ beqz $v0, .L8024132C -/* BE4AC0 80241310 00000000 */ nop -/* BE4AC4 80241314 4616A082 */ mul.s $f2, $f20, $f22 -/* BE4AC8 80241318 00000000 */ nop -/* BE4ACC 8024131C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BE4AD0 80241320 461A0000 */ add.s $f0, $f0, $f26 -/* BE4AD4 80241324 080904CE */ j .L80241338 -/* BE4AD8 80241328 46020000 */ add.s $f0, $f0, $f2 -.L8024132C: -/* BE4ADC 8024132C 4616A002 */ mul.s $f0, $f20, $f22 -/* BE4AE0 80241330 00000000 */ nop -/* BE4AE4 80241334 4600C000 */ add.s $f0, $f24, $f0 -.L80241338: -/* BE4AE8 80241338 E600003C */ swc1 $f0, 0x3c($s0) -/* BE4AEC 8024133C 8E220074 */ lw $v0, 0x74($s1) -/* BE4AF0 80241340 2442000A */ addiu $v0, $v0, 0xa -/* BE4AF4 80241344 44826000 */ mtc1 $v0, $f12 -/* BE4AF8 80241348 00000000 */ nop -/* BE4AFC 8024134C 0C00A6C9 */ jal clamp_angle -/* BE4B00 80241350 46806320 */ cvt.s.w $f12, $f12 -/* BE4B04 80241354 4600020D */ trunc.w.s $f8, $f0 -/* BE4B08 80241358 E6280074 */ swc1 $f8, 0x74($s1) -.L8024135C: -/* BE4B0C 8024135C 8E220090 */ lw $v0, 0x90($s1) -/* BE4B10 80241360 1C40004A */ bgtz $v0, .L8024148C -/* BE4B14 80241364 2442FFFF */ addiu $v0, $v0, -1 -/* BE4B18 80241368 8E430014 */ lw $v1, 0x14($s2) -/* BE4B1C 8024136C 04600048 */ bltz $v1, .L80241490 -/* BE4B20 80241370 00000000 */ nop -/* BE4B24 80241374 8E620074 */ lw $v0, 0x74($s3) -/* BE4B28 80241378 1C400042 */ bgtz $v0, .L80241484 -/* BE4B2C 8024137C 2442FFFF */ addiu $v0, $v0, -1 -/* BE4B30 80241380 AE630074 */ sw $v1, 0x74($s3) -/* BE4B34 80241384 860200A8 */ lh $v0, 0xa8($s0) -/* BE4B38 80241388 C602003C */ lwc1 $f2, 0x3c($s0) -/* BE4B3C 8024138C 44820000 */ mtc1 $v0, $f0 -/* BE4B40 80241390 00000000 */ nop -/* BE4B44 80241394 46800020 */ cvt.s.w $f0, $f0 -/* BE4B48 80241398 46001080 */ add.s $f2, $f2, $f0 -/* BE4B4C 8024139C 3C014024 */ lui $at, 0x4024 -/* BE4B50 802413A0 44810800 */ mtc1 $at, $f1 -/* BE4B54 802413A4 44800000 */ mtc1 $zero, $f0 -/* BE4B58 802413A8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BE4B5C 802413AC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BE4B60 802413B0 460010A1 */ cvt.d.s $f2, $f2 -/* BE4B64 802413B4 46201080 */ add.d $f2, $f2, $f0 -/* BE4B68 802413B8 C440002C */ lwc1 $f0, 0x2c($v0) -/* BE4B6C 802413BC 46000021 */ cvt.d.s $f0, $f0 -/* BE4B70 802413C0 4622003C */ c.lt.d $f0, $f2 -/* BE4B74 802413C4 00000000 */ nop -/* BE4B78 802413C8 4500002C */ bc1f .L8024147C -/* BE4B7C 802413CC 02A0202D */ daddu $a0, $s5, $zero -/* BE4B80 802413D0 AFA00010 */ sw $zero, 0x10($sp) -/* BE4B84 802413D4 8E46000C */ lw $a2, 0xc($s2) -/* BE4B88 802413D8 8E470010 */ lw $a3, 0x10($s2) -/* BE4B8C 802413DC 0C01242D */ jal func_800490B4 -/* BE4B90 802413E0 0220282D */ daddu $a1, $s1, $zero -/* BE4B94 802413E4 10400025 */ beqz $v0, .L8024147C -/* BE4B98 802413E8 0000202D */ daddu $a0, $zero, $zero -/* BE4B9C 802413EC 0200282D */ daddu $a1, $s0, $zero -/* BE4BA0 802413F0 0000302D */ daddu $a2, $zero, $zero -/* BE4BA4 802413F4 2412000C */ addiu $s2, $zero, 0xc -/* BE4BA8 802413F8 860300A8 */ lh $v1, 0xa8($s0) -/* BE4BAC 802413FC 3C013F80 */ lui $at, 0x3f80 -/* BE4BB0 80241400 44810000 */ mtc1 $at, $f0 -/* BE4BB4 80241404 3C014000 */ lui $at, 0x4000 -/* BE4BB8 80241408 44811000 */ mtc1 $at, $f2 -/* BE4BBC 8024140C 3C01C1A0 */ lui $at, 0xc1a0 -/* BE4BC0 80241410 44812000 */ mtc1 $at, $f4 -/* BE4BC4 80241414 44834000 */ mtc1 $v1, $f8 -/* BE4BC8 80241418 00000000 */ nop -/* BE4BCC 8024141C 46804220 */ cvt.s.w $f8, $f8 -/* BE4BD0 80241420 44074000 */ mfc1 $a3, $f8 -/* BE4BD4 80241424 27A20038 */ addiu $v0, $sp, 0x38 -/* BE4BD8 80241428 AFB2001C */ sw $s2, 0x1c($sp) -/* BE4BDC 8024142C AFA20020 */ sw $v0, 0x20($sp) -/* BE4BE0 80241430 E7A00010 */ swc1 $f0, 0x10($sp) -/* BE4BE4 80241434 E7A20014 */ swc1 $f2, 0x14($sp) -/* BE4BE8 80241438 0C01BFA4 */ jal fx_emote -/* BE4BEC 8024143C E7A40018 */ swc1 $f4, 0x18($sp) -/* BE4BF0 80241440 0200202D */ daddu $a0, $s0, $zero -/* BE4BF4 80241444 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BE4BF8 80241448 C480003C */ lwc1 $f0, 0x3c($a0) -/* BE4BFC 8024144C 3C060020 */ lui $a2, 0x20 -/* BE4C00 80241450 0C012530 */ jal func_800494C0 -/* BE4C04 80241454 E4800064 */ swc1 $f0, 0x64($a0) -/* BE4C08 80241458 8E220018 */ lw $v0, 0x18($s1) -/* BE4C0C 8024145C 9442002A */ lhu $v0, 0x2a($v0) -/* BE4C10 80241460 30420001 */ andi $v0, $v0, 1 -/* BE4C14 80241464 10400003 */ beqz $v0, .L80241474 -/* BE4C18 80241468 2402000A */ addiu $v0, $zero, 0xa -/* BE4C1C 8024146C 0809058D */ j .L80241634 -/* BE4C20 80241470 AE620070 */ sw $v0, 0x70($s3) -.L80241474: -/* BE4C24 80241474 0809058D */ j .L80241634 -/* BE4C28 80241478 AE720070 */ sw $s2, 0x70($s3) -.L8024147C: -/* BE4C2C 8024147C 8E620074 */ lw $v0, 0x74($s3) -/* BE4C30 80241480 2442FFFF */ addiu $v0, $v0, -1 -.L80241484: -/* BE4C34 80241484 08090524 */ j .L80241490 -/* BE4C38 80241488 AE620074 */ sw $v0, 0x74($s3) -.L8024148C: -/* BE4C3C 8024148C AE220090 */ sw $v0, 0x90($s1) -.L80241490: -/* BE4C40 80241490 8E2300D0 */ lw $v1, 0xd0($s1) -/* BE4C44 80241494 C6000040 */ lwc1 $f0, 0x40($s0) -/* BE4C48 80241498 C4620000 */ lwc1 $f2, ($v1) -/* BE4C4C 8024149C 468010A0 */ cvt.s.w $f2, $f2 -/* BE4C50 802414A0 C4640008 */ lwc1 $f4, 8($v1) -/* BE4C54 802414A4 46802120 */ cvt.s.w $f4, $f4 -/* BE4C58 802414A8 E7A00010 */ swc1 $f0, 0x10($sp) -/* BE4C5C 802414AC 8E2200D0 */ lw $v0, 0xd0($s1) -/* BE4C60 802414B0 44051000 */ mfc1 $a1, $f2 -/* BE4C64 802414B4 C440000C */ lwc1 $f0, 0xc($v0) -/* BE4C68 802414B8 46800020 */ cvt.s.w $f0, $f0 -/* BE4C6C 802414BC E7A00014 */ swc1 $f0, 0x14($sp) -/* BE4C70 802414C0 8E2200D0 */ lw $v0, 0xd0($s1) -/* BE4C74 802414C4 44062000 */ mfc1 $a2, $f4 -/* BE4C78 802414C8 C4400010 */ lwc1 $f0, 0x10($v0) -/* BE4C7C 802414CC 46800020 */ cvt.s.w $f0, $f0 -/* BE4C80 802414D0 E7A00018 */ swc1 $f0, 0x18($sp) -/* BE4C84 802414D4 8C640018 */ lw $a0, 0x18($v1) -/* BE4C88 802414D8 0C0123F5 */ jal is_point_within_region -/* BE4C8C 802414DC 8E070038 */ lw $a3, 0x38($s0) -/* BE4C90 802414E0 1040001A */ beqz $v0, .L8024154C -/* BE4C94 802414E4 00000000 */ nop -/* BE4C98 802414E8 8E060038 */ lw $a2, 0x38($s0) -/* BE4C9C 802414EC 8E2200D0 */ lw $v0, 0xd0($s1) -/* BE4CA0 802414F0 8E070040 */ lw $a3, 0x40($s0) -/* BE4CA4 802414F4 C44C0000 */ lwc1 $f12, ($v0) -/* BE4CA8 802414F8 46806320 */ cvt.s.w $f12, $f12 -/* BE4CAC 802414FC C44E0008 */ lwc1 $f14, 8($v0) -/* BE4CB0 80241500 0C00A7B5 */ jal dist2D -/* BE4CB4 80241504 468073A0 */ cvt.s.w $f14, $f14 -/* BE4CB8 80241508 C6020018 */ lwc1 $f2, 0x18($s0) -/* BE4CBC 8024150C 4600103C */ c.lt.s $f2, $f0 -/* BE4CC0 80241510 00000000 */ nop -/* BE4CC4 80241514 4500000D */ bc1f .L8024154C -/* BE4CC8 80241518 E7A00034 */ swc1 $f0, 0x34($sp) -/* BE4CCC 8024151C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE4CD0 80241520 8E2200D0 */ lw $v0, 0xd0($s1) -/* BE4CD4 80241524 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE4CD8 80241528 C4480000 */ lwc1 $f8, ($v0) -/* BE4CDC 8024152C 46804220 */ cvt.s.w $f8, $f8 -/* BE4CE0 80241530 44064000 */ mfc1 $a2, $f8 -/* BE4CE4 80241534 C4480008 */ lwc1 $f8, 8($v0) -/* BE4CE8 80241538 46804220 */ cvt.s.w $f8, $f8 -/* BE4CEC 8024153C 44074000 */ mfc1 $a3, $f8 -/* BE4CF0 80241540 0C00A720 */ jal atan2 -/* BE4CF4 80241544 24140001 */ addiu $s4, $zero, 1 -/* BE4CF8 80241548 E600000C */ swc1 $f0, 0xc($s0) -.L8024154C: -/* BE4CFC 8024154C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BE4D00 80241550 8C43000C */ lw $v1, 0xc($v0) -/* BE4D04 80241554 8C420010 */ lw $v0, 0x10($v0) -/* BE4D08 80241558 00621825 */ or $v1, $v1, $v0 -/* BE4D0C 8024155C 00741825 */ or $v1, $v1, $s4 -/* BE4D10 80241560 10600008 */ beqz $v1, .L80241584 -/* BE4D14 80241564 00000000 */ nop -/* BE4D18 80241568 8602008C */ lh $v0, 0x8c($s0) -/* BE4D1C 8024156C 14400031 */ bnez $v0, .L80241634 -/* BE4D20 80241570 00000000 */ nop -/* BE4D24 80241574 8E050018 */ lw $a1, 0x18($s0) -/* BE4D28 80241578 8E06000C */ lw $a2, 0xc($s0) -/* BE4D2C 8024157C 0C00EA95 */ jal npc_move_heading -/* BE4D30 80241580 0200202D */ daddu $a0, $s0, $zero -.L80241584: -/* BE4D34 80241584 C600003C */ lwc1 $f0, 0x3c($s0) -/* BE4D38 80241588 3C014059 */ lui $at, 0x4059 -/* BE4D3C 8024158C 44811800 */ mtc1 $at, $f3 -/* BE4D40 80241590 44801000 */ mtc1 $zero, $f2 -/* BE4D44 80241594 46000021 */ cvt.d.s $f0, $f0 -/* BE4D48 80241598 46220002 */ mul.d $f0, $f0, $f2 -/* BE4D4C 8024159C 00000000 */ nop -/* BE4D50 802415A0 4620020D */ trunc.w.d $f8, $f0 -/* BE4D54 802415A4 E628007C */ swc1 $f8, 0x7c($s1) -/* BE4D58 802415A8 8E420004 */ lw $v0, 4($s2) -/* BE4D5C 802415AC 18400021 */ blez $v0, .L80241634 -/* BE4D60 802415B0 00000000 */ nop -/* BE4D64 802415B4 8602008E */ lh $v0, 0x8e($s0) -/* BE4D68 802415B8 9603008E */ lhu $v1, 0x8e($s0) -/* BE4D6C 802415BC 18400005 */ blez $v0, .L802415D4 -/* BE4D70 802415C0 2462FFFF */ addiu $v0, $v1, -1 -/* BE4D74 802415C4 A602008E */ sh $v0, 0x8e($s0) -/* BE4D78 802415C8 00021400 */ sll $v0, $v0, 0x10 -/* BE4D7C 802415CC 1C400019 */ bgtz $v0, .L80241634 -/* BE4D80 802415D0 00000000 */ nop -.L802415D4: -/* BE4D84 802415D4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BE4D88 802415D8 24020002 */ addiu $v0, $zero, 2 -/* BE4D8C 802415DC 0C00A67F */ jal rand_int -/* BE4D90 802415E0 AE620070 */ sw $v0, 0x70($s3) -/* BE4D94 802415E4 3C035555 */ lui $v1, 0x5555 -/* BE4D98 802415E8 34635556 */ ori $v1, $v1, 0x5556 -/* BE4D9C 802415EC 00430018 */ mult $v0, $v1 -/* BE4DA0 802415F0 000227C3 */ sra $a0, $v0, 0x1f -/* BE4DA4 802415F4 00004010 */ mfhi $t0 -/* BE4DA8 802415F8 01042023 */ subu $a0, $t0, $a0 -/* BE4DAC 802415FC 00041840 */ sll $v1, $a0, 1 -/* BE4DB0 80241600 00641821 */ addu $v1, $v1, $a0 -/* BE4DB4 80241604 00431023 */ subu $v0, $v0, $v1 -/* BE4DB8 80241608 24430002 */ addiu $v1, $v0, 2 -/* BE4DBC 8024160C AE630074 */ sw $v1, 0x74($s3) -/* BE4DC0 80241610 8E42002C */ lw $v0, 0x2c($s2) -/* BE4DC4 80241614 58400007 */ blezl $v0, .L80241634 -/* BE4DC8 80241618 AE600070 */ sw $zero, 0x70($s3) -/* BE4DCC 8024161C 8E420008 */ lw $v0, 8($s2) -/* BE4DD0 80241620 18400003 */ blez $v0, .L80241630 -/* BE4DD4 80241624 28620003 */ slti $v0, $v1, 3 -/* BE4DD8 80241628 10400002 */ beqz $v0, .L80241634 -/* BE4DDC 8024162C 00000000 */ nop -.L80241630: -/* BE4DE0 80241630 AE600070 */ sw $zero, 0x70($s3) -.L80241634: -/* BE4DE4 80241634 8FBF0058 */ lw $ra, 0x58($sp) -/* BE4DE8 80241638 8FB50054 */ lw $s5, 0x54($sp) -/* BE4DEC 8024163C 8FB40050 */ lw $s4, 0x50($sp) -/* BE4DF0 80241640 8FB3004C */ lw $s3, 0x4c($sp) -/* BE4DF4 80241644 8FB20048 */ lw $s2, 0x48($sp) -/* BE4DF8 80241648 8FB10044 */ lw $s1, 0x44($sp) -/* BE4DFC 8024164C 8FB00040 */ lw $s0, 0x40($sp) -/* BE4E00 80241650 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* BE4E04 80241654 D7B80070 */ ldc1 $f24, 0x70($sp) -/* BE4E08 80241658 D7B60068 */ ldc1 $f22, 0x68($sp) -/* BE4E0C 8024165C D7B40060 */ ldc1 $f20, 0x60($sp) -/* BE4E10 80241660 03E00008 */ jr $ra -/* BE4E14 80241664 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_80241668_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_80241668_BE37B0.s deleted file mode 100644 index 8df77a22da..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_80241668_BE37B0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241668_BE4E18 -/* BE4E18 80241668 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BE4E1C 8024166C AFB3001C */ sw $s3, 0x1c($sp) -/* BE4E20 80241670 0080982D */ daddu $s3, $a0, $zero -/* BE4E24 80241674 AFBF0020 */ sw $ra, 0x20($sp) -/* BE4E28 80241678 AFB20018 */ sw $s2, 0x18($sp) -/* BE4E2C 8024167C AFB10014 */ sw $s1, 0x14($sp) -/* BE4E30 80241680 AFB00010 */ sw $s0, 0x10($sp) -/* BE4E34 80241684 8E720148 */ lw $s2, 0x148($s3) -/* BE4E38 80241688 86440008 */ lh $a0, 8($s2) -/* BE4E3C 8024168C 0C00EABB */ jal get_npc_unsafe -/* BE4E40 80241690 00A0882D */ daddu $s1, $a1, $zero -/* BE4E44 80241694 8E240008 */ lw $a0, 8($s1) -/* BE4E48 80241698 0040802D */ daddu $s0, $v0, $zero -/* BE4E4C 8024169C 00041FC2 */ srl $v1, $a0, 0x1f -/* BE4E50 802416A0 00832021 */ addu $a0, $a0, $v1 -/* BE4E54 802416A4 00042043 */ sra $a0, $a0, 1 -/* BE4E58 802416A8 0C00A67F */ jal rand_int -/* BE4E5C 802416AC 24840001 */ addiu $a0, $a0, 1 -/* BE4E60 802416B0 8E230008 */ lw $v1, 8($s1) -/* BE4E64 802416B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* BE4E68 802416B8 00032FC2 */ srl $a1, $v1, 0x1f -/* BE4E6C 802416BC 00651821 */ addu $v1, $v1, $a1 -/* BE4E70 802416C0 00031843 */ sra $v1, $v1, 1 -/* BE4E74 802416C4 00621821 */ addu $v1, $v1, $v0 -/* BE4E78 802416C8 0C00A67F */ jal rand_int -/* BE4E7C 802416CC A603008E */ sh $v1, 0x8e($s0) -/* BE4E80 802416D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* BE4E84 802416D4 44820000 */ mtc1 $v0, $f0 -/* BE4E88 802416D8 00000000 */ nop -/* BE4E8C 802416DC 46800020 */ cvt.s.w $f0, $f0 -/* BE4E90 802416E0 46006300 */ add.s $f12, $f12, $f0 -/* BE4E94 802416E4 3C0142B4 */ lui $at, 0x42b4 -/* BE4E98 802416E8 44810000 */ mtc1 $at, $f0 -/* BE4E9C 802416EC 0C00A6C9 */ jal clamp_angle -/* BE4EA0 802416F0 46006301 */ sub.s $f12, $f12, $f0 -/* BE4EA4 802416F4 E600000C */ swc1 $f0, 0xc($s0) -/* BE4EA8 802416F8 8E4200CC */ lw $v0, 0xcc($s2) -/* BE4EAC 802416FC 8C420000 */ lw $v0, ($v0) -/* BE4EB0 80241700 AE020028 */ sw $v0, 0x28($s0) -/* BE4EB4 80241704 24020003 */ addiu $v0, $zero, 3 -/* BE4EB8 80241708 AE620070 */ sw $v0, 0x70($s3) -/* BE4EBC 8024170C 8FBF0020 */ lw $ra, 0x20($sp) -/* BE4EC0 80241710 8FB3001C */ lw $s3, 0x1c($sp) -/* BE4EC4 80241714 8FB20018 */ lw $s2, 0x18($sp) -/* BE4EC8 80241718 8FB10014 */ lw $s1, 0x14($sp) -/* BE4ECC 8024171C 8FB00010 */ lw $s0, 0x10($sp) -/* BE4ED0 80241720 03E00008 */ jr $ra -/* BE4ED4 80241724 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_80241B50_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_80241B50_BE37B0.s deleted file mode 100644 index 2fc1bacd75..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_80241B50_BE37B0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B50_BE5300 -/* BE5300 80241B50 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BE5304 80241B54 AFB3001C */ sw $s3, 0x1c($sp) -/* BE5308 80241B58 0080982D */ daddu $s3, $a0, $zero -/* BE530C 80241B5C AFBF0020 */ sw $ra, 0x20($sp) -/* BE5310 80241B60 AFB20018 */ sw $s2, 0x18($sp) -/* BE5314 80241B64 AFB10014 */ sw $s1, 0x14($sp) -/* BE5318 80241B68 AFB00010 */ sw $s0, 0x10($sp) -/* BE531C 80241B6C 8E720148 */ lw $s2, 0x148($s3) -/* BE5320 80241B70 86440008 */ lh $a0, 8($s2) -/* BE5324 80241B74 0C00EABB */ jal get_npc_unsafe -/* BE5328 80241B78 00A0802D */ daddu $s0, $a1, $zero -/* BE532C 80241B7C 0040882D */ daddu $s1, $v0, $zero -/* BE5330 80241B80 C6420080 */ lwc1 $f2, 0x80($s2) -/* BE5334 80241B84 468010A0 */ cvt.s.w $f2, $f2 -/* BE5338 80241B88 460010A1 */ cvt.d.s $f2, $f2 -/* BE533C 80241B8C C6400084 */ lwc1 $f0, 0x84($s2) -/* BE5340 80241B90 46800020 */ cvt.s.w $f0, $f0 -/* BE5344 80241B94 46000021 */ cvt.d.s $f0, $f0 -/* BE5348 80241B98 3C014059 */ lui $at, 0x4059 -/* BE534C 80241B9C 44812800 */ mtc1 $at, $f5 -/* BE5350 80241BA0 44802000 */ mtc1 $zero, $f4 -/* BE5354 80241BA4 8E4200CC */ lw $v0, 0xcc($s2) -/* BE5358 80241BA8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BE535C 80241BAC C62E0040 */ lwc1 $f14, 0x40($s1) -/* BE5360 80241BB0 46241083 */ div.d $f2, $f2, $f4 -/* BE5364 80241BB4 462010A0 */ cvt.s.d $f2, $f2 -/* BE5368 80241BB8 46240003 */ div.d $f0, $f0, $f4 -/* BE536C 80241BBC 8C420020 */ lw $v0, 0x20($v0) -/* BE5370 80241BC0 46200020 */ cvt.s.d $f0, $f0 -/* BE5374 80241BC4 E622001C */ swc1 $f2, 0x1c($s1) -/* BE5378 80241BC8 E6200014 */ swc1 $f0, 0x14($s1) -/* BE537C 80241BCC AE220028 */ sw $v0, 0x28($s1) -/* BE5380 80241BD0 C6000018 */ lwc1 $f0, 0x18($s0) -/* BE5384 80241BD4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BE5388 80241BD8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BE538C 80241BDC E6200018 */ swc1 $f0, 0x18($s1) -/* BE5390 80241BE0 8C460028 */ lw $a2, 0x28($v0) -/* BE5394 80241BE4 0C00A720 */ jal atan2 -/* BE5398 80241BE8 8C470030 */ lw $a3, 0x30($v0) -/* BE539C 80241BEC E620000C */ swc1 $f0, 0xc($s1) -/* BE53A0 80241BF0 8E420018 */ lw $v0, 0x18($s2) -/* BE53A4 80241BF4 AE400074 */ sw $zero, 0x74($s2) -/* BE53A8 80241BF8 9442002A */ lhu $v0, 0x2a($v0) -/* BE53AC 80241BFC 30420002 */ andi $v0, $v0, 2 -/* BE53B0 80241C00 10400005 */ beqz $v0, .L80241C18 -/* BE53B4 80241C04 24020003 */ addiu $v0, $zero, 3 -/* BE53B8 80241C08 A622008E */ sh $v0, 0x8e($s1) -/* BE53BC 80241C0C 2402000D */ addiu $v0, $zero, 0xd -/* BE53C0 80241C10 0809071A */ j .L80241C68 -/* BE53C4 80241C14 AE620070 */ sw $v0, 0x70($s3) -.L80241C18: -/* BE53C8 80241C18 24030001 */ addiu $v1, $zero, 1 -/* BE53CC 80241C1C 2402000E */ addiu $v0, $zero, 0xe -/* BE53D0 80241C20 A623008E */ sh $v1, 0x8e($s1) -/* BE53D4 80241C24 AE620070 */ sw $v0, 0x70($s3) -/* BE53D8 80241C28 C6200038 */ lwc1 $f0, 0x38($s1) -/* BE53DC 80241C2C 4600018D */ trunc.w.s $f6, $f0 -/* BE53E0 80241C30 44023000 */ mfc1 $v0, $f6 -/* BE53E4 80241C34 00000000 */ nop -/* BE53E8 80241C38 A6420010 */ sh $v0, 0x10($s2) -/* BE53EC 80241C3C C620003C */ lwc1 $f0, 0x3c($s1) -/* BE53F0 80241C40 4600018D */ trunc.w.s $f6, $f0 -/* BE53F4 80241C44 44023000 */ mfc1 $v0, $f6 -/* BE53F8 80241C48 00000000 */ nop -/* BE53FC 80241C4C A6420012 */ sh $v0, 0x12($s2) -/* BE5400 80241C50 C6200040 */ lwc1 $f0, 0x40($s1) -/* BE5404 80241C54 A2430007 */ sb $v1, 7($s2) -/* BE5408 80241C58 4600018D */ trunc.w.s $f6, $f0 -/* BE540C 80241C5C 44023000 */ mfc1 $v0, $f6 -/* BE5410 80241C60 00000000 */ nop -/* BE5414 80241C64 A6420014 */ sh $v0, 0x14($s2) -.L80241C68: -/* BE5418 80241C68 8FBF0020 */ lw $ra, 0x20($sp) -/* BE541C 80241C6C 8FB3001C */ lw $s3, 0x1c($sp) -/* BE5420 80241C70 8FB20018 */ lw $s2, 0x18($sp) -/* BE5424 80241C74 8FB10014 */ lw $s1, 0x14($sp) -/* BE5428 80241C78 8FB00010 */ lw $s0, 0x10($sp) -/* BE542C 80241C7C 03E00008 */ jr $ra -/* BE5430 80241C80 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_80241C84_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_80241C84_BE37B0.s deleted file mode 100644 index 108944b527..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_80241C84_BE37B0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C84_BE5434 -/* BE5434 80241C84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BE5438 80241C88 AFB00010 */ sw $s0, 0x10($sp) -/* BE543C 80241C8C 0080802D */ daddu $s0, $a0, $zero -/* BE5440 80241C90 AFBF0014 */ sw $ra, 0x14($sp) -/* BE5444 80241C94 8E020148 */ lw $v0, 0x148($s0) -/* BE5448 80241C98 0C00EABB */ jal get_npc_unsafe -/* BE544C 80241C9C 84440008 */ lh $a0, 8($v0) -/* BE5450 80241CA0 0040202D */ daddu $a0, $v0, $zero -/* BE5454 80241CA4 8482008E */ lh $v0, 0x8e($a0) -/* BE5458 80241CA8 9483008E */ lhu $v1, 0x8e($a0) -/* BE545C 80241CAC 18400005 */ blez $v0, .L80241CC4 -/* BE5460 80241CB0 2462FFFF */ addiu $v0, $v1, -1 -/* BE5464 80241CB4 A482008E */ sh $v0, 0x8e($a0) -/* BE5468 80241CB8 00021400 */ sll $v0, $v0, 0x10 -/* BE546C 80241CBC 1C400006 */ bgtz $v0, .L80241CD8 -/* BE5470 80241CC0 00000000 */ nop -.L80241CC4: -/* BE5474 80241CC4 8482008C */ lh $v0, 0x8c($a0) -/* BE5478 80241CC8 14400003 */ bnez $v0, .L80241CD8 -/* BE547C 80241CCC 2402000E */ addiu $v0, $zero, 0xe -/* BE5480 80241CD0 A480008E */ sh $zero, 0x8e($a0) -/* BE5484 80241CD4 AE020070 */ sw $v0, 0x70($s0) -.L80241CD8: -/* BE5488 80241CD8 8FBF0014 */ lw $ra, 0x14($sp) -/* BE548C 80241CDC 8FB00010 */ lw $s0, 0x10($sp) -/* BE5490 80241CE0 03E00008 */ jr $ra -/* BE5494 80241CE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_80242078_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_80242078_BE37B0.s deleted file mode 100644 index cee75ca991..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_80242078_BE37B0.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242078_BE5828 -/* BE5828 80242078 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* BE582C 8024207C AFB00028 */ sw $s0, 0x28($sp) -/* BE5830 80242080 00A0802D */ daddu $s0, $a1, $zero -/* BE5834 80242084 AFB1002C */ sw $s1, 0x2c($sp) -/* BE5838 80242088 00C0882D */ daddu $s1, $a2, $zero -/* BE583C 8024208C AFBF0034 */ sw $ra, 0x34($sp) -/* BE5840 80242090 AFB20030 */ sw $s2, 0x30($sp) -/* BE5844 80242094 AE200070 */ sw $zero, 0x70($s1) -/* BE5848 80242098 8C830000 */ lw $v1, ($a0) -/* BE584C 8024209C 2402FDFF */ addiu $v0, $zero, -0x201 -/* BE5850 802420A0 A480008E */ sh $zero, 0x8e($a0) -/* BE5854 802420A4 00621824 */ and $v1, $v1, $v0 -/* BE5858 802420A8 34650800 */ ori $a1, $v1, 0x800 -/* BE585C 802420AC AC850000 */ sw $a1, ($a0) -/* BE5860 802420B0 8E0200D0 */ lw $v0, 0xd0($s0) -/* BE5864 802420B4 8C420034 */ lw $v0, 0x34($v0) -/* BE5868 802420B8 10400003 */ beqz $v0, .L802420C8 -/* BE586C 802420BC 00E0902D */ daddu $s2, $a3, $zero -/* BE5870 802420C0 08090834 */ j .L802420D0 -/* BE5874 802420C4 34620808 */ ori $v0, $v1, 0x808 -.L802420C8: -/* BE5878 802420C8 2402FFF7 */ addiu $v0, $zero, -9 -/* BE587C 802420CC 00A21024 */ and $v0, $a1, $v0 -.L802420D0: -/* BE5880 802420D0 AC820000 */ sw $v0, ($a0) -/* BE5884 802420D4 27A20024 */ addiu $v0, $sp, 0x24 -/* BE5888 802420D8 27A50018 */ addiu $a1, $sp, 0x18 -/* BE588C 802420DC C4800038 */ lwc1 $f0, 0x38($a0) -/* BE5890 802420E0 C482003C */ lwc1 $f2, 0x3c($a0) -/* BE5894 802420E4 C4840040 */ lwc1 $f4, 0x40($a0) -/* BE5898 802420E8 3C01447A */ lui $at, 0x447a -/* BE589C 802420EC 44813000 */ mtc1 $at, $f6 -/* BE58A0 802420F0 27A6001C */ addiu $a2, $sp, 0x1c -/* BE58A4 802420F4 E7A00018 */ swc1 $f0, 0x18($sp) -/* BE58A8 802420F8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* BE58AC 802420FC E7A40020 */ swc1 $f4, 0x20($sp) -/* BE58B0 80242100 E7A60024 */ swc1 $f6, 0x24($sp) -/* BE58B4 80242104 AFA20010 */ sw $v0, 0x10($sp) -/* BE58B8 80242108 8C840080 */ lw $a0, 0x80($a0) -/* BE58BC 8024210C 0C0372DF */ jal func_800DCB7C -/* BE58C0 80242110 27A70020 */ addiu $a3, $sp, 0x20 -/* BE58C4 80242114 C7A20024 */ lwc1 $f2, 0x24($sp) -/* BE58C8 80242118 3C014059 */ lui $at, 0x4059 -/* BE58CC 8024211C 44812800 */ mtc1 $at, $f5 -/* BE58D0 80242120 44802000 */ mtc1 $zero, $f4 -/* BE58D4 80242124 460010A1 */ cvt.d.s $f2, $f2 -/* BE58D8 80242128 46241082 */ mul.d $f2, $f2, $f4 -/* BE58DC 8024212C 00000000 */ nop -/* BE58E0 80242130 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BE58E4 80242134 46000021 */ cvt.d.s $f0, $f0 -/* BE58E8 80242138 46240002 */ mul.d $f0, $f0, $f4 -/* BE58EC 8024213C 00000000 */ nop -/* BE58F0 80242140 3C013FE0 */ lui $at, 0x3fe0 -/* BE58F4 80242144 44812800 */ mtc1 $at, $f5 -/* BE58F8 80242148 44802000 */ mtc1 $zero, $f4 -/* BE58FC 8024214C 00000000 */ nop -/* BE5900 80242150 46241080 */ add.d $f2, $f2, $f4 -/* BE5904 80242154 AE000074 */ sw $zero, 0x74($s0) -/* BE5908 80242158 46240000 */ add.d $f0, $f0, $f4 -/* BE590C 8024215C AE000090 */ sw $zero, 0x90($s0) -/* BE5910 80242160 4620120D */ trunc.w.d $f8, $f2 -/* BE5914 80242164 E6080078 */ swc1 $f8, 0x78($s0) -/* BE5918 80242168 4620020D */ trunc.w.d $f8, $f0 -/* BE591C 8024216C E6080088 */ swc1 $f8, 0x88($s0) -/* BE5920 80242170 8E420014 */ lw $v0, 0x14($s2) -/* BE5924 80242174 AE220074 */ sw $v0, 0x74($s1) -/* BE5928 80242178 8E0200B0 */ lw $v0, 0xb0($s0) -/* BE592C 8024217C 34420010 */ ori $v0, $v0, 0x10 -/* BE5930 80242180 AE0200B0 */ sw $v0, 0xb0($s0) -/* BE5934 80242184 8FBF0034 */ lw $ra, 0x34($sp) -/* BE5938 80242188 8FB20030 */ lw $s2, 0x30($sp) -/* BE593C 8024218C 8FB1002C */ lw $s1, 0x2c($sp) -/* BE5940 80242190 8FB00028 */ lw $s0, 0x28($sp) -/* BE5944 80242194 03E00008 */ jr $ra -/* BE5948 80242198 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_8024219C_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_8024219C_BE37B0.s deleted file mode 100644 index c840586267..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_8024219C_BE37B0.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024219C_BE594C -/* BE594C 8024219C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BE5950 802421A0 AFB40040 */ sw $s4, 0x40($sp) -/* BE5954 802421A4 0080A02D */ daddu $s4, $a0, $zero -/* BE5958 802421A8 AFBF0048 */ sw $ra, 0x48($sp) -/* BE595C 802421AC AFB50044 */ sw $s5, 0x44($sp) -/* BE5960 802421B0 AFB3003C */ sw $s3, 0x3c($sp) -/* BE5964 802421B4 AFB20038 */ sw $s2, 0x38($sp) -/* BE5968 802421B8 AFB10034 */ sw $s1, 0x34($sp) -/* BE596C 802421BC AFB00030 */ sw $s0, 0x30($sp) -/* BE5970 802421C0 8E920148 */ lw $s2, 0x148($s4) -/* BE5974 802421C4 86440008 */ lh $a0, 8($s2) -/* BE5978 802421C8 8E90000C */ lw $s0, 0xc($s4) -/* BE597C 802421CC 0C00EABB */ jal get_npc_unsafe -/* BE5980 802421D0 00A0882D */ daddu $s1, $a1, $zero -/* BE5984 802421D4 0280202D */ daddu $a0, $s4, $zero -/* BE5988 802421D8 8E050000 */ lw $a1, ($s0) -/* BE598C 802421DC 0C0B1EAF */ jal get_variable -/* BE5990 802421E0 0040A82D */ daddu $s5, $v0, $zero -/* BE5994 802421E4 AFA00010 */ sw $zero, 0x10($sp) -/* BE5998 802421E8 8E4300D0 */ lw $v1, 0xd0($s2) -/* BE599C 802421EC 8C630030 */ lw $v1, 0x30($v1) -/* BE59A0 802421F0 AFA30014 */ sw $v1, 0x14($sp) -/* BE59A4 802421F4 8E4300D0 */ lw $v1, 0xd0($s2) -/* BE59A8 802421F8 8C63001C */ lw $v1, 0x1c($v1) -/* BE59AC 802421FC AFA30018 */ sw $v1, 0x18($sp) -/* BE59B0 80242200 8E4300D0 */ lw $v1, 0xd0($s2) -/* BE59B4 80242204 8C630024 */ lw $v1, 0x24($v1) -/* BE59B8 80242208 AFA3001C */ sw $v1, 0x1c($sp) -/* BE59BC 8024220C 8E4300D0 */ lw $v1, 0xd0($s2) -/* BE59C0 80242210 8C630028 */ lw $v1, 0x28($v1) -/* BE59C4 80242214 27B30010 */ addiu $s3, $sp, 0x10 -/* BE59C8 80242218 AFA30020 */ sw $v1, 0x20($sp) -/* BE59CC 8024221C 8E4300D0 */ lw $v1, 0xd0($s2) -/* BE59D0 80242220 3C0142F0 */ lui $at, 0x42f0 -/* BE59D4 80242224 44810000 */ mtc1 $at, $f0 -/* BE59D8 80242228 8C63002C */ lw $v1, 0x2c($v1) -/* BE59DC 8024222C 0040802D */ daddu $s0, $v0, $zero -/* BE59E0 80242230 E7A00028 */ swc1 $f0, 0x28($sp) -/* BE59E4 80242234 A7A0002C */ sh $zero, 0x2c($sp) -/* BE59E8 80242238 12200006 */ beqz $s1, .L80242254 -/* BE59EC 8024223C AFA30024 */ sw $v1, 0x24($sp) -/* BE59F0 80242240 02A0202D */ daddu $a0, $s5, $zero -/* BE59F4 80242244 0240282D */ daddu $a1, $s2, $zero -/* BE59F8 80242248 0280302D */ daddu $a2, $s4, $zero -/* BE59FC 8024224C 0C09081E */ jal func_80242078 -/* BE5A00 80242250 0200382D */ daddu $a3, $s0, $zero -.L80242254: -/* BE5A04 80242254 2402FFFE */ addiu $v0, $zero, -2 -/* BE5A08 80242258 A2A200AB */ sb $v0, 0xab($s5) -/* BE5A0C 8024225C 8E4300B0 */ lw $v1, 0xb0($s2) -/* BE5A10 80242260 30620004 */ andi $v0, $v1, 4 -/* BE5A14 80242264 10400007 */ beqz $v0, .L80242284 -/* BE5A18 80242268 00000000 */ nop -/* BE5A1C 8024226C 824200B4 */ lb $v0, 0xb4($s2) -/* BE5A20 80242270 1440003C */ bnez $v0, .L80242364 -/* BE5A24 80242274 0000102D */ daddu $v0, $zero, $zero -/* BE5A28 80242278 2402FFFB */ addiu $v0, $zero, -5 -/* BE5A2C 8024227C 00621024 */ and $v0, $v1, $v0 -/* BE5A30 80242280 AE4200B0 */ sw $v0, 0xb0($s2) -.L80242284: -/* BE5A34 80242284 8E830070 */ lw $v1, 0x70($s4) -/* BE5A38 80242288 2C62000F */ sltiu $v0, $v1, 0xf -/* BE5A3C 8024228C 10400034 */ beqz $v0, .L80242360 -/* BE5A40 80242290 00031080 */ sll $v0, $v1, 2 -/* BE5A44 80242294 3C018024 */ lui $at, 0x8024 -/* BE5A48 80242298 00220821 */ addu $at, $at, $v0 -/* BE5A4C 8024229C 8C2242E8 */ lw $v0, 0x42e8($at) -/* BE5A50 802422A0 00400008 */ jr $v0 -/* BE5A54 802422A4 00000000 */ nop -/* BE5A58 802422A8 0280202D */ daddu $a0, $s4, $zero -/* BE5A5C 802422AC 0200282D */ daddu $a1, $s0, $zero -/* BE5A60 802422B0 0C0903A4 */ jal func_80240E90 -/* BE5A64 802422B4 0260302D */ daddu $a2, $s3, $zero -/* BE5A68 802422B8 0280202D */ daddu $a0, $s4, $zero -/* BE5A6C 802422BC 0200282D */ daddu $a1, $s0, $zero -/* BE5A70 802422C0 0C090410 */ jal func_80241040 -/* BE5A74 802422C4 0260302D */ daddu $a2, $s3, $zero -/* BE5A78 802422C8 080908D9 */ j .L80242364 -/* BE5A7C 802422CC 0000102D */ daddu $v0, $zero, $zero -/* BE5A80 802422D0 0280202D */ daddu $a0, $s4, $zero -/* BE5A84 802422D4 0200282D */ daddu $a1, $s0, $zero -/* BE5A88 802422D8 0C09059A */ jal func_80241668 -/* BE5A8C 802422DC 0260302D */ daddu $a2, $s3, $zero -/* BE5A90 802422E0 0280202D */ daddu $a0, $s4, $zero -/* BE5A94 802422E4 0200282D */ daddu $a1, $s0, $zero -/* BE5A98 802422E8 0C0905CA */ jal func_80241728 -/* BE5A9C 802422EC 0260302D */ daddu $a2, $s3, $zero -/* BE5AA0 802422F0 080908D9 */ j .L80242364 -/* BE5AA4 802422F4 0000102D */ daddu $v0, $zero, $zero -/* BE5AA8 802422F8 0280202D */ daddu $a0, $s4, $zero -/* BE5AAC 802422FC 0200282D */ daddu $a1, $s0, $zero -/* BE5AB0 80242300 0C09069B */ jal func_80241A6C -/* BE5AB4 80242304 0260302D */ daddu $a2, $s3, $zero -/* BE5AB8 80242308 0280202D */ daddu $a0, $s4, $zero -/* BE5ABC 8024230C 0200282D */ daddu $a1, $s0, $zero -/* BE5AC0 80242310 0C0906B9 */ jal func_80241AE4 -/* BE5AC4 80242314 0260302D */ daddu $a2, $s3, $zero -/* BE5AC8 80242318 080908D9 */ j .L80242364 -/* BE5ACC 8024231C 0000102D */ daddu $v0, $zero, $zero -/* BE5AD0 80242320 0280202D */ daddu $a0, $s4, $zero -/* BE5AD4 80242324 0200282D */ daddu $a1, $s0, $zero -/* BE5AD8 80242328 0C0906D4 */ jal func_80241B50 -/* BE5ADC 8024232C 0260302D */ daddu $a2, $s3, $zero -/* BE5AE0 80242330 080908D9 */ j .L80242364 -/* BE5AE4 80242334 0000102D */ daddu $v0, $zero, $zero -/* BE5AE8 80242338 0280202D */ daddu $a0, $s4, $zero -/* BE5AEC 8024233C 0200282D */ daddu $a1, $s0, $zero -/* BE5AF0 80242340 0C090721 */ jal func_80241C84 -/* BE5AF4 80242344 0260302D */ daddu $a2, $s3, $zero -/* BE5AF8 80242348 080908D9 */ j .L80242364 -/* BE5AFC 8024234C 0000102D */ daddu $v0, $zero, $zero -/* BE5B00 80242350 0280202D */ daddu $a0, $s4, $zero -/* BE5B04 80242354 0200282D */ daddu $a1, $s0, $zero -/* BE5B08 80242358 0C09073A */ jal func_80241CE8 -/* BE5B0C 8024235C 0260302D */ daddu $a2, $s3, $zero -.L80242360: -/* BE5B10 80242360 0000102D */ daddu $v0, $zero, $zero -.L80242364: -/* BE5B14 80242364 8FBF0048 */ lw $ra, 0x48($sp) -/* BE5B18 80242368 8FB50044 */ lw $s5, 0x44($sp) -/* BE5B1C 8024236C 8FB40040 */ lw $s4, 0x40($sp) -/* BE5B20 80242370 8FB3003C */ lw $s3, 0x3c($sp) -/* BE5B24 80242374 8FB20038 */ lw $s2, 0x38($sp) -/* BE5B28 80242378 8FB10034 */ lw $s1, 0x34($sp) -/* BE5B2C 8024237C 8FB00030 */ lw $s0, 0x30($sp) -/* BE5B30 80242380 03E00008 */ jr $ra -/* BE5B34 80242384 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_802424E8_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_802424E8_BE37B0.s deleted file mode 100644 index ecc10e2426..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_802424E8_BE37B0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424E8_BE5C98 -/* BE5C98 802424E8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE5C9C 802424EC AFB10014 */ sw $s1, 0x14($sp) -/* BE5CA0 802424F0 0080882D */ daddu $s1, $a0, $zero -/* BE5CA4 802424F4 AFBF001C */ sw $ra, 0x1c($sp) -/* BE5CA8 802424F8 AFB20018 */ sw $s2, 0x18($sp) -/* BE5CAC 802424FC AFB00010 */ sw $s0, 0x10($sp) -/* BE5CB0 80242500 8E320148 */ lw $s2, 0x148($s1) -/* BE5CB4 80242504 0C00EABB */ jal get_npc_unsafe -/* BE5CB8 80242508 86440008 */ lh $a0, 8($s2) -/* BE5CBC 8024250C 0040802D */ daddu $s0, $v0, $zero -/* BE5CC0 80242510 0C00EAFF */ jal disable_npc_shadow -/* BE5CC4 80242514 0200202D */ daddu $a0, $s0, $zero -/* BE5CC8 80242518 24020016 */ addiu $v0, $zero, 0x16 -/* BE5CCC 8024251C A60200A8 */ sh $v0, 0xa8($s0) -/* BE5CD0 80242520 24020018 */ addiu $v0, $zero, 0x18 -/* BE5CD4 80242524 A60200A6 */ sh $v0, 0xa6($s0) -/* BE5CD8 80242528 AE200074 */ sw $zero, 0x74($s1) -/* BE5CDC 8024252C A600008E */ sh $zero, 0x8e($s0) -/* BE5CE0 80242530 8E4200CC */ lw $v0, 0xcc($s2) -/* BE5CE4 80242534 8C420020 */ lw $v0, 0x20($v0) -/* BE5CE8 80242538 AE020028 */ sw $v0, 0x28($s0) -/* BE5CEC 8024253C 24020001 */ addiu $v0, $zero, 1 -/* BE5CF0 80242540 AE220070 */ sw $v0, 0x70($s1) -/* BE5CF4 80242544 8FBF001C */ lw $ra, 0x1c($sp) -/* BE5CF8 80242548 8FB20018 */ lw $s2, 0x18($sp) -/* BE5CFC 8024254C 8FB10014 */ lw $s1, 0x14($sp) -/* BE5D00 80242550 8FB00010 */ lw $s0, 0x10($sp) -/* BE5D04 80242554 03E00008 */ jr $ra -/* BE5D08 80242558 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_8024268C_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_8024268C_BE37B0.s deleted file mode 100644 index a92bf665dc..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_8024268C_BE37B0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024268C_BE5E3C -/* BE5E3C 8024268C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE5E40 80242690 AFB20018 */ sw $s2, 0x18($sp) -/* BE5E44 80242694 0080902D */ daddu $s2, $a0, $zero -/* BE5E48 80242698 AFBF001C */ sw $ra, 0x1c($sp) -/* BE5E4C 8024269C AFB10014 */ sw $s1, 0x14($sp) -/* BE5E50 802426A0 AFB00010 */ sw $s0, 0x10($sp) -/* BE5E54 802426A4 8E510148 */ lw $s1, 0x148($s2) -/* BE5E58 802426A8 0C00EABB */ jal get_npc_unsafe -/* BE5E5C 802426AC 86240008 */ lh $a0, 8($s1) -/* BE5E60 802426B0 0040802D */ daddu $s0, $v0, $zero -/* BE5E64 802426B4 9602008E */ lhu $v0, 0x8e($s0) -/* BE5E68 802426B8 2442FFFF */ addiu $v0, $v0, -1 -/* BE5E6C 802426BC A602008E */ sh $v0, 0x8e($s0) -/* BE5E70 802426C0 00021400 */ sll $v0, $v0, 0x10 -/* BE5E74 802426C4 1C400012 */ bgtz $v0, .L80242710 -/* BE5E78 802426C8 00000000 */ nop -/* BE5E7C 802426CC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BE5E80 802426D0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BE5E84 802426D4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE5E88 802426D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE5E8C 802426DC 8C460028 */ lw $a2, 0x28($v0) -/* BE5E90 802426E0 0C00A720 */ jal atan2 -/* BE5E94 802426E4 8C470030 */ lw $a3, 0x30($v0) -/* BE5E98 802426E8 0200202D */ daddu $a0, $s0, $zero -/* BE5E9C 802426EC 0C00EAE8 */ jal enable_npc_shadow -/* BE5EA0 802426F0 E600000C */ swc1 $f0, 0xc($s0) -/* BE5EA4 802426F4 8E2200CC */ lw $v0, 0xcc($s1) -/* BE5EA8 802426F8 8C430028 */ lw $v1, 0x28($v0) -/* BE5EAC 802426FC 24020008 */ addiu $v0, $zero, 8 -/* BE5EB0 80242700 A602008E */ sh $v0, 0x8e($s0) -/* BE5EB4 80242704 24020003 */ addiu $v0, $zero, 3 -/* BE5EB8 80242708 AE030028 */ sw $v1, 0x28($s0) -/* BE5EBC 8024270C AE420070 */ sw $v0, 0x70($s2) -.L80242710: -/* BE5EC0 80242710 8FBF001C */ lw $ra, 0x1c($sp) -/* BE5EC4 80242714 8FB20018 */ lw $s2, 0x18($sp) -/* BE5EC8 80242718 8FB10014 */ lw $s1, 0x14($sp) -/* BE5ECC 8024271C 8FB00010 */ lw $s0, 0x10($sp) -/* BE5ED0 80242720 03E00008 */ jr $ra -/* BE5ED4 80242724 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_802427B0_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_802427B0_BE37B0.s deleted file mode 100644 index 7ffdce66b8..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_802427B0_BE37B0.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427B0_BE5F60 -/* BE5F60 802427B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE5F64 802427B4 AFB10014 */ sw $s1, 0x14($sp) -/* BE5F68 802427B8 0080882D */ daddu $s1, $a0, $zero -/* BE5F6C 802427BC AFBF001C */ sw $ra, 0x1c($sp) -/* BE5F70 802427C0 AFB20018 */ sw $s2, 0x18($sp) -/* BE5F74 802427C4 AFB00010 */ sw $s0, 0x10($sp) -/* BE5F78 802427C8 8E320148 */ lw $s2, 0x148($s1) -/* BE5F7C 802427CC 0C00EABB */ jal get_npc_unsafe -/* BE5F80 802427D0 86440008 */ lh $a0, 8($s2) -/* BE5F84 802427D4 240400B4 */ addiu $a0, $zero, 0xb4 -/* BE5F88 802427D8 0C00A67F */ jal rand_int -/* BE5F8C 802427DC 0040802D */ daddu $s0, $v0, $zero -/* BE5F90 802427E0 C60C000C */ lwc1 $f12, 0xc($s0) -/* BE5F94 802427E4 44820000 */ mtc1 $v0, $f0 -/* BE5F98 802427E8 00000000 */ nop -/* BE5F9C 802427EC 46800020 */ cvt.s.w $f0, $f0 -/* BE5FA0 802427F0 46006300 */ add.s $f12, $f12, $f0 -/* BE5FA4 802427F4 3C0142B4 */ lui $at, 0x42b4 -/* BE5FA8 802427F8 44810000 */ mtc1 $at, $f0 -/* BE5FAC 802427FC 0C00A6C9 */ jal clamp_angle -/* BE5FB0 80242800 46006301 */ sub.s $f12, $f12, $f0 -/* BE5FB4 80242804 E600000C */ swc1 $f0, 0xc($s0) -/* BE5FB8 80242808 8E4200CC */ lw $v0, 0xcc($s2) -/* BE5FBC 8024280C 8C420000 */ lw $v0, ($v0) -/* BE5FC0 80242810 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BE5FC4 80242814 0C00A67F */ jal rand_int -/* BE5FC8 80242818 AE020028 */ sw $v0, 0x28($s0) -/* BE5FCC 8024281C 00021FC2 */ srl $v1, $v0, 0x1f -/* BE5FD0 80242820 00431821 */ addu $v1, $v0, $v1 -/* BE5FD4 80242824 00031843 */ sra $v1, $v1, 1 -/* BE5FD8 80242828 00031840 */ sll $v1, $v1, 1 -/* BE5FDC 8024282C 00431023 */ subu $v0, $v0, $v1 -/* BE5FE0 80242830 24420002 */ addiu $v0, $v0, 2 -/* BE5FE4 80242834 AE220074 */ sw $v0, 0x74($s1) -/* BE5FE8 80242838 24020005 */ addiu $v0, $zero, 5 -/* BE5FEC 8024283C AE220070 */ sw $v0, 0x70($s1) -/* BE5FF0 80242840 8FBF001C */ lw $ra, 0x1c($sp) -/* BE5FF4 80242844 8FB20018 */ lw $s2, 0x18($sp) -/* BE5FF8 80242848 8FB10014 */ lw $s1, 0x14($sp) -/* BE5FFC 8024284C 8FB00010 */ lw $s0, 0x10($sp) -/* BE6000 80242850 03E00008 */ jr $ra -/* BE6004 80242854 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_80242858_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_80242858_BE37B0.s deleted file mode 100644 index 9ef073bac0..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_80242858_BE37B0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242858_BE6008 -/* BE6008 80242858 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BE600C 8024285C AFB3003C */ sw $s3, 0x3c($sp) -/* BE6010 80242860 0080982D */ daddu $s3, $a0, $zero -/* BE6014 80242864 AFBF0040 */ sw $ra, 0x40($sp) -/* BE6018 80242868 AFB20038 */ sw $s2, 0x38($sp) -/* BE601C 8024286C AFB10034 */ sw $s1, 0x34($sp) -/* BE6020 80242870 AFB00030 */ sw $s0, 0x30($sp) -/* BE6024 80242874 8E700148 */ lw $s0, 0x148($s3) -/* BE6028 80242878 00A0902D */ daddu $s2, $a1, $zero -/* BE602C 8024287C 86040008 */ lh $a0, 8($s0) -/* BE6030 80242880 0C00EABB */ jal get_npc_unsafe -/* BE6034 80242884 00C0882D */ daddu $s1, $a2, $zero -/* BE6038 80242888 0220202D */ daddu $a0, $s1, $zero -/* BE603C 8024288C 0200282D */ daddu $a1, $s0, $zero -/* BE6040 80242890 AFA00010 */ sw $zero, 0x10($sp) -/* BE6044 80242894 8E460024 */ lw $a2, 0x24($s2) -/* BE6048 80242898 8E470028 */ lw $a3, 0x28($s2) -/* BE604C 8024289C 0C01242D */ jal func_800490B4 -/* BE6050 802428A0 0040802D */ daddu $s0, $v0, $zero -/* BE6054 802428A4 1040000B */ beqz $v0, .L802428D4 -/* BE6058 802428A8 00000000 */ nop -/* BE605C 802428AC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BE6060 802428B0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BE6064 802428B4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE6068 802428B8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE606C 802428BC 8C460028 */ lw $a2, 0x28($v0) -/* BE6070 802428C0 0C00A720 */ jal atan2 -/* BE6074 802428C4 8C470030 */ lw $a3, 0x30($v0) -/* BE6078 802428C8 2402000C */ addiu $v0, $zero, 0xc -/* BE607C 802428CC 08090A6B */ j .L802429AC -/* BE6080 802428D0 E600000C */ swc1 $f0, 0xc($s0) -.L802428D4: -/* BE6084 802428D4 9602008E */ lhu $v0, 0x8e($s0) -/* BE6088 802428D8 2442FFFF */ addiu $v0, $v0, -1 -/* BE608C 802428DC A602008E */ sh $v0, 0x8e($s0) -/* BE6090 802428E0 00021400 */ sll $v0, $v0, 0x10 -/* BE6094 802428E4 1C400032 */ bgtz $v0, .L802429B0 -/* BE6098 802428E8 00000000 */ nop -/* BE609C 802428EC 8E620074 */ lw $v0, 0x74($s3) -/* BE60A0 802428F0 2442FFFF */ addiu $v0, $v0, -1 -/* BE60A4 802428F4 18400014 */ blez $v0, .L80242948 -/* BE60A8 802428F8 AE620074 */ sw $v0, 0x74($s3) -/* BE60AC 802428FC C600000C */ lwc1 $f0, 0xc($s0) -/* BE60B0 80242900 3C014334 */ lui $at, 0x4334 -/* BE60B4 80242904 44816000 */ mtc1 $at, $f12 -/* BE60B8 80242908 0C00A6C9 */ jal clamp_angle -/* BE60BC 8024290C 460C0300 */ add.s $f12, $f0, $f12 -/* BE60C0 80242910 E600000C */ swc1 $f0, 0xc($s0) -/* BE60C4 80242914 8E440008 */ lw $a0, 8($s2) -/* BE60C8 80242918 000417C2 */ srl $v0, $a0, 0x1f -/* BE60CC 8024291C 00822021 */ addu $a0, $a0, $v0 -/* BE60D0 80242920 00042043 */ sra $a0, $a0, 1 -/* BE60D4 80242924 0C00A67F */ jal rand_int -/* BE60D8 80242928 24840001 */ addiu $a0, $a0, 1 -/* BE60DC 8024292C 8E430008 */ lw $v1, 8($s2) -/* BE60E0 80242930 000327C2 */ srl $a0, $v1, 0x1f -/* BE60E4 80242934 00641821 */ addu $v1, $v1, $a0 -/* BE60E8 80242938 00031843 */ sra $v1, $v1, 1 -/* BE60EC 8024293C 00621821 */ addu $v1, $v1, $v0 -/* BE60F0 80242940 08090A6C */ j .L802429B0 -/* BE60F4 80242944 A603008E */ sh $v1, 0x8e($s0) -.L80242948: -/* BE60F8 80242948 24040002 */ addiu $a0, $zero, 2 -/* BE60FC 8024294C 0200282D */ daddu $a1, $s0, $zero -/* BE6100 80242950 0000302D */ daddu $a2, $zero, $zero -/* BE6104 80242954 860300A8 */ lh $v1, 0xa8($s0) -/* BE6108 80242958 3C013F80 */ lui $at, 0x3f80 -/* BE610C 8024295C 44810000 */ mtc1 $at, $f0 -/* BE6110 80242960 3C014000 */ lui $at, 0x4000 -/* BE6114 80242964 44811000 */ mtc1 $at, $f2 -/* BE6118 80242968 3C01C1A0 */ lui $at, 0xc1a0 -/* BE611C 8024296C 44812000 */ mtc1 $at, $f4 -/* BE6120 80242970 2402000C */ addiu $v0, $zero, 0xc -/* BE6124 80242974 AFA2001C */ sw $v0, 0x1c($sp) -/* BE6128 80242978 44833000 */ mtc1 $v1, $f6 -/* BE612C 8024297C 00000000 */ nop -/* BE6130 80242980 468031A0 */ cvt.s.w $f6, $f6 -/* BE6134 80242984 44073000 */ mfc1 $a3, $f6 -/* BE6138 80242988 27A20028 */ addiu $v0, $sp, 0x28 -/* BE613C 8024298C AFA20020 */ sw $v0, 0x20($sp) -/* BE6140 80242990 E7A00010 */ swc1 $f0, 0x10($sp) -/* BE6144 80242994 E7A20014 */ swc1 $f2, 0x14($sp) -/* BE6148 80242998 0C01BFA4 */ jal fx_emote -/* BE614C 8024299C E7A40018 */ swc1 $f4, 0x18($sp) -/* BE6150 802429A0 2402000F */ addiu $v0, $zero, 0xf -/* BE6154 802429A4 A602008E */ sh $v0, 0x8e($s0) -/* BE6158 802429A8 24020028 */ addiu $v0, $zero, 0x28 -.L802429AC: -/* BE615C 802429AC AE620070 */ sw $v0, 0x70($s3) -.L802429B0: -/* BE6160 802429B0 8FBF0040 */ lw $ra, 0x40($sp) -/* BE6164 802429B4 8FB3003C */ lw $s3, 0x3c($sp) -/* BE6168 802429B8 8FB20038 */ lw $s2, 0x38($sp) -/* BE616C 802429BC 8FB10034 */ lw $s1, 0x34($sp) -/* BE6170 802429C0 8FB00030 */ lw $s0, 0x30($sp) -/* BE6174 802429C4 03E00008 */ jr $ra -/* BE6178 802429C8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_80242A1C_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_80242A1C_BE37B0.s deleted file mode 100644 index 201384e368..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_80242A1C_BE37B0.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A1C_BE61CC -/* BE61CC 80242A1C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BE61D0 80242A20 AFB30024 */ sw $s3, 0x24($sp) -/* BE61D4 80242A24 0080982D */ daddu $s3, $a0, $zero -/* BE61D8 80242A28 AFBF002C */ sw $ra, 0x2c($sp) -/* BE61DC 80242A2C AFB40028 */ sw $s4, 0x28($sp) -/* BE61E0 80242A30 AFB20020 */ sw $s2, 0x20($sp) -/* BE61E4 80242A34 AFB1001C */ sw $s1, 0x1c($sp) -/* BE61E8 80242A38 AFB00018 */ sw $s0, 0x18($sp) -/* BE61EC 80242A3C 8E710148 */ lw $s1, 0x148($s3) -/* BE61F0 80242A40 86240008 */ lh $a0, 8($s1) -/* BE61F4 80242A44 0C00EABB */ jal get_npc_unsafe -/* BE61F8 80242A48 00A0A02D */ daddu $s4, $a1, $zero -/* BE61FC 80242A4C 0040802D */ daddu $s0, $v0, $zero -/* BE6200 80242A50 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* BE6204 80242A54 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* BE6208 80242A58 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE620C 80242A5C 8E420000 */ lw $v0, ($s2) -/* BE6210 80242A60 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE6214 80242A64 8C460028 */ lw $a2, 0x28($v0) -/* BE6218 80242A68 0C00A720 */ jal atan2 -/* BE621C 80242A6C 8C470030 */ lw $a3, 0x30($v0) -/* BE6220 80242A70 3C025555 */ lui $v0, 0x5555 -/* BE6224 80242A74 9603008E */ lhu $v1, 0x8e($s0) -/* BE6228 80242A78 34425556 */ ori $v0, $v0, 0x5556 -/* BE622C 80242A7C 00031C00 */ sll $v1, $v1, 0x10 -/* BE6230 80242A80 00032403 */ sra $a0, $v1, 0x10 -/* BE6234 80242A84 00820018 */ mult $a0, $v0 -/* BE6238 80242A88 00031FC3 */ sra $v1, $v1, 0x1f -/* BE623C 80242A8C 00004010 */ mfhi $t0 -/* BE6240 80242A90 01031823 */ subu $v1, $t0, $v1 -/* BE6244 80242A94 00031040 */ sll $v0, $v1, 1 -/* BE6248 80242A98 00431021 */ addu $v0, $v0, $v1 -/* BE624C 80242A9C 00822023 */ subu $a0, $a0, $v0 -/* BE6250 80242AA0 00042400 */ sll $a0, $a0, 0x10 -/* BE6254 80242AA4 1480000C */ bnez $a0, .L80242AD8 -/* BE6258 80242AA8 E600000C */ swc1 $f0, 0xc($s0) -/* BE625C 80242AAC C6020040 */ lwc1 $f2, 0x40($s0) -/* BE6260 80242AB0 3C014000 */ lui $at, 0x4000 -/* BE6264 80242AB4 44810000 */ mtc1 $at, $f0 -/* BE6268 80242AB8 AFA00010 */ sw $zero, 0x10($sp) -/* BE626C 80242ABC AFA00014 */ sw $zero, 0x14($sp) -/* BE6270 80242AC0 46001080 */ add.s $f2, $f2, $f0 -/* BE6274 80242AC4 8E06003C */ lw $a2, 0x3c($s0) -/* BE6278 80242AC8 8E050038 */ lw $a1, 0x38($s0) -/* BE627C 80242ACC 44071000 */ mfc1 $a3, $f2 -/* BE6280 80242AD0 0C01BECC */ jal fx_walk_normal -/* BE6284 80242AD4 24040002 */ addiu $a0, $zero, 2 -.L80242AD8: -/* BE6288 80242AD8 9602008E */ lhu $v0, 0x8e($s0) -/* BE628C 80242ADC 2442FFFF */ addiu $v0, $v0, -1 -/* BE6290 80242AE0 A602008E */ sh $v0, 0x8e($s0) -/* BE6294 80242AE4 00021400 */ sll $v0, $v0, 0x10 -/* BE6298 80242AE8 1C40002C */ bgtz $v0, .L80242B9C -/* BE629C 80242AEC 00000000 */ nop -/* BE62A0 80242AF0 C6000038 */ lwc1 $f0, 0x38($s0) -/* BE62A4 80242AF4 4600010D */ trunc.w.s $f4, $f0 -/* BE62A8 80242AF8 44022000 */ mfc1 $v0, $f4 -/* BE62AC 80242AFC 00000000 */ nop -/* BE62B0 80242B00 A6220010 */ sh $v0, 0x10($s1) -/* BE62B4 80242B04 C600003C */ lwc1 $f0, 0x3c($s0) -/* BE62B8 80242B08 4600010D */ trunc.w.s $f4, $f0 -/* BE62BC 80242B0C 44022000 */ mfc1 $v0, $f4 -/* BE62C0 80242B10 00000000 */ nop -/* BE62C4 80242B14 A6220012 */ sh $v0, 0x12($s1) -/* BE62C8 80242B18 C6000040 */ lwc1 $f0, 0x40($s0) -/* BE62CC 80242B1C 24020001 */ addiu $v0, $zero, 1 -/* BE62D0 80242B20 A2220007 */ sb $v0, 7($s1) -/* BE62D4 80242B24 4600010D */ trunc.w.s $f4, $f0 -/* BE62D8 80242B28 44022000 */ mfc1 $v0, $f4 -/* BE62DC 80242B2C 00000000 */ nop -/* BE62E0 80242B30 A6220014 */ sh $v0, 0x14($s1) -/* BE62E4 80242B34 C6800018 */ lwc1 $f0, 0x18($s4) -/* BE62E8 80242B38 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE62EC 80242B3C C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE62F0 80242B40 8E420000 */ lw $v0, ($s2) -/* BE62F4 80242B44 E6000018 */ swc1 $f0, 0x18($s0) -/* BE62F8 80242B48 8C460028 */ lw $a2, 0x28($v0) -/* BE62FC 80242B4C 0C00A7B5 */ jal dist2D -/* BE6300 80242B50 8C470030 */ lw $a3, 0x30($v0) -/* BE6304 80242B54 C6020018 */ lwc1 $f2, 0x18($s0) -/* BE6308 80242B58 46020003 */ div.s $f0, $f0, $f2 -/* BE630C 80242B5C 3C018024 */ lui $at, 0x8024 -/* BE6310 80242B60 D4224340 */ ldc1 $f2, 0x4340($at) -/* BE6314 80242B64 46000021 */ cvt.d.s $f0, $f0 -/* BE6318 80242B68 46220000 */ add.d $f0, $f0, $f2 -/* BE631C 80242B6C 4620010D */ trunc.w.d $f4, $f0 -/* BE6320 80242B70 44022000 */ mfc1 $v0, $f4 -/* BE6324 80242B74 00000000 */ nop -/* BE6328 80242B78 A602008E */ sh $v0, 0x8e($s0) -/* BE632C 80242B7C 00021400 */ sll $v0, $v0, 0x10 -/* BE6330 80242B80 00021403 */ sra $v0, $v0, 0x10 -/* BE6334 80242B84 2842000F */ slti $v0, $v0, 0xf -/* BE6338 80242B88 10400002 */ beqz $v0, .L80242B94 -/* BE633C 80242B8C 2402000F */ addiu $v0, $zero, 0xf -/* BE6340 80242B90 A602008E */ sh $v0, 0x8e($s0) -.L80242B94: -/* BE6344 80242B94 24020016 */ addiu $v0, $zero, 0x16 -/* BE6348 80242B98 AE620070 */ sw $v0, 0x70($s3) -.L80242B9C: -/* BE634C 80242B9C 8FBF002C */ lw $ra, 0x2c($sp) -/* BE6350 80242BA0 8FB40028 */ lw $s4, 0x28($sp) -/* BE6354 80242BA4 8FB30024 */ lw $s3, 0x24($sp) -/* BE6358 80242BA8 8FB20020 */ lw $s2, 0x20($sp) -/* BE635C 80242BAC 8FB1001C */ lw $s1, 0x1c($sp) -/* BE6360 80242BB0 8FB00018 */ lw $s0, 0x18($sp) -/* BE6364 80242BB4 03E00008 */ jr $ra -/* BE6368 80242BB8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_arn/arn_04/func_80242EF0_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/func_80242EF0_BE37B0.s deleted file mode 100644 index d41132581b..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/func_80242EF0_BE37B0.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242EF0_BE66A0 -/* BE66A0 80242EF0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE66A4 80242EF4 AFB10014 */ sw $s1, 0x14($sp) -/* BE66A8 80242EF8 0080882D */ daddu $s1, $a0, $zero -/* BE66AC 80242EFC AFBF0018 */ sw $ra, 0x18($sp) -/* BE66B0 80242F00 AFB00010 */ sw $s0, 0x10($sp) -/* BE66B4 80242F04 8E300148 */ lw $s0, 0x148($s1) -/* BE66B8 80242F08 0C00EABB */ jal get_npc_unsafe -/* BE66BC 80242F0C 86040008 */ lh $a0, 8($s0) -/* BE66C0 80242F10 0040202D */ daddu $a0, $v0, $zero -/* BE66C4 80242F14 8482008E */ lh $v0, 0x8e($a0) -/* BE66C8 80242F18 9483008E */ lhu $v1, 0x8e($a0) -/* BE66CC 80242F1C 18400002 */ blez $v0, .L80242F28 -/* BE66D0 80242F20 2462FFFF */ addiu $v0, $v1, -1 -/* BE66D4 80242F24 A482008E */ sh $v0, 0x8e($a0) -.L80242F28: -/* BE66D8 80242F28 8482008C */ lh $v0, 0x8c($a0) -/* BE66DC 80242F2C 1440000A */ bnez $v0, .L80242F58 -/* BE66E0 80242F30 00000000 */ nop -/* BE66E4 80242F34 8482008E */ lh $v0, 0x8e($a0) -/* BE66E8 80242F38 1C400007 */ bgtz $v0, .L80242F58 -/* BE66EC 80242F3C 24020008 */ addiu $v0, $zero, 8 -/* BE66F0 80242F40 A482008E */ sh $v0, 0x8e($a0) -/* BE66F4 80242F44 8E0200CC */ lw $v0, 0xcc($s0) -/* BE66F8 80242F48 8C42002C */ lw $v0, 0x2c($v0) -/* BE66FC 80242F4C AC820028 */ sw $v0, 0x28($a0) -/* BE6700 80242F50 24020033 */ addiu $v0, $zero, 0x33 -/* BE6704 80242F54 AE220070 */ sw $v0, 0x70($s1) -.L80242F58: -/* BE6708 80242F58 8FBF0018 */ lw $ra, 0x18($sp) -/* BE670C 80242F5C 8FB10014 */ lw $s1, 0x14($sp) -/* BE6710 80242F60 8FB00010 */ lw $s0, 0x10($sp) -/* BE6714 80242F64 03E00008 */ jr $ra -/* BE6718 80242F68 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_05/func_80240158_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/func_80240158_BE7BE0.s deleted file mode 100644 index bdb368d7fb..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/func_80240158_BE7BE0.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_BE7D38 -/* BE7D38 80240158 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* BE7D3C 8024015C AFB20038 */ sw $s2, 0x38($sp) -/* BE7D40 80240160 0080902D */ daddu $s2, $a0, $zero -/* BE7D44 80240164 AFBF0044 */ sw $ra, 0x44($sp) -/* BE7D48 80240168 AFB40040 */ sw $s4, 0x40($sp) -/* BE7D4C 8024016C AFB3003C */ sw $s3, 0x3c($sp) -/* BE7D50 80240170 AFB10034 */ sw $s1, 0x34($sp) -/* BE7D54 80240174 AFB00030 */ sw $s0, 0x30($sp) -/* BE7D58 80240178 F7B60050 */ sdc1 $f22, 0x50($sp) -/* BE7D5C 8024017C F7B40048 */ sdc1 $f20, 0x48($sp) -/* BE7D60 80240180 8E510148 */ lw $s1, 0x148($s2) -/* BE7D64 80240184 00A0982D */ daddu $s3, $a1, $zero -/* BE7D68 80240188 86240008 */ lh $a0, 8($s1) -/* BE7D6C 8024018C 0C00EABB */ jal get_npc_unsafe -/* BE7D70 80240190 00C0A02D */ daddu $s4, $a2, $zero -/* BE7D74 80240194 8E630014 */ lw $v1, 0x14($s3) -/* BE7D78 80240198 04600030 */ bltz $v1, .L8024025C -/* BE7D7C 8024019C 0040802D */ daddu $s0, $v0, $zero -/* BE7D80 802401A0 8E420074 */ lw $v0, 0x74($s2) -/* BE7D84 802401A4 1C40002C */ bgtz $v0, .L80240258 -/* BE7D88 802401A8 2442FFFF */ addiu $v0, $v0, -1 -/* BE7D8C 802401AC 0280202D */ daddu $a0, $s4, $zero -/* BE7D90 802401B0 AE430074 */ sw $v1, 0x74($s2) -/* BE7D94 802401B4 AFA00010 */ sw $zero, 0x10($sp) -/* BE7D98 802401B8 8E66000C */ lw $a2, 0xc($s3) -/* BE7D9C 802401BC 8E670010 */ lw $a3, 0x10($s3) -/* BE7DA0 802401C0 0C01242D */ jal func_800490B4 -/* BE7DA4 802401C4 0220282D */ daddu $a1, $s1, $zero -/* BE7DA8 802401C8 10400021 */ beqz $v0, .L80240250 -/* BE7DAC 802401CC 0000202D */ daddu $a0, $zero, $zero -/* BE7DB0 802401D0 0200282D */ daddu $a1, $s0, $zero -/* BE7DB4 802401D4 0000302D */ daddu $a2, $zero, $zero -/* BE7DB8 802401D8 860300A8 */ lh $v1, 0xa8($s0) -/* BE7DBC 802401DC 3C013F80 */ lui $at, 0x3f80 -/* BE7DC0 802401E0 44810000 */ mtc1 $at, $f0 -/* BE7DC4 802401E4 3C014000 */ lui $at, 0x4000 -/* BE7DC8 802401E8 44811000 */ mtc1 $at, $f2 -/* BE7DCC 802401EC 3C01C1A0 */ lui $at, 0xc1a0 -/* BE7DD0 802401F0 44812000 */ mtc1 $at, $f4 -/* BE7DD4 802401F4 2402000F */ addiu $v0, $zero, 0xf -/* BE7DD8 802401F8 AFA2001C */ sw $v0, 0x1c($sp) -/* BE7DDC 802401FC 44833000 */ mtc1 $v1, $f6 -/* BE7DE0 80240200 00000000 */ nop -/* BE7DE4 80240204 468031A0 */ cvt.s.w $f6, $f6 -/* BE7DE8 80240208 44073000 */ mfc1 $a3, $f6 -/* BE7DEC 8024020C 27A20028 */ addiu $v0, $sp, 0x28 -/* BE7DF0 80240210 AFA20020 */ sw $v0, 0x20($sp) -/* BE7DF4 80240214 E7A00010 */ swc1 $f0, 0x10($sp) -/* BE7DF8 80240218 E7A20014 */ swc1 $f2, 0x14($sp) -/* BE7DFC 8024021C 0C01BFA4 */ jal fx_emote -/* BE7E00 80240220 E7A40018 */ swc1 $f4, 0x18($sp) -/* BE7E04 80240224 0200202D */ daddu $a0, $s0, $zero -/* BE7E08 80240228 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BE7E0C 8024022C 0C012530 */ jal func_800494C0 -/* BE7E10 80240230 3C060020 */ lui $a2, 0x20 -/* BE7E14 80240234 8E220018 */ lw $v0, 0x18($s1) -/* BE7E18 80240238 9442002A */ lhu $v0, 0x2a($v0) -/* BE7E1C 8024023C 30420001 */ andi $v0, $v0, 1 -/* BE7E20 80240240 14400064 */ bnez $v0, .L802403D4 -/* BE7E24 80240244 2402000A */ addiu $v0, $zero, 0xa -/* BE7E28 80240248 080900F5 */ j .L802403D4 -/* BE7E2C 8024024C 2402000C */ addiu $v0, $zero, 0xc -.L80240250: -/* BE7E30 80240250 8E420074 */ lw $v0, 0x74($s2) -/* BE7E34 80240254 2442FFFF */ addiu $v0, $v0, -1 -.L80240258: -/* BE7E38 80240258 AE420074 */ sw $v0, 0x74($s2) -.L8024025C: -/* BE7E3C 8024025C 8602008C */ lh $v0, 0x8c($s0) -/* BE7E40 80240260 1440005D */ bnez $v0, .L802403D8 -/* BE7E44 80240264 00000000 */ nop -/* BE7E48 80240268 C6000018 */ lwc1 $f0, 0x18($s0) -/* BE7E4C 8024026C 3C014010 */ lui $at, 0x4010 -/* BE7E50 80240270 44811800 */ mtc1 $at, $f3 -/* BE7E54 80240274 44801000 */ mtc1 $zero, $f2 -/* BE7E58 80240278 46000021 */ cvt.d.s $f0, $f0 -/* BE7E5C 8024027C 4622003C */ c.lt.d $f0, $f2 -/* BE7E60 80240280 00000000 */ nop -/* BE7E64 80240284 45000003 */ bc1f .L80240294 -/* BE7E68 80240288 0200202D */ daddu $a0, $s0, $zero -/* BE7E6C 8024028C 080900A6 */ j .L80240298 -/* BE7E70 80240290 0000282D */ daddu $a1, $zero, $zero -.L80240294: -/* BE7E74 80240294 24050001 */ addiu $a1, $zero, 1 -.L80240298: -/* BE7E78 80240298 0C00F598 */ jal func_8003D660 -/* BE7E7C 8024029C 00000000 */ nop -/* BE7E80 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE7E84 802402A4 8E430078 */ lw $v1, 0x78($s2) -/* BE7E88 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE7E8C 802402AC 00031040 */ sll $v0, $v1, 1 -/* BE7E90 802402B0 00431021 */ addu $v0, $v0, $v1 -/* BE7E94 802402B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* BE7E98 802402B8 00021080 */ sll $v0, $v0, 2 -/* BE7E9C 802402BC 00431021 */ addu $v0, $v0, $v1 -/* BE7EA0 802402C0 C4560004 */ lwc1 $f22, 4($v0) -/* BE7EA4 802402C4 4680B5A0 */ cvt.s.w $f22, $f22 -/* BE7EA8 802402C8 C454000C */ lwc1 $f20, 0xc($v0) -/* BE7EAC 802402CC 4680A520 */ cvt.s.w $f20, $f20 -/* BE7EB0 802402D0 4406B000 */ mfc1 $a2, $f22 -/* BE7EB4 802402D4 4407A000 */ mfc1 $a3, $f20 -/* BE7EB8 802402D8 0C00A720 */ jal atan2 -/* BE7EBC 802402DC 00000000 */ nop -/* BE7EC0 802402E0 8E050018 */ lw $a1, 0x18($s0) -/* BE7EC4 802402E4 44060000 */ mfc1 $a2, $f0 -/* BE7EC8 802402E8 0200202D */ daddu $a0, $s0, $zero -/* BE7ECC 802402EC 0C00EA95 */ jal npc_move_heading -/* BE7ED0 802402F0 AE06000C */ sw $a2, 0xc($s0) -/* BE7ED4 802402F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE7ED8 802402F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE7EDC 802402FC 4406B000 */ mfc1 $a2, $f22 -/* BE7EE0 80240300 4407A000 */ mfc1 $a3, $f20 -/* BE7EE4 80240304 0C00A7B5 */ jal dist2D -/* BE7EE8 80240308 00000000 */ nop -/* BE7EEC 8024030C C6020018 */ lwc1 $f2, 0x18($s0) -/* BE7EF0 80240310 4602003E */ c.le.s $f0, $f2 -/* BE7EF4 80240314 00000000 */ nop -/* BE7EF8 80240318 4500002F */ bc1f .L802403D8 -/* BE7EFC 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BE7F00 80240320 24020002 */ addiu $v0, $zero, 2 -/* BE7F04 80240324 0C00A67F */ jal rand_int -/* BE7F08 80240328 AE420070 */ sw $v0, 0x70($s2) -/* BE7F0C 8024032C 3C035555 */ lui $v1, 0x5555 -/* BE7F10 80240330 34635556 */ ori $v1, $v1, 0x5556 -/* BE7F14 80240334 00430018 */ mult $v0, $v1 -/* BE7F18 80240338 000227C3 */ sra $a0, $v0, 0x1f -/* BE7F1C 8024033C 00004010 */ mfhi $t0 -/* BE7F20 80240340 01042023 */ subu $a0, $t0, $a0 -/* BE7F24 80240344 00041840 */ sll $v1, $a0, 1 -/* BE7F28 80240348 00641821 */ addu $v1, $v1, $a0 -/* BE7F2C 8024034C 00431023 */ subu $v0, $v0, $v1 -/* BE7F30 80240350 24430002 */ addiu $v1, $v0, 2 -/* BE7F34 80240354 AE430074 */ sw $v1, 0x74($s2) -/* BE7F38 80240358 8E62002C */ lw $v0, 0x2c($s3) -/* BE7F3C 8024035C 18400009 */ blez $v0, .L80240384 -/* BE7F40 80240360 24020004 */ addiu $v0, $zero, 4 -/* BE7F44 80240364 8E620004 */ lw $v0, 4($s3) -/* BE7F48 80240368 18400006 */ blez $v0, .L80240384 -/* BE7F4C 8024036C 24020004 */ addiu $v0, $zero, 4 -/* BE7F50 80240370 8E620008 */ lw $v0, 8($s3) -/* BE7F54 80240374 18400003 */ blez $v0, .L80240384 -/* BE7F58 80240378 24020004 */ addiu $v0, $zero, 4 -/* BE7F5C 8024037C 14600002 */ bnez $v1, .L80240388 -/* BE7F60 80240380 00000000 */ nop -.L80240384: -/* BE7F64 80240384 AE420070 */ sw $v0, 0x70($s2) -.L80240388: -/* BE7F68 80240388 0C00A67F */ jal rand_int -/* BE7F6C 8024038C 24042710 */ addiu $a0, $zero, 0x2710 -/* BE7F70 80240390 3C0351EB */ lui $v1, 0x51eb -/* BE7F74 80240394 3463851F */ ori $v1, $v1, 0x851f -/* BE7F78 80240398 00430018 */ mult $v0, $v1 -/* BE7F7C 8024039C 00021FC3 */ sra $v1, $v0, 0x1f -/* BE7F80 802403A0 00004010 */ mfhi $t0 -/* BE7F84 802403A4 00082143 */ sra $a0, $t0, 5 -/* BE7F88 802403A8 00832023 */ subu $a0, $a0, $v1 -/* BE7F8C 802403AC 00041840 */ sll $v1, $a0, 1 -/* BE7F90 802403B0 00641821 */ addu $v1, $v1, $a0 -/* BE7F94 802403B4 000318C0 */ sll $v1, $v1, 3 -/* BE7F98 802403B8 00641821 */ addu $v1, $v1, $a0 -/* BE7F9C 802403BC 00031880 */ sll $v1, $v1, 2 -/* BE7FA0 802403C0 8E640004 */ lw $a0, 4($s3) -/* BE7FA4 802403C4 00431023 */ subu $v0, $v0, $v1 -/* BE7FA8 802403C8 0044102A */ slt $v0, $v0, $a0 -/* BE7FAC 802403CC 10400002 */ beqz $v0, .L802403D8 -/* BE7FB0 802403D0 24020004 */ addiu $v0, $zero, 4 -.L802403D4: -/* BE7FB4 802403D4 AE420070 */ sw $v0, 0x70($s2) -.L802403D8: -/* BE7FB8 802403D8 8FBF0044 */ lw $ra, 0x44($sp) -/* BE7FBC 802403DC 8FB40040 */ lw $s4, 0x40($sp) -/* BE7FC0 802403E0 8FB3003C */ lw $s3, 0x3c($sp) -/* BE7FC4 802403E4 8FB20038 */ lw $s2, 0x38($sp) -/* BE7FC8 802403E8 8FB10034 */ lw $s1, 0x34($sp) -/* BE7FCC 802403EC 8FB00030 */ lw $s0, 0x30($sp) -/* BE7FD0 802403F0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* BE7FD4 802403F4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* BE7FD8 802403F8 03E00008 */ jr $ra -/* BE7FDC 802403FC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_arn/arn_05/func_80240400_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/func_80240400_BE7BE0.s deleted file mode 100644 index cf7795bcc7..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/func_80240400_BE7BE0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_BE7FE0 -/* BE7FE0 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BE7FE4 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* BE7FE8 80240408 0080982D */ daddu $s3, $a0, $zero -/* BE7FEC 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* BE7FF0 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* BE7FF4 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* BE7FF8 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* BE7FFC 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* BE8000 80240420 86440008 */ lh $a0, 8($s2) -/* BE8004 80240424 0C00EABB */ jal get_npc_unsafe -/* BE8008 80240428 00A0882D */ daddu $s1, $a1, $zero -/* BE800C 8024042C 8E240008 */ lw $a0, 8($s1) -/* BE8010 80240430 0040802D */ daddu $s0, $v0, $zero -/* BE8014 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* BE8018 80240438 00832021 */ addu $a0, $a0, $v1 -/* BE801C 8024043C 00042043 */ sra $a0, $a0, 1 -/* BE8020 80240440 0C00A67F */ jal rand_int -/* BE8024 80240444 24840001 */ addiu $a0, $a0, 1 -/* BE8028 80240448 8E230008 */ lw $v1, 8($s1) -/* BE802C 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* BE8030 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* BE8034 80240454 00651821 */ addu $v1, $v1, $a1 -/* BE8038 80240458 00031843 */ sra $v1, $v1, 1 -/* BE803C 8024045C 00621821 */ addu $v1, $v1, $v0 -/* BE8040 80240460 0C00A67F */ jal rand_int -/* BE8044 80240464 A603008E */ sh $v1, 0x8e($s0) -/* BE8048 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* BE804C 8024046C 44820000 */ mtc1 $v0, $f0 -/* BE8050 80240470 00000000 */ nop -/* BE8054 80240474 46800020 */ cvt.s.w $f0, $f0 -/* BE8058 80240478 46006300 */ add.s $f12, $f12, $f0 -/* BE805C 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* BE8060 80240480 44810000 */ mtc1 $at, $f0 -/* BE8064 80240484 0C00A6C9 */ jal clamp_angle -/* BE8068 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* BE806C 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* BE8070 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* BE8074 80240494 8C420000 */ lw $v0, ($v0) -/* BE8078 80240498 AE020028 */ sw $v0, 0x28($s0) -/* BE807C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* BE8080 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* BE8084 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* BE8088 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* BE808C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* BE8090 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* BE8094 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* BE8098 802404B8 03E00008 */ jr $ra -/* BE809C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_05/func_802404C0_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/func_802404C0_BE7BE0.s deleted file mode 100644 index 187ef4b3b2..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/func_802404C0_BE7BE0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_BE80A0 -/* BE80A0 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BE80A4 802404C4 AFB40040 */ sw $s4, 0x40($sp) -/* BE80A8 802404C8 0080A02D */ daddu $s4, $a0, $zero -/* BE80AC 802404CC AFBF0044 */ sw $ra, 0x44($sp) -/* BE80B0 802404D0 AFB3003C */ sw $s3, 0x3c($sp) -/* BE80B4 802404D4 AFB20038 */ sw $s2, 0x38($sp) -/* BE80B8 802404D8 AFB10034 */ sw $s1, 0x34($sp) -/* BE80BC 802404DC AFB00030 */ sw $s0, 0x30($sp) -/* BE80C0 802404E0 8E910148 */ lw $s1, 0x148($s4) -/* BE80C4 802404E4 00A0902D */ daddu $s2, $a1, $zero -/* BE80C8 802404E8 86240008 */ lh $a0, 8($s1) -/* BE80CC 802404EC 0C00EABB */ jal get_npc_unsafe -/* BE80D0 802404F0 00C0982D */ daddu $s3, $a2, $zero -/* BE80D4 802404F4 8E430014 */ lw $v1, 0x14($s2) -/* BE80D8 802404F8 04600031 */ bltz $v1, .L802405C0 -/* BE80DC 802404FC 0040802D */ daddu $s0, $v0, $zero -/* BE80E0 80240500 0260202D */ daddu $a0, $s3, $zero -/* BE80E4 80240504 AFA00010 */ sw $zero, 0x10($sp) -/* BE80E8 80240508 8E460024 */ lw $a2, 0x24($s2) -/* BE80EC 8024050C 8E470028 */ lw $a3, 0x28($s2) -/* BE80F0 80240510 0C01242D */ jal func_800490B4 -/* BE80F4 80240514 0220282D */ daddu $a1, $s1, $zero -/* BE80F8 80240518 10400029 */ beqz $v0, .L802405C0 -/* BE80FC 8024051C 0000202D */ daddu $a0, $zero, $zero -/* BE8100 80240520 0200282D */ daddu $a1, $s0, $zero -/* BE8104 80240524 0000302D */ daddu $a2, $zero, $zero -/* BE8108 80240528 860300A8 */ lh $v1, 0xa8($s0) -/* BE810C 8024052C 3C013F80 */ lui $at, 0x3f80 -/* BE8110 80240530 44810000 */ mtc1 $at, $f0 -/* BE8114 80240534 3C014000 */ lui $at, 0x4000 -/* BE8118 80240538 44811000 */ mtc1 $at, $f2 -/* BE811C 8024053C 3C01C1A0 */ lui $at, 0xc1a0 -/* BE8120 80240540 44812000 */ mtc1 $at, $f4 -/* BE8124 80240544 2402000F */ addiu $v0, $zero, 0xf -/* BE8128 80240548 AFA2001C */ sw $v0, 0x1c($sp) -/* BE812C 8024054C 44833000 */ mtc1 $v1, $f6 -/* BE8130 80240550 00000000 */ nop -/* BE8134 80240554 468031A0 */ cvt.s.w $f6, $f6 -/* BE8138 80240558 44073000 */ mfc1 $a3, $f6 -/* BE813C 8024055C 27A20028 */ addiu $v0, $sp, 0x28 -/* BE8140 80240560 AFA20020 */ sw $v0, 0x20($sp) -/* BE8144 80240564 E7A00010 */ swc1 $f0, 0x10($sp) -/* BE8148 80240568 E7A20014 */ swc1 $f2, 0x14($sp) -/* BE814C 8024056C 0C01BFA4 */ jal fx_emote -/* BE8150 80240570 E7A40018 */ swc1 $f4, 0x18($sp) -/* BE8154 80240574 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BE8158 80240578 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BE815C 8024057C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE8160 80240580 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE8164 80240584 8C460028 */ lw $a2, 0x28($v0) -/* BE8168 80240588 0C00A720 */ jal atan2 -/* BE816C 8024058C 8C470030 */ lw $a3, 0x30($v0) -/* BE8170 80240590 0200202D */ daddu $a0, $s0, $zero -/* BE8174 80240594 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BE8178 80240598 3C060020 */ lui $a2, 0x20 -/* BE817C 8024059C 0C012530 */ jal func_800494C0 -/* BE8180 802405A0 E480000C */ swc1 $f0, 0xc($a0) -/* BE8184 802405A4 8E220018 */ lw $v0, 0x18($s1) -/* BE8188 802405A8 9442002A */ lhu $v0, 0x2a($v0) -/* BE818C 802405AC 30420001 */ andi $v0, $v0, 1 -/* BE8190 802405B0 14400029 */ bnez $v0, .L80240658 -/* BE8194 802405B4 2402000A */ addiu $v0, $zero, 0xa -/* BE8198 802405B8 08090196 */ j .L80240658 -/* BE819C 802405BC 2402000C */ addiu $v0, $zero, 0xc -.L802405C0: -/* BE81A0 802405C0 8602008C */ lh $v0, 0x8c($s0) -/* BE81A4 802405C4 14400025 */ bnez $v0, .L8024065C -/* BE81A8 802405C8 00000000 */ nop -/* BE81AC 802405CC 9602008E */ lhu $v0, 0x8e($s0) -/* BE81B0 802405D0 2442FFFF */ addiu $v0, $v0, -1 -/* BE81B4 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* BE81B8 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* BE81BC 802405DC 1440001F */ bnez $v0, .L8024065C -/* BE81C0 802405E0 00000000 */ nop -/* BE81C4 802405E4 8E820074 */ lw $v0, 0x74($s4) -/* BE81C8 802405E8 2442FFFF */ addiu $v0, $v0, -1 -/* BE81CC 802405EC 10400019 */ beqz $v0, .L80240654 -/* BE81D0 802405F0 AE820074 */ sw $v0, 0x74($s4) -/* BE81D4 802405F4 8E220018 */ lw $v0, 0x18($s1) -/* BE81D8 802405F8 9442002A */ lhu $v0, 0x2a($v0) -/* BE81DC 802405FC 30420010 */ andi $v0, $v0, 0x10 -/* BE81E0 80240600 14400007 */ bnez $v0, .L80240620 -/* BE81E4 80240604 00000000 */ nop -/* BE81E8 80240608 C600000C */ lwc1 $f0, 0xc($s0) -/* BE81EC 8024060C 3C014334 */ lui $at, 0x4334 -/* BE81F0 80240610 44816000 */ mtc1 $at, $f12 -/* BE81F4 80240614 0C00A6C9 */ jal clamp_angle -/* BE81F8 80240618 460C0300 */ add.s $f12, $f0, $f12 -/* BE81FC 8024061C E600000C */ swc1 $f0, 0xc($s0) -.L80240620: -/* BE8200 80240620 8E440008 */ lw $a0, 8($s2) -/* BE8204 80240624 000417C2 */ srl $v0, $a0, 0x1f -/* BE8208 80240628 00822021 */ addu $a0, $a0, $v0 -/* BE820C 8024062C 00042043 */ sra $a0, $a0, 1 -/* BE8210 80240630 0C00A67F */ jal rand_int -/* BE8214 80240634 24840001 */ addiu $a0, $a0, 1 -/* BE8218 80240638 8E430008 */ lw $v1, 8($s2) -/* BE821C 8024063C 000327C2 */ srl $a0, $v1, 0x1f -/* BE8220 80240640 00641821 */ addu $v1, $v1, $a0 -/* BE8224 80240644 00031843 */ sra $v1, $v1, 1 -/* BE8228 80240648 00621821 */ addu $v1, $v1, $v0 -/* BE822C 8024064C 08090197 */ j .L8024065C -/* BE8230 80240650 A603008E */ sh $v1, 0x8e($s0) -.L80240654: -/* BE8234 80240654 24020004 */ addiu $v0, $zero, 4 -.L80240658: -/* BE8238 80240658 AE820070 */ sw $v0, 0x70($s4) -.L8024065C: -/* BE823C 8024065C 8FBF0044 */ lw $ra, 0x44($sp) -/* BE8240 80240660 8FB40040 */ lw $s4, 0x40($sp) -/* BE8244 80240664 8FB3003C */ lw $s3, 0x3c($sp) -/* BE8248 80240668 8FB20038 */ lw $s2, 0x38($sp) -/* BE824C 8024066C 8FB10034 */ lw $s1, 0x34($sp) -/* BE8250 80240670 8FB00030 */ lw $s0, 0x30($sp) -/* BE8254 80240674 03E00008 */ jr $ra -/* BE8258 80240678 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_arn/arn_05/func_8024067C_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/func_8024067C_BE7BE0.s deleted file mode 100644 index dfb573a810..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/func_8024067C_BE7BE0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024067C_BE825C -/* BE825C 8024067C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE8260 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* BE8264 80240684 0080882D */ daddu $s1, $a0, $zero -/* BE8268 80240688 AFBF001C */ sw $ra, 0x1c($sp) -/* BE826C 8024068C AFB20018 */ sw $s2, 0x18($sp) -/* BE8270 80240690 AFB00010 */ sw $s0, 0x10($sp) -/* BE8274 80240694 8E300148 */ lw $s0, 0x148($s1) -/* BE8278 80240698 86040008 */ lh $a0, 8($s0) -/* BE827C 8024069C 0C00EABB */ jal get_npc_unsafe -/* BE8280 802406A0 00A0902D */ daddu $s2, $a1, $zero -/* BE8284 802406A4 8E230078 */ lw $v1, 0x78($s1) -/* BE8288 802406A8 24630001 */ addiu $v1, $v1, 1 -/* BE828C 802406AC AE230078 */ sw $v1, 0x78($s1) -/* BE8290 802406B0 8E0400D0 */ lw $a0, 0xd0($s0) -/* BE8294 802406B4 8C840000 */ lw $a0, ($a0) -/* BE8298 802406B8 0064182A */ slt $v1, $v1, $a0 -/* BE829C 802406BC 14600002 */ bnez $v1, .L802406C8 -/* BE82A0 802406C0 0040282D */ daddu $a1, $v0, $zero -/* BE82A4 802406C4 AE200078 */ sw $zero, 0x78($s1) -.L802406C8: -/* BE82A8 802406C8 8E0200CC */ lw $v0, 0xcc($s0) -/* BE82AC 802406CC 8C420004 */ lw $v0, 4($v0) -/* BE82B0 802406D0 ACA20028 */ sw $v0, 0x28($a1) -/* BE82B4 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* BE82B8 802406D8 8C42007C */ lw $v0, 0x7c($v0) -/* BE82BC 802406DC 04410004 */ bgez $v0, .L802406F0 -/* BE82C0 802406E0 00000000 */ nop -/* BE82C4 802406E4 C6400000 */ lwc1 $f0, ($s2) -/* BE82C8 802406E8 080901C4 */ j .L80240710 -/* BE82CC 802406EC E4A00018 */ swc1 $f0, 0x18($a1) -.L802406F0: -/* BE82D0 802406F0 3C018024 */ lui $at, 0x8024 -/* BE82D4 802406F4 D4225058 */ ldc1 $f2, 0x5058($at) -/* BE82D8 802406F8 44820000 */ mtc1 $v0, $f0 -/* BE82DC 802406FC 00000000 */ nop -/* BE82E0 80240700 46800021 */ cvt.d.w $f0, $f0 -/* BE82E4 80240704 46220003 */ div.d $f0, $f0, $f2 -/* BE82E8 80240708 46200020 */ cvt.s.d $f0, $f0 -/* BE82EC 8024070C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240710: -/* BE82F0 80240710 24020001 */ addiu $v0, $zero, 1 -/* BE82F4 80240714 AE220070 */ sw $v0, 0x70($s1) -/* BE82F8 80240718 8FBF001C */ lw $ra, 0x1c($sp) -/* BE82FC 8024071C 8FB20018 */ lw $s2, 0x18($sp) -/* BE8300 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* BE8304 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* BE8308 80240728 03E00008 */ jr $ra -/* BE830C 8024072C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_05/func_80240730_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/func_80240730_BE7BE0.s deleted file mode 100644 index 396baf608d..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/func_80240730_BE7BE0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_BE8310 -/* BE8310 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE8314 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* BE8318 80240738 0080882D */ daddu $s1, $a0, $zero -/* BE831C 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* BE8320 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* BE8324 80240744 8E300148 */ lw $s0, 0x148($s1) -/* BE8328 80240748 0C00EABB */ jal get_npc_unsafe -/* BE832C 8024074C 86040008 */ lh $a0, 8($s0) -/* BE8330 80240750 8E0300CC */ lw $v1, 0xcc($s0) -/* BE8334 80240754 3C014120 */ lui $at, 0x4120 -/* BE8338 80240758 44812000 */ mtc1 $at, $f4 -/* BE833C 8024075C 3C014000 */ lui $at, 0x4000 -/* BE8340 80240760 44810000 */ mtc1 $at, $f0 -/* BE8344 80240764 C442003C */ lwc1 $f2, 0x3c($v0) -/* BE8348 80240768 8C640010 */ lw $a0, 0x10($v1) -/* BE834C 8024076C 8C430000 */ lw $v1, ($v0) -/* BE8350 80240770 E444001C */ swc1 $f4, 0x1c($v0) -/* BE8354 80240774 E4400014 */ swc1 $f0, 0x14($v0) -/* BE8358 80240778 E4420064 */ swc1 $f2, 0x64($v0) -/* BE835C 8024077C 34630800 */ ori $v1, $v1, 0x800 -/* BE8360 80240780 AC430000 */ sw $v1, ($v0) -/* BE8364 80240784 AC440028 */ sw $a0, 0x28($v0) -/* BE8368 80240788 2402000B */ addiu $v0, $zero, 0xb -/* BE836C 8024078C AE220070 */ sw $v0, 0x70($s1) -/* BE8370 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* BE8374 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* BE8378 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* BE837C 8024079C 03E00008 */ jr $ra -/* BE8380 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_05/func_802407A4_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/func_802407A4_BE7BE0.s deleted file mode 100644 index 35739cb728..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/func_802407A4_BE7BE0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4_BE8384 -/* BE8384 802407A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BE8388 802407A8 AFB00010 */ sw $s0, 0x10($sp) -/* BE838C 802407AC 0080802D */ daddu $s0, $a0, $zero -/* BE8390 802407B0 AFBF0014 */ sw $ra, 0x14($sp) -/* BE8394 802407B4 8E020148 */ lw $v0, 0x148($s0) -/* BE8398 802407B8 0C00EABB */ jal get_npc_unsafe -/* BE839C 802407BC 84440008 */ lh $a0, 8($v0) -/* BE83A0 802407C0 0040202D */ daddu $a0, $v0, $zero -/* BE83A4 802407C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* BE83A8 802407C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* BE83AC 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* BE83B0 802407D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* BE83B4 802407D4 46040001 */ sub.s $f0, $f0, $f4 -/* BE83B8 802407D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* BE83BC 802407DC 4602203C */ c.lt.s $f4, $f2 -/* BE83C0 802407E0 E482003C */ swc1 $f2, 0x3c($a0) -/* BE83C4 802407E4 45010009 */ bc1t .L8024080C -/* BE83C8 802407E8 E480001C */ swc1 $f0, 0x1c($a0) -/* BE83CC 802407EC 8C820000 */ lw $v0, ($a0) -/* BE83D0 802407F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* BE83D4 802407F4 E484003C */ swc1 $f4, 0x3c($a0) -/* BE83D8 802407F8 AC80001C */ sw $zero, 0x1c($a0) -/* BE83DC 802407FC 00431024 */ and $v0, $v0, $v1 -/* BE83E0 80240800 AC820000 */ sw $v0, ($a0) -/* BE83E4 80240804 2402000C */ addiu $v0, $zero, 0xc -/* BE83E8 80240808 AE020070 */ sw $v0, 0x70($s0) -.L8024080C: -/* BE83EC 8024080C 8FBF0014 */ lw $ra, 0x14($sp) -/* BE83F0 80240810 8FB00010 */ lw $s0, 0x10($sp) -/* BE83F4 80240814 03E00008 */ jr $ra -/* BE83F8 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_05/func_8024081C_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/func_8024081C_BE7BE0.s deleted file mode 100644 index a793f6d6e0..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/func_8024081C_BE7BE0.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024081C_BE83FC -/* BE83FC 8024081C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BE8400 80240820 AFB3001C */ sw $s3, 0x1c($sp) -/* BE8404 80240824 0080982D */ daddu $s3, $a0, $zero -/* BE8408 80240828 AFBF0020 */ sw $ra, 0x20($sp) -/* BE840C 8024082C AFB20018 */ sw $s2, 0x18($sp) -/* BE8410 80240830 AFB10014 */ sw $s1, 0x14($sp) -/* BE8414 80240834 AFB00010 */ sw $s0, 0x10($sp) -/* BE8418 80240838 F7B40028 */ sdc1 $f20, 0x28($sp) -/* BE841C 8024083C 8E710148 */ lw $s1, 0x148($s3) -/* BE8420 80240840 86240008 */ lh $a0, 8($s1) -/* BE8424 80240844 0C00EABB */ jal get_npc_unsafe -/* BE8428 80240848 00A0802D */ daddu $s0, $a1, $zero -/* BE842C 8024084C 8E040020 */ lw $a0, 0x20($s0) -/* BE8430 80240850 0040902D */ daddu $s2, $v0, $zero -/* BE8434 80240854 00041FC2 */ srl $v1, $a0, 0x1f -/* BE8438 80240858 00832021 */ addu $a0, $a0, $v1 -/* BE843C 8024085C 00042043 */ sra $a0, $a0, 1 -/* BE8440 80240860 0C00A67F */ jal rand_int -/* BE8444 80240864 24840001 */ addiu $a0, $a0, 1 -/* BE8448 80240868 8E030020 */ lw $v1, 0x20($s0) -/* BE844C 8024086C C64C0038 */ lwc1 $f12, 0x38($s2) -/* BE8450 80240870 000327C2 */ srl $a0, $v1, 0x1f -/* BE8454 80240874 00641821 */ addu $v1, $v1, $a0 -/* BE8458 80240878 00031843 */ sra $v1, $v1, 1 -/* BE845C 8024087C 00621821 */ addu $v1, $v1, $v0 -/* BE8460 80240880 A643008E */ sh $v1, 0x8e($s2) -/* BE8464 80240884 8E2200CC */ lw $v0, 0xcc($s1) -/* BE8468 80240888 C64E0040 */ lwc1 $f14, 0x40($s2) -/* BE846C 8024088C 8C42000C */ lw $v0, 0xc($v0) -/* BE8470 80240890 AE420028 */ sw $v0, 0x28($s2) -/* BE8474 80240894 C6000018 */ lwc1 $f0, 0x18($s0) -/* BE8478 80240898 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BE847C 8024089C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BE8480 802408A0 E6400018 */ swc1 $f0, 0x18($s2) -/* BE8484 802408A4 8C460028 */ lw $a2, 0x28($v0) -/* BE8488 802408A8 0C00A720 */ jal atan2 -/* BE848C 802408AC 8C470030 */ lw $a3, 0x30($v0) -/* BE8490 802408B0 46000506 */ mov.s $f20, $f0 -/* BE8494 802408B4 C64C000C */ lwc1 $f12, 0xc($s2) -/* BE8498 802408B8 0C00A70A */ jal get_clamped_angle_diff -/* BE849C 802408BC 4600A386 */ mov.s $f14, $f20 -/* BE84A0 802408C0 46000086 */ mov.s $f2, $f0 -/* BE84A4 802408C4 8E02001C */ lw $v0, 0x1c($s0) -/* BE84A8 802408C8 46001005 */ abs.s $f0, $f2 -/* BE84AC 802408CC 44822000 */ mtc1 $v0, $f4 -/* BE84B0 802408D0 00000000 */ nop -/* BE84B4 802408D4 46802120 */ cvt.s.w $f4, $f4 -/* BE84B8 802408D8 4600203C */ c.lt.s $f4, $f0 -/* BE84BC 802408DC 00000000 */ nop -/* BE84C0 802408E0 4500000D */ bc1f .L80240918 -/* BE84C4 802408E4 00000000 */ nop -/* BE84C8 802408E8 44800000 */ mtc1 $zero, $f0 -/* BE84CC 802408EC C654000C */ lwc1 $f20, 0xc($s2) -/* BE84D0 802408F0 4600103C */ c.lt.s $f2, $f0 -/* BE84D4 802408F4 00000000 */ nop -/* BE84D8 802408F8 45000006 */ bc1f .L80240914 -/* BE84DC 802408FC 00021023 */ negu $v0, $v0 -/* BE84E0 80240900 44820000 */ mtc1 $v0, $f0 -/* BE84E4 80240904 00000000 */ nop -/* BE84E8 80240908 46800020 */ cvt.s.w $f0, $f0 -/* BE84EC 8024090C 08090246 */ j .L80240918 -/* BE84F0 80240910 4600A500 */ add.s $f20, $f20, $f0 -.L80240914: -/* BE84F4 80240914 4604A500 */ add.s $f20, $f20, $f4 -.L80240918: -/* BE84F8 80240918 0C00A6C9 */ jal clamp_angle -/* BE84FC 8024091C 4600A306 */ mov.s $f12, $f20 -/* BE8500 80240920 2402000D */ addiu $v0, $zero, 0xd -/* BE8504 80240924 E640000C */ swc1 $f0, 0xc($s2) -/* BE8508 80240928 AE620070 */ sw $v0, 0x70($s3) -/* BE850C 8024092C 8FBF0020 */ lw $ra, 0x20($sp) -/* BE8510 80240930 8FB3001C */ lw $s3, 0x1c($sp) -/* BE8514 80240934 8FB20018 */ lw $s2, 0x18($sp) -/* BE8518 80240938 8FB10014 */ lw $s1, 0x14($sp) -/* BE851C 8024093C 8FB00010 */ lw $s0, 0x10($sp) -/* BE8520 80240940 D7B40028 */ ldc1 $f20, 0x28($sp) -/* BE8524 80240944 03E00008 */ jr $ra -/* BE8528 80240948 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_arn/arn_05/func_8024094C_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/func_8024094C_BE7BE0.s deleted file mode 100644 index f8b9e563d0..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/func_8024094C_BE7BE0.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024094C_BE852C -/* BE852C 8024094C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BE8530 80240950 AFB3003C */ sw $s3, 0x3c($sp) -/* BE8534 80240954 0080982D */ daddu $s3, $a0, $zero -/* BE8538 80240958 AFBF0040 */ sw $ra, 0x40($sp) -/* BE853C 8024095C AFB20038 */ sw $s2, 0x38($sp) -/* BE8540 80240960 AFB10034 */ sw $s1, 0x34($sp) -/* BE8544 80240964 AFB00030 */ sw $s0, 0x30($sp) -/* BE8548 80240968 8E720148 */ lw $s2, 0x148($s3) -/* BE854C 8024096C 00A0882D */ daddu $s1, $a1, $zero -/* BE8550 80240970 86440008 */ lh $a0, 8($s2) -/* BE8554 80240974 0C00EABB */ jal get_npc_unsafe -/* BE8558 80240978 00C0802D */ daddu $s0, $a2, $zero -/* BE855C 8024097C 0200202D */ daddu $a0, $s0, $zero -/* BE8560 80240980 0240282D */ daddu $a1, $s2, $zero -/* BE8564 80240984 24030001 */ addiu $v1, $zero, 1 -/* BE8568 80240988 AFA30010 */ sw $v1, 0x10($sp) -/* BE856C 8024098C 8E260024 */ lw $a2, 0x24($s1) -/* BE8570 80240990 8E270028 */ lw $a3, 0x28($s1) -/* BE8574 80240994 0C01242D */ jal func_800490B4 -/* BE8578 80240998 0040802D */ daddu $s0, $v0, $zero -/* BE857C 8024099C 1440001E */ bnez $v0, .L80240A18 -/* BE8580 802409A0 0200202D */ daddu $a0, $s0, $zero -/* BE8584 802409A4 24040002 */ addiu $a0, $zero, 2 -/* BE8588 802409A8 0200282D */ daddu $a1, $s0, $zero -/* BE858C 802409AC 0000302D */ daddu $a2, $zero, $zero -/* BE8590 802409B0 860300A8 */ lh $v1, 0xa8($s0) -/* BE8594 802409B4 3C013F80 */ lui $at, 0x3f80 -/* BE8598 802409B8 44810000 */ mtc1 $at, $f0 -/* BE859C 802409BC 3C014000 */ lui $at, 0x4000 -/* BE85A0 802409C0 44811000 */ mtc1 $at, $f2 -/* BE85A4 802409C4 3C01C1A0 */ lui $at, 0xc1a0 -/* BE85A8 802409C8 44812000 */ mtc1 $at, $f4 -/* BE85AC 802409CC 2402000F */ addiu $v0, $zero, 0xf -/* BE85B0 802409D0 AFA2001C */ sw $v0, 0x1c($sp) -/* BE85B4 802409D4 44833000 */ mtc1 $v1, $f6 -/* BE85B8 802409D8 00000000 */ nop -/* BE85BC 802409DC 468031A0 */ cvt.s.w $f6, $f6 -/* BE85C0 802409E0 44073000 */ mfc1 $a3, $f6 -/* BE85C4 802409E4 27A20028 */ addiu $v0, $sp, 0x28 -/* BE85C8 802409E8 AFA20020 */ sw $v0, 0x20($sp) -/* BE85CC 802409EC E7A00010 */ swc1 $f0, 0x10($sp) -/* BE85D0 802409F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* BE85D4 802409F4 0C01BFA4 */ jal fx_emote -/* BE85D8 802409F8 E7A40018 */ swc1 $f4, 0x18($sp) -/* BE85DC 802409FC 8E4200CC */ lw $v0, 0xcc($s2) -/* BE85E0 80240A00 8C430000 */ lw $v1, ($v0) -/* BE85E4 80240A04 24020019 */ addiu $v0, $zero, 0x19 -/* BE85E8 80240A08 A602008E */ sh $v0, 0x8e($s0) -/* BE85EC 80240A0C 2402000E */ addiu $v0, $zero, 0xe -/* BE85F0 80240A10 08090293 */ j .L80240A4C -/* BE85F4 80240A14 AE030028 */ sw $v1, 0x28($s0) -.L80240A18: -/* BE85F8 80240A18 0C00F598 */ jal func_8003D660 -/* BE85FC 80240A1C 24050001 */ addiu $a1, $zero, 1 -/* BE8600 80240A20 8E050018 */ lw $a1, 0x18($s0) -/* BE8604 80240A24 8E06000C */ lw $a2, 0xc($s0) -/* BE8608 80240A28 0C00EA95 */ jal npc_move_heading -/* BE860C 80240A2C 0200202D */ daddu $a0, $s0, $zero -/* BE8610 80240A30 8602008E */ lh $v0, 0x8e($s0) -/* BE8614 80240A34 9603008E */ lhu $v1, 0x8e($s0) -/* BE8618 80240A38 18400003 */ blez $v0, .L80240A48 -/* BE861C 80240A3C 2462FFFF */ addiu $v0, $v1, -1 -/* BE8620 80240A40 08090294 */ j .L80240A50 -/* BE8624 80240A44 A602008E */ sh $v0, 0x8e($s0) -.L80240A48: -/* BE8628 80240A48 2402000C */ addiu $v0, $zero, 0xc -.L80240A4C: -/* BE862C 80240A4C AE620070 */ sw $v0, 0x70($s3) -.L80240A50: -/* BE8630 80240A50 8FBF0040 */ lw $ra, 0x40($sp) -/* BE8634 80240A54 8FB3003C */ lw $s3, 0x3c($sp) -/* BE8638 80240A58 8FB20038 */ lw $s2, 0x38($sp) -/* BE863C 80240A5C 8FB10034 */ lw $s1, 0x34($sp) -/* BE8640 80240A60 8FB00030 */ lw $s0, 0x30($sp) -/* BE8644 80240A64 03E00008 */ jr $ra -/* BE8648 80240A68 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_arn/arn_05/func_80240A6C_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/func_80240A6C_BE7BE0.s deleted file mode 100644 index b67fdd2dca..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/func_80240A6C_BE7BE0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_BE864C -/* BE864C 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE8650 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* BE8654 80240A74 0080882D */ daddu $s1, $a0, $zero -/* BE8658 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* BE865C 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* BE8660 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* BE8664 80240A84 0C00EABB */ jal get_npc_unsafe -/* BE8668 80240A88 86040008 */ lh $a0, 8($s0) -/* BE866C 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* BE8670 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* BE8674 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* BE8678 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* BE867C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* BE8680 80240AA0 00000000 */ nop -/* BE8684 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* BE8688 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* BE868C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* BE8690 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* BE8694 80240AB4 080902B0 */ j .L80240AC0 -/* BE8698 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* BE869C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* BE86A0 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* BE86A4 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* BE86A8 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* BE86AC 80240ACC 03E00008 */ jr $ra -/* BE86B0 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_05/func_80240AD4_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/func_80240AD4_BE7BE0.s deleted file mode 100644 index 1e3e7e4860..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/func_80240AD4_BE7BE0.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD4_BE86B4 -/* BE86B4 80240AD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE86B8 80240AD8 AFB10014 */ sw $s1, 0x14($sp) -/* BE86BC 80240ADC 0080882D */ daddu $s1, $a0, $zero -/* BE86C0 80240AE0 AFBF001C */ sw $ra, 0x1c($sp) -/* BE86C4 80240AE4 AFB20018 */ sw $s2, 0x18($sp) -/* BE86C8 80240AE8 AFB00010 */ sw $s0, 0x10($sp) -/* BE86CC 80240AEC 8E300148 */ lw $s0, 0x148($s1) -/* BE86D0 80240AF0 86040008 */ lh $a0, 8($s0) -/* BE86D4 80240AF4 0C00EABB */ jal get_npc_unsafe -/* BE86D8 80240AF8 00A0902D */ daddu $s2, $a1, $zero -/* BE86DC 80240AFC 8E0300D0 */ lw $v1, 0xd0($s0) -/* BE86E0 80240B00 8E240078 */ lw $a0, 0x78($s1) -/* BE86E4 80240B04 8C630000 */ lw $v1, ($v1) -/* BE86E8 80240B08 0083182A */ slt $v1, $a0, $v1 -/* BE86EC 80240B0C 10600013 */ beqz $v1, .L80240B5C -/* BE86F0 80240B10 0040302D */ daddu $a2, $v0, $zero -/* BE86F4 80240B14 00041040 */ sll $v0, $a0, 1 -/* BE86F8 80240B18 00441021 */ addu $v0, $v0, $a0 -/* BE86FC 80240B1C 00022880 */ sll $a1, $v0, 2 -.L80240B20: -/* BE8700 80240B20 8E0300D0 */ lw $v1, 0xd0($s0) -/* BE8704 80240B24 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* BE8708 80240B28 00A31021 */ addu $v0, $a1, $v1 -/* BE870C 80240B2C C4400008 */ lwc1 $f0, 8($v0) -/* BE8710 80240B30 46800020 */ cvt.s.w $f0, $f0 -/* BE8714 80240B34 4602003E */ c.le.s $f0, $f2 -/* BE8718 80240B38 00000000 */ nop -/* BE871C 80240B3C 45020003 */ bc1fl .L80240B4C -/* BE8720 80240B40 24840001 */ addiu $a0, $a0, 1 -/* BE8724 80240B44 080902D7 */ j .L80240B5C -/* BE8728 80240B48 AE240078 */ sw $a0, 0x78($s1) -.L80240B4C: -/* BE872C 80240B4C 8C620000 */ lw $v0, ($v1) -/* BE8730 80240B50 0082102A */ slt $v0, $a0, $v0 -/* BE8734 80240B54 1440FFF2 */ bnez $v0, .L80240B20 -/* BE8738 80240B58 24A5000C */ addiu $a1, $a1, 0xc -.L80240B5C: -/* BE873C 80240B5C C6400000 */ lwc1 $f0, ($s2) -/* BE8740 80240B60 E4C00018 */ swc1 $f0, 0x18($a2) -/* BE8744 80240B64 8E0200CC */ lw $v0, 0xcc($s0) -/* BE8748 80240B68 8C420004 */ lw $v0, 4($v0) -/* BE874C 80240B6C ACC20028 */ sw $v0, 0x28($a2) -/* BE8750 80240B70 24020001 */ addiu $v0, $zero, 1 -/* BE8754 80240B74 AE200074 */ sw $zero, 0x74($s1) -/* BE8758 80240B78 AE220070 */ sw $v0, 0x70($s1) -/* BE875C 80240B7C 8FBF001C */ lw $ra, 0x1c($sp) -/* BE8760 80240B80 8FB20018 */ lw $s2, 0x18($sp) -/* BE8764 80240B84 8FB10014 */ lw $s1, 0x14($sp) -/* BE8768 80240B88 8FB00010 */ lw $s0, 0x10($sp) -/* BE876C 80240B8C 03E00008 */ jr $ra -/* BE8770 80240B90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_05/func_80240B94_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/func_80240B94_BE7BE0.s deleted file mode 100644 index 14eb558996..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/func_80240B94_BE7BE0.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B94_BE8774 -/* BE8774 80240B94 27BDFF98 */ addiu $sp, $sp, -0x68 -/* BE8778 80240B98 AFB40058 */ sw $s4, 0x58($sp) -/* BE877C 80240B9C 0080A02D */ daddu $s4, $a0, $zero -/* BE8780 80240BA0 AFBF0060 */ sw $ra, 0x60($sp) -/* BE8784 80240BA4 AFB5005C */ sw $s5, 0x5c($sp) -/* BE8788 80240BA8 AFB30054 */ sw $s3, 0x54($sp) -/* BE878C 80240BAC AFB20050 */ sw $s2, 0x50($sp) -/* BE8790 80240BB0 AFB1004C */ sw $s1, 0x4c($sp) -/* BE8794 80240BB4 AFB00048 */ sw $s0, 0x48($sp) -/* BE8798 80240BB8 8E910148 */ lw $s1, 0x148($s4) -/* BE879C 80240BBC 86240008 */ lh $a0, 8($s1) -/* BE87A0 80240BC0 0C00EABB */ jal get_npc_unsafe -/* BE87A4 80240BC4 00A0802D */ daddu $s0, $a1, $zero -/* BE87A8 80240BC8 8E83000C */ lw $v1, 0xc($s4) -/* BE87AC 80240BCC 0280202D */ daddu $a0, $s4, $zero -/* BE87B0 80240BD0 8C650000 */ lw $a1, ($v1) -/* BE87B4 80240BD4 0C0B1EAF */ jal get_variable -/* BE87B8 80240BD8 0040902D */ daddu $s2, $v0, $zero -/* BE87BC 80240BDC AFA00018 */ sw $zero, 0x18($sp) -/* BE87C0 80240BE0 8E2300D0 */ lw $v1, 0xd0($s1) -/* BE87C4 80240BE4 8C630094 */ lw $v1, 0x94($v1) -/* BE87C8 80240BE8 AFA3001C */ sw $v1, 0x1c($sp) -/* BE87CC 80240BEC 8E2300D0 */ lw $v1, 0xd0($s1) -/* BE87D0 80240BF0 8C630080 */ lw $v1, 0x80($v1) -/* BE87D4 80240BF4 AFA30020 */ sw $v1, 0x20($sp) -/* BE87D8 80240BF8 8E2300D0 */ lw $v1, 0xd0($s1) -/* BE87DC 80240BFC 8C630088 */ lw $v1, 0x88($v1) -/* BE87E0 80240C00 AFA30024 */ sw $v1, 0x24($sp) -/* BE87E4 80240C04 8E2300D0 */ lw $v1, 0xd0($s1) -/* BE87E8 80240C08 8C63008C */ lw $v1, 0x8c($v1) -/* BE87EC 80240C0C 27B50018 */ addiu $s5, $sp, 0x18 -/* BE87F0 80240C10 AFA30028 */ sw $v1, 0x28($sp) -/* BE87F4 80240C14 8E2300D0 */ lw $v1, 0xd0($s1) -/* BE87F8 80240C18 3C014282 */ lui $at, 0x4282 -/* BE87FC 80240C1C 44810000 */ mtc1 $at, $f0 -/* BE8800 80240C20 8C630090 */ lw $v1, 0x90($v1) -/* BE8804 80240C24 0040982D */ daddu $s3, $v0, $zero -/* BE8808 80240C28 E7A00030 */ swc1 $f0, 0x30($sp) -/* BE880C 80240C2C A7A00034 */ sh $zero, 0x34($sp) -/* BE8810 80240C30 16000005 */ bnez $s0, .L80240C48 -/* BE8814 80240C34 AFA3002C */ sw $v1, 0x2c($sp) -/* BE8818 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) -/* BE881C 80240C3C 30420004 */ andi $v0, $v0, 4 -/* BE8820 80240C40 10400044 */ beqz $v0, .L80240D54 -/* BE8824 80240C44 00000000 */ nop -.L80240C48: -/* BE8828 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 -/* BE882C 80240C4C AE800070 */ sw $zero, 0x70($s4) -/* BE8830 80240C50 A640008E */ sh $zero, 0x8e($s2) -/* BE8834 80240C54 8E2200CC */ lw $v0, 0xcc($s1) -/* BE8838 80240C58 8E430000 */ lw $v1, ($s2) -/* BE883C 80240C5C 8C420000 */ lw $v0, ($v0) -/* BE8840 80240C60 00641824 */ and $v1, $v1, $a0 -/* BE8844 80240C64 AE430000 */ sw $v1, ($s2) -/* BE8848 80240C68 AE420028 */ sw $v0, 0x28($s2) -/* BE884C 80240C6C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BE8850 80240C70 8C420098 */ lw $v0, 0x98($v0) -/* BE8854 80240C74 54400005 */ bnel $v0, $zero, .L80240C8C -/* BE8858 80240C78 2402FDFF */ addiu $v0, $zero, -0x201 -/* BE885C 80240C7C 34620200 */ ori $v0, $v1, 0x200 -/* BE8860 80240C80 2403FFF7 */ addiu $v1, $zero, -9 -/* BE8864 80240C84 08090325 */ j .L80240C94 -/* BE8868 80240C88 00431024 */ and $v0, $v0, $v1 -.L80240C8C: -/* BE886C 80240C8C 00621024 */ and $v0, $v1, $v0 -/* BE8870 80240C90 34420008 */ ori $v0, $v0, 8 -.L80240C94: -/* BE8874 80240C94 AE420000 */ sw $v0, ($s2) -/* BE8878 80240C98 8E2200B0 */ lw $v0, 0xb0($s1) -/* BE887C 80240C9C 30420004 */ andi $v0, $v0, 4 -/* BE8880 80240CA0 10400008 */ beqz $v0, .L80240CC4 -/* BE8884 80240CA4 24020063 */ addiu $v0, $zero, 0x63 -/* BE8888 80240CA8 AE820070 */ sw $v0, 0x70($s4) -/* BE888C 80240CAC AE800074 */ sw $zero, 0x74($s4) -/* BE8890 80240CB0 8E2200B0 */ lw $v0, 0xb0($s1) -/* BE8894 80240CB4 2403FFFB */ addiu $v1, $zero, -5 -/* BE8898 80240CB8 00431024 */ and $v0, $v0, $v1 -/* BE889C 80240CBC 0809033C */ j .L80240CF0 -/* BE88A0 80240CC0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240CC4: -/* BE88A4 80240CC4 8E220000 */ lw $v0, ($s1) -/* BE88A8 80240CC8 3C034000 */ lui $v1, 0x4000 -/* BE88AC 80240CCC 00431024 */ and $v0, $v0, $v1 -/* BE88B0 80240CD0 10400007 */ beqz $v0, .L80240CF0 -/* BE88B4 80240CD4 3C03BFFF */ lui $v1, 0xbfff -/* BE88B8 80240CD8 2402000C */ addiu $v0, $zero, 0xc -/* BE88BC 80240CDC AE820070 */ sw $v0, 0x70($s4) -/* BE88C0 80240CE0 8E220000 */ lw $v0, ($s1) -/* BE88C4 80240CE4 3463FFFF */ ori $v1, $v1, 0xffff -/* BE88C8 80240CE8 00431024 */ and $v0, $v0, $v1 -/* BE88CC 80240CEC AE220000 */ sw $v0, ($s1) -.L80240CF0: -/* BE88D0 80240CF0 27A50038 */ addiu $a1, $sp, 0x38 -/* BE88D4 80240CF4 27A6003C */ addiu $a2, $sp, 0x3c -/* BE88D8 80240CF8 C6400038 */ lwc1 $f0, 0x38($s2) -/* BE88DC 80240CFC 864200A8 */ lh $v0, 0xa8($s2) -/* BE88E0 80240D00 3C0142C8 */ lui $at, 0x42c8 -/* BE88E4 80240D04 44812000 */ mtc1 $at, $f4 -/* BE88E8 80240D08 44823000 */ mtc1 $v0, $f6 -/* BE88EC 80240D0C 00000000 */ nop -/* BE88F0 80240D10 468031A0 */ cvt.s.w $f6, $f6 -/* BE88F4 80240D14 27A20044 */ addiu $v0, $sp, 0x44 -/* BE88F8 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) -/* BE88FC 80240D1C C640003C */ lwc1 $f0, 0x3c($s2) -/* BE8900 80240D20 C6420040 */ lwc1 $f2, 0x40($s2) -/* BE8904 80240D24 46060000 */ add.s $f0, $f0, $f6 -/* BE8908 80240D28 E7A40044 */ swc1 $f4, 0x44($sp) -/* BE890C 80240D2C E7A20040 */ swc1 $f2, 0x40($sp) -/* BE8910 80240D30 E7A0003C */ swc1 $f0, 0x3c($sp) -/* BE8914 80240D34 AFA20010 */ sw $v0, 0x10($sp) -/* BE8918 80240D38 8E440080 */ lw $a0, 0x80($s2) -/* BE891C 80240D3C 0C0372DF */ jal func_800DCB7C -/* BE8920 80240D40 27A70040 */ addiu $a3, $sp, 0x40 -/* BE8924 80240D44 10400003 */ beqz $v0, .L80240D54 -/* BE8928 80240D48 00000000 */ nop -/* BE892C 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* BE8930 80240D50 E640003C */ swc1 $f0, 0x3c($s2) -.L80240D54: -/* BE8934 80240D54 8E830070 */ lw $v1, 0x70($s4) -/* BE8938 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* BE893C 80240D5C 10400042 */ beqz $v0, .L80240E68 -/* BE8940 80240D60 00031080 */ sll $v0, $v1, 2 -/* BE8944 80240D64 3C018024 */ lui $at, 0x8024 -/* BE8948 80240D68 00220821 */ addu $at, $at, $v0 -/* BE894C 80240D6C 8C225060 */ lw $v0, 0x5060($at) -/* BE8950 80240D70 00400008 */ jr $v0 -/* BE8954 80240D74 00000000 */ nop -/* BE8958 80240D78 0280202D */ daddu $a0, $s4, $zero -/* BE895C 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* BE8960 80240D80 0C090000 */ jal func_80240000 -/* BE8964 80240D84 02A0302D */ daddu $a2, $s5, $zero -/* BE8968 80240D88 0280202D */ daddu $a0, $s4, $zero -/* BE896C 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* BE8970 80240D90 0C090056 */ jal func_80240158 -/* BE8974 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* BE8978 80240D98 0809039A */ j .L80240E68 -/* BE897C 80240D9C 00000000 */ nop -/* BE8980 80240DA0 0280202D */ daddu $a0, $s4, $zero -/* BE8984 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* BE8988 80240DA8 0C090100 */ jal func_80240400 -/* BE898C 80240DAC 02A0302D */ daddu $a2, $s5, $zero -/* BE8990 80240DB0 0280202D */ daddu $a0, $s4, $zero -/* BE8994 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* BE8998 80240DB8 0C090130 */ jal func_802404C0 -/* BE899C 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* BE89A0 80240DC0 0809039A */ j .L80240E68 -/* BE89A4 80240DC4 00000000 */ nop -/* BE89A8 80240DC8 0280202D */ daddu $a0, $s4, $zero -/* BE89AC 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* BE89B0 80240DD0 0C09019F */ jal func_8024067C -/* BE89B4 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* BE89B8 80240DD8 0809039A */ j .L80240E68 -/* BE89BC 80240DDC 00000000 */ nop -/* BE89C0 80240DE0 0280202D */ daddu $a0, $s4, $zero -/* BE89C4 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* BE89C8 80240DE8 0C0901CC */ jal func_80240730 -/* BE89CC 80240DEC 02A0302D */ daddu $a2, $s5, $zero -/* BE89D0 80240DF0 0280202D */ daddu $a0, $s4, $zero -/* BE89D4 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* BE89D8 80240DF8 0C0901E9 */ jal func_802407A4 -/* BE89DC 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* BE89E0 80240E00 0809039A */ j .L80240E68 -/* BE89E4 80240E04 00000000 */ nop -/* BE89E8 80240E08 0280202D */ daddu $a0, $s4, $zero -/* BE89EC 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* BE89F0 80240E10 0C090207 */ jal func_8024081C -/* BE89F4 80240E14 02A0302D */ daddu $a2, $s5, $zero -/* BE89F8 80240E18 0280202D */ daddu $a0, $s4, $zero -/* BE89FC 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* BE8A00 80240E20 0C090253 */ jal func_8024094C -/* BE8A04 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* BE8A08 80240E28 0809039A */ j .L80240E68 -/* BE8A0C 80240E2C 00000000 */ nop -/* BE8A10 80240E30 0280202D */ daddu $a0, $s4, $zero -/* BE8A14 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BE8A18 80240E38 0C09029B */ jal func_80240A6C -/* BE8A1C 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* BE8A20 80240E40 0809039A */ j .L80240E68 -/* BE8A24 80240E44 00000000 */ nop -/* BE8A28 80240E48 0280202D */ daddu $a0, $s4, $zero -/* BE8A2C 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* BE8A30 80240E50 0C0902B5 */ jal func_80240AD4 -/* BE8A34 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* BE8A38 80240E58 0809039A */ j .L80240E68 -/* BE8A3C 80240E5C 00000000 */ nop -/* BE8A40 80240E60 0C0129CF */ jal func_8004A73C -/* BE8A44 80240E64 0280202D */ daddu $a0, $s4, $zero -.L80240E68: -/* BE8A48 80240E68 8FBF0060 */ lw $ra, 0x60($sp) -/* BE8A4C 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) -/* BE8A50 80240E70 8FB40058 */ lw $s4, 0x58($sp) -/* BE8A54 80240E74 8FB30054 */ lw $s3, 0x54($sp) -/* BE8A58 80240E78 8FB20050 */ lw $s2, 0x50($sp) -/* BE8A5C 80240E7C 8FB1004C */ lw $s1, 0x4c($sp) -/* BE8A60 80240E80 8FB00048 */ lw $s0, 0x48($sp) -/* BE8A64 80240E84 0000102D */ daddu $v0, $zero, $zero -/* BE8A68 80240E88 03E00008 */ jr $ra -/* BE8A6C 80240E8C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_arn/arn_05/func_80240E90_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/func_80240E90_BE7BE0.s deleted file mode 100644 index 79eecd9008..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/func_80240E90_BE7BE0.s +++ /dev/null @@ -1,126 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E90_BE8A70 -/* BE8A70 80240E90 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BE8A74 80240E94 AFB20030 */ sw $s2, 0x30($sp) -/* BE8A78 80240E98 0080902D */ daddu $s2, $a0, $zero -/* BE8A7C 80240E9C AFBF0034 */ sw $ra, 0x34($sp) -/* BE8A80 80240EA0 AFB1002C */ sw $s1, 0x2c($sp) -/* BE8A84 80240EA4 AFB00028 */ sw $s0, 0x28($sp) -/* BE8A88 80240EA8 F7B60040 */ sdc1 $f22, 0x40($sp) -/* BE8A8C 80240EAC F7B40038 */ sdc1 $f20, 0x38($sp) -/* BE8A90 80240EB0 8E500148 */ lw $s0, 0x148($s2) -/* BE8A94 80240EB4 0C00EABB */ jal get_npc_unsafe -/* BE8A98 80240EB8 86040008 */ lh $a0, 8($s0) -/* BE8A9C 80240EBC 0040882D */ daddu $s1, $v0, $zero -/* BE8AA0 80240EC0 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BE8AA4 80240EC4 8E430078 */ lw $v1, 0x78($s2) -/* BE8AA8 80240EC8 C62E0040 */ lwc1 $f14, 0x40($s1) -/* BE8AAC 80240ECC 00031040 */ sll $v0, $v1, 1 -/* BE8AB0 80240ED0 00431021 */ addu $v0, $v0, $v1 -/* BE8AB4 80240ED4 8E0300D0 */ lw $v1, 0xd0($s0) -/* BE8AB8 80240ED8 00021080 */ sll $v0, $v0, 2 -/* BE8ABC 80240EDC 00431021 */ addu $v0, $v0, $v1 -/* BE8AC0 80240EE0 C4560004 */ lwc1 $f22, 4($v0) -/* BE8AC4 80240EE4 4680B5A0 */ cvt.s.w $f22, $f22 -/* BE8AC8 80240EE8 C454000C */ lwc1 $f20, 0xc($v0) -/* BE8ACC 80240EEC 4680A520 */ cvt.s.w $f20, $f20 -/* BE8AD0 80240EF0 4406B000 */ mfc1 $a2, $f22 -/* BE8AD4 80240EF4 4407A000 */ mfc1 $a3, $f20 -/* BE8AD8 80240EF8 E7AC0018 */ swc1 $f12, 0x18($sp) -/* BE8ADC 80240EFC 0C00A720 */ jal atan2 -/* BE8AE0 80240F00 E7AE0020 */ swc1 $f14, 0x20($sp) -/* BE8AE4 80240F04 8E250018 */ lw $a1, 0x18($s1) -/* BE8AE8 80240F08 44060000 */ mfc1 $a2, $f0 -/* BE8AEC 80240F0C 0220202D */ daddu $a0, $s1, $zero -/* BE8AF0 80240F10 0C00EA95 */ jal npc_move_heading -/* BE8AF4 80240F14 AE26000C */ sw $a2, 0xc($s1) -/* BE8AF8 80240F18 27A50018 */ addiu $a1, $sp, 0x18 -/* BE8AFC 80240F1C 27A6001C */ addiu $a2, $sp, 0x1c -/* BE8B00 80240F20 C6200038 */ lwc1 $f0, 0x38($s1) -/* BE8B04 80240F24 8E430078 */ lw $v1, 0x78($s2) -/* BE8B08 80240F28 3C01447A */ lui $at, 0x447a -/* BE8B0C 80240F2C 44812000 */ mtc1 $at, $f4 -/* BE8B10 80240F30 00031040 */ sll $v0, $v1, 1 -/* BE8B14 80240F34 00431021 */ addu $v0, $v0, $v1 -/* BE8B18 80240F38 00021080 */ sll $v0, $v0, 2 -/* BE8B1C 80240F3C E7A00018 */ swc1 $f0, 0x18($sp) -/* BE8B20 80240F40 8E0300D0 */ lw $v1, 0xd0($s0) -/* BE8B24 80240F44 C620003C */ lwc1 $f0, 0x3c($s1) -/* BE8B28 80240F48 C6220040 */ lwc1 $f2, 0x40($s1) -/* BE8B2C 80240F4C 00431021 */ addu $v0, $v0, $v1 -/* BE8B30 80240F50 C4460008 */ lwc1 $f6, 8($v0) -/* BE8B34 80240F54 468031A0 */ cvt.s.w $f6, $f6 -/* BE8B38 80240F58 27A20024 */ addiu $v0, $sp, 0x24 -/* BE8B3C 80240F5C 46060000 */ add.s $f0, $f0, $f6 -/* BE8B40 80240F60 E7A20020 */ swc1 $f2, 0x20($sp) -/* BE8B44 80240F64 E7A40024 */ swc1 $f4, 0x24($sp) -/* BE8B48 80240F68 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BE8B4C 80240F6C AFA20010 */ sw $v0, 0x10($sp) -/* BE8B50 80240F70 8E240080 */ lw $a0, 0x80($s1) -/* BE8B54 80240F74 0C0372DF */ jal func_800DCB7C -/* BE8B58 80240F78 27A70020 */ addiu $a3, $sp, 0x20 -/* BE8B5C 80240F7C 8E430078 */ lw $v1, 0x78($s2) -/* BE8B60 80240F80 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* BE8B64 80240F84 00031040 */ sll $v0, $v1, 1 -/* BE8B68 80240F88 00431021 */ addu $v0, $v0, $v1 -/* BE8B6C 80240F8C 8E0300D0 */ lw $v1, 0xd0($s0) -/* BE8B70 80240F90 00021080 */ sll $v0, $v0, 2 -/* BE8B74 80240F94 00431021 */ addu $v0, $v0, $v1 -/* BE8B78 80240F98 C4400008 */ lwc1 $f0, 8($v0) -/* BE8B7C 80240F9C 46800020 */ cvt.s.w $f0, $f0 -/* BE8B80 80240FA0 46001080 */ add.s $f2, $f2, $f0 -/* BE8B84 80240FA4 C620003C */ lwc1 $f0, 0x3c($s1) -/* BE8B88 80240FA8 3C014000 */ lui $at, 0x4000 -/* BE8B8C 80240FAC 44813800 */ mtc1 $at, $f7 -/* BE8B90 80240FB0 44803000 */ mtc1 $zero, $f6 -/* BE8B94 80240FB4 46001001 */ sub.s $f0, $f2, $f0 -/* BE8B98 80240FB8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* BE8B9C 80240FBC 46000121 */ cvt.d.s $f4, $f0 -/* BE8BA0 80240FC0 4624303C */ c.lt.d $f6, $f4 -/* BE8BA4 80240FC4 00000000 */ nop -/* BE8BA8 80240FC8 45000005 */ bc1f .L80240FE0 -/* BE8BAC 80240FCC E7A00024 */ swc1 $f0, 0x24($sp) -/* BE8BB0 80240FD0 C620003C */ lwc1 $f0, 0x3c($s1) -/* BE8BB4 80240FD4 46000021 */ cvt.d.s $f0, $f0 -/* BE8BB8 80240FD8 08090403 */ j .L8024100C -/* BE8BBC 80240FDC 46260000 */ add.d $f0, $f0, $f6 -.L80240FE0: -/* BE8BC0 80240FE0 3C01C000 */ lui $at, 0xc000 -/* BE8BC4 80240FE4 44810800 */ mtc1 $at, $f1 -/* BE8BC8 80240FE8 44800000 */ mtc1 $zero, $f0 -/* BE8BCC 80240FEC 00000000 */ nop -/* BE8BD0 80240FF0 4620203C */ c.lt.d $f4, $f0 -/* BE8BD4 80240FF4 00000000 */ nop -/* BE8BD8 80240FF8 45020006 */ bc1fl .L80241014 -/* BE8BDC 80240FFC E622003C */ swc1 $f2, 0x3c($s1) -/* BE8BE0 80241000 C620003C */ lwc1 $f0, 0x3c($s1) -/* BE8BE4 80241004 46000021 */ cvt.d.s $f0, $f0 -/* BE8BE8 80241008 46260001 */ sub.d $f0, $f0, $f6 -.L8024100C: -/* BE8BEC 8024100C 46200020 */ cvt.s.d $f0, $f0 -/* BE8BF0 80241010 E620003C */ swc1 $f0, 0x3c($s1) -.L80241014: -/* BE8BF4 80241014 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BE8BF8 80241018 C62E0040 */ lwc1 $f14, 0x40($s1) -/* BE8BFC 8024101C 4406B000 */ mfc1 $a2, $f22 -/* BE8C00 80241020 4407A000 */ mfc1 $a3, $f20 -/* BE8C04 80241024 0C00A7B5 */ jal dist2D -/* BE8C08 80241028 00000000 */ nop -/* BE8C0C 8024102C C6220018 */ lwc1 $f2, 0x18($s1) -/* BE8C10 80241030 4600103C */ c.lt.s $f2, $f0 -/* BE8C14 80241034 00000000 */ nop -/* BE8C18 80241038 45010003 */ bc1t .L80241048 -/* BE8C1C 8024103C E7A00024 */ swc1 $f0, 0x24($sp) -/* BE8C20 80241040 24020002 */ addiu $v0, $zero, 2 -/* BE8C24 80241044 AE420070 */ sw $v0, 0x70($s2) -.L80241048: -/* BE8C28 80241048 8FBF0034 */ lw $ra, 0x34($sp) -/* BE8C2C 8024104C 8FB20030 */ lw $s2, 0x30($sp) -/* BE8C30 80241050 8FB1002C */ lw $s1, 0x2c($sp) -/* BE8C34 80241054 8FB00028 */ lw $s0, 0x28($sp) -/* BE8C38 80241058 D7B60040 */ ldc1 $f22, 0x40($sp) -/* BE8C3C 8024105C D7B40038 */ ldc1 $f20, 0x38($sp) -/* BE8C40 80241060 03E00008 */ jr $ra -/* BE8C44 80241064 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_arn/arn_05/func_80241068_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/func_80241068_BE7BE0.s deleted file mode 100644 index f49661aab9..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/func_80241068_BE7BE0.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241068_BE8C48 -/* BE8C48 80241068 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BE8C4C 8024106C AFB10014 */ sw $s1, 0x14($sp) -/* BE8C50 80241070 0080882D */ daddu $s1, $a0, $zero -/* BE8C54 80241074 AFBF0020 */ sw $ra, 0x20($sp) -/* BE8C58 80241078 AFB3001C */ sw $s3, 0x1c($sp) -/* BE8C5C 8024107C AFB20018 */ sw $s2, 0x18($sp) -/* BE8C60 80241080 AFB00010 */ sw $s0, 0x10($sp) -/* BE8C64 80241084 8E320148 */ lw $s2, 0x148($s1) -/* BE8C68 80241088 86440008 */ lh $a0, 8($s2) -/* BE8C6C 8024108C 0C00EABB */ jal get_npc_unsafe -/* BE8C70 80241090 00A0982D */ daddu $s3, $a1, $zero -/* BE8C74 80241094 0040802D */ daddu $s0, $v0, $zero -/* BE8C78 80241098 9602008E */ lhu $v0, 0x8e($s0) -/* BE8C7C 8024109C 2442FFFF */ addiu $v0, $v0, -1 -/* BE8C80 802410A0 A602008E */ sh $v0, 0x8e($s0) -/* BE8C84 802410A4 00021400 */ sll $v0, $v0, 0x10 -/* BE8C88 802410A8 0441001D */ bgez $v0, .L80241120 -/* BE8C8C 802410AC 00000000 */ nop -/* BE8C90 802410B0 8E220074 */ lw $v0, 0x74($s1) -/* BE8C94 802410B4 2442FFFF */ addiu $v0, $v0, -1 -/* BE8C98 802410B8 04400014 */ bltz $v0, .L8024110C -/* BE8C9C 802410BC AE220074 */ sw $v0, 0x74($s1) -/* BE8CA0 802410C0 C600000C */ lwc1 $f0, 0xc($s0) -/* BE8CA4 802410C4 3C014334 */ lui $at, 0x4334 -/* BE8CA8 802410C8 44816000 */ mtc1 $at, $f12 -/* BE8CAC 802410CC 0C00A6C9 */ jal clamp_angle -/* BE8CB0 802410D0 460C0300 */ add.s $f12, $f0, $f12 -/* BE8CB4 802410D4 E600000C */ swc1 $f0, 0xc($s0) -/* BE8CB8 802410D8 8E640008 */ lw $a0, 8($s3) -/* BE8CBC 802410DC 000417C2 */ srl $v0, $a0, 0x1f -/* BE8CC0 802410E0 00822021 */ addu $a0, $a0, $v0 -/* BE8CC4 802410E4 00042043 */ sra $a0, $a0, 1 -/* BE8CC8 802410E8 0C00A67F */ jal rand_int -/* BE8CCC 802410EC 24840001 */ addiu $a0, $a0, 1 -/* BE8CD0 802410F0 8E630008 */ lw $v1, 8($s3) -/* BE8CD4 802410F4 000327C2 */ srl $a0, $v1, 0x1f -/* BE8CD8 802410F8 00641821 */ addu $v1, $v1, $a0 -/* BE8CDC 802410FC 00031843 */ sra $v1, $v1, 1 -/* BE8CE0 80241100 00621821 */ addu $v1, $v1, $v0 -/* BE8CE4 80241104 08090448 */ j .L80241120 -/* BE8CE8 80241108 A603008E */ sh $v1, 0x8e($s0) -.L8024110C: -/* BE8CEC 8024110C 24020004 */ addiu $v0, $zero, 4 -/* BE8CF0 80241110 AE220070 */ sw $v0, 0x70($s1) -/* BE8CF4 80241114 8E4200CC */ lw $v0, 0xcc($s2) -/* BE8CF8 80241118 8C420000 */ lw $v0, ($v0) -/* BE8CFC 8024111C AE020028 */ sw $v0, 0x28($s0) -.L80241120: -/* BE8D00 80241120 8FBF0020 */ lw $ra, 0x20($sp) -/* BE8D04 80241124 8FB3001C */ lw $s3, 0x1c($sp) -/* BE8D08 80241128 8FB20018 */ lw $s2, 0x18($sp) -/* BE8D0C 8024112C 8FB10014 */ lw $s1, 0x14($sp) -/* BE8D10 80241130 8FB00010 */ lw $s0, 0x10($sp) -/* BE8D14 80241134 03E00008 */ jr $ra -/* BE8D18 80241138 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_05/func_8024113C_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/func_8024113C_BE7BE0.s deleted file mode 100644 index 285fa0ce29..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/func_8024113C_BE7BE0.s +++ /dev/null @@ -1,99 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024113C_BE8D1C -/* BE8D1C 8024113C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BE8D20 80241140 AFB40040 */ sw $s4, 0x40($sp) -/* BE8D24 80241144 0080A02D */ daddu $s4, $a0, $zero -/* BE8D28 80241148 AFBF0048 */ sw $ra, 0x48($sp) -/* BE8D2C 8024114C AFB50044 */ sw $s5, 0x44($sp) -/* BE8D30 80241150 AFB3003C */ sw $s3, 0x3c($sp) -/* BE8D34 80241154 AFB20038 */ sw $s2, 0x38($sp) -/* BE8D38 80241158 AFB10034 */ sw $s1, 0x34($sp) -/* BE8D3C 8024115C AFB00030 */ sw $s0, 0x30($sp) -/* BE8D40 80241160 8E930148 */ lw $s3, 0x148($s4) -/* BE8D44 80241164 86640008 */ lh $a0, 8($s3) -/* BE8D48 80241168 8E90000C */ lw $s0, 0xc($s4) -/* BE8D4C 8024116C 0C00EABB */ jal get_npc_unsafe -/* BE8D50 80241170 00A0882D */ daddu $s1, $a1, $zero -/* BE8D54 80241174 0280202D */ daddu $a0, $s4, $zero -/* BE8D58 80241178 8E050000 */ lw $a1, ($s0) -/* BE8D5C 8024117C 0C0B1EAF */ jal get_variable -/* BE8D60 80241180 0040A82D */ daddu $s5, $v0, $zero -/* BE8D64 80241184 AFA00010 */ sw $zero, 0x10($sp) -/* BE8D68 80241188 8E6300D0 */ lw $v1, 0xd0($s3) -/* BE8D6C 8024118C 8C630094 */ lw $v1, 0x94($v1) -/* BE8D70 80241190 AFA30014 */ sw $v1, 0x14($sp) -/* BE8D74 80241194 8E6300D0 */ lw $v1, 0xd0($s3) -/* BE8D78 80241198 8C630080 */ lw $v1, 0x80($v1) -/* BE8D7C 8024119C AFA30018 */ sw $v1, 0x18($sp) -/* BE8D80 802411A0 8E6300D0 */ lw $v1, 0xd0($s3) -/* BE8D84 802411A4 8C630088 */ lw $v1, 0x88($v1) -/* BE8D88 802411A8 AFA3001C */ sw $v1, 0x1c($sp) -/* BE8D8C 802411AC 8E6300D0 */ lw $v1, 0xd0($s3) -/* BE8D90 802411B0 8C63008C */ lw $v1, 0x8c($v1) -/* BE8D94 802411B4 27B20010 */ addiu $s2, $sp, 0x10 -/* BE8D98 802411B8 AFA30020 */ sw $v1, 0x20($sp) -/* BE8D9C 802411BC 8E6300D0 */ lw $v1, 0xd0($s3) -/* BE8DA0 802411C0 3C0142C8 */ lui $at, 0x42c8 -/* BE8DA4 802411C4 44810000 */ mtc1 $at, $f0 -/* BE8DA8 802411C8 8C630090 */ lw $v1, 0x90($v1) -/* BE8DAC 802411CC 0040802D */ daddu $s0, $v0, $zero -/* BE8DB0 802411D0 E7A00028 */ swc1 $f0, 0x28($sp) -/* BE8DB4 802411D4 A7A0002C */ sh $zero, 0x2c($sp) -/* BE8DB8 802411D8 12200007 */ beqz $s1, .L802411F8 -/* BE8DBC 802411DC AFA30024 */ sw $v1, 0x24($sp) -/* BE8DC0 802411E0 AE800070 */ sw $zero, 0x70($s4) -/* BE8DC4 802411E4 8EA20000 */ lw $v0, ($s5) -/* BE8DC8 802411E8 2403F7FF */ addiu $v1, $zero, -0x801 -/* BE8DCC 802411EC A6A0008E */ sh $zero, 0x8e($s5) -/* BE8DD0 802411F0 00431024 */ and $v0, $v0, $v1 -/* BE8DD4 802411F4 AEA20000 */ sw $v0, ($s5) -.L802411F8: -/* BE8DD8 802411F8 8E830070 */ lw $v1, 0x70($s4) -/* BE8DDC 802411FC 2C620005 */ sltiu $v0, $v1, 5 -/* BE8DE0 80241200 1040001E */ beqz $v0, .L8024127C -/* BE8DE4 80241204 00031080 */ sll $v0, $v1, 2 -/* BE8DE8 80241208 3C018024 */ lui $at, 0x8024 -/* BE8DEC 8024120C 00220821 */ addu $at, $at, $v0 -/* BE8DF0 80241210 8C2251F0 */ lw $v0, 0x51f0($at) -/* BE8DF4 80241214 00400008 */ jr $v0 -/* BE8DF8 80241218 00000000 */ nop -/* BE8DFC 8024121C 0280202D */ daddu $a0, $s4, $zero -/* BE8E00 80241220 0200282D */ daddu $a1, $s0, $zero -/* BE8E04 80241224 0C090000 */ jal func_80240000 -/* BE8E08 80241228 0240302D */ daddu $a2, $s2, $zero -/* BE8E0C 8024122C 0280202D */ daddu $a0, $s4, $zero -/* BE8E10 80241230 0200282D */ daddu $a1, $s0, $zero -/* BE8E14 80241234 0C0903A4 */ jal func_80240E90 -/* BE8E18 80241238 0240302D */ daddu $a2, $s2, $zero -/* BE8E1C 8024123C 0809049F */ j .L8024127C -/* BE8E20 80241240 00000000 */ nop -/* BE8E24 80241244 0280202D */ daddu $a0, $s4, $zero -/* BE8E28 80241248 0200282D */ daddu $a1, $s0, $zero -/* BE8E2C 8024124C 0C090100 */ jal func_80240400 -/* BE8E30 80241250 0240302D */ daddu $a2, $s2, $zero -/* BE8E34 80241254 0280202D */ daddu $a0, $s4, $zero -/* BE8E38 80241258 0200282D */ daddu $a1, $s0, $zero -/* BE8E3C 8024125C 0C09041A */ jal func_80241068 -/* BE8E40 80241260 0240302D */ daddu $a2, $s2, $zero -/* BE8E44 80241264 0809049F */ j .L8024127C -/* BE8E48 80241268 00000000 */ nop -/* BE8E4C 8024126C 0280202D */ daddu $a0, $s4, $zero -/* BE8E50 80241270 0200282D */ daddu $a1, $s0, $zero -/* BE8E54 80241274 0C09019F */ jal func_8024067C -/* BE8E58 80241278 0240302D */ daddu $a2, $s2, $zero -.L8024127C: -/* BE8E5C 8024127C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* BE8E60 80241280 4600008D */ trunc.w.s $f2, $f0 -/* BE8E64 80241284 E662006C */ swc1 $f2, 0x6c($s3) -/* BE8E68 80241288 8FBF0048 */ lw $ra, 0x48($sp) -/* BE8E6C 8024128C 8FB50044 */ lw $s5, 0x44($sp) -/* BE8E70 80241290 8FB40040 */ lw $s4, 0x40($sp) -/* BE8E74 80241294 8FB3003C */ lw $s3, 0x3c($sp) -/* BE8E78 80241298 8FB20038 */ lw $s2, 0x38($sp) -/* BE8E7C 8024129C 8FB10034 */ lw $s1, 0x34($sp) -/* BE8E80 802412A0 8FB00030 */ lw $s0, 0x30($sp) -/* BE8E84 802412A4 0000102D */ daddu $v0, $zero, $zero -/* BE8E88 802412A8 03E00008 */ jr $ra -/* BE8E8C 802412AC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_arn/arn_05/func_802412B0_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/func_802412B0_BE7BE0.s deleted file mode 100644 index 886ce53858..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/func_802412B0_BE7BE0.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412B0_BE8E90 -/* BE8E90 802412B0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* BE8E94 802412B4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* BE8E98 802412B8 8C420010 */ lw $v0, 0x10($v0) -/* BE8E9C 802412BC 00021042 */ srl $v0, $v0, 1 -/* BE8EA0 802412C0 03E00008 */ jr $ra -/* BE8EA4 802412C4 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_arn/arn_05/func_802412C8_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/func_802412C8_BE7BE0.s deleted file mode 100644 index 3d5b8604fa..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/func_802412C8_BE7BE0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412C8_BE8EA8 -/* BE8EA8 802412C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BE8EAC 802412CC AFBF0010 */ sw $ra, 0x10($sp) -/* BE8EB0 802412D0 8C82000C */ lw $v0, 0xc($a0) -/* BE8EB4 802412D4 0C0B1EAF */ jal get_variable -/* BE8EB8 802412D8 8C450000 */ lw $a1, ($v0) -/* BE8EBC 802412DC 0C03AC5A */ jal func_800EB168 -/* BE8EC0 802412E0 0040202D */ daddu $a0, $v0, $zero -/* BE8EC4 802412E4 8FBF0010 */ lw $ra, 0x10($sp) -/* BE8EC8 802412E8 24020002 */ addiu $v0, $zero, 2 -/* BE8ECC 802412EC 03E00008 */ jr $ra -/* BE8ED0 802412F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* BE8ED4 802412F4 00000000 */ nop -/* BE8ED8 802412F8 00000000 */ nop -/* BE8EDC 802412FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_8024004C_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_8024004C_BECDF0.s deleted file mode 100644 index 3a608e1ce6..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_8024004C_BECDF0.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024004C_BECE3C -/* BECE3C 8024004C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BECE40 80240050 AFB20020 */ sw $s2, 0x20($sp) -/* BECE44 80240054 0080902D */ daddu $s2, $a0, $zero -/* BECE48 80240058 AFBF0024 */ sw $ra, 0x24($sp) -/* BECE4C 8024005C AFB1001C */ sw $s1, 0x1c($sp) -/* BECE50 80240060 AFB00018 */ sw $s0, 0x18($sp) -/* BECE54 80240064 10A0004A */ beqz $a1, .L80240190 -/* BECE58 80240068 8E51000C */ lw $s1, 0xc($s2) -/* BECE5C 8024006C 0C00AB39 */ jal heap_malloc -/* BECE60 80240070 24040058 */ addiu $a0, $zero, 0x58 -/* BECE64 80240074 0000202D */ daddu $a0, $zero, $zero -/* BECE68 80240078 3C05FD05 */ lui $a1, 0xfd05 -/* BECE6C 8024007C 34A50F81 */ ori $a1, $a1, 0xf81 -/* BECE70 80240080 0040802D */ daddu $s0, $v0, $zero -/* BECE74 80240084 0200302D */ daddu $a2, $s0, $zero -/* BECE78 80240088 0C0B2026 */ jal set_variable -/* BECE7C 8024008C AE500084 */ sw $s0, 0x84($s2) -/* BECE80 80240090 8E250000 */ lw $a1, ($s1) -/* BECE84 80240094 26310004 */ addiu $s1, $s1, 4 -/* BECE88 80240098 0C0B1EAF */ jal get_variable -/* BECE8C 8024009C 0240202D */ daddu $a0, $s2, $zero -/* BECE90 802400A0 AE020038 */ sw $v0, 0x38($s0) -/* BECE94 802400A4 8E250000 */ lw $a1, ($s1) -/* BECE98 802400A8 26310004 */ addiu $s1, $s1, 4 -/* BECE9C 802400AC 0C0B1EAF */ jal get_variable -/* BECEA0 802400B0 0240202D */ daddu $a0, $s2, $zero -/* BECEA4 802400B4 AE02003C */ sw $v0, 0x3c($s0) -/* BECEA8 802400B8 8E250000 */ lw $a1, ($s1) -/* BECEAC 802400BC 26310004 */ addiu $s1, $s1, 4 -/* BECEB0 802400C0 0C0B210B */ jal get_float_variable -/* BECEB4 802400C4 0240202D */ daddu $a0, $s2, $zero -/* BECEB8 802400C8 E600000C */ swc1 $f0, 0xc($s0) -/* BECEBC 802400CC 8E250000 */ lw $a1, ($s1) -/* BECEC0 802400D0 26310004 */ addiu $s1, $s1, 4 -/* BECEC4 802400D4 0C0B210B */ jal get_float_variable -/* BECEC8 802400D8 0240202D */ daddu $a0, $s2, $zero -/* BECECC 802400DC E6000010 */ swc1 $f0, 0x10($s0) -/* BECED0 802400E0 8E250000 */ lw $a1, ($s1) -/* BECED4 802400E4 26310004 */ addiu $s1, $s1, 4 -/* BECED8 802400E8 0C0B210B */ jal get_float_variable -/* BECEDC 802400EC 0240202D */ daddu $a0, $s2, $zero -/* BECEE0 802400F0 E6000014 */ swc1 $f0, 0x14($s0) -/* BECEE4 802400F4 8E250000 */ lw $a1, ($s1) -/* BECEE8 802400F8 26310004 */ addiu $s1, $s1, 4 -/* BECEEC 802400FC 0C0B210B */ jal get_float_variable -/* BECEF0 80240100 0240202D */ daddu $a0, $s2, $zero -/* BECEF4 80240104 E6000018 */ swc1 $f0, 0x18($s0) -/* BECEF8 80240108 8E250000 */ lw $a1, ($s1) -/* BECEFC 8024010C 26310004 */ addiu $s1, $s1, 4 -/* BECF00 80240110 0C0B210B */ jal get_float_variable -/* BECF04 80240114 0240202D */ daddu $a0, $s2, $zero -/* BECF08 80240118 E600001C */ swc1 $f0, 0x1c($s0) -/* BECF0C 8024011C 8E250000 */ lw $a1, ($s1) -/* BECF10 80240120 26310004 */ addiu $s1, $s1, 4 -/* BECF14 80240124 0C0B210B */ jal get_float_variable -/* BECF18 80240128 0240202D */ daddu $a0, $s2, $zero -/* BECF1C 8024012C E6000020 */ swc1 $f0, 0x20($s0) -/* BECF20 80240130 8E250000 */ lw $a1, ($s1) -/* BECF24 80240134 26310004 */ addiu $s1, $s1, 4 -/* BECF28 80240138 0C0B210B */ jal get_float_variable -/* BECF2C 8024013C 0240202D */ daddu $a0, $s2, $zero -/* BECF30 80240140 E6000024 */ swc1 $f0, 0x24($s0) -/* BECF34 80240144 8E250000 */ lw $a1, ($s1) -/* BECF38 80240148 0C0B210B */ jal get_float_variable -/* BECF3C 8024014C 0240202D */ daddu $a0, $s2, $zero -/* BECF40 80240150 3C013F80 */ lui $at, 0x3f80 -/* BECF44 80240154 44811000 */ mtc1 $at, $f2 -/* BECF48 80240158 E6000028 */ swc1 $f0, 0x28($s0) -/* BECF4C 8024015C AFA00014 */ sw $zero, 0x14($sp) -/* BECF50 80240160 E7A20010 */ swc1 $f2, 0x10($sp) -/* BECF54 80240164 8E05000C */ lw $a1, 0xc($s0) -/* BECF58 80240168 8E060010 */ lw $a2, 0x10($s0) -/* BECF5C 8024016C 8E070014 */ lw $a3, 0x14($s0) -/* BECF60 80240170 0C01CA6C */ jal func_800729B0 -/* BECF64 80240174 24040002 */ addiu $a0, $zero, 2 -/* BECF68 80240178 AE020050 */ sw $v0, 0x50($s0) -/* BECF6C 8024017C A600004E */ sh $zero, 0x4e($s0) -/* BECF70 80240180 A6000048 */ sh $zero, 0x48($s0) -/* BECF74 80240184 A600004A */ sh $zero, 0x4a($s0) -/* BECF78 80240188 A6000044 */ sh $zero, 0x44($s0) -/* BECF7C 8024018C A6000046 */ sh $zero, 0x46($s0) -.L80240190: -/* BECF80 80240190 8FBF0024 */ lw $ra, 0x24($sp) -/* BECF84 80240194 8FB20020 */ lw $s2, 0x20($sp) -/* BECF88 80240198 8FB1001C */ lw $s1, 0x1c($sp) -/* BECF8C 8024019C 8FB00018 */ lw $s0, 0x18($sp) -/* BECF90 802401A0 24020002 */ addiu $v0, $zero, 2 -/* BECF94 802401A4 03E00008 */ jr $ra -/* BECF98 802401A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_802401AC_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_802401AC_BECDF0.s deleted file mode 100644 index 9cf1c4fb9c..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_802401AC_BECDF0.s +++ /dev/null @@ -1,272 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401AC_BECF9C -/* BECF9C 802401AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BECFA0 802401B0 AFBF0020 */ sw $ra, 0x20($sp) -/* BECFA4 802401B4 AFB1001C */ sw $s1, 0x1c($sp) -/* BECFA8 802401B8 AFB00018 */ sw $s0, 0x18($sp) -/* BECFAC 802401BC 8C910084 */ lw $s1, 0x84($a0) -/* BECFB0 802401C0 86230044 */ lh $v1, 0x44($s1) -/* BECFB4 802401C4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* BECFB8 802401C8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* BECFBC 802401CC 2C620005 */ sltiu $v0, $v1, 5 -/* BECFC0 802401D0 1040008A */ beqz $v0, .L802403FC -/* BECFC4 802401D4 00031080 */ sll $v0, $v1, 2 -/* BECFC8 802401D8 3C018024 */ lui $at, 0x8024 -/* BECFCC 802401DC 00220821 */ addu $at, $at, $v0 -/* BECFD0 802401E0 8C227900 */ lw $v0, 0x7900($at) -/* BECFD4 802401E4 00400008 */ jr $v0 -/* BECFD8 802401E8 00000000 */ nop -/* BECFDC 802401EC 8E22003C */ lw $v0, 0x3c($s1) -/* BECFE0 802401F0 86270046 */ lh $a3, 0x46($s1) -/* BECFE4 802401F4 AFA20010 */ sw $v0, 0x10($sp) -/* BECFE8 802401F8 8E250010 */ lw $a1, 0x10($s1) -/* BECFEC 802401FC 8E26001C */ lw $a2, 0x1c($s1) -/* BECFF0 80240200 0C00A8ED */ jal update_lerp -/* BECFF4 80240204 24040005 */ addiu $a0, $zero, 5 -/* BECFF8 80240208 86270046 */ lh $a3, 0x46($s1) -/* BECFFC 8024020C 8E22003C */ lw $v0, 0x3c($s1) -/* BED000 80240210 E6200004 */ swc1 $f0, 4($s1) -/* BED004 80240214 AFA20010 */ sw $v0, 0x10($sp) -/* BED008 80240218 8E25000C */ lw $a1, 0xc($s1) -/* BED00C 8024021C 8E260018 */ lw $a2, 0x18($s1) -/* BED010 80240220 0C00A8ED */ jal update_lerp -/* BED014 80240224 0000202D */ daddu $a0, $zero, $zero -/* BED018 80240228 86270046 */ lh $a3, 0x46($s1) -/* BED01C 8024022C 8E22003C */ lw $v0, 0x3c($s1) -/* BED020 80240230 E6200000 */ swc1 $f0, ($s1) -/* BED024 80240234 AFA20010 */ sw $v0, 0x10($sp) -/* BED028 80240238 8E250014 */ lw $a1, 0x14($s1) -/* BED02C 8024023C 8E260020 */ lw $a2, 0x20($s1) -/* BED030 80240240 0C00A8ED */ jal update_lerp -/* BED034 80240244 0000202D */ daddu $a0, $zero, $zero -/* BED038 80240248 8E220050 */ lw $v0, 0x50($s1) -/* BED03C 8024024C E6200008 */ swc1 $f0, 8($s1) -/* BED040 80240250 C6200000 */ lwc1 $f0, ($s1) -/* BED044 80240254 8C42000C */ lw $v0, 0xc($v0) -/* BED048 80240258 E4400008 */ swc1 $f0, 8($v0) -/* BED04C 8024025C 8E220050 */ lw $v0, 0x50($s1) -/* BED050 80240260 C6200004 */ lwc1 $f0, 4($s1) -/* BED054 80240264 8C42000C */ lw $v0, 0xc($v0) -/* BED058 80240268 E440000C */ swc1 $f0, 0xc($v0) -/* BED05C 8024026C 8E220050 */ lw $v0, 0x50($s1) -/* BED060 80240270 C6200008 */ lwc1 $f0, 8($s1) -/* BED064 80240274 8C42000C */ lw $v0, 0xc($v0) -/* BED068 80240278 E4400010 */ swc1 $f0, 0x10($v0) -/* BED06C 8024027C 96220046 */ lhu $v0, 0x46($s1) -/* BED070 80240280 8E23003C */ lw $v1, 0x3c($s1) -/* BED074 80240284 24420001 */ addiu $v0, $v0, 1 -/* BED078 80240288 A6220046 */ sh $v0, 0x46($s1) -/* BED07C 8024028C 00021400 */ sll $v0, $v0, 0x10 -/* BED080 80240290 00021403 */ sra $v0, $v0, 0x10 -/* BED084 80240294 0043102A */ slt $v0, $v0, $v1 -/* BED088 80240298 14400058 */ bnez $v0, .L802403FC -/* BED08C 8024029C 24020001 */ addiu $v0, $zero, 1 -/* BED090 802402A0 A6220044 */ sh $v0, 0x44($s1) -/* BED094 802402A4 080900FF */ j .L802403FC -/* BED098 802402A8 A6200046 */ sh $zero, 0x46($s1) -/* BED09C 802402AC 96220046 */ lhu $v0, 0x46($s1) -/* BED0A0 802402B0 24420001 */ addiu $v0, $v0, 1 -/* BED0A4 802402B4 A6220046 */ sh $v0, 0x46($s1) -/* BED0A8 802402B8 00021400 */ sll $v0, $v0, 0x10 -/* BED0AC 802402BC 00021403 */ sra $v0, $v0, 0x10 -/* BED0B0 802402C0 2842003C */ slti $v0, $v0, 0x3c -/* BED0B4 802402C4 1440004D */ bnez $v0, .L802403FC -/* BED0B8 802402C8 24020002 */ addiu $v0, $zero, 2 -/* BED0BC 802402CC 8E230050 */ lw $v1, 0x50($s1) -/* BED0C0 802402D0 A6220044 */ sh $v0, 0x44($s1) -/* BED0C4 802402D4 A6200046 */ sh $zero, 0x46($s1) -/* BED0C8 802402D8 8C63000C */ lw $v1, 0xc($v1) -/* BED0CC 802402DC 24020001 */ addiu $v0, $zero, 1 -/* BED0D0 802402E0 AC620070 */ sw $v0, 0x70($v1) -/* BED0D4 802402E4 8E220050 */ lw $v0, 0x50($s1) -/* BED0D8 802402E8 8C42000C */ lw $v0, 0xc($v0) -/* BED0DC 802402EC 080900FF */ j .L802403FC -/* BED0E0 802402F0 AC400074 */ sw $zero, 0x74($v0) -/* BED0E4 802402F4 96220046 */ lhu $v0, 0x46($s1) -/* BED0E8 802402F8 24420001 */ addiu $v0, $v0, 1 -/* BED0EC 802402FC A6220046 */ sh $v0, 0x46($s1) -/* BED0F0 80240300 00021400 */ sll $v0, $v0, 0x10 -/* BED0F4 80240304 00021403 */ sra $v0, $v0, 0x10 -/* BED0F8 80240308 2842003C */ slti $v0, $v0, 0x3c -/* BED0FC 8024030C 1440003B */ bnez $v0, .L802403FC -/* BED100 80240310 00000000 */ nop -/* BED104 80240314 3C013F80 */ lui $at, 0x3f80 -/* BED108 80240318 44810000 */ mtc1 $at, $f0 -/* BED10C 8024031C AFA00014 */ sw $zero, 0x14($sp) -/* BED110 80240320 E7A00010 */ swc1 $f0, 0x10($sp) -/* BED114 80240324 8E250018 */ lw $a1, 0x18($s1) -/* BED118 80240328 8E26001C */ lw $a2, 0x1c($s1) -/* BED11C 8024032C 8E270020 */ lw $a3, 0x20($s1) -/* BED120 80240330 0C01C9AC */ jal func_800726B0 -/* BED124 80240334 24040001 */ addiu $a0, $zero, 1 -/* BED128 80240338 AE220054 */ sw $v0, 0x54($s1) -/* BED12C 8024033C 8C43000C */ lw $v1, 0xc($v0) -/* BED130 80240340 9222003B */ lbu $v0, 0x3b($s1) -/* BED134 80240344 A0620034 */ sb $v0, 0x34($v1) -/* BED138 80240348 8E220054 */ lw $v0, 0x54($s1) -/* BED13C 8024034C 8C42000C */ lw $v0, 0xc($v0) -/* BED140 80240350 AC400020 */ sw $zero, 0x20($v0) -/* BED144 80240354 8E250018 */ lw $a1, 0x18($s1) -/* BED148 80240358 8E260028 */ lw $a2, 0x28($s1) -/* BED14C 8024035C 8E270020 */ lw $a3, 0x20($s1) -/* BED150 80240360 0C044898 */ jal create_shadow_type -/* BED154 80240364 0000202D */ daddu $a0, $zero, $zero -/* BED158 80240368 3C014210 */ lui $at, 0x4210 -/* BED15C 8024036C 44810000 */ mtc1 $at, $f0 -/* BED160 80240370 AE220040 */ sw $v0, 0x40($s1) -/* BED164 80240374 24020003 */ addiu $v0, $zero, 3 -/* BED168 80240378 A6220044 */ sh $v0, 0x44($s1) -/* BED16C 8024037C 24020001 */ addiu $v0, $zero, 1 -/* BED170 80240380 A6200046 */ sh $zero, 0x46($s1) -/* BED174 80240384 AE20002C */ sw $zero, 0x2c($s1) -/* BED178 80240388 A6220048 */ sh $v0, 0x48($s1) -/* BED17C 8024038C 080900FF */ j .L802403FC -/* BED180 80240390 E6200030 */ swc1 $f0, 0x30($s1) -/* BED184 80240394 0000202D */ daddu $a0, $zero, $zero -/* BED188 80240398 3C054210 */ lui $a1, 0x4210 -/* BED18C 8024039C 3C064198 */ lui $a2, 0x4198 -/* BED190 802403A0 86270046 */ lh $a3, 0x46($s1) -/* BED194 802403A4 24020078 */ addiu $v0, $zero, 0x78 -/* BED198 802403A8 0C00A8ED */ jal update_lerp -/* BED19C 802403AC AFA20010 */ sw $v0, 0x10($sp) -/* BED1A0 802403B0 96220046 */ lhu $v0, 0x46($s1) -/* BED1A4 802403B4 E6200030 */ swc1 $f0, 0x30($s1) -/* BED1A8 802403B8 24420001 */ addiu $v0, $v0, 1 -/* BED1AC 802403BC A6220046 */ sh $v0, 0x46($s1) -/* BED1B0 802403C0 00021400 */ sll $v0, $v0, 0x10 -/* BED1B4 802403C4 00021403 */ sra $v0, $v0, 0x10 -/* BED1B8 802403C8 28420078 */ slti $v0, $v0, 0x78 -/* BED1BC 802403CC 1440000B */ bnez $v0, .L802403FC -/* BED1C0 802403D0 24030001 */ addiu $v1, $zero, 1 -/* BED1C4 802403D4 C620002C */ lwc1 $f0, 0x2c($s1) -/* BED1C8 802403D8 24020002 */ addiu $v0, $zero, 2 -/* BED1CC 802403DC A6220048 */ sh $v0, 0x48($s1) -/* BED1D0 802403E0 24020004 */ addiu $v0, $zero, 4 -/* BED1D4 802403E4 A620004C */ sh $zero, 0x4c($s1) -/* BED1D8 802403E8 A623004A */ sh $v1, 0x4a($s1) -/* BED1DC 802403EC A623004E */ sh $v1, 0x4e($s1) -/* BED1E0 802403F0 A6220044 */ sh $v0, 0x44($s1) -/* BED1E4 802403F4 A6200046 */ sh $zero, 0x46($s1) -/* BED1E8 802403F8 E6200034 */ swc1 $f0, 0x34($s1) -.L802403FC: -/* BED1EC 802403FC 8623004A */ lh $v1, 0x4a($s1) -/* BED1F0 80240400 24020001 */ addiu $v0, $zero, 1 -/* BED1F4 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* BED1F8 80240408 24020002 */ addiu $v0, $zero, 2 -/* BED1FC 8024040C 1062001E */ beq $v1, $v0, .L80240488 -/* BED200 80240410 00000000 */ nop -/* BED204 80240414 0809014C */ j .L80240530 -/* BED208 80240418 00000000 */ nop -.L8024041C: -/* BED20C 8024041C 8627004C */ lh $a3, 0x4c($s1) -/* BED210 80240420 24100078 */ addiu $s0, $zero, 0x78 -/* BED214 80240424 AFB00010 */ sw $s0, 0x10($sp) -/* BED218 80240428 8E250034 */ lw $a1, 0x34($s1) -/* BED21C 8024042C 3C0644B4 */ lui $a2, 0x44b4 -/* BED220 80240430 0C00A8ED */ jal update_lerp -/* BED224 80240434 24040004 */ addiu $a0, $zero, 4 -/* BED228 80240438 8627004C */ lh $a3, 0x4c($s1) -/* BED22C 8024043C E620002C */ swc1 $f0, 0x2c($s1) -/* BED230 80240440 AFB00010 */ sw $s0, 0x10($sp) -/* BED234 80240444 8E25001C */ lw $a1, 0x1c($s1) -/* BED238 80240448 8E260024 */ lw $a2, 0x24($s1) -/* BED23C 8024044C 0C00A8ED */ jal update_lerp -/* BED240 80240450 2404000A */ addiu $a0, $zero, 0xa -/* BED244 80240454 9622004C */ lhu $v0, 0x4c($s1) -/* BED248 80240458 E6200004 */ swc1 $f0, 4($s1) -/* BED24C 8024045C 24420001 */ addiu $v0, $v0, 1 -/* BED250 80240460 A622004C */ sh $v0, 0x4c($s1) -/* BED254 80240464 00021400 */ sll $v0, $v0, 0x10 -/* BED258 80240468 00021403 */ sra $v0, $v0, 0x10 -/* BED25C 8024046C 0050102A */ slt $v0, $v0, $s0 -/* BED260 80240470 1440002F */ bnez $v0, .L80240530 -/* BED264 80240474 2402010E */ addiu $v0, $zero, 0x10e -/* BED268 80240478 A622004C */ sh $v0, 0x4c($s1) -/* BED26C 8024047C 24020002 */ addiu $v0, $zero, 2 -/* BED270 80240480 0809014B */ j .L8024052C -/* BED274 80240484 A622004A */ sh $v0, 0x4a($s1) -.L80240488: -/* BED278 80240488 8622004C */ lh $v0, 0x4c($s1) -/* BED27C 8024048C 44826000 */ mtc1 $v0, $f12 -/* BED280 80240490 00000000 */ nop -/* BED284 80240494 0C00A8BB */ jal sin_deg -/* BED288 80240498 46806320 */ cvt.s.w $f12, $f12 -/* BED28C 8024049C 3C013F80 */ lui $at, 0x3f80 -/* BED290 802404A0 44811000 */ mtc1 $at, $f2 -/* BED294 802404A4 00000000 */ nop -/* BED298 802404A8 46020000 */ add.s $f0, $f0, $f2 -/* BED29C 802404AC 46000000 */ add.s $f0, $f0, $f0 -/* BED2A0 802404B0 C6220024 */ lwc1 $f2, 0x24($s1) -/* BED2A4 802404B4 8622004C */ lh $v0, 0x4c($s1) -/* BED2A8 802404B8 46001080 */ add.s $f2, $f2, $f0 -/* BED2AC 802404BC 24420008 */ addiu $v0, $v0, 8 -/* BED2B0 802404C0 44826000 */ mtc1 $v0, $f12 -/* BED2B4 802404C4 00000000 */ nop -/* BED2B8 802404C8 46806320 */ cvt.s.w $f12, $f12 -/* BED2BC 802404CC 0C00A6C9 */ jal clamp_angle -/* BED2C0 802404D0 E6220004 */ swc1 $f2, 4($s1) -/* BED2C4 802404D4 4600010D */ trunc.w.s $f4, $f0 -/* BED2C8 802404D8 44022000 */ mfc1 $v0, $f4 -/* BED2CC 802404DC C6200004 */ lwc1 $f0, 4($s1) -/* BED2D0 802404E0 A622004C */ sh $v0, 0x4c($s1) -/* BED2D4 802404E4 C60C0028 */ lwc1 $f12, 0x28($s0) -/* BED2D8 802404E8 8E060030 */ lw $a2, 0x30($s0) -/* BED2DC 802404EC 3C0141A0 */ lui $at, 0x41a0 -/* BED2E0 802404F0 44817000 */ mtc1 $at, $f14 -/* BED2E4 802404F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* BED2E8 802404F8 C602002C */ lwc1 $f2, 0x2c($s0) -/* BED2EC 802404FC C6200008 */ lwc1 $f0, 8($s1) -/* BED2F0 80240500 E7A00014 */ swc1 $f0, 0x14($sp) -/* BED2F4 80240504 8E270000 */ lw $a3, ($s1) -/* BED2F8 80240508 0C00A7CB */ jal dist3D -/* BED2FC 8024050C 460E1380 */ add.s $f14, $f2, $f14 -/* BED300 80240510 3C0141F0 */ lui $at, 0x41f0 -/* BED304 80240514 44811000 */ mtc1 $at, $f2 -/* BED308 80240518 00000000 */ nop -/* BED30C 8024051C 4600103C */ c.lt.s $f2, $f0 -/* BED310 80240520 00000000 */ nop -/* BED314 80240524 45010002 */ bc1t .L80240530 -/* BED318 80240528 24020003 */ addiu $v0, $zero, 3 -.L8024052C: -/* BED31C 8024052C A622004E */ sh $v0, 0x4e($s1) -.L80240530: -/* BED320 80240530 86230048 */ lh $v1, 0x48($s1) -/* BED324 80240534 24020001 */ addiu $v0, $zero, 1 -/* BED328 80240538 10620005 */ beq $v1, $v0, .L80240550 -/* BED32C 8024053C 24020002 */ addiu $v0, $zero, 2 -/* BED330 80240540 10620008 */ beq $v1, $v0, .L80240564 -/* BED334 80240544 00000000 */ nop -/* BED338 80240548 08090169 */ j .L802405A4 -/* BED33C 8024054C 00000000 */ nop -.L80240550: -/* BED340 80240550 C620002C */ lwc1 $f0, 0x2c($s1) -/* BED344 80240554 C62C0030 */ lwc1 $f12, 0x30($s1) -/* BED348 80240558 0C00A6C9 */ jal clamp_angle -/* BED34C 8024055C 460C0300 */ add.s $f12, $f0, $f12 -/* BED350 80240560 E620002C */ swc1 $f0, 0x2c($s1) -.L80240564: -/* BED354 80240564 8E220054 */ lw $v0, 0x54($s1) -/* BED358 80240568 C620002C */ lwc1 $f0, 0x2c($s1) -/* BED35C 8024056C 8C42000C */ lw $v0, 0xc($v0) -/* BED360 80240570 E4400024 */ swc1 $f0, 0x24($v0) -/* BED364 80240574 8E220054 */ lw $v0, 0x54($s1) -/* BED368 80240578 C6200018 */ lwc1 $f0, 0x18($s1) -/* BED36C 8024057C 8C42000C */ lw $v0, 0xc($v0) -/* BED370 80240580 E4400004 */ swc1 $f0, 4($v0) -/* BED374 80240584 8E220054 */ lw $v0, 0x54($s1) -/* BED378 80240588 C6200004 */ lwc1 $f0, 4($s1) -/* BED37C 8024058C 8C42000C */ lw $v0, 0xc($v0) -/* BED380 80240590 E4400008 */ swc1 $f0, 8($v0) -/* BED384 80240594 8E220054 */ lw $v0, 0x54($s1) -/* BED388 80240598 C6200020 */ lwc1 $f0, 0x20($s1) -/* BED38C 8024059C 8C42000C */ lw $v0, 0xc($v0) -/* BED390 802405A0 E440000C */ swc1 $f0, 0xc($v0) -.L802405A4: -/* BED394 802405A4 8FBF0020 */ lw $ra, 0x20($sp) -/* BED398 802405A8 8FB1001C */ lw $s1, 0x1c($sp) -/* BED39C 802405AC 8FB00018 */ lw $s0, 0x18($sp) -/* BED3A0 802405B0 0000102D */ daddu $v0, $zero, $zero -/* BED3A4 802405B4 03E00008 */ jr $ra -/* BED3A8 802405B8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_802405BC_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_802405BC_BECDF0.s deleted file mode 100644 index 4762dfb5be..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_802405BC_BECDF0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405BC_BED3AC -/* BED3AC 802405BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BED3B0 802405C0 AFB00010 */ sw $s0, 0x10($sp) -/* BED3B4 802405C4 0080802D */ daddu $s0, $a0, $zero -/* BED3B8 802405C8 AFBF0014 */ sw $ra, 0x14($sp) -/* BED3BC 802405CC 8E02000C */ lw $v0, 0xc($s0) -/* BED3C0 802405D0 0C0B1EAF */ jal get_variable -/* BED3C4 802405D4 8C450000 */ lw $a1, ($v0) -/* BED3C8 802405D8 8E030084 */ lw $v1, 0x84($s0) -/* BED3CC 802405DC 8FBF0014 */ lw $ra, 0x14($sp) -/* BED3D0 802405E0 8463004E */ lh $v1, 0x4e($v1) -/* BED3D4 802405E4 8FB00010 */ lw $s0, 0x10($sp) -/* BED3D8 802405E8 00621826 */ xor $v1, $v1, $v0 -/* BED3DC 802405EC 2C630001 */ sltiu $v1, $v1, 1 -/* BED3E0 802405F0 00031040 */ sll $v0, $v1, 1 -/* BED3E4 802405F4 03E00008 */ jr $ra -/* BED3E8 802405F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_802405FC_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_802405FC_BECDF0.s deleted file mode 100644 index 3c2fc03cc1..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_802405FC_BECDF0.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405FC_BED3EC -/* BED3EC 802405FC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BED3F0 80240600 AFB20020 */ sw $s2, 0x20($sp) -/* BED3F4 80240604 0080902D */ daddu $s2, $a0, $zero -/* BED3F8 80240608 AFBF0024 */ sw $ra, 0x24($sp) -/* BED3FC 8024060C AFB1001C */ sw $s1, 0x1c($sp) -/* BED400 80240610 AFB00018 */ sw $s0, 0x18($sp) -/* BED404 80240614 10A00035 */ beqz $a1, .L802406EC -/* BED408 80240618 8E51000C */ lw $s1, 0xc($s2) -/* BED40C 8024061C 0C00AB39 */ jal heap_malloc -/* BED410 80240620 24040058 */ addiu $a0, $zero, 0x58 -/* BED414 80240624 0040802D */ daddu $s0, $v0, $zero -/* BED418 80240628 AE500084 */ sw $s0, 0x84($s2) -/* BED41C 8024062C 8E250000 */ lw $a1, ($s1) -/* BED420 80240630 26310004 */ addiu $s1, $s1, 4 -/* BED424 80240634 0C0B1EAF */ jal get_variable -/* BED428 80240638 0240202D */ daddu $a0, $s2, $zero -/* BED42C 8024063C AE020038 */ sw $v0, 0x38($s0) -/* BED430 80240640 8E250000 */ lw $a1, ($s1) -/* BED434 80240644 26310004 */ addiu $s1, $s1, 4 -/* BED438 80240648 0C0B210B */ jal get_float_variable -/* BED43C 8024064C 0240202D */ daddu $a0, $s2, $zero -/* BED440 80240650 E6000018 */ swc1 $f0, 0x18($s0) -/* BED444 80240654 8E250000 */ lw $a1, ($s1) -/* BED448 80240658 26310004 */ addiu $s1, $s1, 4 -/* BED44C 8024065C 0C0B210B */ jal get_float_variable -/* BED450 80240660 0240202D */ daddu $a0, $s2, $zero -/* BED454 80240664 E6000024 */ swc1 $f0, 0x24($s0) -/* BED458 80240668 8E250000 */ lw $a1, ($s1) -/* BED45C 8024066C 26310004 */ addiu $s1, $s1, 4 -/* BED460 80240670 0C0B210B */ jal get_float_variable -/* BED464 80240674 0240202D */ daddu $a0, $s2, $zero -/* BED468 80240678 E6000020 */ swc1 $f0, 0x20($s0) -/* BED46C 8024067C 8E250000 */ lw $a1, ($s1) -/* BED470 80240680 0C0B210B */ jal get_float_variable -/* BED474 80240684 0240202D */ daddu $a0, $s2, $zero -/* BED478 80240688 3C013F80 */ lui $at, 0x3f80 -/* BED47C 8024068C 44811000 */ mtc1 $at, $f2 -/* BED480 80240690 E6000028 */ swc1 $f0, 0x28($s0) -/* BED484 80240694 AFA00014 */ sw $zero, 0x14($sp) -/* BED488 80240698 E7A20010 */ swc1 $f2, 0x10($sp) -/* BED48C 8024069C 8E050018 */ lw $a1, 0x18($s0) -/* BED490 802406A0 8E060024 */ lw $a2, 0x24($s0) -/* BED494 802406A4 8E070020 */ lw $a3, 0x20($s0) -/* BED498 802406A8 0C01C9AC */ jal func_800726B0 -/* BED49C 802406AC 24040001 */ addiu $a0, $zero, 1 -/* BED4A0 802406B0 AE020054 */ sw $v0, 0x54($s0) -/* BED4A4 802406B4 8C43000C */ lw $v1, 0xc($v0) -/* BED4A8 802406B8 9202003B */ lbu $v0, 0x3b($s0) -/* BED4AC 802406BC A0620034 */ sb $v0, 0x34($v1) -/* BED4B0 802406C0 8E020054 */ lw $v0, 0x54($s0) -/* BED4B4 802406C4 8C42000C */ lw $v0, 0xc($v0) -/* BED4B8 802406C8 AC400020 */ sw $zero, 0x20($v0) -/* BED4BC 802406CC 8E050018 */ lw $a1, 0x18($s0) -/* BED4C0 802406D0 8E060028 */ lw $a2, 0x28($s0) -/* BED4C4 802406D4 8E070020 */ lw $a3, 0x20($s0) -/* BED4C8 802406D8 0C044898 */ jal create_shadow_type -/* BED4CC 802406DC 0000202D */ daddu $a0, $zero, $zero -/* BED4D0 802406E0 AE020040 */ sw $v0, 0x40($s0) -/* BED4D4 802406E4 2402010E */ addiu $v0, $zero, 0x10e -/* BED4D8 802406E8 A602004C */ sh $v0, 0x4c($s0) -.L802406EC: -/* BED4DC 802406EC 8FBF0024 */ lw $ra, 0x24($sp) -/* BED4E0 802406F0 8FB20020 */ lw $s2, 0x20($sp) -/* BED4E4 802406F4 8FB1001C */ lw $s1, 0x1c($sp) -/* BED4E8 802406F8 8FB00018 */ lw $s0, 0x18($sp) -/* BED4EC 802406FC 24020002 */ addiu $v0, $zero, 2 -/* BED4F0 80240700 03E00008 */ jr $ra -/* BED4F4 80240704 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_80240708_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_80240708_BECDF0.s deleted file mode 100644 index 561e77540f..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_80240708_BECDF0.s +++ /dev/null @@ -1,67 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240708_BED4F8 -/* BED4F8 80240708 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BED4FC 8024070C AFBF0014 */ sw $ra, 0x14($sp) -/* BED500 80240710 AFB00010 */ sw $s0, 0x10($sp) -/* BED504 80240714 8C900084 */ lw $s0, 0x84($a0) -/* BED508 80240718 8602004C */ lh $v0, 0x4c($s0) -/* BED50C 8024071C 44826000 */ mtc1 $v0, $f12 -/* BED510 80240720 00000000 */ nop -/* BED514 80240724 0C00A8BB */ jal sin_deg -/* BED518 80240728 46806320 */ cvt.s.w $f12, $f12 -/* BED51C 8024072C 3C013F80 */ lui $at, 0x3f80 -/* BED520 80240730 44811000 */ mtc1 $at, $f2 -/* BED524 80240734 00000000 */ nop -/* BED528 80240738 46020000 */ add.s $f0, $f0, $f2 -/* BED52C 8024073C 46000000 */ add.s $f0, $f0, $f0 -/* BED530 80240740 C6020024 */ lwc1 $f2, 0x24($s0) -/* BED534 80240744 8602004C */ lh $v0, 0x4c($s0) -/* BED538 80240748 46001080 */ add.s $f2, $f2, $f0 -/* BED53C 8024074C 24420008 */ addiu $v0, $v0, 8 -/* BED540 80240750 44826000 */ mtc1 $v0, $f12 -/* BED544 80240754 00000000 */ nop -/* BED548 80240758 46806320 */ cvt.s.w $f12, $f12 -/* BED54C 8024075C 0C00A6C9 */ jal clamp_angle -/* BED550 80240760 E6020004 */ swc1 $f2, 4($s0) -/* BED554 80240764 4600010D */ trunc.w.s $f4, $f0 -/* BED558 80240768 44022000 */ mfc1 $v0, $f4 -/* BED55C 8024076C 00000000 */ nop -/* BED560 80240770 A602004C */ sh $v0, 0x4c($s0) -/* BED564 80240774 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* BED568 80240778 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* BED56C 8024077C C44C0028 */ lwc1 $f12, 0x28($v0) -/* BED570 80240780 C44E0030 */ lwc1 $f14, 0x30($v0) -/* BED574 80240784 8E060018 */ lw $a2, 0x18($s0) -/* BED578 80240788 0C00A7B5 */ jal dist2D -/* BED57C 8024078C 8E070020 */ lw $a3, 0x20($s0) -/* BED580 80240790 3C0141F0 */ lui $at, 0x41f0 -/* BED584 80240794 44811000 */ mtc1 $at, $f2 -/* BED588 80240798 00000000 */ nop -/* BED58C 8024079C 4602003E */ c.le.s $f0, $f2 -/* BED590 802407A0 00000000 */ nop -/* BED594 802407A4 45000002 */ bc1f .L802407B0 -/* BED598 802407A8 24020003 */ addiu $v0, $zero, 3 -/* BED59C 802407AC A602004E */ sh $v0, 0x4e($s0) -.L802407B0: -/* BED5A0 802407B0 8E020054 */ lw $v0, 0x54($s0) -/* BED5A4 802407B4 C6000018 */ lwc1 $f0, 0x18($s0) -/* BED5A8 802407B8 8C42000C */ lw $v0, 0xc($v0) -/* BED5AC 802407BC E4400004 */ swc1 $f0, 4($v0) -/* BED5B0 802407C0 8E020054 */ lw $v0, 0x54($s0) -/* BED5B4 802407C4 C6000004 */ lwc1 $f0, 4($s0) -/* BED5B8 802407C8 8C42000C */ lw $v0, 0xc($v0) -/* BED5BC 802407CC E4400008 */ swc1 $f0, 8($v0) -/* BED5C0 802407D0 8E020054 */ lw $v0, 0x54($s0) -/* BED5C4 802407D4 C6000020 */ lwc1 $f0, 0x20($s0) -/* BED5C8 802407D8 8C42000C */ lw $v0, 0xc($v0) -/* BED5CC 802407DC E440000C */ swc1 $f0, 0xc($v0) -/* BED5D0 802407E0 8FBF0014 */ lw $ra, 0x14($sp) -/* BED5D4 802407E4 8FB00010 */ lw $s0, 0x10($sp) -/* BED5D8 802407E8 0000102D */ daddu $v0, $zero, $zero -/* BED5DC 802407EC 03E00008 */ jr $ra -/* BED5E0 802407F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* BED5E4 802407F4 00000000 */ nop -/* BED5E8 802407F8 00000000 */ nop -/* BED5EC 802407FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_80240800_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_80240800_BECDF0.s deleted file mode 100644 index 4983e96ce6..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_80240800_BECDF0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240800_BED5F0 -/* BED5F0 80240800 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BED5F4 80240804 AFB00010 */ sw $s0, 0x10($sp) -/* BED5F8 80240808 0080802D */ daddu $s0, $a0, $zero -/* BED5FC 8024080C 3C05FE36 */ lui $a1, 0xfe36 -/* BED600 80240810 AFBF0014 */ sw $ra, 0x14($sp) -/* BED604 80240814 0C0B210B */ jal get_float_variable -/* BED608 80240818 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BED60C 8024081C 46000086 */ mov.s $f2, $f0 -/* BED610 80240820 3C018024 */ lui $at, 0x8024 -/* BED614 80240824 D4247940 */ ldc1 $f4, 0x7940($at) -/* BED618 80240828 46001021 */ cvt.d.s $f0, $f2 -/* BED61C 8024082C 4620203E */ c.le.d $f4, $f0 -/* BED620 80240830 00000000 */ nop -/* BED624 80240834 45000003 */ bc1f .L80240844 -/* BED628 80240838 0200202D */ daddu $a0, $s0, $zero -/* BED62C 8024083C 46240001 */ sub.d $f0, $f0, $f4 -/* BED630 80240840 462000A0 */ cvt.s.d $f2, $f0 -.L80240844: -/* BED634 80240844 3C05FE36 */ lui $a1, 0xfe36 -/* BED638 80240848 44061000 */ mfc1 $a2, $f2 -/* BED63C 8024084C 0C0B2190 */ jal set_float_variable -/* BED640 80240850 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BED644 80240854 8FBF0014 */ lw $ra, 0x14($sp) -/* BED648 80240858 8FB00010 */ lw $s0, 0x10($sp) -/* BED64C 8024085C 24020002 */ addiu $v0, $zero, 2 -/* BED650 80240860 03E00008 */ jr $ra -/* BED654 80240864 27BD0018 */ addiu $sp, $sp, 0x18 -/* BED658 80240868 00000000 */ nop -/* BED65C 8024086C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_80240870_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_80240870_BECDF0.s deleted file mode 100644 index 40a5dba70d..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_80240870_BECDF0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_BED660 -/* BED660 80240870 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BED664 80240874 AFBF0010 */ sw $ra, 0x10($sp) -/* BED668 80240878 0C04417A */ jal get_entity_by_index -/* BED66C 8024087C 8C840084 */ lw $a0, 0x84($a0) -/* BED670 80240880 0040182D */ daddu $v1, $v0, $zero -/* BED674 80240884 8C640000 */ lw $a0, ($v1) -/* BED678 80240888 3C050010 */ lui $a1, 0x10 -/* BED67C 8024088C 00852025 */ or $a0, $a0, $a1 -/* BED680 80240890 AC640000 */ sw $a0, ($v1) -/* BED684 80240894 8FBF0010 */ lw $ra, 0x10($sp) -/* BED688 80240898 24020002 */ addiu $v0, $zero, 2 -/* BED68C 8024089C 03E00008 */ jr $ra -/* BED690 802408A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_802408A4_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_802408A4_BECDF0.s deleted file mode 100644 index db20adb625..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_802408A4_BECDF0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A4_BED694 -/* BED694 802408A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BED698 802408A8 AFB20018 */ sw $s2, 0x18($sp) -/* BED69C 802408AC 0080902D */ daddu $s2, $a0, $zero -/* BED6A0 802408B0 AFBF001C */ sw $ra, 0x1c($sp) -/* BED6A4 802408B4 AFB10014 */ sw $s1, 0x14($sp) -/* BED6A8 802408B8 AFB00010 */ sw $s0, 0x10($sp) -/* BED6AC 802408BC 8E50000C */ lw $s0, 0xc($s2) -/* BED6B0 802408C0 8E050000 */ lw $a1, ($s0) -/* BED6B4 802408C4 0C0B1EAF */ jal get_variable -/* BED6B8 802408C8 26100004 */ addiu $s0, $s0, 4 -/* BED6BC 802408CC 0C04417A */ jal get_entity_by_index -/* BED6C0 802408D0 0040202D */ daddu $a0, $v0, $zero -/* BED6C4 802408D4 8E050000 */ lw $a1, ($s0) -/* BED6C8 802408D8 26100004 */ addiu $s0, $s0, 4 -/* BED6CC 802408DC 0040882D */ daddu $s1, $v0, $zero -/* BED6D0 802408E0 C6200048 */ lwc1 $f0, 0x48($s1) -/* BED6D4 802408E4 4600008D */ trunc.w.s $f2, $f0 -/* BED6D8 802408E8 44061000 */ mfc1 $a2, $f2 -/* BED6DC 802408EC 0C0B2026 */ jal set_variable -/* BED6E0 802408F0 0240202D */ daddu $a0, $s2, $zero -/* BED6E4 802408F4 8E050000 */ lw $a1, ($s0) -/* BED6E8 802408F8 26100004 */ addiu $s0, $s0, 4 -/* BED6EC 802408FC C620004C */ lwc1 $f0, 0x4c($s1) -/* BED6F0 80240900 4600008D */ trunc.w.s $f2, $f0 -/* BED6F4 80240904 44061000 */ mfc1 $a2, $f2 -/* BED6F8 80240908 0C0B2026 */ jal set_variable -/* BED6FC 8024090C 0240202D */ daddu $a0, $s2, $zero -/* BED700 80240910 C6200050 */ lwc1 $f0, 0x50($s1) -/* BED704 80240914 8E050000 */ lw $a1, ($s0) -/* BED708 80240918 4600008D */ trunc.w.s $f2, $f0 -/* BED70C 8024091C 44061000 */ mfc1 $a2, $f2 -/* BED710 80240920 0C0B2026 */ jal set_variable -/* BED714 80240924 0240202D */ daddu $a0, $s2, $zero -/* BED718 80240928 8FBF001C */ lw $ra, 0x1c($sp) -/* BED71C 8024092C 8FB20018 */ lw $s2, 0x18($sp) -/* BED720 80240930 8FB10014 */ lw $s1, 0x14($sp) -/* BED724 80240934 8FB00010 */ lw $s0, 0x10($sp) -/* BED728 80240938 24020002 */ addiu $v0, $zero, 2 -/* BED72C 8024093C 03E00008 */ jr $ra -/* BED730 80240940 27BD0020 */ addiu $sp, $sp, 0x20 -/* BED734 80240944 00000000 */ nop -/* BED738 80240948 00000000 */ nop -/* BED73C 8024094C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_80240950_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_80240950_BECDF0.s deleted file mode 100644 index 301db5d436..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_80240950_BECDF0.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240950_BED740 -/* BED740 80240950 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* BED744 80240954 AFB3002C */ sw $s3, 0x2c($sp) -/* BED748 80240958 0080982D */ daddu $s3, $a0, $zero -/* BED74C 8024095C AFBF0030 */ sw $ra, 0x30($sp) -/* BED750 80240960 AFB20028 */ sw $s2, 0x28($sp) -/* BED754 80240964 AFB10024 */ sw $s1, 0x24($sp) -/* BED758 80240968 AFB00020 */ sw $s0, 0x20($sp) -/* BED75C 8024096C 8E710148 */ lw $s1, 0x148($s3) -/* BED760 80240970 86240008 */ lh $a0, 8($s1) -/* BED764 80240974 0C00EABB */ jal get_npc_unsafe -/* BED768 80240978 00A0902D */ daddu $s2, $a1, $zero -/* BED76C 8024097C 8E440004 */ lw $a0, 4($s2) -/* BED770 80240980 0040802D */ daddu $s0, $v0, $zero -/* BED774 80240984 00041FC2 */ srl $v1, $a0, 0x1f -/* BED778 80240988 00832021 */ addu $a0, $a0, $v1 -/* BED77C 8024098C 00042043 */ sra $a0, $a0, 1 -/* BED780 80240990 0C00A67F */ jal rand_int -/* BED784 80240994 24840001 */ addiu $a0, $a0, 1 -/* BED788 80240998 8E430004 */ lw $v1, 4($s2) -/* BED78C 8024099C 000327C2 */ srl $a0, $v1, 0x1f -/* BED790 802409A0 00641821 */ addu $v1, $v1, $a0 -/* BED794 802409A4 00031843 */ sra $v1, $v1, 1 -/* BED798 802409A8 00621821 */ addu $v1, $v1, $v0 -/* BED79C 802409AC A603008E */ sh $v1, 0x8e($s0) -/* BED7A0 802409B0 8E2300D0 */ lw $v1, 0xd0($s1) -/* BED7A4 802409B4 C6000040 */ lwc1 $f0, 0x40($s0) -/* BED7A8 802409B8 C4640000 */ lwc1 $f4, ($v1) -/* BED7AC 802409BC 46802120 */ cvt.s.w $f4, $f4 -/* BED7B0 802409C0 C4620008 */ lwc1 $f2, 8($v1) -/* BED7B4 802409C4 468010A0 */ cvt.s.w $f2, $f2 -/* BED7B8 802409C8 E7A00010 */ swc1 $f0, 0x10($sp) -/* BED7BC 802409CC 8E2200D0 */ lw $v0, 0xd0($s1) -/* BED7C0 802409D0 44061000 */ mfc1 $a2, $f2 -/* BED7C4 802409D4 C440000C */ lwc1 $f0, 0xc($v0) -/* BED7C8 802409D8 46800020 */ cvt.s.w $f0, $f0 -/* BED7CC 802409DC E7A00014 */ swc1 $f0, 0x14($sp) -/* BED7D0 802409E0 8E2200D0 */ lw $v0, 0xd0($s1) -/* BED7D4 802409E4 44052000 */ mfc1 $a1, $f4 -/* BED7D8 802409E8 C4400010 */ lwc1 $f0, 0x10($v0) -/* BED7DC 802409EC 46800020 */ cvt.s.w $f0, $f0 -/* BED7E0 802409F0 E7A00018 */ swc1 $f0, 0x18($sp) -/* BED7E4 802409F4 8C640018 */ lw $a0, 0x18($v1) -/* BED7E8 802409F8 0C0123F5 */ jal is_point_within_region -/* BED7EC 802409FC 8E070038 */ lw $a3, 0x38($s0) -/* BED7F0 80240A00 1040000E */ beqz $v0, .L80240A3C -/* BED7F4 80240A04 00000000 */ nop -/* BED7F8 80240A08 8E2200D0 */ lw $v0, 0xd0($s1) -/* BED7FC 80240A0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BED800 80240A10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BED804 80240A14 C4460000 */ lwc1 $f6, ($v0) -/* BED808 80240A18 468031A0 */ cvt.s.w $f6, $f6 -/* BED80C 80240A1C 44063000 */ mfc1 $a2, $f6 -/* BED810 80240A20 C4460008 */ lwc1 $f6, 8($v0) -/* BED814 80240A24 468031A0 */ cvt.s.w $f6, $f6 -/* BED818 80240A28 44073000 */ mfc1 $a3, $f6 -/* BED81C 80240A2C 0C00A720 */ jal atan2 -/* BED820 80240A30 00000000 */ nop -/* BED824 80240A34 0809029B */ j .L80240A6C -/* BED828 80240A38 E600000C */ swc1 $f0, 0xc($s0) -.L80240A3C: -/* BED82C 80240A3C 0C00A67F */ jal rand_int -/* BED830 80240A40 2404003C */ addiu $a0, $zero, 0x3c -/* BED834 80240A44 C60C000C */ lwc1 $f12, 0xc($s0) -/* BED838 80240A48 44820000 */ mtc1 $v0, $f0 -/* BED83C 80240A4C 00000000 */ nop -/* BED840 80240A50 46800020 */ cvt.s.w $f0, $f0 -/* BED844 80240A54 46006300 */ add.s $f12, $f12, $f0 -/* BED848 80240A58 3C0141F0 */ lui $at, 0x41f0 -/* BED84C 80240A5C 44810000 */ mtc1 $at, $f0 -/* BED850 80240A60 0C00A6C9 */ jal clamp_angle -/* BED854 80240A64 46006301 */ sub.s $f12, $f12, $f0 -/* BED858 80240A68 E600000C */ swc1 $f0, 0xc($s0) -.L80240A6C: -/* BED85C 80240A6C 8E2200CC */ lw $v0, 0xcc($s1) -/* BED860 80240A70 8C420004 */ lw $v0, 4($v0) -/* BED864 80240A74 AE020028 */ sw $v0, 0x28($s0) -/* BED868 80240A78 AE600074 */ sw $zero, 0x74($s3) -/* BED86C 80240A7C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BED870 80240A80 8C420014 */ lw $v0, 0x14($v0) -/* BED874 80240A84 04410004 */ bgez $v0, .L80240A98 -/* BED878 80240A88 00000000 */ nop -/* BED87C 80240A8C C6400000 */ lwc1 $f0, ($s2) -/* BED880 80240A90 080902AE */ j .L80240AB8 -/* BED884 80240A94 E6000018 */ swc1 $f0, 0x18($s0) -.L80240A98: -/* BED888 80240A98 3C018024 */ lui $at, 0x8024 -/* BED88C 80240A9C D4227950 */ ldc1 $f2, 0x7950($at) -/* BED890 80240AA0 44820000 */ mtc1 $v0, $f0 -/* BED894 80240AA4 00000000 */ nop -/* BED898 80240AA8 46800021 */ cvt.d.w $f0, $f0 -/* BED89C 80240AAC 46220003 */ div.d $f0, $f0, $f2 -/* BED8A0 80240AB0 46200020 */ cvt.s.d $f0, $f0 -/* BED8A4 80240AB4 E6000018 */ swc1 $f0, 0x18($s0) -.L80240AB8: -/* BED8A8 80240AB8 C600003C */ lwc1 $f0, 0x3c($s0) -/* BED8AC 80240ABC 3C014059 */ lui $at, 0x4059 -/* BED8B0 80240AC0 44811800 */ mtc1 $at, $f3 -/* BED8B4 80240AC4 44801000 */ mtc1 $zero, $f2 -/* BED8B8 80240AC8 46000021 */ cvt.d.s $f0, $f0 -/* BED8BC 80240ACC 46220002 */ mul.d $f0, $f0, $f2 -/* BED8C0 80240AD0 00000000 */ nop -/* BED8C4 80240AD4 24020001 */ addiu $v0, $zero, 1 -/* BED8C8 80240AD8 4620018D */ trunc.w.d $f6, $f0 -/* BED8CC 80240ADC E626007C */ swc1 $f6, 0x7c($s1) -/* BED8D0 80240AE0 AE620070 */ sw $v0, 0x70($s3) -/* BED8D4 80240AE4 8FBF0030 */ lw $ra, 0x30($sp) -/* BED8D8 80240AE8 8FB3002C */ lw $s3, 0x2c($sp) -/* BED8DC 80240AEC 8FB20028 */ lw $s2, 0x28($sp) -/* BED8E0 80240AF0 8FB10024 */ lw $s1, 0x24($sp) -/* BED8E4 80240AF4 8FB00020 */ lw $s0, 0x20($sp) -/* BED8E8 80240AF8 03E00008 */ jr $ra -/* BED8EC 80240AFC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_80240B00_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_80240B00_BECDF0.s deleted file mode 100644 index 97fd3b2b29..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_80240B00_BECDF0.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B00_BED8F0 -/* BED8F0 80240B00 27BDFF80 */ addiu $sp, $sp, -0x80 -/* BED8F4 80240B04 AFB3004C */ sw $s3, 0x4c($sp) -/* BED8F8 80240B08 0080982D */ daddu $s3, $a0, $zero -/* BED8FC 80240B0C AFBF0058 */ sw $ra, 0x58($sp) -/* BED900 80240B10 AFB50054 */ sw $s5, 0x54($sp) -/* BED904 80240B14 AFB40050 */ sw $s4, 0x50($sp) -/* BED908 80240B18 AFB20048 */ sw $s2, 0x48($sp) -/* BED90C 80240B1C AFB10044 */ sw $s1, 0x44($sp) -/* BED910 80240B20 AFB00040 */ sw $s0, 0x40($sp) -/* BED914 80240B24 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* BED918 80240B28 F7B80070 */ sdc1 $f24, 0x70($sp) -/* BED91C 80240B2C F7B60068 */ sdc1 $f22, 0x68($sp) -/* BED920 80240B30 F7B40060 */ sdc1 $f20, 0x60($sp) -/* BED924 80240B34 8E710148 */ lw $s1, 0x148($s3) -/* BED928 80240B38 00A0902D */ daddu $s2, $a1, $zero -/* BED92C 80240B3C 86240008 */ lh $a0, 8($s1) -/* BED930 80240B40 0C00EABB */ jal get_npc_unsafe -/* BED934 80240B44 00C0A82D */ daddu $s5, $a2, $zero -/* BED938 80240B48 0040802D */ daddu $s0, $v0, $zero -/* BED93C 80240B4C 0000A02D */ daddu $s4, $zero, $zero -/* BED940 80240B50 C624007C */ lwc1 $f4, 0x7c($s1) -/* BED944 80240B54 46802120 */ cvt.s.w $f4, $f4 -/* BED948 80240B58 C6220088 */ lwc1 $f2, 0x88($s1) -/* BED94C 80240B5C 468010A0 */ cvt.s.w $f2, $f2 -/* BED950 80240B60 460010A1 */ cvt.d.s $f2, $f2 -/* BED954 80240B64 46002121 */ cvt.d.s $f4, $f4 -/* BED958 80240B68 C600003C */ lwc1 $f0, 0x3c($s0) -/* BED95C 80240B6C 3C014059 */ lui $at, 0x4059 -/* BED960 80240B70 44813800 */ mtc1 $at, $f7 -/* BED964 80240B74 44803000 */ mtc1 $zero, $f6 -/* BED968 80240B78 46000021 */ cvt.d.s $f0, $f0 -/* BED96C 80240B7C 46260002 */ mul.d $f0, $f0, $f6 -/* BED970 80240B80 00000000 */ nop -/* BED974 80240B84 24020001 */ addiu $v0, $zero, 1 -/* BED978 80240B88 8E24006C */ lw $a0, 0x6c($s1) -/* BED97C 80240B8C 46261083 */ div.d $f2, $f2, $f6 -/* BED980 80240B90 462010A0 */ cvt.s.d $f2, $f2 -/* BED984 80240B94 46262103 */ div.d $f4, $f4, $f6 -/* BED988 80240B98 46202520 */ cvt.s.d $f20, $f4 -/* BED98C 80240B9C 30830011 */ andi $v1, $a0, 0x11 -/* BED990 80240BA0 4620020D */ trunc.w.d $f8, $f0 -/* BED994 80240BA4 E628007C */ swc1 $f8, 0x7c($s1) -/* BED998 80240BA8 C6200078 */ lwc1 $f0, 0x78($s1) -/* BED99C 80240BAC 46800020 */ cvt.s.w $f0, $f0 -/* BED9A0 80240BB0 46000021 */ cvt.d.s $f0, $f0 -/* BED9A4 80240BB4 46260003 */ div.d $f0, $f0, $f6 -/* BED9A8 80240BB8 462006A0 */ cvt.s.d $f26, $f0 -/* BED9AC 80240BBC C6200070 */ lwc1 $f0, 0x70($s1) -/* BED9B0 80240BC0 46800020 */ cvt.s.w $f0, $f0 -/* BED9B4 80240BC4 46000021 */ cvt.d.s $f0, $f0 -/* BED9B8 80240BC8 46260003 */ div.d $f0, $f0, $f6 -/* BED9BC 80240BCC 462005A0 */ cvt.s.d $f22, $f0 -/* BED9C0 80240BD0 14620025 */ bne $v1, $v0, .L80240C68 -/* BED9C4 80240BD4 4602D600 */ add.s $f24, $f26, $f2 -/* BED9C8 80240BD8 8E020000 */ lw $v0, ($s0) -/* BED9CC 80240BDC 30420008 */ andi $v0, $v0, 8 -/* BED9D0 80240BE0 10400009 */ beqz $v0, .L80240C08 -/* BED9D4 80240BE4 27A50028 */ addiu $a1, $sp, 0x28 -/* BED9D8 80240BE8 C600003C */ lwc1 $f0, 0x3c($s0) -/* BED9DC 80240BEC 4600C001 */ sub.s $f0, $f24, $f0 -/* BED9E0 80240BF0 4600B03C */ c.lt.s $f22, $f0 -/* BED9E4 80240BF4 00000000 */ nop -/* BED9E8 80240BF8 4500001B */ bc1f .L80240C68 -/* BED9EC 80240BFC 34820010 */ ori $v0, $a0, 0x10 -/* BED9F0 80240C00 0809031A */ j .L80240C68 -/* BED9F4 80240C04 AE22006C */ sw $v0, 0x6c($s1) -.L80240C08: -/* BED9F8 80240C08 27A6002C */ addiu $a2, $sp, 0x2c -/* BED9FC 80240C0C C6000038 */ lwc1 $f0, 0x38($s0) -/* BEDA00 80240C10 C602003C */ lwc1 $f2, 0x3c($s0) -/* BEDA04 80240C14 C6040040 */ lwc1 $f4, 0x40($s0) -/* BEDA08 80240C18 3C01447A */ lui $at, 0x447a -/* BEDA0C 80240C1C 44813000 */ mtc1 $at, $f6 -/* BEDA10 80240C20 27A20034 */ addiu $v0, $sp, 0x34 -/* BEDA14 80240C24 E7A00028 */ swc1 $f0, 0x28($sp) -/* BEDA18 80240C28 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BEDA1C 80240C2C E7A40030 */ swc1 $f4, 0x30($sp) -/* BEDA20 80240C30 E7A60034 */ swc1 $f6, 0x34($sp) -/* BEDA24 80240C34 AFA20010 */ sw $v0, 0x10($sp) -/* BEDA28 80240C38 8E040080 */ lw $a0, 0x80($s0) -/* BEDA2C 80240C3C 0C0372DF */ jal func_800DCB7C -/* BEDA30 80240C40 27A70030 */ addiu $a3, $sp, 0x30 -/* BEDA34 80240C44 C7A00034 */ lwc1 $f0, 0x34($sp) -/* BEDA38 80240C48 4600D001 */ sub.s $f0, $f26, $f0 -/* BEDA3C 80240C4C 4600B03C */ c.lt.s $f22, $f0 -/* BEDA40 80240C50 00000000 */ nop -/* BEDA44 80240C54 45000004 */ bc1f .L80240C68 -/* BEDA48 80240C58 00000000 */ nop -/* BEDA4C 80240C5C 8E22006C */ lw $v0, 0x6c($s1) -/* BEDA50 80240C60 34420010 */ ori $v0, $v0, 0x10 -/* BEDA54 80240C64 AE22006C */ sw $v0, 0x6c($s1) -.L80240C68: -/* BEDA58 80240C68 8E22006C */ lw $v0, 0x6c($s1) -/* BEDA5C 80240C6C 24030011 */ addiu $v1, $zero, 0x11 -/* BEDA60 80240C70 30420011 */ andi $v0, $v0, 0x11 -/* BEDA64 80240C74 14430039 */ bne $v0, $v1, .L80240D5C -/* BEDA68 80240C78 00000000 */ nop -/* BEDA6C 80240C7C 8E020000 */ lw $v0, ($s0) -/* BEDA70 80240C80 30420008 */ andi $v0, $v0, 8 -/* BEDA74 80240C84 1040000A */ beqz $v0, .L80240CB0 -/* BEDA78 80240C88 4600C106 */ mov.s $f4, $f24 -/* BEDA7C 80240C8C 4614C081 */ sub.s $f2, $f24, $f20 -/* BEDA80 80240C90 3C018024 */ lui $at, 0x8024 -/* BEDA84 80240C94 D4207958 */ ldc1 $f0, 0x7958($at) -/* BEDA88 80240C98 460010A1 */ cvt.d.s $f2, $f2 -/* BEDA8C 80240C9C 46201082 */ mul.d $f2, $f2, $f0 -/* BEDA90 80240CA0 00000000 */ nop -/* BEDA94 80240CA4 4600A021 */ cvt.d.s $f0, $f20 -/* BEDA98 80240CA8 08090345 */ j .L80240D14 -/* BEDA9C 80240CAC 46220000 */ add.d $f0, $f0, $f2 -.L80240CB0: -/* BEDAA0 80240CB0 27A50028 */ addiu $a1, $sp, 0x28 -/* BEDAA4 80240CB4 27A6002C */ addiu $a2, $sp, 0x2c -/* BEDAA8 80240CB8 C6000038 */ lwc1 $f0, 0x38($s0) -/* BEDAAC 80240CBC C6020040 */ lwc1 $f2, 0x40($s0) -/* BEDAB0 80240CC0 3C01447A */ lui $at, 0x447a -/* BEDAB4 80240CC4 44812000 */ mtc1 $at, $f4 -/* BEDAB8 80240CC8 27A20034 */ addiu $v0, $sp, 0x34 -/* BEDABC 80240CCC E7B4002C */ swc1 $f20, 0x2c($sp) -/* BEDAC0 80240CD0 E7A00028 */ swc1 $f0, 0x28($sp) -/* BEDAC4 80240CD4 E7A20030 */ swc1 $f2, 0x30($sp) -/* BEDAC8 80240CD8 E7A40034 */ swc1 $f4, 0x34($sp) -/* BEDACC 80240CDC AFA20010 */ sw $v0, 0x10($sp) -/* BEDAD0 80240CE0 8E040080 */ lw $a0, 0x80($s0) -/* BEDAD4 80240CE4 0C0372DF */ jal func_800DCB7C -/* BEDAD8 80240CE8 27A70030 */ addiu $a3, $sp, 0x30 -/* BEDADC 80240CEC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* BEDAE0 80240CF0 461A2100 */ add.s $f4, $f4, $f26 -/* BEDAE4 80240CF4 46142081 */ sub.s $f2, $f4, $f20 -/* BEDAE8 80240CF8 3C018024 */ lui $at, 0x8024 -/* BEDAEC 80240CFC D4207960 */ ldc1 $f0, 0x7960($at) -/* BEDAF0 80240D00 460010A1 */ cvt.d.s $f2, $f2 -/* BEDAF4 80240D04 46201082 */ mul.d $f2, $f2, $f0 -/* BEDAF8 80240D08 00000000 */ nop -/* BEDAFC 80240D0C 4600A021 */ cvt.d.s $f0, $f20 -/* BEDB00 80240D10 46220000 */ add.d $f0, $f0, $f2 -.L80240D14: -/* BEDB04 80240D14 46200020 */ cvt.s.d $f0, $f0 -/* BEDB08 80240D18 E600003C */ swc1 $f0, 0x3c($s0) -/* BEDB0C 80240D1C C600003C */ lwc1 $f0, 0x3c($s0) -/* BEDB10 80240D20 46002001 */ sub.s $f0, $f4, $f0 -/* BEDB14 80240D24 3C013FF0 */ lui $at, 0x3ff0 -/* BEDB18 80240D28 44811800 */ mtc1 $at, $f3 -/* BEDB1C 80240D2C 44801000 */ mtc1 $zero, $f2 -/* BEDB20 80240D30 46000005 */ abs.s $f0, $f0 -/* BEDB24 80240D34 46000021 */ cvt.d.s $f0, $f0 -/* BEDB28 80240D38 4622003C */ c.lt.d $f0, $f2 -/* BEDB2C 80240D3C 00000000 */ nop -/* BEDB30 80240D40 45000036 */ bc1f .L80240E1C -/* BEDB34 80240D44 2403FFEF */ addiu $v1, $zero, -0x11 -/* BEDB38 80240D48 E604003C */ swc1 $f4, 0x3c($s0) -/* BEDB3C 80240D4C 8E22006C */ lw $v0, 0x6c($s1) -/* BEDB40 80240D50 00431024 */ and $v0, $v0, $v1 -/* BEDB44 80240D54 08090387 */ j .L80240E1C -/* BEDB48 80240D58 AE22006C */ sw $v0, 0x6c($s1) -.L80240D5C: -/* BEDB4C 80240D5C 8E220070 */ lw $v0, 0x70($s1) -/* BEDB50 80240D60 1840002E */ blez $v0, .L80240E1C -/* BEDB54 80240D64 00000000 */ nop -/* BEDB58 80240D68 C62C0074 */ lwc1 $f12, 0x74($s1) -/* BEDB5C 80240D6C 0C00A8BB */ jal sin_deg -/* BEDB60 80240D70 46806320 */ cvt.s.w $f12, $f12 -/* BEDB64 80240D74 8E020000 */ lw $v0, ($s0) -/* BEDB68 80240D78 30420008 */ andi $v0, $v0, 8 -/* BEDB6C 80240D7C 10400003 */ beqz $v0, .L80240D8C -/* BEDB70 80240D80 46000506 */ mov.s $f20, $f0 -/* BEDB74 80240D84 08090373 */ j .L80240DCC -/* BEDB78 80240D88 0000102D */ daddu $v0, $zero, $zero -.L80240D8C: -/* BEDB7C 80240D8C 27A50028 */ addiu $a1, $sp, 0x28 -/* BEDB80 80240D90 27A6002C */ addiu $a2, $sp, 0x2c -/* BEDB84 80240D94 C6000038 */ lwc1 $f0, 0x38($s0) -/* BEDB88 80240D98 C602003C */ lwc1 $f2, 0x3c($s0) -/* BEDB8C 80240D9C C6040040 */ lwc1 $f4, 0x40($s0) -/* BEDB90 80240DA0 3C01447A */ lui $at, 0x447a -/* BEDB94 80240DA4 44813000 */ mtc1 $at, $f6 -/* BEDB98 80240DA8 27A20034 */ addiu $v0, $sp, 0x34 -/* BEDB9C 80240DAC E7A00028 */ swc1 $f0, 0x28($sp) -/* BEDBA0 80240DB0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BEDBA4 80240DB4 E7A40030 */ swc1 $f4, 0x30($sp) -/* BEDBA8 80240DB8 E7A60034 */ swc1 $f6, 0x34($sp) -/* BEDBAC 80240DBC AFA20010 */ sw $v0, 0x10($sp) -/* BEDBB0 80240DC0 8E040080 */ lw $a0, 0x80($s0) -/* BEDBB4 80240DC4 0C0372DF */ jal func_800DCB7C -/* BEDBB8 80240DC8 27A70030 */ addiu $a3, $sp, 0x30 -.L80240DCC: -/* BEDBBC 80240DCC 10400007 */ beqz $v0, .L80240DEC -/* BEDBC0 80240DD0 00000000 */ nop -/* BEDBC4 80240DD4 4616A082 */ mul.s $f2, $f20, $f22 -/* BEDBC8 80240DD8 00000000 */ nop -/* BEDBCC 80240DDC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BEDBD0 80240DE0 461A0000 */ add.s $f0, $f0, $f26 -/* BEDBD4 80240DE4 0809037E */ j .L80240DF8 -/* BEDBD8 80240DE8 46020000 */ add.s $f0, $f0, $f2 -.L80240DEC: -/* BEDBDC 80240DEC 4616A002 */ mul.s $f0, $f20, $f22 -/* BEDBE0 80240DF0 00000000 */ nop -/* BEDBE4 80240DF4 4600C000 */ add.s $f0, $f24, $f0 -.L80240DF8: -/* BEDBE8 80240DF8 E600003C */ swc1 $f0, 0x3c($s0) -/* BEDBEC 80240DFC 8E220074 */ lw $v0, 0x74($s1) -/* BEDBF0 80240E00 2442000A */ addiu $v0, $v0, 0xa -/* BEDBF4 80240E04 44826000 */ mtc1 $v0, $f12 -/* BEDBF8 80240E08 00000000 */ nop -/* BEDBFC 80240E0C 0C00A6C9 */ jal clamp_angle -/* BEDC00 80240E10 46806320 */ cvt.s.w $f12, $f12 -/* BEDC04 80240E14 4600020D */ trunc.w.s $f8, $f0 -/* BEDC08 80240E18 E6280074 */ swc1 $f8, 0x74($s1) -.L80240E1C: -/* BEDC0C 80240E1C 8E220090 */ lw $v0, 0x90($s1) -/* BEDC10 80240E20 1C40004A */ bgtz $v0, .L80240F4C -/* BEDC14 80240E24 2442FFFF */ addiu $v0, $v0, -1 -/* BEDC18 80240E28 8E430014 */ lw $v1, 0x14($s2) -/* BEDC1C 80240E2C 04600048 */ bltz $v1, .L80240F50 -/* BEDC20 80240E30 00000000 */ nop -/* BEDC24 80240E34 8E620074 */ lw $v0, 0x74($s3) -/* BEDC28 80240E38 1C400042 */ bgtz $v0, .L80240F44 -/* BEDC2C 80240E3C 2442FFFF */ addiu $v0, $v0, -1 -/* BEDC30 80240E40 AE630074 */ sw $v1, 0x74($s3) -/* BEDC34 80240E44 860200A8 */ lh $v0, 0xa8($s0) -/* BEDC38 80240E48 C602003C */ lwc1 $f2, 0x3c($s0) -/* BEDC3C 80240E4C 44820000 */ mtc1 $v0, $f0 -/* BEDC40 80240E50 00000000 */ nop -/* BEDC44 80240E54 46800020 */ cvt.s.w $f0, $f0 -/* BEDC48 80240E58 46001080 */ add.s $f2, $f2, $f0 -/* BEDC4C 80240E5C 3C014024 */ lui $at, 0x4024 -/* BEDC50 80240E60 44810800 */ mtc1 $at, $f1 -/* BEDC54 80240E64 44800000 */ mtc1 $zero, $f0 -/* BEDC58 80240E68 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BEDC5C 80240E6C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BEDC60 80240E70 460010A1 */ cvt.d.s $f2, $f2 -/* BEDC64 80240E74 46201080 */ add.d $f2, $f2, $f0 -/* BEDC68 80240E78 C440002C */ lwc1 $f0, 0x2c($v0) -/* BEDC6C 80240E7C 46000021 */ cvt.d.s $f0, $f0 -/* BEDC70 80240E80 4622003C */ c.lt.d $f0, $f2 -/* BEDC74 80240E84 00000000 */ nop -/* BEDC78 80240E88 4500002C */ bc1f .L80240F3C -/* BEDC7C 80240E8C 02A0202D */ daddu $a0, $s5, $zero -/* BEDC80 80240E90 AFA00010 */ sw $zero, 0x10($sp) -/* BEDC84 80240E94 8E46000C */ lw $a2, 0xc($s2) -/* BEDC88 80240E98 8E470010 */ lw $a3, 0x10($s2) -/* BEDC8C 80240E9C 0C01242D */ jal func_800490B4 -/* BEDC90 80240EA0 0220282D */ daddu $a1, $s1, $zero -/* BEDC94 80240EA4 10400025 */ beqz $v0, .L80240F3C -/* BEDC98 80240EA8 0000202D */ daddu $a0, $zero, $zero -/* BEDC9C 80240EAC 0200282D */ daddu $a1, $s0, $zero -/* BEDCA0 80240EB0 0000302D */ daddu $a2, $zero, $zero -/* BEDCA4 80240EB4 2412000C */ addiu $s2, $zero, 0xc -/* BEDCA8 80240EB8 860300A8 */ lh $v1, 0xa8($s0) -/* BEDCAC 80240EBC 3C013F80 */ lui $at, 0x3f80 -/* BEDCB0 80240EC0 44810000 */ mtc1 $at, $f0 -/* BEDCB4 80240EC4 3C014000 */ lui $at, 0x4000 -/* BEDCB8 80240EC8 44811000 */ mtc1 $at, $f2 -/* BEDCBC 80240ECC 3C01C1A0 */ lui $at, 0xc1a0 -/* BEDCC0 80240ED0 44812000 */ mtc1 $at, $f4 -/* BEDCC4 80240ED4 44834000 */ mtc1 $v1, $f8 -/* BEDCC8 80240ED8 00000000 */ nop -/* BEDCCC 80240EDC 46804220 */ cvt.s.w $f8, $f8 -/* BEDCD0 80240EE0 44074000 */ mfc1 $a3, $f8 -/* BEDCD4 80240EE4 27A20038 */ addiu $v0, $sp, 0x38 -/* BEDCD8 80240EE8 AFB2001C */ sw $s2, 0x1c($sp) -/* BEDCDC 80240EEC AFA20020 */ sw $v0, 0x20($sp) -/* BEDCE0 80240EF0 E7A00010 */ swc1 $f0, 0x10($sp) -/* BEDCE4 80240EF4 E7A20014 */ swc1 $f2, 0x14($sp) -/* BEDCE8 80240EF8 0C01BFA4 */ jal fx_emote -/* BEDCEC 80240EFC E7A40018 */ swc1 $f4, 0x18($sp) -/* BEDCF0 80240F00 0200202D */ daddu $a0, $s0, $zero -/* BEDCF4 80240F04 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BEDCF8 80240F08 C480003C */ lwc1 $f0, 0x3c($a0) -/* BEDCFC 80240F0C 3C060020 */ lui $a2, 0x20 -/* BEDD00 80240F10 0C012530 */ jal func_800494C0 -/* BEDD04 80240F14 E4800064 */ swc1 $f0, 0x64($a0) -/* BEDD08 80240F18 8E220018 */ lw $v0, 0x18($s1) -/* BEDD0C 80240F1C 9442002A */ lhu $v0, 0x2a($v0) -/* BEDD10 80240F20 30420001 */ andi $v0, $v0, 1 -/* BEDD14 80240F24 10400003 */ beqz $v0, .L80240F34 -/* BEDD18 80240F28 2402000A */ addiu $v0, $zero, 0xa -/* BEDD1C 80240F2C 0809043D */ j .L802410F4 -/* BEDD20 80240F30 AE620070 */ sw $v0, 0x70($s3) -.L80240F34: -/* BEDD24 80240F34 0809043D */ j .L802410F4 -/* BEDD28 80240F38 AE720070 */ sw $s2, 0x70($s3) -.L80240F3C: -/* BEDD2C 80240F3C 8E620074 */ lw $v0, 0x74($s3) -/* BEDD30 80240F40 2442FFFF */ addiu $v0, $v0, -1 -.L80240F44: -/* BEDD34 80240F44 080903D4 */ j .L80240F50 -/* BEDD38 80240F48 AE620074 */ sw $v0, 0x74($s3) -.L80240F4C: -/* BEDD3C 80240F4C AE220090 */ sw $v0, 0x90($s1) -.L80240F50: -/* BEDD40 80240F50 8E2300D0 */ lw $v1, 0xd0($s1) -/* BEDD44 80240F54 C6000040 */ lwc1 $f0, 0x40($s0) -/* BEDD48 80240F58 C4620000 */ lwc1 $f2, ($v1) -/* BEDD4C 80240F5C 468010A0 */ cvt.s.w $f2, $f2 -/* BEDD50 80240F60 C4640008 */ lwc1 $f4, 8($v1) -/* BEDD54 80240F64 46802120 */ cvt.s.w $f4, $f4 -/* BEDD58 80240F68 E7A00010 */ swc1 $f0, 0x10($sp) -/* BEDD5C 80240F6C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BEDD60 80240F70 44051000 */ mfc1 $a1, $f2 -/* BEDD64 80240F74 C440000C */ lwc1 $f0, 0xc($v0) -/* BEDD68 80240F78 46800020 */ cvt.s.w $f0, $f0 -/* BEDD6C 80240F7C E7A00014 */ swc1 $f0, 0x14($sp) -/* BEDD70 80240F80 8E2200D0 */ lw $v0, 0xd0($s1) -/* BEDD74 80240F84 44062000 */ mfc1 $a2, $f4 -/* BEDD78 80240F88 C4400010 */ lwc1 $f0, 0x10($v0) -/* BEDD7C 80240F8C 46800020 */ cvt.s.w $f0, $f0 -/* BEDD80 80240F90 E7A00018 */ swc1 $f0, 0x18($sp) -/* BEDD84 80240F94 8C640018 */ lw $a0, 0x18($v1) -/* BEDD88 80240F98 0C0123F5 */ jal is_point_within_region -/* BEDD8C 80240F9C 8E070038 */ lw $a3, 0x38($s0) -/* BEDD90 80240FA0 1040001A */ beqz $v0, .L8024100C -/* BEDD94 80240FA4 00000000 */ nop -/* BEDD98 80240FA8 8E060038 */ lw $a2, 0x38($s0) -/* BEDD9C 80240FAC 8E2200D0 */ lw $v0, 0xd0($s1) -/* BEDDA0 80240FB0 8E070040 */ lw $a3, 0x40($s0) -/* BEDDA4 80240FB4 C44C0000 */ lwc1 $f12, ($v0) -/* BEDDA8 80240FB8 46806320 */ cvt.s.w $f12, $f12 -/* BEDDAC 80240FBC C44E0008 */ lwc1 $f14, 8($v0) -/* BEDDB0 80240FC0 0C00A7B5 */ jal dist2D -/* BEDDB4 80240FC4 468073A0 */ cvt.s.w $f14, $f14 -/* BEDDB8 80240FC8 C6020018 */ lwc1 $f2, 0x18($s0) -/* BEDDBC 80240FCC 4600103C */ c.lt.s $f2, $f0 -/* BEDDC0 80240FD0 00000000 */ nop -/* BEDDC4 80240FD4 4500000D */ bc1f .L8024100C -/* BEDDC8 80240FD8 E7A00034 */ swc1 $f0, 0x34($sp) -/* BEDDCC 80240FDC C60C0038 */ lwc1 $f12, 0x38($s0) -/* BEDDD0 80240FE0 8E2200D0 */ lw $v0, 0xd0($s1) -/* BEDDD4 80240FE4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BEDDD8 80240FE8 C4480000 */ lwc1 $f8, ($v0) -/* BEDDDC 80240FEC 46804220 */ cvt.s.w $f8, $f8 -/* BEDDE0 80240FF0 44064000 */ mfc1 $a2, $f8 -/* BEDDE4 80240FF4 C4480008 */ lwc1 $f8, 8($v0) -/* BEDDE8 80240FF8 46804220 */ cvt.s.w $f8, $f8 -/* BEDDEC 80240FFC 44074000 */ mfc1 $a3, $f8 -/* BEDDF0 80241000 0C00A720 */ jal atan2 -/* BEDDF4 80241004 24140001 */ addiu $s4, $zero, 1 -/* BEDDF8 80241008 E600000C */ swc1 $f0, 0xc($s0) -.L8024100C: -/* BEDDFC 8024100C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BEDE00 80241010 8C43000C */ lw $v1, 0xc($v0) -/* BEDE04 80241014 8C420010 */ lw $v0, 0x10($v0) -/* BEDE08 80241018 00621825 */ or $v1, $v1, $v0 -/* BEDE0C 8024101C 00741825 */ or $v1, $v1, $s4 -/* BEDE10 80241020 10600008 */ beqz $v1, .L80241044 -/* BEDE14 80241024 00000000 */ nop -/* BEDE18 80241028 8602008C */ lh $v0, 0x8c($s0) -/* BEDE1C 8024102C 14400031 */ bnez $v0, .L802410F4 -/* BEDE20 80241030 00000000 */ nop -/* BEDE24 80241034 8E050018 */ lw $a1, 0x18($s0) -/* BEDE28 80241038 8E06000C */ lw $a2, 0xc($s0) -/* BEDE2C 8024103C 0C00EA95 */ jal npc_move_heading -/* BEDE30 80241040 0200202D */ daddu $a0, $s0, $zero -.L80241044: -/* BEDE34 80241044 C600003C */ lwc1 $f0, 0x3c($s0) -/* BEDE38 80241048 3C014059 */ lui $at, 0x4059 -/* BEDE3C 8024104C 44811800 */ mtc1 $at, $f3 -/* BEDE40 80241050 44801000 */ mtc1 $zero, $f2 -/* BEDE44 80241054 46000021 */ cvt.d.s $f0, $f0 -/* BEDE48 80241058 46220002 */ mul.d $f0, $f0, $f2 -/* BEDE4C 8024105C 00000000 */ nop -/* BEDE50 80241060 4620020D */ trunc.w.d $f8, $f0 -/* BEDE54 80241064 E628007C */ swc1 $f8, 0x7c($s1) -/* BEDE58 80241068 8E420004 */ lw $v0, 4($s2) -/* BEDE5C 8024106C 18400021 */ blez $v0, .L802410F4 -/* BEDE60 80241070 00000000 */ nop -/* BEDE64 80241074 8602008E */ lh $v0, 0x8e($s0) -/* BEDE68 80241078 9603008E */ lhu $v1, 0x8e($s0) -/* BEDE6C 8024107C 18400005 */ blez $v0, .L80241094 -/* BEDE70 80241080 2462FFFF */ addiu $v0, $v1, -1 -/* BEDE74 80241084 A602008E */ sh $v0, 0x8e($s0) -/* BEDE78 80241088 00021400 */ sll $v0, $v0, 0x10 -/* BEDE7C 8024108C 1C400019 */ bgtz $v0, .L802410F4 -/* BEDE80 80241090 00000000 */ nop -.L80241094: -/* BEDE84 80241094 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BEDE88 80241098 24020002 */ addiu $v0, $zero, 2 -/* BEDE8C 8024109C 0C00A67F */ jal rand_int -/* BEDE90 802410A0 AE620070 */ sw $v0, 0x70($s3) -/* BEDE94 802410A4 3C035555 */ lui $v1, 0x5555 -/* BEDE98 802410A8 34635556 */ ori $v1, $v1, 0x5556 -/* BEDE9C 802410AC 00430018 */ mult $v0, $v1 -/* BEDEA0 802410B0 000227C3 */ sra $a0, $v0, 0x1f -/* BEDEA4 802410B4 00004010 */ mfhi $t0 -/* BEDEA8 802410B8 01042023 */ subu $a0, $t0, $a0 -/* BEDEAC 802410BC 00041840 */ sll $v1, $a0, 1 -/* BEDEB0 802410C0 00641821 */ addu $v1, $v1, $a0 -/* BEDEB4 802410C4 00431023 */ subu $v0, $v0, $v1 -/* BEDEB8 802410C8 24430002 */ addiu $v1, $v0, 2 -/* BEDEBC 802410CC AE630074 */ sw $v1, 0x74($s3) -/* BEDEC0 802410D0 8E42002C */ lw $v0, 0x2c($s2) -/* BEDEC4 802410D4 58400007 */ blezl $v0, .L802410F4 -/* BEDEC8 802410D8 AE600070 */ sw $zero, 0x70($s3) -/* BEDECC 802410DC 8E420008 */ lw $v0, 8($s2) -/* BEDED0 802410E0 18400003 */ blez $v0, .L802410F0 -/* BEDED4 802410E4 28620003 */ slti $v0, $v1, 3 -/* BEDED8 802410E8 10400002 */ beqz $v0, .L802410F4 -/* BEDEDC 802410EC 00000000 */ nop -.L802410F0: -/* BEDEE0 802410F0 AE600070 */ sw $zero, 0x70($s3) -.L802410F4: -/* BEDEE4 802410F4 8FBF0058 */ lw $ra, 0x58($sp) -/* BEDEE8 802410F8 8FB50054 */ lw $s5, 0x54($sp) -/* BEDEEC 802410FC 8FB40050 */ lw $s4, 0x50($sp) -/* BEDEF0 80241100 8FB3004C */ lw $s3, 0x4c($sp) -/* BEDEF4 80241104 8FB20048 */ lw $s2, 0x48($sp) -/* BEDEF8 80241108 8FB10044 */ lw $s1, 0x44($sp) -/* BEDEFC 8024110C 8FB00040 */ lw $s0, 0x40($sp) -/* BEDF00 80241110 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* BEDF04 80241114 D7B80070 */ ldc1 $f24, 0x70($sp) -/* BEDF08 80241118 D7B60068 */ ldc1 $f22, 0x68($sp) -/* BEDF0C 8024111C D7B40060 */ ldc1 $f20, 0x60($sp) -/* BEDF10 80241120 03E00008 */ jr $ra -/* BEDF14 80241124 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_80241128_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_80241128_BECDF0.s deleted file mode 100644 index 7c80cc7dd9..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_80241128_BECDF0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241128_BEDF18 -/* BEDF18 80241128 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BEDF1C 8024112C AFB3001C */ sw $s3, 0x1c($sp) -/* BEDF20 80241130 0080982D */ daddu $s3, $a0, $zero -/* BEDF24 80241134 AFBF0020 */ sw $ra, 0x20($sp) -/* BEDF28 80241138 AFB20018 */ sw $s2, 0x18($sp) -/* BEDF2C 8024113C AFB10014 */ sw $s1, 0x14($sp) -/* BEDF30 80241140 AFB00010 */ sw $s0, 0x10($sp) -/* BEDF34 80241144 8E720148 */ lw $s2, 0x148($s3) -/* BEDF38 80241148 86440008 */ lh $a0, 8($s2) -/* BEDF3C 8024114C 0C00EABB */ jal get_npc_unsafe -/* BEDF40 80241150 00A0882D */ daddu $s1, $a1, $zero -/* BEDF44 80241154 8E240008 */ lw $a0, 8($s1) -/* BEDF48 80241158 0040802D */ daddu $s0, $v0, $zero -/* BEDF4C 8024115C 00041FC2 */ srl $v1, $a0, 0x1f -/* BEDF50 80241160 00832021 */ addu $a0, $a0, $v1 -/* BEDF54 80241164 00042043 */ sra $a0, $a0, 1 -/* BEDF58 80241168 0C00A67F */ jal rand_int -/* BEDF5C 8024116C 24840001 */ addiu $a0, $a0, 1 -/* BEDF60 80241170 8E230008 */ lw $v1, 8($s1) -/* BEDF64 80241174 240400B4 */ addiu $a0, $zero, 0xb4 -/* BEDF68 80241178 00032FC2 */ srl $a1, $v1, 0x1f -/* BEDF6C 8024117C 00651821 */ addu $v1, $v1, $a1 -/* BEDF70 80241180 00031843 */ sra $v1, $v1, 1 -/* BEDF74 80241184 00621821 */ addu $v1, $v1, $v0 -/* BEDF78 80241188 0C00A67F */ jal rand_int -/* BEDF7C 8024118C A603008E */ sh $v1, 0x8e($s0) -/* BEDF80 80241190 C60C000C */ lwc1 $f12, 0xc($s0) -/* BEDF84 80241194 44820000 */ mtc1 $v0, $f0 -/* BEDF88 80241198 00000000 */ nop -/* BEDF8C 8024119C 46800020 */ cvt.s.w $f0, $f0 -/* BEDF90 802411A0 46006300 */ add.s $f12, $f12, $f0 -/* BEDF94 802411A4 3C0142B4 */ lui $at, 0x42b4 -/* BEDF98 802411A8 44810000 */ mtc1 $at, $f0 -/* BEDF9C 802411AC 0C00A6C9 */ jal clamp_angle -/* BEDFA0 802411B0 46006301 */ sub.s $f12, $f12, $f0 -/* BEDFA4 802411B4 E600000C */ swc1 $f0, 0xc($s0) -/* BEDFA8 802411B8 8E4200CC */ lw $v0, 0xcc($s2) -/* BEDFAC 802411BC 8C420000 */ lw $v0, ($v0) -/* BEDFB0 802411C0 AE020028 */ sw $v0, 0x28($s0) -/* BEDFB4 802411C4 24020003 */ addiu $v0, $zero, 3 -/* BEDFB8 802411C8 AE620070 */ sw $v0, 0x70($s3) -/* BEDFBC 802411CC 8FBF0020 */ lw $ra, 0x20($sp) -/* BEDFC0 802411D0 8FB3001C */ lw $s3, 0x1c($sp) -/* BEDFC4 802411D4 8FB20018 */ lw $s2, 0x18($sp) -/* BEDFC8 802411D8 8FB10014 */ lw $s1, 0x14($sp) -/* BEDFCC 802411DC 8FB00010 */ lw $s0, 0x10($sp) -/* BEDFD0 802411E0 03E00008 */ jr $ra -/* BEDFD4 802411E4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_802411E8_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_802411E8_BECDF0.s deleted file mode 100644 index 5c6f025648..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_802411E8_BECDF0.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411E8_BEDFD8 -/* BEDFD8 802411E8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* BEDFDC 802411EC AFB3004C */ sw $s3, 0x4c($sp) -/* BEDFE0 802411F0 0080982D */ daddu $s3, $a0, $zero -/* BEDFE4 802411F4 AFBF0054 */ sw $ra, 0x54($sp) -/* BEDFE8 802411F8 AFB40050 */ sw $s4, 0x50($sp) -/* BEDFEC 802411FC AFB20048 */ sw $s2, 0x48($sp) -/* BEDFF0 80241200 AFB10044 */ sw $s1, 0x44($sp) -/* BEDFF4 80241204 AFB00040 */ sw $s0, 0x40($sp) -/* BEDFF8 80241208 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* BEDFFC 8024120C F7B80068 */ sdc1 $f24, 0x68($sp) -/* BEE000 80241210 F7B60060 */ sdc1 $f22, 0x60($sp) -/* BEE004 80241214 F7B40058 */ sdc1 $f20, 0x58($sp) -/* BEE008 80241218 8E710148 */ lw $s1, 0x148($s3) -/* BEE00C 8024121C 00A0902D */ daddu $s2, $a1, $zero -/* BEE010 80241220 86240008 */ lh $a0, 8($s1) -/* BEE014 80241224 0C00EABB */ jal get_npc_unsafe -/* BEE018 80241228 00C0A02D */ daddu $s4, $a2, $zero -/* BEE01C 8024122C 0040802D */ daddu $s0, $v0, $zero -/* BEE020 80241230 C6200078 */ lwc1 $f0, 0x78($s1) -/* BEE024 80241234 46800020 */ cvt.s.w $f0, $f0 -/* BEE028 80241238 46000021 */ cvt.d.s $f0, $f0 -/* BEE02C 8024123C 3C014059 */ lui $at, 0x4059 -/* BEE030 80241240 44811800 */ mtc1 $at, $f3 -/* BEE034 80241244 44801000 */ mtc1 $zero, $f2 -/* BEE038 80241248 8602008E */ lh $v0, 0x8e($s0) -/* BEE03C 8024124C 9603008E */ lhu $v1, 0x8e($s0) -/* BEE040 80241250 46220003 */ div.d $f0, $f0, $f2 -/* BEE044 80241254 46200620 */ cvt.s.d $f24, $f0 -/* BEE048 80241258 C6200088 */ lwc1 $f0, 0x88($s1) -/* BEE04C 8024125C 46800020 */ cvt.s.w $f0, $f0 -/* BEE050 80241260 46000021 */ cvt.d.s $f0, $f0 -/* BEE054 80241264 46220003 */ div.d $f0, $f0, $f2 -/* BEE058 80241268 46200020 */ cvt.s.d $f0, $f0 -/* BEE05C 8024126C 18400003 */ blez $v0, .L8024127C -/* BEE060 80241270 4600C680 */ add.s $f26, $f24, $f0 -/* BEE064 80241274 2462FFFF */ addiu $v0, $v1, -1 -/* BEE068 80241278 A602008E */ sh $v0, 0x8e($s0) -.L8024127C: -/* BEE06C 8024127C 8E220070 */ lw $v0, 0x70($s1) -/* BEE070 80241280 18400034 */ blez $v0, .L80241354 -/* BEE074 80241284 00000000 */ nop -/* BEE078 80241288 C62C0074 */ lwc1 $f12, 0x74($s1) -/* BEE07C 8024128C 46806320 */ cvt.s.w $f12, $f12 -/* BEE080 80241290 44820000 */ mtc1 $v0, $f0 -/* BEE084 80241294 00000000 */ nop -/* BEE088 80241298 46800020 */ cvt.s.w $f0, $f0 -/* BEE08C 8024129C 46000021 */ cvt.d.s $f0, $f0 -/* BEE090 802412A0 46220003 */ div.d $f0, $f0, $f2 -/* BEE094 802412A4 0C00A8BB */ jal sin_deg -/* BEE098 802412A8 462005A0 */ cvt.s.d $f22, $f0 -/* BEE09C 802412AC 8E020000 */ lw $v0, ($s0) -/* BEE0A0 802412B0 30420008 */ andi $v0, $v0, 8 -/* BEE0A4 802412B4 10400003 */ beqz $v0, .L802412C4 -/* BEE0A8 802412B8 46000506 */ mov.s $f20, $f0 -/* BEE0AC 802412BC 080904C1 */ j .L80241304 -/* BEE0B0 802412C0 0000102D */ daddu $v0, $zero, $zero -.L802412C4: -/* BEE0B4 802412C4 27A50028 */ addiu $a1, $sp, 0x28 -/* BEE0B8 802412C8 27A6002C */ addiu $a2, $sp, 0x2c -/* BEE0BC 802412CC C6000038 */ lwc1 $f0, 0x38($s0) -/* BEE0C0 802412D0 C602003C */ lwc1 $f2, 0x3c($s0) -/* BEE0C4 802412D4 C6040040 */ lwc1 $f4, 0x40($s0) -/* BEE0C8 802412D8 3C01447A */ lui $at, 0x447a -/* BEE0CC 802412DC 44813000 */ mtc1 $at, $f6 -/* BEE0D0 802412E0 27A20034 */ addiu $v0, $sp, 0x34 -/* BEE0D4 802412E4 E7A00028 */ swc1 $f0, 0x28($sp) -/* BEE0D8 802412E8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BEE0DC 802412EC E7A40030 */ swc1 $f4, 0x30($sp) -/* BEE0E0 802412F0 E7A60034 */ swc1 $f6, 0x34($sp) -/* BEE0E4 802412F4 AFA20010 */ sw $v0, 0x10($sp) -/* BEE0E8 802412F8 8E040080 */ lw $a0, 0x80($s0) -/* BEE0EC 802412FC 0C0372DF */ jal func_800DCB7C -/* BEE0F0 80241300 27A70030 */ addiu $a3, $sp, 0x30 -.L80241304: -/* BEE0F4 80241304 10400007 */ beqz $v0, .L80241324 -/* BEE0F8 80241308 00000000 */ nop -/* BEE0FC 8024130C 4616A082 */ mul.s $f2, $f20, $f22 -/* BEE100 80241310 00000000 */ nop -/* BEE104 80241314 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BEE108 80241318 46180000 */ add.s $f0, $f0, $f24 -/* BEE10C 8024131C 080904CC */ j .L80241330 -/* BEE110 80241320 46020000 */ add.s $f0, $f0, $f2 -.L80241324: -/* BEE114 80241324 4616A002 */ mul.s $f0, $f20, $f22 -/* BEE118 80241328 00000000 */ nop -/* BEE11C 8024132C 4600D000 */ add.s $f0, $f26, $f0 -.L80241330: -/* BEE120 80241330 E600003C */ swc1 $f0, 0x3c($s0) -/* BEE124 80241334 8E220074 */ lw $v0, 0x74($s1) -/* BEE128 80241338 2442000A */ addiu $v0, $v0, 0xa -/* BEE12C 8024133C 44826000 */ mtc1 $v0, $f12 -/* BEE130 80241340 00000000 */ nop -/* BEE134 80241344 0C00A6C9 */ jal clamp_angle -/* BEE138 80241348 46806320 */ cvt.s.w $f12, $f12 -/* BEE13C 8024134C 4600020D */ trunc.w.s $f8, $f0 -/* BEE140 80241350 E6280074 */ swc1 $f8, 0x74($s1) -.L80241354: -/* BEE144 80241354 8E220090 */ lw $v0, 0x90($s1) -/* BEE148 80241358 1C400040 */ bgtz $v0, .L8024145C -/* BEE14C 8024135C 2442FFFF */ addiu $v0, $v0, -1 -/* BEE150 80241360 860200A8 */ lh $v0, 0xa8($s0) -/* BEE154 80241364 C600003C */ lwc1 $f0, 0x3c($s0) -/* BEE158 80241368 44821000 */ mtc1 $v0, $f2 -/* BEE15C 8024136C 00000000 */ nop -/* BEE160 80241370 468010A0 */ cvt.s.w $f2, $f2 -/* BEE164 80241374 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BEE168 80241378 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BEE16C 8024137C 46020000 */ add.s $f0, $f0, $f2 -/* BEE170 80241380 3C014024 */ lui $at, 0x4024 -/* BEE174 80241384 44812800 */ mtc1 $at, $f5 -/* BEE178 80241388 44802000 */ mtc1 $zero, $f4 -/* BEE17C 8024138C C442002C */ lwc1 $f2, 0x2c($v0) -/* BEE180 80241390 46000021 */ cvt.d.s $f0, $f0 -/* BEE184 80241394 46240000 */ add.d $f0, $f0, $f4 -/* BEE188 80241398 460010A1 */ cvt.d.s $f2, $f2 -/* BEE18C 8024139C 4620103C */ c.lt.d $f2, $f0 -/* BEE190 802413A0 00000000 */ nop -/* BEE194 802413A4 4500002E */ bc1f .L80241460 -/* BEE198 802413A8 0280202D */ daddu $a0, $s4, $zero -/* BEE19C 802413AC 24020001 */ addiu $v0, $zero, 1 -/* BEE1A0 802413B0 AFA20010 */ sw $v0, 0x10($sp) -/* BEE1A4 802413B4 8E460024 */ lw $a2, 0x24($s2) -/* BEE1A8 802413B8 8E470028 */ lw $a3, 0x28($s2) -/* BEE1AC 802413BC 0C01242D */ jal func_800490B4 -/* BEE1B0 802413C0 0220282D */ daddu $a1, $s1, $zero -/* BEE1B4 802413C4 10400026 */ beqz $v0, .L80241460 -/* BEE1B8 802413C8 0000202D */ daddu $a0, $zero, $zero -/* BEE1BC 802413CC 0200282D */ daddu $a1, $s0, $zero -/* BEE1C0 802413D0 0000302D */ daddu $a2, $zero, $zero -/* BEE1C4 802413D4 2412000C */ addiu $s2, $zero, 0xc -/* BEE1C8 802413D8 860300A8 */ lh $v1, 0xa8($s0) -/* BEE1CC 802413DC 3C013F80 */ lui $at, 0x3f80 -/* BEE1D0 802413E0 44810000 */ mtc1 $at, $f0 -/* BEE1D4 802413E4 3C014000 */ lui $at, 0x4000 -/* BEE1D8 802413E8 44811000 */ mtc1 $at, $f2 -/* BEE1DC 802413EC 3C01C1A0 */ lui $at, 0xc1a0 -/* BEE1E0 802413F0 44812000 */ mtc1 $at, $f4 -/* BEE1E4 802413F4 44834000 */ mtc1 $v1, $f8 -/* BEE1E8 802413F8 00000000 */ nop -/* BEE1EC 802413FC 46804220 */ cvt.s.w $f8, $f8 -/* BEE1F0 80241400 44074000 */ mfc1 $a3, $f8 -/* BEE1F4 80241404 27A20038 */ addiu $v0, $sp, 0x38 -/* BEE1F8 80241408 AFB2001C */ sw $s2, 0x1c($sp) -/* BEE1FC 8024140C AFA20020 */ sw $v0, 0x20($sp) -/* BEE200 80241410 E7A00010 */ swc1 $f0, 0x10($sp) -/* BEE204 80241414 E7A20014 */ swc1 $f2, 0x14($sp) -/* BEE208 80241418 0C01BFA4 */ jal fx_emote -/* BEE20C 8024141C E7A40018 */ swc1 $f4, 0x18($sp) -/* BEE210 80241420 0200202D */ daddu $a0, $s0, $zero -/* BEE214 80241424 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BEE218 80241428 C480003C */ lwc1 $f0, 0x3c($a0) -/* BEE21C 8024142C 3C060020 */ lui $a2, 0x20 -/* BEE220 80241430 0C012530 */ jal func_800494C0 -/* BEE224 80241434 E4800064 */ swc1 $f0, 0x64($a0) -/* BEE228 80241438 8E220018 */ lw $v0, 0x18($s1) -/* BEE22C 8024143C 9442002A */ lhu $v0, 0x2a($v0) -/* BEE230 80241440 30420001 */ andi $v0, $v0, 1 -/* BEE234 80241444 10400003 */ beqz $v0, .L80241454 -/* BEE238 80241448 2402000A */ addiu $v0, $zero, 0xa -/* BEE23C 8024144C 0809053F */ j .L802414FC -/* BEE240 80241450 AE620070 */ sw $v0, 0x70($s3) -.L80241454: -/* BEE244 80241454 0809053F */ j .L802414FC -/* BEE248 80241458 AE720070 */ sw $s2, 0x70($s3) -.L8024145C: -/* BEE24C 8024145C AE220090 */ sw $v0, 0x90($s1) -.L80241460: -/* BEE250 80241460 8602008C */ lh $v0, 0x8c($s0) -/* BEE254 80241464 14400025 */ bnez $v0, .L802414FC -/* BEE258 80241468 00000000 */ nop -/* BEE25C 8024146C 8602008E */ lh $v0, 0x8e($s0) -/* BEE260 80241470 1C400022 */ bgtz $v0, .L802414FC -/* BEE264 80241474 00000000 */ nop -/* BEE268 80241478 8E620074 */ lw $v0, 0x74($s3) -/* BEE26C 8024147C 2442FFFF */ addiu $v0, $v0, -1 -/* BEE270 80241480 1840001D */ blez $v0, .L802414F8 -/* BEE274 80241484 AE620074 */ sw $v0, 0x74($s3) -/* BEE278 80241488 8E220018 */ lw $v0, 0x18($s1) -/* BEE27C 8024148C 9442002A */ lhu $v0, 0x2a($v0) -/* BEE280 80241490 30420010 */ andi $v0, $v0, 0x10 -/* BEE284 80241494 14400007 */ bnez $v0, .L802414B4 -/* BEE288 80241498 00000000 */ nop -/* BEE28C 8024149C C600000C */ lwc1 $f0, 0xc($s0) -/* BEE290 802414A0 3C014334 */ lui $at, 0x4334 -/* BEE294 802414A4 44816000 */ mtc1 $at, $f12 -/* BEE298 802414A8 0C00A6C9 */ jal clamp_angle -/* BEE29C 802414AC 460C0300 */ add.s $f12, $f0, $f12 -/* BEE2A0 802414B0 E600000C */ swc1 $f0, 0xc($s0) -.L802414B4: -/* BEE2A4 802414B4 0C00A67F */ jal rand_int -/* BEE2A8 802414B8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BEE2AC 802414BC 3C032E8B */ lui $v1, 0x2e8b -/* BEE2B0 802414C0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* BEE2B4 802414C4 00430018 */ mult $v0, $v1 -/* BEE2B8 802414C8 00021FC3 */ sra $v1, $v0, 0x1f -/* BEE2BC 802414CC 00004010 */ mfhi $t0 -/* BEE2C0 802414D0 00082043 */ sra $a0, $t0, 1 -/* BEE2C4 802414D4 00832023 */ subu $a0, $a0, $v1 -/* BEE2C8 802414D8 00041840 */ sll $v1, $a0, 1 -/* BEE2CC 802414DC 00641821 */ addu $v1, $v1, $a0 -/* BEE2D0 802414E0 00031880 */ sll $v1, $v1, 2 -/* BEE2D4 802414E4 00641823 */ subu $v1, $v1, $a0 -/* BEE2D8 802414E8 00431023 */ subu $v0, $v0, $v1 -/* BEE2DC 802414EC 24420005 */ addiu $v0, $v0, 5 -/* BEE2E0 802414F0 0809053F */ j .L802414FC -/* BEE2E4 802414F4 A602008E */ sh $v0, 0x8e($s0) -.L802414F8: -/* BEE2E8 802414F8 AE600070 */ sw $zero, 0x70($s3) -.L802414FC: -/* BEE2EC 802414FC 8FBF0054 */ lw $ra, 0x54($sp) -/* BEE2F0 80241500 8FB40050 */ lw $s4, 0x50($sp) -/* BEE2F4 80241504 8FB3004C */ lw $s3, 0x4c($sp) -/* BEE2F8 80241508 8FB20048 */ lw $s2, 0x48($sp) -/* BEE2FC 8024150C 8FB10044 */ lw $s1, 0x44($sp) -/* BEE300 80241510 8FB00040 */ lw $s0, 0x40($sp) -/* BEE304 80241514 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* BEE308 80241518 D7B80068 */ ldc1 $f24, 0x68($sp) -/* BEE30C 8024151C D7B60060 */ ldc1 $f22, 0x60($sp) -/* BEE310 80241520 D7B40058 */ ldc1 $f20, 0x58($sp) -/* BEE314 80241524 03E00008 */ jr $ra -/* BEE318 80241528 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_802415A4_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_802415A4_BECDF0.s deleted file mode 100644 index 481e385765..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_802415A4_BECDF0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415A4_BEE394 -/* BEE394 802415A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BEE398 802415A8 AFB00010 */ sw $s0, 0x10($sp) -/* BEE39C 802415AC 0080802D */ daddu $s0, $a0, $zero -/* BEE3A0 802415B0 AFBF0014 */ sw $ra, 0x14($sp) -/* BEE3A4 802415B4 8E020148 */ lw $v0, 0x148($s0) -/* BEE3A8 802415B8 0C00EABB */ jal get_npc_unsafe -/* BEE3AC 802415BC 84440008 */ lh $a0, 8($v0) -/* BEE3B0 802415C0 9443008E */ lhu $v1, 0x8e($v0) -/* BEE3B4 802415C4 C440003C */ lwc1 $f0, 0x3c($v0) -/* BEE3B8 802415C8 24640001 */ addiu $a0, $v1, 1 -/* BEE3BC 802415CC 00031C00 */ sll $v1, $v1, 0x10 -/* BEE3C0 802415D0 00031B83 */ sra $v1, $v1, 0xe -/* BEE3C4 802415D4 A444008E */ sh $a0, 0x8e($v0) -/* BEE3C8 802415D8 3C018024 */ lui $at, 0x8024 -/* BEE3CC 802415DC 00230821 */ addu $at, $at, $v1 -/* BEE3D0 802415E0 C4223BC0 */ lwc1 $f2, 0x3bc0($at) -/* BEE3D4 802415E4 8443008E */ lh $v1, 0x8e($v0) -/* BEE3D8 802415E8 46020000 */ add.s $f0, $f0, $f2 -/* BEE3DC 802415EC 28630005 */ slti $v1, $v1, 5 -/* BEE3E0 802415F0 14600003 */ bnez $v1, .L80241600 -/* BEE3E4 802415F4 E440003C */ swc1 $f0, 0x3c($v0) -/* BEE3E8 802415F8 2402000C */ addiu $v0, $zero, 0xc -/* BEE3EC 802415FC AE020070 */ sw $v0, 0x70($s0) -.L80241600: -/* BEE3F0 80241600 8FBF0014 */ lw $ra, 0x14($sp) -/* BEE3F4 80241604 8FB00010 */ lw $s0, 0x10($sp) -/* BEE3F8 80241608 03E00008 */ jr $ra -/* BEE3FC 8024160C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_80241610_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_80241610_BECDF0.s deleted file mode 100644 index 81f069221b..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_80241610_BECDF0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241610_BEE400 -/* BEE400 80241610 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BEE404 80241614 AFB3001C */ sw $s3, 0x1c($sp) -/* BEE408 80241618 0080982D */ daddu $s3, $a0, $zero -/* BEE40C 8024161C AFBF0020 */ sw $ra, 0x20($sp) -/* BEE410 80241620 AFB20018 */ sw $s2, 0x18($sp) -/* BEE414 80241624 AFB10014 */ sw $s1, 0x14($sp) -/* BEE418 80241628 AFB00010 */ sw $s0, 0x10($sp) -/* BEE41C 8024162C 8E720148 */ lw $s2, 0x148($s3) -/* BEE420 80241630 86440008 */ lh $a0, 8($s2) -/* BEE424 80241634 0C00EABB */ jal get_npc_unsafe -/* BEE428 80241638 00A0802D */ daddu $s0, $a1, $zero -/* BEE42C 8024163C 0040882D */ daddu $s1, $v0, $zero -/* BEE430 80241640 C6420080 */ lwc1 $f2, 0x80($s2) -/* BEE434 80241644 468010A0 */ cvt.s.w $f2, $f2 -/* BEE438 80241648 460010A1 */ cvt.d.s $f2, $f2 -/* BEE43C 8024164C C6400084 */ lwc1 $f0, 0x84($s2) -/* BEE440 80241650 46800020 */ cvt.s.w $f0, $f0 -/* BEE444 80241654 46000021 */ cvt.d.s $f0, $f0 -/* BEE448 80241658 3C014059 */ lui $at, 0x4059 -/* BEE44C 8024165C 44812800 */ mtc1 $at, $f5 -/* BEE450 80241660 44802000 */ mtc1 $zero, $f4 -/* BEE454 80241664 8E4200CC */ lw $v0, 0xcc($s2) -/* BEE458 80241668 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BEE45C 8024166C C62E0040 */ lwc1 $f14, 0x40($s1) -/* BEE460 80241670 46241083 */ div.d $f2, $f2, $f4 -/* BEE464 80241674 462010A0 */ cvt.s.d $f2, $f2 -/* BEE468 80241678 46240003 */ div.d $f0, $f0, $f4 -/* BEE46C 8024167C 8C420020 */ lw $v0, 0x20($v0) -/* BEE470 80241680 46200020 */ cvt.s.d $f0, $f0 -/* BEE474 80241684 E622001C */ swc1 $f2, 0x1c($s1) -/* BEE478 80241688 E6200014 */ swc1 $f0, 0x14($s1) -/* BEE47C 8024168C AE220028 */ sw $v0, 0x28($s1) -/* BEE480 80241690 C6000018 */ lwc1 $f0, 0x18($s0) -/* BEE484 80241694 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BEE488 80241698 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BEE48C 8024169C E6200018 */ swc1 $f0, 0x18($s1) -/* BEE490 802416A0 8C460028 */ lw $a2, 0x28($v0) -/* BEE494 802416A4 0C00A720 */ jal atan2 -/* BEE498 802416A8 8C470030 */ lw $a3, 0x30($v0) -/* BEE49C 802416AC E620000C */ swc1 $f0, 0xc($s1) -/* BEE4A0 802416B0 8E420018 */ lw $v0, 0x18($s2) -/* BEE4A4 802416B4 AE400074 */ sw $zero, 0x74($s2) -/* BEE4A8 802416B8 9442002A */ lhu $v0, 0x2a($v0) -/* BEE4AC 802416BC 30420002 */ andi $v0, $v0, 2 -/* BEE4B0 802416C0 10400005 */ beqz $v0, .L802416D8 -/* BEE4B4 802416C4 24020003 */ addiu $v0, $zero, 3 -/* BEE4B8 802416C8 A622008E */ sh $v0, 0x8e($s1) -/* BEE4BC 802416CC 2402000D */ addiu $v0, $zero, 0xd -/* BEE4C0 802416D0 080905CA */ j .L80241728 -/* BEE4C4 802416D4 AE620070 */ sw $v0, 0x70($s3) -.L802416D8: -/* BEE4C8 802416D8 24030001 */ addiu $v1, $zero, 1 -/* BEE4CC 802416DC 2402000E */ addiu $v0, $zero, 0xe -/* BEE4D0 802416E0 A623008E */ sh $v1, 0x8e($s1) -/* BEE4D4 802416E4 AE620070 */ sw $v0, 0x70($s3) -/* BEE4D8 802416E8 C6200038 */ lwc1 $f0, 0x38($s1) -/* BEE4DC 802416EC 4600018D */ trunc.w.s $f6, $f0 -/* BEE4E0 802416F0 44023000 */ mfc1 $v0, $f6 -/* BEE4E4 802416F4 00000000 */ nop -/* BEE4E8 802416F8 A6420010 */ sh $v0, 0x10($s2) -/* BEE4EC 802416FC C620003C */ lwc1 $f0, 0x3c($s1) -/* BEE4F0 80241700 4600018D */ trunc.w.s $f6, $f0 -/* BEE4F4 80241704 44023000 */ mfc1 $v0, $f6 -/* BEE4F8 80241708 00000000 */ nop -/* BEE4FC 8024170C A6420012 */ sh $v0, 0x12($s2) -/* BEE500 80241710 C6200040 */ lwc1 $f0, 0x40($s1) -/* BEE504 80241714 A2430007 */ sb $v1, 7($s2) -/* BEE508 80241718 4600018D */ trunc.w.s $f6, $f0 -/* BEE50C 8024171C 44023000 */ mfc1 $v0, $f6 -/* BEE510 80241720 00000000 */ nop -/* BEE514 80241724 A6420014 */ sh $v0, 0x14($s2) -.L80241728: -/* BEE518 80241728 8FBF0020 */ lw $ra, 0x20($sp) -/* BEE51C 8024172C 8FB3001C */ lw $s3, 0x1c($sp) -/* BEE520 80241730 8FB20018 */ lw $s2, 0x18($sp) -/* BEE524 80241734 8FB10014 */ lw $s1, 0x14($sp) -/* BEE528 80241738 8FB00010 */ lw $s0, 0x10($sp) -/* BEE52C 8024173C 03E00008 */ jr $ra -/* BEE530 80241740 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_80241744_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_80241744_BECDF0.s deleted file mode 100644 index 2a5c1285fc..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_80241744_BECDF0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241744_BEE534 -/* BEE534 80241744 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BEE538 80241748 AFB00010 */ sw $s0, 0x10($sp) -/* BEE53C 8024174C 0080802D */ daddu $s0, $a0, $zero -/* BEE540 80241750 AFBF0014 */ sw $ra, 0x14($sp) -/* BEE544 80241754 8E020148 */ lw $v0, 0x148($s0) -/* BEE548 80241758 0C00EABB */ jal get_npc_unsafe -/* BEE54C 8024175C 84440008 */ lh $a0, 8($v0) -/* BEE550 80241760 0040202D */ daddu $a0, $v0, $zero -/* BEE554 80241764 8482008E */ lh $v0, 0x8e($a0) -/* BEE558 80241768 9483008E */ lhu $v1, 0x8e($a0) -/* BEE55C 8024176C 18400005 */ blez $v0, .L80241784 -/* BEE560 80241770 2462FFFF */ addiu $v0, $v1, -1 -/* BEE564 80241774 A482008E */ sh $v0, 0x8e($a0) -/* BEE568 80241778 00021400 */ sll $v0, $v0, 0x10 -/* BEE56C 8024177C 1C400006 */ bgtz $v0, .L80241798 -/* BEE570 80241780 00000000 */ nop -.L80241784: -/* BEE574 80241784 8482008C */ lh $v0, 0x8c($a0) -/* BEE578 80241788 14400003 */ bnez $v0, .L80241798 -/* BEE57C 8024178C 2402000E */ addiu $v0, $zero, 0xe -/* BEE580 80241790 A480008E */ sh $zero, 0x8e($a0) -/* BEE584 80241794 AE020070 */ sw $v0, 0x70($s0) -.L80241798: -/* BEE588 80241798 8FBF0014 */ lw $ra, 0x14($sp) -/* BEE58C 8024179C 8FB00010 */ lw $s0, 0x10($sp) -/* BEE590 802417A0 03E00008 */ jr $ra -/* BEE594 802417A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_802417A8_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_802417A8_BECDF0.s deleted file mode 100644 index b185933fa8..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_802417A8_BECDF0.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417A8_BEE598 -/* BEE598 802417A8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BEE59C 802417AC AFB20030 */ sw $s2, 0x30($sp) -/* BEE5A0 802417B0 0080902D */ daddu $s2, $a0, $zero -/* BEE5A4 802417B4 AFBF0038 */ sw $ra, 0x38($sp) -/* BEE5A8 802417B8 AFB30034 */ sw $s3, 0x34($sp) -/* BEE5AC 802417BC AFB1002C */ sw $s1, 0x2c($sp) -/* BEE5B0 802417C0 AFB00028 */ sw $s0, 0x28($sp) -/* BEE5B4 802417C4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* BEE5B8 802417C8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* BEE5BC 802417CC 8E510148 */ lw $s1, 0x148($s2) -/* BEE5C0 802417D0 86240008 */ lh $a0, 8($s1) -/* BEE5C4 802417D4 0C00EABB */ jal get_npc_unsafe -/* BEE5C8 802417D8 00A0982D */ daddu $s3, $a1, $zero -/* BEE5CC 802417DC 0040802D */ daddu $s0, $v0, $zero -/* BEE5D0 802417E0 0200202D */ daddu $a0, $s0, $zero -/* BEE5D4 802417E4 C6220088 */ lwc1 $f2, 0x88($s1) -/* BEE5D8 802417E8 468010A0 */ cvt.s.w $f2, $f2 -/* BEE5DC 802417EC 460010A1 */ cvt.d.s $f2, $f2 -/* BEE5E0 802417F0 C604001C */ lwc1 $f4, 0x1c($s0) -/* BEE5E4 802417F4 C6000014 */ lwc1 $f0, 0x14($s0) -/* BEE5E8 802417F8 8E050018 */ lw $a1, 0x18($s0) -/* BEE5EC 802417FC 46002100 */ add.s $f4, $f4, $f0 -/* BEE5F0 80241800 8E06000C */ lw $a2, 0xc($s0) -/* BEE5F4 80241804 C6200078 */ lwc1 $f0, 0x78($s1) -/* BEE5F8 80241808 46800020 */ cvt.s.w $f0, $f0 -/* BEE5FC 8024180C E604001C */ swc1 $f4, 0x1c($s0) -/* BEE600 80241810 3C014059 */ lui $at, 0x4059 -/* BEE604 80241814 44812800 */ mtc1 $at, $f5 -/* BEE608 80241818 44802000 */ mtc1 $zero, $f4 -/* BEE60C 8024181C 46000021 */ cvt.d.s $f0, $f0 -/* BEE610 80241820 46240003 */ div.d $f0, $f0, $f4 -/* BEE614 80241824 46200520 */ cvt.s.d $f20, $f0 -/* BEE618 80241828 46241083 */ div.d $f2, $f2, $f4 -/* BEE61C 8024182C 0C00EA95 */ jal npc_move_heading -/* BEE620 80241830 462015A0 */ cvt.s.d $f22, $f2 -/* BEE624 80241834 C604001C */ lwc1 $f4, 0x1c($s0) -/* BEE628 80241838 44801000 */ mtc1 $zero, $f2 -/* BEE62C 8024183C 44801800 */ mtc1 $zero, $f3 -/* BEE630 80241840 46002021 */ cvt.d.s $f0, $f4 -/* BEE634 80241844 4620103E */ c.le.d $f2, $f0 -/* BEE638 80241848 00000000 */ nop -/* BEE63C 8024184C 45000030 */ bc1f .L80241910 -/* BEE640 80241850 00000000 */ nop -/* BEE644 80241854 C600003C */ lwc1 $f0, 0x3c($s0) -/* BEE648 80241858 46040000 */ add.s $f0, $f0, $f4 -/* BEE64C 8024185C E600003C */ swc1 $f0, 0x3c($s0) -/* BEE650 80241860 8E2200CC */ lw $v0, 0xcc($s1) -/* BEE654 80241864 8C420024 */ lw $v0, 0x24($v0) -/* BEE658 80241868 AE020028 */ sw $v0, 0x28($s0) -/* BEE65C 8024186C A2200007 */ sb $zero, 7($s1) -/* BEE660 80241870 8E020000 */ lw $v0, ($s0) -/* BEE664 80241874 30420008 */ andi $v0, $v0, 8 -/* BEE668 80241878 14400011 */ bnez $v0, .L802418C0 -/* BEE66C 8024187C 0000102D */ daddu $v0, $zero, $zero -/* BEE670 80241880 27A50018 */ addiu $a1, $sp, 0x18 -/* BEE674 80241884 27A6001C */ addiu $a2, $sp, 0x1c -/* BEE678 80241888 C6000038 */ lwc1 $f0, 0x38($s0) -/* BEE67C 8024188C C602003C */ lwc1 $f2, 0x3c($s0) -/* BEE680 80241890 C6040040 */ lwc1 $f4, 0x40($s0) -/* BEE684 80241894 3C01447A */ lui $at, 0x447a -/* BEE688 80241898 44813000 */ mtc1 $at, $f6 -/* BEE68C 8024189C 27A20024 */ addiu $v0, $sp, 0x24 -/* BEE690 802418A0 E7A00018 */ swc1 $f0, 0x18($sp) -/* BEE694 802418A4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* BEE698 802418A8 E7A40020 */ swc1 $f4, 0x20($sp) -/* BEE69C 802418AC E7A60024 */ swc1 $f6, 0x24($sp) -/* BEE6A0 802418B0 AFA20010 */ sw $v0, 0x10($sp) -/* BEE6A4 802418B4 8E040080 */ lw $a0, 0x80($s0) -/* BEE6A8 802418B8 0C0372DF */ jal func_800DCB7C -/* BEE6AC 802418BC 27A70020 */ addiu $a3, $sp, 0x20 -.L802418C0: -/* BEE6B0 802418C0 1040000B */ beqz $v0, .L802418F0 -/* BEE6B4 802418C4 00000000 */ nop -/* BEE6B8 802418C8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BEE6BC 802418CC 46140080 */ add.s $f2, $f0, $f20 -/* BEE6C0 802418D0 C600003C */ lwc1 $f0, 0x3c($s0) -/* BEE6C4 802418D4 4600103E */ c.le.s $f2, $f0 -/* BEE6C8 802418D8 00000000 */ nop -/* BEE6CC 802418DC 4500008D */ bc1f .L80241B14 -/* BEE6D0 802418E0 00000000 */ nop -/* BEE6D4 802418E4 E602003C */ swc1 $f2, 0x3c($s0) -/* BEE6D8 802418E8 080906C5 */ j .L80241B14 -/* BEE6DC 802418EC AE400070 */ sw $zero, 0x70($s2) -.L802418F0: -/* BEE6E0 802418F0 C602003C */ lwc1 $f2, 0x3c($s0) -/* BEE6E4 802418F4 C6000064 */ lwc1 $f0, 0x64($s0) -/* BEE6E8 802418F8 4602003E */ c.le.s $f0, $f2 -/* BEE6EC 802418FC 00000000 */ nop -/* BEE6F0 80241900 45030084 */ bc1tl .L80241B14 -/* BEE6F4 80241904 AE400070 */ sw $zero, 0x70($s2) -/* BEE6F8 80241908 080906C5 */ j .L80241B14 -/* BEE6FC 8024190C 00000000 */ nop -.L80241910: -/* BEE700 80241910 4622003C */ c.lt.d $f0, $f2 -/* BEE704 80241914 00000000 */ nop -/* BEE708 80241918 4500007E */ bc1f .L80241B14 -/* BEE70C 8024191C 00000000 */ nop -/* BEE710 80241920 9602008E */ lhu $v0, 0x8e($s0) -/* BEE714 80241924 24420001 */ addiu $v0, $v0, 1 -/* BEE718 80241928 A602008E */ sh $v0, 0x8e($s0) -/* BEE71C 8024192C 00021400 */ sll $v0, $v0, 0x10 -/* BEE720 80241930 8E630020 */ lw $v1, 0x20($s3) -/* BEE724 80241934 00021403 */ sra $v0, $v0, 0x10 -/* BEE728 80241938 0043102A */ slt $v0, $v0, $v1 -/* BEE72C 8024193C 14400026 */ bnez $v0, .L802419D8 -/* BEE730 80241940 00000000 */ nop -/* BEE734 80241944 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BEE738 80241948 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BEE73C 8024194C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BEE740 80241950 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BEE744 80241954 A600008E */ sh $zero, 0x8e($s0) -/* BEE748 80241958 8C460028 */ lw $a2, 0x28($v0) -/* BEE74C 8024195C 0C00A720 */ jal atan2 -/* BEE750 80241960 8C470030 */ lw $a3, 0x30($v0) -/* BEE754 80241964 46000506 */ mov.s $f20, $f0 -/* BEE758 80241968 C60C000C */ lwc1 $f12, 0xc($s0) -/* BEE75C 8024196C 0C00A70A */ jal get_clamped_angle_diff -/* BEE760 80241970 4600A386 */ mov.s $f14, $f20 -/* BEE764 80241974 46000086 */ mov.s $f2, $f0 -/* BEE768 80241978 8E62001C */ lw $v0, 0x1c($s3) -/* BEE76C 8024197C 46001005 */ abs.s $f0, $f2 -/* BEE770 80241980 44822000 */ mtc1 $v0, $f4 -/* BEE774 80241984 00000000 */ nop -/* BEE778 80241988 46802120 */ cvt.s.w $f4, $f4 -/* BEE77C 8024198C 4600203C */ c.lt.s $f4, $f0 -/* BEE780 80241990 00000000 */ nop -/* BEE784 80241994 4500000D */ bc1f .L802419CC -/* BEE788 80241998 00000000 */ nop -/* BEE78C 8024199C 44800000 */ mtc1 $zero, $f0 -/* BEE790 802419A0 C614000C */ lwc1 $f20, 0xc($s0) -/* BEE794 802419A4 4600103C */ c.lt.s $f2, $f0 -/* BEE798 802419A8 00000000 */ nop -/* BEE79C 802419AC 45000006 */ bc1f .L802419C8 -/* BEE7A0 802419B0 00021023 */ negu $v0, $v0 -/* BEE7A4 802419B4 44820000 */ mtc1 $v0, $f0 -/* BEE7A8 802419B8 00000000 */ nop -/* BEE7AC 802419BC 46800020 */ cvt.s.w $f0, $f0 -/* BEE7B0 802419C0 08090673 */ j .L802419CC -/* BEE7B4 802419C4 4600A500 */ add.s $f20, $f20, $f0 -.L802419C8: -/* BEE7B8 802419C8 4604A500 */ add.s $f20, $f20, $f4 -.L802419CC: -/* BEE7BC 802419CC 0C00A6C9 */ jal clamp_angle -/* BEE7C0 802419D0 4600A306 */ mov.s $f12, $f20 -/* BEE7C4 802419D4 E600000C */ swc1 $f0, 0xc($s0) -.L802419D8: -/* BEE7C8 802419D8 8E020000 */ lw $v0, ($s0) -/* BEE7CC 802419DC 30420008 */ andi $v0, $v0, 8 -/* BEE7D0 802419E0 1040000A */ beqz $v0, .L80241A0C -/* BEE7D4 802419E4 27A50018 */ addiu $a1, $sp, 0x18 -/* BEE7D8 802419E8 C602003C */ lwc1 $f2, 0x3c($s0) -/* BEE7DC 802419EC C600001C */ lwc1 $f0, 0x1c($s0) -/* BEE7E0 802419F0 46001080 */ add.s $f2, $f2, $f0 -/* BEE7E4 802419F4 4616103C */ c.lt.s $f2, $f22 -/* BEE7E8 802419F8 00000000 */ nop -/* BEE7EC 802419FC 45020045 */ bc1fl .L80241B14 -/* BEE7F0 80241A00 E602003C */ swc1 $f2, 0x3c($s0) -/* BEE7F4 80241A04 080906C4 */ j .L80241B10 -/* BEE7F8 80241A08 E616003C */ swc1 $f22, 0x3c($s0) -.L80241A0C: -/* BEE7FC 80241A0C C6000038 */ lwc1 $f0, 0x38($s0) -/* BEE800 80241A10 27A6001C */ addiu $a2, $sp, 0x1c -/* BEE804 80241A14 E7A00018 */ swc1 $f0, 0x18($sp) -/* BEE808 80241A18 860200A8 */ lh $v0, 0xa8($s0) -/* BEE80C 80241A1C C600001C */ lwc1 $f0, 0x1c($s0) -/* BEE810 80241A20 C604003C */ lwc1 $f4, 0x3c($s0) -/* BEE814 80241A24 44821000 */ mtc1 $v0, $f2 -/* BEE818 80241A28 00000000 */ nop -/* BEE81C 80241A2C 468010A0 */ cvt.s.w $f2, $f2 -/* BEE820 80241A30 46000005 */ abs.s $f0, $f0 -/* BEE824 80241A34 46020000 */ add.s $f0, $f0, $f2 -/* BEE828 80241A38 C6060040 */ lwc1 $f6, 0x40($s0) -/* BEE82C 80241A3C 27A20024 */ addiu $v0, $sp, 0x24 -/* BEE830 80241A40 46022100 */ add.s $f4, $f4, $f2 -/* BEE834 80241A44 3C014024 */ lui $at, 0x4024 -/* BEE838 80241A48 44811800 */ mtc1 $at, $f3 -/* BEE83C 80241A4C 44801000 */ mtc1 $zero, $f2 -/* BEE840 80241A50 46000021 */ cvt.d.s $f0, $f0 -/* BEE844 80241A54 46220000 */ add.d $f0, $f0, $f2 -/* BEE848 80241A58 E7A60020 */ swc1 $f6, 0x20($sp) -/* BEE84C 80241A5C E7A4001C */ swc1 $f4, 0x1c($sp) -/* BEE850 80241A60 46200020 */ cvt.s.d $f0, $f0 -/* BEE854 80241A64 E7A00024 */ swc1 $f0, 0x24($sp) -/* BEE858 80241A68 AFA20010 */ sw $v0, 0x10($sp) -/* BEE85C 80241A6C 8E040080 */ lw $a0, 0x80($s0) -/* BEE860 80241A70 0C0372DF */ jal func_800DCB7C -/* BEE864 80241A74 27A70020 */ addiu $a3, $sp, 0x20 -/* BEE868 80241A78 10400015 */ beqz $v0, .L80241AD0 -/* BEE86C 80241A7C 00000000 */ nop -/* BEE870 80241A80 860200A8 */ lh $v0, 0xa8($s0) -/* BEE874 80241A84 C604001C */ lwc1 $f4, 0x1c($s0) -/* BEE878 80241A88 44820000 */ mtc1 $v0, $f0 -/* BEE87C 80241A8C 00000000 */ nop -/* BEE880 80241A90 46800020 */ cvt.s.w $f0, $f0 -/* BEE884 80241A94 46002085 */ abs.s $f2, $f4 -/* BEE888 80241A98 46020000 */ add.s $f0, $f0, $f2 -/* BEE88C 80241A9C C7A20024 */ lwc1 $f2, 0x24($sp) -/* BEE890 80241AA0 4600103E */ c.le.s $f2, $f0 -/* BEE894 80241AA4 00000000 */ nop -/* BEE898 80241AA8 45000005 */ bc1f .L80241AC0 -/* BEE89C 80241AAC 00000000 */ nop -/* BEE8A0 80241AB0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BEE8A4 80241AB4 AE00001C */ sw $zero, 0x1c($s0) -/* BEE8A8 80241AB8 080906C5 */ j .L80241B14 -/* BEE8AC 80241ABC E600003C */ swc1 $f0, 0x3c($s0) -.L80241AC0: -/* BEE8B0 80241AC0 C600003C */ lwc1 $f0, 0x3c($s0) -/* BEE8B4 80241AC4 46040000 */ add.s $f0, $f0, $f4 -/* BEE8B8 80241AC8 080906C5 */ j .L80241B14 -/* BEE8BC 80241ACC E600003C */ swc1 $f0, 0x3c($s0) -.L80241AD0: -/* BEE8C0 80241AD0 C606003C */ lwc1 $f6, 0x3c($s0) -/* BEE8C4 80241AD4 860200A8 */ lh $v0, 0xa8($s0) -/* BEE8C8 80241AD8 46163081 */ sub.s $f2, $f6, $f22 -/* BEE8CC 80241ADC 44820000 */ mtc1 $v0, $f0 -/* BEE8D0 80241AE0 00000000 */ nop -/* BEE8D4 80241AE4 46800020 */ cvt.s.w $f0, $f0 -/* BEE8D8 80241AE8 46001080 */ add.s $f2, $f2, $f0 -/* BEE8DC 80241AEC C604001C */ lwc1 $f4, 0x1c($s0) -/* BEE8E0 80241AF0 46002005 */ abs.s $f0, $f4 -/* BEE8E4 80241AF4 4602003C */ c.lt.s $f0, $f2 -/* BEE8E8 80241AF8 00000000 */ nop -/* BEE8EC 80241AFC 45020005 */ bc1fl .L80241B14 -/* BEE8F0 80241B00 AE00001C */ sw $zero, 0x1c($s0) -/* BEE8F4 80241B04 46043000 */ add.s $f0, $f6, $f4 -/* BEE8F8 80241B08 080906C5 */ j .L80241B14 -/* BEE8FC 80241B0C E600003C */ swc1 $f0, 0x3c($s0) -.L80241B10: -/* BEE900 80241B10 AE00001C */ sw $zero, 0x1c($s0) -.L80241B14: -/* BEE904 80241B14 8FBF0038 */ lw $ra, 0x38($sp) -/* BEE908 80241B18 8FB30034 */ lw $s3, 0x34($sp) -/* BEE90C 80241B1C 8FB20030 */ lw $s2, 0x30($sp) -/* BEE910 80241B20 8FB1002C */ lw $s1, 0x2c($sp) -/* BEE914 80241B24 8FB00028 */ lw $s0, 0x28($sp) -/* BEE918 80241B28 D7B60048 */ ldc1 $f22, 0x48($sp) -/* BEE91C 80241B2C D7B40040 */ ldc1 $f20, 0x40($sp) -/* BEE920 80241B30 03E00008 */ jr $ra -/* BEE924 80241B34 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_80241C5C_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_80241C5C_BECDF0.s deleted file mode 100644 index c8a43374bf..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_80241C5C_BECDF0.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C5C_BEEA4C -/* BEEA4C 80241C5C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BEEA50 80241C60 AFB40040 */ sw $s4, 0x40($sp) -/* BEEA54 80241C64 0080A02D */ daddu $s4, $a0, $zero -/* BEEA58 80241C68 AFBF0048 */ sw $ra, 0x48($sp) -/* BEEA5C 80241C6C AFB50044 */ sw $s5, 0x44($sp) -/* BEEA60 80241C70 AFB3003C */ sw $s3, 0x3c($sp) -/* BEEA64 80241C74 AFB20038 */ sw $s2, 0x38($sp) -/* BEEA68 80241C78 AFB10034 */ sw $s1, 0x34($sp) -/* BEEA6C 80241C7C AFB00030 */ sw $s0, 0x30($sp) -/* BEEA70 80241C80 8E920148 */ lw $s2, 0x148($s4) -/* BEEA74 80241C84 86440008 */ lh $a0, 8($s2) -/* BEEA78 80241C88 8E90000C */ lw $s0, 0xc($s4) -/* BEEA7C 80241C8C 0C00EABB */ jal get_npc_unsafe -/* BEEA80 80241C90 00A0882D */ daddu $s1, $a1, $zero -/* BEEA84 80241C94 0280202D */ daddu $a0, $s4, $zero -/* BEEA88 80241C98 8E050000 */ lw $a1, ($s0) -/* BEEA8C 80241C9C 0C0B1EAF */ jal get_variable -/* BEEA90 80241CA0 0040A82D */ daddu $s5, $v0, $zero -/* BEEA94 80241CA4 AFA00010 */ sw $zero, 0x10($sp) -/* BEEA98 80241CA8 8E4300D0 */ lw $v1, 0xd0($s2) -/* BEEA9C 80241CAC 8C630030 */ lw $v1, 0x30($v1) -/* BEEAA0 80241CB0 AFA30014 */ sw $v1, 0x14($sp) -/* BEEAA4 80241CB4 8E4300D0 */ lw $v1, 0xd0($s2) -/* BEEAA8 80241CB8 8C63001C */ lw $v1, 0x1c($v1) -/* BEEAAC 80241CBC AFA30018 */ sw $v1, 0x18($sp) -/* BEEAB0 80241CC0 8E4300D0 */ lw $v1, 0xd0($s2) -/* BEEAB4 80241CC4 8C630024 */ lw $v1, 0x24($v1) -/* BEEAB8 80241CC8 AFA3001C */ sw $v1, 0x1c($sp) -/* BEEABC 80241CCC 8E4300D0 */ lw $v1, 0xd0($s2) -/* BEEAC0 80241CD0 8C630028 */ lw $v1, 0x28($v1) -/* BEEAC4 80241CD4 27B30010 */ addiu $s3, $sp, 0x10 -/* BEEAC8 80241CD8 AFA30020 */ sw $v1, 0x20($sp) -/* BEEACC 80241CDC 8E4300D0 */ lw $v1, 0xd0($s2) -/* BEEAD0 80241CE0 3C0142F0 */ lui $at, 0x42f0 -/* BEEAD4 80241CE4 44810000 */ mtc1 $at, $f0 -/* BEEAD8 80241CE8 8C63002C */ lw $v1, 0x2c($v1) -/* BEEADC 80241CEC 0040802D */ daddu $s0, $v0, $zero -/* BEEAE0 80241CF0 E7A00028 */ swc1 $f0, 0x28($sp) -/* BEEAE4 80241CF4 A7A0002C */ sh $zero, 0x2c($sp) -/* BEEAE8 80241CF8 12200006 */ beqz $s1, .L80241D14 -/* BEEAEC 80241CFC AFA30024 */ sw $v1, 0x24($sp) -/* BEEAF0 80241D00 02A0202D */ daddu $a0, $s5, $zero -/* BEEAF4 80241D04 0240282D */ daddu $a1, $s2, $zero -/* BEEAF8 80241D08 0280302D */ daddu $a2, $s4, $zero -/* BEEAFC 80241D0C 0C0906CE */ jal func_80241B38 -/* BEEB00 80241D10 0200382D */ daddu $a3, $s0, $zero -.L80241D14: -/* BEEB04 80241D14 2402FFFE */ addiu $v0, $zero, -2 -/* BEEB08 80241D18 A2A200AB */ sb $v0, 0xab($s5) -/* BEEB0C 80241D1C 8E4300B0 */ lw $v1, 0xb0($s2) -/* BEEB10 80241D20 30620004 */ andi $v0, $v1, 4 -/* BEEB14 80241D24 10400007 */ beqz $v0, .L80241D44 -/* BEEB18 80241D28 00000000 */ nop -/* BEEB1C 80241D2C 824200B4 */ lb $v0, 0xb4($s2) -/* BEEB20 80241D30 1440003C */ bnez $v0, .L80241E24 -/* BEEB24 80241D34 0000102D */ daddu $v0, $zero, $zero -/* BEEB28 80241D38 2402FFFB */ addiu $v0, $zero, -5 -/* BEEB2C 80241D3C 00621024 */ and $v0, $v1, $v0 -/* BEEB30 80241D40 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241D44: -/* BEEB34 80241D44 8E830070 */ lw $v1, 0x70($s4) -/* BEEB38 80241D48 2C62000F */ sltiu $v0, $v1, 0xf -/* BEEB3C 80241D4C 10400034 */ beqz $v0, .L80241E20 -/* BEEB40 80241D50 00031080 */ sll $v0, $v1, 2 -/* BEEB44 80241D54 3C018024 */ lui $at, 0x8024 -/* BEEB48 80241D58 00220821 */ addu $at, $at, $v0 -/* BEEB4C 80241D5C 8C227968 */ lw $v0, 0x7968($at) -/* BEEB50 80241D60 00400008 */ jr $v0 -/* BEEB54 80241D64 00000000 */ nop -/* BEEB58 80241D68 0280202D */ daddu $a0, $s4, $zero -/* BEEB5C 80241D6C 0200282D */ daddu $a1, $s0, $zero -/* BEEB60 80241D70 0C090254 */ jal func_80240950 -/* BEEB64 80241D74 0260302D */ daddu $a2, $s3, $zero -/* BEEB68 80241D78 0280202D */ daddu $a0, $s4, $zero -/* BEEB6C 80241D7C 0200282D */ daddu $a1, $s0, $zero -/* BEEB70 80241D80 0C0902C0 */ jal func_80240B00 -/* BEEB74 80241D84 0260302D */ daddu $a2, $s3, $zero -/* BEEB78 80241D88 08090789 */ j .L80241E24 -/* BEEB7C 80241D8C 0000102D */ daddu $v0, $zero, $zero -/* BEEB80 80241D90 0280202D */ daddu $a0, $s4, $zero -/* BEEB84 80241D94 0200282D */ daddu $a1, $s0, $zero -/* BEEB88 80241D98 0C09044A */ jal func_80241128 -/* BEEB8C 80241D9C 0260302D */ daddu $a2, $s3, $zero -/* BEEB90 80241DA0 0280202D */ daddu $a0, $s4, $zero -/* BEEB94 80241DA4 0200282D */ daddu $a1, $s0, $zero -/* BEEB98 80241DA8 0C09047A */ jal func_802411E8 -/* BEEB9C 80241DAC 0260302D */ daddu $a2, $s3, $zero -/* BEEBA0 80241DB0 08090789 */ j .L80241E24 -/* BEEBA4 80241DB4 0000102D */ daddu $v0, $zero, $zero -/* BEEBA8 80241DB8 0280202D */ daddu $a0, $s4, $zero -/* BEEBAC 80241DBC 0200282D */ daddu $a1, $s0, $zero -/* BEEBB0 80241DC0 0C09054B */ jal func_8024152C -/* BEEBB4 80241DC4 0260302D */ daddu $a2, $s3, $zero -/* BEEBB8 80241DC8 0280202D */ daddu $a0, $s4, $zero -/* BEEBBC 80241DCC 0200282D */ daddu $a1, $s0, $zero -/* BEEBC0 80241DD0 0C090569 */ jal func_802415A4 -/* BEEBC4 80241DD4 0260302D */ daddu $a2, $s3, $zero -/* BEEBC8 80241DD8 08090789 */ j .L80241E24 -/* BEEBCC 80241DDC 0000102D */ daddu $v0, $zero, $zero -/* BEEBD0 80241DE0 0280202D */ daddu $a0, $s4, $zero -/* BEEBD4 80241DE4 0200282D */ daddu $a1, $s0, $zero -/* BEEBD8 80241DE8 0C090584 */ jal func_80241610 -/* BEEBDC 80241DEC 0260302D */ daddu $a2, $s3, $zero -/* BEEBE0 80241DF0 08090789 */ j .L80241E24 -/* BEEBE4 80241DF4 0000102D */ daddu $v0, $zero, $zero -/* BEEBE8 80241DF8 0280202D */ daddu $a0, $s4, $zero -/* BEEBEC 80241DFC 0200282D */ daddu $a1, $s0, $zero -/* BEEBF0 80241E00 0C0905D1 */ jal func_80241744 -/* BEEBF4 80241E04 0260302D */ daddu $a2, $s3, $zero -/* BEEBF8 80241E08 08090789 */ j .L80241E24 -/* BEEBFC 80241E0C 0000102D */ daddu $v0, $zero, $zero -/* BEEC00 80241E10 0280202D */ daddu $a0, $s4, $zero -/* BEEC04 80241E14 0200282D */ daddu $a1, $s0, $zero -/* BEEC08 80241E18 0C0905EA */ jal func_802417A8 -/* BEEC0C 80241E1C 0260302D */ daddu $a2, $s3, $zero -.L80241E20: -/* BEEC10 80241E20 0000102D */ daddu $v0, $zero, $zero -.L80241E24: -/* BEEC14 80241E24 8FBF0048 */ lw $ra, 0x48($sp) -/* BEEC18 80241E28 8FB50044 */ lw $s5, 0x44($sp) -/* BEEC1C 80241E2C 8FB40040 */ lw $s4, 0x40($sp) -/* BEEC20 80241E30 8FB3003C */ lw $s3, 0x3c($sp) -/* BEEC24 80241E34 8FB20038 */ lw $s2, 0x38($sp) -/* BEEC28 80241E38 8FB10034 */ lw $s1, 0x34($sp) -/* BEEC2C 80241E3C 8FB00030 */ lw $s0, 0x30($sp) -/* BEEC30 80241E40 03E00008 */ jr $ra -/* BEEC34 80241E44 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_arn/arn_07/func_80241E48_BECDF0.s b/asm/nonmatchings/world/area_arn/arn_07/func_80241E48_BECDF0.s deleted file mode 100644 index e992835fbe..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/func_80241E48_BECDF0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E48_BEEC38 -/* BEEC38 80241E48 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BEEC3C 80241E4C AFBF0010 */ sw $ra, 0x10($sp) -/* BEEC40 80241E50 0C03A876 */ jal set_max_SP -/* BEEC44 80241E54 24040003 */ addiu $a0, $zero, 3 -/* BEEC48 80241E58 3C028011 */ lui $v0, %hi(gPlayerData) -/* BEEC4C 80241E5C 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* BEEC50 80241E60 90430003 */ lbu $v1, 3($v0) -/* BEEC54 80241E64 90440006 */ lbu $a0, 6($v0) -/* BEEC58 80241E68 A0430002 */ sb $v1, 2($v0) -/* BEEC5C 80241E6C 0C03A6DB */ jal sync_status_menu -/* BEEC60 80241E70 A0440005 */ sb $a0, 5($v0) -/* BEEC64 80241E74 8FBF0010 */ lw $ra, 0x10($sp) -/* BEEC68 80241E78 24020002 */ addiu $v0, $zero, 2 -/* BEEC6C 80241E7C 03E00008 */ jr $ra -/* BEEC70 80241E80 27BD0018 */ addiu $sp, $sp, 0x18 -/* BEEC74 80241E84 00000000 */ nop -/* BEEC78 80241E88 00000000 */ nop -/* BEEC7C 80241E8C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_08/func_802400C0_BF47A0.s b/asm/nonmatchings/world/area_arn/arn_08/func_802400C0_BF47A0.s deleted file mode 100644 index d137264b84..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_08/func_802400C0_BF47A0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400C0_BF4860 -/* BF4860 802400C0 24020001 */ addiu $v0, $zero, 1 -/* BF4864 802400C4 3C018011 */ lui $at, %hi(gPlayerData) -/* BF4868 802400C8 A022F290 */ sb $v0, %lo(gPlayerData)($at) -/* BF486C 802400CC 03E00008 */ jr $ra -/* BF4870 802400D0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_arn/arn_08/func_802400D4_BF47A0.s b/asm/nonmatchings/world/area_arn/arn_08/func_802400D4_BF47A0.s deleted file mode 100644 index ebdba23951..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_08/func_802400D4_BF47A0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400D4_BF4874 -/* BF4874 802400D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BF4878 802400D8 AFBF0010 */ sw $ra, 0x10($sp) -/* BF487C 802400DC 0C03BCC0 */ jal func_800EF300 -/* BF4880 802400E0 00000000 */ nop -/* BF4884 802400E4 8FBF0010 */ lw $ra, 0x10($sp) -/* BF4888 802400E8 24020002 */ addiu $v0, $zero, 2 -/* BF488C 802400EC 03E00008 */ jr $ra -/* BF4890 802400F0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_08/func_802400F4_BF47A0.s b/asm/nonmatchings/world/area_arn/arn_08/func_802400F4_BF47A0.s deleted file mode 100644 index 83115fab8f..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_08/func_802400F4_BF47A0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F4_BF4894 -/* BF4894 802400F4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BF4898 802400F8 AFB00018 */ sw $s0, 0x18($sp) -/* BF489C 802400FC AFB1001C */ sw $s1, 0x1c($sp) -/* BF48A0 80240100 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* BF48A4 80240104 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* BF48A8 80240108 AFBF0020 */ sw $ra, 0x20($sp) -/* BF48AC 8024010C F7B40028 */ sdc1 $f20, 0x28($sp) -/* BF48B0 80240110 10A00002 */ beqz $a1, .L8024011C -/* BF48B4 80240114 0080802D */ daddu $s0, $a0, $zero -/* BF48B8 80240118 AE000070 */ sw $zero, 0x70($s0) -.L8024011C: -/* BF48BC 8024011C C622002C */ lwc1 $f2, 0x2c($s1) -/* BF48C0 80240120 3C01C120 */ lui $at, 0xc120 -/* BF48C4 80240124 44810000 */ mtc1 $at, $f0 -/* BF48C8 80240128 00000000 */ nop -/* BF48CC 8024012C 4602003C */ c.lt.s $f0, $f2 -/* BF48D0 80240130 00000000 */ nop -/* BF48D4 80240134 45010013 */ bc1t .L80240184 -/* BF48D8 80240138 0000102D */ daddu $v0, $zero, $zero -/* BF48DC 8024013C 0C038D36 */ jal func_800E34D8 -/* BF48E0 80240140 00000000 */ nop -/* BF48E4 80240144 46000506 */ mov.s $f20, $f0 -/* BF48E8 80240148 4600A306 */ mov.s $f12, $f20 -/* BF48EC 8024014C 0C038D45 */ jal func_800E3514 -/* BF48F0 80240150 27A50010 */ addiu $a1, $sp, 0x10 -/* BF48F4 80240154 E620002C */ swc1 $f0, 0x2c($s1) -/* BF48F8 80240158 C6000070 */ lwc1 $f0, 0x70($s0) -/* BF48FC 8024015C 46800020 */ cvt.s.w $f0, $f0 -/* BF4900 80240160 4600A505 */ abs.s $f20, $f20 -/* BF4904 80240164 46140000 */ add.s $f0, $f0, $f20 -/* BF4908 80240168 4600010D */ trunc.w.s $f4, $f0 -/* BF490C 8024016C 44032000 */ mfc1 $v1, $f4 -/* BF4910 80240170 00000000 */ nop -/* BF4914 80240174 28620033 */ slti $v0, $v1, 0x33 -/* BF4918 80240178 38420001 */ xori $v0, $v0, 1 -/* BF491C 8024017C 00021040 */ sll $v0, $v0, 1 -/* BF4920 80240180 AE030070 */ sw $v1, 0x70($s0) -.L80240184: -/* BF4924 80240184 8FBF0020 */ lw $ra, 0x20($sp) -/* BF4928 80240188 8FB1001C */ lw $s1, 0x1c($sp) -/* BF492C 8024018C 8FB00018 */ lw $s0, 0x18($sp) -/* BF4930 80240190 D7B40028 */ ldc1 $f20, 0x28($sp) -/* BF4934 80240194 03E00008 */ jr $ra -/* BF4938 80240198 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_arn/arn_08/func_8024019C_BF47A0.s b/asm/nonmatchings/world/area_arn/arn_08/func_8024019C_BF47A0.s deleted file mode 100644 index a0a992e650..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_08/func_8024019C_BF47A0.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024019C_BF493C -/* BF493C 8024019C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BF4940 802401A0 3C048024 */ lui $a0, 0x8024 -/* BF4944 802401A4 24841188 */ addiu $a0, $a0, 0x1188 -/* BF4948 802401A8 AFBF0018 */ sw $ra, 0x18($sp) -/* BF494C 802401AC AFB10014 */ sw $s1, 0x14($sp) -/* BF4950 802401B0 AFB00010 */ sw $s0, 0x10($sp) -/* BF4954 802401B4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* BF4958 802401B8 8C830000 */ lw $v1, ($a0) -/* BF495C 802401BC 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* BF4960 802401C0 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* BF4964 802401C4 28620003 */ slti $v0, $v1, 3 -/* BF4968 802401C8 50400007 */ beql $v0, $zero, .L802401E8 -/* BF496C 802401CC 24020003 */ addiu $v0, $zero, 3 -/* BF4970 802401D0 1C60000C */ bgtz $v1, .L80240204 -/* BF4974 802401D4 24620001 */ addiu $v0, $v1, 1 -/* BF4978 802401D8 10600007 */ beqz $v1, .L802401F8 -/* BF497C 802401DC 0000102D */ daddu $v0, $zero, $zero -/* BF4980 802401E0 0809009D */ j .L80240274 -/* BF4984 802401E4 00000000 */ nop -.L802401E8: -/* BF4988 802401E8 10620008 */ beq $v1, $v0, .L8024020C -/* BF498C 802401EC 0000102D */ daddu $v0, $zero, $zero -/* BF4990 802401F0 0809009D */ j .L80240274 -/* BF4994 802401F4 00000000 */ nop -.L802401F8: -/* BF4998 802401F8 24020001 */ addiu $v0, $zero, 1 -/* BF499C 802401FC 0809009C */ j .L80240270 -/* BF49A0 80240200 AC820000 */ sw $v0, ($a0) -.L80240204: -/* BF49A4 80240204 0809009C */ j .L80240270 -/* BF49A8 80240208 AC820000 */ sw $v0, ($a0) -.L8024020C: -/* BF49AC 8024020C 3C108011 */ lui $s0, 0x8011 -/* BF49B0 80240210 2610C930 */ addiu $s0, $s0, -0x36d0 -/* BF49B4 80240214 0C03BD17 */ jal clear_partner_move_history -/* BF49B8 80240218 8E040000 */ lw $a0, ($s0) -/* BF49BC 8024021C C6200028 */ lwc1 $f0, 0x28($s1) -/* BF49C0 80240220 C6220030 */ lwc1 $f2, 0x30($s1) -/* BF49C4 80240224 4600010D */ trunc.w.s $f4, $f0 -/* BF49C8 80240228 44042000 */ mfc1 $a0, $f4 -/* BF49CC 8024022C 4600110D */ trunc.w.s $f4, $f2 -/* BF49D0 80240230 44052000 */ mfc1 $a1, $f4 -/* BF49D4 80240234 0C03BCF0 */ jal func_800EF3C0 -/* BF49D8 80240238 00000000 */ nop -/* BF49DC 8024023C 0C03BCF5 */ jal func_800EF3D4 -/* BF49E0 80240240 0000202D */ daddu $a0, $zero, $zero -/* BF49E4 80240244 3C0142B4 */ lui $at, 0x42b4 -/* BF49E8 80240248 4481A000 */ mtc1 $at, $f20 -/* BF49EC 8024024C 8E040000 */ lw $a0, ($s0) -/* BF49F0 80240250 4405A000 */ mfc1 $a1, $f20 -/* BF49F4 80240254 0C00ECD0 */ jal set_npc_yaw -/* BF49F8 80240258 00000000 */ nop -/* BF49FC 8024025C 24020002 */ addiu $v0, $zero, 2 -/* BF4A00 80240260 E6340080 */ swc1 $f20, 0x80($s1) -/* BF4A04 80240264 E6340084 */ swc1 $f20, 0x84($s1) -/* BF4A08 80240268 0809009D */ j .L80240274 -/* BF4A0C 8024026C AE2000A8 */ sw $zero, 0xa8($s1) -.L80240270: -/* BF4A10 80240270 0000102D */ daddu $v0, $zero, $zero -.L80240274: -/* BF4A14 80240274 8FBF0018 */ lw $ra, 0x18($sp) -/* BF4A18 80240278 8FB10014 */ lw $s1, 0x14($sp) -/* BF4A1C 8024027C 8FB00010 */ lw $s0, 0x10($sp) -/* BF4A20 80240280 D7B40020 */ ldc1 $f20, 0x20($sp) -/* BF4A24 80240284 03E00008 */ jr $ra -/* BF4A28 80240288 27BD0028 */ addiu $sp, $sp, 0x28 -/* BF4A2C 8024028C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_00/func_80240060_BFA0A0.s b/asm/nonmatchings/world/area_dgb/dgb_00/func_80240060_BFA0A0.s deleted file mode 100644 index ff23ced951..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_00/func_80240060_BFA0A0.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240060_BFA100 -/* BFA100 80240060 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BFA104 80240064 AFBF0018 */ sw $ra, 0x18($sp) -/* BFA108 80240068 0C00FB3A */ jal get_enemy -/* BFA10C 8024006C 24040006 */ addiu $a0, $zero, 6 -/* BFA110 80240070 84440008 */ lh $a0, 8($v0) -/* BFA114 80240074 0C00EABB */ jal get_npc_unsafe -/* BFA118 80240078 00000000 */ nop -/* BFA11C 8024007C C4400040 */ lwc1 $f0, 0x40($v0) -/* BFA120 80240080 2404032E */ addiu $a0, $zero, 0x32e -/* BFA124 80240084 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFA128 80240088 8C460038 */ lw $a2, 0x38($v0) -/* BFA12C 8024008C 8C47003C */ lw $a3, 0x3c($v0) -/* BFA130 80240090 0C05267B */ jal func_801499EC -/* BFA134 80240094 0000282D */ daddu $a1, $zero, $zero -/* BFA138 80240098 8FBF0018 */ lw $ra, 0x18($sp) -/* BFA13C 8024009C 24020002 */ addiu $v0, $zero, 2 -/* BFA140 802400A0 03E00008 */ jr $ra -/* BFA144 802400A4 27BD0020 */ addiu $sp, $sp, 0x20 -/* BFA148 802400A8 00000000 */ nop -/* BFA14C 802400AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_80240040_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_80240040_BFD880.s deleted file mode 100644 index 6589436402..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_80240040_BFD880.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_BFD8C0 -/* BFD8C0 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BFD8C4 80240044 AFBF0010 */ sw $ra, 0x10($sp) -/* BFD8C8 80240048 0C04417A */ jal get_entity_by_index -/* BFD8CC 8024004C 8C840084 */ lw $a0, 0x84($a0) -/* BFD8D0 80240050 0040182D */ daddu $v1, $v0, $zero -/* BFD8D4 80240054 8C640000 */ lw $a0, ($v1) -/* BFD8D8 80240058 3C050010 */ lui $a1, 0x10 -/* BFD8DC 8024005C 00852025 */ or $a0, $a0, $a1 -/* BFD8E0 80240060 AC640000 */ sw $a0, ($v1) -/* BFD8E4 80240064 8FBF0010 */ lw $ra, 0x10($sp) -/* BFD8E8 80240068 24020002 */ addiu $v0, $zero, 2 -/* BFD8EC 8024006C 03E00008 */ jr $ra -/* BFD8F0 80240070 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_80240074_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_80240074_BFD880.s deleted file mode 100644 index fe24ca5d3f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_80240074_BFD880.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240074_BFD8F4 -/* BFD8F4 80240074 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BFD8F8 80240078 AFB20018 */ sw $s2, 0x18($sp) -/* BFD8FC 8024007C 0080902D */ daddu $s2, $a0, $zero -/* BFD900 80240080 AFBF001C */ sw $ra, 0x1c($sp) -/* BFD904 80240084 AFB10014 */ sw $s1, 0x14($sp) -/* BFD908 80240088 AFB00010 */ sw $s0, 0x10($sp) -/* BFD90C 8024008C 8E50000C */ lw $s0, 0xc($s2) -/* BFD910 80240090 8E050000 */ lw $a1, ($s0) -/* BFD914 80240094 0C0B1EAF */ jal get_variable -/* BFD918 80240098 26100004 */ addiu $s0, $s0, 4 -/* BFD91C 8024009C 0C04417A */ jal get_entity_by_index -/* BFD920 802400A0 0040202D */ daddu $a0, $v0, $zero -/* BFD924 802400A4 8E050000 */ lw $a1, ($s0) -/* BFD928 802400A8 26100004 */ addiu $s0, $s0, 4 -/* BFD92C 802400AC 0040882D */ daddu $s1, $v0, $zero -/* BFD930 802400B0 C6200048 */ lwc1 $f0, 0x48($s1) -/* BFD934 802400B4 4600008D */ trunc.w.s $f2, $f0 -/* BFD938 802400B8 44061000 */ mfc1 $a2, $f2 -/* BFD93C 802400BC 0C0B2026 */ jal set_variable -/* BFD940 802400C0 0240202D */ daddu $a0, $s2, $zero -/* BFD944 802400C4 8E050000 */ lw $a1, ($s0) -/* BFD948 802400C8 26100004 */ addiu $s0, $s0, 4 -/* BFD94C 802400CC C620004C */ lwc1 $f0, 0x4c($s1) -/* BFD950 802400D0 4600008D */ trunc.w.s $f2, $f0 -/* BFD954 802400D4 44061000 */ mfc1 $a2, $f2 -/* BFD958 802400D8 0C0B2026 */ jal set_variable -/* BFD95C 802400DC 0240202D */ daddu $a0, $s2, $zero -/* BFD960 802400E0 C6200050 */ lwc1 $f0, 0x50($s1) -/* BFD964 802400E4 8E050000 */ lw $a1, ($s0) -/* BFD968 802400E8 4600008D */ trunc.w.s $f2, $f0 -/* BFD96C 802400EC 44061000 */ mfc1 $a2, $f2 -/* BFD970 802400F0 0C0B2026 */ jal set_variable -/* BFD974 802400F4 0240202D */ daddu $a0, $s2, $zero -/* BFD978 802400F8 8FBF001C */ lw $ra, 0x1c($sp) -/* BFD97C 802400FC 8FB20018 */ lw $s2, 0x18($sp) -/* BFD980 80240100 8FB10014 */ lw $s1, 0x14($sp) -/* BFD984 80240104 8FB00010 */ lw $s0, 0x10($sp) -/* BFD988 80240108 24020002 */ addiu $v0, $zero, 2 -/* BFD98C 8024010C 03E00008 */ jr $ra -/* BFD990 80240110 27BD0020 */ addiu $sp, $sp, 0x20 -/* BFD994 80240114 00000000 */ nop -/* BFD998 80240118 00000000 */ nop -/* BFD99C 8024011C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_80240120_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_80240120_BFD880.s deleted file mode 100644 index cbf9cbf7f9..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_80240120_BFD880.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240120_BFD9A0 -/* BFD9A0 80240120 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* BFD9A4 80240124 AFB3002C */ sw $s3, 0x2c($sp) -/* BFD9A8 80240128 0080982D */ daddu $s3, $a0, $zero -/* BFD9AC 8024012C AFBF0030 */ sw $ra, 0x30($sp) -/* BFD9B0 80240130 AFB20028 */ sw $s2, 0x28($sp) -/* BFD9B4 80240134 AFB10024 */ sw $s1, 0x24($sp) -/* BFD9B8 80240138 AFB00020 */ sw $s0, 0x20($sp) -/* BFD9BC 8024013C 8E710148 */ lw $s1, 0x148($s3) -/* BFD9C0 80240140 86240008 */ lh $a0, 8($s1) -/* BFD9C4 80240144 0C00EABB */ jal get_npc_unsafe -/* BFD9C8 80240148 00A0902D */ daddu $s2, $a1, $zero -/* BFD9CC 8024014C 8E440004 */ lw $a0, 4($s2) -/* BFD9D0 80240150 0040802D */ daddu $s0, $v0, $zero -/* BFD9D4 80240154 00041FC2 */ srl $v1, $a0, 0x1f -/* BFD9D8 80240158 00832021 */ addu $a0, $a0, $v1 -/* BFD9DC 8024015C 00042043 */ sra $a0, $a0, 1 -/* BFD9E0 80240160 0C00A67F */ jal rand_int -/* BFD9E4 80240164 24840001 */ addiu $a0, $a0, 1 -/* BFD9E8 80240168 8E430004 */ lw $v1, 4($s2) -/* BFD9EC 8024016C 000327C2 */ srl $a0, $v1, 0x1f -/* BFD9F0 80240170 00641821 */ addu $v1, $v1, $a0 -/* BFD9F4 80240174 00031843 */ sra $v1, $v1, 1 -/* BFD9F8 80240178 00621821 */ addu $v1, $v1, $v0 -/* BFD9FC 8024017C A603008E */ sh $v1, 0x8e($s0) -/* BFDA00 80240180 8E2300D0 */ lw $v1, 0xd0($s1) -/* BFDA04 80240184 C6000040 */ lwc1 $f0, 0x40($s0) -/* BFDA08 80240188 C4640000 */ lwc1 $f4, ($v1) -/* BFDA0C 8024018C 46802120 */ cvt.s.w $f4, $f4 -/* BFDA10 80240190 C4620008 */ lwc1 $f2, 8($v1) -/* BFDA14 80240194 468010A0 */ cvt.s.w $f2, $f2 -/* BFDA18 80240198 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFDA1C 8024019C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFDA20 802401A0 44061000 */ mfc1 $a2, $f2 -/* BFDA24 802401A4 C440000C */ lwc1 $f0, 0xc($v0) -/* BFDA28 802401A8 46800020 */ cvt.s.w $f0, $f0 -/* BFDA2C 802401AC E7A00014 */ swc1 $f0, 0x14($sp) -/* BFDA30 802401B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFDA34 802401B4 44052000 */ mfc1 $a1, $f4 -/* BFDA38 802401B8 C4400010 */ lwc1 $f0, 0x10($v0) -/* BFDA3C 802401BC 46800020 */ cvt.s.w $f0, $f0 -/* BFDA40 802401C0 E7A00018 */ swc1 $f0, 0x18($sp) -/* BFDA44 802401C4 8C640018 */ lw $a0, 0x18($v1) -/* BFDA48 802401C8 0C0123F5 */ jal is_point_within_region -/* BFDA4C 802401CC 8E070038 */ lw $a3, 0x38($s0) -/* BFDA50 802401D0 1040000E */ beqz $v0, .L8024020C -/* BFDA54 802401D4 00000000 */ nop -/* BFDA58 802401D8 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFDA5C 802401DC C60C0038 */ lwc1 $f12, 0x38($s0) -/* BFDA60 802401E0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BFDA64 802401E4 C4460000 */ lwc1 $f6, ($v0) -/* BFDA68 802401E8 468031A0 */ cvt.s.w $f6, $f6 -/* BFDA6C 802401EC 44063000 */ mfc1 $a2, $f6 -/* BFDA70 802401F0 C4460008 */ lwc1 $f6, 8($v0) -/* BFDA74 802401F4 468031A0 */ cvt.s.w $f6, $f6 -/* BFDA78 802401F8 44073000 */ mfc1 $a3, $f6 -/* BFDA7C 802401FC 0C00A720 */ jal atan2 -/* BFDA80 80240200 00000000 */ nop -/* BFDA84 80240204 0809008F */ j .L8024023C -/* BFDA88 80240208 E600000C */ swc1 $f0, 0xc($s0) -.L8024020C: -/* BFDA8C 8024020C 0C00A67F */ jal rand_int -/* BFDA90 80240210 2404003C */ addiu $a0, $zero, 0x3c -/* BFDA94 80240214 C60C000C */ lwc1 $f12, 0xc($s0) -/* BFDA98 80240218 44820000 */ mtc1 $v0, $f0 -/* BFDA9C 8024021C 00000000 */ nop -/* BFDAA0 80240220 46800020 */ cvt.s.w $f0, $f0 -/* BFDAA4 80240224 46006300 */ add.s $f12, $f12, $f0 -/* BFDAA8 80240228 3C0141F0 */ lui $at, 0x41f0 -/* BFDAAC 8024022C 44810000 */ mtc1 $at, $f0 -/* BFDAB0 80240230 0C00A6C9 */ jal clamp_angle -/* BFDAB4 80240234 46006301 */ sub.s $f12, $f12, $f0 -/* BFDAB8 80240238 E600000C */ swc1 $f0, 0xc($s0) -.L8024023C: -/* BFDABC 8024023C 8E2200CC */ lw $v0, 0xcc($s1) -/* BFDAC0 80240240 8C420004 */ lw $v0, 4($v0) -/* BFDAC4 80240244 AE020028 */ sw $v0, 0x28($s0) -/* BFDAC8 80240248 AE600074 */ sw $zero, 0x74($s3) -/* BFDACC 8024024C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFDAD0 80240250 8C420014 */ lw $v0, 0x14($v0) -/* BFDAD4 80240254 04410004 */ bgez $v0, .L80240268 -/* BFDAD8 80240258 00000000 */ nop -/* BFDADC 8024025C C6400000 */ lwc1 $f0, ($s2) -/* BFDAE0 80240260 080900A2 */ j .L80240288 -/* BFDAE4 80240264 E6000018 */ swc1 $f0, 0x18($s0) -.L80240268: -/* BFDAE8 80240268 3C018026 */ lui $at, 0x8026 -/* BFDAEC 8024026C D4223420 */ ldc1 $f2, 0x3420($at) -/* BFDAF0 80240270 44820000 */ mtc1 $v0, $f0 -/* BFDAF4 80240274 00000000 */ nop -/* BFDAF8 80240278 46800021 */ cvt.d.w $f0, $f0 -/* BFDAFC 8024027C 46220003 */ div.d $f0, $f0, $f2 -/* BFDB00 80240280 46200020 */ cvt.s.d $f0, $f0 -/* BFDB04 80240284 E6000018 */ swc1 $f0, 0x18($s0) -.L80240288: -/* BFDB08 80240288 C600003C */ lwc1 $f0, 0x3c($s0) -/* BFDB0C 8024028C 3C014059 */ lui $at, 0x4059 -/* BFDB10 80240290 44811800 */ mtc1 $at, $f3 -/* BFDB14 80240294 44801000 */ mtc1 $zero, $f2 -/* BFDB18 80240298 46000021 */ cvt.d.s $f0, $f0 -/* BFDB1C 8024029C 46220002 */ mul.d $f0, $f0, $f2 -/* BFDB20 802402A0 00000000 */ nop -/* BFDB24 802402A4 24020001 */ addiu $v0, $zero, 1 -/* BFDB28 802402A8 4620018D */ trunc.w.d $f6, $f0 -/* BFDB2C 802402AC E626007C */ swc1 $f6, 0x7c($s1) -/* BFDB30 802402B0 AE620070 */ sw $v0, 0x70($s3) -/* BFDB34 802402B4 8FBF0030 */ lw $ra, 0x30($sp) -/* BFDB38 802402B8 8FB3002C */ lw $s3, 0x2c($sp) -/* BFDB3C 802402BC 8FB20028 */ lw $s2, 0x28($sp) -/* BFDB40 802402C0 8FB10024 */ lw $s1, 0x24($sp) -/* BFDB44 802402C4 8FB00020 */ lw $s0, 0x20($sp) -/* BFDB48 802402C8 03E00008 */ jr $ra -/* BFDB4C 802402CC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_802402D0_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_802402D0_BFD880.s deleted file mode 100644 index 67ac53345f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_802402D0_BFD880.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402D0_BFDB50 -/* BFDB50 802402D0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* BFDB54 802402D4 AFB3004C */ sw $s3, 0x4c($sp) -/* BFDB58 802402D8 0080982D */ daddu $s3, $a0, $zero -/* BFDB5C 802402DC AFBF0058 */ sw $ra, 0x58($sp) -/* BFDB60 802402E0 AFB50054 */ sw $s5, 0x54($sp) -/* BFDB64 802402E4 AFB40050 */ sw $s4, 0x50($sp) -/* BFDB68 802402E8 AFB20048 */ sw $s2, 0x48($sp) -/* BFDB6C 802402EC AFB10044 */ sw $s1, 0x44($sp) -/* BFDB70 802402F0 AFB00040 */ sw $s0, 0x40($sp) -/* BFDB74 802402F4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* BFDB78 802402F8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* BFDB7C 802402FC F7B60068 */ sdc1 $f22, 0x68($sp) -/* BFDB80 80240300 F7B40060 */ sdc1 $f20, 0x60($sp) -/* BFDB84 80240304 8E710148 */ lw $s1, 0x148($s3) -/* BFDB88 80240308 00A0902D */ daddu $s2, $a1, $zero -/* BFDB8C 8024030C 86240008 */ lh $a0, 8($s1) -/* BFDB90 80240310 0C00EABB */ jal get_npc_unsafe -/* BFDB94 80240314 00C0A82D */ daddu $s5, $a2, $zero -/* BFDB98 80240318 0040802D */ daddu $s0, $v0, $zero -/* BFDB9C 8024031C 0000A02D */ daddu $s4, $zero, $zero -/* BFDBA0 80240320 C624007C */ lwc1 $f4, 0x7c($s1) -/* BFDBA4 80240324 46802120 */ cvt.s.w $f4, $f4 -/* BFDBA8 80240328 C6220088 */ lwc1 $f2, 0x88($s1) -/* BFDBAC 8024032C 468010A0 */ cvt.s.w $f2, $f2 -/* BFDBB0 80240330 460010A1 */ cvt.d.s $f2, $f2 -/* BFDBB4 80240334 46002121 */ cvt.d.s $f4, $f4 -/* BFDBB8 80240338 C600003C */ lwc1 $f0, 0x3c($s0) -/* BFDBBC 8024033C 3C014059 */ lui $at, 0x4059 -/* BFDBC0 80240340 44813800 */ mtc1 $at, $f7 -/* BFDBC4 80240344 44803000 */ mtc1 $zero, $f6 -/* BFDBC8 80240348 46000021 */ cvt.d.s $f0, $f0 -/* BFDBCC 8024034C 46260002 */ mul.d $f0, $f0, $f6 -/* BFDBD0 80240350 00000000 */ nop -/* BFDBD4 80240354 24020001 */ addiu $v0, $zero, 1 -/* BFDBD8 80240358 8E24006C */ lw $a0, 0x6c($s1) -/* BFDBDC 8024035C 46261083 */ div.d $f2, $f2, $f6 -/* BFDBE0 80240360 462010A0 */ cvt.s.d $f2, $f2 -/* BFDBE4 80240364 46262103 */ div.d $f4, $f4, $f6 -/* BFDBE8 80240368 46202520 */ cvt.s.d $f20, $f4 -/* BFDBEC 8024036C 30830011 */ andi $v1, $a0, 0x11 -/* BFDBF0 80240370 4620020D */ trunc.w.d $f8, $f0 -/* BFDBF4 80240374 E628007C */ swc1 $f8, 0x7c($s1) -/* BFDBF8 80240378 C6200078 */ lwc1 $f0, 0x78($s1) -/* BFDBFC 8024037C 46800020 */ cvt.s.w $f0, $f0 -/* BFDC00 80240380 46000021 */ cvt.d.s $f0, $f0 -/* BFDC04 80240384 46260003 */ div.d $f0, $f0, $f6 -/* BFDC08 80240388 462006A0 */ cvt.s.d $f26, $f0 -/* BFDC0C 8024038C C6200070 */ lwc1 $f0, 0x70($s1) -/* BFDC10 80240390 46800020 */ cvt.s.w $f0, $f0 -/* BFDC14 80240394 46000021 */ cvt.d.s $f0, $f0 -/* BFDC18 80240398 46260003 */ div.d $f0, $f0, $f6 -/* BFDC1C 8024039C 462005A0 */ cvt.s.d $f22, $f0 -/* BFDC20 802403A0 14620025 */ bne $v1, $v0, .L80240438 -/* BFDC24 802403A4 4602D600 */ add.s $f24, $f26, $f2 -/* BFDC28 802403A8 8E020000 */ lw $v0, ($s0) -/* BFDC2C 802403AC 30420008 */ andi $v0, $v0, 8 -/* BFDC30 802403B0 10400009 */ beqz $v0, .L802403D8 -/* BFDC34 802403B4 27A50028 */ addiu $a1, $sp, 0x28 -/* BFDC38 802403B8 C600003C */ lwc1 $f0, 0x3c($s0) -/* BFDC3C 802403BC 4600C001 */ sub.s $f0, $f24, $f0 -/* BFDC40 802403C0 4600B03C */ c.lt.s $f22, $f0 -/* BFDC44 802403C4 00000000 */ nop -/* BFDC48 802403C8 4500001B */ bc1f .L80240438 -/* BFDC4C 802403CC 34820010 */ ori $v0, $a0, 0x10 -/* BFDC50 802403D0 0809010E */ j .L80240438 -/* BFDC54 802403D4 AE22006C */ sw $v0, 0x6c($s1) -.L802403D8: -/* BFDC58 802403D8 27A6002C */ addiu $a2, $sp, 0x2c -/* BFDC5C 802403DC C6000038 */ lwc1 $f0, 0x38($s0) -/* BFDC60 802403E0 C602003C */ lwc1 $f2, 0x3c($s0) -/* BFDC64 802403E4 C6040040 */ lwc1 $f4, 0x40($s0) -/* BFDC68 802403E8 3C01447A */ lui $at, 0x447a -/* BFDC6C 802403EC 44813000 */ mtc1 $at, $f6 -/* BFDC70 802403F0 27A20034 */ addiu $v0, $sp, 0x34 -/* BFDC74 802403F4 E7A00028 */ swc1 $f0, 0x28($sp) -/* BFDC78 802403F8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BFDC7C 802403FC E7A40030 */ swc1 $f4, 0x30($sp) -/* BFDC80 80240400 E7A60034 */ swc1 $f6, 0x34($sp) -/* BFDC84 80240404 AFA20010 */ sw $v0, 0x10($sp) -/* BFDC88 80240408 8E040080 */ lw $a0, 0x80($s0) -/* BFDC8C 8024040C 0C0372DF */ jal func_800DCB7C -/* BFDC90 80240410 27A70030 */ addiu $a3, $sp, 0x30 -/* BFDC94 80240414 C7A00034 */ lwc1 $f0, 0x34($sp) -/* BFDC98 80240418 4600D001 */ sub.s $f0, $f26, $f0 -/* BFDC9C 8024041C 4600B03C */ c.lt.s $f22, $f0 -/* BFDCA0 80240420 00000000 */ nop -/* BFDCA4 80240424 45000004 */ bc1f .L80240438 -/* BFDCA8 80240428 00000000 */ nop -/* BFDCAC 8024042C 8E22006C */ lw $v0, 0x6c($s1) -/* BFDCB0 80240430 34420010 */ ori $v0, $v0, 0x10 -/* BFDCB4 80240434 AE22006C */ sw $v0, 0x6c($s1) -.L80240438: -/* BFDCB8 80240438 8E22006C */ lw $v0, 0x6c($s1) -/* BFDCBC 8024043C 24030011 */ addiu $v1, $zero, 0x11 -/* BFDCC0 80240440 30420011 */ andi $v0, $v0, 0x11 -/* BFDCC4 80240444 14430039 */ bne $v0, $v1, .L8024052C -/* BFDCC8 80240448 00000000 */ nop -/* BFDCCC 8024044C 8E020000 */ lw $v0, ($s0) -/* BFDCD0 80240450 30420008 */ andi $v0, $v0, 8 -/* BFDCD4 80240454 1040000A */ beqz $v0, .L80240480 -/* BFDCD8 80240458 4600C106 */ mov.s $f4, $f24 -/* BFDCDC 8024045C 4614C081 */ sub.s $f2, $f24, $f20 -/* BFDCE0 80240460 3C018026 */ lui $at, 0x8026 -/* BFDCE4 80240464 D4203428 */ ldc1 $f0, 0x3428($at) -/* BFDCE8 80240468 460010A1 */ cvt.d.s $f2, $f2 -/* BFDCEC 8024046C 46201082 */ mul.d $f2, $f2, $f0 -/* BFDCF0 80240470 00000000 */ nop -/* BFDCF4 80240474 4600A021 */ cvt.d.s $f0, $f20 -/* BFDCF8 80240478 08090139 */ j .L802404E4 -/* BFDCFC 8024047C 46220000 */ add.d $f0, $f0, $f2 -.L80240480: -/* BFDD00 80240480 27A50028 */ addiu $a1, $sp, 0x28 -/* BFDD04 80240484 27A6002C */ addiu $a2, $sp, 0x2c -/* BFDD08 80240488 C6000038 */ lwc1 $f0, 0x38($s0) -/* BFDD0C 8024048C C6020040 */ lwc1 $f2, 0x40($s0) -/* BFDD10 80240490 3C01447A */ lui $at, 0x447a -/* BFDD14 80240494 44812000 */ mtc1 $at, $f4 -/* BFDD18 80240498 27A20034 */ addiu $v0, $sp, 0x34 -/* BFDD1C 8024049C E7B4002C */ swc1 $f20, 0x2c($sp) -/* BFDD20 802404A0 E7A00028 */ swc1 $f0, 0x28($sp) -/* BFDD24 802404A4 E7A20030 */ swc1 $f2, 0x30($sp) -/* BFDD28 802404A8 E7A40034 */ swc1 $f4, 0x34($sp) -/* BFDD2C 802404AC AFA20010 */ sw $v0, 0x10($sp) -/* BFDD30 802404B0 8E040080 */ lw $a0, 0x80($s0) -/* BFDD34 802404B4 0C0372DF */ jal func_800DCB7C -/* BFDD38 802404B8 27A70030 */ addiu $a3, $sp, 0x30 -/* BFDD3C 802404BC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* BFDD40 802404C0 461A2100 */ add.s $f4, $f4, $f26 -/* BFDD44 802404C4 46142081 */ sub.s $f2, $f4, $f20 -/* BFDD48 802404C8 3C018026 */ lui $at, 0x8026 -/* BFDD4C 802404CC D4203430 */ ldc1 $f0, 0x3430($at) -/* BFDD50 802404D0 460010A1 */ cvt.d.s $f2, $f2 -/* BFDD54 802404D4 46201082 */ mul.d $f2, $f2, $f0 -/* BFDD58 802404D8 00000000 */ nop -/* BFDD5C 802404DC 4600A021 */ cvt.d.s $f0, $f20 -/* BFDD60 802404E0 46220000 */ add.d $f0, $f0, $f2 -.L802404E4: -/* BFDD64 802404E4 46200020 */ cvt.s.d $f0, $f0 -/* BFDD68 802404E8 E600003C */ swc1 $f0, 0x3c($s0) -/* BFDD6C 802404EC C600003C */ lwc1 $f0, 0x3c($s0) -/* BFDD70 802404F0 46002001 */ sub.s $f0, $f4, $f0 -/* BFDD74 802404F4 3C013FF0 */ lui $at, 0x3ff0 -/* BFDD78 802404F8 44811800 */ mtc1 $at, $f3 -/* BFDD7C 802404FC 44801000 */ mtc1 $zero, $f2 -/* BFDD80 80240500 46000005 */ abs.s $f0, $f0 -/* BFDD84 80240504 46000021 */ cvt.d.s $f0, $f0 -/* BFDD88 80240508 4622003C */ c.lt.d $f0, $f2 -/* BFDD8C 8024050C 00000000 */ nop -/* BFDD90 80240510 45000036 */ bc1f .L802405EC -/* BFDD94 80240514 2403FFEF */ addiu $v1, $zero, -0x11 -/* BFDD98 80240518 E604003C */ swc1 $f4, 0x3c($s0) -/* BFDD9C 8024051C 8E22006C */ lw $v0, 0x6c($s1) -/* BFDDA0 80240520 00431024 */ and $v0, $v0, $v1 -/* BFDDA4 80240524 0809017B */ j .L802405EC -/* BFDDA8 80240528 AE22006C */ sw $v0, 0x6c($s1) -.L8024052C: -/* BFDDAC 8024052C 8E220070 */ lw $v0, 0x70($s1) -/* BFDDB0 80240530 1840002E */ blez $v0, .L802405EC -/* BFDDB4 80240534 00000000 */ nop -/* BFDDB8 80240538 C62C0074 */ lwc1 $f12, 0x74($s1) -/* BFDDBC 8024053C 0C00A8BB */ jal sin_deg -/* BFDDC0 80240540 46806320 */ cvt.s.w $f12, $f12 -/* BFDDC4 80240544 8E020000 */ lw $v0, ($s0) -/* BFDDC8 80240548 30420008 */ andi $v0, $v0, 8 -/* BFDDCC 8024054C 10400003 */ beqz $v0, .L8024055C -/* BFDDD0 80240550 46000506 */ mov.s $f20, $f0 -/* BFDDD4 80240554 08090167 */ j .L8024059C -/* BFDDD8 80240558 0000102D */ daddu $v0, $zero, $zero -.L8024055C: -/* BFDDDC 8024055C 27A50028 */ addiu $a1, $sp, 0x28 -/* BFDDE0 80240560 27A6002C */ addiu $a2, $sp, 0x2c -/* BFDDE4 80240564 C6000038 */ lwc1 $f0, 0x38($s0) -/* BFDDE8 80240568 C602003C */ lwc1 $f2, 0x3c($s0) -/* BFDDEC 8024056C C6040040 */ lwc1 $f4, 0x40($s0) -/* BFDDF0 80240570 3C01447A */ lui $at, 0x447a -/* BFDDF4 80240574 44813000 */ mtc1 $at, $f6 -/* BFDDF8 80240578 27A20034 */ addiu $v0, $sp, 0x34 -/* BFDDFC 8024057C E7A00028 */ swc1 $f0, 0x28($sp) -/* BFDE00 80240580 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BFDE04 80240584 E7A40030 */ swc1 $f4, 0x30($sp) -/* BFDE08 80240588 E7A60034 */ swc1 $f6, 0x34($sp) -/* BFDE0C 8024058C AFA20010 */ sw $v0, 0x10($sp) -/* BFDE10 80240590 8E040080 */ lw $a0, 0x80($s0) -/* BFDE14 80240594 0C0372DF */ jal func_800DCB7C -/* BFDE18 80240598 27A70030 */ addiu $a3, $sp, 0x30 -.L8024059C: -/* BFDE1C 8024059C 10400007 */ beqz $v0, .L802405BC -/* BFDE20 802405A0 00000000 */ nop -/* BFDE24 802405A4 4616A082 */ mul.s $f2, $f20, $f22 -/* BFDE28 802405A8 00000000 */ nop -/* BFDE2C 802405AC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BFDE30 802405B0 461A0000 */ add.s $f0, $f0, $f26 -/* BFDE34 802405B4 08090172 */ j .L802405C8 -/* BFDE38 802405B8 46020000 */ add.s $f0, $f0, $f2 -.L802405BC: -/* BFDE3C 802405BC 4616A002 */ mul.s $f0, $f20, $f22 -/* BFDE40 802405C0 00000000 */ nop -/* BFDE44 802405C4 4600C000 */ add.s $f0, $f24, $f0 -.L802405C8: -/* BFDE48 802405C8 E600003C */ swc1 $f0, 0x3c($s0) -/* BFDE4C 802405CC 8E220074 */ lw $v0, 0x74($s1) -/* BFDE50 802405D0 2442000A */ addiu $v0, $v0, 0xa -/* BFDE54 802405D4 44826000 */ mtc1 $v0, $f12 -/* BFDE58 802405D8 00000000 */ nop -/* BFDE5C 802405DC 0C00A6C9 */ jal clamp_angle -/* BFDE60 802405E0 46806320 */ cvt.s.w $f12, $f12 -/* BFDE64 802405E4 4600020D */ trunc.w.s $f8, $f0 -/* BFDE68 802405E8 E6280074 */ swc1 $f8, 0x74($s1) -.L802405EC: -/* BFDE6C 802405EC 8E220090 */ lw $v0, 0x90($s1) -/* BFDE70 802405F0 1C40004A */ bgtz $v0, .L8024071C -/* BFDE74 802405F4 2442FFFF */ addiu $v0, $v0, -1 -/* BFDE78 802405F8 8E430014 */ lw $v1, 0x14($s2) -/* BFDE7C 802405FC 04600048 */ bltz $v1, .L80240720 -/* BFDE80 80240600 00000000 */ nop -/* BFDE84 80240604 8E620074 */ lw $v0, 0x74($s3) -/* BFDE88 80240608 1C400042 */ bgtz $v0, .L80240714 -/* BFDE8C 8024060C 2442FFFF */ addiu $v0, $v0, -1 -/* BFDE90 80240610 AE630074 */ sw $v1, 0x74($s3) -/* BFDE94 80240614 860200A8 */ lh $v0, 0xa8($s0) -/* BFDE98 80240618 C602003C */ lwc1 $f2, 0x3c($s0) -/* BFDE9C 8024061C 44820000 */ mtc1 $v0, $f0 -/* BFDEA0 80240620 00000000 */ nop -/* BFDEA4 80240624 46800020 */ cvt.s.w $f0, $f0 -/* BFDEA8 80240628 46001080 */ add.s $f2, $f2, $f0 -/* BFDEAC 8024062C 3C014024 */ lui $at, 0x4024 -/* BFDEB0 80240630 44810800 */ mtc1 $at, $f1 -/* BFDEB4 80240634 44800000 */ mtc1 $zero, $f0 -/* BFDEB8 80240638 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BFDEBC 8024063C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BFDEC0 80240640 460010A1 */ cvt.d.s $f2, $f2 -/* BFDEC4 80240644 46201080 */ add.d $f2, $f2, $f0 -/* BFDEC8 80240648 C440002C */ lwc1 $f0, 0x2c($v0) -/* BFDECC 8024064C 46000021 */ cvt.d.s $f0, $f0 -/* BFDED0 80240650 4622003C */ c.lt.d $f0, $f2 -/* BFDED4 80240654 00000000 */ nop -/* BFDED8 80240658 4500002C */ bc1f .L8024070C -/* BFDEDC 8024065C 02A0202D */ daddu $a0, $s5, $zero -/* BFDEE0 80240660 AFA00010 */ sw $zero, 0x10($sp) -/* BFDEE4 80240664 8E46000C */ lw $a2, 0xc($s2) -/* BFDEE8 80240668 8E470010 */ lw $a3, 0x10($s2) -/* BFDEEC 8024066C 0C01242D */ jal func_800490B4 -/* BFDEF0 80240670 0220282D */ daddu $a1, $s1, $zero -/* BFDEF4 80240674 10400025 */ beqz $v0, .L8024070C -/* BFDEF8 80240678 0000202D */ daddu $a0, $zero, $zero -/* BFDEFC 8024067C 0200282D */ daddu $a1, $s0, $zero -/* BFDF00 80240680 0000302D */ daddu $a2, $zero, $zero -/* BFDF04 80240684 2412000C */ addiu $s2, $zero, 0xc -/* BFDF08 80240688 860300A8 */ lh $v1, 0xa8($s0) -/* BFDF0C 8024068C 3C013F80 */ lui $at, 0x3f80 -/* BFDF10 80240690 44810000 */ mtc1 $at, $f0 -/* BFDF14 80240694 3C014000 */ lui $at, 0x4000 -/* BFDF18 80240698 44811000 */ mtc1 $at, $f2 -/* BFDF1C 8024069C 3C01C1A0 */ lui $at, 0xc1a0 -/* BFDF20 802406A0 44812000 */ mtc1 $at, $f4 -/* BFDF24 802406A4 44834000 */ mtc1 $v1, $f8 -/* BFDF28 802406A8 00000000 */ nop -/* BFDF2C 802406AC 46804220 */ cvt.s.w $f8, $f8 -/* BFDF30 802406B0 44074000 */ mfc1 $a3, $f8 -/* BFDF34 802406B4 27A20038 */ addiu $v0, $sp, 0x38 -/* BFDF38 802406B8 AFB2001C */ sw $s2, 0x1c($sp) -/* BFDF3C 802406BC AFA20020 */ sw $v0, 0x20($sp) -/* BFDF40 802406C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFDF44 802406C4 E7A20014 */ swc1 $f2, 0x14($sp) -/* BFDF48 802406C8 0C01BFA4 */ jal fx_emote -/* BFDF4C 802406CC E7A40018 */ swc1 $f4, 0x18($sp) -/* BFDF50 802406D0 0200202D */ daddu $a0, $s0, $zero -/* BFDF54 802406D4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BFDF58 802406D8 C480003C */ lwc1 $f0, 0x3c($a0) -/* BFDF5C 802406DC 3C060020 */ lui $a2, 0x20 -/* BFDF60 802406E0 0C012530 */ jal func_800494C0 -/* BFDF64 802406E4 E4800064 */ swc1 $f0, 0x64($a0) -/* BFDF68 802406E8 8E220018 */ lw $v0, 0x18($s1) -/* BFDF6C 802406EC 9442002A */ lhu $v0, 0x2a($v0) -/* BFDF70 802406F0 30420001 */ andi $v0, $v0, 1 -/* BFDF74 802406F4 10400003 */ beqz $v0, .L80240704 -/* BFDF78 802406F8 2402000A */ addiu $v0, $zero, 0xa -/* BFDF7C 802406FC 08090231 */ j .L802408C4 -/* BFDF80 80240700 AE620070 */ sw $v0, 0x70($s3) -.L80240704: -/* BFDF84 80240704 08090231 */ j .L802408C4 -/* BFDF88 80240708 AE720070 */ sw $s2, 0x70($s3) -.L8024070C: -/* BFDF8C 8024070C 8E620074 */ lw $v0, 0x74($s3) -/* BFDF90 80240710 2442FFFF */ addiu $v0, $v0, -1 -.L80240714: -/* BFDF94 80240714 080901C8 */ j .L80240720 -/* BFDF98 80240718 AE620074 */ sw $v0, 0x74($s3) -.L8024071C: -/* BFDF9C 8024071C AE220090 */ sw $v0, 0x90($s1) -.L80240720: -/* BFDFA0 80240720 8E2300D0 */ lw $v1, 0xd0($s1) -/* BFDFA4 80240724 C6000040 */ lwc1 $f0, 0x40($s0) -/* BFDFA8 80240728 C4620000 */ lwc1 $f2, ($v1) -/* BFDFAC 8024072C 468010A0 */ cvt.s.w $f2, $f2 -/* BFDFB0 80240730 C4640008 */ lwc1 $f4, 8($v1) -/* BFDFB4 80240734 46802120 */ cvt.s.w $f4, $f4 -/* BFDFB8 80240738 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFDFBC 8024073C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFDFC0 80240740 44051000 */ mfc1 $a1, $f2 -/* BFDFC4 80240744 C440000C */ lwc1 $f0, 0xc($v0) -/* BFDFC8 80240748 46800020 */ cvt.s.w $f0, $f0 -/* BFDFCC 8024074C E7A00014 */ swc1 $f0, 0x14($sp) -/* BFDFD0 80240750 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFDFD4 80240754 44062000 */ mfc1 $a2, $f4 -/* BFDFD8 80240758 C4400010 */ lwc1 $f0, 0x10($v0) -/* BFDFDC 8024075C 46800020 */ cvt.s.w $f0, $f0 -/* BFDFE0 80240760 E7A00018 */ swc1 $f0, 0x18($sp) -/* BFDFE4 80240764 8C640018 */ lw $a0, 0x18($v1) -/* BFDFE8 80240768 0C0123F5 */ jal is_point_within_region -/* BFDFEC 8024076C 8E070038 */ lw $a3, 0x38($s0) -/* BFDFF0 80240770 1040001A */ beqz $v0, .L802407DC -/* BFDFF4 80240774 00000000 */ nop -/* BFDFF8 80240778 8E060038 */ lw $a2, 0x38($s0) -/* BFDFFC 8024077C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFE000 80240780 8E070040 */ lw $a3, 0x40($s0) -/* BFE004 80240784 C44C0000 */ lwc1 $f12, ($v0) -/* BFE008 80240788 46806320 */ cvt.s.w $f12, $f12 -/* BFE00C 8024078C C44E0008 */ lwc1 $f14, 8($v0) -/* BFE010 80240790 0C00A7B5 */ jal dist2D -/* BFE014 80240794 468073A0 */ cvt.s.w $f14, $f14 -/* BFE018 80240798 C6020018 */ lwc1 $f2, 0x18($s0) -/* BFE01C 8024079C 4600103C */ c.lt.s $f2, $f0 -/* BFE020 802407A0 00000000 */ nop -/* BFE024 802407A4 4500000D */ bc1f .L802407DC -/* BFE028 802407A8 E7A00034 */ swc1 $f0, 0x34($sp) -/* BFE02C 802407AC C60C0038 */ lwc1 $f12, 0x38($s0) -/* BFE030 802407B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFE034 802407B4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BFE038 802407B8 C4480000 */ lwc1 $f8, ($v0) -/* BFE03C 802407BC 46804220 */ cvt.s.w $f8, $f8 -/* BFE040 802407C0 44064000 */ mfc1 $a2, $f8 -/* BFE044 802407C4 C4480008 */ lwc1 $f8, 8($v0) -/* BFE048 802407C8 46804220 */ cvt.s.w $f8, $f8 -/* BFE04C 802407CC 44074000 */ mfc1 $a3, $f8 -/* BFE050 802407D0 0C00A720 */ jal atan2 -/* BFE054 802407D4 24140001 */ addiu $s4, $zero, 1 -/* BFE058 802407D8 E600000C */ swc1 $f0, 0xc($s0) -.L802407DC: -/* BFE05C 802407DC 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFE060 802407E0 8C43000C */ lw $v1, 0xc($v0) -/* BFE064 802407E4 8C420010 */ lw $v0, 0x10($v0) -/* BFE068 802407E8 00621825 */ or $v1, $v1, $v0 -/* BFE06C 802407EC 00741825 */ or $v1, $v1, $s4 -/* BFE070 802407F0 10600008 */ beqz $v1, .L80240814 -/* BFE074 802407F4 00000000 */ nop -/* BFE078 802407F8 8602008C */ lh $v0, 0x8c($s0) -/* BFE07C 802407FC 14400031 */ bnez $v0, .L802408C4 -/* BFE080 80240800 00000000 */ nop -/* BFE084 80240804 8E050018 */ lw $a1, 0x18($s0) -/* BFE088 80240808 8E06000C */ lw $a2, 0xc($s0) -/* BFE08C 8024080C 0C00EA95 */ jal npc_move_heading -/* BFE090 80240810 0200202D */ daddu $a0, $s0, $zero -.L80240814: -/* BFE094 80240814 C600003C */ lwc1 $f0, 0x3c($s0) -/* BFE098 80240818 3C014059 */ lui $at, 0x4059 -/* BFE09C 8024081C 44811800 */ mtc1 $at, $f3 -/* BFE0A0 80240820 44801000 */ mtc1 $zero, $f2 -/* BFE0A4 80240824 46000021 */ cvt.d.s $f0, $f0 -/* BFE0A8 80240828 46220002 */ mul.d $f0, $f0, $f2 -/* BFE0AC 8024082C 00000000 */ nop -/* BFE0B0 80240830 4620020D */ trunc.w.d $f8, $f0 -/* BFE0B4 80240834 E628007C */ swc1 $f8, 0x7c($s1) -/* BFE0B8 80240838 8E420004 */ lw $v0, 4($s2) -/* BFE0BC 8024083C 18400021 */ blez $v0, .L802408C4 -/* BFE0C0 80240840 00000000 */ nop -/* BFE0C4 80240844 8602008E */ lh $v0, 0x8e($s0) -/* BFE0C8 80240848 9603008E */ lhu $v1, 0x8e($s0) -/* BFE0CC 8024084C 18400005 */ blez $v0, .L80240864 -/* BFE0D0 80240850 2462FFFF */ addiu $v0, $v1, -1 -/* BFE0D4 80240854 A602008E */ sh $v0, 0x8e($s0) -/* BFE0D8 80240858 00021400 */ sll $v0, $v0, 0x10 -/* BFE0DC 8024085C 1C400019 */ bgtz $v0, .L802408C4 -/* BFE0E0 80240860 00000000 */ nop -.L80240864: -/* BFE0E4 80240864 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BFE0E8 80240868 24020002 */ addiu $v0, $zero, 2 -/* BFE0EC 8024086C 0C00A67F */ jal rand_int -/* BFE0F0 80240870 AE620070 */ sw $v0, 0x70($s3) -/* BFE0F4 80240874 3C035555 */ lui $v1, 0x5555 -/* BFE0F8 80240878 34635556 */ ori $v1, $v1, 0x5556 -/* BFE0FC 8024087C 00430018 */ mult $v0, $v1 -/* BFE100 80240880 000227C3 */ sra $a0, $v0, 0x1f -/* BFE104 80240884 00004010 */ mfhi $t0 -/* BFE108 80240888 01042023 */ subu $a0, $t0, $a0 -/* BFE10C 8024088C 00041840 */ sll $v1, $a0, 1 -/* BFE110 80240890 00641821 */ addu $v1, $v1, $a0 -/* BFE114 80240894 00431023 */ subu $v0, $v0, $v1 -/* BFE118 80240898 24430002 */ addiu $v1, $v0, 2 -/* BFE11C 8024089C AE630074 */ sw $v1, 0x74($s3) -/* BFE120 802408A0 8E42002C */ lw $v0, 0x2c($s2) -/* BFE124 802408A4 58400007 */ blezl $v0, .L802408C4 -/* BFE128 802408A8 AE600070 */ sw $zero, 0x70($s3) -/* BFE12C 802408AC 8E420008 */ lw $v0, 8($s2) -/* BFE130 802408B0 18400003 */ blez $v0, .L802408C0 -/* BFE134 802408B4 28620003 */ slti $v0, $v1, 3 -/* BFE138 802408B8 10400002 */ beqz $v0, .L802408C4 -/* BFE13C 802408BC 00000000 */ nop -.L802408C0: -/* BFE140 802408C0 AE600070 */ sw $zero, 0x70($s3) -.L802408C4: -/* BFE144 802408C4 8FBF0058 */ lw $ra, 0x58($sp) -/* BFE148 802408C8 8FB50054 */ lw $s5, 0x54($sp) -/* BFE14C 802408CC 8FB40050 */ lw $s4, 0x50($sp) -/* BFE150 802408D0 8FB3004C */ lw $s3, 0x4c($sp) -/* BFE154 802408D4 8FB20048 */ lw $s2, 0x48($sp) -/* BFE158 802408D8 8FB10044 */ lw $s1, 0x44($sp) -/* BFE15C 802408DC 8FB00040 */ lw $s0, 0x40($sp) -/* BFE160 802408E0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* BFE164 802408E4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* BFE168 802408E8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* BFE16C 802408EC D7B40060 */ ldc1 $f20, 0x60($sp) -/* BFE170 802408F0 03E00008 */ jr $ra -/* BFE174 802408F4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_802408F8_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_802408F8_BFD880.s deleted file mode 100644 index f09da8f65c..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_802408F8_BFD880.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408F8_BFE178 -/* BFE178 802408F8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BFE17C 802408FC AFB3001C */ sw $s3, 0x1c($sp) -/* BFE180 80240900 0080982D */ daddu $s3, $a0, $zero -/* BFE184 80240904 AFBF0020 */ sw $ra, 0x20($sp) -/* BFE188 80240908 AFB20018 */ sw $s2, 0x18($sp) -/* BFE18C 8024090C AFB10014 */ sw $s1, 0x14($sp) -/* BFE190 80240910 AFB00010 */ sw $s0, 0x10($sp) -/* BFE194 80240914 8E720148 */ lw $s2, 0x148($s3) -/* BFE198 80240918 86440008 */ lh $a0, 8($s2) -/* BFE19C 8024091C 0C00EABB */ jal get_npc_unsafe -/* BFE1A0 80240920 00A0882D */ daddu $s1, $a1, $zero -/* BFE1A4 80240924 8E240008 */ lw $a0, 8($s1) -/* BFE1A8 80240928 0040802D */ daddu $s0, $v0, $zero -/* BFE1AC 8024092C 00041FC2 */ srl $v1, $a0, 0x1f -/* BFE1B0 80240930 00832021 */ addu $a0, $a0, $v1 -/* BFE1B4 80240934 00042043 */ sra $a0, $a0, 1 -/* BFE1B8 80240938 0C00A67F */ jal rand_int -/* BFE1BC 8024093C 24840001 */ addiu $a0, $a0, 1 -/* BFE1C0 80240940 8E230008 */ lw $v1, 8($s1) -/* BFE1C4 80240944 240400B4 */ addiu $a0, $zero, 0xb4 -/* BFE1C8 80240948 00032FC2 */ srl $a1, $v1, 0x1f -/* BFE1CC 8024094C 00651821 */ addu $v1, $v1, $a1 -/* BFE1D0 80240950 00031843 */ sra $v1, $v1, 1 -/* BFE1D4 80240954 00621821 */ addu $v1, $v1, $v0 -/* BFE1D8 80240958 0C00A67F */ jal rand_int -/* BFE1DC 8024095C A603008E */ sh $v1, 0x8e($s0) -/* BFE1E0 80240960 C60C000C */ lwc1 $f12, 0xc($s0) -/* BFE1E4 80240964 44820000 */ mtc1 $v0, $f0 -/* BFE1E8 80240968 00000000 */ nop -/* BFE1EC 8024096C 46800020 */ cvt.s.w $f0, $f0 -/* BFE1F0 80240970 46006300 */ add.s $f12, $f12, $f0 -/* BFE1F4 80240974 3C0142B4 */ lui $at, 0x42b4 -/* BFE1F8 80240978 44810000 */ mtc1 $at, $f0 -/* BFE1FC 8024097C 0C00A6C9 */ jal clamp_angle -/* BFE200 80240980 46006301 */ sub.s $f12, $f12, $f0 -/* BFE204 80240984 E600000C */ swc1 $f0, 0xc($s0) -/* BFE208 80240988 8E4200CC */ lw $v0, 0xcc($s2) -/* BFE20C 8024098C 8C420000 */ lw $v0, ($v0) -/* BFE210 80240990 AE020028 */ sw $v0, 0x28($s0) -/* BFE214 80240994 24020003 */ addiu $v0, $zero, 3 -/* BFE218 80240998 AE620070 */ sw $v0, 0x70($s3) -/* BFE21C 8024099C 8FBF0020 */ lw $ra, 0x20($sp) -/* BFE220 802409A0 8FB3001C */ lw $s3, 0x1c($sp) -/* BFE224 802409A4 8FB20018 */ lw $s2, 0x18($sp) -/* BFE228 802409A8 8FB10014 */ lw $s1, 0x14($sp) -/* BFE22C 802409AC 8FB00010 */ lw $s0, 0x10($sp) -/* BFE230 802409B0 03E00008 */ jr $ra -/* BFE234 802409B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_80240CFC_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_80240CFC_BFD880.s deleted file mode 100644 index aa45b2ea69..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_80240CFC_BFD880.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CFC_BFE57C -/* BFE57C 80240CFC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BFE580 80240D00 AFB20018 */ sw $s2, 0x18($sp) -/* BFE584 80240D04 0080902D */ daddu $s2, $a0, $zero -/* BFE588 80240D08 AFBF001C */ sw $ra, 0x1c($sp) -/* BFE58C 80240D0C AFB10014 */ sw $s1, 0x14($sp) -/* BFE590 80240D10 AFB00010 */ sw $s0, 0x10($sp) -/* BFE594 80240D14 8E510148 */ lw $s1, 0x148($s2) -/* BFE598 80240D18 0C00EABB */ jal get_npc_unsafe -/* BFE59C 80240D1C 86240008 */ lh $a0, 8($s1) -/* BFE5A0 80240D20 0040802D */ daddu $s0, $v0, $zero -/* BFE5A4 80240D24 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BFE5A8 80240D28 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BFE5AC 80240D2C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BFE5B0 80240D30 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BFE5B4 80240D34 A600008E */ sh $zero, 0x8e($s0) -/* BFE5B8 80240D38 8C460028 */ lw $a2, 0x28($v0) -/* BFE5BC 80240D3C 0C00A720 */ jal atan2 -/* BFE5C0 80240D40 8C470030 */ lw $a3, 0x30($v0) -/* BFE5C4 80240D44 E600000C */ swc1 $f0, 0xc($s0) -/* BFE5C8 80240D48 8E2200CC */ lw $v0, 0xcc($s1) -/* BFE5CC 80240D4C 8C420020 */ lw $v0, 0x20($v0) -/* BFE5D0 80240D50 AE020028 */ sw $v0, 0x28($s0) -/* BFE5D4 80240D54 2402000B */ addiu $v0, $zero, 0xb -/* BFE5D8 80240D58 AE420070 */ sw $v0, 0x70($s2) -/* BFE5DC 80240D5C 8FBF001C */ lw $ra, 0x1c($sp) -/* BFE5E0 80240D60 8FB20018 */ lw $s2, 0x18($sp) -/* BFE5E4 80240D64 8FB10014 */ lw $s1, 0x14($sp) -/* BFE5E8 80240D68 8FB00010 */ lw $s0, 0x10($sp) -/* BFE5EC 80240D6C 03E00008 */ jr $ra -/* BFE5F0 80240D70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_80240D74_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_80240D74_BFD880.s deleted file mode 100644 index 13a39916eb..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_80240D74_BFD880.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D74_BFE5F4 -/* BFE5F4 80240D74 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BFE5F8 80240D78 AFB00010 */ sw $s0, 0x10($sp) -/* BFE5FC 80240D7C 0080802D */ daddu $s0, $a0, $zero -/* BFE600 80240D80 AFBF0014 */ sw $ra, 0x14($sp) -/* BFE604 80240D84 8E020148 */ lw $v0, 0x148($s0) -/* BFE608 80240D88 0C00EABB */ jal get_npc_unsafe -/* BFE60C 80240D8C 84440008 */ lh $a0, 8($v0) -/* BFE610 80240D90 9443008E */ lhu $v1, 0x8e($v0) -/* BFE614 80240D94 C440003C */ lwc1 $f0, 0x3c($v0) -/* BFE618 80240D98 24640001 */ addiu $a0, $v1, 1 -/* BFE61C 80240D9C 00031C00 */ sll $v1, $v1, 0x10 -/* BFE620 80240DA0 00031B83 */ sra $v1, $v1, 0xe -/* BFE624 80240DA4 A444008E */ sh $a0, 0x8e($v0) -/* BFE628 80240DA8 3C018024 */ lui $at, 0x8024 -/* BFE62C 80240DAC 00230821 */ addu $at, $at, $v1 -/* BFE630 80240DB0 C4224CD0 */ lwc1 $f2, 0x4cd0($at) -/* BFE634 80240DB4 8443008E */ lh $v1, 0x8e($v0) -/* BFE638 80240DB8 46020000 */ add.s $f0, $f0, $f2 -/* BFE63C 80240DBC 28630005 */ slti $v1, $v1, 5 -/* BFE640 80240DC0 14600003 */ bnez $v1, .L80240DD0 -/* BFE644 80240DC4 E440003C */ swc1 $f0, 0x3c($v0) -/* BFE648 80240DC8 2402000C */ addiu $v0, $zero, 0xc -/* BFE64C 80240DCC AE020070 */ sw $v0, 0x70($s0) -.L80240DD0: -/* BFE650 80240DD0 8FBF0014 */ lw $ra, 0x14($sp) -/* BFE654 80240DD4 8FB00010 */ lw $s0, 0x10($sp) -/* BFE658 80240DD8 03E00008 */ jr $ra -/* BFE65C 80240DDC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_80240F14_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_80240F14_BFD880.s deleted file mode 100644 index e4afbbbb39..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_80240F14_BFD880.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F14_BFE794 -/* BFE794 80240F14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BFE798 80240F18 AFB00010 */ sw $s0, 0x10($sp) -/* BFE79C 80240F1C 0080802D */ daddu $s0, $a0, $zero -/* BFE7A0 80240F20 AFBF0014 */ sw $ra, 0x14($sp) -/* BFE7A4 80240F24 8E020148 */ lw $v0, 0x148($s0) -/* BFE7A8 80240F28 0C00EABB */ jal get_npc_unsafe -/* BFE7AC 80240F2C 84440008 */ lh $a0, 8($v0) -/* BFE7B0 80240F30 0040202D */ daddu $a0, $v0, $zero -/* BFE7B4 80240F34 8482008E */ lh $v0, 0x8e($a0) -/* BFE7B8 80240F38 9483008E */ lhu $v1, 0x8e($a0) -/* BFE7BC 80240F3C 18400005 */ blez $v0, .L80240F54 -/* BFE7C0 80240F40 2462FFFF */ addiu $v0, $v1, -1 -/* BFE7C4 80240F44 A482008E */ sh $v0, 0x8e($a0) -/* BFE7C8 80240F48 00021400 */ sll $v0, $v0, 0x10 -/* BFE7CC 80240F4C 1C400006 */ bgtz $v0, .L80240F68 -/* BFE7D0 80240F50 00000000 */ nop -.L80240F54: -/* BFE7D4 80240F54 8482008C */ lh $v0, 0x8c($a0) -/* BFE7D8 80240F58 14400003 */ bnez $v0, .L80240F68 -/* BFE7DC 80240F5C 2402000E */ addiu $v0, $zero, 0xe -/* BFE7E0 80240F60 A480008E */ sh $zero, 0x8e($a0) -/* BFE7E4 80240F64 AE020070 */ sw $v0, 0x70($s0) -.L80240F68: -/* BFE7E8 80240F68 8FBF0014 */ lw $ra, 0x14($sp) -/* BFE7EC 80240F6C 8FB00010 */ lw $s0, 0x10($sp) -/* BFE7F0 80240F70 03E00008 */ jr $ra -/* BFE7F4 80240F74 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_80241770_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_80241770_BFD880.s deleted file mode 100644 index 77648bd85a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_80241770_BFD880.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241770_BFEFF0 -/* BFEFF0 80241770 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BFEFF4 80241774 AFB30024 */ sw $s3, 0x24($sp) -/* BFEFF8 80241778 0080982D */ daddu $s3, $a0, $zero -/* BFEFFC 8024177C AFBF0028 */ sw $ra, 0x28($sp) -/* BFF000 80241780 AFB20020 */ sw $s2, 0x20($sp) -/* BFF004 80241784 AFB1001C */ sw $s1, 0x1c($sp) -/* BFF008 80241788 AFB00018 */ sw $s0, 0x18($sp) -/* BFF00C 8024178C 8E700148 */ lw $s0, 0x148($s3) -/* BFF010 80241790 00A0902D */ daddu $s2, $a1, $zero -/* BFF014 80241794 86040008 */ lh $a0, 8($s0) -/* BFF018 80241798 0C00EABB */ jal get_npc_unsafe -/* BFF01C 8024179C 00C0882D */ daddu $s1, $a2, $zero -/* BFF020 802417A0 0220202D */ daddu $a0, $s1, $zero -/* BFF024 802417A4 0200282D */ daddu $a1, $s0, $zero -/* BFF028 802417A8 24030001 */ addiu $v1, $zero, 1 -/* BFF02C 802417AC AFA30010 */ sw $v1, 0x10($sp) -/* BFF030 802417B0 8E460024 */ lw $a2, 0x24($s2) -/* BFF034 802417B4 8E470028 */ lw $a3, 0x28($s2) -/* BFF038 802417B8 0C01242D */ jal func_800490B4 -/* BFF03C 802417BC 0040802D */ daddu $s0, $v0, $zero -/* BFF040 802417C0 10400024 */ beqz $v0, .L80241854 -/* BFF044 802417C4 24020010 */ addiu $v0, $zero, 0x10 -/* BFF048 802417C8 8E050018 */ lw $a1, 0x18($s0) -/* BFF04C 802417CC 8E06000C */ lw $a2, 0xc($s0) -/* BFF050 802417D0 0C00EA95 */ jal npc_move_heading -/* BFF054 802417D4 0200202D */ daddu $a0, $s0, $zero -/* BFF058 802417D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BFF05C 802417DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BFF060 802417E0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BFF064 802417E4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BFF068 802417E8 8C460028 */ lw $a2, 0x28($v0) -/* BFF06C 802417EC 0C00A7B5 */ jal dist2D -/* BFF070 802417F0 8C470030 */ lw $a3, 0x30($v0) -/* BFF074 802417F4 C6020018 */ lwc1 $f2, 0x18($s0) -/* BFF078 802417F8 3C014004 */ lui $at, 0x4004 -/* BFF07C 802417FC 44812800 */ mtc1 $at, $f5 -/* BFF080 80241800 44802000 */ mtc1 $zero, $f4 -/* BFF084 80241804 460010A1 */ cvt.d.s $f2, $f2 -/* BFF088 80241808 46241082 */ mul.d $f2, $f2, $f4 -/* BFF08C 8024180C 00000000 */ nop -/* BFF090 80241810 46000021 */ cvt.d.s $f0, $f0 -/* BFF094 80241814 4622003E */ c.le.d $f0, $f2 -/* BFF098 80241818 00000000 */ nop -/* BFF09C 8024181C 45000003 */ bc1f .L8024182C -/* BFF0A0 80241820 2402000E */ addiu $v0, $zero, 0xe -/* BFF0A4 80241824 08090615 */ j .L80241854 -/* BFF0A8 80241828 A600008E */ sh $zero, 0x8e($s0) -.L8024182C: -/* BFF0AC 8024182C 9602008E */ lhu $v0, 0x8e($s0) -/* BFF0B0 80241830 2442FFFF */ addiu $v0, $v0, -1 -/* BFF0B4 80241834 A602008E */ sh $v0, 0x8e($s0) -/* BFF0B8 80241838 00021400 */ sll $v0, $v0, 0x10 -/* BFF0BC 8024183C 1C400006 */ bgtz $v0, .L80241858 -/* BFF0C0 80241840 3C030020 */ lui $v1, 0x20 -/* BFF0C4 80241844 8E020000 */ lw $v0, ($s0) -/* BFF0C8 80241848 00431025 */ or $v0, $v0, $v1 -/* BFF0CC 8024184C AE020000 */ sw $v0, ($s0) -/* BFF0D0 80241850 2402000C */ addiu $v0, $zero, 0xc -.L80241854: -/* BFF0D4 80241854 AE620070 */ sw $v0, 0x70($s3) -.L80241858: -/* BFF0D8 80241858 8FBF0028 */ lw $ra, 0x28($sp) -/* BFF0DC 8024185C 8FB30024 */ lw $s3, 0x24($sp) -/* BFF0E0 80241860 8FB20020 */ lw $s2, 0x20($sp) -/* BFF0E4 80241864 8FB1001C */ lw $s1, 0x1c($sp) -/* BFF0E8 80241868 8FB00018 */ lw $s0, 0x18($sp) -/* BFF0EC 8024186C 03E00008 */ jr $ra -/* BFF0F0 80241870 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_80241874_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_80241874_BFD880.s deleted file mode 100644 index 7bd7dc4778..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_80241874_BFD880.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241874_BFF0F4 -/* BFF0F4 80241874 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BFF0F8 80241878 AFB30024 */ sw $s3, 0x24($sp) -/* BFF0FC 8024187C 0080982D */ daddu $s3, $a0, $zero -/* BFF100 80241880 AFBF0028 */ sw $ra, 0x28($sp) -/* BFF104 80241884 AFB20020 */ sw $s2, 0x20($sp) -/* BFF108 80241888 AFB1001C */ sw $s1, 0x1c($sp) -/* BFF10C 8024188C AFB00018 */ sw $s0, 0x18($sp) -/* BFF110 80241890 8E720148 */ lw $s2, 0x148($s3) -/* BFF114 80241894 86440008 */ lh $a0, 8($s2) -/* BFF118 80241898 0C00EABB */ jal get_npc_unsafe -/* BFF11C 8024189C 0000802D */ daddu $s0, $zero, $zero -/* BFF120 802418A0 0040882D */ daddu $s1, $v0, $zero -.L802418A4: -/* BFF124 802418A4 822200A4 */ lb $v0, 0xa4($s1) -/* BFF128 802418A8 52020007 */ beql $s0, $v0, .L802418C8 -/* BFF12C 802418AC 26100001 */ addiu $s0, $s0, 1 -/* BFF130 802418B0 0C00FB3A */ jal get_enemy -/* BFF134 802418B4 0200202D */ daddu $a0, $s0, $zero -/* BFF138 802418B8 8C42006C */ lw $v0, 0x6c($v0) -/* BFF13C 802418BC 30420100 */ andi $v0, $v0, 0x100 -/* BFF140 802418C0 1440001D */ bnez $v0, .L80241938 -/* BFF144 802418C4 26100001 */ addiu $s0, $s0, 1 -.L802418C8: -/* BFF148 802418C8 2A020004 */ slti $v0, $s0, 4 -/* BFF14C 802418CC 1440FFF5 */ bnez $v0, .L802418A4 -/* BFF150 802418D0 00000000 */ nop -/* BFF154 802418D4 8E42006C */ lw $v0, 0x6c($s2) -/* BFF158 802418D8 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* BFF15C 802418DC 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* BFF160 802418E0 34420100 */ ori $v0, $v0, 0x100 -/* BFF164 802418E4 AE42006C */ sw $v0, 0x6c($s2) -/* BFF168 802418E8 C4600028 */ lwc1 $f0, 0x28($v1) -/* BFF16C 802418EC E6200038 */ swc1 $f0, 0x38($s1) -/* BFF170 802418F0 C4600030 */ lwc1 $f0, 0x30($v1) -/* BFF174 802418F4 E6200040 */ swc1 $f0, 0x40($s1) -/* BFF178 802418F8 8E43006C */ lw $v1, 0x6c($s2) -/* BFF17C 802418FC 30621000 */ andi $v0, $v1, 0x1000 -/* BFF180 80241900 14400003 */ bnez $v0, .L80241910 -/* BFF184 80241904 3C048000 */ lui $a0, 0x8000 -/* BFF188 80241908 34621000 */ ori $v0, $v1, 0x1000 -/* BFF18C 8024190C AE42006C */ sw $v0, 0x6c($s2) -.L80241910: -/* BFF190 80241910 C6200040 */ lwc1 $f0, 0x40($s1) -/* BFF194 80241914 34840011 */ ori $a0, $a0, 0x11 -/* BFF198 80241918 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFF19C 8024191C 8E260038 */ lw $a2, 0x38($s1) -/* BFF1A0 80241920 8E27003C */ lw $a3, 0x3c($s1) -/* BFF1A4 80241924 0C052757 */ jal play_sound_at_position -/* BFF1A8 80241928 24050002 */ addiu $a1, $zero, 2 -/* BFF1AC 8024192C 2402000F */ addiu $v0, $zero, 0xf -/* BFF1B0 80241930 A620008E */ sh $zero, 0x8e($s1) -/* BFF1B4 80241934 AE620070 */ sw $v0, 0x70($s3) -.L80241938: -/* BFF1B8 80241938 8FBF0028 */ lw $ra, 0x28($sp) -/* BFF1BC 8024193C 8FB30024 */ lw $s3, 0x24($sp) -/* BFF1C0 80241940 8FB20020 */ lw $s2, 0x20($sp) -/* BFF1C4 80241944 8FB1001C */ lw $s1, 0x1c($sp) -/* BFF1C8 80241948 8FB00018 */ lw $s0, 0x18($sp) -/* BFF1CC 8024194C 03E00008 */ jr $ra -/* BFF1D0 80241950 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_80241954_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_80241954_BFD880.s deleted file mode 100644 index 01af8709b6..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_80241954_BFD880.s +++ /dev/null @@ -1,177 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241954_BFF1D4 -/* BFF1D4 80241954 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BFF1D8 80241958 AFB40040 */ sw $s4, 0x40($sp) -/* BFF1DC 8024195C 0080A02D */ daddu $s4, $a0, $zero -/* BFF1E0 80241960 AFBF0044 */ sw $ra, 0x44($sp) -/* BFF1E4 80241964 AFB3003C */ sw $s3, 0x3c($sp) -/* BFF1E8 80241968 AFB20038 */ sw $s2, 0x38($sp) -/* BFF1EC 8024196C AFB10034 */ sw $s1, 0x34($sp) -/* BFF1F0 80241970 AFB00030 */ sw $s0, 0x30($sp) -/* BFF1F4 80241974 8E930148 */ lw $s3, 0x148($s4) -/* BFF1F8 80241978 00A0802D */ daddu $s0, $a1, $zero -/* BFF1FC 8024197C 86640008 */ lh $a0, 8($s3) -/* BFF200 80241980 0C00EABB */ jal get_npc_unsafe -/* BFF204 80241984 00C0882D */ daddu $s1, $a2, $zero -/* BFF208 80241988 3C048000 */ lui $a0, 0x8000 -/* BFF20C 8024198C 0040902D */ daddu $s2, $v0, $zero -/* BFF210 80241990 C6400040 */ lwc1 $f0, 0x40($s2) -/* BFF214 80241994 34840011 */ ori $a0, $a0, 0x11 -/* BFF218 80241998 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFF21C 8024199C 8E460038 */ lw $a2, 0x38($s2) -/* BFF220 802419A0 8E47003C */ lw $a3, 0x3c($s2) -/* BFF224 802419A4 0C05267B */ jal func_801499EC -/* BFF228 802419A8 24050002 */ addiu $a1, $zero, 2 -/* BFF22C 802419AC 0220202D */ daddu $a0, $s1, $zero -/* BFF230 802419B0 24020001 */ addiu $v0, $zero, 1 -/* BFF234 802419B4 AFA20010 */ sw $v0, 0x10($sp) -/* BFF238 802419B8 8E060024 */ lw $a2, 0x24($s0) -/* BFF23C 802419BC 8E070028 */ lw $a3, 0x28($s0) -/* BFF240 802419C0 0C01242D */ jal func_800490B4 -/* BFF244 802419C4 0260282D */ daddu $a1, $s3, $zero -/* BFF248 802419C8 1440000B */ bnez $v0, .L802419F8 -/* BFF24C 802419CC 3C04FFDF */ lui $a0, 0xffdf -/* BFF250 802419D0 8E62006C */ lw $v0, 0x6c($s3) -/* BFF254 802419D4 2403FEFF */ addiu $v1, $zero, -0x101 -/* BFF258 802419D8 00431024 */ and $v0, $v0, $v1 -/* BFF25C 802419DC AE62006C */ sw $v0, 0x6c($s3) -/* BFF260 802419E0 8E420000 */ lw $v0, ($s2) -/* BFF264 802419E4 3484FFFF */ ori $a0, $a0, 0xffff -/* BFF268 802419E8 AE400048 */ sw $zero, 0x48($s2) -/* BFF26C 802419EC 00441024 */ and $v0, $v0, $a0 -/* BFF270 802419F0 080906F2 */ j .L80241BC8 -/* BFF274 802419F4 AE420000 */ sw $v0, ($s2) -.L802419F8: -/* BFF278 802419F8 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* BFF27C 802419FC 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* BFF280 80241A00 C6440048 */ lwc1 $f4, 0x48($s2) -/* BFF284 80241A04 3C0141C8 */ lui $at, 0x41c8 -/* BFF288 80241A08 44810000 */ mtc1 $at, $f0 -/* BFF28C 80241A0C 8E020000 */ lw $v0, ($s0) -/* BFF290 80241A10 46002100 */ add.s $f4, $f4, $f0 -/* BFF294 80241A14 C4420028 */ lwc1 $f2, 0x28($v0) -/* BFF298 80241A18 3C014000 */ lui $at, 0x4000 -/* BFF29C 80241A1C 44810000 */ mtc1 $at, $f0 -/* BFF2A0 80241A20 E6420038 */ swc1 $f2, 0x38($s2) -/* BFF2A4 80241A24 C4420030 */ lwc1 $f2, 0x30($v0) -/* BFF2A8 80241A28 46001080 */ add.s $f2, $f2, $f0 -/* BFF2AC 80241A2C 3C018026 */ lui $at, 0x8026 -/* BFF2B0 80241A30 D4263478 */ ldc1 $f6, 0x3478($at) -/* BFF2B4 80241A34 46002021 */ cvt.d.s $f0, $f4 -/* BFF2B8 80241A38 4620303C */ c.lt.d $f6, $f0 -/* BFF2BC 80241A3C E6440048 */ swc1 $f4, 0x48($s2) -/* BFF2C0 80241A40 45000004 */ bc1f .L80241A54 -/* BFF2C4 80241A44 E6420040 */ swc1 $f2, 0x40($s2) -/* BFF2C8 80241A48 46260001 */ sub.d $f0, $f0, $f6 -/* BFF2CC 80241A4C 46200020 */ cvt.s.d $f0, $f0 -/* BFF2D0 80241A50 E6400048 */ swc1 $f0, 0x48($s2) -.L80241A54: -/* BFF2D4 80241A54 3C02B60B */ lui $v0, 0xb60b -/* BFF2D8 80241A58 C6400048 */ lwc1 $f0, 0x48($s2) -/* BFF2DC 80241A5C 344260B7 */ ori $v0, $v0, 0x60b7 -/* BFF2E0 80241A60 4600020D */ trunc.w.s $f8, $f0 -/* BFF2E4 80241A64 44044000 */ mfc1 $a0, $f8 -/* BFF2E8 80241A68 00000000 */ nop -/* BFF2EC 80241A6C 00820018 */ mult $a0, $v0 -/* BFF2F0 80241A70 00041FC3 */ sra $v1, $a0, 0x1f -/* BFF2F4 80241A74 00004010 */ mfhi $t0 -/* BFF2F8 80241A78 01041021 */ addu $v0, $t0, $a0 -/* BFF2FC 80241A7C 000211C3 */ sra $v0, $v0, 7 -/* BFF300 80241A80 00431023 */ subu $v0, $v0, $v1 -/* BFF304 80241A84 00021840 */ sll $v1, $v0, 1 -/* BFF308 80241A88 00621821 */ addu $v1, $v1, $v0 -/* BFF30C 80241A8C 00031100 */ sll $v0, $v1, 4 -/* BFF310 80241A90 00431023 */ subu $v0, $v0, $v1 -/* BFF314 80241A94 00021080 */ sll $v0, $v0, 2 -/* BFF318 80241A98 00822023 */ subu $a0, $a0, $v0 -/* BFF31C 80241A9C 00042400 */ sll $a0, $a0, 0x10 -/* BFF320 80241AA0 0C00A4F5 */ jal cosine -/* BFF324 80241AA4 00042403 */ sra $a0, $a0, 0x10 -/* BFF328 80241AA8 3C014260 */ lui $at, 0x4260 -/* BFF32C 80241AAC 44811000 */ mtc1 $at, $f2 -/* BFF330 80241AB0 00000000 */ nop -/* BFF334 80241AB4 46020002 */ mul.s $f0, $f0, $f2 -/* BFF338 80241AB8 00000000 */ nop -/* BFF33C 80241ABC 24050006 */ addiu $a1, $zero, 6 -/* BFF340 80241AC0 3C01437F */ lui $at, 0x437f -/* BFF344 80241AC4 44811000 */ mtc1 $at, $f2 -/* BFF348 80241AC8 240200FF */ addiu $v0, $zero, 0xff -/* BFF34C 80241ACC 46001081 */ sub.s $f2, $f2, $f0 -/* BFF350 80241AD0 AFA20014 */ sw $v0, 0x14($sp) -/* BFF354 80241AD4 AFA00018 */ sw $zero, 0x18($sp) -/* BFF358 80241AD8 4600120D */ trunc.w.s $f8, $f2 -/* BFF35C 80241ADC 44064000 */ mfc1 $a2, $f8 -/* BFF360 80241AE0 00000000 */ nop -/* BFF364 80241AE4 AFA60010 */ sw $a2, 0x10($sp) -/* BFF368 80241AE8 8E440024 */ lw $a0, 0x24($s2) -/* BFF36C 80241AEC 0C0B7A25 */ jal func_802DE894 -/* BFF370 80241AF0 00C0382D */ daddu $a3, $a2, $zero -/* BFF374 80241AF4 27A50020 */ addiu $a1, $sp, 0x20 -/* BFF378 80241AF8 27A60024 */ addiu $a2, $sp, 0x24 -/* BFF37C 80241AFC 8E020000 */ lw $v0, ($s0) -/* BFF380 80241B00 3C01447A */ lui $at, 0x447a -/* BFF384 80241B04 44810000 */ mtc1 $at, $f0 -/* BFF388 80241B08 C4420028 */ lwc1 $f2, 0x28($v0) -/* BFF38C 80241B0C C444002C */ lwc1 $f4, 0x2c($v0) -/* BFF390 80241B10 C4460030 */ lwc1 $f6, 0x30($v0) -/* BFF394 80241B14 27A2002C */ addiu $v0, $sp, 0x2c -/* BFF398 80241B18 E7A0002C */ swc1 $f0, 0x2c($sp) -/* BFF39C 80241B1C E7A20020 */ swc1 $f2, 0x20($sp) -/* BFF3A0 80241B20 E7A40024 */ swc1 $f4, 0x24($sp) -/* BFF3A4 80241B24 E7A60028 */ swc1 $f6, 0x28($sp) -/* BFF3A8 80241B28 AFA20010 */ sw $v0, 0x10($sp) -/* BFF3AC 80241B2C 8E440080 */ lw $a0, 0x80($s2) -/* BFF3B0 80241B30 0C0372DF */ jal func_800DCB7C -/* BFF3B4 80241B34 27A70028 */ addiu $a3, $sp, 0x28 -/* BFF3B8 80241B38 C644003C */ lwc1 $f4, 0x3c($s2) -/* BFF3BC 80241B3C C7A00024 */ lwc1 $f0, 0x24($sp) -/* BFF3C0 80241B40 46002001 */ sub.s $f0, $f4, $f0 -/* BFF3C4 80241B44 3C014038 */ lui $at, 0x4038 -/* BFF3C8 80241B48 44811800 */ mtc1 $at, $f3 -/* BFF3CC 80241B4C 44801000 */ mtc1 $zero, $f2 -/* BFF3D0 80241B50 46000005 */ abs.s $f0, $f0 -/* BFF3D4 80241B54 46000021 */ cvt.d.s $f0, $f0 -/* BFF3D8 80241B58 4620103C */ c.lt.d $f2, $f0 -/* BFF3DC 80241B5C 00000000 */ nop -/* BFF3E0 80241B60 45000008 */ bc1f .L80241B84 -/* BFF3E4 80241B64 3C03FFDF */ lui $v1, 0xffdf -/* BFF3E8 80241B68 3C018026 */ lui $at, 0x8026 -/* BFF3EC 80241B6C D4223480 */ ldc1 $f2, 0x3480($at) -/* BFF3F0 80241B70 46002021 */ cvt.d.s $f0, $f4 -/* BFF3F4 80241B74 46220001 */ sub.d $f0, $f0, $f2 -/* BFF3F8 80241B78 46200020 */ cvt.s.d $f0, $f0 -/* BFF3FC 80241B7C 080906F4 */ j .L80241BD0 -/* BFF400 80241B80 E640003C */ swc1 $f0, 0x3c($s2) -.L80241B84: -/* BFF404 80241B84 8E420000 */ lw $v0, ($s2) -/* BFF408 80241B88 3463FFFF */ ori $v1, $v1, 0xffff -/* BFF40C 80241B8C AE400048 */ sw $zero, 0x48($s2) -/* BFF410 80241B90 00431024 */ and $v0, $v0, $v1 -/* BFF414 80241B94 AE420000 */ sw $v0, ($s2) -/* BFF418 80241B98 3C038011 */ lui $v1, 0x8011 -/* BFF41C 80241B9C 8063EBB3 */ lb $v1, -0x144d($v1) -/* BFF420 80241BA0 24020009 */ addiu $v0, $zero, 9 -/* BFF424 80241BA4 10620009 */ beq $v1, $v0, .L80241BCC -/* BFF428 80241BA8 24020010 */ addiu $v0, $zero, 0x10 -/* BFF42C 80241BAC 0C03805E */ jal disable_player_input -/* BFF430 80241BB0 00000000 */ nop -/* BFF434 80241BB4 0C03BD8A */ jal func_800EF628 -/* BFF438 80241BB8 00000000 */ nop -/* BFF43C 80241BBC 24020014 */ addiu $v0, $zero, 0x14 -/* BFF440 80241BC0 080906F3 */ j .L80241BCC -/* BFF444 80241BC4 A640008E */ sh $zero, 0x8e($s2) -.L80241BC8: -/* BFF448 80241BC8 24020010 */ addiu $v0, $zero, 0x10 -.L80241BCC: -/* BFF44C 80241BCC AE820070 */ sw $v0, 0x70($s4) -.L80241BD0: -/* BFF450 80241BD0 8FBF0044 */ lw $ra, 0x44($sp) -/* BFF454 80241BD4 8FB40040 */ lw $s4, 0x40($sp) -/* BFF458 80241BD8 8FB3003C */ lw $s3, 0x3c($sp) -/* BFF45C 80241BDC 8FB20038 */ lw $s2, 0x38($sp) -/* BFF460 80241BE0 8FB10034 */ lw $s1, 0x34($sp) -/* BFF464 80241BE4 8FB00030 */ lw $s0, 0x30($sp) -/* BFF468 80241BE8 03E00008 */ jr $ra -/* BFF46C 80241BEC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_80241CA8_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_80241CA8_BFD880.s deleted file mode 100644 index d0e4daaa9c..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_80241CA8_BFD880.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CA8_BFF528 -/* BFF528 80241CA8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* BFF52C 80241CAC AFB20048 */ sw $s2, 0x48($sp) -/* BFF530 80241CB0 0080902D */ daddu $s2, $a0, $zero -/* BFF534 80241CB4 AFBF004C */ sw $ra, 0x4c($sp) -/* BFF538 80241CB8 AFB10044 */ sw $s1, 0x44($sp) -/* BFF53C 80241CBC AFB00040 */ sw $s0, 0x40($sp) -/* BFF540 80241CC0 F7B40050 */ sdc1 $f20, 0x50($sp) -/* BFF544 80241CC4 8E500148 */ lw $s0, 0x148($s2) -/* BFF548 80241CC8 0C00EABB */ jal get_npc_unsafe -/* BFF54C 80241CCC 86040008 */ lh $a0, 8($s0) -/* BFF550 80241CD0 27A50028 */ addiu $a1, $sp, 0x28 -/* BFF554 80241CD4 0040882D */ daddu $s1, $v0, $zero -/* BFF558 80241CD8 27A6002C */ addiu $a2, $sp, 0x2c -/* BFF55C 80241CDC 27A70030 */ addiu $a3, $sp, 0x30 -/* BFF560 80241CE0 C620003C */ lwc1 $f0, 0x3c($s1) -/* BFF564 80241CE4 3C014004 */ lui $at, 0x4004 -/* BFF568 80241CE8 44811800 */ mtc1 $at, $f3 -/* BFF56C 80241CEC 44801000 */ mtc1 $zero, $f2 -/* BFF570 80241CF0 C6260038 */ lwc1 $f6, 0x38($s1) -/* BFF574 80241CF4 46000021 */ cvt.d.s $f0, $f0 -/* BFF578 80241CF8 46220000 */ add.d $f0, $f0, $f2 -/* BFF57C 80241CFC 3C01447A */ lui $at, 0x447a -/* BFF580 80241D00 44812000 */ mtc1 $at, $f4 -/* BFF584 80241D04 C6020078 */ lwc1 $f2, 0x78($s0) -/* BFF588 80241D08 468010A0 */ cvt.s.w $f2, $f2 -/* BFF58C 80241D0C 46200020 */ cvt.s.d $f0, $f0 -/* BFF590 80241D10 E620003C */ swc1 $f0, 0x3c($s1) -/* BFF594 80241D14 46000206 */ mov.s $f8, $f0 -/* BFF598 80241D18 C6200040 */ lwc1 $f0, 0x40($s1) -/* BFF59C 80241D1C 27A20034 */ addiu $v0, $sp, 0x34 -/* BFF5A0 80241D20 E7A00030 */ swc1 $f0, 0x30($sp) -/* BFF5A4 80241D24 3C014059 */ lui $at, 0x4059 -/* BFF5A8 80241D28 44810800 */ mtc1 $at, $f1 -/* BFF5AC 80241D2C 44800000 */ mtc1 $zero, $f0 -/* BFF5B0 80241D30 460010A1 */ cvt.d.s $f2, $f2 -/* BFF5B4 80241D34 E7A60028 */ swc1 $f6, 0x28($sp) -/* BFF5B8 80241D38 E7A40034 */ swc1 $f4, 0x34($sp) -/* BFF5BC 80241D3C E7A8002C */ swc1 $f8, 0x2c($sp) -/* BFF5C0 80241D40 AFA20010 */ sw $v0, 0x10($sp) -/* BFF5C4 80241D44 8E240080 */ lw $a0, 0x80($s1) -/* BFF5C8 80241D48 46201083 */ div.d $f2, $f2, $f0 -/* BFF5CC 80241D4C 0C0372DF */ jal func_800DCB7C -/* BFF5D0 80241D50 46201520 */ cvt.s.d $f20, $f2 -/* BFF5D4 80241D54 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BFF5D8 80241D58 46140000 */ add.s $f0, $f0, $f20 -/* BFF5DC 80241D5C C622003C */ lwc1 $f2, 0x3c($s1) -/* BFF5E0 80241D60 4600103C */ c.lt.s $f2, $f0 -/* BFF5E4 80241D64 00000000 */ nop -/* BFF5E8 80241D68 45010028 */ bc1t .L80241E0C -/* BFF5EC 80241D6C 00000000 */ nop -/* BFF5F0 80241D70 8E0200D0 */ lw $v0, 0xd0($s0) -/* BFF5F4 80241D74 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BFF5F8 80241D78 C62E0040 */ lwc1 $f14, 0x40($s1) -/* BFF5FC 80241D7C C44A0000 */ lwc1 $f10, ($v0) -/* BFF600 80241D80 468052A0 */ cvt.s.w $f10, $f10 -/* BFF604 80241D84 44065000 */ mfc1 $a2, $f10 -/* BFF608 80241D88 C44A0008 */ lwc1 $f10, 8($v0) -/* BFF60C 80241D8C 468052A0 */ cvt.s.w $f10, $f10 -/* BFF610 80241D90 44075000 */ mfc1 $a3, $f10 -/* BFF614 80241D94 0C00A720 */ jal atan2 -/* BFF618 80241D98 2410000A */ addiu $s0, $zero, 0xa -/* BFF61C 80241D9C 24040002 */ addiu $a0, $zero, 2 -/* BFF620 80241DA0 0220282D */ daddu $a1, $s1, $zero -/* BFF624 80241DA4 0000302D */ daddu $a2, $zero, $zero -/* BFF628 80241DA8 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* BFF62C 80241DAC 862200A8 */ lh $v0, 0xa8($s1) -/* BFF630 80241DB0 E620000C */ swc1 $f0, 0xc($s1) -/* BFF634 80241DB4 3C013F80 */ lui $at, 0x3f80 -/* BFF638 80241DB8 44810000 */ mtc1 $at, $f0 -/* BFF63C 80241DBC 3C014000 */ lui $at, 0x4000 -/* BFF640 80241DC0 44812000 */ mtc1 $at, $f4 -/* BFF644 80241DC4 3C01C1A0 */ lui $at, 0xc1a0 -/* BFF648 80241DC8 44813000 */ mtc1 $at, $f6 -/* BFF64C 80241DCC 44825000 */ mtc1 $v0, $f10 -/* BFF650 80241DD0 00000000 */ nop -/* BFF654 80241DD4 468052A0 */ cvt.s.w $f10, $f10 -/* BFF658 80241DD8 46141080 */ add.s $f2, $f2, $f20 -/* BFF65C 80241DDC 44075000 */ mfc1 $a3, $f10 -/* BFF660 80241DE0 27A20038 */ addiu $v0, $sp, 0x38 -/* BFF664 80241DE4 E622003C */ swc1 $f2, 0x3c($s1) -/* BFF668 80241DE8 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFF66C 80241DEC E7A40014 */ swc1 $f4, 0x14($sp) -/* BFF670 80241DF0 E7A60018 */ swc1 $f6, 0x18($sp) -/* BFF674 80241DF4 AFB0001C */ sw $s0, 0x1c($sp) -/* BFF678 80241DF8 0C01BFA4 */ jal fx_emote -/* BFF67C 80241DFC AFA20020 */ sw $v0, 0x20($sp) -/* BFF680 80241E00 24020012 */ addiu $v0, $zero, 0x12 -/* BFF684 80241E04 A630008E */ sh $s0, 0x8e($s1) -/* BFF688 80241E08 AE420070 */ sw $v0, 0x70($s2) -.L80241E0C: -/* BFF68C 80241E0C 8FBF004C */ lw $ra, 0x4c($sp) -/* BFF690 80241E10 8FB20048 */ lw $s2, 0x48($sp) -/* BFF694 80241E14 8FB10044 */ lw $s1, 0x44($sp) -/* BFF698 80241E18 8FB00040 */ lw $s0, 0x40($sp) -/* BFF69C 80241E1C D7B40050 */ ldc1 $f20, 0x50($sp) -/* BFF6A0 80241E20 03E00008 */ jr $ra -/* BFF6A4 80241E24 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_80241E28_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_80241E28_BFD880.s deleted file mode 100644 index ed09e9a075..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_80241E28_BFD880.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E28_BFF6A8 -/* BFF6A8 80241E28 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BFF6AC 80241E2C AFB00010 */ sw $s0, 0x10($sp) -/* BFF6B0 80241E30 0080802D */ daddu $s0, $a0, $zero -/* BFF6B4 80241E34 AFBF0014 */ sw $ra, 0x14($sp) -/* BFF6B8 80241E38 8E020148 */ lw $v0, 0x148($s0) -/* BFF6BC 80241E3C 0C00EABB */ jal get_npc_unsafe -/* BFF6C0 80241E40 84440008 */ lh $a0, 8($v0) -/* BFF6C4 80241E44 9443008E */ lhu $v1, 0x8e($v0) -/* BFF6C8 80241E48 2463FFFF */ addiu $v1, $v1, -1 -/* BFF6CC 80241E4C A443008E */ sh $v1, 0x8e($v0) -/* BFF6D0 80241E50 00031C00 */ sll $v1, $v1, 0x10 -/* BFF6D4 80241E54 1C600002 */ bgtz $v1, .L80241E60 -/* BFF6D8 80241E58 2402001E */ addiu $v0, $zero, 0x1e -/* BFF6DC 80241E5C AE020070 */ sw $v0, 0x70($s0) -.L80241E60: -/* BFF6E0 80241E60 8FBF0014 */ lw $ra, 0x14($sp) -/* BFF6E4 80241E64 8FB00010 */ lw $s0, 0x10($sp) -/* BFF6E8 80241E68 03E00008 */ jr $ra -/* BFF6EC 80241E6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_80241EF0_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_80241EF0_BFD880.s deleted file mode 100644 index b1ee6f5c00..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_80241EF0_BFD880.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EF0_BFF770 -/* BFF770 80241EF0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BFF774 80241EF4 AFB20018 */ sw $s2, 0x18($sp) -/* BFF778 80241EF8 0080902D */ daddu $s2, $a0, $zero -/* BFF77C 80241EFC AFBF001C */ sw $ra, 0x1c($sp) -/* BFF780 80241F00 AFB10014 */ sw $s1, 0x14($sp) -/* BFF784 80241F04 AFB00010 */ sw $s0, 0x10($sp) -/* BFF788 80241F08 8E500148 */ lw $s0, 0x148($s2) -/* BFF78C 80241F0C 86040008 */ lh $a0, 8($s0) -/* BFF790 80241F10 0C00EABB */ jal get_npc_unsafe -/* BFF794 80241F14 00A0882D */ daddu $s1, $a1, $zero -/* BFF798 80241F18 3C05FFDF */ lui $a1, 0xffdf -/* BFF79C 80241F1C 8E03006C */ lw $v1, 0x6c($s0) -/* BFF7A0 80241F20 2404FEFF */ addiu $a0, $zero, -0x101 -/* BFF7A4 80241F24 00641824 */ and $v1, $v1, $a0 -/* BFF7A8 80241F28 AE03006C */ sw $v1, 0x6c($s0) -/* BFF7AC 80241F2C 8C430000 */ lw $v1, ($v0) -/* BFF7B0 80241F30 34A5FFFF */ ori $a1, $a1, 0xffff -/* BFF7B4 80241F34 00651824 */ and $v1, $v1, $a1 -/* BFF7B8 80241F38 AC430000 */ sw $v1, ($v0) -/* BFF7BC 80241F3C C6200000 */ lwc1 $f0, ($s1) -/* BFF7C0 80241F40 46000021 */ cvt.d.s $f0, $f0 -/* BFF7C4 80241F44 46200000 */ add.d $f0, $f0, $f0 -/* BFF7C8 80241F48 46200020 */ cvt.s.d $f0, $f0 -/* BFF7CC 80241F4C E4400018 */ swc1 $f0, 0x18($v0) -/* BFF7D0 80241F50 AE000074 */ sw $zero, 0x74($s0) -/* BFF7D4 80241F54 C440003C */ lwc1 $f0, 0x3c($v0) -/* BFF7D8 80241F58 3C014059 */ lui $at, 0x4059 -/* BFF7DC 80241F5C 44811800 */ mtc1 $at, $f3 -/* BFF7E0 80241F60 44801000 */ mtc1 $zero, $f2 -/* BFF7E4 80241F64 46000021 */ cvt.d.s $f0, $f0 -/* BFF7E8 80241F68 46220002 */ mul.d $f0, $f0, $f2 -/* BFF7EC 80241F6C 00000000 */ nop -/* BFF7F0 80241F70 2402001E */ addiu $v0, $zero, 0x1e -/* BFF7F4 80241F74 4620010D */ trunc.w.d $f4, $f0 -/* BFF7F8 80241F78 E604007C */ swc1 $f4, 0x7c($s0) -/* BFF7FC 80241F7C AE420074 */ sw $v0, 0x74($s2) -/* BFF800 80241F80 8FBF001C */ lw $ra, 0x1c($sp) -/* BFF804 80241F84 8FB20018 */ lw $s2, 0x18($sp) -/* BFF808 80241F88 8FB10014 */ lw $s1, 0x14($sp) -/* BFF80C 80241F8C 8FB00010 */ lw $s0, 0x10($sp) -/* BFF810 80241F90 03E00008 */ jr $ra -/* BFF814 80241F94 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_80241F98_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_80241F98_BFD880.s deleted file mode 100644 index 3ed99dbe57..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_80241F98_BFD880.s +++ /dev/null @@ -1,207 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F98_BFF818 -/* BFF818 80241F98 27BDFF88 */ addiu $sp, $sp, -0x78 -/* BFF81C 80241F9C AFB20048 */ sw $s2, 0x48($sp) -/* BFF820 80241FA0 0080902D */ daddu $s2, $a0, $zero -/* BFF824 80241FA4 AFBF0054 */ sw $ra, 0x54($sp) -/* BFF828 80241FA8 AFB40050 */ sw $s4, 0x50($sp) -/* BFF82C 80241FAC AFB3004C */ sw $s3, 0x4c($sp) -/* BFF830 80241FB0 AFB10044 */ sw $s1, 0x44($sp) -/* BFF834 80241FB4 AFB00040 */ sw $s0, 0x40($sp) -/* BFF838 80241FB8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* BFF83C 80241FBC F7B80068 */ sdc1 $f24, 0x68($sp) -/* BFF840 80241FC0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* BFF844 80241FC4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* BFF848 80241FC8 8E500148 */ lw $s0, 0x148($s2) -/* BFF84C 80241FCC 00A0982D */ daddu $s3, $a1, $zero -/* BFF850 80241FD0 86040008 */ lh $a0, 8($s0) -/* BFF854 80241FD4 0C00EABB */ jal get_npc_unsafe -/* BFF858 80241FD8 00C0A02D */ daddu $s4, $a2, $zero -/* BFF85C 80241FDC 0040882D */ daddu $s1, $v0, $zero -/* BFF860 80241FE0 C6200038 */ lwc1 $f0, 0x38($s1) -/* BFF864 80241FE4 C622003C */ lwc1 $f2, 0x3c($s1) -/* BFF868 80241FE8 C6240040 */ lwc1 $f4, 0x40($s1) -/* BFF86C 80241FEC 3C01447A */ lui $at, 0x447a -/* BFF870 80241FF0 44813000 */ mtc1 $at, $f6 -/* BFF874 80241FF4 C60C0074 */ lwc1 $f12, 0x74($s0) -/* BFF878 80241FF8 46806320 */ cvt.s.w $f12, $f12 -/* BFF87C 80241FFC E7A00028 */ swc1 $f0, 0x28($sp) -/* BFF880 80242000 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BFF884 80242004 E7A40030 */ swc1 $f4, 0x30($sp) -/* BFF888 80242008 E7A60034 */ swc1 $f6, 0x34($sp) -/* BFF88C 8024200C C6000078 */ lwc1 $f0, 0x78($s0) -/* BFF890 80242010 46800020 */ cvt.s.w $f0, $f0 -/* BFF894 80242014 46000021 */ cvt.d.s $f0, $f0 -/* BFF898 80242018 C6020088 */ lwc1 $f2, 0x88($s0) -/* BFF89C 8024201C 468010A0 */ cvt.s.w $f2, $f2 -/* BFF8A0 80242020 3C014059 */ lui $at, 0x4059 -/* BFF8A4 80242024 44812800 */ mtc1 $at, $f5 -/* BFF8A8 80242028 44802000 */ mtc1 $zero, $f4 -/* BFF8AC 8024202C 460010A1 */ cvt.d.s $f2, $f2 -/* BFF8B0 80242030 46240003 */ div.d $f0, $f0, $f4 -/* BFF8B4 80242034 462006A0 */ cvt.s.d $f26, $f0 -/* BFF8B8 80242038 46241083 */ div.d $f2, $f2, $f4 -/* BFF8BC 8024203C 462010A0 */ cvt.s.d $f2, $f2 -/* BFF8C0 80242040 C6000070 */ lwc1 $f0, 0x70($s0) -/* BFF8C4 80242044 46800020 */ cvt.s.w $f0, $f0 -/* BFF8C8 80242048 46000021 */ cvt.d.s $f0, $f0 -/* BFF8CC 8024204C 46240003 */ div.d $f0, $f0, $f4 -/* BFF8D0 80242050 462005A0 */ cvt.s.d $f22, $f0 -/* BFF8D4 80242054 0C00A8BB */ jal sin_deg -/* BFF8D8 80242058 4602D600 */ add.s $f24, $f26, $f2 -/* BFF8DC 8024205C 27A50028 */ addiu $a1, $sp, 0x28 -/* BFF8E0 80242060 27A6002C */ addiu $a2, $sp, 0x2c -/* BFF8E4 80242064 27A70030 */ addiu $a3, $sp, 0x30 -/* BFF8E8 80242068 27A20034 */ addiu $v0, $sp, 0x34 -/* BFF8EC 8024206C AFA20010 */ sw $v0, 0x10($sp) -/* BFF8F0 80242070 8E240080 */ lw $a0, 0x80($s1) -/* BFF8F4 80242074 0C0372DF */ jal func_800DCB7C -/* BFF8F8 80242078 46000506 */ mov.s $f20, $f0 -/* BFF8FC 8024207C 10400007 */ beqz $v0, .L8024209C -/* BFF900 80242080 00000000 */ nop -/* BFF904 80242084 4616A082 */ mul.s $f2, $f20, $f22 -/* BFF908 80242088 00000000 */ nop -/* BFF90C 8024208C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BFF910 80242090 461A0000 */ add.s $f0, $f0, $f26 -/* BFF914 80242094 0809082A */ j .L802420A8 -/* BFF918 80242098 46020000 */ add.s $f0, $f0, $f2 -.L8024209C: -/* BFF91C 8024209C 4616A002 */ mul.s $f0, $f20, $f22 -/* BFF920 802420A0 00000000 */ nop -/* BFF924 802420A4 4600C000 */ add.s $f0, $f24, $f0 -.L802420A8: -/* BFF928 802420A8 E620003C */ swc1 $f0, 0x3c($s1) -/* BFF92C 802420AC 8E020074 */ lw $v0, 0x74($s0) -/* BFF930 802420B0 2442000C */ addiu $v0, $v0, 0xc -/* BFF934 802420B4 44826000 */ mtc1 $v0, $f12 -/* BFF938 802420B8 00000000 */ nop -/* BFF93C 802420BC 0C00A6C9 */ jal clamp_angle -/* BFF940 802420C0 46806320 */ cvt.s.w $f12, $f12 -/* BFF944 802420C4 4600020D */ trunc.w.s $f8, $f0 -/* BFF948 802420C8 E6080074 */ swc1 $f8, 0x74($s0) -/* BFF94C 802420CC 8E420074 */ lw $v0, 0x74($s2) -/* BFF950 802420D0 1C400037 */ bgtz $v0, .L802421B0 -/* BFF954 802420D4 2442FFFF */ addiu $v0, $v0, -1 -/* BFF958 802420D8 8E620014 */ lw $v0, 0x14($s3) -/* BFF95C 802420DC AE420074 */ sw $v0, 0x74($s2) -/* BFF960 802420E0 C662000C */ lwc1 $f2, 0xc($s3) -/* BFF964 802420E4 3C013FE0 */ lui $at, 0x3fe0 -/* BFF968 802420E8 44812800 */ mtc1 $at, $f5 -/* BFF96C 802420EC 44802000 */ mtc1 $zero, $f4 -/* BFF970 802420F0 460010A1 */ cvt.d.s $f2, $f2 -/* BFF974 802420F4 46241082 */ mul.d $f2, $f2, $f4 -/* BFF978 802420F8 00000000 */ nop -/* BFF97C 802420FC C6600010 */ lwc1 $f0, 0x10($s3) -/* BFF980 80242100 46000021 */ cvt.d.s $f0, $f0 -/* BFF984 80242104 46240002 */ mul.d $f0, $f0, $f4 -/* BFF988 80242108 00000000 */ nop -/* BFF98C 8024210C 0280202D */ daddu $a0, $s4, $zero -/* BFF990 80242110 462010A0 */ cvt.s.d $f2, $f2 -/* BFF994 80242114 46200020 */ cvt.s.d $f0, $f0 -/* BFF998 80242118 44061000 */ mfc1 $a2, $f2 -/* BFF99C 8024211C 44070000 */ mfc1 $a3, $f0 -/* BFF9A0 80242120 0200282D */ daddu $a1, $s0, $zero -/* BFF9A4 80242124 0C01242D */ jal func_800490B4 -/* BFF9A8 80242128 AFA00010 */ sw $zero, 0x10($sp) -/* BFF9AC 8024212C 1040001E */ beqz $v0, .L802421A8 -/* BFF9B0 80242130 0000202D */ daddu $a0, $zero, $zero -/* BFF9B4 80242134 0220282D */ daddu $a1, $s1, $zero -/* BFF9B8 80242138 0000302D */ daddu $a2, $zero, $zero -/* BFF9BC 8024213C 2410000C */ addiu $s0, $zero, 0xc -/* BFF9C0 80242140 862300A8 */ lh $v1, 0xa8($s1) -/* BFF9C4 80242144 3C013F80 */ lui $at, 0x3f80 -/* BFF9C8 80242148 44810000 */ mtc1 $at, $f0 -/* BFF9CC 8024214C 3C014000 */ lui $at, 0x4000 -/* BFF9D0 80242150 44811000 */ mtc1 $at, $f2 -/* BFF9D4 80242154 3C01C1A0 */ lui $at, 0xc1a0 -/* BFF9D8 80242158 44812000 */ mtc1 $at, $f4 -/* BFF9DC 8024215C 44834000 */ mtc1 $v1, $f8 -/* BFF9E0 80242160 00000000 */ nop -/* BFF9E4 80242164 46804220 */ cvt.s.w $f8, $f8 -/* BFF9E8 80242168 44074000 */ mfc1 $a3, $f8 -/* BFF9EC 8024216C 27A20038 */ addiu $v0, $sp, 0x38 -/* BFF9F0 80242170 AFB0001C */ sw $s0, 0x1c($sp) -/* BFF9F4 80242174 AFA20020 */ sw $v0, 0x20($sp) -/* BFF9F8 80242178 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFF9FC 8024217C E7A20014 */ swc1 $f2, 0x14($sp) -/* BFFA00 80242180 0C01BFA4 */ jal fx_emote -/* BFFA04 80242184 E7A40018 */ swc1 $f4, 0x18($sp) -/* BFFA08 80242188 0220202D */ daddu $a0, $s1, $zero -/* BFFA0C 8024218C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BFFA10 80242190 0C012530 */ jal func_800494C0 -/* BFFA14 80242194 3C060020 */ lui $a2, 0x20 -/* BFFA18 80242198 C620003C */ lwc1 $f0, 0x3c($s1) -/* BFFA1C 8024219C E6200064 */ swc1 $f0, 0x64($s1) -/* BFFA20 802421A0 080908A0 */ j .L80242280 -/* BFFA24 802421A4 AE500070 */ sw $s0, 0x70($s2) -.L802421A8: -/* BFFA28 802421A8 8E420074 */ lw $v0, 0x74($s2) -/* BFFA2C 802421AC 2442FFFF */ addiu $v0, $v0, -1 -.L802421B0: -/* BFFA30 802421B0 AE420074 */ sw $v0, 0x74($s2) -/* BFFA34 802421B4 8622008C */ lh $v0, 0x8c($s1) -/* BFFA38 802421B8 14400031 */ bnez $v0, .L80242280 -/* BFFA3C 802421BC 00000000 */ nop -/* BFFA40 802421C0 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BFFA44 802421C4 8E0200D0 */ lw $v0, 0xd0($s0) -/* BFFA48 802421C8 C62E0040 */ lwc1 $f14, 0x40($s1) -/* BFFA4C 802421CC C4480000 */ lwc1 $f8, ($v0) -/* BFFA50 802421D0 46804220 */ cvt.s.w $f8, $f8 -/* BFFA54 802421D4 44064000 */ mfc1 $a2, $f8 -/* BFFA58 802421D8 C4480008 */ lwc1 $f8, 8($v0) -/* BFFA5C 802421DC 46804220 */ cvt.s.w $f8, $f8 -/* BFFA60 802421E0 44074000 */ mfc1 $a3, $f8 -/* BFFA64 802421E4 0C00A720 */ jal atan2 -/* BFFA68 802421E8 00000000 */ nop -/* BFFA6C 802421EC 8E250018 */ lw $a1, 0x18($s1) -/* BFFA70 802421F0 44060000 */ mfc1 $a2, $f0 -/* BFFA74 802421F4 0220202D */ daddu $a0, $s1, $zero -/* BFFA78 802421F8 0C00EA95 */ jal npc_move_heading -/* BFFA7C 802421FC AE26000C */ sw $a2, 0xc($s1) -/* BFFA80 80242200 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BFFA84 80242204 8E0200D0 */ lw $v0, 0xd0($s0) -/* BFFA88 80242208 C62E0040 */ lwc1 $f14, 0x40($s1) -/* BFFA8C 8024220C C4480000 */ lwc1 $f8, ($v0) -/* BFFA90 80242210 46804220 */ cvt.s.w $f8, $f8 -/* BFFA94 80242214 44064000 */ mfc1 $a2, $f8 -/* BFFA98 80242218 C4480008 */ lwc1 $f8, 8($v0) -/* BFFA9C 8024221C 46804220 */ cvt.s.w $f8, $f8 -/* BFFAA0 80242220 44074000 */ mfc1 $a3, $f8 -/* BFFAA4 80242224 0C00A7B5 */ jal dist2D -/* BFFAA8 80242228 00000000 */ nop -/* BFFAAC 8024222C C6220018 */ lwc1 $f2, 0x18($s1) -/* BFFAB0 80242230 46021080 */ add.s $f2, $f2, $f2 -/* BFFAB4 80242234 4602003E */ c.le.s $f0, $f2 -/* BFFAB8 80242238 00000000 */ nop -/* BFFABC 8024223C 45000010 */ bc1f .L80242280 -/* BFFAC0 80242240 E7A00034 */ swc1 $f0, 0x34($sp) -/* BFFAC4 80242244 0C00A67F */ jal rand_int -/* BFFAC8 80242248 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BFFACC 8024224C 3C035555 */ lui $v1, 0x5555 -/* BFFAD0 80242250 34635556 */ ori $v1, $v1, 0x5556 -/* BFFAD4 80242254 00430018 */ mult $v0, $v1 -/* BFFAD8 80242258 24030002 */ addiu $v1, $zero, 2 -/* BFFADC 8024225C 000227C3 */ sra $a0, $v0, 0x1f -/* BFFAE0 80242260 AE430070 */ sw $v1, 0x70($s2) -/* BFFAE4 80242264 00004010 */ mfhi $t0 -/* BFFAE8 80242268 01042023 */ subu $a0, $t0, $a0 -/* BFFAEC 8024226C 00041840 */ sll $v1, $a0, 1 -/* BFFAF0 80242270 00641821 */ addu $v1, $v1, $a0 -/* BFFAF4 80242274 00431023 */ subu $v0, $v0, $v1 -/* BFFAF8 80242278 24420002 */ addiu $v0, $v0, 2 -/* BFFAFC 8024227C AE420074 */ sw $v0, 0x74($s2) -.L80242280: -/* BFFB00 80242280 8FBF0054 */ lw $ra, 0x54($sp) -/* BFFB04 80242284 8FB40050 */ lw $s4, 0x50($sp) -/* BFFB08 80242288 8FB3004C */ lw $s3, 0x4c($sp) -/* BFFB0C 8024228C 8FB20048 */ lw $s2, 0x48($sp) -/* BFFB10 80242290 8FB10044 */ lw $s1, 0x44($sp) -/* BFFB14 80242294 8FB00040 */ lw $s0, 0x40($sp) -/* BFFB18 80242298 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* BFFB1C 8024229C D7B80068 */ ldc1 $f24, 0x68($sp) -/* BFFB20 802422A0 D7B60060 */ ldc1 $f22, 0x60($sp) -/* BFFB24 802422A4 D7B40058 */ ldc1 $f20, 0x58($sp) -/* BFFB28 802422A8 03E00008 */ jr $ra -/* BFFB2C 802422AC 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_802422B0_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_802422B0_BFD880.s deleted file mode 100644 index 8fde1529c8..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_802422B0_BFD880.s +++ /dev/null @@ -1,166 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422B0_BFFB30 -/* BFFB30 802422B0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* BFFB34 802422B4 AFB40050 */ sw $s4, 0x50($sp) -/* BFFB38 802422B8 0080A02D */ daddu $s4, $a0, $zero -/* BFFB3C 802422BC AFBF0058 */ sw $ra, 0x58($sp) -/* BFFB40 802422C0 AFB50054 */ sw $s5, 0x54($sp) -/* BFFB44 802422C4 AFB3004C */ sw $s3, 0x4c($sp) -/* BFFB48 802422C8 AFB20048 */ sw $s2, 0x48($sp) -/* BFFB4C 802422CC AFB10044 */ sw $s1, 0x44($sp) -/* BFFB50 802422D0 AFB00040 */ sw $s0, 0x40($sp) -/* BFFB54 802422D4 8E920148 */ lw $s2, 0x148($s4) -/* BFFB58 802422D8 86440008 */ lh $a0, 8($s2) -/* BFFB5C 802422DC 0C00EABB */ jal get_npc_unsafe -/* BFFB60 802422E0 00A0802D */ daddu $s0, $a1, $zero -/* BFFB64 802422E4 8E83000C */ lw $v1, 0xc($s4) -/* BFFB68 802422E8 0280202D */ daddu $a0, $s4, $zero -/* BFFB6C 802422EC 8C650000 */ lw $a1, ($v1) -/* BFFB70 802422F0 0C0B1EAF */ jal get_variable -/* BFFB74 802422F4 0040A82D */ daddu $s5, $v0, $zero -/* BFFB78 802422F8 AFA00020 */ sw $zero, 0x20($sp) -/* BFFB7C 802422FC 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFFB80 80242300 8C630030 */ lw $v1, 0x30($v1) -/* BFFB84 80242304 AFA30024 */ sw $v1, 0x24($sp) -/* BFFB88 80242308 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFFB8C 8024230C 8C63001C */ lw $v1, 0x1c($v1) -/* BFFB90 80242310 AFA30028 */ sw $v1, 0x28($sp) -/* BFFB94 80242314 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFFB98 80242318 8C630024 */ lw $v1, 0x24($v1) -/* BFFB9C 8024231C AFA3002C */ sw $v1, 0x2c($sp) -/* BFFBA0 80242320 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFFBA4 80242324 8C630028 */ lw $v1, 0x28($v1) -/* BFFBA8 80242328 27B30020 */ addiu $s3, $sp, 0x20 -/* BFFBAC 8024232C AFA30030 */ sw $v1, 0x30($sp) -/* BFFBB0 80242330 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFFBB4 80242334 3C0142FA */ lui $at, 0x42fa -/* BFFBB8 80242338 44810000 */ mtc1 $at, $f0 -/* BFFBBC 8024233C 8C63002C */ lw $v1, 0x2c($v1) -/* BFFBC0 80242340 0040882D */ daddu $s1, $v0, $zero -/* BFFBC4 80242344 E7A00038 */ swc1 $f0, 0x38($sp) -/* BFFBC8 80242348 A7A0003C */ sh $zero, 0x3c($sp) -/* BFFBCC 8024234C 12000007 */ beqz $s0, .L8024236C -/* BFFBD0 80242350 AFA30034 */ sw $v1, 0x34($sp) -/* BFFBD4 80242354 AE800070 */ sw $zero, 0x70($s4) -/* BFFBD8 80242358 02A0202D */ daddu $a0, $s5, $zero -/* BFFBDC 8024235C 0240282D */ daddu $a1, $s2, $zero -/* BFFBE0 80242360 0280302D */ daddu $a2, $s4, $zero -/* BFFBE4 80242364 0C0904C2 */ jal func_80241308 -/* BFFBE8 80242368 0220382D */ daddu $a3, $s1, $zero -.L8024236C: -/* BFFBEC 8024236C 8E830070 */ lw $v1, 0x70($s4) -/* BFFBF0 80242370 2C620020 */ sltiu $v0, $v1, 0x20 -/* BFFBF4 80242374 10400060 */ beqz $v0, .L802424F8 -/* BFFBF8 80242378 00031080 */ sll $v0, $v1, 2 -/* BFFBFC 8024237C 3C018026 */ lui $at, 0x8026 -/* BFFC00 80242380 00220821 */ addu $at, $at, $v0 -/* BFFC04 80242384 8C223488 */ lw $v0, 0x3488($at) -/* BFFC08 80242388 00400008 */ jr $v0 -/* BFFC0C 8024238C 00000000 */ nop -/* BFFC10 80242390 0280202D */ daddu $a0, $s4, $zero -/* BFFC14 80242394 0220282D */ daddu $a1, $s1, $zero -/* BFFC18 80242398 0C090048 */ jal func_80240120 -/* BFFC1C 8024239C 0260302D */ daddu $a2, $s3, $zero -/* BFFC20 802423A0 0000282D */ daddu $a1, $zero, $zero -/* BFFC24 802423A4 00A0302D */ daddu $a2, $a1, $zero -/* BFFC28 802423A8 AFA00010 */ sw $zero, 0x10($sp) -/* BFFC2C 802423AC AFA00014 */ sw $zero, 0x14($sp) -/* BFFC30 802423B0 AFA00018 */ sw $zero, 0x18($sp) -/* BFFC34 802423B4 8EA40024 */ lw $a0, 0x24($s5) -/* BFFC38 802423B8 0C0B7A25 */ jal func_802DE894 -/* BFFC3C 802423BC 00A0382D */ daddu $a3, $a1, $zero -/* BFFC40 802423C0 0280202D */ daddu $a0, $s4, $zero -/* BFFC44 802423C4 0220282D */ daddu $a1, $s1, $zero -/* BFFC48 802423C8 0C0900B4 */ jal func_802402D0 -/* BFFC4C 802423CC 0260302D */ daddu $a2, $s3, $zero -/* BFFC50 802423D0 080908FE */ j .L802423F8 -/* BFFC54 802423D4 00000000 */ nop -/* BFFC58 802423D8 0280202D */ daddu $a0, $s4, $zero -/* BFFC5C 802423DC 0220282D */ daddu $a1, $s1, $zero -/* BFFC60 802423E0 0C09023E */ jal func_802408F8 -/* BFFC64 802423E4 0260302D */ daddu $a2, $s3, $zero -/* BFFC68 802423E8 0280202D */ daddu $a0, $s4, $zero -/* BFFC6C 802423EC 0220282D */ daddu $a1, $s1, $zero -/* BFFC70 802423F0 0C09026E */ jal func_802409B8 -/* BFFC74 802423F4 0260302D */ daddu $a2, $s3, $zero -.L802423F8: -/* BFFC78 802423F8 8E830070 */ lw $v1, 0x70($s4) -/* BFFC7C 802423FC 2402000C */ addiu $v0, $zero, 0xc -/* BFFC80 80242400 1462003D */ bne $v1, $v0, .L802424F8 -/* BFFC84 80242404 24020006 */ addiu $v0, $zero, 6 -/* BFFC88 80242408 0809093E */ j .L802424F8 -/* BFFC8C 8024240C A6A2008E */ sh $v0, 0x8e($s5) -/* BFFC90 80242410 0280202D */ daddu $a0, $s4, $zero -/* BFFC94 80242414 0220282D */ daddu $a1, $s1, $zero -/* BFFC98 80242418 0C090586 */ jal func_80241618 -/* BFFC9C 8024241C 0260302D */ daddu $a2, $s3, $zero -/* BFFCA0 80242420 8E830070 */ lw $v1, 0x70($s4) -/* BFFCA4 80242424 2402000D */ addiu $v0, $zero, 0xd -/* BFFCA8 80242428 14620033 */ bne $v1, $v0, .L802424F8 -/* BFFCAC 8024242C 00000000 */ nop -/* BFFCB0 80242430 0280202D */ daddu $a0, $s4, $zero -/* BFFCB4 80242434 0220282D */ daddu $a1, $s1, $zero -/* BFFCB8 80242438 0C0905DC */ jal func_80241770 -/* BFFCBC 8024243C 0260302D */ daddu $a2, $s3, $zero -/* BFFCC0 80242440 0809093E */ j .L802424F8 -/* BFFCC4 80242444 00000000 */ nop -/* BFFCC8 80242448 0280202D */ daddu $a0, $s4, $zero -/* BFFCCC 8024244C 0220282D */ daddu $a1, $s1, $zero -/* BFFCD0 80242450 0C09061D */ jal func_80241874 -/* BFFCD4 80242454 0260302D */ daddu $a2, $s3, $zero -/* BFFCD8 80242458 8E830070 */ lw $v1, 0x70($s4) -/* BFFCDC 8024245C 2402000F */ addiu $v0, $zero, 0xf -/* BFFCE0 80242460 14620025 */ bne $v1, $v0, .L802424F8 -/* BFFCE4 80242464 00000000 */ nop -/* BFFCE8 80242468 0280202D */ daddu $a0, $s4, $zero -/* BFFCEC 8024246C 0220282D */ daddu $a1, $s1, $zero -/* BFFCF0 80242470 0C090655 */ jal func_80241954 -/* BFFCF4 80242474 0260302D */ daddu $a2, $s3, $zero -/* BFFCF8 80242478 0809093E */ j .L802424F8 -/* BFFCFC 8024247C 00000000 */ nop -/* BFFD00 80242480 0280202D */ daddu $a0, $s4, $zero -/* BFFD04 80242484 0220282D */ daddu $a1, $s1, $zero -/* BFFD08 80242488 0C0906FC */ jal func_80241BF0 -/* BFFD0C 8024248C 0260302D */ daddu $a2, $s3, $zero -/* BFFD10 80242490 0280202D */ daddu $a0, $s4, $zero -/* BFFD14 80242494 0220282D */ daddu $a1, $s1, $zero -/* BFFD18 80242498 0C09072A */ jal func_80241CA8 -/* BFFD1C 8024249C 0260302D */ daddu $a2, $s3, $zero -/* BFFD20 802424A0 0809093E */ j .L802424F8 -/* BFFD24 802424A4 00000000 */ nop -/* BFFD28 802424A8 0280202D */ daddu $a0, $s4, $zero -/* BFFD2C 802424AC 0220282D */ daddu $a1, $s1, $zero -/* BFFD30 802424B0 0C09078A */ jal func_80241E28 -/* BFFD34 802424B4 0260302D */ daddu $a2, $s3, $zero -/* BFFD38 802424B8 0809093E */ j .L802424F8 -/* BFFD3C 802424BC 00000000 */ nop -/* BFFD40 802424C0 0280202D */ daddu $a0, $s4, $zero -/* BFFD44 802424C4 0220282D */ daddu $a1, $s1, $zero -/* BFFD48 802424C8 0C09079C */ jal func_80241E70 -/* BFFD4C 802424CC 0260302D */ daddu $a2, $s3, $zero -/* BFFD50 802424D0 0809093E */ j .L802424F8 -/* BFFD54 802424D4 00000000 */ nop -/* BFFD58 802424D8 0280202D */ daddu $a0, $s4, $zero -/* BFFD5C 802424DC 0220282D */ daddu $a1, $s1, $zero -/* BFFD60 802424E0 0C0907BC */ jal func_80241EF0 -/* BFFD64 802424E4 0260302D */ daddu $a2, $s3, $zero -/* BFFD68 802424E8 0280202D */ daddu $a0, $s4, $zero -/* BFFD6C 802424EC 0220282D */ daddu $a1, $s1, $zero -/* BFFD70 802424F0 0C0907E6 */ jal func_80241F98 -/* BFFD74 802424F4 0260302D */ daddu $a2, $s3, $zero -.L802424F8: -/* BFFD78 802424F8 8E820070 */ lw $v0, 0x70($s4) -/* BFFD7C 802424FC 8FBF0058 */ lw $ra, 0x58($sp) -/* BFFD80 80242500 8FB50054 */ lw $s5, 0x54($sp) -/* BFFD84 80242504 8FB40050 */ lw $s4, 0x50($sp) -/* BFFD88 80242508 8FB3004C */ lw $s3, 0x4c($sp) -/* BFFD8C 8024250C 8FB20048 */ lw $s2, 0x48($sp) -/* BFFD90 80242510 8FB10044 */ lw $s1, 0x44($sp) -/* BFFD94 80242514 8FB00040 */ lw $s0, 0x40($sp) -/* BFFD98 80242518 38420064 */ xori $v0, $v0, 0x64 -/* BFFD9C 8024251C 2C420001 */ sltiu $v0, $v0, 1 -/* BFFDA0 80242520 00021040 */ sll $v0, $v0, 1 -/* BFFDA4 80242524 03E00008 */ jr $ra -/* BFFDA8 80242528 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_80242BA8_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_80242BA8_BFD880.s deleted file mode 100644 index 13c6335571..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_80242BA8_BFD880.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242BA8_C00428 -/* C00428 80242BA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C0042C 80242BAC AFB10014 */ sw $s1, 0x14($sp) -/* C00430 80242BB0 0080882D */ daddu $s1, $a0, $zero -/* C00434 80242BB4 AFBF001C */ sw $ra, 0x1c($sp) -/* C00438 80242BB8 AFB20018 */ sw $s2, 0x18($sp) -/* C0043C 80242BBC AFB00010 */ sw $s0, 0x10($sp) -/* C00440 80242BC0 8E300148 */ lw $s0, 0x148($s1) -/* C00444 80242BC4 86040008 */ lh $a0, 8($s0) -/* C00448 80242BC8 0C00EABB */ jal get_npc_unsafe -/* C0044C 80242BCC 00A0902D */ daddu $s2, $a1, $zero -/* C00450 80242BD0 8E230078 */ lw $v1, 0x78($s1) -/* C00454 80242BD4 24630001 */ addiu $v1, $v1, 1 -/* C00458 80242BD8 AE230078 */ sw $v1, 0x78($s1) -/* C0045C 80242BDC 8E0400D0 */ lw $a0, 0xd0($s0) -/* C00460 80242BE0 8C840000 */ lw $a0, ($a0) -/* C00464 80242BE4 0064182A */ slt $v1, $v1, $a0 -/* C00468 80242BE8 14600002 */ bnez $v1, .L80242BF4 -/* C0046C 80242BEC 0040282D */ daddu $a1, $v0, $zero -/* C00470 80242BF0 AE200078 */ sw $zero, 0x78($s1) -.L80242BF4: -/* C00474 80242BF4 8E0200CC */ lw $v0, 0xcc($s0) -/* C00478 80242BF8 8C420004 */ lw $v0, 4($v0) -/* C0047C 80242BFC ACA20028 */ sw $v0, 0x28($a1) -/* C00480 80242C00 8E0200D0 */ lw $v0, 0xd0($s0) -/* C00484 80242C04 8C42007C */ lw $v0, 0x7c($v0) -/* C00488 80242C08 04410004 */ bgez $v0, .L80242C1C -/* C0048C 80242C0C 00000000 */ nop -/* C00490 80242C10 C6400000 */ lwc1 $f0, ($s2) -/* C00494 80242C14 08090B0F */ j .L80242C3C -/* C00498 80242C18 E4A00018 */ swc1 $f0, 0x18($a1) -.L80242C1C: -/* C0049C 80242C1C 3C018026 */ lui $at, 0x8026 -/* C004A0 80242C20 D4223518 */ ldc1 $f2, 0x3518($at) -/* C004A4 80242C24 44820000 */ mtc1 $v0, $f0 -/* C004A8 80242C28 00000000 */ nop -/* C004AC 80242C2C 46800021 */ cvt.d.w $f0, $f0 -/* C004B0 80242C30 46220003 */ div.d $f0, $f0, $f2 -/* C004B4 80242C34 46200020 */ cvt.s.d $f0, $f0 -/* C004B8 80242C38 E4A00018 */ swc1 $f0, 0x18($a1) -.L80242C3C: -/* C004BC 80242C3C 24020001 */ addiu $v0, $zero, 1 -/* C004C0 80242C40 AE220070 */ sw $v0, 0x70($s1) -/* C004C4 80242C44 8FBF001C */ lw $ra, 0x1c($sp) -/* C004C8 80242C48 8FB20018 */ lw $s2, 0x18($sp) -/* C004CC 80242C4C 8FB10014 */ lw $s1, 0x14($sp) -/* C004D0 80242C50 8FB00010 */ lw $s0, 0x10($sp) -/* C004D4 80242C54 03E00008 */ jr $ra -/* C004D8 80242C58 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_80242C5C_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_80242C5C_BFD880.s deleted file mode 100644 index 9ea44ce924..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_80242C5C_BFD880.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C5C_C004DC -/* C004DC 80242C5C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C004E0 80242C60 AFB10014 */ sw $s1, 0x14($sp) -/* C004E4 80242C64 0080882D */ daddu $s1, $a0, $zero -/* C004E8 80242C68 AFBF0018 */ sw $ra, 0x18($sp) -/* C004EC 80242C6C AFB00010 */ sw $s0, 0x10($sp) -/* C004F0 80242C70 8E300148 */ lw $s0, 0x148($s1) -/* C004F4 80242C74 0C00EABB */ jal get_npc_unsafe -/* C004F8 80242C78 86040008 */ lh $a0, 8($s0) -/* C004FC 80242C7C 8E0300CC */ lw $v1, 0xcc($s0) -/* C00500 80242C80 3C014120 */ lui $at, 0x4120 -/* C00504 80242C84 44812000 */ mtc1 $at, $f4 -/* C00508 80242C88 3C014000 */ lui $at, 0x4000 -/* C0050C 80242C8C 44810000 */ mtc1 $at, $f0 -/* C00510 80242C90 C442003C */ lwc1 $f2, 0x3c($v0) -/* C00514 80242C94 8C640010 */ lw $a0, 0x10($v1) -/* C00518 80242C98 8C430000 */ lw $v1, ($v0) -/* C0051C 80242C9C E444001C */ swc1 $f4, 0x1c($v0) -/* C00520 80242CA0 E4400014 */ swc1 $f0, 0x14($v0) -/* C00524 80242CA4 E4420064 */ swc1 $f2, 0x64($v0) -/* C00528 80242CA8 34630800 */ ori $v1, $v1, 0x800 -/* C0052C 80242CAC AC430000 */ sw $v1, ($v0) -/* C00530 80242CB0 AC440028 */ sw $a0, 0x28($v0) -/* C00534 80242CB4 2402000B */ addiu $v0, $zero, 0xb -/* C00538 80242CB8 AE220070 */ sw $v0, 0x70($s1) -/* C0053C 80242CBC 8FBF0018 */ lw $ra, 0x18($sp) -/* C00540 80242CC0 8FB10014 */ lw $s1, 0x14($sp) -/* C00544 80242CC4 8FB00010 */ lw $s0, 0x10($sp) -/* C00548 80242CC8 03E00008 */ jr $ra -/* C0054C 80242CCC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_80243000_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_80243000_BFD880.s deleted file mode 100644 index 3752f7d2f3..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_80243000_BFD880.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243000_C00880 -/* C00880 80243000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C00884 80243004 AFB10014 */ sw $s1, 0x14($sp) -/* C00888 80243008 0080882D */ daddu $s1, $a0, $zero -/* C0088C 8024300C AFBF001C */ sw $ra, 0x1c($sp) -/* C00890 80243010 AFB20018 */ sw $s2, 0x18($sp) -/* C00894 80243014 AFB00010 */ sw $s0, 0x10($sp) -/* C00898 80243018 8E300148 */ lw $s0, 0x148($s1) -/* C0089C 8024301C 86040008 */ lh $a0, 8($s0) -/* C008A0 80243020 0C00EABB */ jal get_npc_unsafe -/* C008A4 80243024 00A0902D */ daddu $s2, $a1, $zero -/* C008A8 80243028 8E0300D0 */ lw $v1, 0xd0($s0) -/* C008AC 8024302C 8E240078 */ lw $a0, 0x78($s1) -/* C008B0 80243030 8C630000 */ lw $v1, ($v1) -/* C008B4 80243034 0083182A */ slt $v1, $a0, $v1 -/* C008B8 80243038 10600013 */ beqz $v1, .L80243088 -/* C008BC 8024303C 0040302D */ daddu $a2, $v0, $zero -/* C008C0 80243040 00041040 */ sll $v0, $a0, 1 -/* C008C4 80243044 00441021 */ addu $v0, $v0, $a0 -/* C008C8 80243048 00022880 */ sll $a1, $v0, 2 -.L8024304C: -/* C008CC 8024304C 8E0300D0 */ lw $v1, 0xd0($s0) -/* C008D0 80243050 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* C008D4 80243054 00A31021 */ addu $v0, $a1, $v1 -/* C008D8 80243058 C4400008 */ lwc1 $f0, 8($v0) -/* C008DC 8024305C 46800020 */ cvt.s.w $f0, $f0 -/* C008E0 80243060 4602003E */ c.le.s $f0, $f2 -/* C008E4 80243064 00000000 */ nop -/* C008E8 80243068 45020003 */ bc1fl .L80243078 -/* C008EC 8024306C 24840001 */ addiu $a0, $a0, 1 -/* C008F0 80243070 08090C22 */ j .L80243088 -/* C008F4 80243074 AE240078 */ sw $a0, 0x78($s1) -.L80243078: -/* C008F8 80243078 8C620000 */ lw $v0, ($v1) -/* C008FC 8024307C 0082102A */ slt $v0, $a0, $v0 -/* C00900 80243080 1440FFF2 */ bnez $v0, .L8024304C -/* C00904 80243084 24A5000C */ addiu $a1, $a1, 0xc -.L80243088: -/* C00908 80243088 C6400000 */ lwc1 $f0, ($s2) -/* C0090C 8024308C E4C00018 */ swc1 $f0, 0x18($a2) -/* C00910 80243090 8E0200CC */ lw $v0, 0xcc($s0) -/* C00914 80243094 8C420004 */ lw $v0, 4($v0) -/* C00918 80243098 ACC20028 */ sw $v0, 0x28($a2) -/* C0091C 8024309C 24020001 */ addiu $v0, $zero, 1 -/* C00920 802430A0 AE200074 */ sw $zero, 0x74($s1) -/* C00924 802430A4 AE220070 */ sw $v0, 0x70($s1) -/* C00928 802430A8 8FBF001C */ lw $ra, 0x1c($sp) -/* C0092C 802430AC 8FB20018 */ lw $s2, 0x18($sp) -/* C00930 802430B0 8FB10014 */ lw $s1, 0x14($sp) -/* C00934 802430B4 8FB00010 */ lw $s0, 0x10($sp) -/* C00938 802430B8 03E00008 */ jr $ra -/* C0093C 802430BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_802430C0_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_802430C0_BFD880.s deleted file mode 100644 index 7952cce341..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_802430C0_BFD880.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802430C0_C00940 -/* C00940 802430C0 27BDFF98 */ addiu $sp, $sp, -0x68 -/* C00944 802430C4 AFB40058 */ sw $s4, 0x58($sp) -/* C00948 802430C8 0080A02D */ daddu $s4, $a0, $zero -/* C0094C 802430CC AFBF0060 */ sw $ra, 0x60($sp) -/* C00950 802430D0 AFB5005C */ sw $s5, 0x5c($sp) -/* C00954 802430D4 AFB30054 */ sw $s3, 0x54($sp) -/* C00958 802430D8 AFB20050 */ sw $s2, 0x50($sp) -/* C0095C 802430DC AFB1004C */ sw $s1, 0x4c($sp) -/* C00960 802430E0 AFB00048 */ sw $s0, 0x48($sp) -/* C00964 802430E4 8E910148 */ lw $s1, 0x148($s4) -/* C00968 802430E8 86240008 */ lh $a0, 8($s1) -/* C0096C 802430EC 0C00EABB */ jal get_npc_unsafe -/* C00970 802430F0 00A0802D */ daddu $s0, $a1, $zero -/* C00974 802430F4 8E83000C */ lw $v1, 0xc($s4) -/* C00978 802430F8 0280202D */ daddu $a0, $s4, $zero -/* C0097C 802430FC 8C650000 */ lw $a1, ($v1) -/* C00980 80243100 0C0B1EAF */ jal get_variable -/* C00984 80243104 0040902D */ daddu $s2, $v0, $zero -/* C00988 80243108 AFA00018 */ sw $zero, 0x18($sp) -/* C0098C 8024310C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C00990 80243110 8C630094 */ lw $v1, 0x94($v1) -/* C00994 80243114 AFA3001C */ sw $v1, 0x1c($sp) -/* C00998 80243118 8E2300D0 */ lw $v1, 0xd0($s1) -/* C0099C 8024311C 8C630080 */ lw $v1, 0x80($v1) -/* C009A0 80243120 AFA30020 */ sw $v1, 0x20($sp) -/* C009A4 80243124 8E2300D0 */ lw $v1, 0xd0($s1) -/* C009A8 80243128 8C630088 */ lw $v1, 0x88($v1) -/* C009AC 8024312C AFA30024 */ sw $v1, 0x24($sp) -/* C009B0 80243130 8E2300D0 */ lw $v1, 0xd0($s1) -/* C009B4 80243134 8C63008C */ lw $v1, 0x8c($v1) -/* C009B8 80243138 27B50018 */ addiu $s5, $sp, 0x18 -/* C009BC 8024313C AFA30028 */ sw $v1, 0x28($sp) -/* C009C0 80243140 8E2300D0 */ lw $v1, 0xd0($s1) -/* C009C4 80243144 3C014282 */ lui $at, 0x4282 -/* C009C8 80243148 44810000 */ mtc1 $at, $f0 -/* C009CC 8024314C 8C630090 */ lw $v1, 0x90($v1) -/* C009D0 80243150 0040982D */ daddu $s3, $v0, $zero -/* C009D4 80243154 E7A00030 */ swc1 $f0, 0x30($sp) -/* C009D8 80243158 A7A00034 */ sh $zero, 0x34($sp) -/* C009DC 8024315C 16000005 */ bnez $s0, .L80243174 -/* C009E0 80243160 AFA3002C */ sw $v1, 0x2c($sp) -/* C009E4 80243164 8E2200B0 */ lw $v0, 0xb0($s1) -/* C009E8 80243168 30420004 */ andi $v0, $v0, 4 -/* C009EC 8024316C 10400044 */ beqz $v0, .L80243280 -/* C009F0 80243170 00000000 */ nop -.L80243174: -/* C009F4 80243174 2404F7FF */ addiu $a0, $zero, -0x801 -/* C009F8 80243178 AE800070 */ sw $zero, 0x70($s4) -/* C009FC 8024317C A640008E */ sh $zero, 0x8e($s2) -/* C00A00 80243180 8E2200CC */ lw $v0, 0xcc($s1) -/* C00A04 80243184 8E430000 */ lw $v1, ($s2) -/* C00A08 80243188 8C420000 */ lw $v0, ($v0) -/* C00A0C 8024318C 00641824 */ and $v1, $v1, $a0 -/* C00A10 80243190 AE430000 */ sw $v1, ($s2) -/* C00A14 80243194 AE420028 */ sw $v0, 0x28($s2) -/* C00A18 80243198 8E2200D0 */ lw $v0, 0xd0($s1) -/* C00A1C 8024319C 8C420098 */ lw $v0, 0x98($v0) -/* C00A20 802431A0 54400005 */ bnel $v0, $zero, .L802431B8 -/* C00A24 802431A4 2402FDFF */ addiu $v0, $zero, -0x201 -/* C00A28 802431A8 34620200 */ ori $v0, $v1, 0x200 -/* C00A2C 802431AC 2403FFF7 */ addiu $v1, $zero, -9 -/* C00A30 802431B0 08090C70 */ j .L802431C0 -/* C00A34 802431B4 00431024 */ and $v0, $v0, $v1 -.L802431B8: -/* C00A38 802431B8 00621024 */ and $v0, $v1, $v0 -/* C00A3C 802431BC 34420008 */ ori $v0, $v0, 8 -.L802431C0: -/* C00A40 802431C0 AE420000 */ sw $v0, ($s2) -/* C00A44 802431C4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C00A48 802431C8 30420004 */ andi $v0, $v0, 4 -/* C00A4C 802431CC 10400008 */ beqz $v0, .L802431F0 -/* C00A50 802431D0 24020063 */ addiu $v0, $zero, 0x63 -/* C00A54 802431D4 AE820070 */ sw $v0, 0x70($s4) -/* C00A58 802431D8 AE800074 */ sw $zero, 0x74($s4) -/* C00A5C 802431DC 8E2200B0 */ lw $v0, 0xb0($s1) -/* C00A60 802431E0 2403FFFB */ addiu $v1, $zero, -5 -/* C00A64 802431E4 00431024 */ and $v0, $v0, $v1 -/* C00A68 802431E8 08090C87 */ j .L8024321C -/* C00A6C 802431EC AE2200B0 */ sw $v0, 0xb0($s1) -.L802431F0: -/* C00A70 802431F0 8E220000 */ lw $v0, ($s1) -/* C00A74 802431F4 3C034000 */ lui $v1, 0x4000 -/* C00A78 802431F8 00431024 */ and $v0, $v0, $v1 -/* C00A7C 802431FC 10400007 */ beqz $v0, .L8024321C -/* C00A80 80243200 3C03BFFF */ lui $v1, 0xbfff -/* C00A84 80243204 2402000C */ addiu $v0, $zero, 0xc -/* C00A88 80243208 AE820070 */ sw $v0, 0x70($s4) -/* C00A8C 8024320C 8E220000 */ lw $v0, ($s1) -/* C00A90 80243210 3463FFFF */ ori $v1, $v1, 0xffff -/* C00A94 80243214 00431024 */ and $v0, $v0, $v1 -/* C00A98 80243218 AE220000 */ sw $v0, ($s1) -.L8024321C: -/* C00A9C 8024321C 27A50038 */ addiu $a1, $sp, 0x38 -/* C00AA0 80243220 27A6003C */ addiu $a2, $sp, 0x3c -/* C00AA4 80243224 C6400038 */ lwc1 $f0, 0x38($s2) -/* C00AA8 80243228 864200A8 */ lh $v0, 0xa8($s2) -/* C00AAC 8024322C 3C0142C8 */ lui $at, 0x42c8 -/* C00AB0 80243230 44812000 */ mtc1 $at, $f4 -/* C00AB4 80243234 44823000 */ mtc1 $v0, $f6 -/* C00AB8 80243238 00000000 */ nop -/* C00ABC 8024323C 468031A0 */ cvt.s.w $f6, $f6 -/* C00AC0 80243240 27A20044 */ addiu $v0, $sp, 0x44 -/* C00AC4 80243244 E7A00038 */ swc1 $f0, 0x38($sp) -/* C00AC8 80243248 C640003C */ lwc1 $f0, 0x3c($s2) -/* C00ACC 8024324C C6420040 */ lwc1 $f2, 0x40($s2) -/* C00AD0 80243250 46060000 */ add.s $f0, $f0, $f6 -/* C00AD4 80243254 E7A40044 */ swc1 $f4, 0x44($sp) -/* C00AD8 80243258 E7A20040 */ swc1 $f2, 0x40($sp) -/* C00ADC 8024325C E7A0003C */ swc1 $f0, 0x3c($sp) -/* C00AE0 80243260 AFA20010 */ sw $v0, 0x10($sp) -/* C00AE4 80243264 8E440080 */ lw $a0, 0x80($s2) -/* C00AE8 80243268 0C0372DF */ jal func_800DCB7C -/* C00AEC 8024326C 27A70040 */ addiu $a3, $sp, 0x40 -/* C00AF0 80243270 10400003 */ beqz $v0, .L80243280 -/* C00AF4 80243274 00000000 */ nop -/* C00AF8 80243278 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* C00AFC 8024327C E640003C */ swc1 $f0, 0x3c($s2) -.L80243280: -/* C00B00 80243280 8E830070 */ lw $v1, 0x70($s4) -/* C00B04 80243284 2C620064 */ sltiu $v0, $v1, 0x64 -/* C00B08 80243288 10400042 */ beqz $v0, .L80243394 -/* C00B0C 8024328C 00031080 */ sll $v0, $v1, 2 -/* C00B10 80243290 3C018026 */ lui $at, 0x8026 -/* C00B14 80243294 00220821 */ addu $at, $at, $v0 -/* C00B18 80243298 8C223520 */ lw $v0, 0x3520($at) -/* C00B1C 8024329C 00400008 */ jr $v0 -/* C00B20 802432A0 00000000 */ nop -/* C00B24 802432A4 0280202D */ daddu $a0, $s4, $zero -/* C00B28 802432A8 0260282D */ daddu $a1, $s3, $zero -/* C00B2C 802432AC 0C09094B */ jal func_8024252C -/* C00B30 802432B0 02A0302D */ daddu $a2, $s5, $zero -/* C00B34 802432B4 0280202D */ daddu $a0, $s4, $zero -/* C00B38 802432B8 0260282D */ daddu $a1, $s3, $zero -/* C00B3C 802432BC 0C0909A1 */ jal func_80242684 -/* C00B40 802432C0 02A0302D */ daddu $a2, $s5, $zero -/* C00B44 802432C4 08090CE5 */ j .L80243394 -/* C00B48 802432C8 00000000 */ nop -/* C00B4C 802432CC 0280202D */ daddu $a0, $s4, $zero -/* C00B50 802432D0 0260282D */ daddu $a1, $s3, $zero -/* C00B54 802432D4 0C090A4B */ jal func_8024292C -/* C00B58 802432D8 02A0302D */ daddu $a2, $s5, $zero -/* C00B5C 802432DC 0280202D */ daddu $a0, $s4, $zero -/* C00B60 802432E0 0260282D */ daddu $a1, $s3, $zero -/* C00B64 802432E4 0C090A7B */ jal func_802429EC -/* C00B68 802432E8 02A0302D */ daddu $a2, $s5, $zero -/* C00B6C 802432EC 08090CE5 */ j .L80243394 -/* C00B70 802432F0 00000000 */ nop -/* C00B74 802432F4 0280202D */ daddu $a0, $s4, $zero -/* C00B78 802432F8 0260282D */ daddu $a1, $s3, $zero -/* C00B7C 802432FC 0C090AEA */ jal func_80242BA8 -/* C00B80 80243300 02A0302D */ daddu $a2, $s5, $zero -/* C00B84 80243304 08090CE5 */ j .L80243394 -/* C00B88 80243308 00000000 */ nop -/* C00B8C 8024330C 0280202D */ daddu $a0, $s4, $zero -/* C00B90 80243310 0260282D */ daddu $a1, $s3, $zero -/* C00B94 80243314 0C090B17 */ jal func_80242C5C -/* C00B98 80243318 02A0302D */ daddu $a2, $s5, $zero -/* C00B9C 8024331C 0280202D */ daddu $a0, $s4, $zero -/* C00BA0 80243320 0260282D */ daddu $a1, $s3, $zero -/* C00BA4 80243324 0C090B34 */ jal func_80242CD0 -/* C00BA8 80243328 02A0302D */ daddu $a2, $s5, $zero -/* C00BAC 8024332C 08090CE5 */ j .L80243394 -/* C00BB0 80243330 00000000 */ nop -/* C00BB4 80243334 0280202D */ daddu $a0, $s4, $zero -/* C00BB8 80243338 0260282D */ daddu $a1, $s3, $zero -/* C00BBC 8024333C 0C090B52 */ jal func_80242D48 -/* C00BC0 80243340 02A0302D */ daddu $a2, $s5, $zero -/* C00BC4 80243344 0280202D */ daddu $a0, $s4, $zero -/* C00BC8 80243348 0260282D */ daddu $a1, $s3, $zero -/* C00BCC 8024334C 0C090B9E */ jal func_80242E78 -/* C00BD0 80243350 02A0302D */ daddu $a2, $s5, $zero -/* C00BD4 80243354 08090CE5 */ j .L80243394 -/* C00BD8 80243358 00000000 */ nop -/* C00BDC 8024335C 0280202D */ daddu $a0, $s4, $zero -/* C00BE0 80243360 0260282D */ daddu $a1, $s3, $zero -/* C00BE4 80243364 0C090BE6 */ jal func_80242F98 -/* C00BE8 80243368 02A0302D */ daddu $a2, $s5, $zero -/* C00BEC 8024336C 08090CE5 */ j .L80243394 -/* C00BF0 80243370 00000000 */ nop -/* C00BF4 80243374 0280202D */ daddu $a0, $s4, $zero -/* C00BF8 80243378 0260282D */ daddu $a1, $s3, $zero -/* C00BFC 8024337C 0C090C00 */ jal func_80243000 -/* C00C00 80243380 02A0302D */ daddu $a2, $s5, $zero -/* C00C04 80243384 08090CE5 */ j .L80243394 -/* C00C08 80243388 00000000 */ nop -/* C00C0C 8024338C 0C0129CF */ jal func_8004A73C -/* C00C10 80243390 0280202D */ daddu $a0, $s4, $zero -.L80243394: -/* C00C14 80243394 8FBF0060 */ lw $ra, 0x60($sp) -/* C00C18 80243398 8FB5005C */ lw $s5, 0x5c($sp) -/* C00C1C 8024339C 8FB40058 */ lw $s4, 0x58($sp) -/* C00C20 802433A0 8FB30054 */ lw $s3, 0x54($sp) -/* C00C24 802433A4 8FB20050 */ lw $s2, 0x50($sp) -/* C00C28 802433A8 8FB1004C */ lw $s1, 0x4c($sp) -/* C00C2C 802433AC 8FB00048 */ lw $s0, 0x48($sp) -/* C00C30 802433B0 0000102D */ daddu $v0, $zero, $zero -/* C00C34 802433B4 03E00008 */ jr $ra -/* C00C38 802433B8 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/func_802433BC_BFD880.s b/asm/nonmatchings/world/area_dgb/dgb_01/func_802433BC_BFD880.s deleted file mode 100644 index 779db28dea..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/func_802433BC_BFD880.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802433BC_C00C3C -/* C00C3C 802433BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C00C40 802433C0 AFBF0010 */ sw $ra, 0x10($sp) -/* C00C44 802433C4 0C03A6D5 */ jal increment_status_menu_disabled -/* C00C48 802433C8 00000000 */ nop -/* C00C4C 802433CC 3C05437F */ lui $a1, 0x437f -/* C00C50 802433D0 0C04DF69 */ jal func_80137DA4 -/* C00C54 802433D4 0000202D */ daddu $a0, $zero, $zero -/* C00C58 802433D8 8FBF0010 */ lw $ra, 0x10($sp) -/* C00C5C 802433DC 24020002 */ addiu $v0, $zero, 2 -/* C00C60 802433E0 03E00008 */ jr $ra -/* C00C64 802433E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* C00C68 802433E8 00000000 */ nop -/* C00C6C 802433EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/func_8024006C_C2EBA0.s b/asm/nonmatchings/world/area_dgb/dgb_02/func_8024006C_C2EBA0.s deleted file mode 100644 index df3db0ebc5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/func_8024006C_C2EBA0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024006C_C2EC0C -/* C2EC0C 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C2EC10 80240070 AFB10014 */ sw $s1, 0x14($sp) -/* C2EC14 80240074 0080882D */ daddu $s1, $a0, $zero -/* C2EC18 80240078 AFBF0018 */ sw $ra, 0x18($sp) -/* C2EC1C 8024007C AFB00010 */ sw $s0, 0x10($sp) -/* C2EC20 80240080 8E300148 */ lw $s0, 0x148($s1) -/* C2EC24 80240084 0C00EABB */ jal get_npc_unsafe -/* C2EC28 80240088 86040008 */ lh $a0, 8($s0) -/* C2EC2C 8024008C 0040202D */ daddu $a0, $v0, $zero -/* C2EC30 80240090 9482008E */ lhu $v0, 0x8e($a0) -/* C2EC34 80240094 2442FFFF */ addiu $v0, $v0, -1 -/* C2EC38 80240098 A482008E */ sh $v0, 0x8e($a0) -/* C2EC3C 8024009C 00021400 */ sll $v0, $v0, 0x10 -/* C2EC40 802400A0 1C400009 */ bgtz $v0, .L802400C8 -/* C2EC44 802400A4 24020003 */ addiu $v0, $zero, 3 -/* C2EC48 802400A8 96030076 */ lhu $v1, 0x76($s0) -/* C2EC4C 802400AC AE02006C */ sw $v0, 0x6c($s0) -/* C2EC50 802400B0 A483008E */ sh $v1, 0x8e($a0) -/* C2EC54 802400B4 8E0200CC */ lw $v0, 0xcc($s0) -/* C2EC58 802400B8 8C420024 */ lw $v0, 0x24($v0) -/* C2EC5C 802400BC AC820028 */ sw $v0, 0x28($a0) -/* C2EC60 802400C0 24020020 */ addiu $v0, $zero, 0x20 -/* C2EC64 802400C4 AE220070 */ sw $v0, 0x70($s1) -.L802400C8: -/* C2EC68 802400C8 8FBF0018 */ lw $ra, 0x18($sp) -/* C2EC6C 802400CC 8FB10014 */ lw $s1, 0x14($sp) -/* C2EC70 802400D0 8FB00010 */ lw $s0, 0x10($sp) -/* C2EC74 802400D4 03E00008 */ jr $ra -/* C2EC78 802400D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/func_802400DC_C2EBA0.s b/asm/nonmatchings/world/area_dgb/dgb_02/func_802400DC_C2EBA0.s deleted file mode 100644 index 1886764ebc..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/func_802400DC_C2EBA0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_C2EC7C -/* C2EC7C 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C2EC80 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* C2EC84 802400E4 0080882D */ daddu $s1, $a0, $zero -/* C2EC88 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* C2EC8C 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* C2EC90 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* C2EC94 802400F4 0C00EABB */ jal get_npc_unsafe -/* C2EC98 802400F8 86040008 */ lh $a0, 8($s0) -/* C2EC9C 802400FC 0040282D */ daddu $a1, $v0, $zero -/* C2ECA0 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* C2ECA4 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* C2ECA8 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* C2ECAC 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* C2ECB0 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* C2ECB4 80240114 24020004 */ addiu $v0, $zero, 4 -/* C2ECB8 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* C2ECBC 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* C2ECC0 80240120 8C620000 */ lw $v0, ($v1) -/* C2ECC4 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* C2ECC8 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* C2ECCC 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* C2ECD0 80240130 8E020078 */ lw $v0, 0x78($s0) -/* C2ECD4 80240134 28420008 */ slti $v0, $v0, 8 -/* C2ECD8 80240138 14400018 */ bnez $v0, .L8024019C -/* C2ECDC 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* C2ECE0 80240140 24040003 */ addiu $a0, $zero, 3 -/* C2ECE4 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* C2ECE8 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* C2ECEC 8024014C 3C013F80 */ lui $at, 0x3f80 -/* C2ECF0 80240150 44810000 */ mtc1 $at, $f0 -/* C2ECF4 80240154 3C014000 */ lui $at, 0x4000 -/* C2ECF8 80240158 44811000 */ mtc1 $at, $f2 -/* C2ECFC 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* C2ED00 80240160 44812000 */ mtc1 $at, $f4 -/* C2ED04 80240164 44873000 */ mtc1 $a3, $f6 -/* C2ED08 80240168 00000000 */ nop -/* C2ED0C 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* C2ED10 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* C2ED14 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* C2ED18 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* C2ED1C 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* C2ED20 80240180 44073000 */ mfc1 $a3, $f6 -/* C2ED24 80240184 0000302D */ daddu $a2, $zero, $zero -/* C2ED28 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* C2ED2C 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* C2ED30 80240190 0C01BFA4 */ jal fx_emote -/* C2ED34 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* C2ED38 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* C2ED3C 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* C2ED40 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* C2ED44 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* C2ED48 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* C2ED4C 802401AC 03E00008 */ jr $ra -/* C2ED50 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/func_802401B4_C2EBA0.s b/asm/nonmatchings/world/area_dgb/dgb_02/func_802401B4_C2EBA0.s deleted file mode 100644 index 79f2a03695..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/func_802401B4_C2EBA0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_C2ED54 -/* C2ED54 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C2ED58 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* C2ED5C 802401BC 0080882D */ daddu $s1, $a0, $zero -/* C2ED60 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C2ED64 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* C2ED68 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* C2ED6C 802401CC 0C00EABB */ jal get_npc_unsafe -/* C2ED70 802401D0 86040008 */ lh $a0, 8($s0) -/* C2ED74 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* C2ED78 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* C2ED7C 802401DC A443008E */ sh $v1, 0x8e($v0) -/* C2ED80 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* C2ED84 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* C2ED88 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* C2ED8C 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* C2ED90 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* C2ED94 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* C2ED98 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* C2ED9C 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* C2EDA0 80240200 03E00008 */ jr $ra -/* C2EDA4 80240204 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/func_80240208_C2EBA0.s b/asm/nonmatchings/world/area_dgb/dgb_02/func_80240208_C2EBA0.s deleted file mode 100644 index c9f5bef4fc..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/func_80240208_C2EBA0.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240208_C2EDA8 -/* C2EDA8 80240208 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C2EDAC 8024020C AFBF0024 */ sw $ra, 0x24($sp) -/* C2EDB0 80240210 AFB40020 */ sw $s4, 0x20($sp) -/* C2EDB4 80240214 AFB3001C */ sw $s3, 0x1c($sp) -/* C2EDB8 80240218 AFB20018 */ sw $s2, 0x18($sp) -/* C2EDBC 8024021C AFB10014 */ sw $s1, 0x14($sp) -/* C2EDC0 80240220 AFB00010 */ sw $s0, 0x10($sp) -/* C2EDC4 80240224 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C2EDC8 80240228 8C900148 */ lw $s0, 0x148($a0) -/* C2EDCC 8024022C 86040008 */ lh $a0, 8($s0) -/* C2EDD0 80240230 0C00EABB */ jal get_npc_unsafe -/* C2EDD4 80240234 24110001 */ addiu $s1, $zero, 1 -/* C2EDD8 80240238 86040008 */ lh $a0, 8($s0) -/* C2EDDC 8024023C 0040802D */ daddu $s0, $v0, $zero -/* C2EDE0 80240240 3C05800B */ lui $a1, %hi(gCameras) -/* C2EDE4 80240244 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C2EDE8 80240248 3C03800A */ lui $v1, 0x800a -/* C2EDEC 8024024C 8463A634 */ lh $v1, -0x59cc($v1) -/* C2EDF0 80240250 00912021 */ addu $a0, $a0, $s1 -/* C2EDF4 80240254 00031080 */ sll $v0, $v1, 2 -/* C2EDF8 80240258 00431021 */ addu $v0, $v0, $v1 -/* C2EDFC 8024025C 00021080 */ sll $v0, $v0, 2 -/* C2EE00 80240260 00431023 */ subu $v0, $v0, $v1 -/* C2EE04 80240264 000218C0 */ sll $v1, $v0, 3 -/* C2EE08 80240268 00431021 */ addu $v0, $v0, $v1 -/* C2EE0C 8024026C 000210C0 */ sll $v0, $v0, 3 -/* C2EE10 80240270 0C00FB3A */ jal get_enemy -/* C2EE14 80240274 00459021 */ addu $s2, $v0, $a1 -/* C2EE18 80240278 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C2EE1C 8024027C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C2EE20 80240280 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C2EE24 80240284 8E830000 */ lw $v1, ($s4) -/* C2EE28 80240288 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C2EE2C 8024028C 8C660028 */ lw $a2, 0x28($v1) -/* C2EE30 80240290 8C670030 */ lw $a3, 0x30($v1) -/* C2EE34 80240294 0C00A7B5 */ jal dist2D -/* C2EE38 80240298 0040982D */ daddu $s3, $v0, $zero -/* C2EE3C 8024029C C6620074 */ lwc1 $f2, 0x74($s3) -/* C2EE40 802402A0 468010A0 */ cvt.s.w $f2, $f2 -/* C2EE44 802402A4 4600103C */ c.lt.s $f2, $f0 -/* C2EE48 802402A8 00000000 */ nop -/* C2EE4C 802402AC 45030001 */ bc1tl .L802402B4 -/* C2EE50 802402B0 0000882D */ daddu $s1, $zero, $zero -.L802402B4: -/* C2EE54 802402B4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C2EE58 802402B8 C60E000C */ lwc1 $f14, 0xc($s0) -/* C2EE5C 802402BC 3C014387 */ lui $at, 0x4387 -/* C2EE60 802402C0 4481A000 */ mtc1 $at, $f20 -/* C2EE64 802402C4 0C00A70A */ jal get_clamped_angle_diff -/* C2EE68 802402C8 00000000 */ nop -/* C2EE6C 802402CC 0C00A6C9 */ jal clamp_angle -/* C2EE70 802402D0 46000306 */ mov.s $f12, $f0 -/* C2EE74 802402D4 3C018024 */ lui $at, 0x8024 -/* C2EE78 802402D8 D4222610 */ ldc1 $f2, 0x2610($at) -/* C2EE7C 802402DC 46000021 */ cvt.d.s $f0, $f0 -/* C2EE80 802402E0 4622003C */ c.lt.d $f0, $f2 -/* C2EE84 802402E4 00000000 */ nop -/* C2EE88 802402E8 45000003 */ bc1f .L802402F8 -/* C2EE8C 802402EC 00000000 */ nop -/* C2EE90 802402F0 3C0142B4 */ lui $at, 0x42b4 -/* C2EE94 802402F4 4481A000 */ mtc1 $at, $f20 -.L802402F8: -/* C2EE98 802402F8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C2EE9C 802402FC 8E820000 */ lw $v0, ($s4) -/* C2EEA0 80240300 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C2EEA4 80240304 8C460028 */ lw $a2, 0x28($v0) -/* C2EEA8 80240308 0C00A720 */ jal atan2 -/* C2EEAC 8024030C 8C470030 */ lw $a3, 0x30($v0) -/* C2EEB0 80240310 4600A306 */ mov.s $f12, $f20 -/* C2EEB4 80240314 0C00A70A */ jal get_clamped_angle_diff -/* C2EEB8 80240318 46000386 */ mov.s $f14, $f0 -/* C2EEBC 8024031C C6620078 */ lwc1 $f2, 0x78($s3) -/* C2EEC0 80240320 468010A0 */ cvt.s.w $f2, $f2 -/* C2EEC4 80240324 46000005 */ abs.s $f0, $f0 -/* C2EEC8 80240328 4600103C */ c.lt.s $f2, $f0 -/* C2EECC 8024032C 00000000 */ nop -/* C2EED0 80240330 45030001 */ bc1tl .L80240338 -/* C2EED4 80240334 0000882D */ daddu $s1, $zero, $zero -.L80240338: -/* C2EED8 80240338 8E820000 */ lw $v0, ($s4) -/* C2EEDC 8024033C C600003C */ lwc1 $f0, 0x3c($s0) -/* C2EEE0 80240340 C442002C */ lwc1 $f2, 0x2c($v0) -/* C2EEE4 80240344 860200A8 */ lh $v0, 0xa8($s0) -/* C2EEE8 80240348 46020001 */ sub.s $f0, $f0, $f2 -/* C2EEEC 8024034C 44821000 */ mtc1 $v0, $f2 -/* C2EEF0 80240350 00000000 */ nop -/* C2EEF4 80240354 468010A1 */ cvt.d.w $f2, $f2 -/* C2EEF8 80240358 46221080 */ add.d $f2, $f2, $f2 -/* C2EEFC 8024035C 46000005 */ abs.s $f0, $f0 -/* C2EF00 80240360 46000021 */ cvt.d.s $f0, $f0 -/* C2EF04 80240364 4620103E */ c.le.d $f2, $f0 -/* C2EF08 80240368 00000000 */ nop -/* C2EF0C 8024036C 45030001 */ bc1tl .L80240374 -/* C2EF10 80240370 0000882D */ daddu $s1, $zero, $zero -.L80240374: -/* C2EF14 80240374 3C038011 */ lui $v1, 0x8011 -/* C2EF18 80240378 8063EBB3 */ lb $v1, -0x144d($v1) -/* C2EF1C 8024037C 24020009 */ addiu $v0, $zero, 9 -/* C2EF20 80240380 50620001 */ beql $v1, $v0, .L80240388 -/* C2EF24 80240384 0000882D */ daddu $s1, $zero, $zero -.L80240388: -/* C2EF28 80240388 24020007 */ addiu $v0, $zero, 7 -/* C2EF2C 8024038C 50620001 */ beql $v1, $v0, .L80240394 -/* C2EF30 80240390 0000882D */ daddu $s1, $zero, $zero -.L80240394: -/* C2EF34 80240394 0220102D */ daddu $v0, $s1, $zero -/* C2EF38 80240398 8FBF0024 */ lw $ra, 0x24($sp) -/* C2EF3C 8024039C 8FB40020 */ lw $s4, 0x20($sp) -/* C2EF40 802403A0 8FB3001C */ lw $s3, 0x1c($sp) -/* C2EF44 802403A4 8FB20018 */ lw $s2, 0x18($sp) -/* C2EF48 802403A8 8FB10014 */ lw $s1, 0x14($sp) -/* C2EF4C 802403AC 8FB00010 */ lw $s0, 0x10($sp) -/* C2EF50 802403B0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C2EF54 802403B4 03E00008 */ jr $ra -/* C2EF58 802403B8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/func_8024061C_C2EBA0.s b/asm/nonmatchings/world/area_dgb/dgb_02/func_8024061C_C2EBA0.s deleted file mode 100644 index 76f7a85148..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/func_8024061C_C2EBA0.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_C2F1BC -/* C2F1BC 8024061C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C2F1C0 80240620 AFB20038 */ sw $s2, 0x38($sp) -/* C2F1C4 80240624 0080902D */ daddu $s2, $a0, $zero -/* C2F1C8 80240628 AFBF0048 */ sw $ra, 0x48($sp) -/* C2F1CC 8024062C AFB50044 */ sw $s5, 0x44($sp) -/* C2F1D0 80240630 AFB40040 */ sw $s4, 0x40($sp) -/* C2F1D4 80240634 AFB3003C */ sw $s3, 0x3c($sp) -/* C2F1D8 80240638 AFB10034 */ sw $s1, 0x34($sp) -/* C2F1DC 8024063C AFB00030 */ sw $s0, 0x30($sp) -/* C2F1E0 80240640 8E510148 */ lw $s1, 0x148($s2) -/* C2F1E4 80240644 86240008 */ lh $a0, 8($s1) -/* C2F1E8 80240648 0C00EABB */ jal get_npc_unsafe -/* C2F1EC 8024064C 00A0802D */ daddu $s0, $a1, $zero -/* C2F1F0 80240650 8E43000C */ lw $v1, 0xc($s2) -/* C2F1F4 80240654 0240202D */ daddu $a0, $s2, $zero -/* C2F1F8 80240658 8C650000 */ lw $a1, ($v1) -/* C2F1FC 8024065C 0C0B1EAF */ jal get_variable -/* C2F200 80240660 0040A82D */ daddu $s5, $v0, $zero -/* C2F204 80240664 AFA00010 */ sw $zero, 0x10($sp) -/* C2F208 80240668 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2F20C 8024066C 8C630030 */ lw $v1, 0x30($v1) -/* C2F210 80240670 AFA30014 */ sw $v1, 0x14($sp) -/* C2F214 80240674 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2F218 80240678 8C63001C */ lw $v1, 0x1c($v1) -/* C2F21C 8024067C AFA30018 */ sw $v1, 0x18($sp) -/* C2F220 80240680 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2F224 80240684 8C630024 */ lw $v1, 0x24($v1) -/* C2F228 80240688 AFA3001C */ sw $v1, 0x1c($sp) -/* C2F22C 8024068C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2F230 80240690 8C630028 */ lw $v1, 0x28($v1) -/* C2F234 80240694 27B40010 */ addiu $s4, $sp, 0x10 -/* C2F238 80240698 AFA30020 */ sw $v1, 0x20($sp) -/* C2F23C 8024069C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2F240 802406A0 3C014282 */ lui $at, 0x4282 -/* C2F244 802406A4 44810000 */ mtc1 $at, $f0 -/* C2F248 802406A8 8C63002C */ lw $v1, 0x2c($v1) -/* C2F24C 802406AC 0040982D */ daddu $s3, $v0, $zero -/* C2F250 802406B0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C2F254 802406B4 A7A0002C */ sh $zero, 0x2c($sp) -/* C2F258 802406B8 16000005 */ bnez $s0, .L802406D0 -/* C2F25C 802406BC AFA30024 */ sw $v1, 0x24($sp) -/* C2F260 802406C0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C2F264 802406C4 30420004 */ andi $v0, $v0, 4 -/* C2F268 802406C8 10400020 */ beqz $v0, .L8024074C -/* C2F26C 802406CC 00000000 */ nop -.L802406D0: -/* C2F270 802406D0 2404F7FF */ addiu $a0, $zero, -0x801 -/* C2F274 802406D4 AE400070 */ sw $zero, 0x70($s2) -/* C2F278 802406D8 A6A0008E */ sh $zero, 0x8e($s5) -/* C2F27C 802406DC 8E2200CC */ lw $v0, 0xcc($s1) -/* C2F280 802406E0 8EA30000 */ lw $v1, ($s5) -/* C2F284 802406E4 8C420000 */ lw $v0, ($v0) -/* C2F288 802406E8 00641824 */ and $v1, $v1, $a0 -/* C2F28C 802406EC AEA30000 */ sw $v1, ($s5) -/* C2F290 802406F0 AEA20028 */ sw $v0, 0x28($s5) -/* C2F294 802406F4 8E2200D0 */ lw $v0, 0xd0($s1) -/* C2F298 802406F8 8C420034 */ lw $v0, 0x34($v0) -/* C2F29C 802406FC 54400005 */ bnel $v0, $zero, .L80240714 -/* C2F2A0 80240700 2402FDFF */ addiu $v0, $zero, -0x201 -/* C2F2A4 80240704 34620200 */ ori $v0, $v1, 0x200 -/* C2F2A8 80240708 2403FFF7 */ addiu $v1, $zero, -9 -/* C2F2AC 8024070C 080901C7 */ j .L8024071C -/* C2F2B0 80240710 00431024 */ and $v0, $v0, $v1 -.L80240714: -/* C2F2B4 80240714 00621024 */ and $v0, $v1, $v0 -/* C2F2B8 80240718 34420008 */ ori $v0, $v0, 8 -.L8024071C: -/* C2F2BC 8024071C AEA20000 */ sw $v0, ($s5) -/* C2F2C0 80240720 8E2200B0 */ lw $v0, 0xb0($s1) -/* C2F2C4 80240724 30420004 */ andi $v0, $v0, 4 -/* C2F2C8 80240728 10400007 */ beqz $v0, .L80240748 -/* C2F2CC 8024072C 24020063 */ addiu $v0, $zero, 0x63 -/* C2F2D0 80240730 AE420070 */ sw $v0, 0x70($s2) -/* C2F2D4 80240734 AE400074 */ sw $zero, 0x74($s2) -/* C2F2D8 80240738 8E2200B0 */ lw $v0, 0xb0($s1) -/* C2F2DC 8024073C 2403FFFB */ addiu $v1, $zero, -5 -/* C2F2E0 80240740 00431024 */ and $v0, $v0, $v1 -/* C2F2E4 80240744 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240748: -/* C2F2E8 80240748 AE20006C */ sw $zero, 0x6c($s1) -.L8024074C: -/* C2F2EC 8024074C 8E420070 */ lw $v0, 0x70($s2) -/* C2F2F0 80240750 2842001E */ slti $v0, $v0, 0x1e -/* C2F2F4 80240754 10400009 */ beqz $v0, .L8024077C -/* C2F2F8 80240758 00000000 */ nop -/* C2F2FC 8024075C 8E22006C */ lw $v0, 0x6c($s1) -/* C2F300 80240760 14400006 */ bnez $v0, .L8024077C -/* C2F304 80240764 00000000 */ nop -/* C2F308 80240768 0C090082 */ jal func_80240208 -/* C2F30C 8024076C 0240202D */ daddu $a0, $s2, $zero -/* C2F310 80240770 10400002 */ beqz $v0, .L8024077C -/* C2F314 80240774 2402001E */ addiu $v0, $zero, 0x1e -/* C2F318 80240778 AE420070 */ sw $v0, 0x70($s2) -.L8024077C: -/* C2F31C 8024077C 8E430070 */ lw $v1, 0x70($s2) -/* C2F320 80240780 2C620064 */ sltiu $v0, $v1, 0x64 -/* C2F324 80240784 10400048 */ beqz $v0, .L802408A8 -/* C2F328 80240788 00031080 */ sll $v0, $v1, 2 -/* C2F32C 8024078C 3C018024 */ lui $at, 0x8024 -/* C2F330 80240790 00220821 */ addu $at, $at, $v0 -/* C2F334 80240794 8C222618 */ lw $v0, 0x2618($at) -/* C2F338 80240798 00400008 */ jr $v0 -/* C2F33C 8024079C 00000000 */ nop -/* C2F340 802407A0 0240202D */ daddu $a0, $s2, $zero -/* C2F344 802407A4 0260282D */ daddu $a1, $s3, $zero -/* C2F348 802407A8 0C012568 */ jal func_800495A0 -/* C2F34C 802407AC 0280302D */ daddu $a2, $s4, $zero -/* C2F350 802407B0 0240202D */ daddu $a0, $s2, $zero -/* C2F354 802407B4 0260282D */ daddu $a1, $s3, $zero -/* C2F358 802407B8 0C0125AE */ jal func_800496B8 -/* C2F35C 802407BC 0280302D */ daddu $a2, $s4, $zero -/* C2F360 802407C0 0809022A */ j .L802408A8 -/* C2F364 802407C4 00000000 */ nop -/* C2F368 802407C8 0240202D */ daddu $a0, $s2, $zero -/* C2F36C 802407CC 0260282D */ daddu $a1, $s3, $zero -/* C2F370 802407D0 0C0126D1 */ jal func_80049B44 -/* C2F374 802407D4 0280302D */ daddu $a2, $s4, $zero -/* C2F378 802407D8 0240202D */ daddu $a0, $s2, $zero -/* C2F37C 802407DC 0260282D */ daddu $a1, $s3, $zero -/* C2F380 802407E0 0C012701 */ jal func_80049C04 -/* C2F384 802407E4 0280302D */ daddu $a2, $s4, $zero -/* C2F388 802407E8 0809022A */ j .L802408A8 -/* C2F38C 802407EC 00000000 */ nop -/* C2F390 802407F0 0240202D */ daddu $a0, $s2, $zero -/* C2F394 802407F4 0260282D */ daddu $a1, $s3, $zero -/* C2F398 802407F8 0C01278F */ jal func_80049E3C -/* C2F39C 802407FC 0280302D */ daddu $a2, $s4, $zero -/* C2F3A0 80240800 0240202D */ daddu $a0, $s2, $zero -/* C2F3A4 80240804 0260282D */ daddu $a1, $s3, $zero -/* C2F3A8 80240808 0C0127B3 */ jal func_80049ECC -/* C2F3AC 8024080C 0280302D */ daddu $a2, $s4, $zero -/* C2F3B0 80240810 0809022A */ j .L802408A8 -/* C2F3B4 80240814 00000000 */ nop -/* C2F3B8 80240818 0240202D */ daddu $a0, $s2, $zero -/* C2F3BC 8024081C 0260282D */ daddu $a1, $s3, $zero -/* C2F3C0 80240820 0C0127DF */ jal func_80049F7C -/* C2F3C4 80240824 0280302D */ daddu $a2, $s4, $zero -/* C2F3C8 80240828 0240202D */ daddu $a0, $s2, $zero -/* C2F3CC 8024082C 0260282D */ daddu $a1, $s3, $zero -/* C2F3D0 80240830 0C012849 */ jal func_8004A124 -/* C2F3D4 80240834 0280302D */ daddu $a2, $s4, $zero -/* C2F3D8 80240838 0809022A */ j .L802408A8 -/* C2F3DC 8024083C 00000000 */ nop -/* C2F3E0 80240840 0240202D */ daddu $a0, $s2, $zero -/* C2F3E4 80240844 0260282D */ daddu $a1, $s3, $zero -/* C2F3E8 80240848 0C0128FA */ jal func_8004A3E8 -/* C2F3EC 8024084C 0280302D */ daddu $a2, $s4, $zero -/* C2F3F0 80240850 0809022A */ j .L802408A8 -/* C2F3F4 80240854 00000000 */ nop -/* C2F3F8 80240858 0C090000 */ jal func_80240000 -/* C2F3FC 8024085C 0240202D */ daddu $a0, $s2, $zero -/* C2F400 80240860 0C09001B */ jal func_8024006C -/* C2F404 80240864 0240202D */ daddu $a0, $s2, $zero -/* C2F408 80240868 8E430070 */ lw $v1, 0x70($s2) -/* C2F40C 8024086C 24020020 */ addiu $v0, $zero, 0x20 -/* C2F410 80240870 1462000D */ bne $v1, $v0, .L802408A8 -/* C2F414 80240874 00000000 */ nop -/* C2F418 80240878 0C090037 */ jal func_802400DC -/* C2F41C 8024087C 0240202D */ daddu $a0, $s2, $zero -/* C2F420 80240880 8E430070 */ lw $v1, 0x70($s2) -/* C2F424 80240884 24020021 */ addiu $v0, $zero, 0x21 -/* C2F428 80240888 14620007 */ bne $v1, $v0, .L802408A8 -/* C2F42C 8024088C 00000000 */ nop -/* C2F430 80240890 0C09006D */ jal func_802401B4 -/* C2F434 80240894 0240202D */ daddu $a0, $s2, $zero -/* C2F438 80240898 0809022A */ j .L802408A8 -/* C2F43C 8024089C 00000000 */ nop -/* C2F440 802408A0 0C0129CF */ jal func_8004A73C -/* C2F444 802408A4 0240202D */ daddu $a0, $s2, $zero -.L802408A8: -/* C2F448 802408A8 8FBF0048 */ lw $ra, 0x48($sp) -/* C2F44C 802408AC 8FB50044 */ lw $s5, 0x44($sp) -/* C2F450 802408B0 8FB40040 */ lw $s4, 0x40($sp) -/* C2F454 802408B4 8FB3003C */ lw $s3, 0x3c($sp) -/* C2F458 802408B8 8FB20038 */ lw $s2, 0x38($sp) -/* C2F45C 802408BC 8FB10034 */ lw $s1, 0x34($sp) -/* C2F460 802408C0 8FB00030 */ lw $s0, 0x30($sp) -/* C2F464 802408C4 0000102D */ daddu $v0, $zero, $zero -/* C2F468 802408C8 03E00008 */ jr $ra -/* C2F46C 802408CC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/func_802408D0_C2EBA0.s b/asm/nonmatchings/world/area_dgb/dgb_02/func_802408D0_C2EBA0.s deleted file mode 100644 index e964266343..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/func_802408D0_C2EBA0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408D0_C2F470 -/* C2F470 802408D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C2F474 802408D4 AFB10014 */ sw $s1, 0x14($sp) -/* C2F478 802408D8 0080882D */ daddu $s1, $a0, $zero -/* C2F47C 802408DC AFBF0018 */ sw $ra, 0x18($sp) -/* C2F480 802408E0 AFB00010 */ sw $s0, 0x10($sp) -/* C2F484 802408E4 8E300148 */ lw $s0, 0x148($s1) -/* C2F488 802408E8 0C00EABB */ jal get_npc_unsafe -/* C2F48C 802408EC 86040008 */ lh $a0, 8($s0) -/* C2F490 802408F0 0040202D */ daddu $a0, $v0, $zero -/* C2F494 802408F4 8482008E */ lh $v0, 0x8e($a0) -/* C2F498 802408F8 9483008E */ lhu $v1, 0x8e($a0) -/* C2F49C 802408FC 18400002 */ blez $v0, .L80240908 -/* C2F4A0 80240900 2462FFFF */ addiu $v0, $v1, -1 -/* C2F4A4 80240904 A482008E */ sh $v0, 0x8e($a0) -.L80240908: -/* C2F4A8 80240908 8482008E */ lh $v0, 0x8e($a0) -/* C2F4AC 8024090C 24030001 */ addiu $v1, $zero, 1 -/* C2F4B0 80240910 14430005 */ bne $v0, $v1, .L80240928 -/* C2F4B4 80240914 00000000 */ nop -/* C2F4B8 80240918 8E0200CC */ lw $v0, 0xcc($s0) -/* C2F4BC 8024091C 8C420030 */ lw $v0, 0x30($v0) -/* C2F4C0 80240920 08090251 */ j .L80240944 -/* C2F4C4 80240924 AC820028 */ sw $v0, 0x28($a0) -.L80240928: -/* C2F4C8 80240928 1C400006 */ bgtz $v0, .L80240944 -/* C2F4CC 8024092C 00000000 */ nop -/* C2F4D0 80240930 8E0200CC */ lw $v0, 0xcc($s0) -/* C2F4D4 80240934 8C420028 */ lw $v0, 0x28($v0) -/* C2F4D8 80240938 A480008E */ sh $zero, 0x8e($a0) -/* C2F4DC 8024093C AC820028 */ sw $v0, 0x28($a0) -/* C2F4E0 80240940 AE230070 */ sw $v1, 0x70($s1) -.L80240944: -/* C2F4E4 80240944 8FBF0018 */ lw $ra, 0x18($sp) -/* C2F4E8 80240948 8FB10014 */ lw $s1, 0x14($sp) -/* C2F4EC 8024094C 8FB00010 */ lw $s0, 0x10($sp) -/* C2F4F0 80240950 03E00008 */ jr $ra -/* C2F4F4 80240954 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/func_80240C10_C2EBA0.s b/asm/nonmatchings/world/area_dgb/dgb_02/func_80240C10_C2EBA0.s deleted file mode 100644 index d4b7f1daf9..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/func_80240C10_C2EBA0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C10_C2F7B0 -/* C2F7B0 80240C10 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C2F7B4 80240C14 AFB10014 */ sw $s1, 0x14($sp) -/* C2F7B8 80240C18 0080882D */ daddu $s1, $a0, $zero -/* C2F7BC 80240C1C AFBF0018 */ sw $ra, 0x18($sp) -/* C2F7C0 80240C20 AFB00010 */ sw $s0, 0x10($sp) -/* C2F7C4 80240C24 8E300148 */ lw $s0, 0x148($s1) -/* C2F7C8 80240C28 0C00EABB */ jal get_npc_unsafe -/* C2F7CC 80240C2C 86040008 */ lh $a0, 8($s0) -/* C2F7D0 80240C30 0040182D */ daddu $v1, $v0, $zero -/* C2F7D4 80240C34 9462008E */ lhu $v0, 0x8e($v1) -/* C2F7D8 80240C38 2442FFFF */ addiu $v0, $v0, -1 -/* C2F7DC 80240C3C A462008E */ sh $v0, 0x8e($v1) -/* C2F7E0 80240C40 00021400 */ sll $v0, $v0, 0x10 -/* C2F7E4 80240C44 1C400006 */ bgtz $v0, .L80240C60 -/* C2F7E8 80240C48 24020001 */ addiu $v0, $zero, 1 -/* C2F7EC 80240C4C A462008E */ sh $v0, 0x8e($v1) -/* C2F7F0 80240C50 24020028 */ addiu $v0, $zero, 0x28 -/* C2F7F4 80240C54 AE020088 */ sw $v0, 0x88($s0) -/* C2F7F8 80240C58 24020003 */ addiu $v0, $zero, 3 -/* C2F7FC 80240C5C AE220070 */ sw $v0, 0x70($s1) -.L80240C60: -/* C2F800 80240C60 8FBF0018 */ lw $ra, 0x18($sp) -/* C2F804 80240C64 8FB10014 */ lw $s1, 0x14($sp) -/* C2F808 80240C68 8FB00010 */ lw $s0, 0x10($sp) -/* C2F80C 80240C6C 03E00008 */ jr $ra -/* C2F810 80240C70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/func_80240C74_C2EBA0.s b/asm/nonmatchings/world/area_dgb/dgb_02/func_80240C74_C2EBA0.s deleted file mode 100644 index 1605608790..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/func_80240C74_C2EBA0.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C74_C2F814 -/* C2F814 80240C74 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C2F818 80240C78 AFB10014 */ sw $s1, 0x14($sp) -/* C2F81C 80240C7C 0080882D */ daddu $s1, $a0, $zero -/* C2F820 80240C80 AFBF001C */ sw $ra, 0x1c($sp) -/* C2F824 80240C84 AFB20018 */ sw $s2, 0x18($sp) -/* C2F828 80240C88 AFB00010 */ sw $s0, 0x10($sp) -/* C2F82C 80240C8C 8E320148 */ lw $s2, 0x148($s1) -/* C2F830 80240C90 0C00EABB */ jal get_npc_unsafe -/* C2F834 80240C94 86440008 */ lh $a0, 8($s2) -/* C2F838 80240C98 240400B4 */ addiu $a0, $zero, 0xb4 -/* C2F83C 80240C9C 0C00A67F */ jal rand_int -/* C2F840 80240CA0 0040802D */ daddu $s0, $v0, $zero -/* C2F844 80240CA4 C60C000C */ lwc1 $f12, 0xc($s0) -/* C2F848 80240CA8 44820000 */ mtc1 $v0, $f0 -/* C2F84C 80240CAC 00000000 */ nop -/* C2F850 80240CB0 46800020 */ cvt.s.w $f0, $f0 -/* C2F854 80240CB4 46006300 */ add.s $f12, $f12, $f0 -/* C2F858 80240CB8 3C0142B4 */ lui $at, 0x42b4 -/* C2F85C 80240CBC 44810000 */ mtc1 $at, $f0 -/* C2F860 80240CC0 0C00A6C9 */ jal clamp_angle -/* C2F864 80240CC4 46006301 */ sub.s $f12, $f12, $f0 -/* C2F868 80240CC8 E600000C */ swc1 $f0, 0xc($s0) -/* C2F86C 80240CCC 8E4200CC */ lw $v0, 0xcc($s2) -/* C2F870 80240CD0 8C420000 */ lw $v0, ($v0) -/* C2F874 80240CD4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C2F878 80240CD8 0C00A67F */ jal rand_int -/* C2F87C 80240CDC AE020028 */ sw $v0, 0x28($s0) -/* C2F880 80240CE0 00021FC2 */ srl $v1, $v0, 0x1f -/* C2F884 80240CE4 00431821 */ addu $v1, $v0, $v1 -/* C2F888 80240CE8 00031843 */ sra $v1, $v1, 1 -/* C2F88C 80240CEC 00031840 */ sll $v1, $v1, 1 -/* C2F890 80240CF0 00431023 */ subu $v0, $v0, $v1 -/* C2F894 80240CF4 24420002 */ addiu $v0, $v0, 2 -/* C2F898 80240CF8 AE220074 */ sw $v0, 0x74($s1) -/* C2F89C 80240CFC 24020004 */ addiu $v0, $zero, 4 -/* C2F8A0 80240D00 AE220070 */ sw $v0, 0x70($s1) -/* C2F8A4 80240D04 8FBF001C */ lw $ra, 0x1c($sp) -/* C2F8A8 80240D08 8FB20018 */ lw $s2, 0x18($sp) -/* C2F8AC 80240D0C 8FB10014 */ lw $s1, 0x14($sp) -/* C2F8B0 80240D10 8FB00010 */ lw $s0, 0x10($sp) -/* C2F8B4 80240D14 03E00008 */ jr $ra -/* C2F8B8 80240D18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/func_80240D1C_C2EBA0.s b/asm/nonmatchings/world/area_dgb/dgb_02/func_80240D1C_C2EBA0.s deleted file mode 100644 index 28d12dc56f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/func_80240D1C_C2EBA0.s +++ /dev/null @@ -1,87 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D1C_C2F8BC -/* C2F8BC 80240D1C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C2F8C0 80240D20 AFB20020 */ sw $s2, 0x20($sp) -/* C2F8C4 80240D24 0080902D */ daddu $s2, $a0, $zero -/* C2F8C8 80240D28 AFBF0028 */ sw $ra, 0x28($sp) -/* C2F8CC 80240D2C AFB30024 */ sw $s3, 0x24($sp) -/* C2F8D0 80240D30 AFB1001C */ sw $s1, 0x1c($sp) -/* C2F8D4 80240D34 AFB00018 */ sw $s0, 0x18($sp) -/* C2F8D8 80240D38 8E510148 */ lw $s1, 0x148($s2) -/* C2F8DC 80240D3C 00A0982D */ daddu $s3, $a1, $zero -/* C2F8E0 80240D40 86240008 */ lh $a0, 8($s1) -/* C2F8E4 80240D44 0C00EABB */ jal get_npc_unsafe -/* C2F8E8 80240D48 00C0802D */ daddu $s0, $a2, $zero -/* C2F8EC 80240D4C 0200202D */ daddu $a0, $s0, $zero -/* C2F8F0 80240D50 0040802D */ daddu $s0, $v0, $zero -/* C2F8F4 80240D54 AFA00010 */ sw $zero, 0x10($sp) -/* C2F8F8 80240D58 8E660024 */ lw $a2, 0x24($s3) -/* C2F8FC 80240D5C 8E670028 */ lw $a3, 0x28($s3) -/* C2F900 80240D60 0C01242D */ jal func_800490B4 -/* C2F904 80240D64 0220282D */ daddu $a1, $s1, $zero -/* C2F908 80240D68 1040000C */ beqz $v0, .L80240D9C -/* C2F90C 80240D6C 00000000 */ nop -/* C2F910 80240D70 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C2F914 80240D74 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C2F918 80240D78 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C2F91C 80240D7C C60E0040 */ lwc1 $f14, 0x40($s0) -/* C2F920 80240D80 8C460028 */ lw $a2, 0x28($v0) -/* C2F924 80240D84 0C00A720 */ jal atan2 -/* C2F928 80240D88 8C470030 */ lw $a3, 0x30($v0) -/* C2F92C 80240D8C 2402000C */ addiu $v0, $zero, 0xc -/* C2F930 80240D90 E600000C */ swc1 $f0, 0xc($s0) -/* C2F934 80240D94 0809038E */ j .L80240E38 -/* C2F938 80240D98 AE420070 */ sw $v0, 0x70($s2) -.L80240D9C: -/* C2F93C 80240D9C 9602008E */ lhu $v0, 0x8e($s0) -/* C2F940 80240DA0 2442FFFF */ addiu $v0, $v0, -1 -/* C2F944 80240DA4 A602008E */ sh $v0, 0x8e($s0) -/* C2F948 80240DA8 00021400 */ sll $v0, $v0, 0x10 -/* C2F94C 80240DAC 1C400022 */ bgtz $v0, .L80240E38 -/* C2F950 80240DB0 00000000 */ nop -/* C2F954 80240DB4 8E420074 */ lw $v0, 0x74($s2) -/* C2F958 80240DB8 2442FFFF */ addiu $v0, $v0, -1 -/* C2F95C 80240DBC 18400014 */ blez $v0, .L80240E10 -/* C2F960 80240DC0 AE420074 */ sw $v0, 0x74($s2) -/* C2F964 80240DC4 C600000C */ lwc1 $f0, 0xc($s0) -/* C2F968 80240DC8 3C014334 */ lui $at, 0x4334 -/* C2F96C 80240DCC 44816000 */ mtc1 $at, $f12 -/* C2F970 80240DD0 0C00A6C9 */ jal clamp_angle -/* C2F974 80240DD4 460C0300 */ add.s $f12, $f0, $f12 -/* C2F978 80240DD8 E600000C */ swc1 $f0, 0xc($s0) -/* C2F97C 80240DDC 8E640008 */ lw $a0, 8($s3) -/* C2F980 80240DE0 000417C2 */ srl $v0, $a0, 0x1f -/* C2F984 80240DE4 00822021 */ addu $a0, $a0, $v0 -/* C2F988 80240DE8 00042043 */ sra $a0, $a0, 1 -/* C2F98C 80240DEC 0C00A67F */ jal rand_int -/* C2F990 80240DF0 24840001 */ addiu $a0, $a0, 1 -/* C2F994 80240DF4 8E630008 */ lw $v1, 8($s3) -/* C2F998 80240DF8 000327C2 */ srl $a0, $v1, 0x1f -/* C2F99C 80240DFC 00641821 */ addu $v1, $v1, $a0 -/* C2F9A0 80240E00 00031843 */ sra $v1, $v1, 1 -/* C2F9A4 80240E04 00621821 */ addu $v1, $v1, $v0 -/* C2F9A8 80240E08 0809038E */ j .L80240E38 -/* C2F9AC 80240E0C A603008E */ sh $v1, 0x8e($s0) -.L80240E10: -/* C2F9B0 80240E10 8E250088 */ lw $a1, 0x88($s1) -/* C2F9B4 80240E14 24020028 */ addiu $v0, $zero, 0x28 -/* C2F9B8 80240E18 14A20003 */ bne $a1, $v0, .L80240E28 -/* C2F9BC 80240E1C 24020032 */ addiu $v0, $zero, 0x32 -/* C2F9C0 80240E20 0809038C */ j .L80240E30 -/* C2F9C4 80240E24 24020014 */ addiu $v0, $zero, 0x14 -.L80240E28: -/* C2F9C8 80240E28 14A20003 */ bne $a1, $v0, .L80240E38 -/* C2F9CC 80240E2C 24020019 */ addiu $v0, $zero, 0x19 -.L80240E30: -/* C2F9D0 80240E30 A602008E */ sh $v0, 0x8e($s0) -/* C2F9D4 80240E34 AE450070 */ sw $a1, 0x70($s2) -.L80240E38: -/* C2F9D8 80240E38 8FBF0028 */ lw $ra, 0x28($sp) -/* C2F9DC 80240E3C 8FB30024 */ lw $s3, 0x24($sp) -/* C2F9E0 80240E40 8FB20020 */ lw $s2, 0x20($sp) -/* C2F9E4 80240E44 8FB1001C */ lw $s1, 0x1c($sp) -/* C2F9E8 80240E48 8FB00018 */ lw $s0, 0x18($sp) -/* C2F9EC 80240E4C 03E00008 */ jr $ra -/* C2F9F0 80240E50 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/func_80240E54_C2EBA0.s b/asm/nonmatchings/world/area_dgb/dgb_02/func_80240E54_C2EBA0.s deleted file mode 100644 index bf49377b07..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/func_80240E54_C2EBA0.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E54_C2F9F4 -/* C2F9F4 80240E54 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C2F9F8 80240E58 AFB20018 */ sw $s2, 0x18($sp) -/* C2F9FC 80240E5C 0080902D */ daddu $s2, $a0, $zero -/* C2FA00 80240E60 AFBF001C */ sw $ra, 0x1c($sp) -/* C2FA04 80240E64 AFB10014 */ sw $s1, 0x14($sp) -/* C2FA08 80240E68 AFB00010 */ sw $s0, 0x10($sp) -/* C2FA0C 80240E6C 8E500148 */ lw $s0, 0x148($s2) -/* C2FA10 80240E70 86040008 */ lh $a0, 8($s0) -/* C2FA14 80240E74 0C00EABB */ jal get_npc_unsafe -/* C2FA18 80240E78 00A0882D */ daddu $s1, $a1, $zero -/* C2FA1C 80240E7C 0040182D */ daddu $v1, $v0, $zero -/* C2FA20 80240E80 9462008E */ lhu $v0, 0x8e($v1) -/* C2FA24 80240E84 2442FFFF */ addiu $v0, $v0, -1 -/* C2FA28 80240E88 A462008E */ sh $v0, 0x8e($v1) -/* C2FA2C 80240E8C 00021400 */ sll $v0, $v0, 0x10 -/* C2FA30 80240E90 1C400015 */ bgtz $v0, .L80240EE8 -/* C2FA34 80240E94 00000000 */ nop -/* C2FA38 80240E98 8E0200CC */ lw $v0, 0xcc($s0) -/* C2FA3C 80240E9C 8C420004 */ lw $v0, 4($v0) -/* C2FA40 80240EA0 AC620028 */ sw $v0, 0x28($v1) -/* C2FA44 80240EA4 8E0200D0 */ lw $v0, 0xd0($s0) -/* C2FA48 80240EA8 8C420014 */ lw $v0, 0x14($v0) -/* C2FA4C 80240EAC 04410004 */ bgez $v0, .L80240EC0 -/* C2FA50 80240EB0 00000000 */ nop -/* C2FA54 80240EB4 C6200000 */ lwc1 $f0, ($s1) -/* C2FA58 80240EB8 080903B8 */ j .L80240EE0 -/* C2FA5C 80240EBC E4600018 */ swc1 $f0, 0x18($v1) -.L80240EC0: -/* C2FA60 80240EC0 3C018024 */ lui $at, 0x8024 -/* C2FA64 80240EC4 D42227A8 */ ldc1 $f2, 0x27a8($at) -/* C2FA68 80240EC8 44820000 */ mtc1 $v0, $f0 -/* C2FA6C 80240ECC 00000000 */ nop -/* C2FA70 80240ED0 46800021 */ cvt.d.w $f0, $f0 -/* C2FA74 80240ED4 46220003 */ div.d $f0, $f0, $f2 -/* C2FA78 80240ED8 46200020 */ cvt.s.d $f0, $f0 -/* C2FA7C 80240EDC E4600018 */ swc1 $f0, 0x18($v1) -.L80240EE0: -/* C2FA80 80240EE0 24020029 */ addiu $v0, $zero, 0x29 -/* C2FA84 80240EE4 AE420070 */ sw $v0, 0x70($s2) -.L80240EE8: -/* C2FA88 80240EE8 8FBF001C */ lw $ra, 0x1c($sp) -/* C2FA8C 80240EEC 8FB20018 */ lw $s2, 0x18($sp) -/* C2FA90 80240EF0 8FB10014 */ lw $s1, 0x14($sp) -/* C2FA94 80240EF4 8FB00010 */ lw $s0, 0x10($sp) -/* C2FA98 80240EF8 03E00008 */ jr $ra -/* C2FA9C 80240EFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/func_80240F00_C2EBA0.s b/asm/nonmatchings/world/area_dgb/dgb_02/func_80240F00_C2EBA0.s deleted file mode 100644 index 868fc4fbd4..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/func_80240F00_C2EBA0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F00_C2FAA0 -/* C2FAA0 80240F00 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C2FAA4 80240F04 AFB3002C */ sw $s3, 0x2c($sp) -/* C2FAA8 80240F08 0080982D */ daddu $s3, $a0, $zero -/* C2FAAC 80240F0C AFBF0030 */ sw $ra, 0x30($sp) -/* C2FAB0 80240F10 AFB20028 */ sw $s2, 0x28($sp) -/* C2FAB4 80240F14 AFB10024 */ sw $s1, 0x24($sp) -/* C2FAB8 80240F18 AFB00020 */ sw $s0, 0x20($sp) -/* C2FABC 80240F1C 8E720148 */ lw $s2, 0x148($s3) -/* C2FAC0 80240F20 00A0882D */ daddu $s1, $a1, $zero -/* C2FAC4 80240F24 86440008 */ lh $a0, 8($s2) -/* C2FAC8 80240F28 0C00EABB */ jal get_npc_unsafe -/* C2FACC 80240F2C 00C0802D */ daddu $s0, $a2, $zero -/* C2FAD0 80240F30 0200202D */ daddu $a0, $s0, $zero -/* C2FAD4 80240F34 0240282D */ daddu $a1, $s2, $zero -/* C2FAD8 80240F38 AFA00010 */ sw $zero, 0x10($sp) -/* C2FADC 80240F3C 8E260024 */ lw $a2, 0x24($s1) -/* C2FAE0 80240F40 8E270028 */ lw $a3, 0x28($s1) -/* C2FAE4 80240F44 0C01242D */ jal func_800490B4 -/* C2FAE8 80240F48 0040802D */ daddu $s0, $v0, $zero -/* C2FAEC 80240F4C 1040000C */ beqz $v0, .L80240F80 -/* C2FAF0 80240F50 00000000 */ nop -/* C2FAF4 80240F54 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C2FAF8 80240F58 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C2FAFC 80240F5C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C2FB00 80240F60 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C2FB04 80240F64 8C460028 */ lw $a2, 0x28($v0) -/* C2FB08 80240F68 0C00A720 */ jal atan2 -/* C2FB0C 80240F6C 8C470030 */ lw $a3, 0x30($v0) -/* C2FB10 80240F70 2402000C */ addiu $v0, $zero, 0xc -/* C2FB14 80240F74 E600000C */ swc1 $f0, 0xc($s0) -/* C2FB18 80240F78 08090417 */ j .L8024105C -/* C2FB1C 80240F7C AE620070 */ sw $v0, 0x70($s3) -.L80240F80: -/* C2FB20 80240F80 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C2FB24 80240F84 8E4200D0 */ lw $v0, 0xd0($s2) -/* C2FB28 80240F88 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C2FB2C 80240F8C C4440000 */ lwc1 $f4, ($v0) -/* C2FB30 80240F90 46802120 */ cvt.s.w $f4, $f4 -/* C2FB34 80240F94 44062000 */ mfc1 $a2, $f4 -/* C2FB38 80240F98 C4440008 */ lwc1 $f4, 8($v0) -/* C2FB3C 80240F9C 46802120 */ cvt.s.w $f4, $f4 -/* C2FB40 80240FA0 44072000 */ mfc1 $a3, $f4 -/* C2FB44 80240FA4 0C00A7B5 */ jal dist2D -/* C2FB48 80240FA8 00000000 */ nop -/* C2FB4C 80240FAC C6020018 */ lwc1 $f2, 0x18($s0) -/* C2FB50 80240FB0 4602003E */ c.le.s $f0, $f2 -/* C2FB54 80240FB4 00000000 */ nop -/* C2FB58 80240FB8 4500000B */ bc1f .L80240FE8 -/* C2FB5C 80240FBC 00000000 */ nop -/* C2FB60 80240FC0 8E4200CC */ lw $v0, 0xcc($s2) -/* C2FB64 80240FC4 8C430000 */ lw $v1, ($v0) -/* C2FB68 80240FC8 2402000F */ addiu $v0, $zero, 0xf -/* C2FB6C 80240FCC A602008E */ sh $v0, 0x8e($s0) -/* C2FB70 80240FD0 24020032 */ addiu $v0, $zero, 0x32 -/* C2FB74 80240FD4 AE030028 */ sw $v1, 0x28($s0) -/* C2FB78 80240FD8 AE420088 */ sw $v0, 0x88($s2) -/* C2FB7C 80240FDC 24020003 */ addiu $v0, $zero, 3 -/* C2FB80 80240FE0 08090417 */ j .L8024105C -/* C2FB84 80240FE4 AE620070 */ sw $v0, 0x70($s3) -.L80240FE8: -/* C2FB88 80240FE8 8602008C */ lh $v0, 0x8c($s0) -/* C2FB8C 80240FEC 1440001B */ bnez $v0, .L8024105C -/* C2FB90 80240FF0 0200202D */ daddu $a0, $s0, $zero -/* C2FB94 80240FF4 27A60018 */ addiu $a2, $sp, 0x18 -/* C2FB98 80240FF8 3C0540A0 */ lui $a1, 0x40a0 -/* C2FB9C 80240FFC C600000C */ lwc1 $f0, 0xc($s0) -/* C2FBA0 80241000 0000382D */ daddu $a3, $zero, $zero -/* C2FBA4 80241004 E7A00018 */ swc1 $f0, 0x18($sp) -/* C2FBA8 80241008 AFA00010 */ sw $zero, 0x10($sp) -/* C2FBAC 8024100C 0C0129E1 */ jal func_8004A784 -/* C2FBB0 80241010 AFA00014 */ sw $zero, 0x14($sp) -/* C2FBB4 80241014 C7A00018 */ lwc1 $f0, 0x18($sp) -/* C2FBB8 80241018 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C2FBBC 8024101C E600000C */ swc1 $f0, 0xc($s0) -/* C2FBC0 80241020 8E4200D0 */ lw $v0, 0xd0($s2) -/* C2FBC4 80241024 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C2FBC8 80241028 C4440000 */ lwc1 $f4, ($v0) -/* C2FBCC 8024102C 46802120 */ cvt.s.w $f4, $f4 -/* C2FBD0 80241030 44062000 */ mfc1 $a2, $f4 -/* C2FBD4 80241034 C4440008 */ lwc1 $f4, 8($v0) -/* C2FBD8 80241038 46802120 */ cvt.s.w $f4, $f4 -/* C2FBDC 8024103C 44072000 */ mfc1 $a3, $f4 -/* C2FBE0 80241040 0C00A720 */ jal atan2 -/* C2FBE4 80241044 00000000 */ nop -/* C2FBE8 80241048 8E050018 */ lw $a1, 0x18($s0) -/* C2FBEC 8024104C 44060000 */ mfc1 $a2, $f0 -/* C2FBF0 80241050 0200202D */ daddu $a0, $s0, $zero -/* C2FBF4 80241054 0C00EA95 */ jal npc_move_heading -/* C2FBF8 80241058 AC86000C */ sw $a2, 0xc($a0) -.L8024105C: -/* C2FBFC 8024105C 8FBF0030 */ lw $ra, 0x30($sp) -/* C2FC00 80241060 8FB3002C */ lw $s3, 0x2c($sp) -/* C2FC04 80241064 8FB20028 */ lw $s2, 0x28($sp) -/* C2FC08 80241068 8FB10024 */ lw $s1, 0x24($sp) -/* C2FC0C 8024106C 8FB00020 */ lw $s0, 0x20($sp) -/* C2FC10 80241070 03E00008 */ jr $ra -/* C2FC14 80241074 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/func_802410D4_C2EBA0.s b/asm/nonmatchings/world/area_dgb/dgb_02/func_802410D4_C2EBA0.s deleted file mode 100644 index b81ad641e5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/func_802410D4_C2EBA0.s +++ /dev/null @@ -1,226 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410D4_C2FC74 -/* C2FC74 802410D4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C2FC78 802410D8 AFB20038 */ sw $s2, 0x38($sp) -/* C2FC7C 802410DC 0080902D */ daddu $s2, $a0, $zero -/* C2FC80 802410E0 AFBF0048 */ sw $ra, 0x48($sp) -/* C2FC84 802410E4 AFB50044 */ sw $s5, 0x44($sp) -/* C2FC88 802410E8 AFB40040 */ sw $s4, 0x40($sp) -/* C2FC8C 802410EC AFB3003C */ sw $s3, 0x3c($sp) -/* C2FC90 802410F0 AFB10034 */ sw $s1, 0x34($sp) -/* C2FC94 802410F4 AFB00030 */ sw $s0, 0x30($sp) -/* C2FC98 802410F8 8E510148 */ lw $s1, 0x148($s2) -/* C2FC9C 802410FC 86240008 */ lh $a0, 8($s1) -/* C2FCA0 80241100 0C00EABB */ jal get_npc_unsafe -/* C2FCA4 80241104 00A0802D */ daddu $s0, $a1, $zero -/* C2FCA8 80241108 8E43000C */ lw $v1, 0xc($s2) -/* C2FCAC 8024110C 0240202D */ daddu $a0, $s2, $zero -/* C2FCB0 80241110 8C650000 */ lw $a1, ($v1) -/* C2FCB4 80241114 0C0B1EAF */ jal get_variable -/* C2FCB8 80241118 0040A02D */ daddu $s4, $v0, $zero -/* C2FCBC 8024111C AFA00010 */ sw $zero, 0x10($sp) -/* C2FCC0 80241120 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2FCC4 80241124 8C630030 */ lw $v1, 0x30($v1) -/* C2FCC8 80241128 AFA30014 */ sw $v1, 0x14($sp) -/* C2FCCC 8024112C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2FCD0 80241130 8C63001C */ lw $v1, 0x1c($v1) -/* C2FCD4 80241134 AFA30018 */ sw $v1, 0x18($sp) -/* C2FCD8 80241138 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2FCDC 8024113C 8C630024 */ lw $v1, 0x24($v1) -/* C2FCE0 80241140 AFA3001C */ sw $v1, 0x1c($sp) -/* C2FCE4 80241144 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2FCE8 80241148 8C630028 */ lw $v1, 0x28($v1) -/* C2FCEC 8024114C 27B50010 */ addiu $s5, $sp, 0x10 -/* C2FCF0 80241150 AFA30020 */ sw $v1, 0x20($sp) -/* C2FCF4 80241154 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2FCF8 80241158 3C014220 */ lui $at, 0x4220 -/* C2FCFC 8024115C 44810000 */ mtc1 $at, $f0 -/* C2FD00 80241160 8C63002C */ lw $v1, 0x2c($v1) -/* C2FD04 80241164 0040982D */ daddu $s3, $v0, $zero -/* C2FD08 80241168 E7A00028 */ swc1 $f0, 0x28($sp) -/* C2FD0C 8024116C A7A0002C */ sh $zero, 0x2c($sp) -/* C2FD10 80241170 16000005 */ bnez $s0, .L80241188 -/* C2FD14 80241174 AFA30024 */ sw $v1, 0x24($sp) -/* C2FD18 80241178 8E2200B0 */ lw $v0, 0xb0($s1) -/* C2FD1C 8024117C 30420004 */ andi $v0, $v0, 4 -/* C2FD20 80241180 10400027 */ beqz $v0, .L80241220 -/* C2FD24 80241184 00000000 */ nop -.L80241188: -/* C2FD28 80241188 2402001E */ addiu $v0, $zero, 0x1e -/* C2FD2C 8024118C 2404F7FF */ addiu $a0, $zero, -0x801 -/* C2FD30 80241190 AE400070 */ sw $zero, 0x70($s2) -/* C2FD34 80241194 A682008E */ sh $v0, 0x8e($s4) -/* C2FD38 80241198 8E2300CC */ lw $v1, 0xcc($s1) -/* C2FD3C 8024119C 8E820000 */ lw $v0, ($s4) -/* C2FD40 802411A0 8C630028 */ lw $v1, 0x28($v1) -/* C2FD44 802411A4 00441024 */ and $v0, $v0, $a0 -/* C2FD48 802411A8 AE820000 */ sw $v0, ($s4) -/* C2FD4C 802411AC AE830028 */ sw $v1, 0x28($s4) -/* C2FD50 802411B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C2FD54 802411B4 AE20006C */ sw $zero, 0x6c($s1) -/* C2FD58 802411B8 8C420034 */ lw $v0, 0x34($v0) -/* C2FD5C 802411BC 14400006 */ bnez $v0, .L802411D8 -/* C2FD60 802411C0 2403FDFF */ addiu $v1, $zero, -0x201 -/* C2FD64 802411C4 8E820000 */ lw $v0, ($s4) -/* C2FD68 802411C8 2403FFF7 */ addiu $v1, $zero, -9 -/* C2FD6C 802411CC 34420200 */ ori $v0, $v0, 0x200 -/* C2FD70 802411D0 08090479 */ j .L802411E4 -/* C2FD74 802411D4 00431024 */ and $v0, $v0, $v1 -.L802411D8: -/* C2FD78 802411D8 8E820000 */ lw $v0, ($s4) -/* C2FD7C 802411DC 00431024 */ and $v0, $v0, $v1 -/* C2FD80 802411E0 34420008 */ ori $v0, $v0, 8 -.L802411E4: -/* C2FD84 802411E4 AE820000 */ sw $v0, ($s4) -/* C2FD88 802411E8 8E2200B0 */ lw $v0, 0xb0($s1) -/* C2FD8C 802411EC 30420004 */ andi $v0, $v0, 4 -/* C2FD90 802411F0 10400007 */ beqz $v0, .L80241210 -/* C2FD94 802411F4 24020063 */ addiu $v0, $zero, 0x63 -/* C2FD98 802411F8 AE420070 */ sw $v0, 0x70($s2) -/* C2FD9C 802411FC 24020028 */ addiu $v0, $zero, 0x28 -/* C2FDA0 80241200 AE420074 */ sw $v0, 0x74($s2) -/* C2FDA4 80241204 8E2200CC */ lw $v0, 0xcc($s1) -/* C2FDA8 80241208 8C420000 */ lw $v0, ($v0) -/* C2FDAC 8024120C AE820028 */ sw $v0, 0x28($s4) -.L80241210: -/* C2FDB0 80241210 8E2200B0 */ lw $v0, 0xb0($s1) -/* C2FDB4 80241214 2403FFFB */ addiu $v1, $zero, -5 -/* C2FDB8 80241218 00431024 */ and $v0, $v0, $v1 -/* C2FDBC 8024121C AE2200B0 */ sw $v0, 0xb0($s1) -.L80241220: -/* C2FDC0 80241220 8E420070 */ lw $v0, 0x70($s2) -/* C2FDC4 80241224 2442FFF6 */ addiu $v0, $v0, -0xa -/* C2FDC8 80241228 2C420014 */ sltiu $v0, $v0, 0x14 -/* C2FDCC 8024122C 10400009 */ beqz $v0, .L80241254 -/* C2FDD0 80241230 00000000 */ nop -/* C2FDD4 80241234 8E22006C */ lw $v0, 0x6c($s1) -/* C2FDD8 80241238 14400006 */ bnez $v0, .L80241254 -/* C2FDDC 8024123C 00000000 */ nop -/* C2FDE0 80241240 0C090082 */ jal func_80240208 -/* C2FDE4 80241244 0240202D */ daddu $a0, $s2, $zero -/* C2FDE8 80241248 10400002 */ beqz $v0, .L80241254 -/* C2FDEC 8024124C 2402001E */ addiu $v0, $zero, 0x1e -/* C2FDF0 80241250 AE420070 */ sw $v0, 0x70($s2) -.L80241254: -/* C2FDF4 80241254 8E430070 */ lw $v1, 0x70($s2) -/* C2FDF8 80241258 2C620064 */ sltiu $v0, $v1, 0x64 -/* C2FDFC 8024125C 10400067 */ beqz $v0, .L802413FC -/* C2FE00 80241260 00031080 */ sll $v0, $v1, 2 -/* C2FE04 80241264 3C018024 */ lui $at, 0x8024 -/* C2FE08 80241268 00220821 */ addu $at, $at, $v0 -/* C2FE0C 8024126C 8C2227B0 */ lw $v0, 0x27b0($at) -/* C2FE10 80241270 00400008 */ jr $v0 -/* C2FE14 80241274 00000000 */ nop -/* C2FE18 80241278 0240202D */ daddu $a0, $s2, $zero -/* C2FE1C 8024127C 0260282D */ daddu $a1, $s3, $zero -/* C2FE20 80241280 0C090234 */ jal func_802408D0 -/* C2FE24 80241284 02A0302D */ daddu $a2, $s5, $zero -/* C2FE28 80241288 080904FF */ j .L802413FC -/* C2FE2C 8024128C 00000000 */ nop -/* C2FE30 80241290 0240202D */ daddu $a0, $s2, $zero -/* C2FE34 80241294 0260282D */ daddu $a1, $s3, $zero -/* C2FE38 80241298 0C090256 */ jal func_80240958 -/* C2FE3C 8024129C 02A0302D */ daddu $a2, $s5, $zero -/* C2FE40 802412A0 080904FF */ j .L802413FC -/* C2FE44 802412A4 00000000 */ nop -/* C2FE48 802412A8 0240202D */ daddu $a0, $s2, $zero -/* C2FE4C 802412AC 0260282D */ daddu $a1, $s3, $zero -/* C2FE50 802412B0 0C090304 */ jal func_80240C10 -/* C2FE54 802412B4 02A0302D */ daddu $a2, $s5, $zero -/* C2FE58 802412B8 080904FF */ j .L802413FC -/* C2FE5C 802412BC 00000000 */ nop -/* C2FE60 802412C0 0240202D */ daddu $a0, $s2, $zero -/* C2FE64 802412C4 0260282D */ daddu $a1, $s3, $zero -/* C2FE68 802412C8 0C09031D */ jal func_80240C74 -/* C2FE6C 802412CC 02A0302D */ daddu $a2, $s5, $zero -/* C2FE70 802412D0 080904FF */ j .L802413FC -/* C2FE74 802412D4 00000000 */ nop -/* C2FE78 802412D8 0240202D */ daddu $a0, $s2, $zero -/* C2FE7C 802412DC 0260282D */ daddu $a1, $s3, $zero -/* C2FE80 802412E0 0C090347 */ jal func_80240D1C -/* C2FE84 802412E4 02A0302D */ daddu $a2, $s5, $zero -/* C2FE88 802412E8 080904FF */ j .L802413FC -/* C2FE8C 802412EC 00000000 */ nop -/* C2FE90 802412F0 0240202D */ daddu $a0, $s2, $zero -/* C2FE94 802412F4 0260282D */ daddu $a1, $s3, $zero -/* C2FE98 802412F8 0C0127DF */ jal func_80049F7C -/* C2FE9C 802412FC 02A0302D */ daddu $a2, $s5, $zero -/* C2FEA0 80241300 8E430070 */ lw $v1, 0x70($s2) -/* C2FEA4 80241304 2402000D */ addiu $v0, $zero, 0xd -/* C2FEA8 80241308 1462003C */ bne $v1, $v0, .L802413FC -/* C2FEAC 8024130C 00000000 */ nop -/* C2FEB0 80241310 0240202D */ daddu $a0, $s2, $zero -/* C2FEB4 80241314 0260282D */ daddu $a1, $s3, $zero -/* C2FEB8 80241318 0C012849 */ jal func_8004A124 -/* C2FEBC 8024131C 02A0302D */ daddu $a2, $s5, $zero -/* C2FEC0 80241320 080904FF */ j .L802413FC -/* C2FEC4 80241324 00000000 */ nop -/* C2FEC8 80241328 0240202D */ daddu $a0, $s2, $zero -/* C2FECC 8024132C 0260282D */ daddu $a1, $s3, $zero -/* C2FED0 80241330 0C0128FA */ jal func_8004A3E8 -/* C2FED4 80241334 02A0302D */ daddu $a2, $s5, $zero -/* C2FED8 80241338 2402000F */ addiu $v0, $zero, 0xf -/* C2FEDC 8024133C A682008E */ sh $v0, 0x8e($s4) -/* C2FEE0 80241340 24020028 */ addiu $v0, $zero, 0x28 -/* C2FEE4 80241344 AE220088 */ sw $v0, 0x88($s1) -/* C2FEE8 80241348 24020003 */ addiu $v0, $zero, 3 -/* C2FEEC 8024134C 080904FF */ j .L802413FC -/* C2FEF0 80241350 AE420070 */ sw $v0, 0x70($s2) -/* C2FEF4 80241354 0C090000 */ jal func_80240000 -/* C2FEF8 80241358 0240202D */ daddu $a0, $s2, $zero -/* C2FEFC 8024135C 8E430070 */ lw $v1, 0x70($s2) -/* C2FF00 80241360 2402001F */ addiu $v0, $zero, 0x1f -/* C2FF04 80241364 14620025 */ bne $v1, $v0, .L802413FC -/* C2FF08 80241368 00000000 */ nop -/* C2FF0C 8024136C 0C09001B */ jal func_8024006C -/* C2FF10 80241370 0240202D */ daddu $a0, $s2, $zero -/* C2FF14 80241374 8E430070 */ lw $v1, 0x70($s2) -/* C2FF18 80241378 24020020 */ addiu $v0, $zero, 0x20 -/* C2FF1C 8024137C 1462001F */ bne $v1, $v0, .L802413FC -/* C2FF20 80241380 00000000 */ nop -/* C2FF24 80241384 0C090037 */ jal func_802400DC -/* C2FF28 80241388 0240202D */ daddu $a0, $s2, $zero -/* C2FF2C 8024138C 080904FF */ j .L802413FC -/* C2FF30 80241390 00000000 */ nop -/* C2FF34 80241394 0C09006D */ jal func_802401B4 -/* C2FF38 80241398 0240202D */ daddu $a0, $s2, $zero -/* C2FF3C 8024139C 080904FF */ j .L802413FC -/* C2FF40 802413A0 00000000 */ nop -/* C2FF44 802413A4 0240202D */ daddu $a0, $s2, $zero -/* C2FF48 802413A8 0260282D */ daddu $a1, $s3, $zero -/* C2FF4C 802413AC 0C090395 */ jal func_80240E54 -/* C2FF50 802413B0 02A0302D */ daddu $a2, $s5, $zero -/* C2FF54 802413B4 8E430070 */ lw $v1, 0x70($s2) -/* C2FF58 802413B8 24020029 */ addiu $v0, $zero, 0x29 -/* C2FF5C 802413BC 1462000F */ bne $v1, $v0, .L802413FC -/* C2FF60 802413C0 00000000 */ nop -/* C2FF64 802413C4 0240202D */ daddu $a0, $s2, $zero -/* C2FF68 802413C8 0260282D */ daddu $a1, $s3, $zero -/* C2FF6C 802413CC 0C0903C0 */ jal func_80240F00 -/* C2FF70 802413D0 02A0302D */ daddu $a2, $s5, $zero -/* C2FF74 802413D4 080904FF */ j .L802413FC -/* C2FF78 802413D8 00000000 */ nop -/* C2FF7C 802413DC 0240202D */ daddu $a0, $s2, $zero -/* C2FF80 802413E0 0260282D */ daddu $a1, $s3, $zero -/* C2FF84 802413E4 0C09041E */ jal func_80241078 -/* C2FF88 802413E8 02A0302D */ daddu $a2, $s5, $zero -/* C2FF8C 802413EC 080904FF */ j .L802413FC -/* C2FF90 802413F0 00000000 */ nop -/* C2FF94 802413F4 0C0129CF */ jal func_8004A73C -/* C2FF98 802413F8 0240202D */ daddu $a0, $s2, $zero -.L802413FC: -/* C2FF9C 802413FC 8FBF0048 */ lw $ra, 0x48($sp) -/* C2FFA0 80241400 8FB50044 */ lw $s5, 0x44($sp) -/* C2FFA4 80241404 8FB40040 */ lw $s4, 0x40($sp) -/* C2FFA8 80241408 8FB3003C */ lw $s3, 0x3c($sp) -/* C2FFAC 8024140C 8FB20038 */ lw $s2, 0x38($sp) -/* C2FFB0 80241410 8FB10034 */ lw $s1, 0x34($sp) -/* C2FFB4 80241414 8FB00030 */ lw $s0, 0x30($sp) -/* C2FFB8 80241418 0000102D */ daddu $v0, $zero, $zero -/* C2FFBC 8024141C 03E00008 */ jr $ra -/* C2FFC0 80241420 27BD0050 */ addiu $sp, $sp, 0x50 -/* C2FFC4 80241424 00000000 */ nop -/* C2FFC8 80241428 00000000 */ nop -/* C2FFCC 8024142C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/update_starpoints_display_C2EBA0.s b/asm/nonmatchings/world/area_dgb/dgb_02/update_starpoints_display_C2EBA0.s deleted file mode 100644 index f2098d8934..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/update_starpoints_display_C2EBA0.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_starpoints_display_C2EF5C -/* C2EF5C 802403BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C2EF60 802403C0 AFB40028 */ sw $s4, 0x28($sp) -/* C2EF64 802403C4 0080A02D */ daddu $s4, $a0, $zero -/* C2EF68 802403C8 AFBF002C */ sw $ra, 0x2c($sp) -/* C2EF6C 802403CC AFB30024 */ sw $s3, 0x24($sp) -/* C2EF70 802403D0 AFB20020 */ sw $s2, 0x20($sp) -/* C2EF74 802403D4 AFB1001C */ sw $s1, 0x1c($sp) -/* C2EF78 802403D8 AFB00018 */ sw $s0, 0x18($sp) -/* C2EF7C 802403DC 8E910148 */ lw $s1, 0x148($s4) -/* C2EF80 802403E0 86240008 */ lh $a0, 8($s1) -/* C2EF84 802403E4 0C00EABB */ jal get_npc_unsafe -/* C2EF88 802403E8 00A0802D */ daddu $s0, $a1, $zero -/* C2EF8C 802403EC 16000005 */ bnez $s0, .L80240404 -/* C2EF90 802403F0 0040902D */ daddu $s2, $v0, $zero -/* C2EF94 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C2EF98 802403F8 30420004 */ andi $v0, $v0, 4 -/* C2EF9C 802403FC 10400015 */ beqz $v0, .L80240454 -/* C2EFA0 80240400 00000000 */ nop -.L80240404: -/* C2EFA4 80240404 AE800070 */ sw $zero, 0x70($s4) -/* C2EFA8 80240408 8E420000 */ lw $v0, ($s2) -/* C2EFAC 8024040C 3C031F30 */ lui $v1, 0x1f30 -/* C2EFB0 80240410 A640008E */ sh $zero, 0x8e($s2) -/* C2EFB4 80240414 34420102 */ ori $v0, $v0, 0x102 -/* C2EFB8 80240418 AE420000 */ sw $v0, ($s2) -/* C2EFBC 8024041C 8E220000 */ lw $v0, ($s1) -/* C2EFC0 80240420 3C01C47A */ lui $at, 0xc47a -/* C2EFC4 80240424 44810000 */ mtc1 $at, $f0 -/* C2EFC8 80240428 00431025 */ or $v0, $v0, $v1 -/* C2EFCC 8024042C AE220000 */ sw $v0, ($s1) -/* C2EFD0 80240430 AE400038 */ sw $zero, 0x38($s2) -/* C2EFD4 80240434 E640003C */ swc1 $f0, 0x3c($s2) -/* C2EFD8 80240438 AE400040 */ sw $zero, 0x40($s2) -/* C2EFDC 8024043C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C2EFE0 80240440 30620004 */ andi $v0, $v1, 4 -/* C2EFE4 80240444 10400003 */ beqz $v0, .L80240454 -/* C2EFE8 80240448 2402FFFB */ addiu $v0, $zero, -5 -/* C2EFEC 8024044C 00621024 */ and $v0, $v1, $v0 -/* C2EFF0 80240450 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240454: -/* C2EFF4 80240454 8E930070 */ lw $s3, 0x70($s4) -/* C2EFF8 80240458 12600005 */ beqz $s3, .L80240470 -/* C2EFFC 8024045C 24020001 */ addiu $v0, $zero, 1 -/* C2F000 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* C2F004 80240464 00000000 */ nop -/* C2F008 80240468 0809017E */ j .L802405F8 -/* C2F00C 8024046C 00000000 */ nop -.L80240470: -/* C2F010 80240470 86240008 */ lh $a0, 8($s1) -/* C2F014 80240474 0C00FB3A */ jal get_enemy -/* C2F018 80240478 2484FFFF */ addiu $a0, $a0, -1 -/* C2F01C 8024047C 0040802D */ daddu $s0, $v0, $zero -/* C2F020 80240480 0C00EABB */ jal get_npc_unsafe -/* C2F024 80240484 86040008 */ lh $a0, 8($s0) -/* C2F028 80240488 24030001 */ addiu $v1, $zero, 1 -/* C2F02C 8024048C 0040982D */ daddu $s3, $v0, $zero -/* C2F030 80240490 A2230007 */ sb $v1, 7($s1) -/* C2F034 80240494 8E03006C */ lw $v1, 0x6c($s0) -/* C2F038 80240498 24020003 */ addiu $v0, $zero, 3 -/* C2F03C 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* C2F040 802404A0 00000000 */ nop -/* C2F044 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) -/* C2F048 802404A8 10A00003 */ beqz $a1, .L802404B8 -/* C2F04C 802404AC 0260202D */ daddu $a0, $s3, $zero -/* C2F050 802404B0 0C012530 */ jal func_800494C0 -/* C2F054 802404B4 0000302D */ daddu $a2, $zero, $zero -.L802404B8: -/* C2F058 802404B8 27A40010 */ addiu $a0, $sp, 0x10 -/* C2F05C 802404BC C6280070 */ lwc1 $f8, 0x70($s1) -/* C2F060 802404C0 46804220 */ cvt.s.w $f8, $f8 -/* C2F064 802404C4 C6620034 */ lwc1 $f2, 0x34($s3) -/* C2F068 802404C8 3C014387 */ lui $at, 0x4387 -/* C2F06C 802404CC 44810000 */ mtc1 $at, $f0 -/* C2F070 802404D0 44064000 */ mfc1 $a2, $f8 -/* C2F074 802404D4 46020001 */ sub.s $f0, $f0, $f2 -/* C2F078 802404D8 C6660038 */ lwc1 $f6, 0x38($s3) -/* C2F07C 802404DC C6640040 */ lwc1 $f4, 0x40($s3) -/* C2F080 802404E0 44070000 */ mfc1 $a3, $f0 -/* C2F084 802404E4 27A50014 */ addiu $a1, $sp, 0x14 -/* C2F088 802404E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* C2F08C 802404EC 0C00A7E7 */ jal add_vec2D_polar -/* C2F090 802404F0 E7A40014 */ swc1 $f4, 0x14($sp) -/* C2F094 802404F4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C2F098 802404F8 4600020D */ trunc.w.s $f8, $f0 -/* C2F09C 802404FC 44024000 */ mfc1 $v0, $f8 -/* C2F0A0 80240500 E6400038 */ swc1 $f0, 0x38($s2) -/* C2F0A4 80240504 A6220010 */ sh $v0, 0x10($s1) -/* C2F0A8 80240508 C660003C */ lwc1 $f0, 0x3c($s3) -/* C2F0AC 8024050C C622006C */ lwc1 $f2, 0x6c($s1) -/* C2F0B0 80240510 468010A0 */ cvt.s.w $f2, $f2 -/* C2F0B4 80240514 46020000 */ add.s $f0, $f0, $f2 -/* C2F0B8 80240518 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C2F0BC 8024051C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C2F0C0 80240520 E640003C */ swc1 $f0, 0x3c($s2) -/* C2F0C4 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C2F0C8 80240528 4600020D */ trunc.w.s $f8, $f0 -/* C2F0CC 8024052C 44024000 */ mfc1 $v0, $f8 -/* C2F0D0 80240530 00000000 */ nop -/* C2F0D4 80240534 A6220012 */ sh $v0, 0x12($s1) -/* C2F0D8 80240538 4600120D */ trunc.w.s $f8, $f2 -/* C2F0DC 8024053C 44024000 */ mfc1 $v0, $f8 -/* C2F0E0 80240540 E6420040 */ swc1 $f2, 0x40($s2) -/* C2F0E4 80240544 A6220014 */ sh $v0, 0x14($s1) -/* C2F0E8 80240548 8C660028 */ lw $a2, 0x28($v1) -/* C2F0EC 8024054C 8C670030 */ lw $a3, 0x30($v1) -/* C2F0F0 80240550 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C2F0F4 80240554 0C00A720 */ jal atan2 -/* C2F0F8 80240558 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C2F0FC 8024055C 3C03E0EF */ lui $v1, 0xe0ef -/* C2F100 80240560 E640000C */ swc1 $f0, 0xc($s2) -/* C2F104 80240564 8E220000 */ lw $v0, ($s1) -/* C2F108 80240568 3463FFFF */ ori $v1, $v1, 0xffff -/* C2F10C 8024056C 00431024 */ and $v0, $v0, $v1 -/* C2F110 80240570 AE220000 */ sw $v0, ($s1) -/* C2F114 80240574 24020001 */ addiu $v0, $zero, 1 -/* C2F118 80240578 A640008E */ sh $zero, 0x8e($s2) -/* C2F11C 8024057C 0809017E */ j .L802405F8 -/* C2F120 80240580 AE820070 */ sw $v0, 0x70($s4) -.L80240584: -/* C2F124 80240584 86240008 */ lh $a0, 8($s1) -/* C2F128 80240588 0C00FB3A */ jal get_enemy -/* C2F12C 8024058C 2484FFFF */ addiu $a0, $a0, -1 -/* C2F130 80240590 0040802D */ daddu $s0, $v0, $zero -/* C2F134 80240594 0C00EABB */ jal get_npc_unsafe -/* C2F138 80240598 86040008 */ lh $a0, 8($s0) -/* C2F13C 8024059C 9642008E */ lhu $v0, 0x8e($s2) -/* C2F140 802405A0 24420001 */ addiu $v0, $v0, 1 -/* C2F144 802405A4 A642008E */ sh $v0, 0x8e($s2) -/* C2F148 802405A8 00021400 */ sll $v0, $v0, 0x10 -/* C2F14C 802405AC 8E23007C */ lw $v1, 0x7c($s1) -/* C2F150 802405B0 00021403 */ sra $v0, $v0, 0x10 -/* C2F154 802405B4 0043102A */ slt $v0, $v0, $v1 -/* C2F158 802405B8 50400001 */ beql $v0, $zero, .L802405C0 -/* C2F15C 802405BC A2200007 */ sb $zero, 7($s1) -.L802405C0: -/* C2F160 802405C0 8E03006C */ lw $v1, 0x6c($s0) -/* C2F164 802405C4 24020004 */ addiu $v0, $zero, 4 -/* C2F168 802405C8 1462000B */ bne $v1, $v0, .L802405F8 -/* C2F16C 802405CC 3C021F10 */ lui $v0, 0x1f10 -/* C2F170 802405D0 8E230000 */ lw $v1, ($s1) -/* C2F174 802405D4 3C01C47A */ lui $at, 0xc47a -/* C2F178 802405D8 44810000 */ mtc1 $at, $f0 -/* C2F17C 802405DC 00621825 */ or $v1, $v1, $v0 -/* C2F180 802405E0 AE230000 */ sw $v1, ($s1) -/* C2F184 802405E4 AE400038 */ sw $zero, 0x38($s2) -/* C2F188 802405E8 E640003C */ swc1 $f0, 0x3c($s2) -/* C2F18C 802405EC AE400040 */ sw $zero, 0x40($s2) -/* C2F190 802405F0 A2330007 */ sb $s3, 7($s1) -/* C2F194 802405F4 AE800070 */ sw $zero, 0x70($s4) -.L802405F8: -/* C2F198 802405F8 8FBF002C */ lw $ra, 0x2c($sp) -/* C2F19C 802405FC 8FB40028 */ lw $s4, 0x28($sp) -/* C2F1A0 80240600 8FB30024 */ lw $s3, 0x24($sp) -/* C2F1A4 80240604 8FB20020 */ lw $s2, 0x20($sp) -/* C2F1A8 80240608 8FB1001C */ lw $s1, 0x1c($sp) -/* C2F1AC 8024060C 8FB00018 */ lw $s0, 0x18($sp) -/* C2F1B0 80240610 0000102D */ daddu $v0, $zero, $zero -/* C2F1B4 80240614 03E00008 */ jr $ra -/* C2F1B8 80240618 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/func_802400BC_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/func_802400BC_C314E0.s deleted file mode 100644 index edafbf479e..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/func_802400BC_C314E0.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400BC_C3159C -/* C3159C 802400BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C315A0 802400C0 AFBF002C */ sw $ra, 0x2c($sp) -/* C315A4 802400C4 AFB00028 */ sw $s0, 0x28($sp) -/* C315A8 802400C8 8C820098 */ lw $v0, 0x98($a0) -/* C315AC 802400CC 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* C315B0 802400D0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* C315B4 802400D4 14400005 */ bnez $v0, .L802400EC -/* C315B8 802400D8 00000000 */ nop -/* C315BC 802400DC C4800084 */ lwc1 $f0, 0x84($a0) -/* C315C0 802400E0 46800020 */ cvt.s.w $f0, $f0 -/* C315C4 802400E4 0809003E */ j .L802400F8 -/* C315C8 802400E8 E6000028 */ swc1 $f0, 0x28($s0) -.L802400EC: -/* C315CC 802400EC C4800084 */ lwc1 $f0, 0x84($a0) -/* C315D0 802400F0 46800020 */ cvt.s.w $f0, $f0 -/* C315D4 802400F4 E6000030 */ swc1 $f0, 0x30($s0) -.L802400F8: -/* C315D8 802400F8 27A20024 */ addiu $v0, $sp, 0x24 -/* C315DC 802400FC 0000202D */ daddu $a0, $zero, $zero -/* C315E0 80240100 27A50018 */ addiu $a1, $sp, 0x18 -/* C315E4 80240104 27A6001C */ addiu $a2, $sp, 0x1c -/* C315E8 80240108 C6000028 */ lwc1 $f0, 0x28($s0) -/* C315EC 8024010C 3C014120 */ lui $at, 0x4120 -/* C315F0 80240110 44811000 */ mtc1 $at, $f2 -/* C315F4 80240114 3C014220 */ lui $at, 0x4220 -/* C315F8 80240118 44813000 */ mtc1 $at, $f6 -/* C315FC 8024011C 27A70020 */ addiu $a3, $sp, 0x20 -/* C31600 80240120 E7A00018 */ swc1 $f0, 0x18($sp) -/* C31604 80240124 C600002C */ lwc1 $f0, 0x2c($s0) -/* C31608 80240128 C6040030 */ lwc1 $f4, 0x30($s0) -/* C3160C 8024012C 46020000 */ add.s $f0, $f0, $f2 -/* C31610 80240130 E7A60024 */ swc1 $f6, 0x24($sp) -/* C31614 80240134 E7A40020 */ swc1 $f4, 0x20($sp) -/* C31618 80240138 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C3161C 8024013C 0C0372DF */ jal func_800DCB7C -/* C31620 80240140 AFA20010 */ sw $v0, 0x10($sp) -/* C31624 80240144 C7A00018 */ lwc1 $f0, 0x18($sp) -/* C31628 80240148 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* C3162C 8024014C C7A40020 */ lwc1 $f4, 0x20($sp) -/* C31630 80240150 E6000028 */ swc1 $f0, 0x28($s0) -/* C31634 80240154 E602002C */ swc1 $f2, 0x2c($s0) -/* C31638 80240158 E6040030 */ swc1 $f4, 0x30($s0) -/* C3163C 8024015C 8FBF002C */ lw $ra, 0x2c($sp) -/* C31640 80240160 8FB00028 */ lw $s0, 0x28($sp) -/* C31644 80240164 24020002 */ addiu $v0, $zero, 2 -/* C31648 80240168 03E00008 */ jr $ra -/* C3164C 8024016C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/func_80240170_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/func_80240170_C314E0.s deleted file mode 100644 index 0982c25823..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/func_80240170_C314E0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240170_C31650 -/* C31650 80240170 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C31654 80240174 AFBF0010 */ sw $ra, 0x10($sp) -/* C31658 80240178 0C04417A */ jal get_entity_by_index -/* C3165C 8024017C 8C840084 */ lw $a0, 0x84($a0) -/* C31660 80240180 0040182D */ daddu $v1, $v0, $zero -/* C31664 80240184 8C640000 */ lw $a0, ($v1) -/* C31668 80240188 3C050010 */ lui $a1, 0x10 -/* C3166C 8024018C 00852025 */ or $a0, $a0, $a1 -/* C31670 80240190 AC640000 */ sw $a0, ($v1) -/* C31674 80240194 8FBF0010 */ lw $ra, 0x10($sp) -/* C31678 80240198 24020002 */ addiu $v0, $zero, 2 -/* C3167C 8024019C 03E00008 */ jr $ra -/* C31680 802401A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/func_80240250_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/func_80240250_C314E0.s deleted file mode 100644 index b5e55b57c7..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/func_80240250_C314E0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240250_C31730 -/* C31730 80240250 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C31734 80240254 AFB10014 */ sw $s1, 0x14($sp) -/* C31738 80240258 0080882D */ daddu $s1, $a0, $zero -/* C3173C 8024025C AFBF0018 */ sw $ra, 0x18($sp) -/* C31740 80240260 AFB00010 */ sw $s0, 0x10($sp) -/* C31744 80240264 8E300148 */ lw $s0, 0x148($s1) -/* C31748 80240268 0C00EABB */ jal get_npc_unsafe -/* C3174C 8024026C 86040008 */ lh $a0, 8($s0) -/* C31750 80240270 24030001 */ addiu $v1, $zero, 1 -/* C31754 80240274 0040202D */ daddu $a0, $v0, $zero -/* C31758 80240278 AE03006C */ sw $v1, 0x6c($s0) -/* C3175C 8024027C 8482008C */ lh $v0, 0x8c($a0) -/* C31760 80240280 14400009 */ bnez $v0, .L802402A8 -/* C31764 80240284 24020002 */ addiu $v0, $zero, 2 -/* C31768 80240288 96030072 */ lhu $v1, 0x72($s0) -/* C3176C 8024028C AE02006C */ sw $v0, 0x6c($s0) -/* C31770 80240290 A483008E */ sh $v1, 0x8e($a0) -/* C31774 80240294 8E0200CC */ lw $v0, 0xcc($s0) -/* C31778 80240298 8C420020 */ lw $v0, 0x20($v0) -/* C3177C 8024029C AC820028 */ sw $v0, 0x28($a0) -/* C31780 802402A0 2402001F */ addiu $v0, $zero, 0x1f -/* C31784 802402A4 AE220070 */ sw $v0, 0x70($s1) -.L802402A8: -/* C31788 802402A8 8FBF0018 */ lw $ra, 0x18($sp) -/* C3178C 802402AC 8FB10014 */ lw $s1, 0x14($sp) -/* C31790 802402B0 8FB00010 */ lw $s0, 0x10($sp) -/* C31794 802402B4 03E00008 */ jr $ra -/* C31798 802402B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/func_802402BC_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/func_802402BC_C314E0.s deleted file mode 100644 index c609d5bb5b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/func_802402BC_C314E0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402BC_C3179C -/* C3179C 802402BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C317A0 802402C0 AFB10014 */ sw $s1, 0x14($sp) -/* C317A4 802402C4 0080882D */ daddu $s1, $a0, $zero -/* C317A8 802402C8 AFBF0018 */ sw $ra, 0x18($sp) -/* C317AC 802402CC AFB00010 */ sw $s0, 0x10($sp) -/* C317B0 802402D0 8E300148 */ lw $s0, 0x148($s1) -/* C317B4 802402D4 0C00EABB */ jal get_npc_unsafe -/* C317B8 802402D8 86040008 */ lh $a0, 8($s0) -/* C317BC 802402DC 0040202D */ daddu $a0, $v0, $zero -/* C317C0 802402E0 9482008E */ lhu $v0, 0x8e($a0) -/* C317C4 802402E4 2442FFFF */ addiu $v0, $v0, -1 -/* C317C8 802402E8 A482008E */ sh $v0, 0x8e($a0) -/* C317CC 802402EC 00021400 */ sll $v0, $v0, 0x10 -/* C317D0 802402F0 1C400009 */ bgtz $v0, .L80240318 -/* C317D4 802402F4 24020003 */ addiu $v0, $zero, 3 -/* C317D8 802402F8 96030076 */ lhu $v1, 0x76($s0) -/* C317DC 802402FC AE02006C */ sw $v0, 0x6c($s0) -/* C317E0 80240300 A483008E */ sh $v1, 0x8e($a0) -/* C317E4 80240304 8E0200CC */ lw $v0, 0xcc($s0) -/* C317E8 80240308 8C420024 */ lw $v0, 0x24($v0) -/* C317EC 8024030C AC820028 */ sw $v0, 0x28($a0) -/* C317F0 80240310 24020020 */ addiu $v0, $zero, 0x20 -/* C317F4 80240314 AE220070 */ sw $v0, 0x70($s1) -.L80240318: -/* C317F8 80240318 8FBF0018 */ lw $ra, 0x18($sp) -/* C317FC 8024031C 8FB10014 */ lw $s1, 0x14($sp) -/* C31800 80240320 8FB00010 */ lw $s0, 0x10($sp) -/* C31804 80240324 03E00008 */ jr $ra -/* C31808 80240328 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/func_8024032C_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/func_8024032C_C314E0.s deleted file mode 100644 index e7f99b4ff0..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/func_8024032C_C314E0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024032C_C3180C -/* C3180C 8024032C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C31810 80240330 AFB10034 */ sw $s1, 0x34($sp) -/* C31814 80240334 0080882D */ daddu $s1, $a0, $zero -/* C31818 80240338 AFBF0038 */ sw $ra, 0x38($sp) -/* C3181C 8024033C AFB00030 */ sw $s0, 0x30($sp) -/* C31820 80240340 8E300148 */ lw $s0, 0x148($s1) -/* C31824 80240344 0C00EABB */ jal get_npc_unsafe -/* C31828 80240348 86040008 */ lh $a0, 8($s0) -/* C3182C 8024034C 0040282D */ daddu $a1, $v0, $zero -/* C31830 80240350 94A2008E */ lhu $v0, 0x8e($a1) -/* C31834 80240354 2442FFFF */ addiu $v0, $v0, -1 -/* C31838 80240358 A4A2008E */ sh $v0, 0x8e($a1) -/* C3183C 8024035C 00021400 */ sll $v0, $v0, 0x10 -/* C31840 80240360 1C400023 */ bgtz $v0, .L802403F0 -/* C31844 80240364 24020004 */ addiu $v0, $zero, 4 -/* C31848 80240368 8E0300CC */ lw $v1, 0xcc($s0) -/* C3184C 8024036C AE02006C */ sw $v0, 0x6c($s0) -/* C31850 80240370 8C620000 */ lw $v0, ($v1) -/* C31854 80240374 ACA20028 */ sw $v0, 0x28($a1) -/* C31858 80240378 9602007A */ lhu $v0, 0x7a($s0) -/* C3185C 8024037C A4A2008E */ sh $v0, 0x8e($a1) -/* C31860 80240380 8E020078 */ lw $v0, 0x78($s0) -/* C31864 80240384 28420008 */ slti $v0, $v0, 8 -/* C31868 80240388 14400018 */ bnez $v0, .L802403EC -/* C3186C 8024038C 24020021 */ addiu $v0, $zero, 0x21 -/* C31870 80240390 24040003 */ addiu $a0, $zero, 3 -/* C31874 80240394 27A30028 */ addiu $v1, $sp, 0x28 -/* C31878 80240398 84A700A8 */ lh $a3, 0xa8($a1) -/* C3187C 8024039C 3C013F80 */ lui $at, 0x3f80 -/* C31880 802403A0 44810000 */ mtc1 $at, $f0 -/* C31884 802403A4 3C014000 */ lui $at, 0x4000 -/* C31888 802403A8 44811000 */ mtc1 $at, $f2 -/* C3188C 802403AC 3C01C1A0 */ lui $at, 0xc1a0 -/* C31890 802403B0 44812000 */ mtc1 $at, $f4 -/* C31894 802403B4 44873000 */ mtc1 $a3, $f6 -/* C31898 802403B8 00000000 */ nop -/* C3189C 802403BC 468031A0 */ cvt.s.w $f6, $f6 -/* C318A0 802403C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C318A4 802403C4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C318A8 802403C8 E7A40018 */ swc1 $f4, 0x18($sp) -/* C318AC 802403CC 8E020078 */ lw $v0, 0x78($s0) -/* C318B0 802403D0 44073000 */ mfc1 $a3, $f6 -/* C318B4 802403D4 0000302D */ daddu $a2, $zero, $zero -/* C318B8 802403D8 AFA30020 */ sw $v1, 0x20($sp) -/* C318BC 802403DC 2442FFFF */ addiu $v0, $v0, -1 -/* C318C0 802403E0 0C01BFA4 */ jal fx_emote -/* C318C4 802403E4 AFA2001C */ sw $v0, 0x1c($sp) -/* C318C8 802403E8 24020021 */ addiu $v0, $zero, 0x21 -.L802403EC: -/* C318CC 802403EC AE220070 */ sw $v0, 0x70($s1) -.L802403F0: -/* C318D0 802403F0 8FBF0038 */ lw $ra, 0x38($sp) -/* C318D4 802403F4 8FB10034 */ lw $s1, 0x34($sp) -/* C318D8 802403F8 8FB00030 */ lw $s0, 0x30($sp) -/* C318DC 802403FC 03E00008 */ jr $ra -/* C318E0 80240400 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/func_80240404_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/func_80240404_C314E0.s deleted file mode 100644 index e8d0309eeb..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/func_80240404_C314E0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_C318E4 -/* C318E4 80240404 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C318E8 80240408 AFB10014 */ sw $s1, 0x14($sp) -/* C318EC 8024040C 0080882D */ daddu $s1, $a0, $zero -/* C318F0 80240410 AFBF0018 */ sw $ra, 0x18($sp) -/* C318F4 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* C318F8 80240418 8E300148 */ lw $s0, 0x148($s1) -/* C318FC 8024041C 0C00EABB */ jal get_npc_unsafe -/* C31900 80240420 86040008 */ lh $a0, 8($s0) -/* C31904 80240424 9443008E */ lhu $v1, 0x8e($v0) -/* C31908 80240428 2463FFFF */ addiu $v1, $v1, -1 -/* C3190C 8024042C A443008E */ sh $v1, 0x8e($v0) -/* C31910 80240430 00031C00 */ sll $v1, $v1, 0x10 -/* C31914 80240434 1C600003 */ bgtz $v1, .L80240444 -/* C31918 80240438 2402000C */ addiu $v0, $zero, 0xc -/* C3191C 8024043C AE00006C */ sw $zero, 0x6c($s0) -/* C31920 80240440 AE220070 */ sw $v0, 0x70($s1) -.L80240444: -/* C31924 80240444 8FBF0018 */ lw $ra, 0x18($sp) -/* C31928 80240448 8FB10014 */ lw $s1, 0x14($sp) -/* C3192C 8024044C 8FB00010 */ lw $s0, 0x10($sp) -/* C31930 80240450 03E00008 */ jr $ra -/* C31934 80240454 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/func_8024060C_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/func_8024060C_C314E0.s deleted file mode 100644 index aaacbf029a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/func_8024060C_C314E0.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024060C_C31AEC -/* C31AEC 8024060C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C31AF0 80240610 AFB40028 */ sw $s4, 0x28($sp) -/* C31AF4 80240614 0080A02D */ daddu $s4, $a0, $zero -/* C31AF8 80240618 AFBF002C */ sw $ra, 0x2c($sp) -/* C31AFC 8024061C AFB30024 */ sw $s3, 0x24($sp) -/* C31B00 80240620 AFB20020 */ sw $s2, 0x20($sp) -/* C31B04 80240624 AFB1001C */ sw $s1, 0x1c($sp) -/* C31B08 80240628 AFB00018 */ sw $s0, 0x18($sp) -/* C31B0C 8024062C 8E910148 */ lw $s1, 0x148($s4) -/* C31B10 80240630 86240008 */ lh $a0, 8($s1) -/* C31B14 80240634 0C00EABB */ jal get_npc_unsafe -/* C31B18 80240638 00A0802D */ daddu $s0, $a1, $zero -/* C31B1C 8024063C 16000005 */ bnez $s0, .L80240654 -/* C31B20 80240640 0040902D */ daddu $s2, $v0, $zero -/* C31B24 80240644 8E2200B0 */ lw $v0, 0xb0($s1) -/* C31B28 80240648 30420004 */ andi $v0, $v0, 4 -/* C31B2C 8024064C 10400015 */ beqz $v0, .L802406A4 -/* C31B30 80240650 00000000 */ nop -.L80240654: -/* C31B34 80240654 AE800070 */ sw $zero, 0x70($s4) -/* C31B38 80240658 8E420000 */ lw $v0, ($s2) -/* C31B3C 8024065C 3C031F30 */ lui $v1, 0x1f30 -/* C31B40 80240660 A640008E */ sh $zero, 0x8e($s2) -/* C31B44 80240664 34420102 */ ori $v0, $v0, 0x102 -/* C31B48 80240668 AE420000 */ sw $v0, ($s2) -/* C31B4C 8024066C 8E220000 */ lw $v0, ($s1) -/* C31B50 80240670 3C01C47A */ lui $at, 0xc47a -/* C31B54 80240674 44810000 */ mtc1 $at, $f0 -/* C31B58 80240678 00431025 */ or $v0, $v0, $v1 -/* C31B5C 8024067C AE220000 */ sw $v0, ($s1) -/* C31B60 80240680 AE400038 */ sw $zero, 0x38($s2) -/* C31B64 80240684 E640003C */ swc1 $f0, 0x3c($s2) -/* C31B68 80240688 AE400040 */ sw $zero, 0x40($s2) -/* C31B6C 8024068C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C31B70 80240690 30620004 */ andi $v0, $v1, 4 -/* C31B74 80240694 10400003 */ beqz $v0, .L802406A4 -/* C31B78 80240698 2402FFFB */ addiu $v0, $zero, -5 -/* C31B7C 8024069C 00621024 */ and $v0, $v1, $v0 -/* C31B80 802406A0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802406A4: -/* C31B84 802406A4 8E930070 */ lw $s3, 0x70($s4) -/* C31B88 802406A8 12600005 */ beqz $s3, .L802406C0 -/* C31B8C 802406AC 24020001 */ addiu $v0, $zero, 1 -/* C31B90 802406B0 12620048 */ beq $s3, $v0, .L802407D4 -/* C31B94 802406B4 00000000 */ nop -/* C31B98 802406B8 08090212 */ j .L80240848 -/* C31B9C 802406BC 00000000 */ nop -.L802406C0: -/* C31BA0 802406C0 86240008 */ lh $a0, 8($s1) -/* C31BA4 802406C4 0C00FB3A */ jal get_enemy -/* C31BA8 802406C8 2484FFFF */ addiu $a0, $a0, -1 -/* C31BAC 802406CC 0040802D */ daddu $s0, $v0, $zero -/* C31BB0 802406D0 0C00EABB */ jal get_npc_unsafe -/* C31BB4 802406D4 86040008 */ lh $a0, 8($s0) -/* C31BB8 802406D8 24030001 */ addiu $v1, $zero, 1 -/* C31BBC 802406DC 0040982D */ daddu $s3, $v0, $zero -/* C31BC0 802406E0 A2230007 */ sb $v1, 7($s1) -/* C31BC4 802406E4 8E03006C */ lw $v1, 0x6c($s0) -/* C31BC8 802406E8 24020003 */ addiu $v0, $zero, 3 -/* C31BCC 802406EC 14620056 */ bne $v1, $v0, .L80240848 -/* C31BD0 802406F0 00000000 */ nop -/* C31BD4 802406F4 8E2500A8 */ lw $a1, 0xa8($s1) -/* C31BD8 802406F8 10A00003 */ beqz $a1, .L80240708 -/* C31BDC 802406FC 0260202D */ daddu $a0, $s3, $zero -/* C31BE0 80240700 0C012530 */ jal func_800494C0 -/* C31BE4 80240704 0000302D */ daddu $a2, $zero, $zero -.L80240708: -/* C31BE8 80240708 27A40010 */ addiu $a0, $sp, 0x10 -/* C31BEC 8024070C C6280070 */ lwc1 $f8, 0x70($s1) -/* C31BF0 80240710 46804220 */ cvt.s.w $f8, $f8 -/* C31BF4 80240714 C6620034 */ lwc1 $f2, 0x34($s3) -/* C31BF8 80240718 3C014387 */ lui $at, 0x4387 -/* C31BFC 8024071C 44810000 */ mtc1 $at, $f0 -/* C31C00 80240720 44064000 */ mfc1 $a2, $f8 -/* C31C04 80240724 46020001 */ sub.s $f0, $f0, $f2 -/* C31C08 80240728 C6660038 */ lwc1 $f6, 0x38($s3) -/* C31C0C 8024072C C6640040 */ lwc1 $f4, 0x40($s3) -/* C31C10 80240730 44070000 */ mfc1 $a3, $f0 -/* C31C14 80240734 27A50014 */ addiu $a1, $sp, 0x14 -/* C31C18 80240738 E7A60010 */ swc1 $f6, 0x10($sp) -/* C31C1C 8024073C 0C00A7E7 */ jal add_vec2D_polar -/* C31C20 80240740 E7A40014 */ swc1 $f4, 0x14($sp) -/* C31C24 80240744 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C31C28 80240748 4600020D */ trunc.w.s $f8, $f0 -/* C31C2C 8024074C 44024000 */ mfc1 $v0, $f8 -/* C31C30 80240750 E6400038 */ swc1 $f0, 0x38($s2) -/* C31C34 80240754 A6220010 */ sh $v0, 0x10($s1) -/* C31C38 80240758 C660003C */ lwc1 $f0, 0x3c($s3) -/* C31C3C 8024075C C622006C */ lwc1 $f2, 0x6c($s1) -/* C31C40 80240760 468010A0 */ cvt.s.w $f2, $f2 -/* C31C44 80240764 46020000 */ add.s $f0, $f0, $f2 -/* C31C48 80240768 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C31C4C 8024076C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C31C50 80240770 E640003C */ swc1 $f0, 0x3c($s2) -/* C31C54 80240774 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C31C58 80240778 4600020D */ trunc.w.s $f8, $f0 -/* C31C5C 8024077C 44024000 */ mfc1 $v0, $f8 -/* C31C60 80240780 00000000 */ nop -/* C31C64 80240784 A6220012 */ sh $v0, 0x12($s1) -/* C31C68 80240788 4600120D */ trunc.w.s $f8, $f2 -/* C31C6C 8024078C 44024000 */ mfc1 $v0, $f8 -/* C31C70 80240790 E6420040 */ swc1 $f2, 0x40($s2) -/* C31C74 80240794 A6220014 */ sh $v0, 0x14($s1) -/* C31C78 80240798 8C660028 */ lw $a2, 0x28($v1) -/* C31C7C 8024079C 8C670030 */ lw $a3, 0x30($v1) -/* C31C80 802407A0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C31C84 802407A4 0C00A720 */ jal atan2 -/* C31C88 802407A8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C31C8C 802407AC 3C03E0EF */ lui $v1, 0xe0ef -/* C31C90 802407B0 E640000C */ swc1 $f0, 0xc($s2) -/* C31C94 802407B4 8E220000 */ lw $v0, ($s1) -/* C31C98 802407B8 3463FFFF */ ori $v1, $v1, 0xffff -/* C31C9C 802407BC 00431024 */ and $v0, $v0, $v1 -/* C31CA0 802407C0 AE220000 */ sw $v0, ($s1) -/* C31CA4 802407C4 24020001 */ addiu $v0, $zero, 1 -/* C31CA8 802407C8 A640008E */ sh $zero, 0x8e($s2) -/* C31CAC 802407CC 08090212 */ j .L80240848 -/* C31CB0 802407D0 AE820070 */ sw $v0, 0x70($s4) -.L802407D4: -/* C31CB4 802407D4 86240008 */ lh $a0, 8($s1) -/* C31CB8 802407D8 0C00FB3A */ jal get_enemy -/* C31CBC 802407DC 2484FFFF */ addiu $a0, $a0, -1 -/* C31CC0 802407E0 0040802D */ daddu $s0, $v0, $zero -/* C31CC4 802407E4 0C00EABB */ jal get_npc_unsafe -/* C31CC8 802407E8 86040008 */ lh $a0, 8($s0) -/* C31CCC 802407EC 9642008E */ lhu $v0, 0x8e($s2) -/* C31CD0 802407F0 24420001 */ addiu $v0, $v0, 1 -/* C31CD4 802407F4 A642008E */ sh $v0, 0x8e($s2) -/* C31CD8 802407F8 00021400 */ sll $v0, $v0, 0x10 -/* C31CDC 802407FC 8E23007C */ lw $v1, 0x7c($s1) -/* C31CE0 80240800 00021403 */ sra $v0, $v0, 0x10 -/* C31CE4 80240804 0043102A */ slt $v0, $v0, $v1 -/* C31CE8 80240808 50400001 */ beql $v0, $zero, .L80240810 -/* C31CEC 8024080C A2200007 */ sb $zero, 7($s1) -.L80240810: -/* C31CF0 80240810 8E03006C */ lw $v1, 0x6c($s0) -/* C31CF4 80240814 24020004 */ addiu $v0, $zero, 4 -/* C31CF8 80240818 1462000B */ bne $v1, $v0, .L80240848 -/* C31CFC 8024081C 3C021F10 */ lui $v0, 0x1f10 -/* C31D00 80240820 8E230000 */ lw $v1, ($s1) -/* C31D04 80240824 3C01C47A */ lui $at, 0xc47a -/* C31D08 80240828 44810000 */ mtc1 $at, $f0 -/* C31D0C 8024082C 00621825 */ or $v1, $v1, $v0 -/* C31D10 80240830 AE230000 */ sw $v1, ($s1) -/* C31D14 80240834 AE400038 */ sw $zero, 0x38($s2) -/* C31D18 80240838 E640003C */ swc1 $f0, 0x3c($s2) -/* C31D1C 8024083C AE400040 */ sw $zero, 0x40($s2) -/* C31D20 80240840 A2330007 */ sb $s3, 7($s1) -/* C31D24 80240844 AE800070 */ sw $zero, 0x70($s4) -.L80240848: -/* C31D28 80240848 8FBF002C */ lw $ra, 0x2c($sp) -/* C31D2C 8024084C 8FB40028 */ lw $s4, 0x28($sp) -/* C31D30 80240850 8FB30024 */ lw $s3, 0x24($sp) -/* C31D34 80240854 8FB20020 */ lw $s2, 0x20($sp) -/* C31D38 80240858 8FB1001C */ lw $s1, 0x1c($sp) -/* C31D3C 8024085C 8FB00018 */ lw $s0, 0x18($sp) -/* C31D40 80240860 0000102D */ daddu $v0, $zero, $zero -/* C31D44 80240864 03E00008 */ jr $ra -/* C31D48 80240868 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/func_8024086C_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/func_8024086C_C314E0.s deleted file mode 100644 index 3274630c19..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/func_8024086C_C314E0.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024086C_C31D4C -/* C31D4C 8024086C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C31D50 80240870 AFB20038 */ sw $s2, 0x38($sp) -/* C31D54 80240874 0080902D */ daddu $s2, $a0, $zero -/* C31D58 80240878 AFBF0048 */ sw $ra, 0x48($sp) -/* C31D5C 8024087C AFB50044 */ sw $s5, 0x44($sp) -/* C31D60 80240880 AFB40040 */ sw $s4, 0x40($sp) -/* C31D64 80240884 AFB3003C */ sw $s3, 0x3c($sp) -/* C31D68 80240888 AFB10034 */ sw $s1, 0x34($sp) -/* C31D6C 8024088C AFB00030 */ sw $s0, 0x30($sp) -/* C31D70 80240890 8E510148 */ lw $s1, 0x148($s2) -/* C31D74 80240894 86240008 */ lh $a0, 8($s1) -/* C31D78 80240898 0C00EABB */ jal get_npc_unsafe -/* C31D7C 8024089C 00A0802D */ daddu $s0, $a1, $zero -/* C31D80 802408A0 8E43000C */ lw $v1, 0xc($s2) -/* C31D84 802408A4 0240202D */ daddu $a0, $s2, $zero -/* C31D88 802408A8 8C650000 */ lw $a1, ($v1) -/* C31D8C 802408AC 0C0B1EAF */ jal get_variable -/* C31D90 802408B0 0040A82D */ daddu $s5, $v0, $zero -/* C31D94 802408B4 AFA00010 */ sw $zero, 0x10($sp) -/* C31D98 802408B8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C31D9C 802408BC 8C630030 */ lw $v1, 0x30($v1) -/* C31DA0 802408C0 AFA30014 */ sw $v1, 0x14($sp) -/* C31DA4 802408C4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C31DA8 802408C8 8C63001C */ lw $v1, 0x1c($v1) -/* C31DAC 802408CC AFA30018 */ sw $v1, 0x18($sp) -/* C31DB0 802408D0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C31DB4 802408D4 8C630024 */ lw $v1, 0x24($v1) -/* C31DB8 802408D8 AFA3001C */ sw $v1, 0x1c($sp) -/* C31DBC 802408DC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C31DC0 802408E0 8C630028 */ lw $v1, 0x28($v1) -/* C31DC4 802408E4 27B40010 */ addiu $s4, $sp, 0x10 -/* C31DC8 802408E8 AFA30020 */ sw $v1, 0x20($sp) -/* C31DCC 802408EC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C31DD0 802408F0 3C014282 */ lui $at, 0x4282 -/* C31DD4 802408F4 44810000 */ mtc1 $at, $f0 -/* C31DD8 802408F8 8C63002C */ lw $v1, 0x2c($v1) -/* C31DDC 802408FC 0040982D */ daddu $s3, $v0, $zero -/* C31DE0 80240900 E7A00028 */ swc1 $f0, 0x28($sp) -/* C31DE4 80240904 A7A0002C */ sh $zero, 0x2c($sp) -/* C31DE8 80240908 16000005 */ bnez $s0, .L80240920 -/* C31DEC 8024090C AFA30024 */ sw $v1, 0x24($sp) -/* C31DF0 80240910 8E2200B0 */ lw $v0, 0xb0($s1) -/* C31DF4 80240914 30420004 */ andi $v0, $v0, 4 -/* C31DF8 80240918 10400020 */ beqz $v0, .L8024099C -/* C31DFC 8024091C 00000000 */ nop -.L80240920: -/* C31E00 80240920 2404F7FF */ addiu $a0, $zero, -0x801 -/* C31E04 80240924 AE400070 */ sw $zero, 0x70($s2) -/* C31E08 80240928 A6A0008E */ sh $zero, 0x8e($s5) -/* C31E0C 8024092C 8E2200CC */ lw $v0, 0xcc($s1) -/* C31E10 80240930 8EA30000 */ lw $v1, ($s5) -/* C31E14 80240934 8C420000 */ lw $v0, ($v0) -/* C31E18 80240938 00641824 */ and $v1, $v1, $a0 -/* C31E1C 8024093C AEA30000 */ sw $v1, ($s5) -/* C31E20 80240940 AEA20028 */ sw $v0, 0x28($s5) -/* C31E24 80240944 8E2200D0 */ lw $v0, 0xd0($s1) -/* C31E28 80240948 8C420034 */ lw $v0, 0x34($v0) -/* C31E2C 8024094C 54400005 */ bnel $v0, $zero, .L80240964 -/* C31E30 80240950 2402FDFF */ addiu $v0, $zero, -0x201 -/* C31E34 80240954 34620200 */ ori $v0, $v1, 0x200 -/* C31E38 80240958 2403FFF7 */ addiu $v1, $zero, -9 -/* C31E3C 8024095C 0809025B */ j .L8024096C -/* C31E40 80240960 00431024 */ and $v0, $v0, $v1 -.L80240964: -/* C31E44 80240964 00621024 */ and $v0, $v1, $v0 -/* C31E48 80240968 34420008 */ ori $v0, $v0, 8 -.L8024096C: -/* C31E4C 8024096C AEA20000 */ sw $v0, ($s5) -/* C31E50 80240970 8E2200B0 */ lw $v0, 0xb0($s1) -/* C31E54 80240974 30420004 */ andi $v0, $v0, 4 -/* C31E58 80240978 10400007 */ beqz $v0, .L80240998 -/* C31E5C 8024097C 24020063 */ addiu $v0, $zero, 0x63 -/* C31E60 80240980 AE420070 */ sw $v0, 0x70($s2) -/* C31E64 80240984 AE400074 */ sw $zero, 0x74($s2) -/* C31E68 80240988 8E2200B0 */ lw $v0, 0xb0($s1) -/* C31E6C 8024098C 2403FFFB */ addiu $v1, $zero, -5 -/* C31E70 80240990 00431024 */ and $v0, $v0, $v1 -/* C31E74 80240994 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240998: -/* C31E78 80240998 AE20006C */ sw $zero, 0x6c($s1) -.L8024099C: -/* C31E7C 8024099C 8E420070 */ lw $v0, 0x70($s2) -/* C31E80 802409A0 2842001E */ slti $v0, $v0, 0x1e -/* C31E84 802409A4 10400009 */ beqz $v0, .L802409CC -/* C31E88 802409A8 00000000 */ nop -/* C31E8C 802409AC 8E22006C */ lw $v0, 0x6c($s1) -/* C31E90 802409B0 14400006 */ bnez $v0, .L802409CC -/* C31E94 802409B4 00000000 */ nop -/* C31E98 802409B8 0C090116 */ jal func_80240458 -/* C31E9C 802409BC 0240202D */ daddu $a0, $s2, $zero -/* C31EA0 802409C0 10400002 */ beqz $v0, .L802409CC -/* C31EA4 802409C4 2402001E */ addiu $v0, $zero, 0x1e -/* C31EA8 802409C8 AE420070 */ sw $v0, 0x70($s2) -.L802409CC: -/* C31EAC 802409CC 8E430070 */ lw $v1, 0x70($s2) -/* C31EB0 802409D0 2C620064 */ sltiu $v0, $v1, 0x64 -/* C31EB4 802409D4 10400048 */ beqz $v0, .L80240AF8 -/* C31EB8 802409D8 00031080 */ sll $v0, $v1, 2 -/* C31EBC 802409DC 3C018024 */ lui $at, 0x8024 -/* C31EC0 802409E0 00220821 */ addu $at, $at, $v0 -/* C31EC4 802409E4 8C2249F8 */ lw $v0, 0x49f8($at) -/* C31EC8 802409E8 00400008 */ jr $v0 -/* C31ECC 802409EC 00000000 */ nop -/* C31ED0 802409F0 0240202D */ daddu $a0, $s2, $zero -/* C31ED4 802409F4 0260282D */ daddu $a1, $s3, $zero -/* C31ED8 802409F8 0C012568 */ jal func_800495A0 -/* C31EDC 802409FC 0280302D */ daddu $a2, $s4, $zero -/* C31EE0 80240A00 0240202D */ daddu $a0, $s2, $zero -/* C31EE4 80240A04 0260282D */ daddu $a1, $s3, $zero -/* C31EE8 80240A08 0C0125AE */ jal func_800496B8 -/* C31EEC 80240A0C 0280302D */ daddu $a2, $s4, $zero -/* C31EF0 80240A10 080902BE */ j .L80240AF8 -/* C31EF4 80240A14 00000000 */ nop -/* C31EF8 80240A18 0240202D */ daddu $a0, $s2, $zero -/* C31EFC 80240A1C 0260282D */ daddu $a1, $s3, $zero -/* C31F00 80240A20 0C0126D1 */ jal func_80049B44 -/* C31F04 80240A24 0280302D */ daddu $a2, $s4, $zero -/* C31F08 80240A28 0240202D */ daddu $a0, $s2, $zero -/* C31F0C 80240A2C 0260282D */ daddu $a1, $s3, $zero -/* C31F10 80240A30 0C012701 */ jal func_80049C04 -/* C31F14 80240A34 0280302D */ daddu $a2, $s4, $zero -/* C31F18 80240A38 080902BE */ j .L80240AF8 -/* C31F1C 80240A3C 00000000 */ nop -/* C31F20 80240A40 0240202D */ daddu $a0, $s2, $zero -/* C31F24 80240A44 0260282D */ daddu $a1, $s3, $zero -/* C31F28 80240A48 0C01278F */ jal func_80049E3C -/* C31F2C 80240A4C 0280302D */ daddu $a2, $s4, $zero -/* C31F30 80240A50 0240202D */ daddu $a0, $s2, $zero -/* C31F34 80240A54 0260282D */ daddu $a1, $s3, $zero -/* C31F38 80240A58 0C0127B3 */ jal func_80049ECC -/* C31F3C 80240A5C 0280302D */ daddu $a2, $s4, $zero -/* C31F40 80240A60 080902BE */ j .L80240AF8 -/* C31F44 80240A64 00000000 */ nop -/* C31F48 80240A68 0240202D */ daddu $a0, $s2, $zero -/* C31F4C 80240A6C 0260282D */ daddu $a1, $s3, $zero -/* C31F50 80240A70 0C0127DF */ jal func_80049F7C -/* C31F54 80240A74 0280302D */ daddu $a2, $s4, $zero -/* C31F58 80240A78 0240202D */ daddu $a0, $s2, $zero -/* C31F5C 80240A7C 0260282D */ daddu $a1, $s3, $zero -/* C31F60 80240A80 0C012849 */ jal func_8004A124 -/* C31F64 80240A84 0280302D */ daddu $a2, $s4, $zero -/* C31F68 80240A88 080902BE */ j .L80240AF8 -/* C31F6C 80240A8C 00000000 */ nop -/* C31F70 80240A90 0240202D */ daddu $a0, $s2, $zero -/* C31F74 80240A94 0260282D */ daddu $a1, $s3, $zero -/* C31F78 80240A98 0C0128FA */ jal func_8004A3E8 -/* C31F7C 80240A9C 0280302D */ daddu $a2, $s4, $zero -/* C31F80 80240AA0 080902BE */ j .L80240AF8 -/* C31F84 80240AA4 00000000 */ nop -/* C31F88 80240AA8 0C090094 */ jal func_80240250 -/* C31F8C 80240AAC 0240202D */ daddu $a0, $s2, $zero -/* C31F90 80240AB0 0C0900AF */ jal func_802402BC -/* C31F94 80240AB4 0240202D */ daddu $a0, $s2, $zero -/* C31F98 80240AB8 8E430070 */ lw $v1, 0x70($s2) -/* C31F9C 80240ABC 24020020 */ addiu $v0, $zero, 0x20 -/* C31FA0 80240AC0 1462000D */ bne $v1, $v0, .L80240AF8 -/* C31FA4 80240AC4 00000000 */ nop -/* C31FA8 80240AC8 0C0900CB */ jal func_8024032C -/* C31FAC 80240ACC 0240202D */ daddu $a0, $s2, $zero -/* C31FB0 80240AD0 8E430070 */ lw $v1, 0x70($s2) -/* C31FB4 80240AD4 24020021 */ addiu $v0, $zero, 0x21 -/* C31FB8 80240AD8 14620007 */ bne $v1, $v0, .L80240AF8 -/* C31FBC 80240ADC 00000000 */ nop -/* C31FC0 80240AE0 0C090101 */ jal func_80240404 -/* C31FC4 80240AE4 0240202D */ daddu $a0, $s2, $zero -/* C31FC8 80240AE8 080902BE */ j .L80240AF8 -/* C31FCC 80240AEC 00000000 */ nop -/* C31FD0 80240AF0 0C0129CF */ jal func_8004A73C -/* C31FD4 80240AF4 0240202D */ daddu $a0, $s2, $zero -.L80240AF8: -/* C31FD8 80240AF8 8FBF0048 */ lw $ra, 0x48($sp) -/* C31FDC 80240AFC 8FB50044 */ lw $s5, 0x44($sp) -/* C31FE0 80240B00 8FB40040 */ lw $s4, 0x40($sp) -/* C31FE4 80240B04 8FB3003C */ lw $s3, 0x3c($sp) -/* C31FE8 80240B08 8FB20038 */ lw $s2, 0x38($sp) -/* C31FEC 80240B0C 8FB10034 */ lw $s1, 0x34($sp) -/* C31FF0 80240B10 8FB00030 */ lw $s0, 0x30($sp) -/* C31FF4 80240B14 0000102D */ daddu $v0, $zero, $zero -/* C31FF8 80240B18 03E00008 */ jr $ra -/* C31FFC 80240B1C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/func_80240B20_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/func_80240B20_C314E0.s deleted file mode 100644 index 4758622568..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/func_80240B20_C314E0.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B20_C32000 -/* C32000 80240B20 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C32004 80240B24 AFB50024 */ sw $s5, 0x24($sp) -/* C32008 80240B28 0080A82D */ daddu $s5, $a0, $zero -/* C3200C 80240B2C AFBF002C */ sw $ra, 0x2c($sp) -/* C32010 80240B30 AFB60028 */ sw $s6, 0x28($sp) -/* C32014 80240B34 AFB40020 */ sw $s4, 0x20($sp) -/* C32018 80240B38 AFB3001C */ sw $s3, 0x1c($sp) -/* C3201C 80240B3C AFB20018 */ sw $s2, 0x18($sp) -/* C32020 80240B40 AFB10014 */ sw $s1, 0x14($sp) -/* C32024 80240B44 AFB00010 */ sw $s0, 0x10($sp) -/* C32028 80240B48 F7B80040 */ sdc1 $f24, 0x40($sp) -/* C3202C 80240B4C F7B60038 */ sdc1 $f22, 0x38($sp) -/* C32030 80240B50 F7B40030 */ sdc1 $f20, 0x30($sp) -/* C32034 80240B54 8EB30148 */ lw $s3, 0x148($s5) -/* C32038 80240B58 86640008 */ lh $a0, 8($s3) -/* C3203C 80240B5C 0C00EABB */ jal get_npc_unsafe -/* C32040 80240B60 00A0B02D */ daddu $s6, $a1, $zero -/* C32044 80240B64 0040A02D */ daddu $s4, $v0, $zero -/* C32048 80240B68 AEA00074 */ sw $zero, 0x74($s5) -/* C3204C 80240B6C C6980038 */ lwc1 $f24, 0x38($s4) -/* C32050 80240B70 C6960040 */ lwc1 $f22, 0x40($s4) -/* C32054 80240B74 0000902D */ daddu $s2, $zero, $zero -/* C32058 80240B78 AEA00078 */ sw $zero, 0x78($s5) -/* C3205C 80240B7C 8E6300D0 */ lw $v1, 0xd0($s3) -/* C32060 80240B80 8C620000 */ lw $v0, ($v1) -/* C32064 80240B84 3C0146FF */ lui $at, 0x46ff -/* C32068 80240B88 3421FE00 */ ori $at, $at, 0xfe00 -/* C3206C 80240B8C 4481A000 */ mtc1 $at, $f20 -/* C32070 80240B90 18400018 */ blez $v0, .L80240BF4 -/* C32074 80240B94 0240802D */ daddu $s0, $s2, $zero -/* C32078 80240B98 0240882D */ daddu $s1, $s2, $zero -.L80240B9C: -/* C3207C 80240B9C 02231021 */ addu $v0, $s1, $v1 -/* C32080 80240BA0 4600C306 */ mov.s $f12, $f24 -/* C32084 80240BA4 C4440004 */ lwc1 $f4, 4($v0) -/* C32088 80240BA8 46802120 */ cvt.s.w $f4, $f4 -/* C3208C 80240BAC 44062000 */ mfc1 $a2, $f4 -/* C32090 80240BB0 C444000C */ lwc1 $f4, 0xc($v0) -/* C32094 80240BB4 46802120 */ cvt.s.w $f4, $f4 -/* C32098 80240BB8 44072000 */ mfc1 $a3, $f4 -/* C3209C 80240BBC 0C00A7B5 */ jal dist2D -/* C320A0 80240BC0 4600B386 */ mov.s $f14, $f22 -/* C320A4 80240BC4 4614003C */ c.lt.s $f0, $f20 -/* C320A8 80240BC8 00000000 */ nop -/* C320AC 80240BCC 45000003 */ bc1f .L80240BDC -/* C320B0 80240BD0 2631000C */ addiu $s1, $s1, 0xc -/* C320B4 80240BD4 46000506 */ mov.s $f20, $f0 -/* C320B8 80240BD8 AEB20078 */ sw $s2, 0x78($s5) -.L80240BDC: -/* C320BC 80240BDC 8E6300D0 */ lw $v1, 0xd0($s3) -/* C320C0 80240BE0 26100001 */ addiu $s0, $s0, 1 -/* C320C4 80240BE4 8C620000 */ lw $v0, ($v1) -/* C320C8 80240BE8 0202102A */ slt $v0, $s0, $v0 -/* C320CC 80240BEC 1440FFEB */ bnez $v0, .L80240B9C -/* C320D0 80240BF0 26520001 */ addiu $s2, $s2, 1 -.L80240BF4: -/* C320D4 80240BF4 8E6200CC */ lw $v0, 0xcc($s3) -/* C320D8 80240BF8 8C420004 */ lw $v0, 4($v0) -/* C320DC 80240BFC AE820028 */ sw $v0, 0x28($s4) -/* C320E0 80240C00 8E6200D0 */ lw $v0, 0xd0($s3) -/* C320E4 80240C04 8C42007C */ lw $v0, 0x7c($v0) -/* C320E8 80240C08 04410004 */ bgez $v0, .L80240C1C -/* C320EC 80240C0C 00000000 */ nop -/* C320F0 80240C10 C6C00000 */ lwc1 $f0, ($s6) -/* C320F4 80240C14 0809030F */ j .L80240C3C -/* C320F8 80240C18 E6800018 */ swc1 $f0, 0x18($s4) -.L80240C1C: -/* C320FC 80240C1C 3C018024 */ lui $at, 0x8024 -/* C32100 80240C20 D4224B88 */ ldc1 $f2, 0x4b88($at) -/* C32104 80240C24 44820000 */ mtc1 $v0, $f0 -/* C32108 80240C28 00000000 */ nop -/* C3210C 80240C2C 46800021 */ cvt.d.w $f0, $f0 -/* C32110 80240C30 46220003 */ div.d $f0, $f0, $f2 -/* C32114 80240C34 46200020 */ cvt.s.d $f0, $f0 -/* C32118 80240C38 E6800018 */ swc1 $f0, 0x18($s4) -.L80240C3C: -/* C3211C 80240C3C 24020001 */ addiu $v0, $zero, 1 -/* C32120 80240C40 AEA20070 */ sw $v0, 0x70($s5) -/* C32124 80240C44 8FBF002C */ lw $ra, 0x2c($sp) -/* C32128 80240C48 8FB60028 */ lw $s6, 0x28($sp) -/* C3212C 80240C4C 8FB50024 */ lw $s5, 0x24($sp) -/* C32130 80240C50 8FB40020 */ lw $s4, 0x20($sp) -/* C32134 80240C54 8FB3001C */ lw $s3, 0x1c($sp) -/* C32138 80240C58 8FB20018 */ lw $s2, 0x18($sp) -/* C3213C 80240C5C 8FB10014 */ lw $s1, 0x14($sp) -/* C32140 80240C60 8FB00010 */ lw $s0, 0x10($sp) -/* C32144 80240C64 D7B80040 */ ldc1 $f24, 0x40($sp) -/* C32148 80240C68 D7B60038 */ ldc1 $f22, 0x38($sp) -/* C3214C 80240C6C D7B40030 */ ldc1 $f20, 0x30($sp) -/* C32150 80240C70 03E00008 */ jr $ra -/* C32154 80240C74 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/func_80240C78_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/func_80240C78_C314E0.s deleted file mode 100644 index df8888468c..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/func_80240C78_C314E0.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C78_C32158 -/* C32158 80240C78 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C3215C 80240C7C AFB20038 */ sw $s2, 0x38($sp) -/* C32160 80240C80 0080902D */ daddu $s2, $a0, $zero -/* C32164 80240C84 AFBF0044 */ sw $ra, 0x44($sp) -/* C32168 80240C88 AFB40040 */ sw $s4, 0x40($sp) -/* C3216C 80240C8C AFB3003C */ sw $s3, 0x3c($sp) -/* C32170 80240C90 AFB10034 */ sw $s1, 0x34($sp) -/* C32174 80240C94 AFB00030 */ sw $s0, 0x30($sp) -/* C32178 80240C98 F7B60050 */ sdc1 $f22, 0x50($sp) -/* C3217C 80240C9C F7B40048 */ sdc1 $f20, 0x48($sp) -/* C32180 80240CA0 8E510148 */ lw $s1, 0x148($s2) -/* C32184 80240CA4 00A0982D */ daddu $s3, $a1, $zero -/* C32188 80240CA8 86240008 */ lh $a0, 8($s1) -/* C3218C 80240CAC 0C00EABB */ jal get_npc_unsafe -/* C32190 80240CB0 00C0A02D */ daddu $s4, $a2, $zero -/* C32194 80240CB4 8E630014 */ lw $v1, 0x14($s3) -/* C32198 80240CB8 04600030 */ bltz $v1, .L80240D7C -/* C3219C 80240CBC 0040802D */ daddu $s0, $v0, $zero -/* C321A0 80240CC0 8E420074 */ lw $v0, 0x74($s2) -/* C321A4 80240CC4 1C40002C */ bgtz $v0, .L80240D78 -/* C321A8 80240CC8 2442FFFF */ addiu $v0, $v0, -1 -/* C321AC 80240CCC 0280202D */ daddu $a0, $s4, $zero -/* C321B0 80240CD0 AE430074 */ sw $v1, 0x74($s2) -/* C321B4 80240CD4 AFA00010 */ sw $zero, 0x10($sp) -/* C321B8 80240CD8 8E66000C */ lw $a2, 0xc($s3) -/* C321BC 80240CDC 8E670010 */ lw $a3, 0x10($s3) -/* C321C0 80240CE0 0C01242D */ jal func_800490B4 -/* C321C4 80240CE4 0220282D */ daddu $a1, $s1, $zero -/* C321C8 80240CE8 10400021 */ beqz $v0, .L80240D70 -/* C321CC 80240CEC 0000202D */ daddu $a0, $zero, $zero -/* C321D0 80240CF0 0200282D */ daddu $a1, $s0, $zero -/* C321D4 80240CF4 0000302D */ daddu $a2, $zero, $zero -/* C321D8 80240CF8 860300A8 */ lh $v1, 0xa8($s0) -/* C321DC 80240CFC 3C013F80 */ lui $at, 0x3f80 -/* C321E0 80240D00 44810000 */ mtc1 $at, $f0 -/* C321E4 80240D04 3C014000 */ lui $at, 0x4000 -/* C321E8 80240D08 44811000 */ mtc1 $at, $f2 -/* C321EC 80240D0C 3C01C1A0 */ lui $at, 0xc1a0 -/* C321F0 80240D10 44812000 */ mtc1 $at, $f4 -/* C321F4 80240D14 2402000F */ addiu $v0, $zero, 0xf -/* C321F8 80240D18 AFA2001C */ sw $v0, 0x1c($sp) -/* C321FC 80240D1C 44833000 */ mtc1 $v1, $f6 -/* C32200 80240D20 00000000 */ nop -/* C32204 80240D24 468031A0 */ cvt.s.w $f6, $f6 -/* C32208 80240D28 44073000 */ mfc1 $a3, $f6 -/* C3220C 80240D2C 27A20028 */ addiu $v0, $sp, 0x28 -/* C32210 80240D30 AFA20020 */ sw $v0, 0x20($sp) -/* C32214 80240D34 E7A00010 */ swc1 $f0, 0x10($sp) -/* C32218 80240D38 E7A20014 */ swc1 $f2, 0x14($sp) -/* C3221C 80240D3C 0C01BFA4 */ jal fx_emote -/* C32220 80240D40 E7A40018 */ swc1 $f4, 0x18($sp) -/* C32224 80240D44 0200202D */ daddu $a0, $s0, $zero -/* C32228 80240D48 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C3222C 80240D4C 0C012530 */ jal func_800494C0 -/* C32230 80240D50 3C060020 */ lui $a2, 0x20 -/* C32234 80240D54 8E220018 */ lw $v0, 0x18($s1) -/* C32238 80240D58 9442002A */ lhu $v0, 0x2a($v0) -/* C3223C 80240D5C 30420001 */ andi $v0, $v0, 1 -/* C32240 80240D60 14400064 */ bnez $v0, .L80240EF4 -/* C32244 80240D64 2402000A */ addiu $v0, $zero, 0xa -/* C32248 80240D68 080903BD */ j .L80240EF4 -/* C3224C 80240D6C 2402000C */ addiu $v0, $zero, 0xc -.L80240D70: -/* C32250 80240D70 8E420074 */ lw $v0, 0x74($s2) -/* C32254 80240D74 2442FFFF */ addiu $v0, $v0, -1 -.L80240D78: -/* C32258 80240D78 AE420074 */ sw $v0, 0x74($s2) -.L80240D7C: -/* C3225C 80240D7C 8602008C */ lh $v0, 0x8c($s0) -/* C32260 80240D80 1440005D */ bnez $v0, .L80240EF8 -/* C32264 80240D84 00000000 */ nop -/* C32268 80240D88 C6000018 */ lwc1 $f0, 0x18($s0) -/* C3226C 80240D8C 3C014010 */ lui $at, 0x4010 -/* C32270 80240D90 44811800 */ mtc1 $at, $f3 -/* C32274 80240D94 44801000 */ mtc1 $zero, $f2 -/* C32278 80240D98 46000021 */ cvt.d.s $f0, $f0 -/* C3227C 80240D9C 4622003C */ c.lt.d $f0, $f2 -/* C32280 80240DA0 00000000 */ nop -/* C32284 80240DA4 45000003 */ bc1f .L80240DB4 -/* C32288 80240DA8 0200202D */ daddu $a0, $s0, $zero -/* C3228C 80240DAC 0809036E */ j .L80240DB8 -/* C32290 80240DB0 0000282D */ daddu $a1, $zero, $zero -.L80240DB4: -/* C32294 80240DB4 24050001 */ addiu $a1, $zero, 1 -.L80240DB8: -/* C32298 80240DB8 0C00F598 */ jal func_8003D660 -/* C3229C 80240DBC 00000000 */ nop -/* C322A0 80240DC0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C322A4 80240DC4 8E430078 */ lw $v1, 0x78($s2) -/* C322A8 80240DC8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C322AC 80240DCC 00031040 */ sll $v0, $v1, 1 -/* C322B0 80240DD0 00431021 */ addu $v0, $v0, $v1 -/* C322B4 80240DD4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C322B8 80240DD8 00021080 */ sll $v0, $v0, 2 -/* C322BC 80240DDC 00431021 */ addu $v0, $v0, $v1 -/* C322C0 80240DE0 C4560004 */ lwc1 $f22, 4($v0) -/* C322C4 80240DE4 4680B5A0 */ cvt.s.w $f22, $f22 -/* C322C8 80240DE8 C454000C */ lwc1 $f20, 0xc($v0) -/* C322CC 80240DEC 4680A520 */ cvt.s.w $f20, $f20 -/* C322D0 80240DF0 4406B000 */ mfc1 $a2, $f22 -/* C322D4 80240DF4 4407A000 */ mfc1 $a3, $f20 -/* C322D8 80240DF8 0C00A720 */ jal atan2 -/* C322DC 80240DFC 00000000 */ nop -/* C322E0 80240E00 8E050018 */ lw $a1, 0x18($s0) -/* C322E4 80240E04 44060000 */ mfc1 $a2, $f0 -/* C322E8 80240E08 0200202D */ daddu $a0, $s0, $zero -/* C322EC 80240E0C 0C00EA95 */ jal npc_move_heading -/* C322F0 80240E10 AE06000C */ sw $a2, 0xc($s0) -/* C322F4 80240E14 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C322F8 80240E18 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C322FC 80240E1C 4406B000 */ mfc1 $a2, $f22 -/* C32300 80240E20 4407A000 */ mfc1 $a3, $f20 -/* C32304 80240E24 0C00A7B5 */ jal dist2D -/* C32308 80240E28 00000000 */ nop -/* C3230C 80240E2C C6020018 */ lwc1 $f2, 0x18($s0) -/* C32310 80240E30 4602003E */ c.le.s $f0, $f2 -/* C32314 80240E34 00000000 */ nop -/* C32318 80240E38 4500002F */ bc1f .L80240EF8 -/* C3231C 80240E3C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C32320 80240E40 24020002 */ addiu $v0, $zero, 2 -/* C32324 80240E44 0C00A67F */ jal rand_int -/* C32328 80240E48 AE420070 */ sw $v0, 0x70($s2) -/* C3232C 80240E4C 3C035555 */ lui $v1, 0x5555 -/* C32330 80240E50 34635556 */ ori $v1, $v1, 0x5556 -/* C32334 80240E54 00430018 */ mult $v0, $v1 -/* C32338 80240E58 000227C3 */ sra $a0, $v0, 0x1f -/* C3233C 80240E5C 00004010 */ mfhi $t0 -/* C32340 80240E60 01042023 */ subu $a0, $t0, $a0 -/* C32344 80240E64 00041840 */ sll $v1, $a0, 1 -/* C32348 80240E68 00641821 */ addu $v1, $v1, $a0 -/* C3234C 80240E6C 00431023 */ subu $v0, $v0, $v1 -/* C32350 80240E70 24430002 */ addiu $v1, $v0, 2 -/* C32354 80240E74 AE430074 */ sw $v1, 0x74($s2) -/* C32358 80240E78 8E62002C */ lw $v0, 0x2c($s3) -/* C3235C 80240E7C 18400009 */ blez $v0, .L80240EA4 -/* C32360 80240E80 24020004 */ addiu $v0, $zero, 4 -/* C32364 80240E84 8E620004 */ lw $v0, 4($s3) -/* C32368 80240E88 18400006 */ blez $v0, .L80240EA4 -/* C3236C 80240E8C 24020004 */ addiu $v0, $zero, 4 -/* C32370 80240E90 8E620008 */ lw $v0, 8($s3) -/* C32374 80240E94 18400003 */ blez $v0, .L80240EA4 -/* C32378 80240E98 24020004 */ addiu $v0, $zero, 4 -/* C3237C 80240E9C 14600002 */ bnez $v1, .L80240EA8 -/* C32380 80240EA0 00000000 */ nop -.L80240EA4: -/* C32384 80240EA4 AE420070 */ sw $v0, 0x70($s2) -.L80240EA8: -/* C32388 80240EA8 0C00A67F */ jal rand_int -/* C3238C 80240EAC 24042710 */ addiu $a0, $zero, 0x2710 -/* C32390 80240EB0 3C0351EB */ lui $v1, 0x51eb -/* C32394 80240EB4 3463851F */ ori $v1, $v1, 0x851f -/* C32398 80240EB8 00430018 */ mult $v0, $v1 -/* C3239C 80240EBC 00021FC3 */ sra $v1, $v0, 0x1f -/* C323A0 80240EC0 00004010 */ mfhi $t0 -/* C323A4 80240EC4 00082143 */ sra $a0, $t0, 5 -/* C323A8 80240EC8 00832023 */ subu $a0, $a0, $v1 -/* C323AC 80240ECC 00041840 */ sll $v1, $a0, 1 -/* C323B0 80240ED0 00641821 */ addu $v1, $v1, $a0 -/* C323B4 80240ED4 000318C0 */ sll $v1, $v1, 3 -/* C323B8 80240ED8 00641821 */ addu $v1, $v1, $a0 -/* C323BC 80240EDC 00031880 */ sll $v1, $v1, 2 -/* C323C0 80240EE0 8E640004 */ lw $a0, 4($s3) -/* C323C4 80240EE4 00431023 */ subu $v0, $v0, $v1 -/* C323C8 80240EE8 0044102A */ slt $v0, $v0, $a0 -/* C323CC 80240EEC 10400002 */ beqz $v0, .L80240EF8 -/* C323D0 80240EF0 24020004 */ addiu $v0, $zero, 4 -.L80240EF4: -/* C323D4 80240EF4 AE420070 */ sw $v0, 0x70($s2) -.L80240EF8: -/* C323D8 80240EF8 8FBF0044 */ lw $ra, 0x44($sp) -/* C323DC 80240EFC 8FB40040 */ lw $s4, 0x40($sp) -/* C323E0 80240F00 8FB3003C */ lw $s3, 0x3c($sp) -/* C323E4 80240F04 8FB20038 */ lw $s2, 0x38($sp) -/* C323E8 80240F08 8FB10034 */ lw $s1, 0x34($sp) -/* C323EC 80240F0C 8FB00030 */ lw $s0, 0x30($sp) -/* C323F0 80240F10 D7B60050 */ ldc1 $f22, 0x50($sp) -/* C323F4 80240F14 D7B40048 */ ldc1 $f20, 0x48($sp) -/* C323F8 80240F18 03E00008 */ jr $ra -/* C323FC 80240F1C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/func_80240F20_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/func_80240F20_C314E0.s deleted file mode 100644 index 5578a269b5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/func_80240F20_C314E0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_C32400 -/* C32400 80240F20 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C32404 80240F24 AFB3001C */ sw $s3, 0x1c($sp) -/* C32408 80240F28 0080982D */ daddu $s3, $a0, $zero -/* C3240C 80240F2C AFBF0020 */ sw $ra, 0x20($sp) -/* C32410 80240F30 AFB20018 */ sw $s2, 0x18($sp) -/* C32414 80240F34 AFB10014 */ sw $s1, 0x14($sp) -/* C32418 80240F38 AFB00010 */ sw $s0, 0x10($sp) -/* C3241C 80240F3C 8E720148 */ lw $s2, 0x148($s3) -/* C32420 80240F40 86440008 */ lh $a0, 8($s2) -/* C32424 80240F44 0C00EABB */ jal get_npc_unsafe -/* C32428 80240F48 00A0882D */ daddu $s1, $a1, $zero -/* C3242C 80240F4C 8E240008 */ lw $a0, 8($s1) -/* C32430 80240F50 0040802D */ daddu $s0, $v0, $zero -/* C32434 80240F54 00041FC2 */ srl $v1, $a0, 0x1f -/* C32438 80240F58 00832021 */ addu $a0, $a0, $v1 -/* C3243C 80240F5C 00042043 */ sra $a0, $a0, 1 -/* C32440 80240F60 0C00A67F */ jal rand_int -/* C32444 80240F64 24840001 */ addiu $a0, $a0, 1 -/* C32448 80240F68 8E230008 */ lw $v1, 8($s1) -/* C3244C 80240F6C 240400B4 */ addiu $a0, $zero, 0xb4 -/* C32450 80240F70 00032FC2 */ srl $a1, $v1, 0x1f -/* C32454 80240F74 00651821 */ addu $v1, $v1, $a1 -/* C32458 80240F78 00031843 */ sra $v1, $v1, 1 -/* C3245C 80240F7C 00621821 */ addu $v1, $v1, $v0 -/* C32460 80240F80 0C00A67F */ jal rand_int -/* C32464 80240F84 A603008E */ sh $v1, 0x8e($s0) -/* C32468 80240F88 C60C000C */ lwc1 $f12, 0xc($s0) -/* C3246C 80240F8C 44820000 */ mtc1 $v0, $f0 -/* C32470 80240F90 00000000 */ nop -/* C32474 80240F94 46800020 */ cvt.s.w $f0, $f0 -/* C32478 80240F98 46006300 */ add.s $f12, $f12, $f0 -/* C3247C 80240F9C 3C0142B4 */ lui $at, 0x42b4 -/* C32480 80240FA0 44810000 */ mtc1 $at, $f0 -/* C32484 80240FA4 0C00A6C9 */ jal clamp_angle -/* C32488 80240FA8 46006301 */ sub.s $f12, $f12, $f0 -/* C3248C 80240FAC E600000C */ swc1 $f0, 0xc($s0) -/* C32490 80240FB0 8E4200CC */ lw $v0, 0xcc($s2) -/* C32494 80240FB4 8C420000 */ lw $v0, ($v0) -/* C32498 80240FB8 AE020028 */ sw $v0, 0x28($s0) -/* C3249C 80240FBC 24020003 */ addiu $v0, $zero, 3 -/* C324A0 80240FC0 AE620070 */ sw $v0, 0x70($s3) -/* C324A4 80240FC4 8FBF0020 */ lw $ra, 0x20($sp) -/* C324A8 80240FC8 8FB3001C */ lw $s3, 0x1c($sp) -/* C324AC 80240FCC 8FB20018 */ lw $s2, 0x18($sp) -/* C324B0 80240FD0 8FB10014 */ lw $s1, 0x14($sp) -/* C324B4 80240FD4 8FB00010 */ lw $s0, 0x10($sp) -/* C324B8 80240FD8 03E00008 */ jr $ra -/* C324BC 80240FDC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/func_80240FE0_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/func_80240FE0_C314E0.s deleted file mode 100644 index 098bc41100..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/func_80240FE0_C314E0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FE0_C324C0 -/* C324C0 80240FE0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C324C4 80240FE4 AFB40040 */ sw $s4, 0x40($sp) -/* C324C8 80240FE8 0080A02D */ daddu $s4, $a0, $zero -/* C324CC 80240FEC AFBF0044 */ sw $ra, 0x44($sp) -/* C324D0 80240FF0 AFB3003C */ sw $s3, 0x3c($sp) -/* C324D4 80240FF4 AFB20038 */ sw $s2, 0x38($sp) -/* C324D8 80240FF8 AFB10034 */ sw $s1, 0x34($sp) -/* C324DC 80240FFC AFB00030 */ sw $s0, 0x30($sp) -/* C324E0 80241000 8E910148 */ lw $s1, 0x148($s4) -/* C324E4 80241004 00A0902D */ daddu $s2, $a1, $zero -/* C324E8 80241008 86240008 */ lh $a0, 8($s1) -/* C324EC 8024100C 0C00EABB */ jal get_npc_unsafe -/* C324F0 80241010 00C0982D */ daddu $s3, $a2, $zero -/* C324F4 80241014 8E430014 */ lw $v1, 0x14($s2) -/* C324F8 80241018 04600031 */ bltz $v1, .L802410E0 -/* C324FC 8024101C 0040802D */ daddu $s0, $v0, $zero -/* C32500 80241020 0260202D */ daddu $a0, $s3, $zero -/* C32504 80241024 AFA00010 */ sw $zero, 0x10($sp) -/* C32508 80241028 8E460024 */ lw $a2, 0x24($s2) -/* C3250C 8024102C 8E470028 */ lw $a3, 0x28($s2) -/* C32510 80241030 0C01242D */ jal func_800490B4 -/* C32514 80241034 0220282D */ daddu $a1, $s1, $zero -/* C32518 80241038 10400029 */ beqz $v0, .L802410E0 -/* C3251C 8024103C 0000202D */ daddu $a0, $zero, $zero -/* C32520 80241040 0200282D */ daddu $a1, $s0, $zero -/* C32524 80241044 0000302D */ daddu $a2, $zero, $zero -/* C32528 80241048 860300A8 */ lh $v1, 0xa8($s0) -/* C3252C 8024104C 3C013F80 */ lui $at, 0x3f80 -/* C32530 80241050 44810000 */ mtc1 $at, $f0 -/* C32534 80241054 3C014000 */ lui $at, 0x4000 -/* C32538 80241058 44811000 */ mtc1 $at, $f2 -/* C3253C 8024105C 3C01C1A0 */ lui $at, 0xc1a0 -/* C32540 80241060 44812000 */ mtc1 $at, $f4 -/* C32544 80241064 2402000F */ addiu $v0, $zero, 0xf -/* C32548 80241068 AFA2001C */ sw $v0, 0x1c($sp) -/* C3254C 8024106C 44833000 */ mtc1 $v1, $f6 -/* C32550 80241070 00000000 */ nop -/* C32554 80241074 468031A0 */ cvt.s.w $f6, $f6 -/* C32558 80241078 44073000 */ mfc1 $a3, $f6 -/* C3255C 8024107C 27A20028 */ addiu $v0, $sp, 0x28 -/* C32560 80241080 AFA20020 */ sw $v0, 0x20($sp) -/* C32564 80241084 E7A00010 */ swc1 $f0, 0x10($sp) -/* C32568 80241088 E7A20014 */ swc1 $f2, 0x14($sp) -/* C3256C 8024108C 0C01BFA4 */ jal fx_emote -/* C32570 80241090 E7A40018 */ swc1 $f4, 0x18($sp) -/* C32574 80241094 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C32578 80241098 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3257C 8024109C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C32580 802410A0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C32584 802410A4 8C460028 */ lw $a2, 0x28($v0) -/* C32588 802410A8 0C00A720 */ jal atan2 -/* C3258C 802410AC 8C470030 */ lw $a3, 0x30($v0) -/* C32590 802410B0 0200202D */ daddu $a0, $s0, $zero -/* C32594 802410B4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C32598 802410B8 3C060020 */ lui $a2, 0x20 -/* C3259C 802410BC 0C012530 */ jal func_800494C0 -/* C325A0 802410C0 E480000C */ swc1 $f0, 0xc($a0) -/* C325A4 802410C4 8E220018 */ lw $v0, 0x18($s1) -/* C325A8 802410C8 9442002A */ lhu $v0, 0x2a($v0) -/* C325AC 802410CC 30420001 */ andi $v0, $v0, 1 -/* C325B0 802410D0 14400029 */ bnez $v0, .L80241178 -/* C325B4 802410D4 2402000A */ addiu $v0, $zero, 0xa -/* C325B8 802410D8 0809045E */ j .L80241178 -/* C325BC 802410DC 2402000C */ addiu $v0, $zero, 0xc -.L802410E0: -/* C325C0 802410E0 8602008C */ lh $v0, 0x8c($s0) -/* C325C4 802410E4 14400025 */ bnez $v0, .L8024117C -/* C325C8 802410E8 00000000 */ nop -/* C325CC 802410EC 9602008E */ lhu $v0, 0x8e($s0) -/* C325D0 802410F0 2442FFFF */ addiu $v0, $v0, -1 -/* C325D4 802410F4 A602008E */ sh $v0, 0x8e($s0) -/* C325D8 802410F8 00021400 */ sll $v0, $v0, 0x10 -/* C325DC 802410FC 1440001F */ bnez $v0, .L8024117C -/* C325E0 80241100 00000000 */ nop -/* C325E4 80241104 8E820074 */ lw $v0, 0x74($s4) -/* C325E8 80241108 2442FFFF */ addiu $v0, $v0, -1 -/* C325EC 8024110C 10400019 */ beqz $v0, .L80241174 -/* C325F0 80241110 AE820074 */ sw $v0, 0x74($s4) -/* C325F4 80241114 8E220018 */ lw $v0, 0x18($s1) -/* C325F8 80241118 9442002A */ lhu $v0, 0x2a($v0) -/* C325FC 8024111C 30420010 */ andi $v0, $v0, 0x10 -/* C32600 80241120 14400007 */ bnez $v0, .L80241140 -/* C32604 80241124 00000000 */ nop -/* C32608 80241128 C600000C */ lwc1 $f0, 0xc($s0) -/* C3260C 8024112C 3C014334 */ lui $at, 0x4334 -/* C32610 80241130 44816000 */ mtc1 $at, $f12 -/* C32614 80241134 0C00A6C9 */ jal clamp_angle -/* C32618 80241138 460C0300 */ add.s $f12, $f0, $f12 -/* C3261C 8024113C E600000C */ swc1 $f0, 0xc($s0) -.L80241140: -/* C32620 80241140 8E440008 */ lw $a0, 8($s2) -/* C32624 80241144 000417C2 */ srl $v0, $a0, 0x1f -/* C32628 80241148 00822021 */ addu $a0, $a0, $v0 -/* C3262C 8024114C 00042043 */ sra $a0, $a0, 1 -/* C32630 80241150 0C00A67F */ jal rand_int -/* C32634 80241154 24840001 */ addiu $a0, $a0, 1 -/* C32638 80241158 8E430008 */ lw $v1, 8($s2) -/* C3263C 8024115C 000327C2 */ srl $a0, $v1, 0x1f -/* C32640 80241160 00641821 */ addu $v1, $v1, $a0 -/* C32644 80241164 00031843 */ sra $v1, $v1, 1 -/* C32648 80241168 00621821 */ addu $v1, $v1, $v0 -/* C3264C 8024116C 0809045F */ j .L8024117C -/* C32650 80241170 A603008E */ sh $v1, 0x8e($s0) -.L80241174: -/* C32654 80241174 24020004 */ addiu $v0, $zero, 4 -.L80241178: -/* C32658 80241178 AE820070 */ sw $v0, 0x70($s4) -.L8024117C: -/* C3265C 8024117C 8FBF0044 */ lw $ra, 0x44($sp) -/* C32660 80241180 8FB40040 */ lw $s4, 0x40($sp) -/* C32664 80241184 8FB3003C */ lw $s3, 0x3c($sp) -/* C32668 80241188 8FB20038 */ lw $s2, 0x38($sp) -/* C3266C 8024118C 8FB10034 */ lw $s1, 0x34($sp) -/* C32670 80241190 8FB00030 */ lw $s0, 0x30($sp) -/* C32674 80241194 03E00008 */ jr $ra -/* C32678 80241198 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/func_8024119C_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/func_8024119C_C314E0.s deleted file mode 100644 index 00d239edf2..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/func_8024119C_C314E0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024119C_C3267C -/* C3267C 8024119C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C32680 802411A0 AFB10014 */ sw $s1, 0x14($sp) -/* C32684 802411A4 0080882D */ daddu $s1, $a0, $zero -/* C32688 802411A8 AFBF001C */ sw $ra, 0x1c($sp) -/* C3268C 802411AC AFB20018 */ sw $s2, 0x18($sp) -/* C32690 802411B0 AFB00010 */ sw $s0, 0x10($sp) -/* C32694 802411B4 8E300148 */ lw $s0, 0x148($s1) -/* C32698 802411B8 86040008 */ lh $a0, 8($s0) -/* C3269C 802411BC 0C00EABB */ jal get_npc_unsafe -/* C326A0 802411C0 00A0902D */ daddu $s2, $a1, $zero -/* C326A4 802411C4 8E230078 */ lw $v1, 0x78($s1) -/* C326A8 802411C8 24630001 */ addiu $v1, $v1, 1 -/* C326AC 802411CC AE230078 */ sw $v1, 0x78($s1) -/* C326B0 802411D0 8E0400D0 */ lw $a0, 0xd0($s0) -/* C326B4 802411D4 8C840000 */ lw $a0, ($a0) -/* C326B8 802411D8 0064182A */ slt $v1, $v1, $a0 -/* C326BC 802411DC 14600002 */ bnez $v1, .L802411E8 -/* C326C0 802411E0 0040282D */ daddu $a1, $v0, $zero -/* C326C4 802411E4 AE200078 */ sw $zero, 0x78($s1) -.L802411E8: -/* C326C8 802411E8 8E0200CC */ lw $v0, 0xcc($s0) -/* C326CC 802411EC 8C420004 */ lw $v0, 4($v0) -/* C326D0 802411F0 ACA20028 */ sw $v0, 0x28($a1) -/* C326D4 802411F4 8E0200D0 */ lw $v0, 0xd0($s0) -/* C326D8 802411F8 8C42007C */ lw $v0, 0x7c($v0) -/* C326DC 802411FC 04410004 */ bgez $v0, .L80241210 -/* C326E0 80241200 00000000 */ nop -/* C326E4 80241204 C6400000 */ lwc1 $f0, ($s2) -/* C326E8 80241208 0809048C */ j .L80241230 -/* C326EC 8024120C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241210: -/* C326F0 80241210 3C018024 */ lui $at, 0x8024 -/* C326F4 80241214 D4224B90 */ ldc1 $f2, 0x4b90($at) -/* C326F8 80241218 44820000 */ mtc1 $v0, $f0 -/* C326FC 8024121C 00000000 */ nop -/* C32700 80241220 46800021 */ cvt.d.w $f0, $f0 -/* C32704 80241224 46220003 */ div.d $f0, $f0, $f2 -/* C32708 80241228 46200020 */ cvt.s.d $f0, $f0 -/* C3270C 8024122C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241230: -/* C32710 80241230 24020001 */ addiu $v0, $zero, 1 -/* C32714 80241234 AE220070 */ sw $v0, 0x70($s1) -/* C32718 80241238 8FBF001C */ lw $ra, 0x1c($sp) -/* C3271C 8024123C 8FB20018 */ lw $s2, 0x18($sp) -/* C32720 80241240 8FB10014 */ lw $s1, 0x14($sp) -/* C32724 80241244 8FB00010 */ lw $s0, 0x10($sp) -/* C32728 80241248 03E00008 */ jr $ra -/* C3272C 8024124C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/func_8024146C_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/func_8024146C_C314E0.s deleted file mode 100644 index 93c01b3fc4..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/func_8024146C_C314E0.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024146C_C3294C -/* C3294C 8024146C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C32950 80241470 AFB3003C */ sw $s3, 0x3c($sp) -/* C32954 80241474 0080982D */ daddu $s3, $a0, $zero -/* C32958 80241478 AFBF0040 */ sw $ra, 0x40($sp) -/* C3295C 8024147C AFB20038 */ sw $s2, 0x38($sp) -/* C32960 80241480 AFB10034 */ sw $s1, 0x34($sp) -/* C32964 80241484 AFB00030 */ sw $s0, 0x30($sp) -/* C32968 80241488 8E720148 */ lw $s2, 0x148($s3) -/* C3296C 8024148C 00A0882D */ daddu $s1, $a1, $zero -/* C32970 80241490 86440008 */ lh $a0, 8($s2) -/* C32974 80241494 0C00EABB */ jal get_npc_unsafe -/* C32978 80241498 00C0802D */ daddu $s0, $a2, $zero -/* C3297C 8024149C 0200202D */ daddu $a0, $s0, $zero -/* C32980 802414A0 0240282D */ daddu $a1, $s2, $zero -/* C32984 802414A4 24030001 */ addiu $v1, $zero, 1 -/* C32988 802414A8 AFA30010 */ sw $v1, 0x10($sp) -/* C3298C 802414AC 8E260024 */ lw $a2, 0x24($s1) -/* C32990 802414B0 8E270028 */ lw $a3, 0x28($s1) -/* C32994 802414B4 0C01242D */ jal func_800490B4 -/* C32998 802414B8 0040802D */ daddu $s0, $v0, $zero -/* C3299C 802414BC 1440001E */ bnez $v0, .L80241538 -/* C329A0 802414C0 0200202D */ daddu $a0, $s0, $zero -/* C329A4 802414C4 24040002 */ addiu $a0, $zero, 2 -/* C329A8 802414C8 0200282D */ daddu $a1, $s0, $zero -/* C329AC 802414CC 0000302D */ daddu $a2, $zero, $zero -/* C329B0 802414D0 860300A8 */ lh $v1, 0xa8($s0) -/* C329B4 802414D4 3C013F80 */ lui $at, 0x3f80 -/* C329B8 802414D8 44810000 */ mtc1 $at, $f0 -/* C329BC 802414DC 3C014000 */ lui $at, 0x4000 -/* C329C0 802414E0 44811000 */ mtc1 $at, $f2 -/* C329C4 802414E4 3C01C1A0 */ lui $at, 0xc1a0 -/* C329C8 802414E8 44812000 */ mtc1 $at, $f4 -/* C329CC 802414EC 2402000F */ addiu $v0, $zero, 0xf -/* C329D0 802414F0 AFA2001C */ sw $v0, 0x1c($sp) -/* C329D4 802414F4 44833000 */ mtc1 $v1, $f6 -/* C329D8 802414F8 00000000 */ nop -/* C329DC 802414FC 468031A0 */ cvt.s.w $f6, $f6 -/* C329E0 80241500 44073000 */ mfc1 $a3, $f6 -/* C329E4 80241504 27A20028 */ addiu $v0, $sp, 0x28 -/* C329E8 80241508 AFA20020 */ sw $v0, 0x20($sp) -/* C329EC 8024150C E7A00010 */ swc1 $f0, 0x10($sp) -/* C329F0 80241510 E7A20014 */ swc1 $f2, 0x14($sp) -/* C329F4 80241514 0C01BFA4 */ jal fx_emote -/* C329F8 80241518 E7A40018 */ swc1 $f4, 0x18($sp) -/* C329FC 8024151C 8E4200CC */ lw $v0, 0xcc($s2) -/* C32A00 80241520 8C430000 */ lw $v1, ($v0) -/* C32A04 80241524 24020019 */ addiu $v0, $zero, 0x19 -/* C32A08 80241528 A602008E */ sh $v0, 0x8e($s0) -/* C32A0C 8024152C 2402000E */ addiu $v0, $zero, 0xe -/* C32A10 80241530 0809055B */ j .L8024156C -/* C32A14 80241534 AE030028 */ sw $v1, 0x28($s0) -.L80241538: -/* C32A18 80241538 0C00F598 */ jal func_8003D660 -/* C32A1C 8024153C 24050001 */ addiu $a1, $zero, 1 -/* C32A20 80241540 8E050018 */ lw $a1, 0x18($s0) -/* C32A24 80241544 8E06000C */ lw $a2, 0xc($s0) -/* C32A28 80241548 0C00EA95 */ jal npc_move_heading -/* C32A2C 8024154C 0200202D */ daddu $a0, $s0, $zero -/* C32A30 80241550 8602008E */ lh $v0, 0x8e($s0) -/* C32A34 80241554 9603008E */ lhu $v1, 0x8e($s0) -/* C32A38 80241558 18400003 */ blez $v0, .L80241568 -/* C32A3C 8024155C 2462FFFF */ addiu $v0, $v1, -1 -/* C32A40 80241560 0809055C */ j .L80241570 -/* C32A44 80241564 A602008E */ sh $v0, 0x8e($s0) -.L80241568: -/* C32A48 80241568 2402000C */ addiu $v0, $zero, 0xc -.L8024156C: -/* C32A4C 8024156C AE620070 */ sw $v0, 0x70($s3) -.L80241570: -/* C32A50 80241570 8FBF0040 */ lw $ra, 0x40($sp) -/* C32A54 80241574 8FB3003C */ lw $s3, 0x3c($sp) -/* C32A58 80241578 8FB20038 */ lw $s2, 0x38($sp) -/* C32A5C 8024157C 8FB10034 */ lw $s1, 0x34($sp) -/* C32A60 80241580 8FB00030 */ lw $s0, 0x30($sp) -/* C32A64 80241584 03E00008 */ jr $ra -/* C32A68 80241588 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/func_802415F4_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/func_802415F4_C314E0.s deleted file mode 100644 index 24e87670c4..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/func_802415F4_C314E0.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415F4_C32AD4 -/* C32AD4 802415F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C32AD8 802415F8 AFB10014 */ sw $s1, 0x14($sp) -/* C32ADC 802415FC 0080882D */ daddu $s1, $a0, $zero -/* C32AE0 80241600 AFBF001C */ sw $ra, 0x1c($sp) -/* C32AE4 80241604 AFB20018 */ sw $s2, 0x18($sp) -/* C32AE8 80241608 AFB00010 */ sw $s0, 0x10($sp) -/* C32AEC 8024160C 8E300148 */ lw $s0, 0x148($s1) -/* C32AF0 80241610 86040008 */ lh $a0, 8($s0) -/* C32AF4 80241614 0C00EABB */ jal get_npc_unsafe -/* C32AF8 80241618 00A0902D */ daddu $s2, $a1, $zero -/* C32AFC 8024161C 8E0300D0 */ lw $v1, 0xd0($s0) -/* C32B00 80241620 8E240078 */ lw $a0, 0x78($s1) -/* C32B04 80241624 8C630000 */ lw $v1, ($v1) -/* C32B08 80241628 0083182A */ slt $v1, $a0, $v1 -/* C32B0C 8024162C 10600013 */ beqz $v1, .L8024167C -/* C32B10 80241630 0040302D */ daddu $a2, $v0, $zero -/* C32B14 80241634 00041040 */ sll $v0, $a0, 1 -/* C32B18 80241638 00441021 */ addu $v0, $v0, $a0 -/* C32B1C 8024163C 00022880 */ sll $a1, $v0, 2 -.L80241640: -/* C32B20 80241640 8E0300D0 */ lw $v1, 0xd0($s0) -/* C32B24 80241644 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* C32B28 80241648 00A31021 */ addu $v0, $a1, $v1 -/* C32B2C 8024164C C4400008 */ lwc1 $f0, 8($v0) -/* C32B30 80241650 46800020 */ cvt.s.w $f0, $f0 -/* C32B34 80241654 4602003E */ c.le.s $f0, $f2 -/* C32B38 80241658 00000000 */ nop -/* C32B3C 8024165C 45020003 */ bc1fl .L8024166C -/* C32B40 80241660 24840001 */ addiu $a0, $a0, 1 -/* C32B44 80241664 0809059F */ j .L8024167C -/* C32B48 80241668 AE240078 */ sw $a0, 0x78($s1) -.L8024166C: -/* C32B4C 8024166C 8C620000 */ lw $v0, ($v1) -/* C32B50 80241670 0082102A */ slt $v0, $a0, $v0 -/* C32B54 80241674 1440FFF2 */ bnez $v0, .L80241640 -/* C32B58 80241678 24A5000C */ addiu $a1, $a1, 0xc -.L8024167C: -/* C32B5C 8024167C C6400000 */ lwc1 $f0, ($s2) -/* C32B60 80241680 E4C00018 */ swc1 $f0, 0x18($a2) -/* C32B64 80241684 8E0200CC */ lw $v0, 0xcc($s0) -/* C32B68 80241688 8C420004 */ lw $v0, 4($v0) -/* C32B6C 8024168C ACC20028 */ sw $v0, 0x28($a2) -/* C32B70 80241690 24020001 */ addiu $v0, $zero, 1 -/* C32B74 80241694 AE200074 */ sw $zero, 0x74($s1) -/* C32B78 80241698 AE220070 */ sw $v0, 0x70($s1) -/* C32B7C 8024169C 8FBF001C */ lw $ra, 0x1c($sp) -/* C32B80 802416A0 8FB20018 */ lw $s2, 0x18($sp) -/* C32B84 802416A4 8FB10014 */ lw $s1, 0x14($sp) -/* C32B88 802416A8 8FB00010 */ lw $s0, 0x10($sp) -/* C32B8C 802416AC 03E00008 */ jr $ra -/* C32B90 802416B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/func_80241FBC_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/func_80241FBC_C314E0.s deleted file mode 100644 index 626e4ba600..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/func_80241FBC_C314E0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FBC_C3349C -/* C3349C 80241FBC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C334A0 80241FC0 AFB10014 */ sw $s1, 0x14($sp) -/* C334A4 80241FC4 0080882D */ daddu $s1, $a0, $zero -/* C334A8 80241FC8 AFBF0018 */ sw $ra, 0x18($sp) -/* C334AC 80241FCC AFB00010 */ sw $s0, 0x10($sp) -/* C334B0 80241FD0 8E300148 */ lw $s0, 0x148($s1) -/* C334B4 80241FD4 0C00EABB */ jal get_npc_unsafe -/* C334B8 80241FD8 86040008 */ lh $a0, 8($s0) -/* C334BC 80241FDC 0040182D */ daddu $v1, $v0, $zero -/* C334C0 80241FE0 9462008E */ lhu $v0, 0x8e($v1) -/* C334C4 80241FE4 2442FFFF */ addiu $v0, $v0, -1 -/* C334C8 80241FE8 A462008E */ sh $v0, 0x8e($v1) -/* C334CC 80241FEC 00021400 */ sll $v0, $v0, 0x10 -/* C334D0 80241FF0 1C400006 */ bgtz $v0, .L8024200C -/* C334D4 80241FF4 24020001 */ addiu $v0, $zero, 1 -/* C334D8 80241FF8 A462008E */ sh $v0, 0x8e($v1) -/* C334DC 80241FFC 24020028 */ addiu $v0, $zero, 0x28 -/* C334E0 80242000 AE020088 */ sw $v0, 0x88($s0) -/* C334E4 80242004 24020003 */ addiu $v0, $zero, 3 -/* C334E8 80242008 AE220070 */ sw $v0, 0x70($s1) -.L8024200C: -/* C334EC 8024200C 8FBF0018 */ lw $ra, 0x18($sp) -/* C334F0 80242010 8FB10014 */ lw $s1, 0x14($sp) -/* C334F4 80242014 8FB00010 */ lw $s0, 0x10($sp) -/* C334F8 80242018 03E00008 */ jr $ra -/* C334FC 8024201C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/func_80242424_C314E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/func_80242424_C314E0.s deleted file mode 100644 index e8b64af1fb..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/func_80242424_C314E0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242424_C33904 -/* C33904 80242424 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C33908 80242428 AFB00010 */ sw $s0, 0x10($sp) -/* C3390C 8024242C 0080802D */ daddu $s0, $a0, $zero -/* C33910 80242430 AFBF0014 */ sw $ra, 0x14($sp) -/* C33914 80242434 8E020148 */ lw $v0, 0x148($s0) -/* C33918 80242438 0C00EABB */ jal get_npc_unsafe -/* C3391C 8024243C 84440008 */ lh $a0, 8($v0) -/* C33920 80242440 0040182D */ daddu $v1, $v0, $zero -/* C33924 80242444 8462008C */ lh $v0, 0x8c($v1) -/* C33928 80242448 14400009 */ bnez $v0, .L80242470 -/* C3392C 8024244C 00000000 */ nop -/* C33930 80242450 9462008E */ lhu $v0, 0x8e($v1) -/* C33934 80242454 2442FFFF */ addiu $v0, $v0, -1 -/* C33938 80242458 A462008E */ sh $v0, 0x8e($v1) -/* C3393C 8024245C 00021400 */ sll $v0, $v0, 0x10 -/* C33940 80242460 1C400003 */ bgtz $v0, .L80242470 -/* C33944 80242464 00000000 */ nop -/* C33948 80242468 A460008E */ sh $zero, 0x8e($v1) -/* C3394C 8024246C AE000070 */ sw $zero, 0x70($s0) -.L80242470: -/* C33950 80242470 8FBF0014 */ lw $ra, 0x14($sp) -/* C33954 80242474 8FB00010 */ lw $s0, 0x10($sp) -/* C33958 80242478 03E00008 */ jr $ra -/* C3395C 8024247C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_802401B0_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_802401B0_C36530.s deleted file mode 100644 index 47e39d70bc..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_802401B0_C36530.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_C366E0 -/* C366E0 802401B0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C366E4 802401B4 AFB3004C */ sw $s3, 0x4c($sp) -/* C366E8 802401B8 0080982D */ daddu $s3, $a0, $zero -/* C366EC 802401BC AFBF0058 */ sw $ra, 0x58($sp) -/* C366F0 802401C0 AFB50054 */ sw $s5, 0x54($sp) -/* C366F4 802401C4 AFB40050 */ sw $s4, 0x50($sp) -/* C366F8 802401C8 AFB20048 */ sw $s2, 0x48($sp) -/* C366FC 802401CC AFB10044 */ sw $s1, 0x44($sp) -/* C36700 802401D0 AFB00040 */ sw $s0, 0x40($sp) -/* C36704 802401D4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* C36708 802401D8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* C3670C 802401DC F7B60068 */ sdc1 $f22, 0x68($sp) -/* C36710 802401E0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* C36714 802401E4 8E710148 */ lw $s1, 0x148($s3) -/* C36718 802401E8 00A0902D */ daddu $s2, $a1, $zero -/* C3671C 802401EC 86240008 */ lh $a0, 8($s1) -/* C36720 802401F0 0C00EABB */ jal get_npc_unsafe -/* C36724 802401F4 00C0A82D */ daddu $s5, $a2, $zero -/* C36728 802401F8 0040802D */ daddu $s0, $v0, $zero -/* C3672C 802401FC 0000A02D */ daddu $s4, $zero, $zero -/* C36730 80240200 C624007C */ lwc1 $f4, 0x7c($s1) -/* C36734 80240204 46802120 */ cvt.s.w $f4, $f4 -/* C36738 80240208 C6220088 */ lwc1 $f2, 0x88($s1) -/* C3673C 8024020C 468010A0 */ cvt.s.w $f2, $f2 -/* C36740 80240210 460010A1 */ cvt.d.s $f2, $f2 -/* C36744 80240214 46002121 */ cvt.d.s $f4, $f4 -/* C36748 80240218 C600003C */ lwc1 $f0, 0x3c($s0) -/* C3674C 8024021C 3C014059 */ lui $at, 0x4059 -/* C36750 80240220 44813800 */ mtc1 $at, $f7 -/* C36754 80240224 44803000 */ mtc1 $zero, $f6 -/* C36758 80240228 46000021 */ cvt.d.s $f0, $f0 -/* C3675C 8024022C 46260002 */ mul.d $f0, $f0, $f6 -/* C36760 80240230 00000000 */ nop -/* C36764 80240234 24020001 */ addiu $v0, $zero, 1 -/* C36768 80240238 8E24006C */ lw $a0, 0x6c($s1) -/* C3676C 8024023C 46261083 */ div.d $f2, $f2, $f6 -/* C36770 80240240 462010A0 */ cvt.s.d $f2, $f2 -/* C36774 80240244 46262103 */ div.d $f4, $f4, $f6 -/* C36778 80240248 46202520 */ cvt.s.d $f20, $f4 -/* C3677C 8024024C 30830011 */ andi $v1, $a0, 0x11 -/* C36780 80240250 4620020D */ trunc.w.d $f8, $f0 -/* C36784 80240254 E628007C */ swc1 $f8, 0x7c($s1) -/* C36788 80240258 C6200078 */ lwc1 $f0, 0x78($s1) -/* C3678C 8024025C 46800020 */ cvt.s.w $f0, $f0 -/* C36790 80240260 46000021 */ cvt.d.s $f0, $f0 -/* C36794 80240264 46260003 */ div.d $f0, $f0, $f6 -/* C36798 80240268 462006A0 */ cvt.s.d $f26, $f0 -/* C3679C 8024026C C6200070 */ lwc1 $f0, 0x70($s1) -/* C367A0 80240270 46800020 */ cvt.s.w $f0, $f0 -/* C367A4 80240274 46000021 */ cvt.d.s $f0, $f0 -/* C367A8 80240278 46260003 */ div.d $f0, $f0, $f6 -/* C367AC 8024027C 462005A0 */ cvt.s.d $f22, $f0 -/* C367B0 80240280 14620025 */ bne $v1, $v0, .L80240318 -/* C367B4 80240284 4602D600 */ add.s $f24, $f26, $f2 -/* C367B8 80240288 8E020000 */ lw $v0, ($s0) -/* C367BC 8024028C 30420008 */ andi $v0, $v0, 8 -/* C367C0 80240290 10400009 */ beqz $v0, .L802402B8 -/* C367C4 80240294 27A50028 */ addiu $a1, $sp, 0x28 -/* C367C8 80240298 C600003C */ lwc1 $f0, 0x3c($s0) -/* C367CC 8024029C 4600C001 */ sub.s $f0, $f24, $f0 -/* C367D0 802402A0 4600B03C */ c.lt.s $f22, $f0 -/* C367D4 802402A4 00000000 */ nop -/* C367D8 802402A8 4500001B */ bc1f .L80240318 -/* C367DC 802402AC 34820010 */ ori $v0, $a0, 0x10 -/* C367E0 802402B0 080900C6 */ j .L80240318 -/* C367E4 802402B4 AE22006C */ sw $v0, 0x6c($s1) -.L802402B8: -/* C367E8 802402B8 27A6002C */ addiu $a2, $sp, 0x2c -/* C367EC 802402BC C6000038 */ lwc1 $f0, 0x38($s0) -/* C367F0 802402C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C367F4 802402C4 C6040040 */ lwc1 $f4, 0x40($s0) -/* C367F8 802402C8 3C01447A */ lui $at, 0x447a -/* C367FC 802402CC 44813000 */ mtc1 $at, $f6 -/* C36800 802402D0 27A20034 */ addiu $v0, $sp, 0x34 -/* C36804 802402D4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C36808 802402D8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C3680C 802402DC E7A40030 */ swc1 $f4, 0x30($sp) -/* C36810 802402E0 E7A60034 */ swc1 $f6, 0x34($sp) -/* C36814 802402E4 AFA20010 */ sw $v0, 0x10($sp) -/* C36818 802402E8 8E040080 */ lw $a0, 0x80($s0) -/* C3681C 802402EC 0C0372DF */ jal func_800DCB7C -/* C36820 802402F0 27A70030 */ addiu $a3, $sp, 0x30 -/* C36824 802402F4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* C36828 802402F8 4600D001 */ sub.s $f0, $f26, $f0 -/* C3682C 802402FC 4600B03C */ c.lt.s $f22, $f0 -/* C36830 80240300 00000000 */ nop -/* C36834 80240304 45000004 */ bc1f .L80240318 -/* C36838 80240308 00000000 */ nop -/* C3683C 8024030C 8E22006C */ lw $v0, 0x6c($s1) -/* C36840 80240310 34420010 */ ori $v0, $v0, 0x10 -/* C36844 80240314 AE22006C */ sw $v0, 0x6c($s1) -.L80240318: -/* C36848 80240318 8E22006C */ lw $v0, 0x6c($s1) -/* C3684C 8024031C 24030011 */ addiu $v1, $zero, 0x11 -/* C36850 80240320 30420011 */ andi $v0, $v0, 0x11 -/* C36854 80240324 14430039 */ bne $v0, $v1, .L8024040C -/* C36858 80240328 00000000 */ nop -/* C3685C 8024032C 8E020000 */ lw $v0, ($s0) -/* C36860 80240330 30420008 */ andi $v0, $v0, 8 -/* C36864 80240334 1040000A */ beqz $v0, .L80240360 -/* C36868 80240338 4600C106 */ mov.s $f4, $f24 -/* C3686C 8024033C 4614C081 */ sub.s $f2, $f24, $f20 -/* C36870 80240340 3C018024 */ lui $at, 0x8024 -/* C36874 80240344 D42043F8 */ ldc1 $f0, 0x43f8($at) -/* C36878 80240348 460010A1 */ cvt.d.s $f2, $f2 -/* C3687C 8024034C 46201082 */ mul.d $f2, $f2, $f0 -/* C36880 80240350 00000000 */ nop -/* C36884 80240354 4600A021 */ cvt.d.s $f0, $f20 -/* C36888 80240358 080900F1 */ j .L802403C4 -/* C3688C 8024035C 46220000 */ add.d $f0, $f0, $f2 -.L80240360: -/* C36890 80240360 27A50028 */ addiu $a1, $sp, 0x28 -/* C36894 80240364 27A6002C */ addiu $a2, $sp, 0x2c -/* C36898 80240368 C6000038 */ lwc1 $f0, 0x38($s0) -/* C3689C 8024036C C6020040 */ lwc1 $f2, 0x40($s0) -/* C368A0 80240370 3C01447A */ lui $at, 0x447a -/* C368A4 80240374 44812000 */ mtc1 $at, $f4 -/* C368A8 80240378 27A20034 */ addiu $v0, $sp, 0x34 -/* C368AC 8024037C E7B4002C */ swc1 $f20, 0x2c($sp) -/* C368B0 80240380 E7A00028 */ swc1 $f0, 0x28($sp) -/* C368B4 80240384 E7A20030 */ swc1 $f2, 0x30($sp) -/* C368B8 80240388 E7A40034 */ swc1 $f4, 0x34($sp) -/* C368BC 8024038C AFA20010 */ sw $v0, 0x10($sp) -/* C368C0 80240390 8E040080 */ lw $a0, 0x80($s0) -/* C368C4 80240394 0C0372DF */ jal func_800DCB7C -/* C368C8 80240398 27A70030 */ addiu $a3, $sp, 0x30 -/* C368CC 8024039C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* C368D0 802403A0 461A2100 */ add.s $f4, $f4, $f26 -/* C368D4 802403A4 46142081 */ sub.s $f2, $f4, $f20 -/* C368D8 802403A8 3C018024 */ lui $at, 0x8024 -/* C368DC 802403AC D4204400 */ ldc1 $f0, 0x4400($at) -/* C368E0 802403B0 460010A1 */ cvt.d.s $f2, $f2 -/* C368E4 802403B4 46201082 */ mul.d $f2, $f2, $f0 -/* C368E8 802403B8 00000000 */ nop -/* C368EC 802403BC 4600A021 */ cvt.d.s $f0, $f20 -/* C368F0 802403C0 46220000 */ add.d $f0, $f0, $f2 -.L802403C4: -/* C368F4 802403C4 46200020 */ cvt.s.d $f0, $f0 -/* C368F8 802403C8 E600003C */ swc1 $f0, 0x3c($s0) -/* C368FC 802403CC C600003C */ lwc1 $f0, 0x3c($s0) -/* C36900 802403D0 46002001 */ sub.s $f0, $f4, $f0 -/* C36904 802403D4 3C013FF0 */ lui $at, 0x3ff0 -/* C36908 802403D8 44811800 */ mtc1 $at, $f3 -/* C3690C 802403DC 44801000 */ mtc1 $zero, $f2 -/* C36910 802403E0 46000005 */ abs.s $f0, $f0 -/* C36914 802403E4 46000021 */ cvt.d.s $f0, $f0 -/* C36918 802403E8 4622003C */ c.lt.d $f0, $f2 -/* C3691C 802403EC 00000000 */ nop -/* C36920 802403F0 45000036 */ bc1f .L802404CC -/* C36924 802403F4 2403FFEF */ addiu $v1, $zero, -0x11 -/* C36928 802403F8 E604003C */ swc1 $f4, 0x3c($s0) -/* C3692C 802403FC 8E22006C */ lw $v0, 0x6c($s1) -/* C36930 80240400 00431024 */ and $v0, $v0, $v1 -/* C36934 80240404 08090133 */ j .L802404CC -/* C36938 80240408 AE22006C */ sw $v0, 0x6c($s1) -.L8024040C: -/* C3693C 8024040C 8E220070 */ lw $v0, 0x70($s1) -/* C36940 80240410 1840002E */ blez $v0, .L802404CC -/* C36944 80240414 00000000 */ nop -/* C36948 80240418 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C3694C 8024041C 0C00A8BB */ jal sin_deg -/* C36950 80240420 46806320 */ cvt.s.w $f12, $f12 -/* C36954 80240424 8E020000 */ lw $v0, ($s0) -/* C36958 80240428 30420008 */ andi $v0, $v0, 8 -/* C3695C 8024042C 10400003 */ beqz $v0, .L8024043C -/* C36960 80240430 46000506 */ mov.s $f20, $f0 -/* C36964 80240434 0809011F */ j .L8024047C -/* C36968 80240438 0000102D */ daddu $v0, $zero, $zero -.L8024043C: -/* C3696C 8024043C 27A50028 */ addiu $a1, $sp, 0x28 -/* C36970 80240440 27A6002C */ addiu $a2, $sp, 0x2c -/* C36974 80240444 C6000038 */ lwc1 $f0, 0x38($s0) -/* C36978 80240448 C602003C */ lwc1 $f2, 0x3c($s0) -/* C3697C 8024044C C6040040 */ lwc1 $f4, 0x40($s0) -/* C36980 80240450 3C01447A */ lui $at, 0x447a -/* C36984 80240454 44813000 */ mtc1 $at, $f6 -/* C36988 80240458 27A20034 */ addiu $v0, $sp, 0x34 -/* C3698C 8024045C E7A00028 */ swc1 $f0, 0x28($sp) -/* C36990 80240460 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C36994 80240464 E7A40030 */ swc1 $f4, 0x30($sp) -/* C36998 80240468 E7A60034 */ swc1 $f6, 0x34($sp) -/* C3699C 8024046C AFA20010 */ sw $v0, 0x10($sp) -/* C369A0 80240470 8E040080 */ lw $a0, 0x80($s0) -/* C369A4 80240474 0C0372DF */ jal func_800DCB7C -/* C369A8 80240478 27A70030 */ addiu $a3, $sp, 0x30 -.L8024047C: -/* C369AC 8024047C 10400007 */ beqz $v0, .L8024049C -/* C369B0 80240480 00000000 */ nop -/* C369B4 80240484 4616A082 */ mul.s $f2, $f20, $f22 -/* C369B8 80240488 00000000 */ nop -/* C369BC 8024048C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C369C0 80240490 461A0000 */ add.s $f0, $f0, $f26 -/* C369C4 80240494 0809012A */ j .L802404A8 -/* C369C8 80240498 46020000 */ add.s $f0, $f0, $f2 -.L8024049C: -/* C369CC 8024049C 4616A002 */ mul.s $f0, $f20, $f22 -/* C369D0 802404A0 00000000 */ nop -/* C369D4 802404A4 4600C000 */ add.s $f0, $f24, $f0 -.L802404A8: -/* C369D8 802404A8 E600003C */ swc1 $f0, 0x3c($s0) -/* C369DC 802404AC 8E220074 */ lw $v0, 0x74($s1) -/* C369E0 802404B0 2442000A */ addiu $v0, $v0, 0xa -/* C369E4 802404B4 44826000 */ mtc1 $v0, $f12 -/* C369E8 802404B8 00000000 */ nop -/* C369EC 802404BC 0C00A6C9 */ jal clamp_angle -/* C369F0 802404C0 46806320 */ cvt.s.w $f12, $f12 -/* C369F4 802404C4 4600020D */ trunc.w.s $f8, $f0 -/* C369F8 802404C8 E6280074 */ swc1 $f8, 0x74($s1) -.L802404CC: -/* C369FC 802404CC 8E220090 */ lw $v0, 0x90($s1) -/* C36A00 802404D0 1C40004A */ bgtz $v0, .L802405FC -/* C36A04 802404D4 2442FFFF */ addiu $v0, $v0, -1 -/* C36A08 802404D8 8E430014 */ lw $v1, 0x14($s2) -/* C36A0C 802404DC 04600048 */ bltz $v1, .L80240600 -/* C36A10 802404E0 00000000 */ nop -/* C36A14 802404E4 8E620074 */ lw $v0, 0x74($s3) -/* C36A18 802404E8 1C400042 */ bgtz $v0, .L802405F4 -/* C36A1C 802404EC 2442FFFF */ addiu $v0, $v0, -1 -/* C36A20 802404F0 AE630074 */ sw $v1, 0x74($s3) -/* C36A24 802404F4 860200A8 */ lh $v0, 0xa8($s0) -/* C36A28 802404F8 C602003C */ lwc1 $f2, 0x3c($s0) -/* C36A2C 802404FC 44820000 */ mtc1 $v0, $f0 -/* C36A30 80240500 00000000 */ nop -/* C36A34 80240504 46800020 */ cvt.s.w $f0, $f0 -/* C36A38 80240508 46001080 */ add.s $f2, $f2, $f0 -/* C36A3C 8024050C 3C014024 */ lui $at, 0x4024 -/* C36A40 80240510 44810800 */ mtc1 $at, $f1 -/* C36A44 80240514 44800000 */ mtc1 $zero, $f0 -/* C36A48 80240518 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C36A4C 8024051C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C36A50 80240520 460010A1 */ cvt.d.s $f2, $f2 -/* C36A54 80240524 46201080 */ add.d $f2, $f2, $f0 -/* C36A58 80240528 C440002C */ lwc1 $f0, 0x2c($v0) -/* C36A5C 8024052C 46000021 */ cvt.d.s $f0, $f0 -/* C36A60 80240530 4622003C */ c.lt.d $f0, $f2 -/* C36A64 80240534 00000000 */ nop -/* C36A68 80240538 4500002C */ bc1f .L802405EC -/* C36A6C 8024053C 02A0202D */ daddu $a0, $s5, $zero -/* C36A70 80240540 AFA00010 */ sw $zero, 0x10($sp) -/* C36A74 80240544 8E46000C */ lw $a2, 0xc($s2) -/* C36A78 80240548 8E470010 */ lw $a3, 0x10($s2) -/* C36A7C 8024054C 0C01242D */ jal func_800490B4 -/* C36A80 80240550 0220282D */ daddu $a1, $s1, $zero -/* C36A84 80240554 10400025 */ beqz $v0, .L802405EC -/* C36A88 80240558 0000202D */ daddu $a0, $zero, $zero -/* C36A8C 8024055C 0200282D */ daddu $a1, $s0, $zero -/* C36A90 80240560 0000302D */ daddu $a2, $zero, $zero -/* C36A94 80240564 2412000C */ addiu $s2, $zero, 0xc -/* C36A98 80240568 860300A8 */ lh $v1, 0xa8($s0) -/* C36A9C 8024056C 3C013F80 */ lui $at, 0x3f80 -/* C36AA0 80240570 44810000 */ mtc1 $at, $f0 -/* C36AA4 80240574 3C014000 */ lui $at, 0x4000 -/* C36AA8 80240578 44811000 */ mtc1 $at, $f2 -/* C36AAC 8024057C 3C01C1A0 */ lui $at, 0xc1a0 -/* C36AB0 80240580 44812000 */ mtc1 $at, $f4 -/* C36AB4 80240584 44834000 */ mtc1 $v1, $f8 -/* C36AB8 80240588 00000000 */ nop -/* C36ABC 8024058C 46804220 */ cvt.s.w $f8, $f8 -/* C36AC0 80240590 44074000 */ mfc1 $a3, $f8 -/* C36AC4 80240594 27A20038 */ addiu $v0, $sp, 0x38 -/* C36AC8 80240598 AFB2001C */ sw $s2, 0x1c($sp) -/* C36ACC 8024059C AFA20020 */ sw $v0, 0x20($sp) -/* C36AD0 802405A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C36AD4 802405A4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C36AD8 802405A8 0C01BFA4 */ jal fx_emote -/* C36ADC 802405AC E7A40018 */ swc1 $f4, 0x18($sp) -/* C36AE0 802405B0 0200202D */ daddu $a0, $s0, $zero -/* C36AE4 802405B4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C36AE8 802405B8 C480003C */ lwc1 $f0, 0x3c($a0) -/* C36AEC 802405BC 3C060020 */ lui $a2, 0x20 -/* C36AF0 802405C0 0C012530 */ jal func_800494C0 -/* C36AF4 802405C4 E4800064 */ swc1 $f0, 0x64($a0) -/* C36AF8 802405C8 8E220018 */ lw $v0, 0x18($s1) -/* C36AFC 802405CC 9442002A */ lhu $v0, 0x2a($v0) -/* C36B00 802405D0 30420001 */ andi $v0, $v0, 1 -/* C36B04 802405D4 10400003 */ beqz $v0, .L802405E4 -/* C36B08 802405D8 2402000A */ addiu $v0, $zero, 0xa -/* C36B0C 802405DC 080901E9 */ j .L802407A4 -/* C36B10 802405E0 AE620070 */ sw $v0, 0x70($s3) -.L802405E4: -/* C36B14 802405E4 080901E9 */ j .L802407A4 -/* C36B18 802405E8 AE720070 */ sw $s2, 0x70($s3) -.L802405EC: -/* C36B1C 802405EC 8E620074 */ lw $v0, 0x74($s3) -/* C36B20 802405F0 2442FFFF */ addiu $v0, $v0, -1 -.L802405F4: -/* C36B24 802405F4 08090180 */ j .L80240600 -/* C36B28 802405F8 AE620074 */ sw $v0, 0x74($s3) -.L802405FC: -/* C36B2C 802405FC AE220090 */ sw $v0, 0x90($s1) -.L80240600: -/* C36B30 80240600 8E2300D0 */ lw $v1, 0xd0($s1) -/* C36B34 80240604 C6000040 */ lwc1 $f0, 0x40($s0) -/* C36B38 80240608 C4620000 */ lwc1 $f2, ($v1) -/* C36B3C 8024060C 468010A0 */ cvt.s.w $f2, $f2 -/* C36B40 80240610 C4640008 */ lwc1 $f4, 8($v1) -/* C36B44 80240614 46802120 */ cvt.s.w $f4, $f4 -/* C36B48 80240618 E7A00010 */ swc1 $f0, 0x10($sp) -/* C36B4C 8024061C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C36B50 80240620 44051000 */ mfc1 $a1, $f2 -/* C36B54 80240624 C440000C */ lwc1 $f0, 0xc($v0) -/* C36B58 80240628 46800020 */ cvt.s.w $f0, $f0 -/* C36B5C 8024062C E7A00014 */ swc1 $f0, 0x14($sp) -/* C36B60 80240630 8E2200D0 */ lw $v0, 0xd0($s1) -/* C36B64 80240634 44062000 */ mfc1 $a2, $f4 -/* C36B68 80240638 C4400010 */ lwc1 $f0, 0x10($v0) -/* C36B6C 8024063C 46800020 */ cvt.s.w $f0, $f0 -/* C36B70 80240640 E7A00018 */ swc1 $f0, 0x18($sp) -/* C36B74 80240644 8C640018 */ lw $a0, 0x18($v1) -/* C36B78 80240648 0C0123F5 */ jal is_point_within_region -/* C36B7C 8024064C 8E070038 */ lw $a3, 0x38($s0) -/* C36B80 80240650 1040001A */ beqz $v0, .L802406BC -/* C36B84 80240654 00000000 */ nop -/* C36B88 80240658 8E060038 */ lw $a2, 0x38($s0) -/* C36B8C 8024065C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C36B90 80240660 8E070040 */ lw $a3, 0x40($s0) -/* C36B94 80240664 C44C0000 */ lwc1 $f12, ($v0) -/* C36B98 80240668 46806320 */ cvt.s.w $f12, $f12 -/* C36B9C 8024066C C44E0008 */ lwc1 $f14, 8($v0) -/* C36BA0 80240670 0C00A7B5 */ jal dist2D -/* C36BA4 80240674 468073A0 */ cvt.s.w $f14, $f14 -/* C36BA8 80240678 C6020018 */ lwc1 $f2, 0x18($s0) -/* C36BAC 8024067C 4600103C */ c.lt.s $f2, $f0 -/* C36BB0 80240680 00000000 */ nop -/* C36BB4 80240684 4500000D */ bc1f .L802406BC -/* C36BB8 80240688 E7A00034 */ swc1 $f0, 0x34($sp) -/* C36BBC 8024068C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C36BC0 80240690 8E2200D0 */ lw $v0, 0xd0($s1) -/* C36BC4 80240694 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C36BC8 80240698 C4480000 */ lwc1 $f8, ($v0) -/* C36BCC 8024069C 46804220 */ cvt.s.w $f8, $f8 -/* C36BD0 802406A0 44064000 */ mfc1 $a2, $f8 -/* C36BD4 802406A4 C4480008 */ lwc1 $f8, 8($v0) -/* C36BD8 802406A8 46804220 */ cvt.s.w $f8, $f8 -/* C36BDC 802406AC 44074000 */ mfc1 $a3, $f8 -/* C36BE0 802406B0 0C00A720 */ jal atan2 -/* C36BE4 802406B4 24140001 */ addiu $s4, $zero, 1 -/* C36BE8 802406B8 E600000C */ swc1 $f0, 0xc($s0) -.L802406BC: -/* C36BEC 802406BC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C36BF0 802406C0 8C43000C */ lw $v1, 0xc($v0) -/* C36BF4 802406C4 8C420010 */ lw $v0, 0x10($v0) -/* C36BF8 802406C8 00621825 */ or $v1, $v1, $v0 -/* C36BFC 802406CC 00741825 */ or $v1, $v1, $s4 -/* C36C00 802406D0 10600008 */ beqz $v1, .L802406F4 -/* C36C04 802406D4 00000000 */ nop -/* C36C08 802406D8 8602008C */ lh $v0, 0x8c($s0) -/* C36C0C 802406DC 14400031 */ bnez $v0, .L802407A4 -/* C36C10 802406E0 00000000 */ nop -/* C36C14 802406E4 8E050018 */ lw $a1, 0x18($s0) -/* C36C18 802406E8 8E06000C */ lw $a2, 0xc($s0) -/* C36C1C 802406EC 0C00EA95 */ jal npc_move_heading -/* C36C20 802406F0 0200202D */ daddu $a0, $s0, $zero -.L802406F4: -/* C36C24 802406F4 C600003C */ lwc1 $f0, 0x3c($s0) -/* C36C28 802406F8 3C014059 */ lui $at, 0x4059 -/* C36C2C 802406FC 44811800 */ mtc1 $at, $f3 -/* C36C30 80240700 44801000 */ mtc1 $zero, $f2 -/* C36C34 80240704 46000021 */ cvt.d.s $f0, $f0 -/* C36C38 80240708 46220002 */ mul.d $f0, $f0, $f2 -/* C36C3C 8024070C 00000000 */ nop -/* C36C40 80240710 4620020D */ trunc.w.d $f8, $f0 -/* C36C44 80240714 E628007C */ swc1 $f8, 0x7c($s1) -/* C36C48 80240718 8E420004 */ lw $v0, 4($s2) -/* C36C4C 8024071C 18400021 */ blez $v0, .L802407A4 -/* C36C50 80240720 00000000 */ nop -/* C36C54 80240724 8602008E */ lh $v0, 0x8e($s0) -/* C36C58 80240728 9603008E */ lhu $v1, 0x8e($s0) -/* C36C5C 8024072C 18400005 */ blez $v0, .L80240744 -/* C36C60 80240730 2462FFFF */ addiu $v0, $v1, -1 -/* C36C64 80240734 A602008E */ sh $v0, 0x8e($s0) -/* C36C68 80240738 00021400 */ sll $v0, $v0, 0x10 -/* C36C6C 8024073C 1C400019 */ bgtz $v0, .L802407A4 -/* C36C70 80240740 00000000 */ nop -.L80240744: -/* C36C74 80240744 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C36C78 80240748 24020002 */ addiu $v0, $zero, 2 -/* C36C7C 8024074C 0C00A67F */ jal rand_int -/* C36C80 80240750 AE620070 */ sw $v0, 0x70($s3) -/* C36C84 80240754 3C035555 */ lui $v1, 0x5555 -/* C36C88 80240758 34635556 */ ori $v1, $v1, 0x5556 -/* C36C8C 8024075C 00430018 */ mult $v0, $v1 -/* C36C90 80240760 000227C3 */ sra $a0, $v0, 0x1f -/* C36C94 80240764 00004010 */ mfhi $t0 -/* C36C98 80240768 01042023 */ subu $a0, $t0, $a0 -/* C36C9C 8024076C 00041840 */ sll $v1, $a0, 1 -/* C36CA0 80240770 00641821 */ addu $v1, $v1, $a0 -/* C36CA4 80240774 00431023 */ subu $v0, $v0, $v1 -/* C36CA8 80240778 24430002 */ addiu $v1, $v0, 2 -/* C36CAC 8024077C AE630074 */ sw $v1, 0x74($s3) -/* C36CB0 80240780 8E42002C */ lw $v0, 0x2c($s2) -/* C36CB4 80240784 58400007 */ blezl $v0, .L802407A4 -/* C36CB8 80240788 AE600070 */ sw $zero, 0x70($s3) -/* C36CBC 8024078C 8E420008 */ lw $v0, 8($s2) -/* C36CC0 80240790 18400003 */ blez $v0, .L802407A0 -/* C36CC4 80240794 28620003 */ slti $v0, $v1, 3 -/* C36CC8 80240798 10400002 */ beqz $v0, .L802407A4 -/* C36CCC 8024079C 00000000 */ nop -.L802407A0: -/* C36CD0 802407A0 AE600070 */ sw $zero, 0x70($s3) -.L802407A4: -/* C36CD4 802407A4 8FBF0058 */ lw $ra, 0x58($sp) -/* C36CD8 802407A8 8FB50054 */ lw $s5, 0x54($sp) -/* C36CDC 802407AC 8FB40050 */ lw $s4, 0x50($sp) -/* C36CE0 802407B0 8FB3004C */ lw $s3, 0x4c($sp) -/* C36CE4 802407B4 8FB20048 */ lw $s2, 0x48($sp) -/* C36CE8 802407B8 8FB10044 */ lw $s1, 0x44($sp) -/* C36CEC 802407BC 8FB00040 */ lw $s0, 0x40($sp) -/* C36CF0 802407C0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* C36CF4 802407C4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* C36CF8 802407C8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* C36CFC 802407CC D7B40060 */ ldc1 $f20, 0x60($sp) -/* C36D00 802407D0 03E00008 */ jr $ra -/* C36D04 802407D4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_802407D8_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_802407D8_C36530.s deleted file mode 100644 index 61886d78b9..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_802407D8_C36530.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D8_C36D08 -/* C36D08 802407D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C36D0C 802407DC AFB3001C */ sw $s3, 0x1c($sp) -/* C36D10 802407E0 0080982D */ daddu $s3, $a0, $zero -/* C36D14 802407E4 AFBF0020 */ sw $ra, 0x20($sp) -/* C36D18 802407E8 AFB20018 */ sw $s2, 0x18($sp) -/* C36D1C 802407EC AFB10014 */ sw $s1, 0x14($sp) -/* C36D20 802407F0 AFB00010 */ sw $s0, 0x10($sp) -/* C36D24 802407F4 8E720148 */ lw $s2, 0x148($s3) -/* C36D28 802407F8 86440008 */ lh $a0, 8($s2) -/* C36D2C 802407FC 0C00EABB */ jal get_npc_unsafe -/* C36D30 80240800 00A0882D */ daddu $s1, $a1, $zero -/* C36D34 80240804 8E240008 */ lw $a0, 8($s1) -/* C36D38 80240808 0040802D */ daddu $s0, $v0, $zero -/* C36D3C 8024080C 00041FC2 */ srl $v1, $a0, 0x1f -/* C36D40 80240810 00832021 */ addu $a0, $a0, $v1 -/* C36D44 80240814 00042043 */ sra $a0, $a0, 1 -/* C36D48 80240818 0C00A67F */ jal rand_int -/* C36D4C 8024081C 24840001 */ addiu $a0, $a0, 1 -/* C36D50 80240820 8E230008 */ lw $v1, 8($s1) -/* C36D54 80240824 240400B4 */ addiu $a0, $zero, 0xb4 -/* C36D58 80240828 00032FC2 */ srl $a1, $v1, 0x1f -/* C36D5C 8024082C 00651821 */ addu $v1, $v1, $a1 -/* C36D60 80240830 00031843 */ sra $v1, $v1, 1 -/* C36D64 80240834 00621821 */ addu $v1, $v1, $v0 -/* C36D68 80240838 0C00A67F */ jal rand_int -/* C36D6C 8024083C A603008E */ sh $v1, 0x8e($s0) -/* C36D70 80240840 C60C000C */ lwc1 $f12, 0xc($s0) -/* C36D74 80240844 44820000 */ mtc1 $v0, $f0 -/* C36D78 80240848 00000000 */ nop -/* C36D7C 8024084C 46800020 */ cvt.s.w $f0, $f0 -/* C36D80 80240850 46006300 */ add.s $f12, $f12, $f0 -/* C36D84 80240854 3C0142B4 */ lui $at, 0x42b4 -/* C36D88 80240858 44810000 */ mtc1 $at, $f0 -/* C36D8C 8024085C 0C00A6C9 */ jal clamp_angle -/* C36D90 80240860 46006301 */ sub.s $f12, $f12, $f0 -/* C36D94 80240864 E600000C */ swc1 $f0, 0xc($s0) -/* C36D98 80240868 8E4200CC */ lw $v0, 0xcc($s2) -/* C36D9C 8024086C 8C420000 */ lw $v0, ($v0) -/* C36DA0 80240870 AE020028 */ sw $v0, 0x28($s0) -/* C36DA4 80240874 24020003 */ addiu $v0, $zero, 3 -/* C36DA8 80240878 AE620070 */ sw $v0, 0x70($s3) -/* C36DAC 8024087C 8FBF0020 */ lw $ra, 0x20($sp) -/* C36DB0 80240880 8FB3001C */ lw $s3, 0x1c($sp) -/* C36DB4 80240884 8FB20018 */ lw $s2, 0x18($sp) -/* C36DB8 80240888 8FB10014 */ lw $s1, 0x14($sp) -/* C36DBC 8024088C 8FB00010 */ lw $s0, 0x10($sp) -/* C36DC0 80240890 03E00008 */ jr $ra -/* C36DC4 80240894 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_80240898_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_80240898_C36530.s deleted file mode 100644 index b9b66e4006..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_80240898_C36530.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240898_C36DC8 -/* C36DC8 80240898 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C36DCC 8024089C AFB3004C */ sw $s3, 0x4c($sp) -/* C36DD0 802408A0 0080982D */ daddu $s3, $a0, $zero -/* C36DD4 802408A4 AFBF0054 */ sw $ra, 0x54($sp) -/* C36DD8 802408A8 AFB40050 */ sw $s4, 0x50($sp) -/* C36DDC 802408AC AFB20048 */ sw $s2, 0x48($sp) -/* C36DE0 802408B0 AFB10044 */ sw $s1, 0x44($sp) -/* C36DE4 802408B4 AFB00040 */ sw $s0, 0x40($sp) -/* C36DE8 802408B8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C36DEC 802408BC F7B80068 */ sdc1 $f24, 0x68($sp) -/* C36DF0 802408C0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C36DF4 802408C4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C36DF8 802408C8 8E710148 */ lw $s1, 0x148($s3) -/* C36DFC 802408CC 00A0902D */ daddu $s2, $a1, $zero -/* C36E00 802408D0 86240008 */ lh $a0, 8($s1) -/* C36E04 802408D4 0C00EABB */ jal get_npc_unsafe -/* C36E08 802408D8 00C0A02D */ daddu $s4, $a2, $zero -/* C36E0C 802408DC 0040802D */ daddu $s0, $v0, $zero -/* C36E10 802408E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* C36E14 802408E4 46800020 */ cvt.s.w $f0, $f0 -/* C36E18 802408E8 46000021 */ cvt.d.s $f0, $f0 -/* C36E1C 802408EC 3C014059 */ lui $at, 0x4059 -/* C36E20 802408F0 44811800 */ mtc1 $at, $f3 -/* C36E24 802408F4 44801000 */ mtc1 $zero, $f2 -/* C36E28 802408F8 8602008E */ lh $v0, 0x8e($s0) -/* C36E2C 802408FC 9603008E */ lhu $v1, 0x8e($s0) -/* C36E30 80240900 46220003 */ div.d $f0, $f0, $f2 -/* C36E34 80240904 46200620 */ cvt.s.d $f24, $f0 -/* C36E38 80240908 C6200088 */ lwc1 $f0, 0x88($s1) -/* C36E3C 8024090C 46800020 */ cvt.s.w $f0, $f0 -/* C36E40 80240910 46000021 */ cvt.d.s $f0, $f0 -/* C36E44 80240914 46220003 */ div.d $f0, $f0, $f2 -/* C36E48 80240918 46200020 */ cvt.s.d $f0, $f0 -/* C36E4C 8024091C 18400003 */ blez $v0, .L8024092C -/* C36E50 80240920 4600C680 */ add.s $f26, $f24, $f0 -/* C36E54 80240924 2462FFFF */ addiu $v0, $v1, -1 -/* C36E58 80240928 A602008E */ sh $v0, 0x8e($s0) -.L8024092C: -/* C36E5C 8024092C 8E220070 */ lw $v0, 0x70($s1) -/* C36E60 80240930 18400034 */ blez $v0, .L80240A04 -/* C36E64 80240934 00000000 */ nop -/* C36E68 80240938 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C36E6C 8024093C 46806320 */ cvt.s.w $f12, $f12 -/* C36E70 80240940 44820000 */ mtc1 $v0, $f0 -/* C36E74 80240944 00000000 */ nop -/* C36E78 80240948 46800020 */ cvt.s.w $f0, $f0 -/* C36E7C 8024094C 46000021 */ cvt.d.s $f0, $f0 -/* C36E80 80240950 46220003 */ div.d $f0, $f0, $f2 -/* C36E84 80240954 0C00A8BB */ jal sin_deg -/* C36E88 80240958 462005A0 */ cvt.s.d $f22, $f0 -/* C36E8C 8024095C 8E020000 */ lw $v0, ($s0) -/* C36E90 80240960 30420008 */ andi $v0, $v0, 8 -/* C36E94 80240964 10400003 */ beqz $v0, .L80240974 -/* C36E98 80240968 46000506 */ mov.s $f20, $f0 -/* C36E9C 8024096C 0809026D */ j .L802409B4 -/* C36EA0 80240970 0000102D */ daddu $v0, $zero, $zero -.L80240974: -/* C36EA4 80240974 27A50028 */ addiu $a1, $sp, 0x28 -/* C36EA8 80240978 27A6002C */ addiu $a2, $sp, 0x2c -/* C36EAC 8024097C C6000038 */ lwc1 $f0, 0x38($s0) -/* C36EB0 80240980 C602003C */ lwc1 $f2, 0x3c($s0) -/* C36EB4 80240984 C6040040 */ lwc1 $f4, 0x40($s0) -/* C36EB8 80240988 3C01447A */ lui $at, 0x447a -/* C36EBC 8024098C 44813000 */ mtc1 $at, $f6 -/* C36EC0 80240990 27A20034 */ addiu $v0, $sp, 0x34 -/* C36EC4 80240994 E7A00028 */ swc1 $f0, 0x28($sp) -/* C36EC8 80240998 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C36ECC 8024099C E7A40030 */ swc1 $f4, 0x30($sp) -/* C36ED0 802409A0 E7A60034 */ swc1 $f6, 0x34($sp) -/* C36ED4 802409A4 AFA20010 */ sw $v0, 0x10($sp) -/* C36ED8 802409A8 8E040080 */ lw $a0, 0x80($s0) -/* C36EDC 802409AC 0C0372DF */ jal func_800DCB7C -/* C36EE0 802409B0 27A70030 */ addiu $a3, $sp, 0x30 -.L802409B4: -/* C36EE4 802409B4 10400007 */ beqz $v0, .L802409D4 -/* C36EE8 802409B8 00000000 */ nop -/* C36EEC 802409BC 4616A082 */ mul.s $f2, $f20, $f22 -/* C36EF0 802409C0 00000000 */ nop -/* C36EF4 802409C4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C36EF8 802409C8 46180000 */ add.s $f0, $f0, $f24 -/* C36EFC 802409CC 08090278 */ j .L802409E0 -/* C36F00 802409D0 46020000 */ add.s $f0, $f0, $f2 -.L802409D4: -/* C36F04 802409D4 4616A002 */ mul.s $f0, $f20, $f22 -/* C36F08 802409D8 00000000 */ nop -/* C36F0C 802409DC 4600D000 */ add.s $f0, $f26, $f0 -.L802409E0: -/* C36F10 802409E0 E600003C */ swc1 $f0, 0x3c($s0) -/* C36F14 802409E4 8E220074 */ lw $v0, 0x74($s1) -/* C36F18 802409E8 2442000A */ addiu $v0, $v0, 0xa -/* C36F1C 802409EC 44826000 */ mtc1 $v0, $f12 -/* C36F20 802409F0 00000000 */ nop -/* C36F24 802409F4 0C00A6C9 */ jal clamp_angle -/* C36F28 802409F8 46806320 */ cvt.s.w $f12, $f12 -/* C36F2C 802409FC 4600020D */ trunc.w.s $f8, $f0 -/* C36F30 80240A00 E6280074 */ swc1 $f8, 0x74($s1) -.L80240A04: -/* C36F34 80240A04 8E220090 */ lw $v0, 0x90($s1) -/* C36F38 80240A08 1C400040 */ bgtz $v0, .L80240B0C -/* C36F3C 80240A0C 2442FFFF */ addiu $v0, $v0, -1 -/* C36F40 80240A10 860200A8 */ lh $v0, 0xa8($s0) -/* C36F44 80240A14 C600003C */ lwc1 $f0, 0x3c($s0) -/* C36F48 80240A18 44821000 */ mtc1 $v0, $f2 -/* C36F4C 80240A1C 00000000 */ nop -/* C36F50 80240A20 468010A0 */ cvt.s.w $f2, $f2 -/* C36F54 80240A24 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C36F58 80240A28 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C36F5C 80240A2C 46020000 */ add.s $f0, $f0, $f2 -/* C36F60 80240A30 3C014024 */ lui $at, 0x4024 -/* C36F64 80240A34 44812800 */ mtc1 $at, $f5 -/* C36F68 80240A38 44802000 */ mtc1 $zero, $f4 -/* C36F6C 80240A3C C442002C */ lwc1 $f2, 0x2c($v0) -/* C36F70 80240A40 46000021 */ cvt.d.s $f0, $f0 -/* C36F74 80240A44 46240000 */ add.d $f0, $f0, $f4 -/* C36F78 80240A48 460010A1 */ cvt.d.s $f2, $f2 -/* C36F7C 80240A4C 4620103C */ c.lt.d $f2, $f0 -/* C36F80 80240A50 00000000 */ nop -/* C36F84 80240A54 4500002E */ bc1f .L80240B10 -/* C36F88 80240A58 0280202D */ daddu $a0, $s4, $zero -/* C36F8C 80240A5C 24020001 */ addiu $v0, $zero, 1 -/* C36F90 80240A60 AFA20010 */ sw $v0, 0x10($sp) -/* C36F94 80240A64 8E460024 */ lw $a2, 0x24($s2) -/* C36F98 80240A68 8E470028 */ lw $a3, 0x28($s2) -/* C36F9C 80240A6C 0C01242D */ jal func_800490B4 -/* C36FA0 80240A70 0220282D */ daddu $a1, $s1, $zero -/* C36FA4 80240A74 10400026 */ beqz $v0, .L80240B10 -/* C36FA8 80240A78 0000202D */ daddu $a0, $zero, $zero -/* C36FAC 80240A7C 0200282D */ daddu $a1, $s0, $zero -/* C36FB0 80240A80 0000302D */ daddu $a2, $zero, $zero -/* C36FB4 80240A84 2412000C */ addiu $s2, $zero, 0xc -/* C36FB8 80240A88 860300A8 */ lh $v1, 0xa8($s0) -/* C36FBC 80240A8C 3C013F80 */ lui $at, 0x3f80 -/* C36FC0 80240A90 44810000 */ mtc1 $at, $f0 -/* C36FC4 80240A94 3C014000 */ lui $at, 0x4000 -/* C36FC8 80240A98 44811000 */ mtc1 $at, $f2 -/* C36FCC 80240A9C 3C01C1A0 */ lui $at, 0xc1a0 -/* C36FD0 80240AA0 44812000 */ mtc1 $at, $f4 -/* C36FD4 80240AA4 44834000 */ mtc1 $v1, $f8 -/* C36FD8 80240AA8 00000000 */ nop -/* C36FDC 80240AAC 46804220 */ cvt.s.w $f8, $f8 -/* C36FE0 80240AB0 44074000 */ mfc1 $a3, $f8 -/* C36FE4 80240AB4 27A20038 */ addiu $v0, $sp, 0x38 -/* C36FE8 80240AB8 AFB2001C */ sw $s2, 0x1c($sp) -/* C36FEC 80240ABC AFA20020 */ sw $v0, 0x20($sp) -/* C36FF0 80240AC0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C36FF4 80240AC4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C36FF8 80240AC8 0C01BFA4 */ jal fx_emote -/* C36FFC 80240ACC E7A40018 */ swc1 $f4, 0x18($sp) -/* C37000 80240AD0 0200202D */ daddu $a0, $s0, $zero -/* C37004 80240AD4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C37008 80240AD8 C480003C */ lwc1 $f0, 0x3c($a0) -/* C3700C 80240ADC 3C060020 */ lui $a2, 0x20 -/* C37010 80240AE0 0C012530 */ jal func_800494C0 -/* C37014 80240AE4 E4800064 */ swc1 $f0, 0x64($a0) -/* C37018 80240AE8 8E220018 */ lw $v0, 0x18($s1) -/* C3701C 80240AEC 9442002A */ lhu $v0, 0x2a($v0) -/* C37020 80240AF0 30420001 */ andi $v0, $v0, 1 -/* C37024 80240AF4 10400003 */ beqz $v0, .L80240B04 -/* C37028 80240AF8 2402000A */ addiu $v0, $zero, 0xa -/* C3702C 80240AFC 080902EB */ j .L80240BAC -/* C37030 80240B00 AE620070 */ sw $v0, 0x70($s3) -.L80240B04: -/* C37034 80240B04 080902EB */ j .L80240BAC -/* C37038 80240B08 AE720070 */ sw $s2, 0x70($s3) -.L80240B0C: -/* C3703C 80240B0C AE220090 */ sw $v0, 0x90($s1) -.L80240B10: -/* C37040 80240B10 8602008C */ lh $v0, 0x8c($s0) -/* C37044 80240B14 14400025 */ bnez $v0, .L80240BAC -/* C37048 80240B18 00000000 */ nop -/* C3704C 80240B1C 8602008E */ lh $v0, 0x8e($s0) -/* C37050 80240B20 1C400022 */ bgtz $v0, .L80240BAC -/* C37054 80240B24 00000000 */ nop -/* C37058 80240B28 8E620074 */ lw $v0, 0x74($s3) -/* C3705C 80240B2C 2442FFFF */ addiu $v0, $v0, -1 -/* C37060 80240B30 1840001D */ blez $v0, .L80240BA8 -/* C37064 80240B34 AE620074 */ sw $v0, 0x74($s3) -/* C37068 80240B38 8E220018 */ lw $v0, 0x18($s1) -/* C3706C 80240B3C 9442002A */ lhu $v0, 0x2a($v0) -/* C37070 80240B40 30420010 */ andi $v0, $v0, 0x10 -/* C37074 80240B44 14400007 */ bnez $v0, .L80240B64 -/* C37078 80240B48 00000000 */ nop -/* C3707C 80240B4C C600000C */ lwc1 $f0, 0xc($s0) -/* C37080 80240B50 3C014334 */ lui $at, 0x4334 -/* C37084 80240B54 44816000 */ mtc1 $at, $f12 -/* C37088 80240B58 0C00A6C9 */ jal clamp_angle -/* C3708C 80240B5C 460C0300 */ add.s $f12, $f0, $f12 -/* C37090 80240B60 E600000C */ swc1 $f0, 0xc($s0) -.L80240B64: -/* C37094 80240B64 0C00A67F */ jal rand_int -/* C37098 80240B68 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C3709C 80240B6C 3C032E8B */ lui $v1, 0x2e8b -/* C370A0 80240B70 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* C370A4 80240B74 00430018 */ mult $v0, $v1 -/* C370A8 80240B78 00021FC3 */ sra $v1, $v0, 0x1f -/* C370AC 80240B7C 00004010 */ mfhi $t0 -/* C370B0 80240B80 00082043 */ sra $a0, $t0, 1 -/* C370B4 80240B84 00832023 */ subu $a0, $a0, $v1 -/* C370B8 80240B88 00041840 */ sll $v1, $a0, 1 -/* C370BC 80240B8C 00641821 */ addu $v1, $v1, $a0 -/* C370C0 80240B90 00031880 */ sll $v1, $v1, 2 -/* C370C4 80240B94 00641823 */ subu $v1, $v1, $a0 -/* C370C8 80240B98 00431023 */ subu $v0, $v0, $v1 -/* C370CC 80240B9C 24420005 */ addiu $v0, $v0, 5 -/* C370D0 80240BA0 080902EB */ j .L80240BAC -/* C370D4 80240BA4 A602008E */ sh $v0, 0x8e($s0) -.L80240BA8: -/* C370D8 80240BA8 AE600070 */ sw $zero, 0x70($s3) -.L80240BAC: -/* C370DC 80240BAC 8FBF0054 */ lw $ra, 0x54($sp) -/* C370E0 80240BB0 8FB40050 */ lw $s4, 0x50($sp) -/* C370E4 80240BB4 8FB3004C */ lw $s3, 0x4c($sp) -/* C370E8 80240BB8 8FB20048 */ lw $s2, 0x48($sp) -/* C370EC 80240BBC 8FB10044 */ lw $s1, 0x44($sp) -/* C370F0 80240BC0 8FB00040 */ lw $s0, 0x40($sp) -/* C370F4 80240BC4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C370F8 80240BC8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* C370FC 80240BCC D7B60060 */ ldc1 $f22, 0x60($sp) -/* C37100 80240BD0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C37104 80240BD4 03E00008 */ jr $ra -/* C37108 80240BD8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_80240BDC_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_80240BDC_C36530.s deleted file mode 100644 index 1543aa3ea0..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_80240BDC_C36530.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BDC_C3710C -/* C3710C 80240BDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C37110 80240BE0 AFB20018 */ sw $s2, 0x18($sp) -/* C37114 80240BE4 0080902D */ daddu $s2, $a0, $zero -/* C37118 80240BE8 AFBF001C */ sw $ra, 0x1c($sp) -/* C3711C 80240BEC AFB10014 */ sw $s1, 0x14($sp) -/* C37120 80240BF0 AFB00010 */ sw $s0, 0x10($sp) -/* C37124 80240BF4 8E510148 */ lw $s1, 0x148($s2) -/* C37128 80240BF8 0C00EABB */ jal get_npc_unsafe -/* C3712C 80240BFC 86240008 */ lh $a0, 8($s1) -/* C37130 80240C00 0040802D */ daddu $s0, $v0, $zero -/* C37134 80240C04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C37138 80240C08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3713C 80240C0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C37140 80240C10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C37144 80240C14 A600008E */ sh $zero, 0x8e($s0) -/* C37148 80240C18 8C460028 */ lw $a2, 0x28($v0) -/* C3714C 80240C1C 0C00A720 */ jal atan2 -/* C37150 80240C20 8C470030 */ lw $a3, 0x30($v0) -/* C37154 80240C24 E600000C */ swc1 $f0, 0xc($s0) -/* C37158 80240C28 8E2200CC */ lw $v0, 0xcc($s1) -/* C3715C 80240C2C 8C420020 */ lw $v0, 0x20($v0) -/* C37160 80240C30 AE020028 */ sw $v0, 0x28($s0) -/* C37164 80240C34 2402000B */ addiu $v0, $zero, 0xb -/* C37168 80240C38 AE420070 */ sw $v0, 0x70($s2) -/* C3716C 80240C3C 8FBF001C */ lw $ra, 0x1c($sp) -/* C37170 80240C40 8FB20018 */ lw $s2, 0x18($sp) -/* C37174 80240C44 8FB10014 */ lw $s1, 0x14($sp) -/* C37178 80240C48 8FB00010 */ lw $s0, 0x10($sp) -/* C3717C 80240C4C 03E00008 */ jr $ra -/* C37180 80240C50 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_80240C54_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_80240C54_C36530.s deleted file mode 100644 index eba7604bdf..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_80240C54_C36530.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C54_C37184 -/* C37184 80240C54 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C37188 80240C58 AFB00010 */ sw $s0, 0x10($sp) -/* C3718C 80240C5C 0080802D */ daddu $s0, $a0, $zero -/* C37190 80240C60 AFBF0014 */ sw $ra, 0x14($sp) -/* C37194 80240C64 8E020148 */ lw $v0, 0x148($s0) -/* C37198 80240C68 0C00EABB */ jal get_npc_unsafe -/* C3719C 80240C6C 84440008 */ lh $a0, 8($v0) -/* C371A0 80240C70 9443008E */ lhu $v1, 0x8e($v0) -/* C371A4 80240C74 C440003C */ lwc1 $f0, 0x3c($v0) -/* C371A8 80240C78 24640001 */ addiu $a0, $v1, 1 -/* C371AC 80240C7C 00031C00 */ sll $v1, $v1, 0x10 -/* C371B0 80240C80 00031B83 */ sra $v1, $v1, 0xe -/* C371B4 80240C84 A444008E */ sh $a0, 0x8e($v0) -/* C371B8 80240C88 3C018024 */ lui $at, 0x8024 -/* C371BC 80240C8C 00230821 */ addu $at, $at, $v1 -/* C371C0 80240C90 C4223560 */ lwc1 $f2, 0x3560($at) -/* C371C4 80240C94 8443008E */ lh $v1, 0x8e($v0) -/* C371C8 80240C98 46020000 */ add.s $f0, $f0, $f2 -/* C371CC 80240C9C 28630005 */ slti $v1, $v1, 5 -/* C371D0 80240CA0 14600003 */ bnez $v1, .L80240CB0 -/* C371D4 80240CA4 E440003C */ swc1 $f0, 0x3c($v0) -/* C371D8 80240CA8 2402000C */ addiu $v0, $zero, 0xc -/* C371DC 80240CAC AE020070 */ sw $v0, 0x70($s0) -.L80240CB0: -/* C371E0 80240CB0 8FBF0014 */ lw $ra, 0x14($sp) -/* C371E4 80240CB4 8FB00010 */ lw $s0, 0x10($sp) -/* C371E8 80240CB8 03E00008 */ jr $ra -/* C371EC 80240CBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_80240CC0_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_80240CC0_C36530.s deleted file mode 100644 index c2fdef28b1..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_80240CC0_C36530.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_C371F0 -/* C371F0 80240CC0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C371F4 80240CC4 AFB3001C */ sw $s3, 0x1c($sp) -/* C371F8 80240CC8 0080982D */ daddu $s3, $a0, $zero -/* C371FC 80240CCC AFBF0020 */ sw $ra, 0x20($sp) -/* C37200 80240CD0 AFB20018 */ sw $s2, 0x18($sp) -/* C37204 80240CD4 AFB10014 */ sw $s1, 0x14($sp) -/* C37208 80240CD8 AFB00010 */ sw $s0, 0x10($sp) -/* C3720C 80240CDC 8E720148 */ lw $s2, 0x148($s3) -/* C37210 80240CE0 86440008 */ lh $a0, 8($s2) -/* C37214 80240CE4 0C00EABB */ jal get_npc_unsafe -/* C37218 80240CE8 00A0802D */ daddu $s0, $a1, $zero -/* C3721C 80240CEC 0040882D */ daddu $s1, $v0, $zero -/* C37220 80240CF0 C6420080 */ lwc1 $f2, 0x80($s2) -/* C37224 80240CF4 468010A0 */ cvt.s.w $f2, $f2 -/* C37228 80240CF8 460010A1 */ cvt.d.s $f2, $f2 -/* C3722C 80240CFC C6400084 */ lwc1 $f0, 0x84($s2) -/* C37230 80240D00 46800020 */ cvt.s.w $f0, $f0 -/* C37234 80240D04 46000021 */ cvt.d.s $f0, $f0 -/* C37238 80240D08 3C014059 */ lui $at, 0x4059 -/* C3723C 80240D0C 44812800 */ mtc1 $at, $f5 -/* C37240 80240D10 44802000 */ mtc1 $zero, $f4 -/* C37244 80240D14 8E4200CC */ lw $v0, 0xcc($s2) -/* C37248 80240D18 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C3724C 80240D1C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C37250 80240D20 46241083 */ div.d $f2, $f2, $f4 -/* C37254 80240D24 462010A0 */ cvt.s.d $f2, $f2 -/* C37258 80240D28 46240003 */ div.d $f0, $f0, $f4 -/* C3725C 80240D2C 8C420020 */ lw $v0, 0x20($v0) -/* C37260 80240D30 46200020 */ cvt.s.d $f0, $f0 -/* C37264 80240D34 E622001C */ swc1 $f2, 0x1c($s1) -/* C37268 80240D38 E6200014 */ swc1 $f0, 0x14($s1) -/* C3726C 80240D3C AE220028 */ sw $v0, 0x28($s1) -/* C37270 80240D40 C6000018 */ lwc1 $f0, 0x18($s0) -/* C37274 80240D44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C37278 80240D48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3727C 80240D4C E6200018 */ swc1 $f0, 0x18($s1) -/* C37280 80240D50 8C460028 */ lw $a2, 0x28($v0) -/* C37284 80240D54 0C00A720 */ jal atan2 -/* C37288 80240D58 8C470030 */ lw $a3, 0x30($v0) -/* C3728C 80240D5C E620000C */ swc1 $f0, 0xc($s1) -/* C37290 80240D60 8E420018 */ lw $v0, 0x18($s2) -/* C37294 80240D64 AE400074 */ sw $zero, 0x74($s2) -/* C37298 80240D68 9442002A */ lhu $v0, 0x2a($v0) -/* C3729C 80240D6C 30420002 */ andi $v0, $v0, 2 -/* C372A0 80240D70 10400005 */ beqz $v0, .L80240D88 -/* C372A4 80240D74 24020003 */ addiu $v0, $zero, 3 -/* C372A8 80240D78 A622008E */ sh $v0, 0x8e($s1) -/* C372AC 80240D7C 2402000D */ addiu $v0, $zero, 0xd -/* C372B0 80240D80 08090376 */ j .L80240DD8 -/* C372B4 80240D84 AE620070 */ sw $v0, 0x70($s3) -.L80240D88: -/* C372B8 80240D88 24030001 */ addiu $v1, $zero, 1 -/* C372BC 80240D8C 2402000E */ addiu $v0, $zero, 0xe -/* C372C0 80240D90 A623008E */ sh $v1, 0x8e($s1) -/* C372C4 80240D94 AE620070 */ sw $v0, 0x70($s3) -/* C372C8 80240D98 C6200038 */ lwc1 $f0, 0x38($s1) -/* C372CC 80240D9C 4600018D */ trunc.w.s $f6, $f0 -/* C372D0 80240DA0 44023000 */ mfc1 $v0, $f6 -/* C372D4 80240DA4 00000000 */ nop -/* C372D8 80240DA8 A6420010 */ sh $v0, 0x10($s2) -/* C372DC 80240DAC C620003C */ lwc1 $f0, 0x3c($s1) -/* C372E0 80240DB0 4600018D */ trunc.w.s $f6, $f0 -/* C372E4 80240DB4 44023000 */ mfc1 $v0, $f6 -/* C372E8 80240DB8 00000000 */ nop -/* C372EC 80240DBC A6420012 */ sh $v0, 0x12($s2) -/* C372F0 80240DC0 C6200040 */ lwc1 $f0, 0x40($s1) -/* C372F4 80240DC4 A2430007 */ sb $v1, 7($s2) -/* C372F8 80240DC8 4600018D */ trunc.w.s $f6, $f0 -/* C372FC 80240DCC 44023000 */ mfc1 $v0, $f6 -/* C37300 80240DD0 00000000 */ nop -/* C37304 80240DD4 A6420014 */ sh $v0, 0x14($s2) -.L80240DD8: -/* C37308 80240DD8 8FBF0020 */ lw $ra, 0x20($sp) -/* C3730C 80240DDC 8FB3001C */ lw $s3, 0x1c($sp) -/* C37310 80240DE0 8FB20018 */ lw $s2, 0x18($sp) -/* C37314 80240DE4 8FB10014 */ lw $s1, 0x14($sp) -/* C37318 80240DE8 8FB00010 */ lw $s0, 0x10($sp) -/* C3731C 80240DEC 03E00008 */ jr $ra -/* C37320 80240DF0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_80240DF4_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_80240DF4_C36530.s deleted file mode 100644 index 2648e7b444..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_80240DF4_C36530.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF4_C37324 -/* C37324 80240DF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C37328 80240DF8 AFB00010 */ sw $s0, 0x10($sp) -/* C3732C 80240DFC 0080802D */ daddu $s0, $a0, $zero -/* C37330 80240E00 AFBF0014 */ sw $ra, 0x14($sp) -/* C37334 80240E04 8E020148 */ lw $v0, 0x148($s0) -/* C37338 80240E08 0C00EABB */ jal get_npc_unsafe -/* C3733C 80240E0C 84440008 */ lh $a0, 8($v0) -/* C37340 80240E10 0040202D */ daddu $a0, $v0, $zero -/* C37344 80240E14 8482008E */ lh $v0, 0x8e($a0) -/* C37348 80240E18 9483008E */ lhu $v1, 0x8e($a0) -/* C3734C 80240E1C 18400005 */ blez $v0, .L80240E34 -/* C37350 80240E20 2462FFFF */ addiu $v0, $v1, -1 -/* C37354 80240E24 A482008E */ sh $v0, 0x8e($a0) -/* C37358 80240E28 00021400 */ sll $v0, $v0, 0x10 -/* C3735C 80240E2C 1C400006 */ bgtz $v0, .L80240E48 -/* C37360 80240E30 00000000 */ nop -.L80240E34: -/* C37364 80240E34 8482008C */ lh $v0, 0x8c($a0) -/* C37368 80240E38 14400003 */ bnez $v0, .L80240E48 -/* C3736C 80240E3C 2402000E */ addiu $v0, $zero, 0xe -/* C37370 80240E40 A480008E */ sh $zero, 0x8e($a0) -/* C37374 80240E44 AE020070 */ sw $v0, 0x70($s0) -.L80240E48: -/* C37378 80240E48 8FBF0014 */ lw $ra, 0x14($sp) -/* C3737C 80240E4C 8FB00010 */ lw $s0, 0x10($sp) -/* C37380 80240E50 03E00008 */ jr $ra -/* C37384 80240E54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_80240E58_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_80240E58_C36530.s deleted file mode 100644 index 4c56e68b9b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_80240E58_C36530.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E58_C37388 -/* C37388 80240E58 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C3738C 80240E5C AFB20030 */ sw $s2, 0x30($sp) -/* C37390 80240E60 0080902D */ daddu $s2, $a0, $zero -/* C37394 80240E64 AFBF0038 */ sw $ra, 0x38($sp) -/* C37398 80240E68 AFB30034 */ sw $s3, 0x34($sp) -/* C3739C 80240E6C AFB1002C */ sw $s1, 0x2c($sp) -/* C373A0 80240E70 AFB00028 */ sw $s0, 0x28($sp) -/* C373A4 80240E74 F7B60048 */ sdc1 $f22, 0x48($sp) -/* C373A8 80240E78 F7B40040 */ sdc1 $f20, 0x40($sp) -/* C373AC 80240E7C 8E510148 */ lw $s1, 0x148($s2) -/* C373B0 80240E80 86240008 */ lh $a0, 8($s1) -/* C373B4 80240E84 0C00EABB */ jal get_npc_unsafe -/* C373B8 80240E88 00A0982D */ daddu $s3, $a1, $zero -/* C373BC 80240E8C 0040802D */ daddu $s0, $v0, $zero -/* C373C0 80240E90 0200202D */ daddu $a0, $s0, $zero -/* C373C4 80240E94 C6220088 */ lwc1 $f2, 0x88($s1) -/* C373C8 80240E98 468010A0 */ cvt.s.w $f2, $f2 -/* C373CC 80240E9C 460010A1 */ cvt.d.s $f2, $f2 -/* C373D0 80240EA0 C604001C */ lwc1 $f4, 0x1c($s0) -/* C373D4 80240EA4 C6000014 */ lwc1 $f0, 0x14($s0) -/* C373D8 80240EA8 8E050018 */ lw $a1, 0x18($s0) -/* C373DC 80240EAC 46002100 */ add.s $f4, $f4, $f0 -/* C373E0 80240EB0 8E06000C */ lw $a2, 0xc($s0) -/* C373E4 80240EB4 C6200078 */ lwc1 $f0, 0x78($s1) -/* C373E8 80240EB8 46800020 */ cvt.s.w $f0, $f0 -/* C373EC 80240EBC E604001C */ swc1 $f4, 0x1c($s0) -/* C373F0 80240EC0 3C014059 */ lui $at, 0x4059 -/* C373F4 80240EC4 44812800 */ mtc1 $at, $f5 -/* C373F8 80240EC8 44802000 */ mtc1 $zero, $f4 -/* C373FC 80240ECC 46000021 */ cvt.d.s $f0, $f0 -/* C37400 80240ED0 46240003 */ div.d $f0, $f0, $f4 -/* C37404 80240ED4 46200520 */ cvt.s.d $f20, $f0 -/* C37408 80240ED8 46241083 */ div.d $f2, $f2, $f4 -/* C3740C 80240EDC 0C00EA95 */ jal npc_move_heading -/* C37410 80240EE0 462015A0 */ cvt.s.d $f22, $f2 -/* C37414 80240EE4 C604001C */ lwc1 $f4, 0x1c($s0) -/* C37418 80240EE8 44801000 */ mtc1 $zero, $f2 -/* C3741C 80240EEC 44801800 */ mtc1 $zero, $f3 -/* C37420 80240EF0 46002021 */ cvt.d.s $f0, $f4 -/* C37424 80240EF4 4620103E */ c.le.d $f2, $f0 -/* C37428 80240EF8 00000000 */ nop -/* C3742C 80240EFC 45000030 */ bc1f .L80240FC0 -/* C37430 80240F00 00000000 */ nop -/* C37434 80240F04 C600003C */ lwc1 $f0, 0x3c($s0) -/* C37438 80240F08 46040000 */ add.s $f0, $f0, $f4 -/* C3743C 80240F0C E600003C */ swc1 $f0, 0x3c($s0) -/* C37440 80240F10 8E2200CC */ lw $v0, 0xcc($s1) -/* C37444 80240F14 8C420024 */ lw $v0, 0x24($v0) -/* C37448 80240F18 AE020028 */ sw $v0, 0x28($s0) -/* C3744C 80240F1C A2200007 */ sb $zero, 7($s1) -/* C37450 80240F20 8E020000 */ lw $v0, ($s0) -/* C37454 80240F24 30420008 */ andi $v0, $v0, 8 -/* C37458 80240F28 14400011 */ bnez $v0, .L80240F70 -/* C3745C 80240F2C 0000102D */ daddu $v0, $zero, $zero -/* C37460 80240F30 27A50018 */ addiu $a1, $sp, 0x18 -/* C37464 80240F34 27A6001C */ addiu $a2, $sp, 0x1c -/* C37468 80240F38 C6000038 */ lwc1 $f0, 0x38($s0) -/* C3746C 80240F3C C602003C */ lwc1 $f2, 0x3c($s0) -/* C37470 80240F40 C6040040 */ lwc1 $f4, 0x40($s0) -/* C37474 80240F44 3C01447A */ lui $at, 0x447a -/* C37478 80240F48 44813000 */ mtc1 $at, $f6 -/* C3747C 80240F4C 27A20024 */ addiu $v0, $sp, 0x24 -/* C37480 80240F50 E7A00018 */ swc1 $f0, 0x18($sp) -/* C37484 80240F54 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C37488 80240F58 E7A40020 */ swc1 $f4, 0x20($sp) -/* C3748C 80240F5C E7A60024 */ swc1 $f6, 0x24($sp) -/* C37490 80240F60 AFA20010 */ sw $v0, 0x10($sp) -/* C37494 80240F64 8E040080 */ lw $a0, 0x80($s0) -/* C37498 80240F68 0C0372DF */ jal func_800DCB7C -/* C3749C 80240F6C 27A70020 */ addiu $a3, $sp, 0x20 -.L80240F70: -/* C374A0 80240F70 1040000B */ beqz $v0, .L80240FA0 -/* C374A4 80240F74 00000000 */ nop -/* C374A8 80240F78 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C374AC 80240F7C 46140080 */ add.s $f2, $f0, $f20 -/* C374B0 80240F80 C600003C */ lwc1 $f0, 0x3c($s0) -/* C374B4 80240F84 4600103E */ c.le.s $f2, $f0 -/* C374B8 80240F88 00000000 */ nop -/* C374BC 80240F8C 4500008D */ bc1f .L802411C4 -/* C374C0 80240F90 00000000 */ nop -/* C374C4 80240F94 E602003C */ swc1 $f2, 0x3c($s0) -/* C374C8 80240F98 08090471 */ j .L802411C4 -/* C374CC 80240F9C AE400070 */ sw $zero, 0x70($s2) -.L80240FA0: -/* C374D0 80240FA0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C374D4 80240FA4 C6000064 */ lwc1 $f0, 0x64($s0) -/* C374D8 80240FA8 4602003E */ c.le.s $f0, $f2 -/* C374DC 80240FAC 00000000 */ nop -/* C374E0 80240FB0 45030084 */ bc1tl .L802411C4 -/* C374E4 80240FB4 AE400070 */ sw $zero, 0x70($s2) -/* C374E8 80240FB8 08090471 */ j .L802411C4 -/* C374EC 80240FBC 00000000 */ nop -.L80240FC0: -/* C374F0 80240FC0 4622003C */ c.lt.d $f0, $f2 -/* C374F4 80240FC4 00000000 */ nop -/* C374F8 80240FC8 4500007E */ bc1f .L802411C4 -/* C374FC 80240FCC 00000000 */ nop -/* C37500 80240FD0 9602008E */ lhu $v0, 0x8e($s0) -/* C37504 80240FD4 24420001 */ addiu $v0, $v0, 1 -/* C37508 80240FD8 A602008E */ sh $v0, 0x8e($s0) -/* C3750C 80240FDC 00021400 */ sll $v0, $v0, 0x10 -/* C37510 80240FE0 8E630020 */ lw $v1, 0x20($s3) -/* C37514 80240FE4 00021403 */ sra $v0, $v0, 0x10 -/* C37518 80240FE8 0043102A */ slt $v0, $v0, $v1 -/* C3751C 80240FEC 14400026 */ bnez $v0, .L80241088 -/* C37520 80240FF0 00000000 */ nop -/* C37524 80240FF4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C37528 80240FF8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3752C 80240FFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C37530 80241000 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C37534 80241004 A600008E */ sh $zero, 0x8e($s0) -/* C37538 80241008 8C460028 */ lw $a2, 0x28($v0) -/* C3753C 8024100C 0C00A720 */ jal atan2 -/* C37540 80241010 8C470030 */ lw $a3, 0x30($v0) -/* C37544 80241014 46000506 */ mov.s $f20, $f0 -/* C37548 80241018 C60C000C */ lwc1 $f12, 0xc($s0) -/* C3754C 8024101C 0C00A70A */ jal get_clamped_angle_diff -/* C37550 80241020 4600A386 */ mov.s $f14, $f20 -/* C37554 80241024 46000086 */ mov.s $f2, $f0 -/* C37558 80241028 8E62001C */ lw $v0, 0x1c($s3) -/* C3755C 8024102C 46001005 */ abs.s $f0, $f2 -/* C37560 80241030 44822000 */ mtc1 $v0, $f4 -/* C37564 80241034 00000000 */ nop -/* C37568 80241038 46802120 */ cvt.s.w $f4, $f4 -/* C3756C 8024103C 4600203C */ c.lt.s $f4, $f0 -/* C37570 80241040 00000000 */ nop -/* C37574 80241044 4500000D */ bc1f .L8024107C -/* C37578 80241048 00000000 */ nop -/* C3757C 8024104C 44800000 */ mtc1 $zero, $f0 -/* C37580 80241050 C614000C */ lwc1 $f20, 0xc($s0) -/* C37584 80241054 4600103C */ c.lt.s $f2, $f0 -/* C37588 80241058 00000000 */ nop -/* C3758C 8024105C 45000006 */ bc1f .L80241078 -/* C37590 80241060 00021023 */ negu $v0, $v0 -/* C37594 80241064 44820000 */ mtc1 $v0, $f0 -/* C37598 80241068 00000000 */ nop -/* C3759C 8024106C 46800020 */ cvt.s.w $f0, $f0 -/* C375A0 80241070 0809041F */ j .L8024107C -/* C375A4 80241074 4600A500 */ add.s $f20, $f20, $f0 -.L80241078: -/* C375A8 80241078 4604A500 */ add.s $f20, $f20, $f4 -.L8024107C: -/* C375AC 8024107C 0C00A6C9 */ jal clamp_angle -/* C375B0 80241080 4600A306 */ mov.s $f12, $f20 -/* C375B4 80241084 E600000C */ swc1 $f0, 0xc($s0) -.L80241088: -/* C375B8 80241088 8E020000 */ lw $v0, ($s0) -/* C375BC 8024108C 30420008 */ andi $v0, $v0, 8 -/* C375C0 80241090 1040000A */ beqz $v0, .L802410BC -/* C375C4 80241094 27A50018 */ addiu $a1, $sp, 0x18 -/* C375C8 80241098 C602003C */ lwc1 $f2, 0x3c($s0) -/* C375CC 8024109C C600001C */ lwc1 $f0, 0x1c($s0) -/* C375D0 802410A0 46001080 */ add.s $f2, $f2, $f0 -/* C375D4 802410A4 4616103C */ c.lt.s $f2, $f22 -/* C375D8 802410A8 00000000 */ nop -/* C375DC 802410AC 45020045 */ bc1fl .L802411C4 -/* C375E0 802410B0 E602003C */ swc1 $f2, 0x3c($s0) -/* C375E4 802410B4 08090470 */ j .L802411C0 -/* C375E8 802410B8 E616003C */ swc1 $f22, 0x3c($s0) -.L802410BC: -/* C375EC 802410BC C6000038 */ lwc1 $f0, 0x38($s0) -/* C375F0 802410C0 27A6001C */ addiu $a2, $sp, 0x1c -/* C375F4 802410C4 E7A00018 */ swc1 $f0, 0x18($sp) -/* C375F8 802410C8 860200A8 */ lh $v0, 0xa8($s0) -/* C375FC 802410CC C600001C */ lwc1 $f0, 0x1c($s0) -/* C37600 802410D0 C604003C */ lwc1 $f4, 0x3c($s0) -/* C37604 802410D4 44821000 */ mtc1 $v0, $f2 -/* C37608 802410D8 00000000 */ nop -/* C3760C 802410DC 468010A0 */ cvt.s.w $f2, $f2 -/* C37610 802410E0 46000005 */ abs.s $f0, $f0 -/* C37614 802410E4 46020000 */ add.s $f0, $f0, $f2 -/* C37618 802410E8 C6060040 */ lwc1 $f6, 0x40($s0) -/* C3761C 802410EC 27A20024 */ addiu $v0, $sp, 0x24 -/* C37620 802410F0 46022100 */ add.s $f4, $f4, $f2 -/* C37624 802410F4 3C014024 */ lui $at, 0x4024 -/* C37628 802410F8 44811800 */ mtc1 $at, $f3 -/* C3762C 802410FC 44801000 */ mtc1 $zero, $f2 -/* C37630 80241100 46000021 */ cvt.d.s $f0, $f0 -/* C37634 80241104 46220000 */ add.d $f0, $f0, $f2 -/* C37638 80241108 E7A60020 */ swc1 $f6, 0x20($sp) -/* C3763C 8024110C E7A4001C */ swc1 $f4, 0x1c($sp) -/* C37640 80241110 46200020 */ cvt.s.d $f0, $f0 -/* C37644 80241114 E7A00024 */ swc1 $f0, 0x24($sp) -/* C37648 80241118 AFA20010 */ sw $v0, 0x10($sp) -/* C3764C 8024111C 8E040080 */ lw $a0, 0x80($s0) -/* C37650 80241120 0C0372DF */ jal func_800DCB7C -/* C37654 80241124 27A70020 */ addiu $a3, $sp, 0x20 -/* C37658 80241128 10400015 */ beqz $v0, .L80241180 -/* C3765C 8024112C 00000000 */ nop -/* C37660 80241130 860200A8 */ lh $v0, 0xa8($s0) -/* C37664 80241134 C604001C */ lwc1 $f4, 0x1c($s0) -/* C37668 80241138 44820000 */ mtc1 $v0, $f0 -/* C3766C 8024113C 00000000 */ nop -/* C37670 80241140 46800020 */ cvt.s.w $f0, $f0 -/* C37674 80241144 46002085 */ abs.s $f2, $f4 -/* C37678 80241148 46020000 */ add.s $f0, $f0, $f2 -/* C3767C 8024114C C7A20024 */ lwc1 $f2, 0x24($sp) -/* C37680 80241150 4600103E */ c.le.s $f2, $f0 -/* C37684 80241154 00000000 */ nop -/* C37688 80241158 45000005 */ bc1f .L80241170 -/* C3768C 8024115C 00000000 */ nop -/* C37690 80241160 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C37694 80241164 AE00001C */ sw $zero, 0x1c($s0) -/* C37698 80241168 08090471 */ j .L802411C4 -/* C3769C 8024116C E600003C */ swc1 $f0, 0x3c($s0) -.L80241170: -/* C376A0 80241170 C600003C */ lwc1 $f0, 0x3c($s0) -/* C376A4 80241174 46040000 */ add.s $f0, $f0, $f4 -/* C376A8 80241178 08090471 */ j .L802411C4 -/* C376AC 8024117C E600003C */ swc1 $f0, 0x3c($s0) -.L80241180: -/* C376B0 80241180 C606003C */ lwc1 $f6, 0x3c($s0) -/* C376B4 80241184 860200A8 */ lh $v0, 0xa8($s0) -/* C376B8 80241188 46163081 */ sub.s $f2, $f6, $f22 -/* C376BC 8024118C 44820000 */ mtc1 $v0, $f0 -/* C376C0 80241190 00000000 */ nop -/* C376C4 80241194 46800020 */ cvt.s.w $f0, $f0 -/* C376C8 80241198 46001080 */ add.s $f2, $f2, $f0 -/* C376CC 8024119C C604001C */ lwc1 $f4, 0x1c($s0) -/* C376D0 802411A0 46002005 */ abs.s $f0, $f4 -/* C376D4 802411A4 4602003C */ c.lt.s $f0, $f2 -/* C376D8 802411A8 00000000 */ nop -/* C376DC 802411AC 45020005 */ bc1fl .L802411C4 -/* C376E0 802411B0 AE00001C */ sw $zero, 0x1c($s0) -/* C376E4 802411B4 46043000 */ add.s $f0, $f6, $f4 -/* C376E8 802411B8 08090471 */ j .L802411C4 -/* C376EC 802411BC E600003C */ swc1 $f0, 0x3c($s0) -.L802411C0: -/* C376F0 802411C0 AE00001C */ sw $zero, 0x1c($s0) -.L802411C4: -/* C376F4 802411C4 8FBF0038 */ lw $ra, 0x38($sp) -/* C376F8 802411C8 8FB30034 */ lw $s3, 0x34($sp) -/* C376FC 802411CC 8FB20030 */ lw $s2, 0x30($sp) -/* C37700 802411D0 8FB1002C */ lw $s1, 0x2c($sp) -/* C37704 802411D4 8FB00028 */ lw $s0, 0x28($sp) -/* C37708 802411D8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* C3770C 802411DC D7B40040 */ ldc1 $f20, 0x40($sp) -/* C37710 802411E0 03E00008 */ jr $ra -/* C37714 802411E4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_802411E8_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_802411E8_C36530.s deleted file mode 100644 index 67916706c7..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_802411E8_C36530.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411E8_C37718 -/* C37718 802411E8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C3771C 802411EC AFB00028 */ sw $s0, 0x28($sp) -/* C37720 802411F0 00A0802D */ daddu $s0, $a1, $zero -/* C37724 802411F4 AFB1002C */ sw $s1, 0x2c($sp) -/* C37728 802411F8 00C0882D */ daddu $s1, $a2, $zero -/* C3772C 802411FC AFBF0034 */ sw $ra, 0x34($sp) -/* C37730 80241200 AFB20030 */ sw $s2, 0x30($sp) -/* C37734 80241204 AE200070 */ sw $zero, 0x70($s1) -/* C37738 80241208 8C830000 */ lw $v1, ($a0) -/* C3773C 8024120C 2402FDFF */ addiu $v0, $zero, -0x201 -/* C37740 80241210 A480008E */ sh $zero, 0x8e($a0) -/* C37744 80241214 00621824 */ and $v1, $v1, $v0 -/* C37748 80241218 34650800 */ ori $a1, $v1, 0x800 -/* C3774C 8024121C AC850000 */ sw $a1, ($a0) -/* C37750 80241220 8E0200D0 */ lw $v0, 0xd0($s0) -/* C37754 80241224 8C420034 */ lw $v0, 0x34($v0) -/* C37758 80241228 10400003 */ beqz $v0, .L80241238 -/* C3775C 8024122C 00E0902D */ daddu $s2, $a3, $zero -/* C37760 80241230 08090490 */ j .L80241240 -/* C37764 80241234 34620808 */ ori $v0, $v1, 0x808 -.L80241238: -/* C37768 80241238 2402FFF7 */ addiu $v0, $zero, -9 -/* C3776C 8024123C 00A21024 */ and $v0, $a1, $v0 -.L80241240: -/* C37770 80241240 AC820000 */ sw $v0, ($a0) -/* C37774 80241244 27A20024 */ addiu $v0, $sp, 0x24 -/* C37778 80241248 27A50018 */ addiu $a1, $sp, 0x18 -/* C3777C 8024124C C4800038 */ lwc1 $f0, 0x38($a0) -/* C37780 80241250 C482003C */ lwc1 $f2, 0x3c($a0) -/* C37784 80241254 C4840040 */ lwc1 $f4, 0x40($a0) -/* C37788 80241258 3C01447A */ lui $at, 0x447a -/* C3778C 8024125C 44813000 */ mtc1 $at, $f6 -/* C37790 80241260 27A6001C */ addiu $a2, $sp, 0x1c -/* C37794 80241264 E7A00018 */ swc1 $f0, 0x18($sp) -/* C37798 80241268 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C3779C 8024126C E7A40020 */ swc1 $f4, 0x20($sp) -/* C377A0 80241270 E7A60024 */ swc1 $f6, 0x24($sp) -/* C377A4 80241274 AFA20010 */ sw $v0, 0x10($sp) -/* C377A8 80241278 8C840080 */ lw $a0, 0x80($a0) -/* C377AC 8024127C 0C0372DF */ jal func_800DCB7C -/* C377B0 80241280 27A70020 */ addiu $a3, $sp, 0x20 -/* C377B4 80241284 C7A20024 */ lwc1 $f2, 0x24($sp) -/* C377B8 80241288 3C014059 */ lui $at, 0x4059 -/* C377BC 8024128C 44812800 */ mtc1 $at, $f5 -/* C377C0 80241290 44802000 */ mtc1 $zero, $f4 -/* C377C4 80241294 460010A1 */ cvt.d.s $f2, $f2 -/* C377C8 80241298 46241082 */ mul.d $f2, $f2, $f4 -/* C377CC 8024129C 00000000 */ nop -/* C377D0 802412A0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C377D4 802412A4 46000021 */ cvt.d.s $f0, $f0 -/* C377D8 802412A8 46240002 */ mul.d $f0, $f0, $f4 -/* C377DC 802412AC 00000000 */ nop -/* C377E0 802412B0 3C013FE0 */ lui $at, 0x3fe0 -/* C377E4 802412B4 44812800 */ mtc1 $at, $f5 -/* C377E8 802412B8 44802000 */ mtc1 $zero, $f4 -/* C377EC 802412BC 00000000 */ nop -/* C377F0 802412C0 46241080 */ add.d $f2, $f2, $f4 -/* C377F4 802412C4 AE000074 */ sw $zero, 0x74($s0) -/* C377F8 802412C8 46240000 */ add.d $f0, $f0, $f4 -/* C377FC 802412CC AE000090 */ sw $zero, 0x90($s0) -/* C37800 802412D0 4620120D */ trunc.w.d $f8, $f2 -/* C37804 802412D4 E6080078 */ swc1 $f8, 0x78($s0) -/* C37808 802412D8 4620020D */ trunc.w.d $f8, $f0 -/* C3780C 802412DC E6080088 */ swc1 $f8, 0x88($s0) -/* C37810 802412E0 8E420014 */ lw $v0, 0x14($s2) -/* C37814 802412E4 AE220074 */ sw $v0, 0x74($s1) -/* C37818 802412E8 8E0200B0 */ lw $v0, 0xb0($s0) -/* C3781C 802412EC 34420010 */ ori $v0, $v0, 0x10 -/* C37820 802412F0 AE0200B0 */ sw $v0, 0xb0($s0) -/* C37824 802412F4 8FBF0034 */ lw $ra, 0x34($sp) -/* C37828 802412F8 8FB20030 */ lw $s2, 0x30($sp) -/* C3782C 802412FC 8FB1002C */ lw $s1, 0x2c($sp) -/* C37830 80241300 8FB00028 */ lw $s0, 0x28($sp) -/* C37834 80241304 03E00008 */ jr $ra -/* C37838 80241308 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_8024130C_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_8024130C_C36530.s deleted file mode 100644 index d4315cec8d..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_8024130C_C36530.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024130C_C3783C -/* C3783C 8024130C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C37840 80241310 AFB40040 */ sw $s4, 0x40($sp) -/* C37844 80241314 0080A02D */ daddu $s4, $a0, $zero -/* C37848 80241318 AFBF0048 */ sw $ra, 0x48($sp) -/* C3784C 8024131C AFB50044 */ sw $s5, 0x44($sp) -/* C37850 80241320 AFB3003C */ sw $s3, 0x3c($sp) -/* C37854 80241324 AFB20038 */ sw $s2, 0x38($sp) -/* C37858 80241328 AFB10034 */ sw $s1, 0x34($sp) -/* C3785C 8024132C AFB00030 */ sw $s0, 0x30($sp) -/* C37860 80241330 8E920148 */ lw $s2, 0x148($s4) -/* C37864 80241334 86440008 */ lh $a0, 8($s2) -/* C37868 80241338 8E90000C */ lw $s0, 0xc($s4) -/* C3786C 8024133C 0C00EABB */ jal get_npc_unsafe -/* C37870 80241340 00A0882D */ daddu $s1, $a1, $zero -/* C37874 80241344 0280202D */ daddu $a0, $s4, $zero -/* C37878 80241348 8E050000 */ lw $a1, ($s0) -/* C3787C 8024134C 0C0B1EAF */ jal get_variable -/* C37880 80241350 0040A82D */ daddu $s5, $v0, $zero -/* C37884 80241354 AFA00010 */ sw $zero, 0x10($sp) -/* C37888 80241358 8E4300D0 */ lw $v1, 0xd0($s2) -/* C3788C 8024135C 8C630030 */ lw $v1, 0x30($v1) -/* C37890 80241360 AFA30014 */ sw $v1, 0x14($sp) -/* C37894 80241364 8E4300D0 */ lw $v1, 0xd0($s2) -/* C37898 80241368 8C63001C */ lw $v1, 0x1c($v1) -/* C3789C 8024136C AFA30018 */ sw $v1, 0x18($sp) -/* C378A0 80241370 8E4300D0 */ lw $v1, 0xd0($s2) -/* C378A4 80241374 8C630024 */ lw $v1, 0x24($v1) -/* C378A8 80241378 AFA3001C */ sw $v1, 0x1c($sp) -/* C378AC 8024137C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C378B0 80241380 8C630028 */ lw $v1, 0x28($v1) -/* C378B4 80241384 27B30010 */ addiu $s3, $sp, 0x10 -/* C378B8 80241388 AFA30020 */ sw $v1, 0x20($sp) -/* C378BC 8024138C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C378C0 80241390 3C0142F0 */ lui $at, 0x42f0 -/* C378C4 80241394 44810000 */ mtc1 $at, $f0 -/* C378C8 80241398 8C63002C */ lw $v1, 0x2c($v1) -/* C378CC 8024139C 0040802D */ daddu $s0, $v0, $zero -/* C378D0 802413A0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C378D4 802413A4 A7A0002C */ sh $zero, 0x2c($sp) -/* C378D8 802413A8 12200006 */ beqz $s1, .L802413C4 -/* C378DC 802413AC AFA30024 */ sw $v1, 0x24($sp) -/* C378E0 802413B0 02A0202D */ daddu $a0, $s5, $zero -/* C378E4 802413B4 0240282D */ daddu $a1, $s2, $zero -/* C378E8 802413B8 0280302D */ daddu $a2, $s4, $zero -/* C378EC 802413BC 0C09047A */ jal func_802411E8 -/* C378F0 802413C0 0200382D */ daddu $a3, $s0, $zero -.L802413C4: -/* C378F4 802413C4 2402FFFE */ addiu $v0, $zero, -2 -/* C378F8 802413C8 A2A200AB */ sb $v0, 0xab($s5) -/* C378FC 802413CC 8E4300B0 */ lw $v1, 0xb0($s2) -/* C37900 802413D0 30620004 */ andi $v0, $v1, 4 -/* C37904 802413D4 10400007 */ beqz $v0, .L802413F4 -/* C37908 802413D8 00000000 */ nop -/* C3790C 802413DC 824200B4 */ lb $v0, 0xb4($s2) -/* C37910 802413E0 1440003C */ bnez $v0, .L802414D4 -/* C37914 802413E4 0000102D */ daddu $v0, $zero, $zero -/* C37918 802413E8 2402FFFB */ addiu $v0, $zero, -5 -/* C3791C 802413EC 00621024 */ and $v0, $v1, $v0 -/* C37920 802413F0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802413F4: -/* C37924 802413F4 8E830070 */ lw $v1, 0x70($s4) -/* C37928 802413F8 2C62000F */ sltiu $v0, $v1, 0xf -/* C3792C 802413FC 10400034 */ beqz $v0, .L802414D0 -/* C37930 80241400 00031080 */ sll $v0, $v1, 2 -/* C37934 80241404 3C018024 */ lui $at, 0x8024 -/* C37938 80241408 00220821 */ addu $at, $at, $v0 -/* C3793C 8024140C 8C224408 */ lw $v0, 0x4408($at) -/* C37940 80241410 00400008 */ jr $v0 -/* C37944 80241414 00000000 */ nop -/* C37948 80241418 0280202D */ daddu $a0, $s4, $zero -/* C3794C 8024141C 0200282D */ daddu $a1, $s0, $zero -/* C37950 80241420 0C090000 */ jal func_80240000 -/* C37954 80241424 0260302D */ daddu $a2, $s3, $zero -/* C37958 80241428 0280202D */ daddu $a0, $s4, $zero -/* C3795C 8024142C 0200282D */ daddu $a1, $s0, $zero -/* C37960 80241430 0C09006C */ jal func_802401B0 -/* C37964 80241434 0260302D */ daddu $a2, $s3, $zero -/* C37968 80241438 08090535 */ j .L802414D4 -/* C3796C 8024143C 0000102D */ daddu $v0, $zero, $zero -/* C37970 80241440 0280202D */ daddu $a0, $s4, $zero -/* C37974 80241444 0200282D */ daddu $a1, $s0, $zero -/* C37978 80241448 0C0901F6 */ jal func_802407D8 -/* C3797C 8024144C 0260302D */ daddu $a2, $s3, $zero -/* C37980 80241450 0280202D */ daddu $a0, $s4, $zero -/* C37984 80241454 0200282D */ daddu $a1, $s0, $zero -/* C37988 80241458 0C090226 */ jal func_80240898 -/* C3798C 8024145C 0260302D */ daddu $a2, $s3, $zero -/* C37990 80241460 08090535 */ j .L802414D4 -/* C37994 80241464 0000102D */ daddu $v0, $zero, $zero -/* C37998 80241468 0280202D */ daddu $a0, $s4, $zero -/* C3799C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* C379A0 80241470 0C0902F7 */ jal func_80240BDC -/* C379A4 80241474 0260302D */ daddu $a2, $s3, $zero -/* C379A8 80241478 0280202D */ daddu $a0, $s4, $zero -/* C379AC 8024147C 0200282D */ daddu $a1, $s0, $zero -/* C379B0 80241480 0C090315 */ jal func_80240C54 -/* C379B4 80241484 0260302D */ daddu $a2, $s3, $zero -/* C379B8 80241488 08090535 */ j .L802414D4 -/* C379BC 8024148C 0000102D */ daddu $v0, $zero, $zero -/* C379C0 80241490 0280202D */ daddu $a0, $s4, $zero -/* C379C4 80241494 0200282D */ daddu $a1, $s0, $zero -/* C379C8 80241498 0C090330 */ jal func_80240CC0 -/* C379CC 8024149C 0260302D */ daddu $a2, $s3, $zero -/* C379D0 802414A0 08090535 */ j .L802414D4 -/* C379D4 802414A4 0000102D */ daddu $v0, $zero, $zero -/* C379D8 802414A8 0280202D */ daddu $a0, $s4, $zero -/* C379DC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* C379E0 802414B0 0C09037D */ jal func_80240DF4 -/* C379E4 802414B4 0260302D */ daddu $a2, $s3, $zero -/* C379E8 802414B8 08090535 */ j .L802414D4 -/* C379EC 802414BC 0000102D */ daddu $v0, $zero, $zero -/* C379F0 802414C0 0280202D */ daddu $a0, $s4, $zero -/* C379F4 802414C4 0200282D */ daddu $a1, $s0, $zero -/* C379F8 802414C8 0C090396 */ jal func_80240E58 -/* C379FC 802414CC 0260302D */ daddu $a2, $s3, $zero -.L802414D0: -/* C37A00 802414D0 0000102D */ daddu $v0, $zero, $zero -.L802414D4: -/* C37A04 802414D4 8FBF0048 */ lw $ra, 0x48($sp) -/* C37A08 802414D8 8FB50044 */ lw $s5, 0x44($sp) -/* C37A0C 802414DC 8FB40040 */ lw $s4, 0x40($sp) -/* C37A10 802414E0 8FB3003C */ lw $s3, 0x3c($sp) -/* C37A14 802414E4 8FB20038 */ lw $s2, 0x38($sp) -/* C37A18 802414E8 8FB10034 */ lw $s1, 0x34($sp) -/* C37A1C 802414EC 8FB00030 */ lw $s0, 0x30($sp) -/* C37A20 802414F0 03E00008 */ jr $ra -/* C37A24 802414F4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_802414F8_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_802414F8_C36530.s deleted file mode 100644 index 60b602905b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_802414F8_C36530.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414F8_C37A28 -/* C37A28 802414F8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C37A2C 802414FC AFB3001C */ sw $s3, 0x1c($sp) -/* C37A30 80241500 0080982D */ daddu $s3, $a0, $zero -/* C37A34 80241504 AFBF0020 */ sw $ra, 0x20($sp) -/* C37A38 80241508 AFB20018 */ sw $s2, 0x18($sp) -/* C37A3C 8024150C AFB10014 */ sw $s1, 0x14($sp) -/* C37A40 80241510 AFB00010 */ sw $s0, 0x10($sp) -/* C37A44 80241514 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C37A48 80241518 8E720148 */ lw $s2, 0x148($s3) -/* C37A4C 8024151C 86440008 */ lh $a0, 8($s2) -/* C37A50 80241520 0C00EABB */ jal get_npc_unsafe -/* C37A54 80241524 00A0882D */ daddu $s1, $a1, $zero -/* C37A58 80241528 0040802D */ daddu $s0, $v0, $zero -/* C37A5C 8024152C 9602008E */ lhu $v0, 0x8e($s0) -/* C37A60 80241530 2442FFFF */ addiu $v0, $v0, -1 -/* C37A64 80241534 A602008E */ sh $v0, 0x8e($s0) -/* C37A68 80241538 00021400 */ sll $v0, $v0, 0x10 -/* C37A6C 8024153C 1C40003C */ bgtz $v0, .L80241630 -/* C37A70 80241540 3C03FFDF */ lui $v1, 0xffdf -/* C37A74 80241544 8E020000 */ lw $v0, ($s0) -/* C37A78 80241548 3463FFFF */ ori $v1, $v1, 0xffff -/* C37A7C 8024154C 00431024 */ and $v0, $v0, $v1 -/* C37A80 80241550 AE020000 */ sw $v0, ($s0) -/* C37A84 80241554 8E240020 */ lw $a0, 0x20($s1) -/* C37A88 80241558 000417C2 */ srl $v0, $a0, 0x1f -/* C37A8C 8024155C 00822021 */ addu $a0, $a0, $v0 -/* C37A90 80241560 00042043 */ sra $a0, $a0, 1 -/* C37A94 80241564 0C00A67F */ jal rand_int -/* C37A98 80241568 24840001 */ addiu $a0, $a0, 1 -/* C37A9C 8024156C 8E230020 */ lw $v1, 0x20($s1) -/* C37AA0 80241570 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C37AA4 80241574 000327C2 */ srl $a0, $v1, 0x1f -/* C37AA8 80241578 00641821 */ addu $v1, $v1, $a0 -/* C37AAC 8024157C 00031843 */ sra $v1, $v1, 1 -/* C37AB0 80241580 00621821 */ addu $v1, $v1, $v0 -/* C37AB4 80241584 A603008E */ sh $v1, 0x8e($s0) -/* C37AB8 80241588 8E4200CC */ lw $v0, 0xcc($s2) -/* C37ABC 8024158C C60E0040 */ lwc1 $f14, 0x40($s0) -/* C37AC0 80241590 8C420020 */ lw $v0, 0x20($v0) -/* C37AC4 80241594 AE020028 */ sw $v0, 0x28($s0) -/* C37AC8 80241598 C6200018 */ lwc1 $f0, 0x18($s1) -/* C37ACC 8024159C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C37AD0 802415A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C37AD4 802415A4 E6000018 */ swc1 $f0, 0x18($s0) -/* C37AD8 802415A8 8C460028 */ lw $a2, 0x28($v0) -/* C37ADC 802415AC 0C00A720 */ jal atan2 -/* C37AE0 802415B0 8C470030 */ lw $a3, 0x30($v0) -/* C37AE4 802415B4 46000506 */ mov.s $f20, $f0 -/* C37AE8 802415B8 C60C000C */ lwc1 $f12, 0xc($s0) -/* C37AEC 802415BC 0C00A70A */ jal get_clamped_angle_diff -/* C37AF0 802415C0 4600A386 */ mov.s $f14, $f20 -/* C37AF4 802415C4 46000086 */ mov.s $f2, $f0 -/* C37AF8 802415C8 8E22001C */ lw $v0, 0x1c($s1) -/* C37AFC 802415CC 46001005 */ abs.s $f0, $f2 -/* C37B00 802415D0 44822000 */ mtc1 $v0, $f4 -/* C37B04 802415D4 00000000 */ nop -/* C37B08 802415D8 46802120 */ cvt.s.w $f4, $f4 -/* C37B0C 802415DC 4600203C */ c.lt.s $f4, $f0 -/* C37B10 802415E0 00000000 */ nop -/* C37B14 802415E4 4500000D */ bc1f .L8024161C -/* C37B18 802415E8 00000000 */ nop -/* C37B1C 802415EC 44800000 */ mtc1 $zero, $f0 -/* C37B20 802415F0 C614000C */ lwc1 $f20, 0xc($s0) -/* C37B24 802415F4 4600103C */ c.lt.s $f2, $f0 -/* C37B28 802415F8 00000000 */ nop -/* C37B2C 802415FC 45000006 */ bc1f .L80241618 -/* C37B30 80241600 00021023 */ negu $v0, $v0 -/* C37B34 80241604 44820000 */ mtc1 $v0, $f0 -/* C37B38 80241608 00000000 */ nop -/* C37B3C 8024160C 46800020 */ cvt.s.w $f0, $f0 -/* C37B40 80241610 08090587 */ j .L8024161C -/* C37B44 80241614 4600A500 */ add.s $f20, $f20, $f0 -.L80241618: -/* C37B48 80241618 4604A500 */ add.s $f20, $f20, $f4 -.L8024161C: -/* C37B4C 8024161C 0C00A6C9 */ jal clamp_angle -/* C37B50 80241620 4600A306 */ mov.s $f12, $f20 -/* C37B54 80241624 2402000D */ addiu $v0, $zero, 0xd -/* C37B58 80241628 E600000C */ swc1 $f0, 0xc($s0) -/* C37B5C 8024162C AE620070 */ sw $v0, 0x70($s3) -.L80241630: -/* C37B60 80241630 8FBF0020 */ lw $ra, 0x20($sp) -/* C37B64 80241634 8FB3001C */ lw $s3, 0x1c($sp) -/* C37B68 80241638 8FB20018 */ lw $s2, 0x18($sp) -/* C37B6C 8024163C 8FB10014 */ lw $s1, 0x14($sp) -/* C37B70 80241640 8FB00010 */ lw $s0, 0x10($sp) -/* C37B74 80241644 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C37B78 80241648 03E00008 */ jr $ra -/* C37B7C 8024164C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_80241650_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_80241650_C36530.s deleted file mode 100644 index 8503a37bef..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_80241650_C36530.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241650_C37B80 -/* C37B80 80241650 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C37B84 80241654 AFB30024 */ sw $s3, 0x24($sp) -/* C37B88 80241658 0080982D */ daddu $s3, $a0, $zero -/* C37B8C 8024165C AFBF0028 */ sw $ra, 0x28($sp) -/* C37B90 80241660 AFB20020 */ sw $s2, 0x20($sp) -/* C37B94 80241664 AFB1001C */ sw $s1, 0x1c($sp) -/* C37B98 80241668 AFB00018 */ sw $s0, 0x18($sp) -/* C37B9C 8024166C 8E700148 */ lw $s0, 0x148($s3) -/* C37BA0 80241670 00A0902D */ daddu $s2, $a1, $zero -/* C37BA4 80241674 86040008 */ lh $a0, 8($s0) -/* C37BA8 80241678 0C00EABB */ jal get_npc_unsafe -/* C37BAC 8024167C 00C0882D */ daddu $s1, $a2, $zero -/* C37BB0 80241680 0220202D */ daddu $a0, $s1, $zero -/* C37BB4 80241684 0200282D */ daddu $a1, $s0, $zero -/* C37BB8 80241688 24030001 */ addiu $v1, $zero, 1 -/* C37BBC 8024168C AFA30010 */ sw $v1, 0x10($sp) -/* C37BC0 80241690 8E460024 */ lw $a2, 0x24($s2) -/* C37BC4 80241694 8E470028 */ lw $a3, 0x28($s2) -/* C37BC8 80241698 0C01242D */ jal func_800490B4 -/* C37BCC 8024169C 0040802D */ daddu $s0, $v0, $zero -/* C37BD0 802416A0 10400024 */ beqz $v0, .L80241734 -/* C37BD4 802416A4 24020010 */ addiu $v0, $zero, 0x10 -/* C37BD8 802416A8 8E050018 */ lw $a1, 0x18($s0) -/* C37BDC 802416AC 8E06000C */ lw $a2, 0xc($s0) -/* C37BE0 802416B0 0C00EA95 */ jal npc_move_heading -/* C37BE4 802416B4 0200202D */ daddu $a0, $s0, $zero -/* C37BE8 802416B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C37BEC 802416BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C37BF0 802416C0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C37BF4 802416C4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C37BF8 802416C8 8C460028 */ lw $a2, 0x28($v0) -/* C37BFC 802416CC 0C00A7B5 */ jal dist2D -/* C37C00 802416D0 8C470030 */ lw $a3, 0x30($v0) -/* C37C04 802416D4 C6020018 */ lwc1 $f2, 0x18($s0) -/* C37C08 802416D8 3C014004 */ lui $at, 0x4004 -/* C37C0C 802416DC 44812800 */ mtc1 $at, $f5 -/* C37C10 802416E0 44802000 */ mtc1 $zero, $f4 -/* C37C14 802416E4 460010A1 */ cvt.d.s $f2, $f2 -/* C37C18 802416E8 46241082 */ mul.d $f2, $f2, $f4 -/* C37C1C 802416EC 00000000 */ nop -/* C37C20 802416F0 46000021 */ cvt.d.s $f0, $f0 -/* C37C24 802416F4 4622003E */ c.le.d $f0, $f2 -/* C37C28 802416F8 00000000 */ nop -/* C37C2C 802416FC 45000003 */ bc1f .L8024170C -/* C37C30 80241700 2402000E */ addiu $v0, $zero, 0xe -/* C37C34 80241704 080905CD */ j .L80241734 -/* C37C38 80241708 A600008E */ sh $zero, 0x8e($s0) -.L8024170C: -/* C37C3C 8024170C 9602008E */ lhu $v0, 0x8e($s0) -/* C37C40 80241710 2442FFFF */ addiu $v0, $v0, -1 -/* C37C44 80241714 A602008E */ sh $v0, 0x8e($s0) -/* C37C48 80241718 00021400 */ sll $v0, $v0, 0x10 -/* C37C4C 8024171C 1C400006 */ bgtz $v0, .L80241738 -/* C37C50 80241720 3C030020 */ lui $v1, 0x20 -/* C37C54 80241724 8E020000 */ lw $v0, ($s0) -/* C37C58 80241728 00431025 */ or $v0, $v0, $v1 -/* C37C5C 8024172C AE020000 */ sw $v0, ($s0) -/* C37C60 80241730 2402000C */ addiu $v0, $zero, 0xc -.L80241734: -/* C37C64 80241734 AE620070 */ sw $v0, 0x70($s3) -.L80241738: -/* C37C68 80241738 8FBF0028 */ lw $ra, 0x28($sp) -/* C37C6C 8024173C 8FB30024 */ lw $s3, 0x24($sp) -/* C37C70 80241740 8FB20020 */ lw $s2, 0x20($sp) -/* C37C74 80241744 8FB1001C */ lw $s1, 0x1c($sp) -/* C37C78 80241748 8FB00018 */ lw $s0, 0x18($sp) -/* C37C7C 8024174C 03E00008 */ jr $ra -/* C37C80 80241750 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_80241754_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_80241754_C36530.s deleted file mode 100644 index b64cc24b07..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_80241754_C36530.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241754_C37C84 -/* C37C84 80241754 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C37C88 80241758 AFB20020 */ sw $s2, 0x20($sp) -/* C37C8C 8024175C 0080902D */ daddu $s2, $a0, $zero -/* C37C90 80241760 AFBF0024 */ sw $ra, 0x24($sp) -/* C37C94 80241764 AFB1001C */ sw $s1, 0x1c($sp) -/* C37C98 80241768 AFB00018 */ sw $s0, 0x18($sp) -/* C37C9C 8024176C 8E500148 */ lw $s0, 0x148($s2) -/* C37CA0 80241770 0C00EABB */ jal get_npc_unsafe -/* C37CA4 80241774 86040008 */ lh $a0, 8($s0) -/* C37CA8 80241778 0040882D */ daddu $s1, $v0, $zero -/* C37CAC 8024177C 8E02006C */ lw $v0, 0x6c($s0) -/* C37CB0 80241780 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C37CB4 80241784 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C37CB8 80241788 34420100 */ ori $v0, $v0, 0x100 -/* C37CBC 8024178C AE02006C */ sw $v0, 0x6c($s0) -/* C37CC0 80241790 C4600028 */ lwc1 $f0, 0x28($v1) -/* C37CC4 80241794 E6200038 */ swc1 $f0, 0x38($s1) -/* C37CC8 80241798 C4600030 */ lwc1 $f0, 0x30($v1) -/* C37CCC 8024179C E6200040 */ swc1 $f0, 0x40($s1) -/* C37CD0 802417A0 8E03006C */ lw $v1, 0x6c($s0) -/* C37CD4 802417A4 30621000 */ andi $v0, $v1, 0x1000 -/* C37CD8 802417A8 14400003 */ bnez $v0, .L802417B8 -/* C37CDC 802417AC 3C048000 */ lui $a0, 0x8000 -/* C37CE0 802417B0 34621000 */ ori $v0, $v1, 0x1000 -/* C37CE4 802417B4 AE02006C */ sw $v0, 0x6c($s0) -.L802417B8: -/* C37CE8 802417B8 C6200040 */ lwc1 $f0, 0x40($s1) -/* C37CEC 802417BC 34840011 */ ori $a0, $a0, 0x11 -/* C37CF0 802417C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C37CF4 802417C4 8E260038 */ lw $a2, 0x38($s1) -/* C37CF8 802417C8 8E27003C */ lw $a3, 0x3c($s1) -/* C37CFC 802417CC 0C052757 */ jal play_sound_at_position -/* C37D00 802417D0 24050002 */ addiu $a1, $zero, 2 -/* C37D04 802417D4 2402000F */ addiu $v0, $zero, 0xf -/* C37D08 802417D8 A620008E */ sh $zero, 0x8e($s1) -/* C37D0C 802417DC AE420070 */ sw $v0, 0x70($s2) -/* C37D10 802417E0 8FBF0024 */ lw $ra, 0x24($sp) -/* C37D14 802417E4 8FB20020 */ lw $s2, 0x20($sp) -/* C37D18 802417E8 8FB1001C */ lw $s1, 0x1c($sp) -/* C37D1C 802417EC 8FB00018 */ lw $s0, 0x18($sp) -/* C37D20 802417F0 03E00008 */ jr $ra -/* C37D24 802417F4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_80241CCC_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_80241CCC_C36530.s deleted file mode 100644 index 1791e7a9f5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_80241CCC_C36530.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CCC_C381FC -/* C381FC 80241CCC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C38200 80241CD0 AFB00010 */ sw $s0, 0x10($sp) -/* C38204 80241CD4 0080802D */ daddu $s0, $a0, $zero -/* C38208 80241CD8 AFBF0014 */ sw $ra, 0x14($sp) -/* C3820C 80241CDC 8E020148 */ lw $v0, 0x148($s0) -/* C38210 80241CE0 0C00EABB */ jal get_npc_unsafe -/* C38214 80241CE4 84440008 */ lh $a0, 8($v0) -/* C38218 80241CE8 9443008E */ lhu $v1, 0x8e($v0) -/* C3821C 80241CEC 2463FFFF */ addiu $v1, $v1, -1 -/* C38220 80241CF0 A443008E */ sh $v1, 0x8e($v0) -/* C38224 80241CF4 00031C00 */ sll $v1, $v1, 0x10 -/* C38228 80241CF8 1C600002 */ bgtz $v1, .L80241D04 -/* C3822C 80241CFC 2402001E */ addiu $v0, $zero, 0x1e -/* C38230 80241D00 AE020070 */ sw $v0, 0x70($s0) -.L80241D04: -/* C38234 80241D04 8FBF0014 */ lw $ra, 0x14($sp) -/* C38238 80241D08 8FB00010 */ lw $s0, 0x10($sp) -/* C3823C 80241D0C 03E00008 */ jr $ra -/* C38240 80241D10 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_8024240C_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_8024240C_C36530.s deleted file mode 100644 index 44238febd6..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_8024240C_C36530.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024240C_C3893C -/* C3893C 8024240C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C38940 80242410 AFBF0010 */ sw $ra, 0x10($sp) -/* C38944 80242414 8C82000C */ lw $v0, 0xc($a0) -/* C38948 80242418 0C0B1EAF */ jal get_variable -/* C3894C 8024241C 8C450000 */ lw $a1, ($v0) -/* C38950 80242420 0C0B95A4 */ jal func_802E5690 -/* C38954 80242424 0040202D */ daddu $a0, $v0, $zero -/* C38958 80242428 8FBF0010 */ lw $ra, 0x10($sp) -/* C3895C 8024242C 24020002 */ addiu $v0, $zero, 2 -/* C38960 80242430 03E00008 */ jr $ra -/* C38964 80242434 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_80242438_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_80242438_C36530.s deleted file mode 100644 index 60cd4b4daf..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_80242438_C36530.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242438_C38968 -/* C38968 80242438 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3896C 8024243C AFB00010 */ sw $s0, 0x10($sp) -/* C38970 80242440 0080802D */ daddu $s0, $a0, $zero -/* C38974 80242444 AFBF0018 */ sw $ra, 0x18($sp) -/* C38978 80242448 AFB10014 */ sw $s1, 0x14($sp) -/* C3897C 8024244C 8E11000C */ lw $s1, 0xc($s0) -/* C38980 80242450 8E250000 */ lw $a1, ($s1) -/* C38984 80242454 0C0B1EAF */ jal get_variable -/* C38988 80242458 26310004 */ addiu $s1, $s1, 4 -/* C3898C 8024245C 0200202D */ daddu $a0, $s0, $zero -/* C38990 80242460 3C038011 */ lui $v1, %hi(gPlayerData) -/* C38994 80242464 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* C38998 80242468 000210C0 */ sll $v0, $v0, 3 -/* C3899C 8024246C 00431021 */ addu $v0, $v0, $v1 -/* C389A0 80242470 90460015 */ lbu $a2, 0x15($v0) -/* C389A4 80242474 8E250000 */ lw $a1, ($s1) -/* C389A8 80242478 24C60001 */ addiu $a2, $a2, 1 -/* C389AC 8024247C A0460015 */ sb $a2, 0x15($v0) -/* C389B0 80242480 00063600 */ sll $a2, $a2, 0x18 -/* C389B4 80242484 0C0B2026 */ jal set_variable -/* C389B8 80242488 00063603 */ sra $a2, $a2, 0x18 -/* C389BC 8024248C 8FBF0018 */ lw $ra, 0x18($sp) -/* C389C0 80242490 8FB10014 */ lw $s1, 0x14($sp) -/* C389C4 80242494 8FB00010 */ lw $s0, 0x10($sp) -/* C389C8 80242498 24020002 */ addiu $v0, $zero, 2 -/* C389CC 8024249C 03E00008 */ jr $ra -/* C389D0 802424A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_802424A4_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_802424A4_C36530.s deleted file mode 100644 index ec31123bb2..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_802424A4_C36530.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424A4_C389D4 -/* C389D4 802424A4 3C028011 */ lui $v0, %hi(gPlayerData) -/* C389D8 802424A8 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* C389DC 802424AC 000420C0 */ sll $a0, $a0, 3 -/* C389E0 802424B0 00822021 */ addu $a0, $a0, $v0 -/* C389E4 802424B4 90820014 */ lbu $v0, 0x14($a0) -/* C389E8 802424B8 10400009 */ beqz $v0, .L802424E0 -/* C389EC 802424BC 00000000 */ nop -/* C389F0 802424C0 90820015 */ lbu $v0, 0x15($a0) -/* C389F4 802424C4 00022600 */ sll $a0, $v0, 0x18 -/* C389F8 802424C8 00041E03 */ sra $v1, $a0, 0x18 -/* C389FC 802424CC 00051400 */ sll $v0, $a1, 0x10 -/* C38A00 802424D0 00021403 */ sra $v0, $v0, 0x10 -/* C38A04 802424D4 0043102A */ slt $v0, $v0, $v1 -/* C38A08 802424D8 10400003 */ beqz $v0, .L802424E8 -/* C38A0C 802424DC 00000000 */ nop -.L802424E0: -/* C38A10 802424E0 03E00008 */ jr $ra -/* C38A14 802424E4 2402FFFF */ addiu $v0, $zero, -1 -.L802424E8: -/* C38A18 802424E8 03E00008 */ jr $ra -/* C38A1C 802424EC 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_802424F0_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_802424F0_C36530.s deleted file mode 100644 index 3ad9e58953..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_802424F0_C36530.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424F0_C38A20 -/* C38A20 802424F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C38A24 802424F4 AFB3001C */ sw $s3, 0x1c($sp) -/* C38A28 802424F8 0080982D */ daddu $s3, $a0, $zero -/* C38A2C 802424FC AFB00010 */ sw $s0, 0x10($sp) -/* C38A30 80242500 24100001 */ addiu $s0, $zero, 1 -/* C38A34 80242504 AFB40020 */ sw $s4, 0x20($sp) -/* C38A38 80242508 2414FFFF */ addiu $s4, $zero, -1 -/* C38A3C 8024250C AFB50024 */ sw $s5, 0x24($sp) -/* C38A40 80242510 0200A82D */ daddu $s5, $s0, $zero -/* C38A44 80242514 AFB10014 */ sw $s1, 0x14($sp) -/* C38A48 80242518 3C118011 */ lui $s1, 0x8011 -/* C38A4C 8024251C 2631F298 */ addiu $s1, $s1, -0xd68 -/* C38A50 80242520 AFBF0028 */ sw $ra, 0x28($sp) -/* C38A54 80242524 AFB20018 */ sw $s2, 0x18($sp) -/* C38A58 80242528 8E6200B4 */ lw $v0, 0xb4($s3) -/* C38A5C 8024252C 0280182D */ daddu $v1, $s4, $zero -/* C38A60 80242530 AE630084 */ sw $v1, 0x84($s3) -/* C38A64 80242534 00021027 */ nor $v0, $zero, $v0 -/* C38A68 80242538 000217C2 */ srl $v0, $v0, 0x1f -/* C38A6C 8024253C 00029400 */ sll $s2, $v0, 0x10 -.L80242540: -/* C38A70 80242540 92220014 */ lbu $v0, 0x14($s1) -/* C38A74 80242544 50400008 */ beql $v0, $zero, .L80242568 -/* C38A78 80242548 26100001 */ addiu $s0, $s0, 1 -/* C38A7C 8024254C 0200202D */ daddu $a0, $s0, $zero -/* C38A80 80242550 0C090929 */ jal func_802424A4 -/* C38A84 80242554 00122C03 */ sra $a1, $s2, 0x10 -/* C38A88 80242558 10540003 */ beq $v0, $s4, .L80242568 -/* C38A8C 8024255C 26100001 */ addiu $s0, $s0, 1 -/* C38A90 80242560 0809095D */ j .L80242574 -/* C38A94 80242564 AE750084 */ sw $s5, 0x84($s3) -.L80242568: -/* C38A98 80242568 2A02000C */ slti $v0, $s0, 0xc -/* C38A9C 8024256C 1440FFF4 */ bnez $v0, .L80242540 -/* C38AA0 80242570 26310008 */ addiu $s1, $s1, 8 -.L80242574: -/* C38AA4 80242574 8FBF0028 */ lw $ra, 0x28($sp) -/* C38AA8 80242578 8FB50024 */ lw $s5, 0x24($sp) -/* C38AAC 8024257C 8FB40020 */ lw $s4, 0x20($sp) -/* C38AB0 80242580 8FB3001C */ lw $s3, 0x1c($sp) -/* C38AB4 80242584 8FB20018 */ lw $s2, 0x18($sp) -/* C38AB8 80242588 8FB10014 */ lw $s1, 0x14($sp) -/* C38ABC 8024258C 8FB00010 */ lw $s0, 0x10($sp) -/* C38AC0 80242590 24020002 */ addiu $v0, $zero, 2 -/* C38AC4 80242594 03E00008 */ jr $ra -/* C38AC8 80242598 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_802427EC_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_802427EC_C36530.s deleted file mode 100644 index 786852bb66..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_802427EC_C36530.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427EC_C38D1C -/* C38D1C 802427EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C38D20 802427F0 AFBF0010 */ sw $ra, 0x10($sp) -/* C38D24 802427F4 8C82000C */ lw $v0, 0xc($a0) -/* C38D28 802427F8 0C0B1EAF */ jal get_variable -/* C38D2C 802427FC 8C450000 */ lw $a1, ($v0) -/* C38D30 80242800 0C03AC5A */ jal func_800EB168 -/* C38D34 80242804 0040202D */ daddu $a0, $v0, $zero -/* C38D38 80242808 8FBF0010 */ lw $ra, 0x10($sp) -/* C38D3C 8024280C 24020002 */ addiu $v0, $zero, 2 -/* C38D40 80242810 03E00008 */ jr $ra -/* C38D44 80242814 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_80242850_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_80242850_C36530.s deleted file mode 100644 index e95e4f2f8d..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_80242850_C36530.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242850_C38D80 -/* C38D80 80242850 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C38D84 80242854 AFB1001C */ sw $s1, 0x1c($sp) -/* C38D88 80242858 0080882D */ daddu $s1, $a0, $zero -/* C38D8C 8024285C AFBF0020 */ sw $ra, 0x20($sp) -/* C38D90 80242860 AFB00018 */ sw $s0, 0x18($sp) -/* C38D94 80242864 8E30000C */ lw $s0, 0xc($s1) -/* C38D98 80242868 8E050000 */ lw $a1, ($s0) -/* C38D9C 8024286C 0C0B1EAF */ jal get_variable -/* C38DA0 80242870 26100004 */ addiu $s0, $s0, 4 -/* C38DA4 80242874 0C04417A */ jal get_entity_by_index -/* C38DA8 80242878 0040202D */ daddu $a0, $v0, $zero -/* C38DAC 8024287C 8E100000 */ lw $s0, ($s0) -/* C38DB0 80242880 C444004C */ lwc1 $f4, 0x4c($v0) -/* C38DB4 80242884 3C014148 */ lui $at, 0x4148 -/* C38DB8 80242888 44810000 */ mtc1 $at, $f0 -/* C38DBC 8024288C 3C013F33 */ lui $at, 0x3f33 -/* C38DC0 80242890 34213333 */ ori $at, $at, 0x3333 -/* C38DC4 80242894 44811000 */ mtc1 $at, $f2 -/* C38DC8 80242898 AFA00014 */ sw $zero, 0x14($sp) -/* C38DCC 8024289C 46002100 */ add.s $f4, $f4, $f0 -/* C38DD0 802428A0 E7A20010 */ swc1 $f2, 0x10($sp) -/* C38DD4 802428A4 8C450048 */ lw $a1, 0x48($v0) -/* C38DD8 802428A8 8C470050 */ lw $a3, 0x50($v0) -/* C38DDC 802428AC 44062000 */ mfc1 $a2, $f4 -/* C38DE0 802428B0 0C01C5D4 */ jal func_80071750 -/* C38DE4 802428B4 0000202D */ daddu $a0, $zero, $zero -/* C38DE8 802428B8 0220202D */ daddu $a0, $s1, $zero -/* C38DEC 802428BC 0200282D */ daddu $a1, $s0, $zero -/* C38DF0 802428C0 0C0B2026 */ jal set_variable -/* C38DF4 802428C4 0040302D */ daddu $a2, $v0, $zero -/* C38DF8 802428C8 8FBF0020 */ lw $ra, 0x20($sp) -/* C38DFC 802428CC 8FB1001C */ lw $s1, 0x1c($sp) -/* C38E00 802428D0 8FB00018 */ lw $s0, 0x18($sp) -/* C38E04 802428D4 24020002 */ addiu $v0, $zero, 2 -/* C38E08 802428D8 03E00008 */ jr $ra -/* C38E0C 802428DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_80242F08_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_80242F08_C36530.s deleted file mode 100644 index 3d10bc953d..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_80242F08_C36530.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F08_C39438 -/* C39438 80242F08 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3943C 80242F0C AFB10014 */ sw $s1, 0x14($sp) -/* C39440 80242F10 0080882D */ daddu $s1, $a0, $zero -/* C39444 80242F14 AFB20018 */ sw $s2, 0x18($sp) -/* C39448 80242F18 AFBF001C */ sw $ra, 0x1c($sp) -/* C3944C 80242F1C AFB00010 */ sw $s0, 0x10($sp) -/* C39450 80242F20 8E30000C */ lw $s0, 0xc($s1) -/* C39454 80242F24 10A00010 */ beqz $a1, .L80242F68 -/* C39458 80242F28 0000902D */ daddu $s2, $zero, $zero -/* C3945C 80242F2C 8E050000 */ lw $a1, ($s0) -/* C39460 80242F30 0C0B1EAF */ jal get_variable -/* C39464 80242F34 26100004 */ addiu $s0, $s0, 4 -/* C39468 80242F38 AE220084 */ sw $v0, 0x84($s1) -/* C3946C 80242F3C 8E050000 */ lw $a1, ($s0) -/* C39470 80242F40 0C0B1EAF */ jal get_variable -/* C39474 80242F44 0220202D */ daddu $a0, $s1, $zero -/* C39478 80242F48 0240202D */ daddu $a0, $s2, $zero -/* C3947C 80242F4C 240500D0 */ addiu $a1, $zero, 0xd0 -/* C39480 80242F50 00A0302D */ daddu $a2, $a1, $zero -/* C39484 80242F54 00A0382D */ daddu $a3, $a1, $zero -/* C39488 80242F58 AE220088 */ sw $v0, 0x88($s1) -/* C3948C 80242F5C AE200070 */ sw $zero, 0x70($s1) -/* C39490 80242F60 0C04DF84 */ jal func_80137E10 -/* C39494 80242F64 AE200074 */ sw $zero, 0x74($s1) -.L80242F68: -/* C39498 80242F68 8E230070 */ lw $v1, 0x70($s1) -/* C3949C 80242F6C 24040001 */ addiu $a0, $zero, 1 -/* C394A0 80242F70 10640019 */ beq $v1, $a0, .L80242FD8 -/* C394A4 80242F74 28620002 */ slti $v0, $v1, 2 -/* C394A8 80242F78 10400005 */ beqz $v0, .L80242F90 -/* C394AC 80242F7C 24020002 */ addiu $v0, $zero, 2 -/* C394B0 80242F80 10600007 */ beqz $v1, .L80242FA0 -/* C394B4 80242F84 240500FF */ addiu $a1, $zero, 0xff -/* C394B8 80242F88 08090C06 */ j .L80243018 -/* C394BC 80242F8C 00000000 */ nop -.L80242F90: -/* C394C0 80242F90 10620019 */ beq $v1, $v0, .L80242FF8 -/* C394C4 80242F94 00000000 */ nop -/* C394C8 80242F98 08090C06 */ j .L80243018 -/* C394CC 80242F9C 00000000 */ nop -.L80242FA0: -/* C394D0 80242FA0 8E220074 */ lw $v0, 0x74($s1) -/* C394D4 80242FA4 14450004 */ bne $v0, $a1, .L80242FB8 -/* C394D8 80242FA8 00000000 */ nop -/* C394DC 80242FAC AE240070 */ sw $a0, 0x70($s1) -/* C394E0 80242FB0 AE200078 */ sw $zero, 0x78($s1) -/* C394E4 80242FB4 8E220074 */ lw $v0, 0x74($s1) -.L80242FB8: -/* C394E8 80242FB8 8E230084 */ lw $v1, 0x84($s1) -/* C394EC 80242FBC 00431021 */ addu $v0, $v0, $v1 -/* C394F0 80242FC0 AE220074 */ sw $v0, 0x74($s1) -/* C394F4 80242FC4 28420100 */ slti $v0, $v0, 0x100 -/* C394F8 80242FC8 50400013 */ beql $v0, $zero, .L80243018 -/* C394FC 80242FCC AE250074 */ sw $a1, 0x74($s1) -/* C39500 80242FD0 08090C06 */ j .L80243018 -/* C39504 80242FD4 00000000 */ nop -.L80242FD8: -/* C39508 80242FD8 8E220078 */ lw $v0, 0x78($s1) -/* C3950C 80242FDC 24420001 */ addiu $v0, $v0, 1 -/* C39510 80242FE0 AE220078 */ sw $v0, 0x78($s1) -/* C39514 80242FE4 28420002 */ slti $v0, $v0, 2 -/* C39518 80242FE8 1440000B */ bnez $v0, .L80243018 -/* C3951C 80242FEC 24020002 */ addiu $v0, $zero, 2 -/* C39520 80242FF0 08090C06 */ j .L80243018 -/* C39524 80242FF4 AE220070 */ sw $v0, 0x70($s1) -.L80242FF8: -/* C39528 80242FF8 8E230074 */ lw $v1, 0x74($s1) -/* C3952C 80242FFC 50600001 */ beql $v1, $zero, .L80243004 -/* C39530 80243000 24120001 */ addiu $s2, $zero, 1 -.L80243004: -/* C39534 80243004 8E220088 */ lw $v0, 0x88($s1) -/* C39538 80243008 00621023 */ subu $v0, $v1, $v0 -/* C3953C 8024300C 04410002 */ bgez $v0, .L80243018 -/* C39540 80243010 AE220074 */ sw $v0, 0x74($s1) -/* C39544 80243014 AE200074 */ sw $zero, 0x74($s1) -.L80243018: -/* C39548 80243018 C6200074 */ lwc1 $f0, 0x74($s1) -/* C3954C 8024301C 46800020 */ cvt.s.w $f0, $f0 -/* C39550 80243020 44050000 */ mfc1 $a1, $f0 -/* C39554 80243024 0C04DF62 */ jal func_80137D88 -/* C39558 80243028 24040001 */ addiu $a0, $zero, 1 -/* C3955C 8024302C 0240102D */ daddu $v0, $s2, $zero -/* C39560 80243030 8FBF001C */ lw $ra, 0x1c($sp) -/* C39564 80243034 8FB20018 */ lw $s2, 0x18($sp) -/* C39568 80243038 8FB10014 */ lw $s1, 0x14($sp) -/* C3956C 8024303C 8FB00010 */ lw $s0, 0x10($sp) -/* C39570 80243040 03E00008 */ jr $ra -/* C39574 80243044 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/func_80243090_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/func_80243090_C36530.s deleted file mode 100644 index 4532e191f5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/func_80243090_C36530.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243090_C395C0 -/* C395C0 80243090 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C395C4 80243094 AFBF0018 */ sw $ra, 0x18($sp) -/* C395C8 80243098 0C00EAD2 */ jal get_npc_safe -/* C395CC 8024309C 2404FFFC */ addiu $a0, $zero, -4 -/* C395D0 802430A0 3C0141F0 */ lui $at, 0x41f0 -/* C395D4 802430A4 44810000 */ mtc1 $at, $f0 -/* C395D8 802430A8 C442003C */ lwc1 $f2, 0x3c($v0) -/* C395DC 802430AC 46001080 */ add.s $f2, $f2, $f0 -/* C395E0 802430B0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C395E4 802430B4 8C450038 */ lw $a1, 0x38($v0) -/* C395E8 802430B8 8C470040 */ lw $a3, 0x40($v0) -/* C395EC 802430BC 44061000 */ mfc1 $a2, $f2 -/* C395F0 802430C0 0C01BFBC */ jal func_8006FEF0 -/* C395F4 802430C4 24040004 */ addiu $a0, $zero, 4 -/* C395F8 802430C8 8FBF0018 */ lw $ra, 0x18($sp) -/* C395FC 802430CC 24020002 */ addiu $v0, $zero, 2 -/* C39600 802430D0 03E00008 */ jr $ra -/* C39604 802430D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240030_C3AA10.s b/asm/nonmatchings/world/area_dgb/dgb_05/func_80240030_C3AA10.s deleted file mode 100644 index 144c1b352c..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240030_C3AA10.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240030_C3AA40 -/* C3AA40 80240030 3C018011 */ lui $at, 0x8011 -/* C3AA44 80240034 C422EFF4 */ lwc1 $f2, -0x100c($at) -/* C3AA48 80240038 3C01C387 */ lui $at, 0xc387 -/* C3AA4C 8024003C 44810000 */ mtc1 $at, $f0 -/* C3AA50 80240040 00000000 */ nop -/* C3AA54 80240044 4602003C */ c.lt.s $f0, $f2 -/* C3AA58 80240048 00000000 */ nop -/* C3AA5C 8024004C 45010002 */ bc1t .L80240058 -/* C3AA60 80240050 0000102D */ daddu $v0, $zero, $zero -/* C3AA64 80240054 24020002 */ addiu $v0, $zero, 2 -.L80240058: -/* C3AA68 80240058 03E00008 */ jr $ra -/* C3AA6C 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240060_C3AA10.s b/asm/nonmatchings/world/area_dgb/dgb_05/func_80240060_C3AA10.s deleted file mode 100644 index a01e26da4a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240060_C3AA10.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240060_C3AA70 -/* C3AA70 80240060 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3AA74 80240064 AFB10014 */ sw $s1, 0x14($sp) -/* C3AA78 80240068 0080882D */ daddu $s1, $a0, $zero -/* C3AA7C 8024006C AFBF0018 */ sw $ra, 0x18($sp) -/* C3AA80 80240070 AFB00010 */ sw $s0, 0x10($sp) -/* C3AA84 80240074 8E300148 */ lw $s0, 0x148($s1) -/* C3AA88 80240078 0C00EABB */ jal get_npc_unsafe -/* C3AA8C 8024007C 86040008 */ lh $a0, 8($s0) -/* C3AA90 80240080 24030001 */ addiu $v1, $zero, 1 -/* C3AA94 80240084 0040202D */ daddu $a0, $v0, $zero -/* C3AA98 80240088 AE03006C */ sw $v1, 0x6c($s0) -/* C3AA9C 8024008C 8482008C */ lh $v0, 0x8c($a0) -/* C3AAA0 80240090 14400009 */ bnez $v0, .L802400B8 -/* C3AAA4 80240094 24020002 */ addiu $v0, $zero, 2 -/* C3AAA8 80240098 96030072 */ lhu $v1, 0x72($s0) -/* C3AAAC 8024009C AE02006C */ sw $v0, 0x6c($s0) -/* C3AAB0 802400A0 A483008E */ sh $v1, 0x8e($a0) -/* C3AAB4 802400A4 8E0200CC */ lw $v0, 0xcc($s0) -/* C3AAB8 802400A8 8C420020 */ lw $v0, 0x20($v0) -/* C3AABC 802400AC AC820028 */ sw $v0, 0x28($a0) -/* C3AAC0 802400B0 2402001F */ addiu $v0, $zero, 0x1f -/* C3AAC4 802400B4 AE220070 */ sw $v0, 0x70($s1) -.L802400B8: -/* C3AAC8 802400B8 8FBF0018 */ lw $ra, 0x18($sp) -/* C3AACC 802400BC 8FB10014 */ lw $s1, 0x14($sp) -/* C3AAD0 802400C0 8FB00010 */ lw $s0, 0x10($sp) -/* C3AAD4 802400C4 03E00008 */ jr $ra -/* C3AAD8 802400C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/func_802400CC_C3AA10.s b/asm/nonmatchings/world/area_dgb/dgb_05/func_802400CC_C3AA10.s deleted file mode 100644 index 17ad61f51f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/func_802400CC_C3AA10.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400CC_C3AADC -/* C3AADC 802400CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3AAE0 802400D0 AFB10014 */ sw $s1, 0x14($sp) -/* C3AAE4 802400D4 0080882D */ daddu $s1, $a0, $zero -/* C3AAE8 802400D8 AFBF0018 */ sw $ra, 0x18($sp) -/* C3AAEC 802400DC AFB00010 */ sw $s0, 0x10($sp) -/* C3AAF0 802400E0 8E300148 */ lw $s0, 0x148($s1) -/* C3AAF4 802400E4 0C00EABB */ jal get_npc_unsafe -/* C3AAF8 802400E8 86040008 */ lh $a0, 8($s0) -/* C3AAFC 802400EC 0040202D */ daddu $a0, $v0, $zero -/* C3AB00 802400F0 9482008E */ lhu $v0, 0x8e($a0) -/* C3AB04 802400F4 2442FFFF */ addiu $v0, $v0, -1 -/* C3AB08 802400F8 A482008E */ sh $v0, 0x8e($a0) -/* C3AB0C 802400FC 00021400 */ sll $v0, $v0, 0x10 -/* C3AB10 80240100 1C400009 */ bgtz $v0, .L80240128 -/* C3AB14 80240104 24020003 */ addiu $v0, $zero, 3 -/* C3AB18 80240108 96030076 */ lhu $v1, 0x76($s0) -/* C3AB1C 8024010C AE02006C */ sw $v0, 0x6c($s0) -/* C3AB20 80240110 A483008E */ sh $v1, 0x8e($a0) -/* C3AB24 80240114 8E0200CC */ lw $v0, 0xcc($s0) -/* C3AB28 80240118 8C420024 */ lw $v0, 0x24($v0) -/* C3AB2C 8024011C AC820028 */ sw $v0, 0x28($a0) -/* C3AB30 80240120 24020020 */ addiu $v0, $zero, 0x20 -/* C3AB34 80240124 AE220070 */ sw $v0, 0x70($s1) -.L80240128: -/* C3AB38 80240128 8FBF0018 */ lw $ra, 0x18($sp) -/* C3AB3C 8024012C 8FB10014 */ lw $s1, 0x14($sp) -/* C3AB40 80240130 8FB00010 */ lw $s0, 0x10($sp) -/* C3AB44 80240134 03E00008 */ jr $ra -/* C3AB48 80240138 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/func_8024013C_C3AA10.s b/asm/nonmatchings/world/area_dgb/dgb_05/func_8024013C_C3AA10.s deleted file mode 100644 index 105d4af803..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/func_8024013C_C3AA10.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024013C_C3AB4C -/* C3AB4C 8024013C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C3AB50 80240140 AFB10034 */ sw $s1, 0x34($sp) -/* C3AB54 80240144 0080882D */ daddu $s1, $a0, $zero -/* C3AB58 80240148 AFBF0038 */ sw $ra, 0x38($sp) -/* C3AB5C 8024014C AFB00030 */ sw $s0, 0x30($sp) -/* C3AB60 80240150 8E300148 */ lw $s0, 0x148($s1) -/* C3AB64 80240154 0C00EABB */ jal get_npc_unsafe -/* C3AB68 80240158 86040008 */ lh $a0, 8($s0) -/* C3AB6C 8024015C 0040282D */ daddu $a1, $v0, $zero -/* C3AB70 80240160 94A2008E */ lhu $v0, 0x8e($a1) -/* C3AB74 80240164 2442FFFF */ addiu $v0, $v0, -1 -/* C3AB78 80240168 A4A2008E */ sh $v0, 0x8e($a1) -/* C3AB7C 8024016C 00021400 */ sll $v0, $v0, 0x10 -/* C3AB80 80240170 1C400023 */ bgtz $v0, .L80240200 -/* C3AB84 80240174 24020004 */ addiu $v0, $zero, 4 -/* C3AB88 80240178 8E0300CC */ lw $v1, 0xcc($s0) -/* C3AB8C 8024017C AE02006C */ sw $v0, 0x6c($s0) -/* C3AB90 80240180 8C620000 */ lw $v0, ($v1) -/* C3AB94 80240184 ACA20028 */ sw $v0, 0x28($a1) -/* C3AB98 80240188 9602007A */ lhu $v0, 0x7a($s0) -/* C3AB9C 8024018C A4A2008E */ sh $v0, 0x8e($a1) -/* C3ABA0 80240190 8E020078 */ lw $v0, 0x78($s0) -/* C3ABA4 80240194 28420008 */ slti $v0, $v0, 8 -/* C3ABA8 80240198 14400018 */ bnez $v0, .L802401FC -/* C3ABAC 8024019C 24020021 */ addiu $v0, $zero, 0x21 -/* C3ABB0 802401A0 24040003 */ addiu $a0, $zero, 3 -/* C3ABB4 802401A4 27A30028 */ addiu $v1, $sp, 0x28 -/* C3ABB8 802401A8 84A700A8 */ lh $a3, 0xa8($a1) -/* C3ABBC 802401AC 3C013F80 */ lui $at, 0x3f80 -/* C3ABC0 802401B0 44810000 */ mtc1 $at, $f0 -/* C3ABC4 802401B4 3C014000 */ lui $at, 0x4000 -/* C3ABC8 802401B8 44811000 */ mtc1 $at, $f2 -/* C3ABCC 802401BC 3C01C1A0 */ lui $at, 0xc1a0 -/* C3ABD0 802401C0 44812000 */ mtc1 $at, $f4 -/* C3ABD4 802401C4 44873000 */ mtc1 $a3, $f6 -/* C3ABD8 802401C8 00000000 */ nop -/* C3ABDC 802401CC 468031A0 */ cvt.s.w $f6, $f6 -/* C3ABE0 802401D0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C3ABE4 802401D4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C3ABE8 802401D8 E7A40018 */ swc1 $f4, 0x18($sp) -/* C3ABEC 802401DC 8E020078 */ lw $v0, 0x78($s0) -/* C3ABF0 802401E0 44073000 */ mfc1 $a3, $f6 -/* C3ABF4 802401E4 0000302D */ daddu $a2, $zero, $zero -/* C3ABF8 802401E8 AFA30020 */ sw $v1, 0x20($sp) -/* C3ABFC 802401EC 2442FFFF */ addiu $v0, $v0, -1 -/* C3AC00 802401F0 0C01BFA4 */ jal fx_emote -/* C3AC04 802401F4 AFA2001C */ sw $v0, 0x1c($sp) -/* C3AC08 802401F8 24020021 */ addiu $v0, $zero, 0x21 -.L802401FC: -/* C3AC0C 802401FC AE220070 */ sw $v0, 0x70($s1) -.L80240200: -/* C3AC10 80240200 8FBF0038 */ lw $ra, 0x38($sp) -/* C3AC14 80240204 8FB10034 */ lw $s1, 0x34($sp) -/* C3AC18 80240208 8FB00030 */ lw $s0, 0x30($sp) -/* C3AC1C 8024020C 03E00008 */ jr $ra -/* C3AC20 80240210 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240214_C3AA10.s b/asm/nonmatchings/world/area_dgb/dgb_05/func_80240214_C3AA10.s deleted file mode 100644 index c54b59dcea..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240214_C3AA10.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240214_C3AC24 -/* C3AC24 80240214 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3AC28 80240218 AFB10014 */ sw $s1, 0x14($sp) -/* C3AC2C 8024021C 0080882D */ daddu $s1, $a0, $zero -/* C3AC30 80240220 AFBF0018 */ sw $ra, 0x18($sp) -/* C3AC34 80240224 AFB00010 */ sw $s0, 0x10($sp) -/* C3AC38 80240228 8E300148 */ lw $s0, 0x148($s1) -/* C3AC3C 8024022C 0C00EABB */ jal get_npc_unsafe -/* C3AC40 80240230 86040008 */ lh $a0, 8($s0) -/* C3AC44 80240234 9443008E */ lhu $v1, 0x8e($v0) -/* C3AC48 80240238 2463FFFF */ addiu $v1, $v1, -1 -/* C3AC4C 8024023C A443008E */ sh $v1, 0x8e($v0) -/* C3AC50 80240240 00031C00 */ sll $v1, $v1, 0x10 -/* C3AC54 80240244 1C600003 */ bgtz $v1, .L80240254 -/* C3AC58 80240248 2402000C */ addiu $v0, $zero, 0xc -/* C3AC5C 8024024C AE00006C */ sw $zero, 0x6c($s0) -/* C3AC60 80240250 AE220070 */ sw $v0, 0x70($s1) -.L80240254: -/* C3AC64 80240254 8FBF0018 */ lw $ra, 0x18($sp) -/* C3AC68 80240258 8FB10014 */ lw $s1, 0x14($sp) -/* C3AC6C 8024025C 8FB00010 */ lw $s0, 0x10($sp) -/* C3AC70 80240260 03E00008 */ jr $ra -/* C3AC74 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240268_C3AA10.s b/asm/nonmatchings/world/area_dgb/dgb_05/func_80240268_C3AA10.s deleted file mode 100644 index 3d6afe762c..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240268_C3AA10.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_C3AC78 -/* C3AC78 80240268 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C3AC7C 8024026C AFBF0024 */ sw $ra, 0x24($sp) -/* C3AC80 80240270 AFB40020 */ sw $s4, 0x20($sp) -/* C3AC84 80240274 AFB3001C */ sw $s3, 0x1c($sp) -/* C3AC88 80240278 AFB20018 */ sw $s2, 0x18($sp) -/* C3AC8C 8024027C AFB10014 */ sw $s1, 0x14($sp) -/* C3AC90 80240280 AFB00010 */ sw $s0, 0x10($sp) -/* C3AC94 80240284 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C3AC98 80240288 8C900148 */ lw $s0, 0x148($a0) -/* C3AC9C 8024028C 86040008 */ lh $a0, 8($s0) -/* C3ACA0 80240290 0C00EABB */ jal get_npc_unsafe -/* C3ACA4 80240294 24110001 */ addiu $s1, $zero, 1 -/* C3ACA8 80240298 86040008 */ lh $a0, 8($s0) -/* C3ACAC 8024029C 0040802D */ daddu $s0, $v0, $zero -/* C3ACB0 802402A0 3C05800B */ lui $a1, %hi(gCameras) -/* C3ACB4 802402A4 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C3ACB8 802402A8 3C03800A */ lui $v1, 0x800a -/* C3ACBC 802402AC 8463A634 */ lh $v1, -0x59cc($v1) -/* C3ACC0 802402B0 00912021 */ addu $a0, $a0, $s1 -/* C3ACC4 802402B4 00031080 */ sll $v0, $v1, 2 -/* C3ACC8 802402B8 00431021 */ addu $v0, $v0, $v1 -/* C3ACCC 802402BC 00021080 */ sll $v0, $v0, 2 -/* C3ACD0 802402C0 00431023 */ subu $v0, $v0, $v1 -/* C3ACD4 802402C4 000218C0 */ sll $v1, $v0, 3 -/* C3ACD8 802402C8 00431021 */ addu $v0, $v0, $v1 -/* C3ACDC 802402CC 000210C0 */ sll $v0, $v0, 3 -/* C3ACE0 802402D0 0C00FB3A */ jal get_enemy -/* C3ACE4 802402D4 00459021 */ addu $s2, $v0, $a1 -/* C3ACE8 802402D8 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C3ACEC 802402DC 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C3ACF0 802402E0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3ACF4 802402E4 8E830000 */ lw $v1, ($s4) -/* C3ACF8 802402E8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3ACFC 802402EC 8C660028 */ lw $a2, 0x28($v1) -/* C3AD00 802402F0 8C670030 */ lw $a3, 0x30($v1) -/* C3AD04 802402F4 0C00A7B5 */ jal dist2D -/* C3AD08 802402F8 0040982D */ daddu $s3, $v0, $zero -/* C3AD0C 802402FC C6620074 */ lwc1 $f2, 0x74($s3) -/* C3AD10 80240300 468010A0 */ cvt.s.w $f2, $f2 -/* C3AD14 80240304 4600103C */ c.lt.s $f2, $f0 -/* C3AD18 80240308 00000000 */ nop -/* C3AD1C 8024030C 45030001 */ bc1tl .L80240314 -/* C3AD20 80240310 0000882D */ daddu $s1, $zero, $zero -.L80240314: -/* C3AD24 80240314 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C3AD28 80240318 C60E000C */ lwc1 $f14, 0xc($s0) -/* C3AD2C 8024031C 3C014387 */ lui $at, 0x4387 -/* C3AD30 80240320 4481A000 */ mtc1 $at, $f20 -/* C3AD34 80240324 0C00A70A */ jal get_clamped_angle_diff -/* C3AD38 80240328 00000000 */ nop -/* C3AD3C 8024032C 0C00A6C9 */ jal clamp_angle -/* C3AD40 80240330 46000306 */ mov.s $f12, $f0 -/* C3AD44 80240334 3C018024 */ lui $at, 0x8024 -/* C3AD48 80240338 D4222340 */ ldc1 $f2, 0x2340($at) -/* C3AD4C 8024033C 46000021 */ cvt.d.s $f0, $f0 -/* C3AD50 80240340 4622003C */ c.lt.d $f0, $f2 -/* C3AD54 80240344 00000000 */ nop -/* C3AD58 80240348 45000003 */ bc1f .L80240358 -/* C3AD5C 8024034C 00000000 */ nop -/* C3AD60 80240350 3C0142B4 */ lui $at, 0x42b4 -/* C3AD64 80240354 4481A000 */ mtc1 $at, $f20 -.L80240358: -/* C3AD68 80240358 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3AD6C 8024035C 8E820000 */ lw $v0, ($s4) -/* C3AD70 80240360 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3AD74 80240364 8C460028 */ lw $a2, 0x28($v0) -/* C3AD78 80240368 0C00A720 */ jal atan2 -/* C3AD7C 8024036C 8C470030 */ lw $a3, 0x30($v0) -/* C3AD80 80240370 4600A306 */ mov.s $f12, $f20 -/* C3AD84 80240374 0C00A70A */ jal get_clamped_angle_diff -/* C3AD88 80240378 46000386 */ mov.s $f14, $f0 -/* C3AD8C 8024037C C6620078 */ lwc1 $f2, 0x78($s3) -/* C3AD90 80240380 468010A0 */ cvt.s.w $f2, $f2 -/* C3AD94 80240384 46000005 */ abs.s $f0, $f0 -/* C3AD98 80240388 4600103C */ c.lt.s $f2, $f0 -/* C3AD9C 8024038C 00000000 */ nop -/* C3ADA0 80240390 45030001 */ bc1tl .L80240398 -/* C3ADA4 80240394 0000882D */ daddu $s1, $zero, $zero -.L80240398: -/* C3ADA8 80240398 8E820000 */ lw $v0, ($s4) -/* C3ADAC 8024039C C600003C */ lwc1 $f0, 0x3c($s0) -/* C3ADB0 802403A0 C442002C */ lwc1 $f2, 0x2c($v0) -/* C3ADB4 802403A4 860200A8 */ lh $v0, 0xa8($s0) -/* C3ADB8 802403A8 46020001 */ sub.s $f0, $f0, $f2 -/* C3ADBC 802403AC 44821000 */ mtc1 $v0, $f2 -/* C3ADC0 802403B0 00000000 */ nop -/* C3ADC4 802403B4 468010A1 */ cvt.d.w $f2, $f2 -/* C3ADC8 802403B8 46221080 */ add.d $f2, $f2, $f2 -/* C3ADCC 802403BC 46000005 */ abs.s $f0, $f0 -/* C3ADD0 802403C0 46000021 */ cvt.d.s $f0, $f0 -/* C3ADD4 802403C4 4620103E */ c.le.d $f2, $f0 -/* C3ADD8 802403C8 00000000 */ nop -/* C3ADDC 802403CC 45030001 */ bc1tl .L802403D4 -/* C3ADE0 802403D0 0000882D */ daddu $s1, $zero, $zero -.L802403D4: -/* C3ADE4 802403D4 3C038011 */ lui $v1, 0x8011 -/* C3ADE8 802403D8 8063EBB3 */ lb $v1, -0x144d($v1) -/* C3ADEC 802403DC 24020009 */ addiu $v0, $zero, 9 -/* C3ADF0 802403E0 50620001 */ beql $v1, $v0, .L802403E8 -/* C3ADF4 802403E4 0000882D */ daddu $s1, $zero, $zero -.L802403E8: -/* C3ADF8 802403E8 24020007 */ addiu $v0, $zero, 7 -/* C3ADFC 802403EC 50620001 */ beql $v1, $v0, .L802403F4 -/* C3AE00 802403F0 0000882D */ daddu $s1, $zero, $zero -.L802403F4: -/* C3AE04 802403F4 0220102D */ daddu $v0, $s1, $zero -/* C3AE08 802403F8 8FBF0024 */ lw $ra, 0x24($sp) -/* C3AE0C 802403FC 8FB40020 */ lw $s4, 0x20($sp) -/* C3AE10 80240400 8FB3001C */ lw $s3, 0x1c($sp) -/* C3AE14 80240404 8FB20018 */ lw $s2, 0x18($sp) -/* C3AE18 80240408 8FB10014 */ lw $s1, 0x14($sp) -/* C3AE1C 8024040C 8FB00010 */ lw $s0, 0x10($sp) -/* C3AE20 80240410 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C3AE24 80240414 03E00008 */ jr $ra -/* C3AE28 80240418 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/func_8024041C_C3AA10.s b/asm/nonmatchings/world/area_dgb/dgb_05/func_8024041C_C3AA10.s deleted file mode 100644 index 7b6db14a8f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/func_8024041C_C3AA10.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024041C_C3AE2C -/* C3AE2C 8024041C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C3AE30 80240420 AFB40028 */ sw $s4, 0x28($sp) -/* C3AE34 80240424 0080A02D */ daddu $s4, $a0, $zero -/* C3AE38 80240428 AFBF002C */ sw $ra, 0x2c($sp) -/* C3AE3C 8024042C AFB30024 */ sw $s3, 0x24($sp) -/* C3AE40 80240430 AFB20020 */ sw $s2, 0x20($sp) -/* C3AE44 80240434 AFB1001C */ sw $s1, 0x1c($sp) -/* C3AE48 80240438 AFB00018 */ sw $s0, 0x18($sp) -/* C3AE4C 8024043C 8E910148 */ lw $s1, 0x148($s4) -/* C3AE50 80240440 86240008 */ lh $a0, 8($s1) -/* C3AE54 80240444 0C00EABB */ jal get_npc_unsafe -/* C3AE58 80240448 00A0802D */ daddu $s0, $a1, $zero -/* C3AE5C 8024044C 16000005 */ bnez $s0, .L80240464 -/* C3AE60 80240450 0040902D */ daddu $s2, $v0, $zero -/* C3AE64 80240454 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3AE68 80240458 30420004 */ andi $v0, $v0, 4 -/* C3AE6C 8024045C 10400015 */ beqz $v0, .L802404B4 -/* C3AE70 80240460 00000000 */ nop -.L80240464: -/* C3AE74 80240464 AE800070 */ sw $zero, 0x70($s4) -/* C3AE78 80240468 8E420000 */ lw $v0, ($s2) -/* C3AE7C 8024046C 3C031F30 */ lui $v1, 0x1f30 -/* C3AE80 80240470 A640008E */ sh $zero, 0x8e($s2) -/* C3AE84 80240474 34420102 */ ori $v0, $v0, 0x102 -/* C3AE88 80240478 AE420000 */ sw $v0, ($s2) -/* C3AE8C 8024047C 8E220000 */ lw $v0, ($s1) -/* C3AE90 80240480 3C01C47A */ lui $at, 0xc47a -/* C3AE94 80240484 44810000 */ mtc1 $at, $f0 -/* C3AE98 80240488 00431025 */ or $v0, $v0, $v1 -/* C3AE9C 8024048C AE220000 */ sw $v0, ($s1) -/* C3AEA0 80240490 AE400038 */ sw $zero, 0x38($s2) -/* C3AEA4 80240494 E640003C */ swc1 $f0, 0x3c($s2) -/* C3AEA8 80240498 AE400040 */ sw $zero, 0x40($s2) -/* C3AEAC 8024049C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C3AEB0 802404A0 30620004 */ andi $v0, $v1, 4 -/* C3AEB4 802404A4 10400003 */ beqz $v0, .L802404B4 -/* C3AEB8 802404A8 2402FFFB */ addiu $v0, $zero, -5 -/* C3AEBC 802404AC 00621024 */ and $v0, $v1, $v0 -/* C3AEC0 802404B0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802404B4: -/* C3AEC4 802404B4 8E930070 */ lw $s3, 0x70($s4) -/* C3AEC8 802404B8 12600005 */ beqz $s3, .L802404D0 -/* C3AECC 802404BC 24020001 */ addiu $v0, $zero, 1 -/* C3AED0 802404C0 12620048 */ beq $s3, $v0, .L802405E4 -/* C3AED4 802404C4 00000000 */ nop -/* C3AED8 802404C8 08090196 */ j .L80240658 -/* C3AEDC 802404CC 00000000 */ nop -.L802404D0: -/* C3AEE0 802404D0 86240008 */ lh $a0, 8($s1) -/* C3AEE4 802404D4 0C00FB3A */ jal get_enemy -/* C3AEE8 802404D8 2484FFFF */ addiu $a0, $a0, -1 -/* C3AEEC 802404DC 0040802D */ daddu $s0, $v0, $zero -/* C3AEF0 802404E0 0C00EABB */ jal get_npc_unsafe -/* C3AEF4 802404E4 86040008 */ lh $a0, 8($s0) -/* C3AEF8 802404E8 24030001 */ addiu $v1, $zero, 1 -/* C3AEFC 802404EC 0040982D */ daddu $s3, $v0, $zero -/* C3AF00 802404F0 A2230007 */ sb $v1, 7($s1) -/* C3AF04 802404F4 8E03006C */ lw $v1, 0x6c($s0) -/* C3AF08 802404F8 24020003 */ addiu $v0, $zero, 3 -/* C3AF0C 802404FC 14620056 */ bne $v1, $v0, .L80240658 -/* C3AF10 80240500 00000000 */ nop -/* C3AF14 80240504 8E2500A8 */ lw $a1, 0xa8($s1) -/* C3AF18 80240508 10A00003 */ beqz $a1, .L80240518 -/* C3AF1C 8024050C 0260202D */ daddu $a0, $s3, $zero -/* C3AF20 80240510 0C012530 */ jal func_800494C0 -/* C3AF24 80240514 0000302D */ daddu $a2, $zero, $zero -.L80240518: -/* C3AF28 80240518 27A40010 */ addiu $a0, $sp, 0x10 -/* C3AF2C 8024051C C6280070 */ lwc1 $f8, 0x70($s1) -/* C3AF30 80240520 46804220 */ cvt.s.w $f8, $f8 -/* C3AF34 80240524 C6620034 */ lwc1 $f2, 0x34($s3) -/* C3AF38 80240528 3C014387 */ lui $at, 0x4387 -/* C3AF3C 8024052C 44810000 */ mtc1 $at, $f0 -/* C3AF40 80240530 44064000 */ mfc1 $a2, $f8 -/* C3AF44 80240534 46020001 */ sub.s $f0, $f0, $f2 -/* C3AF48 80240538 C6660038 */ lwc1 $f6, 0x38($s3) -/* C3AF4C 8024053C C6640040 */ lwc1 $f4, 0x40($s3) -/* C3AF50 80240540 44070000 */ mfc1 $a3, $f0 -/* C3AF54 80240544 27A50014 */ addiu $a1, $sp, 0x14 -/* C3AF58 80240548 E7A60010 */ swc1 $f6, 0x10($sp) -/* C3AF5C 8024054C 0C00A7E7 */ jal add_vec2D_polar -/* C3AF60 80240550 E7A40014 */ swc1 $f4, 0x14($sp) -/* C3AF64 80240554 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C3AF68 80240558 4600020D */ trunc.w.s $f8, $f0 -/* C3AF6C 8024055C 44024000 */ mfc1 $v0, $f8 -/* C3AF70 80240560 E6400038 */ swc1 $f0, 0x38($s2) -/* C3AF74 80240564 A6220010 */ sh $v0, 0x10($s1) -/* C3AF78 80240568 C660003C */ lwc1 $f0, 0x3c($s3) -/* C3AF7C 8024056C C622006C */ lwc1 $f2, 0x6c($s1) -/* C3AF80 80240570 468010A0 */ cvt.s.w $f2, $f2 -/* C3AF84 80240574 46020000 */ add.s $f0, $f0, $f2 -/* C3AF88 80240578 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C3AF8C 8024057C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C3AF90 80240580 E640003C */ swc1 $f0, 0x3c($s2) -/* C3AF94 80240584 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C3AF98 80240588 4600020D */ trunc.w.s $f8, $f0 -/* C3AF9C 8024058C 44024000 */ mfc1 $v0, $f8 -/* C3AFA0 80240590 00000000 */ nop -/* C3AFA4 80240594 A6220012 */ sh $v0, 0x12($s1) -/* C3AFA8 80240598 4600120D */ trunc.w.s $f8, $f2 -/* C3AFAC 8024059C 44024000 */ mfc1 $v0, $f8 -/* C3AFB0 802405A0 E6420040 */ swc1 $f2, 0x40($s2) -/* C3AFB4 802405A4 A6220014 */ sh $v0, 0x14($s1) -/* C3AFB8 802405A8 8C660028 */ lw $a2, 0x28($v1) -/* C3AFBC 802405AC 8C670030 */ lw $a3, 0x30($v1) -/* C3AFC0 802405B0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C3AFC4 802405B4 0C00A720 */ jal atan2 -/* C3AFC8 802405B8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C3AFCC 802405BC 3C03E0EF */ lui $v1, 0xe0ef -/* C3AFD0 802405C0 E640000C */ swc1 $f0, 0xc($s2) -/* C3AFD4 802405C4 8E220000 */ lw $v0, ($s1) -/* C3AFD8 802405C8 3463FFFF */ ori $v1, $v1, 0xffff -/* C3AFDC 802405CC 00431024 */ and $v0, $v0, $v1 -/* C3AFE0 802405D0 AE220000 */ sw $v0, ($s1) -/* C3AFE4 802405D4 24020001 */ addiu $v0, $zero, 1 -/* C3AFE8 802405D8 A640008E */ sh $zero, 0x8e($s2) -/* C3AFEC 802405DC 08090196 */ j .L80240658 -/* C3AFF0 802405E0 AE820070 */ sw $v0, 0x70($s4) -.L802405E4: -/* C3AFF4 802405E4 86240008 */ lh $a0, 8($s1) -/* C3AFF8 802405E8 0C00FB3A */ jal get_enemy -/* C3AFFC 802405EC 2484FFFF */ addiu $a0, $a0, -1 -/* C3B000 802405F0 0040802D */ daddu $s0, $v0, $zero -/* C3B004 802405F4 0C00EABB */ jal get_npc_unsafe -/* C3B008 802405F8 86040008 */ lh $a0, 8($s0) -/* C3B00C 802405FC 9642008E */ lhu $v0, 0x8e($s2) -/* C3B010 80240600 24420001 */ addiu $v0, $v0, 1 -/* C3B014 80240604 A642008E */ sh $v0, 0x8e($s2) -/* C3B018 80240608 00021400 */ sll $v0, $v0, 0x10 -/* C3B01C 8024060C 8E23007C */ lw $v1, 0x7c($s1) -/* C3B020 80240610 00021403 */ sra $v0, $v0, 0x10 -/* C3B024 80240614 0043102A */ slt $v0, $v0, $v1 -/* C3B028 80240618 50400001 */ beql $v0, $zero, .L80240620 -/* C3B02C 8024061C A2200007 */ sb $zero, 7($s1) -.L80240620: -/* C3B030 80240620 8E03006C */ lw $v1, 0x6c($s0) -/* C3B034 80240624 24020004 */ addiu $v0, $zero, 4 -/* C3B038 80240628 1462000B */ bne $v1, $v0, .L80240658 -/* C3B03C 8024062C 3C021F10 */ lui $v0, 0x1f10 -/* C3B040 80240630 8E230000 */ lw $v1, ($s1) -/* C3B044 80240634 3C01C47A */ lui $at, 0xc47a -/* C3B048 80240638 44810000 */ mtc1 $at, $f0 -/* C3B04C 8024063C 00621825 */ or $v1, $v1, $v0 -/* C3B050 80240640 AE230000 */ sw $v1, ($s1) -/* C3B054 80240644 AE400038 */ sw $zero, 0x38($s2) -/* C3B058 80240648 E640003C */ swc1 $f0, 0x3c($s2) -/* C3B05C 8024064C AE400040 */ sw $zero, 0x40($s2) -/* C3B060 80240650 A2330007 */ sb $s3, 7($s1) -/* C3B064 80240654 AE800070 */ sw $zero, 0x70($s4) -.L80240658: -/* C3B068 80240658 8FBF002C */ lw $ra, 0x2c($sp) -/* C3B06C 8024065C 8FB40028 */ lw $s4, 0x28($sp) -/* C3B070 80240660 8FB30024 */ lw $s3, 0x24($sp) -/* C3B074 80240664 8FB20020 */ lw $s2, 0x20($sp) -/* C3B078 80240668 8FB1001C */ lw $s1, 0x1c($sp) -/* C3B07C 8024066C 8FB00018 */ lw $s0, 0x18($sp) -/* C3B080 80240670 0000102D */ daddu $v0, $zero, $zero -/* C3B084 80240674 03E00008 */ jr $ra -/* C3B088 80240678 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/func_8024067C_C3AA10.s b/asm/nonmatchings/world/area_dgb/dgb_05/func_8024067C_C3AA10.s deleted file mode 100644 index 396b87090a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/func_8024067C_C3AA10.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024067C_C3B08C -/* C3B08C 8024067C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3B090 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* C3B094 80240684 0080882D */ daddu $s1, $a0, $zero -/* C3B098 80240688 AFBF0018 */ sw $ra, 0x18($sp) -/* C3B09C 8024068C AFB00010 */ sw $s0, 0x10($sp) -/* C3B0A0 80240690 8E300148 */ lw $s0, 0x148($s1) -/* C3B0A4 80240694 0C00EABB */ jal get_npc_unsafe -/* C3B0A8 80240698 86040008 */ lh $a0, 8($s0) -/* C3B0AC 8024069C 0040202D */ daddu $a0, $v0, $zero -/* C3B0B0 802406A0 8482008E */ lh $v0, 0x8e($a0) -/* C3B0B4 802406A4 9483008E */ lhu $v1, 0x8e($a0) -/* C3B0B8 802406A8 18400002 */ blez $v0, .L802406B4 -/* C3B0BC 802406AC 2462FFFF */ addiu $v0, $v1, -1 -/* C3B0C0 802406B0 A482008E */ sh $v0, 0x8e($a0) -.L802406B4: -/* C3B0C4 802406B4 8482008E */ lh $v0, 0x8e($a0) -/* C3B0C8 802406B8 24030001 */ addiu $v1, $zero, 1 -/* C3B0CC 802406BC 14430005 */ bne $v0, $v1, .L802406D4 -/* C3B0D0 802406C0 00000000 */ nop -/* C3B0D4 802406C4 8E0200CC */ lw $v0, 0xcc($s0) -/* C3B0D8 802406C8 8C420030 */ lw $v0, 0x30($v0) -/* C3B0DC 802406CC 080901BC */ j .L802406F0 -/* C3B0E0 802406D0 AC820028 */ sw $v0, 0x28($a0) -.L802406D4: -/* C3B0E4 802406D4 1C400006 */ bgtz $v0, .L802406F0 -/* C3B0E8 802406D8 00000000 */ nop -/* C3B0EC 802406DC 8E0200CC */ lw $v0, 0xcc($s0) -/* C3B0F0 802406E0 8C420028 */ lw $v0, 0x28($v0) -/* C3B0F4 802406E4 A480008E */ sh $zero, 0x8e($a0) -/* C3B0F8 802406E8 AC820028 */ sw $v0, 0x28($a0) -/* C3B0FC 802406EC AE230070 */ sw $v1, 0x70($s1) -.L802406F0: -/* C3B100 802406F0 8FBF0018 */ lw $ra, 0x18($sp) -/* C3B104 802406F4 8FB10014 */ lw $s1, 0x14($sp) -/* C3B108 802406F8 8FB00010 */ lw $s0, 0x10($sp) -/* C3B10C 802406FC 03E00008 */ jr $ra -/* C3B110 80240700 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240704_C3AA10.s b/asm/nonmatchings/world/area_dgb/dgb_05/func_80240704_C3AA10.s deleted file mode 100644 index e026d53f8a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240704_C3AA10.s +++ /dev/null @@ -1,192 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240704_C3B114 -/* C3B114 80240704 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C3B118 80240708 AFB40048 */ sw $s4, 0x48($sp) -/* C3B11C 8024070C 0080A02D */ daddu $s4, $a0, $zero -/* C3B120 80240710 AFBF004C */ sw $ra, 0x4c($sp) -/* C3B124 80240714 AFB30044 */ sw $s3, 0x44($sp) -/* C3B128 80240718 AFB20040 */ sw $s2, 0x40($sp) -/* C3B12C 8024071C AFB1003C */ sw $s1, 0x3c($sp) -/* C3B130 80240720 AFB00038 */ sw $s0, 0x38($sp) -/* C3B134 80240724 8E930148 */ lw $s3, 0x148($s4) -/* C3B138 80240728 00C0802D */ daddu $s0, $a2, $zero -/* C3B13C 8024072C 86640008 */ lh $a0, 8($s3) -/* C3B140 80240730 0C00EABB */ jal get_npc_unsafe -/* C3B144 80240734 0000902D */ daddu $s2, $zero, $zero -/* C3B148 80240738 0C039D59 */ jal get_player_data -/* C3B14C 8024073C 0040882D */ daddu $s1, $v0, $zero -/* C3B150 80240740 0200202D */ daddu $a0, $s0, $zero -/* C3B154 80240744 0260282D */ daddu $a1, $s3, $zero -/* C3B158 80240748 0000382D */ daddu $a3, $zero, $zero -/* C3B15C 8024074C 3C0642A0 */ lui $a2, 0x42a0 -/* C3B160 80240750 0040802D */ daddu $s0, $v0, $zero -/* C3B164 80240754 0C01242D */ jal func_800490B4 -/* C3B168 80240758 AFA00010 */ sw $zero, 0x10($sp) -/* C3B16C 8024075C 10400022 */ beqz $v0, .L802407E8 -/* C3B170 80240760 00000000 */ nop -/* C3B174 80240764 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C3B178 80240768 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3B17C 8024076C 804300B4 */ lb $v1, 0xb4($v0) -/* C3B180 80240770 24020002 */ addiu $v0, $zero, 2 -/* C3B184 80240774 10620013 */ beq $v1, $v0, .L802407C4 -/* C3B188 80240778 2402001A */ addiu $v0, $zero, 0x1a -/* C3B18C 8024077C 10620011 */ beq $v1, $v0, .L802407C4 -/* C3B190 80240780 24020003 */ addiu $v0, $zero, 3 -/* C3B194 80240784 1062000F */ beq $v1, $v0, .L802407C4 -/* C3B198 80240788 2402000E */ addiu $v0, $zero, 0xe -/* C3B19C 8024078C 1062000D */ beq $v1, $v0, .L802407C4 -/* C3B1A0 80240790 24020010 */ addiu $v0, $zero, 0x10 -/* C3B1A4 80240794 1062000B */ beq $v1, $v0, .L802407C4 -/* C3B1A8 80240798 2402000B */ addiu $v0, $zero, 0xb -/* C3B1AC 8024079C 10620009 */ beq $v1, $v0, .L802407C4 -/* C3B1B0 802407A0 2402000A */ addiu $v0, $zero, 0xa -/* C3B1B4 802407A4 10620007 */ beq $v1, $v0, .L802407C4 -/* C3B1B8 802407A8 24020012 */ addiu $v0, $zero, 0x12 -/* C3B1BC 802407AC 10620005 */ beq $v1, $v0, .L802407C4 -/* C3B1C0 802407B0 24020013 */ addiu $v0, $zero, 0x13 -/* C3B1C4 802407B4 10620003 */ beq $v1, $v0, .L802407C4 -/* C3B1C8 802407B8 24020025 */ addiu $v0, $zero, 0x25 -/* C3B1CC 802407BC 14620002 */ bne $v1, $v0, .L802407C8 -/* C3B1D0 802407C0 00000000 */ nop -.L802407C4: -/* C3B1D4 802407C4 24120001 */ addiu $s2, $zero, 1 -.L802407C8: -/* C3B1D8 802407C8 82030012 */ lb $v1, 0x12($s0) -/* C3B1DC 802407CC 24020002 */ addiu $v0, $zero, 2 -/* C3B1E0 802407D0 14620007 */ bne $v1, $v0, .L802407F0 -/* C3B1E4 802407D4 24020001 */ addiu $v0, $zero, 1 -/* C3B1E8 802407D8 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C3B1EC 802407DC 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C3B1F0 802407E0 50430002 */ beql $v0, $v1, .L802407EC -/* C3B1F4 802407E4 24120001 */ addiu $s2, $zero, 1 -.L802407E8: -/* C3B1F8 802407E8 82030012 */ lb $v1, 0x12($s0) -.L802407EC: -/* C3B1FC 802407EC 24020001 */ addiu $v0, $zero, 1 -.L802407F0: -/* C3B200 802407F0 14620006 */ bne $v1, $v0, .L8024080C -/* C3B204 802407F4 24020003 */ addiu $v0, $zero, 3 -/* C3B208 802407F8 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C3B20C 802407FC 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C3B210 80240800 14400008 */ bnez $v0, .L80240824 -/* C3B214 80240804 27A40028 */ addiu $a0, $sp, 0x28 -/* C3B218 80240808 24020003 */ addiu $v0, $zero, 3 -.L8024080C: -/* C3B21C 8024080C 1462001B */ bne $v1, $v0, .L8024087C -/* C3B220 80240810 24020002 */ addiu $v0, $zero, 2 -/* C3B224 80240814 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C3B228 80240818 8063EBB0 */ lb $v1, %lo(D_8010EBB0)($v1) -/* C3B22C 8024081C 14620017 */ bne $v1, $v0, .L8024087C -/* C3B230 80240820 27A40028 */ addiu $a0, $sp, 0x28 -.L80240824: -/* C3B234 80240824 27A5002C */ addiu $a1, $sp, 0x2c -/* C3B238 80240828 8E27000C */ lw $a3, 0xc($s1) -/* C3B23C 8024082C C6200038 */ lwc1 $f0, 0x38($s1) -/* C3B240 80240830 C6220040 */ lwc1 $f2, 0x40($s1) -/* C3B244 80240834 0000302D */ daddu $a2, $zero, $zero -/* C3B248 80240838 E7A00028 */ swc1 $f0, 0x28($sp) -/* C3B24C 8024083C 0C00A7E7 */ jal add_vec2D_polar -/* C3B250 80240840 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C3B254 80240844 3C028011 */ lui $v0, 0x8011 -/* C3B258 80240848 8C42C930 */ lw $v0, -0x36d0($v0) -/* C3B25C 8024084C C7AC0028 */ lwc1 $f12, 0x28($sp) -/* C3B260 80240850 C7AE002C */ lwc1 $f14, 0x2c($sp) -/* C3B264 80240854 8C460038 */ lw $a2, 0x38($v0) -/* C3B268 80240858 0C00A7B5 */ jal dist2D -/* C3B26C 8024085C 8C470040 */ lw $a3, 0x40($v0) -/* C3B270 80240860 3C0142A0 */ lui $at, 0x42a0 -/* C3B274 80240864 44811000 */ mtc1 $at, $f2 -/* C3B278 80240868 00000000 */ nop -/* C3B27C 8024086C 4602003E */ c.le.s $f0, $f2 -/* C3B280 80240870 00000000 */ nop -/* C3B284 80240874 45030001 */ bc1tl .L8024087C -/* C3B288 80240878 24120001 */ addiu $s2, $zero, 1 -.L8024087C: -/* C3B28C 8024087C 12400026 */ beqz $s2, .L80240918 -/* C3B290 80240880 0220202D */ daddu $a0, $s1, $zero -/* C3B294 80240884 3C05B000 */ lui $a1, 0xb000 -/* C3B298 80240888 34A5000E */ ori $a1, $a1, 0xe -/* C3B29C 8024088C 0C012530 */ jal func_800494C0 -/* C3B2A0 80240890 0000302D */ daddu $a2, $zero, $zero -/* C3B2A4 80240894 0000202D */ daddu $a0, $zero, $zero -/* C3B2A8 80240898 0220282D */ daddu $a1, $s1, $zero -/* C3B2AC 8024089C 0000302D */ daddu $a2, $zero, $zero -/* C3B2B0 802408A0 862200A8 */ lh $v0, 0xa8($s1) -/* C3B2B4 802408A4 8E6300CC */ lw $v1, 0xcc($s3) -/* C3B2B8 802408A8 3C013F80 */ lui $at, 0x3f80 -/* C3B2BC 802408AC 44810000 */ mtc1 $at, $f0 -/* C3B2C0 802408B0 3C014000 */ lui $at, 0x4000 -/* C3B2C4 802408B4 44811000 */ mtc1 $at, $f2 -/* C3B2C8 802408B8 3C01C1A0 */ lui $at, 0xc1a0 -/* C3B2CC 802408BC 44812000 */ mtc1 $at, $f4 -/* C3B2D0 802408C0 44823000 */ mtc1 $v0, $f6 -/* C3B2D4 802408C4 00000000 */ nop -/* C3B2D8 802408C8 468031A0 */ cvt.s.w $f6, $f6 -/* C3B2DC 802408CC 44073000 */ mfc1 $a3, $f6 -/* C3B2E0 802408D0 8C63002C */ lw $v1, 0x2c($v1) -/* C3B2E4 802408D4 2402000A */ addiu $v0, $zero, 0xa -/* C3B2E8 802408D8 A622008E */ sh $v0, 0x8e($s1) -/* C3B2EC 802408DC 2402000F */ addiu $v0, $zero, 0xf -/* C3B2F0 802408E0 AE230028 */ sw $v1, 0x28($s1) -/* C3B2F4 802408E4 AFA2001C */ sw $v0, 0x1c($sp) -/* C3B2F8 802408E8 27A20030 */ addiu $v0, $sp, 0x30 -/* C3B2FC 802408EC E7A00010 */ swc1 $f0, 0x10($sp) -/* C3B300 802408F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* C3B304 802408F4 E7A40018 */ swc1 $f4, 0x18($sp) -/* C3B308 802408F8 0C01BFA4 */ jal fx_emote -/* C3B30C 802408FC AFA20020 */ sw $v0, 0x20($sp) -/* C3B310 80240900 0220202D */ daddu $a0, $s1, $zero -/* C3B314 80240904 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C3B318 80240908 0C012530 */ jal func_800494C0 -/* C3B31C 8024090C 3C060020 */ lui $a2, 0x20 -/* C3B320 80240910 24020002 */ addiu $v0, $zero, 2 -/* C3B324 80240914 AE820070 */ sw $v0, 0x70($s4) -.L80240918: -/* C3B328 80240918 9622008E */ lhu $v0, 0x8e($s1) -/* C3B32C 8024091C 24420001 */ addiu $v0, $v0, 1 -/* C3B330 80240920 A622008E */ sh $v0, 0x8e($s1) -/* C3B334 80240924 00021400 */ sll $v0, $v0, 0x10 -/* C3B338 80240928 00021C03 */ sra $v1, $v0, 0x10 -/* C3B33C 8024092C 2402001B */ addiu $v0, $zero, 0x1b -/* C3B340 80240930 14620005 */ bne $v1, $v0, .L80240948 -/* C3B344 80240934 24020039 */ addiu $v0, $zero, 0x39 -/* C3B348 80240938 0220202D */ daddu $a0, $s1, $zero -/* C3B34C 8024093C 3C05B000 */ lui $a1, 0xb000 -/* C3B350 80240940 08090257 */ j .L8024095C -/* C3B354 80240944 34A5000C */ ori $a1, $a1, 0xc -.L80240948: -/* C3B358 80240948 14620008 */ bne $v1, $v0, .L8024096C -/* C3B35C 8024094C 2402003B */ addiu $v0, $zero, 0x3b -/* C3B360 80240950 0220202D */ daddu $a0, $s1, $zero -/* C3B364 80240954 3C05B000 */ lui $a1, 0xb000 -/* C3B368 80240958 34A5000D */ ori $a1, $a1, 0xd -.L8024095C: -/* C3B36C 8024095C 0C012530 */ jal func_800494C0 -/* C3B370 80240960 0000302D */ daddu $a2, $zero, $zero -/* C3B374 80240964 08090267 */ j .L8024099C -/* C3B378 80240968 00000000 */ nop -.L8024096C: -/* C3B37C 8024096C 14620005 */ bne $v1, $v0, .L80240984 -/* C3B380 80240970 2402003C */ addiu $v0, $zero, 0x3c -/* C3B384 80240974 8E6200CC */ lw $v0, 0xcc($s3) -/* C3B388 80240978 8C420030 */ lw $v0, 0x30($v0) -/* C3B38C 8024097C 08090267 */ j .L8024099C -/* C3B390 80240980 AE220028 */ sw $v0, 0x28($s1) -.L80240984: -/* C3B394 80240984 14620005 */ bne $v1, $v0, .L8024099C -/* C3B398 80240988 00000000 */ nop -/* C3B39C 8024098C 8E6200CC */ lw $v0, 0xcc($s3) -/* C3B3A0 80240990 8C420028 */ lw $v0, 0x28($v0) -/* C3B3A4 80240994 A620008E */ sh $zero, 0x8e($s1) -/* C3B3A8 80240998 AE220028 */ sw $v0, 0x28($s1) -.L8024099C: -/* C3B3AC 8024099C 8FBF004C */ lw $ra, 0x4c($sp) -/* C3B3B0 802409A0 8FB40048 */ lw $s4, 0x48($sp) -/* C3B3B4 802409A4 8FB30044 */ lw $s3, 0x44($sp) -/* C3B3B8 802409A8 8FB20040 */ lw $s2, 0x40($sp) -/* C3B3BC 802409AC 8FB1003C */ lw $s1, 0x3c($sp) -/* C3B3C0 802409B0 8FB00038 */ lw $s0, 0x38($sp) -/* C3B3C4 802409B4 03E00008 */ jr $ra -/* C3B3C8 802409B8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240A20_C3AA10.s b/asm/nonmatchings/world/area_dgb/dgb_05/func_80240A20_C3AA10.s deleted file mode 100644 index 5d94a53670..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240A20_C3AA10.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A20_C3B430 -/* C3B430 80240A20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3B434 80240A24 AFB10014 */ sw $s1, 0x14($sp) -/* C3B438 80240A28 0080882D */ daddu $s1, $a0, $zero -/* C3B43C 80240A2C AFBF001C */ sw $ra, 0x1c($sp) -/* C3B440 80240A30 AFB20018 */ sw $s2, 0x18($sp) -/* C3B444 80240A34 AFB00010 */ sw $s0, 0x10($sp) -/* C3B448 80240A38 8E320148 */ lw $s2, 0x148($s1) -/* C3B44C 80240A3C 0C00EABB */ jal get_npc_unsafe -/* C3B450 80240A40 86440008 */ lh $a0, 8($s2) -/* C3B454 80240A44 240400B4 */ addiu $a0, $zero, 0xb4 -/* C3B458 80240A48 0C00A67F */ jal rand_int -/* C3B45C 80240A4C 0040802D */ daddu $s0, $v0, $zero -/* C3B460 80240A50 C60C000C */ lwc1 $f12, 0xc($s0) -/* C3B464 80240A54 44820000 */ mtc1 $v0, $f0 -/* C3B468 80240A58 00000000 */ nop -/* C3B46C 80240A5C 46800020 */ cvt.s.w $f0, $f0 -/* C3B470 80240A60 46006300 */ add.s $f12, $f12, $f0 -/* C3B474 80240A64 3C0142B4 */ lui $at, 0x42b4 -/* C3B478 80240A68 44810000 */ mtc1 $at, $f0 -/* C3B47C 80240A6C 0C00A6C9 */ jal clamp_angle -/* C3B480 80240A70 46006301 */ sub.s $f12, $f12, $f0 -/* C3B484 80240A74 E600000C */ swc1 $f0, 0xc($s0) -/* C3B488 80240A78 8E4200CC */ lw $v0, 0xcc($s2) -/* C3B48C 80240A7C 8C420000 */ lw $v0, ($v0) -/* C3B490 80240A80 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C3B494 80240A84 0C00A67F */ jal rand_int -/* C3B498 80240A88 AE020028 */ sw $v0, 0x28($s0) -/* C3B49C 80240A8C 00021FC2 */ srl $v1, $v0, 0x1f -/* C3B4A0 80240A90 00431821 */ addu $v1, $v0, $v1 -/* C3B4A4 80240A94 00031843 */ sra $v1, $v1, 1 -/* C3B4A8 80240A98 00031840 */ sll $v1, $v1, 1 -/* C3B4AC 80240A9C 00431023 */ subu $v0, $v0, $v1 -/* C3B4B0 80240AA0 24420002 */ addiu $v0, $v0, 2 -/* C3B4B4 80240AA4 AE220074 */ sw $v0, 0x74($s1) -/* C3B4B8 80240AA8 24020004 */ addiu $v0, $zero, 4 -/* C3B4BC 80240AAC AE220070 */ sw $v0, 0x70($s1) -/* C3B4C0 80240AB0 8FBF001C */ lw $ra, 0x1c($sp) -/* C3B4C4 80240AB4 8FB20018 */ lw $s2, 0x18($sp) -/* C3B4C8 80240AB8 8FB10014 */ lw $s1, 0x14($sp) -/* C3B4CC 80240ABC 8FB00010 */ lw $s0, 0x10($sp) -/* C3B4D0 80240AC0 03E00008 */ jr $ra -/* C3B4D4 80240AC4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240AC8_C3AA10.s b/asm/nonmatchings/world/area_dgb/dgb_05/func_80240AC8_C3AA10.s deleted file mode 100644 index 77f8bffc06..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240AC8_C3AA10.s +++ /dev/null @@ -1,87 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AC8_C3B4D8 -/* C3B4D8 80240AC8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C3B4DC 80240ACC AFB20020 */ sw $s2, 0x20($sp) -/* C3B4E0 80240AD0 0080902D */ daddu $s2, $a0, $zero -/* C3B4E4 80240AD4 AFBF0028 */ sw $ra, 0x28($sp) -/* C3B4E8 80240AD8 AFB30024 */ sw $s3, 0x24($sp) -/* C3B4EC 80240ADC AFB1001C */ sw $s1, 0x1c($sp) -/* C3B4F0 80240AE0 AFB00018 */ sw $s0, 0x18($sp) -/* C3B4F4 80240AE4 8E510148 */ lw $s1, 0x148($s2) -/* C3B4F8 80240AE8 00A0982D */ daddu $s3, $a1, $zero -/* C3B4FC 80240AEC 86240008 */ lh $a0, 8($s1) -/* C3B500 80240AF0 0C00EABB */ jal get_npc_unsafe -/* C3B504 80240AF4 00C0802D */ daddu $s0, $a2, $zero -/* C3B508 80240AF8 0200202D */ daddu $a0, $s0, $zero -/* C3B50C 80240AFC 0040802D */ daddu $s0, $v0, $zero -/* C3B510 80240B00 AFA00010 */ sw $zero, 0x10($sp) -/* C3B514 80240B04 8E660024 */ lw $a2, 0x24($s3) -/* C3B518 80240B08 8E670028 */ lw $a3, 0x28($s3) -/* C3B51C 80240B0C 0C01242D */ jal func_800490B4 -/* C3B520 80240B10 0220282D */ daddu $a1, $s1, $zero -/* C3B524 80240B14 1040000C */ beqz $v0, .L80240B48 -/* C3B528 80240B18 00000000 */ nop -/* C3B52C 80240B1C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C3B530 80240B20 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3B534 80240B24 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3B538 80240B28 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3B53C 80240B2C 8C460028 */ lw $a2, 0x28($v0) -/* C3B540 80240B30 0C00A720 */ jal atan2 -/* C3B544 80240B34 8C470030 */ lw $a3, 0x30($v0) -/* C3B548 80240B38 2402000C */ addiu $v0, $zero, 0xc -/* C3B54C 80240B3C E600000C */ swc1 $f0, 0xc($s0) -/* C3B550 80240B40 080902F9 */ j .L80240BE4 -/* C3B554 80240B44 AE420070 */ sw $v0, 0x70($s2) -.L80240B48: -/* C3B558 80240B48 9602008E */ lhu $v0, 0x8e($s0) -/* C3B55C 80240B4C 2442FFFF */ addiu $v0, $v0, -1 -/* C3B560 80240B50 A602008E */ sh $v0, 0x8e($s0) -/* C3B564 80240B54 00021400 */ sll $v0, $v0, 0x10 -/* C3B568 80240B58 1C400022 */ bgtz $v0, .L80240BE4 -/* C3B56C 80240B5C 00000000 */ nop -/* C3B570 80240B60 8E420074 */ lw $v0, 0x74($s2) -/* C3B574 80240B64 2442FFFF */ addiu $v0, $v0, -1 -/* C3B578 80240B68 18400014 */ blez $v0, .L80240BBC -/* C3B57C 80240B6C AE420074 */ sw $v0, 0x74($s2) -/* C3B580 80240B70 C600000C */ lwc1 $f0, 0xc($s0) -/* C3B584 80240B74 3C014334 */ lui $at, 0x4334 -/* C3B588 80240B78 44816000 */ mtc1 $at, $f12 -/* C3B58C 80240B7C 0C00A6C9 */ jal clamp_angle -/* C3B590 80240B80 460C0300 */ add.s $f12, $f0, $f12 -/* C3B594 80240B84 E600000C */ swc1 $f0, 0xc($s0) -/* C3B598 80240B88 8E640008 */ lw $a0, 8($s3) -/* C3B59C 80240B8C 000417C2 */ srl $v0, $a0, 0x1f -/* C3B5A0 80240B90 00822021 */ addu $a0, $a0, $v0 -/* C3B5A4 80240B94 00042043 */ sra $a0, $a0, 1 -/* C3B5A8 80240B98 0C00A67F */ jal rand_int -/* C3B5AC 80240B9C 24840001 */ addiu $a0, $a0, 1 -/* C3B5B0 80240BA0 8E630008 */ lw $v1, 8($s3) -/* C3B5B4 80240BA4 000327C2 */ srl $a0, $v1, 0x1f -/* C3B5B8 80240BA8 00641821 */ addu $v1, $v1, $a0 -/* C3B5BC 80240BAC 00031843 */ sra $v1, $v1, 1 -/* C3B5C0 80240BB0 00621821 */ addu $v1, $v1, $v0 -/* C3B5C4 80240BB4 080902F9 */ j .L80240BE4 -/* C3B5C8 80240BB8 A603008E */ sh $v1, 0x8e($s0) -.L80240BBC: -/* C3B5CC 80240BBC 8E250088 */ lw $a1, 0x88($s1) -/* C3B5D0 80240BC0 24020028 */ addiu $v0, $zero, 0x28 -/* C3B5D4 80240BC4 14A20003 */ bne $a1, $v0, .L80240BD4 -/* C3B5D8 80240BC8 24020032 */ addiu $v0, $zero, 0x32 -/* C3B5DC 80240BCC 080902F7 */ j .L80240BDC -/* C3B5E0 80240BD0 24020014 */ addiu $v0, $zero, 0x14 -.L80240BD4: -/* C3B5E4 80240BD4 14A20003 */ bne $a1, $v0, .L80240BE4 -/* C3B5E8 80240BD8 24020019 */ addiu $v0, $zero, 0x19 -.L80240BDC: -/* C3B5EC 80240BDC A602008E */ sh $v0, 0x8e($s0) -/* C3B5F0 80240BE0 AE450070 */ sw $a1, 0x70($s2) -.L80240BE4: -/* C3B5F4 80240BE4 8FBF0028 */ lw $ra, 0x28($sp) -/* C3B5F8 80240BE8 8FB30024 */ lw $s3, 0x24($sp) -/* C3B5FC 80240BEC 8FB20020 */ lw $s2, 0x20($sp) -/* C3B600 80240BF0 8FB1001C */ lw $s1, 0x1c($sp) -/* C3B604 80240BF4 8FB00018 */ lw $s0, 0x18($sp) -/* C3B608 80240BF8 03E00008 */ jr $ra -/* C3B60C 80240BFC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240CAC_C3AA10.s b/asm/nonmatchings/world/area_dgb/dgb_05/func_80240CAC_C3AA10.s deleted file mode 100644 index 696d7b7971..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240CAC_C3AA10.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CAC_C3B6BC -/* C3B6BC 80240CAC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C3B6C0 80240CB0 AFB3002C */ sw $s3, 0x2c($sp) -/* C3B6C4 80240CB4 0080982D */ daddu $s3, $a0, $zero -/* C3B6C8 80240CB8 AFBF0030 */ sw $ra, 0x30($sp) -/* C3B6CC 80240CBC AFB20028 */ sw $s2, 0x28($sp) -/* C3B6D0 80240CC0 AFB10024 */ sw $s1, 0x24($sp) -/* C3B6D4 80240CC4 AFB00020 */ sw $s0, 0x20($sp) -/* C3B6D8 80240CC8 8E720148 */ lw $s2, 0x148($s3) -/* C3B6DC 80240CCC 00A0882D */ daddu $s1, $a1, $zero -/* C3B6E0 80240CD0 86440008 */ lh $a0, 8($s2) -/* C3B6E4 80240CD4 0C00EABB */ jal get_npc_unsafe -/* C3B6E8 80240CD8 00C0802D */ daddu $s0, $a2, $zero -/* C3B6EC 80240CDC 0200202D */ daddu $a0, $s0, $zero -/* C3B6F0 80240CE0 0240282D */ daddu $a1, $s2, $zero -/* C3B6F4 80240CE4 AFA00010 */ sw $zero, 0x10($sp) -/* C3B6F8 80240CE8 8E260024 */ lw $a2, 0x24($s1) -/* C3B6FC 80240CEC 8E270028 */ lw $a3, 0x28($s1) -/* C3B700 80240CF0 0C01242D */ jal func_800490B4 -/* C3B704 80240CF4 0040802D */ daddu $s0, $v0, $zero -/* C3B708 80240CF8 1040000C */ beqz $v0, .L80240D2C -/* C3B70C 80240CFC 00000000 */ nop -/* C3B710 80240D00 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3B714 80240D04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C3B718 80240D08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3B71C 80240D0C C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3B720 80240D10 8C460028 */ lw $a2, 0x28($v0) -/* C3B724 80240D14 0C00A720 */ jal atan2 -/* C3B728 80240D18 8C470030 */ lw $a3, 0x30($v0) -/* C3B72C 80240D1C 2402000C */ addiu $v0, $zero, 0xc -/* C3B730 80240D20 E600000C */ swc1 $f0, 0xc($s0) -/* C3B734 80240D24 08090382 */ j .L80240E08 -/* C3B738 80240D28 AE620070 */ sw $v0, 0x70($s3) -.L80240D2C: -/* C3B73C 80240D2C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3B740 80240D30 8E4200D0 */ lw $v0, 0xd0($s2) -/* C3B744 80240D34 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3B748 80240D38 C4440000 */ lwc1 $f4, ($v0) -/* C3B74C 80240D3C 46802120 */ cvt.s.w $f4, $f4 -/* C3B750 80240D40 44062000 */ mfc1 $a2, $f4 -/* C3B754 80240D44 C4440008 */ lwc1 $f4, 8($v0) -/* C3B758 80240D48 46802120 */ cvt.s.w $f4, $f4 -/* C3B75C 80240D4C 44072000 */ mfc1 $a3, $f4 -/* C3B760 80240D50 0C00A7B5 */ jal dist2D -/* C3B764 80240D54 00000000 */ nop -/* C3B768 80240D58 C6020018 */ lwc1 $f2, 0x18($s0) -/* C3B76C 80240D5C 4602003E */ c.le.s $f0, $f2 -/* C3B770 80240D60 00000000 */ nop -/* C3B774 80240D64 4500000B */ bc1f .L80240D94 -/* C3B778 80240D68 00000000 */ nop -/* C3B77C 80240D6C 8E4200CC */ lw $v0, 0xcc($s2) -/* C3B780 80240D70 8C430000 */ lw $v1, ($v0) -/* C3B784 80240D74 2402000F */ addiu $v0, $zero, 0xf -/* C3B788 80240D78 A602008E */ sh $v0, 0x8e($s0) -/* C3B78C 80240D7C 24020032 */ addiu $v0, $zero, 0x32 -/* C3B790 80240D80 AE030028 */ sw $v1, 0x28($s0) -/* C3B794 80240D84 AE420088 */ sw $v0, 0x88($s2) -/* C3B798 80240D88 24020003 */ addiu $v0, $zero, 3 -/* C3B79C 80240D8C 08090382 */ j .L80240E08 -/* C3B7A0 80240D90 AE620070 */ sw $v0, 0x70($s3) -.L80240D94: -/* C3B7A4 80240D94 8602008C */ lh $v0, 0x8c($s0) -/* C3B7A8 80240D98 1440001B */ bnez $v0, .L80240E08 -/* C3B7AC 80240D9C 0200202D */ daddu $a0, $s0, $zero -/* C3B7B0 80240DA0 27A60018 */ addiu $a2, $sp, 0x18 -/* C3B7B4 80240DA4 3C0540A0 */ lui $a1, 0x40a0 -/* C3B7B8 80240DA8 C600000C */ lwc1 $f0, 0xc($s0) -/* C3B7BC 80240DAC 0000382D */ daddu $a3, $zero, $zero -/* C3B7C0 80240DB0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C3B7C4 80240DB4 AFA00010 */ sw $zero, 0x10($sp) -/* C3B7C8 80240DB8 0C0129E1 */ jal func_8004A784 -/* C3B7CC 80240DBC AFA00014 */ sw $zero, 0x14($sp) -/* C3B7D0 80240DC0 C7A00018 */ lwc1 $f0, 0x18($sp) -/* C3B7D4 80240DC4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3B7D8 80240DC8 E600000C */ swc1 $f0, 0xc($s0) -/* C3B7DC 80240DCC 8E4200D0 */ lw $v0, 0xd0($s2) -/* C3B7E0 80240DD0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3B7E4 80240DD4 C4440000 */ lwc1 $f4, ($v0) -/* C3B7E8 80240DD8 46802120 */ cvt.s.w $f4, $f4 -/* C3B7EC 80240DDC 44062000 */ mfc1 $a2, $f4 -/* C3B7F0 80240DE0 C4440008 */ lwc1 $f4, 8($v0) -/* C3B7F4 80240DE4 46802120 */ cvt.s.w $f4, $f4 -/* C3B7F8 80240DE8 44072000 */ mfc1 $a3, $f4 -/* C3B7FC 80240DEC 0C00A720 */ jal atan2 -/* C3B800 80240DF0 00000000 */ nop -/* C3B804 80240DF4 8E050018 */ lw $a1, 0x18($s0) -/* C3B808 80240DF8 44060000 */ mfc1 $a2, $f0 -/* C3B80C 80240DFC 0200202D */ daddu $a0, $s0, $zero -/* C3B810 80240E00 0C00EA95 */ jal npc_move_heading -/* C3B814 80240E04 AC86000C */ sw $a2, 0xc($a0) -.L80240E08: -/* C3B818 80240E08 8FBF0030 */ lw $ra, 0x30($sp) -/* C3B81C 80240E0C 8FB3002C */ lw $s3, 0x2c($sp) -/* C3B820 80240E10 8FB20028 */ lw $s2, 0x28($sp) -/* C3B824 80240E14 8FB10024 */ lw $s1, 0x24($sp) -/* C3B828 80240E18 8FB00020 */ lw $s0, 0x20($sp) -/* C3B82C 80240E1C 03E00008 */ jr $ra -/* C3B830 80240E20 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240E24_C3AA10.s b/asm/nonmatchings/world/area_dgb/dgb_05/func_80240E24_C3AA10.s deleted file mode 100644 index 45a298c215..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240E24_C3AA10.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E24_C3B834 -/* C3B834 80240E24 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C3B838 80240E28 AFB00010 */ sw $s0, 0x10($sp) -/* C3B83C 80240E2C 0080802D */ daddu $s0, $a0, $zero -/* C3B840 80240E30 AFBF0014 */ sw $ra, 0x14($sp) -/* C3B844 80240E34 8E020148 */ lw $v0, 0x148($s0) -/* C3B848 80240E38 0C00EABB */ jal get_npc_unsafe -/* C3B84C 80240E3C 84440008 */ lh $a0, 8($v0) -/* C3B850 80240E40 0040182D */ daddu $v1, $v0, $zero -/* C3B854 80240E44 8462008C */ lh $v0, 0x8c($v1) -/* C3B858 80240E48 14400009 */ bnez $v0, .L80240E70 -/* C3B85C 80240E4C 00000000 */ nop -/* C3B860 80240E50 9462008E */ lhu $v0, 0x8e($v1) -/* C3B864 80240E54 2442FFFF */ addiu $v0, $v0, -1 -/* C3B868 80240E58 A462008E */ sh $v0, 0x8e($v1) -/* C3B86C 80240E5C 00021400 */ sll $v0, $v0, 0x10 -/* C3B870 80240E60 1C400003 */ bgtz $v0, .L80240E70 -/* C3B874 80240E64 00000000 */ nop -/* C3B878 80240E68 A460008E */ sh $zero, 0x8e($v1) -/* C3B87C 80240E6C AE000070 */ sw $zero, 0x70($s0) -.L80240E70: -/* C3B880 80240E70 8FBF0014 */ lw $ra, 0x14($sp) -/* C3B884 80240E74 8FB00010 */ lw $s0, 0x10($sp) -/* C3B888 80240E78 03E00008 */ jr $ra -/* C3B88C 80240E7C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240E80_C3AA10.s b/asm/nonmatchings/world/area_dgb/dgb_05/func_80240E80_C3AA10.s deleted file mode 100644 index 7a1cde69c0..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/func_80240E80_C3AA10.s +++ /dev/null @@ -1,223 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E80_C3B890 -/* C3B890 80240E80 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C3B894 80240E84 AFB20038 */ sw $s2, 0x38($sp) -/* C3B898 80240E88 0080902D */ daddu $s2, $a0, $zero -/* C3B89C 80240E8C AFBF0048 */ sw $ra, 0x48($sp) -/* C3B8A0 80240E90 AFB50044 */ sw $s5, 0x44($sp) -/* C3B8A4 80240E94 AFB40040 */ sw $s4, 0x40($sp) -/* C3B8A8 80240E98 AFB3003C */ sw $s3, 0x3c($sp) -/* C3B8AC 80240E9C AFB10034 */ sw $s1, 0x34($sp) -/* C3B8B0 80240EA0 AFB00030 */ sw $s0, 0x30($sp) -/* C3B8B4 80240EA4 8E510148 */ lw $s1, 0x148($s2) -/* C3B8B8 80240EA8 86240008 */ lh $a0, 8($s1) -/* C3B8BC 80240EAC 0C00EABB */ jal get_npc_unsafe -/* C3B8C0 80240EB0 00A0802D */ daddu $s0, $a1, $zero -/* C3B8C4 80240EB4 8E43000C */ lw $v1, 0xc($s2) -/* C3B8C8 80240EB8 0240202D */ daddu $a0, $s2, $zero -/* C3B8CC 80240EBC 8C650000 */ lw $a1, ($v1) -/* C3B8D0 80240EC0 0C0B1EAF */ jal get_variable -/* C3B8D4 80240EC4 0040A02D */ daddu $s4, $v0, $zero -/* C3B8D8 80240EC8 AFA00010 */ sw $zero, 0x10($sp) -/* C3B8DC 80240ECC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3B8E0 80240ED0 8C630030 */ lw $v1, 0x30($v1) -/* C3B8E4 80240ED4 AFA30014 */ sw $v1, 0x14($sp) -/* C3B8E8 80240ED8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3B8EC 80240EDC 8C63001C */ lw $v1, 0x1c($v1) -/* C3B8F0 80240EE0 AFA30018 */ sw $v1, 0x18($sp) -/* C3B8F4 80240EE4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3B8F8 80240EE8 8C630024 */ lw $v1, 0x24($v1) -/* C3B8FC 80240EEC AFA3001C */ sw $v1, 0x1c($sp) -/* C3B900 80240EF0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3B904 80240EF4 8C630028 */ lw $v1, 0x28($v1) -/* C3B908 80240EF8 27B50010 */ addiu $s5, $sp, 0x10 -/* C3B90C 80240EFC AFA30020 */ sw $v1, 0x20($sp) -/* C3B910 80240F00 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3B914 80240F04 3C014220 */ lui $at, 0x4220 -/* C3B918 80240F08 44810000 */ mtc1 $at, $f0 -/* C3B91C 80240F0C 8C63002C */ lw $v1, 0x2c($v1) -/* C3B920 80240F10 0040982D */ daddu $s3, $v0, $zero -/* C3B924 80240F14 E7A00028 */ swc1 $f0, 0x28($sp) -/* C3B928 80240F18 A7A0002C */ sh $zero, 0x2c($sp) -/* C3B92C 80240F1C 16000005 */ bnez $s0, .L80240F34 -/* C3B930 80240F20 AFA30024 */ sw $v1, 0x24($sp) -/* C3B934 80240F24 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3B938 80240F28 30420004 */ andi $v0, $v0, 4 -/* C3B93C 80240F2C 10400027 */ beqz $v0, .L80240FCC -/* C3B940 80240F30 00000000 */ nop -.L80240F34: -/* C3B944 80240F34 2402001E */ addiu $v0, $zero, 0x1e -/* C3B948 80240F38 2404F7FF */ addiu $a0, $zero, -0x801 -/* C3B94C 80240F3C AE400070 */ sw $zero, 0x70($s2) -/* C3B950 80240F40 A682008E */ sh $v0, 0x8e($s4) -/* C3B954 80240F44 8E2300CC */ lw $v1, 0xcc($s1) -/* C3B958 80240F48 8E820000 */ lw $v0, ($s4) -/* C3B95C 80240F4C 8C630028 */ lw $v1, 0x28($v1) -/* C3B960 80240F50 00441024 */ and $v0, $v0, $a0 -/* C3B964 80240F54 AE820000 */ sw $v0, ($s4) -/* C3B968 80240F58 AE830028 */ sw $v1, 0x28($s4) -/* C3B96C 80240F5C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C3B970 80240F60 AE20006C */ sw $zero, 0x6c($s1) -/* C3B974 80240F64 8C420034 */ lw $v0, 0x34($v0) -/* C3B978 80240F68 14400006 */ bnez $v0, .L80240F84 -/* C3B97C 80240F6C 2403FDFF */ addiu $v1, $zero, -0x201 -/* C3B980 80240F70 8E820000 */ lw $v0, ($s4) -/* C3B984 80240F74 2403FFF7 */ addiu $v1, $zero, -9 -/* C3B988 80240F78 34420200 */ ori $v0, $v0, 0x200 -/* C3B98C 80240F7C 080903E4 */ j .L80240F90 -/* C3B990 80240F80 00431024 */ and $v0, $v0, $v1 -.L80240F84: -/* C3B994 80240F84 8E820000 */ lw $v0, ($s4) -/* C3B998 80240F88 00431024 */ and $v0, $v0, $v1 -/* C3B99C 80240F8C 34420008 */ ori $v0, $v0, 8 -.L80240F90: -/* C3B9A0 80240F90 AE820000 */ sw $v0, ($s4) -/* C3B9A4 80240F94 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3B9A8 80240F98 30420004 */ andi $v0, $v0, 4 -/* C3B9AC 80240F9C 10400007 */ beqz $v0, .L80240FBC -/* C3B9B0 80240FA0 24020063 */ addiu $v0, $zero, 0x63 -/* C3B9B4 80240FA4 AE420070 */ sw $v0, 0x70($s2) -/* C3B9B8 80240FA8 24020028 */ addiu $v0, $zero, 0x28 -/* C3B9BC 80240FAC AE420074 */ sw $v0, 0x74($s2) -/* C3B9C0 80240FB0 8E2200CC */ lw $v0, 0xcc($s1) -/* C3B9C4 80240FB4 8C420000 */ lw $v0, ($v0) -/* C3B9C8 80240FB8 AE820028 */ sw $v0, 0x28($s4) -.L80240FBC: -/* C3B9CC 80240FBC 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3B9D0 80240FC0 2403FFFB */ addiu $v1, $zero, -5 -/* C3B9D4 80240FC4 00431024 */ and $v0, $v0, $v1 -/* C3B9D8 80240FC8 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240FCC: -/* C3B9DC 80240FCC 8E420070 */ lw $v0, 0x70($s2) -/* C3B9E0 80240FD0 2442FFF6 */ addiu $v0, $v0, -0xa -/* C3B9E4 80240FD4 2C420014 */ sltiu $v0, $v0, 0x14 -/* C3B9E8 80240FD8 10400009 */ beqz $v0, .L80241000 -/* C3B9EC 80240FDC 00000000 */ nop -/* C3B9F0 80240FE0 8E22006C */ lw $v0, 0x6c($s1) -/* C3B9F4 80240FE4 14400006 */ bnez $v0, .L80241000 -/* C3B9F8 80240FE8 00000000 */ nop -/* C3B9FC 80240FEC 0C09009A */ jal func_80240268 -/* C3BA00 80240FF0 0240202D */ daddu $a0, $s2, $zero -/* C3BA04 80240FF4 10400002 */ beqz $v0, .L80241000 -/* C3BA08 80240FF8 2402001E */ addiu $v0, $zero, 0x1e -/* C3BA0C 80240FFC AE420070 */ sw $v0, 0x70($s2) -.L80241000: -/* C3BA10 80241000 8E430070 */ lw $v1, 0x70($s2) -/* C3BA14 80241004 2C620064 */ sltiu $v0, $v1, 0x64 -/* C3BA18 80241008 10400067 */ beqz $v0, .L802411A8 -/* C3BA1C 8024100C 00031080 */ sll $v0, $v1, 2 -/* C3BA20 80241010 3C018024 */ lui $at, 0x8024 -/* C3BA24 80241014 00220821 */ addu $at, $at, $v0 -/* C3BA28 80241018 8C222350 */ lw $v0, 0x2350($at) -/* C3BA2C 8024101C 00400008 */ jr $v0 -/* C3BA30 80241020 00000000 */ nop -/* C3BA34 80241024 0240202D */ daddu $a0, $s2, $zero -/* C3BA38 80241028 0260282D */ daddu $a1, $s3, $zero -/* C3BA3C 8024102C 0C09019F */ jal func_8024067C -/* C3BA40 80241030 02A0302D */ daddu $a2, $s5, $zero -/* C3BA44 80241034 0809046A */ j .L802411A8 -/* C3BA48 80241038 00000000 */ nop -/* C3BA4C 8024103C 0240202D */ daddu $a0, $s2, $zero -/* C3BA50 80241040 0260282D */ daddu $a1, $s3, $zero -/* C3BA54 80241044 0C0901C1 */ jal func_80240704 -/* C3BA58 80241048 02A0302D */ daddu $a2, $s5, $zero -/* C3BA5C 8024104C 0809046A */ j .L802411A8 -/* C3BA60 80241050 00000000 */ nop -/* C3BA64 80241054 0240202D */ daddu $a0, $s2, $zero -/* C3BA68 80241058 0260282D */ daddu $a1, $s3, $zero -/* C3BA6C 8024105C 0C09026F */ jal func_802409BC -/* C3BA70 80241060 02A0302D */ daddu $a2, $s5, $zero -/* C3BA74 80241064 0809046A */ j .L802411A8 -/* C3BA78 80241068 00000000 */ nop -/* C3BA7C 8024106C 0240202D */ daddu $a0, $s2, $zero -/* C3BA80 80241070 0260282D */ daddu $a1, $s3, $zero -/* C3BA84 80241074 0C090288 */ jal func_80240A20 -/* C3BA88 80241078 02A0302D */ daddu $a2, $s5, $zero -/* C3BA8C 8024107C 0809046A */ j .L802411A8 -/* C3BA90 80241080 00000000 */ nop -/* C3BA94 80241084 0240202D */ daddu $a0, $s2, $zero -/* C3BA98 80241088 0260282D */ daddu $a1, $s3, $zero -/* C3BA9C 8024108C 0C0902B2 */ jal func_80240AC8 -/* C3BAA0 80241090 02A0302D */ daddu $a2, $s5, $zero -/* C3BAA4 80241094 0809046A */ j .L802411A8 -/* C3BAA8 80241098 00000000 */ nop -/* C3BAAC 8024109C 0240202D */ daddu $a0, $s2, $zero -/* C3BAB0 802410A0 0260282D */ daddu $a1, $s3, $zero -/* C3BAB4 802410A4 0C0127DF */ jal func_80049F7C -/* C3BAB8 802410A8 02A0302D */ daddu $a2, $s5, $zero -/* C3BABC 802410AC 8E430070 */ lw $v1, 0x70($s2) -/* C3BAC0 802410B0 2402000D */ addiu $v0, $zero, 0xd -/* C3BAC4 802410B4 1462003C */ bne $v1, $v0, .L802411A8 -/* C3BAC8 802410B8 00000000 */ nop -/* C3BACC 802410BC 0240202D */ daddu $a0, $s2, $zero -/* C3BAD0 802410C0 0260282D */ daddu $a1, $s3, $zero -/* C3BAD4 802410C4 0C012849 */ jal func_8004A124 -/* C3BAD8 802410C8 02A0302D */ daddu $a2, $s5, $zero -/* C3BADC 802410CC 0809046A */ j .L802411A8 -/* C3BAE0 802410D0 00000000 */ nop -/* C3BAE4 802410D4 0240202D */ daddu $a0, $s2, $zero -/* C3BAE8 802410D8 0260282D */ daddu $a1, $s3, $zero -/* C3BAEC 802410DC 0C0128FA */ jal func_8004A3E8 -/* C3BAF0 802410E0 02A0302D */ daddu $a2, $s5, $zero -/* C3BAF4 802410E4 2402000F */ addiu $v0, $zero, 0xf -/* C3BAF8 802410E8 A682008E */ sh $v0, 0x8e($s4) -/* C3BAFC 802410EC 24020028 */ addiu $v0, $zero, 0x28 -/* C3BB00 802410F0 AE220088 */ sw $v0, 0x88($s1) -/* C3BB04 802410F4 24020003 */ addiu $v0, $zero, 3 -/* C3BB08 802410F8 0809046A */ j .L802411A8 -/* C3BB0C 802410FC AE420070 */ sw $v0, 0x70($s2) -/* C3BB10 80241100 0C090018 */ jal func_80240060 -/* C3BB14 80241104 0240202D */ daddu $a0, $s2, $zero -/* C3BB18 80241108 8E430070 */ lw $v1, 0x70($s2) -/* C3BB1C 8024110C 2402001F */ addiu $v0, $zero, 0x1f -/* C3BB20 80241110 14620025 */ bne $v1, $v0, .L802411A8 -/* C3BB24 80241114 00000000 */ nop -/* C3BB28 80241118 0C090033 */ jal func_802400CC -/* C3BB2C 8024111C 0240202D */ daddu $a0, $s2, $zero -/* C3BB30 80241120 8E430070 */ lw $v1, 0x70($s2) -/* C3BB34 80241124 24020020 */ addiu $v0, $zero, 0x20 -/* C3BB38 80241128 1462001F */ bne $v1, $v0, .L802411A8 -/* C3BB3C 8024112C 00000000 */ nop -/* C3BB40 80241130 0C09004F */ jal func_8024013C -/* C3BB44 80241134 0240202D */ daddu $a0, $s2, $zero -/* C3BB48 80241138 0809046A */ j .L802411A8 -/* C3BB4C 8024113C 00000000 */ nop -/* C3BB50 80241140 0C090085 */ jal func_80240214 -/* C3BB54 80241144 0240202D */ daddu $a0, $s2, $zero -/* C3BB58 80241148 0809046A */ j .L802411A8 -/* C3BB5C 8024114C 00000000 */ nop -/* C3BB60 80241150 0240202D */ daddu $a0, $s2, $zero -/* C3BB64 80241154 0260282D */ daddu $a1, $s3, $zero -/* C3BB68 80241158 0C090300 */ jal func_80240C00 -/* C3BB6C 8024115C 02A0302D */ daddu $a2, $s5, $zero -/* C3BB70 80241160 8E430070 */ lw $v1, 0x70($s2) -/* C3BB74 80241164 24020029 */ addiu $v0, $zero, 0x29 -/* C3BB78 80241168 1462000F */ bne $v1, $v0, .L802411A8 -/* C3BB7C 8024116C 00000000 */ nop -/* C3BB80 80241170 0240202D */ daddu $a0, $s2, $zero -/* C3BB84 80241174 0260282D */ daddu $a1, $s3, $zero -/* C3BB88 80241178 0C09032B */ jal func_80240CAC -/* C3BB8C 8024117C 02A0302D */ daddu $a2, $s5, $zero -/* C3BB90 80241180 0809046A */ j .L802411A8 -/* C3BB94 80241184 00000000 */ nop -/* C3BB98 80241188 0240202D */ daddu $a0, $s2, $zero -/* C3BB9C 8024118C 0260282D */ daddu $a1, $s3, $zero -/* C3BBA0 80241190 0C090389 */ jal func_80240E24 -/* C3BBA4 80241194 02A0302D */ daddu $a2, $s5, $zero -/* C3BBA8 80241198 0809046A */ j .L802411A8 -/* C3BBAC 8024119C 00000000 */ nop -/* C3BBB0 802411A0 0C0129CF */ jal func_8004A73C -/* C3BBB4 802411A4 0240202D */ daddu $a0, $s2, $zero -.L802411A8: -/* C3BBB8 802411A8 8FBF0048 */ lw $ra, 0x48($sp) -/* C3BBBC 802411AC 8FB50044 */ lw $s5, 0x44($sp) -/* C3BBC0 802411B0 8FB40040 */ lw $s4, 0x40($sp) -/* C3BBC4 802411B4 8FB3003C */ lw $s3, 0x3c($sp) -/* C3BBC8 802411B8 8FB20038 */ lw $s2, 0x38($sp) -/* C3BBCC 802411BC 8FB10034 */ lw $s1, 0x34($sp) -/* C3BBD0 802411C0 8FB00030 */ lw $s0, 0x30($sp) -/* C3BBD4 802411C4 0000102D */ daddu $v0, $zero, $zero -/* C3BBD8 802411C8 03E00008 */ jr $ra -/* C3BBDC 802411CC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_06/func_802400B4_C3D080.s b/asm/nonmatchings/world/area_dgb/dgb_06/func_802400B4_C3D080.s deleted file mode 100644 index a5213b7278..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_06/func_802400B4_C3D080.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_C3D134 -/* C3D134 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3D138 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* C3D13C 802400BC 0080802D */ daddu $s0, $a0, $zero -/* C3D140 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C3D144 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* C3D148 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* C3D14C 802400CC 8C510000 */ lw $s1, ($v0) -/* C3D150 802400D0 0C0B1EAF */ jal get_variable -/* C3D154 802400D4 0220282D */ daddu $a1, $s1, $zero -/* C3D158 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* C3D15C 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* C3D160 802400E0 0200202D */ daddu $a0, $s0, $zero -/* C3D164 802400E4 00431024 */ and $v0, $v0, $v1 -/* C3D168 802400E8 00021140 */ sll $v0, $v0, 5 -/* C3D16C 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* C3D170 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* C3D174 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* C3D178 802400F8 0C0B2026 */ jal set_variable -/* C3D17C 802400FC 0220282D */ daddu $a1, $s1, $zero -/* C3D180 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* C3D184 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* C3D188 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* C3D18C 8024010C 24020002 */ addiu $v0, $zero, 2 -/* C3D190 80240110 03E00008 */ jr $ra -/* C3D194 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_06/func_80240118_C3D080.s b/asm/nonmatchings/world/area_dgb/dgb_06/func_80240118_C3D080.s deleted file mode 100644 index 35475f59e3..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_06/func_80240118_C3D080.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_06/func_80240268_C3D080.s b/asm/nonmatchings/world/area_dgb/dgb_06/func_80240268_C3D080.s deleted file mode 100644 index 77f053290b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_06/func_80240268_C3D080.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_C3D2E8 -/* C3D2E8 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C3D2EC 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* C3D2F0 80240270 0080802D */ daddu $s0, $a0, $zero -/* C3D2F4 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* C3D2F8 80240278 8E02000C */ lw $v0, 0xc($s0) -/* C3D2FC 8024027C 0C0B1EAF */ jal get_variable -/* C3D300 80240280 8C450000 */ lw $a1, ($v0) -/* C3D304 80240284 00021140 */ sll $v0, $v0, 5 -/* C3D308 80240288 AE000084 */ sw $zero, 0x84($s0) -/* C3D30C 8024028C 3C018008 */ lui $at, 0x8008 -/* C3D310 80240290 00220821 */ addu $at, $at, $v0 -/* C3D314 80240294 942278F8 */ lhu $v0, 0x78f8($at) -/* C3D318 80240298 30420040 */ andi $v0, $v0, 0x40 -/* C3D31C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* C3D320 802402A0 24020001 */ addiu $v0, $zero, 1 -/* C3D324 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* C3D328 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* C3D32C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* C3D330 802402B0 24020002 */ addiu $v0, $zero, 2 -/* C3D334 802402B4 03E00008 */ jr $ra -/* C3D338 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* C3D33C 802402BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/func_8024006C_C3DBF0.s b/asm/nonmatchings/world/area_dgb/dgb_07/func_8024006C_C3DBF0.s deleted file mode 100644 index 650d2d48f1..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/func_8024006C_C3DBF0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024006C_C3DC5C -/* C3DC5C 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3DC60 80240070 AFB10014 */ sw $s1, 0x14($sp) -/* C3DC64 80240074 0080882D */ daddu $s1, $a0, $zero -/* C3DC68 80240078 AFBF0018 */ sw $ra, 0x18($sp) -/* C3DC6C 8024007C AFB00010 */ sw $s0, 0x10($sp) -/* C3DC70 80240080 8E300148 */ lw $s0, 0x148($s1) -/* C3DC74 80240084 0C00EABB */ jal get_npc_unsafe -/* C3DC78 80240088 86040008 */ lh $a0, 8($s0) -/* C3DC7C 8024008C 0040202D */ daddu $a0, $v0, $zero -/* C3DC80 80240090 9482008E */ lhu $v0, 0x8e($a0) -/* C3DC84 80240094 2442FFFF */ addiu $v0, $v0, -1 -/* C3DC88 80240098 A482008E */ sh $v0, 0x8e($a0) -/* C3DC8C 8024009C 00021400 */ sll $v0, $v0, 0x10 -/* C3DC90 802400A0 1C400009 */ bgtz $v0, .L802400C8 -/* C3DC94 802400A4 24020003 */ addiu $v0, $zero, 3 -/* C3DC98 802400A8 96030076 */ lhu $v1, 0x76($s0) -/* C3DC9C 802400AC AE02006C */ sw $v0, 0x6c($s0) -/* C3DCA0 802400B0 A483008E */ sh $v1, 0x8e($a0) -/* C3DCA4 802400B4 8E0200CC */ lw $v0, 0xcc($s0) -/* C3DCA8 802400B8 8C420024 */ lw $v0, 0x24($v0) -/* C3DCAC 802400BC AC820028 */ sw $v0, 0x28($a0) -/* C3DCB0 802400C0 24020020 */ addiu $v0, $zero, 0x20 -/* C3DCB4 802400C4 AE220070 */ sw $v0, 0x70($s1) -.L802400C8: -/* C3DCB8 802400C8 8FBF0018 */ lw $ra, 0x18($sp) -/* C3DCBC 802400CC 8FB10014 */ lw $s1, 0x14($sp) -/* C3DCC0 802400D0 8FB00010 */ lw $s0, 0x10($sp) -/* C3DCC4 802400D4 03E00008 */ jr $ra -/* C3DCC8 802400D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/func_802400DC_C3DBF0.s b/asm/nonmatchings/world/area_dgb/dgb_07/func_802400DC_C3DBF0.s deleted file mode 100644 index c98de8fbf1..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/func_802400DC_C3DBF0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_C3DCCC -/* C3DCCC 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C3DCD0 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* C3DCD4 802400E4 0080882D */ daddu $s1, $a0, $zero -/* C3DCD8 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* C3DCDC 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* C3DCE0 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* C3DCE4 802400F4 0C00EABB */ jal get_npc_unsafe -/* C3DCE8 802400F8 86040008 */ lh $a0, 8($s0) -/* C3DCEC 802400FC 0040282D */ daddu $a1, $v0, $zero -/* C3DCF0 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* C3DCF4 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* C3DCF8 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* C3DCFC 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* C3DD00 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* C3DD04 80240114 24020004 */ addiu $v0, $zero, 4 -/* C3DD08 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* C3DD0C 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* C3DD10 80240120 8C620000 */ lw $v0, ($v1) -/* C3DD14 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* C3DD18 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* C3DD1C 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* C3DD20 80240130 8E020078 */ lw $v0, 0x78($s0) -/* C3DD24 80240134 28420008 */ slti $v0, $v0, 8 -/* C3DD28 80240138 14400018 */ bnez $v0, .L8024019C -/* C3DD2C 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* C3DD30 80240140 24040003 */ addiu $a0, $zero, 3 -/* C3DD34 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* C3DD38 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* C3DD3C 8024014C 3C013F80 */ lui $at, 0x3f80 -/* C3DD40 80240150 44810000 */ mtc1 $at, $f0 -/* C3DD44 80240154 3C014000 */ lui $at, 0x4000 -/* C3DD48 80240158 44811000 */ mtc1 $at, $f2 -/* C3DD4C 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* C3DD50 80240160 44812000 */ mtc1 $at, $f4 -/* C3DD54 80240164 44873000 */ mtc1 $a3, $f6 -/* C3DD58 80240168 00000000 */ nop -/* C3DD5C 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* C3DD60 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* C3DD64 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* C3DD68 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* C3DD6C 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* C3DD70 80240180 44073000 */ mfc1 $a3, $f6 -/* C3DD74 80240184 0000302D */ daddu $a2, $zero, $zero -/* C3DD78 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* C3DD7C 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* C3DD80 80240190 0C01BFA4 */ jal fx_emote -/* C3DD84 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* C3DD88 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* C3DD8C 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* C3DD90 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* C3DD94 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* C3DD98 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* C3DD9C 802401AC 03E00008 */ jr $ra -/* C3DDA0 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/func_802401B4_C3DBF0.s b/asm/nonmatchings/world/area_dgb/dgb_07/func_802401B4_C3DBF0.s deleted file mode 100644 index 5cb8eba7b9..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/func_802401B4_C3DBF0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_C3DDA4 -/* C3DDA4 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3DDA8 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* C3DDAC 802401BC 0080882D */ daddu $s1, $a0, $zero -/* C3DDB0 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C3DDB4 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* C3DDB8 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* C3DDBC 802401CC 0C00EABB */ jal get_npc_unsafe -/* C3DDC0 802401D0 86040008 */ lh $a0, 8($s0) -/* C3DDC4 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* C3DDC8 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* C3DDCC 802401DC A443008E */ sh $v1, 0x8e($v0) -/* C3DDD0 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* C3DDD4 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* C3DDD8 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* C3DDDC 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* C3DDE0 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* C3DDE4 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* C3DDE8 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* C3DDEC 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* C3DDF0 80240200 03E00008 */ jr $ra -/* C3DDF4 80240204 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/func_80240208_C3DBF0.s b/asm/nonmatchings/world/area_dgb/dgb_07/func_80240208_C3DBF0.s deleted file mode 100644 index 65ebc584ee..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/func_80240208_C3DBF0.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240208_C3DDF8 -/* C3DDF8 80240208 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C3DDFC 8024020C AFBF0024 */ sw $ra, 0x24($sp) -/* C3DE00 80240210 AFB40020 */ sw $s4, 0x20($sp) -/* C3DE04 80240214 AFB3001C */ sw $s3, 0x1c($sp) -/* C3DE08 80240218 AFB20018 */ sw $s2, 0x18($sp) -/* C3DE0C 8024021C AFB10014 */ sw $s1, 0x14($sp) -/* C3DE10 80240220 AFB00010 */ sw $s0, 0x10($sp) -/* C3DE14 80240224 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C3DE18 80240228 8C900148 */ lw $s0, 0x148($a0) -/* C3DE1C 8024022C 86040008 */ lh $a0, 8($s0) -/* C3DE20 80240230 0C00EABB */ jal get_npc_unsafe -/* C3DE24 80240234 24110001 */ addiu $s1, $zero, 1 -/* C3DE28 80240238 86040008 */ lh $a0, 8($s0) -/* C3DE2C 8024023C 0040802D */ daddu $s0, $v0, $zero -/* C3DE30 80240240 3C05800B */ lui $a1, %hi(gCameras) -/* C3DE34 80240244 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C3DE38 80240248 3C03800A */ lui $v1, 0x800a -/* C3DE3C 8024024C 8463A634 */ lh $v1, -0x59cc($v1) -/* C3DE40 80240250 00912021 */ addu $a0, $a0, $s1 -/* C3DE44 80240254 00031080 */ sll $v0, $v1, 2 -/* C3DE48 80240258 00431021 */ addu $v0, $v0, $v1 -/* C3DE4C 8024025C 00021080 */ sll $v0, $v0, 2 -/* C3DE50 80240260 00431023 */ subu $v0, $v0, $v1 -/* C3DE54 80240264 000218C0 */ sll $v1, $v0, 3 -/* C3DE58 80240268 00431021 */ addu $v0, $v0, $v1 -/* C3DE5C 8024026C 000210C0 */ sll $v0, $v0, 3 -/* C3DE60 80240270 0C00FB3A */ jal get_enemy -/* C3DE64 80240274 00459021 */ addu $s2, $v0, $a1 -/* C3DE68 80240278 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C3DE6C 8024027C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C3DE70 80240280 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3DE74 80240284 8E830000 */ lw $v1, ($s4) -/* C3DE78 80240288 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3DE7C 8024028C 8C660028 */ lw $a2, 0x28($v1) -/* C3DE80 80240290 8C670030 */ lw $a3, 0x30($v1) -/* C3DE84 80240294 0C00A7B5 */ jal dist2D -/* C3DE88 80240298 0040982D */ daddu $s3, $v0, $zero -/* C3DE8C 8024029C C6620074 */ lwc1 $f2, 0x74($s3) -/* C3DE90 802402A0 468010A0 */ cvt.s.w $f2, $f2 -/* C3DE94 802402A4 4600103C */ c.lt.s $f2, $f0 -/* C3DE98 802402A8 00000000 */ nop -/* C3DE9C 802402AC 45030001 */ bc1tl .L802402B4 -/* C3DEA0 802402B0 0000882D */ daddu $s1, $zero, $zero -.L802402B4: -/* C3DEA4 802402B4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C3DEA8 802402B8 C60E000C */ lwc1 $f14, 0xc($s0) -/* C3DEAC 802402BC 3C014387 */ lui $at, 0x4387 -/* C3DEB0 802402C0 4481A000 */ mtc1 $at, $f20 -/* C3DEB4 802402C4 0C00A70A */ jal get_clamped_angle_diff -/* C3DEB8 802402C8 00000000 */ nop -/* C3DEBC 802402CC 0C00A6C9 */ jal clamp_angle -/* C3DEC0 802402D0 46000306 */ mov.s $f12, $f0 -/* C3DEC4 802402D4 3C018024 */ lui $at, 0x8024 -/* C3DEC8 802402D8 D4221E90 */ ldc1 $f2, 0x1e90($at) -/* C3DECC 802402DC 46000021 */ cvt.d.s $f0, $f0 -/* C3DED0 802402E0 4622003C */ c.lt.d $f0, $f2 -/* C3DED4 802402E4 00000000 */ nop -/* C3DED8 802402E8 45000003 */ bc1f .L802402F8 -/* C3DEDC 802402EC 00000000 */ nop -/* C3DEE0 802402F0 3C0142B4 */ lui $at, 0x42b4 -/* C3DEE4 802402F4 4481A000 */ mtc1 $at, $f20 -.L802402F8: -/* C3DEE8 802402F8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3DEEC 802402FC 8E820000 */ lw $v0, ($s4) -/* C3DEF0 80240300 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3DEF4 80240304 8C460028 */ lw $a2, 0x28($v0) -/* C3DEF8 80240308 0C00A720 */ jal atan2 -/* C3DEFC 8024030C 8C470030 */ lw $a3, 0x30($v0) -/* C3DF00 80240310 4600A306 */ mov.s $f12, $f20 -/* C3DF04 80240314 0C00A70A */ jal get_clamped_angle_diff -/* C3DF08 80240318 46000386 */ mov.s $f14, $f0 -/* C3DF0C 8024031C C6620078 */ lwc1 $f2, 0x78($s3) -/* C3DF10 80240320 468010A0 */ cvt.s.w $f2, $f2 -/* C3DF14 80240324 46000005 */ abs.s $f0, $f0 -/* C3DF18 80240328 4600103C */ c.lt.s $f2, $f0 -/* C3DF1C 8024032C 00000000 */ nop -/* C3DF20 80240330 45030001 */ bc1tl .L80240338 -/* C3DF24 80240334 0000882D */ daddu $s1, $zero, $zero -.L80240338: -/* C3DF28 80240338 8E820000 */ lw $v0, ($s4) -/* C3DF2C 8024033C C600003C */ lwc1 $f0, 0x3c($s0) -/* C3DF30 80240340 C442002C */ lwc1 $f2, 0x2c($v0) -/* C3DF34 80240344 860200A8 */ lh $v0, 0xa8($s0) -/* C3DF38 80240348 46020001 */ sub.s $f0, $f0, $f2 -/* C3DF3C 8024034C 44821000 */ mtc1 $v0, $f2 -/* C3DF40 80240350 00000000 */ nop -/* C3DF44 80240354 468010A1 */ cvt.d.w $f2, $f2 -/* C3DF48 80240358 46221080 */ add.d $f2, $f2, $f2 -/* C3DF4C 8024035C 46000005 */ abs.s $f0, $f0 -/* C3DF50 80240360 46000021 */ cvt.d.s $f0, $f0 -/* C3DF54 80240364 4620103E */ c.le.d $f2, $f0 -/* C3DF58 80240368 00000000 */ nop -/* C3DF5C 8024036C 45030001 */ bc1tl .L80240374 -/* C3DF60 80240370 0000882D */ daddu $s1, $zero, $zero -.L80240374: -/* C3DF64 80240374 3C038011 */ lui $v1, 0x8011 -/* C3DF68 80240378 8063EBB3 */ lb $v1, -0x144d($v1) -/* C3DF6C 8024037C 24020009 */ addiu $v0, $zero, 9 -/* C3DF70 80240380 50620001 */ beql $v1, $v0, .L80240388 -/* C3DF74 80240384 0000882D */ daddu $s1, $zero, $zero -.L80240388: -/* C3DF78 80240388 24020007 */ addiu $v0, $zero, 7 -/* C3DF7C 8024038C 50620001 */ beql $v1, $v0, .L80240394 -/* C3DF80 80240390 0000882D */ daddu $s1, $zero, $zero -.L80240394: -/* C3DF84 80240394 0220102D */ daddu $v0, $s1, $zero -/* C3DF88 80240398 8FBF0024 */ lw $ra, 0x24($sp) -/* C3DF8C 8024039C 8FB40020 */ lw $s4, 0x20($sp) -/* C3DF90 802403A0 8FB3001C */ lw $s3, 0x1c($sp) -/* C3DF94 802403A4 8FB20018 */ lw $s2, 0x18($sp) -/* C3DF98 802403A8 8FB10014 */ lw $s1, 0x14($sp) -/* C3DF9C 802403AC 8FB00010 */ lw $s0, 0x10($sp) -/* C3DFA0 802403B0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C3DFA4 802403B4 03E00008 */ jr $ra -/* C3DFA8 802403B8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/func_8024061C_C3DBF0.s b/asm/nonmatchings/world/area_dgb/dgb_07/func_8024061C_C3DBF0.s deleted file mode 100644 index b06762ed77..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/func_8024061C_C3DBF0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_C3E20C -/* C3E20C 8024061C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3E210 80240620 AFB10014 */ sw $s1, 0x14($sp) -/* C3E214 80240624 0080882D */ daddu $s1, $a0, $zero -/* C3E218 80240628 AFBF0018 */ sw $ra, 0x18($sp) -/* C3E21C 8024062C AFB00010 */ sw $s0, 0x10($sp) -/* C3E220 80240630 8E300148 */ lw $s0, 0x148($s1) -/* C3E224 80240634 0C00EABB */ jal get_npc_unsafe -/* C3E228 80240638 86040008 */ lh $a0, 8($s0) -/* C3E22C 8024063C 0040202D */ daddu $a0, $v0, $zero -/* C3E230 80240640 8482008E */ lh $v0, 0x8e($a0) -/* C3E234 80240644 9483008E */ lhu $v1, 0x8e($a0) -/* C3E238 80240648 18400002 */ blez $v0, .L80240654 -/* C3E23C 8024064C 2462FFFF */ addiu $v0, $v1, -1 -/* C3E240 80240650 A482008E */ sh $v0, 0x8e($a0) -.L80240654: -/* C3E244 80240654 8482008E */ lh $v0, 0x8e($a0) -/* C3E248 80240658 24030001 */ addiu $v1, $zero, 1 -/* C3E24C 8024065C 14430005 */ bne $v0, $v1, .L80240674 -/* C3E250 80240660 00000000 */ nop -/* C3E254 80240664 8E0200CC */ lw $v0, 0xcc($s0) -/* C3E258 80240668 8C420030 */ lw $v0, 0x30($v0) -/* C3E25C 8024066C 080901A4 */ j .L80240690 -/* C3E260 80240670 AC820028 */ sw $v0, 0x28($a0) -.L80240674: -/* C3E264 80240674 1C400006 */ bgtz $v0, .L80240690 -/* C3E268 80240678 00000000 */ nop -/* C3E26C 8024067C 8E0200CC */ lw $v0, 0xcc($s0) -/* C3E270 80240680 8C420028 */ lw $v0, 0x28($v0) -/* C3E274 80240684 A480008E */ sh $zero, 0x8e($a0) -/* C3E278 80240688 AC820028 */ sw $v0, 0x28($a0) -/* C3E27C 8024068C AE230070 */ sw $v1, 0x70($s1) -.L80240690: -/* C3E280 80240690 8FBF0018 */ lw $ra, 0x18($sp) -/* C3E284 80240694 8FB10014 */ lw $s1, 0x14($sp) -/* C3E288 80240698 8FB00010 */ lw $s0, 0x10($sp) -/* C3E28C 8024069C 03E00008 */ jr $ra -/* C3E290 802406A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/func_802406A4_C3DBF0.s b/asm/nonmatchings/world/area_dgb/dgb_07/func_802406A4_C3DBF0.s deleted file mode 100644 index 121fed2797..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/func_802406A4_C3DBF0.s +++ /dev/null @@ -1,192 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A4_C3E294 -/* C3E294 802406A4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C3E298 802406A8 AFB40048 */ sw $s4, 0x48($sp) -/* C3E29C 802406AC 0080A02D */ daddu $s4, $a0, $zero -/* C3E2A0 802406B0 AFBF004C */ sw $ra, 0x4c($sp) -/* C3E2A4 802406B4 AFB30044 */ sw $s3, 0x44($sp) -/* C3E2A8 802406B8 AFB20040 */ sw $s2, 0x40($sp) -/* C3E2AC 802406BC AFB1003C */ sw $s1, 0x3c($sp) -/* C3E2B0 802406C0 AFB00038 */ sw $s0, 0x38($sp) -/* C3E2B4 802406C4 8E930148 */ lw $s3, 0x148($s4) -/* C3E2B8 802406C8 00C0802D */ daddu $s0, $a2, $zero -/* C3E2BC 802406CC 86640008 */ lh $a0, 8($s3) -/* C3E2C0 802406D0 0C00EABB */ jal get_npc_unsafe -/* C3E2C4 802406D4 0000902D */ daddu $s2, $zero, $zero -/* C3E2C8 802406D8 0C039D59 */ jal get_player_data -/* C3E2CC 802406DC 0040882D */ daddu $s1, $v0, $zero -/* C3E2D0 802406E0 0200202D */ daddu $a0, $s0, $zero -/* C3E2D4 802406E4 0260282D */ daddu $a1, $s3, $zero -/* C3E2D8 802406E8 0000382D */ daddu $a3, $zero, $zero -/* C3E2DC 802406EC 3C0642A0 */ lui $a2, 0x42a0 -/* C3E2E0 802406F0 0040802D */ daddu $s0, $v0, $zero -/* C3E2E4 802406F4 0C01242D */ jal func_800490B4 -/* C3E2E8 802406F8 AFA00010 */ sw $zero, 0x10($sp) -/* C3E2EC 802406FC 10400022 */ beqz $v0, .L80240788 -/* C3E2F0 80240700 00000000 */ nop -/* C3E2F4 80240704 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C3E2F8 80240708 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3E2FC 8024070C 804300B4 */ lb $v1, 0xb4($v0) -/* C3E300 80240710 24020002 */ addiu $v0, $zero, 2 -/* C3E304 80240714 10620013 */ beq $v1, $v0, .L80240764 -/* C3E308 80240718 2402001A */ addiu $v0, $zero, 0x1a -/* C3E30C 8024071C 10620011 */ beq $v1, $v0, .L80240764 -/* C3E310 80240720 24020003 */ addiu $v0, $zero, 3 -/* C3E314 80240724 1062000F */ beq $v1, $v0, .L80240764 -/* C3E318 80240728 2402000E */ addiu $v0, $zero, 0xe -/* C3E31C 8024072C 1062000D */ beq $v1, $v0, .L80240764 -/* C3E320 80240730 24020010 */ addiu $v0, $zero, 0x10 -/* C3E324 80240734 1062000B */ beq $v1, $v0, .L80240764 -/* C3E328 80240738 2402000B */ addiu $v0, $zero, 0xb -/* C3E32C 8024073C 10620009 */ beq $v1, $v0, .L80240764 -/* C3E330 80240740 2402000A */ addiu $v0, $zero, 0xa -/* C3E334 80240744 10620007 */ beq $v1, $v0, .L80240764 -/* C3E338 80240748 24020012 */ addiu $v0, $zero, 0x12 -/* C3E33C 8024074C 10620005 */ beq $v1, $v0, .L80240764 -/* C3E340 80240750 24020013 */ addiu $v0, $zero, 0x13 -/* C3E344 80240754 10620003 */ beq $v1, $v0, .L80240764 -/* C3E348 80240758 24020025 */ addiu $v0, $zero, 0x25 -/* C3E34C 8024075C 14620002 */ bne $v1, $v0, .L80240768 -/* C3E350 80240760 00000000 */ nop -.L80240764: -/* C3E354 80240764 24120001 */ addiu $s2, $zero, 1 -.L80240768: -/* C3E358 80240768 82030012 */ lb $v1, 0x12($s0) -/* C3E35C 8024076C 24020002 */ addiu $v0, $zero, 2 -/* C3E360 80240770 14620007 */ bne $v1, $v0, .L80240790 -/* C3E364 80240774 24020001 */ addiu $v0, $zero, 1 -/* C3E368 80240778 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C3E36C 8024077C 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C3E370 80240780 50430002 */ beql $v0, $v1, .L8024078C -/* C3E374 80240784 24120001 */ addiu $s2, $zero, 1 -.L80240788: -/* C3E378 80240788 82030012 */ lb $v1, 0x12($s0) -.L8024078C: -/* C3E37C 8024078C 24020001 */ addiu $v0, $zero, 1 -.L80240790: -/* C3E380 80240790 14620006 */ bne $v1, $v0, .L802407AC -/* C3E384 80240794 24020003 */ addiu $v0, $zero, 3 -/* C3E388 80240798 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C3E38C 8024079C 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C3E390 802407A0 14400008 */ bnez $v0, .L802407C4 -/* C3E394 802407A4 27A40028 */ addiu $a0, $sp, 0x28 -/* C3E398 802407A8 24020003 */ addiu $v0, $zero, 3 -.L802407AC: -/* C3E39C 802407AC 1462001B */ bne $v1, $v0, .L8024081C -/* C3E3A0 802407B0 24020002 */ addiu $v0, $zero, 2 -/* C3E3A4 802407B4 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C3E3A8 802407B8 8063EBB0 */ lb $v1, %lo(D_8010EBB0)($v1) -/* C3E3AC 802407BC 14620017 */ bne $v1, $v0, .L8024081C -/* C3E3B0 802407C0 27A40028 */ addiu $a0, $sp, 0x28 -.L802407C4: -/* C3E3B4 802407C4 27A5002C */ addiu $a1, $sp, 0x2c -/* C3E3B8 802407C8 8E27000C */ lw $a3, 0xc($s1) -/* C3E3BC 802407CC C6200038 */ lwc1 $f0, 0x38($s1) -/* C3E3C0 802407D0 C6220040 */ lwc1 $f2, 0x40($s1) -/* C3E3C4 802407D4 0000302D */ daddu $a2, $zero, $zero -/* C3E3C8 802407D8 E7A00028 */ swc1 $f0, 0x28($sp) -/* C3E3CC 802407DC 0C00A7E7 */ jal add_vec2D_polar -/* C3E3D0 802407E0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C3E3D4 802407E4 3C028011 */ lui $v0, 0x8011 -/* C3E3D8 802407E8 8C42C930 */ lw $v0, -0x36d0($v0) -/* C3E3DC 802407EC C7AC0028 */ lwc1 $f12, 0x28($sp) -/* C3E3E0 802407F0 C7AE002C */ lwc1 $f14, 0x2c($sp) -/* C3E3E4 802407F4 8C460038 */ lw $a2, 0x38($v0) -/* C3E3E8 802407F8 0C00A7B5 */ jal dist2D -/* C3E3EC 802407FC 8C470040 */ lw $a3, 0x40($v0) -/* C3E3F0 80240800 3C0142A0 */ lui $at, 0x42a0 -/* C3E3F4 80240804 44811000 */ mtc1 $at, $f2 -/* C3E3F8 80240808 00000000 */ nop -/* C3E3FC 8024080C 4602003E */ c.le.s $f0, $f2 -/* C3E400 80240810 00000000 */ nop -/* C3E404 80240814 45030001 */ bc1tl .L8024081C -/* C3E408 80240818 24120001 */ addiu $s2, $zero, 1 -.L8024081C: -/* C3E40C 8024081C 12400026 */ beqz $s2, .L802408B8 -/* C3E410 80240820 0220202D */ daddu $a0, $s1, $zero -/* C3E414 80240824 3C05B000 */ lui $a1, 0xb000 -/* C3E418 80240828 34A5000E */ ori $a1, $a1, 0xe -/* C3E41C 8024082C 0C012530 */ jal func_800494C0 -/* C3E420 80240830 0000302D */ daddu $a2, $zero, $zero -/* C3E424 80240834 0000202D */ daddu $a0, $zero, $zero -/* C3E428 80240838 0220282D */ daddu $a1, $s1, $zero -/* C3E42C 8024083C 0000302D */ daddu $a2, $zero, $zero -/* C3E430 80240840 862200A8 */ lh $v0, 0xa8($s1) -/* C3E434 80240844 8E6300CC */ lw $v1, 0xcc($s3) -/* C3E438 80240848 3C013F80 */ lui $at, 0x3f80 -/* C3E43C 8024084C 44810000 */ mtc1 $at, $f0 -/* C3E440 80240850 3C014000 */ lui $at, 0x4000 -/* C3E444 80240854 44811000 */ mtc1 $at, $f2 -/* C3E448 80240858 3C01C1A0 */ lui $at, 0xc1a0 -/* C3E44C 8024085C 44812000 */ mtc1 $at, $f4 -/* C3E450 80240860 44823000 */ mtc1 $v0, $f6 -/* C3E454 80240864 00000000 */ nop -/* C3E458 80240868 468031A0 */ cvt.s.w $f6, $f6 -/* C3E45C 8024086C 44073000 */ mfc1 $a3, $f6 -/* C3E460 80240870 8C63002C */ lw $v1, 0x2c($v1) -/* C3E464 80240874 2402000A */ addiu $v0, $zero, 0xa -/* C3E468 80240878 A622008E */ sh $v0, 0x8e($s1) -/* C3E46C 8024087C 2402000F */ addiu $v0, $zero, 0xf -/* C3E470 80240880 AE230028 */ sw $v1, 0x28($s1) -/* C3E474 80240884 AFA2001C */ sw $v0, 0x1c($sp) -/* C3E478 80240888 27A20030 */ addiu $v0, $sp, 0x30 -/* C3E47C 8024088C E7A00010 */ swc1 $f0, 0x10($sp) -/* C3E480 80240890 E7A20014 */ swc1 $f2, 0x14($sp) -/* C3E484 80240894 E7A40018 */ swc1 $f4, 0x18($sp) -/* C3E488 80240898 0C01BFA4 */ jal fx_emote -/* C3E48C 8024089C AFA20020 */ sw $v0, 0x20($sp) -/* C3E490 802408A0 0220202D */ daddu $a0, $s1, $zero -/* C3E494 802408A4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C3E498 802408A8 0C012530 */ jal func_800494C0 -/* C3E49C 802408AC 3C060020 */ lui $a2, 0x20 -/* C3E4A0 802408B0 24020002 */ addiu $v0, $zero, 2 -/* C3E4A4 802408B4 AE820070 */ sw $v0, 0x70($s4) -.L802408B8: -/* C3E4A8 802408B8 9622008E */ lhu $v0, 0x8e($s1) -/* C3E4AC 802408BC 24420001 */ addiu $v0, $v0, 1 -/* C3E4B0 802408C0 A622008E */ sh $v0, 0x8e($s1) -/* C3E4B4 802408C4 00021400 */ sll $v0, $v0, 0x10 -/* C3E4B8 802408C8 00021C03 */ sra $v1, $v0, 0x10 -/* C3E4BC 802408CC 2402001B */ addiu $v0, $zero, 0x1b -/* C3E4C0 802408D0 14620005 */ bne $v1, $v0, .L802408E8 -/* C3E4C4 802408D4 24020039 */ addiu $v0, $zero, 0x39 -/* C3E4C8 802408D8 0220202D */ daddu $a0, $s1, $zero -/* C3E4CC 802408DC 3C05B000 */ lui $a1, 0xb000 -/* C3E4D0 802408E0 0809023F */ j .L802408FC -/* C3E4D4 802408E4 34A5000C */ ori $a1, $a1, 0xc -.L802408E8: -/* C3E4D8 802408E8 14620008 */ bne $v1, $v0, .L8024090C -/* C3E4DC 802408EC 2402003B */ addiu $v0, $zero, 0x3b -/* C3E4E0 802408F0 0220202D */ daddu $a0, $s1, $zero -/* C3E4E4 802408F4 3C05B000 */ lui $a1, 0xb000 -/* C3E4E8 802408F8 34A5000D */ ori $a1, $a1, 0xd -.L802408FC: -/* C3E4EC 802408FC 0C012530 */ jal func_800494C0 -/* C3E4F0 80240900 0000302D */ daddu $a2, $zero, $zero -/* C3E4F4 80240904 0809024F */ j .L8024093C -/* C3E4F8 80240908 00000000 */ nop -.L8024090C: -/* C3E4FC 8024090C 14620005 */ bne $v1, $v0, .L80240924 -/* C3E500 80240910 2402003C */ addiu $v0, $zero, 0x3c -/* C3E504 80240914 8E6200CC */ lw $v0, 0xcc($s3) -/* C3E508 80240918 8C420030 */ lw $v0, 0x30($v0) -/* C3E50C 8024091C 0809024F */ j .L8024093C -/* C3E510 80240920 AE220028 */ sw $v0, 0x28($s1) -.L80240924: -/* C3E514 80240924 14620005 */ bne $v1, $v0, .L8024093C -/* C3E518 80240928 00000000 */ nop -/* C3E51C 8024092C 8E6200CC */ lw $v0, 0xcc($s3) -/* C3E520 80240930 8C420028 */ lw $v0, 0x28($v0) -/* C3E524 80240934 A620008E */ sh $zero, 0x8e($s1) -/* C3E528 80240938 AE220028 */ sw $v0, 0x28($s1) -.L8024093C: -/* C3E52C 8024093C 8FBF004C */ lw $ra, 0x4c($sp) -/* C3E530 80240940 8FB40048 */ lw $s4, 0x48($sp) -/* C3E534 80240944 8FB30044 */ lw $s3, 0x44($sp) -/* C3E538 80240948 8FB20040 */ lw $s2, 0x40($sp) -/* C3E53C 8024094C 8FB1003C */ lw $s1, 0x3c($sp) -/* C3E540 80240950 8FB00038 */ lw $s0, 0x38($sp) -/* C3E544 80240954 03E00008 */ jr $ra -/* C3E548 80240958 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/func_8024095C_C3DBF0.s b/asm/nonmatchings/world/area_dgb/dgb_07/func_8024095C_C3DBF0.s deleted file mode 100644 index c66ddd5988..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/func_8024095C_C3DBF0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024095C_C3E54C -/* C3E54C 8024095C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3E550 80240960 AFB10014 */ sw $s1, 0x14($sp) -/* C3E554 80240964 0080882D */ daddu $s1, $a0, $zero -/* C3E558 80240968 AFBF0018 */ sw $ra, 0x18($sp) -/* C3E55C 8024096C AFB00010 */ sw $s0, 0x10($sp) -/* C3E560 80240970 8E300148 */ lw $s0, 0x148($s1) -/* C3E564 80240974 0C00EABB */ jal get_npc_unsafe -/* C3E568 80240978 86040008 */ lh $a0, 8($s0) -/* C3E56C 8024097C 0040182D */ daddu $v1, $v0, $zero -/* C3E570 80240980 9462008E */ lhu $v0, 0x8e($v1) -/* C3E574 80240984 2442FFFF */ addiu $v0, $v0, -1 -/* C3E578 80240988 A462008E */ sh $v0, 0x8e($v1) -/* C3E57C 8024098C 00021400 */ sll $v0, $v0, 0x10 -/* C3E580 80240990 1C400006 */ bgtz $v0, .L802409AC -/* C3E584 80240994 24020001 */ addiu $v0, $zero, 1 -/* C3E588 80240998 A462008E */ sh $v0, 0x8e($v1) -/* C3E58C 8024099C 24020028 */ addiu $v0, $zero, 0x28 -/* C3E590 802409A0 AE020088 */ sw $v0, 0x88($s0) -/* C3E594 802409A4 24020003 */ addiu $v0, $zero, 3 -/* C3E598 802409A8 AE220070 */ sw $v0, 0x70($s1) -.L802409AC: -/* C3E59C 802409AC 8FBF0018 */ lw $ra, 0x18($sp) -/* C3E5A0 802409B0 8FB10014 */ lw $s1, 0x14($sp) -/* C3E5A4 802409B4 8FB00010 */ lw $s0, 0x10($sp) -/* C3E5A8 802409B8 03E00008 */ jr $ra -/* C3E5AC 802409BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/func_802409C0_C3DBF0.s b/asm/nonmatchings/world/area_dgb/dgb_07/func_802409C0_C3DBF0.s deleted file mode 100644 index 3e1c35fd4b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/func_802409C0_C3DBF0.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409C0_C3E5B0 -/* C3E5B0 802409C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3E5B4 802409C4 AFB10014 */ sw $s1, 0x14($sp) -/* C3E5B8 802409C8 0080882D */ daddu $s1, $a0, $zero -/* C3E5BC 802409CC AFBF001C */ sw $ra, 0x1c($sp) -/* C3E5C0 802409D0 AFB20018 */ sw $s2, 0x18($sp) -/* C3E5C4 802409D4 AFB00010 */ sw $s0, 0x10($sp) -/* C3E5C8 802409D8 8E320148 */ lw $s2, 0x148($s1) -/* C3E5CC 802409DC 0C00EABB */ jal get_npc_unsafe -/* C3E5D0 802409E0 86440008 */ lh $a0, 8($s2) -/* C3E5D4 802409E4 240400B4 */ addiu $a0, $zero, 0xb4 -/* C3E5D8 802409E8 0C00A67F */ jal rand_int -/* C3E5DC 802409EC 0040802D */ daddu $s0, $v0, $zero -/* C3E5E0 802409F0 C60C000C */ lwc1 $f12, 0xc($s0) -/* C3E5E4 802409F4 44820000 */ mtc1 $v0, $f0 -/* C3E5E8 802409F8 00000000 */ nop -/* C3E5EC 802409FC 46800020 */ cvt.s.w $f0, $f0 -/* C3E5F0 80240A00 46006300 */ add.s $f12, $f12, $f0 -/* C3E5F4 80240A04 3C0142B4 */ lui $at, 0x42b4 -/* C3E5F8 80240A08 44810000 */ mtc1 $at, $f0 -/* C3E5FC 80240A0C 0C00A6C9 */ jal clamp_angle -/* C3E600 80240A10 46006301 */ sub.s $f12, $f12, $f0 -/* C3E604 80240A14 E600000C */ swc1 $f0, 0xc($s0) -/* C3E608 80240A18 8E4200CC */ lw $v0, 0xcc($s2) -/* C3E60C 80240A1C 8C420000 */ lw $v0, ($v0) -/* C3E610 80240A20 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C3E614 80240A24 0C00A67F */ jal rand_int -/* C3E618 80240A28 AE020028 */ sw $v0, 0x28($s0) -/* C3E61C 80240A2C 00021FC2 */ srl $v1, $v0, 0x1f -/* C3E620 80240A30 00431821 */ addu $v1, $v0, $v1 -/* C3E624 80240A34 00031843 */ sra $v1, $v1, 1 -/* C3E628 80240A38 00031840 */ sll $v1, $v1, 1 -/* C3E62C 80240A3C 00431023 */ subu $v0, $v0, $v1 -/* C3E630 80240A40 24420002 */ addiu $v0, $v0, 2 -/* C3E634 80240A44 AE220074 */ sw $v0, 0x74($s1) -/* C3E638 80240A48 24020004 */ addiu $v0, $zero, 4 -/* C3E63C 80240A4C AE220070 */ sw $v0, 0x70($s1) -/* C3E640 80240A50 8FBF001C */ lw $ra, 0x1c($sp) -/* C3E644 80240A54 8FB20018 */ lw $s2, 0x18($sp) -/* C3E648 80240A58 8FB10014 */ lw $s1, 0x14($sp) -/* C3E64C 80240A5C 8FB00010 */ lw $s0, 0x10($sp) -/* C3E650 80240A60 03E00008 */ jr $ra -/* C3E654 80240A64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/func_80240A68_C3DBF0.s b/asm/nonmatchings/world/area_dgb/dgb_07/func_80240A68_C3DBF0.s deleted file mode 100644 index 1738828a13..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/func_80240A68_C3DBF0.s +++ /dev/null @@ -1,87 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A68_C3E658 -/* C3E658 80240A68 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C3E65C 80240A6C AFB20020 */ sw $s2, 0x20($sp) -/* C3E660 80240A70 0080902D */ daddu $s2, $a0, $zero -/* C3E664 80240A74 AFBF0028 */ sw $ra, 0x28($sp) -/* C3E668 80240A78 AFB30024 */ sw $s3, 0x24($sp) -/* C3E66C 80240A7C AFB1001C */ sw $s1, 0x1c($sp) -/* C3E670 80240A80 AFB00018 */ sw $s0, 0x18($sp) -/* C3E674 80240A84 8E510148 */ lw $s1, 0x148($s2) -/* C3E678 80240A88 00A0982D */ daddu $s3, $a1, $zero -/* C3E67C 80240A8C 86240008 */ lh $a0, 8($s1) -/* C3E680 80240A90 0C00EABB */ jal get_npc_unsafe -/* C3E684 80240A94 00C0802D */ daddu $s0, $a2, $zero -/* C3E688 80240A98 0200202D */ daddu $a0, $s0, $zero -/* C3E68C 80240A9C 0040802D */ daddu $s0, $v0, $zero -/* C3E690 80240AA0 AFA00010 */ sw $zero, 0x10($sp) -/* C3E694 80240AA4 8E660024 */ lw $a2, 0x24($s3) -/* C3E698 80240AA8 8E670028 */ lw $a3, 0x28($s3) -/* C3E69C 80240AAC 0C01242D */ jal func_800490B4 -/* C3E6A0 80240AB0 0220282D */ daddu $a1, $s1, $zero -/* C3E6A4 80240AB4 1040000C */ beqz $v0, .L80240AE8 -/* C3E6A8 80240AB8 00000000 */ nop -/* C3E6AC 80240ABC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C3E6B0 80240AC0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3E6B4 80240AC4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3E6B8 80240AC8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3E6BC 80240ACC 8C460028 */ lw $a2, 0x28($v0) -/* C3E6C0 80240AD0 0C00A720 */ jal atan2 -/* C3E6C4 80240AD4 8C470030 */ lw $a3, 0x30($v0) -/* C3E6C8 80240AD8 2402000C */ addiu $v0, $zero, 0xc -/* C3E6CC 80240ADC E600000C */ swc1 $f0, 0xc($s0) -/* C3E6D0 80240AE0 080902E1 */ j .L80240B84 -/* C3E6D4 80240AE4 AE420070 */ sw $v0, 0x70($s2) -.L80240AE8: -/* C3E6D8 80240AE8 9602008E */ lhu $v0, 0x8e($s0) -/* C3E6DC 80240AEC 2442FFFF */ addiu $v0, $v0, -1 -/* C3E6E0 80240AF0 A602008E */ sh $v0, 0x8e($s0) -/* C3E6E4 80240AF4 00021400 */ sll $v0, $v0, 0x10 -/* C3E6E8 80240AF8 1C400022 */ bgtz $v0, .L80240B84 -/* C3E6EC 80240AFC 00000000 */ nop -/* C3E6F0 80240B00 8E420074 */ lw $v0, 0x74($s2) -/* C3E6F4 80240B04 2442FFFF */ addiu $v0, $v0, -1 -/* C3E6F8 80240B08 18400014 */ blez $v0, .L80240B5C -/* C3E6FC 80240B0C AE420074 */ sw $v0, 0x74($s2) -/* C3E700 80240B10 C600000C */ lwc1 $f0, 0xc($s0) -/* C3E704 80240B14 3C014334 */ lui $at, 0x4334 -/* C3E708 80240B18 44816000 */ mtc1 $at, $f12 -/* C3E70C 80240B1C 0C00A6C9 */ jal clamp_angle -/* C3E710 80240B20 460C0300 */ add.s $f12, $f0, $f12 -/* C3E714 80240B24 E600000C */ swc1 $f0, 0xc($s0) -/* C3E718 80240B28 8E640008 */ lw $a0, 8($s3) -/* C3E71C 80240B2C 000417C2 */ srl $v0, $a0, 0x1f -/* C3E720 80240B30 00822021 */ addu $a0, $a0, $v0 -/* C3E724 80240B34 00042043 */ sra $a0, $a0, 1 -/* C3E728 80240B38 0C00A67F */ jal rand_int -/* C3E72C 80240B3C 24840001 */ addiu $a0, $a0, 1 -/* C3E730 80240B40 8E630008 */ lw $v1, 8($s3) -/* C3E734 80240B44 000327C2 */ srl $a0, $v1, 0x1f -/* C3E738 80240B48 00641821 */ addu $v1, $v1, $a0 -/* C3E73C 80240B4C 00031843 */ sra $v1, $v1, 1 -/* C3E740 80240B50 00621821 */ addu $v1, $v1, $v0 -/* C3E744 80240B54 080902E1 */ j .L80240B84 -/* C3E748 80240B58 A603008E */ sh $v1, 0x8e($s0) -.L80240B5C: -/* C3E74C 80240B5C 8E250088 */ lw $a1, 0x88($s1) -/* C3E750 80240B60 24020028 */ addiu $v0, $zero, 0x28 -/* C3E754 80240B64 14A20003 */ bne $a1, $v0, .L80240B74 -/* C3E758 80240B68 24020032 */ addiu $v0, $zero, 0x32 -/* C3E75C 80240B6C 080902DF */ j .L80240B7C -/* C3E760 80240B70 24020014 */ addiu $v0, $zero, 0x14 -.L80240B74: -/* C3E764 80240B74 14A20003 */ bne $a1, $v0, .L80240B84 -/* C3E768 80240B78 24020019 */ addiu $v0, $zero, 0x19 -.L80240B7C: -/* C3E76C 80240B7C A602008E */ sh $v0, 0x8e($s0) -/* C3E770 80240B80 AE450070 */ sw $a1, 0x70($s2) -.L80240B84: -/* C3E774 80240B84 8FBF0028 */ lw $ra, 0x28($sp) -/* C3E778 80240B88 8FB30024 */ lw $s3, 0x24($sp) -/* C3E77C 80240B8C 8FB20020 */ lw $s2, 0x20($sp) -/* C3E780 80240B90 8FB1001C */ lw $s1, 0x1c($sp) -/* C3E784 80240B94 8FB00018 */ lw $s0, 0x18($sp) -/* C3E788 80240B98 03E00008 */ jr $ra -/* C3E78C 80240B9C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/func_80240BA0_C3DBF0.s b/asm/nonmatchings/world/area_dgb/dgb_07/func_80240BA0_C3DBF0.s deleted file mode 100644 index afac790394..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/func_80240BA0_C3DBF0.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BA0_C3E790 -/* C3E790 80240BA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3E794 80240BA4 AFB20018 */ sw $s2, 0x18($sp) -/* C3E798 80240BA8 0080902D */ daddu $s2, $a0, $zero -/* C3E79C 80240BAC AFBF001C */ sw $ra, 0x1c($sp) -/* C3E7A0 80240BB0 AFB10014 */ sw $s1, 0x14($sp) -/* C3E7A4 80240BB4 AFB00010 */ sw $s0, 0x10($sp) -/* C3E7A8 80240BB8 8E500148 */ lw $s0, 0x148($s2) -/* C3E7AC 80240BBC 86040008 */ lh $a0, 8($s0) -/* C3E7B0 80240BC0 0C00EABB */ jal get_npc_unsafe -/* C3E7B4 80240BC4 00A0882D */ daddu $s1, $a1, $zero -/* C3E7B8 80240BC8 0040182D */ daddu $v1, $v0, $zero -/* C3E7BC 80240BCC 9462008E */ lhu $v0, 0x8e($v1) -/* C3E7C0 80240BD0 2442FFFF */ addiu $v0, $v0, -1 -/* C3E7C4 80240BD4 A462008E */ sh $v0, 0x8e($v1) -/* C3E7C8 80240BD8 00021400 */ sll $v0, $v0, 0x10 -/* C3E7CC 80240BDC 1C400015 */ bgtz $v0, .L80240C34 -/* C3E7D0 80240BE0 00000000 */ nop -/* C3E7D4 80240BE4 8E0200CC */ lw $v0, 0xcc($s0) -/* C3E7D8 80240BE8 8C420004 */ lw $v0, 4($v0) -/* C3E7DC 80240BEC AC620028 */ sw $v0, 0x28($v1) -/* C3E7E0 80240BF0 8E0200D0 */ lw $v0, 0xd0($s0) -/* C3E7E4 80240BF4 8C420014 */ lw $v0, 0x14($v0) -/* C3E7E8 80240BF8 04410004 */ bgez $v0, .L80240C0C -/* C3E7EC 80240BFC 00000000 */ nop -/* C3E7F0 80240C00 C6200000 */ lwc1 $f0, ($s1) -/* C3E7F4 80240C04 0809030B */ j .L80240C2C -/* C3E7F8 80240C08 E4600018 */ swc1 $f0, 0x18($v1) -.L80240C0C: -/* C3E7FC 80240C0C 3C018024 */ lui $at, 0x8024 -/* C3E800 80240C10 D4221E98 */ ldc1 $f2, 0x1e98($at) -/* C3E804 80240C14 44820000 */ mtc1 $v0, $f0 -/* C3E808 80240C18 00000000 */ nop -/* C3E80C 80240C1C 46800021 */ cvt.d.w $f0, $f0 -/* C3E810 80240C20 46220003 */ div.d $f0, $f0, $f2 -/* C3E814 80240C24 46200020 */ cvt.s.d $f0, $f0 -/* C3E818 80240C28 E4600018 */ swc1 $f0, 0x18($v1) -.L80240C2C: -/* C3E81C 80240C2C 24020029 */ addiu $v0, $zero, 0x29 -/* C3E820 80240C30 AE420070 */ sw $v0, 0x70($s2) -.L80240C34: -/* C3E824 80240C34 8FBF001C */ lw $ra, 0x1c($sp) -/* C3E828 80240C38 8FB20018 */ lw $s2, 0x18($sp) -/* C3E82C 80240C3C 8FB10014 */ lw $s1, 0x14($sp) -/* C3E830 80240C40 8FB00010 */ lw $s0, 0x10($sp) -/* C3E834 80240C44 03E00008 */ jr $ra -/* C3E838 80240C48 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/func_80240C4C_C3DBF0.s b/asm/nonmatchings/world/area_dgb/dgb_07/func_80240C4C_C3DBF0.s deleted file mode 100644 index d721dc9bab..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/func_80240C4C_C3DBF0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_C3E83C -/* C3E83C 80240C4C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C3E840 80240C50 AFB3002C */ sw $s3, 0x2c($sp) -/* C3E844 80240C54 0080982D */ daddu $s3, $a0, $zero -/* C3E848 80240C58 AFBF0030 */ sw $ra, 0x30($sp) -/* C3E84C 80240C5C AFB20028 */ sw $s2, 0x28($sp) -/* C3E850 80240C60 AFB10024 */ sw $s1, 0x24($sp) -/* C3E854 80240C64 AFB00020 */ sw $s0, 0x20($sp) -/* C3E858 80240C68 8E720148 */ lw $s2, 0x148($s3) -/* C3E85C 80240C6C 00A0882D */ daddu $s1, $a1, $zero -/* C3E860 80240C70 86440008 */ lh $a0, 8($s2) -/* C3E864 80240C74 0C00EABB */ jal get_npc_unsafe -/* C3E868 80240C78 00C0802D */ daddu $s0, $a2, $zero -/* C3E86C 80240C7C 0200202D */ daddu $a0, $s0, $zero -/* C3E870 80240C80 0240282D */ daddu $a1, $s2, $zero -/* C3E874 80240C84 AFA00010 */ sw $zero, 0x10($sp) -/* C3E878 80240C88 8E260024 */ lw $a2, 0x24($s1) -/* C3E87C 80240C8C 8E270028 */ lw $a3, 0x28($s1) -/* C3E880 80240C90 0C01242D */ jal func_800490B4 -/* C3E884 80240C94 0040802D */ daddu $s0, $v0, $zero -/* C3E888 80240C98 1040000C */ beqz $v0, .L80240CCC -/* C3E88C 80240C9C 00000000 */ nop -/* C3E890 80240CA0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3E894 80240CA4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C3E898 80240CA8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3E89C 80240CAC C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3E8A0 80240CB0 8C460028 */ lw $a2, 0x28($v0) -/* C3E8A4 80240CB4 0C00A720 */ jal atan2 -/* C3E8A8 80240CB8 8C470030 */ lw $a3, 0x30($v0) -/* C3E8AC 80240CBC 2402000C */ addiu $v0, $zero, 0xc -/* C3E8B0 80240CC0 E600000C */ swc1 $f0, 0xc($s0) -/* C3E8B4 80240CC4 0809036A */ j .L80240DA8 -/* C3E8B8 80240CC8 AE620070 */ sw $v0, 0x70($s3) -.L80240CCC: -/* C3E8BC 80240CCC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3E8C0 80240CD0 8E4200D0 */ lw $v0, 0xd0($s2) -/* C3E8C4 80240CD4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3E8C8 80240CD8 C4440000 */ lwc1 $f4, ($v0) -/* C3E8CC 80240CDC 46802120 */ cvt.s.w $f4, $f4 -/* C3E8D0 80240CE0 44062000 */ mfc1 $a2, $f4 -/* C3E8D4 80240CE4 C4440008 */ lwc1 $f4, 8($v0) -/* C3E8D8 80240CE8 46802120 */ cvt.s.w $f4, $f4 -/* C3E8DC 80240CEC 44072000 */ mfc1 $a3, $f4 -/* C3E8E0 80240CF0 0C00A7B5 */ jal dist2D -/* C3E8E4 80240CF4 00000000 */ nop -/* C3E8E8 80240CF8 C6020018 */ lwc1 $f2, 0x18($s0) -/* C3E8EC 80240CFC 4602003E */ c.le.s $f0, $f2 -/* C3E8F0 80240D00 00000000 */ nop -/* C3E8F4 80240D04 4500000B */ bc1f .L80240D34 -/* C3E8F8 80240D08 00000000 */ nop -/* C3E8FC 80240D0C 8E4200CC */ lw $v0, 0xcc($s2) -/* C3E900 80240D10 8C430000 */ lw $v1, ($v0) -/* C3E904 80240D14 2402000F */ addiu $v0, $zero, 0xf -/* C3E908 80240D18 A602008E */ sh $v0, 0x8e($s0) -/* C3E90C 80240D1C 24020032 */ addiu $v0, $zero, 0x32 -/* C3E910 80240D20 AE030028 */ sw $v1, 0x28($s0) -/* C3E914 80240D24 AE420088 */ sw $v0, 0x88($s2) -/* C3E918 80240D28 24020003 */ addiu $v0, $zero, 3 -/* C3E91C 80240D2C 0809036A */ j .L80240DA8 -/* C3E920 80240D30 AE620070 */ sw $v0, 0x70($s3) -.L80240D34: -/* C3E924 80240D34 8602008C */ lh $v0, 0x8c($s0) -/* C3E928 80240D38 1440001B */ bnez $v0, .L80240DA8 -/* C3E92C 80240D3C 0200202D */ daddu $a0, $s0, $zero -/* C3E930 80240D40 27A60018 */ addiu $a2, $sp, 0x18 -/* C3E934 80240D44 3C0540A0 */ lui $a1, 0x40a0 -/* C3E938 80240D48 C600000C */ lwc1 $f0, 0xc($s0) -/* C3E93C 80240D4C 0000382D */ daddu $a3, $zero, $zero -/* C3E940 80240D50 E7A00018 */ swc1 $f0, 0x18($sp) -/* C3E944 80240D54 AFA00010 */ sw $zero, 0x10($sp) -/* C3E948 80240D58 0C0129E1 */ jal func_8004A784 -/* C3E94C 80240D5C AFA00014 */ sw $zero, 0x14($sp) -/* C3E950 80240D60 C7A00018 */ lwc1 $f0, 0x18($sp) -/* C3E954 80240D64 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3E958 80240D68 E600000C */ swc1 $f0, 0xc($s0) -/* C3E95C 80240D6C 8E4200D0 */ lw $v0, 0xd0($s2) -/* C3E960 80240D70 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3E964 80240D74 C4440000 */ lwc1 $f4, ($v0) -/* C3E968 80240D78 46802120 */ cvt.s.w $f4, $f4 -/* C3E96C 80240D7C 44062000 */ mfc1 $a2, $f4 -/* C3E970 80240D80 C4440008 */ lwc1 $f4, 8($v0) -/* C3E974 80240D84 46802120 */ cvt.s.w $f4, $f4 -/* C3E978 80240D88 44072000 */ mfc1 $a3, $f4 -/* C3E97C 80240D8C 0C00A720 */ jal atan2 -/* C3E980 80240D90 00000000 */ nop -/* C3E984 80240D94 8E050018 */ lw $a1, 0x18($s0) -/* C3E988 80240D98 44060000 */ mfc1 $a2, $f0 -/* C3E98C 80240D9C 0200202D */ daddu $a0, $s0, $zero -/* C3E990 80240DA0 0C00EA95 */ jal npc_move_heading -/* C3E994 80240DA4 AC86000C */ sw $a2, 0xc($a0) -.L80240DA8: -/* C3E998 80240DA8 8FBF0030 */ lw $ra, 0x30($sp) -/* C3E99C 80240DAC 8FB3002C */ lw $s3, 0x2c($sp) -/* C3E9A0 80240DB0 8FB20028 */ lw $s2, 0x28($sp) -/* C3E9A4 80240DB4 8FB10024 */ lw $s1, 0x24($sp) -/* C3E9A8 80240DB8 8FB00020 */ lw $s0, 0x20($sp) -/* C3E9AC 80240DBC 03E00008 */ jr $ra -/* C3E9B0 80240DC0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/func_80240DC4_C3DBF0.s b/asm/nonmatchings/world/area_dgb/dgb_07/func_80240DC4_C3DBF0.s deleted file mode 100644 index c849bb54ce..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/func_80240DC4_C3DBF0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DC4_C3E9B4 -/* C3E9B4 80240DC4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C3E9B8 80240DC8 AFB00010 */ sw $s0, 0x10($sp) -/* C3E9BC 80240DCC 0080802D */ daddu $s0, $a0, $zero -/* C3E9C0 80240DD0 AFBF0014 */ sw $ra, 0x14($sp) -/* C3E9C4 80240DD4 8E020148 */ lw $v0, 0x148($s0) -/* C3E9C8 80240DD8 0C00EABB */ jal get_npc_unsafe -/* C3E9CC 80240DDC 84440008 */ lh $a0, 8($v0) -/* C3E9D0 80240DE0 0040182D */ daddu $v1, $v0, $zero -/* C3E9D4 80240DE4 8462008C */ lh $v0, 0x8c($v1) -/* C3E9D8 80240DE8 14400009 */ bnez $v0, .L80240E10 -/* C3E9DC 80240DEC 00000000 */ nop -/* C3E9E0 80240DF0 9462008E */ lhu $v0, 0x8e($v1) -/* C3E9E4 80240DF4 2442FFFF */ addiu $v0, $v0, -1 -/* C3E9E8 80240DF8 A462008E */ sh $v0, 0x8e($v1) -/* C3E9EC 80240DFC 00021400 */ sll $v0, $v0, 0x10 -/* C3E9F0 80240E00 1C400003 */ bgtz $v0, .L80240E10 -/* C3E9F4 80240E04 00000000 */ nop -/* C3E9F8 80240E08 A460008E */ sh $zero, 0x8e($v1) -/* C3E9FC 80240E0C AE000070 */ sw $zero, 0x70($s0) -.L80240E10: -/* C3EA00 80240E10 8FBF0014 */ lw $ra, 0x14($sp) -/* C3EA04 80240E14 8FB00010 */ lw $s0, 0x10($sp) -/* C3EA08 80240E18 03E00008 */ jr $ra -/* C3EA0C 80240E1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/func_80240E20_C3DBF0.s b/asm/nonmatchings/world/area_dgb/dgb_07/func_80240E20_C3DBF0.s deleted file mode 100644 index 0ca492763e..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/func_80240E20_C3DBF0.s +++ /dev/null @@ -1,223 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E20_C3EA10 -/* C3EA10 80240E20 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C3EA14 80240E24 AFB20038 */ sw $s2, 0x38($sp) -/* C3EA18 80240E28 0080902D */ daddu $s2, $a0, $zero -/* C3EA1C 80240E2C AFBF0048 */ sw $ra, 0x48($sp) -/* C3EA20 80240E30 AFB50044 */ sw $s5, 0x44($sp) -/* C3EA24 80240E34 AFB40040 */ sw $s4, 0x40($sp) -/* C3EA28 80240E38 AFB3003C */ sw $s3, 0x3c($sp) -/* C3EA2C 80240E3C AFB10034 */ sw $s1, 0x34($sp) -/* C3EA30 80240E40 AFB00030 */ sw $s0, 0x30($sp) -/* C3EA34 80240E44 8E510148 */ lw $s1, 0x148($s2) -/* C3EA38 80240E48 86240008 */ lh $a0, 8($s1) -/* C3EA3C 80240E4C 0C00EABB */ jal get_npc_unsafe -/* C3EA40 80240E50 00A0802D */ daddu $s0, $a1, $zero -/* C3EA44 80240E54 8E43000C */ lw $v1, 0xc($s2) -/* C3EA48 80240E58 0240202D */ daddu $a0, $s2, $zero -/* C3EA4C 80240E5C 8C650000 */ lw $a1, ($v1) -/* C3EA50 80240E60 0C0B1EAF */ jal get_variable -/* C3EA54 80240E64 0040A02D */ daddu $s4, $v0, $zero -/* C3EA58 80240E68 AFA00010 */ sw $zero, 0x10($sp) -/* C3EA5C 80240E6C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EA60 80240E70 8C630030 */ lw $v1, 0x30($v1) -/* C3EA64 80240E74 AFA30014 */ sw $v1, 0x14($sp) -/* C3EA68 80240E78 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EA6C 80240E7C 8C63001C */ lw $v1, 0x1c($v1) -/* C3EA70 80240E80 AFA30018 */ sw $v1, 0x18($sp) -/* C3EA74 80240E84 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EA78 80240E88 8C630024 */ lw $v1, 0x24($v1) -/* C3EA7C 80240E8C AFA3001C */ sw $v1, 0x1c($sp) -/* C3EA80 80240E90 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EA84 80240E94 8C630028 */ lw $v1, 0x28($v1) -/* C3EA88 80240E98 27B50010 */ addiu $s5, $sp, 0x10 -/* C3EA8C 80240E9C AFA30020 */ sw $v1, 0x20($sp) -/* C3EA90 80240EA0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EA94 80240EA4 3C014220 */ lui $at, 0x4220 -/* C3EA98 80240EA8 44810000 */ mtc1 $at, $f0 -/* C3EA9C 80240EAC 8C63002C */ lw $v1, 0x2c($v1) -/* C3EAA0 80240EB0 0040982D */ daddu $s3, $v0, $zero -/* C3EAA4 80240EB4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C3EAA8 80240EB8 A7A0002C */ sh $zero, 0x2c($sp) -/* C3EAAC 80240EBC 16000005 */ bnez $s0, .L80240ED4 -/* C3EAB0 80240EC0 AFA30024 */ sw $v1, 0x24($sp) -/* C3EAB4 80240EC4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3EAB8 80240EC8 30420004 */ andi $v0, $v0, 4 -/* C3EABC 80240ECC 10400027 */ beqz $v0, .L80240F6C -/* C3EAC0 80240ED0 00000000 */ nop -.L80240ED4: -/* C3EAC4 80240ED4 2402001E */ addiu $v0, $zero, 0x1e -/* C3EAC8 80240ED8 2404F7FF */ addiu $a0, $zero, -0x801 -/* C3EACC 80240EDC AE400070 */ sw $zero, 0x70($s2) -/* C3EAD0 80240EE0 A682008E */ sh $v0, 0x8e($s4) -/* C3EAD4 80240EE4 8E2300CC */ lw $v1, 0xcc($s1) -/* C3EAD8 80240EE8 8E820000 */ lw $v0, ($s4) -/* C3EADC 80240EEC 8C630028 */ lw $v1, 0x28($v1) -/* C3EAE0 80240EF0 00441024 */ and $v0, $v0, $a0 -/* C3EAE4 80240EF4 AE820000 */ sw $v0, ($s4) -/* C3EAE8 80240EF8 AE830028 */ sw $v1, 0x28($s4) -/* C3EAEC 80240EFC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C3EAF0 80240F00 AE20006C */ sw $zero, 0x6c($s1) -/* C3EAF4 80240F04 8C420034 */ lw $v0, 0x34($v0) -/* C3EAF8 80240F08 14400006 */ bnez $v0, .L80240F24 -/* C3EAFC 80240F0C 2403FDFF */ addiu $v1, $zero, -0x201 -/* C3EB00 80240F10 8E820000 */ lw $v0, ($s4) -/* C3EB04 80240F14 2403FFF7 */ addiu $v1, $zero, -9 -/* C3EB08 80240F18 34420200 */ ori $v0, $v0, 0x200 -/* C3EB0C 80240F1C 080903CC */ j .L80240F30 -/* C3EB10 80240F20 00431024 */ and $v0, $v0, $v1 -.L80240F24: -/* C3EB14 80240F24 8E820000 */ lw $v0, ($s4) -/* C3EB18 80240F28 00431024 */ and $v0, $v0, $v1 -/* C3EB1C 80240F2C 34420008 */ ori $v0, $v0, 8 -.L80240F30: -/* C3EB20 80240F30 AE820000 */ sw $v0, ($s4) -/* C3EB24 80240F34 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3EB28 80240F38 30420004 */ andi $v0, $v0, 4 -/* C3EB2C 80240F3C 10400007 */ beqz $v0, .L80240F5C -/* C3EB30 80240F40 24020063 */ addiu $v0, $zero, 0x63 -/* C3EB34 80240F44 AE420070 */ sw $v0, 0x70($s2) -/* C3EB38 80240F48 24020028 */ addiu $v0, $zero, 0x28 -/* C3EB3C 80240F4C AE420074 */ sw $v0, 0x74($s2) -/* C3EB40 80240F50 8E2200CC */ lw $v0, 0xcc($s1) -/* C3EB44 80240F54 8C420000 */ lw $v0, ($v0) -/* C3EB48 80240F58 AE820028 */ sw $v0, 0x28($s4) -.L80240F5C: -/* C3EB4C 80240F5C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3EB50 80240F60 2403FFFB */ addiu $v1, $zero, -5 -/* C3EB54 80240F64 00431024 */ and $v0, $v0, $v1 -/* C3EB58 80240F68 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240F6C: -/* C3EB5C 80240F6C 8E420070 */ lw $v0, 0x70($s2) -/* C3EB60 80240F70 2442FFF6 */ addiu $v0, $v0, -0xa -/* C3EB64 80240F74 2C420014 */ sltiu $v0, $v0, 0x14 -/* C3EB68 80240F78 10400009 */ beqz $v0, .L80240FA0 -/* C3EB6C 80240F7C 00000000 */ nop -/* C3EB70 80240F80 8E22006C */ lw $v0, 0x6c($s1) -/* C3EB74 80240F84 14400006 */ bnez $v0, .L80240FA0 -/* C3EB78 80240F88 00000000 */ nop -/* C3EB7C 80240F8C 0C090082 */ jal func_80240208 -/* C3EB80 80240F90 0240202D */ daddu $a0, $s2, $zero -/* C3EB84 80240F94 10400002 */ beqz $v0, .L80240FA0 -/* C3EB88 80240F98 2402001E */ addiu $v0, $zero, 0x1e -/* C3EB8C 80240F9C AE420070 */ sw $v0, 0x70($s2) -.L80240FA0: -/* C3EB90 80240FA0 8E430070 */ lw $v1, 0x70($s2) -/* C3EB94 80240FA4 2C620064 */ sltiu $v0, $v1, 0x64 -/* C3EB98 80240FA8 10400067 */ beqz $v0, .L80241148 -/* C3EB9C 80240FAC 00031080 */ sll $v0, $v1, 2 -/* C3EBA0 80240FB0 3C018024 */ lui $at, 0x8024 -/* C3EBA4 80240FB4 00220821 */ addu $at, $at, $v0 -/* C3EBA8 80240FB8 8C221EA0 */ lw $v0, 0x1ea0($at) -/* C3EBAC 80240FBC 00400008 */ jr $v0 -/* C3EBB0 80240FC0 00000000 */ nop -/* C3EBB4 80240FC4 0240202D */ daddu $a0, $s2, $zero -/* C3EBB8 80240FC8 0260282D */ daddu $a1, $s3, $zero -/* C3EBBC 80240FCC 0C090187 */ jal func_8024061C -/* C3EBC0 80240FD0 02A0302D */ daddu $a2, $s5, $zero -/* C3EBC4 80240FD4 08090452 */ j .L80241148 -/* C3EBC8 80240FD8 00000000 */ nop -/* C3EBCC 80240FDC 0240202D */ daddu $a0, $s2, $zero -/* C3EBD0 80240FE0 0260282D */ daddu $a1, $s3, $zero -/* C3EBD4 80240FE4 0C0901A9 */ jal func_802406A4 -/* C3EBD8 80240FE8 02A0302D */ daddu $a2, $s5, $zero -/* C3EBDC 80240FEC 08090452 */ j .L80241148 -/* C3EBE0 80240FF0 00000000 */ nop -/* C3EBE4 80240FF4 0240202D */ daddu $a0, $s2, $zero -/* C3EBE8 80240FF8 0260282D */ daddu $a1, $s3, $zero -/* C3EBEC 80240FFC 0C090257 */ jal func_8024095C -/* C3EBF0 80241000 02A0302D */ daddu $a2, $s5, $zero -/* C3EBF4 80241004 08090452 */ j .L80241148 -/* C3EBF8 80241008 00000000 */ nop -/* C3EBFC 8024100C 0240202D */ daddu $a0, $s2, $zero -/* C3EC00 80241010 0260282D */ daddu $a1, $s3, $zero -/* C3EC04 80241014 0C090270 */ jal func_802409C0 -/* C3EC08 80241018 02A0302D */ daddu $a2, $s5, $zero -/* C3EC0C 8024101C 08090452 */ j .L80241148 -/* C3EC10 80241020 00000000 */ nop -/* C3EC14 80241024 0240202D */ daddu $a0, $s2, $zero -/* C3EC18 80241028 0260282D */ daddu $a1, $s3, $zero -/* C3EC1C 8024102C 0C09029A */ jal func_80240A68 -/* C3EC20 80241030 02A0302D */ daddu $a2, $s5, $zero -/* C3EC24 80241034 08090452 */ j .L80241148 -/* C3EC28 80241038 00000000 */ nop -/* C3EC2C 8024103C 0240202D */ daddu $a0, $s2, $zero -/* C3EC30 80241040 0260282D */ daddu $a1, $s3, $zero -/* C3EC34 80241044 0C0127DF */ jal func_80049F7C -/* C3EC38 80241048 02A0302D */ daddu $a2, $s5, $zero -/* C3EC3C 8024104C 8E430070 */ lw $v1, 0x70($s2) -/* C3EC40 80241050 2402000D */ addiu $v0, $zero, 0xd -/* C3EC44 80241054 1462003C */ bne $v1, $v0, .L80241148 -/* C3EC48 80241058 00000000 */ nop -/* C3EC4C 8024105C 0240202D */ daddu $a0, $s2, $zero -/* C3EC50 80241060 0260282D */ daddu $a1, $s3, $zero -/* C3EC54 80241064 0C012849 */ jal func_8004A124 -/* C3EC58 80241068 02A0302D */ daddu $a2, $s5, $zero -/* C3EC5C 8024106C 08090452 */ j .L80241148 -/* C3EC60 80241070 00000000 */ nop -/* C3EC64 80241074 0240202D */ daddu $a0, $s2, $zero -/* C3EC68 80241078 0260282D */ daddu $a1, $s3, $zero -/* C3EC6C 8024107C 0C0128FA */ jal func_8004A3E8 -/* C3EC70 80241080 02A0302D */ daddu $a2, $s5, $zero -/* C3EC74 80241084 2402000F */ addiu $v0, $zero, 0xf -/* C3EC78 80241088 A682008E */ sh $v0, 0x8e($s4) -/* C3EC7C 8024108C 24020028 */ addiu $v0, $zero, 0x28 -/* C3EC80 80241090 AE220088 */ sw $v0, 0x88($s1) -/* C3EC84 80241094 24020003 */ addiu $v0, $zero, 3 -/* C3EC88 80241098 08090452 */ j .L80241148 -/* C3EC8C 8024109C AE420070 */ sw $v0, 0x70($s2) -/* C3EC90 802410A0 0C090000 */ jal func_80240000 -/* C3EC94 802410A4 0240202D */ daddu $a0, $s2, $zero -/* C3EC98 802410A8 8E430070 */ lw $v1, 0x70($s2) -/* C3EC9C 802410AC 2402001F */ addiu $v0, $zero, 0x1f -/* C3ECA0 802410B0 14620025 */ bne $v1, $v0, .L80241148 -/* C3ECA4 802410B4 00000000 */ nop -/* C3ECA8 802410B8 0C09001B */ jal func_8024006C -/* C3ECAC 802410BC 0240202D */ daddu $a0, $s2, $zero -/* C3ECB0 802410C0 8E430070 */ lw $v1, 0x70($s2) -/* C3ECB4 802410C4 24020020 */ addiu $v0, $zero, 0x20 -/* C3ECB8 802410C8 1462001F */ bne $v1, $v0, .L80241148 -/* C3ECBC 802410CC 00000000 */ nop -/* C3ECC0 802410D0 0C090037 */ jal func_802400DC -/* C3ECC4 802410D4 0240202D */ daddu $a0, $s2, $zero -/* C3ECC8 802410D8 08090452 */ j .L80241148 -/* C3ECCC 802410DC 00000000 */ nop -/* C3ECD0 802410E0 0C09006D */ jal func_802401B4 -/* C3ECD4 802410E4 0240202D */ daddu $a0, $s2, $zero -/* C3ECD8 802410E8 08090452 */ j .L80241148 -/* C3ECDC 802410EC 00000000 */ nop -/* C3ECE0 802410F0 0240202D */ daddu $a0, $s2, $zero -/* C3ECE4 802410F4 0260282D */ daddu $a1, $s3, $zero -/* C3ECE8 802410F8 0C0902E8 */ jal func_80240BA0 -/* C3ECEC 802410FC 02A0302D */ daddu $a2, $s5, $zero -/* C3ECF0 80241100 8E430070 */ lw $v1, 0x70($s2) -/* C3ECF4 80241104 24020029 */ addiu $v0, $zero, 0x29 -/* C3ECF8 80241108 1462000F */ bne $v1, $v0, .L80241148 -/* C3ECFC 8024110C 00000000 */ nop -/* C3ED00 80241110 0240202D */ daddu $a0, $s2, $zero -/* C3ED04 80241114 0260282D */ daddu $a1, $s3, $zero -/* C3ED08 80241118 0C090313 */ jal func_80240C4C -/* C3ED0C 8024111C 02A0302D */ daddu $a2, $s5, $zero -/* C3ED10 80241120 08090452 */ j .L80241148 -/* C3ED14 80241124 00000000 */ nop -/* C3ED18 80241128 0240202D */ daddu $a0, $s2, $zero -/* C3ED1C 8024112C 0260282D */ daddu $a1, $s3, $zero -/* C3ED20 80241130 0C090371 */ jal func_80240DC4 -/* C3ED24 80241134 02A0302D */ daddu $a2, $s5, $zero -/* C3ED28 80241138 08090452 */ j .L80241148 -/* C3ED2C 8024113C 00000000 */ nop -/* C3ED30 80241140 0C0129CF */ jal func_8004A73C -/* C3ED34 80241144 0240202D */ daddu $a0, $s2, $zero -.L80241148: -/* C3ED38 80241148 8FBF0048 */ lw $ra, 0x48($sp) -/* C3ED3C 8024114C 8FB50044 */ lw $s5, 0x44($sp) -/* C3ED40 80241150 8FB40040 */ lw $s4, 0x40($sp) -/* C3ED44 80241154 8FB3003C */ lw $s3, 0x3c($sp) -/* C3ED48 80241158 8FB20038 */ lw $s2, 0x38($sp) -/* C3ED4C 8024115C 8FB10034 */ lw $s1, 0x34($sp) -/* C3ED50 80241160 8FB00030 */ lw $s0, 0x30($sp) -/* C3ED54 80241164 0000102D */ daddu $v0, $zero, $zero -/* C3ED58 80241168 03E00008 */ jr $ra -/* C3ED5C 8024116C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/func_80241170_C3DBF0.s b/asm/nonmatchings/world/area_dgb/dgb_07/func_80241170_C3DBF0.s deleted file mode 100644 index 60cfb6cd40..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/func_80241170_C3DBF0.s +++ /dev/null @@ -1,187 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241170_C3ED60 -/* C3ED60 80241170 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C3ED64 80241174 AFB20038 */ sw $s2, 0x38($sp) -/* C3ED68 80241178 0080902D */ daddu $s2, $a0, $zero -/* C3ED6C 8024117C AFBF0048 */ sw $ra, 0x48($sp) -/* C3ED70 80241180 AFB50044 */ sw $s5, 0x44($sp) -/* C3ED74 80241184 AFB40040 */ sw $s4, 0x40($sp) -/* C3ED78 80241188 AFB3003C */ sw $s3, 0x3c($sp) -/* C3ED7C 8024118C AFB10034 */ sw $s1, 0x34($sp) -/* C3ED80 80241190 AFB00030 */ sw $s0, 0x30($sp) -/* C3ED84 80241194 8E510148 */ lw $s1, 0x148($s2) -/* C3ED88 80241198 86240008 */ lh $a0, 8($s1) -/* C3ED8C 8024119C 0C00EABB */ jal get_npc_unsafe -/* C3ED90 802411A0 00A0802D */ daddu $s0, $a1, $zero -/* C3ED94 802411A4 8E43000C */ lw $v1, 0xc($s2) -/* C3ED98 802411A8 0240202D */ daddu $a0, $s2, $zero -/* C3ED9C 802411AC 8C650000 */ lw $a1, ($v1) -/* C3EDA0 802411B0 0C0B1EAF */ jal get_variable -/* C3EDA4 802411B4 0040A82D */ daddu $s5, $v0, $zero -/* C3EDA8 802411B8 AFA00010 */ sw $zero, 0x10($sp) -/* C3EDAC 802411BC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EDB0 802411C0 8C630030 */ lw $v1, 0x30($v1) -/* C3EDB4 802411C4 AFA30014 */ sw $v1, 0x14($sp) -/* C3EDB8 802411C8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EDBC 802411CC 8C63001C */ lw $v1, 0x1c($v1) -/* C3EDC0 802411D0 AFA30018 */ sw $v1, 0x18($sp) -/* C3EDC4 802411D4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EDC8 802411D8 8C630024 */ lw $v1, 0x24($v1) -/* C3EDCC 802411DC AFA3001C */ sw $v1, 0x1c($sp) -/* C3EDD0 802411E0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EDD4 802411E4 8C630028 */ lw $v1, 0x28($v1) -/* C3EDD8 802411E8 27B40010 */ addiu $s4, $sp, 0x10 -/* C3EDDC 802411EC AFA30020 */ sw $v1, 0x20($sp) -/* C3EDE0 802411F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EDE4 802411F4 3C014282 */ lui $at, 0x4282 -/* C3EDE8 802411F8 44810000 */ mtc1 $at, $f0 -/* C3EDEC 802411FC 8C63002C */ lw $v1, 0x2c($v1) -/* C3EDF0 80241200 0040982D */ daddu $s3, $v0, $zero -/* C3EDF4 80241204 E7A00028 */ swc1 $f0, 0x28($sp) -/* C3EDF8 80241208 A7A0002C */ sh $zero, 0x2c($sp) -/* C3EDFC 8024120C 16000005 */ bnez $s0, .L80241224 -/* C3EE00 80241210 AFA30024 */ sw $v1, 0x24($sp) -/* C3EE04 80241214 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3EE08 80241218 30420004 */ andi $v0, $v0, 4 -/* C3EE0C 8024121C 10400020 */ beqz $v0, .L802412A0 -/* C3EE10 80241220 00000000 */ nop -.L80241224: -/* C3EE14 80241224 2404F7FF */ addiu $a0, $zero, -0x801 -/* C3EE18 80241228 AE400070 */ sw $zero, 0x70($s2) -/* C3EE1C 8024122C A6A0008E */ sh $zero, 0x8e($s5) -/* C3EE20 80241230 8E2200CC */ lw $v0, 0xcc($s1) -/* C3EE24 80241234 8EA30000 */ lw $v1, ($s5) -/* C3EE28 80241238 8C420000 */ lw $v0, ($v0) -/* C3EE2C 8024123C 00641824 */ and $v1, $v1, $a0 -/* C3EE30 80241240 AEA30000 */ sw $v1, ($s5) -/* C3EE34 80241244 AEA20028 */ sw $v0, 0x28($s5) -/* C3EE38 80241248 8E2200D0 */ lw $v0, 0xd0($s1) -/* C3EE3C 8024124C 8C420034 */ lw $v0, 0x34($v0) -/* C3EE40 80241250 54400005 */ bnel $v0, $zero, .L80241268 -/* C3EE44 80241254 2402FDFF */ addiu $v0, $zero, -0x201 -/* C3EE48 80241258 34620200 */ ori $v0, $v1, 0x200 -/* C3EE4C 8024125C 2403FFF7 */ addiu $v1, $zero, -9 -/* C3EE50 80241260 0809049C */ j .L80241270 -/* C3EE54 80241264 00431024 */ and $v0, $v0, $v1 -.L80241268: -/* C3EE58 80241268 00621024 */ and $v0, $v1, $v0 -/* C3EE5C 8024126C 34420008 */ ori $v0, $v0, 8 -.L80241270: -/* C3EE60 80241270 AEA20000 */ sw $v0, ($s5) -/* C3EE64 80241274 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3EE68 80241278 30420004 */ andi $v0, $v0, 4 -/* C3EE6C 8024127C 10400007 */ beqz $v0, .L8024129C -/* C3EE70 80241280 24020063 */ addiu $v0, $zero, 0x63 -/* C3EE74 80241284 AE420070 */ sw $v0, 0x70($s2) -/* C3EE78 80241288 AE400074 */ sw $zero, 0x74($s2) -/* C3EE7C 8024128C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3EE80 80241290 2403FFFB */ addiu $v1, $zero, -5 -/* C3EE84 80241294 00431024 */ and $v0, $v0, $v1 -/* C3EE88 80241298 AE2200B0 */ sw $v0, 0xb0($s1) -.L8024129C: -/* C3EE8C 8024129C AE20006C */ sw $zero, 0x6c($s1) -.L802412A0: -/* C3EE90 802412A0 8E420070 */ lw $v0, 0x70($s2) -/* C3EE94 802412A4 2842001E */ slti $v0, $v0, 0x1e -/* C3EE98 802412A8 10400009 */ beqz $v0, .L802412D0 -/* C3EE9C 802412AC 00000000 */ nop -/* C3EEA0 802412B0 8E22006C */ lw $v0, 0x6c($s1) -/* C3EEA4 802412B4 14400006 */ bnez $v0, .L802412D0 -/* C3EEA8 802412B8 00000000 */ nop -/* C3EEAC 802412BC 0C090082 */ jal func_80240208 -/* C3EEB0 802412C0 0240202D */ daddu $a0, $s2, $zero -/* C3EEB4 802412C4 10400002 */ beqz $v0, .L802412D0 -/* C3EEB8 802412C8 2402001E */ addiu $v0, $zero, 0x1e -/* C3EEBC 802412CC AE420070 */ sw $v0, 0x70($s2) -.L802412D0: -/* C3EEC0 802412D0 8E430070 */ lw $v1, 0x70($s2) -/* C3EEC4 802412D4 2C620064 */ sltiu $v0, $v1, 0x64 -/* C3EEC8 802412D8 10400048 */ beqz $v0, .L802413FC -/* C3EECC 802412DC 00031080 */ sll $v0, $v1, 2 -/* C3EED0 802412E0 3C018024 */ lui $at, 0x8024 -/* C3EED4 802412E4 00220821 */ addu $at, $at, $v0 -/* C3EED8 802412E8 8C222030 */ lw $v0, 0x2030($at) -/* C3EEDC 802412EC 00400008 */ jr $v0 -/* C3EEE0 802412F0 00000000 */ nop -/* C3EEE4 802412F4 0240202D */ daddu $a0, $s2, $zero -/* C3EEE8 802412F8 0260282D */ daddu $a1, $s3, $zero -/* C3EEEC 802412FC 0C012568 */ jal func_800495A0 -/* C3EEF0 80241300 0280302D */ daddu $a2, $s4, $zero -/* C3EEF4 80241304 0240202D */ daddu $a0, $s2, $zero -/* C3EEF8 80241308 0260282D */ daddu $a1, $s3, $zero -/* C3EEFC 8024130C 0C0125AE */ jal func_800496B8 -/* C3EF00 80241310 0280302D */ daddu $a2, $s4, $zero -/* C3EF04 80241314 080904FF */ j .L802413FC -/* C3EF08 80241318 00000000 */ nop -/* C3EF0C 8024131C 0240202D */ daddu $a0, $s2, $zero -/* C3EF10 80241320 0260282D */ daddu $a1, $s3, $zero -/* C3EF14 80241324 0C0126D1 */ jal func_80049B44 -/* C3EF18 80241328 0280302D */ daddu $a2, $s4, $zero -/* C3EF1C 8024132C 0240202D */ daddu $a0, $s2, $zero -/* C3EF20 80241330 0260282D */ daddu $a1, $s3, $zero -/* C3EF24 80241334 0C012701 */ jal func_80049C04 -/* C3EF28 80241338 0280302D */ daddu $a2, $s4, $zero -/* C3EF2C 8024133C 080904FF */ j .L802413FC -/* C3EF30 80241340 00000000 */ nop -/* C3EF34 80241344 0240202D */ daddu $a0, $s2, $zero -/* C3EF38 80241348 0260282D */ daddu $a1, $s3, $zero -/* C3EF3C 8024134C 0C01278F */ jal func_80049E3C -/* C3EF40 80241350 0280302D */ daddu $a2, $s4, $zero -/* C3EF44 80241354 0240202D */ daddu $a0, $s2, $zero -/* C3EF48 80241358 0260282D */ daddu $a1, $s3, $zero -/* C3EF4C 8024135C 0C0127B3 */ jal func_80049ECC -/* C3EF50 80241360 0280302D */ daddu $a2, $s4, $zero -/* C3EF54 80241364 080904FF */ j .L802413FC -/* C3EF58 80241368 00000000 */ nop -/* C3EF5C 8024136C 0240202D */ daddu $a0, $s2, $zero -/* C3EF60 80241370 0260282D */ daddu $a1, $s3, $zero -/* C3EF64 80241374 0C0127DF */ jal func_80049F7C -/* C3EF68 80241378 0280302D */ daddu $a2, $s4, $zero -/* C3EF6C 8024137C 0240202D */ daddu $a0, $s2, $zero -/* C3EF70 80241380 0260282D */ daddu $a1, $s3, $zero -/* C3EF74 80241384 0C012849 */ jal func_8004A124 -/* C3EF78 80241388 0280302D */ daddu $a2, $s4, $zero -/* C3EF7C 8024138C 080904FF */ j .L802413FC -/* C3EF80 80241390 00000000 */ nop -/* C3EF84 80241394 0240202D */ daddu $a0, $s2, $zero -/* C3EF88 80241398 0260282D */ daddu $a1, $s3, $zero -/* C3EF8C 8024139C 0C0128FA */ jal func_8004A3E8 -/* C3EF90 802413A0 0280302D */ daddu $a2, $s4, $zero -/* C3EF94 802413A4 080904FF */ j .L802413FC -/* C3EF98 802413A8 00000000 */ nop -/* C3EF9C 802413AC 0C090000 */ jal func_80240000 -/* C3EFA0 802413B0 0240202D */ daddu $a0, $s2, $zero -/* C3EFA4 802413B4 0C09001B */ jal func_8024006C -/* C3EFA8 802413B8 0240202D */ daddu $a0, $s2, $zero -/* C3EFAC 802413BC 8E430070 */ lw $v1, 0x70($s2) -/* C3EFB0 802413C0 24020020 */ addiu $v0, $zero, 0x20 -/* C3EFB4 802413C4 1462000D */ bne $v1, $v0, .L802413FC -/* C3EFB8 802413C8 00000000 */ nop -/* C3EFBC 802413CC 0C090037 */ jal func_802400DC -/* C3EFC0 802413D0 0240202D */ daddu $a0, $s2, $zero -/* C3EFC4 802413D4 8E430070 */ lw $v1, 0x70($s2) -/* C3EFC8 802413D8 24020021 */ addiu $v0, $zero, 0x21 -/* C3EFCC 802413DC 14620007 */ bne $v1, $v0, .L802413FC -/* C3EFD0 802413E0 00000000 */ nop -/* C3EFD4 802413E4 0C09006D */ jal func_802401B4 -/* C3EFD8 802413E8 0240202D */ daddu $a0, $s2, $zero -/* C3EFDC 802413EC 080904FF */ j .L802413FC -/* C3EFE0 802413F0 00000000 */ nop -/* C3EFE4 802413F4 0C0129CF */ jal func_8004A73C -/* C3EFE8 802413F8 0240202D */ daddu $a0, $s2, $zero -.L802413FC: -/* C3EFEC 802413FC 8FBF0048 */ lw $ra, 0x48($sp) -/* C3EFF0 80241400 8FB50044 */ lw $s5, 0x44($sp) -/* C3EFF4 80241404 8FB40040 */ lw $s4, 0x40($sp) -/* C3EFF8 80241408 8FB3003C */ lw $s3, 0x3c($sp) -/* C3EFFC 8024140C 8FB20038 */ lw $s2, 0x38($sp) -/* C3F000 80241410 8FB10034 */ lw $s1, 0x34($sp) -/* C3F004 80241414 8FB00030 */ lw $s0, 0x30($sp) -/* C3F008 80241418 0000102D */ daddu $v0, $zero, $zero -/* C3F00C 8024141C 03E00008 */ jr $ra -/* C3F010 80241420 27BD0050 */ addiu $sp, $sp, 0x50 -/* C3F014 80241424 00000000 */ nop -/* C3F018 80241428 00000000 */ nop -/* C3F01C 8024142C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/update_starpoints_display_C3DBF0.s b/asm/nonmatchings/world/area_dgb/dgb_07/update_starpoints_display_C3DBF0.s deleted file mode 100644 index 4388e72948..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_07/update_starpoints_display_C3DBF0.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_starpoints_display_C3DFAC -/* C3DFAC 802403BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C3DFB0 802403C0 AFB40028 */ sw $s4, 0x28($sp) -/* C3DFB4 802403C4 0080A02D */ daddu $s4, $a0, $zero -/* C3DFB8 802403C8 AFBF002C */ sw $ra, 0x2c($sp) -/* C3DFBC 802403CC AFB30024 */ sw $s3, 0x24($sp) -/* C3DFC0 802403D0 AFB20020 */ sw $s2, 0x20($sp) -/* C3DFC4 802403D4 AFB1001C */ sw $s1, 0x1c($sp) -/* C3DFC8 802403D8 AFB00018 */ sw $s0, 0x18($sp) -/* C3DFCC 802403DC 8E910148 */ lw $s1, 0x148($s4) -/* C3DFD0 802403E0 86240008 */ lh $a0, 8($s1) -/* C3DFD4 802403E4 0C00EABB */ jal get_npc_unsafe -/* C3DFD8 802403E8 00A0802D */ daddu $s0, $a1, $zero -/* C3DFDC 802403EC 16000005 */ bnez $s0, .L80240404 -/* C3DFE0 802403F0 0040902D */ daddu $s2, $v0, $zero -/* C3DFE4 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3DFE8 802403F8 30420004 */ andi $v0, $v0, 4 -/* C3DFEC 802403FC 10400015 */ beqz $v0, .L80240454 -/* C3DFF0 80240400 00000000 */ nop -.L80240404: -/* C3DFF4 80240404 AE800070 */ sw $zero, 0x70($s4) -/* C3DFF8 80240408 8E420000 */ lw $v0, ($s2) -/* C3DFFC 8024040C 3C031F30 */ lui $v1, 0x1f30 -/* C3E000 80240410 A640008E */ sh $zero, 0x8e($s2) -/* C3E004 80240414 34420102 */ ori $v0, $v0, 0x102 -/* C3E008 80240418 AE420000 */ sw $v0, ($s2) -/* C3E00C 8024041C 8E220000 */ lw $v0, ($s1) -/* C3E010 80240420 3C01C47A */ lui $at, 0xc47a -/* C3E014 80240424 44810000 */ mtc1 $at, $f0 -/* C3E018 80240428 00431025 */ or $v0, $v0, $v1 -/* C3E01C 8024042C AE220000 */ sw $v0, ($s1) -/* C3E020 80240430 AE400038 */ sw $zero, 0x38($s2) -/* C3E024 80240434 E640003C */ swc1 $f0, 0x3c($s2) -/* C3E028 80240438 AE400040 */ sw $zero, 0x40($s2) -/* C3E02C 8024043C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C3E030 80240440 30620004 */ andi $v0, $v1, 4 -/* C3E034 80240444 10400003 */ beqz $v0, .L80240454 -/* C3E038 80240448 2402FFFB */ addiu $v0, $zero, -5 -/* C3E03C 8024044C 00621024 */ and $v0, $v1, $v0 -/* C3E040 80240450 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240454: -/* C3E044 80240454 8E930070 */ lw $s3, 0x70($s4) -/* C3E048 80240458 12600005 */ beqz $s3, .L80240470 -/* C3E04C 8024045C 24020001 */ addiu $v0, $zero, 1 -/* C3E050 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* C3E054 80240464 00000000 */ nop -/* C3E058 80240468 0809017E */ j .L802405F8 -/* C3E05C 8024046C 00000000 */ nop -.L80240470: -/* C3E060 80240470 86240008 */ lh $a0, 8($s1) -/* C3E064 80240474 0C00FB3A */ jal get_enemy -/* C3E068 80240478 2484FFFF */ addiu $a0, $a0, -1 -/* C3E06C 8024047C 0040802D */ daddu $s0, $v0, $zero -/* C3E070 80240480 0C00EABB */ jal get_npc_unsafe -/* C3E074 80240484 86040008 */ lh $a0, 8($s0) -/* C3E078 80240488 24030001 */ addiu $v1, $zero, 1 -/* C3E07C 8024048C 0040982D */ daddu $s3, $v0, $zero -/* C3E080 80240490 A2230007 */ sb $v1, 7($s1) -/* C3E084 80240494 8E03006C */ lw $v1, 0x6c($s0) -/* C3E088 80240498 24020003 */ addiu $v0, $zero, 3 -/* C3E08C 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* C3E090 802404A0 00000000 */ nop -/* C3E094 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) -/* C3E098 802404A8 10A00003 */ beqz $a1, .L802404B8 -/* C3E09C 802404AC 0260202D */ daddu $a0, $s3, $zero -/* C3E0A0 802404B0 0C012530 */ jal func_800494C0 -/* C3E0A4 802404B4 0000302D */ daddu $a2, $zero, $zero -.L802404B8: -/* C3E0A8 802404B8 27A40010 */ addiu $a0, $sp, 0x10 -/* C3E0AC 802404BC C6280070 */ lwc1 $f8, 0x70($s1) -/* C3E0B0 802404C0 46804220 */ cvt.s.w $f8, $f8 -/* C3E0B4 802404C4 C6620034 */ lwc1 $f2, 0x34($s3) -/* C3E0B8 802404C8 3C014387 */ lui $at, 0x4387 -/* C3E0BC 802404CC 44810000 */ mtc1 $at, $f0 -/* C3E0C0 802404D0 44064000 */ mfc1 $a2, $f8 -/* C3E0C4 802404D4 46020001 */ sub.s $f0, $f0, $f2 -/* C3E0C8 802404D8 C6660038 */ lwc1 $f6, 0x38($s3) -/* C3E0CC 802404DC C6640040 */ lwc1 $f4, 0x40($s3) -/* C3E0D0 802404E0 44070000 */ mfc1 $a3, $f0 -/* C3E0D4 802404E4 27A50014 */ addiu $a1, $sp, 0x14 -/* C3E0D8 802404E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* C3E0DC 802404EC 0C00A7E7 */ jal add_vec2D_polar -/* C3E0E0 802404F0 E7A40014 */ swc1 $f4, 0x14($sp) -/* C3E0E4 802404F4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C3E0E8 802404F8 4600020D */ trunc.w.s $f8, $f0 -/* C3E0EC 802404FC 44024000 */ mfc1 $v0, $f8 -/* C3E0F0 80240500 E6400038 */ swc1 $f0, 0x38($s2) -/* C3E0F4 80240504 A6220010 */ sh $v0, 0x10($s1) -/* C3E0F8 80240508 C660003C */ lwc1 $f0, 0x3c($s3) -/* C3E0FC 8024050C C622006C */ lwc1 $f2, 0x6c($s1) -/* C3E100 80240510 468010A0 */ cvt.s.w $f2, $f2 -/* C3E104 80240514 46020000 */ add.s $f0, $f0, $f2 -/* C3E108 80240518 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C3E10C 8024051C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C3E110 80240520 E640003C */ swc1 $f0, 0x3c($s2) -/* C3E114 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C3E118 80240528 4600020D */ trunc.w.s $f8, $f0 -/* C3E11C 8024052C 44024000 */ mfc1 $v0, $f8 -/* C3E120 80240530 00000000 */ nop -/* C3E124 80240534 A6220012 */ sh $v0, 0x12($s1) -/* C3E128 80240538 4600120D */ trunc.w.s $f8, $f2 -/* C3E12C 8024053C 44024000 */ mfc1 $v0, $f8 -/* C3E130 80240540 E6420040 */ swc1 $f2, 0x40($s2) -/* C3E134 80240544 A6220014 */ sh $v0, 0x14($s1) -/* C3E138 80240548 8C660028 */ lw $a2, 0x28($v1) -/* C3E13C 8024054C 8C670030 */ lw $a3, 0x30($v1) -/* C3E140 80240550 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C3E144 80240554 0C00A720 */ jal atan2 -/* C3E148 80240558 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C3E14C 8024055C 3C03E0EF */ lui $v1, 0xe0ef -/* C3E150 80240560 E640000C */ swc1 $f0, 0xc($s2) -/* C3E154 80240564 8E220000 */ lw $v0, ($s1) -/* C3E158 80240568 3463FFFF */ ori $v1, $v1, 0xffff -/* C3E15C 8024056C 00431024 */ and $v0, $v0, $v1 -/* C3E160 80240570 AE220000 */ sw $v0, ($s1) -/* C3E164 80240574 24020001 */ addiu $v0, $zero, 1 -/* C3E168 80240578 A640008E */ sh $zero, 0x8e($s2) -/* C3E16C 8024057C 0809017E */ j .L802405F8 -/* C3E170 80240580 AE820070 */ sw $v0, 0x70($s4) -.L80240584: -/* C3E174 80240584 86240008 */ lh $a0, 8($s1) -/* C3E178 80240588 0C00FB3A */ jal get_enemy -/* C3E17C 8024058C 2484FFFF */ addiu $a0, $a0, -1 -/* C3E180 80240590 0040802D */ daddu $s0, $v0, $zero -/* C3E184 80240594 0C00EABB */ jal get_npc_unsafe -/* C3E188 80240598 86040008 */ lh $a0, 8($s0) -/* C3E18C 8024059C 9642008E */ lhu $v0, 0x8e($s2) -/* C3E190 802405A0 24420001 */ addiu $v0, $v0, 1 -/* C3E194 802405A4 A642008E */ sh $v0, 0x8e($s2) -/* C3E198 802405A8 00021400 */ sll $v0, $v0, 0x10 -/* C3E19C 802405AC 8E23007C */ lw $v1, 0x7c($s1) -/* C3E1A0 802405B0 00021403 */ sra $v0, $v0, 0x10 -/* C3E1A4 802405B4 0043102A */ slt $v0, $v0, $v1 -/* C3E1A8 802405B8 50400001 */ beql $v0, $zero, .L802405C0 -/* C3E1AC 802405BC A2200007 */ sb $zero, 7($s1) -.L802405C0: -/* C3E1B0 802405C0 8E03006C */ lw $v1, 0x6c($s0) -/* C3E1B4 802405C4 24020004 */ addiu $v0, $zero, 4 -/* C3E1B8 802405C8 1462000B */ bne $v1, $v0, .L802405F8 -/* C3E1BC 802405CC 3C021F10 */ lui $v0, 0x1f10 -/* C3E1C0 802405D0 8E230000 */ lw $v1, ($s1) -/* C3E1C4 802405D4 3C01C47A */ lui $at, 0xc47a -/* C3E1C8 802405D8 44810000 */ mtc1 $at, $f0 -/* C3E1CC 802405DC 00621825 */ or $v1, $v1, $v0 -/* C3E1D0 802405E0 AE230000 */ sw $v1, ($s1) -/* C3E1D4 802405E4 AE400038 */ sw $zero, 0x38($s2) -/* C3E1D8 802405E8 E640003C */ swc1 $f0, 0x3c($s2) -/* C3E1DC 802405EC AE400040 */ sw $zero, 0x40($s2) -/* C3E1E0 802405F0 A2330007 */ sb $s3, 7($s1) -/* C3E1E4 802405F4 AE800070 */ sw $zero, 0x70($s4) -.L802405F8: -/* C3E1E8 802405F8 8FBF002C */ lw $ra, 0x2c($sp) -/* C3E1EC 802405FC 8FB40028 */ lw $s4, 0x28($sp) -/* C3E1F0 80240600 8FB30024 */ lw $s3, 0x24($sp) -/* C3E1F4 80240604 8FB20020 */ lw $s2, 0x20($sp) -/* C3E1F8 80240608 8FB1001C */ lw $s1, 0x1c($sp) -/* C3E1FC 8024060C 8FB00018 */ lw $s0, 0x18($sp) -/* C3E200 80240610 0000102D */ daddu $v0, $zero, $zero -/* C3E204 80240614 03E00008 */ jr $ra -/* C3E208 80240618 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240158_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80240158_C3FDB0.s deleted file mode 100644 index e44fa74a8a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240158_C3FDB0.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_C3FF08 -/* C3FF08 80240158 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C3FF0C 8024015C AFB20038 */ sw $s2, 0x38($sp) -/* C3FF10 80240160 0080902D */ daddu $s2, $a0, $zero -/* C3FF14 80240164 AFBF0044 */ sw $ra, 0x44($sp) -/* C3FF18 80240168 AFB40040 */ sw $s4, 0x40($sp) -/* C3FF1C 8024016C AFB3003C */ sw $s3, 0x3c($sp) -/* C3FF20 80240170 AFB10034 */ sw $s1, 0x34($sp) -/* C3FF24 80240174 AFB00030 */ sw $s0, 0x30($sp) -/* C3FF28 80240178 F7B60050 */ sdc1 $f22, 0x50($sp) -/* C3FF2C 8024017C F7B40048 */ sdc1 $f20, 0x48($sp) -/* C3FF30 80240180 8E510148 */ lw $s1, 0x148($s2) -/* C3FF34 80240184 00A0982D */ daddu $s3, $a1, $zero -/* C3FF38 80240188 86240008 */ lh $a0, 8($s1) -/* C3FF3C 8024018C 0C00EABB */ jal get_npc_unsafe -/* C3FF40 80240190 00C0A02D */ daddu $s4, $a2, $zero -/* C3FF44 80240194 8E630014 */ lw $v1, 0x14($s3) -/* C3FF48 80240198 04600030 */ bltz $v1, .L8024025C -/* C3FF4C 8024019C 0040802D */ daddu $s0, $v0, $zero -/* C3FF50 802401A0 8E420074 */ lw $v0, 0x74($s2) -/* C3FF54 802401A4 1C40002C */ bgtz $v0, .L80240258 -/* C3FF58 802401A8 2442FFFF */ addiu $v0, $v0, -1 -/* C3FF5C 802401AC 0280202D */ daddu $a0, $s4, $zero -/* C3FF60 802401B0 AE430074 */ sw $v1, 0x74($s2) -/* C3FF64 802401B4 AFA00010 */ sw $zero, 0x10($sp) -/* C3FF68 802401B8 8E66000C */ lw $a2, 0xc($s3) -/* C3FF6C 802401BC 8E670010 */ lw $a3, 0x10($s3) -/* C3FF70 802401C0 0C01242D */ jal func_800490B4 -/* C3FF74 802401C4 0220282D */ daddu $a1, $s1, $zero -/* C3FF78 802401C8 10400021 */ beqz $v0, .L80240250 -/* C3FF7C 802401CC 0000202D */ daddu $a0, $zero, $zero -/* C3FF80 802401D0 0200282D */ daddu $a1, $s0, $zero -/* C3FF84 802401D4 0000302D */ daddu $a2, $zero, $zero -/* C3FF88 802401D8 860300A8 */ lh $v1, 0xa8($s0) -/* C3FF8C 802401DC 3C013F80 */ lui $at, 0x3f80 -/* C3FF90 802401E0 44810000 */ mtc1 $at, $f0 -/* C3FF94 802401E4 3C014000 */ lui $at, 0x4000 -/* C3FF98 802401E8 44811000 */ mtc1 $at, $f2 -/* C3FF9C 802401EC 3C01C1A0 */ lui $at, 0xc1a0 -/* C3FFA0 802401F0 44812000 */ mtc1 $at, $f4 -/* C3FFA4 802401F4 2402000F */ addiu $v0, $zero, 0xf -/* C3FFA8 802401F8 AFA2001C */ sw $v0, 0x1c($sp) -/* C3FFAC 802401FC 44833000 */ mtc1 $v1, $f6 -/* C3FFB0 80240200 00000000 */ nop -/* C3FFB4 80240204 468031A0 */ cvt.s.w $f6, $f6 -/* C3FFB8 80240208 44073000 */ mfc1 $a3, $f6 -/* C3FFBC 8024020C 27A20028 */ addiu $v0, $sp, 0x28 -/* C3FFC0 80240210 AFA20020 */ sw $v0, 0x20($sp) -/* C3FFC4 80240214 E7A00010 */ swc1 $f0, 0x10($sp) -/* C3FFC8 80240218 E7A20014 */ swc1 $f2, 0x14($sp) -/* C3FFCC 8024021C 0C01BFA4 */ jal fx_emote -/* C3FFD0 80240220 E7A40018 */ swc1 $f4, 0x18($sp) -/* C3FFD4 80240224 0200202D */ daddu $a0, $s0, $zero -/* C3FFD8 80240228 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C3FFDC 8024022C 0C012530 */ jal func_800494C0 -/* C3FFE0 80240230 3C060020 */ lui $a2, 0x20 -/* C3FFE4 80240234 8E220018 */ lw $v0, 0x18($s1) -/* C3FFE8 80240238 9442002A */ lhu $v0, 0x2a($v0) -/* C3FFEC 8024023C 30420001 */ andi $v0, $v0, 1 -/* C3FFF0 80240240 14400064 */ bnez $v0, .L802403D4 -/* C3FFF4 80240244 2402000A */ addiu $v0, $zero, 0xa -/* C3FFF8 80240248 080900F5 */ j .L802403D4 -/* C3FFFC 8024024C 2402000C */ addiu $v0, $zero, 0xc -.L80240250: -/* C40000 80240250 8E420074 */ lw $v0, 0x74($s2) -/* C40004 80240254 2442FFFF */ addiu $v0, $v0, -1 -.L80240258: -/* C40008 80240258 AE420074 */ sw $v0, 0x74($s2) -.L8024025C: -/* C4000C 8024025C 8602008C */ lh $v0, 0x8c($s0) -/* C40010 80240260 1440005D */ bnez $v0, .L802403D8 -/* C40014 80240264 00000000 */ nop -/* C40018 80240268 C6000018 */ lwc1 $f0, 0x18($s0) -/* C4001C 8024026C 3C014010 */ lui $at, 0x4010 -/* C40020 80240270 44811800 */ mtc1 $at, $f3 -/* C40024 80240274 44801000 */ mtc1 $zero, $f2 -/* C40028 80240278 46000021 */ cvt.d.s $f0, $f0 -/* C4002C 8024027C 4622003C */ c.lt.d $f0, $f2 -/* C40030 80240280 00000000 */ nop -/* C40034 80240284 45000003 */ bc1f .L80240294 -/* C40038 80240288 0200202D */ daddu $a0, $s0, $zero -/* C4003C 8024028C 080900A6 */ j .L80240298 -/* C40040 80240290 0000282D */ daddu $a1, $zero, $zero -.L80240294: -/* C40044 80240294 24050001 */ addiu $a1, $zero, 1 -.L80240298: -/* C40048 80240298 0C00F598 */ jal func_8003D660 -/* C4004C 8024029C 00000000 */ nop -/* C40050 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C40054 802402A4 8E430078 */ lw $v1, 0x78($s2) -/* C40058 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C4005C 802402AC 00031040 */ sll $v0, $v1, 1 -/* C40060 802402B0 00431021 */ addu $v0, $v0, $v1 -/* C40064 802402B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C40068 802402B8 00021080 */ sll $v0, $v0, 2 -/* C4006C 802402BC 00431021 */ addu $v0, $v0, $v1 -/* C40070 802402C0 C4560004 */ lwc1 $f22, 4($v0) -/* C40074 802402C4 4680B5A0 */ cvt.s.w $f22, $f22 -/* C40078 802402C8 C454000C */ lwc1 $f20, 0xc($v0) -/* C4007C 802402CC 4680A520 */ cvt.s.w $f20, $f20 -/* C40080 802402D0 4406B000 */ mfc1 $a2, $f22 -/* C40084 802402D4 4407A000 */ mfc1 $a3, $f20 -/* C40088 802402D8 0C00A720 */ jal atan2 -/* C4008C 802402DC 00000000 */ nop -/* C40090 802402E0 8E050018 */ lw $a1, 0x18($s0) -/* C40094 802402E4 44060000 */ mfc1 $a2, $f0 -/* C40098 802402E8 0200202D */ daddu $a0, $s0, $zero -/* C4009C 802402EC 0C00EA95 */ jal npc_move_heading -/* C400A0 802402F0 AE06000C */ sw $a2, 0xc($s0) -/* C400A4 802402F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C400A8 802402F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C400AC 802402FC 4406B000 */ mfc1 $a2, $f22 -/* C400B0 80240300 4407A000 */ mfc1 $a3, $f20 -/* C400B4 80240304 0C00A7B5 */ jal dist2D -/* C400B8 80240308 00000000 */ nop -/* C400BC 8024030C C6020018 */ lwc1 $f2, 0x18($s0) -/* C400C0 80240310 4602003E */ c.le.s $f0, $f2 -/* C400C4 80240314 00000000 */ nop -/* C400C8 80240318 4500002F */ bc1f .L802403D8 -/* C400CC 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C400D0 80240320 24020002 */ addiu $v0, $zero, 2 -/* C400D4 80240324 0C00A67F */ jal rand_int -/* C400D8 80240328 AE420070 */ sw $v0, 0x70($s2) -/* C400DC 8024032C 3C035555 */ lui $v1, 0x5555 -/* C400E0 80240330 34635556 */ ori $v1, $v1, 0x5556 -/* C400E4 80240334 00430018 */ mult $v0, $v1 -/* C400E8 80240338 000227C3 */ sra $a0, $v0, 0x1f -/* C400EC 8024033C 00004010 */ mfhi $t0 -/* C400F0 80240340 01042023 */ subu $a0, $t0, $a0 -/* C400F4 80240344 00041840 */ sll $v1, $a0, 1 -/* C400F8 80240348 00641821 */ addu $v1, $v1, $a0 -/* C400FC 8024034C 00431023 */ subu $v0, $v0, $v1 -/* C40100 80240350 24430002 */ addiu $v1, $v0, 2 -/* C40104 80240354 AE430074 */ sw $v1, 0x74($s2) -/* C40108 80240358 8E62002C */ lw $v0, 0x2c($s3) -/* C4010C 8024035C 18400009 */ blez $v0, .L80240384 -/* C40110 80240360 24020004 */ addiu $v0, $zero, 4 -/* C40114 80240364 8E620004 */ lw $v0, 4($s3) -/* C40118 80240368 18400006 */ blez $v0, .L80240384 -/* C4011C 8024036C 24020004 */ addiu $v0, $zero, 4 -/* C40120 80240370 8E620008 */ lw $v0, 8($s3) -/* C40124 80240374 18400003 */ blez $v0, .L80240384 -/* C40128 80240378 24020004 */ addiu $v0, $zero, 4 -/* C4012C 8024037C 14600002 */ bnez $v1, .L80240388 -/* C40130 80240380 00000000 */ nop -.L80240384: -/* C40134 80240384 AE420070 */ sw $v0, 0x70($s2) -.L80240388: -/* C40138 80240388 0C00A67F */ jal rand_int -/* C4013C 8024038C 24042710 */ addiu $a0, $zero, 0x2710 -/* C40140 80240390 3C0351EB */ lui $v1, 0x51eb -/* C40144 80240394 3463851F */ ori $v1, $v1, 0x851f -/* C40148 80240398 00430018 */ mult $v0, $v1 -/* C4014C 8024039C 00021FC3 */ sra $v1, $v0, 0x1f -/* C40150 802403A0 00004010 */ mfhi $t0 -/* C40154 802403A4 00082143 */ sra $a0, $t0, 5 -/* C40158 802403A8 00832023 */ subu $a0, $a0, $v1 -/* C4015C 802403AC 00041840 */ sll $v1, $a0, 1 -/* C40160 802403B0 00641821 */ addu $v1, $v1, $a0 -/* C40164 802403B4 000318C0 */ sll $v1, $v1, 3 -/* C40168 802403B8 00641821 */ addu $v1, $v1, $a0 -/* C4016C 802403BC 00031880 */ sll $v1, $v1, 2 -/* C40170 802403C0 8E640004 */ lw $a0, 4($s3) -/* C40174 802403C4 00431023 */ subu $v0, $v0, $v1 -/* C40178 802403C8 0044102A */ slt $v0, $v0, $a0 -/* C4017C 802403CC 10400002 */ beqz $v0, .L802403D8 -/* C40180 802403D0 24020004 */ addiu $v0, $zero, 4 -.L802403D4: -/* C40184 802403D4 AE420070 */ sw $v0, 0x70($s2) -.L802403D8: -/* C40188 802403D8 8FBF0044 */ lw $ra, 0x44($sp) -/* C4018C 802403DC 8FB40040 */ lw $s4, 0x40($sp) -/* C40190 802403E0 8FB3003C */ lw $s3, 0x3c($sp) -/* C40194 802403E4 8FB20038 */ lw $s2, 0x38($sp) -/* C40198 802403E8 8FB10034 */ lw $s1, 0x34($sp) -/* C4019C 802403EC 8FB00030 */ lw $s0, 0x30($sp) -/* C401A0 802403F0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* C401A4 802403F4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* C401A8 802403F8 03E00008 */ jr $ra -/* C401AC 802403FC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240400_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80240400_C3FDB0.s deleted file mode 100644 index 740c062e44..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240400_C3FDB0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_C401B0 -/* C401B0 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C401B4 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* C401B8 80240408 0080982D */ daddu $s3, $a0, $zero -/* C401BC 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* C401C0 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* C401C4 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* C401C8 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* C401CC 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* C401D0 80240420 86440008 */ lh $a0, 8($s2) -/* C401D4 80240424 0C00EABB */ jal get_npc_unsafe -/* C401D8 80240428 00A0882D */ daddu $s1, $a1, $zero -/* C401DC 8024042C 8E240008 */ lw $a0, 8($s1) -/* C401E0 80240430 0040802D */ daddu $s0, $v0, $zero -/* C401E4 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* C401E8 80240438 00832021 */ addu $a0, $a0, $v1 -/* C401EC 8024043C 00042043 */ sra $a0, $a0, 1 -/* C401F0 80240440 0C00A67F */ jal rand_int -/* C401F4 80240444 24840001 */ addiu $a0, $a0, 1 -/* C401F8 80240448 8E230008 */ lw $v1, 8($s1) -/* C401FC 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* C40200 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* C40204 80240454 00651821 */ addu $v1, $v1, $a1 -/* C40208 80240458 00031843 */ sra $v1, $v1, 1 -/* C4020C 8024045C 00621821 */ addu $v1, $v1, $v0 -/* C40210 80240460 0C00A67F */ jal rand_int -/* C40214 80240464 A603008E */ sh $v1, 0x8e($s0) -/* C40218 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* C4021C 8024046C 44820000 */ mtc1 $v0, $f0 -/* C40220 80240470 00000000 */ nop -/* C40224 80240474 46800020 */ cvt.s.w $f0, $f0 -/* C40228 80240478 46006300 */ add.s $f12, $f12, $f0 -/* C4022C 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* C40230 80240480 44810000 */ mtc1 $at, $f0 -/* C40234 80240484 0C00A6C9 */ jal clamp_angle -/* C40238 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* C4023C 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* C40240 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* C40244 80240494 8C420000 */ lw $v0, ($v0) -/* C40248 80240498 AE020028 */ sw $v0, 0x28($s0) -/* C4024C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* C40250 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* C40254 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* C40258 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* C4025C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* C40260 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* C40264 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* C40268 802404B8 03E00008 */ jr $ra -/* C4026C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_802404C0_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_802404C0_C3FDB0.s deleted file mode 100644 index db3983086d..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_802404C0_C3FDB0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_C40270 -/* C40270 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C40274 802404C4 AFB40040 */ sw $s4, 0x40($sp) -/* C40278 802404C8 0080A02D */ daddu $s4, $a0, $zero -/* C4027C 802404CC AFBF0044 */ sw $ra, 0x44($sp) -/* C40280 802404D0 AFB3003C */ sw $s3, 0x3c($sp) -/* C40284 802404D4 AFB20038 */ sw $s2, 0x38($sp) -/* C40288 802404D8 AFB10034 */ sw $s1, 0x34($sp) -/* C4028C 802404DC AFB00030 */ sw $s0, 0x30($sp) -/* C40290 802404E0 8E910148 */ lw $s1, 0x148($s4) -/* C40294 802404E4 00A0902D */ daddu $s2, $a1, $zero -/* C40298 802404E8 86240008 */ lh $a0, 8($s1) -/* C4029C 802404EC 0C00EABB */ jal get_npc_unsafe -/* C402A0 802404F0 00C0982D */ daddu $s3, $a2, $zero -/* C402A4 802404F4 8E430014 */ lw $v1, 0x14($s2) -/* C402A8 802404F8 04600031 */ bltz $v1, .L802405C0 -/* C402AC 802404FC 0040802D */ daddu $s0, $v0, $zero -/* C402B0 80240500 0260202D */ daddu $a0, $s3, $zero -/* C402B4 80240504 AFA00010 */ sw $zero, 0x10($sp) -/* C402B8 80240508 8E460024 */ lw $a2, 0x24($s2) -/* C402BC 8024050C 8E470028 */ lw $a3, 0x28($s2) -/* C402C0 80240510 0C01242D */ jal func_800490B4 -/* C402C4 80240514 0220282D */ daddu $a1, $s1, $zero -/* C402C8 80240518 10400029 */ beqz $v0, .L802405C0 -/* C402CC 8024051C 0000202D */ daddu $a0, $zero, $zero -/* C402D0 80240520 0200282D */ daddu $a1, $s0, $zero -/* C402D4 80240524 0000302D */ daddu $a2, $zero, $zero -/* C402D8 80240528 860300A8 */ lh $v1, 0xa8($s0) -/* C402DC 8024052C 3C013F80 */ lui $at, 0x3f80 -/* C402E0 80240530 44810000 */ mtc1 $at, $f0 -/* C402E4 80240534 3C014000 */ lui $at, 0x4000 -/* C402E8 80240538 44811000 */ mtc1 $at, $f2 -/* C402EC 8024053C 3C01C1A0 */ lui $at, 0xc1a0 -/* C402F0 80240540 44812000 */ mtc1 $at, $f4 -/* C402F4 80240544 2402000F */ addiu $v0, $zero, 0xf -/* C402F8 80240548 AFA2001C */ sw $v0, 0x1c($sp) -/* C402FC 8024054C 44833000 */ mtc1 $v1, $f6 -/* C40300 80240550 00000000 */ nop -/* C40304 80240554 468031A0 */ cvt.s.w $f6, $f6 -/* C40308 80240558 44073000 */ mfc1 $a3, $f6 -/* C4030C 8024055C 27A20028 */ addiu $v0, $sp, 0x28 -/* C40310 80240560 AFA20020 */ sw $v0, 0x20($sp) -/* C40314 80240564 E7A00010 */ swc1 $f0, 0x10($sp) -/* C40318 80240568 E7A20014 */ swc1 $f2, 0x14($sp) -/* C4031C 8024056C 0C01BFA4 */ jal fx_emote -/* C40320 80240570 E7A40018 */ swc1 $f4, 0x18($sp) -/* C40324 80240574 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C40328 80240578 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C4032C 8024057C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C40330 80240580 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C40334 80240584 8C460028 */ lw $a2, 0x28($v0) -/* C40338 80240588 0C00A720 */ jal atan2 -/* C4033C 8024058C 8C470030 */ lw $a3, 0x30($v0) -/* C40340 80240590 0200202D */ daddu $a0, $s0, $zero -/* C40344 80240594 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C40348 80240598 3C060020 */ lui $a2, 0x20 -/* C4034C 8024059C 0C012530 */ jal func_800494C0 -/* C40350 802405A0 E480000C */ swc1 $f0, 0xc($a0) -/* C40354 802405A4 8E220018 */ lw $v0, 0x18($s1) -/* C40358 802405A8 9442002A */ lhu $v0, 0x2a($v0) -/* C4035C 802405AC 30420001 */ andi $v0, $v0, 1 -/* C40360 802405B0 14400029 */ bnez $v0, .L80240658 -/* C40364 802405B4 2402000A */ addiu $v0, $zero, 0xa -/* C40368 802405B8 08090196 */ j .L80240658 -/* C4036C 802405BC 2402000C */ addiu $v0, $zero, 0xc -.L802405C0: -/* C40370 802405C0 8602008C */ lh $v0, 0x8c($s0) -/* C40374 802405C4 14400025 */ bnez $v0, .L8024065C -/* C40378 802405C8 00000000 */ nop -/* C4037C 802405CC 9602008E */ lhu $v0, 0x8e($s0) -/* C40380 802405D0 2442FFFF */ addiu $v0, $v0, -1 -/* C40384 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* C40388 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* C4038C 802405DC 1440001F */ bnez $v0, .L8024065C -/* C40390 802405E0 00000000 */ nop -/* C40394 802405E4 8E820074 */ lw $v0, 0x74($s4) -/* C40398 802405E8 2442FFFF */ addiu $v0, $v0, -1 -/* C4039C 802405EC 10400019 */ beqz $v0, .L80240654 -/* C403A0 802405F0 AE820074 */ sw $v0, 0x74($s4) -/* C403A4 802405F4 8E220018 */ lw $v0, 0x18($s1) -/* C403A8 802405F8 9442002A */ lhu $v0, 0x2a($v0) -/* C403AC 802405FC 30420010 */ andi $v0, $v0, 0x10 -/* C403B0 80240600 14400007 */ bnez $v0, .L80240620 -/* C403B4 80240604 00000000 */ nop -/* C403B8 80240608 C600000C */ lwc1 $f0, 0xc($s0) -/* C403BC 8024060C 3C014334 */ lui $at, 0x4334 -/* C403C0 80240610 44816000 */ mtc1 $at, $f12 -/* C403C4 80240614 0C00A6C9 */ jal clamp_angle -/* C403C8 80240618 460C0300 */ add.s $f12, $f0, $f12 -/* C403CC 8024061C E600000C */ swc1 $f0, 0xc($s0) -.L80240620: -/* C403D0 80240620 8E440008 */ lw $a0, 8($s2) -/* C403D4 80240624 000417C2 */ srl $v0, $a0, 0x1f -/* C403D8 80240628 00822021 */ addu $a0, $a0, $v0 -/* C403DC 8024062C 00042043 */ sra $a0, $a0, 1 -/* C403E0 80240630 0C00A67F */ jal rand_int -/* C403E4 80240634 24840001 */ addiu $a0, $a0, 1 -/* C403E8 80240638 8E430008 */ lw $v1, 8($s2) -/* C403EC 8024063C 000327C2 */ srl $a0, $v1, 0x1f -/* C403F0 80240640 00641821 */ addu $v1, $v1, $a0 -/* C403F4 80240644 00031843 */ sra $v1, $v1, 1 -/* C403F8 80240648 00621821 */ addu $v1, $v1, $v0 -/* C403FC 8024064C 08090197 */ j .L8024065C -/* C40400 80240650 A603008E */ sh $v1, 0x8e($s0) -.L80240654: -/* C40404 80240654 24020004 */ addiu $v0, $zero, 4 -.L80240658: -/* C40408 80240658 AE820070 */ sw $v0, 0x70($s4) -.L8024065C: -/* C4040C 8024065C 8FBF0044 */ lw $ra, 0x44($sp) -/* C40410 80240660 8FB40040 */ lw $s4, 0x40($sp) -/* C40414 80240664 8FB3003C */ lw $s3, 0x3c($sp) -/* C40418 80240668 8FB20038 */ lw $s2, 0x38($sp) -/* C4041C 8024066C 8FB10034 */ lw $s1, 0x34($sp) -/* C40420 80240670 8FB00030 */ lw $s0, 0x30($sp) -/* C40424 80240674 03E00008 */ jr $ra -/* C40428 80240678 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_8024067C_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_8024067C_C3FDB0.s deleted file mode 100644 index e8e5f6f2c0..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_8024067C_C3FDB0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024067C_C4042C -/* C4042C 8024067C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C40430 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* C40434 80240684 0080882D */ daddu $s1, $a0, $zero -/* C40438 80240688 AFBF001C */ sw $ra, 0x1c($sp) -/* C4043C 8024068C AFB20018 */ sw $s2, 0x18($sp) -/* C40440 80240690 AFB00010 */ sw $s0, 0x10($sp) -/* C40444 80240694 8E300148 */ lw $s0, 0x148($s1) -/* C40448 80240698 86040008 */ lh $a0, 8($s0) -/* C4044C 8024069C 0C00EABB */ jal get_npc_unsafe -/* C40450 802406A0 00A0902D */ daddu $s2, $a1, $zero -/* C40454 802406A4 8E230078 */ lw $v1, 0x78($s1) -/* C40458 802406A8 24630001 */ addiu $v1, $v1, 1 -/* C4045C 802406AC AE230078 */ sw $v1, 0x78($s1) -/* C40460 802406B0 8E0400D0 */ lw $a0, 0xd0($s0) -/* C40464 802406B4 8C840000 */ lw $a0, ($a0) -/* C40468 802406B8 0064182A */ slt $v1, $v1, $a0 -/* C4046C 802406BC 14600002 */ bnez $v1, .L802406C8 -/* C40470 802406C0 0040282D */ daddu $a1, $v0, $zero -/* C40474 802406C4 AE200078 */ sw $zero, 0x78($s1) -.L802406C8: -/* C40478 802406C8 8E0200CC */ lw $v0, 0xcc($s0) -/* C4047C 802406CC 8C420004 */ lw $v0, 4($v0) -/* C40480 802406D0 ACA20028 */ sw $v0, 0x28($a1) -/* C40484 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* C40488 802406D8 8C42007C */ lw $v0, 0x7c($v0) -/* C4048C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* C40490 802406E0 00000000 */ nop -/* C40494 802406E4 C6400000 */ lwc1 $f0, ($s2) -/* C40498 802406E8 080901C4 */ j .L80240710 -/* C4049C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) -.L802406F0: -/* C404A0 802406F0 3C018024 */ lui $at, 0x8024 -/* C404A4 802406F4 D4226A08 */ ldc1 $f2, 0x6a08($at) -/* C404A8 802406F8 44820000 */ mtc1 $v0, $f0 -/* C404AC 802406FC 00000000 */ nop -/* C404B0 80240700 46800021 */ cvt.d.w $f0, $f0 -/* C404B4 80240704 46220003 */ div.d $f0, $f0, $f2 -/* C404B8 80240708 46200020 */ cvt.s.d $f0, $f0 -/* C404BC 8024070C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240710: -/* C404C0 80240710 24020001 */ addiu $v0, $zero, 1 -/* C404C4 80240714 AE220070 */ sw $v0, 0x70($s1) -/* C404C8 80240718 8FBF001C */ lw $ra, 0x1c($sp) -/* C404CC 8024071C 8FB20018 */ lw $s2, 0x18($sp) -/* C404D0 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* C404D4 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* C404D8 80240728 03E00008 */ jr $ra -/* C404DC 8024072C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240730_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80240730_C3FDB0.s deleted file mode 100644 index 27abf1d1f8..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240730_C3FDB0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_C404E0 -/* C404E0 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C404E4 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* C404E8 80240738 0080882D */ daddu $s1, $a0, $zero -/* C404EC 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* C404F0 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* C404F4 80240744 8E300148 */ lw $s0, 0x148($s1) -/* C404F8 80240748 0C00EABB */ jal get_npc_unsafe -/* C404FC 8024074C 86040008 */ lh $a0, 8($s0) -/* C40500 80240750 8E0300CC */ lw $v1, 0xcc($s0) -/* C40504 80240754 3C014120 */ lui $at, 0x4120 -/* C40508 80240758 44812000 */ mtc1 $at, $f4 -/* C4050C 8024075C 3C014000 */ lui $at, 0x4000 -/* C40510 80240760 44810000 */ mtc1 $at, $f0 -/* C40514 80240764 C442003C */ lwc1 $f2, 0x3c($v0) -/* C40518 80240768 8C640010 */ lw $a0, 0x10($v1) -/* C4051C 8024076C 8C430000 */ lw $v1, ($v0) -/* C40520 80240770 E444001C */ swc1 $f4, 0x1c($v0) -/* C40524 80240774 E4400014 */ swc1 $f0, 0x14($v0) -/* C40528 80240778 E4420064 */ swc1 $f2, 0x64($v0) -/* C4052C 8024077C 34630800 */ ori $v1, $v1, 0x800 -/* C40530 80240780 AC430000 */ sw $v1, ($v0) -/* C40534 80240784 AC440028 */ sw $a0, 0x28($v0) -/* C40538 80240788 2402000B */ addiu $v0, $zero, 0xb -/* C4053C 8024078C AE220070 */ sw $v0, 0x70($s1) -/* C40540 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* C40544 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* C40548 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* C4054C 8024079C 03E00008 */ jr $ra -/* C40550 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_802407A4_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_802407A4_C3FDB0.s deleted file mode 100644 index 11786ff8cd..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_802407A4_C3FDB0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4_C40554 -/* C40554 802407A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C40558 802407A8 AFB00010 */ sw $s0, 0x10($sp) -/* C4055C 802407AC 0080802D */ daddu $s0, $a0, $zero -/* C40560 802407B0 AFBF0014 */ sw $ra, 0x14($sp) -/* C40564 802407B4 8E020148 */ lw $v0, 0x148($s0) -/* C40568 802407B8 0C00EABB */ jal get_npc_unsafe -/* C4056C 802407BC 84440008 */ lh $a0, 8($v0) -/* C40570 802407C0 0040202D */ daddu $a0, $v0, $zero -/* C40574 802407C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* C40578 802407C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* C4057C 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* C40580 802407D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* C40584 802407D4 46040001 */ sub.s $f0, $f0, $f4 -/* C40588 802407D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* C4058C 802407DC 4602203C */ c.lt.s $f4, $f2 -/* C40590 802407E0 E482003C */ swc1 $f2, 0x3c($a0) -/* C40594 802407E4 45010009 */ bc1t .L8024080C -/* C40598 802407E8 E480001C */ swc1 $f0, 0x1c($a0) -/* C4059C 802407EC 8C820000 */ lw $v0, ($a0) -/* C405A0 802407F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* C405A4 802407F4 E484003C */ swc1 $f4, 0x3c($a0) -/* C405A8 802407F8 AC80001C */ sw $zero, 0x1c($a0) -/* C405AC 802407FC 00431024 */ and $v0, $v0, $v1 -/* C405B0 80240800 AC820000 */ sw $v0, ($a0) -/* C405B4 80240804 2402000C */ addiu $v0, $zero, 0xc -/* C405B8 80240808 AE020070 */ sw $v0, 0x70($s0) -.L8024080C: -/* C405BC 8024080C 8FBF0014 */ lw $ra, 0x14($sp) -/* C405C0 80240810 8FB00010 */ lw $s0, 0x10($sp) -/* C405C4 80240814 03E00008 */ jr $ra -/* C405C8 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_8024081C_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_8024081C_C3FDB0.s deleted file mode 100644 index e852984e1f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_8024081C_C3FDB0.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024081C_C405CC -/* C405CC 8024081C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C405D0 80240820 AFB3001C */ sw $s3, 0x1c($sp) -/* C405D4 80240824 0080982D */ daddu $s3, $a0, $zero -/* C405D8 80240828 AFBF0020 */ sw $ra, 0x20($sp) -/* C405DC 8024082C AFB20018 */ sw $s2, 0x18($sp) -/* C405E0 80240830 AFB10014 */ sw $s1, 0x14($sp) -/* C405E4 80240834 AFB00010 */ sw $s0, 0x10($sp) -/* C405E8 80240838 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C405EC 8024083C 8E710148 */ lw $s1, 0x148($s3) -/* C405F0 80240840 86240008 */ lh $a0, 8($s1) -/* C405F4 80240844 0C00EABB */ jal get_npc_unsafe -/* C405F8 80240848 00A0802D */ daddu $s0, $a1, $zero -/* C405FC 8024084C 8E040020 */ lw $a0, 0x20($s0) -/* C40600 80240850 0040902D */ daddu $s2, $v0, $zero -/* C40604 80240854 00041FC2 */ srl $v1, $a0, 0x1f -/* C40608 80240858 00832021 */ addu $a0, $a0, $v1 -/* C4060C 8024085C 00042043 */ sra $a0, $a0, 1 -/* C40610 80240860 0C00A67F */ jal rand_int -/* C40614 80240864 24840001 */ addiu $a0, $a0, 1 -/* C40618 80240868 8E030020 */ lw $v1, 0x20($s0) -/* C4061C 8024086C C64C0038 */ lwc1 $f12, 0x38($s2) -/* C40620 80240870 000327C2 */ srl $a0, $v1, 0x1f -/* C40624 80240874 00641821 */ addu $v1, $v1, $a0 -/* C40628 80240878 00031843 */ sra $v1, $v1, 1 -/* C4062C 8024087C 00621821 */ addu $v1, $v1, $v0 -/* C40630 80240880 A643008E */ sh $v1, 0x8e($s2) -/* C40634 80240884 8E2200CC */ lw $v0, 0xcc($s1) -/* C40638 80240888 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C4063C 8024088C 8C42000C */ lw $v0, 0xc($v0) -/* C40640 80240890 AE420028 */ sw $v0, 0x28($s2) -/* C40644 80240894 C6000018 */ lwc1 $f0, 0x18($s0) -/* C40648 80240898 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C4064C 8024089C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C40650 802408A0 E6400018 */ swc1 $f0, 0x18($s2) -/* C40654 802408A4 8C460028 */ lw $a2, 0x28($v0) -/* C40658 802408A8 0C00A720 */ jal atan2 -/* C4065C 802408AC 8C470030 */ lw $a3, 0x30($v0) -/* C40660 802408B0 46000506 */ mov.s $f20, $f0 -/* C40664 802408B4 C64C000C */ lwc1 $f12, 0xc($s2) -/* C40668 802408B8 0C00A70A */ jal get_clamped_angle_diff -/* C4066C 802408BC 4600A386 */ mov.s $f14, $f20 -/* C40670 802408C0 46000086 */ mov.s $f2, $f0 -/* C40674 802408C4 8E02001C */ lw $v0, 0x1c($s0) -/* C40678 802408C8 46001005 */ abs.s $f0, $f2 -/* C4067C 802408CC 44822000 */ mtc1 $v0, $f4 -/* C40680 802408D0 00000000 */ nop -/* C40684 802408D4 46802120 */ cvt.s.w $f4, $f4 -/* C40688 802408D8 4600203C */ c.lt.s $f4, $f0 -/* C4068C 802408DC 00000000 */ nop -/* C40690 802408E0 4500000D */ bc1f .L80240918 -/* C40694 802408E4 00000000 */ nop -/* C40698 802408E8 44800000 */ mtc1 $zero, $f0 -/* C4069C 802408EC C654000C */ lwc1 $f20, 0xc($s2) -/* C406A0 802408F0 4600103C */ c.lt.s $f2, $f0 -/* C406A4 802408F4 00000000 */ nop -/* C406A8 802408F8 45000006 */ bc1f .L80240914 -/* C406AC 802408FC 00021023 */ negu $v0, $v0 -/* C406B0 80240900 44820000 */ mtc1 $v0, $f0 -/* C406B4 80240904 00000000 */ nop -/* C406B8 80240908 46800020 */ cvt.s.w $f0, $f0 -/* C406BC 8024090C 08090246 */ j .L80240918 -/* C406C0 80240910 4600A500 */ add.s $f20, $f20, $f0 -.L80240914: -/* C406C4 80240914 4604A500 */ add.s $f20, $f20, $f4 -.L80240918: -/* C406C8 80240918 0C00A6C9 */ jal clamp_angle -/* C406CC 8024091C 4600A306 */ mov.s $f12, $f20 -/* C406D0 80240920 2402000D */ addiu $v0, $zero, 0xd -/* C406D4 80240924 E640000C */ swc1 $f0, 0xc($s2) -/* C406D8 80240928 AE620070 */ sw $v0, 0x70($s3) -/* C406DC 8024092C 8FBF0020 */ lw $ra, 0x20($sp) -/* C406E0 80240930 8FB3001C */ lw $s3, 0x1c($sp) -/* C406E4 80240934 8FB20018 */ lw $s2, 0x18($sp) -/* C406E8 80240938 8FB10014 */ lw $s1, 0x14($sp) -/* C406EC 8024093C 8FB00010 */ lw $s0, 0x10($sp) -/* C406F0 80240940 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C406F4 80240944 03E00008 */ jr $ra -/* C406F8 80240948 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_8024094C_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_8024094C_C3FDB0.s deleted file mode 100644 index 7997a0de78..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_8024094C_C3FDB0.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024094C_C406FC -/* C406FC 8024094C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C40700 80240950 AFB3003C */ sw $s3, 0x3c($sp) -/* C40704 80240954 0080982D */ daddu $s3, $a0, $zero -/* C40708 80240958 AFBF0040 */ sw $ra, 0x40($sp) -/* C4070C 8024095C AFB20038 */ sw $s2, 0x38($sp) -/* C40710 80240960 AFB10034 */ sw $s1, 0x34($sp) -/* C40714 80240964 AFB00030 */ sw $s0, 0x30($sp) -/* C40718 80240968 8E720148 */ lw $s2, 0x148($s3) -/* C4071C 8024096C 00A0882D */ daddu $s1, $a1, $zero -/* C40720 80240970 86440008 */ lh $a0, 8($s2) -/* C40724 80240974 0C00EABB */ jal get_npc_unsafe -/* C40728 80240978 00C0802D */ daddu $s0, $a2, $zero -/* C4072C 8024097C 0200202D */ daddu $a0, $s0, $zero -/* C40730 80240980 0240282D */ daddu $a1, $s2, $zero -/* C40734 80240984 24030001 */ addiu $v1, $zero, 1 -/* C40738 80240988 AFA30010 */ sw $v1, 0x10($sp) -/* C4073C 8024098C 8E260024 */ lw $a2, 0x24($s1) -/* C40740 80240990 8E270028 */ lw $a3, 0x28($s1) -/* C40744 80240994 0C01242D */ jal func_800490B4 -/* C40748 80240998 0040802D */ daddu $s0, $v0, $zero -/* C4074C 8024099C 1440001E */ bnez $v0, .L80240A18 -/* C40750 802409A0 0200202D */ daddu $a0, $s0, $zero -/* C40754 802409A4 24040002 */ addiu $a0, $zero, 2 -/* C40758 802409A8 0200282D */ daddu $a1, $s0, $zero -/* C4075C 802409AC 0000302D */ daddu $a2, $zero, $zero -/* C40760 802409B0 860300A8 */ lh $v1, 0xa8($s0) -/* C40764 802409B4 3C013F80 */ lui $at, 0x3f80 -/* C40768 802409B8 44810000 */ mtc1 $at, $f0 -/* C4076C 802409BC 3C014000 */ lui $at, 0x4000 -/* C40770 802409C0 44811000 */ mtc1 $at, $f2 -/* C40774 802409C4 3C01C1A0 */ lui $at, 0xc1a0 -/* C40778 802409C8 44812000 */ mtc1 $at, $f4 -/* C4077C 802409CC 2402000F */ addiu $v0, $zero, 0xf -/* C40780 802409D0 AFA2001C */ sw $v0, 0x1c($sp) -/* C40784 802409D4 44833000 */ mtc1 $v1, $f6 -/* C40788 802409D8 00000000 */ nop -/* C4078C 802409DC 468031A0 */ cvt.s.w $f6, $f6 -/* C40790 802409E0 44073000 */ mfc1 $a3, $f6 -/* C40794 802409E4 27A20028 */ addiu $v0, $sp, 0x28 -/* C40798 802409E8 AFA20020 */ sw $v0, 0x20($sp) -/* C4079C 802409EC E7A00010 */ swc1 $f0, 0x10($sp) -/* C407A0 802409F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* C407A4 802409F4 0C01BFA4 */ jal fx_emote -/* C407A8 802409F8 E7A40018 */ swc1 $f4, 0x18($sp) -/* C407AC 802409FC 8E4200CC */ lw $v0, 0xcc($s2) -/* C407B0 80240A00 8C430000 */ lw $v1, ($v0) -/* C407B4 80240A04 24020019 */ addiu $v0, $zero, 0x19 -/* C407B8 80240A08 A602008E */ sh $v0, 0x8e($s0) -/* C407BC 80240A0C 2402000E */ addiu $v0, $zero, 0xe -/* C407C0 80240A10 08090293 */ j .L80240A4C -/* C407C4 80240A14 AE030028 */ sw $v1, 0x28($s0) -.L80240A18: -/* C407C8 80240A18 0C00F598 */ jal func_8003D660 -/* C407CC 80240A1C 24050001 */ addiu $a1, $zero, 1 -/* C407D0 80240A20 8E050018 */ lw $a1, 0x18($s0) -/* C407D4 80240A24 8E06000C */ lw $a2, 0xc($s0) -/* C407D8 80240A28 0C00EA95 */ jal npc_move_heading -/* C407DC 80240A2C 0200202D */ daddu $a0, $s0, $zero -/* C407E0 80240A30 8602008E */ lh $v0, 0x8e($s0) -/* C407E4 80240A34 9603008E */ lhu $v1, 0x8e($s0) -/* C407E8 80240A38 18400003 */ blez $v0, .L80240A48 -/* C407EC 80240A3C 2462FFFF */ addiu $v0, $v1, -1 -/* C407F0 80240A40 08090294 */ j .L80240A50 -/* C407F4 80240A44 A602008E */ sh $v0, 0x8e($s0) -.L80240A48: -/* C407F8 80240A48 2402000C */ addiu $v0, $zero, 0xc -.L80240A4C: -/* C407FC 80240A4C AE620070 */ sw $v0, 0x70($s3) -.L80240A50: -/* C40800 80240A50 8FBF0040 */ lw $ra, 0x40($sp) -/* C40804 80240A54 8FB3003C */ lw $s3, 0x3c($sp) -/* C40808 80240A58 8FB20038 */ lw $s2, 0x38($sp) -/* C4080C 80240A5C 8FB10034 */ lw $s1, 0x34($sp) -/* C40810 80240A60 8FB00030 */ lw $s0, 0x30($sp) -/* C40814 80240A64 03E00008 */ jr $ra -/* C40818 80240A68 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240A6C_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80240A6C_C3FDB0.s deleted file mode 100644 index d9db53685a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240A6C_C3FDB0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_C4081C -/* C4081C 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C40820 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* C40824 80240A74 0080882D */ daddu $s1, $a0, $zero -/* C40828 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* C4082C 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* C40830 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* C40834 80240A84 0C00EABB */ jal get_npc_unsafe -/* C40838 80240A88 86040008 */ lh $a0, 8($s0) -/* C4083C 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* C40840 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* C40844 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* C40848 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* C4084C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* C40850 80240AA0 00000000 */ nop -/* C40854 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* C40858 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* C4085C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* C40860 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* C40864 80240AB4 080902B0 */ j .L80240AC0 -/* C40868 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* C4086C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* C40870 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* C40874 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* C40878 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* C4087C 80240ACC 03E00008 */ jr $ra -/* C40880 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240AD4_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80240AD4_C3FDB0.s deleted file mode 100644 index 1c16bf5657..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240AD4_C3FDB0.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD4_C40884 -/* C40884 80240AD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C40888 80240AD8 AFB10014 */ sw $s1, 0x14($sp) -/* C4088C 80240ADC 0080882D */ daddu $s1, $a0, $zero -/* C40890 80240AE0 AFBF001C */ sw $ra, 0x1c($sp) -/* C40894 80240AE4 AFB20018 */ sw $s2, 0x18($sp) -/* C40898 80240AE8 AFB00010 */ sw $s0, 0x10($sp) -/* C4089C 80240AEC 8E300148 */ lw $s0, 0x148($s1) -/* C408A0 80240AF0 86040008 */ lh $a0, 8($s0) -/* C408A4 80240AF4 0C00EABB */ jal get_npc_unsafe -/* C408A8 80240AF8 00A0902D */ daddu $s2, $a1, $zero -/* C408AC 80240AFC 8E0300D0 */ lw $v1, 0xd0($s0) -/* C408B0 80240B00 8E240078 */ lw $a0, 0x78($s1) -/* C408B4 80240B04 8C630000 */ lw $v1, ($v1) -/* C408B8 80240B08 0083182A */ slt $v1, $a0, $v1 -/* C408BC 80240B0C 10600013 */ beqz $v1, .L80240B5C -/* C408C0 80240B10 0040302D */ daddu $a2, $v0, $zero -/* C408C4 80240B14 00041040 */ sll $v0, $a0, 1 -/* C408C8 80240B18 00441021 */ addu $v0, $v0, $a0 -/* C408CC 80240B1C 00022880 */ sll $a1, $v0, 2 -.L80240B20: -/* C408D0 80240B20 8E0300D0 */ lw $v1, 0xd0($s0) -/* C408D4 80240B24 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* C408D8 80240B28 00A31021 */ addu $v0, $a1, $v1 -/* C408DC 80240B2C C4400008 */ lwc1 $f0, 8($v0) -/* C408E0 80240B30 46800020 */ cvt.s.w $f0, $f0 -/* C408E4 80240B34 4602003E */ c.le.s $f0, $f2 -/* C408E8 80240B38 00000000 */ nop -/* C408EC 80240B3C 45020003 */ bc1fl .L80240B4C -/* C408F0 80240B40 24840001 */ addiu $a0, $a0, 1 -/* C408F4 80240B44 080902D7 */ j .L80240B5C -/* C408F8 80240B48 AE240078 */ sw $a0, 0x78($s1) -.L80240B4C: -/* C408FC 80240B4C 8C620000 */ lw $v0, ($v1) -/* C40900 80240B50 0082102A */ slt $v0, $a0, $v0 -/* C40904 80240B54 1440FFF2 */ bnez $v0, .L80240B20 -/* C40908 80240B58 24A5000C */ addiu $a1, $a1, 0xc -.L80240B5C: -/* C4090C 80240B5C C6400000 */ lwc1 $f0, ($s2) -/* C40910 80240B60 E4C00018 */ swc1 $f0, 0x18($a2) -/* C40914 80240B64 8E0200CC */ lw $v0, 0xcc($s0) -/* C40918 80240B68 8C420004 */ lw $v0, 4($v0) -/* C4091C 80240B6C ACC20028 */ sw $v0, 0x28($a2) -/* C40920 80240B70 24020001 */ addiu $v0, $zero, 1 -/* C40924 80240B74 AE200074 */ sw $zero, 0x74($s1) -/* C40928 80240B78 AE220070 */ sw $v0, 0x70($s1) -/* C4092C 80240B7C 8FBF001C */ lw $ra, 0x1c($sp) -/* C40930 80240B80 8FB20018 */ lw $s2, 0x18($sp) -/* C40934 80240B84 8FB10014 */ lw $s1, 0x14($sp) -/* C40938 80240B88 8FB00010 */ lw $s0, 0x10($sp) -/* C4093C 80240B8C 03E00008 */ jr $ra -/* C40940 80240B90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240B94_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80240B94_C3FDB0.s deleted file mode 100644 index 58dc824ff1..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240B94_C3FDB0.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B94_C40944 -/* C40944 80240B94 27BDFF98 */ addiu $sp, $sp, -0x68 -/* C40948 80240B98 AFB40058 */ sw $s4, 0x58($sp) -/* C4094C 80240B9C 0080A02D */ daddu $s4, $a0, $zero -/* C40950 80240BA0 AFBF0060 */ sw $ra, 0x60($sp) -/* C40954 80240BA4 AFB5005C */ sw $s5, 0x5c($sp) -/* C40958 80240BA8 AFB30054 */ sw $s3, 0x54($sp) -/* C4095C 80240BAC AFB20050 */ sw $s2, 0x50($sp) -/* C40960 80240BB0 AFB1004C */ sw $s1, 0x4c($sp) -/* C40964 80240BB4 AFB00048 */ sw $s0, 0x48($sp) -/* C40968 80240BB8 8E910148 */ lw $s1, 0x148($s4) -/* C4096C 80240BBC 86240008 */ lh $a0, 8($s1) -/* C40970 80240BC0 0C00EABB */ jal get_npc_unsafe -/* C40974 80240BC4 00A0802D */ daddu $s0, $a1, $zero -/* C40978 80240BC8 8E83000C */ lw $v1, 0xc($s4) -/* C4097C 80240BCC 0280202D */ daddu $a0, $s4, $zero -/* C40980 80240BD0 8C650000 */ lw $a1, ($v1) -/* C40984 80240BD4 0C0B1EAF */ jal get_variable -/* C40988 80240BD8 0040902D */ daddu $s2, $v0, $zero -/* C4098C 80240BDC AFA00018 */ sw $zero, 0x18($sp) -/* C40990 80240BE0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C40994 80240BE4 8C630094 */ lw $v1, 0x94($v1) -/* C40998 80240BE8 AFA3001C */ sw $v1, 0x1c($sp) -/* C4099C 80240BEC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C409A0 80240BF0 8C630080 */ lw $v1, 0x80($v1) -/* C409A4 80240BF4 AFA30020 */ sw $v1, 0x20($sp) -/* C409A8 80240BF8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C409AC 80240BFC 8C630088 */ lw $v1, 0x88($v1) -/* C409B0 80240C00 AFA30024 */ sw $v1, 0x24($sp) -/* C409B4 80240C04 8E2300D0 */ lw $v1, 0xd0($s1) -/* C409B8 80240C08 8C63008C */ lw $v1, 0x8c($v1) -/* C409BC 80240C0C 27B50018 */ addiu $s5, $sp, 0x18 -/* C409C0 80240C10 AFA30028 */ sw $v1, 0x28($sp) -/* C409C4 80240C14 8E2300D0 */ lw $v1, 0xd0($s1) -/* C409C8 80240C18 3C014282 */ lui $at, 0x4282 -/* C409CC 80240C1C 44810000 */ mtc1 $at, $f0 -/* C409D0 80240C20 8C630090 */ lw $v1, 0x90($v1) -/* C409D4 80240C24 0040982D */ daddu $s3, $v0, $zero -/* C409D8 80240C28 E7A00030 */ swc1 $f0, 0x30($sp) -/* C409DC 80240C2C A7A00034 */ sh $zero, 0x34($sp) -/* C409E0 80240C30 16000005 */ bnez $s0, .L80240C48 -/* C409E4 80240C34 AFA3002C */ sw $v1, 0x2c($sp) -/* C409E8 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) -/* C409EC 80240C3C 30420004 */ andi $v0, $v0, 4 -/* C409F0 80240C40 10400044 */ beqz $v0, .L80240D54 -/* C409F4 80240C44 00000000 */ nop -.L80240C48: -/* C409F8 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 -/* C409FC 80240C4C AE800070 */ sw $zero, 0x70($s4) -/* C40A00 80240C50 A640008E */ sh $zero, 0x8e($s2) -/* C40A04 80240C54 8E2200CC */ lw $v0, 0xcc($s1) -/* C40A08 80240C58 8E430000 */ lw $v1, ($s2) -/* C40A0C 80240C5C 8C420000 */ lw $v0, ($v0) -/* C40A10 80240C60 00641824 */ and $v1, $v1, $a0 -/* C40A14 80240C64 AE430000 */ sw $v1, ($s2) -/* C40A18 80240C68 AE420028 */ sw $v0, 0x28($s2) -/* C40A1C 80240C6C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C40A20 80240C70 8C420098 */ lw $v0, 0x98($v0) -/* C40A24 80240C74 54400005 */ bnel $v0, $zero, .L80240C8C -/* C40A28 80240C78 2402FDFF */ addiu $v0, $zero, -0x201 -/* C40A2C 80240C7C 34620200 */ ori $v0, $v1, 0x200 -/* C40A30 80240C80 2403FFF7 */ addiu $v1, $zero, -9 -/* C40A34 80240C84 08090325 */ j .L80240C94 -/* C40A38 80240C88 00431024 */ and $v0, $v0, $v1 -.L80240C8C: -/* C40A3C 80240C8C 00621024 */ and $v0, $v1, $v0 -/* C40A40 80240C90 34420008 */ ori $v0, $v0, 8 -.L80240C94: -/* C40A44 80240C94 AE420000 */ sw $v0, ($s2) -/* C40A48 80240C98 8E2200B0 */ lw $v0, 0xb0($s1) -/* C40A4C 80240C9C 30420004 */ andi $v0, $v0, 4 -/* C40A50 80240CA0 10400008 */ beqz $v0, .L80240CC4 -/* C40A54 80240CA4 24020063 */ addiu $v0, $zero, 0x63 -/* C40A58 80240CA8 AE820070 */ sw $v0, 0x70($s4) -/* C40A5C 80240CAC AE800074 */ sw $zero, 0x74($s4) -/* C40A60 80240CB0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C40A64 80240CB4 2403FFFB */ addiu $v1, $zero, -5 -/* C40A68 80240CB8 00431024 */ and $v0, $v0, $v1 -/* C40A6C 80240CBC 0809033C */ j .L80240CF0 -/* C40A70 80240CC0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240CC4: -/* C40A74 80240CC4 8E220000 */ lw $v0, ($s1) -/* C40A78 80240CC8 3C034000 */ lui $v1, 0x4000 -/* C40A7C 80240CCC 00431024 */ and $v0, $v0, $v1 -/* C40A80 80240CD0 10400007 */ beqz $v0, .L80240CF0 -/* C40A84 80240CD4 3C03BFFF */ lui $v1, 0xbfff -/* C40A88 80240CD8 2402000C */ addiu $v0, $zero, 0xc -/* C40A8C 80240CDC AE820070 */ sw $v0, 0x70($s4) -/* C40A90 80240CE0 8E220000 */ lw $v0, ($s1) -/* C40A94 80240CE4 3463FFFF */ ori $v1, $v1, 0xffff -/* C40A98 80240CE8 00431024 */ and $v0, $v0, $v1 -/* C40A9C 80240CEC AE220000 */ sw $v0, ($s1) -.L80240CF0: -/* C40AA0 80240CF0 27A50038 */ addiu $a1, $sp, 0x38 -/* C40AA4 80240CF4 27A6003C */ addiu $a2, $sp, 0x3c -/* C40AA8 80240CF8 C6400038 */ lwc1 $f0, 0x38($s2) -/* C40AAC 80240CFC 864200A8 */ lh $v0, 0xa8($s2) -/* C40AB0 80240D00 3C0142C8 */ lui $at, 0x42c8 -/* C40AB4 80240D04 44812000 */ mtc1 $at, $f4 -/* C40AB8 80240D08 44823000 */ mtc1 $v0, $f6 -/* C40ABC 80240D0C 00000000 */ nop -/* C40AC0 80240D10 468031A0 */ cvt.s.w $f6, $f6 -/* C40AC4 80240D14 27A20044 */ addiu $v0, $sp, 0x44 -/* C40AC8 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) -/* C40ACC 80240D1C C640003C */ lwc1 $f0, 0x3c($s2) -/* C40AD0 80240D20 C6420040 */ lwc1 $f2, 0x40($s2) -/* C40AD4 80240D24 46060000 */ add.s $f0, $f0, $f6 -/* C40AD8 80240D28 E7A40044 */ swc1 $f4, 0x44($sp) -/* C40ADC 80240D2C E7A20040 */ swc1 $f2, 0x40($sp) -/* C40AE0 80240D30 E7A0003C */ swc1 $f0, 0x3c($sp) -/* C40AE4 80240D34 AFA20010 */ sw $v0, 0x10($sp) -/* C40AE8 80240D38 8E440080 */ lw $a0, 0x80($s2) -/* C40AEC 80240D3C 0C0372DF */ jal func_800DCB7C -/* C40AF0 80240D40 27A70040 */ addiu $a3, $sp, 0x40 -/* C40AF4 80240D44 10400003 */ beqz $v0, .L80240D54 -/* C40AF8 80240D48 00000000 */ nop -/* C40AFC 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* C40B00 80240D50 E640003C */ swc1 $f0, 0x3c($s2) -.L80240D54: -/* C40B04 80240D54 8E830070 */ lw $v1, 0x70($s4) -/* C40B08 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* C40B0C 80240D5C 10400042 */ beqz $v0, .L80240E68 -/* C40B10 80240D60 00031080 */ sll $v0, $v1, 2 -/* C40B14 80240D64 3C018024 */ lui $at, 0x8024 -/* C40B18 80240D68 00220821 */ addu $at, $at, $v0 -/* C40B1C 80240D6C 8C226A10 */ lw $v0, 0x6a10($at) -/* C40B20 80240D70 00400008 */ jr $v0 -/* C40B24 80240D74 00000000 */ nop -/* C40B28 80240D78 0280202D */ daddu $a0, $s4, $zero -/* C40B2C 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* C40B30 80240D80 0C090000 */ jal func_80240000 -/* C40B34 80240D84 02A0302D */ daddu $a2, $s5, $zero -/* C40B38 80240D88 0280202D */ daddu $a0, $s4, $zero -/* C40B3C 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* C40B40 80240D90 0C090056 */ jal func_80240158 -/* C40B44 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* C40B48 80240D98 0809039A */ j .L80240E68 -/* C40B4C 80240D9C 00000000 */ nop -/* C40B50 80240DA0 0280202D */ daddu $a0, $s4, $zero -/* C40B54 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* C40B58 80240DA8 0C090100 */ jal func_80240400 -/* C40B5C 80240DAC 02A0302D */ daddu $a2, $s5, $zero -/* C40B60 80240DB0 0280202D */ daddu $a0, $s4, $zero -/* C40B64 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* C40B68 80240DB8 0C090130 */ jal func_802404C0 -/* C40B6C 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* C40B70 80240DC0 0809039A */ j .L80240E68 -/* C40B74 80240DC4 00000000 */ nop -/* C40B78 80240DC8 0280202D */ daddu $a0, $s4, $zero -/* C40B7C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* C40B80 80240DD0 0C09019F */ jal func_8024067C -/* C40B84 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* C40B88 80240DD8 0809039A */ j .L80240E68 -/* C40B8C 80240DDC 00000000 */ nop -/* C40B90 80240DE0 0280202D */ daddu $a0, $s4, $zero -/* C40B94 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* C40B98 80240DE8 0C0901CC */ jal func_80240730 -/* C40B9C 80240DEC 02A0302D */ daddu $a2, $s5, $zero -/* C40BA0 80240DF0 0280202D */ daddu $a0, $s4, $zero -/* C40BA4 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* C40BA8 80240DF8 0C0901E9 */ jal func_802407A4 -/* C40BAC 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* C40BB0 80240E00 0809039A */ j .L80240E68 -/* C40BB4 80240E04 00000000 */ nop -/* C40BB8 80240E08 0280202D */ daddu $a0, $s4, $zero -/* C40BBC 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* C40BC0 80240E10 0C090207 */ jal func_8024081C -/* C40BC4 80240E14 02A0302D */ daddu $a2, $s5, $zero -/* C40BC8 80240E18 0280202D */ daddu $a0, $s4, $zero -/* C40BCC 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* C40BD0 80240E20 0C090253 */ jal func_8024094C -/* C40BD4 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* C40BD8 80240E28 0809039A */ j .L80240E68 -/* C40BDC 80240E2C 00000000 */ nop -/* C40BE0 80240E30 0280202D */ daddu $a0, $s4, $zero -/* C40BE4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C40BE8 80240E38 0C09029B */ jal func_80240A6C -/* C40BEC 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* C40BF0 80240E40 0809039A */ j .L80240E68 -/* C40BF4 80240E44 00000000 */ nop -/* C40BF8 80240E48 0280202D */ daddu $a0, $s4, $zero -/* C40BFC 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* C40C00 80240E50 0C0902B5 */ jal func_80240AD4 -/* C40C04 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* C40C08 80240E58 0809039A */ j .L80240E68 -/* C40C0C 80240E5C 00000000 */ nop -/* C40C10 80240E60 0C0129CF */ jal func_8004A73C -/* C40C14 80240E64 0280202D */ daddu $a0, $s4, $zero -.L80240E68: -/* C40C18 80240E68 8FBF0060 */ lw $ra, 0x60($sp) -/* C40C1C 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) -/* C40C20 80240E70 8FB40058 */ lw $s4, 0x58($sp) -/* C40C24 80240E74 8FB30054 */ lw $s3, 0x54($sp) -/* C40C28 80240E78 8FB20050 */ lw $s2, 0x50($sp) -/* C40C2C 80240E7C 8FB1004C */ lw $s1, 0x4c($sp) -/* C40C30 80240E80 8FB00048 */ lw $s0, 0x48($sp) -/* C40C34 80240E84 0000102D */ daddu $v0, $zero, $zero -/* C40C38 80240E88 03E00008 */ jr $ra -/* C40C3C 80240E8C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240E90_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80240E90_C3FDB0.s deleted file mode 100644 index 135ff9a1eb..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240E90_C3FDB0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E90_C40C40 -/* C40C40 80240E90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C40C44 80240E94 AFB10014 */ sw $s1, 0x14($sp) -/* C40C48 80240E98 0080882D */ daddu $s1, $a0, $zero -/* C40C4C 80240E9C AFBF0018 */ sw $ra, 0x18($sp) -/* C40C50 80240EA0 AFB00010 */ sw $s0, 0x10($sp) -/* C40C54 80240EA4 8E300148 */ lw $s0, 0x148($s1) -/* C40C58 80240EA8 0C00EABB */ jal get_npc_unsafe -/* C40C5C 80240EAC 86040008 */ lh $a0, 8($s0) -/* C40C60 80240EB0 24030001 */ addiu $v1, $zero, 1 -/* C40C64 80240EB4 0040202D */ daddu $a0, $v0, $zero -/* C40C68 80240EB8 AE03006C */ sw $v1, 0x6c($s0) -/* C40C6C 80240EBC 8482008C */ lh $v0, 0x8c($a0) -/* C40C70 80240EC0 14400009 */ bnez $v0, .L80240EE8 -/* C40C74 80240EC4 24020002 */ addiu $v0, $zero, 2 -/* C40C78 80240EC8 96030072 */ lhu $v1, 0x72($s0) -/* C40C7C 80240ECC AE02006C */ sw $v0, 0x6c($s0) -/* C40C80 80240ED0 A483008E */ sh $v1, 0x8e($a0) -/* C40C84 80240ED4 8E0200CC */ lw $v0, 0xcc($s0) -/* C40C88 80240ED8 8C420020 */ lw $v0, 0x20($v0) -/* C40C8C 80240EDC AC820028 */ sw $v0, 0x28($a0) -/* C40C90 80240EE0 2402001F */ addiu $v0, $zero, 0x1f -/* C40C94 80240EE4 AE220070 */ sw $v0, 0x70($s1) -.L80240EE8: -/* C40C98 80240EE8 8FBF0018 */ lw $ra, 0x18($sp) -/* C40C9C 80240EEC 8FB10014 */ lw $s1, 0x14($sp) -/* C40CA0 80240EF0 8FB00010 */ lw $s0, 0x10($sp) -/* C40CA4 80240EF4 03E00008 */ jr $ra -/* C40CA8 80240EF8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240EFC_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80240EFC_C3FDB0.s deleted file mode 100644 index 99f70ce678..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240EFC_C3FDB0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EFC_C40CAC -/* C40CAC 80240EFC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C40CB0 80240F00 AFB10014 */ sw $s1, 0x14($sp) -/* C40CB4 80240F04 0080882D */ daddu $s1, $a0, $zero -/* C40CB8 80240F08 AFBF0018 */ sw $ra, 0x18($sp) -/* C40CBC 80240F0C AFB00010 */ sw $s0, 0x10($sp) -/* C40CC0 80240F10 8E300148 */ lw $s0, 0x148($s1) -/* C40CC4 80240F14 0C00EABB */ jal get_npc_unsafe -/* C40CC8 80240F18 86040008 */ lh $a0, 8($s0) -/* C40CCC 80240F1C 0040202D */ daddu $a0, $v0, $zero -/* C40CD0 80240F20 9482008E */ lhu $v0, 0x8e($a0) -/* C40CD4 80240F24 2442FFFF */ addiu $v0, $v0, -1 -/* C40CD8 80240F28 A482008E */ sh $v0, 0x8e($a0) -/* C40CDC 80240F2C 00021400 */ sll $v0, $v0, 0x10 -/* C40CE0 80240F30 1C400009 */ bgtz $v0, .L80240F58 -/* C40CE4 80240F34 24020003 */ addiu $v0, $zero, 3 -/* C40CE8 80240F38 96030076 */ lhu $v1, 0x76($s0) -/* C40CEC 80240F3C AE02006C */ sw $v0, 0x6c($s0) -/* C40CF0 80240F40 A483008E */ sh $v1, 0x8e($a0) -/* C40CF4 80240F44 8E0200CC */ lw $v0, 0xcc($s0) -/* C40CF8 80240F48 8C420024 */ lw $v0, 0x24($v0) -/* C40CFC 80240F4C AC820028 */ sw $v0, 0x28($a0) -/* C40D00 80240F50 24020020 */ addiu $v0, $zero, 0x20 -/* C40D04 80240F54 AE220070 */ sw $v0, 0x70($s1) -.L80240F58: -/* C40D08 80240F58 8FBF0018 */ lw $ra, 0x18($sp) -/* C40D0C 80240F5C 8FB10014 */ lw $s1, 0x14($sp) -/* C40D10 80240F60 8FB00010 */ lw $s0, 0x10($sp) -/* C40D14 80240F64 03E00008 */ jr $ra -/* C40D18 80240F68 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240F6C_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80240F6C_C3FDB0.s deleted file mode 100644 index 26a314b377..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80240F6C_C3FDB0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F6C_C40D1C -/* C40D1C 80240F6C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C40D20 80240F70 AFB10034 */ sw $s1, 0x34($sp) -/* C40D24 80240F74 0080882D */ daddu $s1, $a0, $zero -/* C40D28 80240F78 AFBF0038 */ sw $ra, 0x38($sp) -/* C40D2C 80240F7C AFB00030 */ sw $s0, 0x30($sp) -/* C40D30 80240F80 8E300148 */ lw $s0, 0x148($s1) -/* C40D34 80240F84 0C00EABB */ jal get_npc_unsafe -/* C40D38 80240F88 86040008 */ lh $a0, 8($s0) -/* C40D3C 80240F8C 0040282D */ daddu $a1, $v0, $zero -/* C40D40 80240F90 94A2008E */ lhu $v0, 0x8e($a1) -/* C40D44 80240F94 2442FFFF */ addiu $v0, $v0, -1 -/* C40D48 80240F98 A4A2008E */ sh $v0, 0x8e($a1) -/* C40D4C 80240F9C 00021400 */ sll $v0, $v0, 0x10 -/* C40D50 80240FA0 1C400023 */ bgtz $v0, .L80241030 -/* C40D54 80240FA4 24020004 */ addiu $v0, $zero, 4 -/* C40D58 80240FA8 8E0300CC */ lw $v1, 0xcc($s0) -/* C40D5C 80240FAC AE02006C */ sw $v0, 0x6c($s0) -/* C40D60 80240FB0 8C620000 */ lw $v0, ($v1) -/* C40D64 80240FB4 ACA20028 */ sw $v0, 0x28($a1) -/* C40D68 80240FB8 9602007A */ lhu $v0, 0x7a($s0) -/* C40D6C 80240FBC A4A2008E */ sh $v0, 0x8e($a1) -/* C40D70 80240FC0 8E020078 */ lw $v0, 0x78($s0) -/* C40D74 80240FC4 28420008 */ slti $v0, $v0, 8 -/* C40D78 80240FC8 14400018 */ bnez $v0, .L8024102C -/* C40D7C 80240FCC 24020021 */ addiu $v0, $zero, 0x21 -/* C40D80 80240FD0 24040003 */ addiu $a0, $zero, 3 -/* C40D84 80240FD4 27A30028 */ addiu $v1, $sp, 0x28 -/* C40D88 80240FD8 84A700A8 */ lh $a3, 0xa8($a1) -/* C40D8C 80240FDC 3C013F80 */ lui $at, 0x3f80 -/* C40D90 80240FE0 44810000 */ mtc1 $at, $f0 -/* C40D94 80240FE4 3C014000 */ lui $at, 0x4000 -/* C40D98 80240FE8 44811000 */ mtc1 $at, $f2 -/* C40D9C 80240FEC 3C01C1A0 */ lui $at, 0xc1a0 -/* C40DA0 80240FF0 44812000 */ mtc1 $at, $f4 -/* C40DA4 80240FF4 44873000 */ mtc1 $a3, $f6 -/* C40DA8 80240FF8 00000000 */ nop -/* C40DAC 80240FFC 468031A0 */ cvt.s.w $f6, $f6 -/* C40DB0 80241000 E7A00010 */ swc1 $f0, 0x10($sp) -/* C40DB4 80241004 E7A20014 */ swc1 $f2, 0x14($sp) -/* C40DB8 80241008 E7A40018 */ swc1 $f4, 0x18($sp) -/* C40DBC 8024100C 8E020078 */ lw $v0, 0x78($s0) -/* C40DC0 80241010 44073000 */ mfc1 $a3, $f6 -/* C40DC4 80241014 0000302D */ daddu $a2, $zero, $zero -/* C40DC8 80241018 AFA30020 */ sw $v1, 0x20($sp) -/* C40DCC 8024101C 2442FFFF */ addiu $v0, $v0, -1 -/* C40DD0 80241020 0C01BFA4 */ jal fx_emote -/* C40DD4 80241024 AFA2001C */ sw $v0, 0x1c($sp) -/* C40DD8 80241028 24020021 */ addiu $v0, $zero, 0x21 -.L8024102C: -/* C40DDC 8024102C AE220070 */ sw $v0, 0x70($s1) -.L80241030: -/* C40DE0 80241030 8FBF0038 */ lw $ra, 0x38($sp) -/* C40DE4 80241034 8FB10034 */ lw $s1, 0x34($sp) -/* C40DE8 80241038 8FB00030 */ lw $s0, 0x30($sp) -/* C40DEC 8024103C 03E00008 */ jr $ra -/* C40DF0 80241040 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80241044_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80241044_C3FDB0.s deleted file mode 100644 index f412817d3e..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80241044_C3FDB0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241044_C40DF4 -/* C40DF4 80241044 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C40DF8 80241048 AFB10014 */ sw $s1, 0x14($sp) -/* C40DFC 8024104C 0080882D */ daddu $s1, $a0, $zero -/* C40E00 80241050 AFBF0018 */ sw $ra, 0x18($sp) -/* C40E04 80241054 AFB00010 */ sw $s0, 0x10($sp) -/* C40E08 80241058 8E300148 */ lw $s0, 0x148($s1) -/* C40E0C 8024105C 0C00EABB */ jal get_npc_unsafe -/* C40E10 80241060 86040008 */ lh $a0, 8($s0) -/* C40E14 80241064 9443008E */ lhu $v1, 0x8e($v0) -/* C40E18 80241068 2463FFFF */ addiu $v1, $v1, -1 -/* C40E1C 8024106C A443008E */ sh $v1, 0x8e($v0) -/* C40E20 80241070 00031C00 */ sll $v1, $v1, 0x10 -/* C40E24 80241074 1C600003 */ bgtz $v1, .L80241084 -/* C40E28 80241078 2402000C */ addiu $v0, $zero, 0xc -/* C40E2C 8024107C AE00006C */ sw $zero, 0x6c($s0) -/* C40E30 80241080 AE220070 */ sw $v0, 0x70($s1) -.L80241084: -/* C40E34 80241084 8FBF0018 */ lw $ra, 0x18($sp) -/* C40E38 80241088 8FB10014 */ lw $s1, 0x14($sp) -/* C40E3C 8024108C 8FB00010 */ lw $s0, 0x10($sp) -/* C40E40 80241090 03E00008 */ jr $ra -/* C40E44 80241094 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80241098_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80241098_C3FDB0.s deleted file mode 100644 index ec362bac70..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80241098_C3FDB0.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241098_C40E48 -/* C40E48 80241098 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C40E4C 8024109C AFBF0024 */ sw $ra, 0x24($sp) -/* C40E50 802410A0 AFB40020 */ sw $s4, 0x20($sp) -/* C40E54 802410A4 AFB3001C */ sw $s3, 0x1c($sp) -/* C40E58 802410A8 AFB20018 */ sw $s2, 0x18($sp) -/* C40E5C 802410AC AFB10014 */ sw $s1, 0x14($sp) -/* C40E60 802410B0 AFB00010 */ sw $s0, 0x10($sp) -/* C40E64 802410B4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C40E68 802410B8 8C900148 */ lw $s0, 0x148($a0) -/* C40E6C 802410BC 86040008 */ lh $a0, 8($s0) -/* C40E70 802410C0 0C00EABB */ jal get_npc_unsafe -/* C40E74 802410C4 24110001 */ addiu $s1, $zero, 1 -/* C40E78 802410C8 86040008 */ lh $a0, 8($s0) -/* C40E7C 802410CC 0040802D */ daddu $s0, $v0, $zero -/* C40E80 802410D0 3C05800B */ lui $a1, %hi(gCameras) -/* C40E84 802410D4 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C40E88 802410D8 3C03800A */ lui $v1, 0x800a -/* C40E8C 802410DC 8463A634 */ lh $v1, -0x59cc($v1) -/* C40E90 802410E0 00912021 */ addu $a0, $a0, $s1 -/* C40E94 802410E4 00031080 */ sll $v0, $v1, 2 -/* C40E98 802410E8 00431021 */ addu $v0, $v0, $v1 -/* C40E9C 802410EC 00021080 */ sll $v0, $v0, 2 -/* C40EA0 802410F0 00431023 */ subu $v0, $v0, $v1 -/* C40EA4 802410F4 000218C0 */ sll $v1, $v0, 3 -/* C40EA8 802410F8 00431021 */ addu $v0, $v0, $v1 -/* C40EAC 802410FC 000210C0 */ sll $v0, $v0, 3 -/* C40EB0 80241100 0C00FB3A */ jal get_enemy -/* C40EB4 80241104 00459021 */ addu $s2, $v0, $a1 -/* C40EB8 80241108 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C40EBC 8024110C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C40EC0 80241110 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C40EC4 80241114 8E830000 */ lw $v1, ($s4) -/* C40EC8 80241118 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C40ECC 8024111C 8C660028 */ lw $a2, 0x28($v1) -/* C40ED0 80241120 8C670030 */ lw $a3, 0x30($v1) -/* C40ED4 80241124 0C00A7B5 */ jal dist2D -/* C40ED8 80241128 0040982D */ daddu $s3, $v0, $zero -/* C40EDC 8024112C C6620074 */ lwc1 $f2, 0x74($s3) -/* C40EE0 80241130 468010A0 */ cvt.s.w $f2, $f2 -/* C40EE4 80241134 4600103C */ c.lt.s $f2, $f0 -/* C40EE8 80241138 00000000 */ nop -/* C40EEC 8024113C 45030001 */ bc1tl .L80241144 -/* C40EF0 80241140 0000882D */ daddu $s1, $zero, $zero -.L80241144: -/* C40EF4 80241144 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C40EF8 80241148 C60E000C */ lwc1 $f14, 0xc($s0) -/* C40EFC 8024114C 3C014387 */ lui $at, 0x4387 -/* C40F00 80241150 4481A000 */ mtc1 $at, $f20 -/* C40F04 80241154 0C00A70A */ jal get_clamped_angle_diff -/* C40F08 80241158 00000000 */ nop -/* C40F0C 8024115C 0C00A6C9 */ jal clamp_angle -/* C40F10 80241160 46000306 */ mov.s $f12, $f0 -/* C40F14 80241164 3C018024 */ lui $at, 0x8024 -/* C40F18 80241168 D4226BA0 */ ldc1 $f2, 0x6ba0($at) -/* C40F1C 8024116C 46000021 */ cvt.d.s $f0, $f0 -/* C40F20 80241170 4622003C */ c.lt.d $f0, $f2 -/* C40F24 80241174 00000000 */ nop -/* C40F28 80241178 45000003 */ bc1f .L80241188 -/* C40F2C 8024117C 00000000 */ nop -/* C40F30 80241180 3C0142B4 */ lui $at, 0x42b4 -/* C40F34 80241184 4481A000 */ mtc1 $at, $f20 -.L80241188: -/* C40F38 80241188 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C40F3C 8024118C 8E820000 */ lw $v0, ($s4) -/* C40F40 80241190 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C40F44 80241194 8C460028 */ lw $a2, 0x28($v0) -/* C40F48 80241198 0C00A720 */ jal atan2 -/* C40F4C 8024119C 8C470030 */ lw $a3, 0x30($v0) -/* C40F50 802411A0 4600A306 */ mov.s $f12, $f20 -/* C40F54 802411A4 0C00A70A */ jal get_clamped_angle_diff -/* C40F58 802411A8 46000386 */ mov.s $f14, $f0 -/* C40F5C 802411AC C6620078 */ lwc1 $f2, 0x78($s3) -/* C40F60 802411B0 468010A0 */ cvt.s.w $f2, $f2 -/* C40F64 802411B4 46000005 */ abs.s $f0, $f0 -/* C40F68 802411B8 4600103C */ c.lt.s $f2, $f0 -/* C40F6C 802411BC 00000000 */ nop -/* C40F70 802411C0 45030001 */ bc1tl .L802411C8 -/* C40F74 802411C4 0000882D */ daddu $s1, $zero, $zero -.L802411C8: -/* C40F78 802411C8 8E820000 */ lw $v0, ($s4) -/* C40F7C 802411CC C600003C */ lwc1 $f0, 0x3c($s0) -/* C40F80 802411D0 C442002C */ lwc1 $f2, 0x2c($v0) -/* C40F84 802411D4 860200A8 */ lh $v0, 0xa8($s0) -/* C40F88 802411D8 46020001 */ sub.s $f0, $f0, $f2 -/* C40F8C 802411DC 44821000 */ mtc1 $v0, $f2 -/* C40F90 802411E0 00000000 */ nop -/* C40F94 802411E4 468010A1 */ cvt.d.w $f2, $f2 -/* C40F98 802411E8 46221080 */ add.d $f2, $f2, $f2 -/* C40F9C 802411EC 46000005 */ abs.s $f0, $f0 -/* C40FA0 802411F0 46000021 */ cvt.d.s $f0, $f0 -/* C40FA4 802411F4 4620103E */ c.le.d $f2, $f0 -/* C40FA8 802411F8 00000000 */ nop -/* C40FAC 802411FC 45030001 */ bc1tl .L80241204 -/* C40FB0 80241200 0000882D */ daddu $s1, $zero, $zero -.L80241204: -/* C40FB4 80241204 3C038011 */ lui $v1, 0x8011 -/* C40FB8 80241208 8063EBB3 */ lb $v1, -0x144d($v1) -/* C40FBC 8024120C 24020009 */ addiu $v0, $zero, 9 -/* C40FC0 80241210 50620001 */ beql $v1, $v0, .L80241218 -/* C40FC4 80241214 0000882D */ daddu $s1, $zero, $zero -.L80241218: -/* C40FC8 80241218 24020007 */ addiu $v0, $zero, 7 -/* C40FCC 8024121C 50620001 */ beql $v1, $v0, .L80241224 -/* C40FD0 80241220 0000882D */ daddu $s1, $zero, $zero -.L80241224: -/* C40FD4 80241224 0220102D */ daddu $v0, $s1, $zero -/* C40FD8 80241228 8FBF0024 */ lw $ra, 0x24($sp) -/* C40FDC 8024122C 8FB40020 */ lw $s4, 0x20($sp) -/* C40FE0 80241230 8FB3001C */ lw $s3, 0x1c($sp) -/* C40FE4 80241234 8FB20018 */ lw $s2, 0x18($sp) -/* C40FE8 80241238 8FB10014 */ lw $s1, 0x14($sp) -/* C40FEC 8024123C 8FB00010 */ lw $s0, 0x10($sp) -/* C40FF0 80241240 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C40FF4 80241244 03E00008 */ jr $ra -/* C40FF8 80241248 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_8024124C_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_8024124C_C3FDB0.s deleted file mode 100644 index 55d4c2013a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_8024124C_C3FDB0.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024124C_C40FFC -/* C40FFC 8024124C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C41000 80241250 AFB40028 */ sw $s4, 0x28($sp) -/* C41004 80241254 0080A02D */ daddu $s4, $a0, $zero -/* C41008 80241258 AFBF002C */ sw $ra, 0x2c($sp) -/* C4100C 8024125C AFB30024 */ sw $s3, 0x24($sp) -/* C41010 80241260 AFB20020 */ sw $s2, 0x20($sp) -/* C41014 80241264 AFB1001C */ sw $s1, 0x1c($sp) -/* C41018 80241268 AFB00018 */ sw $s0, 0x18($sp) -/* C4101C 8024126C 8E910148 */ lw $s1, 0x148($s4) -/* C41020 80241270 86240008 */ lh $a0, 8($s1) -/* C41024 80241274 0C00EABB */ jal get_npc_unsafe -/* C41028 80241278 00A0802D */ daddu $s0, $a1, $zero -/* C4102C 8024127C 16000005 */ bnez $s0, .L80241294 -/* C41030 80241280 0040902D */ daddu $s2, $v0, $zero -/* C41034 80241284 8E2200B0 */ lw $v0, 0xb0($s1) -/* C41038 80241288 30420004 */ andi $v0, $v0, 4 -/* C4103C 8024128C 10400015 */ beqz $v0, .L802412E4 -/* C41040 80241290 00000000 */ nop -.L80241294: -/* C41044 80241294 AE800070 */ sw $zero, 0x70($s4) -/* C41048 80241298 8E420000 */ lw $v0, ($s2) -/* C4104C 8024129C 3C031F30 */ lui $v1, 0x1f30 -/* C41050 802412A0 A640008E */ sh $zero, 0x8e($s2) -/* C41054 802412A4 34420102 */ ori $v0, $v0, 0x102 -/* C41058 802412A8 AE420000 */ sw $v0, ($s2) -/* C4105C 802412AC 8E220000 */ lw $v0, ($s1) -/* C41060 802412B0 3C01C47A */ lui $at, 0xc47a -/* C41064 802412B4 44810000 */ mtc1 $at, $f0 -/* C41068 802412B8 00431025 */ or $v0, $v0, $v1 -/* C4106C 802412BC AE220000 */ sw $v0, ($s1) -/* C41070 802412C0 AE400038 */ sw $zero, 0x38($s2) -/* C41074 802412C4 E640003C */ swc1 $f0, 0x3c($s2) -/* C41078 802412C8 AE400040 */ sw $zero, 0x40($s2) -/* C4107C 802412CC 8E2300B0 */ lw $v1, 0xb0($s1) -/* C41080 802412D0 30620004 */ andi $v0, $v1, 4 -/* C41084 802412D4 10400003 */ beqz $v0, .L802412E4 -/* C41088 802412D8 2402FFFB */ addiu $v0, $zero, -5 -/* C4108C 802412DC 00621024 */ and $v0, $v1, $v0 -/* C41090 802412E0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802412E4: -/* C41094 802412E4 8E930070 */ lw $s3, 0x70($s4) -/* C41098 802412E8 12600005 */ beqz $s3, .L80241300 -/* C4109C 802412EC 24020001 */ addiu $v0, $zero, 1 -/* C410A0 802412F0 12620048 */ beq $s3, $v0, .L80241414 -/* C410A4 802412F4 00000000 */ nop -/* C410A8 802412F8 08090522 */ j .L80241488 -/* C410AC 802412FC 00000000 */ nop -.L80241300: -/* C410B0 80241300 86240008 */ lh $a0, 8($s1) -/* C410B4 80241304 0C00FB3A */ jal get_enemy -/* C410B8 80241308 2484FFFF */ addiu $a0, $a0, -1 -/* C410BC 8024130C 0040802D */ daddu $s0, $v0, $zero -/* C410C0 80241310 0C00EABB */ jal get_npc_unsafe -/* C410C4 80241314 86040008 */ lh $a0, 8($s0) -/* C410C8 80241318 24030001 */ addiu $v1, $zero, 1 -/* C410CC 8024131C 0040982D */ daddu $s3, $v0, $zero -/* C410D0 80241320 A2230007 */ sb $v1, 7($s1) -/* C410D4 80241324 8E03006C */ lw $v1, 0x6c($s0) -/* C410D8 80241328 24020003 */ addiu $v0, $zero, 3 -/* C410DC 8024132C 14620056 */ bne $v1, $v0, .L80241488 -/* C410E0 80241330 00000000 */ nop -/* C410E4 80241334 8E2500A8 */ lw $a1, 0xa8($s1) -/* C410E8 80241338 10A00003 */ beqz $a1, .L80241348 -/* C410EC 8024133C 0260202D */ daddu $a0, $s3, $zero -/* C410F0 80241340 0C012530 */ jal func_800494C0 -/* C410F4 80241344 0000302D */ daddu $a2, $zero, $zero -.L80241348: -/* C410F8 80241348 27A40010 */ addiu $a0, $sp, 0x10 -/* C410FC 8024134C C6280070 */ lwc1 $f8, 0x70($s1) -/* C41100 80241350 46804220 */ cvt.s.w $f8, $f8 -/* C41104 80241354 C6620034 */ lwc1 $f2, 0x34($s3) -/* C41108 80241358 3C014387 */ lui $at, 0x4387 -/* C4110C 8024135C 44810000 */ mtc1 $at, $f0 -/* C41110 80241360 44064000 */ mfc1 $a2, $f8 -/* C41114 80241364 46020001 */ sub.s $f0, $f0, $f2 -/* C41118 80241368 C6660038 */ lwc1 $f6, 0x38($s3) -/* C4111C 8024136C C6640040 */ lwc1 $f4, 0x40($s3) -/* C41120 80241370 44070000 */ mfc1 $a3, $f0 -/* C41124 80241374 27A50014 */ addiu $a1, $sp, 0x14 -/* C41128 80241378 E7A60010 */ swc1 $f6, 0x10($sp) -/* C4112C 8024137C 0C00A7E7 */ jal add_vec2D_polar -/* C41130 80241380 E7A40014 */ swc1 $f4, 0x14($sp) -/* C41134 80241384 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C41138 80241388 4600020D */ trunc.w.s $f8, $f0 -/* C4113C 8024138C 44024000 */ mfc1 $v0, $f8 -/* C41140 80241390 E6400038 */ swc1 $f0, 0x38($s2) -/* C41144 80241394 A6220010 */ sh $v0, 0x10($s1) -/* C41148 80241398 C660003C */ lwc1 $f0, 0x3c($s3) -/* C4114C 8024139C C622006C */ lwc1 $f2, 0x6c($s1) -/* C41150 802413A0 468010A0 */ cvt.s.w $f2, $f2 -/* C41154 802413A4 46020000 */ add.s $f0, $f0, $f2 -/* C41158 802413A8 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C4115C 802413AC 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C41160 802413B0 E640003C */ swc1 $f0, 0x3c($s2) -/* C41164 802413B4 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C41168 802413B8 4600020D */ trunc.w.s $f8, $f0 -/* C4116C 802413BC 44024000 */ mfc1 $v0, $f8 -/* C41170 802413C0 00000000 */ nop -/* C41174 802413C4 A6220012 */ sh $v0, 0x12($s1) -/* C41178 802413C8 4600120D */ trunc.w.s $f8, $f2 -/* C4117C 802413CC 44024000 */ mfc1 $v0, $f8 -/* C41180 802413D0 E6420040 */ swc1 $f2, 0x40($s2) -/* C41184 802413D4 A6220014 */ sh $v0, 0x14($s1) -/* C41188 802413D8 8C660028 */ lw $a2, 0x28($v1) -/* C4118C 802413DC 8C670030 */ lw $a3, 0x30($v1) -/* C41190 802413E0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C41194 802413E4 0C00A720 */ jal atan2 -/* C41198 802413E8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C4119C 802413EC 3C03E0EF */ lui $v1, 0xe0ef -/* C411A0 802413F0 E640000C */ swc1 $f0, 0xc($s2) -/* C411A4 802413F4 8E220000 */ lw $v0, ($s1) -/* C411A8 802413F8 3463FFFF */ ori $v1, $v1, 0xffff -/* C411AC 802413FC 00431024 */ and $v0, $v0, $v1 -/* C411B0 80241400 AE220000 */ sw $v0, ($s1) -/* C411B4 80241404 24020001 */ addiu $v0, $zero, 1 -/* C411B8 80241408 A640008E */ sh $zero, 0x8e($s2) -/* C411BC 8024140C 08090522 */ j .L80241488 -/* C411C0 80241410 AE820070 */ sw $v0, 0x70($s4) -.L80241414: -/* C411C4 80241414 86240008 */ lh $a0, 8($s1) -/* C411C8 80241418 0C00FB3A */ jal get_enemy -/* C411CC 8024141C 2484FFFF */ addiu $a0, $a0, -1 -/* C411D0 80241420 0040802D */ daddu $s0, $v0, $zero -/* C411D4 80241424 0C00EABB */ jal get_npc_unsafe -/* C411D8 80241428 86040008 */ lh $a0, 8($s0) -/* C411DC 8024142C 9642008E */ lhu $v0, 0x8e($s2) -/* C411E0 80241430 24420001 */ addiu $v0, $v0, 1 -/* C411E4 80241434 A642008E */ sh $v0, 0x8e($s2) -/* C411E8 80241438 00021400 */ sll $v0, $v0, 0x10 -/* C411EC 8024143C 8E23007C */ lw $v1, 0x7c($s1) -/* C411F0 80241440 00021403 */ sra $v0, $v0, 0x10 -/* C411F4 80241444 0043102A */ slt $v0, $v0, $v1 -/* C411F8 80241448 50400001 */ beql $v0, $zero, .L80241450 -/* C411FC 8024144C A2200007 */ sb $zero, 7($s1) -.L80241450: -/* C41200 80241450 8E03006C */ lw $v1, 0x6c($s0) -/* C41204 80241454 24020004 */ addiu $v0, $zero, 4 -/* C41208 80241458 1462000B */ bne $v1, $v0, .L80241488 -/* C4120C 8024145C 3C021F10 */ lui $v0, 0x1f10 -/* C41210 80241460 8E230000 */ lw $v1, ($s1) -/* C41214 80241464 3C01C47A */ lui $at, 0xc47a -/* C41218 80241468 44810000 */ mtc1 $at, $f0 -/* C4121C 8024146C 00621825 */ or $v1, $v1, $v0 -/* C41220 80241470 AE230000 */ sw $v1, ($s1) -/* C41224 80241474 AE400038 */ sw $zero, 0x38($s2) -/* C41228 80241478 E640003C */ swc1 $f0, 0x3c($s2) -/* C4122C 8024147C AE400040 */ sw $zero, 0x40($s2) -/* C41230 80241480 A2330007 */ sb $s3, 7($s1) -/* C41234 80241484 AE800070 */ sw $zero, 0x70($s4) -.L80241488: -/* C41238 80241488 8FBF002C */ lw $ra, 0x2c($sp) -/* C4123C 8024148C 8FB40028 */ lw $s4, 0x28($sp) -/* C41240 80241490 8FB30024 */ lw $s3, 0x24($sp) -/* C41244 80241494 8FB20020 */ lw $s2, 0x20($sp) -/* C41248 80241498 8FB1001C */ lw $s1, 0x1c($sp) -/* C4124C 8024149C 8FB00018 */ lw $s0, 0x18($sp) -/* C41250 802414A0 0000102D */ daddu $v0, $zero, $zero -/* C41254 802414A4 03E00008 */ jr $ra -/* C41258 802414A8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80241760_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80241760_C3FDB0.s deleted file mode 100644 index 306920020c..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80241760_C3FDB0.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241760_C41510 -/* C41510 80241760 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C41514 80241764 AFB3002C */ sw $s3, 0x2c($sp) -/* C41518 80241768 0080982D */ daddu $s3, $a0, $zero -/* C4151C 8024176C AFBF0030 */ sw $ra, 0x30($sp) -/* C41520 80241770 AFB20028 */ sw $s2, 0x28($sp) -/* C41524 80241774 AFB10024 */ sw $s1, 0x24($sp) -/* C41528 80241778 AFB00020 */ sw $s0, 0x20($sp) -/* C4152C 8024177C 8E710148 */ lw $s1, 0x148($s3) -/* C41530 80241780 86240008 */ lh $a0, 8($s1) -/* C41534 80241784 0C00EABB */ jal get_npc_unsafe -/* C41538 80241788 00A0902D */ daddu $s2, $a1, $zero -/* C4153C 8024178C 8E440004 */ lw $a0, 4($s2) -/* C41540 80241790 0040802D */ daddu $s0, $v0, $zero -/* C41544 80241794 00041FC2 */ srl $v1, $a0, 0x1f -/* C41548 80241798 00832021 */ addu $a0, $a0, $v1 -/* C4154C 8024179C 00042043 */ sra $a0, $a0, 1 -/* C41550 802417A0 0C00A67F */ jal rand_int -/* C41554 802417A4 24840001 */ addiu $a0, $a0, 1 -/* C41558 802417A8 8E430004 */ lw $v1, 4($s2) -/* C4155C 802417AC 000327C2 */ srl $a0, $v1, 0x1f -/* C41560 802417B0 00641821 */ addu $v1, $v1, $a0 -/* C41564 802417B4 00031843 */ sra $v1, $v1, 1 -/* C41568 802417B8 00621821 */ addu $v1, $v1, $v0 -/* C4156C 802417BC A603008E */ sh $v1, 0x8e($s0) -/* C41570 802417C0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C41574 802417C4 C6000040 */ lwc1 $f0, 0x40($s0) -/* C41578 802417C8 C4640000 */ lwc1 $f4, ($v1) -/* C4157C 802417CC 46802120 */ cvt.s.w $f4, $f4 -/* C41580 802417D0 C4620008 */ lwc1 $f2, 8($v1) -/* C41584 802417D4 468010A0 */ cvt.s.w $f2, $f2 -/* C41588 802417D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C4158C 802417DC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C41590 802417E0 44061000 */ mfc1 $a2, $f2 -/* C41594 802417E4 C440000C */ lwc1 $f0, 0xc($v0) -/* C41598 802417E8 46800020 */ cvt.s.w $f0, $f0 -/* C4159C 802417EC E7A00014 */ swc1 $f0, 0x14($sp) -/* C415A0 802417F0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C415A4 802417F4 44052000 */ mfc1 $a1, $f4 -/* C415A8 802417F8 C4400010 */ lwc1 $f0, 0x10($v0) -/* C415AC 802417FC 46800020 */ cvt.s.w $f0, $f0 -/* C415B0 80241800 E7A00018 */ swc1 $f0, 0x18($sp) -/* C415B4 80241804 8C640018 */ lw $a0, 0x18($v1) -/* C415B8 80241808 0C0123F5 */ jal is_point_within_region -/* C415BC 8024180C 8E070038 */ lw $a3, 0x38($s0) -/* C415C0 80241810 1040000E */ beqz $v0, .L8024184C -/* C415C4 80241814 00000000 */ nop -/* C415C8 80241818 8E2200D0 */ lw $v0, 0xd0($s1) -/* C415CC 8024181C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C415D0 80241820 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C415D4 80241824 C4460000 */ lwc1 $f6, ($v0) -/* C415D8 80241828 468031A0 */ cvt.s.w $f6, $f6 -/* C415DC 8024182C 44063000 */ mfc1 $a2, $f6 -/* C415E0 80241830 C4460008 */ lwc1 $f6, 8($v0) -/* C415E4 80241834 468031A0 */ cvt.s.w $f6, $f6 -/* C415E8 80241838 44073000 */ mfc1 $a3, $f6 -/* C415EC 8024183C 0C00A720 */ jal atan2 -/* C415F0 80241840 00000000 */ nop -/* C415F4 80241844 0809061F */ j .L8024187C -/* C415F8 80241848 E600000C */ swc1 $f0, 0xc($s0) -.L8024184C: -/* C415FC 8024184C 0C00A67F */ jal rand_int -/* C41600 80241850 2404003C */ addiu $a0, $zero, 0x3c -/* C41604 80241854 C60C000C */ lwc1 $f12, 0xc($s0) -/* C41608 80241858 44820000 */ mtc1 $v0, $f0 -/* C4160C 8024185C 00000000 */ nop -/* C41610 80241860 46800020 */ cvt.s.w $f0, $f0 -/* C41614 80241864 46006300 */ add.s $f12, $f12, $f0 -/* C41618 80241868 3C0141F0 */ lui $at, 0x41f0 -/* C4161C 8024186C 44810000 */ mtc1 $at, $f0 -/* C41620 80241870 0C00A6C9 */ jal clamp_angle -/* C41624 80241874 46006301 */ sub.s $f12, $f12, $f0 -/* C41628 80241878 E600000C */ swc1 $f0, 0xc($s0) -.L8024187C: -/* C4162C 8024187C 8E2200CC */ lw $v0, 0xcc($s1) -/* C41630 80241880 8C420004 */ lw $v0, 4($v0) -/* C41634 80241884 AE020028 */ sw $v0, 0x28($s0) -/* C41638 80241888 AE600074 */ sw $zero, 0x74($s3) -/* C4163C 8024188C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C41640 80241890 8C420014 */ lw $v0, 0x14($v0) -/* C41644 80241894 04410004 */ bgez $v0, .L802418A8 -/* C41648 80241898 00000000 */ nop -/* C4164C 8024189C C6400000 */ lwc1 $f0, ($s2) -/* C41650 802418A0 08090632 */ j .L802418C8 -/* C41654 802418A4 E6000018 */ swc1 $f0, 0x18($s0) -.L802418A8: -/* C41658 802418A8 3C018024 */ lui $at, 0x8024 -/* C4165C 802418AC D4226D38 */ ldc1 $f2, 0x6d38($at) -/* C41660 802418B0 44820000 */ mtc1 $v0, $f0 -/* C41664 802418B4 00000000 */ nop -/* C41668 802418B8 46800021 */ cvt.d.w $f0, $f0 -/* C4166C 802418BC 46220003 */ div.d $f0, $f0, $f2 -/* C41670 802418C0 46200020 */ cvt.s.d $f0, $f0 -/* C41674 802418C4 E6000018 */ swc1 $f0, 0x18($s0) -.L802418C8: -/* C41678 802418C8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C4167C 802418CC 3C014059 */ lui $at, 0x4059 -/* C41680 802418D0 44811800 */ mtc1 $at, $f3 -/* C41684 802418D4 44801000 */ mtc1 $zero, $f2 -/* C41688 802418D8 46000021 */ cvt.d.s $f0, $f0 -/* C4168C 802418DC 46220002 */ mul.d $f0, $f0, $f2 -/* C41690 802418E0 00000000 */ nop -/* C41694 802418E4 24020001 */ addiu $v0, $zero, 1 -/* C41698 802418E8 4620018D */ trunc.w.d $f6, $f0 -/* C4169C 802418EC E626007C */ swc1 $f6, 0x7c($s1) -/* C416A0 802418F0 AE620070 */ sw $v0, 0x70($s3) -/* C416A4 802418F4 8FBF0030 */ lw $ra, 0x30($sp) -/* C416A8 802418F8 8FB3002C */ lw $s3, 0x2c($sp) -/* C416AC 802418FC 8FB20028 */ lw $s2, 0x28($sp) -/* C416B0 80241900 8FB10024 */ lw $s1, 0x24($sp) -/* C416B4 80241904 8FB00020 */ lw $s0, 0x20($sp) -/* C416B8 80241908 03E00008 */ jr $ra -/* C416BC 8024190C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80241910_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80241910_C3FDB0.s deleted file mode 100644 index b814fbffa2..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80241910_C3FDB0.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241910_C416C0 -/* C416C0 80241910 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C416C4 80241914 AFB3004C */ sw $s3, 0x4c($sp) -/* C416C8 80241918 0080982D */ daddu $s3, $a0, $zero -/* C416CC 8024191C AFBF0058 */ sw $ra, 0x58($sp) -/* C416D0 80241920 AFB50054 */ sw $s5, 0x54($sp) -/* C416D4 80241924 AFB40050 */ sw $s4, 0x50($sp) -/* C416D8 80241928 AFB20048 */ sw $s2, 0x48($sp) -/* C416DC 8024192C AFB10044 */ sw $s1, 0x44($sp) -/* C416E0 80241930 AFB00040 */ sw $s0, 0x40($sp) -/* C416E4 80241934 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* C416E8 80241938 F7B80070 */ sdc1 $f24, 0x70($sp) -/* C416EC 8024193C F7B60068 */ sdc1 $f22, 0x68($sp) -/* C416F0 80241940 F7B40060 */ sdc1 $f20, 0x60($sp) -/* C416F4 80241944 8E710148 */ lw $s1, 0x148($s3) -/* C416F8 80241948 00A0902D */ daddu $s2, $a1, $zero -/* C416FC 8024194C 86240008 */ lh $a0, 8($s1) -/* C41700 80241950 0C00EABB */ jal get_npc_unsafe -/* C41704 80241954 00C0A82D */ daddu $s5, $a2, $zero -/* C41708 80241958 0040802D */ daddu $s0, $v0, $zero -/* C4170C 8024195C 0000A02D */ daddu $s4, $zero, $zero -/* C41710 80241960 C624007C */ lwc1 $f4, 0x7c($s1) -/* C41714 80241964 46802120 */ cvt.s.w $f4, $f4 -/* C41718 80241968 C6220088 */ lwc1 $f2, 0x88($s1) -/* C4171C 8024196C 468010A0 */ cvt.s.w $f2, $f2 -/* C41720 80241970 460010A1 */ cvt.d.s $f2, $f2 -/* C41724 80241974 46002121 */ cvt.d.s $f4, $f4 -/* C41728 80241978 C600003C */ lwc1 $f0, 0x3c($s0) -/* C4172C 8024197C 3C014059 */ lui $at, 0x4059 -/* C41730 80241980 44813800 */ mtc1 $at, $f7 -/* C41734 80241984 44803000 */ mtc1 $zero, $f6 -/* C41738 80241988 46000021 */ cvt.d.s $f0, $f0 -/* C4173C 8024198C 46260002 */ mul.d $f0, $f0, $f6 -/* C41740 80241990 00000000 */ nop -/* C41744 80241994 24020001 */ addiu $v0, $zero, 1 -/* C41748 80241998 8E24006C */ lw $a0, 0x6c($s1) -/* C4174C 8024199C 46261083 */ div.d $f2, $f2, $f6 -/* C41750 802419A0 462010A0 */ cvt.s.d $f2, $f2 -/* C41754 802419A4 46262103 */ div.d $f4, $f4, $f6 -/* C41758 802419A8 46202520 */ cvt.s.d $f20, $f4 -/* C4175C 802419AC 30830011 */ andi $v1, $a0, 0x11 -/* C41760 802419B0 4620020D */ trunc.w.d $f8, $f0 -/* C41764 802419B4 E628007C */ swc1 $f8, 0x7c($s1) -/* C41768 802419B8 C6200078 */ lwc1 $f0, 0x78($s1) -/* C4176C 802419BC 46800020 */ cvt.s.w $f0, $f0 -/* C41770 802419C0 46000021 */ cvt.d.s $f0, $f0 -/* C41774 802419C4 46260003 */ div.d $f0, $f0, $f6 -/* C41778 802419C8 462006A0 */ cvt.s.d $f26, $f0 -/* C4177C 802419CC C6200070 */ lwc1 $f0, 0x70($s1) -/* C41780 802419D0 46800020 */ cvt.s.w $f0, $f0 -/* C41784 802419D4 46000021 */ cvt.d.s $f0, $f0 -/* C41788 802419D8 46260003 */ div.d $f0, $f0, $f6 -/* C4178C 802419DC 462005A0 */ cvt.s.d $f22, $f0 -/* C41790 802419E0 14620025 */ bne $v1, $v0, .L80241A78 -/* C41794 802419E4 4602D600 */ add.s $f24, $f26, $f2 -/* C41798 802419E8 8E020000 */ lw $v0, ($s0) -/* C4179C 802419EC 30420008 */ andi $v0, $v0, 8 -/* C417A0 802419F0 10400009 */ beqz $v0, .L80241A18 -/* C417A4 802419F4 27A50028 */ addiu $a1, $sp, 0x28 -/* C417A8 802419F8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C417AC 802419FC 4600C001 */ sub.s $f0, $f24, $f0 -/* C417B0 80241A00 4600B03C */ c.lt.s $f22, $f0 -/* C417B4 80241A04 00000000 */ nop -/* C417B8 80241A08 4500001B */ bc1f .L80241A78 -/* C417BC 80241A0C 34820010 */ ori $v0, $a0, 0x10 -/* C417C0 80241A10 0809069E */ j .L80241A78 -/* C417C4 80241A14 AE22006C */ sw $v0, 0x6c($s1) -.L80241A18: -/* C417C8 80241A18 27A6002C */ addiu $a2, $sp, 0x2c -/* C417CC 80241A1C C6000038 */ lwc1 $f0, 0x38($s0) -/* C417D0 80241A20 C602003C */ lwc1 $f2, 0x3c($s0) -/* C417D4 80241A24 C6040040 */ lwc1 $f4, 0x40($s0) -/* C417D8 80241A28 3C01447A */ lui $at, 0x447a -/* C417DC 80241A2C 44813000 */ mtc1 $at, $f6 -/* C417E0 80241A30 27A20034 */ addiu $v0, $sp, 0x34 -/* C417E4 80241A34 E7A00028 */ swc1 $f0, 0x28($sp) -/* C417E8 80241A38 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C417EC 80241A3C E7A40030 */ swc1 $f4, 0x30($sp) -/* C417F0 80241A40 E7A60034 */ swc1 $f6, 0x34($sp) -/* C417F4 80241A44 AFA20010 */ sw $v0, 0x10($sp) -/* C417F8 80241A48 8E040080 */ lw $a0, 0x80($s0) -/* C417FC 80241A4C 0C0372DF */ jal func_800DCB7C -/* C41800 80241A50 27A70030 */ addiu $a3, $sp, 0x30 -/* C41804 80241A54 C7A00034 */ lwc1 $f0, 0x34($sp) -/* C41808 80241A58 4600D001 */ sub.s $f0, $f26, $f0 -/* C4180C 80241A5C 4600B03C */ c.lt.s $f22, $f0 -/* C41810 80241A60 00000000 */ nop -/* C41814 80241A64 45000004 */ bc1f .L80241A78 -/* C41818 80241A68 00000000 */ nop -/* C4181C 80241A6C 8E22006C */ lw $v0, 0x6c($s1) -/* C41820 80241A70 34420010 */ ori $v0, $v0, 0x10 -/* C41824 80241A74 AE22006C */ sw $v0, 0x6c($s1) -.L80241A78: -/* C41828 80241A78 8E22006C */ lw $v0, 0x6c($s1) -/* C4182C 80241A7C 24030011 */ addiu $v1, $zero, 0x11 -/* C41830 80241A80 30420011 */ andi $v0, $v0, 0x11 -/* C41834 80241A84 14430039 */ bne $v0, $v1, .L80241B6C -/* C41838 80241A88 00000000 */ nop -/* C4183C 80241A8C 8E020000 */ lw $v0, ($s0) -/* C41840 80241A90 30420008 */ andi $v0, $v0, 8 -/* C41844 80241A94 1040000A */ beqz $v0, .L80241AC0 -/* C41848 80241A98 4600C106 */ mov.s $f4, $f24 -/* C4184C 80241A9C 4614C081 */ sub.s $f2, $f24, $f20 -/* C41850 80241AA0 3C018024 */ lui $at, 0x8024 -/* C41854 80241AA4 D4206D40 */ ldc1 $f0, 0x6d40($at) -/* C41858 80241AA8 460010A1 */ cvt.d.s $f2, $f2 -/* C4185C 80241AAC 46201082 */ mul.d $f2, $f2, $f0 -/* C41860 80241AB0 00000000 */ nop -/* C41864 80241AB4 4600A021 */ cvt.d.s $f0, $f20 -/* C41868 80241AB8 080906C9 */ j .L80241B24 -/* C4186C 80241ABC 46220000 */ add.d $f0, $f0, $f2 -.L80241AC0: -/* C41870 80241AC0 27A50028 */ addiu $a1, $sp, 0x28 -/* C41874 80241AC4 27A6002C */ addiu $a2, $sp, 0x2c -/* C41878 80241AC8 C6000038 */ lwc1 $f0, 0x38($s0) -/* C4187C 80241ACC C6020040 */ lwc1 $f2, 0x40($s0) -/* C41880 80241AD0 3C01447A */ lui $at, 0x447a -/* C41884 80241AD4 44812000 */ mtc1 $at, $f4 -/* C41888 80241AD8 27A20034 */ addiu $v0, $sp, 0x34 -/* C4188C 80241ADC E7B4002C */ swc1 $f20, 0x2c($sp) -/* C41890 80241AE0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C41894 80241AE4 E7A20030 */ swc1 $f2, 0x30($sp) -/* C41898 80241AE8 E7A40034 */ swc1 $f4, 0x34($sp) -/* C4189C 80241AEC AFA20010 */ sw $v0, 0x10($sp) -/* C418A0 80241AF0 8E040080 */ lw $a0, 0x80($s0) -/* C418A4 80241AF4 0C0372DF */ jal func_800DCB7C -/* C418A8 80241AF8 27A70030 */ addiu $a3, $sp, 0x30 -/* C418AC 80241AFC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* C418B0 80241B00 461A2100 */ add.s $f4, $f4, $f26 -/* C418B4 80241B04 46142081 */ sub.s $f2, $f4, $f20 -/* C418B8 80241B08 3C018024 */ lui $at, 0x8024 -/* C418BC 80241B0C D4206D48 */ ldc1 $f0, 0x6d48($at) -/* C418C0 80241B10 460010A1 */ cvt.d.s $f2, $f2 -/* C418C4 80241B14 46201082 */ mul.d $f2, $f2, $f0 -/* C418C8 80241B18 00000000 */ nop -/* C418CC 80241B1C 4600A021 */ cvt.d.s $f0, $f20 -/* C418D0 80241B20 46220000 */ add.d $f0, $f0, $f2 -.L80241B24: -/* C418D4 80241B24 46200020 */ cvt.s.d $f0, $f0 -/* C418D8 80241B28 E600003C */ swc1 $f0, 0x3c($s0) -/* C418DC 80241B2C C600003C */ lwc1 $f0, 0x3c($s0) -/* C418E0 80241B30 46002001 */ sub.s $f0, $f4, $f0 -/* C418E4 80241B34 3C013FF0 */ lui $at, 0x3ff0 -/* C418E8 80241B38 44811800 */ mtc1 $at, $f3 -/* C418EC 80241B3C 44801000 */ mtc1 $zero, $f2 -/* C418F0 80241B40 46000005 */ abs.s $f0, $f0 -/* C418F4 80241B44 46000021 */ cvt.d.s $f0, $f0 -/* C418F8 80241B48 4622003C */ c.lt.d $f0, $f2 -/* C418FC 80241B4C 00000000 */ nop -/* C41900 80241B50 45000036 */ bc1f .L80241C2C -/* C41904 80241B54 2403FFEF */ addiu $v1, $zero, -0x11 -/* C41908 80241B58 E604003C */ swc1 $f4, 0x3c($s0) -/* C4190C 80241B5C 8E22006C */ lw $v0, 0x6c($s1) -/* C41910 80241B60 00431024 */ and $v0, $v0, $v1 -/* C41914 80241B64 0809070B */ j .L80241C2C -/* C41918 80241B68 AE22006C */ sw $v0, 0x6c($s1) -.L80241B6C: -/* C4191C 80241B6C 8E220070 */ lw $v0, 0x70($s1) -/* C41920 80241B70 1840002E */ blez $v0, .L80241C2C -/* C41924 80241B74 00000000 */ nop -/* C41928 80241B78 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C4192C 80241B7C 0C00A8BB */ jal sin_deg -/* C41930 80241B80 46806320 */ cvt.s.w $f12, $f12 -/* C41934 80241B84 8E020000 */ lw $v0, ($s0) -/* C41938 80241B88 30420008 */ andi $v0, $v0, 8 -/* C4193C 80241B8C 10400003 */ beqz $v0, .L80241B9C -/* C41940 80241B90 46000506 */ mov.s $f20, $f0 -/* C41944 80241B94 080906F7 */ j .L80241BDC -/* C41948 80241B98 0000102D */ daddu $v0, $zero, $zero -.L80241B9C: -/* C4194C 80241B9C 27A50028 */ addiu $a1, $sp, 0x28 -/* C41950 80241BA0 27A6002C */ addiu $a2, $sp, 0x2c -/* C41954 80241BA4 C6000038 */ lwc1 $f0, 0x38($s0) -/* C41958 80241BA8 C602003C */ lwc1 $f2, 0x3c($s0) -/* C4195C 80241BAC C6040040 */ lwc1 $f4, 0x40($s0) -/* C41960 80241BB0 3C01447A */ lui $at, 0x447a -/* C41964 80241BB4 44813000 */ mtc1 $at, $f6 -/* C41968 80241BB8 27A20034 */ addiu $v0, $sp, 0x34 -/* C4196C 80241BBC E7A00028 */ swc1 $f0, 0x28($sp) -/* C41970 80241BC0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C41974 80241BC4 E7A40030 */ swc1 $f4, 0x30($sp) -/* C41978 80241BC8 E7A60034 */ swc1 $f6, 0x34($sp) -/* C4197C 80241BCC AFA20010 */ sw $v0, 0x10($sp) -/* C41980 80241BD0 8E040080 */ lw $a0, 0x80($s0) -/* C41984 80241BD4 0C0372DF */ jal func_800DCB7C -/* C41988 80241BD8 27A70030 */ addiu $a3, $sp, 0x30 -.L80241BDC: -/* C4198C 80241BDC 10400007 */ beqz $v0, .L80241BFC -/* C41990 80241BE0 00000000 */ nop -/* C41994 80241BE4 4616A082 */ mul.s $f2, $f20, $f22 -/* C41998 80241BE8 00000000 */ nop -/* C4199C 80241BEC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C419A0 80241BF0 461A0000 */ add.s $f0, $f0, $f26 -/* C419A4 80241BF4 08090702 */ j .L80241C08 -/* C419A8 80241BF8 46020000 */ add.s $f0, $f0, $f2 -.L80241BFC: -/* C419AC 80241BFC 4616A002 */ mul.s $f0, $f20, $f22 -/* C419B0 80241C00 00000000 */ nop -/* C419B4 80241C04 4600C000 */ add.s $f0, $f24, $f0 -.L80241C08: -/* C419B8 80241C08 E600003C */ swc1 $f0, 0x3c($s0) -/* C419BC 80241C0C 8E220074 */ lw $v0, 0x74($s1) -/* C419C0 80241C10 2442000A */ addiu $v0, $v0, 0xa -/* C419C4 80241C14 44826000 */ mtc1 $v0, $f12 -/* C419C8 80241C18 00000000 */ nop -/* C419CC 80241C1C 0C00A6C9 */ jal clamp_angle -/* C419D0 80241C20 46806320 */ cvt.s.w $f12, $f12 -/* C419D4 80241C24 4600020D */ trunc.w.s $f8, $f0 -/* C419D8 80241C28 E6280074 */ swc1 $f8, 0x74($s1) -.L80241C2C: -/* C419DC 80241C2C 8E220090 */ lw $v0, 0x90($s1) -/* C419E0 80241C30 1C40004A */ bgtz $v0, .L80241D5C -/* C419E4 80241C34 2442FFFF */ addiu $v0, $v0, -1 -/* C419E8 80241C38 8E430014 */ lw $v1, 0x14($s2) -/* C419EC 80241C3C 04600048 */ bltz $v1, .L80241D60 -/* C419F0 80241C40 00000000 */ nop -/* C419F4 80241C44 8E620074 */ lw $v0, 0x74($s3) -/* C419F8 80241C48 1C400042 */ bgtz $v0, .L80241D54 -/* C419FC 80241C4C 2442FFFF */ addiu $v0, $v0, -1 -/* C41A00 80241C50 AE630074 */ sw $v1, 0x74($s3) -/* C41A04 80241C54 860200A8 */ lh $v0, 0xa8($s0) -/* C41A08 80241C58 C602003C */ lwc1 $f2, 0x3c($s0) -/* C41A0C 80241C5C 44820000 */ mtc1 $v0, $f0 -/* C41A10 80241C60 00000000 */ nop -/* C41A14 80241C64 46800020 */ cvt.s.w $f0, $f0 -/* C41A18 80241C68 46001080 */ add.s $f2, $f2, $f0 -/* C41A1C 80241C6C 3C014024 */ lui $at, 0x4024 -/* C41A20 80241C70 44810800 */ mtc1 $at, $f1 -/* C41A24 80241C74 44800000 */ mtc1 $zero, $f0 -/* C41A28 80241C78 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C41A2C 80241C7C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C41A30 80241C80 460010A1 */ cvt.d.s $f2, $f2 -/* C41A34 80241C84 46201080 */ add.d $f2, $f2, $f0 -/* C41A38 80241C88 C440002C */ lwc1 $f0, 0x2c($v0) -/* C41A3C 80241C8C 46000021 */ cvt.d.s $f0, $f0 -/* C41A40 80241C90 4622003C */ c.lt.d $f0, $f2 -/* C41A44 80241C94 00000000 */ nop -/* C41A48 80241C98 4500002C */ bc1f .L80241D4C -/* C41A4C 80241C9C 02A0202D */ daddu $a0, $s5, $zero -/* C41A50 80241CA0 AFA00010 */ sw $zero, 0x10($sp) -/* C41A54 80241CA4 8E46000C */ lw $a2, 0xc($s2) -/* C41A58 80241CA8 8E470010 */ lw $a3, 0x10($s2) -/* C41A5C 80241CAC 0C01242D */ jal func_800490B4 -/* C41A60 80241CB0 0220282D */ daddu $a1, $s1, $zero -/* C41A64 80241CB4 10400025 */ beqz $v0, .L80241D4C -/* C41A68 80241CB8 0000202D */ daddu $a0, $zero, $zero -/* C41A6C 80241CBC 0200282D */ daddu $a1, $s0, $zero -/* C41A70 80241CC0 0000302D */ daddu $a2, $zero, $zero -/* C41A74 80241CC4 2412000C */ addiu $s2, $zero, 0xc -/* C41A78 80241CC8 860300A8 */ lh $v1, 0xa8($s0) -/* C41A7C 80241CCC 3C013F80 */ lui $at, 0x3f80 -/* C41A80 80241CD0 44810000 */ mtc1 $at, $f0 -/* C41A84 80241CD4 3C014000 */ lui $at, 0x4000 -/* C41A88 80241CD8 44811000 */ mtc1 $at, $f2 -/* C41A8C 80241CDC 3C01C1A0 */ lui $at, 0xc1a0 -/* C41A90 80241CE0 44812000 */ mtc1 $at, $f4 -/* C41A94 80241CE4 44834000 */ mtc1 $v1, $f8 -/* C41A98 80241CE8 00000000 */ nop -/* C41A9C 80241CEC 46804220 */ cvt.s.w $f8, $f8 -/* C41AA0 80241CF0 44074000 */ mfc1 $a3, $f8 -/* C41AA4 80241CF4 27A20038 */ addiu $v0, $sp, 0x38 -/* C41AA8 80241CF8 AFB2001C */ sw $s2, 0x1c($sp) -/* C41AAC 80241CFC AFA20020 */ sw $v0, 0x20($sp) -/* C41AB0 80241D00 E7A00010 */ swc1 $f0, 0x10($sp) -/* C41AB4 80241D04 E7A20014 */ swc1 $f2, 0x14($sp) -/* C41AB8 80241D08 0C01BFA4 */ jal fx_emote -/* C41ABC 80241D0C E7A40018 */ swc1 $f4, 0x18($sp) -/* C41AC0 80241D10 0200202D */ daddu $a0, $s0, $zero -/* C41AC4 80241D14 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C41AC8 80241D18 C480003C */ lwc1 $f0, 0x3c($a0) -/* C41ACC 80241D1C 3C060020 */ lui $a2, 0x20 -/* C41AD0 80241D20 0C012530 */ jal func_800494C0 -/* C41AD4 80241D24 E4800064 */ swc1 $f0, 0x64($a0) -/* C41AD8 80241D28 8E220018 */ lw $v0, 0x18($s1) -/* C41ADC 80241D2C 9442002A */ lhu $v0, 0x2a($v0) -/* C41AE0 80241D30 30420001 */ andi $v0, $v0, 1 -/* C41AE4 80241D34 10400003 */ beqz $v0, .L80241D44 -/* C41AE8 80241D38 2402000A */ addiu $v0, $zero, 0xa -/* C41AEC 80241D3C 080907C1 */ j .L80241F04 -/* C41AF0 80241D40 AE620070 */ sw $v0, 0x70($s3) -.L80241D44: -/* C41AF4 80241D44 080907C1 */ j .L80241F04 -/* C41AF8 80241D48 AE720070 */ sw $s2, 0x70($s3) -.L80241D4C: -/* C41AFC 80241D4C 8E620074 */ lw $v0, 0x74($s3) -/* C41B00 80241D50 2442FFFF */ addiu $v0, $v0, -1 -.L80241D54: -/* C41B04 80241D54 08090758 */ j .L80241D60 -/* C41B08 80241D58 AE620074 */ sw $v0, 0x74($s3) -.L80241D5C: -/* C41B0C 80241D5C AE220090 */ sw $v0, 0x90($s1) -.L80241D60: -/* C41B10 80241D60 8E2300D0 */ lw $v1, 0xd0($s1) -/* C41B14 80241D64 C6000040 */ lwc1 $f0, 0x40($s0) -/* C41B18 80241D68 C4620000 */ lwc1 $f2, ($v1) -/* C41B1C 80241D6C 468010A0 */ cvt.s.w $f2, $f2 -/* C41B20 80241D70 C4640008 */ lwc1 $f4, 8($v1) -/* C41B24 80241D74 46802120 */ cvt.s.w $f4, $f4 -/* C41B28 80241D78 E7A00010 */ swc1 $f0, 0x10($sp) -/* C41B2C 80241D7C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C41B30 80241D80 44051000 */ mfc1 $a1, $f2 -/* C41B34 80241D84 C440000C */ lwc1 $f0, 0xc($v0) -/* C41B38 80241D88 46800020 */ cvt.s.w $f0, $f0 -/* C41B3C 80241D8C E7A00014 */ swc1 $f0, 0x14($sp) -/* C41B40 80241D90 8E2200D0 */ lw $v0, 0xd0($s1) -/* C41B44 80241D94 44062000 */ mfc1 $a2, $f4 -/* C41B48 80241D98 C4400010 */ lwc1 $f0, 0x10($v0) -/* C41B4C 80241D9C 46800020 */ cvt.s.w $f0, $f0 -/* C41B50 80241DA0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C41B54 80241DA4 8C640018 */ lw $a0, 0x18($v1) -/* C41B58 80241DA8 0C0123F5 */ jal is_point_within_region -/* C41B5C 80241DAC 8E070038 */ lw $a3, 0x38($s0) -/* C41B60 80241DB0 1040001A */ beqz $v0, .L80241E1C -/* C41B64 80241DB4 00000000 */ nop -/* C41B68 80241DB8 8E060038 */ lw $a2, 0x38($s0) -/* C41B6C 80241DBC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C41B70 80241DC0 8E070040 */ lw $a3, 0x40($s0) -/* C41B74 80241DC4 C44C0000 */ lwc1 $f12, ($v0) -/* C41B78 80241DC8 46806320 */ cvt.s.w $f12, $f12 -/* C41B7C 80241DCC C44E0008 */ lwc1 $f14, 8($v0) -/* C41B80 80241DD0 0C00A7B5 */ jal dist2D -/* C41B84 80241DD4 468073A0 */ cvt.s.w $f14, $f14 -/* C41B88 80241DD8 C6020018 */ lwc1 $f2, 0x18($s0) -/* C41B8C 80241DDC 4600103C */ c.lt.s $f2, $f0 -/* C41B90 80241DE0 00000000 */ nop -/* C41B94 80241DE4 4500000D */ bc1f .L80241E1C -/* C41B98 80241DE8 E7A00034 */ swc1 $f0, 0x34($sp) -/* C41B9C 80241DEC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C41BA0 80241DF0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C41BA4 80241DF4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C41BA8 80241DF8 C4480000 */ lwc1 $f8, ($v0) -/* C41BAC 80241DFC 46804220 */ cvt.s.w $f8, $f8 -/* C41BB0 80241E00 44064000 */ mfc1 $a2, $f8 -/* C41BB4 80241E04 C4480008 */ lwc1 $f8, 8($v0) -/* C41BB8 80241E08 46804220 */ cvt.s.w $f8, $f8 -/* C41BBC 80241E0C 44074000 */ mfc1 $a3, $f8 -/* C41BC0 80241E10 0C00A720 */ jal atan2 -/* C41BC4 80241E14 24140001 */ addiu $s4, $zero, 1 -/* C41BC8 80241E18 E600000C */ swc1 $f0, 0xc($s0) -.L80241E1C: -/* C41BCC 80241E1C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C41BD0 80241E20 8C43000C */ lw $v1, 0xc($v0) -/* C41BD4 80241E24 8C420010 */ lw $v0, 0x10($v0) -/* C41BD8 80241E28 00621825 */ or $v1, $v1, $v0 -/* C41BDC 80241E2C 00741825 */ or $v1, $v1, $s4 -/* C41BE0 80241E30 10600008 */ beqz $v1, .L80241E54 -/* C41BE4 80241E34 00000000 */ nop -/* C41BE8 80241E38 8602008C */ lh $v0, 0x8c($s0) -/* C41BEC 80241E3C 14400031 */ bnez $v0, .L80241F04 -/* C41BF0 80241E40 00000000 */ nop -/* C41BF4 80241E44 8E050018 */ lw $a1, 0x18($s0) -/* C41BF8 80241E48 8E06000C */ lw $a2, 0xc($s0) -/* C41BFC 80241E4C 0C00EA95 */ jal npc_move_heading -/* C41C00 80241E50 0200202D */ daddu $a0, $s0, $zero -.L80241E54: -/* C41C04 80241E54 C600003C */ lwc1 $f0, 0x3c($s0) -/* C41C08 80241E58 3C014059 */ lui $at, 0x4059 -/* C41C0C 80241E5C 44811800 */ mtc1 $at, $f3 -/* C41C10 80241E60 44801000 */ mtc1 $zero, $f2 -/* C41C14 80241E64 46000021 */ cvt.d.s $f0, $f0 -/* C41C18 80241E68 46220002 */ mul.d $f0, $f0, $f2 -/* C41C1C 80241E6C 00000000 */ nop -/* C41C20 80241E70 4620020D */ trunc.w.d $f8, $f0 -/* C41C24 80241E74 E628007C */ swc1 $f8, 0x7c($s1) -/* C41C28 80241E78 8E420004 */ lw $v0, 4($s2) -/* C41C2C 80241E7C 18400021 */ blez $v0, .L80241F04 -/* C41C30 80241E80 00000000 */ nop -/* C41C34 80241E84 8602008E */ lh $v0, 0x8e($s0) -/* C41C38 80241E88 9603008E */ lhu $v1, 0x8e($s0) -/* C41C3C 80241E8C 18400005 */ blez $v0, .L80241EA4 -/* C41C40 80241E90 2462FFFF */ addiu $v0, $v1, -1 -/* C41C44 80241E94 A602008E */ sh $v0, 0x8e($s0) -/* C41C48 80241E98 00021400 */ sll $v0, $v0, 0x10 -/* C41C4C 80241E9C 1C400019 */ bgtz $v0, .L80241F04 -/* C41C50 80241EA0 00000000 */ nop -.L80241EA4: -/* C41C54 80241EA4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C41C58 80241EA8 24020002 */ addiu $v0, $zero, 2 -/* C41C5C 80241EAC 0C00A67F */ jal rand_int -/* C41C60 80241EB0 AE620070 */ sw $v0, 0x70($s3) -/* C41C64 80241EB4 3C035555 */ lui $v1, 0x5555 -/* C41C68 80241EB8 34635556 */ ori $v1, $v1, 0x5556 -/* C41C6C 80241EBC 00430018 */ mult $v0, $v1 -/* C41C70 80241EC0 000227C3 */ sra $a0, $v0, 0x1f -/* C41C74 80241EC4 00004010 */ mfhi $t0 -/* C41C78 80241EC8 01042023 */ subu $a0, $t0, $a0 -/* C41C7C 80241ECC 00041840 */ sll $v1, $a0, 1 -/* C41C80 80241ED0 00641821 */ addu $v1, $v1, $a0 -/* C41C84 80241ED4 00431023 */ subu $v0, $v0, $v1 -/* C41C88 80241ED8 24430002 */ addiu $v1, $v0, 2 -/* C41C8C 80241EDC AE630074 */ sw $v1, 0x74($s3) -/* C41C90 80241EE0 8E42002C */ lw $v0, 0x2c($s2) -/* C41C94 80241EE4 58400007 */ blezl $v0, .L80241F04 -/* C41C98 80241EE8 AE600070 */ sw $zero, 0x70($s3) -/* C41C9C 80241EEC 8E420008 */ lw $v0, 8($s2) -/* C41CA0 80241EF0 18400003 */ blez $v0, .L80241F00 -/* C41CA4 80241EF4 28620003 */ slti $v0, $v1, 3 -/* C41CA8 80241EF8 10400002 */ beqz $v0, .L80241F04 -/* C41CAC 80241EFC 00000000 */ nop -.L80241F00: -/* C41CB0 80241F00 AE600070 */ sw $zero, 0x70($s3) -.L80241F04: -/* C41CB4 80241F04 8FBF0058 */ lw $ra, 0x58($sp) -/* C41CB8 80241F08 8FB50054 */ lw $s5, 0x54($sp) -/* C41CBC 80241F0C 8FB40050 */ lw $s4, 0x50($sp) -/* C41CC0 80241F10 8FB3004C */ lw $s3, 0x4c($sp) -/* C41CC4 80241F14 8FB20048 */ lw $s2, 0x48($sp) -/* C41CC8 80241F18 8FB10044 */ lw $s1, 0x44($sp) -/* C41CCC 80241F1C 8FB00040 */ lw $s0, 0x40($sp) -/* C41CD0 80241F20 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* C41CD4 80241F24 D7B80070 */ ldc1 $f24, 0x70($sp) -/* C41CD8 80241F28 D7B60068 */ ldc1 $f22, 0x68($sp) -/* C41CDC 80241F2C D7B40060 */ ldc1 $f20, 0x60($sp) -/* C41CE0 80241F30 03E00008 */ jr $ra -/* C41CE4 80241F34 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80241F38_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80241F38_C3FDB0.s deleted file mode 100644 index 4fefeb90f1..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80241F38_C3FDB0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F38_C41CE8 -/* C41CE8 80241F38 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C41CEC 80241F3C AFB3001C */ sw $s3, 0x1c($sp) -/* C41CF0 80241F40 0080982D */ daddu $s3, $a0, $zero -/* C41CF4 80241F44 AFBF0020 */ sw $ra, 0x20($sp) -/* C41CF8 80241F48 AFB20018 */ sw $s2, 0x18($sp) -/* C41CFC 80241F4C AFB10014 */ sw $s1, 0x14($sp) -/* C41D00 80241F50 AFB00010 */ sw $s0, 0x10($sp) -/* C41D04 80241F54 8E720148 */ lw $s2, 0x148($s3) -/* C41D08 80241F58 86440008 */ lh $a0, 8($s2) -/* C41D0C 80241F5C 0C00EABB */ jal get_npc_unsafe -/* C41D10 80241F60 00A0882D */ daddu $s1, $a1, $zero -/* C41D14 80241F64 8E240008 */ lw $a0, 8($s1) -/* C41D18 80241F68 0040802D */ daddu $s0, $v0, $zero -/* C41D1C 80241F6C 00041FC2 */ srl $v1, $a0, 0x1f -/* C41D20 80241F70 00832021 */ addu $a0, $a0, $v1 -/* C41D24 80241F74 00042043 */ sra $a0, $a0, 1 -/* C41D28 80241F78 0C00A67F */ jal rand_int -/* C41D2C 80241F7C 24840001 */ addiu $a0, $a0, 1 -/* C41D30 80241F80 8E230008 */ lw $v1, 8($s1) -/* C41D34 80241F84 240400B4 */ addiu $a0, $zero, 0xb4 -/* C41D38 80241F88 00032FC2 */ srl $a1, $v1, 0x1f -/* C41D3C 80241F8C 00651821 */ addu $v1, $v1, $a1 -/* C41D40 80241F90 00031843 */ sra $v1, $v1, 1 -/* C41D44 80241F94 00621821 */ addu $v1, $v1, $v0 -/* C41D48 80241F98 0C00A67F */ jal rand_int -/* C41D4C 80241F9C A603008E */ sh $v1, 0x8e($s0) -/* C41D50 80241FA0 C60C000C */ lwc1 $f12, 0xc($s0) -/* C41D54 80241FA4 44820000 */ mtc1 $v0, $f0 -/* C41D58 80241FA8 00000000 */ nop -/* C41D5C 80241FAC 46800020 */ cvt.s.w $f0, $f0 -/* C41D60 80241FB0 46006300 */ add.s $f12, $f12, $f0 -/* C41D64 80241FB4 3C0142B4 */ lui $at, 0x42b4 -/* C41D68 80241FB8 44810000 */ mtc1 $at, $f0 -/* C41D6C 80241FBC 0C00A6C9 */ jal clamp_angle -/* C41D70 80241FC0 46006301 */ sub.s $f12, $f12, $f0 -/* C41D74 80241FC4 E600000C */ swc1 $f0, 0xc($s0) -/* C41D78 80241FC8 8E4200CC */ lw $v0, 0xcc($s2) -/* C41D7C 80241FCC 8C420000 */ lw $v0, ($v0) -/* C41D80 80241FD0 AE020028 */ sw $v0, 0x28($s0) -/* C41D84 80241FD4 24020003 */ addiu $v0, $zero, 3 -/* C41D88 80241FD8 AE620070 */ sw $v0, 0x70($s3) -/* C41D8C 80241FDC 8FBF0020 */ lw $ra, 0x20($sp) -/* C41D90 80241FE0 8FB3001C */ lw $s3, 0x1c($sp) -/* C41D94 80241FE4 8FB20018 */ lw $s2, 0x18($sp) -/* C41D98 80241FE8 8FB10014 */ lw $s1, 0x14($sp) -/* C41D9C 80241FEC 8FB00010 */ lw $s0, 0x10($sp) -/* C41DA0 80241FF0 03E00008 */ jr $ra -/* C41DA4 80241FF4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_8024233C_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_8024233C_C3FDB0.s deleted file mode 100644 index 494dc33084..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_8024233C_C3FDB0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024233C_C420EC -/* C420EC 8024233C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C420F0 80242340 AFB20018 */ sw $s2, 0x18($sp) -/* C420F4 80242344 0080902D */ daddu $s2, $a0, $zero -/* C420F8 80242348 AFBF001C */ sw $ra, 0x1c($sp) -/* C420FC 8024234C AFB10014 */ sw $s1, 0x14($sp) -/* C42100 80242350 AFB00010 */ sw $s0, 0x10($sp) -/* C42104 80242354 8E510148 */ lw $s1, 0x148($s2) -/* C42108 80242358 0C00EABB */ jal get_npc_unsafe -/* C4210C 8024235C 86240008 */ lh $a0, 8($s1) -/* C42110 80242360 0040802D */ daddu $s0, $v0, $zero -/* C42114 80242364 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C42118 80242368 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C4211C 8024236C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C42120 80242370 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C42124 80242374 A600008E */ sh $zero, 0x8e($s0) -/* C42128 80242378 8C460028 */ lw $a2, 0x28($v0) -/* C4212C 8024237C 0C00A720 */ jal atan2 -/* C42130 80242380 8C470030 */ lw $a3, 0x30($v0) -/* C42134 80242384 E600000C */ swc1 $f0, 0xc($s0) -/* C42138 80242388 8E2200CC */ lw $v0, 0xcc($s1) -/* C4213C 8024238C 8C420020 */ lw $v0, 0x20($v0) -/* C42140 80242390 AE020028 */ sw $v0, 0x28($s0) -/* C42144 80242394 2402000B */ addiu $v0, $zero, 0xb -/* C42148 80242398 AE420070 */ sw $v0, 0x70($s2) -/* C4214C 8024239C 8FBF001C */ lw $ra, 0x1c($sp) -/* C42150 802423A0 8FB20018 */ lw $s2, 0x18($sp) -/* C42154 802423A4 8FB10014 */ lw $s1, 0x14($sp) -/* C42158 802423A8 8FB00010 */ lw $s0, 0x10($sp) -/* C4215C 802423AC 03E00008 */ jr $ra -/* C42160 802423B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_802423B4_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_802423B4_C3FDB0.s deleted file mode 100644 index 0f995ab5b8..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_802423B4_C3FDB0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423B4_C42164 -/* C42164 802423B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C42168 802423B8 AFB00010 */ sw $s0, 0x10($sp) -/* C4216C 802423BC 0080802D */ daddu $s0, $a0, $zero -/* C42170 802423C0 AFBF0014 */ sw $ra, 0x14($sp) -/* C42174 802423C4 8E020148 */ lw $v0, 0x148($s0) -/* C42178 802423C8 0C00EABB */ jal get_npc_unsafe -/* C4217C 802423CC 84440008 */ lh $a0, 8($v0) -/* C42180 802423D0 9443008E */ lhu $v1, 0x8e($v0) -/* C42184 802423D4 C440003C */ lwc1 $f0, 0x3c($v0) -/* C42188 802423D8 24640001 */ addiu $a0, $v1, 1 -/* C4218C 802423DC 00031C00 */ sll $v1, $v1, 0x10 -/* C42190 802423E0 00031B83 */ sra $v1, $v1, 0xe -/* C42194 802423E4 A444008E */ sh $a0, 0x8e($v0) -/* C42198 802423E8 3C018024 */ lui $at, 0x8024 -/* C4219C 802423EC 00230821 */ addu $at, $at, $v1 -/* C421A0 802423F0 C4224460 */ lwc1 $f2, 0x4460($at) -/* C421A4 802423F4 8443008E */ lh $v1, 0x8e($v0) -/* C421A8 802423F8 46020000 */ add.s $f0, $f0, $f2 -/* C421AC 802423FC 28630005 */ slti $v1, $v1, 5 -/* C421B0 80242400 14600003 */ bnez $v1, .L80242410 -/* C421B4 80242404 E440003C */ swc1 $f0, 0x3c($v0) -/* C421B8 80242408 2402000C */ addiu $v0, $zero, 0xc -/* C421BC 8024240C AE020070 */ sw $v0, 0x70($s0) -.L80242410: -/* C421C0 80242410 8FBF0014 */ lw $ra, 0x14($sp) -/* C421C4 80242414 8FB00010 */ lw $s0, 0x10($sp) -/* C421C8 80242418 03E00008 */ jr $ra -/* C421CC 8024241C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80242A6C_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80242A6C_C3FDB0.s deleted file mode 100644 index 16e0d06b62..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80242A6C_C3FDB0.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A6C_C4281C -/* C4281C 80242A6C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C42820 80242A70 AFB40040 */ sw $s4, 0x40($sp) -/* C42824 80242A74 0080A02D */ daddu $s4, $a0, $zero -/* C42828 80242A78 AFBF0048 */ sw $ra, 0x48($sp) -/* C4282C 80242A7C AFB50044 */ sw $s5, 0x44($sp) -/* C42830 80242A80 AFB3003C */ sw $s3, 0x3c($sp) -/* C42834 80242A84 AFB20038 */ sw $s2, 0x38($sp) -/* C42838 80242A88 AFB10034 */ sw $s1, 0x34($sp) -/* C4283C 80242A8C AFB00030 */ sw $s0, 0x30($sp) -/* C42840 80242A90 8E920148 */ lw $s2, 0x148($s4) -/* C42844 80242A94 86440008 */ lh $a0, 8($s2) -/* C42848 80242A98 8E90000C */ lw $s0, 0xc($s4) -/* C4284C 80242A9C 0C00EABB */ jal get_npc_unsafe -/* C42850 80242AA0 00A0882D */ daddu $s1, $a1, $zero -/* C42854 80242AA4 0280202D */ daddu $a0, $s4, $zero -/* C42858 80242AA8 8E050000 */ lw $a1, ($s0) -/* C4285C 80242AAC 0C0B1EAF */ jal get_variable -/* C42860 80242AB0 0040A82D */ daddu $s5, $v0, $zero -/* C42864 80242AB4 AFA00010 */ sw $zero, 0x10($sp) -/* C42868 80242AB8 8E4300D0 */ lw $v1, 0xd0($s2) -/* C4286C 80242ABC 8C630030 */ lw $v1, 0x30($v1) -/* C42870 80242AC0 AFA30014 */ sw $v1, 0x14($sp) -/* C42874 80242AC4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C42878 80242AC8 8C63001C */ lw $v1, 0x1c($v1) -/* C4287C 80242ACC AFA30018 */ sw $v1, 0x18($sp) -/* C42880 80242AD0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C42884 80242AD4 8C630024 */ lw $v1, 0x24($v1) -/* C42888 80242AD8 AFA3001C */ sw $v1, 0x1c($sp) -/* C4288C 80242ADC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C42890 80242AE0 8C630028 */ lw $v1, 0x28($v1) -/* C42894 80242AE4 27B30010 */ addiu $s3, $sp, 0x10 -/* C42898 80242AE8 AFA30020 */ sw $v1, 0x20($sp) -/* C4289C 80242AEC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C428A0 80242AF0 3C0142F0 */ lui $at, 0x42f0 -/* C428A4 80242AF4 44810000 */ mtc1 $at, $f0 -/* C428A8 80242AF8 8C63002C */ lw $v1, 0x2c($v1) -/* C428AC 80242AFC 0040802D */ daddu $s0, $v0, $zero -/* C428B0 80242B00 E7A00028 */ swc1 $f0, 0x28($sp) -/* C428B4 80242B04 A7A0002C */ sh $zero, 0x2c($sp) -/* C428B8 80242B08 12200006 */ beqz $s1, .L80242B24 -/* C428BC 80242B0C AFA30024 */ sw $v1, 0x24($sp) -/* C428C0 80242B10 02A0202D */ daddu $a0, $s5, $zero -/* C428C4 80242B14 0240282D */ daddu $a1, $s2, $zero -/* C428C8 80242B18 0280302D */ daddu $a2, $s4, $zero -/* C428CC 80242B1C 0C090A52 */ jal func_80242948 -/* C428D0 80242B20 0200382D */ daddu $a3, $s0, $zero -.L80242B24: -/* C428D4 80242B24 2402FFFE */ addiu $v0, $zero, -2 -/* C428D8 80242B28 A2A200AB */ sb $v0, 0xab($s5) -/* C428DC 80242B2C 8E4300B0 */ lw $v1, 0xb0($s2) -/* C428E0 80242B30 30620004 */ andi $v0, $v1, 4 -/* C428E4 80242B34 10400007 */ beqz $v0, .L80242B54 -/* C428E8 80242B38 00000000 */ nop -/* C428EC 80242B3C 824200B4 */ lb $v0, 0xb4($s2) -/* C428F0 80242B40 1440003C */ bnez $v0, .L80242C34 -/* C428F4 80242B44 0000102D */ daddu $v0, $zero, $zero -/* C428F8 80242B48 2402FFFB */ addiu $v0, $zero, -5 -/* C428FC 80242B4C 00621024 */ and $v0, $v1, $v0 -/* C42900 80242B50 AE4200B0 */ sw $v0, 0xb0($s2) -.L80242B54: -/* C42904 80242B54 8E830070 */ lw $v1, 0x70($s4) -/* C42908 80242B58 2C62000F */ sltiu $v0, $v1, 0xf -/* C4290C 80242B5C 10400034 */ beqz $v0, .L80242C30 -/* C42910 80242B60 00031080 */ sll $v0, $v1, 2 -/* C42914 80242B64 3C018024 */ lui $at, 0x8024 -/* C42918 80242B68 00220821 */ addu $at, $at, $v0 -/* C4291C 80242B6C 8C226D50 */ lw $v0, 0x6d50($at) -/* C42920 80242B70 00400008 */ jr $v0 -/* C42924 80242B74 00000000 */ nop -/* C42928 80242B78 0280202D */ daddu $a0, $s4, $zero -/* C4292C 80242B7C 0200282D */ daddu $a1, $s0, $zero -/* C42930 80242B80 0C0905D8 */ jal func_80241760 -/* C42934 80242B84 0260302D */ daddu $a2, $s3, $zero -/* C42938 80242B88 0280202D */ daddu $a0, $s4, $zero -/* C4293C 80242B8C 0200282D */ daddu $a1, $s0, $zero -/* C42940 80242B90 0C090644 */ jal func_80241910 -/* C42944 80242B94 0260302D */ daddu $a2, $s3, $zero -/* C42948 80242B98 08090B0D */ j .L80242C34 -/* C4294C 80242B9C 0000102D */ daddu $v0, $zero, $zero -/* C42950 80242BA0 0280202D */ daddu $a0, $s4, $zero -/* C42954 80242BA4 0200282D */ daddu $a1, $s0, $zero -/* C42958 80242BA8 0C0907CE */ jal func_80241F38 -/* C4295C 80242BAC 0260302D */ daddu $a2, $s3, $zero -/* C42960 80242BB0 0280202D */ daddu $a0, $s4, $zero -/* C42964 80242BB4 0200282D */ daddu $a1, $s0, $zero -/* C42968 80242BB8 0C0907FE */ jal func_80241FF8 -/* C4296C 80242BBC 0260302D */ daddu $a2, $s3, $zero -/* C42970 80242BC0 08090B0D */ j .L80242C34 -/* C42974 80242BC4 0000102D */ daddu $v0, $zero, $zero -/* C42978 80242BC8 0280202D */ daddu $a0, $s4, $zero -/* C4297C 80242BCC 0200282D */ daddu $a1, $s0, $zero -/* C42980 80242BD0 0C0908CF */ jal func_8024233C -/* C42984 80242BD4 0260302D */ daddu $a2, $s3, $zero -/* C42988 80242BD8 0280202D */ daddu $a0, $s4, $zero -/* C4298C 80242BDC 0200282D */ daddu $a1, $s0, $zero -/* C42990 80242BE0 0C0908ED */ jal func_802423B4 -/* C42994 80242BE4 0260302D */ daddu $a2, $s3, $zero -/* C42998 80242BE8 08090B0D */ j .L80242C34 -/* C4299C 80242BEC 0000102D */ daddu $v0, $zero, $zero -/* C429A0 80242BF0 0280202D */ daddu $a0, $s4, $zero -/* C429A4 80242BF4 0200282D */ daddu $a1, $s0, $zero -/* C429A8 80242BF8 0C090908 */ jal func_80242420 -/* C429AC 80242BFC 0260302D */ daddu $a2, $s3, $zero -/* C429B0 80242C00 08090B0D */ j .L80242C34 -/* C429B4 80242C04 0000102D */ daddu $v0, $zero, $zero -/* C429B8 80242C08 0280202D */ daddu $a0, $s4, $zero -/* C429BC 80242C0C 0200282D */ daddu $a1, $s0, $zero -/* C429C0 80242C10 0C090955 */ jal func_80242554 -/* C429C4 80242C14 0260302D */ daddu $a2, $s3, $zero -/* C429C8 80242C18 08090B0D */ j .L80242C34 -/* C429CC 80242C1C 0000102D */ daddu $v0, $zero, $zero -/* C429D0 80242C20 0280202D */ daddu $a0, $s4, $zero -/* C429D4 80242C24 0200282D */ daddu $a1, $s0, $zero -/* C429D8 80242C28 0C09096E */ jal func_802425B8 -/* C429DC 80242C2C 0260302D */ daddu $a2, $s3, $zero -.L80242C30: -/* C429E0 80242C30 0000102D */ daddu $v0, $zero, $zero -.L80242C34: -/* C429E4 80242C34 8FBF0048 */ lw $ra, 0x48($sp) -/* C429E8 80242C38 8FB50044 */ lw $s5, 0x44($sp) -/* C429EC 80242C3C 8FB40040 */ lw $s4, 0x40($sp) -/* C429F0 80242C40 8FB3003C */ lw $s3, 0x3c($sp) -/* C429F4 80242C44 8FB20038 */ lw $s2, 0x38($sp) -/* C429F8 80242C48 8FB10034 */ lw $s1, 0x34($sp) -/* C429FC 80242C4C 8FB00030 */ lw $s0, 0x30($sp) -/* C42A00 80242C50 03E00008 */ jr $ra -/* C42A04 80242C54 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80242F94_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80242F94_C3FDB0.s deleted file mode 100644 index a44ea33a62..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80242F94_C3FDB0.s +++ /dev/null @@ -1,177 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F94_C42D44 -/* C42D44 80242F94 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C42D48 80242F98 AFB40040 */ sw $s4, 0x40($sp) -/* C42D4C 80242F9C 0080A02D */ daddu $s4, $a0, $zero -/* C42D50 80242FA0 AFBF0044 */ sw $ra, 0x44($sp) -/* C42D54 80242FA4 AFB3003C */ sw $s3, 0x3c($sp) -/* C42D58 80242FA8 AFB20038 */ sw $s2, 0x38($sp) -/* C42D5C 80242FAC AFB10034 */ sw $s1, 0x34($sp) -/* C42D60 80242FB0 AFB00030 */ sw $s0, 0x30($sp) -/* C42D64 80242FB4 8E930148 */ lw $s3, 0x148($s4) -/* C42D68 80242FB8 00A0802D */ daddu $s0, $a1, $zero -/* C42D6C 80242FBC 86640008 */ lh $a0, 8($s3) -/* C42D70 80242FC0 0C00EABB */ jal get_npc_unsafe -/* C42D74 80242FC4 00C0882D */ daddu $s1, $a2, $zero -/* C42D78 80242FC8 3C048000 */ lui $a0, 0x8000 -/* C42D7C 80242FCC 0040902D */ daddu $s2, $v0, $zero -/* C42D80 80242FD0 C6400040 */ lwc1 $f0, 0x40($s2) -/* C42D84 80242FD4 34840011 */ ori $a0, $a0, 0x11 -/* C42D88 80242FD8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C42D8C 80242FDC 8E460038 */ lw $a2, 0x38($s2) -/* C42D90 80242FE0 8E47003C */ lw $a3, 0x3c($s2) -/* C42D94 80242FE4 0C05267B */ jal func_801499EC -/* C42D98 80242FE8 24050002 */ addiu $a1, $zero, 2 -/* C42D9C 80242FEC 0220202D */ daddu $a0, $s1, $zero -/* C42DA0 80242FF0 24020001 */ addiu $v0, $zero, 1 -/* C42DA4 80242FF4 AFA20010 */ sw $v0, 0x10($sp) -/* C42DA8 80242FF8 8E060024 */ lw $a2, 0x24($s0) -/* C42DAC 80242FFC 8E070028 */ lw $a3, 0x28($s0) -/* C42DB0 80243000 0C01242D */ jal func_800490B4 -/* C42DB4 80243004 0260282D */ daddu $a1, $s3, $zero -/* C42DB8 80243008 1440000B */ bnez $v0, .L80243038 -/* C42DBC 8024300C 3C04FFDF */ lui $a0, 0xffdf -/* C42DC0 80243010 8E62006C */ lw $v0, 0x6c($s3) -/* C42DC4 80243014 2403FEFF */ addiu $v1, $zero, -0x101 -/* C42DC8 80243018 00431024 */ and $v0, $v0, $v1 -/* C42DCC 8024301C AE62006C */ sw $v0, 0x6c($s3) -/* C42DD0 80243020 8E420000 */ lw $v0, ($s2) -/* C42DD4 80243024 3484FFFF */ ori $a0, $a0, 0xffff -/* C42DD8 80243028 AE400048 */ sw $zero, 0x48($s2) -/* C42DDC 8024302C 00441024 */ and $v0, $v0, $a0 -/* C42DE0 80243030 08090C82 */ j .L80243208 -/* C42DE4 80243034 AE420000 */ sw $v0, ($s2) -.L80243038: -/* C42DE8 80243038 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* C42DEC 8024303C 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* C42DF0 80243040 C6440048 */ lwc1 $f4, 0x48($s2) -/* C42DF4 80243044 3C0141C8 */ lui $at, 0x41c8 -/* C42DF8 80243048 44810000 */ mtc1 $at, $f0 -/* C42DFC 8024304C 8E020000 */ lw $v0, ($s0) -/* C42E00 80243050 46002100 */ add.s $f4, $f4, $f0 -/* C42E04 80243054 C4420028 */ lwc1 $f2, 0x28($v0) -/* C42E08 80243058 3C014000 */ lui $at, 0x4000 -/* C42E0C 8024305C 44810000 */ mtc1 $at, $f0 -/* C42E10 80243060 E6420038 */ swc1 $f2, 0x38($s2) -/* C42E14 80243064 C4420030 */ lwc1 $f2, 0x30($v0) -/* C42E18 80243068 46001080 */ add.s $f2, $f2, $f0 -/* C42E1C 8024306C 3C018024 */ lui $at, 0x8024 -/* C42E20 80243070 D4266D90 */ ldc1 $f6, 0x6d90($at) -/* C42E24 80243074 46002021 */ cvt.d.s $f0, $f4 -/* C42E28 80243078 4620303C */ c.lt.d $f6, $f0 -/* C42E2C 8024307C E6440048 */ swc1 $f4, 0x48($s2) -/* C42E30 80243080 45000004 */ bc1f .L80243094 -/* C42E34 80243084 E6420040 */ swc1 $f2, 0x40($s2) -/* C42E38 80243088 46260001 */ sub.d $f0, $f0, $f6 -/* C42E3C 8024308C 46200020 */ cvt.s.d $f0, $f0 -/* C42E40 80243090 E6400048 */ swc1 $f0, 0x48($s2) -.L80243094: -/* C42E44 80243094 3C02B60B */ lui $v0, 0xb60b -/* C42E48 80243098 C6400048 */ lwc1 $f0, 0x48($s2) -/* C42E4C 8024309C 344260B7 */ ori $v0, $v0, 0x60b7 -/* C42E50 802430A0 4600020D */ trunc.w.s $f8, $f0 -/* C42E54 802430A4 44044000 */ mfc1 $a0, $f8 -/* C42E58 802430A8 00000000 */ nop -/* C42E5C 802430AC 00820018 */ mult $a0, $v0 -/* C42E60 802430B0 00041FC3 */ sra $v1, $a0, 0x1f -/* C42E64 802430B4 00004010 */ mfhi $t0 -/* C42E68 802430B8 01041021 */ addu $v0, $t0, $a0 -/* C42E6C 802430BC 000211C3 */ sra $v0, $v0, 7 -/* C42E70 802430C0 00431023 */ subu $v0, $v0, $v1 -/* C42E74 802430C4 00021840 */ sll $v1, $v0, 1 -/* C42E78 802430C8 00621821 */ addu $v1, $v1, $v0 -/* C42E7C 802430CC 00031100 */ sll $v0, $v1, 4 -/* C42E80 802430D0 00431023 */ subu $v0, $v0, $v1 -/* C42E84 802430D4 00021080 */ sll $v0, $v0, 2 -/* C42E88 802430D8 00822023 */ subu $a0, $a0, $v0 -/* C42E8C 802430DC 00042400 */ sll $a0, $a0, 0x10 -/* C42E90 802430E0 0C00A4F5 */ jal cosine -/* C42E94 802430E4 00042403 */ sra $a0, $a0, 0x10 -/* C42E98 802430E8 3C014260 */ lui $at, 0x4260 -/* C42E9C 802430EC 44811000 */ mtc1 $at, $f2 -/* C42EA0 802430F0 00000000 */ nop -/* C42EA4 802430F4 46020002 */ mul.s $f0, $f0, $f2 -/* C42EA8 802430F8 00000000 */ nop -/* C42EAC 802430FC 24050006 */ addiu $a1, $zero, 6 -/* C42EB0 80243100 3C01437F */ lui $at, 0x437f -/* C42EB4 80243104 44811000 */ mtc1 $at, $f2 -/* C42EB8 80243108 240200FF */ addiu $v0, $zero, 0xff -/* C42EBC 8024310C 46001081 */ sub.s $f2, $f2, $f0 -/* C42EC0 80243110 AFA20014 */ sw $v0, 0x14($sp) -/* C42EC4 80243114 AFA00018 */ sw $zero, 0x18($sp) -/* C42EC8 80243118 4600120D */ trunc.w.s $f8, $f2 -/* C42ECC 8024311C 44064000 */ mfc1 $a2, $f8 -/* C42ED0 80243120 00000000 */ nop -/* C42ED4 80243124 AFA60010 */ sw $a2, 0x10($sp) -/* C42ED8 80243128 8E440024 */ lw $a0, 0x24($s2) -/* C42EDC 8024312C 0C0B7A25 */ jal func_802DE894 -/* C42EE0 80243130 00C0382D */ daddu $a3, $a2, $zero -/* C42EE4 80243134 27A50020 */ addiu $a1, $sp, 0x20 -/* C42EE8 80243138 27A60024 */ addiu $a2, $sp, 0x24 -/* C42EEC 8024313C 8E020000 */ lw $v0, ($s0) -/* C42EF0 80243140 3C01447A */ lui $at, 0x447a -/* C42EF4 80243144 44810000 */ mtc1 $at, $f0 -/* C42EF8 80243148 C4420028 */ lwc1 $f2, 0x28($v0) -/* C42EFC 8024314C C444002C */ lwc1 $f4, 0x2c($v0) -/* C42F00 80243150 C4460030 */ lwc1 $f6, 0x30($v0) -/* C42F04 80243154 27A2002C */ addiu $v0, $sp, 0x2c -/* C42F08 80243158 E7A0002C */ swc1 $f0, 0x2c($sp) -/* C42F0C 8024315C E7A20020 */ swc1 $f2, 0x20($sp) -/* C42F10 80243160 E7A40024 */ swc1 $f4, 0x24($sp) -/* C42F14 80243164 E7A60028 */ swc1 $f6, 0x28($sp) -/* C42F18 80243168 AFA20010 */ sw $v0, 0x10($sp) -/* C42F1C 8024316C 8E440080 */ lw $a0, 0x80($s2) -/* C42F20 80243170 0C0372DF */ jal func_800DCB7C -/* C42F24 80243174 27A70028 */ addiu $a3, $sp, 0x28 -/* C42F28 80243178 C644003C */ lwc1 $f4, 0x3c($s2) -/* C42F2C 8024317C C7A00024 */ lwc1 $f0, 0x24($sp) -/* C42F30 80243180 46002001 */ sub.s $f0, $f4, $f0 -/* C42F34 80243184 3C014038 */ lui $at, 0x4038 -/* C42F38 80243188 44811800 */ mtc1 $at, $f3 -/* C42F3C 8024318C 44801000 */ mtc1 $zero, $f2 -/* C42F40 80243190 46000005 */ abs.s $f0, $f0 -/* C42F44 80243194 46000021 */ cvt.d.s $f0, $f0 -/* C42F48 80243198 4620103C */ c.lt.d $f2, $f0 -/* C42F4C 8024319C 00000000 */ nop -/* C42F50 802431A0 45000008 */ bc1f .L802431C4 -/* C42F54 802431A4 3C03FFDF */ lui $v1, 0xffdf -/* C42F58 802431A8 3C018024 */ lui $at, 0x8024 -/* C42F5C 802431AC D4226D98 */ ldc1 $f2, 0x6d98($at) -/* C42F60 802431B0 46002021 */ cvt.d.s $f0, $f4 -/* C42F64 802431B4 46220001 */ sub.d $f0, $f0, $f2 -/* C42F68 802431B8 46200020 */ cvt.s.d $f0, $f0 -/* C42F6C 802431BC 08090C84 */ j .L80243210 -/* C42F70 802431C0 E640003C */ swc1 $f0, 0x3c($s2) -.L802431C4: -/* C42F74 802431C4 8E420000 */ lw $v0, ($s2) -/* C42F78 802431C8 3463FFFF */ ori $v1, $v1, 0xffff -/* C42F7C 802431CC AE400048 */ sw $zero, 0x48($s2) -/* C42F80 802431D0 00431024 */ and $v0, $v0, $v1 -/* C42F84 802431D4 AE420000 */ sw $v0, ($s2) -/* C42F88 802431D8 3C038011 */ lui $v1, 0x8011 -/* C42F8C 802431DC 8063EBB3 */ lb $v1, -0x144d($v1) -/* C42F90 802431E0 24020009 */ addiu $v0, $zero, 9 -/* C42F94 802431E4 10620009 */ beq $v1, $v0, .L8024320C -/* C42F98 802431E8 24020010 */ addiu $v0, $zero, 0x10 -/* C42F9C 802431EC 0C03805E */ jal disable_player_input -/* C42FA0 802431F0 00000000 */ nop -/* C42FA4 802431F4 0C03BD8A */ jal func_800EF628 -/* C42FA8 802431F8 00000000 */ nop -/* C42FAC 802431FC 24020014 */ addiu $v0, $zero, 0x14 -/* C42FB0 80243200 08090C83 */ j .L8024320C -/* C42FB4 80243204 A640008E */ sh $zero, 0x8e($s2) -.L80243208: -/* C42FB8 80243208 24020010 */ addiu $v0, $zero, 0x10 -.L8024320C: -/* C42FBC 8024320C AE820070 */ sw $v0, 0x70($s4) -.L80243210: -/* C42FC0 80243210 8FBF0044 */ lw $ra, 0x44($sp) -/* C42FC4 80243214 8FB40040 */ lw $s4, 0x40($sp) -/* C42FC8 80243218 8FB3003C */ lw $s3, 0x3c($sp) -/* C42FCC 8024321C 8FB20038 */ lw $s2, 0x38($sp) -/* C42FD0 80243220 8FB10034 */ lw $s1, 0x34($sp) -/* C42FD4 80243224 8FB00030 */ lw $s0, 0x30($sp) -/* C42FD8 80243228 03E00008 */ jr $ra -/* C42FDC 8024322C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80243230_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80243230_C3FDB0.s deleted file mode 100644 index bcb9fb4d1a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80243230_C3FDB0.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243230_C42FE0 -/* C42FE0 80243230 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C42FE4 80243234 AFB20028 */ sw $s2, 0x28($sp) -/* C42FE8 80243238 0080902D */ daddu $s2, $a0, $zero -/* C42FEC 8024323C AFBF002C */ sw $ra, 0x2c($sp) -/* C42FF0 80243240 AFB10024 */ sw $s1, 0x24($sp) -/* C42FF4 80243244 AFB00020 */ sw $s0, 0x20($sp) -/* C42FF8 80243248 8E500148 */ lw $s0, 0x148($s2) -/* C42FFC 8024324C 0C00EABB */ jal get_npc_unsafe -/* C43000 80243250 86040008 */ lh $a0, 8($s0) -/* C43004 80243254 2404FEFF */ addiu $a0, $zero, -0x101 -/* C43008 80243258 0040882D */ daddu $s1, $v0, $zero -/* C4300C 8024325C 0000282D */ daddu $a1, $zero, $zero -/* C43010 80243260 8E03006C */ lw $v1, 0x6c($s0) -/* C43014 80243264 00A0302D */ daddu $a2, $a1, $zero -/* C43018 80243268 00641824 */ and $v1, $v1, $a0 -/* C4301C 8024326C AE03006C */ sw $v1, 0x6c($s0) -/* C43020 80243270 AFA00010 */ sw $zero, 0x10($sp) -/* C43024 80243274 AFA00014 */ sw $zero, 0x14($sp) -/* C43028 80243278 AFA00018 */ sw $zero, 0x18($sp) -/* C4302C 8024327C 8E240024 */ lw $a0, 0x24($s1) -/* C43030 80243280 0C0B7A25 */ jal func_802DE894 -/* C43034 80243284 00A0382D */ daddu $a3, $a1, $zero -/* C43038 80243288 8E02006C */ lw $v0, 0x6c($s0) -/* C4303C 8024328C 30421000 */ andi $v0, $v0, 0x1000 -/* C43040 80243290 10400008 */ beqz $v0, .L802432B4 -/* C43044 80243294 00000000 */ nop -/* C43048 80243298 3C048000 */ lui $a0, 0x8000 -/* C4304C 8024329C 0C05271B */ jal stop_sound -/* C43050 802432A0 34840011 */ ori $a0, $a0, 0x11 -/* C43054 802432A4 8E02006C */ lw $v0, 0x6c($s0) -/* C43058 802432A8 2403EFFF */ addiu $v1, $zero, -0x1001 -/* C4305C 802432AC 00431024 */ and $v0, $v0, $v1 -/* C43060 802432B0 AE02006C */ sw $v0, 0x6c($s0) -.L802432B4: -/* C43064 802432B4 8E0200CC */ lw $v0, 0xcc($s0) -/* C43068 802432B8 8C430024 */ lw $v1, 0x24($v0) -/* C4306C 802432BC 24020014 */ addiu $v0, $zero, 0x14 -/* C43070 802432C0 A622008E */ sh $v0, 0x8e($s1) -/* C43074 802432C4 24020011 */ addiu $v0, $zero, 0x11 -/* C43078 802432C8 AE230028 */ sw $v1, 0x28($s1) -/* C4307C 802432CC AE420070 */ sw $v0, 0x70($s2) -/* C43080 802432D0 8FBF002C */ lw $ra, 0x2c($sp) -/* C43084 802432D4 8FB20028 */ lw $s2, 0x28($sp) -/* C43088 802432D8 8FB10024 */ lw $s1, 0x24($sp) -/* C4308C 802432DC 8FB00020 */ lw $s0, 0x20($sp) -/* C43090 802432E0 03E00008 */ jr $ra -/* C43094 802432E4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_802432E8_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_802432E8_C3FDB0.s deleted file mode 100644 index 4da36cb61c..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_802432E8_C3FDB0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802432E8_C43098 -/* C43098 802432E8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C4309C 802432EC AFB20048 */ sw $s2, 0x48($sp) -/* C430A0 802432F0 0080902D */ daddu $s2, $a0, $zero -/* C430A4 802432F4 AFBF004C */ sw $ra, 0x4c($sp) -/* C430A8 802432F8 AFB10044 */ sw $s1, 0x44($sp) -/* C430AC 802432FC AFB00040 */ sw $s0, 0x40($sp) -/* C430B0 80243300 F7B40050 */ sdc1 $f20, 0x50($sp) -/* C430B4 80243304 8E500148 */ lw $s0, 0x148($s2) -/* C430B8 80243308 0C00EABB */ jal get_npc_unsafe -/* C430BC 8024330C 86040008 */ lh $a0, 8($s0) -/* C430C0 80243310 27A50028 */ addiu $a1, $sp, 0x28 -/* C430C4 80243314 0040882D */ daddu $s1, $v0, $zero -/* C430C8 80243318 27A6002C */ addiu $a2, $sp, 0x2c -/* C430CC 8024331C 27A70030 */ addiu $a3, $sp, 0x30 -/* C430D0 80243320 C620003C */ lwc1 $f0, 0x3c($s1) -/* C430D4 80243324 3C014004 */ lui $at, 0x4004 -/* C430D8 80243328 44811800 */ mtc1 $at, $f3 -/* C430DC 8024332C 44801000 */ mtc1 $zero, $f2 -/* C430E0 80243330 C6260038 */ lwc1 $f6, 0x38($s1) -/* C430E4 80243334 46000021 */ cvt.d.s $f0, $f0 -/* C430E8 80243338 46220000 */ add.d $f0, $f0, $f2 -/* C430EC 8024333C 3C01447A */ lui $at, 0x447a -/* C430F0 80243340 44812000 */ mtc1 $at, $f4 -/* C430F4 80243344 C6020078 */ lwc1 $f2, 0x78($s0) -/* C430F8 80243348 468010A0 */ cvt.s.w $f2, $f2 -/* C430FC 8024334C 46200020 */ cvt.s.d $f0, $f0 -/* C43100 80243350 E620003C */ swc1 $f0, 0x3c($s1) -/* C43104 80243354 46000206 */ mov.s $f8, $f0 -/* C43108 80243358 C6200040 */ lwc1 $f0, 0x40($s1) -/* C4310C 8024335C 27A20034 */ addiu $v0, $sp, 0x34 -/* C43110 80243360 E7A00030 */ swc1 $f0, 0x30($sp) -/* C43114 80243364 3C014059 */ lui $at, 0x4059 -/* C43118 80243368 44810800 */ mtc1 $at, $f1 -/* C4311C 8024336C 44800000 */ mtc1 $zero, $f0 -/* C43120 80243370 460010A1 */ cvt.d.s $f2, $f2 -/* C43124 80243374 E7A60028 */ swc1 $f6, 0x28($sp) -/* C43128 80243378 E7A40034 */ swc1 $f4, 0x34($sp) -/* C4312C 8024337C E7A8002C */ swc1 $f8, 0x2c($sp) -/* C43130 80243380 AFA20010 */ sw $v0, 0x10($sp) -/* C43134 80243384 8E240080 */ lw $a0, 0x80($s1) -/* C43138 80243388 46201083 */ div.d $f2, $f2, $f0 -/* C4313C 8024338C 0C0372DF */ jal func_800DCB7C -/* C43140 80243390 46201520 */ cvt.s.d $f20, $f2 -/* C43144 80243394 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C43148 80243398 46140000 */ add.s $f0, $f0, $f20 -/* C4314C 8024339C C622003C */ lwc1 $f2, 0x3c($s1) -/* C43150 802433A0 4600103C */ c.lt.s $f2, $f0 -/* C43154 802433A4 00000000 */ nop -/* C43158 802433A8 45010028 */ bc1t .L8024344C -/* C4315C 802433AC 00000000 */ nop -/* C43160 802433B0 8E0200D0 */ lw $v0, 0xd0($s0) -/* C43164 802433B4 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C43168 802433B8 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C4316C 802433BC C44A0000 */ lwc1 $f10, ($v0) -/* C43170 802433C0 468052A0 */ cvt.s.w $f10, $f10 -/* C43174 802433C4 44065000 */ mfc1 $a2, $f10 -/* C43178 802433C8 C44A0008 */ lwc1 $f10, 8($v0) -/* C4317C 802433CC 468052A0 */ cvt.s.w $f10, $f10 -/* C43180 802433D0 44075000 */ mfc1 $a3, $f10 -/* C43184 802433D4 0C00A720 */ jal atan2 -/* C43188 802433D8 2410000A */ addiu $s0, $zero, 0xa -/* C4318C 802433DC 24040002 */ addiu $a0, $zero, 2 -/* C43190 802433E0 0220282D */ daddu $a1, $s1, $zero -/* C43194 802433E4 0000302D */ daddu $a2, $zero, $zero -/* C43198 802433E8 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* C4319C 802433EC 862200A8 */ lh $v0, 0xa8($s1) -/* C431A0 802433F0 E620000C */ swc1 $f0, 0xc($s1) -/* C431A4 802433F4 3C013F80 */ lui $at, 0x3f80 -/* C431A8 802433F8 44810000 */ mtc1 $at, $f0 -/* C431AC 802433FC 3C014000 */ lui $at, 0x4000 -/* C431B0 80243400 44812000 */ mtc1 $at, $f4 -/* C431B4 80243404 3C01C1A0 */ lui $at, 0xc1a0 -/* C431B8 80243408 44813000 */ mtc1 $at, $f6 -/* C431BC 8024340C 44825000 */ mtc1 $v0, $f10 -/* C431C0 80243410 00000000 */ nop -/* C431C4 80243414 468052A0 */ cvt.s.w $f10, $f10 -/* C431C8 80243418 46141080 */ add.s $f2, $f2, $f20 -/* C431CC 8024341C 44075000 */ mfc1 $a3, $f10 -/* C431D0 80243420 27A20038 */ addiu $v0, $sp, 0x38 -/* C431D4 80243424 E622003C */ swc1 $f2, 0x3c($s1) -/* C431D8 80243428 E7A00010 */ swc1 $f0, 0x10($sp) -/* C431DC 8024342C E7A40014 */ swc1 $f4, 0x14($sp) -/* C431E0 80243430 E7A60018 */ swc1 $f6, 0x18($sp) -/* C431E4 80243434 AFB0001C */ sw $s0, 0x1c($sp) -/* C431E8 80243438 0C01BFA4 */ jal fx_emote -/* C431EC 8024343C AFA20020 */ sw $v0, 0x20($sp) -/* C431F0 80243440 24020012 */ addiu $v0, $zero, 0x12 -/* C431F4 80243444 A630008E */ sh $s0, 0x8e($s1) -/* C431F8 80243448 AE420070 */ sw $v0, 0x70($s2) -.L8024344C: -/* C431FC 8024344C 8FBF004C */ lw $ra, 0x4c($sp) -/* C43200 80243450 8FB20048 */ lw $s2, 0x48($sp) -/* C43204 80243454 8FB10044 */ lw $s1, 0x44($sp) -/* C43208 80243458 8FB00040 */ lw $s0, 0x40($sp) -/* C4320C 8024345C D7B40050 */ ldc1 $f20, 0x50($sp) -/* C43210 80243460 03E00008 */ jr $ra -/* C43214 80243464 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_80243468_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_80243468_C3FDB0.s deleted file mode 100644 index dce26df896..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_80243468_C3FDB0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243468_C43218 -/* C43218 80243468 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C4321C 8024346C AFB00010 */ sw $s0, 0x10($sp) -/* C43220 80243470 0080802D */ daddu $s0, $a0, $zero -/* C43224 80243474 AFBF0014 */ sw $ra, 0x14($sp) -/* C43228 80243478 8E020148 */ lw $v0, 0x148($s0) -/* C4322C 8024347C 0C00EABB */ jal get_npc_unsafe -/* C43230 80243480 84440008 */ lh $a0, 8($v0) -/* C43234 80243484 9443008E */ lhu $v1, 0x8e($v0) -/* C43238 80243488 2463FFFF */ addiu $v1, $v1, -1 -/* C4323C 8024348C A443008E */ sh $v1, 0x8e($v0) -/* C43240 80243490 00031C00 */ sll $v1, $v1, 0x10 -/* C43244 80243494 1C600002 */ bgtz $v1, .L802434A0 -/* C43248 80243498 2402001E */ addiu $v0, $zero, 0x1e -/* C4324C 8024349C AE020070 */ sw $v0, 0x70($s0) -.L802434A0: -/* C43250 802434A0 8FBF0014 */ lw $ra, 0x14($sp) -/* C43254 802434A4 8FB00010 */ lw $s0, 0x10($sp) -/* C43258 802434A8 03E00008 */ jr $ra -/* C4325C 802434AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/func_802438F0_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/func_802438F0_C3FDB0.s deleted file mode 100644 index d60bc3e5bc..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/func_802438F0_C3FDB0.s +++ /dev/null @@ -1,166 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802438F0_C436A0 -/* C436A0 802438F0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* C436A4 802438F4 AFB40050 */ sw $s4, 0x50($sp) -/* C436A8 802438F8 0080A02D */ daddu $s4, $a0, $zero -/* C436AC 802438FC AFBF0058 */ sw $ra, 0x58($sp) -/* C436B0 80243900 AFB50054 */ sw $s5, 0x54($sp) -/* C436B4 80243904 AFB3004C */ sw $s3, 0x4c($sp) -/* C436B8 80243908 AFB20048 */ sw $s2, 0x48($sp) -/* C436BC 8024390C AFB10044 */ sw $s1, 0x44($sp) -/* C436C0 80243910 AFB00040 */ sw $s0, 0x40($sp) -/* C436C4 80243914 8E920148 */ lw $s2, 0x148($s4) -/* C436C8 80243918 86440008 */ lh $a0, 8($s2) -/* C436CC 8024391C 0C00EABB */ jal get_npc_unsafe -/* C436D0 80243920 00A0802D */ daddu $s0, $a1, $zero -/* C436D4 80243924 8E83000C */ lw $v1, 0xc($s4) -/* C436D8 80243928 0280202D */ daddu $a0, $s4, $zero -/* C436DC 8024392C 8C650000 */ lw $a1, ($v1) -/* C436E0 80243930 0C0B1EAF */ jal get_variable -/* C436E4 80243934 0040A82D */ daddu $s5, $v0, $zero -/* C436E8 80243938 AFA00020 */ sw $zero, 0x20($sp) -/* C436EC 8024393C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C436F0 80243940 8C630030 */ lw $v1, 0x30($v1) -/* C436F4 80243944 AFA30024 */ sw $v1, 0x24($sp) -/* C436F8 80243948 8E4300D0 */ lw $v1, 0xd0($s2) -/* C436FC 8024394C 8C63001C */ lw $v1, 0x1c($v1) -/* C43700 80243950 AFA30028 */ sw $v1, 0x28($sp) -/* C43704 80243954 8E4300D0 */ lw $v1, 0xd0($s2) -/* C43708 80243958 8C630024 */ lw $v1, 0x24($v1) -/* C4370C 8024395C AFA3002C */ sw $v1, 0x2c($sp) -/* C43710 80243960 8E4300D0 */ lw $v1, 0xd0($s2) -/* C43714 80243964 8C630028 */ lw $v1, 0x28($v1) -/* C43718 80243968 27B30020 */ addiu $s3, $sp, 0x20 -/* C4371C 8024396C AFA30030 */ sw $v1, 0x30($sp) -/* C43720 80243970 8E4300D0 */ lw $v1, 0xd0($s2) -/* C43724 80243974 3C0142FA */ lui $at, 0x42fa -/* C43728 80243978 44810000 */ mtc1 $at, $f0 -/* C4372C 8024397C 8C63002C */ lw $v1, 0x2c($v1) -/* C43730 80243980 0040882D */ daddu $s1, $v0, $zero -/* C43734 80243984 E7A00038 */ swc1 $f0, 0x38($sp) -/* C43738 80243988 A7A0003C */ sh $zero, 0x3c($sp) -/* C4373C 8024398C 12000007 */ beqz $s0, .L802439AC -/* C43740 80243990 AFA30034 */ sw $v1, 0x34($sp) -/* C43744 80243994 AE800070 */ sw $zero, 0x70($s4) -/* C43748 80243998 02A0202D */ daddu $a0, $s5, $zero -/* C4374C 8024399C 0240282D */ daddu $a1, $s2, $zero -/* C43750 802439A0 0280302D */ daddu $a2, $s4, $zero -/* C43754 802439A4 0C090A52 */ jal func_80242948 -/* C43758 802439A8 0220382D */ daddu $a3, $s1, $zero -.L802439AC: -/* C4375C 802439AC 8E830070 */ lw $v1, 0x70($s4) -/* C43760 802439B0 2C620020 */ sltiu $v0, $v1, 0x20 -/* C43764 802439B4 10400060 */ beqz $v0, .L80243B38 -/* C43768 802439B8 00031080 */ sll $v0, $v1, 2 -/* C4376C 802439BC 3C018024 */ lui $at, 0x8024 -/* C43770 802439C0 00220821 */ addu $at, $at, $v0 -/* C43774 802439C4 8C226DA0 */ lw $v0, 0x6da0($at) -/* C43778 802439C8 00400008 */ jr $v0 -/* C4377C 802439CC 00000000 */ nop -/* C43780 802439D0 0280202D */ daddu $a0, $s4, $zero -/* C43784 802439D4 0220282D */ daddu $a1, $s1, $zero -/* C43788 802439D8 0C0905D8 */ jal func_80241760 -/* C4378C 802439DC 0260302D */ daddu $a2, $s3, $zero -/* C43790 802439E0 0000282D */ daddu $a1, $zero, $zero -/* C43794 802439E4 00A0302D */ daddu $a2, $a1, $zero -/* C43798 802439E8 AFA00010 */ sw $zero, 0x10($sp) -/* C4379C 802439EC AFA00014 */ sw $zero, 0x14($sp) -/* C437A0 802439F0 AFA00018 */ sw $zero, 0x18($sp) -/* C437A4 802439F4 8EA40024 */ lw $a0, 0x24($s5) -/* C437A8 802439F8 0C0B7A25 */ jal func_802DE894 -/* C437AC 802439FC 00A0382D */ daddu $a3, $a1, $zero -/* C437B0 80243A00 0280202D */ daddu $a0, $s4, $zero -/* C437B4 80243A04 0220282D */ daddu $a1, $s1, $zero -/* C437B8 80243A08 0C090644 */ jal func_80241910 -/* C437BC 80243A0C 0260302D */ daddu $a2, $s3, $zero -/* C437C0 80243A10 08090E8E */ j .L80243A38 -/* C437C4 80243A14 00000000 */ nop -/* C437C8 80243A18 0280202D */ daddu $a0, $s4, $zero -/* C437CC 80243A1C 0220282D */ daddu $a1, $s1, $zero -/* C437D0 80243A20 0C0907CE */ jal func_80241F38 -/* C437D4 80243A24 0260302D */ daddu $a2, $s3, $zero -/* C437D8 80243A28 0280202D */ daddu $a0, $s4, $zero -/* C437DC 80243A2C 0220282D */ daddu $a1, $s1, $zero -/* C437E0 80243A30 0C0907FE */ jal func_80241FF8 -/* C437E4 80243A34 0260302D */ daddu $a2, $s3, $zero -.L80243A38: -/* C437E8 80243A38 8E830070 */ lw $v1, 0x70($s4) -/* C437EC 80243A3C 2402000C */ addiu $v0, $zero, 0xc -/* C437F0 80243A40 1462003D */ bne $v1, $v0, .L80243B38 -/* C437F4 80243A44 24020006 */ addiu $v0, $zero, 6 -/* C437F8 80243A48 08090ECE */ j .L80243B38 -/* C437FC 80243A4C A6A2008E */ sh $v0, 0x8e($s5) -/* C43800 80243A50 0280202D */ daddu $a0, $s4, $zero -/* C43804 80243A54 0220282D */ daddu $a1, $s1, $zero -/* C43808 80243A58 0C090B16 */ jal func_80242C58 -/* C4380C 80243A5C 0260302D */ daddu $a2, $s3, $zero -/* C43810 80243A60 8E830070 */ lw $v1, 0x70($s4) -/* C43814 80243A64 2402000D */ addiu $v0, $zero, 0xd -/* C43818 80243A68 14620033 */ bne $v1, $v0, .L80243B38 -/* C4381C 80243A6C 00000000 */ nop -/* C43820 80243A70 0280202D */ daddu $a0, $s4, $zero -/* C43824 80243A74 0220282D */ daddu $a1, $s1, $zero -/* C43828 80243A78 0C090B6C */ jal func_80242DB0 -/* C4382C 80243A7C 0260302D */ daddu $a2, $s3, $zero -/* C43830 80243A80 08090ECE */ j .L80243B38 -/* C43834 80243A84 00000000 */ nop -/* C43838 80243A88 0280202D */ daddu $a0, $s4, $zero -/* C4383C 80243A8C 0220282D */ daddu $a1, $s1, $zero -/* C43840 80243A90 0C090BAD */ jal func_80242EB4 -/* C43844 80243A94 0260302D */ daddu $a2, $s3, $zero -/* C43848 80243A98 8E830070 */ lw $v1, 0x70($s4) -/* C4384C 80243A9C 2402000F */ addiu $v0, $zero, 0xf -/* C43850 80243AA0 14620025 */ bne $v1, $v0, .L80243B38 -/* C43854 80243AA4 00000000 */ nop -/* C43858 80243AA8 0280202D */ daddu $a0, $s4, $zero -/* C4385C 80243AAC 0220282D */ daddu $a1, $s1, $zero -/* C43860 80243AB0 0C090BE5 */ jal func_80242F94 -/* C43864 80243AB4 0260302D */ daddu $a2, $s3, $zero -/* C43868 80243AB8 08090ECE */ j .L80243B38 -/* C4386C 80243ABC 00000000 */ nop -/* C43870 80243AC0 0280202D */ daddu $a0, $s4, $zero -/* C43874 80243AC4 0220282D */ daddu $a1, $s1, $zero -/* C43878 80243AC8 0C090C8C */ jal func_80243230 -/* C4387C 80243ACC 0260302D */ daddu $a2, $s3, $zero -/* C43880 80243AD0 0280202D */ daddu $a0, $s4, $zero -/* C43884 80243AD4 0220282D */ daddu $a1, $s1, $zero -/* C43888 80243AD8 0C090CBA */ jal func_802432E8 -/* C4388C 80243ADC 0260302D */ daddu $a2, $s3, $zero -/* C43890 80243AE0 08090ECE */ j .L80243B38 -/* C43894 80243AE4 00000000 */ nop -/* C43898 80243AE8 0280202D */ daddu $a0, $s4, $zero -/* C4389C 80243AEC 0220282D */ daddu $a1, $s1, $zero -/* C438A0 80243AF0 0C090D1A */ jal func_80243468 -/* C438A4 80243AF4 0260302D */ daddu $a2, $s3, $zero -/* C438A8 80243AF8 08090ECE */ j .L80243B38 -/* C438AC 80243AFC 00000000 */ nop -/* C438B0 80243B00 0280202D */ daddu $a0, $s4, $zero -/* C438B4 80243B04 0220282D */ daddu $a1, $s1, $zero -/* C438B8 80243B08 0C090D2C */ jal func_802434B0 -/* C438BC 80243B0C 0260302D */ daddu $a2, $s3, $zero -/* C438C0 80243B10 08090ECE */ j .L80243B38 -/* C438C4 80243B14 00000000 */ nop -/* C438C8 80243B18 0280202D */ daddu $a0, $s4, $zero -/* C438CC 80243B1C 0220282D */ daddu $a1, $s1, $zero -/* C438D0 80243B20 0C090D4C */ jal func_80243530 -/* C438D4 80243B24 0260302D */ daddu $a2, $s3, $zero -/* C438D8 80243B28 0280202D */ daddu $a0, $s4, $zero -/* C438DC 80243B2C 0220282D */ daddu $a1, $s1, $zero -/* C438E0 80243B30 0C090D76 */ jal func_802435D8 -/* C438E4 80243B34 0260302D */ daddu $a2, $s3, $zero -.L80243B38: -/* C438E8 80243B38 8E820070 */ lw $v0, 0x70($s4) -/* C438EC 80243B3C 8FBF0058 */ lw $ra, 0x58($sp) -/* C438F0 80243B40 8FB50054 */ lw $s5, 0x54($sp) -/* C438F4 80243B44 8FB40050 */ lw $s4, 0x50($sp) -/* C438F8 80243B48 8FB3004C */ lw $s3, 0x4c($sp) -/* C438FC 80243B4C 8FB20048 */ lw $s2, 0x48($sp) -/* C43900 80243B50 8FB10044 */ lw $s1, 0x44($sp) -/* C43904 80243B54 8FB00040 */ lw $s0, 0x40($sp) -/* C43908 80243B58 38420064 */ xori $v0, $v0, 0x64 -/* C4390C 80243B5C 2C420001 */ sltiu $v0, $v0, 1 -/* C43910 80243B60 00021040 */ sll $v0, $v0, 1 -/* C43914 80243B64 03E00008 */ jr $ra -/* C43918 80243B68 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_8024006C_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_8024006C_C46BE0.s deleted file mode 100644 index 3e6e856ef3..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_8024006C_C46BE0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024006C_C46C4C -/* C46C4C 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C46C50 80240070 AFB10014 */ sw $s1, 0x14($sp) -/* C46C54 80240074 0080882D */ daddu $s1, $a0, $zero -/* C46C58 80240078 AFBF0018 */ sw $ra, 0x18($sp) -/* C46C5C 8024007C AFB00010 */ sw $s0, 0x10($sp) -/* C46C60 80240080 8E300148 */ lw $s0, 0x148($s1) -/* C46C64 80240084 0C00EABB */ jal get_npc_unsafe -/* C46C68 80240088 86040008 */ lh $a0, 8($s0) -/* C46C6C 8024008C 0040202D */ daddu $a0, $v0, $zero -/* C46C70 80240090 9482008E */ lhu $v0, 0x8e($a0) -/* C46C74 80240094 2442FFFF */ addiu $v0, $v0, -1 -/* C46C78 80240098 A482008E */ sh $v0, 0x8e($a0) -/* C46C7C 8024009C 00021400 */ sll $v0, $v0, 0x10 -/* C46C80 802400A0 1C400009 */ bgtz $v0, .L802400C8 -/* C46C84 802400A4 24020003 */ addiu $v0, $zero, 3 -/* C46C88 802400A8 96030076 */ lhu $v1, 0x76($s0) -/* C46C8C 802400AC AE02006C */ sw $v0, 0x6c($s0) -/* C46C90 802400B0 A483008E */ sh $v1, 0x8e($a0) -/* C46C94 802400B4 8E0200CC */ lw $v0, 0xcc($s0) -/* C46C98 802400B8 8C420024 */ lw $v0, 0x24($v0) -/* C46C9C 802400BC AC820028 */ sw $v0, 0x28($a0) -/* C46CA0 802400C0 24020020 */ addiu $v0, $zero, 0x20 -/* C46CA4 802400C4 AE220070 */ sw $v0, 0x70($s1) -.L802400C8: -/* C46CA8 802400C8 8FBF0018 */ lw $ra, 0x18($sp) -/* C46CAC 802400CC 8FB10014 */ lw $s1, 0x14($sp) -/* C46CB0 802400D0 8FB00010 */ lw $s0, 0x10($sp) -/* C46CB4 802400D4 03E00008 */ jr $ra -/* C46CB8 802400D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_802400DC_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_802400DC_C46BE0.s deleted file mode 100644 index ac12ccfa3d..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_802400DC_C46BE0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_C46CBC -/* C46CBC 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C46CC0 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* C46CC4 802400E4 0080882D */ daddu $s1, $a0, $zero -/* C46CC8 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* C46CCC 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* C46CD0 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* C46CD4 802400F4 0C00EABB */ jal get_npc_unsafe -/* C46CD8 802400F8 86040008 */ lh $a0, 8($s0) -/* C46CDC 802400FC 0040282D */ daddu $a1, $v0, $zero -/* C46CE0 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* C46CE4 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* C46CE8 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* C46CEC 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* C46CF0 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* C46CF4 80240114 24020004 */ addiu $v0, $zero, 4 -/* C46CF8 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* C46CFC 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* C46D00 80240120 8C620000 */ lw $v0, ($v1) -/* C46D04 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* C46D08 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* C46D0C 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* C46D10 80240130 8E020078 */ lw $v0, 0x78($s0) -/* C46D14 80240134 28420008 */ slti $v0, $v0, 8 -/* C46D18 80240138 14400018 */ bnez $v0, .L8024019C -/* C46D1C 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* C46D20 80240140 24040003 */ addiu $a0, $zero, 3 -/* C46D24 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* C46D28 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* C46D2C 8024014C 3C013F80 */ lui $at, 0x3f80 -/* C46D30 80240150 44810000 */ mtc1 $at, $f0 -/* C46D34 80240154 3C014000 */ lui $at, 0x4000 -/* C46D38 80240158 44811000 */ mtc1 $at, $f2 -/* C46D3C 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* C46D40 80240160 44812000 */ mtc1 $at, $f4 -/* C46D44 80240164 44873000 */ mtc1 $a3, $f6 -/* C46D48 80240168 00000000 */ nop -/* C46D4C 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* C46D50 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* C46D54 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* C46D58 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* C46D5C 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* C46D60 80240180 44073000 */ mfc1 $a3, $f6 -/* C46D64 80240184 0000302D */ daddu $a2, $zero, $zero -/* C46D68 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* C46D6C 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* C46D70 80240190 0C01BFA4 */ jal fx_emote -/* C46D74 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* C46D78 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* C46D7C 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* C46D80 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* C46D84 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* C46D88 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* C46D8C 802401AC 03E00008 */ jr $ra -/* C46D90 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_802401B4_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_802401B4_C46BE0.s deleted file mode 100644 index 83cfef7113..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_802401B4_C46BE0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_C46D94 -/* C46D94 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C46D98 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* C46D9C 802401BC 0080882D */ daddu $s1, $a0, $zero -/* C46DA0 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C46DA4 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* C46DA8 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* C46DAC 802401CC 0C00EABB */ jal get_npc_unsafe -/* C46DB0 802401D0 86040008 */ lh $a0, 8($s0) -/* C46DB4 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* C46DB8 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* C46DBC 802401DC A443008E */ sh $v1, 0x8e($v0) -/* C46DC0 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* C46DC4 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* C46DC8 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* C46DCC 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* C46DD0 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* C46DD4 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* C46DD8 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* C46DDC 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* C46DE0 80240200 03E00008 */ jr $ra -/* C46DE4 80240204 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_80240208_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_80240208_C46BE0.s deleted file mode 100644 index 02d2c662d3..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_80240208_C46BE0.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240208_C46DE8 -/* C46DE8 80240208 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C46DEC 8024020C AFBF0024 */ sw $ra, 0x24($sp) -/* C46DF0 80240210 AFB40020 */ sw $s4, 0x20($sp) -/* C46DF4 80240214 AFB3001C */ sw $s3, 0x1c($sp) -/* C46DF8 80240218 AFB20018 */ sw $s2, 0x18($sp) -/* C46DFC 8024021C AFB10014 */ sw $s1, 0x14($sp) -/* C46E00 80240220 AFB00010 */ sw $s0, 0x10($sp) -/* C46E04 80240224 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C46E08 80240228 8C900148 */ lw $s0, 0x148($a0) -/* C46E0C 8024022C 86040008 */ lh $a0, 8($s0) -/* C46E10 80240230 0C00EABB */ jal get_npc_unsafe -/* C46E14 80240234 24110001 */ addiu $s1, $zero, 1 -/* C46E18 80240238 86040008 */ lh $a0, 8($s0) -/* C46E1C 8024023C 0040802D */ daddu $s0, $v0, $zero -/* C46E20 80240240 3C05800B */ lui $a1, %hi(gCameras) -/* C46E24 80240244 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C46E28 80240248 3C03800A */ lui $v1, 0x800a -/* C46E2C 8024024C 8463A634 */ lh $v1, -0x59cc($v1) -/* C46E30 80240250 00912021 */ addu $a0, $a0, $s1 -/* C46E34 80240254 00031080 */ sll $v0, $v1, 2 -/* C46E38 80240258 00431021 */ addu $v0, $v0, $v1 -/* C46E3C 8024025C 00021080 */ sll $v0, $v0, 2 -/* C46E40 80240260 00431023 */ subu $v0, $v0, $v1 -/* C46E44 80240264 000218C0 */ sll $v1, $v0, 3 -/* C46E48 80240268 00431021 */ addu $v0, $v0, $v1 -/* C46E4C 8024026C 000210C0 */ sll $v0, $v0, 3 -/* C46E50 80240270 0C00FB3A */ jal get_enemy -/* C46E54 80240274 00459021 */ addu $s2, $v0, $a1 -/* C46E58 80240278 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C46E5C 8024027C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C46E60 80240280 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C46E64 80240284 8E830000 */ lw $v1, ($s4) -/* C46E68 80240288 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C46E6C 8024028C 8C660028 */ lw $a2, 0x28($v1) -/* C46E70 80240290 8C670030 */ lw $a3, 0x30($v1) -/* C46E74 80240294 0C00A7B5 */ jal dist2D -/* C46E78 80240298 0040982D */ daddu $s3, $v0, $zero -/* C46E7C 8024029C C6620074 */ lwc1 $f2, 0x74($s3) -/* C46E80 802402A0 468010A0 */ cvt.s.w $f2, $f2 -/* C46E84 802402A4 4600103C */ c.lt.s $f2, $f0 -/* C46E88 802402A8 00000000 */ nop -/* C46E8C 802402AC 45030001 */ bc1tl .L802402B4 -/* C46E90 802402B0 0000882D */ daddu $s1, $zero, $zero -.L802402B4: -/* C46E94 802402B4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C46E98 802402B8 C60E000C */ lwc1 $f14, 0xc($s0) -/* C46E9C 802402BC 3C014387 */ lui $at, 0x4387 -/* C46EA0 802402C0 4481A000 */ mtc1 $at, $f20 -/* C46EA4 802402C4 0C00A70A */ jal get_clamped_angle_diff -/* C46EA8 802402C8 00000000 */ nop -/* C46EAC 802402CC 0C00A6C9 */ jal clamp_angle -/* C46EB0 802402D0 46000306 */ mov.s $f12, $f0 -/* C46EB4 802402D4 3C018024 */ lui $at, 0x8024 -/* C46EB8 802402D8 D4225390 */ ldc1 $f2, 0x5390($at) -/* C46EBC 802402DC 46000021 */ cvt.d.s $f0, $f0 -/* C46EC0 802402E0 4622003C */ c.lt.d $f0, $f2 -/* C46EC4 802402E4 00000000 */ nop -/* C46EC8 802402E8 45000003 */ bc1f .L802402F8 -/* C46ECC 802402EC 00000000 */ nop -/* C46ED0 802402F0 3C0142B4 */ lui $at, 0x42b4 -/* C46ED4 802402F4 4481A000 */ mtc1 $at, $f20 -.L802402F8: -/* C46ED8 802402F8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C46EDC 802402FC 8E820000 */ lw $v0, ($s4) -/* C46EE0 80240300 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C46EE4 80240304 8C460028 */ lw $a2, 0x28($v0) -/* C46EE8 80240308 0C00A720 */ jal atan2 -/* C46EEC 8024030C 8C470030 */ lw $a3, 0x30($v0) -/* C46EF0 80240310 4600A306 */ mov.s $f12, $f20 -/* C46EF4 80240314 0C00A70A */ jal get_clamped_angle_diff -/* C46EF8 80240318 46000386 */ mov.s $f14, $f0 -/* C46EFC 8024031C C6620078 */ lwc1 $f2, 0x78($s3) -/* C46F00 80240320 468010A0 */ cvt.s.w $f2, $f2 -/* C46F04 80240324 46000005 */ abs.s $f0, $f0 -/* C46F08 80240328 4600103C */ c.lt.s $f2, $f0 -/* C46F0C 8024032C 00000000 */ nop -/* C46F10 80240330 45030001 */ bc1tl .L80240338 -/* C46F14 80240334 0000882D */ daddu $s1, $zero, $zero -.L80240338: -/* C46F18 80240338 8E820000 */ lw $v0, ($s4) -/* C46F1C 8024033C C600003C */ lwc1 $f0, 0x3c($s0) -/* C46F20 80240340 C442002C */ lwc1 $f2, 0x2c($v0) -/* C46F24 80240344 860200A8 */ lh $v0, 0xa8($s0) -/* C46F28 80240348 46020001 */ sub.s $f0, $f0, $f2 -/* C46F2C 8024034C 44821000 */ mtc1 $v0, $f2 -/* C46F30 80240350 00000000 */ nop -/* C46F34 80240354 468010A1 */ cvt.d.w $f2, $f2 -/* C46F38 80240358 46221080 */ add.d $f2, $f2, $f2 -/* C46F3C 8024035C 46000005 */ abs.s $f0, $f0 -/* C46F40 80240360 46000021 */ cvt.d.s $f0, $f0 -/* C46F44 80240364 4620103E */ c.le.d $f2, $f0 -/* C46F48 80240368 00000000 */ nop -/* C46F4C 8024036C 45030001 */ bc1tl .L80240374 -/* C46F50 80240370 0000882D */ daddu $s1, $zero, $zero -.L80240374: -/* C46F54 80240374 3C038011 */ lui $v1, 0x8011 -/* C46F58 80240378 8063EBB3 */ lb $v1, -0x144d($v1) -/* C46F5C 8024037C 24020009 */ addiu $v0, $zero, 9 -/* C46F60 80240380 50620001 */ beql $v1, $v0, .L80240388 -/* C46F64 80240384 0000882D */ daddu $s1, $zero, $zero -.L80240388: -/* C46F68 80240388 24020007 */ addiu $v0, $zero, 7 -/* C46F6C 8024038C 50620001 */ beql $v1, $v0, .L80240394 -/* C46F70 80240390 0000882D */ daddu $s1, $zero, $zero -.L80240394: -/* C46F74 80240394 0220102D */ daddu $v0, $s1, $zero -/* C46F78 80240398 8FBF0024 */ lw $ra, 0x24($sp) -/* C46F7C 8024039C 8FB40020 */ lw $s4, 0x20($sp) -/* C46F80 802403A0 8FB3001C */ lw $s3, 0x1c($sp) -/* C46F84 802403A4 8FB20018 */ lw $s2, 0x18($sp) -/* C46F88 802403A8 8FB10014 */ lw $s1, 0x14($sp) -/* C46F8C 802403AC 8FB00010 */ lw $s0, 0x10($sp) -/* C46F90 802403B0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C46F94 802403B4 03E00008 */ jr $ra -/* C46F98 802403B8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_8024061C_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_8024061C_C46BE0.s deleted file mode 100644 index cdf817f5cc..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_8024061C_C46BE0.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_C471FC -/* C471FC 8024061C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C47200 80240620 AFB20038 */ sw $s2, 0x38($sp) -/* C47204 80240624 0080902D */ daddu $s2, $a0, $zero -/* C47208 80240628 AFBF0048 */ sw $ra, 0x48($sp) -/* C4720C 8024062C AFB50044 */ sw $s5, 0x44($sp) -/* C47210 80240630 AFB40040 */ sw $s4, 0x40($sp) -/* C47214 80240634 AFB3003C */ sw $s3, 0x3c($sp) -/* C47218 80240638 AFB10034 */ sw $s1, 0x34($sp) -/* C4721C 8024063C AFB00030 */ sw $s0, 0x30($sp) -/* C47220 80240640 8E510148 */ lw $s1, 0x148($s2) -/* C47224 80240644 86240008 */ lh $a0, 8($s1) -/* C47228 80240648 0C00EABB */ jal get_npc_unsafe -/* C4722C 8024064C 00A0802D */ daddu $s0, $a1, $zero -/* C47230 80240650 8E43000C */ lw $v1, 0xc($s2) -/* C47234 80240654 0240202D */ daddu $a0, $s2, $zero -/* C47238 80240658 8C650000 */ lw $a1, ($v1) -/* C4723C 8024065C 0C0B1EAF */ jal get_variable -/* C47240 80240660 0040A82D */ daddu $s5, $v0, $zero -/* C47244 80240664 AFA00010 */ sw $zero, 0x10($sp) -/* C47248 80240668 8E2300D0 */ lw $v1, 0xd0($s1) -/* C4724C 8024066C 8C630030 */ lw $v1, 0x30($v1) -/* C47250 80240670 AFA30014 */ sw $v1, 0x14($sp) -/* C47254 80240674 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47258 80240678 8C63001C */ lw $v1, 0x1c($v1) -/* C4725C 8024067C AFA30018 */ sw $v1, 0x18($sp) -/* C47260 80240680 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47264 80240684 8C630024 */ lw $v1, 0x24($v1) -/* C47268 80240688 AFA3001C */ sw $v1, 0x1c($sp) -/* C4726C 8024068C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47270 80240690 8C630028 */ lw $v1, 0x28($v1) -/* C47274 80240694 27B40010 */ addiu $s4, $sp, 0x10 -/* C47278 80240698 AFA30020 */ sw $v1, 0x20($sp) -/* C4727C 8024069C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47280 802406A0 3C014282 */ lui $at, 0x4282 -/* C47284 802406A4 44810000 */ mtc1 $at, $f0 -/* C47288 802406A8 8C63002C */ lw $v1, 0x2c($v1) -/* C4728C 802406AC 0040982D */ daddu $s3, $v0, $zero -/* C47290 802406B0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C47294 802406B4 A7A0002C */ sh $zero, 0x2c($sp) -/* C47298 802406B8 16000005 */ bnez $s0, .L802406D0 -/* C4729C 802406BC AFA30024 */ sw $v1, 0x24($sp) -/* C472A0 802406C0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C472A4 802406C4 30420004 */ andi $v0, $v0, 4 -/* C472A8 802406C8 10400020 */ beqz $v0, .L8024074C -/* C472AC 802406CC 00000000 */ nop -.L802406D0: -/* C472B0 802406D0 2404F7FF */ addiu $a0, $zero, -0x801 -/* C472B4 802406D4 AE400070 */ sw $zero, 0x70($s2) -/* C472B8 802406D8 A6A0008E */ sh $zero, 0x8e($s5) -/* C472BC 802406DC 8E2200CC */ lw $v0, 0xcc($s1) -/* C472C0 802406E0 8EA30000 */ lw $v1, ($s5) -/* C472C4 802406E4 8C420000 */ lw $v0, ($v0) -/* C472C8 802406E8 00641824 */ and $v1, $v1, $a0 -/* C472CC 802406EC AEA30000 */ sw $v1, ($s5) -/* C472D0 802406F0 AEA20028 */ sw $v0, 0x28($s5) -/* C472D4 802406F4 8E2200D0 */ lw $v0, 0xd0($s1) -/* C472D8 802406F8 8C420034 */ lw $v0, 0x34($v0) -/* C472DC 802406FC 54400005 */ bnel $v0, $zero, .L80240714 -/* C472E0 80240700 2402FDFF */ addiu $v0, $zero, -0x201 -/* C472E4 80240704 34620200 */ ori $v0, $v1, 0x200 -/* C472E8 80240708 2403FFF7 */ addiu $v1, $zero, -9 -/* C472EC 8024070C 080901C7 */ j .L8024071C -/* C472F0 80240710 00431024 */ and $v0, $v0, $v1 -.L80240714: -/* C472F4 80240714 00621024 */ and $v0, $v1, $v0 -/* C472F8 80240718 34420008 */ ori $v0, $v0, 8 -.L8024071C: -/* C472FC 8024071C AEA20000 */ sw $v0, ($s5) -/* C47300 80240720 8E2200B0 */ lw $v0, 0xb0($s1) -/* C47304 80240724 30420004 */ andi $v0, $v0, 4 -/* C47308 80240728 10400007 */ beqz $v0, .L80240748 -/* C4730C 8024072C 24020063 */ addiu $v0, $zero, 0x63 -/* C47310 80240730 AE420070 */ sw $v0, 0x70($s2) -/* C47314 80240734 AE400074 */ sw $zero, 0x74($s2) -/* C47318 80240738 8E2200B0 */ lw $v0, 0xb0($s1) -/* C4731C 8024073C 2403FFFB */ addiu $v1, $zero, -5 -/* C47320 80240740 00431024 */ and $v0, $v0, $v1 -/* C47324 80240744 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240748: -/* C47328 80240748 AE20006C */ sw $zero, 0x6c($s1) -.L8024074C: -/* C4732C 8024074C 8E420070 */ lw $v0, 0x70($s2) -/* C47330 80240750 2842001E */ slti $v0, $v0, 0x1e -/* C47334 80240754 10400009 */ beqz $v0, .L8024077C -/* C47338 80240758 00000000 */ nop -/* C4733C 8024075C 8E22006C */ lw $v0, 0x6c($s1) -/* C47340 80240760 14400006 */ bnez $v0, .L8024077C -/* C47344 80240764 00000000 */ nop -/* C47348 80240768 0C090082 */ jal func_80240208 -/* C4734C 8024076C 0240202D */ daddu $a0, $s2, $zero -/* C47350 80240770 10400002 */ beqz $v0, .L8024077C -/* C47354 80240774 2402001E */ addiu $v0, $zero, 0x1e -/* C47358 80240778 AE420070 */ sw $v0, 0x70($s2) -.L8024077C: -/* C4735C 8024077C 8E430070 */ lw $v1, 0x70($s2) -/* C47360 80240780 2C620064 */ sltiu $v0, $v1, 0x64 -/* C47364 80240784 10400048 */ beqz $v0, .L802408A8 -/* C47368 80240788 00031080 */ sll $v0, $v1, 2 -/* C4736C 8024078C 3C018024 */ lui $at, 0x8024 -/* C47370 80240790 00220821 */ addu $at, $at, $v0 -/* C47374 80240794 8C225398 */ lw $v0, 0x5398($at) -/* C47378 80240798 00400008 */ jr $v0 -/* C4737C 8024079C 00000000 */ nop -/* C47380 802407A0 0240202D */ daddu $a0, $s2, $zero -/* C47384 802407A4 0260282D */ daddu $a1, $s3, $zero -/* C47388 802407A8 0C012568 */ jal func_800495A0 -/* C4738C 802407AC 0280302D */ daddu $a2, $s4, $zero -/* C47390 802407B0 0240202D */ daddu $a0, $s2, $zero -/* C47394 802407B4 0260282D */ daddu $a1, $s3, $zero -/* C47398 802407B8 0C0125AE */ jal func_800496B8 -/* C4739C 802407BC 0280302D */ daddu $a2, $s4, $zero -/* C473A0 802407C0 0809022A */ j .L802408A8 -/* C473A4 802407C4 00000000 */ nop -/* C473A8 802407C8 0240202D */ daddu $a0, $s2, $zero -/* C473AC 802407CC 0260282D */ daddu $a1, $s3, $zero -/* C473B0 802407D0 0C0126D1 */ jal func_80049B44 -/* C473B4 802407D4 0280302D */ daddu $a2, $s4, $zero -/* C473B8 802407D8 0240202D */ daddu $a0, $s2, $zero -/* C473BC 802407DC 0260282D */ daddu $a1, $s3, $zero -/* C473C0 802407E0 0C012701 */ jal func_80049C04 -/* C473C4 802407E4 0280302D */ daddu $a2, $s4, $zero -/* C473C8 802407E8 0809022A */ j .L802408A8 -/* C473CC 802407EC 00000000 */ nop -/* C473D0 802407F0 0240202D */ daddu $a0, $s2, $zero -/* C473D4 802407F4 0260282D */ daddu $a1, $s3, $zero -/* C473D8 802407F8 0C01278F */ jal func_80049E3C -/* C473DC 802407FC 0280302D */ daddu $a2, $s4, $zero -/* C473E0 80240800 0240202D */ daddu $a0, $s2, $zero -/* C473E4 80240804 0260282D */ daddu $a1, $s3, $zero -/* C473E8 80240808 0C0127B3 */ jal func_80049ECC -/* C473EC 8024080C 0280302D */ daddu $a2, $s4, $zero -/* C473F0 80240810 0809022A */ j .L802408A8 -/* C473F4 80240814 00000000 */ nop -/* C473F8 80240818 0240202D */ daddu $a0, $s2, $zero -/* C473FC 8024081C 0260282D */ daddu $a1, $s3, $zero -/* C47400 80240820 0C0127DF */ jal func_80049F7C -/* C47404 80240824 0280302D */ daddu $a2, $s4, $zero -/* C47408 80240828 0240202D */ daddu $a0, $s2, $zero -/* C4740C 8024082C 0260282D */ daddu $a1, $s3, $zero -/* C47410 80240830 0C012849 */ jal func_8004A124 -/* C47414 80240834 0280302D */ daddu $a2, $s4, $zero -/* C47418 80240838 0809022A */ j .L802408A8 -/* C4741C 8024083C 00000000 */ nop -/* C47420 80240840 0240202D */ daddu $a0, $s2, $zero -/* C47424 80240844 0260282D */ daddu $a1, $s3, $zero -/* C47428 80240848 0C0128FA */ jal func_8004A3E8 -/* C4742C 8024084C 0280302D */ daddu $a2, $s4, $zero -/* C47430 80240850 0809022A */ j .L802408A8 -/* C47434 80240854 00000000 */ nop -/* C47438 80240858 0C090000 */ jal func_80240000 -/* C4743C 8024085C 0240202D */ daddu $a0, $s2, $zero -/* C47440 80240860 0C09001B */ jal func_8024006C -/* C47444 80240864 0240202D */ daddu $a0, $s2, $zero -/* C47448 80240868 8E430070 */ lw $v1, 0x70($s2) -/* C4744C 8024086C 24020020 */ addiu $v0, $zero, 0x20 -/* C47450 80240870 1462000D */ bne $v1, $v0, .L802408A8 -/* C47454 80240874 00000000 */ nop -/* C47458 80240878 0C090037 */ jal func_802400DC -/* C4745C 8024087C 0240202D */ daddu $a0, $s2, $zero -/* C47460 80240880 8E430070 */ lw $v1, 0x70($s2) -/* C47464 80240884 24020021 */ addiu $v0, $zero, 0x21 -/* C47468 80240888 14620007 */ bne $v1, $v0, .L802408A8 -/* C4746C 8024088C 00000000 */ nop -/* C47470 80240890 0C09006D */ jal func_802401B4 -/* C47474 80240894 0240202D */ daddu $a0, $s2, $zero -/* C47478 80240898 0809022A */ j .L802408A8 -/* C4747C 8024089C 00000000 */ nop -/* C47480 802408A0 0C0129CF */ jal func_8004A73C -/* C47484 802408A4 0240202D */ daddu $a0, $s2, $zero -.L802408A8: -/* C47488 802408A8 8FBF0048 */ lw $ra, 0x48($sp) -/* C4748C 802408AC 8FB50044 */ lw $s5, 0x44($sp) -/* C47490 802408B0 8FB40040 */ lw $s4, 0x40($sp) -/* C47494 802408B4 8FB3003C */ lw $s3, 0x3c($sp) -/* C47498 802408B8 8FB20038 */ lw $s2, 0x38($sp) -/* C4749C 802408BC 8FB10034 */ lw $s1, 0x34($sp) -/* C474A0 802408C0 8FB00030 */ lw $s0, 0x30($sp) -/* C474A4 802408C4 0000102D */ daddu $v0, $zero, $zero -/* C474A8 802408C8 03E00008 */ jr $ra -/* C474AC 802408CC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_802408D0_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_802408D0_C46BE0.s deleted file mode 100644 index 6ccc31010f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_802408D0_C46BE0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408D0_C474B0 -/* C474B0 802408D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C474B4 802408D4 AFB10014 */ sw $s1, 0x14($sp) -/* C474B8 802408D8 0080882D */ daddu $s1, $a0, $zero -/* C474BC 802408DC AFBF0018 */ sw $ra, 0x18($sp) -/* C474C0 802408E0 AFB00010 */ sw $s0, 0x10($sp) -/* C474C4 802408E4 8E300148 */ lw $s0, 0x148($s1) -/* C474C8 802408E8 0C00EABB */ jal get_npc_unsafe -/* C474CC 802408EC 86040008 */ lh $a0, 8($s0) -/* C474D0 802408F0 0040202D */ daddu $a0, $v0, $zero -/* C474D4 802408F4 8482008E */ lh $v0, 0x8e($a0) -/* C474D8 802408F8 9483008E */ lhu $v1, 0x8e($a0) -/* C474DC 802408FC 18400002 */ blez $v0, .L80240908 -/* C474E0 80240900 2462FFFF */ addiu $v0, $v1, -1 -/* C474E4 80240904 A482008E */ sh $v0, 0x8e($a0) -.L80240908: -/* C474E8 80240908 8482008E */ lh $v0, 0x8e($a0) -/* C474EC 8024090C 24030001 */ addiu $v1, $zero, 1 -/* C474F0 80240910 14430005 */ bne $v0, $v1, .L80240928 -/* C474F4 80240914 00000000 */ nop -/* C474F8 80240918 8E0200CC */ lw $v0, 0xcc($s0) -/* C474FC 8024091C 8C420030 */ lw $v0, 0x30($v0) -/* C47500 80240920 08090251 */ j .L80240944 -/* C47504 80240924 AC820028 */ sw $v0, 0x28($a0) -.L80240928: -/* C47508 80240928 1C400006 */ bgtz $v0, .L80240944 -/* C4750C 8024092C 00000000 */ nop -/* C47510 80240930 8E0200CC */ lw $v0, 0xcc($s0) -/* C47514 80240934 8C420028 */ lw $v0, 0x28($v0) -/* C47518 80240938 A480008E */ sh $zero, 0x8e($a0) -/* C4751C 8024093C AC820028 */ sw $v0, 0x28($a0) -/* C47520 80240940 AE230070 */ sw $v1, 0x70($s1) -.L80240944: -/* C47524 80240944 8FBF0018 */ lw $ra, 0x18($sp) -/* C47528 80240948 8FB10014 */ lw $s1, 0x14($sp) -/* C4752C 8024094C 8FB00010 */ lw $s0, 0x10($sp) -/* C47530 80240950 03E00008 */ jr $ra -/* C47534 80240954 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_80240958_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_80240958_C46BE0.s deleted file mode 100644 index 0c5d6aa6ea..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_80240958_C46BE0.s +++ /dev/null @@ -1,192 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240958_C47538 -/* C47538 80240958 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C4753C 8024095C AFB40048 */ sw $s4, 0x48($sp) -/* C47540 80240960 0080A02D */ daddu $s4, $a0, $zero -/* C47544 80240964 AFBF004C */ sw $ra, 0x4c($sp) -/* C47548 80240968 AFB30044 */ sw $s3, 0x44($sp) -/* C4754C 8024096C AFB20040 */ sw $s2, 0x40($sp) -/* C47550 80240970 AFB1003C */ sw $s1, 0x3c($sp) -/* C47554 80240974 AFB00038 */ sw $s0, 0x38($sp) -/* C47558 80240978 8E930148 */ lw $s3, 0x148($s4) -/* C4755C 8024097C 00C0802D */ daddu $s0, $a2, $zero -/* C47560 80240980 86640008 */ lh $a0, 8($s3) -/* C47564 80240984 0C00EABB */ jal get_npc_unsafe -/* C47568 80240988 0000902D */ daddu $s2, $zero, $zero -/* C4756C 8024098C 0C039D59 */ jal get_player_data -/* C47570 80240990 0040882D */ daddu $s1, $v0, $zero -/* C47574 80240994 0200202D */ daddu $a0, $s0, $zero -/* C47578 80240998 0260282D */ daddu $a1, $s3, $zero -/* C4757C 8024099C 0000382D */ daddu $a3, $zero, $zero -/* C47580 802409A0 3C0642A0 */ lui $a2, 0x42a0 -/* C47584 802409A4 0040802D */ daddu $s0, $v0, $zero -/* C47588 802409A8 0C01242D */ jal func_800490B4 -/* C4758C 802409AC AFA00010 */ sw $zero, 0x10($sp) -/* C47590 802409B0 10400022 */ beqz $v0, .L80240A3C -/* C47594 802409B4 00000000 */ nop -/* C47598 802409B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C4759C 802409BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C475A0 802409C0 804300B4 */ lb $v1, 0xb4($v0) -/* C475A4 802409C4 24020002 */ addiu $v0, $zero, 2 -/* C475A8 802409C8 10620013 */ beq $v1, $v0, .L80240A18 -/* C475AC 802409CC 2402001A */ addiu $v0, $zero, 0x1a -/* C475B0 802409D0 10620011 */ beq $v1, $v0, .L80240A18 -/* C475B4 802409D4 24020003 */ addiu $v0, $zero, 3 -/* C475B8 802409D8 1062000F */ beq $v1, $v0, .L80240A18 -/* C475BC 802409DC 2402000E */ addiu $v0, $zero, 0xe -/* C475C0 802409E0 1062000D */ beq $v1, $v0, .L80240A18 -/* C475C4 802409E4 24020010 */ addiu $v0, $zero, 0x10 -/* C475C8 802409E8 1062000B */ beq $v1, $v0, .L80240A18 -/* C475CC 802409EC 2402000B */ addiu $v0, $zero, 0xb -/* C475D0 802409F0 10620009 */ beq $v1, $v0, .L80240A18 -/* C475D4 802409F4 2402000A */ addiu $v0, $zero, 0xa -/* C475D8 802409F8 10620007 */ beq $v1, $v0, .L80240A18 -/* C475DC 802409FC 24020012 */ addiu $v0, $zero, 0x12 -/* C475E0 80240A00 10620005 */ beq $v1, $v0, .L80240A18 -/* C475E4 80240A04 24020013 */ addiu $v0, $zero, 0x13 -/* C475E8 80240A08 10620003 */ beq $v1, $v0, .L80240A18 -/* C475EC 80240A0C 24020025 */ addiu $v0, $zero, 0x25 -/* C475F0 80240A10 14620002 */ bne $v1, $v0, .L80240A1C -/* C475F4 80240A14 00000000 */ nop -.L80240A18: -/* C475F8 80240A18 24120001 */ addiu $s2, $zero, 1 -.L80240A1C: -/* C475FC 80240A1C 82030012 */ lb $v1, 0x12($s0) -/* C47600 80240A20 24020002 */ addiu $v0, $zero, 2 -/* C47604 80240A24 14620007 */ bne $v1, $v0, .L80240A44 -/* C47608 80240A28 24020001 */ addiu $v0, $zero, 1 -/* C4760C 80240A2C 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C47610 80240A30 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C47614 80240A34 50430002 */ beql $v0, $v1, .L80240A40 -/* C47618 80240A38 24120001 */ addiu $s2, $zero, 1 -.L80240A3C: -/* C4761C 80240A3C 82030012 */ lb $v1, 0x12($s0) -.L80240A40: -/* C47620 80240A40 24020001 */ addiu $v0, $zero, 1 -.L80240A44: -/* C47624 80240A44 14620006 */ bne $v1, $v0, .L80240A60 -/* C47628 80240A48 24020003 */ addiu $v0, $zero, 3 -/* C4762C 80240A4C 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C47630 80240A50 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C47634 80240A54 14400008 */ bnez $v0, .L80240A78 -/* C47638 80240A58 27A40028 */ addiu $a0, $sp, 0x28 -/* C4763C 80240A5C 24020003 */ addiu $v0, $zero, 3 -.L80240A60: -/* C47640 80240A60 1462001B */ bne $v1, $v0, .L80240AD0 -/* C47644 80240A64 24020002 */ addiu $v0, $zero, 2 -/* C47648 80240A68 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C4764C 80240A6C 8063EBB0 */ lb $v1, %lo(D_8010EBB0)($v1) -/* C47650 80240A70 14620017 */ bne $v1, $v0, .L80240AD0 -/* C47654 80240A74 27A40028 */ addiu $a0, $sp, 0x28 -.L80240A78: -/* C47658 80240A78 27A5002C */ addiu $a1, $sp, 0x2c -/* C4765C 80240A7C 8E27000C */ lw $a3, 0xc($s1) -/* C47660 80240A80 C6200038 */ lwc1 $f0, 0x38($s1) -/* C47664 80240A84 C6220040 */ lwc1 $f2, 0x40($s1) -/* C47668 80240A88 0000302D */ daddu $a2, $zero, $zero -/* C4766C 80240A8C E7A00028 */ swc1 $f0, 0x28($sp) -/* C47670 80240A90 0C00A7E7 */ jal add_vec2D_polar -/* C47674 80240A94 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C47678 80240A98 3C028011 */ lui $v0, 0x8011 -/* C4767C 80240A9C 8C42C930 */ lw $v0, -0x36d0($v0) -/* C47680 80240AA0 C7AC0028 */ lwc1 $f12, 0x28($sp) -/* C47684 80240AA4 C7AE002C */ lwc1 $f14, 0x2c($sp) -/* C47688 80240AA8 8C460038 */ lw $a2, 0x38($v0) -/* C4768C 80240AAC 0C00A7B5 */ jal dist2D -/* C47690 80240AB0 8C470040 */ lw $a3, 0x40($v0) -/* C47694 80240AB4 3C0142A0 */ lui $at, 0x42a0 -/* C47698 80240AB8 44811000 */ mtc1 $at, $f2 -/* C4769C 80240ABC 00000000 */ nop -/* C476A0 80240AC0 4602003E */ c.le.s $f0, $f2 -/* C476A4 80240AC4 00000000 */ nop -/* C476A8 80240AC8 45030001 */ bc1tl .L80240AD0 -/* C476AC 80240ACC 24120001 */ addiu $s2, $zero, 1 -.L80240AD0: -/* C476B0 80240AD0 12400026 */ beqz $s2, .L80240B6C -/* C476B4 80240AD4 0220202D */ daddu $a0, $s1, $zero -/* C476B8 80240AD8 3C05B000 */ lui $a1, 0xb000 -/* C476BC 80240ADC 34A5000E */ ori $a1, $a1, 0xe -/* C476C0 80240AE0 0C012530 */ jal func_800494C0 -/* C476C4 80240AE4 0000302D */ daddu $a2, $zero, $zero -/* C476C8 80240AE8 0000202D */ daddu $a0, $zero, $zero -/* C476CC 80240AEC 0220282D */ daddu $a1, $s1, $zero -/* C476D0 80240AF0 0000302D */ daddu $a2, $zero, $zero -/* C476D4 80240AF4 862200A8 */ lh $v0, 0xa8($s1) -/* C476D8 80240AF8 8E6300CC */ lw $v1, 0xcc($s3) -/* C476DC 80240AFC 3C013F80 */ lui $at, 0x3f80 -/* C476E0 80240B00 44810000 */ mtc1 $at, $f0 -/* C476E4 80240B04 3C014000 */ lui $at, 0x4000 -/* C476E8 80240B08 44811000 */ mtc1 $at, $f2 -/* C476EC 80240B0C 3C01C1A0 */ lui $at, 0xc1a0 -/* C476F0 80240B10 44812000 */ mtc1 $at, $f4 -/* C476F4 80240B14 44823000 */ mtc1 $v0, $f6 -/* C476F8 80240B18 00000000 */ nop -/* C476FC 80240B1C 468031A0 */ cvt.s.w $f6, $f6 -/* C47700 80240B20 44073000 */ mfc1 $a3, $f6 -/* C47704 80240B24 8C63002C */ lw $v1, 0x2c($v1) -/* C47708 80240B28 2402000A */ addiu $v0, $zero, 0xa -/* C4770C 80240B2C A622008E */ sh $v0, 0x8e($s1) -/* C47710 80240B30 2402000F */ addiu $v0, $zero, 0xf -/* C47714 80240B34 AE230028 */ sw $v1, 0x28($s1) -/* C47718 80240B38 AFA2001C */ sw $v0, 0x1c($sp) -/* C4771C 80240B3C 27A20030 */ addiu $v0, $sp, 0x30 -/* C47720 80240B40 E7A00010 */ swc1 $f0, 0x10($sp) -/* C47724 80240B44 E7A20014 */ swc1 $f2, 0x14($sp) -/* C47728 80240B48 E7A40018 */ swc1 $f4, 0x18($sp) -/* C4772C 80240B4C 0C01BFA4 */ jal fx_emote -/* C47730 80240B50 AFA20020 */ sw $v0, 0x20($sp) -/* C47734 80240B54 0220202D */ daddu $a0, $s1, $zero -/* C47738 80240B58 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C4773C 80240B5C 0C012530 */ jal func_800494C0 -/* C47740 80240B60 3C060020 */ lui $a2, 0x20 -/* C47744 80240B64 24020002 */ addiu $v0, $zero, 2 -/* C47748 80240B68 AE820070 */ sw $v0, 0x70($s4) -.L80240B6C: -/* C4774C 80240B6C 9622008E */ lhu $v0, 0x8e($s1) -/* C47750 80240B70 24420001 */ addiu $v0, $v0, 1 -/* C47754 80240B74 A622008E */ sh $v0, 0x8e($s1) -/* C47758 80240B78 00021400 */ sll $v0, $v0, 0x10 -/* C4775C 80240B7C 00021C03 */ sra $v1, $v0, 0x10 -/* C47760 80240B80 2402001B */ addiu $v0, $zero, 0x1b -/* C47764 80240B84 14620005 */ bne $v1, $v0, .L80240B9C -/* C47768 80240B88 24020039 */ addiu $v0, $zero, 0x39 -/* C4776C 80240B8C 0220202D */ daddu $a0, $s1, $zero -/* C47770 80240B90 3C05B000 */ lui $a1, 0xb000 -/* C47774 80240B94 080902EC */ j .L80240BB0 -/* C47778 80240B98 34A5000C */ ori $a1, $a1, 0xc -.L80240B9C: -/* C4777C 80240B9C 14620008 */ bne $v1, $v0, .L80240BC0 -/* C47780 80240BA0 2402003B */ addiu $v0, $zero, 0x3b -/* C47784 80240BA4 0220202D */ daddu $a0, $s1, $zero -/* C47788 80240BA8 3C05B000 */ lui $a1, 0xb000 -/* C4778C 80240BAC 34A5000D */ ori $a1, $a1, 0xd -.L80240BB0: -/* C47790 80240BB0 0C012530 */ jal func_800494C0 -/* C47794 80240BB4 0000302D */ daddu $a2, $zero, $zero -/* C47798 80240BB8 080902FC */ j .L80240BF0 -/* C4779C 80240BBC 00000000 */ nop -.L80240BC0: -/* C477A0 80240BC0 14620005 */ bne $v1, $v0, .L80240BD8 -/* C477A4 80240BC4 2402003C */ addiu $v0, $zero, 0x3c -/* C477A8 80240BC8 8E6200CC */ lw $v0, 0xcc($s3) -/* C477AC 80240BCC 8C420030 */ lw $v0, 0x30($v0) -/* C477B0 80240BD0 080902FC */ j .L80240BF0 -/* C477B4 80240BD4 AE220028 */ sw $v0, 0x28($s1) -.L80240BD8: -/* C477B8 80240BD8 14620005 */ bne $v1, $v0, .L80240BF0 -/* C477BC 80240BDC 00000000 */ nop -/* C477C0 80240BE0 8E6200CC */ lw $v0, 0xcc($s3) -/* C477C4 80240BE4 8C420028 */ lw $v0, 0x28($v0) -/* C477C8 80240BE8 A620008E */ sh $zero, 0x8e($s1) -/* C477CC 80240BEC AE220028 */ sw $v0, 0x28($s1) -.L80240BF0: -/* C477D0 80240BF0 8FBF004C */ lw $ra, 0x4c($sp) -/* C477D4 80240BF4 8FB40048 */ lw $s4, 0x48($sp) -/* C477D8 80240BF8 8FB30044 */ lw $s3, 0x44($sp) -/* C477DC 80240BFC 8FB20040 */ lw $s2, 0x40($sp) -/* C477E0 80240C00 8FB1003C */ lw $s1, 0x3c($sp) -/* C477E4 80240C04 8FB00038 */ lw $s0, 0x38($sp) -/* C477E8 80240C08 03E00008 */ jr $ra -/* C477EC 80240C0C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_80240C10_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_80240C10_C46BE0.s deleted file mode 100644 index ac232ee665..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_80240C10_C46BE0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C10_C477F0 -/* C477F0 80240C10 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C477F4 80240C14 AFB10014 */ sw $s1, 0x14($sp) -/* C477F8 80240C18 0080882D */ daddu $s1, $a0, $zero -/* C477FC 80240C1C AFBF0018 */ sw $ra, 0x18($sp) -/* C47800 80240C20 AFB00010 */ sw $s0, 0x10($sp) -/* C47804 80240C24 8E300148 */ lw $s0, 0x148($s1) -/* C47808 80240C28 0C00EABB */ jal get_npc_unsafe -/* C4780C 80240C2C 86040008 */ lh $a0, 8($s0) -/* C47810 80240C30 0040182D */ daddu $v1, $v0, $zero -/* C47814 80240C34 9462008E */ lhu $v0, 0x8e($v1) -/* C47818 80240C38 2442FFFF */ addiu $v0, $v0, -1 -/* C4781C 80240C3C A462008E */ sh $v0, 0x8e($v1) -/* C47820 80240C40 00021400 */ sll $v0, $v0, 0x10 -/* C47824 80240C44 1C400006 */ bgtz $v0, .L80240C60 -/* C47828 80240C48 24020001 */ addiu $v0, $zero, 1 -/* C4782C 80240C4C A462008E */ sh $v0, 0x8e($v1) -/* C47830 80240C50 24020028 */ addiu $v0, $zero, 0x28 -/* C47834 80240C54 AE020088 */ sw $v0, 0x88($s0) -/* C47838 80240C58 24020003 */ addiu $v0, $zero, 3 -/* C4783C 80240C5C AE220070 */ sw $v0, 0x70($s1) -.L80240C60: -/* C47840 80240C60 8FBF0018 */ lw $ra, 0x18($sp) -/* C47844 80240C64 8FB10014 */ lw $s1, 0x14($sp) -/* C47848 80240C68 8FB00010 */ lw $s0, 0x10($sp) -/* C4784C 80240C6C 03E00008 */ jr $ra -/* C47850 80240C70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_80240C74_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_80240C74_C46BE0.s deleted file mode 100644 index 04efbef90f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_80240C74_C46BE0.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C74_C47854 -/* C47854 80240C74 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C47858 80240C78 AFB10014 */ sw $s1, 0x14($sp) -/* C4785C 80240C7C 0080882D */ daddu $s1, $a0, $zero -/* C47860 80240C80 AFBF001C */ sw $ra, 0x1c($sp) -/* C47864 80240C84 AFB20018 */ sw $s2, 0x18($sp) -/* C47868 80240C88 AFB00010 */ sw $s0, 0x10($sp) -/* C4786C 80240C8C 8E320148 */ lw $s2, 0x148($s1) -/* C47870 80240C90 0C00EABB */ jal get_npc_unsafe -/* C47874 80240C94 86440008 */ lh $a0, 8($s2) -/* C47878 80240C98 240400B4 */ addiu $a0, $zero, 0xb4 -/* C4787C 80240C9C 0C00A67F */ jal rand_int -/* C47880 80240CA0 0040802D */ daddu $s0, $v0, $zero -/* C47884 80240CA4 C60C000C */ lwc1 $f12, 0xc($s0) -/* C47888 80240CA8 44820000 */ mtc1 $v0, $f0 -/* C4788C 80240CAC 00000000 */ nop -/* C47890 80240CB0 46800020 */ cvt.s.w $f0, $f0 -/* C47894 80240CB4 46006300 */ add.s $f12, $f12, $f0 -/* C47898 80240CB8 3C0142B4 */ lui $at, 0x42b4 -/* C4789C 80240CBC 44810000 */ mtc1 $at, $f0 -/* C478A0 80240CC0 0C00A6C9 */ jal clamp_angle -/* C478A4 80240CC4 46006301 */ sub.s $f12, $f12, $f0 -/* C478A8 80240CC8 E600000C */ swc1 $f0, 0xc($s0) -/* C478AC 80240CCC 8E4200CC */ lw $v0, 0xcc($s2) -/* C478B0 80240CD0 8C420000 */ lw $v0, ($v0) -/* C478B4 80240CD4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C478B8 80240CD8 0C00A67F */ jal rand_int -/* C478BC 80240CDC AE020028 */ sw $v0, 0x28($s0) -/* C478C0 80240CE0 00021FC2 */ srl $v1, $v0, 0x1f -/* C478C4 80240CE4 00431821 */ addu $v1, $v0, $v1 -/* C478C8 80240CE8 00031843 */ sra $v1, $v1, 1 -/* C478CC 80240CEC 00031840 */ sll $v1, $v1, 1 -/* C478D0 80240CF0 00431023 */ subu $v0, $v0, $v1 -/* C478D4 80240CF4 24420002 */ addiu $v0, $v0, 2 -/* C478D8 80240CF8 AE220074 */ sw $v0, 0x74($s1) -/* C478DC 80240CFC 24020004 */ addiu $v0, $zero, 4 -/* C478E0 80240D00 AE220070 */ sw $v0, 0x70($s1) -/* C478E4 80240D04 8FBF001C */ lw $ra, 0x1c($sp) -/* C478E8 80240D08 8FB20018 */ lw $s2, 0x18($sp) -/* C478EC 80240D0C 8FB10014 */ lw $s1, 0x14($sp) -/* C478F0 80240D10 8FB00010 */ lw $s0, 0x10($sp) -/* C478F4 80240D14 03E00008 */ jr $ra -/* C478F8 80240D18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_80240D1C_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_80240D1C_C46BE0.s deleted file mode 100644 index d01942d192..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_80240D1C_C46BE0.s +++ /dev/null @@ -1,87 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D1C_C478FC -/* C478FC 80240D1C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C47900 80240D20 AFB20020 */ sw $s2, 0x20($sp) -/* C47904 80240D24 0080902D */ daddu $s2, $a0, $zero -/* C47908 80240D28 AFBF0028 */ sw $ra, 0x28($sp) -/* C4790C 80240D2C AFB30024 */ sw $s3, 0x24($sp) -/* C47910 80240D30 AFB1001C */ sw $s1, 0x1c($sp) -/* C47914 80240D34 AFB00018 */ sw $s0, 0x18($sp) -/* C47918 80240D38 8E510148 */ lw $s1, 0x148($s2) -/* C4791C 80240D3C 00A0982D */ daddu $s3, $a1, $zero -/* C47920 80240D40 86240008 */ lh $a0, 8($s1) -/* C47924 80240D44 0C00EABB */ jal get_npc_unsafe -/* C47928 80240D48 00C0802D */ daddu $s0, $a2, $zero -/* C4792C 80240D4C 0200202D */ daddu $a0, $s0, $zero -/* C47930 80240D50 0040802D */ daddu $s0, $v0, $zero -/* C47934 80240D54 AFA00010 */ sw $zero, 0x10($sp) -/* C47938 80240D58 8E660024 */ lw $a2, 0x24($s3) -/* C4793C 80240D5C 8E670028 */ lw $a3, 0x28($s3) -/* C47940 80240D60 0C01242D */ jal func_800490B4 -/* C47944 80240D64 0220282D */ daddu $a1, $s1, $zero -/* C47948 80240D68 1040000C */ beqz $v0, .L80240D9C -/* C4794C 80240D6C 00000000 */ nop -/* C47950 80240D70 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C47954 80240D74 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C47958 80240D78 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C4795C 80240D7C C60E0040 */ lwc1 $f14, 0x40($s0) -/* C47960 80240D80 8C460028 */ lw $a2, 0x28($v0) -/* C47964 80240D84 0C00A720 */ jal atan2 -/* C47968 80240D88 8C470030 */ lw $a3, 0x30($v0) -/* C4796C 80240D8C 2402000C */ addiu $v0, $zero, 0xc -/* C47970 80240D90 E600000C */ swc1 $f0, 0xc($s0) -/* C47974 80240D94 0809038E */ j .L80240E38 -/* C47978 80240D98 AE420070 */ sw $v0, 0x70($s2) -.L80240D9C: -/* C4797C 80240D9C 9602008E */ lhu $v0, 0x8e($s0) -/* C47980 80240DA0 2442FFFF */ addiu $v0, $v0, -1 -/* C47984 80240DA4 A602008E */ sh $v0, 0x8e($s0) -/* C47988 80240DA8 00021400 */ sll $v0, $v0, 0x10 -/* C4798C 80240DAC 1C400022 */ bgtz $v0, .L80240E38 -/* C47990 80240DB0 00000000 */ nop -/* C47994 80240DB4 8E420074 */ lw $v0, 0x74($s2) -/* C47998 80240DB8 2442FFFF */ addiu $v0, $v0, -1 -/* C4799C 80240DBC 18400014 */ blez $v0, .L80240E10 -/* C479A0 80240DC0 AE420074 */ sw $v0, 0x74($s2) -/* C479A4 80240DC4 C600000C */ lwc1 $f0, 0xc($s0) -/* C479A8 80240DC8 3C014334 */ lui $at, 0x4334 -/* C479AC 80240DCC 44816000 */ mtc1 $at, $f12 -/* C479B0 80240DD0 0C00A6C9 */ jal clamp_angle -/* C479B4 80240DD4 460C0300 */ add.s $f12, $f0, $f12 -/* C479B8 80240DD8 E600000C */ swc1 $f0, 0xc($s0) -/* C479BC 80240DDC 8E640008 */ lw $a0, 8($s3) -/* C479C0 80240DE0 000417C2 */ srl $v0, $a0, 0x1f -/* C479C4 80240DE4 00822021 */ addu $a0, $a0, $v0 -/* C479C8 80240DE8 00042043 */ sra $a0, $a0, 1 -/* C479CC 80240DEC 0C00A67F */ jal rand_int -/* C479D0 80240DF0 24840001 */ addiu $a0, $a0, 1 -/* C479D4 80240DF4 8E630008 */ lw $v1, 8($s3) -/* C479D8 80240DF8 000327C2 */ srl $a0, $v1, 0x1f -/* C479DC 80240DFC 00641821 */ addu $v1, $v1, $a0 -/* C479E0 80240E00 00031843 */ sra $v1, $v1, 1 -/* C479E4 80240E04 00621821 */ addu $v1, $v1, $v0 -/* C479E8 80240E08 0809038E */ j .L80240E38 -/* C479EC 80240E0C A603008E */ sh $v1, 0x8e($s0) -.L80240E10: -/* C479F0 80240E10 8E250088 */ lw $a1, 0x88($s1) -/* C479F4 80240E14 24020028 */ addiu $v0, $zero, 0x28 -/* C479F8 80240E18 14A20003 */ bne $a1, $v0, .L80240E28 -/* C479FC 80240E1C 24020032 */ addiu $v0, $zero, 0x32 -/* C47A00 80240E20 0809038C */ j .L80240E30 -/* C47A04 80240E24 24020014 */ addiu $v0, $zero, 0x14 -.L80240E28: -/* C47A08 80240E28 14A20003 */ bne $a1, $v0, .L80240E38 -/* C47A0C 80240E2C 24020019 */ addiu $v0, $zero, 0x19 -.L80240E30: -/* C47A10 80240E30 A602008E */ sh $v0, 0x8e($s0) -/* C47A14 80240E34 AE450070 */ sw $a1, 0x70($s2) -.L80240E38: -/* C47A18 80240E38 8FBF0028 */ lw $ra, 0x28($sp) -/* C47A1C 80240E3C 8FB30024 */ lw $s3, 0x24($sp) -/* C47A20 80240E40 8FB20020 */ lw $s2, 0x20($sp) -/* C47A24 80240E44 8FB1001C */ lw $s1, 0x1c($sp) -/* C47A28 80240E48 8FB00018 */ lw $s0, 0x18($sp) -/* C47A2C 80240E4C 03E00008 */ jr $ra -/* C47A30 80240E50 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_80240E54_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_80240E54_C46BE0.s deleted file mode 100644 index 8cb9b7a8a4..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_80240E54_C46BE0.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E54_C47A34 -/* C47A34 80240E54 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C47A38 80240E58 AFB20018 */ sw $s2, 0x18($sp) -/* C47A3C 80240E5C 0080902D */ daddu $s2, $a0, $zero -/* C47A40 80240E60 AFBF001C */ sw $ra, 0x1c($sp) -/* C47A44 80240E64 AFB10014 */ sw $s1, 0x14($sp) -/* C47A48 80240E68 AFB00010 */ sw $s0, 0x10($sp) -/* C47A4C 80240E6C 8E500148 */ lw $s0, 0x148($s2) -/* C47A50 80240E70 86040008 */ lh $a0, 8($s0) -/* C47A54 80240E74 0C00EABB */ jal get_npc_unsafe -/* C47A58 80240E78 00A0882D */ daddu $s1, $a1, $zero -/* C47A5C 80240E7C 0040182D */ daddu $v1, $v0, $zero -/* C47A60 80240E80 9462008E */ lhu $v0, 0x8e($v1) -/* C47A64 80240E84 2442FFFF */ addiu $v0, $v0, -1 -/* C47A68 80240E88 A462008E */ sh $v0, 0x8e($v1) -/* C47A6C 80240E8C 00021400 */ sll $v0, $v0, 0x10 -/* C47A70 80240E90 1C400015 */ bgtz $v0, .L80240EE8 -/* C47A74 80240E94 00000000 */ nop -/* C47A78 80240E98 8E0200CC */ lw $v0, 0xcc($s0) -/* C47A7C 80240E9C 8C420004 */ lw $v0, 4($v0) -/* C47A80 80240EA0 AC620028 */ sw $v0, 0x28($v1) -/* C47A84 80240EA4 8E0200D0 */ lw $v0, 0xd0($s0) -/* C47A88 80240EA8 8C420014 */ lw $v0, 0x14($v0) -/* C47A8C 80240EAC 04410004 */ bgez $v0, .L80240EC0 -/* C47A90 80240EB0 00000000 */ nop -/* C47A94 80240EB4 C6200000 */ lwc1 $f0, ($s1) -/* C47A98 80240EB8 080903B8 */ j .L80240EE0 -/* C47A9C 80240EBC E4600018 */ swc1 $f0, 0x18($v1) -.L80240EC0: -/* C47AA0 80240EC0 3C018024 */ lui $at, 0x8024 -/* C47AA4 80240EC4 D4225528 */ ldc1 $f2, 0x5528($at) -/* C47AA8 80240EC8 44820000 */ mtc1 $v0, $f0 -/* C47AAC 80240ECC 00000000 */ nop -/* C47AB0 80240ED0 46800021 */ cvt.d.w $f0, $f0 -/* C47AB4 80240ED4 46220003 */ div.d $f0, $f0, $f2 -/* C47AB8 80240ED8 46200020 */ cvt.s.d $f0, $f0 -/* C47ABC 80240EDC E4600018 */ swc1 $f0, 0x18($v1) -.L80240EE0: -/* C47AC0 80240EE0 24020029 */ addiu $v0, $zero, 0x29 -/* C47AC4 80240EE4 AE420070 */ sw $v0, 0x70($s2) -.L80240EE8: -/* C47AC8 80240EE8 8FBF001C */ lw $ra, 0x1c($sp) -/* C47ACC 80240EEC 8FB20018 */ lw $s2, 0x18($sp) -/* C47AD0 80240EF0 8FB10014 */ lw $s1, 0x14($sp) -/* C47AD4 80240EF4 8FB00010 */ lw $s0, 0x10($sp) -/* C47AD8 80240EF8 03E00008 */ jr $ra -/* C47ADC 80240EFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_80240F00_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_80240F00_C46BE0.s deleted file mode 100644 index 49bfdb877f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_80240F00_C46BE0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F00_C47AE0 -/* C47AE0 80240F00 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C47AE4 80240F04 AFB3002C */ sw $s3, 0x2c($sp) -/* C47AE8 80240F08 0080982D */ daddu $s3, $a0, $zero -/* C47AEC 80240F0C AFBF0030 */ sw $ra, 0x30($sp) -/* C47AF0 80240F10 AFB20028 */ sw $s2, 0x28($sp) -/* C47AF4 80240F14 AFB10024 */ sw $s1, 0x24($sp) -/* C47AF8 80240F18 AFB00020 */ sw $s0, 0x20($sp) -/* C47AFC 80240F1C 8E720148 */ lw $s2, 0x148($s3) -/* C47B00 80240F20 00A0882D */ daddu $s1, $a1, $zero -/* C47B04 80240F24 86440008 */ lh $a0, 8($s2) -/* C47B08 80240F28 0C00EABB */ jal get_npc_unsafe -/* C47B0C 80240F2C 00C0802D */ daddu $s0, $a2, $zero -/* C47B10 80240F30 0200202D */ daddu $a0, $s0, $zero -/* C47B14 80240F34 0240282D */ daddu $a1, $s2, $zero -/* C47B18 80240F38 AFA00010 */ sw $zero, 0x10($sp) -/* C47B1C 80240F3C 8E260024 */ lw $a2, 0x24($s1) -/* C47B20 80240F40 8E270028 */ lw $a3, 0x28($s1) -/* C47B24 80240F44 0C01242D */ jal func_800490B4 -/* C47B28 80240F48 0040802D */ daddu $s0, $v0, $zero -/* C47B2C 80240F4C 1040000C */ beqz $v0, .L80240F80 -/* C47B30 80240F50 00000000 */ nop -/* C47B34 80240F54 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C47B38 80240F58 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C47B3C 80240F5C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C47B40 80240F60 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C47B44 80240F64 8C460028 */ lw $a2, 0x28($v0) -/* C47B48 80240F68 0C00A720 */ jal atan2 -/* C47B4C 80240F6C 8C470030 */ lw $a3, 0x30($v0) -/* C47B50 80240F70 2402000C */ addiu $v0, $zero, 0xc -/* C47B54 80240F74 E600000C */ swc1 $f0, 0xc($s0) -/* C47B58 80240F78 08090417 */ j .L8024105C -/* C47B5C 80240F7C AE620070 */ sw $v0, 0x70($s3) -.L80240F80: -/* C47B60 80240F80 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C47B64 80240F84 8E4200D0 */ lw $v0, 0xd0($s2) -/* C47B68 80240F88 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C47B6C 80240F8C C4440000 */ lwc1 $f4, ($v0) -/* C47B70 80240F90 46802120 */ cvt.s.w $f4, $f4 -/* C47B74 80240F94 44062000 */ mfc1 $a2, $f4 -/* C47B78 80240F98 C4440008 */ lwc1 $f4, 8($v0) -/* C47B7C 80240F9C 46802120 */ cvt.s.w $f4, $f4 -/* C47B80 80240FA0 44072000 */ mfc1 $a3, $f4 -/* C47B84 80240FA4 0C00A7B5 */ jal dist2D -/* C47B88 80240FA8 00000000 */ nop -/* C47B8C 80240FAC C6020018 */ lwc1 $f2, 0x18($s0) -/* C47B90 80240FB0 4602003E */ c.le.s $f0, $f2 -/* C47B94 80240FB4 00000000 */ nop -/* C47B98 80240FB8 4500000B */ bc1f .L80240FE8 -/* C47B9C 80240FBC 00000000 */ nop -/* C47BA0 80240FC0 8E4200CC */ lw $v0, 0xcc($s2) -/* C47BA4 80240FC4 8C430000 */ lw $v1, ($v0) -/* C47BA8 80240FC8 2402000F */ addiu $v0, $zero, 0xf -/* C47BAC 80240FCC A602008E */ sh $v0, 0x8e($s0) -/* C47BB0 80240FD0 24020032 */ addiu $v0, $zero, 0x32 -/* C47BB4 80240FD4 AE030028 */ sw $v1, 0x28($s0) -/* C47BB8 80240FD8 AE420088 */ sw $v0, 0x88($s2) -/* C47BBC 80240FDC 24020003 */ addiu $v0, $zero, 3 -/* C47BC0 80240FE0 08090417 */ j .L8024105C -/* C47BC4 80240FE4 AE620070 */ sw $v0, 0x70($s3) -.L80240FE8: -/* C47BC8 80240FE8 8602008C */ lh $v0, 0x8c($s0) -/* C47BCC 80240FEC 1440001B */ bnez $v0, .L8024105C -/* C47BD0 80240FF0 0200202D */ daddu $a0, $s0, $zero -/* C47BD4 80240FF4 27A60018 */ addiu $a2, $sp, 0x18 -/* C47BD8 80240FF8 3C0540A0 */ lui $a1, 0x40a0 -/* C47BDC 80240FFC C600000C */ lwc1 $f0, 0xc($s0) -/* C47BE0 80241000 0000382D */ daddu $a3, $zero, $zero -/* C47BE4 80241004 E7A00018 */ swc1 $f0, 0x18($sp) -/* C47BE8 80241008 AFA00010 */ sw $zero, 0x10($sp) -/* C47BEC 8024100C 0C0129E1 */ jal func_8004A784 -/* C47BF0 80241010 AFA00014 */ sw $zero, 0x14($sp) -/* C47BF4 80241014 C7A00018 */ lwc1 $f0, 0x18($sp) -/* C47BF8 80241018 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C47BFC 8024101C E600000C */ swc1 $f0, 0xc($s0) -/* C47C00 80241020 8E4200D0 */ lw $v0, 0xd0($s2) -/* C47C04 80241024 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C47C08 80241028 C4440000 */ lwc1 $f4, ($v0) -/* C47C0C 8024102C 46802120 */ cvt.s.w $f4, $f4 -/* C47C10 80241030 44062000 */ mfc1 $a2, $f4 -/* C47C14 80241034 C4440008 */ lwc1 $f4, 8($v0) -/* C47C18 80241038 46802120 */ cvt.s.w $f4, $f4 -/* C47C1C 8024103C 44072000 */ mfc1 $a3, $f4 -/* C47C20 80241040 0C00A720 */ jal atan2 -/* C47C24 80241044 00000000 */ nop -/* C47C28 80241048 8E050018 */ lw $a1, 0x18($s0) -/* C47C2C 8024104C 44060000 */ mfc1 $a2, $f0 -/* C47C30 80241050 0200202D */ daddu $a0, $s0, $zero -/* C47C34 80241054 0C00EA95 */ jal npc_move_heading -/* C47C38 80241058 AC86000C */ sw $a2, 0xc($a0) -.L8024105C: -/* C47C3C 8024105C 8FBF0030 */ lw $ra, 0x30($sp) -/* C47C40 80241060 8FB3002C */ lw $s3, 0x2c($sp) -/* C47C44 80241064 8FB20028 */ lw $s2, 0x28($sp) -/* C47C48 80241068 8FB10024 */ lw $s1, 0x24($sp) -/* C47C4C 8024106C 8FB00020 */ lw $s0, 0x20($sp) -/* C47C50 80241070 03E00008 */ jr $ra -/* C47C54 80241074 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_80241078_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_80241078_C46BE0.s deleted file mode 100644 index fe93740b61..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_80241078_C46BE0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241078_C47C58 -/* C47C58 80241078 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C47C5C 8024107C AFB00010 */ sw $s0, 0x10($sp) -/* C47C60 80241080 0080802D */ daddu $s0, $a0, $zero -/* C47C64 80241084 AFBF0014 */ sw $ra, 0x14($sp) -/* C47C68 80241088 8E020148 */ lw $v0, 0x148($s0) -/* C47C6C 8024108C 0C00EABB */ jal get_npc_unsafe -/* C47C70 80241090 84440008 */ lh $a0, 8($v0) -/* C47C74 80241094 0040182D */ daddu $v1, $v0, $zero -/* C47C78 80241098 8462008C */ lh $v0, 0x8c($v1) -/* C47C7C 8024109C 14400009 */ bnez $v0, .L802410C4 -/* C47C80 802410A0 00000000 */ nop -/* C47C84 802410A4 9462008E */ lhu $v0, 0x8e($v1) -/* C47C88 802410A8 2442FFFF */ addiu $v0, $v0, -1 -/* C47C8C 802410AC A462008E */ sh $v0, 0x8e($v1) -/* C47C90 802410B0 00021400 */ sll $v0, $v0, 0x10 -/* C47C94 802410B4 1C400003 */ bgtz $v0, .L802410C4 -/* C47C98 802410B8 00000000 */ nop -/* C47C9C 802410BC A460008E */ sh $zero, 0x8e($v1) -/* C47CA0 802410C0 AE000070 */ sw $zero, 0x70($s0) -.L802410C4: -/* C47CA4 802410C4 8FBF0014 */ lw $ra, 0x14($sp) -/* C47CA8 802410C8 8FB00010 */ lw $s0, 0x10($sp) -/* C47CAC 802410CC 03E00008 */ jr $ra -/* C47CB0 802410D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_802410D4_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_802410D4_C46BE0.s deleted file mode 100644 index d5de70e4a1..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_802410D4_C46BE0.s +++ /dev/null @@ -1,223 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410D4_C47CB4 -/* C47CB4 802410D4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C47CB8 802410D8 AFB20038 */ sw $s2, 0x38($sp) -/* C47CBC 802410DC 0080902D */ daddu $s2, $a0, $zero -/* C47CC0 802410E0 AFBF0048 */ sw $ra, 0x48($sp) -/* C47CC4 802410E4 AFB50044 */ sw $s5, 0x44($sp) -/* C47CC8 802410E8 AFB40040 */ sw $s4, 0x40($sp) -/* C47CCC 802410EC AFB3003C */ sw $s3, 0x3c($sp) -/* C47CD0 802410F0 AFB10034 */ sw $s1, 0x34($sp) -/* C47CD4 802410F4 AFB00030 */ sw $s0, 0x30($sp) -/* C47CD8 802410F8 8E510148 */ lw $s1, 0x148($s2) -/* C47CDC 802410FC 86240008 */ lh $a0, 8($s1) -/* C47CE0 80241100 0C00EABB */ jal get_npc_unsafe -/* C47CE4 80241104 00A0802D */ daddu $s0, $a1, $zero -/* C47CE8 80241108 8E43000C */ lw $v1, 0xc($s2) -/* C47CEC 8024110C 0240202D */ daddu $a0, $s2, $zero -/* C47CF0 80241110 8C650000 */ lw $a1, ($v1) -/* C47CF4 80241114 0C0B1EAF */ jal get_variable -/* C47CF8 80241118 0040A02D */ daddu $s4, $v0, $zero -/* C47CFC 8024111C AFA00010 */ sw $zero, 0x10($sp) -/* C47D00 80241120 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47D04 80241124 8C630030 */ lw $v1, 0x30($v1) -/* C47D08 80241128 AFA30014 */ sw $v1, 0x14($sp) -/* C47D0C 8024112C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47D10 80241130 8C63001C */ lw $v1, 0x1c($v1) -/* C47D14 80241134 AFA30018 */ sw $v1, 0x18($sp) -/* C47D18 80241138 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47D1C 8024113C 8C630024 */ lw $v1, 0x24($v1) -/* C47D20 80241140 AFA3001C */ sw $v1, 0x1c($sp) -/* C47D24 80241144 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47D28 80241148 8C630028 */ lw $v1, 0x28($v1) -/* C47D2C 8024114C 27B50010 */ addiu $s5, $sp, 0x10 -/* C47D30 80241150 AFA30020 */ sw $v1, 0x20($sp) -/* C47D34 80241154 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47D38 80241158 3C014220 */ lui $at, 0x4220 -/* C47D3C 8024115C 44810000 */ mtc1 $at, $f0 -/* C47D40 80241160 8C63002C */ lw $v1, 0x2c($v1) -/* C47D44 80241164 0040982D */ daddu $s3, $v0, $zero -/* C47D48 80241168 E7A00028 */ swc1 $f0, 0x28($sp) -/* C47D4C 8024116C A7A0002C */ sh $zero, 0x2c($sp) -/* C47D50 80241170 16000005 */ bnez $s0, .L80241188 -/* C47D54 80241174 AFA30024 */ sw $v1, 0x24($sp) -/* C47D58 80241178 8E2200B0 */ lw $v0, 0xb0($s1) -/* C47D5C 8024117C 30420004 */ andi $v0, $v0, 4 -/* C47D60 80241180 10400027 */ beqz $v0, .L80241220 -/* C47D64 80241184 00000000 */ nop -.L80241188: -/* C47D68 80241188 2402001E */ addiu $v0, $zero, 0x1e -/* C47D6C 8024118C 2404F7FF */ addiu $a0, $zero, -0x801 -/* C47D70 80241190 AE400070 */ sw $zero, 0x70($s2) -/* C47D74 80241194 A682008E */ sh $v0, 0x8e($s4) -/* C47D78 80241198 8E2300CC */ lw $v1, 0xcc($s1) -/* C47D7C 8024119C 8E820000 */ lw $v0, ($s4) -/* C47D80 802411A0 8C630028 */ lw $v1, 0x28($v1) -/* C47D84 802411A4 00441024 */ and $v0, $v0, $a0 -/* C47D88 802411A8 AE820000 */ sw $v0, ($s4) -/* C47D8C 802411AC AE830028 */ sw $v1, 0x28($s4) -/* C47D90 802411B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C47D94 802411B4 AE20006C */ sw $zero, 0x6c($s1) -/* C47D98 802411B8 8C420034 */ lw $v0, 0x34($v0) -/* C47D9C 802411BC 14400006 */ bnez $v0, .L802411D8 -/* C47DA0 802411C0 2403FDFF */ addiu $v1, $zero, -0x201 -/* C47DA4 802411C4 8E820000 */ lw $v0, ($s4) -/* C47DA8 802411C8 2403FFF7 */ addiu $v1, $zero, -9 -/* C47DAC 802411CC 34420200 */ ori $v0, $v0, 0x200 -/* C47DB0 802411D0 08090479 */ j .L802411E4 -/* C47DB4 802411D4 00431024 */ and $v0, $v0, $v1 -.L802411D8: -/* C47DB8 802411D8 8E820000 */ lw $v0, ($s4) -/* C47DBC 802411DC 00431024 */ and $v0, $v0, $v1 -/* C47DC0 802411E0 34420008 */ ori $v0, $v0, 8 -.L802411E4: -/* C47DC4 802411E4 AE820000 */ sw $v0, ($s4) -/* C47DC8 802411E8 8E2200B0 */ lw $v0, 0xb0($s1) -/* C47DCC 802411EC 30420004 */ andi $v0, $v0, 4 -/* C47DD0 802411F0 10400007 */ beqz $v0, .L80241210 -/* C47DD4 802411F4 24020063 */ addiu $v0, $zero, 0x63 -/* C47DD8 802411F8 AE420070 */ sw $v0, 0x70($s2) -/* C47DDC 802411FC 24020028 */ addiu $v0, $zero, 0x28 -/* C47DE0 80241200 AE420074 */ sw $v0, 0x74($s2) -/* C47DE4 80241204 8E2200CC */ lw $v0, 0xcc($s1) -/* C47DE8 80241208 8C420000 */ lw $v0, ($v0) -/* C47DEC 8024120C AE820028 */ sw $v0, 0x28($s4) -.L80241210: -/* C47DF0 80241210 8E2200B0 */ lw $v0, 0xb0($s1) -/* C47DF4 80241214 2403FFFB */ addiu $v1, $zero, -5 -/* C47DF8 80241218 00431024 */ and $v0, $v0, $v1 -/* C47DFC 8024121C AE2200B0 */ sw $v0, 0xb0($s1) -.L80241220: -/* C47E00 80241220 8E420070 */ lw $v0, 0x70($s2) -/* C47E04 80241224 2442FFF6 */ addiu $v0, $v0, -0xa -/* C47E08 80241228 2C420014 */ sltiu $v0, $v0, 0x14 -/* C47E0C 8024122C 10400009 */ beqz $v0, .L80241254 -/* C47E10 80241230 00000000 */ nop -/* C47E14 80241234 8E22006C */ lw $v0, 0x6c($s1) -/* C47E18 80241238 14400006 */ bnez $v0, .L80241254 -/* C47E1C 8024123C 00000000 */ nop -/* C47E20 80241240 0C090082 */ jal func_80240208 -/* C47E24 80241244 0240202D */ daddu $a0, $s2, $zero -/* C47E28 80241248 10400002 */ beqz $v0, .L80241254 -/* C47E2C 8024124C 2402001E */ addiu $v0, $zero, 0x1e -/* C47E30 80241250 AE420070 */ sw $v0, 0x70($s2) -.L80241254: -/* C47E34 80241254 8E430070 */ lw $v1, 0x70($s2) -/* C47E38 80241258 2C620064 */ sltiu $v0, $v1, 0x64 -/* C47E3C 8024125C 10400067 */ beqz $v0, .L802413FC -/* C47E40 80241260 00031080 */ sll $v0, $v1, 2 -/* C47E44 80241264 3C018024 */ lui $at, 0x8024 -/* C47E48 80241268 00220821 */ addu $at, $at, $v0 -/* C47E4C 8024126C 8C225530 */ lw $v0, 0x5530($at) -/* C47E50 80241270 00400008 */ jr $v0 -/* C47E54 80241274 00000000 */ nop -/* C47E58 80241278 0240202D */ daddu $a0, $s2, $zero -/* C47E5C 8024127C 0260282D */ daddu $a1, $s3, $zero -/* C47E60 80241280 0C090234 */ jal func_802408D0 -/* C47E64 80241284 02A0302D */ daddu $a2, $s5, $zero -/* C47E68 80241288 080904FF */ j .L802413FC -/* C47E6C 8024128C 00000000 */ nop -/* C47E70 80241290 0240202D */ daddu $a0, $s2, $zero -/* C47E74 80241294 0260282D */ daddu $a1, $s3, $zero -/* C47E78 80241298 0C090256 */ jal func_80240958 -/* C47E7C 8024129C 02A0302D */ daddu $a2, $s5, $zero -/* C47E80 802412A0 080904FF */ j .L802413FC -/* C47E84 802412A4 00000000 */ nop -/* C47E88 802412A8 0240202D */ daddu $a0, $s2, $zero -/* C47E8C 802412AC 0260282D */ daddu $a1, $s3, $zero -/* C47E90 802412B0 0C090304 */ jal func_80240C10 -/* C47E94 802412B4 02A0302D */ daddu $a2, $s5, $zero -/* C47E98 802412B8 080904FF */ j .L802413FC -/* C47E9C 802412BC 00000000 */ nop -/* C47EA0 802412C0 0240202D */ daddu $a0, $s2, $zero -/* C47EA4 802412C4 0260282D */ daddu $a1, $s3, $zero -/* C47EA8 802412C8 0C09031D */ jal func_80240C74 -/* C47EAC 802412CC 02A0302D */ daddu $a2, $s5, $zero -/* C47EB0 802412D0 080904FF */ j .L802413FC -/* C47EB4 802412D4 00000000 */ nop -/* C47EB8 802412D8 0240202D */ daddu $a0, $s2, $zero -/* C47EBC 802412DC 0260282D */ daddu $a1, $s3, $zero -/* C47EC0 802412E0 0C090347 */ jal func_80240D1C -/* C47EC4 802412E4 02A0302D */ daddu $a2, $s5, $zero -/* C47EC8 802412E8 080904FF */ j .L802413FC -/* C47ECC 802412EC 00000000 */ nop -/* C47ED0 802412F0 0240202D */ daddu $a0, $s2, $zero -/* C47ED4 802412F4 0260282D */ daddu $a1, $s3, $zero -/* C47ED8 802412F8 0C0127DF */ jal func_80049F7C -/* C47EDC 802412FC 02A0302D */ daddu $a2, $s5, $zero -/* C47EE0 80241300 8E430070 */ lw $v1, 0x70($s2) -/* C47EE4 80241304 2402000D */ addiu $v0, $zero, 0xd -/* C47EE8 80241308 1462003C */ bne $v1, $v0, .L802413FC -/* C47EEC 8024130C 00000000 */ nop -/* C47EF0 80241310 0240202D */ daddu $a0, $s2, $zero -/* C47EF4 80241314 0260282D */ daddu $a1, $s3, $zero -/* C47EF8 80241318 0C012849 */ jal func_8004A124 -/* C47EFC 8024131C 02A0302D */ daddu $a2, $s5, $zero -/* C47F00 80241320 080904FF */ j .L802413FC -/* C47F04 80241324 00000000 */ nop -/* C47F08 80241328 0240202D */ daddu $a0, $s2, $zero -/* C47F0C 8024132C 0260282D */ daddu $a1, $s3, $zero -/* C47F10 80241330 0C0128FA */ jal func_8004A3E8 -/* C47F14 80241334 02A0302D */ daddu $a2, $s5, $zero -/* C47F18 80241338 2402000F */ addiu $v0, $zero, 0xf -/* C47F1C 8024133C A682008E */ sh $v0, 0x8e($s4) -/* C47F20 80241340 24020028 */ addiu $v0, $zero, 0x28 -/* C47F24 80241344 AE220088 */ sw $v0, 0x88($s1) -/* C47F28 80241348 24020003 */ addiu $v0, $zero, 3 -/* C47F2C 8024134C 080904FF */ j .L802413FC -/* C47F30 80241350 AE420070 */ sw $v0, 0x70($s2) -/* C47F34 80241354 0C090000 */ jal func_80240000 -/* C47F38 80241358 0240202D */ daddu $a0, $s2, $zero -/* C47F3C 8024135C 8E430070 */ lw $v1, 0x70($s2) -/* C47F40 80241360 2402001F */ addiu $v0, $zero, 0x1f -/* C47F44 80241364 14620025 */ bne $v1, $v0, .L802413FC -/* C47F48 80241368 00000000 */ nop -/* C47F4C 8024136C 0C09001B */ jal func_8024006C -/* C47F50 80241370 0240202D */ daddu $a0, $s2, $zero -/* C47F54 80241374 8E430070 */ lw $v1, 0x70($s2) -/* C47F58 80241378 24020020 */ addiu $v0, $zero, 0x20 -/* C47F5C 8024137C 1462001F */ bne $v1, $v0, .L802413FC -/* C47F60 80241380 00000000 */ nop -/* C47F64 80241384 0C090037 */ jal func_802400DC -/* C47F68 80241388 0240202D */ daddu $a0, $s2, $zero -/* C47F6C 8024138C 080904FF */ j .L802413FC -/* C47F70 80241390 00000000 */ nop -/* C47F74 80241394 0C09006D */ jal func_802401B4 -/* C47F78 80241398 0240202D */ daddu $a0, $s2, $zero -/* C47F7C 8024139C 080904FF */ j .L802413FC -/* C47F80 802413A0 00000000 */ nop -/* C47F84 802413A4 0240202D */ daddu $a0, $s2, $zero -/* C47F88 802413A8 0260282D */ daddu $a1, $s3, $zero -/* C47F8C 802413AC 0C090395 */ jal func_80240E54 -/* C47F90 802413B0 02A0302D */ daddu $a2, $s5, $zero -/* C47F94 802413B4 8E430070 */ lw $v1, 0x70($s2) -/* C47F98 802413B8 24020029 */ addiu $v0, $zero, 0x29 -/* C47F9C 802413BC 1462000F */ bne $v1, $v0, .L802413FC -/* C47FA0 802413C0 00000000 */ nop -/* C47FA4 802413C4 0240202D */ daddu $a0, $s2, $zero -/* C47FA8 802413C8 0260282D */ daddu $a1, $s3, $zero -/* C47FAC 802413CC 0C0903C0 */ jal func_80240F00 -/* C47FB0 802413D0 02A0302D */ daddu $a2, $s5, $zero -/* C47FB4 802413D4 080904FF */ j .L802413FC -/* C47FB8 802413D8 00000000 */ nop -/* C47FBC 802413DC 0240202D */ daddu $a0, $s2, $zero -/* C47FC0 802413E0 0260282D */ daddu $a1, $s3, $zero -/* C47FC4 802413E4 0C09041E */ jal func_80241078 -/* C47FC8 802413E8 02A0302D */ daddu $a2, $s5, $zero -/* C47FCC 802413EC 080904FF */ j .L802413FC -/* C47FD0 802413F0 00000000 */ nop -/* C47FD4 802413F4 0C0129CF */ jal func_8004A73C -/* C47FD8 802413F8 0240202D */ daddu $a0, $s2, $zero -.L802413FC: -/* C47FDC 802413FC 8FBF0048 */ lw $ra, 0x48($sp) -/* C47FE0 80241400 8FB50044 */ lw $s5, 0x44($sp) -/* C47FE4 80241404 8FB40040 */ lw $s4, 0x40($sp) -/* C47FE8 80241408 8FB3003C */ lw $s3, 0x3c($sp) -/* C47FEC 8024140C 8FB20038 */ lw $s2, 0x38($sp) -/* C47FF0 80241410 8FB10034 */ lw $s1, 0x34($sp) -/* C47FF4 80241414 8FB00030 */ lw $s0, 0x30($sp) -/* C47FF8 80241418 0000102D */ daddu $v0, $zero, $zero -/* C47FFC 8024141C 03E00008 */ jr $ra -/* C48000 80241420 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_80241424_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_80241424_C46BE0.s deleted file mode 100644 index 534306964b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_80241424_C46BE0.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241424_C48004 -/* C48004 80241424 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C48008 80241428 AFB3002C */ sw $s3, 0x2c($sp) -/* C4800C 8024142C 0080982D */ daddu $s3, $a0, $zero -/* C48010 80241430 AFBF0030 */ sw $ra, 0x30($sp) -/* C48014 80241434 AFB20028 */ sw $s2, 0x28($sp) -/* C48018 80241438 AFB10024 */ sw $s1, 0x24($sp) -/* C4801C 8024143C AFB00020 */ sw $s0, 0x20($sp) -/* C48020 80241440 8E710148 */ lw $s1, 0x148($s3) -/* C48024 80241444 86240008 */ lh $a0, 8($s1) -/* C48028 80241448 0C00EABB */ jal get_npc_unsafe -/* C4802C 8024144C 00A0902D */ daddu $s2, $a1, $zero -/* C48030 80241450 8E440004 */ lw $a0, 4($s2) -/* C48034 80241454 0040802D */ daddu $s0, $v0, $zero -/* C48038 80241458 00041FC2 */ srl $v1, $a0, 0x1f -/* C4803C 8024145C 00832021 */ addu $a0, $a0, $v1 -/* C48040 80241460 00042043 */ sra $a0, $a0, 1 -/* C48044 80241464 0C00A67F */ jal rand_int -/* C48048 80241468 24840001 */ addiu $a0, $a0, 1 -/* C4804C 8024146C 8E430004 */ lw $v1, 4($s2) -/* C48050 80241470 000327C2 */ srl $a0, $v1, 0x1f -/* C48054 80241474 00641821 */ addu $v1, $v1, $a0 -/* C48058 80241478 00031843 */ sra $v1, $v1, 1 -/* C4805C 8024147C 00621821 */ addu $v1, $v1, $v0 -/* C48060 80241480 A603008E */ sh $v1, 0x8e($s0) -/* C48064 80241484 8E2300D0 */ lw $v1, 0xd0($s1) -/* C48068 80241488 C6000040 */ lwc1 $f0, 0x40($s0) -/* C4806C 8024148C C4640000 */ lwc1 $f4, ($v1) -/* C48070 80241490 46802120 */ cvt.s.w $f4, $f4 -/* C48074 80241494 C4620008 */ lwc1 $f2, 8($v1) -/* C48078 80241498 468010A0 */ cvt.s.w $f2, $f2 -/* C4807C 8024149C E7A00010 */ swc1 $f0, 0x10($sp) -/* C48080 802414A0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C48084 802414A4 44061000 */ mfc1 $a2, $f2 -/* C48088 802414A8 C440000C */ lwc1 $f0, 0xc($v0) -/* C4808C 802414AC 46800020 */ cvt.s.w $f0, $f0 -/* C48090 802414B0 E7A00014 */ swc1 $f0, 0x14($sp) -/* C48094 802414B4 8E2200D0 */ lw $v0, 0xd0($s1) -/* C48098 802414B8 44052000 */ mfc1 $a1, $f4 -/* C4809C 802414BC C4400010 */ lwc1 $f0, 0x10($v0) -/* C480A0 802414C0 46800020 */ cvt.s.w $f0, $f0 -/* C480A4 802414C4 E7A00018 */ swc1 $f0, 0x18($sp) -/* C480A8 802414C8 8C640018 */ lw $a0, 0x18($v1) -/* C480AC 802414CC 0C0123F5 */ jal is_point_within_region -/* C480B0 802414D0 8E070038 */ lw $a3, 0x38($s0) -/* C480B4 802414D4 1040000E */ beqz $v0, .L80241510 -/* C480B8 802414D8 00000000 */ nop -/* C480BC 802414DC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C480C0 802414E0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C480C4 802414E4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C480C8 802414E8 C4460000 */ lwc1 $f6, ($v0) -/* C480CC 802414EC 468031A0 */ cvt.s.w $f6, $f6 -/* C480D0 802414F0 44063000 */ mfc1 $a2, $f6 -/* C480D4 802414F4 C4460008 */ lwc1 $f6, 8($v0) -/* C480D8 802414F8 468031A0 */ cvt.s.w $f6, $f6 -/* C480DC 802414FC 44073000 */ mfc1 $a3, $f6 -/* C480E0 80241500 0C00A720 */ jal atan2 -/* C480E4 80241504 00000000 */ nop -/* C480E8 80241508 08090550 */ j .L80241540 -/* C480EC 8024150C E600000C */ swc1 $f0, 0xc($s0) -.L80241510: -/* C480F0 80241510 0C00A67F */ jal rand_int -/* C480F4 80241514 2404003C */ addiu $a0, $zero, 0x3c -/* C480F8 80241518 C60C000C */ lwc1 $f12, 0xc($s0) -/* C480FC 8024151C 44820000 */ mtc1 $v0, $f0 -/* C48100 80241520 00000000 */ nop -/* C48104 80241524 46800020 */ cvt.s.w $f0, $f0 -/* C48108 80241528 46006300 */ add.s $f12, $f12, $f0 -/* C4810C 8024152C 3C0141F0 */ lui $at, 0x41f0 -/* C48110 80241530 44810000 */ mtc1 $at, $f0 -/* C48114 80241534 0C00A6C9 */ jal clamp_angle -/* C48118 80241538 46006301 */ sub.s $f12, $f12, $f0 -/* C4811C 8024153C E600000C */ swc1 $f0, 0xc($s0) -.L80241540: -/* C48120 80241540 8E2200CC */ lw $v0, 0xcc($s1) -/* C48124 80241544 8C420004 */ lw $v0, 4($v0) -/* C48128 80241548 AE020028 */ sw $v0, 0x28($s0) -/* C4812C 8024154C AE600074 */ sw $zero, 0x74($s3) -/* C48130 80241550 8E2200D0 */ lw $v0, 0xd0($s1) -/* C48134 80241554 8C420014 */ lw $v0, 0x14($v0) -/* C48138 80241558 04410004 */ bgez $v0, .L8024156C -/* C4813C 8024155C 00000000 */ nop -/* C48140 80241560 C6400000 */ lwc1 $f0, ($s2) -/* C48144 80241564 08090563 */ j .L8024158C -/* C48148 80241568 E6000018 */ swc1 $f0, 0x18($s0) -.L8024156C: -/* C4814C 8024156C 3C018024 */ lui $at, 0x8024 -/* C48150 80241570 D42256C0 */ ldc1 $f2, 0x56c0($at) -/* C48154 80241574 44820000 */ mtc1 $v0, $f0 -/* C48158 80241578 00000000 */ nop -/* C4815C 8024157C 46800021 */ cvt.d.w $f0, $f0 -/* C48160 80241580 46220003 */ div.d $f0, $f0, $f2 -/* C48164 80241584 46200020 */ cvt.s.d $f0, $f0 -/* C48168 80241588 E6000018 */ swc1 $f0, 0x18($s0) -.L8024158C: -/* C4816C 8024158C C600003C */ lwc1 $f0, 0x3c($s0) -/* C48170 80241590 3C014059 */ lui $at, 0x4059 -/* C48174 80241594 44811800 */ mtc1 $at, $f3 -/* C48178 80241598 44801000 */ mtc1 $zero, $f2 -/* C4817C 8024159C 46000021 */ cvt.d.s $f0, $f0 -/* C48180 802415A0 46220002 */ mul.d $f0, $f0, $f2 -/* C48184 802415A4 00000000 */ nop -/* C48188 802415A8 24020001 */ addiu $v0, $zero, 1 -/* C4818C 802415AC 4620018D */ trunc.w.d $f6, $f0 -/* C48190 802415B0 E626007C */ swc1 $f6, 0x7c($s1) -/* C48194 802415B4 AE620070 */ sw $v0, 0x70($s3) -/* C48198 802415B8 8FBF0030 */ lw $ra, 0x30($sp) -/* C4819C 802415BC 8FB3002C */ lw $s3, 0x2c($sp) -/* C481A0 802415C0 8FB20028 */ lw $s2, 0x28($sp) -/* C481A4 802415C4 8FB10024 */ lw $s1, 0x24($sp) -/* C481A8 802415C8 8FB00020 */ lw $s0, 0x20($sp) -/* C481AC 802415CC 03E00008 */ jr $ra -/* C481B0 802415D0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_80241CBC_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_80241CBC_C46BE0.s deleted file mode 100644 index 5f6164e7d5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_80241CBC_C46BE0.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CBC_C4889C -/* C4889C 80241CBC 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C488A0 80241CC0 AFB3004C */ sw $s3, 0x4c($sp) -/* C488A4 80241CC4 0080982D */ daddu $s3, $a0, $zero -/* C488A8 80241CC8 AFBF0054 */ sw $ra, 0x54($sp) -/* C488AC 80241CCC AFB40050 */ sw $s4, 0x50($sp) -/* C488B0 80241CD0 AFB20048 */ sw $s2, 0x48($sp) -/* C488B4 80241CD4 AFB10044 */ sw $s1, 0x44($sp) -/* C488B8 80241CD8 AFB00040 */ sw $s0, 0x40($sp) -/* C488BC 80241CDC F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C488C0 80241CE0 F7B80068 */ sdc1 $f24, 0x68($sp) -/* C488C4 80241CE4 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C488C8 80241CE8 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C488CC 80241CEC 8E710148 */ lw $s1, 0x148($s3) -/* C488D0 80241CF0 00A0902D */ daddu $s2, $a1, $zero -/* C488D4 80241CF4 86240008 */ lh $a0, 8($s1) -/* C488D8 80241CF8 0C00EABB */ jal get_npc_unsafe -/* C488DC 80241CFC 00C0A02D */ daddu $s4, $a2, $zero -/* C488E0 80241D00 0040802D */ daddu $s0, $v0, $zero -/* C488E4 80241D04 C6200078 */ lwc1 $f0, 0x78($s1) -/* C488E8 80241D08 46800020 */ cvt.s.w $f0, $f0 -/* C488EC 80241D0C 46000021 */ cvt.d.s $f0, $f0 -/* C488F0 80241D10 3C014059 */ lui $at, 0x4059 -/* C488F4 80241D14 44811800 */ mtc1 $at, $f3 -/* C488F8 80241D18 44801000 */ mtc1 $zero, $f2 -/* C488FC 80241D1C 8602008E */ lh $v0, 0x8e($s0) -/* C48900 80241D20 9603008E */ lhu $v1, 0x8e($s0) -/* C48904 80241D24 46220003 */ div.d $f0, $f0, $f2 -/* C48908 80241D28 46200620 */ cvt.s.d $f24, $f0 -/* C4890C 80241D2C C6200088 */ lwc1 $f0, 0x88($s1) -/* C48910 80241D30 46800020 */ cvt.s.w $f0, $f0 -/* C48914 80241D34 46000021 */ cvt.d.s $f0, $f0 -/* C48918 80241D38 46220003 */ div.d $f0, $f0, $f2 -/* C4891C 80241D3C 46200020 */ cvt.s.d $f0, $f0 -/* C48920 80241D40 18400003 */ blez $v0, .L80241D50 -/* C48924 80241D44 4600C680 */ add.s $f26, $f24, $f0 -/* C48928 80241D48 2462FFFF */ addiu $v0, $v1, -1 -/* C4892C 80241D4C A602008E */ sh $v0, 0x8e($s0) -.L80241D50: -/* C48930 80241D50 8E220070 */ lw $v0, 0x70($s1) -/* C48934 80241D54 18400034 */ blez $v0, .L80241E28 -/* C48938 80241D58 00000000 */ nop -/* C4893C 80241D5C C62C0074 */ lwc1 $f12, 0x74($s1) -/* C48940 80241D60 46806320 */ cvt.s.w $f12, $f12 -/* C48944 80241D64 44820000 */ mtc1 $v0, $f0 -/* C48948 80241D68 00000000 */ nop -/* C4894C 80241D6C 46800020 */ cvt.s.w $f0, $f0 -/* C48950 80241D70 46000021 */ cvt.d.s $f0, $f0 -/* C48954 80241D74 46220003 */ div.d $f0, $f0, $f2 -/* C48958 80241D78 0C00A8BB */ jal sin_deg -/* C4895C 80241D7C 462005A0 */ cvt.s.d $f22, $f0 -/* C48960 80241D80 8E020000 */ lw $v0, ($s0) -/* C48964 80241D84 30420008 */ andi $v0, $v0, 8 -/* C48968 80241D88 10400003 */ beqz $v0, .L80241D98 -/* C4896C 80241D8C 46000506 */ mov.s $f20, $f0 -/* C48970 80241D90 08090776 */ j .L80241DD8 -/* C48974 80241D94 0000102D */ daddu $v0, $zero, $zero -.L80241D98: -/* C48978 80241D98 27A50028 */ addiu $a1, $sp, 0x28 -/* C4897C 80241D9C 27A6002C */ addiu $a2, $sp, 0x2c -/* C48980 80241DA0 C6000038 */ lwc1 $f0, 0x38($s0) -/* C48984 80241DA4 C602003C */ lwc1 $f2, 0x3c($s0) -/* C48988 80241DA8 C6040040 */ lwc1 $f4, 0x40($s0) -/* C4898C 80241DAC 3C01447A */ lui $at, 0x447a -/* C48990 80241DB0 44813000 */ mtc1 $at, $f6 -/* C48994 80241DB4 27A20034 */ addiu $v0, $sp, 0x34 -/* C48998 80241DB8 E7A00028 */ swc1 $f0, 0x28($sp) -/* C4899C 80241DBC E7A2002C */ swc1 $f2, 0x2c($sp) -/* C489A0 80241DC0 E7A40030 */ swc1 $f4, 0x30($sp) -/* C489A4 80241DC4 E7A60034 */ swc1 $f6, 0x34($sp) -/* C489A8 80241DC8 AFA20010 */ sw $v0, 0x10($sp) -/* C489AC 80241DCC 8E040080 */ lw $a0, 0x80($s0) -/* C489B0 80241DD0 0C0372DF */ jal func_800DCB7C -/* C489B4 80241DD4 27A70030 */ addiu $a3, $sp, 0x30 -.L80241DD8: -/* C489B8 80241DD8 10400007 */ beqz $v0, .L80241DF8 -/* C489BC 80241DDC 00000000 */ nop -/* C489C0 80241DE0 4616A082 */ mul.s $f2, $f20, $f22 -/* C489C4 80241DE4 00000000 */ nop -/* C489C8 80241DE8 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C489CC 80241DEC 46180000 */ add.s $f0, $f0, $f24 -/* C489D0 80241DF0 08090781 */ j .L80241E04 -/* C489D4 80241DF4 46020000 */ add.s $f0, $f0, $f2 -.L80241DF8: -/* C489D8 80241DF8 4616A002 */ mul.s $f0, $f20, $f22 -/* C489DC 80241DFC 00000000 */ nop -/* C489E0 80241E00 4600D000 */ add.s $f0, $f26, $f0 -.L80241E04: -/* C489E4 80241E04 E600003C */ swc1 $f0, 0x3c($s0) -/* C489E8 80241E08 8E220074 */ lw $v0, 0x74($s1) -/* C489EC 80241E0C 2442000A */ addiu $v0, $v0, 0xa -/* C489F0 80241E10 44826000 */ mtc1 $v0, $f12 -/* C489F4 80241E14 00000000 */ nop -/* C489F8 80241E18 0C00A6C9 */ jal clamp_angle -/* C489FC 80241E1C 46806320 */ cvt.s.w $f12, $f12 -/* C48A00 80241E20 4600020D */ trunc.w.s $f8, $f0 -/* C48A04 80241E24 E6280074 */ swc1 $f8, 0x74($s1) -.L80241E28: -/* C48A08 80241E28 8E220090 */ lw $v0, 0x90($s1) -/* C48A0C 80241E2C 1C400040 */ bgtz $v0, .L80241F30 -/* C48A10 80241E30 2442FFFF */ addiu $v0, $v0, -1 -/* C48A14 80241E34 860200A8 */ lh $v0, 0xa8($s0) -/* C48A18 80241E38 C600003C */ lwc1 $f0, 0x3c($s0) -/* C48A1C 80241E3C 44821000 */ mtc1 $v0, $f2 -/* C48A20 80241E40 00000000 */ nop -/* C48A24 80241E44 468010A0 */ cvt.s.w $f2, $f2 -/* C48A28 80241E48 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C48A2C 80241E4C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C48A30 80241E50 46020000 */ add.s $f0, $f0, $f2 -/* C48A34 80241E54 3C014024 */ lui $at, 0x4024 -/* C48A38 80241E58 44812800 */ mtc1 $at, $f5 -/* C48A3C 80241E5C 44802000 */ mtc1 $zero, $f4 -/* C48A40 80241E60 C442002C */ lwc1 $f2, 0x2c($v0) -/* C48A44 80241E64 46000021 */ cvt.d.s $f0, $f0 -/* C48A48 80241E68 46240000 */ add.d $f0, $f0, $f4 -/* C48A4C 80241E6C 460010A1 */ cvt.d.s $f2, $f2 -/* C48A50 80241E70 4620103C */ c.lt.d $f2, $f0 -/* C48A54 80241E74 00000000 */ nop -/* C48A58 80241E78 4500002E */ bc1f .L80241F34 -/* C48A5C 80241E7C 0280202D */ daddu $a0, $s4, $zero -/* C48A60 80241E80 24020001 */ addiu $v0, $zero, 1 -/* C48A64 80241E84 AFA20010 */ sw $v0, 0x10($sp) -/* C48A68 80241E88 8E460024 */ lw $a2, 0x24($s2) -/* C48A6C 80241E8C 8E470028 */ lw $a3, 0x28($s2) -/* C48A70 80241E90 0C01242D */ jal func_800490B4 -/* C48A74 80241E94 0220282D */ daddu $a1, $s1, $zero -/* C48A78 80241E98 10400026 */ beqz $v0, .L80241F34 -/* C48A7C 80241E9C 0000202D */ daddu $a0, $zero, $zero -/* C48A80 80241EA0 0200282D */ daddu $a1, $s0, $zero -/* C48A84 80241EA4 0000302D */ daddu $a2, $zero, $zero -/* C48A88 80241EA8 2412000C */ addiu $s2, $zero, 0xc -/* C48A8C 80241EAC 860300A8 */ lh $v1, 0xa8($s0) -/* C48A90 80241EB0 3C013F80 */ lui $at, 0x3f80 -/* C48A94 80241EB4 44810000 */ mtc1 $at, $f0 -/* C48A98 80241EB8 3C014000 */ lui $at, 0x4000 -/* C48A9C 80241EBC 44811000 */ mtc1 $at, $f2 -/* C48AA0 80241EC0 3C01C1A0 */ lui $at, 0xc1a0 -/* C48AA4 80241EC4 44812000 */ mtc1 $at, $f4 -/* C48AA8 80241EC8 44834000 */ mtc1 $v1, $f8 -/* C48AAC 80241ECC 00000000 */ nop -/* C48AB0 80241ED0 46804220 */ cvt.s.w $f8, $f8 -/* C48AB4 80241ED4 44074000 */ mfc1 $a3, $f8 -/* C48AB8 80241ED8 27A20038 */ addiu $v0, $sp, 0x38 -/* C48ABC 80241EDC AFB2001C */ sw $s2, 0x1c($sp) -/* C48AC0 80241EE0 AFA20020 */ sw $v0, 0x20($sp) -/* C48AC4 80241EE4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C48AC8 80241EE8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C48ACC 80241EEC 0C01BFA4 */ jal fx_emote -/* C48AD0 80241EF0 E7A40018 */ swc1 $f4, 0x18($sp) -/* C48AD4 80241EF4 0200202D */ daddu $a0, $s0, $zero -/* C48AD8 80241EF8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C48ADC 80241EFC C480003C */ lwc1 $f0, 0x3c($a0) -/* C48AE0 80241F00 3C060020 */ lui $a2, 0x20 -/* C48AE4 80241F04 0C012530 */ jal func_800494C0 -/* C48AE8 80241F08 E4800064 */ swc1 $f0, 0x64($a0) -/* C48AEC 80241F0C 8E220018 */ lw $v0, 0x18($s1) -/* C48AF0 80241F10 9442002A */ lhu $v0, 0x2a($v0) -/* C48AF4 80241F14 30420001 */ andi $v0, $v0, 1 -/* C48AF8 80241F18 10400003 */ beqz $v0, .L80241F28 -/* C48AFC 80241F1C 2402000A */ addiu $v0, $zero, 0xa -/* C48B00 80241F20 080907F4 */ j .L80241FD0 -/* C48B04 80241F24 AE620070 */ sw $v0, 0x70($s3) -.L80241F28: -/* C48B08 80241F28 080907F4 */ j .L80241FD0 -/* C48B0C 80241F2C AE720070 */ sw $s2, 0x70($s3) -.L80241F30: -/* C48B10 80241F30 AE220090 */ sw $v0, 0x90($s1) -.L80241F34: -/* C48B14 80241F34 8602008C */ lh $v0, 0x8c($s0) -/* C48B18 80241F38 14400025 */ bnez $v0, .L80241FD0 -/* C48B1C 80241F3C 00000000 */ nop -/* C48B20 80241F40 8602008E */ lh $v0, 0x8e($s0) -/* C48B24 80241F44 1C400022 */ bgtz $v0, .L80241FD0 -/* C48B28 80241F48 00000000 */ nop -/* C48B2C 80241F4C 8E620074 */ lw $v0, 0x74($s3) -/* C48B30 80241F50 2442FFFF */ addiu $v0, $v0, -1 -/* C48B34 80241F54 1840001D */ blez $v0, .L80241FCC -/* C48B38 80241F58 AE620074 */ sw $v0, 0x74($s3) -/* C48B3C 80241F5C 8E220018 */ lw $v0, 0x18($s1) -/* C48B40 80241F60 9442002A */ lhu $v0, 0x2a($v0) -/* C48B44 80241F64 30420010 */ andi $v0, $v0, 0x10 -/* C48B48 80241F68 14400007 */ bnez $v0, .L80241F88 -/* C48B4C 80241F6C 00000000 */ nop -/* C48B50 80241F70 C600000C */ lwc1 $f0, 0xc($s0) -/* C48B54 80241F74 3C014334 */ lui $at, 0x4334 -/* C48B58 80241F78 44816000 */ mtc1 $at, $f12 -/* C48B5C 80241F7C 0C00A6C9 */ jal clamp_angle -/* C48B60 80241F80 460C0300 */ add.s $f12, $f0, $f12 -/* C48B64 80241F84 E600000C */ swc1 $f0, 0xc($s0) -.L80241F88: -/* C48B68 80241F88 0C00A67F */ jal rand_int -/* C48B6C 80241F8C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C48B70 80241F90 3C032E8B */ lui $v1, 0x2e8b -/* C48B74 80241F94 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* C48B78 80241F98 00430018 */ mult $v0, $v1 -/* C48B7C 80241F9C 00021FC3 */ sra $v1, $v0, 0x1f -/* C48B80 80241FA0 00004010 */ mfhi $t0 -/* C48B84 80241FA4 00082043 */ sra $a0, $t0, 1 -/* C48B88 80241FA8 00832023 */ subu $a0, $a0, $v1 -/* C48B8C 80241FAC 00041840 */ sll $v1, $a0, 1 -/* C48B90 80241FB0 00641821 */ addu $v1, $v1, $a0 -/* C48B94 80241FB4 00031880 */ sll $v1, $v1, 2 -/* C48B98 80241FB8 00641823 */ subu $v1, $v1, $a0 -/* C48B9C 80241FBC 00431023 */ subu $v0, $v0, $v1 -/* C48BA0 80241FC0 24420005 */ addiu $v0, $v0, 5 -/* C48BA4 80241FC4 080907F4 */ j .L80241FD0 -/* C48BA8 80241FC8 A602008E */ sh $v0, 0x8e($s0) -.L80241FCC: -/* C48BAC 80241FCC AE600070 */ sw $zero, 0x70($s3) -.L80241FD0: -/* C48BB0 80241FD0 8FBF0054 */ lw $ra, 0x54($sp) -/* C48BB4 80241FD4 8FB40050 */ lw $s4, 0x50($sp) -/* C48BB8 80241FD8 8FB3004C */ lw $s3, 0x4c($sp) -/* C48BBC 80241FDC 8FB20048 */ lw $s2, 0x48($sp) -/* C48BC0 80241FE0 8FB10044 */ lw $s1, 0x44($sp) -/* C48BC4 80241FE4 8FB00040 */ lw $s0, 0x40($sp) -/* C48BC8 80241FE8 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C48BCC 80241FEC D7B80068 */ ldc1 $f24, 0x68($sp) -/* C48BD0 80241FF0 D7B60060 */ ldc1 $f22, 0x60($sp) -/* C48BD4 80241FF4 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C48BD8 80241FF8 03E00008 */ jr $ra -/* C48BDC 80241FFC 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_80242078_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_80242078_C46BE0.s deleted file mode 100644 index d2c07b3016..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_80242078_C46BE0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242078_C48C58 -/* C48C58 80242078 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C48C5C 8024207C AFB00010 */ sw $s0, 0x10($sp) -/* C48C60 80242080 0080802D */ daddu $s0, $a0, $zero -/* C48C64 80242084 AFBF0014 */ sw $ra, 0x14($sp) -/* C48C68 80242088 8E020148 */ lw $v0, 0x148($s0) -/* C48C6C 8024208C 0C00EABB */ jal get_npc_unsafe -/* C48C70 80242090 84440008 */ lh $a0, 8($v0) -/* C48C74 80242094 9443008E */ lhu $v1, 0x8e($v0) -/* C48C78 80242098 C440003C */ lwc1 $f0, 0x3c($v0) -/* C48C7C 8024209C 24640001 */ addiu $a0, $v1, 1 -/* C48C80 802420A0 00031C00 */ sll $v1, $v1, 0x10 -/* C48C84 802420A4 00031B83 */ sra $v1, $v1, 0xe -/* C48C88 802420A8 A444008E */ sh $a0, 0x8e($v0) -/* C48C8C 802420AC 3C018024 */ lui $at, 0x8024 -/* C48C90 802420B0 00230821 */ addu $at, $at, $v1 -/* C48C94 802420B4 C4224358 */ lwc1 $f2, 0x4358($at) -/* C48C98 802420B8 8443008E */ lh $v1, 0x8e($v0) -/* C48C9C 802420BC 46020000 */ add.s $f0, $f0, $f2 -/* C48CA0 802420C0 28630005 */ slti $v1, $v1, 5 -/* C48CA4 802420C4 14600003 */ bnez $v1, .L802420D4 -/* C48CA8 802420C8 E440003C */ swc1 $f0, 0x3c($v0) -/* C48CAC 802420CC 2402000C */ addiu $v0, $zero, 0xc -/* C48CB0 802420D0 AE020070 */ sw $v0, 0x70($s0) -.L802420D4: -/* C48CB4 802420D4 8FBF0014 */ lw $ra, 0x14($sp) -/* C48CB8 802420D8 8FB00010 */ lw $s0, 0x10($sp) -/* C48CBC 802420DC 03E00008 */ jr $ra -/* C48CC0 802420E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_8024260C_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_8024260C_C46BE0.s deleted file mode 100644 index ee2d2cf4fb..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_8024260C_C46BE0.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024260C_C491EC -/* C491EC 8024260C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C491F0 80242610 AFB00028 */ sw $s0, 0x28($sp) -/* C491F4 80242614 00A0802D */ daddu $s0, $a1, $zero -/* C491F8 80242618 AFB1002C */ sw $s1, 0x2c($sp) -/* C491FC 8024261C 00C0882D */ daddu $s1, $a2, $zero -/* C49200 80242620 AFBF0034 */ sw $ra, 0x34($sp) -/* C49204 80242624 AFB20030 */ sw $s2, 0x30($sp) -/* C49208 80242628 AE200070 */ sw $zero, 0x70($s1) -/* C4920C 8024262C 8C830000 */ lw $v1, ($a0) -/* C49210 80242630 2402FDFF */ addiu $v0, $zero, -0x201 -/* C49214 80242634 A480008E */ sh $zero, 0x8e($a0) -/* C49218 80242638 00621824 */ and $v1, $v1, $v0 -/* C4921C 8024263C 34650800 */ ori $a1, $v1, 0x800 -/* C49220 80242640 AC850000 */ sw $a1, ($a0) -/* C49224 80242644 8E0200D0 */ lw $v0, 0xd0($s0) -/* C49228 80242648 8C420034 */ lw $v0, 0x34($v0) -/* C4922C 8024264C 10400003 */ beqz $v0, .L8024265C -/* C49230 80242650 00E0902D */ daddu $s2, $a3, $zero -/* C49234 80242654 08090999 */ j .L80242664 -/* C49238 80242658 34620808 */ ori $v0, $v1, 0x808 -.L8024265C: -/* C4923C 8024265C 2402FFF7 */ addiu $v0, $zero, -9 -/* C49240 80242660 00A21024 */ and $v0, $a1, $v0 -.L80242664: -/* C49244 80242664 AC820000 */ sw $v0, ($a0) -/* C49248 80242668 27A20024 */ addiu $v0, $sp, 0x24 -/* C4924C 8024266C 27A50018 */ addiu $a1, $sp, 0x18 -/* C49250 80242670 C4800038 */ lwc1 $f0, 0x38($a0) -/* C49254 80242674 C482003C */ lwc1 $f2, 0x3c($a0) -/* C49258 80242678 C4840040 */ lwc1 $f4, 0x40($a0) -/* C4925C 8024267C 3C01447A */ lui $at, 0x447a -/* C49260 80242680 44813000 */ mtc1 $at, $f6 -/* C49264 80242684 27A6001C */ addiu $a2, $sp, 0x1c -/* C49268 80242688 E7A00018 */ swc1 $f0, 0x18($sp) -/* C4926C 8024268C E7A2001C */ swc1 $f2, 0x1c($sp) -/* C49270 80242690 E7A40020 */ swc1 $f4, 0x20($sp) -/* C49274 80242694 E7A60024 */ swc1 $f6, 0x24($sp) -/* C49278 80242698 AFA20010 */ sw $v0, 0x10($sp) -/* C4927C 8024269C 8C840080 */ lw $a0, 0x80($a0) -/* C49280 802426A0 0C0372DF */ jal func_800DCB7C -/* C49284 802426A4 27A70020 */ addiu $a3, $sp, 0x20 -/* C49288 802426A8 C7A20024 */ lwc1 $f2, 0x24($sp) -/* C4928C 802426AC 3C014059 */ lui $at, 0x4059 -/* C49290 802426B0 44812800 */ mtc1 $at, $f5 -/* C49294 802426B4 44802000 */ mtc1 $zero, $f4 -/* C49298 802426B8 460010A1 */ cvt.d.s $f2, $f2 -/* C4929C 802426BC 46241082 */ mul.d $f2, $f2, $f4 -/* C492A0 802426C0 00000000 */ nop -/* C492A4 802426C4 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C492A8 802426C8 46000021 */ cvt.d.s $f0, $f0 -/* C492AC 802426CC 46240002 */ mul.d $f0, $f0, $f4 -/* C492B0 802426D0 00000000 */ nop -/* C492B4 802426D4 3C013FE0 */ lui $at, 0x3fe0 -/* C492B8 802426D8 44812800 */ mtc1 $at, $f5 -/* C492BC 802426DC 44802000 */ mtc1 $zero, $f4 -/* C492C0 802426E0 00000000 */ nop -/* C492C4 802426E4 46241080 */ add.d $f2, $f2, $f4 -/* C492C8 802426E8 AE000074 */ sw $zero, 0x74($s0) -/* C492CC 802426EC 46240000 */ add.d $f0, $f0, $f4 -/* C492D0 802426F0 AE000090 */ sw $zero, 0x90($s0) -/* C492D4 802426F4 4620120D */ trunc.w.d $f8, $f2 -/* C492D8 802426F8 E6080078 */ swc1 $f8, 0x78($s0) -/* C492DC 802426FC 4620020D */ trunc.w.d $f8, $f0 -/* C492E0 80242700 E6080088 */ swc1 $f8, 0x88($s0) -/* C492E4 80242704 8E420014 */ lw $v0, 0x14($s2) -/* C492E8 80242708 AE220074 */ sw $v0, 0x74($s1) -/* C492EC 8024270C 8E0200B0 */ lw $v0, 0xb0($s0) -/* C492F0 80242710 34420010 */ ori $v0, $v0, 0x10 -/* C492F4 80242714 AE0200B0 */ sw $v0, 0xb0($s0) -/* C492F8 80242718 8FBF0034 */ lw $ra, 0x34($sp) -/* C492FC 8024271C 8FB20030 */ lw $s2, 0x30($sp) -/* C49300 80242720 8FB1002C */ lw $s1, 0x2c($sp) -/* C49304 80242724 8FB00028 */ lw $s0, 0x28($sp) -/* C49308 80242728 03E00008 */ jr $ra -/* C4930C 8024272C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_80242730_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_80242730_C46BE0.s deleted file mode 100644 index 3220dcda05..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_80242730_C46BE0.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242730_C49310 -/* C49310 80242730 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C49314 80242734 AFB40040 */ sw $s4, 0x40($sp) -/* C49318 80242738 0080A02D */ daddu $s4, $a0, $zero -/* C4931C 8024273C AFBF0048 */ sw $ra, 0x48($sp) -/* C49320 80242740 AFB50044 */ sw $s5, 0x44($sp) -/* C49324 80242744 AFB3003C */ sw $s3, 0x3c($sp) -/* C49328 80242748 AFB20038 */ sw $s2, 0x38($sp) -/* C4932C 8024274C AFB10034 */ sw $s1, 0x34($sp) -/* C49330 80242750 AFB00030 */ sw $s0, 0x30($sp) -/* C49334 80242754 8E920148 */ lw $s2, 0x148($s4) -/* C49338 80242758 86440008 */ lh $a0, 8($s2) -/* C4933C 8024275C 8E90000C */ lw $s0, 0xc($s4) -/* C49340 80242760 0C00EABB */ jal get_npc_unsafe -/* C49344 80242764 00A0882D */ daddu $s1, $a1, $zero -/* C49348 80242768 0280202D */ daddu $a0, $s4, $zero -/* C4934C 8024276C 8E050000 */ lw $a1, ($s0) -/* C49350 80242770 0C0B1EAF */ jal get_variable -/* C49354 80242774 0040A82D */ daddu $s5, $v0, $zero -/* C49358 80242778 AFA00010 */ sw $zero, 0x10($sp) -/* C4935C 8024277C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C49360 80242780 8C630030 */ lw $v1, 0x30($v1) -/* C49364 80242784 AFA30014 */ sw $v1, 0x14($sp) -/* C49368 80242788 8E4300D0 */ lw $v1, 0xd0($s2) -/* C4936C 8024278C 8C63001C */ lw $v1, 0x1c($v1) -/* C49370 80242790 AFA30018 */ sw $v1, 0x18($sp) -/* C49374 80242794 8E4300D0 */ lw $v1, 0xd0($s2) -/* C49378 80242798 8C630024 */ lw $v1, 0x24($v1) -/* C4937C 8024279C AFA3001C */ sw $v1, 0x1c($sp) -/* C49380 802427A0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C49384 802427A4 8C630028 */ lw $v1, 0x28($v1) -/* C49388 802427A8 27B30010 */ addiu $s3, $sp, 0x10 -/* C4938C 802427AC AFA30020 */ sw $v1, 0x20($sp) -/* C49390 802427B0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C49394 802427B4 3C0142F0 */ lui $at, 0x42f0 -/* C49398 802427B8 44810000 */ mtc1 $at, $f0 -/* C4939C 802427BC 8C63002C */ lw $v1, 0x2c($v1) -/* C493A0 802427C0 0040802D */ daddu $s0, $v0, $zero -/* C493A4 802427C4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C493A8 802427C8 A7A0002C */ sh $zero, 0x2c($sp) -/* C493AC 802427CC 12200006 */ beqz $s1, .L802427E8 -/* C493B0 802427D0 AFA30024 */ sw $v1, 0x24($sp) -/* C493B4 802427D4 02A0202D */ daddu $a0, $s5, $zero -/* C493B8 802427D8 0240282D */ daddu $a1, $s2, $zero -/* C493BC 802427DC 0280302D */ daddu $a2, $s4, $zero -/* C493C0 802427E0 0C090983 */ jal func_8024260C -/* C493C4 802427E4 0200382D */ daddu $a3, $s0, $zero -.L802427E8: -/* C493C8 802427E8 2402FFFE */ addiu $v0, $zero, -2 -/* C493CC 802427EC A2A200AB */ sb $v0, 0xab($s5) -/* C493D0 802427F0 8E4300B0 */ lw $v1, 0xb0($s2) -/* C493D4 802427F4 30620004 */ andi $v0, $v1, 4 -/* C493D8 802427F8 10400007 */ beqz $v0, .L80242818 -/* C493DC 802427FC 00000000 */ nop -/* C493E0 80242800 824200B4 */ lb $v0, 0xb4($s2) -/* C493E4 80242804 1440003C */ bnez $v0, .L802428F8 -/* C493E8 80242808 0000102D */ daddu $v0, $zero, $zero -/* C493EC 8024280C 2402FFFB */ addiu $v0, $zero, -5 -/* C493F0 80242810 00621024 */ and $v0, $v1, $v0 -/* C493F4 80242814 AE4200B0 */ sw $v0, 0xb0($s2) -.L80242818: -/* C493F8 80242818 8E830070 */ lw $v1, 0x70($s4) -/* C493FC 8024281C 2C62000F */ sltiu $v0, $v1, 0xf -/* C49400 80242820 10400034 */ beqz $v0, .L802428F4 -/* C49404 80242824 00031080 */ sll $v0, $v1, 2 -/* C49408 80242828 3C018024 */ lui $at, 0x8024 -/* C4940C 8024282C 00220821 */ addu $at, $at, $v0 -/* C49410 80242830 8C2256D8 */ lw $v0, 0x56d8($at) -/* C49414 80242834 00400008 */ jr $v0 -/* C49418 80242838 00000000 */ nop -/* C4941C 8024283C 0280202D */ daddu $a0, $s4, $zero -/* C49420 80242840 0200282D */ daddu $a1, $s0, $zero -/* C49424 80242844 0C090509 */ jal func_80241424 -/* C49428 80242848 0260302D */ daddu $a2, $s3, $zero -/* C4942C 8024284C 0280202D */ daddu $a0, $s4, $zero -/* C49430 80242850 0200282D */ daddu $a1, $s0, $zero -/* C49434 80242854 0C090575 */ jal func_802415D4 -/* C49438 80242858 0260302D */ daddu $a2, $s3, $zero -/* C4943C 8024285C 08090A3E */ j .L802428F8 -/* C49440 80242860 0000102D */ daddu $v0, $zero, $zero -/* C49444 80242864 0280202D */ daddu $a0, $s4, $zero -/* C49448 80242868 0200282D */ daddu $a1, $s0, $zero -/* C4944C 8024286C 0C0906FF */ jal func_80241BFC -/* C49450 80242870 0260302D */ daddu $a2, $s3, $zero -/* C49454 80242874 0280202D */ daddu $a0, $s4, $zero -/* C49458 80242878 0200282D */ daddu $a1, $s0, $zero -/* C4945C 8024287C 0C09072F */ jal func_80241CBC -/* C49460 80242880 0260302D */ daddu $a2, $s3, $zero -/* C49464 80242884 08090A3E */ j .L802428F8 -/* C49468 80242888 0000102D */ daddu $v0, $zero, $zero -/* C4946C 8024288C 0280202D */ daddu $a0, $s4, $zero -/* C49470 80242890 0200282D */ daddu $a1, $s0, $zero -/* C49474 80242894 0C090800 */ jal func_80242000 -/* C49478 80242898 0260302D */ daddu $a2, $s3, $zero -/* C4947C 8024289C 0280202D */ daddu $a0, $s4, $zero -/* C49480 802428A0 0200282D */ daddu $a1, $s0, $zero -/* C49484 802428A4 0C09081E */ jal func_80242078 -/* C49488 802428A8 0260302D */ daddu $a2, $s3, $zero -/* C4948C 802428AC 08090A3E */ j .L802428F8 -/* C49490 802428B0 0000102D */ daddu $v0, $zero, $zero -/* C49494 802428B4 0280202D */ daddu $a0, $s4, $zero -/* C49498 802428B8 0200282D */ daddu $a1, $s0, $zero -/* C4949C 802428BC 0C090839 */ jal func_802420E4 -/* C494A0 802428C0 0260302D */ daddu $a2, $s3, $zero -/* C494A4 802428C4 08090A3E */ j .L802428F8 -/* C494A8 802428C8 0000102D */ daddu $v0, $zero, $zero -/* C494AC 802428CC 0280202D */ daddu $a0, $s4, $zero -/* C494B0 802428D0 0200282D */ daddu $a1, $s0, $zero -/* C494B4 802428D4 0C090886 */ jal func_80242218 -/* C494B8 802428D8 0260302D */ daddu $a2, $s3, $zero -/* C494BC 802428DC 08090A3E */ j .L802428F8 -/* C494C0 802428E0 0000102D */ daddu $v0, $zero, $zero -/* C494C4 802428E4 0280202D */ daddu $a0, $s4, $zero -/* C494C8 802428E8 0200282D */ daddu $a1, $s0, $zero -/* C494CC 802428EC 0C09089F */ jal func_8024227C -/* C494D0 802428F0 0260302D */ daddu $a2, $s3, $zero -.L802428F4: -/* C494D4 802428F4 0000102D */ daddu $v0, $zero, $zero -.L802428F8: -/* C494D8 802428F8 8FBF0048 */ lw $ra, 0x48($sp) -/* C494DC 802428FC 8FB50044 */ lw $s5, 0x44($sp) -/* C494E0 80242900 8FB40040 */ lw $s4, 0x40($sp) -/* C494E4 80242904 8FB3003C */ lw $s3, 0x3c($sp) -/* C494E8 80242908 8FB20038 */ lw $s2, 0x38($sp) -/* C494EC 8024290C 8FB10034 */ lw $s1, 0x34($sp) -/* C494F0 80242910 8FB00030 */ lw $s0, 0x30($sp) -/* C494F4 80242914 03E00008 */ jr $ra -/* C494F8 80242918 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_802430F0_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_802430F0_C46BE0.s deleted file mode 100644 index 9556a309e8..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_802430F0_C46BE0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802430F0_C49CD0 -/* C49CD0 802430F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C49CD4 802430F4 AFB00010 */ sw $s0, 0x10($sp) -/* C49CD8 802430F8 0080802D */ daddu $s0, $a0, $zero -/* C49CDC 802430FC AFBF0014 */ sw $ra, 0x14($sp) -/* C49CE0 80243100 8E020148 */ lw $v0, 0x148($s0) -/* C49CE4 80243104 0C00EABB */ jal get_npc_unsafe -/* C49CE8 80243108 84440008 */ lh $a0, 8($v0) -/* C49CEC 8024310C 9443008E */ lhu $v1, 0x8e($v0) -/* C49CF0 80243110 2463FFFF */ addiu $v1, $v1, -1 -/* C49CF4 80243114 A443008E */ sh $v1, 0x8e($v0) -/* C49CF8 80243118 00031C00 */ sll $v1, $v1, 0x10 -/* C49CFC 8024311C 1C600002 */ bgtz $v1, .L80243128 -/* C49D00 80243120 2402001E */ addiu $v0, $zero, 0x1e -/* C49D04 80243124 AE020070 */ sw $v0, 0x70($s0) -.L80243128: -/* C49D08 80243128 8FBF0014 */ lw $ra, 0x14($sp) -/* C49D0C 8024312C 8FB00010 */ lw $s0, 0x10($sp) -/* C49D10 80243130 03E00008 */ jr $ra -/* C49D14 80243134 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/func_80243578_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/func_80243578_C46BE0.s deleted file mode 100644 index 786d788b63..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/func_80243578_C46BE0.s +++ /dev/null @@ -1,169 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243578_C4A158 -/* C4A158 80243578 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* C4A15C 8024357C AFB40050 */ sw $s4, 0x50($sp) -/* C4A160 80243580 0080A02D */ daddu $s4, $a0, $zero -/* C4A164 80243584 AFBF0058 */ sw $ra, 0x58($sp) -/* C4A168 80243588 AFB50054 */ sw $s5, 0x54($sp) -/* C4A16C 8024358C AFB3004C */ sw $s3, 0x4c($sp) -/* C4A170 80243590 AFB20048 */ sw $s2, 0x48($sp) -/* C4A174 80243594 AFB10044 */ sw $s1, 0x44($sp) -/* C4A178 80243598 AFB00040 */ sw $s0, 0x40($sp) -/* C4A17C 8024359C 8E920148 */ lw $s2, 0x148($s4) -/* C4A180 802435A0 86440008 */ lh $a0, 8($s2) -/* C4A184 802435A4 0C00EABB */ jal get_npc_unsafe -/* C4A188 802435A8 00A0802D */ daddu $s0, $a1, $zero -/* C4A18C 802435AC 8E83000C */ lw $v1, 0xc($s4) -/* C4A190 802435B0 0280202D */ daddu $a0, $s4, $zero -/* C4A194 802435B4 8C650000 */ lw $a1, ($v1) -/* C4A198 802435B8 0C0B1EAF */ jal get_variable -/* C4A19C 802435BC 0040A82D */ daddu $s5, $v0, $zero -/* C4A1A0 802435C0 AFA00020 */ sw $zero, 0x20($sp) -/* C4A1A4 802435C4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C4A1A8 802435C8 8C630030 */ lw $v1, 0x30($v1) -/* C4A1AC 802435CC AFA30024 */ sw $v1, 0x24($sp) -/* C4A1B0 802435D0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C4A1B4 802435D4 8C63001C */ lw $v1, 0x1c($v1) -/* C4A1B8 802435D8 AFA30028 */ sw $v1, 0x28($sp) -/* C4A1BC 802435DC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C4A1C0 802435E0 8C630024 */ lw $v1, 0x24($v1) -/* C4A1C4 802435E4 AFA3002C */ sw $v1, 0x2c($sp) -/* C4A1C8 802435E8 8E4300D0 */ lw $v1, 0xd0($s2) -/* C4A1CC 802435EC 8C630028 */ lw $v1, 0x28($v1) -/* C4A1D0 802435F0 27B30020 */ addiu $s3, $sp, 0x20 -/* C4A1D4 802435F4 AFA30030 */ sw $v1, 0x30($sp) -/* C4A1D8 802435F8 8E4300D0 */ lw $v1, 0xd0($s2) -/* C4A1DC 802435FC 3C0142FA */ lui $at, 0x42fa -/* C4A1E0 80243600 44810000 */ mtc1 $at, $f0 -/* C4A1E4 80243604 8C63002C */ lw $v1, 0x2c($v1) -/* C4A1E8 80243608 0040882D */ daddu $s1, $v0, $zero -/* C4A1EC 8024360C E7A00038 */ swc1 $f0, 0x38($sp) -/* C4A1F0 80243610 A7A0003C */ sh $zero, 0x3c($sp) -/* C4A1F4 80243614 12000007 */ beqz $s0, .L80243634 -/* C4A1F8 80243618 AFA30034 */ sw $v1, 0x34($sp) -/* C4A1FC 8024361C AE800070 */ sw $zero, 0x70($s4) -/* C4A200 80243620 02A0202D */ daddu $a0, $s5, $zero -/* C4A204 80243624 0240282D */ daddu $a1, $s2, $zero -/* C4A208 80243628 0280302D */ daddu $a2, $s4, $zero -/* C4A20C 8024362C 0C090983 */ jal func_8024260C -/* C4A210 80243630 0220382D */ daddu $a3, $s1, $zero -.L80243634: -/* C4A214 80243634 8E830070 */ lw $v1, 0x70($s4) -/* C4A218 80243638 2C620020 */ sltiu $v0, $v1, 0x20 -/* C4A21C 8024363C 10400060 */ beqz $v0, .L802437C0 -/* C4A220 80243640 00031080 */ sll $v0, $v1, 2 -/* C4A224 80243644 3C018024 */ lui $at, 0x8024 -/* C4A228 80243648 00220821 */ addu $at, $at, $v0 -/* C4A22C 8024364C 8C225728 */ lw $v0, 0x5728($at) -/* C4A230 80243650 00400008 */ jr $v0 -/* C4A234 80243654 00000000 */ nop -/* C4A238 80243658 0280202D */ daddu $a0, $s4, $zero -/* C4A23C 8024365C 0220282D */ daddu $a1, $s1, $zero -/* C4A240 80243660 0C090509 */ jal func_80241424 -/* C4A244 80243664 0260302D */ daddu $a2, $s3, $zero -/* C4A248 80243668 0000282D */ daddu $a1, $zero, $zero -/* C4A24C 8024366C 00A0302D */ daddu $a2, $a1, $zero -/* C4A250 80243670 AFA00010 */ sw $zero, 0x10($sp) -/* C4A254 80243674 AFA00014 */ sw $zero, 0x14($sp) -/* C4A258 80243678 AFA00018 */ sw $zero, 0x18($sp) -/* C4A25C 8024367C 8EA40024 */ lw $a0, 0x24($s5) -/* C4A260 80243680 0C0B7A25 */ jal func_802DE894 -/* C4A264 80243684 00A0382D */ daddu $a3, $a1, $zero -/* C4A268 80243688 0280202D */ daddu $a0, $s4, $zero -/* C4A26C 8024368C 0220282D */ daddu $a1, $s1, $zero -/* C4A270 80243690 0C090575 */ jal func_802415D4 -/* C4A274 80243694 0260302D */ daddu $a2, $s3, $zero -/* C4A278 80243698 08090DB0 */ j .L802436C0 -/* C4A27C 8024369C 00000000 */ nop -/* C4A280 802436A0 0280202D */ daddu $a0, $s4, $zero -/* C4A284 802436A4 0220282D */ daddu $a1, $s1, $zero -/* C4A288 802436A8 0C0906FF */ jal func_80241BFC -/* C4A28C 802436AC 0260302D */ daddu $a2, $s3, $zero -/* C4A290 802436B0 0280202D */ daddu $a0, $s4, $zero -/* C4A294 802436B4 0220282D */ daddu $a1, $s1, $zero -/* C4A298 802436B8 0C09072F */ jal func_80241CBC -/* C4A29C 802436BC 0260302D */ daddu $a2, $s3, $zero -.L802436C0: -/* C4A2A0 802436C0 8E830070 */ lw $v1, 0x70($s4) -/* C4A2A4 802436C4 2402000C */ addiu $v0, $zero, 0xc -/* C4A2A8 802436C8 1462003D */ bne $v1, $v0, .L802437C0 -/* C4A2AC 802436CC 24020006 */ addiu $v0, $zero, 6 -/* C4A2B0 802436D0 08090DF0 */ j .L802437C0 -/* C4A2B4 802436D4 A6A2008E */ sh $v0, 0x8e($s5) -/* C4A2B8 802436D8 0280202D */ daddu $a0, $s4, $zero -/* C4A2BC 802436DC 0220282D */ daddu $a1, $s1, $zero -/* C4A2C0 802436E0 0C090A47 */ jal func_8024291C -/* C4A2C4 802436E4 0260302D */ daddu $a2, $s3, $zero -/* C4A2C8 802436E8 8E830070 */ lw $v1, 0x70($s4) -/* C4A2CC 802436EC 2402000D */ addiu $v0, $zero, 0xd -/* C4A2D0 802436F0 14620033 */ bne $v1, $v0, .L802437C0 -/* C4A2D4 802436F4 00000000 */ nop -/* C4A2D8 802436F8 0280202D */ daddu $a0, $s4, $zero -/* C4A2DC 802436FC 0220282D */ daddu $a1, $s1, $zero -/* C4A2E0 80243700 0C090A9D */ jal func_80242A74 -/* C4A2E4 80243704 0260302D */ daddu $a2, $s3, $zero -/* C4A2E8 80243708 08090DF0 */ j .L802437C0 -/* C4A2EC 8024370C 00000000 */ nop -/* C4A2F0 80243710 0280202D */ daddu $a0, $s4, $zero -/* C4A2F4 80243714 0220282D */ daddu $a1, $s1, $zero -/* C4A2F8 80243718 0C090ADE */ jal func_80242B78 -/* C4A2FC 8024371C 0260302D */ daddu $a2, $s3, $zero -/* C4A300 80243720 8E830070 */ lw $v1, 0x70($s4) -/* C4A304 80243724 2402000F */ addiu $v0, $zero, 0xf -/* C4A308 80243728 14620025 */ bne $v1, $v0, .L802437C0 -/* C4A30C 8024372C 00000000 */ nop -/* C4A310 80243730 0280202D */ daddu $a0, $s4, $zero -/* C4A314 80243734 0220282D */ daddu $a1, $s1, $zero -/* C4A318 80243738 0C090B07 */ jal func_80242C1C -/* C4A31C 8024373C 0260302D */ daddu $a2, $s3, $zero -/* C4A320 80243740 08090DF0 */ j .L802437C0 -/* C4A324 80243744 00000000 */ nop -/* C4A328 80243748 0280202D */ daddu $a0, $s4, $zero -/* C4A32C 8024374C 0220282D */ daddu $a1, $s1, $zero -/* C4A330 80243750 0C090BAE */ jal func_80242EB8 -/* C4A334 80243754 0260302D */ daddu $a2, $s3, $zero -/* C4A338 80243758 0280202D */ daddu $a0, $s4, $zero -/* C4A33C 8024375C 0220282D */ daddu $a1, $s1, $zero -/* C4A340 80243760 0C090BDC */ jal func_80242F70 -/* C4A344 80243764 0260302D */ daddu $a2, $s3, $zero -/* C4A348 80243768 08090DF0 */ j .L802437C0 -/* C4A34C 8024376C 00000000 */ nop -/* C4A350 80243770 0280202D */ daddu $a0, $s4, $zero -/* C4A354 80243774 0220282D */ daddu $a1, $s1, $zero -/* C4A358 80243778 0C090C3C */ jal func_802430F0 -/* C4A35C 8024377C 0260302D */ daddu $a2, $s3, $zero -/* C4A360 80243780 08090DF0 */ j .L802437C0 -/* C4A364 80243784 00000000 */ nop -/* C4A368 80243788 0280202D */ daddu $a0, $s4, $zero -/* C4A36C 8024378C 0220282D */ daddu $a1, $s1, $zero -/* C4A370 80243790 0C090C4E */ jal func_80243138 -/* C4A374 80243794 0260302D */ daddu $a2, $s3, $zero -/* C4A378 80243798 08090DF0 */ j .L802437C0 -/* C4A37C 8024379C 00000000 */ nop -/* C4A380 802437A0 0280202D */ daddu $a0, $s4, $zero -/* C4A384 802437A4 0220282D */ daddu $a1, $s1, $zero -/* C4A388 802437A8 0C090C6E */ jal func_802431B8 -/* C4A38C 802437AC 0260302D */ daddu $a2, $s3, $zero -/* C4A390 802437B0 0280202D */ daddu $a0, $s4, $zero -/* C4A394 802437B4 0220282D */ daddu $a1, $s1, $zero -/* C4A398 802437B8 0C090C98 */ jal func_80243260 -/* C4A39C 802437BC 0260302D */ daddu $a2, $s3, $zero -.L802437C0: -/* C4A3A0 802437C0 8E820070 */ lw $v0, 0x70($s4) -/* C4A3A4 802437C4 8FBF0058 */ lw $ra, 0x58($sp) -/* C4A3A8 802437C8 8FB50054 */ lw $s5, 0x54($sp) -/* C4A3AC 802437CC 8FB40050 */ lw $s4, 0x50($sp) -/* C4A3B0 802437D0 8FB3004C */ lw $s3, 0x4c($sp) -/* C4A3B4 802437D4 8FB20048 */ lw $s2, 0x48($sp) -/* C4A3B8 802437D8 8FB10044 */ lw $s1, 0x44($sp) -/* C4A3BC 802437DC 8FB00040 */ lw $s0, 0x40($sp) -/* C4A3C0 802437E0 38420064 */ xori $v0, $v0, 0x64 -/* C4A3C4 802437E4 2C420001 */ sltiu $v0, $v0, 1 -/* C4A3C8 802437E8 00021040 */ sll $v0, $v0, 1 -/* C4A3CC 802437EC 03E00008 */ jr $ra -/* C4A3D0 802437F0 27BD0060 */ addiu $sp, $sp, 0x60 -/* C4A3D4 802437F4 00000000 */ nop -/* C4A3D8 802437F8 00000000 */ nop -/* C4A3DC 802437FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/update_starpoints_display_C46BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/update_starpoints_display_C46BE0.s deleted file mode 100644 index aa14e1a4ef..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/update_starpoints_display_C46BE0.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_starpoints_display_C46F9C -/* C46F9C 802403BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C46FA0 802403C0 AFB40028 */ sw $s4, 0x28($sp) -/* C46FA4 802403C4 0080A02D */ daddu $s4, $a0, $zero -/* C46FA8 802403C8 AFBF002C */ sw $ra, 0x2c($sp) -/* C46FAC 802403CC AFB30024 */ sw $s3, 0x24($sp) -/* C46FB0 802403D0 AFB20020 */ sw $s2, 0x20($sp) -/* C46FB4 802403D4 AFB1001C */ sw $s1, 0x1c($sp) -/* C46FB8 802403D8 AFB00018 */ sw $s0, 0x18($sp) -/* C46FBC 802403DC 8E910148 */ lw $s1, 0x148($s4) -/* C46FC0 802403E0 86240008 */ lh $a0, 8($s1) -/* C46FC4 802403E4 0C00EABB */ jal get_npc_unsafe -/* C46FC8 802403E8 00A0802D */ daddu $s0, $a1, $zero -/* C46FCC 802403EC 16000005 */ bnez $s0, .L80240404 -/* C46FD0 802403F0 0040902D */ daddu $s2, $v0, $zero -/* C46FD4 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C46FD8 802403F8 30420004 */ andi $v0, $v0, 4 -/* C46FDC 802403FC 10400015 */ beqz $v0, .L80240454 -/* C46FE0 80240400 00000000 */ nop -.L80240404: -/* C46FE4 80240404 AE800070 */ sw $zero, 0x70($s4) -/* C46FE8 80240408 8E420000 */ lw $v0, ($s2) -/* C46FEC 8024040C 3C031F30 */ lui $v1, 0x1f30 -/* C46FF0 80240410 A640008E */ sh $zero, 0x8e($s2) -/* C46FF4 80240414 34420102 */ ori $v0, $v0, 0x102 -/* C46FF8 80240418 AE420000 */ sw $v0, ($s2) -/* C46FFC 8024041C 8E220000 */ lw $v0, ($s1) -/* C47000 80240420 3C01C47A */ lui $at, 0xc47a -/* C47004 80240424 44810000 */ mtc1 $at, $f0 -/* C47008 80240428 00431025 */ or $v0, $v0, $v1 -/* C4700C 8024042C AE220000 */ sw $v0, ($s1) -/* C47010 80240430 AE400038 */ sw $zero, 0x38($s2) -/* C47014 80240434 E640003C */ swc1 $f0, 0x3c($s2) -/* C47018 80240438 AE400040 */ sw $zero, 0x40($s2) -/* C4701C 8024043C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C47020 80240440 30620004 */ andi $v0, $v1, 4 -/* C47024 80240444 10400003 */ beqz $v0, .L80240454 -/* C47028 80240448 2402FFFB */ addiu $v0, $zero, -5 -/* C4702C 8024044C 00621024 */ and $v0, $v1, $v0 -/* C47030 80240450 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240454: -/* C47034 80240454 8E930070 */ lw $s3, 0x70($s4) -/* C47038 80240458 12600005 */ beqz $s3, .L80240470 -/* C4703C 8024045C 24020001 */ addiu $v0, $zero, 1 -/* C47040 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* C47044 80240464 00000000 */ nop -/* C47048 80240468 0809017E */ j .L802405F8 -/* C4704C 8024046C 00000000 */ nop -.L80240470: -/* C47050 80240470 86240008 */ lh $a0, 8($s1) -/* C47054 80240474 0C00FB3A */ jal get_enemy -/* C47058 80240478 2484FFFF */ addiu $a0, $a0, -1 -/* C4705C 8024047C 0040802D */ daddu $s0, $v0, $zero -/* C47060 80240480 0C00EABB */ jal get_npc_unsafe -/* C47064 80240484 86040008 */ lh $a0, 8($s0) -/* C47068 80240488 24030001 */ addiu $v1, $zero, 1 -/* C4706C 8024048C 0040982D */ daddu $s3, $v0, $zero -/* C47070 80240490 A2230007 */ sb $v1, 7($s1) -/* C47074 80240494 8E03006C */ lw $v1, 0x6c($s0) -/* C47078 80240498 24020003 */ addiu $v0, $zero, 3 -/* C4707C 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* C47080 802404A0 00000000 */ nop -/* C47084 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) -/* C47088 802404A8 10A00003 */ beqz $a1, .L802404B8 -/* C4708C 802404AC 0260202D */ daddu $a0, $s3, $zero -/* C47090 802404B0 0C012530 */ jal func_800494C0 -/* C47094 802404B4 0000302D */ daddu $a2, $zero, $zero -.L802404B8: -/* C47098 802404B8 27A40010 */ addiu $a0, $sp, 0x10 -/* C4709C 802404BC C6280070 */ lwc1 $f8, 0x70($s1) -/* C470A0 802404C0 46804220 */ cvt.s.w $f8, $f8 -/* C470A4 802404C4 C6620034 */ lwc1 $f2, 0x34($s3) -/* C470A8 802404C8 3C014387 */ lui $at, 0x4387 -/* C470AC 802404CC 44810000 */ mtc1 $at, $f0 -/* C470B0 802404D0 44064000 */ mfc1 $a2, $f8 -/* C470B4 802404D4 46020001 */ sub.s $f0, $f0, $f2 -/* C470B8 802404D8 C6660038 */ lwc1 $f6, 0x38($s3) -/* C470BC 802404DC C6640040 */ lwc1 $f4, 0x40($s3) -/* C470C0 802404E0 44070000 */ mfc1 $a3, $f0 -/* C470C4 802404E4 27A50014 */ addiu $a1, $sp, 0x14 -/* C470C8 802404E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* C470CC 802404EC 0C00A7E7 */ jal add_vec2D_polar -/* C470D0 802404F0 E7A40014 */ swc1 $f4, 0x14($sp) -/* C470D4 802404F4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C470D8 802404F8 4600020D */ trunc.w.s $f8, $f0 -/* C470DC 802404FC 44024000 */ mfc1 $v0, $f8 -/* C470E0 80240500 E6400038 */ swc1 $f0, 0x38($s2) -/* C470E4 80240504 A6220010 */ sh $v0, 0x10($s1) -/* C470E8 80240508 C660003C */ lwc1 $f0, 0x3c($s3) -/* C470EC 8024050C C622006C */ lwc1 $f2, 0x6c($s1) -/* C470F0 80240510 468010A0 */ cvt.s.w $f2, $f2 -/* C470F4 80240514 46020000 */ add.s $f0, $f0, $f2 -/* C470F8 80240518 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C470FC 8024051C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C47100 80240520 E640003C */ swc1 $f0, 0x3c($s2) -/* C47104 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C47108 80240528 4600020D */ trunc.w.s $f8, $f0 -/* C4710C 8024052C 44024000 */ mfc1 $v0, $f8 -/* C47110 80240530 00000000 */ nop -/* C47114 80240534 A6220012 */ sh $v0, 0x12($s1) -/* C47118 80240538 4600120D */ trunc.w.s $f8, $f2 -/* C4711C 8024053C 44024000 */ mfc1 $v0, $f8 -/* C47120 80240540 E6420040 */ swc1 $f2, 0x40($s2) -/* C47124 80240544 A6220014 */ sh $v0, 0x14($s1) -/* C47128 80240548 8C660028 */ lw $a2, 0x28($v1) -/* C4712C 8024054C 8C670030 */ lw $a3, 0x30($v1) -/* C47130 80240550 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C47134 80240554 0C00A720 */ jal atan2 -/* C47138 80240558 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C4713C 8024055C 3C03E0EF */ lui $v1, 0xe0ef -/* C47140 80240560 E640000C */ swc1 $f0, 0xc($s2) -/* C47144 80240564 8E220000 */ lw $v0, ($s1) -/* C47148 80240568 3463FFFF */ ori $v1, $v1, 0xffff -/* C4714C 8024056C 00431024 */ and $v0, $v0, $v1 -/* C47150 80240570 AE220000 */ sw $v0, ($s1) -/* C47154 80240574 24020001 */ addiu $v0, $zero, 1 -/* C47158 80240578 A640008E */ sh $zero, 0x8e($s2) -/* C4715C 8024057C 0809017E */ j .L802405F8 -/* C47160 80240580 AE820070 */ sw $v0, 0x70($s4) -.L80240584: -/* C47164 80240584 86240008 */ lh $a0, 8($s1) -/* C47168 80240588 0C00FB3A */ jal get_enemy -/* C4716C 8024058C 2484FFFF */ addiu $a0, $a0, -1 -/* C47170 80240590 0040802D */ daddu $s0, $v0, $zero -/* C47174 80240594 0C00EABB */ jal get_npc_unsafe -/* C47178 80240598 86040008 */ lh $a0, 8($s0) -/* C4717C 8024059C 9642008E */ lhu $v0, 0x8e($s2) -/* C47180 802405A0 24420001 */ addiu $v0, $v0, 1 -/* C47184 802405A4 A642008E */ sh $v0, 0x8e($s2) -/* C47188 802405A8 00021400 */ sll $v0, $v0, 0x10 -/* C4718C 802405AC 8E23007C */ lw $v1, 0x7c($s1) -/* C47190 802405B0 00021403 */ sra $v0, $v0, 0x10 -/* C47194 802405B4 0043102A */ slt $v0, $v0, $v1 -/* C47198 802405B8 50400001 */ beql $v0, $zero, .L802405C0 -/* C4719C 802405BC A2200007 */ sb $zero, 7($s1) -.L802405C0: -/* C471A0 802405C0 8E03006C */ lw $v1, 0x6c($s0) -/* C471A4 802405C4 24020004 */ addiu $v0, $zero, 4 -/* C471A8 802405C8 1462000B */ bne $v1, $v0, .L802405F8 -/* C471AC 802405CC 3C021F10 */ lui $v0, 0x1f10 -/* C471B0 802405D0 8E230000 */ lw $v1, ($s1) -/* C471B4 802405D4 3C01C47A */ lui $at, 0xc47a -/* C471B8 802405D8 44810000 */ mtc1 $at, $f0 -/* C471BC 802405DC 00621825 */ or $v1, $v1, $v0 -/* C471C0 802405E0 AE230000 */ sw $v1, ($s1) -/* C471C4 802405E4 AE400038 */ sw $zero, 0x38($s2) -/* C471C8 802405E8 E640003C */ swc1 $f0, 0x3c($s2) -/* C471CC 802405EC AE400040 */ sw $zero, 0x40($s2) -/* C471D0 802405F0 A2330007 */ sb $s3, 7($s1) -/* C471D4 802405F4 AE800070 */ sw $zero, 0x70($s4) -.L802405F8: -/* C471D8 802405F8 8FBF002C */ lw $ra, 0x2c($sp) -/* C471DC 802405FC 8FB40028 */ lw $s4, 0x28($sp) -/* C471E0 80240600 8FB30024 */ lw $s3, 0x24($sp) -/* C471E4 80240604 8FB20020 */ lw $s2, 0x20($sp) -/* C471E8 80240608 8FB1001C */ lw $s1, 0x1c($sp) -/* C471EC 8024060C 8FB00018 */ lw $s0, 0x18($sp) -/* C471F0 80240610 0000102D */ daddu $v0, $zero, $zero -/* C471F4 80240614 03E00008 */ jr $ra -/* C471F8 80240618 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_10/func_802400A0_C4C390.s b/asm/nonmatchings/world/area_dgb/dgb_10/func_802400A0_C4C390.s deleted file mode 100644 index 3fc53d1d07..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_10/func_802400A0_C4C390.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400A0_C4C430 -/* C4C430 802400A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C4C434 802400A4 AFB00010 */ sw $s0, 0x10($sp) -/* C4C438 802400A8 0080802D */ daddu $s0, $a0, $zero -/* C4C43C 802400AC 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* C4C440 802400B0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* C4C444 802400B4 AFBF0014 */ sw $ra, 0x14($sp) -/* C4C448 802400B8 8E02013C */ lw $v0, 0x13c($s0) -/* C4C44C 802400BC C46C0028 */ lwc1 $f12, 0x28($v1) -/* C4C450 802400C0 C46E0030 */ lwc1 $f14, 0x30($v1) -/* C4C454 802400C4 C4460008 */ lwc1 $f6, 8($v0) -/* C4C458 802400C8 468031A0 */ cvt.s.w $f6, $f6 -/* C4C45C 802400CC 44063000 */ mfc1 $a2, $f6 -/* C4C460 802400D0 C4460010 */ lwc1 $f6, 0x10($v0) -/* C4C464 802400D4 468031A0 */ cvt.s.w $f6, $f6 -/* C4C468 802400D8 44073000 */ mfc1 $a3, $f6 -/* C4C46C 802400DC 0C00A7B5 */ jal dist2D -/* C4C470 802400E0 00000000 */ nop -/* C4C474 802400E4 3C0142E1 */ lui $at, 0x42e1 -/* C4C478 802400E8 44811000 */ mtc1 $at, $f2 -/* C4C47C 802400EC 46000106 */ mov.s $f4, $f0 -/* C4C480 802400F0 4602203C */ c.lt.s $f4, $f2 -/* C4C484 802400F4 00000000 */ nop -/* C4C488 802400F8 45000003 */ bc1f .L80240108 -/* C4C48C 802400FC AE000084 */ sw $zero, 0x84($s0) -/* C4C490 80240100 24020002 */ addiu $v0, $zero, 2 -/* C4C494 80240104 AE020084 */ sw $v0, 0x84($s0) -.L80240108: -/* C4C498 80240108 3C014216 */ lui $at, 0x4216 -/* C4C49C 8024010C 44810000 */ mtc1 $at, $f0 -/* C4C4A0 80240110 00000000 */ nop -/* C4C4A4 80240114 4600203C */ c.lt.s $f4, $f0 -/* C4C4A8 80240118 00000000 */ nop -/* C4C4AC 8024011C 45000002 */ bc1f .L80240128 -/* C4C4B0 80240120 24020001 */ addiu $v0, $zero, 1 -/* C4C4B4 80240124 AE020084 */ sw $v0, 0x84($s0) -.L80240128: -/* C4C4B8 80240128 8FBF0014 */ lw $ra, 0x14($sp) -/* C4C4BC 8024012C 8FB00010 */ lw $s0, 0x10($sp) -/* C4C4C0 80240130 24020002 */ addiu $v0, $zero, 2 -/* C4C4C4 80240134 03E00008 */ jr $ra -/* C4C4C8 80240138 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_10/func_8024013C_C4C390.s b/asm/nonmatchings/world/area_dgb/dgb_10/func_8024013C_C4C390.s deleted file mode 100644 index 57fdfc7a3d..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_10/func_8024013C_C4C390.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024013C_C4C4CC -/* C4C4CC 8024013C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* C4C4D0 80240140 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* C4C4D4 80240144 C442002C */ lwc1 $f2, 0x2c($v0) -/* C4C4D8 80240148 44800000 */ mtc1 $zero, $f0 -/* C4C4DC 8024014C 00000000 */ nop -/* C4C4E0 80240150 4602003E */ c.le.s $f0, $f2 -/* C4C4E4 80240154 00000000 */ nop -/* C4C4E8 80240158 45000003 */ bc1f .L80240168 -/* C4C4EC 8024015C 0040182D */ daddu $v1, $v0, $zero -/* C4C4F0 80240160 03E00008 */ jr $ra -/* C4C4F4 80240164 0000102D */ daddu $v0, $zero, $zero -.L80240168: -/* C4C4F8 80240168 C4420028 */ lwc1 $f2, 0x28($v0) -/* C4C4FC 8024016C 3C0143DC */ lui $at, 0x43dc -/* C4C500 80240170 44810000 */ mtc1 $at, $f0 -/* C4C504 80240174 00000000 */ nop -/* C4C508 80240178 4600103C */ c.lt.s $f2, $f0 -/* C4C50C 8024017C 00000000 */ nop -/* C4C510 80240180 45000003 */ bc1f .L80240190 -/* C4C514 80240184 00000000 */ nop -/* C4C518 80240188 0809006D */ j .L802401B4 -/* C4C51C 8024018C 24020003 */ addiu $v0, $zero, 3 -.L80240190: -/* C4C520 80240190 C4620030 */ lwc1 $f2, 0x30($v1) -/* C4C524 80240194 3C01C32A */ lui $at, 0xc32a -/* C4C528 80240198 44810000 */ mtc1 $at, $f0 -/* C4C52C 8024019C 00000000 */ nop -/* C4C530 802401A0 4600103C */ c.lt.s $f2, $f0 -/* C4C534 802401A4 00000000 */ nop -/* C4C538 802401A8 45000002 */ bc1f .L802401B4 -/* C4C53C 802401AC 24020001 */ addiu $v0, $zero, 1 -/* C4C540 802401B0 24020002 */ addiu $v0, $zero, 2 -.L802401B4: -/* C4C544 802401B4 AC820084 */ sw $v0, 0x84($a0) -/* C4C548 802401B8 03E00008 */ jr $ra -/* C4C54C 802401BC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dgb/dgb_10/func_802401C0_C4C390.s b/asm/nonmatchings/world/area_dgb/dgb_10/func_802401C0_C4C390.s deleted file mode 100644 index 0f988639e4..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_10/func_802401C0_C4C390.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401C0_C4C550 -/* C4C550 802401C0 3C018011 */ lui $at, 0x8011 -/* C4C554 802401C4 C422EFF4 */ lwc1 $f2, -0x100c($at) -/* C4C558 802401C8 3C01C270 */ lui $at, 0xc270 -/* C4C55C 802401CC 44810000 */ mtc1 $at, $f0 -/* C4C560 802401D0 00000000 */ nop -/* C4C564 802401D4 4602003C */ c.lt.s $f0, $f2 -/* C4C568 802401D8 00000000 */ nop -/* C4C56C 802401DC 45010002 */ bc1t .L802401E8 -/* C4C570 802401E0 0000102D */ daddu $v0, $zero, $zero -/* C4C574 802401E4 24020002 */ addiu $v0, $zero, 2 -.L802401E8: -/* C4C578 802401E8 03E00008 */ jr $ra -/* C4C57C 802401EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_12/func_802400B4_C4DEF0.s b/asm/nonmatchings/world/area_dgb/dgb_12/func_802400B4_C4DEF0.s deleted file mode 100644 index 25833d3eca..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_12/func_802400B4_C4DEF0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_C4DFA4 -/* C4DFA4 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C4DFA8 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* C4DFAC 802400BC 0080802D */ daddu $s0, $a0, $zero -/* C4DFB0 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C4DFB4 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* C4DFB8 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* C4DFBC 802400CC 8C510000 */ lw $s1, ($v0) -/* C4DFC0 802400D0 0C0B1EAF */ jal get_variable -/* C4DFC4 802400D4 0220282D */ daddu $a1, $s1, $zero -/* C4DFC8 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* C4DFCC 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* C4DFD0 802400E0 0200202D */ daddu $a0, $s0, $zero -/* C4DFD4 802400E4 00431024 */ and $v0, $v0, $v1 -/* C4DFD8 802400E8 00021140 */ sll $v0, $v0, 5 -/* C4DFDC 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* C4DFE0 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* C4DFE4 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* C4DFE8 802400F8 0C0B2026 */ jal set_variable -/* C4DFEC 802400FC 0220282D */ daddu $a1, $s1, $zero -/* C4DFF0 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* C4DFF4 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* C4DFF8 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* C4DFFC 8024010C 24020002 */ addiu $v0, $zero, 2 -/* C4E000 80240110 03E00008 */ jr $ra -/* C4E004 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_12/func_80240118_C4DEF0.s b/asm/nonmatchings/world/area_dgb/dgb_12/func_80240118_C4DEF0.s deleted file mode 100644 index c5d4c9ea45..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_12/func_80240118_C4DEF0.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_12/func_80240268_C4DEF0.s b/asm/nonmatchings/world/area_dgb/dgb_12/func_80240268_C4DEF0.s deleted file mode 100644 index c12eeb8986..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_12/func_80240268_C4DEF0.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_C4E158 -/* C4E158 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C4E15C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* C4E160 80240270 0080802D */ daddu $s0, $a0, $zero -/* C4E164 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* C4E168 80240278 8E02000C */ lw $v0, 0xc($s0) -/* C4E16C 8024027C 0C0B1EAF */ jal get_variable -/* C4E170 80240280 8C450000 */ lw $a1, ($v0) -/* C4E174 80240284 00021140 */ sll $v0, $v0, 5 -/* C4E178 80240288 AE000084 */ sw $zero, 0x84($s0) -/* C4E17C 8024028C 3C018008 */ lui $at, 0x8008 -/* C4E180 80240290 00220821 */ addu $at, $at, $v0 -/* C4E184 80240294 942278F8 */ lhu $v0, 0x78f8($at) -/* C4E188 80240298 30420040 */ andi $v0, $v0, 0x40 -/* C4E18C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* C4E190 802402A0 24020001 */ addiu $v0, $zero, 1 -/* C4E194 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* C4E198 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* C4E19C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* C4E1A0 802402B0 24020002 */ addiu $v0, $zero, 2 -/* C4E1A4 802402B4 03E00008 */ jr $ra -/* C4E1A8 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* C4E1AC 802402BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/func_8024006C_C4F510.s b/asm/nonmatchings/world/area_dgb/dgb_15/func_8024006C_C4F510.s deleted file mode 100644 index e6ea1103f7..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/func_8024006C_C4F510.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024006C_C4F57C -/* C4F57C 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C4F580 80240070 AFB10014 */ sw $s1, 0x14($sp) -/* C4F584 80240074 0080882D */ daddu $s1, $a0, $zero -/* C4F588 80240078 AFBF0018 */ sw $ra, 0x18($sp) -/* C4F58C 8024007C AFB00010 */ sw $s0, 0x10($sp) -/* C4F590 80240080 8E300148 */ lw $s0, 0x148($s1) -/* C4F594 80240084 0C00EABB */ jal get_npc_unsafe -/* C4F598 80240088 86040008 */ lh $a0, 8($s0) -/* C4F59C 8024008C 0040202D */ daddu $a0, $v0, $zero -/* C4F5A0 80240090 9482008E */ lhu $v0, 0x8e($a0) -/* C4F5A4 80240094 2442FFFF */ addiu $v0, $v0, -1 -/* C4F5A8 80240098 A482008E */ sh $v0, 0x8e($a0) -/* C4F5AC 8024009C 00021400 */ sll $v0, $v0, 0x10 -/* C4F5B0 802400A0 1C400009 */ bgtz $v0, .L802400C8 -/* C4F5B4 802400A4 24020003 */ addiu $v0, $zero, 3 -/* C4F5B8 802400A8 96030076 */ lhu $v1, 0x76($s0) -/* C4F5BC 802400AC AE02006C */ sw $v0, 0x6c($s0) -/* C4F5C0 802400B0 A483008E */ sh $v1, 0x8e($a0) -/* C4F5C4 802400B4 8E0200CC */ lw $v0, 0xcc($s0) -/* C4F5C8 802400B8 8C420024 */ lw $v0, 0x24($v0) -/* C4F5CC 802400BC AC820028 */ sw $v0, 0x28($a0) -/* C4F5D0 802400C0 24020020 */ addiu $v0, $zero, 0x20 -/* C4F5D4 802400C4 AE220070 */ sw $v0, 0x70($s1) -.L802400C8: -/* C4F5D8 802400C8 8FBF0018 */ lw $ra, 0x18($sp) -/* C4F5DC 802400CC 8FB10014 */ lw $s1, 0x14($sp) -/* C4F5E0 802400D0 8FB00010 */ lw $s0, 0x10($sp) -/* C4F5E4 802400D4 03E00008 */ jr $ra -/* C4F5E8 802400D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/func_802400DC_C4F510.s b/asm/nonmatchings/world/area_dgb/dgb_15/func_802400DC_C4F510.s deleted file mode 100644 index 3e9ad94761..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/func_802400DC_C4F510.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_C4F5EC -/* C4F5EC 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C4F5F0 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* C4F5F4 802400E4 0080882D */ daddu $s1, $a0, $zero -/* C4F5F8 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* C4F5FC 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* C4F600 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* C4F604 802400F4 0C00EABB */ jal get_npc_unsafe -/* C4F608 802400F8 86040008 */ lh $a0, 8($s0) -/* C4F60C 802400FC 0040282D */ daddu $a1, $v0, $zero -/* C4F610 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* C4F614 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* C4F618 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* C4F61C 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* C4F620 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* C4F624 80240114 24020004 */ addiu $v0, $zero, 4 -/* C4F628 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* C4F62C 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* C4F630 80240120 8C620000 */ lw $v0, ($v1) -/* C4F634 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* C4F638 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* C4F63C 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* C4F640 80240130 8E020078 */ lw $v0, 0x78($s0) -/* C4F644 80240134 28420008 */ slti $v0, $v0, 8 -/* C4F648 80240138 14400018 */ bnez $v0, .L8024019C -/* C4F64C 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* C4F650 80240140 24040003 */ addiu $a0, $zero, 3 -/* C4F654 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* C4F658 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* C4F65C 8024014C 3C013F80 */ lui $at, 0x3f80 -/* C4F660 80240150 44810000 */ mtc1 $at, $f0 -/* C4F664 80240154 3C014000 */ lui $at, 0x4000 -/* C4F668 80240158 44811000 */ mtc1 $at, $f2 -/* C4F66C 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* C4F670 80240160 44812000 */ mtc1 $at, $f4 -/* C4F674 80240164 44873000 */ mtc1 $a3, $f6 -/* C4F678 80240168 00000000 */ nop -/* C4F67C 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* C4F680 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* C4F684 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* C4F688 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* C4F68C 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* C4F690 80240180 44073000 */ mfc1 $a3, $f6 -/* C4F694 80240184 0000302D */ daddu $a2, $zero, $zero -/* C4F698 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* C4F69C 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* C4F6A0 80240190 0C01BFA4 */ jal fx_emote -/* C4F6A4 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* C4F6A8 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* C4F6AC 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* C4F6B0 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* C4F6B4 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* C4F6B8 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* C4F6BC 802401AC 03E00008 */ jr $ra -/* C4F6C0 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/func_802401B4_C4F510.s b/asm/nonmatchings/world/area_dgb/dgb_15/func_802401B4_C4F510.s deleted file mode 100644 index f9e025df1f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/func_802401B4_C4F510.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_C4F6C4 -/* C4F6C4 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C4F6C8 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* C4F6CC 802401BC 0080882D */ daddu $s1, $a0, $zero -/* C4F6D0 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C4F6D4 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* C4F6D8 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* C4F6DC 802401CC 0C00EABB */ jal get_npc_unsafe -/* C4F6E0 802401D0 86040008 */ lh $a0, 8($s0) -/* C4F6E4 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* C4F6E8 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* C4F6EC 802401DC A443008E */ sh $v1, 0x8e($v0) -/* C4F6F0 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* C4F6F4 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* C4F6F8 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* C4F6FC 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* C4F700 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* C4F704 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* C4F708 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* C4F70C 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* C4F710 80240200 03E00008 */ jr $ra -/* C4F714 80240204 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/func_80240208_C4F510.s b/asm/nonmatchings/world/area_dgb/dgb_15/func_80240208_C4F510.s deleted file mode 100644 index f4c17ac8cc..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/func_80240208_C4F510.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240208_C4F718 -/* C4F718 80240208 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C4F71C 8024020C AFBF0024 */ sw $ra, 0x24($sp) -/* C4F720 80240210 AFB40020 */ sw $s4, 0x20($sp) -/* C4F724 80240214 AFB3001C */ sw $s3, 0x1c($sp) -/* C4F728 80240218 AFB20018 */ sw $s2, 0x18($sp) -/* C4F72C 8024021C AFB10014 */ sw $s1, 0x14($sp) -/* C4F730 80240220 AFB00010 */ sw $s0, 0x10($sp) -/* C4F734 80240224 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C4F738 80240228 8C900148 */ lw $s0, 0x148($a0) -/* C4F73C 8024022C 86040008 */ lh $a0, 8($s0) -/* C4F740 80240230 0C00EABB */ jal get_npc_unsafe -/* C4F744 80240234 24110001 */ addiu $s1, $zero, 1 -/* C4F748 80240238 86040008 */ lh $a0, 8($s0) -/* C4F74C 8024023C 0040802D */ daddu $s0, $v0, $zero -/* C4F750 80240240 3C05800B */ lui $a1, %hi(gCameras) -/* C4F754 80240244 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C4F758 80240248 3C03800A */ lui $v1, 0x800a -/* C4F75C 8024024C 8463A634 */ lh $v1, -0x59cc($v1) -/* C4F760 80240250 00912021 */ addu $a0, $a0, $s1 -/* C4F764 80240254 00031080 */ sll $v0, $v1, 2 -/* C4F768 80240258 00431021 */ addu $v0, $v0, $v1 -/* C4F76C 8024025C 00021080 */ sll $v0, $v0, 2 -/* C4F770 80240260 00431023 */ subu $v0, $v0, $v1 -/* C4F774 80240264 000218C0 */ sll $v1, $v0, 3 -/* C4F778 80240268 00431021 */ addu $v0, $v0, $v1 -/* C4F77C 8024026C 000210C0 */ sll $v0, $v0, 3 -/* C4F780 80240270 0C00FB3A */ jal get_enemy -/* C4F784 80240274 00459021 */ addu $s2, $v0, $a1 -/* C4F788 80240278 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C4F78C 8024027C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C4F790 80240280 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C4F794 80240284 8E830000 */ lw $v1, ($s4) -/* C4F798 80240288 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C4F79C 8024028C 8C660028 */ lw $a2, 0x28($v1) -/* C4F7A0 80240290 8C670030 */ lw $a3, 0x30($v1) -/* C4F7A4 80240294 0C00A7B5 */ jal dist2D -/* C4F7A8 80240298 0040982D */ daddu $s3, $v0, $zero -/* C4F7AC 8024029C C6620074 */ lwc1 $f2, 0x74($s3) -/* C4F7B0 802402A0 468010A0 */ cvt.s.w $f2, $f2 -/* C4F7B4 802402A4 4600103C */ c.lt.s $f2, $f0 -/* C4F7B8 802402A8 00000000 */ nop -/* C4F7BC 802402AC 45030001 */ bc1tl .L802402B4 -/* C4F7C0 802402B0 0000882D */ daddu $s1, $zero, $zero -.L802402B4: -/* C4F7C4 802402B4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C4F7C8 802402B8 C60E000C */ lwc1 $f14, 0xc($s0) -/* C4F7CC 802402BC 3C014387 */ lui $at, 0x4387 -/* C4F7D0 802402C0 4481A000 */ mtc1 $at, $f20 -/* C4F7D4 802402C4 0C00A70A */ jal get_clamped_angle_diff -/* C4F7D8 802402C8 00000000 */ nop -/* C4F7DC 802402CC 0C00A6C9 */ jal clamp_angle -/* C4F7E0 802402D0 46000306 */ mov.s $f12, $f0 -/* C4F7E4 802402D4 3C018024 */ lui $at, 0x8024 -/* C4F7E8 802402D8 D4222CF0 */ ldc1 $f2, 0x2cf0($at) -/* C4F7EC 802402DC 46000021 */ cvt.d.s $f0, $f0 -/* C4F7F0 802402E0 4622003C */ c.lt.d $f0, $f2 -/* C4F7F4 802402E4 00000000 */ nop -/* C4F7F8 802402E8 45000003 */ bc1f .L802402F8 -/* C4F7FC 802402EC 00000000 */ nop -/* C4F800 802402F0 3C0142B4 */ lui $at, 0x42b4 -/* C4F804 802402F4 4481A000 */ mtc1 $at, $f20 -.L802402F8: -/* C4F808 802402F8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C4F80C 802402FC 8E820000 */ lw $v0, ($s4) -/* C4F810 80240300 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C4F814 80240304 8C460028 */ lw $a2, 0x28($v0) -/* C4F818 80240308 0C00A720 */ jal atan2 -/* C4F81C 8024030C 8C470030 */ lw $a3, 0x30($v0) -/* C4F820 80240310 4600A306 */ mov.s $f12, $f20 -/* C4F824 80240314 0C00A70A */ jal get_clamped_angle_diff -/* C4F828 80240318 46000386 */ mov.s $f14, $f0 -/* C4F82C 8024031C C6620078 */ lwc1 $f2, 0x78($s3) -/* C4F830 80240320 468010A0 */ cvt.s.w $f2, $f2 -/* C4F834 80240324 46000005 */ abs.s $f0, $f0 -/* C4F838 80240328 4600103C */ c.lt.s $f2, $f0 -/* C4F83C 8024032C 00000000 */ nop -/* C4F840 80240330 45030001 */ bc1tl .L80240338 -/* C4F844 80240334 0000882D */ daddu $s1, $zero, $zero -.L80240338: -/* C4F848 80240338 8E820000 */ lw $v0, ($s4) -/* C4F84C 8024033C C600003C */ lwc1 $f0, 0x3c($s0) -/* C4F850 80240340 C442002C */ lwc1 $f2, 0x2c($v0) -/* C4F854 80240344 860200A8 */ lh $v0, 0xa8($s0) -/* C4F858 80240348 46020001 */ sub.s $f0, $f0, $f2 -/* C4F85C 8024034C 44821000 */ mtc1 $v0, $f2 -/* C4F860 80240350 00000000 */ nop -/* C4F864 80240354 468010A1 */ cvt.d.w $f2, $f2 -/* C4F868 80240358 46221080 */ add.d $f2, $f2, $f2 -/* C4F86C 8024035C 46000005 */ abs.s $f0, $f0 -/* C4F870 80240360 46000021 */ cvt.d.s $f0, $f0 -/* C4F874 80240364 4620103E */ c.le.d $f2, $f0 -/* C4F878 80240368 00000000 */ nop -/* C4F87C 8024036C 45030001 */ bc1tl .L80240374 -/* C4F880 80240370 0000882D */ daddu $s1, $zero, $zero -.L80240374: -/* C4F884 80240374 3C038011 */ lui $v1, 0x8011 -/* C4F888 80240378 8063EBB3 */ lb $v1, -0x144d($v1) -/* C4F88C 8024037C 24020009 */ addiu $v0, $zero, 9 -/* C4F890 80240380 50620001 */ beql $v1, $v0, .L80240388 -/* C4F894 80240384 0000882D */ daddu $s1, $zero, $zero -.L80240388: -/* C4F898 80240388 24020007 */ addiu $v0, $zero, 7 -/* C4F89C 8024038C 50620001 */ beql $v1, $v0, .L80240394 -/* C4F8A0 80240390 0000882D */ daddu $s1, $zero, $zero -.L80240394: -/* C4F8A4 80240394 0220102D */ daddu $v0, $s1, $zero -/* C4F8A8 80240398 8FBF0024 */ lw $ra, 0x24($sp) -/* C4F8AC 8024039C 8FB40020 */ lw $s4, 0x20($sp) -/* C4F8B0 802403A0 8FB3001C */ lw $s3, 0x1c($sp) -/* C4F8B4 802403A4 8FB20018 */ lw $s2, 0x18($sp) -/* C4F8B8 802403A8 8FB10014 */ lw $s1, 0x14($sp) -/* C4F8BC 802403AC 8FB00010 */ lw $s0, 0x10($sp) -/* C4F8C0 802403B0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C4F8C4 802403B4 03E00008 */ jr $ra -/* C4F8C8 802403B8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/func_8024061C_C4F510.s b/asm/nonmatchings/world/area_dgb/dgb_15/func_8024061C_C4F510.s deleted file mode 100644 index 1a1a4cb273..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/func_8024061C_C4F510.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_C4FB2C -/* C4FB2C 8024061C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C4FB30 80240620 AFB20038 */ sw $s2, 0x38($sp) -/* C4FB34 80240624 0080902D */ daddu $s2, $a0, $zero -/* C4FB38 80240628 AFBF0048 */ sw $ra, 0x48($sp) -/* C4FB3C 8024062C AFB50044 */ sw $s5, 0x44($sp) -/* C4FB40 80240630 AFB40040 */ sw $s4, 0x40($sp) -/* C4FB44 80240634 AFB3003C */ sw $s3, 0x3c($sp) -/* C4FB48 80240638 AFB10034 */ sw $s1, 0x34($sp) -/* C4FB4C 8024063C AFB00030 */ sw $s0, 0x30($sp) -/* C4FB50 80240640 8E510148 */ lw $s1, 0x148($s2) -/* C4FB54 80240644 86240008 */ lh $a0, 8($s1) -/* C4FB58 80240648 0C00EABB */ jal get_npc_unsafe -/* C4FB5C 8024064C 00A0802D */ daddu $s0, $a1, $zero -/* C4FB60 80240650 8E43000C */ lw $v1, 0xc($s2) -/* C4FB64 80240654 0240202D */ daddu $a0, $s2, $zero -/* C4FB68 80240658 8C650000 */ lw $a1, ($v1) -/* C4FB6C 8024065C 0C0B1EAF */ jal get_variable -/* C4FB70 80240660 0040A82D */ daddu $s5, $v0, $zero -/* C4FB74 80240664 AFA00010 */ sw $zero, 0x10($sp) -/* C4FB78 80240668 8E2300D0 */ lw $v1, 0xd0($s1) -/* C4FB7C 8024066C 8C630030 */ lw $v1, 0x30($v1) -/* C4FB80 80240670 AFA30014 */ sw $v1, 0x14($sp) -/* C4FB84 80240674 8E2300D0 */ lw $v1, 0xd0($s1) -/* C4FB88 80240678 8C63001C */ lw $v1, 0x1c($v1) -/* C4FB8C 8024067C AFA30018 */ sw $v1, 0x18($sp) -/* C4FB90 80240680 8E2300D0 */ lw $v1, 0xd0($s1) -/* C4FB94 80240684 8C630024 */ lw $v1, 0x24($v1) -/* C4FB98 80240688 AFA3001C */ sw $v1, 0x1c($sp) -/* C4FB9C 8024068C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C4FBA0 80240690 8C630028 */ lw $v1, 0x28($v1) -/* C4FBA4 80240694 27B40010 */ addiu $s4, $sp, 0x10 -/* C4FBA8 80240698 AFA30020 */ sw $v1, 0x20($sp) -/* C4FBAC 8024069C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C4FBB0 802406A0 3C014282 */ lui $at, 0x4282 -/* C4FBB4 802406A4 44810000 */ mtc1 $at, $f0 -/* C4FBB8 802406A8 8C63002C */ lw $v1, 0x2c($v1) -/* C4FBBC 802406AC 0040982D */ daddu $s3, $v0, $zero -/* C4FBC0 802406B0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C4FBC4 802406B4 A7A0002C */ sh $zero, 0x2c($sp) -/* C4FBC8 802406B8 16000005 */ bnez $s0, .L802406D0 -/* C4FBCC 802406BC AFA30024 */ sw $v1, 0x24($sp) -/* C4FBD0 802406C0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C4FBD4 802406C4 30420004 */ andi $v0, $v0, 4 -/* C4FBD8 802406C8 10400020 */ beqz $v0, .L8024074C -/* C4FBDC 802406CC 00000000 */ nop -.L802406D0: -/* C4FBE0 802406D0 2404F7FF */ addiu $a0, $zero, -0x801 -/* C4FBE4 802406D4 AE400070 */ sw $zero, 0x70($s2) -/* C4FBE8 802406D8 A6A0008E */ sh $zero, 0x8e($s5) -/* C4FBEC 802406DC 8E2200CC */ lw $v0, 0xcc($s1) -/* C4FBF0 802406E0 8EA30000 */ lw $v1, ($s5) -/* C4FBF4 802406E4 8C420000 */ lw $v0, ($v0) -/* C4FBF8 802406E8 00641824 */ and $v1, $v1, $a0 -/* C4FBFC 802406EC AEA30000 */ sw $v1, ($s5) -/* C4FC00 802406F0 AEA20028 */ sw $v0, 0x28($s5) -/* C4FC04 802406F4 8E2200D0 */ lw $v0, 0xd0($s1) -/* C4FC08 802406F8 8C420034 */ lw $v0, 0x34($v0) -/* C4FC0C 802406FC 54400005 */ bnel $v0, $zero, .L80240714 -/* C4FC10 80240700 2402FDFF */ addiu $v0, $zero, -0x201 -/* C4FC14 80240704 34620200 */ ori $v0, $v1, 0x200 -/* C4FC18 80240708 2403FFF7 */ addiu $v1, $zero, -9 -/* C4FC1C 8024070C 080901C7 */ j .L8024071C -/* C4FC20 80240710 00431024 */ and $v0, $v0, $v1 -.L80240714: -/* C4FC24 80240714 00621024 */ and $v0, $v1, $v0 -/* C4FC28 80240718 34420008 */ ori $v0, $v0, 8 -.L8024071C: -/* C4FC2C 8024071C AEA20000 */ sw $v0, ($s5) -/* C4FC30 80240720 8E2200B0 */ lw $v0, 0xb0($s1) -/* C4FC34 80240724 30420004 */ andi $v0, $v0, 4 -/* C4FC38 80240728 10400007 */ beqz $v0, .L80240748 -/* C4FC3C 8024072C 24020063 */ addiu $v0, $zero, 0x63 -/* C4FC40 80240730 AE420070 */ sw $v0, 0x70($s2) -/* C4FC44 80240734 AE400074 */ sw $zero, 0x74($s2) -/* C4FC48 80240738 8E2200B0 */ lw $v0, 0xb0($s1) -/* C4FC4C 8024073C 2403FFFB */ addiu $v1, $zero, -5 -/* C4FC50 80240740 00431024 */ and $v0, $v0, $v1 -/* C4FC54 80240744 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240748: -/* C4FC58 80240748 AE20006C */ sw $zero, 0x6c($s1) -.L8024074C: -/* C4FC5C 8024074C 8E420070 */ lw $v0, 0x70($s2) -/* C4FC60 80240750 2842001E */ slti $v0, $v0, 0x1e -/* C4FC64 80240754 10400009 */ beqz $v0, .L8024077C -/* C4FC68 80240758 00000000 */ nop -/* C4FC6C 8024075C 8E22006C */ lw $v0, 0x6c($s1) -/* C4FC70 80240760 14400006 */ bnez $v0, .L8024077C -/* C4FC74 80240764 00000000 */ nop -/* C4FC78 80240768 0C090082 */ jal func_80240208 -/* C4FC7C 8024076C 0240202D */ daddu $a0, $s2, $zero -/* C4FC80 80240770 10400002 */ beqz $v0, .L8024077C -/* C4FC84 80240774 2402001E */ addiu $v0, $zero, 0x1e -/* C4FC88 80240778 AE420070 */ sw $v0, 0x70($s2) -.L8024077C: -/* C4FC8C 8024077C 8E430070 */ lw $v1, 0x70($s2) -/* C4FC90 80240780 2C620064 */ sltiu $v0, $v1, 0x64 -/* C4FC94 80240784 10400048 */ beqz $v0, .L802408A8 -/* C4FC98 80240788 00031080 */ sll $v0, $v1, 2 -/* C4FC9C 8024078C 3C018024 */ lui $at, 0x8024 -/* C4FCA0 80240790 00220821 */ addu $at, $at, $v0 -/* C4FCA4 80240794 8C222CF8 */ lw $v0, 0x2cf8($at) -/* C4FCA8 80240798 00400008 */ jr $v0 -/* C4FCAC 8024079C 00000000 */ nop -/* C4FCB0 802407A0 0240202D */ daddu $a0, $s2, $zero -/* C4FCB4 802407A4 0260282D */ daddu $a1, $s3, $zero -/* C4FCB8 802407A8 0C012568 */ jal func_800495A0 -/* C4FCBC 802407AC 0280302D */ daddu $a2, $s4, $zero -/* C4FCC0 802407B0 0240202D */ daddu $a0, $s2, $zero -/* C4FCC4 802407B4 0260282D */ daddu $a1, $s3, $zero -/* C4FCC8 802407B8 0C0125AE */ jal func_800496B8 -/* C4FCCC 802407BC 0280302D */ daddu $a2, $s4, $zero -/* C4FCD0 802407C0 0809022A */ j .L802408A8 -/* C4FCD4 802407C4 00000000 */ nop -/* C4FCD8 802407C8 0240202D */ daddu $a0, $s2, $zero -/* C4FCDC 802407CC 0260282D */ daddu $a1, $s3, $zero -/* C4FCE0 802407D0 0C0126D1 */ jal func_80049B44 -/* C4FCE4 802407D4 0280302D */ daddu $a2, $s4, $zero -/* C4FCE8 802407D8 0240202D */ daddu $a0, $s2, $zero -/* C4FCEC 802407DC 0260282D */ daddu $a1, $s3, $zero -/* C4FCF0 802407E0 0C012701 */ jal func_80049C04 -/* C4FCF4 802407E4 0280302D */ daddu $a2, $s4, $zero -/* C4FCF8 802407E8 0809022A */ j .L802408A8 -/* C4FCFC 802407EC 00000000 */ nop -/* C4FD00 802407F0 0240202D */ daddu $a0, $s2, $zero -/* C4FD04 802407F4 0260282D */ daddu $a1, $s3, $zero -/* C4FD08 802407F8 0C01278F */ jal func_80049E3C -/* C4FD0C 802407FC 0280302D */ daddu $a2, $s4, $zero -/* C4FD10 80240800 0240202D */ daddu $a0, $s2, $zero -/* C4FD14 80240804 0260282D */ daddu $a1, $s3, $zero -/* C4FD18 80240808 0C0127B3 */ jal func_80049ECC -/* C4FD1C 8024080C 0280302D */ daddu $a2, $s4, $zero -/* C4FD20 80240810 0809022A */ j .L802408A8 -/* C4FD24 80240814 00000000 */ nop -/* C4FD28 80240818 0240202D */ daddu $a0, $s2, $zero -/* C4FD2C 8024081C 0260282D */ daddu $a1, $s3, $zero -/* C4FD30 80240820 0C0127DF */ jal func_80049F7C -/* C4FD34 80240824 0280302D */ daddu $a2, $s4, $zero -/* C4FD38 80240828 0240202D */ daddu $a0, $s2, $zero -/* C4FD3C 8024082C 0260282D */ daddu $a1, $s3, $zero -/* C4FD40 80240830 0C012849 */ jal func_8004A124 -/* C4FD44 80240834 0280302D */ daddu $a2, $s4, $zero -/* C4FD48 80240838 0809022A */ j .L802408A8 -/* C4FD4C 8024083C 00000000 */ nop -/* C4FD50 80240840 0240202D */ daddu $a0, $s2, $zero -/* C4FD54 80240844 0260282D */ daddu $a1, $s3, $zero -/* C4FD58 80240848 0C0128FA */ jal func_8004A3E8 -/* C4FD5C 8024084C 0280302D */ daddu $a2, $s4, $zero -/* C4FD60 80240850 0809022A */ j .L802408A8 -/* C4FD64 80240854 00000000 */ nop -/* C4FD68 80240858 0C090000 */ jal func_80240000 -/* C4FD6C 8024085C 0240202D */ daddu $a0, $s2, $zero -/* C4FD70 80240860 0C09001B */ jal func_8024006C -/* C4FD74 80240864 0240202D */ daddu $a0, $s2, $zero -/* C4FD78 80240868 8E430070 */ lw $v1, 0x70($s2) -/* C4FD7C 8024086C 24020020 */ addiu $v0, $zero, 0x20 -/* C4FD80 80240870 1462000D */ bne $v1, $v0, .L802408A8 -/* C4FD84 80240874 00000000 */ nop -/* C4FD88 80240878 0C090037 */ jal func_802400DC -/* C4FD8C 8024087C 0240202D */ daddu $a0, $s2, $zero -/* C4FD90 80240880 8E430070 */ lw $v1, 0x70($s2) -/* C4FD94 80240884 24020021 */ addiu $v0, $zero, 0x21 -/* C4FD98 80240888 14620007 */ bne $v1, $v0, .L802408A8 -/* C4FD9C 8024088C 00000000 */ nop -/* C4FDA0 80240890 0C09006D */ jal func_802401B4 -/* C4FDA4 80240894 0240202D */ daddu $a0, $s2, $zero -/* C4FDA8 80240898 0809022A */ j .L802408A8 -/* C4FDAC 8024089C 00000000 */ nop -/* C4FDB0 802408A0 0C0129CF */ jal func_8004A73C -/* C4FDB4 802408A4 0240202D */ daddu $a0, $s2, $zero -.L802408A8: -/* C4FDB8 802408A8 8FBF0048 */ lw $ra, 0x48($sp) -/* C4FDBC 802408AC 8FB50044 */ lw $s5, 0x44($sp) -/* C4FDC0 802408B0 8FB40040 */ lw $s4, 0x40($sp) -/* C4FDC4 802408B4 8FB3003C */ lw $s3, 0x3c($sp) -/* C4FDC8 802408B8 8FB20038 */ lw $s2, 0x38($sp) -/* C4FDCC 802408BC 8FB10034 */ lw $s1, 0x34($sp) -/* C4FDD0 802408C0 8FB00030 */ lw $s0, 0x30($sp) -/* C4FDD4 802408C4 0000102D */ daddu $v0, $zero, $zero -/* C4FDD8 802408C8 03E00008 */ jr $ra -/* C4FDDC 802408CC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/func_802408D0_C4F510.s b/asm/nonmatchings/world/area_dgb/dgb_15/func_802408D0_C4F510.s deleted file mode 100644 index 3d0147cb7a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/func_802408D0_C4F510.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408D0_C4FDE0 -/* C4FDE0 802408D0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C4FDE4 802408D4 AFB50024 */ sw $s5, 0x24($sp) -/* C4FDE8 802408D8 0080A82D */ daddu $s5, $a0, $zero -/* C4FDEC 802408DC AFBF002C */ sw $ra, 0x2c($sp) -/* C4FDF0 802408E0 AFB60028 */ sw $s6, 0x28($sp) -/* C4FDF4 802408E4 AFB40020 */ sw $s4, 0x20($sp) -/* C4FDF8 802408E8 AFB3001C */ sw $s3, 0x1c($sp) -/* C4FDFC 802408EC AFB20018 */ sw $s2, 0x18($sp) -/* C4FE00 802408F0 AFB10014 */ sw $s1, 0x14($sp) -/* C4FE04 802408F4 AFB00010 */ sw $s0, 0x10($sp) -/* C4FE08 802408F8 F7B80040 */ sdc1 $f24, 0x40($sp) -/* C4FE0C 802408FC F7B60038 */ sdc1 $f22, 0x38($sp) -/* C4FE10 80240900 F7B40030 */ sdc1 $f20, 0x30($sp) -/* C4FE14 80240904 8EB30148 */ lw $s3, 0x148($s5) -/* C4FE18 80240908 86640008 */ lh $a0, 8($s3) -/* C4FE1C 8024090C 0C00EABB */ jal get_npc_unsafe -/* C4FE20 80240910 00A0B02D */ daddu $s6, $a1, $zero -/* C4FE24 80240914 0040A02D */ daddu $s4, $v0, $zero -/* C4FE28 80240918 AEA00074 */ sw $zero, 0x74($s5) -/* C4FE2C 8024091C C6980038 */ lwc1 $f24, 0x38($s4) -/* C4FE30 80240920 C6960040 */ lwc1 $f22, 0x40($s4) -/* C4FE34 80240924 0000902D */ daddu $s2, $zero, $zero -/* C4FE38 80240928 AEA00078 */ sw $zero, 0x78($s5) -/* C4FE3C 8024092C 8E6300D0 */ lw $v1, 0xd0($s3) -/* C4FE40 80240930 8C620000 */ lw $v0, ($v1) -/* C4FE44 80240934 3C0146FF */ lui $at, 0x46ff -/* C4FE48 80240938 3421FE00 */ ori $at, $at, 0xfe00 -/* C4FE4C 8024093C 4481A000 */ mtc1 $at, $f20 -/* C4FE50 80240940 18400018 */ blez $v0, .L802409A4 -/* C4FE54 80240944 0240802D */ daddu $s0, $s2, $zero -/* C4FE58 80240948 0240882D */ daddu $s1, $s2, $zero -.L8024094C: -/* C4FE5C 8024094C 02231021 */ addu $v0, $s1, $v1 -/* C4FE60 80240950 4600C306 */ mov.s $f12, $f24 -/* C4FE64 80240954 C4440004 */ lwc1 $f4, 4($v0) -/* C4FE68 80240958 46802120 */ cvt.s.w $f4, $f4 -/* C4FE6C 8024095C 44062000 */ mfc1 $a2, $f4 -/* C4FE70 80240960 C444000C */ lwc1 $f4, 0xc($v0) -/* C4FE74 80240964 46802120 */ cvt.s.w $f4, $f4 -/* C4FE78 80240968 44072000 */ mfc1 $a3, $f4 -/* C4FE7C 8024096C 0C00A7B5 */ jal dist2D -/* C4FE80 80240970 4600B386 */ mov.s $f14, $f22 -/* C4FE84 80240974 4614003C */ c.lt.s $f0, $f20 -/* C4FE88 80240978 00000000 */ nop -/* C4FE8C 8024097C 45000003 */ bc1f .L8024098C -/* C4FE90 80240980 2631000C */ addiu $s1, $s1, 0xc -/* C4FE94 80240984 46000506 */ mov.s $f20, $f0 -/* C4FE98 80240988 AEB20078 */ sw $s2, 0x78($s5) -.L8024098C: -/* C4FE9C 8024098C 8E6300D0 */ lw $v1, 0xd0($s3) -/* C4FEA0 80240990 26100001 */ addiu $s0, $s0, 1 -/* C4FEA4 80240994 8C620000 */ lw $v0, ($v1) -/* C4FEA8 80240998 0202102A */ slt $v0, $s0, $v0 -/* C4FEAC 8024099C 1440FFEB */ bnez $v0, .L8024094C -/* C4FEB0 802409A0 26520001 */ addiu $s2, $s2, 1 -.L802409A4: -/* C4FEB4 802409A4 8E6200CC */ lw $v0, 0xcc($s3) -/* C4FEB8 802409A8 8C420004 */ lw $v0, 4($v0) -/* C4FEBC 802409AC AE820028 */ sw $v0, 0x28($s4) -/* C4FEC0 802409B0 8E6200D0 */ lw $v0, 0xd0($s3) -/* C4FEC4 802409B4 8C42007C */ lw $v0, 0x7c($v0) -/* C4FEC8 802409B8 04410004 */ bgez $v0, .L802409CC -/* C4FECC 802409BC 00000000 */ nop -/* C4FED0 802409C0 C6C00000 */ lwc1 $f0, ($s6) -/* C4FED4 802409C4 0809027B */ j .L802409EC -/* C4FED8 802409C8 E6800018 */ swc1 $f0, 0x18($s4) -.L802409CC: -/* C4FEDC 802409CC 3C018024 */ lui $at, 0x8024 -/* C4FEE0 802409D0 D4222E88 */ ldc1 $f2, 0x2e88($at) -/* C4FEE4 802409D4 44820000 */ mtc1 $v0, $f0 -/* C4FEE8 802409D8 00000000 */ nop -/* C4FEEC 802409DC 46800021 */ cvt.d.w $f0, $f0 -/* C4FEF0 802409E0 46220003 */ div.d $f0, $f0, $f2 -/* C4FEF4 802409E4 46200020 */ cvt.s.d $f0, $f0 -/* C4FEF8 802409E8 E6800018 */ swc1 $f0, 0x18($s4) -.L802409EC: -/* C4FEFC 802409EC 24020001 */ addiu $v0, $zero, 1 -/* C4FF00 802409F0 AEA20070 */ sw $v0, 0x70($s5) -/* C4FF04 802409F4 8FBF002C */ lw $ra, 0x2c($sp) -/* C4FF08 802409F8 8FB60028 */ lw $s6, 0x28($sp) -/* C4FF0C 802409FC 8FB50024 */ lw $s5, 0x24($sp) -/* C4FF10 80240A00 8FB40020 */ lw $s4, 0x20($sp) -/* C4FF14 80240A04 8FB3001C */ lw $s3, 0x1c($sp) -/* C4FF18 80240A08 8FB20018 */ lw $s2, 0x18($sp) -/* C4FF1C 80240A0C 8FB10014 */ lw $s1, 0x14($sp) -/* C4FF20 80240A10 8FB00010 */ lw $s0, 0x10($sp) -/* C4FF24 80240A14 D7B80040 */ ldc1 $f24, 0x40($sp) -/* C4FF28 80240A18 D7B60038 */ ldc1 $f22, 0x38($sp) -/* C4FF2C 80240A1C D7B40030 */ ldc1 $f20, 0x30($sp) -/* C4FF30 80240A20 03E00008 */ jr $ra -/* C4FF34 80240A24 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/func_80240A28_C4F510.s b/asm/nonmatchings/world/area_dgb/dgb_15/func_80240A28_C4F510.s deleted file mode 100644 index ac06c4f872..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/func_80240A28_C4F510.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A28_C4FF38 -/* C4FF38 80240A28 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C4FF3C 80240A2C AFB20038 */ sw $s2, 0x38($sp) -/* C4FF40 80240A30 0080902D */ daddu $s2, $a0, $zero -/* C4FF44 80240A34 AFBF0044 */ sw $ra, 0x44($sp) -/* C4FF48 80240A38 AFB40040 */ sw $s4, 0x40($sp) -/* C4FF4C 80240A3C AFB3003C */ sw $s3, 0x3c($sp) -/* C4FF50 80240A40 AFB10034 */ sw $s1, 0x34($sp) -/* C4FF54 80240A44 AFB00030 */ sw $s0, 0x30($sp) -/* C4FF58 80240A48 F7B60050 */ sdc1 $f22, 0x50($sp) -/* C4FF5C 80240A4C F7B40048 */ sdc1 $f20, 0x48($sp) -/* C4FF60 80240A50 8E510148 */ lw $s1, 0x148($s2) -/* C4FF64 80240A54 00A0982D */ daddu $s3, $a1, $zero -/* C4FF68 80240A58 86240008 */ lh $a0, 8($s1) -/* C4FF6C 80240A5C 0C00EABB */ jal get_npc_unsafe -/* C4FF70 80240A60 00C0A02D */ daddu $s4, $a2, $zero -/* C4FF74 80240A64 8E630014 */ lw $v1, 0x14($s3) -/* C4FF78 80240A68 04600030 */ bltz $v1, .L80240B2C -/* C4FF7C 80240A6C 0040802D */ daddu $s0, $v0, $zero -/* C4FF80 80240A70 8E420074 */ lw $v0, 0x74($s2) -/* C4FF84 80240A74 1C40002C */ bgtz $v0, .L80240B28 -/* C4FF88 80240A78 2442FFFF */ addiu $v0, $v0, -1 -/* C4FF8C 80240A7C 0280202D */ daddu $a0, $s4, $zero -/* C4FF90 80240A80 AE430074 */ sw $v1, 0x74($s2) -/* C4FF94 80240A84 AFA00010 */ sw $zero, 0x10($sp) -/* C4FF98 80240A88 8E66000C */ lw $a2, 0xc($s3) -/* C4FF9C 80240A8C 8E670010 */ lw $a3, 0x10($s3) -/* C4FFA0 80240A90 0C01242D */ jal func_800490B4 -/* C4FFA4 80240A94 0220282D */ daddu $a1, $s1, $zero -/* C4FFA8 80240A98 10400021 */ beqz $v0, .L80240B20 -/* C4FFAC 80240A9C 0000202D */ daddu $a0, $zero, $zero -/* C4FFB0 80240AA0 0200282D */ daddu $a1, $s0, $zero -/* C4FFB4 80240AA4 0000302D */ daddu $a2, $zero, $zero -/* C4FFB8 80240AA8 860300A8 */ lh $v1, 0xa8($s0) -/* C4FFBC 80240AAC 3C013F80 */ lui $at, 0x3f80 -/* C4FFC0 80240AB0 44810000 */ mtc1 $at, $f0 -/* C4FFC4 80240AB4 3C014000 */ lui $at, 0x4000 -/* C4FFC8 80240AB8 44811000 */ mtc1 $at, $f2 -/* C4FFCC 80240ABC 3C01C1A0 */ lui $at, 0xc1a0 -/* C4FFD0 80240AC0 44812000 */ mtc1 $at, $f4 -/* C4FFD4 80240AC4 2402000F */ addiu $v0, $zero, 0xf -/* C4FFD8 80240AC8 AFA2001C */ sw $v0, 0x1c($sp) -/* C4FFDC 80240ACC 44833000 */ mtc1 $v1, $f6 -/* C4FFE0 80240AD0 00000000 */ nop -/* C4FFE4 80240AD4 468031A0 */ cvt.s.w $f6, $f6 -/* C4FFE8 80240AD8 44073000 */ mfc1 $a3, $f6 -/* C4FFEC 80240ADC 27A20028 */ addiu $v0, $sp, 0x28 -/* C4FFF0 80240AE0 AFA20020 */ sw $v0, 0x20($sp) -/* C4FFF4 80240AE4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C4FFF8 80240AE8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C4FFFC 80240AEC 0C01BFA4 */ jal fx_emote -/* C50000 80240AF0 E7A40018 */ swc1 $f4, 0x18($sp) -/* C50004 80240AF4 0200202D */ daddu $a0, $s0, $zero -/* C50008 80240AF8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C5000C 80240AFC 0C012530 */ jal func_800494C0 -/* C50010 80240B00 3C060020 */ lui $a2, 0x20 -/* C50014 80240B04 8E220018 */ lw $v0, 0x18($s1) -/* C50018 80240B08 9442002A */ lhu $v0, 0x2a($v0) -/* C5001C 80240B0C 30420001 */ andi $v0, $v0, 1 -/* C50020 80240B10 14400064 */ bnez $v0, .L80240CA4 -/* C50024 80240B14 2402000A */ addiu $v0, $zero, 0xa -/* C50028 80240B18 08090329 */ j .L80240CA4 -/* C5002C 80240B1C 2402000C */ addiu $v0, $zero, 0xc -.L80240B20: -/* C50030 80240B20 8E420074 */ lw $v0, 0x74($s2) -/* C50034 80240B24 2442FFFF */ addiu $v0, $v0, -1 -.L80240B28: -/* C50038 80240B28 AE420074 */ sw $v0, 0x74($s2) -.L80240B2C: -/* C5003C 80240B2C 8602008C */ lh $v0, 0x8c($s0) -/* C50040 80240B30 1440005D */ bnez $v0, .L80240CA8 -/* C50044 80240B34 00000000 */ nop -/* C50048 80240B38 C6000018 */ lwc1 $f0, 0x18($s0) -/* C5004C 80240B3C 3C014010 */ lui $at, 0x4010 -/* C50050 80240B40 44811800 */ mtc1 $at, $f3 -/* C50054 80240B44 44801000 */ mtc1 $zero, $f2 -/* C50058 80240B48 46000021 */ cvt.d.s $f0, $f0 -/* C5005C 80240B4C 4622003C */ c.lt.d $f0, $f2 -/* C50060 80240B50 00000000 */ nop -/* C50064 80240B54 45000003 */ bc1f .L80240B64 -/* C50068 80240B58 0200202D */ daddu $a0, $s0, $zero -/* C5006C 80240B5C 080902DA */ j .L80240B68 -/* C50070 80240B60 0000282D */ daddu $a1, $zero, $zero -.L80240B64: -/* C50074 80240B64 24050001 */ addiu $a1, $zero, 1 -.L80240B68: -/* C50078 80240B68 0C00F598 */ jal func_8003D660 -/* C5007C 80240B6C 00000000 */ nop -/* C50080 80240B70 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C50084 80240B74 8E430078 */ lw $v1, 0x78($s2) -/* C50088 80240B78 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C5008C 80240B7C 00031040 */ sll $v0, $v1, 1 -/* C50090 80240B80 00431021 */ addu $v0, $v0, $v1 -/* C50094 80240B84 8E2300D0 */ lw $v1, 0xd0($s1) -/* C50098 80240B88 00021080 */ sll $v0, $v0, 2 -/* C5009C 80240B8C 00431021 */ addu $v0, $v0, $v1 -/* C500A0 80240B90 C4560004 */ lwc1 $f22, 4($v0) -/* C500A4 80240B94 4680B5A0 */ cvt.s.w $f22, $f22 -/* C500A8 80240B98 C454000C */ lwc1 $f20, 0xc($v0) -/* C500AC 80240B9C 4680A520 */ cvt.s.w $f20, $f20 -/* C500B0 80240BA0 4406B000 */ mfc1 $a2, $f22 -/* C500B4 80240BA4 4407A000 */ mfc1 $a3, $f20 -/* C500B8 80240BA8 0C00A720 */ jal atan2 -/* C500BC 80240BAC 00000000 */ nop -/* C500C0 80240BB0 8E050018 */ lw $a1, 0x18($s0) -/* C500C4 80240BB4 44060000 */ mfc1 $a2, $f0 -/* C500C8 80240BB8 0200202D */ daddu $a0, $s0, $zero -/* C500CC 80240BBC 0C00EA95 */ jal npc_move_heading -/* C500D0 80240BC0 AE06000C */ sw $a2, 0xc($s0) -/* C500D4 80240BC4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C500D8 80240BC8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C500DC 80240BCC 4406B000 */ mfc1 $a2, $f22 -/* C500E0 80240BD0 4407A000 */ mfc1 $a3, $f20 -/* C500E4 80240BD4 0C00A7B5 */ jal dist2D -/* C500E8 80240BD8 00000000 */ nop -/* C500EC 80240BDC C6020018 */ lwc1 $f2, 0x18($s0) -/* C500F0 80240BE0 4602003E */ c.le.s $f0, $f2 -/* C500F4 80240BE4 00000000 */ nop -/* C500F8 80240BE8 4500002F */ bc1f .L80240CA8 -/* C500FC 80240BEC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C50100 80240BF0 24020002 */ addiu $v0, $zero, 2 -/* C50104 80240BF4 0C00A67F */ jal rand_int -/* C50108 80240BF8 AE420070 */ sw $v0, 0x70($s2) -/* C5010C 80240BFC 3C035555 */ lui $v1, 0x5555 -/* C50110 80240C00 34635556 */ ori $v1, $v1, 0x5556 -/* C50114 80240C04 00430018 */ mult $v0, $v1 -/* C50118 80240C08 000227C3 */ sra $a0, $v0, 0x1f -/* C5011C 80240C0C 00004010 */ mfhi $t0 -/* C50120 80240C10 01042023 */ subu $a0, $t0, $a0 -/* C50124 80240C14 00041840 */ sll $v1, $a0, 1 -/* C50128 80240C18 00641821 */ addu $v1, $v1, $a0 -/* C5012C 80240C1C 00431023 */ subu $v0, $v0, $v1 -/* C50130 80240C20 24430002 */ addiu $v1, $v0, 2 -/* C50134 80240C24 AE430074 */ sw $v1, 0x74($s2) -/* C50138 80240C28 8E62002C */ lw $v0, 0x2c($s3) -/* C5013C 80240C2C 18400009 */ blez $v0, .L80240C54 -/* C50140 80240C30 24020004 */ addiu $v0, $zero, 4 -/* C50144 80240C34 8E620004 */ lw $v0, 4($s3) -/* C50148 80240C38 18400006 */ blez $v0, .L80240C54 -/* C5014C 80240C3C 24020004 */ addiu $v0, $zero, 4 -/* C50150 80240C40 8E620008 */ lw $v0, 8($s3) -/* C50154 80240C44 18400003 */ blez $v0, .L80240C54 -/* C50158 80240C48 24020004 */ addiu $v0, $zero, 4 -/* C5015C 80240C4C 14600002 */ bnez $v1, .L80240C58 -/* C50160 80240C50 00000000 */ nop -.L80240C54: -/* C50164 80240C54 AE420070 */ sw $v0, 0x70($s2) -.L80240C58: -/* C50168 80240C58 0C00A67F */ jal rand_int -/* C5016C 80240C5C 24042710 */ addiu $a0, $zero, 0x2710 -/* C50170 80240C60 3C0351EB */ lui $v1, 0x51eb -/* C50174 80240C64 3463851F */ ori $v1, $v1, 0x851f -/* C50178 80240C68 00430018 */ mult $v0, $v1 -/* C5017C 80240C6C 00021FC3 */ sra $v1, $v0, 0x1f -/* C50180 80240C70 00004010 */ mfhi $t0 -/* C50184 80240C74 00082143 */ sra $a0, $t0, 5 -/* C50188 80240C78 00832023 */ subu $a0, $a0, $v1 -/* C5018C 80240C7C 00041840 */ sll $v1, $a0, 1 -/* C50190 80240C80 00641821 */ addu $v1, $v1, $a0 -/* C50194 80240C84 000318C0 */ sll $v1, $v1, 3 -/* C50198 80240C88 00641821 */ addu $v1, $v1, $a0 -/* C5019C 80240C8C 00031880 */ sll $v1, $v1, 2 -/* C501A0 80240C90 8E640004 */ lw $a0, 4($s3) -/* C501A4 80240C94 00431023 */ subu $v0, $v0, $v1 -/* C501A8 80240C98 0044102A */ slt $v0, $v0, $a0 -/* C501AC 80240C9C 10400002 */ beqz $v0, .L80240CA8 -/* C501B0 80240CA0 24020004 */ addiu $v0, $zero, 4 -.L80240CA4: -/* C501B4 80240CA4 AE420070 */ sw $v0, 0x70($s2) -.L80240CA8: -/* C501B8 80240CA8 8FBF0044 */ lw $ra, 0x44($sp) -/* C501BC 80240CAC 8FB40040 */ lw $s4, 0x40($sp) -/* C501C0 80240CB0 8FB3003C */ lw $s3, 0x3c($sp) -/* C501C4 80240CB4 8FB20038 */ lw $s2, 0x38($sp) -/* C501C8 80240CB8 8FB10034 */ lw $s1, 0x34($sp) -/* C501CC 80240CBC 8FB00030 */ lw $s0, 0x30($sp) -/* C501D0 80240CC0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* C501D4 80240CC4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* C501D8 80240CC8 03E00008 */ jr $ra -/* C501DC 80240CCC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/func_80240D90_C4F510.s b/asm/nonmatchings/world/area_dgb/dgb_15/func_80240D90_C4F510.s deleted file mode 100644 index 1438fbd616..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/func_80240D90_C4F510.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D90_C502A0 -/* C502A0 80240D90 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C502A4 80240D94 AFB40040 */ sw $s4, 0x40($sp) -/* C502A8 80240D98 0080A02D */ daddu $s4, $a0, $zero -/* C502AC 80240D9C AFBF0044 */ sw $ra, 0x44($sp) -/* C502B0 80240DA0 AFB3003C */ sw $s3, 0x3c($sp) -/* C502B4 80240DA4 AFB20038 */ sw $s2, 0x38($sp) -/* C502B8 80240DA8 AFB10034 */ sw $s1, 0x34($sp) -/* C502BC 80240DAC AFB00030 */ sw $s0, 0x30($sp) -/* C502C0 80240DB0 8E910148 */ lw $s1, 0x148($s4) -/* C502C4 80240DB4 00A0902D */ daddu $s2, $a1, $zero -/* C502C8 80240DB8 86240008 */ lh $a0, 8($s1) -/* C502CC 80240DBC 0C00EABB */ jal get_npc_unsafe -/* C502D0 80240DC0 00C0982D */ daddu $s3, $a2, $zero -/* C502D4 80240DC4 8E430014 */ lw $v1, 0x14($s2) -/* C502D8 80240DC8 04600031 */ bltz $v1, .L80240E90 -/* C502DC 80240DCC 0040802D */ daddu $s0, $v0, $zero -/* C502E0 80240DD0 0260202D */ daddu $a0, $s3, $zero -/* C502E4 80240DD4 AFA00010 */ sw $zero, 0x10($sp) -/* C502E8 80240DD8 8E460024 */ lw $a2, 0x24($s2) -/* C502EC 80240DDC 8E470028 */ lw $a3, 0x28($s2) -/* C502F0 80240DE0 0C01242D */ jal func_800490B4 -/* C502F4 80240DE4 0220282D */ daddu $a1, $s1, $zero -/* C502F8 80240DE8 10400029 */ beqz $v0, .L80240E90 -/* C502FC 80240DEC 0000202D */ daddu $a0, $zero, $zero -/* C50300 80240DF0 0200282D */ daddu $a1, $s0, $zero -/* C50304 80240DF4 0000302D */ daddu $a2, $zero, $zero -/* C50308 80240DF8 860300A8 */ lh $v1, 0xa8($s0) -/* C5030C 80240DFC 3C013F80 */ lui $at, 0x3f80 -/* C50310 80240E00 44810000 */ mtc1 $at, $f0 -/* C50314 80240E04 3C014000 */ lui $at, 0x4000 -/* C50318 80240E08 44811000 */ mtc1 $at, $f2 -/* C5031C 80240E0C 3C01C1A0 */ lui $at, 0xc1a0 -/* C50320 80240E10 44812000 */ mtc1 $at, $f4 -/* C50324 80240E14 2402000F */ addiu $v0, $zero, 0xf -/* C50328 80240E18 AFA2001C */ sw $v0, 0x1c($sp) -/* C5032C 80240E1C 44833000 */ mtc1 $v1, $f6 -/* C50330 80240E20 00000000 */ nop -/* C50334 80240E24 468031A0 */ cvt.s.w $f6, $f6 -/* C50338 80240E28 44073000 */ mfc1 $a3, $f6 -/* C5033C 80240E2C 27A20028 */ addiu $v0, $sp, 0x28 -/* C50340 80240E30 AFA20020 */ sw $v0, 0x20($sp) -/* C50344 80240E34 E7A00010 */ swc1 $f0, 0x10($sp) -/* C50348 80240E38 E7A20014 */ swc1 $f2, 0x14($sp) -/* C5034C 80240E3C 0C01BFA4 */ jal fx_emote -/* C50350 80240E40 E7A40018 */ swc1 $f4, 0x18($sp) -/* C50354 80240E44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C50358 80240E48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C5035C 80240E4C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C50360 80240E50 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C50364 80240E54 8C460028 */ lw $a2, 0x28($v0) -/* C50368 80240E58 0C00A720 */ jal atan2 -/* C5036C 80240E5C 8C470030 */ lw $a3, 0x30($v0) -/* C50370 80240E60 0200202D */ daddu $a0, $s0, $zero -/* C50374 80240E64 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C50378 80240E68 3C060020 */ lui $a2, 0x20 -/* C5037C 80240E6C 0C012530 */ jal func_800494C0 -/* C50380 80240E70 E480000C */ swc1 $f0, 0xc($a0) -/* C50384 80240E74 8E220018 */ lw $v0, 0x18($s1) -/* C50388 80240E78 9442002A */ lhu $v0, 0x2a($v0) -/* C5038C 80240E7C 30420001 */ andi $v0, $v0, 1 -/* C50390 80240E80 14400029 */ bnez $v0, .L80240F28 -/* C50394 80240E84 2402000A */ addiu $v0, $zero, 0xa -/* C50398 80240E88 080903CA */ j .L80240F28 -/* C5039C 80240E8C 2402000C */ addiu $v0, $zero, 0xc -.L80240E90: -/* C503A0 80240E90 8602008C */ lh $v0, 0x8c($s0) -/* C503A4 80240E94 14400025 */ bnez $v0, .L80240F2C -/* C503A8 80240E98 00000000 */ nop -/* C503AC 80240E9C 9602008E */ lhu $v0, 0x8e($s0) -/* C503B0 80240EA0 2442FFFF */ addiu $v0, $v0, -1 -/* C503B4 80240EA4 A602008E */ sh $v0, 0x8e($s0) -/* C503B8 80240EA8 00021400 */ sll $v0, $v0, 0x10 -/* C503BC 80240EAC 1440001F */ bnez $v0, .L80240F2C -/* C503C0 80240EB0 00000000 */ nop -/* C503C4 80240EB4 8E820074 */ lw $v0, 0x74($s4) -/* C503C8 80240EB8 2442FFFF */ addiu $v0, $v0, -1 -/* C503CC 80240EBC 10400019 */ beqz $v0, .L80240F24 -/* C503D0 80240EC0 AE820074 */ sw $v0, 0x74($s4) -/* C503D4 80240EC4 8E220018 */ lw $v0, 0x18($s1) -/* C503D8 80240EC8 9442002A */ lhu $v0, 0x2a($v0) -/* C503DC 80240ECC 30420010 */ andi $v0, $v0, 0x10 -/* C503E0 80240ED0 14400007 */ bnez $v0, .L80240EF0 -/* C503E4 80240ED4 00000000 */ nop -/* C503E8 80240ED8 C600000C */ lwc1 $f0, 0xc($s0) -/* C503EC 80240EDC 3C014334 */ lui $at, 0x4334 -/* C503F0 80240EE0 44816000 */ mtc1 $at, $f12 -/* C503F4 80240EE4 0C00A6C9 */ jal clamp_angle -/* C503F8 80240EE8 460C0300 */ add.s $f12, $f0, $f12 -/* C503FC 80240EEC E600000C */ swc1 $f0, 0xc($s0) -.L80240EF0: -/* C50400 80240EF0 8E440008 */ lw $a0, 8($s2) -/* C50404 80240EF4 000417C2 */ srl $v0, $a0, 0x1f -/* C50408 80240EF8 00822021 */ addu $a0, $a0, $v0 -/* C5040C 80240EFC 00042043 */ sra $a0, $a0, 1 -/* C50410 80240F00 0C00A67F */ jal rand_int -/* C50414 80240F04 24840001 */ addiu $a0, $a0, 1 -/* C50418 80240F08 8E430008 */ lw $v1, 8($s2) -/* C5041C 80240F0C 000327C2 */ srl $a0, $v1, 0x1f -/* C50420 80240F10 00641821 */ addu $v1, $v1, $a0 -/* C50424 80240F14 00031843 */ sra $v1, $v1, 1 -/* C50428 80240F18 00621821 */ addu $v1, $v1, $v0 -/* C5042C 80240F1C 080903CB */ j .L80240F2C -/* C50430 80240F20 A603008E */ sh $v1, 0x8e($s0) -.L80240F24: -/* C50434 80240F24 24020004 */ addiu $v0, $zero, 4 -.L80240F28: -/* C50438 80240F28 AE820070 */ sw $v0, 0x70($s4) -.L80240F2C: -/* C5043C 80240F2C 8FBF0044 */ lw $ra, 0x44($sp) -/* C50440 80240F30 8FB40040 */ lw $s4, 0x40($sp) -/* C50444 80240F34 8FB3003C */ lw $s3, 0x3c($sp) -/* C50448 80240F38 8FB20038 */ lw $s2, 0x38($sp) -/* C5044C 80240F3C 8FB10034 */ lw $s1, 0x34($sp) -/* C50450 80240F40 8FB00030 */ lw $s0, 0x30($sp) -/* C50454 80240F44 03E00008 */ jr $ra -/* C50458 80240F48 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/func_8024121C_C4F510.s b/asm/nonmatchings/world/area_dgb/dgb_15/func_8024121C_C4F510.s deleted file mode 100644 index 54db2faeca..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/func_8024121C_C4F510.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024121C_C5072C -/* C5072C 8024121C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C50730 80241220 AFB3003C */ sw $s3, 0x3c($sp) -/* C50734 80241224 0080982D */ daddu $s3, $a0, $zero -/* C50738 80241228 AFBF0040 */ sw $ra, 0x40($sp) -/* C5073C 8024122C AFB20038 */ sw $s2, 0x38($sp) -/* C50740 80241230 AFB10034 */ sw $s1, 0x34($sp) -/* C50744 80241234 AFB00030 */ sw $s0, 0x30($sp) -/* C50748 80241238 8E720148 */ lw $s2, 0x148($s3) -/* C5074C 8024123C 00A0882D */ daddu $s1, $a1, $zero -/* C50750 80241240 86440008 */ lh $a0, 8($s2) -/* C50754 80241244 0C00EABB */ jal get_npc_unsafe -/* C50758 80241248 00C0802D */ daddu $s0, $a2, $zero -/* C5075C 8024124C 0200202D */ daddu $a0, $s0, $zero -/* C50760 80241250 0240282D */ daddu $a1, $s2, $zero -/* C50764 80241254 24030001 */ addiu $v1, $zero, 1 -/* C50768 80241258 AFA30010 */ sw $v1, 0x10($sp) -/* C5076C 8024125C 8E260024 */ lw $a2, 0x24($s1) -/* C50770 80241260 8E270028 */ lw $a3, 0x28($s1) -/* C50774 80241264 0C01242D */ jal func_800490B4 -/* C50778 80241268 0040802D */ daddu $s0, $v0, $zero -/* C5077C 8024126C 1440001E */ bnez $v0, .L802412E8 -/* C50780 80241270 0200202D */ daddu $a0, $s0, $zero -/* C50784 80241274 24040002 */ addiu $a0, $zero, 2 -/* C50788 80241278 0200282D */ daddu $a1, $s0, $zero -/* C5078C 8024127C 0000302D */ daddu $a2, $zero, $zero -/* C50790 80241280 860300A8 */ lh $v1, 0xa8($s0) -/* C50794 80241284 3C013F80 */ lui $at, 0x3f80 -/* C50798 80241288 44810000 */ mtc1 $at, $f0 -/* C5079C 8024128C 3C014000 */ lui $at, 0x4000 -/* C507A0 80241290 44811000 */ mtc1 $at, $f2 -/* C507A4 80241294 3C01C1A0 */ lui $at, 0xc1a0 -/* C507A8 80241298 44812000 */ mtc1 $at, $f4 -/* C507AC 8024129C 2402000F */ addiu $v0, $zero, 0xf -/* C507B0 802412A0 AFA2001C */ sw $v0, 0x1c($sp) -/* C507B4 802412A4 44833000 */ mtc1 $v1, $f6 -/* C507B8 802412A8 00000000 */ nop -/* C507BC 802412AC 468031A0 */ cvt.s.w $f6, $f6 -/* C507C0 802412B0 44073000 */ mfc1 $a3, $f6 -/* C507C4 802412B4 27A20028 */ addiu $v0, $sp, 0x28 -/* C507C8 802412B8 AFA20020 */ sw $v0, 0x20($sp) -/* C507CC 802412BC E7A00010 */ swc1 $f0, 0x10($sp) -/* C507D0 802412C0 E7A20014 */ swc1 $f2, 0x14($sp) -/* C507D4 802412C4 0C01BFA4 */ jal fx_emote -/* C507D8 802412C8 E7A40018 */ swc1 $f4, 0x18($sp) -/* C507DC 802412CC 8E4200CC */ lw $v0, 0xcc($s2) -/* C507E0 802412D0 8C430000 */ lw $v1, ($v0) -/* C507E4 802412D4 24020019 */ addiu $v0, $zero, 0x19 -/* C507E8 802412D8 A602008E */ sh $v0, 0x8e($s0) -/* C507EC 802412DC 2402000E */ addiu $v0, $zero, 0xe -/* C507F0 802412E0 080904C7 */ j .L8024131C -/* C507F4 802412E4 AE030028 */ sw $v1, 0x28($s0) -.L802412E8: -/* C507F8 802412E8 0C00F598 */ jal func_8003D660 -/* C507FC 802412EC 24050001 */ addiu $a1, $zero, 1 -/* C50800 802412F0 8E050018 */ lw $a1, 0x18($s0) -/* C50804 802412F4 8E06000C */ lw $a2, 0xc($s0) -/* C50808 802412F8 0C00EA95 */ jal npc_move_heading -/* C5080C 802412FC 0200202D */ daddu $a0, $s0, $zero -/* C50810 80241300 8602008E */ lh $v0, 0x8e($s0) -/* C50814 80241304 9603008E */ lhu $v1, 0x8e($s0) -/* C50818 80241308 18400003 */ blez $v0, .L80241318 -/* C5081C 8024130C 2462FFFF */ addiu $v0, $v1, -1 -/* C50820 80241310 080904C8 */ j .L80241320 -/* C50824 80241314 A602008E */ sh $v0, 0x8e($s0) -.L80241318: -/* C50828 80241318 2402000C */ addiu $v0, $zero, 0xc -.L8024131C: -/* C5082C 8024131C AE620070 */ sw $v0, 0x70($s3) -.L80241320: -/* C50830 80241320 8FBF0040 */ lw $ra, 0x40($sp) -/* C50834 80241324 8FB3003C */ lw $s3, 0x3c($sp) -/* C50838 80241328 8FB20038 */ lw $s2, 0x38($sp) -/* C5083C 8024132C 8FB10034 */ lw $s1, 0x34($sp) -/* C50840 80241330 8FB00030 */ lw $s0, 0x30($sp) -/* C50844 80241334 03E00008 */ jr $ra -/* C50848 80241338 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/func_8024133C_C4F510.s b/asm/nonmatchings/world/area_dgb/dgb_15/func_8024133C_C4F510.s deleted file mode 100644 index 0cad4a343b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/func_8024133C_C4F510.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024133C_C5084C -/* C5084C 8024133C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C50850 80241340 AFB10014 */ sw $s1, 0x14($sp) -/* C50854 80241344 0080882D */ daddu $s1, $a0, $zero -/* C50858 80241348 AFBF0018 */ sw $ra, 0x18($sp) -/* C5085C 8024134C AFB00010 */ sw $s0, 0x10($sp) -/* C50860 80241350 8E300148 */ lw $s0, 0x148($s1) -/* C50864 80241354 0C00EABB */ jal get_npc_unsafe -/* C50868 80241358 86040008 */ lh $a0, 8($s0) -/* C5086C 8024135C 9443008E */ lhu $v1, 0x8e($v0) -/* C50870 80241360 2463FFFF */ addiu $v1, $v1, -1 -/* C50874 80241364 A443008E */ sh $v1, 0x8e($v0) -/* C50878 80241368 00031C00 */ sll $v1, $v1, 0x10 -/* C5087C 8024136C 14600008 */ bnez $v1, .L80241390 -/* C50880 80241370 00000000 */ nop -/* C50884 80241374 8E0200B0 */ lw $v0, 0xb0($s0) -/* C50888 80241378 30420080 */ andi $v0, $v0, 0x80 -/* C5088C 8024137C 10400003 */ beqz $v0, .L8024138C -/* C50890 80241380 2402000F */ addiu $v0, $zero, 0xf -/* C50894 80241384 080904E4 */ j .L80241390 -/* C50898 80241388 AE220070 */ sw $v0, 0x70($s1) -.L8024138C: -/* C5089C 8024138C AE200070 */ sw $zero, 0x70($s1) -.L80241390: -/* C508A0 80241390 8FBF0018 */ lw $ra, 0x18($sp) -/* C508A4 80241394 8FB10014 */ lw $s1, 0x14($sp) -/* C508A8 80241398 8FB00010 */ lw $s0, 0x10($sp) -/* C508AC 8024139C 03E00008 */ jr $ra -/* C508B0 802413A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/func_80241760_C4F510.s b/asm/nonmatchings/world/area_dgb/dgb_15/func_80241760_C4F510.s deleted file mode 100644 index 6930360aea..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/func_80241760_C4F510.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241760_C50C70 -/* C50C70 80241760 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C50C74 80241764 AFBF0010 */ sw $ra, 0x10($sp) -/* C50C78 80241768 0C03A6D5 */ jal increment_status_menu_disabled -/* C50C7C 8024176C 00000000 */ nop -/* C50C80 80241770 3C05437F */ lui $a1, 0x437f -/* C50C84 80241774 0C04DF69 */ jal func_80137DA4 -/* C50C88 80241778 0000202D */ daddu $a0, $zero, $zero -/* C50C8C 8024177C 8FBF0010 */ lw $ra, 0x10($sp) -/* C50C90 80241780 24020002 */ addiu $v0, $zero, 2 -/* C50C94 80241784 03E00008 */ jr $ra -/* C50C98 80241788 27BD0018 */ addiu $sp, $sp, 0x18 -/* C50C9C 8024178C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/func_80241790_C4F510.s b/asm/nonmatchings/world/area_dgb/dgb_15/func_80241790_C4F510.s deleted file mode 100644 index 8ad1f98dc6..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/func_80241790_C4F510.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241790_C50CA0 -/* C50CA0 80241790 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C50CA4 80241794 AFB20018 */ sw $s2, 0x18($sp) -/* C50CA8 80241798 0080902D */ daddu $s2, $a0, $zero -/* C50CAC 8024179C AFBF001C */ sw $ra, 0x1c($sp) -/* C50CB0 802417A0 AFB10014 */ sw $s1, 0x14($sp) -/* C50CB4 802417A4 AFB00010 */ sw $s0, 0x10($sp) -/* C50CB8 802417A8 8E50000C */ lw $s0, 0xc($s2) -/* C50CBC 802417AC 8E050000 */ lw $a1, ($s0) -/* C50CC0 802417B0 0C0B1EAF */ jal get_variable -/* C50CC4 802417B4 26100004 */ addiu $s0, $s0, 4 -/* C50CC8 802417B8 0C04417A */ jal get_entity_by_index -/* C50CCC 802417BC 0040202D */ daddu $a0, $v0, $zero -/* C50CD0 802417C0 8E050000 */ lw $a1, ($s0) -/* C50CD4 802417C4 26100004 */ addiu $s0, $s0, 4 -/* C50CD8 802417C8 0040882D */ daddu $s1, $v0, $zero -/* C50CDC 802417CC C6200048 */ lwc1 $f0, 0x48($s1) -/* C50CE0 802417D0 4600008D */ trunc.w.s $f2, $f0 -/* C50CE4 802417D4 44061000 */ mfc1 $a2, $f2 -/* C50CE8 802417D8 0C0B2026 */ jal set_variable -/* C50CEC 802417DC 0240202D */ daddu $a0, $s2, $zero -/* C50CF0 802417E0 8E050000 */ lw $a1, ($s0) -/* C50CF4 802417E4 26100004 */ addiu $s0, $s0, 4 -/* C50CF8 802417E8 C620004C */ lwc1 $f0, 0x4c($s1) -/* C50CFC 802417EC 4600008D */ trunc.w.s $f2, $f0 -/* C50D00 802417F0 44061000 */ mfc1 $a2, $f2 -/* C50D04 802417F4 0C0B2026 */ jal set_variable -/* C50D08 802417F8 0240202D */ daddu $a0, $s2, $zero -/* C50D0C 802417FC C6200050 */ lwc1 $f0, 0x50($s1) -/* C50D10 80241800 8E050000 */ lw $a1, ($s0) -/* C50D14 80241804 4600008D */ trunc.w.s $f2, $f0 -/* C50D18 80241808 44061000 */ mfc1 $a2, $f2 -/* C50D1C 8024180C 0C0B2026 */ jal set_variable -/* C50D20 80241810 0240202D */ daddu $a0, $s2, $zero -/* C50D24 80241814 8FBF001C */ lw $ra, 0x1c($sp) -/* C50D28 80241818 8FB20018 */ lw $s2, 0x18($sp) -/* C50D2C 8024181C 8FB10014 */ lw $s1, 0x14($sp) -/* C50D30 80241820 8FB00010 */ lw $s0, 0x10($sp) -/* C50D34 80241824 24020002 */ addiu $v0, $zero, 2 -/* C50D38 80241828 03E00008 */ jr $ra -/* C50D3C 8024182C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/func_80241830_C4F510.s b/asm/nonmatchings/world/area_dgb/dgb_15/func_80241830_C4F510.s deleted file mode 100644 index 7aa1bf0169..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/func_80241830_C4F510.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241830_C50D40 -/* C50D40 80241830 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C50D44 80241834 AFBF0010 */ sw $ra, 0x10($sp) -/* C50D48 80241838 0C04417A */ jal get_entity_by_index -/* C50D4C 8024183C 8C840084 */ lw $a0, 0x84($a0) -/* C50D50 80241840 0040182D */ daddu $v1, $v0, $zero -/* C50D54 80241844 8C640000 */ lw $a0, ($v1) -/* C50D58 80241848 3C050010 */ lui $a1, 0x10 -/* C50D5C 8024184C 00852025 */ or $a0, $a0, $a1 -/* C50D60 80241850 AC640000 */ sw $a0, ($v1) -/* C50D64 80241854 8FBF0010 */ lw $ra, 0x10($sp) -/* C50D68 80241858 24020002 */ addiu $v0, $zero, 2 -/* C50D6C 8024185C 03E00008 */ jr $ra -/* C50D70 80241860 27BD0018 */ addiu $sp, $sp, 0x18 -/* C50D74 80241864 00000000 */ nop -/* C50D78 80241868 00000000 */ nop -/* C50D7C 8024186C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/update_starpoints_display_C4F510.s b/asm/nonmatchings/world/area_dgb/dgb_15/update_starpoints_display_C4F510.s deleted file mode 100644 index 980347d650..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/update_starpoints_display_C4F510.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_starpoints_display_C4F8CC -/* C4F8CC 802403BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C4F8D0 802403C0 AFB40028 */ sw $s4, 0x28($sp) -/* C4F8D4 802403C4 0080A02D */ daddu $s4, $a0, $zero -/* C4F8D8 802403C8 AFBF002C */ sw $ra, 0x2c($sp) -/* C4F8DC 802403CC AFB30024 */ sw $s3, 0x24($sp) -/* C4F8E0 802403D0 AFB20020 */ sw $s2, 0x20($sp) -/* C4F8E4 802403D4 AFB1001C */ sw $s1, 0x1c($sp) -/* C4F8E8 802403D8 AFB00018 */ sw $s0, 0x18($sp) -/* C4F8EC 802403DC 8E910148 */ lw $s1, 0x148($s4) -/* C4F8F0 802403E0 86240008 */ lh $a0, 8($s1) -/* C4F8F4 802403E4 0C00EABB */ jal get_npc_unsafe -/* C4F8F8 802403E8 00A0802D */ daddu $s0, $a1, $zero -/* C4F8FC 802403EC 16000005 */ bnez $s0, .L80240404 -/* C4F900 802403F0 0040902D */ daddu $s2, $v0, $zero -/* C4F904 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C4F908 802403F8 30420004 */ andi $v0, $v0, 4 -/* C4F90C 802403FC 10400015 */ beqz $v0, .L80240454 -/* C4F910 80240400 00000000 */ nop -.L80240404: -/* C4F914 80240404 AE800070 */ sw $zero, 0x70($s4) -/* C4F918 80240408 8E420000 */ lw $v0, ($s2) -/* C4F91C 8024040C 3C031F30 */ lui $v1, 0x1f30 -/* C4F920 80240410 A640008E */ sh $zero, 0x8e($s2) -/* C4F924 80240414 34420102 */ ori $v0, $v0, 0x102 -/* C4F928 80240418 AE420000 */ sw $v0, ($s2) -/* C4F92C 8024041C 8E220000 */ lw $v0, ($s1) -/* C4F930 80240420 3C01C47A */ lui $at, 0xc47a -/* C4F934 80240424 44810000 */ mtc1 $at, $f0 -/* C4F938 80240428 00431025 */ or $v0, $v0, $v1 -/* C4F93C 8024042C AE220000 */ sw $v0, ($s1) -/* C4F940 80240430 AE400038 */ sw $zero, 0x38($s2) -/* C4F944 80240434 E640003C */ swc1 $f0, 0x3c($s2) -/* C4F948 80240438 AE400040 */ sw $zero, 0x40($s2) -/* C4F94C 8024043C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C4F950 80240440 30620004 */ andi $v0, $v1, 4 -/* C4F954 80240444 10400003 */ beqz $v0, .L80240454 -/* C4F958 80240448 2402FFFB */ addiu $v0, $zero, -5 -/* C4F95C 8024044C 00621024 */ and $v0, $v1, $v0 -/* C4F960 80240450 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240454: -/* C4F964 80240454 8E930070 */ lw $s3, 0x70($s4) -/* C4F968 80240458 12600005 */ beqz $s3, .L80240470 -/* C4F96C 8024045C 24020001 */ addiu $v0, $zero, 1 -/* C4F970 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* C4F974 80240464 00000000 */ nop -/* C4F978 80240468 0809017E */ j .L802405F8 -/* C4F97C 8024046C 00000000 */ nop -.L80240470: -/* C4F980 80240470 86240008 */ lh $a0, 8($s1) -/* C4F984 80240474 0C00FB3A */ jal get_enemy -/* C4F988 80240478 2484FFFF */ addiu $a0, $a0, -1 -/* C4F98C 8024047C 0040802D */ daddu $s0, $v0, $zero -/* C4F990 80240480 0C00EABB */ jal get_npc_unsafe -/* C4F994 80240484 86040008 */ lh $a0, 8($s0) -/* C4F998 80240488 24030001 */ addiu $v1, $zero, 1 -/* C4F99C 8024048C 0040982D */ daddu $s3, $v0, $zero -/* C4F9A0 80240490 A2230007 */ sb $v1, 7($s1) -/* C4F9A4 80240494 8E03006C */ lw $v1, 0x6c($s0) -/* C4F9A8 80240498 24020003 */ addiu $v0, $zero, 3 -/* C4F9AC 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* C4F9B0 802404A0 00000000 */ nop -/* C4F9B4 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) -/* C4F9B8 802404A8 10A00003 */ beqz $a1, .L802404B8 -/* C4F9BC 802404AC 0260202D */ daddu $a0, $s3, $zero -/* C4F9C0 802404B0 0C012530 */ jal func_800494C0 -/* C4F9C4 802404B4 0000302D */ daddu $a2, $zero, $zero -.L802404B8: -/* C4F9C8 802404B8 27A40010 */ addiu $a0, $sp, 0x10 -/* C4F9CC 802404BC C6280070 */ lwc1 $f8, 0x70($s1) -/* C4F9D0 802404C0 46804220 */ cvt.s.w $f8, $f8 -/* C4F9D4 802404C4 C6620034 */ lwc1 $f2, 0x34($s3) -/* C4F9D8 802404C8 3C014387 */ lui $at, 0x4387 -/* C4F9DC 802404CC 44810000 */ mtc1 $at, $f0 -/* C4F9E0 802404D0 44064000 */ mfc1 $a2, $f8 -/* C4F9E4 802404D4 46020001 */ sub.s $f0, $f0, $f2 -/* C4F9E8 802404D8 C6660038 */ lwc1 $f6, 0x38($s3) -/* C4F9EC 802404DC C6640040 */ lwc1 $f4, 0x40($s3) -/* C4F9F0 802404E0 44070000 */ mfc1 $a3, $f0 -/* C4F9F4 802404E4 27A50014 */ addiu $a1, $sp, 0x14 -/* C4F9F8 802404E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* C4F9FC 802404EC 0C00A7E7 */ jal add_vec2D_polar -/* C4FA00 802404F0 E7A40014 */ swc1 $f4, 0x14($sp) -/* C4FA04 802404F4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C4FA08 802404F8 4600020D */ trunc.w.s $f8, $f0 -/* C4FA0C 802404FC 44024000 */ mfc1 $v0, $f8 -/* C4FA10 80240500 E6400038 */ swc1 $f0, 0x38($s2) -/* C4FA14 80240504 A6220010 */ sh $v0, 0x10($s1) -/* C4FA18 80240508 C660003C */ lwc1 $f0, 0x3c($s3) -/* C4FA1C 8024050C C622006C */ lwc1 $f2, 0x6c($s1) -/* C4FA20 80240510 468010A0 */ cvt.s.w $f2, $f2 -/* C4FA24 80240514 46020000 */ add.s $f0, $f0, $f2 -/* C4FA28 80240518 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C4FA2C 8024051C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C4FA30 80240520 E640003C */ swc1 $f0, 0x3c($s2) -/* C4FA34 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C4FA38 80240528 4600020D */ trunc.w.s $f8, $f0 -/* C4FA3C 8024052C 44024000 */ mfc1 $v0, $f8 -/* C4FA40 80240530 00000000 */ nop -/* C4FA44 80240534 A6220012 */ sh $v0, 0x12($s1) -/* C4FA48 80240538 4600120D */ trunc.w.s $f8, $f2 -/* C4FA4C 8024053C 44024000 */ mfc1 $v0, $f8 -/* C4FA50 80240540 E6420040 */ swc1 $f2, 0x40($s2) -/* C4FA54 80240544 A6220014 */ sh $v0, 0x14($s1) -/* C4FA58 80240548 8C660028 */ lw $a2, 0x28($v1) -/* C4FA5C 8024054C 8C670030 */ lw $a3, 0x30($v1) -/* C4FA60 80240550 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C4FA64 80240554 0C00A720 */ jal atan2 -/* C4FA68 80240558 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C4FA6C 8024055C 3C03E0EF */ lui $v1, 0xe0ef -/* C4FA70 80240560 E640000C */ swc1 $f0, 0xc($s2) -/* C4FA74 80240564 8E220000 */ lw $v0, ($s1) -/* C4FA78 80240568 3463FFFF */ ori $v1, $v1, 0xffff -/* C4FA7C 8024056C 00431024 */ and $v0, $v0, $v1 -/* C4FA80 80240570 AE220000 */ sw $v0, ($s1) -/* C4FA84 80240574 24020001 */ addiu $v0, $zero, 1 -/* C4FA88 80240578 A640008E */ sh $zero, 0x8e($s2) -/* C4FA8C 8024057C 0809017E */ j .L802405F8 -/* C4FA90 80240580 AE820070 */ sw $v0, 0x70($s4) -.L80240584: -/* C4FA94 80240584 86240008 */ lh $a0, 8($s1) -/* C4FA98 80240588 0C00FB3A */ jal get_enemy -/* C4FA9C 8024058C 2484FFFF */ addiu $a0, $a0, -1 -/* C4FAA0 80240590 0040802D */ daddu $s0, $v0, $zero -/* C4FAA4 80240594 0C00EABB */ jal get_npc_unsafe -/* C4FAA8 80240598 86040008 */ lh $a0, 8($s0) -/* C4FAAC 8024059C 9642008E */ lhu $v0, 0x8e($s2) -/* C4FAB0 802405A0 24420001 */ addiu $v0, $v0, 1 -/* C4FAB4 802405A4 A642008E */ sh $v0, 0x8e($s2) -/* C4FAB8 802405A8 00021400 */ sll $v0, $v0, 0x10 -/* C4FABC 802405AC 8E23007C */ lw $v1, 0x7c($s1) -/* C4FAC0 802405B0 00021403 */ sra $v0, $v0, 0x10 -/* C4FAC4 802405B4 0043102A */ slt $v0, $v0, $v1 -/* C4FAC8 802405B8 50400001 */ beql $v0, $zero, .L802405C0 -/* C4FACC 802405BC A2200007 */ sb $zero, 7($s1) -.L802405C0: -/* C4FAD0 802405C0 8E03006C */ lw $v1, 0x6c($s0) -/* C4FAD4 802405C4 24020004 */ addiu $v0, $zero, 4 -/* C4FAD8 802405C8 1462000B */ bne $v1, $v0, .L802405F8 -/* C4FADC 802405CC 3C021F10 */ lui $v0, 0x1f10 -/* C4FAE0 802405D0 8E230000 */ lw $v1, ($s1) -/* C4FAE4 802405D4 3C01C47A */ lui $at, 0xc47a -/* C4FAE8 802405D8 44810000 */ mtc1 $at, $f0 -/* C4FAEC 802405DC 00621825 */ or $v1, $v1, $v0 -/* C4FAF0 802405E0 AE230000 */ sw $v1, ($s1) -/* C4FAF4 802405E4 AE400038 */ sw $zero, 0x38($s2) -/* C4FAF8 802405E8 E640003C */ swc1 $f0, 0x3c($s2) -/* C4FAFC 802405EC AE400040 */ sw $zero, 0x40($s2) -/* C4FB00 802405F0 A2330007 */ sb $s3, 7($s1) -/* C4FB04 802405F4 AE800070 */ sw $zero, 0x70($s4) -.L802405F8: -/* C4FB08 802405F8 8FBF002C */ lw $ra, 0x2c($sp) -/* C4FB0C 802405FC 8FB40028 */ lw $s4, 0x28($sp) -/* C4FB10 80240600 8FB30024 */ lw $s3, 0x24($sp) -/* C4FB14 80240604 8FB20020 */ lw $s2, 0x20($sp) -/* C4FB18 80240608 8FB1001C */ lw $s1, 0x1c($sp) -/* C4FB1C 8024060C 8FB00018 */ lw $s0, 0x18($sp) -/* C4FB20 80240610 0000102D */ daddu $v0, $zero, $zero -/* C4FB24 80240614 03E00008 */ jr $ra -/* C4FB28 80240618 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/func_8024006C_C52540.s b/asm/nonmatchings/world/area_dgb/dgb_16/func_8024006C_C52540.s deleted file mode 100644 index 839fd0407b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/func_8024006C_C52540.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024006C_C525AC -/* C525AC 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C525B0 80240070 AFB10014 */ sw $s1, 0x14($sp) -/* C525B4 80240074 0080882D */ daddu $s1, $a0, $zero -/* C525B8 80240078 AFBF0018 */ sw $ra, 0x18($sp) -/* C525BC 8024007C AFB00010 */ sw $s0, 0x10($sp) -/* C525C0 80240080 8E300148 */ lw $s0, 0x148($s1) -/* C525C4 80240084 0C00EABB */ jal get_npc_unsafe -/* C525C8 80240088 86040008 */ lh $a0, 8($s0) -/* C525CC 8024008C 0040202D */ daddu $a0, $v0, $zero -/* C525D0 80240090 9482008E */ lhu $v0, 0x8e($a0) -/* C525D4 80240094 2442FFFF */ addiu $v0, $v0, -1 -/* C525D8 80240098 A482008E */ sh $v0, 0x8e($a0) -/* C525DC 8024009C 00021400 */ sll $v0, $v0, 0x10 -/* C525E0 802400A0 1C400009 */ bgtz $v0, .L802400C8 -/* C525E4 802400A4 24020003 */ addiu $v0, $zero, 3 -/* C525E8 802400A8 96030076 */ lhu $v1, 0x76($s0) -/* C525EC 802400AC AE02006C */ sw $v0, 0x6c($s0) -/* C525F0 802400B0 A483008E */ sh $v1, 0x8e($a0) -/* C525F4 802400B4 8E0200CC */ lw $v0, 0xcc($s0) -/* C525F8 802400B8 8C420024 */ lw $v0, 0x24($v0) -/* C525FC 802400BC AC820028 */ sw $v0, 0x28($a0) -/* C52600 802400C0 24020020 */ addiu $v0, $zero, 0x20 -/* C52604 802400C4 AE220070 */ sw $v0, 0x70($s1) -.L802400C8: -/* C52608 802400C8 8FBF0018 */ lw $ra, 0x18($sp) -/* C5260C 802400CC 8FB10014 */ lw $s1, 0x14($sp) -/* C52610 802400D0 8FB00010 */ lw $s0, 0x10($sp) -/* C52614 802400D4 03E00008 */ jr $ra -/* C52618 802400D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/func_802400DC_C52540.s b/asm/nonmatchings/world/area_dgb/dgb_16/func_802400DC_C52540.s deleted file mode 100644 index 998dd47300..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/func_802400DC_C52540.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_C5261C -/* C5261C 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C52620 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* C52624 802400E4 0080882D */ daddu $s1, $a0, $zero -/* C52628 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* C5262C 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* C52630 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* C52634 802400F4 0C00EABB */ jal get_npc_unsafe -/* C52638 802400F8 86040008 */ lh $a0, 8($s0) -/* C5263C 802400FC 0040282D */ daddu $a1, $v0, $zero -/* C52640 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* C52644 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* C52648 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* C5264C 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* C52650 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* C52654 80240114 24020004 */ addiu $v0, $zero, 4 -/* C52658 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* C5265C 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* C52660 80240120 8C620000 */ lw $v0, ($v1) -/* C52664 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* C52668 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* C5266C 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* C52670 80240130 8E020078 */ lw $v0, 0x78($s0) -/* C52674 80240134 28420008 */ slti $v0, $v0, 8 -/* C52678 80240138 14400018 */ bnez $v0, .L8024019C -/* C5267C 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* C52680 80240140 24040003 */ addiu $a0, $zero, 3 -/* C52684 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* C52688 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* C5268C 8024014C 3C013F80 */ lui $at, 0x3f80 -/* C52690 80240150 44810000 */ mtc1 $at, $f0 -/* C52694 80240154 3C014000 */ lui $at, 0x4000 -/* C52698 80240158 44811000 */ mtc1 $at, $f2 -/* C5269C 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* C526A0 80240160 44812000 */ mtc1 $at, $f4 -/* C526A4 80240164 44873000 */ mtc1 $a3, $f6 -/* C526A8 80240168 00000000 */ nop -/* C526AC 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* C526B0 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* C526B4 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* C526B8 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* C526BC 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* C526C0 80240180 44073000 */ mfc1 $a3, $f6 -/* C526C4 80240184 0000302D */ daddu $a2, $zero, $zero -/* C526C8 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* C526CC 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* C526D0 80240190 0C01BFA4 */ jal fx_emote -/* C526D4 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* C526D8 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* C526DC 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* C526E0 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* C526E4 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* C526E8 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* C526EC 802401AC 03E00008 */ jr $ra -/* C526F0 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/func_802401B4_C52540.s b/asm/nonmatchings/world/area_dgb/dgb_16/func_802401B4_C52540.s deleted file mode 100644 index d5532ce774..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/func_802401B4_C52540.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_C526F4 -/* C526F4 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C526F8 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* C526FC 802401BC 0080882D */ daddu $s1, $a0, $zero -/* C52700 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C52704 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* C52708 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* C5270C 802401CC 0C00EABB */ jal get_npc_unsafe -/* C52710 802401D0 86040008 */ lh $a0, 8($s0) -/* C52714 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* C52718 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* C5271C 802401DC A443008E */ sh $v1, 0x8e($v0) -/* C52720 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* C52724 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* C52728 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* C5272C 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* C52730 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* C52734 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* C52738 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* C5273C 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* C52740 80240200 03E00008 */ jr $ra -/* C52744 80240204 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/func_80240208_C52540.s b/asm/nonmatchings/world/area_dgb/dgb_16/func_80240208_C52540.s deleted file mode 100644 index f85f8bc734..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/func_80240208_C52540.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240208_C52748 -/* C52748 80240208 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C5274C 8024020C AFBF0024 */ sw $ra, 0x24($sp) -/* C52750 80240210 AFB40020 */ sw $s4, 0x20($sp) -/* C52754 80240214 AFB3001C */ sw $s3, 0x1c($sp) -/* C52758 80240218 AFB20018 */ sw $s2, 0x18($sp) -/* C5275C 8024021C AFB10014 */ sw $s1, 0x14($sp) -/* C52760 80240220 AFB00010 */ sw $s0, 0x10($sp) -/* C52764 80240224 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C52768 80240228 8C900148 */ lw $s0, 0x148($a0) -/* C5276C 8024022C 86040008 */ lh $a0, 8($s0) -/* C52770 80240230 0C00EABB */ jal get_npc_unsafe -/* C52774 80240234 24110001 */ addiu $s1, $zero, 1 -/* C52778 80240238 86040008 */ lh $a0, 8($s0) -/* C5277C 8024023C 0040802D */ daddu $s0, $v0, $zero -/* C52780 80240240 3C05800B */ lui $a1, %hi(gCameras) -/* C52784 80240244 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C52788 80240248 3C03800A */ lui $v1, 0x800a -/* C5278C 8024024C 8463A634 */ lh $v1, -0x59cc($v1) -/* C52790 80240250 00912021 */ addu $a0, $a0, $s1 -/* C52794 80240254 00031080 */ sll $v0, $v1, 2 -/* C52798 80240258 00431021 */ addu $v0, $v0, $v1 -/* C5279C 8024025C 00021080 */ sll $v0, $v0, 2 -/* C527A0 80240260 00431023 */ subu $v0, $v0, $v1 -/* C527A4 80240264 000218C0 */ sll $v1, $v0, 3 -/* C527A8 80240268 00431021 */ addu $v0, $v0, $v1 -/* C527AC 8024026C 000210C0 */ sll $v0, $v0, 3 -/* C527B0 80240270 0C00FB3A */ jal get_enemy -/* C527B4 80240274 00459021 */ addu $s2, $v0, $a1 -/* C527B8 80240278 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C527BC 8024027C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C527C0 80240280 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C527C4 80240284 8E830000 */ lw $v1, ($s4) -/* C527C8 80240288 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C527CC 8024028C 8C660028 */ lw $a2, 0x28($v1) -/* C527D0 80240290 8C670030 */ lw $a3, 0x30($v1) -/* C527D4 80240294 0C00A7B5 */ jal dist2D -/* C527D8 80240298 0040982D */ daddu $s3, $v0, $zero -/* C527DC 8024029C C6620074 */ lwc1 $f2, 0x74($s3) -/* C527E0 802402A0 468010A0 */ cvt.s.w $f2, $f2 -/* C527E4 802402A4 4600103C */ c.lt.s $f2, $f0 -/* C527E8 802402A8 00000000 */ nop -/* C527EC 802402AC 45030001 */ bc1tl .L802402B4 -/* C527F0 802402B0 0000882D */ daddu $s1, $zero, $zero -.L802402B4: -/* C527F4 802402B4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C527F8 802402B8 C60E000C */ lwc1 $f14, 0xc($s0) -/* C527FC 802402BC 3C014387 */ lui $at, 0x4387 -/* C52800 802402C0 4481A000 */ mtc1 $at, $f20 -/* C52804 802402C4 0C00A70A */ jal get_clamped_angle_diff -/* C52808 802402C8 00000000 */ nop -/* C5280C 802402CC 0C00A6C9 */ jal clamp_angle -/* C52810 802402D0 46000306 */ mov.s $f12, $f0 -/* C52814 802402D4 3C018024 */ lui $at, 0x8024 -/* C52818 802402D8 D42231F0 */ ldc1 $f2, 0x31f0($at) -/* C5281C 802402DC 46000021 */ cvt.d.s $f0, $f0 -/* C52820 802402E0 4622003C */ c.lt.d $f0, $f2 -/* C52824 802402E4 00000000 */ nop -/* C52828 802402E8 45000003 */ bc1f .L802402F8 -/* C5282C 802402EC 00000000 */ nop -/* C52830 802402F0 3C0142B4 */ lui $at, 0x42b4 -/* C52834 802402F4 4481A000 */ mtc1 $at, $f20 -.L802402F8: -/* C52838 802402F8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C5283C 802402FC 8E820000 */ lw $v0, ($s4) -/* C52840 80240300 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C52844 80240304 8C460028 */ lw $a2, 0x28($v0) -/* C52848 80240308 0C00A720 */ jal atan2 -/* C5284C 8024030C 8C470030 */ lw $a3, 0x30($v0) -/* C52850 80240310 4600A306 */ mov.s $f12, $f20 -/* C52854 80240314 0C00A70A */ jal get_clamped_angle_diff -/* C52858 80240318 46000386 */ mov.s $f14, $f0 -/* C5285C 8024031C C6620078 */ lwc1 $f2, 0x78($s3) -/* C52860 80240320 468010A0 */ cvt.s.w $f2, $f2 -/* C52864 80240324 46000005 */ abs.s $f0, $f0 -/* C52868 80240328 4600103C */ c.lt.s $f2, $f0 -/* C5286C 8024032C 00000000 */ nop -/* C52870 80240330 45030001 */ bc1tl .L80240338 -/* C52874 80240334 0000882D */ daddu $s1, $zero, $zero -.L80240338: -/* C52878 80240338 8E820000 */ lw $v0, ($s4) -/* C5287C 8024033C C600003C */ lwc1 $f0, 0x3c($s0) -/* C52880 80240340 C442002C */ lwc1 $f2, 0x2c($v0) -/* C52884 80240344 860200A8 */ lh $v0, 0xa8($s0) -/* C52888 80240348 46020001 */ sub.s $f0, $f0, $f2 -/* C5288C 8024034C 44821000 */ mtc1 $v0, $f2 -/* C52890 80240350 00000000 */ nop -/* C52894 80240354 468010A1 */ cvt.d.w $f2, $f2 -/* C52898 80240358 46221080 */ add.d $f2, $f2, $f2 -/* C5289C 8024035C 46000005 */ abs.s $f0, $f0 -/* C528A0 80240360 46000021 */ cvt.d.s $f0, $f0 -/* C528A4 80240364 4620103E */ c.le.d $f2, $f0 -/* C528A8 80240368 00000000 */ nop -/* C528AC 8024036C 45030001 */ bc1tl .L80240374 -/* C528B0 80240370 0000882D */ daddu $s1, $zero, $zero -.L80240374: -/* C528B4 80240374 3C038011 */ lui $v1, 0x8011 -/* C528B8 80240378 8063EBB3 */ lb $v1, -0x144d($v1) -/* C528BC 8024037C 24020009 */ addiu $v0, $zero, 9 -/* C528C0 80240380 50620001 */ beql $v1, $v0, .L80240388 -/* C528C4 80240384 0000882D */ daddu $s1, $zero, $zero -.L80240388: -/* C528C8 80240388 24020007 */ addiu $v0, $zero, 7 -/* C528CC 8024038C 50620001 */ beql $v1, $v0, .L80240394 -/* C528D0 80240390 0000882D */ daddu $s1, $zero, $zero -.L80240394: -/* C528D4 80240394 0220102D */ daddu $v0, $s1, $zero -/* C528D8 80240398 8FBF0024 */ lw $ra, 0x24($sp) -/* C528DC 8024039C 8FB40020 */ lw $s4, 0x20($sp) -/* C528E0 802403A0 8FB3001C */ lw $s3, 0x1c($sp) -/* C528E4 802403A4 8FB20018 */ lw $s2, 0x18($sp) -/* C528E8 802403A8 8FB10014 */ lw $s1, 0x14($sp) -/* C528EC 802403AC 8FB00010 */ lw $s0, 0x10($sp) -/* C528F0 802403B0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C528F4 802403B4 03E00008 */ jr $ra -/* C528F8 802403B8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/func_8024061C_C52540.s b/asm/nonmatchings/world/area_dgb/dgb_16/func_8024061C_C52540.s deleted file mode 100644 index d6239df6fa..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/func_8024061C_C52540.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_C52B5C -/* C52B5C 8024061C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C52B60 80240620 AFB10014 */ sw $s1, 0x14($sp) -/* C52B64 80240624 0080882D */ daddu $s1, $a0, $zero -/* C52B68 80240628 AFBF0018 */ sw $ra, 0x18($sp) -/* C52B6C 8024062C AFB00010 */ sw $s0, 0x10($sp) -/* C52B70 80240630 8E300148 */ lw $s0, 0x148($s1) -/* C52B74 80240634 0C00EABB */ jal get_npc_unsafe -/* C52B78 80240638 86040008 */ lh $a0, 8($s0) -/* C52B7C 8024063C 0040202D */ daddu $a0, $v0, $zero -/* C52B80 80240640 8482008E */ lh $v0, 0x8e($a0) -/* C52B84 80240644 9483008E */ lhu $v1, 0x8e($a0) -/* C52B88 80240648 18400002 */ blez $v0, .L80240654 -/* C52B8C 8024064C 2462FFFF */ addiu $v0, $v1, -1 -/* C52B90 80240650 A482008E */ sh $v0, 0x8e($a0) -.L80240654: -/* C52B94 80240654 8482008E */ lh $v0, 0x8e($a0) -/* C52B98 80240658 24030001 */ addiu $v1, $zero, 1 -/* C52B9C 8024065C 14430005 */ bne $v0, $v1, .L80240674 -/* C52BA0 80240660 00000000 */ nop -/* C52BA4 80240664 8E0200CC */ lw $v0, 0xcc($s0) -/* C52BA8 80240668 8C420030 */ lw $v0, 0x30($v0) -/* C52BAC 8024066C 080901A4 */ j .L80240690 -/* C52BB0 80240670 AC820028 */ sw $v0, 0x28($a0) -.L80240674: -/* C52BB4 80240674 1C400006 */ bgtz $v0, .L80240690 -/* C52BB8 80240678 00000000 */ nop -/* C52BBC 8024067C 8E0200CC */ lw $v0, 0xcc($s0) -/* C52BC0 80240680 8C420028 */ lw $v0, 0x28($v0) -/* C52BC4 80240684 A480008E */ sh $zero, 0x8e($a0) -/* C52BC8 80240688 AC820028 */ sw $v0, 0x28($a0) -/* C52BCC 8024068C AE230070 */ sw $v1, 0x70($s1) -.L80240690: -/* C52BD0 80240690 8FBF0018 */ lw $ra, 0x18($sp) -/* C52BD4 80240694 8FB10014 */ lw $s1, 0x14($sp) -/* C52BD8 80240698 8FB00010 */ lw $s0, 0x10($sp) -/* C52BDC 8024069C 03E00008 */ jr $ra -/* C52BE0 802406A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/func_802406A4_C52540.s b/asm/nonmatchings/world/area_dgb/dgb_16/func_802406A4_C52540.s deleted file mode 100644 index ec2fc82c83..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/func_802406A4_C52540.s +++ /dev/null @@ -1,192 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A4_C52BE4 -/* C52BE4 802406A4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C52BE8 802406A8 AFB40048 */ sw $s4, 0x48($sp) -/* C52BEC 802406AC 0080A02D */ daddu $s4, $a0, $zero -/* C52BF0 802406B0 AFBF004C */ sw $ra, 0x4c($sp) -/* C52BF4 802406B4 AFB30044 */ sw $s3, 0x44($sp) -/* C52BF8 802406B8 AFB20040 */ sw $s2, 0x40($sp) -/* C52BFC 802406BC AFB1003C */ sw $s1, 0x3c($sp) -/* C52C00 802406C0 AFB00038 */ sw $s0, 0x38($sp) -/* C52C04 802406C4 8E930148 */ lw $s3, 0x148($s4) -/* C52C08 802406C8 00C0802D */ daddu $s0, $a2, $zero -/* C52C0C 802406CC 86640008 */ lh $a0, 8($s3) -/* C52C10 802406D0 0C00EABB */ jal get_npc_unsafe -/* C52C14 802406D4 0000902D */ daddu $s2, $zero, $zero -/* C52C18 802406D8 0C039D59 */ jal get_player_data -/* C52C1C 802406DC 0040882D */ daddu $s1, $v0, $zero -/* C52C20 802406E0 0200202D */ daddu $a0, $s0, $zero -/* C52C24 802406E4 0260282D */ daddu $a1, $s3, $zero -/* C52C28 802406E8 0000382D */ daddu $a3, $zero, $zero -/* C52C2C 802406EC 3C0642A0 */ lui $a2, 0x42a0 -/* C52C30 802406F0 0040802D */ daddu $s0, $v0, $zero -/* C52C34 802406F4 0C01242D */ jal func_800490B4 -/* C52C38 802406F8 AFA00010 */ sw $zero, 0x10($sp) -/* C52C3C 802406FC 10400022 */ beqz $v0, .L80240788 -/* C52C40 80240700 00000000 */ nop -/* C52C44 80240704 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C52C48 80240708 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C52C4C 8024070C 804300B4 */ lb $v1, 0xb4($v0) -/* C52C50 80240710 24020002 */ addiu $v0, $zero, 2 -/* C52C54 80240714 10620013 */ beq $v1, $v0, .L80240764 -/* C52C58 80240718 2402001A */ addiu $v0, $zero, 0x1a -/* C52C5C 8024071C 10620011 */ beq $v1, $v0, .L80240764 -/* C52C60 80240720 24020003 */ addiu $v0, $zero, 3 -/* C52C64 80240724 1062000F */ beq $v1, $v0, .L80240764 -/* C52C68 80240728 2402000E */ addiu $v0, $zero, 0xe -/* C52C6C 8024072C 1062000D */ beq $v1, $v0, .L80240764 -/* C52C70 80240730 24020010 */ addiu $v0, $zero, 0x10 -/* C52C74 80240734 1062000B */ beq $v1, $v0, .L80240764 -/* C52C78 80240738 2402000B */ addiu $v0, $zero, 0xb -/* C52C7C 8024073C 10620009 */ beq $v1, $v0, .L80240764 -/* C52C80 80240740 2402000A */ addiu $v0, $zero, 0xa -/* C52C84 80240744 10620007 */ beq $v1, $v0, .L80240764 -/* C52C88 80240748 24020012 */ addiu $v0, $zero, 0x12 -/* C52C8C 8024074C 10620005 */ beq $v1, $v0, .L80240764 -/* C52C90 80240750 24020013 */ addiu $v0, $zero, 0x13 -/* C52C94 80240754 10620003 */ beq $v1, $v0, .L80240764 -/* C52C98 80240758 24020025 */ addiu $v0, $zero, 0x25 -/* C52C9C 8024075C 14620002 */ bne $v1, $v0, .L80240768 -/* C52CA0 80240760 00000000 */ nop -.L80240764: -/* C52CA4 80240764 24120001 */ addiu $s2, $zero, 1 -.L80240768: -/* C52CA8 80240768 82030012 */ lb $v1, 0x12($s0) -/* C52CAC 8024076C 24020002 */ addiu $v0, $zero, 2 -/* C52CB0 80240770 14620007 */ bne $v1, $v0, .L80240790 -/* C52CB4 80240774 24020001 */ addiu $v0, $zero, 1 -/* C52CB8 80240778 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C52CBC 8024077C 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C52CC0 80240780 50430002 */ beql $v0, $v1, .L8024078C -/* C52CC4 80240784 24120001 */ addiu $s2, $zero, 1 -.L80240788: -/* C52CC8 80240788 82030012 */ lb $v1, 0x12($s0) -.L8024078C: -/* C52CCC 8024078C 24020001 */ addiu $v0, $zero, 1 -.L80240790: -/* C52CD0 80240790 14620006 */ bne $v1, $v0, .L802407AC -/* C52CD4 80240794 24020003 */ addiu $v0, $zero, 3 -/* C52CD8 80240798 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C52CDC 8024079C 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C52CE0 802407A0 14400008 */ bnez $v0, .L802407C4 -/* C52CE4 802407A4 27A40028 */ addiu $a0, $sp, 0x28 -/* C52CE8 802407A8 24020003 */ addiu $v0, $zero, 3 -.L802407AC: -/* C52CEC 802407AC 1462001B */ bne $v1, $v0, .L8024081C -/* C52CF0 802407B0 24020002 */ addiu $v0, $zero, 2 -/* C52CF4 802407B4 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C52CF8 802407B8 8063EBB0 */ lb $v1, %lo(D_8010EBB0)($v1) -/* C52CFC 802407BC 14620017 */ bne $v1, $v0, .L8024081C -/* C52D00 802407C0 27A40028 */ addiu $a0, $sp, 0x28 -.L802407C4: -/* C52D04 802407C4 27A5002C */ addiu $a1, $sp, 0x2c -/* C52D08 802407C8 8E27000C */ lw $a3, 0xc($s1) -/* C52D0C 802407CC C6200038 */ lwc1 $f0, 0x38($s1) -/* C52D10 802407D0 C6220040 */ lwc1 $f2, 0x40($s1) -/* C52D14 802407D4 0000302D */ daddu $a2, $zero, $zero -/* C52D18 802407D8 E7A00028 */ swc1 $f0, 0x28($sp) -/* C52D1C 802407DC 0C00A7E7 */ jal add_vec2D_polar -/* C52D20 802407E0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C52D24 802407E4 3C028011 */ lui $v0, 0x8011 -/* C52D28 802407E8 8C42C930 */ lw $v0, -0x36d0($v0) -/* C52D2C 802407EC C7AC0028 */ lwc1 $f12, 0x28($sp) -/* C52D30 802407F0 C7AE002C */ lwc1 $f14, 0x2c($sp) -/* C52D34 802407F4 8C460038 */ lw $a2, 0x38($v0) -/* C52D38 802407F8 0C00A7B5 */ jal dist2D -/* C52D3C 802407FC 8C470040 */ lw $a3, 0x40($v0) -/* C52D40 80240800 3C0142A0 */ lui $at, 0x42a0 -/* C52D44 80240804 44811000 */ mtc1 $at, $f2 -/* C52D48 80240808 00000000 */ nop -/* C52D4C 8024080C 4602003E */ c.le.s $f0, $f2 -/* C52D50 80240810 00000000 */ nop -/* C52D54 80240814 45030001 */ bc1tl .L8024081C -/* C52D58 80240818 24120001 */ addiu $s2, $zero, 1 -.L8024081C: -/* C52D5C 8024081C 12400026 */ beqz $s2, .L802408B8 -/* C52D60 80240820 0220202D */ daddu $a0, $s1, $zero -/* C52D64 80240824 3C05B000 */ lui $a1, 0xb000 -/* C52D68 80240828 34A5000E */ ori $a1, $a1, 0xe -/* C52D6C 8024082C 0C012530 */ jal func_800494C0 -/* C52D70 80240830 0000302D */ daddu $a2, $zero, $zero -/* C52D74 80240834 0000202D */ daddu $a0, $zero, $zero -/* C52D78 80240838 0220282D */ daddu $a1, $s1, $zero -/* C52D7C 8024083C 0000302D */ daddu $a2, $zero, $zero -/* C52D80 80240840 862200A8 */ lh $v0, 0xa8($s1) -/* C52D84 80240844 8E6300CC */ lw $v1, 0xcc($s3) -/* C52D88 80240848 3C013F80 */ lui $at, 0x3f80 -/* C52D8C 8024084C 44810000 */ mtc1 $at, $f0 -/* C52D90 80240850 3C014000 */ lui $at, 0x4000 -/* C52D94 80240854 44811000 */ mtc1 $at, $f2 -/* C52D98 80240858 3C01C1A0 */ lui $at, 0xc1a0 -/* C52D9C 8024085C 44812000 */ mtc1 $at, $f4 -/* C52DA0 80240860 44823000 */ mtc1 $v0, $f6 -/* C52DA4 80240864 00000000 */ nop -/* C52DA8 80240868 468031A0 */ cvt.s.w $f6, $f6 -/* C52DAC 8024086C 44073000 */ mfc1 $a3, $f6 -/* C52DB0 80240870 8C63002C */ lw $v1, 0x2c($v1) -/* C52DB4 80240874 2402000A */ addiu $v0, $zero, 0xa -/* C52DB8 80240878 A622008E */ sh $v0, 0x8e($s1) -/* C52DBC 8024087C 2402000F */ addiu $v0, $zero, 0xf -/* C52DC0 80240880 AE230028 */ sw $v1, 0x28($s1) -/* C52DC4 80240884 AFA2001C */ sw $v0, 0x1c($sp) -/* C52DC8 80240888 27A20030 */ addiu $v0, $sp, 0x30 -/* C52DCC 8024088C E7A00010 */ swc1 $f0, 0x10($sp) -/* C52DD0 80240890 E7A20014 */ swc1 $f2, 0x14($sp) -/* C52DD4 80240894 E7A40018 */ swc1 $f4, 0x18($sp) -/* C52DD8 80240898 0C01BFA4 */ jal fx_emote -/* C52DDC 8024089C AFA20020 */ sw $v0, 0x20($sp) -/* C52DE0 802408A0 0220202D */ daddu $a0, $s1, $zero -/* C52DE4 802408A4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C52DE8 802408A8 0C012530 */ jal func_800494C0 -/* C52DEC 802408AC 3C060020 */ lui $a2, 0x20 -/* C52DF0 802408B0 24020002 */ addiu $v0, $zero, 2 -/* C52DF4 802408B4 AE820070 */ sw $v0, 0x70($s4) -.L802408B8: -/* C52DF8 802408B8 9622008E */ lhu $v0, 0x8e($s1) -/* C52DFC 802408BC 24420001 */ addiu $v0, $v0, 1 -/* C52E00 802408C0 A622008E */ sh $v0, 0x8e($s1) -/* C52E04 802408C4 00021400 */ sll $v0, $v0, 0x10 -/* C52E08 802408C8 00021C03 */ sra $v1, $v0, 0x10 -/* C52E0C 802408CC 2402001B */ addiu $v0, $zero, 0x1b -/* C52E10 802408D0 14620005 */ bne $v1, $v0, .L802408E8 -/* C52E14 802408D4 24020039 */ addiu $v0, $zero, 0x39 -/* C52E18 802408D8 0220202D */ daddu $a0, $s1, $zero -/* C52E1C 802408DC 3C05B000 */ lui $a1, 0xb000 -/* C52E20 802408E0 0809023F */ j .L802408FC -/* C52E24 802408E4 34A5000C */ ori $a1, $a1, 0xc -.L802408E8: -/* C52E28 802408E8 14620008 */ bne $v1, $v0, .L8024090C -/* C52E2C 802408EC 2402003B */ addiu $v0, $zero, 0x3b -/* C52E30 802408F0 0220202D */ daddu $a0, $s1, $zero -/* C52E34 802408F4 3C05B000 */ lui $a1, 0xb000 -/* C52E38 802408F8 34A5000D */ ori $a1, $a1, 0xd -.L802408FC: -/* C52E3C 802408FC 0C012530 */ jal func_800494C0 -/* C52E40 80240900 0000302D */ daddu $a2, $zero, $zero -/* C52E44 80240904 0809024F */ j .L8024093C -/* C52E48 80240908 00000000 */ nop -.L8024090C: -/* C52E4C 8024090C 14620005 */ bne $v1, $v0, .L80240924 -/* C52E50 80240910 2402003C */ addiu $v0, $zero, 0x3c -/* C52E54 80240914 8E6200CC */ lw $v0, 0xcc($s3) -/* C52E58 80240918 8C420030 */ lw $v0, 0x30($v0) -/* C52E5C 8024091C 0809024F */ j .L8024093C -/* C52E60 80240920 AE220028 */ sw $v0, 0x28($s1) -.L80240924: -/* C52E64 80240924 14620005 */ bne $v1, $v0, .L8024093C -/* C52E68 80240928 00000000 */ nop -/* C52E6C 8024092C 8E6200CC */ lw $v0, 0xcc($s3) -/* C52E70 80240930 8C420028 */ lw $v0, 0x28($v0) -/* C52E74 80240934 A620008E */ sh $zero, 0x8e($s1) -/* C52E78 80240938 AE220028 */ sw $v0, 0x28($s1) -.L8024093C: -/* C52E7C 8024093C 8FBF004C */ lw $ra, 0x4c($sp) -/* C52E80 80240940 8FB40048 */ lw $s4, 0x48($sp) -/* C52E84 80240944 8FB30044 */ lw $s3, 0x44($sp) -/* C52E88 80240948 8FB20040 */ lw $s2, 0x40($sp) -/* C52E8C 8024094C 8FB1003C */ lw $s1, 0x3c($sp) -/* C52E90 80240950 8FB00038 */ lw $s0, 0x38($sp) -/* C52E94 80240954 03E00008 */ jr $ra -/* C52E98 80240958 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/func_8024095C_C52540.s b/asm/nonmatchings/world/area_dgb/dgb_16/func_8024095C_C52540.s deleted file mode 100644 index 5d2cd6306f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/func_8024095C_C52540.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024095C_C52E9C -/* C52E9C 8024095C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C52EA0 80240960 AFB10014 */ sw $s1, 0x14($sp) -/* C52EA4 80240964 0080882D */ daddu $s1, $a0, $zero -/* C52EA8 80240968 AFBF0018 */ sw $ra, 0x18($sp) -/* C52EAC 8024096C AFB00010 */ sw $s0, 0x10($sp) -/* C52EB0 80240970 8E300148 */ lw $s0, 0x148($s1) -/* C52EB4 80240974 0C00EABB */ jal get_npc_unsafe -/* C52EB8 80240978 86040008 */ lh $a0, 8($s0) -/* C52EBC 8024097C 0040182D */ daddu $v1, $v0, $zero -/* C52EC0 80240980 9462008E */ lhu $v0, 0x8e($v1) -/* C52EC4 80240984 2442FFFF */ addiu $v0, $v0, -1 -/* C52EC8 80240988 A462008E */ sh $v0, 0x8e($v1) -/* C52ECC 8024098C 00021400 */ sll $v0, $v0, 0x10 -/* C52ED0 80240990 1C400006 */ bgtz $v0, .L802409AC -/* C52ED4 80240994 24020001 */ addiu $v0, $zero, 1 -/* C52ED8 80240998 A462008E */ sh $v0, 0x8e($v1) -/* C52EDC 8024099C 24020028 */ addiu $v0, $zero, 0x28 -/* C52EE0 802409A0 AE020088 */ sw $v0, 0x88($s0) -/* C52EE4 802409A4 24020003 */ addiu $v0, $zero, 3 -/* C52EE8 802409A8 AE220070 */ sw $v0, 0x70($s1) -.L802409AC: -/* C52EEC 802409AC 8FBF0018 */ lw $ra, 0x18($sp) -/* C52EF0 802409B0 8FB10014 */ lw $s1, 0x14($sp) -/* C52EF4 802409B4 8FB00010 */ lw $s0, 0x10($sp) -/* C52EF8 802409B8 03E00008 */ jr $ra -/* C52EFC 802409BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/func_802409C0_C52540.s b/asm/nonmatchings/world/area_dgb/dgb_16/func_802409C0_C52540.s deleted file mode 100644 index f0b4a65dd8..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/func_802409C0_C52540.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409C0_C52F00 -/* C52F00 802409C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C52F04 802409C4 AFB10014 */ sw $s1, 0x14($sp) -/* C52F08 802409C8 0080882D */ daddu $s1, $a0, $zero -/* C52F0C 802409CC AFBF001C */ sw $ra, 0x1c($sp) -/* C52F10 802409D0 AFB20018 */ sw $s2, 0x18($sp) -/* C52F14 802409D4 AFB00010 */ sw $s0, 0x10($sp) -/* C52F18 802409D8 8E320148 */ lw $s2, 0x148($s1) -/* C52F1C 802409DC 0C00EABB */ jal get_npc_unsafe -/* C52F20 802409E0 86440008 */ lh $a0, 8($s2) -/* C52F24 802409E4 240400B4 */ addiu $a0, $zero, 0xb4 -/* C52F28 802409E8 0C00A67F */ jal rand_int -/* C52F2C 802409EC 0040802D */ daddu $s0, $v0, $zero -/* C52F30 802409F0 C60C000C */ lwc1 $f12, 0xc($s0) -/* C52F34 802409F4 44820000 */ mtc1 $v0, $f0 -/* C52F38 802409F8 00000000 */ nop -/* C52F3C 802409FC 46800020 */ cvt.s.w $f0, $f0 -/* C52F40 80240A00 46006300 */ add.s $f12, $f12, $f0 -/* C52F44 80240A04 3C0142B4 */ lui $at, 0x42b4 -/* C52F48 80240A08 44810000 */ mtc1 $at, $f0 -/* C52F4C 80240A0C 0C00A6C9 */ jal clamp_angle -/* C52F50 80240A10 46006301 */ sub.s $f12, $f12, $f0 -/* C52F54 80240A14 E600000C */ swc1 $f0, 0xc($s0) -/* C52F58 80240A18 8E4200CC */ lw $v0, 0xcc($s2) -/* C52F5C 80240A1C 8C420000 */ lw $v0, ($v0) -/* C52F60 80240A20 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C52F64 80240A24 0C00A67F */ jal rand_int -/* C52F68 80240A28 AE020028 */ sw $v0, 0x28($s0) -/* C52F6C 80240A2C 00021FC2 */ srl $v1, $v0, 0x1f -/* C52F70 80240A30 00431821 */ addu $v1, $v0, $v1 -/* C52F74 80240A34 00031843 */ sra $v1, $v1, 1 -/* C52F78 80240A38 00031840 */ sll $v1, $v1, 1 -/* C52F7C 80240A3C 00431023 */ subu $v0, $v0, $v1 -/* C52F80 80240A40 24420002 */ addiu $v0, $v0, 2 -/* C52F84 80240A44 AE220074 */ sw $v0, 0x74($s1) -/* C52F88 80240A48 24020004 */ addiu $v0, $zero, 4 -/* C52F8C 80240A4C AE220070 */ sw $v0, 0x70($s1) -/* C52F90 80240A50 8FBF001C */ lw $ra, 0x1c($sp) -/* C52F94 80240A54 8FB20018 */ lw $s2, 0x18($sp) -/* C52F98 80240A58 8FB10014 */ lw $s1, 0x14($sp) -/* C52F9C 80240A5C 8FB00010 */ lw $s0, 0x10($sp) -/* C52FA0 80240A60 03E00008 */ jr $ra -/* C52FA4 80240A64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/func_80240A68_C52540.s b/asm/nonmatchings/world/area_dgb/dgb_16/func_80240A68_C52540.s deleted file mode 100644 index ed6c4fd7d4..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/func_80240A68_C52540.s +++ /dev/null @@ -1,87 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A68_C52FA8 -/* C52FA8 80240A68 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C52FAC 80240A6C AFB20020 */ sw $s2, 0x20($sp) -/* C52FB0 80240A70 0080902D */ daddu $s2, $a0, $zero -/* C52FB4 80240A74 AFBF0028 */ sw $ra, 0x28($sp) -/* C52FB8 80240A78 AFB30024 */ sw $s3, 0x24($sp) -/* C52FBC 80240A7C AFB1001C */ sw $s1, 0x1c($sp) -/* C52FC0 80240A80 AFB00018 */ sw $s0, 0x18($sp) -/* C52FC4 80240A84 8E510148 */ lw $s1, 0x148($s2) -/* C52FC8 80240A88 00A0982D */ daddu $s3, $a1, $zero -/* C52FCC 80240A8C 86240008 */ lh $a0, 8($s1) -/* C52FD0 80240A90 0C00EABB */ jal get_npc_unsafe -/* C52FD4 80240A94 00C0802D */ daddu $s0, $a2, $zero -/* C52FD8 80240A98 0200202D */ daddu $a0, $s0, $zero -/* C52FDC 80240A9C 0040802D */ daddu $s0, $v0, $zero -/* C52FE0 80240AA0 AFA00010 */ sw $zero, 0x10($sp) -/* C52FE4 80240AA4 8E660024 */ lw $a2, 0x24($s3) -/* C52FE8 80240AA8 8E670028 */ lw $a3, 0x28($s3) -/* C52FEC 80240AAC 0C01242D */ jal func_800490B4 -/* C52FF0 80240AB0 0220282D */ daddu $a1, $s1, $zero -/* C52FF4 80240AB4 1040000C */ beqz $v0, .L80240AE8 -/* C52FF8 80240AB8 00000000 */ nop -/* C52FFC 80240ABC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C53000 80240AC0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C53004 80240AC4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C53008 80240AC8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C5300C 80240ACC 8C460028 */ lw $a2, 0x28($v0) -/* C53010 80240AD0 0C00A720 */ jal atan2 -/* C53014 80240AD4 8C470030 */ lw $a3, 0x30($v0) -/* C53018 80240AD8 2402000C */ addiu $v0, $zero, 0xc -/* C5301C 80240ADC E600000C */ swc1 $f0, 0xc($s0) -/* C53020 80240AE0 080902E1 */ j .L80240B84 -/* C53024 80240AE4 AE420070 */ sw $v0, 0x70($s2) -.L80240AE8: -/* C53028 80240AE8 9602008E */ lhu $v0, 0x8e($s0) -/* C5302C 80240AEC 2442FFFF */ addiu $v0, $v0, -1 -/* C53030 80240AF0 A602008E */ sh $v0, 0x8e($s0) -/* C53034 80240AF4 00021400 */ sll $v0, $v0, 0x10 -/* C53038 80240AF8 1C400022 */ bgtz $v0, .L80240B84 -/* C5303C 80240AFC 00000000 */ nop -/* C53040 80240B00 8E420074 */ lw $v0, 0x74($s2) -/* C53044 80240B04 2442FFFF */ addiu $v0, $v0, -1 -/* C53048 80240B08 18400014 */ blez $v0, .L80240B5C -/* C5304C 80240B0C AE420074 */ sw $v0, 0x74($s2) -/* C53050 80240B10 C600000C */ lwc1 $f0, 0xc($s0) -/* C53054 80240B14 3C014334 */ lui $at, 0x4334 -/* C53058 80240B18 44816000 */ mtc1 $at, $f12 -/* C5305C 80240B1C 0C00A6C9 */ jal clamp_angle -/* C53060 80240B20 460C0300 */ add.s $f12, $f0, $f12 -/* C53064 80240B24 E600000C */ swc1 $f0, 0xc($s0) -/* C53068 80240B28 8E640008 */ lw $a0, 8($s3) -/* C5306C 80240B2C 000417C2 */ srl $v0, $a0, 0x1f -/* C53070 80240B30 00822021 */ addu $a0, $a0, $v0 -/* C53074 80240B34 00042043 */ sra $a0, $a0, 1 -/* C53078 80240B38 0C00A67F */ jal rand_int -/* C5307C 80240B3C 24840001 */ addiu $a0, $a0, 1 -/* C53080 80240B40 8E630008 */ lw $v1, 8($s3) -/* C53084 80240B44 000327C2 */ srl $a0, $v1, 0x1f -/* C53088 80240B48 00641821 */ addu $v1, $v1, $a0 -/* C5308C 80240B4C 00031843 */ sra $v1, $v1, 1 -/* C53090 80240B50 00621821 */ addu $v1, $v1, $v0 -/* C53094 80240B54 080902E1 */ j .L80240B84 -/* C53098 80240B58 A603008E */ sh $v1, 0x8e($s0) -.L80240B5C: -/* C5309C 80240B5C 8E250088 */ lw $a1, 0x88($s1) -/* C530A0 80240B60 24020028 */ addiu $v0, $zero, 0x28 -/* C530A4 80240B64 14A20003 */ bne $a1, $v0, .L80240B74 -/* C530A8 80240B68 24020032 */ addiu $v0, $zero, 0x32 -/* C530AC 80240B6C 080902DF */ j .L80240B7C -/* C530B0 80240B70 24020014 */ addiu $v0, $zero, 0x14 -.L80240B74: -/* C530B4 80240B74 14A20003 */ bne $a1, $v0, .L80240B84 -/* C530B8 80240B78 24020019 */ addiu $v0, $zero, 0x19 -.L80240B7C: -/* C530BC 80240B7C A602008E */ sh $v0, 0x8e($s0) -/* C530C0 80240B80 AE450070 */ sw $a1, 0x70($s2) -.L80240B84: -/* C530C4 80240B84 8FBF0028 */ lw $ra, 0x28($sp) -/* C530C8 80240B88 8FB30024 */ lw $s3, 0x24($sp) -/* C530CC 80240B8C 8FB20020 */ lw $s2, 0x20($sp) -/* C530D0 80240B90 8FB1001C */ lw $s1, 0x1c($sp) -/* C530D4 80240B94 8FB00018 */ lw $s0, 0x18($sp) -/* C530D8 80240B98 03E00008 */ jr $ra -/* C530DC 80240B9C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/func_80240BA0_C52540.s b/asm/nonmatchings/world/area_dgb/dgb_16/func_80240BA0_C52540.s deleted file mode 100644 index e23ba8df6c..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/func_80240BA0_C52540.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BA0_C530E0 -/* C530E0 80240BA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C530E4 80240BA4 AFB20018 */ sw $s2, 0x18($sp) -/* C530E8 80240BA8 0080902D */ daddu $s2, $a0, $zero -/* C530EC 80240BAC AFBF001C */ sw $ra, 0x1c($sp) -/* C530F0 80240BB0 AFB10014 */ sw $s1, 0x14($sp) -/* C530F4 80240BB4 AFB00010 */ sw $s0, 0x10($sp) -/* C530F8 80240BB8 8E500148 */ lw $s0, 0x148($s2) -/* C530FC 80240BBC 86040008 */ lh $a0, 8($s0) -/* C53100 80240BC0 0C00EABB */ jal get_npc_unsafe -/* C53104 80240BC4 00A0882D */ daddu $s1, $a1, $zero -/* C53108 80240BC8 0040182D */ daddu $v1, $v0, $zero -/* C5310C 80240BCC 9462008E */ lhu $v0, 0x8e($v1) -/* C53110 80240BD0 2442FFFF */ addiu $v0, $v0, -1 -/* C53114 80240BD4 A462008E */ sh $v0, 0x8e($v1) -/* C53118 80240BD8 00021400 */ sll $v0, $v0, 0x10 -/* C5311C 80240BDC 1C400015 */ bgtz $v0, .L80240C34 -/* C53120 80240BE0 00000000 */ nop -/* C53124 80240BE4 8E0200CC */ lw $v0, 0xcc($s0) -/* C53128 80240BE8 8C420004 */ lw $v0, 4($v0) -/* C5312C 80240BEC AC620028 */ sw $v0, 0x28($v1) -/* C53130 80240BF0 8E0200D0 */ lw $v0, 0xd0($s0) -/* C53134 80240BF4 8C420014 */ lw $v0, 0x14($v0) -/* C53138 80240BF8 04410004 */ bgez $v0, .L80240C0C -/* C5313C 80240BFC 00000000 */ nop -/* C53140 80240C00 C6200000 */ lwc1 $f0, ($s1) -/* C53144 80240C04 0809030B */ j .L80240C2C -/* C53148 80240C08 E4600018 */ swc1 $f0, 0x18($v1) -.L80240C0C: -/* C5314C 80240C0C 3C018024 */ lui $at, 0x8024 -/* C53150 80240C10 D42231F8 */ ldc1 $f2, 0x31f8($at) -/* C53154 80240C14 44820000 */ mtc1 $v0, $f0 -/* C53158 80240C18 00000000 */ nop -/* C5315C 80240C1C 46800021 */ cvt.d.w $f0, $f0 -/* C53160 80240C20 46220003 */ div.d $f0, $f0, $f2 -/* C53164 80240C24 46200020 */ cvt.s.d $f0, $f0 -/* C53168 80240C28 E4600018 */ swc1 $f0, 0x18($v1) -.L80240C2C: -/* C5316C 80240C2C 24020029 */ addiu $v0, $zero, 0x29 -/* C53170 80240C30 AE420070 */ sw $v0, 0x70($s2) -.L80240C34: -/* C53174 80240C34 8FBF001C */ lw $ra, 0x1c($sp) -/* C53178 80240C38 8FB20018 */ lw $s2, 0x18($sp) -/* C5317C 80240C3C 8FB10014 */ lw $s1, 0x14($sp) -/* C53180 80240C40 8FB00010 */ lw $s0, 0x10($sp) -/* C53184 80240C44 03E00008 */ jr $ra -/* C53188 80240C48 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/func_80240C4C_C52540.s b/asm/nonmatchings/world/area_dgb/dgb_16/func_80240C4C_C52540.s deleted file mode 100644 index fbfe04b938..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/func_80240C4C_C52540.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_C5318C -/* C5318C 80240C4C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C53190 80240C50 AFB3002C */ sw $s3, 0x2c($sp) -/* C53194 80240C54 0080982D */ daddu $s3, $a0, $zero -/* C53198 80240C58 AFBF0030 */ sw $ra, 0x30($sp) -/* C5319C 80240C5C AFB20028 */ sw $s2, 0x28($sp) -/* C531A0 80240C60 AFB10024 */ sw $s1, 0x24($sp) -/* C531A4 80240C64 AFB00020 */ sw $s0, 0x20($sp) -/* C531A8 80240C68 8E720148 */ lw $s2, 0x148($s3) -/* C531AC 80240C6C 00A0882D */ daddu $s1, $a1, $zero -/* C531B0 80240C70 86440008 */ lh $a0, 8($s2) -/* C531B4 80240C74 0C00EABB */ jal get_npc_unsafe -/* C531B8 80240C78 00C0802D */ daddu $s0, $a2, $zero -/* C531BC 80240C7C 0200202D */ daddu $a0, $s0, $zero -/* C531C0 80240C80 0240282D */ daddu $a1, $s2, $zero -/* C531C4 80240C84 AFA00010 */ sw $zero, 0x10($sp) -/* C531C8 80240C88 8E260024 */ lw $a2, 0x24($s1) -/* C531CC 80240C8C 8E270028 */ lw $a3, 0x28($s1) -/* C531D0 80240C90 0C01242D */ jal func_800490B4 -/* C531D4 80240C94 0040802D */ daddu $s0, $v0, $zero -/* C531D8 80240C98 1040000C */ beqz $v0, .L80240CCC -/* C531DC 80240C9C 00000000 */ nop -/* C531E0 80240CA0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C531E4 80240CA4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C531E8 80240CA8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C531EC 80240CAC C60E0040 */ lwc1 $f14, 0x40($s0) -/* C531F0 80240CB0 8C460028 */ lw $a2, 0x28($v0) -/* C531F4 80240CB4 0C00A720 */ jal atan2 -/* C531F8 80240CB8 8C470030 */ lw $a3, 0x30($v0) -/* C531FC 80240CBC 2402000C */ addiu $v0, $zero, 0xc -/* C53200 80240CC0 E600000C */ swc1 $f0, 0xc($s0) -/* C53204 80240CC4 0809036A */ j .L80240DA8 -/* C53208 80240CC8 AE620070 */ sw $v0, 0x70($s3) -.L80240CCC: -/* C5320C 80240CCC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C53210 80240CD0 8E4200D0 */ lw $v0, 0xd0($s2) -/* C53214 80240CD4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C53218 80240CD8 C4440000 */ lwc1 $f4, ($v0) -/* C5321C 80240CDC 46802120 */ cvt.s.w $f4, $f4 -/* C53220 80240CE0 44062000 */ mfc1 $a2, $f4 -/* C53224 80240CE4 C4440008 */ lwc1 $f4, 8($v0) -/* C53228 80240CE8 46802120 */ cvt.s.w $f4, $f4 -/* C5322C 80240CEC 44072000 */ mfc1 $a3, $f4 -/* C53230 80240CF0 0C00A7B5 */ jal dist2D -/* C53234 80240CF4 00000000 */ nop -/* C53238 80240CF8 C6020018 */ lwc1 $f2, 0x18($s0) -/* C5323C 80240CFC 4602003E */ c.le.s $f0, $f2 -/* C53240 80240D00 00000000 */ nop -/* C53244 80240D04 4500000B */ bc1f .L80240D34 -/* C53248 80240D08 00000000 */ nop -/* C5324C 80240D0C 8E4200CC */ lw $v0, 0xcc($s2) -/* C53250 80240D10 8C430000 */ lw $v1, ($v0) -/* C53254 80240D14 2402000F */ addiu $v0, $zero, 0xf -/* C53258 80240D18 A602008E */ sh $v0, 0x8e($s0) -/* C5325C 80240D1C 24020032 */ addiu $v0, $zero, 0x32 -/* C53260 80240D20 AE030028 */ sw $v1, 0x28($s0) -/* C53264 80240D24 AE420088 */ sw $v0, 0x88($s2) -/* C53268 80240D28 24020003 */ addiu $v0, $zero, 3 -/* C5326C 80240D2C 0809036A */ j .L80240DA8 -/* C53270 80240D30 AE620070 */ sw $v0, 0x70($s3) -.L80240D34: -/* C53274 80240D34 8602008C */ lh $v0, 0x8c($s0) -/* C53278 80240D38 1440001B */ bnez $v0, .L80240DA8 -/* C5327C 80240D3C 0200202D */ daddu $a0, $s0, $zero -/* C53280 80240D40 27A60018 */ addiu $a2, $sp, 0x18 -/* C53284 80240D44 3C0540A0 */ lui $a1, 0x40a0 -/* C53288 80240D48 C600000C */ lwc1 $f0, 0xc($s0) -/* C5328C 80240D4C 0000382D */ daddu $a3, $zero, $zero -/* C53290 80240D50 E7A00018 */ swc1 $f0, 0x18($sp) -/* C53294 80240D54 AFA00010 */ sw $zero, 0x10($sp) -/* C53298 80240D58 0C0129E1 */ jal func_8004A784 -/* C5329C 80240D5C AFA00014 */ sw $zero, 0x14($sp) -/* C532A0 80240D60 C7A00018 */ lwc1 $f0, 0x18($sp) -/* C532A4 80240D64 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C532A8 80240D68 E600000C */ swc1 $f0, 0xc($s0) -/* C532AC 80240D6C 8E4200D0 */ lw $v0, 0xd0($s2) -/* C532B0 80240D70 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C532B4 80240D74 C4440000 */ lwc1 $f4, ($v0) -/* C532B8 80240D78 46802120 */ cvt.s.w $f4, $f4 -/* C532BC 80240D7C 44062000 */ mfc1 $a2, $f4 -/* C532C0 80240D80 C4440008 */ lwc1 $f4, 8($v0) -/* C532C4 80240D84 46802120 */ cvt.s.w $f4, $f4 -/* C532C8 80240D88 44072000 */ mfc1 $a3, $f4 -/* C532CC 80240D8C 0C00A720 */ jal atan2 -/* C532D0 80240D90 00000000 */ nop -/* C532D4 80240D94 8E050018 */ lw $a1, 0x18($s0) -/* C532D8 80240D98 44060000 */ mfc1 $a2, $f0 -/* C532DC 80240D9C 0200202D */ daddu $a0, $s0, $zero -/* C532E0 80240DA0 0C00EA95 */ jal npc_move_heading -/* C532E4 80240DA4 AC86000C */ sw $a2, 0xc($a0) -.L80240DA8: -/* C532E8 80240DA8 8FBF0030 */ lw $ra, 0x30($sp) -/* C532EC 80240DAC 8FB3002C */ lw $s3, 0x2c($sp) -/* C532F0 80240DB0 8FB20028 */ lw $s2, 0x28($sp) -/* C532F4 80240DB4 8FB10024 */ lw $s1, 0x24($sp) -/* C532F8 80240DB8 8FB00020 */ lw $s0, 0x20($sp) -/* C532FC 80240DBC 03E00008 */ jr $ra -/* C53300 80240DC0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/func_80240DC4_C52540.s b/asm/nonmatchings/world/area_dgb/dgb_16/func_80240DC4_C52540.s deleted file mode 100644 index 1eba4663ac..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/func_80240DC4_C52540.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DC4_C53304 -/* C53304 80240DC4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C53308 80240DC8 AFB00010 */ sw $s0, 0x10($sp) -/* C5330C 80240DCC 0080802D */ daddu $s0, $a0, $zero -/* C53310 80240DD0 AFBF0014 */ sw $ra, 0x14($sp) -/* C53314 80240DD4 8E020148 */ lw $v0, 0x148($s0) -/* C53318 80240DD8 0C00EABB */ jal get_npc_unsafe -/* C5331C 80240DDC 84440008 */ lh $a0, 8($v0) -/* C53320 80240DE0 0040182D */ daddu $v1, $v0, $zero -/* C53324 80240DE4 8462008C */ lh $v0, 0x8c($v1) -/* C53328 80240DE8 14400009 */ bnez $v0, .L80240E10 -/* C5332C 80240DEC 00000000 */ nop -/* C53330 80240DF0 9462008E */ lhu $v0, 0x8e($v1) -/* C53334 80240DF4 2442FFFF */ addiu $v0, $v0, -1 -/* C53338 80240DF8 A462008E */ sh $v0, 0x8e($v1) -/* C5333C 80240DFC 00021400 */ sll $v0, $v0, 0x10 -/* C53340 80240E00 1C400003 */ bgtz $v0, .L80240E10 -/* C53344 80240E04 00000000 */ nop -/* C53348 80240E08 A460008E */ sh $zero, 0x8e($v1) -/* C5334C 80240E0C AE000070 */ sw $zero, 0x70($s0) -.L80240E10: -/* C53350 80240E10 8FBF0014 */ lw $ra, 0x14($sp) -/* C53354 80240E14 8FB00010 */ lw $s0, 0x10($sp) -/* C53358 80240E18 03E00008 */ jr $ra -/* C5335C 80240E1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/func_80240E20_C52540.s b/asm/nonmatchings/world/area_dgb/dgb_16/func_80240E20_C52540.s deleted file mode 100644 index 9bb74e3282..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/func_80240E20_C52540.s +++ /dev/null @@ -1,223 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E20_C53360 -/* C53360 80240E20 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C53364 80240E24 AFB20038 */ sw $s2, 0x38($sp) -/* C53368 80240E28 0080902D */ daddu $s2, $a0, $zero -/* C5336C 80240E2C AFBF0048 */ sw $ra, 0x48($sp) -/* C53370 80240E30 AFB50044 */ sw $s5, 0x44($sp) -/* C53374 80240E34 AFB40040 */ sw $s4, 0x40($sp) -/* C53378 80240E38 AFB3003C */ sw $s3, 0x3c($sp) -/* C5337C 80240E3C AFB10034 */ sw $s1, 0x34($sp) -/* C53380 80240E40 AFB00030 */ sw $s0, 0x30($sp) -/* C53384 80240E44 8E510148 */ lw $s1, 0x148($s2) -/* C53388 80240E48 86240008 */ lh $a0, 8($s1) -/* C5338C 80240E4C 0C00EABB */ jal get_npc_unsafe -/* C53390 80240E50 00A0802D */ daddu $s0, $a1, $zero -/* C53394 80240E54 8E43000C */ lw $v1, 0xc($s2) -/* C53398 80240E58 0240202D */ daddu $a0, $s2, $zero -/* C5339C 80240E5C 8C650000 */ lw $a1, ($v1) -/* C533A0 80240E60 0C0B1EAF */ jal get_variable -/* C533A4 80240E64 0040A02D */ daddu $s4, $v0, $zero -/* C533A8 80240E68 AFA00010 */ sw $zero, 0x10($sp) -/* C533AC 80240E6C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C533B0 80240E70 8C630030 */ lw $v1, 0x30($v1) -/* C533B4 80240E74 AFA30014 */ sw $v1, 0x14($sp) -/* C533B8 80240E78 8E2300D0 */ lw $v1, 0xd0($s1) -/* C533BC 80240E7C 8C63001C */ lw $v1, 0x1c($v1) -/* C533C0 80240E80 AFA30018 */ sw $v1, 0x18($sp) -/* C533C4 80240E84 8E2300D0 */ lw $v1, 0xd0($s1) -/* C533C8 80240E88 8C630024 */ lw $v1, 0x24($v1) -/* C533CC 80240E8C AFA3001C */ sw $v1, 0x1c($sp) -/* C533D0 80240E90 8E2300D0 */ lw $v1, 0xd0($s1) -/* C533D4 80240E94 8C630028 */ lw $v1, 0x28($v1) -/* C533D8 80240E98 27B50010 */ addiu $s5, $sp, 0x10 -/* C533DC 80240E9C AFA30020 */ sw $v1, 0x20($sp) -/* C533E0 80240EA0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C533E4 80240EA4 3C014220 */ lui $at, 0x4220 -/* C533E8 80240EA8 44810000 */ mtc1 $at, $f0 -/* C533EC 80240EAC 8C63002C */ lw $v1, 0x2c($v1) -/* C533F0 80240EB0 0040982D */ daddu $s3, $v0, $zero -/* C533F4 80240EB4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C533F8 80240EB8 A7A0002C */ sh $zero, 0x2c($sp) -/* C533FC 80240EBC 16000005 */ bnez $s0, .L80240ED4 -/* C53400 80240EC0 AFA30024 */ sw $v1, 0x24($sp) -/* C53404 80240EC4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C53408 80240EC8 30420004 */ andi $v0, $v0, 4 -/* C5340C 80240ECC 10400027 */ beqz $v0, .L80240F6C -/* C53410 80240ED0 00000000 */ nop -.L80240ED4: -/* C53414 80240ED4 2402001E */ addiu $v0, $zero, 0x1e -/* C53418 80240ED8 2404F7FF */ addiu $a0, $zero, -0x801 -/* C5341C 80240EDC AE400070 */ sw $zero, 0x70($s2) -/* C53420 80240EE0 A682008E */ sh $v0, 0x8e($s4) -/* C53424 80240EE4 8E2300CC */ lw $v1, 0xcc($s1) -/* C53428 80240EE8 8E820000 */ lw $v0, ($s4) -/* C5342C 80240EEC 8C630028 */ lw $v1, 0x28($v1) -/* C53430 80240EF0 00441024 */ and $v0, $v0, $a0 -/* C53434 80240EF4 AE820000 */ sw $v0, ($s4) -/* C53438 80240EF8 AE830028 */ sw $v1, 0x28($s4) -/* C5343C 80240EFC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C53440 80240F00 AE20006C */ sw $zero, 0x6c($s1) -/* C53444 80240F04 8C420034 */ lw $v0, 0x34($v0) -/* C53448 80240F08 14400006 */ bnez $v0, .L80240F24 -/* C5344C 80240F0C 2403FDFF */ addiu $v1, $zero, -0x201 -/* C53450 80240F10 8E820000 */ lw $v0, ($s4) -/* C53454 80240F14 2403FFF7 */ addiu $v1, $zero, -9 -/* C53458 80240F18 34420200 */ ori $v0, $v0, 0x200 -/* C5345C 80240F1C 080903CC */ j .L80240F30 -/* C53460 80240F20 00431024 */ and $v0, $v0, $v1 -.L80240F24: -/* C53464 80240F24 8E820000 */ lw $v0, ($s4) -/* C53468 80240F28 00431024 */ and $v0, $v0, $v1 -/* C5346C 80240F2C 34420008 */ ori $v0, $v0, 8 -.L80240F30: -/* C53470 80240F30 AE820000 */ sw $v0, ($s4) -/* C53474 80240F34 8E2200B0 */ lw $v0, 0xb0($s1) -/* C53478 80240F38 30420004 */ andi $v0, $v0, 4 -/* C5347C 80240F3C 10400007 */ beqz $v0, .L80240F5C -/* C53480 80240F40 24020063 */ addiu $v0, $zero, 0x63 -/* C53484 80240F44 AE420070 */ sw $v0, 0x70($s2) -/* C53488 80240F48 24020028 */ addiu $v0, $zero, 0x28 -/* C5348C 80240F4C AE420074 */ sw $v0, 0x74($s2) -/* C53490 80240F50 8E2200CC */ lw $v0, 0xcc($s1) -/* C53494 80240F54 8C420000 */ lw $v0, ($v0) -/* C53498 80240F58 AE820028 */ sw $v0, 0x28($s4) -.L80240F5C: -/* C5349C 80240F5C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C534A0 80240F60 2403FFFB */ addiu $v1, $zero, -5 -/* C534A4 80240F64 00431024 */ and $v0, $v0, $v1 -/* C534A8 80240F68 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240F6C: -/* C534AC 80240F6C 8E420070 */ lw $v0, 0x70($s2) -/* C534B0 80240F70 2442FFF6 */ addiu $v0, $v0, -0xa -/* C534B4 80240F74 2C420014 */ sltiu $v0, $v0, 0x14 -/* C534B8 80240F78 10400009 */ beqz $v0, .L80240FA0 -/* C534BC 80240F7C 00000000 */ nop -/* C534C0 80240F80 8E22006C */ lw $v0, 0x6c($s1) -/* C534C4 80240F84 14400006 */ bnez $v0, .L80240FA0 -/* C534C8 80240F88 00000000 */ nop -/* C534CC 80240F8C 0C090082 */ jal func_80240208 -/* C534D0 80240F90 0240202D */ daddu $a0, $s2, $zero -/* C534D4 80240F94 10400002 */ beqz $v0, .L80240FA0 -/* C534D8 80240F98 2402001E */ addiu $v0, $zero, 0x1e -/* C534DC 80240F9C AE420070 */ sw $v0, 0x70($s2) -.L80240FA0: -/* C534E0 80240FA0 8E430070 */ lw $v1, 0x70($s2) -/* C534E4 80240FA4 2C620064 */ sltiu $v0, $v1, 0x64 -/* C534E8 80240FA8 10400067 */ beqz $v0, .L80241148 -/* C534EC 80240FAC 00031080 */ sll $v0, $v1, 2 -/* C534F0 80240FB0 3C018024 */ lui $at, 0x8024 -/* C534F4 80240FB4 00220821 */ addu $at, $at, $v0 -/* C534F8 80240FB8 8C223200 */ lw $v0, 0x3200($at) -/* C534FC 80240FBC 00400008 */ jr $v0 -/* C53500 80240FC0 00000000 */ nop -/* C53504 80240FC4 0240202D */ daddu $a0, $s2, $zero -/* C53508 80240FC8 0260282D */ daddu $a1, $s3, $zero -/* C5350C 80240FCC 0C090187 */ jal func_8024061C -/* C53510 80240FD0 02A0302D */ daddu $a2, $s5, $zero -/* C53514 80240FD4 08090452 */ j .L80241148 -/* C53518 80240FD8 00000000 */ nop -/* C5351C 80240FDC 0240202D */ daddu $a0, $s2, $zero -/* C53520 80240FE0 0260282D */ daddu $a1, $s3, $zero -/* C53524 80240FE4 0C0901A9 */ jal func_802406A4 -/* C53528 80240FE8 02A0302D */ daddu $a2, $s5, $zero -/* C5352C 80240FEC 08090452 */ j .L80241148 -/* C53530 80240FF0 00000000 */ nop -/* C53534 80240FF4 0240202D */ daddu $a0, $s2, $zero -/* C53538 80240FF8 0260282D */ daddu $a1, $s3, $zero -/* C5353C 80240FFC 0C090257 */ jal func_8024095C -/* C53540 80241000 02A0302D */ daddu $a2, $s5, $zero -/* C53544 80241004 08090452 */ j .L80241148 -/* C53548 80241008 00000000 */ nop -/* C5354C 8024100C 0240202D */ daddu $a0, $s2, $zero -/* C53550 80241010 0260282D */ daddu $a1, $s3, $zero -/* C53554 80241014 0C090270 */ jal func_802409C0 -/* C53558 80241018 02A0302D */ daddu $a2, $s5, $zero -/* C5355C 8024101C 08090452 */ j .L80241148 -/* C53560 80241020 00000000 */ nop -/* C53564 80241024 0240202D */ daddu $a0, $s2, $zero -/* C53568 80241028 0260282D */ daddu $a1, $s3, $zero -/* C5356C 8024102C 0C09029A */ jal func_80240A68 -/* C53570 80241030 02A0302D */ daddu $a2, $s5, $zero -/* C53574 80241034 08090452 */ j .L80241148 -/* C53578 80241038 00000000 */ nop -/* C5357C 8024103C 0240202D */ daddu $a0, $s2, $zero -/* C53580 80241040 0260282D */ daddu $a1, $s3, $zero -/* C53584 80241044 0C0127DF */ jal func_80049F7C -/* C53588 80241048 02A0302D */ daddu $a2, $s5, $zero -/* C5358C 8024104C 8E430070 */ lw $v1, 0x70($s2) -/* C53590 80241050 2402000D */ addiu $v0, $zero, 0xd -/* C53594 80241054 1462003C */ bne $v1, $v0, .L80241148 -/* C53598 80241058 00000000 */ nop -/* C5359C 8024105C 0240202D */ daddu $a0, $s2, $zero -/* C535A0 80241060 0260282D */ daddu $a1, $s3, $zero -/* C535A4 80241064 0C012849 */ jal func_8004A124 -/* C535A8 80241068 02A0302D */ daddu $a2, $s5, $zero -/* C535AC 8024106C 08090452 */ j .L80241148 -/* C535B0 80241070 00000000 */ nop -/* C535B4 80241074 0240202D */ daddu $a0, $s2, $zero -/* C535B8 80241078 0260282D */ daddu $a1, $s3, $zero -/* C535BC 8024107C 0C0128FA */ jal func_8004A3E8 -/* C535C0 80241080 02A0302D */ daddu $a2, $s5, $zero -/* C535C4 80241084 2402000F */ addiu $v0, $zero, 0xf -/* C535C8 80241088 A682008E */ sh $v0, 0x8e($s4) -/* C535CC 8024108C 24020028 */ addiu $v0, $zero, 0x28 -/* C535D0 80241090 AE220088 */ sw $v0, 0x88($s1) -/* C535D4 80241094 24020003 */ addiu $v0, $zero, 3 -/* C535D8 80241098 08090452 */ j .L80241148 -/* C535DC 8024109C AE420070 */ sw $v0, 0x70($s2) -/* C535E0 802410A0 0C090000 */ jal func_80240000 -/* C535E4 802410A4 0240202D */ daddu $a0, $s2, $zero -/* C535E8 802410A8 8E430070 */ lw $v1, 0x70($s2) -/* C535EC 802410AC 2402001F */ addiu $v0, $zero, 0x1f -/* C535F0 802410B0 14620025 */ bne $v1, $v0, .L80241148 -/* C535F4 802410B4 00000000 */ nop -/* C535F8 802410B8 0C09001B */ jal func_8024006C -/* C535FC 802410BC 0240202D */ daddu $a0, $s2, $zero -/* C53600 802410C0 8E430070 */ lw $v1, 0x70($s2) -/* C53604 802410C4 24020020 */ addiu $v0, $zero, 0x20 -/* C53608 802410C8 1462001F */ bne $v1, $v0, .L80241148 -/* C5360C 802410CC 00000000 */ nop -/* C53610 802410D0 0C090037 */ jal func_802400DC -/* C53614 802410D4 0240202D */ daddu $a0, $s2, $zero -/* C53618 802410D8 08090452 */ j .L80241148 -/* C5361C 802410DC 00000000 */ nop -/* C53620 802410E0 0C09006D */ jal func_802401B4 -/* C53624 802410E4 0240202D */ daddu $a0, $s2, $zero -/* C53628 802410E8 08090452 */ j .L80241148 -/* C5362C 802410EC 00000000 */ nop -/* C53630 802410F0 0240202D */ daddu $a0, $s2, $zero -/* C53634 802410F4 0260282D */ daddu $a1, $s3, $zero -/* C53638 802410F8 0C0902E8 */ jal func_80240BA0 -/* C5363C 802410FC 02A0302D */ daddu $a2, $s5, $zero -/* C53640 80241100 8E430070 */ lw $v1, 0x70($s2) -/* C53644 80241104 24020029 */ addiu $v0, $zero, 0x29 -/* C53648 80241108 1462000F */ bne $v1, $v0, .L80241148 -/* C5364C 8024110C 00000000 */ nop -/* C53650 80241110 0240202D */ daddu $a0, $s2, $zero -/* C53654 80241114 0260282D */ daddu $a1, $s3, $zero -/* C53658 80241118 0C090313 */ jal func_80240C4C -/* C5365C 8024111C 02A0302D */ daddu $a2, $s5, $zero -/* C53660 80241120 08090452 */ j .L80241148 -/* C53664 80241124 00000000 */ nop -/* C53668 80241128 0240202D */ daddu $a0, $s2, $zero -/* C5366C 8024112C 0260282D */ daddu $a1, $s3, $zero -/* C53670 80241130 0C090371 */ jal func_80240DC4 -/* C53674 80241134 02A0302D */ daddu $a2, $s5, $zero -/* C53678 80241138 08090452 */ j .L80241148 -/* C5367C 8024113C 00000000 */ nop -/* C53680 80241140 0C0129CF */ jal func_8004A73C -/* C53684 80241144 0240202D */ daddu $a0, $s2, $zero -.L80241148: -/* C53688 80241148 8FBF0048 */ lw $ra, 0x48($sp) -/* C5368C 8024114C 8FB50044 */ lw $s5, 0x44($sp) -/* C53690 80241150 8FB40040 */ lw $s4, 0x40($sp) -/* C53694 80241154 8FB3003C */ lw $s3, 0x3c($sp) -/* C53698 80241158 8FB20038 */ lw $s2, 0x38($sp) -/* C5369C 8024115C 8FB10034 */ lw $s1, 0x34($sp) -/* C536A0 80241160 8FB00030 */ lw $s0, 0x30($sp) -/* C536A4 80241164 0000102D */ daddu $v0, $zero, $zero -/* C536A8 80241168 03E00008 */ jr $ra -/* C536AC 8024116C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/func_80241170_C52540.s b/asm/nonmatchings/world/area_dgb/dgb_16/func_80241170_C52540.s deleted file mode 100644 index 3ce6b44d09..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/func_80241170_C52540.s +++ /dev/null @@ -1,187 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241170_C536B0 -/* C536B0 80241170 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C536B4 80241174 AFB20038 */ sw $s2, 0x38($sp) -/* C536B8 80241178 0080902D */ daddu $s2, $a0, $zero -/* C536BC 8024117C AFBF0048 */ sw $ra, 0x48($sp) -/* C536C0 80241180 AFB50044 */ sw $s5, 0x44($sp) -/* C536C4 80241184 AFB40040 */ sw $s4, 0x40($sp) -/* C536C8 80241188 AFB3003C */ sw $s3, 0x3c($sp) -/* C536CC 8024118C AFB10034 */ sw $s1, 0x34($sp) -/* C536D0 80241190 AFB00030 */ sw $s0, 0x30($sp) -/* C536D4 80241194 8E510148 */ lw $s1, 0x148($s2) -/* C536D8 80241198 86240008 */ lh $a0, 8($s1) -/* C536DC 8024119C 0C00EABB */ jal get_npc_unsafe -/* C536E0 802411A0 00A0802D */ daddu $s0, $a1, $zero -/* C536E4 802411A4 8E43000C */ lw $v1, 0xc($s2) -/* C536E8 802411A8 0240202D */ daddu $a0, $s2, $zero -/* C536EC 802411AC 8C650000 */ lw $a1, ($v1) -/* C536F0 802411B0 0C0B1EAF */ jal get_variable -/* C536F4 802411B4 0040A82D */ daddu $s5, $v0, $zero -/* C536F8 802411B8 AFA00010 */ sw $zero, 0x10($sp) -/* C536FC 802411BC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C53700 802411C0 8C630030 */ lw $v1, 0x30($v1) -/* C53704 802411C4 AFA30014 */ sw $v1, 0x14($sp) -/* C53708 802411C8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C5370C 802411CC 8C63001C */ lw $v1, 0x1c($v1) -/* C53710 802411D0 AFA30018 */ sw $v1, 0x18($sp) -/* C53714 802411D4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C53718 802411D8 8C630024 */ lw $v1, 0x24($v1) -/* C5371C 802411DC AFA3001C */ sw $v1, 0x1c($sp) -/* C53720 802411E0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C53724 802411E4 8C630028 */ lw $v1, 0x28($v1) -/* C53728 802411E8 27B40010 */ addiu $s4, $sp, 0x10 -/* C5372C 802411EC AFA30020 */ sw $v1, 0x20($sp) -/* C53730 802411F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C53734 802411F4 3C014282 */ lui $at, 0x4282 -/* C53738 802411F8 44810000 */ mtc1 $at, $f0 -/* C5373C 802411FC 8C63002C */ lw $v1, 0x2c($v1) -/* C53740 80241200 0040982D */ daddu $s3, $v0, $zero -/* C53744 80241204 E7A00028 */ swc1 $f0, 0x28($sp) -/* C53748 80241208 A7A0002C */ sh $zero, 0x2c($sp) -/* C5374C 8024120C 16000005 */ bnez $s0, .L80241224 -/* C53750 80241210 AFA30024 */ sw $v1, 0x24($sp) -/* C53754 80241214 8E2200B0 */ lw $v0, 0xb0($s1) -/* C53758 80241218 30420004 */ andi $v0, $v0, 4 -/* C5375C 8024121C 10400020 */ beqz $v0, .L802412A0 -/* C53760 80241220 00000000 */ nop -.L80241224: -/* C53764 80241224 2404F7FF */ addiu $a0, $zero, -0x801 -/* C53768 80241228 AE400070 */ sw $zero, 0x70($s2) -/* C5376C 8024122C A6A0008E */ sh $zero, 0x8e($s5) -/* C53770 80241230 8E2200CC */ lw $v0, 0xcc($s1) -/* C53774 80241234 8EA30000 */ lw $v1, ($s5) -/* C53778 80241238 8C420000 */ lw $v0, ($v0) -/* C5377C 8024123C 00641824 */ and $v1, $v1, $a0 -/* C53780 80241240 AEA30000 */ sw $v1, ($s5) -/* C53784 80241244 AEA20028 */ sw $v0, 0x28($s5) -/* C53788 80241248 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5378C 8024124C 8C420034 */ lw $v0, 0x34($v0) -/* C53790 80241250 54400005 */ bnel $v0, $zero, .L80241268 -/* C53794 80241254 2402FDFF */ addiu $v0, $zero, -0x201 -/* C53798 80241258 34620200 */ ori $v0, $v1, 0x200 -/* C5379C 8024125C 2403FFF7 */ addiu $v1, $zero, -9 -/* C537A0 80241260 0809049C */ j .L80241270 -/* C537A4 80241264 00431024 */ and $v0, $v0, $v1 -.L80241268: -/* C537A8 80241268 00621024 */ and $v0, $v1, $v0 -/* C537AC 8024126C 34420008 */ ori $v0, $v0, 8 -.L80241270: -/* C537B0 80241270 AEA20000 */ sw $v0, ($s5) -/* C537B4 80241274 8E2200B0 */ lw $v0, 0xb0($s1) -/* C537B8 80241278 30420004 */ andi $v0, $v0, 4 -/* C537BC 8024127C 10400007 */ beqz $v0, .L8024129C -/* C537C0 80241280 24020063 */ addiu $v0, $zero, 0x63 -/* C537C4 80241284 AE420070 */ sw $v0, 0x70($s2) -/* C537C8 80241288 AE400074 */ sw $zero, 0x74($s2) -/* C537CC 8024128C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C537D0 80241290 2403FFFB */ addiu $v1, $zero, -5 -/* C537D4 80241294 00431024 */ and $v0, $v0, $v1 -/* C537D8 80241298 AE2200B0 */ sw $v0, 0xb0($s1) -.L8024129C: -/* C537DC 8024129C AE20006C */ sw $zero, 0x6c($s1) -.L802412A0: -/* C537E0 802412A0 8E420070 */ lw $v0, 0x70($s2) -/* C537E4 802412A4 2842001E */ slti $v0, $v0, 0x1e -/* C537E8 802412A8 10400009 */ beqz $v0, .L802412D0 -/* C537EC 802412AC 00000000 */ nop -/* C537F0 802412B0 8E22006C */ lw $v0, 0x6c($s1) -/* C537F4 802412B4 14400006 */ bnez $v0, .L802412D0 -/* C537F8 802412B8 00000000 */ nop -/* C537FC 802412BC 0C090082 */ jal func_80240208 -/* C53800 802412C0 0240202D */ daddu $a0, $s2, $zero -/* C53804 802412C4 10400002 */ beqz $v0, .L802412D0 -/* C53808 802412C8 2402001E */ addiu $v0, $zero, 0x1e -/* C5380C 802412CC AE420070 */ sw $v0, 0x70($s2) -.L802412D0: -/* C53810 802412D0 8E430070 */ lw $v1, 0x70($s2) -/* C53814 802412D4 2C620064 */ sltiu $v0, $v1, 0x64 -/* C53818 802412D8 10400048 */ beqz $v0, .L802413FC -/* C5381C 802412DC 00031080 */ sll $v0, $v1, 2 -/* C53820 802412E0 3C018024 */ lui $at, 0x8024 -/* C53824 802412E4 00220821 */ addu $at, $at, $v0 -/* C53828 802412E8 8C223390 */ lw $v0, 0x3390($at) -/* C5382C 802412EC 00400008 */ jr $v0 -/* C53830 802412F0 00000000 */ nop -/* C53834 802412F4 0240202D */ daddu $a0, $s2, $zero -/* C53838 802412F8 0260282D */ daddu $a1, $s3, $zero -/* C5383C 802412FC 0C012568 */ jal func_800495A0 -/* C53840 80241300 0280302D */ daddu $a2, $s4, $zero -/* C53844 80241304 0240202D */ daddu $a0, $s2, $zero -/* C53848 80241308 0260282D */ daddu $a1, $s3, $zero -/* C5384C 8024130C 0C0125AE */ jal func_800496B8 -/* C53850 80241310 0280302D */ daddu $a2, $s4, $zero -/* C53854 80241314 080904FF */ j .L802413FC -/* C53858 80241318 00000000 */ nop -/* C5385C 8024131C 0240202D */ daddu $a0, $s2, $zero -/* C53860 80241320 0260282D */ daddu $a1, $s3, $zero -/* C53864 80241324 0C0126D1 */ jal func_80049B44 -/* C53868 80241328 0280302D */ daddu $a2, $s4, $zero -/* C5386C 8024132C 0240202D */ daddu $a0, $s2, $zero -/* C53870 80241330 0260282D */ daddu $a1, $s3, $zero -/* C53874 80241334 0C012701 */ jal func_80049C04 -/* C53878 80241338 0280302D */ daddu $a2, $s4, $zero -/* C5387C 8024133C 080904FF */ j .L802413FC -/* C53880 80241340 00000000 */ nop -/* C53884 80241344 0240202D */ daddu $a0, $s2, $zero -/* C53888 80241348 0260282D */ daddu $a1, $s3, $zero -/* C5388C 8024134C 0C01278F */ jal func_80049E3C -/* C53890 80241350 0280302D */ daddu $a2, $s4, $zero -/* C53894 80241354 0240202D */ daddu $a0, $s2, $zero -/* C53898 80241358 0260282D */ daddu $a1, $s3, $zero -/* C5389C 8024135C 0C0127B3 */ jal func_80049ECC -/* C538A0 80241360 0280302D */ daddu $a2, $s4, $zero -/* C538A4 80241364 080904FF */ j .L802413FC -/* C538A8 80241368 00000000 */ nop -/* C538AC 8024136C 0240202D */ daddu $a0, $s2, $zero -/* C538B0 80241370 0260282D */ daddu $a1, $s3, $zero -/* C538B4 80241374 0C0127DF */ jal func_80049F7C -/* C538B8 80241378 0280302D */ daddu $a2, $s4, $zero -/* C538BC 8024137C 0240202D */ daddu $a0, $s2, $zero -/* C538C0 80241380 0260282D */ daddu $a1, $s3, $zero -/* C538C4 80241384 0C012849 */ jal func_8004A124 -/* C538C8 80241388 0280302D */ daddu $a2, $s4, $zero -/* C538CC 8024138C 080904FF */ j .L802413FC -/* C538D0 80241390 00000000 */ nop -/* C538D4 80241394 0240202D */ daddu $a0, $s2, $zero -/* C538D8 80241398 0260282D */ daddu $a1, $s3, $zero -/* C538DC 8024139C 0C0128FA */ jal func_8004A3E8 -/* C538E0 802413A0 0280302D */ daddu $a2, $s4, $zero -/* C538E4 802413A4 080904FF */ j .L802413FC -/* C538E8 802413A8 00000000 */ nop -/* C538EC 802413AC 0C090000 */ jal func_80240000 -/* C538F0 802413B0 0240202D */ daddu $a0, $s2, $zero -/* C538F4 802413B4 0C09001B */ jal func_8024006C -/* C538F8 802413B8 0240202D */ daddu $a0, $s2, $zero -/* C538FC 802413BC 8E430070 */ lw $v1, 0x70($s2) -/* C53900 802413C0 24020020 */ addiu $v0, $zero, 0x20 -/* C53904 802413C4 1462000D */ bne $v1, $v0, .L802413FC -/* C53908 802413C8 00000000 */ nop -/* C5390C 802413CC 0C090037 */ jal func_802400DC -/* C53910 802413D0 0240202D */ daddu $a0, $s2, $zero -/* C53914 802413D4 8E430070 */ lw $v1, 0x70($s2) -/* C53918 802413D8 24020021 */ addiu $v0, $zero, 0x21 -/* C5391C 802413DC 14620007 */ bne $v1, $v0, .L802413FC -/* C53920 802413E0 00000000 */ nop -/* C53924 802413E4 0C09006D */ jal func_802401B4 -/* C53928 802413E8 0240202D */ daddu $a0, $s2, $zero -/* C5392C 802413EC 080904FF */ j .L802413FC -/* C53930 802413F0 00000000 */ nop -/* C53934 802413F4 0C0129CF */ jal func_8004A73C -/* C53938 802413F8 0240202D */ daddu $a0, $s2, $zero -.L802413FC: -/* C5393C 802413FC 8FBF0048 */ lw $ra, 0x48($sp) -/* C53940 80241400 8FB50044 */ lw $s5, 0x44($sp) -/* C53944 80241404 8FB40040 */ lw $s4, 0x40($sp) -/* C53948 80241408 8FB3003C */ lw $s3, 0x3c($sp) -/* C5394C 8024140C 8FB20038 */ lw $s2, 0x38($sp) -/* C53950 80241410 8FB10034 */ lw $s1, 0x34($sp) -/* C53954 80241414 8FB00030 */ lw $s0, 0x30($sp) -/* C53958 80241418 0000102D */ daddu $v0, $zero, $zero -/* C5395C 8024141C 03E00008 */ jr $ra -/* C53960 80241420 27BD0050 */ addiu $sp, $sp, 0x50 -/* C53964 80241424 00000000 */ nop -/* C53968 80241428 00000000 */ nop -/* C5396C 8024142C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/update_starpoints_display_C52540.s b/asm/nonmatchings/world/area_dgb/dgb_16/update_starpoints_display_C52540.s deleted file mode 100644 index 2c4d284f33..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_16/update_starpoints_display_C52540.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_starpoints_display_C528FC -/* C528FC 802403BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C52900 802403C0 AFB40028 */ sw $s4, 0x28($sp) -/* C52904 802403C4 0080A02D */ daddu $s4, $a0, $zero -/* C52908 802403C8 AFBF002C */ sw $ra, 0x2c($sp) -/* C5290C 802403CC AFB30024 */ sw $s3, 0x24($sp) -/* C52910 802403D0 AFB20020 */ sw $s2, 0x20($sp) -/* C52914 802403D4 AFB1001C */ sw $s1, 0x1c($sp) -/* C52918 802403D8 AFB00018 */ sw $s0, 0x18($sp) -/* C5291C 802403DC 8E910148 */ lw $s1, 0x148($s4) -/* C52920 802403E0 86240008 */ lh $a0, 8($s1) -/* C52924 802403E4 0C00EABB */ jal get_npc_unsafe -/* C52928 802403E8 00A0802D */ daddu $s0, $a1, $zero -/* C5292C 802403EC 16000005 */ bnez $s0, .L80240404 -/* C52930 802403F0 0040902D */ daddu $s2, $v0, $zero -/* C52934 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C52938 802403F8 30420004 */ andi $v0, $v0, 4 -/* C5293C 802403FC 10400015 */ beqz $v0, .L80240454 -/* C52940 80240400 00000000 */ nop -.L80240404: -/* C52944 80240404 AE800070 */ sw $zero, 0x70($s4) -/* C52948 80240408 8E420000 */ lw $v0, ($s2) -/* C5294C 8024040C 3C031F30 */ lui $v1, 0x1f30 -/* C52950 80240410 A640008E */ sh $zero, 0x8e($s2) -/* C52954 80240414 34420102 */ ori $v0, $v0, 0x102 -/* C52958 80240418 AE420000 */ sw $v0, ($s2) -/* C5295C 8024041C 8E220000 */ lw $v0, ($s1) -/* C52960 80240420 3C01C47A */ lui $at, 0xc47a -/* C52964 80240424 44810000 */ mtc1 $at, $f0 -/* C52968 80240428 00431025 */ or $v0, $v0, $v1 -/* C5296C 8024042C AE220000 */ sw $v0, ($s1) -/* C52970 80240430 AE400038 */ sw $zero, 0x38($s2) -/* C52974 80240434 E640003C */ swc1 $f0, 0x3c($s2) -/* C52978 80240438 AE400040 */ sw $zero, 0x40($s2) -/* C5297C 8024043C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C52980 80240440 30620004 */ andi $v0, $v1, 4 -/* C52984 80240444 10400003 */ beqz $v0, .L80240454 -/* C52988 80240448 2402FFFB */ addiu $v0, $zero, -5 -/* C5298C 8024044C 00621024 */ and $v0, $v1, $v0 -/* C52990 80240450 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240454: -/* C52994 80240454 8E930070 */ lw $s3, 0x70($s4) -/* C52998 80240458 12600005 */ beqz $s3, .L80240470 -/* C5299C 8024045C 24020001 */ addiu $v0, $zero, 1 -/* C529A0 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* C529A4 80240464 00000000 */ nop -/* C529A8 80240468 0809017E */ j .L802405F8 -/* C529AC 8024046C 00000000 */ nop -.L80240470: -/* C529B0 80240470 86240008 */ lh $a0, 8($s1) -/* C529B4 80240474 0C00FB3A */ jal get_enemy -/* C529B8 80240478 2484FFFF */ addiu $a0, $a0, -1 -/* C529BC 8024047C 0040802D */ daddu $s0, $v0, $zero -/* C529C0 80240480 0C00EABB */ jal get_npc_unsafe -/* C529C4 80240484 86040008 */ lh $a0, 8($s0) -/* C529C8 80240488 24030001 */ addiu $v1, $zero, 1 -/* C529CC 8024048C 0040982D */ daddu $s3, $v0, $zero -/* C529D0 80240490 A2230007 */ sb $v1, 7($s1) -/* C529D4 80240494 8E03006C */ lw $v1, 0x6c($s0) -/* C529D8 80240498 24020003 */ addiu $v0, $zero, 3 -/* C529DC 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* C529E0 802404A0 00000000 */ nop -/* C529E4 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) -/* C529E8 802404A8 10A00003 */ beqz $a1, .L802404B8 -/* C529EC 802404AC 0260202D */ daddu $a0, $s3, $zero -/* C529F0 802404B0 0C012530 */ jal func_800494C0 -/* C529F4 802404B4 0000302D */ daddu $a2, $zero, $zero -.L802404B8: -/* C529F8 802404B8 27A40010 */ addiu $a0, $sp, 0x10 -/* C529FC 802404BC C6280070 */ lwc1 $f8, 0x70($s1) -/* C52A00 802404C0 46804220 */ cvt.s.w $f8, $f8 -/* C52A04 802404C4 C6620034 */ lwc1 $f2, 0x34($s3) -/* C52A08 802404C8 3C014387 */ lui $at, 0x4387 -/* C52A0C 802404CC 44810000 */ mtc1 $at, $f0 -/* C52A10 802404D0 44064000 */ mfc1 $a2, $f8 -/* C52A14 802404D4 46020001 */ sub.s $f0, $f0, $f2 -/* C52A18 802404D8 C6660038 */ lwc1 $f6, 0x38($s3) -/* C52A1C 802404DC C6640040 */ lwc1 $f4, 0x40($s3) -/* C52A20 802404E0 44070000 */ mfc1 $a3, $f0 -/* C52A24 802404E4 27A50014 */ addiu $a1, $sp, 0x14 -/* C52A28 802404E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* C52A2C 802404EC 0C00A7E7 */ jal add_vec2D_polar -/* C52A30 802404F0 E7A40014 */ swc1 $f4, 0x14($sp) -/* C52A34 802404F4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C52A38 802404F8 4600020D */ trunc.w.s $f8, $f0 -/* C52A3C 802404FC 44024000 */ mfc1 $v0, $f8 -/* C52A40 80240500 E6400038 */ swc1 $f0, 0x38($s2) -/* C52A44 80240504 A6220010 */ sh $v0, 0x10($s1) -/* C52A48 80240508 C660003C */ lwc1 $f0, 0x3c($s3) -/* C52A4C 8024050C C622006C */ lwc1 $f2, 0x6c($s1) -/* C52A50 80240510 468010A0 */ cvt.s.w $f2, $f2 -/* C52A54 80240514 46020000 */ add.s $f0, $f0, $f2 -/* C52A58 80240518 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C52A5C 8024051C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C52A60 80240520 E640003C */ swc1 $f0, 0x3c($s2) -/* C52A64 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C52A68 80240528 4600020D */ trunc.w.s $f8, $f0 -/* C52A6C 8024052C 44024000 */ mfc1 $v0, $f8 -/* C52A70 80240530 00000000 */ nop -/* C52A74 80240534 A6220012 */ sh $v0, 0x12($s1) -/* C52A78 80240538 4600120D */ trunc.w.s $f8, $f2 -/* C52A7C 8024053C 44024000 */ mfc1 $v0, $f8 -/* C52A80 80240540 E6420040 */ swc1 $f2, 0x40($s2) -/* C52A84 80240544 A6220014 */ sh $v0, 0x14($s1) -/* C52A88 80240548 8C660028 */ lw $a2, 0x28($v1) -/* C52A8C 8024054C 8C670030 */ lw $a3, 0x30($v1) -/* C52A90 80240550 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C52A94 80240554 0C00A720 */ jal atan2 -/* C52A98 80240558 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C52A9C 8024055C 3C03E0EF */ lui $v1, 0xe0ef -/* C52AA0 80240560 E640000C */ swc1 $f0, 0xc($s2) -/* C52AA4 80240564 8E220000 */ lw $v0, ($s1) -/* C52AA8 80240568 3463FFFF */ ori $v1, $v1, 0xffff -/* C52AAC 8024056C 00431024 */ and $v0, $v0, $v1 -/* C52AB0 80240570 AE220000 */ sw $v0, ($s1) -/* C52AB4 80240574 24020001 */ addiu $v0, $zero, 1 -/* C52AB8 80240578 A640008E */ sh $zero, 0x8e($s2) -/* C52ABC 8024057C 0809017E */ j .L802405F8 -/* C52AC0 80240580 AE820070 */ sw $v0, 0x70($s4) -.L80240584: -/* C52AC4 80240584 86240008 */ lh $a0, 8($s1) -/* C52AC8 80240588 0C00FB3A */ jal get_enemy -/* C52ACC 8024058C 2484FFFF */ addiu $a0, $a0, -1 -/* C52AD0 80240590 0040802D */ daddu $s0, $v0, $zero -/* C52AD4 80240594 0C00EABB */ jal get_npc_unsafe -/* C52AD8 80240598 86040008 */ lh $a0, 8($s0) -/* C52ADC 8024059C 9642008E */ lhu $v0, 0x8e($s2) -/* C52AE0 802405A0 24420001 */ addiu $v0, $v0, 1 -/* C52AE4 802405A4 A642008E */ sh $v0, 0x8e($s2) -/* C52AE8 802405A8 00021400 */ sll $v0, $v0, 0x10 -/* C52AEC 802405AC 8E23007C */ lw $v1, 0x7c($s1) -/* C52AF0 802405B0 00021403 */ sra $v0, $v0, 0x10 -/* C52AF4 802405B4 0043102A */ slt $v0, $v0, $v1 -/* C52AF8 802405B8 50400001 */ beql $v0, $zero, .L802405C0 -/* C52AFC 802405BC A2200007 */ sb $zero, 7($s1) -.L802405C0: -/* C52B00 802405C0 8E03006C */ lw $v1, 0x6c($s0) -/* C52B04 802405C4 24020004 */ addiu $v0, $zero, 4 -/* C52B08 802405C8 1462000B */ bne $v1, $v0, .L802405F8 -/* C52B0C 802405CC 3C021F10 */ lui $v0, 0x1f10 -/* C52B10 802405D0 8E230000 */ lw $v1, ($s1) -/* C52B14 802405D4 3C01C47A */ lui $at, 0xc47a -/* C52B18 802405D8 44810000 */ mtc1 $at, $f0 -/* C52B1C 802405DC 00621825 */ or $v1, $v1, $v0 -/* C52B20 802405E0 AE230000 */ sw $v1, ($s1) -/* C52B24 802405E4 AE400038 */ sw $zero, 0x38($s2) -/* C52B28 802405E8 E640003C */ swc1 $f0, 0x3c($s2) -/* C52B2C 802405EC AE400040 */ sw $zero, 0x40($s2) -/* C52B30 802405F0 A2330007 */ sb $s3, 7($s1) -/* C52B34 802405F4 AE800070 */ sw $zero, 0x70($s4) -.L802405F8: -/* C52B38 802405F8 8FBF002C */ lw $ra, 0x2c($sp) -/* C52B3C 802405FC 8FB40028 */ lw $s4, 0x28($sp) -/* C52B40 80240600 8FB30024 */ lw $s3, 0x24($sp) -/* C52B44 80240604 8FB20020 */ lw $s2, 0x20($sp) -/* C52B48 80240608 8FB1001C */ lw $s1, 0x1c($sp) -/* C52B4C 8024060C 8FB00018 */ lw $s0, 0x18($sp) -/* C52B50 80240610 0000102D */ daddu $v0, $zero, $zero -/* C52B54 80240614 03E00008 */ jr $ra -/* C52B58 80240618 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/begin_battle_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/begin_battle_C55F40.s deleted file mode 100644 index 99c367974e..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/begin_battle_C55F40.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel begin_battle_C57158 -/* C57158 80241218 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5715C 8024121C AFB00010 */ sw $s0, 0x10($sp) -/* C57160 80241220 0080802D */ daddu $s0, $a0, $zero -/* C57164 80241224 AFBF0014 */ sw $ra, 0x14($sp) -/* C57168 80241228 8E02000C */ lw $v0, 0xc($s0) -/* C5716C 8024122C 0C0B1EAF */ jal get_variable -/* C57170 80241230 8C450000 */ lw $a1, ($v0) -/* C57174 80241234 00021140 */ sll $v0, $v0, 5 -/* C57178 80241238 AE000084 */ sw $zero, 0x84($s0) -/* C5717C 8024123C 3C018008 */ lui $at, 0x8008 -/* C57180 80241240 00220821 */ addu $at, $at, $v0 -/* C57184 80241244 942278F8 */ lhu $v0, 0x78f8($at) -/* C57188 80241248 30420040 */ andi $v0, $v0, 0x40 -/* C5718C 8024124C 10400002 */ beqz $v0, .L80241258 -/* C57190 80241250 24020001 */ addiu $v0, $zero, 1 -/* C57194 80241254 AE020084 */ sw $v0, 0x84($s0) -.L80241258: -/* C57198 80241258 8FBF0014 */ lw $ra, 0x14($sp) -/* C5719C 8024125C 8FB00010 */ lw $s0, 0x10($sp) -/* C571A0 80241260 24020002 */ addiu $v0, $zero, 2 -/* C571A4 80241264 03E00008 */ jr $ra -/* C571A8 80241268 27BD0018 */ addiu $sp, $sp, 0x18 -/* C571AC 8024126C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240158_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/func_80240158_C55F40.s deleted file mode 100644 index ef112d540e..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240158_C55F40.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_C56098 -/* C56098 80240158 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C5609C 8024015C AFB20038 */ sw $s2, 0x38($sp) -/* C560A0 80240160 0080902D */ daddu $s2, $a0, $zero -/* C560A4 80240164 AFBF0044 */ sw $ra, 0x44($sp) -/* C560A8 80240168 AFB40040 */ sw $s4, 0x40($sp) -/* C560AC 8024016C AFB3003C */ sw $s3, 0x3c($sp) -/* C560B0 80240170 AFB10034 */ sw $s1, 0x34($sp) -/* C560B4 80240174 AFB00030 */ sw $s0, 0x30($sp) -/* C560B8 80240178 F7B60050 */ sdc1 $f22, 0x50($sp) -/* C560BC 8024017C F7B40048 */ sdc1 $f20, 0x48($sp) -/* C560C0 80240180 8E510148 */ lw $s1, 0x148($s2) -/* C560C4 80240184 00A0982D */ daddu $s3, $a1, $zero -/* C560C8 80240188 86240008 */ lh $a0, 8($s1) -/* C560CC 8024018C 0C00EABB */ jal get_npc_unsafe -/* C560D0 80240190 00C0A02D */ daddu $s4, $a2, $zero -/* C560D4 80240194 8E630014 */ lw $v1, 0x14($s3) -/* C560D8 80240198 04600030 */ bltz $v1, .L8024025C -/* C560DC 8024019C 0040802D */ daddu $s0, $v0, $zero -/* C560E0 802401A0 8E420074 */ lw $v0, 0x74($s2) -/* C560E4 802401A4 1C40002C */ bgtz $v0, .L80240258 -/* C560E8 802401A8 2442FFFF */ addiu $v0, $v0, -1 -/* C560EC 802401AC 0280202D */ daddu $a0, $s4, $zero -/* C560F0 802401B0 AE430074 */ sw $v1, 0x74($s2) -/* C560F4 802401B4 AFA00010 */ sw $zero, 0x10($sp) -/* C560F8 802401B8 8E66000C */ lw $a2, 0xc($s3) -/* C560FC 802401BC 8E670010 */ lw $a3, 0x10($s3) -/* C56100 802401C0 0C01242D */ jal func_800490B4 -/* C56104 802401C4 0220282D */ daddu $a1, $s1, $zero -/* C56108 802401C8 10400021 */ beqz $v0, .L80240250 -/* C5610C 802401CC 0000202D */ daddu $a0, $zero, $zero -/* C56110 802401D0 0200282D */ daddu $a1, $s0, $zero -/* C56114 802401D4 0000302D */ daddu $a2, $zero, $zero -/* C56118 802401D8 860300A8 */ lh $v1, 0xa8($s0) -/* C5611C 802401DC 3C013F80 */ lui $at, 0x3f80 -/* C56120 802401E0 44810000 */ mtc1 $at, $f0 -/* C56124 802401E4 3C014000 */ lui $at, 0x4000 -/* C56128 802401E8 44811000 */ mtc1 $at, $f2 -/* C5612C 802401EC 3C01C1A0 */ lui $at, 0xc1a0 -/* C56130 802401F0 44812000 */ mtc1 $at, $f4 -/* C56134 802401F4 2402000F */ addiu $v0, $zero, 0xf -/* C56138 802401F8 AFA2001C */ sw $v0, 0x1c($sp) -/* C5613C 802401FC 44833000 */ mtc1 $v1, $f6 -/* C56140 80240200 00000000 */ nop -/* C56144 80240204 468031A0 */ cvt.s.w $f6, $f6 -/* C56148 80240208 44073000 */ mfc1 $a3, $f6 -/* C5614C 8024020C 27A20028 */ addiu $v0, $sp, 0x28 -/* C56150 80240210 AFA20020 */ sw $v0, 0x20($sp) -/* C56154 80240214 E7A00010 */ swc1 $f0, 0x10($sp) -/* C56158 80240218 E7A20014 */ swc1 $f2, 0x14($sp) -/* C5615C 8024021C 0C01BFA4 */ jal fx_emote -/* C56160 80240220 E7A40018 */ swc1 $f4, 0x18($sp) -/* C56164 80240224 0200202D */ daddu $a0, $s0, $zero -/* C56168 80240228 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C5616C 8024022C 0C012530 */ jal func_800494C0 -/* C56170 80240230 3C060020 */ lui $a2, 0x20 -/* C56174 80240234 8E220018 */ lw $v0, 0x18($s1) -/* C56178 80240238 9442002A */ lhu $v0, 0x2a($v0) -/* C5617C 8024023C 30420001 */ andi $v0, $v0, 1 -/* C56180 80240240 14400064 */ bnez $v0, .L802403D4 -/* C56184 80240244 2402000A */ addiu $v0, $zero, 0xa -/* C56188 80240248 080900F5 */ j .L802403D4 -/* C5618C 8024024C 2402000C */ addiu $v0, $zero, 0xc -.L80240250: -/* C56190 80240250 8E420074 */ lw $v0, 0x74($s2) -/* C56194 80240254 2442FFFF */ addiu $v0, $v0, -1 -.L80240258: -/* C56198 80240258 AE420074 */ sw $v0, 0x74($s2) -.L8024025C: -/* C5619C 8024025C 8602008C */ lh $v0, 0x8c($s0) -/* C561A0 80240260 1440005D */ bnez $v0, .L802403D8 -/* C561A4 80240264 00000000 */ nop -/* C561A8 80240268 C6000018 */ lwc1 $f0, 0x18($s0) -/* C561AC 8024026C 3C014010 */ lui $at, 0x4010 -/* C561B0 80240270 44811800 */ mtc1 $at, $f3 -/* C561B4 80240274 44801000 */ mtc1 $zero, $f2 -/* C561B8 80240278 46000021 */ cvt.d.s $f0, $f0 -/* C561BC 8024027C 4622003C */ c.lt.d $f0, $f2 -/* C561C0 80240280 00000000 */ nop -/* C561C4 80240284 45000003 */ bc1f .L80240294 -/* C561C8 80240288 0200202D */ daddu $a0, $s0, $zero -/* C561CC 8024028C 080900A6 */ j .L80240298 -/* C561D0 80240290 0000282D */ daddu $a1, $zero, $zero -.L80240294: -/* C561D4 80240294 24050001 */ addiu $a1, $zero, 1 -.L80240298: -/* C561D8 80240298 0C00F598 */ jal func_8003D660 -/* C561DC 8024029C 00000000 */ nop -/* C561E0 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C561E4 802402A4 8E430078 */ lw $v1, 0x78($s2) -/* C561E8 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C561EC 802402AC 00031040 */ sll $v0, $v1, 1 -/* C561F0 802402B0 00431021 */ addu $v0, $v0, $v1 -/* C561F4 802402B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C561F8 802402B8 00021080 */ sll $v0, $v0, 2 -/* C561FC 802402BC 00431021 */ addu $v0, $v0, $v1 -/* C56200 802402C0 C4560004 */ lwc1 $f22, 4($v0) -/* C56204 802402C4 4680B5A0 */ cvt.s.w $f22, $f22 -/* C56208 802402C8 C454000C */ lwc1 $f20, 0xc($v0) -/* C5620C 802402CC 4680A520 */ cvt.s.w $f20, $f20 -/* C56210 802402D0 4406B000 */ mfc1 $a2, $f22 -/* C56214 802402D4 4407A000 */ mfc1 $a3, $f20 -/* C56218 802402D8 0C00A720 */ jal atan2 -/* C5621C 802402DC 00000000 */ nop -/* C56220 802402E0 8E050018 */ lw $a1, 0x18($s0) -/* C56224 802402E4 44060000 */ mfc1 $a2, $f0 -/* C56228 802402E8 0200202D */ daddu $a0, $s0, $zero -/* C5622C 802402EC 0C00EA95 */ jal npc_move_heading -/* C56230 802402F0 AE06000C */ sw $a2, 0xc($s0) -/* C56234 802402F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C56238 802402F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C5623C 802402FC 4406B000 */ mfc1 $a2, $f22 -/* C56240 80240300 4407A000 */ mfc1 $a3, $f20 -/* C56244 80240304 0C00A7B5 */ jal dist2D -/* C56248 80240308 00000000 */ nop -/* C5624C 8024030C C6020018 */ lwc1 $f2, 0x18($s0) -/* C56250 80240310 4602003E */ c.le.s $f0, $f2 -/* C56254 80240314 00000000 */ nop -/* C56258 80240318 4500002F */ bc1f .L802403D8 -/* C5625C 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C56260 80240320 24020002 */ addiu $v0, $zero, 2 -/* C56264 80240324 0C00A67F */ jal rand_int -/* C56268 80240328 AE420070 */ sw $v0, 0x70($s2) -/* C5626C 8024032C 3C035555 */ lui $v1, 0x5555 -/* C56270 80240330 34635556 */ ori $v1, $v1, 0x5556 -/* C56274 80240334 00430018 */ mult $v0, $v1 -/* C56278 80240338 000227C3 */ sra $a0, $v0, 0x1f -/* C5627C 8024033C 00004010 */ mfhi $t0 -/* C56280 80240340 01042023 */ subu $a0, $t0, $a0 -/* C56284 80240344 00041840 */ sll $v1, $a0, 1 -/* C56288 80240348 00641821 */ addu $v1, $v1, $a0 -/* C5628C 8024034C 00431023 */ subu $v0, $v0, $v1 -/* C56290 80240350 24430002 */ addiu $v1, $v0, 2 -/* C56294 80240354 AE430074 */ sw $v1, 0x74($s2) -/* C56298 80240358 8E62002C */ lw $v0, 0x2c($s3) -/* C5629C 8024035C 18400009 */ blez $v0, .L80240384 -/* C562A0 80240360 24020004 */ addiu $v0, $zero, 4 -/* C562A4 80240364 8E620004 */ lw $v0, 4($s3) -/* C562A8 80240368 18400006 */ blez $v0, .L80240384 -/* C562AC 8024036C 24020004 */ addiu $v0, $zero, 4 -/* C562B0 80240370 8E620008 */ lw $v0, 8($s3) -/* C562B4 80240374 18400003 */ blez $v0, .L80240384 -/* C562B8 80240378 24020004 */ addiu $v0, $zero, 4 -/* C562BC 8024037C 14600002 */ bnez $v1, .L80240388 -/* C562C0 80240380 00000000 */ nop -.L80240384: -/* C562C4 80240384 AE420070 */ sw $v0, 0x70($s2) -.L80240388: -/* C562C8 80240388 0C00A67F */ jal rand_int -/* C562CC 8024038C 24042710 */ addiu $a0, $zero, 0x2710 -/* C562D0 80240390 3C0351EB */ lui $v1, 0x51eb -/* C562D4 80240394 3463851F */ ori $v1, $v1, 0x851f -/* C562D8 80240398 00430018 */ mult $v0, $v1 -/* C562DC 8024039C 00021FC3 */ sra $v1, $v0, 0x1f -/* C562E0 802403A0 00004010 */ mfhi $t0 -/* C562E4 802403A4 00082143 */ sra $a0, $t0, 5 -/* C562E8 802403A8 00832023 */ subu $a0, $a0, $v1 -/* C562EC 802403AC 00041840 */ sll $v1, $a0, 1 -/* C562F0 802403B0 00641821 */ addu $v1, $v1, $a0 -/* C562F4 802403B4 000318C0 */ sll $v1, $v1, 3 -/* C562F8 802403B8 00641821 */ addu $v1, $v1, $a0 -/* C562FC 802403BC 00031880 */ sll $v1, $v1, 2 -/* C56300 802403C0 8E640004 */ lw $a0, 4($s3) -/* C56304 802403C4 00431023 */ subu $v0, $v0, $v1 -/* C56308 802403C8 0044102A */ slt $v0, $v0, $a0 -/* C5630C 802403CC 10400002 */ beqz $v0, .L802403D8 -/* C56310 802403D0 24020004 */ addiu $v0, $zero, 4 -.L802403D4: -/* C56314 802403D4 AE420070 */ sw $v0, 0x70($s2) -.L802403D8: -/* C56318 802403D8 8FBF0044 */ lw $ra, 0x44($sp) -/* C5631C 802403DC 8FB40040 */ lw $s4, 0x40($sp) -/* C56320 802403E0 8FB3003C */ lw $s3, 0x3c($sp) -/* C56324 802403E4 8FB20038 */ lw $s2, 0x38($sp) -/* C56328 802403E8 8FB10034 */ lw $s1, 0x34($sp) -/* C5632C 802403EC 8FB00030 */ lw $s0, 0x30($sp) -/* C56330 802403F0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* C56334 802403F4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* C56338 802403F8 03E00008 */ jr $ra -/* C5633C 802403FC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240400_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/func_80240400_C55F40.s deleted file mode 100644 index f9a06a63b5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240400_C55F40.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_C56340 -/* C56340 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C56344 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* C56348 80240408 0080982D */ daddu $s3, $a0, $zero -/* C5634C 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* C56350 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* C56354 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* C56358 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* C5635C 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* C56360 80240420 86440008 */ lh $a0, 8($s2) -/* C56364 80240424 0C00EABB */ jal get_npc_unsafe -/* C56368 80240428 00A0882D */ daddu $s1, $a1, $zero -/* C5636C 8024042C 8E240008 */ lw $a0, 8($s1) -/* C56370 80240430 0040802D */ daddu $s0, $v0, $zero -/* C56374 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* C56378 80240438 00832021 */ addu $a0, $a0, $v1 -/* C5637C 8024043C 00042043 */ sra $a0, $a0, 1 -/* C56380 80240440 0C00A67F */ jal rand_int -/* C56384 80240444 24840001 */ addiu $a0, $a0, 1 -/* C56388 80240448 8E230008 */ lw $v1, 8($s1) -/* C5638C 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* C56390 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* C56394 80240454 00651821 */ addu $v1, $v1, $a1 -/* C56398 80240458 00031843 */ sra $v1, $v1, 1 -/* C5639C 8024045C 00621821 */ addu $v1, $v1, $v0 -/* C563A0 80240460 0C00A67F */ jal rand_int -/* C563A4 80240464 A603008E */ sh $v1, 0x8e($s0) -/* C563A8 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* C563AC 8024046C 44820000 */ mtc1 $v0, $f0 -/* C563B0 80240470 00000000 */ nop -/* C563B4 80240474 46800020 */ cvt.s.w $f0, $f0 -/* C563B8 80240478 46006300 */ add.s $f12, $f12, $f0 -/* C563BC 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* C563C0 80240480 44810000 */ mtc1 $at, $f0 -/* C563C4 80240484 0C00A6C9 */ jal clamp_angle -/* C563C8 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* C563CC 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* C563D0 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* C563D4 80240494 8C420000 */ lw $v0, ($v0) -/* C563D8 80240498 AE020028 */ sw $v0, 0x28($s0) -/* C563DC 8024049C 24020003 */ addiu $v0, $zero, 3 -/* C563E0 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* C563E4 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* C563E8 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* C563EC 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* C563F0 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* C563F4 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* C563F8 802404B8 03E00008 */ jr $ra -/* C563FC 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/func_802404C0_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/func_802404C0_C55F40.s deleted file mode 100644 index 5d45ce5521..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/func_802404C0_C55F40.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_C56400 -/* C56400 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C56404 802404C4 AFB40040 */ sw $s4, 0x40($sp) -/* C56408 802404C8 0080A02D */ daddu $s4, $a0, $zero -/* C5640C 802404CC AFBF0044 */ sw $ra, 0x44($sp) -/* C56410 802404D0 AFB3003C */ sw $s3, 0x3c($sp) -/* C56414 802404D4 AFB20038 */ sw $s2, 0x38($sp) -/* C56418 802404D8 AFB10034 */ sw $s1, 0x34($sp) -/* C5641C 802404DC AFB00030 */ sw $s0, 0x30($sp) -/* C56420 802404E0 8E910148 */ lw $s1, 0x148($s4) -/* C56424 802404E4 00A0902D */ daddu $s2, $a1, $zero -/* C56428 802404E8 86240008 */ lh $a0, 8($s1) -/* C5642C 802404EC 0C00EABB */ jal get_npc_unsafe -/* C56430 802404F0 00C0982D */ daddu $s3, $a2, $zero -/* C56434 802404F4 8E430014 */ lw $v1, 0x14($s2) -/* C56438 802404F8 04600031 */ bltz $v1, .L802405C0 -/* C5643C 802404FC 0040802D */ daddu $s0, $v0, $zero -/* C56440 80240500 0260202D */ daddu $a0, $s3, $zero -/* C56444 80240504 AFA00010 */ sw $zero, 0x10($sp) -/* C56448 80240508 8E460024 */ lw $a2, 0x24($s2) -/* C5644C 8024050C 8E470028 */ lw $a3, 0x28($s2) -/* C56450 80240510 0C01242D */ jal func_800490B4 -/* C56454 80240514 0220282D */ daddu $a1, $s1, $zero -/* C56458 80240518 10400029 */ beqz $v0, .L802405C0 -/* C5645C 8024051C 0000202D */ daddu $a0, $zero, $zero -/* C56460 80240520 0200282D */ daddu $a1, $s0, $zero -/* C56464 80240524 0000302D */ daddu $a2, $zero, $zero -/* C56468 80240528 860300A8 */ lh $v1, 0xa8($s0) -/* C5646C 8024052C 3C013F80 */ lui $at, 0x3f80 -/* C56470 80240530 44810000 */ mtc1 $at, $f0 -/* C56474 80240534 3C014000 */ lui $at, 0x4000 -/* C56478 80240538 44811000 */ mtc1 $at, $f2 -/* C5647C 8024053C 3C01C1A0 */ lui $at, 0xc1a0 -/* C56480 80240540 44812000 */ mtc1 $at, $f4 -/* C56484 80240544 2402000F */ addiu $v0, $zero, 0xf -/* C56488 80240548 AFA2001C */ sw $v0, 0x1c($sp) -/* C5648C 8024054C 44833000 */ mtc1 $v1, $f6 -/* C56490 80240550 00000000 */ nop -/* C56494 80240554 468031A0 */ cvt.s.w $f6, $f6 -/* C56498 80240558 44073000 */ mfc1 $a3, $f6 -/* C5649C 8024055C 27A20028 */ addiu $v0, $sp, 0x28 -/* C564A0 80240560 AFA20020 */ sw $v0, 0x20($sp) -/* C564A4 80240564 E7A00010 */ swc1 $f0, 0x10($sp) -/* C564A8 80240568 E7A20014 */ swc1 $f2, 0x14($sp) -/* C564AC 8024056C 0C01BFA4 */ jal fx_emote -/* C564B0 80240570 E7A40018 */ swc1 $f4, 0x18($sp) -/* C564B4 80240574 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C564B8 80240578 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C564BC 8024057C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C564C0 80240580 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C564C4 80240584 8C460028 */ lw $a2, 0x28($v0) -/* C564C8 80240588 0C00A720 */ jal atan2 -/* C564CC 8024058C 8C470030 */ lw $a3, 0x30($v0) -/* C564D0 80240590 0200202D */ daddu $a0, $s0, $zero -/* C564D4 80240594 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C564D8 80240598 3C060020 */ lui $a2, 0x20 -/* C564DC 8024059C 0C012530 */ jal func_800494C0 -/* C564E0 802405A0 E480000C */ swc1 $f0, 0xc($a0) -/* C564E4 802405A4 8E220018 */ lw $v0, 0x18($s1) -/* C564E8 802405A8 9442002A */ lhu $v0, 0x2a($v0) -/* C564EC 802405AC 30420001 */ andi $v0, $v0, 1 -/* C564F0 802405B0 14400029 */ bnez $v0, .L80240658 -/* C564F4 802405B4 2402000A */ addiu $v0, $zero, 0xa -/* C564F8 802405B8 08090196 */ j .L80240658 -/* C564FC 802405BC 2402000C */ addiu $v0, $zero, 0xc -.L802405C0: -/* C56500 802405C0 8602008C */ lh $v0, 0x8c($s0) -/* C56504 802405C4 14400025 */ bnez $v0, .L8024065C -/* C56508 802405C8 00000000 */ nop -/* C5650C 802405CC 9602008E */ lhu $v0, 0x8e($s0) -/* C56510 802405D0 2442FFFF */ addiu $v0, $v0, -1 -/* C56514 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* C56518 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* C5651C 802405DC 1440001F */ bnez $v0, .L8024065C -/* C56520 802405E0 00000000 */ nop -/* C56524 802405E4 8E820074 */ lw $v0, 0x74($s4) -/* C56528 802405E8 2442FFFF */ addiu $v0, $v0, -1 -/* C5652C 802405EC 10400019 */ beqz $v0, .L80240654 -/* C56530 802405F0 AE820074 */ sw $v0, 0x74($s4) -/* C56534 802405F4 8E220018 */ lw $v0, 0x18($s1) -/* C56538 802405F8 9442002A */ lhu $v0, 0x2a($v0) -/* C5653C 802405FC 30420010 */ andi $v0, $v0, 0x10 -/* C56540 80240600 14400007 */ bnez $v0, .L80240620 -/* C56544 80240604 00000000 */ nop -/* C56548 80240608 C600000C */ lwc1 $f0, 0xc($s0) -/* C5654C 8024060C 3C014334 */ lui $at, 0x4334 -/* C56550 80240610 44816000 */ mtc1 $at, $f12 -/* C56554 80240614 0C00A6C9 */ jal clamp_angle -/* C56558 80240618 460C0300 */ add.s $f12, $f0, $f12 -/* C5655C 8024061C E600000C */ swc1 $f0, 0xc($s0) -.L80240620: -/* C56560 80240620 8E440008 */ lw $a0, 8($s2) -/* C56564 80240624 000417C2 */ srl $v0, $a0, 0x1f -/* C56568 80240628 00822021 */ addu $a0, $a0, $v0 -/* C5656C 8024062C 00042043 */ sra $a0, $a0, 1 -/* C56570 80240630 0C00A67F */ jal rand_int -/* C56574 80240634 24840001 */ addiu $a0, $a0, 1 -/* C56578 80240638 8E430008 */ lw $v1, 8($s2) -/* C5657C 8024063C 000327C2 */ srl $a0, $v1, 0x1f -/* C56580 80240640 00641821 */ addu $v1, $v1, $a0 -/* C56584 80240644 00031843 */ sra $v1, $v1, 1 -/* C56588 80240648 00621821 */ addu $v1, $v1, $v0 -/* C5658C 8024064C 08090197 */ j .L8024065C -/* C56590 80240650 A603008E */ sh $v1, 0x8e($s0) -.L80240654: -/* C56594 80240654 24020004 */ addiu $v0, $zero, 4 -.L80240658: -/* C56598 80240658 AE820070 */ sw $v0, 0x70($s4) -.L8024065C: -/* C5659C 8024065C 8FBF0044 */ lw $ra, 0x44($sp) -/* C565A0 80240660 8FB40040 */ lw $s4, 0x40($sp) -/* C565A4 80240664 8FB3003C */ lw $s3, 0x3c($sp) -/* C565A8 80240668 8FB20038 */ lw $s2, 0x38($sp) -/* C565AC 8024066C 8FB10034 */ lw $s1, 0x34($sp) -/* C565B0 80240670 8FB00030 */ lw $s0, 0x30($sp) -/* C565B4 80240674 03E00008 */ jr $ra -/* C565B8 80240678 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/func_8024067C_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/func_8024067C_C55F40.s deleted file mode 100644 index 2ac543d912..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/func_8024067C_C55F40.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024067C_C565BC -/* C565BC 8024067C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C565C0 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* C565C4 80240684 0080882D */ daddu $s1, $a0, $zero -/* C565C8 80240688 AFBF001C */ sw $ra, 0x1c($sp) -/* C565CC 8024068C AFB20018 */ sw $s2, 0x18($sp) -/* C565D0 80240690 AFB00010 */ sw $s0, 0x10($sp) -/* C565D4 80240694 8E300148 */ lw $s0, 0x148($s1) -/* C565D8 80240698 86040008 */ lh $a0, 8($s0) -/* C565DC 8024069C 0C00EABB */ jal get_npc_unsafe -/* C565E0 802406A0 00A0902D */ daddu $s2, $a1, $zero -/* C565E4 802406A4 8E230078 */ lw $v1, 0x78($s1) -/* C565E8 802406A8 24630001 */ addiu $v1, $v1, 1 -/* C565EC 802406AC AE230078 */ sw $v1, 0x78($s1) -/* C565F0 802406B0 8E0400D0 */ lw $a0, 0xd0($s0) -/* C565F4 802406B4 8C840000 */ lw $a0, ($a0) -/* C565F8 802406B8 0064182A */ slt $v1, $v1, $a0 -/* C565FC 802406BC 14600002 */ bnez $v1, .L802406C8 -/* C56600 802406C0 0040282D */ daddu $a1, $v0, $zero -/* C56604 802406C4 AE200078 */ sw $zero, 0x78($s1) -.L802406C8: -/* C56608 802406C8 8E0200CC */ lw $v0, 0xcc($s0) -/* C5660C 802406CC 8C420004 */ lw $v0, 4($v0) -/* C56610 802406D0 ACA20028 */ sw $v0, 0x28($a1) -/* C56614 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* C56618 802406D8 8C42007C */ lw $v0, 0x7c($v0) -/* C5661C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* C56620 802406E0 00000000 */ nop -/* C56624 802406E4 C6400000 */ lwc1 $f0, ($s2) -/* C56628 802406E8 080901C4 */ j .L80240710 -/* C5662C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) -.L802406F0: -/* C56630 802406F0 3C018024 */ lui $at, 0x8024 -/* C56634 802406F4 D42238E8 */ ldc1 $f2, 0x38e8($at) -/* C56638 802406F8 44820000 */ mtc1 $v0, $f0 -/* C5663C 802406FC 00000000 */ nop -/* C56640 80240700 46800021 */ cvt.d.w $f0, $f0 -/* C56644 80240704 46220003 */ div.d $f0, $f0, $f2 -/* C56648 80240708 46200020 */ cvt.s.d $f0, $f0 -/* C5664C 8024070C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240710: -/* C56650 80240710 24020001 */ addiu $v0, $zero, 1 -/* C56654 80240714 AE220070 */ sw $v0, 0x70($s1) -/* C56658 80240718 8FBF001C */ lw $ra, 0x1c($sp) -/* C5665C 8024071C 8FB20018 */ lw $s2, 0x18($sp) -/* C56660 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* C56664 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* C56668 80240728 03E00008 */ jr $ra -/* C5666C 8024072C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240730_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/func_80240730_C55F40.s deleted file mode 100644 index 26d8f8c2b9..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240730_C55F40.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_C56670 -/* C56670 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C56674 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* C56678 80240738 0080882D */ daddu $s1, $a0, $zero -/* C5667C 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* C56680 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* C56684 80240744 8E300148 */ lw $s0, 0x148($s1) -/* C56688 80240748 0C00EABB */ jal get_npc_unsafe -/* C5668C 8024074C 86040008 */ lh $a0, 8($s0) -/* C56690 80240750 8E0300CC */ lw $v1, 0xcc($s0) -/* C56694 80240754 3C014120 */ lui $at, 0x4120 -/* C56698 80240758 44812000 */ mtc1 $at, $f4 -/* C5669C 8024075C 3C014000 */ lui $at, 0x4000 -/* C566A0 80240760 44810000 */ mtc1 $at, $f0 -/* C566A4 80240764 C442003C */ lwc1 $f2, 0x3c($v0) -/* C566A8 80240768 8C640010 */ lw $a0, 0x10($v1) -/* C566AC 8024076C 8C430000 */ lw $v1, ($v0) -/* C566B0 80240770 E444001C */ swc1 $f4, 0x1c($v0) -/* C566B4 80240774 E4400014 */ swc1 $f0, 0x14($v0) -/* C566B8 80240778 E4420064 */ swc1 $f2, 0x64($v0) -/* C566BC 8024077C 34630800 */ ori $v1, $v1, 0x800 -/* C566C0 80240780 AC430000 */ sw $v1, ($v0) -/* C566C4 80240784 AC440028 */ sw $a0, 0x28($v0) -/* C566C8 80240788 2402000B */ addiu $v0, $zero, 0xb -/* C566CC 8024078C AE220070 */ sw $v0, 0x70($s1) -/* C566D0 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* C566D4 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* C566D8 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* C566DC 8024079C 03E00008 */ jr $ra -/* C566E0 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/func_802407A4_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/func_802407A4_C55F40.s deleted file mode 100644 index 9b25ec53dc..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/func_802407A4_C55F40.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4_C566E4 -/* C566E4 802407A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C566E8 802407A8 AFB00010 */ sw $s0, 0x10($sp) -/* C566EC 802407AC 0080802D */ daddu $s0, $a0, $zero -/* C566F0 802407B0 AFBF0014 */ sw $ra, 0x14($sp) -/* C566F4 802407B4 8E020148 */ lw $v0, 0x148($s0) -/* C566F8 802407B8 0C00EABB */ jal get_npc_unsafe -/* C566FC 802407BC 84440008 */ lh $a0, 8($v0) -/* C56700 802407C0 0040202D */ daddu $a0, $v0, $zero -/* C56704 802407C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* C56708 802407C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* C5670C 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* C56710 802407D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* C56714 802407D4 46040001 */ sub.s $f0, $f0, $f4 -/* C56718 802407D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* C5671C 802407DC 4602203C */ c.lt.s $f4, $f2 -/* C56720 802407E0 E482003C */ swc1 $f2, 0x3c($a0) -/* C56724 802407E4 45010009 */ bc1t .L8024080C -/* C56728 802407E8 E480001C */ swc1 $f0, 0x1c($a0) -/* C5672C 802407EC 8C820000 */ lw $v0, ($a0) -/* C56730 802407F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* C56734 802407F4 E484003C */ swc1 $f4, 0x3c($a0) -/* C56738 802407F8 AC80001C */ sw $zero, 0x1c($a0) -/* C5673C 802407FC 00431024 */ and $v0, $v0, $v1 -/* C56740 80240800 AC820000 */ sw $v0, ($a0) -/* C56744 80240804 2402000C */ addiu $v0, $zero, 0xc -/* C56748 80240808 AE020070 */ sw $v0, 0x70($s0) -.L8024080C: -/* C5674C 8024080C 8FBF0014 */ lw $ra, 0x14($sp) -/* C56750 80240810 8FB00010 */ lw $s0, 0x10($sp) -/* C56754 80240814 03E00008 */ jr $ra -/* C56758 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/func_8024081C_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/func_8024081C_C55F40.s deleted file mode 100644 index 55115fedee..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/func_8024081C_C55F40.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024081C_C5675C -/* C5675C 8024081C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C56760 80240820 AFB3001C */ sw $s3, 0x1c($sp) -/* C56764 80240824 0080982D */ daddu $s3, $a0, $zero -/* C56768 80240828 AFBF0020 */ sw $ra, 0x20($sp) -/* C5676C 8024082C AFB20018 */ sw $s2, 0x18($sp) -/* C56770 80240830 AFB10014 */ sw $s1, 0x14($sp) -/* C56774 80240834 AFB00010 */ sw $s0, 0x10($sp) -/* C56778 80240838 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C5677C 8024083C 8E710148 */ lw $s1, 0x148($s3) -/* C56780 80240840 86240008 */ lh $a0, 8($s1) -/* C56784 80240844 0C00EABB */ jal get_npc_unsafe -/* C56788 80240848 00A0802D */ daddu $s0, $a1, $zero -/* C5678C 8024084C 8E040020 */ lw $a0, 0x20($s0) -/* C56790 80240850 0040902D */ daddu $s2, $v0, $zero -/* C56794 80240854 00041FC2 */ srl $v1, $a0, 0x1f -/* C56798 80240858 00832021 */ addu $a0, $a0, $v1 -/* C5679C 8024085C 00042043 */ sra $a0, $a0, 1 -/* C567A0 80240860 0C00A67F */ jal rand_int -/* C567A4 80240864 24840001 */ addiu $a0, $a0, 1 -/* C567A8 80240868 8E030020 */ lw $v1, 0x20($s0) -/* C567AC 8024086C C64C0038 */ lwc1 $f12, 0x38($s2) -/* C567B0 80240870 000327C2 */ srl $a0, $v1, 0x1f -/* C567B4 80240874 00641821 */ addu $v1, $v1, $a0 -/* C567B8 80240878 00031843 */ sra $v1, $v1, 1 -/* C567BC 8024087C 00621821 */ addu $v1, $v1, $v0 -/* C567C0 80240880 A643008E */ sh $v1, 0x8e($s2) -/* C567C4 80240884 8E2200CC */ lw $v0, 0xcc($s1) -/* C567C8 80240888 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C567CC 8024088C 8C42000C */ lw $v0, 0xc($v0) -/* C567D0 80240890 AE420028 */ sw $v0, 0x28($s2) -/* C567D4 80240894 C6000018 */ lwc1 $f0, 0x18($s0) -/* C567D8 80240898 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C567DC 8024089C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C567E0 802408A0 E6400018 */ swc1 $f0, 0x18($s2) -/* C567E4 802408A4 8C460028 */ lw $a2, 0x28($v0) -/* C567E8 802408A8 0C00A720 */ jal atan2 -/* C567EC 802408AC 8C470030 */ lw $a3, 0x30($v0) -/* C567F0 802408B0 46000506 */ mov.s $f20, $f0 -/* C567F4 802408B4 C64C000C */ lwc1 $f12, 0xc($s2) -/* C567F8 802408B8 0C00A70A */ jal get_clamped_angle_diff -/* C567FC 802408BC 4600A386 */ mov.s $f14, $f20 -/* C56800 802408C0 46000086 */ mov.s $f2, $f0 -/* C56804 802408C4 8E02001C */ lw $v0, 0x1c($s0) -/* C56808 802408C8 46001005 */ abs.s $f0, $f2 -/* C5680C 802408CC 44822000 */ mtc1 $v0, $f4 -/* C56810 802408D0 00000000 */ nop -/* C56814 802408D4 46802120 */ cvt.s.w $f4, $f4 -/* C56818 802408D8 4600203C */ c.lt.s $f4, $f0 -/* C5681C 802408DC 00000000 */ nop -/* C56820 802408E0 4500000D */ bc1f .L80240918 -/* C56824 802408E4 00000000 */ nop -/* C56828 802408E8 44800000 */ mtc1 $zero, $f0 -/* C5682C 802408EC C654000C */ lwc1 $f20, 0xc($s2) -/* C56830 802408F0 4600103C */ c.lt.s $f2, $f0 -/* C56834 802408F4 00000000 */ nop -/* C56838 802408F8 45000006 */ bc1f .L80240914 -/* C5683C 802408FC 00021023 */ negu $v0, $v0 -/* C56840 80240900 44820000 */ mtc1 $v0, $f0 -/* C56844 80240904 00000000 */ nop -/* C56848 80240908 46800020 */ cvt.s.w $f0, $f0 -/* C5684C 8024090C 08090246 */ j .L80240918 -/* C56850 80240910 4600A500 */ add.s $f20, $f20, $f0 -.L80240914: -/* C56854 80240914 4604A500 */ add.s $f20, $f20, $f4 -.L80240918: -/* C56858 80240918 0C00A6C9 */ jal clamp_angle -/* C5685C 8024091C 4600A306 */ mov.s $f12, $f20 -/* C56860 80240920 2402000D */ addiu $v0, $zero, 0xd -/* C56864 80240924 E640000C */ swc1 $f0, 0xc($s2) -/* C56868 80240928 AE620070 */ sw $v0, 0x70($s3) -/* C5686C 8024092C 8FBF0020 */ lw $ra, 0x20($sp) -/* C56870 80240930 8FB3001C */ lw $s3, 0x1c($sp) -/* C56874 80240934 8FB20018 */ lw $s2, 0x18($sp) -/* C56878 80240938 8FB10014 */ lw $s1, 0x14($sp) -/* C5687C 8024093C 8FB00010 */ lw $s0, 0x10($sp) -/* C56880 80240940 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C56884 80240944 03E00008 */ jr $ra -/* C56888 80240948 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/func_8024094C_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/func_8024094C_C55F40.s deleted file mode 100644 index 529ba84707..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/func_8024094C_C55F40.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024094C_C5688C -/* C5688C 8024094C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C56890 80240950 AFB3003C */ sw $s3, 0x3c($sp) -/* C56894 80240954 0080982D */ daddu $s3, $a0, $zero -/* C56898 80240958 AFBF0040 */ sw $ra, 0x40($sp) -/* C5689C 8024095C AFB20038 */ sw $s2, 0x38($sp) -/* C568A0 80240960 AFB10034 */ sw $s1, 0x34($sp) -/* C568A4 80240964 AFB00030 */ sw $s0, 0x30($sp) -/* C568A8 80240968 8E720148 */ lw $s2, 0x148($s3) -/* C568AC 8024096C 00A0882D */ daddu $s1, $a1, $zero -/* C568B0 80240970 86440008 */ lh $a0, 8($s2) -/* C568B4 80240974 0C00EABB */ jal get_npc_unsafe -/* C568B8 80240978 00C0802D */ daddu $s0, $a2, $zero -/* C568BC 8024097C 0200202D */ daddu $a0, $s0, $zero -/* C568C0 80240980 0240282D */ daddu $a1, $s2, $zero -/* C568C4 80240984 24030001 */ addiu $v1, $zero, 1 -/* C568C8 80240988 AFA30010 */ sw $v1, 0x10($sp) -/* C568CC 8024098C 8E260024 */ lw $a2, 0x24($s1) -/* C568D0 80240990 8E270028 */ lw $a3, 0x28($s1) -/* C568D4 80240994 0C01242D */ jal func_800490B4 -/* C568D8 80240998 0040802D */ daddu $s0, $v0, $zero -/* C568DC 8024099C 1440001E */ bnez $v0, .L80240A18 -/* C568E0 802409A0 0200202D */ daddu $a0, $s0, $zero -/* C568E4 802409A4 24040002 */ addiu $a0, $zero, 2 -/* C568E8 802409A8 0200282D */ daddu $a1, $s0, $zero -/* C568EC 802409AC 0000302D */ daddu $a2, $zero, $zero -/* C568F0 802409B0 860300A8 */ lh $v1, 0xa8($s0) -/* C568F4 802409B4 3C013F80 */ lui $at, 0x3f80 -/* C568F8 802409B8 44810000 */ mtc1 $at, $f0 -/* C568FC 802409BC 3C014000 */ lui $at, 0x4000 -/* C56900 802409C0 44811000 */ mtc1 $at, $f2 -/* C56904 802409C4 3C01C1A0 */ lui $at, 0xc1a0 -/* C56908 802409C8 44812000 */ mtc1 $at, $f4 -/* C5690C 802409CC 2402000F */ addiu $v0, $zero, 0xf -/* C56910 802409D0 AFA2001C */ sw $v0, 0x1c($sp) -/* C56914 802409D4 44833000 */ mtc1 $v1, $f6 -/* C56918 802409D8 00000000 */ nop -/* C5691C 802409DC 468031A0 */ cvt.s.w $f6, $f6 -/* C56920 802409E0 44073000 */ mfc1 $a3, $f6 -/* C56924 802409E4 27A20028 */ addiu $v0, $sp, 0x28 -/* C56928 802409E8 AFA20020 */ sw $v0, 0x20($sp) -/* C5692C 802409EC E7A00010 */ swc1 $f0, 0x10($sp) -/* C56930 802409F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* C56934 802409F4 0C01BFA4 */ jal fx_emote -/* C56938 802409F8 E7A40018 */ swc1 $f4, 0x18($sp) -/* C5693C 802409FC 8E4200CC */ lw $v0, 0xcc($s2) -/* C56940 80240A00 8C430000 */ lw $v1, ($v0) -/* C56944 80240A04 24020019 */ addiu $v0, $zero, 0x19 -/* C56948 80240A08 A602008E */ sh $v0, 0x8e($s0) -/* C5694C 80240A0C 2402000E */ addiu $v0, $zero, 0xe -/* C56950 80240A10 08090293 */ j .L80240A4C -/* C56954 80240A14 AE030028 */ sw $v1, 0x28($s0) -.L80240A18: -/* C56958 80240A18 0C00F598 */ jal func_8003D660 -/* C5695C 80240A1C 24050001 */ addiu $a1, $zero, 1 -/* C56960 80240A20 8E050018 */ lw $a1, 0x18($s0) -/* C56964 80240A24 8E06000C */ lw $a2, 0xc($s0) -/* C56968 80240A28 0C00EA95 */ jal npc_move_heading -/* C5696C 80240A2C 0200202D */ daddu $a0, $s0, $zero -/* C56970 80240A30 8602008E */ lh $v0, 0x8e($s0) -/* C56974 80240A34 9603008E */ lhu $v1, 0x8e($s0) -/* C56978 80240A38 18400003 */ blez $v0, .L80240A48 -/* C5697C 80240A3C 2462FFFF */ addiu $v0, $v1, -1 -/* C56980 80240A40 08090294 */ j .L80240A50 -/* C56984 80240A44 A602008E */ sh $v0, 0x8e($s0) -.L80240A48: -/* C56988 80240A48 2402000C */ addiu $v0, $zero, 0xc -.L80240A4C: -/* C5698C 80240A4C AE620070 */ sw $v0, 0x70($s3) -.L80240A50: -/* C56990 80240A50 8FBF0040 */ lw $ra, 0x40($sp) -/* C56994 80240A54 8FB3003C */ lw $s3, 0x3c($sp) -/* C56998 80240A58 8FB20038 */ lw $s2, 0x38($sp) -/* C5699C 80240A5C 8FB10034 */ lw $s1, 0x34($sp) -/* C569A0 80240A60 8FB00030 */ lw $s0, 0x30($sp) -/* C569A4 80240A64 03E00008 */ jr $ra -/* C569A8 80240A68 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240A6C_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/func_80240A6C_C55F40.s deleted file mode 100644 index 30dd6eb008..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240A6C_C55F40.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_C569AC -/* C569AC 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C569B0 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* C569B4 80240A74 0080882D */ daddu $s1, $a0, $zero -/* C569B8 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* C569BC 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* C569C0 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* C569C4 80240A84 0C00EABB */ jal get_npc_unsafe -/* C569C8 80240A88 86040008 */ lh $a0, 8($s0) -/* C569CC 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* C569D0 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* C569D4 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* C569D8 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* C569DC 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* C569E0 80240AA0 00000000 */ nop -/* C569E4 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* C569E8 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* C569EC 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* C569F0 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* C569F4 80240AB4 080902B0 */ j .L80240AC0 -/* C569F8 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* C569FC 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* C56A00 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* C56A04 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* C56A08 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* C56A0C 80240ACC 03E00008 */ jr $ra -/* C56A10 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240AD4_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/func_80240AD4_C55F40.s deleted file mode 100644 index 7ca7f0d074..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240AD4_C55F40.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD4_C56A14 -/* C56A14 80240AD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C56A18 80240AD8 AFB10014 */ sw $s1, 0x14($sp) -/* C56A1C 80240ADC 0080882D */ daddu $s1, $a0, $zero -/* C56A20 80240AE0 AFBF001C */ sw $ra, 0x1c($sp) -/* C56A24 80240AE4 AFB20018 */ sw $s2, 0x18($sp) -/* C56A28 80240AE8 AFB00010 */ sw $s0, 0x10($sp) -/* C56A2C 80240AEC 8E300148 */ lw $s0, 0x148($s1) -/* C56A30 80240AF0 86040008 */ lh $a0, 8($s0) -/* C56A34 80240AF4 0C00EABB */ jal get_npc_unsafe -/* C56A38 80240AF8 00A0902D */ daddu $s2, $a1, $zero -/* C56A3C 80240AFC 8E0300D0 */ lw $v1, 0xd0($s0) -/* C56A40 80240B00 8E240078 */ lw $a0, 0x78($s1) -/* C56A44 80240B04 8C630000 */ lw $v1, ($v1) -/* C56A48 80240B08 0083182A */ slt $v1, $a0, $v1 -/* C56A4C 80240B0C 10600013 */ beqz $v1, .L80240B5C -/* C56A50 80240B10 0040302D */ daddu $a2, $v0, $zero -/* C56A54 80240B14 00041040 */ sll $v0, $a0, 1 -/* C56A58 80240B18 00441021 */ addu $v0, $v0, $a0 -/* C56A5C 80240B1C 00022880 */ sll $a1, $v0, 2 -.L80240B20: -/* C56A60 80240B20 8E0300D0 */ lw $v1, 0xd0($s0) -/* C56A64 80240B24 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* C56A68 80240B28 00A31021 */ addu $v0, $a1, $v1 -/* C56A6C 80240B2C C4400008 */ lwc1 $f0, 8($v0) -/* C56A70 80240B30 46800020 */ cvt.s.w $f0, $f0 -/* C56A74 80240B34 4602003E */ c.le.s $f0, $f2 -/* C56A78 80240B38 00000000 */ nop -/* C56A7C 80240B3C 45020003 */ bc1fl .L80240B4C -/* C56A80 80240B40 24840001 */ addiu $a0, $a0, 1 -/* C56A84 80240B44 080902D7 */ j .L80240B5C -/* C56A88 80240B48 AE240078 */ sw $a0, 0x78($s1) -.L80240B4C: -/* C56A8C 80240B4C 8C620000 */ lw $v0, ($v1) -/* C56A90 80240B50 0082102A */ slt $v0, $a0, $v0 -/* C56A94 80240B54 1440FFF2 */ bnez $v0, .L80240B20 -/* C56A98 80240B58 24A5000C */ addiu $a1, $a1, 0xc -.L80240B5C: -/* C56A9C 80240B5C C6400000 */ lwc1 $f0, ($s2) -/* C56AA0 80240B60 E4C00018 */ swc1 $f0, 0x18($a2) -/* C56AA4 80240B64 8E0200CC */ lw $v0, 0xcc($s0) -/* C56AA8 80240B68 8C420004 */ lw $v0, 4($v0) -/* C56AAC 80240B6C ACC20028 */ sw $v0, 0x28($a2) -/* C56AB0 80240B70 24020001 */ addiu $v0, $zero, 1 -/* C56AB4 80240B74 AE200074 */ sw $zero, 0x74($s1) -/* C56AB8 80240B78 AE220070 */ sw $v0, 0x70($s1) -/* C56ABC 80240B7C 8FBF001C */ lw $ra, 0x1c($sp) -/* C56AC0 80240B80 8FB20018 */ lw $s2, 0x18($sp) -/* C56AC4 80240B84 8FB10014 */ lw $s1, 0x14($sp) -/* C56AC8 80240B88 8FB00010 */ lw $s0, 0x10($sp) -/* C56ACC 80240B8C 03E00008 */ jr $ra -/* C56AD0 80240B90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240B94_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/func_80240B94_C55F40.s deleted file mode 100644 index a9965d9d70..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240B94_C55F40.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B94_C56AD4 -/* C56AD4 80240B94 27BDFF98 */ addiu $sp, $sp, -0x68 -/* C56AD8 80240B98 AFB40058 */ sw $s4, 0x58($sp) -/* C56ADC 80240B9C 0080A02D */ daddu $s4, $a0, $zero -/* C56AE0 80240BA0 AFBF0060 */ sw $ra, 0x60($sp) -/* C56AE4 80240BA4 AFB5005C */ sw $s5, 0x5c($sp) -/* C56AE8 80240BA8 AFB30054 */ sw $s3, 0x54($sp) -/* C56AEC 80240BAC AFB20050 */ sw $s2, 0x50($sp) -/* C56AF0 80240BB0 AFB1004C */ sw $s1, 0x4c($sp) -/* C56AF4 80240BB4 AFB00048 */ sw $s0, 0x48($sp) -/* C56AF8 80240BB8 8E910148 */ lw $s1, 0x148($s4) -/* C56AFC 80240BBC 86240008 */ lh $a0, 8($s1) -/* C56B00 80240BC0 0C00EABB */ jal get_npc_unsafe -/* C56B04 80240BC4 00A0802D */ daddu $s0, $a1, $zero -/* C56B08 80240BC8 8E83000C */ lw $v1, 0xc($s4) -/* C56B0C 80240BCC 0280202D */ daddu $a0, $s4, $zero -/* C56B10 80240BD0 8C650000 */ lw $a1, ($v1) -/* C56B14 80240BD4 0C0B1EAF */ jal get_variable -/* C56B18 80240BD8 0040902D */ daddu $s2, $v0, $zero -/* C56B1C 80240BDC AFA00018 */ sw $zero, 0x18($sp) -/* C56B20 80240BE0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C56B24 80240BE4 8C630094 */ lw $v1, 0x94($v1) -/* C56B28 80240BE8 AFA3001C */ sw $v1, 0x1c($sp) -/* C56B2C 80240BEC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C56B30 80240BF0 8C630080 */ lw $v1, 0x80($v1) -/* C56B34 80240BF4 AFA30020 */ sw $v1, 0x20($sp) -/* C56B38 80240BF8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C56B3C 80240BFC 8C630088 */ lw $v1, 0x88($v1) -/* C56B40 80240C00 AFA30024 */ sw $v1, 0x24($sp) -/* C56B44 80240C04 8E2300D0 */ lw $v1, 0xd0($s1) -/* C56B48 80240C08 8C63008C */ lw $v1, 0x8c($v1) -/* C56B4C 80240C0C 27B50018 */ addiu $s5, $sp, 0x18 -/* C56B50 80240C10 AFA30028 */ sw $v1, 0x28($sp) -/* C56B54 80240C14 8E2300D0 */ lw $v1, 0xd0($s1) -/* C56B58 80240C18 3C014282 */ lui $at, 0x4282 -/* C56B5C 80240C1C 44810000 */ mtc1 $at, $f0 -/* C56B60 80240C20 8C630090 */ lw $v1, 0x90($v1) -/* C56B64 80240C24 0040982D */ daddu $s3, $v0, $zero -/* C56B68 80240C28 E7A00030 */ swc1 $f0, 0x30($sp) -/* C56B6C 80240C2C A7A00034 */ sh $zero, 0x34($sp) -/* C56B70 80240C30 16000005 */ bnez $s0, .L80240C48 -/* C56B74 80240C34 AFA3002C */ sw $v1, 0x2c($sp) -/* C56B78 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) -/* C56B7C 80240C3C 30420004 */ andi $v0, $v0, 4 -/* C56B80 80240C40 10400044 */ beqz $v0, .L80240D54 -/* C56B84 80240C44 00000000 */ nop -.L80240C48: -/* C56B88 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 -/* C56B8C 80240C4C AE800070 */ sw $zero, 0x70($s4) -/* C56B90 80240C50 A640008E */ sh $zero, 0x8e($s2) -/* C56B94 80240C54 8E2200CC */ lw $v0, 0xcc($s1) -/* C56B98 80240C58 8E430000 */ lw $v1, ($s2) -/* C56B9C 80240C5C 8C420000 */ lw $v0, ($v0) -/* C56BA0 80240C60 00641824 */ and $v1, $v1, $a0 -/* C56BA4 80240C64 AE430000 */ sw $v1, ($s2) -/* C56BA8 80240C68 AE420028 */ sw $v0, 0x28($s2) -/* C56BAC 80240C6C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C56BB0 80240C70 8C420098 */ lw $v0, 0x98($v0) -/* C56BB4 80240C74 54400005 */ bnel $v0, $zero, .L80240C8C -/* C56BB8 80240C78 2402FDFF */ addiu $v0, $zero, -0x201 -/* C56BBC 80240C7C 34620200 */ ori $v0, $v1, 0x200 -/* C56BC0 80240C80 2403FFF7 */ addiu $v1, $zero, -9 -/* C56BC4 80240C84 08090325 */ j .L80240C94 -/* C56BC8 80240C88 00431024 */ and $v0, $v0, $v1 -.L80240C8C: -/* C56BCC 80240C8C 00621024 */ and $v0, $v1, $v0 -/* C56BD0 80240C90 34420008 */ ori $v0, $v0, 8 -.L80240C94: -/* C56BD4 80240C94 AE420000 */ sw $v0, ($s2) -/* C56BD8 80240C98 8E2200B0 */ lw $v0, 0xb0($s1) -/* C56BDC 80240C9C 30420004 */ andi $v0, $v0, 4 -/* C56BE0 80240CA0 10400008 */ beqz $v0, .L80240CC4 -/* C56BE4 80240CA4 24020063 */ addiu $v0, $zero, 0x63 -/* C56BE8 80240CA8 AE820070 */ sw $v0, 0x70($s4) -/* C56BEC 80240CAC AE800074 */ sw $zero, 0x74($s4) -/* C56BF0 80240CB0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C56BF4 80240CB4 2403FFFB */ addiu $v1, $zero, -5 -/* C56BF8 80240CB8 00431024 */ and $v0, $v0, $v1 -/* C56BFC 80240CBC 0809033C */ j .L80240CF0 -/* C56C00 80240CC0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240CC4: -/* C56C04 80240CC4 8E220000 */ lw $v0, ($s1) -/* C56C08 80240CC8 3C034000 */ lui $v1, 0x4000 -/* C56C0C 80240CCC 00431024 */ and $v0, $v0, $v1 -/* C56C10 80240CD0 10400007 */ beqz $v0, .L80240CF0 -/* C56C14 80240CD4 3C03BFFF */ lui $v1, 0xbfff -/* C56C18 80240CD8 2402000C */ addiu $v0, $zero, 0xc -/* C56C1C 80240CDC AE820070 */ sw $v0, 0x70($s4) -/* C56C20 80240CE0 8E220000 */ lw $v0, ($s1) -/* C56C24 80240CE4 3463FFFF */ ori $v1, $v1, 0xffff -/* C56C28 80240CE8 00431024 */ and $v0, $v0, $v1 -/* C56C2C 80240CEC AE220000 */ sw $v0, ($s1) -.L80240CF0: -/* C56C30 80240CF0 27A50038 */ addiu $a1, $sp, 0x38 -/* C56C34 80240CF4 27A6003C */ addiu $a2, $sp, 0x3c -/* C56C38 80240CF8 C6400038 */ lwc1 $f0, 0x38($s2) -/* C56C3C 80240CFC 864200A8 */ lh $v0, 0xa8($s2) -/* C56C40 80240D00 3C0142C8 */ lui $at, 0x42c8 -/* C56C44 80240D04 44812000 */ mtc1 $at, $f4 -/* C56C48 80240D08 44823000 */ mtc1 $v0, $f6 -/* C56C4C 80240D0C 00000000 */ nop -/* C56C50 80240D10 468031A0 */ cvt.s.w $f6, $f6 -/* C56C54 80240D14 27A20044 */ addiu $v0, $sp, 0x44 -/* C56C58 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) -/* C56C5C 80240D1C C640003C */ lwc1 $f0, 0x3c($s2) -/* C56C60 80240D20 C6420040 */ lwc1 $f2, 0x40($s2) -/* C56C64 80240D24 46060000 */ add.s $f0, $f0, $f6 -/* C56C68 80240D28 E7A40044 */ swc1 $f4, 0x44($sp) -/* C56C6C 80240D2C E7A20040 */ swc1 $f2, 0x40($sp) -/* C56C70 80240D30 E7A0003C */ swc1 $f0, 0x3c($sp) -/* C56C74 80240D34 AFA20010 */ sw $v0, 0x10($sp) -/* C56C78 80240D38 8E440080 */ lw $a0, 0x80($s2) -/* C56C7C 80240D3C 0C0372DF */ jal func_800DCB7C -/* C56C80 80240D40 27A70040 */ addiu $a3, $sp, 0x40 -/* C56C84 80240D44 10400003 */ beqz $v0, .L80240D54 -/* C56C88 80240D48 00000000 */ nop -/* C56C8C 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* C56C90 80240D50 E640003C */ swc1 $f0, 0x3c($s2) -.L80240D54: -/* C56C94 80240D54 8E830070 */ lw $v1, 0x70($s4) -/* C56C98 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* C56C9C 80240D5C 10400042 */ beqz $v0, .L80240E68 -/* C56CA0 80240D60 00031080 */ sll $v0, $v1, 2 -/* C56CA4 80240D64 3C018024 */ lui $at, 0x8024 -/* C56CA8 80240D68 00220821 */ addu $at, $at, $v0 -/* C56CAC 80240D6C 8C2238F0 */ lw $v0, 0x38f0($at) -/* C56CB0 80240D70 00400008 */ jr $v0 -/* C56CB4 80240D74 00000000 */ nop -/* C56CB8 80240D78 0280202D */ daddu $a0, $s4, $zero -/* C56CBC 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* C56CC0 80240D80 0C090000 */ jal func_80240000 -/* C56CC4 80240D84 02A0302D */ daddu $a2, $s5, $zero -/* C56CC8 80240D88 0280202D */ daddu $a0, $s4, $zero -/* C56CCC 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* C56CD0 80240D90 0C090056 */ jal func_80240158 -/* C56CD4 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* C56CD8 80240D98 0809039A */ j .L80240E68 -/* C56CDC 80240D9C 00000000 */ nop -/* C56CE0 80240DA0 0280202D */ daddu $a0, $s4, $zero -/* C56CE4 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* C56CE8 80240DA8 0C090100 */ jal func_80240400 -/* C56CEC 80240DAC 02A0302D */ daddu $a2, $s5, $zero -/* C56CF0 80240DB0 0280202D */ daddu $a0, $s4, $zero -/* C56CF4 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* C56CF8 80240DB8 0C090130 */ jal func_802404C0 -/* C56CFC 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* C56D00 80240DC0 0809039A */ j .L80240E68 -/* C56D04 80240DC4 00000000 */ nop -/* C56D08 80240DC8 0280202D */ daddu $a0, $s4, $zero -/* C56D0C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* C56D10 80240DD0 0C09019F */ jal func_8024067C -/* C56D14 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* C56D18 80240DD8 0809039A */ j .L80240E68 -/* C56D1C 80240DDC 00000000 */ nop -/* C56D20 80240DE0 0280202D */ daddu $a0, $s4, $zero -/* C56D24 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* C56D28 80240DE8 0C0901CC */ jal func_80240730 -/* C56D2C 80240DEC 02A0302D */ daddu $a2, $s5, $zero -/* C56D30 80240DF0 0280202D */ daddu $a0, $s4, $zero -/* C56D34 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* C56D38 80240DF8 0C0901E9 */ jal func_802407A4 -/* C56D3C 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* C56D40 80240E00 0809039A */ j .L80240E68 -/* C56D44 80240E04 00000000 */ nop -/* C56D48 80240E08 0280202D */ daddu $a0, $s4, $zero -/* C56D4C 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* C56D50 80240E10 0C090207 */ jal func_8024081C -/* C56D54 80240E14 02A0302D */ daddu $a2, $s5, $zero -/* C56D58 80240E18 0280202D */ daddu $a0, $s4, $zero -/* C56D5C 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* C56D60 80240E20 0C090253 */ jal func_8024094C -/* C56D64 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* C56D68 80240E28 0809039A */ j .L80240E68 -/* C56D6C 80240E2C 00000000 */ nop -/* C56D70 80240E30 0280202D */ daddu $a0, $s4, $zero -/* C56D74 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C56D78 80240E38 0C09029B */ jal func_80240A6C -/* C56D7C 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* C56D80 80240E40 0809039A */ j .L80240E68 -/* C56D84 80240E44 00000000 */ nop -/* C56D88 80240E48 0280202D */ daddu $a0, $s4, $zero -/* C56D8C 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* C56D90 80240E50 0C0902B5 */ jal func_80240AD4 -/* C56D94 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* C56D98 80240E58 0809039A */ j .L80240E68 -/* C56D9C 80240E5C 00000000 */ nop -/* C56DA0 80240E60 0C0129CF */ jal func_8004A73C -/* C56DA4 80240E64 0280202D */ daddu $a0, $s4, $zero -.L80240E68: -/* C56DA8 80240E68 8FBF0060 */ lw $ra, 0x60($sp) -/* C56DAC 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) -/* C56DB0 80240E70 8FB40058 */ lw $s4, 0x58($sp) -/* C56DB4 80240E74 8FB30054 */ lw $s3, 0x54($sp) -/* C56DB8 80240E78 8FB20050 */ lw $s2, 0x50($sp) -/* C56DBC 80240E7C 8FB1004C */ lw $s1, 0x4c($sp) -/* C56DC0 80240E80 8FB00048 */ lw $s0, 0x48($sp) -/* C56DC4 80240E84 0000102D */ daddu $v0, $zero, $zero -/* C56DC8 80240E88 03E00008 */ jr $ra -/* C56DCC 80240E8C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240E90_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/func_80240E90_C55F40.s deleted file mode 100644 index 4c68fcda40..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240E90_C55F40.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E90_C56DD0 -/* C56DD0 80240E90 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C56DD4 80240E94 AFBF0010 */ sw $ra, 0x10($sp) -/* C56DD8 80240E98 0C03A6D5 */ jal increment_status_menu_disabled -/* C56DDC 80240E9C 00000000 */ nop -/* C56DE0 80240EA0 3C05437F */ lui $a1, 0x437f -/* C56DE4 80240EA4 0C04DF69 */ jal func_80137DA4 -/* C56DE8 80240EA8 0000202D */ daddu $a0, $zero, $zero -/* C56DEC 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* C56DF0 80240EB0 24020002 */ addiu $v0, $zero, 2 -/* C56DF4 80240EB4 03E00008 */ jr $ra -/* C56DF8 80240EB8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240EBC_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/func_80240EBC_C55F40.s deleted file mode 100644 index 7df4bc968f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240EBC_C55F40.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EBC_C56DFC -/* C56DFC 80240EBC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C56E00 80240EC0 AFB3001C */ sw $s3, 0x1c($sp) -/* C56E04 80240EC4 0080982D */ daddu $s3, $a0, $zero -/* C56E08 80240EC8 AFB00010 */ sw $s0, 0x10($sp) -/* C56E0C 80240ECC 00A0802D */ daddu $s0, $a1, $zero -/* C56E10 80240ED0 0000202D */ daddu $a0, $zero, $zero -/* C56E14 80240ED4 AFBF0024 */ sw $ra, 0x24($sp) -/* C56E18 80240ED8 AFB40020 */ sw $s4, 0x20($sp) -/* C56E1C 80240EDC AFB20018 */ sw $s2, 0x18($sp) -/* C56E20 80240EE0 0C00EABB */ jal get_npc_unsafe -/* C56E24 80240EE4 AFB10014 */ sw $s1, 0x14($sp) -/* C56E28 80240EE8 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* C56E2C 80240EEC 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* C56E30 80240EF0 0240A02D */ daddu $s4, $s2, $zero -/* C56E34 80240EF4 1200000E */ beqz $s0, .L80240F30 -/* C56E38 80240EF8 0040882D */ daddu $s1, $v0, $zero -/* C56E3C 80240EFC 3C01406C */ lui $at, 0x406c -/* C56E40 80240F00 3421CCCD */ ori $at, $at, 0xcccd -/* C56E44 80240F04 44810000 */ mtc1 $at, $f0 -/* C56E48 80240F08 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C56E4C 80240F0C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C56E50 80240F10 E6200018 */ swc1 $f0, 0x18($s1) -/* C56E54 80240F14 8E460028 */ lw $a2, 0x28($s2) -/* C56E58 80240F18 0C00A720 */ jal atan2 -/* C56E5C 80240F1C 8E470030 */ lw $a3, 0x30($s2) -/* C56E60 80240F20 2402000F */ addiu $v0, $zero, 0xf -/* C56E64 80240F24 E620000C */ swc1 $f0, 0xc($s1) -/* C56E68 80240F28 AE600074 */ sw $zero, 0x74($s3) -/* C56E6C 80240F2C A622008E */ sh $v0, 0x8e($s1) -.L80240F30: -/* C56E70 80240F30 8E620074 */ lw $v0, 0x74($s3) -/* C56E74 80240F34 1440000F */ bnez $v0, .L80240F74 -/* C56E78 80240F38 00000000 */ nop -/* C56E7C 80240F3C 8622008E */ lh $v0, 0x8e($s1) -/* C56E80 80240F40 14400009 */ bnez $v0, .L80240F68 -/* C56E84 80240F44 00000000 */ nop -/* C56E88 80240F48 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C56E8C 80240F4C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C56E90 80240F50 8E860028 */ lw $a2, 0x28($s4) -/* C56E94 80240F54 0C00A720 */ jal atan2 -/* C56E98 80240F58 8E870030 */ lw $a3, 0x30($s4) -/* C56E9C 80240F5C 2402000F */ addiu $v0, $zero, 0xf -/* C56EA0 80240F60 E620000C */ swc1 $f0, 0xc($s1) -/* C56EA4 80240F64 A622008E */ sh $v0, 0x8e($s1) -.L80240F68: -/* C56EA8 80240F68 9622008E */ lhu $v0, 0x8e($s1) -/* C56EAC 80240F6C 2442FFFF */ addiu $v0, $v0, -1 -/* C56EB0 80240F70 A622008E */ sh $v0, 0x8e($s1) -.L80240F74: -/* C56EB4 80240F74 8E26000C */ lw $a2, 0xc($s1) -/* C56EB8 80240F78 8E250018 */ lw $a1, 0x18($s1) -/* C56EBC 80240F7C 0C00EA95 */ jal npc_move_heading -/* C56EC0 80240F80 0220202D */ daddu $a0, $s1, $zero -/* C56EC4 80240F84 8FBF0024 */ lw $ra, 0x24($sp) -/* C56EC8 80240F88 8FB40020 */ lw $s4, 0x20($sp) -/* C56ECC 80240F8C 8FB3001C */ lw $s3, 0x1c($sp) -/* C56ED0 80240F90 8FB20018 */ lw $s2, 0x18($sp) -/* C56ED4 80240F94 8FB10014 */ lw $s1, 0x14($sp) -/* C56ED8 80240F98 8FB00010 */ lw $s0, 0x10($sp) -/* C56EDC 80240F9C 0000102D */ daddu $v0, $zero, $zero -/* C56EE0 80240FA0 03E00008 */ jr $ra -/* C56EE4 80240FA4 27BD0028 */ addiu $sp, $sp, 0x28 -/* C56EE8 80240FA8 00000000 */ nop -/* C56EEC 80240FAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240FB0_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/func_80240FB0_C55F40.s deleted file mode 100644 index 3cc00b4104..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/func_80240FB0_C55F40.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FB0_C56EF0 -/* C56EF0 80240FB0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C56EF4 80240FB4 AFB00010 */ sw $s0, 0x10($sp) -/* C56EF8 80240FB8 3C108024 */ lui $s0, 0x8024 -/* C56EFC 80240FBC 261036E0 */ addiu $s0, $s0, 0x36e0 -/* C56F00 80240FC0 AFBF0018 */ sw $ra, 0x18($sp) -/* C56F04 80240FC4 AFB10014 */ sw $s1, 0x14($sp) -/* C56F08 80240FC8 8E020000 */ lw $v0, ($s0) -/* C56F0C 80240FCC 14400010 */ bnez $v0, .L80241010 -/* C56F10 80240FD0 0080882D */ daddu $s1, $a0, $zero -/* C56F14 80240FD4 0C00AB39 */ jal heap_malloc -/* C56F18 80240FD8 24040040 */ addiu $a0, $zero, 0x40 -/* C56F1C 80240FDC AE020000 */ sw $v0, ($s0) -/* C56F20 80240FE0 0000182D */ daddu $v1, $zero, $zero -/* C56F24 80240FE4 0040282D */ daddu $a1, $v0, $zero -/* C56F28 80240FE8 0220202D */ daddu $a0, $s1, $zero -.L80240FEC: -/* C56F2C 80240FEC 8C820084 */ lw $v0, 0x84($a0) -/* C56F30 80240FF0 24840004 */ addiu $a0, $a0, 4 -/* C56F34 80240FF4 24630001 */ addiu $v1, $v1, 1 -/* C56F38 80240FF8 ACA20000 */ sw $v0, ($a1) -/* C56F3C 80240FFC 28620010 */ slti $v0, $v1, 0x10 -/* C56F40 80241000 1440FFFA */ bnez $v0, .L80240FEC -/* C56F44 80241004 24A50004 */ addiu $a1, $a1, 4 -/* C56F48 80241008 08090413 */ j .L8024104C -/* C56F4C 8024100C 00000000 */ nop -.L80241010: -/* C56F50 80241010 0000182D */ daddu $v1, $zero, $zero -/* C56F54 80241014 0040282D */ daddu $a1, $v0, $zero -/* C56F58 80241018 0220202D */ daddu $a0, $s1, $zero -.L8024101C: -/* C56F5C 8024101C 8CA20000 */ lw $v0, ($a1) -/* C56F60 80241020 24A50004 */ addiu $a1, $a1, 4 -/* C56F64 80241024 24630001 */ addiu $v1, $v1, 1 -/* C56F68 80241028 AC820084 */ sw $v0, 0x84($a0) -/* C56F6C 8024102C 28620010 */ slti $v0, $v1, 0x10 -/* C56F70 80241030 1440FFFA */ bnez $v0, .L8024101C -/* C56F74 80241034 24840004 */ addiu $a0, $a0, 4 -/* C56F78 80241038 3C108024 */ lui $s0, 0x8024 -/* C56F7C 8024103C 261036E0 */ addiu $s0, $s0, 0x36e0 -/* C56F80 80241040 0C00AB4B */ jal heap_free -/* C56F84 80241044 8E040000 */ lw $a0, ($s0) -/* C56F88 80241048 AE000000 */ sw $zero, ($s0) -.L8024104C: -/* C56F8C 8024104C 8FBF0018 */ lw $ra, 0x18($sp) -/* C56F90 80241050 8FB10014 */ lw $s1, 0x14($sp) -/* C56F94 80241054 8FB00010 */ lw $s0, 0x10($sp) -/* C56F98 80241058 24020002 */ addiu $v0, $zero, 2 -/* C56F9C 8024105C 03E00008 */ jr $ra -/* C56FA0 80241060 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/func_80241064_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/func_80241064_C55F40.s deleted file mode 100644 index 663bf368e2..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/func_80241064_C55F40.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241064_C56FA4 -/* C56FA4 80241064 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C56FA8 80241068 AFB00010 */ sw $s0, 0x10($sp) -/* C56FAC 8024106C 0080802D */ daddu $s0, $a0, $zero -/* C56FB0 80241070 AFBF0018 */ sw $ra, 0x18($sp) -/* C56FB4 80241074 AFB10014 */ sw $s1, 0x14($sp) -/* C56FB8 80241078 8E02000C */ lw $v0, 0xc($s0) -/* C56FBC 8024107C 8C510000 */ lw $s1, ($v0) -/* C56FC0 80241080 0C0B1EAF */ jal get_variable -/* C56FC4 80241084 0220282D */ daddu $a1, $s1, $zero -/* C56FC8 80241088 3C03FFF0 */ lui $v1, 0xfff0 -/* C56FCC 8024108C 3463FFFF */ ori $v1, $v1, 0xffff -/* C56FD0 80241090 0200202D */ daddu $a0, $s0, $zero -/* C56FD4 80241094 00431024 */ and $v0, $v0, $v1 -/* C56FD8 80241098 00021140 */ sll $v0, $v0, 5 -/* C56FDC 8024109C 3C068008 */ lui $a2, %hi(gItemTable) -/* C56FE0 802410A0 00C23021 */ addu $a2, $a2, $v0 -/* C56FE4 802410A4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* C56FE8 802410A8 0C0B2026 */ jal set_variable -/* C56FEC 802410AC 0220282D */ daddu $a1, $s1, $zero -/* C56FF0 802410B0 8FBF0018 */ lw $ra, 0x18($sp) -/* C56FF4 802410B4 8FB10014 */ lw $s1, 0x14($sp) -/* C56FF8 802410B8 8FB00010 */ lw $s0, 0x10($sp) -/* C56FFC 802410BC 24020002 */ addiu $v0, $zero, 2 -/* C57000 802410C0 03E00008 */ jr $ra -/* C57004 802410C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/func_802410C8_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/func_802410C8_C55F40.s deleted file mode 100644 index d5bac78964..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/func_802410C8_C55F40.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_dro/dro_01/func_80240020_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_80240020_95B200.s deleted file mode 100644 index 37de318f0a..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_80240020_95B200.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_95B220 -/* 95B220 80240020 3C028016 */ lui $v0, 0x8016 -/* 95B224 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 95B228 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 95B22C 8024002C 03E00008 */ jr $ra -/* 95B230 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_80240034_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_80240034_95B200.s deleted file mode 100644 index 1db5dc5b8d..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_80240034_95B200.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_95B234 -/* 95B234 80240034 3C038016 */ lui $v1, 0x8016 -/* 95B238 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* 95B23C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95B240 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 95B244 80240044 0080802D */ daddu $s0, $a0, $zero -/* 95B248 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* 95B24C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 95B250 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* 95B254 80240054 24020002 */ addiu $v0, $zero, 2 -/* 95B258 80240058 08090038 */ j .L802400E0 -/* 95B25C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* 95B260 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 95B264 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 95B268 80240068 80620040 */ lb $v0, 0x40($v1) -/* 95B26C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* 95B270 80240070 04420001 */ bltzl $v0, .L80240078 -/* 95B274 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* 95B278 80240078 14400003 */ bnez $v0, .L80240088 -/* 95B27C 8024007C 00000000 */ nop -/* 95B280 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* 95B284 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* 95B288 80240088 44822000 */ mtc1 $v0, $f4 -/* 95B28C 8024008C 00000000 */ nop -/* 95B290 80240090 46802120 */ cvt.s.w $f4, $f4 -/* 95B294 80240094 44062000 */ mfc1 $a2, $f4 -/* 95B298 80240098 44872000 */ mtc1 $a3, $f4 -/* 95B29C 8024009C 00000000 */ nop -/* 95B2A0 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* 95B2A4 802400A4 44806000 */ mtc1 $zero, $f12 -/* 95B2A8 802400A8 44072000 */ mfc1 $a3, $f4 -/* 95B2AC 802400AC 0C00A720 */ jal atan2 -/* 95B2B0 802400B0 46006386 */ mov.s $f14, $f12 -/* 95B2B4 802400B4 3C014270 */ lui $at, 0x4270 -/* 95B2B8 802400B8 44811000 */ mtc1 $at, $f2 -/* 95B2BC 802400BC 00000000 */ nop -/* 95B2C0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 95B2C4 802400C4 00000000 */ nop -/* 95B2C8 802400C8 45000004 */ bc1f .L802400DC -/* 95B2CC 802400CC 24020001 */ addiu $v0, $zero, 1 -/* 95B2D0 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* 95B2D4 802400D4 08090038 */ j .L802400E0 -/* 95B2D8 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* 95B2DC 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* 95B2E0 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 95B2E4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 95B2E8 802400E8 03E00008 */ jr $ra -/* 95B2EC 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_802400F0_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_802400F0_95B200.s deleted file mode 100644 index 16a9b9c13f..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_802400F0_95B200.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_95B2F0 -/* 95B2F0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95B2F4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 95B2F8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 95B2FC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 95B300 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 95B304 80240104 0C016AFA */ jal get_current_map_header -/* 95B308 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 95B30C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 95B310 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 95B314 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 95B318 80240118 0C0B1EAF */ jal get_variable -/* 95B31C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 95B320 80240120 0220202D */ daddu $a0, $s1, $zero -/* 95B324 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 95B328 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 95B32C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 95B330 80240130 02031821 */ addu $v1, $s0, $v1 -/* 95B334 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 95B338 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 95B33C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 95B340 80240140 0C0B2026 */ jal set_variable -/* 95B344 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 95B348 80240148 0220202D */ daddu $a0, $s1, $zero -/* 95B34C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 95B350 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 95B354 80240154 02021021 */ addu $v0, $s0, $v0 -/* 95B358 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 95B35C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 95B360 80240160 44061000 */ mfc1 $a2, $f2 -/* 95B364 80240164 0C0B2026 */ jal set_variable -/* 95B368 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 95B36C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 95B370 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 95B374 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 95B378 80240178 02021021 */ addu $v0, $s0, $v0 -/* 95B37C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 95B380 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 95B384 80240184 44061000 */ mfc1 $a2, $f2 -/* 95B388 80240188 0C0B2026 */ jal set_variable -/* 95B38C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 95B390 80240190 0220202D */ daddu $a0, $s1, $zero -/* 95B394 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 95B398 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 95B39C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 95B3A0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 95B3A4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 95B3A8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 95B3AC 802401AC 0C0B2026 */ jal set_variable -/* 95B3B0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 95B3B4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 95B3B8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 95B3BC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 95B3C0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 95B3C4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 95B3C8 802401C8 03E00008 */ jr $ra -/* 95B3CC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_802401D0_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_802401D0_95B200.s deleted file mode 100644 index 91f004377d..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_802401D0_95B200.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_95B3D0 -/* 95B3D0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 95B3D4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 95B3D8 802401D8 3C014334 */ lui $at, 0x4334 -/* 95B3DC 802401DC 44816000 */ mtc1 $at, $f12 -/* 95B3E0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95B3E4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 95B3E8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 95B3EC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 95B3F0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 95B3F4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 95B3F8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 95B3FC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 95B400 80240200 00431021 */ addu $v0, $v0, $v1 -/* 95B404 80240204 000210C0 */ sll $v0, $v0, 3 -/* 95B408 80240208 3C01800B */ lui $at, 0x800b -/* 95B40C 8024020C 00220821 */ addu $at, $at, $v0 -/* 95B410 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 95B414 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 95B418 80240218 0C00A6C9 */ jal clamp_angle -/* 95B41C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 95B420 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 95B424 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 95B428 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 95B42C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 95B430 80240230 24020002 */ addiu $v0, $zero, 2 -/* 95B434 80240234 03E00008 */ jr $ra -/* 95B438 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_8024023C_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_8024023C_95B200.s deleted file mode 100644 index e2b18efb07..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_8024023C_95B200.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_95B43C -/* 95B43C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 95B440 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 95B444 80240244 0080802D */ daddu $s0, $a0, $zero -/* 95B448 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 95B44C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 95B450 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 95B454 80240254 0C0B210B */ jal get_float_variable -/* 95B458 80240258 8C450000 */ lw $a1, ($v0) -/* 95B45C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 95B460 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 95B464 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 95B468 80240268 44060000 */ mfc1 $a2, $f0 -/* 95B46C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 95B470 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 95B474 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95B478 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 95B47C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 95B480 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 95B484 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 95B488 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 95B48C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 95B490 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 95B494 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 95B498 80240298 0C0B2190 */ jal set_float_variable -/* 95B49C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 95B4A0 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 95B4A4 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 95B4A8 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 95B4AC 802402AC 0C0B2190 */ jal set_float_variable -/* 95B4B0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 95B4B4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 95B4B8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 95B4BC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 95B4C0 802402C0 0C0B2190 */ jal set_float_variable -/* 95B4C4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 95B4C8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 95B4CC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 95B4D0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 95B4D4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 95B4D8 802402D8 03E00008 */ jr $ra -/* 95B4DC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_802402E0_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_802402E0_95B200.s deleted file mode 100644 index a7ea913395..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_802402E0_95B200.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_95B4E0 -/* 95B4E0 802402E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95B4E4 802402E4 AFB10014 */ sw $s1, 0x14($sp) -/* 95B4E8 802402E8 0080882D */ daddu $s1, $a0, $zero -/* 95B4EC 802402EC AFBF001C */ sw $ra, 0x1c($sp) -/* 95B4F0 802402F0 AFB20018 */ sw $s2, 0x18($sp) -/* 95B4F4 802402F4 AFB00010 */ sw $s0, 0x10($sp) -/* 95B4F8 802402F8 8E30000C */ lw $s0, 0xc($s1) -/* 95B4FC 802402FC 8E050000 */ lw $a1, ($s0) -/* 95B500 80240300 0C0B1EAF */ jal get_variable -/* 95B504 80240304 26100004 */ addiu $s0, $s0, 4 -/* 95B508 80240308 8E050000 */ lw $a1, ($s0) -/* 95B50C 8024030C 26100004 */ addiu $s0, $s0, 4 -/* 95B510 80240310 0220202D */ daddu $a0, $s1, $zero -/* 95B514 80240314 0C0B1EAF */ jal get_variable -/* 95B518 80240318 0040902D */ daddu $s2, $v0, $zero -/* 95B51C 8024031C 0220202D */ daddu $a0, $s1, $zero -/* 95B520 80240320 8E050000 */ lw $a1, ($s0) -/* 95B524 80240324 0C0B1EAF */ jal get_variable -/* 95B528 80240328 0040802D */ daddu $s0, $v0, $zero -/* 95B52C 8024032C 0040882D */ daddu $s1, $v0, $zero -/* 95B530 80240330 2402FFFF */ addiu $v0, $zero, -1 -/* 95B534 80240334 16020005 */ bne $s0, $v0, .L8024034C -/* 95B538 80240338 24020001 */ addiu $v0, $zero, 1 -/* 95B53C 8024033C 0C04760B */ jal func_8011D82C -/* 95B540 80240340 0220202D */ daddu $a0, $s1, $zero -/* 95B544 80240344 080900FB */ j .L802403EC -/* 95B548 80240348 24020002 */ addiu $v0, $zero, 2 -.L8024034C: -/* 95B54C 8024034C 12420018 */ beq $s2, $v0, .L802403B0 -/* 95B550 80240350 2A420002 */ slti $v0, $s2, 2 -/* 95B554 80240354 10400005 */ beqz $v0, .L8024036C -/* 95B558 80240358 24020002 */ addiu $v0, $zero, 2 -/* 95B55C 8024035C 12400007 */ beqz $s2, .L8024037C -/* 95B560 80240360 3412FFFF */ ori $s2, $zero, 0xffff -/* 95B564 80240364 080900FB */ j .L802403EC -/* 95B568 80240368 00000000 */ nop -.L8024036C: -/* 95B56C 8024036C 1242001B */ beq $s2, $v0, .L802403DC -/* 95B570 80240370 24020002 */ addiu $v0, $zero, 2 -/* 95B574 80240374 080900FB */ j .L802403EC -/* 95B578 80240378 00000000 */ nop -.L8024037C: -/* 95B57C 8024037C 8E040000 */ lw $a0, ($s0) -/* 95B580 80240380 1092001A */ beq $a0, $s2, .L802403EC -/* 95B584 80240384 24020002 */ addiu $v0, $zero, 2 -/* 95B588 80240388 0C046C04 */ jal get_model_list_index_from_tree_index -/* 95B58C 8024038C 26100004 */ addiu $s0, $s0, 4 -/* 95B590 80240390 0C046B4C */ jal get_model_from_list_index -/* 95B594 80240394 0040202D */ daddu $a0, $v0, $zero -/* 95B598 80240398 0040202D */ daddu $a0, $v0, $zero -/* 95B59C 8024039C 2405FFFF */ addiu $a1, $zero, -1 -/* 95B5A0 802403A0 0C046F1F */ jal func_8011BC7C -/* 95B5A4 802403A4 0220302D */ daddu $a2, $s1, $zero -/* 95B5A8 802403A8 080900DF */ j .L8024037C -/* 95B5AC 802403AC 00000000 */ nop -.L802403B0: -/* 95B5B0 802403B0 3412FFFF */ ori $s2, $zero, 0xffff -.L802403B4: -/* 95B5B4 802403B4 8E020000 */ lw $v0, ($s0) -/* 95B5B8 802403B8 1052000B */ beq $v0, $s2, .L802403E8 -/* 95B5BC 802403BC 2405FFFF */ addiu $a1, $zero, -1 -/* 95B5C0 802403C0 96040002 */ lhu $a0, 2($s0) -/* 95B5C4 802403C4 0220302D */ daddu $a2, $s1, $zero -/* 95B5C8 802403C8 26100004 */ addiu $s0, $s0, 4 -/* 95B5CC 802403CC 0C046E54 */ jal func_8011B950 -/* 95B5D0 802403D0 0000382D */ daddu $a3, $zero, $zero -/* 95B5D4 802403D4 080900ED */ j .L802403B4 -/* 95B5D8 802403D8 00000000 */ nop -.L802403DC: -/* 95B5DC 802403DC 3C028015 */ lui $v0, 0x8015 -/* 95B5E0 802403E0 8C4212F0 */ lw $v0, 0x12f0($v0) -/* 95B5E4 802403E4 A0510000 */ sb $s1, ($v0) -.L802403E8: -/* 95B5E8 802403E8 24020002 */ addiu $v0, $zero, 2 -.L802403EC: -/* 95B5EC 802403EC 8FBF001C */ lw $ra, 0x1c($sp) -/* 95B5F0 802403F0 8FB20018 */ lw $s2, 0x18($sp) -/* 95B5F4 802403F4 8FB10014 */ lw $s1, 0x14($sp) -/* 95B5F8 802403F8 8FB00010 */ lw $s0, 0x10($sp) -/* 95B5FC 802403FC 03E00008 */ jr $ra -/* 95B600 80240400 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_80240404_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_80240404_95B200.s deleted file mode 100644 index 252440ab76..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_80240404_95B200.s +++ /dev/null @@ -1,128 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_95B604 -/* 95B604 80240404 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 95B608 80240408 AFB10034 */ sw $s1, 0x34($sp) -/* 95B60C 8024040C 0080882D */ daddu $s1, $a0, $zero -/* 95B610 80240410 AFBF0054 */ sw $ra, 0x54($sp) -/* 95B614 80240414 AFBE0050 */ sw $fp, 0x50($sp) -/* 95B618 80240418 AFB7004C */ sw $s7, 0x4c($sp) -/* 95B61C 8024041C AFB60048 */ sw $s6, 0x48($sp) -/* 95B620 80240420 AFB50044 */ sw $s5, 0x44($sp) -/* 95B624 80240424 AFB40040 */ sw $s4, 0x40($sp) -/* 95B628 80240428 AFB3003C */ sw $s3, 0x3c($sp) -/* 95B62C 8024042C AFB20038 */ sw $s2, 0x38($sp) -/* 95B630 80240430 AFB00030 */ sw $s0, 0x30($sp) -/* 95B634 80240434 8E30000C */ lw $s0, 0xc($s1) -/* 95B638 80240438 8E050000 */ lw $a1, ($s0) -/* 95B63C 8024043C 0C0B1EAF */ jal get_variable -/* 95B640 80240440 26100004 */ addiu $s0, $s0, 4 -/* 95B644 80240444 8E050000 */ lw $a1, ($s0) -/* 95B648 80240448 26100004 */ addiu $s0, $s0, 4 -/* 95B64C 8024044C 0220202D */ daddu $a0, $s1, $zero -/* 95B650 80240450 0C0B1EAF */ jal get_variable -/* 95B654 80240454 0040982D */ daddu $s3, $v0, $zero -/* 95B658 80240458 8E050000 */ lw $a1, ($s0) -/* 95B65C 8024045C 26100004 */ addiu $s0, $s0, 4 -/* 95B660 80240460 0220202D */ daddu $a0, $s1, $zero -/* 95B664 80240464 0C0B1EAF */ jal get_variable -/* 95B668 80240468 0040B02D */ daddu $s6, $v0, $zero -/* 95B66C 8024046C 8E050000 */ lw $a1, ($s0) -/* 95B670 80240470 26100004 */ addiu $s0, $s0, 4 -/* 95B674 80240474 0220202D */ daddu $a0, $s1, $zero -/* 95B678 80240478 0C0B1EAF */ jal get_variable -/* 95B67C 8024047C 0040A82D */ daddu $s5, $v0, $zero -/* 95B680 80240480 8E050000 */ lw $a1, ($s0) -/* 95B684 80240484 26100004 */ addiu $s0, $s0, 4 -/* 95B688 80240488 0220202D */ daddu $a0, $s1, $zero -/* 95B68C 8024048C 0C0B1EAF */ jal get_variable -/* 95B690 80240490 0040A02D */ daddu $s4, $v0, $zero -/* 95B694 80240494 8E050000 */ lw $a1, ($s0) -/* 95B698 80240498 26100004 */ addiu $s0, $s0, 4 -/* 95B69C 8024049C 0220202D */ daddu $a0, $s1, $zero -/* 95B6A0 802404A0 0C0B1EAF */ jal get_variable -/* 95B6A4 802404A4 0040902D */ daddu $s2, $v0, $zero -/* 95B6A8 802404A8 8E050000 */ lw $a1, ($s0) -/* 95B6AC 802404AC 26100004 */ addiu $s0, $s0, 4 -/* 95B6B0 802404B0 0220202D */ daddu $a0, $s1, $zero -/* 95B6B4 802404B4 0C0B1EAF */ jal get_variable -/* 95B6B8 802404B8 AFA20028 */ sw $v0, 0x28($sp) -/* 95B6BC 802404BC 8E050000 */ lw $a1, ($s0) -/* 95B6C0 802404C0 26100004 */ addiu $s0, $s0, 4 -/* 95B6C4 802404C4 0220202D */ daddu $a0, $s1, $zero -/* 95B6C8 802404C8 0C0B1EAF */ jal get_variable -/* 95B6CC 802404CC 0040F02D */ daddu $fp, $v0, $zero -/* 95B6D0 802404D0 8E050000 */ lw $a1, ($s0) -/* 95B6D4 802404D4 26100004 */ addiu $s0, $s0, 4 -/* 95B6D8 802404D8 0220202D */ daddu $a0, $s1, $zero -/* 95B6DC 802404DC 0C0B1EAF */ jal get_variable -/* 95B6E0 802404E0 0040B82D */ daddu $s7, $v0, $zero -/* 95B6E4 802404E4 0220202D */ daddu $a0, $s1, $zero -/* 95B6E8 802404E8 8E050000 */ lw $a1, ($s0) -/* 95B6EC 802404EC 0C0B1EAF */ jal get_variable -/* 95B6F0 802404F0 0040802D */ daddu $s0, $v0, $zero -/* 95B6F4 802404F4 0040182D */ daddu $v1, $v0, $zero -/* 95B6F8 802404F8 24020002 */ addiu $v0, $zero, 2 -/* 95B6FC 802404FC 12620012 */ beq $s3, $v0, .L80240548 -/* 95B700 80240500 2A620003 */ slti $v0, $s3, 3 -/* 95B704 80240504 10400005 */ beqz $v0, .L8024051C -/* 95B708 80240508 24020001 */ addiu $v0, $zero, 1 -/* 95B70C 8024050C 12620008 */ beq $s3, $v0, .L80240530 -/* 95B710 80240510 32C400FF */ andi $a0, $s6, 0xff -/* 95B714 80240514 08090169 */ j .L802405A4 -/* 95B718 80240518 00000000 */ nop -.L8024051C: -/* 95B71C 8024051C 24020003 */ addiu $v0, $zero, 3 -/* 95B720 80240520 12620018 */ beq $s3, $v0, .L80240584 -/* 95B724 80240524 32C400FF */ andi $a0, $s6, 0xff -/* 95B728 80240528 08090169 */ j .L802405A4 -/* 95B72C 8024052C 00000000 */ nop -.L80240530: -/* 95B730 80240530 32A500FF */ andi $a1, $s5, 0xff -/* 95B734 80240534 328600FF */ andi $a2, $s4, 0xff -/* 95B738 80240538 0C046F97 */ jal set_background_color_blend -/* 95B73C 8024053C 324700FF */ andi $a3, $s2, 0xff -/* 95B740 80240540 08090169 */ j .L802405A4 -/* 95B744 80240544 00000000 */ nop -.L80240548: -/* 95B748 80240548 32C400FF */ andi $a0, $s6, 0xff -/* 95B74C 8024054C 32A500FF */ andi $a1, $s5, 0xff -/* 95B750 80240550 328600FF */ andi $a2, $s4, 0xff -/* 95B754 80240554 324700FF */ andi $a3, $s2, 0xff -/* 95B758 80240558 93A2002B */ lbu $v0, 0x2b($sp) -/* 95B75C 8024055C AFB0001C */ sw $s0, 0x1c($sp) -/* 95B760 80240560 AFA30020 */ sw $v1, 0x20($sp) -/* 95B764 80240564 AFA20010 */ sw $v0, 0x10($sp) -/* 95B768 80240568 33C200FF */ andi $v0, $fp, 0xff -/* 95B76C 8024056C AFA20014 */ sw $v0, 0x14($sp) -/* 95B770 80240570 32E200FF */ andi $v0, $s7, 0xff -/* 95B774 80240574 0C046FAD */ jal func_8011BEB4 -/* 95B778 80240578 AFA20018 */ sw $v0, 0x18($sp) -/* 95B77C 8024057C 08090169 */ j .L802405A4 -/* 95B780 80240580 00000000 */ nop -.L80240584: -/* 95B784 80240584 32A500FF */ andi $a1, $s5, 0xff -/* 95B788 80240588 328600FF */ andi $a2, $s4, 0xff -/* 95B78C 8024058C 324700FF */ andi $a3, $s2, 0xff -/* 95B790 80240590 93A2002B */ lbu $v0, 0x2b($sp) -/* 95B794 80240594 AFA20010 */ sw $v0, 0x10($sp) -/* 95B798 80240598 33C200FF */ andi $v0, $fp, 0xff -/* 95B79C 8024059C 0C046FE6 */ jal func_8011BF98 -/* 95B7A0 802405A0 AFA20014 */ sw $v0, 0x14($sp) -.L802405A4: -/* 95B7A4 802405A4 8FBF0054 */ lw $ra, 0x54($sp) -/* 95B7A8 802405A8 8FBE0050 */ lw $fp, 0x50($sp) -/* 95B7AC 802405AC 8FB7004C */ lw $s7, 0x4c($sp) -/* 95B7B0 802405B0 8FB60048 */ lw $s6, 0x48($sp) -/* 95B7B4 802405B4 8FB50044 */ lw $s5, 0x44($sp) -/* 95B7B8 802405B8 8FB40040 */ lw $s4, 0x40($sp) -/* 95B7BC 802405BC 8FB3003C */ lw $s3, 0x3c($sp) -/* 95B7C0 802405C0 8FB20038 */ lw $s2, 0x38($sp) -/* 95B7C4 802405C4 8FB10034 */ lw $s1, 0x34($sp) -/* 95B7C8 802405C8 8FB00030 */ lw $s0, 0x30($sp) -/* 95B7CC 802405CC 24020002 */ addiu $v0, $zero, 2 -/* 95B7D0 802405D0 03E00008 */ jr $ra -/* 95B7D4 802405D4 27BD0058 */ addiu $sp, $sp, 0x58 -/* 95B7D8 802405D8 00000000 */ nop -/* 95B7DC 802405DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_80240738_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_80240738_95B200.s deleted file mode 100644 index 41e2d96ab7..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_80240738_95B200.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240738_95B938 -/* 95B938 80240738 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 95B93C 8024073C AFB20038 */ sw $s2, 0x38($sp) -/* 95B940 80240740 0080902D */ daddu $s2, $a0, $zero -/* 95B944 80240744 AFBF0044 */ sw $ra, 0x44($sp) -/* 95B948 80240748 AFB40040 */ sw $s4, 0x40($sp) -/* 95B94C 8024074C AFB3003C */ sw $s3, 0x3c($sp) -/* 95B950 80240750 AFB10034 */ sw $s1, 0x34($sp) -/* 95B954 80240754 AFB00030 */ sw $s0, 0x30($sp) -/* 95B958 80240758 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 95B95C 8024075C F7B40048 */ sdc1 $f20, 0x48($sp) -/* 95B960 80240760 8E510148 */ lw $s1, 0x148($s2) -/* 95B964 80240764 00A0982D */ daddu $s3, $a1, $zero -/* 95B968 80240768 86240008 */ lh $a0, 8($s1) -/* 95B96C 8024076C 0C00EABB */ jal get_npc_unsafe -/* 95B970 80240770 00C0A02D */ daddu $s4, $a2, $zero -/* 95B974 80240774 8E630014 */ lw $v1, 0x14($s3) -/* 95B978 80240778 04600030 */ bltz $v1, .L8024083C -/* 95B97C 8024077C 0040802D */ daddu $s0, $v0, $zero -/* 95B980 80240780 8E420074 */ lw $v0, 0x74($s2) -/* 95B984 80240784 1C40002C */ bgtz $v0, .L80240838 -/* 95B988 80240788 2442FFFF */ addiu $v0, $v0, -1 -/* 95B98C 8024078C 0280202D */ daddu $a0, $s4, $zero -/* 95B990 80240790 AE430074 */ sw $v1, 0x74($s2) -/* 95B994 80240794 AFA00010 */ sw $zero, 0x10($sp) -/* 95B998 80240798 8E66000C */ lw $a2, 0xc($s3) -/* 95B99C 8024079C 8E670010 */ lw $a3, 0x10($s3) -/* 95B9A0 802407A0 0C01242D */ jal func_800490B4 -/* 95B9A4 802407A4 0220282D */ daddu $a1, $s1, $zero -/* 95B9A8 802407A8 10400021 */ beqz $v0, .L80240830 -/* 95B9AC 802407AC 0000202D */ daddu $a0, $zero, $zero -/* 95B9B0 802407B0 0200282D */ daddu $a1, $s0, $zero -/* 95B9B4 802407B4 0000302D */ daddu $a2, $zero, $zero -/* 95B9B8 802407B8 860300A8 */ lh $v1, 0xa8($s0) -/* 95B9BC 802407BC 3C013F80 */ lui $at, 0x3f80 -/* 95B9C0 802407C0 44810000 */ mtc1 $at, $f0 -/* 95B9C4 802407C4 3C014000 */ lui $at, 0x4000 -/* 95B9C8 802407C8 44811000 */ mtc1 $at, $f2 -/* 95B9CC 802407CC 3C01C1A0 */ lui $at, 0xc1a0 -/* 95B9D0 802407D0 44812000 */ mtc1 $at, $f4 -/* 95B9D4 802407D4 2402000F */ addiu $v0, $zero, 0xf -/* 95B9D8 802407D8 AFA2001C */ sw $v0, 0x1c($sp) -/* 95B9DC 802407DC 44833000 */ mtc1 $v1, $f6 -/* 95B9E0 802407E0 00000000 */ nop -/* 95B9E4 802407E4 468031A0 */ cvt.s.w $f6, $f6 -/* 95B9E8 802407E8 44073000 */ mfc1 $a3, $f6 -/* 95B9EC 802407EC 27A20028 */ addiu $v0, $sp, 0x28 -/* 95B9F0 802407F0 AFA20020 */ sw $v0, 0x20($sp) -/* 95B9F4 802407F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95B9F8 802407F8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 95B9FC 802407FC 0C01BFA4 */ jal fx_emote -/* 95BA00 80240800 E7A40018 */ swc1 $f4, 0x18($sp) -/* 95BA04 80240804 0200202D */ daddu $a0, $s0, $zero -/* 95BA08 80240808 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 95BA0C 8024080C 0C012530 */ jal func_800494C0 -/* 95BA10 80240810 3C060020 */ lui $a2, 0x20 -/* 95BA14 80240814 8E220018 */ lw $v0, 0x18($s1) -/* 95BA18 80240818 9442002A */ lhu $v0, 0x2a($v0) -/* 95BA1C 8024081C 30420001 */ andi $v0, $v0, 1 -/* 95BA20 80240820 14400064 */ bnez $v0, .L802409B4 -/* 95BA24 80240824 2402000A */ addiu $v0, $zero, 0xa -/* 95BA28 80240828 0809026D */ j .L802409B4 -/* 95BA2C 8024082C 2402000C */ addiu $v0, $zero, 0xc -.L80240830: -/* 95BA30 80240830 8E420074 */ lw $v0, 0x74($s2) -/* 95BA34 80240834 2442FFFF */ addiu $v0, $v0, -1 -.L80240838: -/* 95BA38 80240838 AE420074 */ sw $v0, 0x74($s2) -.L8024083C: -/* 95BA3C 8024083C 8602008C */ lh $v0, 0x8c($s0) -/* 95BA40 80240840 1440005D */ bnez $v0, .L802409B8 -/* 95BA44 80240844 00000000 */ nop -/* 95BA48 80240848 C6000018 */ lwc1 $f0, 0x18($s0) -/* 95BA4C 8024084C 3C014010 */ lui $at, 0x4010 -/* 95BA50 80240850 44811800 */ mtc1 $at, $f3 -/* 95BA54 80240854 44801000 */ mtc1 $zero, $f2 -/* 95BA58 80240858 46000021 */ cvt.d.s $f0, $f0 -/* 95BA5C 8024085C 4622003C */ c.lt.d $f0, $f2 -/* 95BA60 80240860 00000000 */ nop -/* 95BA64 80240864 45000003 */ bc1f .L80240874 -/* 95BA68 80240868 0200202D */ daddu $a0, $s0, $zero -/* 95BA6C 8024086C 0809021E */ j .L80240878 -/* 95BA70 80240870 0000282D */ daddu $a1, $zero, $zero -.L80240874: -/* 95BA74 80240874 24050001 */ addiu $a1, $zero, 1 -.L80240878: -/* 95BA78 80240878 0C00F598 */ jal func_8003D660 -/* 95BA7C 8024087C 00000000 */ nop -/* 95BA80 80240880 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 95BA84 80240884 8E430078 */ lw $v1, 0x78($s2) -/* 95BA88 80240888 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 95BA8C 8024088C 00031040 */ sll $v0, $v1, 1 -/* 95BA90 80240890 00431021 */ addu $v0, $v0, $v1 -/* 95BA94 80240894 8E2300D0 */ lw $v1, 0xd0($s1) -/* 95BA98 80240898 00021080 */ sll $v0, $v0, 2 -/* 95BA9C 8024089C 00431021 */ addu $v0, $v0, $v1 -/* 95BAA0 802408A0 C4560004 */ lwc1 $f22, 4($v0) -/* 95BAA4 802408A4 4680B5A0 */ cvt.s.w $f22, $f22 -/* 95BAA8 802408A8 C454000C */ lwc1 $f20, 0xc($v0) -/* 95BAAC 802408AC 4680A520 */ cvt.s.w $f20, $f20 -/* 95BAB0 802408B0 4406B000 */ mfc1 $a2, $f22 -/* 95BAB4 802408B4 4407A000 */ mfc1 $a3, $f20 -/* 95BAB8 802408B8 0C00A720 */ jal atan2 -/* 95BABC 802408BC 00000000 */ nop -/* 95BAC0 802408C0 8E050018 */ lw $a1, 0x18($s0) -/* 95BAC4 802408C4 44060000 */ mfc1 $a2, $f0 -/* 95BAC8 802408C8 0200202D */ daddu $a0, $s0, $zero -/* 95BACC 802408CC 0C00EA95 */ jal npc_move_heading -/* 95BAD0 802408D0 AE06000C */ sw $a2, 0xc($s0) -/* 95BAD4 802408D4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 95BAD8 802408D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 95BADC 802408DC 4406B000 */ mfc1 $a2, $f22 -/* 95BAE0 802408E0 4407A000 */ mfc1 $a3, $f20 -/* 95BAE4 802408E4 0C00A7B5 */ jal dist2D -/* 95BAE8 802408E8 00000000 */ nop -/* 95BAEC 802408EC C6020018 */ lwc1 $f2, 0x18($s0) -/* 95BAF0 802408F0 4602003E */ c.le.s $f0, $f2 -/* 95BAF4 802408F4 00000000 */ nop -/* 95BAF8 802408F8 4500002F */ bc1f .L802409B8 -/* 95BAFC 802408FC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 95BB00 80240900 24020002 */ addiu $v0, $zero, 2 -/* 95BB04 80240904 0C00A67F */ jal rand_int -/* 95BB08 80240908 AE420070 */ sw $v0, 0x70($s2) -/* 95BB0C 8024090C 3C035555 */ lui $v1, 0x5555 -/* 95BB10 80240910 34635556 */ ori $v1, $v1, 0x5556 -/* 95BB14 80240914 00430018 */ mult $v0, $v1 -/* 95BB18 80240918 000227C3 */ sra $a0, $v0, 0x1f -/* 95BB1C 8024091C 00004010 */ mfhi $t0 -/* 95BB20 80240920 01042023 */ subu $a0, $t0, $a0 -/* 95BB24 80240924 00041840 */ sll $v1, $a0, 1 -/* 95BB28 80240928 00641821 */ addu $v1, $v1, $a0 -/* 95BB2C 8024092C 00431023 */ subu $v0, $v0, $v1 -/* 95BB30 80240930 24430002 */ addiu $v1, $v0, 2 -/* 95BB34 80240934 AE430074 */ sw $v1, 0x74($s2) -/* 95BB38 80240938 8E62002C */ lw $v0, 0x2c($s3) -/* 95BB3C 8024093C 18400009 */ blez $v0, .L80240964 -/* 95BB40 80240940 24020004 */ addiu $v0, $zero, 4 -/* 95BB44 80240944 8E620004 */ lw $v0, 4($s3) -/* 95BB48 80240948 18400006 */ blez $v0, .L80240964 -/* 95BB4C 8024094C 24020004 */ addiu $v0, $zero, 4 -/* 95BB50 80240950 8E620008 */ lw $v0, 8($s3) -/* 95BB54 80240954 18400003 */ blez $v0, .L80240964 -/* 95BB58 80240958 24020004 */ addiu $v0, $zero, 4 -/* 95BB5C 8024095C 14600002 */ bnez $v1, .L80240968 -/* 95BB60 80240960 00000000 */ nop -.L80240964: -/* 95BB64 80240964 AE420070 */ sw $v0, 0x70($s2) -.L80240968: -/* 95BB68 80240968 0C00A67F */ jal rand_int -/* 95BB6C 8024096C 24042710 */ addiu $a0, $zero, 0x2710 -/* 95BB70 80240970 3C0351EB */ lui $v1, 0x51eb -/* 95BB74 80240974 3463851F */ ori $v1, $v1, 0x851f -/* 95BB78 80240978 00430018 */ mult $v0, $v1 -/* 95BB7C 8024097C 00021FC3 */ sra $v1, $v0, 0x1f -/* 95BB80 80240980 00004010 */ mfhi $t0 -/* 95BB84 80240984 00082143 */ sra $a0, $t0, 5 -/* 95BB88 80240988 00832023 */ subu $a0, $a0, $v1 -/* 95BB8C 8024098C 00041840 */ sll $v1, $a0, 1 -/* 95BB90 80240990 00641821 */ addu $v1, $v1, $a0 -/* 95BB94 80240994 000318C0 */ sll $v1, $v1, 3 -/* 95BB98 80240998 00641821 */ addu $v1, $v1, $a0 -/* 95BB9C 8024099C 00031880 */ sll $v1, $v1, 2 -/* 95BBA0 802409A0 8E640004 */ lw $a0, 4($s3) -/* 95BBA4 802409A4 00431023 */ subu $v0, $v0, $v1 -/* 95BBA8 802409A8 0044102A */ slt $v0, $v0, $a0 -/* 95BBAC 802409AC 10400002 */ beqz $v0, .L802409B8 -/* 95BBB0 802409B0 24020004 */ addiu $v0, $zero, 4 -.L802409B4: -/* 95BBB4 802409B4 AE420070 */ sw $v0, 0x70($s2) -.L802409B8: -/* 95BBB8 802409B8 8FBF0044 */ lw $ra, 0x44($sp) -/* 95BBBC 802409BC 8FB40040 */ lw $s4, 0x40($sp) -/* 95BBC0 802409C0 8FB3003C */ lw $s3, 0x3c($sp) -/* 95BBC4 802409C4 8FB20038 */ lw $s2, 0x38($sp) -/* 95BBC8 802409C8 8FB10034 */ lw $s1, 0x34($sp) -/* 95BBCC 802409CC 8FB00030 */ lw $s0, 0x30($sp) -/* 95BBD0 802409D0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 95BBD4 802409D4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 95BBD8 802409D8 03E00008 */ jr $ra -/* 95BBDC 802409DC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_802409E0_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_802409E0_95B200.s deleted file mode 100644 index af4c82231f..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_802409E0_95B200.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409E0_95BBE0 -/* 95BBE0 802409E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 95BBE4 802409E4 AFB3001C */ sw $s3, 0x1c($sp) -/* 95BBE8 802409E8 0080982D */ daddu $s3, $a0, $zero -/* 95BBEC 802409EC AFBF0020 */ sw $ra, 0x20($sp) -/* 95BBF0 802409F0 AFB20018 */ sw $s2, 0x18($sp) -/* 95BBF4 802409F4 AFB10014 */ sw $s1, 0x14($sp) -/* 95BBF8 802409F8 AFB00010 */ sw $s0, 0x10($sp) -/* 95BBFC 802409FC 8E720148 */ lw $s2, 0x148($s3) -/* 95BC00 80240A00 86440008 */ lh $a0, 8($s2) -/* 95BC04 80240A04 0C00EABB */ jal get_npc_unsafe -/* 95BC08 80240A08 00A0882D */ daddu $s1, $a1, $zero -/* 95BC0C 80240A0C 8E240008 */ lw $a0, 8($s1) -/* 95BC10 80240A10 0040802D */ daddu $s0, $v0, $zero -/* 95BC14 80240A14 00041FC2 */ srl $v1, $a0, 0x1f -/* 95BC18 80240A18 00832021 */ addu $a0, $a0, $v1 -/* 95BC1C 80240A1C 00042043 */ sra $a0, $a0, 1 -/* 95BC20 80240A20 0C00A67F */ jal rand_int -/* 95BC24 80240A24 24840001 */ addiu $a0, $a0, 1 -/* 95BC28 80240A28 8E230008 */ lw $v1, 8($s1) -/* 95BC2C 80240A2C 240400B4 */ addiu $a0, $zero, 0xb4 -/* 95BC30 80240A30 00032FC2 */ srl $a1, $v1, 0x1f -/* 95BC34 80240A34 00651821 */ addu $v1, $v1, $a1 -/* 95BC38 80240A38 00031843 */ sra $v1, $v1, 1 -/* 95BC3C 80240A3C 00621821 */ addu $v1, $v1, $v0 -/* 95BC40 80240A40 0C00A67F */ jal rand_int -/* 95BC44 80240A44 A603008E */ sh $v1, 0x8e($s0) -/* 95BC48 80240A48 C60C000C */ lwc1 $f12, 0xc($s0) -/* 95BC4C 80240A4C 44820000 */ mtc1 $v0, $f0 -/* 95BC50 80240A50 00000000 */ nop -/* 95BC54 80240A54 46800020 */ cvt.s.w $f0, $f0 -/* 95BC58 80240A58 46006300 */ add.s $f12, $f12, $f0 -/* 95BC5C 80240A5C 3C0142B4 */ lui $at, 0x42b4 -/* 95BC60 80240A60 44810000 */ mtc1 $at, $f0 -/* 95BC64 80240A64 0C00A6C9 */ jal clamp_angle -/* 95BC68 80240A68 46006301 */ sub.s $f12, $f12, $f0 -/* 95BC6C 80240A6C E600000C */ swc1 $f0, 0xc($s0) -/* 95BC70 80240A70 8E4200CC */ lw $v0, 0xcc($s2) -/* 95BC74 80240A74 8C420000 */ lw $v0, ($v0) -/* 95BC78 80240A78 AE020028 */ sw $v0, 0x28($s0) -/* 95BC7C 80240A7C 24020003 */ addiu $v0, $zero, 3 -/* 95BC80 80240A80 AE620070 */ sw $v0, 0x70($s3) -/* 95BC84 80240A84 8FBF0020 */ lw $ra, 0x20($sp) -/* 95BC88 80240A88 8FB3001C */ lw $s3, 0x1c($sp) -/* 95BC8C 80240A8C 8FB20018 */ lw $s2, 0x18($sp) -/* 95BC90 80240A90 8FB10014 */ lw $s1, 0x14($sp) -/* 95BC94 80240A94 8FB00010 */ lw $s0, 0x10($sp) -/* 95BC98 80240A98 03E00008 */ jr $ra -/* 95BC9C 80240A9C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_80240D10_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_80240D10_95B200.s deleted file mode 100644 index ed26aab7fc..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_80240D10_95B200.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D10_95BF10 -/* 95BF10 80240D10 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95BF14 80240D14 AFB10014 */ sw $s1, 0x14($sp) -/* 95BF18 80240D18 0080882D */ daddu $s1, $a0, $zero -/* 95BF1C 80240D1C AFBF0018 */ sw $ra, 0x18($sp) -/* 95BF20 80240D20 AFB00010 */ sw $s0, 0x10($sp) -/* 95BF24 80240D24 8E300148 */ lw $s0, 0x148($s1) -/* 95BF28 80240D28 0C00EABB */ jal get_npc_unsafe -/* 95BF2C 80240D2C 86040008 */ lh $a0, 8($s0) -/* 95BF30 80240D30 8E0300CC */ lw $v1, 0xcc($s0) -/* 95BF34 80240D34 3C014120 */ lui $at, 0x4120 -/* 95BF38 80240D38 44812000 */ mtc1 $at, $f4 -/* 95BF3C 80240D3C 3C014000 */ lui $at, 0x4000 -/* 95BF40 80240D40 44810000 */ mtc1 $at, $f0 -/* 95BF44 80240D44 C442003C */ lwc1 $f2, 0x3c($v0) -/* 95BF48 80240D48 8C640010 */ lw $a0, 0x10($v1) -/* 95BF4C 80240D4C 8C430000 */ lw $v1, ($v0) -/* 95BF50 80240D50 E444001C */ swc1 $f4, 0x1c($v0) -/* 95BF54 80240D54 E4400014 */ swc1 $f0, 0x14($v0) -/* 95BF58 80240D58 E4420064 */ swc1 $f2, 0x64($v0) -/* 95BF5C 80240D5C 34630800 */ ori $v1, $v1, 0x800 -/* 95BF60 80240D60 AC430000 */ sw $v1, ($v0) -/* 95BF64 80240D64 AC440028 */ sw $a0, 0x28($v0) -/* 95BF68 80240D68 2402000B */ addiu $v0, $zero, 0xb -/* 95BF6C 80240D6C AE220070 */ sw $v0, 0x70($s1) -/* 95BF70 80240D70 8FBF0018 */ lw $ra, 0x18($sp) -/* 95BF74 80240D74 8FB10014 */ lw $s1, 0x14($sp) -/* 95BF78 80240D78 8FB00010 */ lw $s0, 0x10($sp) -/* 95BF7C 80240D7C 03E00008 */ jr $ra -/* 95BF80 80240D80 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_80241174_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_80241174_95B200.s deleted file mode 100644 index e0af860996..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_80241174_95B200.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241174_95C374 -/* 95C374 80241174 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 95C378 80241178 AFB40058 */ sw $s4, 0x58($sp) -/* 95C37C 8024117C 0080A02D */ daddu $s4, $a0, $zero -/* 95C380 80241180 AFBF0060 */ sw $ra, 0x60($sp) -/* 95C384 80241184 AFB5005C */ sw $s5, 0x5c($sp) -/* 95C388 80241188 AFB30054 */ sw $s3, 0x54($sp) -/* 95C38C 8024118C AFB20050 */ sw $s2, 0x50($sp) -/* 95C390 80241190 AFB1004C */ sw $s1, 0x4c($sp) -/* 95C394 80241194 AFB00048 */ sw $s0, 0x48($sp) -/* 95C398 80241198 8E910148 */ lw $s1, 0x148($s4) -/* 95C39C 8024119C 86240008 */ lh $a0, 8($s1) -/* 95C3A0 802411A0 0C00EABB */ jal get_npc_unsafe -/* 95C3A4 802411A4 00A0802D */ daddu $s0, $a1, $zero -/* 95C3A8 802411A8 8E83000C */ lw $v1, 0xc($s4) -/* 95C3AC 802411AC 0280202D */ daddu $a0, $s4, $zero -/* 95C3B0 802411B0 8C650000 */ lw $a1, ($v1) -/* 95C3B4 802411B4 0C0B1EAF */ jal get_variable -/* 95C3B8 802411B8 0040902D */ daddu $s2, $v0, $zero -/* 95C3BC 802411BC AFA00018 */ sw $zero, 0x18($sp) -/* 95C3C0 802411C0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 95C3C4 802411C4 8C630094 */ lw $v1, 0x94($v1) -/* 95C3C8 802411C8 AFA3001C */ sw $v1, 0x1c($sp) -/* 95C3CC 802411CC 8E2300D0 */ lw $v1, 0xd0($s1) -/* 95C3D0 802411D0 8C630080 */ lw $v1, 0x80($v1) -/* 95C3D4 802411D4 AFA30020 */ sw $v1, 0x20($sp) -/* 95C3D8 802411D8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 95C3DC 802411DC 8C630088 */ lw $v1, 0x88($v1) -/* 95C3E0 802411E0 AFA30024 */ sw $v1, 0x24($sp) -/* 95C3E4 802411E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 95C3E8 802411E8 8C63008C */ lw $v1, 0x8c($v1) -/* 95C3EC 802411EC 27B50018 */ addiu $s5, $sp, 0x18 -/* 95C3F0 802411F0 AFA30028 */ sw $v1, 0x28($sp) -/* 95C3F4 802411F4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 95C3F8 802411F8 3C014282 */ lui $at, 0x4282 -/* 95C3FC 802411FC 44810000 */ mtc1 $at, $f0 -/* 95C400 80241200 8C630090 */ lw $v1, 0x90($v1) -/* 95C404 80241204 0040982D */ daddu $s3, $v0, $zero -/* 95C408 80241208 E7A00030 */ swc1 $f0, 0x30($sp) -/* 95C40C 8024120C A7A00034 */ sh $zero, 0x34($sp) -/* 95C410 80241210 16000005 */ bnez $s0, .L80241228 -/* 95C414 80241214 AFA3002C */ sw $v1, 0x2c($sp) -/* 95C418 80241218 8E2200B0 */ lw $v0, 0xb0($s1) -/* 95C41C 8024121C 30420004 */ andi $v0, $v0, 4 -/* 95C420 80241220 10400044 */ beqz $v0, .L80241334 -/* 95C424 80241224 00000000 */ nop -.L80241228: -/* 95C428 80241228 2404F7FF */ addiu $a0, $zero, -0x801 -/* 95C42C 8024122C AE800070 */ sw $zero, 0x70($s4) -/* 95C430 80241230 A640008E */ sh $zero, 0x8e($s2) -/* 95C434 80241234 8E2200CC */ lw $v0, 0xcc($s1) -/* 95C438 80241238 8E430000 */ lw $v1, ($s2) -/* 95C43C 8024123C 8C420000 */ lw $v0, ($v0) -/* 95C440 80241240 00641824 */ and $v1, $v1, $a0 -/* 95C444 80241244 AE430000 */ sw $v1, ($s2) -/* 95C448 80241248 AE420028 */ sw $v0, 0x28($s2) -/* 95C44C 8024124C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 95C450 80241250 8C420098 */ lw $v0, 0x98($v0) -/* 95C454 80241254 54400005 */ bnel $v0, $zero, .L8024126C -/* 95C458 80241258 2402FDFF */ addiu $v0, $zero, -0x201 -/* 95C45C 8024125C 34620200 */ ori $v0, $v1, 0x200 -/* 95C460 80241260 2403FFF7 */ addiu $v1, $zero, -9 -/* 95C464 80241264 0809049D */ j .L80241274 -/* 95C468 80241268 00431024 */ and $v0, $v0, $v1 -.L8024126C: -/* 95C46C 8024126C 00621024 */ and $v0, $v1, $v0 -/* 95C470 80241270 34420008 */ ori $v0, $v0, 8 -.L80241274: -/* 95C474 80241274 AE420000 */ sw $v0, ($s2) -/* 95C478 80241278 8E2200B0 */ lw $v0, 0xb0($s1) -/* 95C47C 8024127C 30420004 */ andi $v0, $v0, 4 -/* 95C480 80241280 10400008 */ beqz $v0, .L802412A4 -/* 95C484 80241284 24020063 */ addiu $v0, $zero, 0x63 -/* 95C488 80241288 AE820070 */ sw $v0, 0x70($s4) -/* 95C48C 8024128C AE800074 */ sw $zero, 0x74($s4) -/* 95C490 80241290 8E2200B0 */ lw $v0, 0xb0($s1) -/* 95C494 80241294 2403FFFB */ addiu $v1, $zero, -5 -/* 95C498 80241298 00431024 */ and $v0, $v0, $v1 -/* 95C49C 8024129C 080904B4 */ j .L802412D0 -/* 95C4A0 802412A0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802412A4: -/* 95C4A4 802412A4 8E220000 */ lw $v0, ($s1) -/* 95C4A8 802412A8 3C034000 */ lui $v1, 0x4000 -/* 95C4AC 802412AC 00431024 */ and $v0, $v0, $v1 -/* 95C4B0 802412B0 10400007 */ beqz $v0, .L802412D0 -/* 95C4B4 802412B4 3C03BFFF */ lui $v1, 0xbfff -/* 95C4B8 802412B8 2402000C */ addiu $v0, $zero, 0xc -/* 95C4BC 802412BC AE820070 */ sw $v0, 0x70($s4) -/* 95C4C0 802412C0 8E220000 */ lw $v0, ($s1) -/* 95C4C4 802412C4 3463FFFF */ ori $v1, $v1, 0xffff -/* 95C4C8 802412C8 00431024 */ and $v0, $v0, $v1 -/* 95C4CC 802412CC AE220000 */ sw $v0, ($s1) -.L802412D0: -/* 95C4D0 802412D0 27A50038 */ addiu $a1, $sp, 0x38 -/* 95C4D4 802412D4 27A6003C */ addiu $a2, $sp, 0x3c -/* 95C4D8 802412D8 C6400038 */ lwc1 $f0, 0x38($s2) -/* 95C4DC 802412DC 864200A8 */ lh $v0, 0xa8($s2) -/* 95C4E0 802412E0 3C0142C8 */ lui $at, 0x42c8 -/* 95C4E4 802412E4 44812000 */ mtc1 $at, $f4 -/* 95C4E8 802412E8 44823000 */ mtc1 $v0, $f6 -/* 95C4EC 802412EC 00000000 */ nop -/* 95C4F0 802412F0 468031A0 */ cvt.s.w $f6, $f6 -/* 95C4F4 802412F4 27A20044 */ addiu $v0, $sp, 0x44 -/* 95C4F8 802412F8 E7A00038 */ swc1 $f0, 0x38($sp) -/* 95C4FC 802412FC C640003C */ lwc1 $f0, 0x3c($s2) -/* 95C500 80241300 C6420040 */ lwc1 $f2, 0x40($s2) -/* 95C504 80241304 46060000 */ add.s $f0, $f0, $f6 -/* 95C508 80241308 E7A40044 */ swc1 $f4, 0x44($sp) -/* 95C50C 8024130C E7A20040 */ swc1 $f2, 0x40($sp) -/* 95C510 80241310 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 95C514 80241314 AFA20010 */ sw $v0, 0x10($sp) -/* 95C518 80241318 8E440080 */ lw $a0, 0x80($s2) -/* 95C51C 8024131C 0C0372DF */ jal func_800DCB7C -/* 95C520 80241320 27A70040 */ addiu $a3, $sp, 0x40 -/* 95C524 80241324 10400003 */ beqz $v0, .L80241334 -/* 95C528 80241328 00000000 */ nop -/* 95C52C 8024132C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 95C530 80241330 E640003C */ swc1 $f0, 0x3c($s2) -.L80241334: -/* 95C534 80241334 8E830070 */ lw $v1, 0x70($s4) -/* 95C538 80241338 2C620064 */ sltiu $v0, $v1, 0x64 -/* 95C53C 8024133C 10400042 */ beqz $v0, .L80241448 -/* 95C540 80241340 00031080 */ sll $v0, $v1, 2 -/* 95C544 80241344 3C018025 */ lui $at, 0x8025 -/* 95C548 80241348 00220821 */ addu $at, $at, $v0 -/* 95C54C 8024134C 8C22DDF0 */ lw $v0, -0x2210($at) -/* 95C550 80241350 00400008 */ jr $v0 -/* 95C554 80241354 00000000 */ nop -/* 95C558 80241358 0280202D */ daddu $a0, $s4, $zero -/* 95C55C 8024135C 0260282D */ daddu $a1, $s3, $zero -/* 95C560 80241360 0C090178 */ jal func_802405E0 -/* 95C564 80241364 02A0302D */ daddu $a2, $s5, $zero -/* 95C568 80241368 0280202D */ daddu $a0, $s4, $zero -/* 95C56C 8024136C 0260282D */ daddu $a1, $s3, $zero -/* 95C570 80241370 0C0901CE */ jal func_80240738 -/* 95C574 80241374 02A0302D */ daddu $a2, $s5, $zero -/* 95C578 80241378 08090512 */ j .L80241448 -/* 95C57C 8024137C 00000000 */ nop -/* 95C580 80241380 0280202D */ daddu $a0, $s4, $zero -/* 95C584 80241384 0260282D */ daddu $a1, $s3, $zero -/* 95C588 80241388 0C090278 */ jal func_802409E0 -/* 95C58C 8024138C 02A0302D */ daddu $a2, $s5, $zero -/* 95C590 80241390 0280202D */ daddu $a0, $s4, $zero -/* 95C594 80241394 0260282D */ daddu $a1, $s3, $zero -/* 95C598 80241398 0C0902A8 */ jal func_80240AA0 -/* 95C59C 8024139C 02A0302D */ daddu $a2, $s5, $zero -/* 95C5A0 802413A0 08090512 */ j .L80241448 -/* 95C5A4 802413A4 00000000 */ nop -/* 95C5A8 802413A8 0280202D */ daddu $a0, $s4, $zero -/* 95C5AC 802413AC 0260282D */ daddu $a1, $s3, $zero -/* 95C5B0 802413B0 0C090317 */ jal func_80240C5C -/* 95C5B4 802413B4 02A0302D */ daddu $a2, $s5, $zero -/* 95C5B8 802413B8 08090512 */ j .L80241448 -/* 95C5BC 802413BC 00000000 */ nop -/* 95C5C0 802413C0 0280202D */ daddu $a0, $s4, $zero -/* 95C5C4 802413C4 0260282D */ daddu $a1, $s3, $zero -/* 95C5C8 802413C8 0C090344 */ jal func_80240D10 -/* 95C5CC 802413CC 02A0302D */ daddu $a2, $s5, $zero -/* 95C5D0 802413D0 0280202D */ daddu $a0, $s4, $zero -/* 95C5D4 802413D4 0260282D */ daddu $a1, $s3, $zero -/* 95C5D8 802413D8 0C090361 */ jal func_80240D84 -/* 95C5DC 802413DC 02A0302D */ daddu $a2, $s5, $zero -/* 95C5E0 802413E0 08090512 */ j .L80241448 -/* 95C5E4 802413E4 00000000 */ nop -/* 95C5E8 802413E8 0280202D */ daddu $a0, $s4, $zero -/* 95C5EC 802413EC 0260282D */ daddu $a1, $s3, $zero -/* 95C5F0 802413F0 0C09037F */ jal func_80240DFC -/* 95C5F4 802413F4 02A0302D */ daddu $a2, $s5, $zero -/* 95C5F8 802413F8 0280202D */ daddu $a0, $s4, $zero -/* 95C5FC 802413FC 0260282D */ daddu $a1, $s3, $zero -/* 95C600 80241400 0C0903CB */ jal func_80240F2C -/* 95C604 80241404 02A0302D */ daddu $a2, $s5, $zero -/* 95C608 80241408 08090512 */ j .L80241448 -/* 95C60C 8024140C 00000000 */ nop -/* 95C610 80241410 0280202D */ daddu $a0, $s4, $zero -/* 95C614 80241414 0260282D */ daddu $a1, $s3, $zero -/* 95C618 80241418 0C090413 */ jal func_8024104C -/* 95C61C 8024141C 02A0302D */ daddu $a2, $s5, $zero -/* 95C620 80241420 08090512 */ j .L80241448 -/* 95C624 80241424 00000000 */ nop -/* 95C628 80241428 0280202D */ daddu $a0, $s4, $zero -/* 95C62C 8024142C 0260282D */ daddu $a1, $s3, $zero -/* 95C630 80241430 0C09042D */ jal func_802410B4 -/* 95C634 80241434 02A0302D */ daddu $a2, $s5, $zero -/* 95C638 80241438 08090512 */ j .L80241448 -/* 95C63C 8024143C 00000000 */ nop -/* 95C640 80241440 0C0129CF */ jal func_8004A73C -/* 95C644 80241444 0280202D */ daddu $a0, $s4, $zero -.L80241448: -/* 95C648 80241448 8FBF0060 */ lw $ra, 0x60($sp) -/* 95C64C 8024144C 8FB5005C */ lw $s5, 0x5c($sp) -/* 95C650 80241450 8FB40058 */ lw $s4, 0x58($sp) -/* 95C654 80241454 8FB30054 */ lw $s3, 0x54($sp) -/* 95C658 80241458 8FB20050 */ lw $s2, 0x50($sp) -/* 95C65C 8024145C 8FB1004C */ lw $s1, 0x4c($sp) -/* 95C660 80241460 8FB00048 */ lw $s0, 0x48($sp) -/* 95C664 80241464 0000102D */ daddu $v0, $zero, $zero -/* 95C668 80241468 03E00008 */ jr $ra -/* 95C66C 8024146C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_8024159C_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_8024159C_95B200.s deleted file mode 100644 index a09e694f23..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_8024159C_95B200.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024159C_95C79C -/* 95C79C 8024159C 3C018015 */ lui $at, %hi(D_80151310) -/* 95C7A0 802415A0 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 95C7A4 802415A4 03E00008 */ jr $ra -/* 95C7A8 802415A8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_8024189C_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_8024189C_95B200.s deleted file mode 100644 index e6bff98043..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_8024189C_95B200.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024189C_95CA9C -/* 95CA9C 8024189C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 95CAA0 802418A0 AFB10014 */ sw $s1, 0x14($sp) -/* 95CAA4 802418A4 0080882D */ daddu $s1, $a0, $zero -/* 95CAA8 802418A8 AFBF0024 */ sw $ra, 0x24($sp) -/* 95CAAC 802418AC AFB40020 */ sw $s4, 0x20($sp) -/* 95CAB0 802418B0 AFB3001C */ sw $s3, 0x1c($sp) -/* 95CAB4 802418B4 AFB20018 */ sw $s2, 0x18($sp) -/* 95CAB8 802418B8 10A00033 */ beqz $a1, .L80241988 -/* 95CABC 802418BC AFB00010 */ sw $s0, 0x10($sp) -/* 95CAC0 802418C0 0C04760B */ jal func_8011D82C -/* 95CAC4 802418C4 24040001 */ addiu $a0, $zero, 1 -/* 95CAC8 802418C8 0000202D */ daddu $a0, $zero, $zero -/* 95CACC 802418CC 0080282D */ daddu $a1, $a0, $zero -/* 95CAD0 802418D0 0080302D */ daddu $a2, $a0, $zero -/* 95CAD4 802418D4 0080382D */ daddu $a3, $a0, $zero -/* 95CAD8 802418D8 0080802D */ daddu $s0, $a0, $zero -/* 95CADC 802418DC 2414FFFC */ addiu $s4, $zero, -4 -/* 95CAE0 802418E0 2413000A */ addiu $s3, $zero, 0xa -/* 95CAE4 802418E4 3C120080 */ lui $s2, 0x80 -/* 95CAE8 802418E8 3C038015 */ lui $v1, 0x8015 -/* 95CAEC 802418EC 8C6312F0 */ lw $v1, 0x12f0($v1) -/* 95CAF0 802418F0 24020001 */ addiu $v0, $zero, 1 -/* 95CAF4 802418F4 0C046F97 */ jal set_background_color_blend -/* 95CAF8 802418F8 A0620000 */ sb $v0, ($v1) -.L802418FC: -/* 95CAFC 802418FC 0C00E2B7 */ jal get_npc_by_index -/* 95CB00 80241900 0200202D */ daddu $a0, $s0, $zero -/* 95CB04 80241904 0040202D */ daddu $a0, $v0, $zero -/* 95CB08 80241908 5080000B */ beql $a0, $zero, .L80241938 -/* 95CB0C 8024190C 26100001 */ addiu $s0, $s0, 1 -/* 95CB10 80241910 8C820000 */ lw $v0, ($a0) -/* 95CB14 80241914 50400008 */ beql $v0, $zero, .L80241938 -/* 95CB18 80241918 26100001 */ addiu $s0, $s0, 1 -/* 95CB1C 8024191C 808300A4 */ lb $v1, 0xa4($a0) -/* 95CB20 80241920 10740005 */ beq $v1, $s4, .L80241938 -/* 95CB24 80241924 26100001 */ addiu $s0, $s0, 1 -/* 95CB28 80241928 10730003 */ beq $v1, $s3, .L80241938 -/* 95CB2C 8024192C 00000000 */ nop -/* 95CB30 80241930 00521025 */ or $v0, $v0, $s2 -/* 95CB34 80241934 AC820000 */ sw $v0, ($a0) -.L80241938: -/* 95CB38 80241938 2A020040 */ slti $v0, $s0, 0x40 -/* 95CB3C 8024193C 1440FFEF */ bnez $v0, .L802418FC -/* 95CB40 80241940 00000000 */ nop -/* 95CB44 80241944 0000802D */ daddu $s0, $zero, $zero -/* 95CB48 80241948 3C120800 */ lui $s2, 0x800 -.L8024194C: -/* 95CB4C 8024194C 0C04C3D6 */ jal get_item_entity -/* 95CB50 80241950 0200202D */ daddu $a0, $s0, $zero -/* 95CB54 80241954 0040182D */ daddu $v1, $v0, $zero -/* 95CB58 80241958 10600007 */ beqz $v1, .L80241978 -/* 95CB5C 8024195C 26100001 */ addiu $s0, $s0, 1 -/* 95CB60 80241960 8C640000 */ lw $a0, ($v1) -/* 95CB64 80241964 30820010 */ andi $v0, $a0, 0x10 -/* 95CB68 80241968 10400003 */ beqz $v0, .L80241978 -/* 95CB6C 8024196C 00000000 */ nop -/* 95CB70 80241970 00921025 */ or $v0, $a0, $s2 -/* 95CB74 80241974 AC620000 */ sw $v0, ($v1) -.L80241978: -/* 95CB78 80241978 2A020100 */ slti $v0, $s0, 0x100 -/* 95CB7C 8024197C 1440FFF3 */ bnez $v0, .L8024194C -/* 95CB80 80241980 00000000 */ nop -/* 95CB84 80241984 AE200070 */ sw $zero, 0x70($s1) -.L80241988: -/* 95CB88 80241988 8E220070 */ lw $v0, 0x70($s1) -/* 95CB8C 8024198C 24420008 */ addiu $v0, $v0, 8 -/* 95CB90 80241990 AE220070 */ sw $v0, 0x70($s1) -/* 95CB94 80241994 28420100 */ slti $v0, $v0, 0x100 -/* 95CB98 80241998 14400003 */ bnez $v0, .L802419A8 -/* 95CB9C 8024199C 0000202D */ daddu $a0, $zero, $zero -/* 95CBA0 802419A0 240200FF */ addiu $v0, $zero, 0xff -/* 95CBA4 802419A4 AE220070 */ sw $v0, 0x70($s1) -.L802419A8: -/* 95CBA8 802419A8 0080282D */ daddu $a1, $a0, $zero -/* 95CBAC 802419AC 92270073 */ lbu $a3, 0x73($s1) -/* 95CBB0 802419B0 0C046F97 */ jal set_background_color_blend -/* 95CBB4 802419B4 0080302D */ daddu $a2, $a0, $zero -/* 95CBB8 802419B8 8E220070 */ lw $v0, 0x70($s1) -/* 95CBBC 802419BC 8FBF0024 */ lw $ra, 0x24($sp) -/* 95CBC0 802419C0 8FB40020 */ lw $s4, 0x20($sp) -/* 95CBC4 802419C4 8FB3001C */ lw $s3, 0x1c($sp) -/* 95CBC8 802419C8 8FB20018 */ lw $s2, 0x18($sp) -/* 95CBCC 802419CC 8FB10014 */ lw $s1, 0x14($sp) -/* 95CBD0 802419D0 8FB00010 */ lw $s0, 0x10($sp) -/* 95CBD4 802419D4 384200FF */ xori $v0, $v0, 0xff -/* 95CBD8 802419D8 2C420001 */ sltiu $v0, $v0, 1 -/* 95CBDC 802419DC 00021040 */ sll $v0, $v0, 1 -/* 95CBE0 802419E0 03E00008 */ jr $ra -/* 95CBE4 802419E4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_80241EAC_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_80241EAC_95B200.s deleted file mode 100644 index 28dca7491d..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_80241EAC_95B200.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EAC_95D0AC -/* 95D0AC 80241EAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95D0B0 80241EB0 AFBF0010 */ sw $ra, 0x10($sp) -/* 95D0B4 80241EB4 8C82000C */ lw $v0, 0xc($a0) -/* 95D0B8 80241EB8 0C0B1EAF */ jal get_variable -/* 95D0BC 80241EBC 8C450000 */ lw $a1, ($v0) -/* 95D0C0 80241EC0 3C038025 */ lui $v1, 0x8025 -/* 95D0C4 80241EC4 8C63DFE0 */ lw $v1, -0x2020($v1) -/* 95D0C8 80241EC8 8C63000C */ lw $v1, 0xc($v1) -/* 95D0CC 80241ECC AC620034 */ sw $v0, 0x34($v1) -/* 95D0D0 80241ED0 8FBF0010 */ lw $ra, 0x10($sp) -/* 95D0D4 80241ED4 24020002 */ addiu $v0, $zero, 2 -/* 95D0D8 80241ED8 03E00008 */ jr $ra -/* 95D0DC 80241EDC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_8024228C_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_8024228C_95B200.s deleted file mode 100644 index 7cffdb15ba..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_8024228C_95B200.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024228C_95D48C -/* 95D48C 8024228C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 95D490 80242290 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 95D494 80242294 10A00002 */ beqz $a1, .L802422A0 -/* 95D498 80242298 2402003C */ addiu $v0, $zero, 0x3c -/* 95D49C 8024229C AC820070 */ sw $v0, 0x70($a0) -.L802422A0: -/* 95D4A0 802422A0 C4620080 */ lwc1 $f2, 0x80($v1) -/* 95D4A4 802422A4 3C0141F0 */ lui $at, 0x41f0 -/* 95D4A8 802422A8 44810000 */ mtc1 $at, $f0 -/* 95D4AC 802422AC 00000000 */ nop -/* 95D4B0 802422B0 46001000 */ add.s $f0, $f2, $f0 -/* 95D4B4 802422B4 3C0143B4 */ lui $at, 0x43b4 -/* 95D4B8 802422B8 44811000 */ mtc1 $at, $f2 -/* 95D4BC 802422BC 00000000 */ nop -/* 95D4C0 802422C0 4600103E */ c.le.s $f2, $f0 -/* 95D4C4 802422C4 00000000 */ nop -/* 95D4C8 802422C8 45000003 */ bc1f .L802422D8 -/* 95D4CC 802422CC E4600080 */ swc1 $f0, 0x80($v1) -/* 95D4D0 802422D0 46020001 */ sub.s $f0, $f0, $f2 -/* 95D4D4 802422D4 E4600080 */ swc1 $f0, 0x80($v1) -.L802422D8: -/* 95D4D8 802422D8 8C820070 */ lw $v0, 0x70($a0) -/* 95D4DC 802422DC 2442FFFF */ addiu $v0, $v0, -1 -/* 95D4E0 802422E0 AC820070 */ sw $v0, 0x70($a0) -/* 95D4E4 802422E4 000217C3 */ sra $v0, $v0, 0x1f -/* 95D4E8 802422E8 03E00008 */ jr $ra -/* 95D4EC 802422EC 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_802431B4_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_802431B4_95B200.s deleted file mode 100644 index c20a03d473..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_802431B4_95B200.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802431B4_95E3B4 -/* 95E3B4 802431B4 3C038011 */ lui $v1, %hi(gPlayerData) -/* 95E3B8 802431B8 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 95E3BC 802431BC 8C6202BC */ lw $v0, 0x2bc($v1) -/* 95E3C0 802431C0 8C630328 */ lw $v1, 0x328($v1) -/* 95E3C4 802431C4 00431023 */ subu $v0, $v0, $v1 -/* 95E3C8 802431C8 3C0391A2 */ lui $v1, 0x91a2 -/* 95E3CC 802431CC 3463B3C5 */ ori $v1, $v1, 0xb3c5 -/* 95E3D0 802431D0 00430019 */ multu $v0, $v1 -/* 95E3D4 802431D4 00002810 */ mfhi $a1 -/* 95E3D8 802431D8 000512C2 */ srl $v0, $a1, 0xb -/* 95E3DC 802431DC 2842001E */ slti $v0, $v0, 0x1e -/* 95E3E0 802431E0 10400003 */ beqz $v0, .L802431F0 -/* 95E3E4 802431E4 24020001 */ addiu $v0, $zero, 1 -/* 95E3E8 802431E8 08090C7D */ j .L802431F4 -/* 95E3EC 802431EC AC820084 */ sw $v0, 0x84($a0) -.L802431F0: -/* 95E3F0 802431F0 AC800084 */ sw $zero, 0x84($a0) -.L802431F4: -/* 95E3F4 802431F4 03E00008 */ jr $ra -/* 95E3F8 802431F8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_80243514_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_80243514_95B200.s deleted file mode 100644 index cb13d1cce3..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_80243514_95B200.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243514_95E714 -/* 95E714 80243514 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95E718 80243518 AFB00010 */ sw $s0, 0x10($sp) -/* 95E71C 8024351C 0080802D */ daddu $s0, $a0, $zero -/* 95E720 80243520 AFBF0018 */ sw $ra, 0x18($sp) -/* 95E724 80243524 AFB10014 */ sw $s1, 0x14($sp) -/* 95E728 80243528 8E02000C */ lw $v0, 0xc($s0) -/* 95E72C 8024352C 8C510000 */ lw $s1, ($v0) -/* 95E730 80243530 0C0B1EAF */ jal get_variable -/* 95E734 80243534 0220282D */ daddu $a1, $s1, $zero -/* 95E738 80243538 3C03FFF0 */ lui $v1, 0xfff0 -/* 95E73C 8024353C 3463FFFF */ ori $v1, $v1, 0xffff -/* 95E740 80243540 0200202D */ daddu $a0, $s0, $zero -/* 95E744 80243544 00431024 */ and $v0, $v0, $v1 -/* 95E748 80243548 00021140 */ sll $v0, $v0, 5 -/* 95E74C 8024354C 3C068008 */ lui $a2, %hi(gItemTable) -/* 95E750 80243550 00C23021 */ addu $a2, $a2, $v0 -/* 95E754 80243554 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 95E758 80243558 0C0B2026 */ jal set_variable -/* 95E75C 8024355C 0220282D */ daddu $a1, $s1, $zero -/* 95E760 80243560 8FBF0018 */ lw $ra, 0x18($sp) -/* 95E764 80243564 8FB10014 */ lw $s1, 0x14($sp) -/* 95E768 80243568 8FB00010 */ lw $s0, 0x10($sp) -/* 95E76C 8024356C 24020002 */ addiu $v0, $zero, 2 -/* 95E770 80243570 03E00008 */ jr $ra -/* 95E774 80243574 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_802435C0_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_802435C0_95B200.s deleted file mode 100644 index 5abd0821d0..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_802435C0_95B200.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435C0_95E7C0 -/* 95E7C0 802435C0 3C028016 */ lui $v0, 0x8016 -/* 95E7C4 802435C4 8442A552 */ lh $v0, -0x5aae($v0) -/* 95E7C8 802435C8 AC820084 */ sw $v0, 0x84($a0) -/* 95E7CC 802435CC 03E00008 */ jr $ra -/* 95E7D0 802435D0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_01/func_802438F0_95B200.s b/asm/nonmatchings/world/area_dro/dro_01/func_802438F0_95B200.s deleted file mode 100644 index 4f77e4fe6e..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/func_802438F0_95B200.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802438F0_95EAF0 -/* 95EAF0 802438F0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 95EAF4 802438F4 AFB10054 */ sw $s1, 0x54($sp) -/* 95EAF8 802438F8 0080882D */ daddu $s1, $a0, $zero -/* 95EAFC 802438FC AFBF005C */ sw $ra, 0x5c($sp) -/* 95EB00 80243900 AFB20058 */ sw $s2, 0x58($sp) -/* 95EB04 80243904 AFB00050 */ sw $s0, 0x50($sp) -/* 95EB08 80243908 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 95EB0C 8024390C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 95EB10 80243910 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 95EB14 80243914 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 95EB18 80243918 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 95EB1C 8024391C 8E30000C */ lw $s0, 0xc($s1) -/* 95EB20 80243920 8E050000 */ lw $a1, ($s0) -/* 95EB24 80243924 0C0B1EAF */ jal get_variable -/* 95EB28 80243928 26100004 */ addiu $s0, $s0, 4 -/* 95EB2C 8024392C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 95EB30 80243930 0040202D */ daddu $a0, $v0, $zero -/* 95EB34 80243934 8E050000 */ lw $a1, ($s0) -/* 95EB38 80243938 26100004 */ addiu $s0, $s0, 4 -/* 95EB3C 8024393C 0220202D */ daddu $a0, $s1, $zero -/* 95EB40 80243940 0C0B210B */ jal get_float_variable -/* 95EB44 80243944 0040902D */ daddu $s2, $v0, $zero -/* 95EB48 80243948 8E050000 */ lw $a1, ($s0) -/* 95EB4C 8024394C 26100004 */ addiu $s0, $s0, 4 -/* 95EB50 80243950 0220202D */ daddu $a0, $s1, $zero -/* 95EB54 80243954 0C0B210B */ jal get_float_variable -/* 95EB58 80243958 46000706 */ mov.s $f28, $f0 -/* 95EB5C 8024395C 8E050000 */ lw $a1, ($s0) -/* 95EB60 80243960 26100004 */ addiu $s0, $s0, 4 -/* 95EB64 80243964 0220202D */ daddu $a0, $s1, $zero -/* 95EB68 80243968 0C0B210B */ jal get_float_variable -/* 95EB6C 8024396C 46000686 */ mov.s $f26, $f0 -/* 95EB70 80243970 0220202D */ daddu $a0, $s1, $zero -/* 95EB74 80243974 8E050000 */ lw $a1, ($s0) -/* 95EB78 80243978 0C0B210B */ jal get_float_variable -/* 95EB7C 8024397C 46000586 */ mov.s $f22, $f0 -/* 95EB80 80243980 0240202D */ daddu $a0, $s2, $zero -/* 95EB84 80243984 0C046B4C */ jal get_model_from_list_index -/* 95EB88 80243988 46000606 */ mov.s $f24, $f0 -/* 95EB8C 8024398C 0040882D */ daddu $s1, $v0, $zero -/* 95EB90 80243990 96220000 */ lhu $v0, ($s1) -/* 95EB94 80243994 30420400 */ andi $v0, $v0, 0x400 -/* 95EB98 80243998 1440001E */ bnez $v0, .L80243A14 -/* 95EB9C 8024399C 26300058 */ addiu $s0, $s1, 0x58 -/* 95EBA0 802439A0 4480A000 */ mtc1 $zero, $f20 -/* 95EBA4 802439A4 4406B000 */ mfc1 $a2, $f22 -/* 95EBA8 802439A8 4405A000 */ mfc1 $a1, $f20 -/* 95EBAC 802439AC 4407A000 */ mfc1 $a3, $f20 -/* 95EBB0 802439B0 0C019E40 */ jal guTranslateF -/* 95EBB4 802439B4 0200202D */ daddu $a0, $s0, $zero -/* 95EBB8 802439B8 4405E000 */ mfc1 $a1, $f28 -/* 95EBBC 802439BC 4406D000 */ mfc1 $a2, $f26 -/* 95EBC0 802439C0 4407C000 */ mfc1 $a3, $f24 -/* 95EBC4 802439C4 0C090E20 */ jal func_80243880 -/* 95EBC8 802439C8 27A40010 */ addiu $a0, $sp, 0x10 -/* 95EBCC 802439CC 27A40010 */ addiu $a0, $sp, 0x10 -/* 95EBD0 802439D0 0200282D */ daddu $a1, $s0, $zero -/* 95EBD4 802439D4 0C019D80 */ jal guMtxCatF -/* 95EBD8 802439D8 0200302D */ daddu $a2, $s0, $zero -/* 95EBDC 802439DC 27A40010 */ addiu $a0, $sp, 0x10 -/* 95EBE0 802439E0 4600B587 */ neg.s $f22, $f22 -/* 95EBE4 802439E4 4405A000 */ mfc1 $a1, $f20 -/* 95EBE8 802439E8 4406B000 */ mfc1 $a2, $f22 -/* 95EBEC 802439EC 0C019E40 */ jal guTranslateF -/* 95EBF0 802439F0 00A0382D */ daddu $a3, $a1, $zero -/* 95EBF4 802439F4 27A40010 */ addiu $a0, $sp, 0x10 -/* 95EBF8 802439F8 0200282D */ daddu $a1, $s0, $zero -/* 95EBFC 802439FC 0C019D80 */ jal guMtxCatF -/* 95EC00 80243A00 00A0302D */ daddu $a2, $a1, $zero -/* 95EC04 80243A04 96220000 */ lhu $v0, ($s1) -/* 95EC08 80243A08 34421400 */ ori $v0, $v0, 0x1400 -/* 95EC0C 80243A0C 08090EA3 */ j .L80243A8C -/* 95EC10 80243A10 A6220000 */ sh $v0, ($s1) -.L80243A14: -/* 95EC14 80243A14 4480A000 */ mtc1 $zero, $f20 -/* 95EC18 80243A18 4406B000 */ mfc1 $a2, $f22 -/* 95EC1C 80243A1C 4405A000 */ mfc1 $a1, $f20 -/* 95EC20 80243A20 4407A000 */ mfc1 $a3, $f20 -/* 95EC24 80243A24 0C019E40 */ jal guTranslateF -/* 95EC28 80243A28 27A40010 */ addiu $a0, $sp, 0x10 -/* 95EC2C 80243A2C 27A40010 */ addiu $a0, $sp, 0x10 -/* 95EC30 80243A30 26300058 */ addiu $s0, $s1, 0x58 -/* 95EC34 80243A34 0200282D */ daddu $a1, $s0, $zero -/* 95EC38 80243A38 0C019D80 */ jal guMtxCatF -/* 95EC3C 80243A3C 0200302D */ daddu $a2, $s0, $zero -/* 95EC40 80243A40 4405E000 */ mfc1 $a1, $f28 -/* 95EC44 80243A44 4406D000 */ mfc1 $a2, $f26 -/* 95EC48 80243A48 4407C000 */ mfc1 $a3, $f24 -/* 95EC4C 80243A4C 0C090E20 */ jal func_80243880 -/* 95EC50 80243A50 27A40010 */ addiu $a0, $sp, 0x10 -/* 95EC54 80243A54 27A40010 */ addiu $a0, $sp, 0x10 -/* 95EC58 80243A58 0200282D */ daddu $a1, $s0, $zero -/* 95EC5C 80243A5C 0C019D80 */ jal guMtxCatF -/* 95EC60 80243A60 0200302D */ daddu $a2, $s0, $zero -/* 95EC64 80243A64 27A40010 */ addiu $a0, $sp, 0x10 -/* 95EC68 80243A68 4600B587 */ neg.s $f22, $f22 -/* 95EC6C 80243A6C 4405A000 */ mfc1 $a1, $f20 -/* 95EC70 80243A70 4406B000 */ mfc1 $a2, $f22 -/* 95EC74 80243A74 0C019E40 */ jal guTranslateF -/* 95EC78 80243A78 00A0382D */ daddu $a3, $a1, $zero -/* 95EC7C 80243A7C 27A40010 */ addiu $a0, $sp, 0x10 -/* 95EC80 80243A80 0200282D */ daddu $a1, $s0, $zero -/* 95EC84 80243A84 0C019D80 */ jal guMtxCatF -/* 95EC88 80243A88 00A0302D */ daddu $a2, $a1, $zero -.L80243A8C: -/* 95EC8C 80243A8C 8FBF005C */ lw $ra, 0x5c($sp) -/* 95EC90 80243A90 8FB20058 */ lw $s2, 0x58($sp) -/* 95EC94 80243A94 8FB10054 */ lw $s1, 0x54($sp) -/* 95EC98 80243A98 8FB00050 */ lw $s0, 0x50($sp) -/* 95EC9C 80243A9C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 95ECA0 80243AA0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 95ECA4 80243AA4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 95ECA8 80243AA8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 95ECAC 80243AAC D7B40060 */ ldc1 $f20, 0x60($sp) -/* 95ECB0 80243AB0 24020002 */ addiu $v0, $zero, 2 -/* 95ECB4 80243AB4 03E00008 */ jr $ra -/* 95ECB8 80243AB8 27BD0088 */ addiu $sp, $sp, 0x88 -/* 95ECBC 80243ABC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_02/func_80240124_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/func_80240124_9691C0.s deleted file mode 100644 index 4b2108a004..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/func_80240124_9691C0.s +++ /dev/null @@ -1,128 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_9692E4 -/* 9692E4 80240124 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 9692E8 80240128 AFB10034 */ sw $s1, 0x34($sp) -/* 9692EC 8024012C 0080882D */ daddu $s1, $a0, $zero -/* 9692F0 80240130 AFBF0054 */ sw $ra, 0x54($sp) -/* 9692F4 80240134 AFBE0050 */ sw $fp, 0x50($sp) -/* 9692F8 80240138 AFB7004C */ sw $s7, 0x4c($sp) -/* 9692FC 8024013C AFB60048 */ sw $s6, 0x48($sp) -/* 969300 80240140 AFB50044 */ sw $s5, 0x44($sp) -/* 969304 80240144 AFB40040 */ sw $s4, 0x40($sp) -/* 969308 80240148 AFB3003C */ sw $s3, 0x3c($sp) -/* 96930C 8024014C AFB20038 */ sw $s2, 0x38($sp) -/* 969310 80240150 AFB00030 */ sw $s0, 0x30($sp) -/* 969314 80240154 8E30000C */ lw $s0, 0xc($s1) -/* 969318 80240158 8E050000 */ lw $a1, ($s0) -/* 96931C 8024015C 0C0B1EAF */ jal get_variable -/* 969320 80240160 26100004 */ addiu $s0, $s0, 4 -/* 969324 80240164 8E050000 */ lw $a1, ($s0) -/* 969328 80240168 26100004 */ addiu $s0, $s0, 4 -/* 96932C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 969330 80240170 0C0B1EAF */ jal get_variable -/* 969334 80240174 0040982D */ daddu $s3, $v0, $zero -/* 969338 80240178 8E050000 */ lw $a1, ($s0) -/* 96933C 8024017C 26100004 */ addiu $s0, $s0, 4 -/* 969340 80240180 0220202D */ daddu $a0, $s1, $zero -/* 969344 80240184 0C0B1EAF */ jal get_variable -/* 969348 80240188 0040B02D */ daddu $s6, $v0, $zero -/* 96934C 8024018C 8E050000 */ lw $a1, ($s0) -/* 969350 80240190 26100004 */ addiu $s0, $s0, 4 -/* 969354 80240194 0220202D */ daddu $a0, $s1, $zero -/* 969358 80240198 0C0B1EAF */ jal get_variable -/* 96935C 8024019C 0040A82D */ daddu $s5, $v0, $zero -/* 969360 802401A0 8E050000 */ lw $a1, ($s0) -/* 969364 802401A4 26100004 */ addiu $s0, $s0, 4 -/* 969368 802401A8 0220202D */ daddu $a0, $s1, $zero -/* 96936C 802401AC 0C0B1EAF */ jal get_variable -/* 969370 802401B0 0040A02D */ daddu $s4, $v0, $zero -/* 969374 802401B4 8E050000 */ lw $a1, ($s0) -/* 969378 802401B8 26100004 */ addiu $s0, $s0, 4 -/* 96937C 802401BC 0220202D */ daddu $a0, $s1, $zero -/* 969380 802401C0 0C0B1EAF */ jal get_variable -/* 969384 802401C4 0040902D */ daddu $s2, $v0, $zero -/* 969388 802401C8 8E050000 */ lw $a1, ($s0) -/* 96938C 802401CC 26100004 */ addiu $s0, $s0, 4 -/* 969390 802401D0 0220202D */ daddu $a0, $s1, $zero -/* 969394 802401D4 0C0B1EAF */ jal get_variable -/* 969398 802401D8 AFA20028 */ sw $v0, 0x28($sp) -/* 96939C 802401DC 8E050000 */ lw $a1, ($s0) -/* 9693A0 802401E0 26100004 */ addiu $s0, $s0, 4 -/* 9693A4 802401E4 0220202D */ daddu $a0, $s1, $zero -/* 9693A8 802401E8 0C0B1EAF */ jal get_variable -/* 9693AC 802401EC 0040F02D */ daddu $fp, $v0, $zero -/* 9693B0 802401F0 8E050000 */ lw $a1, ($s0) -/* 9693B4 802401F4 26100004 */ addiu $s0, $s0, 4 -/* 9693B8 802401F8 0220202D */ daddu $a0, $s1, $zero -/* 9693BC 802401FC 0C0B1EAF */ jal get_variable -/* 9693C0 80240200 0040B82D */ daddu $s7, $v0, $zero -/* 9693C4 80240204 0220202D */ daddu $a0, $s1, $zero -/* 9693C8 80240208 8E050000 */ lw $a1, ($s0) -/* 9693CC 8024020C 0C0B1EAF */ jal get_variable -/* 9693D0 80240210 0040802D */ daddu $s0, $v0, $zero -/* 9693D4 80240214 0040182D */ daddu $v1, $v0, $zero -/* 9693D8 80240218 24020002 */ addiu $v0, $zero, 2 -/* 9693DC 8024021C 12620012 */ beq $s3, $v0, .L80240268 -/* 9693E0 80240220 2A620003 */ slti $v0, $s3, 3 -/* 9693E4 80240224 10400005 */ beqz $v0, .L8024023C -/* 9693E8 80240228 24020001 */ addiu $v0, $zero, 1 -/* 9693EC 8024022C 12620008 */ beq $s3, $v0, .L80240250 -/* 9693F0 80240230 32C400FF */ andi $a0, $s6, 0xff -/* 9693F4 80240234 080900B1 */ j .L802402C4 -/* 9693F8 80240238 00000000 */ nop -.L8024023C: -/* 9693FC 8024023C 24020003 */ addiu $v0, $zero, 3 -/* 969400 80240240 12620018 */ beq $s3, $v0, .L802402A4 -/* 969404 80240244 32C400FF */ andi $a0, $s6, 0xff -/* 969408 80240248 080900B1 */ j .L802402C4 -/* 96940C 8024024C 00000000 */ nop -.L80240250: -/* 969410 80240250 32A500FF */ andi $a1, $s5, 0xff -/* 969414 80240254 328600FF */ andi $a2, $s4, 0xff -/* 969418 80240258 0C046F97 */ jal set_background_color_blend -/* 96941C 8024025C 324700FF */ andi $a3, $s2, 0xff -/* 969420 80240260 080900B1 */ j .L802402C4 -/* 969424 80240264 00000000 */ nop -.L80240268: -/* 969428 80240268 32C400FF */ andi $a0, $s6, 0xff -/* 96942C 8024026C 32A500FF */ andi $a1, $s5, 0xff -/* 969430 80240270 328600FF */ andi $a2, $s4, 0xff -/* 969434 80240274 324700FF */ andi $a3, $s2, 0xff -/* 969438 80240278 93A2002B */ lbu $v0, 0x2b($sp) -/* 96943C 8024027C AFB0001C */ sw $s0, 0x1c($sp) -/* 969440 80240280 AFA30020 */ sw $v1, 0x20($sp) -/* 969444 80240284 AFA20010 */ sw $v0, 0x10($sp) -/* 969448 80240288 33C200FF */ andi $v0, $fp, 0xff -/* 96944C 8024028C AFA20014 */ sw $v0, 0x14($sp) -/* 969450 80240290 32E200FF */ andi $v0, $s7, 0xff -/* 969454 80240294 0C046FAD */ jal func_8011BEB4 -/* 969458 80240298 AFA20018 */ sw $v0, 0x18($sp) -/* 96945C 8024029C 080900B1 */ j .L802402C4 -/* 969460 802402A0 00000000 */ nop -.L802402A4: -/* 969464 802402A4 32A500FF */ andi $a1, $s5, 0xff -/* 969468 802402A8 328600FF */ andi $a2, $s4, 0xff -/* 96946C 802402AC 324700FF */ andi $a3, $s2, 0xff -/* 969470 802402B0 93A2002B */ lbu $v0, 0x2b($sp) -/* 969474 802402B4 AFA20010 */ sw $v0, 0x10($sp) -/* 969478 802402B8 33C200FF */ andi $v0, $fp, 0xff -/* 96947C 802402BC 0C046FE6 */ jal func_8011BF98 -/* 969480 802402C0 AFA20014 */ sw $v0, 0x14($sp) -.L802402C4: -/* 969484 802402C4 8FBF0054 */ lw $ra, 0x54($sp) -/* 969488 802402C8 8FBE0050 */ lw $fp, 0x50($sp) -/* 96948C 802402CC 8FB7004C */ lw $s7, 0x4c($sp) -/* 969490 802402D0 8FB60048 */ lw $s6, 0x48($sp) -/* 969494 802402D4 8FB50044 */ lw $s5, 0x44($sp) -/* 969498 802402D8 8FB40040 */ lw $s4, 0x40($sp) -/* 96949C 802402DC 8FB3003C */ lw $s3, 0x3c($sp) -/* 9694A0 802402E0 8FB20038 */ lw $s2, 0x38($sp) -/* 9694A4 802402E4 8FB10034 */ lw $s1, 0x34($sp) -/* 9694A8 802402E8 8FB00030 */ lw $s0, 0x30($sp) -/* 9694AC 802402EC 24020002 */ addiu $v0, $zero, 2 -/* 9694B0 802402F0 03E00008 */ jr $ra -/* 9694B4 802402F4 27BD0058 */ addiu $sp, $sp, 0x58 -/* 9694B8 802402F8 00000000 */ nop -/* 9694BC 802402FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_02/func_80240300_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/func_80240300_9691C0.s deleted file mode 100644 index 06889b3548..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/func_80240300_9691C0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240300_9694C0 -/* 9694C0 80240300 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9694C4 80240304 AFB00010 */ sw $s0, 0x10($sp) -/* 9694C8 80240308 3C108024 */ lui $s0, 0x8024 -/* 9694CC 8024030C 26104DE0 */ addiu $s0, $s0, 0x4de0 -/* 9694D0 80240310 AFBF0018 */ sw $ra, 0x18($sp) -/* 9694D4 80240314 AFB10014 */ sw $s1, 0x14($sp) -/* 9694D8 80240318 8E020000 */ lw $v0, ($s0) -/* 9694DC 8024031C 14400010 */ bnez $v0, .L80240360 -/* 9694E0 80240320 0080882D */ daddu $s1, $a0, $zero -/* 9694E4 80240324 0C00AB39 */ jal heap_malloc -/* 9694E8 80240328 24040040 */ addiu $a0, $zero, 0x40 -/* 9694EC 8024032C AE020000 */ sw $v0, ($s0) -/* 9694F0 80240330 0000182D */ daddu $v1, $zero, $zero -/* 9694F4 80240334 0040282D */ daddu $a1, $v0, $zero -/* 9694F8 80240338 0220202D */ daddu $a0, $s1, $zero -.L8024033C: -/* 9694FC 8024033C 8C820084 */ lw $v0, 0x84($a0) -/* 969500 80240340 24840004 */ addiu $a0, $a0, 4 -/* 969504 80240344 24630001 */ addiu $v1, $v1, 1 -/* 969508 80240348 ACA20000 */ sw $v0, ($a1) -/* 96950C 8024034C 28620010 */ slti $v0, $v1, 0x10 -/* 969510 80240350 1440FFFA */ bnez $v0, .L8024033C -/* 969514 80240354 24A50004 */ addiu $a1, $a1, 4 -/* 969518 80240358 080900E7 */ j .L8024039C -/* 96951C 8024035C 00000000 */ nop -.L80240360: -/* 969520 80240360 0000182D */ daddu $v1, $zero, $zero -/* 969524 80240364 0040282D */ daddu $a1, $v0, $zero -/* 969528 80240368 0220202D */ daddu $a0, $s1, $zero -.L8024036C: -/* 96952C 8024036C 8CA20000 */ lw $v0, ($a1) -/* 969530 80240370 24A50004 */ addiu $a1, $a1, 4 -/* 969534 80240374 24630001 */ addiu $v1, $v1, 1 -/* 969538 80240378 AC820084 */ sw $v0, 0x84($a0) -/* 96953C 8024037C 28620010 */ slti $v0, $v1, 0x10 -/* 969540 80240380 1440FFFA */ bnez $v0, .L8024036C -/* 969544 80240384 24840004 */ addiu $a0, $a0, 4 -/* 969548 80240388 3C108024 */ lui $s0, 0x8024 -/* 96954C 8024038C 26104DE0 */ addiu $s0, $s0, 0x4de0 -/* 969550 80240390 0C00AB4B */ jal heap_free -/* 969554 80240394 8E040000 */ lw $a0, ($s0) -/* 969558 80240398 AE000000 */ sw $zero, ($s0) -.L8024039C: -/* 96955C 8024039C 8FBF0018 */ lw $ra, 0x18($sp) -/* 969560 802403A0 8FB10014 */ lw $s1, 0x14($sp) -/* 969564 802403A4 8FB00010 */ lw $s0, 0x10($sp) -/* 969568 802403A8 24020002 */ addiu $v0, $zero, 2 -/* 96956C 802403AC 03E00008 */ jr $ra -/* 969570 802403B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/func_802403B4_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/func_802403B4_9691C0.s deleted file mode 100644 index 9f49ee3cc5..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/func_802403B4_9691C0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403B4_969574 -/* 969574 802403B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 969578 802403B8 AFB00010 */ sw $s0, 0x10($sp) -/* 96957C 802403BC 0080802D */ daddu $s0, $a0, $zero -/* 969580 802403C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 969584 802403C4 AFB10014 */ sw $s1, 0x14($sp) -/* 969588 802403C8 8E02000C */ lw $v0, 0xc($s0) -/* 96958C 802403CC 8C510000 */ lw $s1, ($v0) -/* 969590 802403D0 0C0B1EAF */ jal get_variable -/* 969594 802403D4 0220282D */ daddu $a1, $s1, $zero -/* 969598 802403D8 3C03FFF0 */ lui $v1, 0xfff0 -/* 96959C 802403DC 3463FFFF */ ori $v1, $v1, 0xffff -/* 9695A0 802403E0 0200202D */ daddu $a0, $s0, $zero -/* 9695A4 802403E4 00431024 */ and $v0, $v0, $v1 -/* 9695A8 802403E8 00021140 */ sll $v0, $v0, 5 -/* 9695AC 802403EC 3C068008 */ lui $a2, %hi(gItemTable) -/* 9695B0 802403F0 00C23021 */ addu $a2, $a2, $v0 -/* 9695B4 802403F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 9695B8 802403F8 0C0B2026 */ jal set_variable -/* 9695BC 802403FC 0220282D */ daddu $a1, $s1, $zero -/* 9695C0 80240400 8FBF0018 */ lw $ra, 0x18($sp) -/* 9695C4 80240404 8FB10014 */ lw $s1, 0x14($sp) -/* 9695C8 80240408 8FB00010 */ lw $s0, 0x10($sp) -/* 9695CC 8024040C 24020002 */ addiu $v0, $zero, 2 -/* 9695D0 80240410 03E00008 */ jr $ra -/* 9695D4 80240414 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/func_80240418_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/func_80240418_9691C0.s deleted file mode 100644 index a2c503ecc0..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/func_80240418_9691C0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240418_9695D8 -/* 9695D8 80240418 24020001 */ addiu $v0, $zero, 1 -/* 9695DC 8024041C 3C018015 */ lui $at, %hi(D_80151310) -/* 9695E0 80240420 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 9695E4 80240424 03E00008 */ jr $ra -/* 9695E8 80240428 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_02/func_8024042C_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/func_8024042C_9691C0.s deleted file mode 100644 index 67a3458f14..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/func_8024042C_9691C0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024042C_9695EC -/* 9695EC 8024042C 3C018015 */ lui $at, %hi(D_80151310) -/* 9695F0 80240430 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 9695F4 80240434 03E00008 */ jr $ra -/* 9695F8 80240438 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_02/func_802406AC_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/func_802406AC_9691C0.s deleted file mode 100644 index 5726597c6e..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/func_802406AC_9691C0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406AC_96986C -/* 96986C 802406AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 969870 802406B0 AFBF0010 */ sw $ra, 0x10($sp) -/* 969874 802406B4 0C00EABB */ jal get_npc_unsafe -/* 969878 802406B8 8C84014C */ lw $a0, 0x14c($a0) -/* 96987C 802406BC 8FBF0010 */ lw $ra, 0x10($sp) -/* 969880 802406C0 0000102D */ daddu $v0, $zero, $zero -/* 969884 802406C4 03E00008 */ jr $ra -/* 969888 802406C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/func_80240A70_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/func_80240A70_9691C0.s deleted file mode 100644 index 0c9c4bd015..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/func_80240A70_9691C0.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A70_969C30 -/* 969C30 80240A70 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 969C34 80240A74 AFB1001C */ sw $s1, 0x1c($sp) -/* 969C38 80240A78 AFBF0020 */ sw $ra, 0x20($sp) -/* 969C3C 80240A7C AFB00018 */ sw $s0, 0x18($sp) -/* 969C40 80240A80 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 969C44 80240A84 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 969C48 80240A88 10A00060 */ beqz $a1, .L80240C0C -/* 969C4C 80240A8C 0080882D */ daddu $s1, $a0, $zero -/* 969C50 80240A90 3C05F4AC */ lui $a1, 0xf4ac -/* 969C54 80240A94 0C0B1EAF */ jal get_variable -/* 969C58 80240A98 34A5D481 */ ori $a1, $a1, 0xd481 -/* 969C5C 80240A9C 0220202D */ daddu $a0, $s1, $zero -/* 969C60 80240AA0 3C05F4AC */ lui $a1, 0xf4ac -/* 969C64 80240AA4 4482B000 */ mtc1 $v0, $f22 -/* 969C68 80240AA8 00000000 */ nop -/* 969C6C 80240AAC 4680B5A0 */ cvt.s.w $f22, $f22 -/* 969C70 80240AB0 0C0B1EAF */ jal get_variable -/* 969C74 80240AB4 34A5D482 */ ori $a1, $a1, 0xd482 -/* 969C78 80240AB8 0220202D */ daddu $a0, $s1, $zero -/* 969C7C 80240ABC 3C05F4AC */ lui $a1, 0xf4ac -/* 969C80 80240AC0 4482A000 */ mtc1 $v0, $f20 -/* 969C84 80240AC4 00000000 */ nop -/* 969C88 80240AC8 4680A520 */ cvt.s.w $f20, $f20 -/* 969C8C 80240ACC 0C0B1EAF */ jal get_variable -/* 969C90 80240AD0 34A5D483 */ ori $a1, $a1, 0xd483 -/* 969C94 80240AD4 44821000 */ mtc1 $v0, $f2 -/* 969C98 80240AD8 00000000 */ nop -/* 969C9C 80240ADC 468010A0 */ cvt.s.w $f2, $f2 -/* 969CA0 80240AE0 4405B000 */ mfc1 $a1, $f22 -/* 969CA4 80240AE4 4406A000 */ mfc1 $a2, $f20 -/* 969CA8 80240AE8 44071000 */ mfc1 $a3, $f2 -/* 969CAC 80240AEC 0C01C574 */ jal func_800715D0 -/* 969CB0 80240AF0 0000202D */ daddu $a0, $zero, $zero -/* 969CB4 80240AF4 0220202D */ daddu $a0, $s1, $zero -/* 969CB8 80240AF8 3C05F4AC */ lui $a1, 0xf4ac -/* 969CBC 80240AFC 34A5D481 */ ori $a1, $a1, 0xd481 -/* 969CC0 80240B00 3C108025 */ lui $s0, 0x8025 -/* 969CC4 80240B04 2610EFC0 */ addiu $s0, $s0, -0x1040 -/* 969CC8 80240B08 0C0B1EAF */ jal get_variable -/* 969CCC 80240B0C AE020000 */ sw $v0, ($s0) -/* 969CD0 80240B10 0220202D */ daddu $a0, $s1, $zero -/* 969CD4 80240B14 3C05F4AC */ lui $a1, 0xf4ac -/* 969CD8 80240B18 4482B000 */ mtc1 $v0, $f22 -/* 969CDC 80240B1C 00000000 */ nop -/* 969CE0 80240B20 4680B5A0 */ cvt.s.w $f22, $f22 -/* 969CE4 80240B24 0C0B1EAF */ jal get_variable -/* 969CE8 80240B28 34A5D482 */ ori $a1, $a1, 0xd482 -/* 969CEC 80240B2C 0220202D */ daddu $a0, $s1, $zero -/* 969CF0 80240B30 3C05F4AC */ lui $a1, 0xf4ac -/* 969CF4 80240B34 4482A000 */ mtc1 $v0, $f20 -/* 969CF8 80240B38 00000000 */ nop -/* 969CFC 80240B3C 4680A520 */ cvt.s.w $f20, $f20 -/* 969D00 80240B40 0C0B1EAF */ jal get_variable -/* 969D04 80240B44 34A5D483 */ ori $a1, $a1, 0xd483 -/* 969D08 80240B48 44821000 */ mtc1 $v0, $f2 -/* 969D0C 80240B4C 00000000 */ nop -/* 969D10 80240B50 468010A0 */ cvt.s.w $f2, $f2 -/* 969D14 80240B54 4405B000 */ mfc1 $a1, $f22 -/* 969D18 80240B58 4406A000 */ mfc1 $a2, $f20 -/* 969D1C 80240B5C 44071000 */ mfc1 $a3, $f2 -/* 969D20 80240B60 0C01C604 */ jal func_80071810 -/* 969D24 80240B64 0000202D */ daddu $a0, $zero, $zero -/* 969D28 80240B68 0220202D */ daddu $a0, $s1, $zero -/* 969D2C 80240B6C 3C05F4AC */ lui $a1, 0xf4ac -/* 969D30 80240B70 3C018025 */ lui $at, 0x8025 -/* 969D34 80240B74 AC22EFC4 */ sw $v0, -0x103c($at) -/* 969D38 80240B78 0C0B1EAF */ jal get_variable -/* 969D3C 80240B7C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 969D40 80240B80 0220202D */ daddu $a0, $s1, $zero -/* 969D44 80240B84 3C05F4AC */ lui $a1, 0xf4ac -/* 969D48 80240B88 4482B000 */ mtc1 $v0, $f22 -/* 969D4C 80240B8C 00000000 */ nop -/* 969D50 80240B90 4680B5A0 */ cvt.s.w $f22, $f22 -/* 969D54 80240B94 0C0B1EAF */ jal get_variable -/* 969D58 80240B98 34A5D482 */ ori $a1, $a1, 0xd482 -/* 969D5C 80240B9C 0220202D */ daddu $a0, $s1, $zero -/* 969D60 80240BA0 3C05F4AC */ lui $a1, 0xf4ac -/* 969D64 80240BA4 4482A000 */ mtc1 $v0, $f20 -/* 969D68 80240BA8 00000000 */ nop -/* 969D6C 80240BAC 4680A520 */ cvt.s.w $f20, $f20 -/* 969D70 80240BB0 0C0B1EAF */ jal get_variable -/* 969D74 80240BB4 34A5D483 */ ori $a1, $a1, 0xd483 -/* 969D78 80240BB8 44821000 */ mtc1 $v0, $f2 -/* 969D7C 80240BBC 00000000 */ nop -/* 969D80 80240BC0 468010A0 */ cvt.s.w $f2, $f2 -/* 969D84 80240BC4 4405B000 */ mfc1 $a1, $f22 -/* 969D88 80240BC8 4406A000 */ mfc1 $a2, $f20 -/* 969D8C 80240BCC 3C013F80 */ lui $at, 0x3f80 -/* 969D90 80240BD0 44810000 */ mtc1 $at, $f0 -/* 969D94 80240BD4 44071000 */ mfc1 $a3, $f2 -/* 969D98 80240BD8 0000202D */ daddu $a0, $zero, $zero -/* 969D9C 80240BDC AFA00014 */ sw $zero, 0x14($sp) -/* 969DA0 80240BE0 0C01CA24 */ jal func_80072890 -/* 969DA4 80240BE4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 969DA8 80240BE8 8E030000 */ lw $v1, ($s0) -/* 969DAC 80240BEC 8C64000C */ lw $a0, 0xc($v1) -/* 969DB0 80240BF0 3C018025 */ lui $at, 0x8025 -/* 969DB4 80240BF4 AC22EFC8 */ sw $v0, -0x1038($at) -/* 969DB8 80240BF8 AC800018 */ sw $zero, 0x18($a0) -/* 969DBC 80240BFC AC800020 */ sw $zero, 0x20($a0) -/* 969DC0 80240C00 AC800024 */ sw $zero, 0x24($a0) -/* 969DC4 80240C04 AC800028 */ sw $zero, 0x28($a0) -/* 969DC8 80240C08 AC80001C */ sw $zero, 0x1c($a0) -.L80240C0C: -/* 969DCC 80240C0C 3C028025 */ lui $v0, 0x8025 -/* 969DD0 80240C10 8C42EFC0 */ lw $v0, -0x1040($v0) -/* 969DD4 80240C14 8C44000C */ lw $a0, 0xc($v0) -/* 969DD8 80240C18 8C820020 */ lw $v0, 0x20($a0) -/* 969DDC 80240C1C 8C830028 */ lw $v1, 0x28($a0) -/* 969DE0 80240C20 2442000A */ addiu $v0, $v0, 0xa -/* 969DE4 80240C24 AC820020 */ sw $v0, 0x20($a0) -/* 969DE8 80240C28 8C820024 */ lw $v0, 0x24($a0) -/* 969DEC 80240C2C 2463000A */ addiu $v1, $v1, 0xa -/* 969DF0 80240C30 AC830028 */ sw $v1, 0x28($a0) -/* 969DF4 80240C34 8C830018 */ lw $v1, 0x18($a0) -/* 969DF8 80240C38 2442000A */ addiu $v0, $v0, 0xa -/* 969DFC 80240C3C AC820024 */ sw $v0, 0x24($a0) -/* 969E00 80240C40 8C82001C */ lw $v0, 0x1c($a0) -/* 969E04 80240C44 2463000A */ addiu $v1, $v1, 0xa -/* 969E08 80240C48 AC830018 */ sw $v1, 0x18($a0) -/* 969E0C 80240C4C 286300FF */ slti $v1, $v1, 0xff -/* 969E10 80240C50 2442000A */ addiu $v0, $v0, 0xa -/* 969E14 80240C54 AC82001C */ sw $v0, 0x1c($a0) -/* 969E18 80240C58 14600004 */ bnez $v1, .L80240C6C -/* 969E1C 80240C5C 0000102D */ daddu $v0, $zero, $zero -/* 969E20 80240C60 240200FF */ addiu $v0, $zero, 0xff -/* 969E24 80240C64 AC820018 */ sw $v0, 0x18($a0) -/* 969E28 80240C68 24020002 */ addiu $v0, $zero, 2 -.L80240C6C: -/* 969E2C 80240C6C 8FBF0020 */ lw $ra, 0x20($sp) -/* 969E30 80240C70 8FB1001C */ lw $s1, 0x1c($sp) -/* 969E34 80240C74 8FB00018 */ lw $s0, 0x18($sp) -/* 969E38 80240C78 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 969E3C 80240C7C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 969E40 80240C80 03E00008 */ jr $ra -/* 969E44 80240C84 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dro/dro_02/func_80240D3C_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/func_80240D3C_9691C0.s deleted file mode 100644 index 73011eae1d..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/func_80240D3C_9691C0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_969EFC -/* 969EFC 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 969F00 80240D40 AFBF0010 */ sw $ra, 0x10($sp) -/* 969F04 80240D44 8C82000C */ lw $v0, 0xc($a0) -/* 969F08 80240D48 0C0B1EAF */ jal get_variable -/* 969F0C 80240D4C 8C450000 */ lw $a1, ($v0) -/* 969F10 80240D50 3C038025 */ lui $v1, 0x8025 -/* 969F14 80240D54 8C63EFC0 */ lw $v1, -0x1040($v1) -/* 969F18 80240D58 8C63000C */ lw $v1, 0xc($v1) -/* 969F1C 80240D5C AC620034 */ sw $v0, 0x34($v1) -/* 969F20 80240D60 8FBF0010 */ lw $ra, 0x10($sp) -/* 969F24 80240D64 24020002 */ addiu $v0, $zero, 2 -/* 969F28 80240D68 03E00008 */ jr $ra -/* 969F2C 80240D6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/func_80240D70_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/func_80240D70_9691C0.s deleted file mode 100644 index c87c6e9ad4..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/func_80240D70_9691C0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D70_969F30 -/* 969F30 80240D70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 969F34 80240D74 AFBF0010 */ sw $ra, 0x10($sp) -/* 969F38 80240D78 8C82000C */ lw $v0, 0xc($a0) -/* 969F3C 80240D7C 0C0B1EAF */ jal get_variable -/* 969F40 80240D80 8C450000 */ lw $a1, ($v0) -/* 969F44 80240D84 0040202D */ daddu $a0, $v0, $zero -/* 969F48 80240D88 3C028025 */ lui $v0, 0x8025 -/* 969F4C 80240D8C 8C42EFC0 */ lw $v0, -0x1040($v0) -/* 969F50 80240D90 24030001 */ addiu $v1, $zero, 1 -/* 969F54 80240D94 8C45000C */ lw $a1, 0xc($v0) -/* 969F58 80240D98 1083000D */ beq $a0, $v1, .L80240DD0 -/* 969F5C 80240D9C 28820002 */ slti $v0, $a0, 2 -/* 969F60 80240DA0 10400005 */ beqz $v0, .L80240DB8 -/* 969F64 80240DA4 24020002 */ addiu $v0, $zero, 2 -/* 969F68 80240DA8 10800007 */ beqz $a0, .L80240DC8 -/* 969F6C 80240DAC 240200C0 */ addiu $v0, $zero, 0xc0 -/* 969F70 80240DB0 08090378 */ j .L80240DE0 -/* 969F74 80240DB4 ACA00038 */ sw $zero, 0x38($a1) -.L80240DB8: -/* 969F78 80240DB8 10820008 */ beq $a0, $v0, .L80240DDC -/* 969F7C 80240DBC 24020040 */ addiu $v0, $zero, 0x40 -/* 969F80 80240DC0 08090378 */ j .L80240DE0 -/* 969F84 80240DC4 ACA00038 */ sw $zero, 0x38($a1) -.L80240DC8: -/* 969F88 80240DC8 08090378 */ j .L80240DE0 -/* 969F8C 80240DCC ACA20038 */ sw $v0, 0x38($a1) -.L80240DD0: -/* 969F90 80240DD0 24020080 */ addiu $v0, $zero, 0x80 -/* 969F94 80240DD4 08090378 */ j .L80240DE0 -/* 969F98 80240DD8 ACA20038 */ sw $v0, 0x38($a1) -.L80240DDC: -/* 969F9C 80240DDC ACA20038 */ sw $v0, 0x38($a1) -.L80240DE0: -/* 969FA0 80240DE0 8FBF0010 */ lw $ra, 0x10($sp) -/* 969FA4 80240DE4 24020002 */ addiu $v0, $zero, 2 -/* 969FA8 80240DE8 03E00008 */ jr $ra -/* 969FAC 80240DEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/func_80240DF0_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/func_80240DF0_9691C0.s deleted file mode 100644 index 316c997580..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/func_80240DF0_9691C0.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF0_969FB0 -/* 969FB0 80240DF0 3C028025 */ lui $v0, 0x8025 -/* 969FB4 80240DF4 8C42EFC8 */ lw $v0, -0x1038($v0) -/* 969FB8 80240DF8 8C42000C */ lw $v0, 0xc($v0) -/* 969FBC 80240DFC AC40001C */ sw $zero, 0x1c($v0) -/* 969FC0 80240E00 03E00008 */ jr $ra -/* 969FC4 80240E04 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_02/func_80241210_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/func_80241210_9691C0.s deleted file mode 100644 index 1311c901c0..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/func_80241210_9691C0.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241210_96A3D0 -/* 96A3D0 80241210 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 96A3D4 80241214 AFB10014 */ sw $s1, 0x14($sp) -/* 96A3D8 80241218 0080882D */ daddu $s1, $a0, $zero -/* 96A3DC 8024121C AFB00010 */ sw $s0, 0x10($sp) -/* 96A3E0 80241220 00A0802D */ daddu $s0, $a1, $zero -/* 96A3E4 80241224 AFBF001C */ sw $ra, 0x1c($sp) -/* 96A3E8 80241228 AFB20018 */ sw $s2, 0x18($sp) -/* 96A3EC 8024122C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 96A3F0 80241230 0C00EABB */ jal get_npc_unsafe -/* 96A3F4 80241234 2404FFFC */ addiu $a0, $zero, -4 -/* 96A3F8 80241238 12000017 */ beqz $s0, .L80241298 -/* 96A3FC 8024123C 0040902D */ daddu $s2, $v0, $zero -/* 96A400 80241240 0220202D */ daddu $a0, $s1, $zero -/* 96A404 80241244 3C05FE36 */ lui $a1, 0xfe36 -/* 96A408 80241248 0C0B210B */ jal get_float_variable -/* 96A40C 8024124C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 96A410 80241250 0220202D */ daddu $a0, $s1, $zero -/* 96A414 80241254 3C05FE36 */ lui $a1, 0xfe36 -/* 96A418 80241258 3C014270 */ lui $at, 0x4270 -/* 96A41C 8024125C 4481A000 */ mtc1 $at, $f20 -/* 96A420 80241260 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 96A424 80241264 46140003 */ div.s $f0, $f0, $f20 -/* 96A428 80241268 0C0B210B */ jal get_float_variable -/* 96A42C 8024126C E6200074 */ swc1 $f0, 0x74($s1) -/* 96A430 80241270 0220202D */ daddu $a0, $s1, $zero -/* 96A434 80241274 3C05FE36 */ lui $a1, 0xfe36 -/* 96A438 80241278 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 96A43C 8024127C 46140003 */ div.s $f0, $f0, $f20 -/* 96A440 80241280 0C0B210B */ jal get_float_variable -/* 96A444 80241284 E6200078 */ swc1 $f0, 0x78($s1) -/* 96A448 80241288 46140003 */ div.s $f0, $f0, $f20 -/* 96A44C 8024128C 2402003C */ addiu $v0, $zero, 0x3c -/* 96A450 80241290 E620007C */ swc1 $f0, 0x7c($s1) -/* 96A454 80241294 AE220070 */ sw $v0, 0x70($s1) -.L80241298: -/* 96A458 80241298 C6400038 */ lwc1 $f0, 0x38($s2) -/* 96A45C 8024129C C6220074 */ lwc1 $f2, 0x74($s1) -/* 96A460 802412A0 46020000 */ add.s $f0, $f0, $f2 -/* 96A464 802412A4 E6400038 */ swc1 $f0, 0x38($s2) -/* 96A468 802412A8 C640003C */ lwc1 $f0, 0x3c($s2) -/* 96A46C 802412AC C6220078 */ lwc1 $f2, 0x78($s1) -/* 96A470 802412B0 46020000 */ add.s $f0, $f0, $f2 -/* 96A474 802412B4 E640003C */ swc1 $f0, 0x3c($s2) -/* 96A478 802412B8 C6400040 */ lwc1 $f0, 0x40($s2) -/* 96A47C 802412BC C622007C */ lwc1 $f2, 0x7c($s1) -/* 96A480 802412C0 46020000 */ add.s $f0, $f0, $f2 -/* 96A484 802412C4 E6400040 */ swc1 $f0, 0x40($s2) -/* 96A488 802412C8 8E230070 */ lw $v1, 0x70($s1) -/* 96A48C 802412CC 2463FFFF */ addiu $v1, $v1, -1 -/* 96A490 802412D0 2C620001 */ sltiu $v0, $v1, 1 -/* 96A494 802412D4 AE230070 */ sw $v1, 0x70($s1) -/* 96A498 802412D8 8FBF001C */ lw $ra, 0x1c($sp) -/* 96A49C 802412DC 8FB20018 */ lw $s2, 0x18($sp) -/* 96A4A0 802412E0 8FB10014 */ lw $s1, 0x14($sp) -/* 96A4A4 802412E4 8FB00010 */ lw $s0, 0x10($sp) -/* 96A4A8 802412E8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 96A4AC 802412EC 00021040 */ sll $v0, $v0, 1 -/* 96A4B0 802412F0 03E00008 */ jr $ra -/* 96A4B4 802412F4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_02/func_802412F8_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/func_802412F8_9691C0.s deleted file mode 100644 index e8f3e6e374..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/func_802412F8_9691C0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412F8_96A4B8 -/* 96A4B8 802412F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96A4BC 802412FC 3C058025 */ lui $a1, 0x8025 -/* 96A4C0 80241300 8CA5EFB8 */ lw $a1, -0x1048($a1) -/* 96A4C4 80241304 AFBF0010 */ sw $ra, 0x10($sp) -/* 96A4C8 80241308 0C0B1EAF */ jal get_variable -/* 96A4CC 8024130C 0000202D */ daddu $a0, $zero, $zero -/* 96A4D0 80241310 0040182D */ daddu $v1, $v0, $zero -/* 96A4D4 80241314 24020001 */ addiu $v0, $zero, 1 -/* 96A4D8 80241318 14620006 */ bne $v1, $v0, .L80241334 -/* 96A4DC 8024131C 24020002 */ addiu $v0, $zero, 2 -/* 96A4E0 80241320 44800000 */ mtc1 $zero, $f0 -/* 96A4E4 80241324 00000000 */ nop -/* 96A4E8 80241328 44050000 */ mfc1 $a1, $f0 -/* 96A4EC 8024132C 080904D3 */ j .L8024134C -/* 96A4F0 80241330 0000202D */ daddu $a0, $zero, $zero -.L80241334: -/* 96A4F4 80241334 14620008 */ bne $v1, $v0, .L80241358 -/* 96A4F8 80241338 24040001 */ addiu $a0, $zero, 1 -/* 96A4FC 8024133C 44800000 */ mtc1 $zero, $f0 -/* 96A500 80241340 00000000 */ nop -/* 96A504 80241344 44050000 */ mfc1 $a1, $f0 -/* 96A508 80241348 00000000 */ nop -.L8024134C: -/* 96A50C 8024134C 00A0302D */ daddu $a2, $a1, $zero -/* 96A510 80241350 0C01C5A4 */ jal func_80071690 -/* 96A514 80241354 00A0382D */ daddu $a3, $a1, $zero -.L80241358: -/* 96A518 80241358 8FBF0010 */ lw $ra, 0x10($sp) -/* 96A51C 8024135C 03E00008 */ jr $ra -/* 96A520 80241360 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/func_80241364_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/func_80241364_9691C0.s deleted file mode 100644 index 87ece7f871..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/func_80241364_9691C0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241364_96A524 -/* 96A524 80241364 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96A528 80241368 3C058024 */ lui $a1, 0x8024 -/* 96A52C 8024136C 24A512F8 */ addiu $a1, $a1, 0x12f8 -/* 96A530 80241370 AFBF0010 */ sw $ra, 0x10($sp) -/* 96A534 80241374 0C048C8F */ jal bind_dynamic_entity_7 -/* 96A538 80241378 0000202D */ daddu $a0, $zero, $zero -/* 96A53C 8024137C 8FBF0010 */ lw $ra, 0x10($sp) -/* 96A540 80241380 3C018025 */ lui $at, 0x8025 -/* 96A544 80241384 AC22EFA0 */ sw $v0, -0x1060($at) -/* 96A548 80241388 24020002 */ addiu $v0, $zero, 2 -/* 96A54C 8024138C 03E00008 */ jr $ra -/* 96A550 80241390 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/func_802416FC_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/func_802416FC_9691C0.s deleted file mode 100644 index 6c6011589f..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/func_802416FC_9691C0.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416FC_96A8BC -/* 96A8BC 802416FC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 96A8C0 80241700 AFB20028 */ sw $s2, 0x28($sp) -/* 96A8C4 80241704 0080902D */ daddu $s2, $a0, $zero -/* 96A8C8 80241708 AFBF0030 */ sw $ra, 0x30($sp) -/* 96A8CC 8024170C AFB3002C */ sw $s3, 0x2c($sp) -/* 96A8D0 80241710 AFB10024 */ sw $s1, 0x24($sp) -/* 96A8D4 80241714 AFB00020 */ sw $s0, 0x20($sp) -/* 96A8D8 80241718 3C018025 */ lui $at, 0x8025 -/* 96A8DC 8024171C AC32EFCC */ sw $s2, -0x1034($at) -/* 96A8E0 80241720 0C04E9C1 */ jal func_8013A704 -/* 96A8E4 80241724 24040001 */ addiu $a0, $zero, 1 -/* 96A8E8 80241728 0040982D */ daddu $s3, $v0, $zero -/* 96A8EC 8024172C 0260202D */ daddu $a0, $s3, $zero -/* 96A8F0 80241730 24050005 */ addiu $a1, $zero, 5 -/* 96A8F4 80241734 2406000F */ addiu $a2, $zero, 0xf -/* 96A8F8 80241738 24070001 */ addiu $a3, $zero, 1 -/* 96A8FC 8024173C 00E0882D */ daddu $s1, $a3, $zero -/* 96A900 80241740 24100800 */ addiu $s0, $zero, 0x800 -/* 96A904 80241744 AFB10010 */ sw $s1, 0x10($sp) -/* 96A908 80241748 AFA00014 */ sw $zero, 0x14($sp) -/* 96A90C 8024174C 0C04EAA7 */ jal func_8013AA9C -/* 96A910 80241750 AFB00018 */ sw $s0, 0x18($sp) -/* 96A914 80241754 0240202D */ daddu $a0, $s2, $zero -/* 96A918 80241758 3C05F4AC */ lui $a1, 0xf4ac -/* 96A91C 8024175C 34A5D480 */ ori $a1, $a1, 0xd480 -/* 96A920 80241760 0C0B2026 */ jal set_variable -/* 96A924 80241764 0260302D */ daddu $a2, $s3, $zero -/* 96A928 80241768 0C04E9C1 */ jal func_8013A704 -/* 96A92C 8024176C 24040001 */ addiu $a0, $zero, 1 -/* 96A930 80241770 0040982D */ daddu $s3, $v0, $zero -/* 96A934 80241774 0260202D */ daddu $a0, $s3, $zero -/* 96A938 80241778 24050005 */ addiu $a1, $zero, 5 -/* 96A93C 8024177C 24060010 */ addiu $a2, $zero, 0x10 -/* 96A940 80241780 24070001 */ addiu $a3, $zero, 1 -/* 96A944 80241784 AFB10010 */ sw $s1, 0x10($sp) -/* 96A948 80241788 AFA00014 */ sw $zero, 0x14($sp) -/* 96A94C 8024178C 0C04EAA7 */ jal func_8013AA9C -/* 96A950 80241790 AFB00018 */ sw $s0, 0x18($sp) -/* 96A954 80241794 0240202D */ daddu $a0, $s2, $zero -/* 96A958 80241798 3C05F4AC */ lui $a1, 0xf4ac -/* 96A95C 8024179C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 96A960 802417A0 0C0B2026 */ jal set_variable -/* 96A964 802417A4 0260302D */ daddu $a2, $s3, $zero -/* 96A968 802417A8 0C04E9C1 */ jal func_8013A704 -/* 96A96C 802417AC 24040001 */ addiu $a0, $zero, 1 -/* 96A970 802417B0 0040982D */ daddu $s3, $v0, $zero -/* 96A974 802417B4 0260202D */ daddu $a0, $s3, $zero -/* 96A978 802417B8 24050005 */ addiu $a1, $zero, 5 -/* 96A97C 802417BC 24060011 */ addiu $a2, $zero, 0x11 -/* 96A980 802417C0 24070001 */ addiu $a3, $zero, 1 -/* 96A984 802417C4 AFB10010 */ sw $s1, 0x10($sp) -/* 96A988 802417C8 AFA00014 */ sw $zero, 0x14($sp) -/* 96A98C 802417CC 0C04EAA7 */ jal func_8013AA9C -/* 96A990 802417D0 AFB00018 */ sw $s0, 0x18($sp) -/* 96A994 802417D4 0240202D */ daddu $a0, $s2, $zero -/* 96A998 802417D8 3C05F4AC */ lui $a1, 0xf4ac -/* 96A99C 802417DC 34A5D482 */ ori $a1, $a1, 0xd482 -/* 96A9A0 802417E0 0C0B2026 */ jal set_variable -/* 96A9A4 802417E4 0260302D */ daddu $a2, $s3, $zero -/* 96A9A8 802417E8 0C04E9C1 */ jal func_8013A704 -/* 96A9AC 802417EC 24040001 */ addiu $a0, $zero, 1 -/* 96A9B0 802417F0 0040982D */ daddu $s3, $v0, $zero -/* 96A9B4 802417F4 0260202D */ daddu $a0, $s3, $zero -/* 96A9B8 802417F8 24050005 */ addiu $a1, $zero, 5 -/* 96A9BC 802417FC 24060012 */ addiu $a2, $zero, 0x12 -/* 96A9C0 80241800 24070001 */ addiu $a3, $zero, 1 -/* 96A9C4 80241804 AFB10010 */ sw $s1, 0x10($sp) -/* 96A9C8 80241808 AFA00014 */ sw $zero, 0x14($sp) -/* 96A9CC 8024180C 0C04EAA7 */ jal func_8013AA9C -/* 96A9D0 80241810 AFB00018 */ sw $s0, 0x18($sp) -/* 96A9D4 80241814 0240202D */ daddu $a0, $s2, $zero -/* 96A9D8 80241818 3C05F4AC */ lui $a1, 0xf4ac -/* 96A9DC 8024181C 34A5D483 */ ori $a1, $a1, 0xd483 -/* 96A9E0 80241820 0C0B2026 */ jal set_variable -/* 96A9E4 80241824 0260302D */ daddu $a2, $s3, $zero -/* 96A9E8 80241828 3C048024 */ lui $a0, 0x8024 -/* 96A9EC 8024182C 2484240C */ addiu $a0, $a0, 0x240c -/* 96A9F0 80241830 3C058024 */ lui $a1, 0x8024 -/* 96A9F4 80241834 24A52EAC */ addiu $a1, $a1, 0x2eac -/* 96A9F8 80241838 0C048C56 */ jal bind_dynamic_entity_3 -/* 96A9FC 8024183C 00000000 */ nop -/* 96AA00 80241840 0240202D */ daddu $a0, $s2, $zero -/* 96AA04 80241844 3C05F4AC */ lui $a1, 0xf4ac -/* 96AA08 80241848 34A5D487 */ ori $a1, $a1, 0xd487 -/* 96AA0C 8024184C 0C0B2026 */ jal set_variable -/* 96AA10 80241850 0040302D */ daddu $a2, $v0, $zero -/* 96AA14 80241854 8FBF0030 */ lw $ra, 0x30($sp) -/* 96AA18 80241858 8FB3002C */ lw $s3, 0x2c($sp) -/* 96AA1C 8024185C 8FB20028 */ lw $s2, 0x28($sp) -/* 96AA20 80241860 8FB10024 */ lw $s1, 0x24($sp) -/* 96AA24 80241864 8FB00020 */ lw $s0, 0x20($sp) -/* 96AA28 80241868 24020002 */ addiu $v0, $zero, 2 -/* 96AA2C 8024186C 03E00008 */ jr $ra -/* 96AA30 80241870 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dro/dro_02/func_80241874_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/func_80241874_9691C0.s deleted file mode 100644 index 1f785747d8..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/func_80241874_9691C0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241874_96AA34 -/* 96AA34 80241874 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96AA38 80241878 AFB00010 */ sw $s0, 0x10($sp) -/* 96AA3C 8024187C 0080802D */ daddu $s0, $a0, $zero -/* 96AA40 80241880 3C05F4AC */ lui $a1, 0xf4ac -/* 96AA44 80241884 AFBF0014 */ sw $ra, 0x14($sp) -/* 96AA48 80241888 0C0B1EAF */ jal get_variable -/* 96AA4C 8024188C 34A5D480 */ ori $a1, $a1, 0xd480 -/* 96AA50 80241890 0C04EA15 */ jal func_8013A854 -/* 96AA54 80241894 0040202D */ daddu $a0, $v0, $zero -/* 96AA58 80241898 0200202D */ daddu $a0, $s0, $zero -/* 96AA5C 8024189C 3C05F4AC */ lui $a1, 0xf4ac -/* 96AA60 802418A0 0C0B1EAF */ jal get_variable -/* 96AA64 802418A4 34A5D481 */ ori $a1, $a1, 0xd481 -/* 96AA68 802418A8 0C04EA15 */ jal func_8013A854 -/* 96AA6C 802418AC 0040202D */ daddu $a0, $v0, $zero -/* 96AA70 802418B0 0200202D */ daddu $a0, $s0, $zero -/* 96AA74 802418B4 3C05F4AC */ lui $a1, 0xf4ac -/* 96AA78 802418B8 0C0B1EAF */ jal get_variable -/* 96AA7C 802418BC 34A5D482 */ ori $a1, $a1, 0xd482 -/* 96AA80 802418C0 0C04EA15 */ jal func_8013A854 -/* 96AA84 802418C4 0040202D */ daddu $a0, $v0, $zero -/* 96AA88 802418C8 0200202D */ daddu $a0, $s0, $zero -/* 96AA8C 802418CC 3C05F4AC */ lui $a1, 0xf4ac -/* 96AA90 802418D0 0C0B1EAF */ jal get_variable -/* 96AA94 802418D4 34A5D483 */ ori $a1, $a1, 0xd483 -/* 96AA98 802418D8 0C04EA15 */ jal func_8013A854 -/* 96AA9C 802418DC 0040202D */ daddu $a0, $v0, $zero -/* 96AAA0 802418E0 0200202D */ daddu $a0, $s0, $zero -/* 96AAA4 802418E4 3C05F4AC */ lui $a1, 0xf4ac -/* 96AAA8 802418E8 0C0B1EAF */ jal get_variable -/* 96AAAC 802418EC 34A5D487 */ ori $a1, $a1, 0xd487 -/* 96AAB0 802418F0 0C048D70 */ jal func_801235C0 -/* 96AAB4 802418F4 0040202D */ daddu $a0, $v0, $zero -/* 96AAB8 802418F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 96AABC 802418FC 8FB00010 */ lw $s0, 0x10($sp) -/* 96AAC0 80241900 24020002 */ addiu $v0, $zero, 2 -/* 96AAC4 80241904 03E00008 */ jr $ra -/* 96AAC8 80241908 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/func_80243870_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/func_80243870_9691C0.s deleted file mode 100644 index dc7c48892b..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/func_80243870_9691C0.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243870_96CA30 -/* 96CA30 80243870 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 96CA34 80243874 AFB1001C */ sw $s1, 0x1c($sp) -/* 96CA38 80243878 0080882D */ daddu $s1, $a0, $zero -/* 96CA3C 8024387C AFBF0034 */ sw $ra, 0x34($sp) -/* 96CA40 80243880 AFB60030 */ sw $s6, 0x30($sp) -/* 96CA44 80243884 AFB5002C */ sw $s5, 0x2c($sp) -/* 96CA48 80243888 AFB40028 */ sw $s4, 0x28($sp) -/* 96CA4C 8024388C AFB30024 */ sw $s3, 0x24($sp) -/* 96CA50 80243890 AFB20020 */ sw $s2, 0x20($sp) -/* 96CA54 80243894 AFB00018 */ sw $s0, 0x18($sp) -/* 96CA58 80243898 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 96CA5C 8024389C F7B40038 */ sdc1 $f20, 0x38($sp) -/* 96CA60 802438A0 8E30000C */ lw $s0, 0xc($s1) -/* 96CA64 802438A4 8E160000 */ lw $s6, ($s0) -/* 96CA68 802438A8 26100004 */ addiu $s0, $s0, 4 -/* 96CA6C 802438AC 0C0B1EAF */ jal get_variable -/* 96CA70 802438B0 02C0282D */ daddu $a1, $s6, $zero -/* 96CA74 802438B4 44820000 */ mtc1 $v0, $f0 -/* 96CA78 802438B8 00000000 */ nop -/* 96CA7C 802438BC 46800020 */ cvt.s.w $f0, $f0 -/* 96CA80 802438C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 96CA84 802438C4 8E140000 */ lw $s4, ($s0) -/* 96CA88 802438C8 26100004 */ addiu $s0, $s0, 4 -/* 96CA8C 802438CC 0220202D */ daddu $a0, $s1, $zero -/* 96CA90 802438D0 0C0B1EAF */ jal get_variable -/* 96CA94 802438D4 0280282D */ daddu $a1, $s4, $zero -/* 96CA98 802438D8 0220202D */ daddu $a0, $s1, $zero -/* 96CA9C 802438DC 8E150000 */ lw $s5, ($s0) -/* 96CAA0 802438E0 4482B000 */ mtc1 $v0, $f22 -/* 96CAA4 802438E4 00000000 */ nop -/* 96CAA8 802438E8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 96CAAC 802438EC 0C0B1EAF */ jal get_variable -/* 96CAB0 802438F0 02A0282D */ daddu $a1, $s5, $zero -/* 96CAB4 802438F4 2404FFFC */ addiu $a0, $zero, -4 -/* 96CAB8 802438F8 44820000 */ mtc1 $v0, $f0 -/* 96CABC 802438FC 00000000 */ nop -/* 96CAC0 80243900 46800020 */ cvt.s.w $f0, $f0 -/* 96CAC4 80243904 0C00EABB */ jal get_npc_unsafe -/* 96CAC8 80243908 E7A00014 */ swc1 $f0, 0x14($sp) -/* 96CACC 8024390C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 96CAD0 80243910 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 96CAD4 80243914 3C014334 */ lui $at, 0x4334 -/* 96CAD8 80243918 44816000 */ mtc1 $at, $f12 -/* 96CADC 8024391C 00041880 */ sll $v1, $a0, 2 -/* 96CAE0 80243920 00641821 */ addu $v1, $v1, $a0 -/* 96CAE4 80243924 00031880 */ sll $v1, $v1, 2 -/* 96CAE8 80243928 00641823 */ subu $v1, $v1, $a0 -/* 96CAEC 8024392C 000320C0 */ sll $a0, $v1, 3 -/* 96CAF0 80243930 00641821 */ addu $v1, $v1, $a0 -/* 96CAF4 80243934 000318C0 */ sll $v1, $v1, 3 -/* 96CAF8 80243938 3C01800B */ lui $at, 0x800b -/* 96CAFC 8024393C 00230821 */ addu $at, $at, $v1 -/* 96CB00 80243940 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 96CB04 80243944 460C0300 */ add.s $f12, $f0, $f12 -/* 96CB08 80243948 0C00A6C9 */ jal clamp_angle -/* 96CB0C 8024394C 0040982D */ daddu $s3, $v0, $zero -/* 96CB10 80243950 27B00010 */ addiu $s0, $sp, 0x10 -/* 96CB14 80243954 0200202D */ daddu $a0, $s0, $zero -/* 96CB18 80243958 27B20014 */ addiu $s2, $sp, 0x14 -/* 96CB1C 8024395C 0240282D */ daddu $a1, $s2, $zero -/* 96CB20 80243960 3C064170 */ lui $a2, 0x4170 -/* 96CB24 80243964 8E67000C */ lw $a3, 0xc($s3) -/* 96CB28 80243968 0C00A7E7 */ jal add_vec2D_polar -/* 96CB2C 8024396C 46000506 */ mov.s $f20, $f0 -/* 96CB30 80243970 0200202D */ daddu $a0, $s0, $zero -/* 96CB34 80243974 3C064120 */ lui $a2, 0x4120 -/* 96CB38 80243978 4407A000 */ mfc1 $a3, $f20 -/* 96CB3C 8024397C 0C00A7E7 */ jal add_vec2D_polar -/* 96CB40 80243980 0240282D */ daddu $a1, $s2, $zero -/* 96CB44 80243984 0220202D */ daddu $a0, $s1, $zero -/* 96CB48 80243988 C7A00010 */ lwc1 $f0, 0x10($sp) -/* 96CB4C 8024398C 4600008D */ trunc.w.s $f2, $f0 -/* 96CB50 80243990 44061000 */ mfc1 $a2, $f2 -/* 96CB54 80243994 0C0B2026 */ jal set_variable -/* 96CB58 80243998 02C0282D */ daddu $a1, $s6, $zero -/* 96CB5C 8024399C 0220202D */ daddu $a0, $s1, $zero -/* 96CB60 802439A0 4600B08D */ trunc.w.s $f2, $f22 -/* 96CB64 802439A4 44061000 */ mfc1 $a2, $f2 -/* 96CB68 802439A8 0C0B2026 */ jal set_variable -/* 96CB6C 802439AC 0280282D */ daddu $a1, $s4, $zero -/* 96CB70 802439B0 0220202D */ daddu $a0, $s1, $zero -/* 96CB74 802439B4 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 96CB78 802439B8 4600008D */ trunc.w.s $f2, $f0 -/* 96CB7C 802439BC 44061000 */ mfc1 $a2, $f2 -/* 96CB80 802439C0 0C0B2026 */ jal set_variable -/* 96CB84 802439C4 02A0282D */ daddu $a1, $s5, $zero -/* 96CB88 802439C8 8FBF0034 */ lw $ra, 0x34($sp) -/* 96CB8C 802439CC 8FB60030 */ lw $s6, 0x30($sp) -/* 96CB90 802439D0 8FB5002C */ lw $s5, 0x2c($sp) -/* 96CB94 802439D4 8FB40028 */ lw $s4, 0x28($sp) -/* 96CB98 802439D8 8FB30024 */ lw $s3, 0x24($sp) -/* 96CB9C 802439DC 8FB20020 */ lw $s2, 0x20($sp) -/* 96CBA0 802439E0 8FB1001C */ lw $s1, 0x1c($sp) -/* 96CBA4 802439E4 8FB00018 */ lw $s0, 0x18($sp) -/* 96CBA8 802439E8 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 96CBAC 802439EC D7B40038 */ ldc1 $f20, 0x38($sp) -/* 96CBB0 802439F0 24020002 */ addiu $v0, $zero, 2 -/* 96CBB4 802439F4 03E00008 */ jr $ra -/* 96CBB8 802439F8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_end/end_00/func_80240020_DF6A00.s b/asm/nonmatchings/world/area_end/end_00/func_80240020_DF6A00.s deleted file mode 100644 index 8d4446207b..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/func_80240020_DF6A00.s +++ /dev/null @@ -1,153 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_DF6A20 -/* DF6A20 80240020 27BDFF38 */ addiu $sp, $sp, -0xc8 -/* DF6A24 80240024 AFB00088 */ sw $s0, 0x88($sp) -/* DF6A28 80240028 00A0802D */ daddu $s0, $a1, $zero -/* DF6A2C 8024002C AFBF00A0 */ sw $ra, 0xa0($sp) -/* DF6A30 80240030 AFB5009C */ sw $s5, 0x9c($sp) -/* DF6A34 80240034 AFB40098 */ sw $s4, 0x98($sp) -/* DF6A38 80240038 AFB30094 */ sw $s3, 0x94($sp) -/* DF6A3C 8024003C AFB20090 */ sw $s2, 0x90($sp) -/* DF6A40 80240040 AFB1008C */ sw $s1, 0x8c($sp) -/* DF6A44 80240044 F7BA00C0 */ sdc1 $f26, 0xc0($sp) -/* DF6A48 80240048 F7B800B8 */ sdc1 $f24, 0xb8($sp) -/* DF6A4C 8024004C F7B600B0 */ sdc1 $f22, 0xb0($sp) -/* DF6A50 80240050 F7B400A8 */ sdc1 $f20, 0xa8($sp) -/* DF6A54 80240054 C6160010 */ lwc1 $f22, 0x10($s0) -/* DF6A58 80240058 4680B5A0 */ cvt.s.w $f22, $f22 -/* DF6A5C 8024005C 4480D000 */ mtc1 $zero, $f26 -/* DF6A60 80240060 3C01437F */ lui $at, 0x437f -/* DF6A64 80240064 4481A000 */ mtc1 $at, $f20 -/* DF6A68 80240068 8C82001C */ lw $v0, 0x1c($a0) -/* DF6A6C 8024006C 4405D000 */ mfc1 $a1, $f26 -/* DF6A70 80240070 4406A000 */ mfc1 $a2, $f20 -/* DF6A74 80240074 C6180014 */ lwc1 $f24, 0x14($s0) -/* DF6A78 80240078 4680C620 */ cvt.s.w $f24, $f24 -/* DF6A7C 8024007C AFA20010 */ sw $v0, 0x10($sp) -/* DF6A80 80240080 8E070018 */ lw $a3, 0x18($s0) -/* DF6A84 80240084 0C00A8ED */ jal update_lerp -/* DF6A88 80240088 0000202D */ daddu $a0, $zero, $zero -/* DF6A8C 8024008C 4600A03C */ c.lt.s $f20, $f0 -/* DF6A90 80240090 00000000 */ nop -/* DF6A94 80240094 45000002 */ bc1f .L802400A0 -/* DF6A98 80240098 27B10038 */ addiu $s1, $sp, 0x38 -/* DF6A9C 8024009C 4600A006 */ mov.s $f0, $f20 -.L802400A0: -/* DF6AA0 802400A0 4600010D */ trunc.w.s $f4, $f0 -/* DF6AA4 802400A4 E7A40014 */ swc1 $f4, 0x14($sp) -/* DF6AA8 802400A8 0000202D */ daddu $a0, $zero, $zero -/* DF6AAC 802400AC 24050007 */ addiu $a1, $zero, 7 -/* DF6AB0 802400B0 240600FF */ addiu $a2, $zero, 0xff -/* DF6AB4 802400B4 00C0382D */ daddu $a3, $a2, $zero -/* DF6AB8 802400B8 00C0A82D */ daddu $s5, $a2, $zero -/* DF6ABC 802400BC AFB50010 */ sw $s5, 0x10($sp) -/* DF6AC0 802400C0 0C04EAA7 */ jal func_8013AA9C -/* DF6AC4 802400C4 AFA00018 */ sw $zero, 0x18($sp) -/* DF6AC8 802400C8 AFB10010 */ sw $s1, 0x10($sp) -/* DF6ACC 802400CC 8E040004 */ lw $a0, 4($s0) -/* DF6AD0 802400D0 8E050008 */ lw $a1, 8($s0) -/* DF6AD4 802400D4 8E060000 */ lw $a2, ($s0) -/* DF6AD8 802400D8 8E07000C */ lw $a3, 0xc($s0) -/* DF6ADC 802400DC 0C04BA38 */ jal func_8012E8E0 -/* DF6AE0 802400E0 3C140001 */ lui $s4, 1 -/* DF6AE4 802400E4 93A20042 */ lbu $v0, 0x42($sp) -/* DF6AE8 802400E8 3C013FE0 */ lui $at, 0x3fe0 -/* DF6AEC 802400EC 4481A800 */ mtc1 $at, $f21 -/* DF6AF0 802400F0 4480A000 */ mtc1 $zero, $f20 -/* DF6AF4 802400F4 44820000 */ mtc1 $v0, $f0 -/* DF6AF8 802400F8 00000000 */ nop -/* DF6AFC 802400FC 46800021 */ cvt.d.w $f0, $f0 -/* DF6B00 80240100 46340002 */ mul.d $f0, $f0, $f20 -/* DF6B04 80240104 00000000 */ nop -/* DF6B08 80240108 36941630 */ ori $s4, $s4, 0x1630 -/* DF6B0C 8024010C 4600B0A1 */ cvt.d.s $f2, $f22 -/* DF6B10 80240110 27B00048 */ addiu $s0, $sp, 0x48 -/* DF6B14 80240114 4600C607 */ neg.s $f24, $f24 -/* DF6B18 80240118 46201080 */ add.d $f2, $f2, $f0 -/* DF6B1C 8024011C 4406C000 */ mfc1 $a2, $f24 -/* DF6B20 80240120 4407D000 */ mfc1 $a3, $f26 -/* DF6B24 80240124 462010A0 */ cvt.s.d $f2, $f2 -/* DF6B28 80240128 44051000 */ mfc1 $a1, $f2 -/* DF6B2C 8024012C 0C019E40 */ jal guTranslateF -/* DF6B30 80240130 0200202D */ daddu $a0, $s0, $zero -/* DF6B34 80240134 0200202D */ daddu $a0, $s0, $zero -/* DF6B38 80240138 3C128007 */ lui $s2, 0x8007 -/* DF6B3C 8024013C 265241F0 */ addiu $s2, $s2, 0x41f0 -/* DF6B40 80240140 3C13800A */ lui $s3, 0x800a -/* DF6B44 80240144 2673A674 */ addiu $s3, $s3, -0x598c -/* DF6B48 80240148 96450000 */ lhu $a1, ($s2) -/* DF6B4C 8024014C 8E620000 */ lw $v0, ($s3) -/* DF6B50 80240150 00052980 */ sll $a1, $a1, 6 -/* DF6B54 80240154 00B42821 */ addu $a1, $a1, $s4 -/* DF6B58 80240158 0C019D40 */ jal guMtxF2L -/* DF6B5C 8024015C 00452821 */ addu $a1, $v0, $a1 -/* DF6B60 80240160 3C03DA38 */ lui $v1, 0xda38 -/* DF6B64 80240164 34630002 */ ori $v1, $v1, 2 -/* DF6B68 80240168 0000202D */ daddu $a0, $zero, $zero -/* DF6B6C 8024016C 27A50020 */ addiu $a1, $sp, 0x20 -/* DF6B70 80240170 3C060005 */ lui $a2, 5 -/* DF6B74 80240174 34C60040 */ ori $a2, $a2, 0x40 -/* DF6B78 80240178 3C11800A */ lui $s1, 0x800a -/* DF6B7C 8024017C 2631A66C */ addiu $s1, $s1, -0x5994 -/* DF6B80 80240180 0200382D */ daddu $a3, $s0, $zero -/* DF6B84 80240184 8E220000 */ lw $v0, ($s1) -/* DF6B88 80240188 96480000 */ lhu $t0, ($s2) -/* DF6B8C 8024018C 0040482D */ daddu $t1, $v0, $zero -/* DF6B90 80240190 24420008 */ addiu $v0, $v0, 8 -/* DF6B94 80240194 AE220000 */ sw $v0, ($s1) -/* DF6B98 80240198 3102FFFF */ andi $v0, $t0, 0xffff -/* DF6B9C 8024019C 00021180 */ sll $v0, $v0, 6 -/* DF6BA0 802401A0 00541021 */ addu $v0, $v0, $s4 -/* DF6BA4 802401A4 AD230000 */ sw $v1, ($t1) -/* DF6BA8 802401A8 8E630000 */ lw $v1, ($s3) -/* DF6BAC 802401AC 25080001 */ addiu $t0, $t0, 1 -/* DF6BB0 802401B0 00621821 */ addu $v1, $v1, $v0 -/* DF6BB4 802401B4 3C028000 */ lui $v0, 0x8000 -/* DF6BB8 802401B8 00621821 */ addu $v1, $v1, $v0 -/* DF6BBC 802401BC AD230004 */ sw $v1, 4($t1) -/* DF6BC0 802401C0 93A20042 */ lbu $v0, 0x42($sp) -/* DF6BC4 802401C4 8FA3003C */ lw $v1, 0x3c($sp) -/* DF6BC8 802401C8 93A90040 */ lbu $t1, 0x40($sp) -/* DF6BCC 802401CC 93AA0041 */ lbu $t2, 0x41($sp) -/* DF6BD0 802401D0 44820000 */ mtc1 $v0, $f0 -/* DF6BD4 802401D4 00000000 */ nop -/* DF6BD8 802401D8 46800021 */ cvt.d.w $f0, $f0 -/* DF6BDC 802401DC 8FA20038 */ lw $v0, 0x38($sp) -/* DF6BE0 802401E0 46340002 */ mul.d $f0, $f0, $f20 -/* DF6BE4 802401E4 00000000 */ nop -/* DF6BE8 802401E8 A6480000 */ sh $t0, ($s2) -/* DF6BEC 802401EC A7A0002E */ sh $zero, 0x2e($sp) -/* DF6BF0 802401F0 A3B50030 */ sb $s5, 0x30($sp) -/* DF6BF4 802401F4 AFA30024 */ sw $v1, 0x24($sp) -/* DF6BF8 802401F8 A7A90028 */ sh $t1, 0x28($sp) -/* DF6BFC 802401FC A7AA002A */ sh $t2, 0x2a($sp) -/* DF6C00 80240200 AFA20020 */ sw $v0, 0x20($sp) -/* DF6C04 80240204 46200007 */ neg.d $f0, $f0 -/* DF6C08 80240208 4620010D */ trunc.w.d $f4, $f0 -/* DF6C0C 8024020C 44022000 */ mfc1 $v0, $f4 -/* DF6C10 80240210 0C04EBDC */ jal func_8013AF70 -/* DF6C14 80240214 A7A2002C */ sh $v0, 0x2c($sp) -/* DF6C18 80240218 3C04D838 */ lui $a0, 0xd838 -/* DF6C1C 8024021C 8E220000 */ lw $v0, ($s1) -/* DF6C20 80240220 34840002 */ ori $a0, $a0, 2 -/* DF6C24 80240224 0040182D */ daddu $v1, $v0, $zero -/* DF6C28 80240228 24420008 */ addiu $v0, $v0, 8 -/* DF6C2C 8024022C AE220000 */ sw $v0, ($s1) -/* DF6C30 80240230 24020040 */ addiu $v0, $zero, 0x40 -/* DF6C34 80240234 AC640000 */ sw $a0, ($v1) -/* DF6C38 80240238 AC620004 */ sw $v0, 4($v1) -/* DF6C3C 8024023C 8FBF00A0 */ lw $ra, 0xa0($sp) -/* DF6C40 80240240 8FB5009C */ lw $s5, 0x9c($sp) -/* DF6C44 80240244 8FB40098 */ lw $s4, 0x98($sp) -/* DF6C48 80240248 8FB30094 */ lw $s3, 0x94($sp) -/* DF6C4C 8024024C 8FB20090 */ lw $s2, 0x90($sp) -/* DF6C50 80240250 8FB1008C */ lw $s1, 0x8c($sp) -/* DF6C54 80240254 8FB00088 */ lw $s0, 0x88($sp) -/* DF6C58 80240258 D7BA00C0 */ ldc1 $f26, 0xc0($sp) -/* DF6C5C 8024025C D7B800B8 */ ldc1 $f24, 0xb8($sp) -/* DF6C60 80240260 D7B600B0 */ ldc1 $f22, 0xb0($sp) -/* DF6C64 80240264 D7B400A8 */ ldc1 $f20, 0xa8($sp) -/* DF6C68 80240268 03E00008 */ jr $ra -/* DF6C6C 8024026C 27BD00C8 */ addiu $sp, $sp, 0xc8 diff --git a/asm/nonmatchings/world/area_end/end_00/func_80240270_DF6A00.s b/asm/nonmatchings/world/area_end/end_00/func_80240270_DF6A00.s deleted file mode 100644 index 7fa27e8dcd..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/func_80240270_DF6A00.s +++ /dev/null @@ -1,190 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240270_DF6C70 -/* DF6C70 80240270 27BDFF40 */ addiu $sp, $sp, -0xc0 -/* DF6C74 80240274 AFB1008C */ sw $s1, 0x8c($sp) -/* DF6C78 80240278 0080882D */ daddu $s1, $a0, $zero -/* DF6C7C 8024027C AFB00088 */ sw $s0, 0x88($sp) -/* DF6C80 80240280 00A0802D */ daddu $s0, $a1, $zero -/* DF6C84 80240284 0000202D */ daddu $a0, $zero, $zero -/* DF6C88 80240288 AFBF00A0 */ sw $ra, 0xa0($sp) -/* DF6C8C 8024028C AFB5009C */ sw $s5, 0x9c($sp) -/* DF6C90 80240290 AFB40098 */ sw $s4, 0x98($sp) -/* DF6C94 80240294 AFB30094 */ sw $s3, 0x94($sp) -/* DF6C98 80240298 AFB20090 */ sw $s2, 0x90($sp) -/* DF6C9C 8024029C F7B800B8 */ sdc1 $f24, 0xb8($sp) -/* DF6CA0 802402A0 F7B600B0 */ sdc1 $f22, 0xb0($sp) -/* DF6CA4 802402A4 F7B400A8 */ sdc1 $f20, 0xa8($sp) -/* DF6CA8 802402A8 C6160010 */ lwc1 $f22, 0x10($s0) -/* DF6CAC 802402AC 4680B5A0 */ cvt.s.w $f22, $f22 -/* DF6CB0 802402B0 3C01437F */ lui $at, 0x437f -/* DF6CB4 802402B4 4481A000 */ mtc1 $at, $f20 -/* DF6CB8 802402B8 8E22001C */ lw $v0, 0x1c($s1) -/* DF6CBC 802402BC 4406A000 */ mfc1 $a2, $f20 -/* DF6CC0 802402C0 C6180014 */ lwc1 $f24, 0x14($s0) -/* DF6CC4 802402C4 4680C620 */ cvt.s.w $f24, $f24 -/* DF6CC8 802402C8 AFA20010 */ sw $v0, 0x10($sp) -/* DF6CCC 802402CC 8E070018 */ lw $a3, 0x18($s0) -/* DF6CD0 802402D0 0C00A8ED */ jal update_lerp -/* DF6CD4 802402D4 0000282D */ daddu $a1, $zero, $zero -/* DF6CD8 802402D8 4600A03C */ c.lt.s $f20, $f0 -/* DF6CDC 802402DC 00000000 */ nop -/* DF6CE0 802402E0 45000002 */ bc1f .L802402EC -/* DF6CE4 802402E4 27B50038 */ addiu $s5, $sp, 0x38 -/* DF6CE8 802402E8 4600A006 */ mov.s $f0, $f20 -.L802402EC: -/* DF6CEC 802402EC 8E24001C */ lw $a0, 0x1c($s1) -/* DF6CF0 802402F0 8E030018 */ lw $v1, 0x18($s0) -/* DF6CF4 802402F4 2482FFFC */ addiu $v0, $a0, -4 -/* DF6CF8 802402F8 14620007 */ bne $v1, $v0, .L80240318 -/* DF6CFC 802402FC 2482FFFD */ addiu $v0, $a0, -3 -/* DF6D00 80240300 4600010D */ trunc.w.s $f4, $f0 -/* DF6D04 80240304 E7A40014 */ swc1 $f4, 0x14($sp) -/* DF6D08 80240308 0000202D */ daddu $a0, $zero, $zero -/* DF6D0C 8024030C 2405000A */ addiu $a1, $zero, 0xa -/* DF6D10 80240310 080900E1 */ j .L80240384 -/* DF6D14 80240314 24060040 */ addiu $a2, $zero, 0x40 -.L80240318: -/* DF6D18 80240318 14620007 */ bne $v1, $v0, .L80240338 -/* DF6D1C 8024031C 2482FFFE */ addiu $v0, $a0, -2 -/* DF6D20 80240320 4600010D */ trunc.w.s $f4, $f0 -/* DF6D24 80240324 E7A40014 */ swc1 $f4, 0x14($sp) -/* DF6D28 80240328 0000202D */ daddu $a0, $zero, $zero -/* DF6D2C 8024032C 2405000A */ addiu $a1, $zero, 0xa -/* DF6D30 80240330 080900E1 */ j .L80240384 -/* DF6D34 80240334 24060060 */ addiu $a2, $zero, 0x60 -.L80240338: -/* DF6D38 80240338 14620007 */ bne $v1, $v0, .L80240358 -/* DF6D3C 8024033C 2482FFFF */ addiu $v0, $a0, -1 -/* DF6D40 80240340 4600010D */ trunc.w.s $f4, $f0 -/* DF6D44 80240344 E7A40014 */ swc1 $f4, 0x14($sp) -/* DF6D48 80240348 0000202D */ daddu $a0, $zero, $zero -/* DF6D4C 8024034C 2405000A */ addiu $a1, $zero, 0xa -/* DF6D50 80240350 080900E1 */ j .L80240384 -/* DF6D54 80240354 2406007F */ addiu $a2, $zero, 0x7f -.L80240358: -/* DF6D58 80240358 14620006 */ bne $v1, $v0, .L80240374 -/* DF6D5C 8024035C 0000202D */ daddu $a0, $zero, $zero -/* DF6D60 80240360 4600010D */ trunc.w.s $f4, $f0 -/* DF6D64 80240364 E7A40014 */ swc1 $f4, 0x14($sp) -/* DF6D68 80240368 2405000A */ addiu $a1, $zero, 0xa -/* DF6D6C 8024036C 080900E1 */ j .L80240384 -/* DF6D70 80240370 24060050 */ addiu $a2, $zero, 0x50 -.L80240374: -/* DF6D74 80240374 4600010D */ trunc.w.s $f4, $f0 -/* DF6D78 80240378 E7A40014 */ swc1 $f4, 0x14($sp) -/* DF6D7C 8024037C 24050007 */ addiu $a1, $zero, 7 -/* DF6D80 80240380 240600FF */ addiu $a2, $zero, 0xff -.L80240384: -/* DF6D84 80240384 00C0382D */ daddu $a3, $a2, $zero -/* DF6D88 80240388 00C0102D */ daddu $v0, $a2, $zero -/* DF6D8C 8024038C AFA20010 */ sw $v0, 0x10($sp) -/* DF6D90 80240390 0C04EAA7 */ jal func_8013AA9C -/* DF6D94 80240394 AFA00018 */ sw $zero, 0x18($sp) -/* DF6D98 80240398 AFB50010 */ sw $s5, 0x10($sp) -/* DF6D9C 8024039C 8E040004 */ lw $a0, 4($s0) -/* DF6DA0 802403A0 8E050008 */ lw $a1, 8($s0) -/* DF6DA4 802403A4 8E060000 */ lw $a2, ($s0) -/* DF6DA8 802403A8 8E07000C */ lw $a3, 0xc($s0) -/* DF6DAC 802403AC 0C04BA38 */ jal func_8012E8E0 -/* DF6DB0 802403B0 3C140001 */ lui $s4, 1 -/* DF6DB4 802403B4 92A2000A */ lbu $v0, 0xa($s5) -/* DF6DB8 802403B8 3C013FE0 */ lui $at, 0x3fe0 -/* DF6DBC 802403BC 4481A800 */ mtc1 $at, $f21 -/* DF6DC0 802403C0 4480A000 */ mtc1 $zero, $f20 -/* DF6DC4 802403C4 44820000 */ mtc1 $v0, $f0 -/* DF6DC8 802403C8 00000000 */ nop -/* DF6DCC 802403CC 46800021 */ cvt.d.w $f0, $f0 -/* DF6DD0 802403D0 46340002 */ mul.d $f0, $f0, $f20 -/* DF6DD4 802403D4 00000000 */ nop -/* DF6DD8 802403D8 36941630 */ ori $s4, $s4, 0x1630 -/* DF6DDC 802403DC 4600B0A1 */ cvt.d.s $f2, $f22 -/* DF6DE0 802403E0 46201080 */ add.d $f2, $f2, $f0 -/* DF6DE4 802403E4 27B30048 */ addiu $s3, $sp, 0x48 -/* DF6DE8 802403E8 0260202D */ daddu $a0, $s3, $zero -/* DF6DEC 802403EC 4600C607 */ neg.s $f24, $f24 -/* DF6DF0 802403F0 4406C000 */ mfc1 $a2, $f24 -/* DF6DF4 802403F4 462010A0 */ cvt.s.d $f2, $f2 -/* DF6DF8 802403F8 44051000 */ mfc1 $a1, $f2 -/* DF6DFC 802403FC 0C019E40 */ jal guTranslateF -/* DF6E00 80240400 0000382D */ daddu $a3, $zero, $zero -/* DF6E04 80240404 0260202D */ daddu $a0, $s3, $zero -/* DF6E08 80240408 3C108007 */ lui $s0, 0x8007 -/* DF6E0C 8024040C 261041F0 */ addiu $s0, $s0, 0x41f0 -/* DF6E10 80240410 3C12800A */ lui $s2, 0x800a -/* DF6E14 80240414 2652A674 */ addiu $s2, $s2, -0x598c -/* DF6E18 80240418 96050000 */ lhu $a1, ($s0) -/* DF6E1C 8024041C 8E420000 */ lw $v0, ($s2) -/* DF6E20 80240420 00052980 */ sll $a1, $a1, 6 -/* DF6E24 80240424 00B42821 */ addu $a1, $a1, $s4 -/* DF6E28 80240428 0C019D40 */ jal guMtxF2L -/* DF6E2C 8024042C 00452821 */ addu $a1, $v0, $a1 -/* DF6E30 80240430 3C02DA38 */ lui $v0, 0xda38 -/* DF6E34 80240434 34420002 */ ori $v0, $v0, 2 -/* DF6E38 80240438 3C11800A */ lui $s1, 0x800a -/* DF6E3C 8024043C 2631A66C */ addiu $s1, $s1, -0x5994 -/* DF6E40 80240440 8E240000 */ lw $a0, ($s1) -/* DF6E44 80240444 96050000 */ lhu $a1, ($s0) -/* DF6E48 80240448 0080302D */ daddu $a2, $a0, $zero -/* DF6E4C 8024044C ACC20000 */ sw $v0, ($a2) -/* DF6E50 80240450 30A2FFFF */ andi $v0, $a1, 0xffff -/* DF6E54 80240454 00021180 */ sll $v0, $v0, 6 -/* DF6E58 80240458 8E430000 */ lw $v1, ($s2) -/* DF6E5C 8024045C 00541021 */ addu $v0, $v0, $s4 -/* DF6E60 80240460 00621821 */ addu $v1, $v1, $v0 -/* DF6E64 80240464 3C028000 */ lui $v0, 0x8000 -/* DF6E68 80240468 00621821 */ addu $v1, $v1, $v0 -/* DF6E6C 8024046C ACC30004 */ sw $v1, 4($a2) -/* DF6E70 80240470 8EA20000 */ lw $v0, ($s5) -/* DF6E74 80240474 24840008 */ addiu $a0, $a0, 8 -/* DF6E78 80240478 AE240000 */ sw $a0, ($s1) -/* DF6E7C 8024047C AFA20020 */ sw $v0, 0x20($sp) -/* DF6E80 80240480 8EA20004 */ lw $v0, 4($s5) -/* DF6E84 80240484 24A50001 */ addiu $a1, $a1, 1 -/* DF6E88 80240488 A6050000 */ sh $a1, ($s0) -/* DF6E8C 8024048C AFA20024 */ sw $v0, 0x24($sp) -/* DF6E90 80240490 92A20008 */ lbu $v0, 8($s5) -/* DF6E94 80240494 A7A20028 */ sh $v0, 0x28($sp) -/* DF6E98 80240498 92A20009 */ lbu $v0, 9($s5) -/* DF6E9C 8024049C A7A2002A */ sh $v0, 0x2a($sp) -/* DF6EA0 802404A0 92A2000A */ lbu $v0, 0xa($s5) -/* DF6EA4 802404A4 0260382D */ daddu $a3, $s3, $zero -/* DF6EA8 802404A8 44820000 */ mtc1 $v0, $f0 -/* DF6EAC 802404AC 00000000 */ nop -/* DF6EB0 802404B0 46800021 */ cvt.d.w $f0, $f0 -/* DF6EB4 802404B4 46340002 */ mul.d $f0, $f0, $f20 -/* DF6EB8 802404B8 00000000 */ nop -/* DF6EBC 802404BC 0000202D */ daddu $a0, $zero, $zero -/* DF6EC0 802404C0 3C060005 */ lui $a2, 5 -/* DF6EC4 802404C4 34C60040 */ ori $a2, $a2, 0x40 -/* DF6EC8 802404C8 27A50020 */ addiu $a1, $sp, 0x20 -/* DF6ECC 802404CC A7A0002E */ sh $zero, 0x2e($sp) -/* DF6ED0 802404D0 240200FF */ addiu $v0, $zero, 0xff -/* DF6ED4 802404D4 A3A20030 */ sb $v0, 0x30($sp) -/* DF6ED8 802404D8 46200007 */ neg.d $f0, $f0 -/* DF6EDC 802404DC 4620010D */ trunc.w.d $f4, $f0 -/* DF6EE0 802404E0 44022000 */ mfc1 $v0, $f4 -/* DF6EE4 802404E4 0C04EBDC */ jal func_8013AF70 -/* DF6EE8 802404E8 A7A2002C */ sh $v0, 0x2c($sp) -/* DF6EEC 802404EC 3C04D838 */ lui $a0, 0xd838 -/* DF6EF0 802404F0 8E220000 */ lw $v0, ($s1) -/* DF6EF4 802404F4 34840002 */ ori $a0, $a0, 2 -/* DF6EF8 802404F8 0040182D */ daddu $v1, $v0, $zero -/* DF6EFC 802404FC 24420008 */ addiu $v0, $v0, 8 -/* DF6F00 80240500 AE220000 */ sw $v0, ($s1) -/* DF6F04 80240504 24020040 */ addiu $v0, $zero, 0x40 -/* DF6F08 80240508 AC640000 */ sw $a0, ($v1) -/* DF6F0C 8024050C AC620004 */ sw $v0, 4($v1) -/* DF6F10 80240510 8FBF00A0 */ lw $ra, 0xa0($sp) -/* DF6F14 80240514 8FB5009C */ lw $s5, 0x9c($sp) -/* DF6F18 80240518 8FB40098 */ lw $s4, 0x98($sp) -/* DF6F1C 8024051C 8FB30094 */ lw $s3, 0x94($sp) -/* DF6F20 80240520 8FB20090 */ lw $s2, 0x90($sp) -/* DF6F24 80240524 8FB1008C */ lw $s1, 0x8c($sp) -/* DF6F28 80240528 8FB00088 */ lw $s0, 0x88($sp) -/* DF6F2C 8024052C D7B800B8 */ ldc1 $f24, 0xb8($sp) -/* DF6F30 80240530 D7B600B0 */ ldc1 $f22, 0xb0($sp) -/* DF6F34 80240534 D7B400A8 */ ldc1 $f20, 0xa8($sp) -/* DF6F38 80240538 03E00008 */ jr $ra -/* DF6F3C 8024053C 27BD00C0 */ addiu $sp, $sp, 0xc0 diff --git a/asm/nonmatchings/world/area_end/end_00/func_80240540_DF6A00.s b/asm/nonmatchings/world/area_end/end_00/func_80240540_DF6A00.s deleted file mode 100644 index 8ab6f9a32e..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/func_80240540_DF6A00.s +++ /dev/null @@ -1,190 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240540_DF6F40 -/* DF6F40 80240540 27BDFEF0 */ addiu $sp, $sp, -0x110 -/* DF6F44 80240544 AFB200D0 */ sw $s2, 0xd0($sp) -/* DF6F48 80240548 0080902D */ daddu $s2, $a0, $zero -/* DF6F4C 8024054C AFB000C8 */ sw $s0, 0xc8($sp) -/* DF6F50 80240550 00A0802D */ daddu $s0, $a1, $zero -/* DF6F54 80240554 AFBF00E0 */ sw $ra, 0xe0($sp) -/* DF6F58 80240558 AFB500DC */ sw $s5, 0xdc($sp) -/* DF6F5C 8024055C AFB400D8 */ sw $s4, 0xd8($sp) -/* DF6F60 80240560 AFB300D4 */ sw $s3, 0xd4($sp) -/* DF6F64 80240564 AFB100CC */ sw $s1, 0xcc($sp) -/* DF6F68 80240568 F7BC0108 */ sdc1 $f28, 0x108($sp) -/* DF6F6C 8024056C F7BA0100 */ sdc1 $f26, 0x100($sp) -/* DF6F70 80240570 F7B800F8 */ sdc1 $f24, 0xf8($sp) -/* DF6F74 80240574 F7B600F0 */ sdc1 $f22, 0xf0($sp) -/* DF6F78 80240578 F7B400E8 */ sdc1 $f20, 0xe8($sp) -/* DF6F7C 8024057C C6160010 */ lwc1 $f22, 0x10($s0) -/* DF6F80 80240580 4680B5A0 */ cvt.s.w $f22, $f22 -/* DF6F84 80240584 3C054180 */ lui $a1, 0x4180 -/* DF6F88 80240588 3C064396 */ lui $a2, 0x4396 -/* DF6F8C 8024058C 8E42001C */ lw $v0, 0x1c($s2) -/* DF6F90 80240590 C61C0014 */ lwc1 $f28, 0x14($s0) -/* DF6F94 80240594 4680E720 */ cvt.s.w $f28, $f28 -/* DF6F98 80240598 AFA20010 */ sw $v0, 0x10($sp) -/* DF6F9C 8024059C 8E070018 */ lw $a3, 0x18($s0) -/* DF6FA0 802405A0 0C00A8ED */ jal update_lerp -/* DF6FA4 802405A4 2404000C */ addiu $a0, $zero, 0xc -/* DF6FA8 802405A8 3C01437F */ lui $at, 0x437f -/* DF6FAC 802405AC 44811000 */ mtc1 $at, $f2 -/* DF6FB0 802405B0 00000000 */ nop -/* DF6FB4 802405B4 4600103C */ c.lt.s $f2, $f0 -/* DF6FB8 802405B8 00000000 */ nop -/* DF6FBC 802405BC 45000002 */ bc1f .L802405C8 -/* DF6FC0 802405C0 27B10038 */ addiu $s1, $sp, 0x38 -/* DF6FC4 802405C4 46001006 */ mov.s $f0, $f2 -.L802405C8: -/* DF6FC8 802405C8 4600010D */ trunc.w.s $f4, $f0 -/* DF6FCC 802405CC E7A40014 */ swc1 $f4, 0x14($sp) -/* DF6FD0 802405D0 0000202D */ daddu $a0, $zero, $zero -/* DF6FD4 802405D4 24050007 */ addiu $a1, $zero, 7 -/* DF6FD8 802405D8 240600FF */ addiu $a2, $zero, 0xff -/* DF6FDC 802405DC 00C0382D */ daddu $a3, $a2, $zero -/* DF6FE0 802405E0 00C0A82D */ daddu $s5, $a2, $zero -/* DF6FE4 802405E4 AFB50010 */ sw $s5, 0x10($sp) -/* DF6FE8 802405E8 0C04EAA7 */ jal func_8013AA9C -/* DF6FEC 802405EC AFA00018 */ sw $zero, 0x18($sp) -/* DF6FF0 802405F0 8E42001C */ lw $v0, 0x1c($s2) -/* DF6FF4 802405F4 3C053E4C */ lui $a1, 0x3e4c -/* DF6FF8 802405F8 34A5CCCD */ ori $a1, $a1, 0xcccd -/* DF6FFC 802405FC 3C064000 */ lui $a2, 0x4000 -/* DF7000 80240600 AFA20010 */ sw $v0, 0x10($sp) -/* DF7004 80240604 8E070018 */ lw $a3, 0x18($s0) -/* DF7008 80240608 0C00A8ED */ jal update_lerp -/* DF700C 8024060C 0000202D */ daddu $a0, $zero, $zero -/* DF7010 80240610 46000506 */ mov.s $f20, $f0 -/* DF7014 80240614 3C013FF0 */ lui $at, 0x3ff0 -/* DF7018 80240618 4481C800 */ mtc1 $at, $f25 -/* DF701C 8024061C 4480C000 */ mtc1 $zero, $f24 -/* DF7020 80240620 4600A021 */ cvt.d.s $f0, $f20 -/* DF7024 80240624 4620C03C */ c.lt.d $f24, $f0 -/* DF7028 80240628 00000000 */ nop -/* DF702C 8024062C 45000003 */ bc1f .L8024063C -/* DF7030 80240630 AFB10010 */ sw $s1, 0x10($sp) -/* DF7034 80240634 3C013F80 */ lui $at, 0x3f80 -/* DF7038 80240638 4481A000 */ mtc1 $at, $f20 -.L8024063C: -/* DF703C 8024063C 8E040004 */ lw $a0, 4($s0) -/* DF7040 80240640 8E050008 */ lw $a1, 8($s0) -/* DF7044 80240644 8E060000 */ lw $a2, ($s0) -/* DF7048 80240648 0C04BA38 */ jal func_8012E8E0 -/* DF704C 8024064C 8E07000C */ lw $a3, 0xc($s0) -/* DF7050 80240650 93A20042 */ lbu $v0, 0x42($sp) -/* DF7054 80240654 3C013FE0 */ lui $at, 0x3fe0 -/* DF7058 80240658 4481D800 */ mtc1 $at, $f27 -/* DF705C 8024065C 4480D000 */ mtc1 $zero, $f26 -/* DF7060 80240660 44820000 */ mtc1 $v0, $f0 -/* DF7064 80240664 00000000 */ nop -/* DF7068 80240668 46800021 */ cvt.d.w $f0, $f0 -/* DF706C 8024066C 463A0002 */ mul.d $f0, $f0, $f26 -/* DF7070 80240670 00000000 */ nop -/* DF7074 80240674 4600B0A1 */ cvt.d.s $f2, $f22 -/* DF7078 80240678 46201080 */ add.d $f2, $f2, $f0 -/* DF707C 8024067C 27B40048 */ addiu $s4, $sp, 0x48 -/* DF7080 80240680 0280202D */ daddu $a0, $s4, $zero -/* DF7084 80240684 4600E707 */ neg.s $f28, $f28 -/* DF7088 80240688 4406E000 */ mfc1 $a2, $f28 -/* DF708C 8024068C 462010A0 */ cvt.s.d $f2, $f2 -/* DF7090 80240690 44051000 */ mfc1 $a1, $f2 -/* DF7094 80240694 0C019E40 */ jal guTranslateF -/* DF7098 80240698 0000382D */ daddu $a3, $zero, $zero -/* DF709C 8024069C 4600A021 */ cvt.d.s $f0, $f20 -/* DF70A0 802406A0 46380032 */ c.eq.d $f0, $f24 -/* DF70A4 802406A4 00000000 */ nop -/* DF70A8 802406A8 4501000C */ bc1t .L802406DC -/* DF70AC 802406AC 3C130001 */ lui $s3, 1 -/* DF70B0 802406B0 27B00088 */ addiu $s0, $sp, 0x88 -/* DF70B4 802406B4 0200202D */ daddu $a0, $s0, $zero -/* DF70B8 802406B8 4405A000 */ mfc1 $a1, $f20 -/* DF70BC 802406BC 3C073F80 */ lui $a3, 0x3f80 -/* DF70C0 802406C0 0C019DF0 */ jal guScaleF -/* DF70C4 802406C4 00A0302D */ daddu $a2, $a1, $zero -/* DF70C8 802406C8 0200202D */ daddu $a0, $s0, $zero -/* DF70CC 802406CC 0280282D */ daddu $a1, $s4, $zero -/* DF70D0 802406D0 0C019D80 */ jal guMtxCatF -/* DF70D4 802406D4 0280302D */ daddu $a2, $s4, $zero -/* DF70D8 802406D8 3C130001 */ lui $s3, 1 -.L802406DC: -/* DF70DC 802406DC 36731630 */ ori $s3, $s3, 0x1630 -/* DF70E0 802406E0 0280202D */ daddu $a0, $s4, $zero -/* DF70E4 802406E4 3C118007 */ lui $s1, 0x8007 -/* DF70E8 802406E8 263141F0 */ addiu $s1, $s1, 0x41f0 -/* DF70EC 802406EC 3C12800A */ lui $s2, 0x800a -/* DF70F0 802406F0 2652A674 */ addiu $s2, $s2, -0x598c -/* DF70F4 802406F4 96250000 */ lhu $a1, ($s1) -/* DF70F8 802406F8 8E420000 */ lw $v0, ($s2) -/* DF70FC 802406FC 00052980 */ sll $a1, $a1, 6 -/* DF7100 80240700 00B32821 */ addu $a1, $a1, $s3 -/* DF7104 80240704 0C019D40 */ jal guMtxF2L -/* DF7108 80240708 00452821 */ addu $a1, $v0, $a1 -/* DF710C 8024070C 3C03DA38 */ lui $v1, 0xda38 -/* DF7110 80240710 34630002 */ ori $v1, $v1, 2 -/* DF7114 80240714 0000202D */ daddu $a0, $zero, $zero -/* DF7118 80240718 27A50020 */ addiu $a1, $sp, 0x20 -/* DF711C 8024071C 24060040 */ addiu $a2, $zero, 0x40 -/* DF7120 80240720 3C10800A */ lui $s0, 0x800a -/* DF7124 80240724 2610A66C */ addiu $s0, $s0, -0x5994 -/* DF7128 80240728 0280382D */ daddu $a3, $s4, $zero -/* DF712C 8024072C 8E020000 */ lw $v0, ($s0) -/* DF7130 80240730 96280000 */ lhu $t0, ($s1) -/* DF7134 80240734 0040482D */ daddu $t1, $v0, $zero -/* DF7138 80240738 24420008 */ addiu $v0, $v0, 8 -/* DF713C 8024073C AE020000 */ sw $v0, ($s0) -/* DF7140 80240740 3102FFFF */ andi $v0, $t0, 0xffff -/* DF7144 80240744 00021180 */ sll $v0, $v0, 6 -/* DF7148 80240748 00531021 */ addu $v0, $v0, $s3 -/* DF714C 8024074C AD230000 */ sw $v1, ($t1) -/* DF7150 80240750 8E430000 */ lw $v1, ($s2) -/* DF7154 80240754 25080001 */ addiu $t0, $t0, 1 -/* DF7158 80240758 00621821 */ addu $v1, $v1, $v0 -/* DF715C 8024075C 3C028000 */ lui $v0, 0x8000 -/* DF7160 80240760 00621821 */ addu $v1, $v1, $v0 -/* DF7164 80240764 AD230004 */ sw $v1, 4($t1) -/* DF7168 80240768 93A20042 */ lbu $v0, 0x42($sp) -/* DF716C 8024076C 8FA3003C */ lw $v1, 0x3c($sp) -/* DF7170 80240770 93A90040 */ lbu $t1, 0x40($sp) -/* DF7174 80240774 93AA0041 */ lbu $t2, 0x41($sp) -/* DF7178 80240778 44820000 */ mtc1 $v0, $f0 -/* DF717C 8024077C 00000000 */ nop -/* DF7180 80240780 46800021 */ cvt.d.w $f0, $f0 -/* DF7184 80240784 8FA20038 */ lw $v0, 0x38($sp) -/* DF7188 80240788 463A0002 */ mul.d $f0, $f0, $f26 -/* DF718C 8024078C 00000000 */ nop -/* DF7190 80240790 A6280000 */ sh $t0, ($s1) -/* DF7194 80240794 A7A0002E */ sh $zero, 0x2e($sp) -/* DF7198 80240798 A3B50030 */ sb $s5, 0x30($sp) -/* DF719C 8024079C AFA30024 */ sw $v1, 0x24($sp) -/* DF71A0 802407A0 A7A90028 */ sh $t1, 0x28($sp) -/* DF71A4 802407A4 A7AA002A */ sh $t2, 0x2a($sp) -/* DF71A8 802407A8 AFA20020 */ sw $v0, 0x20($sp) -/* DF71AC 802407AC 46200007 */ neg.d $f0, $f0 -/* DF71B0 802407B0 4620010D */ trunc.w.d $f4, $f0 -/* DF71B4 802407B4 44022000 */ mfc1 $v0, $f4 -/* DF71B8 802407B8 0C04EBDC */ jal func_8013AF70 -/* DF71BC 802407BC A7A2002C */ sh $v0, 0x2c($sp) -/* DF71C0 802407C0 3C04D838 */ lui $a0, 0xd838 -/* DF71C4 802407C4 8E020000 */ lw $v0, ($s0) -/* DF71C8 802407C8 34840002 */ ori $a0, $a0, 2 -/* DF71CC 802407CC 0040182D */ daddu $v1, $v0, $zero -/* DF71D0 802407D0 24420008 */ addiu $v0, $v0, 8 -/* DF71D4 802407D4 AE020000 */ sw $v0, ($s0) -/* DF71D8 802407D8 24020040 */ addiu $v0, $zero, 0x40 -/* DF71DC 802407DC AC640000 */ sw $a0, ($v1) -/* DF71E0 802407E0 AC620004 */ sw $v0, 4($v1) -/* DF71E4 802407E4 8FBF00E0 */ lw $ra, 0xe0($sp) -/* DF71E8 802407E8 8FB500DC */ lw $s5, 0xdc($sp) -/* DF71EC 802407EC 8FB400D8 */ lw $s4, 0xd8($sp) -/* DF71F0 802407F0 8FB300D4 */ lw $s3, 0xd4($sp) -/* DF71F4 802407F4 8FB200D0 */ lw $s2, 0xd0($sp) -/* DF71F8 802407F8 8FB100CC */ lw $s1, 0xcc($sp) -/* DF71FC 802407FC 8FB000C8 */ lw $s0, 0xc8($sp) -/* DF7200 80240800 D7BC0108 */ ldc1 $f28, 0x108($sp) -/* DF7204 80240804 D7BA0100 */ ldc1 $f26, 0x100($sp) -/* DF7208 80240808 D7B800F8 */ ldc1 $f24, 0xf8($sp) -/* DF720C 8024080C D7B600F0 */ ldc1 $f22, 0xf0($sp) -/* DF7210 80240810 D7B400E8 */ ldc1 $f20, 0xe8($sp) -/* DF7214 80240814 03E00008 */ jr $ra -/* DF7218 80240818 27BD0110 */ addiu $sp, $sp, 0x110 diff --git a/asm/nonmatchings/world/area_end/end_00/func_8024081C_DF6A00.s b/asm/nonmatchings/world/area_end/end_00/func_8024081C_DF6A00.s deleted file mode 100644 index 43217d860f..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/func_8024081C_DF6A00.s +++ /dev/null @@ -1,186 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024081C_DF721C -/* DF721C 8024081C 27BDFEF0 */ addiu $sp, $sp, -0x110 -/* DF7220 80240820 AFB200D0 */ sw $s2, 0xd0($sp) -/* DF7224 80240824 0080902D */ daddu $s2, $a0, $zero -/* DF7228 80240828 AFB000C8 */ sw $s0, 0xc8($sp) -/* DF722C 8024082C 00A0802D */ daddu $s0, $a1, $zero -/* DF7230 80240830 AFBF00E0 */ sw $ra, 0xe0($sp) -/* DF7234 80240834 AFB500DC */ sw $s5, 0xdc($sp) -/* DF7238 80240838 AFB400D8 */ sw $s4, 0xd8($sp) -/* DF723C 8024083C AFB300D4 */ sw $s3, 0xd4($sp) -/* DF7240 80240840 AFB100CC */ sw $s1, 0xcc($sp) -/* DF7244 80240844 F7BC0108 */ sdc1 $f28, 0x108($sp) -/* DF7248 80240848 F7BA0100 */ sdc1 $f26, 0x100($sp) -/* DF724C 8024084C F7B800F8 */ sdc1 $f24, 0xf8($sp) -/* DF7250 80240850 F7B600F0 */ sdc1 $f22, 0xf0($sp) -/* DF7254 80240854 F7B400E8 */ sdc1 $f20, 0xe8($sp) -/* DF7258 80240858 C6180010 */ lwc1 $f24, 0x10($s0) -/* DF725C 8024085C 4680C620 */ cvt.s.w $f24, $f24 -/* DF7260 80240860 3C054200 */ lui $a1, 0x4200 -/* DF7264 80240864 3C064396 */ lui $a2, 0x4396 -/* DF7268 80240868 8E42001C */ lw $v0, 0x1c($s2) -/* DF726C 8024086C C61C0014 */ lwc1 $f28, 0x14($s0) -/* DF7270 80240870 4680E720 */ cvt.s.w $f28, $f28 -/* DF7274 80240874 AFA20010 */ sw $v0, 0x10($sp) -/* DF7278 80240878 8E070018 */ lw $a3, 0x18($s0) -/* DF727C 8024087C 0C00A8ED */ jal update_lerp -/* DF7280 80240880 2404000C */ addiu $a0, $zero, 0xc -/* DF7284 80240884 3C01437F */ lui $at, 0x437f -/* DF7288 80240888 44811000 */ mtc1 $at, $f2 -/* DF728C 8024088C 00000000 */ nop -/* DF7290 80240890 4600103C */ c.lt.s $f2, $f0 -/* DF7294 80240894 00000000 */ nop -/* DF7298 80240898 45000002 */ bc1f .L802408A4 -/* DF729C 8024089C 27B10038 */ addiu $s1, $sp, 0x38 -/* DF72A0 802408A0 46001006 */ mov.s $f0, $f2 -.L802408A4: -/* DF72A4 802408A4 4600010D */ trunc.w.s $f4, $f0 -/* DF72A8 802408A8 E7A40014 */ swc1 $f4, 0x14($sp) -/* DF72AC 802408AC 0000202D */ daddu $a0, $zero, $zero -/* DF72B0 802408B0 24050007 */ addiu $a1, $zero, 7 -/* DF72B4 802408B4 240600FF */ addiu $a2, $zero, 0xff -/* DF72B8 802408B8 00C0382D */ daddu $a3, $a2, $zero -/* DF72BC 802408BC 00C0A82D */ daddu $s5, $a2, $zero -/* DF72C0 802408C0 AFB50010 */ sw $s5, 0x10($sp) -/* DF72C4 802408C4 0C04EAA7 */ jal func_8013AA9C -/* DF72C8 802408C8 AFA00018 */ sw $zero, 0x18($sp) -/* DF72CC 802408CC 8E42001C */ lw $v0, 0x1c($s2) -/* DF72D0 802408D0 3C05C296 */ lui $a1, 0xc296 -/* DF72D4 802408D4 3C0641F0 */ lui $a2, 0x41f0 -/* DF72D8 802408D8 AFA20010 */ sw $v0, 0x10($sp) -/* DF72DC 802408DC 8E070018 */ lw $a3, 0x18($s0) -/* DF72E0 802408E0 0C00A8ED */ jal update_lerp -/* DF72E4 802408E4 0000202D */ daddu $a0, $zero, $zero -/* DF72E8 802408E8 4480B000 */ mtc1 $zero, $f22 -/* DF72EC 802408EC 46000506 */ mov.s $f20, $f0 -/* DF72F0 802408F0 4614B03E */ c.le.s $f22, $f20 -/* DF72F4 802408F4 00000000 */ nop -/* DF72F8 802408F8 45030001 */ bc1tl .L80240900 -/* DF72FC 802408FC 4600B506 */ mov.s $f20, $f22 -.L80240900: -/* DF7300 80240900 AFB10010 */ sw $s1, 0x10($sp) -/* DF7304 80240904 8E040004 */ lw $a0, 4($s0) -/* DF7308 80240908 8E050008 */ lw $a1, 8($s0) -/* DF730C 8024090C 8E060000 */ lw $a2, ($s0) -/* DF7310 80240910 0C04BA38 */ jal func_8012E8E0 -/* DF7314 80240914 8E07000C */ lw $a3, 0xc($s0) -/* DF7318 80240918 93A20042 */ lbu $v0, 0x42($sp) -/* DF731C 8024091C 3C013FE0 */ lui $at, 0x3fe0 -/* DF7320 80240920 4481D800 */ mtc1 $at, $f27 -/* DF7324 80240924 4480D000 */ mtc1 $zero, $f26 -/* DF7328 80240928 44820000 */ mtc1 $v0, $f0 -/* DF732C 8024092C 00000000 */ nop -/* DF7330 80240930 46800021 */ cvt.d.w $f0, $f0 -/* DF7334 80240934 463A0002 */ mul.d $f0, $f0, $f26 -/* DF7338 80240938 00000000 */ nop -/* DF733C 8024093C 4600C0A1 */ cvt.d.s $f2, $f24 -/* DF7340 80240940 27B40048 */ addiu $s4, $sp, 0x48 -/* DF7344 80240944 4600E707 */ neg.s $f28, $f28 -/* DF7348 80240948 46201080 */ add.d $f2, $f2, $f0 -/* DF734C 8024094C 4406E000 */ mfc1 $a2, $f28 -/* DF7350 80240950 4407B000 */ mfc1 $a3, $f22 -/* DF7354 80240954 462010A0 */ cvt.s.d $f2, $f2 -/* DF7358 80240958 44051000 */ mfc1 $a1, $f2 -/* DF735C 8024095C 0C019E40 */ jal guTranslateF -/* DF7360 80240960 0280202D */ daddu $a0, $s4, $zero -/* DF7364 80240964 4616A032 */ c.eq.s $f20, $f22 -/* DF7368 80240968 00000000 */ nop -/* DF736C 8024096C 4501000D */ bc1t .L802409A4 -/* DF7370 80240970 3C130001 */ lui $s3, 1 -/* DF7374 80240974 27B00088 */ addiu $s0, $sp, 0x88 -/* DF7378 80240978 4405A000 */ mfc1 $a1, $f20 -/* DF737C 8024097C 4406B000 */ mfc1 $a2, $f22 -/* DF7380 80240980 3C073F80 */ lui $a3, 0x3f80 -/* DF7384 80240984 0200202D */ daddu $a0, $s0, $zero -/* DF7388 80240988 0C019EC8 */ jal guRotateF -/* DF738C 8024098C AFA60010 */ sw $a2, 0x10($sp) -/* DF7390 80240990 0200202D */ daddu $a0, $s0, $zero -/* DF7394 80240994 0280282D */ daddu $a1, $s4, $zero -/* DF7398 80240998 0C019D80 */ jal guMtxCatF -/* DF739C 8024099C 0280302D */ daddu $a2, $s4, $zero -/* DF73A0 802409A0 3C130001 */ lui $s3, 1 -.L802409A4: -/* DF73A4 802409A4 36731630 */ ori $s3, $s3, 0x1630 -/* DF73A8 802409A8 0280202D */ daddu $a0, $s4, $zero -/* DF73AC 802409AC 3C118007 */ lui $s1, 0x8007 -/* DF73B0 802409B0 263141F0 */ addiu $s1, $s1, 0x41f0 -/* DF73B4 802409B4 3C12800A */ lui $s2, 0x800a -/* DF73B8 802409B8 2652A674 */ addiu $s2, $s2, -0x598c -/* DF73BC 802409BC 96250000 */ lhu $a1, ($s1) -/* DF73C0 802409C0 8E420000 */ lw $v0, ($s2) -/* DF73C4 802409C4 00052980 */ sll $a1, $a1, 6 -/* DF73C8 802409C8 00B32821 */ addu $a1, $a1, $s3 -/* DF73CC 802409CC 0C019D40 */ jal guMtxF2L -/* DF73D0 802409D0 00452821 */ addu $a1, $v0, $a1 -/* DF73D4 802409D4 3C03DA38 */ lui $v1, 0xda38 -/* DF73D8 802409D8 34630002 */ ori $v1, $v1, 2 -/* DF73DC 802409DC 0000202D */ daddu $a0, $zero, $zero -/* DF73E0 802409E0 27A50020 */ addiu $a1, $sp, 0x20 -/* DF73E4 802409E4 3C060001 */ lui $a2, 1 -/* DF73E8 802409E8 34C60040 */ ori $a2, $a2, 0x40 -/* DF73EC 802409EC 3C10800A */ lui $s0, 0x800a -/* DF73F0 802409F0 2610A66C */ addiu $s0, $s0, -0x5994 -/* DF73F4 802409F4 0280382D */ daddu $a3, $s4, $zero -/* DF73F8 802409F8 8E020000 */ lw $v0, ($s0) -/* DF73FC 802409FC 96280000 */ lhu $t0, ($s1) -/* DF7400 80240A00 0040482D */ daddu $t1, $v0, $zero -/* DF7404 80240A04 24420008 */ addiu $v0, $v0, 8 -/* DF7408 80240A08 AE020000 */ sw $v0, ($s0) -/* DF740C 80240A0C 3102FFFF */ andi $v0, $t0, 0xffff -/* DF7410 80240A10 00021180 */ sll $v0, $v0, 6 -/* DF7414 80240A14 00531021 */ addu $v0, $v0, $s3 -/* DF7418 80240A18 AD230000 */ sw $v1, ($t1) -/* DF741C 80240A1C 8E430000 */ lw $v1, ($s2) -/* DF7420 80240A20 25080001 */ addiu $t0, $t0, 1 -/* DF7424 80240A24 00621821 */ addu $v1, $v1, $v0 -/* DF7428 80240A28 3C028000 */ lui $v0, 0x8000 -/* DF742C 80240A2C 00621821 */ addu $v1, $v1, $v0 -/* DF7430 80240A30 AD230004 */ sw $v1, 4($t1) -/* DF7434 80240A34 93A20042 */ lbu $v0, 0x42($sp) -/* DF7438 80240A38 8FA3003C */ lw $v1, 0x3c($sp) -/* DF743C 80240A3C 93A90040 */ lbu $t1, 0x40($sp) -/* DF7440 80240A40 93AA0041 */ lbu $t2, 0x41($sp) -/* DF7444 80240A44 44820000 */ mtc1 $v0, $f0 -/* DF7448 80240A48 00000000 */ nop -/* DF744C 80240A4C 46800021 */ cvt.d.w $f0, $f0 -/* DF7450 80240A50 8FA20038 */ lw $v0, 0x38($sp) -/* DF7454 80240A54 463A0002 */ mul.d $f0, $f0, $f26 -/* DF7458 80240A58 00000000 */ nop -/* DF745C 80240A5C A6280000 */ sh $t0, ($s1) -/* DF7460 80240A60 A7A0002E */ sh $zero, 0x2e($sp) -/* DF7464 80240A64 A3B50030 */ sb $s5, 0x30($sp) -/* DF7468 80240A68 AFA30024 */ sw $v1, 0x24($sp) -/* DF746C 80240A6C A7A90028 */ sh $t1, 0x28($sp) -/* DF7470 80240A70 A7AA002A */ sh $t2, 0x2a($sp) -/* DF7474 80240A74 AFA20020 */ sw $v0, 0x20($sp) -/* DF7478 80240A78 46200007 */ neg.d $f0, $f0 -/* DF747C 80240A7C 4620010D */ trunc.w.d $f4, $f0 -/* DF7480 80240A80 44022000 */ mfc1 $v0, $f4 -/* DF7484 80240A84 0C04EBDC */ jal func_8013AF70 -/* DF7488 80240A88 A7A2002C */ sh $v0, 0x2c($sp) -/* DF748C 80240A8C 3C04D838 */ lui $a0, 0xd838 -/* DF7490 80240A90 8E020000 */ lw $v0, ($s0) -/* DF7494 80240A94 34840002 */ ori $a0, $a0, 2 -/* DF7498 80240A98 0040182D */ daddu $v1, $v0, $zero -/* DF749C 80240A9C 24420008 */ addiu $v0, $v0, 8 -/* DF74A0 80240AA0 AE020000 */ sw $v0, ($s0) -/* DF74A4 80240AA4 24020040 */ addiu $v0, $zero, 0x40 -/* DF74A8 80240AA8 AC640000 */ sw $a0, ($v1) -/* DF74AC 80240AAC AC620004 */ sw $v0, 4($v1) -/* DF74B0 80240AB0 8FBF00E0 */ lw $ra, 0xe0($sp) -/* DF74B4 80240AB4 8FB500DC */ lw $s5, 0xdc($sp) -/* DF74B8 80240AB8 8FB400D8 */ lw $s4, 0xd8($sp) -/* DF74BC 80240ABC 8FB300D4 */ lw $s3, 0xd4($sp) -/* DF74C0 80240AC0 8FB200D0 */ lw $s2, 0xd0($sp) -/* DF74C4 80240AC4 8FB100CC */ lw $s1, 0xcc($sp) -/* DF74C8 80240AC8 8FB000C8 */ lw $s0, 0xc8($sp) -/* DF74CC 80240ACC D7BC0108 */ ldc1 $f28, 0x108($sp) -/* DF74D0 80240AD0 D7BA0100 */ ldc1 $f26, 0x100($sp) -/* DF74D4 80240AD4 D7B800F8 */ ldc1 $f24, 0xf8($sp) -/* DF74D8 80240AD8 D7B600F0 */ ldc1 $f22, 0xf0($sp) -/* DF74DC 80240ADC D7B400E8 */ ldc1 $f20, 0xe8($sp) -/* DF74E0 80240AE0 03E00008 */ jr $ra -/* DF74E4 80240AE4 27BD0110 */ addiu $sp, $sp, 0x110 diff --git a/asm/nonmatchings/world/area_end/end_00/func_80240AE8_DF6A00.s b/asm/nonmatchings/world/area_end/end_00/func_80240AE8_DF6A00.s deleted file mode 100644 index 081a476c5e..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/func_80240AE8_DF6A00.s +++ /dev/null @@ -1,251 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AE8_DF74E8 -/* DF74E8 80240AE8 27BDFEF0 */ addiu $sp, $sp, -0x110 -/* DF74EC 80240AEC AFB000C8 */ sw $s0, 0xc8($sp) -/* DF74F0 80240AF0 0080802D */ daddu $s0, $a0, $zero -/* DF74F4 80240AF4 AFB100CC */ sw $s1, 0xcc($sp) -/* DF74F8 80240AF8 00A0882D */ daddu $s1, $a1, $zero -/* DF74FC 80240AFC AFB600E0 */ sw $s6, 0xe0($sp) -/* DF7500 80240B00 24160040 */ addiu $s6, $zero, 0x40 -/* DF7504 80240B04 AFBF00E4 */ sw $ra, 0xe4($sp) -/* DF7508 80240B08 AFB500DC */ sw $s5, 0xdc($sp) -/* DF750C 80240B0C AFB400D8 */ sw $s4, 0xd8($sp) -/* DF7510 80240B10 AFB300D4 */ sw $s3, 0xd4($sp) -/* DF7514 80240B14 AFB200D0 */ sw $s2, 0xd0($sp) -/* DF7518 80240B18 F7BC0108 */ sdc1 $f28, 0x108($sp) -/* DF751C 80240B1C F7BA0100 */ sdc1 $f26, 0x100($sp) -/* DF7520 80240B20 F7B800F8 */ sdc1 $f24, 0xf8($sp) -/* DF7524 80240B24 F7B600F0 */ sdc1 $f22, 0xf0($sp) -/* DF7528 80240B28 F7B400E8 */ sdc1 $f20, 0xe8($sp) -/* DF752C 80240B2C C6200010 */ lwc1 $f0, 0x10($s1) -/* DF7530 80240B30 46800020 */ cvt.s.w $f0, $f0 -/* DF7534 80240B34 8E020068 */ lw $v0, 0x68($s0) -/* DF7538 80240B38 8E030014 */ lw $v1, 0x14($s0) -/* DF753C 80240B3C 44060000 */ mfc1 $a2, $f0 -/* DF7540 80240B40 8E07001C */ lw $a3, 0x1c($s0) -/* DF7544 80240B44 00431021 */ addu $v0, $v0, $v1 -/* DF7548 80240B48 2442FFF0 */ addiu $v0, $v0, -0x10 -/* DF754C 80240B4C 44822000 */ mtc1 $v0, $f4 -/* DF7550 80240B50 00000000 */ nop -/* DF7554 80240B54 46802120 */ cvt.s.w $f4, $f4 -/* DF7558 80240B58 8E03006C */ lw $v1, 0x6c($s0) -/* DF755C 80240B5C 44052000 */ mfc1 $a1, $f4 -/* DF7560 80240B60 AFA70010 */ sw $a3, 0x10($sp) -/* DF7564 80240B64 8E270018 */ lw $a3, 0x18($s1) -/* DF7568 80240B68 2463003C */ addiu $v1, $v1, 0x3c -/* DF756C 80240B6C 4483A000 */ mtc1 $v1, $f20 -/* DF7570 80240B70 00000000 */ nop -/* DF7574 80240B74 4680A520 */ cvt.s.w $f20, $f20 -/* DF7578 80240B78 0C00A8ED */ jal update_lerp -/* DF757C 80240B7C 2404000A */ addiu $a0, $zero, 0xa -/* DF7580 80240B80 C6220014 */ lwc1 $f2, 0x14($s1) -/* DF7584 80240B84 468010A0 */ cvt.s.w $f2, $f2 -/* DF7588 80240B88 4405A000 */ mfc1 $a1, $f20 -/* DF758C 80240B8C 44061000 */ mfc1 $a2, $f2 -/* DF7590 80240B90 8E02001C */ lw $v0, 0x1c($s0) -/* DF7594 80240B94 24040005 */ addiu $a0, $zero, 5 -/* DF7598 80240B98 AFA20010 */ sw $v0, 0x10($sp) -/* DF759C 80240B9C 8E270018 */ lw $a3, 0x18($s1) -/* DF75A0 80240BA0 0C00A8ED */ jal update_lerp -/* DF75A4 80240BA4 46000506 */ mov.s $f20, $f0 -/* DF75A8 80240BA8 27B50038 */ addiu $s5, $sp, 0x38 -/* DF75AC 80240BAC 8E220018 */ lw $v0, 0x18($s1) -/* DF75B0 80240BB0 8E03001C */ lw $v1, 0x1c($s0) -/* DF75B4 80240BB4 14430004 */ bne $v0, $v1, .L80240BC8 -/* DF75B8 80240BB8 46000706 */ mov.s $f28, $f0 -/* DF75BC 80240BBC 4480B000 */ mtc1 $zero, $f22 -/* DF75C0 80240BC0 080902F9 */ j .L80240BE4 -/* DF75C4 80240BC4 00000000 */ nop -.L80240BC8: -/* DF75C8 80240BC8 00621823 */ subu $v1, $v1, $v0 -/* DF75CC 80240BCC 00031080 */ sll $v0, $v1, 2 -/* DF75D0 80240BD0 00431021 */ addu $v0, $v0, $v1 -/* DF75D4 80240BD4 00021040 */ sll $v0, $v0, 1 -/* DF75D8 80240BD8 4482B000 */ mtc1 $v0, $f22 -/* DF75DC 80240BDC 00000000 */ nop -/* DF75E0 80240BE0 4680B5A0 */ cvt.s.w $f22, $f22 -.L80240BE4: -/* DF75E4 80240BE4 8E02001C */ lw $v0, 0x1c($s0) -/* DF75E8 80240BE8 3C054000 */ lui $a1, 0x4000 -/* DF75EC 80240BEC 3C063F80 */ lui $a2, 0x3f80 -/* DF75F0 80240BF0 AFA20010 */ sw $v0, 0x10($sp) -/* DF75F4 80240BF4 8E270018 */ lw $a3, 0x18($s1) -/* DF75F8 80240BF8 0C00A8ED */ jal update_lerp -/* DF75FC 80240BFC 24040004 */ addiu $a0, $zero, 4 -/* DF7600 80240C00 8E220018 */ lw $v0, 0x18($s1) -/* DF7604 80240C04 8E04001C */ lw $a0, 0x1c($s0) -/* DF7608 80240C08 1444000C */ bne $v0, $a0, .L80240C3C -/* DF760C 80240C0C 46000686 */ mov.s $f26, $f0 -/* DF7610 80240C10 0000202D */ daddu $a0, $zero, $zero -/* DF7614 80240C14 0080282D */ daddu $a1, $a0, $zero -/* DF7618 80240C18 0080302D */ daddu $a2, $a0, $zero -/* DF761C 80240C1C 0080382D */ daddu $a3, $a0, $zero -/* DF7620 80240C20 AFA00010 */ sw $zero, 0x10($sp) -/* DF7624 80240C24 AFA00014 */ sw $zero, 0x14($sp) -/* DF7628 80240C28 0C04EAA7 */ jal func_8013AA9C -/* DF762C 80240C2C AFA00018 */ sw $zero, 0x18($sp) -/* DF7630 80240C30 3C020001 */ lui $v0, 1 -/* DF7634 80240C34 08090326 */ j .L80240C98 -/* DF7638 80240C38 02C2B025 */ or $s6, $s6, $v0 -.L80240C3C: -/* DF763C 80240C3C 3C054180 */ lui $a1, 0x4180 -/* DF7640 80240C40 3C064396 */ lui $a2, 0x4396 -/* DF7644 80240C44 AFA40010 */ sw $a0, 0x10($sp) -/* DF7648 80240C48 8E270018 */ lw $a3, 0x18($s1) -/* DF764C 80240C4C 0C00A8ED */ jal update_lerp -/* DF7650 80240C50 0000202D */ daddu $a0, $zero, $zero -/* DF7654 80240C54 3C01437F */ lui $at, 0x437f -/* DF7658 80240C58 44811000 */ mtc1 $at, $f2 -/* DF765C 80240C5C 00000000 */ nop -/* DF7660 80240C60 4600103C */ c.lt.s $f2, $f0 -/* DF7664 80240C64 00000000 */ nop -/* DF7668 80240C68 45030001 */ bc1tl .L80240C70 -/* DF766C 80240C6C 46001006 */ mov.s $f0, $f2 -.L80240C70: -/* DF7670 80240C70 4600010D */ trunc.w.s $f4, $f0 -/* DF7674 80240C74 E7A40014 */ swc1 $f4, 0x14($sp) -/* DF7678 80240C78 0000202D */ daddu $a0, $zero, $zero -/* DF767C 80240C7C 24050007 */ addiu $a1, $zero, 7 -/* DF7680 80240C80 240600FF */ addiu $a2, $zero, 0xff -/* DF7684 80240C84 00C0382D */ daddu $a3, $a2, $zero -/* DF7688 80240C88 00C0102D */ daddu $v0, $a2, $zero -/* DF768C 80240C8C AFA20010 */ sw $v0, 0x10($sp) -/* DF7690 80240C90 0C04EAA7 */ jal func_8013AA9C -/* DF7694 80240C94 AFA00018 */ sw $zero, 0x18($sp) -.L80240C98: -/* DF7698 80240C98 AFB50010 */ sw $s5, 0x10($sp) -/* DF769C 80240C9C 8E240004 */ lw $a0, 4($s1) -/* DF76A0 80240CA0 8E250008 */ lw $a1, 8($s1) -/* DF76A4 80240CA4 8E260000 */ lw $a2, ($s1) -/* DF76A8 80240CA8 8E27000C */ lw $a3, 0xc($s1) -/* DF76AC 80240CAC 0C04BA38 */ jal func_8012E8E0 -/* DF76B0 80240CB0 3C140001 */ lui $s4, 1 -/* DF76B4 80240CB4 92A2000A */ lbu $v0, 0xa($s5) -/* DF76B8 80240CB8 3C013FE0 */ lui $at, 0x3fe0 -/* DF76BC 80240CBC 4481C800 */ mtc1 $at, $f25 -/* DF76C0 80240CC0 4480C000 */ mtc1 $zero, $f24 -/* DF76C4 80240CC4 44820000 */ mtc1 $v0, $f0 -/* DF76C8 80240CC8 00000000 */ nop -/* DF76CC 80240CCC 46800021 */ cvt.d.w $f0, $f0 -/* DF76D0 80240CD0 46380002 */ mul.d $f0, $f0, $f24 -/* DF76D4 80240CD4 00000000 */ nop -/* DF76D8 80240CD8 36941630 */ ori $s4, $s4, 0x1630 -/* DF76DC 80240CDC 4600A0A1 */ cvt.d.s $f2, $f20 -/* DF76E0 80240CE0 27B10048 */ addiu $s1, $sp, 0x48 -/* DF76E4 80240CE4 4600E707 */ neg.s $f28, $f28 -/* DF76E8 80240CE8 4480A000 */ mtc1 $zero, $f20 -/* DF76EC 80240CEC 46201080 */ add.d $f2, $f2, $f0 -/* DF76F0 80240CF0 4406E000 */ mfc1 $a2, $f28 -/* DF76F4 80240CF4 4407A000 */ mfc1 $a3, $f20 -/* DF76F8 80240CF8 462010A0 */ cvt.s.d $f2, $f2 -/* DF76FC 80240CFC 44051000 */ mfc1 $a1, $f2 -/* DF7700 80240D00 0C019E40 */ jal guTranslateF -/* DF7704 80240D04 0220202D */ daddu $a0, $s1, $zero -/* DF7708 80240D08 27B00088 */ addiu $s0, $sp, 0x88 -/* DF770C 80240D0C 4405B000 */ mfc1 $a1, $f22 -/* DF7710 80240D10 3C013F80 */ lui $at, 0x3f80 -/* DF7714 80240D14 4481B000 */ mtc1 $at, $f22 -/* DF7718 80240D18 4406A000 */ mfc1 $a2, $f20 -/* DF771C 80240D1C 3C013E4C */ lui $at, 0x3e4c -/* DF7720 80240D20 3421CCCD */ ori $at, $at, 0xcccd -/* DF7724 80240D24 44810000 */ mtc1 $at, $f0 -/* DF7728 80240D28 4407B000 */ mfc1 $a3, $f22 -/* DF772C 80240D2C 0200202D */ daddu $a0, $s0, $zero -/* DF7730 80240D30 0C019EC8 */ jal guRotateF -/* DF7734 80240D34 E7A00010 */ swc1 $f0, 0x10($sp) -/* DF7738 80240D38 0200202D */ daddu $a0, $s0, $zero -/* DF773C 80240D3C 0220282D */ daddu $a1, $s1, $zero -/* DF7740 80240D40 0C019D80 */ jal guMtxCatF -/* DF7744 80240D44 0220302D */ daddu $a2, $s1, $zero -/* DF7748 80240D48 0200202D */ daddu $a0, $s0, $zero -/* DF774C 80240D4C 4405D000 */ mfc1 $a1, $f26 -/* DF7750 80240D50 4407B000 */ mfc1 $a3, $f22 -/* DF7754 80240D54 0C019DF0 */ jal guScaleF -/* DF7758 80240D58 00A0302D */ daddu $a2, $a1, $zero -/* DF775C 80240D5C 0200202D */ daddu $a0, $s0, $zero -/* DF7760 80240D60 0220282D */ daddu $a1, $s1, $zero -/* DF7764 80240D64 0C019D80 */ jal guMtxCatF -/* DF7768 80240D68 0220302D */ daddu $a2, $s1, $zero -/* DF776C 80240D6C 0220202D */ daddu $a0, $s1, $zero -/* DF7770 80240D70 3C108007 */ lui $s0, 0x8007 -/* DF7774 80240D74 261041F0 */ addiu $s0, $s0, 0x41f0 -/* DF7778 80240D78 3C13800A */ lui $s3, 0x800a -/* DF777C 80240D7C 2673A674 */ addiu $s3, $s3, -0x598c -/* DF7780 80240D80 96050000 */ lhu $a1, ($s0) -/* DF7784 80240D84 8E620000 */ lw $v0, ($s3) -/* DF7788 80240D88 00052980 */ sll $a1, $a1, 6 -/* DF778C 80240D8C 00B42821 */ addu $a1, $a1, $s4 -/* DF7790 80240D90 0C019D40 */ jal guMtxF2L -/* DF7794 80240D94 00452821 */ addu $a1, $v0, $a1 -/* DF7798 80240D98 3C02DA38 */ lui $v0, 0xda38 -/* DF779C 80240D9C 34420002 */ ori $v0, $v0, 2 -/* DF77A0 80240DA0 3C12800A */ lui $s2, 0x800a -/* DF77A4 80240DA4 2652A66C */ addiu $s2, $s2, -0x5994 -/* DF77A8 80240DA8 8E440000 */ lw $a0, ($s2) -/* DF77AC 80240DAC 96050000 */ lhu $a1, ($s0) -/* DF77B0 80240DB0 0080302D */ daddu $a2, $a0, $zero -/* DF77B4 80240DB4 ACC20000 */ sw $v0, ($a2) -/* DF77B8 80240DB8 30A2FFFF */ andi $v0, $a1, 0xffff -/* DF77BC 80240DBC 00021180 */ sll $v0, $v0, 6 -/* DF77C0 80240DC0 8E630000 */ lw $v1, ($s3) -/* DF77C4 80240DC4 00541021 */ addu $v0, $v0, $s4 -/* DF77C8 80240DC8 00621821 */ addu $v1, $v1, $v0 -/* DF77CC 80240DCC 3C028000 */ lui $v0, 0x8000 -/* DF77D0 80240DD0 00621821 */ addu $v1, $v1, $v0 -/* DF77D4 80240DD4 ACC30004 */ sw $v1, 4($a2) -/* DF77D8 80240DD8 8EA20000 */ lw $v0, ($s5) -/* DF77DC 80240DDC 24840008 */ addiu $a0, $a0, 8 -/* DF77E0 80240DE0 AE440000 */ sw $a0, ($s2) -/* DF77E4 80240DE4 AFA20020 */ sw $v0, 0x20($sp) -/* DF77E8 80240DE8 8EA20004 */ lw $v0, 4($s5) -/* DF77EC 80240DEC 24A50001 */ addiu $a1, $a1, 1 -/* DF77F0 80240DF0 A6050000 */ sh $a1, ($s0) -/* DF77F4 80240DF4 AFA20024 */ sw $v0, 0x24($sp) -/* DF77F8 80240DF8 92A20008 */ lbu $v0, 8($s5) -/* DF77FC 80240DFC A7A20028 */ sh $v0, 0x28($sp) -/* DF7800 80240E00 92A20009 */ lbu $v0, 9($s5) -/* DF7804 80240E04 A7A2002A */ sh $v0, 0x2a($sp) -/* DF7808 80240E08 92A2000A */ lbu $v0, 0xa($s5) -/* DF780C 80240E0C 44820000 */ mtc1 $v0, $f0 -/* DF7810 80240E10 00000000 */ nop -/* DF7814 80240E14 46800021 */ cvt.d.w $f0, $f0 -/* DF7818 80240E18 46380002 */ mul.d $f0, $f0, $f24 -/* DF781C 80240E1C 00000000 */ nop -/* DF7820 80240E20 0220382D */ daddu $a3, $s1, $zero -/* DF7824 80240E24 0000202D */ daddu $a0, $zero, $zero -/* DF7828 80240E28 02C0302D */ daddu $a2, $s6, $zero -/* DF782C 80240E2C 27A50020 */ addiu $a1, $sp, 0x20 -/* DF7830 80240E30 A7A0002E */ sh $zero, 0x2e($sp) -/* DF7834 80240E34 240200FF */ addiu $v0, $zero, 0xff -/* DF7838 80240E38 A3A20030 */ sb $v0, 0x30($sp) -/* DF783C 80240E3C 46200007 */ neg.d $f0, $f0 -/* DF7840 80240E40 4620010D */ trunc.w.d $f4, $f0 -/* DF7844 80240E44 44022000 */ mfc1 $v0, $f4 -/* DF7848 80240E48 0C04EBDC */ jal func_8013AF70 -/* DF784C 80240E4C A7A2002C */ sh $v0, 0x2c($sp) -/* DF7850 80240E50 3C04D838 */ lui $a0, 0xd838 -/* DF7854 80240E54 8E420000 */ lw $v0, ($s2) -/* DF7858 80240E58 34840002 */ ori $a0, $a0, 2 -/* DF785C 80240E5C 0040182D */ daddu $v1, $v0, $zero -/* DF7860 80240E60 24420008 */ addiu $v0, $v0, 8 -/* DF7864 80240E64 AE420000 */ sw $v0, ($s2) -/* DF7868 80240E68 24020040 */ addiu $v0, $zero, 0x40 -/* DF786C 80240E6C AC640000 */ sw $a0, ($v1) -/* DF7870 80240E70 AC620004 */ sw $v0, 4($v1) -/* DF7874 80240E74 8FBF00E4 */ lw $ra, 0xe4($sp) -/* DF7878 80240E78 8FB600E0 */ lw $s6, 0xe0($sp) -/* DF787C 80240E7C 8FB500DC */ lw $s5, 0xdc($sp) -/* DF7880 80240E80 8FB400D8 */ lw $s4, 0xd8($sp) -/* DF7884 80240E84 8FB300D4 */ lw $s3, 0xd4($sp) -/* DF7888 80240E88 8FB200D0 */ lw $s2, 0xd0($sp) -/* DF788C 80240E8C 8FB100CC */ lw $s1, 0xcc($sp) -/* DF7890 80240E90 8FB000C8 */ lw $s0, 0xc8($sp) -/* DF7894 80240E94 D7BC0108 */ ldc1 $f28, 0x108($sp) -/* DF7898 80240E98 D7BA0100 */ ldc1 $f26, 0x100($sp) -/* DF789C 80240E9C D7B800F8 */ ldc1 $f24, 0xf8($sp) -/* DF78A0 80240EA0 D7B600F0 */ ldc1 $f22, 0xf0($sp) -/* DF78A4 80240EA4 D7B400E8 */ ldc1 $f20, 0xe8($sp) -/* DF78A8 80240EA8 03E00008 */ jr $ra -/* DF78AC 80240EAC 27BD0110 */ addiu $sp, $sp, 0x110 diff --git a/asm/nonmatchings/world/area_end/end_00/func_80240FEC_DF6A00.s b/asm/nonmatchings/world/area_end/end_00/func_80240FEC_DF6A00.s deleted file mode 100644 index 213533d1bf..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/func_80240FEC_DF6A00.s +++ /dev/null @@ -1,124 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FEC_DF79EC -/* DF79EC 80240FEC 27BDFF48 */ addiu $sp, $sp, -0xb8 -/* DF79F0 80240FF0 AFB00088 */ sw $s0, 0x88($sp) -/* DF79F4 80240FF4 00A0802D */ daddu $s0, $a1, $zero -/* DF79F8 80240FF8 0000202D */ daddu $a0, $zero, $zero -/* DF79FC 80240FFC 0080282D */ daddu $a1, $a0, $zero -/* DF7A00 80241000 0080302D */ daddu $a2, $a0, $zero -/* DF7A04 80241004 0080382D */ daddu $a3, $a0, $zero -/* DF7A08 80241008 AFBF00A0 */ sw $ra, 0xa0($sp) -/* DF7A0C 8024100C AFB5009C */ sw $s5, 0x9c($sp) -/* DF7A10 80241010 AFB40098 */ sw $s4, 0x98($sp) -/* DF7A14 80241014 AFB30094 */ sw $s3, 0x94($sp) -/* DF7A18 80241018 AFB20090 */ sw $s2, 0x90($sp) -/* DF7A1C 8024101C AFB1008C */ sw $s1, 0x8c($sp) -/* DF7A20 80241020 F7B600B0 */ sdc1 $f22, 0xb0($sp) -/* DF7A24 80241024 F7B400A8 */ sdc1 $f20, 0xa8($sp) -/* DF7A28 80241028 C6140010 */ lwc1 $f20, 0x10($s0) -/* DF7A2C 8024102C 4680A520 */ cvt.s.w $f20, $f20 -/* DF7A30 80241030 C6160014 */ lwc1 $f22, 0x14($s0) -/* DF7A34 80241034 4680B5A0 */ cvt.s.w $f22, $f22 -/* DF7A38 80241038 AFA00010 */ sw $zero, 0x10($sp) -/* DF7A3C 8024103C AFA00014 */ sw $zero, 0x14($sp) -/* DF7A40 80241040 0C04EAA7 */ jal func_8013AA9C -/* DF7A44 80241044 AFA00018 */ sw $zero, 0x18($sp) -/* DF7A48 80241048 27B40048 */ addiu $s4, $sp, 0x48 -/* DF7A4C 8024104C 0280202D */ daddu $a0, $s4, $zero -/* DF7A50 80241050 0000382D */ daddu $a3, $zero, $zero -/* DF7A54 80241054 3C150001 */ lui $s5, 1 -/* DF7A58 80241058 4600B587 */ neg.s $f22, $f22 -/* DF7A5C 8024105C 4405A000 */ mfc1 $a1, $f20 -/* DF7A60 80241060 4406B000 */ mfc1 $a2, $f22 -/* DF7A64 80241064 0C019E40 */ jal guTranslateF -/* DF7A68 80241068 36B51630 */ ori $s5, $s5, 0x1630 -/* DF7A6C 8024106C 0280202D */ daddu $a0, $s4, $zero -/* DF7A70 80241070 3C118007 */ lui $s1, 0x8007 -/* DF7A74 80241074 263141F0 */ addiu $s1, $s1, 0x41f0 -/* DF7A78 80241078 3C12800A */ lui $s2, 0x800a -/* DF7A7C 8024107C 2652A674 */ addiu $s2, $s2, -0x598c -/* DF7A80 80241080 96250000 */ lhu $a1, ($s1) -/* DF7A84 80241084 8E420000 */ lw $v0, ($s2) -/* DF7A88 80241088 00052980 */ sll $a1, $a1, 6 -/* DF7A8C 8024108C 00B52821 */ addu $a1, $a1, $s5 -/* DF7A90 80241090 0C019D40 */ jal guMtxF2L -/* DF7A94 80241094 00452821 */ addu $a1, $v0, $a1 -/* DF7A98 80241098 3C02DA38 */ lui $v0, 0xda38 -/* DF7A9C 8024109C 34420002 */ ori $v0, $v0, 2 -/* DF7AA0 802410A0 3C13800A */ lui $s3, 0x800a -/* DF7AA4 802410A4 2673A66C */ addiu $s3, $s3, -0x5994 -/* DF7AA8 802410A8 8E680000 */ lw $t0, ($s3) -/* DF7AAC 802410AC 96290000 */ lhu $t1, ($s1) -/* DF7AB0 802410B0 0100202D */ daddu $a0, $t0, $zero -/* DF7AB4 802410B4 AC820000 */ sw $v0, ($a0) -/* DF7AB8 802410B8 3122FFFF */ andi $v0, $t1, 0xffff -/* DF7ABC 802410BC 00021180 */ sll $v0, $v0, 6 -/* DF7AC0 802410C0 00551021 */ addu $v0, $v0, $s5 -/* DF7AC4 802410C4 8E430000 */ lw $v1, ($s2) -/* DF7AC8 802410C8 25080008 */ addiu $t0, $t0, 8 -/* DF7ACC 802410CC 00621821 */ addu $v1, $v1, $v0 -/* DF7AD0 802410D0 3C028000 */ lui $v0, 0x8000 -/* DF7AD4 802410D4 00621821 */ addu $v1, $v1, $v0 -/* DF7AD8 802410D8 27A20038 */ addiu $v0, $sp, 0x38 -/* DF7ADC 802410DC AC830004 */ sw $v1, 4($a0) -/* DF7AE0 802410E0 AFA20010 */ sw $v0, 0x10($sp) -/* DF7AE4 802410E4 8E040004 */ lw $a0, 4($s0) -/* DF7AE8 802410E8 8E050008 */ lw $a1, 8($s0) -/* DF7AEC 802410EC 8E060000 */ lw $a2, ($s0) -/* DF7AF0 802410F0 8E07000C */ lw $a3, 0xc($s0) -/* DF7AF4 802410F4 25290001 */ addiu $t1, $t1, 1 -/* DF7AF8 802410F8 AE680000 */ sw $t0, ($s3) -/* DF7AFC 802410FC 0C04BA38 */ jal func_8012E8E0 -/* DF7B00 80241100 A6290000 */ sh $t1, ($s1) -/* DF7B04 80241104 0000202D */ daddu $a0, $zero, $zero -/* DF7B08 80241108 27A50020 */ addiu $a1, $sp, 0x20 -/* DF7B0C 8024110C 3C060005 */ lui $a2, 5 -/* DF7B10 80241110 34C60040 */ ori $a2, $a2, 0x40 -/* DF7B14 80241114 0280382D */ daddu $a3, $s4, $zero -/* DF7B18 80241118 93A20042 */ lbu $v0, 0x42($sp) -/* DF7B1C 8024111C 3C013FE0 */ lui $at, 0x3fe0 -/* DF7B20 80241120 44810800 */ mtc1 $at, $f1 -/* DF7B24 80241124 44800000 */ mtc1 $zero, $f0 -/* DF7B28 80241128 8FA30038 */ lw $v1, 0x38($sp) -/* DF7B2C 8024112C 8FA8003C */ lw $t0, 0x3c($sp) -/* DF7B30 80241130 93A90040 */ lbu $t1, 0x40($sp) -/* DF7B34 80241134 93AA0041 */ lbu $t2, 0x41($sp) -/* DF7B38 80241138 44821000 */ mtc1 $v0, $f2 -/* DF7B3C 8024113C 00000000 */ nop -/* DF7B40 80241140 468010A1 */ cvt.d.w $f2, $f2 -/* DF7B44 80241144 46201082 */ mul.d $f2, $f2, $f0 -/* DF7B48 80241148 00000000 */ nop -/* DF7B4C 8024114C A7A0002E */ sh $zero, 0x2e($sp) -/* DF7B50 80241150 240200FF */ addiu $v0, $zero, 0xff -/* DF7B54 80241154 A3A20030 */ sb $v0, 0x30($sp) -/* DF7B58 80241158 AFA30020 */ sw $v1, 0x20($sp) -/* DF7B5C 8024115C AFA80024 */ sw $t0, 0x24($sp) -/* DF7B60 80241160 A7A90028 */ sh $t1, 0x28($sp) -/* DF7B64 80241164 A7AA002A */ sh $t2, 0x2a($sp) -/* DF7B68 80241168 46201087 */ neg.d $f2, $f2 -/* DF7B6C 8024116C 4620110D */ trunc.w.d $f4, $f2 -/* DF7B70 80241170 44022000 */ mfc1 $v0, $f4 -/* DF7B74 80241174 0C04EBDC */ jal func_8013AF70 -/* DF7B78 80241178 A7A2002C */ sh $v0, 0x2c($sp) -/* DF7B7C 8024117C 3C04D838 */ lui $a0, 0xd838 -/* DF7B80 80241180 8E620000 */ lw $v0, ($s3) -/* DF7B84 80241184 34840002 */ ori $a0, $a0, 2 -/* DF7B88 80241188 0040182D */ daddu $v1, $v0, $zero -/* DF7B8C 8024118C 24420008 */ addiu $v0, $v0, 8 -/* DF7B90 80241190 AE620000 */ sw $v0, ($s3) -/* DF7B94 80241194 24020040 */ addiu $v0, $zero, 0x40 -/* DF7B98 80241198 AC640000 */ sw $a0, ($v1) -/* DF7B9C 8024119C AC620004 */ sw $v0, 4($v1) -/* DF7BA0 802411A0 8FBF00A0 */ lw $ra, 0xa0($sp) -/* DF7BA4 802411A4 8FB5009C */ lw $s5, 0x9c($sp) -/* DF7BA8 802411A8 8FB40098 */ lw $s4, 0x98($sp) -/* DF7BAC 802411AC 8FB30094 */ lw $s3, 0x94($sp) -/* DF7BB0 802411B0 8FB20090 */ lw $s2, 0x90($sp) -/* DF7BB4 802411B4 8FB1008C */ lw $s1, 0x8c($sp) -/* DF7BB8 802411B8 8FB00088 */ lw $s0, 0x88($sp) -/* DF7BBC 802411BC D7B600B0 */ ldc1 $f22, 0xb0($sp) -/* DF7BC0 802411C0 D7B400A8 */ ldc1 $f20, 0xa8($sp) -/* DF7BC4 802411C4 03E00008 */ jr $ra -/* DF7BC8 802411C8 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/asm/nonmatchings/world/area_end/end_00/func_80241768_DF6A00.s b/asm/nonmatchings/world/area_end/end_00/func_80241768_DF6A00.s deleted file mode 100644 index 4cb09cfa03..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/func_80241768_DF6A00.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241768_DF8168 -/* DF8168 80241768 27BDFEF0 */ addiu $sp, $sp, -0x110 -/* DF816C 8024176C AFB100CC */ sw $s1, 0xcc($sp) -/* DF8170 80241770 0080882D */ daddu $s1, $a0, $zero -/* DF8174 80241774 AFB000C8 */ sw $s0, 0xc8($sp) -/* DF8178 80241778 00A0802D */ daddu $s0, $a1, $zero -/* DF817C 8024177C AFBF00E0 */ sw $ra, 0xe0($sp) -/* DF8180 80241780 AFB500DC */ sw $s5, 0xdc($sp) -/* DF8184 80241784 AFB400D8 */ sw $s4, 0xd8($sp) -/* DF8188 80241788 AFB300D4 */ sw $s3, 0xd4($sp) -/* DF818C 8024178C AFB200D0 */ sw $s2, 0xd0($sp) -/* DF8190 80241790 F7BC0108 */ sdc1 $f28, 0x108($sp) -/* DF8194 80241794 F7BA0100 */ sdc1 $f26, 0x100($sp) -/* DF8198 80241798 F7B800F8 */ sdc1 $f24, 0xf8($sp) -/* DF819C 8024179C F7B600F0 */ sdc1 $f22, 0xf0($sp) -/* DF81A0 802417A0 F7B400E8 */ sdc1 $f20, 0xe8($sp) -/* DF81A4 802417A4 C6140010 */ lwc1 $f20, 0x10($s0) -/* DF81A8 802417A8 4680A520 */ cvt.s.w $f20, $f20 -/* DF81AC 802417AC 4480B000 */ mtc1 $zero, $f22 -/* DF81B0 802417B0 3C05437F */ lui $a1, 0x437f -/* DF81B4 802417B4 8E220050 */ lw $v0, 0x50($s1) -/* DF81B8 802417B8 4406B000 */ mfc1 $a2, $f22 -/* DF81BC 802417BC C61C0014 */ lwc1 $f28, 0x14($s0) -/* DF81C0 802417C0 4680E720 */ cvt.s.w $f28, $f28 -/* DF81C4 802417C4 AFA20010 */ sw $v0, 0x10($sp) -/* DF81C8 802417C8 8E070018 */ lw $a3, 0x18($s0) -/* DF81CC 802417CC 0C00A8ED */ jal update_lerp -/* DF81D0 802417D0 2404000B */ addiu $a0, $zero, 0xb -/* DF81D4 802417D4 4600008D */ trunc.w.s $f2, $f0 -/* DF81D8 802417D8 E7A20014 */ swc1 $f2, 0x14($sp) -/* DF81DC 802417DC 0000202D */ daddu $a0, $zero, $zero -/* DF81E0 802417E0 24050007 */ addiu $a1, $zero, 7 -/* DF81E4 802417E4 240600FF */ addiu $a2, $zero, 0xff -/* DF81E8 802417E8 00C0382D */ daddu $a3, $a2, $zero -/* DF81EC 802417EC 00C0A82D */ daddu $s5, $a2, $zero -/* DF81F0 802417F0 AFB50010 */ sw $s5, 0x10($sp) -/* DF81F4 802417F4 0C04EAA7 */ jal func_8013AA9C -/* DF81F8 802417F8 AFA00018 */ sw $zero, 0x18($sp) -/* DF81FC 802417FC 8E220050 */ lw $v0, 0x50($s1) -/* DF8200 80241800 4405B000 */ mfc1 $a1, $f22 -/* DF8204 80241804 3C064270 */ lui $a2, 0x4270 -/* DF8208 80241808 AFA20010 */ sw $v0, 0x10($sp) -/* DF820C 8024180C 8E070018 */ lw $a3, 0x18($s0) -/* DF8210 80241810 0C00A8ED */ jal update_lerp -/* DF8214 80241814 0000202D */ daddu $a0, $zero, $zero -/* DF8218 80241818 27A20038 */ addiu $v0, $sp, 0x38 -/* DF821C 8024181C AFA20010 */ sw $v0, 0x10($sp) -/* DF8220 80241820 8E040004 */ lw $a0, 4($s0) -/* DF8224 80241824 8E050008 */ lw $a1, 8($s0) -/* DF8228 80241828 8E060000 */ lw $a2, ($s0) -/* DF822C 8024182C 8E07000C */ lw $a3, 0xc($s0) -/* DF8230 80241830 0C04BA38 */ jal func_8012E8E0 -/* DF8234 80241834 46000606 */ mov.s $f24, $f0 -/* DF8238 80241838 93A20042 */ lbu $v0, 0x42($sp) -/* DF823C 8024183C 3C013FE0 */ lui $at, 0x3fe0 -/* DF8240 80241840 4481D800 */ mtc1 $at, $f27 -/* DF8244 80241844 4480D000 */ mtc1 $zero, $f26 -/* DF8248 80241848 44820000 */ mtc1 $v0, $f0 -/* DF824C 8024184C 00000000 */ nop -/* DF8250 80241850 46800021 */ cvt.d.w $f0, $f0 -/* DF8254 80241854 463A0002 */ mul.d $f0, $f0, $f26 -/* DF8258 80241858 00000000 */ nop -/* DF825C 8024185C 3C140001 */ lui $s4, 1 -/* DF8260 80241860 36941630 */ ori $s4, $s4, 0x1630 -/* DF8264 80241864 4600A521 */ cvt.d.s $f20, $f20 -/* DF8268 80241868 27B10048 */ addiu $s1, $sp, 0x48 -/* DF826C 8024186C 4600E707 */ neg.s $f28, $f28 -/* DF8270 80241870 4620A500 */ add.d $f20, $f20, $f0 -/* DF8274 80241874 4406E000 */ mfc1 $a2, $f28 -/* DF8278 80241878 4407B000 */ mfc1 $a3, $f22 -/* DF827C 8024187C 4620A520 */ cvt.s.d $f20, $f20 -/* DF8280 80241880 4405A000 */ mfc1 $a1, $f20 -/* DF8284 80241884 0C019E40 */ jal guTranslateF -/* DF8288 80241888 0220202D */ daddu $a0, $s1, $zero -/* DF828C 8024188C 27B00088 */ addiu $s0, $sp, 0x88 -/* DF8290 80241890 4405C000 */ mfc1 $a1, $f24 -/* DF8294 80241894 4406B000 */ mfc1 $a2, $f22 -/* DF8298 80241898 3C073F80 */ lui $a3, 0x3f80 -/* DF829C 8024189C 0200202D */ daddu $a0, $s0, $zero -/* DF82A0 802418A0 0C019EC8 */ jal guRotateF -/* DF82A4 802418A4 AFA60010 */ sw $a2, 0x10($sp) -/* DF82A8 802418A8 0200202D */ daddu $a0, $s0, $zero -/* DF82AC 802418AC 0220282D */ daddu $a1, $s1, $zero -/* DF82B0 802418B0 0C019D80 */ jal guMtxCatF -/* DF82B4 802418B4 0220302D */ daddu $a2, $s1, $zero -/* DF82B8 802418B8 0220202D */ daddu $a0, $s1, $zero -/* DF82BC 802418BC 3C128007 */ lui $s2, 0x8007 -/* DF82C0 802418C0 265241F0 */ addiu $s2, $s2, 0x41f0 -/* DF82C4 802418C4 3C13800A */ lui $s3, 0x800a -/* DF82C8 802418C8 2673A674 */ addiu $s3, $s3, -0x598c -/* DF82CC 802418CC 96450000 */ lhu $a1, ($s2) -/* DF82D0 802418D0 8E620000 */ lw $v0, ($s3) -/* DF82D4 802418D4 00052980 */ sll $a1, $a1, 6 -/* DF82D8 802418D8 00B42821 */ addu $a1, $a1, $s4 -/* DF82DC 802418DC 0C019D40 */ jal guMtxF2L -/* DF82E0 802418E0 00452821 */ addu $a1, $v0, $a1 -/* DF82E4 802418E4 3C03DA38 */ lui $v1, 0xda38 -/* DF82E8 802418E8 34630002 */ ori $v1, $v1, 2 -/* DF82EC 802418EC 0000202D */ daddu $a0, $zero, $zero -/* DF82F0 802418F0 27A50020 */ addiu $a1, $sp, 0x20 -/* DF82F4 802418F4 3C060001 */ lui $a2, 1 -/* DF82F8 802418F8 34C60040 */ ori $a2, $a2, 0x40 -/* DF82FC 802418FC 3C10800A */ lui $s0, 0x800a -/* DF8300 80241900 2610A66C */ addiu $s0, $s0, -0x5994 -/* DF8304 80241904 0220382D */ daddu $a3, $s1, $zero -/* DF8308 80241908 8E020000 */ lw $v0, ($s0) -/* DF830C 8024190C 96480000 */ lhu $t0, ($s2) -/* DF8310 80241910 0040482D */ daddu $t1, $v0, $zero -/* DF8314 80241914 24420008 */ addiu $v0, $v0, 8 -/* DF8318 80241918 AE020000 */ sw $v0, ($s0) -/* DF831C 8024191C 3102FFFF */ andi $v0, $t0, 0xffff -/* DF8320 80241920 00021180 */ sll $v0, $v0, 6 -/* DF8324 80241924 00541021 */ addu $v0, $v0, $s4 -/* DF8328 80241928 AD230000 */ sw $v1, ($t1) -/* DF832C 8024192C 8E630000 */ lw $v1, ($s3) -/* DF8330 80241930 25080001 */ addiu $t0, $t0, 1 -/* DF8334 80241934 00621821 */ addu $v1, $v1, $v0 -/* DF8338 80241938 3C028000 */ lui $v0, 0x8000 -/* DF833C 8024193C 00621821 */ addu $v1, $v1, $v0 -/* DF8340 80241940 AD230004 */ sw $v1, 4($t1) -/* DF8344 80241944 93A20042 */ lbu $v0, 0x42($sp) -/* DF8348 80241948 8FA3003C */ lw $v1, 0x3c($sp) -/* DF834C 8024194C 93A90040 */ lbu $t1, 0x40($sp) -/* DF8350 80241950 93AA0041 */ lbu $t2, 0x41($sp) -/* DF8354 80241954 44820000 */ mtc1 $v0, $f0 -/* DF8358 80241958 00000000 */ nop -/* DF835C 8024195C 46800021 */ cvt.d.w $f0, $f0 -/* DF8360 80241960 8FA20038 */ lw $v0, 0x38($sp) -/* DF8364 80241964 463A0002 */ mul.d $f0, $f0, $f26 -/* DF8368 80241968 00000000 */ nop -/* DF836C 8024196C A6480000 */ sh $t0, ($s2) -/* DF8370 80241970 A7A0002E */ sh $zero, 0x2e($sp) -/* DF8374 80241974 A3B50030 */ sb $s5, 0x30($sp) -/* DF8378 80241978 AFA30024 */ sw $v1, 0x24($sp) -/* DF837C 8024197C A7A90028 */ sh $t1, 0x28($sp) -/* DF8380 80241980 A7AA002A */ sh $t2, 0x2a($sp) -/* DF8384 80241984 AFA20020 */ sw $v0, 0x20($sp) -/* DF8388 80241988 46200007 */ neg.d $f0, $f0 -/* DF838C 8024198C 4620008D */ trunc.w.d $f2, $f0 -/* DF8390 80241990 44021000 */ mfc1 $v0, $f2 -/* DF8394 80241994 0C04EBDC */ jal func_8013AF70 -/* DF8398 80241998 A7A2002C */ sh $v0, 0x2c($sp) -/* DF839C 8024199C 3C04D838 */ lui $a0, 0xd838 -/* DF83A0 802419A0 8E020000 */ lw $v0, ($s0) -/* DF83A4 802419A4 34840002 */ ori $a0, $a0, 2 -/* DF83A8 802419A8 0040182D */ daddu $v1, $v0, $zero -/* DF83AC 802419AC 24420008 */ addiu $v0, $v0, 8 -/* DF83B0 802419B0 AE020000 */ sw $v0, ($s0) -/* DF83B4 802419B4 24020040 */ addiu $v0, $zero, 0x40 -/* DF83B8 802419B8 AC640000 */ sw $a0, ($v1) -/* DF83BC 802419BC AC620004 */ sw $v0, 4($v1) -/* DF83C0 802419C0 8FBF00E0 */ lw $ra, 0xe0($sp) -/* DF83C4 802419C4 8FB500DC */ lw $s5, 0xdc($sp) -/* DF83C8 802419C8 8FB400D8 */ lw $s4, 0xd8($sp) -/* DF83CC 802419CC 8FB300D4 */ lw $s3, 0xd4($sp) -/* DF83D0 802419D0 8FB200D0 */ lw $s2, 0xd0($sp) -/* DF83D4 802419D4 8FB100CC */ lw $s1, 0xcc($sp) -/* DF83D8 802419D8 8FB000C8 */ lw $s0, 0xc8($sp) -/* DF83DC 802419DC D7BC0108 */ ldc1 $f28, 0x108($sp) -/* DF83E0 802419E0 D7BA0100 */ ldc1 $f26, 0x100($sp) -/* DF83E4 802419E4 D7B800F8 */ ldc1 $f24, 0xf8($sp) -/* DF83E8 802419E8 D7B600F0 */ ldc1 $f22, 0xf0($sp) -/* DF83EC 802419EC D7B400E8 */ ldc1 $f20, 0xe8($sp) -/* DF83F0 802419F0 03E00008 */ jr $ra -/* DF83F4 802419F4 27BD0110 */ addiu $sp, $sp, 0x110 diff --git a/asm/nonmatchings/world/area_end/end_00/func_802421D8_DF6A00.s b/asm/nonmatchings/world/area_end/end_00/func_802421D8_DF6A00.s deleted file mode 100644 index 58c7534f3b..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/func_802421D8_DF6A00.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421D8_DF8BD8 -/* DF8BD8 802421D8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DF8BDC 802421DC 3C05DC08 */ lui $a1, 0xdc08 -/* DF8BE0 802421E0 34A50008 */ ori $a1, $a1, 8 -/* DF8BE4 802421E4 AFB40030 */ sw $s4, 0x30($sp) -/* DF8BE8 802421E8 0000A02D */ daddu $s4, $zero, $zero -/* DF8BEC 802421EC AFB10024 */ sw $s1, 0x24($sp) -/* DF8BF0 802421F0 3C11800A */ lui $s1, 0x800a -/* DF8BF4 802421F4 2631A66C */ addiu $s1, $s1, -0x5994 -/* DF8BF8 802421F8 AFB3002C */ sw $s3, 0x2c($sp) -/* DF8BFC 802421FC 24130004 */ addiu $s3, $zero, 4 -/* DF8C00 80242200 3C028025 */ lui $v0, 0x8025 -/* DF8C04 80242204 24420EF0 */ addiu $v0, $v0, 0xef0 -/* DF8C08 80242208 AFBF0038 */ sw $ra, 0x38($sp) -/* DF8C0C 8024220C AFB50034 */ sw $s5, 0x34($sp) -/* DF8C10 80242210 AFB20028 */ sw $s2, 0x28($sp) -/* DF8C14 80242214 AFB00020 */ sw $s0, 0x20($sp) -/* DF8C18 80242218 8E230000 */ lw $v1, ($s1) -/* DF8C1C 8024221C 3C108007 */ lui $s0, 0x8007 -/* DF8C20 80242220 8E1041F4 */ lw $s0, 0x41f4($s0) -/* DF8C24 80242224 3C158025 */ lui $s5, 0x8025 -/* DF8C28 80242228 8EB5F7E4 */ lw $s5, -0x81c($s5) -/* DF8C2C 8024222C 44800000 */ mtc1 $zero, $f0 -/* DF8C30 80242230 3C01C2C8 */ lui $at, 0xc2c8 -/* DF8C34 80242234 44811000 */ mtc1 $at, $f2 -/* DF8C38 80242238 3C0142C8 */ lui $at, 0x42c8 -/* DF8C3C 8024223C 44812000 */ mtc1 $at, $f4 -/* DF8C40 80242240 3C013F80 */ lui $at, 0x3f80 -/* DF8C44 80242244 44813000 */ mtc1 $at, $f6 -/* DF8C48 80242248 3C0643A0 */ lui $a2, 0x43a0 -/* DF8C4C 8024224C 3C07C370 */ lui $a3, 0xc370 -/* DF8C50 80242250 0060402D */ daddu $t0, $v1, $zero -/* DF8C54 80242254 24630008 */ addiu $v1, $v1, 8 -/* DF8C58 80242258 00108180 */ sll $s0, $s0, 6 -/* DF8C5C 8024225C 02028021 */ addu $s0, $s0, $v0 -/* DF8C60 80242260 0200202D */ daddu $a0, $s0, $zero -/* DF8C64 80242264 02A0902D */ daddu $s2, $s5, $zero -/* DF8C68 80242268 AE230000 */ sw $v1, ($s1) -/* DF8C6C 8024226C AD050000 */ sw $a1, ($t0) -/* DF8C70 80242270 44050000 */ mfc1 $a1, $f0 -/* DF8C74 80242274 3C028024 */ lui $v0, 0x8024 -/* DF8C78 80242278 24422D60 */ addiu $v0, $v0, 0x2d60 -/* DF8C7C 8024227C AD020004 */ sw $v0, 4($t0) -/* DF8C80 80242280 E7A20014 */ swc1 $f2, 0x14($sp) -/* DF8C84 80242284 E7A40018 */ swc1 $f4, 0x18($sp) -/* DF8C88 80242288 E7A6001C */ swc1 $f6, 0x1c($sp) -/* DF8C8C 8024228C 0C018E90 */ jal guOrtho -/* DF8C90 80242290 AFA50010 */ sw $a1, 0x10($sp) -/* DF8C94 80242294 3C03DA38 */ lui $v1, 0xda38 -/* DF8C98 80242298 34630007 */ ori $v1, $v1, 7 -/* DF8C9C 8024229C 3C05D9C0 */ lui $a1, 0xd9c0 -/* DF8CA0 802422A0 34A5F9FB */ ori $a1, $a1, 0xf9fb -/* DF8CA4 802422A4 3C07D9FF */ lui $a3, 0xd9ff -/* DF8CA8 802422A8 34E7FFFF */ ori $a3, $a3, 0xffff -/* DF8CAC 802422AC 3C060020 */ lui $a2, 0x20 -/* DF8CB0 802422B0 8E220000 */ lw $v0, ($s1) -/* DF8CB4 802422B4 00D33025 */ or $a2, $a2, $s3 -/* DF8CB8 802422B8 0040202D */ daddu $a0, $v0, $zero -/* DF8CBC 802422BC 24420008 */ addiu $v0, $v0, 8 -/* DF8CC0 802422C0 AE220000 */ sw $v0, ($s1) -/* DF8CC4 802422C4 AC830000 */ sw $v1, ($a0) -/* DF8CC8 802422C8 3C038000 */ lui $v1, 0x8000 -/* DF8CCC 802422CC 02038021 */ addu $s0, $s0, $v1 -/* DF8CD0 802422D0 24430008 */ addiu $v1, $v0, 8 -/* DF8CD4 802422D4 AC900004 */ sw $s0, 4($a0) -/* DF8CD8 802422D8 AE230000 */ sw $v1, ($s1) -/* DF8CDC 802422DC 3C03E700 */ lui $v1, 0xe700 -/* DF8CE0 802422E0 AC430000 */ sw $v1, ($v0) -/* DF8CE4 802422E4 24430010 */ addiu $v1, $v0, 0x10 -/* DF8CE8 802422E8 AC400004 */ sw $zero, 4($v0) -/* DF8CEC 802422EC AE230000 */ sw $v1, ($s1) -/* DF8CF0 802422F0 24430018 */ addiu $v1, $v0, 0x18 -/* DF8CF4 802422F4 AC450008 */ sw $a1, 8($v0) -/* DF8CF8 802422F8 AC40000C */ sw $zero, 0xc($v0) -/* DF8CFC 802422FC AE230000 */ sw $v1, ($s1) -/* DF8D00 80242300 AC470010 */ sw $a3, 0x10($v0) -/* DF8D04 80242304 AC460014 */ sw $a2, 0x14($v0) -.L80242308: -/* DF8D08 80242308 96420074 */ lhu $v0, 0x74($s2) -/* DF8D0C 8024230C 30420001 */ andi $v0, $v0, 1 -/* DF8D10 80242310 50400004 */ beql $v0, $zero, .L80242324 -/* DF8D14 80242314 26730074 */ addiu $s3, $s3, 0x74 -/* DF8D18 80242318 0C0906CD */ jal func_80241B34 -/* DF8D1C 8024231C 02B32021 */ addu $a0, $s5, $s3 -/* DF8D20 80242320 26730074 */ addiu $s3, $s3, 0x74 -.L80242324: -/* DF8D24 80242324 26940001 */ addiu $s4, $s4, 1 -/* DF8D28 80242328 2A820020 */ slti $v0, $s4, 0x20 -/* DF8D2C 8024232C 1440FFF6 */ bnez $v0, .L80242308 -/* DF8D30 80242330 26520074 */ addiu $s2, $s2, 0x74 -/* DF8D34 80242334 8FBF0038 */ lw $ra, 0x38($sp) -/* DF8D38 80242338 8FB50034 */ lw $s5, 0x34($sp) -/* DF8D3C 8024233C 8FB40030 */ lw $s4, 0x30($sp) -/* DF8D40 80242340 8FB3002C */ lw $s3, 0x2c($sp) -/* DF8D44 80242344 8FB20028 */ lw $s2, 0x28($sp) -/* DF8D48 80242348 8FB10024 */ lw $s1, 0x24($sp) -/* DF8D4C 8024234C 8FB00020 */ lw $s0, 0x20($sp) -/* DF8D50 80242350 03E00008 */ jr $ra -/* DF8D54 80242354 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_end/end_00/func_80242358_DF6A00.s b/asm/nonmatchings/world/area_end/end_00/func_80242358_DF6A00.s deleted file mode 100644 index 1d76ed0521..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/func_80242358_DF6A00.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242358_DF8D58 -/* DF8D58 80242358 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DF8D5C 8024235C AFB20030 */ sw $s2, 0x30($sp) -/* DF8D60 80242360 0080902D */ daddu $s2, $a0, $zero -/* DF8D64 80242364 0000182D */ daddu $v1, $zero, $zero -/* DF8D68 80242368 3C068025 */ lui $a2, 0x8025 -/* DF8D6C 8024236C 8CC6F7E4 */ lw $a2, -0x81c($a2) -/* DF8D70 80242370 24040020 */ addiu $a0, $zero, 0x20 -/* DF8D74 80242374 AFBF0038 */ sw $ra, 0x38($sp) -/* DF8D78 80242378 AFB30034 */ sw $s3, 0x34($sp) -/* DF8D7C 8024237C AFB1002C */ sw $s1, 0x2c($sp) -/* DF8D80 80242380 AFB00028 */ sw $s0, 0x28($sp) -/* DF8D84 80242384 00C0282D */ daddu $a1, $a2, $zero -.L80242388: -/* DF8D88 80242388 94A20074 */ lhu $v0, 0x74($a1) -/* DF8D8C 8024238C 30420001 */ andi $v0, $v0, 1 -/* DF8D90 80242390 10400006 */ beqz $v0, .L802423AC -/* DF8D94 80242394 000310C0 */ sll $v0, $v1, 3 -/* DF8D98 80242398 24630001 */ addiu $v1, $v1, 1 -/* DF8D9C 8024239C 10640051 */ beq $v1, $a0, .L802424E4 -/* DF8DA0 802423A0 24A50074 */ addiu $a1, $a1, 0x74 -/* DF8DA4 802423A4 080908E2 */ j .L80242388 -/* DF8DA8 802423A8 00000000 */ nop -.L802423AC: -/* DF8DAC 802423AC 00431023 */ subu $v0, $v0, $v1 -/* DF8DB0 802423B0 00021080 */ sll $v0, $v0, 2 -/* DF8DB4 802423B4 00431021 */ addu $v0, $v0, $v1 -/* DF8DB8 802423B8 00021080 */ sll $v0, $v0, 2 -/* DF8DBC 802423BC 24420004 */ addiu $v0, $v0, 4 -/* DF8DC0 802423C0 8E440000 */ lw $a0, ($s2) -/* DF8DC4 802423C4 10800047 */ beqz $a0, .L802424E4 -/* DF8DC8 802423C8 00C28821 */ addu $s1, $a2, $v0 -/* DF8DCC 802423CC 04820014 */ bltzl $a0, .L80242420 -/* DF8DD0 802423D0 AE240000 */ sw $a0, ($s1) -/* DF8DD4 802423D4 3C138024 */ lui $s3, 0x8024 -/* DF8DD8 802423D8 26732D70 */ addiu $s3, $s3, 0x2d70 -/* DF8DDC 802423DC 8E650000 */ lw $a1, ($s3) -/* DF8DE0 802423E0 3C108025 */ lui $s0, 0x8025 -/* DF8DE4 802423E4 2610F7F0 */ addiu $s0, $s0, -0x810 -/* DF8DE8 802423E8 00052A00 */ sll $a1, $a1, 8 -/* DF8DEC 802423EC 0C049601 */ jal dma_load_string -/* DF8DF0 802423F0 00B02821 */ addu $a1, $a1, $s0 -/* DF8DF4 802423F4 8E630000 */ lw $v1, ($s3) -/* DF8DF8 802423F8 00031200 */ sll $v0, $v1, 8 -/* DF8DFC 802423FC 00501021 */ addu $v0, $v0, $s0 -/* DF8E00 80242400 24630001 */ addiu $v1, $v1, 1 -/* DF8E04 80242404 AE220000 */ sw $v0, ($s1) -/* DF8E08 80242408 AE630000 */ sw $v1, ($s3) -/* DF8E0C 8024240C 28630017 */ slti $v1, $v1, 0x17 -/* DF8E10 80242410 50600003 */ beql $v1, $zero, .L80242420 -/* DF8E14 80242414 AE600000 */ sw $zero, ($s3) -/* DF8E18 80242418 08090909 */ j .L80242424 -/* DF8E1C 8024241C 0000282D */ daddu $a1, $zero, $zero -.L80242420: -/* DF8E20 80242420 0000282D */ daddu $a1, $zero, $zero -.L80242424: -/* DF8E24 80242424 27A20024 */ addiu $v0, $sp, 0x24 -/* DF8E28 80242428 00A0302D */ daddu $a2, $a1, $zero -/* DF8E2C 8024242C AFA00010 */ sw $zero, 0x10($sp) -/* DF8E30 80242430 AFA00014 */ sw $zero, 0x14($sp) -/* DF8E34 80242434 AFA20018 */ sw $v0, 0x18($sp) -/* DF8E38 80242438 AFA0001C */ sw $zero, 0x1c($sp) -/* DF8E3C 8024243C 8E240000 */ lw $a0, ($s1) -/* DF8E40 80242440 0C0497DA */ jal get_string_properties -/* DF8E44 80242444 27A70020 */ addiu $a3, $sp, 0x20 -/* DF8E48 80242448 8E420004 */ lw $v0, 4($s2) -/* DF8E4C 8024244C AE220068 */ sw $v0, 0x68($s1) -/* DF8E50 80242450 8E420008 */ lw $v0, 8($s2) -/* DF8E54 80242454 AE22006C */ sw $v0, 0x6c($s1) -/* DF8E58 80242458 8E42000C */ lw $v0, 0xc($s2) -/* DF8E5C 8024245C AE220010 */ sw $v0, 0x10($s1) -/* DF8E60 80242460 8E420010 */ lw $v0, 0x10($s2) -/* DF8E64 80242464 AE220018 */ sw $v0, 0x18($s1) -/* DF8E68 80242468 8E420014 */ lw $v0, 0x14($s2) -/* DF8E6C 8024246C AE22001C */ sw $v0, 0x1c($s1) -/* DF8E70 80242470 8E42001C */ lw $v0, 0x1c($s2) -/* DF8E74 80242474 AE220034 */ sw $v0, 0x34($s1) -/* DF8E78 80242478 8E420020 */ lw $v0, 0x20($s2) -/* DF8E7C 8024247C AE220038 */ sw $v0, 0x38($s1) -/* DF8E80 80242480 8E440018 */ lw $a0, 0x18($s2) -/* DF8E84 80242484 1080000C */ beqz $a0, .L802424B8 -/* DF8E88 80242488 00000000 */ nop -/* DF8E8C 8024248C 8FA20024 */ lw $v0, 0x24($sp) -/* DF8E90 80242490 8FA30020 */ lw $v1, 0x20($sp) -/* DF8E94 80242494 24420001 */ addiu $v0, $v0, 1 -/* DF8E98 80242498 00621823 */ subu $v1, $v1, $v0 -/* DF8E9C 8024249C 00640018 */ mult $v1, $a0 -/* DF8EA0 802424A0 8E420020 */ lw $v0, 0x20($s2) -/* DF8EA4 802424A4 00004012 */ mflo $t0 -/* DF8EA8 802424A8 00481023 */ subu $v0, $v0, $t0 -/* DF8EAC 802424AC 04410002 */ bgez $v0, .L802424B8 -/* DF8EB0 802424B0 AE220038 */ sw $v0, 0x38($s1) -/* DF8EB4 802424B4 AE200038 */ sw $zero, 0x38($s1) -.L802424B8: -/* DF8EB8 802424B8 8E420024 */ lw $v0, 0x24($s2) -/* DF8EBC 802424BC AE22004C */ sw $v0, 0x4c($s1) -/* DF8EC0 802424C0 8E420028 */ lw $v0, 0x28($s2) -/* DF8EC4 802424C4 AE220050 */ sw $v0, 0x50($s1) -/* DF8EC8 802424C8 8E420018 */ lw $v0, 0x18($s2) -/* DF8ECC 802424CC AE220020 */ sw $v0, 0x20($s1) -/* DF8ED0 802424D0 8E42002C */ lw $v0, 0x2c($s2) -/* DF8ED4 802424D4 AE220054 */ sw $v0, 0x54($s1) -/* DF8ED8 802424D8 96420034 */ lhu $v0, 0x34($s2) -/* DF8EDC 802424DC 34420003 */ ori $v0, $v0, 3 -/* DF8EE0 802424E0 A6220070 */ sh $v0, 0x70($s1) -.L802424E4: -/* DF8EE4 802424E4 8FBF0038 */ lw $ra, 0x38($sp) -/* DF8EE8 802424E8 8FB30034 */ lw $s3, 0x34($sp) -/* DF8EEC 802424EC 8FB20030 */ lw $s2, 0x30($sp) -/* DF8EF0 802424F0 8FB1002C */ lw $s1, 0x2c($sp) -/* DF8EF4 802424F4 8FB00028 */ lw $s0, 0x28($sp) -/* DF8EF8 802424F8 03E00008 */ jr $ra -/* DF8EFC 802424FC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_end/end_00/func_80242558_DF6A00.s b/asm/nonmatchings/world/area_end/end_00/func_80242558_DF6A00.s deleted file mode 100644 index a2b0e716df..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/func_80242558_DF6A00.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242558_DF8F58 -/* DF8F58 80242558 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF8F5C 8024255C AFBF0010 */ sw $ra, 0x10($sp) -/* DF8F60 80242560 0C090940 */ jal func_80242500 -/* DF8F64 80242564 00000000 */ nop -/* DF8F68 80242568 0C048DCD */ jal load_font -/* DF8F6C 8024256C 24040001 */ addiu $a0, $zero, 1 -/* DF8F70 80242570 8FBF0010 */ lw $ra, 0x10($sp) -/* DF8F74 80242574 24020002 */ addiu $v0, $zero, 2 -/* DF8F78 80242578 03E00008 */ jr $ra -/* DF8F7C 8024257C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_00/func_80242680_DF6A00.s b/asm/nonmatchings/world/area_end/end_00/func_80242680_DF6A00.s deleted file mode 100644 index 12c867923f..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/func_80242680_DF6A00.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242680_DF9080 -/* DF9080 80242680 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DF9084 80242684 AFBF0028 */ sw $ra, 0x28($sp) -/* DF9088 80242688 AFB10024 */ sw $s1, 0x24($sp) -/* DF908C 8024268C AFB00020 */ sw $s0, 0x20($sp) -/* DF9090 80242690 8C82000C */ lw $v0, 0xc($a0) -/* DF9094 80242694 0C0B1EAF */ jal get_variable -/* DF9098 80242698 8C450000 */ lw $a1, ($v0) -/* DF909C 8024269C 24030100 */ addiu $v1, $zero, 0x100 -/* DF90A0 802426A0 0040882D */ daddu $s1, $v0, $zero -/* DF90A4 802426A4 3C028024 */ lui $v0, 0x8024 -/* DF90A8 802426A8 24424D74 */ addiu $v0, $v0, 0x4d74 -/* DF90AC 802426AC 00118040 */ sll $s0, $s1, 1 -/* DF90B0 802426B0 02118021 */ addu $s0, $s0, $s1 -/* DF90B4 802426B4 001080C0 */ sll $s0, $s0, 3 -/* DF90B8 802426B8 02028021 */ addu $s0, $s0, $v0 -/* DF90BC 802426BC AFA30010 */ sw $v1, 0x10($sp) -/* DF90C0 802426C0 8E020000 */ lw $v0, ($s0) -/* DF90C4 802426C4 AFA00018 */ sw $zero, 0x18($sp) -/* DF90C8 802426C8 AFA0001C */ sw $zero, 0x1c($sp) -/* DF90CC 802426CC AFA20014 */ sw $v0, 0x14($sp) -/* DF90D0 802426D0 8E050004 */ lw $a1, 4($s0) -/* DF90D4 802426D4 24020001 */ addiu $v0, $zero, 1 -/* DF90D8 802426D8 3C01802E */ lui $at, 0x802e -/* DF90DC 802426DC AC22F524 */ sw $v0, -0xadc($at) -/* DF90E0 802426E0 0C00E219 */ jal create_standard_npc -/* DF90E4 802426E4 27A40010 */ addiu $a0, $sp, 0x10 -/* DF90E8 802426E8 0C00E2B7 */ jal get_npc_by_index -/* DF90EC 802426EC 0040202D */ daddu $a0, $v0, $zero -/* DF90F0 802426F0 3C04FBFF */ lui $a0, 0xfbff -/* DF90F4 802426F4 8C430000 */ lw $v1, ($v0) -/* DF90F8 802426F8 3484FFFF */ ori $a0, $a0, 0xffff -/* DF90FC 802426FC A05100A4 */ sb $s1, 0xa4($v0) -/* DF9100 80242700 00641824 */ and $v1, $v1, $a0 -/* DF9104 80242704 AC430000 */ sw $v1, ($v0) -/* DF9108 80242708 C6000008 */ lwc1 $f0, 8($s0) -/* DF910C 8024270C E4400038 */ swc1 $f0, 0x38($v0) -/* DF9110 80242710 C600000C */ lwc1 $f0, 0xc($s0) -/* DF9114 80242714 E440003C */ swc1 $f0, 0x3c($v0) -/* DF9118 80242718 C6000010 */ lwc1 $f0, 0x10($s0) -/* DF911C 8024271C E4400040 */ swc1 $f0, 0x40($v0) -/* DF9120 80242720 8E050014 */ lw $a1, 0x14($s0) -/* DF9124 80242724 0C00ECD0 */ jal set_npc_yaw -/* DF9128 80242728 0040202D */ daddu $a0, $v0, $zero -/* DF912C 8024272C 8FBF0028 */ lw $ra, 0x28($sp) -/* DF9130 80242730 8FB10024 */ lw $s1, 0x24($sp) -/* DF9134 80242734 8FB00020 */ lw $s0, 0x20($sp) -/* DF9138 80242738 24020002 */ addiu $v0, $zero, 2 -/* DF913C 8024273C 03E00008 */ jr $ra -/* DF9140 80242740 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_end/end_00/func_80242744_DF6A00.s b/asm/nonmatchings/world/area_end/end_00/func_80242744_DF6A00.s deleted file mode 100644 index d539ca5ad7..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/func_80242744_DF6A00.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242744_DF9144 -/* DF9144 80242744 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DF9148 80242748 AFB10014 */ sw $s1, 0x14($sp) -/* DF914C 8024274C 0080882D */ daddu $s1, $a0, $zero -/* DF9150 80242750 AFBF0018 */ sw $ra, 0x18($sp) -/* DF9154 80242754 AFB00010 */ sw $s0, 0x10($sp) -/* DF9158 80242758 8E30000C */ lw $s0, 0xc($s1) -/* DF915C 8024275C 8E050000 */ lw $a1, ($s0) -/* DF9160 80242760 0C0B1EAF */ jal get_variable -/* DF9164 80242764 26100004 */ addiu $s0, $s0, 4 -/* DF9168 80242768 3C048035 */ lui $a0, 0x8035 -/* DF916C 8024276C 2484F800 */ addiu $a0, $a0, -0x800 -/* DF9170 80242770 8E100000 */ lw $s0, ($s0) -/* DF9174 80242774 0C00A41B */ jal _heap_malloc -/* DF9178 80242778 0040282D */ daddu $a1, $v0, $zero -/* DF917C 8024277C 0220202D */ daddu $a0, $s1, $zero -/* DF9180 80242780 0040302D */ daddu $a2, $v0, $zero -/* DF9184 80242784 0C0B2026 */ jal set_variable -/* DF9188 80242788 0200282D */ daddu $a1, $s0, $zero -/* DF918C 8024278C 8FBF0018 */ lw $ra, 0x18($sp) -/* DF9190 80242790 8FB10014 */ lw $s1, 0x14($sp) -/* DF9194 80242794 8FB00010 */ lw $s0, 0x10($sp) -/* DF9198 80242798 24020002 */ addiu $v0, $zero, 2 -/* DF919C 8024279C 03E00008 */ jr $ra -/* DF91A0 802427A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_end/end_00/func_802427A4_DF6A00.s b/asm/nonmatchings/world/area_end/end_00/func_802427A4_DF6A00.s deleted file mode 100644 index 4558745999..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/func_802427A4_DF6A00.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427A4_DF91A4 -/* DF91A4 802427A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF91A8 802427A8 AFBF0010 */ sw $ra, 0x10($sp) -/* DF91AC 802427AC 8C82000C */ lw $v0, 0xc($a0) -/* DF91B0 802427B0 0C0B1EAF */ jal get_variable -/* DF91B4 802427B4 8C450000 */ lw $a1, ($v0) -/* DF91B8 802427B8 3C048035 */ lui $a0, 0x8035 -/* DF91BC 802427BC 2484F800 */ addiu $a0, $a0, -0x800 -/* DF91C0 802427C0 0C00A487 */ jal _heap_free -/* DF91C4 802427C4 0040282D */ daddu $a1, $v0, $zero -/* DF91C8 802427C8 8FBF0010 */ lw $ra, 0x10($sp) -/* DF91CC 802427CC 24020002 */ addiu $v0, $zero, 2 -/* DF91D0 802427D0 03E00008 */ jr $ra -/* DF91D4 802427D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_00/func_80242898_DF6A00.s b/asm/nonmatchings/world/area_end/end_00/func_80242898_DF6A00.s deleted file mode 100644 index dfd328794e..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/func_80242898_DF6A00.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242898_DF9298 -/* DF9298 80242898 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF929C 8024289C AFB00010 */ sw $s0, 0x10($sp) -/* DF92A0 802428A0 0080802D */ daddu $s0, $a0, $zero -/* DF92A4 802428A4 AFBF0014 */ sw $ra, 0x14($sp) -/* DF92A8 802428A8 10A00006 */ beqz $a1, .L802428C4 -/* DF92AC 802428AC 8E02000C */ lw $v0, 0xc($s0) -/* DF92B0 802428B0 0C0B1EAF */ jal get_variable -/* DF92B4 802428B4 8C450000 */ lw $a1, ($v0) -/* DF92B8 802428B8 0C00EABB */ jal get_npc_unsafe -/* DF92BC 802428BC 0040202D */ daddu $a0, $v0, $zero -/* DF92C0 802428C0 AE020074 */ sw $v0, 0x74($s0) -.L802428C4: -/* DF92C4 802428C4 8E030074 */ lw $v1, 0x74($s0) -/* DF92C8 802428C8 3C013F2A */ lui $at, 0x3f2a -/* DF92CC 802428CC 3421AAAB */ ori $at, $at, 0xaaab -/* DF92D0 802428D0 44811000 */ mtc1 $at, $f2 -/* DF92D4 802428D4 C4600038 */ lwc1 $f0, 0x38($v1) -/* DF92D8 802428D8 46020000 */ add.s $f0, $f0, $f2 -/* DF92DC 802428DC E4600038 */ swc1 $f0, 0x38($v1) -/* DF92E0 802428E0 8FBF0014 */ lw $ra, 0x14($sp) -/* DF92E4 802428E4 8FB00010 */ lw $s0, 0x10($sp) -/* DF92E8 802428E8 0000102D */ daddu $v0, $zero, $zero -/* DF92EC 802428EC 03E00008 */ jr $ra -/* DF92F0 802428F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* DF92F4 802428F4 00000000 */ nop -/* DF92F8 802428F8 00000000 */ nop -/* DF92FC 802428FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_00/func_80242A30_DF6A00.s b/asm/nonmatchings/world/area_end/end_00/func_80242A30_DF6A00.s deleted file mode 100644 index d7538e5faa..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/func_80242A30_DF6A00.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A30_DF9430 -/* DF9430 80242A30 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DF9434 80242A34 AFB10014 */ sw $s1, 0x14($sp) -/* DF9438 80242A38 0080882D */ daddu $s1, $a0, $zero -/* DF943C 80242A3C AFBF001C */ sw $ra, 0x1c($sp) -/* DF9440 80242A40 AFB20018 */ sw $s2, 0x18($sp) -/* DF9444 80242A44 AFB00010 */ sw $s0, 0x10($sp) -/* DF9448 80242A48 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DF944C 80242A4C F7B40020 */ sdc1 $f20, 0x20($sp) -/* DF9450 80242A50 8E30000C */ lw $s0, 0xc($s1) -/* DF9454 80242A54 8E050000 */ lw $a1, ($s0) -/* DF9458 80242A58 0C0B1EAF */ jal get_variable -/* DF945C 80242A5C 26100004 */ addiu $s0, $s0, 4 -/* DF9460 80242A60 8E050000 */ lw $a1, ($s0) -/* DF9464 80242A64 26100004 */ addiu $s0, $s0, 4 -/* DF9468 80242A68 0220202D */ daddu $a0, $s1, $zero -/* DF946C 80242A6C 0C0B210B */ jal get_float_variable -/* DF9470 80242A70 0040902D */ daddu $s2, $v0, $zero -/* DF9474 80242A74 8E050000 */ lw $a1, ($s0) -/* DF9478 80242A78 26100004 */ addiu $s0, $s0, 4 -/* DF947C 80242A7C 0220202D */ daddu $a0, $s1, $zero -/* DF9480 80242A80 0C0B210B */ jal get_float_variable -/* DF9484 80242A84 46000586 */ mov.s $f22, $f0 -/* DF9488 80242A88 0220202D */ daddu $a0, $s1, $zero -/* DF948C 80242A8C 8E050000 */ lw $a1, ($s0) -/* DF9490 80242A90 0C0B210B */ jal get_float_variable -/* DF9494 80242A94 46000506 */ mov.s $f20, $f0 -/* DF9498 80242A98 8E42000C */ lw $v0, 0xc($s2) -/* DF949C 80242A9C E4560008 */ swc1 $f22, 8($v0) -/* DF94A0 80242AA0 8E42000C */ lw $v0, 0xc($s2) -/* DF94A4 80242AA4 E454000C */ swc1 $f20, 0xc($v0) -/* DF94A8 80242AA8 8E43000C */ lw $v1, 0xc($s2) -/* DF94AC 80242AAC E4600010 */ swc1 $f0, 0x10($v1) -/* DF94B0 80242AB0 8FBF001C */ lw $ra, 0x1c($sp) -/* DF94B4 80242AB4 8FB20018 */ lw $s2, 0x18($sp) -/* DF94B8 80242AB8 8FB10014 */ lw $s1, 0x14($sp) -/* DF94BC 80242ABC 8FB00010 */ lw $s0, 0x10($sp) -/* DF94C0 80242AC0 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DF94C4 80242AC4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DF94C8 80242AC8 24020002 */ addiu $v0, $zero, 2 -/* DF94CC 80242ACC 03E00008 */ jr $ra -/* DF94D0 80242AD0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_end/end_00/func_80242AD4_DF6A00.s b/asm/nonmatchings/world/area_end/end_00/func_80242AD4_DF6A00.s deleted file mode 100644 index 5ad028f6df..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/func_80242AD4_DF6A00.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AD4_DF94D4 -/* DF94D4 80242AD4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF94D8 80242AD8 AFBF0010 */ sw $ra, 0x10($sp) -/* DF94DC 80242ADC 8C82000C */ lw $v0, 0xc($a0) -/* DF94E0 80242AE0 0C0B1EAF */ jal get_variable -/* DF94E4 80242AE4 8C450000 */ lw $a1, ($v0) -/* DF94E8 80242AE8 8C44000C */ lw $a0, 0xc($v0) -/* DF94EC 80242AEC 24030001 */ addiu $v1, $zero, 1 -/* DF94F0 80242AF0 AC830004 */ sw $v1, 4($a0) -/* DF94F4 80242AF4 8FBF0010 */ lw $ra, 0x10($sp) -/* DF94F8 80242AF8 24020002 */ addiu $v0, $zero, 2 -/* DF94FC 80242AFC 03E00008 */ jr $ra -/* DF9500 80242B00 27BD0018 */ addiu $sp, $sp, 0x18 -/* DF9504 80242B04 00000000 */ nop -/* DF9508 80242B08 00000000 */ nop -/* DF950C 80242B0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_01/_E07C20/func_802428C0.s b/asm/nonmatchings/world/area_end/end_01/_E07C20/func_802428C0.s new file mode 100644 index 0000000000..35e467928e --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/_E07C20/func_802428C0.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802428C0 +/* E07C20 802428C0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E07C24 802428C4 2404005B */ addiu $a0, $zero, 0x5b +/* E07C28 802428C8 2405FFFF */ addiu $a1, $zero, -1 +/* E07C2C 802428CC 24060001 */ addiu $a2, $zero, 1 +/* E07C30 802428D0 AFBF0010 */ sw $ra, 0x10($sp) +/* E07C34 802428D4 0C046E54 */ jal func_8011B950 +/* E07C38 802428D8 0000382D */ daddu $a3, $zero, $zero +/* E07C3C 802428DC 0000202D */ daddu $a0, $zero, $zero +/* E07C40 802428E0 0080282D */ daddu $a1, $a0, $zero +/* E07C44 802428E4 0080302D */ daddu $a2, $a0, $zero +/* E07C48 802428E8 0C046F97 */ jal set_background_color_blend +/* E07C4C 802428EC 240700FF */ addiu $a3, $zero, 0xff +/* E07C50 802428F0 8FBF0010 */ lw $ra, 0x10($sp) +/* E07C54 802428F4 24020002 */ addiu $v0, $zero, 2 +/* E07C58 802428F8 03E00008 */ jr $ra +/* E07C5C 802428FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/func_80242900_E05360.s b/asm/nonmatchings/world/area_end/end_01/_E07C20/func_80242900_E07C60.s similarity index 100% rename from asm/nonmatchings/world/area_end/end_01/func_80242900_E05360.s rename to asm/nonmatchings/world/area_end/end_01/_E07C20/func_80242900_E07C60.s diff --git a/asm/nonmatchings/world/area_end/end_01/func_80242978_E05360.s b/asm/nonmatchings/world/area_end/end_01/_E07C20/func_80242978_E07CD8.s similarity index 100% rename from asm/nonmatchings/world/area_end/end_01/func_80242978_E05360.s rename to asm/nonmatchings/world/area_end/end_01/_E07C20/func_80242978_E07CD8.s diff --git a/asm/nonmatchings/world/area_end/end_01/func_80242A68_E05360.s b/asm/nonmatchings/world/area_end/end_01/_E07C20/func_80242A68_E07DC8.s similarity index 100% rename from asm/nonmatchings/world/area_end/end_01/func_80242A68_E05360.s rename to asm/nonmatchings/world/area_end/end_01/_E07C20/func_80242A68_E07DC8.s diff --git a/asm/nonmatchings/world/area_end/end_01/_E07C20/func_80242B68.s b/asm/nonmatchings/world/area_end/end_01/_E07C20/func_80242B68.s new file mode 100644 index 0000000000..ee1a878a5c --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/_E07C20/func_80242B68.s @@ -0,0 +1,69 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242B68 +/* E07EC8 80242B68 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E07ECC 80242B6C AFB10014 */ sw $s1, 0x14($sp) +/* E07ED0 80242B70 0080882D */ daddu $s1, $a0, $zero +/* E07ED4 80242B74 AFBF0018 */ sw $ra, 0x18($sp) +/* E07ED8 80242B78 AFB00010 */ sw $s0, 0x10($sp) +/* E07EDC 80242B7C 8E22000C */ lw $v0, 0xc($s1) +/* E07EE0 80242B80 00A0802D */ daddu $s0, $a1, $zero +/* E07EE4 80242B84 0C0B1EAF */ jal get_variable +/* E07EE8 80242B88 8C450000 */ lw $a1, ($v0) +/* E07EEC 80242B8C 1200000C */ beqz $s0, .L80242BC0 +/* E07EF0 80242B90 0220202D */ daddu $a0, $s1, $zero +/* E07EF4 80242B94 0C0B36B0 */ jal resolve_npc +/* E07EF8 80242B98 0040282D */ daddu $a1, $v0, $zero +/* E07EFC 80242B9C AE220074 */ sw $v0, 0x74($s1) +/* E07F00 80242BA0 C4420038 */ lwc1 $f2, 0x38($v0) +/* E07F04 80242BA4 3C014334 */ lui $at, 0x4334 +/* E07F08 80242BA8 44810000 */ mtc1 $at, $f0 +/* E07F0C 80242BAC 24020048 */ addiu $v0, $zero, 0x48 +/* E07F10 80242BB0 AE220070 */ sw $v0, 0x70($s1) +/* E07F14 80242BB4 4600110D */ trunc.w.s $f4, $f2 +/* E07F18 80242BB8 E6240078 */ swc1 $f4, 0x78($s1) +/* E07F1C 80242BBC E620007C */ swc1 $f0, 0x7c($s1) +.L80242BC0: +/* E07F20 80242BC0 C620007C */ lwc1 $f0, 0x7c($s1) +/* E07F24 80242BC4 3C0140A0 */ lui $at, 0x40a0 +/* E07F28 80242BC8 44816000 */ mtc1 $at, $f12 +/* E07F2C 80242BCC 8E300074 */ lw $s0, 0x74($s1) +/* E07F30 80242BD0 0C00A6C9 */ jal clamp_angle +/* E07F34 80242BD4 460C0300 */ add.s $f12, $f0, $f12 +/* E07F38 80242BD8 46000306 */ mov.s $f12, $f0 +/* E07F3C 80242BDC 0C00A8D4 */ jal cos_deg +/* E07F40 80242BE0 E62C007C */ swc1 $f12, 0x7c($s1) +/* E07F44 80242BE4 3C0140C0 */ lui $at, 0x40c0 +/* E07F48 80242BE8 44811000 */ mtc1 $at, $f2 +/* E07F4C 80242BEC 00000000 */ nop +/* E07F50 80242BF0 46020002 */ mul.s $f0, $f0, $f2 +/* E07F54 80242BF4 00000000 */ nop +/* E07F58 80242BF8 C6020038 */ lwc1 $f2, 0x38($s0) +/* E07F5C 80242BFC 46001080 */ add.s $f2, $f2, $f0 +/* E07F60 80242C00 E6020038 */ swc1 $f2, 0x38($s0) +/* E07F64 80242C04 0C00A8BB */ jal sin_deg +/* E07F68 80242C08 C62C007C */ lwc1 $f12, 0x7c($s1) +/* E07F6C 80242C0C 3C014020 */ lui $at, 0x4020 +/* E07F70 80242C10 44811000 */ mtc1 $at, $f2 +/* E07F74 80242C14 00000000 */ nop +/* E07F78 80242C18 46020002 */ mul.s $f0, $f0, $f2 +/* E07F7C 80242C1C 00000000 */ nop +/* E07F80 80242C20 C6020040 */ lwc1 $f2, 0x40($s0) +/* E07F84 80242C24 46001080 */ add.s $f2, $f2, $f0 +/* E07F88 80242C28 3C014334 */ lui $at, 0x4334 +/* E07F8C 80242C2C 44816000 */ mtc1 $at, $f12 +/* E07F90 80242C30 E6020040 */ swc1 $f2, 0x40($s0) +/* E07F94 80242C34 C620007C */ lwc1 $f0, 0x7c($s1) +/* E07F98 80242C38 0C00A6C9 */ jal clamp_angle +/* E07F9C 80242C3C 46006301 */ sub.s $f12, $f12, $f0 +/* E07FA0 80242C40 E6000034 */ swc1 $f0, 0x34($s0) +/* E07FA4 80242C44 8E230070 */ lw $v1, 0x70($s1) +/* E07FA8 80242C48 2463FFFF */ addiu $v1, $v1, -1 +/* E07FAC 80242C4C AE230070 */ sw $v1, 0x70($s1) +/* E07FB0 80242C50 8FBF0018 */ lw $ra, 0x18($sp) +/* E07FB4 80242C54 8FB10014 */ lw $s1, 0x14($sp) +/* E07FB8 80242C58 8FB00010 */ lw $s0, 0x10($sp) +/* E07FBC 80242C5C 2C620001 */ sltiu $v0, $v1, 1 +/* E07FC0 80242C60 03E00008 */ jr $ra +/* E07FC4 80242C64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_end/end_01/_E07C20/func_80242C68.s b/asm/nonmatchings/world/area_end/end_01/_E07C20/func_80242C68.s new file mode 100644 index 0000000000..537768cfe4 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/_E07C20/func_80242C68.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C68 +/* E07FC8 80242C68 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E07FCC 80242C6C AFBF0010 */ sw $ra, 0x10($sp) +/* E07FD0 80242C70 8C82000C */ lw $v0, 0xc($a0) +/* E07FD4 80242C74 0C0B1EAF */ jal get_variable +/* E07FD8 80242C78 8C450000 */ lw $a1, ($v0) +/* E07FDC 80242C7C 8FBF0010 */ lw $ra, 0x10($sp) +/* E07FE0 80242C80 3C018024 */ lui $at, 0x8024 +/* E07FE4 80242C84 AC225D34 */ sw $v0, 0x5d34($at) +/* E07FE8 80242C88 24020002 */ addiu $v0, $zero, 2 +/* E07FEC 80242C8C 03E00008 */ jr $ra +/* E07FF0 80242C90 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/_E07C20/func_80242C94.s b/asm/nonmatchings/world/area_end/end_01/_E07C20/func_80242C94.s new file mode 100644 index 0000000000..17bbe48363 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/_E07C20/func_80242C94.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C94 +/* E07FF4 80242C94 3C06FC12 */ lui $a2, 0xfc12 +/* E07FF8 80242C98 34C64624 */ ori $a2, $a2, 0x4624 +/* E07FFC 80242C9C 3C05FF8F */ lui $a1, 0xff8f +/* E08000 80242CA0 3C04800A */ lui $a0, 0x800a +/* E08004 80242CA4 2484A66C */ addiu $a0, $a0, -0x5994 +/* E08008 80242CA8 8C820000 */ lw $v0, ($a0) +/* E0800C 80242CAC 34A5FFFF */ ori $a1, $a1, 0xffff +/* E08010 80242CB0 0040182D */ daddu $v1, $v0, $zero +/* E08014 80242CB4 24420008 */ addiu $v0, $v0, 8 +/* E08018 80242CB8 AC820000 */ sw $v0, ($a0) +/* E0801C 80242CBC AC660000 */ sw $a2, ($v1) +/* E08020 80242CC0 AC650004 */ sw $a1, 4($v1) +/* E08024 80242CC4 24430008 */ addiu $v1, $v0, 8 +/* E08028 80242CC8 AC830000 */ sw $v1, ($a0) +/* E0802C 80242CCC 3C048024 */ lui $a0, 0x8024 +/* E08030 80242CD0 90845D37 */ lbu $a0, 0x5d37($a0) +/* E08034 80242CD4 3C03FA00 */ lui $v1, 0xfa00 +/* E08038 80242CD8 AC430000 */ sw $v1, ($v0) +/* E0803C 80242CDC 03E00008 */ jr $ra +/* E08040 80242CE0 AC440004 */ sw $a0, 4($v0) +/* E08044 80242CE4 00000000 */ nop +/* E08048 80242CE8 00000000 */ nop +/* E0804C 80242CEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_01/func_80240010_E05360.s b/asm/nonmatchings/world/area_end/end_01/func_80240010_E05360.s deleted file mode 100644 index fa2262d9a7..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/func_80240010_E05360.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240010_E05370 -/* E05370 80240010 3C01420C */ lui $at, 0x420c -/* E05374 80240014 44810000 */ mtc1 $at, $f0 -/* E05378 80240018 00000000 */ nop -/* E0537C 8024001C 3C01800B */ lui $at, 0x800b -/* E05380 80240020 E4201D98 */ swc1 $f0, 0x1d98($at) -/* E05384 80240024 03E00008 */ jr $ra -/* E05388 80240028 24020002 */ addiu $v0, $zero, 2 -/* E0538C 8024002C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_01/func_80240030_E05360.s b/asm/nonmatchings/world/area_end/end_01/func_80240030_E05360.s deleted file mode 100644 index ab52763ac8..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/func_80240030_E05360.s +++ /dev/null @@ -1,153 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240030_E05390 -/* E05390 80240030 27BDFF38 */ addiu $sp, $sp, -0xc8 -/* E05394 80240034 AFB00088 */ sw $s0, 0x88($sp) -/* E05398 80240038 00A0802D */ daddu $s0, $a1, $zero -/* E0539C 8024003C AFBF00A0 */ sw $ra, 0xa0($sp) -/* E053A0 80240040 AFB5009C */ sw $s5, 0x9c($sp) -/* E053A4 80240044 AFB40098 */ sw $s4, 0x98($sp) -/* E053A8 80240048 AFB30094 */ sw $s3, 0x94($sp) -/* E053AC 8024004C AFB20090 */ sw $s2, 0x90($sp) -/* E053B0 80240050 AFB1008C */ sw $s1, 0x8c($sp) -/* E053B4 80240054 F7BA00C0 */ sdc1 $f26, 0xc0($sp) -/* E053B8 80240058 F7B800B8 */ sdc1 $f24, 0xb8($sp) -/* E053BC 8024005C F7B600B0 */ sdc1 $f22, 0xb0($sp) -/* E053C0 80240060 F7B400A8 */ sdc1 $f20, 0xa8($sp) -/* E053C4 80240064 C6160010 */ lwc1 $f22, 0x10($s0) -/* E053C8 80240068 4680B5A0 */ cvt.s.w $f22, $f22 -/* E053CC 8024006C 4480D000 */ mtc1 $zero, $f26 -/* E053D0 80240070 3C01437F */ lui $at, 0x437f -/* E053D4 80240074 4481A000 */ mtc1 $at, $f20 -/* E053D8 80240078 8C82001C */ lw $v0, 0x1c($a0) -/* E053DC 8024007C 4405D000 */ mfc1 $a1, $f26 -/* E053E0 80240080 4406A000 */ mfc1 $a2, $f20 -/* E053E4 80240084 C6180014 */ lwc1 $f24, 0x14($s0) -/* E053E8 80240088 4680C620 */ cvt.s.w $f24, $f24 -/* E053EC 8024008C AFA20010 */ sw $v0, 0x10($sp) -/* E053F0 80240090 8E070018 */ lw $a3, 0x18($s0) -/* E053F4 80240094 0C00A8ED */ jal update_lerp -/* E053F8 80240098 0000202D */ daddu $a0, $zero, $zero -/* E053FC 8024009C 4600A03C */ c.lt.s $f20, $f0 -/* E05400 802400A0 00000000 */ nop -/* E05404 802400A4 45000002 */ bc1f .L802400B0 -/* E05408 802400A8 27B10038 */ addiu $s1, $sp, 0x38 -/* E0540C 802400AC 4600A006 */ mov.s $f0, $f20 -.L802400B0: -/* E05410 802400B0 4600010D */ trunc.w.s $f4, $f0 -/* E05414 802400B4 E7A40014 */ swc1 $f4, 0x14($sp) -/* E05418 802400B8 0000202D */ daddu $a0, $zero, $zero -/* E0541C 802400BC 24050007 */ addiu $a1, $zero, 7 -/* E05420 802400C0 240600FF */ addiu $a2, $zero, 0xff -/* E05424 802400C4 00C0382D */ daddu $a3, $a2, $zero -/* E05428 802400C8 00C0A82D */ daddu $s5, $a2, $zero -/* E0542C 802400CC AFB50010 */ sw $s5, 0x10($sp) -/* E05430 802400D0 0C04EAA7 */ jal func_8013AA9C -/* E05434 802400D4 AFA00018 */ sw $zero, 0x18($sp) -/* E05438 802400D8 AFB10010 */ sw $s1, 0x10($sp) -/* E0543C 802400DC 8E040004 */ lw $a0, 4($s0) -/* E05440 802400E0 8E050008 */ lw $a1, 8($s0) -/* E05444 802400E4 8E060000 */ lw $a2, ($s0) -/* E05448 802400E8 8E07000C */ lw $a3, 0xc($s0) -/* E0544C 802400EC 0C04BA38 */ jal func_8012E8E0 -/* E05450 802400F0 3C140001 */ lui $s4, 1 -/* E05454 802400F4 93A20042 */ lbu $v0, 0x42($sp) -/* E05458 802400F8 3C013FE0 */ lui $at, 0x3fe0 -/* E0545C 802400FC 4481A800 */ mtc1 $at, $f21 -/* E05460 80240100 4480A000 */ mtc1 $zero, $f20 -/* E05464 80240104 44820000 */ mtc1 $v0, $f0 -/* E05468 80240108 00000000 */ nop -/* E0546C 8024010C 46800021 */ cvt.d.w $f0, $f0 -/* E05470 80240110 46340002 */ mul.d $f0, $f0, $f20 -/* E05474 80240114 00000000 */ nop -/* E05478 80240118 36941630 */ ori $s4, $s4, 0x1630 -/* E0547C 8024011C 4600B0A1 */ cvt.d.s $f2, $f22 -/* E05480 80240120 27B00048 */ addiu $s0, $sp, 0x48 -/* E05484 80240124 4600C607 */ neg.s $f24, $f24 -/* E05488 80240128 46201080 */ add.d $f2, $f2, $f0 -/* E0548C 8024012C 4406C000 */ mfc1 $a2, $f24 -/* E05490 80240130 4407D000 */ mfc1 $a3, $f26 -/* E05494 80240134 462010A0 */ cvt.s.d $f2, $f2 -/* E05498 80240138 44051000 */ mfc1 $a1, $f2 -/* E0549C 8024013C 0C019E40 */ jal guTranslateF -/* E054A0 80240140 0200202D */ daddu $a0, $s0, $zero -/* E054A4 80240144 0200202D */ daddu $a0, $s0, $zero -/* E054A8 80240148 3C128007 */ lui $s2, 0x8007 -/* E054AC 8024014C 265241F0 */ addiu $s2, $s2, 0x41f0 -/* E054B0 80240150 3C13800A */ lui $s3, 0x800a -/* E054B4 80240154 2673A674 */ addiu $s3, $s3, -0x598c -/* E054B8 80240158 96450000 */ lhu $a1, ($s2) -/* E054BC 8024015C 8E620000 */ lw $v0, ($s3) -/* E054C0 80240160 00052980 */ sll $a1, $a1, 6 -/* E054C4 80240164 00B42821 */ addu $a1, $a1, $s4 -/* E054C8 80240168 0C019D40 */ jal guMtxF2L -/* E054CC 8024016C 00452821 */ addu $a1, $v0, $a1 -/* E054D0 80240170 3C03DA38 */ lui $v1, 0xda38 -/* E054D4 80240174 34630002 */ ori $v1, $v1, 2 -/* E054D8 80240178 0000202D */ daddu $a0, $zero, $zero -/* E054DC 8024017C 27A50020 */ addiu $a1, $sp, 0x20 -/* E054E0 80240180 3C060005 */ lui $a2, 5 -/* E054E4 80240184 34C60040 */ ori $a2, $a2, 0x40 -/* E054E8 80240188 3C11800A */ lui $s1, 0x800a -/* E054EC 8024018C 2631A66C */ addiu $s1, $s1, -0x5994 -/* E054F0 80240190 0200382D */ daddu $a3, $s0, $zero -/* E054F4 80240194 8E220000 */ lw $v0, ($s1) -/* E054F8 80240198 96480000 */ lhu $t0, ($s2) -/* E054FC 8024019C 0040482D */ daddu $t1, $v0, $zero -/* E05500 802401A0 24420008 */ addiu $v0, $v0, 8 -/* E05504 802401A4 AE220000 */ sw $v0, ($s1) -/* E05508 802401A8 3102FFFF */ andi $v0, $t0, 0xffff -/* E0550C 802401AC 00021180 */ sll $v0, $v0, 6 -/* E05510 802401B0 00541021 */ addu $v0, $v0, $s4 -/* E05514 802401B4 AD230000 */ sw $v1, ($t1) -/* E05518 802401B8 8E630000 */ lw $v1, ($s3) -/* E0551C 802401BC 25080001 */ addiu $t0, $t0, 1 -/* E05520 802401C0 00621821 */ addu $v1, $v1, $v0 -/* E05524 802401C4 3C028000 */ lui $v0, 0x8000 -/* E05528 802401C8 00621821 */ addu $v1, $v1, $v0 -/* E0552C 802401CC AD230004 */ sw $v1, 4($t1) -/* E05530 802401D0 93A20042 */ lbu $v0, 0x42($sp) -/* E05534 802401D4 8FA3003C */ lw $v1, 0x3c($sp) -/* E05538 802401D8 93A90040 */ lbu $t1, 0x40($sp) -/* E0553C 802401DC 93AA0041 */ lbu $t2, 0x41($sp) -/* E05540 802401E0 44820000 */ mtc1 $v0, $f0 -/* E05544 802401E4 00000000 */ nop -/* E05548 802401E8 46800021 */ cvt.d.w $f0, $f0 -/* E0554C 802401EC 8FA20038 */ lw $v0, 0x38($sp) -/* E05550 802401F0 46340002 */ mul.d $f0, $f0, $f20 -/* E05554 802401F4 00000000 */ nop -/* E05558 802401F8 A6480000 */ sh $t0, ($s2) -/* E0555C 802401FC A7A0002E */ sh $zero, 0x2e($sp) -/* E05560 80240200 A3B50030 */ sb $s5, 0x30($sp) -/* E05564 80240204 AFA30024 */ sw $v1, 0x24($sp) -/* E05568 80240208 A7A90028 */ sh $t1, 0x28($sp) -/* E0556C 8024020C A7AA002A */ sh $t2, 0x2a($sp) -/* E05570 80240210 AFA20020 */ sw $v0, 0x20($sp) -/* E05574 80240214 46200007 */ neg.d $f0, $f0 -/* E05578 80240218 4620010D */ trunc.w.d $f4, $f0 -/* E0557C 8024021C 44022000 */ mfc1 $v0, $f4 -/* E05580 80240220 0C04EBDC */ jal func_8013AF70 -/* E05584 80240224 A7A2002C */ sh $v0, 0x2c($sp) -/* E05588 80240228 3C04D838 */ lui $a0, 0xd838 -/* E0558C 8024022C 8E220000 */ lw $v0, ($s1) -/* E05590 80240230 34840002 */ ori $a0, $a0, 2 -/* E05594 80240234 0040182D */ daddu $v1, $v0, $zero -/* E05598 80240238 24420008 */ addiu $v0, $v0, 8 -/* E0559C 8024023C AE220000 */ sw $v0, ($s1) -/* E055A0 80240240 24020040 */ addiu $v0, $zero, 0x40 -/* E055A4 80240244 AC640000 */ sw $a0, ($v1) -/* E055A8 80240248 AC620004 */ sw $v0, 4($v1) -/* E055AC 8024024C 8FBF00A0 */ lw $ra, 0xa0($sp) -/* E055B0 80240250 8FB5009C */ lw $s5, 0x9c($sp) -/* E055B4 80240254 8FB40098 */ lw $s4, 0x98($sp) -/* E055B8 80240258 8FB30094 */ lw $s3, 0x94($sp) -/* E055BC 8024025C 8FB20090 */ lw $s2, 0x90($sp) -/* E055C0 80240260 8FB1008C */ lw $s1, 0x8c($sp) -/* E055C4 80240264 8FB00088 */ lw $s0, 0x88($sp) -/* E055C8 80240268 D7BA00C0 */ ldc1 $f26, 0xc0($sp) -/* E055CC 8024026C D7B800B8 */ ldc1 $f24, 0xb8($sp) -/* E055D0 80240270 D7B600B0 */ ldc1 $f22, 0xb0($sp) -/* E055D4 80240274 D7B400A8 */ ldc1 $f20, 0xa8($sp) -/* E055D8 80240278 03E00008 */ jr $ra -/* E055DC 8024027C 27BD00C8 */ addiu $sp, $sp, 0xc8 diff --git a/asm/nonmatchings/world/area_end/end_01/func_80240280_E05360.s b/asm/nonmatchings/world/area_end/end_01/func_80240280_E05360.s deleted file mode 100644 index c40523671d..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/func_80240280_E05360.s +++ /dev/null @@ -1,190 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240280_E055E0 -/* E055E0 80240280 27BDFF40 */ addiu $sp, $sp, -0xc0 -/* E055E4 80240284 AFB1008C */ sw $s1, 0x8c($sp) -/* E055E8 80240288 0080882D */ daddu $s1, $a0, $zero -/* E055EC 8024028C AFB00088 */ sw $s0, 0x88($sp) -/* E055F0 80240290 00A0802D */ daddu $s0, $a1, $zero -/* E055F4 80240294 0000202D */ daddu $a0, $zero, $zero -/* E055F8 80240298 AFBF00A0 */ sw $ra, 0xa0($sp) -/* E055FC 8024029C AFB5009C */ sw $s5, 0x9c($sp) -/* E05600 802402A0 AFB40098 */ sw $s4, 0x98($sp) -/* E05604 802402A4 AFB30094 */ sw $s3, 0x94($sp) -/* E05608 802402A8 AFB20090 */ sw $s2, 0x90($sp) -/* E0560C 802402AC F7B800B8 */ sdc1 $f24, 0xb8($sp) -/* E05610 802402B0 F7B600B0 */ sdc1 $f22, 0xb0($sp) -/* E05614 802402B4 F7B400A8 */ sdc1 $f20, 0xa8($sp) -/* E05618 802402B8 C6160010 */ lwc1 $f22, 0x10($s0) -/* E0561C 802402BC 4680B5A0 */ cvt.s.w $f22, $f22 -/* E05620 802402C0 3C01437F */ lui $at, 0x437f -/* E05624 802402C4 4481A000 */ mtc1 $at, $f20 -/* E05628 802402C8 8E22001C */ lw $v0, 0x1c($s1) -/* E0562C 802402CC 4406A000 */ mfc1 $a2, $f20 -/* E05630 802402D0 C6180014 */ lwc1 $f24, 0x14($s0) -/* E05634 802402D4 4680C620 */ cvt.s.w $f24, $f24 -/* E05638 802402D8 AFA20010 */ sw $v0, 0x10($sp) -/* E0563C 802402DC 8E070018 */ lw $a3, 0x18($s0) -/* E05640 802402E0 0C00A8ED */ jal update_lerp -/* E05644 802402E4 0000282D */ daddu $a1, $zero, $zero -/* E05648 802402E8 4600A03C */ c.lt.s $f20, $f0 -/* E0564C 802402EC 00000000 */ nop -/* E05650 802402F0 45000002 */ bc1f .L802402FC -/* E05654 802402F4 27B50038 */ addiu $s5, $sp, 0x38 -/* E05658 802402F8 4600A006 */ mov.s $f0, $f20 -.L802402FC: -/* E0565C 802402FC 8E24001C */ lw $a0, 0x1c($s1) -/* E05660 80240300 8E030018 */ lw $v1, 0x18($s0) -/* E05664 80240304 2482FFFC */ addiu $v0, $a0, -4 -/* E05668 80240308 14620007 */ bne $v1, $v0, .L80240328 -/* E0566C 8024030C 2482FFFD */ addiu $v0, $a0, -3 -/* E05670 80240310 4600010D */ trunc.w.s $f4, $f0 -/* E05674 80240314 E7A40014 */ swc1 $f4, 0x14($sp) -/* E05678 80240318 0000202D */ daddu $a0, $zero, $zero -/* E0567C 8024031C 2405000A */ addiu $a1, $zero, 0xa -/* E05680 80240320 080900E5 */ j .L80240394 -/* E05684 80240324 24060040 */ addiu $a2, $zero, 0x40 -.L80240328: -/* E05688 80240328 14620007 */ bne $v1, $v0, .L80240348 -/* E0568C 8024032C 2482FFFE */ addiu $v0, $a0, -2 -/* E05690 80240330 4600010D */ trunc.w.s $f4, $f0 -/* E05694 80240334 E7A40014 */ swc1 $f4, 0x14($sp) -/* E05698 80240338 0000202D */ daddu $a0, $zero, $zero -/* E0569C 8024033C 2405000A */ addiu $a1, $zero, 0xa -/* E056A0 80240340 080900E5 */ j .L80240394 -/* E056A4 80240344 24060060 */ addiu $a2, $zero, 0x60 -.L80240348: -/* E056A8 80240348 14620007 */ bne $v1, $v0, .L80240368 -/* E056AC 8024034C 2482FFFF */ addiu $v0, $a0, -1 -/* E056B0 80240350 4600010D */ trunc.w.s $f4, $f0 -/* E056B4 80240354 E7A40014 */ swc1 $f4, 0x14($sp) -/* E056B8 80240358 0000202D */ daddu $a0, $zero, $zero -/* E056BC 8024035C 2405000A */ addiu $a1, $zero, 0xa -/* E056C0 80240360 080900E5 */ j .L80240394 -/* E056C4 80240364 2406007F */ addiu $a2, $zero, 0x7f -.L80240368: -/* E056C8 80240368 14620006 */ bne $v1, $v0, .L80240384 -/* E056CC 8024036C 0000202D */ daddu $a0, $zero, $zero -/* E056D0 80240370 4600010D */ trunc.w.s $f4, $f0 -/* E056D4 80240374 E7A40014 */ swc1 $f4, 0x14($sp) -/* E056D8 80240378 2405000A */ addiu $a1, $zero, 0xa -/* E056DC 8024037C 080900E5 */ j .L80240394 -/* E056E0 80240380 24060050 */ addiu $a2, $zero, 0x50 -.L80240384: -/* E056E4 80240384 4600010D */ trunc.w.s $f4, $f0 -/* E056E8 80240388 E7A40014 */ swc1 $f4, 0x14($sp) -/* E056EC 8024038C 24050007 */ addiu $a1, $zero, 7 -/* E056F0 80240390 240600FF */ addiu $a2, $zero, 0xff -.L80240394: -/* E056F4 80240394 00C0382D */ daddu $a3, $a2, $zero -/* E056F8 80240398 00C0102D */ daddu $v0, $a2, $zero -/* E056FC 8024039C AFA20010 */ sw $v0, 0x10($sp) -/* E05700 802403A0 0C04EAA7 */ jal func_8013AA9C -/* E05704 802403A4 AFA00018 */ sw $zero, 0x18($sp) -/* E05708 802403A8 AFB50010 */ sw $s5, 0x10($sp) -/* E0570C 802403AC 8E040004 */ lw $a0, 4($s0) -/* E05710 802403B0 8E050008 */ lw $a1, 8($s0) -/* E05714 802403B4 8E060000 */ lw $a2, ($s0) -/* E05718 802403B8 8E07000C */ lw $a3, 0xc($s0) -/* E0571C 802403BC 0C04BA38 */ jal func_8012E8E0 -/* E05720 802403C0 3C140001 */ lui $s4, 1 -/* E05724 802403C4 92A2000A */ lbu $v0, 0xa($s5) -/* E05728 802403C8 3C013FE0 */ lui $at, 0x3fe0 -/* E0572C 802403CC 4481A800 */ mtc1 $at, $f21 -/* E05730 802403D0 4480A000 */ mtc1 $zero, $f20 -/* E05734 802403D4 44820000 */ mtc1 $v0, $f0 -/* E05738 802403D8 00000000 */ nop -/* E0573C 802403DC 46800021 */ cvt.d.w $f0, $f0 -/* E05740 802403E0 46340002 */ mul.d $f0, $f0, $f20 -/* E05744 802403E4 00000000 */ nop -/* E05748 802403E8 36941630 */ ori $s4, $s4, 0x1630 -/* E0574C 802403EC 4600B0A1 */ cvt.d.s $f2, $f22 -/* E05750 802403F0 46201080 */ add.d $f2, $f2, $f0 -/* E05754 802403F4 27B30048 */ addiu $s3, $sp, 0x48 -/* E05758 802403F8 0260202D */ daddu $a0, $s3, $zero -/* E0575C 802403FC 4600C607 */ neg.s $f24, $f24 -/* E05760 80240400 4406C000 */ mfc1 $a2, $f24 -/* E05764 80240404 462010A0 */ cvt.s.d $f2, $f2 -/* E05768 80240408 44051000 */ mfc1 $a1, $f2 -/* E0576C 8024040C 0C019E40 */ jal guTranslateF -/* E05770 80240410 0000382D */ daddu $a3, $zero, $zero -/* E05774 80240414 0260202D */ daddu $a0, $s3, $zero -/* E05778 80240418 3C108007 */ lui $s0, 0x8007 -/* E0577C 8024041C 261041F0 */ addiu $s0, $s0, 0x41f0 -/* E05780 80240420 3C12800A */ lui $s2, 0x800a -/* E05784 80240424 2652A674 */ addiu $s2, $s2, -0x598c -/* E05788 80240428 96050000 */ lhu $a1, ($s0) -/* E0578C 8024042C 8E420000 */ lw $v0, ($s2) -/* E05790 80240430 00052980 */ sll $a1, $a1, 6 -/* E05794 80240434 00B42821 */ addu $a1, $a1, $s4 -/* E05798 80240438 0C019D40 */ jal guMtxF2L -/* E0579C 8024043C 00452821 */ addu $a1, $v0, $a1 -/* E057A0 80240440 3C02DA38 */ lui $v0, 0xda38 -/* E057A4 80240444 34420002 */ ori $v0, $v0, 2 -/* E057A8 80240448 3C11800A */ lui $s1, 0x800a -/* E057AC 8024044C 2631A66C */ addiu $s1, $s1, -0x5994 -/* E057B0 80240450 8E240000 */ lw $a0, ($s1) -/* E057B4 80240454 96050000 */ lhu $a1, ($s0) -/* E057B8 80240458 0080302D */ daddu $a2, $a0, $zero -/* E057BC 8024045C ACC20000 */ sw $v0, ($a2) -/* E057C0 80240460 30A2FFFF */ andi $v0, $a1, 0xffff -/* E057C4 80240464 00021180 */ sll $v0, $v0, 6 -/* E057C8 80240468 8E430000 */ lw $v1, ($s2) -/* E057CC 8024046C 00541021 */ addu $v0, $v0, $s4 -/* E057D0 80240470 00621821 */ addu $v1, $v1, $v0 -/* E057D4 80240474 3C028000 */ lui $v0, 0x8000 -/* E057D8 80240478 00621821 */ addu $v1, $v1, $v0 -/* E057DC 8024047C ACC30004 */ sw $v1, 4($a2) -/* E057E0 80240480 8EA20000 */ lw $v0, ($s5) -/* E057E4 80240484 24840008 */ addiu $a0, $a0, 8 -/* E057E8 80240488 AE240000 */ sw $a0, ($s1) -/* E057EC 8024048C AFA20020 */ sw $v0, 0x20($sp) -/* E057F0 80240490 8EA20004 */ lw $v0, 4($s5) -/* E057F4 80240494 24A50001 */ addiu $a1, $a1, 1 -/* E057F8 80240498 A6050000 */ sh $a1, ($s0) -/* E057FC 8024049C AFA20024 */ sw $v0, 0x24($sp) -/* E05800 802404A0 92A20008 */ lbu $v0, 8($s5) -/* E05804 802404A4 A7A20028 */ sh $v0, 0x28($sp) -/* E05808 802404A8 92A20009 */ lbu $v0, 9($s5) -/* E0580C 802404AC A7A2002A */ sh $v0, 0x2a($sp) -/* E05810 802404B0 92A2000A */ lbu $v0, 0xa($s5) -/* E05814 802404B4 0260382D */ daddu $a3, $s3, $zero -/* E05818 802404B8 44820000 */ mtc1 $v0, $f0 -/* E0581C 802404BC 00000000 */ nop -/* E05820 802404C0 46800021 */ cvt.d.w $f0, $f0 -/* E05824 802404C4 46340002 */ mul.d $f0, $f0, $f20 -/* E05828 802404C8 00000000 */ nop -/* E0582C 802404CC 0000202D */ daddu $a0, $zero, $zero -/* E05830 802404D0 3C060005 */ lui $a2, 5 -/* E05834 802404D4 34C60040 */ ori $a2, $a2, 0x40 -/* E05838 802404D8 27A50020 */ addiu $a1, $sp, 0x20 -/* E0583C 802404DC A7A0002E */ sh $zero, 0x2e($sp) -/* E05840 802404E0 240200FF */ addiu $v0, $zero, 0xff -/* E05844 802404E4 A3A20030 */ sb $v0, 0x30($sp) -/* E05848 802404E8 46200007 */ neg.d $f0, $f0 -/* E0584C 802404EC 4620010D */ trunc.w.d $f4, $f0 -/* E05850 802404F0 44022000 */ mfc1 $v0, $f4 -/* E05854 802404F4 0C04EBDC */ jal func_8013AF70 -/* E05858 802404F8 A7A2002C */ sh $v0, 0x2c($sp) -/* E0585C 802404FC 3C04D838 */ lui $a0, 0xd838 -/* E05860 80240500 8E220000 */ lw $v0, ($s1) -/* E05864 80240504 34840002 */ ori $a0, $a0, 2 -/* E05868 80240508 0040182D */ daddu $v1, $v0, $zero -/* E0586C 8024050C 24420008 */ addiu $v0, $v0, 8 -/* E05870 80240510 AE220000 */ sw $v0, ($s1) -/* E05874 80240514 24020040 */ addiu $v0, $zero, 0x40 -/* E05878 80240518 AC640000 */ sw $a0, ($v1) -/* E0587C 8024051C AC620004 */ sw $v0, 4($v1) -/* E05880 80240520 8FBF00A0 */ lw $ra, 0xa0($sp) -/* E05884 80240524 8FB5009C */ lw $s5, 0x9c($sp) -/* E05888 80240528 8FB40098 */ lw $s4, 0x98($sp) -/* E0588C 8024052C 8FB30094 */ lw $s3, 0x94($sp) -/* E05890 80240530 8FB20090 */ lw $s2, 0x90($sp) -/* E05894 80240534 8FB1008C */ lw $s1, 0x8c($sp) -/* E05898 80240538 8FB00088 */ lw $s0, 0x88($sp) -/* E0589C 8024053C D7B800B8 */ ldc1 $f24, 0xb8($sp) -/* E058A0 80240540 D7B600B0 */ ldc1 $f22, 0xb0($sp) -/* E058A4 80240544 D7B400A8 */ ldc1 $f20, 0xa8($sp) -/* E058A8 80240548 03E00008 */ jr $ra -/* E058AC 8024054C 27BD00C0 */ addiu $sp, $sp, 0xc0 diff --git a/asm/nonmatchings/world/area_end/end_01/func_80240550_E05360.s b/asm/nonmatchings/world/area_end/end_01/func_80240550_E05360.s deleted file mode 100644 index d3ce747db6..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/func_80240550_E05360.s +++ /dev/null @@ -1,190 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240550_E058B0 -/* E058B0 80240550 27BDFEF0 */ addiu $sp, $sp, -0x110 -/* E058B4 80240554 AFB200D0 */ sw $s2, 0xd0($sp) -/* E058B8 80240558 0080902D */ daddu $s2, $a0, $zero -/* E058BC 8024055C AFB000C8 */ sw $s0, 0xc8($sp) -/* E058C0 80240560 00A0802D */ daddu $s0, $a1, $zero -/* E058C4 80240564 AFBF00E0 */ sw $ra, 0xe0($sp) -/* E058C8 80240568 AFB500DC */ sw $s5, 0xdc($sp) -/* E058CC 8024056C AFB400D8 */ sw $s4, 0xd8($sp) -/* E058D0 80240570 AFB300D4 */ sw $s3, 0xd4($sp) -/* E058D4 80240574 AFB100CC */ sw $s1, 0xcc($sp) -/* E058D8 80240578 F7BC0108 */ sdc1 $f28, 0x108($sp) -/* E058DC 8024057C F7BA0100 */ sdc1 $f26, 0x100($sp) -/* E058E0 80240580 F7B800F8 */ sdc1 $f24, 0xf8($sp) -/* E058E4 80240584 F7B600F0 */ sdc1 $f22, 0xf0($sp) -/* E058E8 80240588 F7B400E8 */ sdc1 $f20, 0xe8($sp) -/* E058EC 8024058C C6160010 */ lwc1 $f22, 0x10($s0) -/* E058F0 80240590 4680B5A0 */ cvt.s.w $f22, $f22 -/* E058F4 80240594 3C054180 */ lui $a1, 0x4180 -/* E058F8 80240598 3C064396 */ lui $a2, 0x4396 -/* E058FC 8024059C 8E42001C */ lw $v0, 0x1c($s2) -/* E05900 802405A0 C61C0014 */ lwc1 $f28, 0x14($s0) -/* E05904 802405A4 4680E720 */ cvt.s.w $f28, $f28 -/* E05908 802405A8 AFA20010 */ sw $v0, 0x10($sp) -/* E0590C 802405AC 8E070018 */ lw $a3, 0x18($s0) -/* E05910 802405B0 0C00A8ED */ jal update_lerp -/* E05914 802405B4 2404000C */ addiu $a0, $zero, 0xc -/* E05918 802405B8 3C01437F */ lui $at, 0x437f -/* E0591C 802405BC 44811000 */ mtc1 $at, $f2 -/* E05920 802405C0 00000000 */ nop -/* E05924 802405C4 4600103C */ c.lt.s $f2, $f0 -/* E05928 802405C8 00000000 */ nop -/* E0592C 802405CC 45000002 */ bc1f .L802405D8 -/* E05930 802405D0 27B10038 */ addiu $s1, $sp, 0x38 -/* E05934 802405D4 46001006 */ mov.s $f0, $f2 -.L802405D8: -/* E05938 802405D8 4600010D */ trunc.w.s $f4, $f0 -/* E0593C 802405DC E7A40014 */ swc1 $f4, 0x14($sp) -/* E05940 802405E0 0000202D */ daddu $a0, $zero, $zero -/* E05944 802405E4 24050007 */ addiu $a1, $zero, 7 -/* E05948 802405E8 240600FF */ addiu $a2, $zero, 0xff -/* E0594C 802405EC 00C0382D */ daddu $a3, $a2, $zero -/* E05950 802405F0 00C0A82D */ daddu $s5, $a2, $zero -/* E05954 802405F4 AFB50010 */ sw $s5, 0x10($sp) -/* E05958 802405F8 0C04EAA7 */ jal func_8013AA9C -/* E0595C 802405FC AFA00018 */ sw $zero, 0x18($sp) -/* E05960 80240600 8E42001C */ lw $v0, 0x1c($s2) -/* E05964 80240604 3C053E4C */ lui $a1, 0x3e4c -/* E05968 80240608 34A5CCCD */ ori $a1, $a1, 0xcccd -/* E0596C 8024060C 3C064000 */ lui $a2, 0x4000 -/* E05970 80240610 AFA20010 */ sw $v0, 0x10($sp) -/* E05974 80240614 8E070018 */ lw $a3, 0x18($s0) -/* E05978 80240618 0C00A8ED */ jal update_lerp -/* E0597C 8024061C 0000202D */ daddu $a0, $zero, $zero -/* E05980 80240620 46000506 */ mov.s $f20, $f0 -/* E05984 80240624 3C013FF0 */ lui $at, 0x3ff0 -/* E05988 80240628 4481C800 */ mtc1 $at, $f25 -/* E0598C 8024062C 4480C000 */ mtc1 $zero, $f24 -/* E05990 80240630 4600A021 */ cvt.d.s $f0, $f20 -/* E05994 80240634 4620C03C */ c.lt.d $f24, $f0 -/* E05998 80240638 00000000 */ nop -/* E0599C 8024063C 45000003 */ bc1f .L8024064C -/* E059A0 80240640 AFB10010 */ sw $s1, 0x10($sp) -/* E059A4 80240644 3C013F80 */ lui $at, 0x3f80 -/* E059A8 80240648 4481A000 */ mtc1 $at, $f20 -.L8024064C: -/* E059AC 8024064C 8E040004 */ lw $a0, 4($s0) -/* E059B0 80240650 8E050008 */ lw $a1, 8($s0) -/* E059B4 80240654 8E060000 */ lw $a2, ($s0) -/* E059B8 80240658 0C04BA38 */ jal func_8012E8E0 -/* E059BC 8024065C 8E07000C */ lw $a3, 0xc($s0) -/* E059C0 80240660 93A20042 */ lbu $v0, 0x42($sp) -/* E059C4 80240664 3C013FE0 */ lui $at, 0x3fe0 -/* E059C8 80240668 4481D800 */ mtc1 $at, $f27 -/* E059CC 8024066C 4480D000 */ mtc1 $zero, $f26 -/* E059D0 80240670 44820000 */ mtc1 $v0, $f0 -/* E059D4 80240674 00000000 */ nop -/* E059D8 80240678 46800021 */ cvt.d.w $f0, $f0 -/* E059DC 8024067C 463A0002 */ mul.d $f0, $f0, $f26 -/* E059E0 80240680 00000000 */ nop -/* E059E4 80240684 4600B0A1 */ cvt.d.s $f2, $f22 -/* E059E8 80240688 46201080 */ add.d $f2, $f2, $f0 -/* E059EC 8024068C 27B40048 */ addiu $s4, $sp, 0x48 -/* E059F0 80240690 0280202D */ daddu $a0, $s4, $zero -/* E059F4 80240694 4600E707 */ neg.s $f28, $f28 -/* E059F8 80240698 4406E000 */ mfc1 $a2, $f28 -/* E059FC 8024069C 462010A0 */ cvt.s.d $f2, $f2 -/* E05A00 802406A0 44051000 */ mfc1 $a1, $f2 -/* E05A04 802406A4 0C019E40 */ jal guTranslateF -/* E05A08 802406A8 0000382D */ daddu $a3, $zero, $zero -/* E05A0C 802406AC 4600A021 */ cvt.d.s $f0, $f20 -/* E05A10 802406B0 46380032 */ c.eq.d $f0, $f24 -/* E05A14 802406B4 00000000 */ nop -/* E05A18 802406B8 4501000C */ bc1t .L802406EC -/* E05A1C 802406BC 3C130001 */ lui $s3, 1 -/* E05A20 802406C0 27B00088 */ addiu $s0, $sp, 0x88 -/* E05A24 802406C4 0200202D */ daddu $a0, $s0, $zero -/* E05A28 802406C8 4405A000 */ mfc1 $a1, $f20 -/* E05A2C 802406CC 3C073F80 */ lui $a3, 0x3f80 -/* E05A30 802406D0 0C019DF0 */ jal guScaleF -/* E05A34 802406D4 00A0302D */ daddu $a2, $a1, $zero -/* E05A38 802406D8 0200202D */ daddu $a0, $s0, $zero -/* E05A3C 802406DC 0280282D */ daddu $a1, $s4, $zero -/* E05A40 802406E0 0C019D80 */ jal guMtxCatF -/* E05A44 802406E4 0280302D */ daddu $a2, $s4, $zero -/* E05A48 802406E8 3C130001 */ lui $s3, 1 -.L802406EC: -/* E05A4C 802406EC 36731630 */ ori $s3, $s3, 0x1630 -/* E05A50 802406F0 0280202D */ daddu $a0, $s4, $zero -/* E05A54 802406F4 3C118007 */ lui $s1, 0x8007 -/* E05A58 802406F8 263141F0 */ addiu $s1, $s1, 0x41f0 -/* E05A5C 802406FC 3C12800A */ lui $s2, 0x800a -/* E05A60 80240700 2652A674 */ addiu $s2, $s2, -0x598c -/* E05A64 80240704 96250000 */ lhu $a1, ($s1) -/* E05A68 80240708 8E420000 */ lw $v0, ($s2) -/* E05A6C 8024070C 00052980 */ sll $a1, $a1, 6 -/* E05A70 80240710 00B32821 */ addu $a1, $a1, $s3 -/* E05A74 80240714 0C019D40 */ jal guMtxF2L -/* E05A78 80240718 00452821 */ addu $a1, $v0, $a1 -/* E05A7C 8024071C 3C03DA38 */ lui $v1, 0xda38 -/* E05A80 80240720 34630002 */ ori $v1, $v1, 2 -/* E05A84 80240724 0000202D */ daddu $a0, $zero, $zero -/* E05A88 80240728 27A50020 */ addiu $a1, $sp, 0x20 -/* E05A8C 8024072C 24060040 */ addiu $a2, $zero, 0x40 -/* E05A90 80240730 3C10800A */ lui $s0, 0x800a -/* E05A94 80240734 2610A66C */ addiu $s0, $s0, -0x5994 -/* E05A98 80240738 0280382D */ daddu $a3, $s4, $zero -/* E05A9C 8024073C 8E020000 */ lw $v0, ($s0) -/* E05AA0 80240740 96280000 */ lhu $t0, ($s1) -/* E05AA4 80240744 0040482D */ daddu $t1, $v0, $zero -/* E05AA8 80240748 24420008 */ addiu $v0, $v0, 8 -/* E05AAC 8024074C AE020000 */ sw $v0, ($s0) -/* E05AB0 80240750 3102FFFF */ andi $v0, $t0, 0xffff -/* E05AB4 80240754 00021180 */ sll $v0, $v0, 6 -/* E05AB8 80240758 00531021 */ addu $v0, $v0, $s3 -/* E05ABC 8024075C AD230000 */ sw $v1, ($t1) -/* E05AC0 80240760 8E430000 */ lw $v1, ($s2) -/* E05AC4 80240764 25080001 */ addiu $t0, $t0, 1 -/* E05AC8 80240768 00621821 */ addu $v1, $v1, $v0 -/* E05ACC 8024076C 3C028000 */ lui $v0, 0x8000 -/* E05AD0 80240770 00621821 */ addu $v1, $v1, $v0 -/* E05AD4 80240774 AD230004 */ sw $v1, 4($t1) -/* E05AD8 80240778 93A20042 */ lbu $v0, 0x42($sp) -/* E05ADC 8024077C 8FA3003C */ lw $v1, 0x3c($sp) -/* E05AE0 80240780 93A90040 */ lbu $t1, 0x40($sp) -/* E05AE4 80240784 93AA0041 */ lbu $t2, 0x41($sp) -/* E05AE8 80240788 44820000 */ mtc1 $v0, $f0 -/* E05AEC 8024078C 00000000 */ nop -/* E05AF0 80240790 46800021 */ cvt.d.w $f0, $f0 -/* E05AF4 80240794 8FA20038 */ lw $v0, 0x38($sp) -/* E05AF8 80240798 463A0002 */ mul.d $f0, $f0, $f26 -/* E05AFC 8024079C 00000000 */ nop -/* E05B00 802407A0 A6280000 */ sh $t0, ($s1) -/* E05B04 802407A4 A7A0002E */ sh $zero, 0x2e($sp) -/* E05B08 802407A8 A3B50030 */ sb $s5, 0x30($sp) -/* E05B0C 802407AC AFA30024 */ sw $v1, 0x24($sp) -/* E05B10 802407B0 A7A90028 */ sh $t1, 0x28($sp) -/* E05B14 802407B4 A7AA002A */ sh $t2, 0x2a($sp) -/* E05B18 802407B8 AFA20020 */ sw $v0, 0x20($sp) -/* E05B1C 802407BC 46200007 */ neg.d $f0, $f0 -/* E05B20 802407C0 4620010D */ trunc.w.d $f4, $f0 -/* E05B24 802407C4 44022000 */ mfc1 $v0, $f4 -/* E05B28 802407C8 0C04EBDC */ jal func_8013AF70 -/* E05B2C 802407CC A7A2002C */ sh $v0, 0x2c($sp) -/* E05B30 802407D0 3C04D838 */ lui $a0, 0xd838 -/* E05B34 802407D4 8E020000 */ lw $v0, ($s0) -/* E05B38 802407D8 34840002 */ ori $a0, $a0, 2 -/* E05B3C 802407DC 0040182D */ daddu $v1, $v0, $zero -/* E05B40 802407E0 24420008 */ addiu $v0, $v0, 8 -/* E05B44 802407E4 AE020000 */ sw $v0, ($s0) -/* E05B48 802407E8 24020040 */ addiu $v0, $zero, 0x40 -/* E05B4C 802407EC AC640000 */ sw $a0, ($v1) -/* E05B50 802407F0 AC620004 */ sw $v0, 4($v1) -/* E05B54 802407F4 8FBF00E0 */ lw $ra, 0xe0($sp) -/* E05B58 802407F8 8FB500DC */ lw $s5, 0xdc($sp) -/* E05B5C 802407FC 8FB400D8 */ lw $s4, 0xd8($sp) -/* E05B60 80240800 8FB300D4 */ lw $s3, 0xd4($sp) -/* E05B64 80240804 8FB200D0 */ lw $s2, 0xd0($sp) -/* E05B68 80240808 8FB100CC */ lw $s1, 0xcc($sp) -/* E05B6C 8024080C 8FB000C8 */ lw $s0, 0xc8($sp) -/* E05B70 80240810 D7BC0108 */ ldc1 $f28, 0x108($sp) -/* E05B74 80240814 D7BA0100 */ ldc1 $f26, 0x100($sp) -/* E05B78 80240818 D7B800F8 */ ldc1 $f24, 0xf8($sp) -/* E05B7C 8024081C D7B600F0 */ ldc1 $f22, 0xf0($sp) -/* E05B80 80240820 D7B400E8 */ ldc1 $f20, 0xe8($sp) -/* E05B84 80240824 03E00008 */ jr $ra -/* E05B88 80240828 27BD0110 */ addiu $sp, $sp, 0x110 diff --git a/asm/nonmatchings/world/area_end/end_01/func_8024082C_E05360.s b/asm/nonmatchings/world/area_end/end_01/func_8024082C_E05360.s deleted file mode 100644 index 673e2edd83..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/func_8024082C_E05360.s +++ /dev/null @@ -1,186 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024082C_E05B8C -/* E05B8C 8024082C 27BDFEF0 */ addiu $sp, $sp, -0x110 -/* E05B90 80240830 AFB200D0 */ sw $s2, 0xd0($sp) -/* E05B94 80240834 0080902D */ daddu $s2, $a0, $zero -/* E05B98 80240838 AFB000C8 */ sw $s0, 0xc8($sp) -/* E05B9C 8024083C 00A0802D */ daddu $s0, $a1, $zero -/* E05BA0 80240840 AFBF00E0 */ sw $ra, 0xe0($sp) -/* E05BA4 80240844 AFB500DC */ sw $s5, 0xdc($sp) -/* E05BA8 80240848 AFB400D8 */ sw $s4, 0xd8($sp) -/* E05BAC 8024084C AFB300D4 */ sw $s3, 0xd4($sp) -/* E05BB0 80240850 AFB100CC */ sw $s1, 0xcc($sp) -/* E05BB4 80240854 F7BC0108 */ sdc1 $f28, 0x108($sp) -/* E05BB8 80240858 F7BA0100 */ sdc1 $f26, 0x100($sp) -/* E05BBC 8024085C F7B800F8 */ sdc1 $f24, 0xf8($sp) -/* E05BC0 80240860 F7B600F0 */ sdc1 $f22, 0xf0($sp) -/* E05BC4 80240864 F7B400E8 */ sdc1 $f20, 0xe8($sp) -/* E05BC8 80240868 C6180010 */ lwc1 $f24, 0x10($s0) -/* E05BCC 8024086C 4680C620 */ cvt.s.w $f24, $f24 -/* E05BD0 80240870 3C054200 */ lui $a1, 0x4200 -/* E05BD4 80240874 3C064396 */ lui $a2, 0x4396 -/* E05BD8 80240878 8E42001C */ lw $v0, 0x1c($s2) -/* E05BDC 8024087C C61C0014 */ lwc1 $f28, 0x14($s0) -/* E05BE0 80240880 4680E720 */ cvt.s.w $f28, $f28 -/* E05BE4 80240884 AFA20010 */ sw $v0, 0x10($sp) -/* E05BE8 80240888 8E070018 */ lw $a3, 0x18($s0) -/* E05BEC 8024088C 0C00A8ED */ jal update_lerp -/* E05BF0 80240890 2404000C */ addiu $a0, $zero, 0xc -/* E05BF4 80240894 3C01437F */ lui $at, 0x437f -/* E05BF8 80240898 44811000 */ mtc1 $at, $f2 -/* E05BFC 8024089C 00000000 */ nop -/* E05C00 802408A0 4600103C */ c.lt.s $f2, $f0 -/* E05C04 802408A4 00000000 */ nop -/* E05C08 802408A8 45000002 */ bc1f .L802408B4 -/* E05C0C 802408AC 27B10038 */ addiu $s1, $sp, 0x38 -/* E05C10 802408B0 46001006 */ mov.s $f0, $f2 -.L802408B4: -/* E05C14 802408B4 4600010D */ trunc.w.s $f4, $f0 -/* E05C18 802408B8 E7A40014 */ swc1 $f4, 0x14($sp) -/* E05C1C 802408BC 0000202D */ daddu $a0, $zero, $zero -/* E05C20 802408C0 24050007 */ addiu $a1, $zero, 7 -/* E05C24 802408C4 240600FF */ addiu $a2, $zero, 0xff -/* E05C28 802408C8 00C0382D */ daddu $a3, $a2, $zero -/* E05C2C 802408CC 00C0A82D */ daddu $s5, $a2, $zero -/* E05C30 802408D0 AFB50010 */ sw $s5, 0x10($sp) -/* E05C34 802408D4 0C04EAA7 */ jal func_8013AA9C -/* E05C38 802408D8 AFA00018 */ sw $zero, 0x18($sp) -/* E05C3C 802408DC 8E42001C */ lw $v0, 0x1c($s2) -/* E05C40 802408E0 3C05C296 */ lui $a1, 0xc296 -/* E05C44 802408E4 3C0641F0 */ lui $a2, 0x41f0 -/* E05C48 802408E8 AFA20010 */ sw $v0, 0x10($sp) -/* E05C4C 802408EC 8E070018 */ lw $a3, 0x18($s0) -/* E05C50 802408F0 0C00A8ED */ jal update_lerp -/* E05C54 802408F4 0000202D */ daddu $a0, $zero, $zero -/* E05C58 802408F8 4480B000 */ mtc1 $zero, $f22 -/* E05C5C 802408FC 46000506 */ mov.s $f20, $f0 -/* E05C60 80240900 4614B03E */ c.le.s $f22, $f20 -/* E05C64 80240904 00000000 */ nop -/* E05C68 80240908 45030001 */ bc1tl .L80240910 -/* E05C6C 8024090C 4600B506 */ mov.s $f20, $f22 -.L80240910: -/* E05C70 80240910 AFB10010 */ sw $s1, 0x10($sp) -/* E05C74 80240914 8E040004 */ lw $a0, 4($s0) -/* E05C78 80240918 8E050008 */ lw $a1, 8($s0) -/* E05C7C 8024091C 8E060000 */ lw $a2, ($s0) -/* E05C80 80240920 0C04BA38 */ jal func_8012E8E0 -/* E05C84 80240924 8E07000C */ lw $a3, 0xc($s0) -/* E05C88 80240928 93A20042 */ lbu $v0, 0x42($sp) -/* E05C8C 8024092C 3C013FE0 */ lui $at, 0x3fe0 -/* E05C90 80240930 4481D800 */ mtc1 $at, $f27 -/* E05C94 80240934 4480D000 */ mtc1 $zero, $f26 -/* E05C98 80240938 44820000 */ mtc1 $v0, $f0 -/* E05C9C 8024093C 00000000 */ nop -/* E05CA0 80240940 46800021 */ cvt.d.w $f0, $f0 -/* E05CA4 80240944 463A0002 */ mul.d $f0, $f0, $f26 -/* E05CA8 80240948 00000000 */ nop -/* E05CAC 8024094C 4600C0A1 */ cvt.d.s $f2, $f24 -/* E05CB0 80240950 27B40048 */ addiu $s4, $sp, 0x48 -/* E05CB4 80240954 4600E707 */ neg.s $f28, $f28 -/* E05CB8 80240958 46201080 */ add.d $f2, $f2, $f0 -/* E05CBC 8024095C 4406E000 */ mfc1 $a2, $f28 -/* E05CC0 80240960 4407B000 */ mfc1 $a3, $f22 -/* E05CC4 80240964 462010A0 */ cvt.s.d $f2, $f2 -/* E05CC8 80240968 44051000 */ mfc1 $a1, $f2 -/* E05CCC 8024096C 0C019E40 */ jal guTranslateF -/* E05CD0 80240970 0280202D */ daddu $a0, $s4, $zero -/* E05CD4 80240974 4616A032 */ c.eq.s $f20, $f22 -/* E05CD8 80240978 00000000 */ nop -/* E05CDC 8024097C 4501000D */ bc1t .L802409B4 -/* E05CE0 80240980 3C130001 */ lui $s3, 1 -/* E05CE4 80240984 27B00088 */ addiu $s0, $sp, 0x88 -/* E05CE8 80240988 4405A000 */ mfc1 $a1, $f20 -/* E05CEC 8024098C 4406B000 */ mfc1 $a2, $f22 -/* E05CF0 80240990 3C073F80 */ lui $a3, 0x3f80 -/* E05CF4 80240994 0200202D */ daddu $a0, $s0, $zero -/* E05CF8 80240998 0C019EC8 */ jal guRotateF -/* E05CFC 8024099C AFA60010 */ sw $a2, 0x10($sp) -/* E05D00 802409A0 0200202D */ daddu $a0, $s0, $zero -/* E05D04 802409A4 0280282D */ daddu $a1, $s4, $zero -/* E05D08 802409A8 0C019D80 */ jal guMtxCatF -/* E05D0C 802409AC 0280302D */ daddu $a2, $s4, $zero -/* E05D10 802409B0 3C130001 */ lui $s3, 1 -.L802409B4: -/* E05D14 802409B4 36731630 */ ori $s3, $s3, 0x1630 -/* E05D18 802409B8 0280202D */ daddu $a0, $s4, $zero -/* E05D1C 802409BC 3C118007 */ lui $s1, 0x8007 -/* E05D20 802409C0 263141F0 */ addiu $s1, $s1, 0x41f0 -/* E05D24 802409C4 3C12800A */ lui $s2, 0x800a -/* E05D28 802409C8 2652A674 */ addiu $s2, $s2, -0x598c -/* E05D2C 802409CC 96250000 */ lhu $a1, ($s1) -/* E05D30 802409D0 8E420000 */ lw $v0, ($s2) -/* E05D34 802409D4 00052980 */ sll $a1, $a1, 6 -/* E05D38 802409D8 00B32821 */ addu $a1, $a1, $s3 -/* E05D3C 802409DC 0C019D40 */ jal guMtxF2L -/* E05D40 802409E0 00452821 */ addu $a1, $v0, $a1 -/* E05D44 802409E4 3C03DA38 */ lui $v1, 0xda38 -/* E05D48 802409E8 34630002 */ ori $v1, $v1, 2 -/* E05D4C 802409EC 0000202D */ daddu $a0, $zero, $zero -/* E05D50 802409F0 27A50020 */ addiu $a1, $sp, 0x20 -/* E05D54 802409F4 3C060001 */ lui $a2, 1 -/* E05D58 802409F8 34C60040 */ ori $a2, $a2, 0x40 -/* E05D5C 802409FC 3C10800A */ lui $s0, 0x800a -/* E05D60 80240A00 2610A66C */ addiu $s0, $s0, -0x5994 -/* E05D64 80240A04 0280382D */ daddu $a3, $s4, $zero -/* E05D68 80240A08 8E020000 */ lw $v0, ($s0) -/* E05D6C 80240A0C 96280000 */ lhu $t0, ($s1) -/* E05D70 80240A10 0040482D */ daddu $t1, $v0, $zero -/* E05D74 80240A14 24420008 */ addiu $v0, $v0, 8 -/* E05D78 80240A18 AE020000 */ sw $v0, ($s0) -/* E05D7C 80240A1C 3102FFFF */ andi $v0, $t0, 0xffff -/* E05D80 80240A20 00021180 */ sll $v0, $v0, 6 -/* E05D84 80240A24 00531021 */ addu $v0, $v0, $s3 -/* E05D88 80240A28 AD230000 */ sw $v1, ($t1) -/* E05D8C 80240A2C 8E430000 */ lw $v1, ($s2) -/* E05D90 80240A30 25080001 */ addiu $t0, $t0, 1 -/* E05D94 80240A34 00621821 */ addu $v1, $v1, $v0 -/* E05D98 80240A38 3C028000 */ lui $v0, 0x8000 -/* E05D9C 80240A3C 00621821 */ addu $v1, $v1, $v0 -/* E05DA0 80240A40 AD230004 */ sw $v1, 4($t1) -/* E05DA4 80240A44 93A20042 */ lbu $v0, 0x42($sp) -/* E05DA8 80240A48 8FA3003C */ lw $v1, 0x3c($sp) -/* E05DAC 80240A4C 93A90040 */ lbu $t1, 0x40($sp) -/* E05DB0 80240A50 93AA0041 */ lbu $t2, 0x41($sp) -/* E05DB4 80240A54 44820000 */ mtc1 $v0, $f0 -/* E05DB8 80240A58 00000000 */ nop -/* E05DBC 80240A5C 46800021 */ cvt.d.w $f0, $f0 -/* E05DC0 80240A60 8FA20038 */ lw $v0, 0x38($sp) -/* E05DC4 80240A64 463A0002 */ mul.d $f0, $f0, $f26 -/* E05DC8 80240A68 00000000 */ nop -/* E05DCC 80240A6C A6280000 */ sh $t0, ($s1) -/* E05DD0 80240A70 A7A0002E */ sh $zero, 0x2e($sp) -/* E05DD4 80240A74 A3B50030 */ sb $s5, 0x30($sp) -/* E05DD8 80240A78 AFA30024 */ sw $v1, 0x24($sp) -/* E05DDC 80240A7C A7A90028 */ sh $t1, 0x28($sp) -/* E05DE0 80240A80 A7AA002A */ sh $t2, 0x2a($sp) -/* E05DE4 80240A84 AFA20020 */ sw $v0, 0x20($sp) -/* E05DE8 80240A88 46200007 */ neg.d $f0, $f0 -/* E05DEC 80240A8C 4620010D */ trunc.w.d $f4, $f0 -/* E05DF0 80240A90 44022000 */ mfc1 $v0, $f4 -/* E05DF4 80240A94 0C04EBDC */ jal func_8013AF70 -/* E05DF8 80240A98 A7A2002C */ sh $v0, 0x2c($sp) -/* E05DFC 80240A9C 3C04D838 */ lui $a0, 0xd838 -/* E05E00 80240AA0 8E020000 */ lw $v0, ($s0) -/* E05E04 80240AA4 34840002 */ ori $a0, $a0, 2 -/* E05E08 80240AA8 0040182D */ daddu $v1, $v0, $zero -/* E05E0C 80240AAC 24420008 */ addiu $v0, $v0, 8 -/* E05E10 80240AB0 AE020000 */ sw $v0, ($s0) -/* E05E14 80240AB4 24020040 */ addiu $v0, $zero, 0x40 -/* E05E18 80240AB8 AC640000 */ sw $a0, ($v1) -/* E05E1C 80240ABC AC620004 */ sw $v0, 4($v1) -/* E05E20 80240AC0 8FBF00E0 */ lw $ra, 0xe0($sp) -/* E05E24 80240AC4 8FB500DC */ lw $s5, 0xdc($sp) -/* E05E28 80240AC8 8FB400D8 */ lw $s4, 0xd8($sp) -/* E05E2C 80240ACC 8FB300D4 */ lw $s3, 0xd4($sp) -/* E05E30 80240AD0 8FB200D0 */ lw $s2, 0xd0($sp) -/* E05E34 80240AD4 8FB100CC */ lw $s1, 0xcc($sp) -/* E05E38 80240AD8 8FB000C8 */ lw $s0, 0xc8($sp) -/* E05E3C 80240ADC D7BC0108 */ ldc1 $f28, 0x108($sp) -/* E05E40 80240AE0 D7BA0100 */ ldc1 $f26, 0x100($sp) -/* E05E44 80240AE4 D7B800F8 */ ldc1 $f24, 0xf8($sp) -/* E05E48 80240AE8 D7B600F0 */ ldc1 $f22, 0xf0($sp) -/* E05E4C 80240AEC D7B400E8 */ ldc1 $f20, 0xe8($sp) -/* E05E50 80240AF0 03E00008 */ jr $ra -/* E05E54 80240AF4 27BD0110 */ addiu $sp, $sp, 0x110 diff --git a/asm/nonmatchings/world/area_end/end_01/func_80240AF8_E05360.s b/asm/nonmatchings/world/area_end/end_01/func_80240AF8_E05360.s deleted file mode 100644 index 9f9998e63a..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/func_80240AF8_E05360.s +++ /dev/null @@ -1,251 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AF8_E05E58 -/* E05E58 80240AF8 27BDFEF0 */ addiu $sp, $sp, -0x110 -/* E05E5C 80240AFC AFB000C8 */ sw $s0, 0xc8($sp) -/* E05E60 80240B00 0080802D */ daddu $s0, $a0, $zero -/* E05E64 80240B04 AFB100CC */ sw $s1, 0xcc($sp) -/* E05E68 80240B08 00A0882D */ daddu $s1, $a1, $zero -/* E05E6C 80240B0C AFB600E0 */ sw $s6, 0xe0($sp) -/* E05E70 80240B10 24160040 */ addiu $s6, $zero, 0x40 -/* E05E74 80240B14 AFBF00E4 */ sw $ra, 0xe4($sp) -/* E05E78 80240B18 AFB500DC */ sw $s5, 0xdc($sp) -/* E05E7C 80240B1C AFB400D8 */ sw $s4, 0xd8($sp) -/* E05E80 80240B20 AFB300D4 */ sw $s3, 0xd4($sp) -/* E05E84 80240B24 AFB200D0 */ sw $s2, 0xd0($sp) -/* E05E88 80240B28 F7BC0108 */ sdc1 $f28, 0x108($sp) -/* E05E8C 80240B2C F7BA0100 */ sdc1 $f26, 0x100($sp) -/* E05E90 80240B30 F7B800F8 */ sdc1 $f24, 0xf8($sp) -/* E05E94 80240B34 F7B600F0 */ sdc1 $f22, 0xf0($sp) -/* E05E98 80240B38 F7B400E8 */ sdc1 $f20, 0xe8($sp) -/* E05E9C 80240B3C C6200010 */ lwc1 $f0, 0x10($s1) -/* E05EA0 80240B40 46800020 */ cvt.s.w $f0, $f0 -/* E05EA4 80240B44 8E020068 */ lw $v0, 0x68($s0) -/* E05EA8 80240B48 8E030014 */ lw $v1, 0x14($s0) -/* E05EAC 80240B4C 44060000 */ mfc1 $a2, $f0 -/* E05EB0 80240B50 8E07001C */ lw $a3, 0x1c($s0) -/* E05EB4 80240B54 00431021 */ addu $v0, $v0, $v1 -/* E05EB8 80240B58 2442FFF0 */ addiu $v0, $v0, -0x10 -/* E05EBC 80240B5C 44822000 */ mtc1 $v0, $f4 -/* E05EC0 80240B60 00000000 */ nop -/* E05EC4 80240B64 46802120 */ cvt.s.w $f4, $f4 -/* E05EC8 80240B68 8E03006C */ lw $v1, 0x6c($s0) -/* E05ECC 80240B6C 44052000 */ mfc1 $a1, $f4 -/* E05ED0 80240B70 AFA70010 */ sw $a3, 0x10($sp) -/* E05ED4 80240B74 8E270018 */ lw $a3, 0x18($s1) -/* E05ED8 80240B78 2463003C */ addiu $v1, $v1, 0x3c -/* E05EDC 80240B7C 4483A000 */ mtc1 $v1, $f20 -/* E05EE0 80240B80 00000000 */ nop -/* E05EE4 80240B84 4680A520 */ cvt.s.w $f20, $f20 -/* E05EE8 80240B88 0C00A8ED */ jal update_lerp -/* E05EEC 80240B8C 2404000A */ addiu $a0, $zero, 0xa -/* E05EF0 80240B90 C6220014 */ lwc1 $f2, 0x14($s1) -/* E05EF4 80240B94 468010A0 */ cvt.s.w $f2, $f2 -/* E05EF8 80240B98 4405A000 */ mfc1 $a1, $f20 -/* E05EFC 80240B9C 44061000 */ mfc1 $a2, $f2 -/* E05F00 80240BA0 8E02001C */ lw $v0, 0x1c($s0) -/* E05F04 80240BA4 24040005 */ addiu $a0, $zero, 5 -/* E05F08 80240BA8 AFA20010 */ sw $v0, 0x10($sp) -/* E05F0C 80240BAC 8E270018 */ lw $a3, 0x18($s1) -/* E05F10 80240BB0 0C00A8ED */ jal update_lerp -/* E05F14 80240BB4 46000506 */ mov.s $f20, $f0 -/* E05F18 80240BB8 27B50038 */ addiu $s5, $sp, 0x38 -/* E05F1C 80240BBC 8E220018 */ lw $v0, 0x18($s1) -/* E05F20 80240BC0 8E03001C */ lw $v1, 0x1c($s0) -/* E05F24 80240BC4 14430004 */ bne $v0, $v1, .L80240BD8 -/* E05F28 80240BC8 46000706 */ mov.s $f28, $f0 -/* E05F2C 80240BCC 4480B000 */ mtc1 $zero, $f22 -/* E05F30 80240BD0 080902FD */ j .L80240BF4 -/* E05F34 80240BD4 00000000 */ nop -.L80240BD8: -/* E05F38 80240BD8 00621823 */ subu $v1, $v1, $v0 -/* E05F3C 80240BDC 00031080 */ sll $v0, $v1, 2 -/* E05F40 80240BE0 00431021 */ addu $v0, $v0, $v1 -/* E05F44 80240BE4 00021040 */ sll $v0, $v0, 1 -/* E05F48 80240BE8 4482B000 */ mtc1 $v0, $f22 -/* E05F4C 80240BEC 00000000 */ nop -/* E05F50 80240BF0 4680B5A0 */ cvt.s.w $f22, $f22 -.L80240BF4: -/* E05F54 80240BF4 8E02001C */ lw $v0, 0x1c($s0) -/* E05F58 80240BF8 3C054000 */ lui $a1, 0x4000 -/* E05F5C 80240BFC 3C063F80 */ lui $a2, 0x3f80 -/* E05F60 80240C00 AFA20010 */ sw $v0, 0x10($sp) -/* E05F64 80240C04 8E270018 */ lw $a3, 0x18($s1) -/* E05F68 80240C08 0C00A8ED */ jal update_lerp -/* E05F6C 80240C0C 24040004 */ addiu $a0, $zero, 4 -/* E05F70 80240C10 8E220018 */ lw $v0, 0x18($s1) -/* E05F74 80240C14 8E04001C */ lw $a0, 0x1c($s0) -/* E05F78 80240C18 1444000C */ bne $v0, $a0, .L80240C4C -/* E05F7C 80240C1C 46000686 */ mov.s $f26, $f0 -/* E05F80 80240C20 0000202D */ daddu $a0, $zero, $zero -/* E05F84 80240C24 0080282D */ daddu $a1, $a0, $zero -/* E05F88 80240C28 0080302D */ daddu $a2, $a0, $zero -/* E05F8C 80240C2C 0080382D */ daddu $a3, $a0, $zero -/* E05F90 80240C30 AFA00010 */ sw $zero, 0x10($sp) -/* E05F94 80240C34 AFA00014 */ sw $zero, 0x14($sp) -/* E05F98 80240C38 0C04EAA7 */ jal func_8013AA9C -/* E05F9C 80240C3C AFA00018 */ sw $zero, 0x18($sp) -/* E05FA0 80240C40 3C020001 */ lui $v0, 1 -/* E05FA4 80240C44 0809032A */ j .L80240CA8 -/* E05FA8 80240C48 02C2B025 */ or $s6, $s6, $v0 -.L80240C4C: -/* E05FAC 80240C4C 3C054180 */ lui $a1, 0x4180 -/* E05FB0 80240C50 3C064396 */ lui $a2, 0x4396 -/* E05FB4 80240C54 AFA40010 */ sw $a0, 0x10($sp) -/* E05FB8 80240C58 8E270018 */ lw $a3, 0x18($s1) -/* E05FBC 80240C5C 0C00A8ED */ jal update_lerp -/* E05FC0 80240C60 0000202D */ daddu $a0, $zero, $zero -/* E05FC4 80240C64 3C01437F */ lui $at, 0x437f -/* E05FC8 80240C68 44811000 */ mtc1 $at, $f2 -/* E05FCC 80240C6C 00000000 */ nop -/* E05FD0 80240C70 4600103C */ c.lt.s $f2, $f0 -/* E05FD4 80240C74 00000000 */ nop -/* E05FD8 80240C78 45030001 */ bc1tl .L80240C80 -/* E05FDC 80240C7C 46001006 */ mov.s $f0, $f2 -.L80240C80: -/* E05FE0 80240C80 4600010D */ trunc.w.s $f4, $f0 -/* E05FE4 80240C84 E7A40014 */ swc1 $f4, 0x14($sp) -/* E05FE8 80240C88 0000202D */ daddu $a0, $zero, $zero -/* E05FEC 80240C8C 24050007 */ addiu $a1, $zero, 7 -/* E05FF0 80240C90 240600FF */ addiu $a2, $zero, 0xff -/* E05FF4 80240C94 00C0382D */ daddu $a3, $a2, $zero -/* E05FF8 80240C98 00C0102D */ daddu $v0, $a2, $zero -/* E05FFC 80240C9C AFA20010 */ sw $v0, 0x10($sp) -/* E06000 80240CA0 0C04EAA7 */ jal func_8013AA9C -/* E06004 80240CA4 AFA00018 */ sw $zero, 0x18($sp) -.L80240CA8: -/* E06008 80240CA8 AFB50010 */ sw $s5, 0x10($sp) -/* E0600C 80240CAC 8E240004 */ lw $a0, 4($s1) -/* E06010 80240CB0 8E250008 */ lw $a1, 8($s1) -/* E06014 80240CB4 8E260000 */ lw $a2, ($s1) -/* E06018 80240CB8 8E27000C */ lw $a3, 0xc($s1) -/* E0601C 80240CBC 0C04BA38 */ jal func_8012E8E0 -/* E06020 80240CC0 3C140001 */ lui $s4, 1 -/* E06024 80240CC4 92A2000A */ lbu $v0, 0xa($s5) -/* E06028 80240CC8 3C013FE0 */ lui $at, 0x3fe0 -/* E0602C 80240CCC 4481C800 */ mtc1 $at, $f25 -/* E06030 80240CD0 4480C000 */ mtc1 $zero, $f24 -/* E06034 80240CD4 44820000 */ mtc1 $v0, $f0 -/* E06038 80240CD8 00000000 */ nop -/* E0603C 80240CDC 46800021 */ cvt.d.w $f0, $f0 -/* E06040 80240CE0 46380002 */ mul.d $f0, $f0, $f24 -/* E06044 80240CE4 00000000 */ nop -/* E06048 80240CE8 36941630 */ ori $s4, $s4, 0x1630 -/* E0604C 80240CEC 4600A0A1 */ cvt.d.s $f2, $f20 -/* E06050 80240CF0 27B10048 */ addiu $s1, $sp, 0x48 -/* E06054 80240CF4 4600E707 */ neg.s $f28, $f28 -/* E06058 80240CF8 4480A000 */ mtc1 $zero, $f20 -/* E0605C 80240CFC 46201080 */ add.d $f2, $f2, $f0 -/* E06060 80240D00 4406E000 */ mfc1 $a2, $f28 -/* E06064 80240D04 4407A000 */ mfc1 $a3, $f20 -/* E06068 80240D08 462010A0 */ cvt.s.d $f2, $f2 -/* E0606C 80240D0C 44051000 */ mfc1 $a1, $f2 -/* E06070 80240D10 0C019E40 */ jal guTranslateF -/* E06074 80240D14 0220202D */ daddu $a0, $s1, $zero -/* E06078 80240D18 27B00088 */ addiu $s0, $sp, 0x88 -/* E0607C 80240D1C 4405B000 */ mfc1 $a1, $f22 -/* E06080 80240D20 3C013F80 */ lui $at, 0x3f80 -/* E06084 80240D24 4481B000 */ mtc1 $at, $f22 -/* E06088 80240D28 4406A000 */ mfc1 $a2, $f20 -/* E0608C 80240D2C 3C013E4C */ lui $at, 0x3e4c -/* E06090 80240D30 3421CCCD */ ori $at, $at, 0xcccd -/* E06094 80240D34 44810000 */ mtc1 $at, $f0 -/* E06098 80240D38 4407B000 */ mfc1 $a3, $f22 -/* E0609C 80240D3C 0200202D */ daddu $a0, $s0, $zero -/* E060A0 80240D40 0C019EC8 */ jal guRotateF -/* E060A4 80240D44 E7A00010 */ swc1 $f0, 0x10($sp) -/* E060A8 80240D48 0200202D */ daddu $a0, $s0, $zero -/* E060AC 80240D4C 0220282D */ daddu $a1, $s1, $zero -/* E060B0 80240D50 0C019D80 */ jal guMtxCatF -/* E060B4 80240D54 0220302D */ daddu $a2, $s1, $zero -/* E060B8 80240D58 0200202D */ daddu $a0, $s0, $zero -/* E060BC 80240D5C 4405D000 */ mfc1 $a1, $f26 -/* E060C0 80240D60 4407B000 */ mfc1 $a3, $f22 -/* E060C4 80240D64 0C019DF0 */ jal guScaleF -/* E060C8 80240D68 00A0302D */ daddu $a2, $a1, $zero -/* E060CC 80240D6C 0200202D */ daddu $a0, $s0, $zero -/* E060D0 80240D70 0220282D */ daddu $a1, $s1, $zero -/* E060D4 80240D74 0C019D80 */ jal guMtxCatF -/* E060D8 80240D78 0220302D */ daddu $a2, $s1, $zero -/* E060DC 80240D7C 0220202D */ daddu $a0, $s1, $zero -/* E060E0 80240D80 3C108007 */ lui $s0, 0x8007 -/* E060E4 80240D84 261041F0 */ addiu $s0, $s0, 0x41f0 -/* E060E8 80240D88 3C13800A */ lui $s3, 0x800a -/* E060EC 80240D8C 2673A674 */ addiu $s3, $s3, -0x598c -/* E060F0 80240D90 96050000 */ lhu $a1, ($s0) -/* E060F4 80240D94 8E620000 */ lw $v0, ($s3) -/* E060F8 80240D98 00052980 */ sll $a1, $a1, 6 -/* E060FC 80240D9C 00B42821 */ addu $a1, $a1, $s4 -/* E06100 80240DA0 0C019D40 */ jal guMtxF2L -/* E06104 80240DA4 00452821 */ addu $a1, $v0, $a1 -/* E06108 80240DA8 3C02DA38 */ lui $v0, 0xda38 -/* E0610C 80240DAC 34420002 */ ori $v0, $v0, 2 -/* E06110 80240DB0 3C12800A */ lui $s2, 0x800a -/* E06114 80240DB4 2652A66C */ addiu $s2, $s2, -0x5994 -/* E06118 80240DB8 8E440000 */ lw $a0, ($s2) -/* E0611C 80240DBC 96050000 */ lhu $a1, ($s0) -/* E06120 80240DC0 0080302D */ daddu $a2, $a0, $zero -/* E06124 80240DC4 ACC20000 */ sw $v0, ($a2) -/* E06128 80240DC8 30A2FFFF */ andi $v0, $a1, 0xffff -/* E0612C 80240DCC 00021180 */ sll $v0, $v0, 6 -/* E06130 80240DD0 8E630000 */ lw $v1, ($s3) -/* E06134 80240DD4 00541021 */ addu $v0, $v0, $s4 -/* E06138 80240DD8 00621821 */ addu $v1, $v1, $v0 -/* E0613C 80240DDC 3C028000 */ lui $v0, 0x8000 -/* E06140 80240DE0 00621821 */ addu $v1, $v1, $v0 -/* E06144 80240DE4 ACC30004 */ sw $v1, 4($a2) -/* E06148 80240DE8 8EA20000 */ lw $v0, ($s5) -/* E0614C 80240DEC 24840008 */ addiu $a0, $a0, 8 -/* E06150 80240DF0 AE440000 */ sw $a0, ($s2) -/* E06154 80240DF4 AFA20020 */ sw $v0, 0x20($sp) -/* E06158 80240DF8 8EA20004 */ lw $v0, 4($s5) -/* E0615C 80240DFC 24A50001 */ addiu $a1, $a1, 1 -/* E06160 80240E00 A6050000 */ sh $a1, ($s0) -/* E06164 80240E04 AFA20024 */ sw $v0, 0x24($sp) -/* E06168 80240E08 92A20008 */ lbu $v0, 8($s5) -/* E0616C 80240E0C A7A20028 */ sh $v0, 0x28($sp) -/* E06170 80240E10 92A20009 */ lbu $v0, 9($s5) -/* E06174 80240E14 A7A2002A */ sh $v0, 0x2a($sp) -/* E06178 80240E18 92A2000A */ lbu $v0, 0xa($s5) -/* E0617C 80240E1C 44820000 */ mtc1 $v0, $f0 -/* E06180 80240E20 00000000 */ nop -/* E06184 80240E24 46800021 */ cvt.d.w $f0, $f0 -/* E06188 80240E28 46380002 */ mul.d $f0, $f0, $f24 -/* E0618C 80240E2C 00000000 */ nop -/* E06190 80240E30 0220382D */ daddu $a3, $s1, $zero -/* E06194 80240E34 0000202D */ daddu $a0, $zero, $zero -/* E06198 80240E38 02C0302D */ daddu $a2, $s6, $zero -/* E0619C 80240E3C 27A50020 */ addiu $a1, $sp, 0x20 -/* E061A0 80240E40 A7A0002E */ sh $zero, 0x2e($sp) -/* E061A4 80240E44 240200FF */ addiu $v0, $zero, 0xff -/* E061A8 80240E48 A3A20030 */ sb $v0, 0x30($sp) -/* E061AC 80240E4C 46200007 */ neg.d $f0, $f0 -/* E061B0 80240E50 4620010D */ trunc.w.d $f4, $f0 -/* E061B4 80240E54 44022000 */ mfc1 $v0, $f4 -/* E061B8 80240E58 0C04EBDC */ jal func_8013AF70 -/* E061BC 80240E5C A7A2002C */ sh $v0, 0x2c($sp) -/* E061C0 80240E60 3C04D838 */ lui $a0, 0xd838 -/* E061C4 80240E64 8E420000 */ lw $v0, ($s2) -/* E061C8 80240E68 34840002 */ ori $a0, $a0, 2 -/* E061CC 80240E6C 0040182D */ daddu $v1, $v0, $zero -/* E061D0 80240E70 24420008 */ addiu $v0, $v0, 8 -/* E061D4 80240E74 AE420000 */ sw $v0, ($s2) -/* E061D8 80240E78 24020040 */ addiu $v0, $zero, 0x40 -/* E061DC 80240E7C AC640000 */ sw $a0, ($v1) -/* E061E0 80240E80 AC620004 */ sw $v0, 4($v1) -/* E061E4 80240E84 8FBF00E4 */ lw $ra, 0xe4($sp) -/* E061E8 80240E88 8FB600E0 */ lw $s6, 0xe0($sp) -/* E061EC 80240E8C 8FB500DC */ lw $s5, 0xdc($sp) -/* E061F0 80240E90 8FB400D8 */ lw $s4, 0xd8($sp) -/* E061F4 80240E94 8FB300D4 */ lw $s3, 0xd4($sp) -/* E061F8 80240E98 8FB200D0 */ lw $s2, 0xd0($sp) -/* E061FC 80240E9C 8FB100CC */ lw $s1, 0xcc($sp) -/* E06200 80240EA0 8FB000C8 */ lw $s0, 0xc8($sp) -/* E06204 80240EA4 D7BC0108 */ ldc1 $f28, 0x108($sp) -/* E06208 80240EA8 D7BA0100 */ ldc1 $f26, 0x100($sp) -/* E0620C 80240EAC D7B800F8 */ ldc1 $f24, 0xf8($sp) -/* E06210 80240EB0 D7B600F0 */ ldc1 $f22, 0xf0($sp) -/* E06214 80240EB4 D7B400E8 */ ldc1 $f20, 0xe8($sp) -/* E06218 80240EB8 03E00008 */ jr $ra -/* E0621C 80240EBC 27BD0110 */ addiu $sp, $sp, 0x110 diff --git a/asm/nonmatchings/world/area_end/end_01/func_80240EC0_E05360.s b/asm/nonmatchings/world/area_end/end_01/func_80240EC0_E05360.s deleted file mode 100644 index 5bf94d13a0..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/func_80240EC0_E05360.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EC0_E06220 -/* E06220 80240EC0 27BDFF90 */ addiu $sp, $sp, -0x70 -/* E06224 80240EC4 AFB00048 */ sw $s0, 0x48($sp) -/* E06228 80240EC8 00A0802D */ daddu $s0, $a1, $zero -/* E0622C 80240ECC AFBF0050 */ sw $ra, 0x50($sp) -/* E06230 80240ED0 AFB1004C */ sw $s1, 0x4c($sp) -/* E06234 80240ED4 F7B80068 */ sdc1 $f24, 0x68($sp) -/* E06238 80240ED8 F7B60060 */ sdc1 $f22, 0x60($sp) -/* E0623C 80240EDC F7B40058 */ sdc1 $f20, 0x58($sp) -/* E06240 80240EE0 8C82001C */ lw $v0, 0x1c($a0) -/* E06244 80240EE4 0000202D */ daddu $a0, $zero, $zero -/* E06248 80240EE8 0000282D */ daddu $a1, $zero, $zero -/* E0624C 80240EEC C6140010 */ lwc1 $f20, 0x10($s0) -/* E06250 80240EF0 4680A520 */ cvt.s.w $f20, $f20 -/* E06254 80240EF4 3C06437F */ lui $a2, 0x437f -/* E06258 80240EF8 C6160014 */ lwc1 $f22, 0x14($s0) -/* E0625C 80240EFC 4680B5A0 */ cvt.s.w $f22, $f22 -/* E06260 80240F00 AFA20010 */ sw $v0, 0x10($sp) -/* E06264 80240F04 8E070018 */ lw $a3, 0x18($s0) -/* E06268 80240F08 0C00A8ED */ jal update_lerp -/* E0626C 80240F0C 27B10038 */ addiu $s1, $sp, 0x38 -/* E06270 80240F10 AFB10010 */ sw $s1, 0x10($sp) -/* E06274 80240F14 8E040004 */ lw $a0, 4($s0) -/* E06278 80240F18 8E050008 */ lw $a1, 8($s0) -/* E0627C 80240F1C 8E060000 */ lw $a2, ($s0) -/* E06280 80240F20 8E07000C */ lw $a3, 0xc($s0) -/* E06284 80240F24 0C04BA38 */ jal func_8012E8E0 -/* E06288 80240F28 46000606 */ mov.s $f24, $f0 -/* E0628C 80240F2C 4600A08D */ trunc.w.s $f2, $f20 -/* E06290 80240F30 44021000 */ mfc1 $v0, $f2 -/* E06294 80240F34 93A50040 */ lbu $a1, 0x40($sp) -/* E06298 80240F38 93A60041 */ lbu $a2, 0x41($sp) -/* E0629C 80240F3C 00021400 */ sll $v0, $v0, 0x10 -/* E062A0 80240F40 AFA00010 */ sw $zero, 0x10($sp) -/* E062A4 80240F44 8FA3003C */ lw $v1, 0x3c($sp) -/* E062A8 80240F48 00021403 */ sra $v0, $v0, 0x10 -/* E062AC 80240F4C AFA20018 */ sw $v0, 0x18($sp) -/* E062B0 80240F50 4600B08D */ trunc.w.s $f2, $f22 -/* E062B4 80240F54 44021000 */ mfc1 $v0, $f2 -/* E062B8 80240F58 00000000 */ nop -/* E062BC 80240F5C 00021400 */ sll $v0, $v0, 0x10 -/* E062C0 80240F60 3C014F00 */ lui $at, 0x4f00 -/* E062C4 80240F64 44810000 */ mtc1 $at, $f0 -/* E062C8 80240F68 00021403 */ sra $v0, $v0, 0x10 -/* E062CC 80240F6C AFA2001C */ sw $v0, 0x1c($sp) -/* E062D0 80240F70 2402000A */ addiu $v0, $zero, 0xa -/* E062D4 80240F74 AFA20020 */ sw $v0, 0x20($sp) -/* E062D8 80240F78 24020014 */ addiu $v0, $zero, 0x14 -/* E062DC 80240F7C AFA20024 */ sw $v0, 0x24($sp) -/* E062E0 80240F80 2402012C */ addiu $v0, $zero, 0x12c -/* E062E4 80240F84 AFA20028 */ sw $v0, 0x28($sp) -/* E062E8 80240F88 240200C8 */ addiu $v0, $zero, 0xc8 -/* E062EC 80240F8C AFA2002C */ sw $v0, 0x2c($sp) -/* E062F0 80240F90 4618003E */ c.le.s $f0, $f24 -/* E062F4 80240F94 00000000 */ nop -/* E062F8 80240F98 45010005 */ bc1t .L80240FB0 -/* E062FC 80240F9C AFA30014 */ sw $v1, 0x14($sp) -/* E06300 80240FA0 4600C08D */ trunc.w.s $f2, $f24 -/* E06304 80240FA4 44031000 */ mfc1 $v1, $f2 -/* E06308 80240FA8 080903F3 */ j .L80240FCC -/* E0630C 80240FAC 306200FF */ andi $v0, $v1, 0xff -.L80240FB0: -/* E06310 80240FB0 4600C001 */ sub.s $f0, $f24, $f0 -/* E06314 80240FB4 3C028000 */ lui $v0, 0x8000 -/* E06318 80240FB8 4600008D */ trunc.w.s $f2, $f0 -/* E0631C 80240FBC 44031000 */ mfc1 $v1, $f2 -/* E06320 80240FC0 00000000 */ nop -/* E06324 80240FC4 00621825 */ or $v1, $v1, $v0 -/* E06328 80240FC8 306200FF */ andi $v0, $v1, 0xff -.L80240FCC: -/* E0632C 80240FCC AFA20030 */ sw $v0, 0x30($sp) -/* E06330 80240FD0 8E240000 */ lw $a0, ($s1) -/* E06334 80240FD4 0C04BA68 */ jal func_8012E9A0 -/* E06338 80240FD8 24070002 */ addiu $a3, $zero, 2 -/* E0633C 80240FDC 8FBF0050 */ lw $ra, 0x50($sp) -/* E06340 80240FE0 8FB1004C */ lw $s1, 0x4c($sp) -/* E06344 80240FE4 8FB00048 */ lw $s0, 0x48($sp) -/* E06348 80240FE8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* E0634C 80240FEC D7B60060 */ ldc1 $f22, 0x60($sp) -/* E06350 80240FF0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* E06354 80240FF4 03E00008 */ jr $ra -/* E06358 80240FF8 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_end/end_01/func_80241A08_E05360.s b/asm/nonmatchings/world/area_end/end_01/func_80241A08_E05360.s deleted file mode 100644 index 95843426e9..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/func_80241A08_E05360.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A08_E06D68 -/* E06D68 80241A08 27BDFF90 */ addiu $sp, $sp, -0x70 -/* E06D6C 80241A0C AFB00048 */ sw $s0, 0x48($sp) -/* E06D70 80241A10 00A0802D */ daddu $s0, $a1, $zero -/* E06D74 80241A14 AFBF0050 */ sw $ra, 0x50($sp) -/* E06D78 80241A18 AFB1004C */ sw $s1, 0x4c($sp) -/* E06D7C 80241A1C F7B80068 */ sdc1 $f24, 0x68($sp) -/* E06D80 80241A20 F7B60060 */ sdc1 $f22, 0x60($sp) -/* E06D84 80241A24 F7B40058 */ sdc1 $f20, 0x58($sp) -/* E06D88 80241A28 8C820050 */ lw $v0, 0x50($a0) -/* E06D8C 80241A2C 2404000B */ addiu $a0, $zero, 0xb -/* E06D90 80241A30 0000302D */ daddu $a2, $zero, $zero -/* E06D94 80241A34 C6140010 */ lwc1 $f20, 0x10($s0) -/* E06D98 80241A38 4680A520 */ cvt.s.w $f20, $f20 -/* E06D9C 80241A3C 3C05437F */ lui $a1, 0x437f -/* E06DA0 80241A40 C6160014 */ lwc1 $f22, 0x14($s0) -/* E06DA4 80241A44 4680B5A0 */ cvt.s.w $f22, $f22 -/* E06DA8 80241A48 AFA20010 */ sw $v0, 0x10($sp) -/* E06DAC 80241A4C 8E070018 */ lw $a3, 0x18($s0) -/* E06DB0 80241A50 0C00A8ED */ jal update_lerp -/* E06DB4 80241A54 27B10038 */ addiu $s1, $sp, 0x38 -/* E06DB8 80241A58 AFB10010 */ sw $s1, 0x10($sp) -/* E06DBC 80241A5C 8E040004 */ lw $a0, 4($s0) -/* E06DC0 80241A60 8E050008 */ lw $a1, 8($s0) -/* E06DC4 80241A64 8E060000 */ lw $a2, ($s0) -/* E06DC8 80241A68 8E07000C */ lw $a3, 0xc($s0) -/* E06DCC 80241A6C 0C04BA38 */ jal func_8012E8E0 -/* E06DD0 80241A70 46000606 */ mov.s $f24, $f0 -/* E06DD4 80241A74 4600A08D */ trunc.w.s $f2, $f20 -/* E06DD8 80241A78 44021000 */ mfc1 $v0, $f2 -/* E06DDC 80241A7C 93A50040 */ lbu $a1, 0x40($sp) -/* E06DE0 80241A80 93A60041 */ lbu $a2, 0x41($sp) -/* E06DE4 80241A84 00021400 */ sll $v0, $v0, 0x10 -/* E06DE8 80241A88 AFA00010 */ sw $zero, 0x10($sp) -/* E06DEC 80241A8C 8FA3003C */ lw $v1, 0x3c($sp) -/* E06DF0 80241A90 00021403 */ sra $v0, $v0, 0x10 -/* E06DF4 80241A94 AFA20018 */ sw $v0, 0x18($sp) -/* E06DF8 80241A98 4600B08D */ trunc.w.s $f2, $f22 -/* E06DFC 80241A9C 44021000 */ mfc1 $v0, $f2 -/* E06E00 80241AA0 00000000 */ nop -/* E06E04 80241AA4 00021400 */ sll $v0, $v0, 0x10 -/* E06E08 80241AA8 3C014F00 */ lui $at, 0x4f00 -/* E06E0C 80241AAC 44810000 */ mtc1 $at, $f0 -/* E06E10 80241AB0 00021403 */ sra $v0, $v0, 0x10 -/* E06E14 80241AB4 AFA2001C */ sw $v0, 0x1c($sp) -/* E06E18 80241AB8 2402000A */ addiu $v0, $zero, 0xa -/* E06E1C 80241ABC AFA20020 */ sw $v0, 0x20($sp) -/* E06E20 80241AC0 24020014 */ addiu $v0, $zero, 0x14 -/* E06E24 80241AC4 AFA20024 */ sw $v0, 0x24($sp) -/* E06E28 80241AC8 2402012C */ addiu $v0, $zero, 0x12c -/* E06E2C 80241ACC AFA20028 */ sw $v0, 0x28($sp) -/* E06E30 80241AD0 240200C8 */ addiu $v0, $zero, 0xc8 -/* E06E34 80241AD4 AFA2002C */ sw $v0, 0x2c($sp) -/* E06E38 80241AD8 4618003E */ c.le.s $f0, $f24 -/* E06E3C 80241ADC 00000000 */ nop -/* E06E40 80241AE0 45010005 */ bc1t .L80241AF8 -/* E06E44 80241AE4 AFA30014 */ sw $v1, 0x14($sp) -/* E06E48 80241AE8 4600C08D */ trunc.w.s $f2, $f24 -/* E06E4C 80241AEC 44031000 */ mfc1 $v1, $f2 -/* E06E50 80241AF0 080906C5 */ j .L80241B14 -/* E06E54 80241AF4 306200FF */ andi $v0, $v1, 0xff -.L80241AF8: -/* E06E58 80241AF8 4600C001 */ sub.s $f0, $f24, $f0 -/* E06E5C 80241AFC 3C028000 */ lui $v0, 0x8000 -/* E06E60 80241B00 4600008D */ trunc.w.s $f2, $f0 -/* E06E64 80241B04 44031000 */ mfc1 $v1, $f2 -/* E06E68 80241B08 00000000 */ nop -/* E06E6C 80241B0C 00621825 */ or $v1, $v1, $v0 -/* E06E70 80241B10 306200FF */ andi $v0, $v1, 0xff -.L80241B14: -/* E06E74 80241B14 AFA20030 */ sw $v0, 0x30($sp) -/* E06E78 80241B18 8E240000 */ lw $a0, ($s1) -/* E06E7C 80241B1C 0C04BA68 */ jal func_8012E9A0 -/* E06E80 80241B20 24070002 */ addiu $a3, $zero, 2 -/* E06E84 80241B24 8FBF0050 */ lw $ra, 0x50($sp) -/* E06E88 80241B28 8FB1004C */ lw $s1, 0x4c($sp) -/* E06E8C 80241B2C 8FB00048 */ lw $s0, 0x48($sp) -/* E06E90 80241B30 D7B80068 */ ldc1 $f24, 0x68($sp) -/* E06E94 80241B34 D7B60060 */ ldc1 $f22, 0x60($sp) -/* E06E98 80241B38 D7B40058 */ ldc1 $f20, 0x58($sp) -/* E06E9C 80241B3C 03E00008 */ jr $ra -/* E06EA0 80241B40 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_end/end_01/func_802421E8_E05360.s b/asm/nonmatchings/world/area_end/end_01/func_802421E8_E05360.s deleted file mode 100644 index 97f78cca0e..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/func_802421E8_E05360.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421E8_E07548 -/* E07548 802421E8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* E0754C 802421EC 3C05DC08 */ lui $a1, 0xdc08 -/* E07550 802421F0 34A50008 */ ori $a1, $a1, 8 -/* E07554 802421F4 AFB40030 */ sw $s4, 0x30($sp) -/* E07558 802421F8 0000A02D */ daddu $s4, $zero, $zero -/* E0755C 802421FC AFB10024 */ sw $s1, 0x24($sp) -/* E07560 80242200 3C11800A */ lui $s1, 0x800a -/* E07564 80242204 2631A66C */ addiu $s1, $s1, -0x5994 -/* E07568 80242208 AFB3002C */ sw $s3, 0x2c($sp) -/* E0756C 8024220C 24130004 */ addiu $s3, $zero, 4 -/* E07570 80242210 3C028025 */ lui $v0, 0x8025 -/* E07574 80242214 2442B9D0 */ addiu $v0, $v0, -0x4630 -/* E07578 80242218 AFBF0038 */ sw $ra, 0x38($sp) -/* E0757C 8024221C AFB50034 */ sw $s5, 0x34($sp) -/* E07580 80242220 AFB20028 */ sw $s2, 0x28($sp) -/* E07584 80242224 AFB00020 */ sw $s0, 0x20($sp) -/* E07588 80242228 8E230000 */ lw $v1, ($s1) -/* E0758C 8024222C 3C108007 */ lui $s0, 0x8007 -/* E07590 80242230 8E1041F4 */ lw $s0, 0x41f4($s0) -/* E07594 80242234 3C158025 */ lui $s5, 0x8025 -/* E07598 80242238 8EB5A2C4 */ lw $s5, -0x5d3c($s5) -/* E0759C 8024223C 44800000 */ mtc1 $zero, $f0 -/* E075A0 80242240 3C01C2C8 */ lui $at, 0xc2c8 -/* E075A4 80242244 44811000 */ mtc1 $at, $f2 -/* E075A8 80242248 3C0142C8 */ lui $at, 0x42c8 -/* E075AC 8024224C 44812000 */ mtc1 $at, $f4 -/* E075B0 80242250 3C013F80 */ lui $at, 0x3f80 -/* E075B4 80242254 44813000 */ mtc1 $at, $f6 -/* E075B8 80242258 3C0643A0 */ lui $a2, 0x43a0 -/* E075BC 8024225C 3C07C370 */ lui $a3, 0xc370 -/* E075C0 80242260 0060402D */ daddu $t0, $v1, $zero -/* E075C4 80242264 24630008 */ addiu $v1, $v1, 8 -/* E075C8 80242268 00108180 */ sll $s0, $s0, 6 -/* E075CC 8024226C 02028021 */ addu $s0, $s0, $v0 -/* E075D0 80242270 0200202D */ daddu $a0, $s0, $zero -/* E075D4 80242274 02A0902D */ daddu $s2, $s5, $zero -/* E075D8 80242278 AE230000 */ sw $v1, ($s1) -/* E075DC 8024227C AD050000 */ sw $a1, ($t0) -/* E075E0 80242280 44050000 */ mfc1 $a1, $f0 -/* E075E4 80242284 3C028024 */ lui $v0, 0x8024 -/* E075E8 80242288 24423200 */ addiu $v0, $v0, 0x3200 -/* E075EC 8024228C AD020004 */ sw $v0, 4($t0) -/* E075F0 80242290 E7A20014 */ swc1 $f2, 0x14($sp) -/* E075F4 80242294 E7A40018 */ swc1 $f4, 0x18($sp) -/* E075F8 80242298 E7A6001C */ swc1 $f6, 0x1c($sp) -/* E075FC 8024229C 0C018E90 */ jal guOrtho -/* E07600 802422A0 AFA50010 */ sw $a1, 0x10($sp) -/* E07604 802422A4 3C03DA38 */ lui $v1, 0xda38 -/* E07608 802422A8 34630007 */ ori $v1, $v1, 7 -/* E0760C 802422AC 3C05D9C0 */ lui $a1, 0xd9c0 -/* E07610 802422B0 34A5F9FB */ ori $a1, $a1, 0xf9fb -/* E07614 802422B4 3C07D9FF */ lui $a3, 0xd9ff -/* E07618 802422B8 34E7FFFF */ ori $a3, $a3, 0xffff -/* E0761C 802422BC 3C060020 */ lui $a2, 0x20 -/* E07620 802422C0 8E220000 */ lw $v0, ($s1) -/* E07624 802422C4 00D33025 */ or $a2, $a2, $s3 -/* E07628 802422C8 0040202D */ daddu $a0, $v0, $zero -/* E0762C 802422CC 24420008 */ addiu $v0, $v0, 8 -/* E07630 802422D0 AE220000 */ sw $v0, ($s1) -/* E07634 802422D4 AC830000 */ sw $v1, ($a0) -/* E07638 802422D8 3C038000 */ lui $v1, 0x8000 -/* E0763C 802422DC 02038021 */ addu $s0, $s0, $v1 -/* E07640 802422E0 24430008 */ addiu $v1, $v0, 8 -/* E07644 802422E4 AC900004 */ sw $s0, 4($a0) -/* E07648 802422E8 AE230000 */ sw $v1, ($s1) -/* E0764C 802422EC 3C03E700 */ lui $v1, 0xe700 -/* E07650 802422F0 AC430000 */ sw $v1, ($v0) -/* E07654 802422F4 24430010 */ addiu $v1, $v0, 0x10 -/* E07658 802422F8 AC400004 */ sw $zero, 4($v0) -/* E0765C 802422FC AE230000 */ sw $v1, ($s1) -/* E07660 80242300 24430018 */ addiu $v1, $v0, 0x18 -/* E07664 80242304 AC450008 */ sw $a1, 8($v0) -/* E07668 80242308 AC40000C */ sw $zero, 0xc($v0) -/* E0766C 8024230C AE230000 */ sw $v1, ($s1) -/* E07670 80242310 AC470010 */ sw $a3, 0x10($v0) -/* E07674 80242314 AC460014 */ sw $a2, 0x14($v0) -.L80242318: -/* E07678 80242318 96420074 */ lhu $v0, 0x74($s2) -/* E0767C 8024231C 30420001 */ andi $v0, $v0, 1 -/* E07680 80242320 50400004 */ beql $v0, $zero, .L80242334 -/* E07684 80242324 26730074 */ addiu $s3, $s3, 0x74 -/* E07688 80242328 0C0906D1 */ jal func_80241B44 -/* E0768C 8024232C 02B32021 */ addu $a0, $s5, $s3 -/* E07690 80242330 26730074 */ addiu $s3, $s3, 0x74 -.L80242334: -/* E07694 80242334 26940001 */ addiu $s4, $s4, 1 -/* E07698 80242338 2A820020 */ slti $v0, $s4, 0x20 -/* E0769C 8024233C 1440FFF6 */ bnez $v0, .L80242318 -/* E076A0 80242340 26520074 */ addiu $s2, $s2, 0x74 -/* E076A4 80242344 8FBF0038 */ lw $ra, 0x38($sp) -/* E076A8 80242348 8FB50034 */ lw $s5, 0x34($sp) -/* E076AC 8024234C 8FB40030 */ lw $s4, 0x30($sp) -/* E076B0 80242350 8FB3002C */ lw $s3, 0x2c($sp) -/* E076B4 80242354 8FB20028 */ lw $s2, 0x28($sp) -/* E076B8 80242358 8FB10024 */ lw $s1, 0x24($sp) -/* E076BC 8024235C 8FB00020 */ lw $s0, 0x20($sp) -/* E076C0 80242360 03E00008 */ jr $ra -/* E076C4 80242364 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_end/end_01/func_80242368_E05360.s b/asm/nonmatchings/world/area_end/end_01/func_80242368_E05360.s deleted file mode 100644 index 5cc6770b1c..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/func_80242368_E05360.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242368_E076C8 -/* E076C8 80242368 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* E076CC 8024236C AFB20030 */ sw $s2, 0x30($sp) -/* E076D0 80242370 0080902D */ daddu $s2, $a0, $zero -/* E076D4 80242374 0000182D */ daddu $v1, $zero, $zero -/* E076D8 80242378 3C068025 */ lui $a2, 0x8025 -/* E076DC 8024237C 8CC6A2C4 */ lw $a2, -0x5d3c($a2) -/* E076E0 80242380 24040020 */ addiu $a0, $zero, 0x20 -/* E076E4 80242384 AFBF0038 */ sw $ra, 0x38($sp) -/* E076E8 80242388 AFB30034 */ sw $s3, 0x34($sp) -/* E076EC 8024238C AFB1002C */ sw $s1, 0x2c($sp) -/* E076F0 80242390 AFB00028 */ sw $s0, 0x28($sp) -/* E076F4 80242394 00C0282D */ daddu $a1, $a2, $zero -.L80242398: -/* E076F8 80242398 94A20074 */ lhu $v0, 0x74($a1) -/* E076FC 8024239C 30420001 */ andi $v0, $v0, 1 -/* E07700 802423A0 10400006 */ beqz $v0, .L802423BC -/* E07704 802423A4 000310C0 */ sll $v0, $v1, 3 -/* E07708 802423A8 24630001 */ addiu $v1, $v1, 1 -/* E0770C 802423AC 10640051 */ beq $v1, $a0, .L802424F4 -/* E07710 802423B0 24A50074 */ addiu $a1, $a1, 0x74 -/* E07714 802423B4 080908E6 */ j .L80242398 -/* E07718 802423B8 00000000 */ nop -.L802423BC: -/* E0771C 802423BC 00431023 */ subu $v0, $v0, $v1 -/* E07720 802423C0 00021080 */ sll $v0, $v0, 2 -/* E07724 802423C4 00431021 */ addu $v0, $v0, $v1 -/* E07728 802423C8 00021080 */ sll $v0, $v0, 2 -/* E0772C 802423CC 24420004 */ addiu $v0, $v0, 4 -/* E07730 802423D0 8E440000 */ lw $a0, ($s2) -/* E07734 802423D4 10800047 */ beqz $a0, .L802424F4 -/* E07738 802423D8 00C28821 */ addu $s1, $a2, $v0 -/* E0773C 802423DC 04820014 */ bltzl $a0, .L80242430 -/* E07740 802423E0 AE240000 */ sw $a0, ($s1) -/* E07744 802423E4 3C138024 */ lui $s3, 0x8024 -/* E07748 802423E8 26733210 */ addiu $s3, $s3, 0x3210 -/* E0774C 802423EC 8E650000 */ lw $a1, ($s3) -/* E07750 802423F0 3C108025 */ lui $s0, 0x8025 -/* E07754 802423F4 2610A2D0 */ addiu $s0, $s0, -0x5d30 -/* E07758 802423F8 00052A00 */ sll $a1, $a1, 8 -/* E0775C 802423FC 0C049601 */ jal dma_load_string -/* E07760 80242400 00B02821 */ addu $a1, $a1, $s0 -/* E07764 80242404 8E630000 */ lw $v1, ($s3) -/* E07768 80242408 00031200 */ sll $v0, $v1, 8 -/* E0776C 8024240C 00501021 */ addu $v0, $v0, $s0 -/* E07770 80242410 24630001 */ addiu $v1, $v1, 1 -/* E07774 80242414 AE220000 */ sw $v0, ($s1) -/* E07778 80242418 AE630000 */ sw $v1, ($s3) -/* E0777C 8024241C 28630017 */ slti $v1, $v1, 0x17 -/* E07780 80242420 50600003 */ beql $v1, $zero, .L80242430 -/* E07784 80242424 AE600000 */ sw $zero, ($s3) -/* E07788 80242428 0809090D */ j .L80242434 -/* E0778C 8024242C 0000282D */ daddu $a1, $zero, $zero -.L80242430: -/* E07790 80242430 0000282D */ daddu $a1, $zero, $zero -.L80242434: -/* E07794 80242434 27A20024 */ addiu $v0, $sp, 0x24 -/* E07798 80242438 00A0302D */ daddu $a2, $a1, $zero -/* E0779C 8024243C AFA00010 */ sw $zero, 0x10($sp) -/* E077A0 80242440 AFA00014 */ sw $zero, 0x14($sp) -/* E077A4 80242444 AFA20018 */ sw $v0, 0x18($sp) -/* E077A8 80242448 AFA0001C */ sw $zero, 0x1c($sp) -/* E077AC 8024244C 8E240000 */ lw $a0, ($s1) -/* E077B0 80242450 0C0497DA */ jal get_string_properties -/* E077B4 80242454 27A70020 */ addiu $a3, $sp, 0x20 -/* E077B8 80242458 8E420004 */ lw $v0, 4($s2) -/* E077BC 8024245C AE220068 */ sw $v0, 0x68($s1) -/* E077C0 80242460 8E420008 */ lw $v0, 8($s2) -/* E077C4 80242464 AE22006C */ sw $v0, 0x6c($s1) -/* E077C8 80242468 8E42000C */ lw $v0, 0xc($s2) -/* E077CC 8024246C AE220010 */ sw $v0, 0x10($s1) -/* E077D0 80242470 8E420010 */ lw $v0, 0x10($s2) -/* E077D4 80242474 AE220018 */ sw $v0, 0x18($s1) -/* E077D8 80242478 8E420014 */ lw $v0, 0x14($s2) -/* E077DC 8024247C AE22001C */ sw $v0, 0x1c($s1) -/* E077E0 80242480 8E42001C */ lw $v0, 0x1c($s2) -/* E077E4 80242484 AE220034 */ sw $v0, 0x34($s1) -/* E077E8 80242488 8E420020 */ lw $v0, 0x20($s2) -/* E077EC 8024248C AE220038 */ sw $v0, 0x38($s1) -/* E077F0 80242490 8E440018 */ lw $a0, 0x18($s2) -/* E077F4 80242494 1080000C */ beqz $a0, .L802424C8 -/* E077F8 80242498 00000000 */ nop -/* E077FC 8024249C 8FA20024 */ lw $v0, 0x24($sp) -/* E07800 802424A0 8FA30020 */ lw $v1, 0x20($sp) -/* E07804 802424A4 24420001 */ addiu $v0, $v0, 1 -/* E07808 802424A8 00621823 */ subu $v1, $v1, $v0 -/* E0780C 802424AC 00640018 */ mult $v1, $a0 -/* E07810 802424B0 8E420020 */ lw $v0, 0x20($s2) -/* E07814 802424B4 00004012 */ mflo $t0 -/* E07818 802424B8 00481023 */ subu $v0, $v0, $t0 -/* E0781C 802424BC 04410002 */ bgez $v0, .L802424C8 -/* E07820 802424C0 AE220038 */ sw $v0, 0x38($s1) -/* E07824 802424C4 AE200038 */ sw $zero, 0x38($s1) -.L802424C8: -/* E07828 802424C8 8E420024 */ lw $v0, 0x24($s2) -/* E0782C 802424CC AE22004C */ sw $v0, 0x4c($s1) -/* E07830 802424D0 8E420028 */ lw $v0, 0x28($s2) -/* E07834 802424D4 AE220050 */ sw $v0, 0x50($s1) -/* E07838 802424D8 8E420018 */ lw $v0, 0x18($s2) -/* E0783C 802424DC AE220020 */ sw $v0, 0x20($s1) -/* E07840 802424E0 8E42002C */ lw $v0, 0x2c($s2) -/* E07844 802424E4 AE220054 */ sw $v0, 0x54($s1) -/* E07848 802424E8 96420034 */ lhu $v0, 0x34($s2) -/* E0784C 802424EC 34420003 */ ori $v0, $v0, 3 -/* E07850 802424F0 A6220070 */ sh $v0, 0x70($s1) -.L802424F4: -/* E07854 802424F4 8FBF0038 */ lw $ra, 0x38($sp) -/* E07858 802424F8 8FB30034 */ lw $s3, 0x34($sp) -/* E0785C 802424FC 8FB20030 */ lw $s2, 0x30($sp) -/* E07860 80242500 8FB1002C */ lw $s1, 0x2c($sp) -/* E07864 80242504 8FB00028 */ lw $s0, 0x28($sp) -/* E07868 80242508 03E00008 */ jr $ra -/* E0786C 8024250C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_end/end_01/func_80242590_E05360.s b/asm/nonmatchings/world/area_end/end_01/func_80242590_E05360.s deleted file mode 100644 index 98f1d27bdc..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/func_80242590_E05360.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242590_E078F0 -/* E078F0 80242590 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E078F4 80242594 AFB10014 */ sw $s1, 0x14($sp) -/* E078F8 80242598 0080882D */ daddu $s1, $a0, $zero -/* E078FC 8024259C AFBF001C */ sw $ra, 0x1c($sp) -/* E07900 802425A0 AFB20018 */ sw $s2, 0x18($sp) -/* E07904 802425A4 AFB00010 */ sw $s0, 0x10($sp) -/* E07908 802425A8 8E22000C */ lw $v0, 0xc($s1) -/* E0790C 802425AC 00A0802D */ daddu $s0, $a1, $zero -/* E07910 802425B0 0C0B1EAF */ jal get_variable -/* E07914 802425B4 8C450000 */ lw $a1, ($v0) -/* E07918 802425B8 12000005 */ beqz $s0, .L802425D0 -/* E0791C 802425BC 0040902D */ daddu $s2, $v0, $zero -/* E07920 802425C0 2402FFFF */ addiu $v0, $zero, -1 -/* E07924 802425C4 AE200084 */ sw $zero, 0x84($s1) -/* E07928 802425C8 AE220088 */ sw $v0, 0x88($s1) -/* E0792C 802425CC AE20008C */ sw $zero, 0x8c($s1) -.L802425D0: -/* E07930 802425D0 8E230084 */ lw $v1, 0x84($s1) -/* E07934 802425D4 10600005 */ beqz $v1, .L802425EC -/* E07938 802425D8 24020001 */ addiu $v0, $zero, 1 -/* E0793C 802425DC 10620020 */ beq $v1, $v0, .L80242660 -/* E07940 802425E0 0000102D */ daddu $v0, $zero, $zero -/* E07944 802425E4 0809099E */ j .L80242678 -/* E07948 802425E8 00000000 */ nop -.L802425EC: -/* E0794C 802425EC 2410FFFF */ addiu $s0, $zero, -1 -.L802425F0: -/* E07950 802425F0 8E22008C */ lw $v0, 0x8c($s1) -/* E07954 802425F4 000218C0 */ sll $v1, $v0, 3 -/* E07958 802425F8 00621823 */ subu $v1, $v1, $v0 -/* E0795C 802425FC 000318C0 */ sll $v1, $v1, 3 -/* E07960 80242600 00722021 */ addu $a0, $v1, $s2 -/* E07964 80242604 8C820000 */ lw $v0, ($a0) -/* E07968 80242608 10400003 */ beqz $v0, .L80242618 -/* E0796C 8024260C 00000000 */ nop -/* E07970 80242610 0C0908DA */ jal func_80242368 -/* E07974 80242614 00000000 */ nop -.L80242618: -/* E07978 80242618 8E23008C */ lw $v1, 0x8c($s1) -/* E0797C 8024261C 000310C0 */ sll $v0, $v1, 3 -/* E07980 80242620 00431023 */ subu $v0, $v0, $v1 -/* E07984 80242624 000210C0 */ sll $v0, $v0, 3 -/* E07988 80242628 00521021 */ addu $v0, $v0, $s2 -/* E0798C 8024262C 8C420030 */ lw $v0, 0x30($v0) -/* E07990 80242630 AE220088 */ sw $v0, 0x88($s1) -/* E07994 80242634 0060102D */ daddu $v0, $v1, $zero -/* E07998 80242638 8E230088 */ lw $v1, 0x88($s1) -/* E0799C 8024263C 24420001 */ addiu $v0, $v0, 1 -/* E079A0 80242640 1C600005 */ bgtz $v1, .L80242658 -/* E079A4 80242644 AE22008C */ sw $v0, 0x8c($s1) -/* E079A8 80242648 1470FFE9 */ bne $v1, $s0, .L802425F0 -/* E079AC 8024264C 24020002 */ addiu $v0, $zero, 2 -/* E079B0 80242650 0809099E */ j .L80242678 -/* E079B4 80242654 00000000 */ nop -.L80242658: -/* E079B8 80242658 24020001 */ addiu $v0, $zero, 1 -/* E079BC 8024265C AE220084 */ sw $v0, 0x84($s1) -.L80242660: -/* E079C0 80242660 8E220088 */ lw $v0, 0x88($s1) -/* E079C4 80242664 2442FFFF */ addiu $v0, $v0, -1 -/* E079C8 80242668 1C400002 */ bgtz $v0, .L80242674 -/* E079CC 8024266C AE220088 */ sw $v0, 0x88($s1) -/* E079D0 80242670 AE200084 */ sw $zero, 0x84($s1) -.L80242674: -/* E079D4 80242674 0000102D */ daddu $v0, $zero, $zero -.L80242678: -/* E079D8 80242678 8FBF001C */ lw $ra, 0x1c($sp) -/* E079DC 8024267C 8FB20018 */ lw $s2, 0x18($sp) -/* E079E0 80242680 8FB10014 */ lw $s1, 0x14($sp) -/* E079E4 80242684 8FB00010 */ lw $s0, 0x10($sp) -/* E079E8 80242688 03E00008 */ jr $ra -/* E079EC 8024268C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_end/end_01/func_80242754_E05360.s b/asm/nonmatchings/world/area_end/end_01/func_80242754_E05360.s deleted file mode 100644 index dacab1c174..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/func_80242754_E05360.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242754_E07AB4 -/* E07AB4 80242754 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E07AB8 80242758 AFB10014 */ sw $s1, 0x14($sp) -/* E07ABC 8024275C 0080882D */ daddu $s1, $a0, $zero -/* E07AC0 80242760 AFBF0018 */ sw $ra, 0x18($sp) -/* E07AC4 80242764 AFB00010 */ sw $s0, 0x10($sp) -/* E07AC8 80242768 8E30000C */ lw $s0, 0xc($s1) -/* E07ACC 8024276C 8E050000 */ lw $a1, ($s0) -/* E07AD0 80242770 0C0B1EAF */ jal get_variable -/* E07AD4 80242774 26100004 */ addiu $s0, $s0, 4 -/* E07AD8 80242778 3C048035 */ lui $a0, 0x8035 -/* E07ADC 8024277C 2484F800 */ addiu $a0, $a0, -0x800 -/* E07AE0 80242780 8E100000 */ lw $s0, ($s0) -/* E07AE4 80242784 0C00A41B */ jal _heap_malloc -/* E07AE8 80242788 0040282D */ daddu $a1, $v0, $zero -/* E07AEC 8024278C 0220202D */ daddu $a0, $s1, $zero -/* E07AF0 80242790 0040302D */ daddu $a2, $v0, $zero -/* E07AF4 80242794 0C0B2026 */ jal set_variable -/* E07AF8 80242798 0200282D */ daddu $a1, $s0, $zero -/* E07AFC 8024279C 8FBF0018 */ lw $ra, 0x18($sp) -/* E07B00 802427A0 8FB10014 */ lw $s1, 0x14($sp) -/* E07B04 802427A4 8FB00010 */ lw $s0, 0x10($sp) -/* E07B08 802427A8 24020002 */ addiu $v0, $zero, 2 -/* E07B0C 802427AC 03E00008 */ jr $ra -/* E07B10 802427B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_00/func_80240040_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/func_80240040_C9DF20.s deleted file mode 100644 index 4f93c5a0b9..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/func_80240040_C9DF20.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_C9DF60 -/* C9DF60 80240040 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C9DF64 80240044 AFB50024 */ sw $s5, 0x24($sp) -/* C9DF68 80240048 0080A82D */ daddu $s5, $a0, $zero -/* C9DF6C 8024004C AFBF002C */ sw $ra, 0x2c($sp) -/* C9DF70 80240050 AFB60028 */ sw $s6, 0x28($sp) -/* C9DF74 80240054 AFB40020 */ sw $s4, 0x20($sp) -/* C9DF78 80240058 AFB3001C */ sw $s3, 0x1c($sp) -/* C9DF7C 8024005C AFB20018 */ sw $s2, 0x18($sp) -/* C9DF80 80240060 AFB10014 */ sw $s1, 0x14($sp) -/* C9DF84 80240064 AFB00010 */ sw $s0, 0x10($sp) -/* C9DF88 80240068 F7B80040 */ sdc1 $f24, 0x40($sp) -/* C9DF8C 8024006C F7B60038 */ sdc1 $f22, 0x38($sp) -/* C9DF90 80240070 F7B40030 */ sdc1 $f20, 0x30($sp) -/* C9DF94 80240074 8EB30148 */ lw $s3, 0x148($s5) -/* C9DF98 80240078 86640008 */ lh $a0, 8($s3) -/* C9DF9C 8024007C 0C00EABB */ jal get_npc_unsafe -/* C9DFA0 80240080 00A0B02D */ daddu $s6, $a1, $zero -/* C9DFA4 80240084 0040A02D */ daddu $s4, $v0, $zero -/* C9DFA8 80240088 AEA00074 */ sw $zero, 0x74($s5) -/* C9DFAC 8024008C C6980038 */ lwc1 $f24, 0x38($s4) -/* C9DFB0 80240090 C6960040 */ lwc1 $f22, 0x40($s4) -/* C9DFB4 80240094 0000902D */ daddu $s2, $zero, $zero -/* C9DFB8 80240098 AEA00078 */ sw $zero, 0x78($s5) -/* C9DFBC 8024009C 8E6300D0 */ lw $v1, 0xd0($s3) -/* C9DFC0 802400A0 8C620000 */ lw $v0, ($v1) -/* C9DFC4 802400A4 3C0146FF */ lui $at, 0x46ff -/* C9DFC8 802400A8 3421FE00 */ ori $at, $at, 0xfe00 -/* C9DFCC 802400AC 4481A000 */ mtc1 $at, $f20 -/* C9DFD0 802400B0 18400018 */ blez $v0, .L80240114 -/* C9DFD4 802400B4 0240802D */ daddu $s0, $s2, $zero -/* C9DFD8 802400B8 0240882D */ daddu $s1, $s2, $zero -.L802400BC: -/* C9DFDC 802400BC 02231021 */ addu $v0, $s1, $v1 -/* C9DFE0 802400C0 4600C306 */ mov.s $f12, $f24 -/* C9DFE4 802400C4 C4440004 */ lwc1 $f4, 4($v0) -/* C9DFE8 802400C8 46802120 */ cvt.s.w $f4, $f4 -/* C9DFEC 802400CC 44062000 */ mfc1 $a2, $f4 -/* C9DFF0 802400D0 C444000C */ lwc1 $f4, 0xc($v0) -/* C9DFF4 802400D4 46802120 */ cvt.s.w $f4, $f4 -/* C9DFF8 802400D8 44072000 */ mfc1 $a3, $f4 -/* C9DFFC 802400DC 0C00A7B5 */ jal dist2D -/* C9E000 802400E0 4600B386 */ mov.s $f14, $f22 -/* C9E004 802400E4 4614003C */ c.lt.s $f0, $f20 -/* C9E008 802400E8 00000000 */ nop -/* C9E00C 802400EC 45000003 */ bc1f .L802400FC -/* C9E010 802400F0 2631000C */ addiu $s1, $s1, 0xc -/* C9E014 802400F4 46000506 */ mov.s $f20, $f0 -/* C9E018 802400F8 AEB20078 */ sw $s2, 0x78($s5) -.L802400FC: -/* C9E01C 802400FC 8E6300D0 */ lw $v1, 0xd0($s3) -/* C9E020 80240100 26100001 */ addiu $s0, $s0, 1 -/* C9E024 80240104 8C620000 */ lw $v0, ($v1) -/* C9E028 80240108 0202102A */ slt $v0, $s0, $v0 -/* C9E02C 8024010C 1440FFEB */ bnez $v0, .L802400BC -/* C9E030 80240110 26520001 */ addiu $s2, $s2, 1 -.L80240114: -/* C9E034 80240114 8E6200CC */ lw $v0, 0xcc($s3) -/* C9E038 80240118 8C420004 */ lw $v0, 4($v0) -/* C9E03C 8024011C AE820028 */ sw $v0, 0x28($s4) -/* C9E040 80240120 8E6200D0 */ lw $v0, 0xd0($s3) -/* C9E044 80240124 8C42007C */ lw $v0, 0x7c($v0) -/* C9E048 80240128 04410004 */ bgez $v0, .L8024013C -/* C9E04C 8024012C 00000000 */ nop -/* C9E050 80240130 C6C00000 */ lwc1 $f0, ($s6) -/* C9E054 80240134 08090057 */ j .L8024015C -/* C9E058 80240138 E6800018 */ swc1 $f0, 0x18($s4) -.L8024013C: -/* C9E05C 8024013C 3C018025 */ lui $at, 0x8025 -/* C9E060 80240140 D42291C0 */ ldc1 $f2, -0x6e40($at) -/* C9E064 80240144 44820000 */ mtc1 $v0, $f0 -/* C9E068 80240148 00000000 */ nop -/* C9E06C 8024014C 46800021 */ cvt.d.w $f0, $f0 -/* C9E070 80240150 46220003 */ div.d $f0, $f0, $f2 -/* C9E074 80240154 46200020 */ cvt.s.d $f0, $f0 -/* C9E078 80240158 E6800018 */ swc1 $f0, 0x18($s4) -.L8024015C: -/* C9E07C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* C9E080 80240160 AEA20070 */ sw $v0, 0x70($s5) -/* C9E084 80240164 8FBF002C */ lw $ra, 0x2c($sp) -/* C9E088 80240168 8FB60028 */ lw $s6, 0x28($sp) -/* C9E08C 8024016C 8FB50024 */ lw $s5, 0x24($sp) -/* C9E090 80240170 8FB40020 */ lw $s4, 0x20($sp) -/* C9E094 80240174 8FB3001C */ lw $s3, 0x1c($sp) -/* C9E098 80240178 8FB20018 */ lw $s2, 0x18($sp) -/* C9E09C 8024017C 8FB10014 */ lw $s1, 0x14($sp) -/* C9E0A0 80240180 8FB00010 */ lw $s0, 0x10($sp) -/* C9E0A4 80240184 D7B80040 */ ldc1 $f24, 0x40($sp) -/* C9E0A8 80240188 D7B60038 */ ldc1 $f22, 0x38($sp) -/* C9E0AC 8024018C D7B40030 */ ldc1 $f20, 0x30($sp) -/* C9E0B0 80240190 03E00008 */ jr $ra -/* C9E0B4 80240194 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_00/func_80240198_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/func_80240198_C9DF20.s deleted file mode 100644 index 5fc04f5558..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/func_80240198_C9DF20.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240198_C9E0B8 -/* C9E0B8 80240198 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C9E0BC 8024019C AFB20038 */ sw $s2, 0x38($sp) -/* C9E0C0 802401A0 0080902D */ daddu $s2, $a0, $zero -/* C9E0C4 802401A4 AFBF0044 */ sw $ra, 0x44($sp) -/* C9E0C8 802401A8 AFB40040 */ sw $s4, 0x40($sp) -/* C9E0CC 802401AC AFB3003C */ sw $s3, 0x3c($sp) -/* C9E0D0 802401B0 AFB10034 */ sw $s1, 0x34($sp) -/* C9E0D4 802401B4 AFB00030 */ sw $s0, 0x30($sp) -/* C9E0D8 802401B8 F7B60050 */ sdc1 $f22, 0x50($sp) -/* C9E0DC 802401BC F7B40048 */ sdc1 $f20, 0x48($sp) -/* C9E0E0 802401C0 8E510148 */ lw $s1, 0x148($s2) -/* C9E0E4 802401C4 00A0982D */ daddu $s3, $a1, $zero -/* C9E0E8 802401C8 86240008 */ lh $a0, 8($s1) -/* C9E0EC 802401CC 0C00EABB */ jal get_npc_unsafe -/* C9E0F0 802401D0 00C0A02D */ daddu $s4, $a2, $zero -/* C9E0F4 802401D4 8E630014 */ lw $v1, 0x14($s3) -/* C9E0F8 802401D8 04600030 */ bltz $v1, .L8024029C -/* C9E0FC 802401DC 0040802D */ daddu $s0, $v0, $zero -/* C9E100 802401E0 8E420074 */ lw $v0, 0x74($s2) -/* C9E104 802401E4 1C40002C */ bgtz $v0, .L80240298 -/* C9E108 802401E8 2442FFFF */ addiu $v0, $v0, -1 -/* C9E10C 802401EC 0280202D */ daddu $a0, $s4, $zero -/* C9E110 802401F0 AE430074 */ sw $v1, 0x74($s2) -/* C9E114 802401F4 AFA00010 */ sw $zero, 0x10($sp) -/* C9E118 802401F8 8E66000C */ lw $a2, 0xc($s3) -/* C9E11C 802401FC 8E670010 */ lw $a3, 0x10($s3) -/* C9E120 80240200 0C01242D */ jal func_800490B4 -/* C9E124 80240204 0220282D */ daddu $a1, $s1, $zero -/* C9E128 80240208 10400021 */ beqz $v0, .L80240290 -/* C9E12C 8024020C 0000202D */ daddu $a0, $zero, $zero -/* C9E130 80240210 0200282D */ daddu $a1, $s0, $zero -/* C9E134 80240214 0000302D */ daddu $a2, $zero, $zero -/* C9E138 80240218 860300A8 */ lh $v1, 0xa8($s0) -/* C9E13C 8024021C 3C013F80 */ lui $at, 0x3f80 -/* C9E140 80240220 44810000 */ mtc1 $at, $f0 -/* C9E144 80240224 3C014000 */ lui $at, 0x4000 -/* C9E148 80240228 44811000 */ mtc1 $at, $f2 -/* C9E14C 8024022C 3C01C1A0 */ lui $at, 0xc1a0 -/* C9E150 80240230 44812000 */ mtc1 $at, $f4 -/* C9E154 80240234 2402000F */ addiu $v0, $zero, 0xf -/* C9E158 80240238 AFA2001C */ sw $v0, 0x1c($sp) -/* C9E15C 8024023C 44833000 */ mtc1 $v1, $f6 -/* C9E160 80240240 00000000 */ nop -/* C9E164 80240244 468031A0 */ cvt.s.w $f6, $f6 -/* C9E168 80240248 44073000 */ mfc1 $a3, $f6 -/* C9E16C 8024024C 27A20028 */ addiu $v0, $sp, 0x28 -/* C9E170 80240250 AFA20020 */ sw $v0, 0x20($sp) -/* C9E174 80240254 E7A00010 */ swc1 $f0, 0x10($sp) -/* C9E178 80240258 E7A20014 */ swc1 $f2, 0x14($sp) -/* C9E17C 8024025C 0C01BFA4 */ jal fx_emote -/* C9E180 80240260 E7A40018 */ swc1 $f4, 0x18($sp) -/* C9E184 80240264 0200202D */ daddu $a0, $s0, $zero -/* C9E188 80240268 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C9E18C 8024026C 0C012530 */ jal func_800494C0 -/* C9E190 80240270 3C060020 */ lui $a2, 0x20 -/* C9E194 80240274 8E220018 */ lw $v0, 0x18($s1) -/* C9E198 80240278 9442002A */ lhu $v0, 0x2a($v0) -/* C9E19C 8024027C 30420001 */ andi $v0, $v0, 1 -/* C9E1A0 80240280 14400064 */ bnez $v0, .L80240414 -/* C9E1A4 80240284 2402000A */ addiu $v0, $zero, 0xa -/* C9E1A8 80240288 08090105 */ j .L80240414 -/* C9E1AC 8024028C 2402000C */ addiu $v0, $zero, 0xc -.L80240290: -/* C9E1B0 80240290 8E420074 */ lw $v0, 0x74($s2) -/* C9E1B4 80240294 2442FFFF */ addiu $v0, $v0, -1 -.L80240298: -/* C9E1B8 80240298 AE420074 */ sw $v0, 0x74($s2) -.L8024029C: -/* C9E1BC 8024029C 8602008C */ lh $v0, 0x8c($s0) -/* C9E1C0 802402A0 1440005D */ bnez $v0, .L80240418 -/* C9E1C4 802402A4 00000000 */ nop -/* C9E1C8 802402A8 C6000018 */ lwc1 $f0, 0x18($s0) -/* C9E1CC 802402AC 3C014010 */ lui $at, 0x4010 -/* C9E1D0 802402B0 44811800 */ mtc1 $at, $f3 -/* C9E1D4 802402B4 44801000 */ mtc1 $zero, $f2 -/* C9E1D8 802402B8 46000021 */ cvt.d.s $f0, $f0 -/* C9E1DC 802402BC 4622003C */ c.lt.d $f0, $f2 -/* C9E1E0 802402C0 00000000 */ nop -/* C9E1E4 802402C4 45000003 */ bc1f .L802402D4 -/* C9E1E8 802402C8 0200202D */ daddu $a0, $s0, $zero -/* C9E1EC 802402CC 080900B6 */ j .L802402D8 -/* C9E1F0 802402D0 0000282D */ daddu $a1, $zero, $zero -.L802402D4: -/* C9E1F4 802402D4 24050001 */ addiu $a1, $zero, 1 -.L802402D8: -/* C9E1F8 802402D8 0C00F598 */ jal func_8003D660 -/* C9E1FC 802402DC 00000000 */ nop -/* C9E200 802402E0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C9E204 802402E4 8E430078 */ lw $v1, 0x78($s2) -/* C9E208 802402E8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C9E20C 802402EC 00031040 */ sll $v0, $v1, 1 -/* C9E210 802402F0 00431021 */ addu $v0, $v0, $v1 -/* C9E214 802402F4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C9E218 802402F8 00021080 */ sll $v0, $v0, 2 -/* C9E21C 802402FC 00431021 */ addu $v0, $v0, $v1 -/* C9E220 80240300 C4560004 */ lwc1 $f22, 4($v0) -/* C9E224 80240304 4680B5A0 */ cvt.s.w $f22, $f22 -/* C9E228 80240308 C454000C */ lwc1 $f20, 0xc($v0) -/* C9E22C 8024030C 4680A520 */ cvt.s.w $f20, $f20 -/* C9E230 80240310 4406B000 */ mfc1 $a2, $f22 -/* C9E234 80240314 4407A000 */ mfc1 $a3, $f20 -/* C9E238 80240318 0C00A720 */ jal atan2 -/* C9E23C 8024031C 00000000 */ nop -/* C9E240 80240320 8E050018 */ lw $a1, 0x18($s0) -/* C9E244 80240324 44060000 */ mfc1 $a2, $f0 -/* C9E248 80240328 0200202D */ daddu $a0, $s0, $zero -/* C9E24C 8024032C 0C00EA95 */ jal npc_move_heading -/* C9E250 80240330 AE06000C */ sw $a2, 0xc($s0) -/* C9E254 80240334 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C9E258 80240338 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C9E25C 8024033C 4406B000 */ mfc1 $a2, $f22 -/* C9E260 80240340 4407A000 */ mfc1 $a3, $f20 -/* C9E264 80240344 0C00A7B5 */ jal dist2D -/* C9E268 80240348 00000000 */ nop -/* C9E26C 8024034C C6020018 */ lwc1 $f2, 0x18($s0) -/* C9E270 80240350 4602003E */ c.le.s $f0, $f2 -/* C9E274 80240354 00000000 */ nop -/* C9E278 80240358 4500002F */ bc1f .L80240418 -/* C9E27C 8024035C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C9E280 80240360 24020002 */ addiu $v0, $zero, 2 -/* C9E284 80240364 0C00A67F */ jal rand_int -/* C9E288 80240368 AE420070 */ sw $v0, 0x70($s2) -/* C9E28C 8024036C 3C035555 */ lui $v1, 0x5555 -/* C9E290 80240370 34635556 */ ori $v1, $v1, 0x5556 -/* C9E294 80240374 00430018 */ mult $v0, $v1 -/* C9E298 80240378 000227C3 */ sra $a0, $v0, 0x1f -/* C9E29C 8024037C 00004010 */ mfhi $t0 -/* C9E2A0 80240380 01042023 */ subu $a0, $t0, $a0 -/* C9E2A4 80240384 00041840 */ sll $v1, $a0, 1 -/* C9E2A8 80240388 00641821 */ addu $v1, $v1, $a0 -/* C9E2AC 8024038C 00431023 */ subu $v0, $v0, $v1 -/* C9E2B0 80240390 24430002 */ addiu $v1, $v0, 2 -/* C9E2B4 80240394 AE430074 */ sw $v1, 0x74($s2) -/* C9E2B8 80240398 8E62002C */ lw $v0, 0x2c($s3) -/* C9E2BC 8024039C 18400009 */ blez $v0, .L802403C4 -/* C9E2C0 802403A0 24020004 */ addiu $v0, $zero, 4 -/* C9E2C4 802403A4 8E620004 */ lw $v0, 4($s3) -/* C9E2C8 802403A8 18400006 */ blez $v0, .L802403C4 -/* C9E2CC 802403AC 24020004 */ addiu $v0, $zero, 4 -/* C9E2D0 802403B0 8E620008 */ lw $v0, 8($s3) -/* C9E2D4 802403B4 18400003 */ blez $v0, .L802403C4 -/* C9E2D8 802403B8 24020004 */ addiu $v0, $zero, 4 -/* C9E2DC 802403BC 14600002 */ bnez $v1, .L802403C8 -/* C9E2E0 802403C0 00000000 */ nop -.L802403C4: -/* C9E2E4 802403C4 AE420070 */ sw $v0, 0x70($s2) -.L802403C8: -/* C9E2E8 802403C8 0C00A67F */ jal rand_int -/* C9E2EC 802403CC 24042710 */ addiu $a0, $zero, 0x2710 -/* C9E2F0 802403D0 3C0351EB */ lui $v1, 0x51eb -/* C9E2F4 802403D4 3463851F */ ori $v1, $v1, 0x851f -/* C9E2F8 802403D8 00430018 */ mult $v0, $v1 -/* C9E2FC 802403DC 00021FC3 */ sra $v1, $v0, 0x1f -/* C9E300 802403E0 00004010 */ mfhi $t0 -/* C9E304 802403E4 00082143 */ sra $a0, $t0, 5 -/* C9E308 802403E8 00832023 */ subu $a0, $a0, $v1 -/* C9E30C 802403EC 00041840 */ sll $v1, $a0, 1 -/* C9E310 802403F0 00641821 */ addu $v1, $v1, $a0 -/* C9E314 802403F4 000318C0 */ sll $v1, $v1, 3 -/* C9E318 802403F8 00641821 */ addu $v1, $v1, $a0 -/* C9E31C 802403FC 00031880 */ sll $v1, $v1, 2 -/* C9E320 80240400 8E640004 */ lw $a0, 4($s3) -/* C9E324 80240404 00431023 */ subu $v0, $v0, $v1 -/* C9E328 80240408 0044102A */ slt $v0, $v0, $a0 -/* C9E32C 8024040C 10400002 */ beqz $v0, .L80240418 -/* C9E330 80240410 24020004 */ addiu $v0, $zero, 4 -.L80240414: -/* C9E334 80240414 AE420070 */ sw $v0, 0x70($s2) -.L80240418: -/* C9E338 80240418 8FBF0044 */ lw $ra, 0x44($sp) -/* C9E33C 8024041C 8FB40040 */ lw $s4, 0x40($sp) -/* C9E340 80240420 8FB3003C */ lw $s3, 0x3c($sp) -/* C9E344 80240424 8FB20038 */ lw $s2, 0x38($sp) -/* C9E348 80240428 8FB10034 */ lw $s1, 0x34($sp) -/* C9E34C 8024042C 8FB00030 */ lw $s0, 0x30($sp) -/* C9E350 80240430 D7B60050 */ ldc1 $f22, 0x50($sp) -/* C9E354 80240434 D7B40048 */ ldc1 $f20, 0x48($sp) -/* C9E358 80240438 03E00008 */ jr $ra -/* C9E35C 8024043C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_flo/flo_00/func_80240440_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/func_80240440_C9DF20.s deleted file mode 100644 index f6cb56f8ac..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/func_80240440_C9DF20.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240440_C9E360 -/* C9E360 80240440 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C9E364 80240444 AFB3001C */ sw $s3, 0x1c($sp) -/* C9E368 80240448 0080982D */ daddu $s3, $a0, $zero -/* C9E36C 8024044C AFBF0020 */ sw $ra, 0x20($sp) -/* C9E370 80240450 AFB20018 */ sw $s2, 0x18($sp) -/* C9E374 80240454 AFB10014 */ sw $s1, 0x14($sp) -/* C9E378 80240458 AFB00010 */ sw $s0, 0x10($sp) -/* C9E37C 8024045C 8E720148 */ lw $s2, 0x148($s3) -/* C9E380 80240460 86440008 */ lh $a0, 8($s2) -/* C9E384 80240464 0C00EABB */ jal get_npc_unsafe -/* C9E388 80240468 00A0882D */ daddu $s1, $a1, $zero -/* C9E38C 8024046C 8E240008 */ lw $a0, 8($s1) -/* C9E390 80240470 0040802D */ daddu $s0, $v0, $zero -/* C9E394 80240474 00041FC2 */ srl $v1, $a0, 0x1f -/* C9E398 80240478 00832021 */ addu $a0, $a0, $v1 -/* C9E39C 8024047C 00042043 */ sra $a0, $a0, 1 -/* C9E3A0 80240480 0C00A67F */ jal rand_int -/* C9E3A4 80240484 24840001 */ addiu $a0, $a0, 1 -/* C9E3A8 80240488 8E230008 */ lw $v1, 8($s1) -/* C9E3AC 8024048C 240400B4 */ addiu $a0, $zero, 0xb4 -/* C9E3B0 80240490 00032FC2 */ srl $a1, $v1, 0x1f -/* C9E3B4 80240494 00651821 */ addu $v1, $v1, $a1 -/* C9E3B8 80240498 00031843 */ sra $v1, $v1, 1 -/* C9E3BC 8024049C 00621821 */ addu $v1, $v1, $v0 -/* C9E3C0 802404A0 0C00A67F */ jal rand_int -/* C9E3C4 802404A4 A603008E */ sh $v1, 0x8e($s0) -/* C9E3C8 802404A8 C60C000C */ lwc1 $f12, 0xc($s0) -/* C9E3CC 802404AC 44820000 */ mtc1 $v0, $f0 -/* C9E3D0 802404B0 00000000 */ nop -/* C9E3D4 802404B4 46800020 */ cvt.s.w $f0, $f0 -/* C9E3D8 802404B8 46006300 */ add.s $f12, $f12, $f0 -/* C9E3DC 802404BC 3C0142B4 */ lui $at, 0x42b4 -/* C9E3E0 802404C0 44810000 */ mtc1 $at, $f0 -/* C9E3E4 802404C4 0C00A6C9 */ jal clamp_angle -/* C9E3E8 802404C8 46006301 */ sub.s $f12, $f12, $f0 -/* C9E3EC 802404CC E600000C */ swc1 $f0, 0xc($s0) -/* C9E3F0 802404D0 8E4200CC */ lw $v0, 0xcc($s2) -/* C9E3F4 802404D4 8C420000 */ lw $v0, ($v0) -/* C9E3F8 802404D8 AE020028 */ sw $v0, 0x28($s0) -/* C9E3FC 802404DC 24020003 */ addiu $v0, $zero, 3 -/* C9E400 802404E0 AE620070 */ sw $v0, 0x70($s3) -/* C9E404 802404E4 8FBF0020 */ lw $ra, 0x20($sp) -/* C9E408 802404E8 8FB3001C */ lw $s3, 0x1c($sp) -/* C9E40C 802404EC 8FB20018 */ lw $s2, 0x18($sp) -/* C9E410 802404F0 8FB10014 */ lw $s1, 0x14($sp) -/* C9E414 802404F4 8FB00010 */ lw $s0, 0x10($sp) -/* C9E418 802404F8 03E00008 */ jr $ra -/* C9E41C 802404FC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_00/func_80240500_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/func_80240500_C9DF20.s deleted file mode 100644 index 20e62e9e01..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/func_80240500_C9DF20.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_C9E420 -/* C9E420 80240500 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C9E424 80240504 AFB40040 */ sw $s4, 0x40($sp) -/* C9E428 80240508 0080A02D */ daddu $s4, $a0, $zero -/* C9E42C 8024050C AFBF0044 */ sw $ra, 0x44($sp) -/* C9E430 80240510 AFB3003C */ sw $s3, 0x3c($sp) -/* C9E434 80240514 AFB20038 */ sw $s2, 0x38($sp) -/* C9E438 80240518 AFB10034 */ sw $s1, 0x34($sp) -/* C9E43C 8024051C AFB00030 */ sw $s0, 0x30($sp) -/* C9E440 80240520 8E910148 */ lw $s1, 0x148($s4) -/* C9E444 80240524 00A0902D */ daddu $s2, $a1, $zero -/* C9E448 80240528 86240008 */ lh $a0, 8($s1) -/* C9E44C 8024052C 0C00EABB */ jal get_npc_unsafe -/* C9E450 80240530 00C0982D */ daddu $s3, $a2, $zero -/* C9E454 80240534 8E430014 */ lw $v1, 0x14($s2) -/* C9E458 80240538 04600031 */ bltz $v1, .L80240600 -/* C9E45C 8024053C 0040802D */ daddu $s0, $v0, $zero -/* C9E460 80240540 0260202D */ daddu $a0, $s3, $zero -/* C9E464 80240544 AFA00010 */ sw $zero, 0x10($sp) -/* C9E468 80240548 8E460024 */ lw $a2, 0x24($s2) -/* C9E46C 8024054C 8E470028 */ lw $a3, 0x28($s2) -/* C9E470 80240550 0C01242D */ jal func_800490B4 -/* C9E474 80240554 0220282D */ daddu $a1, $s1, $zero -/* C9E478 80240558 10400029 */ beqz $v0, .L80240600 -/* C9E47C 8024055C 0000202D */ daddu $a0, $zero, $zero -/* C9E480 80240560 0200282D */ daddu $a1, $s0, $zero -/* C9E484 80240564 0000302D */ daddu $a2, $zero, $zero -/* C9E488 80240568 860300A8 */ lh $v1, 0xa8($s0) -/* C9E48C 8024056C 3C013F80 */ lui $at, 0x3f80 -/* C9E490 80240570 44810000 */ mtc1 $at, $f0 -/* C9E494 80240574 3C014000 */ lui $at, 0x4000 -/* C9E498 80240578 44811000 */ mtc1 $at, $f2 -/* C9E49C 8024057C 3C01C1A0 */ lui $at, 0xc1a0 -/* C9E4A0 80240580 44812000 */ mtc1 $at, $f4 -/* C9E4A4 80240584 2402000F */ addiu $v0, $zero, 0xf -/* C9E4A8 80240588 AFA2001C */ sw $v0, 0x1c($sp) -/* C9E4AC 8024058C 44833000 */ mtc1 $v1, $f6 -/* C9E4B0 80240590 00000000 */ nop -/* C9E4B4 80240594 468031A0 */ cvt.s.w $f6, $f6 -/* C9E4B8 80240598 44073000 */ mfc1 $a3, $f6 -/* C9E4BC 8024059C 27A20028 */ addiu $v0, $sp, 0x28 -/* C9E4C0 802405A0 AFA20020 */ sw $v0, 0x20($sp) -/* C9E4C4 802405A4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C9E4C8 802405A8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C9E4CC 802405AC 0C01BFA4 */ jal fx_emote -/* C9E4D0 802405B0 E7A40018 */ swc1 $f4, 0x18($sp) -/* C9E4D4 802405B4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C9E4D8 802405B8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C9E4DC 802405BC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C9E4E0 802405C0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C9E4E4 802405C4 8C460028 */ lw $a2, 0x28($v0) -/* C9E4E8 802405C8 0C00A720 */ jal atan2 -/* C9E4EC 802405CC 8C470030 */ lw $a3, 0x30($v0) -/* C9E4F0 802405D0 0200202D */ daddu $a0, $s0, $zero -/* C9E4F4 802405D4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C9E4F8 802405D8 3C060020 */ lui $a2, 0x20 -/* C9E4FC 802405DC 0C012530 */ jal func_800494C0 -/* C9E500 802405E0 E480000C */ swc1 $f0, 0xc($a0) -/* C9E504 802405E4 8E220018 */ lw $v0, 0x18($s1) -/* C9E508 802405E8 9442002A */ lhu $v0, 0x2a($v0) -/* C9E50C 802405EC 30420001 */ andi $v0, $v0, 1 -/* C9E510 802405F0 14400029 */ bnez $v0, .L80240698 -/* C9E514 802405F4 2402000A */ addiu $v0, $zero, 0xa -/* C9E518 802405F8 080901A6 */ j .L80240698 -/* C9E51C 802405FC 2402000C */ addiu $v0, $zero, 0xc -.L80240600: -/* C9E520 80240600 8602008C */ lh $v0, 0x8c($s0) -/* C9E524 80240604 14400025 */ bnez $v0, .L8024069C -/* C9E528 80240608 00000000 */ nop -/* C9E52C 8024060C 9602008E */ lhu $v0, 0x8e($s0) -/* C9E530 80240610 2442FFFF */ addiu $v0, $v0, -1 -/* C9E534 80240614 A602008E */ sh $v0, 0x8e($s0) -/* C9E538 80240618 00021400 */ sll $v0, $v0, 0x10 -/* C9E53C 8024061C 1440001F */ bnez $v0, .L8024069C -/* C9E540 80240620 00000000 */ nop -/* C9E544 80240624 8E820074 */ lw $v0, 0x74($s4) -/* C9E548 80240628 2442FFFF */ addiu $v0, $v0, -1 -/* C9E54C 8024062C 10400019 */ beqz $v0, .L80240694 -/* C9E550 80240630 AE820074 */ sw $v0, 0x74($s4) -/* C9E554 80240634 8E220018 */ lw $v0, 0x18($s1) -/* C9E558 80240638 9442002A */ lhu $v0, 0x2a($v0) -/* C9E55C 8024063C 30420010 */ andi $v0, $v0, 0x10 -/* C9E560 80240640 14400007 */ bnez $v0, .L80240660 -/* C9E564 80240644 00000000 */ nop -/* C9E568 80240648 C600000C */ lwc1 $f0, 0xc($s0) -/* C9E56C 8024064C 3C014334 */ lui $at, 0x4334 -/* C9E570 80240650 44816000 */ mtc1 $at, $f12 -/* C9E574 80240654 0C00A6C9 */ jal clamp_angle -/* C9E578 80240658 460C0300 */ add.s $f12, $f0, $f12 -/* C9E57C 8024065C E600000C */ swc1 $f0, 0xc($s0) -.L80240660: -/* C9E580 80240660 8E440008 */ lw $a0, 8($s2) -/* C9E584 80240664 000417C2 */ srl $v0, $a0, 0x1f -/* C9E588 80240668 00822021 */ addu $a0, $a0, $v0 -/* C9E58C 8024066C 00042043 */ sra $a0, $a0, 1 -/* C9E590 80240670 0C00A67F */ jal rand_int -/* C9E594 80240674 24840001 */ addiu $a0, $a0, 1 -/* C9E598 80240678 8E430008 */ lw $v1, 8($s2) -/* C9E59C 8024067C 000327C2 */ srl $a0, $v1, 0x1f -/* C9E5A0 80240680 00641821 */ addu $v1, $v1, $a0 -/* C9E5A4 80240684 00031843 */ sra $v1, $v1, 1 -/* C9E5A8 80240688 00621821 */ addu $v1, $v1, $v0 -/* C9E5AC 8024068C 080901A7 */ j .L8024069C -/* C9E5B0 80240690 A603008E */ sh $v1, 0x8e($s0) -.L80240694: -/* C9E5B4 80240694 24020004 */ addiu $v0, $zero, 4 -.L80240698: -/* C9E5B8 80240698 AE820070 */ sw $v0, 0x70($s4) -.L8024069C: -/* C9E5BC 8024069C 8FBF0044 */ lw $ra, 0x44($sp) -/* C9E5C0 802406A0 8FB40040 */ lw $s4, 0x40($sp) -/* C9E5C4 802406A4 8FB3003C */ lw $s3, 0x3c($sp) -/* C9E5C8 802406A8 8FB20038 */ lw $s2, 0x38($sp) -/* C9E5CC 802406AC 8FB10034 */ lw $s1, 0x34($sp) -/* C9E5D0 802406B0 8FB00030 */ lw $s0, 0x30($sp) -/* C9E5D4 802406B4 03E00008 */ jr $ra -/* C9E5D8 802406B8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_00/func_802406BC_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/func_802406BC_C9DF20.s deleted file mode 100644 index 45b2e9d2a2..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/func_802406BC_C9DF20.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406BC_C9E5DC -/* C9E5DC 802406BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C9E5E0 802406C0 AFB10014 */ sw $s1, 0x14($sp) -/* C9E5E4 802406C4 0080882D */ daddu $s1, $a0, $zero -/* C9E5E8 802406C8 AFBF001C */ sw $ra, 0x1c($sp) -/* C9E5EC 802406CC AFB20018 */ sw $s2, 0x18($sp) -/* C9E5F0 802406D0 AFB00010 */ sw $s0, 0x10($sp) -/* C9E5F4 802406D4 8E300148 */ lw $s0, 0x148($s1) -/* C9E5F8 802406D8 86040008 */ lh $a0, 8($s0) -/* C9E5FC 802406DC 0C00EABB */ jal get_npc_unsafe -/* C9E600 802406E0 00A0902D */ daddu $s2, $a1, $zero -/* C9E604 802406E4 8E230078 */ lw $v1, 0x78($s1) -/* C9E608 802406E8 24630001 */ addiu $v1, $v1, 1 -/* C9E60C 802406EC AE230078 */ sw $v1, 0x78($s1) -/* C9E610 802406F0 8E0400D0 */ lw $a0, 0xd0($s0) -/* C9E614 802406F4 8C840000 */ lw $a0, ($a0) -/* C9E618 802406F8 0064182A */ slt $v1, $v1, $a0 -/* C9E61C 802406FC 14600002 */ bnez $v1, .L80240708 -/* C9E620 80240700 0040282D */ daddu $a1, $v0, $zero -/* C9E624 80240704 AE200078 */ sw $zero, 0x78($s1) -.L80240708: -/* C9E628 80240708 8E0200CC */ lw $v0, 0xcc($s0) -/* C9E62C 8024070C 8C420004 */ lw $v0, 4($v0) -/* C9E630 80240710 ACA20028 */ sw $v0, 0x28($a1) -/* C9E634 80240714 8E0200D0 */ lw $v0, 0xd0($s0) -/* C9E638 80240718 8C42007C */ lw $v0, 0x7c($v0) -/* C9E63C 8024071C 04410004 */ bgez $v0, .L80240730 -/* C9E640 80240720 00000000 */ nop -/* C9E644 80240724 C6400000 */ lwc1 $f0, ($s2) -/* C9E648 80240728 080901D4 */ j .L80240750 -/* C9E64C 8024072C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240730: -/* C9E650 80240730 3C018025 */ lui $at, 0x8025 -/* C9E654 80240734 D42291C8 */ ldc1 $f2, -0x6e38($at) -/* C9E658 80240738 44820000 */ mtc1 $v0, $f0 -/* C9E65C 8024073C 00000000 */ nop -/* C9E660 80240740 46800021 */ cvt.d.w $f0, $f0 -/* C9E664 80240744 46220003 */ div.d $f0, $f0, $f2 -/* C9E668 80240748 46200020 */ cvt.s.d $f0, $f0 -/* C9E66C 8024074C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240750: -/* C9E670 80240750 24020001 */ addiu $v0, $zero, 1 -/* C9E674 80240754 AE220070 */ sw $v0, 0x70($s1) -/* C9E678 80240758 8FBF001C */ lw $ra, 0x1c($sp) -/* C9E67C 8024075C 8FB20018 */ lw $s2, 0x18($sp) -/* C9E680 80240760 8FB10014 */ lw $s1, 0x14($sp) -/* C9E684 80240764 8FB00010 */ lw $s0, 0x10($sp) -/* C9E688 80240768 03E00008 */ jr $ra -/* C9E68C 8024076C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_00/func_80240770_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/func_80240770_C9DF20.s deleted file mode 100644 index 34112785b0..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/func_80240770_C9DF20.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240770_C9E690 -/* C9E690 80240770 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C9E694 80240774 AFB10014 */ sw $s1, 0x14($sp) -/* C9E698 80240778 0080882D */ daddu $s1, $a0, $zero -/* C9E69C 8024077C AFBF0018 */ sw $ra, 0x18($sp) -/* C9E6A0 80240780 AFB00010 */ sw $s0, 0x10($sp) -/* C9E6A4 80240784 8E300148 */ lw $s0, 0x148($s1) -/* C9E6A8 80240788 0C00EABB */ jal get_npc_unsafe -/* C9E6AC 8024078C 86040008 */ lh $a0, 8($s0) -/* C9E6B0 80240790 8E0300CC */ lw $v1, 0xcc($s0) -/* C9E6B4 80240794 3C014120 */ lui $at, 0x4120 -/* C9E6B8 80240798 44812000 */ mtc1 $at, $f4 -/* C9E6BC 8024079C 3C014000 */ lui $at, 0x4000 -/* C9E6C0 802407A0 44810000 */ mtc1 $at, $f0 -/* C9E6C4 802407A4 C442003C */ lwc1 $f2, 0x3c($v0) -/* C9E6C8 802407A8 8C640010 */ lw $a0, 0x10($v1) -/* C9E6CC 802407AC 8C430000 */ lw $v1, ($v0) -/* C9E6D0 802407B0 E444001C */ swc1 $f4, 0x1c($v0) -/* C9E6D4 802407B4 E4400014 */ swc1 $f0, 0x14($v0) -/* C9E6D8 802407B8 E4420064 */ swc1 $f2, 0x64($v0) -/* C9E6DC 802407BC 34630800 */ ori $v1, $v1, 0x800 -/* C9E6E0 802407C0 AC430000 */ sw $v1, ($v0) -/* C9E6E4 802407C4 AC440028 */ sw $a0, 0x28($v0) -/* C9E6E8 802407C8 2402000B */ addiu $v0, $zero, 0xb -/* C9E6EC 802407CC AE220070 */ sw $v0, 0x70($s1) -/* C9E6F0 802407D0 8FBF0018 */ lw $ra, 0x18($sp) -/* C9E6F4 802407D4 8FB10014 */ lw $s1, 0x14($sp) -/* C9E6F8 802407D8 8FB00010 */ lw $s0, 0x10($sp) -/* C9E6FC 802407DC 03E00008 */ jr $ra -/* C9E700 802407E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_00/func_8024085C_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/func_8024085C_C9DF20.s deleted file mode 100644 index f2a5e50174..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/func_8024085C_C9DF20.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024085C_C9E77C -/* C9E77C 8024085C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C9E780 80240860 AFB3001C */ sw $s3, 0x1c($sp) -/* C9E784 80240864 0080982D */ daddu $s3, $a0, $zero -/* C9E788 80240868 AFBF0020 */ sw $ra, 0x20($sp) -/* C9E78C 8024086C AFB20018 */ sw $s2, 0x18($sp) -/* C9E790 80240870 AFB10014 */ sw $s1, 0x14($sp) -/* C9E794 80240874 AFB00010 */ sw $s0, 0x10($sp) -/* C9E798 80240878 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C9E79C 8024087C 8E710148 */ lw $s1, 0x148($s3) -/* C9E7A0 80240880 86240008 */ lh $a0, 8($s1) -/* C9E7A4 80240884 0C00EABB */ jal get_npc_unsafe -/* C9E7A8 80240888 00A0802D */ daddu $s0, $a1, $zero -/* C9E7AC 8024088C 8E040020 */ lw $a0, 0x20($s0) -/* C9E7B0 80240890 0040902D */ daddu $s2, $v0, $zero -/* C9E7B4 80240894 00041FC2 */ srl $v1, $a0, 0x1f -/* C9E7B8 80240898 00832021 */ addu $a0, $a0, $v1 -/* C9E7BC 8024089C 00042043 */ sra $a0, $a0, 1 -/* C9E7C0 802408A0 0C00A67F */ jal rand_int -/* C9E7C4 802408A4 24840001 */ addiu $a0, $a0, 1 -/* C9E7C8 802408A8 8E030020 */ lw $v1, 0x20($s0) -/* C9E7CC 802408AC C64C0038 */ lwc1 $f12, 0x38($s2) -/* C9E7D0 802408B0 000327C2 */ srl $a0, $v1, 0x1f -/* C9E7D4 802408B4 00641821 */ addu $v1, $v1, $a0 -/* C9E7D8 802408B8 00031843 */ sra $v1, $v1, 1 -/* C9E7DC 802408BC 00621821 */ addu $v1, $v1, $v0 -/* C9E7E0 802408C0 A643008E */ sh $v1, 0x8e($s2) -/* C9E7E4 802408C4 8E2200CC */ lw $v0, 0xcc($s1) -/* C9E7E8 802408C8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C9E7EC 802408CC 8C42000C */ lw $v0, 0xc($v0) -/* C9E7F0 802408D0 AE420028 */ sw $v0, 0x28($s2) -/* C9E7F4 802408D4 C6000018 */ lwc1 $f0, 0x18($s0) -/* C9E7F8 802408D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C9E7FC 802408DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C9E800 802408E0 E6400018 */ swc1 $f0, 0x18($s2) -/* C9E804 802408E4 8C460028 */ lw $a2, 0x28($v0) -/* C9E808 802408E8 0C00A720 */ jal atan2 -/* C9E80C 802408EC 8C470030 */ lw $a3, 0x30($v0) -/* C9E810 802408F0 46000506 */ mov.s $f20, $f0 -/* C9E814 802408F4 C64C000C */ lwc1 $f12, 0xc($s2) -/* C9E818 802408F8 0C00A70A */ jal get_clamped_angle_diff -/* C9E81C 802408FC 4600A386 */ mov.s $f14, $f20 -/* C9E820 80240900 46000086 */ mov.s $f2, $f0 -/* C9E824 80240904 8E02001C */ lw $v0, 0x1c($s0) -/* C9E828 80240908 46001005 */ abs.s $f0, $f2 -/* C9E82C 8024090C 44822000 */ mtc1 $v0, $f4 -/* C9E830 80240910 00000000 */ nop -/* C9E834 80240914 46802120 */ cvt.s.w $f4, $f4 -/* C9E838 80240918 4600203C */ c.lt.s $f4, $f0 -/* C9E83C 8024091C 00000000 */ nop -/* C9E840 80240920 4500000D */ bc1f .L80240958 -/* C9E844 80240924 00000000 */ nop -/* C9E848 80240928 44800000 */ mtc1 $zero, $f0 -/* C9E84C 8024092C C654000C */ lwc1 $f20, 0xc($s2) -/* C9E850 80240930 4600103C */ c.lt.s $f2, $f0 -/* C9E854 80240934 00000000 */ nop -/* C9E858 80240938 45000006 */ bc1f .L80240954 -/* C9E85C 8024093C 00021023 */ negu $v0, $v0 -/* C9E860 80240940 44820000 */ mtc1 $v0, $f0 -/* C9E864 80240944 00000000 */ nop -/* C9E868 80240948 46800020 */ cvt.s.w $f0, $f0 -/* C9E86C 8024094C 08090256 */ j .L80240958 -/* C9E870 80240950 4600A500 */ add.s $f20, $f20, $f0 -.L80240954: -/* C9E874 80240954 4604A500 */ add.s $f20, $f20, $f4 -.L80240958: -/* C9E878 80240958 0C00A6C9 */ jal clamp_angle -/* C9E87C 8024095C 4600A306 */ mov.s $f12, $f20 -/* C9E880 80240960 2402000D */ addiu $v0, $zero, 0xd -/* C9E884 80240964 E640000C */ swc1 $f0, 0xc($s2) -/* C9E888 80240968 AE620070 */ sw $v0, 0x70($s3) -/* C9E88C 8024096C 8FBF0020 */ lw $ra, 0x20($sp) -/* C9E890 80240970 8FB3001C */ lw $s3, 0x1c($sp) -/* C9E894 80240974 8FB20018 */ lw $s2, 0x18($sp) -/* C9E898 80240978 8FB10014 */ lw $s1, 0x14($sp) -/* C9E89C 8024097C 8FB00010 */ lw $s0, 0x10($sp) -/* C9E8A0 80240980 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C9E8A4 80240984 03E00008 */ jr $ra -/* C9E8A8 80240988 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_flo/flo_00/func_80240AAC_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/func_80240AAC_C9DF20.s deleted file mode 100644 index 852a15f512..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/func_80240AAC_C9DF20.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AAC_C9E9CC -/* C9E9CC 80240AAC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C9E9D0 80240AB0 AFB10014 */ sw $s1, 0x14($sp) -/* C9E9D4 80240AB4 0080882D */ daddu $s1, $a0, $zero -/* C9E9D8 80240AB8 AFBF0018 */ sw $ra, 0x18($sp) -/* C9E9DC 80240ABC AFB00010 */ sw $s0, 0x10($sp) -/* C9E9E0 80240AC0 8E300148 */ lw $s0, 0x148($s1) -/* C9E9E4 80240AC4 0C00EABB */ jal get_npc_unsafe -/* C9E9E8 80240AC8 86040008 */ lh $a0, 8($s0) -/* C9E9EC 80240ACC 9443008E */ lhu $v1, 0x8e($v0) -/* C9E9F0 80240AD0 2463FFFF */ addiu $v1, $v1, -1 -/* C9E9F4 80240AD4 A443008E */ sh $v1, 0x8e($v0) -/* C9E9F8 80240AD8 00031C00 */ sll $v1, $v1, 0x10 -/* C9E9FC 80240ADC 14600008 */ bnez $v1, .L80240B00 -/* C9EA00 80240AE0 00000000 */ nop -/* C9EA04 80240AE4 8E0200B0 */ lw $v0, 0xb0($s0) -/* C9EA08 80240AE8 30420080 */ andi $v0, $v0, 0x80 -/* C9EA0C 80240AEC 10400003 */ beqz $v0, .L80240AFC -/* C9EA10 80240AF0 2402000F */ addiu $v0, $zero, 0xf -/* C9EA14 80240AF4 080902C0 */ j .L80240B00 -/* C9EA18 80240AF8 AE220070 */ sw $v0, 0x70($s1) -.L80240AFC: -/* C9EA1C 80240AFC AE200070 */ sw $zero, 0x70($s1) -.L80240B00: -/* C9EA20 80240B00 8FBF0018 */ lw $ra, 0x18($sp) -/* C9EA24 80240B04 8FB10014 */ lw $s1, 0x14($sp) -/* C9EA28 80240B08 8FB00010 */ lw $s0, 0x10($sp) -/* C9EA2C 80240B0C 03E00008 */ jr $ra -/* C9EA30 80240B10 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_00/func_80240B14_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/func_80240B14_C9DF20.s deleted file mode 100644 index 106876158f..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/func_80240B14_C9DF20.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B14_C9EA34 -/* C9EA34 80240B14 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C9EA38 80240B18 AFB10014 */ sw $s1, 0x14($sp) -/* C9EA3C 80240B1C 0080882D */ daddu $s1, $a0, $zero -/* C9EA40 80240B20 AFBF001C */ sw $ra, 0x1c($sp) -/* C9EA44 80240B24 AFB20018 */ sw $s2, 0x18($sp) -/* C9EA48 80240B28 AFB00010 */ sw $s0, 0x10($sp) -/* C9EA4C 80240B2C 8E300148 */ lw $s0, 0x148($s1) -/* C9EA50 80240B30 86040008 */ lh $a0, 8($s0) -/* C9EA54 80240B34 0C00EABB */ jal get_npc_unsafe -/* C9EA58 80240B38 00A0902D */ daddu $s2, $a1, $zero -/* C9EA5C 80240B3C 8E0300D0 */ lw $v1, 0xd0($s0) -/* C9EA60 80240B40 8E240078 */ lw $a0, 0x78($s1) -/* C9EA64 80240B44 8C630000 */ lw $v1, ($v1) -/* C9EA68 80240B48 0083182A */ slt $v1, $a0, $v1 -/* C9EA6C 80240B4C 10600013 */ beqz $v1, .L80240B9C -/* C9EA70 80240B50 0040302D */ daddu $a2, $v0, $zero -/* C9EA74 80240B54 00041040 */ sll $v0, $a0, 1 -/* C9EA78 80240B58 00441021 */ addu $v0, $v0, $a0 -/* C9EA7C 80240B5C 00022880 */ sll $a1, $v0, 2 -.L80240B60: -/* C9EA80 80240B60 8E0300D0 */ lw $v1, 0xd0($s0) -/* C9EA84 80240B64 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* C9EA88 80240B68 00A31021 */ addu $v0, $a1, $v1 -/* C9EA8C 80240B6C C4400008 */ lwc1 $f0, 8($v0) -/* C9EA90 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* C9EA94 80240B74 4602003E */ c.le.s $f0, $f2 -/* C9EA98 80240B78 00000000 */ nop -/* C9EA9C 80240B7C 45020003 */ bc1fl .L80240B8C -/* C9EAA0 80240B80 24840001 */ addiu $a0, $a0, 1 -/* C9EAA4 80240B84 080902E7 */ j .L80240B9C -/* C9EAA8 80240B88 AE240078 */ sw $a0, 0x78($s1) -.L80240B8C: -/* C9EAAC 80240B8C 8C620000 */ lw $v0, ($v1) -/* C9EAB0 80240B90 0082102A */ slt $v0, $a0, $v0 -/* C9EAB4 80240B94 1440FFF2 */ bnez $v0, .L80240B60 -/* C9EAB8 80240B98 24A5000C */ addiu $a1, $a1, 0xc -.L80240B9C: -/* C9EABC 80240B9C C6400000 */ lwc1 $f0, ($s2) -/* C9EAC0 80240BA0 E4C00018 */ swc1 $f0, 0x18($a2) -/* C9EAC4 80240BA4 8E0200CC */ lw $v0, 0xcc($s0) -/* C9EAC8 80240BA8 8C420004 */ lw $v0, 4($v0) -/* C9EACC 80240BAC ACC20028 */ sw $v0, 0x28($a2) -/* C9EAD0 80240BB0 24020001 */ addiu $v0, $zero, 1 -/* C9EAD4 80240BB4 AE200074 */ sw $zero, 0x74($s1) -/* C9EAD8 80240BB8 AE220070 */ sw $v0, 0x70($s1) -/* C9EADC 80240BBC 8FBF001C */ lw $ra, 0x1c($sp) -/* C9EAE0 80240BC0 8FB20018 */ lw $s2, 0x18($sp) -/* C9EAE4 80240BC4 8FB10014 */ lw $s1, 0x14($sp) -/* C9EAE8 80240BC8 8FB00010 */ lw $s0, 0x10($sp) -/* C9EAEC 80240BCC 03E00008 */ jr $ra -/* C9EAF0 80240BD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_00/func_80240BD4_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/func_80240BD4_C9DF20.s deleted file mode 100644 index 58372ec2cb..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/func_80240BD4_C9DF20.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BD4_C9EAF4 -/* C9EAF4 80240BD4 27BDFF98 */ addiu $sp, $sp, -0x68 -/* C9EAF8 80240BD8 AFB40058 */ sw $s4, 0x58($sp) -/* C9EAFC 80240BDC 0080A02D */ daddu $s4, $a0, $zero -/* C9EB00 80240BE0 AFBF0060 */ sw $ra, 0x60($sp) -/* C9EB04 80240BE4 AFB5005C */ sw $s5, 0x5c($sp) -/* C9EB08 80240BE8 AFB30054 */ sw $s3, 0x54($sp) -/* C9EB0C 80240BEC AFB20050 */ sw $s2, 0x50($sp) -/* C9EB10 80240BF0 AFB1004C */ sw $s1, 0x4c($sp) -/* C9EB14 80240BF4 AFB00048 */ sw $s0, 0x48($sp) -/* C9EB18 80240BF8 8E910148 */ lw $s1, 0x148($s4) -/* C9EB1C 80240BFC 86240008 */ lh $a0, 8($s1) -/* C9EB20 80240C00 0C00EABB */ jal get_npc_unsafe -/* C9EB24 80240C04 00A0802D */ daddu $s0, $a1, $zero -/* C9EB28 80240C08 8E83000C */ lw $v1, 0xc($s4) -/* C9EB2C 80240C0C 0280202D */ daddu $a0, $s4, $zero -/* C9EB30 80240C10 8C650000 */ lw $a1, ($v1) -/* C9EB34 80240C14 0C0B1EAF */ jal get_variable -/* C9EB38 80240C18 0040902D */ daddu $s2, $v0, $zero -/* C9EB3C 80240C1C AFA00018 */ sw $zero, 0x18($sp) -/* C9EB40 80240C20 8E2300D0 */ lw $v1, 0xd0($s1) -/* C9EB44 80240C24 8C630094 */ lw $v1, 0x94($v1) -/* C9EB48 80240C28 AFA3001C */ sw $v1, 0x1c($sp) -/* C9EB4C 80240C2C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C9EB50 80240C30 8C630080 */ lw $v1, 0x80($v1) -/* C9EB54 80240C34 AFA30020 */ sw $v1, 0x20($sp) -/* C9EB58 80240C38 8E2300D0 */ lw $v1, 0xd0($s1) -/* C9EB5C 80240C3C 8C630088 */ lw $v1, 0x88($v1) -/* C9EB60 80240C40 AFA30024 */ sw $v1, 0x24($sp) -/* C9EB64 80240C44 8E2300D0 */ lw $v1, 0xd0($s1) -/* C9EB68 80240C48 8C63008C */ lw $v1, 0x8c($v1) -/* C9EB6C 80240C4C 27B50018 */ addiu $s5, $sp, 0x18 -/* C9EB70 80240C50 AFA30028 */ sw $v1, 0x28($sp) -/* C9EB74 80240C54 8E2300D0 */ lw $v1, 0xd0($s1) -/* C9EB78 80240C58 3C014282 */ lui $at, 0x4282 -/* C9EB7C 80240C5C 44810000 */ mtc1 $at, $f0 -/* C9EB80 80240C60 8C630090 */ lw $v1, 0x90($v1) -/* C9EB84 80240C64 0040982D */ daddu $s3, $v0, $zero -/* C9EB88 80240C68 E7A00030 */ swc1 $f0, 0x30($sp) -/* C9EB8C 80240C6C A7A00034 */ sh $zero, 0x34($sp) -/* C9EB90 80240C70 16000005 */ bnez $s0, .L80240C88 -/* C9EB94 80240C74 AFA3002C */ sw $v1, 0x2c($sp) -/* C9EB98 80240C78 8E2200B0 */ lw $v0, 0xb0($s1) -/* C9EB9C 80240C7C 30420004 */ andi $v0, $v0, 4 -/* C9EBA0 80240C80 10400044 */ beqz $v0, .L80240D94 -/* C9EBA4 80240C84 00000000 */ nop -.L80240C88: -/* C9EBA8 80240C88 2404F7FF */ addiu $a0, $zero, -0x801 -/* C9EBAC 80240C8C AE800070 */ sw $zero, 0x70($s4) -/* C9EBB0 80240C90 A640008E */ sh $zero, 0x8e($s2) -/* C9EBB4 80240C94 8E2200CC */ lw $v0, 0xcc($s1) -/* C9EBB8 80240C98 8E430000 */ lw $v1, ($s2) -/* C9EBBC 80240C9C 8C420000 */ lw $v0, ($v0) -/* C9EBC0 80240CA0 00641824 */ and $v1, $v1, $a0 -/* C9EBC4 80240CA4 AE430000 */ sw $v1, ($s2) -/* C9EBC8 80240CA8 AE420028 */ sw $v0, 0x28($s2) -/* C9EBCC 80240CAC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C9EBD0 80240CB0 8C420098 */ lw $v0, 0x98($v0) -/* C9EBD4 80240CB4 54400005 */ bnel $v0, $zero, .L80240CCC -/* C9EBD8 80240CB8 2402FDFF */ addiu $v0, $zero, -0x201 -/* C9EBDC 80240CBC 34620200 */ ori $v0, $v1, 0x200 -/* C9EBE0 80240CC0 2403FFF7 */ addiu $v1, $zero, -9 -/* C9EBE4 80240CC4 08090335 */ j .L80240CD4 -/* C9EBE8 80240CC8 00431024 */ and $v0, $v0, $v1 -.L80240CCC: -/* C9EBEC 80240CCC 00621024 */ and $v0, $v1, $v0 -/* C9EBF0 80240CD0 34420008 */ ori $v0, $v0, 8 -.L80240CD4: -/* C9EBF4 80240CD4 AE420000 */ sw $v0, ($s2) -/* C9EBF8 80240CD8 8E2200B0 */ lw $v0, 0xb0($s1) -/* C9EBFC 80240CDC 30420004 */ andi $v0, $v0, 4 -/* C9EC00 80240CE0 10400008 */ beqz $v0, .L80240D04 -/* C9EC04 80240CE4 24020063 */ addiu $v0, $zero, 0x63 -/* C9EC08 80240CE8 AE820070 */ sw $v0, 0x70($s4) -/* C9EC0C 80240CEC AE800074 */ sw $zero, 0x74($s4) -/* C9EC10 80240CF0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C9EC14 80240CF4 2403FFFB */ addiu $v1, $zero, -5 -/* C9EC18 80240CF8 00431024 */ and $v0, $v0, $v1 -/* C9EC1C 80240CFC 0809034C */ j .L80240D30 -/* C9EC20 80240D00 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240D04: -/* C9EC24 80240D04 8E220000 */ lw $v0, ($s1) -/* C9EC28 80240D08 3C034000 */ lui $v1, 0x4000 -/* C9EC2C 80240D0C 00431024 */ and $v0, $v0, $v1 -/* C9EC30 80240D10 10400007 */ beqz $v0, .L80240D30 -/* C9EC34 80240D14 3C03BFFF */ lui $v1, 0xbfff -/* C9EC38 80240D18 2402000C */ addiu $v0, $zero, 0xc -/* C9EC3C 80240D1C AE820070 */ sw $v0, 0x70($s4) -/* C9EC40 80240D20 8E220000 */ lw $v0, ($s1) -/* C9EC44 80240D24 3463FFFF */ ori $v1, $v1, 0xffff -/* C9EC48 80240D28 00431024 */ and $v0, $v0, $v1 -/* C9EC4C 80240D2C AE220000 */ sw $v0, ($s1) -.L80240D30: -/* C9EC50 80240D30 27A50038 */ addiu $a1, $sp, 0x38 -/* C9EC54 80240D34 27A6003C */ addiu $a2, $sp, 0x3c -/* C9EC58 80240D38 C6400038 */ lwc1 $f0, 0x38($s2) -/* C9EC5C 80240D3C 864200A8 */ lh $v0, 0xa8($s2) -/* C9EC60 80240D40 3C0142C8 */ lui $at, 0x42c8 -/* C9EC64 80240D44 44812000 */ mtc1 $at, $f4 -/* C9EC68 80240D48 44823000 */ mtc1 $v0, $f6 -/* C9EC6C 80240D4C 00000000 */ nop -/* C9EC70 80240D50 468031A0 */ cvt.s.w $f6, $f6 -/* C9EC74 80240D54 27A20044 */ addiu $v0, $sp, 0x44 -/* C9EC78 80240D58 E7A00038 */ swc1 $f0, 0x38($sp) -/* C9EC7C 80240D5C C640003C */ lwc1 $f0, 0x3c($s2) -/* C9EC80 80240D60 C6420040 */ lwc1 $f2, 0x40($s2) -/* C9EC84 80240D64 46060000 */ add.s $f0, $f0, $f6 -/* C9EC88 80240D68 E7A40044 */ swc1 $f4, 0x44($sp) -/* C9EC8C 80240D6C E7A20040 */ swc1 $f2, 0x40($sp) -/* C9EC90 80240D70 E7A0003C */ swc1 $f0, 0x3c($sp) -/* C9EC94 80240D74 AFA20010 */ sw $v0, 0x10($sp) -/* C9EC98 80240D78 8E440080 */ lw $a0, 0x80($s2) -/* C9EC9C 80240D7C 0C0372DF */ jal func_800DCB7C -/* C9ECA0 80240D80 27A70040 */ addiu $a3, $sp, 0x40 -/* C9ECA4 80240D84 10400003 */ beqz $v0, .L80240D94 -/* C9ECA8 80240D88 00000000 */ nop -/* C9ECAC 80240D8C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* C9ECB0 80240D90 E640003C */ swc1 $f0, 0x3c($s2) -.L80240D94: -/* C9ECB4 80240D94 8E830070 */ lw $v1, 0x70($s4) -/* C9ECB8 80240D98 2C620064 */ sltiu $v0, $v1, 0x64 -/* C9ECBC 80240D9C 10400042 */ beqz $v0, .L80240EA8 -/* C9ECC0 80240DA0 00031080 */ sll $v0, $v1, 2 -/* C9ECC4 80240DA4 3C018025 */ lui $at, 0x8025 -/* C9ECC8 80240DA8 00220821 */ addu $at, $at, $v0 -/* C9ECCC 80240DAC 8C2291D0 */ lw $v0, -0x6e30($at) -/* C9ECD0 80240DB0 00400008 */ jr $v0 -/* C9ECD4 80240DB4 00000000 */ nop -/* C9ECD8 80240DB8 0280202D */ daddu $a0, $s4, $zero -/* C9ECDC 80240DBC 0260282D */ daddu $a1, $s3, $zero -/* C9ECE0 80240DC0 0C090010 */ jal func_80240040 -/* C9ECE4 80240DC4 02A0302D */ daddu $a2, $s5, $zero -/* C9ECE8 80240DC8 0280202D */ daddu $a0, $s4, $zero -/* C9ECEC 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* C9ECF0 80240DD0 0C090066 */ jal func_80240198 -/* C9ECF4 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* C9ECF8 80240DD8 080903AA */ j .L80240EA8 -/* C9ECFC 80240DDC 00000000 */ nop -/* C9ED00 80240DE0 0280202D */ daddu $a0, $s4, $zero -/* C9ED04 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* C9ED08 80240DE8 0C090110 */ jal func_80240440 -/* C9ED0C 80240DEC 02A0302D */ daddu $a2, $s5, $zero -/* C9ED10 80240DF0 0280202D */ daddu $a0, $s4, $zero -/* C9ED14 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* C9ED18 80240DF8 0C090140 */ jal func_80240500 -/* C9ED1C 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* C9ED20 80240E00 080903AA */ j .L80240EA8 -/* C9ED24 80240E04 00000000 */ nop -/* C9ED28 80240E08 0280202D */ daddu $a0, $s4, $zero -/* C9ED2C 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* C9ED30 80240E10 0C0901AF */ jal func_802406BC -/* C9ED34 80240E14 02A0302D */ daddu $a2, $s5, $zero -/* C9ED38 80240E18 080903AA */ j .L80240EA8 -/* C9ED3C 80240E1C 00000000 */ nop -/* C9ED40 80240E20 0280202D */ daddu $a0, $s4, $zero -/* C9ED44 80240E24 0260282D */ daddu $a1, $s3, $zero -/* C9ED48 80240E28 0C0901DC */ jal func_80240770 -/* C9ED4C 80240E2C 02A0302D */ daddu $a2, $s5, $zero -/* C9ED50 80240E30 0280202D */ daddu $a0, $s4, $zero -/* C9ED54 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C9ED58 80240E38 0C0901F9 */ jal func_802407E4 -/* C9ED5C 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* C9ED60 80240E40 080903AA */ j .L80240EA8 -/* C9ED64 80240E44 00000000 */ nop -/* C9ED68 80240E48 0280202D */ daddu $a0, $s4, $zero -/* C9ED6C 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* C9ED70 80240E50 0C090217 */ jal func_8024085C -/* C9ED74 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* C9ED78 80240E58 0280202D */ daddu $a0, $s4, $zero -/* C9ED7C 80240E5C 0260282D */ daddu $a1, $s3, $zero -/* C9ED80 80240E60 0C090263 */ jal func_8024098C -/* C9ED84 80240E64 02A0302D */ daddu $a2, $s5, $zero -/* C9ED88 80240E68 080903AA */ j .L80240EA8 -/* C9ED8C 80240E6C 00000000 */ nop -/* C9ED90 80240E70 0280202D */ daddu $a0, $s4, $zero -/* C9ED94 80240E74 0260282D */ daddu $a1, $s3, $zero -/* C9ED98 80240E78 0C0902AB */ jal func_80240AAC -/* C9ED9C 80240E7C 02A0302D */ daddu $a2, $s5, $zero -/* C9EDA0 80240E80 080903AA */ j .L80240EA8 -/* C9EDA4 80240E84 00000000 */ nop -/* C9EDA8 80240E88 0280202D */ daddu $a0, $s4, $zero -/* C9EDAC 80240E8C 0260282D */ daddu $a1, $s3, $zero -/* C9EDB0 80240E90 0C0902C5 */ jal func_80240B14 -/* C9EDB4 80240E94 02A0302D */ daddu $a2, $s5, $zero -/* C9EDB8 80240E98 080903AA */ j .L80240EA8 -/* C9EDBC 80240E9C 00000000 */ nop -/* C9EDC0 80240EA0 0C0129CF */ jal func_8004A73C -/* C9EDC4 80240EA4 0280202D */ daddu $a0, $s4, $zero -.L80240EA8: -/* C9EDC8 80240EA8 8FBF0060 */ lw $ra, 0x60($sp) -/* C9EDCC 80240EAC 8FB5005C */ lw $s5, 0x5c($sp) -/* C9EDD0 80240EB0 8FB40058 */ lw $s4, 0x58($sp) -/* C9EDD4 80240EB4 8FB30054 */ lw $s3, 0x54($sp) -/* C9EDD8 80240EB8 8FB20050 */ lw $s2, 0x50($sp) -/* C9EDDC 80240EBC 8FB1004C */ lw $s1, 0x4c($sp) -/* C9EDE0 80240EC0 8FB00048 */ lw $s0, 0x48($sp) -/* C9EDE4 80240EC4 0000102D */ daddu $v0, $zero, $zero -/* C9EDE8 80240EC8 03E00008 */ jr $ra -/* C9EDEC 80240ECC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_flo/flo_00/func_80240ED0_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/func_80240ED0_C9DF20.s deleted file mode 100644 index 28b154b8a4..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/func_80240ED0_C9DF20.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ED0_C9EDF0 -/* C9EDF0 80240ED0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9EDF4 80240ED4 AFBF0010 */ sw $ra, 0x10($sp) -/* C9EDF8 80240ED8 0C03A876 */ jal set_max_SP -/* C9EDFC 80240EDC 24040006 */ addiu $a0, $zero, 6 -/* C9EE00 80240EE0 3C028011 */ lui $v0, %hi(gPlayerData) -/* C9EE04 80240EE4 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* C9EE08 80240EE8 90430003 */ lbu $v1, 3($v0) -/* C9EE0C 80240EEC 90440006 */ lbu $a0, 6($v0) -/* C9EE10 80240EF0 A0430002 */ sb $v1, 2($v0) -/* C9EE14 80240EF4 0C03A6DB */ jal sync_status_menu -/* C9EE18 80240EF8 A0440005 */ sb $a0, 5($v0) -/* C9EE1C 80240EFC 8FBF0010 */ lw $ra, 0x10($sp) -/* C9EE20 80240F00 24020002 */ addiu $v0, $zero, 2 -/* C9EE24 80240F04 03E00008 */ jr $ra -/* C9EE28 80240F08 27BD0018 */ addiu $sp, $sp, 0x18 -/* C9EE2C 80240F0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_00/func_80240F10_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/func_80240F10_C9DF20.s deleted file mode 100644 index e1c9689626..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/func_80240F10_C9DF20.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F10_C9EE30 -/* C9EE30 80240F10 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C9EE34 80240F14 AFB00010 */ sw $s0, 0x10($sp) -/* C9EE38 80240F18 0080802D */ daddu $s0, $a0, $zero -/* C9EE3C 80240F1C AFB20018 */ sw $s2, 0x18($sp) -/* C9EE40 80240F20 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* C9EE44 80240F24 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* C9EE48 80240F28 AFBF001C */ sw $ra, 0x1c($sp) -/* C9EE4C 80240F2C AFB10014 */ sw $s1, 0x14($sp) -/* C9EE50 80240F30 C64000A8 */ lwc1 $f0, 0xa8($s2) -/* C9EE54 80240F34 8E02000C */ lw $v0, 0xc($s0) -/* C9EE58 80240F38 4600008D */ trunc.w.s $f2, $f0 -/* C9EE5C 80240F3C 44061000 */ mfc1 $a2, $f2 -/* C9EE60 80240F40 8C450000 */ lw $a1, ($v0) -/* C9EE64 80240F44 0C0B2026 */ jal set_variable -/* C9EE68 80240F48 8C510004 */ lw $s1, 4($v0) -/* C9EE6C 80240F4C 0200202D */ daddu $a0, $s0, $zero -/* C9EE70 80240F50 C6400080 */ lwc1 $f0, 0x80($s2) -/* C9EE74 80240F54 4600008D */ trunc.w.s $f2, $f0 -/* C9EE78 80240F58 44061000 */ mfc1 $a2, $f2 -/* C9EE7C 80240F5C 0C0B2026 */ jal set_variable -/* C9EE80 80240F60 0220282D */ daddu $a1, $s1, $zero -/* C9EE84 80240F64 8FBF001C */ lw $ra, 0x1c($sp) -/* C9EE88 80240F68 8FB20018 */ lw $s2, 0x18($sp) -/* C9EE8C 80240F6C 8FB10014 */ lw $s1, 0x14($sp) -/* C9EE90 80240F70 8FB00010 */ lw $s0, 0x10($sp) -/* C9EE94 80240F74 24020002 */ addiu $v0, $zero, 2 -/* C9EE98 80240F78 03E00008 */ jr $ra -/* C9EE9C 80240F7C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_00/func_80240F80_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/func_80240F80_C9DF20.s deleted file mode 100644 index ef0dec8934..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/func_80240F80_C9DF20.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F80_C9EEA0 -/* C9EEA0 80240F80 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C9EEA4 80240F84 AFB00010 */ sw $s0, 0x10($sp) -/* C9EEA8 80240F88 0080802D */ daddu $s0, $a0, $zero -/* C9EEAC 80240F8C AFBF0018 */ sw $ra, 0x18($sp) -/* C9EEB0 80240F90 AFB10014 */ sw $s1, 0x14($sp) -/* C9EEB4 80240F94 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* C9EEB8 80240F98 F7B80030 */ sdc1 $f24, 0x30($sp) -/* C9EEBC 80240F9C F7B60028 */ sdc1 $f22, 0x28($sp) -/* C9EEC0 80240FA0 F7B40020 */ sdc1 $f20, 0x20($sp) -/* C9EEC4 80240FA4 8E05008C */ lw $a1, 0x8c($s0) -/* C9EEC8 80240FA8 0C0B1EAF */ jal get_variable -/* C9EECC 80240FAC 0000202D */ daddu $a0, $zero, $zero -/* C9EED0 80240FB0 C60200A8 */ lwc1 $f2, 0xa8($s0) -/* C9EED4 80240FB4 468010A0 */ cvt.s.w $f2, $f2 -/* C9EED8 80240FB8 44061000 */ mfc1 $a2, $f2 -/* C9EEDC 80240FBC C60200B0 */ lwc1 $f2, 0xb0($s0) -/* C9EEE0 80240FC0 468010A0 */ cvt.s.w $f2, $f2 -/* C9EEE4 80240FC4 4482A000 */ mtc1 $v0, $f20 -/* C9EEE8 80240FC8 00000000 */ nop -/* C9EEEC 80240FCC 4680A520 */ cvt.s.w $f20, $f20 -/* C9EEF0 80240FD0 3C01C2A6 */ lui $at, 0xc2a6 -/* C9EEF4 80240FD4 4481C000 */ mtc1 $at, $f24 -/* C9EEF8 80240FD8 3C0142AE */ lui $at, 0x42ae -/* C9EEFC 80240FDC 4481D000 */ mtc1 $at, $f26 -/* C9EF00 80240FE0 44071000 */ mfc1 $a3, $f2 -/* C9EF04 80240FE4 4600C306 */ mov.s $f12, $f24 -/* C9EF08 80240FE8 0C00A7B5 */ jal dist2D -/* C9EF0C 80240FEC 4600D386 */ mov.s $f14, $f26 -/* C9EF10 80240FF0 4600C306 */ mov.s $f12, $f24 -/* C9EF14 80240FF4 4600D386 */ mov.s $f14, $f26 -/* C9EF18 80240FF8 C60200A8 */ lwc1 $f2, 0xa8($s0) -/* C9EF1C 80240FFC 468010A0 */ cvt.s.w $f2, $f2 -/* C9EF20 80241000 44061000 */ mfc1 $a2, $f2 -/* C9EF24 80241004 C60200B0 */ lwc1 $f2, 0xb0($s0) -/* C9EF28 80241008 468010A0 */ cvt.s.w $f2, $f2 -/* C9EF2C 8024100C 44071000 */ mfc1 $a3, $f2 -/* C9EF30 80241010 0C00A720 */ jal atan2 -/* C9EF34 80241014 46000586 */ mov.s $f22, $f0 -/* C9EF38 80241018 0C00A6C9 */ jal clamp_angle -/* C9EF3C 8024101C 46140301 */ sub.s $f12, $f0, $f20 -/* C9EF40 80241020 46000506 */ mov.s $f20, $f0 -/* C9EF44 80241024 0C00A8BB */ jal sin_deg -/* C9EF48 80241028 4600A306 */ mov.s $f12, $f20 -/* C9EF4C 8024102C 4600B002 */ mul.s $f0, $f22, $f0 -/* C9EF50 80241030 00000000 */ nop -/* C9EF54 80241034 46180000 */ add.s $f0, $f0, $f24 -/* C9EF58 80241038 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* C9EF5C 8024103C 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* C9EF60 80241040 E6200028 */ swc1 $f0, 0x28($s1) -/* C9EF64 80241044 8E0500AC */ lw $a1, 0xac($s0) -/* C9EF68 80241048 0C0B1EAF */ jal get_variable -/* C9EF6C 8024104C 0000202D */ daddu $a0, $zero, $zero -/* C9EF70 80241050 0000202D */ daddu $a0, $zero, $zero -/* C9EF74 80241054 8E050090 */ lw $a1, 0x90($s0) -/* C9EF78 80241058 0C0B1EAF */ jal get_variable -/* C9EF7C 8024105C 0040802D */ daddu $s0, $v0, $zero -/* C9EF80 80241060 4600A306 */ mov.s $f12, $f20 -/* C9EF84 80241064 02028021 */ addu $s0, $s0, $v0 -/* C9EF88 80241068 44900000 */ mtc1 $s0, $f0 -/* C9EF8C 8024106C 00000000 */ nop -/* C9EF90 80241070 46800020 */ cvt.s.w $f0, $f0 -/* C9EF94 80241074 0C00A8D4 */ jal cos_deg -/* C9EF98 80241078 E620002C */ swc1 $f0, 0x2c($s1) -/* C9EF9C 8024107C 4600B582 */ mul.s $f22, $f22, $f0 -/* C9EFA0 80241080 00000000 */ nop -/* C9EFA4 80241084 4616D681 */ sub.s $f26, $f26, $f22 -/* C9EFA8 80241088 E63A0030 */ swc1 $f26, 0x30($s1) -/* C9EFAC 8024108C 8FBF0018 */ lw $ra, 0x18($sp) -/* C9EFB0 80241090 8FB10014 */ lw $s1, 0x14($sp) -/* C9EFB4 80241094 8FB00010 */ lw $s0, 0x10($sp) -/* C9EFB8 80241098 D7BA0038 */ ldc1 $f26, 0x38($sp) -/* C9EFBC 8024109C D7B80030 */ ldc1 $f24, 0x30($sp) -/* C9EFC0 802410A0 D7B60028 */ ldc1 $f22, 0x28($sp) -/* C9EFC4 802410A4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* C9EFC8 802410A8 24020002 */ addiu $v0, $zero, 2 -/* C9EFCC 802410AC 03E00008 */ jr $ra -/* C9EFD0 802410B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_flo/flo_00/func_802410B4_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/func_802410B4_C9DF20.s deleted file mode 100644 index b6f2d2c4e2..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/func_802410B4_C9DF20.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410B4_C9EFD4 -/* C9EFD4 802410B4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C9EFD8 802410B8 AFB00010 */ sw $s0, 0x10($sp) -/* C9EFDC 802410BC 0080802D */ daddu $s0, $a0, $zero -/* C9EFE0 802410C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C9EFE4 802410C4 AFB10014 */ sw $s1, 0x14($sp) -/* C9EFE8 802410C8 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* C9EFEC 802410CC F7B80030 */ sdc1 $f24, 0x30($sp) -/* C9EFF0 802410D0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* C9EFF4 802410D4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* C9EFF8 802410D8 0C00E2B7 */ jal get_npc_by_index -/* C9EFFC 802410DC 0000202D */ daddu $a0, $zero, $zero -/* C9F000 802410E0 0000202D */ daddu $a0, $zero, $zero -/* C9F004 802410E4 8E05008C */ lw $a1, 0x8c($s0) -/* C9F008 802410E8 0C0B1EAF */ jal get_variable -/* C9F00C 802410EC 0040882D */ daddu $s1, $v0, $zero -/* C9F010 802410F0 C60200B4 */ lwc1 $f2, 0xb4($s0) -/* C9F014 802410F4 468010A0 */ cvt.s.w $f2, $f2 -/* C9F018 802410F8 44061000 */ mfc1 $a2, $f2 -/* C9F01C 802410FC C60200BC */ lwc1 $f2, 0xbc($s0) -/* C9F020 80241100 468010A0 */ cvt.s.w $f2, $f2 -/* C9F024 80241104 4482A000 */ mtc1 $v0, $f20 -/* C9F028 80241108 00000000 */ nop -/* C9F02C 8024110C 4680A520 */ cvt.s.w $f20, $f20 -/* C9F030 80241110 3C01C2A6 */ lui $at, 0xc2a6 -/* C9F034 80241114 4481C000 */ mtc1 $at, $f24 -/* C9F038 80241118 3C0142AE */ lui $at, 0x42ae -/* C9F03C 8024111C 4481D000 */ mtc1 $at, $f26 -/* C9F040 80241120 44071000 */ mfc1 $a3, $f2 -/* C9F044 80241124 4600C306 */ mov.s $f12, $f24 -/* C9F048 80241128 0C00A7B5 */ jal dist2D -/* C9F04C 8024112C 4600D386 */ mov.s $f14, $f26 -/* C9F050 80241130 4600C306 */ mov.s $f12, $f24 -/* C9F054 80241134 4600D386 */ mov.s $f14, $f26 -/* C9F058 80241138 C60200B4 */ lwc1 $f2, 0xb4($s0) -/* C9F05C 8024113C 468010A0 */ cvt.s.w $f2, $f2 -/* C9F060 80241140 44061000 */ mfc1 $a2, $f2 -/* C9F064 80241144 C60200BC */ lwc1 $f2, 0xbc($s0) -/* C9F068 80241148 468010A0 */ cvt.s.w $f2, $f2 -/* C9F06C 8024114C 44071000 */ mfc1 $a3, $f2 -/* C9F070 80241150 0C00A720 */ jal atan2 -/* C9F074 80241154 46000586 */ mov.s $f22, $f0 -/* C9F078 80241158 0C00A6C9 */ jal clamp_angle -/* C9F07C 8024115C 46140301 */ sub.s $f12, $f0, $f20 -/* C9F080 80241160 46000506 */ mov.s $f20, $f0 -/* C9F084 80241164 0C00A8BB */ jal sin_deg -/* C9F088 80241168 4600A306 */ mov.s $f12, $f20 -/* C9F08C 8024116C 4600B002 */ mul.s $f0, $f22, $f0 -/* C9F090 80241170 00000000 */ nop -/* C9F094 80241174 46180000 */ add.s $f0, $f0, $f24 -/* C9F098 80241178 E6200038 */ swc1 $f0, 0x38($s1) -/* C9F09C 8024117C 8E0500B8 */ lw $a1, 0xb8($s0) -/* C9F0A0 80241180 0C0B1EAF */ jal get_variable -/* C9F0A4 80241184 0000202D */ daddu $a0, $zero, $zero -/* C9F0A8 80241188 0000202D */ daddu $a0, $zero, $zero -/* C9F0AC 8024118C 8E050090 */ lw $a1, 0x90($s0) -/* C9F0B0 80241190 0C0B1EAF */ jal get_variable -/* C9F0B4 80241194 0040802D */ daddu $s0, $v0, $zero -/* C9F0B8 80241198 4600A306 */ mov.s $f12, $f20 -/* C9F0BC 8024119C 02028021 */ addu $s0, $s0, $v0 -/* C9F0C0 802411A0 44900000 */ mtc1 $s0, $f0 -/* C9F0C4 802411A4 00000000 */ nop -/* C9F0C8 802411A8 46800020 */ cvt.s.w $f0, $f0 -/* C9F0CC 802411AC 0C00A8D4 */ jal cos_deg -/* C9F0D0 802411B0 E620003C */ swc1 $f0, 0x3c($s1) -/* C9F0D4 802411B4 4600B582 */ mul.s $f22, $f22, $f0 -/* C9F0D8 802411B8 00000000 */ nop -/* C9F0DC 802411BC 4616D681 */ sub.s $f26, $f26, $f22 -/* C9F0E0 802411C0 E63A0040 */ swc1 $f26, 0x40($s1) -/* C9F0E4 802411C4 8FBF0018 */ lw $ra, 0x18($sp) -/* C9F0E8 802411C8 8FB10014 */ lw $s1, 0x14($sp) -/* C9F0EC 802411CC 8FB00010 */ lw $s0, 0x10($sp) -/* C9F0F0 802411D0 D7BA0038 */ ldc1 $f26, 0x38($sp) -/* C9F0F4 802411D4 D7B80030 */ ldc1 $f24, 0x30($sp) -/* C9F0F8 802411D8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* C9F0FC 802411DC D7B40020 */ ldc1 $f20, 0x20($sp) -/* C9F100 802411E0 24020002 */ addiu $v0, $zero, 2 -/* C9F104 802411E4 03E00008 */ jr $ra -/* C9F108 802411E8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_flo/flo_00/func_802411EC_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/func_802411EC_C9DF20.s deleted file mode 100644 index 59e27a8f08..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/func_802411EC_C9DF20.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411EC_C9F10C -/* C9F10C 802411EC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C9F110 802411F0 AFB20018 */ sw $s2, 0x18($sp) -/* C9F114 802411F4 0080902D */ daddu $s2, $a0, $zero -/* C9F118 802411F8 AFBF0028 */ sw $ra, 0x28($sp) -/* C9F11C 802411FC AFB50024 */ sw $s5, 0x24($sp) -/* C9F120 80241200 AFB40020 */ sw $s4, 0x20($sp) -/* C9F124 80241204 AFB3001C */ sw $s3, 0x1c($sp) -/* C9F128 80241208 AFB10014 */ sw $s1, 0x14($sp) -/* C9F12C 8024120C AFB00010 */ sw $s0, 0x10($sp) -/* C9F130 80241210 F7B80040 */ sdc1 $f24, 0x40($sp) -/* C9F134 80241214 F7B60038 */ sdc1 $f22, 0x38($sp) -/* C9F138 80241218 F7B40030 */ sdc1 $f20, 0x30($sp) -/* C9F13C 8024121C 8E50000C */ lw $s0, 0xc($s2) -/* C9F140 80241220 8E140000 */ lw $s4, ($s0) -/* C9F144 80241224 26100004 */ addiu $s0, $s0, 4 -/* C9F148 80241228 0C0B1EAF */ jal get_variable -/* C9F14C 8024122C 0280282D */ daddu $a1, $s4, $zero -/* C9F150 80241230 0040982D */ daddu $s3, $v0, $zero -/* C9F154 80241234 8E150000 */ lw $s5, ($s0) -/* C9F158 80241238 26100004 */ addiu $s0, $s0, 4 -/* C9F15C 8024123C 8E050000 */ lw $a1, ($s0) -/* C9F160 80241240 26100004 */ addiu $s0, $s0, 4 -/* C9F164 80241244 0C0B210B */ jal get_float_variable -/* C9F168 80241248 0240202D */ daddu $a0, $s2, $zero -/* C9F16C 8024124C 8E050000 */ lw $a1, ($s0) -/* C9F170 80241250 26100004 */ addiu $s0, $s0, 4 -/* C9F174 80241254 0240202D */ daddu $a0, $s2, $zero -/* C9F178 80241258 0C0B210B */ jal get_float_variable -/* C9F17C 8024125C 46000606 */ mov.s $f24, $f0 -/* C9F180 80241260 8E050000 */ lw $a1, ($s0) -/* C9F184 80241264 26100004 */ addiu $s0, $s0, 4 -/* C9F188 80241268 0240202D */ daddu $a0, $s2, $zero -/* C9F18C 8024126C 0C0B1EAF */ jal get_variable -/* C9F190 80241270 46000506 */ mov.s $f20, $f0 -/* C9F194 80241274 8E050000 */ lw $a1, ($s0) -/* C9F198 80241278 26100004 */ addiu $s0, $s0, 4 -/* C9F19C 8024127C 0240202D */ daddu $a0, $s2, $zero -/* C9F1A0 80241280 0C0B1EAF */ jal get_variable -/* C9F1A4 80241284 0040882D */ daddu $s1, $v0, $zero -/* C9F1A8 80241288 0240202D */ daddu $a0, $s2, $zero -/* C9F1AC 8024128C 8E050000 */ lw $a1, ($s0) -/* C9F1B0 80241290 0C0B210B */ jal get_float_variable -/* C9F1B4 80241294 0040802D */ daddu $s0, $v0, $zero -/* C9F1B8 80241298 3C014334 */ lui $at, 0x4334 -/* C9F1BC 8024129C 44811000 */ mtc1 $at, $f2 -/* C9F1C0 802412A0 3C014049 */ lui $at, 0x4049 -/* C9F1C4 802412A4 34210FD8 */ ori $at, $at, 0xfd8 -/* C9F1C8 802412A8 44812000 */ mtc1 $at, $f4 -/* C9F1CC 802412AC 46020003 */ div.s $f0, $f0, $f2 -/* C9F1D0 802412B0 46040582 */ mul.s $f22, $f0, $f4 -/* C9F1D4 802412B4 00000000 */ nop -/* C9F1D8 802412B8 4618A501 */ sub.s $f20, $f20, $f24 -/* C9F1DC 802412BC 3C013F00 */ lui $at, 0x3f00 -/* C9F1E0 802412C0 44810000 */ mtc1 $at, $f0 -/* C9F1E4 802412C4 00000000 */ nop -/* C9F1E8 802412C8 4600A502 */ mul.s $f20, $f20, $f0 -/* C9F1EC 802412CC 00000000 */ nop -/* C9F1F0 802412D0 12000007 */ beqz $s0, .L802412F0 -/* C9F1F4 802412D4 0233102A */ slt $v0, $s1, $s3 -/* C9F1F8 802412D8 10400005 */ beqz $v0, .L802412F0 -/* C9F1FC 802412DC 0240202D */ daddu $a0, $s2, $zero -/* C9F200 802412E0 0220982D */ daddu $s3, $s1, $zero -/* C9F204 802412E4 0280282D */ daddu $a1, $s4, $zero -/* C9F208 802412E8 0C0B2026 */ jal set_variable -/* C9F20C 802412EC 0220302D */ daddu $a2, $s1, $zero -.L802412F0: -/* C9F210 802412F0 3C014049 */ lui $at, 0x4049 -/* C9F214 802412F4 34210FD8 */ ori $at, $at, 0xfd8 -/* C9F218 802412F8 44810000 */ mtc1 $at, $f0 -/* C9F21C 802412FC 44936000 */ mtc1 $s3, $f12 -/* C9F220 80241300 00000000 */ nop -/* C9F224 80241304 46806320 */ cvt.s.w $f12, $f12 -/* C9F228 80241308 46006302 */ mul.s $f12, $f12, $f0 -/* C9F22C 8024130C 00000000 */ nop -/* C9F230 80241310 44910000 */ mtc1 $s1, $f0 -/* C9F234 80241314 00000000 */ nop -/* C9F238 80241318 46800020 */ cvt.s.w $f0, $f0 -/* C9F23C 8024131C 46006303 */ div.s $f12, $f12, $f0 -/* C9F240 80241320 0C00A874 */ jal cos_rad -/* C9F244 80241324 46166300 */ add.s $f12, $f12, $f22 -/* C9F248 80241328 4600A002 */ mul.s $f0, $f20, $f0 -/* C9F24C 8024132C 00000000 */ nop -/* C9F250 80241330 4614C080 */ add.s $f2, $f24, $f20 -/* C9F254 80241334 46001081 */ sub.s $f2, $f2, $f0 -/* C9F258 80241338 0240202D */ daddu $a0, $s2, $zero -/* C9F25C 8024133C 44061000 */ mfc1 $a2, $f2 -/* C9F260 80241340 0C0B2190 */ jal set_float_variable -/* C9F264 80241344 02A0282D */ daddu $a1, $s5, $zero -/* C9F268 80241348 8FBF0028 */ lw $ra, 0x28($sp) -/* C9F26C 8024134C 8FB50024 */ lw $s5, 0x24($sp) -/* C9F270 80241350 8FB40020 */ lw $s4, 0x20($sp) -/* C9F274 80241354 8FB3001C */ lw $s3, 0x1c($sp) -/* C9F278 80241358 8FB20018 */ lw $s2, 0x18($sp) -/* C9F27C 8024135C 8FB10014 */ lw $s1, 0x14($sp) -/* C9F280 80241360 8FB00010 */ lw $s0, 0x10($sp) -/* C9F284 80241364 D7B80040 */ ldc1 $f24, 0x40($sp) -/* C9F288 80241368 D7B60038 */ ldc1 $f22, 0x38($sp) -/* C9F28C 8024136C D7B40030 */ ldc1 $f20, 0x30($sp) -/* C9F290 80241370 24020002 */ addiu $v0, $zero, 2 -/* C9F294 80241374 03E00008 */ jr $ra -/* C9F298 80241378 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_00/func_8024137C_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/func_8024137C_C9DF20.s deleted file mode 100644 index 1c169d7a02..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/func_8024137C_C9DF20.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024137C_C9F29C -/* C9F29C 8024137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9F2A0 80241380 AFBF0010 */ sw $ra, 0x10($sp) -/* C9F2A4 80241384 0C03A6DB */ jal sync_status_menu -/* C9F2A8 80241388 00000000 */ nop -/* C9F2AC 8024138C 8FBF0010 */ lw $ra, 0x10($sp) -/* C9F2B0 80241390 24020002 */ addiu $v0, $zero, 2 -/* C9F2B4 80241394 03E00008 */ jr $ra -/* C9F2B8 80241398 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_00/func_8024139C_C9DF20.s b/asm/nonmatchings/world/area_flo/flo_00/func_8024139C_C9DF20.s deleted file mode 100644 index 888c1b13a6..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/func_8024139C_C9DF20.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024139C_C9F2BC -/* C9F2BC 8024139C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9F2C0 802413A0 AFBF0010 */ sw $ra, 0x10($sp) -/* C9F2C4 802413A4 0C03A6D5 */ jal increment_status_menu_disabled -/* C9F2C8 802413A8 00000000 */ nop -/* C9F2CC 802413AC 8FBF0010 */ lw $ra, 0x10($sp) -/* C9F2D0 802413B0 24020002 */ addiu $v0, $zero, 2 -/* C9F2D4 802413B4 03E00008 */ jr $ra -/* C9F2D8 802413B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_03/func_80240040_CA72A0.s b/asm/nonmatchings/world/area_flo/flo_03/func_80240040_CA72A0.s deleted file mode 100644 index 7141302d04..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_03/func_80240040_CA72A0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_CA72E0 -/* CA72E0 80240040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CA72E4 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* CA72E8 80240048 3C108024 */ lui $s0, 0x8024 -/* CA72EC 8024004C 26100F08 */ addiu $s0, $s0, 0xf08 -/* CA72F0 80240050 AFBF0018 */ sw $ra, 0x18($sp) -/* CA72F4 80240054 AFB10014 */ sw $s1, 0x14($sp) -/* CA72F8 80240058 8E020000 */ lw $v0, ($s0) -/* CA72FC 8024005C 14400010 */ bnez $v0, .L802400A0 -/* CA7300 80240060 0080882D */ daddu $s1, $a0, $zero -/* CA7304 80240064 0C00AB39 */ jal heap_malloc -/* CA7308 80240068 24040040 */ addiu $a0, $zero, 0x40 -/* CA730C 8024006C AE020000 */ sw $v0, ($s0) -/* CA7310 80240070 0000182D */ daddu $v1, $zero, $zero -/* CA7314 80240074 0040282D */ daddu $a1, $v0, $zero -/* CA7318 80240078 0220202D */ daddu $a0, $s1, $zero -.L8024007C: -/* CA731C 8024007C 8C820084 */ lw $v0, 0x84($a0) -/* CA7320 80240080 24840004 */ addiu $a0, $a0, 4 -/* CA7324 80240084 24630001 */ addiu $v1, $v1, 1 -/* CA7328 80240088 ACA20000 */ sw $v0, ($a1) -/* CA732C 8024008C 28620010 */ slti $v0, $v1, 0x10 -/* CA7330 80240090 1440FFFA */ bnez $v0, .L8024007C -/* CA7334 80240094 24A50004 */ addiu $a1, $a1, 4 -/* CA7338 80240098 08090037 */ j .L802400DC -/* CA733C 8024009C 00000000 */ nop -.L802400A0: -/* CA7340 802400A0 0000182D */ daddu $v1, $zero, $zero -/* CA7344 802400A4 0040282D */ daddu $a1, $v0, $zero -/* CA7348 802400A8 0220202D */ daddu $a0, $s1, $zero -.L802400AC: -/* CA734C 802400AC 8CA20000 */ lw $v0, ($a1) -/* CA7350 802400B0 24A50004 */ addiu $a1, $a1, 4 -/* CA7354 802400B4 24630001 */ addiu $v1, $v1, 1 -/* CA7358 802400B8 AC820084 */ sw $v0, 0x84($a0) -/* CA735C 802400BC 28620010 */ slti $v0, $v1, 0x10 -/* CA7360 802400C0 1440FFFA */ bnez $v0, .L802400AC -/* CA7364 802400C4 24840004 */ addiu $a0, $a0, 4 -/* CA7368 802400C8 3C108024 */ lui $s0, 0x8024 -/* CA736C 802400CC 26100F08 */ addiu $s0, $s0, 0xf08 -/* CA7370 802400D0 0C00AB4B */ jal heap_free -/* CA7374 802400D4 8E040000 */ lw $a0, ($s0) -/* CA7378 802400D8 AE000000 */ sw $zero, ($s0) -.L802400DC: -/* CA737C 802400DC 8FBF0018 */ lw $ra, 0x18($sp) -/* CA7380 802400E0 8FB10014 */ lw $s1, 0x14($sp) -/* CA7384 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* CA7388 802400E8 24020002 */ addiu $v0, $zero, 2 -/* CA738C 802400EC 03E00008 */ jr $ra -/* CA7390 802400F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_03/func_802400F4_CA72A0.s b/asm/nonmatchings/world/area_flo/flo_03/func_802400F4_CA72A0.s deleted file mode 100644 index 6c2f06a846..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_03/func_802400F4_CA72A0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F4_CA7394 -/* CA7394 802400F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CA7398 802400F8 AFB00010 */ sw $s0, 0x10($sp) -/* CA739C 802400FC 0080802D */ daddu $s0, $a0, $zero -/* CA73A0 80240100 AFBF0018 */ sw $ra, 0x18($sp) -/* CA73A4 80240104 AFB10014 */ sw $s1, 0x14($sp) -/* CA73A8 80240108 8E02000C */ lw $v0, 0xc($s0) -/* CA73AC 8024010C 8C510000 */ lw $s1, ($v0) -/* CA73B0 80240110 0C0B1EAF */ jal get_variable -/* CA73B4 80240114 0220282D */ daddu $a1, $s1, $zero -/* CA73B8 80240118 3C03FFF0 */ lui $v1, 0xfff0 -/* CA73BC 8024011C 3463FFFF */ ori $v1, $v1, 0xffff -/* CA73C0 80240120 0200202D */ daddu $a0, $s0, $zero -/* CA73C4 80240124 00431024 */ and $v0, $v0, $v1 -/* CA73C8 80240128 00021140 */ sll $v0, $v0, 5 -/* CA73CC 8024012C 3C068008 */ lui $a2, %hi(gItemTable) -/* CA73D0 80240130 00C23021 */ addu $a2, $a2, $v0 -/* CA73D4 80240134 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* CA73D8 80240138 0C0B2026 */ jal set_variable -/* CA73DC 8024013C 0220282D */ daddu $a1, $s1, $zero -/* CA73E0 80240140 8FBF0018 */ lw $ra, 0x18($sp) -/* CA73E4 80240144 8FB10014 */ lw $s1, 0x14($sp) -/* CA73E8 80240148 8FB00010 */ lw $s0, 0x10($sp) -/* CA73EC 8024014C 24020002 */ addiu $v0, $zero, 2 -/* CA73F0 80240150 03E00008 */ jr $ra -/* CA73F4 80240154 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_03/func_80240158_CA72A0.s b/asm/nonmatchings/world/area_flo/flo_03/func_80240158_CA72A0.s deleted file mode 100644 index 0ce770d2a9..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_03/func_80240158_CA72A0.s +++ /dev/null @@ -1,179 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_CA73F8 -/* CA73F8 80240158 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CA73FC 8024015C AFBF0020 */ sw $ra, 0x20($sp) -/* CA7400 80240160 AFB1001C */ sw $s1, 0x1c($sp) -/* CA7404 80240164 AFB00018 */ sw $s0, 0x18($sp) -/* CA7408 80240168 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* CA740C 8024016C F7B80038 */ sdc1 $f24, 0x38($sp) -/* CA7410 80240170 F7B60030 */ sdc1 $f22, 0x30($sp) -/* CA7414 80240174 F7B40028 */ sdc1 $f20, 0x28($sp) -/* CA7418 80240178 8C910148 */ lw $s1, 0x148($a0) -/* CA741C 8024017C 0C00EABB */ jal get_npc_unsafe -/* CA7420 80240180 86240008 */ lh $a0, 8($s1) -/* CA7424 80240184 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* CA7428 80240188 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* CA742C 8024018C 0040802D */ daddu $s0, $v0, $zero -/* CA7430 80240190 3C01C352 */ lui $at, 0xc352 -/* CA7434 80240194 4481B000 */ mtc1 $at, $f22 -/* CA7438 80240198 3C01C337 */ lui $at, 0xc337 -/* CA743C 8024019C 4481C000 */ mtc1 $at, $f24 -/* CA7440 802401A0 8C660028 */ lw $a2, 0x28($v1) -/* CA7444 802401A4 8C670030 */ lw $a3, 0x30($v1) -/* CA7448 802401A8 3C014334 */ lui $at, 0x4334 -/* CA744C 802401AC 4481D000 */ mtc1 $at, $f26 -/* CA7450 802401B0 4600B306 */ mov.s $f12, $f22 -/* CA7454 802401B4 0C00A720 */ jal atan2 -/* CA7458 802401B8 4600C386 */ mov.s $f14, $f24 -/* CA745C 802401BC 0C00A6C9 */ jal clamp_angle -/* CA7460 802401C0 461A0300 */ add.s $f12, $f0, $f26 -/* CA7464 802401C4 27A40010 */ addiu $a0, $sp, 0x10 -/* CA7468 802401C8 3C064238 */ lui $a2, 0x4238 -/* CA746C 802401CC 44070000 */ mfc1 $a3, $f0 -/* CA7470 802401D0 27A50014 */ addiu $a1, $sp, 0x14 -/* CA7474 802401D4 E7B60010 */ swc1 $f22, 0x10($sp) -/* CA7478 802401D8 0C00A7E7 */ jal add_vec2D_polar -/* CA747C 802401DC E7B80014 */ swc1 $f24, 0x14($sp) -/* CA7480 802401E0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CA7484 802401E4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CA7488 802401E8 8FA60010 */ lw $a2, 0x10($sp) -/* CA748C 802401EC 0C00A7B5 */ jal dist2D -/* CA7490 802401F0 8FA70014 */ lw $a3, 0x14($sp) -/* CA7494 802401F4 3C014000 */ lui $at, 0x4000 -/* CA7498 802401F8 44811800 */ mtc1 $at, $f3 -/* CA749C 802401FC 44801000 */ mtc1 $zero, $f2 -/* CA74A0 80240200 46000121 */ cvt.d.s $f4, $f0 -/* CA74A4 80240204 4624103C */ c.lt.d $f2, $f4 -/* CA74A8 80240208 00000000 */ nop -/* CA74AC 8024020C 45000053 */ bc1f .L8024035C -/* CA74B0 80240210 4600B306 */ mov.s $f12, $f22 -/* CA74B4 80240214 8E060038 */ lw $a2, 0x38($s0) -/* CA74B8 80240218 8E070040 */ lw $a3, 0x40($s0) -/* CA74BC 8024021C 0C00A720 */ jal atan2 -/* CA74C0 80240220 4600C386 */ mov.s $f14, $f24 -/* CA74C4 80240224 0C00A6C9 */ jal clamp_angle -/* CA74C8 80240228 46000306 */ mov.s $f12, $f0 -/* CA74CC 8024022C 4600B306 */ mov.s $f12, $f22 -/* CA74D0 80240230 4600C386 */ mov.s $f14, $f24 -/* CA74D4 80240234 8FA60010 */ lw $a2, 0x10($sp) -/* CA74D8 80240238 8FA70014 */ lw $a3, 0x14($sp) -/* CA74DC 8024023C 0C00A720 */ jal atan2 -/* CA74E0 80240240 46000506 */ mov.s $f20, $f0 -/* CA74E4 80240244 0C00A6C9 */ jal clamp_angle -/* CA74E8 80240248 46000306 */ mov.s $f12, $f0 -/* CA74EC 8024024C 4600A101 */ sub.s $f4, $f20, $f0 -/* CA74F0 80240250 4600218D */ trunc.w.s $f6, $f4 -/* CA74F4 80240254 44023000 */ mfc1 $v0, $f6 -/* CA74F8 80240258 00000000 */ nop -/* CA74FC 8024025C 04420001 */ bltzl $v0, .L80240264 -/* CA7500 80240260 00021023 */ negu $v0, $v0 -.L80240264: -/* CA7504 80240264 28420015 */ slti $v0, $v0, 0x15 -/* CA7508 80240268 1440002D */ bnez $v0, .L80240320 -/* CA750C 8024026C 00000000 */ nop -/* CA7510 80240270 4604D03E */ c.le.s $f26, $f4 -/* CA7514 80240274 00000000 */ nop -/* CA7518 80240278 45000005 */ bc1f .L80240290 -/* CA751C 8024027C 46002086 */ mov.s $f2, $f4 -/* CA7520 80240280 3C0143B4 */ lui $at, 0x43b4 -/* CA7524 80240284 44810000 */ mtc1 $at, $f0 -/* CA7528 80240288 00000000 */ nop -/* CA752C 8024028C 46002081 */ sub.s $f2, $f4, $f0 -.L80240290: -/* CA7530 80240290 3C01C334 */ lui $at, 0xc334 -/* CA7534 80240294 44810000 */ mtc1 $at, $f0 -/* CA7538 80240298 00000000 */ nop -/* CA753C 8024029C 4600103E */ c.le.s $f2, $f0 -/* CA7540 802402A0 00000000 */ nop -/* CA7544 802402A4 45000005 */ bc1f .L802402BC -/* CA7548 802402A8 00000000 */ nop -/* CA754C 802402AC 3C0143B4 */ lui $at, 0x43b4 -/* CA7550 802402B0 44810000 */ mtc1 $at, $f0 -/* CA7554 802402B4 00000000 */ nop -/* CA7558 802402B8 46001080 */ add.s $f2, $f2, $f0 -.L802402BC: -/* CA755C 802402BC 46022032 */ c.eq.s $f4, $f2 -/* CA7560 802402C0 00000000 */ nop -/* CA7564 802402C4 45000016 */ bc1f .L80240320 -/* CA7568 802402C8 00000000 */ nop -/* CA756C 802402CC 44800000 */ mtc1 $zero, $f0 -/* CA7570 802402D0 E7B60010 */ swc1 $f22, 0x10($sp) -/* CA7574 802402D4 4604003E */ c.le.s $f0, $f4 -/* CA7578 802402D8 00000000 */ nop -/* CA757C 802402DC 45000005 */ bc1f .L802402F4 -/* CA7580 802402E0 E7B80014 */ swc1 $f24, 0x14($sp) -/* CA7584 802402E4 3C0141A0 */ lui $at, 0x41a0 -/* CA7588 802402E8 44816000 */ mtc1 $at, $f12 -/* CA758C 802402EC 080900C1 */ j .L80240304 -/* CA7590 802402F0 460CA301 */ sub.s $f12, $f20, $f12 -.L802402F4: -/* CA7594 802402F4 3C0141A0 */ lui $at, 0x41a0 -/* CA7598 802402F8 44816000 */ mtc1 $at, $f12 -/* CA759C 802402FC 00000000 */ nop -/* CA75A0 80240300 460CA300 */ add.s $f12, $f20, $f12 -.L80240304: -/* CA75A4 80240304 0C00A6C9 */ jal clamp_angle -/* CA75A8 80240308 00000000 */ nop -/* CA75AC 8024030C 27A40010 */ addiu $a0, $sp, 0x10 -/* CA75B0 80240310 3C064238 */ lui $a2, 0x4238 -/* CA75B4 80240314 44070000 */ mfc1 $a3, $f0 -/* CA75B8 80240318 0C00A7E7 */ jal add_vec2D_polar -/* CA75BC 8024031C 27A50014 */ addiu $a1, $sp, 0x14 -.L80240320: -/* CA75C0 80240320 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CA75C4 80240324 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CA75C8 80240328 8FA60010 */ lw $a2, 0x10($sp) -/* CA75CC 8024032C 8E2200CC */ lw $v0, 0xcc($s1) -/* CA75D0 80240330 8FA70014 */ lw $a3, 0x14($sp) -/* CA75D4 80240334 8C420008 */ lw $v0, 8($v0) -/* CA75D8 80240338 0C00A720 */ jal atan2 -/* CA75DC 8024033C AE020028 */ sw $v0, 0x28($s0) -/* CA75E0 80240340 3C054000 */ lui $a1, 0x4000 -/* CA75E4 80240344 44060000 */ mfc1 $a2, $f0 -/* CA75E8 80240348 0200202D */ daddu $a0, $s0, $zero -/* CA75EC 8024034C 0C00EA95 */ jal npc_move_heading -/* CA75F0 80240350 AC86000C */ sw $a2, 0xc($a0) -/* CA75F4 80240354 080900F2 */ j .L802403C8 -/* CA75F8 80240358 00000000 */ nop -.L8024035C: -/* CA75FC 8024035C 3C018024 */ lui $at, 0x8024 -/* CA7600 80240360 D4204F48 */ ldc1 $f0, 0x4f48($at) -/* CA7604 80240364 4624003C */ c.lt.d $f0, $f4 -/* CA7608 80240368 00000000 */ nop -/* CA760C 8024036C 4500000F */ bc1f .L802403AC -/* CA7610 80240370 00000000 */ nop -/* CA7614 80240374 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CA7618 80240378 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CA761C 8024037C 8FA60010 */ lw $a2, 0x10($sp) -/* CA7620 80240380 0C00A720 */ jal atan2 -/* CA7624 80240384 8FA70014 */ lw $a3, 0x14($sp) -/* CA7628 80240388 C7A20010 */ lwc1 $f2, 0x10($sp) -/* CA762C 8024038C C7A40014 */ lwc1 $f4, 0x14($sp) -/* CA7630 80240390 E600000C */ swc1 $f0, 0xc($s0) -/* CA7634 80240394 E6020038 */ swc1 $f2, 0x38($s0) -/* CA7638 80240398 E6040040 */ swc1 $f4, 0x40($s0) -/* CA763C 8024039C 8E2200CC */ lw $v0, 0xcc($s1) -/* CA7640 802403A0 8C420004 */ lw $v0, 4($v0) -/* CA7644 802403A4 080900F2 */ j .L802403C8 -/* CA7648 802403A8 AE020028 */ sw $v0, 0x28($s0) -.L802403AC: -/* CA764C 802403AC C7A00010 */ lwc1 $f0, 0x10($sp) -/* CA7650 802403B0 C7A20014 */ lwc1 $f2, 0x14($sp) -/* CA7654 802403B4 E6000038 */ swc1 $f0, 0x38($s0) -/* CA7658 802403B8 E6020040 */ swc1 $f2, 0x40($s0) -/* CA765C 802403BC 8E2200CC */ lw $v0, 0xcc($s1) -/* CA7660 802403C0 8C420000 */ lw $v0, ($v0) -/* CA7664 802403C4 AE020028 */ sw $v0, 0x28($s0) -.L802403C8: -/* CA7668 802403C8 8FBF0020 */ lw $ra, 0x20($sp) -/* CA766C 802403CC 8FB1001C */ lw $s1, 0x1c($sp) -/* CA7670 802403D0 8FB00018 */ lw $s0, 0x18($sp) -/* CA7674 802403D4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* CA7678 802403D8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* CA767C 802403DC D7B60030 */ ldc1 $f22, 0x30($sp) -/* CA7680 802403E0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* CA7684 802403E4 0000102D */ daddu $v0, $zero, $zero -/* CA7688 802403E8 03E00008 */ jr $ra -/* CA768C 802403EC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_03/func_802403F0_CA72A0.s b/asm/nonmatchings/world/area_flo/flo_03/func_802403F0_CA72A0.s deleted file mode 100644 index ad9b63274a..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_03/func_802403F0_CA72A0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F0_CA7690 -/* CA7690 802403F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* CA7694 802403F4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* CA7698 802403F8 4485A000 */ mtc1 $a1, $f20 -/* CA769C 802403FC F7B60020 */ sdc1 $f22, 0x20($sp) -/* CA76A0 80240400 4486B000 */ mtc1 $a2, $f22 -/* CA76A4 80240404 AFB00010 */ sw $s0, 0x10($sp) -/* CA76A8 80240408 F7B80028 */ sdc1 $f24, 0x28($sp) -/* CA76AC 8024040C 4487C000 */ mtc1 $a3, $f24 -/* CA76B0 80240410 AFBF0014 */ sw $ra, 0x14($sp) -/* CA76B4 80240414 0C019D28 */ jal guMtxIdentF -/* CA76B8 80240418 0080802D */ daddu $s0, $a0, $zero -/* CA76BC 8024041C 4616A582 */ mul.s $f22, $f20, $f22 -/* CA76C0 80240420 00000000 */ nop -/* CA76C4 80240424 4618A502 */ mul.s $f20, $f20, $f24 -/* CA76C8 80240428 00000000 */ nop -/* CA76CC 8024042C 3C013F80 */ lui $at, 0x3f80 -/* CA76D0 80240430 44810000 */ mtc1 $at, $f0 -/* CA76D4 80240434 00000000 */ nop -/* CA76D8 80240438 E6000014 */ swc1 $f0, 0x14($s0) -/* CA76DC 8024043C E6160010 */ swc1 $f22, 0x10($s0) -/* CA76E0 80240440 E6140018 */ swc1 $f20, 0x18($s0) -/* CA76E4 80240444 8FBF0014 */ lw $ra, 0x14($sp) -/* CA76E8 80240448 8FB00010 */ lw $s0, 0x10($sp) -/* CA76EC 8024044C D7B80028 */ ldc1 $f24, 0x28($sp) -/* CA76F0 80240450 D7B60020 */ ldc1 $f22, 0x20($sp) -/* CA76F4 80240454 D7B40018 */ ldc1 $f20, 0x18($sp) -/* CA76F8 80240458 03E00008 */ jr $ra -/* CA76FC 8024045C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_flo/flo_03/func_80240460_CA72A0.s b/asm/nonmatchings/world/area_flo/flo_03/func_80240460_CA72A0.s deleted file mode 100644 index 713bad0ac5..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_03/func_80240460_CA72A0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240460_CA7700 -/* CA7700 80240460 27BDFF78 */ addiu $sp, $sp, -0x88 -/* CA7704 80240464 AFB10054 */ sw $s1, 0x54($sp) -/* CA7708 80240468 0080882D */ daddu $s1, $a0, $zero -/* CA770C 8024046C AFBF005C */ sw $ra, 0x5c($sp) -/* CA7710 80240470 AFB20058 */ sw $s2, 0x58($sp) -/* CA7714 80240474 AFB00050 */ sw $s0, 0x50($sp) -/* CA7718 80240478 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* CA771C 8024047C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CA7720 80240480 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CA7724 80240484 F7B60068 */ sdc1 $f22, 0x68($sp) -/* CA7728 80240488 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CA772C 8024048C 8E30000C */ lw $s0, 0xc($s1) -/* CA7730 80240490 8E050000 */ lw $a1, ($s0) -/* CA7734 80240494 0C0B1EAF */ jal get_variable -/* CA7738 80240498 26100004 */ addiu $s0, $s0, 4 -/* CA773C 8024049C 0C046C04 */ jal get_model_list_index_from_tree_index -/* CA7740 802404A0 0040202D */ daddu $a0, $v0, $zero -/* CA7744 802404A4 8E050000 */ lw $a1, ($s0) -/* CA7748 802404A8 26100004 */ addiu $s0, $s0, 4 -/* CA774C 802404AC 0220202D */ daddu $a0, $s1, $zero -/* CA7750 802404B0 0C0B210B */ jal get_float_variable -/* CA7754 802404B4 0040902D */ daddu $s2, $v0, $zero -/* CA7758 802404B8 8E050000 */ lw $a1, ($s0) -/* CA775C 802404BC 26100004 */ addiu $s0, $s0, 4 -/* CA7760 802404C0 0220202D */ daddu $a0, $s1, $zero -/* CA7764 802404C4 0C0B210B */ jal get_float_variable -/* CA7768 802404C8 46000706 */ mov.s $f28, $f0 -/* CA776C 802404CC 8E050000 */ lw $a1, ($s0) -/* CA7770 802404D0 26100004 */ addiu $s0, $s0, 4 -/* CA7774 802404D4 0220202D */ daddu $a0, $s1, $zero -/* CA7778 802404D8 0C0B210B */ jal get_float_variable -/* CA777C 802404DC 46000686 */ mov.s $f26, $f0 -/* CA7780 802404E0 0220202D */ daddu $a0, $s1, $zero -/* CA7784 802404E4 8E050000 */ lw $a1, ($s0) -/* CA7788 802404E8 0C0B210B */ jal get_float_variable -/* CA778C 802404EC 46000586 */ mov.s $f22, $f0 -/* CA7790 802404F0 0240202D */ daddu $a0, $s2, $zero -/* CA7794 802404F4 0C046B4C */ jal get_model_from_list_index -/* CA7798 802404F8 46000606 */ mov.s $f24, $f0 -/* CA779C 802404FC 0040882D */ daddu $s1, $v0, $zero -/* CA77A0 80240500 96220000 */ lhu $v0, ($s1) -/* CA77A4 80240504 30420400 */ andi $v0, $v0, 0x400 -/* CA77A8 80240508 1440001E */ bnez $v0, .L80240584 -/* CA77AC 8024050C 26300058 */ addiu $s0, $s1, 0x58 -/* CA77B0 80240510 4480A000 */ mtc1 $zero, $f20 -/* CA77B4 80240514 4406B000 */ mfc1 $a2, $f22 -/* CA77B8 80240518 4405A000 */ mfc1 $a1, $f20 -/* CA77BC 8024051C 4407A000 */ mfc1 $a3, $f20 -/* CA77C0 80240520 0C019E40 */ jal guTranslateF -/* CA77C4 80240524 0200202D */ daddu $a0, $s0, $zero -/* CA77C8 80240528 4405E000 */ mfc1 $a1, $f28 -/* CA77CC 8024052C 4406D000 */ mfc1 $a2, $f26 -/* CA77D0 80240530 4407C000 */ mfc1 $a3, $f24 -/* CA77D4 80240534 0C0900FC */ jal func_802403F0 -/* CA77D8 80240538 27A40010 */ addiu $a0, $sp, 0x10 -/* CA77DC 8024053C 27A40010 */ addiu $a0, $sp, 0x10 -/* CA77E0 80240540 0200282D */ daddu $a1, $s0, $zero -/* CA77E4 80240544 0C019D80 */ jal guMtxCatF -/* CA77E8 80240548 0200302D */ daddu $a2, $s0, $zero -/* CA77EC 8024054C 27A40010 */ addiu $a0, $sp, 0x10 -/* CA77F0 80240550 4600B587 */ neg.s $f22, $f22 -/* CA77F4 80240554 4405A000 */ mfc1 $a1, $f20 -/* CA77F8 80240558 4406B000 */ mfc1 $a2, $f22 -/* CA77FC 8024055C 0C019E40 */ jal guTranslateF -/* CA7800 80240560 00A0382D */ daddu $a3, $a1, $zero -/* CA7804 80240564 27A40010 */ addiu $a0, $sp, 0x10 -/* CA7808 80240568 0200282D */ daddu $a1, $s0, $zero -/* CA780C 8024056C 0C019D80 */ jal guMtxCatF -/* CA7810 80240570 00A0302D */ daddu $a2, $a1, $zero -/* CA7814 80240574 96220000 */ lhu $v0, ($s1) -/* CA7818 80240578 34421400 */ ori $v0, $v0, 0x1400 -/* CA781C 8024057C 0809017F */ j .L802405FC -/* CA7820 80240580 A6220000 */ sh $v0, ($s1) -.L80240584: -/* CA7824 80240584 4480A000 */ mtc1 $zero, $f20 -/* CA7828 80240588 4406B000 */ mfc1 $a2, $f22 -/* CA782C 8024058C 4405A000 */ mfc1 $a1, $f20 -/* CA7830 80240590 4407A000 */ mfc1 $a3, $f20 -/* CA7834 80240594 0C019E40 */ jal guTranslateF -/* CA7838 80240598 27A40010 */ addiu $a0, $sp, 0x10 -/* CA783C 8024059C 27A40010 */ addiu $a0, $sp, 0x10 -/* CA7840 802405A0 26300058 */ addiu $s0, $s1, 0x58 -/* CA7844 802405A4 0200282D */ daddu $a1, $s0, $zero -/* CA7848 802405A8 0C019D80 */ jal guMtxCatF -/* CA784C 802405AC 0200302D */ daddu $a2, $s0, $zero -/* CA7850 802405B0 4405E000 */ mfc1 $a1, $f28 -/* CA7854 802405B4 4406D000 */ mfc1 $a2, $f26 -/* CA7858 802405B8 4407C000 */ mfc1 $a3, $f24 -/* CA785C 802405BC 0C0900FC */ jal func_802403F0 -/* CA7860 802405C0 27A40010 */ addiu $a0, $sp, 0x10 -/* CA7864 802405C4 27A40010 */ addiu $a0, $sp, 0x10 -/* CA7868 802405C8 0200282D */ daddu $a1, $s0, $zero -/* CA786C 802405CC 0C019D80 */ jal guMtxCatF -/* CA7870 802405D0 0200302D */ daddu $a2, $s0, $zero -/* CA7874 802405D4 27A40010 */ addiu $a0, $sp, 0x10 -/* CA7878 802405D8 4600B587 */ neg.s $f22, $f22 -/* CA787C 802405DC 4405A000 */ mfc1 $a1, $f20 -/* CA7880 802405E0 4406B000 */ mfc1 $a2, $f22 -/* CA7884 802405E4 0C019E40 */ jal guTranslateF -/* CA7888 802405E8 00A0382D */ daddu $a3, $a1, $zero -/* CA788C 802405EC 27A40010 */ addiu $a0, $sp, 0x10 -/* CA7890 802405F0 0200282D */ daddu $a1, $s0, $zero -/* CA7894 802405F4 0C019D80 */ jal guMtxCatF -/* CA7898 802405F8 00A0302D */ daddu $a2, $a1, $zero -.L802405FC: -/* CA789C 802405FC 8FBF005C */ lw $ra, 0x5c($sp) -/* CA78A0 80240600 8FB20058 */ lw $s2, 0x58($sp) -/* CA78A4 80240604 8FB10054 */ lw $s1, 0x54($sp) -/* CA78A8 80240608 8FB00050 */ lw $s0, 0x50($sp) -/* CA78AC 8024060C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* CA78B0 80240610 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CA78B4 80240614 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CA78B8 80240618 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CA78BC 8024061C D7B40060 */ ldc1 $f20, 0x60($sp) -/* CA78C0 80240620 24020002 */ addiu $v0, $zero, 2 -/* CA78C4 80240624 03E00008 */ jr $ra -/* CA78C8 80240628 27BD0088 */ addiu $sp, $sp, 0x88 -/* CA78CC 8024062C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_07/func_80240124_CAC1F0.s b/asm/nonmatchings/world/area_flo/flo_07/func_80240124_CAC1F0.s deleted file mode 100644 index 41de7241ca..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_07/func_80240124_CAC1F0.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_CAC314 -/* CAC314 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CAC318 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* CAC31C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* CAC320 80240130 10A00005 */ beqz $a1, .L80240148 -/* CAC324 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* CAC328 80240138 AE000070 */ sw $zero, 0x70($s0) -/* CAC32C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* CAC330 80240140 AE000078 */ sw $zero, 0x78($s0) -/* CAC334 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* CAC338 80240148 8E020070 */ lw $v0, 0x70($s0) -/* CAC33C 8024014C 1440000E */ bnez $v0, .L80240188 -/* CAC340 80240150 00000000 */ nop -/* CAC344 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* CAC348 80240158 8E020088 */ lw $v0, 0x88($s0) -/* CAC34C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* CAC350 80240160 04610004 */ bgez $v1, .L80240174 -/* CAC354 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* CAC358 80240168 3C020002 */ lui $v0, 2 -/* CAC35C 8024016C 08090061 */ j .L80240184 -/* CAC360 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* CAC364 80240174 3C040002 */ lui $a0, 2 -/* CAC368 80240178 0083102A */ slt $v0, $a0, $v1 -/* CAC36C 8024017C 10400002 */ beqz $v0, .L80240188 -/* CAC370 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* CAC374 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* CAC378 80240188 8E020074 */ lw $v0, 0x74($s0) -/* CAC37C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* CAC380 80240190 00000000 */ nop -/* CAC384 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* CAC388 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* CAC38C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* CAC390 802401A0 04610004 */ bgez $v1, .L802401B4 -/* CAC394 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* CAC398 802401A8 3C020002 */ lui $v0, 2 -/* CAC39C 802401AC 08090071 */ j .L802401C4 -/* CAC3A0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* CAC3A4 802401B4 3C040002 */ lui $a0, 2 -/* CAC3A8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* CAC3AC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* CAC3B0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* CAC3B4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* CAC3B8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* CAC3BC 802401CC 1440000E */ bnez $v0, .L80240208 -/* CAC3C0 802401D0 00000000 */ nop -/* CAC3C4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* CAC3C8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* CAC3CC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* CAC3D0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* CAC3D4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* CAC3D8 802401E8 3C020002 */ lui $v0, 2 -/* CAC3DC 802401EC 08090081 */ j .L80240204 -/* CAC3E0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* CAC3E4 802401F4 3C040002 */ lui $a0, 2 -/* CAC3E8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* CAC3EC 802401FC 10400002 */ beqz $v0, .L80240208 -/* CAC3F0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* CAC3F4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* CAC3F8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* CAC3FC 8024020C 1440000E */ bnez $v0, .L80240248 -/* CAC400 80240210 00000000 */ nop -/* CAC404 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* CAC408 80240218 8E020094 */ lw $v0, 0x94($s0) -/* CAC40C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* CAC410 80240220 04610004 */ bgez $v1, .L80240234 -/* CAC414 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* CAC418 80240228 3C020002 */ lui $v0, 2 -/* CAC41C 8024022C 08090091 */ j .L80240244 -/* CAC420 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* CAC424 80240234 3C040002 */ lui $a0, 2 -/* CAC428 80240238 0083102A */ slt $v0, $a0, $v1 -/* CAC42C 8024023C 10400002 */ beqz $v0, .L80240248 -/* CAC430 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* CAC434 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* CAC438 80240248 8E040084 */ lw $a0, 0x84($s0) -/* CAC43C 8024024C 0C046F07 */ jal set_main_pan_u -/* CAC440 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* CAC444 80240254 8E040084 */ lw $a0, 0x84($s0) -/* CAC448 80240258 0C046F0D */ jal set_main_pan_v -/* CAC44C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* CAC450 80240260 8E040084 */ lw $a0, 0x84($s0) -/* CAC454 80240264 0C046F13 */ jal set_aux_pan_u -/* CAC458 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* CAC45C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* CAC460 80240270 0C046F19 */ jal set_aux_pan_v -/* CAC464 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* CAC468 80240278 8E020070 */ lw $v0, 0x70($s0) -/* CAC46C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* CAC470 80240280 8E040098 */ lw $a0, 0x98($s0) -/* CAC474 80240284 24420001 */ addiu $v0, $v0, 1 -/* CAC478 80240288 AE020070 */ sw $v0, 0x70($s0) -/* CAC47C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* CAC480 80240290 24630001 */ addiu $v1, $v1, 1 -/* CAC484 80240294 AE030078 */ sw $v1, 0x78($s0) -/* CAC488 80240298 8E030070 */ lw $v1, 0x70($s0) -/* CAC48C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* CAC490 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* CAC494 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* CAC498 802402A8 0064182A */ slt $v1, $v1, $a0 -/* CAC49C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* CAC4A0 802402B0 14600002 */ bnez $v1, .L802402BC -/* CAC4A4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* CAC4A8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* CAC4AC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* CAC4B0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* CAC4B4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* CAC4B8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* CAC4BC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* CAC4C0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* CAC4C4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* CAC4C8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* CAC4CC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* CAC4D0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* CAC4D4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* CAC4D8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* CAC4DC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* CAC4E0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* CAC4E4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* CAC4E8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* CAC4EC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* CAC4F0 80240300 0000102D */ daddu $v0, $zero, $zero -/* CAC4F4 80240304 03E00008 */ jr $ra -/* CAC4F8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_07/func_8024030C_CAC1F0.s b/asm/nonmatchings/world/area_flo/flo_07/func_8024030C_CAC1F0.s deleted file mode 100644 index c3dfd29b09..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_07/func_8024030C_CAC1F0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_CAC4FC -/* CAC4FC 8024030C 44800000 */ mtc1 $zero, $f0 -/* CAC500 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CAC504 80240314 44050000 */ mfc1 $a1, $f0 -/* CAC508 80240318 0000202D */ daddu $a0, $zero, $zero -/* CAC50C 8024031C AFBF0018 */ sw $ra, 0x18($sp) -/* CAC510 80240320 AFA00014 */ sw $zero, 0x14($sp) -/* CAC514 80240324 E7A00010 */ swc1 $f0, 0x10($sp) -/* CAC518 80240328 00A0302D */ daddu $a2, $a1, $zero -/* CAC51C 8024032C 0C01CA54 */ jal func_80072950 -/* CAC520 80240330 00A0382D */ daddu $a3, $a1, $zero -/* CAC524 80240334 8FBF0018 */ lw $ra, 0x18($sp) -/* CAC528 80240338 24020002 */ addiu $v0, $zero, 2 -/* CAC52C 8024033C 03E00008 */ jr $ra -/* CAC530 80240340 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_07/func_80240344_CAC1F0.s b/asm/nonmatchings/world/area_flo/flo_07/func_80240344_CAC1F0.s deleted file mode 100644 index 39ccafa5f1..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_07/func_80240344_CAC1F0.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240344_CAC534 -/* CAC534 80240344 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* CAC538 80240348 24020008 */ addiu $v0, $zero, 8 -/* CAC53C 8024034C 3C014348 */ lui $at, 0x4348 -/* CAC540 80240350 44810000 */ mtc1 $at, $f0 -/* CAC544 80240354 3C0142F0 */ lui $at, 0x42f0 -/* CAC548 80240358 44811000 */ mtc1 $at, $f2 -/* CAC54C 8024035C 3C014080 */ lui $at, 0x4080 -/* CAC550 80240360 44812000 */ mtc1 $at, $f4 -/* CAC554 80240364 3C05C388 */ lui $a1, 0xc388 -/* CAC558 80240368 3C0642A0 */ lui $a2, 0x42a0 -/* CAC55C 8024036C 3C0741A0 */ lui $a3, 0x41a0 -/* CAC560 80240370 24040003 */ addiu $a0, $zero, 3 -/* CAC564 80240374 AFBF0028 */ sw $ra, 0x28($sp) -/* CAC568 80240378 AFA2001C */ sw $v0, 0x1c($sp) -/* CAC56C 8024037C AFA00020 */ sw $zero, 0x20($sp) -/* CAC570 80240380 E7A00010 */ swc1 $f0, 0x10($sp) -/* CAC574 80240384 E7A20014 */ swc1 $f2, 0x14($sp) -/* CAC578 80240388 0C01C8D4 */ jal func_80072350 -/* CAC57C 8024038C E7A40018 */ swc1 $f4, 0x18($sp) -/* CAC580 80240390 8C43000C */ lw $v1, 0xc($v0) -/* CAC584 80240394 240500F0 */ addiu $a1, $zero, 0xf0 -/* CAC588 80240398 AC650038 */ sw $a1, 0x38($v1) -/* CAC58C 8024039C 8C43000C */ lw $v1, 0xc($v0) -/* CAC590 802403A0 AC65003C */ sw $a1, 0x3c($v1) -/* CAC594 802403A4 8C43000C */ lw $v1, 0xc($v0) -/* CAC598 802403A8 AC650040 */ sw $a1, 0x40($v1) -/* CAC59C 802403AC 8C43000C */ lw $v1, 0xc($v0) -/* CAC5A0 802403B0 240400E6 */ addiu $a0, $zero, 0xe6 -/* CAC5A4 802403B4 AC640048 */ sw $a0, 0x48($v1) -/* CAC5A8 802403B8 8C43000C */ lw $v1, 0xc($v0) -/* CAC5AC 802403BC AC64004C */ sw $a0, 0x4c($v1) -/* CAC5B0 802403C0 8C43000C */ lw $v1, 0xc($v0) -/* CAC5B4 802403C4 AC650050 */ sw $a1, 0x50($v1) -/* CAC5B8 802403C8 8FBF0028 */ lw $ra, 0x28($sp) -/* CAC5BC 802403CC 24020002 */ addiu $v0, $zero, 2 -/* CAC5C0 802403D0 03E00008 */ jr $ra -/* CAC5C4 802403D4 27BD0030 */ addiu $sp, $sp, 0x30 -/* CAC5C8 802403D8 00000000 */ nop -/* CAC5CC 802403DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_07/func_802403E0_CAC1F0.s b/asm/nonmatchings/world/area_flo/flo_07/func_802403E0_CAC1F0.s deleted file mode 100644 index 39f5512b00..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_07/func_802403E0_CAC1F0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403E0_CAC5D0 -/* CAC5D0 802403E0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* CAC5D4 802403E4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* CAC5D8 802403E8 4485A000 */ mtc1 $a1, $f20 -/* CAC5DC 802403EC F7B60020 */ sdc1 $f22, 0x20($sp) -/* CAC5E0 802403F0 4486B000 */ mtc1 $a2, $f22 -/* CAC5E4 802403F4 AFB00010 */ sw $s0, 0x10($sp) -/* CAC5E8 802403F8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* CAC5EC 802403FC 4487C000 */ mtc1 $a3, $f24 -/* CAC5F0 80240400 AFBF0014 */ sw $ra, 0x14($sp) -/* CAC5F4 80240404 0C019D28 */ jal guMtxIdentF -/* CAC5F8 80240408 0080802D */ daddu $s0, $a0, $zero -/* CAC5FC 8024040C 4616A582 */ mul.s $f22, $f20, $f22 -/* CAC600 80240410 00000000 */ nop -/* CAC604 80240414 4618A502 */ mul.s $f20, $f20, $f24 -/* CAC608 80240418 00000000 */ nop -/* CAC60C 8024041C 3C013F80 */ lui $at, 0x3f80 -/* CAC610 80240420 44810000 */ mtc1 $at, $f0 -/* CAC614 80240424 00000000 */ nop -/* CAC618 80240428 E6000014 */ swc1 $f0, 0x14($s0) -/* CAC61C 8024042C E6160010 */ swc1 $f22, 0x10($s0) -/* CAC620 80240430 E6140018 */ swc1 $f20, 0x18($s0) -/* CAC624 80240434 8FBF0014 */ lw $ra, 0x14($sp) -/* CAC628 80240438 8FB00010 */ lw $s0, 0x10($sp) -/* CAC62C 8024043C D7B80028 */ ldc1 $f24, 0x28($sp) -/* CAC630 80240440 D7B60020 */ ldc1 $f22, 0x20($sp) -/* CAC634 80240444 D7B40018 */ ldc1 $f20, 0x18($sp) -/* CAC638 80240448 03E00008 */ jr $ra -/* CAC63C 8024044C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_flo/flo_07/func_8024061C_CAC1F0.s b/asm/nonmatchings/world/area_flo/flo_07/func_8024061C_CAC1F0.s deleted file mode 100644 index 62829aff0a..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_07/func_8024061C_CAC1F0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_CAC80C -/* CAC80C 8024061C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CAC810 80240620 AFB00010 */ sw $s0, 0x10($sp) -/* CAC814 80240624 3C108024 */ lui $s0, 0x8024 -/* CAC818 80240628 26101BB0 */ addiu $s0, $s0, 0x1bb0 -/* CAC81C 8024062C AFBF0018 */ sw $ra, 0x18($sp) -/* CAC820 80240630 AFB10014 */ sw $s1, 0x14($sp) -/* CAC824 80240634 8E020000 */ lw $v0, ($s0) -/* CAC828 80240638 14400010 */ bnez $v0, .L8024067C -/* CAC82C 8024063C 0080882D */ daddu $s1, $a0, $zero -/* CAC830 80240640 0C00AB39 */ jal heap_malloc -/* CAC834 80240644 24040040 */ addiu $a0, $zero, 0x40 -/* CAC838 80240648 AE020000 */ sw $v0, ($s0) -/* CAC83C 8024064C 0000182D */ daddu $v1, $zero, $zero -/* CAC840 80240650 0040282D */ daddu $a1, $v0, $zero -/* CAC844 80240654 0220202D */ daddu $a0, $s1, $zero -.L80240658: -/* CAC848 80240658 8C820084 */ lw $v0, 0x84($a0) -/* CAC84C 8024065C 24840004 */ addiu $a0, $a0, 4 -/* CAC850 80240660 24630001 */ addiu $v1, $v1, 1 -/* CAC854 80240664 ACA20000 */ sw $v0, ($a1) -/* CAC858 80240668 28620010 */ slti $v0, $v1, 0x10 -/* CAC85C 8024066C 1440FFFA */ bnez $v0, .L80240658 -/* CAC860 80240670 24A50004 */ addiu $a1, $a1, 4 -/* CAC864 80240674 080901AE */ j .L802406B8 -/* CAC868 80240678 00000000 */ nop -.L8024067C: -/* CAC86C 8024067C 0000182D */ daddu $v1, $zero, $zero -/* CAC870 80240680 0040282D */ daddu $a1, $v0, $zero -/* CAC874 80240684 0220202D */ daddu $a0, $s1, $zero -.L80240688: -/* CAC878 80240688 8CA20000 */ lw $v0, ($a1) -/* CAC87C 8024068C 24A50004 */ addiu $a1, $a1, 4 -/* CAC880 80240690 24630001 */ addiu $v1, $v1, 1 -/* CAC884 80240694 AC820084 */ sw $v0, 0x84($a0) -/* CAC888 80240698 28620010 */ slti $v0, $v1, 0x10 -/* CAC88C 8024069C 1440FFFA */ bnez $v0, .L80240688 -/* CAC890 802406A0 24840004 */ addiu $a0, $a0, 4 -/* CAC894 802406A4 3C108024 */ lui $s0, 0x8024 -/* CAC898 802406A8 26101BB0 */ addiu $s0, $s0, 0x1bb0 -/* CAC89C 802406AC 0C00AB4B */ jal heap_free -/* CAC8A0 802406B0 8E040000 */ lw $a0, ($s0) -/* CAC8A4 802406B4 AE000000 */ sw $zero, ($s0) -.L802406B8: -/* CAC8A8 802406B8 8FBF0018 */ lw $ra, 0x18($sp) -/* CAC8AC 802406BC 8FB10014 */ lw $s1, 0x14($sp) -/* CAC8B0 802406C0 8FB00010 */ lw $s0, 0x10($sp) -/* CAC8B4 802406C4 24020002 */ addiu $v0, $zero, 2 -/* CAC8B8 802406C8 03E00008 */ jr $ra -/* CAC8BC 802406CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_07/func_802406D0_CAC1F0.s b/asm/nonmatchings/world/area_flo/flo_07/func_802406D0_CAC1F0.s deleted file mode 100644 index 0a72f3d569..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_07/func_802406D0_CAC1F0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406D0_CAC8C0 -/* CAC8C0 802406D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CAC8C4 802406D4 AFB00010 */ sw $s0, 0x10($sp) -/* CAC8C8 802406D8 0080802D */ daddu $s0, $a0, $zero -/* CAC8CC 802406DC AFBF0018 */ sw $ra, 0x18($sp) -/* CAC8D0 802406E0 AFB10014 */ sw $s1, 0x14($sp) -/* CAC8D4 802406E4 8E02000C */ lw $v0, 0xc($s0) -/* CAC8D8 802406E8 8C510000 */ lw $s1, ($v0) -/* CAC8DC 802406EC 0C0B1EAF */ jal get_variable -/* CAC8E0 802406F0 0220282D */ daddu $a1, $s1, $zero -/* CAC8E4 802406F4 3C03FFF0 */ lui $v1, 0xfff0 -/* CAC8E8 802406F8 3463FFFF */ ori $v1, $v1, 0xffff -/* CAC8EC 802406FC 0200202D */ daddu $a0, $s0, $zero -/* CAC8F0 80240700 00431024 */ and $v0, $v0, $v1 -/* CAC8F4 80240704 00021140 */ sll $v0, $v0, 5 -/* CAC8F8 80240708 3C068008 */ lui $a2, %hi(gItemTable) -/* CAC8FC 8024070C 00C23021 */ addu $a2, $a2, $v0 -/* CAC900 80240710 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* CAC904 80240714 0C0B2026 */ jal set_variable -/* CAC908 80240718 0220282D */ daddu $a1, $s1, $zero -/* CAC90C 8024071C 8FBF0018 */ lw $ra, 0x18($sp) -/* CAC910 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* CAC914 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* CAC918 80240728 24020002 */ addiu $v0, $zero, 2 -/* CAC91C 8024072C 03E00008 */ jr $ra -/* CAC920 80240730 27BD0020 */ addiu $sp, $sp, 0x20 -/* CAC924 80240734 00000000 */ nop -/* CAC928 80240738 00000000 */ nop -/* CAC92C 8024073C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_8024001C_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_8024001C_CAED40.s deleted file mode 100644 index d173ce6993..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_8024001C_CAED40.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_CAED5C -/* CAED5C 8024001C 3C02800A */ lui $v0, %hi(D_8009A650) -/* CAED60 80240020 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* CAED64 80240024 8C430000 */ lw $v1, ($v0) -/* CAED68 80240028 2404FFBF */ addiu $a0, $zero, -0x41 -/* CAED6C 8024002C 00641824 */ and $v1, $v1, $a0 -/* CAED70 80240030 AC430000 */ sw $v1, ($v0) -/* CAED74 80240034 03E00008 */ jr $ra -/* CAED78 80240038 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_8024003C_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_8024003C_CAED40.s deleted file mode 100644 index 4d00d78a6d..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_8024003C_CAED40.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024003C_CAED7C -/* CAED7C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CAED80 80240040 AFBF0010 */ sw $ra, 0x10($sp) -/* CAED84 80240044 8C82000C */ lw $v0, 0xc($a0) -/* CAED88 80240048 0C0B1EAF */ jal get_variable -/* CAED8C 8024004C 8C450000 */ lw $a1, ($v0) -/* CAED90 80240050 0C0B95A4 */ jal func_802E5690 -/* CAED94 80240054 0040202D */ daddu $a0, $v0, $zero -/* CAED98 80240058 8FBF0010 */ lw $ra, 0x10($sp) -/* CAED9C 8024005C 24020002 */ addiu $v0, $zero, 2 -/* CAEDA0 80240060 03E00008 */ jr $ra -/* CAEDA4 80240064 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80240068_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80240068_CAED40.s deleted file mode 100644 index 8304598e7d..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80240068_CAED40.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240068_CAEDA8 -/* CAEDA8 80240068 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CAEDAC 8024006C AFB00010 */ sw $s0, 0x10($sp) -/* CAEDB0 80240070 0080802D */ daddu $s0, $a0, $zero -/* CAEDB4 80240074 AFBF0018 */ sw $ra, 0x18($sp) -/* CAEDB8 80240078 AFB10014 */ sw $s1, 0x14($sp) -/* CAEDBC 8024007C 8E11000C */ lw $s1, 0xc($s0) -/* CAEDC0 80240080 8E250000 */ lw $a1, ($s1) -/* CAEDC4 80240084 0C0B1EAF */ jal get_variable -/* CAEDC8 80240088 26310004 */ addiu $s1, $s1, 4 -/* CAEDCC 8024008C 0200202D */ daddu $a0, $s0, $zero -/* CAEDD0 80240090 3C038011 */ lui $v1, %hi(gPlayerData) -/* CAEDD4 80240094 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* CAEDD8 80240098 000210C0 */ sll $v0, $v0, 3 -/* CAEDDC 8024009C 00431021 */ addu $v0, $v0, $v1 -/* CAEDE0 802400A0 90460015 */ lbu $a2, 0x15($v0) -/* CAEDE4 802400A4 8E250000 */ lw $a1, ($s1) -/* CAEDE8 802400A8 24C60001 */ addiu $a2, $a2, 1 -/* CAEDEC 802400AC A0460015 */ sb $a2, 0x15($v0) -/* CAEDF0 802400B0 00063600 */ sll $a2, $a2, 0x18 -/* CAEDF4 802400B4 0C0B2026 */ jal set_variable -/* CAEDF8 802400B8 00063603 */ sra $a2, $a2, 0x18 -/* CAEDFC 802400BC 8FBF0018 */ lw $ra, 0x18($sp) -/* CAEE00 802400C0 8FB10014 */ lw $s1, 0x14($sp) -/* CAEE04 802400C4 8FB00010 */ lw $s0, 0x10($sp) -/* CAEE08 802400C8 24020002 */ addiu $v0, $zero, 2 -/* CAEE0C 802400CC 03E00008 */ jr $ra -/* CAEE10 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_802400D4_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_802400D4_CAED40.s deleted file mode 100644 index 89a8e69494..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_802400D4_CAED40.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400D4_CAEE14 -/* CAEE14 802400D4 3C028011 */ lui $v0, %hi(gPlayerData) -/* CAEE18 802400D8 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* CAEE1C 802400DC 000420C0 */ sll $a0, $a0, 3 -/* CAEE20 802400E0 00822021 */ addu $a0, $a0, $v0 -/* CAEE24 802400E4 90820014 */ lbu $v0, 0x14($a0) -/* CAEE28 802400E8 10400009 */ beqz $v0, .L80240110 -/* CAEE2C 802400EC 00000000 */ nop -/* CAEE30 802400F0 90820015 */ lbu $v0, 0x15($a0) -/* CAEE34 802400F4 00022600 */ sll $a0, $v0, 0x18 -/* CAEE38 802400F8 00041E03 */ sra $v1, $a0, 0x18 -/* CAEE3C 802400FC 00051400 */ sll $v0, $a1, 0x10 -/* CAEE40 80240100 00021403 */ sra $v0, $v0, 0x10 -/* CAEE44 80240104 0043102A */ slt $v0, $v0, $v1 -/* CAEE48 80240108 10400003 */ beqz $v0, .L80240118 -/* CAEE4C 8024010C 00000000 */ nop -.L80240110: -/* CAEE50 80240110 03E00008 */ jr $ra -/* CAEE54 80240114 2402FFFF */ addiu $v0, $zero, -1 -.L80240118: -/* CAEE58 80240118 03E00008 */ jr $ra -/* CAEE5C 8024011C 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80240120_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80240120_CAED40.s deleted file mode 100644 index e9cd068a89..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80240120_CAED40.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240120_CAEE60 -/* CAEE60 80240120 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* CAEE64 80240124 AFB3001C */ sw $s3, 0x1c($sp) -/* CAEE68 80240128 0080982D */ daddu $s3, $a0, $zero -/* CAEE6C 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* CAEE70 80240130 24100001 */ addiu $s0, $zero, 1 -/* CAEE74 80240134 AFB40020 */ sw $s4, 0x20($sp) -/* CAEE78 80240138 2414FFFF */ addiu $s4, $zero, -1 -/* CAEE7C 8024013C AFB50024 */ sw $s5, 0x24($sp) -/* CAEE80 80240140 0200A82D */ daddu $s5, $s0, $zero -/* CAEE84 80240144 AFB10014 */ sw $s1, 0x14($sp) -/* CAEE88 80240148 3C118011 */ lui $s1, 0x8011 -/* CAEE8C 8024014C 2631F298 */ addiu $s1, $s1, -0xd68 -/* CAEE90 80240150 AFBF0028 */ sw $ra, 0x28($sp) -/* CAEE94 80240154 AFB20018 */ sw $s2, 0x18($sp) -/* CAEE98 80240158 8E6200B4 */ lw $v0, 0xb4($s3) -/* CAEE9C 8024015C 0280182D */ daddu $v1, $s4, $zero -/* CAEEA0 80240160 AE630084 */ sw $v1, 0x84($s3) -/* CAEEA4 80240164 00021027 */ nor $v0, $zero, $v0 -/* CAEEA8 80240168 000217C2 */ srl $v0, $v0, 0x1f -/* CAEEAC 8024016C 00029400 */ sll $s2, $v0, 0x10 -.L80240170: -/* CAEEB0 80240170 92220014 */ lbu $v0, 0x14($s1) -/* CAEEB4 80240174 50400008 */ beql $v0, $zero, .L80240198 -/* CAEEB8 80240178 26100001 */ addiu $s0, $s0, 1 -/* CAEEBC 8024017C 0200202D */ daddu $a0, $s0, $zero -/* CAEEC0 80240180 0C090035 */ jal func_802400D4 -/* CAEEC4 80240184 00122C03 */ sra $a1, $s2, 0x10 -/* CAEEC8 80240188 10540003 */ beq $v0, $s4, .L80240198 -/* CAEECC 8024018C 26100001 */ addiu $s0, $s0, 1 -/* CAEED0 80240190 08090069 */ j .L802401A4 -/* CAEED4 80240194 AE750084 */ sw $s5, 0x84($s3) -.L80240198: -/* CAEED8 80240198 2A02000C */ slti $v0, $s0, 0xc -/* CAEEDC 8024019C 1440FFF4 */ bnez $v0, .L80240170 -/* CAEEE0 802401A0 26310008 */ addiu $s1, $s1, 8 -.L802401A4: -/* CAEEE4 802401A4 8FBF0028 */ lw $ra, 0x28($sp) -/* CAEEE8 802401A8 8FB50024 */ lw $s5, 0x24($sp) -/* CAEEEC 802401AC 8FB40020 */ lw $s4, 0x20($sp) -/* CAEEF0 802401B0 8FB3001C */ lw $s3, 0x1c($sp) -/* CAEEF4 802401B4 8FB20018 */ lw $s2, 0x18($sp) -/* CAEEF8 802401B8 8FB10014 */ lw $s1, 0x14($sp) -/* CAEEFC 802401BC 8FB00010 */ lw $s0, 0x10($sp) -/* CAEF00 802401C0 24020002 */ addiu $v0, $zero, 2 -/* CAEF04 802401C4 03E00008 */ jr $ra -/* CAEF08 802401C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_802401CC_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_802401CC_CAED40.s deleted file mode 100644 index b66625b4cb..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_802401CC_CAED40.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401CC_CAEF0C -/* CAEF0C 802401CC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* CAEF10 802401D0 AFB5002C */ sw $s5, 0x2c($sp) -/* CAEF14 802401D4 0080A82D */ daddu $s5, $a0, $zero -/* CAEF18 802401D8 AFBE0038 */ sw $fp, 0x38($sp) -/* CAEF1C 802401DC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* CAEF20 802401E0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* CAEF24 802401E4 AFBF003C */ sw $ra, 0x3c($sp) -/* CAEF28 802401E8 AFB70034 */ sw $s7, 0x34($sp) -/* CAEF2C 802401EC AFB60030 */ sw $s6, 0x30($sp) -/* CAEF30 802401F0 AFB40028 */ sw $s4, 0x28($sp) -/* CAEF34 802401F4 AFB30024 */ sw $s3, 0x24($sp) -/* CAEF38 802401F8 AFB20020 */ sw $s2, 0x20($sp) -/* CAEF3C 802401FC AFB1001C */ sw $s1, 0x1c($sp) -/* CAEF40 80240200 10A0004F */ beqz $a1, .L80240340 -/* CAEF44 80240204 AFB00018 */ sw $s0, 0x18($sp) -/* CAEF48 80240208 0C00AB39 */ jal heap_malloc -/* CAEF4C 8024020C 24040330 */ addiu $a0, $zero, 0x330 -/* CAEF50 80240210 0040982D */ daddu $s3, $v0, $zero -/* CAEF54 80240214 0000B02D */ daddu $s6, $zero, $zero -/* CAEF58 80240218 02C0902D */ daddu $s2, $s6, $zero -/* CAEF5C 8024021C 3C148024 */ lui $s4, 0x8024 -/* CAEF60 80240220 26941FB8 */ addiu $s4, $s4, 0x1fb8 -/* CAEF64 80240224 0260882D */ daddu $s1, $s3, $zero -/* CAEF68 80240228 8EA200B4 */ lw $v0, 0xb4($s5) -/* CAEF6C 8024022C 3C038024 */ lui $v1, 0x8024 -/* CAEF70 80240230 24631FB0 */ addiu $v1, $v1, 0x1fb0 -/* CAEF74 80240234 AEB30078 */ sw $s3, 0x78($s5) -/* CAEF78 80240238 00021027 */ nor $v0, $zero, $v0 -/* CAEF7C 8024023C 0002BFC2 */ srl $s7, $v0, 0x1f -/* CAEF80 80240240 00171080 */ sll $v0, $s7, 2 -/* CAEF84 80240244 00431021 */ addu $v0, $v0, $v1 -/* CAEF88 80240248 AFA20010 */ sw $v0, 0x10($sp) -.L8024024C: -/* CAEF8C 8024024C 86900000 */ lh $s0, ($s4) -/* CAEF90 80240250 001010C0 */ sll $v0, $s0, 3 -/* CAEF94 80240254 03C21021 */ addu $v0, $fp, $v0 -/* CAEF98 80240258 90420014 */ lbu $v0, 0x14($v0) -/* CAEF9C 8024025C 5040002E */ beql $v0, $zero, .L80240318 -/* CAEFA0 80240260 26520001 */ addiu $s2, $s2, 1 -/* CAEFA4 80240264 00101100 */ sll $v0, $s0, 4 -/* CAEFA8 80240268 3C068009 */ lui $a2, 0x8009 -/* CAEFAC 8024026C 24C6EF20 */ addiu $a2, $a2, -0x10e0 -/* CAEFB0 80240270 00461021 */ addu $v0, $v0, $a2 -/* CAEFB4 80240274 0200202D */ daddu $a0, $s0, $zero -/* CAEFB8 80240278 AE300108 */ sw $s0, 0x108($s1) -/* CAEFBC 8024027C 8C420000 */ lw $v0, ($v0) -/* CAEFC0 80240280 02E0282D */ daddu $a1, $s7, $zero -/* CAEFC4 80240284 0C090035 */ jal func_802400D4 -/* CAEFC8 80240288 AE220084 */ sw $v0, 0x84($s1) -/* CAEFCC 8024028C 0040202D */ daddu $a0, $v0, $zero -/* CAEFD0 80240290 04800011 */ bltz $a0, .L802402D8 -/* CAEFD4 80240294 00101080 */ sll $v0, $s0, 2 -/* CAEFD8 80240298 3C06800F */ lui $a2, 0x800f -/* CAEFDC 8024029C 24C67F00 */ addiu $a2, $a2, 0x7f00 -/* CAEFE0 802402A0 00461021 */ addu $v0, $v0, $a2 -/* CAEFE4 802402A4 8C430000 */ lw $v1, ($v0) -/* CAEFE8 802402A8 24020001 */ addiu $v0, $zero, 1 -/* CAEFEC 802402AC AE22018C */ sw $v0, 0x18c($s1) -/* CAEFF0 802402B0 00041080 */ sll $v0, $a0, 2 -/* CAEFF4 802402B4 3C068024 */ lui $a2, 0x8024 -/* CAEFF8 802402B8 24C61FC8 */ addiu $a2, $a2, 0x1fc8 -/* CAEFFC 802402BC AE230000 */ sw $v1, ($s1) -/* CAF000 802402C0 001218C0 */ sll $v1, $s2, 3 -/* CAF004 802402C4 00431021 */ addu $v0, $v0, $v1 -/* CAF008 802402C8 00461021 */ addu $v0, $v0, $a2 -/* CAF00C 802402CC 8C420000 */ lw $v0, ($v0) -/* CAF010 802402D0 080900BF */ j .L802402FC -/* CAF014 802402D4 AE220294 */ sw $v0, 0x294($s1) -.L802402D8: -/* CAF018 802402D8 3C06800F */ lui $a2, 0x800f -/* CAF01C 802402DC 24C67F40 */ addiu $a2, $a2, 0x7f40 -/* CAF020 802402E0 00461021 */ addu $v0, $v0, $a2 -/* CAF024 802402E4 8C420000 */ lw $v0, ($v0) -/* CAF028 802402E8 AE20018C */ sw $zero, 0x18c($s1) -/* CAF02C 802402EC AE220000 */ sw $v0, ($s1) -/* CAF030 802402F0 8FA60010 */ lw $a2, 0x10($sp) -/* CAF034 802402F4 8CC20000 */ lw $v0, ($a2) -/* CAF038 802402F8 AE220294 */ sw $v0, 0x294($s1) -.L802402FC: -/* CAF03C 802402FC 001010C0 */ sll $v0, $s0, 3 -/* CAF040 80240300 03C21021 */ addu $v0, $fp, $v0 -/* CAF044 80240304 80420015 */ lb $v0, 0x15($v0) -/* CAF048 80240308 26D60001 */ addiu $s6, $s6, 1 -/* CAF04C 8024030C AE220210 */ sw $v0, 0x210($s1) -/* CAF050 80240310 26310004 */ addiu $s1, $s1, 4 -/* CAF054 80240314 26520001 */ addiu $s2, $s2, 1 -.L80240318: -/* CAF058 80240318 2A420008 */ slti $v0, $s2, 8 -/* CAF05C 8024031C 1440FFCB */ bnez $v0, .L8024024C -/* CAF060 80240320 26940002 */ addiu $s4, $s4, 2 -/* CAF064 80240324 0260202D */ daddu $a0, $s3, $zero -/* CAF068 80240328 24020004 */ addiu $v0, $zero, 4 -/* CAF06C 8024032C AC820318 */ sw $v0, 0x318($a0) -/* CAF070 80240330 AC960324 */ sw $s6, 0x324($a0) -/* CAF074 80240334 0C03D390 */ jal func_800F4E40 -/* CAF078 80240338 AC800328 */ sw $zero, 0x328($a0) -/* CAF07C 8024033C AEA00070 */ sw $zero, 0x70($s5) -.L80240340: -/* CAF080 80240340 8EA20070 */ lw $v0, 0x70($s5) -/* CAF084 80240344 8EB30078 */ lw $s3, 0x78($s5) -/* CAF088 80240348 14400008 */ bnez $v0, .L8024036C -/* CAF08C 8024034C 24420001 */ addiu $v0, $v0, 1 -/* CAF090 80240350 8662032C */ lh $v0, 0x32c($s3) -/* CAF094 80240354 10400009 */ beqz $v0, .L8024037C -/* CAF098 80240358 AEA20074 */ sw $v0, 0x74($s5) -/* CAF09C 8024035C 0C03C4EC */ jal func_800F13B0 -/* CAF0A0 80240360 00000000 */ nop -/* CAF0A4 80240364 8EA20070 */ lw $v0, 0x70($s5) -/* CAF0A8 80240368 24420001 */ addiu $v0, $v0, 1 -.L8024036C: -/* CAF0AC 8024036C AEA20070 */ sw $v0, 0x70($s5) -/* CAF0B0 80240370 2842000F */ slti $v0, $v0, 0xf -/* CAF0B4 80240374 10400003 */ beqz $v0, .L80240384 -/* CAF0B8 80240378 00000000 */ nop -.L8024037C: -/* CAF0BC 8024037C 080900FB */ j .L802403EC -/* CAF0C0 80240380 0000102D */ daddu $v0, $zero, $zero -.L80240384: -/* CAF0C4 80240384 0C03C54E */ jal func_800F1538 -/* CAF0C8 80240388 00000000 */ nop -/* CAF0CC 8024038C 8EA30074 */ lw $v1, 0x74($s5) -/* CAF0D0 80240390 240200FF */ addiu $v0, $zero, 0xff -/* CAF0D4 80240394 10620010 */ beq $v1, $v0, .L802403D8 -/* CAF0D8 80240398 2462FFFF */ addiu $v0, $v1, -1 -/* CAF0DC 8024039C 00021080 */ sll $v0, $v0, 2 -/* CAF0E0 802403A0 02621021 */ addu $v0, $s3, $v0 -/* CAF0E4 802403A4 8C420108 */ lw $v0, 0x108($v0) -/* CAF0E8 802403A8 00021100 */ sll $v0, $v0, 4 -/* CAF0EC 802403AC 3C038009 */ lui $v1, 0x8009 -/* CAF0F0 802403B0 00621821 */ addu $v1, $v1, $v0 -/* CAF0F4 802403B4 8C63EF20 */ lw $v1, -0x10e0($v1) -/* CAF0F8 802403B8 8EA20074 */ lw $v0, 0x74($s5) -/* CAF0FC 802403BC 2442FFFF */ addiu $v0, $v0, -1 -/* CAF100 802403C0 00021080 */ sll $v0, $v0, 2 -/* CAF104 802403C4 02621021 */ addu $v0, $s3, $v0 -/* CAF108 802403C8 AEA30084 */ sw $v1, 0x84($s5) -/* CAF10C 802403CC 8C420108 */ lw $v0, 0x108($v0) -/* CAF110 802403D0 080900F8 */ j .L802403E0 -/* CAF114 802403D4 AEA20088 */ sw $v0, 0x88($s5) -.L802403D8: -/* CAF118 802403D8 2402FFFF */ addiu $v0, $zero, -1 -/* CAF11C 802403DC AEA20084 */ sw $v0, 0x84($s5) -.L802403E0: -/* CAF120 802403E0 0C00AB4B */ jal heap_free -/* CAF124 802403E4 8EA40078 */ lw $a0, 0x78($s5) -/* CAF128 802403E8 24020002 */ addiu $v0, $zero, 2 -.L802403EC: -/* CAF12C 802403EC 8FBF003C */ lw $ra, 0x3c($sp) -/* CAF130 802403F0 8FBE0038 */ lw $fp, 0x38($sp) -/* CAF134 802403F4 8FB70034 */ lw $s7, 0x34($sp) -/* CAF138 802403F8 8FB60030 */ lw $s6, 0x30($sp) -/* CAF13C 802403FC 8FB5002C */ lw $s5, 0x2c($sp) -/* CAF140 80240400 8FB40028 */ lw $s4, 0x28($sp) -/* CAF144 80240404 8FB30024 */ lw $s3, 0x24($sp) -/* CAF148 80240408 8FB20020 */ lw $s2, 0x20($sp) -/* CAF14C 8024040C 8FB1001C */ lw $s1, 0x1c($sp) -/* CAF150 80240410 8FB00018 */ lw $s0, 0x18($sp) -/* CAF154 80240414 03E00008 */ jr $ra -/* CAF158 80240418 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_8024041C_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_8024041C_CAED40.s deleted file mode 100644 index f089cee433..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_8024041C_CAED40.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024041C_CAF15C -/* CAF15C 8024041C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CAF160 80240420 AFBF0010 */ sw $ra, 0x10($sp) -/* CAF164 80240424 8C82000C */ lw $v0, 0xc($a0) -/* CAF168 80240428 0C0B1EAF */ jal get_variable -/* CAF16C 8024042C 8C450000 */ lw $a1, ($v0) -/* CAF170 80240430 0C03AC5A */ jal func_800EB168 -/* CAF174 80240434 0040202D */ daddu $a0, $v0, $zero -/* CAF178 80240438 8FBF0010 */ lw $ra, 0x10($sp) -/* CAF17C 8024043C 24020002 */ addiu $v0, $zero, 2 -/* CAF180 80240440 03E00008 */ jr $ra -/* CAF184 80240444 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80240448_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80240448_CAED40.s deleted file mode 100644 index 78f957404c..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80240448_CAED40.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240448_CAF188 -/* CAF188 80240448 3C028011 */ lui $v0, 0x8011 -/* CAF18C 8024044C 8042F2A2 */ lb $v0, -0xd5e($v0) -/* CAF190 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CAF194 80240454 AFBF0010 */ sw $ra, 0x10($sp) -/* CAF198 80240458 00021100 */ sll $v0, $v0, 4 -/* CAF19C 8024045C 3C048009 */ lui $a0, 0x8009 -/* CAF1A0 80240460 00822021 */ addu $a0, $a0, $v0 -/* CAF1A4 80240464 8C84EF20 */ lw $a0, -0x10e0($a0) -/* CAF1A8 80240468 0C0496CF */ jal set_message_string -/* CAF1AC 8024046C 0000282D */ daddu $a1, $zero, $zero -/* CAF1B0 80240470 8FBF0010 */ lw $ra, 0x10($sp) -/* CAF1B4 80240474 24020002 */ addiu $v0, $zero, 2 -/* CAF1B8 80240478 03E00008 */ jr $ra -/* CAF1BC 8024047C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80240480_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80240480_CAED40.s deleted file mode 100644 index a0dab30d31..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80240480_CAED40.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240480_CAF1C0 -/* CAF1C0 80240480 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CAF1C4 80240484 AFB1001C */ sw $s1, 0x1c($sp) -/* CAF1C8 80240488 0080882D */ daddu $s1, $a0, $zero -/* CAF1CC 8024048C AFBF0020 */ sw $ra, 0x20($sp) -/* CAF1D0 80240490 AFB00018 */ sw $s0, 0x18($sp) -/* CAF1D4 80240494 8E30000C */ lw $s0, 0xc($s1) -/* CAF1D8 80240498 8E050000 */ lw $a1, ($s0) -/* CAF1DC 8024049C 0C0B1EAF */ jal get_variable -/* CAF1E0 802404A0 26100004 */ addiu $s0, $s0, 4 -/* CAF1E4 802404A4 0C04417A */ jal get_entity_by_index -/* CAF1E8 802404A8 0040202D */ daddu $a0, $v0, $zero -/* CAF1EC 802404AC 8E100000 */ lw $s0, ($s0) -/* CAF1F0 802404B0 C444004C */ lwc1 $f4, 0x4c($v0) -/* CAF1F4 802404B4 3C014148 */ lui $at, 0x4148 -/* CAF1F8 802404B8 44810000 */ mtc1 $at, $f0 -/* CAF1FC 802404BC 3C013F33 */ lui $at, 0x3f33 -/* CAF200 802404C0 34213333 */ ori $at, $at, 0x3333 -/* CAF204 802404C4 44811000 */ mtc1 $at, $f2 -/* CAF208 802404C8 AFA00014 */ sw $zero, 0x14($sp) -/* CAF20C 802404CC 46002100 */ add.s $f4, $f4, $f0 -/* CAF210 802404D0 E7A20010 */ swc1 $f2, 0x10($sp) -/* CAF214 802404D4 8C450048 */ lw $a1, 0x48($v0) -/* CAF218 802404D8 8C470050 */ lw $a3, 0x50($v0) -/* CAF21C 802404DC 44062000 */ mfc1 $a2, $f4 -/* CAF220 802404E0 0C01C5D4 */ jal func_80071750 -/* CAF224 802404E4 0000202D */ daddu $a0, $zero, $zero -/* CAF228 802404E8 0220202D */ daddu $a0, $s1, $zero -/* CAF22C 802404EC 0200282D */ daddu $a1, $s0, $zero -/* CAF230 802404F0 0C0B2026 */ jal set_variable -/* CAF234 802404F4 0040302D */ daddu $a2, $v0, $zero -/* CAF238 802404F8 8FBF0020 */ lw $ra, 0x20($sp) -/* CAF23C 802404FC 8FB1001C */ lw $s1, 0x1c($sp) -/* CAF240 80240500 8FB00018 */ lw $s0, 0x18($sp) -/* CAF244 80240504 24020002 */ addiu $v0, $zero, 2 -/* CAF248 80240508 03E00008 */ jr $ra -/* CAF24C 8024050C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80240510_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80240510_CAED40.s deleted file mode 100644 index 7dc30db3c8..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80240510_CAED40.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240510_CAF250 -/* CAF250 80240510 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CAF254 80240514 AFBF0010 */ sw $ra, 0x10($sp) -/* CAF258 80240518 8C82000C */ lw $v0, 0xc($a0) -/* CAF25C 8024051C 0C0B1EAF */ jal get_variable -/* CAF260 80240520 8C450000 */ lw $a1, ($v0) -/* CAF264 80240524 0040202D */ daddu $a0, $v0, $zero -/* CAF268 80240528 8C830000 */ lw $v1, ($a0) -/* CAF26C 8024052C 34630010 */ ori $v1, $v1, 0x10 -/* CAF270 80240530 AC830000 */ sw $v1, ($a0) -/* CAF274 80240534 8FBF0010 */ lw $ra, 0x10($sp) -/* CAF278 80240538 24020002 */ addiu $v0, $zero, 2 -/* CAF27C 8024053C 03E00008 */ jr $ra -/* CAF280 80240540 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80240544_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80240544_CAED40.s deleted file mode 100644 index 31eb6ae686..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80240544_CAED40.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240544_CAF284 -/* CAF284 80240544 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CAF288 80240548 AFBF0018 */ sw $ra, 0x18($sp) -/* CAF28C 8024054C 8C82000C */ lw $v0, 0xc($a0) -/* CAF290 80240550 0C0B1EAF */ jal get_variable -/* CAF294 80240554 8C450000 */ lw $a1, ($v0) -/* CAF298 80240558 0C04417A */ jal get_entity_by_index -/* CAF29C 8024055C 0040202D */ daddu $a0, $v0, $zero -/* CAF2A0 80240560 3C013F80 */ lui $at, 0x3f80 -/* CAF2A4 80240564 44810000 */ mtc1 $at, $f0 -/* CAF2A8 80240568 C442004C */ lwc1 $f2, 0x4c($v0) -/* CAF2AC 8024056C E7A00010 */ swc1 $f0, 0x10($sp) -/* CAF2B0 80240570 3C014148 */ lui $at, 0x4148 -/* CAF2B4 80240574 44810000 */ mtc1 $at, $f0 -/* CAF2B8 80240578 2403004B */ addiu $v1, $zero, 0x4b -/* CAF2BC 8024057C AFA30014 */ sw $v1, 0x14($sp) -/* CAF2C0 80240580 46001080 */ add.s $f2, $f2, $f0 -/* CAF2C4 80240584 8C450048 */ lw $a1, 0x48($v0) -/* CAF2C8 80240588 8C470050 */ lw $a3, 0x50($v0) -/* CAF2CC 8024058C 44061000 */ mfc1 $a2, $f2 -/* CAF2D0 80240590 0C01C2EC */ jal func_80070BB0 -/* CAF2D4 80240594 24040004 */ addiu $a0, $zero, 4 -/* CAF2D8 80240598 8FBF0018 */ lw $ra, 0x18($sp) -/* CAF2DC 8024059C 24020002 */ addiu $v0, $zero, 2 -/* CAF2E0 802405A0 03E00008 */ jr $ra -/* CAF2E4 802405A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_802405A8_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_802405A8_CAED40.s deleted file mode 100644 index 7bfbdda10b..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_802405A8_CAED40.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A8_CAF2E8 -/* CAF2E8 802405A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CAF2EC 802405AC AFBF0018 */ sw $ra, 0x18($sp) -/* CAF2F0 802405B0 0C00EAD2 */ jal get_npc_safe -/* CAF2F4 802405B4 2404FFFC */ addiu $a0, $zero, -4 -/* CAF2F8 802405B8 C444003C */ lwc1 $f4, 0x3c($v0) -/* CAF2FC 802405BC 3C014148 */ lui $at, 0x4148 -/* CAF300 802405C0 44811000 */ mtc1 $at, $f2 -/* CAF304 802405C4 3C013F80 */ lui $at, 0x3f80 -/* CAF308 802405C8 44810000 */ mtc1 $at, $f0 -/* CAF30C 802405CC 2403001E */ addiu $v1, $zero, 0x1e -/* CAF310 802405D0 AFA30014 */ sw $v1, 0x14($sp) -/* CAF314 802405D4 46022100 */ add.s $f4, $f4, $f2 -/* CAF318 802405D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* CAF31C 802405DC 8C450038 */ lw $a1, 0x38($v0) -/* CAF320 802405E0 8C470040 */ lw $a3, 0x40($v0) -/* CAF324 802405E4 44062000 */ mfc1 $a2, $f4 -/* CAF328 802405E8 0C01C2EC */ jal func_80070BB0 -/* CAF32C 802405EC 24040009 */ addiu $a0, $zero, 9 -/* CAF330 802405F0 8FBF0018 */ lw $ra, 0x18($sp) -/* CAF334 802405F4 24020002 */ addiu $v0, $zero, 2 -/* CAF338 802405F8 03E00008 */ jr $ra -/* CAF33C 802405FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80240600_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80240600_CAED40.s deleted file mode 100644 index b0fe73e0a5..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80240600_CAED40.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240600_CAF340 -/* CAF340 80240600 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* CAF344 80240604 AFB60040 */ sw $s6, 0x40($sp) -/* CAF348 80240608 0080B02D */ daddu $s6, $a0, $zero -/* CAF34C 8024060C AFB00028 */ sw $s0, 0x28($sp) -/* CAF350 80240610 00A0802D */ daddu $s0, $a1, $zero -/* CAF354 80240614 AFBF0044 */ sw $ra, 0x44($sp) -/* CAF358 80240618 AFB5003C */ sw $s5, 0x3c($sp) -/* CAF35C 8024061C AFB40038 */ sw $s4, 0x38($sp) -/* CAF360 80240620 AFB30034 */ sw $s3, 0x34($sp) -/* CAF364 80240624 AFB20030 */ sw $s2, 0x30($sp) -/* CAF368 80240628 AFB1002C */ sw $s1, 0x2c($sp) -/* CAF36C 8024062C F7B80058 */ sdc1 $f24, 0x58($sp) -/* CAF370 80240630 F7B60050 */ sdc1 $f22, 0x50($sp) -/* CAF374 80240634 F7B40048 */ sdc1 $f20, 0x48($sp) -/* CAF378 80240638 8ED3000C */ lw $s3, 0xc($s6) -/* CAF37C 8024063C 0C00EAD2 */ jal get_npc_safe -/* CAF380 80240640 2404FFFC */ addiu $a0, $zero, -4 -/* CAF384 80240644 27A50018 */ addiu $a1, $sp, 0x18 -/* CAF388 80240648 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* CAF38C 8024064C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* CAF390 80240650 27A6001C */ addiu $a2, $sp, 0x1c -/* CAF394 80240654 00041880 */ sll $v1, $a0, 2 -/* CAF398 80240658 00641821 */ addu $v1, $v1, $a0 -/* CAF39C 8024065C 00031880 */ sll $v1, $v1, 2 -/* CAF3A0 80240660 00641823 */ subu $v1, $v1, $a0 -/* CAF3A4 80240664 000320C0 */ sll $a0, $v1, 3 -/* CAF3A8 80240668 00641821 */ addu $v1, $v1, $a0 -/* CAF3AC 8024066C 000318C0 */ sll $v1, $v1, 3 -/* CAF3B0 80240670 3C01800B */ lui $at, 0x800b -/* CAF3B4 80240674 00230821 */ addu $at, $at, $v1 -/* CAF3B8 80240678 C42C1DEC */ lwc1 $f12, 0x1dec($at) -/* CAF3BC 8024067C 0C00A88D */ jal sin_cos_deg -/* CAF3C0 80240680 0040A82D */ daddu $s5, $v0, $zero -/* CAF3C4 80240684 1200005D */ beqz $s0, .L802407FC -/* CAF3C8 80240688 00000000 */ nop -/* CAF3CC 8024068C 0C00AB0A */ jal general_heap_malloc -/* CAF3D0 80240690 24040068 */ addiu $a0, $zero, 0x68 -/* CAF3D4 80240694 0040902D */ daddu $s2, $v0, $zero -/* CAF3D8 80240698 02C0202D */ daddu $a0, $s6, $zero -/* CAF3DC 8024069C 0000882D */ daddu $s1, $zero, $zero -/* CAF3E0 802406A0 2414FFFF */ addiu $s4, $zero, -1 -/* CAF3E4 802406A4 AED20060 */ sw $s2, 0x60($s6) -/* CAF3E8 802406A8 8E650000 */ lw $a1, ($s3) -/* CAF3EC 802406AC 3C014148 */ lui $at, 0x4148 -/* CAF3F0 802406B0 4481C000 */ mtc1 $at, $f24 -/* CAF3F4 802406B4 3C013F80 */ lui $at, 0x3f80 -/* CAF3F8 802406B8 4481B000 */ mtc1 $at, $f22 -/* CAF3FC 802406BC 4480A000 */ mtc1 $zero, $f20 -/* CAF400 802406C0 0C0B1EAF */ jal get_variable -/* CAF404 802406C4 0240802D */ daddu $s0, $s2, $zero -/* CAF408 802406C8 0C04417A */ jal get_entity_by_index -/* CAF40C 802406CC 0040202D */ daddu $a0, $v0, $zero -/* CAF410 802406D0 AE42005C */ sw $v0, 0x5c($s2) -.L802406D4: -/* CAF414 802406D4 8E42005C */ lw $v0, 0x5c($s2) -/* CAF418 802406D8 C440004C */ lwc1 $f0, 0x4c($v0) -/* CAF41C 802406DC 0000202D */ daddu $a0, $zero, $zero -/* CAF420 802406E0 E7B60010 */ swc1 $f22, 0x10($sp) -/* CAF424 802406E4 AFB40014 */ sw $s4, 0x14($sp) -/* CAF428 802406E8 46180000 */ add.s $f0, $f0, $f24 -/* CAF42C 802406EC 8C450048 */ lw $a1, 0x48($v0) -/* CAF430 802406F0 8C470050 */ lw $a3, 0x50($v0) -/* CAF434 802406F4 44060000 */ mfc1 $a2, $f0 -/* CAF438 802406F8 0C01C5BC */ jal func_800716F0 -/* CAF43C 802406FC 26310001 */ addiu $s1, $s1, 1 -/* CAF440 80240700 AE020008 */ sw $v0, 8($s0) -/* CAF444 80240704 E614002C */ swc1 $f20, 0x2c($s0) -/* CAF448 80240708 E6140020 */ swc1 $f20, 0x20($s0) -/* CAF44C 8024070C E6140014 */ swc1 $f20, 0x14($s0) -/* CAF450 80240710 E6140050 */ swc1 $f20, 0x50($s0) -/* CAF454 80240714 E6140044 */ swc1 $f20, 0x44($s0) -/* CAF458 80240718 E6140038 */ swc1 $f20, 0x38($s0) -/* CAF45C 8024071C 2A220003 */ slti $v0, $s1, 3 -/* CAF460 80240720 1440FFEC */ bnez $v0, .L802406D4 -/* CAF464 80240724 26100004 */ addiu $s0, $s0, 4 -/* CAF468 80240728 0000882D */ daddu $s1, $zero, $zero -/* CAF46C 8024072C 0240802D */ daddu $s0, $s2, $zero -/* CAF470 80240730 3C148024 */ lui $s4, 0x8024 -/* CAF474 80240734 26942008 */ addiu $s4, $s4, 0x2008 -/* CAF478 80240738 3C014248 */ lui $at, 0x4248 -/* CAF47C 8024073C 4481A000 */ mtc1 $at, $f20 -/* CAF480 80240740 24130044 */ addiu $s3, $zero, 0x44 -/* CAF484 80240744 AE400000 */ sw $zero, ($s2) -/* CAF488 80240748 AE400004 */ sw $zero, 4($s2) -/* CAF48C 8024074C AE400060 */ sw $zero, 0x60($s2) -/* CAF490 80240750 AE400064 */ sw $zero, 0x64($s2) -.L80240754: -/* CAF494 80240754 27A40020 */ addiu $a0, $sp, 0x20 -/* CAF498 80240758 4406A000 */ mfc1 $a2, $f20 -/* CAF49C 8024075C 8E870000 */ lw $a3, ($s4) -/* CAF4A0 80240760 02532821 */ addu $a1, $s2, $s3 -/* CAF4A4 80240764 0C00A7E7 */ jal add_vec2D_polar -/* CAF4A8 80240768 AFA00020 */ sw $zero, 0x20($sp) -/* CAF4AC 8024076C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* CAF4B0 80240770 C7A40020 */ lwc1 $f4, 0x20($sp) -/* CAF4B4 80240774 46041082 */ mul.s $f2, $f2, $f4 -/* CAF4B8 80240778 00000000 */ nop -/* CAF4BC 8024077C C7A00018 */ lwc1 $f0, 0x18($sp) -/* CAF4C0 80240780 46040002 */ mul.s $f0, $f0, $f4 -/* CAF4C4 80240784 00000000 */ nop -/* CAF4C8 80240788 E6020038 */ swc1 $f2, 0x38($s0) -/* CAF4CC 8024078C E6000050 */ swc1 $f0, 0x50($s0) -/* CAF4D0 80240790 8E42005C */ lw $v0, 0x5c($s2) -/* CAF4D4 80240794 C6000038 */ lwc1 $f0, 0x38($s0) -/* CAF4D8 80240798 C4420048 */ lwc1 $f2, 0x48($v0) -/* CAF4DC 8024079C 46001080 */ add.s $f2, $f2, $f0 -/* CAF4E0 802407A0 C6A00038 */ lwc1 $f0, 0x38($s5) -/* CAF4E4 802407A4 46020001 */ sub.s $f0, $f0, $f2 -/* CAF4E8 802407A8 E6000038 */ swc1 $f0, 0x38($s0) -/* CAF4EC 802407AC 8E42005C */ lw $v0, 0x5c($s2) -/* CAF4F0 802407B0 C6000044 */ lwc1 $f0, 0x44($s0) -/* CAF4F4 802407B4 C442004C */ lwc1 $f2, 0x4c($v0) -/* CAF4F8 802407B8 46001080 */ add.s $f2, $f2, $f0 -/* CAF4FC 802407BC C6A0003C */ lwc1 $f0, 0x3c($s5) -/* CAF500 802407C0 46020001 */ sub.s $f0, $f0, $f2 -/* CAF504 802407C4 E6000044 */ swc1 $f0, 0x44($s0) -/* CAF508 802407C8 8E42005C */ lw $v0, 0x5c($s2) -/* CAF50C 802407CC C6000050 */ lwc1 $f0, 0x50($s0) -/* CAF510 802407D0 C4420050 */ lwc1 $f2, 0x50($v0) -/* CAF514 802407D4 26940004 */ addiu $s4, $s4, 4 -/* CAF518 802407D8 46001080 */ add.s $f2, $f2, $f0 -/* CAF51C 802407DC C6A00040 */ lwc1 $f0, 0x40($s5) -/* CAF520 802407E0 26730004 */ addiu $s3, $s3, 4 -/* CAF524 802407E4 46020001 */ sub.s $f0, $f0, $f2 -/* CAF528 802407E8 26310001 */ addiu $s1, $s1, 1 -/* CAF52C 802407EC 2A220003 */ slti $v0, $s1, 3 -/* CAF530 802407F0 E6000050 */ swc1 $f0, 0x50($s0) -/* CAF534 802407F4 1440FFD7 */ bnez $v0, .L80240754 -/* CAF538 802407F8 26100004 */ addiu $s0, $s0, 4 -.L802407FC: -/* CAF53C 802407FC 8ED20060 */ lw $s2, 0x60($s6) -/* CAF540 80240800 8E430000 */ lw $v1, ($s2) -/* CAF544 80240804 24020001 */ addiu $v0, $zero, 1 -/* CAF548 80240808 10620038 */ beq $v1, $v0, .L802408EC -/* CAF54C 8024080C 28620002 */ slti $v0, $v1, 2 -/* CAF550 80240810 50400005 */ beql $v0, $zero, .L80240828 -/* CAF554 80240814 24020002 */ addiu $v0, $zero, 2 -/* CAF558 80240818 10600007 */ beqz $v1, .L80240838 -/* CAF55C 8024081C 24040005 */ addiu $a0, $zero, 5 -/* CAF560 80240820 08090274 */ j .L802409D0 -/* CAF564 80240824 00000000 */ nop -.L80240828: -/* CAF568 80240828 10620058 */ beq $v1, $v0, .L8024098C -/* CAF56C 8024082C 00000000 */ nop -/* CAF570 80240830 08090274 */ j .L802409D0 -/* CAF574 80240834 00000000 */ nop -.L80240838: -/* CAF578 80240838 0000882D */ daddu $s1, $zero, $zero -/* CAF57C 8024083C 3C148024 */ lui $s4, 0x8024 -/* CAF580 80240840 26942008 */ addiu $s4, $s4, 0x2008 -/* CAF584 80240844 24130020 */ addiu $s3, $zero, 0x20 -/* CAF588 80240848 3C064248 */ lui $a2, 0x4248 -/* CAF58C 8024084C 44800000 */ mtc1 $zero, $f0 -/* CAF590 80240850 24020014 */ addiu $v0, $zero, 0x14 -/* CAF594 80240854 AFA20010 */ sw $v0, 0x10($sp) -/* CAF598 80240858 44050000 */ mfc1 $a1, $f0 -/* CAF59C 8024085C 8E470060 */ lw $a3, 0x60($s2) -/* CAF5A0 80240860 4485B000 */ mtc1 $a1, $f22 -/* CAF5A4 80240864 0C00A8ED */ jal update_lerp -/* CAF5A8 80240868 0240802D */ daddu $s0, $s2, $zero -/* CAF5AC 8024086C 46000506 */ mov.s $f20, $f0 -.L80240870: -/* CAF5B0 80240870 4406A000 */ mfc1 $a2, $f20 -/* CAF5B4 80240874 27A40020 */ addiu $a0, $sp, 0x20 -/* CAF5B8 80240878 E6160020 */ swc1 $f22, 0x20($s0) -/* CAF5BC 8024087C 8E870000 */ lw $a3, ($s4) -/* CAF5C0 80240880 02532821 */ addu $a1, $s2, $s3 -/* CAF5C4 80240884 0C00A7E7 */ jal add_vec2D_polar -/* CAF5C8 80240888 E7B60020 */ swc1 $f22, 0x20($sp) -/* CAF5CC 8024088C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* CAF5D0 80240890 C7A00020 */ lwc1 $f0, 0x20($sp) -/* CAF5D4 80240894 46002102 */ mul.s $f4, $f4, $f0 -/* CAF5D8 80240898 00000000 */ nop -/* CAF5DC 8024089C C7A20018 */ lwc1 $f2, 0x18($sp) -/* CAF5E0 802408A0 26940004 */ addiu $s4, $s4, 4 -/* CAF5E4 802408A4 46001082 */ mul.s $f2, $f2, $f0 -/* CAF5E8 802408A8 00000000 */ nop -/* CAF5EC 802408AC 26730004 */ addiu $s3, $s3, 4 -/* CAF5F0 802408B0 26310001 */ addiu $s1, $s1, 1 -/* CAF5F4 802408B4 2A220003 */ slti $v0, $s1, 3 -/* CAF5F8 802408B8 E6040014 */ swc1 $f4, 0x14($s0) -/* CAF5FC 802408BC E602002C */ swc1 $f2, 0x2c($s0) -/* CAF600 802408C0 1440FFEB */ bnez $v0, .L80240870 -/* CAF604 802408C4 26100004 */ addiu $s0, $s0, 4 -/* CAF608 802408C8 8E420060 */ lw $v0, 0x60($s2) -/* CAF60C 802408CC 24420001 */ addiu $v0, $v0, 1 -/* CAF610 802408D0 AE420060 */ sw $v0, 0x60($s2) -/* CAF614 802408D4 28420015 */ slti $v0, $v0, 0x15 -/* CAF618 802408D8 1440003D */ bnez $v0, .L802409D0 -/* CAF61C 802408DC 24020001 */ addiu $v0, $zero, 1 -/* CAF620 802408E0 AE420000 */ sw $v0, ($s2) -/* CAF624 802408E4 08090274 */ j .L802409D0 -/* CAF628 802408E8 AE400060 */ sw $zero, 0x60($s2) -.L802408EC: -/* CAF62C 802408EC 0000882D */ daddu $s1, $zero, $zero -/* CAF630 802408F0 3C148024 */ lui $s4, 0x8024 -/* CAF634 802408F4 26942008 */ addiu $s4, $s4, 0x2008 -/* CAF638 802408F8 24130020 */ addiu $s3, $zero, 0x20 -/* CAF63C 802408FC 0240802D */ daddu $s0, $s2, $zero -/* CAF640 80240900 3C014248 */ lui $at, 0x4248 -/* CAF644 80240904 4481A000 */ mtc1 $at, $f20 -/* CAF648 80240908 4480B000 */ mtc1 $zero, $f22 -.L8024090C: -/* CAF64C 8024090C 4406A000 */ mfc1 $a2, $f20 -/* CAF650 80240910 27A40020 */ addiu $a0, $sp, 0x20 -/* CAF654 80240914 E6160020 */ swc1 $f22, 0x20($s0) -/* CAF658 80240918 8E870000 */ lw $a3, ($s4) -/* CAF65C 8024091C 02532821 */ addu $a1, $s2, $s3 -/* CAF660 80240920 0C00A7E7 */ jal add_vec2D_polar -/* CAF664 80240924 E7B60020 */ swc1 $f22, 0x20($sp) -/* CAF668 80240928 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* CAF66C 8024092C C7A00020 */ lwc1 $f0, 0x20($sp) -/* CAF670 80240930 46002102 */ mul.s $f4, $f4, $f0 -/* CAF674 80240934 00000000 */ nop -/* CAF678 80240938 C7A20018 */ lwc1 $f2, 0x18($sp) -/* CAF67C 8024093C 26940004 */ addiu $s4, $s4, 4 -/* CAF680 80240940 46001082 */ mul.s $f2, $f2, $f0 -/* CAF684 80240944 00000000 */ nop -/* CAF688 80240948 26730004 */ addiu $s3, $s3, 4 -/* CAF68C 8024094C 26310001 */ addiu $s1, $s1, 1 -/* CAF690 80240950 2A220003 */ slti $v0, $s1, 3 -/* CAF694 80240954 E6040014 */ swc1 $f4, 0x14($s0) -/* CAF698 80240958 E602002C */ swc1 $f2, 0x2c($s0) -/* CAF69C 8024095C 1440FFEB */ bnez $v0, .L8024090C -/* CAF6A0 80240960 26100004 */ addiu $s0, $s0, 4 -/* CAF6A4 80240964 8E420060 */ lw $v0, 0x60($s2) -/* CAF6A8 80240968 24420001 */ addiu $v0, $v0, 1 -/* CAF6AC 8024096C AE420060 */ sw $v0, 0x60($s2) -/* CAF6B0 80240970 28420010 */ slti $v0, $v0, 0x10 -/* CAF6B4 80240974 14400016 */ bnez $v0, .L802409D0 -/* CAF6B8 80240978 2402000F */ addiu $v0, $zero, 0xf -/* CAF6BC 8024097C AE420060 */ sw $v0, 0x60($s2) -/* CAF6C0 80240980 24020002 */ addiu $v0, $zero, 2 -/* CAF6C4 80240984 08090274 */ j .L802409D0 -/* CAF6C8 80240988 AE420000 */ sw $v0, ($s2) -.L8024098C: -/* CAF6CC 8024098C 8E420060 */ lw $v0, 0x60($s2) -/* CAF6D0 80240990 24420001 */ addiu $v0, $v0, 1 -/* CAF6D4 80240994 AE420060 */ sw $v0, 0x60($s2) -/* CAF6D8 80240998 2842001F */ slti $v0, $v0, 0x1f -/* CAF6DC 8024099C 1440000C */ bnez $v0, .L802409D0 -/* CAF6E0 802409A0 0000882D */ daddu $s1, $zero, $zero -/* CAF6E4 802409A4 0240282D */ daddu $a1, $s2, $zero -.L802409A8: -/* CAF6E8 802409A8 8CA20008 */ lw $v0, 8($a1) -/* CAF6EC 802409AC 8C430000 */ lw $v1, ($v0) -/* CAF6F0 802409B0 26310001 */ addiu $s1, $s1, 1 -/* CAF6F4 802409B4 34630010 */ ori $v1, $v1, 0x10 -/* CAF6F8 802409B8 AC430000 */ sw $v1, ($v0) -/* CAF6FC 802409BC 2A220003 */ slti $v0, $s1, 3 -/* CAF700 802409C0 1440FFF9 */ bnez $v0, .L802409A8 -/* CAF704 802409C4 24A50004 */ addiu $a1, $a1, 4 -/* CAF708 802409C8 080902C1 */ j .L80240B04 -/* CAF70C 802409CC 24020002 */ addiu $v0, $zero, 2 -.L802409D0: -/* CAF710 802409D0 8E430004 */ lw $v1, 4($s2) -/* CAF714 802409D4 10600005 */ beqz $v1, .L802409EC -/* CAF718 802409D8 24020001 */ addiu $v0, $zero, 1 -/* CAF71C 802409DC 1062000B */ beq $v1, $v0, .L80240A0C -/* CAF720 802409E0 0000882D */ daddu $s1, $zero, $zero -/* CAF724 802409E4 080902B0 */ j .L80240AC0 -/* CAF728 802409E8 0240282D */ daddu $a1, $s2, $zero -.L802409EC: -/* CAF72C 802409EC 8E420064 */ lw $v0, 0x64($s2) -/* CAF730 802409F0 24420001 */ addiu $v0, $v0, 1 -/* CAF734 802409F4 AE420064 */ sw $v0, 0x64($s2) -/* CAF738 802409F8 28420010 */ slti $v0, $v0, 0x10 -/* CAF73C 802409FC 1440002F */ bnez $v0, .L80240ABC -/* CAF740 80240A00 0000882D */ daddu $s1, $zero, $zero -/* CAF744 80240A04 080902AC */ j .L80240AB0 -/* CAF748 80240A08 24020001 */ addiu $v0, $zero, 1 -.L80240A0C: -/* CAF74C 80240A0C 4480A000 */ mtc1 $zero, $f20 -/* CAF750 80240A10 24130014 */ addiu $s3, $zero, 0x14 -/* CAF754 80240A14 0240802D */ daddu $s0, $s2, $zero -.L80240A18: -/* CAF758 80240A18 4405A000 */ mfc1 $a1, $f20 -/* CAF75C 80240A1C AFB30010 */ sw $s3, 0x10($sp) -/* CAF760 80240A20 8E060038 */ lw $a2, 0x38($s0) -/* CAF764 80240A24 8E470064 */ lw $a3, 0x64($s2) -/* CAF768 80240A28 0C00A8ED */ jal update_lerp -/* CAF76C 80240A2C 24040001 */ addiu $a0, $zero, 1 -/* CAF770 80240A30 C6020014 */ lwc1 $f2, 0x14($s0) -/* CAF774 80240A34 46001080 */ add.s $f2, $f2, $f0 -/* CAF778 80240A38 4405A000 */ mfc1 $a1, $f20 -/* CAF77C 80240A3C E6020014 */ swc1 $f2, 0x14($s0) -/* CAF780 80240A40 AFB30010 */ sw $s3, 0x10($sp) -/* CAF784 80240A44 8E060044 */ lw $a2, 0x44($s0) -/* CAF788 80240A48 8E470064 */ lw $a3, 0x64($s2) -/* CAF78C 80240A4C 0C00A8ED */ jal update_lerp -/* CAF790 80240A50 24040001 */ addiu $a0, $zero, 1 -/* CAF794 80240A54 C6020020 */ lwc1 $f2, 0x20($s0) -/* CAF798 80240A58 46001080 */ add.s $f2, $f2, $f0 -/* CAF79C 80240A5C 4405A000 */ mfc1 $a1, $f20 -/* CAF7A0 80240A60 E6020020 */ swc1 $f2, 0x20($s0) -/* CAF7A4 80240A64 AFB30010 */ sw $s3, 0x10($sp) -/* CAF7A8 80240A68 8E060050 */ lw $a2, 0x50($s0) -/* CAF7AC 80240A6C 8E470064 */ lw $a3, 0x64($s2) -/* CAF7B0 80240A70 0C00A8ED */ jal update_lerp -/* CAF7B4 80240A74 24040001 */ addiu $a0, $zero, 1 -/* CAF7B8 80240A78 C602002C */ lwc1 $f2, 0x2c($s0) -/* CAF7BC 80240A7C 46001080 */ add.s $f2, $f2, $f0 -/* CAF7C0 80240A80 26310001 */ addiu $s1, $s1, 1 -/* CAF7C4 80240A84 2A220003 */ slti $v0, $s1, 3 -/* CAF7C8 80240A88 E602002C */ swc1 $f2, 0x2c($s0) -/* CAF7CC 80240A8C 1440FFE2 */ bnez $v0, .L80240A18 -/* CAF7D0 80240A90 26100004 */ addiu $s0, $s0, 4 -/* CAF7D4 80240A94 8E420064 */ lw $v0, 0x64($s2) -/* CAF7D8 80240A98 24420001 */ addiu $v0, $v0, 1 -/* CAF7DC 80240A9C AE420064 */ sw $v0, 0x64($s2) -/* CAF7E0 80240AA0 28420015 */ slti $v0, $v0, 0x15 -/* CAF7E4 80240AA4 14400005 */ bnez $v0, .L80240ABC -/* CAF7E8 80240AA8 0000882D */ daddu $s1, $zero, $zero -/* CAF7EC 80240AAC 24020002 */ addiu $v0, $zero, 2 -.L80240AB0: -/* CAF7F0 80240AB0 AE420004 */ sw $v0, 4($s2) -/* CAF7F4 80240AB4 AE400064 */ sw $zero, 0x64($s2) -/* CAF7F8 80240AB8 0000882D */ daddu $s1, $zero, $zero -.L80240ABC: -/* CAF7FC 80240ABC 0240282D */ daddu $a1, $s2, $zero -.L80240AC0: -/* CAF800 80240AC0 8CA20008 */ lw $v0, 8($a1) -/* CAF804 80240AC4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* CAF808 80240AC8 8C42000C */ lw $v0, 0xc($v0) -/* CAF80C 80240ACC E4400010 */ swc1 $f0, 0x10($v0) -/* CAF810 80240AD0 8CA20008 */ lw $v0, 8($a1) -/* CAF814 80240AD4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* CAF818 80240AD8 8C42000C */ lw $v0, 0xc($v0) -/* CAF81C 80240ADC 26310001 */ addiu $s1, $s1, 1 -/* CAF820 80240AE0 E4400014 */ swc1 $f0, 0x14($v0) -/* CAF824 80240AE4 8CA20008 */ lw $v0, 8($a1) -/* CAF828 80240AE8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* CAF82C 80240AEC 8C42000C */ lw $v0, 0xc($v0) -/* CAF830 80240AF0 E4400018 */ swc1 $f0, 0x18($v0) -/* CAF834 80240AF4 2A220003 */ slti $v0, $s1, 3 -/* CAF838 80240AF8 1440FFF1 */ bnez $v0, .L80240AC0 -/* CAF83C 80240AFC 24A50004 */ addiu $a1, $a1, 4 -/* CAF840 80240B00 0000102D */ daddu $v0, $zero, $zero -.L80240B04: -/* CAF844 80240B04 8FBF0044 */ lw $ra, 0x44($sp) -/* CAF848 80240B08 8FB60040 */ lw $s6, 0x40($sp) -/* CAF84C 80240B0C 8FB5003C */ lw $s5, 0x3c($sp) -/* CAF850 80240B10 8FB40038 */ lw $s4, 0x38($sp) -/* CAF854 80240B14 8FB30034 */ lw $s3, 0x34($sp) -/* CAF858 80240B18 8FB20030 */ lw $s2, 0x30($sp) -/* CAF85C 80240B1C 8FB1002C */ lw $s1, 0x2c($sp) -/* CAF860 80240B20 8FB00028 */ lw $s0, 0x28($sp) -/* CAF864 80240B24 D7B80058 */ ldc1 $f24, 0x58($sp) -/* CAF868 80240B28 D7B60050 */ ldc1 $f22, 0x50($sp) -/* CAF86C 80240B2C D7B40048 */ ldc1 $f20, 0x48($sp) -/* CAF870 80240B30 03E00008 */ jr $ra -/* CAF874 80240B34 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80240B38_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80240B38_CAED40.s deleted file mode 100644 index 79455e53ab..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80240B38_CAED40.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B38_CAF878 -/* CAF878 80240B38 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CAF87C 80240B3C AFB10014 */ sw $s1, 0x14($sp) -/* CAF880 80240B40 0080882D */ daddu $s1, $a0, $zero -/* CAF884 80240B44 AFB20018 */ sw $s2, 0x18($sp) -/* CAF888 80240B48 AFBF001C */ sw $ra, 0x1c($sp) -/* CAF88C 80240B4C AFB00010 */ sw $s0, 0x10($sp) -/* CAF890 80240B50 8E30000C */ lw $s0, 0xc($s1) -/* CAF894 80240B54 10A00010 */ beqz $a1, .L80240B98 -/* CAF898 80240B58 0000902D */ daddu $s2, $zero, $zero -/* CAF89C 80240B5C 8E050000 */ lw $a1, ($s0) -/* CAF8A0 80240B60 0C0B1EAF */ jal get_variable -/* CAF8A4 80240B64 26100004 */ addiu $s0, $s0, 4 -/* CAF8A8 80240B68 AE220084 */ sw $v0, 0x84($s1) -/* CAF8AC 80240B6C 8E050000 */ lw $a1, ($s0) -/* CAF8B0 80240B70 0C0B1EAF */ jal get_variable -/* CAF8B4 80240B74 0220202D */ daddu $a0, $s1, $zero -/* CAF8B8 80240B78 0240202D */ daddu $a0, $s2, $zero -/* CAF8BC 80240B7C 240500D0 */ addiu $a1, $zero, 0xd0 -/* CAF8C0 80240B80 00A0302D */ daddu $a2, $a1, $zero -/* CAF8C4 80240B84 00A0382D */ daddu $a3, $a1, $zero -/* CAF8C8 80240B88 AE220088 */ sw $v0, 0x88($s1) -/* CAF8CC 80240B8C AE200070 */ sw $zero, 0x70($s1) -/* CAF8D0 80240B90 0C04DF84 */ jal func_80137E10 -/* CAF8D4 80240B94 AE200074 */ sw $zero, 0x74($s1) -.L80240B98: -/* CAF8D8 80240B98 8E230070 */ lw $v1, 0x70($s1) -/* CAF8DC 80240B9C 24040001 */ addiu $a0, $zero, 1 -/* CAF8E0 80240BA0 10640019 */ beq $v1, $a0, .L80240C08 -/* CAF8E4 80240BA4 28620002 */ slti $v0, $v1, 2 -/* CAF8E8 80240BA8 10400005 */ beqz $v0, .L80240BC0 -/* CAF8EC 80240BAC 24020002 */ addiu $v0, $zero, 2 -/* CAF8F0 80240BB0 10600007 */ beqz $v1, .L80240BD0 -/* CAF8F4 80240BB4 240500FF */ addiu $a1, $zero, 0xff -/* CAF8F8 80240BB8 08090312 */ j .L80240C48 -/* CAF8FC 80240BBC 00000000 */ nop -.L80240BC0: -/* CAF900 80240BC0 10620019 */ beq $v1, $v0, .L80240C28 -/* CAF904 80240BC4 00000000 */ nop -/* CAF908 80240BC8 08090312 */ j .L80240C48 -/* CAF90C 80240BCC 00000000 */ nop -.L80240BD0: -/* CAF910 80240BD0 8E220074 */ lw $v0, 0x74($s1) -/* CAF914 80240BD4 14450004 */ bne $v0, $a1, .L80240BE8 -/* CAF918 80240BD8 00000000 */ nop -/* CAF91C 80240BDC AE240070 */ sw $a0, 0x70($s1) -/* CAF920 80240BE0 AE200078 */ sw $zero, 0x78($s1) -/* CAF924 80240BE4 8E220074 */ lw $v0, 0x74($s1) -.L80240BE8: -/* CAF928 80240BE8 8E230084 */ lw $v1, 0x84($s1) -/* CAF92C 80240BEC 00431021 */ addu $v0, $v0, $v1 -/* CAF930 80240BF0 AE220074 */ sw $v0, 0x74($s1) -/* CAF934 80240BF4 28420100 */ slti $v0, $v0, 0x100 -/* CAF938 80240BF8 50400013 */ beql $v0, $zero, .L80240C48 -/* CAF93C 80240BFC AE250074 */ sw $a1, 0x74($s1) -/* CAF940 80240C00 08090312 */ j .L80240C48 -/* CAF944 80240C04 00000000 */ nop -.L80240C08: -/* CAF948 80240C08 8E220078 */ lw $v0, 0x78($s1) -/* CAF94C 80240C0C 24420001 */ addiu $v0, $v0, 1 -/* CAF950 80240C10 AE220078 */ sw $v0, 0x78($s1) -/* CAF954 80240C14 28420002 */ slti $v0, $v0, 2 -/* CAF958 80240C18 1440000B */ bnez $v0, .L80240C48 -/* CAF95C 80240C1C 24020002 */ addiu $v0, $zero, 2 -/* CAF960 80240C20 08090312 */ j .L80240C48 -/* CAF964 80240C24 AE220070 */ sw $v0, 0x70($s1) -.L80240C28: -/* CAF968 80240C28 8E230074 */ lw $v1, 0x74($s1) -/* CAF96C 80240C2C 50600001 */ beql $v1, $zero, .L80240C34 -/* CAF970 80240C30 24120001 */ addiu $s2, $zero, 1 -.L80240C34: -/* CAF974 80240C34 8E220088 */ lw $v0, 0x88($s1) -/* CAF978 80240C38 00621023 */ subu $v0, $v1, $v0 -/* CAF97C 80240C3C 04410002 */ bgez $v0, .L80240C48 -/* CAF980 80240C40 AE220074 */ sw $v0, 0x74($s1) -/* CAF984 80240C44 AE200074 */ sw $zero, 0x74($s1) -.L80240C48: -/* CAF988 80240C48 C6200074 */ lwc1 $f0, 0x74($s1) -/* CAF98C 80240C4C 46800020 */ cvt.s.w $f0, $f0 -/* CAF990 80240C50 44050000 */ mfc1 $a1, $f0 -/* CAF994 80240C54 0C04DF62 */ jal func_80137D88 -/* CAF998 80240C58 24040001 */ addiu $a0, $zero, 1 -/* CAF99C 80240C5C 0240102D */ daddu $v0, $s2, $zero -/* CAF9A0 80240C60 8FBF001C */ lw $ra, 0x1c($sp) -/* CAF9A4 80240C64 8FB20018 */ lw $s2, 0x18($sp) -/* CAF9A8 80240C68 8FB10014 */ lw $s1, 0x14($sp) -/* CAF9AC 80240C6C 8FB00010 */ lw $s0, 0x10($sp) -/* CAF9B0 80240C70 03E00008 */ jr $ra -/* CAF9B4 80240C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80240C78_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80240C78_CAED40.s deleted file mode 100644 index e53c8fd5ed..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80240C78_CAED40.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C78_CAF9B8 -/* CAF9B8 80240C78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CAF9BC 80240C7C AFBF0018 */ sw $ra, 0x18($sp) -/* CAF9C0 80240C80 0C00EAD2 */ jal get_npc_safe -/* CAF9C4 80240C84 2404FFFC */ addiu $a0, $zero, -4 -/* CAF9C8 80240C88 3C0141F0 */ lui $at, 0x41f0 -/* CAF9CC 80240C8C 44810000 */ mtc1 $at, $f0 -/* CAF9D0 80240C90 C442003C */ lwc1 $f2, 0x3c($v0) -/* CAF9D4 80240C94 46001080 */ add.s $f2, $f2, $f0 -/* CAF9D8 80240C98 E7A00010 */ swc1 $f0, 0x10($sp) -/* CAF9DC 80240C9C 8C450038 */ lw $a1, 0x38($v0) -/* CAF9E0 80240CA0 8C470040 */ lw $a3, 0x40($v0) -/* CAF9E4 80240CA4 44061000 */ mfc1 $a2, $f2 -/* CAF9E8 80240CA8 0C01BFBC */ jal func_8006FEF0 -/* CAF9EC 80240CAC 24040002 */ addiu $a0, $zero, 2 -/* CAF9F0 80240CB0 8FBF0018 */ lw $ra, 0x18($sp) -/* CAF9F4 80240CB4 24020002 */ addiu $v0, $zero, 2 -/* CAF9F8 80240CB8 03E00008 */ jr $ra -/* CAF9FC 80240CBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80240CC0_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80240CC0_CAED40.s deleted file mode 100644 index f77a23f1cb..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80240CC0_CAED40.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_CAFA00 -/* CAFA00 80240CC0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CAFA04 80240CC4 AFBF0018 */ sw $ra, 0x18($sp) -/* CAFA08 80240CC8 0C00EAD2 */ jal get_npc_safe -/* CAFA0C 80240CCC 2404FFFC */ addiu $a0, $zero, -4 -/* CAFA10 80240CD0 3C0141F0 */ lui $at, 0x41f0 -/* CAFA14 80240CD4 44810000 */ mtc1 $at, $f0 -/* CAFA18 80240CD8 C442003C */ lwc1 $f2, 0x3c($v0) -/* CAFA1C 80240CDC 46001080 */ add.s $f2, $f2, $f0 -/* CAFA20 80240CE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* CAFA24 80240CE4 8C450038 */ lw $a1, 0x38($v0) -/* CAFA28 80240CE8 8C470040 */ lw $a3, 0x40($v0) -/* CAFA2C 80240CEC 44061000 */ mfc1 $a2, $f2 -/* CAFA30 80240CF0 0C01BFBC */ jal func_8006FEF0 -/* CAFA34 80240CF4 24040004 */ addiu $a0, $zero, 4 -/* CAFA38 80240CF8 8FBF0018 */ lw $ra, 0x18($sp) -/* CAFA3C 80240CFC 24020002 */ addiu $v0, $zero, 2 -/* CAFA40 80240D00 03E00008 */ jr $ra -/* CAFA44 80240D04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80240D08_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80240D08_CAED40.s deleted file mode 100644 index 5ad4eca0c7..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80240D08_CAED40.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D08_CAFA48 -/* CAFA48 80240D08 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* CAFA4C 80240D0C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* CAFA50 80240D10 AC800084 */ sw $zero, 0x84($a0) -/* CAFA54 80240D14 80620000 */ lb $v0, ($v1) -/* CAFA58 80240D18 10400005 */ beqz $v0, .L80240D30 -/* CAFA5C 80240D1C 24020003 */ addiu $v0, $zero, 3 -/* CAFA60 80240D20 80630003 */ lb $v1, 3($v1) -/* CAFA64 80240D24 14620002 */ bne $v1, $v0, .L80240D30 -/* CAFA68 80240D28 24020001 */ addiu $v0, $zero, 1 -/* CAFA6C 80240D2C AC820084 */ sw $v0, 0x84($a0) -.L80240D30: -/* CAFA70 80240D30 03E00008 */ jr $ra -/* CAFA74 80240D34 24020002 */ addiu $v0, $zero, 2 -/* CAFA78 80240D38 00000000 */ nop -/* CAFA7C 80240D3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80240D40_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80240D40_CAED40.s deleted file mode 100644 index 0d16835395..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80240D40_CAED40.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D40_CAFA80 -/* CAFA80 80240D40 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CAFA84 80240D44 24040001 */ addiu $a0, $zero, 1 -/* CAFA88 80240D48 0000282D */ daddu $a1, $zero, $zero -/* CAFA8C 80240D4C 00A0302D */ daddu $a2, $a1, $zero -/* CAFA90 80240D50 00A0382D */ daddu $a3, $a1, $zero -/* CAFA94 80240D54 AFBF0018 */ sw $ra, 0x18($sp) -/* CAFA98 80240D58 AFA00010 */ sw $zero, 0x10($sp) -/* CAFA9C 80240D5C 0C01CA54 */ jal func_80072950 -/* CAFAA0 80240D60 AFA00014 */ sw $zero, 0x14($sp) -/* CAFAA4 80240D64 8FBF0018 */ lw $ra, 0x18($sp) -/* CAFAA8 80240D68 24020002 */ addiu $v0, $zero, 2 -/* CAFAAC 80240D6C 03E00008 */ jr $ra -/* CAFAB0 80240D70 27BD0020 */ addiu $sp, $sp, 0x20 -/* CAFAB4 80240D74 00000000 */ nop -/* CAFAB8 80240D78 00000000 */ nop -/* CAFABC 80240D7C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80240D80_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80240D80_CAED40.s deleted file mode 100644 index 990d1dfa72..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80240D80_CAED40.s +++ /dev/null @@ -1,401 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D80_CAFAC0 -/* CAFAC0 80240D80 27BDFF68 */ addiu $sp, $sp, -0x98 -/* CAFAC4 80240D84 AFB60060 */ sw $s6, 0x60($sp) -/* CAFAC8 80240D88 0080B02D */ daddu $s6, $a0, $zero -/* CAFACC 80240D8C AFBF0064 */ sw $ra, 0x64($sp) -/* CAFAD0 80240D90 AFB5005C */ sw $s5, 0x5c($sp) -/* CAFAD4 80240D94 AFB40058 */ sw $s4, 0x58($sp) -/* CAFAD8 80240D98 AFB30054 */ sw $s3, 0x54($sp) -/* CAFADC 80240D9C AFB20050 */ sw $s2, 0x50($sp) -/* CAFAE0 80240DA0 AFB1004C */ sw $s1, 0x4c($sp) -/* CAFAE4 80240DA4 AFB00048 */ sw $s0, 0x48($sp) -/* CAFAE8 80240DA8 F7BE0090 */ sdc1 $f30, 0x90($sp) -/* CAFAEC 80240DAC F7BC0088 */ sdc1 $f28, 0x88($sp) -/* CAFAF0 80240DB0 F7BA0080 */ sdc1 $f26, 0x80($sp) -/* CAFAF4 80240DB4 F7B80078 */ sdc1 $f24, 0x78($sp) -/* CAFAF8 80240DB8 F7B60070 */ sdc1 $f22, 0x70($sp) -/* CAFAFC 80240DBC F7B40068 */ sdc1 $f20, 0x68($sp) -/* CAFB00 80240DC0 8ED20148 */ lw $s2, 0x148($s6) -/* CAFB04 80240DC4 00A0882D */ daddu $s1, $a1, $zero -/* CAFB08 80240DC8 86440008 */ lh $a0, 8($s2) -/* CAFB0C 80240DCC 0C00EABB */ jal get_npc_unsafe -/* CAFB10 80240DD0 00C0A82D */ daddu $s5, $a2, $zero -/* CAFB14 80240DD4 8E240020 */ lw $a0, 0x20($s1) -/* CAFB18 80240DD8 0040802D */ daddu $s0, $v0, $zero -/* CAFB1C 80240DDC 00041FC2 */ srl $v1, $a0, 0x1f -/* CAFB20 80240DE0 00832021 */ addu $a0, $a0, $v1 -/* CAFB24 80240DE4 00042043 */ sra $a0, $a0, 1 -/* CAFB28 80240DE8 0C00A67F */ jal rand_int -/* CAFB2C 80240DEC 24840001 */ addiu $a0, $a0, 1 -/* CAFB30 80240DF0 8E230020 */ lw $v1, 0x20($s1) -/* CAFB34 80240DF4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CAFB38 80240DF8 000327C2 */ srl $a0, $v1, 0x1f -/* CAFB3C 80240DFC 00641821 */ addu $v1, $v1, $a0 -/* CAFB40 80240E00 00031843 */ sra $v1, $v1, 1 -/* CAFB44 80240E04 00621821 */ addu $v1, $v1, $v0 -/* CAFB48 80240E08 A603008E */ sh $v1, 0x8e($s0) -/* CAFB4C 80240E0C 8E4200CC */ lw $v0, 0xcc($s2) -/* CAFB50 80240E10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CAFB54 80240E14 8C42000C */ lw $v0, 0xc($v0) -/* CAFB58 80240E18 AE020028 */ sw $v0, 0x28($s0) -/* CAFB5C 80240E1C C6200018 */ lwc1 $f0, 0x18($s1) -/* CAFB60 80240E20 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CAFB64 80240E24 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CAFB68 80240E28 E6000018 */ swc1 $f0, 0x18($s0) -/* CAFB6C 80240E2C 8C460028 */ lw $a2, 0x28($v0) -/* CAFB70 80240E30 8C470030 */ lw $a3, 0x30($v0) -/* CAFB74 80240E34 0C00A720 */ jal atan2 -/* CAFB78 80240E38 0000982D */ daddu $s3, $zero, $zero -/* CAFB7C 80240E3C 3C014334 */ lui $at, 0x4334 -/* CAFB80 80240E40 44816000 */ mtc1 $at, $f12 -/* CAFB84 80240E44 0C00A6C9 */ jal clamp_angle -/* CAFB88 80240E48 460C0300 */ add.s $f12, $f0, $f12 -/* CAFB8C 80240E4C 46000506 */ mov.s $f20, $f0 -/* CAFB90 80240E50 C60C000C */ lwc1 $f12, 0xc($s0) -/* CAFB94 80240E54 0C00A70A */ jal get_clamped_angle_diff -/* CAFB98 80240E58 4600A386 */ mov.s $f14, $f20 -/* CAFB9C 80240E5C 46000086 */ mov.s $f2, $f0 -/* CAFBA0 80240E60 8E22001C */ lw $v0, 0x1c($s1) -/* CAFBA4 80240E64 46001005 */ abs.s $f0, $f2 -/* CAFBA8 80240E68 44822000 */ mtc1 $v0, $f4 -/* CAFBAC 80240E6C 00000000 */ nop -/* CAFBB0 80240E70 46802120 */ cvt.s.w $f4, $f4 -/* CAFBB4 80240E74 4600203C */ c.lt.s $f4, $f0 -/* CAFBB8 80240E78 00000000 */ nop -/* CAFBBC 80240E7C 4500000D */ bc1f .L80240EB4 -/* CAFBC0 80240E80 00000000 */ nop -/* CAFBC4 80240E84 44800000 */ mtc1 $zero, $f0 -/* CAFBC8 80240E88 C614000C */ lwc1 $f20, 0xc($s0) -/* CAFBCC 80240E8C 4600103C */ c.lt.s $f2, $f0 -/* CAFBD0 80240E90 00000000 */ nop -/* CAFBD4 80240E94 45000006 */ bc1f .L80240EB0 -/* CAFBD8 80240E98 00021023 */ negu $v0, $v0 -/* CAFBDC 80240E9C 44820000 */ mtc1 $v0, $f0 -/* CAFBE0 80240EA0 00000000 */ nop -/* CAFBE4 80240EA4 46800020 */ cvt.s.w $f0, $f0 -/* CAFBE8 80240EA8 080903AD */ j .L80240EB4 -/* CAFBEC 80240EAC 4600A500 */ add.s $f20, $f20, $f0 -.L80240EB0: -/* CAFBF0 80240EB0 4604A500 */ add.s $f20, $f20, $f4 -.L80240EB4: -/* CAFBF4 80240EB4 0C00A6C9 */ jal clamp_angle -/* CAFBF8 80240EB8 4600A306 */ mov.s $f12, $f20 -/* CAFBFC 80240EBC 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* CAFC00 80240EC0 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* CAFC04 80240EC4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CAFC08 80240EC8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CAFC0C 80240ECC 8E820000 */ lw $v0, ($s4) -/* CAFC10 80240ED0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CAFC14 80240ED4 E600000C */ swc1 $f0, 0xc($s0) -/* CAFC18 80240ED8 46006006 */ mov.s $f0, $f12 -/* CAFC1C 80240EDC 8C460028 */ lw $a2, 0x28($v0) -/* CAFC20 80240EE0 8C470030 */ lw $a3, 0x30($v0) -/* CAFC24 80240EE4 46007106 */ mov.s $f4, $f14 -/* CAFC28 80240EE8 E7A00020 */ swc1 $f0, 0x20($sp) -/* CAFC2C 80240EEC E7A20024 */ swc1 $f2, 0x24($sp) -/* CAFC30 80240EF0 0C00A720 */ jal atan2 -/* CAFC34 80240EF4 E7A40028 */ swc1 $f4, 0x28($sp) -/* CAFC38 80240EF8 3C014334 */ lui $at, 0x4334 -/* CAFC3C 80240EFC 44816000 */ mtc1 $at, $f12 -/* CAFC40 80240F00 0C00A6C9 */ jal clamp_angle -/* CAFC44 80240F04 460C0300 */ add.s $f12, $f0, $f12 -/* CAFC48 80240F08 C6020018 */ lwc1 $f2, 0x18($s0) -/* CAFC4C 80240F0C 3C014012 */ lui $at, 0x4012 -/* CAFC50 80240F10 4481E800 */ mtc1 $at, $f29 -/* CAFC54 80240F14 4480E000 */ mtc1 $zero, $f28 -/* CAFC58 80240F18 460010A1 */ cvt.d.s $f2, $f2 -/* CAFC5C 80240F1C 463C1082 */ mul.d $f2, $f2, $f28 -/* CAFC60 80240F20 00000000 */ nop -/* CAFC64 80240F24 46000506 */ mov.s $f20, $f0 -/* CAFC68 80240F28 27A50020 */ addiu $a1, $sp, 0x20 -/* CAFC6C 80240F2C 27A60024 */ addiu $a2, $sp, 0x24 -/* CAFC70 80240F30 27A70028 */ addiu $a3, $sp, 0x28 -/* CAFC74 80240F34 E7B40014 */ swc1 $f20, 0x14($sp) -/* CAFC78 80240F38 462010A0 */ cvt.s.d $f2, $f2 -/* CAFC7C 80240F3C E7A20010 */ swc1 $f2, 0x10($sp) -/* CAFC80 80240F40 860200A8 */ lh $v0, 0xa8($s0) -/* CAFC84 80240F44 4480B000 */ mtc1 $zero, $f22 -/* CAFC88 80240F48 44820000 */ mtc1 $v0, $f0 -/* CAFC8C 80240F4C 00000000 */ nop -/* CAFC90 80240F50 46800020 */ cvt.s.w $f0, $f0 -/* CAFC94 80240F54 E7A00018 */ swc1 $f0, 0x18($sp) -/* CAFC98 80240F58 860200A6 */ lh $v0, 0xa6($s0) -/* CAFC9C 80240F5C 4600B606 */ mov.s $f24, $f22 -/* CAFCA0 80240F60 44820000 */ mtc1 $v0, $f0 -/* CAFCA4 80240F64 00000000 */ nop -/* CAFCA8 80240F68 46800020 */ cvt.s.w $f0, $f0 -/* CAFCAC 80240F6C E7A0001C */ swc1 $f0, 0x1c($sp) -/* CAFCB0 80240F70 8E040080 */ lw $a0, 0x80($s0) -/* CAFCB4 80240F74 0C03773B */ jal func_800DDCEC -/* CAFCB8 80240F78 4600C686 */ mov.s $f26, $f24 -/* CAFCBC 80240F7C 104000E1 */ beqz $v0, .L80241304 -/* CAFCC0 80240F80 00000000 */ nop -/* CAFCC4 80240F84 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CAFCC8 80240F88 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CAFCCC 80240F8C 8FA60020 */ lw $a2, 0x20($sp) -/* CAFCD0 80240F90 0C00A7B5 */ jal dist2D -/* CAFCD4 80240F94 8FA70028 */ lw $a3, 0x28($sp) -/* CAFCD8 80240F98 46000586 */ mov.s $f22, $f0 -/* CAFCDC 80240F9C C6020038 */ lwc1 $f2, 0x38($s0) -/* CAFCE0 80240FA0 C604003C */ lwc1 $f4, 0x3c($s0) -/* CAFCE4 80240FA4 3C01420C */ lui $at, 0x420c -/* CAFCE8 80240FA8 4481F000 */ mtc1 $at, $f30 -/* CAFCEC 80240FAC C6000040 */ lwc1 $f0, 0x40($s0) -/* CAFCF0 80240FB0 461EA300 */ add.s $f12, $f20, $f30 -/* CAFCF4 80240FB4 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CAFCF8 80240FB8 E7A40030 */ swc1 $f4, 0x30($sp) -/* CAFCFC 80240FBC 0C00A6C9 */ jal clamp_angle -/* CAFD00 80240FC0 E7A00034 */ swc1 $f0, 0x34($sp) -/* CAFD04 80240FC4 C6020018 */ lwc1 $f2, 0x18($s0) -/* CAFD08 80240FC8 460010A1 */ cvt.d.s $f2, $f2 -/* CAFD0C 80240FCC 463C1082 */ mul.d $f2, $f2, $f28 -/* CAFD10 80240FD0 00000000 */ nop -/* CAFD14 80240FD4 E7A00014 */ swc1 $f0, 0x14($sp) -/* CAFD18 80240FD8 462010A0 */ cvt.s.d $f2, $f2 -/* CAFD1C 80240FDC E7A20010 */ swc1 $f2, 0x10($sp) -/* CAFD20 80240FE0 860200A8 */ lh $v0, 0xa8($s0) -/* CAFD24 80240FE4 27A5002C */ addiu $a1, $sp, 0x2c -/* CAFD28 80240FE8 44820000 */ mtc1 $v0, $f0 -/* CAFD2C 80240FEC 00000000 */ nop -/* CAFD30 80240FF0 46800020 */ cvt.s.w $f0, $f0 -/* CAFD34 80240FF4 E7A00018 */ swc1 $f0, 0x18($sp) -/* CAFD38 80240FF8 860200A6 */ lh $v0, 0xa6($s0) -/* CAFD3C 80240FFC 27A60030 */ addiu $a2, $sp, 0x30 -/* CAFD40 80241000 44820000 */ mtc1 $v0, $f0 -/* CAFD44 80241004 00000000 */ nop -/* CAFD48 80241008 46800020 */ cvt.s.w $f0, $f0 -/* CAFD4C 8024100C E7A0001C */ swc1 $f0, 0x1c($sp) -/* CAFD50 80241010 8E040080 */ lw $a0, 0x80($s0) -/* CAFD54 80241014 0C03773B */ jal func_800DDCEC -/* CAFD58 80241018 27A70034 */ addiu $a3, $sp, 0x34 -/* CAFD5C 8024101C 10400007 */ beqz $v0, .L8024103C -/* CAFD60 80241020 00000000 */ nop -/* CAFD64 80241024 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CAFD68 80241028 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CAFD6C 8024102C 8FA6002C */ lw $a2, 0x2c($sp) -/* CAFD70 80241030 0C00A7B5 */ jal dist2D -/* CAFD74 80241034 8FA70034 */ lw $a3, 0x34($sp) -/* CAFD78 80241038 46000606 */ mov.s $f24, $f0 -.L8024103C: -/* CAFD7C 8024103C C6000038 */ lwc1 $f0, 0x38($s0) -/* CAFD80 80241040 C602003C */ lwc1 $f2, 0x3c($s0) -/* CAFD84 80241044 C6040040 */ lwc1 $f4, 0x40($s0) -/* CAFD88 80241048 461EA301 */ sub.s $f12, $f20, $f30 -/* CAFD8C 8024104C E7A00038 */ swc1 $f0, 0x38($sp) -/* CAFD90 80241050 E7A2003C */ swc1 $f2, 0x3c($sp) -/* CAFD94 80241054 0C00A6C9 */ jal clamp_angle -/* CAFD98 80241058 E7A40040 */ swc1 $f4, 0x40($sp) -/* CAFD9C 8024105C C6020018 */ lwc1 $f2, 0x18($s0) -/* CAFDA0 80241060 460010A1 */ cvt.d.s $f2, $f2 -/* CAFDA4 80241064 463C1082 */ mul.d $f2, $f2, $f28 -/* CAFDA8 80241068 00000000 */ nop -/* CAFDAC 8024106C E7A00014 */ swc1 $f0, 0x14($sp) -/* CAFDB0 80241070 462010A0 */ cvt.s.d $f2, $f2 -/* CAFDB4 80241074 E7A20010 */ swc1 $f2, 0x10($sp) -/* CAFDB8 80241078 860200A8 */ lh $v0, 0xa8($s0) -/* CAFDBC 8024107C 27A50038 */ addiu $a1, $sp, 0x38 -/* CAFDC0 80241080 44820000 */ mtc1 $v0, $f0 -/* CAFDC4 80241084 00000000 */ nop -/* CAFDC8 80241088 46800020 */ cvt.s.w $f0, $f0 -/* CAFDCC 8024108C E7A00018 */ swc1 $f0, 0x18($sp) -/* CAFDD0 80241090 860200A6 */ lh $v0, 0xa6($s0) -/* CAFDD4 80241094 27A6003C */ addiu $a2, $sp, 0x3c -/* CAFDD8 80241098 44820000 */ mtc1 $v0, $f0 -/* CAFDDC 8024109C 00000000 */ nop -/* CAFDE0 802410A0 46800020 */ cvt.s.w $f0, $f0 -/* CAFDE4 802410A4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* CAFDE8 802410A8 8E040080 */ lw $a0, 0x80($s0) -/* CAFDEC 802410AC 0C03773B */ jal func_800DDCEC -/* CAFDF0 802410B0 27A70040 */ addiu $a3, $sp, 0x40 -/* CAFDF4 802410B4 10400007 */ beqz $v0, .L802410D4 -/* CAFDF8 802410B8 00000000 */ nop -/* CAFDFC 802410BC C60C0038 */ lwc1 $f12, 0x38($s0) -/* CAFE00 802410C0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CAFE04 802410C4 8FA60038 */ lw $a2, 0x38($sp) -/* CAFE08 802410C8 0C00A7B5 */ jal dist2D -/* CAFE0C 802410CC 8FA70040 */ lw $a3, 0x40($sp) -/* CAFE10 802410D0 46000686 */ mov.s $f26, $f0 -.L802410D4: -/* CAFE14 802410D4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CAFE18 802410D8 8E820000 */ lw $v0, ($s4) -/* CAFE1C 802410DC C60E0040 */ lwc1 $f14, 0x40($s0) -/* CAFE20 802410E0 8C460028 */ lw $a2, 0x28($v0) -/* CAFE24 802410E4 0C00A7B5 */ jal dist2D -/* CAFE28 802410E8 8C470030 */ lw $a3, 0x30($v0) -/* CAFE2C 802410EC C6000018 */ lwc1 $f0, 0x18($s0) -/* CAFE30 802410F0 3C013FF8 */ lui $at, 0x3ff8 -/* CAFE34 802410F4 44811800 */ mtc1 $at, $f3 -/* CAFE38 802410F8 44801000 */ mtc1 $zero, $f2 -/* CAFE3C 802410FC 46000021 */ cvt.d.s $f0, $f0 -/* CAFE40 80241100 46220082 */ mul.d $f2, $f0, $f2 -/* CAFE44 80241104 00000000 */ nop -/* CAFE48 80241108 4600B021 */ cvt.d.s $f0, $f22 -/* CAFE4C 8024110C 4622003C */ c.lt.d $f0, $f2 -/* CAFE50 80241110 00000000 */ nop -/* CAFE54 80241114 45000012 */ bc1f .L80241160 -/* CAFE58 80241118 00000000 */ nop -/* CAFE5C 8024111C 4600C021 */ cvt.d.s $f0, $f24 -/* CAFE60 80241120 4622003C */ c.lt.d $f0, $f2 -/* CAFE64 80241124 00000000 */ nop -/* CAFE68 80241128 4500000D */ bc1f .L80241160 -/* CAFE6C 8024112C 00000000 */ nop -/* CAFE70 80241130 4600D021 */ cvt.d.s $f0, $f26 -/* CAFE74 80241134 4622003C */ c.lt.d $f0, $f2 -/* CAFE78 80241138 00000000 */ nop -/* CAFE7C 8024113C 45000008 */ bc1f .L80241160 -/* CAFE80 80241140 02A0202D */ daddu $a0, $s5, $zero -/* CAFE84 80241144 AFA00010 */ sw $zero, 0x10($sp) -/* CAFE88 80241148 8E26000C */ lw $a2, 0xc($s1) -/* CAFE8C 8024114C 8E270010 */ lw $a3, 0x10($s1) -/* CAFE90 80241150 0C01242D */ jal func_800490B4 -/* CAFE94 80241154 0240282D */ daddu $a1, $s2, $zero -/* CAFE98 80241158 54400001 */ bnel $v0, $zero, .L80241160 -/* CAFE9C 8024115C 24130001 */ addiu $s3, $zero, 1 -.L80241160: -/* CAFEA0 80241160 1660006A */ bnez $s3, .L8024130C -/* CAFEA4 80241164 2402000A */ addiu $v0, $zero, 0xa -/* CAFEA8 80241168 4616C03C */ c.lt.s $f24, $f22 -/* CAFEAC 8024116C 00000000 */ nop -/* CAFEB0 80241170 4500000C */ bc1f .L802411A4 -/* CAFEB4 80241174 00000000 */ nop -/* CAFEB8 80241178 4618D03C */ c.lt.s $f26, $f24 -/* CAFEBC 8024117C 00000000 */ nop -/* CAFEC0 80241180 45000006 */ bc1f .L8024119C -/* CAFEC4 80241184 00000000 */ nop -/* CAFEC8 80241188 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CAFECC 8024118C C60E0040 */ lwc1 $f14, 0x40($s0) -/* CAFED0 80241190 8FA60020 */ lw $a2, 0x20($sp) -/* CAFED4 80241194 080904A2 */ j .L80241288 -/* CAFED8 80241198 8FA70028 */ lw $a3, 0x28($sp) -.L8024119C: -/* CAFEDC 8024119C 4616C03C */ c.lt.s $f24, $f22 -/* CAFEE0 802411A0 00000000 */ nop -.L802411A4: -/* CAFEE4 802411A4 4500000A */ bc1f .L802411D0 -/* CAFEE8 802411A8 00000000 */ nop -/* CAFEEC 802411AC 461AC03C */ c.lt.s $f24, $f26 -/* CAFEF0 802411B0 00000000 */ nop -/* CAFEF4 802411B4 45000006 */ bc1f .L802411D0 -/* CAFEF8 802411B8 00000000 */ nop -/* CAFEFC 802411BC C60C0038 */ lwc1 $f12, 0x38($s0) -/* CAFF00 802411C0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CAFF04 802411C4 8FA60020 */ lw $a2, 0x20($sp) -/* CAFF08 802411C8 080904A2 */ j .L80241288 -/* CAFF0C 802411CC 8FA70028 */ lw $a3, 0x28($sp) -.L802411D0: -/* CAFF10 802411D0 4618B03C */ c.lt.s $f22, $f24 -/* CAFF14 802411D4 00000000 */ nop -/* CAFF18 802411D8 4500000A */ bc1f .L80241204 -/* CAFF1C 802411DC 00000000 */ nop -/* CAFF20 802411E0 4616D03C */ c.lt.s $f26, $f22 -/* CAFF24 802411E4 00000000 */ nop -/* CAFF28 802411E8 45000006 */ bc1f .L80241204 -/* CAFF2C 802411EC 00000000 */ nop -/* CAFF30 802411F0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CAFF34 802411F4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CAFF38 802411F8 8FA6002C */ lw $a2, 0x2c($sp) -/* CAFF3C 802411FC 080904A2 */ j .L80241288 -/* CAFF40 80241200 8FA70034 */ lw $a3, 0x34($sp) -.L80241204: -/* CAFF44 80241204 4618D03C */ c.lt.s $f26, $f24 -/* CAFF48 80241208 00000000 */ nop -/* CAFF4C 8024120C 4500000A */ bc1f .L80241238 -/* CAFF50 80241210 00000000 */ nop -/* CAFF54 80241214 461AB03C */ c.lt.s $f22, $f26 -/* CAFF58 80241218 00000000 */ nop -/* CAFF5C 8024121C 45000008 */ bc1f .L80241240 -/* CAFF60 80241220 00000000 */ nop -/* CAFF64 80241224 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CAFF68 80241228 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CAFF6C 8024122C 8FA6002C */ lw $a2, 0x2c($sp) -/* CAFF70 80241230 080904A2 */ j .L80241288 -/* CAFF74 80241234 8FA70034 */ lw $a3, 0x34($sp) -.L80241238: -/* CAFF78 80241238 461AB03C */ c.lt.s $f22, $f26 -/* CAFF7C 8024123C 00000000 */ nop -.L80241240: -/* CAFF80 80241240 45000005 */ bc1f .L80241258 -/* CAFF84 80241244 00000000 */ nop -/* CAFF88 80241248 4616C03C */ c.lt.s $f24, $f22 -/* CAFF8C 8024124C 00000000 */ nop -/* CAFF90 80241250 45010009 */ bc1t .L80241278 -/* CAFF94 80241254 00000000 */ nop -.L80241258: -/* CAFF98 80241258 461AC03C */ c.lt.s $f24, $f26 -/* CAFF9C 8024125C 00000000 */ nop -/* CAFFA0 80241260 4500000C */ bc1f .L80241294 -/* CAFFA4 80241264 00000000 */ nop -/* CAFFA8 80241268 4618B03C */ c.lt.s $f22, $f24 -/* CAFFAC 8024126C 00000000 */ nop -/* CAFFB0 80241270 45000008 */ bc1f .L80241294 -/* CAFFB4 80241274 00000000 */ nop -.L80241278: -/* CAFFB8 80241278 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CAFFBC 8024127C C60E0040 */ lwc1 $f14, 0x40($s0) -/* CAFFC0 80241280 8FA60038 */ lw $a2, 0x38($sp) -/* CAFFC4 80241284 8FA70040 */ lw $a3, 0x40($sp) -.L80241288: -/* CAFFC8 80241288 0C00A720 */ jal atan2 -/* CAFFCC 8024128C 00000000 */ nop -/* CAFFD0 80241290 46000506 */ mov.s $f20, $f0 -.L80241294: -/* CAFFD4 80241294 C60C000C */ lwc1 $f12, 0xc($s0) -/* CAFFD8 80241298 0C00A70A */ jal get_clamped_angle_diff -/* CAFFDC 8024129C 4600A386 */ mov.s $f14, $f20 -/* CAFFE0 802412A0 46000086 */ mov.s $f2, $f0 -/* CAFFE4 802412A4 8E22001C */ lw $v0, 0x1c($s1) -/* CAFFE8 802412A8 46001005 */ abs.s $f0, $f2 -/* CAFFEC 802412AC 44822000 */ mtc1 $v0, $f4 -/* CAFFF0 802412B0 00000000 */ nop -/* CAFFF4 802412B4 46802120 */ cvt.s.w $f4, $f4 -/* CAFFF8 802412B8 4600203C */ c.lt.s $f4, $f0 -/* CAFFFC 802412BC 00000000 */ nop -/* CB0000 802412C0 4500000D */ bc1f .L802412F8 -/* CB0004 802412C4 00000000 */ nop -/* CB0008 802412C8 44800000 */ mtc1 $zero, $f0 -/* CB000C 802412CC C614000C */ lwc1 $f20, 0xc($s0) -/* CB0010 802412D0 4600103C */ c.lt.s $f2, $f0 -/* CB0014 802412D4 00000000 */ nop -/* CB0018 802412D8 45000006 */ bc1f .L802412F4 -/* CB001C 802412DC 00021023 */ negu $v0, $v0 -/* CB0020 802412E0 44820000 */ mtc1 $v0, $f0 -/* CB0024 802412E4 00000000 */ nop -/* CB0028 802412E8 46800020 */ cvt.s.w $f0, $f0 -/* CB002C 802412EC 080904BE */ j .L802412F8 -/* CB0030 802412F0 4600A500 */ add.s $f20, $f20, $f0 -.L802412F4: -/* CB0034 802412F4 4604A500 */ add.s $f20, $f20, $f4 -.L802412F8: -/* CB0038 802412F8 0C00A6C9 */ jal clamp_angle -/* CB003C 802412FC 4600A306 */ mov.s $f12, $f20 -/* CB0040 80241300 E600000C */ swc1 $f0, 0xc($s0) -.L80241304: -/* CB0044 80241304 12600005 */ beqz $s3, .L8024131C -/* CB0048 80241308 2402000A */ addiu $v0, $zero, 0xa -.L8024130C: -/* CB004C 8024130C A602008E */ sh $v0, 0x8e($s0) -/* CB0050 80241310 8E4200CC */ lw $v0, 0xcc($s2) -/* CB0054 80241314 8C420020 */ lw $v0, 0x20($v0) -/* CB0058 80241318 AE020028 */ sw $v0, 0x28($s0) -.L8024131C: -/* CB005C 8024131C 2402000D */ addiu $v0, $zero, 0xd -/* CB0060 80241320 AEC20070 */ sw $v0, 0x70($s6) -/* CB0064 80241324 8FBF0064 */ lw $ra, 0x64($sp) -/* CB0068 80241328 8FB60060 */ lw $s6, 0x60($sp) -/* CB006C 8024132C 8FB5005C */ lw $s5, 0x5c($sp) -/* CB0070 80241330 8FB40058 */ lw $s4, 0x58($sp) -/* CB0074 80241334 8FB30054 */ lw $s3, 0x54($sp) -/* CB0078 80241338 8FB20050 */ lw $s2, 0x50($sp) -/* CB007C 8024133C 8FB1004C */ lw $s1, 0x4c($sp) -/* CB0080 80241340 8FB00048 */ lw $s0, 0x48($sp) -/* CB0084 80241344 D7BE0090 */ ldc1 $f30, 0x90($sp) -/* CB0088 80241348 D7BC0088 */ ldc1 $f28, 0x88($sp) -/* CB008C 8024134C D7BA0080 */ ldc1 $f26, 0x80($sp) -/* CB0090 80241350 D7B80078 */ ldc1 $f24, 0x78($sp) -/* CB0094 80241354 D7B60070 */ ldc1 $f22, 0x70($sp) -/* CB0098 80241358 D7B40068 */ ldc1 $f20, 0x68($sp) -/* CB009C 8024135C 03E00008 */ jr $ra -/* CB00A0 80241360 27BD0098 */ addiu $sp, $sp, 0x98 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80241364_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80241364_CAED40.s deleted file mode 100644 index 6d795db7a2..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80241364_CAED40.s +++ /dev/null @@ -1,100 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241364_CB00A4 -/* CB00A4 80241364 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CB00A8 80241368 AFB3003C */ sw $s3, 0x3c($sp) -/* CB00AC 8024136C 0080982D */ daddu $s3, $a0, $zero -/* CB00B0 80241370 AFBF0040 */ sw $ra, 0x40($sp) -/* CB00B4 80241374 AFB20038 */ sw $s2, 0x38($sp) -/* CB00B8 80241378 AFB10034 */ sw $s1, 0x34($sp) -/* CB00BC 8024137C AFB00030 */ sw $s0, 0x30($sp) -/* CB00C0 80241380 8E720148 */ lw $s2, 0x148($s3) -/* CB00C4 80241384 00A0882D */ daddu $s1, $a1, $zero -/* CB00C8 80241388 86440008 */ lh $a0, 8($s2) -/* CB00CC 8024138C 0C00EABB */ jal get_npc_unsafe -/* CB00D0 80241390 00C0802D */ daddu $s0, $a2, $zero -/* CB00D4 80241394 0200202D */ daddu $a0, $s0, $zero -/* CB00D8 80241398 0240282D */ daddu $a1, $s2, $zero -/* CB00DC 8024139C 24030001 */ addiu $v1, $zero, 1 -/* CB00E0 802413A0 AFA30010 */ sw $v1, 0x10($sp) -/* CB00E4 802413A4 8E260024 */ lw $a2, 0x24($s1) -/* CB00E8 802413A8 8E270028 */ lw $a3, 0x28($s1) -/* CB00EC 802413AC 0C01242D */ jal func_800490B4 -/* CB00F0 802413B0 0040802D */ daddu $s0, $v0, $zero -/* CB00F4 802413B4 1440001D */ bnez $v0, .L8024142C -/* CB00F8 802413B8 24040002 */ addiu $a0, $zero, 2 -/* CB00FC 802413BC 0200282D */ daddu $a1, $s0, $zero -/* CB0100 802413C0 0000302D */ daddu $a2, $zero, $zero -/* CB0104 802413C4 860300A8 */ lh $v1, 0xa8($s0) -/* CB0108 802413C8 3C013F80 */ lui $at, 0x3f80 -/* CB010C 802413CC 44810000 */ mtc1 $at, $f0 -/* CB0110 802413D0 3C014000 */ lui $at, 0x4000 -/* CB0114 802413D4 44811000 */ mtc1 $at, $f2 -/* CB0118 802413D8 3C01C1A0 */ lui $at, 0xc1a0 -/* CB011C 802413DC 44812000 */ mtc1 $at, $f4 -/* CB0120 802413E0 2402000F */ addiu $v0, $zero, 0xf -/* CB0124 802413E4 AFA2001C */ sw $v0, 0x1c($sp) -/* CB0128 802413E8 44833000 */ mtc1 $v1, $f6 -/* CB012C 802413EC 00000000 */ nop -/* CB0130 802413F0 468031A0 */ cvt.s.w $f6, $f6 -/* CB0134 802413F4 44073000 */ mfc1 $a3, $f6 -/* CB0138 802413F8 27A20028 */ addiu $v0, $sp, 0x28 -/* CB013C 802413FC AFA20020 */ sw $v0, 0x20($sp) -/* CB0140 80241400 E7A00010 */ swc1 $f0, 0x10($sp) -/* CB0144 80241404 E7A20014 */ swc1 $f2, 0x14($sp) -/* CB0148 80241408 0C01BFA4 */ jal fx_emote -/* CB014C 8024140C E7A40018 */ swc1 $f4, 0x18($sp) -/* CB0150 80241410 8E4200CC */ lw $v0, 0xcc($s2) -/* CB0154 80241414 8C430000 */ lw $v1, ($v0) -/* CB0158 80241418 24020019 */ addiu $v0, $zero, 0x19 -/* CB015C 8024141C A602008E */ sh $v0, 0x8e($s0) -/* CB0160 80241420 2402000E */ addiu $v0, $zero, 0xe -/* CB0164 80241424 0809052A */ j .L802414A8 -/* CB0168 80241428 AE030028 */ sw $v1, 0x28($s0) -.L8024142C: -/* CB016C 8024142C 8E4200CC */ lw $v0, 0xcc($s2) -/* CB0170 80241430 8E030028 */ lw $v1, 0x28($s0) -/* CB0174 80241434 8C420020 */ lw $v0, 0x20($v0) -/* CB0178 80241438 10620014 */ beq $v1, $v0, .L8024148C -/* CB017C 8024143C 00000000 */ nop -/* CB0180 80241440 C6000018 */ lwc1 $f0, 0x18($s0) -/* CB0184 80241444 3C014010 */ lui $at, 0x4010 -/* CB0188 80241448 44811800 */ mtc1 $at, $f3 -/* CB018C 8024144C 44801000 */ mtc1 $zero, $f2 -/* CB0190 80241450 46000021 */ cvt.d.s $f0, $f0 -/* CB0194 80241454 4622003C */ c.lt.d $f0, $f2 -/* CB0198 80241458 00000000 */ nop -/* CB019C 8024145C 45000003 */ bc1f .L8024146C -/* CB01A0 80241460 0000282D */ daddu $a1, $zero, $zero -/* CB01A4 80241464 0809051D */ j .L80241474 -/* CB01A8 80241468 0200202D */ daddu $a0, $s0, $zero -.L8024146C: -/* CB01AC 8024146C 0200202D */ daddu $a0, $s0, $zero -/* CB01B0 80241470 24050001 */ addiu $a1, $zero, 1 -.L80241474: -/* CB01B4 80241474 0C00F598 */ jal func_8003D660 -/* CB01B8 80241478 00000000 */ nop -/* CB01BC 8024147C 8E050018 */ lw $a1, 0x18($s0) -/* CB01C0 80241480 8E06000C */ lw $a2, 0xc($s0) -/* CB01C4 80241484 0C00EA95 */ jal npc_move_heading -/* CB01C8 80241488 0200202D */ daddu $a0, $s0, $zero -.L8024148C: -/* CB01CC 8024148C 8602008E */ lh $v0, 0x8e($s0) -/* CB01D0 80241490 9603008E */ lhu $v1, 0x8e($s0) -/* CB01D4 80241494 18400003 */ blez $v0, .L802414A4 -/* CB01D8 80241498 2462FFFF */ addiu $v0, $v1, -1 -/* CB01DC 8024149C 0809052B */ j .L802414AC -/* CB01E0 802414A0 A602008E */ sh $v0, 0x8e($s0) -.L802414A4: -/* CB01E4 802414A4 2402000C */ addiu $v0, $zero, 0xc -.L802414A8: -/* CB01E8 802414A8 AE620070 */ sw $v0, 0x70($s3) -.L802414AC: -/* CB01EC 802414AC 8FBF0040 */ lw $ra, 0x40($sp) -/* CB01F0 802414B0 8FB3003C */ lw $s3, 0x3c($sp) -/* CB01F4 802414B4 8FB20038 */ lw $s2, 0x38($sp) -/* CB01F8 802414B8 8FB10034 */ lw $s1, 0x34($sp) -/* CB01FC 802414BC 8FB00030 */ lw $s0, 0x30($sp) -/* CB0200 802414C0 03E00008 */ jr $ra -/* CB0204 802414C4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_802414C8_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_802414C8_CAED40.s deleted file mode 100644 index 5c9594de00..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_802414C8_CAED40.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414C8_CB0208 -/* CB0208 802414C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CB020C 802414CC AFB00010 */ sw $s0, 0x10($sp) -/* CB0210 802414D0 0080802D */ daddu $s0, $a0, $zero -/* CB0214 802414D4 AFBF0014 */ sw $ra, 0x14($sp) -/* CB0218 802414D8 8E020148 */ lw $v0, 0x148($s0) -/* CB021C 802414DC 0C00EABB */ jal get_npc_unsafe -/* CB0220 802414E0 84440008 */ lh $a0, 8($v0) -/* CB0224 802414E4 9443008E */ lhu $v1, 0x8e($v0) -/* CB0228 802414E8 2463FFFF */ addiu $v1, $v1, -1 -/* CB022C 802414EC A443008E */ sh $v1, 0x8e($v0) -/* CB0230 802414F0 00031C00 */ sll $v1, $v1, 0x10 -/* CB0234 802414F4 50600001 */ beql $v1, $zero, .L802414FC -/* CB0238 802414F8 AE000070 */ sw $zero, 0x70($s0) -.L802414FC: -/* CB023C 802414FC 8FBF0014 */ lw $ra, 0x14($sp) -/* CB0240 80241500 8FB00010 */ lw $s0, 0x10($sp) -/* CB0244 80241504 03E00008 */ jr $ra -/* CB0248 80241508 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_8024150C_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_8024150C_CAED40.s deleted file mode 100644 index 4623b9a4f6..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_8024150C_CAED40.s +++ /dev/null @@ -1,151 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024150C_CB024C -/* CB024C 8024150C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CB0250 80241510 AFB40040 */ sw $s4, 0x40($sp) -/* CB0254 80241514 0080A02D */ daddu $s4, $a0, $zero -/* CB0258 80241518 AFBF0048 */ sw $ra, 0x48($sp) -/* CB025C 8024151C AFB50044 */ sw $s5, 0x44($sp) -/* CB0260 80241520 AFB3003C */ sw $s3, 0x3c($sp) -/* CB0264 80241524 AFB20038 */ sw $s2, 0x38($sp) -/* CB0268 80241528 AFB10034 */ sw $s1, 0x34($sp) -/* CB026C 8024152C AFB00030 */ sw $s0, 0x30($sp) -/* CB0270 80241530 8E910148 */ lw $s1, 0x148($s4) -/* CB0274 80241534 86240008 */ lh $a0, 8($s1) -/* CB0278 80241538 0C00EABB */ jal get_npc_unsafe -/* CB027C 8024153C 00A0802D */ daddu $s0, $a1, $zero -/* CB0280 80241540 8E83000C */ lw $v1, 0xc($s4) -/* CB0284 80241544 0280202D */ daddu $a0, $s4, $zero -/* CB0288 80241548 8C650000 */ lw $a1, ($v1) -/* CB028C 8024154C 0C0B1EAF */ jal get_variable -/* CB0290 80241550 0040A82D */ daddu $s5, $v0, $zero -/* CB0294 80241554 AFA00010 */ sw $zero, 0x10($sp) -/* CB0298 80241558 8E2300D0 */ lw $v1, 0xd0($s1) -/* CB029C 8024155C 8C630030 */ lw $v1, 0x30($v1) -/* CB02A0 80241560 AFA30014 */ sw $v1, 0x14($sp) -/* CB02A4 80241564 8E2300D0 */ lw $v1, 0xd0($s1) -/* CB02A8 80241568 8C63001C */ lw $v1, 0x1c($v1) -/* CB02AC 8024156C AFA30018 */ sw $v1, 0x18($sp) -/* CB02B0 80241570 8E2300D0 */ lw $v1, 0xd0($s1) -/* CB02B4 80241574 8C630024 */ lw $v1, 0x24($v1) -/* CB02B8 80241578 AFA3001C */ sw $v1, 0x1c($sp) -/* CB02BC 8024157C 8E2300D0 */ lw $v1, 0xd0($s1) -/* CB02C0 80241580 8C630028 */ lw $v1, 0x28($v1) -/* CB02C4 80241584 27B30010 */ addiu $s3, $sp, 0x10 -/* CB02C8 80241588 AFA30020 */ sw $v1, 0x20($sp) -/* CB02CC 8024158C 8E2300D0 */ lw $v1, 0xd0($s1) -/* CB02D0 80241590 3C0142C8 */ lui $at, 0x42c8 -/* CB02D4 80241594 44810000 */ mtc1 $at, $f0 -/* CB02D8 80241598 8C63002C */ lw $v1, 0x2c($v1) -/* CB02DC 8024159C 0040902D */ daddu $s2, $v0, $zero -/* CB02E0 802415A0 E7A00028 */ swc1 $f0, 0x28($sp) -/* CB02E4 802415A4 A7A0002C */ sh $zero, 0x2c($sp) -/* CB02E8 802415A8 16000005 */ bnez $s0, .L802415C0 -/* CB02EC 802415AC AFA30024 */ sw $v1, 0x24($sp) -/* CB02F0 802415B0 8E2200B0 */ lw $v0, 0xb0($s1) -/* CB02F4 802415B4 30420004 */ andi $v0, $v0, 4 -/* CB02F8 802415B8 1040001F */ beqz $v0, .L80241638 -/* CB02FC 802415BC 00000000 */ nop -.L802415C0: -/* CB0300 802415C0 2404F7FF */ addiu $a0, $zero, -0x801 -/* CB0304 802415C4 AE800070 */ sw $zero, 0x70($s4) -/* CB0308 802415C8 A6A0008E */ sh $zero, 0x8e($s5) -/* CB030C 802415CC 8E2200CC */ lw $v0, 0xcc($s1) -/* CB0310 802415D0 8EA30000 */ lw $v1, ($s5) -/* CB0314 802415D4 8C420000 */ lw $v0, ($v0) -/* CB0318 802415D8 00641824 */ and $v1, $v1, $a0 -/* CB031C 802415DC AEA30000 */ sw $v1, ($s5) -/* CB0320 802415E0 AEA20028 */ sw $v0, 0x28($s5) -/* CB0324 802415E4 8E2200D0 */ lw $v0, 0xd0($s1) -/* CB0328 802415E8 8C420034 */ lw $v0, 0x34($v0) -/* CB032C 802415EC 54400005 */ bnel $v0, $zero, .L80241604 -/* CB0330 802415F0 2402FDFF */ addiu $v0, $zero, -0x201 -/* CB0334 802415F4 34620200 */ ori $v0, $v1, 0x200 -/* CB0338 802415F8 2403FFF7 */ addiu $v1, $zero, -9 -/* CB033C 802415FC 08090583 */ j .L8024160C -/* CB0340 80241600 00431024 */ and $v0, $v0, $v1 -.L80241604: -/* CB0344 80241604 00621024 */ and $v0, $v1, $v0 -/* CB0348 80241608 34420008 */ ori $v0, $v0, 8 -.L8024160C: -/* CB034C 8024160C AEA20000 */ sw $v0, ($s5) -/* CB0350 80241610 8E2200B0 */ lw $v0, 0xb0($s1) -/* CB0354 80241614 30420004 */ andi $v0, $v0, 4 -/* CB0358 80241618 10400007 */ beqz $v0, .L80241638 -/* CB035C 8024161C 24020063 */ addiu $v0, $zero, 0x63 -/* CB0360 80241620 AE820070 */ sw $v0, 0x70($s4) -/* CB0364 80241624 AE800074 */ sw $zero, 0x74($s4) -/* CB0368 80241628 8E2200B0 */ lw $v0, 0xb0($s1) -/* CB036C 8024162C 2403FFFB */ addiu $v1, $zero, -5 -/* CB0370 80241630 00431024 */ and $v0, $v0, $v1 -/* CB0374 80241634 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241638: -/* CB0378 80241638 8E830070 */ lw $v1, 0x70($s4) -/* CB037C 8024163C 2C620064 */ sltiu $v0, $v1, 0x64 -/* CB0380 80241640 10400036 */ beqz $v0, .L8024171C -/* CB0384 80241644 00031080 */ sll $v0, $v1, 2 -/* CB0388 80241648 3C018024 */ lui $at, 0x8024 -/* CB038C 8024164C 00220821 */ addu $at, $at, $v0 -/* CB0390 80241650 8C226130 */ lw $v0, 0x6130($at) -/* CB0394 80241654 00400008 */ jr $v0 -/* CB0398 80241658 00000000 */ nop -/* CB039C 8024165C 0280202D */ daddu $a0, $s4, $zero -/* CB03A0 80241660 0240282D */ daddu $a1, $s2, $zero -/* CB03A4 80241664 0C012568 */ jal func_800495A0 -/* CB03A8 80241668 0260302D */ daddu $a2, $s3, $zero -/* CB03AC 8024166C 0280202D */ daddu $a0, $s4, $zero -/* CB03B0 80241670 0240282D */ daddu $a1, $s2, $zero -/* CB03B4 80241674 0C0125AE */ jal func_800496B8 -/* CB03B8 80241678 0260302D */ daddu $a2, $s3, $zero -/* CB03BC 8024167C 080905C7 */ j .L8024171C -/* CB03C0 80241680 00000000 */ nop -/* CB03C4 80241684 0280202D */ daddu $a0, $s4, $zero -/* CB03C8 80241688 0240282D */ daddu $a1, $s2, $zero -/* CB03CC 8024168C 0C0126D1 */ jal func_80049B44 -/* CB03D0 80241690 0260302D */ daddu $a2, $s3, $zero -/* CB03D4 80241694 0280202D */ daddu $a0, $s4, $zero -/* CB03D8 80241698 0240282D */ daddu $a1, $s2, $zero -/* CB03DC 8024169C 0C012701 */ jal func_80049C04 -/* CB03E0 802416A0 0260302D */ daddu $a2, $s3, $zero -/* CB03E4 802416A4 080905C7 */ j .L8024171C -/* CB03E8 802416A8 00000000 */ nop -/* CB03EC 802416AC 0280202D */ daddu $a0, $s4, $zero -/* CB03F0 802416B0 0240282D */ daddu $a1, $s2, $zero -/* CB03F4 802416B4 0C01278F */ jal func_80049E3C -/* CB03F8 802416B8 0260302D */ daddu $a2, $s3, $zero -/* CB03FC 802416BC 0280202D */ daddu $a0, $s4, $zero -/* CB0400 802416C0 0240282D */ daddu $a1, $s2, $zero -/* CB0404 802416C4 0C0127B3 */ jal func_80049ECC -/* CB0408 802416C8 0260302D */ daddu $a2, $s3, $zero -/* CB040C 802416CC 080905C7 */ j .L8024171C -/* CB0410 802416D0 00000000 */ nop -/* CB0414 802416D4 0280202D */ daddu $a0, $s4, $zero -/* CB0418 802416D8 0240282D */ daddu $a1, $s2, $zero -/* CB041C 802416DC 0C090360 */ jal func_80240D80 -/* CB0420 802416E0 0260302D */ daddu $a2, $s3, $zero -/* CB0424 802416E4 0280202D */ daddu $a0, $s4, $zero -/* CB0428 802416E8 0240282D */ daddu $a1, $s2, $zero -/* CB042C 802416EC 0C0904D9 */ jal func_80241364 -/* CB0430 802416F0 0260302D */ daddu $a2, $s3, $zero -/* CB0434 802416F4 080905C7 */ j .L8024171C -/* CB0438 802416F8 00000000 */ nop -/* CB043C 802416FC 0280202D */ daddu $a0, $s4, $zero -/* CB0440 80241700 0240282D */ daddu $a1, $s2, $zero -/* CB0444 80241704 0C090532 */ jal func_802414C8 -/* CB0448 80241708 0260302D */ daddu $a2, $s3, $zero -/* CB044C 8024170C 080905C7 */ j .L8024171C -/* CB0450 80241710 00000000 */ nop -/* CB0454 80241714 0C0129CF */ jal func_8004A73C -/* CB0458 80241718 0280202D */ daddu $a0, $s4, $zero -.L8024171C: -/* CB045C 8024171C 8FBF0048 */ lw $ra, 0x48($sp) -/* CB0460 80241720 8FB50044 */ lw $s5, 0x44($sp) -/* CB0464 80241724 8FB40040 */ lw $s4, 0x40($sp) -/* CB0468 80241728 8FB3003C */ lw $s3, 0x3c($sp) -/* CB046C 8024172C 8FB20038 */ lw $s2, 0x38($sp) -/* CB0470 80241730 8FB10034 */ lw $s1, 0x34($sp) -/* CB0474 80241734 8FB00030 */ lw $s0, 0x30($sp) -/* CB0478 80241738 0000102D */ daddu $v0, $zero, $zero -/* CB047C 8024173C 03E00008 */ jr $ra -/* CB0480 80241740 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80241744_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80241744_CAED40.s deleted file mode 100644 index 3863931c86..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80241744_CAED40.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241744_CB0484 -/* CB0484 80241744 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CB0488 80241748 AFB10014 */ sw $s1, 0x14($sp) -/* CB048C 8024174C 0080882D */ daddu $s1, $a0, $zero -/* CB0490 80241750 AFBF0018 */ sw $ra, 0x18($sp) -/* CB0494 80241754 AFB00010 */ sw $s0, 0x10($sp) -/* CB0498 80241758 8E30000C */ lw $s0, 0xc($s1) -/* CB049C 8024175C 8E050000 */ lw $a1, ($s0) -/* CB04A0 80241760 0C0B1EAF */ jal get_variable -/* CB04A4 80241764 26100004 */ addiu $s0, $s0, 4 -/* CB04A8 80241768 0C00EAD2 */ jal get_npc_safe -/* CB04AC 8024176C 0040202D */ daddu $a0, $v0, $zero -/* CB04B0 80241770 10400005 */ beqz $v0, .L80241788 -/* CB04B4 80241774 00000000 */ nop -/* CB04B8 80241778 8E050000 */ lw $a1, ($s0) -/* CB04BC 8024177C 844600A8 */ lh $a2, 0xa8($v0) -/* CB04C0 80241780 0C0B2026 */ jal set_variable -/* CB04C4 80241784 0220202D */ daddu $a0, $s1, $zero -.L80241788: -/* CB04C8 80241788 8FBF0018 */ lw $ra, 0x18($sp) -/* CB04CC 8024178C 8FB10014 */ lw $s1, 0x14($sp) -/* CB04D0 80241790 8FB00010 */ lw $s0, 0x10($sp) -/* CB04D4 80241794 24020002 */ addiu $v0, $zero, 2 -/* CB04D8 80241798 03E00008 */ jr $ra -/* CB04DC 8024179C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_802417A0_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_802417A0_CAED40.s deleted file mode 100644 index 937e8173ab..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_802417A0_CAED40.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417A0_CB04E0 -/* CB04E0 802417A0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CB04E4 802417A4 AFB10014 */ sw $s1, 0x14($sp) -/* CB04E8 802417A8 0080882D */ daddu $s1, $a0, $zero -/* CB04EC 802417AC AFBF0024 */ sw $ra, 0x24($sp) -/* CB04F0 802417B0 AFB40020 */ sw $s4, 0x20($sp) -/* CB04F4 802417B4 AFB3001C */ sw $s3, 0x1c($sp) -/* CB04F8 802417B8 AFB20018 */ sw $s2, 0x18($sp) -/* CB04FC 802417BC AFB00010 */ sw $s0, 0x10($sp) -/* CB0500 802417C0 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* CB0504 802417C4 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* CB0508 802417C8 F7B80038 */ sdc1 $f24, 0x38($sp) -/* CB050C 802417CC F7B60030 */ sdc1 $f22, 0x30($sp) -/* CB0510 802417D0 F7B40028 */ sdc1 $f20, 0x28($sp) -/* CB0514 802417D4 8E30000C */ lw $s0, 0xc($s1) -/* CB0518 802417D8 8E130000 */ lw $s3, ($s0) -/* CB051C 802417DC 26100004 */ addiu $s0, $s0, 4 -/* CB0520 802417E0 0C0B1EAF */ jal get_variable -/* CB0524 802417E4 0260282D */ daddu $a1, $s3, $zero -/* CB0528 802417E8 4482E000 */ mtc1 $v0, $f28 -/* CB052C 802417EC 00000000 */ nop -/* CB0530 802417F0 4680E720 */ cvt.s.w $f28, $f28 -/* CB0534 802417F4 8E140000 */ lw $s4, ($s0) -/* CB0538 802417F8 26100004 */ addiu $s0, $s0, 4 -/* CB053C 802417FC 0220202D */ daddu $a0, $s1, $zero -/* CB0540 80241800 0C0B1EAF */ jal get_variable -/* CB0544 80241804 0280282D */ daddu $a1, $s4, $zero -/* CB0548 80241808 4482D000 */ mtc1 $v0, $f26 -/* CB054C 8024180C 00000000 */ nop -/* CB0550 80241810 4680D6A0 */ cvt.s.w $f26, $f26 -/* CB0554 80241814 8E100000 */ lw $s0, ($s0) -/* CB0558 80241818 0220202D */ daddu $a0, $s1, $zero -/* CB055C 8024181C 0C0B1EAF */ jal get_variable -/* CB0560 80241820 0200282D */ daddu $a1, $s0, $zero -/* CB0564 80241824 4482C000 */ mtc1 $v0, $f24 -/* CB0568 80241828 00000000 */ nop -/* CB056C 8024182C 4680C620 */ cvt.s.w $f24, $f24 -/* CB0570 80241830 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* CB0574 80241834 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* CB0578 80241838 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* CB057C 8024183C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CB0580 80241840 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* CB0584 80241844 44800000 */ mtc1 $zero, $f0 -/* CB0588 80241848 00031080 */ sll $v0, $v1, 2 -/* CB058C 8024184C 00431021 */ addu $v0, $v0, $v1 -/* CB0590 80241850 00021080 */ sll $v0, $v0, 2 -/* CB0594 80241854 00431023 */ subu $v0, $v0, $v1 -/* CB0598 80241858 000218C0 */ sll $v1, $v0, 3 -/* CB059C 8024185C 00431021 */ addu $v0, $v0, $v1 -/* CB05A0 80241860 000210C0 */ sll $v0, $v0, 3 -/* CB05A4 80241864 46001032 */ c.eq.s $f2, $f0 -/* CB05A8 80241868 3C01800B */ lui $at, 0x800b -/* CB05AC 8024186C 00220821 */ addu $at, $at, $v0 -/* CB05B0 80241870 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* CB05B4 80241874 45000005 */ bc1f .L8024188C -/* CB05B8 80241878 00000000 */ nop -/* CB05BC 8024187C 3C0142C8 */ lui $at, 0x42c8 -/* CB05C0 80241880 44810000 */ mtc1 $at, $f0 -/* CB05C4 80241884 08090627 */ j .L8024189C -/* CB05C8 80241888 4600B581 */ sub.s $f22, $f22, $f0 -.L8024188C: -/* CB05CC 8024188C 3C0142C8 */ lui $at, 0x42c8 -/* CB05D0 80241890 44810000 */ mtc1 $at, $f0 -/* CB05D4 80241894 00000000 */ nop -/* CB05D8 80241898 4600B580 */ add.s $f22, $f22, $f0 -.L8024189C: -/* CB05DC 8024189C 0C00A6C9 */ jal clamp_angle -/* CB05E0 802418A0 4600B306 */ mov.s $f12, $f22 -/* CB05E4 802418A4 46000586 */ mov.s $f22, $f0 -/* CB05E8 802418A8 3C014170 */ lui $at, 0x4170 -/* CB05EC 802418AC 4481A000 */ mtc1 $at, $f20 -/* CB05F0 802418B0 0C00A8BB */ jal sin_deg -/* CB05F4 802418B4 4600B306 */ mov.s $f12, $f22 -/* CB05F8 802418B8 46140002 */ mul.s $f0, $f0, $f20 -/* CB05FC 802418BC 00000000 */ nop -/* CB0600 802418C0 864200B0 */ lh $v0, 0xb0($s2) -/* CB0604 802418C4 3C013F00 */ lui $at, 0x3f00 -/* CB0608 802418C8 44812000 */ mtc1 $at, $f4 -/* CB060C 802418CC 44821000 */ mtc1 $v0, $f2 -/* CB0610 802418D0 00000000 */ nop -/* CB0614 802418D4 468010A0 */ cvt.s.w $f2, $f2 -/* CB0618 802418D8 46041082 */ mul.s $f2, $f2, $f4 -/* CB061C 802418DC 00000000 */ nop -/* CB0620 802418E0 4600E700 */ add.s $f28, $f28, $f0 -/* CB0624 802418E4 4602D680 */ add.s $f26, $f26, $f2 -/* CB0628 802418E8 0C00A8D4 */ jal cos_deg -/* CB062C 802418EC 4600B306 */ mov.s $f12, $f22 -/* CB0630 802418F0 46140002 */ mul.s $f0, $f0, $f20 -/* CB0634 802418F4 00000000 */ nop -/* CB0638 802418F8 0220202D */ daddu $a0, $s1, $zero -/* CB063C 802418FC 0260282D */ daddu $a1, $s3, $zero -/* CB0640 80241900 4600E18D */ trunc.w.s $f6, $f28 -/* CB0644 80241904 44063000 */ mfc1 $a2, $f6 -/* CB0648 80241908 0C0B2026 */ jal set_variable -/* CB064C 8024190C 4600C601 */ sub.s $f24, $f24, $f0 -/* CB0650 80241910 0220202D */ daddu $a0, $s1, $zero -/* CB0654 80241914 4600D18D */ trunc.w.s $f6, $f26 -/* CB0658 80241918 44063000 */ mfc1 $a2, $f6 -/* CB065C 8024191C 0C0B2026 */ jal set_variable -/* CB0660 80241920 0280282D */ daddu $a1, $s4, $zero -/* CB0664 80241924 0220202D */ daddu $a0, $s1, $zero -/* CB0668 80241928 4600C18D */ trunc.w.s $f6, $f24 -/* CB066C 8024192C 44063000 */ mfc1 $a2, $f6 -/* CB0670 80241930 0C0B2026 */ jal set_variable -/* CB0674 80241934 0200282D */ daddu $a1, $s0, $zero -/* CB0678 80241938 8FBF0024 */ lw $ra, 0x24($sp) -/* CB067C 8024193C 8FB40020 */ lw $s4, 0x20($sp) -/* CB0680 80241940 8FB3001C */ lw $s3, 0x1c($sp) -/* CB0684 80241944 8FB20018 */ lw $s2, 0x18($sp) -/* CB0688 80241948 8FB10014 */ lw $s1, 0x14($sp) -/* CB068C 8024194C 8FB00010 */ lw $s0, 0x10($sp) -/* CB0690 80241950 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* CB0694 80241954 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* CB0698 80241958 D7B80038 */ ldc1 $f24, 0x38($sp) -/* CB069C 8024195C D7B60030 */ ldc1 $f22, 0x30($sp) -/* CB06A0 80241960 D7B40028 */ ldc1 $f20, 0x28($sp) -/* CB06A4 80241964 24020002 */ addiu $v0, $zero, 2 -/* CB06A8 80241968 03E00008 */ jr $ra -/* CB06AC 8024196C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80241970_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80241970_CAED40.s deleted file mode 100644 index 9671bfc811..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80241970_CAED40.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241970_CB06B0 -/* CB06B0 80241970 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CB06B4 80241974 AFBF0010 */ sw $ra, 0x10($sp) -/* CB06B8 80241978 10A00003 */ beqz $a1, .L80241988 -/* CB06BC 8024197C 8C86000C */ lw $a2, 0xc($a0) -/* CB06C0 80241980 3C018024 */ lui $at, 0x8024 -/* CB06C4 80241984 AC203088 */ sw $zero, 0x3088($at) -.L80241988: -/* CB06C8 80241988 3C038024 */ lui $v1, 0x8024 -/* CB06CC 8024198C 24633088 */ addiu $v1, $v1, 0x3088 -/* CB06D0 80241990 8C620000 */ lw $v0, ($v1) -/* CB06D4 80241994 54400003 */ bnel $v0, $zero, .L802419A4 -/* CB06D8 80241998 AC600000 */ sw $zero, ($v1) -/* CB06DC 8024199C 0809066E */ j .L802419B8 -/* CB06E0 802419A0 0000102D */ daddu $v0, $zero, $zero -.L802419A4: -/* CB06E4 802419A4 8CC50000 */ lw $a1, ($a2) -/* CB06E8 802419A8 3C068024 */ lui $a2, 0x8024 -/* CB06EC 802419AC 0C0B2026 */ jal set_variable -/* CB06F0 802419B0 8CC6308C */ lw $a2, 0x308c($a2) -/* CB06F4 802419B4 24020002 */ addiu $v0, $zero, 2 -.L802419B8: -/* CB06F8 802419B8 8FBF0010 */ lw $ra, 0x10($sp) -/* CB06FC 802419BC 03E00008 */ jr $ra -/* CB0700 802419C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_802419C4_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_802419C4_CAED40.s deleted file mode 100644 index 835e5021c3..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_802419C4_CAED40.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419C4_CB0704 -/* CB0704 802419C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CB0708 802419C8 AFBF0010 */ sw $ra, 0x10($sp) -/* CB070C 802419CC 8C82000C */ lw $v0, 0xc($a0) -/* CB0710 802419D0 0C0B1EAF */ jal get_variable -/* CB0714 802419D4 8C450000 */ lw $a1, ($v0) -/* CB0718 802419D8 3C018024 */ lui $at, 0x8024 -/* CB071C 802419DC AC22308C */ sw $v0, 0x308c($at) -/* CB0720 802419E0 24020002 */ addiu $v0, $zero, 2 -/* CB0724 802419E4 8FBF0010 */ lw $ra, 0x10($sp) -/* CB0728 802419E8 24030001 */ addiu $v1, $zero, 1 -/* CB072C 802419EC 3C018024 */ lui $at, 0x8024 -/* CB0730 802419F0 AC233088 */ sw $v1, 0x3088($at) -/* CB0734 802419F4 03E00008 */ jr $ra -/* CB0738 802419F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80241B5C_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80241B5C_CAED40.s deleted file mode 100644 index 63f10f60ab..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80241B5C_CAED40.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B5C_CB089C -/* CB089C 80241B5C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CB08A0 80241B60 AFB00010 */ sw $s0, 0x10($sp) -/* CB08A4 80241B64 0080802D */ daddu $s0, $a0, $zero -/* CB08A8 80241B68 AFBF0014 */ sw $ra, 0x14($sp) -/* CB08AC 80241B6C 8E02000C */ lw $v0, 0xc($s0) -/* CB08B0 80241B70 0C0B1EAF */ jal get_variable -/* CB08B4 80241B74 8C450000 */ lw $a1, ($v0) -/* CB08B8 80241B78 3C048008 */ lui $a0, %hi(gItemTable) -/* CB08BC 80241B7C 248478E0 */ addiu $a0, $a0, %lo(gItemTable) -/* CB08C0 80241B80 00021940 */ sll $v1, $v0, 5 -/* CB08C4 80241B84 00642021 */ addu $a0, $v1, $a0 -/* CB08C8 80241B88 240300BB */ addiu $v1, $zero, 0xbb -/* CB08CC 80241B8C 14430003 */ bne $v0, $v1, .L80241B9C -/* CB08D0 80241B90 24020002 */ addiu $v0, $zero, 2 -/* CB08D4 80241B94 080906EE */ j .L80241BB8 -/* CB08D8 80241B98 AE0200A8 */ sw $v0, 0xa8($s0) -.L80241B9C: -/* CB08DC 80241B9C 94820018 */ lhu $v0, 0x18($a0) -/* CB08E0 80241BA0 30420080 */ andi $v0, $v0, 0x80 -/* CB08E4 80241BA4 10400003 */ beqz $v0, .L80241BB4 -/* CB08E8 80241BA8 24020001 */ addiu $v0, $zero, 1 -/* CB08EC 80241BAC 080906EE */ j .L80241BB8 -/* CB08F0 80241BB0 AE0200A8 */ sw $v0, 0xa8($s0) -.L80241BB4: -/* CB08F4 80241BB4 AE0000A8 */ sw $zero, 0xa8($s0) -.L80241BB8: -/* CB08F8 80241BB8 8FBF0014 */ lw $ra, 0x14($sp) -/* CB08FC 80241BBC 8FB00010 */ lw $s0, 0x10($sp) -/* CB0900 80241BC0 24020002 */ addiu $v0, $zero, 2 -/* CB0904 80241BC4 03E00008 */ jr $ra -/* CB0908 80241BC8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80241BCC_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80241BCC_CAED40.s deleted file mode 100644 index 83b34842a4..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80241BCC_CAED40.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BCC_CB090C -/* CB090C 80241BCC 2404005A */ addiu $a0, $zero, 0x5a -/* CB0910 80241BD0 3C038024 */ lui $v1, 0x8024 -/* CB0914 80241BD4 24636598 */ addiu $v1, $v1, 0x6598 -/* CB0918 80241BD8 240200DA */ addiu $v0, $zero, 0xda -.L80241BDC: -/* CB091C 80241BDC AC620000 */ sw $v0, ($v1) -/* CB0920 80241BE0 2463FFFC */ addiu $v1, $v1, -4 -/* CB0924 80241BE4 2484FFFF */ addiu $a0, $a0, -1 -/* CB0928 80241BE8 0481FFFC */ bgez $a0, .L80241BDC -/* CB092C 80241BEC 2442FFFF */ addiu $v0, $v0, -1 -/* CB0930 80241BF0 3C018024 */ lui $at, 0x8024 -/* CB0934 80241BF4 AC20659C */ sw $zero, 0x659c($at) -/* CB0938 80241BF8 03E00008 */ jr $ra -/* CB093C 80241BFC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80241C70_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80241C70_CAED40.s deleted file mode 100644 index 71204abb20..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80241C70_CAED40.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C70_CB09B0 -/* CB09B0 80241C70 27BDFF78 */ addiu $sp, $sp, -0x88 -/* CB09B4 80241C74 AFB10054 */ sw $s1, 0x54($sp) -/* CB09B8 80241C78 0080882D */ daddu $s1, $a0, $zero -/* CB09BC 80241C7C AFBF005C */ sw $ra, 0x5c($sp) -/* CB09C0 80241C80 AFB20058 */ sw $s2, 0x58($sp) -/* CB09C4 80241C84 AFB00050 */ sw $s0, 0x50($sp) -/* CB09C8 80241C88 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* CB09CC 80241C8C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CB09D0 80241C90 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CB09D4 80241C94 F7B60068 */ sdc1 $f22, 0x68($sp) -/* CB09D8 80241C98 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CB09DC 80241C9C 8E30000C */ lw $s0, 0xc($s1) -/* CB09E0 80241CA0 8E050000 */ lw $a1, ($s0) -/* CB09E4 80241CA4 0C0B1EAF */ jal get_variable -/* CB09E8 80241CA8 26100004 */ addiu $s0, $s0, 4 -/* CB09EC 80241CAC 0C046C04 */ jal get_model_list_index_from_tree_index -/* CB09F0 80241CB0 0040202D */ daddu $a0, $v0, $zero -/* CB09F4 80241CB4 8E050000 */ lw $a1, ($s0) -/* CB09F8 80241CB8 26100004 */ addiu $s0, $s0, 4 -/* CB09FC 80241CBC 0220202D */ daddu $a0, $s1, $zero -/* CB0A00 80241CC0 0C0B210B */ jal get_float_variable -/* CB0A04 80241CC4 0040902D */ daddu $s2, $v0, $zero -/* CB0A08 80241CC8 8E050000 */ lw $a1, ($s0) -/* CB0A0C 80241CCC 26100004 */ addiu $s0, $s0, 4 -/* CB0A10 80241CD0 0220202D */ daddu $a0, $s1, $zero -/* CB0A14 80241CD4 0C0B210B */ jal get_float_variable -/* CB0A18 80241CD8 46000706 */ mov.s $f28, $f0 -/* CB0A1C 80241CDC 8E050000 */ lw $a1, ($s0) -/* CB0A20 80241CE0 26100004 */ addiu $s0, $s0, 4 -/* CB0A24 80241CE4 0220202D */ daddu $a0, $s1, $zero -/* CB0A28 80241CE8 0C0B210B */ jal get_float_variable -/* CB0A2C 80241CEC 46000686 */ mov.s $f26, $f0 -/* CB0A30 80241CF0 0220202D */ daddu $a0, $s1, $zero -/* CB0A34 80241CF4 8E050000 */ lw $a1, ($s0) -/* CB0A38 80241CF8 0C0B210B */ jal get_float_variable -/* CB0A3C 80241CFC 46000586 */ mov.s $f22, $f0 -/* CB0A40 80241D00 0240202D */ daddu $a0, $s2, $zero -/* CB0A44 80241D04 0C046B4C */ jal get_model_from_list_index -/* CB0A48 80241D08 46000606 */ mov.s $f24, $f0 -/* CB0A4C 80241D0C 0040882D */ daddu $s1, $v0, $zero -/* CB0A50 80241D10 96220000 */ lhu $v0, ($s1) -/* CB0A54 80241D14 30420400 */ andi $v0, $v0, 0x400 -/* CB0A58 80241D18 1440001E */ bnez $v0, .L80241D94 -/* CB0A5C 80241D1C 26300058 */ addiu $s0, $s1, 0x58 -/* CB0A60 80241D20 4480A000 */ mtc1 $zero, $f20 -/* CB0A64 80241D24 4406B000 */ mfc1 $a2, $f22 -/* CB0A68 80241D28 4405A000 */ mfc1 $a1, $f20 -/* CB0A6C 80241D2C 4407A000 */ mfc1 $a3, $f20 -/* CB0A70 80241D30 0C019E40 */ jal guTranslateF -/* CB0A74 80241D34 0200202D */ daddu $a0, $s0, $zero -/* CB0A78 80241D38 4405E000 */ mfc1 $a1, $f28 -/* CB0A7C 80241D3C 4406D000 */ mfc1 $a2, $f26 -/* CB0A80 80241D40 4407C000 */ mfc1 $a3, $f24 -/* CB0A84 80241D44 0C090700 */ jal func_80241C00 -/* CB0A88 80241D48 27A40010 */ addiu $a0, $sp, 0x10 -/* CB0A8C 80241D4C 27A40010 */ addiu $a0, $sp, 0x10 -/* CB0A90 80241D50 0200282D */ daddu $a1, $s0, $zero -/* CB0A94 80241D54 0C019D80 */ jal guMtxCatF -/* CB0A98 80241D58 0200302D */ daddu $a2, $s0, $zero -/* CB0A9C 80241D5C 27A40010 */ addiu $a0, $sp, 0x10 -/* CB0AA0 80241D60 4600B587 */ neg.s $f22, $f22 -/* CB0AA4 80241D64 4405A000 */ mfc1 $a1, $f20 -/* CB0AA8 80241D68 4406B000 */ mfc1 $a2, $f22 -/* CB0AAC 80241D6C 0C019E40 */ jal guTranslateF -/* CB0AB0 80241D70 00A0382D */ daddu $a3, $a1, $zero -/* CB0AB4 80241D74 27A40010 */ addiu $a0, $sp, 0x10 -/* CB0AB8 80241D78 0200282D */ daddu $a1, $s0, $zero -/* CB0ABC 80241D7C 0C019D80 */ jal guMtxCatF -/* CB0AC0 80241D80 00A0302D */ daddu $a2, $a1, $zero -/* CB0AC4 80241D84 96220000 */ lhu $v0, ($s1) -/* CB0AC8 80241D88 34421400 */ ori $v0, $v0, 0x1400 -/* CB0ACC 80241D8C 08090783 */ j .L80241E0C -/* CB0AD0 80241D90 A6220000 */ sh $v0, ($s1) -.L80241D94: -/* CB0AD4 80241D94 4480A000 */ mtc1 $zero, $f20 -/* CB0AD8 80241D98 4406B000 */ mfc1 $a2, $f22 -/* CB0ADC 80241D9C 4405A000 */ mfc1 $a1, $f20 -/* CB0AE0 80241DA0 4407A000 */ mfc1 $a3, $f20 -/* CB0AE4 80241DA4 0C019E40 */ jal guTranslateF -/* CB0AE8 80241DA8 27A40010 */ addiu $a0, $sp, 0x10 -/* CB0AEC 80241DAC 27A40010 */ addiu $a0, $sp, 0x10 -/* CB0AF0 80241DB0 26300058 */ addiu $s0, $s1, 0x58 -/* CB0AF4 80241DB4 0200282D */ daddu $a1, $s0, $zero -/* CB0AF8 80241DB8 0C019D80 */ jal guMtxCatF -/* CB0AFC 80241DBC 0200302D */ daddu $a2, $s0, $zero -/* CB0B00 80241DC0 4405E000 */ mfc1 $a1, $f28 -/* CB0B04 80241DC4 4406D000 */ mfc1 $a2, $f26 -/* CB0B08 80241DC8 4407C000 */ mfc1 $a3, $f24 -/* CB0B0C 80241DCC 0C090700 */ jal func_80241C00 -/* CB0B10 80241DD0 27A40010 */ addiu $a0, $sp, 0x10 -/* CB0B14 80241DD4 27A40010 */ addiu $a0, $sp, 0x10 -/* CB0B18 80241DD8 0200282D */ daddu $a1, $s0, $zero -/* CB0B1C 80241DDC 0C019D80 */ jal guMtxCatF -/* CB0B20 80241DE0 0200302D */ daddu $a2, $s0, $zero -/* CB0B24 80241DE4 27A40010 */ addiu $a0, $sp, 0x10 -/* CB0B28 80241DE8 4600B587 */ neg.s $f22, $f22 -/* CB0B2C 80241DEC 4405A000 */ mfc1 $a1, $f20 -/* CB0B30 80241DF0 4406B000 */ mfc1 $a2, $f22 -/* CB0B34 80241DF4 0C019E40 */ jal guTranslateF -/* CB0B38 80241DF8 00A0382D */ daddu $a3, $a1, $zero -/* CB0B3C 80241DFC 27A40010 */ addiu $a0, $sp, 0x10 -/* CB0B40 80241E00 0200282D */ daddu $a1, $s0, $zero -/* CB0B44 80241E04 0C019D80 */ jal guMtxCatF -/* CB0B48 80241E08 00A0302D */ daddu $a2, $a1, $zero -.L80241E0C: -/* CB0B4C 80241E0C 8FBF005C */ lw $ra, 0x5c($sp) -/* CB0B50 80241E10 8FB20058 */ lw $s2, 0x58($sp) -/* CB0B54 80241E14 8FB10054 */ lw $s1, 0x54($sp) -/* CB0B58 80241E18 8FB00050 */ lw $s0, 0x50($sp) -/* CB0B5C 80241E1C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* CB0B60 80241E20 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CB0B64 80241E24 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CB0B68 80241E28 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CB0B6C 80241E2C D7B40060 */ ldc1 $f20, 0x60($sp) -/* CB0B70 80241E30 24020002 */ addiu $v0, $zero, 2 -/* CB0B74 80241E34 03E00008 */ jr $ra -/* CB0B78 80241E38 27BD0088 */ addiu $sp, $sp, 0x88 -/* CB0B7C 80241E3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_08/func_80241E40_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/func_80241E40_CAED40.s deleted file mode 100644 index 220ed73b7f..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/func_80241E40_CAED40.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E40_CB0B80 -/* CB0B80 80241E40 8C820084 */ lw $v0, 0x84($a0) -/* CB0B84 80241E44 8C830090 */ lw $v1, 0x90($a0) -/* CB0B88 80241E48 00431023 */ subu $v0, $v0, $v1 -/* CB0B8C 80241E4C 44821000 */ mtc1 $v0, $f2 -/* CB0B90 80241E50 00000000 */ nop -/* CB0B94 80241E54 468010A0 */ cvt.s.w $f2, $f2 -/* CB0B98 80241E58 8C820088 */ lw $v0, 0x88($a0) -/* CB0B9C 80241E5C 8C830094 */ lw $v1, 0x94($a0) -/* CB0BA0 80241E60 46021082 */ mul.s $f2, $f2, $f2 -/* CB0BA4 80241E64 00000000 */ nop -/* CB0BA8 80241E68 00431023 */ subu $v0, $v0, $v1 -/* CB0BAC 80241E6C 44822000 */ mtc1 $v0, $f4 -/* CB0BB0 80241E70 00000000 */ nop -/* CB0BB4 80241E74 46802120 */ cvt.s.w $f4, $f4 -/* CB0BB8 80241E78 8C82008C */ lw $v0, 0x8c($a0) -/* CB0BBC 80241E7C 46042102 */ mul.s $f4, $f4, $f4 -/* CB0BC0 80241E80 00000000 */ nop -/* CB0BC4 80241E84 8C830098 */ lw $v1, 0x98($a0) -/* CB0BC8 80241E88 00431023 */ subu $v0, $v0, $v1 -/* CB0BCC 80241E8C 44820000 */ mtc1 $v0, $f0 -/* CB0BD0 80241E90 00000000 */ nop -/* CB0BD4 80241E94 46800020 */ cvt.s.w $f0, $f0 -/* CB0BD8 80241E98 46000002 */ mul.s $f0, $f0, $f0 -/* CB0BDC 80241E9C 00000000 */ nop -/* CB0BE0 80241EA0 46041080 */ add.s $f2, $f2, $f4 -/* CB0BE4 80241EA4 46001080 */ add.s $f2, $f2, $f0 -/* CB0BE8 80241EA8 3C014561 */ lui $at, 0x4561 -/* CB0BEC 80241EAC 44810000 */ mtc1 $at, $f0 -/* CB0BF0 80241EB0 00000000 */ nop -/* CB0BF4 80241EB4 4600103C */ c.lt.s $f2, $f0 -/* CB0BF8 80241EB8 00000000 */ nop -/* CB0BFC 80241EBC 45010002 */ bc1t .L80241EC8 -/* CB0C00 80241EC0 24020001 */ addiu $v0, $zero, 1 -/* CB0C04 80241EC4 0000102D */ daddu $v0, $zero, $zero -.L80241EC8: -/* CB0C08 80241EC8 AC820084 */ sw $v0, 0x84($a0) -/* CB0C0C 80241ECC 03E00008 */ jr $ra -/* CB0C10 80241ED0 24020002 */ addiu $v0, $zero, 2 -/* CB0C14 80241ED4 00000000 */ nop -/* CB0C18 80241ED8 00000000 */ nop -/* CB0C1C 80241EDC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_09/func_80240040_CB5000.s b/asm/nonmatchings/world/area_flo/flo_09/func_80240040_CB5000.s deleted file mode 100644 index 2c6e87fbd1..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/func_80240040_CB5000.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_CB5040 -/* CB5040 80240040 8C820084 */ lw $v0, 0x84($a0) -/* CB5044 80240044 8C830090 */ lw $v1, 0x90($a0) -/* CB5048 80240048 00431023 */ subu $v0, $v0, $v1 -/* CB504C 8024004C 44821000 */ mtc1 $v0, $f2 -/* CB5050 80240050 00000000 */ nop -/* CB5054 80240054 468010A0 */ cvt.s.w $f2, $f2 -/* CB5058 80240058 8C820088 */ lw $v0, 0x88($a0) -/* CB505C 8024005C 8C830094 */ lw $v1, 0x94($a0) -/* CB5060 80240060 46021082 */ mul.s $f2, $f2, $f2 -/* CB5064 80240064 00000000 */ nop -/* CB5068 80240068 00431023 */ subu $v0, $v0, $v1 -/* CB506C 8024006C 44822000 */ mtc1 $v0, $f4 -/* CB5070 80240070 00000000 */ nop -/* CB5074 80240074 46802120 */ cvt.s.w $f4, $f4 -/* CB5078 80240078 8C82008C */ lw $v0, 0x8c($a0) -/* CB507C 8024007C 46042102 */ mul.s $f4, $f4, $f4 -/* CB5080 80240080 00000000 */ nop -/* CB5084 80240084 8C830098 */ lw $v1, 0x98($a0) -/* CB5088 80240088 00431023 */ subu $v0, $v0, $v1 -/* CB508C 8024008C 44820000 */ mtc1 $v0, $f0 -/* CB5090 80240090 00000000 */ nop -/* CB5094 80240094 46800020 */ cvt.s.w $f0, $f0 -/* CB5098 80240098 46000002 */ mul.s $f0, $f0, $f0 -/* CB509C 8024009C 00000000 */ nop -/* CB50A0 802400A0 46041080 */ add.s $f2, $f2, $f4 -/* CB50A4 802400A4 46001080 */ add.s $f2, $f2, $f0 -/* CB50A8 802400A8 3C014561 */ lui $at, 0x4561 -/* CB50AC 802400AC 44810000 */ mtc1 $at, $f0 -/* CB50B0 802400B0 00000000 */ nop -/* CB50B4 802400B4 4600103C */ c.lt.s $f2, $f0 -/* CB50B8 802400B8 00000000 */ nop -/* CB50BC 802400BC 45010002 */ bc1t .L802400C8 -/* CB50C0 802400C0 24020001 */ addiu $v0, $zero, 1 -/* CB50C4 802400C4 0000102D */ daddu $v0, $zero, $zero -.L802400C8: -/* CB50C8 802400C8 AC820084 */ sw $v0, 0x84($a0) -/* CB50CC 802400CC 03E00008 */ jr $ra -/* CB50D0 802400D0 24020002 */ addiu $v0, $zero, 2 -/* CB50D4 802400D4 00000000 */ nop -/* CB50D8 802400D8 00000000 */ nop -/* CB50DC 802400DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_09/func_802400E0_CB5000.s b/asm/nonmatchings/world/area_flo/flo_09/func_802400E0_CB5000.s deleted file mode 100644 index 326ad0f1c8..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/func_802400E0_CB5000.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E0_CB50E0 -/* CB50E0 802400E0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* CB50E4 802400E4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* CB50E8 802400E8 4485A000 */ mtc1 $a1, $f20 -/* CB50EC 802400EC F7B60020 */ sdc1 $f22, 0x20($sp) -/* CB50F0 802400F0 4486B000 */ mtc1 $a2, $f22 -/* CB50F4 802400F4 AFB00010 */ sw $s0, 0x10($sp) -/* CB50F8 802400F8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* CB50FC 802400FC 4487C000 */ mtc1 $a3, $f24 -/* CB5100 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* CB5104 80240104 0C019D28 */ jal guMtxIdentF -/* CB5108 80240108 0080802D */ daddu $s0, $a0, $zero -/* CB510C 8024010C 4616A582 */ mul.s $f22, $f20, $f22 -/* CB5110 80240110 00000000 */ nop -/* CB5114 80240114 4618A502 */ mul.s $f20, $f20, $f24 -/* CB5118 80240118 00000000 */ nop -/* CB511C 8024011C 3C013F80 */ lui $at, 0x3f80 -/* CB5120 80240120 44810000 */ mtc1 $at, $f0 -/* CB5124 80240124 00000000 */ nop -/* CB5128 80240128 E6000014 */ swc1 $f0, 0x14($s0) -/* CB512C 8024012C E6160010 */ swc1 $f22, 0x10($s0) -/* CB5130 80240130 E6140018 */ swc1 $f20, 0x18($s0) -/* CB5134 80240134 8FBF0014 */ lw $ra, 0x14($sp) -/* CB5138 80240138 8FB00010 */ lw $s0, 0x10($sp) -/* CB513C 8024013C D7B80028 */ ldc1 $f24, 0x28($sp) -/* CB5140 80240140 D7B60020 */ ldc1 $f22, 0x20($sp) -/* CB5144 80240144 D7B40018 */ ldc1 $f20, 0x18($sp) -/* CB5148 80240148 03E00008 */ jr $ra -/* CB514C 8024014C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_flo/flo_09/func_80240150_CB5000.s b/asm/nonmatchings/world/area_flo/flo_09/func_80240150_CB5000.s deleted file mode 100644 index 5e4230f10a..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/func_80240150_CB5000.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240150_CB5150 -/* CB5150 80240150 27BDFF78 */ addiu $sp, $sp, -0x88 -/* CB5154 80240154 AFB10054 */ sw $s1, 0x54($sp) -/* CB5158 80240158 0080882D */ daddu $s1, $a0, $zero -/* CB515C 8024015C AFBF005C */ sw $ra, 0x5c($sp) -/* CB5160 80240160 AFB20058 */ sw $s2, 0x58($sp) -/* CB5164 80240164 AFB00050 */ sw $s0, 0x50($sp) -/* CB5168 80240168 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* CB516C 8024016C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CB5170 80240170 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CB5174 80240174 F7B60068 */ sdc1 $f22, 0x68($sp) -/* CB5178 80240178 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CB517C 8024017C 8E30000C */ lw $s0, 0xc($s1) -/* CB5180 80240180 8E050000 */ lw $a1, ($s0) -/* CB5184 80240184 0C0B1EAF */ jal get_variable -/* CB5188 80240188 26100004 */ addiu $s0, $s0, 4 -/* CB518C 8024018C 0C046C04 */ jal get_model_list_index_from_tree_index -/* CB5190 80240190 0040202D */ daddu $a0, $v0, $zero -/* CB5194 80240194 8E050000 */ lw $a1, ($s0) -/* CB5198 80240198 26100004 */ addiu $s0, $s0, 4 -/* CB519C 8024019C 0220202D */ daddu $a0, $s1, $zero -/* CB51A0 802401A0 0C0B210B */ jal get_float_variable -/* CB51A4 802401A4 0040902D */ daddu $s2, $v0, $zero -/* CB51A8 802401A8 8E050000 */ lw $a1, ($s0) -/* CB51AC 802401AC 26100004 */ addiu $s0, $s0, 4 -/* CB51B0 802401B0 0220202D */ daddu $a0, $s1, $zero -/* CB51B4 802401B4 0C0B210B */ jal get_float_variable -/* CB51B8 802401B8 46000706 */ mov.s $f28, $f0 -/* CB51BC 802401BC 8E050000 */ lw $a1, ($s0) -/* CB51C0 802401C0 26100004 */ addiu $s0, $s0, 4 -/* CB51C4 802401C4 0220202D */ daddu $a0, $s1, $zero -/* CB51C8 802401C8 0C0B210B */ jal get_float_variable -/* CB51CC 802401CC 46000686 */ mov.s $f26, $f0 -/* CB51D0 802401D0 0220202D */ daddu $a0, $s1, $zero -/* CB51D4 802401D4 8E050000 */ lw $a1, ($s0) -/* CB51D8 802401D8 0C0B210B */ jal get_float_variable -/* CB51DC 802401DC 46000586 */ mov.s $f22, $f0 -/* CB51E0 802401E0 0240202D */ daddu $a0, $s2, $zero -/* CB51E4 802401E4 0C046B4C */ jal get_model_from_list_index -/* CB51E8 802401E8 46000606 */ mov.s $f24, $f0 -/* CB51EC 802401EC 0040882D */ daddu $s1, $v0, $zero -/* CB51F0 802401F0 96220000 */ lhu $v0, ($s1) -/* CB51F4 802401F4 30420400 */ andi $v0, $v0, 0x400 -/* CB51F8 802401F8 1440001E */ bnez $v0, .L80240274 -/* CB51FC 802401FC 26300058 */ addiu $s0, $s1, 0x58 -/* CB5200 80240200 4480A000 */ mtc1 $zero, $f20 -/* CB5204 80240204 4406B000 */ mfc1 $a2, $f22 -/* CB5208 80240208 4405A000 */ mfc1 $a1, $f20 -/* CB520C 8024020C 4407A000 */ mfc1 $a3, $f20 -/* CB5210 80240210 0C019E40 */ jal guTranslateF -/* CB5214 80240214 0200202D */ daddu $a0, $s0, $zero -/* CB5218 80240218 4405E000 */ mfc1 $a1, $f28 -/* CB521C 8024021C 4406D000 */ mfc1 $a2, $f26 -/* CB5220 80240220 4407C000 */ mfc1 $a3, $f24 -/* CB5224 80240224 0C090038 */ jal func_802400E0 -/* CB5228 80240228 27A40010 */ addiu $a0, $sp, 0x10 -/* CB522C 8024022C 27A40010 */ addiu $a0, $sp, 0x10 -/* CB5230 80240230 0200282D */ daddu $a1, $s0, $zero -/* CB5234 80240234 0C019D80 */ jal guMtxCatF -/* CB5238 80240238 0200302D */ daddu $a2, $s0, $zero -/* CB523C 8024023C 27A40010 */ addiu $a0, $sp, 0x10 -/* CB5240 80240240 4600B587 */ neg.s $f22, $f22 -/* CB5244 80240244 4405A000 */ mfc1 $a1, $f20 -/* CB5248 80240248 4406B000 */ mfc1 $a2, $f22 -/* CB524C 8024024C 0C019E40 */ jal guTranslateF -/* CB5250 80240250 00A0382D */ daddu $a3, $a1, $zero -/* CB5254 80240254 27A40010 */ addiu $a0, $sp, 0x10 -/* CB5258 80240258 0200282D */ daddu $a1, $s0, $zero -/* CB525C 8024025C 0C019D80 */ jal guMtxCatF -/* CB5260 80240260 00A0302D */ daddu $a2, $a1, $zero -/* CB5264 80240264 96220000 */ lhu $v0, ($s1) -/* CB5268 80240268 34421400 */ ori $v0, $v0, 0x1400 -/* CB526C 8024026C 080900BB */ j .L802402EC -/* CB5270 80240270 A6220000 */ sh $v0, ($s1) -.L80240274: -/* CB5274 80240274 4480A000 */ mtc1 $zero, $f20 -/* CB5278 80240278 4406B000 */ mfc1 $a2, $f22 -/* CB527C 8024027C 4405A000 */ mfc1 $a1, $f20 -/* CB5280 80240280 4407A000 */ mfc1 $a3, $f20 -/* CB5284 80240284 0C019E40 */ jal guTranslateF -/* CB5288 80240288 27A40010 */ addiu $a0, $sp, 0x10 -/* CB528C 8024028C 27A40010 */ addiu $a0, $sp, 0x10 -/* CB5290 80240290 26300058 */ addiu $s0, $s1, 0x58 -/* CB5294 80240294 0200282D */ daddu $a1, $s0, $zero -/* CB5298 80240298 0C019D80 */ jal guMtxCatF -/* CB529C 8024029C 0200302D */ daddu $a2, $s0, $zero -/* CB52A0 802402A0 4405E000 */ mfc1 $a1, $f28 -/* CB52A4 802402A4 4406D000 */ mfc1 $a2, $f26 -/* CB52A8 802402A8 4407C000 */ mfc1 $a3, $f24 -/* CB52AC 802402AC 0C090038 */ jal func_802400E0 -/* CB52B0 802402B0 27A40010 */ addiu $a0, $sp, 0x10 -/* CB52B4 802402B4 27A40010 */ addiu $a0, $sp, 0x10 -/* CB52B8 802402B8 0200282D */ daddu $a1, $s0, $zero -/* CB52BC 802402BC 0C019D80 */ jal guMtxCatF -/* CB52C0 802402C0 0200302D */ daddu $a2, $s0, $zero -/* CB52C4 802402C4 27A40010 */ addiu $a0, $sp, 0x10 -/* CB52C8 802402C8 4600B587 */ neg.s $f22, $f22 -/* CB52CC 802402CC 4405A000 */ mfc1 $a1, $f20 -/* CB52D0 802402D0 4406B000 */ mfc1 $a2, $f22 -/* CB52D4 802402D4 0C019E40 */ jal guTranslateF -/* CB52D8 802402D8 00A0382D */ daddu $a3, $a1, $zero -/* CB52DC 802402DC 27A40010 */ addiu $a0, $sp, 0x10 -/* CB52E0 802402E0 0200282D */ daddu $a1, $s0, $zero -/* CB52E4 802402E4 0C019D80 */ jal guMtxCatF -/* CB52E8 802402E8 00A0302D */ daddu $a2, $a1, $zero -.L802402EC: -/* CB52EC 802402EC 8FBF005C */ lw $ra, 0x5c($sp) -/* CB52F0 802402F0 8FB20058 */ lw $s2, 0x58($sp) -/* CB52F4 802402F4 8FB10054 */ lw $s1, 0x54($sp) -/* CB52F8 802402F8 8FB00050 */ lw $s0, 0x50($sp) -/* CB52FC 802402FC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* CB5300 80240300 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CB5304 80240304 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CB5308 80240308 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CB530C 8024030C D7B40060 */ ldc1 $f20, 0x60($sp) -/* CB5310 80240310 24020002 */ addiu $v0, $zero, 2 -/* CB5314 80240314 03E00008 */ jr $ra -/* CB5318 80240318 27BD0088 */ addiu $sp, $sp, 0x88 -/* CB531C 8024031C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_09/func_80240320_CB5000.s b/asm/nonmatchings/world/area_flo/flo_09/func_80240320_CB5000.s deleted file mode 100644 index 51a02ad115..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/func_80240320_CB5000.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240320_CB5320 -/* CB5320 80240320 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CB5324 80240324 AFB3002C */ sw $s3, 0x2c($sp) -/* CB5328 80240328 0080982D */ daddu $s3, $a0, $zero -/* CB532C 8024032C AFBF0030 */ sw $ra, 0x30($sp) -/* CB5330 80240330 AFB20028 */ sw $s2, 0x28($sp) -/* CB5334 80240334 AFB10024 */ sw $s1, 0x24($sp) -/* CB5338 80240338 AFB00020 */ sw $s0, 0x20($sp) -/* CB533C 8024033C 8E710148 */ lw $s1, 0x148($s3) -/* CB5340 80240340 86240008 */ lh $a0, 8($s1) -/* CB5344 80240344 0C00EABB */ jal get_npc_unsafe -/* CB5348 80240348 00A0902D */ daddu $s2, $a1, $zero -/* CB534C 8024034C 8E440004 */ lw $a0, 4($s2) -/* CB5350 80240350 0040802D */ daddu $s0, $v0, $zero -/* CB5354 80240354 00041FC2 */ srl $v1, $a0, 0x1f -/* CB5358 80240358 00832021 */ addu $a0, $a0, $v1 -/* CB535C 8024035C 00042043 */ sra $a0, $a0, 1 -/* CB5360 80240360 0C00A67F */ jal rand_int -/* CB5364 80240364 24840001 */ addiu $a0, $a0, 1 -/* CB5368 80240368 8E430004 */ lw $v1, 4($s2) -/* CB536C 8024036C 000327C2 */ srl $a0, $v1, 0x1f -/* CB5370 80240370 00641821 */ addu $v1, $v1, $a0 -/* CB5374 80240374 00031843 */ sra $v1, $v1, 1 -/* CB5378 80240378 00621821 */ addu $v1, $v1, $v0 -/* CB537C 8024037C A603008E */ sh $v1, 0x8e($s0) -/* CB5380 80240380 8E2300D0 */ lw $v1, 0xd0($s1) -/* CB5384 80240384 C6000040 */ lwc1 $f0, 0x40($s0) -/* CB5388 80240388 C4640000 */ lwc1 $f4, ($v1) -/* CB538C 8024038C 46802120 */ cvt.s.w $f4, $f4 -/* CB5390 80240390 C4620008 */ lwc1 $f2, 8($v1) -/* CB5394 80240394 468010A0 */ cvt.s.w $f2, $f2 -/* CB5398 80240398 E7A00010 */ swc1 $f0, 0x10($sp) -/* CB539C 8024039C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CB53A0 802403A0 44061000 */ mfc1 $a2, $f2 -/* CB53A4 802403A4 C440000C */ lwc1 $f0, 0xc($v0) -/* CB53A8 802403A8 46800020 */ cvt.s.w $f0, $f0 -/* CB53AC 802403AC E7A00014 */ swc1 $f0, 0x14($sp) -/* CB53B0 802403B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* CB53B4 802403B4 44052000 */ mfc1 $a1, $f4 -/* CB53B8 802403B8 C4400010 */ lwc1 $f0, 0x10($v0) -/* CB53BC 802403BC 46800020 */ cvt.s.w $f0, $f0 -/* CB53C0 802403C0 E7A00018 */ swc1 $f0, 0x18($sp) -/* CB53C4 802403C4 8C640018 */ lw $a0, 0x18($v1) -/* CB53C8 802403C8 0C0123F5 */ jal is_point_within_region -/* CB53CC 802403CC 8E070038 */ lw $a3, 0x38($s0) -/* CB53D0 802403D0 1040000E */ beqz $v0, .L8024040C -/* CB53D4 802403D4 00000000 */ nop -/* CB53D8 802403D8 8E2200D0 */ lw $v0, 0xd0($s1) -/* CB53DC 802403DC C60C0038 */ lwc1 $f12, 0x38($s0) -/* CB53E0 802403E0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CB53E4 802403E4 C4460000 */ lwc1 $f6, ($v0) -/* CB53E8 802403E8 468031A0 */ cvt.s.w $f6, $f6 -/* CB53EC 802403EC 44063000 */ mfc1 $a2, $f6 -/* CB53F0 802403F0 C4460008 */ lwc1 $f6, 8($v0) -/* CB53F4 802403F4 468031A0 */ cvt.s.w $f6, $f6 -/* CB53F8 802403F8 44073000 */ mfc1 $a3, $f6 -/* CB53FC 802403FC 0C00A720 */ jal atan2 -/* CB5400 80240400 00000000 */ nop -/* CB5404 80240404 0809010F */ j .L8024043C -/* CB5408 80240408 E600000C */ swc1 $f0, 0xc($s0) -.L8024040C: -/* CB540C 8024040C 0C00A67F */ jal rand_int -/* CB5410 80240410 2404003C */ addiu $a0, $zero, 0x3c -/* CB5414 80240414 C60C000C */ lwc1 $f12, 0xc($s0) -/* CB5418 80240418 44820000 */ mtc1 $v0, $f0 -/* CB541C 8024041C 00000000 */ nop -/* CB5420 80240420 46800020 */ cvt.s.w $f0, $f0 -/* CB5424 80240424 46006300 */ add.s $f12, $f12, $f0 -/* CB5428 80240428 3C0141F0 */ lui $at, 0x41f0 -/* CB542C 8024042C 44810000 */ mtc1 $at, $f0 -/* CB5430 80240430 0C00A6C9 */ jal clamp_angle -/* CB5434 80240434 46006301 */ sub.s $f12, $f12, $f0 -/* CB5438 80240438 E600000C */ swc1 $f0, 0xc($s0) -.L8024043C: -/* CB543C 8024043C 8E2200CC */ lw $v0, 0xcc($s1) -/* CB5440 80240440 8C420004 */ lw $v0, 4($v0) -/* CB5444 80240444 AE020028 */ sw $v0, 0x28($s0) -/* CB5448 80240448 AE600074 */ sw $zero, 0x74($s3) -/* CB544C 8024044C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CB5450 80240450 8C420014 */ lw $v0, 0x14($v0) -/* CB5454 80240454 04410004 */ bgez $v0, .L80240468 -/* CB5458 80240458 00000000 */ nop -/* CB545C 8024045C C6400000 */ lwc1 $f0, ($s2) -/* CB5460 80240460 08090122 */ j .L80240488 -/* CB5464 80240464 E6000018 */ swc1 $f0, 0x18($s0) -.L80240468: -/* CB5468 80240468 3C018024 */ lui $at, 0x8024 -/* CB546C 8024046C D42241A0 */ ldc1 $f2, 0x41a0($at) -/* CB5470 80240470 44820000 */ mtc1 $v0, $f0 -/* CB5474 80240474 00000000 */ nop -/* CB5478 80240478 46800021 */ cvt.d.w $f0, $f0 -/* CB547C 8024047C 46220003 */ div.d $f0, $f0, $f2 -/* CB5480 80240480 46200020 */ cvt.s.d $f0, $f0 -/* CB5484 80240484 E6000018 */ swc1 $f0, 0x18($s0) -.L80240488: -/* CB5488 80240488 C600003C */ lwc1 $f0, 0x3c($s0) -/* CB548C 8024048C 3C014059 */ lui $at, 0x4059 -/* CB5490 80240490 44811800 */ mtc1 $at, $f3 -/* CB5494 80240494 44801000 */ mtc1 $zero, $f2 -/* CB5498 80240498 46000021 */ cvt.d.s $f0, $f0 -/* CB549C 8024049C 46220002 */ mul.d $f0, $f0, $f2 -/* CB54A0 802404A0 00000000 */ nop -/* CB54A4 802404A4 24020001 */ addiu $v0, $zero, 1 -/* CB54A8 802404A8 4620018D */ trunc.w.d $f6, $f0 -/* CB54AC 802404AC E626007C */ swc1 $f6, 0x7c($s1) -/* CB54B0 802404B0 AE620070 */ sw $v0, 0x70($s3) -/* CB54B4 802404B4 8FBF0030 */ lw $ra, 0x30($sp) -/* CB54B8 802404B8 8FB3002C */ lw $s3, 0x2c($sp) -/* CB54BC 802404BC 8FB20028 */ lw $s2, 0x28($sp) -/* CB54C0 802404C0 8FB10024 */ lw $s1, 0x24($sp) -/* CB54C4 802404C4 8FB00020 */ lw $s0, 0x20($sp) -/* CB54C8 802404C8 03E00008 */ jr $ra -/* CB54CC 802404CC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_09/func_802404D0_CB5000.s b/asm/nonmatchings/world/area_flo/flo_09/func_802404D0_CB5000.s deleted file mode 100644 index fcc14bafa7..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/func_802404D0_CB5000.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404D0_CB54D0 -/* CB54D0 802404D0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* CB54D4 802404D4 AFB3004C */ sw $s3, 0x4c($sp) -/* CB54D8 802404D8 0080982D */ daddu $s3, $a0, $zero -/* CB54DC 802404DC AFBF0058 */ sw $ra, 0x58($sp) -/* CB54E0 802404E0 AFB50054 */ sw $s5, 0x54($sp) -/* CB54E4 802404E4 AFB40050 */ sw $s4, 0x50($sp) -/* CB54E8 802404E8 AFB20048 */ sw $s2, 0x48($sp) -/* CB54EC 802404EC AFB10044 */ sw $s1, 0x44($sp) -/* CB54F0 802404F0 AFB00040 */ sw $s0, 0x40($sp) -/* CB54F4 802404F4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CB54F8 802404F8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CB54FC 802404FC F7B60068 */ sdc1 $f22, 0x68($sp) -/* CB5500 80240500 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CB5504 80240504 8E710148 */ lw $s1, 0x148($s3) -/* CB5508 80240508 00A0902D */ daddu $s2, $a1, $zero -/* CB550C 8024050C 86240008 */ lh $a0, 8($s1) -/* CB5510 80240510 0C00EABB */ jal get_npc_unsafe -/* CB5514 80240514 00C0A82D */ daddu $s5, $a2, $zero -/* CB5518 80240518 0040802D */ daddu $s0, $v0, $zero -/* CB551C 8024051C 0000A02D */ daddu $s4, $zero, $zero -/* CB5520 80240520 C624007C */ lwc1 $f4, 0x7c($s1) -/* CB5524 80240524 46802120 */ cvt.s.w $f4, $f4 -/* CB5528 80240528 C6220088 */ lwc1 $f2, 0x88($s1) -/* CB552C 8024052C 468010A0 */ cvt.s.w $f2, $f2 -/* CB5530 80240530 460010A1 */ cvt.d.s $f2, $f2 -/* CB5534 80240534 46002121 */ cvt.d.s $f4, $f4 -/* CB5538 80240538 C600003C */ lwc1 $f0, 0x3c($s0) -/* CB553C 8024053C 3C014059 */ lui $at, 0x4059 -/* CB5540 80240540 44813800 */ mtc1 $at, $f7 -/* CB5544 80240544 44803000 */ mtc1 $zero, $f6 -/* CB5548 80240548 46000021 */ cvt.d.s $f0, $f0 -/* CB554C 8024054C 46260002 */ mul.d $f0, $f0, $f6 -/* CB5550 80240550 00000000 */ nop -/* CB5554 80240554 24020001 */ addiu $v0, $zero, 1 -/* CB5558 80240558 8E24006C */ lw $a0, 0x6c($s1) -/* CB555C 8024055C 46261083 */ div.d $f2, $f2, $f6 -/* CB5560 80240560 462010A0 */ cvt.s.d $f2, $f2 -/* CB5564 80240564 46262103 */ div.d $f4, $f4, $f6 -/* CB5568 80240568 46202520 */ cvt.s.d $f20, $f4 -/* CB556C 8024056C 30830011 */ andi $v1, $a0, 0x11 -/* CB5570 80240570 4620020D */ trunc.w.d $f8, $f0 -/* CB5574 80240574 E628007C */ swc1 $f8, 0x7c($s1) -/* CB5578 80240578 C6200078 */ lwc1 $f0, 0x78($s1) -/* CB557C 8024057C 46800020 */ cvt.s.w $f0, $f0 -/* CB5580 80240580 46000021 */ cvt.d.s $f0, $f0 -/* CB5584 80240584 46260003 */ div.d $f0, $f0, $f6 -/* CB5588 80240588 462006A0 */ cvt.s.d $f26, $f0 -/* CB558C 8024058C C6200070 */ lwc1 $f0, 0x70($s1) -/* CB5590 80240590 46800020 */ cvt.s.w $f0, $f0 -/* CB5594 80240594 46000021 */ cvt.d.s $f0, $f0 -/* CB5598 80240598 46260003 */ div.d $f0, $f0, $f6 -/* CB559C 8024059C 462005A0 */ cvt.s.d $f22, $f0 -/* CB55A0 802405A0 14620025 */ bne $v1, $v0, .L80240638 -/* CB55A4 802405A4 4602D600 */ add.s $f24, $f26, $f2 -/* CB55A8 802405A8 8E020000 */ lw $v0, ($s0) -/* CB55AC 802405AC 30420008 */ andi $v0, $v0, 8 -/* CB55B0 802405B0 10400009 */ beqz $v0, .L802405D8 -/* CB55B4 802405B4 27A50028 */ addiu $a1, $sp, 0x28 -/* CB55B8 802405B8 C600003C */ lwc1 $f0, 0x3c($s0) -/* CB55BC 802405BC 4600C001 */ sub.s $f0, $f24, $f0 -/* CB55C0 802405C0 4600B03C */ c.lt.s $f22, $f0 -/* CB55C4 802405C4 00000000 */ nop -/* CB55C8 802405C8 4500001B */ bc1f .L80240638 -/* CB55CC 802405CC 34820010 */ ori $v0, $a0, 0x10 -/* CB55D0 802405D0 0809018E */ j .L80240638 -/* CB55D4 802405D4 AE22006C */ sw $v0, 0x6c($s1) -.L802405D8: -/* CB55D8 802405D8 27A6002C */ addiu $a2, $sp, 0x2c -/* CB55DC 802405DC C6000038 */ lwc1 $f0, 0x38($s0) -/* CB55E0 802405E0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CB55E4 802405E4 C6040040 */ lwc1 $f4, 0x40($s0) -/* CB55E8 802405E8 3C01447A */ lui $at, 0x447a -/* CB55EC 802405EC 44813000 */ mtc1 $at, $f6 -/* CB55F0 802405F0 27A20034 */ addiu $v0, $sp, 0x34 -/* CB55F4 802405F4 E7A00028 */ swc1 $f0, 0x28($sp) -/* CB55F8 802405F8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CB55FC 802405FC E7A40030 */ swc1 $f4, 0x30($sp) -/* CB5600 80240600 E7A60034 */ swc1 $f6, 0x34($sp) -/* CB5604 80240604 AFA20010 */ sw $v0, 0x10($sp) -/* CB5608 80240608 8E040080 */ lw $a0, 0x80($s0) -/* CB560C 8024060C 0C0372DF */ jal func_800DCB7C -/* CB5610 80240610 27A70030 */ addiu $a3, $sp, 0x30 -/* CB5614 80240614 C7A00034 */ lwc1 $f0, 0x34($sp) -/* CB5618 80240618 4600D001 */ sub.s $f0, $f26, $f0 -/* CB561C 8024061C 4600B03C */ c.lt.s $f22, $f0 -/* CB5620 80240620 00000000 */ nop -/* CB5624 80240624 45000004 */ bc1f .L80240638 -/* CB5628 80240628 00000000 */ nop -/* CB562C 8024062C 8E22006C */ lw $v0, 0x6c($s1) -/* CB5630 80240630 34420010 */ ori $v0, $v0, 0x10 -/* CB5634 80240634 AE22006C */ sw $v0, 0x6c($s1) -.L80240638: -/* CB5638 80240638 8E22006C */ lw $v0, 0x6c($s1) -/* CB563C 8024063C 24030011 */ addiu $v1, $zero, 0x11 -/* CB5640 80240640 30420011 */ andi $v0, $v0, 0x11 -/* CB5644 80240644 14430039 */ bne $v0, $v1, .L8024072C -/* CB5648 80240648 00000000 */ nop -/* CB564C 8024064C 8E020000 */ lw $v0, ($s0) -/* CB5650 80240650 30420008 */ andi $v0, $v0, 8 -/* CB5654 80240654 1040000A */ beqz $v0, .L80240680 -/* CB5658 80240658 4600C106 */ mov.s $f4, $f24 -/* CB565C 8024065C 4614C081 */ sub.s $f2, $f24, $f20 -/* CB5660 80240660 3C018024 */ lui $at, 0x8024 -/* CB5664 80240664 D42041A8 */ ldc1 $f0, 0x41a8($at) -/* CB5668 80240668 460010A1 */ cvt.d.s $f2, $f2 -/* CB566C 8024066C 46201082 */ mul.d $f2, $f2, $f0 -/* CB5670 80240670 00000000 */ nop -/* CB5674 80240674 4600A021 */ cvt.d.s $f0, $f20 -/* CB5678 80240678 080901B9 */ j .L802406E4 -/* CB567C 8024067C 46220000 */ add.d $f0, $f0, $f2 -.L80240680: -/* CB5680 80240680 27A50028 */ addiu $a1, $sp, 0x28 -/* CB5684 80240684 27A6002C */ addiu $a2, $sp, 0x2c -/* CB5688 80240688 C6000038 */ lwc1 $f0, 0x38($s0) -/* CB568C 8024068C C6020040 */ lwc1 $f2, 0x40($s0) -/* CB5690 80240690 3C01447A */ lui $at, 0x447a -/* CB5694 80240694 44812000 */ mtc1 $at, $f4 -/* CB5698 80240698 27A20034 */ addiu $v0, $sp, 0x34 -/* CB569C 8024069C E7B4002C */ swc1 $f20, 0x2c($sp) -/* CB56A0 802406A0 E7A00028 */ swc1 $f0, 0x28($sp) -/* CB56A4 802406A4 E7A20030 */ swc1 $f2, 0x30($sp) -/* CB56A8 802406A8 E7A40034 */ swc1 $f4, 0x34($sp) -/* CB56AC 802406AC AFA20010 */ sw $v0, 0x10($sp) -/* CB56B0 802406B0 8E040080 */ lw $a0, 0x80($s0) -/* CB56B4 802406B4 0C0372DF */ jal func_800DCB7C -/* CB56B8 802406B8 27A70030 */ addiu $a3, $sp, 0x30 -/* CB56BC 802406BC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* CB56C0 802406C0 461A2100 */ add.s $f4, $f4, $f26 -/* CB56C4 802406C4 46142081 */ sub.s $f2, $f4, $f20 -/* CB56C8 802406C8 3C018024 */ lui $at, 0x8024 -/* CB56CC 802406CC D42041B0 */ ldc1 $f0, 0x41b0($at) -/* CB56D0 802406D0 460010A1 */ cvt.d.s $f2, $f2 -/* CB56D4 802406D4 46201082 */ mul.d $f2, $f2, $f0 -/* CB56D8 802406D8 00000000 */ nop -/* CB56DC 802406DC 4600A021 */ cvt.d.s $f0, $f20 -/* CB56E0 802406E0 46220000 */ add.d $f0, $f0, $f2 -.L802406E4: -/* CB56E4 802406E4 46200020 */ cvt.s.d $f0, $f0 -/* CB56E8 802406E8 E600003C */ swc1 $f0, 0x3c($s0) -/* CB56EC 802406EC C600003C */ lwc1 $f0, 0x3c($s0) -/* CB56F0 802406F0 46002001 */ sub.s $f0, $f4, $f0 -/* CB56F4 802406F4 3C013FF0 */ lui $at, 0x3ff0 -/* CB56F8 802406F8 44811800 */ mtc1 $at, $f3 -/* CB56FC 802406FC 44801000 */ mtc1 $zero, $f2 -/* CB5700 80240700 46000005 */ abs.s $f0, $f0 -/* CB5704 80240704 46000021 */ cvt.d.s $f0, $f0 -/* CB5708 80240708 4622003C */ c.lt.d $f0, $f2 -/* CB570C 8024070C 00000000 */ nop -/* CB5710 80240710 45000036 */ bc1f .L802407EC -/* CB5714 80240714 2403FFEF */ addiu $v1, $zero, -0x11 -/* CB5718 80240718 E604003C */ swc1 $f4, 0x3c($s0) -/* CB571C 8024071C 8E22006C */ lw $v0, 0x6c($s1) -/* CB5720 80240720 00431024 */ and $v0, $v0, $v1 -/* CB5724 80240724 080901FB */ j .L802407EC -/* CB5728 80240728 AE22006C */ sw $v0, 0x6c($s1) -.L8024072C: -/* CB572C 8024072C 8E220070 */ lw $v0, 0x70($s1) -/* CB5730 80240730 1840002E */ blez $v0, .L802407EC -/* CB5734 80240734 00000000 */ nop -/* CB5738 80240738 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CB573C 8024073C 0C00A8BB */ jal sin_deg -/* CB5740 80240740 46806320 */ cvt.s.w $f12, $f12 -/* CB5744 80240744 8E020000 */ lw $v0, ($s0) -/* CB5748 80240748 30420008 */ andi $v0, $v0, 8 -/* CB574C 8024074C 10400003 */ beqz $v0, .L8024075C -/* CB5750 80240750 46000506 */ mov.s $f20, $f0 -/* CB5754 80240754 080901E7 */ j .L8024079C -/* CB5758 80240758 0000102D */ daddu $v0, $zero, $zero -.L8024075C: -/* CB575C 8024075C 27A50028 */ addiu $a1, $sp, 0x28 -/* CB5760 80240760 27A6002C */ addiu $a2, $sp, 0x2c -/* CB5764 80240764 C6000038 */ lwc1 $f0, 0x38($s0) -/* CB5768 80240768 C602003C */ lwc1 $f2, 0x3c($s0) -/* CB576C 8024076C C6040040 */ lwc1 $f4, 0x40($s0) -/* CB5770 80240770 3C01447A */ lui $at, 0x447a -/* CB5774 80240774 44813000 */ mtc1 $at, $f6 -/* CB5778 80240778 27A20034 */ addiu $v0, $sp, 0x34 -/* CB577C 8024077C E7A00028 */ swc1 $f0, 0x28($sp) -/* CB5780 80240780 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CB5784 80240784 E7A40030 */ swc1 $f4, 0x30($sp) -/* CB5788 80240788 E7A60034 */ swc1 $f6, 0x34($sp) -/* CB578C 8024078C AFA20010 */ sw $v0, 0x10($sp) -/* CB5790 80240790 8E040080 */ lw $a0, 0x80($s0) -/* CB5794 80240794 0C0372DF */ jal func_800DCB7C -/* CB5798 80240798 27A70030 */ addiu $a3, $sp, 0x30 -.L8024079C: -/* CB579C 8024079C 10400007 */ beqz $v0, .L802407BC -/* CB57A0 802407A0 00000000 */ nop -/* CB57A4 802407A4 4616A082 */ mul.s $f2, $f20, $f22 -/* CB57A8 802407A8 00000000 */ nop -/* CB57AC 802407AC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CB57B0 802407B0 461A0000 */ add.s $f0, $f0, $f26 -/* CB57B4 802407B4 080901F2 */ j .L802407C8 -/* CB57B8 802407B8 46020000 */ add.s $f0, $f0, $f2 -.L802407BC: -/* CB57BC 802407BC 4616A002 */ mul.s $f0, $f20, $f22 -/* CB57C0 802407C0 00000000 */ nop -/* CB57C4 802407C4 4600C000 */ add.s $f0, $f24, $f0 -.L802407C8: -/* CB57C8 802407C8 E600003C */ swc1 $f0, 0x3c($s0) -/* CB57CC 802407CC 8E220074 */ lw $v0, 0x74($s1) -/* CB57D0 802407D0 2442000A */ addiu $v0, $v0, 0xa -/* CB57D4 802407D4 44826000 */ mtc1 $v0, $f12 -/* CB57D8 802407D8 00000000 */ nop -/* CB57DC 802407DC 0C00A6C9 */ jal clamp_angle -/* CB57E0 802407E0 46806320 */ cvt.s.w $f12, $f12 -/* CB57E4 802407E4 4600020D */ trunc.w.s $f8, $f0 -/* CB57E8 802407E8 E6280074 */ swc1 $f8, 0x74($s1) -.L802407EC: -/* CB57EC 802407EC 8E220090 */ lw $v0, 0x90($s1) -/* CB57F0 802407F0 1C40004A */ bgtz $v0, .L8024091C -/* CB57F4 802407F4 2442FFFF */ addiu $v0, $v0, -1 -/* CB57F8 802407F8 8E430014 */ lw $v1, 0x14($s2) -/* CB57FC 802407FC 04600048 */ bltz $v1, .L80240920 -/* CB5800 80240800 00000000 */ nop -/* CB5804 80240804 8E620074 */ lw $v0, 0x74($s3) -/* CB5808 80240808 1C400042 */ bgtz $v0, .L80240914 -/* CB580C 8024080C 2442FFFF */ addiu $v0, $v0, -1 -/* CB5810 80240810 AE630074 */ sw $v1, 0x74($s3) -/* CB5814 80240814 860200A8 */ lh $v0, 0xa8($s0) -/* CB5818 80240818 C602003C */ lwc1 $f2, 0x3c($s0) -/* CB581C 8024081C 44820000 */ mtc1 $v0, $f0 -/* CB5820 80240820 00000000 */ nop -/* CB5824 80240824 46800020 */ cvt.s.w $f0, $f0 -/* CB5828 80240828 46001080 */ add.s $f2, $f2, $f0 -/* CB582C 8024082C 3C014024 */ lui $at, 0x4024 -/* CB5830 80240830 44810800 */ mtc1 $at, $f1 -/* CB5834 80240834 44800000 */ mtc1 $zero, $f0 -/* CB5838 80240838 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CB583C 8024083C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CB5840 80240840 460010A1 */ cvt.d.s $f2, $f2 -/* CB5844 80240844 46201080 */ add.d $f2, $f2, $f0 -/* CB5848 80240848 C440002C */ lwc1 $f0, 0x2c($v0) -/* CB584C 8024084C 46000021 */ cvt.d.s $f0, $f0 -/* CB5850 80240850 4622003C */ c.lt.d $f0, $f2 -/* CB5854 80240854 00000000 */ nop -/* CB5858 80240858 4500002C */ bc1f .L8024090C -/* CB585C 8024085C 02A0202D */ daddu $a0, $s5, $zero -/* CB5860 80240860 AFA00010 */ sw $zero, 0x10($sp) -/* CB5864 80240864 8E46000C */ lw $a2, 0xc($s2) -/* CB5868 80240868 8E470010 */ lw $a3, 0x10($s2) -/* CB586C 8024086C 0C01242D */ jal func_800490B4 -/* CB5870 80240870 0220282D */ daddu $a1, $s1, $zero -/* CB5874 80240874 10400025 */ beqz $v0, .L8024090C -/* CB5878 80240878 0000202D */ daddu $a0, $zero, $zero -/* CB587C 8024087C 0200282D */ daddu $a1, $s0, $zero -/* CB5880 80240880 0000302D */ daddu $a2, $zero, $zero -/* CB5884 80240884 2412000C */ addiu $s2, $zero, 0xc -/* CB5888 80240888 860300A8 */ lh $v1, 0xa8($s0) -/* CB588C 8024088C 3C013F80 */ lui $at, 0x3f80 -/* CB5890 80240890 44810000 */ mtc1 $at, $f0 -/* CB5894 80240894 3C014000 */ lui $at, 0x4000 -/* CB5898 80240898 44811000 */ mtc1 $at, $f2 -/* CB589C 8024089C 3C01C1A0 */ lui $at, 0xc1a0 -/* CB58A0 802408A0 44812000 */ mtc1 $at, $f4 -/* CB58A4 802408A4 44834000 */ mtc1 $v1, $f8 -/* CB58A8 802408A8 00000000 */ nop -/* CB58AC 802408AC 46804220 */ cvt.s.w $f8, $f8 -/* CB58B0 802408B0 44074000 */ mfc1 $a3, $f8 -/* CB58B4 802408B4 27A20038 */ addiu $v0, $sp, 0x38 -/* CB58B8 802408B8 AFB2001C */ sw $s2, 0x1c($sp) -/* CB58BC 802408BC AFA20020 */ sw $v0, 0x20($sp) -/* CB58C0 802408C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* CB58C4 802408C4 E7A20014 */ swc1 $f2, 0x14($sp) -/* CB58C8 802408C8 0C01BFA4 */ jal fx_emote -/* CB58CC 802408CC E7A40018 */ swc1 $f4, 0x18($sp) -/* CB58D0 802408D0 0200202D */ daddu $a0, $s0, $zero -/* CB58D4 802408D4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CB58D8 802408D8 C480003C */ lwc1 $f0, 0x3c($a0) -/* CB58DC 802408DC 3C060020 */ lui $a2, 0x20 -/* CB58E0 802408E0 0C012530 */ jal func_800494C0 -/* CB58E4 802408E4 E4800064 */ swc1 $f0, 0x64($a0) -/* CB58E8 802408E8 8E220018 */ lw $v0, 0x18($s1) -/* CB58EC 802408EC 9442002A */ lhu $v0, 0x2a($v0) -/* CB58F0 802408F0 30420001 */ andi $v0, $v0, 1 -/* CB58F4 802408F4 10400003 */ beqz $v0, .L80240904 -/* CB58F8 802408F8 2402000A */ addiu $v0, $zero, 0xa -/* CB58FC 802408FC 080902B1 */ j .L80240AC4 -/* CB5900 80240900 AE620070 */ sw $v0, 0x70($s3) -.L80240904: -/* CB5904 80240904 080902B1 */ j .L80240AC4 -/* CB5908 80240908 AE720070 */ sw $s2, 0x70($s3) -.L8024090C: -/* CB590C 8024090C 8E620074 */ lw $v0, 0x74($s3) -/* CB5910 80240910 2442FFFF */ addiu $v0, $v0, -1 -.L80240914: -/* CB5914 80240914 08090248 */ j .L80240920 -/* CB5918 80240918 AE620074 */ sw $v0, 0x74($s3) -.L8024091C: -/* CB591C 8024091C AE220090 */ sw $v0, 0x90($s1) -.L80240920: -/* CB5920 80240920 8E2300D0 */ lw $v1, 0xd0($s1) -/* CB5924 80240924 C6000040 */ lwc1 $f0, 0x40($s0) -/* CB5928 80240928 C4620000 */ lwc1 $f2, ($v1) -/* CB592C 8024092C 468010A0 */ cvt.s.w $f2, $f2 -/* CB5930 80240930 C4640008 */ lwc1 $f4, 8($v1) -/* CB5934 80240934 46802120 */ cvt.s.w $f4, $f4 -/* CB5938 80240938 E7A00010 */ swc1 $f0, 0x10($sp) -/* CB593C 8024093C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CB5940 80240940 44051000 */ mfc1 $a1, $f2 -/* CB5944 80240944 C440000C */ lwc1 $f0, 0xc($v0) -/* CB5948 80240948 46800020 */ cvt.s.w $f0, $f0 -/* CB594C 8024094C E7A00014 */ swc1 $f0, 0x14($sp) -/* CB5950 80240950 8E2200D0 */ lw $v0, 0xd0($s1) -/* CB5954 80240954 44062000 */ mfc1 $a2, $f4 -/* CB5958 80240958 C4400010 */ lwc1 $f0, 0x10($v0) -/* CB595C 8024095C 46800020 */ cvt.s.w $f0, $f0 -/* CB5960 80240960 E7A00018 */ swc1 $f0, 0x18($sp) -/* CB5964 80240964 8C640018 */ lw $a0, 0x18($v1) -/* CB5968 80240968 0C0123F5 */ jal is_point_within_region -/* CB596C 8024096C 8E070038 */ lw $a3, 0x38($s0) -/* CB5970 80240970 1040001A */ beqz $v0, .L802409DC -/* CB5974 80240974 00000000 */ nop -/* CB5978 80240978 8E060038 */ lw $a2, 0x38($s0) -/* CB597C 8024097C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CB5980 80240980 8E070040 */ lw $a3, 0x40($s0) -/* CB5984 80240984 C44C0000 */ lwc1 $f12, ($v0) -/* CB5988 80240988 46806320 */ cvt.s.w $f12, $f12 -/* CB598C 8024098C C44E0008 */ lwc1 $f14, 8($v0) -/* CB5990 80240990 0C00A7B5 */ jal dist2D -/* CB5994 80240994 468073A0 */ cvt.s.w $f14, $f14 -/* CB5998 80240998 C6020018 */ lwc1 $f2, 0x18($s0) -/* CB599C 8024099C 4600103C */ c.lt.s $f2, $f0 -/* CB59A0 802409A0 00000000 */ nop -/* CB59A4 802409A4 4500000D */ bc1f .L802409DC -/* CB59A8 802409A8 E7A00034 */ swc1 $f0, 0x34($sp) -/* CB59AC 802409AC C60C0038 */ lwc1 $f12, 0x38($s0) -/* CB59B0 802409B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* CB59B4 802409B4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CB59B8 802409B8 C4480000 */ lwc1 $f8, ($v0) -/* CB59BC 802409BC 46804220 */ cvt.s.w $f8, $f8 -/* CB59C0 802409C0 44064000 */ mfc1 $a2, $f8 -/* CB59C4 802409C4 C4480008 */ lwc1 $f8, 8($v0) -/* CB59C8 802409C8 46804220 */ cvt.s.w $f8, $f8 -/* CB59CC 802409CC 44074000 */ mfc1 $a3, $f8 -/* CB59D0 802409D0 0C00A720 */ jal atan2 -/* CB59D4 802409D4 24140001 */ addiu $s4, $zero, 1 -/* CB59D8 802409D8 E600000C */ swc1 $f0, 0xc($s0) -.L802409DC: -/* CB59DC 802409DC 8E2200D0 */ lw $v0, 0xd0($s1) -/* CB59E0 802409E0 8C43000C */ lw $v1, 0xc($v0) -/* CB59E4 802409E4 8C420010 */ lw $v0, 0x10($v0) -/* CB59E8 802409E8 00621825 */ or $v1, $v1, $v0 -/* CB59EC 802409EC 00741825 */ or $v1, $v1, $s4 -/* CB59F0 802409F0 10600008 */ beqz $v1, .L80240A14 -/* CB59F4 802409F4 00000000 */ nop -/* CB59F8 802409F8 8602008C */ lh $v0, 0x8c($s0) -/* CB59FC 802409FC 14400031 */ bnez $v0, .L80240AC4 -/* CB5A00 80240A00 00000000 */ nop -/* CB5A04 80240A04 8E050018 */ lw $a1, 0x18($s0) -/* CB5A08 80240A08 8E06000C */ lw $a2, 0xc($s0) -/* CB5A0C 80240A0C 0C00EA95 */ jal npc_move_heading -/* CB5A10 80240A10 0200202D */ daddu $a0, $s0, $zero -.L80240A14: -/* CB5A14 80240A14 C600003C */ lwc1 $f0, 0x3c($s0) -/* CB5A18 80240A18 3C014059 */ lui $at, 0x4059 -/* CB5A1C 80240A1C 44811800 */ mtc1 $at, $f3 -/* CB5A20 80240A20 44801000 */ mtc1 $zero, $f2 -/* CB5A24 80240A24 46000021 */ cvt.d.s $f0, $f0 -/* CB5A28 80240A28 46220002 */ mul.d $f0, $f0, $f2 -/* CB5A2C 80240A2C 00000000 */ nop -/* CB5A30 80240A30 4620020D */ trunc.w.d $f8, $f0 -/* CB5A34 80240A34 E628007C */ swc1 $f8, 0x7c($s1) -/* CB5A38 80240A38 8E420004 */ lw $v0, 4($s2) -/* CB5A3C 80240A3C 18400021 */ blez $v0, .L80240AC4 -/* CB5A40 80240A40 00000000 */ nop -/* CB5A44 80240A44 8602008E */ lh $v0, 0x8e($s0) -/* CB5A48 80240A48 9603008E */ lhu $v1, 0x8e($s0) -/* CB5A4C 80240A4C 18400005 */ blez $v0, .L80240A64 -/* CB5A50 80240A50 2462FFFF */ addiu $v0, $v1, -1 -/* CB5A54 80240A54 A602008E */ sh $v0, 0x8e($s0) -/* CB5A58 80240A58 00021400 */ sll $v0, $v0, 0x10 -/* CB5A5C 80240A5C 1C400019 */ bgtz $v0, .L80240AC4 -/* CB5A60 80240A60 00000000 */ nop -.L80240A64: -/* CB5A64 80240A64 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CB5A68 80240A68 24020002 */ addiu $v0, $zero, 2 -/* CB5A6C 80240A6C 0C00A67F */ jal rand_int -/* CB5A70 80240A70 AE620070 */ sw $v0, 0x70($s3) -/* CB5A74 80240A74 3C035555 */ lui $v1, 0x5555 -/* CB5A78 80240A78 34635556 */ ori $v1, $v1, 0x5556 -/* CB5A7C 80240A7C 00430018 */ mult $v0, $v1 -/* CB5A80 80240A80 000227C3 */ sra $a0, $v0, 0x1f -/* CB5A84 80240A84 00004010 */ mfhi $t0 -/* CB5A88 80240A88 01042023 */ subu $a0, $t0, $a0 -/* CB5A8C 80240A8C 00041840 */ sll $v1, $a0, 1 -/* CB5A90 80240A90 00641821 */ addu $v1, $v1, $a0 -/* CB5A94 80240A94 00431023 */ subu $v0, $v0, $v1 -/* CB5A98 80240A98 24430002 */ addiu $v1, $v0, 2 -/* CB5A9C 80240A9C AE630074 */ sw $v1, 0x74($s3) -/* CB5AA0 80240AA0 8E42002C */ lw $v0, 0x2c($s2) -/* CB5AA4 80240AA4 58400007 */ blezl $v0, .L80240AC4 -/* CB5AA8 80240AA8 AE600070 */ sw $zero, 0x70($s3) -/* CB5AAC 80240AAC 8E420008 */ lw $v0, 8($s2) -/* CB5AB0 80240AB0 18400003 */ blez $v0, .L80240AC0 -/* CB5AB4 80240AB4 28620003 */ slti $v0, $v1, 3 -/* CB5AB8 80240AB8 10400002 */ beqz $v0, .L80240AC4 -/* CB5ABC 80240ABC 00000000 */ nop -.L80240AC0: -/* CB5AC0 80240AC0 AE600070 */ sw $zero, 0x70($s3) -.L80240AC4: -/* CB5AC4 80240AC4 8FBF0058 */ lw $ra, 0x58($sp) -/* CB5AC8 80240AC8 8FB50054 */ lw $s5, 0x54($sp) -/* CB5ACC 80240ACC 8FB40050 */ lw $s4, 0x50($sp) -/* CB5AD0 80240AD0 8FB3004C */ lw $s3, 0x4c($sp) -/* CB5AD4 80240AD4 8FB20048 */ lw $s2, 0x48($sp) -/* CB5AD8 80240AD8 8FB10044 */ lw $s1, 0x44($sp) -/* CB5ADC 80240ADC 8FB00040 */ lw $s0, 0x40($sp) -/* CB5AE0 80240AE0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CB5AE4 80240AE4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CB5AE8 80240AE8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CB5AEC 80240AEC D7B40060 */ ldc1 $f20, 0x60($sp) -/* CB5AF0 80240AF0 03E00008 */ jr $ra -/* CB5AF4 80240AF4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_flo/flo_09/func_80240AF8_CB5000.s b/asm/nonmatchings/world/area_flo/flo_09/func_80240AF8_CB5000.s deleted file mode 100644 index 12fe1a077f..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/func_80240AF8_CB5000.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AF8_CB5AF8 -/* CB5AF8 80240AF8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CB5AFC 80240AFC AFB3001C */ sw $s3, 0x1c($sp) -/* CB5B00 80240B00 0080982D */ daddu $s3, $a0, $zero -/* CB5B04 80240B04 AFBF0020 */ sw $ra, 0x20($sp) -/* CB5B08 80240B08 AFB20018 */ sw $s2, 0x18($sp) -/* CB5B0C 80240B0C AFB10014 */ sw $s1, 0x14($sp) -/* CB5B10 80240B10 AFB00010 */ sw $s0, 0x10($sp) -/* CB5B14 80240B14 8E720148 */ lw $s2, 0x148($s3) -/* CB5B18 80240B18 86440008 */ lh $a0, 8($s2) -/* CB5B1C 80240B1C 0C00EABB */ jal get_npc_unsafe -/* CB5B20 80240B20 00A0882D */ daddu $s1, $a1, $zero -/* CB5B24 80240B24 8E240008 */ lw $a0, 8($s1) -/* CB5B28 80240B28 0040802D */ daddu $s0, $v0, $zero -/* CB5B2C 80240B2C 00041FC2 */ srl $v1, $a0, 0x1f -/* CB5B30 80240B30 00832021 */ addu $a0, $a0, $v1 -/* CB5B34 80240B34 00042043 */ sra $a0, $a0, 1 -/* CB5B38 80240B38 0C00A67F */ jal rand_int -/* CB5B3C 80240B3C 24840001 */ addiu $a0, $a0, 1 -/* CB5B40 80240B40 8E230008 */ lw $v1, 8($s1) -/* CB5B44 80240B44 240400B4 */ addiu $a0, $zero, 0xb4 -/* CB5B48 80240B48 00032FC2 */ srl $a1, $v1, 0x1f -/* CB5B4C 80240B4C 00651821 */ addu $v1, $v1, $a1 -/* CB5B50 80240B50 00031843 */ sra $v1, $v1, 1 -/* CB5B54 80240B54 00621821 */ addu $v1, $v1, $v0 -/* CB5B58 80240B58 0C00A67F */ jal rand_int -/* CB5B5C 80240B5C A603008E */ sh $v1, 0x8e($s0) -/* CB5B60 80240B60 C60C000C */ lwc1 $f12, 0xc($s0) -/* CB5B64 80240B64 44820000 */ mtc1 $v0, $f0 -/* CB5B68 80240B68 00000000 */ nop -/* CB5B6C 80240B6C 46800020 */ cvt.s.w $f0, $f0 -/* CB5B70 80240B70 46006300 */ add.s $f12, $f12, $f0 -/* CB5B74 80240B74 3C0142B4 */ lui $at, 0x42b4 -/* CB5B78 80240B78 44810000 */ mtc1 $at, $f0 -/* CB5B7C 80240B7C 0C00A6C9 */ jal clamp_angle -/* CB5B80 80240B80 46006301 */ sub.s $f12, $f12, $f0 -/* CB5B84 80240B84 E600000C */ swc1 $f0, 0xc($s0) -/* CB5B88 80240B88 8E4200CC */ lw $v0, 0xcc($s2) -/* CB5B8C 80240B8C 8C420000 */ lw $v0, ($v0) -/* CB5B90 80240B90 AE020028 */ sw $v0, 0x28($s0) -/* CB5B94 80240B94 24020003 */ addiu $v0, $zero, 3 -/* CB5B98 80240B98 AE620070 */ sw $v0, 0x70($s3) -/* CB5B9C 80240B9C 8FBF0020 */ lw $ra, 0x20($sp) -/* CB5BA0 80240BA0 8FB3001C */ lw $s3, 0x1c($sp) -/* CB5BA4 80240BA4 8FB20018 */ lw $s2, 0x18($sp) -/* CB5BA8 80240BA8 8FB10014 */ lw $s1, 0x14($sp) -/* CB5BAC 80240BAC 8FB00010 */ lw $s0, 0x10($sp) -/* CB5BB0 80240BB0 03E00008 */ jr $ra -/* CB5BB4 80240BB4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_09/func_80240BB8_CB5000.s b/asm/nonmatchings/world/area_flo/flo_09/func_80240BB8_CB5000.s deleted file mode 100644 index 5e33565603..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/func_80240BB8_CB5000.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BB8_CB5BB8 -/* CB5BB8 80240BB8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* CB5BBC 80240BBC AFB3004C */ sw $s3, 0x4c($sp) -/* CB5BC0 80240BC0 0080982D */ daddu $s3, $a0, $zero -/* CB5BC4 80240BC4 AFBF0054 */ sw $ra, 0x54($sp) -/* CB5BC8 80240BC8 AFB40050 */ sw $s4, 0x50($sp) -/* CB5BCC 80240BCC AFB20048 */ sw $s2, 0x48($sp) -/* CB5BD0 80240BD0 AFB10044 */ sw $s1, 0x44($sp) -/* CB5BD4 80240BD4 AFB00040 */ sw $s0, 0x40($sp) -/* CB5BD8 80240BD8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* CB5BDC 80240BDC F7B80068 */ sdc1 $f24, 0x68($sp) -/* CB5BE0 80240BE0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* CB5BE4 80240BE4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* CB5BE8 80240BE8 8E710148 */ lw $s1, 0x148($s3) -/* CB5BEC 80240BEC 00A0902D */ daddu $s2, $a1, $zero -/* CB5BF0 80240BF0 86240008 */ lh $a0, 8($s1) -/* CB5BF4 80240BF4 0C00EABB */ jal get_npc_unsafe -/* CB5BF8 80240BF8 00C0A02D */ daddu $s4, $a2, $zero -/* CB5BFC 80240BFC 0040802D */ daddu $s0, $v0, $zero -/* CB5C00 80240C00 C6200078 */ lwc1 $f0, 0x78($s1) -/* CB5C04 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* CB5C08 80240C08 46000021 */ cvt.d.s $f0, $f0 -/* CB5C0C 80240C0C 3C014059 */ lui $at, 0x4059 -/* CB5C10 80240C10 44811800 */ mtc1 $at, $f3 -/* CB5C14 80240C14 44801000 */ mtc1 $zero, $f2 -/* CB5C18 80240C18 8602008E */ lh $v0, 0x8e($s0) -/* CB5C1C 80240C1C 9603008E */ lhu $v1, 0x8e($s0) -/* CB5C20 80240C20 46220003 */ div.d $f0, $f0, $f2 -/* CB5C24 80240C24 46200620 */ cvt.s.d $f24, $f0 -/* CB5C28 80240C28 C6200088 */ lwc1 $f0, 0x88($s1) -/* CB5C2C 80240C2C 46800020 */ cvt.s.w $f0, $f0 -/* CB5C30 80240C30 46000021 */ cvt.d.s $f0, $f0 -/* CB5C34 80240C34 46220003 */ div.d $f0, $f0, $f2 -/* CB5C38 80240C38 46200020 */ cvt.s.d $f0, $f0 -/* CB5C3C 80240C3C 18400003 */ blez $v0, .L80240C4C -/* CB5C40 80240C40 4600C680 */ add.s $f26, $f24, $f0 -/* CB5C44 80240C44 2462FFFF */ addiu $v0, $v1, -1 -/* CB5C48 80240C48 A602008E */ sh $v0, 0x8e($s0) -.L80240C4C: -/* CB5C4C 80240C4C 8E220070 */ lw $v0, 0x70($s1) -/* CB5C50 80240C50 18400034 */ blez $v0, .L80240D24 -/* CB5C54 80240C54 00000000 */ nop -/* CB5C58 80240C58 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CB5C5C 80240C5C 46806320 */ cvt.s.w $f12, $f12 -/* CB5C60 80240C60 44820000 */ mtc1 $v0, $f0 -/* CB5C64 80240C64 00000000 */ nop -/* CB5C68 80240C68 46800020 */ cvt.s.w $f0, $f0 -/* CB5C6C 80240C6C 46000021 */ cvt.d.s $f0, $f0 -/* CB5C70 80240C70 46220003 */ div.d $f0, $f0, $f2 -/* CB5C74 80240C74 0C00A8BB */ jal sin_deg -/* CB5C78 80240C78 462005A0 */ cvt.s.d $f22, $f0 -/* CB5C7C 80240C7C 8E020000 */ lw $v0, ($s0) -/* CB5C80 80240C80 30420008 */ andi $v0, $v0, 8 -/* CB5C84 80240C84 10400003 */ beqz $v0, .L80240C94 -/* CB5C88 80240C88 46000506 */ mov.s $f20, $f0 -/* CB5C8C 80240C8C 08090335 */ j .L80240CD4 -/* CB5C90 80240C90 0000102D */ daddu $v0, $zero, $zero -.L80240C94: -/* CB5C94 80240C94 27A50028 */ addiu $a1, $sp, 0x28 -/* CB5C98 80240C98 27A6002C */ addiu $a2, $sp, 0x2c -/* CB5C9C 80240C9C C6000038 */ lwc1 $f0, 0x38($s0) -/* CB5CA0 80240CA0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CB5CA4 80240CA4 C6040040 */ lwc1 $f4, 0x40($s0) -/* CB5CA8 80240CA8 3C01447A */ lui $at, 0x447a -/* CB5CAC 80240CAC 44813000 */ mtc1 $at, $f6 -/* CB5CB0 80240CB0 27A20034 */ addiu $v0, $sp, 0x34 -/* CB5CB4 80240CB4 E7A00028 */ swc1 $f0, 0x28($sp) -/* CB5CB8 80240CB8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CB5CBC 80240CBC E7A40030 */ swc1 $f4, 0x30($sp) -/* CB5CC0 80240CC0 E7A60034 */ swc1 $f6, 0x34($sp) -/* CB5CC4 80240CC4 AFA20010 */ sw $v0, 0x10($sp) -/* CB5CC8 80240CC8 8E040080 */ lw $a0, 0x80($s0) -/* CB5CCC 80240CCC 0C0372DF */ jal func_800DCB7C -/* CB5CD0 80240CD0 27A70030 */ addiu $a3, $sp, 0x30 -.L80240CD4: -/* CB5CD4 80240CD4 10400007 */ beqz $v0, .L80240CF4 -/* CB5CD8 80240CD8 00000000 */ nop -/* CB5CDC 80240CDC 4616A082 */ mul.s $f2, $f20, $f22 -/* CB5CE0 80240CE0 00000000 */ nop -/* CB5CE4 80240CE4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CB5CE8 80240CE8 46180000 */ add.s $f0, $f0, $f24 -/* CB5CEC 80240CEC 08090340 */ j .L80240D00 -/* CB5CF0 80240CF0 46020000 */ add.s $f0, $f0, $f2 -.L80240CF4: -/* CB5CF4 80240CF4 4616A002 */ mul.s $f0, $f20, $f22 -/* CB5CF8 80240CF8 00000000 */ nop -/* CB5CFC 80240CFC 4600D000 */ add.s $f0, $f26, $f0 -.L80240D00: -/* CB5D00 80240D00 E600003C */ swc1 $f0, 0x3c($s0) -/* CB5D04 80240D04 8E220074 */ lw $v0, 0x74($s1) -/* CB5D08 80240D08 2442000A */ addiu $v0, $v0, 0xa -/* CB5D0C 80240D0C 44826000 */ mtc1 $v0, $f12 -/* CB5D10 80240D10 00000000 */ nop -/* CB5D14 80240D14 0C00A6C9 */ jal clamp_angle -/* CB5D18 80240D18 46806320 */ cvt.s.w $f12, $f12 -/* CB5D1C 80240D1C 4600020D */ trunc.w.s $f8, $f0 -/* CB5D20 80240D20 E6280074 */ swc1 $f8, 0x74($s1) -.L80240D24: -/* CB5D24 80240D24 8E220090 */ lw $v0, 0x90($s1) -/* CB5D28 80240D28 1C400040 */ bgtz $v0, .L80240E2C -/* CB5D2C 80240D2C 2442FFFF */ addiu $v0, $v0, -1 -/* CB5D30 80240D30 860200A8 */ lh $v0, 0xa8($s0) -/* CB5D34 80240D34 C600003C */ lwc1 $f0, 0x3c($s0) -/* CB5D38 80240D38 44821000 */ mtc1 $v0, $f2 -/* CB5D3C 80240D3C 00000000 */ nop -/* CB5D40 80240D40 468010A0 */ cvt.s.w $f2, $f2 -/* CB5D44 80240D44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CB5D48 80240D48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CB5D4C 80240D4C 46020000 */ add.s $f0, $f0, $f2 -/* CB5D50 80240D50 3C014024 */ lui $at, 0x4024 -/* CB5D54 80240D54 44812800 */ mtc1 $at, $f5 -/* CB5D58 80240D58 44802000 */ mtc1 $zero, $f4 -/* CB5D5C 80240D5C C442002C */ lwc1 $f2, 0x2c($v0) -/* CB5D60 80240D60 46000021 */ cvt.d.s $f0, $f0 -/* CB5D64 80240D64 46240000 */ add.d $f0, $f0, $f4 -/* CB5D68 80240D68 460010A1 */ cvt.d.s $f2, $f2 -/* CB5D6C 80240D6C 4620103C */ c.lt.d $f2, $f0 -/* CB5D70 80240D70 00000000 */ nop -/* CB5D74 80240D74 4500002E */ bc1f .L80240E30 -/* CB5D78 80240D78 0280202D */ daddu $a0, $s4, $zero -/* CB5D7C 80240D7C 24020001 */ addiu $v0, $zero, 1 -/* CB5D80 80240D80 AFA20010 */ sw $v0, 0x10($sp) -/* CB5D84 80240D84 8E460024 */ lw $a2, 0x24($s2) -/* CB5D88 80240D88 8E470028 */ lw $a3, 0x28($s2) -/* CB5D8C 80240D8C 0C01242D */ jal func_800490B4 -/* CB5D90 80240D90 0220282D */ daddu $a1, $s1, $zero -/* CB5D94 80240D94 10400026 */ beqz $v0, .L80240E30 -/* CB5D98 80240D98 0000202D */ daddu $a0, $zero, $zero -/* CB5D9C 80240D9C 0200282D */ daddu $a1, $s0, $zero -/* CB5DA0 80240DA0 0000302D */ daddu $a2, $zero, $zero -/* CB5DA4 80240DA4 2412000C */ addiu $s2, $zero, 0xc -/* CB5DA8 80240DA8 860300A8 */ lh $v1, 0xa8($s0) -/* CB5DAC 80240DAC 3C013F80 */ lui $at, 0x3f80 -/* CB5DB0 80240DB0 44810000 */ mtc1 $at, $f0 -/* CB5DB4 80240DB4 3C014000 */ lui $at, 0x4000 -/* CB5DB8 80240DB8 44811000 */ mtc1 $at, $f2 -/* CB5DBC 80240DBC 3C01C1A0 */ lui $at, 0xc1a0 -/* CB5DC0 80240DC0 44812000 */ mtc1 $at, $f4 -/* CB5DC4 80240DC4 44834000 */ mtc1 $v1, $f8 -/* CB5DC8 80240DC8 00000000 */ nop -/* CB5DCC 80240DCC 46804220 */ cvt.s.w $f8, $f8 -/* CB5DD0 80240DD0 44074000 */ mfc1 $a3, $f8 -/* CB5DD4 80240DD4 27A20038 */ addiu $v0, $sp, 0x38 -/* CB5DD8 80240DD8 AFB2001C */ sw $s2, 0x1c($sp) -/* CB5DDC 80240DDC AFA20020 */ sw $v0, 0x20($sp) -/* CB5DE0 80240DE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* CB5DE4 80240DE4 E7A20014 */ swc1 $f2, 0x14($sp) -/* CB5DE8 80240DE8 0C01BFA4 */ jal fx_emote -/* CB5DEC 80240DEC E7A40018 */ swc1 $f4, 0x18($sp) -/* CB5DF0 80240DF0 0200202D */ daddu $a0, $s0, $zero -/* CB5DF4 80240DF4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CB5DF8 80240DF8 C480003C */ lwc1 $f0, 0x3c($a0) -/* CB5DFC 80240DFC 3C060020 */ lui $a2, 0x20 -/* CB5E00 80240E00 0C012530 */ jal func_800494C0 -/* CB5E04 80240E04 E4800064 */ swc1 $f0, 0x64($a0) -/* CB5E08 80240E08 8E220018 */ lw $v0, 0x18($s1) -/* CB5E0C 80240E0C 9442002A */ lhu $v0, 0x2a($v0) -/* CB5E10 80240E10 30420001 */ andi $v0, $v0, 1 -/* CB5E14 80240E14 10400003 */ beqz $v0, .L80240E24 -/* CB5E18 80240E18 2402000A */ addiu $v0, $zero, 0xa -/* CB5E1C 80240E1C 080903B3 */ j .L80240ECC -/* CB5E20 80240E20 AE620070 */ sw $v0, 0x70($s3) -.L80240E24: -/* CB5E24 80240E24 080903B3 */ j .L80240ECC -/* CB5E28 80240E28 AE720070 */ sw $s2, 0x70($s3) -.L80240E2C: -/* CB5E2C 80240E2C AE220090 */ sw $v0, 0x90($s1) -.L80240E30: -/* CB5E30 80240E30 8602008C */ lh $v0, 0x8c($s0) -/* CB5E34 80240E34 14400025 */ bnez $v0, .L80240ECC -/* CB5E38 80240E38 00000000 */ nop -/* CB5E3C 80240E3C 8602008E */ lh $v0, 0x8e($s0) -/* CB5E40 80240E40 1C400022 */ bgtz $v0, .L80240ECC -/* CB5E44 80240E44 00000000 */ nop -/* CB5E48 80240E48 8E620074 */ lw $v0, 0x74($s3) -/* CB5E4C 80240E4C 2442FFFF */ addiu $v0, $v0, -1 -/* CB5E50 80240E50 1840001D */ blez $v0, .L80240EC8 -/* CB5E54 80240E54 AE620074 */ sw $v0, 0x74($s3) -/* CB5E58 80240E58 8E220018 */ lw $v0, 0x18($s1) -/* CB5E5C 80240E5C 9442002A */ lhu $v0, 0x2a($v0) -/* CB5E60 80240E60 30420010 */ andi $v0, $v0, 0x10 -/* CB5E64 80240E64 14400007 */ bnez $v0, .L80240E84 -/* CB5E68 80240E68 00000000 */ nop -/* CB5E6C 80240E6C C600000C */ lwc1 $f0, 0xc($s0) -/* CB5E70 80240E70 3C014334 */ lui $at, 0x4334 -/* CB5E74 80240E74 44816000 */ mtc1 $at, $f12 -/* CB5E78 80240E78 0C00A6C9 */ jal clamp_angle -/* CB5E7C 80240E7C 460C0300 */ add.s $f12, $f0, $f12 -/* CB5E80 80240E80 E600000C */ swc1 $f0, 0xc($s0) -.L80240E84: -/* CB5E84 80240E84 0C00A67F */ jal rand_int -/* CB5E88 80240E88 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CB5E8C 80240E8C 3C032E8B */ lui $v1, 0x2e8b -/* CB5E90 80240E90 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* CB5E94 80240E94 00430018 */ mult $v0, $v1 -/* CB5E98 80240E98 00021FC3 */ sra $v1, $v0, 0x1f -/* CB5E9C 80240E9C 00004010 */ mfhi $t0 -/* CB5EA0 80240EA0 00082043 */ sra $a0, $t0, 1 -/* CB5EA4 80240EA4 00832023 */ subu $a0, $a0, $v1 -/* CB5EA8 80240EA8 00041840 */ sll $v1, $a0, 1 -/* CB5EAC 80240EAC 00641821 */ addu $v1, $v1, $a0 -/* CB5EB0 80240EB0 00031880 */ sll $v1, $v1, 2 -/* CB5EB4 80240EB4 00641823 */ subu $v1, $v1, $a0 -/* CB5EB8 80240EB8 00431023 */ subu $v0, $v0, $v1 -/* CB5EBC 80240EBC 24420005 */ addiu $v0, $v0, 5 -/* CB5EC0 80240EC0 080903B3 */ j .L80240ECC -/* CB5EC4 80240EC4 A602008E */ sh $v0, 0x8e($s0) -.L80240EC8: -/* CB5EC8 80240EC8 AE600070 */ sw $zero, 0x70($s3) -.L80240ECC: -/* CB5ECC 80240ECC 8FBF0054 */ lw $ra, 0x54($sp) -/* CB5ED0 80240ED0 8FB40050 */ lw $s4, 0x50($sp) -/* CB5ED4 80240ED4 8FB3004C */ lw $s3, 0x4c($sp) -/* CB5ED8 80240ED8 8FB20048 */ lw $s2, 0x48($sp) -/* CB5EDC 80240EDC 8FB10044 */ lw $s1, 0x44($sp) -/* CB5EE0 80240EE0 8FB00040 */ lw $s0, 0x40($sp) -/* CB5EE4 80240EE4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* CB5EE8 80240EE8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* CB5EEC 80240EEC D7B60060 */ ldc1 $f22, 0x60($sp) -/* CB5EF0 80240EF0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* CB5EF4 80240EF4 03E00008 */ jr $ra -/* CB5EF8 80240EF8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_flo/flo_09/func_80240EFC_CB5000.s b/asm/nonmatchings/world/area_flo/flo_09/func_80240EFC_CB5000.s deleted file mode 100644 index d1850a6443..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/func_80240EFC_CB5000.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EFC_CB5EFC -/* CB5EFC 80240EFC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CB5F00 80240F00 AFB20018 */ sw $s2, 0x18($sp) -/* CB5F04 80240F04 0080902D */ daddu $s2, $a0, $zero -/* CB5F08 80240F08 AFBF001C */ sw $ra, 0x1c($sp) -/* CB5F0C 80240F0C AFB10014 */ sw $s1, 0x14($sp) -/* CB5F10 80240F10 AFB00010 */ sw $s0, 0x10($sp) -/* CB5F14 80240F14 8E510148 */ lw $s1, 0x148($s2) -/* CB5F18 80240F18 0C00EABB */ jal get_npc_unsafe -/* CB5F1C 80240F1C 86240008 */ lh $a0, 8($s1) -/* CB5F20 80240F20 0040802D */ daddu $s0, $v0, $zero -/* CB5F24 80240F24 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CB5F28 80240F28 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CB5F2C 80240F2C C60C0038 */ lwc1 $f12, 0x38($s0) -/* CB5F30 80240F30 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CB5F34 80240F34 A600008E */ sh $zero, 0x8e($s0) -/* CB5F38 80240F38 8C460028 */ lw $a2, 0x28($v0) -/* CB5F3C 80240F3C 0C00A720 */ jal atan2 -/* CB5F40 80240F40 8C470030 */ lw $a3, 0x30($v0) -/* CB5F44 80240F44 E600000C */ swc1 $f0, 0xc($s0) -/* CB5F48 80240F48 8E2200CC */ lw $v0, 0xcc($s1) -/* CB5F4C 80240F4C 8C420020 */ lw $v0, 0x20($v0) -/* CB5F50 80240F50 AE020028 */ sw $v0, 0x28($s0) -/* CB5F54 80240F54 2402000B */ addiu $v0, $zero, 0xb -/* CB5F58 80240F58 AE420070 */ sw $v0, 0x70($s2) -/* CB5F5C 80240F5C 8FBF001C */ lw $ra, 0x1c($sp) -/* CB5F60 80240F60 8FB20018 */ lw $s2, 0x18($sp) -/* CB5F64 80240F64 8FB10014 */ lw $s1, 0x14($sp) -/* CB5F68 80240F68 8FB00010 */ lw $s0, 0x10($sp) -/* CB5F6C 80240F6C 03E00008 */ jr $ra -/* CB5F70 80240F70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_09/func_80240FE0_CB5000.s b/asm/nonmatchings/world/area_flo/flo_09/func_80240FE0_CB5000.s deleted file mode 100644 index ff44f26419..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/func_80240FE0_CB5000.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FE0_CB5FE0 -/* CB5FE0 80240FE0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CB5FE4 80240FE4 AFB3001C */ sw $s3, 0x1c($sp) -/* CB5FE8 80240FE8 0080982D */ daddu $s3, $a0, $zero -/* CB5FEC 80240FEC AFBF0020 */ sw $ra, 0x20($sp) -/* CB5FF0 80240FF0 AFB20018 */ sw $s2, 0x18($sp) -/* CB5FF4 80240FF4 AFB10014 */ sw $s1, 0x14($sp) -/* CB5FF8 80240FF8 AFB00010 */ sw $s0, 0x10($sp) -/* CB5FFC 80240FFC 8E720148 */ lw $s2, 0x148($s3) -/* CB6000 80241000 86440008 */ lh $a0, 8($s2) -/* CB6004 80241004 0C00EABB */ jal get_npc_unsafe -/* CB6008 80241008 00A0802D */ daddu $s0, $a1, $zero -/* CB600C 8024100C 0040882D */ daddu $s1, $v0, $zero -/* CB6010 80241010 C6420080 */ lwc1 $f2, 0x80($s2) -/* CB6014 80241014 468010A0 */ cvt.s.w $f2, $f2 -/* CB6018 80241018 460010A1 */ cvt.d.s $f2, $f2 -/* CB601C 8024101C C6400084 */ lwc1 $f0, 0x84($s2) -/* CB6020 80241020 46800020 */ cvt.s.w $f0, $f0 -/* CB6024 80241024 46000021 */ cvt.d.s $f0, $f0 -/* CB6028 80241028 3C014059 */ lui $at, 0x4059 -/* CB602C 8024102C 44812800 */ mtc1 $at, $f5 -/* CB6030 80241030 44802000 */ mtc1 $zero, $f4 -/* CB6034 80241034 8E4200CC */ lw $v0, 0xcc($s2) -/* CB6038 80241038 C62C0038 */ lwc1 $f12, 0x38($s1) -/* CB603C 8024103C C62E0040 */ lwc1 $f14, 0x40($s1) -/* CB6040 80241040 46241083 */ div.d $f2, $f2, $f4 -/* CB6044 80241044 462010A0 */ cvt.s.d $f2, $f2 -/* CB6048 80241048 46240003 */ div.d $f0, $f0, $f4 -/* CB604C 8024104C 8C420020 */ lw $v0, 0x20($v0) -/* CB6050 80241050 46200020 */ cvt.s.d $f0, $f0 -/* CB6054 80241054 E622001C */ swc1 $f2, 0x1c($s1) -/* CB6058 80241058 E6200014 */ swc1 $f0, 0x14($s1) -/* CB605C 8024105C AE220028 */ sw $v0, 0x28($s1) -/* CB6060 80241060 C6000018 */ lwc1 $f0, 0x18($s0) -/* CB6064 80241064 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CB6068 80241068 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CB606C 8024106C E6200018 */ swc1 $f0, 0x18($s1) -/* CB6070 80241070 8C460028 */ lw $a2, 0x28($v0) -/* CB6074 80241074 0C00A720 */ jal atan2 -/* CB6078 80241078 8C470030 */ lw $a3, 0x30($v0) -/* CB607C 8024107C E620000C */ swc1 $f0, 0xc($s1) -/* CB6080 80241080 8E420018 */ lw $v0, 0x18($s2) -/* CB6084 80241084 AE400074 */ sw $zero, 0x74($s2) -/* CB6088 80241088 9442002A */ lhu $v0, 0x2a($v0) -/* CB608C 8024108C 30420002 */ andi $v0, $v0, 2 -/* CB6090 80241090 10400005 */ beqz $v0, .L802410A8 -/* CB6094 80241094 24020003 */ addiu $v0, $zero, 3 -/* CB6098 80241098 A622008E */ sh $v0, 0x8e($s1) -/* CB609C 8024109C 2402000D */ addiu $v0, $zero, 0xd -/* CB60A0 802410A0 0809043E */ j .L802410F8 -/* CB60A4 802410A4 AE620070 */ sw $v0, 0x70($s3) -.L802410A8: -/* CB60A8 802410A8 24030001 */ addiu $v1, $zero, 1 -/* CB60AC 802410AC 2402000E */ addiu $v0, $zero, 0xe -/* CB60B0 802410B0 A623008E */ sh $v1, 0x8e($s1) -/* CB60B4 802410B4 AE620070 */ sw $v0, 0x70($s3) -/* CB60B8 802410B8 C6200038 */ lwc1 $f0, 0x38($s1) -/* CB60BC 802410BC 4600018D */ trunc.w.s $f6, $f0 -/* CB60C0 802410C0 44023000 */ mfc1 $v0, $f6 -/* CB60C4 802410C4 00000000 */ nop -/* CB60C8 802410C8 A6420010 */ sh $v0, 0x10($s2) -/* CB60CC 802410CC C620003C */ lwc1 $f0, 0x3c($s1) -/* CB60D0 802410D0 4600018D */ trunc.w.s $f6, $f0 -/* CB60D4 802410D4 44023000 */ mfc1 $v0, $f6 -/* CB60D8 802410D8 00000000 */ nop -/* CB60DC 802410DC A6420012 */ sh $v0, 0x12($s2) -/* CB60E0 802410E0 C6200040 */ lwc1 $f0, 0x40($s1) -/* CB60E4 802410E4 A2430007 */ sb $v1, 7($s2) -/* CB60E8 802410E8 4600018D */ trunc.w.s $f6, $f0 -/* CB60EC 802410EC 44023000 */ mfc1 $v0, $f6 -/* CB60F0 802410F0 00000000 */ nop -/* CB60F4 802410F4 A6420014 */ sh $v0, 0x14($s2) -.L802410F8: -/* CB60F8 802410F8 8FBF0020 */ lw $ra, 0x20($sp) -/* CB60FC 802410FC 8FB3001C */ lw $s3, 0x1c($sp) -/* CB6100 80241100 8FB20018 */ lw $s2, 0x18($sp) -/* CB6104 80241104 8FB10014 */ lw $s1, 0x14($sp) -/* CB6108 80241108 8FB00010 */ lw $s0, 0x10($sp) -/* CB610C 8024110C 03E00008 */ jr $ra -/* CB6110 80241110 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_09/func_80241114_CB5000.s b/asm/nonmatchings/world/area_flo/flo_09/func_80241114_CB5000.s deleted file mode 100644 index ae7d0908a3..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/func_80241114_CB5000.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241114_CB6114 -/* CB6114 80241114 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CB6118 80241118 AFB00010 */ sw $s0, 0x10($sp) -/* CB611C 8024111C 0080802D */ daddu $s0, $a0, $zero -/* CB6120 80241120 AFBF0014 */ sw $ra, 0x14($sp) -/* CB6124 80241124 8E020148 */ lw $v0, 0x148($s0) -/* CB6128 80241128 0C00EABB */ jal get_npc_unsafe -/* CB612C 8024112C 84440008 */ lh $a0, 8($v0) -/* CB6130 80241130 0040202D */ daddu $a0, $v0, $zero -/* CB6134 80241134 8482008E */ lh $v0, 0x8e($a0) -/* CB6138 80241138 9483008E */ lhu $v1, 0x8e($a0) -/* CB613C 8024113C 18400005 */ blez $v0, .L80241154 -/* CB6140 80241140 2462FFFF */ addiu $v0, $v1, -1 -/* CB6144 80241144 A482008E */ sh $v0, 0x8e($a0) -/* CB6148 80241148 00021400 */ sll $v0, $v0, 0x10 -/* CB614C 8024114C 1C400006 */ bgtz $v0, .L80241168 -/* CB6150 80241150 00000000 */ nop -.L80241154: -/* CB6154 80241154 8482008C */ lh $v0, 0x8c($a0) -/* CB6158 80241158 14400003 */ bnez $v0, .L80241168 -/* CB615C 8024115C 2402000E */ addiu $v0, $zero, 0xe -/* CB6160 80241160 A480008E */ sh $zero, 0x8e($a0) -/* CB6164 80241164 AE020070 */ sw $v0, 0x70($s0) -.L80241168: -/* CB6168 80241168 8FBF0014 */ lw $ra, 0x14($sp) -/* CB616C 8024116C 8FB00010 */ lw $s0, 0x10($sp) -/* CB6170 80241170 03E00008 */ jr $ra -/* CB6174 80241174 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_09/func_8024162C_CB5000.s b/asm/nonmatchings/world/area_flo/flo_09/func_8024162C_CB5000.s deleted file mode 100644 index 0ed773d0ee..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/func_8024162C_CB5000.s +++ /dev/null @@ -1,133 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024162C_CB662C -/* CB662C 8024162C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CB6630 80241630 AFB40040 */ sw $s4, 0x40($sp) -/* CB6634 80241634 0080A02D */ daddu $s4, $a0, $zero -/* CB6638 80241638 AFBF0048 */ sw $ra, 0x48($sp) -/* CB663C 8024163C AFB50044 */ sw $s5, 0x44($sp) -/* CB6640 80241640 AFB3003C */ sw $s3, 0x3c($sp) -/* CB6644 80241644 AFB20038 */ sw $s2, 0x38($sp) -/* CB6648 80241648 AFB10034 */ sw $s1, 0x34($sp) -/* CB664C 8024164C AFB00030 */ sw $s0, 0x30($sp) -/* CB6650 80241650 8E920148 */ lw $s2, 0x148($s4) -/* CB6654 80241654 86440008 */ lh $a0, 8($s2) -/* CB6658 80241658 8E90000C */ lw $s0, 0xc($s4) -/* CB665C 8024165C 0C00EABB */ jal get_npc_unsafe -/* CB6660 80241660 00A0882D */ daddu $s1, $a1, $zero -/* CB6664 80241664 0280202D */ daddu $a0, $s4, $zero -/* CB6668 80241668 8E050000 */ lw $a1, ($s0) -/* CB666C 8024166C 0C0B1EAF */ jal get_variable -/* CB6670 80241670 0040A82D */ daddu $s5, $v0, $zero -/* CB6674 80241674 AFA00010 */ sw $zero, 0x10($sp) -/* CB6678 80241678 8E4300D0 */ lw $v1, 0xd0($s2) -/* CB667C 8024167C 8C630030 */ lw $v1, 0x30($v1) -/* CB6680 80241680 AFA30014 */ sw $v1, 0x14($sp) -/* CB6684 80241684 8E4300D0 */ lw $v1, 0xd0($s2) -/* CB6688 80241688 8C63001C */ lw $v1, 0x1c($v1) -/* CB668C 8024168C AFA30018 */ sw $v1, 0x18($sp) -/* CB6690 80241690 8E4300D0 */ lw $v1, 0xd0($s2) -/* CB6694 80241694 8C630024 */ lw $v1, 0x24($v1) -/* CB6698 80241698 AFA3001C */ sw $v1, 0x1c($sp) -/* CB669C 8024169C 8E4300D0 */ lw $v1, 0xd0($s2) -/* CB66A0 802416A0 8C630028 */ lw $v1, 0x28($v1) -/* CB66A4 802416A4 27B30010 */ addiu $s3, $sp, 0x10 -/* CB66A8 802416A8 AFA30020 */ sw $v1, 0x20($sp) -/* CB66AC 802416AC 8E4300D0 */ lw $v1, 0xd0($s2) -/* CB66B0 802416B0 3C0142F0 */ lui $at, 0x42f0 -/* CB66B4 802416B4 44810000 */ mtc1 $at, $f0 -/* CB66B8 802416B8 8C63002C */ lw $v1, 0x2c($v1) -/* CB66BC 802416BC 0040802D */ daddu $s0, $v0, $zero -/* CB66C0 802416C0 E7A00028 */ swc1 $f0, 0x28($sp) -/* CB66C4 802416C4 A7A0002C */ sh $zero, 0x2c($sp) -/* CB66C8 802416C8 12200006 */ beqz $s1, .L802416E4 -/* CB66CC 802416CC AFA30024 */ sw $v1, 0x24($sp) -/* CB66D0 802416D0 02A0202D */ daddu $a0, $s5, $zero -/* CB66D4 802416D4 0240282D */ daddu $a1, $s2, $zero -/* CB66D8 802416D8 0280302D */ daddu $a2, $s4, $zero -/* CB66DC 802416DC 0C090542 */ jal func_80241508 -/* CB66E0 802416E0 0200382D */ daddu $a3, $s0, $zero -.L802416E4: -/* CB66E4 802416E4 2402FFFE */ addiu $v0, $zero, -2 -/* CB66E8 802416E8 A2A200AB */ sb $v0, 0xab($s5) -/* CB66EC 802416EC 8E4300B0 */ lw $v1, 0xb0($s2) -/* CB66F0 802416F0 30620004 */ andi $v0, $v1, 4 -/* CB66F4 802416F4 10400007 */ beqz $v0, .L80241714 -/* CB66F8 802416F8 00000000 */ nop -/* CB66FC 802416FC 824200B4 */ lb $v0, 0xb4($s2) -/* CB6700 80241700 1440003C */ bnez $v0, .L802417F4 -/* CB6704 80241704 0000102D */ daddu $v0, $zero, $zero -/* CB6708 80241708 2402FFFB */ addiu $v0, $zero, -5 -/* CB670C 8024170C 00621024 */ and $v0, $v1, $v0 -/* CB6710 80241710 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241714: -/* CB6714 80241714 8E830070 */ lw $v1, 0x70($s4) -/* CB6718 80241718 2C62000F */ sltiu $v0, $v1, 0xf -/* CB671C 8024171C 10400034 */ beqz $v0, .L802417F0 -/* CB6720 80241720 00031080 */ sll $v0, $v1, 2 -/* CB6724 80241724 3C018024 */ lui $at, 0x8024 -/* CB6728 80241728 00220821 */ addu $at, $at, $v0 -/* CB672C 8024172C 8C2241B8 */ lw $v0, 0x41b8($at) -/* CB6730 80241730 00400008 */ jr $v0 -/* CB6734 80241734 00000000 */ nop -/* CB6738 80241738 0280202D */ daddu $a0, $s4, $zero -/* CB673C 8024173C 0200282D */ daddu $a1, $s0, $zero -/* CB6740 80241740 0C0900C8 */ jal func_80240320 -/* CB6744 80241744 0260302D */ daddu $a2, $s3, $zero -/* CB6748 80241748 0280202D */ daddu $a0, $s4, $zero -/* CB674C 8024174C 0200282D */ daddu $a1, $s0, $zero -/* CB6750 80241750 0C090134 */ jal func_802404D0 -/* CB6754 80241754 0260302D */ daddu $a2, $s3, $zero -/* CB6758 80241758 080905FD */ j .L802417F4 -/* CB675C 8024175C 0000102D */ daddu $v0, $zero, $zero -/* CB6760 80241760 0280202D */ daddu $a0, $s4, $zero -/* CB6764 80241764 0200282D */ daddu $a1, $s0, $zero -/* CB6768 80241768 0C0902BE */ jal func_80240AF8 -/* CB676C 8024176C 0260302D */ daddu $a2, $s3, $zero -/* CB6770 80241770 0280202D */ daddu $a0, $s4, $zero -/* CB6774 80241774 0200282D */ daddu $a1, $s0, $zero -/* CB6778 80241778 0C0902EE */ jal func_80240BB8 -/* CB677C 8024177C 0260302D */ daddu $a2, $s3, $zero -/* CB6780 80241780 080905FD */ j .L802417F4 -/* CB6784 80241784 0000102D */ daddu $v0, $zero, $zero -/* CB6788 80241788 0280202D */ daddu $a0, $s4, $zero -/* CB678C 8024178C 0200282D */ daddu $a1, $s0, $zero -/* CB6790 80241790 0C0903BF */ jal func_80240EFC -/* CB6794 80241794 0260302D */ daddu $a2, $s3, $zero -/* CB6798 80241798 0280202D */ daddu $a0, $s4, $zero -/* CB679C 8024179C 0200282D */ daddu $a1, $s0, $zero -/* CB67A0 802417A0 0C0903DD */ jal func_80240F74 -/* CB67A4 802417A4 0260302D */ daddu $a2, $s3, $zero -/* CB67A8 802417A8 080905FD */ j .L802417F4 -/* CB67AC 802417AC 0000102D */ daddu $v0, $zero, $zero -/* CB67B0 802417B0 0280202D */ daddu $a0, $s4, $zero -/* CB67B4 802417B4 0200282D */ daddu $a1, $s0, $zero -/* CB67B8 802417B8 0C0903F8 */ jal func_80240FE0 -/* CB67BC 802417BC 0260302D */ daddu $a2, $s3, $zero -/* CB67C0 802417C0 080905FD */ j .L802417F4 -/* CB67C4 802417C4 0000102D */ daddu $v0, $zero, $zero -/* CB67C8 802417C8 0280202D */ daddu $a0, $s4, $zero -/* CB67CC 802417CC 0200282D */ daddu $a1, $s0, $zero -/* CB67D0 802417D0 0C090445 */ jal func_80241114 -/* CB67D4 802417D4 0260302D */ daddu $a2, $s3, $zero -/* CB67D8 802417D8 080905FD */ j .L802417F4 -/* CB67DC 802417DC 0000102D */ daddu $v0, $zero, $zero -/* CB67E0 802417E0 0280202D */ daddu $a0, $s4, $zero -/* CB67E4 802417E4 0200282D */ daddu $a1, $s0, $zero -/* CB67E8 802417E8 0C09045E */ jal func_80241178 -/* CB67EC 802417EC 0260302D */ daddu $a2, $s3, $zero -.L802417F0: -/* CB67F0 802417F0 0000102D */ daddu $v0, $zero, $zero -.L802417F4: -/* CB67F4 802417F4 8FBF0048 */ lw $ra, 0x48($sp) -/* CB67F8 802417F8 8FB50044 */ lw $s5, 0x44($sp) -/* CB67FC 802417FC 8FB40040 */ lw $s4, 0x40($sp) -/* CB6800 80241800 8FB3003C */ lw $s3, 0x3c($sp) -/* CB6804 80241804 8FB20038 */ lw $s2, 0x38($sp) -/* CB6808 80241808 8FB10034 */ lw $s1, 0x34($sp) -/* CB680C 8024180C 8FB00030 */ lw $s0, 0x30($sp) -/* CB6810 80241810 03E00008 */ jr $ra -/* CB6814 80241814 27BD0050 */ addiu $sp, $sp, 0x50 -/* CB6818 80241818 00000000 */ nop -/* CB681C 8024181C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_10/func_80240040_CB9200.s b/asm/nonmatchings/world/area_flo/flo_10/func_80240040_CB9200.s deleted file mode 100644 index a5164e987e..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_10/func_80240040_CB9200.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_CB9240 -/* CB9240 80240040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CB9244 80240044 24040001 */ addiu $a0, $zero, 1 -/* CB9248 80240048 0000282D */ daddu $a1, $zero, $zero -/* CB924C 8024004C 00A0302D */ daddu $a2, $a1, $zero -/* CB9250 80240050 00A0382D */ daddu $a3, $a1, $zero -/* CB9254 80240054 AFBF0018 */ sw $ra, 0x18($sp) -/* CB9258 80240058 AFA00010 */ sw $zero, 0x10($sp) -/* CB925C 8024005C 0C01CA54 */ jal func_80072950 -/* CB9260 80240060 AFA00014 */ sw $zero, 0x14($sp) -/* CB9264 80240064 8FBF0018 */ lw $ra, 0x18($sp) -/* CB9268 80240068 24020002 */ addiu $v0, $zero, 2 -/* CB926C 8024006C 03E00008 */ jr $ra -/* CB9270 80240070 27BD0020 */ addiu $sp, $sp, 0x20 -/* CB9274 80240074 00000000 */ nop -/* CB9278 80240078 00000000 */ nop -/* CB927C 8024007C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_10/func_80240080_CB9200.s b/asm/nonmatchings/world/area_flo/flo_10/func_80240080_CB9200.s deleted file mode 100644 index 51e89066c9..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_10/func_80240080_CB9200.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240080_CB9280 -/* CB9280 80240080 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CB9284 80240084 AFB00010 */ sw $s0, 0x10($sp) -/* CB9288 80240088 3C108024 */ lui $s0, 0x8024 -/* CB928C 8024008C 26101CB0 */ addiu $s0, $s0, 0x1cb0 -/* CB9290 80240090 AFBF0018 */ sw $ra, 0x18($sp) -/* CB9294 80240094 AFB10014 */ sw $s1, 0x14($sp) -/* CB9298 80240098 8E020000 */ lw $v0, ($s0) -/* CB929C 8024009C 14400010 */ bnez $v0, .L802400E0 -/* CB92A0 802400A0 0080882D */ daddu $s1, $a0, $zero -/* CB92A4 802400A4 0C00AB39 */ jal heap_malloc -/* CB92A8 802400A8 24040040 */ addiu $a0, $zero, 0x40 -/* CB92AC 802400AC AE020000 */ sw $v0, ($s0) -/* CB92B0 802400B0 0000182D */ daddu $v1, $zero, $zero -/* CB92B4 802400B4 0040282D */ daddu $a1, $v0, $zero -/* CB92B8 802400B8 0220202D */ daddu $a0, $s1, $zero -.L802400BC: -/* CB92BC 802400BC 8C820084 */ lw $v0, 0x84($a0) -/* CB92C0 802400C0 24840004 */ addiu $a0, $a0, 4 -/* CB92C4 802400C4 24630001 */ addiu $v1, $v1, 1 -/* CB92C8 802400C8 ACA20000 */ sw $v0, ($a1) -/* CB92CC 802400CC 28620010 */ slti $v0, $v1, 0x10 -/* CB92D0 802400D0 1440FFFA */ bnez $v0, .L802400BC -/* CB92D4 802400D4 24A50004 */ addiu $a1, $a1, 4 -/* CB92D8 802400D8 08090047 */ j .L8024011C -/* CB92DC 802400DC 00000000 */ nop -.L802400E0: -/* CB92E0 802400E0 0000182D */ daddu $v1, $zero, $zero -/* CB92E4 802400E4 0040282D */ daddu $a1, $v0, $zero -/* CB92E8 802400E8 0220202D */ daddu $a0, $s1, $zero -.L802400EC: -/* CB92EC 802400EC 8CA20000 */ lw $v0, ($a1) -/* CB92F0 802400F0 24A50004 */ addiu $a1, $a1, 4 -/* CB92F4 802400F4 24630001 */ addiu $v1, $v1, 1 -/* CB92F8 802400F8 AC820084 */ sw $v0, 0x84($a0) -/* CB92FC 802400FC 28620010 */ slti $v0, $v1, 0x10 -/* CB9300 80240100 1440FFFA */ bnez $v0, .L802400EC -/* CB9304 80240104 24840004 */ addiu $a0, $a0, 4 -/* CB9308 80240108 3C108024 */ lui $s0, 0x8024 -/* CB930C 8024010C 26101CB0 */ addiu $s0, $s0, 0x1cb0 -/* CB9310 80240110 0C00AB4B */ jal heap_free -/* CB9314 80240114 8E040000 */ lw $a0, ($s0) -/* CB9318 80240118 AE000000 */ sw $zero, ($s0) -.L8024011C: -/* CB931C 8024011C 8FBF0018 */ lw $ra, 0x18($sp) -/* CB9320 80240120 8FB10014 */ lw $s1, 0x14($sp) -/* CB9324 80240124 8FB00010 */ lw $s0, 0x10($sp) -/* CB9328 80240128 24020002 */ addiu $v0, $zero, 2 -/* CB932C 8024012C 03E00008 */ jr $ra -/* CB9330 80240130 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_10/func_80240198_CB9200.s b/asm/nonmatchings/world/area_flo/flo_10/func_80240198_CB9200.s deleted file mode 100644 index 540bf3924a..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_10/func_80240198_CB9200.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240198_CB9398 -/* CB9398 80240198 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CB939C 8024019C AFB00010 */ sw $s0, 0x10($sp) -/* CB93A0 802401A0 0080802D */ daddu $s0, $a0, $zero -/* CB93A4 802401A4 AFBF0014 */ sw $ra, 0x14($sp) -/* CB93A8 802401A8 8E0300A8 */ lw $v1, 0xa8($s0) -/* CB93AC 802401AC 8E020088 */ lw $v0, 0x88($s0) -/* CB93B0 802401B0 00621821 */ addu $v1, $v1, $v0 -/* CB93B4 802401B4 04610004 */ bgez $v1, .L802401C8 -/* CB93B8 802401B8 AE0300A8 */ sw $v1, 0xa8($s0) -/* CB93BC 802401BC 3C020002 */ lui $v0, 2 -/* CB93C0 802401C0 08090076 */ j .L802401D8 -/* CB93C4 802401C4 00621021 */ addu $v0, $v1, $v0 -.L802401C8: -/* CB93C8 802401C8 3C040002 */ lui $a0, 2 -/* CB93CC 802401CC 0083102A */ slt $v0, $a0, $v1 -/* CB93D0 802401D0 10400002 */ beqz $v0, .L802401DC -/* CB93D4 802401D4 00641023 */ subu $v0, $v1, $a0 -.L802401D8: -/* CB93D8 802401D8 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401DC: -/* CB93DC 802401DC 8E0300AC */ lw $v1, 0xac($s0) -/* CB93E0 802401E0 8E02008C */ lw $v0, 0x8c($s0) -/* CB93E4 802401E4 00621821 */ addu $v1, $v1, $v0 -/* CB93E8 802401E8 04610004 */ bgez $v1, .L802401FC -/* CB93EC 802401EC AE0300AC */ sw $v1, 0xac($s0) -/* CB93F0 802401F0 3C020002 */ lui $v0, 2 -/* CB93F4 802401F4 08090083 */ j .L8024020C -/* CB93F8 802401F8 00621021 */ addu $v0, $v1, $v0 -.L802401FC: -/* CB93FC 802401FC 3C040002 */ lui $a0, 2 -/* CB9400 80240200 0083102A */ slt $v0, $a0, $v1 -/* CB9404 80240204 10400002 */ beqz $v0, .L80240210 -/* CB9408 80240208 00641023 */ subu $v0, $v1, $a0 -.L8024020C: -/* CB940C 8024020C AE0200AC */ sw $v0, 0xac($s0) -.L80240210: -/* CB9410 80240210 8E0300B0 */ lw $v1, 0xb0($s0) -/* CB9414 80240214 8E020090 */ lw $v0, 0x90($s0) -/* CB9418 80240218 00621821 */ addu $v1, $v1, $v0 -/* CB941C 8024021C 04610004 */ bgez $v1, .L80240230 -/* CB9420 80240220 AE0300B0 */ sw $v1, 0xb0($s0) -/* CB9424 80240224 3C020002 */ lui $v0, 2 -/* CB9428 80240228 08090090 */ j .L80240240 -/* CB942C 8024022C 00621021 */ addu $v0, $v1, $v0 -.L80240230: -/* CB9430 80240230 3C040002 */ lui $a0, 2 -/* CB9434 80240234 0083102A */ slt $v0, $a0, $v1 -/* CB9438 80240238 10400002 */ beqz $v0, .L80240244 -/* CB943C 8024023C 00641023 */ subu $v0, $v1, $a0 -.L80240240: -/* CB9440 80240240 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240244: -/* CB9444 80240244 8E0300B4 */ lw $v1, 0xb4($s0) -/* CB9448 80240248 8E020094 */ lw $v0, 0x94($s0) -/* CB944C 8024024C 00621821 */ addu $v1, $v1, $v0 -/* CB9450 80240250 04610004 */ bgez $v1, .L80240264 -/* CB9454 80240254 AE0300B4 */ sw $v1, 0xb4($s0) -/* CB9458 80240258 3C020002 */ lui $v0, 2 -/* CB945C 8024025C 0809009D */ j .L80240274 -/* CB9460 80240260 00621021 */ addu $v0, $v1, $v0 -.L80240264: -/* CB9464 80240264 3C040002 */ lui $a0, 2 -/* CB9468 80240268 0083102A */ slt $v0, $a0, $v1 -/* CB946C 8024026C 10400002 */ beqz $v0, .L80240278 -/* CB9470 80240270 00641023 */ subu $v0, $v1, $a0 -.L80240274: -/* CB9474 80240274 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240278: -/* CB9478 80240278 8E040084 */ lw $a0, 0x84($s0) -/* CB947C 8024027C 0C046F07 */ jal set_main_pan_u -/* CB9480 80240280 8E0500A8 */ lw $a1, 0xa8($s0) -/* CB9484 80240284 8E040084 */ lw $a0, 0x84($s0) -/* CB9488 80240288 0C046F0D */ jal set_main_pan_v -/* CB948C 8024028C 8E0500AC */ lw $a1, 0xac($s0) -/* CB9490 80240290 8E040084 */ lw $a0, 0x84($s0) -/* CB9494 80240294 0C046F13 */ jal set_aux_pan_u -/* CB9498 80240298 8E0500B0 */ lw $a1, 0xb0($s0) -/* CB949C 8024029C 8E040084 */ lw $a0, 0x84($s0) -/* CB94A0 802402A0 0C046F19 */ jal set_aux_pan_v -/* CB94A4 802402A4 8E0500B4 */ lw $a1, 0xb4($s0) -/* CB94A8 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* CB94AC 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* CB94B0 802402B0 0000102D */ daddu $v0, $zero, $zero -/* CB94B4 802402B4 03E00008 */ jr $ra -/* CB94B8 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_10/func_802402BC_CB9200.s b/asm/nonmatchings/world/area_flo/flo_10/func_802402BC_CB9200.s deleted file mode 100644 index 3ab65f07dd..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_10/func_802402BC_CB9200.s +++ /dev/null @@ -1,146 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402BC_CB94BC -/* CB94BC 802402BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CB94C0 802402C0 AFB00010 */ sw $s0, 0x10($sp) -/* CB94C4 802402C4 0080802D */ daddu $s0, $a0, $zero -/* CB94C8 802402C8 10A00005 */ beqz $a1, .L802402E0 -/* CB94CC 802402CC AFBF0014 */ sw $ra, 0x14($sp) -/* CB94D0 802402D0 AE000070 */ sw $zero, 0x70($s0) -/* CB94D4 802402D4 AE000074 */ sw $zero, 0x74($s0) -/* CB94D8 802402D8 AE000078 */ sw $zero, 0x78($s0) -/* CB94DC 802402DC AE00007C */ sw $zero, 0x7c($s0) -.L802402E0: -/* CB94E0 802402E0 8E020070 */ lw $v0, 0x70($s0) -/* CB94E4 802402E4 1440000E */ bnez $v0, .L80240320 -/* CB94E8 802402E8 00000000 */ nop -/* CB94EC 802402EC 8E0300A8 */ lw $v1, 0xa8($s0) -/* CB94F0 802402F0 8E020088 */ lw $v0, 0x88($s0) -/* CB94F4 802402F4 00621821 */ addu $v1, $v1, $v0 -/* CB94F8 802402F8 04610004 */ bgez $v1, .L8024030C -/* CB94FC 802402FC AE0300A8 */ sw $v1, 0xa8($s0) -/* CB9500 80240300 3C020002 */ lui $v0, 2 -/* CB9504 80240304 080900C7 */ j .L8024031C -/* CB9508 80240308 00621021 */ addu $v0, $v1, $v0 -.L8024030C: -/* CB950C 8024030C 3C040002 */ lui $a0, 2 -/* CB9510 80240310 0083102A */ slt $v0, $a0, $v1 -/* CB9514 80240314 10400002 */ beqz $v0, .L80240320 -/* CB9518 80240318 00641023 */ subu $v0, $v1, $a0 -.L8024031C: -/* CB951C 8024031C AE0200A8 */ sw $v0, 0xa8($s0) -.L80240320: -/* CB9520 80240320 8E020074 */ lw $v0, 0x74($s0) -/* CB9524 80240324 1440000E */ bnez $v0, .L80240360 -/* CB9528 80240328 00000000 */ nop -/* CB952C 8024032C 8E0300AC */ lw $v1, 0xac($s0) -/* CB9530 80240330 8E02008C */ lw $v0, 0x8c($s0) -/* CB9534 80240334 00621821 */ addu $v1, $v1, $v0 -/* CB9538 80240338 04610004 */ bgez $v1, .L8024034C -/* CB953C 8024033C AE0300AC */ sw $v1, 0xac($s0) -/* CB9540 80240340 3C020002 */ lui $v0, 2 -/* CB9544 80240344 080900D7 */ j .L8024035C -/* CB9548 80240348 00621021 */ addu $v0, $v1, $v0 -.L8024034C: -/* CB954C 8024034C 3C040002 */ lui $a0, 2 -/* CB9550 80240350 0083102A */ slt $v0, $a0, $v1 -/* CB9554 80240354 10400002 */ beqz $v0, .L80240360 -/* CB9558 80240358 00641023 */ subu $v0, $v1, $a0 -.L8024035C: -/* CB955C 8024035C AE0200AC */ sw $v0, 0xac($s0) -.L80240360: -/* CB9560 80240360 8E020078 */ lw $v0, 0x78($s0) -/* CB9564 80240364 1440000E */ bnez $v0, .L802403A0 -/* CB9568 80240368 00000000 */ nop -/* CB956C 8024036C 8E0300B0 */ lw $v1, 0xb0($s0) -/* CB9570 80240370 8E020090 */ lw $v0, 0x90($s0) -/* CB9574 80240374 00621821 */ addu $v1, $v1, $v0 -/* CB9578 80240378 04610004 */ bgez $v1, .L8024038C -/* CB957C 8024037C AE0300B0 */ sw $v1, 0xb0($s0) -/* CB9580 80240380 3C020002 */ lui $v0, 2 -/* CB9584 80240384 080900E7 */ j .L8024039C -/* CB9588 80240388 00621021 */ addu $v0, $v1, $v0 -.L8024038C: -/* CB958C 8024038C 3C040002 */ lui $a0, 2 -/* CB9590 80240390 0083102A */ slt $v0, $a0, $v1 -/* CB9594 80240394 10400002 */ beqz $v0, .L802403A0 -/* CB9598 80240398 00641023 */ subu $v0, $v1, $a0 -.L8024039C: -/* CB959C 8024039C AE0200B0 */ sw $v0, 0xb0($s0) -.L802403A0: -/* CB95A0 802403A0 8E02007C */ lw $v0, 0x7c($s0) -/* CB95A4 802403A4 1440000E */ bnez $v0, .L802403E0 -/* CB95A8 802403A8 00000000 */ nop -/* CB95AC 802403AC 8E0300B4 */ lw $v1, 0xb4($s0) -/* CB95B0 802403B0 8E020094 */ lw $v0, 0x94($s0) -/* CB95B4 802403B4 00621821 */ addu $v1, $v1, $v0 -/* CB95B8 802403B8 04610004 */ bgez $v1, .L802403CC -/* CB95BC 802403BC AE0300B4 */ sw $v1, 0xb4($s0) -/* CB95C0 802403C0 3C020002 */ lui $v0, 2 -/* CB95C4 802403C4 080900F7 */ j .L802403DC -/* CB95C8 802403C8 00621021 */ addu $v0, $v1, $v0 -.L802403CC: -/* CB95CC 802403CC 3C040002 */ lui $a0, 2 -/* CB95D0 802403D0 0083102A */ slt $v0, $a0, $v1 -/* CB95D4 802403D4 10400002 */ beqz $v0, .L802403E0 -/* CB95D8 802403D8 00641023 */ subu $v0, $v1, $a0 -.L802403DC: -/* CB95DC 802403DC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403E0: -/* CB95E0 802403E0 8E040084 */ lw $a0, 0x84($s0) -/* CB95E4 802403E4 0C046F07 */ jal set_main_pan_u -/* CB95E8 802403E8 8E0500A8 */ lw $a1, 0xa8($s0) -/* CB95EC 802403EC 8E040084 */ lw $a0, 0x84($s0) -/* CB95F0 802403F0 0C046F0D */ jal set_main_pan_v -/* CB95F4 802403F4 8E0500AC */ lw $a1, 0xac($s0) -/* CB95F8 802403F8 8E040084 */ lw $a0, 0x84($s0) -/* CB95FC 802403FC 0C046F13 */ jal set_aux_pan_u -/* CB9600 80240400 8E0500B0 */ lw $a1, 0xb0($s0) -/* CB9604 80240404 8E040084 */ lw $a0, 0x84($s0) -/* CB9608 80240408 0C046F19 */ jal set_aux_pan_v -/* CB960C 8024040C 8E0500B4 */ lw $a1, 0xb4($s0) -/* CB9610 80240410 8E020070 */ lw $v0, 0x70($s0) -/* CB9614 80240414 8E030078 */ lw $v1, 0x78($s0) -/* CB9618 80240418 8E040098 */ lw $a0, 0x98($s0) -/* CB961C 8024041C 24420001 */ addiu $v0, $v0, 1 -/* CB9620 80240420 AE020070 */ sw $v0, 0x70($s0) -/* CB9624 80240424 8E020074 */ lw $v0, 0x74($s0) -/* CB9628 80240428 24630001 */ addiu $v1, $v1, 1 -/* CB962C 8024042C AE030078 */ sw $v1, 0x78($s0) -/* CB9630 80240430 8E030070 */ lw $v1, 0x70($s0) -/* CB9634 80240434 24420001 */ addiu $v0, $v0, 1 -/* CB9638 80240438 AE020074 */ sw $v0, 0x74($s0) -/* CB963C 8024043C 8E02007C */ lw $v0, 0x7c($s0) -/* CB9640 80240440 0064182A */ slt $v1, $v1, $a0 -/* CB9644 80240444 24420001 */ addiu $v0, $v0, 1 -/* CB9648 80240448 14600002 */ bnez $v1, .L80240454 -/* CB964C 8024044C AE02007C */ sw $v0, 0x7c($s0) -/* CB9650 80240450 AE000070 */ sw $zero, 0x70($s0) -.L80240454: -/* CB9654 80240454 8E020074 */ lw $v0, 0x74($s0) -/* CB9658 80240458 8E03009C */ lw $v1, 0x9c($s0) -/* CB965C 8024045C 0043102A */ slt $v0, $v0, $v1 -/* CB9660 80240460 50400001 */ beql $v0, $zero, .L80240468 -/* CB9664 80240464 AE000074 */ sw $zero, 0x74($s0) -.L80240468: -/* CB9668 80240468 8E020078 */ lw $v0, 0x78($s0) -/* CB966C 8024046C 8E0300A0 */ lw $v1, 0xa0($s0) -/* CB9670 80240470 0043102A */ slt $v0, $v0, $v1 -/* CB9674 80240474 50400001 */ beql $v0, $zero, .L8024047C -/* CB9678 80240478 AE000078 */ sw $zero, 0x78($s0) -.L8024047C: -/* CB967C 8024047C 8E02007C */ lw $v0, 0x7c($s0) -/* CB9680 80240480 8E0300A4 */ lw $v1, 0xa4($s0) -/* CB9684 80240484 0043102A */ slt $v0, $v0, $v1 -/* CB9688 80240488 50400001 */ beql $v0, $zero, .L80240490 -/* CB968C 8024048C AE00007C */ sw $zero, 0x7c($s0) -.L80240490: -/* CB9690 80240490 8FBF0014 */ lw $ra, 0x14($sp) -/* CB9694 80240494 8FB00010 */ lw $s0, 0x10($sp) -/* CB9698 80240498 0000102D */ daddu $v0, $zero, $zero -/* CB969C 8024049C 03E00008 */ jr $ra -/* CB96A0 802404A0 27BD0018 */ addiu $sp, $sp, 0x18 -/* CB96A4 802404A4 00000000 */ nop -/* CB96A8 802404A8 00000000 */ nop -/* CB96AC 802404AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_10/func_802404B0_CB9200.s b/asm/nonmatchings/world/area_flo/flo_10/func_802404B0_CB9200.s deleted file mode 100644 index f934889cb9..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_10/func_802404B0_CB9200.s +++ /dev/null @@ -1,398 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404B0_CB96B0 -/* CB96B0 802404B0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CB96B4 802404B4 AFB60040 */ sw $s6, 0x40($sp) -/* CB96B8 802404B8 0080B02D */ daddu $s6, $a0, $zero -/* CB96BC 802404BC 3C028024 */ lui $v0, 0x8024 -/* CB96C0 802404C0 24424070 */ addiu $v0, $v0, 0x4070 -/* CB96C4 802404C4 AFBF004C */ sw $ra, 0x4c($sp) -/* CB96C8 802404C8 AFBE0048 */ sw $fp, 0x48($sp) -/* CB96CC 802404CC AFB70044 */ sw $s7, 0x44($sp) -/* CB96D0 802404D0 AFB5003C */ sw $s5, 0x3c($sp) -/* CB96D4 802404D4 AFB40038 */ sw $s4, 0x38($sp) -/* CB96D8 802404D8 AFB30034 */ sw $s3, 0x34($sp) -/* CB96DC 802404DC AFB20030 */ sw $s2, 0x30($sp) -/* CB96E0 802404E0 AFB1002C */ sw $s1, 0x2c($sp) -/* CB96E4 802404E4 AFB00028 */ sw $s0, 0x28($sp) -/* CB96E8 802404E8 AFA50054 */ sw $a1, 0x54($sp) -/* CB96EC 802404EC 8C430000 */ lw $v1, ($v0) -/* CB96F0 802404F0 00C0A02D */ daddu $s4, $a2, $zero -/* CB96F4 802404F4 24630005 */ addiu $v1, $v1, 5 -/* CB96F8 802404F8 AC430000 */ sw $v1, ($v0) -/* CB96FC 802404FC 02D4102A */ slt $v0, $s6, $s4 -/* CB9700 80240500 10400159 */ beqz $v0, .L80240A68 -/* CB9704 80240504 00000000 */ nop -/* CB9708 80240508 8FAA0054 */ lw $t2, 0x54($sp) -/* CB970C 8024050C 0147102A */ slt $v0, $t2, $a3 -/* CB9710 80240510 10400155 */ beqz $v0, .L80240A68 -/* CB9714 80240514 00000000 */ nop -/* CB9718 80240518 06C20002 */ bltzl $s6, .L80240524 -/* CB971C 8024051C 0000B02D */ daddu $s6, $zero, $zero -/* CB9720 80240520 8FAA0054 */ lw $t2, 0x54($sp) -.L80240524: -/* CB9724 80240524 05420001 */ bltzl $t2, .L8024052C -/* CB9728 80240528 AFA00054 */ sw $zero, 0x54($sp) -.L8024052C: -/* CB972C 8024052C 06820001 */ bltzl $s4, .L80240534 -/* CB9730 80240530 0000A02D */ daddu $s4, $zero, $zero -.L80240534: -/* CB9734 80240534 04E20001 */ bltzl $a3, .L8024053C -/* CB9738 80240538 0000382D */ daddu $a3, $zero, $zero -.L8024053C: -/* CB973C 8024053C 2AC20140 */ slti $v0, $s6, 0x140 -/* CB9740 80240540 50400001 */ beql $v0, $zero, .L80240548 -/* CB9744 80240544 2416013F */ addiu $s6, $zero, 0x13f -.L80240548: -/* CB9748 80240548 8FAA0054 */ lw $t2, 0x54($sp) -/* CB974C 8024054C 294200F0 */ slti $v0, $t2, 0xf0 -/* CB9750 80240550 14400003 */ bnez $v0, .L80240560 -/* CB9754 80240554 2A820140 */ slti $v0, $s4, 0x140 -/* CB9758 80240558 240A00EF */ addiu $t2, $zero, 0xef -/* CB975C 8024055C AFAA0054 */ sw $t2, 0x54($sp) -.L80240560: -/* CB9760 80240560 50400001 */ beql $v0, $zero, .L80240568 -/* CB9764 80240564 2414013F */ addiu $s4, $zero, 0x13f -.L80240568: -/* CB9768 80240568 28E200F0 */ slti $v0, $a3, 0xf0 -/* CB976C 8024056C 50400001 */ beql $v0, $zero, .L80240574 -/* CB9770 80240570 240700EF */ addiu $a3, $zero, 0xef -.L80240574: -/* CB9774 80240574 12D4013C */ beq $s6, $s4, .L80240A68 -/* CB9778 80240578 00000000 */ nop -/* CB977C 8024057C 8FAA0054 */ lw $t2, 0x54($sp) -/* CB9780 80240580 11470139 */ beq $t2, $a3, .L80240A68 -/* CB9784 80240584 00000000 */ nop -/* CB9788 80240588 06C10002 */ bgez $s6, .L80240594 -/* CB978C 8024058C 02C0102D */ daddu $v0, $s6, $zero -/* CB9790 80240590 26C20003 */ addiu $v0, $s6, 3 -.L80240594: -/* CB9794 80240594 00021083 */ sra $v0, $v0, 2 -/* CB9798 80240598 0002B080 */ sll $s6, $v0, 2 -/* CB979C 8024059C 06810002 */ bgez $s4, .L802405A8 -/* CB97A0 802405A0 0280102D */ daddu $v0, $s4, $zero -/* CB97A4 802405A4 26820003 */ addiu $v0, $s4, 3 -.L802405A8: -/* CB97A8 802405A8 3C042AAA */ lui $a0, 0x2aaa -/* CB97AC 802405AC 3484AAAB */ ori $a0, $a0, 0xaaab -/* CB97B0 802405B0 8FAA0054 */ lw $t2, 0x54($sp) -/* CB97B4 802405B4 00021083 */ sra $v0, $v0, 2 -/* CB97B8 802405B8 00EA1823 */ subu $v1, $a3, $t2 -/* CB97BC 802405BC 00640018 */ mult $v1, $a0 -/* CB97C0 802405C0 00021080 */ sll $v0, $v0, 2 -/* CB97C4 802405C4 24540004 */ addiu $s4, $v0, 4 -/* CB97C8 802405C8 0000F02D */ daddu $fp, $zero, $zero -/* CB97CC 802405CC 000317C3 */ sra $v0, $v1, 0x1f -/* CB97D0 802405D0 00005010 */ mfhi $t2 -/* CB97D4 802405D4 01425023 */ subu $t2, $t2, $v0 -/* CB97D8 802405D8 000A1040 */ sll $v0, $t2, 1 -/* CB97DC 802405DC 004A1021 */ addu $v0, $v0, $t2 -/* CB97E0 802405E0 AFAA0014 */ sw $t2, 0x14($sp) -/* CB97E4 802405E4 AFAA0010 */ sw $t2, 0x10($sp) -/* CB97E8 802405E8 3C0A800A */ lui $t2, 0x800a -/* CB97EC 802405EC 8D4AA64C */ lw $t2, -0x59b4($t2) -/* CB97F0 802405F0 00021040 */ sll $v0, $v0, 1 -/* CB97F4 802405F4 AFAA0018 */ sw $t2, 0x18($sp) -/* CB97F8 802405F8 8FAA0010 */ lw $t2, 0x10($sp) -/* CB97FC 802405FC 00621823 */ subu $v1, $v1, $v0 -/* CB9800 80240600 19400097 */ blez $t2, .L80240860 -/* CB9804 80240604 AFA30014 */ sw $v1, 0x14($sp) -/* CB9808 80240608 3C13800A */ lui $s3, 0x800a -/* CB980C 8024060C 2673A66C */ addiu $s3, $s3, -0x5994 -/* CB9810 80240610 02961023 */ subu $v0, $s4, $s6 -/* CB9814 80240614 00021040 */ sll $v0, $v0, 1 -/* CB9818 80240618 24420007 */ addiu $v0, $v0, 7 -/* CB981C 8024061C 000210C3 */ sra $v0, $v0, 3 -/* CB9820 80240620 304201FF */ andi $v0, $v0, 0x1ff -/* CB9824 80240624 00021240 */ sll $v0, $v0, 9 -/* CB9828 80240628 3C03F510 */ lui $v1, 0xf510 -/* CB982C 8024062C 8FB70054 */ lw $s7, 0x54($sp) -/* CB9830 80240630 00431025 */ or $v0, $v0, $v1 -/* CB9834 80240634 AFA2001C */ sw $v0, 0x1c($sp) -/* CB9838 80240638 AFA00020 */ sw $zero, 0x20($sp) -/* CB983C 8024063C 02E0A82D */ daddu $s5, $s7, $zero -.L80240640: -/* CB9840 80240640 26B2FFFA */ addiu $s2, $s5, -6 -/* CB9844 80240644 0640007D */ bltz $s2, .L8024083C -/* CB9848 80240648 00123040 */ sll $a2, $s2, 1 -/* CB984C 8024064C 28C20100 */ slti $v0, $a2, 0x100 -/* CB9850 80240650 50400001 */ beql $v0, $zero, .L80240658 -/* CB9854 80240654 240600FF */ addiu $a2, $zero, 0xff -.L80240658: -/* CB9858 80240658 3C05FD10 */ lui $a1, 0xfd10 -/* CB985C 8024065C 34A5013F */ ori $a1, $a1, 0x13f -/* CB9860 80240660 3C02FA00 */ lui $v0, 0xfa00 -/* CB9864 80240664 8E700000 */ lw $s0, ($s3) -/* CB9868 80240668 8FA40018 */ lw $a0, 0x18($sp) -/* CB986C 8024066C 0200182D */ daddu $v1, $s0, $zero -/* CB9870 80240670 26100008 */ addiu $s0, $s0, 8 -/* CB9874 80240674 AE700000 */ sw $s0, ($s3) -/* CB9878 80240678 AC620000 */ sw $v0, ($v1) -/* CB987C 8024067C 2402FF00 */ addiu $v0, $zero, -0x100 -/* CB9880 80240680 00C21025 */ or $v0, $a2, $v0 -/* CB9884 80240684 AC620004 */ sw $v0, 4($v1) -/* CB9888 80240688 26020008 */ addiu $v0, $s0, 8 -/* CB988C 8024068C AE620000 */ sw $v0, ($s3) -/* CB9890 80240690 0C0187A4 */ jal osVirtualToPhysical -/* CB9894 80240694 AE050000 */ sw $a1, ($s0) -/* CB9898 80240698 3C030700 */ lui $v1, 0x700 -/* CB989C 8024069C 34630090 */ ori $v1, $v1, 0x90 -/* CB98A0 802406A0 00163080 */ sll $a2, $s6, 2 -/* CB98A4 802406A4 30C60FFF */ andi $a2, $a2, 0xfff -/* CB98A8 802406A8 00063300 */ sll $a2, $a2, 0xc -/* CB98AC 802406AC 00122080 */ sll $a0, $s2, 2 -/* CB98B0 802406B0 30840FFF */ andi $a0, $a0, 0xfff -/* CB98B4 802406B4 26A5FFFF */ addiu $a1, $s5, -1 -/* CB98B8 802406B8 8E710000 */ lw $s1, ($s3) -/* CB98BC 802406BC 00052880 */ sll $a1, $a1, 2 -/* CB98C0 802406C0 AE020004 */ sw $v0, 4($s0) -/* CB98C4 802406C4 0220102D */ daddu $v0, $s1, $zero -/* CB98C8 802406C8 26310008 */ addiu $s1, $s1, 8 -/* CB98CC 802406CC AE710000 */ sw $s1, ($s3) -/* CB98D0 802406D0 8FAA001C */ lw $t2, 0x1c($sp) -/* CB98D4 802406D4 30A50FFF */ andi $a1, $a1, 0xfff -/* CB98D8 802406D8 AC430004 */ sw $v1, 4($v0) -/* CB98DC 802406DC 2683FFFF */ addiu $v1, $s4, -1 -/* CB98E0 802406E0 00031880 */ sll $v1, $v1, 2 -/* CB98E4 802406E4 30630FFF */ andi $v1, $v1, 0xfff -/* CB98E8 802406E8 00031B00 */ sll $v1, $v1, 0xc -/* CB98EC 802406EC AC4A0000 */ sw $t2, ($v0) -/* CB98F0 802406F0 26220008 */ addiu $v0, $s1, 8 -/* CB98F4 802406F4 AE620000 */ sw $v0, ($s3) -/* CB98F8 802406F8 3C02E600 */ lui $v0, 0xe600 -/* CB98FC 802406FC AE220000 */ sw $v0, ($s1) -/* CB9900 80240700 26220010 */ addiu $v0, $s1, 0x10 -/* CB9904 80240704 AE200004 */ sw $zero, 4($s1) -/* CB9908 80240708 AE620000 */ sw $v0, ($s3) -/* CB990C 8024070C 3C02F400 */ lui $v0, 0xf400 -/* CB9910 80240710 00821025 */ or $v0, $a0, $v0 -/* CB9914 80240714 00C21025 */ or $v0, $a2, $v0 -/* CB9918 80240718 AE220008 */ sw $v0, 8($s1) -/* CB991C 8024071C 3C020700 */ lui $v0, 0x700 -/* CB9920 80240720 00A21025 */ or $v0, $a1, $v0 -/* CB9924 80240724 00621025 */ or $v0, $v1, $v0 -/* CB9928 80240728 AE22000C */ sw $v0, 0xc($s1) -/* CB992C 8024072C 26220018 */ addiu $v0, $s1, 0x18 -/* CB9930 80240730 AE620000 */ sw $v0, ($s3) -/* CB9934 80240734 3C02E700 */ lui $v0, 0xe700 -/* CB9938 80240738 AE220010 */ sw $v0, 0x10($s1) -/* CB993C 8024073C 26220020 */ addiu $v0, $s1, 0x20 -/* CB9940 80240740 AE200014 */ sw $zero, 0x14($s1) -/* CB9944 80240744 AE620000 */ sw $v0, ($s3) -/* CB9948 80240748 24020090 */ addiu $v0, $zero, 0x90 -/* CB994C 8024074C AE22001C */ sw $v0, 0x1c($s1) -/* CB9950 80240750 26220028 */ addiu $v0, $s1, 0x28 -/* CB9954 80240754 AE2A0018 */ sw $t2, 0x18($s1) -/* CB9958 80240758 AE620000 */ sw $v0, ($s3) -/* CB995C 8024075C 3C02F200 */ lui $v0, 0xf200 -/* CB9960 80240760 00822025 */ or $a0, $a0, $v0 -/* CB9964 80240764 00C42025 */ or $a0, $a2, $a0 -/* CB9968 80240768 00651825 */ or $v1, $v1, $a1 -/* CB996C 8024076C 26220030 */ addiu $v0, $s1, 0x30 -/* CB9970 80240770 AE240020 */ sw $a0, 0x20($s1) -/* CB9974 80240774 00142080 */ sll $a0, $s4, 2 -/* CB9978 80240778 30840FFF */ andi $a0, $a0, 0xfff -/* CB997C 8024077C 00042300 */ sll $a0, $a0, 0xc -/* CB9980 80240780 AE230024 */ sw $v1, 0x24($s1) -/* CB9984 80240784 AE620000 */ sw $v0, ($s3) -/* CB9988 80240788 26E20006 */ addiu $v0, $s7, 6 -/* CB998C 8024078C 00021080 */ sll $v0, $v0, 2 -/* CB9990 80240790 30420FFF */ andi $v0, $v0, 0xfff -/* CB9994 80240794 3C03E400 */ lui $v1, 0xe400 -/* CB9998 80240798 00431025 */ or $v0, $v0, $v1 -/* CB999C 8024079C 00822025 */ or $a0, $a0, $v0 -/* CB99A0 802407A0 00171080 */ sll $v0, $s7, 2 -/* CB99A4 802407A4 30420FFF */ andi $v0, $v0, 0xfff -/* CB99A8 802407A8 00C23025 */ or $a2, $a2, $v0 -/* CB99AC 802407AC 26220038 */ addiu $v0, $s1, 0x38 -/* CB99B0 802407B0 AE240028 */ sw $a0, 0x28($s1) -/* CB99B4 802407B4 AE26002C */ sw $a2, 0x2c($s1) -/* CB99B8 802407B8 AE620000 */ sw $v0, ($s3) -/* CB99BC 802407BC 3C02E100 */ lui $v0, 0xe100 -/* CB99C0 802407C0 00161D40 */ sll $v1, $s6, 0x15 -/* CB99C4 802407C4 AE220030 */ sw $v0, 0x30($s1) -/* CB99C8 802407C8 00151140 */ sll $v0, $s5, 5 -/* CB99CC 802407CC 3042FFFF */ andi $v0, $v0, 0xffff -/* CB99D0 802407D0 00621825 */ or $v1, $v1, $v0 -/* CB99D4 802407D4 26220040 */ addiu $v0, $s1, 0x40 -/* CB99D8 802407D8 AE230034 */ sw $v1, 0x34($s1) -/* CB99DC 802407DC AE620000 */ sw $v0, ($s3) -/* CB99E0 802407E0 3C038024 */ lui $v1, 0x8024 -/* CB99E4 802407E4 8C634070 */ lw $v1, 0x4070($v1) -/* CB99E8 802407E8 3C02F100 */ lui $v0, 0xf100 -/* CB99EC 802407EC AE220038 */ sw $v0, 0x38($s1) -/* CB99F0 802407F0 8FAA0020 */ lw $t2, 0x20($sp) -/* CB99F4 802407F4 006A1821 */ addu $v1, $v1, $t2 -/* CB99F8 802407F8 44836000 */ mtc1 $v1, $f12 -/* CB99FC 802407FC 00000000 */ nop -/* CB9A00 80240800 0C00A8BB */ jal sin_deg -/* CB9A04 80240804 46806320 */ cvt.s.w $f12, $f12 -/* CB9A08 80240808 3C0143FA */ lui $at, 0x43fa -/* CB9A0C 8024080C 44811000 */ mtc1 $at, $f2 -/* CB9A10 80240810 00000000 */ nop -/* CB9A14 80240814 46020002 */ mul.s $f0, $f0, $f2 -/* CB9A18 80240818 00000000 */ nop -/* CB9A1C 8024081C 3C030400 */ lui $v1, 0x400 -/* CB9A20 80240820 4600010D */ trunc.w.s $f4, $f0 -/* CB9A24 80240824 44022000 */ mfc1 $v0, $f4 -/* CB9A28 80240828 00000000 */ nop -/* CB9A2C 8024082C 2442FE0C */ addiu $v0, $v0, -0x1f4 -/* CB9A30 80240830 3042FFFF */ andi $v0, $v0, 0xffff -/* CB9A34 80240834 00431025 */ or $v0, $v0, $v1 -/* CB9A38 80240838 AE22003C */ sw $v0, 0x3c($s1) -.L8024083C: -/* CB9A3C 8024083C 26F70006 */ addiu $s7, $s7, 6 -/* CB9A40 80240840 8FAA0020 */ lw $t2, 0x20($sp) -/* CB9A44 80240844 254A001E */ addiu $t2, $t2, 0x1e -/* CB9A48 80240848 AFAA0020 */ sw $t2, 0x20($sp) -/* CB9A4C 8024084C 8FAA0010 */ lw $t2, 0x10($sp) -/* CB9A50 80240850 27DE0001 */ addiu $fp, $fp, 1 -/* CB9A54 80240854 03CA102A */ slt $v0, $fp, $t2 -/* CB9A58 80240858 1440FF79 */ bnez $v0, .L80240640 -/* CB9A5C 8024085C 26B5FFFA */ addiu $s5, $s5, -6 -.L80240860: -/* CB9A60 80240860 8FAA0014 */ lw $t2, 0x14($sp) -/* CB9A64 80240864 11400080 */ beqz $t2, .L80240A68 -/* CB9A68 80240868 001E1040 */ sll $v0, $fp, 1 -/* CB9A6C 8024086C 005E1021 */ addu $v0, $v0, $fp -/* CB9A70 80240870 8FAA0054 */ lw $t2, 0x54($sp) -/* CB9A74 80240874 00029840 */ sll $s3, $v0, 1 -/* CB9A78 80240878 01539023 */ subu $s2, $t2, $s3 -/* CB9A7C 8024087C 2642FFFA */ addiu $v0, $s2, -6 -/* CB9A80 80240880 04400079 */ bltz $v0, .L80240A68 -/* CB9A84 80240884 00023040 */ sll $a2, $v0, 1 -/* CB9A88 80240888 28C20100 */ slti $v0, $a2, 0x100 -/* CB9A8C 8024088C 50400001 */ beql $v0, $zero, .L80240894 -/* CB9A90 80240890 240600FF */ addiu $a2, $zero, 0xff -.L80240894: -/* CB9A94 80240894 3C05FD10 */ lui $a1, 0xfd10 -/* CB9A98 80240898 34A5013F */ ori $a1, $a1, 0x13f -/* CB9A9C 8024089C 3C11800A */ lui $s1, 0x800a -/* CB9AA0 802408A0 2631A66C */ addiu $s1, $s1, -0x5994 -/* CB9AA4 802408A4 3C02FA00 */ lui $v0, 0xfa00 -/* CB9AA8 802408A8 8E300000 */ lw $s0, ($s1) -/* CB9AAC 802408AC 8FA40018 */ lw $a0, 0x18($sp) -/* CB9AB0 802408B0 0200182D */ daddu $v1, $s0, $zero -/* CB9AB4 802408B4 26100008 */ addiu $s0, $s0, 8 -/* CB9AB8 802408B8 AE300000 */ sw $s0, ($s1) -/* CB9ABC 802408BC AC620000 */ sw $v0, ($v1) -/* CB9AC0 802408C0 2402FF00 */ addiu $v0, $zero, -0x100 -/* CB9AC4 802408C4 00C21025 */ or $v0, $a2, $v0 -/* CB9AC8 802408C8 AC620004 */ sw $v0, 4($v1) -/* CB9ACC 802408CC 26020008 */ addiu $v0, $s0, 8 -/* CB9AD0 802408D0 AE220000 */ sw $v0, ($s1) -/* CB9AD4 802408D4 0C0187A4 */ jal osVirtualToPhysical -/* CB9AD8 802408D8 AE050000 */ sw $a1, ($s0) -/* CB9ADC 802408DC 3C050700 */ lui $a1, 0x700 -/* CB9AE0 802408E0 34A50090 */ ori $a1, $a1, 0x90 -/* CB9AE4 802408E4 3C090400 */ lui $t1, 0x400 -/* CB9AE8 802408E8 3529FC00 */ ori $t1, $t1, 0xfc00 -/* CB9AEC 802408EC 02962023 */ subu $a0, $s4, $s6 -/* CB9AF0 802408F0 00042040 */ sll $a0, $a0, 1 -/* CB9AF4 802408F4 24840007 */ addiu $a0, $a0, 7 -/* CB9AF8 802408F8 000420C3 */ sra $a0, $a0, 3 -/* CB9AFC 802408FC 308401FF */ andi $a0, $a0, 0x1ff -/* CB9B00 80240900 8E260000 */ lw $a2, ($s1) -/* CB9B04 80240904 00042240 */ sll $a0, $a0, 9 -/* CB9B08 80240908 AE020004 */ sw $v0, 4($s0) -/* CB9B0C 8024090C 3C02F510 */ lui $v0, 0xf510 -/* CB9B10 80240910 00822025 */ or $a0, $a0, $v0 -/* CB9B14 80240914 00164080 */ sll $t0, $s6, 2 -/* CB9B18 80240918 31080FFF */ andi $t0, $t0, 0xfff -/* CB9B1C 8024091C 00084300 */ sll $t0, $t0, 0xc -/* CB9B20 80240920 2647FFFF */ addiu $a3, $s2, -1 -/* CB9B24 80240924 00073880 */ sll $a3, $a3, 2 -/* CB9B28 80240928 30E70FFF */ andi $a3, $a3, 0xfff -/* CB9B2C 8024092C 00C0182D */ daddu $v1, $a2, $zero -/* CB9B30 80240930 24C60008 */ addiu $a2, $a2, 8 -/* CB9B34 80240934 24C20008 */ addiu $v0, $a2, 8 -/* CB9B38 80240938 AE260000 */ sw $a2, ($s1) -/* CB9B3C 8024093C AC640000 */ sw $a0, ($v1) -/* CB9B40 80240940 AC650004 */ sw $a1, 4($v1) -/* CB9B44 80240944 AE220000 */ sw $v0, ($s1) -/* CB9B48 80240948 3C02E600 */ lui $v0, 0xe600 -/* CB9B4C 8024094C ACC20000 */ sw $v0, ($a2) -/* CB9B50 80240950 24C20010 */ addiu $v0, $a2, 0x10 -/* CB9B54 80240954 ACC00004 */ sw $zero, 4($a2) -/* CB9B58 80240958 AE220000 */ sw $v0, ($s1) -/* CB9B5C 8024095C 3C02F400 */ lui $v0, 0xf400 -/* CB9B60 80240960 2683FFFF */ addiu $v1, $s4, -1 -/* CB9B64 80240964 00031880 */ sll $v1, $v1, 2 -/* CB9B68 80240968 30630FFF */ andi $v1, $v1, 0xfff -/* CB9B6C 8024096C 8FAA0014 */ lw $t2, 0x14($sp) -/* CB9B70 80240970 00031B00 */ sll $v1, $v1, 0xc -/* CB9B74 80240974 024A2823 */ subu $a1, $s2, $t2 -/* CB9B78 80240978 00052880 */ sll $a1, $a1, 2 -/* CB9B7C 8024097C 30A50FFF */ andi $a1, $a1, 0xfff -/* CB9B80 80240980 00A21025 */ or $v0, $a1, $v0 -/* CB9B84 80240984 01021025 */ or $v0, $t0, $v0 -/* CB9B88 80240988 ACC20008 */ sw $v0, 8($a2) -/* CB9B8C 8024098C 3C020700 */ lui $v0, 0x700 -/* CB9B90 80240990 00E21025 */ or $v0, $a3, $v0 -/* CB9B94 80240994 00621025 */ or $v0, $v1, $v0 -/* CB9B98 80240998 ACC2000C */ sw $v0, 0xc($a2) -/* CB9B9C 8024099C 24C20018 */ addiu $v0, $a2, 0x18 -/* CB9BA0 802409A0 AE220000 */ sw $v0, ($s1) -/* CB9BA4 802409A4 3C02E700 */ lui $v0, 0xe700 -/* CB9BA8 802409A8 ACC20010 */ sw $v0, 0x10($a2) -/* CB9BAC 802409AC 24C20020 */ addiu $v0, $a2, 0x20 -/* CB9BB0 802409B0 ACC00014 */ sw $zero, 0x14($a2) -/* CB9BB4 802409B4 AE220000 */ sw $v0, ($s1) -/* CB9BB8 802409B8 24020090 */ addiu $v0, $zero, 0x90 -/* CB9BBC 802409BC ACC2001C */ sw $v0, 0x1c($a2) -/* CB9BC0 802409C0 24C20028 */ addiu $v0, $a2, 0x28 -/* CB9BC4 802409C4 ACC40018 */ sw $a0, 0x18($a2) -/* CB9BC8 802409C8 AE220000 */ sw $v0, ($s1) -/* CB9BCC 802409CC 3C02F200 */ lui $v0, 0xf200 -/* CB9BD0 802409D0 00A22825 */ or $a1, $a1, $v0 -/* CB9BD4 802409D4 01052825 */ or $a1, $t0, $a1 -/* CB9BD8 802409D8 00671825 */ or $v1, $v1, $a3 -/* CB9BDC 802409DC 24C20030 */ addiu $v0, $a2, 0x30 -/* CB9BE0 802409E0 ACC30024 */ sw $v1, 0x24($a2) -/* CB9BE4 802409E4 00141880 */ sll $v1, $s4, 2 -/* CB9BE8 802409E8 30630FFF */ andi $v1, $v1, 0xfff -/* CB9BEC 802409EC ACC50020 */ sw $a1, 0x20($a2) -/* CB9BF0 802409F0 AE220000 */ sw $v0, ($s1) -/* CB9BF4 802409F4 8FAA0054 */ lw $t2, 0x54($sp) -/* CB9BF8 802409F8 00031B00 */ sll $v1, $v1, 0xc -/* CB9BFC 802409FC 01532821 */ addu $a1, $t2, $s3 -/* CB9C00 80240A00 8FAA0014 */ lw $t2, 0x14($sp) -/* CB9C04 80240A04 3C04E400 */ lui $a0, 0xe400 -/* CB9C08 80240A08 00AA1021 */ addu $v0, $a1, $t2 -/* CB9C0C 80240A0C 00021080 */ sll $v0, $v0, 2 -/* CB9C10 80240A10 30420FFF */ andi $v0, $v0, 0xfff -/* CB9C14 80240A14 00441025 */ or $v0, $v0, $a0 -/* CB9C18 80240A18 00621825 */ or $v1, $v1, $v0 -/* CB9C1C 80240A1C 00052880 */ sll $a1, $a1, 2 -/* CB9C20 80240A20 30A50FFF */ andi $a1, $a1, 0xfff -/* CB9C24 80240A24 01054025 */ or $t0, $t0, $a1 -/* CB9C28 80240A28 24C20038 */ addiu $v0, $a2, 0x38 -/* CB9C2C 80240A2C ACC30028 */ sw $v1, 0x28($a2) -/* CB9C30 80240A30 ACC8002C */ sw $t0, 0x2c($a2) -/* CB9C34 80240A34 AE220000 */ sw $v0, ($s1) -/* CB9C38 80240A38 3C02E100 */ lui $v0, 0xe100 -/* CB9C3C 80240A3C 00161D40 */ sll $v1, $s6, 0x15 -/* CB9C40 80240A40 ACC20030 */ sw $v0, 0x30($a2) -/* CB9C44 80240A44 00121140 */ sll $v0, $s2, 5 -/* CB9C48 80240A48 3042FFFF */ andi $v0, $v0, 0xffff -/* CB9C4C 80240A4C 00621825 */ or $v1, $v1, $v0 -/* CB9C50 80240A50 24C20040 */ addiu $v0, $a2, 0x40 -/* CB9C54 80240A54 ACC30034 */ sw $v1, 0x34($a2) -/* CB9C58 80240A58 AE220000 */ sw $v0, ($s1) -/* CB9C5C 80240A5C 3C02F100 */ lui $v0, 0xf100 -/* CB9C60 80240A60 ACC20038 */ sw $v0, 0x38($a2) -/* CB9C64 80240A64 ACC9003C */ sw $t1, 0x3c($a2) -.L80240A68: -/* CB9C68 80240A68 8FBF004C */ lw $ra, 0x4c($sp) -/* CB9C6C 80240A6C 8FBE0048 */ lw $fp, 0x48($sp) -/* CB9C70 80240A70 8FB70044 */ lw $s7, 0x44($sp) -/* CB9C74 80240A74 8FB60040 */ lw $s6, 0x40($sp) -/* CB9C78 80240A78 8FB5003C */ lw $s5, 0x3c($sp) -/* CB9C7C 80240A7C 8FB40038 */ lw $s4, 0x38($sp) -/* CB9C80 80240A80 8FB30034 */ lw $s3, 0x34($sp) -/* CB9C84 80240A84 8FB20030 */ lw $s2, 0x30($sp) -/* CB9C88 80240A88 8FB1002C */ lw $s1, 0x2c($sp) -/* CB9C8C 80240A8C 8FB00028 */ lw $s0, 0x28($sp) -/* CB9C90 80240A90 03E00008 */ jr $ra -/* CB9C94 80240A94 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_10/func_80240A98_CB9200.s b/asm/nonmatchings/world/area_flo/flo_10/func_80240A98_CB9200.s deleted file mode 100644 index bab18472cd..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_10/func_80240A98_CB9200.s +++ /dev/null @@ -1,508 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A98_CB9C98 -/* CB9C98 80240A98 27BDFF68 */ addiu $sp, $sp, -0x98 -/* CB9C9C 80240A9C 24040030 */ addiu $a0, $zero, 0x30 -/* CB9CA0 80240AA0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* CB9CA4 80240AA4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CB9CA8 80240AA8 3C05800B */ lui $a1, %hi(gCameras) -/* CB9CAC 80240AAC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* CB9CB0 80240AB0 AFBF0064 */ sw $ra, 0x64($sp) -/* CB9CB4 80240AB4 AFBE0060 */ sw $fp, 0x60($sp) -/* CB9CB8 80240AB8 AFB7005C */ sw $s7, 0x5c($sp) -/* CB9CBC 80240ABC AFB60058 */ sw $s6, 0x58($sp) -/* CB9CC0 80240AC0 AFB50054 */ sw $s5, 0x54($sp) -/* CB9CC4 80240AC4 AFB40050 */ sw $s4, 0x50($sp) -/* CB9CC8 80240AC8 AFB3004C */ sw $s3, 0x4c($sp) -/* CB9CCC 80240ACC AFB20048 */ sw $s2, 0x48($sp) -/* CB9CD0 80240AD0 AFB10044 */ sw $s1, 0x44($sp) -/* CB9CD4 80240AD4 AFB00040 */ sw $s0, 0x40($sp) -/* CB9CD8 80240AD8 F7BE0090 */ sdc1 $f30, 0x90($sp) -/* CB9CDC 80240ADC F7BC0088 */ sdc1 $f28, 0x88($sp) -/* CB9CE0 80240AE0 F7BA0080 */ sdc1 $f26, 0x80($sp) -/* CB9CE4 80240AE4 F7B80078 */ sdc1 $f24, 0x78($sp) -/* CB9CE8 80240AE8 F7B60070 */ sdc1 $f22, 0x70($sp) -/* CB9CEC 80240AEC F7B40068 */ sdc1 $f20, 0x68($sp) -/* CB9CF0 80240AF0 00031080 */ sll $v0, $v1, 2 -/* CB9CF4 80240AF4 00431021 */ addu $v0, $v0, $v1 -/* CB9CF8 80240AF8 00021080 */ sll $v0, $v0, 2 -/* CB9CFC 80240AFC 00431023 */ subu $v0, $v0, $v1 -/* CB9D00 80240B00 000218C0 */ sll $v1, $v0, 3 -/* CB9D04 80240B04 00431021 */ addu $v0, $v0, $v1 -/* CB9D08 80240B08 000210C0 */ sll $v0, $v0, 3 -/* CB9D0C 80240B0C 0C046C04 */ jal get_model_list_index_from_tree_index -/* CB9D10 80240B10 0045B821 */ addu $s7, $v0, $a1 -/* CB9D14 80240B14 0C046B4C */ jal get_model_from_list_index -/* CB9D18 80240B18 0040202D */ daddu $a0, $v0, $zero -/* CB9D1C 80240B1C 0040F02D */ daddu $fp, $v0, $zero -/* CB9D20 80240B20 27B40028 */ addiu $s4, $sp, 0x28 -/* CB9D24 80240B24 27B2002C */ addiu $s2, $sp, 0x2c -/* CB9D28 80240B28 27B30030 */ addiu $s3, $sp, 0x30 -/* CB9D2C 80240B2C 27B10034 */ addiu $s1, $sp, 0x34 -/* CB9D30 80240B30 8FC20008 */ lw $v0, 8($fp) -/* CB9D34 80240B34 C7C00098 */ lwc1 $f0, 0x98($fp) -/* CB9D38 80240B38 8C42000C */ lw $v0, 0xc($v0) -/* CB9D3C 80240B3C 3C013F80 */ lui $at, 0x3f80 -/* CB9D40 80240B40 4481E000 */ mtc1 $at, $f28 -/* CB9D44 80240B44 C45E0004 */ lwc1 $f30, 4($v0) -/* CB9D48 80240B48 4680F7A0 */ cvt.s.w $f30, $f30 -/* CB9D4C 80240B4C 461E0001 */ sub.s $f0, $f0, $f30 -/* CB9D50 80240B50 C448001C */ lwc1 $f8, 0x1c($v0) -/* CB9D54 80240B54 46804220 */ cvt.s.w $f8, $f8 -/* CB9D58 80240B58 E7A80038 */ swc1 $f8, 0x38($sp) -/* CB9D5C 80240B5C 44050000 */ mfc1 $a1, $f0 -/* CB9D60 80240B60 C7C000A0 */ lwc1 $f0, 0xa0($fp) -/* CB9D64 80240B64 26F000D4 */ addiu $s0, $s7, 0xd4 -/* CB9D68 80240B68 E7BC0010 */ swc1 $f28, 0x10($sp) -/* CB9D6C 80240B6C AFB40014 */ sw $s4, 0x14($sp) -/* CB9D70 80240B70 AFB20018 */ sw $s2, 0x18($sp) -/* CB9D74 80240B74 AFB3001C */ sw $s3, 0x1c($sp) -/* CB9D78 80240B78 46080201 */ sub.s $f8, $f0, $f8 -/* CB9D7C 80240B7C AFB10020 */ sw $s1, 0x20($sp) -/* CB9D80 80240B80 8FC6009C */ lw $a2, 0x9c($fp) -/* CB9D84 80240B84 44074000 */ mfc1 $a3, $f8 -/* CB9D88 80240B88 0C00A588 */ jal transform_point -/* CB9D8C 80240B8C 0200202D */ daddu $a0, $s0, $zero -/* CB9D90 80240B90 C7A00034 */ lwc1 $f0, 0x34($sp) -/* CB9D94 80240B94 C7A60028 */ lwc1 $f6, 0x28($sp) -/* CB9D98 80240B98 4600E003 */ div.s $f0, $f28, $f0 -/* CB9D9C 80240B9C 46003182 */ mul.s $f6, $f6, $f0 -/* CB9DA0 80240BA0 00000000 */ nop -/* CB9DA4 80240BA4 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* CB9DA8 80240BA8 46000087 */ neg.s $f2, $f0 -/* CB9DAC 80240BAC 46022102 */ mul.s $f4, $f4, $f2 -/* CB9DB0 80240BB0 00000000 */ nop -/* CB9DB4 80240BB4 C7A20030 */ lwc1 $f2, 0x30($sp) -/* CB9DB8 80240BB8 46001082 */ mul.s $f2, $f2, $f0 -/* CB9DBC 80240BBC 00000000 */ nop -/* CB9DC0 80240BC0 44804000 */ mtc1 $zero, $f8 -/* CB9DC4 80240BC4 00000000 */ nop -/* CB9DC8 80240BC8 4608003C */ c.lt.s $f0, $f8 -/* CB9DCC 80240BCC E7A00034 */ swc1 $f0, 0x34($sp) -/* CB9DD0 80240BD0 E7A60028 */ swc1 $f6, 0x28($sp) -/* CB9DD4 80240BD4 E7A4002C */ swc1 $f4, 0x2c($sp) -/* CB9DD8 80240BD8 45000003 */ bc1f .L80240BE8 -/* CB9DDC 80240BDC E7A20030 */ swc1 $f2, 0x30($sp) -/* CB9DE0 80240BE0 E7A80028 */ swc1 $f8, 0x28($sp) -/* CB9DE4 80240BE4 E7BC002C */ swc1 $f28, 0x2c($sp) -.L80240BE8: -/* CB9DE8 80240BE8 C7B40028 */ lwc1 $f20, 0x28($sp) -/* CB9DEC 80240BEC C7B6002C */ lwc1 $f22, 0x2c($sp) -/* CB9DF0 80240BF0 C7C00098 */ lwc1 $f0, 0x98($fp) -/* CB9DF4 80240BF4 C7C200A0 */ lwc1 $f2, 0xa0($fp) -/* CB9DF8 80240BF8 C7A80038 */ lwc1 $f8, 0x38($sp) -/* CB9DFC 80240BFC E7BC0010 */ swc1 $f28, 0x10($sp) -/* CB9E00 80240C00 AFB40014 */ sw $s4, 0x14($sp) -/* CB9E04 80240C04 AFB20018 */ sw $s2, 0x18($sp) -/* CB9E08 80240C08 461E0001 */ sub.s $f0, $f0, $f30 -/* CB9E0C 80240C0C AFB3001C */ sw $s3, 0x1c($sp) -/* CB9E10 80240C10 AFB10020 */ sw $s1, 0x20($sp) -/* CB9E14 80240C14 46081200 */ add.s $f8, $f2, $f8 -/* CB9E18 80240C18 8FC6009C */ lw $a2, 0x9c($fp) -/* CB9E1C 80240C1C 44050000 */ mfc1 $a1, $f0 -/* CB9E20 80240C20 44074000 */ mfc1 $a3, $f8 -/* CB9E24 80240C24 0C00A588 */ jal transform_point -/* CB9E28 80240C28 0200202D */ daddu $a0, $s0, $zero -/* CB9E2C 80240C2C C7A00034 */ lwc1 $f0, 0x34($sp) -/* CB9E30 80240C30 C7A60028 */ lwc1 $f6, 0x28($sp) -/* CB9E34 80240C34 4600E003 */ div.s $f0, $f28, $f0 -/* CB9E38 80240C38 46003182 */ mul.s $f6, $f6, $f0 -/* CB9E3C 80240C3C 00000000 */ nop -/* CB9E40 80240C40 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* CB9E44 80240C44 46000087 */ neg.s $f2, $f0 -/* CB9E48 80240C48 46022102 */ mul.s $f4, $f4, $f2 -/* CB9E4C 80240C4C 00000000 */ nop -/* CB9E50 80240C50 C7A20030 */ lwc1 $f2, 0x30($sp) -/* CB9E54 80240C54 46001082 */ mul.s $f2, $f2, $f0 -/* CB9E58 80240C58 00000000 */ nop -/* CB9E5C 80240C5C 4600A606 */ mov.s $f24, $f20 -/* CB9E60 80240C60 44804000 */ mtc1 $zero, $f8 -/* CB9E64 80240C64 4600B686 */ mov.s $f26, $f22 -/* CB9E68 80240C68 4608003C */ c.lt.s $f0, $f8 -/* CB9E6C 80240C6C E7A00034 */ swc1 $f0, 0x34($sp) -/* CB9E70 80240C70 E7A60028 */ swc1 $f6, 0x28($sp) -/* CB9E74 80240C74 E7A4002C */ swc1 $f4, 0x2c($sp) -/* CB9E78 80240C78 45000003 */ bc1f .L80240C88 -/* CB9E7C 80240C7C E7A20030 */ swc1 $f2, 0x30($sp) -/* CB9E80 80240C80 E7A80028 */ swc1 $f8, 0x28($sp) -/* CB9E84 80240C84 E7BC002C */ swc1 $f28, 0x2c($sp) -.L80240C88: -/* CB9E88 80240C88 C7A20028 */ lwc1 $f2, 0x28($sp) -/* CB9E8C 80240C8C 4614103C */ c.lt.s $f2, $f20 -/* CB9E90 80240C90 00000000 */ nop -/* CB9E94 80240C94 45030001 */ bc1tl .L80240C9C -/* CB9E98 80240C98 46001606 */ mov.s $f24, $f2 -.L80240C9C: -/* CB9E9C 80240C9C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CB9EA0 80240CA0 4616003C */ c.lt.s $f0, $f22 -/* CB9EA4 80240CA4 00000000 */ nop -/* CB9EA8 80240CA8 45030001 */ bc1tl .L80240CB0 -/* CB9EAC 80240CAC 46000686 */ mov.s $f26, $f0 -.L80240CB0: -/* CB9EB0 80240CB0 4602A03C */ c.lt.s $f20, $f2 -/* CB9EB4 80240CB4 00000000 */ nop -/* CB9EB8 80240CB8 45030001 */ bc1tl .L80240CC0 -/* CB9EBC 80240CBC 46001506 */ mov.s $f20, $f2 -.L80240CC0: -/* CB9EC0 80240CC0 4600B03C */ c.lt.s $f22, $f0 -/* CB9EC4 80240CC4 00000000 */ nop -/* CB9EC8 80240CC8 45030001 */ bc1tl .L80240CD0 -/* CB9ECC 80240CCC 46000586 */ mov.s $f22, $f0 -.L80240CD0: -/* CB9ED0 80240CD0 C7C00098 */ lwc1 $f0, 0x98($fp) -/* CB9ED4 80240CD4 C7C200A0 */ lwc1 $f2, 0xa0($fp) -/* CB9ED8 80240CD8 C7A80038 */ lwc1 $f8, 0x38($sp) -/* CB9EDC 80240CDC E7BC0010 */ swc1 $f28, 0x10($sp) -/* CB9EE0 80240CE0 AFB40014 */ sw $s4, 0x14($sp) -/* CB9EE4 80240CE4 AFB20018 */ sw $s2, 0x18($sp) -/* CB9EE8 80240CE8 461E0000 */ add.s $f0, $f0, $f30 -/* CB9EEC 80240CEC AFB3001C */ sw $s3, 0x1c($sp) -/* CB9EF0 80240CF0 AFB10020 */ sw $s1, 0x20($sp) -/* CB9EF4 80240CF4 46081200 */ add.s $f8, $f2, $f8 -/* CB9EF8 80240CF8 8FC6009C */ lw $a2, 0x9c($fp) -/* CB9EFC 80240CFC 44050000 */ mfc1 $a1, $f0 -/* CB9F00 80240D00 44074000 */ mfc1 $a3, $f8 -/* CB9F04 80240D04 0C00A588 */ jal transform_point -/* CB9F08 80240D08 0200202D */ daddu $a0, $s0, $zero -/* CB9F0C 80240D0C C7A00034 */ lwc1 $f0, 0x34($sp) -/* CB9F10 80240D10 C7A60028 */ lwc1 $f6, 0x28($sp) -/* CB9F14 80240D14 4600E003 */ div.s $f0, $f28, $f0 -/* CB9F18 80240D18 46003182 */ mul.s $f6, $f6, $f0 -/* CB9F1C 80240D1C 00000000 */ nop -/* CB9F20 80240D20 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* CB9F24 80240D24 46000087 */ neg.s $f2, $f0 -/* CB9F28 80240D28 46022102 */ mul.s $f4, $f4, $f2 -/* CB9F2C 80240D2C 00000000 */ nop -/* CB9F30 80240D30 C7A20030 */ lwc1 $f2, 0x30($sp) -/* CB9F34 80240D34 46001082 */ mul.s $f2, $f2, $f0 -/* CB9F38 80240D38 00000000 */ nop -/* CB9F3C 80240D3C 44804000 */ mtc1 $zero, $f8 -/* CB9F40 80240D40 00000000 */ nop -/* CB9F44 80240D44 4608003C */ c.lt.s $f0, $f8 -/* CB9F48 80240D48 E7A00034 */ swc1 $f0, 0x34($sp) -/* CB9F4C 80240D4C E7A60028 */ swc1 $f6, 0x28($sp) -/* CB9F50 80240D50 E7A4002C */ swc1 $f4, 0x2c($sp) -/* CB9F54 80240D54 45000003 */ bc1f .L80240D64 -/* CB9F58 80240D58 E7A20030 */ swc1 $f2, 0x30($sp) -/* CB9F5C 80240D5C E7BC0028 */ swc1 $f28, 0x28($sp) -/* CB9F60 80240D60 E7BC002C */ swc1 $f28, 0x2c($sp) -.L80240D64: -/* CB9F64 80240D64 C7A20028 */ lwc1 $f2, 0x28($sp) -/* CB9F68 80240D68 4618103C */ c.lt.s $f2, $f24 -/* CB9F6C 80240D6C 00000000 */ nop -/* CB9F70 80240D70 45030001 */ bc1tl .L80240D78 -/* CB9F74 80240D74 46001606 */ mov.s $f24, $f2 -.L80240D78: -/* CB9F78 80240D78 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CB9F7C 80240D7C 461A003C */ c.lt.s $f0, $f26 -/* CB9F80 80240D80 00000000 */ nop -/* CB9F84 80240D84 45030001 */ bc1tl .L80240D8C -/* CB9F88 80240D88 46000686 */ mov.s $f26, $f0 -.L80240D8C: -/* CB9F8C 80240D8C 4602A03C */ c.lt.s $f20, $f2 -/* CB9F90 80240D90 00000000 */ nop -/* CB9F94 80240D94 45030001 */ bc1tl .L80240D9C -/* CB9F98 80240D98 46001506 */ mov.s $f20, $f2 -.L80240D9C: -/* CB9F9C 80240D9C 4600B03C */ c.lt.s $f22, $f0 -/* CB9FA0 80240DA0 00000000 */ nop -/* CB9FA4 80240DA4 45030001 */ bc1tl .L80240DAC -/* CB9FA8 80240DA8 46000586 */ mov.s $f22, $f0 -.L80240DAC: -/* CB9FAC 80240DAC C7C00098 */ lwc1 $f0, 0x98($fp) -/* CB9FB0 80240DB0 C7C200A0 */ lwc1 $f2, 0xa0($fp) -/* CB9FB4 80240DB4 C7A80038 */ lwc1 $f8, 0x38($sp) -/* CB9FB8 80240DB8 E7BC0010 */ swc1 $f28, 0x10($sp) -/* CB9FBC 80240DBC AFB40014 */ sw $s4, 0x14($sp) -/* CB9FC0 80240DC0 AFB20018 */ sw $s2, 0x18($sp) -/* CB9FC4 80240DC4 461E0000 */ add.s $f0, $f0, $f30 -/* CB9FC8 80240DC8 AFB3001C */ sw $s3, 0x1c($sp) -/* CB9FCC 80240DCC AFB10020 */ sw $s1, 0x20($sp) -/* CB9FD0 80240DD0 46081201 */ sub.s $f8, $f2, $f8 -/* CB9FD4 80240DD4 8FC6009C */ lw $a2, 0x9c($fp) -/* CB9FD8 80240DD8 44050000 */ mfc1 $a1, $f0 -/* CB9FDC 80240DDC 44074000 */ mfc1 $a3, $f8 -/* CB9FE0 80240DE0 0C00A588 */ jal transform_point -/* CB9FE4 80240DE4 26E400D4 */ addiu $a0, $s7, 0xd4 -/* CB9FE8 80240DE8 C7A00034 */ lwc1 $f0, 0x34($sp) -/* CB9FEC 80240DEC C7A60028 */ lwc1 $f6, 0x28($sp) -/* CB9FF0 80240DF0 4600E003 */ div.s $f0, $f28, $f0 -/* CB9FF4 80240DF4 46003182 */ mul.s $f6, $f6, $f0 -/* CB9FF8 80240DF8 00000000 */ nop -/* CB9FFC 80240DFC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* CBA000 80240E00 46000087 */ neg.s $f2, $f0 -/* CBA004 80240E04 46022102 */ mul.s $f4, $f4, $f2 -/* CBA008 80240E08 00000000 */ nop -/* CBA00C 80240E0C C7A20030 */ lwc1 $f2, 0x30($sp) -/* CBA010 80240E10 46001082 */ mul.s $f2, $f2, $f0 -/* CBA014 80240E14 00000000 */ nop -/* CBA018 80240E18 44804000 */ mtc1 $zero, $f8 -/* CBA01C 80240E1C 00000000 */ nop -/* CBA020 80240E20 4608003C */ c.lt.s $f0, $f8 -/* CBA024 80240E24 E7A00034 */ swc1 $f0, 0x34($sp) -/* CBA028 80240E28 E7A60028 */ swc1 $f6, 0x28($sp) -/* CBA02C 80240E2C E7A4002C */ swc1 $f4, 0x2c($sp) -/* CBA030 80240E30 45000003 */ bc1f .L80240E40 -/* CBA034 80240E34 E7A20030 */ swc1 $f2, 0x30($sp) -/* CBA038 80240E38 E7BC0028 */ swc1 $f28, 0x28($sp) -/* CBA03C 80240E3C E7BC002C */ swc1 $f28, 0x2c($sp) -.L80240E40: -/* CBA040 80240E40 C7A20028 */ lwc1 $f2, 0x28($sp) -/* CBA044 80240E44 4618103C */ c.lt.s $f2, $f24 -/* CBA048 80240E48 00000000 */ nop -/* CBA04C 80240E4C 45030001 */ bc1tl .L80240E54 -/* CBA050 80240E50 46001606 */ mov.s $f24, $f2 -.L80240E54: -/* CBA054 80240E54 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CBA058 80240E58 461A003C */ c.lt.s $f0, $f26 -/* CBA05C 80240E5C 00000000 */ nop -/* CBA060 80240E60 45030001 */ bc1tl .L80240E68 -/* CBA064 80240E64 46000686 */ mov.s $f26, $f0 -.L80240E68: -/* CBA068 80240E68 4602A03C */ c.lt.s $f20, $f2 -/* CBA06C 80240E6C 00000000 */ nop -/* CBA070 80240E70 45030001 */ bc1tl .L80240E78 -/* CBA074 80240E74 46001506 */ mov.s $f20, $f2 -.L80240E78: -/* CBA078 80240E78 4600B03C */ c.lt.s $f22, $f0 -/* CBA07C 80240E7C 00000000 */ nop -/* CBA080 80240E80 45030001 */ bc1tl .L80240E88 -/* CBA084 80240E84 46000586 */ mov.s $f22, $f0 -.L80240E88: -/* CBA088 80240E88 4614C032 */ c.eq.s $f24, $f20 -/* CBA08C 80240E8C 00000000 */ nop -/* CBA090 80240E90 45000005 */ bc1f .L80240EA8 -/* CBA094 80240E94 00000000 */ nop -/* CBA098 80240E98 4616D032 */ c.eq.s $f26, $f22 -/* CBA09C 80240E9C 00000000 */ nop -/* CBA0A0 80240EA0 450100CE */ bc1t .L802411DC -/* CBA0A4 80240EA4 00000000 */ nop -.L80240EA8: -/* CBA0A8 80240EA8 86E2000A */ lh $v0, 0xa($s7) -/* CBA0AC 80240EAC 44821000 */ mtc1 $v0, $f2 -/* CBA0B0 80240EB0 00000000 */ nop -/* CBA0B4 80240EB4 468010A0 */ cvt.s.w $f2, $f2 -/* CBA0B8 80240EB8 4602C002 */ mul.s $f0, $f24, $f2 -/* CBA0BC 80240EBC 00000000 */ nop -/* CBA0C0 80240EC0 46020000 */ add.s $f0, $f0, $f2 -/* CBA0C4 80240EC4 3C013F00 */ lui $at, 0x3f00 -/* CBA0C8 80240EC8 44813000 */ mtc1 $at, $f6 -/* CBA0CC 80240ECC 00000000 */ nop -/* CBA0D0 80240ED0 46060602 */ mul.s $f24, $f0, $f6 -/* CBA0D4 80240ED4 00000000 */ nop -/* CBA0D8 80240ED8 86E2000C */ lh $v0, 0xc($s7) -/* CBA0DC 80240EDC 44822000 */ mtc1 $v0, $f4 -/* CBA0E0 80240EE0 00000000 */ nop -/* CBA0E4 80240EE4 46802120 */ cvt.s.w $f4, $f4 -/* CBA0E8 80240EE8 4604D002 */ mul.s $f0, $f26, $f4 -/* CBA0EC 80240EEC 00000000 */ nop -/* CBA0F0 80240EF0 46040000 */ add.s $f0, $f0, $f4 -/* CBA0F4 80240EF4 3C18E300 */ lui $t8, 0xe300 -/* CBA0F8 80240EF8 37180A01 */ ori $t8, $t8, 0xa01 -/* CBA0FC 80240EFC 46060682 */ mul.s $f26, $f0, $f6 -/* CBA100 80240F00 00000000 */ nop -/* CBA104 80240F04 3C14E200 */ lui $s4, 0xe200 -/* CBA108 80240F08 3694001C */ ori $s4, $s4, 0x1c -/* CBA10C 80240F0C 3C060F0A */ lui $a2, 0xf0a -/* CBA110 80240F10 34C64010 */ ori $a2, $a2, 0x4010 -/* CBA114 80240F14 4602A002 */ mul.s $f0, $f20, $f2 -/* CBA118 80240F18 00000000 */ nop -/* CBA11C 80240F1C 3C13FF10 */ lui $s3, 0xff10 -/* CBA120 80240F20 3673013F */ ori $s3, $s3, 0x13f -/* CBA124 80240F24 3C15FCFF */ lui $s5, 0xfcff -/* CBA128 80240F28 36B5FFFF */ ori $s5, $s5, 0xffff -/* CBA12C 80240F2C 46020000 */ add.s $f0, $f0, $f2 -/* CBA130 80240F30 3C16E200 */ lui $s6, 0xe200 -/* CBA134 80240F34 36D61D00 */ ori $s6, $s6, 0x1d00 -/* CBA138 80240F38 46060502 */ mul.s $f20, $f0, $f6 -/* CBA13C 80240F3C 00000000 */ nop -/* CBA140 80240F40 3C04800A */ lui $a0, %hi(nuGfxZBuffer) -/* CBA144 80240F44 8C84A5DC */ lw $a0, %lo(nuGfxZBuffer)($a0) -/* CBA148 80240F48 3C12800A */ lui $s2, 0x800a -/* CBA14C 80240F4C 2652A66C */ addiu $s2, $s2, -0x5994 -/* CBA150 80240F50 AFB8003C */ sw $t8, 0x3c($sp) -/* CBA154 80240F54 8E510000 */ lw $s1, ($s2) -/* CBA158 80240F58 4604B002 */ mul.s $f0, $f22, $f4 -/* CBA15C 80240F5C 00000000 */ nop -/* CBA160 80240F60 86E3000E */ lh $v1, 0xe($s7) -/* CBA164 80240F64 86E50010 */ lh $a1, 0x10($s7) -/* CBA168 80240F68 0220102D */ daddu $v0, $s1, $zero -/* CBA16C 80240F6C 26310008 */ addiu $s1, $s1, 8 -/* CBA170 80240F70 46040000 */ add.s $f0, $f0, $f4 -/* CBA174 80240F74 AE510000 */ sw $s1, ($s2) -/* CBA178 80240F78 AC580000 */ sw $t8, ($v0) -/* CBA17C 80240F7C 46060582 */ mul.s $f22, $f0, $f6 -/* CBA180 80240F80 00000000 */ nop -/* CBA184 80240F84 AC400004 */ sw $zero, 4($v0) -/* CBA188 80240F88 26220008 */ addiu $v0, $s1, 8 -/* CBA18C 80240F8C AE420000 */ sw $v0, ($s2) -/* CBA190 80240F90 44851000 */ mtc1 $a1, $f2 -/* CBA194 80240F94 00000000 */ nop -/* CBA198 80240F98 468010A0 */ cvt.s.w $f2, $f2 -/* CBA19C 80240F9C 4602D680 */ add.s $f26, $f26, $f2 -/* CBA1A0 80240FA0 26220010 */ addiu $v0, $s1, 0x10 -/* CBA1A4 80240FA4 44830000 */ mtc1 $v1, $f0 -/* CBA1A8 80240FA8 00000000 */ nop -/* CBA1AC 80240FAC 46800020 */ cvt.s.w $f0, $f0 -/* CBA1B0 80240FB0 4600C600 */ add.s $f24, $f24, $f0 -/* CBA1B4 80240FB4 AE340000 */ sw $s4, ($s1) -/* CBA1B8 80240FB8 AE260004 */ sw $a2, 4($s1) -/* CBA1BC 80240FBC 4600A500 */ add.s $f20, $f20, $f0 -/* CBA1C0 80240FC0 AE420000 */ sw $v0, ($s2) -/* CBA1C4 80240FC4 AE330008 */ sw $s3, 8($s1) -/* CBA1C8 80240FC8 0C0187A4 */ jal osVirtualToPhysical -/* CBA1CC 80240FCC 4602B580 */ add.s $f22, $f22, $f2 -/* CBA1D0 80240FD0 3C03FFFD */ lui $v1, 0xfffd -/* CBA1D4 80240FD4 3463FEFF */ ori $v1, $v1, 0xfeff -/* CBA1D8 80240FD8 3C05F8F0 */ lui $a1, 0xf8f0 -/* CBA1DC 80240FDC 8E500000 */ lw $s0, ($s2) -/* CBA1E0 80240FE0 34A5F000 */ ori $a1, $a1, 0xf000 -/* CBA1E4 80240FE4 AE22000C */ sw $v0, 0xc($s1) -/* CBA1E8 80240FE8 3C11E700 */ lui $s1, 0xe700 -/* CBA1EC 80240FEC 3C04800A */ lui $a0, 0x800a -/* CBA1F0 80240FF0 8C84A64C */ lw $a0, -0x59b4($a0) -/* CBA1F4 80240FF4 0200102D */ daddu $v0, $s0, $zero -/* CBA1F8 80240FF8 26100008 */ addiu $s0, $s0, 8 -/* CBA1FC 80240FFC AE500000 */ sw $s0, ($s2) -/* CBA200 80241000 AC550000 */ sw $s5, ($v0) -/* CBA204 80241004 AC430004 */ sw $v1, 4($v0) -/* CBA208 80241008 26020008 */ addiu $v0, $s0, 8 -/* CBA20C 8024100C AE420000 */ sw $v0, ($s2) -/* CBA210 80241010 3C02FA00 */ lui $v0, 0xfa00 -/* CBA214 80241014 AE020000 */ sw $v0, ($s0) -/* CBA218 80241018 26020010 */ addiu $v0, $s0, 0x10 -/* CBA21C 8024101C AE050004 */ sw $a1, 4($s0) -/* CBA220 80241020 AE420000 */ sw $v0, ($s2) -/* CBA224 80241024 3C02DE00 */ lui $v0, 0xde00 -/* CBA228 80241028 AE110008 */ sw $s1, 8($s0) -/* CBA22C 8024102C AE00000C */ sw $zero, 0xc($s0) -/* CBA230 80241030 AE020010 */ sw $v0, 0x10($s0) -/* CBA234 80241034 8FC30008 */ lw $v1, 8($fp) -/* CBA238 80241038 26020018 */ addiu $v0, $s0, 0x18 -/* CBA23C 8024103C AE420000 */ sw $v0, ($s2) -/* CBA240 80241040 8C630004 */ lw $v1, 4($v1) -/* CBA244 80241044 26020020 */ addiu $v0, $s0, 0x20 -/* CBA248 80241048 AE420000 */ sw $v0, ($s2) -/* CBA24C 8024104C 8C630000 */ lw $v1, ($v1) -/* CBA250 80241050 26020028 */ addiu $v0, $s0, 0x28 -/* CBA254 80241054 AE420000 */ sw $v0, ($s2) -/* CBA258 80241058 AE110018 */ sw $s1, 0x18($s0) -/* CBA25C 8024105C AE00001C */ sw $zero, 0x1c($s0) -/* CBA260 80241060 AE130020 */ sw $s3, 0x20($s0) -/* CBA264 80241064 0C0187A4 */ jal osVirtualToPhysical -/* CBA268 80241068 AE030014 */ sw $v1, 0x14($s0) -/* CBA26C 8024106C 3C090050 */ lui $t1, 0x50 -/* CBA270 80241070 35294E50 */ ori $t1, $t1, 0x4e50 -/* CBA274 80241074 3C0AE300 */ lui $t2, 0xe300 -/* CBA278 80241078 354A1201 */ ori $t2, $t2, 0x1201 -/* CBA27C 8024107C 3C0BE300 */ lui $t3, 0xe300 -/* CBA280 80241080 356B0C00 */ ori $t3, $t3, 0xc00 -/* CBA284 80241084 3C0CD700 */ lui $t4, 0xd700 -/* CBA288 80241088 358C0002 */ ori $t4, $t4, 2 -/* CBA28C 8024108C 3C0DE300 */ lui $t5, 0xe300 -/* CBA290 80241090 35AD1001 */ ori $t5, $t5, 0x1001 -/* CBA294 80241094 3C0EE300 */ lui $t6, 0xe300 -/* CBA298 80241098 35CE0D01 */ ori $t6, $t6, 0xd01 -/* CBA29C 8024109C 3C0FE300 */ lui $t7, 0xe300 -/* CBA2A0 802410A0 35EF0F00 */ ori $t7, $t7, 0xf00 -/* CBA2A4 802410A4 3C13FFFC */ lui $s3, 0xfffc -/* CBA2A8 802410A8 3673F67B */ ori $s3, $s3, 0xf67b -/* CBA2AC 802410AC 4600C20D */ trunc.w.s $f8, $f24 -/* CBA2B0 802410B0 44044000 */ mfc1 $a0, $f8 -/* CBA2B4 802410B4 4600D20D */ trunc.w.s $f8, $f26 -/* CBA2B8 802410B8 44054000 */ mfc1 $a1, $f8 -/* CBA2BC 802410BC 4600A20D */ trunc.w.s $f8, $f20 -/* CBA2C0 802410C0 44064000 */ mfc1 $a2, $f8 -/* CBA2C4 802410C4 8E430000 */ lw $v1, ($s2) -/* CBA2C8 802410C8 4600B20D */ trunc.w.s $f8, $f22 -/* CBA2CC 802410CC 44074000 */ mfc1 $a3, $f8 -/* CBA2D0 802410D0 AE020024 */ sw $v0, 0x24($s0) -/* CBA2D4 802410D4 24020004 */ addiu $v0, $zero, 4 -/* CBA2D8 802410D8 0060402D */ daddu $t0, $v1, $zero -/* CBA2DC 802410DC 24630008 */ addiu $v1, $v1, 8 -/* CBA2E0 802410E0 AE430000 */ sw $v1, ($s2) -/* CBA2E4 802410E4 AD020004 */ sw $v0, 4($t0) -/* CBA2E8 802410E8 24620008 */ addiu $v0, $v1, 8 -/* CBA2EC 802410EC AD160000 */ sw $s6, ($t0) -/* CBA2F0 802410F0 AE420000 */ sw $v0, ($s2) -/* CBA2F4 802410F4 3C02EE00 */ lui $v0, 0xee00 -/* CBA2F8 802410F8 AC620000 */ sw $v0, ($v1) -/* CBA2FC 802410FC 3C027FDE */ lui $v0, 0x7fde -/* CBA300 80241100 AC620004 */ sw $v0, 4($v1) -/* CBA304 80241104 24620010 */ addiu $v0, $v1, 0x10 -/* CBA308 80241108 AE420000 */ sw $v0, ($s2) -/* CBA30C 8024110C 24620018 */ addiu $v0, $v1, 0x18 -/* CBA310 80241110 AC740008 */ sw $s4, 8($v1) -/* CBA314 80241114 AC69000C */ sw $t1, 0xc($v1) -/* CBA318 80241118 AE420000 */ sw $v0, ($s2) -/* CBA31C 8024111C 24620020 */ addiu $v0, $v1, 0x20 -/* CBA320 80241120 AC6A0010 */ sw $t2, 0x10($v1) -/* CBA324 80241124 AC600014 */ sw $zero, 0x14($v1) -/* CBA328 80241128 AE420000 */ sw $v0, ($s2) -/* CBA32C 8024112C 24620028 */ addiu $v0, $v1, 0x28 -/* CBA330 80241130 AC6B0018 */ sw $t3, 0x18($v1) -/* CBA334 80241134 AC60001C */ sw $zero, 0x1c($v1) -/* CBA338 80241138 AE420000 */ sw $v0, ($s2) -/* CBA33C 8024113C 2402FFFF */ addiu $v0, $zero, -1 -/* CBA340 80241140 AC620024 */ sw $v0, 0x24($v1) -/* CBA344 80241144 24620030 */ addiu $v0, $v1, 0x30 -/* CBA348 80241148 AC6C0020 */ sw $t4, 0x20($v1) -/* CBA34C 8024114C AE420000 */ sw $v0, ($s2) -/* CBA350 80241150 24620038 */ addiu $v0, $v1, 0x38 -/* CBA354 80241154 AC6D0028 */ sw $t5, 0x28($v1) -/* CBA358 80241158 AC60002C */ sw $zero, 0x2c($v1) -/* CBA35C 8024115C AE420000 */ sw $v0, ($s2) -/* CBA360 80241160 24620040 */ addiu $v0, $v1, 0x40 -/* CBA364 80241164 AC6E0030 */ sw $t6, 0x30($v1) -/* CBA368 80241168 AC600034 */ sw $zero, 0x34($v1) -/* CBA36C 8024116C AE420000 */ sw $v0, ($s2) -/* CBA370 80241170 24620048 */ addiu $v0, $v1, 0x48 -/* CBA374 80241174 AC6F0038 */ sw $t7, 0x38($v1) -/* CBA378 80241178 AC60003C */ sw $zero, 0x3c($v1) -/* CBA37C 8024117C AE420000 */ sw $v0, ($s2) -/* CBA380 80241180 24620050 */ addiu $v0, $v1, 0x50 -/* CBA384 80241184 AC750040 */ sw $s5, 0x40($v1) -/* CBA388 80241188 AC730044 */ sw $s3, 0x44($v1) -/* CBA38C 8024118C AE420000 */ sw $v0, ($s2) -/* CBA390 80241190 AC710048 */ sw $s1, 0x48($v1) -/* CBA394 80241194 0C09012C */ jal func_802404B0 -/* CBA398 80241198 AC60004C */ sw $zero, 0x4c($v1) -/* CBA39C 8024119C 8E420000 */ lw $v0, ($s2) -/* CBA3A0 802411A0 0040182D */ daddu $v1, $v0, $zero -/* CBA3A4 802411A4 24420008 */ addiu $v0, $v0, 8 -/* CBA3A8 802411A8 AE420000 */ sw $v0, ($s2) -/* CBA3AC 802411AC AC710000 */ sw $s1, ($v1) -/* CBA3B0 802411B0 AC600004 */ sw $zero, 4($v1) -/* CBA3B4 802411B4 24430008 */ addiu $v1, $v0, 8 -/* CBA3B8 802411B8 AE430000 */ sw $v1, ($s2) -/* CBA3BC 802411BC 8FB8003C */ lw $t8, 0x3c($sp) -/* CBA3C0 802411C0 3C030010 */ lui $v1, 0x10 -/* CBA3C4 802411C4 AC580000 */ sw $t8, ($v0) -/* CBA3C8 802411C8 AC430004 */ sw $v1, 4($v0) -/* CBA3CC 802411CC 24430010 */ addiu $v1, $v0, 0x10 -/* CBA3D0 802411D0 AE430000 */ sw $v1, ($s2) -/* CBA3D4 802411D4 AC560008 */ sw $s6, 8($v0) -/* CBA3D8 802411D8 AC40000C */ sw $zero, 0xc($v0) -.L802411DC: -/* CBA3DC 802411DC 8FBF0064 */ lw $ra, 0x64($sp) -/* CBA3E0 802411E0 8FBE0060 */ lw $fp, 0x60($sp) -/* CBA3E4 802411E4 8FB7005C */ lw $s7, 0x5c($sp) -/* CBA3E8 802411E8 8FB60058 */ lw $s6, 0x58($sp) -/* CBA3EC 802411EC 8FB50054 */ lw $s5, 0x54($sp) -/* CBA3F0 802411F0 8FB40050 */ lw $s4, 0x50($sp) -/* CBA3F4 802411F4 8FB3004C */ lw $s3, 0x4c($sp) -/* CBA3F8 802411F8 8FB20048 */ lw $s2, 0x48($sp) -/* CBA3FC 802411FC 8FB10044 */ lw $s1, 0x44($sp) -/* CBA400 80241200 8FB00040 */ lw $s0, 0x40($sp) -/* CBA404 80241204 D7BE0090 */ ldc1 $f30, 0x90($sp) -/* CBA408 80241208 D7BC0088 */ ldc1 $f28, 0x88($sp) -/* CBA40C 8024120C D7BA0080 */ ldc1 $f26, 0x80($sp) -/* CBA410 80241210 D7B80078 */ ldc1 $f24, 0x78($sp) -/* CBA414 80241214 D7B60070 */ ldc1 $f22, 0x70($sp) -/* CBA418 80241218 D7B40068 */ ldc1 $f20, 0x68($sp) -/* CBA41C 8024121C 03E00008 */ jr $ra -/* CBA420 80241220 27BD0098 */ addiu $sp, $sp, 0x98 -/* CBA424 80241224 00000000 */ nop -/* CBA428 80241228 00000000 */ nop -/* CBA42C 8024122C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_10/func_802412A0_CB9200.s b/asm/nonmatchings/world/area_flo/flo_10/func_802412A0_CB9200.s deleted file mode 100644 index 6b8ffdce6c..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_10/func_802412A0_CB9200.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412A0_CBA4A0 -/* CBA4A0 802412A0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* CBA4A4 802412A4 AFB10054 */ sw $s1, 0x54($sp) -/* CBA4A8 802412A8 0080882D */ daddu $s1, $a0, $zero -/* CBA4AC 802412AC AFBF005C */ sw $ra, 0x5c($sp) -/* CBA4B0 802412B0 AFB20058 */ sw $s2, 0x58($sp) -/* CBA4B4 802412B4 AFB00050 */ sw $s0, 0x50($sp) -/* CBA4B8 802412B8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* CBA4BC 802412BC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CBA4C0 802412C0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CBA4C4 802412C4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* CBA4C8 802412C8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CBA4CC 802412CC 8E30000C */ lw $s0, 0xc($s1) -/* CBA4D0 802412D0 8E050000 */ lw $a1, ($s0) -/* CBA4D4 802412D4 0C0B1EAF */ jal get_variable -/* CBA4D8 802412D8 26100004 */ addiu $s0, $s0, 4 -/* CBA4DC 802412DC 0C046C04 */ jal get_model_list_index_from_tree_index -/* CBA4E0 802412E0 0040202D */ daddu $a0, $v0, $zero -/* CBA4E4 802412E4 8E050000 */ lw $a1, ($s0) -/* CBA4E8 802412E8 26100004 */ addiu $s0, $s0, 4 -/* CBA4EC 802412EC 0220202D */ daddu $a0, $s1, $zero -/* CBA4F0 802412F0 0C0B210B */ jal get_float_variable -/* CBA4F4 802412F4 0040902D */ daddu $s2, $v0, $zero -/* CBA4F8 802412F8 8E050000 */ lw $a1, ($s0) -/* CBA4FC 802412FC 26100004 */ addiu $s0, $s0, 4 -/* CBA500 80241300 0220202D */ daddu $a0, $s1, $zero -/* CBA504 80241304 0C0B210B */ jal get_float_variable -/* CBA508 80241308 46000706 */ mov.s $f28, $f0 -/* CBA50C 8024130C 8E050000 */ lw $a1, ($s0) -/* CBA510 80241310 26100004 */ addiu $s0, $s0, 4 -/* CBA514 80241314 0220202D */ daddu $a0, $s1, $zero -/* CBA518 80241318 0C0B210B */ jal get_float_variable -/* CBA51C 8024131C 46000686 */ mov.s $f26, $f0 -/* CBA520 80241320 0220202D */ daddu $a0, $s1, $zero -/* CBA524 80241324 8E050000 */ lw $a1, ($s0) -/* CBA528 80241328 0C0B210B */ jal get_float_variable -/* CBA52C 8024132C 46000586 */ mov.s $f22, $f0 -/* CBA530 80241330 0240202D */ daddu $a0, $s2, $zero -/* CBA534 80241334 0C046B4C */ jal get_model_from_list_index -/* CBA538 80241338 46000606 */ mov.s $f24, $f0 -/* CBA53C 8024133C 0040882D */ daddu $s1, $v0, $zero -/* CBA540 80241340 96220000 */ lhu $v0, ($s1) -/* CBA544 80241344 30420400 */ andi $v0, $v0, 0x400 -/* CBA548 80241348 1440001E */ bnez $v0, .L802413C4 -/* CBA54C 8024134C 26300058 */ addiu $s0, $s1, 0x58 -/* CBA550 80241350 4480A000 */ mtc1 $zero, $f20 -/* CBA554 80241354 4406B000 */ mfc1 $a2, $f22 -/* CBA558 80241358 4405A000 */ mfc1 $a1, $f20 -/* CBA55C 8024135C 4407A000 */ mfc1 $a3, $f20 -/* CBA560 80241360 0C019E40 */ jal guTranslateF -/* CBA564 80241364 0200202D */ daddu $a0, $s0, $zero -/* CBA568 80241368 4405E000 */ mfc1 $a1, $f28 -/* CBA56C 8024136C 4406D000 */ mfc1 $a2, $f26 -/* CBA570 80241370 4407C000 */ mfc1 $a3, $f24 -/* CBA574 80241374 0C09048C */ jal func_80241230 -/* CBA578 80241378 27A40010 */ addiu $a0, $sp, 0x10 -/* CBA57C 8024137C 27A40010 */ addiu $a0, $sp, 0x10 -/* CBA580 80241380 0200282D */ daddu $a1, $s0, $zero -/* CBA584 80241384 0C019D80 */ jal guMtxCatF -/* CBA588 80241388 0200302D */ daddu $a2, $s0, $zero -/* CBA58C 8024138C 27A40010 */ addiu $a0, $sp, 0x10 -/* CBA590 80241390 4600B587 */ neg.s $f22, $f22 -/* CBA594 80241394 4405A000 */ mfc1 $a1, $f20 -/* CBA598 80241398 4406B000 */ mfc1 $a2, $f22 -/* CBA59C 8024139C 0C019E40 */ jal guTranslateF -/* CBA5A0 802413A0 00A0382D */ daddu $a3, $a1, $zero -/* CBA5A4 802413A4 27A40010 */ addiu $a0, $sp, 0x10 -/* CBA5A8 802413A8 0200282D */ daddu $a1, $s0, $zero -/* CBA5AC 802413AC 0C019D80 */ jal guMtxCatF -/* CBA5B0 802413B0 00A0302D */ daddu $a2, $a1, $zero -/* CBA5B4 802413B4 96220000 */ lhu $v0, ($s1) -/* CBA5B8 802413B8 34421400 */ ori $v0, $v0, 0x1400 -/* CBA5BC 802413BC 0809050F */ j .L8024143C -/* CBA5C0 802413C0 A6220000 */ sh $v0, ($s1) -.L802413C4: -/* CBA5C4 802413C4 4480A000 */ mtc1 $zero, $f20 -/* CBA5C8 802413C8 4406B000 */ mfc1 $a2, $f22 -/* CBA5CC 802413CC 4405A000 */ mfc1 $a1, $f20 -/* CBA5D0 802413D0 4407A000 */ mfc1 $a3, $f20 -/* CBA5D4 802413D4 0C019E40 */ jal guTranslateF -/* CBA5D8 802413D8 27A40010 */ addiu $a0, $sp, 0x10 -/* CBA5DC 802413DC 27A40010 */ addiu $a0, $sp, 0x10 -/* CBA5E0 802413E0 26300058 */ addiu $s0, $s1, 0x58 -/* CBA5E4 802413E4 0200282D */ daddu $a1, $s0, $zero -/* CBA5E8 802413E8 0C019D80 */ jal guMtxCatF -/* CBA5EC 802413EC 0200302D */ daddu $a2, $s0, $zero -/* CBA5F0 802413F0 4405E000 */ mfc1 $a1, $f28 -/* CBA5F4 802413F4 4406D000 */ mfc1 $a2, $f26 -/* CBA5F8 802413F8 4407C000 */ mfc1 $a3, $f24 -/* CBA5FC 802413FC 0C09048C */ jal func_80241230 -/* CBA600 80241400 27A40010 */ addiu $a0, $sp, 0x10 -/* CBA604 80241404 27A40010 */ addiu $a0, $sp, 0x10 -/* CBA608 80241408 0200282D */ daddu $a1, $s0, $zero -/* CBA60C 8024140C 0C019D80 */ jal guMtxCatF -/* CBA610 80241410 0200302D */ daddu $a2, $s0, $zero -/* CBA614 80241414 27A40010 */ addiu $a0, $sp, 0x10 -/* CBA618 80241418 4600B587 */ neg.s $f22, $f22 -/* CBA61C 8024141C 4405A000 */ mfc1 $a1, $f20 -/* CBA620 80241420 4406B000 */ mfc1 $a2, $f22 -/* CBA624 80241424 0C019E40 */ jal guTranslateF -/* CBA628 80241428 00A0382D */ daddu $a3, $a1, $zero -/* CBA62C 8024142C 27A40010 */ addiu $a0, $sp, 0x10 -/* CBA630 80241430 0200282D */ daddu $a1, $s0, $zero -/* CBA634 80241434 0C019D80 */ jal guMtxCatF -/* CBA638 80241438 00A0302D */ daddu $a2, $a1, $zero -.L8024143C: -/* CBA63C 8024143C 8FBF005C */ lw $ra, 0x5c($sp) -/* CBA640 80241440 8FB20058 */ lw $s2, 0x58($sp) -/* CBA644 80241444 8FB10054 */ lw $s1, 0x54($sp) -/* CBA648 80241448 8FB00050 */ lw $s0, 0x50($sp) -/* CBA64C 8024144C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* CBA650 80241450 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CBA654 80241454 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CBA658 80241458 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CBA65C 8024145C D7B40060 */ ldc1 $f20, 0x60($sp) -/* CBA660 80241460 24020002 */ addiu $v0, $zero, 2 -/* CBA664 80241464 03E00008 */ jr $ra -/* CBA668 80241468 27BD0088 */ addiu $sp, $sp, 0x88 -/* CBA66C 8024146C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_11/func_80240020_CBDCD0.s b/asm/nonmatchings/world/area_flo/flo_11/func_80240020_CBDCD0.s deleted file mode 100644 index e9c240c011..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_11/func_80240020_CBDCD0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_CBDCF0 -/* CBDCF0 80240020 3C028016 */ lui $v0, 0x8016 -/* CBDCF4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* CBDCF8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* CBDCFC 8024002C 03E00008 */ jr $ra -/* CBDD00 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_flo/flo_11/func_80240034_CBDCD0.s b/asm/nonmatchings/world/area_flo/flo_11/func_80240034_CBDCD0.s deleted file mode 100644 index 3fdb9b44cb..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_11/func_80240034_CBDCD0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_CBDD04 -/* CBDD04 80240034 3C038016 */ lui $v1, 0x8016 -/* CBDD08 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* CBDD0C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CBDD10 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* CBDD14 80240044 0080802D */ daddu $s0, $a0, $zero -/* CBDD18 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* CBDD1C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* CBDD20 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* CBDD24 80240054 24020002 */ addiu $v0, $zero, 2 -/* CBDD28 80240058 08090038 */ j .L802400E0 -/* CBDD2C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* CBDD30 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* CBDD34 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* CBDD38 80240068 80620040 */ lb $v0, 0x40($v1) -/* CBDD3C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* CBDD40 80240070 04420001 */ bltzl $v0, .L80240078 -/* CBDD44 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* CBDD48 80240078 14400003 */ bnez $v0, .L80240088 -/* CBDD4C 8024007C 00000000 */ nop -/* CBDD50 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* CBDD54 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* CBDD58 80240088 44822000 */ mtc1 $v0, $f4 -/* CBDD5C 8024008C 00000000 */ nop -/* CBDD60 80240090 46802120 */ cvt.s.w $f4, $f4 -/* CBDD64 80240094 44062000 */ mfc1 $a2, $f4 -/* CBDD68 80240098 44872000 */ mtc1 $a3, $f4 -/* CBDD6C 8024009C 00000000 */ nop -/* CBDD70 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* CBDD74 802400A4 44806000 */ mtc1 $zero, $f12 -/* CBDD78 802400A8 44072000 */ mfc1 $a3, $f4 -/* CBDD7C 802400AC 0C00A720 */ jal atan2 -/* CBDD80 802400B0 46006386 */ mov.s $f14, $f12 -/* CBDD84 802400B4 3C014270 */ lui $at, 0x4270 -/* CBDD88 802400B8 44811000 */ mtc1 $at, $f2 -/* CBDD8C 802400BC 00000000 */ nop -/* CBDD90 802400C0 4602003C */ c.lt.s $f0, $f2 -/* CBDD94 802400C4 00000000 */ nop -/* CBDD98 802400C8 45000004 */ bc1f .L802400DC -/* CBDD9C 802400CC 24020001 */ addiu $v0, $zero, 1 -/* CBDDA0 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* CBDDA4 802400D4 08090038 */ j .L802400E0 -/* CBDDA8 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* CBDDAC 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* CBDDB0 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* CBDDB4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* CBDDB8 802400E8 03E00008 */ jr $ra -/* CBDDBC 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_11/func_802400F0_CBDCD0.s b/asm/nonmatchings/world/area_flo/flo_11/func_802400F0_CBDCD0.s deleted file mode 100644 index 4ae194fc45..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_11/func_802400F0_CBDCD0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_CBDDC0 -/* CBDDC0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CBDDC4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* CBDDC8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* CBDDCC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* CBDDD0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* CBDDD4 80240104 0C016AFA */ jal get_current_map_header -/* CBDDD8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* CBDDDC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* CBDDE0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* CBDDE4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* CBDDE8 80240118 0C0B1EAF */ jal get_variable -/* CBDDEC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* CBDDF0 80240120 0220202D */ daddu $a0, $s1, $zero -/* CBDDF4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* CBDDF8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* CBDDFC 8024012C 00028100 */ sll $s0, $v0, 4 -/* CBDE00 80240130 02031821 */ addu $v1, $s0, $v1 -/* CBDE04 80240134 C4600000 */ lwc1 $f0, ($v1) -/* CBDE08 80240138 4600008D */ trunc.w.s $f2, $f0 -/* CBDE0C 8024013C 44061000 */ mfc1 $a2, $f2 -/* CBDE10 80240140 0C0B2026 */ jal set_variable -/* CBDE14 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* CBDE18 80240148 0220202D */ daddu $a0, $s1, $zero -/* CBDE1C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* CBDE20 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* CBDE24 80240154 02021021 */ addu $v0, $s0, $v0 -/* CBDE28 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* CBDE2C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* CBDE30 80240160 44061000 */ mfc1 $a2, $f2 -/* CBDE34 80240164 0C0B2026 */ jal set_variable -/* CBDE38 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* CBDE3C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* CBDE40 80240170 8E420014 */ lw $v0, 0x14($s2) -/* CBDE44 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* CBDE48 80240178 02021021 */ addu $v0, $s0, $v0 -/* CBDE4C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* CBDE50 80240180 4600008D */ trunc.w.s $f2, $f0 -/* CBDE54 80240184 44061000 */ mfc1 $a2, $f2 -/* CBDE58 80240188 0C0B2026 */ jal set_variable -/* CBDE5C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* CBDE60 80240190 0220202D */ daddu $a0, $s1, $zero -/* CBDE64 80240194 8E420014 */ lw $v0, 0x14($s2) -/* CBDE68 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* CBDE6C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* CBDE70 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* CBDE74 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* CBDE78 802401A8 44061000 */ mfc1 $a2, $f2 -/* CBDE7C 802401AC 0C0B2026 */ jal set_variable -/* CBDE80 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* CBDE84 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* CBDE88 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* CBDE8C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* CBDE90 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* CBDE94 802401C4 24020002 */ addiu $v0, $zero, 2 -/* CBDE98 802401C8 03E00008 */ jr $ra -/* CBDE9C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_11/func_802401D0_CBDCD0.s b/asm/nonmatchings/world/area_flo/flo_11/func_802401D0_CBDCD0.s deleted file mode 100644 index d65378554e..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_11/func_802401D0_CBDCD0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_CBDEA0 -/* CBDEA0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* CBDEA4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CBDEA8 802401D8 3C014334 */ lui $at, 0x4334 -/* CBDEAC 802401DC 44816000 */ mtc1 $at, $f12 -/* CBDEB0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CBDEB4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* CBDEB8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* CBDEBC 802401EC 00031080 */ sll $v0, $v1, 2 -/* CBDEC0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* CBDEC4 802401F4 00021080 */ sll $v0, $v0, 2 -/* CBDEC8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* CBDECC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* CBDED0 80240200 00431021 */ addu $v0, $v0, $v1 -/* CBDED4 80240204 000210C0 */ sll $v0, $v0, 3 -/* CBDED8 80240208 3C01800B */ lui $at, 0x800b -/* CBDEDC 8024020C 00220821 */ addu $at, $at, $v0 -/* CBDEE0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* CBDEE4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* CBDEE8 80240218 0C00A6C9 */ jal clamp_angle -/* CBDEEC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* CBDEF0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* CBDEF4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* CBDEF8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* CBDEFC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* CBDF00 80240230 24020002 */ addiu $v0, $zero, 2 -/* CBDF04 80240234 03E00008 */ jr $ra -/* CBDF08 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_11/func_8024023C_CBDCD0.s b/asm/nonmatchings/world/area_flo/flo_11/func_8024023C_CBDCD0.s deleted file mode 100644 index 2b0515a251..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_11/func_8024023C_CBDCD0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_CBDF0C -/* CBDF0C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CBDF10 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* CBDF14 80240244 0080802D */ daddu $s0, $a0, $zero -/* CBDF18 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* CBDF1C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* CBDF20 80240250 8E02000C */ lw $v0, 0xc($s0) -/* CBDF24 80240254 0C0B210B */ jal get_float_variable -/* CBDF28 80240258 8C450000 */ lw $a1, ($v0) -/* CBDF2C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* CBDF30 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* CBDF34 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* CBDF38 80240268 44060000 */ mfc1 $a2, $f0 -/* CBDF3C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* CBDF40 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* CBDF44 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* CBDF48 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* CBDF4C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* CBDF50 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* CBDF54 80240284 0C00A7E7 */ jal add_vec2D_polar -/* CBDF58 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* CBDF5C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* CBDF60 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* CBDF64 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* CBDF68 80240298 0C0B2190 */ jal set_float_variable -/* CBDF6C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* CBDF70 802402A0 0200202D */ daddu $a0, $s0, $zero -/* CBDF74 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* CBDF78 802402A8 4406A000 */ mfc1 $a2, $f20 -/* CBDF7C 802402AC 0C0B2190 */ jal set_float_variable -/* CBDF80 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* CBDF84 802402B4 0200202D */ daddu $a0, $s0, $zero -/* CBDF88 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* CBDF8C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* CBDF90 802402C0 0C0B2190 */ jal set_float_variable -/* CBDF94 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* CBDF98 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* CBDF9C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* CBDFA0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* CBDFA4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* CBDFA8 802402D8 03E00008 */ jr $ra -/* CBDFAC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_11/func_802402E0_CBDCD0.s b/asm/nonmatchings/world/area_flo/flo_11/func_802402E0_CBDCD0.s deleted file mode 100644 index a478869eb7..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_11/func_802402E0_CBDCD0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_CBDFB0 -/* CBDFB0 802402E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CBDFB4 802402E4 0000202D */ daddu $a0, $zero, $zero -/* CBDFB8 802402E8 0080282D */ daddu $a1, $a0, $zero -/* CBDFBC 802402EC 0080302D */ daddu $a2, $a0, $zero -/* CBDFC0 802402F0 0080382D */ daddu $a3, $a0, $zero -/* CBDFC4 802402F4 AFBF0018 */ sw $ra, 0x18($sp) -/* CBDFC8 802402F8 AFA00010 */ sw $zero, 0x10($sp) -/* CBDFCC 802402FC 0C01CA54 */ jal func_80072950 -/* CBDFD0 80240300 AFA00014 */ sw $zero, 0x14($sp) -/* CBDFD4 80240304 8FBF0018 */ lw $ra, 0x18($sp) -/* CBDFD8 80240308 24020002 */ addiu $v0, $zero, 2 -/* CBDFDC 8024030C 03E00008 */ jr $ra -/* CBDFE0 80240310 27BD0020 */ addiu $sp, $sp, 0x20 -/* CBDFE4 80240314 00000000 */ nop -/* CBDFE8 80240318 00000000 */ nop -/* CBDFEC 8024031C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_12/func_80240040_CC0E30.s b/asm/nonmatchings/world/area_flo/flo_12/func_80240040_CC0E30.s deleted file mode 100644 index 8887a2d287..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_12/func_80240040_CC0E30.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_CC0E70 -/* CC0E70 80240040 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* CC0E74 80240044 F7B40018 */ sdc1 $f20, 0x18($sp) -/* CC0E78 80240048 4485A000 */ mtc1 $a1, $f20 -/* CC0E7C 8024004C F7B60020 */ sdc1 $f22, 0x20($sp) -/* CC0E80 80240050 4486B000 */ mtc1 $a2, $f22 -/* CC0E84 80240054 AFB00010 */ sw $s0, 0x10($sp) -/* CC0E88 80240058 F7B80028 */ sdc1 $f24, 0x28($sp) -/* CC0E8C 8024005C 4487C000 */ mtc1 $a3, $f24 -/* CC0E90 80240060 AFBF0014 */ sw $ra, 0x14($sp) -/* CC0E94 80240064 0C019D28 */ jal guMtxIdentF -/* CC0E98 80240068 0080802D */ daddu $s0, $a0, $zero -/* CC0E9C 8024006C 4616A582 */ mul.s $f22, $f20, $f22 -/* CC0EA0 80240070 00000000 */ nop -/* CC0EA4 80240074 4618A502 */ mul.s $f20, $f20, $f24 -/* CC0EA8 80240078 00000000 */ nop -/* CC0EAC 8024007C 3C013F80 */ lui $at, 0x3f80 -/* CC0EB0 80240080 44810000 */ mtc1 $at, $f0 -/* CC0EB4 80240084 00000000 */ nop -/* CC0EB8 80240088 E6000014 */ swc1 $f0, 0x14($s0) -/* CC0EBC 8024008C E6160010 */ swc1 $f22, 0x10($s0) -/* CC0EC0 80240090 E6140018 */ swc1 $f20, 0x18($s0) -/* CC0EC4 80240094 8FBF0014 */ lw $ra, 0x14($sp) -/* CC0EC8 80240098 8FB00010 */ lw $s0, 0x10($sp) -/* CC0ECC 8024009C D7B80028 */ ldc1 $f24, 0x28($sp) -/* CC0ED0 802400A0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* CC0ED4 802400A4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* CC0ED8 802400A8 03E00008 */ jr $ra -/* CC0EDC 802400AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_flo/flo_12/func_802400B0_CC0E30.s b/asm/nonmatchings/world/area_flo/flo_12/func_802400B0_CC0E30.s deleted file mode 100644 index d8575c2d29..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_12/func_802400B0_CC0E30.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B0_CC0EE0 -/* CC0EE0 802400B0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* CC0EE4 802400B4 AFB10054 */ sw $s1, 0x54($sp) -/* CC0EE8 802400B8 0080882D */ daddu $s1, $a0, $zero -/* CC0EEC 802400BC AFBF005C */ sw $ra, 0x5c($sp) -/* CC0EF0 802400C0 AFB20058 */ sw $s2, 0x58($sp) -/* CC0EF4 802400C4 AFB00050 */ sw $s0, 0x50($sp) -/* CC0EF8 802400C8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* CC0EFC 802400CC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CC0F00 802400D0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CC0F04 802400D4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* CC0F08 802400D8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CC0F0C 802400DC 8E30000C */ lw $s0, 0xc($s1) -/* CC0F10 802400E0 8E050000 */ lw $a1, ($s0) -/* CC0F14 802400E4 0C0B1EAF */ jal get_variable -/* CC0F18 802400E8 26100004 */ addiu $s0, $s0, 4 -/* CC0F1C 802400EC 0C046C04 */ jal get_model_list_index_from_tree_index -/* CC0F20 802400F0 0040202D */ daddu $a0, $v0, $zero -/* CC0F24 802400F4 8E050000 */ lw $a1, ($s0) -/* CC0F28 802400F8 26100004 */ addiu $s0, $s0, 4 -/* CC0F2C 802400FC 0220202D */ daddu $a0, $s1, $zero -/* CC0F30 80240100 0C0B210B */ jal get_float_variable -/* CC0F34 80240104 0040902D */ daddu $s2, $v0, $zero -/* CC0F38 80240108 8E050000 */ lw $a1, ($s0) -/* CC0F3C 8024010C 26100004 */ addiu $s0, $s0, 4 -/* CC0F40 80240110 0220202D */ daddu $a0, $s1, $zero -/* CC0F44 80240114 0C0B210B */ jal get_float_variable -/* CC0F48 80240118 46000706 */ mov.s $f28, $f0 -/* CC0F4C 8024011C 8E050000 */ lw $a1, ($s0) -/* CC0F50 80240120 26100004 */ addiu $s0, $s0, 4 -/* CC0F54 80240124 0220202D */ daddu $a0, $s1, $zero -/* CC0F58 80240128 0C0B210B */ jal get_float_variable -/* CC0F5C 8024012C 46000686 */ mov.s $f26, $f0 -/* CC0F60 80240130 0220202D */ daddu $a0, $s1, $zero -/* CC0F64 80240134 8E050000 */ lw $a1, ($s0) -/* CC0F68 80240138 0C0B210B */ jal get_float_variable -/* CC0F6C 8024013C 46000586 */ mov.s $f22, $f0 -/* CC0F70 80240140 0240202D */ daddu $a0, $s2, $zero -/* CC0F74 80240144 0C046B4C */ jal get_model_from_list_index -/* CC0F78 80240148 46000606 */ mov.s $f24, $f0 -/* CC0F7C 8024014C 0040882D */ daddu $s1, $v0, $zero -/* CC0F80 80240150 96220000 */ lhu $v0, ($s1) -/* CC0F84 80240154 30420400 */ andi $v0, $v0, 0x400 -/* CC0F88 80240158 1440001E */ bnez $v0, .L802401D4 -/* CC0F8C 8024015C 26300058 */ addiu $s0, $s1, 0x58 -/* CC0F90 80240160 4480A000 */ mtc1 $zero, $f20 -/* CC0F94 80240164 4406B000 */ mfc1 $a2, $f22 -/* CC0F98 80240168 4405A000 */ mfc1 $a1, $f20 -/* CC0F9C 8024016C 4407A000 */ mfc1 $a3, $f20 -/* CC0FA0 80240170 0C019E40 */ jal guTranslateF -/* CC0FA4 80240174 0200202D */ daddu $a0, $s0, $zero -/* CC0FA8 80240178 4405E000 */ mfc1 $a1, $f28 -/* CC0FAC 8024017C 4406D000 */ mfc1 $a2, $f26 -/* CC0FB0 80240180 4407C000 */ mfc1 $a3, $f24 -/* CC0FB4 80240184 0C090010 */ jal func_80240040 -/* CC0FB8 80240188 27A40010 */ addiu $a0, $sp, 0x10 -/* CC0FBC 8024018C 27A40010 */ addiu $a0, $sp, 0x10 -/* CC0FC0 80240190 0200282D */ daddu $a1, $s0, $zero -/* CC0FC4 80240194 0C019D80 */ jal guMtxCatF -/* CC0FC8 80240198 0200302D */ daddu $a2, $s0, $zero -/* CC0FCC 8024019C 27A40010 */ addiu $a0, $sp, 0x10 -/* CC0FD0 802401A0 4600B587 */ neg.s $f22, $f22 -/* CC0FD4 802401A4 4405A000 */ mfc1 $a1, $f20 -/* CC0FD8 802401A8 4406B000 */ mfc1 $a2, $f22 -/* CC0FDC 802401AC 0C019E40 */ jal guTranslateF -/* CC0FE0 802401B0 00A0382D */ daddu $a3, $a1, $zero -/* CC0FE4 802401B4 27A40010 */ addiu $a0, $sp, 0x10 -/* CC0FE8 802401B8 0200282D */ daddu $a1, $s0, $zero -/* CC0FEC 802401BC 0C019D80 */ jal guMtxCatF -/* CC0FF0 802401C0 00A0302D */ daddu $a2, $a1, $zero -/* CC0FF4 802401C4 96220000 */ lhu $v0, ($s1) -/* CC0FF8 802401C8 34421400 */ ori $v0, $v0, 0x1400 -/* CC0FFC 802401CC 08090093 */ j .L8024024C -/* CC1000 802401D0 A6220000 */ sh $v0, ($s1) -.L802401D4: -/* CC1004 802401D4 4480A000 */ mtc1 $zero, $f20 -/* CC1008 802401D8 4406B000 */ mfc1 $a2, $f22 -/* CC100C 802401DC 4405A000 */ mfc1 $a1, $f20 -/* CC1010 802401E0 4407A000 */ mfc1 $a3, $f20 -/* CC1014 802401E4 0C019E40 */ jal guTranslateF -/* CC1018 802401E8 27A40010 */ addiu $a0, $sp, 0x10 -/* CC101C 802401EC 27A40010 */ addiu $a0, $sp, 0x10 -/* CC1020 802401F0 26300058 */ addiu $s0, $s1, 0x58 -/* CC1024 802401F4 0200282D */ daddu $a1, $s0, $zero -/* CC1028 802401F8 0C019D80 */ jal guMtxCatF -/* CC102C 802401FC 0200302D */ daddu $a2, $s0, $zero -/* CC1030 80240200 4405E000 */ mfc1 $a1, $f28 -/* CC1034 80240204 4406D000 */ mfc1 $a2, $f26 -/* CC1038 80240208 4407C000 */ mfc1 $a3, $f24 -/* CC103C 8024020C 0C090010 */ jal func_80240040 -/* CC1040 80240210 27A40010 */ addiu $a0, $sp, 0x10 -/* CC1044 80240214 27A40010 */ addiu $a0, $sp, 0x10 -/* CC1048 80240218 0200282D */ daddu $a1, $s0, $zero -/* CC104C 8024021C 0C019D80 */ jal guMtxCatF -/* CC1050 80240220 0200302D */ daddu $a2, $s0, $zero -/* CC1054 80240224 27A40010 */ addiu $a0, $sp, 0x10 -/* CC1058 80240228 4600B587 */ neg.s $f22, $f22 -/* CC105C 8024022C 4405A000 */ mfc1 $a1, $f20 -/* CC1060 80240230 4406B000 */ mfc1 $a2, $f22 -/* CC1064 80240234 0C019E40 */ jal guTranslateF -/* CC1068 80240238 00A0382D */ daddu $a3, $a1, $zero -/* CC106C 8024023C 27A40010 */ addiu $a0, $sp, 0x10 -/* CC1070 80240240 0200282D */ daddu $a1, $s0, $zero -/* CC1074 80240244 0C019D80 */ jal guMtxCatF -/* CC1078 80240248 00A0302D */ daddu $a2, $a1, $zero -.L8024024C: -/* CC107C 8024024C 8FBF005C */ lw $ra, 0x5c($sp) -/* CC1080 80240250 8FB20058 */ lw $s2, 0x58($sp) -/* CC1084 80240254 8FB10054 */ lw $s1, 0x54($sp) -/* CC1088 80240258 8FB00050 */ lw $s0, 0x50($sp) -/* CC108C 8024025C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* CC1090 80240260 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CC1094 80240264 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CC1098 80240268 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CC109C 8024026C D7B40060 */ ldc1 $f20, 0x60($sp) -/* CC10A0 80240270 24020002 */ addiu $v0, $zero, 2 -/* CC10A4 80240274 03E00008 */ jr $ra -/* CC10A8 80240278 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_flo/flo_12/func_8024027C_CC0E30.s b/asm/nonmatchings/world/area_flo/flo_12/func_8024027C_CC0E30.s deleted file mode 100644 index 800d9bb3e0..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_12/func_8024027C_CC0E30.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024027C_CC10AC -/* CC10AC 8024027C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CC10B0 80240280 AFB00010 */ sw $s0, 0x10($sp) -/* CC10B4 80240284 3C108024 */ lui $s0, 0x8024 -/* CC10B8 80240288 261017EC */ addiu $s0, $s0, 0x17ec -/* CC10BC 8024028C AFBF0018 */ sw $ra, 0x18($sp) -/* CC10C0 80240290 AFB10014 */ sw $s1, 0x14($sp) -/* CC10C4 80240294 8E020000 */ lw $v0, ($s0) -/* CC10C8 80240298 14400010 */ bnez $v0, .L802402DC -/* CC10CC 8024029C 0080882D */ daddu $s1, $a0, $zero -/* CC10D0 802402A0 0C00AB39 */ jal heap_malloc -/* CC10D4 802402A4 24040040 */ addiu $a0, $zero, 0x40 -/* CC10D8 802402A8 AE020000 */ sw $v0, ($s0) -/* CC10DC 802402AC 0000182D */ daddu $v1, $zero, $zero -/* CC10E0 802402B0 0040282D */ daddu $a1, $v0, $zero -/* CC10E4 802402B4 0220202D */ daddu $a0, $s1, $zero -.L802402B8: -/* CC10E8 802402B8 8C820084 */ lw $v0, 0x84($a0) -/* CC10EC 802402BC 24840004 */ addiu $a0, $a0, 4 -/* CC10F0 802402C0 24630001 */ addiu $v1, $v1, 1 -/* CC10F4 802402C4 ACA20000 */ sw $v0, ($a1) -/* CC10F8 802402C8 28620010 */ slti $v0, $v1, 0x10 -/* CC10FC 802402CC 1440FFFA */ bnez $v0, .L802402B8 -/* CC1100 802402D0 24A50004 */ addiu $a1, $a1, 4 -/* CC1104 802402D4 080900C6 */ j .L80240318 -/* CC1108 802402D8 00000000 */ nop -.L802402DC: -/* CC110C 802402DC 0000182D */ daddu $v1, $zero, $zero -/* CC1110 802402E0 0040282D */ daddu $a1, $v0, $zero -/* CC1114 802402E4 0220202D */ daddu $a0, $s1, $zero -.L802402E8: -/* CC1118 802402E8 8CA20000 */ lw $v0, ($a1) -/* CC111C 802402EC 24A50004 */ addiu $a1, $a1, 4 -/* CC1120 802402F0 24630001 */ addiu $v1, $v1, 1 -/* CC1124 802402F4 AC820084 */ sw $v0, 0x84($a0) -/* CC1128 802402F8 28620010 */ slti $v0, $v1, 0x10 -/* CC112C 802402FC 1440FFFA */ bnez $v0, .L802402E8 -/* CC1130 80240300 24840004 */ addiu $a0, $a0, 4 -/* CC1134 80240304 3C108024 */ lui $s0, 0x8024 -/* CC1138 80240308 261017EC */ addiu $s0, $s0, 0x17ec -/* CC113C 8024030C 0C00AB4B */ jal heap_free -/* CC1140 80240310 8E040000 */ lw $a0, ($s0) -/* CC1144 80240314 AE000000 */ sw $zero, ($s0) -.L80240318: -/* CC1148 80240318 8FBF0018 */ lw $ra, 0x18($sp) -/* CC114C 8024031C 8FB10014 */ lw $s1, 0x14($sp) -/* CC1150 80240320 8FB00010 */ lw $s0, 0x10($sp) -/* CC1154 80240324 24020002 */ addiu $v0, $zero, 2 -/* CC1158 80240328 03E00008 */ jr $ra -/* CC115C 8024032C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_12/func_80240330_CC0E30.s b/asm/nonmatchings/world/area_flo/flo_12/func_80240330_CC0E30.s deleted file mode 100644 index ac55af8dfd..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_12/func_80240330_CC0E30.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240330_CC1160 -/* CC1160 80240330 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CC1164 80240334 AFB00010 */ sw $s0, 0x10($sp) -/* CC1168 80240338 0080802D */ daddu $s0, $a0, $zero -/* CC116C 8024033C AFBF0018 */ sw $ra, 0x18($sp) -/* CC1170 80240340 AFB10014 */ sw $s1, 0x14($sp) -/* CC1174 80240344 8E02000C */ lw $v0, 0xc($s0) -/* CC1178 80240348 8C510000 */ lw $s1, ($v0) -/* CC117C 8024034C 0C0B1EAF */ jal get_variable -/* CC1180 80240350 0220282D */ daddu $a1, $s1, $zero -/* CC1184 80240354 3C03FFF0 */ lui $v1, 0xfff0 -/* CC1188 80240358 3463FFFF */ ori $v1, $v1, 0xffff -/* CC118C 8024035C 0200202D */ daddu $a0, $s0, $zero -/* CC1190 80240360 00431024 */ and $v0, $v0, $v1 -/* CC1194 80240364 00021140 */ sll $v0, $v0, 5 -/* CC1198 80240368 3C068008 */ lui $a2, %hi(gItemTable) -/* CC119C 8024036C 00C23021 */ addu $a2, $a2, $v0 -/* CC11A0 80240370 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* CC11A4 80240374 0C0B2026 */ jal set_variable -/* CC11A8 80240378 0220282D */ daddu $a1, $s1, $zero -/* CC11AC 8024037C 8FBF0018 */ lw $ra, 0x18($sp) -/* CC11B0 80240380 8FB10014 */ lw $s1, 0x14($sp) -/* CC11B4 80240384 8FB00010 */ lw $s0, 0x10($sp) -/* CC11B8 80240388 24020002 */ addiu $v0, $zero, 2 -/* CC11BC 8024038C 03E00008 */ jr $ra -/* CC11C0 80240390 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_12/func_80240394_CC0E30.s b/asm/nonmatchings/world/area_flo/flo_12/func_80240394_CC0E30.s deleted file mode 100644 index 2fcfc6598c..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_12/func_80240394_CC0E30.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240394_CC11C4 -/* CC11C4 80240394 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CC11C8 80240398 AFB10014 */ sw $s1, 0x14($sp) -/* CC11CC 8024039C 0080882D */ daddu $s1, $a0, $zero -/* CC11D0 802403A0 AFBF0018 */ sw $ra, 0x18($sp) -/* CC11D4 802403A4 AFB00010 */ sw $s0, 0x10($sp) -/* CC11D8 802403A8 8E30000C */ lw $s0, 0xc($s1) -/* CC11DC 802403AC 8E050000 */ lw $a1, ($s0) -/* CC11E0 802403B0 0C0B1EAF */ jal get_variable -/* CC11E4 802403B4 26100004 */ addiu $s0, $s0, 4 -/* CC11E8 802403B8 0C00EAD2 */ jal get_npc_safe -/* CC11EC 802403BC 0040202D */ daddu $a0, $v0, $zero -/* CC11F0 802403C0 10400005 */ beqz $v0, .L802403D8 -/* CC11F4 802403C4 00000000 */ nop -/* CC11F8 802403C8 8E050000 */ lw $a1, ($s0) -/* CC11FC 802403CC 844600A8 */ lh $a2, 0xa8($v0) -/* CC1200 802403D0 0C0B2026 */ jal set_variable -/* CC1204 802403D4 0220202D */ daddu $a0, $s1, $zero -.L802403D8: -/* CC1208 802403D8 8FBF0018 */ lw $ra, 0x18($sp) -/* CC120C 802403DC 8FB10014 */ lw $s1, 0x14($sp) -/* CC1210 802403E0 8FB00010 */ lw $s0, 0x10($sp) -/* CC1214 802403E4 24020002 */ addiu $v0, $zero, 2 -/* CC1218 802403E8 03E00008 */ jr $ra -/* CC121C 802403EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_12/func_802403F0_CC0E30.s b/asm/nonmatchings/world/area_flo/flo_12/func_802403F0_CC0E30.s deleted file mode 100644 index 52c385e539..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_12/func_802403F0_CC0E30.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F0_CC1220 -/* CC1220 802403F0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CC1224 802403F4 AFB10014 */ sw $s1, 0x14($sp) -/* CC1228 802403F8 0080882D */ daddu $s1, $a0, $zero -/* CC122C 802403FC AFBF0024 */ sw $ra, 0x24($sp) -/* CC1230 80240400 AFB40020 */ sw $s4, 0x20($sp) -/* CC1234 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* CC1238 80240408 AFB20018 */ sw $s2, 0x18($sp) -/* CC123C 8024040C AFB00010 */ sw $s0, 0x10($sp) -/* CC1240 80240410 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* CC1244 80240414 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* CC1248 80240418 F7B80038 */ sdc1 $f24, 0x38($sp) -/* CC124C 8024041C F7B60030 */ sdc1 $f22, 0x30($sp) -/* CC1250 80240420 F7B40028 */ sdc1 $f20, 0x28($sp) -/* CC1254 80240424 8E30000C */ lw $s0, 0xc($s1) -/* CC1258 80240428 8E130000 */ lw $s3, ($s0) -/* CC125C 8024042C 26100004 */ addiu $s0, $s0, 4 -/* CC1260 80240430 0C0B1EAF */ jal get_variable -/* CC1264 80240434 0260282D */ daddu $a1, $s3, $zero -/* CC1268 80240438 4482E000 */ mtc1 $v0, $f28 -/* CC126C 8024043C 00000000 */ nop -/* CC1270 80240440 4680E720 */ cvt.s.w $f28, $f28 -/* CC1274 80240444 8E140000 */ lw $s4, ($s0) -/* CC1278 80240448 26100004 */ addiu $s0, $s0, 4 -/* CC127C 8024044C 0220202D */ daddu $a0, $s1, $zero -/* CC1280 80240450 0C0B1EAF */ jal get_variable -/* CC1284 80240454 0280282D */ daddu $a1, $s4, $zero -/* CC1288 80240458 4482D000 */ mtc1 $v0, $f26 -/* CC128C 8024045C 00000000 */ nop -/* CC1290 80240460 4680D6A0 */ cvt.s.w $f26, $f26 -/* CC1294 80240464 8E100000 */ lw $s0, ($s0) -/* CC1298 80240468 0220202D */ daddu $a0, $s1, $zero -/* CC129C 8024046C 0C0B1EAF */ jal get_variable -/* CC12A0 80240470 0200282D */ daddu $a1, $s0, $zero -/* CC12A4 80240474 4482C000 */ mtc1 $v0, $f24 -/* CC12A8 80240478 00000000 */ nop -/* CC12AC 8024047C 4680C620 */ cvt.s.w $f24, $f24 -/* CC12B0 80240480 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* CC12B4 80240484 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* CC12B8 80240488 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* CC12BC 8024048C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CC12C0 80240490 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* CC12C4 80240494 44800000 */ mtc1 $zero, $f0 -/* CC12C8 80240498 00031080 */ sll $v0, $v1, 2 -/* CC12CC 8024049C 00431021 */ addu $v0, $v0, $v1 -/* CC12D0 802404A0 00021080 */ sll $v0, $v0, 2 -/* CC12D4 802404A4 00431023 */ subu $v0, $v0, $v1 -/* CC12D8 802404A8 000218C0 */ sll $v1, $v0, 3 -/* CC12DC 802404AC 00431021 */ addu $v0, $v0, $v1 -/* CC12E0 802404B0 000210C0 */ sll $v0, $v0, 3 -/* CC12E4 802404B4 46001032 */ c.eq.s $f2, $f0 -/* CC12E8 802404B8 3C01800B */ lui $at, 0x800b -/* CC12EC 802404BC 00220821 */ addu $at, $at, $v0 -/* CC12F0 802404C0 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* CC12F4 802404C4 45000005 */ bc1f .L802404DC -/* CC12F8 802404C8 00000000 */ nop -/* CC12FC 802404CC 3C0142C8 */ lui $at, 0x42c8 -/* CC1300 802404D0 44810000 */ mtc1 $at, $f0 -/* CC1304 802404D4 0809013B */ j .L802404EC -/* CC1308 802404D8 4600B581 */ sub.s $f22, $f22, $f0 -.L802404DC: -/* CC130C 802404DC 3C0142C8 */ lui $at, 0x42c8 -/* CC1310 802404E0 44810000 */ mtc1 $at, $f0 -/* CC1314 802404E4 00000000 */ nop -/* CC1318 802404E8 4600B580 */ add.s $f22, $f22, $f0 -.L802404EC: -/* CC131C 802404EC 0C00A6C9 */ jal clamp_angle -/* CC1320 802404F0 4600B306 */ mov.s $f12, $f22 -/* CC1324 802404F4 46000586 */ mov.s $f22, $f0 -/* CC1328 802404F8 3C014170 */ lui $at, 0x4170 -/* CC132C 802404FC 4481A000 */ mtc1 $at, $f20 -/* CC1330 80240500 0C00A8BB */ jal sin_deg -/* CC1334 80240504 4600B306 */ mov.s $f12, $f22 -/* CC1338 80240508 46140002 */ mul.s $f0, $f0, $f20 -/* CC133C 8024050C 00000000 */ nop -/* CC1340 80240510 864200B0 */ lh $v0, 0xb0($s2) -/* CC1344 80240514 3C013F00 */ lui $at, 0x3f00 -/* CC1348 80240518 44812000 */ mtc1 $at, $f4 -/* CC134C 8024051C 44821000 */ mtc1 $v0, $f2 -/* CC1350 80240520 00000000 */ nop -/* CC1354 80240524 468010A0 */ cvt.s.w $f2, $f2 -/* CC1358 80240528 46041082 */ mul.s $f2, $f2, $f4 -/* CC135C 8024052C 00000000 */ nop -/* CC1360 80240530 4600E700 */ add.s $f28, $f28, $f0 -/* CC1364 80240534 4602D680 */ add.s $f26, $f26, $f2 -/* CC1368 80240538 0C00A8D4 */ jal cos_deg -/* CC136C 8024053C 4600B306 */ mov.s $f12, $f22 -/* CC1370 80240540 46140002 */ mul.s $f0, $f0, $f20 -/* CC1374 80240544 00000000 */ nop -/* CC1378 80240548 0220202D */ daddu $a0, $s1, $zero -/* CC137C 8024054C 0260282D */ daddu $a1, $s3, $zero -/* CC1380 80240550 4600E18D */ trunc.w.s $f6, $f28 -/* CC1384 80240554 44063000 */ mfc1 $a2, $f6 -/* CC1388 80240558 0C0B2026 */ jal set_variable -/* CC138C 8024055C 4600C601 */ sub.s $f24, $f24, $f0 -/* CC1390 80240560 0220202D */ daddu $a0, $s1, $zero -/* CC1394 80240564 4600D18D */ trunc.w.s $f6, $f26 -/* CC1398 80240568 44063000 */ mfc1 $a2, $f6 -/* CC139C 8024056C 0C0B2026 */ jal set_variable -/* CC13A0 80240570 0280282D */ daddu $a1, $s4, $zero -/* CC13A4 80240574 0220202D */ daddu $a0, $s1, $zero -/* CC13A8 80240578 4600C18D */ trunc.w.s $f6, $f24 -/* CC13AC 8024057C 44063000 */ mfc1 $a2, $f6 -/* CC13B0 80240580 0C0B2026 */ jal set_variable -/* CC13B4 80240584 0200282D */ daddu $a1, $s0, $zero -/* CC13B8 80240588 8FBF0024 */ lw $ra, 0x24($sp) -/* CC13BC 8024058C 8FB40020 */ lw $s4, 0x20($sp) -/* CC13C0 80240590 8FB3001C */ lw $s3, 0x1c($sp) -/* CC13C4 80240594 8FB20018 */ lw $s2, 0x18($sp) -/* CC13C8 80240598 8FB10014 */ lw $s1, 0x14($sp) -/* CC13CC 8024059C 8FB00010 */ lw $s0, 0x10($sp) -/* CC13D0 802405A0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* CC13D4 802405A4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* CC13D8 802405A8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* CC13DC 802405AC D7B60030 */ ldc1 $f22, 0x30($sp) -/* CC13E0 802405B0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* CC13E4 802405B4 24020002 */ addiu $v0, $zero, 2 -/* CC13E8 802405B8 03E00008 */ jr $ra -/* CC13EC 802405BC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_12/func_802405C0_CC0E30.s b/asm/nonmatchings/world/area_flo/flo_12/func_802405C0_CC0E30.s deleted file mode 100644 index 5065b072cb..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_12/func_802405C0_CC0E30.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405C0_CC13F0 -/* CC13F0 802405C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CC13F4 802405C4 AFBF0010 */ sw $ra, 0x10($sp) -/* CC13F8 802405C8 10A00003 */ beqz $a1, .L802405D8 -/* CC13FC 802405CC 8C86000C */ lw $a2, 0xc($a0) -/* CC1400 802405D0 3C018024 */ lui $at, 0x8024 -/* CC1404 802405D4 AC201850 */ sw $zero, 0x1850($at) -.L802405D8: -/* CC1408 802405D8 3C038024 */ lui $v1, 0x8024 -/* CC140C 802405DC 24631850 */ addiu $v1, $v1, 0x1850 -/* CC1410 802405E0 8C620000 */ lw $v0, ($v1) -/* CC1414 802405E4 54400003 */ bnel $v0, $zero, .L802405F4 -/* CC1418 802405E8 AC600000 */ sw $zero, ($v1) -/* CC141C 802405EC 08090182 */ j .L80240608 -/* CC1420 802405F0 0000102D */ daddu $v0, $zero, $zero -.L802405F4: -/* CC1424 802405F4 8CC50000 */ lw $a1, ($a2) -/* CC1428 802405F8 3C068024 */ lui $a2, 0x8024 -/* CC142C 802405FC 0C0B2026 */ jal set_variable -/* CC1430 80240600 8CC61854 */ lw $a2, 0x1854($a2) -/* CC1434 80240604 24020002 */ addiu $v0, $zero, 2 -.L80240608: -/* CC1438 80240608 8FBF0010 */ lw $ra, 0x10($sp) -/* CC143C 8024060C 03E00008 */ jr $ra -/* CC1440 80240610 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_12/func_8024064C_CC0E30.s b/asm/nonmatchings/world/area_flo/flo_12/func_8024064C_CC0E30.s deleted file mode 100644 index c9c744edb6..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_12/func_8024064C_CC0E30.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024064C_CC147C -/* CC147C 8024064C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CC1480 80240650 AFBF0010 */ sw $ra, 0x10($sp) -/* CC1484 80240654 8C82000C */ lw $v0, 0xc($a0) -/* CC1488 80240658 0C0B1EAF */ jal get_variable -/* CC148C 8024065C 8C450000 */ lw $a1, ($v0) -/* CC1490 80240660 0040182D */ daddu $v1, $v0, $zero -/* CC1494 80240664 10600012 */ beqz $v1, .L802406B0 -/* CC1498 80240668 0000202D */ daddu $a0, $zero, $zero -/* CC149C 8024066C 8C620000 */ lw $v0, ($v1) -/* CC14A0 80240670 5040000A */ beql $v0, $zero, .L8024069C -/* CC14A4 80240674 00041080 */ sll $v0, $a0, 2 -/* CC14A8 80240678 3C058024 */ lui $a1, 0x8024 -/* CC14AC 8024067C 24A529E0 */ addiu $a1, $a1, 0x29e0 -.L80240680: -/* CC14B0 80240680 24630004 */ addiu $v1, $v1, 4 -/* CC14B4 80240684 24840001 */ addiu $a0, $a0, 1 -/* CC14B8 80240688 ACA20000 */ sw $v0, ($a1) -/* CC14BC 8024068C 8C620000 */ lw $v0, ($v1) -/* CC14C0 80240690 1440FFFB */ bnez $v0, .L80240680 -/* CC14C4 80240694 24A50004 */ addiu $a1, $a1, 4 -/* CC14C8 80240698 00041080 */ sll $v0, $a0, 2 -.L8024069C: -/* CC14CC 8024069C 3C018024 */ lui $at, 0x8024 -/* CC14D0 802406A0 00220821 */ addu $at, $at, $v0 -/* CC14D4 802406A4 AC2029E0 */ sw $zero, 0x29e0($at) -/* CC14D8 802406A8 080901B6 */ j .L802406D8 -/* CC14DC 802406AC 00000000 */ nop -.L802406B0: -/* CC14E0 802406B0 3C038024 */ lui $v1, 0x8024 -/* CC14E4 802406B4 246329E0 */ addiu $v1, $v1, 0x29e0 -/* CC14E8 802406B8 0060282D */ daddu $a1, $v1, $zero -.L802406BC: -/* CC14EC 802406BC 24820010 */ addiu $v0, $a0, 0x10 -/* CC14F0 802406C0 AC620000 */ sw $v0, ($v1) -/* CC14F4 802406C4 24630004 */ addiu $v1, $v1, 4 -/* CC14F8 802406C8 24840001 */ addiu $a0, $a0, 1 -/* CC14FC 802406CC 28820070 */ slti $v0, $a0, 0x70 -/* CC1500 802406D0 1440FFFA */ bnez $v0, .L802406BC -/* CC1504 802406D4 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802406D8: -/* CC1508 802406D8 8FBF0010 */ lw $ra, 0x10($sp) -/* CC150C 802406DC 24020002 */ addiu $v0, $zero, 2 -/* CC1510 802406E0 03E00008 */ jr $ra -/* CC1514 802406E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* CC1518 802406E8 00000000 */ nop -/* CC151C 802406EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_13/func_80240040_CC3810.s b/asm/nonmatchings/world/area_flo/flo_13/func_80240040_CC3810.s deleted file mode 100644 index 9d473b0635..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/func_80240040_CC3810.s +++ /dev/null @@ -1,109 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_CC3850 -/* CC3850 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CC3854 80240044 AFB20018 */ sw $s2, 0x18($sp) -/* CC3858 80240048 0080902D */ daddu $s2, $a0, $zero -/* CC385C 8024004C AFB10014 */ sw $s1, 0x14($sp) -/* CC3860 80240050 00A0882D */ daddu $s1, $a1, $zero -/* CC3864 80240054 AFBF0024 */ sw $ra, 0x24($sp) -/* CC3868 80240058 AFB40020 */ sw $s4, 0x20($sp) -/* CC386C 8024005C AFB3001C */ sw $s3, 0x1c($sp) -/* CC3870 80240060 AFB00010 */ sw $s0, 0x10($sp) -/* CC3874 80240064 8E50000C */ lw $s0, 0xc($s2) -/* CC3878 80240068 8E050000 */ lw $a1, ($s0) -/* CC387C 8024006C 0C0B1EAF */ jal get_variable -/* CC3880 80240070 26100004 */ addiu $s0, $s0, 4 -/* CC3884 80240074 0240202D */ daddu $a0, $s2, $zero -/* CC3888 80240078 8E050000 */ lw $a1, ($s0) -/* CC388C 8024007C 0C0B1EAF */ jal get_variable -/* CC3890 80240080 0040802D */ daddu $s0, $v0, $zero -/* CC3894 80240084 0200202D */ daddu $a0, $s0, $zero -/* CC3898 80240088 0C00EAD2 */ jal get_npc_safe -/* CC389C 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* CC38A0 80240090 3C138011 */ lui $s3, %hi(gPlayerData) -/* CC38A4 80240094 2673F290 */ addiu $s3, $s3, %lo(gPlayerData) -/* CC38A8 80240098 12200006 */ beqz $s1, .L802400B4 -/* CC38AC 8024009C 0040802D */ daddu $s0, $v0, $zero -/* CC38B0 802400A0 82620012 */ lb $v0, 0x12($s3) -/* CC38B4 802400A4 54400003 */ bnel $v0, $zero, .L802400B4 -/* CC38B8 802400A8 AE400070 */ sw $zero, 0x70($s2) -/* CC38BC 802400AC 24020002 */ addiu $v0, $zero, 2 -/* CC38C0 802400B0 AE420070 */ sw $v0, 0x70($s2) -.L802400B4: -/* CC38C4 802400B4 8E430070 */ lw $v1, 0x70($s2) -/* CC38C8 802400B8 24110001 */ addiu $s1, $zero, 1 -/* CC38CC 802400BC 10710013 */ beq $v1, $s1, .L8024010C -/* CC38D0 802400C0 28620002 */ slti $v0, $v1, 2 -/* CC38D4 802400C4 10400005 */ beqz $v0, .L802400DC -/* CC38D8 802400C8 24020002 */ addiu $v0, $zero, 2 -/* CC38DC 802400CC 10600009 */ beqz $v1, .L802400F4 -/* CC38E0 802400D0 0000102D */ daddu $v0, $zero, $zero -/* CC38E4 802400D4 08090069 */ j .L802401A4 -/* CC38E8 802400D8 00000000 */ nop -.L802400DC: -/* CC38EC 802400DC 10620013 */ beq $v1, $v0, .L8024012C -/* CC38F0 802400E0 24020003 */ addiu $v0, $zero, 3 -/* CC38F4 802400E4 1062001E */ beq $v1, $v0, .L80240160 -/* CC38F8 802400E8 0000102D */ daddu $v0, $zero, $zero -/* CC38FC 802400EC 08090069 */ j .L802401A4 -/* CC3900 802400F0 00000000 */ nop -.L802400F4: -/* CC3904 802400F4 0C03AC5A */ jal func_800EB168 -/* CC3908 802400F8 0000202D */ daddu $a0, $zero, $zero -/* CC390C 802400FC 2402001E */ addiu $v0, $zero, 0x1e -/* CC3910 80240100 AE420074 */ sw $v0, 0x74($s2) -/* CC3914 80240104 08090068 */ j .L802401A0 -/* CC3918 80240108 AE510070 */ sw $s1, 0x70($s2) -.L8024010C: -/* CC391C 8024010C 8E420074 */ lw $v0, 0x74($s2) -/* CC3920 80240110 2403FFFF */ addiu $v1, $zero, -1 -/* CC3924 80240114 2442FFFF */ addiu $v0, $v0, -1 -/* CC3928 80240118 14430021 */ bne $v0, $v1, .L802401A0 -/* CC392C 8024011C AE420074 */ sw $v0, 0x74($s2) -/* CC3930 80240120 24020002 */ addiu $v0, $zero, 2 -/* CC3934 80240124 08090068 */ j .L802401A0 -/* CC3938 80240128 AE420070 */ sw $v0, 0x70($s2) -.L8024012C: -/* CC393C 8024012C 0200202D */ daddu $a0, $s0, $zero -/* CC3940 80240130 00141600 */ sll $v0, $s4, 0x18 -/* CC3944 80240134 00021543 */ sra $v0, $v0, 0x15 -/* CC3948 80240138 02621021 */ addu $v0, $s3, $v0 -/* CC394C 8024013C A2740012 */ sb $s4, 0x12($s3) -/* CC3950 80240140 0C03BD17 */ jal clear_partner_move_history -/* CC3954 80240144 A0510014 */ sb $s1, 0x14($v0) -/* CC3958 80240148 82640012 */ lb $a0, 0x12($s3) -/* CC395C 8024014C 0C03ACA9 */ jal func_800EB2A4 -/* CC3960 80240150 00000000 */ nop -/* CC3964 80240154 24020003 */ addiu $v0, $zero, 3 -/* CC3968 80240158 08090068 */ j .L802401A0 -/* CC396C 8024015C AE420070 */ sw $v0, 0x70($s2) -.L80240160: -/* CC3970 80240160 0C00EAD2 */ jal get_npc_safe -/* CC3974 80240164 2404FFFC */ addiu $a0, $zero, -4 -/* CC3978 80240168 8E05000C */ lw $a1, 0xc($s0) -/* CC397C 8024016C 0C00ECD0 */ jal set_npc_yaw -/* CC3980 80240170 0040202D */ daddu $a0, $v0, $zero -/* CC3984 80240174 0200202D */ daddu $a0, $s0, $zero -/* CC3988 80240178 8E020000 */ lw $v0, ($s0) -/* CC398C 8024017C 2403FFFB */ addiu $v1, $zero, -5 -/* CC3990 80240180 00431024 */ and $v0, $v0, $v1 -/* CC3994 80240184 0C00EAFF */ jal disable_npc_shadow -/* CC3998 80240188 AE020000 */ sw $v0, ($s0) -/* CC399C 8024018C 3C01C47A */ lui $at, 0xc47a -/* CC39A0 80240190 44810000 */ mtc1 $at, $f0 -/* CC39A4 80240194 24020002 */ addiu $v0, $zero, 2 -/* CC39A8 80240198 08090069 */ j .L802401A4 -/* CC39AC 8024019C E600003C */ swc1 $f0, 0x3c($s0) -.L802401A0: -/* CC39B0 802401A0 0000102D */ daddu $v0, $zero, $zero -.L802401A4: -/* CC39B4 802401A4 8FBF0024 */ lw $ra, 0x24($sp) -/* CC39B8 802401A8 8FB40020 */ lw $s4, 0x20($sp) -/* CC39BC 802401AC 8FB3001C */ lw $s3, 0x1c($sp) -/* CC39C0 802401B0 8FB20018 */ lw $s2, 0x18($sp) -/* CC39C4 802401B4 8FB10014 */ lw $s1, 0x14($sp) -/* CC39C8 802401B8 8FB00010 */ lw $s0, 0x10($sp) -/* CC39CC 802401BC 03E00008 */ jr $ra -/* CC39D0 802401C0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_13/func_802401C4_CC3810.s b/asm/nonmatchings/world/area_flo/flo_13/func_802401C4_CC3810.s deleted file mode 100644 index 60cd3fb8dc..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/func_802401C4_CC3810.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401C4_CC39D4 -/* CC39D4 802401C4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CC39D8 802401C8 AFB3002C */ sw $s3, 0x2c($sp) -/* CC39DC 802401CC 0080982D */ daddu $s3, $a0, $zero -/* CC39E0 802401D0 AFBF0030 */ sw $ra, 0x30($sp) -/* CC39E4 802401D4 AFB20028 */ sw $s2, 0x28($sp) -/* CC39E8 802401D8 AFB10024 */ sw $s1, 0x24($sp) -/* CC39EC 802401DC AFB00020 */ sw $s0, 0x20($sp) -/* CC39F0 802401E0 8E710148 */ lw $s1, 0x148($s3) -/* CC39F4 802401E4 86240008 */ lh $a0, 8($s1) -/* CC39F8 802401E8 0C00EABB */ jal get_npc_unsafe -/* CC39FC 802401EC 00A0902D */ daddu $s2, $a1, $zero -/* CC3A00 802401F0 8E440004 */ lw $a0, 4($s2) -/* CC3A04 802401F4 0040802D */ daddu $s0, $v0, $zero -/* CC3A08 802401F8 00041FC2 */ srl $v1, $a0, 0x1f -/* CC3A0C 802401FC 00832021 */ addu $a0, $a0, $v1 -/* CC3A10 80240200 00042043 */ sra $a0, $a0, 1 -/* CC3A14 80240204 0C00A67F */ jal rand_int -/* CC3A18 80240208 24840001 */ addiu $a0, $a0, 1 -/* CC3A1C 8024020C 8E430004 */ lw $v1, 4($s2) -/* CC3A20 80240210 000327C2 */ srl $a0, $v1, 0x1f -/* CC3A24 80240214 00641821 */ addu $v1, $v1, $a0 -/* CC3A28 80240218 00031843 */ sra $v1, $v1, 1 -/* CC3A2C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* CC3A30 80240220 A603008E */ sh $v1, 0x8e($s0) -/* CC3A34 80240224 8E2300D0 */ lw $v1, 0xd0($s1) -/* CC3A38 80240228 C6000040 */ lwc1 $f0, 0x40($s0) -/* CC3A3C 8024022C C4640000 */ lwc1 $f4, ($v1) -/* CC3A40 80240230 46802120 */ cvt.s.w $f4, $f4 -/* CC3A44 80240234 C4620008 */ lwc1 $f2, 8($v1) -/* CC3A48 80240238 468010A0 */ cvt.s.w $f2, $f2 -/* CC3A4C 8024023C E7A00010 */ swc1 $f0, 0x10($sp) -/* CC3A50 80240240 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC3A54 80240244 44061000 */ mfc1 $a2, $f2 -/* CC3A58 80240248 C440000C */ lwc1 $f0, 0xc($v0) -/* CC3A5C 8024024C 46800020 */ cvt.s.w $f0, $f0 -/* CC3A60 80240250 E7A00014 */ swc1 $f0, 0x14($sp) -/* CC3A64 80240254 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC3A68 80240258 44052000 */ mfc1 $a1, $f4 -/* CC3A6C 8024025C C4400010 */ lwc1 $f0, 0x10($v0) -/* CC3A70 80240260 46800020 */ cvt.s.w $f0, $f0 -/* CC3A74 80240264 E7A00018 */ swc1 $f0, 0x18($sp) -/* CC3A78 80240268 8C640018 */ lw $a0, 0x18($v1) -/* CC3A7C 8024026C 0C0123F5 */ jal is_point_within_region -/* CC3A80 80240270 8E070038 */ lw $a3, 0x38($s0) -/* CC3A84 80240274 1040000E */ beqz $v0, .L802402B0 -/* CC3A88 80240278 00000000 */ nop -/* CC3A8C 8024027C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC3A90 80240280 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CC3A94 80240284 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CC3A98 80240288 C4460000 */ lwc1 $f6, ($v0) -/* CC3A9C 8024028C 468031A0 */ cvt.s.w $f6, $f6 -/* CC3AA0 80240290 44063000 */ mfc1 $a2, $f6 -/* CC3AA4 80240294 C4460008 */ lwc1 $f6, 8($v0) -/* CC3AA8 80240298 468031A0 */ cvt.s.w $f6, $f6 -/* CC3AAC 8024029C 44073000 */ mfc1 $a3, $f6 -/* CC3AB0 802402A0 0C00A720 */ jal atan2 -/* CC3AB4 802402A4 00000000 */ nop -/* CC3AB8 802402A8 080900B8 */ j .L802402E0 -/* CC3ABC 802402AC E600000C */ swc1 $f0, 0xc($s0) -.L802402B0: -/* CC3AC0 802402B0 0C00A67F */ jal rand_int -/* CC3AC4 802402B4 2404003C */ addiu $a0, $zero, 0x3c -/* CC3AC8 802402B8 C60C000C */ lwc1 $f12, 0xc($s0) -/* CC3ACC 802402BC 44820000 */ mtc1 $v0, $f0 -/* CC3AD0 802402C0 00000000 */ nop -/* CC3AD4 802402C4 46800020 */ cvt.s.w $f0, $f0 -/* CC3AD8 802402C8 46006300 */ add.s $f12, $f12, $f0 -/* CC3ADC 802402CC 3C0141F0 */ lui $at, 0x41f0 -/* CC3AE0 802402D0 44810000 */ mtc1 $at, $f0 -/* CC3AE4 802402D4 0C00A6C9 */ jal clamp_angle -/* CC3AE8 802402D8 46006301 */ sub.s $f12, $f12, $f0 -/* CC3AEC 802402DC E600000C */ swc1 $f0, 0xc($s0) -.L802402E0: -/* CC3AF0 802402E0 8E2200CC */ lw $v0, 0xcc($s1) -/* CC3AF4 802402E4 8C420004 */ lw $v0, 4($v0) -/* CC3AF8 802402E8 AE020028 */ sw $v0, 0x28($s0) -/* CC3AFC 802402EC AE600074 */ sw $zero, 0x74($s3) -/* CC3B00 802402F0 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC3B04 802402F4 8C420014 */ lw $v0, 0x14($v0) -/* CC3B08 802402F8 04410004 */ bgez $v0, .L8024030C -/* CC3B0C 802402FC 00000000 */ nop -/* CC3B10 80240300 C6400000 */ lwc1 $f0, ($s2) -/* CC3B14 80240304 080900CB */ j .L8024032C -/* CC3B18 80240308 E6000018 */ swc1 $f0, 0x18($s0) -.L8024030C: -/* CC3B1C 8024030C 3C018024 */ lui $at, 0x8024 -/* CC3B20 80240310 D4227A30 */ ldc1 $f2, 0x7a30($at) -/* CC3B24 80240314 44820000 */ mtc1 $v0, $f0 -/* CC3B28 80240318 00000000 */ nop -/* CC3B2C 8024031C 46800021 */ cvt.d.w $f0, $f0 -/* CC3B30 80240320 46220003 */ div.d $f0, $f0, $f2 -/* CC3B34 80240324 46200020 */ cvt.s.d $f0, $f0 -/* CC3B38 80240328 E6000018 */ swc1 $f0, 0x18($s0) -.L8024032C: -/* CC3B3C 8024032C C600003C */ lwc1 $f0, 0x3c($s0) -/* CC3B40 80240330 3C014059 */ lui $at, 0x4059 -/* CC3B44 80240334 44811800 */ mtc1 $at, $f3 -/* CC3B48 80240338 44801000 */ mtc1 $zero, $f2 -/* CC3B4C 8024033C 46000021 */ cvt.d.s $f0, $f0 -/* CC3B50 80240340 46220002 */ mul.d $f0, $f0, $f2 -/* CC3B54 80240344 00000000 */ nop -/* CC3B58 80240348 24020001 */ addiu $v0, $zero, 1 -/* CC3B5C 8024034C 4620018D */ trunc.w.d $f6, $f0 -/* CC3B60 80240350 E626007C */ swc1 $f6, 0x7c($s1) -/* CC3B64 80240354 AE620070 */ sw $v0, 0x70($s3) -/* CC3B68 80240358 8FBF0030 */ lw $ra, 0x30($sp) -/* CC3B6C 8024035C 8FB3002C */ lw $s3, 0x2c($sp) -/* CC3B70 80240360 8FB20028 */ lw $s2, 0x28($sp) -/* CC3B74 80240364 8FB10024 */ lw $s1, 0x24($sp) -/* CC3B78 80240368 8FB00020 */ lw $s0, 0x20($sp) -/* CC3B7C 8024036C 03E00008 */ jr $ra -/* CC3B80 80240370 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_13/func_80240A5C_CC3810.s b/asm/nonmatchings/world/area_flo/flo_13/func_80240A5C_CC3810.s deleted file mode 100644 index ac20673a86..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/func_80240A5C_CC3810.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A5C_CC426C -/* CC426C 80240A5C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* CC4270 80240A60 AFB3004C */ sw $s3, 0x4c($sp) -/* CC4274 80240A64 0080982D */ daddu $s3, $a0, $zero -/* CC4278 80240A68 AFBF0054 */ sw $ra, 0x54($sp) -/* CC427C 80240A6C AFB40050 */ sw $s4, 0x50($sp) -/* CC4280 80240A70 AFB20048 */ sw $s2, 0x48($sp) -/* CC4284 80240A74 AFB10044 */ sw $s1, 0x44($sp) -/* CC4288 80240A78 AFB00040 */ sw $s0, 0x40($sp) -/* CC428C 80240A7C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* CC4290 80240A80 F7B80068 */ sdc1 $f24, 0x68($sp) -/* CC4294 80240A84 F7B60060 */ sdc1 $f22, 0x60($sp) -/* CC4298 80240A88 F7B40058 */ sdc1 $f20, 0x58($sp) -/* CC429C 80240A8C 8E710148 */ lw $s1, 0x148($s3) -/* CC42A0 80240A90 00A0902D */ daddu $s2, $a1, $zero -/* CC42A4 80240A94 86240008 */ lh $a0, 8($s1) -/* CC42A8 80240A98 0C00EABB */ jal get_npc_unsafe -/* CC42AC 80240A9C 00C0A02D */ daddu $s4, $a2, $zero -/* CC42B0 80240AA0 0040802D */ daddu $s0, $v0, $zero -/* CC42B4 80240AA4 C6200078 */ lwc1 $f0, 0x78($s1) -/* CC42B8 80240AA8 46800020 */ cvt.s.w $f0, $f0 -/* CC42BC 80240AAC 46000021 */ cvt.d.s $f0, $f0 -/* CC42C0 80240AB0 3C014059 */ lui $at, 0x4059 -/* CC42C4 80240AB4 44811800 */ mtc1 $at, $f3 -/* CC42C8 80240AB8 44801000 */ mtc1 $zero, $f2 -/* CC42CC 80240ABC 8602008E */ lh $v0, 0x8e($s0) -/* CC42D0 80240AC0 9603008E */ lhu $v1, 0x8e($s0) -/* CC42D4 80240AC4 46220003 */ div.d $f0, $f0, $f2 -/* CC42D8 80240AC8 46200620 */ cvt.s.d $f24, $f0 -/* CC42DC 80240ACC C6200088 */ lwc1 $f0, 0x88($s1) -/* CC42E0 80240AD0 46800020 */ cvt.s.w $f0, $f0 -/* CC42E4 80240AD4 46000021 */ cvt.d.s $f0, $f0 -/* CC42E8 80240AD8 46220003 */ div.d $f0, $f0, $f2 -/* CC42EC 80240ADC 46200020 */ cvt.s.d $f0, $f0 -/* CC42F0 80240AE0 18400003 */ blez $v0, .L80240AF0 -/* CC42F4 80240AE4 4600C680 */ add.s $f26, $f24, $f0 -/* CC42F8 80240AE8 2462FFFF */ addiu $v0, $v1, -1 -/* CC42FC 80240AEC A602008E */ sh $v0, 0x8e($s0) -.L80240AF0: -/* CC4300 80240AF0 8E220070 */ lw $v0, 0x70($s1) -/* CC4304 80240AF4 18400034 */ blez $v0, .L80240BC8 -/* CC4308 80240AF8 00000000 */ nop -/* CC430C 80240AFC C62C0074 */ lwc1 $f12, 0x74($s1) -/* CC4310 80240B00 46806320 */ cvt.s.w $f12, $f12 -/* CC4314 80240B04 44820000 */ mtc1 $v0, $f0 -/* CC4318 80240B08 00000000 */ nop -/* CC431C 80240B0C 46800020 */ cvt.s.w $f0, $f0 -/* CC4320 80240B10 46000021 */ cvt.d.s $f0, $f0 -/* CC4324 80240B14 46220003 */ div.d $f0, $f0, $f2 -/* CC4328 80240B18 0C00A8BB */ jal sin_deg -/* CC432C 80240B1C 462005A0 */ cvt.s.d $f22, $f0 -/* CC4330 80240B20 8E020000 */ lw $v0, ($s0) -/* CC4334 80240B24 30420008 */ andi $v0, $v0, 8 -/* CC4338 80240B28 10400003 */ beqz $v0, .L80240B38 -/* CC433C 80240B2C 46000506 */ mov.s $f20, $f0 -/* CC4340 80240B30 080902DE */ j .L80240B78 -/* CC4344 80240B34 0000102D */ daddu $v0, $zero, $zero -.L80240B38: -/* CC4348 80240B38 27A50028 */ addiu $a1, $sp, 0x28 -/* CC434C 80240B3C 27A6002C */ addiu $a2, $sp, 0x2c -/* CC4350 80240B40 C6000038 */ lwc1 $f0, 0x38($s0) -/* CC4354 80240B44 C602003C */ lwc1 $f2, 0x3c($s0) -/* CC4358 80240B48 C6040040 */ lwc1 $f4, 0x40($s0) -/* CC435C 80240B4C 3C01447A */ lui $at, 0x447a -/* CC4360 80240B50 44813000 */ mtc1 $at, $f6 -/* CC4364 80240B54 27A20034 */ addiu $v0, $sp, 0x34 -/* CC4368 80240B58 E7A00028 */ swc1 $f0, 0x28($sp) -/* CC436C 80240B5C E7A2002C */ swc1 $f2, 0x2c($sp) -/* CC4370 80240B60 E7A40030 */ swc1 $f4, 0x30($sp) -/* CC4374 80240B64 E7A60034 */ swc1 $f6, 0x34($sp) -/* CC4378 80240B68 AFA20010 */ sw $v0, 0x10($sp) -/* CC437C 80240B6C 8E040080 */ lw $a0, 0x80($s0) -/* CC4380 80240B70 0C0372DF */ jal func_800DCB7C -/* CC4384 80240B74 27A70030 */ addiu $a3, $sp, 0x30 -.L80240B78: -/* CC4388 80240B78 10400007 */ beqz $v0, .L80240B98 -/* CC438C 80240B7C 00000000 */ nop -/* CC4390 80240B80 4616A082 */ mul.s $f2, $f20, $f22 -/* CC4394 80240B84 00000000 */ nop -/* CC4398 80240B88 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CC439C 80240B8C 46180000 */ add.s $f0, $f0, $f24 -/* CC43A0 80240B90 080902E9 */ j .L80240BA4 -/* CC43A4 80240B94 46020000 */ add.s $f0, $f0, $f2 -.L80240B98: -/* CC43A8 80240B98 4616A002 */ mul.s $f0, $f20, $f22 -/* CC43AC 80240B9C 00000000 */ nop -/* CC43B0 80240BA0 4600D000 */ add.s $f0, $f26, $f0 -.L80240BA4: -/* CC43B4 80240BA4 E600003C */ swc1 $f0, 0x3c($s0) -/* CC43B8 80240BA8 8E220074 */ lw $v0, 0x74($s1) -/* CC43BC 80240BAC 2442000A */ addiu $v0, $v0, 0xa -/* CC43C0 80240BB0 44826000 */ mtc1 $v0, $f12 -/* CC43C4 80240BB4 00000000 */ nop -/* CC43C8 80240BB8 0C00A6C9 */ jal clamp_angle -/* CC43CC 80240BBC 46806320 */ cvt.s.w $f12, $f12 -/* CC43D0 80240BC0 4600020D */ trunc.w.s $f8, $f0 -/* CC43D4 80240BC4 E6280074 */ swc1 $f8, 0x74($s1) -.L80240BC8: -/* CC43D8 80240BC8 8E220090 */ lw $v0, 0x90($s1) -/* CC43DC 80240BCC 1C400040 */ bgtz $v0, .L80240CD0 -/* CC43E0 80240BD0 2442FFFF */ addiu $v0, $v0, -1 -/* CC43E4 80240BD4 860200A8 */ lh $v0, 0xa8($s0) -/* CC43E8 80240BD8 C600003C */ lwc1 $f0, 0x3c($s0) -/* CC43EC 80240BDC 44821000 */ mtc1 $v0, $f2 -/* CC43F0 80240BE0 00000000 */ nop -/* CC43F4 80240BE4 468010A0 */ cvt.s.w $f2, $f2 -/* CC43F8 80240BE8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CC43FC 80240BEC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CC4400 80240BF0 46020000 */ add.s $f0, $f0, $f2 -/* CC4404 80240BF4 3C014024 */ lui $at, 0x4024 -/* CC4408 80240BF8 44812800 */ mtc1 $at, $f5 -/* CC440C 80240BFC 44802000 */ mtc1 $zero, $f4 -/* CC4410 80240C00 C442002C */ lwc1 $f2, 0x2c($v0) -/* CC4414 80240C04 46000021 */ cvt.d.s $f0, $f0 -/* CC4418 80240C08 46240000 */ add.d $f0, $f0, $f4 -/* CC441C 80240C0C 460010A1 */ cvt.d.s $f2, $f2 -/* CC4420 80240C10 4620103C */ c.lt.d $f2, $f0 -/* CC4424 80240C14 00000000 */ nop -/* CC4428 80240C18 4500002E */ bc1f .L80240CD4 -/* CC442C 80240C1C 0280202D */ daddu $a0, $s4, $zero -/* CC4430 80240C20 24020001 */ addiu $v0, $zero, 1 -/* CC4434 80240C24 AFA20010 */ sw $v0, 0x10($sp) -/* CC4438 80240C28 8E460024 */ lw $a2, 0x24($s2) -/* CC443C 80240C2C 8E470028 */ lw $a3, 0x28($s2) -/* CC4440 80240C30 0C01242D */ jal func_800490B4 -/* CC4444 80240C34 0220282D */ daddu $a1, $s1, $zero -/* CC4448 80240C38 10400026 */ beqz $v0, .L80240CD4 -/* CC444C 80240C3C 0000202D */ daddu $a0, $zero, $zero -/* CC4450 80240C40 0200282D */ daddu $a1, $s0, $zero -/* CC4454 80240C44 0000302D */ daddu $a2, $zero, $zero -/* CC4458 80240C48 2412000C */ addiu $s2, $zero, 0xc -/* CC445C 80240C4C 860300A8 */ lh $v1, 0xa8($s0) -/* CC4460 80240C50 3C013F80 */ lui $at, 0x3f80 -/* CC4464 80240C54 44810000 */ mtc1 $at, $f0 -/* CC4468 80240C58 3C014000 */ lui $at, 0x4000 -/* CC446C 80240C5C 44811000 */ mtc1 $at, $f2 -/* CC4470 80240C60 3C01C1A0 */ lui $at, 0xc1a0 -/* CC4474 80240C64 44812000 */ mtc1 $at, $f4 -/* CC4478 80240C68 44834000 */ mtc1 $v1, $f8 -/* CC447C 80240C6C 00000000 */ nop -/* CC4480 80240C70 46804220 */ cvt.s.w $f8, $f8 -/* CC4484 80240C74 44074000 */ mfc1 $a3, $f8 -/* CC4488 80240C78 27A20038 */ addiu $v0, $sp, 0x38 -/* CC448C 80240C7C AFB2001C */ sw $s2, 0x1c($sp) -/* CC4490 80240C80 AFA20020 */ sw $v0, 0x20($sp) -/* CC4494 80240C84 E7A00010 */ swc1 $f0, 0x10($sp) -/* CC4498 80240C88 E7A20014 */ swc1 $f2, 0x14($sp) -/* CC449C 80240C8C 0C01BFA4 */ jal fx_emote -/* CC44A0 80240C90 E7A40018 */ swc1 $f4, 0x18($sp) -/* CC44A4 80240C94 0200202D */ daddu $a0, $s0, $zero -/* CC44A8 80240C98 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CC44AC 80240C9C C480003C */ lwc1 $f0, 0x3c($a0) -/* CC44B0 80240CA0 3C060020 */ lui $a2, 0x20 -/* CC44B4 80240CA4 0C012530 */ jal func_800494C0 -/* CC44B8 80240CA8 E4800064 */ swc1 $f0, 0x64($a0) -/* CC44BC 80240CAC 8E220018 */ lw $v0, 0x18($s1) -/* CC44C0 80240CB0 9442002A */ lhu $v0, 0x2a($v0) -/* CC44C4 80240CB4 30420001 */ andi $v0, $v0, 1 -/* CC44C8 80240CB8 10400003 */ beqz $v0, .L80240CC8 -/* CC44CC 80240CBC 2402000A */ addiu $v0, $zero, 0xa -/* CC44D0 80240CC0 0809035C */ j .L80240D70 -/* CC44D4 80240CC4 AE620070 */ sw $v0, 0x70($s3) -.L80240CC8: -/* CC44D8 80240CC8 0809035C */ j .L80240D70 -/* CC44DC 80240CCC AE720070 */ sw $s2, 0x70($s3) -.L80240CD0: -/* CC44E0 80240CD0 AE220090 */ sw $v0, 0x90($s1) -.L80240CD4: -/* CC44E4 80240CD4 8602008C */ lh $v0, 0x8c($s0) -/* CC44E8 80240CD8 14400025 */ bnez $v0, .L80240D70 -/* CC44EC 80240CDC 00000000 */ nop -/* CC44F0 80240CE0 8602008E */ lh $v0, 0x8e($s0) -/* CC44F4 80240CE4 1C400022 */ bgtz $v0, .L80240D70 -/* CC44F8 80240CE8 00000000 */ nop -/* CC44FC 80240CEC 8E620074 */ lw $v0, 0x74($s3) -/* CC4500 80240CF0 2442FFFF */ addiu $v0, $v0, -1 -/* CC4504 80240CF4 1840001D */ blez $v0, .L80240D6C -/* CC4508 80240CF8 AE620074 */ sw $v0, 0x74($s3) -/* CC450C 80240CFC 8E220018 */ lw $v0, 0x18($s1) -/* CC4510 80240D00 9442002A */ lhu $v0, 0x2a($v0) -/* CC4514 80240D04 30420010 */ andi $v0, $v0, 0x10 -/* CC4518 80240D08 14400007 */ bnez $v0, .L80240D28 -/* CC451C 80240D0C 00000000 */ nop -/* CC4520 80240D10 C600000C */ lwc1 $f0, 0xc($s0) -/* CC4524 80240D14 3C014334 */ lui $at, 0x4334 -/* CC4528 80240D18 44816000 */ mtc1 $at, $f12 -/* CC452C 80240D1C 0C00A6C9 */ jal clamp_angle -/* CC4530 80240D20 460C0300 */ add.s $f12, $f0, $f12 -/* CC4534 80240D24 E600000C */ swc1 $f0, 0xc($s0) -.L80240D28: -/* CC4538 80240D28 0C00A67F */ jal rand_int -/* CC453C 80240D2C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CC4540 80240D30 3C032E8B */ lui $v1, 0x2e8b -/* CC4544 80240D34 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* CC4548 80240D38 00430018 */ mult $v0, $v1 -/* CC454C 80240D3C 00021FC3 */ sra $v1, $v0, 0x1f -/* CC4550 80240D40 00004010 */ mfhi $t0 -/* CC4554 80240D44 00082043 */ sra $a0, $t0, 1 -/* CC4558 80240D48 00832023 */ subu $a0, $a0, $v1 -/* CC455C 80240D4C 00041840 */ sll $v1, $a0, 1 -/* CC4560 80240D50 00641821 */ addu $v1, $v1, $a0 -/* CC4564 80240D54 00031880 */ sll $v1, $v1, 2 -/* CC4568 80240D58 00641823 */ subu $v1, $v1, $a0 -/* CC456C 80240D5C 00431023 */ subu $v0, $v0, $v1 -/* CC4570 80240D60 24420005 */ addiu $v0, $v0, 5 -/* CC4574 80240D64 0809035C */ j .L80240D70 -/* CC4578 80240D68 A602008E */ sh $v0, 0x8e($s0) -.L80240D6C: -/* CC457C 80240D6C AE600070 */ sw $zero, 0x70($s3) -.L80240D70: -/* CC4580 80240D70 8FBF0054 */ lw $ra, 0x54($sp) -/* CC4584 80240D74 8FB40050 */ lw $s4, 0x50($sp) -/* CC4588 80240D78 8FB3004C */ lw $s3, 0x4c($sp) -/* CC458C 80240D7C 8FB20048 */ lw $s2, 0x48($sp) -/* CC4590 80240D80 8FB10044 */ lw $s1, 0x44($sp) -/* CC4594 80240D84 8FB00040 */ lw $s0, 0x40($sp) -/* CC4598 80240D88 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* CC459C 80240D8C D7B80068 */ ldc1 $f24, 0x68($sp) -/* CC45A0 80240D90 D7B60060 */ ldc1 $f22, 0x60($sp) -/* CC45A4 80240D94 D7B40058 */ ldc1 $f20, 0x58($sp) -/* CC45A8 80240D98 03E00008 */ jr $ra -/* CC45AC 80240D9C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_flo/flo_13/func_80240DA0_CC3810.s b/asm/nonmatchings/world/area_flo/flo_13/func_80240DA0_CC3810.s deleted file mode 100644 index cab6bafc1a..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/func_80240DA0_CC3810.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DA0_CC45B0 -/* CC45B0 80240DA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CC45B4 80240DA4 AFB20018 */ sw $s2, 0x18($sp) -/* CC45B8 80240DA8 0080902D */ daddu $s2, $a0, $zero -/* CC45BC 80240DAC AFBF001C */ sw $ra, 0x1c($sp) -/* CC45C0 80240DB0 AFB10014 */ sw $s1, 0x14($sp) -/* CC45C4 80240DB4 AFB00010 */ sw $s0, 0x10($sp) -/* CC45C8 80240DB8 8E510148 */ lw $s1, 0x148($s2) -/* CC45CC 80240DBC 0C00EABB */ jal get_npc_unsafe -/* CC45D0 80240DC0 86240008 */ lh $a0, 8($s1) -/* CC45D4 80240DC4 0040802D */ daddu $s0, $v0, $zero -/* CC45D8 80240DC8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CC45DC 80240DCC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CC45E0 80240DD0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CC45E4 80240DD4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CC45E8 80240DD8 A600008E */ sh $zero, 0x8e($s0) -/* CC45EC 80240DDC 8C460028 */ lw $a2, 0x28($v0) -/* CC45F0 80240DE0 0C00A720 */ jal atan2 -/* CC45F4 80240DE4 8C470030 */ lw $a3, 0x30($v0) -/* CC45F8 80240DE8 E600000C */ swc1 $f0, 0xc($s0) -/* CC45FC 80240DEC 8E2200CC */ lw $v0, 0xcc($s1) -/* CC4600 80240DF0 8C420020 */ lw $v0, 0x20($v0) -/* CC4604 80240DF4 AE020028 */ sw $v0, 0x28($s0) -/* CC4608 80240DF8 2402000B */ addiu $v0, $zero, 0xb -/* CC460C 80240DFC AE420070 */ sw $v0, 0x70($s2) -/* CC4610 80240E00 8FBF001C */ lw $ra, 0x1c($sp) -/* CC4614 80240E04 8FB20018 */ lw $s2, 0x18($sp) -/* CC4618 80240E08 8FB10014 */ lw $s1, 0x14($sp) -/* CC461C 80240E0C 8FB00010 */ lw $s0, 0x10($sp) -/* CC4620 80240E10 03E00008 */ jr $ra -/* CC4624 80240E14 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_13/func_80240E18_CC3810.s b/asm/nonmatchings/world/area_flo/flo_13/func_80240E18_CC3810.s deleted file mode 100644 index 69e3b9a527..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/func_80240E18_CC3810.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E18_CC4628 -/* CC4628 80240E18 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CC462C 80240E1C AFB00010 */ sw $s0, 0x10($sp) -/* CC4630 80240E20 0080802D */ daddu $s0, $a0, $zero -/* CC4634 80240E24 AFBF0014 */ sw $ra, 0x14($sp) -/* CC4638 80240E28 8E020148 */ lw $v0, 0x148($s0) -/* CC463C 80240E2C 0C00EABB */ jal get_npc_unsafe -/* CC4640 80240E30 84440008 */ lh $a0, 8($v0) -/* CC4644 80240E34 9443008E */ lhu $v1, 0x8e($v0) -/* CC4648 80240E38 C440003C */ lwc1 $f0, 0x3c($v0) -/* CC464C 80240E3C 24640001 */ addiu $a0, $v1, 1 -/* CC4650 80240E40 00031C00 */ sll $v1, $v1, 0x10 -/* CC4654 80240E44 00031B83 */ sra $v1, $v1, 0xe -/* CC4658 80240E48 A444008E */ sh $a0, 0x8e($v0) -/* CC465C 80240E4C 3C018024 */ lui $at, 0x8024 -/* CC4660 80240E50 00230821 */ addu $at, $at, $v1 -/* CC4664 80240E54 C422412C */ lwc1 $f2, 0x412c($at) -/* CC4668 80240E58 8443008E */ lh $v1, 0x8e($v0) -/* CC466C 80240E5C 46020000 */ add.s $f0, $f0, $f2 -/* CC4670 80240E60 28630005 */ slti $v1, $v1, 5 -/* CC4674 80240E64 14600003 */ bnez $v1, .L80240E74 -/* CC4678 80240E68 E440003C */ swc1 $f0, 0x3c($v0) -/* CC467C 80240E6C 2402000C */ addiu $v0, $zero, 0xc -/* CC4680 80240E70 AE020070 */ sw $v0, 0x70($s0) -.L80240E74: -/* CC4684 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* CC4688 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* CC468C 80240E7C 03E00008 */ jr $ra -/* CC4690 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_13/func_80240E84_CC3810.s b/asm/nonmatchings/world/area_flo/flo_13/func_80240E84_CC3810.s deleted file mode 100644 index 341148f28f..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/func_80240E84_CC3810.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_CC4694 -/* CC4694 80240E84 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CC4698 80240E88 AFB3001C */ sw $s3, 0x1c($sp) -/* CC469C 80240E8C 0080982D */ daddu $s3, $a0, $zero -/* CC46A0 80240E90 AFBF0020 */ sw $ra, 0x20($sp) -/* CC46A4 80240E94 AFB20018 */ sw $s2, 0x18($sp) -/* CC46A8 80240E98 AFB10014 */ sw $s1, 0x14($sp) -/* CC46AC 80240E9C AFB00010 */ sw $s0, 0x10($sp) -/* CC46B0 80240EA0 8E720148 */ lw $s2, 0x148($s3) -/* CC46B4 80240EA4 86440008 */ lh $a0, 8($s2) -/* CC46B8 80240EA8 0C00EABB */ jal get_npc_unsafe -/* CC46BC 80240EAC 00A0802D */ daddu $s0, $a1, $zero -/* CC46C0 80240EB0 0040882D */ daddu $s1, $v0, $zero -/* CC46C4 80240EB4 C6420080 */ lwc1 $f2, 0x80($s2) -/* CC46C8 80240EB8 468010A0 */ cvt.s.w $f2, $f2 -/* CC46CC 80240EBC 460010A1 */ cvt.d.s $f2, $f2 -/* CC46D0 80240EC0 C6400084 */ lwc1 $f0, 0x84($s2) -/* CC46D4 80240EC4 46800020 */ cvt.s.w $f0, $f0 -/* CC46D8 80240EC8 46000021 */ cvt.d.s $f0, $f0 -/* CC46DC 80240ECC 3C014059 */ lui $at, 0x4059 -/* CC46E0 80240ED0 44812800 */ mtc1 $at, $f5 -/* CC46E4 80240ED4 44802000 */ mtc1 $zero, $f4 -/* CC46E8 80240ED8 8E4200CC */ lw $v0, 0xcc($s2) -/* CC46EC 80240EDC C62C0038 */ lwc1 $f12, 0x38($s1) -/* CC46F0 80240EE0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* CC46F4 80240EE4 46241083 */ div.d $f2, $f2, $f4 -/* CC46F8 80240EE8 462010A0 */ cvt.s.d $f2, $f2 -/* CC46FC 80240EEC 46240003 */ div.d $f0, $f0, $f4 -/* CC4700 80240EF0 8C420020 */ lw $v0, 0x20($v0) -/* CC4704 80240EF4 46200020 */ cvt.s.d $f0, $f0 -/* CC4708 80240EF8 E622001C */ swc1 $f2, 0x1c($s1) -/* CC470C 80240EFC E6200014 */ swc1 $f0, 0x14($s1) -/* CC4710 80240F00 AE220028 */ sw $v0, 0x28($s1) -/* CC4714 80240F04 C6000018 */ lwc1 $f0, 0x18($s0) -/* CC4718 80240F08 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CC471C 80240F0C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CC4720 80240F10 E6200018 */ swc1 $f0, 0x18($s1) -/* CC4724 80240F14 8C460028 */ lw $a2, 0x28($v0) -/* CC4728 80240F18 0C00A720 */ jal atan2 -/* CC472C 80240F1C 8C470030 */ lw $a3, 0x30($v0) -/* CC4730 80240F20 E620000C */ swc1 $f0, 0xc($s1) -/* CC4734 80240F24 8E420018 */ lw $v0, 0x18($s2) -/* CC4738 80240F28 AE400074 */ sw $zero, 0x74($s2) -/* CC473C 80240F2C 9442002A */ lhu $v0, 0x2a($v0) -/* CC4740 80240F30 30420002 */ andi $v0, $v0, 2 -/* CC4744 80240F34 10400005 */ beqz $v0, .L80240F4C -/* CC4748 80240F38 24020003 */ addiu $v0, $zero, 3 -/* CC474C 80240F3C A622008E */ sh $v0, 0x8e($s1) -/* CC4750 80240F40 2402000D */ addiu $v0, $zero, 0xd -/* CC4754 80240F44 080903E7 */ j .L80240F9C -/* CC4758 80240F48 AE620070 */ sw $v0, 0x70($s3) -.L80240F4C: -/* CC475C 80240F4C 24030001 */ addiu $v1, $zero, 1 -/* CC4760 80240F50 2402000E */ addiu $v0, $zero, 0xe -/* CC4764 80240F54 A623008E */ sh $v1, 0x8e($s1) -/* CC4768 80240F58 AE620070 */ sw $v0, 0x70($s3) -/* CC476C 80240F5C C6200038 */ lwc1 $f0, 0x38($s1) -/* CC4770 80240F60 4600018D */ trunc.w.s $f6, $f0 -/* CC4774 80240F64 44023000 */ mfc1 $v0, $f6 -/* CC4778 80240F68 00000000 */ nop -/* CC477C 80240F6C A6420010 */ sh $v0, 0x10($s2) -/* CC4780 80240F70 C620003C */ lwc1 $f0, 0x3c($s1) -/* CC4784 80240F74 4600018D */ trunc.w.s $f6, $f0 -/* CC4788 80240F78 44023000 */ mfc1 $v0, $f6 -/* CC478C 80240F7C 00000000 */ nop -/* CC4790 80240F80 A6420012 */ sh $v0, 0x12($s2) -/* CC4794 80240F84 C6200040 */ lwc1 $f0, 0x40($s1) -/* CC4798 80240F88 A2430007 */ sb $v1, 7($s2) -/* CC479C 80240F8C 4600018D */ trunc.w.s $f6, $f0 -/* CC47A0 80240F90 44023000 */ mfc1 $v0, $f6 -/* CC47A4 80240F94 00000000 */ nop -/* CC47A8 80240F98 A6420014 */ sh $v0, 0x14($s2) -.L80240F9C: -/* CC47AC 80240F9C 8FBF0020 */ lw $ra, 0x20($sp) -/* CC47B0 80240FA0 8FB3001C */ lw $s3, 0x1c($sp) -/* CC47B4 80240FA4 8FB20018 */ lw $s2, 0x18($sp) -/* CC47B8 80240FA8 8FB10014 */ lw $s1, 0x14($sp) -/* CC47BC 80240FAC 8FB00010 */ lw $s0, 0x10($sp) -/* CC47C0 80240FB0 03E00008 */ jr $ra -/* CC47C4 80240FB4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_13/func_80240FB8_CC3810.s b/asm/nonmatchings/world/area_flo/flo_13/func_80240FB8_CC3810.s deleted file mode 100644 index 4e1db15cd2..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/func_80240FB8_CC3810.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FB8_CC47C8 -/* CC47C8 80240FB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CC47CC 80240FBC AFB00010 */ sw $s0, 0x10($sp) -/* CC47D0 80240FC0 0080802D */ daddu $s0, $a0, $zero -/* CC47D4 80240FC4 AFBF0014 */ sw $ra, 0x14($sp) -/* CC47D8 80240FC8 8E020148 */ lw $v0, 0x148($s0) -/* CC47DC 80240FCC 0C00EABB */ jal get_npc_unsafe -/* CC47E0 80240FD0 84440008 */ lh $a0, 8($v0) -/* CC47E4 80240FD4 0040202D */ daddu $a0, $v0, $zero -/* CC47E8 80240FD8 8482008E */ lh $v0, 0x8e($a0) -/* CC47EC 80240FDC 9483008E */ lhu $v1, 0x8e($a0) -/* CC47F0 80240FE0 18400005 */ blez $v0, .L80240FF8 -/* CC47F4 80240FE4 2462FFFF */ addiu $v0, $v1, -1 -/* CC47F8 80240FE8 A482008E */ sh $v0, 0x8e($a0) -/* CC47FC 80240FEC 00021400 */ sll $v0, $v0, 0x10 -/* CC4800 80240FF0 1C400006 */ bgtz $v0, .L8024100C -/* CC4804 80240FF4 00000000 */ nop -.L80240FF8: -/* CC4808 80240FF8 8482008C */ lh $v0, 0x8c($a0) -/* CC480C 80240FFC 14400003 */ bnez $v0, .L8024100C -/* CC4810 80241000 2402000E */ addiu $v0, $zero, 0xe -/* CC4814 80241004 A480008E */ sh $zero, 0x8e($a0) -/* CC4818 80241008 AE020070 */ sw $v0, 0x70($s0) -.L8024100C: -/* CC481C 8024100C 8FBF0014 */ lw $ra, 0x14($sp) -/* CC4820 80241010 8FB00010 */ lw $s0, 0x10($sp) -/* CC4824 80241014 03E00008 */ jr $ra -/* CC4828 80241018 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_13/func_8024101C_CC3810.s b/asm/nonmatchings/world/area_flo/flo_13/func_8024101C_CC3810.s deleted file mode 100644 index 90c6883203..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/func_8024101C_CC3810.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024101C_CC482C -/* CC482C 8024101C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CC4830 80241020 AFB20030 */ sw $s2, 0x30($sp) -/* CC4834 80241024 0080902D */ daddu $s2, $a0, $zero -/* CC4838 80241028 AFBF0038 */ sw $ra, 0x38($sp) -/* CC483C 8024102C AFB30034 */ sw $s3, 0x34($sp) -/* CC4840 80241030 AFB1002C */ sw $s1, 0x2c($sp) -/* CC4844 80241034 AFB00028 */ sw $s0, 0x28($sp) -/* CC4848 80241038 F7B60048 */ sdc1 $f22, 0x48($sp) -/* CC484C 8024103C F7B40040 */ sdc1 $f20, 0x40($sp) -/* CC4850 80241040 8E510148 */ lw $s1, 0x148($s2) -/* CC4854 80241044 86240008 */ lh $a0, 8($s1) -/* CC4858 80241048 0C00EABB */ jal get_npc_unsafe -/* CC485C 8024104C 00A0982D */ daddu $s3, $a1, $zero -/* CC4860 80241050 0040802D */ daddu $s0, $v0, $zero -/* CC4864 80241054 0200202D */ daddu $a0, $s0, $zero -/* CC4868 80241058 C6220088 */ lwc1 $f2, 0x88($s1) -/* CC486C 8024105C 468010A0 */ cvt.s.w $f2, $f2 -/* CC4870 80241060 460010A1 */ cvt.d.s $f2, $f2 -/* CC4874 80241064 C604001C */ lwc1 $f4, 0x1c($s0) -/* CC4878 80241068 C6000014 */ lwc1 $f0, 0x14($s0) -/* CC487C 8024106C 8E050018 */ lw $a1, 0x18($s0) -/* CC4880 80241070 46002100 */ add.s $f4, $f4, $f0 -/* CC4884 80241074 8E06000C */ lw $a2, 0xc($s0) -/* CC4888 80241078 C6200078 */ lwc1 $f0, 0x78($s1) -/* CC488C 8024107C 46800020 */ cvt.s.w $f0, $f0 -/* CC4890 80241080 E604001C */ swc1 $f4, 0x1c($s0) -/* CC4894 80241084 3C014059 */ lui $at, 0x4059 -/* CC4898 80241088 44812800 */ mtc1 $at, $f5 -/* CC489C 8024108C 44802000 */ mtc1 $zero, $f4 -/* CC48A0 80241090 46000021 */ cvt.d.s $f0, $f0 -/* CC48A4 80241094 46240003 */ div.d $f0, $f0, $f4 -/* CC48A8 80241098 46200520 */ cvt.s.d $f20, $f0 -/* CC48AC 8024109C 46241083 */ div.d $f2, $f2, $f4 -/* CC48B0 802410A0 0C00EA95 */ jal npc_move_heading -/* CC48B4 802410A4 462015A0 */ cvt.s.d $f22, $f2 -/* CC48B8 802410A8 C604001C */ lwc1 $f4, 0x1c($s0) -/* CC48BC 802410AC 44801000 */ mtc1 $zero, $f2 -/* CC48C0 802410B0 44801800 */ mtc1 $zero, $f3 -/* CC48C4 802410B4 46002021 */ cvt.d.s $f0, $f4 -/* CC48C8 802410B8 4620103E */ c.le.d $f2, $f0 -/* CC48CC 802410BC 00000000 */ nop -/* CC48D0 802410C0 45000030 */ bc1f .L80241184 -/* CC48D4 802410C4 00000000 */ nop -/* CC48D8 802410C8 C600003C */ lwc1 $f0, 0x3c($s0) -/* CC48DC 802410CC 46040000 */ add.s $f0, $f0, $f4 -/* CC48E0 802410D0 E600003C */ swc1 $f0, 0x3c($s0) -/* CC48E4 802410D4 8E2200CC */ lw $v0, 0xcc($s1) -/* CC48E8 802410D8 8C420024 */ lw $v0, 0x24($v0) -/* CC48EC 802410DC AE020028 */ sw $v0, 0x28($s0) -/* CC48F0 802410E0 A2200007 */ sb $zero, 7($s1) -/* CC48F4 802410E4 8E020000 */ lw $v0, ($s0) -/* CC48F8 802410E8 30420008 */ andi $v0, $v0, 8 -/* CC48FC 802410EC 14400011 */ bnez $v0, .L80241134 -/* CC4900 802410F0 0000102D */ daddu $v0, $zero, $zero -/* CC4904 802410F4 27A50018 */ addiu $a1, $sp, 0x18 -/* CC4908 802410F8 27A6001C */ addiu $a2, $sp, 0x1c -/* CC490C 802410FC C6000038 */ lwc1 $f0, 0x38($s0) -/* CC4910 80241100 C602003C */ lwc1 $f2, 0x3c($s0) -/* CC4914 80241104 C6040040 */ lwc1 $f4, 0x40($s0) -/* CC4918 80241108 3C01447A */ lui $at, 0x447a -/* CC491C 8024110C 44813000 */ mtc1 $at, $f6 -/* CC4920 80241110 27A20024 */ addiu $v0, $sp, 0x24 -/* CC4924 80241114 E7A00018 */ swc1 $f0, 0x18($sp) -/* CC4928 80241118 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CC492C 8024111C E7A40020 */ swc1 $f4, 0x20($sp) -/* CC4930 80241120 E7A60024 */ swc1 $f6, 0x24($sp) -/* CC4934 80241124 AFA20010 */ sw $v0, 0x10($sp) -/* CC4938 80241128 8E040080 */ lw $a0, 0x80($s0) -/* CC493C 8024112C 0C0372DF */ jal func_800DCB7C -/* CC4940 80241130 27A70020 */ addiu $a3, $sp, 0x20 -.L80241134: -/* CC4944 80241134 1040000B */ beqz $v0, .L80241164 -/* CC4948 80241138 00000000 */ nop -/* CC494C 8024113C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CC4950 80241140 46140080 */ add.s $f2, $f0, $f20 -/* CC4954 80241144 C600003C */ lwc1 $f0, 0x3c($s0) -/* CC4958 80241148 4600103E */ c.le.s $f2, $f0 -/* CC495C 8024114C 00000000 */ nop -/* CC4960 80241150 4500008D */ bc1f .L80241388 -/* CC4964 80241154 00000000 */ nop -/* CC4968 80241158 E602003C */ swc1 $f2, 0x3c($s0) -/* CC496C 8024115C 080904E2 */ j .L80241388 -/* CC4970 80241160 AE400070 */ sw $zero, 0x70($s2) -.L80241164: -/* CC4974 80241164 C602003C */ lwc1 $f2, 0x3c($s0) -/* CC4978 80241168 C6000064 */ lwc1 $f0, 0x64($s0) -/* CC497C 8024116C 4602003E */ c.le.s $f0, $f2 -/* CC4980 80241170 00000000 */ nop -/* CC4984 80241174 45030084 */ bc1tl .L80241388 -/* CC4988 80241178 AE400070 */ sw $zero, 0x70($s2) -/* CC498C 8024117C 080904E2 */ j .L80241388 -/* CC4990 80241180 00000000 */ nop -.L80241184: -/* CC4994 80241184 4622003C */ c.lt.d $f0, $f2 -/* CC4998 80241188 00000000 */ nop -/* CC499C 8024118C 4500007E */ bc1f .L80241388 -/* CC49A0 80241190 00000000 */ nop -/* CC49A4 80241194 9602008E */ lhu $v0, 0x8e($s0) -/* CC49A8 80241198 24420001 */ addiu $v0, $v0, 1 -/* CC49AC 8024119C A602008E */ sh $v0, 0x8e($s0) -/* CC49B0 802411A0 00021400 */ sll $v0, $v0, 0x10 -/* CC49B4 802411A4 8E630020 */ lw $v1, 0x20($s3) -/* CC49B8 802411A8 00021403 */ sra $v0, $v0, 0x10 -/* CC49BC 802411AC 0043102A */ slt $v0, $v0, $v1 -/* CC49C0 802411B0 14400026 */ bnez $v0, .L8024124C -/* CC49C4 802411B4 00000000 */ nop -/* CC49C8 802411B8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CC49CC 802411BC C60E0040 */ lwc1 $f14, 0x40($s0) -/* CC49D0 802411C0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CC49D4 802411C4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CC49D8 802411C8 A600008E */ sh $zero, 0x8e($s0) -/* CC49DC 802411CC 8C460028 */ lw $a2, 0x28($v0) -/* CC49E0 802411D0 0C00A720 */ jal atan2 -/* CC49E4 802411D4 8C470030 */ lw $a3, 0x30($v0) -/* CC49E8 802411D8 46000506 */ mov.s $f20, $f0 -/* CC49EC 802411DC C60C000C */ lwc1 $f12, 0xc($s0) -/* CC49F0 802411E0 0C00A70A */ jal get_clamped_angle_diff -/* CC49F4 802411E4 4600A386 */ mov.s $f14, $f20 -/* CC49F8 802411E8 46000086 */ mov.s $f2, $f0 -/* CC49FC 802411EC 8E62001C */ lw $v0, 0x1c($s3) -/* CC4A00 802411F0 46001005 */ abs.s $f0, $f2 -/* CC4A04 802411F4 44822000 */ mtc1 $v0, $f4 -/* CC4A08 802411F8 00000000 */ nop -/* CC4A0C 802411FC 46802120 */ cvt.s.w $f4, $f4 -/* CC4A10 80241200 4600203C */ c.lt.s $f4, $f0 -/* CC4A14 80241204 00000000 */ nop -/* CC4A18 80241208 4500000D */ bc1f .L80241240 -/* CC4A1C 8024120C 00000000 */ nop -/* CC4A20 80241210 44800000 */ mtc1 $zero, $f0 -/* CC4A24 80241214 C614000C */ lwc1 $f20, 0xc($s0) -/* CC4A28 80241218 4600103C */ c.lt.s $f2, $f0 -/* CC4A2C 8024121C 00000000 */ nop -/* CC4A30 80241220 45000006 */ bc1f .L8024123C -/* CC4A34 80241224 00021023 */ negu $v0, $v0 -/* CC4A38 80241228 44820000 */ mtc1 $v0, $f0 -/* CC4A3C 8024122C 00000000 */ nop -/* CC4A40 80241230 46800020 */ cvt.s.w $f0, $f0 -/* CC4A44 80241234 08090490 */ j .L80241240 -/* CC4A48 80241238 4600A500 */ add.s $f20, $f20, $f0 -.L8024123C: -/* CC4A4C 8024123C 4604A500 */ add.s $f20, $f20, $f4 -.L80241240: -/* CC4A50 80241240 0C00A6C9 */ jal clamp_angle -/* CC4A54 80241244 4600A306 */ mov.s $f12, $f20 -/* CC4A58 80241248 E600000C */ swc1 $f0, 0xc($s0) -.L8024124C: -/* CC4A5C 8024124C 8E020000 */ lw $v0, ($s0) -/* CC4A60 80241250 30420008 */ andi $v0, $v0, 8 -/* CC4A64 80241254 1040000A */ beqz $v0, .L80241280 -/* CC4A68 80241258 27A50018 */ addiu $a1, $sp, 0x18 -/* CC4A6C 8024125C C602003C */ lwc1 $f2, 0x3c($s0) -/* CC4A70 80241260 C600001C */ lwc1 $f0, 0x1c($s0) -/* CC4A74 80241264 46001080 */ add.s $f2, $f2, $f0 -/* CC4A78 80241268 4616103C */ c.lt.s $f2, $f22 -/* CC4A7C 8024126C 00000000 */ nop -/* CC4A80 80241270 45020045 */ bc1fl .L80241388 -/* CC4A84 80241274 E602003C */ swc1 $f2, 0x3c($s0) -/* CC4A88 80241278 080904E1 */ j .L80241384 -/* CC4A8C 8024127C E616003C */ swc1 $f22, 0x3c($s0) -.L80241280: -/* CC4A90 80241280 C6000038 */ lwc1 $f0, 0x38($s0) -/* CC4A94 80241284 27A6001C */ addiu $a2, $sp, 0x1c -/* CC4A98 80241288 E7A00018 */ swc1 $f0, 0x18($sp) -/* CC4A9C 8024128C 860200A8 */ lh $v0, 0xa8($s0) -/* CC4AA0 80241290 C600001C */ lwc1 $f0, 0x1c($s0) -/* CC4AA4 80241294 C604003C */ lwc1 $f4, 0x3c($s0) -/* CC4AA8 80241298 44821000 */ mtc1 $v0, $f2 -/* CC4AAC 8024129C 00000000 */ nop -/* CC4AB0 802412A0 468010A0 */ cvt.s.w $f2, $f2 -/* CC4AB4 802412A4 46000005 */ abs.s $f0, $f0 -/* CC4AB8 802412A8 46020000 */ add.s $f0, $f0, $f2 -/* CC4ABC 802412AC C6060040 */ lwc1 $f6, 0x40($s0) -/* CC4AC0 802412B0 27A20024 */ addiu $v0, $sp, 0x24 -/* CC4AC4 802412B4 46022100 */ add.s $f4, $f4, $f2 -/* CC4AC8 802412B8 3C014024 */ lui $at, 0x4024 -/* CC4ACC 802412BC 44811800 */ mtc1 $at, $f3 -/* CC4AD0 802412C0 44801000 */ mtc1 $zero, $f2 -/* CC4AD4 802412C4 46000021 */ cvt.d.s $f0, $f0 -/* CC4AD8 802412C8 46220000 */ add.d $f0, $f0, $f2 -/* CC4ADC 802412CC E7A60020 */ swc1 $f6, 0x20($sp) -/* CC4AE0 802412D0 E7A4001C */ swc1 $f4, 0x1c($sp) -/* CC4AE4 802412D4 46200020 */ cvt.s.d $f0, $f0 -/* CC4AE8 802412D8 E7A00024 */ swc1 $f0, 0x24($sp) -/* CC4AEC 802412DC AFA20010 */ sw $v0, 0x10($sp) -/* CC4AF0 802412E0 8E040080 */ lw $a0, 0x80($s0) -/* CC4AF4 802412E4 0C0372DF */ jal func_800DCB7C -/* CC4AF8 802412E8 27A70020 */ addiu $a3, $sp, 0x20 -/* CC4AFC 802412EC 10400015 */ beqz $v0, .L80241344 -/* CC4B00 802412F0 00000000 */ nop -/* CC4B04 802412F4 860200A8 */ lh $v0, 0xa8($s0) -/* CC4B08 802412F8 C604001C */ lwc1 $f4, 0x1c($s0) -/* CC4B0C 802412FC 44820000 */ mtc1 $v0, $f0 -/* CC4B10 80241300 00000000 */ nop -/* CC4B14 80241304 46800020 */ cvt.s.w $f0, $f0 -/* CC4B18 80241308 46002085 */ abs.s $f2, $f4 -/* CC4B1C 8024130C 46020000 */ add.s $f0, $f0, $f2 -/* CC4B20 80241310 C7A20024 */ lwc1 $f2, 0x24($sp) -/* CC4B24 80241314 4600103E */ c.le.s $f2, $f0 -/* CC4B28 80241318 00000000 */ nop -/* CC4B2C 8024131C 45000005 */ bc1f .L80241334 -/* CC4B30 80241320 00000000 */ nop -/* CC4B34 80241324 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CC4B38 80241328 AE00001C */ sw $zero, 0x1c($s0) -/* CC4B3C 8024132C 080904E2 */ j .L80241388 -/* CC4B40 80241330 E600003C */ swc1 $f0, 0x3c($s0) -.L80241334: -/* CC4B44 80241334 C600003C */ lwc1 $f0, 0x3c($s0) -/* CC4B48 80241338 46040000 */ add.s $f0, $f0, $f4 -/* CC4B4C 8024133C 080904E2 */ j .L80241388 -/* CC4B50 80241340 E600003C */ swc1 $f0, 0x3c($s0) -.L80241344: -/* CC4B54 80241344 C606003C */ lwc1 $f6, 0x3c($s0) -/* CC4B58 80241348 860200A8 */ lh $v0, 0xa8($s0) -/* CC4B5C 8024134C 46163081 */ sub.s $f2, $f6, $f22 -/* CC4B60 80241350 44820000 */ mtc1 $v0, $f0 -/* CC4B64 80241354 00000000 */ nop -/* CC4B68 80241358 46800020 */ cvt.s.w $f0, $f0 -/* CC4B6C 8024135C 46001080 */ add.s $f2, $f2, $f0 -/* CC4B70 80241360 C604001C */ lwc1 $f4, 0x1c($s0) -/* CC4B74 80241364 46002005 */ abs.s $f0, $f4 -/* CC4B78 80241368 4602003C */ c.lt.s $f0, $f2 -/* CC4B7C 8024136C 00000000 */ nop -/* CC4B80 80241370 45020005 */ bc1fl .L80241388 -/* CC4B84 80241374 AE00001C */ sw $zero, 0x1c($s0) -/* CC4B88 80241378 46043000 */ add.s $f0, $f6, $f4 -/* CC4B8C 8024137C 080904E2 */ j .L80241388 -/* CC4B90 80241380 E600003C */ swc1 $f0, 0x3c($s0) -.L80241384: -/* CC4B94 80241384 AE00001C */ sw $zero, 0x1c($s0) -.L80241388: -/* CC4B98 80241388 8FBF0038 */ lw $ra, 0x38($sp) -/* CC4B9C 8024138C 8FB30034 */ lw $s3, 0x34($sp) -/* CC4BA0 80241390 8FB20030 */ lw $s2, 0x30($sp) -/* CC4BA4 80241394 8FB1002C */ lw $s1, 0x2c($sp) -/* CC4BA8 80241398 8FB00028 */ lw $s0, 0x28($sp) -/* CC4BAC 8024139C D7B60048 */ ldc1 $f22, 0x48($sp) -/* CC4BB0 802413A0 D7B40040 */ ldc1 $f20, 0x40($sp) -/* CC4BB4 802413A4 03E00008 */ jr $ra -/* CC4BB8 802413A8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_13/func_802413AC_CC3810.s b/asm/nonmatchings/world/area_flo/flo_13/func_802413AC_CC3810.s deleted file mode 100644 index aa550297bb..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/func_802413AC_CC3810.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413AC_CC4BBC -/* CC4BBC 802413AC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CC4BC0 802413B0 AFB00028 */ sw $s0, 0x28($sp) -/* CC4BC4 802413B4 00A0802D */ daddu $s0, $a1, $zero -/* CC4BC8 802413B8 AFB1002C */ sw $s1, 0x2c($sp) -/* CC4BCC 802413BC 00C0882D */ daddu $s1, $a2, $zero -/* CC4BD0 802413C0 AFBF0034 */ sw $ra, 0x34($sp) -/* CC4BD4 802413C4 AFB20030 */ sw $s2, 0x30($sp) -/* CC4BD8 802413C8 AE200070 */ sw $zero, 0x70($s1) -/* CC4BDC 802413CC 8C830000 */ lw $v1, ($a0) -/* CC4BE0 802413D0 2402FDFF */ addiu $v0, $zero, -0x201 -/* CC4BE4 802413D4 A480008E */ sh $zero, 0x8e($a0) -/* CC4BE8 802413D8 00621824 */ and $v1, $v1, $v0 -/* CC4BEC 802413DC 34650800 */ ori $a1, $v1, 0x800 -/* CC4BF0 802413E0 AC850000 */ sw $a1, ($a0) -/* CC4BF4 802413E4 8E0200D0 */ lw $v0, 0xd0($s0) -/* CC4BF8 802413E8 8C420034 */ lw $v0, 0x34($v0) -/* CC4BFC 802413EC 10400003 */ beqz $v0, .L802413FC -/* CC4C00 802413F0 00E0902D */ daddu $s2, $a3, $zero -/* CC4C04 802413F4 08090501 */ j .L80241404 -/* CC4C08 802413F8 34620808 */ ori $v0, $v1, 0x808 -.L802413FC: -/* CC4C0C 802413FC 2402FFF7 */ addiu $v0, $zero, -9 -/* CC4C10 80241400 00A21024 */ and $v0, $a1, $v0 -.L80241404: -/* CC4C14 80241404 AC820000 */ sw $v0, ($a0) -/* CC4C18 80241408 27A20024 */ addiu $v0, $sp, 0x24 -/* CC4C1C 8024140C 27A50018 */ addiu $a1, $sp, 0x18 -/* CC4C20 80241410 C4800038 */ lwc1 $f0, 0x38($a0) -/* CC4C24 80241414 C482003C */ lwc1 $f2, 0x3c($a0) -/* CC4C28 80241418 C4840040 */ lwc1 $f4, 0x40($a0) -/* CC4C2C 8024141C 3C01447A */ lui $at, 0x447a -/* CC4C30 80241420 44813000 */ mtc1 $at, $f6 -/* CC4C34 80241424 27A6001C */ addiu $a2, $sp, 0x1c -/* CC4C38 80241428 E7A00018 */ swc1 $f0, 0x18($sp) -/* CC4C3C 8024142C E7A2001C */ swc1 $f2, 0x1c($sp) -/* CC4C40 80241430 E7A40020 */ swc1 $f4, 0x20($sp) -/* CC4C44 80241434 E7A60024 */ swc1 $f6, 0x24($sp) -/* CC4C48 80241438 AFA20010 */ sw $v0, 0x10($sp) -/* CC4C4C 8024143C 8C840080 */ lw $a0, 0x80($a0) -/* CC4C50 80241440 0C0372DF */ jal func_800DCB7C -/* CC4C54 80241444 27A70020 */ addiu $a3, $sp, 0x20 -/* CC4C58 80241448 C7A20024 */ lwc1 $f2, 0x24($sp) -/* CC4C5C 8024144C 3C014059 */ lui $at, 0x4059 -/* CC4C60 80241450 44812800 */ mtc1 $at, $f5 -/* CC4C64 80241454 44802000 */ mtc1 $zero, $f4 -/* CC4C68 80241458 460010A1 */ cvt.d.s $f2, $f2 -/* CC4C6C 8024145C 46241082 */ mul.d $f2, $f2, $f4 -/* CC4C70 80241460 00000000 */ nop -/* CC4C74 80241464 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CC4C78 80241468 46000021 */ cvt.d.s $f0, $f0 -/* CC4C7C 8024146C 46240002 */ mul.d $f0, $f0, $f4 -/* CC4C80 80241470 00000000 */ nop -/* CC4C84 80241474 3C013FE0 */ lui $at, 0x3fe0 -/* CC4C88 80241478 44812800 */ mtc1 $at, $f5 -/* CC4C8C 8024147C 44802000 */ mtc1 $zero, $f4 -/* CC4C90 80241480 00000000 */ nop -/* CC4C94 80241484 46241080 */ add.d $f2, $f2, $f4 -/* CC4C98 80241488 AE000074 */ sw $zero, 0x74($s0) -/* CC4C9C 8024148C 46240000 */ add.d $f0, $f0, $f4 -/* CC4CA0 80241490 AE000090 */ sw $zero, 0x90($s0) -/* CC4CA4 80241494 4620120D */ trunc.w.d $f8, $f2 -/* CC4CA8 80241498 E6080078 */ swc1 $f8, 0x78($s0) -/* CC4CAC 8024149C 4620020D */ trunc.w.d $f8, $f0 -/* CC4CB0 802414A0 E6080088 */ swc1 $f8, 0x88($s0) -/* CC4CB4 802414A4 8E420014 */ lw $v0, 0x14($s2) -/* CC4CB8 802414A8 AE220074 */ sw $v0, 0x74($s1) -/* CC4CBC 802414AC 8E0200B0 */ lw $v0, 0xb0($s0) -/* CC4CC0 802414B0 34420010 */ ori $v0, $v0, 0x10 -/* CC4CC4 802414B4 AE0200B0 */ sw $v0, 0xb0($s0) -/* CC4CC8 802414B8 8FBF0034 */ lw $ra, 0x34($sp) -/* CC4CCC 802414BC 8FB20030 */ lw $s2, 0x30($sp) -/* CC4CD0 802414C0 8FB1002C */ lw $s1, 0x2c($sp) -/* CC4CD4 802414C4 8FB00028 */ lw $s0, 0x28($sp) -/* CC4CD8 802414C8 03E00008 */ jr $ra -/* CC4CDC 802414CC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_13/func_802414D0_CC3810.s b/asm/nonmatchings/world/area_flo/flo_13/func_802414D0_CC3810.s deleted file mode 100644 index 4e4224d3cd..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/func_802414D0_CC3810.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414D0_CC4CE0 -/* CC4CE0 802414D0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CC4CE4 802414D4 AFB40040 */ sw $s4, 0x40($sp) -/* CC4CE8 802414D8 0080A02D */ daddu $s4, $a0, $zero -/* CC4CEC 802414DC AFBF0048 */ sw $ra, 0x48($sp) -/* CC4CF0 802414E0 AFB50044 */ sw $s5, 0x44($sp) -/* CC4CF4 802414E4 AFB3003C */ sw $s3, 0x3c($sp) -/* CC4CF8 802414E8 AFB20038 */ sw $s2, 0x38($sp) -/* CC4CFC 802414EC AFB10034 */ sw $s1, 0x34($sp) -/* CC4D00 802414F0 AFB00030 */ sw $s0, 0x30($sp) -/* CC4D04 802414F4 8E920148 */ lw $s2, 0x148($s4) -/* CC4D08 802414F8 86440008 */ lh $a0, 8($s2) -/* CC4D0C 802414FC 8E90000C */ lw $s0, 0xc($s4) -/* CC4D10 80241500 0C00EABB */ jal get_npc_unsafe -/* CC4D14 80241504 00A0882D */ daddu $s1, $a1, $zero -/* CC4D18 80241508 0280202D */ daddu $a0, $s4, $zero -/* CC4D1C 8024150C 8E050000 */ lw $a1, ($s0) -/* CC4D20 80241510 0C0B1EAF */ jal get_variable -/* CC4D24 80241514 0040A82D */ daddu $s5, $v0, $zero -/* CC4D28 80241518 AFA00010 */ sw $zero, 0x10($sp) -/* CC4D2C 8024151C 8E4300D0 */ lw $v1, 0xd0($s2) -/* CC4D30 80241520 8C630030 */ lw $v1, 0x30($v1) -/* CC4D34 80241524 AFA30014 */ sw $v1, 0x14($sp) -/* CC4D38 80241528 8E4300D0 */ lw $v1, 0xd0($s2) -/* CC4D3C 8024152C 8C63001C */ lw $v1, 0x1c($v1) -/* CC4D40 80241530 AFA30018 */ sw $v1, 0x18($sp) -/* CC4D44 80241534 8E4300D0 */ lw $v1, 0xd0($s2) -/* CC4D48 80241538 8C630024 */ lw $v1, 0x24($v1) -/* CC4D4C 8024153C AFA3001C */ sw $v1, 0x1c($sp) -/* CC4D50 80241540 8E4300D0 */ lw $v1, 0xd0($s2) -/* CC4D54 80241544 8C630028 */ lw $v1, 0x28($v1) -/* CC4D58 80241548 27B30010 */ addiu $s3, $sp, 0x10 -/* CC4D5C 8024154C AFA30020 */ sw $v1, 0x20($sp) -/* CC4D60 80241550 8E4300D0 */ lw $v1, 0xd0($s2) -/* CC4D64 80241554 3C0142F0 */ lui $at, 0x42f0 -/* CC4D68 80241558 44810000 */ mtc1 $at, $f0 -/* CC4D6C 8024155C 8C63002C */ lw $v1, 0x2c($v1) -/* CC4D70 80241560 0040802D */ daddu $s0, $v0, $zero -/* CC4D74 80241564 E7A00028 */ swc1 $f0, 0x28($sp) -/* CC4D78 80241568 A7A0002C */ sh $zero, 0x2c($sp) -/* CC4D7C 8024156C 12200006 */ beqz $s1, .L80241588 -/* CC4D80 80241570 AFA30024 */ sw $v1, 0x24($sp) -/* CC4D84 80241574 02A0202D */ daddu $a0, $s5, $zero -/* CC4D88 80241578 0240282D */ daddu $a1, $s2, $zero -/* CC4D8C 8024157C 0280302D */ daddu $a2, $s4, $zero -/* CC4D90 80241580 0C0904EB */ jal func_802413AC -/* CC4D94 80241584 0200382D */ daddu $a3, $s0, $zero -.L80241588: -/* CC4D98 80241588 2402FFFE */ addiu $v0, $zero, -2 -/* CC4D9C 8024158C A2A200AB */ sb $v0, 0xab($s5) -/* CC4DA0 80241590 8E4300B0 */ lw $v1, 0xb0($s2) -/* CC4DA4 80241594 30620004 */ andi $v0, $v1, 4 -/* CC4DA8 80241598 10400007 */ beqz $v0, .L802415B8 -/* CC4DAC 8024159C 00000000 */ nop -/* CC4DB0 802415A0 824200B4 */ lb $v0, 0xb4($s2) -/* CC4DB4 802415A4 1440003C */ bnez $v0, .L80241698 -/* CC4DB8 802415A8 0000102D */ daddu $v0, $zero, $zero -/* CC4DBC 802415AC 2402FFFB */ addiu $v0, $zero, -5 -/* CC4DC0 802415B0 00621024 */ and $v0, $v1, $v0 -/* CC4DC4 802415B4 AE4200B0 */ sw $v0, 0xb0($s2) -.L802415B8: -/* CC4DC8 802415B8 8E830070 */ lw $v1, 0x70($s4) -/* CC4DCC 802415BC 2C62000F */ sltiu $v0, $v1, 0xf -/* CC4DD0 802415C0 10400034 */ beqz $v0, .L80241694 -/* CC4DD4 802415C4 00031080 */ sll $v0, $v1, 2 -/* CC4DD8 802415C8 3C018024 */ lui $at, 0x8024 -/* CC4DDC 802415CC 00220821 */ addu $at, $at, $v0 -/* CC4DE0 802415D0 8C227A48 */ lw $v0, 0x7a48($at) -/* CC4DE4 802415D4 00400008 */ jr $v0 -/* CC4DE8 802415D8 00000000 */ nop -/* CC4DEC 802415DC 0280202D */ daddu $a0, $s4, $zero -/* CC4DF0 802415E0 0200282D */ daddu $a1, $s0, $zero -/* CC4DF4 802415E4 0C090071 */ jal func_802401C4 -/* CC4DF8 802415E8 0260302D */ daddu $a2, $s3, $zero -/* CC4DFC 802415EC 0280202D */ daddu $a0, $s4, $zero -/* CC4E00 802415F0 0200282D */ daddu $a1, $s0, $zero -/* CC4E04 802415F4 0C0900DD */ jal func_80240374 -/* CC4E08 802415F8 0260302D */ daddu $a2, $s3, $zero -/* CC4E0C 802415FC 080905A6 */ j .L80241698 -/* CC4E10 80241600 0000102D */ daddu $v0, $zero, $zero -/* CC4E14 80241604 0280202D */ daddu $a0, $s4, $zero -/* CC4E18 80241608 0200282D */ daddu $a1, $s0, $zero -/* CC4E1C 8024160C 0C090267 */ jal func_8024099C -/* CC4E20 80241610 0260302D */ daddu $a2, $s3, $zero -/* CC4E24 80241614 0280202D */ daddu $a0, $s4, $zero -/* CC4E28 80241618 0200282D */ daddu $a1, $s0, $zero -/* CC4E2C 8024161C 0C090297 */ jal func_80240A5C -/* CC4E30 80241620 0260302D */ daddu $a2, $s3, $zero -/* CC4E34 80241624 080905A6 */ j .L80241698 -/* CC4E38 80241628 0000102D */ daddu $v0, $zero, $zero -/* CC4E3C 8024162C 0280202D */ daddu $a0, $s4, $zero -/* CC4E40 80241630 0200282D */ daddu $a1, $s0, $zero -/* CC4E44 80241634 0C090368 */ jal func_80240DA0 -/* CC4E48 80241638 0260302D */ daddu $a2, $s3, $zero -/* CC4E4C 8024163C 0280202D */ daddu $a0, $s4, $zero -/* CC4E50 80241640 0200282D */ daddu $a1, $s0, $zero -/* CC4E54 80241644 0C090386 */ jal func_80240E18 -/* CC4E58 80241648 0260302D */ daddu $a2, $s3, $zero -/* CC4E5C 8024164C 080905A6 */ j .L80241698 -/* CC4E60 80241650 0000102D */ daddu $v0, $zero, $zero -/* CC4E64 80241654 0280202D */ daddu $a0, $s4, $zero -/* CC4E68 80241658 0200282D */ daddu $a1, $s0, $zero -/* CC4E6C 8024165C 0C0903A1 */ jal func_80240E84 -/* CC4E70 80241660 0260302D */ daddu $a2, $s3, $zero -/* CC4E74 80241664 080905A6 */ j .L80241698 -/* CC4E78 80241668 0000102D */ daddu $v0, $zero, $zero -/* CC4E7C 8024166C 0280202D */ daddu $a0, $s4, $zero -/* CC4E80 80241670 0200282D */ daddu $a1, $s0, $zero -/* CC4E84 80241674 0C0903EE */ jal func_80240FB8 -/* CC4E88 80241678 0260302D */ daddu $a2, $s3, $zero -/* CC4E8C 8024167C 080905A6 */ j .L80241698 -/* CC4E90 80241680 0000102D */ daddu $v0, $zero, $zero -/* CC4E94 80241684 0280202D */ daddu $a0, $s4, $zero -/* CC4E98 80241688 0200282D */ daddu $a1, $s0, $zero -/* CC4E9C 8024168C 0C090407 */ jal func_8024101C -/* CC4EA0 80241690 0260302D */ daddu $a2, $s3, $zero -.L80241694: -/* CC4EA4 80241694 0000102D */ daddu $v0, $zero, $zero -.L80241698: -/* CC4EA8 80241698 8FBF0048 */ lw $ra, 0x48($sp) -/* CC4EAC 8024169C 8FB50044 */ lw $s5, 0x44($sp) -/* CC4EB0 802416A0 8FB40040 */ lw $s4, 0x40($sp) -/* CC4EB4 802416A4 8FB3003C */ lw $s3, 0x3c($sp) -/* CC4EB8 802416A8 8FB20038 */ lw $s2, 0x38($sp) -/* CC4EBC 802416AC 8FB10034 */ lw $s1, 0x34($sp) -/* CC4EC0 802416B0 8FB00030 */ lw $s0, 0x30($sp) -/* CC4EC4 802416B4 03E00008 */ jr $ra -/* CC4EC8 802416B8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_13/func_802416BC_CC3810.s b/asm/nonmatchings/world/area_flo/flo_13/func_802416BC_CC3810.s deleted file mode 100644 index ba04ea4052..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/func_802416BC_CC3810.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416BC_CC4ECC -/* CC4ECC 802416BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CC4ED0 802416C0 AFB00010 */ sw $s0, 0x10($sp) -/* CC4ED4 802416C4 24100032 */ addiu $s0, $zero, 0x32 -/* CC4ED8 802416C8 AFBF0014 */ sw $ra, 0x14($sp) -.L802416CC: -/* CC4EDC 802416CC 0C00FB3A */ jal get_enemy -/* CC4EE0 802416D0 0200202D */ daddu $a0, $s0, $zero -/* CC4EE4 802416D4 8C420094 */ lw $v0, 0x94($v0) -/* CC4EE8 802416D8 54400003 */ bnel $v0, $zero, .L802416E8 -/* CC4EEC 802416DC 26100001 */ addiu $s0, $s0, 1 -/* CC4EF0 802416E0 080905BD */ j .L802416F4 -/* CC4EF4 802416E4 0200102D */ daddu $v0, $s0, $zero -.L802416E8: -/* CC4EF8 802416E8 2A020038 */ slti $v0, $s0, 0x38 -/* CC4EFC 802416EC 1440FFF7 */ bnez $v0, .L802416CC -/* CC4F00 802416F0 2402FFFF */ addiu $v0, $zero, -1 -.L802416F4: -/* CC4F04 802416F4 8FBF0014 */ lw $ra, 0x14($sp) -/* CC4F08 802416F8 8FB00010 */ lw $s0, 0x10($sp) -/* CC4F0C 802416FC 03E00008 */ jr $ra -/* CC4F10 80241700 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_13/func_80241B68_CC3810.s b/asm/nonmatchings/world/area_flo/flo_13/func_80241B68_CC3810.s deleted file mode 100644 index c82fc76421..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/func_80241B68_CC3810.s +++ /dev/null @@ -1,156 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B68_CC5378 -/* CC5378 80241B68 27BDFF98 */ addiu $sp, $sp, -0x68 -/* CC537C 80241B6C AFB20048 */ sw $s2, 0x48($sp) -/* CC5380 80241B70 0080902D */ daddu $s2, $a0, $zero -/* CC5384 80241B74 AFBF0054 */ sw $ra, 0x54($sp) -/* CC5388 80241B78 AFB40050 */ sw $s4, 0x50($sp) -/* CC538C 80241B7C AFB3004C */ sw $s3, 0x4c($sp) -/* CC5390 80241B80 AFB10044 */ sw $s1, 0x44($sp) -/* CC5394 80241B84 AFB00040 */ sw $s0, 0x40($sp) -/* CC5398 80241B88 F7B60060 */ sdc1 $f22, 0x60($sp) -/* CC539C 80241B8C F7B40058 */ sdc1 $f20, 0x58($sp) -/* CC53A0 80241B90 8E510148 */ lw $s1, 0x148($s2) -/* CC53A4 80241B94 00A0982D */ daddu $s3, $a1, $zero -/* CC53A8 80241B98 86240008 */ lh $a0, 8($s1) -/* CC53AC 80241B9C 0C00EABB */ jal get_npc_unsafe -/* CC53B0 80241BA0 00C0A02D */ daddu $s4, $a2, $zero -/* CC53B4 80241BA4 0040802D */ daddu $s0, $v0, $zero -/* CC53B8 80241BA8 C6200078 */ lwc1 $f0, 0x78($s1) -/* CC53BC 80241BAC 46800020 */ cvt.s.w $f0, $f0 -/* CC53C0 80241BB0 46000021 */ cvt.d.s $f0, $f0 -/* CC53C4 80241BB4 3C014059 */ lui $at, 0x4059 -/* CC53C8 80241BB8 44814800 */ mtc1 $at, $f9 -/* CC53CC 80241BBC 44804000 */ mtc1 $zero, $f8 -/* CC53D0 80241BC0 8602008E */ lh $v0, 0x8e($s0) -/* CC53D4 80241BC4 9603008E */ lhu $v1, 0x8e($s0) -/* CC53D8 80241BC8 46280003 */ div.d $f0, $f0, $f8 -/* CC53DC 80241BCC 18400003 */ blez $v0, .L80241BDC -/* CC53E0 80241BD0 462005A0 */ cvt.s.d $f22, $f0 -/* CC53E4 80241BD4 2462FFFF */ addiu $v0, $v1, -1 -/* CC53E8 80241BD8 A602008E */ sh $v0, 0x8e($s0) -.L80241BDC: -/* CC53EC 80241BDC 27A50028 */ addiu $a1, $sp, 0x28 -/* CC53F0 80241BE0 27A6002C */ addiu $a2, $sp, 0x2c -/* CC53F4 80241BE4 27A70030 */ addiu $a3, $sp, 0x30 -/* CC53F8 80241BE8 C6000038 */ lwc1 $f0, 0x38($s0) -/* CC53FC 80241BEC C602003C */ lwc1 $f2, 0x3c($s0) -/* CC5400 80241BF0 C6040040 */ lwc1 $f4, 0x40($s0) -/* CC5404 80241BF4 3C01447A */ lui $at, 0x447a -/* CC5408 80241BF8 44813000 */ mtc1 $at, $f6 -/* CC540C 80241BFC 27A20034 */ addiu $v0, $sp, 0x34 -/* CC5410 80241C00 E7A00028 */ swc1 $f0, 0x28($sp) -/* CC5414 80241C04 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CC5418 80241C08 E7A40030 */ swc1 $f4, 0x30($sp) -/* CC541C 80241C0C E7A60034 */ swc1 $f6, 0x34($sp) -/* CC5420 80241C10 C6340070 */ lwc1 $f20, 0x70($s1) -/* CC5424 80241C14 4680A520 */ cvt.s.w $f20, $f20 -/* CC5428 80241C18 4600A521 */ cvt.d.s $f20, $f20 -/* CC542C 80241C1C 4628A503 */ div.d $f20, $f20, $f8 -/* CC5430 80241C20 AFA20010 */ sw $v0, 0x10($sp) -/* CC5434 80241C24 8E040080 */ lw $a0, 0x80($s0) -/* CC5438 80241C28 0C0372DF */ jal func_800DCB7C -/* CC543C 80241C2C 4620A520 */ cvt.s.d $f20, $f20 -/* CC5440 80241C30 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CC5444 80241C34 0C00A8BB */ jal sin_deg -/* CC5448 80241C38 46806320 */ cvt.s.w $f12, $f12 -/* CC544C 80241C3C 46140002 */ mul.s $f0, $f0, $f20 -/* CC5450 80241C40 00000000 */ nop -/* CC5454 80241C44 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* CC5458 80241C48 46161080 */ add.s $f2, $f2, $f22 -/* CC545C 80241C4C 46001080 */ add.s $f2, $f2, $f0 -/* CC5460 80241C50 E602003C */ swc1 $f2, 0x3c($s0) -/* CC5464 80241C54 8E220074 */ lw $v0, 0x74($s1) -/* CC5468 80241C58 2442000C */ addiu $v0, $v0, 0xc -/* CC546C 80241C5C 44826000 */ mtc1 $v0, $f12 -/* CC5470 80241C60 00000000 */ nop -/* CC5474 80241C64 0C00A6C9 */ jal clamp_angle -/* CC5478 80241C68 46806320 */ cvt.s.w $f12, $f12 -/* CC547C 80241C6C 4600028D */ trunc.w.s $f10, $f0 -/* CC5480 80241C70 E62A0074 */ swc1 $f10, 0x74($s1) -/* CC5484 80241C74 0280202D */ daddu $a0, $s4, $zero -/* CC5488 80241C78 24020001 */ addiu $v0, $zero, 1 -/* CC548C 80241C7C AFA20010 */ sw $v0, 0x10($sp) -/* CC5490 80241C80 8E660024 */ lw $a2, 0x24($s3) -/* CC5494 80241C84 8E670028 */ lw $a3, 0x28($s3) -/* CC5498 80241C88 0C01242D */ jal func_800490B4 -/* CC549C 80241C8C 0220282D */ daddu $a1, $s1, $zero -/* CC54A0 80241C90 1040001D */ beqz $v0, .L80241D08 -/* CC54A4 80241C94 0000202D */ daddu $a0, $zero, $zero -/* CC54A8 80241C98 0200282D */ daddu $a1, $s0, $zero -/* CC54AC 80241C9C 0000302D */ daddu $a2, $zero, $zero -/* CC54B0 80241CA0 860300A8 */ lh $v1, 0xa8($s0) -/* CC54B4 80241CA4 3C013F80 */ lui $at, 0x3f80 -/* CC54B8 80241CA8 44810000 */ mtc1 $at, $f0 -/* CC54BC 80241CAC 3C014000 */ lui $at, 0x4000 -/* CC54C0 80241CB0 44811000 */ mtc1 $at, $f2 -/* CC54C4 80241CB4 3C01C1A0 */ lui $at, 0xc1a0 -/* CC54C8 80241CB8 44812000 */ mtc1 $at, $f4 -/* CC54CC 80241CBC 2402000F */ addiu $v0, $zero, 0xf -/* CC54D0 80241CC0 AFA2001C */ sw $v0, 0x1c($sp) -/* CC54D4 80241CC4 44835000 */ mtc1 $v1, $f10 -/* CC54D8 80241CC8 00000000 */ nop -/* CC54DC 80241CCC 468052A0 */ cvt.s.w $f10, $f10 -/* CC54E0 80241CD0 44075000 */ mfc1 $a3, $f10 -/* CC54E4 80241CD4 27A20038 */ addiu $v0, $sp, 0x38 -/* CC54E8 80241CD8 AFA20020 */ sw $v0, 0x20($sp) -/* CC54EC 80241CDC E7A00010 */ swc1 $f0, 0x10($sp) -/* CC54F0 80241CE0 E7A20014 */ swc1 $f2, 0x14($sp) -/* CC54F4 80241CE4 0C01BFA4 */ jal fx_emote -/* CC54F8 80241CE8 E7A40018 */ swc1 $f4, 0x18($sp) -/* CC54FC 80241CEC 0200202D */ daddu $a0, $s0, $zero -/* CC5500 80241CF0 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CC5504 80241CF4 0C012530 */ jal func_800494C0 -/* CC5508 80241CF8 3C060020 */ lui $a2, 0x20 -/* CC550C 80241CFC 2402000C */ addiu $v0, $zero, 0xc -/* CC5510 80241D00 08090764 */ j .L80241D90 -/* CC5514 80241D04 AE420070 */ sw $v0, 0x70($s2) -.L80241D08: -/* CC5518 80241D08 8602008C */ lh $v0, 0x8c($s0) -/* CC551C 80241D0C 14400020 */ bnez $v0, .L80241D90 -/* CC5520 80241D10 00000000 */ nop -/* CC5524 80241D14 8602008E */ lh $v0, 0x8e($s0) -/* CC5528 80241D18 1C40001D */ bgtz $v0, .L80241D90 -/* CC552C 80241D1C 00000000 */ nop -/* CC5530 80241D20 8E420074 */ lw $v0, 0x74($s2) -/* CC5534 80241D24 2442FFFF */ addiu $v0, $v0, -1 -/* CC5538 80241D28 18400018 */ blez $v0, .L80241D8C -/* CC553C 80241D2C AE420074 */ sw $v0, 0x74($s2) -/* CC5540 80241D30 C600000C */ lwc1 $f0, 0xc($s0) -/* CC5544 80241D34 3C014334 */ lui $at, 0x4334 -/* CC5548 80241D38 44816000 */ mtc1 $at, $f12 -/* CC554C 80241D3C 0C00A6C9 */ jal clamp_angle -/* CC5550 80241D40 460C0300 */ add.s $f12, $f0, $f12 -/* CC5554 80241D44 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CC5558 80241D48 0C00A67F */ jal rand_int -/* CC555C 80241D4C E600000C */ swc1 $f0, 0xc($s0) -/* CC5560 80241D50 3C032E8B */ lui $v1, 0x2e8b -/* CC5564 80241D54 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* CC5568 80241D58 00430018 */ mult $v0, $v1 -/* CC556C 80241D5C 00021FC3 */ sra $v1, $v0, 0x1f -/* CC5570 80241D60 00004010 */ mfhi $t0 -/* CC5574 80241D64 00082043 */ sra $a0, $t0, 1 -/* CC5578 80241D68 00832023 */ subu $a0, $a0, $v1 -/* CC557C 80241D6C 00041840 */ sll $v1, $a0, 1 -/* CC5580 80241D70 00641821 */ addu $v1, $v1, $a0 -/* CC5584 80241D74 00031880 */ sll $v1, $v1, 2 -/* CC5588 80241D78 00641823 */ subu $v1, $v1, $a0 -/* CC558C 80241D7C 00431023 */ subu $v0, $v0, $v1 -/* CC5590 80241D80 24420005 */ addiu $v0, $v0, 5 -/* CC5594 80241D84 08090764 */ j .L80241D90 -/* CC5598 80241D88 A602008E */ sh $v0, 0x8e($s0) -.L80241D8C: -/* CC559C 80241D8C AE400070 */ sw $zero, 0x70($s2) -.L80241D90: -/* CC55A0 80241D90 8FBF0054 */ lw $ra, 0x54($sp) -/* CC55A4 80241D94 8FB40050 */ lw $s4, 0x50($sp) -/* CC55A8 80241D98 8FB3004C */ lw $s3, 0x4c($sp) -/* CC55AC 80241D9C 8FB20048 */ lw $s2, 0x48($sp) -/* CC55B0 80241DA0 8FB10044 */ lw $s1, 0x44($sp) -/* CC55B4 80241DA4 8FB00040 */ lw $s0, 0x40($sp) -/* CC55B8 80241DA8 D7B60060 */ ldc1 $f22, 0x60($sp) -/* CC55BC 80241DAC D7B40058 */ ldc1 $f20, 0x58($sp) -/* CC55C0 80241DB0 03E00008 */ jr $ra -/* CC55C4 80241DB4 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_flo/flo_13/func_80242298_CC3810.s b/asm/nonmatchings/world/area_flo/flo_13/func_80242298_CC3810.s deleted file mode 100644 index d91ddac89a..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/func_80242298_CC3810.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242298_CC5AA8 -/* CC5AA8 80242298 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CC5AAC 8024229C AFB20018 */ sw $s2, 0x18($sp) -/* CC5AB0 802422A0 0080902D */ daddu $s2, $a0, $zero -/* CC5AB4 802422A4 AFBF001C */ sw $ra, 0x1c($sp) -/* CC5AB8 802422A8 AFB10014 */ sw $s1, 0x14($sp) -/* CC5ABC 802422AC AFB00010 */ sw $s0, 0x10($sp) -/* CC5AC0 802422B0 8E510148 */ lw $s1, 0x148($s2) -/* CC5AC4 802422B4 0C00EABB */ jal get_npc_unsafe -/* CC5AC8 802422B8 86240008 */ lh $a0, 8($s1) -/* CC5ACC 802422BC 0040802D */ daddu $s0, $v0, $zero -/* CC5AD0 802422C0 8E2300CC */ lw $v1, 0xcc($s1) -/* CC5AD4 802422C4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CC5AD8 802422C8 8C630020 */ lw $v1, 0x20($v1) -/* CC5ADC 802422CC AE030028 */ sw $v1, 0x28($s0) -/* CC5AE0 802422D0 96220076 */ lhu $v0, 0x76($s1) -/* CC5AE4 802422D4 A602008E */ sh $v0, 0x8e($s0) -/* CC5AE8 802422D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CC5AEC 802422DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CC5AF0 802422E0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CC5AF4 802422E4 8C460028 */ lw $a2, 0x28($v0) -/* CC5AF8 802422E8 0C00A720 */ jal atan2 -/* CC5AFC 802422EC 8C470030 */ lw $a3, 0x30($v0) -/* CC5B00 802422F0 2402000D */ addiu $v0, $zero, 0xd -/* CC5B04 802422F4 E600000C */ swc1 $f0, 0xc($s0) -/* CC5B08 802422F8 AE420070 */ sw $v0, 0x70($s2) -/* CC5B0C 802422FC 8FBF001C */ lw $ra, 0x1c($sp) -/* CC5B10 80242300 8FB20018 */ lw $s2, 0x18($sp) -/* CC5B14 80242304 8FB10014 */ lw $s1, 0x14($sp) -/* CC5B18 80242308 8FB00010 */ lw $s0, 0x10($sp) -/* CC5B1C 8024230C 03E00008 */ jr $ra -/* CC5B20 80242310 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_13/func_80242A6C_CC3810.s b/asm/nonmatchings/world/area_flo/flo_13/func_80242A6C_CC3810.s deleted file mode 100644 index 40edf5314a..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/func_80242A6C_CC3810.s +++ /dev/null @@ -1,616 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A6C_CC627C -/* CC627C 80242A6C 27BDFF68 */ addiu $sp, $sp, -0x98 -/* CC6280 80242A70 AFB5007C */ sw $s5, 0x7c($sp) -/* CC6284 80242A74 0080A82D */ daddu $s5, $a0, $zero -/* CC6288 80242A78 AFBF0080 */ sw $ra, 0x80($sp) -/* CC628C 80242A7C AFB40078 */ sw $s4, 0x78($sp) -/* CC6290 80242A80 AFB30074 */ sw $s3, 0x74($sp) -/* CC6294 80242A84 AFB20070 */ sw $s2, 0x70($sp) -/* CC6298 80242A88 AFB1006C */ sw $s1, 0x6c($sp) -/* CC629C 80242A8C AFB00068 */ sw $s0, 0x68($sp) -/* CC62A0 80242A90 F7B60090 */ sdc1 $f22, 0x90($sp) -/* CC62A4 80242A94 F7B40088 */ sdc1 $f20, 0x88($sp) -/* CC62A8 80242A98 8EB20148 */ lw $s2, 0x148($s5) -/* CC62AC 80242A9C 86440008 */ lh $a0, 8($s2) -/* CC62B0 80242AA0 0C00EABB */ jal get_npc_unsafe -/* CC62B4 80242AA4 00A0802D */ daddu $s0, $a1, $zero -/* CC62B8 80242AA8 8EA3000C */ lw $v1, 0xc($s5) -/* CC62BC 80242AAC 02A0202D */ daddu $a0, $s5, $zero -/* CC62C0 80242AB0 8C650000 */ lw $a1, ($v1) -/* CC62C4 80242AB4 0C0B1EAF */ jal get_variable -/* CC62C8 80242AB8 0040882D */ daddu $s1, $v0, $zero -/* CC62CC 80242ABC AFA00028 */ sw $zero, 0x28($sp) -/* CC62D0 80242AC0 8E4300D0 */ lw $v1, 0xd0($s2) -/* CC62D4 80242AC4 8C630030 */ lw $v1, 0x30($v1) -/* CC62D8 80242AC8 AFA3002C */ sw $v1, 0x2c($sp) -/* CC62DC 80242ACC 8E4300D0 */ lw $v1, 0xd0($s2) -/* CC62E0 80242AD0 8C63001C */ lw $v1, 0x1c($v1) -/* CC62E4 80242AD4 AFA30030 */ sw $v1, 0x30($sp) -/* CC62E8 80242AD8 8E4300D0 */ lw $v1, 0xd0($s2) -/* CC62EC 80242ADC 8C630024 */ lw $v1, 0x24($v1) -/* CC62F0 80242AE0 AFA30034 */ sw $v1, 0x34($sp) -/* CC62F4 80242AE4 8E4300D0 */ lw $v1, 0xd0($s2) -/* CC62F8 80242AE8 8C630028 */ lw $v1, 0x28($v1) -/* CC62FC 80242AEC 27B40028 */ addiu $s4, $sp, 0x28 -/* CC6300 80242AF0 AFA30038 */ sw $v1, 0x38($sp) -/* CC6304 80242AF4 8E4300D0 */ lw $v1, 0xd0($s2) -/* CC6308 80242AF8 3C014282 */ lui $at, 0x4282 -/* CC630C 80242AFC 44810000 */ mtc1 $at, $f0 -/* CC6310 80242B00 8C63002C */ lw $v1, 0x2c($v1) -/* CC6314 80242B04 0040982D */ daddu $s3, $v0, $zero -/* CC6318 80242B08 E7A00040 */ swc1 $f0, 0x40($sp) -/* CC631C 80242B0C A7A00044 */ sh $zero, 0x44($sp) -/* CC6320 80242B10 12000007 */ beqz $s0, .L80242B30 -/* CC6324 80242B14 AFA3003C */ sw $v1, 0x3c($sp) -/* CC6328 80242B18 8E4200B0 */ lw $v0, 0xb0($s2) -/* CC632C 80242B1C 862300A8 */ lh $v1, 0xa8($s1) -/* CC6330 80242B20 34420008 */ ori $v0, $v0, 8 -/* CC6334 80242B24 AE430084 */ sw $v1, 0x84($s2) -/* CC6338 80242B28 08090AD0 */ j .L80242B40 -/* CC633C 80242B2C AE4200B0 */ sw $v0, 0xb0($s2) -.L80242B30: -/* CC6340 80242B30 8E430094 */ lw $v1, 0x94($s2) -/* CC6344 80242B34 24020064 */ addiu $v0, $zero, 0x64 -/* CC6348 80242B38 1462001C */ bne $v1, $v0, .L80242BAC -/* CC634C 80242B3C 00000000 */ nop -.L80242B40: -/* CC6350 80242B40 24020064 */ addiu $v0, $zero, 0x64 -/* CC6354 80242B44 2404F7FF */ addiu $a0, $zero, -0x801 -/* CC6358 80242B48 AEA20070 */ sw $v0, 0x70($s5) -/* CC635C 80242B4C A620008E */ sh $zero, 0x8e($s1) -/* CC6360 80242B50 8E4300CC */ lw $v1, 0xcc($s2) -/* CC6364 80242B54 8E220000 */ lw $v0, ($s1) -/* CC6368 80242B58 3C01C47A */ lui $at, 0xc47a -/* CC636C 80242B5C 44810000 */ mtc1 $at, $f0 -/* CC6370 80242B60 8C630000 */ lw $v1, ($v1) -/* CC6374 80242B64 00441024 */ and $v0, $v0, $a0 -/* CC6378 80242B68 AE220000 */ sw $v0, ($s1) -/* CC637C 80242B6C AE230028 */ sw $v1, 0x28($s1) -/* CC6380 80242B70 8E420000 */ lw $v0, ($s2) -/* CC6384 80242B74 3C030020 */ lui $v1, 0x20 -/* CC6388 80242B78 00431025 */ or $v0, $v0, $v1 -/* CC638C 80242B7C AE420000 */ sw $v0, ($s2) -/* CC6390 80242B80 8E220000 */ lw $v0, ($s1) -/* CC6394 80242B84 2403FDFF */ addiu $v1, $zero, -0x201 -/* CC6398 80242B88 00431024 */ and $v0, $v0, $v1 -/* CC639C 80242B8C 34420008 */ ori $v0, $v0, 8 -/* CC63A0 80242B90 AE220000 */ sw $v0, ($s1) -/* CC63A4 80242B94 2402FFFF */ addiu $v0, $zero, -1 -/* CC63A8 80242B98 AE400094 */ sw $zero, 0x94($s2) -/* CC63AC 80242B9C AE420098 */ sw $v0, 0x98($s2) -/* CC63B0 80242BA0 AE200038 */ sw $zero, 0x38($s1) -/* CC63B4 80242BA4 E620003C */ swc1 $f0, 0x3c($s1) -/* CC63B8 80242BA8 AE200040 */ sw $zero, 0x40($s1) -.L80242BAC: -/* CC63BC 80242BAC 8E4200B0 */ lw $v0, 0xb0($s2) -/* CC63C0 80242BB0 30420004 */ andi $v0, $v0, 4 -/* CC63C4 80242BB4 10400030 */ beqz $v0, .L80242C78 -/* CC63C8 80242BB8 2403FFFB */ addiu $v1, $zero, -5 -/* CC63CC 80242BBC A620008E */ sh $zero, 0x8e($s1) -/* CC63D0 80242BC0 96420086 */ lhu $v0, 0x86($s2) -/* CC63D4 80242BC4 A62200A8 */ sh $v0, 0xa8($s1) -/* CC63D8 80242BC8 8E4200B0 */ lw $v0, 0xb0($s2) -/* CC63DC 80242BCC 00431024 */ and $v0, $v0, $v1 -/* CC63E0 80242BD0 AE4200B0 */ sw $v0, 0xb0($s2) -/* CC63E4 80242BD4 8E220000 */ lw $v0, ($s1) -/* CC63E8 80242BD8 30420800 */ andi $v0, $v0, 0x800 -/* CC63EC 80242BDC 1040000A */ beqz $v0, .L80242C08 -/* CC63F0 80242BE0 3C02004A */ lui $v0, 0x4a -/* CC63F4 80242BE4 3C013F80 */ lui $at, 0x3f80 -/* CC63F8 80242BE8 44810000 */ mtc1 $at, $f0 -/* CC63FC 80242BEC 34420018 */ ori $v0, $v0, 0x18 -/* CC6400 80242BF0 AE220028 */ sw $v0, 0x28($s1) -/* CC6404 80242BF4 24020066 */ addiu $v0, $zero, 0x66 -/* CC6408 80242BF8 AE200018 */ sw $zero, 0x18($s1) -/* CC640C 80242BFC AE20001C */ sw $zero, 0x1c($s1) -/* CC6410 80242C00 08090B1D */ j .L80242C74 -/* CC6414 80242C04 E6200014 */ swc1 $f0, 0x14($s1) -.L80242C08: -/* CC6418 80242C08 24040002 */ addiu $a0, $zero, 2 -/* CC641C 80242C0C 0220282D */ daddu $a1, $s1, $zero -/* CC6420 80242C10 0000302D */ daddu $a2, $zero, $zero -/* CC6424 80242C14 862300A8 */ lh $v1, 0xa8($s1) -/* CC6428 80242C18 3C013F80 */ lui $at, 0x3f80 -/* CC642C 80242C1C 44810000 */ mtc1 $at, $f0 -/* CC6430 80242C20 3C014000 */ lui $at, 0x4000 -/* CC6434 80242C24 44811000 */ mtc1 $at, $f2 -/* CC6438 80242C28 3C01C1A0 */ lui $at, 0xc1a0 -/* CC643C 80242C2C 44812000 */ mtc1 $at, $f4 -/* CC6440 80242C30 24020028 */ addiu $v0, $zero, 0x28 -/* CC6444 80242C34 AFA2001C */ sw $v0, 0x1c($sp) -/* CC6448 80242C38 44834000 */ mtc1 $v1, $f8 -/* CC644C 80242C3C 00000000 */ nop -/* CC6450 80242C40 46804220 */ cvt.s.w $f8, $f8 -/* CC6454 80242C44 44074000 */ mfc1 $a3, $f8 -/* CC6458 80242C48 27A20048 */ addiu $v0, $sp, 0x48 -/* CC645C 80242C4C AFA20020 */ sw $v0, 0x20($sp) -/* CC6460 80242C50 E7A00010 */ swc1 $f0, 0x10($sp) -/* CC6464 80242C54 E7A20014 */ swc1 $f2, 0x14($sp) -/* CC6468 80242C58 0C01BFA4 */ jal fx_emote -/* CC646C 80242C5C E7A40018 */ swc1 $f4, 0x18($sp) -/* CC6470 80242C60 8E4200CC */ lw $v0, 0xcc($s2) -/* CC6474 80242C64 8C420000 */ lw $v0, ($v0) -/* CC6478 80242C68 AE220028 */ sw $v0, 0x28($s1) -/* CC647C 80242C6C 240200C8 */ addiu $v0, $zero, 0xc8 -/* CC6480 80242C70 AEA00074 */ sw $zero, 0x74($s5) -.L80242C74: -/* CC6484 80242C74 AEA20070 */ sw $v0, 0x70($s5) -.L80242C78: -/* CC6488 80242C78 27A2004C */ addiu $v0, $sp, 0x4c -/* CC648C 80242C7C AFA20010 */ sw $v0, 0x10($sp) -/* CC6490 80242C80 27A20050 */ addiu $v0, $sp, 0x50 -/* CC6494 80242C84 AFA20014 */ sw $v0, 0x14($sp) -/* CC6498 80242C88 27A20054 */ addiu $v0, $sp, 0x54 -/* CC649C 80242C8C AFA20018 */ sw $v0, 0x18($sp) -/* CC64A0 80242C90 8E250038 */ lw $a1, 0x38($s1) -/* CC64A4 80242C94 8E26003C */ lw $a2, 0x3c($s1) -/* CC64A8 80242C98 8E270040 */ lw $a3, 0x40($s1) -/* CC64AC 80242C9C 0C00B94E */ jal get_screen_coords -/* CC64B0 80242CA0 0000202D */ daddu $a0, $zero, $zero -/* CC64B4 80242CA4 8EA20070 */ lw $v0, 0x70($s5) -/* CC64B8 80242CA8 28420064 */ slti $v0, $v0, 0x64 -/* CC64BC 80242CAC 10400007 */ beqz $v0, .L80242CCC -/* CC64C0 80242CB0 00000000 */ nop -/* CC64C4 80242CB4 8FA2004C */ lw $v0, 0x4c($sp) -/* CC64C8 80242CB8 24420032 */ addiu $v0, $v0, 0x32 -/* CC64CC 80242CBC 2C4201A5 */ sltiu $v0, $v0, 0x1a5 -/* CC64D0 80242CC0 14400002 */ bnez $v0, .L80242CCC -/* CC64D4 80242CC4 2402006E */ addiu $v0, $zero, 0x6e -/* CC64D8 80242CC8 AEA20070 */ sw $v0, 0x70($s5) -.L80242CCC: -/* CC64DC 80242CCC 8EA30070 */ lw $v1, 0x70($s5) -/* CC64E0 80242CD0 2402000F */ addiu $v0, $zero, 0xf -/* CC64E4 80242CD4 1062006B */ beq $v1, $v0, .L80242E84 -/* CC64E8 80242CD8 28620010 */ slti $v0, $v1, 0x10 -/* CC64EC 80242CDC 10400016 */ beqz $v0, .L80242D38 -/* CC64F0 80242CE0 24020003 */ addiu $v0, $zero, 3 -/* CC64F4 80242CE4 10620051 */ beq $v1, $v0, .L80242E2C -/* CC64F8 80242CE8 28620004 */ slti $v0, $v1, 4 -/* CC64FC 80242CEC 10400009 */ beqz $v0, .L80242D14 -/* CC6500 80242CF0 24020001 */ addiu $v0, $zero, 1 -/* CC6504 80242CF4 10620044 */ beq $v1, $v0, .L80242E08 -/* CC6508 80242CF8 28620002 */ slti $v0, $v1, 2 -/* CC650C 80242CFC 50400048 */ beql $v0, $zero, .L80242E20 -/* CC6510 80242D00 02A0202D */ daddu $a0, $s5, $zero -/* CC6514 80242D04 50600027 */ beql $v1, $zero, .L80242DA4 -/* CC6518 80242D08 02A0202D */ daddu $a0, $s5, $zero -/* CC651C 80242D0C 08090CCE */ j .L80243338 -/* CC6520 80242D10 00000000 */ nop -.L80242D14: -/* CC6524 80242D14 2402000D */ addiu $v0, $zero, 0xd -/* CC6528 80242D18 1062004D */ beq $v1, $v0, .L80242E50 -/* CC652C 80242D1C 2862000E */ slti $v0, $v1, 0xe -/* CC6530 80242D20 10400052 */ beqz $v0, .L80242E6C -/* CC6534 80242D24 2402000C */ addiu $v0, $zero, 0xc -/* CC6538 80242D28 10620046 */ beq $v1, $v0, .L80242E44 -/* CC653C 80242D2C 02A0202D */ daddu $a0, $s5, $zero -/* CC6540 80242D30 08090CCE */ j .L80243338 -/* CC6544 80242D34 00000000 */ nop -.L80242D38: -/* CC6548 80242D38 24020067 */ addiu $v0, $zero, 0x67 -/* CC654C 80242D3C 10620158 */ beq $v1, $v0, .L802432A0 -/* CC6550 80242D40 28620068 */ slti $v0, $v1, 0x68 -/* CC6554 80242D44 10400009 */ beqz $v0, .L80242D6C -/* CC6558 80242D48 24020065 */ addiu $v0, $zero, 0x65 -/* CC655C 80242D4C 1062008F */ beq $v1, $v0, .L80242F8C -/* CC6560 80242D50 28620066 */ slti $v0, $v1, 0x66 -/* CC6564 80242D54 104000A9 */ beqz $v0, .L80242FFC -/* CC6568 80242D58 24020064 */ addiu $v0, $zero, 0x64 -/* CC656C 80242D5C 1062004F */ beq $v1, $v0, .L80242E9C -/* CC6570 80242D60 24020002 */ addiu $v0, $zero, 2 -/* CC6574 80242D64 08090CCE */ j .L80243338 -/* CC6578 80242D68 00000000 */ nop -.L80242D6C: -/* CC657C 80242D6C 2404006F */ addiu $a0, $zero, 0x6f -/* CC6580 80242D70 10640166 */ beq $v1, $a0, .L8024330C -/* CC6584 80242D74 28620070 */ slti $v0, $v1, 0x70 -/* CC6588 80242D78 10400005 */ beqz $v0, .L80242D90 -/* CC658C 80242D7C 2402006E */ addiu $v0, $zero, 0x6e -/* CC6590 80242D80 10620156 */ beq $v1, $v0, .L802432DC -/* CC6594 80242D84 2402001E */ addiu $v0, $zero, 0x1e -/* CC6598 80242D88 08090CCE */ j .L80243338 -/* CC659C 80242D8C 00000000 */ nop -.L80242D90: -/* CC65A0 80242D90 240200C8 */ addiu $v0, $zero, 0xc8 -/* CC65A4 80242D94 10620166 */ beq $v1, $v0, .L80243330 -/* CC65A8 80242D98 00000000 */ nop -/* CC65AC 80242D9C 08090CCE */ j .L80243338 -/* CC65B0 80242DA0 00000000 */ nop -.L80242DA4: -/* CC65B4 80242DA4 0260282D */ daddu $a1, $s3, $zero -/* CC65B8 80242DA8 0C012568 */ jal func_800495A0 -/* CC65BC 80242DAC 0280302D */ daddu $a2, $s4, $zero -/* CC65C0 80242DB0 96420086 */ lhu $v0, 0x86($s2) -/* CC65C4 80242DB4 A62200A8 */ sh $v0, 0xa8($s1) -/* CC65C8 80242DB8 8E4200A0 */ lw $v0, 0xa0($s2) -/* CC65CC 80242DBC 10400013 */ beqz $v0, .L80242E0C -/* CC65D0 80242DC0 02A0202D */ daddu $a0, $s5, $zero -/* CC65D4 80242DC4 C620003C */ lwc1 $f0, 0x3c($s1) -/* CC65D8 80242DC8 44801000 */ mtc1 $zero, $f2 -/* CC65DC 80242DCC 44801800 */ mtc1 $zero, $f3 -/* CC65E0 80242DD0 46000021 */ cvt.d.s $f0, $f0 -/* CC65E4 80242DD4 4622003E */ c.le.d $f0, $f2 -/* CC65E8 80242DD8 00000000 */ nop -/* CC65EC 80242DDC 45000005 */ bc1f .L80242DF4 -/* CC65F0 80242DE0 2403FDFF */ addiu $v1, $zero, -0x201 -/* CC65F4 80242DE4 8E220000 */ lw $v0, ($s1) -/* CC65F8 80242DE8 00431024 */ and $v0, $v0, $v1 -/* CC65FC 80242DEC 08090B81 */ j .L80242E04 -/* CC6600 80242DF0 34420008 */ ori $v0, $v0, 8 -.L80242DF4: -/* CC6604 80242DF4 8E220000 */ lw $v0, ($s1) -/* CC6608 80242DF8 2403FFF7 */ addiu $v1, $zero, -9 -/* CC660C 80242DFC 34420200 */ ori $v0, $v0, 0x200 -/* CC6610 80242E00 00431024 */ and $v0, $v0, $v1 -.L80242E04: -/* CC6614 80242E04 AE220000 */ sw $v0, ($s1) -.L80242E08: -/* CC6618 80242E08 02A0202D */ daddu $a0, $s5, $zero -.L80242E0C: -/* CC661C 80242E0C 0260282D */ daddu $a1, $s3, $zero -/* CC6620 80242E10 0C0125AE */ jal func_800496B8 -/* CC6624 80242E14 0280302D */ daddu $a2, $s4, $zero -/* CC6628 80242E18 08090CCE */ j .L80243338 -/* CC662C 80242E1C 00000000 */ nop -.L80242E20: -/* CC6630 80242E20 0260282D */ daddu $a1, $s3, $zero -/* CC6634 80242E24 0C0126D1 */ jal func_80049B44 -/* CC6638 80242E28 0280302D */ daddu $a2, $s4, $zero -.L80242E2C: -/* CC663C 80242E2C 02A0202D */ daddu $a0, $s5, $zero -/* CC6640 80242E30 0260282D */ daddu $a1, $s3, $zero -/* CC6644 80242E34 0C012701 */ jal func_80049C04 -/* CC6648 80242E38 0280302D */ daddu $a2, $s4, $zero -/* CC664C 80242E3C 08090CCE */ j .L80243338 -/* CC6650 80242E40 00000000 */ nop -.L80242E44: -/* CC6654 80242E44 0260282D */ daddu $a1, $s3, $zero -/* CC6658 80242E48 0C0908A6 */ jal func_80242298 -/* CC665C 80242E4C 0280302D */ daddu $a2, $s4, $zero -.L80242E50: -/* CC6660 80242E50 02A0202D */ daddu $a0, $s5, $zero -/* CC6664 80242E54 0260282D */ daddu $a1, $s3, $zero -/* CC6668 80242E58 0C0908C5 */ jal func_80242314 -/* CC666C 80242E5C 0280302D */ daddu $a2, $s4, $zero -/* CC6670 80242E60 96420086 */ lhu $v0, 0x86($s2) -/* CC6674 80242E64 08090CCE */ j .L80243338 -/* CC6678 80242E68 A62200A8 */ sh $v0, 0xa8($s1) -.L80242E6C: -/* CC667C 80242E6C 02A0202D */ daddu $a0, $s5, $zero -/* CC6680 80242E70 0260282D */ daddu $a1, $s3, $zero -/* CC6684 80242E74 0C090912 */ jal func_80242448 -/* CC6688 80242E78 0280302D */ daddu $a2, $s4, $zero -/* CC668C 80242E7C 08090CCE */ j .L80243338 -/* CC6690 80242E80 00000000 */ nop -.L80242E84: -/* CC6694 80242E84 02A0202D */ daddu $a0, $s5, $zero -/* CC6698 80242E88 0260282D */ daddu $a1, $s3, $zero -/* CC669C 80242E8C 0C09096B */ jal func_802425AC -/* CC66A0 80242E90 0280302D */ daddu $a2, $s4, $zero -/* CC66A4 80242E94 08090CCE */ j .L80243338 -/* CC66A8 80242E98 00000000 */ nop -.L80242E9C: -/* CC66AC 80242E9C 8E430094 */ lw $v1, 0x94($s2) -/* CC66B0 80242EA0 14620125 */ bne $v1, $v0, .L80243338 -/* CC66B4 80242EA4 00000000 */ nop -/* CC66B8 80242EA8 0C00FB3A */ jal get_enemy -/* CC66BC 80242EAC 8E440098 */ lw $a0, 0x98($s2) -/* CC66C0 80242EB0 0C00EABB */ jal get_npc_unsafe -/* CC66C4 80242EB4 84440008 */ lh $a0, 8($v0) -/* CC66C8 80242EB8 C440000C */ lwc1 $f0, 0xc($v0) -/* CC66CC 80242EBC 3C018024 */ lui $at, 0x8024 -/* CC66D0 80242EC0 D4227AE8 */ ldc1 $f2, 0x7ae8($at) -/* CC66D4 80242EC4 46000021 */ cvt.d.s $f0, $f0 -/* CC66D8 80242EC8 4622003C */ c.lt.d $f0, $f2 -/* CC66DC 80242ECC 00000000 */ nop -/* CC66E0 80242ED0 45000008 */ bc1f .L80242EF4 -/* CC66E4 80242ED4 00000000 */ nop -/* CC66E8 80242ED8 C4400038 */ lwc1 $f0, 0x38($v0) -/* CC66EC 80242EDC 3C014028 */ lui $at, 0x4028 -/* CC66F0 80242EE0 44811800 */ mtc1 $at, $f3 -/* CC66F4 80242EE4 44801000 */ mtc1 $zero, $f2 -/* CC66F8 80242EE8 46000021 */ cvt.d.s $f0, $f0 -/* CC66FC 80242EEC 08090BC3 */ j .L80242F0C -/* CC6700 80242EF0 46220000 */ add.d $f0, $f0, $f2 -.L80242EF4: -/* CC6704 80242EF4 C4400038 */ lwc1 $f0, 0x38($v0) -/* CC6708 80242EF8 3C014028 */ lui $at, 0x4028 -/* CC670C 80242EFC 44811800 */ mtc1 $at, $f3 -/* CC6710 80242F00 44801000 */ mtc1 $zero, $f2 -/* CC6714 80242F04 46000021 */ cvt.d.s $f0, $f0 -/* CC6718 80242F08 46220001 */ sub.d $f0, $f0, $f2 -.L80242F0C: -/* CC671C 80242F0C 46200020 */ cvt.s.d $f0, $f0 -/* CC6720 80242F10 E6200038 */ swc1 $f0, 0x38($s1) -/* CC6724 80242F14 3C04004A */ lui $a0, 0x4a -/* CC6728 80242F18 C440003C */ lwc1 $f0, 0x3c($v0) -/* CC672C 80242F1C 3C014039 */ lui $at, 0x4039 -/* CC6730 80242F20 44811800 */ mtc1 $at, $f3 -/* CC6734 80242F24 44801000 */ mtc1 $zero, $f2 -/* CC6738 80242F28 46000021 */ cvt.d.s $f0, $f0 -/* CC673C 80242F2C 46220000 */ add.d $f0, $f0, $f2 -/* CC6740 80242F30 34840018 */ ori $a0, $a0, 0x18 -/* CC6744 80242F34 3C013FF0 */ lui $at, 0x3ff0 -/* CC6748 80242F38 44811800 */ mtc1 $at, $f3 -/* CC674C 80242F3C 44801000 */ mtc1 $zero, $f2 -/* CC6750 80242F40 46200020 */ cvt.s.d $f0, $f0 -/* CC6754 80242F44 E620003C */ swc1 $f0, 0x3c($s1) -/* CC6758 80242F48 C4400040 */ lwc1 $f0, 0x40($v0) -/* CC675C 80242F4C 8E220000 */ lw $v0, ($s1) -/* CC6760 80242F50 2403FFFD */ addiu $v1, $zero, -3 -/* CC6764 80242F54 AE200048 */ sw $zero, 0x48($s1) -/* CC6768 80242F58 AE200034 */ sw $zero, 0x34($s1) -/* CC676C 80242F5C AE240028 */ sw $a0, 0x28($s1) -/* CC6770 80242F60 34420008 */ ori $v0, $v0, 8 -/* CC6774 80242F64 00431024 */ and $v0, $v0, $v1 -/* CC6778 80242F68 2403FDFF */ addiu $v1, $zero, -0x201 -/* CC677C 80242F6C 00431024 */ and $v0, $v0, $v1 -/* CC6780 80242F70 46000021 */ cvt.d.s $f0, $f0 -/* CC6784 80242F74 46220000 */ add.d $f0, $f0, $f2 -/* CC6788 80242F78 AE220000 */ sw $v0, ($s1) -/* CC678C 80242F7C 24020065 */ addiu $v0, $zero, 0x65 -/* CC6790 80242F80 46200020 */ cvt.s.d $f0, $f0 -/* CC6794 80242F84 E6200040 */ swc1 $f0, 0x40($s1) -/* CC6798 80242F88 AEA20070 */ sw $v0, 0x70($s5) -.L80242F8C: -/* CC679C 80242F8C 8E430094 */ lw $v1, 0x94($s2) -/* CC67A0 80242F90 24020003 */ addiu $v0, $zero, 3 -/* CC67A4 80242F94 146200E8 */ bne $v1, $v0, .L80243338 -/* CC67A8 80242F98 24020004 */ addiu $v0, $zero, 4 -/* CC67AC 80242F9C AE420094 */ sw $v0, 0x94($s2) -/* CC67B0 80242FA0 C62C0038 */ lwc1 $f12, 0x38($s1) -/* CC67B4 80242FA4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CC67B8 80242FA8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CC67BC 80242FAC C62E0040 */ lwc1 $f14, 0x40($s1) -/* CC67C0 80242FB0 8C460028 */ lw $a2, 0x28($v0) -/* CC67C4 80242FB4 0C00A720 */ jal atan2 -/* CC67C8 80242FB8 8C470030 */ lw $a3, 0x30($v0) -/* CC67CC 80242FBC 3C014020 */ lui $at, 0x4020 -/* CC67D0 80242FC0 44811000 */ mtc1 $at, $f2 -/* CC67D4 80242FC4 3C014100 */ lui $at, 0x4100 -/* CC67D8 80242FC8 44812000 */ mtc1 $at, $f4 -/* CC67DC 80242FCC 3C013F4C */ lui $at, 0x3f4c -/* CC67E0 80242FD0 3421CCCD */ ori $at, $at, 0xcccd -/* CC67E4 80242FD4 44813000 */ mtc1 $at, $f6 -/* CC67E8 80242FD8 8E220000 */ lw $v0, ($s1) -/* CC67EC 80242FDC E620000C */ swc1 $f0, 0xc($s1) -/* CC67F0 80242FE0 34420800 */ ori $v0, $v0, 0x800 -/* CC67F4 80242FE4 AE220000 */ sw $v0, ($s1) -/* CC67F8 80242FE8 24020066 */ addiu $v0, $zero, 0x66 -/* CC67FC 80242FEC E6220018 */ swc1 $f2, 0x18($s1) -/* CC6800 80242FF0 E624001C */ swc1 $f4, 0x1c($s1) -/* CC6804 80242FF4 E6260014 */ swc1 $f6, 0x14($s1) -/* CC6808 80242FF8 AEA20070 */ sw $v0, 0x70($s5) -.L80242FFC: -/* CC680C 80242FFC C6200018 */ lwc1 $f0, 0x18($s1) -/* CC6810 80243000 44801000 */ mtc1 $zero, $f2 -/* CC6814 80243004 44801800 */ mtc1 $zero, $f3 -/* CC6818 80243008 46000021 */ cvt.d.s $f0, $f0 -/* CC681C 8024300C 4620103C */ c.lt.d $f2, $f0 -/* CC6820 80243010 00000000 */ nop -/* CC6824 80243014 4500001F */ bc1f .L80243094 -/* CC6828 80243018 27A50058 */ addiu $a1, $sp, 0x58 -/* CC682C 8024301C C6200038 */ lwc1 $f0, 0x38($s1) -/* CC6830 80243020 C622003C */ lwc1 $f2, 0x3c($s1) -/* CC6834 80243024 C6240040 */ lwc1 $f4, 0x40($s1) -/* CC6838 80243028 C6260018 */ lwc1 $f6, 0x18($s1) -/* CC683C 8024302C E7A00058 */ swc1 $f0, 0x58($sp) -/* CC6840 80243030 E7A2005C */ swc1 $f2, 0x5c($sp) -/* CC6844 80243034 E7A40060 */ swc1 $f4, 0x60($sp) -/* CC6848 80243038 E7A60010 */ swc1 $f6, 0x10($sp) -/* CC684C 8024303C C620000C */ lwc1 $f0, 0xc($s1) -/* CC6850 80243040 E7A00014 */ swc1 $f0, 0x14($sp) -/* CC6854 80243044 862200A8 */ lh $v0, 0xa8($s1) -/* CC6858 80243048 44820000 */ mtc1 $v0, $f0 -/* CC685C 8024304C 00000000 */ nop -/* CC6860 80243050 46800020 */ cvt.s.w $f0, $f0 -/* CC6864 80243054 E7A00018 */ swc1 $f0, 0x18($sp) -/* CC6868 80243058 862200A6 */ lh $v0, 0xa6($s1) -/* CC686C 8024305C 27A6005C */ addiu $a2, $sp, 0x5c -/* CC6870 80243060 44820000 */ mtc1 $v0, $f0 -/* CC6874 80243064 00000000 */ nop -/* CC6878 80243068 46800020 */ cvt.s.w $f0, $f0 -/* CC687C 8024306C E7A0001C */ swc1 $f0, 0x1c($sp) -/* CC6880 80243070 8E240080 */ lw $a0, 0x80($s1) -/* CC6884 80243074 0C037711 */ jal func_800DDC44 -/* CC6888 80243078 27A70060 */ addiu $a3, $sp, 0x60 -/* CC688C 8024307C 54400005 */ bnel $v0, $zero, .L80243094 -/* CC6890 80243080 AE200018 */ sw $zero, 0x18($s1) -/* CC6894 80243084 8E250018 */ lw $a1, 0x18($s1) -/* CC6898 80243088 8E26000C */ lw $a2, 0xc($s1) -/* CC689C 8024308C 0C00EA95 */ jal npc_move_heading -/* CC68A0 80243090 0220202D */ daddu $a0, $s1, $zero -.L80243094: -/* CC68A4 80243094 C620001C */ lwc1 $f0, 0x1c($s1) -/* CC68A8 80243098 4480B000 */ mtc1 $zero, $f22 -/* CC68AC 8024309C 4480B800 */ mtc1 $zero, $f23 -/* CC68B0 802430A0 46000021 */ cvt.d.s $f0, $f0 -/* CC68B4 802430A4 4636003C */ c.lt.d $f0, $f22 -/* CC68B8 802430A8 00000000 */ nop -/* CC68BC 802430AC 45000074 */ bc1f .L80243280 -/* CC68C0 802430B0 27A50058 */ addiu $a1, $sp, 0x58 -/* CC68C4 802430B4 27A6005C */ addiu $a2, $sp, 0x5c -/* CC68C8 802430B8 27A20064 */ addiu $v0, $sp, 0x64 -/* CC68CC 802430BC C622003C */ lwc1 $f2, 0x3c($s1) -/* CC68D0 802430C0 C6260038 */ lwc1 $f6, 0x38($s1) -/* CC68D4 802430C4 3C01402A */ lui $at, 0x402a -/* CC68D8 802430C8 4481A800 */ mtc1 $at, $f21 -/* CC68DC 802430CC 4480A000 */ mtc1 $zero, $f20 -/* CC68E0 802430D0 460010A1 */ cvt.d.s $f2, $f2 -/* CC68E4 802430D4 46341080 */ add.d $f2, $f2, $f20 -/* CC68E8 802430D8 C620001C */ lwc1 $f0, 0x1c($s1) -/* CC68EC 802430DC C6240040 */ lwc1 $f4, 0x40($s1) -/* CC68F0 802430E0 46000005 */ abs.s $f0, $f0 -/* CC68F4 802430E4 E7A40060 */ swc1 $f4, 0x60($sp) -/* CC68F8 802430E8 3C014030 */ lui $at, 0x4030 -/* CC68FC 802430EC 44812800 */ mtc1 $at, $f5 -/* CC6900 802430F0 44802000 */ mtc1 $zero, $f4 -/* CC6904 802430F4 46000021 */ cvt.d.s $f0, $f0 -/* CC6908 802430F8 E7A60058 */ swc1 $f6, 0x58($sp) -/* CC690C 802430FC 46240000 */ add.d $f0, $f0, $f4 -/* CC6910 80243100 462010A0 */ cvt.s.d $f2, $f2 -/* CC6914 80243104 E7A2005C */ swc1 $f2, 0x5c($sp) -/* CC6918 80243108 46200020 */ cvt.s.d $f0, $f0 -/* CC691C 8024310C E7A00064 */ swc1 $f0, 0x64($sp) -/* CC6920 80243110 AFA20010 */ sw $v0, 0x10($sp) -/* CC6924 80243114 8E240080 */ lw $a0, 0x80($s1) -/* CC6928 80243118 0C0372DF */ jal func_800DCB7C -/* CC692C 8024311C 27A70060 */ addiu $a3, $sp, 0x60 -/* CC6930 80243120 10400057 */ beqz $v0, .L80243280 -/* CC6934 80243124 00000000 */ nop -/* CC6938 80243128 C620001C */ lwc1 $f0, 0x1c($s1) -/* CC693C 8024312C C7A20064 */ lwc1 $f2, 0x64($sp) -/* CC6940 80243130 46000005 */ abs.s $f0, $f0 -/* CC6944 80243134 46000021 */ cvt.d.s $f0, $f0 -/* CC6948 80243138 46340000 */ add.d $f0, $f0, $f20 -/* CC694C 8024313C 460010A1 */ cvt.d.s $f2, $f2 -/* CC6950 80243140 4620103E */ c.le.d $f2, $f0 -/* CC6954 80243144 00000000 */ nop -/* CC6958 80243148 4500004D */ bc1f .L80243280 -/* CC695C 8024314C 00000000 */ nop -/* CC6960 80243150 C7A0005C */ lwc1 $f0, 0x5c($sp) -/* CC6964 80243154 E620003C */ swc1 $f0, 0x3c($s1) -/* CC6968 80243158 8E4200D0 */ lw $v0, 0xd0($s2) -/* CC696C 8024315C C6200038 */ lwc1 $f0, 0x38($s1) -/* CC6970 80243160 4600020D */ trunc.w.s $f8, $f0 -/* CC6974 80243164 E4480000 */ swc1 $f8, ($v0) -/* CC6978 80243168 8E4200D0 */ lw $v0, 0xd0($s2) -/* CC697C 8024316C C620003C */ lwc1 $f0, 0x3c($s1) -/* CC6980 80243170 4600020D */ trunc.w.s $f8, $f0 -/* CC6984 80243174 E4480004 */ swc1 $f8, 4($v0) -/* CC6988 80243178 8E4200D0 */ lw $v0, 0xd0($s2) -/* CC698C 8024317C C6200040 */ lwc1 $f0, 0x40($s1) -/* CC6990 80243180 4600020D */ trunc.w.s $f8, $f0 -/* CC6994 80243184 E4480008 */ swc1 $f8, 8($v0) -/* CC6998 80243188 8E4200D0 */ lw $v0, 0xd0($s2) -/* CC699C 8024318C C6200038 */ lwc1 $f0, 0x38($s1) -/* CC69A0 80243190 4600020D */ trunc.w.s $f8, $f0 -/* CC69A4 80243194 E448001C */ swc1 $f8, 0x1c($v0) -/* CC69A8 80243198 8E4200D0 */ lw $v0, 0xd0($s2) -/* CC69AC 8024319C C620003C */ lwc1 $f0, 0x3c($s1) -/* CC69B0 802431A0 4600020D */ trunc.w.s $f8, $f0 -/* CC69B4 802431A4 E4480020 */ swc1 $f8, 0x20($v0) -/* CC69B8 802431A8 8E4200D0 */ lw $v0, 0xd0($s2) -/* CC69BC 802431AC C6200040 */ lwc1 $f0, 0x40($s1) -/* CC69C0 802431B0 4600020D */ trunc.w.s $f8, $f0 -/* CC69C4 802431B4 E4480024 */ swc1 $f8, 0x24($v0) -/* CC69C8 802431B8 8E4300A0 */ lw $v1, 0xa0($s2) -/* CC69CC 802431BC 24020005 */ addiu $v0, $zero, 5 -/* CC69D0 802431C0 1060000B */ beqz $v1, .L802431F0 -/* CC69D4 802431C4 AE420094 */ sw $v0, 0x94($s2) -/* CC69D8 802431C8 C620003C */ lwc1 $f0, 0x3c($s1) -/* CC69DC 802431CC 46000021 */ cvt.d.s $f0, $f0 -/* CC69E0 802431D0 4636003E */ c.le.d $f0, $f22 -/* CC69E4 802431D4 00000000 */ nop -/* CC69E8 802431D8 4501000D */ bc1t .L80243210 -/* CC69EC 802431DC 2403FFF7 */ addiu $v1, $zero, -9 -/* CC69F0 802431E0 8E220000 */ lw $v0, ($s1) -/* CC69F4 802431E4 34420200 */ ori $v0, $v0, 0x200 -/* CC69F8 802431E8 08090C88 */ j .L80243220 -/* CC69FC 802431EC 00431024 */ and $v0, $v0, $v1 -.L802431F0: -/* CC6A00 802431F0 8E4200D0 */ lw $v0, 0xd0($s2) -/* CC6A04 802431F4 8C420034 */ lw $v0, 0x34($v0) -/* CC6A08 802431F8 14400005 */ bnez $v0, .L80243210 -/* CC6A0C 802431FC 2403FFF7 */ addiu $v1, $zero, -9 -/* CC6A10 80243200 8E220000 */ lw $v0, ($s1) -/* CC6A14 80243204 34420200 */ ori $v0, $v0, 0x200 -/* CC6A18 80243208 08090C88 */ j .L80243220 -/* CC6A1C 8024320C 00431024 */ and $v0, $v0, $v1 -.L80243210: -/* CC6A20 80243210 8E220000 */ lw $v0, ($s1) -/* CC6A24 80243214 2403FDFF */ addiu $v1, $zero, -0x201 -/* CC6A28 80243218 00431024 */ and $v0, $v0, $v1 -/* CC6A2C 8024321C 34420008 */ ori $v0, $v0, 8 -.L80243220: -/* CC6A30 80243220 AE220000 */ sw $v0, ($s1) -/* CC6A34 80243224 C62C0038 */ lwc1 $f12, 0x38($s1) -/* CC6A38 80243228 C62E0040 */ lwc1 $f14, 0x40($s1) -/* CC6A3C 8024322C 8E220000 */ lw $v0, ($s1) -/* CC6A40 80243230 3C04800F */ lui $a0, %hi(gPlayerStatusPtr) -/* CC6A44 80243234 8C847B30 */ lw $a0, %lo(gPlayerStatusPtr)($a0) -/* CC6A48 80243238 3C030004 */ lui $v1, 4 -/* CC6A4C 8024323C AE20001C */ sw $zero, 0x1c($s1) -/* CC6A50 80243240 00431025 */ or $v0, $v0, $v1 -/* CC6A54 80243244 2403F7FF */ addiu $v1, $zero, -0x801 -/* CC6A58 80243248 00431024 */ and $v0, $v0, $v1 -/* CC6A5C 8024324C AE220000 */ sw $v0, ($s1) -/* CC6A60 80243250 8C860028 */ lw $a2, 0x28($a0) -/* CC6A64 80243254 0C00A720 */ jal atan2 -/* CC6A68 80243258 8C870030 */ lw $a3, 0x30($a0) -/* CC6A6C 8024325C 3C02004A */ lui $v0, 0x4a -/* CC6A70 80243260 3442001A */ ori $v0, $v0, 0x1a -/* CC6A74 80243264 AE220028 */ sw $v0, 0x28($s1) -/* CC6A78 80243268 24020003 */ addiu $v0, $zero, 3 -/* CC6A7C 8024326C A622008E */ sh $v0, 0x8e($s1) -/* CC6A80 80243270 24020067 */ addiu $v0, $zero, 0x67 -/* CC6A84 80243274 E620000C */ swc1 $f0, 0xc($s1) -/* CC6A88 80243278 08090CCE */ j .L80243338 -/* CC6A8C 8024327C AEA20070 */ sw $v0, 0x70($s5) -.L80243280: -/* CC6A90 80243280 C624003C */ lwc1 $f4, 0x3c($s1) -/* CC6A94 80243284 C620001C */ lwc1 $f0, 0x1c($s1) -/* CC6A98 80243288 46002100 */ add.s $f4, $f4, $f0 -/* CC6A9C 8024328C C6220014 */ lwc1 $f2, 0x14($s1) -/* CC6AA0 80243290 46020001 */ sub.s $f0, $f0, $f2 -/* CC6AA4 80243294 E624003C */ swc1 $f4, 0x3c($s1) -/* CC6AA8 80243298 08090CCE */ j .L80243338 -/* CC6AAC 8024329C E620001C */ swc1 $f0, 0x1c($s1) -.L802432A0: -/* CC6AB0 802432A0 9622008E */ lhu $v0, 0x8e($s1) -/* CC6AB4 802432A4 2442FFFF */ addiu $v0, $v0, -1 -/* CC6AB8 802432A8 A622008E */ sh $v0, 0x8e($s1) -/* CC6ABC 802432AC 00021400 */ sll $v0, $v0, 0x10 -/* CC6AC0 802432B0 1C400021 */ bgtz $v0, .L80243338 -/* CC6AC4 802432B4 3C03004A */ lui $v1, 0x4a -/* CC6AC8 802432B8 3C04FFFB */ lui $a0, 0xfffb -/* CC6ACC 802432BC 3484FFFF */ ori $a0, $a0, 0xffff -/* CC6AD0 802432C0 8E220000 */ lw $v0, ($s1) -/* CC6AD4 802432C4 34630001 */ ori $v1, $v1, 1 -/* CC6AD8 802432C8 AE230028 */ sw $v1, 0x28($s1) -/* CC6ADC 802432CC 00441024 */ and $v0, $v0, $a0 -/* CC6AE0 802432D0 AE220000 */ sw $v0, ($s1) -/* CC6AE4 802432D4 08090CCE */ j .L80243338 -/* CC6AE8 802432D8 AEA00070 */ sw $zero, 0x70($s5) -.L802432DC: -/* CC6AEC 802432DC 3C01C47A */ lui $at, 0xc47a -/* CC6AF0 802432E0 44810000 */ mtc1 $at, $f0 -/* CC6AF4 802432E4 8E230000 */ lw $v1, ($s1) -/* CC6AF8 802432E8 A622008E */ sh $v0, 0x8e($s1) -/* CC6AFC 802432EC 2402FDFF */ addiu $v0, $zero, -0x201 -/* CC6B00 802432F0 AE200038 */ sw $zero, 0x38($s1) -/* CC6B04 802432F4 AE200040 */ sw $zero, 0x40($s1) -/* CC6B08 802432F8 3463000A */ ori $v1, $v1, 0xa -/* CC6B0C 802432FC 00621824 */ and $v1, $v1, $v0 -/* CC6B10 80243300 E620003C */ swc1 $f0, 0x3c($s1) -/* CC6B14 80243304 AE230000 */ sw $v1, ($s1) -/* CC6B18 80243308 AEA40070 */ sw $a0, 0x70($s5) -.L8024330C: -/* CC6B1C 8024330C 9622008E */ lhu $v0, 0x8e($s1) -/* CC6B20 80243310 2442FFFF */ addiu $v0, $v0, -1 -/* CC6B24 80243314 A622008E */ sh $v0, 0x8e($s1) -/* CC6B28 80243318 00021400 */ sll $v0, $v0, 0x10 -/* CC6B2C 8024331C 1C400006 */ bgtz $v0, .L80243338 -/* CC6B30 80243320 24020064 */ addiu $v0, $zero, 0x64 -/* CC6B34 80243324 AE400094 */ sw $zero, 0x94($s2) -/* CC6B38 80243328 08090CCE */ j .L80243338 -/* CC6B3C 8024332C AEA20070 */ sw $v0, 0x70($s5) -.L80243330: -/* CC6B40 80243330 0C0129CF */ jal func_8004A73C -/* CC6B44 80243334 02A0202D */ daddu $a0, $s5, $zero -.L80243338: -/* CC6B48 80243338 8FBF0080 */ lw $ra, 0x80($sp) -/* CC6B4C 8024333C 8FB5007C */ lw $s5, 0x7c($sp) -/* CC6B50 80243340 8FB40078 */ lw $s4, 0x78($sp) -/* CC6B54 80243344 8FB30074 */ lw $s3, 0x74($sp) -/* CC6B58 80243348 8FB20070 */ lw $s2, 0x70($sp) -/* CC6B5C 8024334C 8FB1006C */ lw $s1, 0x6c($sp) -/* CC6B60 80243350 8FB00068 */ lw $s0, 0x68($sp) -/* CC6B64 80243354 D7B60090 */ ldc1 $f22, 0x90($sp) -/* CC6B68 80243358 D7B40088 */ ldc1 $f20, 0x88($sp) -/* CC6B6C 8024335C 0000102D */ daddu $v0, $zero, $zero -/* CC6B70 80243360 03E00008 */ jr $ra -/* CC6B74 80243364 27BD0098 */ addiu $sp, $sp, 0x98 diff --git a/asm/nonmatchings/world/area_flo/flo_14/func_80240124_CCB310.s b/asm/nonmatchings/world/area_flo/flo_14/func_80240124_CCB310.s deleted file mode 100644 index 1081a6f13f..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/func_80240124_CCB310.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_CCB434 -/* CCB434 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CCB438 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* CCB43C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* CCB440 80240130 10A00005 */ beqz $a1, .L80240148 -/* CCB444 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* CCB448 80240138 AE000070 */ sw $zero, 0x70($s0) -/* CCB44C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* CCB450 80240140 AE000078 */ sw $zero, 0x78($s0) -/* CCB454 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* CCB458 80240148 8E020070 */ lw $v0, 0x70($s0) -/* CCB45C 8024014C 1440000E */ bnez $v0, .L80240188 -/* CCB460 80240150 00000000 */ nop -/* CCB464 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* CCB468 80240158 8E020088 */ lw $v0, 0x88($s0) -/* CCB46C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* CCB470 80240160 04610004 */ bgez $v1, .L80240174 -/* CCB474 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* CCB478 80240168 3C020002 */ lui $v0, 2 -/* CCB47C 8024016C 08090061 */ j .L80240184 -/* CCB480 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* CCB484 80240174 3C040002 */ lui $a0, 2 -/* CCB488 80240178 0083102A */ slt $v0, $a0, $v1 -/* CCB48C 8024017C 10400002 */ beqz $v0, .L80240188 -/* CCB490 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* CCB494 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* CCB498 80240188 8E020074 */ lw $v0, 0x74($s0) -/* CCB49C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* CCB4A0 80240190 00000000 */ nop -/* CCB4A4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* CCB4A8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* CCB4AC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* CCB4B0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* CCB4B4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* CCB4B8 802401A8 3C020002 */ lui $v0, 2 -/* CCB4BC 802401AC 08090071 */ j .L802401C4 -/* CCB4C0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* CCB4C4 802401B4 3C040002 */ lui $a0, 2 -/* CCB4C8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* CCB4CC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* CCB4D0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* CCB4D4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* CCB4D8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* CCB4DC 802401CC 1440000E */ bnez $v0, .L80240208 -/* CCB4E0 802401D0 00000000 */ nop -/* CCB4E4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* CCB4E8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* CCB4EC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* CCB4F0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* CCB4F4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* CCB4F8 802401E8 3C020002 */ lui $v0, 2 -/* CCB4FC 802401EC 08090081 */ j .L80240204 -/* CCB500 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* CCB504 802401F4 3C040002 */ lui $a0, 2 -/* CCB508 802401F8 0083102A */ slt $v0, $a0, $v1 -/* CCB50C 802401FC 10400002 */ beqz $v0, .L80240208 -/* CCB510 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* CCB514 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* CCB518 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* CCB51C 8024020C 1440000E */ bnez $v0, .L80240248 -/* CCB520 80240210 00000000 */ nop -/* CCB524 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* CCB528 80240218 8E020094 */ lw $v0, 0x94($s0) -/* CCB52C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* CCB530 80240220 04610004 */ bgez $v1, .L80240234 -/* CCB534 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* CCB538 80240228 3C020002 */ lui $v0, 2 -/* CCB53C 8024022C 08090091 */ j .L80240244 -/* CCB540 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* CCB544 80240234 3C040002 */ lui $a0, 2 -/* CCB548 80240238 0083102A */ slt $v0, $a0, $v1 -/* CCB54C 8024023C 10400002 */ beqz $v0, .L80240248 -/* CCB550 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* CCB554 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* CCB558 80240248 8E040084 */ lw $a0, 0x84($s0) -/* CCB55C 8024024C 0C046F07 */ jal set_main_pan_u -/* CCB560 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* CCB564 80240254 8E040084 */ lw $a0, 0x84($s0) -/* CCB568 80240258 0C046F0D */ jal set_main_pan_v -/* CCB56C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* CCB570 80240260 8E040084 */ lw $a0, 0x84($s0) -/* CCB574 80240264 0C046F13 */ jal set_aux_pan_u -/* CCB578 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* CCB57C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* CCB580 80240270 0C046F19 */ jal set_aux_pan_v -/* CCB584 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* CCB588 80240278 8E020070 */ lw $v0, 0x70($s0) -/* CCB58C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* CCB590 80240280 8E040098 */ lw $a0, 0x98($s0) -/* CCB594 80240284 24420001 */ addiu $v0, $v0, 1 -/* CCB598 80240288 AE020070 */ sw $v0, 0x70($s0) -/* CCB59C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* CCB5A0 80240290 24630001 */ addiu $v1, $v1, 1 -/* CCB5A4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* CCB5A8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* CCB5AC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* CCB5B0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* CCB5B4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* CCB5B8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* CCB5BC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* CCB5C0 802402B0 14600002 */ bnez $v1, .L802402BC -/* CCB5C4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* CCB5C8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* CCB5CC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* CCB5D0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* CCB5D4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* CCB5D8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* CCB5DC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* CCB5E0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* CCB5E4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* CCB5E8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* CCB5EC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* CCB5F0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* CCB5F4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* CCB5F8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* CCB5FC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* CCB600 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* CCB604 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* CCB608 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* CCB60C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* CCB610 80240300 0000102D */ daddu $v0, $zero, $zero -/* CCB614 80240304 03E00008 */ jr $ra -/* CCB618 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_14/func_8024030C_CCB310.s b/asm/nonmatchings/world/area_flo/flo_14/func_8024030C_CCB310.s deleted file mode 100644 index 4262e3e595..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/func_8024030C_CCB310.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_CCB61C -/* CCB61C 8024030C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CCB620 80240310 0000202D */ daddu $a0, $zero, $zero -/* CCB624 80240314 0080282D */ daddu $a1, $a0, $zero -/* CCB628 80240318 0080302D */ daddu $a2, $a0, $zero -/* CCB62C 8024031C 0080382D */ daddu $a3, $a0, $zero -/* CCB630 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* CCB634 80240324 AFA00010 */ sw $zero, 0x10($sp) -/* CCB638 80240328 0C01CA54 */ jal func_80072950 -/* CCB63C 8024032C AFA00014 */ sw $zero, 0x14($sp) -/* CCB640 80240330 8FBF0018 */ lw $ra, 0x18($sp) -/* CCB644 80240334 24020002 */ addiu $v0, $zero, 2 -/* CCB648 80240338 03E00008 */ jr $ra -/* CCB64C 8024033C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_14/func_80240340_CCB310.s b/asm/nonmatchings/world/area_flo/flo_14/func_80240340_CCB310.s deleted file mode 100644 index 915d5f18b0..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/func_80240340_CCB310.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240340_CCB650 -/* CCB650 80240340 8C820084 */ lw $v0, 0x84($a0) -/* CCB654 80240344 8C830090 */ lw $v1, 0x90($a0) -/* CCB658 80240348 00431023 */ subu $v0, $v0, $v1 -/* CCB65C 8024034C 44821000 */ mtc1 $v0, $f2 -/* CCB660 80240350 00000000 */ nop -/* CCB664 80240354 468010A0 */ cvt.s.w $f2, $f2 -/* CCB668 80240358 8C820088 */ lw $v0, 0x88($a0) -/* CCB66C 8024035C 8C830094 */ lw $v1, 0x94($a0) -/* CCB670 80240360 46021082 */ mul.s $f2, $f2, $f2 -/* CCB674 80240364 00000000 */ nop -/* CCB678 80240368 00431023 */ subu $v0, $v0, $v1 -/* CCB67C 8024036C 44822000 */ mtc1 $v0, $f4 -/* CCB680 80240370 00000000 */ nop -/* CCB684 80240374 46802120 */ cvt.s.w $f4, $f4 -/* CCB688 80240378 8C82008C */ lw $v0, 0x8c($a0) -/* CCB68C 8024037C 46042102 */ mul.s $f4, $f4, $f4 -/* CCB690 80240380 00000000 */ nop -/* CCB694 80240384 8C830098 */ lw $v1, 0x98($a0) -/* CCB698 80240388 00431023 */ subu $v0, $v0, $v1 -/* CCB69C 8024038C 44820000 */ mtc1 $v0, $f0 -/* CCB6A0 80240390 00000000 */ nop -/* CCB6A4 80240394 46800020 */ cvt.s.w $f0, $f0 -/* CCB6A8 80240398 46000002 */ mul.s $f0, $f0, $f0 -/* CCB6AC 8024039C 00000000 */ nop -/* CCB6B0 802403A0 46041080 */ add.s $f2, $f2, $f4 -/* CCB6B4 802403A4 46001080 */ add.s $f2, $f2, $f0 -/* CCB6B8 802403A8 3C014561 */ lui $at, 0x4561 -/* CCB6BC 802403AC 44810000 */ mtc1 $at, $f0 -/* CCB6C0 802403B0 00000000 */ nop -/* CCB6C4 802403B4 4600103C */ c.lt.s $f2, $f0 -/* CCB6C8 802403B8 00000000 */ nop -/* CCB6CC 802403BC 45010002 */ bc1t .L802403C8 -/* CCB6D0 802403C0 24020001 */ addiu $v0, $zero, 1 -/* CCB6D4 802403C4 0000102D */ daddu $v0, $zero, $zero -.L802403C8: -/* CCB6D8 802403C8 AC820084 */ sw $v0, 0x84($a0) -/* CCB6DC 802403CC 03E00008 */ jr $ra -/* CCB6E0 802403D0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_flo/flo_14/func_802403D4_CCB310.s b/asm/nonmatchings/world/area_flo/flo_14/func_802403D4_CCB310.s deleted file mode 100644 index 316b599ad3..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/func_802403D4_CCB310.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403D4_CCB6E4 -/* CCB6E4 802403D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CCB6E8 802403D8 3C028011 */ lui $v0, 0x8011 -/* CCB6EC 802403DC 8042F2A2 */ lb $v0, -0xd5e($v0) -/* CCB6F0 802403E0 0080182D */ daddu $v1, $a0, $zero -/* CCB6F4 802403E4 1040000C */ beqz $v0, .L80240418 -/* CCB6F8 802403E8 AFBF0010 */ sw $ra, 0x10($sp) -/* CCB6FC 802403EC 2404FFFC */ addiu $a0, $zero, -4 -/* CCB700 802403F0 24020001 */ addiu $v0, $zero, 1 -/* CCB704 802403F4 0C00EABB */ jal get_npc_unsafe -/* CCB708 802403F8 AC6200BC */ sw $v0, 0xbc($v1) -/* CCB70C 802403FC 0000202D */ daddu $a0, $zero, $zero -/* CCB710 80240400 3C05FD05 */ lui $a1, 0xfd05 -/* CCB714 80240404 8C460000 */ lw $a2, ($v0) -/* CCB718 80240408 0C0B2026 */ jal set_variable -/* CCB71C 8024040C 34A50F80 */ ori $a1, $a1, 0xf80 -/* CCB720 80240410 08090108 */ j .L80240420 -/* CCB724 80240414 24020002 */ addiu $v0, $zero, 2 -.L80240418: -/* CCB728 80240418 AC6000BC */ sw $zero, 0xbc($v1) -/* CCB72C 8024041C 24020002 */ addiu $v0, $zero, 2 -.L80240420: -/* CCB730 80240420 8FBF0010 */ lw $ra, 0x10($sp) -/* CCB734 80240424 03E00008 */ jr $ra -/* CCB738 80240428 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_14/func_8024042C_CCB310.s b/asm/nonmatchings/world/area_flo/flo_14/func_8024042C_CCB310.s deleted file mode 100644 index 24829f7eef..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/func_8024042C_CCB310.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024042C_CCB73C -/* CCB73C 8024042C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CCB740 80240430 2404FFFC */ addiu $a0, $zero, -4 -/* CCB744 80240434 AFBF0014 */ sw $ra, 0x14($sp) -/* CCB748 80240438 0C00EABB */ jal get_npc_unsafe -/* CCB74C 8024043C AFB00010 */ sw $s0, 0x10($sp) -/* CCB750 80240440 0000202D */ daddu $a0, $zero, $zero -/* CCB754 80240444 3C05FD05 */ lui $a1, 0xfd05 -/* CCB758 80240448 34A50F80 */ ori $a1, $a1, 0xf80 -/* CCB75C 8024044C 0C0B1EAF */ jal get_variable -/* CCB760 80240450 0040802D */ daddu $s0, $v0, $zero -/* CCB764 80240454 AE020000 */ sw $v0, ($s0) -/* CCB768 80240458 8FBF0014 */ lw $ra, 0x14($sp) -/* CCB76C 8024045C 8FB00010 */ lw $s0, 0x10($sp) -/* CCB770 80240460 24020002 */ addiu $v0, $zero, 2 -/* CCB774 80240464 03E00008 */ jr $ra -/* CCB778 80240468 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_14/func_8024046C_CCB310.s b/asm/nonmatchings/world/area_flo/flo_14/func_8024046C_CCB310.s deleted file mode 100644 index 59a693cf3b..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/func_8024046C_CCB310.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024046C_CCB77C -/* CCB77C 8024046C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CCB780 80240470 AFB1001C */ sw $s1, 0x1c($sp) -/* CCB784 80240474 0080882D */ daddu $s1, $a0, $zero -/* CCB788 80240478 AFBF0020 */ sw $ra, 0x20($sp) -/* CCB78C 8024047C AFB00018 */ sw $s0, 0x18($sp) -/* CCB790 80240480 8E30000C */ lw $s0, 0xc($s1) -/* CCB794 80240484 8E050000 */ lw $a1, ($s0) -/* CCB798 80240488 0C0B1EAF */ jal get_variable -/* CCB79C 8024048C 26100004 */ addiu $s0, $s0, 4 -/* CCB7A0 80240490 AE220070 */ sw $v0, 0x70($s1) -/* CCB7A4 80240494 8E050000 */ lw $a1, ($s0) -/* CCB7A8 80240498 26100004 */ addiu $s0, $s0, 4 -/* CCB7AC 8024049C 0C0B1EAF */ jal get_variable -/* CCB7B0 802404A0 0220202D */ daddu $a0, $s1, $zero -/* CCB7B4 802404A4 AE220074 */ sw $v0, 0x74($s1) -/* CCB7B8 802404A8 8E050000 */ lw $a1, ($s0) -/* CCB7BC 802404AC 0C0B1EAF */ jal get_variable -/* CCB7C0 802404B0 0220202D */ daddu $a0, $s1, $zero -/* CCB7C4 802404B4 24040194 */ addiu $a0, $zero, 0x194 -/* CCB7C8 802404B8 0000282D */ daddu $a1, $zero, $zero -/* CCB7CC 802404BC C6200070 */ lwc1 $f0, 0x70($s1) -/* CCB7D0 802404C0 46800020 */ cvt.s.w $f0, $f0 -/* CCB7D4 802404C4 C6220074 */ lwc1 $f2, 0x74($s1) -/* CCB7D8 802404C8 468010A0 */ cvt.s.w $f2, $f2 -/* CCB7DC 802404CC 44060000 */ mfc1 $a2, $f0 -/* CCB7E0 802404D0 44071000 */ mfc1 $a3, $f2 -/* CCB7E4 802404D4 44820000 */ mtc1 $v0, $f0 -/* CCB7E8 802404D8 00000000 */ nop -/* CCB7EC 802404DC 46800020 */ cvt.s.w $f0, $f0 -/* CCB7F0 802404E0 AE220078 */ sw $v0, 0x78($s1) -/* CCB7F4 802404E4 0C05267B */ jal func_801499EC -/* CCB7F8 802404E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* CCB7FC 802404EC 8FBF0020 */ lw $ra, 0x20($sp) -/* CCB800 802404F0 8FB1001C */ lw $s1, 0x1c($sp) -/* CCB804 802404F4 8FB00018 */ lw $s0, 0x18($sp) -/* CCB808 802404F8 24020002 */ addiu $v0, $zero, 2 -/* CCB80C 802404FC 03E00008 */ jr $ra -/* CCB810 80240500 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_14/func_80240504_CCB310.s b/asm/nonmatchings/world/area_flo/flo_14/func_80240504_CCB310.s deleted file mode 100644 index 88fe836a3f..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/func_80240504_CCB310.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240504_CCB814 -/* CCB814 80240504 27BDFF88 */ addiu $sp, $sp, -0x78 -/* CCB818 80240508 AFBF0064 */ sw $ra, 0x64($sp) -/* CCB81C 8024050C AFB00060 */ sw $s0, 0x60($sp) -/* CCB820 80240510 F7B60070 */ sdc1 $f22, 0x70($sp) -/* CCB824 80240514 F7B40068 */ sdc1 $f20, 0x68($sp) -/* CCB828 80240518 0C019D28 */ jal guMtxIdentF -/* CCB82C 8024051C 27A40010 */ addiu $a0, $sp, 0x10 -/* CCB830 80240520 3C108024 */ lui $s0, 0x8024 -/* CCB834 80240524 26103B14 */ addiu $s0, $s0, 0x3b14 -/* CCB838 80240528 C6000000 */ lwc1 $f0, ($s0) -/* CCB83C 8024052C 3C014130 */ lui $at, 0x4130 -/* CCB840 80240530 44816000 */ mtc1 $at, $f12 -/* CCB844 80240534 0C00A85B */ jal sin_rad -/* CCB848 80240538 460C0303 */ div.s $f12, $f0, $f12 -/* CCB84C 8024053C 3C018024 */ lui $at, 0x8024 -/* CCB850 80240540 D4345320 */ ldc1 $f20, 0x5320($at) -/* CCB854 80240544 46000021 */ cvt.d.s $f0, $f0 -/* CCB858 80240548 46340002 */ mul.d $f0, $f0, $f20 -/* CCB85C 8024054C 00000000 */ nop -/* CCB860 80240550 3C018024 */ lui $at, 0x8024 -/* CCB864 80240554 D4365328 */ ldc1 $f22, 0x5328($at) -/* CCB868 80240558 C6020000 */ lwc1 $f2, ($s0) -/* CCB86C 8024055C 3C014140 */ lui $at, 0x4140 -/* CCB870 80240560 44816000 */ mtc1 $at, $f12 -/* CCB874 80240564 46360000 */ add.d $f0, $f0, $f22 -/* CCB878 80240568 460C1303 */ div.s $f12, $f2, $f12 -/* CCB87C 8024056C 46200020 */ cvt.s.d $f0, $f0 -/* CCB880 80240570 0C00A85B */ jal sin_rad -/* CCB884 80240574 E7A00010 */ swc1 $f0, 0x10($sp) -/* CCB888 80240578 46000021 */ cvt.d.s $f0, $f0 -/* CCB88C 8024057C 46340002 */ mul.d $f0, $f0, $f20 -/* CCB890 80240580 00000000 */ nop -/* CCB894 80240584 C6020000 */ lwc1 $f2, ($s0) -/* CCB898 80240588 3C014150 */ lui $at, 0x4150 -/* CCB89C 8024058C 44816000 */ mtc1 $at, $f12 -/* CCB8A0 80240590 00000000 */ nop -/* CCB8A4 80240594 460C1303 */ div.s $f12, $f2, $f12 -/* CCB8A8 80240598 46200020 */ cvt.s.d $f0, $f0 -/* CCB8AC 8024059C 0C00A874 */ jal cos_rad -/* CCB8B0 802405A0 E7A00014 */ swc1 $f0, 0x14($sp) -/* CCB8B4 802405A4 46000021 */ cvt.d.s $f0, $f0 -/* CCB8B8 802405A8 46340002 */ mul.d $f0, $f0, $f20 -/* CCB8BC 802405AC 00000000 */ nop -/* CCB8C0 802405B0 C60C0000 */ lwc1 $f12, ($s0) -/* CCB8C4 802405B4 3C0140E0 */ lui $at, 0x40e0 -/* CCB8C8 802405B8 44811000 */ mtc1 $at, $f2 -/* CCB8CC 802405BC 3C013F80 */ lui $at, 0x3f80 -/* CCB8D0 802405C0 44812000 */ mtc1 $at, $f4 -/* CCB8D4 802405C4 46026303 */ div.s $f12, $f12, $f2 -/* CCB8D8 802405C8 46046300 */ add.s $f12, $f12, $f4 -/* CCB8DC 802405CC 46200020 */ cvt.s.d $f0, $f0 -/* CCB8E0 802405D0 0C00A85B */ jal sin_rad -/* CCB8E4 802405D4 E7A00018 */ swc1 $f0, 0x18($sp) -/* CCB8E8 802405D8 46000021 */ cvt.d.s $f0, $f0 -/* CCB8EC 802405DC 46340002 */ mul.d $f0, $f0, $f20 -/* CCB8F0 802405E0 00000000 */ nop -/* CCB8F4 802405E4 C6020000 */ lwc1 $f2, ($s0) -/* CCB8F8 802405E8 3C014160 */ lui $at, 0x4160 -/* CCB8FC 802405EC 44816000 */ mtc1 $at, $f12 -/* CCB900 802405F0 46360000 */ add.d $f0, $f0, $f22 -/* CCB904 802405F4 460C1303 */ div.s $f12, $f2, $f12 -/* CCB908 802405F8 46200020 */ cvt.s.d $f0, $f0 -/* CCB90C 802405FC 0C00A85B */ jal sin_rad -/* CCB910 80240600 E7A00024 */ swc1 $f0, 0x24($sp) -/* CCB914 80240604 46000021 */ cvt.d.s $f0, $f0 -/* CCB918 80240608 46340002 */ mul.d $f0, $f0, $f20 -/* CCB91C 8024060C 00000000 */ nop -/* CCB920 80240610 C6020000 */ lwc1 $f2, ($s0) -/* CCB924 80240614 3C014170 */ lui $at, 0x4170 -/* CCB928 80240618 44816000 */ mtc1 $at, $f12 -/* CCB92C 8024061C 00000000 */ nop -/* CCB930 80240620 460C1303 */ div.s $f12, $f2, $f12 -/* CCB934 80240624 46200020 */ cvt.s.d $f0, $f0 -/* CCB938 80240628 0C00A874 */ jal cos_rad -/* CCB93C 8024062C E7A00020 */ swc1 $f0, 0x20($sp) -/* CCB940 80240630 46000021 */ cvt.d.s $f0, $f0 -/* CCB944 80240634 46340002 */ mul.d $f0, $f0, $f20 -/* CCB948 80240638 00000000 */ nop -/* CCB94C 8024063C C60C0000 */ lwc1 $f12, ($s0) -/* CCB950 80240640 3C013E80 */ lui $at, 0x3e80 -/* CCB954 80240644 44811000 */ mtc1 $at, $f2 -/* CCB958 80240648 00000000 */ nop -/* CCB95C 8024064C 46026302 */ mul.s $f12, $f12, $f2 -/* CCB960 80240650 00000000 */ nop -/* CCB964 80240654 3C014000 */ lui $at, 0x4000 -/* CCB968 80240658 44811000 */ mtc1 $at, $f2 -/* CCB96C 8024065C 00000000 */ nop -/* CCB970 80240660 46026300 */ add.s $f12, $f12, $f2 -/* CCB974 80240664 46200020 */ cvt.s.d $f0, $f0 -/* CCB978 80240668 0C00A85B */ jal sin_rad -/* CCB97C 8024066C E7A00028 */ swc1 $f0, 0x28($sp) -/* CCB980 80240670 46000021 */ cvt.d.s $f0, $f0 -/* CCB984 80240674 46340002 */ mul.d $f0, $f0, $f20 -/* CCB988 80240678 00000000 */ nop -/* CCB98C 8024067C C6020000 */ lwc1 $f2, ($s0) -/* CCB990 80240680 3C013D80 */ lui $at, 0x3d80 -/* CCB994 80240684 44816000 */ mtc1 $at, $f12 -/* CCB998 80240688 00000000 */ nop -/* CCB99C 8024068C 460C1302 */ mul.s $f12, $f2, $f12 -/* CCB9A0 80240690 00000000 */ nop -/* CCB9A4 80240694 46360000 */ add.d $f0, $f0, $f22 -/* CCB9A8 80240698 46200020 */ cvt.s.d $f0, $f0 -/* CCB9AC 8024069C 0C00A85B */ jal sin_rad -/* CCB9B0 802406A0 E7A00038 */ swc1 $f0, 0x38($sp) -/* CCB9B4 802406A4 46000021 */ cvt.d.s $f0, $f0 -/* CCB9B8 802406A8 46340002 */ mul.d $f0, $f0, $f20 -/* CCB9BC 802406AC 00000000 */ nop -/* CCB9C0 802406B0 C6020000 */ lwc1 $f2, ($s0) -/* CCB9C4 802406B4 3C014188 */ lui $at, 0x4188 -/* CCB9C8 802406B8 44816000 */ mtc1 $at, $f12 -/* CCB9CC 802406BC 00000000 */ nop -/* CCB9D0 802406C0 460C1303 */ div.s $f12, $f2, $f12 -/* CCB9D4 802406C4 46200020 */ cvt.s.d $f0, $f0 -/* CCB9D8 802406C8 0C00A874 */ jal cos_rad -/* CCB9DC 802406CC E7A00030 */ swc1 $f0, 0x30($sp) -/* CCB9E0 802406D0 3C030001 */ lui $v1, 1 -/* CCB9E4 802406D4 46000021 */ cvt.d.s $f0, $f0 -/* CCB9E8 802406D8 46340002 */ mul.d $f0, $f0, $f20 -/* CCB9EC 802406DC 00000000 */ nop -/* CCB9F0 802406E0 34631630 */ ori $v1, $v1, 0x1630 -/* CCB9F4 802406E4 27A40010 */ addiu $a0, $sp, 0x10 -/* CCB9F8 802406E8 3C058007 */ lui $a1, 0x8007 -/* CCB9FC 802406EC 94A541F0 */ lhu $a1, 0x41f0($a1) -/* CCBA00 802406F0 3C02800A */ lui $v0, 0x800a -/* CCBA04 802406F4 8C42A674 */ lw $v0, -0x598c($v0) -/* CCBA08 802406F8 00052980 */ sll $a1, $a1, 6 -/* CCBA0C 802406FC 00A32821 */ addu $a1, $a1, $v1 -/* CCBA10 80240700 00452821 */ addu $a1, $v0, $a1 -/* CCBA14 80240704 46200020 */ cvt.s.d $f0, $f0 -/* CCBA18 80240708 0C019D40 */ jal guMtxF2L -/* CCBA1C 8024070C E7A00034 */ swc1 $f0, 0x34($sp) -/* CCBA20 80240710 0000202D */ daddu $a0, $zero, $zero -/* CCBA24 80240714 27A50050 */ addiu $a1, $sp, 0x50 -/* CCBA28 80240718 27A60054 */ addiu $a2, $sp, 0x54 -/* CCBA2C 8024071C 0C0470AC */ jal func_8011C2B0 -/* CCBA30 80240720 27A70058 */ addiu $a3, $sp, 0x58 -/* CCBA34 80240724 3C03DA38 */ lui $v1, 0xda38 -/* CCBA38 80240728 34630001 */ ori $v1, $v1, 1 -/* CCBA3C 8024072C 3C080001 */ lui $t0, 1 -/* CCBA40 80240730 35081630 */ ori $t0, $t0, 0x1630 -/* CCBA44 80240734 3C06800A */ lui $a2, 0x800a -/* CCBA48 80240738 24C6A66C */ addiu $a2, $a2, -0x5994 -/* CCBA4C 8024073C 0000202D */ daddu $a0, $zero, $zero -/* CCBA50 80240740 3C058007 */ lui $a1, 0x8007 -/* CCBA54 80240744 24A541F0 */ addiu $a1, $a1, 0x41f0 -/* CCBA58 80240748 8CD00000 */ lw $s0, ($a2) -/* CCBA5C 8024074C 94A20000 */ lhu $v0, ($a1) -/* CCBA60 80240750 0200382D */ daddu $a3, $s0, $zero -/* CCBA64 80240754 26100008 */ addiu $s0, $s0, 8 -/* CCBA68 80240758 ACD00000 */ sw $s0, ($a2) -/* CCBA6C 8024075C ACE30000 */ sw $v1, ($a3) -/* CCBA70 80240760 24430001 */ addiu $v1, $v0, 1 -/* CCBA74 80240764 3042FFFF */ andi $v0, $v0, 0xffff -/* CCBA78 80240768 00021180 */ sll $v0, $v0, 6 -/* CCBA7C 8024076C A4A30000 */ sh $v1, ($a1) -/* CCBA80 80240770 3C03800A */ lui $v1, 0x800a -/* CCBA84 80240774 8C63A674 */ lw $v1, -0x598c($v1) -/* CCBA88 80240778 00481021 */ addu $v0, $v0, $t0 -/* CCBA8C 8024077C 00621821 */ addu $v1, $v1, $v0 -/* CCBA90 80240780 26020008 */ addiu $v0, $s0, 8 -/* CCBA94 80240784 ACE30004 */ sw $v1, 4($a3) -/* CCBA98 80240788 ACC20000 */ sw $v0, ($a2) -/* CCBA9C 8024078C 3C02DE00 */ lui $v0, 0xde00 -/* CCBAA0 80240790 0C0470BB */ jal func_8011C2EC -/* CCBAA4 80240794 AE020000 */ sw $v0, ($s0) -/* CCBAA8 80240798 3C038024 */ lui $v1, 0x8024 -/* CCBAAC 8024079C 24633B14 */ addiu $v1, $v1, 0x3b14 -/* CCBAB0 802407A0 C4600000 */ lwc1 $f0, ($v1) -/* CCBAB4 802407A4 3C013F80 */ lui $at, 0x3f80 -/* CCBAB8 802407A8 44811000 */ mtc1 $at, $f2 -/* CCBABC 802407AC 00000000 */ nop -/* CCBAC0 802407B0 46020000 */ add.s $f0, $f0, $f2 -/* CCBAC4 802407B4 AE020004 */ sw $v0, 4($s0) -/* CCBAC8 802407B8 E4600000 */ swc1 $f0, ($v1) -/* CCBACC 802407BC 8FBF0064 */ lw $ra, 0x64($sp) -/* CCBAD0 802407C0 8FB00060 */ lw $s0, 0x60($sp) -/* CCBAD4 802407C4 D7B60070 */ ldc1 $f22, 0x70($sp) -/* CCBAD8 802407C8 D7B40068 */ ldc1 $f20, 0x68($sp) -/* CCBADC 802407CC 03E00008 */ jr $ra -/* CCBAE0 802407D0 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_flo/flo_14/func_802407D4_CCB310.s b/asm/nonmatchings/world/area_flo/flo_14/func_802407D4_CCB310.s deleted file mode 100644 index a95b1031ad..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/func_802407D4_CCB310.s +++ /dev/null @@ -1,221 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D4_CCBAE4 -/* CCBAE4 802407D4 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* CCBAE8 802407D8 24040001 */ addiu $a0, $zero, 1 -/* CCBAEC 802407DC 27A50010 */ addiu $a1, $sp, 0x10 -/* CCBAF0 802407E0 27A60014 */ addiu $a2, $sp, 0x14 -/* CCBAF4 802407E4 AFBF0030 */ sw $ra, 0x30($sp) -/* CCBAF8 802407E8 AFB3002C */ sw $s3, 0x2c($sp) -/* CCBAFC 802407EC AFB20028 */ sw $s2, 0x28($sp) -/* CCBB00 802407F0 AFB10024 */ sw $s1, 0x24($sp) -/* CCBB04 802407F4 AFB00020 */ sw $s0, 0x20($sp) -/* CCBB08 802407F8 F7BA0050 */ sdc1 $f26, 0x50($sp) -/* CCBB0C 802407FC F7B80048 */ sdc1 $f24, 0x48($sp) -/* CCBB10 80240800 F7B60040 */ sdc1 $f22, 0x40($sp) -/* CCBB14 80240804 F7B40038 */ sdc1 $f20, 0x38($sp) -/* CCBB18 80240808 0C0470AC */ jal func_8011C2B0 -/* CCBB1C 8024080C 27A70018 */ addiu $a3, $sp, 0x18 -/* CCBB20 80240810 8FA20018 */ lw $v0, 0x18($sp) -/* CCBB24 80240814 18400072 */ blez $v0, .L802409E0 -/* CCBB28 80240818 0000902D */ daddu $s2, $zero, $zero -/* CCBB2C 8024081C 3C138024 */ lui $s3, 0x8024 -/* CCBB30 80240820 26733B18 */ addiu $s3, $s3, 0x3b18 -/* CCBB34 80240824 3C014334 */ lui $at, 0x4334 -/* CCBB38 80240828 4481D000 */ mtc1 $at, $f26 -/* CCBB3C 8024082C 3C018024 */ lui $at, 0x8024 -/* CCBB40 80240830 D4385330 */ ldc1 $f24, 0x5330($at) -/* CCBB44 80240834 3C018024 */ lui $at, 0x8024 -/* CCBB48 80240838 D4365338 */ ldc1 $f22, 0x5338($at) -/* CCBB4C 8024083C 00122100 */ sll $a0, $s2, 4 -.L80240840: -/* CCBB50 80240840 8FA20010 */ lw $v0, 0x10($sp) -/* CCBB54 80240844 8FA30014 */ lw $v1, 0x14($sp) -/* CCBB58 80240848 00448021 */ addu $s0, $v0, $a0 -/* CCBB5C 8024084C 86020000 */ lh $v0, ($s0) -/* CCBB60 80240850 28420259 */ slti $v0, $v0, 0x259 -/* CCBB64 80240854 1040005D */ beqz $v0, .L802409CC -/* CCBB68 80240858 00648821 */ addu $s1, $v1, $a0 -/* CCBB6C 8024085C C66C0000 */ lwc1 $f12, ($s3) -/* CCBB70 80240860 46806320 */ cvt.s.w $f12, $f12 -/* CCBB74 80240864 461A6303 */ div.s $f12, $f12, $f26 -/* CCBB78 80240868 46006321 */ cvt.d.s $f12, $f12 -/* CCBB7C 8024086C 46386302 */ mul.d $f12, $f12, $f24 -/* CCBB80 80240870 00000000 */ nop -/* CCBB84 80240874 0C00A85B */ jal sin_rad -/* CCBB88 80240878 46206320 */ cvt.s.d $f12, $f12 -/* CCBB8C 8024087C C66C0000 */ lwc1 $f12, ($s3) -/* CCBB90 80240880 46806320 */ cvt.s.w $f12, $f12 -/* CCBB94 80240884 461A6303 */ div.s $f12, $f12, $f26 -/* CCBB98 80240888 46006321 */ cvt.d.s $f12, $f12 -/* CCBB9C 8024088C 46386302 */ mul.d $f12, $f12, $f24 -/* CCBBA0 80240890 00000000 */ nop -/* CCBBA4 80240894 3C018024 */ lui $at, 0x8024 -/* CCBBA8 80240898 D4225340 */ ldc1 $f2, 0x5340($at) -/* CCBBAC 8024089C 46000521 */ cvt.d.s $f20, $f0 -/* CCBBB0 802408A0 4622A502 */ mul.d $f20, $f20, $f2 -/* CCBBB4 802408A4 00000000 */ nop -/* CCBBB8 802408A8 3C018024 */ lui $at, 0x8024 -/* CCBBBC 802408AC D4205348 */ ldc1 $f0, 0x5348($at) -/* CCBBC0 802408B0 4620A500 */ add.d $f20, $f20, $f0 -/* CCBBC4 802408B4 46206320 */ cvt.s.d $f12, $f12 -/* CCBBC8 802408B8 0C00A85B */ jal sin_rad -/* CCBBCC 802408BC 4620A520 */ cvt.s.d $f20, $f20 -/* CCBBD0 802408C0 46000021 */ cvt.d.s $f0, $f0 -/* CCBBD4 802408C4 46360002 */ mul.d $f0, $f0, $f22 -/* CCBBD8 802408C8 00000000 */ nop -/* CCBBDC 802408CC 86020000 */ lh $v0, ($s0) -/* CCBBE0 802408D0 2442FD98 */ addiu $v0, $v0, -0x268 -/* CCBBE4 802408D4 44822000 */ mtc1 $v0, $f4 -/* CCBBE8 802408D8 00000000 */ nop -/* CCBBEC 802408DC 46802120 */ cvt.s.w $f4, $f4 -/* CCBBF0 802408E0 46142102 */ mul.s $f4, $f4, $f20 -/* CCBBF4 802408E4 00000000 */ nop -/* CCBBF8 802408E8 4620B001 */ sub.d $f0, $f22, $f0 -/* CCBBFC 802408EC 3C01C240 */ lui $at, 0xc240 -/* CCBC00 802408F0 44813000 */ mtc1 $at, $f6 -/* CCBC04 802408F4 46200020 */ cvt.s.d $f0, $f0 -/* CCBC08 802408F8 46060182 */ mul.s $f6, $f0, $f6 -/* CCBC0C 802408FC 00000000 */ nop -/* CCBC10 80240900 3C01441A */ lui $at, 0x441a -/* CCBC14 80240904 44811000 */ mtc1 $at, $f2 -/* CCBC18 80240908 00000000 */ nop -/* CCBC1C 8024090C 46022100 */ add.s $f4, $f4, $f2 -/* CCBC20 80240910 46062100 */ add.s $f4, $f4, $f6 -/* CCBC24 80240914 3C0141C8 */ lui $at, 0x41c8 -/* CCBC28 80240918 44813000 */ mtc1 $at, $f6 -/* CCBC2C 8024091C 00000000 */ nop -/* CCBC30 80240920 46060182 */ mul.s $f6, $f0, $f6 -/* CCBC34 80240924 00000000 */ nop -/* CCBC38 80240928 4600220D */ trunc.w.s $f8, $f4 -/* CCBC3C 8024092C 44024000 */ mfc1 $v0, $f8 -/* CCBC40 80240930 00000000 */ nop -/* CCBC44 80240934 A6220000 */ sh $v0, ($s1) -/* CCBC48 80240938 86020002 */ lh $v0, 2($s0) -/* CCBC4C 8024093C 2442FFD4 */ addiu $v0, $v0, -0x2c -/* CCBC50 80240940 44821000 */ mtc1 $v0, $f2 -/* CCBC54 80240944 00000000 */ nop -/* CCBC58 80240948 468010A0 */ cvt.s.w $f2, $f2 -/* CCBC5C 8024094C 46141082 */ mul.s $f2, $f2, $f20 -/* CCBC60 80240950 00000000 */ nop -/* CCBC64 80240954 3C014230 */ lui $at, 0x4230 -/* CCBC68 80240958 44812000 */ mtc1 $at, $f4 -/* CCBC6C 8024095C 00000000 */ nop -/* CCBC70 80240960 46041080 */ add.s $f2, $f2, $f4 -/* CCBC74 80240964 46061080 */ add.s $f2, $f2, $f6 -/* CCBC78 80240968 3C01C2AE */ lui $at, 0xc2ae -/* CCBC7C 8024096C 44812000 */ mtc1 $at, $f4 -/* CCBC80 80240970 00000000 */ nop -/* CCBC84 80240974 46040002 */ mul.s $f0, $f0, $f4 -/* CCBC88 80240978 00000000 */ nop -/* CCBC8C 8024097C 4600120D */ trunc.w.s $f8, $f2 -/* CCBC90 80240980 44024000 */ mfc1 $v0, $f8 -/* CCBC94 80240984 00000000 */ nop -/* CCBC98 80240988 A6220002 */ sh $v0, 2($s1) -/* CCBC9C 8024098C 86020004 */ lh $v0, 4($s0) -/* CCBCA0 80240990 2442FF8F */ addiu $v0, $v0, -0x71 -/* CCBCA4 80240994 44821000 */ mtc1 $v0, $f2 -/* CCBCA8 80240998 00000000 */ nop -/* CCBCAC 8024099C 468010A0 */ cvt.s.w $f2, $f2 -/* CCBCB0 802409A0 46141082 */ mul.s $f2, $f2, $f20 -/* CCBCB4 802409A4 00000000 */ nop -/* CCBCB8 802409A8 3C0142E2 */ lui $at, 0x42e2 -/* CCBCBC 802409AC 44812000 */ mtc1 $at, $f4 -/* CCBCC0 802409B0 00000000 */ nop -/* CCBCC4 802409B4 46041080 */ add.s $f2, $f2, $f4 -/* CCBCC8 802409B8 46001080 */ add.s $f2, $f2, $f0 -/* CCBCCC 802409BC 4600120D */ trunc.w.s $f8, $f2 -/* CCBCD0 802409C0 44024000 */ mfc1 $v0, $f8 -/* CCBCD4 802409C4 00000000 */ nop -/* CCBCD8 802409C8 A6220004 */ sh $v0, 4($s1) -.L802409CC: -/* CCBCDC 802409CC 8FA20018 */ lw $v0, 0x18($sp) -/* CCBCE0 802409D0 26520001 */ addiu $s2, $s2, 1 -/* CCBCE4 802409D4 0242102A */ slt $v0, $s2, $v0 -/* CCBCE8 802409D8 1440FF99 */ bnez $v0, .L80240840 -/* CCBCEC 802409DC 00122100 */ sll $a0, $s2, 4 -.L802409E0: -/* CCBCF0 802409E0 3C03800A */ lui $v1, 0x800a -/* CCBCF4 802409E4 2463A66C */ addiu $v1, $v1, -0x5994 -/* CCBCF8 802409E8 8C620000 */ lw $v0, ($v1) -/* CCBCFC 802409EC 24040001 */ addiu $a0, $zero, 1 -/* CCBD00 802409F0 0040802D */ daddu $s0, $v0, $zero -/* CCBD04 802409F4 24420008 */ addiu $v0, $v0, 8 -/* CCBD08 802409F8 AC620000 */ sw $v0, ($v1) -/* CCBD0C 802409FC 3C02DE00 */ lui $v0, 0xde00 -/* CCBD10 80240A00 0C0470BB */ jal func_8011C2EC -/* CCBD14 80240A04 AE020000 */ sw $v0, ($s0) -/* CCBD18 80240A08 0000202D */ daddu $a0, $zero, $zero -/* CCBD1C 80240A0C 3C05F971 */ lui $a1, 0xf971 -/* CCBD20 80240A10 34A588A4 */ ori $a1, $a1, 0x88a4 -/* CCBD24 80240A14 0C0B1EAF */ jal get_variable -/* CCBD28 80240A18 AE020004 */ sw $v0, 4($s0) -/* CCBD2C 80240A1C 10400017 */ beqz $v0, .L80240A7C -/* CCBD30 80240A20 00000000 */ nop -/* CCBD34 80240A24 3C048024 */ lui $a0, 0x8024 -/* CCBD38 80240A28 24843B18 */ addiu $a0, $a0, 0x3b18 -/* CCBD3C 80240A2C 8C830000 */ lw $v1, ($a0) -/* CCBD40 80240A30 2862005B */ slti $v0, $v1, 0x5b -/* CCBD44 80240A34 14400005 */ bnez $v0, .L80240A4C -/* CCBD48 80240A38 2862FFA6 */ slti $v0, $v1, -0x5a -/* CCBD4C 80240A3C 2462FE98 */ addiu $v0, $v1, -0x168 -/* CCBD50 80240A40 AC820000 */ sw $v0, ($a0) -/* CCBD54 80240A44 8C830000 */ lw $v1, ($a0) -/* CCBD58 80240A48 2862FFA6 */ slti $v0, $v1, -0x5a -.L80240A4C: -/* CCBD5C 80240A4C 14400002 */ bnez $v0, .L80240A58 -/* CCBD60 80240A50 24620014 */ addiu $v0, $v1, 0x14 -/* CCBD64 80240A54 24620005 */ addiu $v0, $v1, 5 -.L80240A58: -/* CCBD68 80240A58 AC820000 */ sw $v0, ($a0) -/* CCBD6C 80240A5C 3C038024 */ lui $v1, 0x8024 -/* CCBD70 80240A60 24633B18 */ addiu $v1, $v1, 0x3b18 -/* CCBD74 80240A64 8C620000 */ lw $v0, ($v1) -/* CCBD78 80240A68 2842005A */ slti $v0, $v0, 0x5a -/* CCBD7C 80240A6C 14400013 */ bnez $v0, .L80240ABC -/* CCBD80 80240A70 2402005A */ addiu $v0, $zero, 0x5a -/* CCBD84 80240A74 080902AF */ j .L80240ABC -/* CCBD88 80240A78 AC620000 */ sw $v0, ($v1) -.L80240A7C: -/* CCBD8C 80240A7C 3C028024 */ lui $v0, 0x8024 -/* CCBD90 80240A80 8C423B18 */ lw $v0, 0x3b18($v0) -/* CCBD94 80240A84 2442FF73 */ addiu $v0, $v0, -0x8d -/* CCBD98 80240A88 2C420077 */ sltiu $v0, $v0, 0x77 -/* CCBD9C 80240A8C 10400004 */ beqz $v0, .L80240AA0 -/* CCBDA0 80240A90 24020001 */ addiu $v0, $zero, 1 -/* CCBDA4 80240A94 3C018024 */ lui $at, 0x8024 -/* CCBDA8 80240A98 080902AA */ j .L80240AA8 -/* CCBDAC 80240A9C AC2231CC */ sw $v0, 0x31cc($at) -.L80240AA0: -/* CCBDB0 80240AA0 3C018024 */ lui $at, 0x8024 -/* CCBDB4 80240AA4 AC2031CC */ sw $zero, 0x31cc($at) -.L80240AA8: -/* CCBDB8 80240AA8 3C038024 */ lui $v1, 0x8024 -/* CCBDBC 80240AAC 24633B18 */ addiu $v1, $v1, 0x3b18 -/* CCBDC0 80240AB0 8C620000 */ lw $v0, ($v1) -/* CCBDC4 80240AB4 24420005 */ addiu $v0, $v0, 5 -/* CCBDC8 80240AB8 AC620000 */ sw $v0, ($v1) -.L80240ABC: -/* CCBDCC 80240ABC 3C048024 */ lui $a0, 0x8024 -/* CCBDD0 80240AC0 24843B18 */ addiu $a0, $a0, 0x3b18 -/* CCBDD4 80240AC4 8C830000 */ lw $v1, ($a0) -/* CCBDD8 80240AC8 28620168 */ slti $v0, $v1, 0x168 -/* CCBDDC 80240ACC 14400002 */ bnez $v0, .L80240AD8 -/* CCBDE0 80240AD0 2462FE98 */ addiu $v0, $v1, -0x168 -/* CCBDE4 80240AD4 AC820000 */ sw $v0, ($a0) -.L80240AD8: -/* CCBDE8 80240AD8 8FBF0030 */ lw $ra, 0x30($sp) -/* CCBDEC 80240ADC 8FB3002C */ lw $s3, 0x2c($sp) -/* CCBDF0 80240AE0 8FB20028 */ lw $s2, 0x28($sp) -/* CCBDF4 80240AE4 8FB10024 */ lw $s1, 0x24($sp) -/* CCBDF8 80240AE8 8FB00020 */ lw $s0, 0x20($sp) -/* CCBDFC 80240AEC D7BA0050 */ ldc1 $f26, 0x50($sp) -/* CCBE00 80240AF0 D7B80048 */ ldc1 $f24, 0x48($sp) -/* CCBE04 80240AF4 D7B60040 */ ldc1 $f22, 0x40($sp) -/* CCBE08 80240AF8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* CCBE0C 80240AFC 03E00008 */ jr $ra -/* CCBE10 80240B00 27BD0058 */ addiu $sp, $sp, 0x58 -/* CCBE14 80240B04 00000000 */ nop -/* CCBE18 80240B08 00000000 */ nop -/* CCBE1C 80240B0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_14/func_80240B10_CCB310.s b/asm/nonmatchings/world/area_flo/flo_14/func_80240B10_CCB310.s deleted file mode 100644 index a4a4fc1b06..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/func_80240B10_CCB310.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B10_CCBE20 -/* CCBE20 80240B10 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CCBE24 80240B14 AFB3002C */ sw $s3, 0x2c($sp) -/* CCBE28 80240B18 0080982D */ daddu $s3, $a0, $zero -/* CCBE2C 80240B1C AFBF0030 */ sw $ra, 0x30($sp) -/* CCBE30 80240B20 AFB20028 */ sw $s2, 0x28($sp) -/* CCBE34 80240B24 AFB10024 */ sw $s1, 0x24($sp) -/* CCBE38 80240B28 AFB00020 */ sw $s0, 0x20($sp) -/* CCBE3C 80240B2C 8E710148 */ lw $s1, 0x148($s3) -/* CCBE40 80240B30 86240008 */ lh $a0, 8($s1) -/* CCBE44 80240B34 0C00EABB */ jal get_npc_unsafe -/* CCBE48 80240B38 00A0902D */ daddu $s2, $a1, $zero -/* CCBE4C 80240B3C 8E440004 */ lw $a0, 4($s2) -/* CCBE50 80240B40 0040802D */ daddu $s0, $v0, $zero -/* CCBE54 80240B44 00041FC2 */ srl $v1, $a0, 0x1f -/* CCBE58 80240B48 00832021 */ addu $a0, $a0, $v1 -/* CCBE5C 80240B4C 00042043 */ sra $a0, $a0, 1 -/* CCBE60 80240B50 0C00A67F */ jal rand_int -/* CCBE64 80240B54 24840001 */ addiu $a0, $a0, 1 -/* CCBE68 80240B58 8E430004 */ lw $v1, 4($s2) -/* CCBE6C 80240B5C 000327C2 */ srl $a0, $v1, 0x1f -/* CCBE70 80240B60 00641821 */ addu $v1, $v1, $a0 -/* CCBE74 80240B64 00031843 */ sra $v1, $v1, 1 -/* CCBE78 80240B68 00621821 */ addu $v1, $v1, $v0 -/* CCBE7C 80240B6C A603008E */ sh $v1, 0x8e($s0) -/* CCBE80 80240B70 8E2300D0 */ lw $v1, 0xd0($s1) -/* CCBE84 80240B74 C6000040 */ lwc1 $f0, 0x40($s0) -/* CCBE88 80240B78 C4640000 */ lwc1 $f4, ($v1) -/* CCBE8C 80240B7C 46802120 */ cvt.s.w $f4, $f4 -/* CCBE90 80240B80 C4620008 */ lwc1 $f2, 8($v1) -/* CCBE94 80240B84 468010A0 */ cvt.s.w $f2, $f2 -/* CCBE98 80240B88 E7A00010 */ swc1 $f0, 0x10($sp) -/* CCBE9C 80240B8C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CCBEA0 80240B90 44061000 */ mfc1 $a2, $f2 -/* CCBEA4 80240B94 C440000C */ lwc1 $f0, 0xc($v0) -/* CCBEA8 80240B98 46800020 */ cvt.s.w $f0, $f0 -/* CCBEAC 80240B9C E7A00014 */ swc1 $f0, 0x14($sp) -/* CCBEB0 80240BA0 8E2200D0 */ lw $v0, 0xd0($s1) -/* CCBEB4 80240BA4 44052000 */ mfc1 $a1, $f4 -/* CCBEB8 80240BA8 C4400010 */ lwc1 $f0, 0x10($v0) -/* CCBEBC 80240BAC 46800020 */ cvt.s.w $f0, $f0 -/* CCBEC0 80240BB0 E7A00018 */ swc1 $f0, 0x18($sp) -/* CCBEC4 80240BB4 8C640018 */ lw $a0, 0x18($v1) -/* CCBEC8 80240BB8 0C0123F5 */ jal is_point_within_region -/* CCBECC 80240BBC 8E070038 */ lw $a3, 0x38($s0) -/* CCBED0 80240BC0 1040000E */ beqz $v0, .L80240BFC -/* CCBED4 80240BC4 00000000 */ nop -/* CCBED8 80240BC8 8E2200D0 */ lw $v0, 0xd0($s1) -/* CCBEDC 80240BCC C60C0038 */ lwc1 $f12, 0x38($s0) -/* CCBEE0 80240BD0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CCBEE4 80240BD4 C4460000 */ lwc1 $f6, ($v0) -/* CCBEE8 80240BD8 468031A0 */ cvt.s.w $f6, $f6 -/* CCBEEC 80240BDC 44063000 */ mfc1 $a2, $f6 -/* CCBEF0 80240BE0 C4460008 */ lwc1 $f6, 8($v0) -/* CCBEF4 80240BE4 468031A0 */ cvt.s.w $f6, $f6 -/* CCBEF8 80240BE8 44073000 */ mfc1 $a3, $f6 -/* CCBEFC 80240BEC 0C00A720 */ jal atan2 -/* CCBF00 80240BF0 00000000 */ nop -/* CCBF04 80240BF4 0809030B */ j .L80240C2C -/* CCBF08 80240BF8 E600000C */ swc1 $f0, 0xc($s0) -.L80240BFC: -/* CCBF0C 80240BFC 0C00A67F */ jal rand_int -/* CCBF10 80240C00 2404003C */ addiu $a0, $zero, 0x3c -/* CCBF14 80240C04 C60C000C */ lwc1 $f12, 0xc($s0) -/* CCBF18 80240C08 44820000 */ mtc1 $v0, $f0 -/* CCBF1C 80240C0C 00000000 */ nop -/* CCBF20 80240C10 46800020 */ cvt.s.w $f0, $f0 -/* CCBF24 80240C14 46006300 */ add.s $f12, $f12, $f0 -/* CCBF28 80240C18 3C0141F0 */ lui $at, 0x41f0 -/* CCBF2C 80240C1C 44810000 */ mtc1 $at, $f0 -/* CCBF30 80240C20 0C00A6C9 */ jal clamp_angle -/* CCBF34 80240C24 46006301 */ sub.s $f12, $f12, $f0 -/* CCBF38 80240C28 E600000C */ swc1 $f0, 0xc($s0) -.L80240C2C: -/* CCBF3C 80240C2C 8E2200CC */ lw $v0, 0xcc($s1) -/* CCBF40 80240C30 8C420004 */ lw $v0, 4($v0) -/* CCBF44 80240C34 AE020028 */ sw $v0, 0x28($s0) -/* CCBF48 80240C38 AE600074 */ sw $zero, 0x74($s3) -/* CCBF4C 80240C3C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CCBF50 80240C40 8C420014 */ lw $v0, 0x14($v0) -/* CCBF54 80240C44 04410004 */ bgez $v0, .L80240C58 -/* CCBF58 80240C48 00000000 */ nop -/* CCBF5C 80240C4C C6400000 */ lwc1 $f0, ($s2) -/* CCBF60 80240C50 0809031E */ j .L80240C78 -/* CCBF64 80240C54 E6000018 */ swc1 $f0, 0x18($s0) -.L80240C58: -/* CCBF68 80240C58 3C018024 */ lui $at, 0x8024 -/* CCBF6C 80240C5C D4225350 */ ldc1 $f2, 0x5350($at) -/* CCBF70 80240C60 44820000 */ mtc1 $v0, $f0 -/* CCBF74 80240C64 00000000 */ nop -/* CCBF78 80240C68 46800021 */ cvt.d.w $f0, $f0 -/* CCBF7C 80240C6C 46220003 */ div.d $f0, $f0, $f2 -/* CCBF80 80240C70 46200020 */ cvt.s.d $f0, $f0 -/* CCBF84 80240C74 E6000018 */ swc1 $f0, 0x18($s0) -.L80240C78: -/* CCBF88 80240C78 C600003C */ lwc1 $f0, 0x3c($s0) -/* CCBF8C 80240C7C 3C014059 */ lui $at, 0x4059 -/* CCBF90 80240C80 44811800 */ mtc1 $at, $f3 -/* CCBF94 80240C84 44801000 */ mtc1 $zero, $f2 -/* CCBF98 80240C88 46000021 */ cvt.d.s $f0, $f0 -/* CCBF9C 80240C8C 46220002 */ mul.d $f0, $f0, $f2 -/* CCBFA0 80240C90 00000000 */ nop -/* CCBFA4 80240C94 24020001 */ addiu $v0, $zero, 1 -/* CCBFA8 80240C98 4620018D */ trunc.w.d $f6, $f0 -/* CCBFAC 80240C9C E626007C */ swc1 $f6, 0x7c($s1) -/* CCBFB0 80240CA0 AE620070 */ sw $v0, 0x70($s3) -/* CCBFB4 80240CA4 8FBF0030 */ lw $ra, 0x30($sp) -/* CCBFB8 80240CA8 8FB3002C */ lw $s3, 0x2c($sp) -/* CCBFBC 80240CAC 8FB20028 */ lw $s2, 0x28($sp) -/* CCBFC0 80240CB0 8FB10024 */ lw $s1, 0x24($sp) -/* CCBFC4 80240CB4 8FB00020 */ lw $s0, 0x20($sp) -/* CCBFC8 80240CB8 03E00008 */ jr $ra -/* CCBFCC 80240CBC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_14/func_80240CC0_CCB310.s b/asm/nonmatchings/world/area_flo/flo_14/func_80240CC0_CCB310.s deleted file mode 100644 index bc388df124..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/func_80240CC0_CCB310.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_CCBFD0 -/* CCBFD0 80240CC0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* CCBFD4 80240CC4 AFB3004C */ sw $s3, 0x4c($sp) -/* CCBFD8 80240CC8 0080982D */ daddu $s3, $a0, $zero -/* CCBFDC 80240CCC AFBF0058 */ sw $ra, 0x58($sp) -/* CCBFE0 80240CD0 AFB50054 */ sw $s5, 0x54($sp) -/* CCBFE4 80240CD4 AFB40050 */ sw $s4, 0x50($sp) -/* CCBFE8 80240CD8 AFB20048 */ sw $s2, 0x48($sp) -/* CCBFEC 80240CDC AFB10044 */ sw $s1, 0x44($sp) -/* CCBFF0 80240CE0 AFB00040 */ sw $s0, 0x40($sp) -/* CCBFF4 80240CE4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CCBFF8 80240CE8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CCBFFC 80240CEC F7B60068 */ sdc1 $f22, 0x68($sp) -/* CCC000 80240CF0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CCC004 80240CF4 8E710148 */ lw $s1, 0x148($s3) -/* CCC008 80240CF8 00A0902D */ daddu $s2, $a1, $zero -/* CCC00C 80240CFC 86240008 */ lh $a0, 8($s1) -/* CCC010 80240D00 0C00EABB */ jal get_npc_unsafe -/* CCC014 80240D04 00C0A82D */ daddu $s5, $a2, $zero -/* CCC018 80240D08 0040802D */ daddu $s0, $v0, $zero -/* CCC01C 80240D0C 0000A02D */ daddu $s4, $zero, $zero -/* CCC020 80240D10 C624007C */ lwc1 $f4, 0x7c($s1) -/* CCC024 80240D14 46802120 */ cvt.s.w $f4, $f4 -/* CCC028 80240D18 C6220088 */ lwc1 $f2, 0x88($s1) -/* CCC02C 80240D1C 468010A0 */ cvt.s.w $f2, $f2 -/* CCC030 80240D20 460010A1 */ cvt.d.s $f2, $f2 -/* CCC034 80240D24 46002121 */ cvt.d.s $f4, $f4 -/* CCC038 80240D28 C600003C */ lwc1 $f0, 0x3c($s0) -/* CCC03C 80240D2C 3C014059 */ lui $at, 0x4059 -/* CCC040 80240D30 44813800 */ mtc1 $at, $f7 -/* CCC044 80240D34 44803000 */ mtc1 $zero, $f6 -/* CCC048 80240D38 46000021 */ cvt.d.s $f0, $f0 -/* CCC04C 80240D3C 46260002 */ mul.d $f0, $f0, $f6 -/* CCC050 80240D40 00000000 */ nop -/* CCC054 80240D44 24020001 */ addiu $v0, $zero, 1 -/* CCC058 80240D48 8E24006C */ lw $a0, 0x6c($s1) -/* CCC05C 80240D4C 46261083 */ div.d $f2, $f2, $f6 -/* CCC060 80240D50 462010A0 */ cvt.s.d $f2, $f2 -/* CCC064 80240D54 46262103 */ div.d $f4, $f4, $f6 -/* CCC068 80240D58 46202520 */ cvt.s.d $f20, $f4 -/* CCC06C 80240D5C 30830011 */ andi $v1, $a0, 0x11 -/* CCC070 80240D60 4620020D */ trunc.w.d $f8, $f0 -/* CCC074 80240D64 E628007C */ swc1 $f8, 0x7c($s1) -/* CCC078 80240D68 C6200078 */ lwc1 $f0, 0x78($s1) -/* CCC07C 80240D6C 46800020 */ cvt.s.w $f0, $f0 -/* CCC080 80240D70 46000021 */ cvt.d.s $f0, $f0 -/* CCC084 80240D74 46260003 */ div.d $f0, $f0, $f6 -/* CCC088 80240D78 462006A0 */ cvt.s.d $f26, $f0 -/* CCC08C 80240D7C C6200070 */ lwc1 $f0, 0x70($s1) -/* CCC090 80240D80 46800020 */ cvt.s.w $f0, $f0 -/* CCC094 80240D84 46000021 */ cvt.d.s $f0, $f0 -/* CCC098 80240D88 46260003 */ div.d $f0, $f0, $f6 -/* CCC09C 80240D8C 462005A0 */ cvt.s.d $f22, $f0 -/* CCC0A0 80240D90 14620025 */ bne $v1, $v0, .L80240E28 -/* CCC0A4 80240D94 4602D600 */ add.s $f24, $f26, $f2 -/* CCC0A8 80240D98 8E020000 */ lw $v0, ($s0) -/* CCC0AC 80240D9C 30420008 */ andi $v0, $v0, 8 -/* CCC0B0 80240DA0 10400009 */ beqz $v0, .L80240DC8 -/* CCC0B4 80240DA4 27A50028 */ addiu $a1, $sp, 0x28 -/* CCC0B8 80240DA8 C600003C */ lwc1 $f0, 0x3c($s0) -/* CCC0BC 80240DAC 4600C001 */ sub.s $f0, $f24, $f0 -/* CCC0C0 80240DB0 4600B03C */ c.lt.s $f22, $f0 -/* CCC0C4 80240DB4 00000000 */ nop -/* CCC0C8 80240DB8 4500001B */ bc1f .L80240E28 -/* CCC0CC 80240DBC 34820010 */ ori $v0, $a0, 0x10 -/* CCC0D0 80240DC0 0809038A */ j .L80240E28 -/* CCC0D4 80240DC4 AE22006C */ sw $v0, 0x6c($s1) -.L80240DC8: -/* CCC0D8 80240DC8 27A6002C */ addiu $a2, $sp, 0x2c -/* CCC0DC 80240DCC C6000038 */ lwc1 $f0, 0x38($s0) -/* CCC0E0 80240DD0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CCC0E4 80240DD4 C6040040 */ lwc1 $f4, 0x40($s0) -/* CCC0E8 80240DD8 3C01447A */ lui $at, 0x447a -/* CCC0EC 80240DDC 44813000 */ mtc1 $at, $f6 -/* CCC0F0 80240DE0 27A20034 */ addiu $v0, $sp, 0x34 -/* CCC0F4 80240DE4 E7A00028 */ swc1 $f0, 0x28($sp) -/* CCC0F8 80240DE8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CCC0FC 80240DEC E7A40030 */ swc1 $f4, 0x30($sp) -/* CCC100 80240DF0 E7A60034 */ swc1 $f6, 0x34($sp) -/* CCC104 80240DF4 AFA20010 */ sw $v0, 0x10($sp) -/* CCC108 80240DF8 8E040080 */ lw $a0, 0x80($s0) -/* CCC10C 80240DFC 0C0372DF */ jal func_800DCB7C -/* CCC110 80240E00 27A70030 */ addiu $a3, $sp, 0x30 -/* CCC114 80240E04 C7A00034 */ lwc1 $f0, 0x34($sp) -/* CCC118 80240E08 4600D001 */ sub.s $f0, $f26, $f0 -/* CCC11C 80240E0C 4600B03C */ c.lt.s $f22, $f0 -/* CCC120 80240E10 00000000 */ nop -/* CCC124 80240E14 45000004 */ bc1f .L80240E28 -/* CCC128 80240E18 00000000 */ nop -/* CCC12C 80240E1C 8E22006C */ lw $v0, 0x6c($s1) -/* CCC130 80240E20 34420010 */ ori $v0, $v0, 0x10 -/* CCC134 80240E24 AE22006C */ sw $v0, 0x6c($s1) -.L80240E28: -/* CCC138 80240E28 8E22006C */ lw $v0, 0x6c($s1) -/* CCC13C 80240E2C 24030011 */ addiu $v1, $zero, 0x11 -/* CCC140 80240E30 30420011 */ andi $v0, $v0, 0x11 -/* CCC144 80240E34 14430039 */ bne $v0, $v1, .L80240F1C -/* CCC148 80240E38 00000000 */ nop -/* CCC14C 80240E3C 8E020000 */ lw $v0, ($s0) -/* CCC150 80240E40 30420008 */ andi $v0, $v0, 8 -/* CCC154 80240E44 1040000A */ beqz $v0, .L80240E70 -/* CCC158 80240E48 4600C106 */ mov.s $f4, $f24 -/* CCC15C 80240E4C 4614C081 */ sub.s $f2, $f24, $f20 -/* CCC160 80240E50 3C018024 */ lui $at, 0x8024 -/* CCC164 80240E54 D4205358 */ ldc1 $f0, 0x5358($at) -/* CCC168 80240E58 460010A1 */ cvt.d.s $f2, $f2 -/* CCC16C 80240E5C 46201082 */ mul.d $f2, $f2, $f0 -/* CCC170 80240E60 00000000 */ nop -/* CCC174 80240E64 4600A021 */ cvt.d.s $f0, $f20 -/* CCC178 80240E68 080903B5 */ j .L80240ED4 -/* CCC17C 80240E6C 46220000 */ add.d $f0, $f0, $f2 -.L80240E70: -/* CCC180 80240E70 27A50028 */ addiu $a1, $sp, 0x28 -/* CCC184 80240E74 27A6002C */ addiu $a2, $sp, 0x2c -/* CCC188 80240E78 C6000038 */ lwc1 $f0, 0x38($s0) -/* CCC18C 80240E7C C6020040 */ lwc1 $f2, 0x40($s0) -/* CCC190 80240E80 3C01447A */ lui $at, 0x447a -/* CCC194 80240E84 44812000 */ mtc1 $at, $f4 -/* CCC198 80240E88 27A20034 */ addiu $v0, $sp, 0x34 -/* CCC19C 80240E8C E7B4002C */ swc1 $f20, 0x2c($sp) -/* CCC1A0 80240E90 E7A00028 */ swc1 $f0, 0x28($sp) -/* CCC1A4 80240E94 E7A20030 */ swc1 $f2, 0x30($sp) -/* CCC1A8 80240E98 E7A40034 */ swc1 $f4, 0x34($sp) -/* CCC1AC 80240E9C AFA20010 */ sw $v0, 0x10($sp) -/* CCC1B0 80240EA0 8E040080 */ lw $a0, 0x80($s0) -/* CCC1B4 80240EA4 0C0372DF */ jal func_800DCB7C -/* CCC1B8 80240EA8 27A70030 */ addiu $a3, $sp, 0x30 -/* CCC1BC 80240EAC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* CCC1C0 80240EB0 461A2100 */ add.s $f4, $f4, $f26 -/* CCC1C4 80240EB4 46142081 */ sub.s $f2, $f4, $f20 -/* CCC1C8 80240EB8 3C018024 */ lui $at, 0x8024 -/* CCC1CC 80240EBC D4205360 */ ldc1 $f0, 0x5360($at) -/* CCC1D0 80240EC0 460010A1 */ cvt.d.s $f2, $f2 -/* CCC1D4 80240EC4 46201082 */ mul.d $f2, $f2, $f0 -/* CCC1D8 80240EC8 00000000 */ nop -/* CCC1DC 80240ECC 4600A021 */ cvt.d.s $f0, $f20 -/* CCC1E0 80240ED0 46220000 */ add.d $f0, $f0, $f2 -.L80240ED4: -/* CCC1E4 80240ED4 46200020 */ cvt.s.d $f0, $f0 -/* CCC1E8 80240ED8 E600003C */ swc1 $f0, 0x3c($s0) -/* CCC1EC 80240EDC C600003C */ lwc1 $f0, 0x3c($s0) -/* CCC1F0 80240EE0 46002001 */ sub.s $f0, $f4, $f0 -/* CCC1F4 80240EE4 3C013FF0 */ lui $at, 0x3ff0 -/* CCC1F8 80240EE8 44811800 */ mtc1 $at, $f3 -/* CCC1FC 80240EEC 44801000 */ mtc1 $zero, $f2 -/* CCC200 80240EF0 46000005 */ abs.s $f0, $f0 -/* CCC204 80240EF4 46000021 */ cvt.d.s $f0, $f0 -/* CCC208 80240EF8 4622003C */ c.lt.d $f0, $f2 -/* CCC20C 80240EFC 00000000 */ nop -/* CCC210 80240F00 45000036 */ bc1f .L80240FDC -/* CCC214 80240F04 2403FFEF */ addiu $v1, $zero, -0x11 -/* CCC218 80240F08 E604003C */ swc1 $f4, 0x3c($s0) -/* CCC21C 80240F0C 8E22006C */ lw $v0, 0x6c($s1) -/* CCC220 80240F10 00431024 */ and $v0, $v0, $v1 -/* CCC224 80240F14 080903F7 */ j .L80240FDC -/* CCC228 80240F18 AE22006C */ sw $v0, 0x6c($s1) -.L80240F1C: -/* CCC22C 80240F1C 8E220070 */ lw $v0, 0x70($s1) -/* CCC230 80240F20 1840002E */ blez $v0, .L80240FDC -/* CCC234 80240F24 00000000 */ nop -/* CCC238 80240F28 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CCC23C 80240F2C 0C00A8BB */ jal sin_deg -/* CCC240 80240F30 46806320 */ cvt.s.w $f12, $f12 -/* CCC244 80240F34 8E020000 */ lw $v0, ($s0) -/* CCC248 80240F38 30420008 */ andi $v0, $v0, 8 -/* CCC24C 80240F3C 10400003 */ beqz $v0, .L80240F4C -/* CCC250 80240F40 46000506 */ mov.s $f20, $f0 -/* CCC254 80240F44 080903E3 */ j .L80240F8C -/* CCC258 80240F48 0000102D */ daddu $v0, $zero, $zero -.L80240F4C: -/* CCC25C 80240F4C 27A50028 */ addiu $a1, $sp, 0x28 -/* CCC260 80240F50 27A6002C */ addiu $a2, $sp, 0x2c -/* CCC264 80240F54 C6000038 */ lwc1 $f0, 0x38($s0) -/* CCC268 80240F58 C602003C */ lwc1 $f2, 0x3c($s0) -/* CCC26C 80240F5C C6040040 */ lwc1 $f4, 0x40($s0) -/* CCC270 80240F60 3C01447A */ lui $at, 0x447a -/* CCC274 80240F64 44813000 */ mtc1 $at, $f6 -/* CCC278 80240F68 27A20034 */ addiu $v0, $sp, 0x34 -/* CCC27C 80240F6C E7A00028 */ swc1 $f0, 0x28($sp) -/* CCC280 80240F70 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CCC284 80240F74 E7A40030 */ swc1 $f4, 0x30($sp) -/* CCC288 80240F78 E7A60034 */ swc1 $f6, 0x34($sp) -/* CCC28C 80240F7C AFA20010 */ sw $v0, 0x10($sp) -/* CCC290 80240F80 8E040080 */ lw $a0, 0x80($s0) -/* CCC294 80240F84 0C0372DF */ jal func_800DCB7C -/* CCC298 80240F88 27A70030 */ addiu $a3, $sp, 0x30 -.L80240F8C: -/* CCC29C 80240F8C 10400007 */ beqz $v0, .L80240FAC -/* CCC2A0 80240F90 00000000 */ nop -/* CCC2A4 80240F94 4616A082 */ mul.s $f2, $f20, $f22 -/* CCC2A8 80240F98 00000000 */ nop -/* CCC2AC 80240F9C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CCC2B0 80240FA0 461A0000 */ add.s $f0, $f0, $f26 -/* CCC2B4 80240FA4 080903EE */ j .L80240FB8 -/* CCC2B8 80240FA8 46020000 */ add.s $f0, $f0, $f2 -.L80240FAC: -/* CCC2BC 80240FAC 4616A002 */ mul.s $f0, $f20, $f22 -/* CCC2C0 80240FB0 00000000 */ nop -/* CCC2C4 80240FB4 4600C000 */ add.s $f0, $f24, $f0 -.L80240FB8: -/* CCC2C8 80240FB8 E600003C */ swc1 $f0, 0x3c($s0) -/* CCC2CC 80240FBC 8E220074 */ lw $v0, 0x74($s1) -/* CCC2D0 80240FC0 2442000A */ addiu $v0, $v0, 0xa -/* CCC2D4 80240FC4 44826000 */ mtc1 $v0, $f12 -/* CCC2D8 80240FC8 00000000 */ nop -/* CCC2DC 80240FCC 0C00A6C9 */ jal clamp_angle -/* CCC2E0 80240FD0 46806320 */ cvt.s.w $f12, $f12 -/* CCC2E4 80240FD4 4600020D */ trunc.w.s $f8, $f0 -/* CCC2E8 80240FD8 E6280074 */ swc1 $f8, 0x74($s1) -.L80240FDC: -/* CCC2EC 80240FDC 8E220090 */ lw $v0, 0x90($s1) -/* CCC2F0 80240FE0 1C40004A */ bgtz $v0, .L8024110C -/* CCC2F4 80240FE4 2442FFFF */ addiu $v0, $v0, -1 -/* CCC2F8 80240FE8 8E430014 */ lw $v1, 0x14($s2) -/* CCC2FC 80240FEC 04600048 */ bltz $v1, .L80241110 -/* CCC300 80240FF0 00000000 */ nop -/* CCC304 80240FF4 8E620074 */ lw $v0, 0x74($s3) -/* CCC308 80240FF8 1C400042 */ bgtz $v0, .L80241104 -/* CCC30C 80240FFC 2442FFFF */ addiu $v0, $v0, -1 -/* CCC310 80241000 AE630074 */ sw $v1, 0x74($s3) -/* CCC314 80241004 860200A8 */ lh $v0, 0xa8($s0) -/* CCC318 80241008 C602003C */ lwc1 $f2, 0x3c($s0) -/* CCC31C 8024100C 44820000 */ mtc1 $v0, $f0 -/* CCC320 80241010 00000000 */ nop -/* CCC324 80241014 46800020 */ cvt.s.w $f0, $f0 -/* CCC328 80241018 46001080 */ add.s $f2, $f2, $f0 -/* CCC32C 8024101C 3C014024 */ lui $at, 0x4024 -/* CCC330 80241020 44810800 */ mtc1 $at, $f1 -/* CCC334 80241024 44800000 */ mtc1 $zero, $f0 -/* CCC338 80241028 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CCC33C 8024102C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CCC340 80241030 460010A1 */ cvt.d.s $f2, $f2 -/* CCC344 80241034 46201080 */ add.d $f2, $f2, $f0 -/* CCC348 80241038 C440002C */ lwc1 $f0, 0x2c($v0) -/* CCC34C 8024103C 46000021 */ cvt.d.s $f0, $f0 -/* CCC350 80241040 4622003C */ c.lt.d $f0, $f2 -/* CCC354 80241044 00000000 */ nop -/* CCC358 80241048 4500002C */ bc1f .L802410FC -/* CCC35C 8024104C 02A0202D */ daddu $a0, $s5, $zero -/* CCC360 80241050 AFA00010 */ sw $zero, 0x10($sp) -/* CCC364 80241054 8E46000C */ lw $a2, 0xc($s2) -/* CCC368 80241058 8E470010 */ lw $a3, 0x10($s2) -/* CCC36C 8024105C 0C01242D */ jal func_800490B4 -/* CCC370 80241060 0220282D */ daddu $a1, $s1, $zero -/* CCC374 80241064 10400025 */ beqz $v0, .L802410FC -/* CCC378 80241068 0000202D */ daddu $a0, $zero, $zero -/* CCC37C 8024106C 0200282D */ daddu $a1, $s0, $zero -/* CCC380 80241070 0000302D */ daddu $a2, $zero, $zero -/* CCC384 80241074 2412000C */ addiu $s2, $zero, 0xc -/* CCC388 80241078 860300A8 */ lh $v1, 0xa8($s0) -/* CCC38C 8024107C 3C013F80 */ lui $at, 0x3f80 -/* CCC390 80241080 44810000 */ mtc1 $at, $f0 -/* CCC394 80241084 3C014000 */ lui $at, 0x4000 -/* CCC398 80241088 44811000 */ mtc1 $at, $f2 -/* CCC39C 8024108C 3C01C1A0 */ lui $at, 0xc1a0 -/* CCC3A0 80241090 44812000 */ mtc1 $at, $f4 -/* CCC3A4 80241094 44834000 */ mtc1 $v1, $f8 -/* CCC3A8 80241098 00000000 */ nop -/* CCC3AC 8024109C 46804220 */ cvt.s.w $f8, $f8 -/* CCC3B0 802410A0 44074000 */ mfc1 $a3, $f8 -/* CCC3B4 802410A4 27A20038 */ addiu $v0, $sp, 0x38 -/* CCC3B8 802410A8 AFB2001C */ sw $s2, 0x1c($sp) -/* CCC3BC 802410AC AFA20020 */ sw $v0, 0x20($sp) -/* CCC3C0 802410B0 E7A00010 */ swc1 $f0, 0x10($sp) -/* CCC3C4 802410B4 E7A20014 */ swc1 $f2, 0x14($sp) -/* CCC3C8 802410B8 0C01BFA4 */ jal fx_emote -/* CCC3CC 802410BC E7A40018 */ swc1 $f4, 0x18($sp) -/* CCC3D0 802410C0 0200202D */ daddu $a0, $s0, $zero -/* CCC3D4 802410C4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CCC3D8 802410C8 C480003C */ lwc1 $f0, 0x3c($a0) -/* CCC3DC 802410CC 3C060020 */ lui $a2, 0x20 -/* CCC3E0 802410D0 0C012530 */ jal func_800494C0 -/* CCC3E4 802410D4 E4800064 */ swc1 $f0, 0x64($a0) -/* CCC3E8 802410D8 8E220018 */ lw $v0, 0x18($s1) -/* CCC3EC 802410DC 9442002A */ lhu $v0, 0x2a($v0) -/* CCC3F0 802410E0 30420001 */ andi $v0, $v0, 1 -/* CCC3F4 802410E4 10400003 */ beqz $v0, .L802410F4 -/* CCC3F8 802410E8 2402000A */ addiu $v0, $zero, 0xa -/* CCC3FC 802410EC 080904AD */ j .L802412B4 -/* CCC400 802410F0 AE620070 */ sw $v0, 0x70($s3) -.L802410F4: -/* CCC404 802410F4 080904AD */ j .L802412B4 -/* CCC408 802410F8 AE720070 */ sw $s2, 0x70($s3) -.L802410FC: -/* CCC40C 802410FC 8E620074 */ lw $v0, 0x74($s3) -/* CCC410 80241100 2442FFFF */ addiu $v0, $v0, -1 -.L80241104: -/* CCC414 80241104 08090444 */ j .L80241110 -/* CCC418 80241108 AE620074 */ sw $v0, 0x74($s3) -.L8024110C: -/* CCC41C 8024110C AE220090 */ sw $v0, 0x90($s1) -.L80241110: -/* CCC420 80241110 8E2300D0 */ lw $v1, 0xd0($s1) -/* CCC424 80241114 C6000040 */ lwc1 $f0, 0x40($s0) -/* CCC428 80241118 C4620000 */ lwc1 $f2, ($v1) -/* CCC42C 8024111C 468010A0 */ cvt.s.w $f2, $f2 -/* CCC430 80241120 C4640008 */ lwc1 $f4, 8($v1) -/* CCC434 80241124 46802120 */ cvt.s.w $f4, $f4 -/* CCC438 80241128 E7A00010 */ swc1 $f0, 0x10($sp) -/* CCC43C 8024112C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CCC440 80241130 44051000 */ mfc1 $a1, $f2 -/* CCC444 80241134 C440000C */ lwc1 $f0, 0xc($v0) -/* CCC448 80241138 46800020 */ cvt.s.w $f0, $f0 -/* CCC44C 8024113C E7A00014 */ swc1 $f0, 0x14($sp) -/* CCC450 80241140 8E2200D0 */ lw $v0, 0xd0($s1) -/* CCC454 80241144 44062000 */ mfc1 $a2, $f4 -/* CCC458 80241148 C4400010 */ lwc1 $f0, 0x10($v0) -/* CCC45C 8024114C 46800020 */ cvt.s.w $f0, $f0 -/* CCC460 80241150 E7A00018 */ swc1 $f0, 0x18($sp) -/* CCC464 80241154 8C640018 */ lw $a0, 0x18($v1) -/* CCC468 80241158 0C0123F5 */ jal is_point_within_region -/* CCC46C 8024115C 8E070038 */ lw $a3, 0x38($s0) -/* CCC470 80241160 1040001A */ beqz $v0, .L802411CC -/* CCC474 80241164 00000000 */ nop -/* CCC478 80241168 8E060038 */ lw $a2, 0x38($s0) -/* CCC47C 8024116C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CCC480 80241170 8E070040 */ lw $a3, 0x40($s0) -/* CCC484 80241174 C44C0000 */ lwc1 $f12, ($v0) -/* CCC488 80241178 46806320 */ cvt.s.w $f12, $f12 -/* CCC48C 8024117C C44E0008 */ lwc1 $f14, 8($v0) -/* CCC490 80241180 0C00A7B5 */ jal dist2D -/* CCC494 80241184 468073A0 */ cvt.s.w $f14, $f14 -/* CCC498 80241188 C6020018 */ lwc1 $f2, 0x18($s0) -/* CCC49C 8024118C 4600103C */ c.lt.s $f2, $f0 -/* CCC4A0 80241190 00000000 */ nop -/* CCC4A4 80241194 4500000D */ bc1f .L802411CC -/* CCC4A8 80241198 E7A00034 */ swc1 $f0, 0x34($sp) -/* CCC4AC 8024119C C60C0038 */ lwc1 $f12, 0x38($s0) -/* CCC4B0 802411A0 8E2200D0 */ lw $v0, 0xd0($s1) -/* CCC4B4 802411A4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CCC4B8 802411A8 C4480000 */ lwc1 $f8, ($v0) -/* CCC4BC 802411AC 46804220 */ cvt.s.w $f8, $f8 -/* CCC4C0 802411B0 44064000 */ mfc1 $a2, $f8 -/* CCC4C4 802411B4 C4480008 */ lwc1 $f8, 8($v0) -/* CCC4C8 802411B8 46804220 */ cvt.s.w $f8, $f8 -/* CCC4CC 802411BC 44074000 */ mfc1 $a3, $f8 -/* CCC4D0 802411C0 0C00A720 */ jal atan2 -/* CCC4D4 802411C4 24140001 */ addiu $s4, $zero, 1 -/* CCC4D8 802411C8 E600000C */ swc1 $f0, 0xc($s0) -.L802411CC: -/* CCC4DC 802411CC 8E2200D0 */ lw $v0, 0xd0($s1) -/* CCC4E0 802411D0 8C43000C */ lw $v1, 0xc($v0) -/* CCC4E4 802411D4 8C420010 */ lw $v0, 0x10($v0) -/* CCC4E8 802411D8 00621825 */ or $v1, $v1, $v0 -/* CCC4EC 802411DC 00741825 */ or $v1, $v1, $s4 -/* CCC4F0 802411E0 10600008 */ beqz $v1, .L80241204 -/* CCC4F4 802411E4 00000000 */ nop -/* CCC4F8 802411E8 8602008C */ lh $v0, 0x8c($s0) -/* CCC4FC 802411EC 14400031 */ bnez $v0, .L802412B4 -/* CCC500 802411F0 00000000 */ nop -/* CCC504 802411F4 8E050018 */ lw $a1, 0x18($s0) -/* CCC508 802411F8 8E06000C */ lw $a2, 0xc($s0) -/* CCC50C 802411FC 0C00EA95 */ jal npc_move_heading -/* CCC510 80241200 0200202D */ daddu $a0, $s0, $zero -.L80241204: -/* CCC514 80241204 C600003C */ lwc1 $f0, 0x3c($s0) -/* CCC518 80241208 3C014059 */ lui $at, 0x4059 -/* CCC51C 8024120C 44811800 */ mtc1 $at, $f3 -/* CCC520 80241210 44801000 */ mtc1 $zero, $f2 -/* CCC524 80241214 46000021 */ cvt.d.s $f0, $f0 -/* CCC528 80241218 46220002 */ mul.d $f0, $f0, $f2 -/* CCC52C 8024121C 00000000 */ nop -/* CCC530 80241220 4620020D */ trunc.w.d $f8, $f0 -/* CCC534 80241224 E628007C */ swc1 $f8, 0x7c($s1) -/* CCC538 80241228 8E420004 */ lw $v0, 4($s2) -/* CCC53C 8024122C 18400021 */ blez $v0, .L802412B4 -/* CCC540 80241230 00000000 */ nop -/* CCC544 80241234 8602008E */ lh $v0, 0x8e($s0) -/* CCC548 80241238 9603008E */ lhu $v1, 0x8e($s0) -/* CCC54C 8024123C 18400005 */ blez $v0, .L80241254 -/* CCC550 80241240 2462FFFF */ addiu $v0, $v1, -1 -/* CCC554 80241244 A602008E */ sh $v0, 0x8e($s0) -/* CCC558 80241248 00021400 */ sll $v0, $v0, 0x10 -/* CCC55C 8024124C 1C400019 */ bgtz $v0, .L802412B4 -/* CCC560 80241250 00000000 */ nop -.L80241254: -/* CCC564 80241254 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CCC568 80241258 24020002 */ addiu $v0, $zero, 2 -/* CCC56C 8024125C 0C00A67F */ jal rand_int -/* CCC570 80241260 AE620070 */ sw $v0, 0x70($s3) -/* CCC574 80241264 3C035555 */ lui $v1, 0x5555 -/* CCC578 80241268 34635556 */ ori $v1, $v1, 0x5556 -/* CCC57C 8024126C 00430018 */ mult $v0, $v1 -/* CCC580 80241270 000227C3 */ sra $a0, $v0, 0x1f -/* CCC584 80241274 00004010 */ mfhi $t0 -/* CCC588 80241278 01042023 */ subu $a0, $t0, $a0 -/* CCC58C 8024127C 00041840 */ sll $v1, $a0, 1 -/* CCC590 80241280 00641821 */ addu $v1, $v1, $a0 -/* CCC594 80241284 00431023 */ subu $v0, $v0, $v1 -/* CCC598 80241288 24430002 */ addiu $v1, $v0, 2 -/* CCC59C 8024128C AE630074 */ sw $v1, 0x74($s3) -/* CCC5A0 80241290 8E42002C */ lw $v0, 0x2c($s2) -/* CCC5A4 80241294 58400007 */ blezl $v0, .L802412B4 -/* CCC5A8 80241298 AE600070 */ sw $zero, 0x70($s3) -/* CCC5AC 8024129C 8E420008 */ lw $v0, 8($s2) -/* CCC5B0 802412A0 18400003 */ blez $v0, .L802412B0 -/* CCC5B4 802412A4 28620003 */ slti $v0, $v1, 3 -/* CCC5B8 802412A8 10400002 */ beqz $v0, .L802412B4 -/* CCC5BC 802412AC 00000000 */ nop -.L802412B0: -/* CCC5C0 802412B0 AE600070 */ sw $zero, 0x70($s3) -.L802412B4: -/* CCC5C4 802412B4 8FBF0058 */ lw $ra, 0x58($sp) -/* CCC5C8 802412B8 8FB50054 */ lw $s5, 0x54($sp) -/* CCC5CC 802412BC 8FB40050 */ lw $s4, 0x50($sp) -/* CCC5D0 802412C0 8FB3004C */ lw $s3, 0x4c($sp) -/* CCC5D4 802412C4 8FB20048 */ lw $s2, 0x48($sp) -/* CCC5D8 802412C8 8FB10044 */ lw $s1, 0x44($sp) -/* CCC5DC 802412CC 8FB00040 */ lw $s0, 0x40($sp) -/* CCC5E0 802412D0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CCC5E4 802412D4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CCC5E8 802412D8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CCC5EC 802412DC D7B40060 */ ldc1 $f20, 0x60($sp) -/* CCC5F0 802412E0 03E00008 */ jr $ra -/* CCC5F4 802412E4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_flo/flo_14/func_802412E8_CCB310.s b/asm/nonmatchings/world/area_flo/flo_14/func_802412E8_CCB310.s deleted file mode 100644 index 68df1f2950..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/func_802412E8_CCB310.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412E8_CCC5F8 -/* CCC5F8 802412E8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CCC5FC 802412EC AFB3001C */ sw $s3, 0x1c($sp) -/* CCC600 802412F0 0080982D */ daddu $s3, $a0, $zero -/* CCC604 802412F4 AFBF0020 */ sw $ra, 0x20($sp) -/* CCC608 802412F8 AFB20018 */ sw $s2, 0x18($sp) -/* CCC60C 802412FC AFB10014 */ sw $s1, 0x14($sp) -/* CCC610 80241300 AFB00010 */ sw $s0, 0x10($sp) -/* CCC614 80241304 8E720148 */ lw $s2, 0x148($s3) -/* CCC618 80241308 86440008 */ lh $a0, 8($s2) -/* CCC61C 8024130C 0C00EABB */ jal get_npc_unsafe -/* CCC620 80241310 00A0882D */ daddu $s1, $a1, $zero -/* CCC624 80241314 8E240008 */ lw $a0, 8($s1) -/* CCC628 80241318 0040802D */ daddu $s0, $v0, $zero -/* CCC62C 8024131C 00041FC2 */ srl $v1, $a0, 0x1f -/* CCC630 80241320 00832021 */ addu $a0, $a0, $v1 -/* CCC634 80241324 00042043 */ sra $a0, $a0, 1 -/* CCC638 80241328 0C00A67F */ jal rand_int -/* CCC63C 8024132C 24840001 */ addiu $a0, $a0, 1 -/* CCC640 80241330 8E230008 */ lw $v1, 8($s1) -/* CCC644 80241334 240400B4 */ addiu $a0, $zero, 0xb4 -/* CCC648 80241338 00032FC2 */ srl $a1, $v1, 0x1f -/* CCC64C 8024133C 00651821 */ addu $v1, $v1, $a1 -/* CCC650 80241340 00031843 */ sra $v1, $v1, 1 -/* CCC654 80241344 00621821 */ addu $v1, $v1, $v0 -/* CCC658 80241348 0C00A67F */ jal rand_int -/* CCC65C 8024134C A603008E */ sh $v1, 0x8e($s0) -/* CCC660 80241350 C60C000C */ lwc1 $f12, 0xc($s0) -/* CCC664 80241354 44820000 */ mtc1 $v0, $f0 -/* CCC668 80241358 00000000 */ nop -/* CCC66C 8024135C 46800020 */ cvt.s.w $f0, $f0 -/* CCC670 80241360 46006300 */ add.s $f12, $f12, $f0 -/* CCC674 80241364 3C0142B4 */ lui $at, 0x42b4 -/* CCC678 80241368 44810000 */ mtc1 $at, $f0 -/* CCC67C 8024136C 0C00A6C9 */ jal clamp_angle -/* CCC680 80241370 46006301 */ sub.s $f12, $f12, $f0 -/* CCC684 80241374 E600000C */ swc1 $f0, 0xc($s0) -/* CCC688 80241378 8E4200CC */ lw $v0, 0xcc($s2) -/* CCC68C 8024137C 8C420000 */ lw $v0, ($v0) -/* CCC690 80241380 AE020028 */ sw $v0, 0x28($s0) -/* CCC694 80241384 24020003 */ addiu $v0, $zero, 3 -/* CCC698 80241388 AE620070 */ sw $v0, 0x70($s3) -/* CCC69C 8024138C 8FBF0020 */ lw $ra, 0x20($sp) -/* CCC6A0 80241390 8FB3001C */ lw $s3, 0x1c($sp) -/* CCC6A4 80241394 8FB20018 */ lw $s2, 0x18($sp) -/* CCC6A8 80241398 8FB10014 */ lw $s1, 0x14($sp) -/* CCC6AC 8024139C 8FB00010 */ lw $s0, 0x10($sp) -/* CCC6B0 802413A0 03E00008 */ jr $ra -/* CCC6B4 802413A4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_14/func_802416EC_CCB310.s b/asm/nonmatchings/world/area_flo/flo_14/func_802416EC_CCB310.s deleted file mode 100644 index b102d88416..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/func_802416EC_CCB310.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416EC_CCC9FC -/* CCC9FC 802416EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CCCA00 802416F0 AFB20018 */ sw $s2, 0x18($sp) -/* CCCA04 802416F4 0080902D */ daddu $s2, $a0, $zero -/* CCCA08 802416F8 AFBF001C */ sw $ra, 0x1c($sp) -/* CCCA0C 802416FC AFB10014 */ sw $s1, 0x14($sp) -/* CCCA10 80241700 AFB00010 */ sw $s0, 0x10($sp) -/* CCCA14 80241704 8E510148 */ lw $s1, 0x148($s2) -/* CCCA18 80241708 0C00EABB */ jal get_npc_unsafe -/* CCCA1C 8024170C 86240008 */ lh $a0, 8($s1) -/* CCCA20 80241710 0040802D */ daddu $s0, $v0, $zero -/* CCCA24 80241714 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CCCA28 80241718 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CCCA2C 8024171C C60C0038 */ lwc1 $f12, 0x38($s0) -/* CCCA30 80241720 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CCCA34 80241724 A600008E */ sh $zero, 0x8e($s0) -/* CCCA38 80241728 8C460028 */ lw $a2, 0x28($v0) -/* CCCA3C 8024172C 0C00A720 */ jal atan2 -/* CCCA40 80241730 8C470030 */ lw $a3, 0x30($v0) -/* CCCA44 80241734 E600000C */ swc1 $f0, 0xc($s0) -/* CCCA48 80241738 8E2200CC */ lw $v0, 0xcc($s1) -/* CCCA4C 8024173C 8C420020 */ lw $v0, 0x20($v0) -/* CCCA50 80241740 AE020028 */ sw $v0, 0x28($s0) -/* CCCA54 80241744 2402000B */ addiu $v0, $zero, 0xb -/* CCCA58 80241748 AE420070 */ sw $v0, 0x70($s2) -/* CCCA5C 8024174C 8FBF001C */ lw $ra, 0x1c($sp) -/* CCCA60 80241750 8FB20018 */ lw $s2, 0x18($sp) -/* CCCA64 80241754 8FB10014 */ lw $s1, 0x14($sp) -/* CCCA68 80241758 8FB00010 */ lw $s0, 0x10($sp) -/* CCCA6C 8024175C 03E00008 */ jr $ra -/* CCCA70 80241760 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_14/func_802417D0_CCB310.s b/asm/nonmatchings/world/area_flo/flo_14/func_802417D0_CCB310.s deleted file mode 100644 index 6b0bd83605..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/func_802417D0_CCB310.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417D0_CCCAE0 -/* CCCAE0 802417D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CCCAE4 802417D4 AFB3001C */ sw $s3, 0x1c($sp) -/* CCCAE8 802417D8 0080982D */ daddu $s3, $a0, $zero -/* CCCAEC 802417DC AFBF0020 */ sw $ra, 0x20($sp) -/* CCCAF0 802417E0 AFB20018 */ sw $s2, 0x18($sp) -/* CCCAF4 802417E4 AFB10014 */ sw $s1, 0x14($sp) -/* CCCAF8 802417E8 AFB00010 */ sw $s0, 0x10($sp) -/* CCCAFC 802417EC 8E720148 */ lw $s2, 0x148($s3) -/* CCCB00 802417F0 86440008 */ lh $a0, 8($s2) -/* CCCB04 802417F4 0C00EABB */ jal get_npc_unsafe -/* CCCB08 802417F8 00A0802D */ daddu $s0, $a1, $zero -/* CCCB0C 802417FC 0040882D */ daddu $s1, $v0, $zero -/* CCCB10 80241800 C6420080 */ lwc1 $f2, 0x80($s2) -/* CCCB14 80241804 468010A0 */ cvt.s.w $f2, $f2 -/* CCCB18 80241808 460010A1 */ cvt.d.s $f2, $f2 -/* CCCB1C 8024180C C6400084 */ lwc1 $f0, 0x84($s2) -/* CCCB20 80241810 46800020 */ cvt.s.w $f0, $f0 -/* CCCB24 80241814 46000021 */ cvt.d.s $f0, $f0 -/* CCCB28 80241818 3C014059 */ lui $at, 0x4059 -/* CCCB2C 8024181C 44812800 */ mtc1 $at, $f5 -/* CCCB30 80241820 44802000 */ mtc1 $zero, $f4 -/* CCCB34 80241824 8E4200CC */ lw $v0, 0xcc($s2) -/* CCCB38 80241828 C62C0038 */ lwc1 $f12, 0x38($s1) -/* CCCB3C 8024182C C62E0040 */ lwc1 $f14, 0x40($s1) -/* CCCB40 80241830 46241083 */ div.d $f2, $f2, $f4 -/* CCCB44 80241834 462010A0 */ cvt.s.d $f2, $f2 -/* CCCB48 80241838 46240003 */ div.d $f0, $f0, $f4 -/* CCCB4C 8024183C 8C420020 */ lw $v0, 0x20($v0) -/* CCCB50 80241840 46200020 */ cvt.s.d $f0, $f0 -/* CCCB54 80241844 E622001C */ swc1 $f2, 0x1c($s1) -/* CCCB58 80241848 E6200014 */ swc1 $f0, 0x14($s1) -/* CCCB5C 8024184C AE220028 */ sw $v0, 0x28($s1) -/* CCCB60 80241850 C6000018 */ lwc1 $f0, 0x18($s0) -/* CCCB64 80241854 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CCCB68 80241858 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CCCB6C 8024185C E6200018 */ swc1 $f0, 0x18($s1) -/* CCCB70 80241860 8C460028 */ lw $a2, 0x28($v0) -/* CCCB74 80241864 0C00A720 */ jal atan2 -/* CCCB78 80241868 8C470030 */ lw $a3, 0x30($v0) -/* CCCB7C 8024186C E620000C */ swc1 $f0, 0xc($s1) -/* CCCB80 80241870 8E420018 */ lw $v0, 0x18($s2) -/* CCCB84 80241874 AE400074 */ sw $zero, 0x74($s2) -/* CCCB88 80241878 9442002A */ lhu $v0, 0x2a($v0) -/* CCCB8C 8024187C 30420002 */ andi $v0, $v0, 2 -/* CCCB90 80241880 10400005 */ beqz $v0, .L80241898 -/* CCCB94 80241884 24020003 */ addiu $v0, $zero, 3 -/* CCCB98 80241888 A622008E */ sh $v0, 0x8e($s1) -/* CCCB9C 8024188C 2402000D */ addiu $v0, $zero, 0xd -/* CCCBA0 80241890 0809063A */ j .L802418E8 -/* CCCBA4 80241894 AE620070 */ sw $v0, 0x70($s3) -.L80241898: -/* CCCBA8 80241898 24030001 */ addiu $v1, $zero, 1 -/* CCCBAC 8024189C 2402000E */ addiu $v0, $zero, 0xe -/* CCCBB0 802418A0 A623008E */ sh $v1, 0x8e($s1) -/* CCCBB4 802418A4 AE620070 */ sw $v0, 0x70($s3) -/* CCCBB8 802418A8 C6200038 */ lwc1 $f0, 0x38($s1) -/* CCCBBC 802418AC 4600018D */ trunc.w.s $f6, $f0 -/* CCCBC0 802418B0 44023000 */ mfc1 $v0, $f6 -/* CCCBC4 802418B4 00000000 */ nop -/* CCCBC8 802418B8 A6420010 */ sh $v0, 0x10($s2) -/* CCCBCC 802418BC C620003C */ lwc1 $f0, 0x3c($s1) -/* CCCBD0 802418C0 4600018D */ trunc.w.s $f6, $f0 -/* CCCBD4 802418C4 44023000 */ mfc1 $v0, $f6 -/* CCCBD8 802418C8 00000000 */ nop -/* CCCBDC 802418CC A6420012 */ sh $v0, 0x12($s2) -/* CCCBE0 802418D0 C6200040 */ lwc1 $f0, 0x40($s1) -/* CCCBE4 802418D4 A2430007 */ sb $v1, 7($s2) -/* CCCBE8 802418D8 4600018D */ trunc.w.s $f6, $f0 -/* CCCBEC 802418DC 44023000 */ mfc1 $v0, $f6 -/* CCCBF0 802418E0 00000000 */ nop -/* CCCBF4 802418E4 A6420014 */ sh $v0, 0x14($s2) -.L802418E8: -/* CCCBF8 802418E8 8FBF0020 */ lw $ra, 0x20($sp) -/* CCCBFC 802418EC 8FB3001C */ lw $s3, 0x1c($sp) -/* CCCC00 802418F0 8FB20018 */ lw $s2, 0x18($sp) -/* CCCC04 802418F4 8FB10014 */ lw $s1, 0x14($sp) -/* CCCC08 802418F8 8FB00010 */ lw $s0, 0x10($sp) -/* CCCC0C 802418FC 03E00008 */ jr $ra -/* CCCC10 80241900 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_14/func_80241904_CCB310.s b/asm/nonmatchings/world/area_flo/flo_14/func_80241904_CCB310.s deleted file mode 100644 index 145ace4a68..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/func_80241904_CCB310.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241904_CCCC14 -/* CCCC14 80241904 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CCCC18 80241908 AFB00010 */ sw $s0, 0x10($sp) -/* CCCC1C 8024190C 0080802D */ daddu $s0, $a0, $zero -/* CCCC20 80241910 AFBF0014 */ sw $ra, 0x14($sp) -/* CCCC24 80241914 8E020148 */ lw $v0, 0x148($s0) -/* CCCC28 80241918 0C00EABB */ jal get_npc_unsafe -/* CCCC2C 8024191C 84440008 */ lh $a0, 8($v0) -/* CCCC30 80241920 0040202D */ daddu $a0, $v0, $zero -/* CCCC34 80241924 8482008E */ lh $v0, 0x8e($a0) -/* CCCC38 80241928 9483008E */ lhu $v1, 0x8e($a0) -/* CCCC3C 8024192C 18400005 */ blez $v0, .L80241944 -/* CCCC40 80241930 2462FFFF */ addiu $v0, $v1, -1 -/* CCCC44 80241934 A482008E */ sh $v0, 0x8e($a0) -/* CCCC48 80241938 00021400 */ sll $v0, $v0, 0x10 -/* CCCC4C 8024193C 1C400006 */ bgtz $v0, .L80241958 -/* CCCC50 80241940 00000000 */ nop -.L80241944: -/* CCCC54 80241944 8482008C */ lh $v0, 0x8c($a0) -/* CCCC58 80241948 14400003 */ bnez $v0, .L80241958 -/* CCCC5C 8024194C 2402000E */ addiu $v0, $zero, 0xe -/* CCCC60 80241950 A480008E */ sh $zero, 0x8e($a0) -/* CCCC64 80241954 AE020070 */ sw $v0, 0x70($s0) -.L80241958: -/* CCCC68 80241958 8FBF0014 */ lw $ra, 0x14($sp) -/* CCCC6C 8024195C 8FB00010 */ lw $s0, 0x10($sp) -/* CCCC70 80241960 03E00008 */ jr $ra -/* CCCC74 80241964 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_14/func_80242288_CCB310.s b/asm/nonmatchings/world/area_flo/flo_14/func_80242288_CCB310.s deleted file mode 100644 index 4fe30675ed..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/func_80242288_CCB310.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242288_CCD598 -/* CCD598 80242288 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CCD59C 8024228C AFBF0010 */ sw $ra, 0x10($sp) -/* CCD5A0 80242290 8C82000C */ lw $v0, 0xc($a0) -/* CCD5A4 80242294 0C0B1EAF */ jal get_variable -/* CCD5A8 80242298 8C450000 */ lw $a1, ($v0) -/* CCD5AC 8024229C 3C018024 */ lui $at, 0x8024 -/* CCD5B0 802422A0 AC224600 */ sw $v0, 0x4600($at) -/* CCD5B4 802422A4 24020002 */ addiu $v0, $zero, 2 -/* CCD5B8 802422A8 8FBF0010 */ lw $ra, 0x10($sp) -/* CCD5BC 802422AC 24030001 */ addiu $v1, $zero, 1 -/* CCD5C0 802422B0 3C018024 */ lui $at, 0x8024 -/* CCD5C4 802422B4 AC2345FC */ sw $v1, 0x45fc($at) -/* CCD5C8 802422B8 03E00008 */ jr $ra -/* CCD5CC 802422BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_14/func_802422C0_CCB310.s b/asm/nonmatchings/world/area_flo/flo_14/func_802422C0_CCB310.s deleted file mode 100644 index 8cb6116e94..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/func_802422C0_CCB310.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422C0_CCD5D0 -/* CCD5D0 802422C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CCD5D4 802422C4 AFBF0010 */ sw $ra, 0x10($sp) -/* CCD5D8 802422C8 8C82000C */ lw $v0, 0xc($a0) -/* CCD5DC 802422CC 0C0B1EAF */ jal get_variable -/* CCD5E0 802422D0 8C450000 */ lw $a1, ($v0) -/* CCD5E4 802422D4 0040182D */ daddu $v1, $v0, $zero -/* CCD5E8 802422D8 10600012 */ beqz $v1, .L80242324 -/* CCD5EC 802422DC 0000202D */ daddu $a0, $zero, $zero -/* CCD5F0 802422E0 8C620000 */ lw $v0, ($v1) -/* CCD5F4 802422E4 5040000A */ beql $v0, $zero, .L80242310 -/* CCD5F8 802422E8 00041080 */ sll $v0, $a0, 2 -/* CCD5FC 802422EC 3C058024 */ lui $a1, 0x8024 -/* CCD600 802422F0 24A553B0 */ addiu $a1, $a1, 0x53b0 -.L802422F4: -/* CCD604 802422F4 24630004 */ addiu $v1, $v1, 4 -/* CCD608 802422F8 24840001 */ addiu $a0, $a0, 1 -/* CCD60C 802422FC ACA20000 */ sw $v0, ($a1) -/* CCD610 80242300 8C620000 */ lw $v0, ($v1) -/* CCD614 80242304 1440FFFB */ bnez $v0, .L802422F4 -/* CCD618 80242308 24A50004 */ addiu $a1, $a1, 4 -/* CCD61C 8024230C 00041080 */ sll $v0, $a0, 2 -.L80242310: -/* CCD620 80242310 3C018024 */ lui $at, 0x8024 -/* CCD624 80242314 00220821 */ addu $at, $at, $v0 -/* CCD628 80242318 AC2053B0 */ sw $zero, 0x53b0($at) -/* CCD62C 8024231C 080908D3 */ j .L8024234C -/* CCD630 80242320 00000000 */ nop -.L80242324: -/* CCD634 80242324 3C038024 */ lui $v1, 0x8024 -/* CCD638 80242328 246353B0 */ addiu $v1, $v1, 0x53b0 -/* CCD63C 8024232C 0060282D */ daddu $a1, $v1, $zero -.L80242330: -/* CCD640 80242330 24820080 */ addiu $v0, $a0, 0x80 -/* CCD644 80242334 AC620000 */ sw $v0, ($v1) -/* CCD648 80242338 24630004 */ addiu $v1, $v1, 4 -/* CCD64C 8024233C 24840001 */ addiu $a0, $a0, 1 -/* CCD650 80242340 2882005B */ slti $v0, $a0, 0x5b -/* CCD654 80242344 1440FFFA */ bnez $v0, .L80242330 -/* CCD658 80242348 ACA0016C */ sw $zero, 0x16c($a1) -.L8024234C: -/* CCD65C 8024234C 8FBF0010 */ lw $ra, 0x10($sp) -/* CCD660 80242350 24020002 */ addiu $v0, $zero, 2 -/* CCD664 80242354 03E00008 */ jr $ra -/* CCD668 80242358 27BD0018 */ addiu $sp, $sp, 0x18 -/* CCD66C 8024235C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80240040_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80240040_CD1E30.s deleted file mode 100644 index 7c82b6e2f7..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80240040_CD1E30.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_CD1E70 -/* CD1E70 80240040 8C820084 */ lw $v0, 0x84($a0) -/* CD1E74 80240044 8C830090 */ lw $v1, 0x90($a0) -/* CD1E78 80240048 00431023 */ subu $v0, $v0, $v1 -/* CD1E7C 8024004C 44821000 */ mtc1 $v0, $f2 -/* CD1E80 80240050 00000000 */ nop -/* CD1E84 80240054 468010A0 */ cvt.s.w $f2, $f2 -/* CD1E88 80240058 8C820088 */ lw $v0, 0x88($a0) -/* CD1E8C 8024005C 8C830094 */ lw $v1, 0x94($a0) -/* CD1E90 80240060 46021082 */ mul.s $f2, $f2, $f2 -/* CD1E94 80240064 00000000 */ nop -/* CD1E98 80240068 00431023 */ subu $v0, $v0, $v1 -/* CD1E9C 8024006C 44822000 */ mtc1 $v0, $f4 -/* CD1EA0 80240070 00000000 */ nop -/* CD1EA4 80240074 46802120 */ cvt.s.w $f4, $f4 -/* CD1EA8 80240078 8C82008C */ lw $v0, 0x8c($a0) -/* CD1EAC 8024007C 46042102 */ mul.s $f4, $f4, $f4 -/* CD1EB0 80240080 00000000 */ nop -/* CD1EB4 80240084 8C830098 */ lw $v1, 0x98($a0) -/* CD1EB8 80240088 00431023 */ subu $v0, $v0, $v1 -/* CD1EBC 8024008C 44820000 */ mtc1 $v0, $f0 -/* CD1EC0 80240090 00000000 */ nop -/* CD1EC4 80240094 46800020 */ cvt.s.w $f0, $f0 -/* CD1EC8 80240098 46000002 */ mul.s $f0, $f0, $f0 -/* CD1ECC 8024009C 00000000 */ nop -/* CD1ED0 802400A0 46041080 */ add.s $f2, $f2, $f4 -/* CD1ED4 802400A4 46001080 */ add.s $f2, $f2, $f0 -/* CD1ED8 802400A8 3C014561 */ lui $at, 0x4561 -/* CD1EDC 802400AC 44810000 */ mtc1 $at, $f0 -/* CD1EE0 802400B0 00000000 */ nop -/* CD1EE4 802400B4 4600103C */ c.lt.s $f2, $f0 -/* CD1EE8 802400B8 00000000 */ nop -/* CD1EEC 802400BC 45010002 */ bc1t .L802400C8 -/* CD1EF0 802400C0 24020001 */ addiu $v0, $zero, 1 -/* CD1EF4 802400C4 0000102D */ daddu $v0, $zero, $zero -.L802400C8: -/* CD1EF8 802400C8 AC820084 */ sw $v0, 0x84($a0) -/* CD1EFC 802400CC 03E00008 */ jr $ra -/* CD1F00 802400D0 24020002 */ addiu $v0, $zero, 2 -/* CD1F04 802400D4 00000000 */ nop -/* CD1F08 802400D8 00000000 */ nop -/* CD1F0C 802400DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_802400E0_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_802400E0_CD1E30.s deleted file mode 100644 index c7b0d6ded7..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_802400E0_CD1E30.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E0_CD1F10 -/* CD1F10 802400E0 3C03800A */ lui $v1, %hi(D_8009A650) -/* CD1F14 802400E4 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* CD1F18 802400E8 8C620000 */ lw $v0, ($v1) -/* CD1F1C 802400EC 34420040 */ ori $v0, $v0, 0x40 -/* CD1F20 802400F0 AC620000 */ sw $v0, ($v1) -/* CD1F24 802400F4 03E00008 */ jr $ra -/* CD1F28 802400F8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_802400FC_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_802400FC_CD1E30.s deleted file mode 100644 index badd365d69..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_802400FC_CD1E30.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400FC_CD1F2C -/* CD1F2C 802400FC 3C02800A */ lui $v0, %hi(D_8009A650) -/* CD1F30 80240100 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* CD1F34 80240104 8C430000 */ lw $v1, ($v0) -/* CD1F38 80240108 2404FFBF */ addiu $a0, $zero, -0x41 -/* CD1F3C 8024010C 00641824 */ and $v1, $v1, $a0 -/* CD1F40 80240110 AC430000 */ sw $v1, ($v0) -/* CD1F44 80240114 03E00008 */ jr $ra -/* CD1F48 80240118 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_8024011C_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_8024011C_CD1E30.s deleted file mode 100644 index 6f00d13e1f..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_8024011C_CD1E30.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024011C_CD1F4C -/* CD1F4C 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CD1F50 80240120 AFBF0010 */ sw $ra, 0x10($sp) -/* CD1F54 80240124 8C82000C */ lw $v0, 0xc($a0) -/* CD1F58 80240128 0C0B1EAF */ jal get_variable -/* CD1F5C 8024012C 8C450000 */ lw $a1, ($v0) -/* CD1F60 80240130 0C0B95A4 */ jal func_802E5690 -/* CD1F64 80240134 0040202D */ daddu $a0, $v0, $zero -/* CD1F68 80240138 8FBF0010 */ lw $ra, 0x10($sp) -/* CD1F6C 8024013C 24020002 */ addiu $v0, $zero, 2 -/* CD1F70 80240140 03E00008 */ jr $ra -/* CD1F74 80240144 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80240148_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80240148_CD1E30.s deleted file mode 100644 index 4cef9bbb35..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80240148_CD1E30.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240148_CD1F78 -/* CD1F78 80240148 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD1F7C 8024014C AFB00010 */ sw $s0, 0x10($sp) -/* CD1F80 80240150 0080802D */ daddu $s0, $a0, $zero -/* CD1F84 80240154 AFBF0018 */ sw $ra, 0x18($sp) -/* CD1F88 80240158 AFB10014 */ sw $s1, 0x14($sp) -/* CD1F8C 8024015C 8E11000C */ lw $s1, 0xc($s0) -/* CD1F90 80240160 8E250000 */ lw $a1, ($s1) -/* CD1F94 80240164 0C0B1EAF */ jal get_variable -/* CD1F98 80240168 26310004 */ addiu $s1, $s1, 4 -/* CD1F9C 8024016C 0200202D */ daddu $a0, $s0, $zero -/* CD1FA0 80240170 3C038011 */ lui $v1, %hi(gPlayerData) -/* CD1FA4 80240174 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* CD1FA8 80240178 000210C0 */ sll $v0, $v0, 3 -/* CD1FAC 8024017C 00431021 */ addu $v0, $v0, $v1 -/* CD1FB0 80240180 90460015 */ lbu $a2, 0x15($v0) -/* CD1FB4 80240184 8E250000 */ lw $a1, ($s1) -/* CD1FB8 80240188 24C60001 */ addiu $a2, $a2, 1 -/* CD1FBC 8024018C A0460015 */ sb $a2, 0x15($v0) -/* CD1FC0 80240190 00063600 */ sll $a2, $a2, 0x18 -/* CD1FC4 80240194 0C0B2026 */ jal set_variable -/* CD1FC8 80240198 00063603 */ sra $a2, $a2, 0x18 -/* CD1FCC 8024019C 8FBF0018 */ lw $ra, 0x18($sp) -/* CD1FD0 802401A0 8FB10014 */ lw $s1, 0x14($sp) -/* CD1FD4 802401A4 8FB00010 */ lw $s0, 0x10($sp) -/* CD1FD8 802401A8 24020002 */ addiu $v0, $zero, 2 -/* CD1FDC 802401AC 03E00008 */ jr $ra -/* CD1FE0 802401B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_802401B4_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_802401B4_CD1E30.s deleted file mode 100644 index e91a92f61a..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_802401B4_CD1E30.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_CD1FE4 -/* CD1FE4 802401B4 3C028011 */ lui $v0, %hi(gPlayerData) -/* CD1FE8 802401B8 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* CD1FEC 802401BC 000420C0 */ sll $a0, $a0, 3 -/* CD1FF0 802401C0 00822021 */ addu $a0, $a0, $v0 -/* CD1FF4 802401C4 90820014 */ lbu $v0, 0x14($a0) -/* CD1FF8 802401C8 10400009 */ beqz $v0, .L802401F0 -/* CD1FFC 802401CC 00000000 */ nop -/* CD2000 802401D0 90820015 */ lbu $v0, 0x15($a0) -/* CD2004 802401D4 00022600 */ sll $a0, $v0, 0x18 -/* CD2008 802401D8 00041E03 */ sra $v1, $a0, 0x18 -/* CD200C 802401DC 00051400 */ sll $v0, $a1, 0x10 -/* CD2010 802401E0 00021403 */ sra $v0, $v0, 0x10 -/* CD2014 802401E4 0043102A */ slt $v0, $v0, $v1 -/* CD2018 802401E8 10400003 */ beqz $v0, .L802401F8 -/* CD201C 802401EC 00000000 */ nop -.L802401F0: -/* CD2020 802401F0 03E00008 */ jr $ra -/* CD2024 802401F4 2402FFFF */ addiu $v0, $zero, -1 -.L802401F8: -/* CD2028 802401F8 03E00008 */ jr $ra -/* CD202C 802401FC 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80240200_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80240200_CD1E30.s deleted file mode 100644 index 6573be8d48..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80240200_CD1E30.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240200_CD2030 -/* CD2030 80240200 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* CD2034 80240204 AFB3001C */ sw $s3, 0x1c($sp) -/* CD2038 80240208 0080982D */ daddu $s3, $a0, $zero -/* CD203C 8024020C AFB00010 */ sw $s0, 0x10($sp) -/* CD2040 80240210 24100001 */ addiu $s0, $zero, 1 -/* CD2044 80240214 AFB40020 */ sw $s4, 0x20($sp) -/* CD2048 80240218 2414FFFF */ addiu $s4, $zero, -1 -/* CD204C 8024021C AFB50024 */ sw $s5, 0x24($sp) -/* CD2050 80240220 0200A82D */ daddu $s5, $s0, $zero -/* CD2054 80240224 AFB10014 */ sw $s1, 0x14($sp) -/* CD2058 80240228 3C118011 */ lui $s1, 0x8011 -/* CD205C 8024022C 2631F298 */ addiu $s1, $s1, -0xd68 -/* CD2060 80240230 AFBF0028 */ sw $ra, 0x28($sp) -/* CD2064 80240234 AFB20018 */ sw $s2, 0x18($sp) -/* CD2068 80240238 8E6200B4 */ lw $v0, 0xb4($s3) -/* CD206C 8024023C 0280182D */ daddu $v1, $s4, $zero -/* CD2070 80240240 AE630084 */ sw $v1, 0x84($s3) -/* CD2074 80240244 00021027 */ nor $v0, $zero, $v0 -/* CD2078 80240248 000217C2 */ srl $v0, $v0, 0x1f -/* CD207C 8024024C 00029400 */ sll $s2, $v0, 0x10 -.L80240250: -/* CD2080 80240250 92220014 */ lbu $v0, 0x14($s1) -/* CD2084 80240254 50400008 */ beql $v0, $zero, .L80240278 -/* CD2088 80240258 26100001 */ addiu $s0, $s0, 1 -/* CD208C 8024025C 0200202D */ daddu $a0, $s0, $zero -/* CD2090 80240260 0C09006D */ jal func_802401B4 -/* CD2094 80240264 00122C03 */ sra $a1, $s2, 0x10 -/* CD2098 80240268 10540003 */ beq $v0, $s4, .L80240278 -/* CD209C 8024026C 26100001 */ addiu $s0, $s0, 1 -/* CD20A0 80240270 080900A1 */ j .L80240284 -/* CD20A4 80240274 AE750084 */ sw $s5, 0x84($s3) -.L80240278: -/* CD20A8 80240278 2A02000C */ slti $v0, $s0, 0xc -/* CD20AC 8024027C 1440FFF4 */ bnez $v0, .L80240250 -/* CD20B0 80240280 26310008 */ addiu $s1, $s1, 8 -.L80240284: -/* CD20B4 80240284 8FBF0028 */ lw $ra, 0x28($sp) -/* CD20B8 80240288 8FB50024 */ lw $s5, 0x24($sp) -/* CD20BC 8024028C 8FB40020 */ lw $s4, 0x20($sp) -/* CD20C0 80240290 8FB3001C */ lw $s3, 0x1c($sp) -/* CD20C4 80240294 8FB20018 */ lw $s2, 0x18($sp) -/* CD20C8 80240298 8FB10014 */ lw $s1, 0x14($sp) -/* CD20CC 8024029C 8FB00010 */ lw $s0, 0x10($sp) -/* CD20D0 802402A0 24020002 */ addiu $v0, $zero, 2 -/* CD20D4 802402A4 03E00008 */ jr $ra -/* CD20D8 802402A8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_802402AC_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_802402AC_CD1E30.s deleted file mode 100644 index a09d050134..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_802402AC_CD1E30.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402AC_CD20DC -/* CD20DC 802402AC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* CD20E0 802402B0 AFB5002C */ sw $s5, 0x2c($sp) -/* CD20E4 802402B4 0080A82D */ daddu $s5, $a0, $zero -/* CD20E8 802402B8 AFBE0038 */ sw $fp, 0x38($sp) -/* CD20EC 802402BC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* CD20F0 802402C0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* CD20F4 802402C4 AFBF003C */ sw $ra, 0x3c($sp) -/* CD20F8 802402C8 AFB70034 */ sw $s7, 0x34($sp) -/* CD20FC 802402CC AFB60030 */ sw $s6, 0x30($sp) -/* CD2100 802402D0 AFB40028 */ sw $s4, 0x28($sp) -/* CD2104 802402D4 AFB30024 */ sw $s3, 0x24($sp) -/* CD2108 802402D8 AFB20020 */ sw $s2, 0x20($sp) -/* CD210C 802402DC AFB1001C */ sw $s1, 0x1c($sp) -/* CD2110 802402E0 10A0004F */ beqz $a1, .L80240420 -/* CD2114 802402E4 AFB00018 */ sw $s0, 0x18($sp) -/* CD2118 802402E8 0C00AB39 */ jal heap_malloc -/* CD211C 802402EC 24040330 */ addiu $a0, $zero, 0x330 -/* CD2120 802402F0 0040982D */ daddu $s3, $v0, $zero -/* CD2124 802402F4 0000B02D */ daddu $s6, $zero, $zero -/* CD2128 802402F8 02C0902D */ daddu $s2, $s6, $zero -/* CD212C 802402FC 3C148024 */ lui $s4, 0x8024 -/* CD2130 80240300 26943708 */ addiu $s4, $s4, 0x3708 -/* CD2134 80240304 0260882D */ daddu $s1, $s3, $zero -/* CD2138 80240308 8EA200B4 */ lw $v0, 0xb4($s5) -/* CD213C 8024030C 3C038024 */ lui $v1, 0x8024 -/* CD2140 80240310 24633700 */ addiu $v1, $v1, 0x3700 -/* CD2144 80240314 AEB30078 */ sw $s3, 0x78($s5) -/* CD2148 80240318 00021027 */ nor $v0, $zero, $v0 -/* CD214C 8024031C 0002BFC2 */ srl $s7, $v0, 0x1f -/* CD2150 80240320 00171080 */ sll $v0, $s7, 2 -/* CD2154 80240324 00431021 */ addu $v0, $v0, $v1 -/* CD2158 80240328 AFA20010 */ sw $v0, 0x10($sp) -.L8024032C: -/* CD215C 8024032C 86900000 */ lh $s0, ($s4) -/* CD2160 80240330 001010C0 */ sll $v0, $s0, 3 -/* CD2164 80240334 03C21021 */ addu $v0, $fp, $v0 -/* CD2168 80240338 90420014 */ lbu $v0, 0x14($v0) -/* CD216C 8024033C 5040002E */ beql $v0, $zero, .L802403F8 -/* CD2170 80240340 26520001 */ addiu $s2, $s2, 1 -/* CD2174 80240344 00101100 */ sll $v0, $s0, 4 -/* CD2178 80240348 3C068009 */ lui $a2, 0x8009 -/* CD217C 8024034C 24C6EF20 */ addiu $a2, $a2, -0x10e0 -/* CD2180 80240350 00461021 */ addu $v0, $v0, $a2 -/* CD2184 80240354 0200202D */ daddu $a0, $s0, $zero -/* CD2188 80240358 AE300108 */ sw $s0, 0x108($s1) -/* CD218C 8024035C 8C420000 */ lw $v0, ($v0) -/* CD2190 80240360 02E0282D */ daddu $a1, $s7, $zero -/* CD2194 80240364 0C09006D */ jal func_802401B4 -/* CD2198 80240368 AE220084 */ sw $v0, 0x84($s1) -/* CD219C 8024036C 0040202D */ daddu $a0, $v0, $zero -/* CD21A0 80240370 04800011 */ bltz $a0, .L802403B8 -/* CD21A4 80240374 00101080 */ sll $v0, $s0, 2 -/* CD21A8 80240378 3C06800F */ lui $a2, 0x800f -/* CD21AC 8024037C 24C67F00 */ addiu $a2, $a2, 0x7f00 -/* CD21B0 80240380 00461021 */ addu $v0, $v0, $a2 -/* CD21B4 80240384 8C430000 */ lw $v1, ($v0) -/* CD21B8 80240388 24020001 */ addiu $v0, $zero, 1 -/* CD21BC 8024038C AE22018C */ sw $v0, 0x18c($s1) -/* CD21C0 80240390 00041080 */ sll $v0, $a0, 2 -/* CD21C4 80240394 3C068024 */ lui $a2, 0x8024 -/* CD21C8 80240398 24C63718 */ addiu $a2, $a2, 0x3718 -/* CD21CC 8024039C AE230000 */ sw $v1, ($s1) -/* CD21D0 802403A0 001218C0 */ sll $v1, $s2, 3 -/* CD21D4 802403A4 00431021 */ addu $v0, $v0, $v1 -/* CD21D8 802403A8 00461021 */ addu $v0, $v0, $a2 -/* CD21DC 802403AC 8C420000 */ lw $v0, ($v0) -/* CD21E0 802403B0 080900F7 */ j .L802403DC -/* CD21E4 802403B4 AE220294 */ sw $v0, 0x294($s1) -.L802403B8: -/* CD21E8 802403B8 3C06800F */ lui $a2, 0x800f -/* CD21EC 802403BC 24C67F40 */ addiu $a2, $a2, 0x7f40 -/* CD21F0 802403C0 00461021 */ addu $v0, $v0, $a2 -/* CD21F4 802403C4 8C420000 */ lw $v0, ($v0) -/* CD21F8 802403C8 AE20018C */ sw $zero, 0x18c($s1) -/* CD21FC 802403CC AE220000 */ sw $v0, ($s1) -/* CD2200 802403D0 8FA60010 */ lw $a2, 0x10($sp) -/* CD2204 802403D4 8CC20000 */ lw $v0, ($a2) -/* CD2208 802403D8 AE220294 */ sw $v0, 0x294($s1) -.L802403DC: -/* CD220C 802403DC 001010C0 */ sll $v0, $s0, 3 -/* CD2210 802403E0 03C21021 */ addu $v0, $fp, $v0 -/* CD2214 802403E4 80420015 */ lb $v0, 0x15($v0) -/* CD2218 802403E8 26D60001 */ addiu $s6, $s6, 1 -/* CD221C 802403EC AE220210 */ sw $v0, 0x210($s1) -/* CD2220 802403F0 26310004 */ addiu $s1, $s1, 4 -/* CD2224 802403F4 26520001 */ addiu $s2, $s2, 1 -.L802403F8: -/* CD2228 802403F8 2A420008 */ slti $v0, $s2, 8 -/* CD222C 802403FC 1440FFCB */ bnez $v0, .L8024032C -/* CD2230 80240400 26940002 */ addiu $s4, $s4, 2 -/* CD2234 80240404 0260202D */ daddu $a0, $s3, $zero -/* CD2238 80240408 24020004 */ addiu $v0, $zero, 4 -/* CD223C 8024040C AC820318 */ sw $v0, 0x318($a0) -/* CD2240 80240410 AC960324 */ sw $s6, 0x324($a0) -/* CD2244 80240414 0C03D390 */ jal func_800F4E40 -/* CD2248 80240418 AC800328 */ sw $zero, 0x328($a0) -/* CD224C 8024041C AEA00070 */ sw $zero, 0x70($s5) -.L80240420: -/* CD2250 80240420 8EA20070 */ lw $v0, 0x70($s5) -/* CD2254 80240424 8EB30078 */ lw $s3, 0x78($s5) -/* CD2258 80240428 14400008 */ bnez $v0, .L8024044C -/* CD225C 8024042C 24420001 */ addiu $v0, $v0, 1 -/* CD2260 80240430 8662032C */ lh $v0, 0x32c($s3) -/* CD2264 80240434 10400009 */ beqz $v0, .L8024045C -/* CD2268 80240438 AEA20074 */ sw $v0, 0x74($s5) -/* CD226C 8024043C 0C03C4EC */ jal func_800F13B0 -/* CD2270 80240440 00000000 */ nop -/* CD2274 80240444 8EA20070 */ lw $v0, 0x70($s5) -/* CD2278 80240448 24420001 */ addiu $v0, $v0, 1 -.L8024044C: -/* CD227C 8024044C AEA20070 */ sw $v0, 0x70($s5) -/* CD2280 80240450 2842000F */ slti $v0, $v0, 0xf -/* CD2284 80240454 10400003 */ beqz $v0, .L80240464 -/* CD2288 80240458 00000000 */ nop -.L8024045C: -/* CD228C 8024045C 08090133 */ j .L802404CC -/* CD2290 80240460 0000102D */ daddu $v0, $zero, $zero -.L80240464: -/* CD2294 80240464 0C03C54E */ jal func_800F1538 -/* CD2298 80240468 00000000 */ nop -/* CD229C 8024046C 8EA30074 */ lw $v1, 0x74($s5) -/* CD22A0 80240470 240200FF */ addiu $v0, $zero, 0xff -/* CD22A4 80240474 10620010 */ beq $v1, $v0, .L802404B8 -/* CD22A8 80240478 2462FFFF */ addiu $v0, $v1, -1 -/* CD22AC 8024047C 00021080 */ sll $v0, $v0, 2 -/* CD22B0 80240480 02621021 */ addu $v0, $s3, $v0 -/* CD22B4 80240484 8C420108 */ lw $v0, 0x108($v0) -/* CD22B8 80240488 00021100 */ sll $v0, $v0, 4 -/* CD22BC 8024048C 3C038009 */ lui $v1, 0x8009 -/* CD22C0 80240490 00621821 */ addu $v1, $v1, $v0 -/* CD22C4 80240494 8C63EF20 */ lw $v1, -0x10e0($v1) -/* CD22C8 80240498 8EA20074 */ lw $v0, 0x74($s5) -/* CD22CC 8024049C 2442FFFF */ addiu $v0, $v0, -1 -/* CD22D0 802404A0 00021080 */ sll $v0, $v0, 2 -/* CD22D4 802404A4 02621021 */ addu $v0, $s3, $v0 -/* CD22D8 802404A8 AEA30084 */ sw $v1, 0x84($s5) -/* CD22DC 802404AC 8C420108 */ lw $v0, 0x108($v0) -/* CD22E0 802404B0 08090130 */ j .L802404C0 -/* CD22E4 802404B4 AEA20088 */ sw $v0, 0x88($s5) -.L802404B8: -/* CD22E8 802404B8 2402FFFF */ addiu $v0, $zero, -1 -/* CD22EC 802404BC AEA20084 */ sw $v0, 0x84($s5) -.L802404C0: -/* CD22F0 802404C0 0C00AB4B */ jal heap_free -/* CD22F4 802404C4 8EA40078 */ lw $a0, 0x78($s5) -/* CD22F8 802404C8 24020002 */ addiu $v0, $zero, 2 -.L802404CC: -/* CD22FC 802404CC 8FBF003C */ lw $ra, 0x3c($sp) -/* CD2300 802404D0 8FBE0038 */ lw $fp, 0x38($sp) -/* CD2304 802404D4 8FB70034 */ lw $s7, 0x34($sp) -/* CD2308 802404D8 8FB60030 */ lw $s6, 0x30($sp) -/* CD230C 802404DC 8FB5002C */ lw $s5, 0x2c($sp) -/* CD2310 802404E0 8FB40028 */ lw $s4, 0x28($sp) -/* CD2314 802404E4 8FB30024 */ lw $s3, 0x24($sp) -/* CD2318 802404E8 8FB20020 */ lw $s2, 0x20($sp) -/* CD231C 802404EC 8FB1001C */ lw $s1, 0x1c($sp) -/* CD2320 802404F0 8FB00018 */ lw $s0, 0x18($sp) -/* CD2324 802404F4 03E00008 */ jr $ra -/* CD2328 802404F8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80240528_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80240528_CD1E30.s deleted file mode 100644 index aca75a6bbd..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80240528_CD1E30.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240528_CD2358 -/* CD2358 80240528 3C028011 */ lui $v0, 0x8011 -/* CD235C 8024052C 8042F2A2 */ lb $v0, -0xd5e($v0) -/* CD2360 80240530 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CD2364 80240534 AFBF0010 */ sw $ra, 0x10($sp) -/* CD2368 80240538 00021100 */ sll $v0, $v0, 4 -/* CD236C 8024053C 3C048009 */ lui $a0, 0x8009 -/* CD2370 80240540 00822021 */ addu $a0, $a0, $v0 -/* CD2374 80240544 8C84EF20 */ lw $a0, -0x10e0($a0) -/* CD2378 80240548 0C0496CF */ jal set_message_string -/* CD237C 8024054C 0000282D */ daddu $a1, $zero, $zero -/* CD2380 80240550 8FBF0010 */ lw $ra, 0x10($sp) -/* CD2384 80240554 24020002 */ addiu $v0, $zero, 2 -/* CD2388 80240558 03E00008 */ jr $ra -/* CD238C 8024055C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_802405F0_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_802405F0_CD1E30.s deleted file mode 100644 index e566583d2a..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_802405F0_CD1E30.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_CD2420 -/* CD2420 802405F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CD2424 802405F4 AFBF0010 */ sw $ra, 0x10($sp) -/* CD2428 802405F8 8C82000C */ lw $v0, 0xc($a0) -/* CD242C 802405FC 0C0B1EAF */ jal get_variable -/* CD2430 80240600 8C450000 */ lw $a1, ($v0) -/* CD2434 80240604 0040202D */ daddu $a0, $v0, $zero -/* CD2438 80240608 8C830000 */ lw $v1, ($a0) -/* CD243C 8024060C 34630010 */ ori $v1, $v1, 0x10 -/* CD2440 80240610 AC830000 */ sw $v1, ($a0) -/* CD2444 80240614 8FBF0010 */ lw $ra, 0x10($sp) -/* CD2448 80240618 24020002 */ addiu $v0, $zero, 2 -/* CD244C 8024061C 03E00008 */ jr $ra -/* CD2450 80240620 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80240624_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80240624_CD1E30.s deleted file mode 100644 index 86799ff980..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80240624_CD1E30.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240624_CD2454 -/* CD2454 80240624 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD2458 80240628 AFBF0018 */ sw $ra, 0x18($sp) -/* CD245C 8024062C 8C82000C */ lw $v0, 0xc($a0) -/* CD2460 80240630 0C0B1EAF */ jal get_variable -/* CD2464 80240634 8C450000 */ lw $a1, ($v0) -/* CD2468 80240638 0C04417A */ jal get_entity_by_index -/* CD246C 8024063C 0040202D */ daddu $a0, $v0, $zero -/* CD2470 80240640 3C013F80 */ lui $at, 0x3f80 -/* CD2474 80240644 44810000 */ mtc1 $at, $f0 -/* CD2478 80240648 C442004C */ lwc1 $f2, 0x4c($v0) -/* CD247C 8024064C E7A00010 */ swc1 $f0, 0x10($sp) -/* CD2480 80240650 3C014148 */ lui $at, 0x4148 -/* CD2484 80240654 44810000 */ mtc1 $at, $f0 -/* CD2488 80240658 2403004B */ addiu $v1, $zero, 0x4b -/* CD248C 8024065C AFA30014 */ sw $v1, 0x14($sp) -/* CD2490 80240660 46001080 */ add.s $f2, $f2, $f0 -/* CD2494 80240664 8C450048 */ lw $a1, 0x48($v0) -/* CD2498 80240668 8C470050 */ lw $a3, 0x50($v0) -/* CD249C 8024066C 44061000 */ mfc1 $a2, $f2 -/* CD24A0 80240670 0C01C2EC */ jal func_80070BB0 -/* CD24A4 80240674 24040004 */ addiu $a0, $zero, 4 -/* CD24A8 80240678 8FBF0018 */ lw $ra, 0x18($sp) -/* CD24AC 8024067C 24020002 */ addiu $v0, $zero, 2 -/* CD24B0 80240680 03E00008 */ jr $ra -/* CD24B4 80240684 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80240688_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80240688_CD1E30.s deleted file mode 100644 index 8673e9911b..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80240688_CD1E30.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240688_CD24B8 -/* CD24B8 80240688 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD24BC 8024068C AFBF0018 */ sw $ra, 0x18($sp) -/* CD24C0 80240690 0C00EAD2 */ jal get_npc_safe -/* CD24C4 80240694 2404FFFC */ addiu $a0, $zero, -4 -/* CD24C8 80240698 C444003C */ lwc1 $f4, 0x3c($v0) -/* CD24CC 8024069C 3C014148 */ lui $at, 0x4148 -/* CD24D0 802406A0 44811000 */ mtc1 $at, $f2 -/* CD24D4 802406A4 3C013F80 */ lui $at, 0x3f80 -/* CD24D8 802406A8 44810000 */ mtc1 $at, $f0 -/* CD24DC 802406AC 2403001E */ addiu $v1, $zero, 0x1e -/* CD24E0 802406B0 AFA30014 */ sw $v1, 0x14($sp) -/* CD24E4 802406B4 46022100 */ add.s $f4, $f4, $f2 -/* CD24E8 802406B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD24EC 802406BC 8C450038 */ lw $a1, 0x38($v0) -/* CD24F0 802406C0 8C470040 */ lw $a3, 0x40($v0) -/* CD24F4 802406C4 44062000 */ mfc1 $a2, $f4 -/* CD24F8 802406C8 0C01C2EC */ jal func_80070BB0 -/* CD24FC 802406CC 24040009 */ addiu $a0, $zero, 9 -/* CD2500 802406D0 8FBF0018 */ lw $ra, 0x18($sp) -/* CD2504 802406D4 24020002 */ addiu $v0, $zero, 2 -/* CD2508 802406D8 03E00008 */ jr $ra -/* CD250C 802406DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_802406E0_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_802406E0_CD1E30.s deleted file mode 100644 index e22f346e98..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_802406E0_CD1E30.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406E0_CD2510 -/* CD2510 802406E0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* CD2514 802406E4 AFB60040 */ sw $s6, 0x40($sp) -/* CD2518 802406E8 0080B02D */ daddu $s6, $a0, $zero -/* CD251C 802406EC AFB00028 */ sw $s0, 0x28($sp) -/* CD2520 802406F0 00A0802D */ daddu $s0, $a1, $zero -/* CD2524 802406F4 AFBF0044 */ sw $ra, 0x44($sp) -/* CD2528 802406F8 AFB5003C */ sw $s5, 0x3c($sp) -/* CD252C 802406FC AFB40038 */ sw $s4, 0x38($sp) -/* CD2530 80240700 AFB30034 */ sw $s3, 0x34($sp) -/* CD2534 80240704 AFB20030 */ sw $s2, 0x30($sp) -/* CD2538 80240708 AFB1002C */ sw $s1, 0x2c($sp) -/* CD253C 8024070C F7B80058 */ sdc1 $f24, 0x58($sp) -/* CD2540 80240710 F7B60050 */ sdc1 $f22, 0x50($sp) -/* CD2544 80240714 F7B40048 */ sdc1 $f20, 0x48($sp) -/* CD2548 80240718 8ED3000C */ lw $s3, 0xc($s6) -/* CD254C 8024071C 0C00EAD2 */ jal get_npc_safe -/* CD2550 80240720 2404FFFC */ addiu $a0, $zero, -4 -/* CD2554 80240724 27A50018 */ addiu $a1, $sp, 0x18 -/* CD2558 80240728 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* CD255C 8024072C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* CD2560 80240730 27A6001C */ addiu $a2, $sp, 0x1c -/* CD2564 80240734 00041880 */ sll $v1, $a0, 2 -/* CD2568 80240738 00641821 */ addu $v1, $v1, $a0 -/* CD256C 8024073C 00031880 */ sll $v1, $v1, 2 -/* CD2570 80240740 00641823 */ subu $v1, $v1, $a0 -/* CD2574 80240744 000320C0 */ sll $a0, $v1, 3 -/* CD2578 80240748 00641821 */ addu $v1, $v1, $a0 -/* CD257C 8024074C 000318C0 */ sll $v1, $v1, 3 -/* CD2580 80240750 3C01800B */ lui $at, 0x800b -/* CD2584 80240754 00230821 */ addu $at, $at, $v1 -/* CD2588 80240758 C42C1DEC */ lwc1 $f12, 0x1dec($at) -/* CD258C 8024075C 0C00A88D */ jal sin_cos_deg -/* CD2590 80240760 0040A82D */ daddu $s5, $v0, $zero -/* CD2594 80240764 1200005D */ beqz $s0, .L802408DC -/* CD2598 80240768 00000000 */ nop -/* CD259C 8024076C 0C00AB0A */ jal general_heap_malloc -/* CD25A0 80240770 24040068 */ addiu $a0, $zero, 0x68 -/* CD25A4 80240774 0040902D */ daddu $s2, $v0, $zero -/* CD25A8 80240778 02C0202D */ daddu $a0, $s6, $zero -/* CD25AC 8024077C 0000882D */ daddu $s1, $zero, $zero -/* CD25B0 80240780 2414FFFF */ addiu $s4, $zero, -1 -/* CD25B4 80240784 AED20060 */ sw $s2, 0x60($s6) -/* CD25B8 80240788 8E650000 */ lw $a1, ($s3) -/* CD25BC 8024078C 3C014148 */ lui $at, 0x4148 -/* CD25C0 80240790 4481C000 */ mtc1 $at, $f24 -/* CD25C4 80240794 3C013F80 */ lui $at, 0x3f80 -/* CD25C8 80240798 4481B000 */ mtc1 $at, $f22 -/* CD25CC 8024079C 4480A000 */ mtc1 $zero, $f20 -/* CD25D0 802407A0 0C0B1EAF */ jal get_variable -/* CD25D4 802407A4 0240802D */ daddu $s0, $s2, $zero -/* CD25D8 802407A8 0C04417A */ jal get_entity_by_index -/* CD25DC 802407AC 0040202D */ daddu $a0, $v0, $zero -/* CD25E0 802407B0 AE42005C */ sw $v0, 0x5c($s2) -.L802407B4: -/* CD25E4 802407B4 8E42005C */ lw $v0, 0x5c($s2) -/* CD25E8 802407B8 C440004C */ lwc1 $f0, 0x4c($v0) -/* CD25EC 802407BC 0000202D */ daddu $a0, $zero, $zero -/* CD25F0 802407C0 E7B60010 */ swc1 $f22, 0x10($sp) -/* CD25F4 802407C4 AFB40014 */ sw $s4, 0x14($sp) -/* CD25F8 802407C8 46180000 */ add.s $f0, $f0, $f24 -/* CD25FC 802407CC 8C450048 */ lw $a1, 0x48($v0) -/* CD2600 802407D0 8C470050 */ lw $a3, 0x50($v0) -/* CD2604 802407D4 44060000 */ mfc1 $a2, $f0 -/* CD2608 802407D8 0C01C5BC */ jal func_800716F0 -/* CD260C 802407DC 26310001 */ addiu $s1, $s1, 1 -/* CD2610 802407E0 AE020008 */ sw $v0, 8($s0) -/* CD2614 802407E4 E614002C */ swc1 $f20, 0x2c($s0) -/* CD2618 802407E8 E6140020 */ swc1 $f20, 0x20($s0) -/* CD261C 802407EC E6140014 */ swc1 $f20, 0x14($s0) -/* CD2620 802407F0 E6140050 */ swc1 $f20, 0x50($s0) -/* CD2624 802407F4 E6140044 */ swc1 $f20, 0x44($s0) -/* CD2628 802407F8 E6140038 */ swc1 $f20, 0x38($s0) -/* CD262C 802407FC 2A220003 */ slti $v0, $s1, 3 -/* CD2630 80240800 1440FFEC */ bnez $v0, .L802407B4 -/* CD2634 80240804 26100004 */ addiu $s0, $s0, 4 -/* CD2638 80240808 0000882D */ daddu $s1, $zero, $zero -/* CD263C 8024080C 0240802D */ daddu $s0, $s2, $zero -/* CD2640 80240810 3C148024 */ lui $s4, 0x8024 -/* CD2644 80240814 26943758 */ addiu $s4, $s4, 0x3758 -/* CD2648 80240818 3C014248 */ lui $at, 0x4248 -/* CD264C 8024081C 4481A000 */ mtc1 $at, $f20 -/* CD2650 80240820 24130044 */ addiu $s3, $zero, 0x44 -/* CD2654 80240824 AE400000 */ sw $zero, ($s2) -/* CD2658 80240828 AE400004 */ sw $zero, 4($s2) -/* CD265C 8024082C AE400060 */ sw $zero, 0x60($s2) -/* CD2660 80240830 AE400064 */ sw $zero, 0x64($s2) -.L80240834: -/* CD2664 80240834 27A40020 */ addiu $a0, $sp, 0x20 -/* CD2668 80240838 4406A000 */ mfc1 $a2, $f20 -/* CD266C 8024083C 8E870000 */ lw $a3, ($s4) -/* CD2670 80240840 02532821 */ addu $a1, $s2, $s3 -/* CD2674 80240844 0C00A7E7 */ jal add_vec2D_polar -/* CD2678 80240848 AFA00020 */ sw $zero, 0x20($sp) -/* CD267C 8024084C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* CD2680 80240850 C7A40020 */ lwc1 $f4, 0x20($sp) -/* CD2684 80240854 46041082 */ mul.s $f2, $f2, $f4 -/* CD2688 80240858 00000000 */ nop -/* CD268C 8024085C C7A00018 */ lwc1 $f0, 0x18($sp) -/* CD2690 80240860 46040002 */ mul.s $f0, $f0, $f4 -/* CD2694 80240864 00000000 */ nop -/* CD2698 80240868 E6020038 */ swc1 $f2, 0x38($s0) -/* CD269C 8024086C E6000050 */ swc1 $f0, 0x50($s0) -/* CD26A0 80240870 8E42005C */ lw $v0, 0x5c($s2) -/* CD26A4 80240874 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD26A8 80240878 C4420048 */ lwc1 $f2, 0x48($v0) -/* CD26AC 8024087C 46001080 */ add.s $f2, $f2, $f0 -/* CD26B0 80240880 C6A00038 */ lwc1 $f0, 0x38($s5) -/* CD26B4 80240884 46020001 */ sub.s $f0, $f0, $f2 -/* CD26B8 80240888 E6000038 */ swc1 $f0, 0x38($s0) -/* CD26BC 8024088C 8E42005C */ lw $v0, 0x5c($s2) -/* CD26C0 80240890 C6000044 */ lwc1 $f0, 0x44($s0) -/* CD26C4 80240894 C442004C */ lwc1 $f2, 0x4c($v0) -/* CD26C8 80240898 46001080 */ add.s $f2, $f2, $f0 -/* CD26CC 8024089C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* CD26D0 802408A0 46020001 */ sub.s $f0, $f0, $f2 -/* CD26D4 802408A4 E6000044 */ swc1 $f0, 0x44($s0) -/* CD26D8 802408A8 8E42005C */ lw $v0, 0x5c($s2) -/* CD26DC 802408AC C6000050 */ lwc1 $f0, 0x50($s0) -/* CD26E0 802408B0 C4420050 */ lwc1 $f2, 0x50($v0) -/* CD26E4 802408B4 26940004 */ addiu $s4, $s4, 4 -/* CD26E8 802408B8 46001080 */ add.s $f2, $f2, $f0 -/* CD26EC 802408BC C6A00040 */ lwc1 $f0, 0x40($s5) -/* CD26F0 802408C0 26730004 */ addiu $s3, $s3, 4 -/* CD26F4 802408C4 46020001 */ sub.s $f0, $f0, $f2 -/* CD26F8 802408C8 26310001 */ addiu $s1, $s1, 1 -/* CD26FC 802408CC 2A220003 */ slti $v0, $s1, 3 -/* CD2700 802408D0 E6000050 */ swc1 $f0, 0x50($s0) -/* CD2704 802408D4 1440FFD7 */ bnez $v0, .L80240834 -/* CD2708 802408D8 26100004 */ addiu $s0, $s0, 4 -.L802408DC: -/* CD270C 802408DC 8ED20060 */ lw $s2, 0x60($s6) -/* CD2710 802408E0 8E430000 */ lw $v1, ($s2) -/* CD2714 802408E4 24020001 */ addiu $v0, $zero, 1 -/* CD2718 802408E8 10620038 */ beq $v1, $v0, .L802409CC -/* CD271C 802408EC 28620002 */ slti $v0, $v1, 2 -/* CD2720 802408F0 50400005 */ beql $v0, $zero, .L80240908 -/* CD2724 802408F4 24020002 */ addiu $v0, $zero, 2 -/* CD2728 802408F8 10600007 */ beqz $v1, .L80240918 -/* CD272C 802408FC 24040005 */ addiu $a0, $zero, 5 -/* CD2730 80240900 080902AC */ j .L80240AB0 -/* CD2734 80240904 00000000 */ nop -.L80240908: -/* CD2738 80240908 10620058 */ beq $v1, $v0, .L80240A6C -/* CD273C 8024090C 00000000 */ nop -/* CD2740 80240910 080902AC */ j .L80240AB0 -/* CD2744 80240914 00000000 */ nop -.L80240918: -/* CD2748 80240918 0000882D */ daddu $s1, $zero, $zero -/* CD274C 8024091C 3C148024 */ lui $s4, 0x8024 -/* CD2750 80240920 26943758 */ addiu $s4, $s4, 0x3758 -/* CD2754 80240924 24130020 */ addiu $s3, $zero, 0x20 -/* CD2758 80240928 3C064248 */ lui $a2, 0x4248 -/* CD275C 8024092C 44800000 */ mtc1 $zero, $f0 -/* CD2760 80240930 24020014 */ addiu $v0, $zero, 0x14 -/* CD2764 80240934 AFA20010 */ sw $v0, 0x10($sp) -/* CD2768 80240938 44050000 */ mfc1 $a1, $f0 -/* CD276C 8024093C 8E470060 */ lw $a3, 0x60($s2) -/* CD2770 80240940 4485B000 */ mtc1 $a1, $f22 -/* CD2774 80240944 0C00A8ED */ jal update_lerp -/* CD2778 80240948 0240802D */ daddu $s0, $s2, $zero -/* CD277C 8024094C 46000506 */ mov.s $f20, $f0 -.L80240950: -/* CD2780 80240950 4406A000 */ mfc1 $a2, $f20 -/* CD2784 80240954 27A40020 */ addiu $a0, $sp, 0x20 -/* CD2788 80240958 E6160020 */ swc1 $f22, 0x20($s0) -/* CD278C 8024095C 8E870000 */ lw $a3, ($s4) -/* CD2790 80240960 02532821 */ addu $a1, $s2, $s3 -/* CD2794 80240964 0C00A7E7 */ jal add_vec2D_polar -/* CD2798 80240968 E7B60020 */ swc1 $f22, 0x20($sp) -/* CD279C 8024096C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* CD27A0 80240970 C7A00020 */ lwc1 $f0, 0x20($sp) -/* CD27A4 80240974 46002102 */ mul.s $f4, $f4, $f0 -/* CD27A8 80240978 00000000 */ nop -/* CD27AC 8024097C C7A20018 */ lwc1 $f2, 0x18($sp) -/* CD27B0 80240980 26940004 */ addiu $s4, $s4, 4 -/* CD27B4 80240984 46001082 */ mul.s $f2, $f2, $f0 -/* CD27B8 80240988 00000000 */ nop -/* CD27BC 8024098C 26730004 */ addiu $s3, $s3, 4 -/* CD27C0 80240990 26310001 */ addiu $s1, $s1, 1 -/* CD27C4 80240994 2A220003 */ slti $v0, $s1, 3 -/* CD27C8 80240998 E6040014 */ swc1 $f4, 0x14($s0) -/* CD27CC 8024099C E602002C */ swc1 $f2, 0x2c($s0) -/* CD27D0 802409A0 1440FFEB */ bnez $v0, .L80240950 -/* CD27D4 802409A4 26100004 */ addiu $s0, $s0, 4 -/* CD27D8 802409A8 8E420060 */ lw $v0, 0x60($s2) -/* CD27DC 802409AC 24420001 */ addiu $v0, $v0, 1 -/* CD27E0 802409B0 AE420060 */ sw $v0, 0x60($s2) -/* CD27E4 802409B4 28420015 */ slti $v0, $v0, 0x15 -/* CD27E8 802409B8 1440003D */ bnez $v0, .L80240AB0 -/* CD27EC 802409BC 24020001 */ addiu $v0, $zero, 1 -/* CD27F0 802409C0 AE420000 */ sw $v0, ($s2) -/* CD27F4 802409C4 080902AC */ j .L80240AB0 -/* CD27F8 802409C8 AE400060 */ sw $zero, 0x60($s2) -.L802409CC: -/* CD27FC 802409CC 0000882D */ daddu $s1, $zero, $zero -/* CD2800 802409D0 3C148024 */ lui $s4, 0x8024 -/* CD2804 802409D4 26943758 */ addiu $s4, $s4, 0x3758 -/* CD2808 802409D8 24130020 */ addiu $s3, $zero, 0x20 -/* CD280C 802409DC 0240802D */ daddu $s0, $s2, $zero -/* CD2810 802409E0 3C014248 */ lui $at, 0x4248 -/* CD2814 802409E4 4481A000 */ mtc1 $at, $f20 -/* CD2818 802409E8 4480B000 */ mtc1 $zero, $f22 -.L802409EC: -/* CD281C 802409EC 4406A000 */ mfc1 $a2, $f20 -/* CD2820 802409F0 27A40020 */ addiu $a0, $sp, 0x20 -/* CD2824 802409F4 E6160020 */ swc1 $f22, 0x20($s0) -/* CD2828 802409F8 8E870000 */ lw $a3, ($s4) -/* CD282C 802409FC 02532821 */ addu $a1, $s2, $s3 -/* CD2830 80240A00 0C00A7E7 */ jal add_vec2D_polar -/* CD2834 80240A04 E7B60020 */ swc1 $f22, 0x20($sp) -/* CD2838 80240A08 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* CD283C 80240A0C C7A00020 */ lwc1 $f0, 0x20($sp) -/* CD2840 80240A10 46002102 */ mul.s $f4, $f4, $f0 -/* CD2844 80240A14 00000000 */ nop -/* CD2848 80240A18 C7A20018 */ lwc1 $f2, 0x18($sp) -/* CD284C 80240A1C 26940004 */ addiu $s4, $s4, 4 -/* CD2850 80240A20 46001082 */ mul.s $f2, $f2, $f0 -/* CD2854 80240A24 00000000 */ nop -/* CD2858 80240A28 26730004 */ addiu $s3, $s3, 4 -/* CD285C 80240A2C 26310001 */ addiu $s1, $s1, 1 -/* CD2860 80240A30 2A220003 */ slti $v0, $s1, 3 -/* CD2864 80240A34 E6040014 */ swc1 $f4, 0x14($s0) -/* CD2868 80240A38 E602002C */ swc1 $f2, 0x2c($s0) -/* CD286C 80240A3C 1440FFEB */ bnez $v0, .L802409EC -/* CD2870 80240A40 26100004 */ addiu $s0, $s0, 4 -/* CD2874 80240A44 8E420060 */ lw $v0, 0x60($s2) -/* CD2878 80240A48 24420001 */ addiu $v0, $v0, 1 -/* CD287C 80240A4C AE420060 */ sw $v0, 0x60($s2) -/* CD2880 80240A50 28420010 */ slti $v0, $v0, 0x10 -/* CD2884 80240A54 14400016 */ bnez $v0, .L80240AB0 -/* CD2888 80240A58 2402000F */ addiu $v0, $zero, 0xf -/* CD288C 80240A5C AE420060 */ sw $v0, 0x60($s2) -/* CD2890 80240A60 24020002 */ addiu $v0, $zero, 2 -/* CD2894 80240A64 080902AC */ j .L80240AB0 -/* CD2898 80240A68 AE420000 */ sw $v0, ($s2) -.L80240A6C: -/* CD289C 80240A6C 8E420060 */ lw $v0, 0x60($s2) -/* CD28A0 80240A70 24420001 */ addiu $v0, $v0, 1 -/* CD28A4 80240A74 AE420060 */ sw $v0, 0x60($s2) -/* CD28A8 80240A78 2842001F */ slti $v0, $v0, 0x1f -/* CD28AC 80240A7C 1440000C */ bnez $v0, .L80240AB0 -/* CD28B0 80240A80 0000882D */ daddu $s1, $zero, $zero -/* CD28B4 80240A84 0240282D */ daddu $a1, $s2, $zero -.L80240A88: -/* CD28B8 80240A88 8CA20008 */ lw $v0, 8($a1) -/* CD28BC 80240A8C 8C430000 */ lw $v1, ($v0) -/* CD28C0 80240A90 26310001 */ addiu $s1, $s1, 1 -/* CD28C4 80240A94 34630010 */ ori $v1, $v1, 0x10 -/* CD28C8 80240A98 AC430000 */ sw $v1, ($v0) -/* CD28CC 80240A9C 2A220003 */ slti $v0, $s1, 3 -/* CD28D0 80240AA0 1440FFF9 */ bnez $v0, .L80240A88 -/* CD28D4 80240AA4 24A50004 */ addiu $a1, $a1, 4 -/* CD28D8 80240AA8 080902F9 */ j .L80240BE4 -/* CD28DC 80240AAC 24020002 */ addiu $v0, $zero, 2 -.L80240AB0: -/* CD28E0 80240AB0 8E430004 */ lw $v1, 4($s2) -/* CD28E4 80240AB4 10600005 */ beqz $v1, .L80240ACC -/* CD28E8 80240AB8 24020001 */ addiu $v0, $zero, 1 -/* CD28EC 80240ABC 1062000B */ beq $v1, $v0, .L80240AEC -/* CD28F0 80240AC0 0000882D */ daddu $s1, $zero, $zero -/* CD28F4 80240AC4 080902E8 */ j .L80240BA0 -/* CD28F8 80240AC8 0240282D */ daddu $a1, $s2, $zero -.L80240ACC: -/* CD28FC 80240ACC 8E420064 */ lw $v0, 0x64($s2) -/* CD2900 80240AD0 24420001 */ addiu $v0, $v0, 1 -/* CD2904 80240AD4 AE420064 */ sw $v0, 0x64($s2) -/* CD2908 80240AD8 28420010 */ slti $v0, $v0, 0x10 -/* CD290C 80240ADC 1440002F */ bnez $v0, .L80240B9C -/* CD2910 80240AE0 0000882D */ daddu $s1, $zero, $zero -/* CD2914 80240AE4 080902E4 */ j .L80240B90 -/* CD2918 80240AE8 24020001 */ addiu $v0, $zero, 1 -.L80240AEC: -/* CD291C 80240AEC 4480A000 */ mtc1 $zero, $f20 -/* CD2920 80240AF0 24130014 */ addiu $s3, $zero, 0x14 -/* CD2924 80240AF4 0240802D */ daddu $s0, $s2, $zero -.L80240AF8: -/* CD2928 80240AF8 4405A000 */ mfc1 $a1, $f20 -/* CD292C 80240AFC AFB30010 */ sw $s3, 0x10($sp) -/* CD2930 80240B00 8E060038 */ lw $a2, 0x38($s0) -/* CD2934 80240B04 8E470064 */ lw $a3, 0x64($s2) -/* CD2938 80240B08 0C00A8ED */ jal update_lerp -/* CD293C 80240B0C 24040001 */ addiu $a0, $zero, 1 -/* CD2940 80240B10 C6020014 */ lwc1 $f2, 0x14($s0) -/* CD2944 80240B14 46001080 */ add.s $f2, $f2, $f0 -/* CD2948 80240B18 4405A000 */ mfc1 $a1, $f20 -/* CD294C 80240B1C E6020014 */ swc1 $f2, 0x14($s0) -/* CD2950 80240B20 AFB30010 */ sw $s3, 0x10($sp) -/* CD2954 80240B24 8E060044 */ lw $a2, 0x44($s0) -/* CD2958 80240B28 8E470064 */ lw $a3, 0x64($s2) -/* CD295C 80240B2C 0C00A8ED */ jal update_lerp -/* CD2960 80240B30 24040001 */ addiu $a0, $zero, 1 -/* CD2964 80240B34 C6020020 */ lwc1 $f2, 0x20($s0) -/* CD2968 80240B38 46001080 */ add.s $f2, $f2, $f0 -/* CD296C 80240B3C 4405A000 */ mfc1 $a1, $f20 -/* CD2970 80240B40 E6020020 */ swc1 $f2, 0x20($s0) -/* CD2974 80240B44 AFB30010 */ sw $s3, 0x10($sp) -/* CD2978 80240B48 8E060050 */ lw $a2, 0x50($s0) -/* CD297C 80240B4C 8E470064 */ lw $a3, 0x64($s2) -/* CD2980 80240B50 0C00A8ED */ jal update_lerp -/* CD2984 80240B54 24040001 */ addiu $a0, $zero, 1 -/* CD2988 80240B58 C602002C */ lwc1 $f2, 0x2c($s0) -/* CD298C 80240B5C 46001080 */ add.s $f2, $f2, $f0 -/* CD2990 80240B60 26310001 */ addiu $s1, $s1, 1 -/* CD2994 80240B64 2A220003 */ slti $v0, $s1, 3 -/* CD2998 80240B68 E602002C */ swc1 $f2, 0x2c($s0) -/* CD299C 80240B6C 1440FFE2 */ bnez $v0, .L80240AF8 -/* CD29A0 80240B70 26100004 */ addiu $s0, $s0, 4 -/* CD29A4 80240B74 8E420064 */ lw $v0, 0x64($s2) -/* CD29A8 80240B78 24420001 */ addiu $v0, $v0, 1 -/* CD29AC 80240B7C AE420064 */ sw $v0, 0x64($s2) -/* CD29B0 80240B80 28420015 */ slti $v0, $v0, 0x15 -/* CD29B4 80240B84 14400005 */ bnez $v0, .L80240B9C -/* CD29B8 80240B88 0000882D */ daddu $s1, $zero, $zero -/* CD29BC 80240B8C 24020002 */ addiu $v0, $zero, 2 -.L80240B90: -/* CD29C0 80240B90 AE420004 */ sw $v0, 4($s2) -/* CD29C4 80240B94 AE400064 */ sw $zero, 0x64($s2) -/* CD29C8 80240B98 0000882D */ daddu $s1, $zero, $zero -.L80240B9C: -/* CD29CC 80240B9C 0240282D */ daddu $a1, $s2, $zero -.L80240BA0: -/* CD29D0 80240BA0 8CA20008 */ lw $v0, 8($a1) -/* CD29D4 80240BA4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* CD29D8 80240BA8 8C42000C */ lw $v0, 0xc($v0) -/* CD29DC 80240BAC E4400010 */ swc1 $f0, 0x10($v0) -/* CD29E0 80240BB0 8CA20008 */ lw $v0, 8($a1) -/* CD29E4 80240BB4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* CD29E8 80240BB8 8C42000C */ lw $v0, 0xc($v0) -/* CD29EC 80240BBC 26310001 */ addiu $s1, $s1, 1 -/* CD29F0 80240BC0 E4400014 */ swc1 $f0, 0x14($v0) -/* CD29F4 80240BC4 8CA20008 */ lw $v0, 8($a1) -/* CD29F8 80240BC8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* CD29FC 80240BCC 8C42000C */ lw $v0, 0xc($v0) -/* CD2A00 80240BD0 E4400018 */ swc1 $f0, 0x18($v0) -/* CD2A04 80240BD4 2A220003 */ slti $v0, $s1, 3 -/* CD2A08 80240BD8 1440FFF1 */ bnez $v0, .L80240BA0 -/* CD2A0C 80240BDC 24A50004 */ addiu $a1, $a1, 4 -/* CD2A10 80240BE0 0000102D */ daddu $v0, $zero, $zero -.L80240BE4: -/* CD2A14 80240BE4 8FBF0044 */ lw $ra, 0x44($sp) -/* CD2A18 80240BE8 8FB60040 */ lw $s6, 0x40($sp) -/* CD2A1C 80240BEC 8FB5003C */ lw $s5, 0x3c($sp) -/* CD2A20 80240BF0 8FB40038 */ lw $s4, 0x38($sp) -/* CD2A24 80240BF4 8FB30034 */ lw $s3, 0x34($sp) -/* CD2A28 80240BF8 8FB20030 */ lw $s2, 0x30($sp) -/* CD2A2C 80240BFC 8FB1002C */ lw $s1, 0x2c($sp) -/* CD2A30 80240C00 8FB00028 */ lw $s0, 0x28($sp) -/* CD2A34 80240C04 D7B80058 */ ldc1 $f24, 0x58($sp) -/* CD2A38 80240C08 D7B60050 */ ldc1 $f22, 0x50($sp) -/* CD2A3C 80240C0C D7B40048 */ ldc1 $f20, 0x48($sp) -/* CD2A40 80240C10 03E00008 */ jr $ra -/* CD2A44 80240C14 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80240C18_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80240C18_CD1E30.s deleted file mode 100644 index 394076ea91..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80240C18_CD1E30.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C18_CD2A48 -/* CD2A48 80240C18 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD2A4C 80240C1C AFB10014 */ sw $s1, 0x14($sp) -/* CD2A50 80240C20 0080882D */ daddu $s1, $a0, $zero -/* CD2A54 80240C24 AFB20018 */ sw $s2, 0x18($sp) -/* CD2A58 80240C28 AFBF001C */ sw $ra, 0x1c($sp) -/* CD2A5C 80240C2C AFB00010 */ sw $s0, 0x10($sp) -/* CD2A60 80240C30 8E30000C */ lw $s0, 0xc($s1) -/* CD2A64 80240C34 10A00010 */ beqz $a1, .L80240C78 -/* CD2A68 80240C38 0000902D */ daddu $s2, $zero, $zero -/* CD2A6C 80240C3C 8E050000 */ lw $a1, ($s0) -/* CD2A70 80240C40 0C0B1EAF */ jal get_variable -/* CD2A74 80240C44 26100004 */ addiu $s0, $s0, 4 -/* CD2A78 80240C48 AE220084 */ sw $v0, 0x84($s1) -/* CD2A7C 80240C4C 8E050000 */ lw $a1, ($s0) -/* CD2A80 80240C50 0C0B1EAF */ jal get_variable -/* CD2A84 80240C54 0220202D */ daddu $a0, $s1, $zero -/* CD2A88 80240C58 0240202D */ daddu $a0, $s2, $zero -/* CD2A8C 80240C5C 240500D0 */ addiu $a1, $zero, 0xd0 -/* CD2A90 80240C60 00A0302D */ daddu $a2, $a1, $zero -/* CD2A94 80240C64 00A0382D */ daddu $a3, $a1, $zero -/* CD2A98 80240C68 AE220088 */ sw $v0, 0x88($s1) -/* CD2A9C 80240C6C AE200070 */ sw $zero, 0x70($s1) -/* CD2AA0 80240C70 0C04DF84 */ jal func_80137E10 -/* CD2AA4 80240C74 AE200074 */ sw $zero, 0x74($s1) -.L80240C78: -/* CD2AA8 80240C78 8E230070 */ lw $v1, 0x70($s1) -/* CD2AAC 80240C7C 24040001 */ addiu $a0, $zero, 1 -/* CD2AB0 80240C80 10640019 */ beq $v1, $a0, .L80240CE8 -/* CD2AB4 80240C84 28620002 */ slti $v0, $v1, 2 -/* CD2AB8 80240C88 10400005 */ beqz $v0, .L80240CA0 -/* CD2ABC 80240C8C 24020002 */ addiu $v0, $zero, 2 -/* CD2AC0 80240C90 10600007 */ beqz $v1, .L80240CB0 -/* CD2AC4 80240C94 240500FF */ addiu $a1, $zero, 0xff -/* CD2AC8 80240C98 0809034A */ j .L80240D28 -/* CD2ACC 80240C9C 00000000 */ nop -.L80240CA0: -/* CD2AD0 80240CA0 10620019 */ beq $v1, $v0, .L80240D08 -/* CD2AD4 80240CA4 00000000 */ nop -/* CD2AD8 80240CA8 0809034A */ j .L80240D28 -/* CD2ADC 80240CAC 00000000 */ nop -.L80240CB0: -/* CD2AE0 80240CB0 8E220074 */ lw $v0, 0x74($s1) -/* CD2AE4 80240CB4 14450004 */ bne $v0, $a1, .L80240CC8 -/* CD2AE8 80240CB8 00000000 */ nop -/* CD2AEC 80240CBC AE240070 */ sw $a0, 0x70($s1) -/* CD2AF0 80240CC0 AE200078 */ sw $zero, 0x78($s1) -/* CD2AF4 80240CC4 8E220074 */ lw $v0, 0x74($s1) -.L80240CC8: -/* CD2AF8 80240CC8 8E230084 */ lw $v1, 0x84($s1) -/* CD2AFC 80240CCC 00431021 */ addu $v0, $v0, $v1 -/* CD2B00 80240CD0 AE220074 */ sw $v0, 0x74($s1) -/* CD2B04 80240CD4 28420100 */ slti $v0, $v0, 0x100 -/* CD2B08 80240CD8 50400013 */ beql $v0, $zero, .L80240D28 -/* CD2B0C 80240CDC AE250074 */ sw $a1, 0x74($s1) -/* CD2B10 80240CE0 0809034A */ j .L80240D28 -/* CD2B14 80240CE4 00000000 */ nop -.L80240CE8: -/* CD2B18 80240CE8 8E220078 */ lw $v0, 0x78($s1) -/* CD2B1C 80240CEC 24420001 */ addiu $v0, $v0, 1 -/* CD2B20 80240CF0 AE220078 */ sw $v0, 0x78($s1) -/* CD2B24 80240CF4 28420002 */ slti $v0, $v0, 2 -/* CD2B28 80240CF8 1440000B */ bnez $v0, .L80240D28 -/* CD2B2C 80240CFC 24020002 */ addiu $v0, $zero, 2 -/* CD2B30 80240D00 0809034A */ j .L80240D28 -/* CD2B34 80240D04 AE220070 */ sw $v0, 0x70($s1) -.L80240D08: -/* CD2B38 80240D08 8E230074 */ lw $v1, 0x74($s1) -/* CD2B3C 80240D0C 50600001 */ beql $v1, $zero, .L80240D14 -/* CD2B40 80240D10 24120001 */ addiu $s2, $zero, 1 -.L80240D14: -/* CD2B44 80240D14 8E220088 */ lw $v0, 0x88($s1) -/* CD2B48 80240D18 00621023 */ subu $v0, $v1, $v0 -/* CD2B4C 80240D1C 04410002 */ bgez $v0, .L80240D28 -/* CD2B50 80240D20 AE220074 */ sw $v0, 0x74($s1) -/* CD2B54 80240D24 AE200074 */ sw $zero, 0x74($s1) -.L80240D28: -/* CD2B58 80240D28 C6200074 */ lwc1 $f0, 0x74($s1) -/* CD2B5C 80240D2C 46800020 */ cvt.s.w $f0, $f0 -/* CD2B60 80240D30 44050000 */ mfc1 $a1, $f0 -/* CD2B64 80240D34 0C04DF62 */ jal func_80137D88 -/* CD2B68 80240D38 24040001 */ addiu $a0, $zero, 1 -/* CD2B6C 80240D3C 0240102D */ daddu $v0, $s2, $zero -/* CD2B70 80240D40 8FBF001C */ lw $ra, 0x1c($sp) -/* CD2B74 80240D44 8FB20018 */ lw $s2, 0x18($sp) -/* CD2B78 80240D48 8FB10014 */ lw $s1, 0x14($sp) -/* CD2B7C 80240D4C 8FB00010 */ lw $s0, 0x10($sp) -/* CD2B80 80240D50 03E00008 */ jr $ra -/* CD2B84 80240D54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80240DA0_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80240DA0_CD1E30.s deleted file mode 100644 index 6423b74d60..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80240DA0_CD1E30.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DA0_CD2BD0 -/* CD2BD0 80240DA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD2BD4 80240DA4 AFBF0018 */ sw $ra, 0x18($sp) -/* CD2BD8 80240DA8 0C00EAD2 */ jal get_npc_safe -/* CD2BDC 80240DAC 2404FFFC */ addiu $a0, $zero, -4 -/* CD2BE0 80240DB0 3C0141F0 */ lui $at, 0x41f0 -/* CD2BE4 80240DB4 44810000 */ mtc1 $at, $f0 -/* CD2BE8 80240DB8 C442003C */ lwc1 $f2, 0x3c($v0) -/* CD2BEC 80240DBC 46001080 */ add.s $f2, $f2, $f0 -/* CD2BF0 80240DC0 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD2BF4 80240DC4 8C450038 */ lw $a1, 0x38($v0) -/* CD2BF8 80240DC8 8C470040 */ lw $a3, 0x40($v0) -/* CD2BFC 80240DCC 44061000 */ mfc1 $a2, $f2 -/* CD2C00 80240DD0 0C01BFBC */ jal func_8006FEF0 -/* CD2C04 80240DD4 24040004 */ addiu $a0, $zero, 4 -/* CD2C08 80240DD8 8FBF0018 */ lw $ra, 0x18($sp) -/* CD2C0C 80240DDC 24020002 */ addiu $v0, $zero, 2 -/* CD2C10 80240DE0 03E00008 */ jr $ra -/* CD2C14 80240DE4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80240DE8_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80240DE8_CD1E30.s deleted file mode 100644 index c836f59423..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80240DE8_CD1E30.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DE8_CD2C18 -/* CD2C18 80240DE8 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* CD2C1C 80240DEC 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* CD2C20 80240DF0 AC800084 */ sw $zero, 0x84($a0) -/* CD2C24 80240DF4 80620000 */ lb $v0, ($v1) -/* CD2C28 80240DF8 10400005 */ beqz $v0, .L80240E10 -/* CD2C2C 80240DFC 24020003 */ addiu $v0, $zero, 3 -/* CD2C30 80240E00 80630003 */ lb $v1, 3($v1) -/* CD2C34 80240E04 14620002 */ bne $v1, $v0, .L80240E10 -/* CD2C38 80240E08 24020001 */ addiu $v0, $zero, 1 -/* CD2C3C 80240E0C AC820084 */ sw $v0, 0x84($a0) -.L80240E10: -/* CD2C40 80240E10 03E00008 */ jr $ra -/* CD2C44 80240E14 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80240E18_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80240E18_CD1E30.s deleted file mode 100644 index ce539dd5a3..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80240E18_CD1E30.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E18_CD2C48 -/* CD2C48 80240E18 AC800084 */ sw $zero, 0x84($a0) -/* CD2C4C 80240E1C 3C038011 */ lui $v1, %hi(gPlayerActionState) -/* CD2C50 80240E20 8063F07C */ lb $v1, %lo(gPlayerActionState)($v1) -/* CD2C54 80240E24 2402000E */ addiu $v0, $zero, 0xe -/* CD2C58 80240E28 10620004 */ beq $v1, $v0, .L80240E3C -/* CD2C5C 80240E2C 24020001 */ addiu $v0, $zero, 1 -/* CD2C60 80240E30 24020010 */ addiu $v0, $zero, 0x10 -/* CD2C64 80240E34 14620002 */ bne $v1, $v0, .L80240E40 -/* CD2C68 80240E38 24020001 */ addiu $v0, $zero, 1 -.L80240E3C: -/* CD2C6C 80240E3C AC820084 */ sw $v0, 0x84($a0) -.L80240E40: -/* CD2C70 80240E40 03E00008 */ jr $ra -/* CD2C74 80240E44 24020002 */ addiu $v0, $zero, 2 -/* CD2C78 80240E48 00000000 */ nop -/* CD2C7C 80240E4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80240E50_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80240E50_CD1E30.s deleted file mode 100644 index 0297271238..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80240E50_CD1E30.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E50_CD2C80 -/* CD2C80 80240E50 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CD2C84 80240E54 AFB3002C */ sw $s3, 0x2c($sp) -/* CD2C88 80240E58 0080982D */ daddu $s3, $a0, $zero -/* CD2C8C 80240E5C AFBF0030 */ sw $ra, 0x30($sp) -/* CD2C90 80240E60 AFB20028 */ sw $s2, 0x28($sp) -/* CD2C94 80240E64 AFB10024 */ sw $s1, 0x24($sp) -/* CD2C98 80240E68 AFB00020 */ sw $s0, 0x20($sp) -/* CD2C9C 80240E6C 8E710148 */ lw $s1, 0x148($s3) -/* CD2CA0 80240E70 86240008 */ lh $a0, 8($s1) -/* CD2CA4 80240E74 0C00EABB */ jal get_npc_unsafe -/* CD2CA8 80240E78 00A0902D */ daddu $s2, $a1, $zero -/* CD2CAC 80240E7C 8E440004 */ lw $a0, 4($s2) -/* CD2CB0 80240E80 0040802D */ daddu $s0, $v0, $zero -/* CD2CB4 80240E84 00041FC2 */ srl $v1, $a0, 0x1f -/* CD2CB8 80240E88 00832021 */ addu $a0, $a0, $v1 -/* CD2CBC 80240E8C 00042043 */ sra $a0, $a0, 1 -/* CD2CC0 80240E90 0C00A67F */ jal rand_int -/* CD2CC4 80240E94 24840001 */ addiu $a0, $a0, 1 -/* CD2CC8 80240E98 8E430004 */ lw $v1, 4($s2) -/* CD2CCC 80240E9C 000327C2 */ srl $a0, $v1, 0x1f -/* CD2CD0 80240EA0 00641821 */ addu $v1, $v1, $a0 -/* CD2CD4 80240EA4 00031843 */ sra $v1, $v1, 1 -/* CD2CD8 80240EA8 00621821 */ addu $v1, $v1, $v0 -/* CD2CDC 80240EAC A603008E */ sh $v1, 0x8e($s0) -/* CD2CE0 80240EB0 8E2300D0 */ lw $v1, 0xd0($s1) -/* CD2CE4 80240EB4 C6000040 */ lwc1 $f0, 0x40($s0) -/* CD2CE8 80240EB8 C4640000 */ lwc1 $f4, ($v1) -/* CD2CEC 80240EBC 46802120 */ cvt.s.w $f4, $f4 -/* CD2CF0 80240EC0 C4620008 */ lwc1 $f2, 8($v1) -/* CD2CF4 80240EC4 468010A0 */ cvt.s.w $f2, $f2 -/* CD2CF8 80240EC8 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD2CFC 80240ECC 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD2D00 80240ED0 44061000 */ mfc1 $a2, $f2 -/* CD2D04 80240ED4 C440000C */ lwc1 $f0, 0xc($v0) -/* CD2D08 80240ED8 46800020 */ cvt.s.w $f0, $f0 -/* CD2D0C 80240EDC E7A00014 */ swc1 $f0, 0x14($sp) -/* CD2D10 80240EE0 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD2D14 80240EE4 44052000 */ mfc1 $a1, $f4 -/* CD2D18 80240EE8 C4400010 */ lwc1 $f0, 0x10($v0) -/* CD2D1C 80240EEC 46800020 */ cvt.s.w $f0, $f0 -/* CD2D20 80240EF0 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD2D24 80240EF4 8C640018 */ lw $a0, 0x18($v1) -/* CD2D28 80240EF8 0C0123F5 */ jal is_point_within_region -/* CD2D2C 80240EFC 8E070038 */ lw $a3, 0x38($s0) -/* CD2D30 80240F00 1040000E */ beqz $v0, .L80240F3C -/* CD2D34 80240F04 00000000 */ nop -/* CD2D38 80240F08 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD2D3C 80240F0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* CD2D40 80240F10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CD2D44 80240F14 C4460000 */ lwc1 $f6, ($v0) -/* CD2D48 80240F18 468031A0 */ cvt.s.w $f6, $f6 -/* CD2D4C 80240F1C 44063000 */ mfc1 $a2, $f6 -/* CD2D50 80240F20 C4460008 */ lwc1 $f6, 8($v0) -/* CD2D54 80240F24 468031A0 */ cvt.s.w $f6, $f6 -/* CD2D58 80240F28 44073000 */ mfc1 $a3, $f6 -/* CD2D5C 80240F2C 0C00A720 */ jal atan2 -/* CD2D60 80240F30 00000000 */ nop -/* CD2D64 80240F34 080903DB */ j .L80240F6C -/* CD2D68 80240F38 E600000C */ swc1 $f0, 0xc($s0) -.L80240F3C: -/* CD2D6C 80240F3C 0C00A67F */ jal rand_int -/* CD2D70 80240F40 2404003C */ addiu $a0, $zero, 0x3c -/* CD2D74 80240F44 C60C000C */ lwc1 $f12, 0xc($s0) -/* CD2D78 80240F48 44820000 */ mtc1 $v0, $f0 -/* CD2D7C 80240F4C 00000000 */ nop -/* CD2D80 80240F50 46800020 */ cvt.s.w $f0, $f0 -/* CD2D84 80240F54 46006300 */ add.s $f12, $f12, $f0 -/* CD2D88 80240F58 3C0141F0 */ lui $at, 0x41f0 -/* CD2D8C 80240F5C 44810000 */ mtc1 $at, $f0 -/* CD2D90 80240F60 0C00A6C9 */ jal clamp_angle -/* CD2D94 80240F64 46006301 */ sub.s $f12, $f12, $f0 -/* CD2D98 80240F68 E600000C */ swc1 $f0, 0xc($s0) -.L80240F6C: -/* CD2D9C 80240F6C 8E2200CC */ lw $v0, 0xcc($s1) -/* CD2DA0 80240F70 8C420004 */ lw $v0, 4($v0) -/* CD2DA4 80240F74 AE020028 */ sw $v0, 0x28($s0) -/* CD2DA8 80240F78 AE600074 */ sw $zero, 0x74($s3) -/* CD2DAC 80240F7C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD2DB0 80240F80 8C420014 */ lw $v0, 0x14($v0) -/* CD2DB4 80240F84 04410004 */ bgez $v0, .L80240F98 -/* CD2DB8 80240F88 00000000 */ nop -/* CD2DBC 80240F8C C6400000 */ lwc1 $f0, ($s2) -/* CD2DC0 80240F90 080903EE */ j .L80240FB8 -/* CD2DC4 80240F94 E6000018 */ swc1 $f0, 0x18($s0) -.L80240F98: -/* CD2DC8 80240F98 3C018024 */ lui $at, 0x8024 -/* CD2DCC 80240F9C D42253F0 */ ldc1 $f2, 0x53f0($at) -/* CD2DD0 80240FA0 44820000 */ mtc1 $v0, $f0 -/* CD2DD4 80240FA4 00000000 */ nop -/* CD2DD8 80240FA8 46800021 */ cvt.d.w $f0, $f0 -/* CD2DDC 80240FAC 46220003 */ div.d $f0, $f0, $f2 -/* CD2DE0 80240FB0 46200020 */ cvt.s.d $f0, $f0 -/* CD2DE4 80240FB4 E6000018 */ swc1 $f0, 0x18($s0) -.L80240FB8: -/* CD2DE8 80240FB8 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD2DEC 80240FBC 3C014059 */ lui $at, 0x4059 -/* CD2DF0 80240FC0 44811800 */ mtc1 $at, $f3 -/* CD2DF4 80240FC4 44801000 */ mtc1 $zero, $f2 -/* CD2DF8 80240FC8 46000021 */ cvt.d.s $f0, $f0 -/* CD2DFC 80240FCC 46220002 */ mul.d $f0, $f0, $f2 -/* CD2E00 80240FD0 00000000 */ nop -/* CD2E04 80240FD4 24020001 */ addiu $v0, $zero, 1 -/* CD2E08 80240FD8 4620018D */ trunc.w.d $f6, $f0 -/* CD2E0C 80240FDC E626007C */ swc1 $f6, 0x7c($s1) -/* CD2E10 80240FE0 AE620070 */ sw $v0, 0x70($s3) -/* CD2E14 80240FE4 8FBF0030 */ lw $ra, 0x30($sp) -/* CD2E18 80240FE8 8FB3002C */ lw $s3, 0x2c($sp) -/* CD2E1C 80240FEC 8FB20028 */ lw $s2, 0x28($sp) -/* CD2E20 80240FF0 8FB10024 */ lw $s1, 0x24($sp) -/* CD2E24 80240FF4 8FB00020 */ lw $s0, 0x20($sp) -/* CD2E28 80240FF8 03E00008 */ jr $ra -/* CD2E2C 80240FFC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80241000_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80241000_CD1E30.s deleted file mode 100644 index 11861f2409..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80241000_CD1E30.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241000_CD2E30 -/* CD2E30 80241000 27BDFF80 */ addiu $sp, $sp, -0x80 -/* CD2E34 80241004 AFB3004C */ sw $s3, 0x4c($sp) -/* CD2E38 80241008 0080982D */ daddu $s3, $a0, $zero -/* CD2E3C 8024100C AFBF0058 */ sw $ra, 0x58($sp) -/* CD2E40 80241010 AFB50054 */ sw $s5, 0x54($sp) -/* CD2E44 80241014 AFB40050 */ sw $s4, 0x50($sp) -/* CD2E48 80241018 AFB20048 */ sw $s2, 0x48($sp) -/* CD2E4C 8024101C AFB10044 */ sw $s1, 0x44($sp) -/* CD2E50 80241020 AFB00040 */ sw $s0, 0x40($sp) -/* CD2E54 80241024 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CD2E58 80241028 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CD2E5C 8024102C F7B60068 */ sdc1 $f22, 0x68($sp) -/* CD2E60 80241030 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CD2E64 80241034 8E710148 */ lw $s1, 0x148($s3) -/* CD2E68 80241038 00A0902D */ daddu $s2, $a1, $zero -/* CD2E6C 8024103C 86240008 */ lh $a0, 8($s1) -/* CD2E70 80241040 0C00EABB */ jal get_npc_unsafe -/* CD2E74 80241044 00C0A82D */ daddu $s5, $a2, $zero -/* CD2E78 80241048 0040802D */ daddu $s0, $v0, $zero -/* CD2E7C 8024104C 0000A02D */ daddu $s4, $zero, $zero -/* CD2E80 80241050 C624007C */ lwc1 $f4, 0x7c($s1) -/* CD2E84 80241054 46802120 */ cvt.s.w $f4, $f4 -/* CD2E88 80241058 C6220088 */ lwc1 $f2, 0x88($s1) -/* CD2E8C 8024105C 468010A0 */ cvt.s.w $f2, $f2 -/* CD2E90 80241060 460010A1 */ cvt.d.s $f2, $f2 -/* CD2E94 80241064 46002121 */ cvt.d.s $f4, $f4 -/* CD2E98 80241068 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD2E9C 8024106C 3C014059 */ lui $at, 0x4059 -/* CD2EA0 80241070 44813800 */ mtc1 $at, $f7 -/* CD2EA4 80241074 44803000 */ mtc1 $zero, $f6 -/* CD2EA8 80241078 46000021 */ cvt.d.s $f0, $f0 -/* CD2EAC 8024107C 46260002 */ mul.d $f0, $f0, $f6 -/* CD2EB0 80241080 00000000 */ nop -/* CD2EB4 80241084 24020001 */ addiu $v0, $zero, 1 -/* CD2EB8 80241088 8E24006C */ lw $a0, 0x6c($s1) -/* CD2EBC 8024108C 46261083 */ div.d $f2, $f2, $f6 -/* CD2EC0 80241090 462010A0 */ cvt.s.d $f2, $f2 -/* CD2EC4 80241094 46262103 */ div.d $f4, $f4, $f6 -/* CD2EC8 80241098 46202520 */ cvt.s.d $f20, $f4 -/* CD2ECC 8024109C 30830011 */ andi $v1, $a0, 0x11 -/* CD2ED0 802410A0 4620020D */ trunc.w.d $f8, $f0 -/* CD2ED4 802410A4 E628007C */ swc1 $f8, 0x7c($s1) -/* CD2ED8 802410A8 C6200078 */ lwc1 $f0, 0x78($s1) -/* CD2EDC 802410AC 46800020 */ cvt.s.w $f0, $f0 -/* CD2EE0 802410B0 46000021 */ cvt.d.s $f0, $f0 -/* CD2EE4 802410B4 46260003 */ div.d $f0, $f0, $f6 -/* CD2EE8 802410B8 462006A0 */ cvt.s.d $f26, $f0 -/* CD2EEC 802410BC C6200070 */ lwc1 $f0, 0x70($s1) -/* CD2EF0 802410C0 46800020 */ cvt.s.w $f0, $f0 -/* CD2EF4 802410C4 46000021 */ cvt.d.s $f0, $f0 -/* CD2EF8 802410C8 46260003 */ div.d $f0, $f0, $f6 -/* CD2EFC 802410CC 462005A0 */ cvt.s.d $f22, $f0 -/* CD2F00 802410D0 14620025 */ bne $v1, $v0, .L80241168 -/* CD2F04 802410D4 4602D600 */ add.s $f24, $f26, $f2 -/* CD2F08 802410D8 8E020000 */ lw $v0, ($s0) -/* CD2F0C 802410DC 30420008 */ andi $v0, $v0, 8 -/* CD2F10 802410E0 10400009 */ beqz $v0, .L80241108 -/* CD2F14 802410E4 27A50028 */ addiu $a1, $sp, 0x28 -/* CD2F18 802410E8 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD2F1C 802410EC 4600C001 */ sub.s $f0, $f24, $f0 -/* CD2F20 802410F0 4600B03C */ c.lt.s $f22, $f0 -/* CD2F24 802410F4 00000000 */ nop -/* CD2F28 802410F8 4500001B */ bc1f .L80241168 -/* CD2F2C 802410FC 34820010 */ ori $v0, $a0, 0x10 -/* CD2F30 80241100 0809045A */ j .L80241168 -/* CD2F34 80241104 AE22006C */ sw $v0, 0x6c($s1) -.L80241108: -/* CD2F38 80241108 27A6002C */ addiu $a2, $sp, 0x2c -/* CD2F3C 8024110C C6000038 */ lwc1 $f0, 0x38($s0) -/* CD2F40 80241110 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD2F44 80241114 C6040040 */ lwc1 $f4, 0x40($s0) -/* CD2F48 80241118 3C01447A */ lui $at, 0x447a -/* CD2F4C 8024111C 44813000 */ mtc1 $at, $f6 -/* CD2F50 80241120 27A20034 */ addiu $v0, $sp, 0x34 -/* CD2F54 80241124 E7A00028 */ swc1 $f0, 0x28($sp) -/* CD2F58 80241128 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CD2F5C 8024112C E7A40030 */ swc1 $f4, 0x30($sp) -/* CD2F60 80241130 E7A60034 */ swc1 $f6, 0x34($sp) -/* CD2F64 80241134 AFA20010 */ sw $v0, 0x10($sp) -/* CD2F68 80241138 8E040080 */ lw $a0, 0x80($s0) -/* CD2F6C 8024113C 0C0372DF */ jal func_800DCB7C -/* CD2F70 80241140 27A70030 */ addiu $a3, $sp, 0x30 -/* CD2F74 80241144 C7A00034 */ lwc1 $f0, 0x34($sp) -/* CD2F78 80241148 4600D001 */ sub.s $f0, $f26, $f0 -/* CD2F7C 8024114C 4600B03C */ c.lt.s $f22, $f0 -/* CD2F80 80241150 00000000 */ nop -/* CD2F84 80241154 45000004 */ bc1f .L80241168 -/* CD2F88 80241158 00000000 */ nop -/* CD2F8C 8024115C 8E22006C */ lw $v0, 0x6c($s1) -/* CD2F90 80241160 34420010 */ ori $v0, $v0, 0x10 -/* CD2F94 80241164 AE22006C */ sw $v0, 0x6c($s1) -.L80241168: -/* CD2F98 80241168 8E22006C */ lw $v0, 0x6c($s1) -/* CD2F9C 8024116C 24030011 */ addiu $v1, $zero, 0x11 -/* CD2FA0 80241170 30420011 */ andi $v0, $v0, 0x11 -/* CD2FA4 80241174 14430039 */ bne $v0, $v1, .L8024125C -/* CD2FA8 80241178 00000000 */ nop -/* CD2FAC 8024117C 8E020000 */ lw $v0, ($s0) -/* CD2FB0 80241180 30420008 */ andi $v0, $v0, 8 -/* CD2FB4 80241184 1040000A */ beqz $v0, .L802411B0 -/* CD2FB8 80241188 4600C106 */ mov.s $f4, $f24 -/* CD2FBC 8024118C 4614C081 */ sub.s $f2, $f24, $f20 -/* CD2FC0 80241190 3C018024 */ lui $at, 0x8024 -/* CD2FC4 80241194 D42053F8 */ ldc1 $f0, 0x53f8($at) -/* CD2FC8 80241198 460010A1 */ cvt.d.s $f2, $f2 -/* CD2FCC 8024119C 46201082 */ mul.d $f2, $f2, $f0 -/* CD2FD0 802411A0 00000000 */ nop -/* CD2FD4 802411A4 4600A021 */ cvt.d.s $f0, $f20 -/* CD2FD8 802411A8 08090485 */ j .L80241214 -/* CD2FDC 802411AC 46220000 */ add.d $f0, $f0, $f2 -.L802411B0: -/* CD2FE0 802411B0 27A50028 */ addiu $a1, $sp, 0x28 -/* CD2FE4 802411B4 27A6002C */ addiu $a2, $sp, 0x2c -/* CD2FE8 802411B8 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD2FEC 802411BC C6020040 */ lwc1 $f2, 0x40($s0) -/* CD2FF0 802411C0 3C01447A */ lui $at, 0x447a -/* CD2FF4 802411C4 44812000 */ mtc1 $at, $f4 -/* CD2FF8 802411C8 27A20034 */ addiu $v0, $sp, 0x34 -/* CD2FFC 802411CC E7B4002C */ swc1 $f20, 0x2c($sp) -/* CD3000 802411D0 E7A00028 */ swc1 $f0, 0x28($sp) -/* CD3004 802411D4 E7A20030 */ swc1 $f2, 0x30($sp) -/* CD3008 802411D8 E7A40034 */ swc1 $f4, 0x34($sp) -/* CD300C 802411DC AFA20010 */ sw $v0, 0x10($sp) -/* CD3010 802411E0 8E040080 */ lw $a0, 0x80($s0) -/* CD3014 802411E4 0C0372DF */ jal func_800DCB7C -/* CD3018 802411E8 27A70030 */ addiu $a3, $sp, 0x30 -/* CD301C 802411EC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* CD3020 802411F0 461A2100 */ add.s $f4, $f4, $f26 -/* CD3024 802411F4 46142081 */ sub.s $f2, $f4, $f20 -/* CD3028 802411F8 3C018024 */ lui $at, 0x8024 -/* CD302C 802411FC D4205400 */ ldc1 $f0, 0x5400($at) -/* CD3030 80241200 460010A1 */ cvt.d.s $f2, $f2 -/* CD3034 80241204 46201082 */ mul.d $f2, $f2, $f0 -/* CD3038 80241208 00000000 */ nop -/* CD303C 8024120C 4600A021 */ cvt.d.s $f0, $f20 -/* CD3040 80241210 46220000 */ add.d $f0, $f0, $f2 -.L80241214: -/* CD3044 80241214 46200020 */ cvt.s.d $f0, $f0 -/* CD3048 80241218 E600003C */ swc1 $f0, 0x3c($s0) -/* CD304C 8024121C C600003C */ lwc1 $f0, 0x3c($s0) -/* CD3050 80241220 46002001 */ sub.s $f0, $f4, $f0 -/* CD3054 80241224 3C013FF0 */ lui $at, 0x3ff0 -/* CD3058 80241228 44811800 */ mtc1 $at, $f3 -/* CD305C 8024122C 44801000 */ mtc1 $zero, $f2 -/* CD3060 80241230 46000005 */ abs.s $f0, $f0 -/* CD3064 80241234 46000021 */ cvt.d.s $f0, $f0 -/* CD3068 80241238 4622003C */ c.lt.d $f0, $f2 -/* CD306C 8024123C 00000000 */ nop -/* CD3070 80241240 45000036 */ bc1f .L8024131C -/* CD3074 80241244 2403FFEF */ addiu $v1, $zero, -0x11 -/* CD3078 80241248 E604003C */ swc1 $f4, 0x3c($s0) -/* CD307C 8024124C 8E22006C */ lw $v0, 0x6c($s1) -/* CD3080 80241250 00431024 */ and $v0, $v0, $v1 -/* CD3084 80241254 080904C7 */ j .L8024131C -/* CD3088 80241258 AE22006C */ sw $v0, 0x6c($s1) -.L8024125C: -/* CD308C 8024125C 8E220070 */ lw $v0, 0x70($s1) -/* CD3090 80241260 1840002E */ blez $v0, .L8024131C -/* CD3094 80241264 00000000 */ nop -/* CD3098 80241268 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CD309C 8024126C 0C00A8BB */ jal sin_deg -/* CD30A0 80241270 46806320 */ cvt.s.w $f12, $f12 -/* CD30A4 80241274 8E020000 */ lw $v0, ($s0) -/* CD30A8 80241278 30420008 */ andi $v0, $v0, 8 -/* CD30AC 8024127C 10400003 */ beqz $v0, .L8024128C -/* CD30B0 80241280 46000506 */ mov.s $f20, $f0 -/* CD30B4 80241284 080904B3 */ j .L802412CC -/* CD30B8 80241288 0000102D */ daddu $v0, $zero, $zero -.L8024128C: -/* CD30BC 8024128C 27A50028 */ addiu $a1, $sp, 0x28 -/* CD30C0 80241290 27A6002C */ addiu $a2, $sp, 0x2c -/* CD30C4 80241294 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD30C8 80241298 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD30CC 8024129C C6040040 */ lwc1 $f4, 0x40($s0) -/* CD30D0 802412A0 3C01447A */ lui $at, 0x447a -/* CD30D4 802412A4 44813000 */ mtc1 $at, $f6 -/* CD30D8 802412A8 27A20034 */ addiu $v0, $sp, 0x34 -/* CD30DC 802412AC E7A00028 */ swc1 $f0, 0x28($sp) -/* CD30E0 802412B0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CD30E4 802412B4 E7A40030 */ swc1 $f4, 0x30($sp) -/* CD30E8 802412B8 E7A60034 */ swc1 $f6, 0x34($sp) -/* CD30EC 802412BC AFA20010 */ sw $v0, 0x10($sp) -/* CD30F0 802412C0 8E040080 */ lw $a0, 0x80($s0) -/* CD30F4 802412C4 0C0372DF */ jal func_800DCB7C -/* CD30F8 802412C8 27A70030 */ addiu $a3, $sp, 0x30 -.L802412CC: -/* CD30FC 802412CC 10400007 */ beqz $v0, .L802412EC -/* CD3100 802412D0 00000000 */ nop -/* CD3104 802412D4 4616A082 */ mul.s $f2, $f20, $f22 -/* CD3108 802412D8 00000000 */ nop -/* CD310C 802412DC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CD3110 802412E0 461A0000 */ add.s $f0, $f0, $f26 -/* CD3114 802412E4 080904BE */ j .L802412F8 -/* CD3118 802412E8 46020000 */ add.s $f0, $f0, $f2 -.L802412EC: -/* CD311C 802412EC 4616A002 */ mul.s $f0, $f20, $f22 -/* CD3120 802412F0 00000000 */ nop -/* CD3124 802412F4 4600C000 */ add.s $f0, $f24, $f0 -.L802412F8: -/* CD3128 802412F8 E600003C */ swc1 $f0, 0x3c($s0) -/* CD312C 802412FC 8E220074 */ lw $v0, 0x74($s1) -/* CD3130 80241300 2442000A */ addiu $v0, $v0, 0xa -/* CD3134 80241304 44826000 */ mtc1 $v0, $f12 -/* CD3138 80241308 00000000 */ nop -/* CD313C 8024130C 0C00A6C9 */ jal clamp_angle -/* CD3140 80241310 46806320 */ cvt.s.w $f12, $f12 -/* CD3144 80241314 4600020D */ trunc.w.s $f8, $f0 -/* CD3148 80241318 E6280074 */ swc1 $f8, 0x74($s1) -.L8024131C: -/* CD314C 8024131C 8E220090 */ lw $v0, 0x90($s1) -/* CD3150 80241320 1C40004A */ bgtz $v0, .L8024144C -/* CD3154 80241324 2442FFFF */ addiu $v0, $v0, -1 -/* CD3158 80241328 8E430014 */ lw $v1, 0x14($s2) -/* CD315C 8024132C 04600048 */ bltz $v1, .L80241450 -/* CD3160 80241330 00000000 */ nop -/* CD3164 80241334 8E620074 */ lw $v0, 0x74($s3) -/* CD3168 80241338 1C400042 */ bgtz $v0, .L80241444 -/* CD316C 8024133C 2442FFFF */ addiu $v0, $v0, -1 -/* CD3170 80241340 AE630074 */ sw $v1, 0x74($s3) -/* CD3174 80241344 860200A8 */ lh $v0, 0xa8($s0) -/* CD3178 80241348 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD317C 8024134C 44820000 */ mtc1 $v0, $f0 -/* CD3180 80241350 00000000 */ nop -/* CD3184 80241354 46800020 */ cvt.s.w $f0, $f0 -/* CD3188 80241358 46001080 */ add.s $f2, $f2, $f0 -/* CD318C 8024135C 3C014024 */ lui $at, 0x4024 -/* CD3190 80241360 44810800 */ mtc1 $at, $f1 -/* CD3194 80241364 44800000 */ mtc1 $zero, $f0 -/* CD3198 80241368 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD319C 8024136C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD31A0 80241370 460010A1 */ cvt.d.s $f2, $f2 -/* CD31A4 80241374 46201080 */ add.d $f2, $f2, $f0 -/* CD31A8 80241378 C440002C */ lwc1 $f0, 0x2c($v0) -/* CD31AC 8024137C 46000021 */ cvt.d.s $f0, $f0 -/* CD31B0 80241380 4622003C */ c.lt.d $f0, $f2 -/* CD31B4 80241384 00000000 */ nop -/* CD31B8 80241388 4500002C */ bc1f .L8024143C -/* CD31BC 8024138C 02A0202D */ daddu $a0, $s5, $zero -/* CD31C0 80241390 AFA00010 */ sw $zero, 0x10($sp) -/* CD31C4 80241394 8E46000C */ lw $a2, 0xc($s2) -/* CD31C8 80241398 8E470010 */ lw $a3, 0x10($s2) -/* CD31CC 8024139C 0C01242D */ jal func_800490B4 -/* CD31D0 802413A0 0220282D */ daddu $a1, $s1, $zero -/* CD31D4 802413A4 10400025 */ beqz $v0, .L8024143C -/* CD31D8 802413A8 0000202D */ daddu $a0, $zero, $zero -/* CD31DC 802413AC 0200282D */ daddu $a1, $s0, $zero -/* CD31E0 802413B0 0000302D */ daddu $a2, $zero, $zero -/* CD31E4 802413B4 2412000C */ addiu $s2, $zero, 0xc -/* CD31E8 802413B8 860300A8 */ lh $v1, 0xa8($s0) -/* CD31EC 802413BC 3C013F80 */ lui $at, 0x3f80 -/* CD31F0 802413C0 44810000 */ mtc1 $at, $f0 -/* CD31F4 802413C4 3C014000 */ lui $at, 0x4000 -/* CD31F8 802413C8 44811000 */ mtc1 $at, $f2 -/* CD31FC 802413CC 3C01C1A0 */ lui $at, 0xc1a0 -/* CD3200 802413D0 44812000 */ mtc1 $at, $f4 -/* CD3204 802413D4 44834000 */ mtc1 $v1, $f8 -/* CD3208 802413D8 00000000 */ nop -/* CD320C 802413DC 46804220 */ cvt.s.w $f8, $f8 -/* CD3210 802413E0 44074000 */ mfc1 $a3, $f8 -/* CD3214 802413E4 27A20038 */ addiu $v0, $sp, 0x38 -/* CD3218 802413E8 AFB2001C */ sw $s2, 0x1c($sp) -/* CD321C 802413EC AFA20020 */ sw $v0, 0x20($sp) -/* CD3220 802413F0 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD3224 802413F4 E7A20014 */ swc1 $f2, 0x14($sp) -/* CD3228 802413F8 0C01BFA4 */ jal fx_emote -/* CD322C 802413FC E7A40018 */ swc1 $f4, 0x18($sp) -/* CD3230 80241400 0200202D */ daddu $a0, $s0, $zero -/* CD3234 80241404 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CD3238 80241408 C480003C */ lwc1 $f0, 0x3c($a0) -/* CD323C 8024140C 3C060020 */ lui $a2, 0x20 -/* CD3240 80241410 0C012530 */ jal func_800494C0 -/* CD3244 80241414 E4800064 */ swc1 $f0, 0x64($a0) -/* CD3248 80241418 8E220018 */ lw $v0, 0x18($s1) -/* CD324C 8024141C 9442002A */ lhu $v0, 0x2a($v0) -/* CD3250 80241420 30420001 */ andi $v0, $v0, 1 -/* CD3254 80241424 10400003 */ beqz $v0, .L80241434 -/* CD3258 80241428 2402000A */ addiu $v0, $zero, 0xa -/* CD325C 8024142C 0809057D */ j .L802415F4 -/* CD3260 80241430 AE620070 */ sw $v0, 0x70($s3) -.L80241434: -/* CD3264 80241434 0809057D */ j .L802415F4 -/* CD3268 80241438 AE720070 */ sw $s2, 0x70($s3) -.L8024143C: -/* CD326C 8024143C 8E620074 */ lw $v0, 0x74($s3) -/* CD3270 80241440 2442FFFF */ addiu $v0, $v0, -1 -.L80241444: -/* CD3274 80241444 08090514 */ j .L80241450 -/* CD3278 80241448 AE620074 */ sw $v0, 0x74($s3) -.L8024144C: -/* CD327C 8024144C AE220090 */ sw $v0, 0x90($s1) -.L80241450: -/* CD3280 80241450 8E2300D0 */ lw $v1, 0xd0($s1) -/* CD3284 80241454 C6000040 */ lwc1 $f0, 0x40($s0) -/* CD3288 80241458 C4620000 */ lwc1 $f2, ($v1) -/* CD328C 8024145C 468010A0 */ cvt.s.w $f2, $f2 -/* CD3290 80241460 C4640008 */ lwc1 $f4, 8($v1) -/* CD3294 80241464 46802120 */ cvt.s.w $f4, $f4 -/* CD3298 80241468 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD329C 8024146C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD32A0 80241470 44051000 */ mfc1 $a1, $f2 -/* CD32A4 80241474 C440000C */ lwc1 $f0, 0xc($v0) -/* CD32A8 80241478 46800020 */ cvt.s.w $f0, $f0 -/* CD32AC 8024147C E7A00014 */ swc1 $f0, 0x14($sp) -/* CD32B0 80241480 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD32B4 80241484 44062000 */ mfc1 $a2, $f4 -/* CD32B8 80241488 C4400010 */ lwc1 $f0, 0x10($v0) -/* CD32BC 8024148C 46800020 */ cvt.s.w $f0, $f0 -/* CD32C0 80241490 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD32C4 80241494 8C640018 */ lw $a0, 0x18($v1) -/* CD32C8 80241498 0C0123F5 */ jal is_point_within_region -/* CD32CC 8024149C 8E070038 */ lw $a3, 0x38($s0) -/* CD32D0 802414A0 1040001A */ beqz $v0, .L8024150C -/* CD32D4 802414A4 00000000 */ nop -/* CD32D8 802414A8 8E060038 */ lw $a2, 0x38($s0) -/* CD32DC 802414AC 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD32E0 802414B0 8E070040 */ lw $a3, 0x40($s0) -/* CD32E4 802414B4 C44C0000 */ lwc1 $f12, ($v0) -/* CD32E8 802414B8 46806320 */ cvt.s.w $f12, $f12 -/* CD32EC 802414BC C44E0008 */ lwc1 $f14, 8($v0) -/* CD32F0 802414C0 0C00A7B5 */ jal dist2D -/* CD32F4 802414C4 468073A0 */ cvt.s.w $f14, $f14 -/* CD32F8 802414C8 C6020018 */ lwc1 $f2, 0x18($s0) -/* CD32FC 802414CC 4600103C */ c.lt.s $f2, $f0 -/* CD3300 802414D0 00000000 */ nop -/* CD3304 802414D4 4500000D */ bc1f .L8024150C -/* CD3308 802414D8 E7A00034 */ swc1 $f0, 0x34($sp) -/* CD330C 802414DC C60C0038 */ lwc1 $f12, 0x38($s0) -/* CD3310 802414E0 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD3314 802414E4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CD3318 802414E8 C4480000 */ lwc1 $f8, ($v0) -/* CD331C 802414EC 46804220 */ cvt.s.w $f8, $f8 -/* CD3320 802414F0 44064000 */ mfc1 $a2, $f8 -/* CD3324 802414F4 C4480008 */ lwc1 $f8, 8($v0) -/* CD3328 802414F8 46804220 */ cvt.s.w $f8, $f8 -/* CD332C 802414FC 44074000 */ mfc1 $a3, $f8 -/* CD3330 80241500 0C00A720 */ jal atan2 -/* CD3334 80241504 24140001 */ addiu $s4, $zero, 1 -/* CD3338 80241508 E600000C */ swc1 $f0, 0xc($s0) -.L8024150C: -/* CD333C 8024150C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD3340 80241510 8C43000C */ lw $v1, 0xc($v0) -/* CD3344 80241514 8C420010 */ lw $v0, 0x10($v0) -/* CD3348 80241518 00621825 */ or $v1, $v1, $v0 -/* CD334C 8024151C 00741825 */ or $v1, $v1, $s4 -/* CD3350 80241520 10600008 */ beqz $v1, .L80241544 -/* CD3354 80241524 00000000 */ nop -/* CD3358 80241528 8602008C */ lh $v0, 0x8c($s0) -/* CD335C 8024152C 14400031 */ bnez $v0, .L802415F4 -/* CD3360 80241530 00000000 */ nop -/* CD3364 80241534 8E050018 */ lw $a1, 0x18($s0) -/* CD3368 80241538 8E06000C */ lw $a2, 0xc($s0) -/* CD336C 8024153C 0C00EA95 */ jal npc_move_heading -/* CD3370 80241540 0200202D */ daddu $a0, $s0, $zero -.L80241544: -/* CD3374 80241544 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD3378 80241548 3C014059 */ lui $at, 0x4059 -/* CD337C 8024154C 44811800 */ mtc1 $at, $f3 -/* CD3380 80241550 44801000 */ mtc1 $zero, $f2 -/* CD3384 80241554 46000021 */ cvt.d.s $f0, $f0 -/* CD3388 80241558 46220002 */ mul.d $f0, $f0, $f2 -/* CD338C 8024155C 00000000 */ nop -/* CD3390 80241560 4620020D */ trunc.w.d $f8, $f0 -/* CD3394 80241564 E628007C */ swc1 $f8, 0x7c($s1) -/* CD3398 80241568 8E420004 */ lw $v0, 4($s2) -/* CD339C 8024156C 18400021 */ blez $v0, .L802415F4 -/* CD33A0 80241570 00000000 */ nop -/* CD33A4 80241574 8602008E */ lh $v0, 0x8e($s0) -/* CD33A8 80241578 9603008E */ lhu $v1, 0x8e($s0) -/* CD33AC 8024157C 18400005 */ blez $v0, .L80241594 -/* CD33B0 80241580 2462FFFF */ addiu $v0, $v1, -1 -/* CD33B4 80241584 A602008E */ sh $v0, 0x8e($s0) -/* CD33B8 80241588 00021400 */ sll $v0, $v0, 0x10 -/* CD33BC 8024158C 1C400019 */ bgtz $v0, .L802415F4 -/* CD33C0 80241590 00000000 */ nop -.L80241594: -/* CD33C4 80241594 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CD33C8 80241598 24020002 */ addiu $v0, $zero, 2 -/* CD33CC 8024159C 0C00A67F */ jal rand_int -/* CD33D0 802415A0 AE620070 */ sw $v0, 0x70($s3) -/* CD33D4 802415A4 3C035555 */ lui $v1, 0x5555 -/* CD33D8 802415A8 34635556 */ ori $v1, $v1, 0x5556 -/* CD33DC 802415AC 00430018 */ mult $v0, $v1 -/* CD33E0 802415B0 000227C3 */ sra $a0, $v0, 0x1f -/* CD33E4 802415B4 00004010 */ mfhi $t0 -/* CD33E8 802415B8 01042023 */ subu $a0, $t0, $a0 -/* CD33EC 802415BC 00041840 */ sll $v1, $a0, 1 -/* CD33F0 802415C0 00641821 */ addu $v1, $v1, $a0 -/* CD33F4 802415C4 00431023 */ subu $v0, $v0, $v1 -/* CD33F8 802415C8 24430002 */ addiu $v1, $v0, 2 -/* CD33FC 802415CC AE630074 */ sw $v1, 0x74($s3) -/* CD3400 802415D0 8E42002C */ lw $v0, 0x2c($s2) -/* CD3404 802415D4 58400007 */ blezl $v0, .L802415F4 -/* CD3408 802415D8 AE600070 */ sw $zero, 0x70($s3) -/* CD340C 802415DC 8E420008 */ lw $v0, 8($s2) -/* CD3410 802415E0 18400003 */ blez $v0, .L802415F0 -/* CD3414 802415E4 28620003 */ slti $v0, $v1, 3 -/* CD3418 802415E8 10400002 */ beqz $v0, .L802415F4 -/* CD341C 802415EC 00000000 */ nop -.L802415F0: -/* CD3420 802415F0 AE600070 */ sw $zero, 0x70($s3) -.L802415F4: -/* CD3424 802415F4 8FBF0058 */ lw $ra, 0x58($sp) -/* CD3428 802415F8 8FB50054 */ lw $s5, 0x54($sp) -/* CD342C 802415FC 8FB40050 */ lw $s4, 0x50($sp) -/* CD3430 80241600 8FB3004C */ lw $s3, 0x4c($sp) -/* CD3434 80241604 8FB20048 */ lw $s2, 0x48($sp) -/* CD3438 80241608 8FB10044 */ lw $s1, 0x44($sp) -/* CD343C 8024160C 8FB00040 */ lw $s0, 0x40($sp) -/* CD3440 80241610 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CD3444 80241614 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CD3448 80241618 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CD344C 8024161C D7B40060 */ ldc1 $f20, 0x60($sp) -/* CD3450 80241620 03E00008 */ jr $ra -/* CD3454 80241624 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80241628_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80241628_CD1E30.s deleted file mode 100644 index 1c832134a3..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80241628_CD1E30.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241628_CD3458 -/* CD3458 80241628 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CD345C 8024162C AFB3001C */ sw $s3, 0x1c($sp) -/* CD3460 80241630 0080982D */ daddu $s3, $a0, $zero -/* CD3464 80241634 AFBF0020 */ sw $ra, 0x20($sp) -/* CD3468 80241638 AFB20018 */ sw $s2, 0x18($sp) -/* CD346C 8024163C AFB10014 */ sw $s1, 0x14($sp) -/* CD3470 80241640 AFB00010 */ sw $s0, 0x10($sp) -/* CD3474 80241644 8E720148 */ lw $s2, 0x148($s3) -/* CD3478 80241648 86440008 */ lh $a0, 8($s2) -/* CD347C 8024164C 0C00EABB */ jal get_npc_unsafe -/* CD3480 80241650 00A0882D */ daddu $s1, $a1, $zero -/* CD3484 80241654 8E240008 */ lw $a0, 8($s1) -/* CD3488 80241658 0040802D */ daddu $s0, $v0, $zero -/* CD348C 8024165C 00041FC2 */ srl $v1, $a0, 0x1f -/* CD3490 80241660 00832021 */ addu $a0, $a0, $v1 -/* CD3494 80241664 00042043 */ sra $a0, $a0, 1 -/* CD3498 80241668 0C00A67F */ jal rand_int -/* CD349C 8024166C 24840001 */ addiu $a0, $a0, 1 -/* CD34A0 80241670 8E230008 */ lw $v1, 8($s1) -/* CD34A4 80241674 240400B4 */ addiu $a0, $zero, 0xb4 -/* CD34A8 80241678 00032FC2 */ srl $a1, $v1, 0x1f -/* CD34AC 8024167C 00651821 */ addu $v1, $v1, $a1 -/* CD34B0 80241680 00031843 */ sra $v1, $v1, 1 -/* CD34B4 80241684 00621821 */ addu $v1, $v1, $v0 -/* CD34B8 80241688 0C00A67F */ jal rand_int -/* CD34BC 8024168C A603008E */ sh $v1, 0x8e($s0) -/* CD34C0 80241690 C60C000C */ lwc1 $f12, 0xc($s0) -/* CD34C4 80241694 44820000 */ mtc1 $v0, $f0 -/* CD34C8 80241698 00000000 */ nop -/* CD34CC 8024169C 46800020 */ cvt.s.w $f0, $f0 -/* CD34D0 802416A0 46006300 */ add.s $f12, $f12, $f0 -/* CD34D4 802416A4 3C0142B4 */ lui $at, 0x42b4 -/* CD34D8 802416A8 44810000 */ mtc1 $at, $f0 -/* CD34DC 802416AC 0C00A6C9 */ jal clamp_angle -/* CD34E0 802416B0 46006301 */ sub.s $f12, $f12, $f0 -/* CD34E4 802416B4 E600000C */ swc1 $f0, 0xc($s0) -/* CD34E8 802416B8 8E4200CC */ lw $v0, 0xcc($s2) -/* CD34EC 802416BC 8C420000 */ lw $v0, ($v0) -/* CD34F0 802416C0 AE020028 */ sw $v0, 0x28($s0) -/* CD34F4 802416C4 24020003 */ addiu $v0, $zero, 3 -/* CD34F8 802416C8 AE620070 */ sw $v0, 0x70($s3) -/* CD34FC 802416CC 8FBF0020 */ lw $ra, 0x20($sp) -/* CD3500 802416D0 8FB3001C */ lw $s3, 0x1c($sp) -/* CD3504 802416D4 8FB20018 */ lw $s2, 0x18($sp) -/* CD3508 802416D8 8FB10014 */ lw $s1, 0x14($sp) -/* CD350C 802416DC 8FB00010 */ lw $s0, 0x10($sp) -/* CD3510 802416E0 03E00008 */ jr $ra -/* CD3514 802416E4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_802416E8_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_802416E8_CD1E30.s deleted file mode 100644 index 8e4fb46a66..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_802416E8_CD1E30.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416E8_CD3518 -/* CD3518 802416E8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* CD351C 802416EC AFB3004C */ sw $s3, 0x4c($sp) -/* CD3520 802416F0 0080982D */ daddu $s3, $a0, $zero -/* CD3524 802416F4 AFBF0054 */ sw $ra, 0x54($sp) -/* CD3528 802416F8 AFB40050 */ sw $s4, 0x50($sp) -/* CD352C 802416FC AFB20048 */ sw $s2, 0x48($sp) -/* CD3530 80241700 AFB10044 */ sw $s1, 0x44($sp) -/* CD3534 80241704 AFB00040 */ sw $s0, 0x40($sp) -/* CD3538 80241708 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* CD353C 8024170C F7B80068 */ sdc1 $f24, 0x68($sp) -/* CD3540 80241710 F7B60060 */ sdc1 $f22, 0x60($sp) -/* CD3544 80241714 F7B40058 */ sdc1 $f20, 0x58($sp) -/* CD3548 80241718 8E710148 */ lw $s1, 0x148($s3) -/* CD354C 8024171C 00A0902D */ daddu $s2, $a1, $zero -/* CD3550 80241720 86240008 */ lh $a0, 8($s1) -/* CD3554 80241724 0C00EABB */ jal get_npc_unsafe -/* CD3558 80241728 00C0A02D */ daddu $s4, $a2, $zero -/* CD355C 8024172C 0040802D */ daddu $s0, $v0, $zero -/* CD3560 80241730 C6200078 */ lwc1 $f0, 0x78($s1) -/* CD3564 80241734 46800020 */ cvt.s.w $f0, $f0 -/* CD3568 80241738 46000021 */ cvt.d.s $f0, $f0 -/* CD356C 8024173C 3C014059 */ lui $at, 0x4059 -/* CD3570 80241740 44811800 */ mtc1 $at, $f3 -/* CD3574 80241744 44801000 */ mtc1 $zero, $f2 -/* CD3578 80241748 8602008E */ lh $v0, 0x8e($s0) -/* CD357C 8024174C 9603008E */ lhu $v1, 0x8e($s0) -/* CD3580 80241750 46220003 */ div.d $f0, $f0, $f2 -/* CD3584 80241754 46200620 */ cvt.s.d $f24, $f0 -/* CD3588 80241758 C6200088 */ lwc1 $f0, 0x88($s1) -/* CD358C 8024175C 46800020 */ cvt.s.w $f0, $f0 -/* CD3590 80241760 46000021 */ cvt.d.s $f0, $f0 -/* CD3594 80241764 46220003 */ div.d $f0, $f0, $f2 -/* CD3598 80241768 46200020 */ cvt.s.d $f0, $f0 -/* CD359C 8024176C 18400003 */ blez $v0, .L8024177C -/* CD35A0 80241770 4600C680 */ add.s $f26, $f24, $f0 -/* CD35A4 80241774 2462FFFF */ addiu $v0, $v1, -1 -/* CD35A8 80241778 A602008E */ sh $v0, 0x8e($s0) -.L8024177C: -/* CD35AC 8024177C 8E220070 */ lw $v0, 0x70($s1) -/* CD35B0 80241780 18400034 */ blez $v0, .L80241854 -/* CD35B4 80241784 00000000 */ nop -/* CD35B8 80241788 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CD35BC 8024178C 46806320 */ cvt.s.w $f12, $f12 -/* CD35C0 80241790 44820000 */ mtc1 $v0, $f0 -/* CD35C4 80241794 00000000 */ nop -/* CD35C8 80241798 46800020 */ cvt.s.w $f0, $f0 -/* CD35CC 8024179C 46000021 */ cvt.d.s $f0, $f0 -/* CD35D0 802417A0 46220003 */ div.d $f0, $f0, $f2 -/* CD35D4 802417A4 0C00A8BB */ jal sin_deg -/* CD35D8 802417A8 462005A0 */ cvt.s.d $f22, $f0 -/* CD35DC 802417AC 8E020000 */ lw $v0, ($s0) -/* CD35E0 802417B0 30420008 */ andi $v0, $v0, 8 -/* CD35E4 802417B4 10400003 */ beqz $v0, .L802417C4 -/* CD35E8 802417B8 46000506 */ mov.s $f20, $f0 -/* CD35EC 802417BC 08090601 */ j .L80241804 -/* CD35F0 802417C0 0000102D */ daddu $v0, $zero, $zero -.L802417C4: -/* CD35F4 802417C4 27A50028 */ addiu $a1, $sp, 0x28 -/* CD35F8 802417C8 27A6002C */ addiu $a2, $sp, 0x2c -/* CD35FC 802417CC C6000038 */ lwc1 $f0, 0x38($s0) -/* CD3600 802417D0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD3604 802417D4 C6040040 */ lwc1 $f4, 0x40($s0) -/* CD3608 802417D8 3C01447A */ lui $at, 0x447a -/* CD360C 802417DC 44813000 */ mtc1 $at, $f6 -/* CD3610 802417E0 27A20034 */ addiu $v0, $sp, 0x34 -/* CD3614 802417E4 E7A00028 */ swc1 $f0, 0x28($sp) -/* CD3618 802417E8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CD361C 802417EC E7A40030 */ swc1 $f4, 0x30($sp) -/* CD3620 802417F0 E7A60034 */ swc1 $f6, 0x34($sp) -/* CD3624 802417F4 AFA20010 */ sw $v0, 0x10($sp) -/* CD3628 802417F8 8E040080 */ lw $a0, 0x80($s0) -/* CD362C 802417FC 0C0372DF */ jal func_800DCB7C -/* CD3630 80241800 27A70030 */ addiu $a3, $sp, 0x30 -.L80241804: -/* CD3634 80241804 10400007 */ beqz $v0, .L80241824 -/* CD3638 80241808 00000000 */ nop -/* CD363C 8024180C 4616A082 */ mul.s $f2, $f20, $f22 -/* CD3640 80241810 00000000 */ nop -/* CD3644 80241814 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CD3648 80241818 46180000 */ add.s $f0, $f0, $f24 -/* CD364C 8024181C 0809060C */ j .L80241830 -/* CD3650 80241820 46020000 */ add.s $f0, $f0, $f2 -.L80241824: -/* CD3654 80241824 4616A002 */ mul.s $f0, $f20, $f22 -/* CD3658 80241828 00000000 */ nop -/* CD365C 8024182C 4600D000 */ add.s $f0, $f26, $f0 -.L80241830: -/* CD3660 80241830 E600003C */ swc1 $f0, 0x3c($s0) -/* CD3664 80241834 8E220074 */ lw $v0, 0x74($s1) -/* CD3668 80241838 2442000A */ addiu $v0, $v0, 0xa -/* CD366C 8024183C 44826000 */ mtc1 $v0, $f12 -/* CD3670 80241840 00000000 */ nop -/* CD3674 80241844 0C00A6C9 */ jal clamp_angle -/* CD3678 80241848 46806320 */ cvt.s.w $f12, $f12 -/* CD367C 8024184C 4600020D */ trunc.w.s $f8, $f0 -/* CD3680 80241850 E6280074 */ swc1 $f8, 0x74($s1) -.L80241854: -/* CD3684 80241854 8E220090 */ lw $v0, 0x90($s1) -/* CD3688 80241858 1C400040 */ bgtz $v0, .L8024195C -/* CD368C 8024185C 2442FFFF */ addiu $v0, $v0, -1 -/* CD3690 80241860 860200A8 */ lh $v0, 0xa8($s0) -/* CD3694 80241864 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD3698 80241868 44821000 */ mtc1 $v0, $f2 -/* CD369C 8024186C 00000000 */ nop -/* CD36A0 80241870 468010A0 */ cvt.s.w $f2, $f2 -/* CD36A4 80241874 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD36A8 80241878 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD36AC 8024187C 46020000 */ add.s $f0, $f0, $f2 -/* CD36B0 80241880 3C014024 */ lui $at, 0x4024 -/* CD36B4 80241884 44812800 */ mtc1 $at, $f5 -/* CD36B8 80241888 44802000 */ mtc1 $zero, $f4 -/* CD36BC 8024188C C442002C */ lwc1 $f2, 0x2c($v0) -/* CD36C0 80241890 46000021 */ cvt.d.s $f0, $f0 -/* CD36C4 80241894 46240000 */ add.d $f0, $f0, $f4 -/* CD36C8 80241898 460010A1 */ cvt.d.s $f2, $f2 -/* CD36CC 8024189C 4620103C */ c.lt.d $f2, $f0 -/* CD36D0 802418A0 00000000 */ nop -/* CD36D4 802418A4 4500002E */ bc1f .L80241960 -/* CD36D8 802418A8 0280202D */ daddu $a0, $s4, $zero -/* CD36DC 802418AC 24020001 */ addiu $v0, $zero, 1 -/* CD36E0 802418B0 AFA20010 */ sw $v0, 0x10($sp) -/* CD36E4 802418B4 8E460024 */ lw $a2, 0x24($s2) -/* CD36E8 802418B8 8E470028 */ lw $a3, 0x28($s2) -/* CD36EC 802418BC 0C01242D */ jal func_800490B4 -/* CD36F0 802418C0 0220282D */ daddu $a1, $s1, $zero -/* CD36F4 802418C4 10400026 */ beqz $v0, .L80241960 -/* CD36F8 802418C8 0000202D */ daddu $a0, $zero, $zero -/* CD36FC 802418CC 0200282D */ daddu $a1, $s0, $zero -/* CD3700 802418D0 0000302D */ daddu $a2, $zero, $zero -/* CD3704 802418D4 2412000C */ addiu $s2, $zero, 0xc -/* CD3708 802418D8 860300A8 */ lh $v1, 0xa8($s0) -/* CD370C 802418DC 3C013F80 */ lui $at, 0x3f80 -/* CD3710 802418E0 44810000 */ mtc1 $at, $f0 -/* CD3714 802418E4 3C014000 */ lui $at, 0x4000 -/* CD3718 802418E8 44811000 */ mtc1 $at, $f2 -/* CD371C 802418EC 3C01C1A0 */ lui $at, 0xc1a0 -/* CD3720 802418F0 44812000 */ mtc1 $at, $f4 -/* CD3724 802418F4 44834000 */ mtc1 $v1, $f8 -/* CD3728 802418F8 00000000 */ nop -/* CD372C 802418FC 46804220 */ cvt.s.w $f8, $f8 -/* CD3730 80241900 44074000 */ mfc1 $a3, $f8 -/* CD3734 80241904 27A20038 */ addiu $v0, $sp, 0x38 -/* CD3738 80241908 AFB2001C */ sw $s2, 0x1c($sp) -/* CD373C 8024190C AFA20020 */ sw $v0, 0x20($sp) -/* CD3740 80241910 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD3744 80241914 E7A20014 */ swc1 $f2, 0x14($sp) -/* CD3748 80241918 0C01BFA4 */ jal fx_emote -/* CD374C 8024191C E7A40018 */ swc1 $f4, 0x18($sp) -/* CD3750 80241920 0200202D */ daddu $a0, $s0, $zero -/* CD3754 80241924 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CD3758 80241928 C480003C */ lwc1 $f0, 0x3c($a0) -/* CD375C 8024192C 3C060020 */ lui $a2, 0x20 -/* CD3760 80241930 0C012530 */ jal func_800494C0 -/* CD3764 80241934 E4800064 */ swc1 $f0, 0x64($a0) -/* CD3768 80241938 8E220018 */ lw $v0, 0x18($s1) -/* CD376C 8024193C 9442002A */ lhu $v0, 0x2a($v0) -/* CD3770 80241940 30420001 */ andi $v0, $v0, 1 -/* CD3774 80241944 10400003 */ beqz $v0, .L80241954 -/* CD3778 80241948 2402000A */ addiu $v0, $zero, 0xa -/* CD377C 8024194C 0809067F */ j .L802419FC -/* CD3780 80241950 AE620070 */ sw $v0, 0x70($s3) -.L80241954: -/* CD3784 80241954 0809067F */ j .L802419FC -/* CD3788 80241958 AE720070 */ sw $s2, 0x70($s3) -.L8024195C: -/* CD378C 8024195C AE220090 */ sw $v0, 0x90($s1) -.L80241960: -/* CD3790 80241960 8602008C */ lh $v0, 0x8c($s0) -/* CD3794 80241964 14400025 */ bnez $v0, .L802419FC -/* CD3798 80241968 00000000 */ nop -/* CD379C 8024196C 8602008E */ lh $v0, 0x8e($s0) -/* CD37A0 80241970 1C400022 */ bgtz $v0, .L802419FC -/* CD37A4 80241974 00000000 */ nop -/* CD37A8 80241978 8E620074 */ lw $v0, 0x74($s3) -/* CD37AC 8024197C 2442FFFF */ addiu $v0, $v0, -1 -/* CD37B0 80241980 1840001D */ blez $v0, .L802419F8 -/* CD37B4 80241984 AE620074 */ sw $v0, 0x74($s3) -/* CD37B8 80241988 8E220018 */ lw $v0, 0x18($s1) -/* CD37BC 8024198C 9442002A */ lhu $v0, 0x2a($v0) -/* CD37C0 80241990 30420010 */ andi $v0, $v0, 0x10 -/* CD37C4 80241994 14400007 */ bnez $v0, .L802419B4 -/* CD37C8 80241998 00000000 */ nop -/* CD37CC 8024199C C600000C */ lwc1 $f0, 0xc($s0) -/* CD37D0 802419A0 3C014334 */ lui $at, 0x4334 -/* CD37D4 802419A4 44816000 */ mtc1 $at, $f12 -/* CD37D8 802419A8 0C00A6C9 */ jal clamp_angle -/* CD37DC 802419AC 460C0300 */ add.s $f12, $f0, $f12 -/* CD37E0 802419B0 E600000C */ swc1 $f0, 0xc($s0) -.L802419B4: -/* CD37E4 802419B4 0C00A67F */ jal rand_int -/* CD37E8 802419B8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CD37EC 802419BC 3C032E8B */ lui $v1, 0x2e8b -/* CD37F0 802419C0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* CD37F4 802419C4 00430018 */ mult $v0, $v1 -/* CD37F8 802419C8 00021FC3 */ sra $v1, $v0, 0x1f -/* CD37FC 802419CC 00004010 */ mfhi $t0 -/* CD3800 802419D0 00082043 */ sra $a0, $t0, 1 -/* CD3804 802419D4 00832023 */ subu $a0, $a0, $v1 -/* CD3808 802419D8 00041840 */ sll $v1, $a0, 1 -/* CD380C 802419DC 00641821 */ addu $v1, $v1, $a0 -/* CD3810 802419E0 00031880 */ sll $v1, $v1, 2 -/* CD3814 802419E4 00641823 */ subu $v1, $v1, $a0 -/* CD3818 802419E8 00431023 */ subu $v0, $v0, $v1 -/* CD381C 802419EC 24420005 */ addiu $v0, $v0, 5 -/* CD3820 802419F0 0809067F */ j .L802419FC -/* CD3824 802419F4 A602008E */ sh $v0, 0x8e($s0) -.L802419F8: -/* CD3828 802419F8 AE600070 */ sw $zero, 0x70($s3) -.L802419FC: -/* CD382C 802419FC 8FBF0054 */ lw $ra, 0x54($sp) -/* CD3830 80241A00 8FB40050 */ lw $s4, 0x50($sp) -/* CD3834 80241A04 8FB3004C */ lw $s3, 0x4c($sp) -/* CD3838 80241A08 8FB20048 */ lw $s2, 0x48($sp) -/* CD383C 80241A0C 8FB10044 */ lw $s1, 0x44($sp) -/* CD3840 80241A10 8FB00040 */ lw $s0, 0x40($sp) -/* CD3844 80241A14 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* CD3848 80241A18 D7B80068 */ ldc1 $f24, 0x68($sp) -/* CD384C 80241A1C D7B60060 */ ldc1 $f22, 0x60($sp) -/* CD3850 80241A20 D7B40058 */ ldc1 $f20, 0x58($sp) -/* CD3854 80241A24 03E00008 */ jr $ra -/* CD3858 80241A28 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80241A2C_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80241A2C_CD1E30.s deleted file mode 100644 index 8a07fc3aa9..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80241A2C_CD1E30.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A2C_CD385C -/* CD385C 80241A2C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD3860 80241A30 AFB20018 */ sw $s2, 0x18($sp) -/* CD3864 80241A34 0080902D */ daddu $s2, $a0, $zero -/* CD3868 80241A38 AFBF001C */ sw $ra, 0x1c($sp) -/* CD386C 80241A3C AFB10014 */ sw $s1, 0x14($sp) -/* CD3870 80241A40 AFB00010 */ sw $s0, 0x10($sp) -/* CD3874 80241A44 8E510148 */ lw $s1, 0x148($s2) -/* CD3878 80241A48 0C00EABB */ jal get_npc_unsafe -/* CD387C 80241A4C 86240008 */ lh $a0, 8($s1) -/* CD3880 80241A50 0040802D */ daddu $s0, $v0, $zero -/* CD3884 80241A54 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD3888 80241A58 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD388C 80241A5C C60C0038 */ lwc1 $f12, 0x38($s0) -/* CD3890 80241A60 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CD3894 80241A64 A600008E */ sh $zero, 0x8e($s0) -/* CD3898 80241A68 8C460028 */ lw $a2, 0x28($v0) -/* CD389C 80241A6C 0C00A720 */ jal atan2 -/* CD38A0 80241A70 8C470030 */ lw $a3, 0x30($v0) -/* CD38A4 80241A74 E600000C */ swc1 $f0, 0xc($s0) -/* CD38A8 80241A78 8E2200CC */ lw $v0, 0xcc($s1) -/* CD38AC 80241A7C 8C420020 */ lw $v0, 0x20($v0) -/* CD38B0 80241A80 AE020028 */ sw $v0, 0x28($s0) -/* CD38B4 80241A84 2402000B */ addiu $v0, $zero, 0xb -/* CD38B8 80241A88 AE420070 */ sw $v0, 0x70($s2) -/* CD38BC 80241A8C 8FBF001C */ lw $ra, 0x1c($sp) -/* CD38C0 80241A90 8FB20018 */ lw $s2, 0x18($sp) -/* CD38C4 80241A94 8FB10014 */ lw $s1, 0x14($sp) -/* CD38C8 80241A98 8FB00010 */ lw $s0, 0x10($sp) -/* CD38CC 80241A9C 03E00008 */ jr $ra -/* CD38D0 80241AA0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80241AA4_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80241AA4_CD1E30.s deleted file mode 100644 index 5eb35dea0a..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80241AA4_CD1E30.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AA4_CD38D4 -/* CD38D4 80241AA4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CD38D8 80241AA8 AFB00010 */ sw $s0, 0x10($sp) -/* CD38DC 80241AAC 0080802D */ daddu $s0, $a0, $zero -/* CD38E0 80241AB0 AFBF0014 */ sw $ra, 0x14($sp) -/* CD38E4 80241AB4 8E020148 */ lw $v0, 0x148($s0) -/* CD38E8 80241AB8 0C00EABB */ jal get_npc_unsafe -/* CD38EC 80241ABC 84440008 */ lh $a0, 8($v0) -/* CD38F0 80241AC0 9443008E */ lhu $v1, 0x8e($v0) -/* CD38F4 80241AC4 C440003C */ lwc1 $f0, 0x3c($v0) -/* CD38F8 80241AC8 24640001 */ addiu $a0, $v1, 1 -/* CD38FC 80241ACC 00031C00 */ sll $v1, $v1, 0x10 -/* CD3900 80241AD0 00031B83 */ sra $v1, $v1, 0xe -/* CD3904 80241AD4 A444008E */ sh $a0, 0x8e($v0) -/* CD3908 80241AD8 3C018024 */ lui $at, 0x8024 -/* CD390C 80241ADC 00230821 */ addu $at, $at, $v1 -/* CD3910 80241AE0 C4224010 */ lwc1 $f2, 0x4010($at) -/* CD3914 80241AE4 8443008E */ lh $v1, 0x8e($v0) -/* CD3918 80241AE8 46020000 */ add.s $f0, $f0, $f2 -/* CD391C 80241AEC 28630005 */ slti $v1, $v1, 5 -/* CD3920 80241AF0 14600003 */ bnez $v1, .L80241B00 -/* CD3924 80241AF4 E440003C */ swc1 $f0, 0x3c($v0) -/* CD3928 80241AF8 2402000C */ addiu $v0, $zero, 0xc -/* CD392C 80241AFC AE020070 */ sw $v0, 0x70($s0) -.L80241B00: -/* CD3930 80241B00 8FBF0014 */ lw $ra, 0x14($sp) -/* CD3934 80241B04 8FB00010 */ lw $s0, 0x10($sp) -/* CD3938 80241B08 03E00008 */ jr $ra -/* CD393C 80241B0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80241B10_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80241B10_CD1E30.s deleted file mode 100644 index 6c31e6d39e..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80241B10_CD1E30.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B10_CD3940 -/* CD3940 80241B10 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CD3944 80241B14 AFB3001C */ sw $s3, 0x1c($sp) -/* CD3948 80241B18 0080982D */ daddu $s3, $a0, $zero -/* CD394C 80241B1C AFBF0020 */ sw $ra, 0x20($sp) -/* CD3950 80241B20 AFB20018 */ sw $s2, 0x18($sp) -/* CD3954 80241B24 AFB10014 */ sw $s1, 0x14($sp) -/* CD3958 80241B28 AFB00010 */ sw $s0, 0x10($sp) -/* CD395C 80241B2C 8E720148 */ lw $s2, 0x148($s3) -/* CD3960 80241B30 86440008 */ lh $a0, 8($s2) -/* CD3964 80241B34 0C00EABB */ jal get_npc_unsafe -/* CD3968 80241B38 00A0802D */ daddu $s0, $a1, $zero -/* CD396C 80241B3C 0040882D */ daddu $s1, $v0, $zero -/* CD3970 80241B40 C6420080 */ lwc1 $f2, 0x80($s2) -/* CD3974 80241B44 468010A0 */ cvt.s.w $f2, $f2 -/* CD3978 80241B48 460010A1 */ cvt.d.s $f2, $f2 -/* CD397C 80241B4C C6400084 */ lwc1 $f0, 0x84($s2) -/* CD3980 80241B50 46800020 */ cvt.s.w $f0, $f0 -/* CD3984 80241B54 46000021 */ cvt.d.s $f0, $f0 -/* CD3988 80241B58 3C014059 */ lui $at, 0x4059 -/* CD398C 80241B5C 44812800 */ mtc1 $at, $f5 -/* CD3990 80241B60 44802000 */ mtc1 $zero, $f4 -/* CD3994 80241B64 8E4200CC */ lw $v0, 0xcc($s2) -/* CD3998 80241B68 C62C0038 */ lwc1 $f12, 0x38($s1) -/* CD399C 80241B6C C62E0040 */ lwc1 $f14, 0x40($s1) -/* CD39A0 80241B70 46241083 */ div.d $f2, $f2, $f4 -/* CD39A4 80241B74 462010A0 */ cvt.s.d $f2, $f2 -/* CD39A8 80241B78 46240003 */ div.d $f0, $f0, $f4 -/* CD39AC 80241B7C 8C420020 */ lw $v0, 0x20($v0) -/* CD39B0 80241B80 46200020 */ cvt.s.d $f0, $f0 -/* CD39B4 80241B84 E622001C */ swc1 $f2, 0x1c($s1) -/* CD39B8 80241B88 E6200014 */ swc1 $f0, 0x14($s1) -/* CD39BC 80241B8C AE220028 */ sw $v0, 0x28($s1) -/* CD39C0 80241B90 C6000018 */ lwc1 $f0, 0x18($s0) -/* CD39C4 80241B94 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD39C8 80241B98 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD39CC 80241B9C E6200018 */ swc1 $f0, 0x18($s1) -/* CD39D0 80241BA0 8C460028 */ lw $a2, 0x28($v0) -/* CD39D4 80241BA4 0C00A720 */ jal atan2 -/* CD39D8 80241BA8 8C470030 */ lw $a3, 0x30($v0) -/* CD39DC 80241BAC E620000C */ swc1 $f0, 0xc($s1) -/* CD39E0 80241BB0 8E420018 */ lw $v0, 0x18($s2) -/* CD39E4 80241BB4 AE400074 */ sw $zero, 0x74($s2) -/* CD39E8 80241BB8 9442002A */ lhu $v0, 0x2a($v0) -/* CD39EC 80241BBC 30420002 */ andi $v0, $v0, 2 -/* CD39F0 80241BC0 10400005 */ beqz $v0, .L80241BD8 -/* CD39F4 80241BC4 24020003 */ addiu $v0, $zero, 3 -/* CD39F8 80241BC8 A622008E */ sh $v0, 0x8e($s1) -/* CD39FC 80241BCC 2402000D */ addiu $v0, $zero, 0xd -/* CD3A00 80241BD0 0809070A */ j .L80241C28 -/* CD3A04 80241BD4 AE620070 */ sw $v0, 0x70($s3) -.L80241BD8: -/* CD3A08 80241BD8 24030001 */ addiu $v1, $zero, 1 -/* CD3A0C 80241BDC 2402000E */ addiu $v0, $zero, 0xe -/* CD3A10 80241BE0 A623008E */ sh $v1, 0x8e($s1) -/* CD3A14 80241BE4 AE620070 */ sw $v0, 0x70($s3) -/* CD3A18 80241BE8 C6200038 */ lwc1 $f0, 0x38($s1) -/* CD3A1C 80241BEC 4600018D */ trunc.w.s $f6, $f0 -/* CD3A20 80241BF0 44023000 */ mfc1 $v0, $f6 -/* CD3A24 80241BF4 00000000 */ nop -/* CD3A28 80241BF8 A6420010 */ sh $v0, 0x10($s2) -/* CD3A2C 80241BFC C620003C */ lwc1 $f0, 0x3c($s1) -/* CD3A30 80241C00 4600018D */ trunc.w.s $f6, $f0 -/* CD3A34 80241C04 44023000 */ mfc1 $v0, $f6 -/* CD3A38 80241C08 00000000 */ nop -/* CD3A3C 80241C0C A6420012 */ sh $v0, 0x12($s2) -/* CD3A40 80241C10 C6200040 */ lwc1 $f0, 0x40($s1) -/* CD3A44 80241C14 A2430007 */ sb $v1, 7($s2) -/* CD3A48 80241C18 4600018D */ trunc.w.s $f6, $f0 -/* CD3A4C 80241C1C 44023000 */ mfc1 $v0, $f6 -/* CD3A50 80241C20 00000000 */ nop -/* CD3A54 80241C24 A6420014 */ sh $v0, 0x14($s2) -.L80241C28: -/* CD3A58 80241C28 8FBF0020 */ lw $ra, 0x20($sp) -/* CD3A5C 80241C2C 8FB3001C */ lw $s3, 0x1c($sp) -/* CD3A60 80241C30 8FB20018 */ lw $s2, 0x18($sp) -/* CD3A64 80241C34 8FB10014 */ lw $s1, 0x14($sp) -/* CD3A68 80241C38 8FB00010 */ lw $s0, 0x10($sp) -/* CD3A6C 80241C3C 03E00008 */ jr $ra -/* CD3A70 80241C40 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80241C44_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80241C44_CD1E30.s deleted file mode 100644 index 6454ec9f6d..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80241C44_CD1E30.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C44_CD3A74 -/* CD3A74 80241C44 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CD3A78 80241C48 AFB00010 */ sw $s0, 0x10($sp) -/* CD3A7C 80241C4C 0080802D */ daddu $s0, $a0, $zero -/* CD3A80 80241C50 AFBF0014 */ sw $ra, 0x14($sp) -/* CD3A84 80241C54 8E020148 */ lw $v0, 0x148($s0) -/* CD3A88 80241C58 0C00EABB */ jal get_npc_unsafe -/* CD3A8C 80241C5C 84440008 */ lh $a0, 8($v0) -/* CD3A90 80241C60 0040202D */ daddu $a0, $v0, $zero -/* CD3A94 80241C64 8482008E */ lh $v0, 0x8e($a0) -/* CD3A98 80241C68 9483008E */ lhu $v1, 0x8e($a0) -/* CD3A9C 80241C6C 18400005 */ blez $v0, .L80241C84 -/* CD3AA0 80241C70 2462FFFF */ addiu $v0, $v1, -1 -/* CD3AA4 80241C74 A482008E */ sh $v0, 0x8e($a0) -/* CD3AA8 80241C78 00021400 */ sll $v0, $v0, 0x10 -/* CD3AAC 80241C7C 1C400006 */ bgtz $v0, .L80241C98 -/* CD3AB0 80241C80 00000000 */ nop -.L80241C84: -/* CD3AB4 80241C84 8482008C */ lh $v0, 0x8c($a0) -/* CD3AB8 80241C88 14400003 */ bnez $v0, .L80241C98 -/* CD3ABC 80241C8C 2402000E */ addiu $v0, $zero, 0xe -/* CD3AC0 80241C90 A480008E */ sh $zero, 0x8e($a0) -/* CD3AC4 80241C94 AE020070 */ sw $v0, 0x70($s0) -.L80241C98: -/* CD3AC8 80241C98 8FBF0014 */ lw $ra, 0x14($sp) -/* CD3ACC 80241C9C 8FB00010 */ lw $s0, 0x10($sp) -/* CD3AD0 80241CA0 03E00008 */ jr $ra -/* CD3AD4 80241CA4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80241CA8_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80241CA8_CD1E30.s deleted file mode 100644 index d5fee89fff..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80241CA8_CD1E30.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CA8_CD3AD8 -/* CD3AD8 80241CA8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CD3ADC 80241CAC AFB20030 */ sw $s2, 0x30($sp) -/* CD3AE0 80241CB0 0080902D */ daddu $s2, $a0, $zero -/* CD3AE4 80241CB4 AFBF0038 */ sw $ra, 0x38($sp) -/* CD3AE8 80241CB8 AFB30034 */ sw $s3, 0x34($sp) -/* CD3AEC 80241CBC AFB1002C */ sw $s1, 0x2c($sp) -/* CD3AF0 80241CC0 AFB00028 */ sw $s0, 0x28($sp) -/* CD3AF4 80241CC4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* CD3AF8 80241CC8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* CD3AFC 80241CCC 8E510148 */ lw $s1, 0x148($s2) -/* CD3B00 80241CD0 86240008 */ lh $a0, 8($s1) -/* CD3B04 80241CD4 0C00EABB */ jal get_npc_unsafe -/* CD3B08 80241CD8 00A0982D */ daddu $s3, $a1, $zero -/* CD3B0C 80241CDC 0040802D */ daddu $s0, $v0, $zero -/* CD3B10 80241CE0 0200202D */ daddu $a0, $s0, $zero -/* CD3B14 80241CE4 C6220088 */ lwc1 $f2, 0x88($s1) -/* CD3B18 80241CE8 468010A0 */ cvt.s.w $f2, $f2 -/* CD3B1C 80241CEC 460010A1 */ cvt.d.s $f2, $f2 -/* CD3B20 80241CF0 C604001C */ lwc1 $f4, 0x1c($s0) -/* CD3B24 80241CF4 C6000014 */ lwc1 $f0, 0x14($s0) -/* CD3B28 80241CF8 8E050018 */ lw $a1, 0x18($s0) -/* CD3B2C 80241CFC 46002100 */ add.s $f4, $f4, $f0 -/* CD3B30 80241D00 8E06000C */ lw $a2, 0xc($s0) -/* CD3B34 80241D04 C6200078 */ lwc1 $f0, 0x78($s1) -/* CD3B38 80241D08 46800020 */ cvt.s.w $f0, $f0 -/* CD3B3C 80241D0C E604001C */ swc1 $f4, 0x1c($s0) -/* CD3B40 80241D10 3C014059 */ lui $at, 0x4059 -/* CD3B44 80241D14 44812800 */ mtc1 $at, $f5 -/* CD3B48 80241D18 44802000 */ mtc1 $zero, $f4 -/* CD3B4C 80241D1C 46000021 */ cvt.d.s $f0, $f0 -/* CD3B50 80241D20 46240003 */ div.d $f0, $f0, $f4 -/* CD3B54 80241D24 46200520 */ cvt.s.d $f20, $f0 -/* CD3B58 80241D28 46241083 */ div.d $f2, $f2, $f4 -/* CD3B5C 80241D2C 0C00EA95 */ jal npc_move_heading -/* CD3B60 80241D30 462015A0 */ cvt.s.d $f22, $f2 -/* CD3B64 80241D34 C604001C */ lwc1 $f4, 0x1c($s0) -/* CD3B68 80241D38 44801000 */ mtc1 $zero, $f2 -/* CD3B6C 80241D3C 44801800 */ mtc1 $zero, $f3 -/* CD3B70 80241D40 46002021 */ cvt.d.s $f0, $f4 -/* CD3B74 80241D44 4620103E */ c.le.d $f2, $f0 -/* CD3B78 80241D48 00000000 */ nop -/* CD3B7C 80241D4C 45000030 */ bc1f .L80241E10 -/* CD3B80 80241D50 00000000 */ nop -/* CD3B84 80241D54 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD3B88 80241D58 46040000 */ add.s $f0, $f0, $f4 -/* CD3B8C 80241D5C E600003C */ swc1 $f0, 0x3c($s0) -/* CD3B90 80241D60 8E2200CC */ lw $v0, 0xcc($s1) -/* CD3B94 80241D64 8C420024 */ lw $v0, 0x24($v0) -/* CD3B98 80241D68 AE020028 */ sw $v0, 0x28($s0) -/* CD3B9C 80241D6C A2200007 */ sb $zero, 7($s1) -/* CD3BA0 80241D70 8E020000 */ lw $v0, ($s0) -/* CD3BA4 80241D74 30420008 */ andi $v0, $v0, 8 -/* CD3BA8 80241D78 14400011 */ bnez $v0, .L80241DC0 -/* CD3BAC 80241D7C 0000102D */ daddu $v0, $zero, $zero -/* CD3BB0 80241D80 27A50018 */ addiu $a1, $sp, 0x18 -/* CD3BB4 80241D84 27A6001C */ addiu $a2, $sp, 0x1c -/* CD3BB8 80241D88 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD3BBC 80241D8C C602003C */ lwc1 $f2, 0x3c($s0) -/* CD3BC0 80241D90 C6040040 */ lwc1 $f4, 0x40($s0) -/* CD3BC4 80241D94 3C01447A */ lui $at, 0x447a -/* CD3BC8 80241D98 44813000 */ mtc1 $at, $f6 -/* CD3BCC 80241D9C 27A20024 */ addiu $v0, $sp, 0x24 -/* CD3BD0 80241DA0 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD3BD4 80241DA4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CD3BD8 80241DA8 E7A40020 */ swc1 $f4, 0x20($sp) -/* CD3BDC 80241DAC E7A60024 */ swc1 $f6, 0x24($sp) -/* CD3BE0 80241DB0 AFA20010 */ sw $v0, 0x10($sp) -/* CD3BE4 80241DB4 8E040080 */ lw $a0, 0x80($s0) -/* CD3BE8 80241DB8 0C0372DF */ jal func_800DCB7C -/* CD3BEC 80241DBC 27A70020 */ addiu $a3, $sp, 0x20 -.L80241DC0: -/* CD3BF0 80241DC0 1040000B */ beqz $v0, .L80241DF0 -/* CD3BF4 80241DC4 00000000 */ nop -/* CD3BF8 80241DC8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CD3BFC 80241DCC 46140080 */ add.s $f2, $f0, $f20 -/* CD3C00 80241DD0 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD3C04 80241DD4 4600103E */ c.le.s $f2, $f0 -/* CD3C08 80241DD8 00000000 */ nop -/* CD3C0C 80241DDC 4500008D */ bc1f .L80242014 -/* CD3C10 80241DE0 00000000 */ nop -/* CD3C14 80241DE4 E602003C */ swc1 $f2, 0x3c($s0) -/* CD3C18 80241DE8 08090805 */ j .L80242014 -/* CD3C1C 80241DEC AE400070 */ sw $zero, 0x70($s2) -.L80241DF0: -/* CD3C20 80241DF0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD3C24 80241DF4 C6000064 */ lwc1 $f0, 0x64($s0) -/* CD3C28 80241DF8 4602003E */ c.le.s $f0, $f2 -/* CD3C2C 80241DFC 00000000 */ nop -/* CD3C30 80241E00 45030084 */ bc1tl .L80242014 -/* CD3C34 80241E04 AE400070 */ sw $zero, 0x70($s2) -/* CD3C38 80241E08 08090805 */ j .L80242014 -/* CD3C3C 80241E0C 00000000 */ nop -.L80241E10: -/* CD3C40 80241E10 4622003C */ c.lt.d $f0, $f2 -/* CD3C44 80241E14 00000000 */ nop -/* CD3C48 80241E18 4500007E */ bc1f .L80242014 -/* CD3C4C 80241E1C 00000000 */ nop -/* CD3C50 80241E20 9602008E */ lhu $v0, 0x8e($s0) -/* CD3C54 80241E24 24420001 */ addiu $v0, $v0, 1 -/* CD3C58 80241E28 A602008E */ sh $v0, 0x8e($s0) -/* CD3C5C 80241E2C 00021400 */ sll $v0, $v0, 0x10 -/* CD3C60 80241E30 8E630020 */ lw $v1, 0x20($s3) -/* CD3C64 80241E34 00021403 */ sra $v0, $v0, 0x10 -/* CD3C68 80241E38 0043102A */ slt $v0, $v0, $v1 -/* CD3C6C 80241E3C 14400026 */ bnez $v0, .L80241ED8 -/* CD3C70 80241E40 00000000 */ nop -/* CD3C74 80241E44 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CD3C78 80241E48 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CD3C7C 80241E4C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD3C80 80241E50 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD3C84 80241E54 A600008E */ sh $zero, 0x8e($s0) -/* CD3C88 80241E58 8C460028 */ lw $a2, 0x28($v0) -/* CD3C8C 80241E5C 0C00A720 */ jal atan2 -/* CD3C90 80241E60 8C470030 */ lw $a3, 0x30($v0) -/* CD3C94 80241E64 46000506 */ mov.s $f20, $f0 -/* CD3C98 80241E68 C60C000C */ lwc1 $f12, 0xc($s0) -/* CD3C9C 80241E6C 0C00A70A */ jal get_clamped_angle_diff -/* CD3CA0 80241E70 4600A386 */ mov.s $f14, $f20 -/* CD3CA4 80241E74 46000086 */ mov.s $f2, $f0 -/* CD3CA8 80241E78 8E62001C */ lw $v0, 0x1c($s3) -/* CD3CAC 80241E7C 46001005 */ abs.s $f0, $f2 -/* CD3CB0 80241E80 44822000 */ mtc1 $v0, $f4 -/* CD3CB4 80241E84 00000000 */ nop -/* CD3CB8 80241E88 46802120 */ cvt.s.w $f4, $f4 -/* CD3CBC 80241E8C 4600203C */ c.lt.s $f4, $f0 -/* CD3CC0 80241E90 00000000 */ nop -/* CD3CC4 80241E94 4500000D */ bc1f .L80241ECC -/* CD3CC8 80241E98 00000000 */ nop -/* CD3CCC 80241E9C 44800000 */ mtc1 $zero, $f0 -/* CD3CD0 80241EA0 C614000C */ lwc1 $f20, 0xc($s0) -/* CD3CD4 80241EA4 4600103C */ c.lt.s $f2, $f0 -/* CD3CD8 80241EA8 00000000 */ nop -/* CD3CDC 80241EAC 45000006 */ bc1f .L80241EC8 -/* CD3CE0 80241EB0 00021023 */ negu $v0, $v0 -/* CD3CE4 80241EB4 44820000 */ mtc1 $v0, $f0 -/* CD3CE8 80241EB8 00000000 */ nop -/* CD3CEC 80241EBC 46800020 */ cvt.s.w $f0, $f0 -/* CD3CF0 80241EC0 080907B3 */ j .L80241ECC -/* CD3CF4 80241EC4 4600A500 */ add.s $f20, $f20, $f0 -.L80241EC8: -/* CD3CF8 80241EC8 4604A500 */ add.s $f20, $f20, $f4 -.L80241ECC: -/* CD3CFC 80241ECC 0C00A6C9 */ jal clamp_angle -/* CD3D00 80241ED0 4600A306 */ mov.s $f12, $f20 -/* CD3D04 80241ED4 E600000C */ swc1 $f0, 0xc($s0) -.L80241ED8: -/* CD3D08 80241ED8 8E020000 */ lw $v0, ($s0) -/* CD3D0C 80241EDC 30420008 */ andi $v0, $v0, 8 -/* CD3D10 80241EE0 1040000A */ beqz $v0, .L80241F0C -/* CD3D14 80241EE4 27A50018 */ addiu $a1, $sp, 0x18 -/* CD3D18 80241EE8 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD3D1C 80241EEC C600001C */ lwc1 $f0, 0x1c($s0) -/* CD3D20 80241EF0 46001080 */ add.s $f2, $f2, $f0 -/* CD3D24 80241EF4 4616103C */ c.lt.s $f2, $f22 -/* CD3D28 80241EF8 00000000 */ nop -/* CD3D2C 80241EFC 45020045 */ bc1fl .L80242014 -/* CD3D30 80241F00 E602003C */ swc1 $f2, 0x3c($s0) -/* CD3D34 80241F04 08090804 */ j .L80242010 -/* CD3D38 80241F08 E616003C */ swc1 $f22, 0x3c($s0) -.L80241F0C: -/* CD3D3C 80241F0C C6000038 */ lwc1 $f0, 0x38($s0) -/* CD3D40 80241F10 27A6001C */ addiu $a2, $sp, 0x1c -/* CD3D44 80241F14 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD3D48 80241F18 860200A8 */ lh $v0, 0xa8($s0) -/* CD3D4C 80241F1C C600001C */ lwc1 $f0, 0x1c($s0) -/* CD3D50 80241F20 C604003C */ lwc1 $f4, 0x3c($s0) -/* CD3D54 80241F24 44821000 */ mtc1 $v0, $f2 -/* CD3D58 80241F28 00000000 */ nop -/* CD3D5C 80241F2C 468010A0 */ cvt.s.w $f2, $f2 -/* CD3D60 80241F30 46000005 */ abs.s $f0, $f0 -/* CD3D64 80241F34 46020000 */ add.s $f0, $f0, $f2 -/* CD3D68 80241F38 C6060040 */ lwc1 $f6, 0x40($s0) -/* CD3D6C 80241F3C 27A20024 */ addiu $v0, $sp, 0x24 -/* CD3D70 80241F40 46022100 */ add.s $f4, $f4, $f2 -/* CD3D74 80241F44 3C014024 */ lui $at, 0x4024 -/* CD3D78 80241F48 44811800 */ mtc1 $at, $f3 -/* CD3D7C 80241F4C 44801000 */ mtc1 $zero, $f2 -/* CD3D80 80241F50 46000021 */ cvt.d.s $f0, $f0 -/* CD3D84 80241F54 46220000 */ add.d $f0, $f0, $f2 -/* CD3D88 80241F58 E7A60020 */ swc1 $f6, 0x20($sp) -/* CD3D8C 80241F5C E7A4001C */ swc1 $f4, 0x1c($sp) -/* CD3D90 80241F60 46200020 */ cvt.s.d $f0, $f0 -/* CD3D94 80241F64 E7A00024 */ swc1 $f0, 0x24($sp) -/* CD3D98 80241F68 AFA20010 */ sw $v0, 0x10($sp) -/* CD3D9C 80241F6C 8E040080 */ lw $a0, 0x80($s0) -/* CD3DA0 80241F70 0C0372DF */ jal func_800DCB7C -/* CD3DA4 80241F74 27A70020 */ addiu $a3, $sp, 0x20 -/* CD3DA8 80241F78 10400015 */ beqz $v0, .L80241FD0 -/* CD3DAC 80241F7C 00000000 */ nop -/* CD3DB0 80241F80 860200A8 */ lh $v0, 0xa8($s0) -/* CD3DB4 80241F84 C604001C */ lwc1 $f4, 0x1c($s0) -/* CD3DB8 80241F88 44820000 */ mtc1 $v0, $f0 -/* CD3DBC 80241F8C 00000000 */ nop -/* CD3DC0 80241F90 46800020 */ cvt.s.w $f0, $f0 -/* CD3DC4 80241F94 46002085 */ abs.s $f2, $f4 -/* CD3DC8 80241F98 46020000 */ add.s $f0, $f0, $f2 -/* CD3DCC 80241F9C C7A20024 */ lwc1 $f2, 0x24($sp) -/* CD3DD0 80241FA0 4600103E */ c.le.s $f2, $f0 -/* CD3DD4 80241FA4 00000000 */ nop -/* CD3DD8 80241FA8 45000005 */ bc1f .L80241FC0 -/* CD3DDC 80241FAC 00000000 */ nop -/* CD3DE0 80241FB0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CD3DE4 80241FB4 AE00001C */ sw $zero, 0x1c($s0) -/* CD3DE8 80241FB8 08090805 */ j .L80242014 -/* CD3DEC 80241FBC E600003C */ swc1 $f0, 0x3c($s0) -.L80241FC0: -/* CD3DF0 80241FC0 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD3DF4 80241FC4 46040000 */ add.s $f0, $f0, $f4 -/* CD3DF8 80241FC8 08090805 */ j .L80242014 -/* CD3DFC 80241FCC E600003C */ swc1 $f0, 0x3c($s0) -.L80241FD0: -/* CD3E00 80241FD0 C606003C */ lwc1 $f6, 0x3c($s0) -/* CD3E04 80241FD4 860200A8 */ lh $v0, 0xa8($s0) -/* CD3E08 80241FD8 46163081 */ sub.s $f2, $f6, $f22 -/* CD3E0C 80241FDC 44820000 */ mtc1 $v0, $f0 -/* CD3E10 80241FE0 00000000 */ nop -/* CD3E14 80241FE4 46800020 */ cvt.s.w $f0, $f0 -/* CD3E18 80241FE8 46001080 */ add.s $f2, $f2, $f0 -/* CD3E1C 80241FEC C604001C */ lwc1 $f4, 0x1c($s0) -/* CD3E20 80241FF0 46002005 */ abs.s $f0, $f4 -/* CD3E24 80241FF4 4602003C */ c.lt.s $f0, $f2 -/* CD3E28 80241FF8 00000000 */ nop -/* CD3E2C 80241FFC 45020005 */ bc1fl .L80242014 -/* CD3E30 80242000 AE00001C */ sw $zero, 0x1c($s0) -/* CD3E34 80242004 46043000 */ add.s $f0, $f6, $f4 -/* CD3E38 80242008 08090805 */ j .L80242014 -/* CD3E3C 8024200C E600003C */ swc1 $f0, 0x3c($s0) -.L80242010: -/* CD3E40 80242010 AE00001C */ sw $zero, 0x1c($s0) -.L80242014: -/* CD3E44 80242014 8FBF0038 */ lw $ra, 0x38($sp) -/* CD3E48 80242018 8FB30034 */ lw $s3, 0x34($sp) -/* CD3E4C 8024201C 8FB20030 */ lw $s2, 0x30($sp) -/* CD3E50 80242020 8FB1002C */ lw $s1, 0x2c($sp) -/* CD3E54 80242024 8FB00028 */ lw $s0, 0x28($sp) -/* CD3E58 80242028 D7B60048 */ ldc1 $f22, 0x48($sp) -/* CD3E5C 8024202C D7B40040 */ ldc1 $f20, 0x40($sp) -/* CD3E60 80242030 03E00008 */ jr $ra -/* CD3E64 80242034 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_80242348_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_80242348_CD1E30.s deleted file mode 100644 index 43b43be27c..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_80242348_CD1E30.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242348_CD4178 -/* CD4178 80242348 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* CD417C 8024234C AFB3001C */ sw $s3, 0x1c($sp) -/* CD4180 80242350 0080982D */ daddu $s3, $a0, $zero -/* CD4184 80242354 AFBF0020 */ sw $ra, 0x20($sp) -/* CD4188 80242358 AFB20018 */ sw $s2, 0x18($sp) -/* CD418C 8024235C AFB10014 */ sw $s1, 0x14($sp) -/* CD4190 80242360 AFB00010 */ sw $s0, 0x10($sp) -/* CD4194 80242364 F7B40028 */ sdc1 $f20, 0x28($sp) -/* CD4198 80242368 8E710148 */ lw $s1, 0x148($s3) -/* CD419C 8024236C 86240008 */ lh $a0, 8($s1) -/* CD41A0 80242370 0C00EABB */ jal get_npc_unsafe -/* CD41A4 80242374 00A0802D */ daddu $s0, $a1, $zero -/* CD41A8 80242378 8E040020 */ lw $a0, 0x20($s0) -/* CD41AC 8024237C 0040902D */ daddu $s2, $v0, $zero -/* CD41B0 80242380 00041FC2 */ srl $v1, $a0, 0x1f -/* CD41B4 80242384 00832021 */ addu $a0, $a0, $v1 -/* CD41B8 80242388 00042043 */ sra $a0, $a0, 1 -/* CD41BC 8024238C 0C00A67F */ jal rand_int -/* CD41C0 80242390 24840001 */ addiu $a0, $a0, 1 -/* CD41C4 80242394 8E030020 */ lw $v1, 0x20($s0) -/* CD41C8 80242398 C64C0038 */ lwc1 $f12, 0x38($s2) -/* CD41CC 8024239C 000327C2 */ srl $a0, $v1, 0x1f -/* CD41D0 802423A0 00641821 */ addu $v1, $v1, $a0 -/* CD41D4 802423A4 00031843 */ sra $v1, $v1, 1 -/* CD41D8 802423A8 00621821 */ addu $v1, $v1, $v0 -/* CD41DC 802423AC A643008E */ sh $v1, 0x8e($s2) -/* CD41E0 802423B0 8E2200CC */ lw $v0, 0xcc($s1) -/* CD41E4 802423B4 C64E0040 */ lwc1 $f14, 0x40($s2) -/* CD41E8 802423B8 8C42000C */ lw $v0, 0xc($v0) -/* CD41EC 802423BC AE420028 */ sw $v0, 0x28($s2) -/* CD41F0 802423C0 C6000018 */ lwc1 $f0, 0x18($s0) -/* CD41F4 802423C4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD41F8 802423C8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD41FC 802423CC E6400018 */ swc1 $f0, 0x18($s2) -/* CD4200 802423D0 8C460028 */ lw $a2, 0x28($v0) -/* CD4204 802423D4 0C00A720 */ jal atan2 -/* CD4208 802423D8 8C470030 */ lw $a3, 0x30($v0) -/* CD420C 802423DC 46000506 */ mov.s $f20, $f0 -/* CD4210 802423E0 C64C000C */ lwc1 $f12, 0xc($s2) -/* CD4214 802423E4 0C00A70A */ jal get_clamped_angle_diff -/* CD4218 802423E8 4600A386 */ mov.s $f14, $f20 -/* CD421C 802423EC 46000086 */ mov.s $f2, $f0 -/* CD4220 802423F0 8E02001C */ lw $v0, 0x1c($s0) -/* CD4224 802423F4 46001005 */ abs.s $f0, $f2 -/* CD4228 802423F8 44822000 */ mtc1 $v0, $f4 -/* CD422C 802423FC 00000000 */ nop -/* CD4230 80242400 46802120 */ cvt.s.w $f4, $f4 -/* CD4234 80242404 4600203C */ c.lt.s $f4, $f0 -/* CD4238 80242408 00000000 */ nop -/* CD423C 8024240C 4500000D */ bc1f .L80242444 -/* CD4240 80242410 00000000 */ nop -/* CD4244 80242414 44800000 */ mtc1 $zero, $f0 -/* CD4248 80242418 C654000C */ lwc1 $f20, 0xc($s2) -/* CD424C 8024241C 4600103C */ c.lt.s $f2, $f0 -/* CD4250 80242420 00000000 */ nop -/* CD4254 80242424 45000006 */ bc1f .L80242440 -/* CD4258 80242428 00021023 */ negu $v0, $v0 -/* CD425C 8024242C 44820000 */ mtc1 $v0, $f0 -/* CD4260 80242430 00000000 */ nop -/* CD4264 80242434 46800020 */ cvt.s.w $f0, $f0 -/* CD4268 80242438 08090911 */ j .L80242444 -/* CD426C 8024243C 4600A500 */ add.s $f20, $f20, $f0 -.L80242440: -/* CD4270 80242440 4604A500 */ add.s $f20, $f20, $f4 -.L80242444: -/* CD4274 80242444 0C00A6C9 */ jal clamp_angle -/* CD4278 80242448 4600A306 */ mov.s $f12, $f20 -/* CD427C 8024244C 2402000D */ addiu $v0, $zero, 0xd -/* CD4280 80242450 E640000C */ swc1 $f0, 0xc($s2) -/* CD4284 80242454 AE620070 */ sw $v0, 0x70($s3) -/* CD4288 80242458 8FBF0020 */ lw $ra, 0x20($sp) -/* CD428C 8024245C 8FB3001C */ lw $s3, 0x1c($sp) -/* CD4290 80242460 8FB20018 */ lw $s2, 0x18($sp) -/* CD4294 80242464 8FB10014 */ lw $s1, 0x14($sp) -/* CD4298 80242468 8FB00010 */ lw $s0, 0x10($sp) -/* CD429C 8024246C D7B40028 */ ldc1 $f20, 0x28($sp) -/* CD42A0 80242470 03E00008 */ jr $ra -/* CD42A4 80242474 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_flo/flo_16/func_802426F8_CD1E30.s b/asm/nonmatchings/world/area_flo/flo_16/func_802426F8_CD1E30.s deleted file mode 100644 index beca83fe44..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/func_802426F8_CD1E30.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426F8_CD4528 -/* CD4528 802426F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD452C 802426FC AFB10014 */ sw $s1, 0x14($sp) -/* CD4530 80242700 0080882D */ daddu $s1, $a0, $zero -/* CD4534 80242704 AFBF0018 */ sw $ra, 0x18($sp) -/* CD4538 80242708 AFB00010 */ sw $s0, 0x10($sp) -/* CD453C 8024270C 8E300148 */ lw $s0, 0x148($s1) -/* CD4540 80242710 0C00EABB */ jal get_npc_unsafe -/* CD4544 80242714 86040008 */ lh $a0, 8($s0) -/* CD4548 80242718 0040182D */ daddu $v1, $v0, $zero -/* CD454C 8024271C 9462008E */ lhu $v0, 0x8e($v1) -/* CD4550 80242720 2442FFFF */ addiu $v0, $v0, -1 -/* CD4554 80242724 A462008E */ sh $v0, 0x8e($v1) -/* CD4558 80242728 00021400 */ sll $v0, $v0, 0x10 -/* CD455C 8024272C 1C400004 */ bgtz $v0, .L80242740 -/* CD4560 80242730 00000000 */ nop -/* CD4564 80242734 AE000074 */ sw $zero, 0x74($s0) -/* CD4568 80242738 A460008E */ sh $zero, 0x8e($v1) -/* CD456C 8024273C AE200070 */ sw $zero, 0x70($s1) -.L80242740: -/* CD4570 80242740 8FBF0018 */ lw $ra, 0x18($sp) -/* CD4574 80242744 8FB10014 */ lw $s1, 0x14($sp) -/* CD4578 80242748 8FB00010 */ lw $s0, 0x10($sp) -/* CD457C 8024274C 03E00008 */ jr $ra -/* CD4580 80242750 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_17/func_80240040_CD72E0.s b/asm/nonmatchings/world/area_flo/flo_17/func_80240040_CD72E0.s deleted file mode 100644 index 69633055f6..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/func_80240040_CD72E0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_CD7320 -/* CD7320 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CD7324 80240044 AFBF0010 */ sw $ra, 0x10($sp) -/* CD7328 80240048 8C82000C */ lw $v0, 0xc($a0) -/* CD732C 8024004C 3C068016 */ lui $a2, 0x8016 -/* CD7330 80240050 84C6A556 */ lh $a2, -0x5aaa($a2) -/* CD7334 80240054 0C0B2026 */ jal set_variable -/* CD7338 80240058 8C450000 */ lw $a1, ($v0) -/* CD733C 8024005C 8FBF0010 */ lw $ra, 0x10($sp) -/* CD7340 80240060 24020002 */ addiu $v0, $zero, 2 -/* CD7344 80240064 03E00008 */ jr $ra -/* CD7348 80240068 27BD0018 */ addiu $sp, $sp, 0x18 -/* CD734C 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_17/func_80240070_CD72E0.s b/asm/nonmatchings/world/area_flo/flo_17/func_80240070_CD72E0.s deleted file mode 100644 index 8d6af1eb7d..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/func_80240070_CD72E0.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_CD7350 -/* CD7350 80240070 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CD7354 80240074 AFB3002C */ sw $s3, 0x2c($sp) -/* CD7358 80240078 0080982D */ daddu $s3, $a0, $zero -/* CD735C 8024007C AFBF0030 */ sw $ra, 0x30($sp) -/* CD7360 80240080 AFB20028 */ sw $s2, 0x28($sp) -/* CD7364 80240084 AFB10024 */ sw $s1, 0x24($sp) -/* CD7368 80240088 AFB00020 */ sw $s0, 0x20($sp) -/* CD736C 8024008C 8E710148 */ lw $s1, 0x148($s3) -/* CD7370 80240090 86240008 */ lh $a0, 8($s1) -/* CD7374 80240094 0C00EABB */ jal get_npc_unsafe -/* CD7378 80240098 00A0902D */ daddu $s2, $a1, $zero -/* CD737C 8024009C 8E440004 */ lw $a0, 4($s2) -/* CD7380 802400A0 0040802D */ daddu $s0, $v0, $zero -/* CD7384 802400A4 00041FC2 */ srl $v1, $a0, 0x1f -/* CD7388 802400A8 00832021 */ addu $a0, $a0, $v1 -/* CD738C 802400AC 00042043 */ sra $a0, $a0, 1 -/* CD7390 802400B0 0C00A67F */ jal rand_int -/* CD7394 802400B4 24840001 */ addiu $a0, $a0, 1 -/* CD7398 802400B8 8E430004 */ lw $v1, 4($s2) -/* CD739C 802400BC 000327C2 */ srl $a0, $v1, 0x1f -/* CD73A0 802400C0 00641821 */ addu $v1, $v1, $a0 -/* CD73A4 802400C4 00031843 */ sra $v1, $v1, 1 -/* CD73A8 802400C8 00621821 */ addu $v1, $v1, $v0 -/* CD73AC 802400CC A603008E */ sh $v1, 0x8e($s0) -/* CD73B0 802400D0 8E2300D0 */ lw $v1, 0xd0($s1) -/* CD73B4 802400D4 C6000040 */ lwc1 $f0, 0x40($s0) -/* CD73B8 802400D8 C4640000 */ lwc1 $f4, ($v1) -/* CD73BC 802400DC 46802120 */ cvt.s.w $f4, $f4 -/* CD73C0 802400E0 C4620008 */ lwc1 $f2, 8($v1) -/* CD73C4 802400E4 468010A0 */ cvt.s.w $f2, $f2 -/* CD73C8 802400E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD73CC 802400EC 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD73D0 802400F0 44061000 */ mfc1 $a2, $f2 -/* CD73D4 802400F4 C440000C */ lwc1 $f0, 0xc($v0) -/* CD73D8 802400F8 46800020 */ cvt.s.w $f0, $f0 -/* CD73DC 802400FC E7A00014 */ swc1 $f0, 0x14($sp) -/* CD73E0 80240100 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD73E4 80240104 44052000 */ mfc1 $a1, $f4 -/* CD73E8 80240108 C4400010 */ lwc1 $f0, 0x10($v0) -/* CD73EC 8024010C 46800020 */ cvt.s.w $f0, $f0 -/* CD73F0 80240110 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD73F4 80240114 8C640018 */ lw $a0, 0x18($v1) -/* CD73F8 80240118 0C0123F5 */ jal is_point_within_region -/* CD73FC 8024011C 8E070038 */ lw $a3, 0x38($s0) -/* CD7400 80240120 1040000E */ beqz $v0, .L8024015C -/* CD7404 80240124 00000000 */ nop -/* CD7408 80240128 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD740C 8024012C C60C0038 */ lwc1 $f12, 0x38($s0) -/* CD7410 80240130 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CD7414 80240134 C4460000 */ lwc1 $f6, ($v0) -/* CD7418 80240138 468031A0 */ cvt.s.w $f6, $f6 -/* CD741C 8024013C 44063000 */ mfc1 $a2, $f6 -/* CD7420 80240140 C4460008 */ lwc1 $f6, 8($v0) -/* CD7424 80240144 468031A0 */ cvt.s.w $f6, $f6 -/* CD7428 80240148 44073000 */ mfc1 $a3, $f6 -/* CD742C 8024014C 0C00A720 */ jal atan2 -/* CD7430 80240150 00000000 */ nop -/* CD7434 80240154 08090063 */ j .L8024018C -/* CD7438 80240158 E600000C */ swc1 $f0, 0xc($s0) -.L8024015C: -/* CD743C 8024015C 0C00A67F */ jal rand_int -/* CD7440 80240160 2404003C */ addiu $a0, $zero, 0x3c -/* CD7444 80240164 C60C000C */ lwc1 $f12, 0xc($s0) -/* CD7448 80240168 44820000 */ mtc1 $v0, $f0 -/* CD744C 8024016C 00000000 */ nop -/* CD7450 80240170 46800020 */ cvt.s.w $f0, $f0 -/* CD7454 80240174 46006300 */ add.s $f12, $f12, $f0 -/* CD7458 80240178 3C0141F0 */ lui $at, 0x41f0 -/* CD745C 8024017C 44810000 */ mtc1 $at, $f0 -/* CD7460 80240180 0C00A6C9 */ jal clamp_angle -/* CD7464 80240184 46006301 */ sub.s $f12, $f12, $f0 -/* CD7468 80240188 E600000C */ swc1 $f0, 0xc($s0) -.L8024018C: -/* CD746C 8024018C 8E2200CC */ lw $v0, 0xcc($s1) -/* CD7470 80240190 8C420004 */ lw $v0, 4($v0) -/* CD7474 80240194 AE020028 */ sw $v0, 0x28($s0) -/* CD7478 80240198 AE600074 */ sw $zero, 0x74($s3) -/* CD747C 8024019C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD7480 802401A0 8C420014 */ lw $v0, 0x14($v0) -/* CD7484 802401A4 04410004 */ bgez $v0, .L802401B8 -/* CD7488 802401A8 00000000 */ nop -/* CD748C 802401AC C6400000 */ lwc1 $f0, ($s2) -/* CD7490 802401B0 08090076 */ j .L802401D8 -/* CD7494 802401B4 E6000018 */ swc1 $f0, 0x18($s0) -.L802401B8: -/* CD7498 802401B8 3C018024 */ lui $at, 0x8024 -/* CD749C 802401BC D4225300 */ ldc1 $f2, 0x5300($at) -/* CD74A0 802401C0 44820000 */ mtc1 $v0, $f0 -/* CD74A4 802401C4 00000000 */ nop -/* CD74A8 802401C8 46800021 */ cvt.d.w $f0, $f0 -/* CD74AC 802401CC 46220003 */ div.d $f0, $f0, $f2 -/* CD74B0 802401D0 46200020 */ cvt.s.d $f0, $f0 -/* CD74B4 802401D4 E6000018 */ swc1 $f0, 0x18($s0) -.L802401D8: -/* CD74B8 802401D8 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD74BC 802401DC 3C014059 */ lui $at, 0x4059 -/* CD74C0 802401E0 44811800 */ mtc1 $at, $f3 -/* CD74C4 802401E4 44801000 */ mtc1 $zero, $f2 -/* CD74C8 802401E8 46000021 */ cvt.d.s $f0, $f0 -/* CD74CC 802401EC 46220002 */ mul.d $f0, $f0, $f2 -/* CD74D0 802401F0 00000000 */ nop -/* CD74D4 802401F4 24020001 */ addiu $v0, $zero, 1 -/* CD74D8 802401F8 4620018D */ trunc.w.d $f6, $f0 -/* CD74DC 802401FC E626007C */ swc1 $f6, 0x7c($s1) -/* CD74E0 80240200 AE620070 */ sw $v0, 0x70($s3) -/* CD74E4 80240204 8FBF0030 */ lw $ra, 0x30($sp) -/* CD74E8 80240208 8FB3002C */ lw $s3, 0x2c($sp) -/* CD74EC 8024020C 8FB20028 */ lw $s2, 0x28($sp) -/* CD74F0 80240210 8FB10024 */ lw $s1, 0x24($sp) -/* CD74F4 80240214 8FB00020 */ lw $s0, 0x20($sp) -/* CD74F8 80240218 03E00008 */ jr $ra -/* CD74FC 8024021C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_17/func_80240220_CD72E0.s b/asm/nonmatchings/world/area_flo/flo_17/func_80240220_CD72E0.s deleted file mode 100644 index 6faa34d14f..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/func_80240220_CD72E0.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240220_CD7500 -/* CD7500 80240220 27BDFF80 */ addiu $sp, $sp, -0x80 -/* CD7504 80240224 AFB3004C */ sw $s3, 0x4c($sp) -/* CD7508 80240228 0080982D */ daddu $s3, $a0, $zero -/* CD750C 8024022C AFBF0058 */ sw $ra, 0x58($sp) -/* CD7510 80240230 AFB50054 */ sw $s5, 0x54($sp) -/* CD7514 80240234 AFB40050 */ sw $s4, 0x50($sp) -/* CD7518 80240238 AFB20048 */ sw $s2, 0x48($sp) -/* CD751C 8024023C AFB10044 */ sw $s1, 0x44($sp) -/* CD7520 80240240 AFB00040 */ sw $s0, 0x40($sp) -/* CD7524 80240244 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CD7528 80240248 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CD752C 8024024C F7B60068 */ sdc1 $f22, 0x68($sp) -/* CD7530 80240250 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CD7534 80240254 8E710148 */ lw $s1, 0x148($s3) -/* CD7538 80240258 00A0902D */ daddu $s2, $a1, $zero -/* CD753C 8024025C 86240008 */ lh $a0, 8($s1) -/* CD7540 80240260 0C00EABB */ jal get_npc_unsafe -/* CD7544 80240264 00C0A82D */ daddu $s5, $a2, $zero -/* CD7548 80240268 0040802D */ daddu $s0, $v0, $zero -/* CD754C 8024026C 0000A02D */ daddu $s4, $zero, $zero -/* CD7550 80240270 C624007C */ lwc1 $f4, 0x7c($s1) -/* CD7554 80240274 46802120 */ cvt.s.w $f4, $f4 -/* CD7558 80240278 C6220088 */ lwc1 $f2, 0x88($s1) -/* CD755C 8024027C 468010A0 */ cvt.s.w $f2, $f2 -/* CD7560 80240280 460010A1 */ cvt.d.s $f2, $f2 -/* CD7564 80240284 46002121 */ cvt.d.s $f4, $f4 -/* CD7568 80240288 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD756C 8024028C 3C014059 */ lui $at, 0x4059 -/* CD7570 80240290 44813800 */ mtc1 $at, $f7 -/* CD7574 80240294 44803000 */ mtc1 $zero, $f6 -/* CD7578 80240298 46000021 */ cvt.d.s $f0, $f0 -/* CD757C 8024029C 46260002 */ mul.d $f0, $f0, $f6 -/* CD7580 802402A0 00000000 */ nop -/* CD7584 802402A4 24020001 */ addiu $v0, $zero, 1 -/* CD7588 802402A8 8E24006C */ lw $a0, 0x6c($s1) -/* CD758C 802402AC 46261083 */ div.d $f2, $f2, $f6 -/* CD7590 802402B0 462010A0 */ cvt.s.d $f2, $f2 -/* CD7594 802402B4 46262103 */ div.d $f4, $f4, $f6 -/* CD7598 802402B8 46202520 */ cvt.s.d $f20, $f4 -/* CD759C 802402BC 30830011 */ andi $v1, $a0, 0x11 -/* CD75A0 802402C0 4620020D */ trunc.w.d $f8, $f0 -/* CD75A4 802402C4 E628007C */ swc1 $f8, 0x7c($s1) -/* CD75A8 802402C8 C6200078 */ lwc1 $f0, 0x78($s1) -/* CD75AC 802402CC 46800020 */ cvt.s.w $f0, $f0 -/* CD75B0 802402D0 46000021 */ cvt.d.s $f0, $f0 -/* CD75B4 802402D4 46260003 */ div.d $f0, $f0, $f6 -/* CD75B8 802402D8 462006A0 */ cvt.s.d $f26, $f0 -/* CD75BC 802402DC C6200070 */ lwc1 $f0, 0x70($s1) -/* CD75C0 802402E0 46800020 */ cvt.s.w $f0, $f0 -/* CD75C4 802402E4 46000021 */ cvt.d.s $f0, $f0 -/* CD75C8 802402E8 46260003 */ div.d $f0, $f0, $f6 -/* CD75CC 802402EC 462005A0 */ cvt.s.d $f22, $f0 -/* CD75D0 802402F0 14620025 */ bne $v1, $v0, .L80240388 -/* CD75D4 802402F4 4602D600 */ add.s $f24, $f26, $f2 -/* CD75D8 802402F8 8E020000 */ lw $v0, ($s0) -/* CD75DC 802402FC 30420008 */ andi $v0, $v0, 8 -/* CD75E0 80240300 10400009 */ beqz $v0, .L80240328 -/* CD75E4 80240304 27A50028 */ addiu $a1, $sp, 0x28 -/* CD75E8 80240308 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD75EC 8024030C 4600C001 */ sub.s $f0, $f24, $f0 -/* CD75F0 80240310 4600B03C */ c.lt.s $f22, $f0 -/* CD75F4 80240314 00000000 */ nop -/* CD75F8 80240318 4500001B */ bc1f .L80240388 -/* CD75FC 8024031C 34820010 */ ori $v0, $a0, 0x10 -/* CD7600 80240320 080900E2 */ j .L80240388 -/* CD7604 80240324 AE22006C */ sw $v0, 0x6c($s1) -.L80240328: -/* CD7608 80240328 27A6002C */ addiu $a2, $sp, 0x2c -/* CD760C 8024032C C6000038 */ lwc1 $f0, 0x38($s0) -/* CD7610 80240330 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD7614 80240334 C6040040 */ lwc1 $f4, 0x40($s0) -/* CD7618 80240338 3C01447A */ lui $at, 0x447a -/* CD761C 8024033C 44813000 */ mtc1 $at, $f6 -/* CD7620 80240340 27A20034 */ addiu $v0, $sp, 0x34 -/* CD7624 80240344 E7A00028 */ swc1 $f0, 0x28($sp) -/* CD7628 80240348 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CD762C 8024034C E7A40030 */ swc1 $f4, 0x30($sp) -/* CD7630 80240350 E7A60034 */ swc1 $f6, 0x34($sp) -/* CD7634 80240354 AFA20010 */ sw $v0, 0x10($sp) -/* CD7638 80240358 8E040080 */ lw $a0, 0x80($s0) -/* CD763C 8024035C 0C0372DF */ jal func_800DCB7C -/* CD7640 80240360 27A70030 */ addiu $a3, $sp, 0x30 -/* CD7644 80240364 C7A00034 */ lwc1 $f0, 0x34($sp) -/* CD7648 80240368 4600D001 */ sub.s $f0, $f26, $f0 -/* CD764C 8024036C 4600B03C */ c.lt.s $f22, $f0 -/* CD7650 80240370 00000000 */ nop -/* CD7654 80240374 45000004 */ bc1f .L80240388 -/* CD7658 80240378 00000000 */ nop -/* CD765C 8024037C 8E22006C */ lw $v0, 0x6c($s1) -/* CD7660 80240380 34420010 */ ori $v0, $v0, 0x10 -/* CD7664 80240384 AE22006C */ sw $v0, 0x6c($s1) -.L80240388: -/* CD7668 80240388 8E22006C */ lw $v0, 0x6c($s1) -/* CD766C 8024038C 24030011 */ addiu $v1, $zero, 0x11 -/* CD7670 80240390 30420011 */ andi $v0, $v0, 0x11 -/* CD7674 80240394 14430039 */ bne $v0, $v1, .L8024047C -/* CD7678 80240398 00000000 */ nop -/* CD767C 8024039C 8E020000 */ lw $v0, ($s0) -/* CD7680 802403A0 30420008 */ andi $v0, $v0, 8 -/* CD7684 802403A4 1040000A */ beqz $v0, .L802403D0 -/* CD7688 802403A8 4600C106 */ mov.s $f4, $f24 -/* CD768C 802403AC 4614C081 */ sub.s $f2, $f24, $f20 -/* CD7690 802403B0 3C018024 */ lui $at, 0x8024 -/* CD7694 802403B4 D4205308 */ ldc1 $f0, 0x5308($at) -/* CD7698 802403B8 460010A1 */ cvt.d.s $f2, $f2 -/* CD769C 802403BC 46201082 */ mul.d $f2, $f2, $f0 -/* CD76A0 802403C0 00000000 */ nop -/* CD76A4 802403C4 4600A021 */ cvt.d.s $f0, $f20 -/* CD76A8 802403C8 0809010D */ j .L80240434 -/* CD76AC 802403CC 46220000 */ add.d $f0, $f0, $f2 -.L802403D0: -/* CD76B0 802403D0 27A50028 */ addiu $a1, $sp, 0x28 -/* CD76B4 802403D4 27A6002C */ addiu $a2, $sp, 0x2c -/* CD76B8 802403D8 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD76BC 802403DC C6020040 */ lwc1 $f2, 0x40($s0) -/* CD76C0 802403E0 3C01447A */ lui $at, 0x447a -/* CD76C4 802403E4 44812000 */ mtc1 $at, $f4 -/* CD76C8 802403E8 27A20034 */ addiu $v0, $sp, 0x34 -/* CD76CC 802403EC E7B4002C */ swc1 $f20, 0x2c($sp) -/* CD76D0 802403F0 E7A00028 */ swc1 $f0, 0x28($sp) -/* CD76D4 802403F4 E7A20030 */ swc1 $f2, 0x30($sp) -/* CD76D8 802403F8 E7A40034 */ swc1 $f4, 0x34($sp) -/* CD76DC 802403FC AFA20010 */ sw $v0, 0x10($sp) -/* CD76E0 80240400 8E040080 */ lw $a0, 0x80($s0) -/* CD76E4 80240404 0C0372DF */ jal func_800DCB7C -/* CD76E8 80240408 27A70030 */ addiu $a3, $sp, 0x30 -/* CD76EC 8024040C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* CD76F0 80240410 461A2100 */ add.s $f4, $f4, $f26 -/* CD76F4 80240414 46142081 */ sub.s $f2, $f4, $f20 -/* CD76F8 80240418 3C018024 */ lui $at, 0x8024 -/* CD76FC 8024041C D4205310 */ ldc1 $f0, 0x5310($at) -/* CD7700 80240420 460010A1 */ cvt.d.s $f2, $f2 -/* CD7704 80240424 46201082 */ mul.d $f2, $f2, $f0 -/* CD7708 80240428 00000000 */ nop -/* CD770C 8024042C 4600A021 */ cvt.d.s $f0, $f20 -/* CD7710 80240430 46220000 */ add.d $f0, $f0, $f2 -.L80240434: -/* CD7714 80240434 46200020 */ cvt.s.d $f0, $f0 -/* CD7718 80240438 E600003C */ swc1 $f0, 0x3c($s0) -/* CD771C 8024043C C600003C */ lwc1 $f0, 0x3c($s0) -/* CD7720 80240440 46002001 */ sub.s $f0, $f4, $f0 -/* CD7724 80240444 3C013FF0 */ lui $at, 0x3ff0 -/* CD7728 80240448 44811800 */ mtc1 $at, $f3 -/* CD772C 8024044C 44801000 */ mtc1 $zero, $f2 -/* CD7730 80240450 46000005 */ abs.s $f0, $f0 -/* CD7734 80240454 46000021 */ cvt.d.s $f0, $f0 -/* CD7738 80240458 4622003C */ c.lt.d $f0, $f2 -/* CD773C 8024045C 00000000 */ nop -/* CD7740 80240460 45000036 */ bc1f .L8024053C -/* CD7744 80240464 2403FFEF */ addiu $v1, $zero, -0x11 -/* CD7748 80240468 E604003C */ swc1 $f4, 0x3c($s0) -/* CD774C 8024046C 8E22006C */ lw $v0, 0x6c($s1) -/* CD7750 80240470 00431024 */ and $v0, $v0, $v1 -/* CD7754 80240474 0809014F */ j .L8024053C -/* CD7758 80240478 AE22006C */ sw $v0, 0x6c($s1) -.L8024047C: -/* CD775C 8024047C 8E220070 */ lw $v0, 0x70($s1) -/* CD7760 80240480 1840002E */ blez $v0, .L8024053C -/* CD7764 80240484 00000000 */ nop -/* CD7768 80240488 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CD776C 8024048C 0C00A8BB */ jal sin_deg -/* CD7770 80240490 46806320 */ cvt.s.w $f12, $f12 -/* CD7774 80240494 8E020000 */ lw $v0, ($s0) -/* CD7778 80240498 30420008 */ andi $v0, $v0, 8 -/* CD777C 8024049C 10400003 */ beqz $v0, .L802404AC -/* CD7780 802404A0 46000506 */ mov.s $f20, $f0 -/* CD7784 802404A4 0809013B */ j .L802404EC -/* CD7788 802404A8 0000102D */ daddu $v0, $zero, $zero -.L802404AC: -/* CD778C 802404AC 27A50028 */ addiu $a1, $sp, 0x28 -/* CD7790 802404B0 27A6002C */ addiu $a2, $sp, 0x2c -/* CD7794 802404B4 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD7798 802404B8 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD779C 802404BC C6040040 */ lwc1 $f4, 0x40($s0) -/* CD77A0 802404C0 3C01447A */ lui $at, 0x447a -/* CD77A4 802404C4 44813000 */ mtc1 $at, $f6 -/* CD77A8 802404C8 27A20034 */ addiu $v0, $sp, 0x34 -/* CD77AC 802404CC E7A00028 */ swc1 $f0, 0x28($sp) -/* CD77B0 802404D0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CD77B4 802404D4 E7A40030 */ swc1 $f4, 0x30($sp) -/* CD77B8 802404D8 E7A60034 */ swc1 $f6, 0x34($sp) -/* CD77BC 802404DC AFA20010 */ sw $v0, 0x10($sp) -/* CD77C0 802404E0 8E040080 */ lw $a0, 0x80($s0) -/* CD77C4 802404E4 0C0372DF */ jal func_800DCB7C -/* CD77C8 802404E8 27A70030 */ addiu $a3, $sp, 0x30 -.L802404EC: -/* CD77CC 802404EC 10400007 */ beqz $v0, .L8024050C -/* CD77D0 802404F0 00000000 */ nop -/* CD77D4 802404F4 4616A082 */ mul.s $f2, $f20, $f22 -/* CD77D8 802404F8 00000000 */ nop -/* CD77DC 802404FC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CD77E0 80240500 461A0000 */ add.s $f0, $f0, $f26 -/* CD77E4 80240504 08090146 */ j .L80240518 -/* CD77E8 80240508 46020000 */ add.s $f0, $f0, $f2 -.L8024050C: -/* CD77EC 8024050C 4616A002 */ mul.s $f0, $f20, $f22 -/* CD77F0 80240510 00000000 */ nop -/* CD77F4 80240514 4600C000 */ add.s $f0, $f24, $f0 -.L80240518: -/* CD77F8 80240518 E600003C */ swc1 $f0, 0x3c($s0) -/* CD77FC 8024051C 8E220074 */ lw $v0, 0x74($s1) -/* CD7800 80240520 2442000A */ addiu $v0, $v0, 0xa -/* CD7804 80240524 44826000 */ mtc1 $v0, $f12 -/* CD7808 80240528 00000000 */ nop -/* CD780C 8024052C 0C00A6C9 */ jal clamp_angle -/* CD7810 80240530 46806320 */ cvt.s.w $f12, $f12 -/* CD7814 80240534 4600020D */ trunc.w.s $f8, $f0 -/* CD7818 80240538 E6280074 */ swc1 $f8, 0x74($s1) -.L8024053C: -/* CD781C 8024053C 8E220090 */ lw $v0, 0x90($s1) -/* CD7820 80240540 1C40004A */ bgtz $v0, .L8024066C -/* CD7824 80240544 2442FFFF */ addiu $v0, $v0, -1 -/* CD7828 80240548 8E430014 */ lw $v1, 0x14($s2) -/* CD782C 8024054C 04600048 */ bltz $v1, .L80240670 -/* CD7830 80240550 00000000 */ nop -/* CD7834 80240554 8E620074 */ lw $v0, 0x74($s3) -/* CD7838 80240558 1C400042 */ bgtz $v0, .L80240664 -/* CD783C 8024055C 2442FFFF */ addiu $v0, $v0, -1 -/* CD7840 80240560 AE630074 */ sw $v1, 0x74($s3) -/* CD7844 80240564 860200A8 */ lh $v0, 0xa8($s0) -/* CD7848 80240568 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD784C 8024056C 44820000 */ mtc1 $v0, $f0 -/* CD7850 80240570 00000000 */ nop -/* CD7854 80240574 46800020 */ cvt.s.w $f0, $f0 -/* CD7858 80240578 46001080 */ add.s $f2, $f2, $f0 -/* CD785C 8024057C 3C014024 */ lui $at, 0x4024 -/* CD7860 80240580 44810800 */ mtc1 $at, $f1 -/* CD7864 80240584 44800000 */ mtc1 $zero, $f0 -/* CD7868 80240588 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD786C 8024058C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD7870 80240590 460010A1 */ cvt.d.s $f2, $f2 -/* CD7874 80240594 46201080 */ add.d $f2, $f2, $f0 -/* CD7878 80240598 C440002C */ lwc1 $f0, 0x2c($v0) -/* CD787C 8024059C 46000021 */ cvt.d.s $f0, $f0 -/* CD7880 802405A0 4622003C */ c.lt.d $f0, $f2 -/* CD7884 802405A4 00000000 */ nop -/* CD7888 802405A8 4500002C */ bc1f .L8024065C -/* CD788C 802405AC 02A0202D */ daddu $a0, $s5, $zero -/* CD7890 802405B0 AFA00010 */ sw $zero, 0x10($sp) -/* CD7894 802405B4 8E46000C */ lw $a2, 0xc($s2) -/* CD7898 802405B8 8E470010 */ lw $a3, 0x10($s2) -/* CD789C 802405BC 0C01242D */ jal func_800490B4 -/* CD78A0 802405C0 0220282D */ daddu $a1, $s1, $zero -/* CD78A4 802405C4 10400025 */ beqz $v0, .L8024065C -/* CD78A8 802405C8 0000202D */ daddu $a0, $zero, $zero -/* CD78AC 802405CC 0200282D */ daddu $a1, $s0, $zero -/* CD78B0 802405D0 0000302D */ daddu $a2, $zero, $zero -/* CD78B4 802405D4 2412000C */ addiu $s2, $zero, 0xc -/* CD78B8 802405D8 860300A8 */ lh $v1, 0xa8($s0) -/* CD78BC 802405DC 3C013F80 */ lui $at, 0x3f80 -/* CD78C0 802405E0 44810000 */ mtc1 $at, $f0 -/* CD78C4 802405E4 3C014000 */ lui $at, 0x4000 -/* CD78C8 802405E8 44811000 */ mtc1 $at, $f2 -/* CD78CC 802405EC 3C01C1A0 */ lui $at, 0xc1a0 -/* CD78D0 802405F0 44812000 */ mtc1 $at, $f4 -/* CD78D4 802405F4 44834000 */ mtc1 $v1, $f8 -/* CD78D8 802405F8 00000000 */ nop -/* CD78DC 802405FC 46804220 */ cvt.s.w $f8, $f8 -/* CD78E0 80240600 44074000 */ mfc1 $a3, $f8 -/* CD78E4 80240604 27A20038 */ addiu $v0, $sp, 0x38 -/* CD78E8 80240608 AFB2001C */ sw $s2, 0x1c($sp) -/* CD78EC 8024060C AFA20020 */ sw $v0, 0x20($sp) -/* CD78F0 80240610 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD78F4 80240614 E7A20014 */ swc1 $f2, 0x14($sp) -/* CD78F8 80240618 0C01BFA4 */ jal fx_emote -/* CD78FC 8024061C E7A40018 */ swc1 $f4, 0x18($sp) -/* CD7900 80240620 0200202D */ daddu $a0, $s0, $zero -/* CD7904 80240624 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CD7908 80240628 C480003C */ lwc1 $f0, 0x3c($a0) -/* CD790C 8024062C 3C060020 */ lui $a2, 0x20 -/* CD7910 80240630 0C012530 */ jal func_800494C0 -/* CD7914 80240634 E4800064 */ swc1 $f0, 0x64($a0) -/* CD7918 80240638 8E220018 */ lw $v0, 0x18($s1) -/* CD791C 8024063C 9442002A */ lhu $v0, 0x2a($v0) -/* CD7920 80240640 30420001 */ andi $v0, $v0, 1 -/* CD7924 80240644 10400003 */ beqz $v0, .L80240654 -/* CD7928 80240648 2402000A */ addiu $v0, $zero, 0xa -/* CD792C 8024064C 08090205 */ j .L80240814 -/* CD7930 80240650 AE620070 */ sw $v0, 0x70($s3) -.L80240654: -/* CD7934 80240654 08090205 */ j .L80240814 -/* CD7938 80240658 AE720070 */ sw $s2, 0x70($s3) -.L8024065C: -/* CD793C 8024065C 8E620074 */ lw $v0, 0x74($s3) -/* CD7940 80240660 2442FFFF */ addiu $v0, $v0, -1 -.L80240664: -/* CD7944 80240664 0809019C */ j .L80240670 -/* CD7948 80240668 AE620074 */ sw $v0, 0x74($s3) -.L8024066C: -/* CD794C 8024066C AE220090 */ sw $v0, 0x90($s1) -.L80240670: -/* CD7950 80240670 8E2300D0 */ lw $v1, 0xd0($s1) -/* CD7954 80240674 C6000040 */ lwc1 $f0, 0x40($s0) -/* CD7958 80240678 C4620000 */ lwc1 $f2, ($v1) -/* CD795C 8024067C 468010A0 */ cvt.s.w $f2, $f2 -/* CD7960 80240680 C4640008 */ lwc1 $f4, 8($v1) -/* CD7964 80240684 46802120 */ cvt.s.w $f4, $f4 -/* CD7968 80240688 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD796C 8024068C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD7970 80240690 44051000 */ mfc1 $a1, $f2 -/* CD7974 80240694 C440000C */ lwc1 $f0, 0xc($v0) -/* CD7978 80240698 46800020 */ cvt.s.w $f0, $f0 -/* CD797C 8024069C E7A00014 */ swc1 $f0, 0x14($sp) -/* CD7980 802406A0 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD7984 802406A4 44062000 */ mfc1 $a2, $f4 -/* CD7988 802406A8 C4400010 */ lwc1 $f0, 0x10($v0) -/* CD798C 802406AC 46800020 */ cvt.s.w $f0, $f0 -/* CD7990 802406B0 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD7994 802406B4 8C640018 */ lw $a0, 0x18($v1) -/* CD7998 802406B8 0C0123F5 */ jal is_point_within_region -/* CD799C 802406BC 8E070038 */ lw $a3, 0x38($s0) -/* CD79A0 802406C0 1040001A */ beqz $v0, .L8024072C -/* CD79A4 802406C4 00000000 */ nop -/* CD79A8 802406C8 8E060038 */ lw $a2, 0x38($s0) -/* CD79AC 802406CC 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD79B0 802406D0 8E070040 */ lw $a3, 0x40($s0) -/* CD79B4 802406D4 C44C0000 */ lwc1 $f12, ($v0) -/* CD79B8 802406D8 46806320 */ cvt.s.w $f12, $f12 -/* CD79BC 802406DC C44E0008 */ lwc1 $f14, 8($v0) -/* CD79C0 802406E0 0C00A7B5 */ jal dist2D -/* CD79C4 802406E4 468073A0 */ cvt.s.w $f14, $f14 -/* CD79C8 802406E8 C6020018 */ lwc1 $f2, 0x18($s0) -/* CD79CC 802406EC 4600103C */ c.lt.s $f2, $f0 -/* CD79D0 802406F0 00000000 */ nop -/* CD79D4 802406F4 4500000D */ bc1f .L8024072C -/* CD79D8 802406F8 E7A00034 */ swc1 $f0, 0x34($sp) -/* CD79DC 802406FC C60C0038 */ lwc1 $f12, 0x38($s0) -/* CD79E0 80240700 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD79E4 80240704 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CD79E8 80240708 C4480000 */ lwc1 $f8, ($v0) -/* CD79EC 8024070C 46804220 */ cvt.s.w $f8, $f8 -/* CD79F0 80240710 44064000 */ mfc1 $a2, $f8 -/* CD79F4 80240714 C4480008 */ lwc1 $f8, 8($v0) -/* CD79F8 80240718 46804220 */ cvt.s.w $f8, $f8 -/* CD79FC 8024071C 44074000 */ mfc1 $a3, $f8 -/* CD7A00 80240720 0C00A720 */ jal atan2 -/* CD7A04 80240724 24140001 */ addiu $s4, $zero, 1 -/* CD7A08 80240728 E600000C */ swc1 $f0, 0xc($s0) -.L8024072C: -/* CD7A0C 8024072C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD7A10 80240730 8C43000C */ lw $v1, 0xc($v0) -/* CD7A14 80240734 8C420010 */ lw $v0, 0x10($v0) -/* CD7A18 80240738 00621825 */ or $v1, $v1, $v0 -/* CD7A1C 8024073C 00741825 */ or $v1, $v1, $s4 -/* CD7A20 80240740 10600008 */ beqz $v1, .L80240764 -/* CD7A24 80240744 00000000 */ nop -/* CD7A28 80240748 8602008C */ lh $v0, 0x8c($s0) -/* CD7A2C 8024074C 14400031 */ bnez $v0, .L80240814 -/* CD7A30 80240750 00000000 */ nop -/* CD7A34 80240754 8E050018 */ lw $a1, 0x18($s0) -/* CD7A38 80240758 8E06000C */ lw $a2, 0xc($s0) -/* CD7A3C 8024075C 0C00EA95 */ jal npc_move_heading -/* CD7A40 80240760 0200202D */ daddu $a0, $s0, $zero -.L80240764: -/* CD7A44 80240764 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD7A48 80240768 3C014059 */ lui $at, 0x4059 -/* CD7A4C 8024076C 44811800 */ mtc1 $at, $f3 -/* CD7A50 80240770 44801000 */ mtc1 $zero, $f2 -/* CD7A54 80240774 46000021 */ cvt.d.s $f0, $f0 -/* CD7A58 80240778 46220002 */ mul.d $f0, $f0, $f2 -/* CD7A5C 8024077C 00000000 */ nop -/* CD7A60 80240780 4620020D */ trunc.w.d $f8, $f0 -/* CD7A64 80240784 E628007C */ swc1 $f8, 0x7c($s1) -/* CD7A68 80240788 8E420004 */ lw $v0, 4($s2) -/* CD7A6C 8024078C 18400021 */ blez $v0, .L80240814 -/* CD7A70 80240790 00000000 */ nop -/* CD7A74 80240794 8602008E */ lh $v0, 0x8e($s0) -/* CD7A78 80240798 9603008E */ lhu $v1, 0x8e($s0) -/* CD7A7C 8024079C 18400005 */ blez $v0, .L802407B4 -/* CD7A80 802407A0 2462FFFF */ addiu $v0, $v1, -1 -/* CD7A84 802407A4 A602008E */ sh $v0, 0x8e($s0) -/* CD7A88 802407A8 00021400 */ sll $v0, $v0, 0x10 -/* CD7A8C 802407AC 1C400019 */ bgtz $v0, .L80240814 -/* CD7A90 802407B0 00000000 */ nop -.L802407B4: -/* CD7A94 802407B4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CD7A98 802407B8 24020002 */ addiu $v0, $zero, 2 -/* CD7A9C 802407BC 0C00A67F */ jal rand_int -/* CD7AA0 802407C0 AE620070 */ sw $v0, 0x70($s3) -/* CD7AA4 802407C4 3C035555 */ lui $v1, 0x5555 -/* CD7AA8 802407C8 34635556 */ ori $v1, $v1, 0x5556 -/* CD7AAC 802407CC 00430018 */ mult $v0, $v1 -/* CD7AB0 802407D0 000227C3 */ sra $a0, $v0, 0x1f -/* CD7AB4 802407D4 00004010 */ mfhi $t0 -/* CD7AB8 802407D8 01042023 */ subu $a0, $t0, $a0 -/* CD7ABC 802407DC 00041840 */ sll $v1, $a0, 1 -/* CD7AC0 802407E0 00641821 */ addu $v1, $v1, $a0 -/* CD7AC4 802407E4 00431023 */ subu $v0, $v0, $v1 -/* CD7AC8 802407E8 24430002 */ addiu $v1, $v0, 2 -/* CD7ACC 802407EC AE630074 */ sw $v1, 0x74($s3) -/* CD7AD0 802407F0 8E42002C */ lw $v0, 0x2c($s2) -/* CD7AD4 802407F4 58400007 */ blezl $v0, .L80240814 -/* CD7AD8 802407F8 AE600070 */ sw $zero, 0x70($s3) -/* CD7ADC 802407FC 8E420008 */ lw $v0, 8($s2) -/* CD7AE0 80240800 18400003 */ blez $v0, .L80240810 -/* CD7AE4 80240804 28620003 */ slti $v0, $v1, 3 -/* CD7AE8 80240808 10400002 */ beqz $v0, .L80240814 -/* CD7AEC 8024080C 00000000 */ nop -.L80240810: -/* CD7AF0 80240810 AE600070 */ sw $zero, 0x70($s3) -.L80240814: -/* CD7AF4 80240814 8FBF0058 */ lw $ra, 0x58($sp) -/* CD7AF8 80240818 8FB50054 */ lw $s5, 0x54($sp) -/* CD7AFC 8024081C 8FB40050 */ lw $s4, 0x50($sp) -/* CD7B00 80240820 8FB3004C */ lw $s3, 0x4c($sp) -/* CD7B04 80240824 8FB20048 */ lw $s2, 0x48($sp) -/* CD7B08 80240828 8FB10044 */ lw $s1, 0x44($sp) -/* CD7B0C 8024082C 8FB00040 */ lw $s0, 0x40($sp) -/* CD7B10 80240830 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CD7B14 80240834 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CD7B18 80240838 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CD7B1C 8024083C D7B40060 */ ldc1 $f20, 0x60($sp) -/* CD7B20 80240840 03E00008 */ jr $ra -/* CD7B24 80240844 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_flo/flo_17/func_80240908_CD72E0.s b/asm/nonmatchings/world/area_flo/flo_17/func_80240908_CD72E0.s deleted file mode 100644 index 0ede8b2436..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/func_80240908_CD72E0.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240908_CD7BE8 -/* CD7BE8 80240908 27BDFF88 */ addiu $sp, $sp, -0x78 -/* CD7BEC 8024090C AFB3004C */ sw $s3, 0x4c($sp) -/* CD7BF0 80240910 0080982D */ daddu $s3, $a0, $zero -/* CD7BF4 80240914 AFBF0054 */ sw $ra, 0x54($sp) -/* CD7BF8 80240918 AFB40050 */ sw $s4, 0x50($sp) -/* CD7BFC 8024091C AFB20048 */ sw $s2, 0x48($sp) -/* CD7C00 80240920 AFB10044 */ sw $s1, 0x44($sp) -/* CD7C04 80240924 AFB00040 */ sw $s0, 0x40($sp) -/* CD7C08 80240928 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* CD7C0C 8024092C F7B80068 */ sdc1 $f24, 0x68($sp) -/* CD7C10 80240930 F7B60060 */ sdc1 $f22, 0x60($sp) -/* CD7C14 80240934 F7B40058 */ sdc1 $f20, 0x58($sp) -/* CD7C18 80240938 8E710148 */ lw $s1, 0x148($s3) -/* CD7C1C 8024093C 00A0902D */ daddu $s2, $a1, $zero -/* CD7C20 80240940 86240008 */ lh $a0, 8($s1) -/* CD7C24 80240944 0C00EABB */ jal get_npc_unsafe -/* CD7C28 80240948 00C0A02D */ daddu $s4, $a2, $zero -/* CD7C2C 8024094C 0040802D */ daddu $s0, $v0, $zero -/* CD7C30 80240950 C6200078 */ lwc1 $f0, 0x78($s1) -/* CD7C34 80240954 46800020 */ cvt.s.w $f0, $f0 -/* CD7C38 80240958 46000021 */ cvt.d.s $f0, $f0 -/* CD7C3C 8024095C 3C014059 */ lui $at, 0x4059 -/* CD7C40 80240960 44811800 */ mtc1 $at, $f3 -/* CD7C44 80240964 44801000 */ mtc1 $zero, $f2 -/* CD7C48 80240968 8602008E */ lh $v0, 0x8e($s0) -/* CD7C4C 8024096C 9603008E */ lhu $v1, 0x8e($s0) -/* CD7C50 80240970 46220003 */ div.d $f0, $f0, $f2 -/* CD7C54 80240974 46200620 */ cvt.s.d $f24, $f0 -/* CD7C58 80240978 C6200088 */ lwc1 $f0, 0x88($s1) -/* CD7C5C 8024097C 46800020 */ cvt.s.w $f0, $f0 -/* CD7C60 80240980 46000021 */ cvt.d.s $f0, $f0 -/* CD7C64 80240984 46220003 */ div.d $f0, $f0, $f2 -/* CD7C68 80240988 46200020 */ cvt.s.d $f0, $f0 -/* CD7C6C 8024098C 18400003 */ blez $v0, .L8024099C -/* CD7C70 80240990 4600C680 */ add.s $f26, $f24, $f0 -/* CD7C74 80240994 2462FFFF */ addiu $v0, $v1, -1 -/* CD7C78 80240998 A602008E */ sh $v0, 0x8e($s0) -.L8024099C: -/* CD7C7C 8024099C 8E220070 */ lw $v0, 0x70($s1) -/* CD7C80 802409A0 18400034 */ blez $v0, .L80240A74 -/* CD7C84 802409A4 00000000 */ nop -/* CD7C88 802409A8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CD7C8C 802409AC 46806320 */ cvt.s.w $f12, $f12 -/* CD7C90 802409B0 44820000 */ mtc1 $v0, $f0 -/* CD7C94 802409B4 00000000 */ nop -/* CD7C98 802409B8 46800020 */ cvt.s.w $f0, $f0 -/* CD7C9C 802409BC 46000021 */ cvt.d.s $f0, $f0 -/* CD7CA0 802409C0 46220003 */ div.d $f0, $f0, $f2 -/* CD7CA4 802409C4 0C00A8BB */ jal sin_deg -/* CD7CA8 802409C8 462005A0 */ cvt.s.d $f22, $f0 -/* CD7CAC 802409CC 8E020000 */ lw $v0, ($s0) -/* CD7CB0 802409D0 30420008 */ andi $v0, $v0, 8 -/* CD7CB4 802409D4 10400003 */ beqz $v0, .L802409E4 -/* CD7CB8 802409D8 46000506 */ mov.s $f20, $f0 -/* CD7CBC 802409DC 08090289 */ j .L80240A24 -/* CD7CC0 802409E0 0000102D */ daddu $v0, $zero, $zero -.L802409E4: -/* CD7CC4 802409E4 27A50028 */ addiu $a1, $sp, 0x28 -/* CD7CC8 802409E8 27A6002C */ addiu $a2, $sp, 0x2c -/* CD7CCC 802409EC C6000038 */ lwc1 $f0, 0x38($s0) -/* CD7CD0 802409F0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD7CD4 802409F4 C6040040 */ lwc1 $f4, 0x40($s0) -/* CD7CD8 802409F8 3C01447A */ lui $at, 0x447a -/* CD7CDC 802409FC 44813000 */ mtc1 $at, $f6 -/* CD7CE0 80240A00 27A20034 */ addiu $v0, $sp, 0x34 -/* CD7CE4 80240A04 E7A00028 */ swc1 $f0, 0x28($sp) -/* CD7CE8 80240A08 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CD7CEC 80240A0C E7A40030 */ swc1 $f4, 0x30($sp) -/* CD7CF0 80240A10 E7A60034 */ swc1 $f6, 0x34($sp) -/* CD7CF4 80240A14 AFA20010 */ sw $v0, 0x10($sp) -/* CD7CF8 80240A18 8E040080 */ lw $a0, 0x80($s0) -/* CD7CFC 80240A1C 0C0372DF */ jal func_800DCB7C -/* CD7D00 80240A20 27A70030 */ addiu $a3, $sp, 0x30 -.L80240A24: -/* CD7D04 80240A24 10400007 */ beqz $v0, .L80240A44 -/* CD7D08 80240A28 00000000 */ nop -/* CD7D0C 80240A2C 4616A082 */ mul.s $f2, $f20, $f22 -/* CD7D10 80240A30 00000000 */ nop -/* CD7D14 80240A34 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CD7D18 80240A38 46180000 */ add.s $f0, $f0, $f24 -/* CD7D1C 80240A3C 08090294 */ j .L80240A50 -/* CD7D20 80240A40 46020000 */ add.s $f0, $f0, $f2 -.L80240A44: -/* CD7D24 80240A44 4616A002 */ mul.s $f0, $f20, $f22 -/* CD7D28 80240A48 00000000 */ nop -/* CD7D2C 80240A4C 4600D000 */ add.s $f0, $f26, $f0 -.L80240A50: -/* CD7D30 80240A50 E600003C */ swc1 $f0, 0x3c($s0) -/* CD7D34 80240A54 8E220074 */ lw $v0, 0x74($s1) -/* CD7D38 80240A58 2442000A */ addiu $v0, $v0, 0xa -/* CD7D3C 80240A5C 44826000 */ mtc1 $v0, $f12 -/* CD7D40 80240A60 00000000 */ nop -/* CD7D44 80240A64 0C00A6C9 */ jal clamp_angle -/* CD7D48 80240A68 46806320 */ cvt.s.w $f12, $f12 -/* CD7D4C 80240A6C 4600020D */ trunc.w.s $f8, $f0 -/* CD7D50 80240A70 E6280074 */ swc1 $f8, 0x74($s1) -.L80240A74: -/* CD7D54 80240A74 8E220090 */ lw $v0, 0x90($s1) -/* CD7D58 80240A78 1C400040 */ bgtz $v0, .L80240B7C -/* CD7D5C 80240A7C 2442FFFF */ addiu $v0, $v0, -1 -/* CD7D60 80240A80 860200A8 */ lh $v0, 0xa8($s0) -/* CD7D64 80240A84 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD7D68 80240A88 44821000 */ mtc1 $v0, $f2 -/* CD7D6C 80240A8C 00000000 */ nop -/* CD7D70 80240A90 468010A0 */ cvt.s.w $f2, $f2 -/* CD7D74 80240A94 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD7D78 80240A98 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD7D7C 80240A9C 46020000 */ add.s $f0, $f0, $f2 -/* CD7D80 80240AA0 3C014024 */ lui $at, 0x4024 -/* CD7D84 80240AA4 44812800 */ mtc1 $at, $f5 -/* CD7D88 80240AA8 44802000 */ mtc1 $zero, $f4 -/* CD7D8C 80240AAC C442002C */ lwc1 $f2, 0x2c($v0) -/* CD7D90 80240AB0 46000021 */ cvt.d.s $f0, $f0 -/* CD7D94 80240AB4 46240000 */ add.d $f0, $f0, $f4 -/* CD7D98 80240AB8 460010A1 */ cvt.d.s $f2, $f2 -/* CD7D9C 80240ABC 4620103C */ c.lt.d $f2, $f0 -/* CD7DA0 80240AC0 00000000 */ nop -/* CD7DA4 80240AC4 4500002E */ bc1f .L80240B80 -/* CD7DA8 80240AC8 0280202D */ daddu $a0, $s4, $zero -/* CD7DAC 80240ACC 24020001 */ addiu $v0, $zero, 1 -/* CD7DB0 80240AD0 AFA20010 */ sw $v0, 0x10($sp) -/* CD7DB4 80240AD4 8E460024 */ lw $a2, 0x24($s2) -/* CD7DB8 80240AD8 8E470028 */ lw $a3, 0x28($s2) -/* CD7DBC 80240ADC 0C01242D */ jal func_800490B4 -/* CD7DC0 80240AE0 0220282D */ daddu $a1, $s1, $zero -/* CD7DC4 80240AE4 10400026 */ beqz $v0, .L80240B80 -/* CD7DC8 80240AE8 0000202D */ daddu $a0, $zero, $zero -/* CD7DCC 80240AEC 0200282D */ daddu $a1, $s0, $zero -/* CD7DD0 80240AF0 0000302D */ daddu $a2, $zero, $zero -/* CD7DD4 80240AF4 2412000C */ addiu $s2, $zero, 0xc -/* CD7DD8 80240AF8 860300A8 */ lh $v1, 0xa8($s0) -/* CD7DDC 80240AFC 3C013F80 */ lui $at, 0x3f80 -/* CD7DE0 80240B00 44810000 */ mtc1 $at, $f0 -/* CD7DE4 80240B04 3C014000 */ lui $at, 0x4000 -/* CD7DE8 80240B08 44811000 */ mtc1 $at, $f2 -/* CD7DEC 80240B0C 3C01C1A0 */ lui $at, 0xc1a0 -/* CD7DF0 80240B10 44812000 */ mtc1 $at, $f4 -/* CD7DF4 80240B14 44834000 */ mtc1 $v1, $f8 -/* CD7DF8 80240B18 00000000 */ nop -/* CD7DFC 80240B1C 46804220 */ cvt.s.w $f8, $f8 -/* CD7E00 80240B20 44074000 */ mfc1 $a3, $f8 -/* CD7E04 80240B24 27A20038 */ addiu $v0, $sp, 0x38 -/* CD7E08 80240B28 AFB2001C */ sw $s2, 0x1c($sp) -/* CD7E0C 80240B2C AFA20020 */ sw $v0, 0x20($sp) -/* CD7E10 80240B30 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD7E14 80240B34 E7A20014 */ swc1 $f2, 0x14($sp) -/* CD7E18 80240B38 0C01BFA4 */ jal fx_emote -/* CD7E1C 80240B3C E7A40018 */ swc1 $f4, 0x18($sp) -/* CD7E20 80240B40 0200202D */ daddu $a0, $s0, $zero -/* CD7E24 80240B44 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CD7E28 80240B48 C480003C */ lwc1 $f0, 0x3c($a0) -/* CD7E2C 80240B4C 3C060020 */ lui $a2, 0x20 -/* CD7E30 80240B50 0C012530 */ jal func_800494C0 -/* CD7E34 80240B54 E4800064 */ swc1 $f0, 0x64($a0) -/* CD7E38 80240B58 8E220018 */ lw $v0, 0x18($s1) -/* CD7E3C 80240B5C 9442002A */ lhu $v0, 0x2a($v0) -/* CD7E40 80240B60 30420001 */ andi $v0, $v0, 1 -/* CD7E44 80240B64 10400003 */ beqz $v0, .L80240B74 -/* CD7E48 80240B68 2402000A */ addiu $v0, $zero, 0xa -/* CD7E4C 80240B6C 08090307 */ j .L80240C1C -/* CD7E50 80240B70 AE620070 */ sw $v0, 0x70($s3) -.L80240B74: -/* CD7E54 80240B74 08090307 */ j .L80240C1C -/* CD7E58 80240B78 AE720070 */ sw $s2, 0x70($s3) -.L80240B7C: -/* CD7E5C 80240B7C AE220090 */ sw $v0, 0x90($s1) -.L80240B80: -/* CD7E60 80240B80 8602008C */ lh $v0, 0x8c($s0) -/* CD7E64 80240B84 14400025 */ bnez $v0, .L80240C1C -/* CD7E68 80240B88 00000000 */ nop -/* CD7E6C 80240B8C 8602008E */ lh $v0, 0x8e($s0) -/* CD7E70 80240B90 1C400022 */ bgtz $v0, .L80240C1C -/* CD7E74 80240B94 00000000 */ nop -/* CD7E78 80240B98 8E620074 */ lw $v0, 0x74($s3) -/* CD7E7C 80240B9C 2442FFFF */ addiu $v0, $v0, -1 -/* CD7E80 80240BA0 1840001D */ blez $v0, .L80240C18 -/* CD7E84 80240BA4 AE620074 */ sw $v0, 0x74($s3) -/* CD7E88 80240BA8 8E220018 */ lw $v0, 0x18($s1) -/* CD7E8C 80240BAC 9442002A */ lhu $v0, 0x2a($v0) -/* CD7E90 80240BB0 30420010 */ andi $v0, $v0, 0x10 -/* CD7E94 80240BB4 14400007 */ bnez $v0, .L80240BD4 -/* CD7E98 80240BB8 00000000 */ nop -/* CD7E9C 80240BBC C600000C */ lwc1 $f0, 0xc($s0) -/* CD7EA0 80240BC0 3C014334 */ lui $at, 0x4334 -/* CD7EA4 80240BC4 44816000 */ mtc1 $at, $f12 -/* CD7EA8 80240BC8 0C00A6C9 */ jal clamp_angle -/* CD7EAC 80240BCC 460C0300 */ add.s $f12, $f0, $f12 -/* CD7EB0 80240BD0 E600000C */ swc1 $f0, 0xc($s0) -.L80240BD4: -/* CD7EB4 80240BD4 0C00A67F */ jal rand_int -/* CD7EB8 80240BD8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CD7EBC 80240BDC 3C032E8B */ lui $v1, 0x2e8b -/* CD7EC0 80240BE0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* CD7EC4 80240BE4 00430018 */ mult $v0, $v1 -/* CD7EC8 80240BE8 00021FC3 */ sra $v1, $v0, 0x1f -/* CD7ECC 80240BEC 00004010 */ mfhi $t0 -/* CD7ED0 80240BF0 00082043 */ sra $a0, $t0, 1 -/* CD7ED4 80240BF4 00832023 */ subu $a0, $a0, $v1 -/* CD7ED8 80240BF8 00041840 */ sll $v1, $a0, 1 -/* CD7EDC 80240BFC 00641821 */ addu $v1, $v1, $a0 -/* CD7EE0 80240C00 00031880 */ sll $v1, $v1, 2 -/* CD7EE4 80240C04 00641823 */ subu $v1, $v1, $a0 -/* CD7EE8 80240C08 00431023 */ subu $v0, $v0, $v1 -/* CD7EEC 80240C0C 24420005 */ addiu $v0, $v0, 5 -/* CD7EF0 80240C10 08090307 */ j .L80240C1C -/* CD7EF4 80240C14 A602008E */ sh $v0, 0x8e($s0) -.L80240C18: -/* CD7EF8 80240C18 AE600070 */ sw $zero, 0x70($s3) -.L80240C1C: -/* CD7EFC 80240C1C 8FBF0054 */ lw $ra, 0x54($sp) -/* CD7F00 80240C20 8FB40050 */ lw $s4, 0x50($sp) -/* CD7F04 80240C24 8FB3004C */ lw $s3, 0x4c($sp) -/* CD7F08 80240C28 8FB20048 */ lw $s2, 0x48($sp) -/* CD7F0C 80240C2C 8FB10044 */ lw $s1, 0x44($sp) -/* CD7F10 80240C30 8FB00040 */ lw $s0, 0x40($sp) -/* CD7F14 80240C34 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* CD7F18 80240C38 D7B80068 */ ldc1 $f24, 0x68($sp) -/* CD7F1C 80240C3C D7B60060 */ ldc1 $f22, 0x60($sp) -/* CD7F20 80240C40 D7B40058 */ ldc1 $f20, 0x58($sp) -/* CD7F24 80240C44 03E00008 */ jr $ra -/* CD7F28 80240C48 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_flo/flo_17/func_80240C4C_CD72E0.s b/asm/nonmatchings/world/area_flo/flo_17/func_80240C4C_CD72E0.s deleted file mode 100644 index b962d08171..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/func_80240C4C_CD72E0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_CD7F2C -/* CD7F2C 80240C4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD7F30 80240C50 AFB20018 */ sw $s2, 0x18($sp) -/* CD7F34 80240C54 0080902D */ daddu $s2, $a0, $zero -/* CD7F38 80240C58 AFBF001C */ sw $ra, 0x1c($sp) -/* CD7F3C 80240C5C AFB10014 */ sw $s1, 0x14($sp) -/* CD7F40 80240C60 AFB00010 */ sw $s0, 0x10($sp) -/* CD7F44 80240C64 8E510148 */ lw $s1, 0x148($s2) -/* CD7F48 80240C68 0C00EABB */ jal get_npc_unsafe -/* CD7F4C 80240C6C 86240008 */ lh $a0, 8($s1) -/* CD7F50 80240C70 0040802D */ daddu $s0, $v0, $zero -/* CD7F54 80240C74 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD7F58 80240C78 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD7F5C 80240C7C C60C0038 */ lwc1 $f12, 0x38($s0) -/* CD7F60 80240C80 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CD7F64 80240C84 A600008E */ sh $zero, 0x8e($s0) -/* CD7F68 80240C88 8C460028 */ lw $a2, 0x28($v0) -/* CD7F6C 80240C8C 0C00A720 */ jal atan2 -/* CD7F70 80240C90 8C470030 */ lw $a3, 0x30($v0) -/* CD7F74 80240C94 E600000C */ swc1 $f0, 0xc($s0) -/* CD7F78 80240C98 8E2200CC */ lw $v0, 0xcc($s1) -/* CD7F7C 80240C9C 8C420020 */ lw $v0, 0x20($v0) -/* CD7F80 80240CA0 AE020028 */ sw $v0, 0x28($s0) -/* CD7F84 80240CA4 2402000B */ addiu $v0, $zero, 0xb -/* CD7F88 80240CA8 AE420070 */ sw $v0, 0x70($s2) -/* CD7F8C 80240CAC 8FBF001C */ lw $ra, 0x1c($sp) -/* CD7F90 80240CB0 8FB20018 */ lw $s2, 0x18($sp) -/* CD7F94 80240CB4 8FB10014 */ lw $s1, 0x14($sp) -/* CD7F98 80240CB8 8FB00010 */ lw $s0, 0x10($sp) -/* CD7F9C 80240CBC 03E00008 */ jr $ra -/* CD7FA0 80240CC0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_17/func_80240CC4_CD72E0.s b/asm/nonmatchings/world/area_flo/flo_17/func_80240CC4_CD72E0.s deleted file mode 100644 index 9288bb15a3..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/func_80240CC4_CD72E0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC4_CD7FA4 -/* CD7FA4 80240CC4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CD7FA8 80240CC8 AFB00010 */ sw $s0, 0x10($sp) -/* CD7FAC 80240CCC 0080802D */ daddu $s0, $a0, $zero -/* CD7FB0 80240CD0 AFBF0014 */ sw $ra, 0x14($sp) -/* CD7FB4 80240CD4 8E020148 */ lw $v0, 0x148($s0) -/* CD7FB8 80240CD8 0C00EABB */ jal get_npc_unsafe -/* CD7FBC 80240CDC 84440008 */ lh $a0, 8($v0) -/* CD7FC0 80240CE0 9443008E */ lhu $v1, 0x8e($v0) -/* CD7FC4 80240CE4 C440003C */ lwc1 $f0, 0x3c($v0) -/* CD7FC8 80240CE8 24640001 */ addiu $a0, $v1, 1 -/* CD7FCC 80240CEC 00031C00 */ sll $v1, $v1, 0x10 -/* CD7FD0 80240CF0 00031B83 */ sra $v1, $v1, 0xe -/* CD7FD4 80240CF4 A444008E */ sh $a0, 0x8e($v0) -/* CD7FD8 80240CF8 3C018024 */ lui $at, 0x8024 -/* CD7FDC 80240CFC 00230821 */ addu $at, $at, $v1 -/* CD7FE0 80240D00 C422440C */ lwc1 $f2, 0x440c($at) -/* CD7FE4 80240D04 8443008E */ lh $v1, 0x8e($v0) -/* CD7FE8 80240D08 46020000 */ add.s $f0, $f0, $f2 -/* CD7FEC 80240D0C 28630005 */ slti $v1, $v1, 5 -/* CD7FF0 80240D10 14600003 */ bnez $v1, .L80240D20 -/* CD7FF4 80240D14 E440003C */ swc1 $f0, 0x3c($v0) -/* CD7FF8 80240D18 2402000C */ addiu $v0, $zero, 0xc -/* CD7FFC 80240D1C AE020070 */ sw $v0, 0x70($s0) -.L80240D20: -/* CD8000 80240D20 8FBF0014 */ lw $ra, 0x14($sp) -/* CD8004 80240D24 8FB00010 */ lw $s0, 0x10($sp) -/* CD8008 80240D28 03E00008 */ jr $ra -/* CD800C 80240D2C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_17/func_80240D30_CD72E0.s b/asm/nonmatchings/world/area_flo/flo_17/func_80240D30_CD72E0.s deleted file mode 100644 index 771c970692..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/func_80240D30_CD72E0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D30_CD8010 -/* CD8010 80240D30 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CD8014 80240D34 AFB3001C */ sw $s3, 0x1c($sp) -/* CD8018 80240D38 0080982D */ daddu $s3, $a0, $zero -/* CD801C 80240D3C AFBF0020 */ sw $ra, 0x20($sp) -/* CD8020 80240D40 AFB20018 */ sw $s2, 0x18($sp) -/* CD8024 80240D44 AFB10014 */ sw $s1, 0x14($sp) -/* CD8028 80240D48 AFB00010 */ sw $s0, 0x10($sp) -/* CD802C 80240D4C 8E720148 */ lw $s2, 0x148($s3) -/* CD8030 80240D50 86440008 */ lh $a0, 8($s2) -/* CD8034 80240D54 0C00EABB */ jal get_npc_unsafe -/* CD8038 80240D58 00A0802D */ daddu $s0, $a1, $zero -/* CD803C 80240D5C 0040882D */ daddu $s1, $v0, $zero -/* CD8040 80240D60 C6420080 */ lwc1 $f2, 0x80($s2) -/* CD8044 80240D64 468010A0 */ cvt.s.w $f2, $f2 -/* CD8048 80240D68 460010A1 */ cvt.d.s $f2, $f2 -/* CD804C 80240D6C C6400084 */ lwc1 $f0, 0x84($s2) -/* CD8050 80240D70 46800020 */ cvt.s.w $f0, $f0 -/* CD8054 80240D74 46000021 */ cvt.d.s $f0, $f0 -/* CD8058 80240D78 3C014059 */ lui $at, 0x4059 -/* CD805C 80240D7C 44812800 */ mtc1 $at, $f5 -/* CD8060 80240D80 44802000 */ mtc1 $zero, $f4 -/* CD8064 80240D84 8E4200CC */ lw $v0, 0xcc($s2) -/* CD8068 80240D88 C62C0038 */ lwc1 $f12, 0x38($s1) -/* CD806C 80240D8C C62E0040 */ lwc1 $f14, 0x40($s1) -/* CD8070 80240D90 46241083 */ div.d $f2, $f2, $f4 -/* CD8074 80240D94 462010A0 */ cvt.s.d $f2, $f2 -/* CD8078 80240D98 46240003 */ div.d $f0, $f0, $f4 -/* CD807C 80240D9C 8C420020 */ lw $v0, 0x20($v0) -/* CD8080 80240DA0 46200020 */ cvt.s.d $f0, $f0 -/* CD8084 80240DA4 E622001C */ swc1 $f2, 0x1c($s1) -/* CD8088 80240DA8 E6200014 */ swc1 $f0, 0x14($s1) -/* CD808C 80240DAC AE220028 */ sw $v0, 0x28($s1) -/* CD8090 80240DB0 C6000018 */ lwc1 $f0, 0x18($s0) -/* CD8094 80240DB4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD8098 80240DB8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD809C 80240DBC E6200018 */ swc1 $f0, 0x18($s1) -/* CD80A0 80240DC0 8C460028 */ lw $a2, 0x28($v0) -/* CD80A4 80240DC4 0C00A720 */ jal atan2 -/* CD80A8 80240DC8 8C470030 */ lw $a3, 0x30($v0) -/* CD80AC 80240DCC E620000C */ swc1 $f0, 0xc($s1) -/* CD80B0 80240DD0 8E420018 */ lw $v0, 0x18($s2) -/* CD80B4 80240DD4 AE400074 */ sw $zero, 0x74($s2) -/* CD80B8 80240DD8 9442002A */ lhu $v0, 0x2a($v0) -/* CD80BC 80240DDC 30420002 */ andi $v0, $v0, 2 -/* CD80C0 80240DE0 10400005 */ beqz $v0, .L80240DF8 -/* CD80C4 80240DE4 24020003 */ addiu $v0, $zero, 3 -/* CD80C8 80240DE8 A622008E */ sh $v0, 0x8e($s1) -/* CD80CC 80240DEC 2402000D */ addiu $v0, $zero, 0xd -/* CD80D0 80240DF0 08090392 */ j .L80240E48 -/* CD80D4 80240DF4 AE620070 */ sw $v0, 0x70($s3) -.L80240DF8: -/* CD80D8 80240DF8 24030001 */ addiu $v1, $zero, 1 -/* CD80DC 80240DFC 2402000E */ addiu $v0, $zero, 0xe -/* CD80E0 80240E00 A623008E */ sh $v1, 0x8e($s1) -/* CD80E4 80240E04 AE620070 */ sw $v0, 0x70($s3) -/* CD80E8 80240E08 C6200038 */ lwc1 $f0, 0x38($s1) -/* CD80EC 80240E0C 4600018D */ trunc.w.s $f6, $f0 -/* CD80F0 80240E10 44023000 */ mfc1 $v0, $f6 -/* CD80F4 80240E14 00000000 */ nop -/* CD80F8 80240E18 A6420010 */ sh $v0, 0x10($s2) -/* CD80FC 80240E1C C620003C */ lwc1 $f0, 0x3c($s1) -/* CD8100 80240E20 4600018D */ trunc.w.s $f6, $f0 -/* CD8104 80240E24 44023000 */ mfc1 $v0, $f6 -/* CD8108 80240E28 00000000 */ nop -/* CD810C 80240E2C A6420012 */ sh $v0, 0x12($s2) -/* CD8110 80240E30 C6200040 */ lwc1 $f0, 0x40($s1) -/* CD8114 80240E34 A2430007 */ sb $v1, 7($s2) -/* CD8118 80240E38 4600018D */ trunc.w.s $f6, $f0 -/* CD811C 80240E3C 44023000 */ mfc1 $v0, $f6 -/* CD8120 80240E40 00000000 */ nop -/* CD8124 80240E44 A6420014 */ sh $v0, 0x14($s2) -.L80240E48: -/* CD8128 80240E48 8FBF0020 */ lw $ra, 0x20($sp) -/* CD812C 80240E4C 8FB3001C */ lw $s3, 0x1c($sp) -/* CD8130 80240E50 8FB20018 */ lw $s2, 0x18($sp) -/* CD8134 80240E54 8FB10014 */ lw $s1, 0x14($sp) -/* CD8138 80240E58 8FB00010 */ lw $s0, 0x10($sp) -/* CD813C 80240E5C 03E00008 */ jr $ra -/* CD8140 80240E60 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_17/func_80240EC8_CD72E0.s b/asm/nonmatchings/world/area_flo/flo_17/func_80240EC8_CD72E0.s deleted file mode 100644 index 2a3b2e9557..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/func_80240EC8_CD72E0.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EC8_CD81A8 -/* CD81A8 80240EC8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CD81AC 80240ECC AFB20030 */ sw $s2, 0x30($sp) -/* CD81B0 80240ED0 0080902D */ daddu $s2, $a0, $zero -/* CD81B4 80240ED4 AFBF0038 */ sw $ra, 0x38($sp) -/* CD81B8 80240ED8 AFB30034 */ sw $s3, 0x34($sp) -/* CD81BC 80240EDC AFB1002C */ sw $s1, 0x2c($sp) -/* CD81C0 80240EE0 AFB00028 */ sw $s0, 0x28($sp) -/* CD81C4 80240EE4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* CD81C8 80240EE8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* CD81CC 80240EEC 8E510148 */ lw $s1, 0x148($s2) -/* CD81D0 80240EF0 86240008 */ lh $a0, 8($s1) -/* CD81D4 80240EF4 0C00EABB */ jal get_npc_unsafe -/* CD81D8 80240EF8 00A0982D */ daddu $s3, $a1, $zero -/* CD81DC 80240EFC 0040802D */ daddu $s0, $v0, $zero -/* CD81E0 80240F00 0200202D */ daddu $a0, $s0, $zero -/* CD81E4 80240F04 C6220088 */ lwc1 $f2, 0x88($s1) -/* CD81E8 80240F08 468010A0 */ cvt.s.w $f2, $f2 -/* CD81EC 80240F0C 460010A1 */ cvt.d.s $f2, $f2 -/* CD81F0 80240F10 C604001C */ lwc1 $f4, 0x1c($s0) -/* CD81F4 80240F14 C6000014 */ lwc1 $f0, 0x14($s0) -/* CD81F8 80240F18 8E050018 */ lw $a1, 0x18($s0) -/* CD81FC 80240F1C 46002100 */ add.s $f4, $f4, $f0 -/* CD8200 80240F20 8E06000C */ lw $a2, 0xc($s0) -/* CD8204 80240F24 C6200078 */ lwc1 $f0, 0x78($s1) -/* CD8208 80240F28 46800020 */ cvt.s.w $f0, $f0 -/* CD820C 80240F2C E604001C */ swc1 $f4, 0x1c($s0) -/* CD8210 80240F30 3C014059 */ lui $at, 0x4059 -/* CD8214 80240F34 44812800 */ mtc1 $at, $f5 -/* CD8218 80240F38 44802000 */ mtc1 $zero, $f4 -/* CD821C 80240F3C 46000021 */ cvt.d.s $f0, $f0 -/* CD8220 80240F40 46240003 */ div.d $f0, $f0, $f4 -/* CD8224 80240F44 46200520 */ cvt.s.d $f20, $f0 -/* CD8228 80240F48 46241083 */ div.d $f2, $f2, $f4 -/* CD822C 80240F4C 0C00EA95 */ jal npc_move_heading -/* CD8230 80240F50 462015A0 */ cvt.s.d $f22, $f2 -/* CD8234 80240F54 C604001C */ lwc1 $f4, 0x1c($s0) -/* CD8238 80240F58 44801000 */ mtc1 $zero, $f2 -/* CD823C 80240F5C 44801800 */ mtc1 $zero, $f3 -/* CD8240 80240F60 46002021 */ cvt.d.s $f0, $f4 -/* CD8244 80240F64 4620103E */ c.le.d $f2, $f0 -/* CD8248 80240F68 00000000 */ nop -/* CD824C 80240F6C 45000030 */ bc1f .L80241030 -/* CD8250 80240F70 00000000 */ nop -/* CD8254 80240F74 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD8258 80240F78 46040000 */ add.s $f0, $f0, $f4 -/* CD825C 80240F7C E600003C */ swc1 $f0, 0x3c($s0) -/* CD8260 80240F80 8E2200CC */ lw $v0, 0xcc($s1) -/* CD8264 80240F84 8C420024 */ lw $v0, 0x24($v0) -/* CD8268 80240F88 AE020028 */ sw $v0, 0x28($s0) -/* CD826C 80240F8C A2200007 */ sb $zero, 7($s1) -/* CD8270 80240F90 8E020000 */ lw $v0, ($s0) -/* CD8274 80240F94 30420008 */ andi $v0, $v0, 8 -/* CD8278 80240F98 14400011 */ bnez $v0, .L80240FE0 -/* CD827C 80240F9C 0000102D */ daddu $v0, $zero, $zero -/* CD8280 80240FA0 27A50018 */ addiu $a1, $sp, 0x18 -/* CD8284 80240FA4 27A6001C */ addiu $a2, $sp, 0x1c -/* CD8288 80240FA8 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD828C 80240FAC C602003C */ lwc1 $f2, 0x3c($s0) -/* CD8290 80240FB0 C6040040 */ lwc1 $f4, 0x40($s0) -/* CD8294 80240FB4 3C01447A */ lui $at, 0x447a -/* CD8298 80240FB8 44813000 */ mtc1 $at, $f6 -/* CD829C 80240FBC 27A20024 */ addiu $v0, $sp, 0x24 -/* CD82A0 80240FC0 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD82A4 80240FC4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CD82A8 80240FC8 E7A40020 */ swc1 $f4, 0x20($sp) -/* CD82AC 80240FCC E7A60024 */ swc1 $f6, 0x24($sp) -/* CD82B0 80240FD0 AFA20010 */ sw $v0, 0x10($sp) -/* CD82B4 80240FD4 8E040080 */ lw $a0, 0x80($s0) -/* CD82B8 80240FD8 0C0372DF */ jal func_800DCB7C -/* CD82BC 80240FDC 27A70020 */ addiu $a3, $sp, 0x20 -.L80240FE0: -/* CD82C0 80240FE0 1040000B */ beqz $v0, .L80241010 -/* CD82C4 80240FE4 00000000 */ nop -/* CD82C8 80240FE8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CD82CC 80240FEC 46140080 */ add.s $f2, $f0, $f20 -/* CD82D0 80240FF0 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD82D4 80240FF4 4600103E */ c.le.s $f2, $f0 -/* CD82D8 80240FF8 00000000 */ nop -/* CD82DC 80240FFC 4500008D */ bc1f .L80241234 -/* CD82E0 80241000 00000000 */ nop -/* CD82E4 80241004 E602003C */ swc1 $f2, 0x3c($s0) -/* CD82E8 80241008 0809048D */ j .L80241234 -/* CD82EC 8024100C AE400070 */ sw $zero, 0x70($s2) -.L80241010: -/* CD82F0 80241010 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD82F4 80241014 C6000064 */ lwc1 $f0, 0x64($s0) -/* CD82F8 80241018 4602003E */ c.le.s $f0, $f2 -/* CD82FC 8024101C 00000000 */ nop -/* CD8300 80241020 45030084 */ bc1tl .L80241234 -/* CD8304 80241024 AE400070 */ sw $zero, 0x70($s2) -/* CD8308 80241028 0809048D */ j .L80241234 -/* CD830C 8024102C 00000000 */ nop -.L80241030: -/* CD8310 80241030 4622003C */ c.lt.d $f0, $f2 -/* CD8314 80241034 00000000 */ nop -/* CD8318 80241038 4500007E */ bc1f .L80241234 -/* CD831C 8024103C 00000000 */ nop -/* CD8320 80241040 9602008E */ lhu $v0, 0x8e($s0) -/* CD8324 80241044 24420001 */ addiu $v0, $v0, 1 -/* CD8328 80241048 A602008E */ sh $v0, 0x8e($s0) -/* CD832C 8024104C 00021400 */ sll $v0, $v0, 0x10 -/* CD8330 80241050 8E630020 */ lw $v1, 0x20($s3) -/* CD8334 80241054 00021403 */ sra $v0, $v0, 0x10 -/* CD8338 80241058 0043102A */ slt $v0, $v0, $v1 -/* CD833C 8024105C 14400026 */ bnez $v0, .L802410F8 -/* CD8340 80241060 00000000 */ nop -/* CD8344 80241064 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CD8348 80241068 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CD834C 8024106C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD8350 80241070 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD8354 80241074 A600008E */ sh $zero, 0x8e($s0) -/* CD8358 80241078 8C460028 */ lw $a2, 0x28($v0) -/* CD835C 8024107C 0C00A720 */ jal atan2 -/* CD8360 80241080 8C470030 */ lw $a3, 0x30($v0) -/* CD8364 80241084 46000506 */ mov.s $f20, $f0 -/* CD8368 80241088 C60C000C */ lwc1 $f12, 0xc($s0) -/* CD836C 8024108C 0C00A70A */ jal get_clamped_angle_diff -/* CD8370 80241090 4600A386 */ mov.s $f14, $f20 -/* CD8374 80241094 46000086 */ mov.s $f2, $f0 -/* CD8378 80241098 8E62001C */ lw $v0, 0x1c($s3) -/* CD837C 8024109C 46001005 */ abs.s $f0, $f2 -/* CD8380 802410A0 44822000 */ mtc1 $v0, $f4 -/* CD8384 802410A4 00000000 */ nop -/* CD8388 802410A8 46802120 */ cvt.s.w $f4, $f4 -/* CD838C 802410AC 4600203C */ c.lt.s $f4, $f0 -/* CD8390 802410B0 00000000 */ nop -/* CD8394 802410B4 4500000D */ bc1f .L802410EC -/* CD8398 802410B8 00000000 */ nop -/* CD839C 802410BC 44800000 */ mtc1 $zero, $f0 -/* CD83A0 802410C0 C614000C */ lwc1 $f20, 0xc($s0) -/* CD83A4 802410C4 4600103C */ c.lt.s $f2, $f0 -/* CD83A8 802410C8 00000000 */ nop -/* CD83AC 802410CC 45000006 */ bc1f .L802410E8 -/* CD83B0 802410D0 00021023 */ negu $v0, $v0 -/* CD83B4 802410D4 44820000 */ mtc1 $v0, $f0 -/* CD83B8 802410D8 00000000 */ nop -/* CD83BC 802410DC 46800020 */ cvt.s.w $f0, $f0 -/* CD83C0 802410E0 0809043B */ j .L802410EC -/* CD83C4 802410E4 4600A500 */ add.s $f20, $f20, $f0 -.L802410E8: -/* CD83C8 802410E8 4604A500 */ add.s $f20, $f20, $f4 -.L802410EC: -/* CD83CC 802410EC 0C00A6C9 */ jal clamp_angle -/* CD83D0 802410F0 4600A306 */ mov.s $f12, $f20 -/* CD83D4 802410F4 E600000C */ swc1 $f0, 0xc($s0) -.L802410F8: -/* CD83D8 802410F8 8E020000 */ lw $v0, ($s0) -/* CD83DC 802410FC 30420008 */ andi $v0, $v0, 8 -/* CD83E0 80241100 1040000A */ beqz $v0, .L8024112C -/* CD83E4 80241104 27A50018 */ addiu $a1, $sp, 0x18 -/* CD83E8 80241108 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD83EC 8024110C C600001C */ lwc1 $f0, 0x1c($s0) -/* CD83F0 80241110 46001080 */ add.s $f2, $f2, $f0 -/* CD83F4 80241114 4616103C */ c.lt.s $f2, $f22 -/* CD83F8 80241118 00000000 */ nop -/* CD83FC 8024111C 45020045 */ bc1fl .L80241234 -/* CD8400 80241120 E602003C */ swc1 $f2, 0x3c($s0) -/* CD8404 80241124 0809048C */ j .L80241230 -/* CD8408 80241128 E616003C */ swc1 $f22, 0x3c($s0) -.L8024112C: -/* CD840C 8024112C C6000038 */ lwc1 $f0, 0x38($s0) -/* CD8410 80241130 27A6001C */ addiu $a2, $sp, 0x1c -/* CD8414 80241134 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD8418 80241138 860200A8 */ lh $v0, 0xa8($s0) -/* CD841C 8024113C C600001C */ lwc1 $f0, 0x1c($s0) -/* CD8420 80241140 C604003C */ lwc1 $f4, 0x3c($s0) -/* CD8424 80241144 44821000 */ mtc1 $v0, $f2 -/* CD8428 80241148 00000000 */ nop -/* CD842C 8024114C 468010A0 */ cvt.s.w $f2, $f2 -/* CD8430 80241150 46000005 */ abs.s $f0, $f0 -/* CD8434 80241154 46020000 */ add.s $f0, $f0, $f2 -/* CD8438 80241158 C6060040 */ lwc1 $f6, 0x40($s0) -/* CD843C 8024115C 27A20024 */ addiu $v0, $sp, 0x24 -/* CD8440 80241160 46022100 */ add.s $f4, $f4, $f2 -/* CD8444 80241164 3C014024 */ lui $at, 0x4024 -/* CD8448 80241168 44811800 */ mtc1 $at, $f3 -/* CD844C 8024116C 44801000 */ mtc1 $zero, $f2 -/* CD8450 80241170 46000021 */ cvt.d.s $f0, $f0 -/* CD8454 80241174 46220000 */ add.d $f0, $f0, $f2 -/* CD8458 80241178 E7A60020 */ swc1 $f6, 0x20($sp) -/* CD845C 8024117C E7A4001C */ swc1 $f4, 0x1c($sp) -/* CD8460 80241180 46200020 */ cvt.s.d $f0, $f0 -/* CD8464 80241184 E7A00024 */ swc1 $f0, 0x24($sp) -/* CD8468 80241188 AFA20010 */ sw $v0, 0x10($sp) -/* CD846C 8024118C 8E040080 */ lw $a0, 0x80($s0) -/* CD8470 80241190 0C0372DF */ jal func_800DCB7C -/* CD8474 80241194 27A70020 */ addiu $a3, $sp, 0x20 -/* CD8478 80241198 10400015 */ beqz $v0, .L802411F0 -/* CD847C 8024119C 00000000 */ nop -/* CD8480 802411A0 860200A8 */ lh $v0, 0xa8($s0) -/* CD8484 802411A4 C604001C */ lwc1 $f4, 0x1c($s0) -/* CD8488 802411A8 44820000 */ mtc1 $v0, $f0 -/* CD848C 802411AC 00000000 */ nop -/* CD8490 802411B0 46800020 */ cvt.s.w $f0, $f0 -/* CD8494 802411B4 46002085 */ abs.s $f2, $f4 -/* CD8498 802411B8 46020000 */ add.s $f0, $f0, $f2 -/* CD849C 802411BC C7A20024 */ lwc1 $f2, 0x24($sp) -/* CD84A0 802411C0 4600103E */ c.le.s $f2, $f0 -/* CD84A4 802411C4 00000000 */ nop -/* CD84A8 802411C8 45000005 */ bc1f .L802411E0 -/* CD84AC 802411CC 00000000 */ nop -/* CD84B0 802411D0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CD84B4 802411D4 AE00001C */ sw $zero, 0x1c($s0) -/* CD84B8 802411D8 0809048D */ j .L80241234 -/* CD84BC 802411DC E600003C */ swc1 $f0, 0x3c($s0) -.L802411E0: -/* CD84C0 802411E0 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD84C4 802411E4 46040000 */ add.s $f0, $f0, $f4 -/* CD84C8 802411E8 0809048D */ j .L80241234 -/* CD84CC 802411EC E600003C */ swc1 $f0, 0x3c($s0) -.L802411F0: -/* CD84D0 802411F0 C606003C */ lwc1 $f6, 0x3c($s0) -/* CD84D4 802411F4 860200A8 */ lh $v0, 0xa8($s0) -/* CD84D8 802411F8 46163081 */ sub.s $f2, $f6, $f22 -/* CD84DC 802411FC 44820000 */ mtc1 $v0, $f0 -/* CD84E0 80241200 00000000 */ nop -/* CD84E4 80241204 46800020 */ cvt.s.w $f0, $f0 -/* CD84E8 80241208 46001080 */ add.s $f2, $f2, $f0 -/* CD84EC 8024120C C604001C */ lwc1 $f4, 0x1c($s0) -/* CD84F0 80241210 46002005 */ abs.s $f0, $f4 -/* CD84F4 80241214 4602003C */ c.lt.s $f0, $f2 -/* CD84F8 80241218 00000000 */ nop -/* CD84FC 8024121C 45020005 */ bc1fl .L80241234 -/* CD8500 80241220 AE00001C */ sw $zero, 0x1c($s0) -/* CD8504 80241224 46043000 */ add.s $f0, $f6, $f4 -/* CD8508 80241228 0809048D */ j .L80241234 -/* CD850C 8024122C E600003C */ swc1 $f0, 0x3c($s0) -.L80241230: -/* CD8510 80241230 AE00001C */ sw $zero, 0x1c($s0) -.L80241234: -/* CD8514 80241234 8FBF0038 */ lw $ra, 0x38($sp) -/* CD8518 80241238 8FB30034 */ lw $s3, 0x34($sp) -/* CD851C 8024123C 8FB20030 */ lw $s2, 0x30($sp) -/* CD8520 80241240 8FB1002C */ lw $s1, 0x2c($sp) -/* CD8524 80241244 8FB00028 */ lw $s0, 0x28($sp) -/* CD8528 80241248 D7B60048 */ ldc1 $f22, 0x48($sp) -/* CD852C 8024124C D7B40040 */ ldc1 $f20, 0x40($sp) -/* CD8530 80241250 03E00008 */ jr $ra -/* CD8534 80241254 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_17/func_8024137C_CD72E0.s b/asm/nonmatchings/world/area_flo/flo_17/func_8024137C_CD72E0.s deleted file mode 100644 index 9fe700f069..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/func_8024137C_CD72E0.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024137C_CD865C -/* CD865C 8024137C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CD8660 80241380 AFB40040 */ sw $s4, 0x40($sp) -/* CD8664 80241384 0080A02D */ daddu $s4, $a0, $zero -/* CD8668 80241388 AFBF0048 */ sw $ra, 0x48($sp) -/* CD866C 8024138C AFB50044 */ sw $s5, 0x44($sp) -/* CD8670 80241390 AFB3003C */ sw $s3, 0x3c($sp) -/* CD8674 80241394 AFB20038 */ sw $s2, 0x38($sp) -/* CD8678 80241398 AFB10034 */ sw $s1, 0x34($sp) -/* CD867C 8024139C AFB00030 */ sw $s0, 0x30($sp) -/* CD8680 802413A0 8E920148 */ lw $s2, 0x148($s4) -/* CD8684 802413A4 86440008 */ lh $a0, 8($s2) -/* CD8688 802413A8 8E90000C */ lw $s0, 0xc($s4) -/* CD868C 802413AC 0C00EABB */ jal get_npc_unsafe -/* CD8690 802413B0 00A0882D */ daddu $s1, $a1, $zero -/* CD8694 802413B4 0280202D */ daddu $a0, $s4, $zero -/* CD8698 802413B8 8E050000 */ lw $a1, ($s0) -/* CD869C 802413BC 0C0B1EAF */ jal get_variable -/* CD86A0 802413C0 0040A82D */ daddu $s5, $v0, $zero -/* CD86A4 802413C4 AFA00010 */ sw $zero, 0x10($sp) -/* CD86A8 802413C8 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD86AC 802413CC 8C630030 */ lw $v1, 0x30($v1) -/* CD86B0 802413D0 AFA30014 */ sw $v1, 0x14($sp) -/* CD86B4 802413D4 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD86B8 802413D8 8C63001C */ lw $v1, 0x1c($v1) -/* CD86BC 802413DC AFA30018 */ sw $v1, 0x18($sp) -/* CD86C0 802413E0 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD86C4 802413E4 8C630024 */ lw $v1, 0x24($v1) -/* CD86C8 802413E8 AFA3001C */ sw $v1, 0x1c($sp) -/* CD86CC 802413EC 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD86D0 802413F0 8C630028 */ lw $v1, 0x28($v1) -/* CD86D4 802413F4 27B30010 */ addiu $s3, $sp, 0x10 -/* CD86D8 802413F8 AFA30020 */ sw $v1, 0x20($sp) -/* CD86DC 802413FC 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD86E0 80241400 3C0142F0 */ lui $at, 0x42f0 -/* CD86E4 80241404 44810000 */ mtc1 $at, $f0 -/* CD86E8 80241408 8C63002C */ lw $v1, 0x2c($v1) -/* CD86EC 8024140C 0040802D */ daddu $s0, $v0, $zero -/* CD86F0 80241410 E7A00028 */ swc1 $f0, 0x28($sp) -/* CD86F4 80241414 A7A0002C */ sh $zero, 0x2c($sp) -/* CD86F8 80241418 12200006 */ beqz $s1, .L80241434 -/* CD86FC 8024141C AFA30024 */ sw $v1, 0x24($sp) -/* CD8700 80241420 02A0202D */ daddu $a0, $s5, $zero -/* CD8704 80241424 0240282D */ daddu $a1, $s2, $zero -/* CD8708 80241428 0280302D */ daddu $a2, $s4, $zero -/* CD870C 8024142C 0C090496 */ jal func_80241258 -/* CD8710 80241430 0200382D */ daddu $a3, $s0, $zero -.L80241434: -/* CD8714 80241434 2402FFFE */ addiu $v0, $zero, -2 -/* CD8718 80241438 A2A200AB */ sb $v0, 0xab($s5) -/* CD871C 8024143C 8E4300B0 */ lw $v1, 0xb0($s2) -/* CD8720 80241440 30620004 */ andi $v0, $v1, 4 -/* CD8724 80241444 10400007 */ beqz $v0, .L80241464 -/* CD8728 80241448 00000000 */ nop -/* CD872C 8024144C 824200B4 */ lb $v0, 0xb4($s2) -/* CD8730 80241450 1440003C */ bnez $v0, .L80241544 -/* CD8734 80241454 0000102D */ daddu $v0, $zero, $zero -/* CD8738 80241458 2402FFFB */ addiu $v0, $zero, -5 -/* CD873C 8024145C 00621024 */ and $v0, $v1, $v0 -/* CD8740 80241460 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241464: -/* CD8744 80241464 8E830070 */ lw $v1, 0x70($s4) -/* CD8748 80241468 2C62000F */ sltiu $v0, $v1, 0xf -/* CD874C 8024146C 10400034 */ beqz $v0, .L80241540 -/* CD8750 80241470 00031080 */ sll $v0, $v1, 2 -/* CD8754 80241474 3C018024 */ lui $at, 0x8024 -/* CD8758 80241478 00220821 */ addu $at, $at, $v0 -/* CD875C 8024147C 8C225318 */ lw $v0, 0x5318($at) -/* CD8760 80241480 00400008 */ jr $v0 -/* CD8764 80241484 00000000 */ nop -/* CD8768 80241488 0280202D */ daddu $a0, $s4, $zero -/* CD876C 8024148C 0200282D */ daddu $a1, $s0, $zero -/* CD8770 80241490 0C09001C */ jal func_80240070 -/* CD8774 80241494 0260302D */ daddu $a2, $s3, $zero -/* CD8778 80241498 0280202D */ daddu $a0, $s4, $zero -/* CD877C 8024149C 0200282D */ daddu $a1, $s0, $zero -/* CD8780 802414A0 0C090088 */ jal func_80240220 -/* CD8784 802414A4 0260302D */ daddu $a2, $s3, $zero -/* CD8788 802414A8 08090551 */ j .L80241544 -/* CD878C 802414AC 0000102D */ daddu $v0, $zero, $zero -/* CD8790 802414B0 0280202D */ daddu $a0, $s4, $zero -/* CD8794 802414B4 0200282D */ daddu $a1, $s0, $zero -/* CD8798 802414B8 0C090212 */ jal func_80240848 -/* CD879C 802414BC 0260302D */ daddu $a2, $s3, $zero -/* CD87A0 802414C0 0280202D */ daddu $a0, $s4, $zero -/* CD87A4 802414C4 0200282D */ daddu $a1, $s0, $zero -/* CD87A8 802414C8 0C090242 */ jal func_80240908 -/* CD87AC 802414CC 0260302D */ daddu $a2, $s3, $zero -/* CD87B0 802414D0 08090551 */ j .L80241544 -/* CD87B4 802414D4 0000102D */ daddu $v0, $zero, $zero -/* CD87B8 802414D8 0280202D */ daddu $a0, $s4, $zero -/* CD87BC 802414DC 0200282D */ daddu $a1, $s0, $zero -/* CD87C0 802414E0 0C090313 */ jal func_80240C4C -/* CD87C4 802414E4 0260302D */ daddu $a2, $s3, $zero -/* CD87C8 802414E8 0280202D */ daddu $a0, $s4, $zero -/* CD87CC 802414EC 0200282D */ daddu $a1, $s0, $zero -/* CD87D0 802414F0 0C090331 */ jal func_80240CC4 -/* CD87D4 802414F4 0260302D */ daddu $a2, $s3, $zero -/* CD87D8 802414F8 08090551 */ j .L80241544 -/* CD87DC 802414FC 0000102D */ daddu $v0, $zero, $zero -/* CD87E0 80241500 0280202D */ daddu $a0, $s4, $zero -/* CD87E4 80241504 0200282D */ daddu $a1, $s0, $zero -/* CD87E8 80241508 0C09034C */ jal func_80240D30 -/* CD87EC 8024150C 0260302D */ daddu $a2, $s3, $zero -/* CD87F0 80241510 08090551 */ j .L80241544 -/* CD87F4 80241514 0000102D */ daddu $v0, $zero, $zero -/* CD87F8 80241518 0280202D */ daddu $a0, $s4, $zero -/* CD87FC 8024151C 0200282D */ daddu $a1, $s0, $zero -/* CD8800 80241520 0C090399 */ jal func_80240E64 -/* CD8804 80241524 0260302D */ daddu $a2, $s3, $zero -/* CD8808 80241528 08090551 */ j .L80241544 -/* CD880C 8024152C 0000102D */ daddu $v0, $zero, $zero -/* CD8810 80241530 0280202D */ daddu $a0, $s4, $zero -/* CD8814 80241534 0200282D */ daddu $a1, $s0, $zero -/* CD8818 80241538 0C0903B2 */ jal func_80240EC8 -/* CD881C 8024153C 0260302D */ daddu $a2, $s3, $zero -.L80241540: -/* CD8820 80241540 0000102D */ daddu $v0, $zero, $zero -.L80241544: -/* CD8824 80241544 8FBF0048 */ lw $ra, 0x48($sp) -/* CD8828 80241548 8FB50044 */ lw $s5, 0x44($sp) -/* CD882C 8024154C 8FB40040 */ lw $s4, 0x40($sp) -/* CD8830 80241550 8FB3003C */ lw $s3, 0x3c($sp) -/* CD8834 80241554 8FB20038 */ lw $s2, 0x38($sp) -/* CD8838 80241558 8FB10034 */ lw $s1, 0x34($sp) -/* CD883C 8024155C 8FB00030 */ lw $s0, 0x30($sp) -/* CD8840 80241560 03E00008 */ jr $ra -/* CD8844 80241564 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_17/func_802415B0_CD72E0.s b/asm/nonmatchings/world/area_flo/flo_17/func_802415B0_CD72E0.s deleted file mode 100644 index fbf58d9e86..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/func_802415B0_CD72E0.s +++ /dev/null @@ -1,295 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415B0_CD8890 -/* CD8890 802415B0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* CD8894 802415B4 AFB20048 */ sw $s2, 0x48($sp) -/* CD8898 802415B8 0080902D */ daddu $s2, $a0, $zero -/* CD889C 802415BC AFBF0064 */ sw $ra, 0x64($sp) -/* CD88A0 802415C0 AFBE0060 */ sw $fp, 0x60($sp) -/* CD88A4 802415C4 AFB7005C */ sw $s7, 0x5c($sp) -/* CD88A8 802415C8 AFB60058 */ sw $s6, 0x58($sp) -/* CD88AC 802415CC AFB50054 */ sw $s5, 0x54($sp) -/* CD88B0 802415D0 AFB40050 */ sw $s4, 0x50($sp) -/* CD88B4 802415D4 AFB3004C */ sw $s3, 0x4c($sp) -/* CD88B8 802415D8 AFB10044 */ sw $s1, 0x44($sp) -/* CD88BC 802415DC AFB00040 */ sw $s0, 0x40($sp) -/* CD88C0 802415E0 F7BA0080 */ sdc1 $f26, 0x80($sp) -/* CD88C4 802415E4 F7B80078 */ sdc1 $f24, 0x78($sp) -/* CD88C8 802415E8 F7B60070 */ sdc1 $f22, 0x70($sp) -/* CD88CC 802415EC F7B40068 */ sdc1 $f20, 0x68($sp) -/* CD88D0 802415F0 8E510148 */ lw $s1, 0x148($s2) -/* CD88D4 802415F4 00A0B82D */ daddu $s7, $a1, $zero -/* CD88D8 802415F8 86240008 */ lh $a0, 8($s1) -/* CD88DC 802415FC 0C00EABB */ jal get_npc_unsafe -/* CD88E0 80241600 00C0F02D */ daddu $fp, $a2, $zero -/* CD88E4 80241604 C620007C */ lwc1 $f0, 0x7c($s1) -/* CD88E8 80241608 46800020 */ cvt.s.w $f0, $f0 -/* CD88EC 8024160C 46000021 */ cvt.d.s $f0, $f0 -/* CD88F0 80241610 0040802D */ daddu $s0, $v0, $zero -/* CD88F4 80241614 3C014059 */ lui $at, 0x4059 -/* CD88F8 80241618 44813800 */ mtc1 $at, $f7 -/* CD88FC 8024161C 44803000 */ mtc1 $zero, $f6 -/* CD8900 80241620 8602008E */ lh $v0, 0x8e($s0) -/* CD8904 80241624 9603008E */ lhu $v1, 0x8e($s0) -/* CD8908 80241628 46260003 */ div.d $f0, $f0, $f6 -/* CD890C 8024162C 462005A0 */ cvt.s.d $f22, $f0 -/* CD8910 80241630 C6200078 */ lwc1 $f0, 0x78($s1) -/* CD8914 80241634 46800020 */ cvt.s.w $f0, $f0 -/* CD8918 80241638 46000021 */ cvt.d.s $f0, $f0 -/* CD891C 8024163C 46260003 */ div.d $f0, $f0, $f6 -/* CD8920 80241640 18400003 */ blez $v0, .L80241650 -/* CD8924 80241644 46200620 */ cvt.s.d $f24, $f0 -/* CD8928 80241648 2462FFFF */ addiu $v0, $v1, -1 -/* CD892C 8024164C A602008E */ sh $v0, 0x8e($s0) -.L80241650: -/* CD8930 80241650 27B40028 */ addiu $s4, $sp, 0x28 -/* CD8934 80241654 0280282D */ daddu $a1, $s4, $zero -/* CD8938 80241658 27B5002C */ addiu $s5, $sp, 0x2c -/* CD893C 8024165C 02A0302D */ daddu $a2, $s5, $zero -/* CD8940 80241660 27B60030 */ addiu $s6, $sp, 0x30 -/* CD8944 80241664 02C0382D */ daddu $a3, $s6, $zero -/* CD8948 80241668 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD894C 8024166C C602003C */ lwc1 $f2, 0x3c($s0) -/* CD8950 80241670 C6040040 */ lwc1 $f4, 0x40($s0) -/* CD8954 80241674 3C01447A */ lui $at, 0x447a -/* CD8958 80241678 4481D000 */ mtc1 $at, $f26 -/* CD895C 8024167C 27B30034 */ addiu $s3, $sp, 0x34 -/* CD8960 80241680 E7A00028 */ swc1 $f0, 0x28($sp) -/* CD8964 80241684 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CD8968 80241688 E7A40030 */ swc1 $f4, 0x30($sp) -/* CD896C 8024168C E7BA0034 */ swc1 $f26, 0x34($sp) -/* CD8970 80241690 C6340070 */ lwc1 $f20, 0x70($s1) -/* CD8974 80241694 4680A520 */ cvt.s.w $f20, $f20 -/* CD8978 80241698 4600A521 */ cvt.d.s $f20, $f20 -/* CD897C 8024169C 4626A503 */ div.d $f20, $f20, $f6 -/* CD8980 802416A0 AFB30010 */ sw $s3, 0x10($sp) -/* CD8984 802416A4 8E040080 */ lw $a0, 0x80($s0) -/* CD8988 802416A8 0C0372DF */ jal func_800DCB7C -/* CD898C 802416AC 4620A520 */ cvt.s.d $f20, $f20 -/* CD8990 802416B0 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CD8994 802416B4 0C00A8BB */ jal sin_deg -/* CD8998 802416B8 46806320 */ cvt.s.w $f12, $f12 -/* CD899C 802416BC 46140002 */ mul.s $f0, $f0, $f20 -/* CD89A0 802416C0 00000000 */ nop -/* CD89A4 802416C4 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* CD89A8 802416C8 46181080 */ add.s $f2, $f2, $f24 -/* CD89AC 802416CC 46001080 */ add.s $f2, $f2, $f0 -/* CD89B0 802416D0 E602003C */ swc1 $f2, 0x3c($s0) -/* CD89B4 802416D4 8E220074 */ lw $v0, 0x74($s1) -/* CD89B8 802416D8 2442000C */ addiu $v0, $v0, 0xc -/* CD89BC 802416DC 44826000 */ mtc1 $v0, $f12 -/* CD89C0 802416E0 00000000 */ nop -/* CD89C4 802416E4 0C00A6C9 */ jal clamp_angle -/* CD89C8 802416E8 46806320 */ cvt.s.w $f12, $f12 -/* CD89CC 802416EC 4600020D */ trunc.w.s $f8, $f0 -/* CD89D0 802416F0 E6280074 */ swc1 $f8, 0x74($s1) -/* CD89D4 802416F4 8EE30014 */ lw $v1, 0x14($s7) -/* CD89D8 802416F8 0460003C */ bltz $v1, .L802417EC -/* CD89DC 802416FC 00000000 */ nop -/* CD89E0 80241700 8E420074 */ lw $v0, 0x74($s2) -/* CD89E4 80241704 1C400038 */ bgtz $v0, .L802417E8 -/* CD89E8 80241708 2442FFFF */ addiu $v0, $v0, -1 -/* CD89EC 8024170C 03C0202D */ daddu $a0, $fp, $zero -/* CD89F0 80241710 AE430074 */ sw $v1, 0x74($s2) -/* CD89F4 80241714 AFA00010 */ sw $zero, 0x10($sp) -/* CD89F8 80241718 8EE6000C */ lw $a2, 0xc($s7) -/* CD89FC 8024171C 8EE70010 */ lw $a3, 0x10($s7) -/* CD8A00 80241720 0C01242D */ jal func_800490B4 -/* CD8A04 80241724 0220282D */ daddu $a1, $s1, $zero -/* CD8A08 80241728 1040002D */ beqz $v0, .L802417E0 -/* CD8A0C 8024172C 0000202D */ daddu $a0, $zero, $zero -/* CD8A10 80241730 0200282D */ daddu $a1, $s0, $zero -/* CD8A14 80241734 0000302D */ daddu $a2, $zero, $zero -/* CD8A18 80241738 860300A8 */ lh $v1, 0xa8($s0) -/* CD8A1C 8024173C 3C013F80 */ lui $at, 0x3f80 -/* CD8A20 80241740 44810000 */ mtc1 $at, $f0 -/* CD8A24 80241744 3C014000 */ lui $at, 0x4000 -/* CD8A28 80241748 44811000 */ mtc1 $at, $f2 -/* CD8A2C 8024174C 3C01C1A0 */ lui $at, 0xc1a0 -/* CD8A30 80241750 44812000 */ mtc1 $at, $f4 -/* CD8A34 80241754 2402000F */ addiu $v0, $zero, 0xf -/* CD8A38 80241758 AFA2001C */ sw $v0, 0x1c($sp) -/* CD8A3C 8024175C 44834000 */ mtc1 $v1, $f8 -/* CD8A40 80241760 00000000 */ nop -/* CD8A44 80241764 46804220 */ cvt.s.w $f8, $f8 -/* CD8A48 80241768 44074000 */ mfc1 $a3, $f8 -/* CD8A4C 8024176C 27A20038 */ addiu $v0, $sp, 0x38 -/* CD8A50 80241770 AFA20020 */ sw $v0, 0x20($sp) -/* CD8A54 80241774 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD8A58 80241778 E7A20014 */ swc1 $f2, 0x14($sp) -/* CD8A5C 8024177C 0C01BFA4 */ jal fx_emote -/* CD8A60 80241780 E7A40018 */ swc1 $f4, 0x18($sp) -/* CD8A64 80241784 0200202D */ daddu $a0, $s0, $zero -/* CD8A68 80241788 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CD8A6C 8024178C 0C012530 */ jal func_800494C0 -/* CD8A70 80241790 3C060020 */ lui $a2, 0x20 -/* CD8A74 80241794 0280282D */ daddu $a1, $s4, $zero -/* CD8A78 80241798 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD8A7C 8024179C C602003C */ lwc1 $f2, 0x3c($s0) -/* CD8A80 802417A0 C6040040 */ lwc1 $f4, 0x40($s0) -/* CD8A84 802417A4 02A0302D */ daddu $a2, $s5, $zero -/* CD8A88 802417A8 E7BA0034 */ swc1 $f26, 0x34($sp) -/* CD8A8C 802417AC E7A00028 */ swc1 $f0, 0x28($sp) -/* CD8A90 802417B0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CD8A94 802417B4 E7A40030 */ swc1 $f4, 0x30($sp) -/* CD8A98 802417B8 AFB30010 */ sw $s3, 0x10($sp) -/* CD8A9C 802417BC 8E040080 */ lw $a0, 0x80($s0) -/* CD8AA0 802417C0 0C0372DF */ jal func_800DCB7C -/* CD8AA4 802417C4 02C0382D */ daddu $a3, $s6, $zero -/* CD8AA8 802417C8 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CD8AAC 802417CC 46180000 */ add.s $f0, $f0, $f24 -/* CD8AB0 802417D0 2402000C */ addiu $v0, $zero, 0xc -/* CD8AB4 802417D4 E6000064 */ swc1 $f0, 0x64($s0) -/* CD8AB8 802417D8 08090675 */ j .L802419D4 -/* CD8ABC 802417DC AE420070 */ sw $v0, 0x70($s2) -.L802417E0: -/* CD8AC0 802417E0 8E420074 */ lw $v0, 0x74($s2) -/* CD8AC4 802417E4 2442FFFF */ addiu $v0, $v0, -1 -.L802417E8: -/* CD8AC8 802417E8 AE420074 */ sw $v0, 0x74($s2) -.L802417EC: -/* CD8ACC 802417EC 8E2300D0 */ lw $v1, 0xd0($s1) -/* CD8AD0 802417F0 C6000040 */ lwc1 $f0, 0x40($s0) -/* CD8AD4 802417F4 C4620000 */ lwc1 $f2, ($v1) -/* CD8AD8 802417F8 468010A0 */ cvt.s.w $f2, $f2 -/* CD8ADC 802417FC C4640008 */ lwc1 $f4, 8($v1) -/* CD8AE0 80241800 46802120 */ cvt.s.w $f4, $f4 -/* CD8AE4 80241804 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD8AE8 80241808 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD8AEC 8024180C 44051000 */ mfc1 $a1, $f2 -/* CD8AF0 80241810 C440000C */ lwc1 $f0, 0xc($v0) -/* CD8AF4 80241814 46800020 */ cvt.s.w $f0, $f0 -/* CD8AF8 80241818 E7A00014 */ swc1 $f0, 0x14($sp) -/* CD8AFC 8024181C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD8B00 80241820 44062000 */ mfc1 $a2, $f4 -/* CD8B04 80241824 C4400010 */ lwc1 $f0, 0x10($v0) -/* CD8B08 80241828 46800020 */ cvt.s.w $f0, $f0 -/* CD8B0C 8024182C E7A00018 */ swc1 $f0, 0x18($sp) -/* CD8B10 80241830 8C640018 */ lw $a0, 0x18($v1) -/* CD8B14 80241834 0C0123F5 */ jal is_point_within_region -/* CD8B18 80241838 8E070038 */ lw $a3, 0x38($s0) -/* CD8B1C 8024183C 1040000D */ beqz $v0, .L80241874 -/* CD8B20 80241840 00000000 */ nop -/* CD8B24 80241844 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD8B28 80241848 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CD8B2C 8024184C C60E0040 */ lwc1 $f14, 0x40($s0) -/* CD8B30 80241850 C4480000 */ lwc1 $f8, ($v0) -/* CD8B34 80241854 46804220 */ cvt.s.w $f8, $f8 -/* CD8B38 80241858 44064000 */ mfc1 $a2, $f8 -/* CD8B3C 8024185C C4480008 */ lwc1 $f8, 8($v0) -/* CD8B40 80241860 46804220 */ cvt.s.w $f8, $f8 -/* CD8B44 80241864 44074000 */ mfc1 $a3, $f8 -/* CD8B48 80241868 0C00A720 */ jal atan2 -/* CD8B4C 8024186C 00000000 */ nop -/* CD8B50 80241870 E600000C */ swc1 $f0, 0xc($s0) -.L80241874: -/* CD8B54 80241874 8602008C */ lh $v0, 0x8c($s0) -/* CD8B58 80241878 14400056 */ bnez $v0, .L802419D4 -/* CD8B5C 8024187C 00000000 */ nop -/* CD8B60 80241880 8602008E */ lh $v0, 0x8e($s0) -/* CD8B64 80241884 1840003D */ blez $v0, .L8024197C -/* CD8B68 80241888 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CD8B6C 8024188C 8E050018 */ lw $a1, 0x18($s0) -/* CD8B70 80241890 8E06000C */ lw $a2, 0xc($s0) -/* CD8B74 80241894 0C00EA95 */ jal npc_move_heading -/* CD8B78 80241898 0200202D */ daddu $a0, $s0, $zero -/* CD8B7C 8024189C 8E22006C */ lw $v0, 0x6c($s1) -/* CD8B80 802418A0 30420001 */ andi $v0, $v0, 1 -/* CD8B84 802418A4 10400032 */ beqz $v0, .L80241970 -/* CD8B88 802418A8 27A50028 */ addiu $a1, $sp, 0x28 -/* CD8B8C 802418AC 27A6002C */ addiu $a2, $sp, 0x2c -/* CD8B90 802418B0 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD8B94 802418B4 C6020040 */ lwc1 $f2, 0x40($s0) -/* CD8B98 802418B8 3C01447A */ lui $at, 0x447a -/* CD8B9C 802418BC 44812000 */ mtc1 $at, $f4 -/* CD8BA0 802418C0 27A20034 */ addiu $v0, $sp, 0x34 -/* CD8BA4 802418C4 E7B6002C */ swc1 $f22, 0x2c($sp) -/* CD8BA8 802418C8 E7A00028 */ swc1 $f0, 0x28($sp) -/* CD8BAC 802418CC E7A20030 */ swc1 $f2, 0x30($sp) -/* CD8BB0 802418D0 E7A40034 */ swc1 $f4, 0x34($sp) -/* CD8BB4 802418D4 AFA20010 */ sw $v0, 0x10($sp) -/* CD8BB8 802418D8 8E040080 */ lw $a0, 0x80($s0) -/* CD8BBC 802418DC 0C0372DF */ jal func_800DCB7C -/* CD8BC0 802418E0 27A70030 */ addiu $a3, $sp, 0x30 -/* CD8BC4 802418E4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CD8BC8 802418E8 46180100 */ add.s $f4, $f0, $f24 -/* CD8BCC 802418EC 3C014000 */ lui $at, 0x4000 -/* CD8BD0 802418F0 44813800 */ mtc1 $at, $f7 -/* CD8BD4 802418F4 44803000 */ mtc1 $zero, $f6 -/* CD8BD8 802418F8 46162001 */ sub.s $f0, $f4, $f22 -/* CD8BDC 802418FC E7A4002C */ swc1 $f4, 0x2c($sp) -/* CD8BE0 80241900 460000A1 */ cvt.d.s $f2, $f0 -/* CD8BE4 80241904 4622303C */ c.lt.d $f6, $f2 -/* CD8BE8 80241908 00000000 */ nop -/* CD8BEC 8024190C 45000005 */ bc1f .L80241924 -/* CD8BF0 80241910 E7A00034 */ swc1 $f0, 0x34($sp) -/* CD8BF4 80241914 4600B021 */ cvt.d.s $f0, $f22 -/* CD8BF8 80241918 46260000 */ add.d $f0, $f0, $f6 -/* CD8BFC 8024191C 08090654 */ j .L80241950 -/* CD8C00 80241920 462005A0 */ cvt.s.d $f22, $f0 -.L80241924: -/* CD8C04 80241924 3C01C000 */ lui $at, 0xc000 -/* CD8C08 80241928 44810800 */ mtc1 $at, $f1 -/* CD8C0C 8024192C 44800000 */ mtc1 $zero, $f0 -/* CD8C10 80241930 00000000 */ nop -/* CD8C14 80241934 4620103C */ c.lt.d $f2, $f0 -/* CD8C18 80241938 00000000 */ nop -/* CD8C1C 8024193C 45020004 */ bc1fl .L80241950 -/* CD8C20 80241940 46002586 */ mov.s $f22, $f4 -/* CD8C24 80241944 4600B021 */ cvt.d.s $f0, $f22 -/* CD8C28 80241948 46260001 */ sub.d $f0, $f0, $f6 -/* CD8C2C 8024194C 462005A0 */ cvt.s.d $f22, $f0 -.L80241950: -/* CD8C30 80241950 3C014059 */ lui $at, 0x4059 -/* CD8C34 80241954 44811800 */ mtc1 $at, $f3 -/* CD8C38 80241958 44801000 */ mtc1 $zero, $f2 -/* CD8C3C 8024195C 4600B021 */ cvt.d.s $f0, $f22 -/* CD8C40 80241960 46220002 */ mul.d $f0, $f0, $f2 -/* CD8C44 80241964 00000000 */ nop -/* CD8C48 80241968 4620020D */ trunc.w.d $f8, $f0 -/* CD8C4C 8024196C E628007C */ swc1 $f8, 0x7c($s1) -.L80241970: -/* CD8C50 80241970 8602008E */ lh $v0, 0x8e($s0) -/* CD8C54 80241974 1C400017 */ bgtz $v0, .L802419D4 -/* CD8C58 80241978 240403E8 */ addiu $a0, $zero, 0x3e8 -.L8024197C: -/* CD8C5C 8024197C 24020002 */ addiu $v0, $zero, 2 -/* CD8C60 80241980 0C00A67F */ jal rand_int -/* CD8C64 80241984 AE420070 */ sw $v0, 0x70($s2) -/* CD8C68 80241988 3C035555 */ lui $v1, 0x5555 -/* CD8C6C 8024198C 34635556 */ ori $v1, $v1, 0x5556 -/* CD8C70 80241990 00430018 */ mult $v0, $v1 -/* CD8C74 80241994 000227C3 */ sra $a0, $v0, 0x1f -/* CD8C78 80241998 00004010 */ mfhi $t0 -/* CD8C7C 8024199C 01042023 */ subu $a0, $t0, $a0 -/* CD8C80 802419A0 00041840 */ sll $v1, $a0, 1 -/* CD8C84 802419A4 00641821 */ addu $v1, $v1, $a0 -/* CD8C88 802419A8 00431023 */ subu $v0, $v0, $v1 -/* CD8C8C 802419AC 24430002 */ addiu $v1, $v0, 2 -/* CD8C90 802419B0 AE430074 */ sw $v1, 0x74($s2) -/* CD8C94 802419B4 8EE2002C */ lw $v0, 0x2c($s7) -/* CD8C98 802419B8 58400006 */ blezl $v0, .L802419D4 -/* CD8C9C 802419BC AE400070 */ sw $zero, 0x70($s2) -/* CD8CA0 802419C0 8EE20004 */ lw $v0, 4($s7) -/* CD8CA4 802419C4 58400003 */ blezl $v0, .L802419D4 -/* CD8CA8 802419C8 AE400070 */ sw $zero, 0x70($s2) -/* CD8CAC 802419CC 50600001 */ beql $v1, $zero, .L802419D4 -/* CD8CB0 802419D0 AE400070 */ sw $zero, 0x70($s2) -.L802419D4: -/* CD8CB4 802419D4 8FBF0064 */ lw $ra, 0x64($sp) -/* CD8CB8 802419D8 8FBE0060 */ lw $fp, 0x60($sp) -/* CD8CBC 802419DC 8FB7005C */ lw $s7, 0x5c($sp) -/* CD8CC0 802419E0 8FB60058 */ lw $s6, 0x58($sp) -/* CD8CC4 802419E4 8FB50054 */ lw $s5, 0x54($sp) -/* CD8CC8 802419E8 8FB40050 */ lw $s4, 0x50($sp) -/* CD8CCC 802419EC 8FB3004C */ lw $s3, 0x4c($sp) -/* CD8CD0 802419F0 8FB20048 */ lw $s2, 0x48($sp) -/* CD8CD4 802419F4 8FB10044 */ lw $s1, 0x44($sp) -/* CD8CD8 802419F8 8FB00040 */ lw $s0, 0x40($sp) -/* CD8CDC 802419FC D7BA0080 */ ldc1 $f26, 0x80($sp) -/* CD8CE0 80241A00 D7B80078 */ ldc1 $f24, 0x78($sp) -/* CD8CE4 80241A04 D7B60070 */ ldc1 $f22, 0x70($sp) -/* CD8CE8 80241A08 D7B40068 */ ldc1 $f20, 0x68($sp) -/* CD8CEC 80241A0C 03E00008 */ jr $ra -/* CD8CF0 80241A10 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_flo/flo_17/func_80242144_CD72E0.s b/asm/nonmatchings/world/area_flo/flo_17/func_80242144_CD72E0.s deleted file mode 100644 index bacf35a3ee..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/func_80242144_CD72E0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242144_CD9424 -/* CD9424 80242144 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD9428 80242148 AFB20018 */ sw $s2, 0x18($sp) -/* CD942C 8024214C 0080902D */ daddu $s2, $a0, $zero -/* CD9430 80242150 AFBF001C */ sw $ra, 0x1c($sp) -/* CD9434 80242154 AFB10014 */ sw $s1, 0x14($sp) -/* CD9438 80242158 AFB00010 */ sw $s0, 0x10($sp) -/* CD943C 8024215C 8E510148 */ lw $s1, 0x148($s2) -/* CD9440 80242160 0C00EABB */ jal get_npc_unsafe -/* CD9444 80242164 86240008 */ lh $a0, 8($s1) -/* CD9448 80242168 0040802D */ daddu $s0, $v0, $zero -/* CD944C 8024216C 8E2300CC */ lw $v1, 0xcc($s1) -/* CD9450 80242170 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CD9454 80242174 8C630020 */ lw $v1, 0x20($v1) -/* CD9458 80242178 AE030028 */ sw $v1, 0x28($s0) -/* CD945C 8024217C 96220076 */ lhu $v0, 0x76($s1) -/* CD9460 80242180 A602008E */ sh $v0, 0x8e($s0) -/* CD9464 80242184 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD9468 80242188 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD946C 8024218C C60E0040 */ lwc1 $f14, 0x40($s0) -/* CD9470 80242190 8C460028 */ lw $a2, 0x28($v0) -/* CD9474 80242194 0C00A720 */ jal atan2 -/* CD9478 80242198 8C470030 */ lw $a3, 0x30($v0) -/* CD947C 8024219C 2402000D */ addiu $v0, $zero, 0xd -/* CD9480 802421A0 E600000C */ swc1 $f0, 0xc($s0) -/* CD9484 802421A4 AE420070 */ sw $v0, 0x70($s2) -/* CD9488 802421A8 8FBF001C */ lw $ra, 0x1c($sp) -/* CD948C 802421AC 8FB20018 */ lw $s2, 0x18($sp) -/* CD9490 802421B0 8FB10014 */ lw $s1, 0x14($sp) -/* CD9494 802421B4 8FB00010 */ lw $s0, 0x10($sp) -/* CD9498 802421B8 03E00008 */ jr $ra -/* CD949C 802421BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_17/func_802421C0_CD72E0.s b/asm/nonmatchings/world/area_flo/flo_17/func_802421C0_CD72E0.s deleted file mode 100644 index 2ee94ffdb6..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/func_802421C0_CD72E0.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421C0_CD94A0 -/* CD94A0 802421C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CD94A4 802421C4 AFB3001C */ sw $s3, 0x1c($sp) -/* CD94A8 802421C8 0080982D */ daddu $s3, $a0, $zero -/* CD94AC 802421CC AFBF0020 */ sw $ra, 0x20($sp) -/* CD94B0 802421D0 AFB20018 */ sw $s2, 0x18($sp) -/* CD94B4 802421D4 AFB10014 */ sw $s1, 0x14($sp) -/* CD94B8 802421D8 AFB00010 */ sw $s0, 0x10($sp) -/* CD94BC 802421DC 8E710148 */ lw $s1, 0x148($s3) -/* CD94C0 802421E0 86240008 */ lh $a0, 8($s1) -/* CD94C4 802421E4 0C00EABB */ jal get_npc_unsafe -/* CD94C8 802421E8 00A0902D */ daddu $s2, $a1, $zero -/* CD94CC 802421EC 0040802D */ daddu $s0, $v0, $zero -/* CD94D0 802421F0 8602008E */ lh $v0, 0x8e($s0) -/* CD94D4 802421F4 9603008E */ lhu $v1, 0x8e($s0) -/* CD94D8 802421F8 18400005 */ blez $v0, .L80242210 -/* CD94DC 802421FC 2462FFFF */ addiu $v0, $v1, -1 -/* CD94E0 80242200 A602008E */ sh $v0, 0x8e($s0) -/* CD94E4 80242204 00021400 */ sll $v0, $v0, 0x10 -/* CD94E8 80242208 1C400033 */ bgtz $v0, .L802422D8 -/* CD94EC 8024220C 00000000 */ nop -.L80242210: -/* CD94F0 80242210 8602008C */ lh $v0, 0x8c($s0) -/* CD94F4 80242214 14400030 */ bnez $v0, .L802422D8 -/* CD94F8 80242218 00000000 */ nop -/* CD94FC 8024221C 8E2200CC */ lw $v0, 0xcc($s1) -/* CD9500 80242220 8C420024 */ lw $v0, 0x24($v0) -/* CD9504 80242224 AE020028 */ sw $v0, 0x28($s0) -/* CD9508 80242228 C6400018 */ lwc1 $f0, 0x18($s2) -/* CD950C 8024222C E6000018 */ swc1 $f0, 0x18($s0) -/* CD9510 80242230 8E230088 */ lw $v1, 0x88($s1) -/* CD9514 80242234 24020005 */ addiu $v0, $zero, 5 -/* CD9518 80242238 10620005 */ beq $v1, $v0, .L80242250 -/* CD951C 8024223C 00000000 */ nop -/* CD9520 80242240 10600003 */ beqz $v1, .L80242250 -/* CD9524 80242244 24020001 */ addiu $v0, $zero, 1 -/* CD9528 80242248 14620006 */ bne $v1, $v0, .L80242264 -/* CD952C 8024224C 00000000 */ nop -.L80242250: -/* CD9530 80242250 8E220084 */ lw $v0, 0x84($s1) -/* CD9534 80242254 00021FC2 */ srl $v1, $v0, 0x1f -/* CD9538 80242258 00431021 */ addu $v0, $v0, $v1 -/* CD953C 8024225C 00021043 */ sra $v0, $v0, 1 -/* CD9540 80242260 A60200A8 */ sh $v0, 0xa8($s0) -.L80242264: -/* CD9544 80242264 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD9548 80242268 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD954C 8024226C C60C0038 */ lwc1 $f12, 0x38($s0) -/* CD9550 80242270 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CD9554 80242274 8C460028 */ lw $a2, 0x28($v0) -/* CD9558 80242278 0C00A7B5 */ jal dist2D -/* CD955C 8024227C 8C470030 */ lw $a3, 0x30($v0) -/* CD9560 80242280 C6020018 */ lwc1 $f2, 0x18($s0) -/* CD9564 80242284 46020003 */ div.s $f0, $f0, $f2 -/* CD9568 80242288 3C018024 */ lui $at, 0x8024 -/* CD956C 8024228C D4225358 */ ldc1 $f2, 0x5358($at) -/* CD9570 80242290 46000021 */ cvt.d.s $f0, $f0 -/* CD9574 80242294 46220000 */ add.d $f0, $f0, $f2 -/* CD9578 80242298 4620010D */ trunc.w.d $f4, $f0 -/* CD957C 8024229C 44022000 */ mfc1 $v0, $f4 -/* CD9580 802422A0 00000000 */ nop -/* CD9584 802422A4 A602008E */ sh $v0, 0x8e($s0) -/* CD9588 802422A8 00021400 */ sll $v0, $v0, 0x10 -/* CD958C 802422AC 8E230078 */ lw $v1, 0x78($s1) -/* CD9590 802422B0 00021403 */ sra $v0, $v0, 0x10 -/* CD9594 802422B4 0043102A */ slt $v0, $v0, $v1 -/* CD9598 802422B8 10400003 */ beqz $v0, .L802422C8 -/* CD959C 802422BC 00000000 */ nop -/* CD95A0 802422C0 9622007A */ lhu $v0, 0x7a($s1) -/* CD95A4 802422C4 A602008E */ sh $v0, 0x8e($s0) -.L802422C8: -/* CD95A8 802422C8 8602008E */ lh $v0, 0x8e($s0) -/* CD95AC 802422CC AE22007C */ sw $v0, 0x7c($s1) -/* CD95B0 802422D0 2402000E */ addiu $v0, $zero, 0xe -/* CD95B4 802422D4 AE620070 */ sw $v0, 0x70($s3) -.L802422D8: -/* CD95B8 802422D8 8FBF0020 */ lw $ra, 0x20($sp) -/* CD95BC 802422DC 8FB3001C */ lw $s3, 0x1c($sp) -/* CD95C0 802422E0 8FB20018 */ lw $s2, 0x18($sp) -/* CD95C4 802422E4 8FB10014 */ lw $s1, 0x14($sp) -/* CD95C8 802422E8 8FB00010 */ lw $s0, 0x10($sp) -/* CD95CC 802422EC 03E00008 */ jr $ra -/* CD95D0 802422F0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_18/func_80240124_CDC6A0.s b/asm/nonmatchings/world/area_flo/flo_18/func_80240124_CDC6A0.s deleted file mode 100644 index df904d4d5e..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_18/func_80240124_CDC6A0.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_CDC7C4 -/* CDC7C4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CDC7C8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* CDC7CC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* CDC7D0 80240130 10A00005 */ beqz $a1, .L80240148 -/* CDC7D4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* CDC7D8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* CDC7DC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* CDC7E0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* CDC7E4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* CDC7E8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* CDC7EC 8024014C 1440000E */ bnez $v0, .L80240188 -/* CDC7F0 80240150 00000000 */ nop -/* CDC7F4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* CDC7F8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* CDC7FC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* CDC800 80240160 04610004 */ bgez $v1, .L80240174 -/* CDC804 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* CDC808 80240168 3C020002 */ lui $v0, 2 -/* CDC80C 8024016C 08090061 */ j .L80240184 -/* CDC810 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* CDC814 80240174 3C040002 */ lui $a0, 2 -/* CDC818 80240178 0083102A */ slt $v0, $a0, $v1 -/* CDC81C 8024017C 10400002 */ beqz $v0, .L80240188 -/* CDC820 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* CDC824 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* CDC828 80240188 8E020074 */ lw $v0, 0x74($s0) -/* CDC82C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* CDC830 80240190 00000000 */ nop -/* CDC834 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* CDC838 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* CDC83C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* CDC840 802401A0 04610004 */ bgez $v1, .L802401B4 -/* CDC844 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* CDC848 802401A8 3C020002 */ lui $v0, 2 -/* CDC84C 802401AC 08090071 */ j .L802401C4 -/* CDC850 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* CDC854 802401B4 3C040002 */ lui $a0, 2 -/* CDC858 802401B8 0083102A */ slt $v0, $a0, $v1 -/* CDC85C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* CDC860 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* CDC864 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* CDC868 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* CDC86C 802401CC 1440000E */ bnez $v0, .L80240208 -/* CDC870 802401D0 00000000 */ nop -/* CDC874 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* CDC878 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* CDC87C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* CDC880 802401E0 04610004 */ bgez $v1, .L802401F4 -/* CDC884 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* CDC888 802401E8 3C020002 */ lui $v0, 2 -/* CDC88C 802401EC 08090081 */ j .L80240204 -/* CDC890 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* CDC894 802401F4 3C040002 */ lui $a0, 2 -/* CDC898 802401F8 0083102A */ slt $v0, $a0, $v1 -/* CDC89C 802401FC 10400002 */ beqz $v0, .L80240208 -/* CDC8A0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* CDC8A4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* CDC8A8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* CDC8AC 8024020C 1440000E */ bnez $v0, .L80240248 -/* CDC8B0 80240210 00000000 */ nop -/* CDC8B4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* CDC8B8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* CDC8BC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* CDC8C0 80240220 04610004 */ bgez $v1, .L80240234 -/* CDC8C4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* CDC8C8 80240228 3C020002 */ lui $v0, 2 -/* CDC8CC 8024022C 08090091 */ j .L80240244 -/* CDC8D0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* CDC8D4 80240234 3C040002 */ lui $a0, 2 -/* CDC8D8 80240238 0083102A */ slt $v0, $a0, $v1 -/* CDC8DC 8024023C 10400002 */ beqz $v0, .L80240248 -/* CDC8E0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* CDC8E4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* CDC8E8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* CDC8EC 8024024C 0C046F07 */ jal set_main_pan_u -/* CDC8F0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* CDC8F4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* CDC8F8 80240258 0C046F0D */ jal set_main_pan_v -/* CDC8FC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* CDC900 80240260 8E040084 */ lw $a0, 0x84($s0) -/* CDC904 80240264 0C046F13 */ jal set_aux_pan_u -/* CDC908 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* CDC90C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* CDC910 80240270 0C046F19 */ jal set_aux_pan_v -/* CDC914 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* CDC918 80240278 8E020070 */ lw $v0, 0x70($s0) -/* CDC91C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* CDC920 80240280 8E040098 */ lw $a0, 0x98($s0) -/* CDC924 80240284 24420001 */ addiu $v0, $v0, 1 -/* CDC928 80240288 AE020070 */ sw $v0, 0x70($s0) -/* CDC92C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* CDC930 80240290 24630001 */ addiu $v1, $v1, 1 -/* CDC934 80240294 AE030078 */ sw $v1, 0x78($s0) -/* CDC938 80240298 8E030070 */ lw $v1, 0x70($s0) -/* CDC93C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* CDC940 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* CDC944 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* CDC948 802402A8 0064182A */ slt $v1, $v1, $a0 -/* CDC94C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* CDC950 802402B0 14600002 */ bnez $v1, .L802402BC -/* CDC954 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* CDC958 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* CDC95C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* CDC960 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* CDC964 802402C4 0043102A */ slt $v0, $v0, $v1 -/* CDC968 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* CDC96C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* CDC970 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* CDC974 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* CDC978 802402D8 0043102A */ slt $v0, $v0, $v1 -/* CDC97C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* CDC980 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* CDC984 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* CDC988 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* CDC98C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* CDC990 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* CDC994 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* CDC998 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* CDC99C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* CDC9A0 80240300 0000102D */ daddu $v0, $zero, $zero -/* CDC9A4 80240304 03E00008 */ jr $ra -/* CDC9A8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_18/func_8024030C_CDC6A0.s b/asm/nonmatchings/world/area_flo/flo_18/func_8024030C_CDC6A0.s deleted file mode 100644 index d571290684..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_18/func_8024030C_CDC6A0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_CDC9AC -/* CDC9AC 8024030C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CDC9B0 80240310 24040001 */ addiu $a0, $zero, 1 -/* CDC9B4 80240314 0000282D */ daddu $a1, $zero, $zero -/* CDC9B8 80240318 00A0302D */ daddu $a2, $a1, $zero -/* CDC9BC 8024031C 00A0382D */ daddu $a3, $a1, $zero -/* CDC9C0 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* CDC9C4 80240324 AFA00010 */ sw $zero, 0x10($sp) -/* CDC9C8 80240328 0C01CA54 */ jal func_80072950 -/* CDC9CC 8024032C AFA00014 */ sw $zero, 0x14($sp) -/* CDC9D0 80240330 8FBF0018 */ lw $ra, 0x18($sp) -/* CDC9D4 80240334 24020002 */ addiu $v0, $zero, 2 -/* CDC9D8 80240338 03E00008 */ jr $ra -/* CDC9DC 8024033C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_18/func_80240340_CDC6A0.s b/asm/nonmatchings/world/area_flo/flo_18/func_80240340_CDC6A0.s deleted file mode 100644 index c5e8e745fa..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_18/func_80240340_CDC6A0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240340_CDC9E0 -/* CDC9E0 80240340 8C8400C0 */ lw $a0, 0xc0($a0) -/* CDC9E4 80240344 8C83000C */ lw $v1, 0xc($a0) -/* CDC9E8 80240348 24020045 */ addiu $v0, $zero, 0x45 -/* CDC9EC 8024034C AC620030 */ sw $v0, 0x30($v1) -/* CDC9F0 80240350 8C83000C */ lw $v1, 0xc($a0) -/* CDC9F4 80240354 240200FF */ addiu $v0, $zero, 0xff -/* CDC9F8 80240358 AC620034 */ sw $v0, 0x34($v1) -/* CDC9FC 8024035C 8C83000C */ lw $v1, 0xc($a0) -/* CDCA00 80240360 240200D9 */ addiu $v0, $zero, 0xd9 -/* CDCA04 80240364 AC620038 */ sw $v0, 0x38($v1) -/* CDCA08 80240368 8C83000C */ lw $v1, 0xc($a0) -/* CDCA0C 8024036C 240200B0 */ addiu $v0, $zero, 0xb0 -/* CDCA10 80240370 AC620040 */ sw $v0, 0x40($v1) -/* CDCA14 80240374 8C83000C */ lw $v1, 0xc($a0) -/* CDCA18 80240378 240200FE */ addiu $v0, $zero, 0xfe -/* CDCA1C 8024037C AC620044 */ sw $v0, 0x44($v1) -/* CDCA20 80240380 8C83000C */ lw $v1, 0xc($a0) -/* CDCA24 80240384 2402007C */ addiu $v0, $zero, 0x7c -/* CDCA28 80240388 AC620048 */ sw $v0, 0x48($v1) -/* CDCA2C 8024038C 03E00008 */ jr $ra -/* CDCA30 80240390 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_flo/flo_18/func_80240394_CDC6A0.s b/asm/nonmatchings/world/area_flo/flo_18/func_80240394_CDC6A0.s deleted file mode 100644 index 3153127742..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_18/func_80240394_CDC6A0.s +++ /dev/null @@ -1,108 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240394_CDCA34 -/* CDCA34 80240394 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CDCA38 80240398 AFB20018 */ sw $s2, 0x18($sp) -/* CDCA3C 8024039C 0080902D */ daddu $s2, $a0, $zero -/* CDCA40 802403A0 AFBF0028 */ sw $ra, 0x28($sp) -/* CDCA44 802403A4 AFB50024 */ sw $s5, 0x24($sp) -/* CDCA48 802403A8 AFB40020 */ sw $s4, 0x20($sp) -/* CDCA4C 802403AC AFB3001C */ sw $s3, 0x1c($sp) -/* CDCA50 802403B0 AFB10014 */ sw $s1, 0x14($sp) -/* CDCA54 802403B4 AFB00010 */ sw $s0, 0x10($sp) -/* CDCA58 802403B8 F7B80040 */ sdc1 $f24, 0x40($sp) -/* CDCA5C 802403BC F7B60038 */ sdc1 $f22, 0x38($sp) -/* CDCA60 802403C0 F7B40030 */ sdc1 $f20, 0x30($sp) -/* CDCA64 802403C4 8E50000C */ lw $s0, 0xc($s2) -/* CDCA68 802403C8 8E140000 */ lw $s4, ($s0) -/* CDCA6C 802403CC 26100004 */ addiu $s0, $s0, 4 -/* CDCA70 802403D0 0C0B1EAF */ jal get_variable -/* CDCA74 802403D4 0280282D */ daddu $a1, $s4, $zero -/* CDCA78 802403D8 0040982D */ daddu $s3, $v0, $zero -/* CDCA7C 802403DC 8E150000 */ lw $s5, ($s0) -/* CDCA80 802403E0 26100004 */ addiu $s0, $s0, 4 -/* CDCA84 802403E4 8E050000 */ lw $a1, ($s0) -/* CDCA88 802403E8 26100004 */ addiu $s0, $s0, 4 -/* CDCA8C 802403EC 0C0B210B */ jal get_float_variable -/* CDCA90 802403F0 0240202D */ daddu $a0, $s2, $zero -/* CDCA94 802403F4 8E050000 */ lw $a1, ($s0) -/* CDCA98 802403F8 26100004 */ addiu $s0, $s0, 4 -/* CDCA9C 802403FC 0240202D */ daddu $a0, $s2, $zero -/* CDCAA0 80240400 0C0B210B */ jal get_float_variable -/* CDCAA4 80240404 46000606 */ mov.s $f24, $f0 -/* CDCAA8 80240408 8E050000 */ lw $a1, ($s0) -/* CDCAAC 8024040C 26100004 */ addiu $s0, $s0, 4 -/* CDCAB0 80240410 0240202D */ daddu $a0, $s2, $zero -/* CDCAB4 80240414 0C0B1EAF */ jal get_variable -/* CDCAB8 80240418 46000506 */ mov.s $f20, $f0 -/* CDCABC 8024041C 8E050000 */ lw $a1, ($s0) -/* CDCAC0 80240420 26100004 */ addiu $s0, $s0, 4 -/* CDCAC4 80240424 0240202D */ daddu $a0, $s2, $zero -/* CDCAC8 80240428 0C0B1EAF */ jal get_variable -/* CDCACC 8024042C 0040882D */ daddu $s1, $v0, $zero -/* CDCAD0 80240430 0240202D */ daddu $a0, $s2, $zero -/* CDCAD4 80240434 8E050000 */ lw $a1, ($s0) -/* CDCAD8 80240438 0C0B210B */ jal get_float_variable -/* CDCADC 8024043C 0040802D */ daddu $s0, $v0, $zero -/* CDCAE0 80240440 3C014334 */ lui $at, 0x4334 -/* CDCAE4 80240444 44811000 */ mtc1 $at, $f2 -/* CDCAE8 80240448 3C014049 */ lui $at, 0x4049 -/* CDCAEC 8024044C 34210FD8 */ ori $at, $at, 0xfd8 -/* CDCAF0 80240450 44812000 */ mtc1 $at, $f4 -/* CDCAF4 80240454 46020003 */ div.s $f0, $f0, $f2 -/* CDCAF8 80240458 46040582 */ mul.s $f22, $f0, $f4 -/* CDCAFC 8024045C 00000000 */ nop -/* CDCB00 80240460 4618A501 */ sub.s $f20, $f20, $f24 -/* CDCB04 80240464 3C013F00 */ lui $at, 0x3f00 -/* CDCB08 80240468 44810000 */ mtc1 $at, $f0 -/* CDCB0C 8024046C 00000000 */ nop -/* CDCB10 80240470 4600A502 */ mul.s $f20, $f20, $f0 -/* CDCB14 80240474 00000000 */ nop -/* CDCB18 80240478 12000007 */ beqz $s0, .L80240498 -/* CDCB1C 8024047C 0233102A */ slt $v0, $s1, $s3 -/* CDCB20 80240480 10400005 */ beqz $v0, .L80240498 -/* CDCB24 80240484 0240202D */ daddu $a0, $s2, $zero -/* CDCB28 80240488 0220982D */ daddu $s3, $s1, $zero -/* CDCB2C 8024048C 0280282D */ daddu $a1, $s4, $zero -/* CDCB30 80240490 0C0B2026 */ jal set_variable -/* CDCB34 80240494 0220302D */ daddu $a2, $s1, $zero -.L80240498: -/* CDCB38 80240498 3C014049 */ lui $at, 0x4049 -/* CDCB3C 8024049C 34210FD8 */ ori $at, $at, 0xfd8 -/* CDCB40 802404A0 44810000 */ mtc1 $at, $f0 -/* CDCB44 802404A4 44936000 */ mtc1 $s3, $f12 -/* CDCB48 802404A8 00000000 */ nop -/* CDCB4C 802404AC 46806320 */ cvt.s.w $f12, $f12 -/* CDCB50 802404B0 46006302 */ mul.s $f12, $f12, $f0 -/* CDCB54 802404B4 00000000 */ nop -/* CDCB58 802404B8 44910000 */ mtc1 $s1, $f0 -/* CDCB5C 802404BC 00000000 */ nop -/* CDCB60 802404C0 46800020 */ cvt.s.w $f0, $f0 -/* CDCB64 802404C4 46006303 */ div.s $f12, $f12, $f0 -/* CDCB68 802404C8 0C00A874 */ jal cos_rad -/* CDCB6C 802404CC 46166300 */ add.s $f12, $f12, $f22 -/* CDCB70 802404D0 4600A002 */ mul.s $f0, $f20, $f0 -/* CDCB74 802404D4 00000000 */ nop -/* CDCB78 802404D8 4614C080 */ add.s $f2, $f24, $f20 -/* CDCB7C 802404DC 46001081 */ sub.s $f2, $f2, $f0 -/* CDCB80 802404E0 0240202D */ daddu $a0, $s2, $zero -/* CDCB84 802404E4 44061000 */ mfc1 $a2, $f2 -/* CDCB88 802404E8 0C0B2190 */ jal set_float_variable -/* CDCB8C 802404EC 02A0282D */ daddu $a1, $s5, $zero -/* CDCB90 802404F0 8FBF0028 */ lw $ra, 0x28($sp) -/* CDCB94 802404F4 8FB50024 */ lw $s5, 0x24($sp) -/* CDCB98 802404F8 8FB40020 */ lw $s4, 0x20($sp) -/* CDCB9C 802404FC 8FB3001C */ lw $s3, 0x1c($sp) -/* CDCBA0 80240500 8FB20018 */ lw $s2, 0x18($sp) -/* CDCBA4 80240504 8FB10014 */ lw $s1, 0x14($sp) -/* CDCBA8 80240508 8FB00010 */ lw $s0, 0x10($sp) -/* CDCBAC 8024050C D7B80040 */ ldc1 $f24, 0x40($sp) -/* CDCBB0 80240510 D7B60038 */ ldc1 $f22, 0x38($sp) -/* CDCBB4 80240514 D7B40030 */ ldc1 $f20, 0x30($sp) -/* CDCBB8 80240518 24020002 */ addiu $v0, $zero, 2 -/* CDCBBC 8024051C 03E00008 */ jr $ra -/* CDCBC0 80240520 27BD0048 */ addiu $sp, $sp, 0x48 -/* CDCBC4 80240524 00000000 */ nop -/* CDCBC8 80240528 00000000 */ nop -/* CDCBCC 8024052C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_18/func_80240530_CDC6A0.s b/asm/nonmatchings/world/area_flo/flo_18/func_80240530_CDC6A0.s deleted file mode 100644 index 0d79c46658..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_18/func_80240530_CDC6A0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240530_CDCBD0 -/* CDCBD0 80240530 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CDCBD4 80240534 AFB00010 */ sw $s0, 0x10($sp) -/* CDCBD8 80240538 0080802D */ daddu $s0, $a0, $zero -/* CDCBDC 8024053C AFBF0014 */ sw $ra, 0x14($sp) -/* CDCBE0 80240540 C60C0084 */ lwc1 $f12, 0x84($s0) -/* CDCBE4 80240544 46806320 */ cvt.s.w $f12, $f12 -/* CDCBE8 80240548 C6020090 */ lwc1 $f2, 0x90($s0) -/* CDCBEC 8024054C 468010A0 */ cvt.s.w $f2, $f2 -/* CDCBF0 80240550 44061000 */ mfc1 $a2, $f2 -/* CDCBF4 80240554 C6020098 */ lwc1 $f2, 0x98($s0) -/* CDCBF8 80240558 468010A0 */ cvt.s.w $f2, $f2 -/* CDCBFC 8024055C 44071000 */ mfc1 $a3, $f2 -/* CDCC00 80240560 C60E008C */ lwc1 $f14, 0x8c($s0) -/* CDCC04 80240564 0C00A720 */ jal atan2 -/* CDCC08 80240568 468073A0 */ cvt.s.w $f14, $f14 -/* CDCC0C 8024056C 4600008D */ trunc.w.s $f2, $f0 -/* CDCC10 80240570 E60200AC */ swc1 $f2, 0xac($s0) -/* CDCC14 80240574 8FBF0014 */ lw $ra, 0x14($sp) -/* CDCC18 80240578 8FB00010 */ lw $s0, 0x10($sp) -/* CDCC1C 8024057C 24020002 */ addiu $v0, $zero, 2 -/* CDCC20 80240580 03E00008 */ jr $ra -/* CDCC24 80240584 27BD0018 */ addiu $sp, $sp, 0x18 -/* CDCC28 80240588 00000000 */ nop -/* CDCC2C 8024058C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_18/func_80240590_CDC6A0.s b/asm/nonmatchings/world/area_flo/flo_18/func_80240590_CDC6A0.s deleted file mode 100644 index 3a392f91b4..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_18/func_80240590_CDC6A0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240590_CDCC30 -/* CDCC30 80240590 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* CDCC34 80240594 F7B40018 */ sdc1 $f20, 0x18($sp) -/* CDCC38 80240598 4485A000 */ mtc1 $a1, $f20 -/* CDCC3C 8024059C F7B60020 */ sdc1 $f22, 0x20($sp) -/* CDCC40 802405A0 4486B000 */ mtc1 $a2, $f22 -/* CDCC44 802405A4 AFB00010 */ sw $s0, 0x10($sp) -/* CDCC48 802405A8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* CDCC4C 802405AC 4487C000 */ mtc1 $a3, $f24 -/* CDCC50 802405B0 AFBF0014 */ sw $ra, 0x14($sp) -/* CDCC54 802405B4 0C019D28 */ jal guMtxIdentF -/* CDCC58 802405B8 0080802D */ daddu $s0, $a0, $zero -/* CDCC5C 802405BC 4616A582 */ mul.s $f22, $f20, $f22 -/* CDCC60 802405C0 00000000 */ nop -/* CDCC64 802405C4 4618A502 */ mul.s $f20, $f20, $f24 -/* CDCC68 802405C8 00000000 */ nop -/* CDCC6C 802405CC 3C013F80 */ lui $at, 0x3f80 -/* CDCC70 802405D0 44810000 */ mtc1 $at, $f0 -/* CDCC74 802405D4 00000000 */ nop -/* CDCC78 802405D8 E6000014 */ swc1 $f0, 0x14($s0) -/* CDCC7C 802405DC E6160010 */ swc1 $f22, 0x10($s0) -/* CDCC80 802405E0 E6140018 */ swc1 $f20, 0x18($s0) -/* CDCC84 802405E4 8FBF0014 */ lw $ra, 0x14($sp) -/* CDCC88 802405E8 8FB00010 */ lw $s0, 0x10($sp) -/* CDCC8C 802405EC D7B80028 */ ldc1 $f24, 0x28($sp) -/* CDCC90 802405F0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* CDCC94 802405F4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* CDCC98 802405F8 03E00008 */ jr $ra -/* CDCC9C 802405FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_flo/flo_18/func_80240600_CDC6A0.s b/asm/nonmatchings/world/area_flo/flo_18/func_80240600_CDC6A0.s deleted file mode 100644 index 642009a3d0..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_18/func_80240600_CDC6A0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240600_CDCCA0 -/* CDCCA0 80240600 27BDFF78 */ addiu $sp, $sp, -0x88 -/* CDCCA4 80240604 AFB10054 */ sw $s1, 0x54($sp) -/* CDCCA8 80240608 0080882D */ daddu $s1, $a0, $zero -/* CDCCAC 8024060C AFBF005C */ sw $ra, 0x5c($sp) -/* CDCCB0 80240610 AFB20058 */ sw $s2, 0x58($sp) -/* CDCCB4 80240614 AFB00050 */ sw $s0, 0x50($sp) -/* CDCCB8 80240618 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* CDCCBC 8024061C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CDCCC0 80240620 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CDCCC4 80240624 F7B60068 */ sdc1 $f22, 0x68($sp) -/* CDCCC8 80240628 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CDCCCC 8024062C 8E30000C */ lw $s0, 0xc($s1) -/* CDCCD0 80240630 8E050000 */ lw $a1, ($s0) -/* CDCCD4 80240634 0C0B1EAF */ jal get_variable -/* CDCCD8 80240638 26100004 */ addiu $s0, $s0, 4 -/* CDCCDC 8024063C 0C046C04 */ jal get_model_list_index_from_tree_index -/* CDCCE0 80240640 0040202D */ daddu $a0, $v0, $zero -/* CDCCE4 80240644 8E050000 */ lw $a1, ($s0) -/* CDCCE8 80240648 26100004 */ addiu $s0, $s0, 4 -/* CDCCEC 8024064C 0220202D */ daddu $a0, $s1, $zero -/* CDCCF0 80240650 0C0B210B */ jal get_float_variable -/* CDCCF4 80240654 0040902D */ daddu $s2, $v0, $zero -/* CDCCF8 80240658 8E050000 */ lw $a1, ($s0) -/* CDCCFC 8024065C 26100004 */ addiu $s0, $s0, 4 -/* CDCD00 80240660 0220202D */ daddu $a0, $s1, $zero -/* CDCD04 80240664 0C0B210B */ jal get_float_variable -/* CDCD08 80240668 46000706 */ mov.s $f28, $f0 -/* CDCD0C 8024066C 8E050000 */ lw $a1, ($s0) -/* CDCD10 80240670 26100004 */ addiu $s0, $s0, 4 -/* CDCD14 80240674 0220202D */ daddu $a0, $s1, $zero -/* CDCD18 80240678 0C0B210B */ jal get_float_variable -/* CDCD1C 8024067C 46000686 */ mov.s $f26, $f0 -/* CDCD20 80240680 0220202D */ daddu $a0, $s1, $zero -/* CDCD24 80240684 8E050000 */ lw $a1, ($s0) -/* CDCD28 80240688 0C0B210B */ jal get_float_variable -/* CDCD2C 8024068C 46000586 */ mov.s $f22, $f0 -/* CDCD30 80240690 0240202D */ daddu $a0, $s2, $zero -/* CDCD34 80240694 0C046B4C */ jal get_model_from_list_index -/* CDCD38 80240698 46000606 */ mov.s $f24, $f0 -/* CDCD3C 8024069C 0040882D */ daddu $s1, $v0, $zero -/* CDCD40 802406A0 96220000 */ lhu $v0, ($s1) -/* CDCD44 802406A4 30420400 */ andi $v0, $v0, 0x400 -/* CDCD48 802406A8 1440001E */ bnez $v0, .L80240724 -/* CDCD4C 802406AC 26300058 */ addiu $s0, $s1, 0x58 -/* CDCD50 802406B0 4480A000 */ mtc1 $zero, $f20 -/* CDCD54 802406B4 4406B000 */ mfc1 $a2, $f22 -/* CDCD58 802406B8 4405A000 */ mfc1 $a1, $f20 -/* CDCD5C 802406BC 4407A000 */ mfc1 $a3, $f20 -/* CDCD60 802406C0 0C019E40 */ jal guTranslateF -/* CDCD64 802406C4 0200202D */ daddu $a0, $s0, $zero -/* CDCD68 802406C8 4405E000 */ mfc1 $a1, $f28 -/* CDCD6C 802406CC 4406D000 */ mfc1 $a2, $f26 -/* CDCD70 802406D0 4407C000 */ mfc1 $a3, $f24 -/* CDCD74 802406D4 0C090164 */ jal func_80240590 -/* CDCD78 802406D8 27A40010 */ addiu $a0, $sp, 0x10 -/* CDCD7C 802406DC 27A40010 */ addiu $a0, $sp, 0x10 -/* CDCD80 802406E0 0200282D */ daddu $a1, $s0, $zero -/* CDCD84 802406E4 0C019D80 */ jal guMtxCatF -/* CDCD88 802406E8 0200302D */ daddu $a2, $s0, $zero -/* CDCD8C 802406EC 27A40010 */ addiu $a0, $sp, 0x10 -/* CDCD90 802406F0 4600B587 */ neg.s $f22, $f22 -/* CDCD94 802406F4 4405A000 */ mfc1 $a1, $f20 -/* CDCD98 802406F8 4406B000 */ mfc1 $a2, $f22 -/* CDCD9C 802406FC 0C019E40 */ jal guTranslateF -/* CDCDA0 80240700 00A0382D */ daddu $a3, $a1, $zero -/* CDCDA4 80240704 27A40010 */ addiu $a0, $sp, 0x10 -/* CDCDA8 80240708 0200282D */ daddu $a1, $s0, $zero -/* CDCDAC 8024070C 0C019D80 */ jal guMtxCatF -/* CDCDB0 80240710 00A0302D */ daddu $a2, $a1, $zero -/* CDCDB4 80240714 96220000 */ lhu $v0, ($s1) -/* CDCDB8 80240718 34421400 */ ori $v0, $v0, 0x1400 -/* CDCDBC 8024071C 080901E7 */ j .L8024079C -/* CDCDC0 80240720 A6220000 */ sh $v0, ($s1) -.L80240724: -/* CDCDC4 80240724 4480A000 */ mtc1 $zero, $f20 -/* CDCDC8 80240728 4406B000 */ mfc1 $a2, $f22 -/* CDCDCC 8024072C 4405A000 */ mfc1 $a1, $f20 -/* CDCDD0 80240730 4407A000 */ mfc1 $a3, $f20 -/* CDCDD4 80240734 0C019E40 */ jal guTranslateF -/* CDCDD8 80240738 27A40010 */ addiu $a0, $sp, 0x10 -/* CDCDDC 8024073C 27A40010 */ addiu $a0, $sp, 0x10 -/* CDCDE0 80240740 26300058 */ addiu $s0, $s1, 0x58 -/* CDCDE4 80240744 0200282D */ daddu $a1, $s0, $zero -/* CDCDE8 80240748 0C019D80 */ jal guMtxCatF -/* CDCDEC 8024074C 0200302D */ daddu $a2, $s0, $zero -/* CDCDF0 80240750 4405E000 */ mfc1 $a1, $f28 -/* CDCDF4 80240754 4406D000 */ mfc1 $a2, $f26 -/* CDCDF8 80240758 4407C000 */ mfc1 $a3, $f24 -/* CDCDFC 8024075C 0C090164 */ jal func_80240590 -/* CDCE00 80240760 27A40010 */ addiu $a0, $sp, 0x10 -/* CDCE04 80240764 27A40010 */ addiu $a0, $sp, 0x10 -/* CDCE08 80240768 0200282D */ daddu $a1, $s0, $zero -/* CDCE0C 8024076C 0C019D80 */ jal guMtxCatF -/* CDCE10 80240770 0200302D */ daddu $a2, $s0, $zero -/* CDCE14 80240774 27A40010 */ addiu $a0, $sp, 0x10 -/* CDCE18 80240778 4600B587 */ neg.s $f22, $f22 -/* CDCE1C 8024077C 4405A000 */ mfc1 $a1, $f20 -/* CDCE20 80240780 4406B000 */ mfc1 $a2, $f22 -/* CDCE24 80240784 0C019E40 */ jal guTranslateF -/* CDCE28 80240788 00A0382D */ daddu $a3, $a1, $zero -/* CDCE2C 8024078C 27A40010 */ addiu $a0, $sp, 0x10 -/* CDCE30 80240790 0200282D */ daddu $a1, $s0, $zero -/* CDCE34 80240794 0C019D80 */ jal guMtxCatF -/* CDCE38 80240798 00A0302D */ daddu $a2, $a1, $zero -.L8024079C: -/* CDCE3C 8024079C 8FBF005C */ lw $ra, 0x5c($sp) -/* CDCE40 802407A0 8FB20058 */ lw $s2, 0x58($sp) -/* CDCE44 802407A4 8FB10054 */ lw $s1, 0x54($sp) -/* CDCE48 802407A8 8FB00050 */ lw $s0, 0x50($sp) -/* CDCE4C 802407AC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* CDCE50 802407B0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CDCE54 802407B4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CDCE58 802407B8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CDCE5C 802407BC D7B40060 */ ldc1 $f20, 0x60($sp) -/* CDCE60 802407C0 24020002 */ addiu $v0, $zero, 2 -/* CDCE64 802407C4 03E00008 */ jr $ra -/* CDCE68 802407C8 27BD0088 */ addiu $sp, $sp, 0x88 -/* CDCE6C 802407CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_19/func_80240124_CE36F0.s b/asm/nonmatchings/world/area_flo/flo_19/func_80240124_CE36F0.s deleted file mode 100644 index fadeedf4b6..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_19/func_80240124_CE36F0.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_CE3814 -/* CE3814 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CE3818 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* CE381C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* CE3820 80240130 10A00005 */ beqz $a1, .L80240148 -/* CE3824 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* CE3828 80240138 AE000070 */ sw $zero, 0x70($s0) -/* CE382C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* CE3830 80240140 AE000078 */ sw $zero, 0x78($s0) -/* CE3834 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* CE3838 80240148 8E020070 */ lw $v0, 0x70($s0) -/* CE383C 8024014C 1440000E */ bnez $v0, .L80240188 -/* CE3840 80240150 00000000 */ nop -/* CE3844 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* CE3848 80240158 8E020088 */ lw $v0, 0x88($s0) -/* CE384C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* CE3850 80240160 04610004 */ bgez $v1, .L80240174 -/* CE3854 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* CE3858 80240168 3C020002 */ lui $v0, 2 -/* CE385C 8024016C 08090061 */ j .L80240184 -/* CE3860 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* CE3864 80240174 3C040002 */ lui $a0, 2 -/* CE3868 80240178 0083102A */ slt $v0, $a0, $v1 -/* CE386C 8024017C 10400002 */ beqz $v0, .L80240188 -/* CE3870 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* CE3874 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* CE3878 80240188 8E020074 */ lw $v0, 0x74($s0) -/* CE387C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* CE3880 80240190 00000000 */ nop -/* CE3884 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* CE3888 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* CE388C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* CE3890 802401A0 04610004 */ bgez $v1, .L802401B4 -/* CE3894 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* CE3898 802401A8 3C020002 */ lui $v0, 2 -/* CE389C 802401AC 08090071 */ j .L802401C4 -/* CE38A0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* CE38A4 802401B4 3C040002 */ lui $a0, 2 -/* CE38A8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* CE38AC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* CE38B0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* CE38B4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* CE38B8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* CE38BC 802401CC 1440000E */ bnez $v0, .L80240208 -/* CE38C0 802401D0 00000000 */ nop -/* CE38C4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* CE38C8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* CE38CC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* CE38D0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* CE38D4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* CE38D8 802401E8 3C020002 */ lui $v0, 2 -/* CE38DC 802401EC 08090081 */ j .L80240204 -/* CE38E0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* CE38E4 802401F4 3C040002 */ lui $a0, 2 -/* CE38E8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* CE38EC 802401FC 10400002 */ beqz $v0, .L80240208 -/* CE38F0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* CE38F4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* CE38F8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* CE38FC 8024020C 1440000E */ bnez $v0, .L80240248 -/* CE3900 80240210 00000000 */ nop -/* CE3904 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* CE3908 80240218 8E020094 */ lw $v0, 0x94($s0) -/* CE390C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* CE3910 80240220 04610004 */ bgez $v1, .L80240234 -/* CE3914 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* CE3918 80240228 3C020002 */ lui $v0, 2 -/* CE391C 8024022C 08090091 */ j .L80240244 -/* CE3920 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* CE3924 80240234 3C040002 */ lui $a0, 2 -/* CE3928 80240238 0083102A */ slt $v0, $a0, $v1 -/* CE392C 8024023C 10400002 */ beqz $v0, .L80240248 -/* CE3930 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* CE3934 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* CE3938 80240248 8E040084 */ lw $a0, 0x84($s0) -/* CE393C 8024024C 0C046F07 */ jal set_main_pan_u -/* CE3940 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* CE3944 80240254 8E040084 */ lw $a0, 0x84($s0) -/* CE3948 80240258 0C046F0D */ jal set_main_pan_v -/* CE394C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* CE3950 80240260 8E040084 */ lw $a0, 0x84($s0) -/* CE3954 80240264 0C046F13 */ jal set_aux_pan_u -/* CE3958 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* CE395C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* CE3960 80240270 0C046F19 */ jal set_aux_pan_v -/* CE3964 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* CE3968 80240278 8E020070 */ lw $v0, 0x70($s0) -/* CE396C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* CE3970 80240280 8E040098 */ lw $a0, 0x98($s0) -/* CE3974 80240284 24420001 */ addiu $v0, $v0, 1 -/* CE3978 80240288 AE020070 */ sw $v0, 0x70($s0) -/* CE397C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* CE3980 80240290 24630001 */ addiu $v1, $v1, 1 -/* CE3984 80240294 AE030078 */ sw $v1, 0x78($s0) -/* CE3988 80240298 8E030070 */ lw $v1, 0x70($s0) -/* CE398C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* CE3990 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* CE3994 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* CE3998 802402A8 0064182A */ slt $v1, $v1, $a0 -/* CE399C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* CE39A0 802402B0 14600002 */ bnez $v1, .L802402BC -/* CE39A4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* CE39A8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* CE39AC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* CE39B0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* CE39B4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* CE39B8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* CE39BC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* CE39C0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* CE39C4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* CE39C8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* CE39CC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* CE39D0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* CE39D4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* CE39D8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* CE39DC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* CE39E0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* CE39E4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* CE39E8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* CE39EC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* CE39F0 80240300 0000102D */ daddu $v0, $zero, $zero -/* CE39F4 80240304 03E00008 */ jr $ra -/* CE39F8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_19/func_8024030C_CE36F0.s b/asm/nonmatchings/world/area_flo/flo_19/func_8024030C_CE36F0.s deleted file mode 100644 index fa5ba33944..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_19/func_8024030C_CE36F0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_CE39FC -/* CE39FC 8024030C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CE3A00 80240310 24040001 */ addiu $a0, $zero, 1 -/* CE3A04 80240314 0000282D */ daddu $a1, $zero, $zero -/* CE3A08 80240318 00A0302D */ daddu $a2, $a1, $zero -/* CE3A0C 8024031C 00A0382D */ daddu $a3, $a1, $zero -/* CE3A10 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* CE3A14 80240324 AFA00010 */ sw $zero, 0x10($sp) -/* CE3A18 80240328 0C01CA54 */ jal func_80072950 -/* CE3A1C 8024032C AFA00014 */ sw $zero, 0x14($sp) -/* CE3A20 80240330 8FBF0018 */ lw $ra, 0x18($sp) -/* CE3A24 80240334 24020002 */ addiu $v0, $zero, 2 -/* CE3A28 80240338 03E00008 */ jr $ra -/* CE3A2C 8024033C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_19/func_80240340_CE36F0.s b/asm/nonmatchings/world/area_flo/flo_19/func_80240340_CE36F0.s deleted file mode 100644 index 226345618d..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_19/func_80240340_CE36F0.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240340_CE3A30 -/* CE3A30 80240340 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CE3A34 80240344 AFB20018 */ sw $s2, 0x18($sp) -/* CE3A38 80240348 0080902D */ daddu $s2, $a0, $zero -/* CE3A3C 8024034C AFBF0028 */ sw $ra, 0x28($sp) -/* CE3A40 80240350 AFB50024 */ sw $s5, 0x24($sp) -/* CE3A44 80240354 AFB40020 */ sw $s4, 0x20($sp) -/* CE3A48 80240358 AFB3001C */ sw $s3, 0x1c($sp) -/* CE3A4C 8024035C AFB10014 */ sw $s1, 0x14($sp) -/* CE3A50 80240360 AFB00010 */ sw $s0, 0x10($sp) -/* CE3A54 80240364 F7B80040 */ sdc1 $f24, 0x40($sp) -/* CE3A58 80240368 F7B60038 */ sdc1 $f22, 0x38($sp) -/* CE3A5C 8024036C F7B40030 */ sdc1 $f20, 0x30($sp) -/* CE3A60 80240370 8E50000C */ lw $s0, 0xc($s2) -/* CE3A64 80240374 8E140000 */ lw $s4, ($s0) -/* CE3A68 80240378 26100004 */ addiu $s0, $s0, 4 -/* CE3A6C 8024037C 0C0B1EAF */ jal get_variable -/* CE3A70 80240380 0280282D */ daddu $a1, $s4, $zero -/* CE3A74 80240384 0040982D */ daddu $s3, $v0, $zero -/* CE3A78 80240388 8E150000 */ lw $s5, ($s0) -/* CE3A7C 8024038C 26100004 */ addiu $s0, $s0, 4 -/* CE3A80 80240390 8E050000 */ lw $a1, ($s0) -/* CE3A84 80240394 26100004 */ addiu $s0, $s0, 4 -/* CE3A88 80240398 0C0B210B */ jal get_float_variable -/* CE3A8C 8024039C 0240202D */ daddu $a0, $s2, $zero -/* CE3A90 802403A0 8E050000 */ lw $a1, ($s0) -/* CE3A94 802403A4 26100004 */ addiu $s0, $s0, 4 -/* CE3A98 802403A8 0240202D */ daddu $a0, $s2, $zero -/* CE3A9C 802403AC 0C0B210B */ jal get_float_variable -/* CE3AA0 802403B0 46000606 */ mov.s $f24, $f0 -/* CE3AA4 802403B4 8E050000 */ lw $a1, ($s0) -/* CE3AA8 802403B8 26100004 */ addiu $s0, $s0, 4 -/* CE3AAC 802403BC 0240202D */ daddu $a0, $s2, $zero -/* CE3AB0 802403C0 0C0B1EAF */ jal get_variable -/* CE3AB4 802403C4 46000506 */ mov.s $f20, $f0 -/* CE3AB8 802403C8 8E050000 */ lw $a1, ($s0) -/* CE3ABC 802403CC 26100004 */ addiu $s0, $s0, 4 -/* CE3AC0 802403D0 0240202D */ daddu $a0, $s2, $zero -/* CE3AC4 802403D4 0C0B1EAF */ jal get_variable -/* CE3AC8 802403D8 0040882D */ daddu $s1, $v0, $zero -/* CE3ACC 802403DC 0240202D */ daddu $a0, $s2, $zero -/* CE3AD0 802403E0 8E050000 */ lw $a1, ($s0) -/* CE3AD4 802403E4 0C0B210B */ jal get_float_variable -/* CE3AD8 802403E8 0040802D */ daddu $s0, $v0, $zero -/* CE3ADC 802403EC 3C014334 */ lui $at, 0x4334 -/* CE3AE0 802403F0 44811000 */ mtc1 $at, $f2 -/* CE3AE4 802403F4 3C014049 */ lui $at, 0x4049 -/* CE3AE8 802403F8 34210FD8 */ ori $at, $at, 0xfd8 -/* CE3AEC 802403FC 44812000 */ mtc1 $at, $f4 -/* CE3AF0 80240400 46020003 */ div.s $f0, $f0, $f2 -/* CE3AF4 80240404 46040582 */ mul.s $f22, $f0, $f4 -/* CE3AF8 80240408 00000000 */ nop -/* CE3AFC 8024040C 4618A501 */ sub.s $f20, $f20, $f24 -/* CE3B00 80240410 3C013F00 */ lui $at, 0x3f00 -/* CE3B04 80240414 44810000 */ mtc1 $at, $f0 -/* CE3B08 80240418 4600A505 */ abs.s $f20, $f20 -/* CE3B0C 8024041C 4600A502 */ mul.s $f20, $f20, $f0 -/* CE3B10 80240420 00000000 */ nop -/* CE3B14 80240424 12000007 */ beqz $s0, .L80240444 -/* CE3B18 80240428 0233102A */ slt $v0, $s1, $s3 -/* CE3B1C 8024042C 10400005 */ beqz $v0, .L80240444 -/* CE3B20 80240430 0240202D */ daddu $a0, $s2, $zero -/* CE3B24 80240434 0220982D */ daddu $s3, $s1, $zero -/* CE3B28 80240438 0280282D */ daddu $a1, $s4, $zero -/* CE3B2C 8024043C 0C0B2026 */ jal set_variable -/* CE3B30 80240440 0220302D */ daddu $a2, $s1, $zero -.L80240444: -/* CE3B34 80240444 3C014049 */ lui $at, 0x4049 -/* CE3B38 80240448 34210FD8 */ ori $at, $at, 0xfd8 -/* CE3B3C 8024044C 44810000 */ mtc1 $at, $f0 -/* CE3B40 80240450 44936000 */ mtc1 $s3, $f12 -/* CE3B44 80240454 00000000 */ nop -/* CE3B48 80240458 46806320 */ cvt.s.w $f12, $f12 -/* CE3B4C 8024045C 46006302 */ mul.s $f12, $f12, $f0 -/* CE3B50 80240460 00000000 */ nop -/* CE3B54 80240464 44910000 */ mtc1 $s1, $f0 -/* CE3B58 80240468 00000000 */ nop -/* CE3B5C 8024046C 46800020 */ cvt.s.w $f0, $f0 -/* CE3B60 80240470 46006303 */ div.s $f12, $f12, $f0 -/* CE3B64 80240474 0C00A874 */ jal cos_rad -/* CE3B68 80240478 46166300 */ add.s $f12, $f12, $f22 -/* CE3B6C 8024047C 4600A002 */ mul.s $f0, $f20, $f0 -/* CE3B70 80240480 00000000 */ nop -/* CE3B74 80240484 4614C080 */ add.s $f2, $f24, $f20 -/* CE3B78 80240488 46001081 */ sub.s $f2, $f2, $f0 -/* CE3B7C 8024048C 0240202D */ daddu $a0, $s2, $zero -/* CE3B80 80240490 44061000 */ mfc1 $a2, $f2 -/* CE3B84 80240494 0C0B2190 */ jal set_float_variable -/* CE3B88 80240498 02A0282D */ daddu $a1, $s5, $zero -/* CE3B8C 8024049C 8FBF0028 */ lw $ra, 0x28($sp) -/* CE3B90 802404A0 8FB50024 */ lw $s5, 0x24($sp) -/* CE3B94 802404A4 8FB40020 */ lw $s4, 0x20($sp) -/* CE3B98 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* CE3B9C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* CE3BA0 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* CE3BA4 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* CE3BA8 802404B8 D7B80040 */ ldc1 $f24, 0x40($sp) -/* CE3BAC 802404BC D7B60038 */ ldc1 $f22, 0x38($sp) -/* CE3BB0 802404C0 D7B40030 */ ldc1 $f20, 0x30($sp) -/* CE3BB4 802404C4 24020002 */ addiu $v0, $zero, 2 -/* CE3BB8 802404C8 03E00008 */ jr $ra -/* CE3BBC 802404CC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_19/func_802404D0_CE36F0.s b/asm/nonmatchings/world/area_flo/flo_19/func_802404D0_CE36F0.s deleted file mode 100644 index f650d32b33..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_19/func_802404D0_CE36F0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404D0_CE3BC0 -/* CE3BC0 802404D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CE3BC4 802404D4 AFB00010 */ sw $s0, 0x10($sp) -/* CE3BC8 802404D8 0080802D */ daddu $s0, $a0, $zero -/* CE3BCC 802404DC AFB20018 */ sw $s2, 0x18($sp) -/* CE3BD0 802404E0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* CE3BD4 802404E4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* CE3BD8 802404E8 AFBF001C */ sw $ra, 0x1c($sp) -/* CE3BDC 802404EC AFB10014 */ sw $s1, 0x14($sp) -/* CE3BE0 802404F0 C64000A8 */ lwc1 $f0, 0xa8($s2) -/* CE3BE4 802404F4 8E02000C */ lw $v0, 0xc($s0) -/* CE3BE8 802404F8 4600008D */ trunc.w.s $f2, $f0 -/* CE3BEC 802404FC 44061000 */ mfc1 $a2, $f2 -/* CE3BF0 80240500 8C450000 */ lw $a1, ($v0) -/* CE3BF4 80240504 0C0B2026 */ jal set_variable -/* CE3BF8 80240508 8C510004 */ lw $s1, 4($v0) -/* CE3BFC 8024050C 0200202D */ daddu $a0, $s0, $zero -/* CE3C00 80240510 C6400080 */ lwc1 $f0, 0x80($s2) -/* CE3C04 80240514 4600008D */ trunc.w.s $f2, $f0 -/* CE3C08 80240518 44061000 */ mfc1 $a2, $f2 -/* CE3C0C 8024051C 0C0B2026 */ jal set_variable -/* CE3C10 80240520 0220282D */ daddu $a1, $s1, $zero -/* CE3C14 80240524 8FBF001C */ lw $ra, 0x1c($sp) -/* CE3C18 80240528 8FB20018 */ lw $s2, 0x18($sp) -/* CE3C1C 8024052C 8FB10014 */ lw $s1, 0x14($sp) -/* CE3C20 80240530 8FB00010 */ lw $s0, 0x10($sp) -/* CE3C24 80240534 24020002 */ addiu $v0, $zero, 2 -/* CE3C28 80240538 03E00008 */ jr $ra -/* CE3C2C 8024053C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_19/func_80240540_CE36F0.s b/asm/nonmatchings/world/area_flo/flo_19/func_80240540_CE36F0.s deleted file mode 100644 index 88bac9acad..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_19/func_80240540_CE36F0.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240540_CE3C30 -/* CE3C30 80240540 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CE3C34 80240544 AFB00010 */ sw $s0, 0x10($sp) -/* CE3C38 80240548 0080802D */ daddu $s0, $a0, $zero -/* CE3C3C 8024054C AFBF0018 */ sw $ra, 0x18($sp) -/* CE3C40 80240550 AFB10014 */ sw $s1, 0x14($sp) -/* CE3C44 80240554 F7B80030 */ sdc1 $f24, 0x30($sp) -/* CE3C48 80240558 F7B60028 */ sdc1 $f22, 0x28($sp) -/* CE3C4C 8024055C F7B40020 */ sdc1 $f20, 0x20($sp) -/* CE3C50 80240560 8E05008C */ lw $a1, 0x8c($s0) -/* CE3C54 80240564 4480B000 */ mtc1 $zero, $f22 -/* CE3C58 80240568 0C0B1EAF */ jal get_variable -/* CE3C5C 8024056C 0000202D */ daddu $a0, $zero, $zero -/* CE3C60 80240570 4600B306 */ mov.s $f12, $f22 -/* CE3C64 80240574 C60200A8 */ lwc1 $f2, 0xa8($s0) -/* CE3C68 80240578 468010A0 */ cvt.s.w $f2, $f2 -/* CE3C6C 8024057C 44061000 */ mfc1 $a2, $f2 -/* CE3C70 80240580 C60200B0 */ lwc1 $f2, 0xb0($s0) -/* CE3C74 80240584 468010A0 */ cvt.s.w $f2, $f2 -/* CE3C78 80240588 44071000 */ mfc1 $a3, $f2 -/* CE3C7C 8024058C 4482A000 */ mtc1 $v0, $f20 -/* CE3C80 80240590 00000000 */ nop -/* CE3C84 80240594 4680A520 */ cvt.s.w $f20, $f20 -/* CE3C88 80240598 0C00A7B5 */ jal dist2D -/* CE3C8C 8024059C 4600B386 */ mov.s $f14, $f22 -/* CE3C90 802405A0 4600B306 */ mov.s $f12, $f22 -/* CE3C94 802405A4 4600B386 */ mov.s $f14, $f22 -/* CE3C98 802405A8 C60200A8 */ lwc1 $f2, 0xa8($s0) -/* CE3C9C 802405AC 468010A0 */ cvt.s.w $f2, $f2 -/* CE3CA0 802405B0 44061000 */ mfc1 $a2, $f2 -/* CE3CA4 802405B4 C60200B0 */ lwc1 $f2, 0xb0($s0) -/* CE3CA8 802405B8 468010A0 */ cvt.s.w $f2, $f2 -/* CE3CAC 802405BC 44071000 */ mfc1 $a3, $f2 -/* CE3CB0 802405C0 0C00A720 */ jal atan2 -/* CE3CB4 802405C4 46000606 */ mov.s $f24, $f0 -/* CE3CB8 802405C8 0C00A6C9 */ jal clamp_angle -/* CE3CBC 802405CC 46140301 */ sub.s $f12, $f0, $f20 -/* CE3CC0 802405D0 46000506 */ mov.s $f20, $f0 -/* CE3CC4 802405D4 0C00A8BB */ jal sin_deg -/* CE3CC8 802405D8 4600A306 */ mov.s $f12, $f20 -/* CE3CCC 802405DC 4600C002 */ mul.s $f0, $f24, $f0 -/* CE3CD0 802405E0 00000000 */ nop -/* CE3CD4 802405E4 46160000 */ add.s $f0, $f0, $f22 -/* CE3CD8 802405E8 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* CE3CDC 802405EC 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* CE3CE0 802405F0 E6200028 */ swc1 $f0, 0x28($s1) -/* CE3CE4 802405F4 8E0500AC */ lw $a1, 0xac($s0) -/* CE3CE8 802405F8 0C0B1EAF */ jal get_variable -/* CE3CEC 802405FC 0000202D */ daddu $a0, $zero, $zero -/* CE3CF0 80240600 0000202D */ daddu $a0, $zero, $zero -/* CE3CF4 80240604 8E050090 */ lw $a1, 0x90($s0) -/* CE3CF8 80240608 0C0B1EAF */ jal get_variable -/* CE3CFC 8024060C 0040802D */ daddu $s0, $v0, $zero -/* CE3D00 80240610 4600A306 */ mov.s $f12, $f20 -/* CE3D04 80240614 02028021 */ addu $s0, $s0, $v0 -/* CE3D08 80240618 44900000 */ mtc1 $s0, $f0 -/* CE3D0C 8024061C 00000000 */ nop -/* CE3D10 80240620 46800020 */ cvt.s.w $f0, $f0 -/* CE3D14 80240624 0C00A8D4 */ jal cos_deg -/* CE3D18 80240628 E620002C */ swc1 $f0, 0x2c($s1) -/* CE3D1C 8024062C 4600C602 */ mul.s $f24, $f24, $f0 -/* CE3D20 80240630 00000000 */ nop -/* CE3D24 80240634 4618B581 */ sub.s $f22, $f22, $f24 -/* CE3D28 80240638 E6360030 */ swc1 $f22, 0x30($s1) -/* CE3D2C 8024063C 8FBF0018 */ lw $ra, 0x18($sp) -/* CE3D30 80240640 8FB10014 */ lw $s1, 0x14($sp) -/* CE3D34 80240644 8FB00010 */ lw $s0, 0x10($sp) -/* CE3D38 80240648 D7B80030 */ ldc1 $f24, 0x30($sp) -/* CE3D3C 8024064C D7B60028 */ ldc1 $f22, 0x28($sp) -/* CE3D40 80240650 D7B40020 */ ldc1 $f20, 0x20($sp) -/* CE3D44 80240654 24020002 */ addiu $v0, $zero, 2 -/* CE3D48 80240658 03E00008 */ jr $ra -/* CE3D4C 8024065C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_19/func_80240660_CE36F0.s b/asm/nonmatchings/world/area_flo/flo_19/func_80240660_CE36F0.s deleted file mode 100644 index b7bfe9b4a9..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_19/func_80240660_CE36F0.s +++ /dev/null @@ -1,77 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240660_CE3D50 -/* CE3D50 80240660 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CE3D54 80240664 AFB00010 */ sw $s0, 0x10($sp) -/* CE3D58 80240668 0080802D */ daddu $s0, $a0, $zero -/* CE3D5C 8024066C AFBF0018 */ sw $ra, 0x18($sp) -/* CE3D60 80240670 AFB10014 */ sw $s1, 0x14($sp) -/* CE3D64 80240674 F7B80030 */ sdc1 $f24, 0x30($sp) -/* CE3D68 80240678 F7B60028 */ sdc1 $f22, 0x28($sp) -/* CE3D6C 8024067C F7B40020 */ sdc1 $f20, 0x20($sp) -/* CE3D70 80240680 0C00E2B7 */ jal get_npc_by_index -/* CE3D74 80240684 0000202D */ daddu $a0, $zero, $zero -/* CE3D78 80240688 0000202D */ daddu $a0, $zero, $zero -/* CE3D7C 8024068C 8E05008C */ lw $a1, 0x8c($s0) -/* CE3D80 80240690 4480B000 */ mtc1 $zero, $f22 -/* CE3D84 80240694 0C0B1EAF */ jal get_variable -/* CE3D88 80240698 0040882D */ daddu $s1, $v0, $zero -/* CE3D8C 8024069C 4600B306 */ mov.s $f12, $f22 -/* CE3D90 802406A0 C60200B4 */ lwc1 $f2, 0xb4($s0) -/* CE3D94 802406A4 468010A0 */ cvt.s.w $f2, $f2 -/* CE3D98 802406A8 44061000 */ mfc1 $a2, $f2 -/* CE3D9C 802406AC C60200BC */ lwc1 $f2, 0xbc($s0) -/* CE3DA0 802406B0 468010A0 */ cvt.s.w $f2, $f2 -/* CE3DA4 802406B4 44071000 */ mfc1 $a3, $f2 -/* CE3DA8 802406B8 4482A000 */ mtc1 $v0, $f20 -/* CE3DAC 802406BC 00000000 */ nop -/* CE3DB0 802406C0 4680A520 */ cvt.s.w $f20, $f20 -/* CE3DB4 802406C4 0C00A7B5 */ jal dist2D -/* CE3DB8 802406C8 4600B386 */ mov.s $f14, $f22 -/* CE3DBC 802406CC 4600B306 */ mov.s $f12, $f22 -/* CE3DC0 802406D0 4600B386 */ mov.s $f14, $f22 -/* CE3DC4 802406D4 C60200B4 */ lwc1 $f2, 0xb4($s0) -/* CE3DC8 802406D8 468010A0 */ cvt.s.w $f2, $f2 -/* CE3DCC 802406DC 44061000 */ mfc1 $a2, $f2 -/* CE3DD0 802406E0 C60200BC */ lwc1 $f2, 0xbc($s0) -/* CE3DD4 802406E4 468010A0 */ cvt.s.w $f2, $f2 -/* CE3DD8 802406E8 44071000 */ mfc1 $a3, $f2 -/* CE3DDC 802406EC 0C00A720 */ jal atan2 -/* CE3DE0 802406F0 46000606 */ mov.s $f24, $f0 -/* CE3DE4 802406F4 0C00A6C9 */ jal clamp_angle -/* CE3DE8 802406F8 46140301 */ sub.s $f12, $f0, $f20 -/* CE3DEC 802406FC 46000506 */ mov.s $f20, $f0 -/* CE3DF0 80240700 0C00A8BB */ jal sin_deg -/* CE3DF4 80240704 4600A306 */ mov.s $f12, $f20 -/* CE3DF8 80240708 4600C002 */ mul.s $f0, $f24, $f0 -/* CE3DFC 8024070C 00000000 */ nop -/* CE3E00 80240710 46160000 */ add.s $f0, $f0, $f22 -/* CE3E04 80240714 E6200038 */ swc1 $f0, 0x38($s1) -/* CE3E08 80240718 8E0500B8 */ lw $a1, 0xb8($s0) -/* CE3E0C 8024071C 0C0B1EAF */ jal get_variable -/* CE3E10 80240720 0000202D */ daddu $a0, $zero, $zero -/* CE3E14 80240724 0000202D */ daddu $a0, $zero, $zero -/* CE3E18 80240728 8E050090 */ lw $a1, 0x90($s0) -/* CE3E1C 8024072C 0C0B1EAF */ jal get_variable -/* CE3E20 80240730 0040802D */ daddu $s0, $v0, $zero -/* CE3E24 80240734 4600A306 */ mov.s $f12, $f20 -/* CE3E28 80240738 02028021 */ addu $s0, $s0, $v0 -/* CE3E2C 8024073C 44900000 */ mtc1 $s0, $f0 -/* CE3E30 80240740 00000000 */ nop -/* CE3E34 80240744 46800020 */ cvt.s.w $f0, $f0 -/* CE3E38 80240748 0C00A8D4 */ jal cos_deg -/* CE3E3C 8024074C E620003C */ swc1 $f0, 0x3c($s1) -/* CE3E40 80240750 4600C602 */ mul.s $f24, $f24, $f0 -/* CE3E44 80240754 00000000 */ nop -/* CE3E48 80240758 4618B581 */ sub.s $f22, $f22, $f24 -/* CE3E4C 8024075C E6360040 */ swc1 $f22, 0x40($s1) -/* CE3E50 80240760 8FBF0018 */ lw $ra, 0x18($sp) -/* CE3E54 80240764 8FB10014 */ lw $s1, 0x14($sp) -/* CE3E58 80240768 8FB00010 */ lw $s0, 0x10($sp) -/* CE3E5C 8024076C D7B80030 */ ldc1 $f24, 0x30($sp) -/* CE3E60 80240770 D7B60028 */ ldc1 $f22, 0x28($sp) -/* CE3E64 80240774 D7B40020 */ ldc1 $f20, 0x20($sp) -/* CE3E68 80240778 24020002 */ addiu $v0, $zero, 2 -/* CE3E6C 8024077C 03E00008 */ jr $ra -/* CE3E70 80240780 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_19/func_80240784_CE36F0.s b/asm/nonmatchings/world/area_flo/flo_19/func_80240784_CE36F0.s deleted file mode 100644 index e8935be42f..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_19/func_80240784_CE36F0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240784_CE3E74 -/* CE3E74 80240784 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CE3E78 80240788 AFBF0010 */ sw $ra, 0x10($sp) -/* CE3E7C 8024078C C4800084 */ lwc1 $f0, 0x84($a0) -/* CE3E80 80240790 46800020 */ cvt.s.w $f0, $f0 -/* CE3E84 80240794 44050000 */ mfc1 $a1, $f0 -/* CE3E88 80240798 0C04DF69 */ jal func_80137DA4 -/* CE3E8C 8024079C 24040001 */ addiu $a0, $zero, 1 -/* CE3E90 802407A0 8FBF0010 */ lw $ra, 0x10($sp) -/* CE3E94 802407A4 24020002 */ addiu $v0, $zero, 2 -/* CE3E98 802407A8 03E00008 */ jr $ra -/* CE3E9C 802407AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_19/func_802407B0_CE36F0.s b/asm/nonmatchings/world/area_flo/flo_19/func_802407B0_CE36F0.s deleted file mode 100644 index c965900974..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_19/func_802407B0_CE36F0.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407B0_CE3EA0 -/* CE3EA0 802407B0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CE3EA4 802407B4 AFB20018 */ sw $s2, 0x18($sp) -/* CE3EA8 802407B8 0080902D */ daddu $s2, $a0, $zero -/* CE3EAC 802407BC AFBF0028 */ sw $ra, 0x28($sp) -/* CE3EB0 802407C0 AFB50024 */ sw $s5, 0x24($sp) -/* CE3EB4 802407C4 AFB40020 */ sw $s4, 0x20($sp) -/* CE3EB8 802407C8 AFB3001C */ sw $s3, 0x1c($sp) -/* CE3EBC 802407CC AFB10014 */ sw $s1, 0x14($sp) -/* CE3EC0 802407D0 AFB00010 */ sw $s0, 0x10($sp) -/* CE3EC4 802407D4 F7B80040 */ sdc1 $f24, 0x40($sp) -/* CE3EC8 802407D8 F7B60038 */ sdc1 $f22, 0x38($sp) -/* CE3ECC 802407DC F7B40030 */ sdc1 $f20, 0x30($sp) -/* CE3ED0 802407E0 8E50000C */ lw $s0, 0xc($s2) -/* CE3ED4 802407E4 8E140000 */ lw $s4, ($s0) -/* CE3ED8 802407E8 26100004 */ addiu $s0, $s0, 4 -/* CE3EDC 802407EC 0C0B1EAF */ jal get_variable -/* CE3EE0 802407F0 0280282D */ daddu $a1, $s4, $zero -/* CE3EE4 802407F4 0040982D */ daddu $s3, $v0, $zero -/* CE3EE8 802407F8 8E150000 */ lw $s5, ($s0) -/* CE3EEC 802407FC 26100004 */ addiu $s0, $s0, 4 -/* CE3EF0 80240800 8E050000 */ lw $a1, ($s0) -/* CE3EF4 80240804 26100004 */ addiu $s0, $s0, 4 -/* CE3EF8 80240808 0C0B210B */ jal get_float_variable -/* CE3EFC 8024080C 0240202D */ daddu $a0, $s2, $zero -/* CE3F00 80240810 8E050000 */ lw $a1, ($s0) -/* CE3F04 80240814 26100004 */ addiu $s0, $s0, 4 -/* CE3F08 80240818 0240202D */ daddu $a0, $s2, $zero -/* CE3F0C 8024081C 0C0B210B */ jal get_float_variable -/* CE3F10 80240820 46000606 */ mov.s $f24, $f0 -/* CE3F14 80240824 8E050000 */ lw $a1, ($s0) -/* CE3F18 80240828 26100004 */ addiu $s0, $s0, 4 -/* CE3F1C 8024082C 0240202D */ daddu $a0, $s2, $zero -/* CE3F20 80240830 0C0B1EAF */ jal get_variable -/* CE3F24 80240834 46000506 */ mov.s $f20, $f0 -/* CE3F28 80240838 8E050000 */ lw $a1, ($s0) -/* CE3F2C 8024083C 26100004 */ addiu $s0, $s0, 4 -/* CE3F30 80240840 0240202D */ daddu $a0, $s2, $zero -/* CE3F34 80240844 0C0B1EAF */ jal get_variable -/* CE3F38 80240848 0040882D */ daddu $s1, $v0, $zero -/* CE3F3C 8024084C 0240202D */ daddu $a0, $s2, $zero -/* CE3F40 80240850 8E050000 */ lw $a1, ($s0) -/* CE3F44 80240854 0C0B210B */ jal get_float_variable -/* CE3F48 80240858 0040802D */ daddu $s0, $v0, $zero -/* CE3F4C 8024085C 3C014334 */ lui $at, 0x4334 -/* CE3F50 80240860 44811000 */ mtc1 $at, $f2 -/* CE3F54 80240864 3C014049 */ lui $at, 0x4049 -/* CE3F58 80240868 34210FD8 */ ori $at, $at, 0xfd8 -/* CE3F5C 8024086C 44812000 */ mtc1 $at, $f4 -/* CE3F60 80240870 46020003 */ div.s $f0, $f0, $f2 -/* CE3F64 80240874 46040582 */ mul.s $f22, $f0, $f4 -/* CE3F68 80240878 00000000 */ nop -/* CE3F6C 8024087C 4618A501 */ sub.s $f20, $f20, $f24 -/* CE3F70 80240880 3C013F00 */ lui $at, 0x3f00 -/* CE3F74 80240884 44810000 */ mtc1 $at, $f0 -/* CE3F78 80240888 00000000 */ nop -/* CE3F7C 8024088C 4600A502 */ mul.s $f20, $f20, $f0 -/* CE3F80 80240890 00000000 */ nop -/* CE3F84 80240894 12000007 */ beqz $s0, .L802408B4 -/* CE3F88 80240898 0233102A */ slt $v0, $s1, $s3 -/* CE3F8C 8024089C 10400005 */ beqz $v0, .L802408B4 -/* CE3F90 802408A0 0240202D */ daddu $a0, $s2, $zero -/* CE3F94 802408A4 0220982D */ daddu $s3, $s1, $zero -/* CE3F98 802408A8 0280282D */ daddu $a1, $s4, $zero -/* CE3F9C 802408AC 0C0B2026 */ jal set_variable -/* CE3FA0 802408B0 0220302D */ daddu $a2, $s1, $zero -.L802408B4: -/* CE3FA4 802408B4 3C014049 */ lui $at, 0x4049 -/* CE3FA8 802408B8 34210FD8 */ ori $at, $at, 0xfd8 -/* CE3FAC 802408BC 44810000 */ mtc1 $at, $f0 -/* CE3FB0 802408C0 44936000 */ mtc1 $s3, $f12 -/* CE3FB4 802408C4 00000000 */ nop -/* CE3FB8 802408C8 46806320 */ cvt.s.w $f12, $f12 -/* CE3FBC 802408CC 46006302 */ mul.s $f12, $f12, $f0 -/* CE3FC0 802408D0 00000000 */ nop -/* CE3FC4 802408D4 44910000 */ mtc1 $s1, $f0 -/* CE3FC8 802408D8 00000000 */ nop -/* CE3FCC 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* CE3FD0 802408E0 46006303 */ div.s $f12, $f12, $f0 -/* CE3FD4 802408E4 0C00A874 */ jal cos_rad -/* CE3FD8 802408E8 46166300 */ add.s $f12, $f12, $f22 -/* CE3FDC 802408EC 4600A002 */ mul.s $f0, $f20, $f0 -/* CE3FE0 802408F0 00000000 */ nop -/* CE3FE4 802408F4 4614C080 */ add.s $f2, $f24, $f20 -/* CE3FE8 802408F8 46001081 */ sub.s $f2, $f2, $f0 -/* CE3FEC 802408FC 0240202D */ daddu $a0, $s2, $zero -/* CE3FF0 80240900 44061000 */ mfc1 $a2, $f2 -/* CE3FF4 80240904 0C0B2190 */ jal set_float_variable -/* CE3FF8 80240908 02A0282D */ daddu $a1, $s5, $zero -/* CE3FFC 8024090C 8FBF0028 */ lw $ra, 0x28($sp) -/* CE4000 80240910 8FB50024 */ lw $s5, 0x24($sp) -/* CE4004 80240914 8FB40020 */ lw $s4, 0x20($sp) -/* CE4008 80240918 8FB3001C */ lw $s3, 0x1c($sp) -/* CE400C 8024091C 8FB20018 */ lw $s2, 0x18($sp) -/* CE4010 80240920 8FB10014 */ lw $s1, 0x14($sp) -/* CE4014 80240924 8FB00010 */ lw $s0, 0x10($sp) -/* CE4018 80240928 D7B80040 */ ldc1 $f24, 0x40($sp) -/* CE401C 8024092C D7B60038 */ ldc1 $f22, 0x38($sp) -/* CE4020 80240930 D7B40030 */ ldc1 $f20, 0x30($sp) -/* CE4024 80240934 24020002 */ addiu $v0, $zero, 2 -/* CE4028 80240938 03E00008 */ jr $ra -/* CE402C 8024093C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_21/func_8024004C_CE6700.s b/asm/nonmatchings/world/area_flo/flo_21/func_8024004C_CE6700.s deleted file mode 100644 index 89339d7475..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_21/func_8024004C_CE6700.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024004C_CE674C -/* CE674C 8024004C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CE6750 80240050 AFB20020 */ sw $s2, 0x20($sp) -/* CE6754 80240054 0080902D */ daddu $s2, $a0, $zero -/* CE6758 80240058 AFBF0024 */ sw $ra, 0x24($sp) -/* CE675C 8024005C AFB1001C */ sw $s1, 0x1c($sp) -/* CE6760 80240060 AFB00018 */ sw $s0, 0x18($sp) -/* CE6764 80240064 10A0004A */ beqz $a1, .L80240190 -/* CE6768 80240068 8E51000C */ lw $s1, 0xc($s2) -/* CE676C 8024006C 0C00AB39 */ jal heap_malloc -/* CE6770 80240070 24040058 */ addiu $a0, $zero, 0x58 -/* CE6774 80240074 0000202D */ daddu $a0, $zero, $zero -/* CE6778 80240078 3C05FD05 */ lui $a1, 0xfd05 -/* CE677C 8024007C 34A50F81 */ ori $a1, $a1, 0xf81 -/* CE6780 80240080 0040802D */ daddu $s0, $v0, $zero -/* CE6784 80240084 0200302D */ daddu $a2, $s0, $zero -/* CE6788 80240088 0C0B2026 */ jal set_variable -/* CE678C 8024008C AE500084 */ sw $s0, 0x84($s2) -/* CE6790 80240090 8E250000 */ lw $a1, ($s1) -/* CE6794 80240094 26310004 */ addiu $s1, $s1, 4 -/* CE6798 80240098 0C0B1EAF */ jal get_variable -/* CE679C 8024009C 0240202D */ daddu $a0, $s2, $zero -/* CE67A0 802400A0 AE020038 */ sw $v0, 0x38($s0) -/* CE67A4 802400A4 8E250000 */ lw $a1, ($s1) -/* CE67A8 802400A8 26310004 */ addiu $s1, $s1, 4 -/* CE67AC 802400AC 0C0B1EAF */ jal get_variable -/* CE67B0 802400B0 0240202D */ daddu $a0, $s2, $zero -/* CE67B4 802400B4 AE02003C */ sw $v0, 0x3c($s0) -/* CE67B8 802400B8 8E250000 */ lw $a1, ($s1) -/* CE67BC 802400BC 26310004 */ addiu $s1, $s1, 4 -/* CE67C0 802400C0 0C0B210B */ jal get_float_variable -/* CE67C4 802400C4 0240202D */ daddu $a0, $s2, $zero -/* CE67C8 802400C8 E600000C */ swc1 $f0, 0xc($s0) -/* CE67CC 802400CC 8E250000 */ lw $a1, ($s1) -/* CE67D0 802400D0 26310004 */ addiu $s1, $s1, 4 -/* CE67D4 802400D4 0C0B210B */ jal get_float_variable -/* CE67D8 802400D8 0240202D */ daddu $a0, $s2, $zero -/* CE67DC 802400DC E6000010 */ swc1 $f0, 0x10($s0) -/* CE67E0 802400E0 8E250000 */ lw $a1, ($s1) -/* CE67E4 802400E4 26310004 */ addiu $s1, $s1, 4 -/* CE67E8 802400E8 0C0B210B */ jal get_float_variable -/* CE67EC 802400EC 0240202D */ daddu $a0, $s2, $zero -/* CE67F0 802400F0 E6000014 */ swc1 $f0, 0x14($s0) -/* CE67F4 802400F4 8E250000 */ lw $a1, ($s1) -/* CE67F8 802400F8 26310004 */ addiu $s1, $s1, 4 -/* CE67FC 802400FC 0C0B210B */ jal get_float_variable -/* CE6800 80240100 0240202D */ daddu $a0, $s2, $zero -/* CE6804 80240104 E6000018 */ swc1 $f0, 0x18($s0) -/* CE6808 80240108 8E250000 */ lw $a1, ($s1) -/* CE680C 8024010C 26310004 */ addiu $s1, $s1, 4 -/* CE6810 80240110 0C0B210B */ jal get_float_variable -/* CE6814 80240114 0240202D */ daddu $a0, $s2, $zero -/* CE6818 80240118 E600001C */ swc1 $f0, 0x1c($s0) -/* CE681C 8024011C 8E250000 */ lw $a1, ($s1) -/* CE6820 80240120 26310004 */ addiu $s1, $s1, 4 -/* CE6824 80240124 0C0B210B */ jal get_float_variable -/* CE6828 80240128 0240202D */ daddu $a0, $s2, $zero -/* CE682C 8024012C E6000020 */ swc1 $f0, 0x20($s0) -/* CE6830 80240130 8E250000 */ lw $a1, ($s1) -/* CE6834 80240134 26310004 */ addiu $s1, $s1, 4 -/* CE6838 80240138 0C0B210B */ jal get_float_variable -/* CE683C 8024013C 0240202D */ daddu $a0, $s2, $zero -/* CE6840 80240140 E6000024 */ swc1 $f0, 0x24($s0) -/* CE6844 80240144 8E250000 */ lw $a1, ($s1) -/* CE6848 80240148 0C0B210B */ jal get_float_variable -/* CE684C 8024014C 0240202D */ daddu $a0, $s2, $zero -/* CE6850 80240150 3C013F80 */ lui $at, 0x3f80 -/* CE6854 80240154 44811000 */ mtc1 $at, $f2 -/* CE6858 80240158 E6000028 */ swc1 $f0, 0x28($s0) -/* CE685C 8024015C AFA00014 */ sw $zero, 0x14($sp) -/* CE6860 80240160 E7A20010 */ swc1 $f2, 0x10($sp) -/* CE6864 80240164 8E05000C */ lw $a1, 0xc($s0) -/* CE6868 80240168 8E060010 */ lw $a2, 0x10($s0) -/* CE686C 8024016C 8E070014 */ lw $a3, 0x14($s0) -/* CE6870 80240170 0C01CA6C */ jal func_800729B0 -/* CE6874 80240174 24040002 */ addiu $a0, $zero, 2 -/* CE6878 80240178 AE020050 */ sw $v0, 0x50($s0) -/* CE687C 8024017C A600004E */ sh $zero, 0x4e($s0) -/* CE6880 80240180 A6000048 */ sh $zero, 0x48($s0) -/* CE6884 80240184 A600004A */ sh $zero, 0x4a($s0) -/* CE6888 80240188 A6000044 */ sh $zero, 0x44($s0) -/* CE688C 8024018C A6000046 */ sh $zero, 0x46($s0) -.L80240190: -/* CE6890 80240190 8FBF0024 */ lw $ra, 0x24($sp) -/* CE6894 80240194 8FB20020 */ lw $s2, 0x20($sp) -/* CE6898 80240198 8FB1001C */ lw $s1, 0x1c($sp) -/* CE689C 8024019C 8FB00018 */ lw $s0, 0x18($sp) -/* CE68A0 802401A0 24020002 */ addiu $v0, $zero, 2 -/* CE68A4 802401A4 03E00008 */ jr $ra -/* CE68A8 802401A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_21/func_802401AC_CE6700.s b/asm/nonmatchings/world/area_flo/flo_21/func_802401AC_CE6700.s deleted file mode 100644 index 64455463ad..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_21/func_802401AC_CE6700.s +++ /dev/null @@ -1,272 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401AC_CE68AC -/* CE68AC 802401AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CE68B0 802401B0 AFBF0020 */ sw $ra, 0x20($sp) -/* CE68B4 802401B4 AFB1001C */ sw $s1, 0x1c($sp) -/* CE68B8 802401B8 AFB00018 */ sw $s0, 0x18($sp) -/* CE68BC 802401BC 8C910084 */ lw $s1, 0x84($a0) -/* CE68C0 802401C0 86230044 */ lh $v1, 0x44($s1) -/* CE68C4 802401C4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* CE68C8 802401C8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* CE68CC 802401CC 2C620005 */ sltiu $v0, $v1, 5 -/* CE68D0 802401D0 1040008A */ beqz $v0, .L802403FC -/* CE68D4 802401D4 00031080 */ sll $v0, $v1, 2 -/* CE68D8 802401D8 3C018024 */ lui $at, 0x8024 -/* CE68DC 802401DC 00220821 */ addu $at, $at, $v0 -/* CE68E0 802401E0 8C225B10 */ lw $v0, 0x5b10($at) -/* CE68E4 802401E4 00400008 */ jr $v0 -/* CE68E8 802401E8 00000000 */ nop -/* CE68EC 802401EC 8E22003C */ lw $v0, 0x3c($s1) -/* CE68F0 802401F0 86270046 */ lh $a3, 0x46($s1) -/* CE68F4 802401F4 AFA20010 */ sw $v0, 0x10($sp) -/* CE68F8 802401F8 8E250010 */ lw $a1, 0x10($s1) -/* CE68FC 802401FC 8E26001C */ lw $a2, 0x1c($s1) -/* CE6900 80240200 0C00A8ED */ jal update_lerp -/* CE6904 80240204 24040005 */ addiu $a0, $zero, 5 -/* CE6908 80240208 86270046 */ lh $a3, 0x46($s1) -/* CE690C 8024020C 8E22003C */ lw $v0, 0x3c($s1) -/* CE6910 80240210 E6200004 */ swc1 $f0, 4($s1) -/* CE6914 80240214 AFA20010 */ sw $v0, 0x10($sp) -/* CE6918 80240218 8E25000C */ lw $a1, 0xc($s1) -/* CE691C 8024021C 8E260018 */ lw $a2, 0x18($s1) -/* CE6920 80240220 0C00A8ED */ jal update_lerp -/* CE6924 80240224 0000202D */ daddu $a0, $zero, $zero -/* CE6928 80240228 86270046 */ lh $a3, 0x46($s1) -/* CE692C 8024022C 8E22003C */ lw $v0, 0x3c($s1) -/* CE6930 80240230 E6200000 */ swc1 $f0, ($s1) -/* CE6934 80240234 AFA20010 */ sw $v0, 0x10($sp) -/* CE6938 80240238 8E250014 */ lw $a1, 0x14($s1) -/* CE693C 8024023C 8E260020 */ lw $a2, 0x20($s1) -/* CE6940 80240240 0C00A8ED */ jal update_lerp -/* CE6944 80240244 0000202D */ daddu $a0, $zero, $zero -/* CE6948 80240248 8E220050 */ lw $v0, 0x50($s1) -/* CE694C 8024024C E6200008 */ swc1 $f0, 8($s1) -/* CE6950 80240250 C6200000 */ lwc1 $f0, ($s1) -/* CE6954 80240254 8C42000C */ lw $v0, 0xc($v0) -/* CE6958 80240258 E4400008 */ swc1 $f0, 8($v0) -/* CE695C 8024025C 8E220050 */ lw $v0, 0x50($s1) -/* CE6960 80240260 C6200004 */ lwc1 $f0, 4($s1) -/* CE6964 80240264 8C42000C */ lw $v0, 0xc($v0) -/* CE6968 80240268 E440000C */ swc1 $f0, 0xc($v0) -/* CE696C 8024026C 8E220050 */ lw $v0, 0x50($s1) -/* CE6970 80240270 C6200008 */ lwc1 $f0, 8($s1) -/* CE6974 80240274 8C42000C */ lw $v0, 0xc($v0) -/* CE6978 80240278 E4400010 */ swc1 $f0, 0x10($v0) -/* CE697C 8024027C 96220046 */ lhu $v0, 0x46($s1) -/* CE6980 80240280 8E23003C */ lw $v1, 0x3c($s1) -/* CE6984 80240284 24420001 */ addiu $v0, $v0, 1 -/* CE6988 80240288 A6220046 */ sh $v0, 0x46($s1) -/* CE698C 8024028C 00021400 */ sll $v0, $v0, 0x10 -/* CE6990 80240290 00021403 */ sra $v0, $v0, 0x10 -/* CE6994 80240294 0043102A */ slt $v0, $v0, $v1 -/* CE6998 80240298 14400058 */ bnez $v0, .L802403FC -/* CE699C 8024029C 24020001 */ addiu $v0, $zero, 1 -/* CE69A0 802402A0 A6220044 */ sh $v0, 0x44($s1) -/* CE69A4 802402A4 080900FF */ j .L802403FC -/* CE69A8 802402A8 A6200046 */ sh $zero, 0x46($s1) -/* CE69AC 802402AC 96220046 */ lhu $v0, 0x46($s1) -/* CE69B0 802402B0 24420001 */ addiu $v0, $v0, 1 -/* CE69B4 802402B4 A6220046 */ sh $v0, 0x46($s1) -/* CE69B8 802402B8 00021400 */ sll $v0, $v0, 0x10 -/* CE69BC 802402BC 00021403 */ sra $v0, $v0, 0x10 -/* CE69C0 802402C0 2842003C */ slti $v0, $v0, 0x3c -/* CE69C4 802402C4 1440004D */ bnez $v0, .L802403FC -/* CE69C8 802402C8 24020002 */ addiu $v0, $zero, 2 -/* CE69CC 802402CC 8E230050 */ lw $v1, 0x50($s1) -/* CE69D0 802402D0 A6220044 */ sh $v0, 0x44($s1) -/* CE69D4 802402D4 A6200046 */ sh $zero, 0x46($s1) -/* CE69D8 802402D8 8C63000C */ lw $v1, 0xc($v1) -/* CE69DC 802402DC 24020001 */ addiu $v0, $zero, 1 -/* CE69E0 802402E0 AC620070 */ sw $v0, 0x70($v1) -/* CE69E4 802402E4 8E220050 */ lw $v0, 0x50($s1) -/* CE69E8 802402E8 8C42000C */ lw $v0, 0xc($v0) -/* CE69EC 802402EC 080900FF */ j .L802403FC -/* CE69F0 802402F0 AC400074 */ sw $zero, 0x74($v0) -/* CE69F4 802402F4 96220046 */ lhu $v0, 0x46($s1) -/* CE69F8 802402F8 24420001 */ addiu $v0, $v0, 1 -/* CE69FC 802402FC A6220046 */ sh $v0, 0x46($s1) -/* CE6A00 80240300 00021400 */ sll $v0, $v0, 0x10 -/* CE6A04 80240304 00021403 */ sra $v0, $v0, 0x10 -/* CE6A08 80240308 2842003C */ slti $v0, $v0, 0x3c -/* CE6A0C 8024030C 1440003B */ bnez $v0, .L802403FC -/* CE6A10 80240310 00000000 */ nop -/* CE6A14 80240314 3C013F80 */ lui $at, 0x3f80 -/* CE6A18 80240318 44810000 */ mtc1 $at, $f0 -/* CE6A1C 8024031C AFA00014 */ sw $zero, 0x14($sp) -/* CE6A20 80240320 E7A00010 */ swc1 $f0, 0x10($sp) -/* CE6A24 80240324 8E250018 */ lw $a1, 0x18($s1) -/* CE6A28 80240328 8E26001C */ lw $a2, 0x1c($s1) -/* CE6A2C 8024032C 8E270020 */ lw $a3, 0x20($s1) -/* CE6A30 80240330 0C01C9AC */ jal func_800726B0 -/* CE6A34 80240334 24040001 */ addiu $a0, $zero, 1 -/* CE6A38 80240338 AE220054 */ sw $v0, 0x54($s1) -/* CE6A3C 8024033C 8C43000C */ lw $v1, 0xc($v0) -/* CE6A40 80240340 9222003B */ lbu $v0, 0x3b($s1) -/* CE6A44 80240344 A0620034 */ sb $v0, 0x34($v1) -/* CE6A48 80240348 8E220054 */ lw $v0, 0x54($s1) -/* CE6A4C 8024034C 8C42000C */ lw $v0, 0xc($v0) -/* CE6A50 80240350 AC400020 */ sw $zero, 0x20($v0) -/* CE6A54 80240354 8E250018 */ lw $a1, 0x18($s1) -/* CE6A58 80240358 8E260028 */ lw $a2, 0x28($s1) -/* CE6A5C 8024035C 8E270020 */ lw $a3, 0x20($s1) -/* CE6A60 80240360 0C044898 */ jal create_shadow_type -/* CE6A64 80240364 0000202D */ daddu $a0, $zero, $zero -/* CE6A68 80240368 3C014210 */ lui $at, 0x4210 -/* CE6A6C 8024036C 44810000 */ mtc1 $at, $f0 -/* CE6A70 80240370 AE220040 */ sw $v0, 0x40($s1) -/* CE6A74 80240374 24020003 */ addiu $v0, $zero, 3 -/* CE6A78 80240378 A6220044 */ sh $v0, 0x44($s1) -/* CE6A7C 8024037C 24020001 */ addiu $v0, $zero, 1 -/* CE6A80 80240380 A6200046 */ sh $zero, 0x46($s1) -/* CE6A84 80240384 AE20002C */ sw $zero, 0x2c($s1) -/* CE6A88 80240388 A6220048 */ sh $v0, 0x48($s1) -/* CE6A8C 8024038C 080900FF */ j .L802403FC -/* CE6A90 80240390 E6200030 */ swc1 $f0, 0x30($s1) -/* CE6A94 80240394 0000202D */ daddu $a0, $zero, $zero -/* CE6A98 80240398 3C054210 */ lui $a1, 0x4210 -/* CE6A9C 8024039C 3C064198 */ lui $a2, 0x4198 -/* CE6AA0 802403A0 86270046 */ lh $a3, 0x46($s1) -/* CE6AA4 802403A4 24020078 */ addiu $v0, $zero, 0x78 -/* CE6AA8 802403A8 0C00A8ED */ jal update_lerp -/* CE6AAC 802403AC AFA20010 */ sw $v0, 0x10($sp) -/* CE6AB0 802403B0 96220046 */ lhu $v0, 0x46($s1) -/* CE6AB4 802403B4 E6200030 */ swc1 $f0, 0x30($s1) -/* CE6AB8 802403B8 24420001 */ addiu $v0, $v0, 1 -/* CE6ABC 802403BC A6220046 */ sh $v0, 0x46($s1) -/* CE6AC0 802403C0 00021400 */ sll $v0, $v0, 0x10 -/* CE6AC4 802403C4 00021403 */ sra $v0, $v0, 0x10 -/* CE6AC8 802403C8 28420078 */ slti $v0, $v0, 0x78 -/* CE6ACC 802403CC 1440000B */ bnez $v0, .L802403FC -/* CE6AD0 802403D0 24030001 */ addiu $v1, $zero, 1 -/* CE6AD4 802403D4 C620002C */ lwc1 $f0, 0x2c($s1) -/* CE6AD8 802403D8 24020002 */ addiu $v0, $zero, 2 -/* CE6ADC 802403DC A6220048 */ sh $v0, 0x48($s1) -/* CE6AE0 802403E0 24020004 */ addiu $v0, $zero, 4 -/* CE6AE4 802403E4 A620004C */ sh $zero, 0x4c($s1) -/* CE6AE8 802403E8 A623004A */ sh $v1, 0x4a($s1) -/* CE6AEC 802403EC A623004E */ sh $v1, 0x4e($s1) -/* CE6AF0 802403F0 A6220044 */ sh $v0, 0x44($s1) -/* CE6AF4 802403F4 A6200046 */ sh $zero, 0x46($s1) -/* CE6AF8 802403F8 E6200034 */ swc1 $f0, 0x34($s1) -.L802403FC: -/* CE6AFC 802403FC 8623004A */ lh $v1, 0x4a($s1) -/* CE6B00 80240400 24020001 */ addiu $v0, $zero, 1 -/* CE6B04 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* CE6B08 80240408 24020002 */ addiu $v0, $zero, 2 -/* CE6B0C 8024040C 1062001E */ beq $v1, $v0, .L80240488 -/* CE6B10 80240410 00000000 */ nop -/* CE6B14 80240414 0809014C */ j .L80240530 -/* CE6B18 80240418 00000000 */ nop -.L8024041C: -/* CE6B1C 8024041C 8627004C */ lh $a3, 0x4c($s1) -/* CE6B20 80240420 24100078 */ addiu $s0, $zero, 0x78 -/* CE6B24 80240424 AFB00010 */ sw $s0, 0x10($sp) -/* CE6B28 80240428 8E250034 */ lw $a1, 0x34($s1) -/* CE6B2C 8024042C 3C0644B4 */ lui $a2, 0x44b4 -/* CE6B30 80240430 0C00A8ED */ jal update_lerp -/* CE6B34 80240434 24040004 */ addiu $a0, $zero, 4 -/* CE6B38 80240438 8627004C */ lh $a3, 0x4c($s1) -/* CE6B3C 8024043C E620002C */ swc1 $f0, 0x2c($s1) -/* CE6B40 80240440 AFB00010 */ sw $s0, 0x10($sp) -/* CE6B44 80240444 8E25001C */ lw $a1, 0x1c($s1) -/* CE6B48 80240448 8E260024 */ lw $a2, 0x24($s1) -/* CE6B4C 8024044C 0C00A8ED */ jal update_lerp -/* CE6B50 80240450 2404000A */ addiu $a0, $zero, 0xa -/* CE6B54 80240454 9622004C */ lhu $v0, 0x4c($s1) -/* CE6B58 80240458 E6200004 */ swc1 $f0, 4($s1) -/* CE6B5C 8024045C 24420001 */ addiu $v0, $v0, 1 -/* CE6B60 80240460 A622004C */ sh $v0, 0x4c($s1) -/* CE6B64 80240464 00021400 */ sll $v0, $v0, 0x10 -/* CE6B68 80240468 00021403 */ sra $v0, $v0, 0x10 -/* CE6B6C 8024046C 0050102A */ slt $v0, $v0, $s0 -/* CE6B70 80240470 1440002F */ bnez $v0, .L80240530 -/* CE6B74 80240474 2402010E */ addiu $v0, $zero, 0x10e -/* CE6B78 80240478 A622004C */ sh $v0, 0x4c($s1) -/* CE6B7C 8024047C 24020002 */ addiu $v0, $zero, 2 -/* CE6B80 80240480 0809014B */ j .L8024052C -/* CE6B84 80240484 A622004A */ sh $v0, 0x4a($s1) -.L80240488: -/* CE6B88 80240488 8622004C */ lh $v0, 0x4c($s1) -/* CE6B8C 8024048C 44826000 */ mtc1 $v0, $f12 -/* CE6B90 80240490 00000000 */ nop -/* CE6B94 80240494 0C00A8BB */ jal sin_deg -/* CE6B98 80240498 46806320 */ cvt.s.w $f12, $f12 -/* CE6B9C 8024049C 3C013F80 */ lui $at, 0x3f80 -/* CE6BA0 802404A0 44811000 */ mtc1 $at, $f2 -/* CE6BA4 802404A4 00000000 */ nop -/* CE6BA8 802404A8 46020000 */ add.s $f0, $f0, $f2 -/* CE6BAC 802404AC 46000000 */ add.s $f0, $f0, $f0 -/* CE6BB0 802404B0 C6220024 */ lwc1 $f2, 0x24($s1) -/* CE6BB4 802404B4 8622004C */ lh $v0, 0x4c($s1) -/* CE6BB8 802404B8 46001080 */ add.s $f2, $f2, $f0 -/* CE6BBC 802404BC 24420008 */ addiu $v0, $v0, 8 -/* CE6BC0 802404C0 44826000 */ mtc1 $v0, $f12 -/* CE6BC4 802404C4 00000000 */ nop -/* CE6BC8 802404C8 46806320 */ cvt.s.w $f12, $f12 -/* CE6BCC 802404CC 0C00A6C9 */ jal clamp_angle -/* CE6BD0 802404D0 E6220004 */ swc1 $f2, 4($s1) -/* CE6BD4 802404D4 4600010D */ trunc.w.s $f4, $f0 -/* CE6BD8 802404D8 44022000 */ mfc1 $v0, $f4 -/* CE6BDC 802404DC C6200004 */ lwc1 $f0, 4($s1) -/* CE6BE0 802404E0 A622004C */ sh $v0, 0x4c($s1) -/* CE6BE4 802404E4 C60C0028 */ lwc1 $f12, 0x28($s0) -/* CE6BE8 802404E8 8E060030 */ lw $a2, 0x30($s0) -/* CE6BEC 802404EC 3C0141A0 */ lui $at, 0x41a0 -/* CE6BF0 802404F0 44817000 */ mtc1 $at, $f14 -/* CE6BF4 802404F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* CE6BF8 802404F8 C602002C */ lwc1 $f2, 0x2c($s0) -/* CE6BFC 802404FC C6200008 */ lwc1 $f0, 8($s1) -/* CE6C00 80240500 E7A00014 */ swc1 $f0, 0x14($sp) -/* CE6C04 80240504 8E270000 */ lw $a3, ($s1) -/* CE6C08 80240508 0C00A7CB */ jal dist3D -/* CE6C0C 8024050C 460E1380 */ add.s $f14, $f2, $f14 -/* CE6C10 80240510 3C0141F0 */ lui $at, 0x41f0 -/* CE6C14 80240514 44811000 */ mtc1 $at, $f2 -/* CE6C18 80240518 00000000 */ nop -/* CE6C1C 8024051C 4600103C */ c.lt.s $f2, $f0 -/* CE6C20 80240520 00000000 */ nop -/* CE6C24 80240524 45010002 */ bc1t .L80240530 -/* CE6C28 80240528 24020003 */ addiu $v0, $zero, 3 -.L8024052C: -/* CE6C2C 8024052C A622004E */ sh $v0, 0x4e($s1) -.L80240530: -/* CE6C30 80240530 86230048 */ lh $v1, 0x48($s1) -/* CE6C34 80240534 24020001 */ addiu $v0, $zero, 1 -/* CE6C38 80240538 10620005 */ beq $v1, $v0, .L80240550 -/* CE6C3C 8024053C 24020002 */ addiu $v0, $zero, 2 -/* CE6C40 80240540 10620008 */ beq $v1, $v0, .L80240564 -/* CE6C44 80240544 00000000 */ nop -/* CE6C48 80240548 08090169 */ j .L802405A4 -/* CE6C4C 8024054C 00000000 */ nop -.L80240550: -/* CE6C50 80240550 C620002C */ lwc1 $f0, 0x2c($s1) -/* CE6C54 80240554 C62C0030 */ lwc1 $f12, 0x30($s1) -/* CE6C58 80240558 0C00A6C9 */ jal clamp_angle -/* CE6C5C 8024055C 460C0300 */ add.s $f12, $f0, $f12 -/* CE6C60 80240560 E620002C */ swc1 $f0, 0x2c($s1) -.L80240564: -/* CE6C64 80240564 8E220054 */ lw $v0, 0x54($s1) -/* CE6C68 80240568 C620002C */ lwc1 $f0, 0x2c($s1) -/* CE6C6C 8024056C 8C42000C */ lw $v0, 0xc($v0) -/* CE6C70 80240570 E4400024 */ swc1 $f0, 0x24($v0) -/* CE6C74 80240574 8E220054 */ lw $v0, 0x54($s1) -/* CE6C78 80240578 C6200018 */ lwc1 $f0, 0x18($s1) -/* CE6C7C 8024057C 8C42000C */ lw $v0, 0xc($v0) -/* CE6C80 80240580 E4400004 */ swc1 $f0, 4($v0) -/* CE6C84 80240584 8E220054 */ lw $v0, 0x54($s1) -/* CE6C88 80240588 C6200004 */ lwc1 $f0, 4($s1) -/* CE6C8C 8024058C 8C42000C */ lw $v0, 0xc($v0) -/* CE6C90 80240590 E4400008 */ swc1 $f0, 8($v0) -/* CE6C94 80240594 8E220054 */ lw $v0, 0x54($s1) -/* CE6C98 80240598 C6200020 */ lwc1 $f0, 0x20($s1) -/* CE6C9C 8024059C 8C42000C */ lw $v0, 0xc($v0) -/* CE6CA0 802405A0 E440000C */ swc1 $f0, 0xc($v0) -.L802405A4: -/* CE6CA4 802405A4 8FBF0020 */ lw $ra, 0x20($sp) -/* CE6CA8 802405A8 8FB1001C */ lw $s1, 0x1c($sp) -/* CE6CAC 802405AC 8FB00018 */ lw $s0, 0x18($sp) -/* CE6CB0 802405B0 0000102D */ daddu $v0, $zero, $zero -/* CE6CB4 802405B4 03E00008 */ jr $ra -/* CE6CB8 802405B8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_21/func_802405BC_CE6700.s b/asm/nonmatchings/world/area_flo/flo_21/func_802405BC_CE6700.s deleted file mode 100644 index f29b69a2bb..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_21/func_802405BC_CE6700.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405BC_CE6CBC -/* CE6CBC 802405BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CE6CC0 802405C0 AFB00010 */ sw $s0, 0x10($sp) -/* CE6CC4 802405C4 0080802D */ daddu $s0, $a0, $zero -/* CE6CC8 802405C8 AFBF0014 */ sw $ra, 0x14($sp) -/* CE6CCC 802405CC 8E02000C */ lw $v0, 0xc($s0) -/* CE6CD0 802405D0 0C0B1EAF */ jal get_variable -/* CE6CD4 802405D4 8C450000 */ lw $a1, ($v0) -/* CE6CD8 802405D8 8E030084 */ lw $v1, 0x84($s0) -/* CE6CDC 802405DC 8FBF0014 */ lw $ra, 0x14($sp) -/* CE6CE0 802405E0 8463004E */ lh $v1, 0x4e($v1) -/* CE6CE4 802405E4 8FB00010 */ lw $s0, 0x10($sp) -/* CE6CE8 802405E8 00621826 */ xor $v1, $v1, $v0 -/* CE6CEC 802405EC 2C630001 */ sltiu $v1, $v1, 1 -/* CE6CF0 802405F0 00031040 */ sll $v0, $v1, 1 -/* CE6CF4 802405F4 03E00008 */ jr $ra -/* CE6CF8 802405F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_21/func_802405FC_CE6700.s b/asm/nonmatchings/world/area_flo/flo_21/func_802405FC_CE6700.s deleted file mode 100644 index 67e6c2a950..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_21/func_802405FC_CE6700.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405FC_CE6CFC -/* CE6CFC 802405FC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CE6D00 80240600 AFB20020 */ sw $s2, 0x20($sp) -/* CE6D04 80240604 0080902D */ daddu $s2, $a0, $zero -/* CE6D08 80240608 AFBF0024 */ sw $ra, 0x24($sp) -/* CE6D0C 8024060C AFB1001C */ sw $s1, 0x1c($sp) -/* CE6D10 80240610 AFB00018 */ sw $s0, 0x18($sp) -/* CE6D14 80240614 10A00035 */ beqz $a1, .L802406EC -/* CE6D18 80240618 8E51000C */ lw $s1, 0xc($s2) -/* CE6D1C 8024061C 0C00AB39 */ jal heap_malloc -/* CE6D20 80240620 24040058 */ addiu $a0, $zero, 0x58 -/* CE6D24 80240624 0040802D */ daddu $s0, $v0, $zero -/* CE6D28 80240628 AE500084 */ sw $s0, 0x84($s2) -/* CE6D2C 8024062C 8E250000 */ lw $a1, ($s1) -/* CE6D30 80240630 26310004 */ addiu $s1, $s1, 4 -/* CE6D34 80240634 0C0B1EAF */ jal get_variable -/* CE6D38 80240638 0240202D */ daddu $a0, $s2, $zero -/* CE6D3C 8024063C AE020038 */ sw $v0, 0x38($s0) -/* CE6D40 80240640 8E250000 */ lw $a1, ($s1) -/* CE6D44 80240644 26310004 */ addiu $s1, $s1, 4 -/* CE6D48 80240648 0C0B210B */ jal get_float_variable -/* CE6D4C 8024064C 0240202D */ daddu $a0, $s2, $zero -/* CE6D50 80240650 E6000018 */ swc1 $f0, 0x18($s0) -/* CE6D54 80240654 8E250000 */ lw $a1, ($s1) -/* CE6D58 80240658 26310004 */ addiu $s1, $s1, 4 -/* CE6D5C 8024065C 0C0B210B */ jal get_float_variable -/* CE6D60 80240660 0240202D */ daddu $a0, $s2, $zero -/* CE6D64 80240664 E6000024 */ swc1 $f0, 0x24($s0) -/* CE6D68 80240668 8E250000 */ lw $a1, ($s1) -/* CE6D6C 8024066C 26310004 */ addiu $s1, $s1, 4 -/* CE6D70 80240670 0C0B210B */ jal get_float_variable -/* CE6D74 80240674 0240202D */ daddu $a0, $s2, $zero -/* CE6D78 80240678 E6000020 */ swc1 $f0, 0x20($s0) -/* CE6D7C 8024067C 8E250000 */ lw $a1, ($s1) -/* CE6D80 80240680 0C0B210B */ jal get_float_variable -/* CE6D84 80240684 0240202D */ daddu $a0, $s2, $zero -/* CE6D88 80240688 3C013F80 */ lui $at, 0x3f80 -/* CE6D8C 8024068C 44811000 */ mtc1 $at, $f2 -/* CE6D90 80240690 E6000028 */ swc1 $f0, 0x28($s0) -/* CE6D94 80240694 AFA00014 */ sw $zero, 0x14($sp) -/* CE6D98 80240698 E7A20010 */ swc1 $f2, 0x10($sp) -/* CE6D9C 8024069C 8E050018 */ lw $a1, 0x18($s0) -/* CE6DA0 802406A0 8E060024 */ lw $a2, 0x24($s0) -/* CE6DA4 802406A4 8E070020 */ lw $a3, 0x20($s0) -/* CE6DA8 802406A8 0C01C9AC */ jal func_800726B0 -/* CE6DAC 802406AC 24040001 */ addiu $a0, $zero, 1 -/* CE6DB0 802406B0 AE020054 */ sw $v0, 0x54($s0) -/* CE6DB4 802406B4 8C43000C */ lw $v1, 0xc($v0) -/* CE6DB8 802406B8 9202003B */ lbu $v0, 0x3b($s0) -/* CE6DBC 802406BC A0620034 */ sb $v0, 0x34($v1) -/* CE6DC0 802406C0 8E020054 */ lw $v0, 0x54($s0) -/* CE6DC4 802406C4 8C42000C */ lw $v0, 0xc($v0) -/* CE6DC8 802406C8 AC400020 */ sw $zero, 0x20($v0) -/* CE6DCC 802406CC 8E050018 */ lw $a1, 0x18($s0) -/* CE6DD0 802406D0 8E060028 */ lw $a2, 0x28($s0) -/* CE6DD4 802406D4 8E070020 */ lw $a3, 0x20($s0) -/* CE6DD8 802406D8 0C044898 */ jal create_shadow_type -/* CE6DDC 802406DC 0000202D */ daddu $a0, $zero, $zero -/* CE6DE0 802406E0 AE020040 */ sw $v0, 0x40($s0) -/* CE6DE4 802406E4 2402010E */ addiu $v0, $zero, 0x10e -/* CE6DE8 802406E8 A602004C */ sh $v0, 0x4c($s0) -.L802406EC: -/* CE6DEC 802406EC 8FBF0024 */ lw $ra, 0x24($sp) -/* CE6DF0 802406F0 8FB20020 */ lw $s2, 0x20($sp) -/* CE6DF4 802406F4 8FB1001C */ lw $s1, 0x1c($sp) -/* CE6DF8 802406F8 8FB00018 */ lw $s0, 0x18($sp) -/* CE6DFC 802406FC 24020002 */ addiu $v0, $zero, 2 -/* CE6E00 80240700 03E00008 */ jr $ra -/* CE6E04 80240704 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_21/func_80240708_CE6700.s b/asm/nonmatchings/world/area_flo/flo_21/func_80240708_CE6700.s deleted file mode 100644 index 5ff52bbd0f..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_21/func_80240708_CE6700.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240708_CE6E08 -/* CE6E08 80240708 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CE6E0C 8024070C AFBF0014 */ sw $ra, 0x14($sp) -/* CE6E10 80240710 AFB00010 */ sw $s0, 0x10($sp) -/* CE6E14 80240714 8C900084 */ lw $s0, 0x84($a0) -/* CE6E18 80240718 8602004C */ lh $v0, 0x4c($s0) -/* CE6E1C 8024071C 44826000 */ mtc1 $v0, $f12 -/* CE6E20 80240720 00000000 */ nop -/* CE6E24 80240724 0C00A8BB */ jal sin_deg -/* CE6E28 80240728 46806320 */ cvt.s.w $f12, $f12 -/* CE6E2C 8024072C 3C013F80 */ lui $at, 0x3f80 -/* CE6E30 80240730 44811000 */ mtc1 $at, $f2 -/* CE6E34 80240734 00000000 */ nop -/* CE6E38 80240738 46020000 */ add.s $f0, $f0, $f2 -/* CE6E3C 8024073C 46000000 */ add.s $f0, $f0, $f0 -/* CE6E40 80240740 C6020024 */ lwc1 $f2, 0x24($s0) -/* CE6E44 80240744 8602004C */ lh $v0, 0x4c($s0) -/* CE6E48 80240748 46001080 */ add.s $f2, $f2, $f0 -/* CE6E4C 8024074C 24420008 */ addiu $v0, $v0, 8 -/* CE6E50 80240750 44826000 */ mtc1 $v0, $f12 -/* CE6E54 80240754 00000000 */ nop -/* CE6E58 80240758 46806320 */ cvt.s.w $f12, $f12 -/* CE6E5C 8024075C 0C00A6C9 */ jal clamp_angle -/* CE6E60 80240760 E6020004 */ swc1 $f2, 4($s0) -/* CE6E64 80240764 4600010D */ trunc.w.s $f4, $f0 -/* CE6E68 80240768 44022000 */ mfc1 $v0, $f4 -/* CE6E6C 8024076C 00000000 */ nop -/* CE6E70 80240770 A602004C */ sh $v0, 0x4c($s0) -/* CE6E74 80240774 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* CE6E78 80240778 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* CE6E7C 8024077C C44C0028 */ lwc1 $f12, 0x28($v0) -/* CE6E80 80240780 C44E0030 */ lwc1 $f14, 0x30($v0) -/* CE6E84 80240784 8E060018 */ lw $a2, 0x18($s0) -/* CE6E88 80240788 0C00A7B5 */ jal dist2D -/* CE6E8C 8024078C 8E070020 */ lw $a3, 0x20($s0) -/* CE6E90 80240790 3C0141F0 */ lui $at, 0x41f0 -/* CE6E94 80240794 44811000 */ mtc1 $at, $f2 -/* CE6E98 80240798 00000000 */ nop -/* CE6E9C 8024079C 4602003E */ c.le.s $f0, $f2 -/* CE6EA0 802407A0 00000000 */ nop -/* CE6EA4 802407A4 45000002 */ bc1f .L802407B0 -/* CE6EA8 802407A8 24020003 */ addiu $v0, $zero, 3 -/* CE6EAC 802407AC A602004E */ sh $v0, 0x4e($s0) -.L802407B0: -/* CE6EB0 802407B0 8E020054 */ lw $v0, 0x54($s0) -/* CE6EB4 802407B4 C6000018 */ lwc1 $f0, 0x18($s0) -/* CE6EB8 802407B8 8C42000C */ lw $v0, 0xc($v0) -/* CE6EBC 802407BC E4400004 */ swc1 $f0, 4($v0) -/* CE6EC0 802407C0 8E020054 */ lw $v0, 0x54($s0) -/* CE6EC4 802407C4 C6000004 */ lwc1 $f0, 4($s0) -/* CE6EC8 802407C8 8C42000C */ lw $v0, 0xc($v0) -/* CE6ECC 802407CC E4400008 */ swc1 $f0, 8($v0) -/* CE6ED0 802407D0 8E020054 */ lw $v0, 0x54($s0) -/* CE6ED4 802407D4 C6000020 */ lwc1 $f0, 0x20($s0) -/* CE6ED8 802407D8 8C42000C */ lw $v0, 0xc($v0) -/* CE6EDC 802407DC E440000C */ swc1 $f0, 0xc($v0) -/* CE6EE0 802407E0 8FBF0014 */ lw $ra, 0x14($sp) -/* CE6EE4 802407E4 8FB00010 */ lw $s0, 0x10($sp) -/* CE6EE8 802407E8 0000102D */ daddu $v0, $zero, $zero -/* CE6EEC 802407EC 03E00008 */ jr $ra -/* CE6EF0 802407F0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_21/func_802407F4_CE6700.s b/asm/nonmatchings/world/area_flo/flo_21/func_802407F4_CE6700.s deleted file mode 100644 index c5e1383095..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_21/func_802407F4_CE6700.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407F4_CE6EF4 -/* CE6EF4 802407F4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CE6EF8 802407F8 AFB00010 */ sw $s0, 0x10($sp) -/* CE6EFC 802407FC 0080802D */ daddu $s0, $a0, $zero -/* CE6F00 80240800 AFBF0014 */ sw $ra, 0x14($sp) -/* CE6F04 80240804 8E0300A8 */ lw $v1, 0xa8($s0) -/* CE6F08 80240808 8E020088 */ lw $v0, 0x88($s0) -/* CE6F0C 8024080C 00621821 */ addu $v1, $v1, $v0 -/* CE6F10 80240810 04610004 */ bgez $v1, .L80240824 -/* CE6F14 80240814 AE0300A8 */ sw $v1, 0xa8($s0) -/* CE6F18 80240818 3C020002 */ lui $v0, 2 -/* CE6F1C 8024081C 0809020D */ j .L80240834 -/* CE6F20 80240820 00621021 */ addu $v0, $v1, $v0 -.L80240824: -/* CE6F24 80240824 3C040002 */ lui $a0, 2 -/* CE6F28 80240828 0083102A */ slt $v0, $a0, $v1 -/* CE6F2C 8024082C 10400002 */ beqz $v0, .L80240838 -/* CE6F30 80240830 00641023 */ subu $v0, $v1, $a0 -.L80240834: -/* CE6F34 80240834 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240838: -/* CE6F38 80240838 8E0300AC */ lw $v1, 0xac($s0) -/* CE6F3C 8024083C 8E02008C */ lw $v0, 0x8c($s0) -/* CE6F40 80240840 00621821 */ addu $v1, $v1, $v0 -/* CE6F44 80240844 04610004 */ bgez $v1, .L80240858 -/* CE6F48 80240848 AE0300AC */ sw $v1, 0xac($s0) -/* CE6F4C 8024084C 3C020002 */ lui $v0, 2 -/* CE6F50 80240850 0809021A */ j .L80240868 -/* CE6F54 80240854 00621021 */ addu $v0, $v1, $v0 -.L80240858: -/* CE6F58 80240858 3C040002 */ lui $a0, 2 -/* CE6F5C 8024085C 0083102A */ slt $v0, $a0, $v1 -/* CE6F60 80240860 10400002 */ beqz $v0, .L8024086C -/* CE6F64 80240864 00641023 */ subu $v0, $v1, $a0 -.L80240868: -/* CE6F68 80240868 AE0200AC */ sw $v0, 0xac($s0) -.L8024086C: -/* CE6F6C 8024086C 8E0300B0 */ lw $v1, 0xb0($s0) -/* CE6F70 80240870 8E020090 */ lw $v0, 0x90($s0) -/* CE6F74 80240874 00621821 */ addu $v1, $v1, $v0 -/* CE6F78 80240878 04610004 */ bgez $v1, .L8024088C -/* CE6F7C 8024087C AE0300B0 */ sw $v1, 0xb0($s0) -/* CE6F80 80240880 3C020002 */ lui $v0, 2 -/* CE6F84 80240884 08090227 */ j .L8024089C -/* CE6F88 80240888 00621021 */ addu $v0, $v1, $v0 -.L8024088C: -/* CE6F8C 8024088C 3C040002 */ lui $a0, 2 -/* CE6F90 80240890 0083102A */ slt $v0, $a0, $v1 -/* CE6F94 80240894 10400002 */ beqz $v0, .L802408A0 -/* CE6F98 80240898 00641023 */ subu $v0, $v1, $a0 -.L8024089C: -/* CE6F9C 8024089C AE0200B0 */ sw $v0, 0xb0($s0) -.L802408A0: -/* CE6FA0 802408A0 8E0300B4 */ lw $v1, 0xb4($s0) -/* CE6FA4 802408A4 8E020094 */ lw $v0, 0x94($s0) -/* CE6FA8 802408A8 00621821 */ addu $v1, $v1, $v0 -/* CE6FAC 802408AC 04610004 */ bgez $v1, .L802408C0 -/* CE6FB0 802408B0 AE0300B4 */ sw $v1, 0xb4($s0) -/* CE6FB4 802408B4 3C020002 */ lui $v0, 2 -/* CE6FB8 802408B8 08090234 */ j .L802408D0 -/* CE6FBC 802408BC 00621021 */ addu $v0, $v1, $v0 -.L802408C0: -/* CE6FC0 802408C0 3C040002 */ lui $a0, 2 -/* CE6FC4 802408C4 0083102A */ slt $v0, $a0, $v1 -/* CE6FC8 802408C8 10400002 */ beqz $v0, .L802408D4 -/* CE6FCC 802408CC 00641023 */ subu $v0, $v1, $a0 -.L802408D0: -/* CE6FD0 802408D0 AE0200B4 */ sw $v0, 0xb4($s0) -.L802408D4: -/* CE6FD4 802408D4 8E040084 */ lw $a0, 0x84($s0) -/* CE6FD8 802408D8 0C046F07 */ jal set_main_pan_u -/* CE6FDC 802408DC 8E0500A8 */ lw $a1, 0xa8($s0) -/* CE6FE0 802408E0 8E040084 */ lw $a0, 0x84($s0) -/* CE6FE4 802408E4 0C046F0D */ jal set_main_pan_v -/* CE6FE8 802408E8 8E0500AC */ lw $a1, 0xac($s0) -/* CE6FEC 802408EC 8E040084 */ lw $a0, 0x84($s0) -/* CE6FF0 802408F0 0C046F13 */ jal set_aux_pan_u -/* CE6FF4 802408F4 8E0500B0 */ lw $a1, 0xb0($s0) -/* CE6FF8 802408F8 8E040084 */ lw $a0, 0x84($s0) -/* CE6FFC 802408FC 0C046F19 */ jal set_aux_pan_v -/* CE7000 80240900 8E0500B4 */ lw $a1, 0xb4($s0) -/* CE7004 80240904 8FBF0014 */ lw $ra, 0x14($sp) -/* CE7008 80240908 8FB00010 */ lw $s0, 0x10($sp) -/* CE700C 8024090C 0000102D */ daddu $v0, $zero, $zero -/* CE7010 80240910 03E00008 */ jr $ra -/* CE7014 80240914 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_21/func_80240B00_CE6700.s b/asm/nonmatchings/world/area_flo/flo_21/func_80240B00_CE6700.s deleted file mode 100644 index fb2330530e..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_21/func_80240B00_CE6700.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B00_CE7200 -/* CE7200 80240B00 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CE7204 80240B04 24040001 */ addiu $a0, $zero, 1 -/* CE7208 80240B08 0000282D */ daddu $a1, $zero, $zero -/* CE720C 80240B0C 00A0302D */ daddu $a2, $a1, $zero -/* CE7210 80240B10 00A0382D */ daddu $a3, $a1, $zero -/* CE7214 80240B14 AFBF0018 */ sw $ra, 0x18($sp) -/* CE7218 80240B18 AFA00010 */ sw $zero, 0x10($sp) -/* CE721C 80240B1C 0C01CA54 */ jal func_80072950 -/* CE7220 80240B20 AFA00014 */ sw $zero, 0x14($sp) -/* CE7224 80240B24 8FBF0018 */ lw $ra, 0x18($sp) -/* CE7228 80240B28 24020002 */ addiu $v0, $zero, 2 -/* CE722C 80240B2C 03E00008 */ jr $ra -/* CE7230 80240B30 27BD0020 */ addiu $sp, $sp, 0x20 -/* CE7234 80240B34 00000000 */ nop -/* CE7238 80240B38 00000000 */ nop -/* CE723C 80240B3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_21/func_80240CD0_CE6700.s b/asm/nonmatchings/world/area_flo/flo_21/func_80240CD0_CE6700.s deleted file mode 100644 index b1f5761016..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_21/func_80240CD0_CE6700.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CD0_CE73D0 -/* CE73D0 80240CD0 3C03800B */ lui $v1, %hi(gCameras) -/* CE73D4 80240CD4 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* CE73D8 80240CD8 94620002 */ lhu $v0, 2($v1) -/* CE73DC 80240CDC 3042FFFE */ andi $v0, $v0, 0xfffe -/* CE73E0 80240CE0 A4620002 */ sh $v0, 2($v1) -/* CE73E4 80240CE4 03E00008 */ jr $ra -/* CE73E8 80240CE8 24020002 */ addiu $v0, $zero, 2 -/* CE73EC 80240CEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_22/func_80240040_CEC240.s b/asm/nonmatchings/world/area_flo/flo_22/_CEC280/func_80240040_CEC280.s similarity index 100% rename from asm/nonmatchings/world/area_flo/flo_22/func_80240040_CEC240.s rename to asm/nonmatchings/world/area_flo/flo_22/_CEC280/func_80240040_CEC280.s diff --git a/asm/nonmatchings/world/area_flo/flo_22/func_80240050_CEC240.s b/asm/nonmatchings/world/area_flo/flo_22/_CEC290/func_80240050_CEC290.s similarity index 100% rename from asm/nonmatchings/world/area_flo/flo_22/func_80240050_CEC240.s rename to asm/nonmatchings/world/area_flo/flo_22/_CEC290/func_80240050_CEC290.s diff --git a/asm/nonmatchings/world/area_flo/flo_22/func_802400C0_CEC240.s b/asm/nonmatchings/world/area_flo/flo_22/_CEC290/func_802400C0_CEC300.s similarity index 100% rename from asm/nonmatchings/world/area_flo/flo_22/func_802400C0_CEC240.s rename to asm/nonmatchings/world/area_flo/flo_22/_CEC290/func_802400C0_CEC300.s diff --git a/asm/nonmatchings/world/area_flo/flo_23/func_80240040_CEE260.s b/asm/nonmatchings/world/area_flo/flo_23/func_80240040_CEE260.s deleted file mode 100644 index 503bab8c9b..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_23/func_80240040_CEE260.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_CEE2A0 -/* CEE2A0 80240040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CEE2A4 80240044 AFB10014 */ sw $s1, 0x14($sp) -/* CEE2A8 80240048 0080882D */ daddu $s1, $a0, $zero -/* CEE2AC 8024004C AFBF0018 */ sw $ra, 0x18($sp) -/* CEE2B0 80240050 AFB00010 */ sw $s0, 0x10($sp) -/* CEE2B4 80240054 8E30000C */ lw $s0, 0xc($s1) -/* CEE2B8 80240058 8E050000 */ lw $a1, ($s0) -/* CEE2BC 8024005C 0C0B1EAF */ jal get_variable -/* CEE2C0 80240060 26100004 */ addiu $s0, $s0, 4 -/* CEE2C4 80240064 0C00EAD2 */ jal get_npc_safe -/* CEE2C8 80240068 0040202D */ daddu $a0, $v0, $zero -/* CEE2CC 8024006C 10400005 */ beqz $v0, .L80240084 -/* CEE2D0 80240070 00000000 */ nop -/* CEE2D4 80240074 8E050000 */ lw $a1, ($s0) -/* CEE2D8 80240078 844600A8 */ lh $a2, 0xa8($v0) -/* CEE2DC 8024007C 0C0B2026 */ jal set_variable -/* CEE2E0 80240080 0220202D */ daddu $a0, $s1, $zero -.L80240084: -/* CEE2E4 80240084 8FBF0018 */ lw $ra, 0x18($sp) -/* CEE2E8 80240088 8FB10014 */ lw $s1, 0x14($sp) -/* CEE2EC 8024008C 8FB00010 */ lw $s0, 0x10($sp) -/* CEE2F0 80240090 24020002 */ addiu $v0, $zero, 2 -/* CEE2F4 80240094 03E00008 */ jr $ra -/* CEE2F8 80240098 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_23/func_8024009C_CEE260.s b/asm/nonmatchings/world/area_flo/flo_23/func_8024009C_CEE260.s deleted file mode 100644 index 57f1ed0a84..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_23/func_8024009C_CEE260.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024009C_CEE2FC -/* CEE2FC 8024009C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CEE300 802400A0 AFB10014 */ sw $s1, 0x14($sp) -/* CEE304 802400A4 0080882D */ daddu $s1, $a0, $zero -/* CEE308 802400A8 AFBF0024 */ sw $ra, 0x24($sp) -/* CEE30C 802400AC AFB40020 */ sw $s4, 0x20($sp) -/* CEE310 802400B0 AFB3001C */ sw $s3, 0x1c($sp) -/* CEE314 802400B4 AFB20018 */ sw $s2, 0x18($sp) -/* CEE318 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* CEE31C 802400BC F7BC0048 */ sdc1 $f28, 0x48($sp) -/* CEE320 802400C0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* CEE324 802400C4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* CEE328 802400C8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* CEE32C 802400CC F7B40028 */ sdc1 $f20, 0x28($sp) -/* CEE330 802400D0 8E30000C */ lw $s0, 0xc($s1) -/* CEE334 802400D4 8E130000 */ lw $s3, ($s0) -/* CEE338 802400D8 26100004 */ addiu $s0, $s0, 4 -/* CEE33C 802400DC 0C0B1EAF */ jal get_variable -/* CEE340 802400E0 0260282D */ daddu $a1, $s3, $zero -/* CEE344 802400E4 4482E000 */ mtc1 $v0, $f28 -/* CEE348 802400E8 00000000 */ nop -/* CEE34C 802400EC 4680E720 */ cvt.s.w $f28, $f28 -/* CEE350 802400F0 8E140000 */ lw $s4, ($s0) -/* CEE354 802400F4 26100004 */ addiu $s0, $s0, 4 -/* CEE358 802400F8 0220202D */ daddu $a0, $s1, $zero -/* CEE35C 802400FC 0C0B1EAF */ jal get_variable -/* CEE360 80240100 0280282D */ daddu $a1, $s4, $zero -/* CEE364 80240104 4482D000 */ mtc1 $v0, $f26 -/* CEE368 80240108 00000000 */ nop -/* CEE36C 8024010C 4680D6A0 */ cvt.s.w $f26, $f26 -/* CEE370 80240110 8E100000 */ lw $s0, ($s0) -/* CEE374 80240114 0220202D */ daddu $a0, $s1, $zero -/* CEE378 80240118 0C0B1EAF */ jal get_variable -/* CEE37C 8024011C 0200282D */ daddu $a1, $s0, $zero -/* CEE380 80240120 4482C000 */ mtc1 $v0, $f24 -/* CEE384 80240124 00000000 */ nop -/* CEE388 80240128 4680C620 */ cvt.s.w $f24, $f24 -/* CEE38C 8024012C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* CEE390 80240130 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* CEE394 80240134 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* CEE398 80240138 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CEE39C 8024013C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* CEE3A0 80240140 44800000 */ mtc1 $zero, $f0 -/* CEE3A4 80240144 00031080 */ sll $v0, $v1, 2 -/* CEE3A8 80240148 00431021 */ addu $v0, $v0, $v1 -/* CEE3AC 8024014C 00021080 */ sll $v0, $v0, 2 -/* CEE3B0 80240150 00431023 */ subu $v0, $v0, $v1 -/* CEE3B4 80240154 000218C0 */ sll $v1, $v0, 3 -/* CEE3B8 80240158 00431021 */ addu $v0, $v0, $v1 -/* CEE3BC 8024015C 000210C0 */ sll $v0, $v0, 3 -/* CEE3C0 80240160 46001032 */ c.eq.s $f2, $f0 -/* CEE3C4 80240164 3C01800B */ lui $at, 0x800b -/* CEE3C8 80240168 00220821 */ addu $at, $at, $v0 -/* CEE3CC 8024016C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* CEE3D0 80240170 45000005 */ bc1f .L80240188 -/* CEE3D4 80240174 00000000 */ nop -/* CEE3D8 80240178 3C0142C8 */ lui $at, 0x42c8 -/* CEE3DC 8024017C 44810000 */ mtc1 $at, $f0 -/* CEE3E0 80240180 08090066 */ j .L80240198 -/* CEE3E4 80240184 4600B581 */ sub.s $f22, $f22, $f0 -.L80240188: -/* CEE3E8 80240188 3C0142C8 */ lui $at, 0x42c8 -/* CEE3EC 8024018C 44810000 */ mtc1 $at, $f0 -/* CEE3F0 80240190 00000000 */ nop -/* CEE3F4 80240194 4600B580 */ add.s $f22, $f22, $f0 -.L80240198: -/* CEE3F8 80240198 0C00A6C9 */ jal clamp_angle -/* CEE3FC 8024019C 4600B306 */ mov.s $f12, $f22 -/* CEE400 802401A0 46000586 */ mov.s $f22, $f0 -/* CEE404 802401A4 3C014170 */ lui $at, 0x4170 -/* CEE408 802401A8 4481A000 */ mtc1 $at, $f20 -/* CEE40C 802401AC 0C00A8BB */ jal sin_deg -/* CEE410 802401B0 4600B306 */ mov.s $f12, $f22 -/* CEE414 802401B4 46140002 */ mul.s $f0, $f0, $f20 -/* CEE418 802401B8 00000000 */ nop -/* CEE41C 802401BC 864200B0 */ lh $v0, 0xb0($s2) -/* CEE420 802401C0 3C013F00 */ lui $at, 0x3f00 -/* CEE424 802401C4 44812000 */ mtc1 $at, $f4 -/* CEE428 802401C8 44821000 */ mtc1 $v0, $f2 -/* CEE42C 802401CC 00000000 */ nop -/* CEE430 802401D0 468010A0 */ cvt.s.w $f2, $f2 -/* CEE434 802401D4 46041082 */ mul.s $f2, $f2, $f4 -/* CEE438 802401D8 00000000 */ nop -/* CEE43C 802401DC 4600E700 */ add.s $f28, $f28, $f0 -/* CEE440 802401E0 4602D680 */ add.s $f26, $f26, $f2 -/* CEE444 802401E4 0C00A8D4 */ jal cos_deg -/* CEE448 802401E8 4600B306 */ mov.s $f12, $f22 -/* CEE44C 802401EC 46140002 */ mul.s $f0, $f0, $f20 -/* CEE450 802401F0 00000000 */ nop -/* CEE454 802401F4 0220202D */ daddu $a0, $s1, $zero -/* CEE458 802401F8 0260282D */ daddu $a1, $s3, $zero -/* CEE45C 802401FC 4600E18D */ trunc.w.s $f6, $f28 -/* CEE460 80240200 44063000 */ mfc1 $a2, $f6 -/* CEE464 80240204 0C0B2026 */ jal set_variable -/* CEE468 80240208 4600C601 */ sub.s $f24, $f24, $f0 -/* CEE46C 8024020C 0220202D */ daddu $a0, $s1, $zero -/* CEE470 80240210 4600D18D */ trunc.w.s $f6, $f26 -/* CEE474 80240214 44063000 */ mfc1 $a2, $f6 -/* CEE478 80240218 0C0B2026 */ jal set_variable -/* CEE47C 8024021C 0280282D */ daddu $a1, $s4, $zero -/* CEE480 80240220 0220202D */ daddu $a0, $s1, $zero -/* CEE484 80240224 4600C18D */ trunc.w.s $f6, $f24 -/* CEE488 80240228 44063000 */ mfc1 $a2, $f6 -/* CEE48C 8024022C 0C0B2026 */ jal set_variable -/* CEE490 80240230 0200282D */ daddu $a1, $s0, $zero -/* CEE494 80240234 8FBF0024 */ lw $ra, 0x24($sp) -/* CEE498 80240238 8FB40020 */ lw $s4, 0x20($sp) -/* CEE49C 8024023C 8FB3001C */ lw $s3, 0x1c($sp) -/* CEE4A0 80240240 8FB20018 */ lw $s2, 0x18($sp) -/* CEE4A4 80240244 8FB10014 */ lw $s1, 0x14($sp) -/* CEE4A8 80240248 8FB00010 */ lw $s0, 0x10($sp) -/* CEE4AC 8024024C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* CEE4B0 80240250 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* CEE4B4 80240254 D7B80038 */ ldc1 $f24, 0x38($sp) -/* CEE4B8 80240258 D7B60030 */ ldc1 $f22, 0x30($sp) -/* CEE4BC 8024025C D7B40028 */ ldc1 $f20, 0x28($sp) -/* CEE4C0 80240260 24020002 */ addiu $v0, $zero, 2 -/* CEE4C4 80240264 03E00008 */ jr $ra -/* CEE4C8 80240268 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_23/func_8024026C_CEE260.s b/asm/nonmatchings/world/area_flo/flo_23/func_8024026C_CEE260.s deleted file mode 100644 index 96d3c24c72..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_23/func_8024026C_CEE260.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024026C_CEE4CC -/* CEE4CC 8024026C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CEE4D0 80240270 AFBF0010 */ sw $ra, 0x10($sp) -/* CEE4D4 80240274 10A00003 */ beqz $a1, .L80240284 -/* CEE4D8 80240278 8C86000C */ lw $a2, 0xc($a0) -/* CEE4DC 8024027C 3C018024 */ lui $at, 0x8024 -/* CEE4E0 80240280 AC20130C */ sw $zero, 0x130c($at) -.L80240284: -/* CEE4E4 80240284 3C038024 */ lui $v1, 0x8024 -/* CEE4E8 80240288 2463130C */ addiu $v1, $v1, 0x130c -/* CEE4EC 8024028C 8C620000 */ lw $v0, ($v1) -/* CEE4F0 80240290 54400003 */ bnel $v0, $zero, .L802402A0 -/* CEE4F4 80240294 AC600000 */ sw $zero, ($v1) -/* CEE4F8 80240298 080900AD */ j .L802402B4 -/* CEE4FC 8024029C 0000102D */ daddu $v0, $zero, $zero -.L802402A0: -/* CEE500 802402A0 8CC50000 */ lw $a1, ($a2) -/* CEE504 802402A4 3C068024 */ lui $a2, 0x8024 -/* CEE508 802402A8 0C0B2026 */ jal set_variable -/* CEE50C 802402AC 8CC61310 */ lw $a2, 0x1310($a2) -/* CEE510 802402B0 24020002 */ addiu $v0, $zero, 2 -.L802402B4: -/* CEE514 802402B4 8FBF0010 */ lw $ra, 0x10($sp) -/* CEE518 802402B8 03E00008 */ jr $ra -/* CEE51C 802402BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_23/func_802402C0_CEE260.s b/asm/nonmatchings/world/area_flo/flo_23/func_802402C0_CEE260.s deleted file mode 100644 index 86ad0d1213..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_23/func_802402C0_CEE260.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402C0_CEE520 -/* CEE520 802402C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CEE524 802402C4 AFBF0010 */ sw $ra, 0x10($sp) -/* CEE528 802402C8 8C82000C */ lw $v0, 0xc($a0) -/* CEE52C 802402CC 0C0B1EAF */ jal get_variable -/* CEE530 802402D0 8C450000 */ lw $a1, ($v0) -/* CEE534 802402D4 3C018024 */ lui $at, 0x8024 -/* CEE538 802402D8 AC221310 */ sw $v0, 0x1310($at) -/* CEE53C 802402DC 24020002 */ addiu $v0, $zero, 2 -/* CEE540 802402E0 8FBF0010 */ lw $ra, 0x10($sp) -/* CEE544 802402E4 24030001 */ addiu $v1, $zero, 1 -/* CEE548 802402E8 3C018024 */ lui $at, 0x8024 -/* CEE54C 802402EC AC23130C */ sw $v1, 0x130c($at) -/* CEE550 802402F0 03E00008 */ jr $ra -/* CEE554 802402F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_23/func_802402F8_CEE260.s b/asm/nonmatchings/world/area_flo/flo_23/func_802402F8_CEE260.s deleted file mode 100644 index 7545e041df..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_23/func_802402F8_CEE260.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F8_CEE558 -/* CEE558 802402F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CEE55C 802402FC AFBF0010 */ sw $ra, 0x10($sp) -/* CEE560 80240300 8C82000C */ lw $v0, 0xc($a0) -/* CEE564 80240304 0C0B1EAF */ jal get_variable -/* CEE568 80240308 8C450000 */ lw $a1, ($v0) -/* CEE56C 8024030C 0040182D */ daddu $v1, $v0, $zero -/* CEE570 80240310 10600012 */ beqz $v1, .L8024035C -/* CEE574 80240314 0000202D */ daddu $a0, $zero, $zero -/* CEE578 80240318 8C620000 */ lw $v0, ($v1) -/* CEE57C 8024031C 5040000A */ beql $v0, $zero, .L80240348 -/* CEE580 80240320 00041080 */ sll $v0, $a0, 2 -/* CEE584 80240324 3C058024 */ lui $a1, 0x8024 -/* CEE588 80240328 24A526E0 */ addiu $a1, $a1, 0x26e0 -.L8024032C: -/* CEE58C 8024032C 24630004 */ addiu $v1, $v1, 4 -/* CEE590 80240330 24840001 */ addiu $a0, $a0, 1 -/* CEE594 80240334 ACA20000 */ sw $v0, ($a1) -/* CEE598 80240338 8C620000 */ lw $v0, ($v1) -/* CEE59C 8024033C 1440FFFB */ bnez $v0, .L8024032C -/* CEE5A0 80240340 24A50004 */ addiu $a1, $a1, 4 -/* CEE5A4 80240344 00041080 */ sll $v0, $a0, 2 -.L80240348: -/* CEE5A8 80240348 3C018024 */ lui $at, 0x8024 -/* CEE5AC 8024034C 00220821 */ addu $at, $at, $v0 -/* CEE5B0 80240350 AC2026E0 */ sw $zero, 0x26e0($at) -/* CEE5B4 80240354 080900E1 */ j .L80240384 -/* CEE5B8 80240358 00000000 */ nop -.L8024035C: -/* CEE5BC 8024035C 3C038024 */ lui $v1, 0x8024 -/* CEE5C0 80240360 246326E0 */ addiu $v1, $v1, 0x26e0 -/* CEE5C4 80240364 0060282D */ daddu $a1, $v1, $zero -.L80240368: -/* CEE5C8 80240368 24820080 */ addiu $v0, $a0, 0x80 -/* CEE5CC 8024036C AC620000 */ sw $v0, ($v1) -/* CEE5D0 80240370 24630004 */ addiu $v1, $v1, 4 -/* CEE5D4 80240374 24840001 */ addiu $a0, $a0, 1 -/* CEE5D8 80240378 2882005B */ slti $v0, $a0, 0x5b -/* CEE5DC 8024037C 1440FFFA */ bnez $v0, .L80240368 -/* CEE5E0 80240380 ACA0016C */ sw $zero, 0x16c($a1) -.L80240384: -/* CEE5E4 80240384 8FBF0010 */ lw $ra, 0x10($sp) -/* CEE5E8 80240388 24020002 */ addiu $v0, $zero, 2 -/* CEE5EC 8024038C 03E00008 */ jr $ra -/* CEE5F0 80240390 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_23/func_80240394_CEE260.s b/asm/nonmatchings/world/area_flo/flo_23/func_80240394_CEE260.s deleted file mode 100644 index 3331ec8a7b..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_23/func_80240394_CEE260.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240394_CEE5F4 -/* CEE5F4 80240394 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CEE5F8 80240398 AFB20018 */ sw $s2, 0x18($sp) -/* CEE5FC 8024039C 0080902D */ daddu $s2, $a0, $zero -/* CEE600 802403A0 AFBF001C */ sw $ra, 0x1c($sp) -/* CEE604 802403A4 AFB10014 */ sw $s1, 0x14($sp) -/* CEE608 802403A8 AFB00010 */ sw $s0, 0x10($sp) -/* CEE60C 802403AC 8E510148 */ lw $s1, 0x148($s2) -/* CEE610 802403B0 0C00EABB */ jal get_npc_unsafe -/* CEE614 802403B4 86240008 */ lh $a0, 8($s1) -/* CEE618 802403B8 0040802D */ daddu $s0, $v0, $zero -/* CEE61C 802403BC 8E2300CC */ lw $v1, 0xcc($s1) -/* CEE620 802403C0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CEE624 802403C4 8C630020 */ lw $v1, 0x20($v1) -/* CEE628 802403C8 AE030028 */ sw $v1, 0x28($s0) -/* CEE62C 802403CC 96220076 */ lhu $v0, 0x76($s1) -/* CEE630 802403D0 A602008E */ sh $v0, 0x8e($s0) -/* CEE634 802403D4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CEE638 802403D8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CEE63C 802403DC C60E0040 */ lwc1 $f14, 0x40($s0) -/* CEE640 802403E0 8C460028 */ lw $a2, 0x28($v0) -/* CEE644 802403E4 0C00A720 */ jal atan2 -/* CEE648 802403E8 8C470030 */ lw $a3, 0x30($v0) -/* CEE64C 802403EC 2402000D */ addiu $v0, $zero, 0xd -/* CEE650 802403F0 E600000C */ swc1 $f0, 0xc($s0) -/* CEE654 802403F4 AE420070 */ sw $v0, 0x70($s2) -/* CEE658 802403F8 8FBF001C */ lw $ra, 0x1c($sp) -/* CEE65C 802403FC 8FB20018 */ lw $s2, 0x18($sp) -/* CEE660 80240400 8FB10014 */ lw $s1, 0x14($sp) -/* CEE664 80240404 8FB00010 */ lw $s0, 0x10($sp) -/* CEE668 80240408 03E00008 */ jr $ra -/* CEE66C 8024040C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_23/func_80240410_CEE260.s b/asm/nonmatchings/world/area_flo/flo_23/func_80240410_CEE260.s deleted file mode 100644 index 83cb99fc40..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_23/func_80240410_CEE260.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240410_CEE670 -/* CEE670 80240410 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CEE674 80240414 AFB3001C */ sw $s3, 0x1c($sp) -/* CEE678 80240418 0080982D */ daddu $s3, $a0, $zero -/* CEE67C 8024041C AFBF0020 */ sw $ra, 0x20($sp) -/* CEE680 80240420 AFB20018 */ sw $s2, 0x18($sp) -/* CEE684 80240424 AFB10014 */ sw $s1, 0x14($sp) -/* CEE688 80240428 AFB00010 */ sw $s0, 0x10($sp) -/* CEE68C 8024042C 8E710148 */ lw $s1, 0x148($s3) -/* CEE690 80240430 86240008 */ lh $a0, 8($s1) -/* CEE694 80240434 0C00EABB */ jal get_npc_unsafe -/* CEE698 80240438 00A0902D */ daddu $s2, $a1, $zero -/* CEE69C 8024043C 0040802D */ daddu $s0, $v0, $zero -/* CEE6A0 80240440 8602008E */ lh $v0, 0x8e($s0) -/* CEE6A4 80240444 9603008E */ lhu $v1, 0x8e($s0) -/* CEE6A8 80240448 18400005 */ blez $v0, .L80240460 -/* CEE6AC 8024044C 2462FFFF */ addiu $v0, $v1, -1 -/* CEE6B0 80240450 A602008E */ sh $v0, 0x8e($s0) -/* CEE6B4 80240454 00021400 */ sll $v0, $v0, 0x10 -/* CEE6B8 80240458 1C400033 */ bgtz $v0, .L80240528 -/* CEE6BC 8024045C 00000000 */ nop -.L80240460: -/* CEE6C0 80240460 8602008C */ lh $v0, 0x8c($s0) -/* CEE6C4 80240464 14400030 */ bnez $v0, .L80240528 -/* CEE6C8 80240468 00000000 */ nop -/* CEE6CC 8024046C 8E2200CC */ lw $v0, 0xcc($s1) -/* CEE6D0 80240470 8C420024 */ lw $v0, 0x24($v0) -/* CEE6D4 80240474 AE020028 */ sw $v0, 0x28($s0) -/* CEE6D8 80240478 C6400018 */ lwc1 $f0, 0x18($s2) -/* CEE6DC 8024047C E6000018 */ swc1 $f0, 0x18($s0) -/* CEE6E0 80240480 8E230088 */ lw $v1, 0x88($s1) -/* CEE6E4 80240484 24020005 */ addiu $v0, $zero, 5 -/* CEE6E8 80240488 10620005 */ beq $v1, $v0, .L802404A0 -/* CEE6EC 8024048C 00000000 */ nop -/* CEE6F0 80240490 10600003 */ beqz $v1, .L802404A0 -/* CEE6F4 80240494 24020001 */ addiu $v0, $zero, 1 -/* CEE6F8 80240498 14620006 */ bne $v1, $v0, .L802404B4 -/* CEE6FC 8024049C 00000000 */ nop -.L802404A0: -/* CEE700 802404A0 8E220084 */ lw $v0, 0x84($s1) -/* CEE704 802404A4 00021FC2 */ srl $v1, $v0, 0x1f -/* CEE708 802404A8 00431021 */ addu $v0, $v0, $v1 -/* CEE70C 802404AC 00021043 */ sra $v0, $v0, 1 -/* CEE710 802404B0 A60200A8 */ sh $v0, 0xa8($s0) -.L802404B4: -/* CEE714 802404B4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CEE718 802404B8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CEE71C 802404BC C60C0038 */ lwc1 $f12, 0x38($s0) -/* CEE720 802404C0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CEE724 802404C4 8C460028 */ lw $a2, 0x28($v0) -/* CEE728 802404C8 0C00A7B5 */ jal dist2D -/* CEE72C 802404CC 8C470030 */ lw $a3, 0x30($v0) -/* CEE730 802404D0 C6020018 */ lwc1 $f2, 0x18($s0) -/* CEE734 802404D4 46020003 */ div.s $f0, $f0, $f2 -/* CEE738 802404D8 3C018024 */ lui $at, 0x8024 -/* CEE73C 802404DC D4222680 */ ldc1 $f2, 0x2680($at) -/* CEE740 802404E0 46000021 */ cvt.d.s $f0, $f0 -/* CEE744 802404E4 46220000 */ add.d $f0, $f0, $f2 -/* CEE748 802404E8 4620010D */ trunc.w.d $f4, $f0 -/* CEE74C 802404EC 44022000 */ mfc1 $v0, $f4 -/* CEE750 802404F0 00000000 */ nop -/* CEE754 802404F4 A602008E */ sh $v0, 0x8e($s0) -/* CEE758 802404F8 00021400 */ sll $v0, $v0, 0x10 -/* CEE75C 802404FC 8E230078 */ lw $v1, 0x78($s1) -/* CEE760 80240500 00021403 */ sra $v0, $v0, 0x10 -/* CEE764 80240504 0043102A */ slt $v0, $v0, $v1 -/* CEE768 80240508 10400003 */ beqz $v0, .L80240518 -/* CEE76C 8024050C 00000000 */ nop -/* CEE770 80240510 9622007A */ lhu $v0, 0x7a($s1) -/* CEE774 80240514 A602008E */ sh $v0, 0x8e($s0) -.L80240518: -/* CEE778 80240518 8602008E */ lh $v0, 0x8e($s0) -/* CEE77C 8024051C AE22007C */ sw $v0, 0x7c($s1) -/* CEE780 80240520 2402000E */ addiu $v0, $zero, 0xe -/* CEE784 80240524 AE620070 */ sw $v0, 0x70($s3) -.L80240528: -/* CEE788 80240528 8FBF0020 */ lw $ra, 0x20($sp) -/* CEE78C 8024052C 8FB3001C */ lw $s3, 0x1c($sp) -/* CEE790 80240530 8FB20018 */ lw $s2, 0x18($sp) -/* CEE794 80240534 8FB10014 */ lw $s1, 0x14($sp) -/* CEE798 80240538 8FB00010 */ lw $s0, 0x10($sp) -/* CEE79C 8024053C 03E00008 */ jr $ra -/* CEE7A0 80240540 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_23/func_80240544_CEE260.s b/asm/nonmatchings/world/area_flo/flo_23/func_80240544_CEE260.s deleted file mode 100644 index 2ad8e56571..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_23/func_80240544_CEE260.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240544_CEE7A4 -/* CEE7A4 80240544 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CEE7A8 80240548 AFB3003C */ sw $s3, 0x3c($sp) -/* CEE7AC 8024054C 0080982D */ daddu $s3, $a0, $zero -/* CEE7B0 80240550 AFBF0040 */ sw $ra, 0x40($sp) -/* CEE7B4 80240554 AFB20038 */ sw $s2, 0x38($sp) -/* CEE7B8 80240558 AFB10034 */ sw $s1, 0x34($sp) -/* CEE7BC 8024055C AFB00030 */ sw $s0, 0x30($sp) -/* CEE7C0 80240560 8E710148 */ lw $s1, 0x148($s3) -/* CEE7C4 80240564 0C00EABB */ jal get_npc_unsafe -/* CEE7C8 80240568 86240008 */ lh $a0, 8($s1) -/* CEE7CC 8024056C 0040802D */ daddu $s0, $v0, $zero -/* CEE7D0 80240570 8E22007C */ lw $v0, 0x7c($s1) -/* CEE7D4 80240574 8603008E */ lh $v1, 0x8e($s0) -/* CEE7D8 80240578 2442FFFF */ addiu $v0, $v0, -1 -/* CEE7DC 8024057C 14620012 */ bne $v1, $v0, .L802405C8 -/* CEE7E0 80240580 00000000 */ nop -/* CEE7E4 80240584 C6000038 */ lwc1 $f0, 0x38($s0) -/* CEE7E8 80240588 4600020D */ trunc.w.s $f8, $f0 -/* CEE7EC 8024058C 44024000 */ mfc1 $v0, $f8 -/* CEE7F0 80240590 00000000 */ nop -/* CEE7F4 80240594 A6220010 */ sh $v0, 0x10($s1) -/* CEE7F8 80240598 C600003C */ lwc1 $f0, 0x3c($s0) -/* CEE7FC 8024059C 4600020D */ trunc.w.s $f8, $f0 -/* CEE800 802405A0 44024000 */ mfc1 $v0, $f8 -/* CEE804 802405A4 00000000 */ nop -/* CEE808 802405A8 A6220012 */ sh $v0, 0x12($s1) -/* CEE80C 802405AC C6000040 */ lwc1 $f0, 0x40($s0) -/* CEE810 802405B0 24020001 */ addiu $v0, $zero, 1 -/* CEE814 802405B4 A2220007 */ sb $v0, 7($s1) -/* CEE818 802405B8 4600020D */ trunc.w.s $f8, $f0 -/* CEE81C 802405BC 44024000 */ mfc1 $v0, $f8 -/* CEE820 802405C0 00000000 */ nop -/* CEE824 802405C4 A6220014 */ sh $v0, 0x14($s1) -.L802405C8: -/* CEE828 802405C8 C6000038 */ lwc1 $f0, 0x38($s0) -/* CEE82C 802405CC C602003C */ lwc1 $f2, 0x3c($s0) -/* CEE830 802405D0 C6040040 */ lwc1 $f4, 0x40($s0) -/* CEE834 802405D4 C6060018 */ lwc1 $f6, 0x18($s0) -/* CEE838 802405D8 E7A00020 */ swc1 $f0, 0x20($sp) -/* CEE83C 802405DC E7A20024 */ swc1 $f2, 0x24($sp) -/* CEE840 802405E0 E7A40028 */ swc1 $f4, 0x28($sp) -/* CEE844 802405E4 E7A60010 */ swc1 $f6, 0x10($sp) -/* CEE848 802405E8 C600000C */ lwc1 $f0, 0xc($s0) -/* CEE84C 802405EC E7A00014 */ swc1 $f0, 0x14($sp) -/* CEE850 802405F0 860200A8 */ lh $v0, 0xa8($s0) -/* CEE854 802405F4 27A50020 */ addiu $a1, $sp, 0x20 -/* CEE858 802405F8 44820000 */ mtc1 $v0, $f0 -/* CEE85C 802405FC 00000000 */ nop -/* CEE860 80240600 46800020 */ cvt.s.w $f0, $f0 -/* CEE864 80240604 E7A00018 */ swc1 $f0, 0x18($sp) -/* CEE868 80240608 860200A6 */ lh $v0, 0xa6($s0) -/* CEE86C 8024060C 27A60024 */ addiu $a2, $sp, 0x24 -/* CEE870 80240610 44820000 */ mtc1 $v0, $f0 -/* CEE874 80240614 00000000 */ nop -/* CEE878 80240618 46800020 */ cvt.s.w $f0, $f0 -/* CEE87C 8024061C E7A0001C */ swc1 $f0, 0x1c($sp) -/* CEE880 80240620 8E040080 */ lw $a0, 0x80($s0) -/* CEE884 80240624 0C037711 */ jal func_800DDC44 -/* CEE888 80240628 27A70028 */ addiu $a3, $sp, 0x28 -/* CEE88C 8024062C 0040902D */ daddu $s2, $v0, $zero -/* CEE890 80240630 16400005 */ bnez $s2, .L80240648 -/* CEE894 80240634 00000000 */ nop -/* CEE898 80240638 8E050018 */ lw $a1, 0x18($s0) -/* CEE89C 8024063C 8E06000C */ lw $a2, 0xc($s0) -/* CEE8A0 80240640 0C00EA95 */ jal npc_move_heading -/* CEE8A4 80240644 0200202D */ daddu $a0, $s0, $zero -.L80240648: -/* CEE8A8 80240648 8602008E */ lh $v0, 0x8e($s0) -/* CEE8AC 8024064C 9603008E */ lhu $v1, 0x8e($s0) -/* CEE8B0 80240650 18400007 */ blez $v0, .L80240670 -/* CEE8B4 80240654 2462FFFF */ addiu $v0, $v1, -1 -/* CEE8B8 80240658 A602008E */ sh $v0, 0x8e($s0) -/* CEE8BC 8024065C 00021400 */ sll $v0, $v0, 0x10 -/* CEE8C0 80240660 18400003 */ blez $v0, .L80240670 -/* CEE8C4 80240664 00000000 */ nop -/* CEE8C8 80240668 12400008 */ beqz $s2, .L8024068C -/* CEE8CC 8024066C 00000000 */ nop -.L80240670: -/* CEE8D0 80240670 8E2200CC */ lw $v0, 0xcc($s1) -/* CEE8D4 80240674 A2200007 */ sb $zero, 7($s1) -/* CEE8D8 80240678 8C420028 */ lw $v0, 0x28($v0) -/* CEE8DC 8024067C A600008E */ sh $zero, 0x8e($s0) -/* CEE8E0 80240680 AE020028 */ sw $v0, 0x28($s0) -/* CEE8E4 80240684 2402000F */ addiu $v0, $zero, 0xf -/* CEE8E8 80240688 AE620070 */ sw $v0, 0x70($s3) -.L8024068C: -/* CEE8EC 8024068C 8FBF0040 */ lw $ra, 0x40($sp) -/* CEE8F0 80240690 8FB3003C */ lw $s3, 0x3c($sp) -/* CEE8F4 80240694 8FB20038 */ lw $s2, 0x38($sp) -/* CEE8F8 80240698 8FB10034 */ lw $s1, 0x34($sp) -/* CEE8FC 8024069C 8FB00030 */ lw $s0, 0x30($sp) -/* CEE900 802406A0 03E00008 */ jr $ra -/* CEE904 802406A4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_23/func_802406A8_CEE260.s b/asm/nonmatchings/world/area_flo/flo_23/func_802406A8_CEE260.s deleted file mode 100644 index 20aa6d5791..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_23/func_802406A8_CEE260.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A8_CEE908 -/* CEE908 802406A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CEE90C 802406AC AFB10014 */ sw $s1, 0x14($sp) -/* CEE910 802406B0 0080882D */ daddu $s1, $a0, $zero -/* CEE914 802406B4 AFBF0018 */ sw $ra, 0x18($sp) -/* CEE918 802406B8 AFB00010 */ sw $s0, 0x10($sp) -/* CEE91C 802406BC 8E300148 */ lw $s0, 0x148($s1) -/* CEE920 802406C0 0C00EABB */ jal get_npc_unsafe -/* CEE924 802406C4 86040008 */ lh $a0, 8($s0) -/* CEE928 802406C8 0040202D */ daddu $a0, $v0, $zero -/* CEE92C 802406CC 9482008E */ lhu $v0, 0x8e($a0) -/* CEE930 802406D0 24030003 */ addiu $v1, $zero, 3 -/* CEE934 802406D4 24420001 */ addiu $v0, $v0, 1 -/* CEE938 802406D8 A482008E */ sh $v0, 0x8e($a0) -/* CEE93C 802406DC 00021400 */ sll $v0, $v0, 0x10 -/* CEE940 802406E0 00021403 */ sra $v0, $v0, 0x10 -/* CEE944 802406E4 14430003 */ bne $v0, $v1, .L802406F4 -/* CEE948 802406E8 00000000 */ nop -/* CEE94C 802406EC 96020086 */ lhu $v0, 0x86($s0) -/* CEE950 802406F0 A48200A8 */ sh $v0, 0xa8($a0) -.L802406F4: -/* CEE954 802406F4 8482008E */ lh $v0, 0x8e($a0) -/* CEE958 802406F8 8E030080 */ lw $v1, 0x80($s0) -/* CEE95C 802406FC 0043102A */ slt $v0, $v0, $v1 -/* CEE960 80240700 14400004 */ bnez $v0, .L80240714 -/* CEE964 80240704 00000000 */ nop -/* CEE968 80240708 96020086 */ lhu $v0, 0x86($s0) -/* CEE96C 8024070C A48200A8 */ sh $v0, 0xa8($a0) -/* CEE970 80240710 AE200070 */ sw $zero, 0x70($s1) -.L80240714: -/* CEE974 80240714 8FBF0018 */ lw $ra, 0x18($sp) -/* CEE978 80240718 8FB10014 */ lw $s1, 0x14($sp) -/* CEE97C 8024071C 8FB00010 */ lw $s0, 0x10($sp) -/* CEE980 80240720 03E00008 */ jr $ra -/* CEE984 80240724 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_23/func_80240728_CEE260.s b/asm/nonmatchings/world/area_flo/flo_23/func_80240728_CEE260.s deleted file mode 100644 index 5b73bb1115..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_23/func_80240728_CEE260.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240728_CEE988 -/* CEE988 80240728 27BDFF90 */ addiu $sp, $sp, -0x70 -/* CEE98C 8024072C AFB3005C */ sw $s3, 0x5c($sp) -/* CEE990 80240730 0080982D */ daddu $s3, $a0, $zero -/* CEE994 80240734 AFBF0068 */ sw $ra, 0x68($sp) -/* CEE998 80240738 AFB50064 */ sw $s5, 0x64($sp) -/* CEE99C 8024073C AFB40060 */ sw $s4, 0x60($sp) -/* CEE9A0 80240740 AFB20058 */ sw $s2, 0x58($sp) -/* CEE9A4 80240744 AFB10054 */ sw $s1, 0x54($sp) -/* CEE9A8 80240748 AFB00050 */ sw $s0, 0x50($sp) -/* CEE9AC 8024074C 8E710148 */ lw $s1, 0x148($s3) -/* CEE9B0 80240750 86240008 */ lh $a0, 8($s1) -/* CEE9B4 80240754 0C00EABB */ jal get_npc_unsafe -/* CEE9B8 80240758 00A0802D */ daddu $s0, $a1, $zero -/* CEE9BC 8024075C 8E63000C */ lw $v1, 0xc($s3) -/* CEE9C0 80240760 0260202D */ daddu $a0, $s3, $zero -/* CEE9C4 80240764 8C650000 */ lw $a1, ($v1) -/* CEE9C8 80240768 0C0B1EAF */ jal get_variable -/* CEE9CC 8024076C 0040902D */ daddu $s2, $v0, $zero -/* CEE9D0 80240770 AFA00028 */ sw $zero, 0x28($sp) -/* CEE9D4 80240774 8E2300D0 */ lw $v1, 0xd0($s1) -/* CEE9D8 80240778 8C630030 */ lw $v1, 0x30($v1) -/* CEE9DC 8024077C AFA3002C */ sw $v1, 0x2c($sp) -/* CEE9E0 80240780 8E2300D0 */ lw $v1, 0xd0($s1) -/* CEE9E4 80240784 8C63001C */ lw $v1, 0x1c($v1) -/* CEE9E8 80240788 AFA30030 */ sw $v1, 0x30($sp) -/* CEE9EC 8024078C 8E2300D0 */ lw $v1, 0xd0($s1) -/* CEE9F0 80240790 8C630024 */ lw $v1, 0x24($v1) -/* CEE9F4 80240794 AFA30034 */ sw $v1, 0x34($sp) -/* CEE9F8 80240798 8E2300D0 */ lw $v1, 0xd0($s1) -/* CEE9FC 8024079C 8C630028 */ lw $v1, 0x28($v1) -/* CEEA00 802407A0 27B50028 */ addiu $s5, $sp, 0x28 -/* CEEA04 802407A4 AFA30038 */ sw $v1, 0x38($sp) -/* CEEA08 802407A8 8E2300D0 */ lw $v1, 0xd0($s1) -/* CEEA0C 802407AC 3C0142C8 */ lui $at, 0x42c8 -/* CEEA10 802407B0 44810000 */ mtc1 $at, $f0 -/* CEEA14 802407B4 8C63002C */ lw $v1, 0x2c($v1) -/* CEEA18 802407B8 0040A02D */ daddu $s4, $v0, $zero -/* CEEA1C 802407BC E7A00040 */ swc1 $f0, 0x40($sp) -/* CEEA20 802407C0 A7A00044 */ sh $zero, 0x44($sp) -/* CEEA24 802407C4 12000009 */ beqz $s0, .L802407EC -/* CEEA28 802407C8 AFA3003C */ sw $v1, 0x3c($sp) -/* CEEA2C 802407CC 864300A8 */ lh $v1, 0xa8($s2) -/* CEEA30 802407D0 8E2200B0 */ lw $v0, 0xb0($s1) -/* CEEA34 802407D4 AE20008C */ sw $zero, 0x8c($s1) -/* CEEA38 802407D8 A22000B5 */ sb $zero, 0xb5($s1) -/* CEEA3C 802407DC 34420008 */ ori $v0, $v0, 8 -/* CEEA40 802407E0 AE230084 */ sw $v1, 0x84($s1) -/* CEEA44 802407E4 080901FF */ j .L802407FC -/* CEEA48 802407E8 AE2200B0 */ sw $v0, 0xb0($s1) -.L802407EC: -/* CEEA4C 802407EC 8E2200B0 */ lw $v0, 0xb0($s1) -/* CEEA50 802407F0 30420004 */ andi $v0, $v0, 4 -/* CEEA54 802407F4 10400047 */ beqz $v0, .L80240914 -/* CEEA58 802407F8 00000000 */ nop -.L802407FC: -/* CEEA5C 802407FC AE600070 */ sw $zero, 0x70($s3) -/* CEEA60 80240800 A640008E */ sh $zero, 0x8e($s2) -/* CEEA64 80240804 8E2300CC */ lw $v1, 0xcc($s1) -/* CEEA68 80240808 2404F7FF */ addiu $a0, $zero, -0x801 -/* CEEA6C 8024080C A2200007 */ sb $zero, 7($s1) -/* CEEA70 80240810 8E420000 */ lw $v0, ($s2) -/* CEEA74 80240814 8C630000 */ lw $v1, ($v1) -/* CEEA78 80240818 00441024 */ and $v0, $v0, $a0 -/* CEEA7C 8024081C AE420000 */ sw $v0, ($s2) -/* CEEA80 80240820 AE430028 */ sw $v1, 0x28($s2) -/* CEEA84 80240824 96220086 */ lhu $v0, 0x86($s1) -/* CEEA88 80240828 A64200A8 */ sh $v0, 0xa8($s2) -/* CEEA8C 8024082C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CEEA90 80240830 AE200090 */ sw $zero, 0x90($s1) -/* CEEA94 80240834 8C420034 */ lw $v0, 0x34($v0) -/* CEEA98 80240838 14400006 */ bnez $v0, .L80240854 -/* CEEA9C 8024083C 2403FDFF */ addiu $v1, $zero, -0x201 -/* CEEAA0 80240840 8E420000 */ lw $v0, ($s2) -/* CEEAA4 80240844 2403FFF7 */ addiu $v1, $zero, -9 -/* CEEAA8 80240848 34420200 */ ori $v0, $v0, 0x200 -/* CEEAAC 8024084C 08090218 */ j .L80240860 -/* CEEAB0 80240850 00431024 */ and $v0, $v0, $v1 -.L80240854: -/* CEEAB4 80240854 8E420000 */ lw $v0, ($s2) -/* CEEAB8 80240858 00431024 */ and $v0, $v0, $v1 -/* CEEABC 8024085C 34420008 */ ori $v0, $v0, 8 -.L80240860: -/* CEEAC0 80240860 AE420000 */ sw $v0, ($s2) -/* CEEAC4 80240864 8E2200B0 */ lw $v0, 0xb0($s1) -/* CEEAC8 80240868 30420004 */ andi $v0, $v0, 4 -/* CEEACC 8024086C 1040001E */ beqz $v0, .L802408E8 -/* CEEAD0 80240870 24040002 */ addiu $a0, $zero, 2 -/* CEEAD4 80240874 0240282D */ daddu $a1, $s2, $zero -/* CEEAD8 80240878 0000302D */ daddu $a2, $zero, $zero -/* CEEADC 8024087C 24020063 */ addiu $v0, $zero, 0x63 -/* CEEAE0 80240880 AE620070 */ sw $v0, 0x70($s3) -/* CEEAE4 80240884 AE600074 */ sw $zero, 0x74($s3) -/* CEEAE8 80240888 864300A8 */ lh $v1, 0xa8($s2) -/* CEEAEC 8024088C 3C013F80 */ lui $at, 0x3f80 -/* CEEAF0 80240890 44810000 */ mtc1 $at, $f0 -/* CEEAF4 80240894 3C014000 */ lui $at, 0x4000 -/* CEEAF8 80240898 44811000 */ mtc1 $at, $f2 -/* CEEAFC 8024089C 3C01C1A0 */ lui $at, 0xc1a0 -/* CEEB00 802408A0 44812000 */ mtc1 $at, $f4 -/* CEEB04 802408A4 24020028 */ addiu $v0, $zero, 0x28 -/* CEEB08 802408A8 AFA2001C */ sw $v0, 0x1c($sp) -/* CEEB0C 802408AC 44833000 */ mtc1 $v1, $f6 -/* CEEB10 802408B0 00000000 */ nop -/* CEEB14 802408B4 468031A0 */ cvt.s.w $f6, $f6 -/* CEEB18 802408B8 44073000 */ mfc1 $a3, $f6 -/* CEEB1C 802408BC 27A20048 */ addiu $v0, $sp, 0x48 -/* CEEB20 802408C0 AFA20020 */ sw $v0, 0x20($sp) -/* CEEB24 802408C4 E7A00010 */ swc1 $f0, 0x10($sp) -/* CEEB28 802408C8 E7A20014 */ swc1 $f2, 0x14($sp) -/* CEEB2C 802408CC 0C01BFA4 */ jal fx_emote -/* CEEB30 802408D0 E7A40018 */ swc1 $f4, 0x18($sp) -/* CEEB34 802408D4 8E2200B0 */ lw $v0, 0xb0($s1) -/* CEEB38 802408D8 2403FFFB */ addiu $v1, $zero, -5 -/* CEEB3C 802408DC 00431024 */ and $v0, $v0, $v1 -/* CEEB40 802408E0 08090245 */ j .L80240914 -/* CEEB44 802408E4 AE2200B0 */ sw $v0, 0xb0($s1) -.L802408E8: -/* CEEB48 802408E8 8E220000 */ lw $v0, ($s1) -/* CEEB4C 802408EC 3C034000 */ lui $v1, 0x4000 -/* CEEB50 802408F0 00431024 */ and $v0, $v0, $v1 -/* CEEB54 802408F4 10400007 */ beqz $v0, .L80240914 -/* CEEB58 802408F8 3C03BFFF */ lui $v1, 0xbfff -/* CEEB5C 802408FC 2402000C */ addiu $v0, $zero, 0xc -/* CEEB60 80240900 AE620070 */ sw $v0, 0x70($s3) -/* CEEB64 80240904 8E220000 */ lw $v0, ($s1) -/* CEEB68 80240908 3463FFFF */ ori $v1, $v1, 0xffff -/* CEEB6C 8024090C 00431024 */ and $v0, $v0, $v1 -/* CEEB70 80240910 AE220000 */ sw $v0, ($s1) -.L80240914: -/* CEEB74 80240914 8E220090 */ lw $v0, 0x90($s1) -/* CEEB78 80240918 1840000C */ blez $v0, .L8024094C -/* CEEB7C 8024091C 2442FFFF */ addiu $v0, $v0, -1 -/* CEEB80 80240920 14400087 */ bnez $v0, .L80240B40 -/* CEEB84 80240924 AE220090 */ sw $v0, 0x90($s1) -/* CEEB88 80240928 3C03FFAA */ lui $v1, 0xffaa -/* CEEB8C 8024092C 8E420028 */ lw $v0, 0x28($s2) -/* CEEB90 80240930 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* CEEB94 80240934 00431021 */ addu $v0, $v0, $v1 -/* CEEB98 80240938 2C420002 */ sltiu $v0, $v0, 2 -/* CEEB9C 8024093C 10400003 */ beqz $v0, .L8024094C -/* CEEBA0 80240940 3C020055 */ lui $v0, 0x55 -/* CEEBA4 80240944 3442000C */ ori $v0, $v0, 0xc -/* CEEBA8 80240948 AE420028 */ sw $v0, 0x28($s2) -.L8024094C: -/* CEEBAC 8024094C 8E630070 */ lw $v1, 0x70($s3) -/* CEEBB0 80240950 2402000C */ addiu $v0, $zero, 0xc -/* CEEBB4 80240954 10620048 */ beq $v1, $v0, .L80240A78 -/* CEEBB8 80240958 2862000D */ slti $v0, $v1, 0xd -/* CEEBBC 8024095C 1040000F */ beqz $v0, .L8024099C -/* CEEBC0 80240960 24100001 */ addiu $s0, $zero, 1 -/* CEEBC4 80240964 1070001E */ beq $v1, $s0, .L802409E0 -/* CEEBC8 80240968 28620002 */ slti $v0, $v1, 2 -/* CEEBCC 8024096C 10400005 */ beqz $v0, .L80240984 -/* CEEBD0 80240970 24020002 */ addiu $v0, $zero, 2 -/* CEEBD4 80240974 10600015 */ beqz $v1, .L802409CC -/* CEEBD8 80240978 0260202D */ daddu $a0, $s3, $zero -/* CEEBDC 8024097C 080902B5 */ j .L80240AD4 -/* CEEBE0 80240980 00000000 */ nop -.L80240984: -/* CEEBE4 80240984 1062001C */ beq $v1, $v0, .L802409F8 -/* CEEBE8 80240988 24020003 */ addiu $v0, $zero, 3 -/* CEEBEC 8024098C 10620035 */ beq $v1, $v0, .L80240A64 -/* CEEBF0 80240990 0260202D */ daddu $a0, $s3, $zero -/* CEEBF4 80240994 080902B5 */ j .L80240AD4 -/* CEEBF8 80240998 00000000 */ nop -.L8024099C: -/* CEEBFC 8024099C 2402000E */ addiu $v0, $zero, 0xe -/* CEEC00 802409A0 1062003F */ beq $v1, $v0, .L80240AA0 -/* CEEC04 802409A4 0062102A */ slt $v0, $v1, $v0 -/* CEEC08 802409A8 14400038 */ bnez $v0, .L80240A8C -/* CEEC0C 802409AC 0260202D */ daddu $a0, $s3, $zero -/* CEEC10 802409B0 2402000F */ addiu $v0, $zero, 0xf -/* CEEC14 802409B4 10620040 */ beq $v1, $v0, .L80240AB8 -/* CEEC18 802409B8 24020063 */ addiu $v0, $zero, 0x63 -/* CEEC1C 802409BC 10620043 */ beq $v1, $v0, .L80240ACC -/* CEEC20 802409C0 00000000 */ nop -/* CEEC24 802409C4 080902B5 */ j .L80240AD4 -/* CEEC28 802409C8 00000000 */ nop -.L802409CC: -/* CEEC2C 802409CC 0280282D */ daddu $a1, $s4, $zero -/* CEEC30 802409D0 0C012568 */ jal func_800495A0 -/* CEEC34 802409D4 02A0302D */ daddu $a2, $s5, $zero -/* CEEC38 802409D8 96220086 */ lhu $v0, 0x86($s1) -/* CEEC3C 802409DC A64200A8 */ sh $v0, 0xa8($s2) -.L802409E0: -/* CEEC40 802409E0 0260202D */ daddu $a0, $s3, $zero -/* CEEC44 802409E4 0280282D */ daddu $a1, $s4, $zero -/* CEEC48 802409E8 0C0125AE */ jal func_800496B8 -/* CEEC4C 802409EC 02A0302D */ daddu $a2, $s5, $zero -/* CEEC50 802409F0 080902B5 */ j .L80240AD4 -/* CEEC54 802409F4 00000000 */ nop -.L802409F8: -/* CEEC58 802409F8 0260202D */ daddu $a0, $s3, $zero -/* CEEC5C 802409FC 0280282D */ daddu $a1, $s4, $zero -/* CEEC60 80240A00 0C0126D1 */ jal func_80049B44 -/* CEEC64 80240A04 02A0302D */ daddu $a2, $s5, $zero -/* CEEC68 80240A08 8E230088 */ lw $v1, 0x88($s1) -/* CEEC6C 80240A0C 24020006 */ addiu $v0, $zero, 6 -/* CEEC70 80240A10 14620014 */ bne $v1, $v0, .L80240A64 -/* CEEC74 80240A14 0260202D */ daddu $a0, $s3, $zero -/* CEEC78 80240A18 0C00A67F */ jal rand_int -/* CEEC7C 80240A1C 24040064 */ addiu $a0, $zero, 0x64 -/* CEEC80 80240A20 28420021 */ slti $v0, $v0, 0x21 -/* CEEC84 80240A24 5040000F */ beql $v0, $zero, .L80240A64 -/* CEEC88 80240A28 0260202D */ daddu $a0, $s3, $zero -/* CEEC8C 80240A2C 8E22008C */ lw $v0, 0x8c($s1) -/* CEEC90 80240A30 10400005 */ beqz $v0, .L80240A48 -/* CEEC94 80240A34 3C020055 */ lui $v0, 0x55 -/* CEEC98 80240A38 3442002F */ ori $v0, $v0, 0x2f -/* CEEC9C 80240A3C AE20008C */ sw $zero, 0x8c($s1) -/* CEECA0 80240A40 08090295 */ j .L80240A54 -/* CEECA4 80240A44 A22000B5 */ sb $zero, 0xb5($s1) -.L80240A48: -/* CEECA8 80240A48 3442002E */ ori $v0, $v0, 0x2e -/* CEECAC 80240A4C AE30008C */ sw $s0, 0x8c($s1) -/* CEECB0 80240A50 A23000B5 */ sb $s0, 0xb5($s1) -.L80240A54: -/* CEECB4 80240A54 AE420028 */ sw $v0, 0x28($s2) -/* CEECB8 80240A58 24020007 */ addiu $v0, $zero, 7 -/* CEECBC 80240A5C 080902D0 */ j .L80240B40 -/* CEECC0 80240A60 AE220090 */ sw $v0, 0x90($s1) -.L80240A64: -/* CEECC4 80240A64 0280282D */ daddu $a1, $s4, $zero -/* CEECC8 80240A68 0C012701 */ jal func_80049C04 -/* CEECCC 80240A6C 02A0302D */ daddu $a2, $s5, $zero -/* CEECD0 80240A70 080902B5 */ j .L80240AD4 -/* CEECD4 80240A74 00000000 */ nop -.L80240A78: -/* CEECD8 80240A78 0260202D */ daddu $a0, $s3, $zero -/* CEECDC 80240A7C 0280282D */ daddu $a1, $s4, $zero -/* CEECE0 80240A80 0C0900E5 */ jal func_80240394 -/* CEECE4 80240A84 02A0302D */ daddu $a2, $s5, $zero -/* CEECE8 80240A88 0260202D */ daddu $a0, $s3, $zero -.L80240A8C: -/* CEECEC 80240A8C 0280282D */ daddu $a1, $s4, $zero -/* CEECF0 80240A90 0C090104 */ jal func_80240410 -/* CEECF4 80240A94 02A0302D */ daddu $a2, $s5, $zero -/* CEECF8 80240A98 080902B5 */ j .L80240AD4 -/* CEECFC 80240A9C 00000000 */ nop -.L80240AA0: -/* CEED00 80240AA0 0260202D */ daddu $a0, $s3, $zero -/* CEED04 80240AA4 0280282D */ daddu $a1, $s4, $zero -/* CEED08 80240AA8 0C090151 */ jal func_80240544 -/* CEED0C 80240AAC 02A0302D */ daddu $a2, $s5, $zero -/* CEED10 80240AB0 080902B5 */ j .L80240AD4 -/* CEED14 80240AB4 00000000 */ nop -.L80240AB8: -/* CEED18 80240AB8 0280282D */ daddu $a1, $s4, $zero -/* CEED1C 80240ABC 0C0901AA */ jal func_802406A8 -/* CEED20 80240AC0 02A0302D */ daddu $a2, $s5, $zero -/* CEED24 80240AC4 080902B5 */ j .L80240AD4 -/* CEED28 80240AC8 00000000 */ nop -.L80240ACC: -/* CEED2C 80240ACC 0C0129CF */ jal func_8004A73C -/* CEED30 80240AD0 0260202D */ daddu $a0, $s3, $zero -.L80240AD4: -/* CEED34 80240AD4 8E230088 */ lw $v1, 0x88($s1) -/* CEED38 80240AD8 24020006 */ addiu $v0, $zero, 6 -/* CEED3C 80240ADC 14620019 */ bne $v1, $v0, .L80240B44 -/* CEED40 80240AE0 0000102D */ daddu $v0, $zero, $zero -/* CEED44 80240AE4 8E22008C */ lw $v0, 0x8c($s1) -/* CEED48 80240AE8 10400003 */ beqz $v0, .L80240AF8 -/* CEED4C 80240AEC 24020001 */ addiu $v0, $zero, 1 -/* CEED50 80240AF0 080902BF */ j .L80240AFC -/* CEED54 80240AF4 A22200B5 */ sb $v0, 0xb5($s1) -.L80240AF8: -/* CEED58 80240AF8 A22000B5 */ sb $zero, 0xb5($s1) -.L80240AFC: -/* CEED5C 80240AFC 8E22008C */ lw $v0, 0x8c($s1) -/* CEED60 80240B00 1040000F */ beqz $v0, .L80240B40 -/* CEED64 80240B04 3C03FFAA */ lui $v1, 0xffaa -/* CEED68 80240B08 8E420028 */ lw $v0, 0x28($s2) -/* CEED6C 80240B0C 3463FFFC */ ori $v1, $v1, 0xfffc -/* CEED70 80240B10 00431821 */ addu $v1, $v0, $v1 -/* CEED74 80240B14 2C620015 */ sltiu $v0, $v1, 0x15 -/* CEED78 80240B18 10400009 */ beqz $v0, .L80240B40 -/* CEED7C 80240B1C 00031080 */ sll $v0, $v1, 2 -/* CEED80 80240B20 3C018024 */ lui $at, 0x8024 -/* CEED84 80240B24 00220821 */ addu $at, $at, $v0 -/* CEED88 80240B28 8C222688 */ lw $v0, 0x2688($at) -/* CEED8C 80240B2C 00400008 */ jr $v0 -/* CEED90 80240B30 00000000 */ nop -/* CEED94 80240B34 8E420028 */ lw $v0, 0x28($s2) -/* CEED98 80240B38 24420001 */ addiu $v0, $v0, 1 -/* CEED9C 80240B3C AE420028 */ sw $v0, 0x28($s2) -.L80240B40: -/* CEEDA0 80240B40 0000102D */ daddu $v0, $zero, $zero -.L80240B44: -/* CEEDA4 80240B44 8FBF0068 */ lw $ra, 0x68($sp) -/* CEEDA8 80240B48 8FB50064 */ lw $s5, 0x64($sp) -/* CEEDAC 80240B4C 8FB40060 */ lw $s4, 0x60($sp) -/* CEEDB0 80240B50 8FB3005C */ lw $s3, 0x5c($sp) -/* CEEDB4 80240B54 8FB20058 */ lw $s2, 0x58($sp) -/* CEEDB8 80240B58 8FB10054 */ lw $s1, 0x54($sp) -/* CEEDBC 80240B5C 8FB00050 */ lw $s0, 0x50($sp) -/* CEEDC0 80240B60 03E00008 */ jr $ra -/* CEEDC4 80240B64 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_flo/flo_23/func_80240B68_CEE260.s b/asm/nonmatchings/world/area_flo/flo_23/func_80240B68_CEE260.s deleted file mode 100644 index c36394f3f2..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_23/func_80240B68_CEE260.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B68_CEEDC8 -/* CEEDC8 80240B68 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CEEDCC 80240B6C AFB10014 */ sw $s1, 0x14($sp) -/* CEEDD0 80240B70 0080882D */ daddu $s1, $a0, $zero -/* CEEDD4 80240B74 AFBF0020 */ sw $ra, 0x20($sp) -/* CEEDD8 80240B78 AFB3001C */ sw $s3, 0x1c($sp) -/* CEEDDC 80240B7C AFB20018 */ sw $s2, 0x18($sp) -/* CEEDE0 80240B80 AFB00010 */ sw $s0, 0x10($sp) -/* CEEDE4 80240B84 8E30000C */ lw $s0, 0xc($s1) -/* CEEDE8 80240B88 8E050000 */ lw $a1, ($s0) -/* CEEDEC 80240B8C 0C0B1EAF */ jal get_variable -/* CEEDF0 80240B90 26100004 */ addiu $s0, $s0, 4 -/* CEEDF4 80240B94 8E050000 */ lw $a1, ($s0) -/* CEEDF8 80240B98 26100004 */ addiu $s0, $s0, 4 -/* CEEDFC 80240B9C 0220202D */ daddu $a0, $s1, $zero -/* CEEE00 80240BA0 0C0B1EAF */ jal get_variable -/* CEEE04 80240BA4 0040982D */ daddu $s3, $v0, $zero -/* CEEE08 80240BA8 8E050000 */ lw $a1, ($s0) -/* CEEE0C 80240BAC 26100004 */ addiu $s0, $s0, 4 -/* CEEE10 80240BB0 0220202D */ daddu $a0, $s1, $zero -/* CEEE14 80240BB4 0C0B1EAF */ jal get_variable -/* CEEE18 80240BB8 0040902D */ daddu $s2, $v0, $zero -/* CEEE1C 80240BBC 0220202D */ daddu $a0, $s1, $zero -/* CEEE20 80240BC0 8E050000 */ lw $a1, ($s0) -/* CEEE24 80240BC4 0C0B1EAF */ jal get_variable -/* CEEE28 80240BC8 0040882D */ daddu $s1, $v0, $zero -/* CEEE2C 80240BCC 0260202D */ daddu $a0, $s3, $zero -/* CEEE30 80240BD0 0C04C3D6 */ jal get_item_entity -/* CEEE34 80240BD4 0040802D */ daddu $s0, $v0, $zero -/* CEEE38 80240BD8 0040182D */ daddu $v1, $v0, $zero -/* CEEE3C 80240BDC 44920000 */ mtc1 $s2, $f0 -/* CEEE40 80240BE0 00000000 */ nop -/* CEEE44 80240BE4 46800020 */ cvt.s.w $f0, $f0 -/* CEEE48 80240BE8 E4600008 */ swc1 $f0, 8($v1) -/* CEEE4C 80240BEC 44910000 */ mtc1 $s1, $f0 -/* CEEE50 80240BF0 00000000 */ nop -/* CEEE54 80240BF4 46800020 */ cvt.s.w $f0, $f0 -/* CEEE58 80240BF8 E460000C */ swc1 $f0, 0xc($v1) -/* CEEE5C 80240BFC 44900000 */ mtc1 $s0, $f0 -/* CEEE60 80240C00 00000000 */ nop -/* CEEE64 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* CEEE68 80240C08 E4600010 */ swc1 $f0, 0x10($v1) -/* CEEE6C 80240C0C 8FBF0020 */ lw $ra, 0x20($sp) -/* CEEE70 80240C10 8FB3001C */ lw $s3, 0x1c($sp) -/* CEEE74 80240C14 8FB20018 */ lw $s2, 0x18($sp) -/* CEEE78 80240C18 8FB10014 */ lw $s1, 0x14($sp) -/* CEEE7C 80240C1C 8FB00010 */ lw $s0, 0x10($sp) -/* CEEE80 80240C20 24020002 */ addiu $v0, $zero, 2 -/* CEEE84 80240C24 03E00008 */ jr $ra -/* CEEE88 80240C28 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_23/func_80240C2C_CEE260.s b/asm/nonmatchings/world/area_flo/flo_23/func_80240C2C_CEE260.s deleted file mode 100644 index ebe2bf60f2..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_23/func_80240C2C_CEE260.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C2C_CEEE8C -/* CEEE8C 80240C2C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CEEE90 80240C30 AFB00010 */ sw $s0, 0x10($sp) -/* CEEE94 80240C34 0080802D */ daddu $s0, $a0, $zero -/* CEEE98 80240C38 AFBF0014 */ sw $ra, 0x14($sp) -/* CEEE9C 80240C3C 8E02000C */ lw $v0, 0xc($s0) -/* CEEEA0 80240C40 0C0B1EAF */ jal get_variable -/* CEEEA4 80240C44 8C450000 */ lw $a1, ($v0) -/* CEEEA8 80240C48 3C048008 */ lui $a0, %hi(gItemTable) -/* CEEEAC 80240C4C 248478E0 */ addiu $a0, $a0, %lo(gItemTable) -/* CEEEB0 80240C50 00021940 */ sll $v1, $v0, 5 -/* CEEEB4 80240C54 00642021 */ addu $a0, $v1, $a0 -/* CEEEB8 80240C58 240300BB */ addiu $v1, $zero, 0xbb -/* CEEEBC 80240C5C 14430003 */ bne $v0, $v1, .L80240C6C -/* CEEEC0 80240C60 24020002 */ addiu $v0, $zero, 2 -/* CEEEC4 80240C64 08090322 */ j .L80240C88 -/* CEEEC8 80240C68 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240C6C: -/* CEEECC 80240C6C 94820018 */ lhu $v0, 0x18($a0) -/* CEEED0 80240C70 30420080 */ andi $v0, $v0, 0x80 -/* CEEED4 80240C74 10400003 */ beqz $v0, .L80240C84 -/* CEEED8 80240C78 24020001 */ addiu $v0, $zero, 1 -/* CEEEDC 80240C7C 08090322 */ j .L80240C88 -/* CEEEE0 80240C80 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240C84: -/* CEEEE4 80240C84 AE0000A8 */ sw $zero, 0xa8($s0) -.L80240C88: -/* CEEEE8 80240C88 8FBF0014 */ lw $ra, 0x14($sp) -/* CEEEEC 80240C8C 8FB00010 */ lw $s0, 0x10($sp) -/* CEEEF0 80240C90 24020002 */ addiu $v0, $zero, 2 -/* CEEEF4 80240C94 03E00008 */ jr $ra -/* CEEEF8 80240C98 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_23/func_80240C9C_CEE260.s b/asm/nonmatchings/world/area_flo/flo_23/func_80240C9C_CEE260.s deleted file mode 100644 index b5665b97e3..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_23/func_80240C9C_CEE260.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C9C_CEEEFC -/* CEEEFC 80240C9C 2404005A */ addiu $a0, $zero, 0x5a -/* CEEF00 80240CA0 3C038024 */ lui $v1, 0x8024 -/* CEEF04 80240CA4 246329B8 */ addiu $v1, $v1, 0x29b8 -/* CEEF08 80240CA8 240200DA */ addiu $v0, $zero, 0xda -.L80240CAC: -/* CEEF0C 80240CAC AC620000 */ sw $v0, ($v1) -/* CEEF10 80240CB0 2463FFFC */ addiu $v1, $v1, -4 -/* CEEF14 80240CB4 2484FFFF */ addiu $a0, $a0, -1 -/* CEEF18 80240CB8 0481FFFC */ bgez $a0, .L80240CAC -/* CEEF1C 80240CBC 2442FFFF */ addiu $v0, $v0, -1 -/* CEEF20 80240CC0 3C018024 */ lui $at, 0x8024 -/* CEEF24 80240CC4 AC2029BC */ sw $zero, 0x29bc($at) -/* CEEF28 80240CC8 03E00008 */ jr $ra -/* CEEF2C 80240CCC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_flo/flo_24/func_80240040_CF0940.s b/asm/nonmatchings/world/area_flo/flo_24/func_80240040_CF0940.s deleted file mode 100644 index ceeaaa9932..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_24/func_80240040_CF0940.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_CF0980 -/* CF0980 80240040 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* CF0984 80240044 F7B40018 */ sdc1 $f20, 0x18($sp) -/* CF0988 80240048 4485A000 */ mtc1 $a1, $f20 -/* CF098C 8024004C F7B60020 */ sdc1 $f22, 0x20($sp) -/* CF0990 80240050 4486B000 */ mtc1 $a2, $f22 -/* CF0994 80240054 AFB00010 */ sw $s0, 0x10($sp) -/* CF0998 80240058 F7B80028 */ sdc1 $f24, 0x28($sp) -/* CF099C 8024005C 4487C000 */ mtc1 $a3, $f24 -/* CF09A0 80240060 AFBF0014 */ sw $ra, 0x14($sp) -/* CF09A4 80240064 0C019D28 */ jal guMtxIdentF -/* CF09A8 80240068 0080802D */ daddu $s0, $a0, $zero -/* CF09AC 8024006C 4616A582 */ mul.s $f22, $f20, $f22 -/* CF09B0 80240070 00000000 */ nop -/* CF09B4 80240074 4618A502 */ mul.s $f20, $f20, $f24 -/* CF09B8 80240078 00000000 */ nop -/* CF09BC 8024007C 3C013F80 */ lui $at, 0x3f80 -/* CF09C0 80240080 44810000 */ mtc1 $at, $f0 -/* CF09C4 80240084 00000000 */ nop -/* CF09C8 80240088 E6000014 */ swc1 $f0, 0x14($s0) -/* CF09CC 8024008C E6160010 */ swc1 $f22, 0x10($s0) -/* CF09D0 80240090 E6140018 */ swc1 $f20, 0x18($s0) -/* CF09D4 80240094 8FBF0014 */ lw $ra, 0x14($sp) -/* CF09D8 80240098 8FB00010 */ lw $s0, 0x10($sp) -/* CF09DC 8024009C D7B80028 */ ldc1 $f24, 0x28($sp) -/* CF09E0 802400A0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* CF09E4 802400A4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* CF09E8 802400A8 03E00008 */ jr $ra -/* CF09EC 802400AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_flo/flo_24/func_802400B0_CF0940.s b/asm/nonmatchings/world/area_flo/flo_24/func_802400B0_CF0940.s deleted file mode 100644 index e39a5ff3c2..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_24/func_802400B0_CF0940.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B0_CF09F0 -/* CF09F0 802400B0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* CF09F4 802400B4 AFB10054 */ sw $s1, 0x54($sp) -/* CF09F8 802400B8 0080882D */ daddu $s1, $a0, $zero -/* CF09FC 802400BC AFBF005C */ sw $ra, 0x5c($sp) -/* CF0A00 802400C0 AFB20058 */ sw $s2, 0x58($sp) -/* CF0A04 802400C4 AFB00050 */ sw $s0, 0x50($sp) -/* CF0A08 802400C8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* CF0A0C 802400CC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CF0A10 802400D0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CF0A14 802400D4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* CF0A18 802400D8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CF0A1C 802400DC 8E30000C */ lw $s0, 0xc($s1) -/* CF0A20 802400E0 8E050000 */ lw $a1, ($s0) -/* CF0A24 802400E4 0C0B1EAF */ jal get_variable -/* CF0A28 802400E8 26100004 */ addiu $s0, $s0, 4 -/* CF0A2C 802400EC 0C046C04 */ jal get_model_list_index_from_tree_index -/* CF0A30 802400F0 0040202D */ daddu $a0, $v0, $zero -/* CF0A34 802400F4 8E050000 */ lw $a1, ($s0) -/* CF0A38 802400F8 26100004 */ addiu $s0, $s0, 4 -/* CF0A3C 802400FC 0220202D */ daddu $a0, $s1, $zero -/* CF0A40 80240100 0C0B210B */ jal get_float_variable -/* CF0A44 80240104 0040902D */ daddu $s2, $v0, $zero -/* CF0A48 80240108 8E050000 */ lw $a1, ($s0) -/* CF0A4C 8024010C 26100004 */ addiu $s0, $s0, 4 -/* CF0A50 80240110 0220202D */ daddu $a0, $s1, $zero -/* CF0A54 80240114 0C0B210B */ jal get_float_variable -/* CF0A58 80240118 46000706 */ mov.s $f28, $f0 -/* CF0A5C 8024011C 8E050000 */ lw $a1, ($s0) -/* CF0A60 80240120 26100004 */ addiu $s0, $s0, 4 -/* CF0A64 80240124 0220202D */ daddu $a0, $s1, $zero -/* CF0A68 80240128 0C0B210B */ jal get_float_variable -/* CF0A6C 8024012C 46000686 */ mov.s $f26, $f0 -/* CF0A70 80240130 0220202D */ daddu $a0, $s1, $zero -/* CF0A74 80240134 8E050000 */ lw $a1, ($s0) -/* CF0A78 80240138 0C0B210B */ jal get_float_variable -/* CF0A7C 8024013C 46000586 */ mov.s $f22, $f0 -/* CF0A80 80240140 0240202D */ daddu $a0, $s2, $zero -/* CF0A84 80240144 0C046B4C */ jal get_model_from_list_index -/* CF0A88 80240148 46000606 */ mov.s $f24, $f0 -/* CF0A8C 8024014C 0040882D */ daddu $s1, $v0, $zero -/* CF0A90 80240150 96220000 */ lhu $v0, ($s1) -/* CF0A94 80240154 30420400 */ andi $v0, $v0, 0x400 -/* CF0A98 80240158 1440001E */ bnez $v0, .L802401D4 -/* CF0A9C 8024015C 26300058 */ addiu $s0, $s1, 0x58 -/* CF0AA0 80240160 4480A000 */ mtc1 $zero, $f20 -/* CF0AA4 80240164 4406B000 */ mfc1 $a2, $f22 -/* CF0AA8 80240168 4405A000 */ mfc1 $a1, $f20 -/* CF0AAC 8024016C 4407A000 */ mfc1 $a3, $f20 -/* CF0AB0 80240170 0C019E40 */ jal guTranslateF -/* CF0AB4 80240174 0200202D */ daddu $a0, $s0, $zero -/* CF0AB8 80240178 4405E000 */ mfc1 $a1, $f28 -/* CF0ABC 8024017C 4406D000 */ mfc1 $a2, $f26 -/* CF0AC0 80240180 4407C000 */ mfc1 $a3, $f24 -/* CF0AC4 80240184 0C090010 */ jal func_80240040 -/* CF0AC8 80240188 27A40010 */ addiu $a0, $sp, 0x10 -/* CF0ACC 8024018C 27A40010 */ addiu $a0, $sp, 0x10 -/* CF0AD0 80240190 0200282D */ daddu $a1, $s0, $zero -/* CF0AD4 80240194 0C019D80 */ jal guMtxCatF -/* CF0AD8 80240198 0200302D */ daddu $a2, $s0, $zero -/* CF0ADC 8024019C 27A40010 */ addiu $a0, $sp, 0x10 -/* CF0AE0 802401A0 4600B587 */ neg.s $f22, $f22 -/* CF0AE4 802401A4 4405A000 */ mfc1 $a1, $f20 -/* CF0AE8 802401A8 4406B000 */ mfc1 $a2, $f22 -/* CF0AEC 802401AC 0C019E40 */ jal guTranslateF -/* CF0AF0 802401B0 00A0382D */ daddu $a3, $a1, $zero -/* CF0AF4 802401B4 27A40010 */ addiu $a0, $sp, 0x10 -/* CF0AF8 802401B8 0200282D */ daddu $a1, $s0, $zero -/* CF0AFC 802401BC 0C019D80 */ jal guMtxCatF -/* CF0B00 802401C0 00A0302D */ daddu $a2, $a1, $zero -/* CF0B04 802401C4 96220000 */ lhu $v0, ($s1) -/* CF0B08 802401C8 34421400 */ ori $v0, $v0, 0x1400 -/* CF0B0C 802401CC 08090093 */ j .L8024024C -/* CF0B10 802401D0 A6220000 */ sh $v0, ($s1) -.L802401D4: -/* CF0B14 802401D4 4480A000 */ mtc1 $zero, $f20 -/* CF0B18 802401D8 4406B000 */ mfc1 $a2, $f22 -/* CF0B1C 802401DC 4405A000 */ mfc1 $a1, $f20 -/* CF0B20 802401E0 4407A000 */ mfc1 $a3, $f20 -/* CF0B24 802401E4 0C019E40 */ jal guTranslateF -/* CF0B28 802401E8 27A40010 */ addiu $a0, $sp, 0x10 -/* CF0B2C 802401EC 27A40010 */ addiu $a0, $sp, 0x10 -/* CF0B30 802401F0 26300058 */ addiu $s0, $s1, 0x58 -/* CF0B34 802401F4 0200282D */ daddu $a1, $s0, $zero -/* CF0B38 802401F8 0C019D80 */ jal guMtxCatF -/* CF0B3C 802401FC 0200302D */ daddu $a2, $s0, $zero -/* CF0B40 80240200 4405E000 */ mfc1 $a1, $f28 -/* CF0B44 80240204 4406D000 */ mfc1 $a2, $f26 -/* CF0B48 80240208 4407C000 */ mfc1 $a3, $f24 -/* CF0B4C 8024020C 0C090010 */ jal func_80240040 -/* CF0B50 80240210 27A40010 */ addiu $a0, $sp, 0x10 -/* CF0B54 80240214 27A40010 */ addiu $a0, $sp, 0x10 -/* CF0B58 80240218 0200282D */ daddu $a1, $s0, $zero -/* CF0B5C 8024021C 0C019D80 */ jal guMtxCatF -/* CF0B60 80240220 0200302D */ daddu $a2, $s0, $zero -/* CF0B64 80240224 27A40010 */ addiu $a0, $sp, 0x10 -/* CF0B68 80240228 4600B587 */ neg.s $f22, $f22 -/* CF0B6C 8024022C 4405A000 */ mfc1 $a1, $f20 -/* CF0B70 80240230 4406B000 */ mfc1 $a2, $f22 -/* CF0B74 80240234 0C019E40 */ jal guTranslateF -/* CF0B78 80240238 00A0382D */ daddu $a3, $a1, $zero -/* CF0B7C 8024023C 27A40010 */ addiu $a0, $sp, 0x10 -/* CF0B80 80240240 0200282D */ daddu $a1, $s0, $zero -/* CF0B84 80240244 0C019D80 */ jal guMtxCatF -/* CF0B88 80240248 00A0302D */ daddu $a2, $a1, $zero -.L8024024C: -/* CF0B8C 8024024C 8FBF005C */ lw $ra, 0x5c($sp) -/* CF0B90 80240250 8FB20058 */ lw $s2, 0x58($sp) -/* CF0B94 80240254 8FB10054 */ lw $s1, 0x54($sp) -/* CF0B98 80240258 8FB00050 */ lw $s0, 0x50($sp) -/* CF0B9C 8024025C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* CF0BA0 80240260 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CF0BA4 80240264 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CF0BA8 80240268 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CF0BAC 8024026C D7B40060 */ ldc1 $f20, 0x60($sp) -/* CF0BB0 80240270 24020002 */ addiu $v0, $zero, 2 -/* CF0BB4 80240274 03E00008 */ jr $ra -/* CF0BB8 80240278 27BD0088 */ addiu $sp, $sp, 0x88 -/* CF0BBC 8024027C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_24/func_80240280_CF0940.s b/asm/nonmatchings/world/area_flo/flo_24/func_80240280_CF0940.s deleted file mode 100644 index ba2177296d..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_24/func_80240280_CF0940.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240280_CF0BC0 -/* CF0BC0 80240280 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF0BC4 80240284 AFB00010 */ sw $s0, 0x10($sp) -/* CF0BC8 80240288 0080802D */ daddu $s0, $a0, $zero -/* CF0BCC 8024028C AFBF0014 */ sw $ra, 0x14($sp) -/* CF0BD0 80240290 8E0300A8 */ lw $v1, 0xa8($s0) -/* CF0BD4 80240294 8E020088 */ lw $v0, 0x88($s0) -/* CF0BD8 80240298 00621821 */ addu $v1, $v1, $v0 -/* CF0BDC 8024029C 04610004 */ bgez $v1, .L802402B0 -/* CF0BE0 802402A0 AE0300A8 */ sw $v1, 0xa8($s0) -/* CF0BE4 802402A4 3C020002 */ lui $v0, 2 -/* CF0BE8 802402A8 080900B0 */ j .L802402C0 -/* CF0BEC 802402AC 00621021 */ addu $v0, $v1, $v0 -.L802402B0: -/* CF0BF0 802402B0 3C040002 */ lui $a0, 2 -/* CF0BF4 802402B4 0083102A */ slt $v0, $a0, $v1 -/* CF0BF8 802402B8 10400002 */ beqz $v0, .L802402C4 -/* CF0BFC 802402BC 00641023 */ subu $v0, $v1, $a0 -.L802402C0: -/* CF0C00 802402C0 AE0200A8 */ sw $v0, 0xa8($s0) -.L802402C4: -/* CF0C04 802402C4 8E0300AC */ lw $v1, 0xac($s0) -/* CF0C08 802402C8 8E02008C */ lw $v0, 0x8c($s0) -/* CF0C0C 802402CC 00621821 */ addu $v1, $v1, $v0 -/* CF0C10 802402D0 04610004 */ bgez $v1, .L802402E4 -/* CF0C14 802402D4 AE0300AC */ sw $v1, 0xac($s0) -/* CF0C18 802402D8 3C020002 */ lui $v0, 2 -/* CF0C1C 802402DC 080900BD */ j .L802402F4 -/* CF0C20 802402E0 00621021 */ addu $v0, $v1, $v0 -.L802402E4: -/* CF0C24 802402E4 3C040002 */ lui $a0, 2 -/* CF0C28 802402E8 0083102A */ slt $v0, $a0, $v1 -/* CF0C2C 802402EC 10400002 */ beqz $v0, .L802402F8 -/* CF0C30 802402F0 00641023 */ subu $v0, $v1, $a0 -.L802402F4: -/* CF0C34 802402F4 AE0200AC */ sw $v0, 0xac($s0) -.L802402F8: -/* CF0C38 802402F8 8E0300B0 */ lw $v1, 0xb0($s0) -/* CF0C3C 802402FC 8E020090 */ lw $v0, 0x90($s0) -/* CF0C40 80240300 00621821 */ addu $v1, $v1, $v0 -/* CF0C44 80240304 04610004 */ bgez $v1, .L80240318 -/* CF0C48 80240308 AE0300B0 */ sw $v1, 0xb0($s0) -/* CF0C4C 8024030C 3C020002 */ lui $v0, 2 -/* CF0C50 80240310 080900CA */ j .L80240328 -/* CF0C54 80240314 00621021 */ addu $v0, $v1, $v0 -.L80240318: -/* CF0C58 80240318 3C040002 */ lui $a0, 2 -/* CF0C5C 8024031C 0083102A */ slt $v0, $a0, $v1 -/* CF0C60 80240320 10400002 */ beqz $v0, .L8024032C -/* CF0C64 80240324 00641023 */ subu $v0, $v1, $a0 -.L80240328: -/* CF0C68 80240328 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024032C: -/* CF0C6C 8024032C 8E0300B4 */ lw $v1, 0xb4($s0) -/* CF0C70 80240330 8E020094 */ lw $v0, 0x94($s0) -/* CF0C74 80240334 00621821 */ addu $v1, $v1, $v0 -/* CF0C78 80240338 04610004 */ bgez $v1, .L8024034C -/* CF0C7C 8024033C AE0300B4 */ sw $v1, 0xb4($s0) -/* CF0C80 80240340 3C020002 */ lui $v0, 2 -/* CF0C84 80240344 080900D7 */ j .L8024035C -/* CF0C88 80240348 00621021 */ addu $v0, $v1, $v0 -.L8024034C: -/* CF0C8C 8024034C 3C040002 */ lui $a0, 2 -/* CF0C90 80240350 0083102A */ slt $v0, $a0, $v1 -/* CF0C94 80240354 10400002 */ beqz $v0, .L80240360 -/* CF0C98 80240358 00641023 */ subu $v0, $v1, $a0 -.L8024035C: -/* CF0C9C 8024035C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240360: -/* CF0CA0 80240360 8E040084 */ lw $a0, 0x84($s0) -/* CF0CA4 80240364 0C046F07 */ jal set_main_pan_u -/* CF0CA8 80240368 8E0500A8 */ lw $a1, 0xa8($s0) -/* CF0CAC 8024036C 8E040084 */ lw $a0, 0x84($s0) -/* CF0CB0 80240370 0C046F0D */ jal set_main_pan_v -/* CF0CB4 80240374 8E0500AC */ lw $a1, 0xac($s0) -/* CF0CB8 80240378 8E040084 */ lw $a0, 0x84($s0) -/* CF0CBC 8024037C 0C046F13 */ jal set_aux_pan_u -/* CF0CC0 80240380 8E0500B0 */ lw $a1, 0xb0($s0) -/* CF0CC4 80240384 8E040084 */ lw $a0, 0x84($s0) -/* CF0CC8 80240388 0C046F19 */ jal set_aux_pan_v -/* CF0CCC 8024038C 8E0500B4 */ lw $a1, 0xb4($s0) -/* CF0CD0 80240390 8FBF0014 */ lw $ra, 0x14($sp) -/* CF0CD4 80240394 8FB00010 */ lw $s0, 0x10($sp) -/* CF0CD8 80240398 0000102D */ daddu $v0, $zero, $zero -/* CF0CDC 8024039C 03E00008 */ jr $ra -/* CF0CE0 802403A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_24/func_802403A4_CF0940.s b/asm/nonmatchings/world/area_flo/flo_24/func_802403A4_CF0940.s deleted file mode 100644 index ca87afddf4..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_24/func_802403A4_CF0940.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403A4_CF0CE4 -/* CF0CE4 802403A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF0CE8 802403A8 AFB00010 */ sw $s0, 0x10($sp) -/* CF0CEC 802403AC 0080802D */ daddu $s0, $a0, $zero -/* CF0CF0 802403B0 10A00005 */ beqz $a1, .L802403C8 -/* CF0CF4 802403B4 AFBF0014 */ sw $ra, 0x14($sp) -/* CF0CF8 802403B8 AE000070 */ sw $zero, 0x70($s0) -/* CF0CFC 802403BC AE000074 */ sw $zero, 0x74($s0) -/* CF0D00 802403C0 AE000078 */ sw $zero, 0x78($s0) -/* CF0D04 802403C4 AE00007C */ sw $zero, 0x7c($s0) -.L802403C8: -/* CF0D08 802403C8 8E020070 */ lw $v0, 0x70($s0) -/* CF0D0C 802403CC 1440000E */ bnez $v0, .L80240408 -/* CF0D10 802403D0 00000000 */ nop -/* CF0D14 802403D4 8E0300A8 */ lw $v1, 0xa8($s0) -/* CF0D18 802403D8 8E020088 */ lw $v0, 0x88($s0) -/* CF0D1C 802403DC 00621821 */ addu $v1, $v1, $v0 -/* CF0D20 802403E0 04610004 */ bgez $v1, .L802403F4 -/* CF0D24 802403E4 AE0300A8 */ sw $v1, 0xa8($s0) -/* CF0D28 802403E8 3C020002 */ lui $v0, 2 -/* CF0D2C 802403EC 08090101 */ j .L80240404 -/* CF0D30 802403F0 00621021 */ addu $v0, $v1, $v0 -.L802403F4: -/* CF0D34 802403F4 3C040002 */ lui $a0, 2 -/* CF0D38 802403F8 0083102A */ slt $v0, $a0, $v1 -/* CF0D3C 802403FC 10400002 */ beqz $v0, .L80240408 -/* CF0D40 80240400 00641023 */ subu $v0, $v1, $a0 -.L80240404: -/* CF0D44 80240404 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240408: -/* CF0D48 80240408 8E020074 */ lw $v0, 0x74($s0) -/* CF0D4C 8024040C 1440000E */ bnez $v0, .L80240448 -/* CF0D50 80240410 00000000 */ nop -/* CF0D54 80240414 8E0300AC */ lw $v1, 0xac($s0) -/* CF0D58 80240418 8E02008C */ lw $v0, 0x8c($s0) -/* CF0D5C 8024041C 00621821 */ addu $v1, $v1, $v0 -/* CF0D60 80240420 04610004 */ bgez $v1, .L80240434 -/* CF0D64 80240424 AE0300AC */ sw $v1, 0xac($s0) -/* CF0D68 80240428 3C020002 */ lui $v0, 2 -/* CF0D6C 8024042C 08090111 */ j .L80240444 -/* CF0D70 80240430 00621021 */ addu $v0, $v1, $v0 -.L80240434: -/* CF0D74 80240434 3C040002 */ lui $a0, 2 -/* CF0D78 80240438 0083102A */ slt $v0, $a0, $v1 -/* CF0D7C 8024043C 10400002 */ beqz $v0, .L80240448 -/* CF0D80 80240440 00641023 */ subu $v0, $v1, $a0 -.L80240444: -/* CF0D84 80240444 AE0200AC */ sw $v0, 0xac($s0) -.L80240448: -/* CF0D88 80240448 8E020078 */ lw $v0, 0x78($s0) -/* CF0D8C 8024044C 1440000E */ bnez $v0, .L80240488 -/* CF0D90 80240450 00000000 */ nop -/* CF0D94 80240454 8E0300B0 */ lw $v1, 0xb0($s0) -/* CF0D98 80240458 8E020090 */ lw $v0, 0x90($s0) -/* CF0D9C 8024045C 00621821 */ addu $v1, $v1, $v0 -/* CF0DA0 80240460 04610004 */ bgez $v1, .L80240474 -/* CF0DA4 80240464 AE0300B0 */ sw $v1, 0xb0($s0) -/* CF0DA8 80240468 3C020002 */ lui $v0, 2 -/* CF0DAC 8024046C 08090121 */ j .L80240484 -/* CF0DB0 80240470 00621021 */ addu $v0, $v1, $v0 -.L80240474: -/* CF0DB4 80240474 3C040002 */ lui $a0, 2 -/* CF0DB8 80240478 0083102A */ slt $v0, $a0, $v1 -/* CF0DBC 8024047C 10400002 */ beqz $v0, .L80240488 -/* CF0DC0 80240480 00641023 */ subu $v0, $v1, $a0 -.L80240484: -/* CF0DC4 80240484 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240488: -/* CF0DC8 80240488 8E02007C */ lw $v0, 0x7c($s0) -/* CF0DCC 8024048C 1440000E */ bnez $v0, .L802404C8 -/* CF0DD0 80240490 00000000 */ nop -/* CF0DD4 80240494 8E0300B4 */ lw $v1, 0xb4($s0) -/* CF0DD8 80240498 8E020094 */ lw $v0, 0x94($s0) -/* CF0DDC 8024049C 00621821 */ addu $v1, $v1, $v0 -/* CF0DE0 802404A0 04610004 */ bgez $v1, .L802404B4 -/* CF0DE4 802404A4 AE0300B4 */ sw $v1, 0xb4($s0) -/* CF0DE8 802404A8 3C020002 */ lui $v0, 2 -/* CF0DEC 802404AC 08090131 */ j .L802404C4 -/* CF0DF0 802404B0 00621021 */ addu $v0, $v1, $v0 -.L802404B4: -/* CF0DF4 802404B4 3C040002 */ lui $a0, 2 -/* CF0DF8 802404B8 0083102A */ slt $v0, $a0, $v1 -/* CF0DFC 802404BC 10400002 */ beqz $v0, .L802404C8 -/* CF0E00 802404C0 00641023 */ subu $v0, $v1, $a0 -.L802404C4: -/* CF0E04 802404C4 AE0200B4 */ sw $v0, 0xb4($s0) -.L802404C8: -/* CF0E08 802404C8 8E040084 */ lw $a0, 0x84($s0) -/* CF0E0C 802404CC 0C046F07 */ jal set_main_pan_u -/* CF0E10 802404D0 8E0500A8 */ lw $a1, 0xa8($s0) -/* CF0E14 802404D4 8E040084 */ lw $a0, 0x84($s0) -/* CF0E18 802404D8 0C046F0D */ jal set_main_pan_v -/* CF0E1C 802404DC 8E0500AC */ lw $a1, 0xac($s0) -/* CF0E20 802404E0 8E040084 */ lw $a0, 0x84($s0) -/* CF0E24 802404E4 0C046F13 */ jal set_aux_pan_u -/* CF0E28 802404E8 8E0500B0 */ lw $a1, 0xb0($s0) -/* CF0E2C 802404EC 8E040084 */ lw $a0, 0x84($s0) -/* CF0E30 802404F0 0C046F19 */ jal set_aux_pan_v -/* CF0E34 802404F4 8E0500B4 */ lw $a1, 0xb4($s0) -/* CF0E38 802404F8 8E020070 */ lw $v0, 0x70($s0) -/* CF0E3C 802404FC 8E030078 */ lw $v1, 0x78($s0) -/* CF0E40 80240500 8E040098 */ lw $a0, 0x98($s0) -/* CF0E44 80240504 24420001 */ addiu $v0, $v0, 1 -/* CF0E48 80240508 AE020070 */ sw $v0, 0x70($s0) -/* CF0E4C 8024050C 8E020074 */ lw $v0, 0x74($s0) -/* CF0E50 80240510 24630001 */ addiu $v1, $v1, 1 -/* CF0E54 80240514 AE030078 */ sw $v1, 0x78($s0) -/* CF0E58 80240518 8E030070 */ lw $v1, 0x70($s0) -/* CF0E5C 8024051C 24420001 */ addiu $v0, $v0, 1 -/* CF0E60 80240520 AE020074 */ sw $v0, 0x74($s0) -/* CF0E64 80240524 8E02007C */ lw $v0, 0x7c($s0) -/* CF0E68 80240528 0064182A */ slt $v1, $v1, $a0 -/* CF0E6C 8024052C 24420001 */ addiu $v0, $v0, 1 -/* CF0E70 80240530 14600002 */ bnez $v1, .L8024053C -/* CF0E74 80240534 AE02007C */ sw $v0, 0x7c($s0) -/* CF0E78 80240538 AE000070 */ sw $zero, 0x70($s0) -.L8024053C: -/* CF0E7C 8024053C 8E020074 */ lw $v0, 0x74($s0) -/* CF0E80 80240540 8E03009C */ lw $v1, 0x9c($s0) -/* CF0E84 80240544 0043102A */ slt $v0, $v0, $v1 -/* CF0E88 80240548 50400001 */ beql $v0, $zero, .L80240550 -/* CF0E8C 8024054C AE000074 */ sw $zero, 0x74($s0) -.L80240550: -/* CF0E90 80240550 8E020078 */ lw $v0, 0x78($s0) -/* CF0E94 80240554 8E0300A0 */ lw $v1, 0xa0($s0) -/* CF0E98 80240558 0043102A */ slt $v0, $v0, $v1 -/* CF0E9C 8024055C 50400001 */ beql $v0, $zero, .L80240564 -/* CF0EA0 80240560 AE000078 */ sw $zero, 0x78($s0) -.L80240564: -/* CF0EA4 80240564 8E02007C */ lw $v0, 0x7c($s0) -/* CF0EA8 80240568 8E0300A4 */ lw $v1, 0xa4($s0) -/* CF0EAC 8024056C 0043102A */ slt $v0, $v0, $v1 -/* CF0EB0 80240570 50400001 */ beql $v0, $zero, .L80240578 -/* CF0EB4 80240574 AE00007C */ sw $zero, 0x7c($s0) -.L80240578: -/* CF0EB8 80240578 8FBF0014 */ lw $ra, 0x14($sp) -/* CF0EBC 8024057C 8FB00010 */ lw $s0, 0x10($sp) -/* CF0EC0 80240580 0000102D */ daddu $v0, $zero, $zero -/* CF0EC4 80240584 03E00008 */ jr $ra -/* CF0EC8 80240588 27BD0018 */ addiu $sp, $sp, 0x18 -/* CF0ECC 8024058C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_80240040_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_80240040_CF2BD0.s deleted file mode 100644 index 0a64be6e8b..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_80240040_CF2BD0.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_CF2C10 -/* CF2C10 80240040 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CF2C14 80240044 AFB3002C */ sw $s3, 0x2c($sp) -/* CF2C18 80240048 0080982D */ daddu $s3, $a0, $zero -/* CF2C1C 8024004C AFBF0030 */ sw $ra, 0x30($sp) -/* CF2C20 80240050 AFB20028 */ sw $s2, 0x28($sp) -/* CF2C24 80240054 AFB10024 */ sw $s1, 0x24($sp) -/* CF2C28 80240058 AFB00020 */ sw $s0, 0x20($sp) -/* CF2C2C 8024005C 8E710148 */ lw $s1, 0x148($s3) -/* CF2C30 80240060 86240008 */ lh $a0, 8($s1) -/* CF2C34 80240064 0C00EABB */ jal get_npc_unsafe -/* CF2C38 80240068 00A0902D */ daddu $s2, $a1, $zero -/* CF2C3C 8024006C 8E440004 */ lw $a0, 4($s2) -/* CF2C40 80240070 0040802D */ daddu $s0, $v0, $zero -/* CF2C44 80240074 00041FC2 */ srl $v1, $a0, 0x1f -/* CF2C48 80240078 00832021 */ addu $a0, $a0, $v1 -/* CF2C4C 8024007C 00042043 */ sra $a0, $a0, 1 -/* CF2C50 80240080 0C00A67F */ jal rand_int -/* CF2C54 80240084 24840001 */ addiu $a0, $a0, 1 -/* CF2C58 80240088 8E430004 */ lw $v1, 4($s2) -/* CF2C5C 8024008C 000327C2 */ srl $a0, $v1, 0x1f -/* CF2C60 80240090 00641821 */ addu $v1, $v1, $a0 -/* CF2C64 80240094 00031843 */ sra $v1, $v1, 1 -/* CF2C68 80240098 00621821 */ addu $v1, $v1, $v0 -/* CF2C6C 8024009C A603008E */ sh $v1, 0x8e($s0) -/* CF2C70 802400A0 8E2300D0 */ lw $v1, 0xd0($s1) -/* CF2C74 802400A4 C6000040 */ lwc1 $f0, 0x40($s0) -/* CF2C78 802400A8 C4640000 */ lwc1 $f4, ($v1) -/* CF2C7C 802400AC 46802120 */ cvt.s.w $f4, $f4 -/* CF2C80 802400B0 C4620008 */ lwc1 $f2, 8($v1) -/* CF2C84 802400B4 468010A0 */ cvt.s.w $f2, $f2 -/* CF2C88 802400B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* CF2C8C 802400BC 8E2200D0 */ lw $v0, 0xd0($s1) -/* CF2C90 802400C0 44061000 */ mfc1 $a2, $f2 -/* CF2C94 802400C4 C440000C */ lwc1 $f0, 0xc($v0) -/* CF2C98 802400C8 46800020 */ cvt.s.w $f0, $f0 -/* CF2C9C 802400CC E7A00014 */ swc1 $f0, 0x14($sp) -/* CF2CA0 802400D0 8E2200D0 */ lw $v0, 0xd0($s1) -/* CF2CA4 802400D4 44052000 */ mfc1 $a1, $f4 -/* CF2CA8 802400D8 C4400010 */ lwc1 $f0, 0x10($v0) -/* CF2CAC 802400DC 46800020 */ cvt.s.w $f0, $f0 -/* CF2CB0 802400E0 E7A00018 */ swc1 $f0, 0x18($sp) -/* CF2CB4 802400E4 8C640018 */ lw $a0, 0x18($v1) -/* CF2CB8 802400E8 0C0123F5 */ jal is_point_within_region -/* CF2CBC 802400EC 8E070038 */ lw $a3, 0x38($s0) -/* CF2CC0 802400F0 1040000E */ beqz $v0, .L8024012C -/* CF2CC4 802400F4 00000000 */ nop -/* CF2CC8 802400F8 8E2200D0 */ lw $v0, 0xd0($s1) -/* CF2CCC 802400FC C60C0038 */ lwc1 $f12, 0x38($s0) -/* CF2CD0 80240100 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CF2CD4 80240104 C4460000 */ lwc1 $f6, ($v0) -/* CF2CD8 80240108 468031A0 */ cvt.s.w $f6, $f6 -/* CF2CDC 8024010C 44063000 */ mfc1 $a2, $f6 -/* CF2CE0 80240110 C4460008 */ lwc1 $f6, 8($v0) -/* CF2CE4 80240114 468031A0 */ cvt.s.w $f6, $f6 -/* CF2CE8 80240118 44073000 */ mfc1 $a3, $f6 -/* CF2CEC 8024011C 0C00A720 */ jal atan2 -/* CF2CF0 80240120 00000000 */ nop -/* CF2CF4 80240124 08090057 */ j .L8024015C -/* CF2CF8 80240128 E600000C */ swc1 $f0, 0xc($s0) -.L8024012C: -/* CF2CFC 8024012C 0C00A67F */ jal rand_int -/* CF2D00 80240130 2404003C */ addiu $a0, $zero, 0x3c -/* CF2D04 80240134 C60C000C */ lwc1 $f12, 0xc($s0) -/* CF2D08 80240138 44820000 */ mtc1 $v0, $f0 -/* CF2D0C 8024013C 00000000 */ nop -/* CF2D10 80240140 46800020 */ cvt.s.w $f0, $f0 -/* CF2D14 80240144 46006300 */ add.s $f12, $f12, $f0 -/* CF2D18 80240148 3C0141F0 */ lui $at, 0x41f0 -/* CF2D1C 8024014C 44810000 */ mtc1 $at, $f0 -/* CF2D20 80240150 0C00A6C9 */ jal clamp_angle -/* CF2D24 80240154 46006301 */ sub.s $f12, $f12, $f0 -/* CF2D28 80240158 E600000C */ swc1 $f0, 0xc($s0) -.L8024015C: -/* CF2D2C 8024015C 8E2200CC */ lw $v0, 0xcc($s1) -/* CF2D30 80240160 8C420004 */ lw $v0, 4($v0) -/* CF2D34 80240164 AE020028 */ sw $v0, 0x28($s0) -/* CF2D38 80240168 AE600074 */ sw $zero, 0x74($s3) -/* CF2D3C 8024016C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CF2D40 80240170 8C420014 */ lw $v0, 0x14($v0) -/* CF2D44 80240174 04410004 */ bgez $v0, .L80240188 -/* CF2D48 80240178 00000000 */ nop -/* CF2D4C 8024017C C6400000 */ lwc1 $f0, ($s2) -/* CF2D50 80240180 0809006A */ j .L802401A8 -/* CF2D54 80240184 E6000018 */ swc1 $f0, 0x18($s0) -.L80240188: -/* CF2D58 80240188 3C018024 */ lui $at, 0x8024 -/* CF2D5C 8024018C D4224EE0 */ ldc1 $f2, 0x4ee0($at) -/* CF2D60 80240190 44820000 */ mtc1 $v0, $f0 -/* CF2D64 80240194 00000000 */ nop -/* CF2D68 80240198 46800021 */ cvt.d.w $f0, $f0 -/* CF2D6C 8024019C 46220003 */ div.d $f0, $f0, $f2 -/* CF2D70 802401A0 46200020 */ cvt.s.d $f0, $f0 -/* CF2D74 802401A4 E6000018 */ swc1 $f0, 0x18($s0) -.L802401A8: -/* CF2D78 802401A8 C600003C */ lwc1 $f0, 0x3c($s0) -/* CF2D7C 802401AC 3C014059 */ lui $at, 0x4059 -/* CF2D80 802401B0 44811800 */ mtc1 $at, $f3 -/* CF2D84 802401B4 44801000 */ mtc1 $zero, $f2 -/* CF2D88 802401B8 46000021 */ cvt.d.s $f0, $f0 -/* CF2D8C 802401BC 46220002 */ mul.d $f0, $f0, $f2 -/* CF2D90 802401C0 00000000 */ nop -/* CF2D94 802401C4 24020001 */ addiu $v0, $zero, 1 -/* CF2D98 802401C8 4620018D */ trunc.w.d $f6, $f0 -/* CF2D9C 802401CC E626007C */ swc1 $f6, 0x7c($s1) -/* CF2DA0 802401D0 AE620070 */ sw $v0, 0x70($s3) -/* CF2DA4 802401D4 8FBF0030 */ lw $ra, 0x30($sp) -/* CF2DA8 802401D8 8FB3002C */ lw $s3, 0x2c($sp) -/* CF2DAC 802401DC 8FB20028 */ lw $s2, 0x28($sp) -/* CF2DB0 802401E0 8FB10024 */ lw $s1, 0x24($sp) -/* CF2DB4 802401E4 8FB00020 */ lw $s0, 0x20($sp) -/* CF2DB8 802401E8 03E00008 */ jr $ra -/* CF2DBC 802401EC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_802401F0_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_802401F0_CF2BD0.s deleted file mode 100644 index bc840ed0f3..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_802401F0_CF2BD0.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401F0_CF2DC0 -/* CF2DC0 802401F0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* CF2DC4 802401F4 AFB3004C */ sw $s3, 0x4c($sp) -/* CF2DC8 802401F8 0080982D */ daddu $s3, $a0, $zero -/* CF2DCC 802401FC AFBF0058 */ sw $ra, 0x58($sp) -/* CF2DD0 80240200 AFB50054 */ sw $s5, 0x54($sp) -/* CF2DD4 80240204 AFB40050 */ sw $s4, 0x50($sp) -/* CF2DD8 80240208 AFB20048 */ sw $s2, 0x48($sp) -/* CF2DDC 8024020C AFB10044 */ sw $s1, 0x44($sp) -/* CF2DE0 80240210 AFB00040 */ sw $s0, 0x40($sp) -/* CF2DE4 80240214 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CF2DE8 80240218 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CF2DEC 8024021C F7B60068 */ sdc1 $f22, 0x68($sp) -/* CF2DF0 80240220 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CF2DF4 80240224 8E710148 */ lw $s1, 0x148($s3) -/* CF2DF8 80240228 00A0902D */ daddu $s2, $a1, $zero -/* CF2DFC 8024022C 86240008 */ lh $a0, 8($s1) -/* CF2E00 80240230 0C00EABB */ jal get_npc_unsafe -/* CF2E04 80240234 00C0A82D */ daddu $s5, $a2, $zero -/* CF2E08 80240238 0040802D */ daddu $s0, $v0, $zero -/* CF2E0C 8024023C 0000A02D */ daddu $s4, $zero, $zero -/* CF2E10 80240240 C624007C */ lwc1 $f4, 0x7c($s1) -/* CF2E14 80240244 46802120 */ cvt.s.w $f4, $f4 -/* CF2E18 80240248 C6220088 */ lwc1 $f2, 0x88($s1) -/* CF2E1C 8024024C 468010A0 */ cvt.s.w $f2, $f2 -/* CF2E20 80240250 460010A1 */ cvt.d.s $f2, $f2 -/* CF2E24 80240254 46002121 */ cvt.d.s $f4, $f4 -/* CF2E28 80240258 C600003C */ lwc1 $f0, 0x3c($s0) -/* CF2E2C 8024025C 3C014059 */ lui $at, 0x4059 -/* CF2E30 80240260 44813800 */ mtc1 $at, $f7 -/* CF2E34 80240264 44803000 */ mtc1 $zero, $f6 -/* CF2E38 80240268 46000021 */ cvt.d.s $f0, $f0 -/* CF2E3C 8024026C 46260002 */ mul.d $f0, $f0, $f6 -/* CF2E40 80240270 00000000 */ nop -/* CF2E44 80240274 24020001 */ addiu $v0, $zero, 1 -/* CF2E48 80240278 8E24006C */ lw $a0, 0x6c($s1) -/* CF2E4C 8024027C 46261083 */ div.d $f2, $f2, $f6 -/* CF2E50 80240280 462010A0 */ cvt.s.d $f2, $f2 -/* CF2E54 80240284 46262103 */ div.d $f4, $f4, $f6 -/* CF2E58 80240288 46202520 */ cvt.s.d $f20, $f4 -/* CF2E5C 8024028C 30830011 */ andi $v1, $a0, 0x11 -/* CF2E60 80240290 4620020D */ trunc.w.d $f8, $f0 -/* CF2E64 80240294 E628007C */ swc1 $f8, 0x7c($s1) -/* CF2E68 80240298 C6200078 */ lwc1 $f0, 0x78($s1) -/* CF2E6C 8024029C 46800020 */ cvt.s.w $f0, $f0 -/* CF2E70 802402A0 46000021 */ cvt.d.s $f0, $f0 -/* CF2E74 802402A4 46260003 */ div.d $f0, $f0, $f6 -/* CF2E78 802402A8 462006A0 */ cvt.s.d $f26, $f0 -/* CF2E7C 802402AC C6200070 */ lwc1 $f0, 0x70($s1) -/* CF2E80 802402B0 46800020 */ cvt.s.w $f0, $f0 -/* CF2E84 802402B4 46000021 */ cvt.d.s $f0, $f0 -/* CF2E88 802402B8 46260003 */ div.d $f0, $f0, $f6 -/* CF2E8C 802402BC 462005A0 */ cvt.s.d $f22, $f0 -/* CF2E90 802402C0 14620025 */ bne $v1, $v0, .L80240358 -/* CF2E94 802402C4 4602D600 */ add.s $f24, $f26, $f2 -/* CF2E98 802402C8 8E020000 */ lw $v0, ($s0) -/* CF2E9C 802402CC 30420008 */ andi $v0, $v0, 8 -/* CF2EA0 802402D0 10400009 */ beqz $v0, .L802402F8 -/* CF2EA4 802402D4 27A50028 */ addiu $a1, $sp, 0x28 -/* CF2EA8 802402D8 C600003C */ lwc1 $f0, 0x3c($s0) -/* CF2EAC 802402DC 4600C001 */ sub.s $f0, $f24, $f0 -/* CF2EB0 802402E0 4600B03C */ c.lt.s $f22, $f0 -/* CF2EB4 802402E4 00000000 */ nop -/* CF2EB8 802402E8 4500001B */ bc1f .L80240358 -/* CF2EBC 802402EC 34820010 */ ori $v0, $a0, 0x10 -/* CF2EC0 802402F0 080900D6 */ j .L80240358 -/* CF2EC4 802402F4 AE22006C */ sw $v0, 0x6c($s1) -.L802402F8: -/* CF2EC8 802402F8 27A6002C */ addiu $a2, $sp, 0x2c -/* CF2ECC 802402FC C6000038 */ lwc1 $f0, 0x38($s0) -/* CF2ED0 80240300 C602003C */ lwc1 $f2, 0x3c($s0) -/* CF2ED4 80240304 C6040040 */ lwc1 $f4, 0x40($s0) -/* CF2ED8 80240308 3C01447A */ lui $at, 0x447a -/* CF2EDC 8024030C 44813000 */ mtc1 $at, $f6 -/* CF2EE0 80240310 27A20034 */ addiu $v0, $sp, 0x34 -/* CF2EE4 80240314 E7A00028 */ swc1 $f0, 0x28($sp) -/* CF2EE8 80240318 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CF2EEC 8024031C E7A40030 */ swc1 $f4, 0x30($sp) -/* CF2EF0 80240320 E7A60034 */ swc1 $f6, 0x34($sp) -/* CF2EF4 80240324 AFA20010 */ sw $v0, 0x10($sp) -/* CF2EF8 80240328 8E040080 */ lw $a0, 0x80($s0) -/* CF2EFC 8024032C 0C0372DF */ jal func_800DCB7C -/* CF2F00 80240330 27A70030 */ addiu $a3, $sp, 0x30 -/* CF2F04 80240334 C7A00034 */ lwc1 $f0, 0x34($sp) -/* CF2F08 80240338 4600D001 */ sub.s $f0, $f26, $f0 -/* CF2F0C 8024033C 4600B03C */ c.lt.s $f22, $f0 -/* CF2F10 80240340 00000000 */ nop -/* CF2F14 80240344 45000004 */ bc1f .L80240358 -/* CF2F18 80240348 00000000 */ nop -/* CF2F1C 8024034C 8E22006C */ lw $v0, 0x6c($s1) -/* CF2F20 80240350 34420010 */ ori $v0, $v0, 0x10 -/* CF2F24 80240354 AE22006C */ sw $v0, 0x6c($s1) -.L80240358: -/* CF2F28 80240358 8E22006C */ lw $v0, 0x6c($s1) -/* CF2F2C 8024035C 24030011 */ addiu $v1, $zero, 0x11 -/* CF2F30 80240360 30420011 */ andi $v0, $v0, 0x11 -/* CF2F34 80240364 14430039 */ bne $v0, $v1, .L8024044C -/* CF2F38 80240368 00000000 */ nop -/* CF2F3C 8024036C 8E020000 */ lw $v0, ($s0) -/* CF2F40 80240370 30420008 */ andi $v0, $v0, 8 -/* CF2F44 80240374 1040000A */ beqz $v0, .L802403A0 -/* CF2F48 80240378 4600C106 */ mov.s $f4, $f24 -/* CF2F4C 8024037C 4614C081 */ sub.s $f2, $f24, $f20 -/* CF2F50 80240380 3C018024 */ lui $at, 0x8024 -/* CF2F54 80240384 D4204EE8 */ ldc1 $f0, 0x4ee8($at) -/* CF2F58 80240388 460010A1 */ cvt.d.s $f2, $f2 -/* CF2F5C 8024038C 46201082 */ mul.d $f2, $f2, $f0 -/* CF2F60 80240390 00000000 */ nop -/* CF2F64 80240394 4600A021 */ cvt.d.s $f0, $f20 -/* CF2F68 80240398 08090101 */ j .L80240404 -/* CF2F6C 8024039C 46220000 */ add.d $f0, $f0, $f2 -.L802403A0: -/* CF2F70 802403A0 27A50028 */ addiu $a1, $sp, 0x28 -/* CF2F74 802403A4 27A6002C */ addiu $a2, $sp, 0x2c -/* CF2F78 802403A8 C6000038 */ lwc1 $f0, 0x38($s0) -/* CF2F7C 802403AC C6020040 */ lwc1 $f2, 0x40($s0) -/* CF2F80 802403B0 3C01447A */ lui $at, 0x447a -/* CF2F84 802403B4 44812000 */ mtc1 $at, $f4 -/* CF2F88 802403B8 27A20034 */ addiu $v0, $sp, 0x34 -/* CF2F8C 802403BC E7B4002C */ swc1 $f20, 0x2c($sp) -/* CF2F90 802403C0 E7A00028 */ swc1 $f0, 0x28($sp) -/* CF2F94 802403C4 E7A20030 */ swc1 $f2, 0x30($sp) -/* CF2F98 802403C8 E7A40034 */ swc1 $f4, 0x34($sp) -/* CF2F9C 802403CC AFA20010 */ sw $v0, 0x10($sp) -/* CF2FA0 802403D0 8E040080 */ lw $a0, 0x80($s0) -/* CF2FA4 802403D4 0C0372DF */ jal func_800DCB7C -/* CF2FA8 802403D8 27A70030 */ addiu $a3, $sp, 0x30 -/* CF2FAC 802403DC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* CF2FB0 802403E0 461A2100 */ add.s $f4, $f4, $f26 -/* CF2FB4 802403E4 46142081 */ sub.s $f2, $f4, $f20 -/* CF2FB8 802403E8 3C018024 */ lui $at, 0x8024 -/* CF2FBC 802403EC D4204EF0 */ ldc1 $f0, 0x4ef0($at) -/* CF2FC0 802403F0 460010A1 */ cvt.d.s $f2, $f2 -/* CF2FC4 802403F4 46201082 */ mul.d $f2, $f2, $f0 -/* CF2FC8 802403F8 00000000 */ nop -/* CF2FCC 802403FC 4600A021 */ cvt.d.s $f0, $f20 -/* CF2FD0 80240400 46220000 */ add.d $f0, $f0, $f2 -.L80240404: -/* CF2FD4 80240404 46200020 */ cvt.s.d $f0, $f0 -/* CF2FD8 80240408 E600003C */ swc1 $f0, 0x3c($s0) -/* CF2FDC 8024040C C600003C */ lwc1 $f0, 0x3c($s0) -/* CF2FE0 80240410 46002001 */ sub.s $f0, $f4, $f0 -/* CF2FE4 80240414 3C013FF0 */ lui $at, 0x3ff0 -/* CF2FE8 80240418 44811800 */ mtc1 $at, $f3 -/* CF2FEC 8024041C 44801000 */ mtc1 $zero, $f2 -/* CF2FF0 80240420 46000005 */ abs.s $f0, $f0 -/* CF2FF4 80240424 46000021 */ cvt.d.s $f0, $f0 -/* CF2FF8 80240428 4622003C */ c.lt.d $f0, $f2 -/* CF2FFC 8024042C 00000000 */ nop -/* CF3000 80240430 45000036 */ bc1f .L8024050C -/* CF3004 80240434 2403FFEF */ addiu $v1, $zero, -0x11 -/* CF3008 80240438 E604003C */ swc1 $f4, 0x3c($s0) -/* CF300C 8024043C 8E22006C */ lw $v0, 0x6c($s1) -/* CF3010 80240440 00431024 */ and $v0, $v0, $v1 -/* CF3014 80240444 08090143 */ j .L8024050C -/* CF3018 80240448 AE22006C */ sw $v0, 0x6c($s1) -.L8024044C: -/* CF301C 8024044C 8E220070 */ lw $v0, 0x70($s1) -/* CF3020 80240450 1840002E */ blez $v0, .L8024050C -/* CF3024 80240454 00000000 */ nop -/* CF3028 80240458 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CF302C 8024045C 0C00A8BB */ jal sin_deg -/* CF3030 80240460 46806320 */ cvt.s.w $f12, $f12 -/* CF3034 80240464 8E020000 */ lw $v0, ($s0) -/* CF3038 80240468 30420008 */ andi $v0, $v0, 8 -/* CF303C 8024046C 10400003 */ beqz $v0, .L8024047C -/* CF3040 80240470 46000506 */ mov.s $f20, $f0 -/* CF3044 80240474 0809012F */ j .L802404BC -/* CF3048 80240478 0000102D */ daddu $v0, $zero, $zero -.L8024047C: -/* CF304C 8024047C 27A50028 */ addiu $a1, $sp, 0x28 -/* CF3050 80240480 27A6002C */ addiu $a2, $sp, 0x2c -/* CF3054 80240484 C6000038 */ lwc1 $f0, 0x38($s0) -/* CF3058 80240488 C602003C */ lwc1 $f2, 0x3c($s0) -/* CF305C 8024048C C6040040 */ lwc1 $f4, 0x40($s0) -/* CF3060 80240490 3C01447A */ lui $at, 0x447a -/* CF3064 80240494 44813000 */ mtc1 $at, $f6 -/* CF3068 80240498 27A20034 */ addiu $v0, $sp, 0x34 -/* CF306C 8024049C E7A00028 */ swc1 $f0, 0x28($sp) -/* CF3070 802404A0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CF3074 802404A4 E7A40030 */ swc1 $f4, 0x30($sp) -/* CF3078 802404A8 E7A60034 */ swc1 $f6, 0x34($sp) -/* CF307C 802404AC AFA20010 */ sw $v0, 0x10($sp) -/* CF3080 802404B0 8E040080 */ lw $a0, 0x80($s0) -/* CF3084 802404B4 0C0372DF */ jal func_800DCB7C -/* CF3088 802404B8 27A70030 */ addiu $a3, $sp, 0x30 -.L802404BC: -/* CF308C 802404BC 10400007 */ beqz $v0, .L802404DC -/* CF3090 802404C0 00000000 */ nop -/* CF3094 802404C4 4616A082 */ mul.s $f2, $f20, $f22 -/* CF3098 802404C8 00000000 */ nop -/* CF309C 802404CC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CF30A0 802404D0 461A0000 */ add.s $f0, $f0, $f26 -/* CF30A4 802404D4 0809013A */ j .L802404E8 -/* CF30A8 802404D8 46020000 */ add.s $f0, $f0, $f2 -.L802404DC: -/* CF30AC 802404DC 4616A002 */ mul.s $f0, $f20, $f22 -/* CF30B0 802404E0 00000000 */ nop -/* CF30B4 802404E4 4600C000 */ add.s $f0, $f24, $f0 -.L802404E8: -/* CF30B8 802404E8 E600003C */ swc1 $f0, 0x3c($s0) -/* CF30BC 802404EC 8E220074 */ lw $v0, 0x74($s1) -/* CF30C0 802404F0 2442000A */ addiu $v0, $v0, 0xa -/* CF30C4 802404F4 44826000 */ mtc1 $v0, $f12 -/* CF30C8 802404F8 00000000 */ nop -/* CF30CC 802404FC 0C00A6C9 */ jal clamp_angle -/* CF30D0 80240500 46806320 */ cvt.s.w $f12, $f12 -/* CF30D4 80240504 4600020D */ trunc.w.s $f8, $f0 -/* CF30D8 80240508 E6280074 */ swc1 $f8, 0x74($s1) -.L8024050C: -/* CF30DC 8024050C 8E220090 */ lw $v0, 0x90($s1) -/* CF30E0 80240510 1C40004A */ bgtz $v0, .L8024063C -/* CF30E4 80240514 2442FFFF */ addiu $v0, $v0, -1 -/* CF30E8 80240518 8E430014 */ lw $v1, 0x14($s2) -/* CF30EC 8024051C 04600048 */ bltz $v1, .L80240640 -/* CF30F0 80240520 00000000 */ nop -/* CF30F4 80240524 8E620074 */ lw $v0, 0x74($s3) -/* CF30F8 80240528 1C400042 */ bgtz $v0, .L80240634 -/* CF30FC 8024052C 2442FFFF */ addiu $v0, $v0, -1 -/* CF3100 80240530 AE630074 */ sw $v1, 0x74($s3) -/* CF3104 80240534 860200A8 */ lh $v0, 0xa8($s0) -/* CF3108 80240538 C602003C */ lwc1 $f2, 0x3c($s0) -/* CF310C 8024053C 44820000 */ mtc1 $v0, $f0 -/* CF3110 80240540 00000000 */ nop -/* CF3114 80240544 46800020 */ cvt.s.w $f0, $f0 -/* CF3118 80240548 46001080 */ add.s $f2, $f2, $f0 -/* CF311C 8024054C 3C014024 */ lui $at, 0x4024 -/* CF3120 80240550 44810800 */ mtc1 $at, $f1 -/* CF3124 80240554 44800000 */ mtc1 $zero, $f0 -/* CF3128 80240558 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CF312C 8024055C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CF3130 80240560 460010A1 */ cvt.d.s $f2, $f2 -/* CF3134 80240564 46201080 */ add.d $f2, $f2, $f0 -/* CF3138 80240568 C440002C */ lwc1 $f0, 0x2c($v0) -/* CF313C 8024056C 46000021 */ cvt.d.s $f0, $f0 -/* CF3140 80240570 4622003C */ c.lt.d $f0, $f2 -/* CF3144 80240574 00000000 */ nop -/* CF3148 80240578 4500002C */ bc1f .L8024062C -/* CF314C 8024057C 02A0202D */ daddu $a0, $s5, $zero -/* CF3150 80240580 AFA00010 */ sw $zero, 0x10($sp) -/* CF3154 80240584 8E46000C */ lw $a2, 0xc($s2) -/* CF3158 80240588 8E470010 */ lw $a3, 0x10($s2) -/* CF315C 8024058C 0C01242D */ jal func_800490B4 -/* CF3160 80240590 0220282D */ daddu $a1, $s1, $zero -/* CF3164 80240594 10400025 */ beqz $v0, .L8024062C -/* CF3168 80240598 0000202D */ daddu $a0, $zero, $zero -/* CF316C 8024059C 0200282D */ daddu $a1, $s0, $zero -/* CF3170 802405A0 0000302D */ daddu $a2, $zero, $zero -/* CF3174 802405A4 2412000C */ addiu $s2, $zero, 0xc -/* CF3178 802405A8 860300A8 */ lh $v1, 0xa8($s0) -/* CF317C 802405AC 3C013F80 */ lui $at, 0x3f80 -/* CF3180 802405B0 44810000 */ mtc1 $at, $f0 -/* CF3184 802405B4 3C014000 */ lui $at, 0x4000 -/* CF3188 802405B8 44811000 */ mtc1 $at, $f2 -/* CF318C 802405BC 3C01C1A0 */ lui $at, 0xc1a0 -/* CF3190 802405C0 44812000 */ mtc1 $at, $f4 -/* CF3194 802405C4 44834000 */ mtc1 $v1, $f8 -/* CF3198 802405C8 00000000 */ nop -/* CF319C 802405CC 46804220 */ cvt.s.w $f8, $f8 -/* CF31A0 802405D0 44074000 */ mfc1 $a3, $f8 -/* CF31A4 802405D4 27A20038 */ addiu $v0, $sp, 0x38 -/* CF31A8 802405D8 AFB2001C */ sw $s2, 0x1c($sp) -/* CF31AC 802405DC AFA20020 */ sw $v0, 0x20($sp) -/* CF31B0 802405E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* CF31B4 802405E4 E7A20014 */ swc1 $f2, 0x14($sp) -/* CF31B8 802405E8 0C01BFA4 */ jal fx_emote -/* CF31BC 802405EC E7A40018 */ swc1 $f4, 0x18($sp) -/* CF31C0 802405F0 0200202D */ daddu $a0, $s0, $zero -/* CF31C4 802405F4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CF31C8 802405F8 C480003C */ lwc1 $f0, 0x3c($a0) -/* CF31CC 802405FC 3C060020 */ lui $a2, 0x20 -/* CF31D0 80240600 0C012530 */ jal func_800494C0 -/* CF31D4 80240604 E4800064 */ swc1 $f0, 0x64($a0) -/* CF31D8 80240608 8E220018 */ lw $v0, 0x18($s1) -/* CF31DC 8024060C 9442002A */ lhu $v0, 0x2a($v0) -/* CF31E0 80240610 30420001 */ andi $v0, $v0, 1 -/* CF31E4 80240614 10400003 */ beqz $v0, .L80240624 -/* CF31E8 80240618 2402000A */ addiu $v0, $zero, 0xa -/* CF31EC 8024061C 080901F9 */ j .L802407E4 -/* CF31F0 80240620 AE620070 */ sw $v0, 0x70($s3) -.L80240624: -/* CF31F4 80240624 080901F9 */ j .L802407E4 -/* CF31F8 80240628 AE720070 */ sw $s2, 0x70($s3) -.L8024062C: -/* CF31FC 8024062C 8E620074 */ lw $v0, 0x74($s3) -/* CF3200 80240630 2442FFFF */ addiu $v0, $v0, -1 -.L80240634: -/* CF3204 80240634 08090190 */ j .L80240640 -/* CF3208 80240638 AE620074 */ sw $v0, 0x74($s3) -.L8024063C: -/* CF320C 8024063C AE220090 */ sw $v0, 0x90($s1) -.L80240640: -/* CF3210 80240640 8E2300D0 */ lw $v1, 0xd0($s1) -/* CF3214 80240644 C6000040 */ lwc1 $f0, 0x40($s0) -/* CF3218 80240648 C4620000 */ lwc1 $f2, ($v1) -/* CF321C 8024064C 468010A0 */ cvt.s.w $f2, $f2 -/* CF3220 80240650 C4640008 */ lwc1 $f4, 8($v1) -/* CF3224 80240654 46802120 */ cvt.s.w $f4, $f4 -/* CF3228 80240658 E7A00010 */ swc1 $f0, 0x10($sp) -/* CF322C 8024065C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CF3230 80240660 44051000 */ mfc1 $a1, $f2 -/* CF3234 80240664 C440000C */ lwc1 $f0, 0xc($v0) -/* CF3238 80240668 46800020 */ cvt.s.w $f0, $f0 -/* CF323C 8024066C E7A00014 */ swc1 $f0, 0x14($sp) -/* CF3240 80240670 8E2200D0 */ lw $v0, 0xd0($s1) -/* CF3244 80240674 44062000 */ mfc1 $a2, $f4 -/* CF3248 80240678 C4400010 */ lwc1 $f0, 0x10($v0) -/* CF324C 8024067C 46800020 */ cvt.s.w $f0, $f0 -/* CF3250 80240680 E7A00018 */ swc1 $f0, 0x18($sp) -/* CF3254 80240684 8C640018 */ lw $a0, 0x18($v1) -/* CF3258 80240688 0C0123F5 */ jal is_point_within_region -/* CF325C 8024068C 8E070038 */ lw $a3, 0x38($s0) -/* CF3260 80240690 1040001A */ beqz $v0, .L802406FC -/* CF3264 80240694 00000000 */ nop -/* CF3268 80240698 8E060038 */ lw $a2, 0x38($s0) -/* CF326C 8024069C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CF3270 802406A0 8E070040 */ lw $a3, 0x40($s0) -/* CF3274 802406A4 C44C0000 */ lwc1 $f12, ($v0) -/* CF3278 802406A8 46806320 */ cvt.s.w $f12, $f12 -/* CF327C 802406AC C44E0008 */ lwc1 $f14, 8($v0) -/* CF3280 802406B0 0C00A7B5 */ jal dist2D -/* CF3284 802406B4 468073A0 */ cvt.s.w $f14, $f14 -/* CF3288 802406B8 C6020018 */ lwc1 $f2, 0x18($s0) -/* CF328C 802406BC 4600103C */ c.lt.s $f2, $f0 -/* CF3290 802406C0 00000000 */ nop -/* CF3294 802406C4 4500000D */ bc1f .L802406FC -/* CF3298 802406C8 E7A00034 */ swc1 $f0, 0x34($sp) -/* CF329C 802406CC C60C0038 */ lwc1 $f12, 0x38($s0) -/* CF32A0 802406D0 8E2200D0 */ lw $v0, 0xd0($s1) -/* CF32A4 802406D4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CF32A8 802406D8 C4480000 */ lwc1 $f8, ($v0) -/* CF32AC 802406DC 46804220 */ cvt.s.w $f8, $f8 -/* CF32B0 802406E0 44064000 */ mfc1 $a2, $f8 -/* CF32B4 802406E4 C4480008 */ lwc1 $f8, 8($v0) -/* CF32B8 802406E8 46804220 */ cvt.s.w $f8, $f8 -/* CF32BC 802406EC 44074000 */ mfc1 $a3, $f8 -/* CF32C0 802406F0 0C00A720 */ jal atan2 -/* CF32C4 802406F4 24140001 */ addiu $s4, $zero, 1 -/* CF32C8 802406F8 E600000C */ swc1 $f0, 0xc($s0) -.L802406FC: -/* CF32CC 802406FC 8E2200D0 */ lw $v0, 0xd0($s1) -/* CF32D0 80240700 8C43000C */ lw $v1, 0xc($v0) -/* CF32D4 80240704 8C420010 */ lw $v0, 0x10($v0) -/* CF32D8 80240708 00621825 */ or $v1, $v1, $v0 -/* CF32DC 8024070C 00741825 */ or $v1, $v1, $s4 -/* CF32E0 80240710 10600008 */ beqz $v1, .L80240734 -/* CF32E4 80240714 00000000 */ nop -/* CF32E8 80240718 8602008C */ lh $v0, 0x8c($s0) -/* CF32EC 8024071C 14400031 */ bnez $v0, .L802407E4 -/* CF32F0 80240720 00000000 */ nop -/* CF32F4 80240724 8E050018 */ lw $a1, 0x18($s0) -/* CF32F8 80240728 8E06000C */ lw $a2, 0xc($s0) -/* CF32FC 8024072C 0C00EA95 */ jal npc_move_heading -/* CF3300 80240730 0200202D */ daddu $a0, $s0, $zero -.L80240734: -/* CF3304 80240734 C600003C */ lwc1 $f0, 0x3c($s0) -/* CF3308 80240738 3C014059 */ lui $at, 0x4059 -/* CF330C 8024073C 44811800 */ mtc1 $at, $f3 -/* CF3310 80240740 44801000 */ mtc1 $zero, $f2 -/* CF3314 80240744 46000021 */ cvt.d.s $f0, $f0 -/* CF3318 80240748 46220002 */ mul.d $f0, $f0, $f2 -/* CF331C 8024074C 00000000 */ nop -/* CF3320 80240750 4620020D */ trunc.w.d $f8, $f0 -/* CF3324 80240754 E628007C */ swc1 $f8, 0x7c($s1) -/* CF3328 80240758 8E420004 */ lw $v0, 4($s2) -/* CF332C 8024075C 18400021 */ blez $v0, .L802407E4 -/* CF3330 80240760 00000000 */ nop -/* CF3334 80240764 8602008E */ lh $v0, 0x8e($s0) -/* CF3338 80240768 9603008E */ lhu $v1, 0x8e($s0) -/* CF333C 8024076C 18400005 */ blez $v0, .L80240784 -/* CF3340 80240770 2462FFFF */ addiu $v0, $v1, -1 -/* CF3344 80240774 A602008E */ sh $v0, 0x8e($s0) -/* CF3348 80240778 00021400 */ sll $v0, $v0, 0x10 -/* CF334C 8024077C 1C400019 */ bgtz $v0, .L802407E4 -/* CF3350 80240780 00000000 */ nop -.L80240784: -/* CF3354 80240784 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CF3358 80240788 24020002 */ addiu $v0, $zero, 2 -/* CF335C 8024078C 0C00A67F */ jal rand_int -/* CF3360 80240790 AE620070 */ sw $v0, 0x70($s3) -/* CF3364 80240794 3C035555 */ lui $v1, 0x5555 -/* CF3368 80240798 34635556 */ ori $v1, $v1, 0x5556 -/* CF336C 8024079C 00430018 */ mult $v0, $v1 -/* CF3370 802407A0 000227C3 */ sra $a0, $v0, 0x1f -/* CF3374 802407A4 00004010 */ mfhi $t0 -/* CF3378 802407A8 01042023 */ subu $a0, $t0, $a0 -/* CF337C 802407AC 00041840 */ sll $v1, $a0, 1 -/* CF3380 802407B0 00641821 */ addu $v1, $v1, $a0 -/* CF3384 802407B4 00431023 */ subu $v0, $v0, $v1 -/* CF3388 802407B8 24430002 */ addiu $v1, $v0, 2 -/* CF338C 802407BC AE630074 */ sw $v1, 0x74($s3) -/* CF3390 802407C0 8E42002C */ lw $v0, 0x2c($s2) -/* CF3394 802407C4 58400007 */ blezl $v0, .L802407E4 -/* CF3398 802407C8 AE600070 */ sw $zero, 0x70($s3) -/* CF339C 802407CC 8E420008 */ lw $v0, 8($s2) -/* CF33A0 802407D0 18400003 */ blez $v0, .L802407E0 -/* CF33A4 802407D4 28620003 */ slti $v0, $v1, 3 -/* CF33A8 802407D8 10400002 */ beqz $v0, .L802407E4 -/* CF33AC 802407DC 00000000 */ nop -.L802407E0: -/* CF33B0 802407E0 AE600070 */ sw $zero, 0x70($s3) -.L802407E4: -/* CF33B4 802407E4 8FBF0058 */ lw $ra, 0x58($sp) -/* CF33B8 802407E8 8FB50054 */ lw $s5, 0x54($sp) -/* CF33BC 802407EC 8FB40050 */ lw $s4, 0x50($sp) -/* CF33C0 802407F0 8FB3004C */ lw $s3, 0x4c($sp) -/* CF33C4 802407F4 8FB20048 */ lw $s2, 0x48($sp) -/* CF33C8 802407F8 8FB10044 */ lw $s1, 0x44($sp) -/* CF33CC 802407FC 8FB00040 */ lw $s0, 0x40($sp) -/* CF33D0 80240800 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CF33D4 80240804 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CF33D8 80240808 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CF33DC 8024080C D7B40060 */ ldc1 $f20, 0x60($sp) -/* CF33E0 80240810 03E00008 */ jr $ra -/* CF33E4 80240814 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_80240C1C_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_80240C1C_CF2BD0.s deleted file mode 100644 index 0450f09162..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_80240C1C_CF2BD0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C1C_CF37EC -/* CF37EC 80240C1C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF37F0 80240C20 AFB20018 */ sw $s2, 0x18($sp) -/* CF37F4 80240C24 0080902D */ daddu $s2, $a0, $zero -/* CF37F8 80240C28 AFBF001C */ sw $ra, 0x1c($sp) -/* CF37FC 80240C2C AFB10014 */ sw $s1, 0x14($sp) -/* CF3800 80240C30 AFB00010 */ sw $s0, 0x10($sp) -/* CF3804 80240C34 8E510148 */ lw $s1, 0x148($s2) -/* CF3808 80240C38 0C00EABB */ jal get_npc_unsafe -/* CF380C 80240C3C 86240008 */ lh $a0, 8($s1) -/* CF3810 80240C40 0040802D */ daddu $s0, $v0, $zero -/* CF3814 80240C44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CF3818 80240C48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CF381C 80240C4C C60C0038 */ lwc1 $f12, 0x38($s0) -/* CF3820 80240C50 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CF3824 80240C54 A600008E */ sh $zero, 0x8e($s0) -/* CF3828 80240C58 8C460028 */ lw $a2, 0x28($v0) -/* CF382C 80240C5C 0C00A720 */ jal atan2 -/* CF3830 80240C60 8C470030 */ lw $a3, 0x30($v0) -/* CF3834 80240C64 E600000C */ swc1 $f0, 0xc($s0) -/* CF3838 80240C68 8E2200CC */ lw $v0, 0xcc($s1) -/* CF383C 80240C6C 8C420020 */ lw $v0, 0x20($v0) -/* CF3840 80240C70 AE020028 */ sw $v0, 0x28($s0) -/* CF3844 80240C74 2402000B */ addiu $v0, $zero, 0xb -/* CF3848 80240C78 AE420070 */ sw $v0, 0x70($s2) -/* CF384C 80240C7C 8FBF001C */ lw $ra, 0x1c($sp) -/* CF3850 80240C80 8FB20018 */ lw $s2, 0x18($sp) -/* CF3854 80240C84 8FB10014 */ lw $s1, 0x14($sp) -/* CF3858 80240C88 8FB00010 */ lw $s0, 0x10($sp) -/* CF385C 80240C8C 03E00008 */ jr $ra -/* CF3860 80240C90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_80240C94_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_80240C94_CF2BD0.s deleted file mode 100644 index 079faf0e99..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_80240C94_CF2BD0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C94_CF3864 -/* CF3864 80240C94 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF3868 80240C98 AFB00010 */ sw $s0, 0x10($sp) -/* CF386C 80240C9C 0080802D */ daddu $s0, $a0, $zero -/* CF3870 80240CA0 AFBF0014 */ sw $ra, 0x14($sp) -/* CF3874 80240CA4 8E020148 */ lw $v0, 0x148($s0) -/* CF3878 80240CA8 0C00EABB */ jal get_npc_unsafe -/* CF387C 80240CAC 84440008 */ lh $a0, 8($v0) -/* CF3880 80240CB0 9443008E */ lhu $v1, 0x8e($v0) -/* CF3884 80240CB4 C440003C */ lwc1 $f0, 0x3c($v0) -/* CF3888 80240CB8 24640001 */ addiu $a0, $v1, 1 -/* CF388C 80240CBC 00031C00 */ sll $v1, $v1, 0x10 -/* CF3890 80240CC0 00031B83 */ sra $v1, $v1, 0xe -/* CF3894 80240CC4 A444008E */ sh $a0, 0x8e($v0) -/* CF3898 80240CC8 3C018024 */ lui $at, 0x8024 -/* CF389C 80240CCC 00230821 */ addu $at, $at, $v1 -/* CF38A0 80240CD0 C422291C */ lwc1 $f2, 0x291c($at) -/* CF38A4 80240CD4 8443008E */ lh $v1, 0x8e($v0) -/* CF38A8 80240CD8 46020000 */ add.s $f0, $f0, $f2 -/* CF38AC 80240CDC 28630005 */ slti $v1, $v1, 5 -/* CF38B0 80240CE0 14600003 */ bnez $v1, .L80240CF0 -/* CF38B4 80240CE4 E440003C */ swc1 $f0, 0x3c($v0) -/* CF38B8 80240CE8 2402000C */ addiu $v0, $zero, 0xc -/* CF38BC 80240CEC AE020070 */ sw $v0, 0x70($s0) -.L80240CF0: -/* CF38C0 80240CF0 8FBF0014 */ lw $ra, 0x14($sp) -/* CF38C4 80240CF4 8FB00010 */ lw $s0, 0x10($sp) -/* CF38C8 80240CF8 03E00008 */ jr $ra -/* CF38CC 80240CFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_80240D00_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_80240D00_CF2BD0.s deleted file mode 100644 index 294fa3a1c3..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_80240D00_CF2BD0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D00_CF38D0 -/* CF38D0 80240D00 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CF38D4 80240D04 AFB3001C */ sw $s3, 0x1c($sp) -/* CF38D8 80240D08 0080982D */ daddu $s3, $a0, $zero -/* CF38DC 80240D0C AFBF0020 */ sw $ra, 0x20($sp) -/* CF38E0 80240D10 AFB20018 */ sw $s2, 0x18($sp) -/* CF38E4 80240D14 AFB10014 */ sw $s1, 0x14($sp) -/* CF38E8 80240D18 AFB00010 */ sw $s0, 0x10($sp) -/* CF38EC 80240D1C 8E720148 */ lw $s2, 0x148($s3) -/* CF38F0 80240D20 86440008 */ lh $a0, 8($s2) -/* CF38F4 80240D24 0C00EABB */ jal get_npc_unsafe -/* CF38F8 80240D28 00A0802D */ daddu $s0, $a1, $zero -/* CF38FC 80240D2C 0040882D */ daddu $s1, $v0, $zero -/* CF3900 80240D30 C6420080 */ lwc1 $f2, 0x80($s2) -/* CF3904 80240D34 468010A0 */ cvt.s.w $f2, $f2 -/* CF3908 80240D38 460010A1 */ cvt.d.s $f2, $f2 -/* CF390C 80240D3C C6400084 */ lwc1 $f0, 0x84($s2) -/* CF3910 80240D40 46800020 */ cvt.s.w $f0, $f0 -/* CF3914 80240D44 46000021 */ cvt.d.s $f0, $f0 -/* CF3918 80240D48 3C014059 */ lui $at, 0x4059 -/* CF391C 80240D4C 44812800 */ mtc1 $at, $f5 -/* CF3920 80240D50 44802000 */ mtc1 $zero, $f4 -/* CF3924 80240D54 8E4200CC */ lw $v0, 0xcc($s2) -/* CF3928 80240D58 C62C0038 */ lwc1 $f12, 0x38($s1) -/* CF392C 80240D5C C62E0040 */ lwc1 $f14, 0x40($s1) -/* CF3930 80240D60 46241083 */ div.d $f2, $f2, $f4 -/* CF3934 80240D64 462010A0 */ cvt.s.d $f2, $f2 -/* CF3938 80240D68 46240003 */ div.d $f0, $f0, $f4 -/* CF393C 80240D6C 8C420020 */ lw $v0, 0x20($v0) -/* CF3940 80240D70 46200020 */ cvt.s.d $f0, $f0 -/* CF3944 80240D74 E622001C */ swc1 $f2, 0x1c($s1) -/* CF3948 80240D78 E6200014 */ swc1 $f0, 0x14($s1) -/* CF394C 80240D7C AE220028 */ sw $v0, 0x28($s1) -/* CF3950 80240D80 C6000018 */ lwc1 $f0, 0x18($s0) -/* CF3954 80240D84 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CF3958 80240D88 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CF395C 80240D8C E6200018 */ swc1 $f0, 0x18($s1) -/* CF3960 80240D90 8C460028 */ lw $a2, 0x28($v0) -/* CF3964 80240D94 0C00A720 */ jal atan2 -/* CF3968 80240D98 8C470030 */ lw $a3, 0x30($v0) -/* CF396C 80240D9C E620000C */ swc1 $f0, 0xc($s1) -/* CF3970 80240DA0 8E420018 */ lw $v0, 0x18($s2) -/* CF3974 80240DA4 AE400074 */ sw $zero, 0x74($s2) -/* CF3978 80240DA8 9442002A */ lhu $v0, 0x2a($v0) -/* CF397C 80240DAC 30420002 */ andi $v0, $v0, 2 -/* CF3980 80240DB0 10400005 */ beqz $v0, .L80240DC8 -/* CF3984 80240DB4 24020003 */ addiu $v0, $zero, 3 -/* CF3988 80240DB8 A622008E */ sh $v0, 0x8e($s1) -/* CF398C 80240DBC 2402000D */ addiu $v0, $zero, 0xd -/* CF3990 80240DC0 08090386 */ j .L80240E18 -/* CF3994 80240DC4 AE620070 */ sw $v0, 0x70($s3) -.L80240DC8: -/* CF3998 80240DC8 24030001 */ addiu $v1, $zero, 1 -/* CF399C 80240DCC 2402000E */ addiu $v0, $zero, 0xe -/* CF39A0 80240DD0 A623008E */ sh $v1, 0x8e($s1) -/* CF39A4 80240DD4 AE620070 */ sw $v0, 0x70($s3) -/* CF39A8 80240DD8 C6200038 */ lwc1 $f0, 0x38($s1) -/* CF39AC 80240DDC 4600018D */ trunc.w.s $f6, $f0 -/* CF39B0 80240DE0 44023000 */ mfc1 $v0, $f6 -/* CF39B4 80240DE4 00000000 */ nop -/* CF39B8 80240DE8 A6420010 */ sh $v0, 0x10($s2) -/* CF39BC 80240DEC C620003C */ lwc1 $f0, 0x3c($s1) -/* CF39C0 80240DF0 4600018D */ trunc.w.s $f6, $f0 -/* CF39C4 80240DF4 44023000 */ mfc1 $v0, $f6 -/* CF39C8 80240DF8 00000000 */ nop -/* CF39CC 80240DFC A6420012 */ sh $v0, 0x12($s2) -/* CF39D0 80240E00 C6200040 */ lwc1 $f0, 0x40($s1) -/* CF39D4 80240E04 A2430007 */ sb $v1, 7($s2) -/* CF39D8 80240E08 4600018D */ trunc.w.s $f6, $f0 -/* CF39DC 80240E0C 44023000 */ mfc1 $v0, $f6 -/* CF39E0 80240E10 00000000 */ nop -/* CF39E4 80240E14 A6420014 */ sh $v0, 0x14($s2) -.L80240E18: -/* CF39E8 80240E18 8FBF0020 */ lw $ra, 0x20($sp) -/* CF39EC 80240E1C 8FB3001C */ lw $s3, 0x1c($sp) -/* CF39F0 80240E20 8FB20018 */ lw $s2, 0x18($sp) -/* CF39F4 80240E24 8FB10014 */ lw $s1, 0x14($sp) -/* CF39F8 80240E28 8FB00010 */ lw $s0, 0x10($sp) -/* CF39FC 80240E2C 03E00008 */ jr $ra -/* CF3A00 80240E30 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_80240E34_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_80240E34_CF2BD0.s deleted file mode 100644 index 31b08adfb8..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_80240E34_CF2BD0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E34_CF3A04 -/* CF3A04 80240E34 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF3A08 80240E38 AFB00010 */ sw $s0, 0x10($sp) -/* CF3A0C 80240E3C 0080802D */ daddu $s0, $a0, $zero -/* CF3A10 80240E40 AFBF0014 */ sw $ra, 0x14($sp) -/* CF3A14 80240E44 8E020148 */ lw $v0, 0x148($s0) -/* CF3A18 80240E48 0C00EABB */ jal get_npc_unsafe -/* CF3A1C 80240E4C 84440008 */ lh $a0, 8($v0) -/* CF3A20 80240E50 0040202D */ daddu $a0, $v0, $zero -/* CF3A24 80240E54 8482008E */ lh $v0, 0x8e($a0) -/* CF3A28 80240E58 9483008E */ lhu $v1, 0x8e($a0) -/* CF3A2C 80240E5C 18400005 */ blez $v0, .L80240E74 -/* CF3A30 80240E60 2462FFFF */ addiu $v0, $v1, -1 -/* CF3A34 80240E64 A482008E */ sh $v0, 0x8e($a0) -/* CF3A38 80240E68 00021400 */ sll $v0, $v0, 0x10 -/* CF3A3C 80240E6C 1C400006 */ bgtz $v0, .L80240E88 -/* CF3A40 80240E70 00000000 */ nop -.L80240E74: -/* CF3A44 80240E74 8482008C */ lh $v0, 0x8c($a0) -/* CF3A48 80240E78 14400003 */ bnez $v0, .L80240E88 -/* CF3A4C 80240E7C 2402000E */ addiu $v0, $zero, 0xe -/* CF3A50 80240E80 A480008E */ sh $zero, 0x8e($a0) -/* CF3A54 80240E84 AE020070 */ sw $v0, 0x70($s0) -.L80240E88: -/* CF3A58 80240E88 8FBF0014 */ lw $ra, 0x14($sp) -/* CF3A5C 80240E8C 8FB00010 */ lw $s0, 0x10($sp) -/* CF3A60 80240E90 03E00008 */ jr $ra -/* CF3A64 80240E94 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_80240E98_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_80240E98_CF2BD0.s deleted file mode 100644 index f5d4f90c2b..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_80240E98_CF2BD0.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E98_CF3A68 -/* CF3A68 80240E98 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CF3A6C 80240E9C AFB20030 */ sw $s2, 0x30($sp) -/* CF3A70 80240EA0 0080902D */ daddu $s2, $a0, $zero -/* CF3A74 80240EA4 AFBF0038 */ sw $ra, 0x38($sp) -/* CF3A78 80240EA8 AFB30034 */ sw $s3, 0x34($sp) -/* CF3A7C 80240EAC AFB1002C */ sw $s1, 0x2c($sp) -/* CF3A80 80240EB0 AFB00028 */ sw $s0, 0x28($sp) -/* CF3A84 80240EB4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* CF3A88 80240EB8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* CF3A8C 80240EBC 8E510148 */ lw $s1, 0x148($s2) -/* CF3A90 80240EC0 86240008 */ lh $a0, 8($s1) -/* CF3A94 80240EC4 0C00EABB */ jal get_npc_unsafe -/* CF3A98 80240EC8 00A0982D */ daddu $s3, $a1, $zero -/* CF3A9C 80240ECC 0040802D */ daddu $s0, $v0, $zero -/* CF3AA0 80240ED0 0200202D */ daddu $a0, $s0, $zero -/* CF3AA4 80240ED4 C6220088 */ lwc1 $f2, 0x88($s1) -/* CF3AA8 80240ED8 468010A0 */ cvt.s.w $f2, $f2 -/* CF3AAC 80240EDC 460010A1 */ cvt.d.s $f2, $f2 -/* CF3AB0 80240EE0 C604001C */ lwc1 $f4, 0x1c($s0) -/* CF3AB4 80240EE4 C6000014 */ lwc1 $f0, 0x14($s0) -/* CF3AB8 80240EE8 8E050018 */ lw $a1, 0x18($s0) -/* CF3ABC 80240EEC 46002100 */ add.s $f4, $f4, $f0 -/* CF3AC0 80240EF0 8E06000C */ lw $a2, 0xc($s0) -/* CF3AC4 80240EF4 C6200078 */ lwc1 $f0, 0x78($s1) -/* CF3AC8 80240EF8 46800020 */ cvt.s.w $f0, $f0 -/* CF3ACC 80240EFC E604001C */ swc1 $f4, 0x1c($s0) -/* CF3AD0 80240F00 3C014059 */ lui $at, 0x4059 -/* CF3AD4 80240F04 44812800 */ mtc1 $at, $f5 -/* CF3AD8 80240F08 44802000 */ mtc1 $zero, $f4 -/* CF3ADC 80240F0C 46000021 */ cvt.d.s $f0, $f0 -/* CF3AE0 80240F10 46240003 */ div.d $f0, $f0, $f4 -/* CF3AE4 80240F14 46200520 */ cvt.s.d $f20, $f0 -/* CF3AE8 80240F18 46241083 */ div.d $f2, $f2, $f4 -/* CF3AEC 80240F1C 0C00EA95 */ jal npc_move_heading -/* CF3AF0 80240F20 462015A0 */ cvt.s.d $f22, $f2 -/* CF3AF4 80240F24 C604001C */ lwc1 $f4, 0x1c($s0) -/* CF3AF8 80240F28 44801000 */ mtc1 $zero, $f2 -/* CF3AFC 80240F2C 44801800 */ mtc1 $zero, $f3 -/* CF3B00 80240F30 46002021 */ cvt.d.s $f0, $f4 -/* CF3B04 80240F34 4620103E */ c.le.d $f2, $f0 -/* CF3B08 80240F38 00000000 */ nop -/* CF3B0C 80240F3C 45000030 */ bc1f .L80241000 -/* CF3B10 80240F40 00000000 */ nop -/* CF3B14 80240F44 C600003C */ lwc1 $f0, 0x3c($s0) -/* CF3B18 80240F48 46040000 */ add.s $f0, $f0, $f4 -/* CF3B1C 80240F4C E600003C */ swc1 $f0, 0x3c($s0) -/* CF3B20 80240F50 8E2200CC */ lw $v0, 0xcc($s1) -/* CF3B24 80240F54 8C420024 */ lw $v0, 0x24($v0) -/* CF3B28 80240F58 AE020028 */ sw $v0, 0x28($s0) -/* CF3B2C 80240F5C A2200007 */ sb $zero, 7($s1) -/* CF3B30 80240F60 8E020000 */ lw $v0, ($s0) -/* CF3B34 80240F64 30420008 */ andi $v0, $v0, 8 -/* CF3B38 80240F68 14400011 */ bnez $v0, .L80240FB0 -/* CF3B3C 80240F6C 0000102D */ daddu $v0, $zero, $zero -/* CF3B40 80240F70 27A50018 */ addiu $a1, $sp, 0x18 -/* CF3B44 80240F74 27A6001C */ addiu $a2, $sp, 0x1c -/* CF3B48 80240F78 C6000038 */ lwc1 $f0, 0x38($s0) -/* CF3B4C 80240F7C C602003C */ lwc1 $f2, 0x3c($s0) -/* CF3B50 80240F80 C6040040 */ lwc1 $f4, 0x40($s0) -/* CF3B54 80240F84 3C01447A */ lui $at, 0x447a -/* CF3B58 80240F88 44813000 */ mtc1 $at, $f6 -/* CF3B5C 80240F8C 27A20024 */ addiu $v0, $sp, 0x24 -/* CF3B60 80240F90 E7A00018 */ swc1 $f0, 0x18($sp) -/* CF3B64 80240F94 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CF3B68 80240F98 E7A40020 */ swc1 $f4, 0x20($sp) -/* CF3B6C 80240F9C E7A60024 */ swc1 $f6, 0x24($sp) -/* CF3B70 80240FA0 AFA20010 */ sw $v0, 0x10($sp) -/* CF3B74 80240FA4 8E040080 */ lw $a0, 0x80($s0) -/* CF3B78 80240FA8 0C0372DF */ jal func_800DCB7C -/* CF3B7C 80240FAC 27A70020 */ addiu $a3, $sp, 0x20 -.L80240FB0: -/* CF3B80 80240FB0 1040000B */ beqz $v0, .L80240FE0 -/* CF3B84 80240FB4 00000000 */ nop -/* CF3B88 80240FB8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CF3B8C 80240FBC 46140080 */ add.s $f2, $f0, $f20 -/* CF3B90 80240FC0 C600003C */ lwc1 $f0, 0x3c($s0) -/* CF3B94 80240FC4 4600103E */ c.le.s $f2, $f0 -/* CF3B98 80240FC8 00000000 */ nop -/* CF3B9C 80240FCC 4500008D */ bc1f .L80241204 -/* CF3BA0 80240FD0 00000000 */ nop -/* CF3BA4 80240FD4 E602003C */ swc1 $f2, 0x3c($s0) -/* CF3BA8 80240FD8 08090481 */ j .L80241204 -/* CF3BAC 80240FDC AE400070 */ sw $zero, 0x70($s2) -.L80240FE0: -/* CF3BB0 80240FE0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CF3BB4 80240FE4 C6000064 */ lwc1 $f0, 0x64($s0) -/* CF3BB8 80240FE8 4602003E */ c.le.s $f0, $f2 -/* CF3BBC 80240FEC 00000000 */ nop -/* CF3BC0 80240FF0 45030084 */ bc1tl .L80241204 -/* CF3BC4 80240FF4 AE400070 */ sw $zero, 0x70($s2) -/* CF3BC8 80240FF8 08090481 */ j .L80241204 -/* CF3BCC 80240FFC 00000000 */ nop -.L80241000: -/* CF3BD0 80241000 4622003C */ c.lt.d $f0, $f2 -/* CF3BD4 80241004 00000000 */ nop -/* CF3BD8 80241008 4500007E */ bc1f .L80241204 -/* CF3BDC 8024100C 00000000 */ nop -/* CF3BE0 80241010 9602008E */ lhu $v0, 0x8e($s0) -/* CF3BE4 80241014 24420001 */ addiu $v0, $v0, 1 -/* CF3BE8 80241018 A602008E */ sh $v0, 0x8e($s0) -/* CF3BEC 8024101C 00021400 */ sll $v0, $v0, 0x10 -/* CF3BF0 80241020 8E630020 */ lw $v1, 0x20($s3) -/* CF3BF4 80241024 00021403 */ sra $v0, $v0, 0x10 -/* CF3BF8 80241028 0043102A */ slt $v0, $v0, $v1 -/* CF3BFC 8024102C 14400026 */ bnez $v0, .L802410C8 -/* CF3C00 80241030 00000000 */ nop -/* CF3C04 80241034 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CF3C08 80241038 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CF3C0C 8024103C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CF3C10 80241040 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CF3C14 80241044 A600008E */ sh $zero, 0x8e($s0) -/* CF3C18 80241048 8C460028 */ lw $a2, 0x28($v0) -/* CF3C1C 8024104C 0C00A720 */ jal atan2 -/* CF3C20 80241050 8C470030 */ lw $a3, 0x30($v0) -/* CF3C24 80241054 46000506 */ mov.s $f20, $f0 -/* CF3C28 80241058 C60C000C */ lwc1 $f12, 0xc($s0) -/* CF3C2C 8024105C 0C00A70A */ jal get_clamped_angle_diff -/* CF3C30 80241060 4600A386 */ mov.s $f14, $f20 -/* CF3C34 80241064 46000086 */ mov.s $f2, $f0 -/* CF3C38 80241068 8E62001C */ lw $v0, 0x1c($s3) -/* CF3C3C 8024106C 46001005 */ abs.s $f0, $f2 -/* CF3C40 80241070 44822000 */ mtc1 $v0, $f4 -/* CF3C44 80241074 00000000 */ nop -/* CF3C48 80241078 46802120 */ cvt.s.w $f4, $f4 -/* CF3C4C 8024107C 4600203C */ c.lt.s $f4, $f0 -/* CF3C50 80241080 00000000 */ nop -/* CF3C54 80241084 4500000D */ bc1f .L802410BC -/* CF3C58 80241088 00000000 */ nop -/* CF3C5C 8024108C 44800000 */ mtc1 $zero, $f0 -/* CF3C60 80241090 C614000C */ lwc1 $f20, 0xc($s0) -/* CF3C64 80241094 4600103C */ c.lt.s $f2, $f0 -/* CF3C68 80241098 00000000 */ nop -/* CF3C6C 8024109C 45000006 */ bc1f .L802410B8 -/* CF3C70 802410A0 00021023 */ negu $v0, $v0 -/* CF3C74 802410A4 44820000 */ mtc1 $v0, $f0 -/* CF3C78 802410A8 00000000 */ nop -/* CF3C7C 802410AC 46800020 */ cvt.s.w $f0, $f0 -/* CF3C80 802410B0 0809042F */ j .L802410BC -/* CF3C84 802410B4 4600A500 */ add.s $f20, $f20, $f0 -.L802410B8: -/* CF3C88 802410B8 4604A500 */ add.s $f20, $f20, $f4 -.L802410BC: -/* CF3C8C 802410BC 0C00A6C9 */ jal clamp_angle -/* CF3C90 802410C0 4600A306 */ mov.s $f12, $f20 -/* CF3C94 802410C4 E600000C */ swc1 $f0, 0xc($s0) -.L802410C8: -/* CF3C98 802410C8 8E020000 */ lw $v0, ($s0) -/* CF3C9C 802410CC 30420008 */ andi $v0, $v0, 8 -/* CF3CA0 802410D0 1040000A */ beqz $v0, .L802410FC -/* CF3CA4 802410D4 27A50018 */ addiu $a1, $sp, 0x18 -/* CF3CA8 802410D8 C602003C */ lwc1 $f2, 0x3c($s0) -/* CF3CAC 802410DC C600001C */ lwc1 $f0, 0x1c($s0) -/* CF3CB0 802410E0 46001080 */ add.s $f2, $f2, $f0 -/* CF3CB4 802410E4 4616103C */ c.lt.s $f2, $f22 -/* CF3CB8 802410E8 00000000 */ nop -/* CF3CBC 802410EC 45020045 */ bc1fl .L80241204 -/* CF3CC0 802410F0 E602003C */ swc1 $f2, 0x3c($s0) -/* CF3CC4 802410F4 08090480 */ j .L80241200 -/* CF3CC8 802410F8 E616003C */ swc1 $f22, 0x3c($s0) -.L802410FC: -/* CF3CCC 802410FC C6000038 */ lwc1 $f0, 0x38($s0) -/* CF3CD0 80241100 27A6001C */ addiu $a2, $sp, 0x1c -/* CF3CD4 80241104 E7A00018 */ swc1 $f0, 0x18($sp) -/* CF3CD8 80241108 860200A8 */ lh $v0, 0xa8($s0) -/* CF3CDC 8024110C C600001C */ lwc1 $f0, 0x1c($s0) -/* CF3CE0 80241110 C604003C */ lwc1 $f4, 0x3c($s0) -/* CF3CE4 80241114 44821000 */ mtc1 $v0, $f2 -/* CF3CE8 80241118 00000000 */ nop -/* CF3CEC 8024111C 468010A0 */ cvt.s.w $f2, $f2 -/* CF3CF0 80241120 46000005 */ abs.s $f0, $f0 -/* CF3CF4 80241124 46020000 */ add.s $f0, $f0, $f2 -/* CF3CF8 80241128 C6060040 */ lwc1 $f6, 0x40($s0) -/* CF3CFC 8024112C 27A20024 */ addiu $v0, $sp, 0x24 -/* CF3D00 80241130 46022100 */ add.s $f4, $f4, $f2 -/* CF3D04 80241134 3C014024 */ lui $at, 0x4024 -/* CF3D08 80241138 44811800 */ mtc1 $at, $f3 -/* CF3D0C 8024113C 44801000 */ mtc1 $zero, $f2 -/* CF3D10 80241140 46000021 */ cvt.d.s $f0, $f0 -/* CF3D14 80241144 46220000 */ add.d $f0, $f0, $f2 -/* CF3D18 80241148 E7A60020 */ swc1 $f6, 0x20($sp) -/* CF3D1C 8024114C E7A4001C */ swc1 $f4, 0x1c($sp) -/* CF3D20 80241150 46200020 */ cvt.s.d $f0, $f0 -/* CF3D24 80241154 E7A00024 */ swc1 $f0, 0x24($sp) -/* CF3D28 80241158 AFA20010 */ sw $v0, 0x10($sp) -/* CF3D2C 8024115C 8E040080 */ lw $a0, 0x80($s0) -/* CF3D30 80241160 0C0372DF */ jal func_800DCB7C -/* CF3D34 80241164 27A70020 */ addiu $a3, $sp, 0x20 -/* CF3D38 80241168 10400015 */ beqz $v0, .L802411C0 -/* CF3D3C 8024116C 00000000 */ nop -/* CF3D40 80241170 860200A8 */ lh $v0, 0xa8($s0) -/* CF3D44 80241174 C604001C */ lwc1 $f4, 0x1c($s0) -/* CF3D48 80241178 44820000 */ mtc1 $v0, $f0 -/* CF3D4C 8024117C 00000000 */ nop -/* CF3D50 80241180 46800020 */ cvt.s.w $f0, $f0 -/* CF3D54 80241184 46002085 */ abs.s $f2, $f4 -/* CF3D58 80241188 46020000 */ add.s $f0, $f0, $f2 -/* CF3D5C 8024118C C7A20024 */ lwc1 $f2, 0x24($sp) -/* CF3D60 80241190 4600103E */ c.le.s $f2, $f0 -/* CF3D64 80241194 00000000 */ nop -/* CF3D68 80241198 45000005 */ bc1f .L802411B0 -/* CF3D6C 8024119C 00000000 */ nop -/* CF3D70 802411A0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CF3D74 802411A4 AE00001C */ sw $zero, 0x1c($s0) -/* CF3D78 802411A8 08090481 */ j .L80241204 -/* CF3D7C 802411AC E600003C */ swc1 $f0, 0x3c($s0) -.L802411B0: -/* CF3D80 802411B0 C600003C */ lwc1 $f0, 0x3c($s0) -/* CF3D84 802411B4 46040000 */ add.s $f0, $f0, $f4 -/* CF3D88 802411B8 08090481 */ j .L80241204 -/* CF3D8C 802411BC E600003C */ swc1 $f0, 0x3c($s0) -.L802411C0: -/* CF3D90 802411C0 C606003C */ lwc1 $f6, 0x3c($s0) -/* CF3D94 802411C4 860200A8 */ lh $v0, 0xa8($s0) -/* CF3D98 802411C8 46163081 */ sub.s $f2, $f6, $f22 -/* CF3D9C 802411CC 44820000 */ mtc1 $v0, $f0 -/* CF3DA0 802411D0 00000000 */ nop -/* CF3DA4 802411D4 46800020 */ cvt.s.w $f0, $f0 -/* CF3DA8 802411D8 46001080 */ add.s $f2, $f2, $f0 -/* CF3DAC 802411DC C604001C */ lwc1 $f4, 0x1c($s0) -/* CF3DB0 802411E0 46002005 */ abs.s $f0, $f4 -/* CF3DB4 802411E4 4602003C */ c.lt.s $f0, $f2 -/* CF3DB8 802411E8 00000000 */ nop -/* CF3DBC 802411EC 45020005 */ bc1fl .L80241204 -/* CF3DC0 802411F0 AE00001C */ sw $zero, 0x1c($s0) -/* CF3DC4 802411F4 46043000 */ add.s $f0, $f6, $f4 -/* CF3DC8 802411F8 08090481 */ j .L80241204 -/* CF3DCC 802411FC E600003C */ swc1 $f0, 0x3c($s0) -.L80241200: -/* CF3DD0 80241200 AE00001C */ sw $zero, 0x1c($s0) -.L80241204: -/* CF3DD4 80241204 8FBF0038 */ lw $ra, 0x38($sp) -/* CF3DD8 80241208 8FB30034 */ lw $s3, 0x34($sp) -/* CF3DDC 8024120C 8FB20030 */ lw $s2, 0x30($sp) -/* CF3DE0 80241210 8FB1002C */ lw $s1, 0x2c($sp) -/* CF3DE4 80241214 8FB00028 */ lw $s0, 0x28($sp) -/* CF3DE8 80241218 D7B60048 */ ldc1 $f22, 0x48($sp) -/* CF3DEC 8024121C D7B40040 */ ldc1 $f20, 0x40($sp) -/* CF3DF0 80241220 03E00008 */ jr $ra -/* CF3DF4 80241224 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_80241228_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_80241228_CF2BD0.s deleted file mode 100644 index a8fd2c5e29..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_80241228_CF2BD0.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241228_CF3DF8 -/* CF3DF8 80241228 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CF3DFC 8024122C AFB00028 */ sw $s0, 0x28($sp) -/* CF3E00 80241230 00A0802D */ daddu $s0, $a1, $zero -/* CF3E04 80241234 AFB1002C */ sw $s1, 0x2c($sp) -/* CF3E08 80241238 00C0882D */ daddu $s1, $a2, $zero -/* CF3E0C 8024123C AFBF0034 */ sw $ra, 0x34($sp) -/* CF3E10 80241240 AFB20030 */ sw $s2, 0x30($sp) -/* CF3E14 80241244 AE200070 */ sw $zero, 0x70($s1) -/* CF3E18 80241248 8C830000 */ lw $v1, ($a0) -/* CF3E1C 8024124C 2402FDFF */ addiu $v0, $zero, -0x201 -/* CF3E20 80241250 A480008E */ sh $zero, 0x8e($a0) -/* CF3E24 80241254 00621824 */ and $v1, $v1, $v0 -/* CF3E28 80241258 34650800 */ ori $a1, $v1, 0x800 -/* CF3E2C 8024125C AC850000 */ sw $a1, ($a0) -/* CF3E30 80241260 8E0200D0 */ lw $v0, 0xd0($s0) -/* CF3E34 80241264 8C420034 */ lw $v0, 0x34($v0) -/* CF3E38 80241268 10400003 */ beqz $v0, .L80241278 -/* CF3E3C 8024126C 00E0902D */ daddu $s2, $a3, $zero -/* CF3E40 80241270 080904A0 */ j .L80241280 -/* CF3E44 80241274 34620808 */ ori $v0, $v1, 0x808 -.L80241278: -/* CF3E48 80241278 2402FFF7 */ addiu $v0, $zero, -9 -/* CF3E4C 8024127C 00A21024 */ and $v0, $a1, $v0 -.L80241280: -/* CF3E50 80241280 AC820000 */ sw $v0, ($a0) -/* CF3E54 80241284 27A20024 */ addiu $v0, $sp, 0x24 -/* CF3E58 80241288 27A50018 */ addiu $a1, $sp, 0x18 -/* CF3E5C 8024128C C4800038 */ lwc1 $f0, 0x38($a0) -/* CF3E60 80241290 C482003C */ lwc1 $f2, 0x3c($a0) -/* CF3E64 80241294 C4840040 */ lwc1 $f4, 0x40($a0) -/* CF3E68 80241298 3C01447A */ lui $at, 0x447a -/* CF3E6C 8024129C 44813000 */ mtc1 $at, $f6 -/* CF3E70 802412A0 27A6001C */ addiu $a2, $sp, 0x1c -/* CF3E74 802412A4 E7A00018 */ swc1 $f0, 0x18($sp) -/* CF3E78 802412A8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CF3E7C 802412AC E7A40020 */ swc1 $f4, 0x20($sp) -/* CF3E80 802412B0 E7A60024 */ swc1 $f6, 0x24($sp) -/* CF3E84 802412B4 AFA20010 */ sw $v0, 0x10($sp) -/* CF3E88 802412B8 8C840080 */ lw $a0, 0x80($a0) -/* CF3E8C 802412BC 0C0372DF */ jal func_800DCB7C -/* CF3E90 802412C0 27A70020 */ addiu $a3, $sp, 0x20 -/* CF3E94 802412C4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* CF3E98 802412C8 3C014059 */ lui $at, 0x4059 -/* CF3E9C 802412CC 44812800 */ mtc1 $at, $f5 -/* CF3EA0 802412D0 44802000 */ mtc1 $zero, $f4 -/* CF3EA4 802412D4 460010A1 */ cvt.d.s $f2, $f2 -/* CF3EA8 802412D8 46241082 */ mul.d $f2, $f2, $f4 -/* CF3EAC 802412DC 00000000 */ nop -/* CF3EB0 802412E0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CF3EB4 802412E4 46000021 */ cvt.d.s $f0, $f0 -/* CF3EB8 802412E8 46240002 */ mul.d $f0, $f0, $f4 -/* CF3EBC 802412EC 00000000 */ nop -/* CF3EC0 802412F0 3C013FE0 */ lui $at, 0x3fe0 -/* CF3EC4 802412F4 44812800 */ mtc1 $at, $f5 -/* CF3EC8 802412F8 44802000 */ mtc1 $zero, $f4 -/* CF3ECC 802412FC 00000000 */ nop -/* CF3ED0 80241300 46241080 */ add.d $f2, $f2, $f4 -/* CF3ED4 80241304 AE000074 */ sw $zero, 0x74($s0) -/* CF3ED8 80241308 46240000 */ add.d $f0, $f0, $f4 -/* CF3EDC 8024130C AE000090 */ sw $zero, 0x90($s0) -/* CF3EE0 80241310 4620120D */ trunc.w.d $f8, $f2 -/* CF3EE4 80241314 E6080078 */ swc1 $f8, 0x78($s0) -/* CF3EE8 80241318 4620020D */ trunc.w.d $f8, $f0 -/* CF3EEC 8024131C E6080088 */ swc1 $f8, 0x88($s0) -/* CF3EF0 80241320 8E420014 */ lw $v0, 0x14($s2) -/* CF3EF4 80241324 AE220074 */ sw $v0, 0x74($s1) -/* CF3EF8 80241328 8E0200B0 */ lw $v0, 0xb0($s0) -/* CF3EFC 8024132C 34420010 */ ori $v0, $v0, 0x10 -/* CF3F00 80241330 AE0200B0 */ sw $v0, 0xb0($s0) -/* CF3F04 80241334 8FBF0034 */ lw $ra, 0x34($sp) -/* CF3F08 80241338 8FB20030 */ lw $s2, 0x30($sp) -/* CF3F0C 8024133C 8FB1002C */ lw $s1, 0x2c($sp) -/* CF3F10 80241340 8FB00028 */ lw $s0, 0x28($sp) -/* CF3F14 80241344 03E00008 */ jr $ra -/* CF3F18 80241348 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_8024134C_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_8024134C_CF2BD0.s deleted file mode 100644 index 18c6e2ba3b..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_8024134C_CF2BD0.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024134C_CF3F1C -/* CF3F1C 8024134C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CF3F20 80241350 AFB40040 */ sw $s4, 0x40($sp) -/* CF3F24 80241354 0080A02D */ daddu $s4, $a0, $zero -/* CF3F28 80241358 AFBF0048 */ sw $ra, 0x48($sp) -/* CF3F2C 8024135C AFB50044 */ sw $s5, 0x44($sp) -/* CF3F30 80241360 AFB3003C */ sw $s3, 0x3c($sp) -/* CF3F34 80241364 AFB20038 */ sw $s2, 0x38($sp) -/* CF3F38 80241368 AFB10034 */ sw $s1, 0x34($sp) -/* CF3F3C 8024136C AFB00030 */ sw $s0, 0x30($sp) -/* CF3F40 80241370 8E920148 */ lw $s2, 0x148($s4) -/* CF3F44 80241374 86440008 */ lh $a0, 8($s2) -/* CF3F48 80241378 8E90000C */ lw $s0, 0xc($s4) -/* CF3F4C 8024137C 0C00EABB */ jal get_npc_unsafe -/* CF3F50 80241380 00A0882D */ daddu $s1, $a1, $zero -/* CF3F54 80241384 0280202D */ daddu $a0, $s4, $zero -/* CF3F58 80241388 8E050000 */ lw $a1, ($s0) -/* CF3F5C 8024138C 0C0B1EAF */ jal get_variable -/* CF3F60 80241390 0040A82D */ daddu $s5, $v0, $zero -/* CF3F64 80241394 AFA00010 */ sw $zero, 0x10($sp) -/* CF3F68 80241398 8E4300D0 */ lw $v1, 0xd0($s2) -/* CF3F6C 8024139C 8C630030 */ lw $v1, 0x30($v1) -/* CF3F70 802413A0 AFA30014 */ sw $v1, 0x14($sp) -/* CF3F74 802413A4 8E4300D0 */ lw $v1, 0xd0($s2) -/* CF3F78 802413A8 8C63001C */ lw $v1, 0x1c($v1) -/* CF3F7C 802413AC AFA30018 */ sw $v1, 0x18($sp) -/* CF3F80 802413B0 8E4300D0 */ lw $v1, 0xd0($s2) -/* CF3F84 802413B4 8C630024 */ lw $v1, 0x24($v1) -/* CF3F88 802413B8 AFA3001C */ sw $v1, 0x1c($sp) -/* CF3F8C 802413BC 8E4300D0 */ lw $v1, 0xd0($s2) -/* CF3F90 802413C0 8C630028 */ lw $v1, 0x28($v1) -/* CF3F94 802413C4 27B30010 */ addiu $s3, $sp, 0x10 -/* CF3F98 802413C8 AFA30020 */ sw $v1, 0x20($sp) -/* CF3F9C 802413CC 8E4300D0 */ lw $v1, 0xd0($s2) -/* CF3FA0 802413D0 3C0142F0 */ lui $at, 0x42f0 -/* CF3FA4 802413D4 44810000 */ mtc1 $at, $f0 -/* CF3FA8 802413D8 8C63002C */ lw $v1, 0x2c($v1) -/* CF3FAC 802413DC 0040802D */ daddu $s0, $v0, $zero -/* CF3FB0 802413E0 E7A00028 */ swc1 $f0, 0x28($sp) -/* CF3FB4 802413E4 A7A0002C */ sh $zero, 0x2c($sp) -/* CF3FB8 802413E8 12200006 */ beqz $s1, .L80241404 -/* CF3FBC 802413EC AFA30024 */ sw $v1, 0x24($sp) -/* CF3FC0 802413F0 02A0202D */ daddu $a0, $s5, $zero -/* CF3FC4 802413F4 0240282D */ daddu $a1, $s2, $zero -/* CF3FC8 802413F8 0280302D */ daddu $a2, $s4, $zero -/* CF3FCC 802413FC 0C09048A */ jal func_80241228 -/* CF3FD0 80241400 0200382D */ daddu $a3, $s0, $zero -.L80241404: -/* CF3FD4 80241404 2402FFFE */ addiu $v0, $zero, -2 -/* CF3FD8 80241408 A2A200AB */ sb $v0, 0xab($s5) -/* CF3FDC 8024140C 8E4300B0 */ lw $v1, 0xb0($s2) -/* CF3FE0 80241410 30620004 */ andi $v0, $v1, 4 -/* CF3FE4 80241414 10400007 */ beqz $v0, .L80241434 -/* CF3FE8 80241418 00000000 */ nop -/* CF3FEC 8024141C 824200B4 */ lb $v0, 0xb4($s2) -/* CF3FF0 80241420 1440003C */ bnez $v0, .L80241514 -/* CF3FF4 80241424 0000102D */ daddu $v0, $zero, $zero -/* CF3FF8 80241428 2402FFFB */ addiu $v0, $zero, -5 -/* CF3FFC 8024142C 00621024 */ and $v0, $v1, $v0 -/* CF4000 80241430 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241434: -/* CF4004 80241434 8E830070 */ lw $v1, 0x70($s4) -/* CF4008 80241438 2C62000F */ sltiu $v0, $v1, 0xf -/* CF400C 8024143C 10400034 */ beqz $v0, .L80241510 -/* CF4010 80241440 00031080 */ sll $v0, $v1, 2 -/* CF4014 80241444 3C018024 */ lui $at, 0x8024 -/* CF4018 80241448 00220821 */ addu $at, $at, $v0 -/* CF401C 8024144C 8C224EF8 */ lw $v0, 0x4ef8($at) -/* CF4020 80241450 00400008 */ jr $v0 -/* CF4024 80241454 00000000 */ nop -/* CF4028 80241458 0280202D */ daddu $a0, $s4, $zero -/* CF402C 8024145C 0200282D */ daddu $a1, $s0, $zero -/* CF4030 80241460 0C090010 */ jal func_80240040 -/* CF4034 80241464 0260302D */ daddu $a2, $s3, $zero -/* CF4038 80241468 0280202D */ daddu $a0, $s4, $zero -/* CF403C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* CF4040 80241470 0C09007C */ jal func_802401F0 -/* CF4044 80241474 0260302D */ daddu $a2, $s3, $zero -/* CF4048 80241478 08090545 */ j .L80241514 -/* CF404C 8024147C 0000102D */ daddu $v0, $zero, $zero -/* CF4050 80241480 0280202D */ daddu $a0, $s4, $zero -/* CF4054 80241484 0200282D */ daddu $a1, $s0, $zero -/* CF4058 80241488 0C090206 */ jal func_80240818 -/* CF405C 8024148C 0260302D */ daddu $a2, $s3, $zero -/* CF4060 80241490 0280202D */ daddu $a0, $s4, $zero -/* CF4064 80241494 0200282D */ daddu $a1, $s0, $zero -/* CF4068 80241498 0C090236 */ jal func_802408D8 -/* CF406C 8024149C 0260302D */ daddu $a2, $s3, $zero -/* CF4070 802414A0 08090545 */ j .L80241514 -/* CF4074 802414A4 0000102D */ daddu $v0, $zero, $zero -/* CF4078 802414A8 0280202D */ daddu $a0, $s4, $zero -/* CF407C 802414AC 0200282D */ daddu $a1, $s0, $zero -/* CF4080 802414B0 0C090307 */ jal func_80240C1C -/* CF4084 802414B4 0260302D */ daddu $a2, $s3, $zero -/* CF4088 802414B8 0280202D */ daddu $a0, $s4, $zero -/* CF408C 802414BC 0200282D */ daddu $a1, $s0, $zero -/* CF4090 802414C0 0C090325 */ jal func_80240C94 -/* CF4094 802414C4 0260302D */ daddu $a2, $s3, $zero -/* CF4098 802414C8 08090545 */ j .L80241514 -/* CF409C 802414CC 0000102D */ daddu $v0, $zero, $zero -/* CF40A0 802414D0 0280202D */ daddu $a0, $s4, $zero -/* CF40A4 802414D4 0200282D */ daddu $a1, $s0, $zero -/* CF40A8 802414D8 0C090340 */ jal func_80240D00 -/* CF40AC 802414DC 0260302D */ daddu $a2, $s3, $zero -/* CF40B0 802414E0 08090545 */ j .L80241514 -/* CF40B4 802414E4 0000102D */ daddu $v0, $zero, $zero -/* CF40B8 802414E8 0280202D */ daddu $a0, $s4, $zero -/* CF40BC 802414EC 0200282D */ daddu $a1, $s0, $zero -/* CF40C0 802414F0 0C09038D */ jal func_80240E34 -/* CF40C4 802414F4 0260302D */ daddu $a2, $s3, $zero -/* CF40C8 802414F8 08090545 */ j .L80241514 -/* CF40CC 802414FC 0000102D */ daddu $v0, $zero, $zero -/* CF40D0 80241500 0280202D */ daddu $a0, $s4, $zero -/* CF40D4 80241504 0200282D */ daddu $a1, $s0, $zero -/* CF40D8 80241508 0C0903A6 */ jal func_80240E98 -/* CF40DC 8024150C 0260302D */ daddu $a2, $s3, $zero -.L80241510: -/* CF40E0 80241510 0000102D */ daddu $v0, $zero, $zero -.L80241514: -/* CF40E4 80241514 8FBF0048 */ lw $ra, 0x48($sp) -/* CF40E8 80241518 8FB50044 */ lw $s5, 0x44($sp) -/* CF40EC 8024151C 8FB40040 */ lw $s4, 0x40($sp) -/* CF40F0 80241520 8FB3003C */ lw $s3, 0x3c($sp) -/* CF40F4 80241524 8FB20038 */ lw $s2, 0x38($sp) -/* CF40F8 80241528 8FB10034 */ lw $s1, 0x34($sp) -/* CF40FC 8024152C 8FB00030 */ lw $s0, 0x30($sp) -/* CF4100 80241530 03E00008 */ jr $ra -/* CF4104 80241534 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_80241668_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_80241668_CF2BD0.s deleted file mode 100644 index 0571809b1f..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_80241668_CF2BD0.s +++ /dev/null @@ -1,172 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241668_CF4238 -/* CF4238 80241668 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* CF423C 8024166C AFB3004C */ sw $s3, 0x4c($sp) -/* CF4240 80241670 0080982D */ daddu $s3, $a0, $zero -/* CF4244 80241674 AFBF0050 */ sw $ra, 0x50($sp) -/* CF4248 80241678 AFB20048 */ sw $s2, 0x48($sp) -/* CF424C 8024167C AFB10044 */ sw $s1, 0x44($sp) -/* CF4250 80241680 AFB00040 */ sw $s0, 0x40($sp) -/* CF4254 80241684 8E720148 */ lw $s2, 0x148($s3) -/* CF4258 80241688 00A0882D */ daddu $s1, $a1, $zero -/* CF425C 8024168C 86440008 */ lh $a0, 8($s2) -/* CF4260 80241690 0C00EABB */ jal get_npc_unsafe -/* CF4264 80241694 00C0802D */ daddu $s0, $a2, $zero -/* CF4268 80241698 0200202D */ daddu $a0, $s0, $zero -/* CF426C 8024169C 0240282D */ daddu $a1, $s2, $zero -/* CF4270 802416A0 24030001 */ addiu $v1, $zero, 1 -/* CF4274 802416A4 AFA30010 */ sw $v1, 0x10($sp) -/* CF4278 802416A8 8E260024 */ lw $a2, 0x24($s1) -/* CF427C 802416AC 8E270028 */ lw $a3, 0x28($s1) -/* CF4280 802416B0 0C01242D */ jal func_800490B4 -/* CF4284 802416B4 0040802D */ daddu $s0, $v0, $zero -/* CF4288 802416B8 14400020 */ bnez $v0, .L8024173C -/* CF428C 802416BC 24040002 */ addiu $a0, $zero, 2 -/* CF4290 802416C0 0200282D */ daddu $a1, $s0, $zero -/* CF4294 802416C4 0000302D */ daddu $a2, $zero, $zero -/* CF4298 802416C8 860300A8 */ lh $v1, 0xa8($s0) -/* CF429C 802416CC 3C013F80 */ lui $at, 0x3f80 -/* CF42A0 802416D0 44810000 */ mtc1 $at, $f0 -/* CF42A4 802416D4 3C014000 */ lui $at, 0x4000 -/* CF42A8 802416D8 44811000 */ mtc1 $at, $f2 -/* CF42AC 802416DC 3C01C1A0 */ lui $at, 0xc1a0 -/* CF42B0 802416E0 44812000 */ mtc1 $at, $f4 -/* CF42B4 802416E4 2402000F */ addiu $v0, $zero, 0xf -/* CF42B8 802416E8 AFA2001C */ sw $v0, 0x1c($sp) -/* CF42BC 802416EC 44834000 */ mtc1 $v1, $f8 -/* CF42C0 802416F0 00000000 */ nop -/* CF42C4 802416F4 46804220 */ cvt.s.w $f8, $f8 -/* CF42C8 802416F8 44074000 */ mfc1 $a3, $f8 -/* CF42CC 802416FC 27A20028 */ addiu $v0, $sp, 0x28 -/* CF42D0 80241700 AFA20020 */ sw $v0, 0x20($sp) -/* CF42D4 80241704 E7A00010 */ swc1 $f0, 0x10($sp) -/* CF42D8 80241708 E7A20014 */ swc1 $f2, 0x14($sp) -/* CF42DC 8024170C 0C01BFA4 */ jal fx_emote -/* CF42E0 80241710 E7A40018 */ swc1 $f4, 0x18($sp) -/* CF42E4 80241714 8E4200CC */ lw $v0, 0xcc($s2) -/* CF42E8 80241718 8C430000 */ lw $v1, ($v0) -/* CF42EC 8024171C 2402001E */ addiu $v0, $zero, 0x1e -/* CF42F0 80241720 A602008E */ sh $v0, 0x8e($s0) -/* CF42F4 80241724 24020014 */ addiu $v0, $zero, 0x14 -/* CF42F8 80241728 AE030028 */ sw $v1, 0x28($s0) -/* CF42FC 8024172C AE620070 */ sw $v0, 0x70($s3) -/* CF4300 80241730 2402001E */ addiu $v0, $zero, 0x1e -/* CF4304 80241734 08090633 */ j .L802418CC -/* CF4308 80241738 AE420090 */ sw $v0, 0x90($s2) -.L8024173C: -/* CF430C 8024173C 8E050018 */ lw $a1, 0x18($s0) -/* CF4310 80241740 8E06000C */ lw $a2, 0xc($s0) -/* CF4314 80241744 0C00EA95 */ jal npc_move_heading -/* CF4318 80241748 0200202D */ daddu $a0, $s0, $zero -/* CF431C 8024174C 8E020000 */ lw $v0, ($s0) -/* CF4320 80241750 30420008 */ andi $v0, $v0, 8 -/* CF4324 80241754 14400028 */ bnez $v0, .L802417F8 -/* CF4328 80241758 0000882D */ daddu $s1, $zero, $zero -/* CF432C 8024175C 27A5002C */ addiu $a1, $sp, 0x2c -/* CF4330 80241760 27A60030 */ addiu $a2, $sp, 0x30 -/* CF4334 80241764 860200A8 */ lh $v0, 0xa8($s0) -/* CF4338 80241768 C6000038 */ lwc1 $f0, 0x38($s0) -/* CF433C 8024176C 44821000 */ mtc1 $v0, $f2 -/* CF4340 80241770 00000000 */ nop -/* CF4344 80241774 468010A0 */ cvt.s.w $f2, $f2 -/* CF4348 80241778 E7A0002C */ swc1 $f0, 0x2c($sp) -/* CF434C 8024177C 860200A8 */ lh $v0, 0xa8($s0) -/* CF4350 80241780 C604003C */ lwc1 $f4, 0x3c($s0) -/* CF4354 80241784 C6060040 */ lwc1 $f6, 0x40($s0) -/* CF4358 80241788 44820000 */ mtc1 $v0, $f0 -/* CF435C 8024178C 00000000 */ nop -/* CF4360 80241790 46800021 */ cvt.d.w $f0, $f0 -/* CF4364 80241794 46022100 */ add.s $f4, $f4, $f2 -/* CF4368 80241798 3C014008 */ lui $at, 0x4008 -/* CF436C 8024179C 44811800 */ mtc1 $at, $f3 -/* CF4370 802417A0 44801000 */ mtc1 $zero, $f2 -/* CF4374 802417A4 27A20038 */ addiu $v0, $sp, 0x38 -/* CF4378 802417A8 46220000 */ add.d $f0, $f0, $f2 -/* CF437C 802417AC E7A60034 */ swc1 $f6, 0x34($sp) -/* CF4380 802417B0 E7A40030 */ swc1 $f4, 0x30($sp) -/* CF4384 802417B4 46200020 */ cvt.s.d $f0, $f0 -/* CF4388 802417B8 E7A00038 */ swc1 $f0, 0x38($sp) -/* CF438C 802417BC AFA20010 */ sw $v0, 0x10($sp) -/* CF4390 802417C0 8E040080 */ lw $a0, 0x80($s0) -/* CF4394 802417C4 0C0372DF */ jal func_800DCB7C -/* CF4398 802417C8 27A70034 */ addiu $a3, $sp, 0x34 -/* CF439C 802417CC 1040000A */ beqz $v0, .L802417F8 -/* CF43A0 802417D0 00000000 */ nop -/* CF43A4 802417D4 860200A8 */ lh $v0, 0xa8($s0) -/* CF43A8 802417D8 C7A20038 */ lwc1 $f2, 0x38($sp) -/* CF43AC 802417DC 44820000 */ mtc1 $v0, $f0 -/* CF43B0 802417E0 00000000 */ nop -/* CF43B4 802417E4 46800020 */ cvt.s.w $f0, $f0 -/* CF43B8 802417E8 4600103C */ c.lt.s $f2, $f0 -/* CF43BC 802417EC 00000000 */ nop -/* CF43C0 802417F0 45030001 */ bc1tl .L802417F8 -/* CF43C4 802417F4 24110001 */ addiu $s1, $zero, 1 -.L802417F8: -/* CF43C8 802417F8 12200008 */ beqz $s1, .L8024181C -/* CF43CC 802417FC 00000000 */ nop -/* CF43D0 80241800 C7A00030 */ lwc1 $f0, 0x30($sp) -/* CF43D4 80241804 3C013FF0 */ lui $at, 0x3ff0 -/* CF43D8 80241808 44811800 */ mtc1 $at, $f3 -/* CF43DC 8024180C 44801000 */ mtc1 $zero, $f2 -/* CF43E0 80241810 46000021 */ cvt.d.s $f0, $f0 -/* CF43E4 80241814 08090629 */ j .L802418A4 -/* CF43E8 80241818 46220000 */ add.d $f0, $f0, $f2 -.L8024181C: -/* CF43EC 8024181C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CF43F0 80241820 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CF43F4 80241824 3C014018 */ lui $at, 0x4018 -/* CF43F8 80241828 44811800 */ mtc1 $at, $f3 -/* CF43FC 8024182C 44801000 */ mtc1 $zero, $f2 -/* CF4400 80241830 C440002C */ lwc1 $f0, 0x2c($v0) -/* CF4404 80241834 C604003C */ lwc1 $f4, 0x3c($s0) -/* CF4408 80241838 46000021 */ cvt.d.s $f0, $f0 -/* CF440C 8024183C 46220000 */ add.d $f0, $f0, $f2 -/* CF4410 80241840 46002121 */ cvt.d.s $f4, $f4 -/* CF4414 80241844 46202001 */ sub.d $f0, $f4, $f0 -/* CF4418 80241848 462001A0 */ cvt.s.d $f6, $f0 -/* CF441C 8024184C 44800000 */ mtc1 $zero, $f0 -/* CF4420 80241850 44800800 */ mtc1 $zero, $f1 -/* CF4424 80241854 460030A1 */ cvt.d.s $f2, $f6 -/* CF4428 80241858 4620103C */ c.lt.d $f2, $f0 -/* CF442C 8024185C 00000000 */ nop -/* CF4430 80241860 45010009 */ bc1t .L80241888 -/* CF4434 80241864 00000000 */ nop -/* CF4438 80241868 3C014010 */ lui $at, 0x4010 -/* CF443C 8024186C 44810800 */ mtc1 $at, $f1 -/* CF4440 80241870 44800000 */ mtc1 $zero, $f0 -/* CF4444 80241874 00000000 */ nop -/* CF4448 80241878 4622003C */ c.lt.d $f0, $f2 -/* CF444C 8024187C 00000000 */ nop -/* CF4450 80241880 4500000A */ bc1f .L802418AC -/* CF4454 80241884 00000000 */ nop -.L80241888: -/* CF4458 80241888 3C018024 */ lui $at, 0x8024 -/* CF445C 8024188C D4224F38 */ ldc1 $f2, 0x4f38($at) -/* CF4460 80241890 46003187 */ neg.s $f6, $f6 -/* CF4464 80241894 46003021 */ cvt.d.s $f0, $f6 -/* CF4468 80241898 46220002 */ mul.d $f0, $f0, $f2 -/* CF446C 8024189C 00000000 */ nop -/* CF4470 802418A0 46202000 */ add.d $f0, $f4, $f0 -.L802418A4: -/* CF4474 802418A4 46200020 */ cvt.s.d $f0, $f0 -/* CF4478 802418A8 E600003C */ swc1 $f0, 0x3c($s0) -.L802418AC: -/* CF447C 802418AC 8602008E */ lh $v0, 0x8e($s0) -/* CF4480 802418B0 9603008E */ lhu $v1, 0x8e($s0) -/* CF4484 802418B4 18400003 */ blez $v0, .L802418C4 -/* CF4488 802418B8 2462FFFF */ addiu $v0, $v1, -1 -/* CF448C 802418BC 08090633 */ j .L802418CC -/* CF4490 802418C0 A602008E */ sh $v0, 0x8e($s0) -.L802418C4: -/* CF4494 802418C4 2402000C */ addiu $v0, $zero, 0xc -/* CF4498 802418C8 AE620070 */ sw $v0, 0x70($s3) -.L802418CC: -/* CF449C 802418CC 8FBF0050 */ lw $ra, 0x50($sp) -/* CF44A0 802418D0 8FB3004C */ lw $s3, 0x4c($sp) -/* CF44A4 802418D4 8FB20048 */ lw $s2, 0x48($sp) -/* CF44A8 802418D8 8FB10044 */ lw $s1, 0x44($sp) -/* CF44AC 802418DC 8FB00040 */ lw $s0, 0x40($sp) -/* CF44B0 802418E0 03E00008 */ jr $ra -/* CF44B4 802418E4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_802418E8_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_802418E8_CF2BD0.s deleted file mode 100644 index 8693eaadc6..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_802418E8_CF2BD0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418E8_CF44B8 -/* CF44B8 802418E8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF44BC 802418EC AFB10014 */ sw $s1, 0x14($sp) -/* CF44C0 802418F0 0080882D */ daddu $s1, $a0, $zero -/* CF44C4 802418F4 AFBF0018 */ sw $ra, 0x18($sp) -/* CF44C8 802418F8 AFB00010 */ sw $s0, 0x10($sp) -/* CF44CC 802418FC 8E300148 */ lw $s0, 0x148($s1) -/* CF44D0 80241900 0C00EABB */ jal get_npc_unsafe -/* CF44D4 80241904 86040008 */ lh $a0, 8($s0) -/* CF44D8 80241908 0040182D */ daddu $v1, $v0, $zero -/* CF44DC 8024190C 9462008E */ lhu $v0, 0x8e($v1) -/* CF44E0 80241910 2442FFFF */ addiu $v0, $v0, -1 -/* CF44E4 80241914 A462008E */ sh $v0, 0x8e($v1) -/* CF44E8 80241918 00021400 */ sll $v0, $v0, 0x10 -/* CF44EC 8024191C 1C400004 */ bgtz $v0, .L80241930 -/* CF44F0 80241920 00000000 */ nop -/* CF44F4 80241924 AE000074 */ sw $zero, 0x74($s0) -/* CF44F8 80241928 A460008E */ sh $zero, 0x8e($v1) -/* CF44FC 8024192C AE200070 */ sw $zero, 0x70($s1) -.L80241930: -/* CF4500 80241930 8FBF0018 */ lw $ra, 0x18($sp) -/* CF4504 80241934 8FB10014 */ lw $s1, 0x14($sp) -/* CF4508 80241938 8FB00010 */ lw $s0, 0x10($sp) -/* CF450C 8024193C 03E00008 */ jr $ra -/* CF4510 80241940 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_80241944_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_80241944_CF2BD0.s deleted file mode 100644 index 0eb3ef1290..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_80241944_CF2BD0.s +++ /dev/null @@ -1,130 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241944_CF4514 -/* CF4514 80241944 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CF4518 80241948 AFB40040 */ sw $s4, 0x40($sp) -/* CF451C 8024194C 0080A02D */ daddu $s4, $a0, $zero -/* CF4520 80241950 AFBF0048 */ sw $ra, 0x48($sp) -/* CF4524 80241954 AFB50044 */ sw $s5, 0x44($sp) -/* CF4528 80241958 AFB3003C */ sw $s3, 0x3c($sp) -/* CF452C 8024195C AFB20038 */ sw $s2, 0x38($sp) -/* CF4530 80241960 AFB10034 */ sw $s1, 0x34($sp) -/* CF4534 80241964 AFB00030 */ sw $s0, 0x30($sp) -/* CF4538 80241968 8E920148 */ lw $s2, 0x148($s4) -/* CF453C 8024196C 86440008 */ lh $a0, 8($s2) -/* CF4540 80241970 8E90000C */ lw $s0, 0xc($s4) -/* CF4544 80241974 0C00EABB */ jal get_npc_unsafe -/* CF4548 80241978 00A0882D */ daddu $s1, $a1, $zero -/* CF454C 8024197C 0280202D */ daddu $a0, $s4, $zero -/* CF4550 80241980 8E050000 */ lw $a1, ($s0) -/* CF4554 80241984 0C0B1EAF */ jal get_variable -/* CF4558 80241988 0040A82D */ daddu $s5, $v0, $zero -/* CF455C 8024198C AFA00010 */ sw $zero, 0x10($sp) -/* CF4560 80241990 8E4300D0 */ lw $v1, 0xd0($s2) -/* CF4564 80241994 8C630030 */ lw $v1, 0x30($v1) -/* CF4568 80241998 AFA30014 */ sw $v1, 0x14($sp) -/* CF456C 8024199C 8E4300D0 */ lw $v1, 0xd0($s2) -/* CF4570 802419A0 8C63001C */ lw $v1, 0x1c($v1) -/* CF4574 802419A4 AFA30018 */ sw $v1, 0x18($sp) -/* CF4578 802419A8 8E4300D0 */ lw $v1, 0xd0($s2) -/* CF457C 802419AC 8C630024 */ lw $v1, 0x24($v1) -/* CF4580 802419B0 AFA3001C */ sw $v1, 0x1c($sp) -/* CF4584 802419B4 8E4300D0 */ lw $v1, 0xd0($s2) -/* CF4588 802419B8 8C630028 */ lw $v1, 0x28($v1) -/* CF458C 802419BC 27B30010 */ addiu $s3, $sp, 0x10 -/* CF4590 802419C0 AFA30020 */ sw $v1, 0x20($sp) -/* CF4594 802419C4 8E4300D0 */ lw $v1, 0xd0($s2) -/* CF4598 802419C8 3C0142F0 */ lui $at, 0x42f0 -/* CF459C 802419CC 44810000 */ mtc1 $at, $f0 -/* CF45A0 802419D0 8C63002C */ lw $v1, 0x2c($v1) -/* CF45A4 802419D4 0040802D */ daddu $s0, $v0, $zero -/* CF45A8 802419D8 E7A00028 */ swc1 $f0, 0x28($sp) -/* CF45AC 802419DC A7A0002C */ sh $zero, 0x2c($sp) -/* CF45B0 802419E0 12200007 */ beqz $s1, .L80241A00 -/* CF45B4 802419E4 AFA30024 */ sw $v1, 0x24($sp) -/* CF45B8 802419E8 02A0202D */ daddu $a0, $s5, $zero -/* CF45BC 802419EC 0240282D */ daddu $a1, $s2, $zero -/* CF45C0 802419F0 0280302D */ daddu $a2, $s4, $zero -/* CF45C4 802419F4 0C09048A */ jal func_80241228 -/* CF45C8 802419F8 0200382D */ daddu $a3, $s0, $zero -/* CF45CC 802419FC AE800070 */ sw $zero, 0x70($s4) -.L80241A00: -/* CF45D0 80241A00 2402FFFE */ addiu $v0, $zero, -2 -/* CF45D4 80241A04 A2A200AB */ sb $v0, 0xab($s5) -/* CF45D8 80241A08 8E4300B0 */ lw $v1, 0xb0($s2) -/* CF45DC 80241A0C 30620004 */ andi $v0, $v1, 4 -/* CF45E0 80241A10 10400007 */ beqz $v0, .L80241A30 -/* CF45E4 80241A14 00000000 */ nop -/* CF45E8 80241A18 824200B4 */ lb $v0, 0xb4($s2) -/* CF45EC 80241A1C 1440003A */ bnez $v0, .L80241B08 -/* CF45F0 80241A20 0000102D */ daddu $v0, $zero, $zero -/* CF45F4 80241A24 2402FFFB */ addiu $v0, $zero, -5 -/* CF45F8 80241A28 00621024 */ and $v0, $v1, $v0 -/* CF45FC 80241A2C AE4200B0 */ sw $v0, 0xb0($s2) -.L80241A30: -/* CF4600 80241A30 8E830070 */ lw $v1, 0x70($s4) -/* CF4604 80241A34 2C620015 */ sltiu $v0, $v1, 0x15 -/* CF4608 80241A38 10400032 */ beqz $v0, .L80241B04 -/* CF460C 80241A3C 00031080 */ sll $v0, $v1, 2 -/* CF4610 80241A40 3C018024 */ lui $at, 0x8024 -/* CF4614 80241A44 00220821 */ addu $at, $at, $v0 -/* CF4618 80241A48 8C224F40 */ lw $v0, 0x4f40($at) -/* CF461C 80241A4C 00400008 */ jr $v0 -/* CF4620 80241A50 00000000 */ nop -/* CF4624 80241A54 0280202D */ daddu $a0, $s4, $zero -/* CF4628 80241A58 0200282D */ daddu $a1, $s0, $zero -/* CF462C 80241A5C 0C090010 */ jal func_80240040 -/* CF4630 80241A60 0260302D */ daddu $a2, $s3, $zero -/* CF4634 80241A64 0280202D */ daddu $a0, $s4, $zero -/* CF4638 80241A68 0200282D */ daddu $a1, $s0, $zero -/* CF463C 80241A6C 0C09007C */ jal func_802401F0 -/* CF4640 80241A70 0260302D */ daddu $a2, $s3, $zero -/* CF4644 80241A74 080906C2 */ j .L80241B08 -/* CF4648 80241A78 0000102D */ daddu $v0, $zero, $zero -/* CF464C 80241A7C 0280202D */ daddu $a0, $s4, $zero -/* CF4650 80241A80 0200282D */ daddu $a1, $s0, $zero -/* CF4654 80241A84 0C090206 */ jal func_80240818 -/* CF4658 80241A88 0260302D */ daddu $a2, $s3, $zero -/* CF465C 80241A8C 0280202D */ daddu $a0, $s4, $zero -/* CF4660 80241A90 0200282D */ daddu $a1, $s0, $zero -/* CF4664 80241A94 0C090236 */ jal func_802408D8 -/* CF4668 80241A98 0260302D */ daddu $a2, $s3, $zero -/* CF466C 80241A9C 080906C2 */ j .L80241B08 -/* CF4670 80241AA0 0000102D */ daddu $v0, $zero, $zero -/* CF4674 80241AA4 0280202D */ daddu $a0, $s4, $zero -/* CF4678 80241AA8 0200282D */ daddu $a1, $s0, $zero -/* CF467C 80241AAC 0C090307 */ jal func_80240C1C -/* CF4680 80241AB0 0260302D */ daddu $a2, $s3, $zero -/* CF4684 80241AB4 0280202D */ daddu $a0, $s4, $zero -/* CF4688 80241AB8 0200282D */ daddu $a1, $s0, $zero -/* CF468C 80241ABC 0C090325 */ jal func_80240C94 -/* CF4690 80241AC0 0260302D */ daddu $a2, $s3, $zero -/* CF4694 80241AC4 080906C2 */ j .L80241B08 -/* CF4698 80241AC8 0000102D */ daddu $v0, $zero, $zero -/* CF469C 80241ACC 0280202D */ daddu $a0, $s4, $zero -/* CF46A0 80241AD0 0200282D */ daddu $a1, $s0, $zero -/* CF46A4 80241AD4 0C09054E */ jal func_80241538 -/* CF46A8 80241AD8 0260302D */ daddu $a2, $s3, $zero -/* CF46AC 80241ADC 0280202D */ daddu $a0, $s4, $zero -/* CF46B0 80241AE0 0200282D */ daddu $a1, $s0, $zero -/* CF46B4 80241AE4 0C09059A */ jal func_80241668 -/* CF46B8 80241AE8 0260302D */ daddu $a2, $s3, $zero -/* CF46BC 80241AEC 080906C2 */ j .L80241B08 -/* CF46C0 80241AF0 0000102D */ daddu $v0, $zero, $zero -/* CF46C4 80241AF4 0280202D */ daddu $a0, $s4, $zero -/* CF46C8 80241AF8 0200282D */ daddu $a1, $s0, $zero -/* CF46CC 80241AFC 0C09063A */ jal func_802418E8 -/* CF46D0 80241B00 0260302D */ daddu $a2, $s3, $zero -.L80241B04: -/* CF46D4 80241B04 0000102D */ daddu $v0, $zero, $zero -.L80241B08: -/* CF46D8 80241B08 8FBF0048 */ lw $ra, 0x48($sp) -/* CF46DC 80241B0C 8FB50044 */ lw $s5, 0x44($sp) -/* CF46E0 80241B10 8FB40040 */ lw $s4, 0x40($sp) -/* CF46E4 80241B14 8FB3003C */ lw $s3, 0x3c($sp) -/* CF46E8 80241B18 8FB20038 */ lw $s2, 0x38($sp) -/* CF46EC 80241B1C 8FB10034 */ lw $s1, 0x34($sp) -/* CF46F0 80241B20 8FB00030 */ lw $s0, 0x30($sp) -/* CF46F4 80241B24 03E00008 */ jr $ra -/* CF46F8 80241B28 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_80241B2C_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_80241B2C_CF2BD0.s deleted file mode 100644 index 8e91249be1..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_80241B2C_CF2BD0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B2C_CF46FC -/* CF46FC 80241B2C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF4700 80241B30 AFB10014 */ sw $s1, 0x14($sp) -/* CF4704 80241B34 0080882D */ daddu $s1, $a0, $zero -/* CF4708 80241B38 AFBF0018 */ sw $ra, 0x18($sp) -/* CF470C 80241B3C AFB00010 */ sw $s0, 0x10($sp) -/* CF4710 80241B40 8E30000C */ lw $s0, 0xc($s1) -/* CF4714 80241B44 8E050000 */ lw $a1, ($s0) -/* CF4718 80241B48 0C0B1EAF */ jal get_variable -/* CF471C 80241B4C 26100004 */ addiu $s0, $s0, 4 -/* CF4720 80241B50 0C00EAD2 */ jal get_npc_safe -/* CF4724 80241B54 0040202D */ daddu $a0, $v0, $zero -/* CF4728 80241B58 10400005 */ beqz $v0, .L80241B70 -/* CF472C 80241B5C 00000000 */ nop -/* CF4730 80241B60 8E050000 */ lw $a1, ($s0) -/* CF4734 80241B64 844600A8 */ lh $a2, 0xa8($v0) -/* CF4738 80241B68 0C0B2026 */ jal set_variable -/* CF473C 80241B6C 0220202D */ daddu $a0, $s1, $zero -.L80241B70: -/* CF4740 80241B70 8FBF0018 */ lw $ra, 0x18($sp) -/* CF4744 80241B74 8FB10014 */ lw $s1, 0x14($sp) -/* CF4748 80241B78 8FB00010 */ lw $s0, 0x10($sp) -/* CF474C 80241B7C 24020002 */ addiu $v0, $zero, 2 -/* CF4750 80241B80 03E00008 */ jr $ra -/* CF4754 80241B84 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_80241DAC_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_80241DAC_CF2BD0.s deleted file mode 100644 index 3bf5eb2aa0..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_80241DAC_CF2BD0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DAC_CF497C -/* CF497C 80241DAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF4980 80241DB0 AFBF0010 */ sw $ra, 0x10($sp) -/* CF4984 80241DB4 8C82000C */ lw $v0, 0xc($a0) -/* CF4988 80241DB8 0C0B1EAF */ jal get_variable -/* CF498C 80241DBC 8C450000 */ lw $a1, ($v0) -/* CF4990 80241DC0 3C018024 */ lui $at, 0x8024 -/* CF4994 80241DC4 AC222AD0 */ sw $v0, 0x2ad0($at) -/* CF4998 80241DC8 24020002 */ addiu $v0, $zero, 2 -/* CF499C 80241DCC 8FBF0010 */ lw $ra, 0x10($sp) -/* CF49A0 80241DD0 24030001 */ addiu $v1, $zero, 1 -/* CF49A4 80241DD4 3C018024 */ lui $at, 0x8024 -/* CF49A8 80241DD8 AC232ACC */ sw $v1, 0x2acc($at) -/* CF49AC 80241DDC 03E00008 */ jr $ra -/* CF49B0 80241DE0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_80241DE4_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_80241DE4_CF2BD0.s deleted file mode 100644 index 6c6cd9ff3d..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_80241DE4_CF2BD0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DE4_CF49B4 -/* CF49B4 80241DE4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF49B8 80241DE8 AFBF0010 */ sw $ra, 0x10($sp) -/* CF49BC 80241DEC 8C82000C */ lw $v0, 0xc($a0) -/* CF49C0 80241DF0 0C0B1EAF */ jal get_variable -/* CF49C4 80241DF4 8C450000 */ lw $a1, ($v0) -/* CF49C8 80241DF8 0040182D */ daddu $v1, $v0, $zero -/* CF49CC 80241DFC 10600012 */ beqz $v1, .L80241E48 -/* CF49D0 80241E00 0000202D */ daddu $a0, $zero, $zero -/* CF49D4 80241E04 8C620000 */ lw $v0, ($v1) -/* CF49D8 80241E08 5040000A */ beql $v0, $zero, .L80241E34 -/* CF49DC 80241E0C 00041080 */ sll $v0, $a0, 2 -/* CF49E0 80241E10 3C058024 */ lui $a1, 0x8024 -/* CF49E4 80241E14 24A54FA0 */ addiu $a1, $a1, 0x4fa0 -.L80241E18: -/* CF49E8 80241E18 24630004 */ addiu $v1, $v1, 4 -/* CF49EC 80241E1C 24840001 */ addiu $a0, $a0, 1 -/* CF49F0 80241E20 ACA20000 */ sw $v0, ($a1) -/* CF49F4 80241E24 8C620000 */ lw $v0, ($v1) -/* CF49F8 80241E28 1440FFFB */ bnez $v0, .L80241E18 -/* CF49FC 80241E2C 24A50004 */ addiu $a1, $a1, 4 -/* CF4A00 80241E30 00041080 */ sll $v0, $a0, 2 -.L80241E34: -/* CF4A04 80241E34 3C018024 */ lui $at, 0x8024 -/* CF4A08 80241E38 00220821 */ addu $at, $at, $v0 -/* CF4A0C 80241E3C AC204FA0 */ sw $zero, 0x4fa0($at) -/* CF4A10 80241E40 0809079C */ j .L80241E70 -/* CF4A14 80241E44 00000000 */ nop -.L80241E48: -/* CF4A18 80241E48 3C038024 */ lui $v1, 0x8024 -/* CF4A1C 80241E4C 24634FA0 */ addiu $v1, $v1, 0x4fa0 -/* CF4A20 80241E50 0060282D */ daddu $a1, $v1, $zero -.L80241E54: -/* CF4A24 80241E54 24820080 */ addiu $v0, $a0, 0x80 -/* CF4A28 80241E58 AC620000 */ sw $v0, ($v1) -/* CF4A2C 80241E5C 24630004 */ addiu $v1, $v1, 4 -/* CF4A30 80241E60 24840001 */ addiu $a0, $a0, 1 -/* CF4A34 80241E64 2882005B */ slti $v0, $a0, 0x5b -/* CF4A38 80241E68 1440FFFA */ bnez $v0, .L80241E54 -/* CF4A3C 80241E6C ACA0016C */ sw $zero, 0x16c($a1) -.L80241E70: -/* CF4A40 80241E70 8FBF0010 */ lw $ra, 0x10($sp) -/* CF4A44 80241E74 24020002 */ addiu $v0, $zero, 2 -/* CF4A48 80241E78 03E00008 */ jr $ra -/* CF4A4C 80241E7C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_80241E80_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_80241E80_CF2BD0.s deleted file mode 100644 index 20a54e0c81..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_80241E80_CF2BD0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E80_CF4A50 -/* CF4A50 80241E80 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CF4A54 80241E84 AFB10014 */ sw $s1, 0x14($sp) -/* CF4A58 80241E88 0080882D */ daddu $s1, $a0, $zero -/* CF4A5C 80241E8C AFBF0020 */ sw $ra, 0x20($sp) -/* CF4A60 80241E90 AFB3001C */ sw $s3, 0x1c($sp) -/* CF4A64 80241E94 AFB20018 */ sw $s2, 0x18($sp) -/* CF4A68 80241E98 AFB00010 */ sw $s0, 0x10($sp) -/* CF4A6C 80241E9C 8E30000C */ lw $s0, 0xc($s1) -/* CF4A70 80241EA0 8E050000 */ lw $a1, ($s0) -/* CF4A74 80241EA4 0C0B1EAF */ jal get_variable -/* CF4A78 80241EA8 26100004 */ addiu $s0, $s0, 4 -/* CF4A7C 80241EAC 8E050000 */ lw $a1, ($s0) -/* CF4A80 80241EB0 26100004 */ addiu $s0, $s0, 4 -/* CF4A84 80241EB4 0220202D */ daddu $a0, $s1, $zero -/* CF4A88 80241EB8 0C0B1EAF */ jal get_variable -/* CF4A8C 80241EBC 0040982D */ daddu $s3, $v0, $zero -/* CF4A90 80241EC0 8E050000 */ lw $a1, ($s0) -/* CF4A94 80241EC4 26100004 */ addiu $s0, $s0, 4 -/* CF4A98 80241EC8 0220202D */ daddu $a0, $s1, $zero -/* CF4A9C 80241ECC 0C0B1EAF */ jal get_variable -/* CF4AA0 80241ED0 0040902D */ daddu $s2, $v0, $zero -/* CF4AA4 80241ED4 0220202D */ daddu $a0, $s1, $zero -/* CF4AA8 80241ED8 8E050000 */ lw $a1, ($s0) -/* CF4AAC 80241EDC 0C0B1EAF */ jal get_variable -/* CF4AB0 80241EE0 0040882D */ daddu $s1, $v0, $zero -/* CF4AB4 80241EE4 0260202D */ daddu $a0, $s3, $zero -/* CF4AB8 80241EE8 0C04C3D6 */ jal get_item_entity -/* CF4ABC 80241EEC 0040802D */ daddu $s0, $v0, $zero -/* CF4AC0 80241EF0 0040182D */ daddu $v1, $v0, $zero -/* CF4AC4 80241EF4 44920000 */ mtc1 $s2, $f0 -/* CF4AC8 80241EF8 00000000 */ nop -/* CF4ACC 80241EFC 46800020 */ cvt.s.w $f0, $f0 -/* CF4AD0 80241F00 E4600008 */ swc1 $f0, 8($v1) -/* CF4AD4 80241F04 44910000 */ mtc1 $s1, $f0 -/* CF4AD8 80241F08 00000000 */ nop -/* CF4ADC 80241F0C 46800020 */ cvt.s.w $f0, $f0 -/* CF4AE0 80241F10 E460000C */ swc1 $f0, 0xc($v1) -/* CF4AE4 80241F14 44900000 */ mtc1 $s0, $f0 -/* CF4AE8 80241F18 00000000 */ nop -/* CF4AEC 80241F1C 46800020 */ cvt.s.w $f0, $f0 -/* CF4AF0 80241F20 E4600010 */ swc1 $f0, 0x10($v1) -/* CF4AF4 80241F24 8FBF0020 */ lw $ra, 0x20($sp) -/* CF4AF8 80241F28 8FB3001C */ lw $s3, 0x1c($sp) -/* CF4AFC 80241F2C 8FB20018 */ lw $s2, 0x18($sp) -/* CF4B00 80241F30 8FB10014 */ lw $s1, 0x14($sp) -/* CF4B04 80241F34 8FB00010 */ lw $s0, 0x10($sp) -/* CF4B08 80241F38 24020002 */ addiu $v0, $zero, 2 -/* CF4B0C 80241F3C 03E00008 */ jr $ra -/* CF4B10 80241F40 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_80241FB4_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_80241FB4_CF2BD0.s deleted file mode 100644 index e47a7e33bf..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_80241FB4_CF2BD0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FB4_CF4B84 -/* CF4B84 80241FB4 2404005A */ addiu $a0, $zero, 0x5a -/* CF4B88 80241FB8 3C038024 */ lui $v1, 0x8024 -/* CF4B8C 80241FBC 24635278 */ addiu $v1, $v1, 0x5278 -/* CF4B90 80241FC0 240200DA */ addiu $v0, $zero, 0xda -.L80241FC4: -/* CF4B94 80241FC4 AC620000 */ sw $v0, ($v1) -/* CF4B98 80241FC8 2463FFFC */ addiu $v1, $v1, -4 -/* CF4B9C 80241FCC 2484FFFF */ addiu $a0, $a0, -1 -/* CF4BA0 80241FD0 0481FFFC */ bgez $a0, .L80241FC4 -/* CF4BA4 80241FD4 2442FFFF */ addiu $v0, $v0, -1 -/* CF4BA8 80241FD8 3C018024 */ lui $at, 0x8024 -/* CF4BAC 80241FDC AC20527C */ sw $zero, 0x527c($at) -/* CF4BB0 80241FE0 03E00008 */ jr $ra -/* CF4BB4 80241FE4 24020002 */ addiu $v0, $zero, 2 -/* CF4BB8 80241FE8 00000000 */ nop -/* CF4BBC 80241FEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_80241FF0_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_80241FF0_CF2BD0.s deleted file mode 100644 index 4157faa6a0..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_80241FF0_CF2BD0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FF0_CF4BC0 -/* CF4BC0 80241FF0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* CF4BC4 80241FF4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* CF4BC8 80241FF8 4485A000 */ mtc1 $a1, $f20 -/* CF4BCC 80241FFC F7B60020 */ sdc1 $f22, 0x20($sp) -/* CF4BD0 80242000 4486B000 */ mtc1 $a2, $f22 -/* CF4BD4 80242004 AFB00010 */ sw $s0, 0x10($sp) -/* CF4BD8 80242008 F7B80028 */ sdc1 $f24, 0x28($sp) -/* CF4BDC 8024200C 4487C000 */ mtc1 $a3, $f24 -/* CF4BE0 80242010 AFBF0014 */ sw $ra, 0x14($sp) -/* CF4BE4 80242014 0C019D28 */ jal guMtxIdentF -/* CF4BE8 80242018 0080802D */ daddu $s0, $a0, $zero -/* CF4BEC 8024201C 4616A582 */ mul.s $f22, $f20, $f22 -/* CF4BF0 80242020 00000000 */ nop -/* CF4BF4 80242024 4618A502 */ mul.s $f20, $f20, $f24 -/* CF4BF8 80242028 00000000 */ nop -/* CF4BFC 8024202C 3C013F80 */ lui $at, 0x3f80 -/* CF4C00 80242030 44810000 */ mtc1 $at, $f0 -/* CF4C04 80242034 00000000 */ nop -/* CF4C08 80242038 E6000014 */ swc1 $f0, 0x14($s0) -/* CF4C0C 8024203C E6160010 */ swc1 $f22, 0x10($s0) -/* CF4C10 80242040 E6140018 */ swc1 $f20, 0x18($s0) -/* CF4C14 80242044 8FBF0014 */ lw $ra, 0x14($sp) -/* CF4C18 80242048 8FB00010 */ lw $s0, 0x10($sp) -/* CF4C1C 8024204C D7B80028 */ ldc1 $f24, 0x28($sp) -/* CF4C20 80242050 D7B60020 */ ldc1 $f22, 0x20($sp) -/* CF4C24 80242054 D7B40018 */ ldc1 $f20, 0x18($sp) -/* CF4C28 80242058 03E00008 */ jr $ra -/* CF4C2C 8024205C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_flo/flo_25/func_80242230_CF2BD0.s b/asm/nonmatchings/world/area_flo/flo_25/func_80242230_CF2BD0.s deleted file mode 100644 index da1a6813aa..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/func_80242230_CF2BD0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242230_CF4E00 -/* CF4E00 80242230 8C820084 */ lw $v0, 0x84($a0) -/* CF4E04 80242234 8C830090 */ lw $v1, 0x90($a0) -/* CF4E08 80242238 00431023 */ subu $v0, $v0, $v1 -/* CF4E0C 8024223C 44821000 */ mtc1 $v0, $f2 -/* CF4E10 80242240 00000000 */ nop -/* CF4E14 80242244 468010A0 */ cvt.s.w $f2, $f2 -/* CF4E18 80242248 8C820088 */ lw $v0, 0x88($a0) -/* CF4E1C 8024224C 8C830094 */ lw $v1, 0x94($a0) -/* CF4E20 80242250 46021082 */ mul.s $f2, $f2, $f2 -/* CF4E24 80242254 00000000 */ nop -/* CF4E28 80242258 00431023 */ subu $v0, $v0, $v1 -/* CF4E2C 8024225C 44822000 */ mtc1 $v0, $f4 -/* CF4E30 80242260 00000000 */ nop -/* CF4E34 80242264 46802120 */ cvt.s.w $f4, $f4 -/* CF4E38 80242268 8C82008C */ lw $v0, 0x8c($a0) -/* CF4E3C 8024226C 46042102 */ mul.s $f4, $f4, $f4 -/* CF4E40 80242270 00000000 */ nop -/* CF4E44 80242274 8C830098 */ lw $v1, 0x98($a0) -/* CF4E48 80242278 00431023 */ subu $v0, $v0, $v1 -/* CF4E4C 8024227C 44820000 */ mtc1 $v0, $f0 -/* CF4E50 80242280 00000000 */ nop -/* CF4E54 80242284 46800020 */ cvt.s.w $f0, $f0 -/* CF4E58 80242288 46000002 */ mul.s $f0, $f0, $f0 -/* CF4E5C 8024228C 00000000 */ nop -/* CF4E60 80242290 46041080 */ add.s $f2, $f2, $f4 -/* CF4E64 80242294 46001080 */ add.s $f2, $f2, $f0 -/* CF4E68 80242298 3C014561 */ lui $at, 0x4561 -/* CF4E6C 8024229C 44810000 */ mtc1 $at, $f0 -/* CF4E70 802422A0 00000000 */ nop -/* CF4E74 802422A4 4600103C */ c.lt.s $f2, $f0 -/* CF4E78 802422A8 00000000 */ nop -/* CF4E7C 802422AC 45010002 */ bc1t .L802422B8 -/* CF4E80 802422B0 24020001 */ addiu $v0, $zero, 1 -/* CF4E84 802422B4 0000102D */ daddu $v0, $zero, $zero -.L802422B8: -/* CF4E88 802422B8 AC820084 */ sw $v0, 0x84($a0) -/* CF4E8C 802422BC 03E00008 */ jr $ra -/* CF4E90 802422C0 24020002 */ addiu $v0, $zero, 2 -/* CF4E94 802422C4 00000000 */ nop -/* CF4E98 802422C8 00000000 */ nop -/* CF4E9C 802422CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_gv/gv_01/func_80240020_E1E460.s b/asm/nonmatchings/world/area_gv/gv_01/func_80240020_E1E460.s deleted file mode 100644 index 67649d3c6d..0000000000 --- a/asm/nonmatchings/world/area_gv/gv_01/func_80240020_E1E460.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_E1E480 -/* E1E480 80240020 3C028016 */ lui $v0, 0x8016 -/* E1E484 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* E1E488 80240028 AC820084 */ sw $v0, 0x84($a0) -/* E1E48C 8024002C 03E00008 */ jr $ra -/* E1E490 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_gv/gv_01/func_80240034_E1E460.s b/asm/nonmatchings/world/area_gv/gv_01/func_80240034_E1E460.s deleted file mode 100644 index 886833bdd8..0000000000 --- a/asm/nonmatchings/world/area_gv/gv_01/func_80240034_E1E460.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_E1E494 -/* E1E494 80240034 3C038016 */ lui $v1, 0x8016 -/* E1E498 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* E1E49C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E1E4A0 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* E1E4A4 80240044 0080802D */ daddu $s0, $a0, $zero -/* E1E4A8 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* E1E4AC 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* E1E4B0 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* E1E4B4 80240054 24020002 */ addiu $v0, $zero, 2 -/* E1E4B8 80240058 08090038 */ j .L802400E0 -/* E1E4BC 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* E1E4C0 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* E1E4C4 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* E1E4C8 80240068 80620040 */ lb $v0, 0x40($v1) -/* E1E4CC 8024006C 80670044 */ lb $a3, 0x44($v1) -/* E1E4D0 80240070 04420001 */ bltzl $v0, .L80240078 -/* E1E4D4 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* E1E4D8 80240078 14400003 */ bnez $v0, .L80240088 -/* E1E4DC 8024007C 00000000 */ nop -/* E1E4E0 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* E1E4E4 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* E1E4E8 80240088 44822000 */ mtc1 $v0, $f4 -/* E1E4EC 8024008C 00000000 */ nop -/* E1E4F0 80240090 46802120 */ cvt.s.w $f4, $f4 -/* E1E4F4 80240094 44062000 */ mfc1 $a2, $f4 -/* E1E4F8 80240098 44872000 */ mtc1 $a3, $f4 -/* E1E4FC 8024009C 00000000 */ nop -/* E1E500 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* E1E504 802400A4 44806000 */ mtc1 $zero, $f12 -/* E1E508 802400A8 44072000 */ mfc1 $a3, $f4 -/* E1E50C 802400AC 0C00A720 */ jal atan2 -/* E1E510 802400B0 46006386 */ mov.s $f14, $f12 -/* E1E514 802400B4 3C014270 */ lui $at, 0x4270 -/* E1E518 802400B8 44811000 */ mtc1 $at, $f2 -/* E1E51C 802400BC 00000000 */ nop -/* E1E520 802400C0 4602003C */ c.lt.s $f0, $f2 -/* E1E524 802400C4 00000000 */ nop -/* E1E528 802400C8 45000004 */ bc1f .L802400DC -/* E1E52C 802400CC 24020001 */ addiu $v0, $zero, 1 -/* E1E530 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* E1E534 802400D4 08090038 */ j .L802400E0 -/* E1E538 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* E1E53C 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* E1E540 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* E1E544 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* E1E548 802400E8 03E00008 */ jr $ra -/* E1E54C 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_gv/gv_01/func_802400F0_E1E460.s b/asm/nonmatchings/world/area_gv/gv_01/func_802400F0_E1E460.s deleted file mode 100644 index 64a13483fd..0000000000 --- a/asm/nonmatchings/world/area_gv/gv_01/func_802400F0_E1E460.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_E1E550 -/* E1E550 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E1E554 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* E1E558 802400F8 0080882D */ daddu $s1, $a0, $zero -/* E1E55C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* E1E560 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* E1E564 80240104 0C016AFA */ jal get_current_map_header -/* E1E568 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* E1E56C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* E1E570 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* E1E574 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* E1E578 80240118 0C0B1EAF */ jal get_variable -/* E1E57C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* E1E580 80240120 0220202D */ daddu $a0, $s1, $zero -/* E1E584 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* E1E588 80240128 8E430014 */ lw $v1, 0x14($s2) -/* E1E58C 8024012C 00028100 */ sll $s0, $v0, 4 -/* E1E590 80240130 02031821 */ addu $v1, $s0, $v1 -/* E1E594 80240134 C4600000 */ lwc1 $f0, ($v1) -/* E1E598 80240138 4600008D */ trunc.w.s $f2, $f0 -/* E1E59C 8024013C 44061000 */ mfc1 $a2, $f2 -/* E1E5A0 80240140 0C0B2026 */ jal set_variable -/* E1E5A4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* E1E5A8 80240148 0220202D */ daddu $a0, $s1, $zero -/* E1E5AC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* E1E5B0 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* E1E5B4 80240154 02021021 */ addu $v0, $s0, $v0 -/* E1E5B8 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* E1E5BC 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* E1E5C0 80240160 44061000 */ mfc1 $a2, $f2 -/* E1E5C4 80240164 0C0B2026 */ jal set_variable -/* E1E5C8 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* E1E5CC 8024016C 0220202D */ daddu $a0, $s1, $zero -/* E1E5D0 80240170 8E420014 */ lw $v0, 0x14($s2) -/* E1E5D4 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* E1E5D8 80240178 02021021 */ addu $v0, $s0, $v0 -/* E1E5DC 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* E1E5E0 80240180 4600008D */ trunc.w.s $f2, $f0 -/* E1E5E4 80240184 44061000 */ mfc1 $a2, $f2 -/* E1E5E8 80240188 0C0B2026 */ jal set_variable -/* E1E5EC 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E1E5F0 80240190 0220202D */ daddu $a0, $s1, $zero -/* E1E5F4 80240194 8E420014 */ lw $v0, 0x14($s2) -/* E1E5F8 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* E1E5FC 8024019C 02028021 */ addu $s0, $s0, $v0 -/* E1E600 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* E1E604 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* E1E608 802401A8 44061000 */ mfc1 $a2, $f2 -/* E1E60C 802401AC 0C0B2026 */ jal set_variable -/* E1E610 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* E1E614 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* E1E618 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* E1E61C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* E1E620 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* E1E624 802401C4 24020002 */ addiu $v0, $zero, 2 -/* E1E628 802401C8 03E00008 */ jr $ra -/* E1E62C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_gv/gv_01/func_802401D0_E1E460.s b/asm/nonmatchings/world/area_gv/gv_01/func_802401D0_E1E460.s deleted file mode 100644 index 4b4079a470..0000000000 --- a/asm/nonmatchings/world/area_gv/gv_01/func_802401D0_E1E460.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_E1E630 -/* E1E630 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* E1E634 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* E1E638 802401D8 3C014334 */ lui $at, 0x4334 -/* E1E63C 802401DC 44816000 */ mtc1 $at, $f12 -/* E1E640 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E1E644 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* E1E648 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* E1E64C 802401EC 00031080 */ sll $v0, $v1, 2 -/* E1E650 802401F0 00431021 */ addu $v0, $v0, $v1 -/* E1E654 802401F4 00021080 */ sll $v0, $v0, 2 -/* E1E658 802401F8 00431023 */ subu $v0, $v0, $v1 -/* E1E65C 802401FC 000218C0 */ sll $v1, $v0, 3 -/* E1E660 80240200 00431021 */ addu $v0, $v0, $v1 -/* E1E664 80240204 000210C0 */ sll $v0, $v0, 3 -/* E1E668 80240208 3C01800B */ lui $at, 0x800b -/* E1E66C 8024020C 00220821 */ addu $at, $at, $v0 -/* E1E670 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* E1E674 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* E1E678 80240218 0C00A6C9 */ jal clamp_angle -/* E1E67C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* E1E680 80240220 4600008D */ trunc.w.s $f2, $f0 -/* E1E684 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* E1E688 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* E1E68C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* E1E690 80240230 24020002 */ addiu $v0, $zero, 2 -/* E1E694 80240234 03E00008 */ jr $ra -/* E1E698 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_gv/gv_01/func_8024023C_E1E460.s b/asm/nonmatchings/world/area_gv/gv_01/func_8024023C_E1E460.s deleted file mode 100644 index f181a0032f..0000000000 --- a/asm/nonmatchings/world/area_gv/gv_01/func_8024023C_E1E460.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_E1E69C -/* E1E69C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E1E6A0 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* E1E6A4 80240244 0080802D */ daddu $s0, $a0, $zero -/* E1E6A8 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* E1E6AC 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* E1E6B0 80240250 8E02000C */ lw $v0, 0xc($s0) -/* E1E6B4 80240254 0C0B210B */ jal get_float_variable -/* E1E6B8 80240258 8C450000 */ lw $a1, ($v0) -/* E1E6BC 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* E1E6C0 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* E1E6C4 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* E1E6C8 80240268 44060000 */ mfc1 $a2, $f0 -/* E1E6CC 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* E1E6D0 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* E1E6D4 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* E1E6D8 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* E1E6DC 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* E1E6E0 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* E1E6E4 80240284 0C00A7E7 */ jal add_vec2D_polar -/* E1E6E8 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* E1E6EC 8024028C 0200202D */ daddu $a0, $s0, $zero -/* E1E6F0 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* E1E6F4 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* E1E6F8 80240298 0C0B2190 */ jal set_float_variable -/* E1E6FC 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* E1E700 802402A0 0200202D */ daddu $a0, $s0, $zero -/* E1E704 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* E1E708 802402A8 4406A000 */ mfc1 $a2, $f20 -/* E1E70C 802402AC 0C0B2190 */ jal set_float_variable -/* E1E710 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* E1E714 802402B4 0200202D */ daddu $a0, $s0, $zero -/* E1E718 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* E1E71C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* E1E720 802402C0 0C0B2190 */ jal set_float_variable -/* E1E724 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* E1E728 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* E1E72C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* E1E730 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* E1E734 802402D4 24020002 */ addiu $v0, $zero, 2 -/* E1E738 802402D8 03E00008 */ jr $ra -/* E1E73C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_gv/gv_01/func_802402E0_E1E460.s b/asm/nonmatchings/world/area_gv/gv_01/func_802402E0_E1E460.s deleted file mode 100644 index 04ab960f79..0000000000 --- a/asm/nonmatchings/world/area_gv/gv_01/func_802402E0_E1E460.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_E1E740 -/* E1E740 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E1E744 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* E1E748 802402E8 0080802D */ daddu $s0, $a0, $zero -/* E1E74C 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* E1E750 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* E1E754 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* E1E758 802402F8 00621821 */ addu $v1, $v1, $v0 -/* E1E75C 802402FC 04610004 */ bgez $v1, .L80240310 -/* E1E760 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* E1E764 80240304 3C020002 */ lui $v0, 2 -/* E1E768 80240308 080900C8 */ j .L80240320 -/* E1E76C 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* E1E770 80240310 3C040002 */ lui $a0, 2 -/* E1E774 80240314 0083102A */ slt $v0, $a0, $v1 -/* E1E778 80240318 10400002 */ beqz $v0, .L80240324 -/* E1E77C 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* E1E780 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* E1E784 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* E1E788 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* E1E78C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* E1E790 80240330 04610004 */ bgez $v1, .L80240344 -/* E1E794 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* E1E798 80240338 3C020002 */ lui $v0, 2 -/* E1E79C 8024033C 080900D5 */ j .L80240354 -/* E1E7A0 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* E1E7A4 80240344 3C040002 */ lui $a0, 2 -/* E1E7A8 80240348 0083102A */ slt $v0, $a0, $v1 -/* E1E7AC 8024034C 10400002 */ beqz $v0, .L80240358 -/* E1E7B0 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* E1E7B4 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* E1E7B8 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* E1E7BC 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* E1E7C0 80240360 00621821 */ addu $v1, $v1, $v0 -/* E1E7C4 80240364 04610004 */ bgez $v1, .L80240378 -/* E1E7C8 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* E1E7CC 8024036C 3C020002 */ lui $v0, 2 -/* E1E7D0 80240370 080900E2 */ j .L80240388 -/* E1E7D4 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* E1E7D8 80240378 3C040002 */ lui $a0, 2 -/* E1E7DC 8024037C 0083102A */ slt $v0, $a0, $v1 -/* E1E7E0 80240380 10400002 */ beqz $v0, .L8024038C -/* E1E7E4 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* E1E7E8 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* E1E7EC 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* E1E7F0 80240390 8E020094 */ lw $v0, 0x94($s0) -/* E1E7F4 80240394 00621821 */ addu $v1, $v1, $v0 -/* E1E7F8 80240398 04610004 */ bgez $v1, .L802403AC -/* E1E7FC 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* E1E800 802403A0 3C020002 */ lui $v0, 2 -/* E1E804 802403A4 080900EF */ j .L802403BC -/* E1E808 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* E1E80C 802403AC 3C040002 */ lui $a0, 2 -/* E1E810 802403B0 0083102A */ slt $v0, $a0, $v1 -/* E1E814 802403B4 10400002 */ beqz $v0, .L802403C0 -/* E1E818 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* E1E81C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* E1E820 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* E1E824 802403C4 0C046F07 */ jal set_main_pan_u -/* E1E828 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* E1E82C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* E1E830 802403D0 0C046F0D */ jal set_main_pan_v -/* E1E834 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* E1E838 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* E1E83C 802403DC 0C046F13 */ jal set_aux_pan_u -/* E1E840 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* E1E844 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* E1E848 802403E8 0C046F19 */ jal set_aux_pan_v -/* E1E84C 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* E1E850 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* E1E854 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* E1E858 802403F8 0000102D */ daddu $v0, $zero, $zero -/* E1E85C 802403FC 03E00008 */ jr $ra -/* E1E860 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_gv/gv_01/func_80240404_E1E460.s b/asm/nonmatchings/world/area_gv/gv_01/func_80240404_E1E460.s deleted file mode 100644 index 638612c1bb..0000000000 --- a/asm/nonmatchings/world/area_gv/gv_01/func_80240404_E1E460.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_E1E864 -/* E1E864 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E1E868 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* E1E86C 8024040C 0080802D */ daddu $s0, $a0, $zero -/* E1E870 80240410 10A00005 */ beqz $a1, .L80240428 -/* E1E874 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* E1E878 80240418 AE000070 */ sw $zero, 0x70($s0) -/* E1E87C 8024041C AE000074 */ sw $zero, 0x74($s0) -/* E1E880 80240420 AE000078 */ sw $zero, 0x78($s0) -/* E1E884 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* E1E888 80240428 8E020070 */ lw $v0, 0x70($s0) -/* E1E88C 8024042C 1440000E */ bnez $v0, .L80240468 -/* E1E890 80240430 00000000 */ nop -/* E1E894 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* E1E898 80240438 8E020088 */ lw $v0, 0x88($s0) -/* E1E89C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* E1E8A0 80240440 04610004 */ bgez $v1, .L80240454 -/* E1E8A4 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* E1E8A8 80240448 3C020002 */ lui $v0, 2 -/* E1E8AC 8024044C 08090119 */ j .L80240464 -/* E1E8B0 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* E1E8B4 80240454 3C040002 */ lui $a0, 2 -/* E1E8B8 80240458 0083102A */ slt $v0, $a0, $v1 -/* E1E8BC 8024045C 10400002 */ beqz $v0, .L80240468 -/* E1E8C0 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* E1E8C4 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* E1E8C8 80240468 8E020074 */ lw $v0, 0x74($s0) -/* E1E8CC 8024046C 1440000E */ bnez $v0, .L802404A8 -/* E1E8D0 80240470 00000000 */ nop -/* E1E8D4 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* E1E8D8 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* E1E8DC 8024047C 00621821 */ addu $v1, $v1, $v0 -/* E1E8E0 80240480 04610004 */ bgez $v1, .L80240494 -/* E1E8E4 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* E1E8E8 80240488 3C020002 */ lui $v0, 2 -/* E1E8EC 8024048C 08090129 */ j .L802404A4 -/* E1E8F0 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* E1E8F4 80240494 3C040002 */ lui $a0, 2 -/* E1E8F8 80240498 0083102A */ slt $v0, $a0, $v1 -/* E1E8FC 8024049C 10400002 */ beqz $v0, .L802404A8 -/* E1E900 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* E1E904 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* E1E908 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* E1E90C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* E1E910 802404B0 00000000 */ nop -/* E1E914 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* E1E918 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* E1E91C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* E1E920 802404C0 04610004 */ bgez $v1, .L802404D4 -/* E1E924 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* E1E928 802404C8 3C020002 */ lui $v0, 2 -/* E1E92C 802404CC 08090139 */ j .L802404E4 -/* E1E930 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* E1E934 802404D4 3C040002 */ lui $a0, 2 -/* E1E938 802404D8 0083102A */ slt $v0, $a0, $v1 -/* E1E93C 802404DC 10400002 */ beqz $v0, .L802404E8 -/* E1E940 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* E1E944 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* E1E948 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* E1E94C 802404EC 1440000E */ bnez $v0, .L80240528 -/* E1E950 802404F0 00000000 */ nop -/* E1E954 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* E1E958 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* E1E95C 802404FC 00621821 */ addu $v1, $v1, $v0 -/* E1E960 80240500 04610004 */ bgez $v1, .L80240514 -/* E1E964 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* E1E968 80240508 3C020002 */ lui $v0, 2 -/* E1E96C 8024050C 08090149 */ j .L80240524 -/* E1E970 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* E1E974 80240514 3C040002 */ lui $a0, 2 -/* E1E978 80240518 0083102A */ slt $v0, $a0, $v1 -/* E1E97C 8024051C 10400002 */ beqz $v0, .L80240528 -/* E1E980 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* E1E984 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* E1E988 80240528 8E040084 */ lw $a0, 0x84($s0) -/* E1E98C 8024052C 0C046F07 */ jal set_main_pan_u -/* E1E990 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* E1E994 80240534 8E040084 */ lw $a0, 0x84($s0) -/* E1E998 80240538 0C046F0D */ jal set_main_pan_v -/* E1E99C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* E1E9A0 80240540 8E040084 */ lw $a0, 0x84($s0) -/* E1E9A4 80240544 0C046F13 */ jal set_aux_pan_u -/* E1E9A8 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* E1E9AC 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* E1E9B0 80240550 0C046F19 */ jal set_aux_pan_v -/* E1E9B4 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* E1E9B8 80240558 8E020070 */ lw $v0, 0x70($s0) -/* E1E9BC 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* E1E9C0 80240560 8E040098 */ lw $a0, 0x98($s0) -/* E1E9C4 80240564 24420001 */ addiu $v0, $v0, 1 -/* E1E9C8 80240568 AE020070 */ sw $v0, 0x70($s0) -/* E1E9CC 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* E1E9D0 80240570 24630001 */ addiu $v1, $v1, 1 -/* E1E9D4 80240574 AE030078 */ sw $v1, 0x78($s0) -/* E1E9D8 80240578 8E030070 */ lw $v1, 0x70($s0) -/* E1E9DC 8024057C 24420001 */ addiu $v0, $v0, 1 -/* E1E9E0 80240580 AE020074 */ sw $v0, 0x74($s0) -/* E1E9E4 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* E1E9E8 80240588 0064182A */ slt $v1, $v1, $a0 -/* E1E9EC 8024058C 24420001 */ addiu $v0, $v0, 1 -/* E1E9F0 80240590 14600002 */ bnez $v1, .L8024059C -/* E1E9F4 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* E1E9F8 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* E1E9FC 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* E1EA00 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* E1EA04 802405A4 0043102A */ slt $v0, $v0, $v1 -/* E1EA08 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* E1EA0C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* E1EA10 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* E1EA14 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* E1EA18 802405B8 0043102A */ slt $v0, $v0, $v1 -/* E1EA1C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* E1EA20 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* E1EA24 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* E1EA28 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* E1EA2C 802405CC 0043102A */ slt $v0, $v0, $v1 -/* E1EA30 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* E1EA34 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* E1EA38 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* E1EA3C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* E1EA40 802405E0 0000102D */ daddu $v0, $zero, $zero -/* E1EA44 802405E4 03E00008 */ jr $ra -/* E1EA48 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_gv/gv_01/func_802405EC_E1E460.s b/asm/nonmatchings/world/area_gv/gv_01/func_802405EC_E1E460.s deleted file mode 100644 index 6a5ea4103e..0000000000 --- a/asm/nonmatchings/world/area_gv/gv_01/func_802405EC_E1E460.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_E1EA4C -/* E1EA4C 802405EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E1EA50 802405F0 AFB00010 */ sw $s0, 0x10($sp) -/* E1EA54 802405F4 0080802D */ daddu $s0, $a0, $zero -/* E1EA58 802405F8 10A00008 */ beqz $a1, .L8024061C -/* E1EA5C 802405FC AFBF0014 */ sw $ra, 0x14($sp) -/* E1EA60 80240600 3C013F80 */ lui $at, 0x3f80 -/* E1EA64 80240604 44816000 */ mtc1 $at, $f12 -/* E1EA68 80240608 0C00AFB7 */ jal set_curtain_scale_goal -/* E1EA6C 8024060C AE000070 */ sw $zero, 0x70($s0) -/* E1EA70 80240610 44806000 */ mtc1 $zero, $f12 -/* E1EA74 80240614 0C00AFC9 */ jal set_curtain_fade -/* E1EA78 80240618 00000000 */ nop -.L8024061C: -/* E1EA7C 8024061C 8E020070 */ lw $v0, 0x70($s0) -/* E1EA80 80240620 24420005 */ addiu $v0, $v0, 5 -/* E1EA84 80240624 AE020070 */ sw $v0, 0x70($s0) -/* E1EA88 80240628 28420100 */ slti $v0, $v0, 0x100 -/* E1EA8C 8024062C 14400003 */ bnez $v0, .L8024063C -/* E1EA90 80240630 24040001 */ addiu $a0, $zero, 1 -/* E1EA94 80240634 240200FF */ addiu $v0, $zero, 0xff -/* E1EA98 80240638 AE020070 */ sw $v0, 0x70($s0) -.L8024063C: -/* E1EA9C 8024063C 240500D0 */ addiu $a1, $zero, 0xd0 -/* E1EAA0 80240640 00A0302D */ daddu $a2, $a1, $zero -/* E1EAA4 80240644 0C04DF84 */ jal func_80137E10 -/* E1EAA8 80240648 00A0382D */ daddu $a3, $a1, $zero -/* E1EAAC 8024064C C6000070 */ lwc1 $f0, 0x70($s0) -/* E1EAB0 80240650 46800020 */ cvt.s.w $f0, $f0 -/* E1EAB4 80240654 44050000 */ mfc1 $a1, $f0 -/* E1EAB8 80240658 0C04DF69 */ jal func_80137DA4 -/* E1EABC 8024065C 0000202D */ daddu $a0, $zero, $zero -/* E1EAC0 80240660 24040001 */ addiu $a0, $zero, 1 -/* E1EAC4 80240664 0C04E035 */ jal func_801380D4 -/* E1EAC8 80240668 0000282D */ daddu $a1, $zero, $zero -/* E1EACC 8024066C 8E020070 */ lw $v0, 0x70($s0) -/* E1EAD0 80240670 8FBF0014 */ lw $ra, 0x14($sp) -/* E1EAD4 80240674 8FB00010 */ lw $s0, 0x10($sp) -/* E1EAD8 80240678 384200FF */ xori $v0, $v0, 0xff -/* E1EADC 8024067C 2C420001 */ sltiu $v0, $v0, 1 -/* E1EAE0 80240680 03E00008 */ jr $ra -/* E1EAE4 80240684 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_gv/gv_01/func_80240688_E1E460.s b/asm/nonmatchings/world/area_gv/gv_01/func_80240688_E1E460.s deleted file mode 100644 index c5f6dc6596..0000000000 --- a/asm/nonmatchings/world/area_gv/gv_01/func_80240688_E1E460.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240688_E1EAE8 -/* E1EAE8 80240688 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E1EAEC 8024068C 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* E1EAF0 80240690 2463419C */ addiu $v1, $v1, %lo(gGameStatusPtr) -/* E1EAF4 80240694 AFBF0010 */ sw $ra, 0x10($sp) -/* E1EAF8 80240698 8C620000 */ lw $v0, ($v1) -/* E1EAFC 8024069C A0400070 */ sb $zero, 0x70($v0) -/* E1EB00 802406A0 8C620000 */ lw $v0, ($v1) -/* E1EB04 802406A4 A0400076 */ sb $zero, 0x76($v0) -/* E1EB08 802406A8 8C620000 */ lw $v0, ($v1) -/* E1EB0C 802406AC A0400078 */ sb $zero, 0x78($v0) -/* E1EB10 802406B0 8C620000 */ lw $v0, ($v1) -/* E1EB14 802406B4 3C04800A */ lui $a0, %hi(D_8009A650) -/* E1EB18 802406B8 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) -/* E1EB1C 802406BC A040007D */ sb $zero, 0x7d($v0) -/* E1EB20 802406C0 8C820000 */ lw $v0, ($a0) -/* E1EB24 802406C4 2403FFF7 */ addiu $v1, $zero, -9 -/* E1EB28 802406C8 00431024 */ and $v0, $v0, $v1 -/* E1EB2C 802406CC 0C00AB00 */ jal general_heap_create -/* E1EB30 802406D0 AC820000 */ sw $v0, ($a0) -/* E1EB34 802406D4 0C047624 */ jal func_8011D890 -/* E1EB38 802406D8 00000000 */ nop -/* E1EB3C 802406DC 0C048C2E */ jal clear_dynamic_entity_list -/* E1EB40 802406E0 00000000 */ nop -/* E1EB44 802406E4 0C0B0C77 */ jal clear_script_list -/* E1EB48 802406E8 00000000 */ nop -/* E1EB4C 802406EC 0C00B7BD */ jal create_cameras_a -/* E1EB50 802406F0 00000000 */ nop -/* E1EB54 802406F4 0C0B763E */ jal func_802DD8F8 -/* E1EB58 802406F8 0000202D */ daddu $a0, $zero, $zero -/* E1EB5C 802406FC 0C0482EC */ jal clear_virtual_models -/* E1EB60 80240700 00000000 */ nop -/* E1EB64 80240704 0C047889 */ jal func_8011E224 -/* E1EB68 80240708 00000000 */ nop -/* E1EB6C 8024070C 0C045751 */ jal clear_model_data -/* E1EB70 80240710 00000000 */ nop -/* E1EB74 80240714 0C052010 */ jal func_80148040 -/* E1EB78 80240718 00000000 */ nop -/* E1EB7C 8024071C 0C05177E */ jal func_80145DF8 -/* E1EB80 80240720 00000000 */ nop -/* E1EB84 80240724 0C050440 */ jal func_80141100 -/* E1EB88 80240728 00000000 */ nop -/* E1EB8C 8024072C 0C0515A0 */ jal clear_trigger_data -/* E1EB90 80240730 00000000 */ nop -/* E1EB94 80240734 0C048D9D */ jal clear_printers -/* E1EB98 80240738 00000000 */ nop -/* E1EB9C 8024073C 0C04432E */ jal clear_entity_data -/* E1EBA0 80240740 0000202D */ daddu $a0, $zero, $zero -/* E1EBA4 80240744 0C04E042 */ jal func_80138108 -/* E1EBA8 80240748 00000000 */ nop -/* E1EBAC 8024074C 0C037F14 */ jal clear_player_status -/* E1EBB0 80240750 00000000 */ nop -/* E1EBB4 80240754 0C00E12F */ jal clear_npcs -/* E1EBB8 80240758 00000000 */ nop -/* E1EBBC 8024075C 0C039CE8 */ jal clear_player_data -/* E1EBC0 80240760 00000000 */ nop -/* E1EBC4 80240764 0C01CACC */ jal func_80072B30 -/* E1EBC8 80240768 00000000 */ nop -/* E1EBCC 8024076C 0C00F8CE */ jal func_8003E338 -/* E1EBD0 80240770 00000000 */ nop -/* E1EBD4 80240774 0C016727 */ jal func_80059C9C -/* E1EBD8 80240778 00000000 */ nop -/* E1EBDC 8024077C 0C04C3FC */ jal clear_item_entity_data -/* E1EBE0 80240780 00000000 */ nop -/* E1EBE4 80240784 0C0514C8 */ jal clear_saved_variables -/* E1EBE8 80240788 00000000 */ nop -/* E1EBEC 8024078C 0C016BE5 */ jal initialize_collision -/* E1EBF0 80240790 00000000 */ nop -/* E1EBF4 80240794 0C00CDF4 */ jal intro_logos_set_fade_alpha -/* E1EBF8 80240798 240400FF */ addiu $a0, $zero, 0xff -/* E1EBFC 8024079C 0C00CDF8 */ jal intro_logos_set_fade_color -/* E1EC00 802407A0 240400D0 */ addiu $a0, $zero, 0xd0 -/* E1EC04 802407A4 0C00CD3C */ jal set_game_mode -/* E1EC08 802407A8 24040002 */ addiu $a0, $zero, 2 -/* E1EC0C 802407AC 8FBF0010 */ lw $ra, 0x10($sp) -/* E1EC10 802407B0 240200FF */ addiu $v0, $zero, 0xff -/* E1EC14 802407B4 03E00008 */ jr $ra -/* E1EC18 802407B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* E1EC1C 802407BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_00/func_80240050_A0BCF0.s b/asm/nonmatchings/world/area_hos/hos_00/func_80240050_A0BCF0.s deleted file mode 100644 index 592d58a92b..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_00/func_80240050_A0BCF0.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_A0BD40 -/* A0BD40 80240050 27BDFF98 */ addiu $sp, $sp, -0x68 -/* A0BD44 80240054 AFB1002C */ sw $s1, 0x2c($sp) -/* A0BD48 80240058 0080882D */ daddu $s1, $a0, $zero -/* A0BD4C 8024005C AFBF0030 */ sw $ra, 0x30($sp) -/* A0BD50 80240060 AFB00028 */ sw $s0, 0x28($sp) -/* A0BD54 80240064 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* A0BD58 80240068 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* A0BD5C 8024006C F7BA0050 */ sdc1 $f26, 0x50($sp) -/* A0BD60 80240070 F7B80048 */ sdc1 $f24, 0x48($sp) -/* A0BD64 80240074 F7B60040 */ sdc1 $f22, 0x40($sp) -/* A0BD68 80240078 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A0BD6C 8024007C 8E30000C */ lw $s0, 0xc($s1) -/* A0BD70 80240080 8E050000 */ lw $a1, ($s0) -/* A0BD74 80240084 0C0B210B */ jal get_float_variable -/* A0BD78 80240088 26100004 */ addiu $s0, $s0, 4 -/* A0BD7C 8024008C 8E050000 */ lw $a1, ($s0) -/* A0BD80 80240090 26100004 */ addiu $s0, $s0, 4 -/* A0BD84 80240094 0220202D */ daddu $a0, $s1, $zero -/* A0BD88 80240098 0C0B210B */ jal get_float_variable -/* A0BD8C 8024009C E7A00020 */ swc1 $f0, 0x20($sp) -/* A0BD90 802400A0 8E050000 */ lw $a1, ($s0) -/* A0BD94 802400A4 26100004 */ addiu $s0, $s0, 4 -/* A0BD98 802400A8 0220202D */ daddu $a0, $s1, $zero -/* A0BD9C 802400AC 0C0B210B */ jal get_float_variable -/* A0BDA0 802400B0 46000786 */ mov.s $f30, $f0 -/* A0BDA4 802400B4 8E050000 */ lw $a1, ($s0) -/* A0BDA8 802400B8 26100004 */ addiu $s0, $s0, 4 -/* A0BDAC 802400BC 0220202D */ daddu $a0, $s1, $zero -/* A0BDB0 802400C0 0C0B210B */ jal get_float_variable -/* A0BDB4 802400C4 46000706 */ mov.s $f28, $f0 -/* A0BDB8 802400C8 8E050000 */ lw $a1, ($s0) -/* A0BDBC 802400CC 26100004 */ addiu $s0, $s0, 4 -/* A0BDC0 802400D0 0220202D */ daddu $a0, $s1, $zero -/* A0BDC4 802400D4 0C0B210B */ jal get_float_variable -/* A0BDC8 802400D8 46000686 */ mov.s $f26, $f0 -/* A0BDCC 802400DC 8E050000 */ lw $a1, ($s0) -/* A0BDD0 802400E0 26100004 */ addiu $s0, $s0, 4 -/* A0BDD4 802400E4 0220202D */ daddu $a0, $s1, $zero -/* A0BDD8 802400E8 0C0B210B */ jal get_float_variable -/* A0BDDC 802400EC 46000606 */ mov.s $f24, $f0 -/* A0BDE0 802400F0 8E050000 */ lw $a1, ($s0) -/* A0BDE4 802400F4 26100004 */ addiu $s0, $s0, 4 -/* A0BDE8 802400F8 0220202D */ daddu $a0, $s1, $zero -/* A0BDEC 802400FC 0C0B210B */ jal get_float_variable -/* A0BDF0 80240100 46000586 */ mov.s $f22, $f0 -/* A0BDF4 80240104 0220202D */ daddu $a0, $s1, $zero -/* A0BDF8 80240108 8E050000 */ lw $a1, ($s0) -/* A0BDFC 8024010C 0C0B210B */ jal get_float_variable -/* A0BE00 80240110 46000506 */ mov.s $f20, $f0 -/* A0BE04 80240114 4405F000 */ mfc1 $a1, $f30 -/* A0BE08 80240118 4406E000 */ mfc1 $a2, $f28 -/* A0BE0C 8024011C 4407D000 */ mfc1 $a3, $f26 -/* A0BE10 80240120 C7A20020 */ lwc1 $f2, 0x20($sp) -/* A0BE14 80240124 E7B80010 */ swc1 $f24, 0x10($sp) -/* A0BE18 80240128 E7B60014 */ swc1 $f22, 0x14($sp) -/* A0BE1C 8024012C E7B40018 */ swc1 $f20, 0x18($sp) -/* A0BE20 80240130 4600108D */ trunc.w.s $f2, $f2 -/* A0BE24 80240134 44041000 */ mfc1 $a0, $f2 -/* A0BE28 80240138 0C01BF8C */ jal func_8006FE30 -/* A0BE2C 8024013C E7A0001C */ swc1 $f0, 0x1c($sp) -/* A0BE30 80240140 8FBF0030 */ lw $ra, 0x30($sp) -/* A0BE34 80240144 8FB1002C */ lw $s1, 0x2c($sp) -/* A0BE38 80240148 8FB00028 */ lw $s0, 0x28($sp) -/* A0BE3C 8024014C D7BE0060 */ ldc1 $f30, 0x60($sp) -/* A0BE40 80240150 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* A0BE44 80240154 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* A0BE48 80240158 D7B80048 */ ldc1 $f24, 0x48($sp) -/* A0BE4C 8024015C D7B60040 */ ldc1 $f22, 0x40($sp) -/* A0BE50 80240160 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A0BE54 80240164 24020002 */ addiu $v0, $zero, 2 -/* A0BE58 80240168 03E00008 */ jr $ra -/* A0BE5C 8024016C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_hos/hos_00/func_80240584_A0BCF0.s b/asm/nonmatchings/world/area_hos/hos_00/func_80240584_A0BCF0.s deleted file mode 100644 index cf307d46fa..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_00/func_80240584_A0BCF0.s +++ /dev/null @@ -1,148 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240584_A0C274 -/* A0C274 80240584 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A0C278 80240588 AFB10034 */ sw $s1, 0x34($sp) -/* A0C27C 8024058C 0080882D */ daddu $s1, $a0, $zero -/* A0C280 80240590 3C01800B */ lui $at, 0x800b -/* A0C284 80240594 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* A0C288 80240598 3C014334 */ lui $at, 0x4334 -/* A0C28C 8024059C 44811000 */ mtc1 $at, $f2 -/* A0C290 802405A0 3C014049 */ lui $at, 0x4049 -/* A0C294 802405A4 34210FD8 */ ori $at, $at, 0xfd8 -/* A0C298 802405A8 44812000 */ mtc1 $at, $f4 -/* A0C29C 802405AC 24040096 */ addiu $a0, $zero, 0x96 -/* A0C2A0 802405B0 AFBF0038 */ sw $ra, 0x38($sp) -/* A0C2A4 802405B4 F7BE0068 */ sdc1 $f30, 0x68($sp) -/* A0C2A8 802405B8 46020003 */ div.s $f0, $f0, $f2 -/* A0C2AC 802405BC 46040782 */ mul.s $f30, $f0, $f4 -/* A0C2B0 802405C0 00000000 */ nop -/* A0C2B4 802405C4 AFB00030 */ sw $s0, 0x30($sp) -/* A0C2B8 802405C8 F7BC0060 */ sdc1 $f28, 0x60($sp) -/* A0C2BC 802405CC F7BA0058 */ sdc1 $f26, 0x58($sp) -/* A0C2C0 802405D0 3C018024 */ lui $at, 0x8024 -/* A0C2C4 802405D4 D4224B50 */ ldc1 $f2, 0x4b50($at) -/* A0C2C8 802405D8 4600F021 */ cvt.d.s $f0, $f30 -/* A0C2CC 802405DC 46220100 */ add.d $f4, $f0, $f2 -/* A0C2D0 802405E0 F7B80050 */ sdc1 $f24, 0x50($sp) -/* A0C2D4 802405E4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A0C2D8 802405E8 46220001 */ sub.d $f0, $f0, $f2 -/* A0C2DC 802405EC F7B40040 */ sdc1 $f20, 0x40($sp) -/* A0C2E0 802405F0 46202120 */ cvt.s.d $f4, $f4 -/* A0C2E4 802405F4 46200020 */ cvt.s.d $f0, $f0 -/* A0C2E8 802405F8 E7A40020 */ swc1 $f4, 0x20($sp) -/* A0C2EC 802405FC 0C00A67F */ jal rand_int -/* A0C2F0 80240600 E7A00024 */ swc1 $f0, 0x24($sp) -/* A0C2F4 80240604 24040096 */ addiu $a0, $zero, 0x96 -/* A0C2F8 80240608 44823000 */ mtc1 $v0, $f6 -/* A0C2FC 8024060C 00000000 */ nop -/* A0C300 80240610 468031A0 */ cvt.s.w $f6, $f6 -/* A0C304 80240614 0C00A67F */ jal rand_int -/* A0C308 80240618 E7A60028 */ swc1 $f6, 0x28($sp) -/* A0C30C 8024061C 24040064 */ addiu $a0, $zero, 0x64 -/* A0C310 80240620 44823000 */ mtc1 $v0, $f6 -/* A0C314 80240624 00000000 */ nop -/* A0C318 80240628 468031A0 */ cvt.s.w $f6, $f6 -/* A0C31C 8024062C 0C00A67F */ jal rand_int -/* A0C320 80240630 E7A6002C */ swc1 $f6, 0x2c($sp) -/* A0C324 80240634 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A0C328 80240638 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A0C32C 8024063C 2442FFCE */ addiu $v0, $v0, -0x32 -/* A0C330 80240640 C6000030 */ lwc1 $f0, 0x30($s0) -/* A0C334 80240644 3C014348 */ lui $at, 0x4348 -/* A0C338 80240648 4481B000 */ mtc1 $at, $f22 -/* A0C33C 8024064C 4482A000 */ mtc1 $v0, $f20 -/* A0C340 80240650 00000000 */ nop -/* A0C344 80240654 4680A520 */ cvt.s.w $f20, $f20 -/* A0C348 80240658 4616003C */ c.lt.s $f0, $f22 -/* A0C34C 8024065C 00000000 */ nop -/* A0C350 80240660 4501004A */ bc1t .L8024078C -/* A0C354 80240664 24020002 */ addiu $v0, $zero, 2 -/* A0C358 80240668 0C00A85B */ jal sin_rad -/* A0C35C 8024066C 4600F306 */ mov.s $f12, $f30 -/* A0C360 80240670 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C364 80240674 00000000 */ nop -/* A0C368 80240678 C61A0028 */ lwc1 $f26, 0x28($s0) -/* A0C36C 8024067C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* A0C370 80240680 0C00A85B */ jal sin_rad -/* A0C374 80240684 4600D681 */ sub.s $f26, $f26, $f0 -/* A0C378 80240688 C7A60028 */ lwc1 $f6, 0x28($sp) -/* A0C37C 8024068C 46003002 */ mul.s $f0, $f6, $f0 -/* A0C380 80240690 00000000 */ nop -/* A0C384 80240694 C61C002C */ lwc1 $f28, 0x2c($s0) -/* A0C388 80240698 4616E700 */ add.s $f28, $f28, $f22 -/* A0C38C 8024069C 4600D680 */ add.s $f26, $f26, $f0 -/* A0C390 802406A0 0C00A874 */ jal cos_rad -/* A0C394 802406A4 4600F306 */ mov.s $f12, $f30 -/* A0C398 802406A8 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C39C 802406AC 00000000 */ nop -/* A0C3A0 802406B0 C6180030 */ lwc1 $f24, 0x30($s0) -/* A0C3A4 802406B4 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* A0C3A8 802406B8 0C00A874 */ jal cos_rad -/* A0C3AC 802406BC 4600C600 */ add.s $f24, $f24, $f0 -/* A0C3B0 802406C0 C7A60028 */ lwc1 $f6, 0x28($sp) -/* A0C3B4 802406C4 46003002 */ mul.s $f0, $f6, $f0 -/* A0C3B8 802406C8 00000000 */ nop -/* A0C3BC 802406CC 4600C601 */ sub.s $f24, $f24, $f0 -/* A0C3C0 802406D0 4600D18D */ trunc.w.s $f6, $f26 -/* A0C3C4 802406D4 E6260088 */ swc1 $f6, 0x88($s1) -/* A0C3C8 802406D8 4600E18D */ trunc.w.s $f6, $f28 -/* A0C3CC 802406DC E626008C */ swc1 $f6, 0x8c($s1) -/* A0C3D0 802406E0 4600C18D */ trunc.w.s $f6, $f24 -/* A0C3D4 802406E4 E6260090 */ swc1 $f6, 0x90($s1) -/* A0C3D8 802406E8 0C00A85B */ jal sin_rad -/* A0C3DC 802406EC 4600F306 */ mov.s $f12, $f30 -/* A0C3E0 802406F0 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C3E4 802406F4 00000000 */ nop -/* A0C3E8 802406F8 C6160028 */ lwc1 $f22, 0x28($s0) -/* A0C3EC 802406FC C7AC0024 */ lwc1 $f12, 0x24($sp) -/* A0C3F0 80240700 0C00A85B */ jal sin_rad -/* A0C3F4 80240704 4600B581 */ sub.s $f22, $f22, $f0 -/* A0C3F8 80240708 C7A6002C */ lwc1 $f6, 0x2c($sp) -/* A0C3FC 8024070C 46003002 */ mul.s $f0, $f6, $f0 -/* A0C400 80240710 00000000 */ nop -/* A0C404 80240714 4600F306 */ mov.s $f12, $f30 -/* A0C408 80240718 C61E002C */ lwc1 $f30, 0x2c($s0) -/* A0C40C 8024071C 0C00A874 */ jal cos_rad -/* A0C410 80240720 4600B580 */ add.s $f22, $f22, $f0 -/* A0C414 80240724 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C418 80240728 00000000 */ nop -/* A0C41C 8024072C C6140030 */ lwc1 $f20, 0x30($s0) -/* A0C420 80240730 C7AC0024 */ lwc1 $f12, 0x24($sp) -/* A0C424 80240734 0C00A874 */ jal cos_rad -/* A0C428 80240738 4600A500 */ add.s $f20, $f20, $f0 -/* A0C42C 8024073C C7A6002C */ lwc1 $f6, 0x2c($sp) -/* A0C430 80240740 46003002 */ mul.s $f0, $f6, $f0 -/* A0C434 80240744 00000000 */ nop -/* A0C438 80240748 24040004 */ addiu $a0, $zero, 4 -/* A0C43C 8024074C 0C00A67F */ jal rand_int -/* A0C440 80240750 4600A501 */ sub.s $f20, $f20, $f0 -/* A0C444 80240754 24040002 */ addiu $a0, $zero, 2 -/* A0C448 80240758 2442000A */ addiu $v0, $v0, 0xa -/* A0C44C 8024075C 4405D000 */ mfc1 $a1, $f26 -/* A0C450 80240760 4406E000 */ mfc1 $a2, $f28 -/* A0C454 80240764 4407C000 */ mfc1 $a3, $f24 -/* A0C458 80240768 44820000 */ mtc1 $v0, $f0 -/* A0C45C 8024076C 00000000 */ nop -/* A0C460 80240770 46800020 */ cvt.s.w $f0, $f0 -/* A0C464 80240774 E7B60010 */ swc1 $f22, 0x10($sp) -/* A0C468 80240778 E7BE0014 */ swc1 $f30, 0x14($sp) -/* A0C46C 8024077C E7A0001C */ swc1 $f0, 0x1c($sp) -/* A0C470 80240780 0C01BF8C */ jal func_8006FE30 -/* A0C474 80240784 E7B40018 */ swc1 $f20, 0x18($sp) -/* A0C478 80240788 24020002 */ addiu $v0, $zero, 2 -.L8024078C: -/* A0C47C 8024078C 8FBF0038 */ lw $ra, 0x38($sp) -/* A0C480 80240790 8FB10034 */ lw $s1, 0x34($sp) -/* A0C484 80240794 8FB00030 */ lw $s0, 0x30($sp) -/* A0C488 80240798 D7BE0068 */ ldc1 $f30, 0x68($sp) -/* A0C48C 8024079C D7BC0060 */ ldc1 $f28, 0x60($sp) -/* A0C490 802407A0 D7BA0058 */ ldc1 $f26, 0x58($sp) -/* A0C494 802407A4 D7B80050 */ ldc1 $f24, 0x50($sp) -/* A0C498 802407A8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A0C49C 802407AC D7B40040 */ ldc1 $f20, 0x40($sp) -/* A0C4A0 802407B0 03E00008 */ jr $ra -/* A0C4A4 802407B4 27BD0070 */ addiu $sp, $sp, 0x70 -/* A0C4A8 802407B8 00000000 */ nop -/* A0C4AC 802407BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_00/func_802407C0_A0BCF0.s b/asm/nonmatchings/world/area_hos/hos_00/func_802407C0_A0BCF0.s deleted file mode 100644 index 8a35eb943d..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_00/func_802407C0_A0BCF0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407C0_A0C4B0 -/* A0C4B0 802407C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A0C4B4 802407C4 AFBF0010 */ sw $ra, 0x10($sp) -/* A0C4B8 802407C8 8C82000C */ lw $v0, 0xc($a0) -/* A0C4BC 802407CC 0C0B1EAF */ jal get_variable -/* A0C4C0 802407D0 8C450000 */ lw $a1, ($v0) -/* A0C4C4 802407D4 8FBF0010 */ lw $ra, 0x10($sp) -/* A0C4C8 802407D8 3C018011 */ lui $at, 0x8011 -/* A0C4CC 802407DC A022F2A2 */ sb $v0, -0xd5e($at) -/* A0C4D0 802407E0 24020002 */ addiu $v0, $zero, 2 -/* A0C4D4 802407E4 03E00008 */ jr $ra -/* A0C4D8 802407E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A0C4DC 802407EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_00/func_802407F0_A0BCF0.s b/asm/nonmatchings/world/area_hos/hos_00/func_802407F0_A0BCF0.s deleted file mode 100644 index 9e71d5b4dd..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_00/func_802407F0_A0BCF0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407F0_A0C4E0 -/* A0C4E0 802407F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A0C4E4 802407F4 AFB00010 */ sw $s0, 0x10($sp) -/* A0C4E8 802407F8 3C108024 */ lui $s0, 0x8024 -/* A0C4EC 802407FC 26102970 */ addiu $s0, $s0, 0x2970 -/* A0C4F0 80240800 AFBF0018 */ sw $ra, 0x18($sp) -/* A0C4F4 80240804 AFB10014 */ sw $s1, 0x14($sp) -/* A0C4F8 80240808 8E020000 */ lw $v0, ($s0) -/* A0C4FC 8024080C 14400010 */ bnez $v0, .L80240850 -/* A0C500 80240810 0080882D */ daddu $s1, $a0, $zero -/* A0C504 80240814 0C00AB39 */ jal heap_malloc -/* A0C508 80240818 24040040 */ addiu $a0, $zero, 0x40 -/* A0C50C 8024081C AE020000 */ sw $v0, ($s0) -/* A0C510 80240820 0000182D */ daddu $v1, $zero, $zero -/* A0C514 80240824 0040282D */ daddu $a1, $v0, $zero -/* A0C518 80240828 0220202D */ daddu $a0, $s1, $zero -.L8024082C: -/* A0C51C 8024082C 8C820084 */ lw $v0, 0x84($a0) -/* A0C520 80240830 24840004 */ addiu $a0, $a0, 4 -/* A0C524 80240834 24630001 */ addiu $v1, $v1, 1 -/* A0C528 80240838 ACA20000 */ sw $v0, ($a1) -/* A0C52C 8024083C 28620010 */ slti $v0, $v1, 0x10 -/* A0C530 80240840 1440FFFA */ bnez $v0, .L8024082C -/* A0C534 80240844 24A50004 */ addiu $a1, $a1, 4 -/* A0C538 80240848 08090223 */ j .L8024088C -/* A0C53C 8024084C 00000000 */ nop -.L80240850: -/* A0C540 80240850 0000182D */ daddu $v1, $zero, $zero -/* A0C544 80240854 0040282D */ daddu $a1, $v0, $zero -/* A0C548 80240858 0220202D */ daddu $a0, $s1, $zero -.L8024085C: -/* A0C54C 8024085C 8CA20000 */ lw $v0, ($a1) -/* A0C550 80240860 24A50004 */ addiu $a1, $a1, 4 -/* A0C554 80240864 24630001 */ addiu $v1, $v1, 1 -/* A0C558 80240868 AC820084 */ sw $v0, 0x84($a0) -/* A0C55C 8024086C 28620010 */ slti $v0, $v1, 0x10 -/* A0C560 80240870 1440FFFA */ bnez $v0, .L8024085C -/* A0C564 80240874 24840004 */ addiu $a0, $a0, 4 -/* A0C568 80240878 3C108024 */ lui $s0, 0x8024 -/* A0C56C 8024087C 26102970 */ addiu $s0, $s0, 0x2970 -/* A0C570 80240880 0C00AB4B */ jal heap_free -/* A0C574 80240884 8E040000 */ lw $a0, ($s0) -/* A0C578 80240888 AE000000 */ sw $zero, ($s0) -.L8024088C: -/* A0C57C 8024088C 8FBF0018 */ lw $ra, 0x18($sp) -/* A0C580 80240890 8FB10014 */ lw $s1, 0x14($sp) -/* A0C584 80240894 8FB00010 */ lw $s0, 0x10($sp) -/* A0C588 80240898 24020002 */ addiu $v0, $zero, 2 -/* A0C58C 8024089C 03E00008 */ jr $ra -/* A0C590 802408A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_00/func_80240908_A0BCF0.s b/asm/nonmatchings/world/area_hos/hos_00/func_80240908_A0BCF0.s deleted file mode 100644 index 33ee37042b..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_00/func_80240908_A0BCF0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240908_A0C5F8 -/* A0C5F8 80240908 24020001 */ addiu $v0, $zero, 1 -/* A0C5FC 8024090C 3C018011 */ lui $at, 0x8011 -/* A0C600 80240910 A022F29A */ sb $v0, -0xd66($at) -/* A0C604 80240914 03E00008 */ jr $ra -/* A0C608 80240918 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_00/func_8024091C_A0BCF0.s b/asm/nonmatchings/world/area_hos/hos_00/func_8024091C_A0BCF0.s deleted file mode 100644 index b9933b0752..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_00/func_8024091C_A0BCF0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024091C_A0C60C -/* A0C60C 8024091C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A0C610 80240920 AFB10014 */ sw $s1, 0x14($sp) -/* A0C614 80240924 0080882D */ daddu $s1, $a0, $zero -/* A0C618 80240928 AFBF0018 */ sw $ra, 0x18($sp) -/* A0C61C 8024092C AFB00010 */ sw $s0, 0x10($sp) -/* A0C620 80240930 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A0C624 80240934 8E30000C */ lw $s0, 0xc($s1) -/* A0C628 80240938 8E050000 */ lw $a1, ($s0) -/* A0C62C 8024093C 0C0B210B */ jal get_float_variable -/* A0C630 80240940 26100004 */ addiu $s0, $s0, 4 -/* A0C634 80240944 0220202D */ daddu $a0, $s1, $zero -/* A0C638 80240948 8E050000 */ lw $a1, ($s0) -/* A0C63C 8024094C 0C0B210B */ jal get_float_variable -/* A0C640 80240950 46000506 */ mov.s $f20, $f0 -/* A0C644 80240954 0C00A8BB */ jal sin_deg -/* A0C648 80240958 46000306 */ mov.s $f12, $f0 -/* A0C64C 8024095C 4600A502 */ mul.s $f20, $f20, $f0 -/* A0C650 80240960 00000000 */ nop -/* A0C654 80240964 26100004 */ addiu $s0, $s0, 4 -/* A0C658 80240968 8E050000 */ lw $a1, ($s0) -/* A0C65C 8024096C 4406A000 */ mfc1 $a2, $f20 -/* A0C660 80240970 0C0B2190 */ jal set_float_variable -/* A0C664 80240974 0220202D */ daddu $a0, $s1, $zero -/* A0C668 80240978 8FBF0018 */ lw $ra, 0x18($sp) -/* A0C66C 8024097C 8FB10014 */ lw $s1, 0x14($sp) -/* A0C670 80240980 8FB00010 */ lw $s0, 0x10($sp) -/* A0C674 80240984 D7B40020 */ ldc1 $f20, 0x20($sp) -/* A0C678 80240988 24020002 */ addiu $v0, $zero, 2 -/* A0C67C 8024098C 03E00008 */ jr $ra -/* A0C680 80240990 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_00/func_80240994_A0BCF0.s b/asm/nonmatchings/world/area_hos/hos_00/func_80240994_A0BCF0.s deleted file mode 100644 index c4db5b26d5..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_00/func_80240994_A0BCF0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240994_A0C684 -/* A0C684 80240994 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A0C688 80240998 2404FFFC */ addiu $a0, $zero, -4 -/* A0C68C 8024099C AFBF0020 */ sw $ra, 0x20($sp) -/* A0C690 802409A0 AFB3001C */ sw $s3, 0x1c($sp) -/* A0C694 802409A4 AFB20018 */ sw $s2, 0x18($sp) -/* A0C698 802409A8 AFB10014 */ sw $s1, 0x14($sp) -/* A0C69C 802409AC 0C00EABB */ jal get_npc_unsafe -/* A0C6A0 802409B0 AFB00010 */ sw $s0, 0x10($sp) -/* A0C6A4 802409B4 0000202D */ daddu $a0, $zero, $zero -/* A0C6A8 802409B8 0C00EABB */ jal get_npc_unsafe -/* A0C6AC 802409BC 0040882D */ daddu $s1, $v0, $zero -/* A0C6B0 802409C0 0040802D */ daddu $s0, $v0, $zero -/* A0C6B4 802409C4 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A0C6B8 802409C8 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A0C6BC 802409CC 8E060038 */ lw $a2, 0x38($s0) -/* A0C6C0 802409D0 0C00A720 */ jal atan2 -/* A0C6C4 802409D4 8E070040 */ lw $a3, 0x40($s0) -/* A0C6C8 802409D8 E620000C */ swc1 $f0, 0xc($s1) -/* A0C6CC 802409DC 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* A0C6D0 802409E0 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* A0C6D4 802409E4 C62C0028 */ lwc1 $f12, 0x28($s1) -/* A0C6D8 802409E8 C62E0030 */ lwc1 $f14, 0x30($s1) -/* A0C6DC 802409EC 8E060038 */ lw $a2, 0x38($s0) -/* A0C6E0 802409F0 0C00A720 */ jal atan2 -/* A0C6E4 802409F4 8E070040 */ lw $a3, 0x40($s0) -/* A0C6E8 802409F8 3C138024 */ lui $s3, 0x8024 -/* A0C6EC 802409FC 26732B9C */ addiu $s3, $s3, 0x2b9c -/* A0C6F0 80240A00 3C128024 */ lui $s2, %hi(pause_set_cursor_opacity) -/* A0C6F4 80240A04 26522BA0 */ addiu $s2, $s2, %lo(pause_set_cursor_opacity) -/* A0C6F8 80240A08 C66C0000 */ lwc1 $f12, ($s3) -/* A0C6FC 80240A0C C64E0000 */ lwc1 $f14, ($s2) -/* A0C700 80240A10 E6200080 */ swc1 $f0, 0x80($s1) -/* A0C704 80240A14 8E060038 */ lw $a2, 0x38($s0) -/* A0C708 80240A18 0C00A720 */ jal atan2 -/* A0C70C 80240A1C 8E070040 */ lw $a3, 0x40($s0) -/* A0C710 80240A20 C6020038 */ lwc1 $f2, 0x38($s0) -/* A0C714 80240A24 C6040040 */ lwc1 $f4, 0x40($s0) -/* A0C718 80240A28 E600000C */ swc1 $f0, 0xc($s0) -/* A0C71C 80240A2C E6620000 */ swc1 $f2, ($s3) -/* A0C720 80240A30 E6440000 */ swc1 $f4, ($s2) -/* A0C724 80240A34 8FBF0020 */ lw $ra, 0x20($sp) -/* A0C728 80240A38 8FB3001C */ lw $s3, 0x1c($sp) -/* A0C72C 80240A3C 8FB20018 */ lw $s2, 0x18($sp) -/* A0C730 80240A40 8FB10014 */ lw $s1, 0x14($sp) -/* A0C734 80240A44 8FB00010 */ lw $s0, 0x10($sp) -/* A0C738 80240A48 24020002 */ addiu $v0, $zero, 2 -/* A0C73C 80240A4C 03E00008 */ jr $ra -/* A0C740 80240A50 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_00/func_80240B20_A0BCF0.s b/asm/nonmatchings/world/area_hos/hos_00/func_80240B20_A0BCF0.s deleted file mode 100644 index f552d12cd2..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_00/func_80240B20_A0BCF0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B20_A0C810 -/* A0C810 80240B20 3C03800B */ lui $v1, %hi(gCameras) -/* A0C814 80240B24 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* A0C818 80240B28 94620000 */ lhu $v0, ($v1) -/* A0C81C 80240B2C 34421000 */ ori $v0, $v0, 0x1000 -/* A0C820 80240B30 A4620000 */ sh $v0, ($v1) -/* A0C824 80240B34 03E00008 */ jr $ra -/* A0C828 80240B38 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_00/func_80240B3C_A0BCF0.s b/asm/nonmatchings/world/area_hos/hos_00/func_80240B3C_A0BCF0.s deleted file mode 100644 index 1872d26d35..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_00/func_80240B3C_A0BCF0.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B3C_A0C82C -/* A0C82C 80240B3C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A0C830 80240B40 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A0C834 80240B44 3C01439B */ lui $at, 0x439b -/* A0C838 80240B48 4481A000 */ mtc1 $at, $f20 -/* A0C83C 80240B4C AFB00010 */ sw $s0, 0x10($sp) -/* A0C840 80240B50 0080802D */ daddu $s0, $a0, $zero -/* A0C844 80240B54 AFBF001C */ sw $ra, 0x1c($sp) -/* A0C848 80240B58 AFB20018 */ sw $s2, 0x18($sp) -/* A0C84C 80240B5C AFB10014 */ sw $s1, 0x14($sp) -/* A0C850 80240B60 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* A0C854 80240B64 F7B80030 */ sdc1 $f24, 0x30($sp) -/* A0C858 80240B68 F7B60028 */ sdc1 $f22, 0x28($sp) -/* A0C85C 80240B6C 8E110084 */ lw $s1, 0x84($s0) -/* A0C860 80240B70 8E12008C */ lw $s2, 0x8c($s0) -/* A0C864 80240B74 3C0142C8 */ lui $at, 0x42c8 -/* A0C868 80240B78 4481C000 */ mtc1 $at, $f24 -/* A0C86C 80240B7C 0C00A8BB */ jal sin_deg -/* A0C870 80240B80 4600A306 */ mov.s $f12, $f20 -/* A0C874 80240B84 46180002 */ mul.s $f0, $f0, $f24 -/* A0C878 80240B88 00000000 */ nop -/* A0C87C 80240B8C 4491B000 */ mtc1 $s1, $f22 -/* A0C880 80240B90 00000000 */ nop -/* A0C884 80240B94 4680B5A0 */ cvt.s.w $f22, $f22 -/* A0C888 80240B98 4600B000 */ add.s $f0, $f22, $f0 -/* A0C88C 80240B9C 4600008D */ trunc.w.s $f2, $f0 -/* A0C890 80240BA0 E6020084 */ swc1 $f2, 0x84($s0) -/* A0C894 80240BA4 0C00A8D4 */ jal cos_deg -/* A0C898 80240BA8 4600A306 */ mov.s $f12, $f20 -/* A0C89C 80240BAC 46180002 */ mul.s $f0, $f0, $f24 -/* A0C8A0 80240BB0 00000000 */ nop -/* A0C8A4 80240BB4 4492A000 */ mtc1 $s2, $f20 -/* A0C8A8 80240BB8 00000000 */ nop -/* A0C8AC 80240BBC 4680A520 */ cvt.s.w $f20, $f20 -/* A0C8B0 80240BC0 3C014302 */ lui $at, 0x4302 -/* A0C8B4 80240BC4 4481D000 */ mtc1 $at, $f26 -/* A0C8B8 80240BC8 4600A001 */ sub.s $f0, $f20, $f0 -/* A0C8BC 80240BCC 4600008D */ trunc.w.s $f2, $f0 -/* A0C8C0 80240BD0 E6020088 */ swc1 $f2, 0x88($s0) -/* A0C8C4 80240BD4 0C00A8BB */ jal sin_deg -/* A0C8C8 80240BD8 4600D306 */ mov.s $f12, $f26 -/* A0C8CC 80240BDC 46180002 */ mul.s $f0, $f0, $f24 -/* A0C8D0 80240BE0 00000000 */ nop -/* A0C8D4 80240BE4 4600B580 */ add.s $f22, $f22, $f0 -/* A0C8D8 80240BE8 4600B08D */ trunc.w.s $f2, $f22 -/* A0C8DC 80240BEC E602008C */ swc1 $f2, 0x8c($s0) -/* A0C8E0 80240BF0 0C00A8D4 */ jal cos_deg -/* A0C8E4 80240BF4 4600D306 */ mov.s $f12, $f26 -/* A0C8E8 80240BF8 46180002 */ mul.s $f0, $f0, $f24 -/* A0C8EC 80240BFC 00000000 */ nop -/* A0C8F0 80240C00 4600A501 */ sub.s $f20, $f20, $f0 -/* A0C8F4 80240C04 4600A08D */ trunc.w.s $f2, $f20 -/* A0C8F8 80240C08 E6020090 */ swc1 $f2, 0x90($s0) -/* A0C8FC 80240C0C 8FBF001C */ lw $ra, 0x1c($sp) -/* A0C900 80240C10 8FB20018 */ lw $s2, 0x18($sp) -/* A0C904 80240C14 8FB10014 */ lw $s1, 0x14($sp) -/* A0C908 80240C18 8FB00010 */ lw $s0, 0x10($sp) -/* A0C90C 80240C1C D7BA0038 */ ldc1 $f26, 0x38($sp) -/* A0C910 80240C20 D7B80030 */ ldc1 $f24, 0x30($sp) -/* A0C914 80240C24 D7B60028 */ ldc1 $f22, 0x28($sp) -/* A0C918 80240C28 D7B40020 */ ldc1 $f20, 0x20($sp) -/* A0C91C 80240C2C 24020002 */ addiu $v0, $zero, 2 -/* A0C920 80240C30 03E00008 */ jr $ra -/* A0C924 80240C34 27BD0040 */ addiu $sp, $sp, 0x40 -/* A0C928 80240C38 00000000 */ nop -/* A0C92C 80240C3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_01/func_80240120_A10880.s b/asm/nonmatchings/world/area_hos/hos_01/func_80240120_A10880.s deleted file mode 100644 index 845e4bed0d..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/func_80240120_A10880.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240120_A109A0 -/* A109A0 80240120 27BDFF98 */ addiu $sp, $sp, -0x68 -/* A109A4 80240124 F7BA0050 */ sdc1 $f26, 0x50($sp) -/* A109A8 80240128 3C01800B */ lui $at, 0x800b -/* A109AC 8024012C C43A1DEC */ lwc1 $f26, 0x1dec($at) -/* A109B0 80240130 3C014334 */ lui $at, 0x4334 -/* A109B4 80240134 44810000 */ mtc1 $at, $f0 -/* A109B8 80240138 3C014049 */ lui $at, 0x4049 -/* A109BC 8024013C 34210FD8 */ ori $at, $at, 0xfd8 -/* A109C0 80240140 44811000 */ mtc1 $at, $f2 -/* A109C4 80240144 240401F4 */ addiu $a0, $zero, 0x1f4 -/* A109C8 80240148 AFBF0034 */ sw $ra, 0x34($sp) -/* A109CC 8024014C 4600D683 */ div.s $f26, $f26, $f0 -/* A109D0 80240150 4602D682 */ mul.s $f26, $f26, $f2 -/* A109D4 80240154 00000000 */ nop -/* A109D8 80240158 AFB00030 */ sw $s0, 0x30($sp) -/* A109DC 8024015C F7B60040 */ sdc1 $f22, 0x40($sp) -/* A109E0 80240160 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A109E4 80240164 3C018024 */ lui $at, 0x8024 -/* A109E8 80240168 D4205970 */ ldc1 $f0, 0x5970($at) -/* A109EC 8024016C 4600D521 */ cvt.d.s $f20, $f26 -/* A109F0 80240170 4620A580 */ add.d $f22, $f20, $f0 -/* A109F4 80240174 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* A109F8 80240178 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* A109FC 8024017C 4620A501 */ sub.d $f20, $f20, $f0 -/* A10A00 80240180 F7B80048 */ sdc1 $f24, 0x48($sp) -/* A10A04 80240184 4620B5A0 */ cvt.s.d $f22, $f22 -/* A10A08 80240188 0C00A67F */ jal rand_int -/* A10A0C 8024018C 4620A520 */ cvt.s.d $f20, $f20 -/* A10A10 80240190 2442FF06 */ addiu $v0, $v0, -0xfa -/* A10A14 80240194 4482C000 */ mtc1 $v0, $f24 -/* A10A18 80240198 00000000 */ nop -/* A10A1C 8024019C 4680C620 */ cvt.s.w $f24, $f24 -/* A10A20 802401A0 0C00A67F */ jal rand_int -/* A10A24 802401A4 240401F4 */ addiu $a0, $zero, 0x1f4 -/* A10A28 802401A8 24040064 */ addiu $a0, $zero, 0x64 -/* A10A2C 802401AC 2442FF06 */ addiu $v0, $v0, -0xfa -/* A10A30 802401B0 44822000 */ mtc1 $v0, $f4 -/* A10A34 802401B4 00000000 */ nop -/* A10A38 802401B8 46802120 */ cvt.s.w $f4, $f4 -/* A10A3C 802401BC 0C00A67F */ jal rand_int -/* A10A40 802401C0 E7A40028 */ swc1 $f4, 0x28($sp) -/* A10A44 802401C4 24420258 */ addiu $v0, $v0, 0x258 -/* A10A48 802401C8 4482E000 */ mtc1 $v0, $f28 -/* A10A4C 802401CC 00000000 */ nop -/* A10A50 802401D0 4680E720 */ cvt.s.w $f28, $f28 -/* A10A54 802401D4 0C00A85B */ jal sin_rad -/* A10A58 802401D8 4600D306 */ mov.s $f12, $f26 -/* A10A5C 802401DC 4600E002 */ mul.s $f0, $f28, $f0 -/* A10A60 802401E0 00000000 */ nop -/* A10A64 802401E4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A10A68 802401E8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A10A6C 802401EC C6020028 */ lwc1 $f2, 0x28($s0) -/* A10A70 802401F0 46001780 */ add.s $f30, $f2, $f0 -/* A10A74 802401F4 0C00A85B */ jal sin_rad -/* A10A78 802401F8 4600B306 */ mov.s $f12, $f22 -/* A10A7C 802401FC 4600C002 */ mul.s $f0, $f24, $f0 -/* A10A80 80240200 00000000 */ nop -/* A10A84 80240204 C602002C */ lwc1 $f2, 0x2c($s0) -/* A10A88 80240208 4600F780 */ add.s $f30, $f30, $f0 -/* A10A8C 8024020C 3C014348 */ lui $at, 0x4348 -/* A10A90 80240210 44810000 */ mtc1 $at, $f0 -/* A10A94 80240214 00000000 */ nop -/* A10A98 80240218 46001080 */ add.s $f2, $f2, $f0 -/* A10A9C 8024021C 4600D306 */ mov.s $f12, $f26 -/* A10AA0 80240220 E7BE0020 */ swc1 $f30, 0x20($sp) -/* A10AA4 80240224 0C00A874 */ jal cos_rad -/* A10AA8 80240228 E7A20024 */ swc1 $f2, 0x24($sp) -/* A10AAC 8024022C 4600E002 */ mul.s $f0, $f28, $f0 -/* A10AB0 80240230 00000000 */ nop -/* A10AB4 80240234 C61E0030 */ lwc1 $f30, 0x30($s0) -/* A10AB8 80240238 4600F781 */ sub.s $f30, $f30, $f0 -/* A10ABC 8024023C 0C00A874 */ jal cos_rad -/* A10AC0 80240240 4600B306 */ mov.s $f12, $f22 -/* A10AC4 80240244 4600C602 */ mul.s $f24, $f24, $f0 -/* A10AC8 80240248 00000000 */ nop -/* A10ACC 8024024C 4618F781 */ sub.s $f30, $f30, $f24 -/* A10AD0 80240250 0C00A85B */ jal sin_rad -/* A10AD4 80240254 4600D306 */ mov.s $f12, $f26 -/* A10AD8 80240258 4600E002 */ mul.s $f0, $f28, $f0 -/* A10ADC 8024025C 00000000 */ nop -/* A10AE0 80240260 C6180028 */ lwc1 $f24, 0x28($s0) -/* A10AE4 80240264 4600A306 */ mov.s $f12, $f20 -/* A10AE8 80240268 0C00A85B */ jal sin_rad -/* A10AEC 8024026C 4600C600 */ add.s $f24, $f24, $f0 -/* A10AF0 80240270 C7A40028 */ lwc1 $f4, 0x28($sp) -/* A10AF4 80240274 46002002 */ mul.s $f0, $f4, $f0 -/* A10AF8 80240278 00000000 */ nop -/* A10AFC 8024027C 4600D306 */ mov.s $f12, $f26 -/* A10B00 80240280 C61A002C */ lwc1 $f26, 0x2c($s0) -/* A10B04 80240284 0C00A874 */ jal cos_rad -/* A10B08 80240288 4600C600 */ add.s $f24, $f24, $f0 -/* A10B0C 8024028C 4600E702 */ mul.s $f28, $f28, $f0 -/* A10B10 80240290 00000000 */ nop -/* A10B14 80240294 C6160030 */ lwc1 $f22, 0x30($s0) -/* A10B18 80240298 4600A306 */ mov.s $f12, $f20 -/* A10B1C 8024029C 0C00A874 */ jal cos_rad -/* A10B20 802402A0 461CB581 */ sub.s $f22, $f22, $f28 -/* A10B24 802402A4 C7A40028 */ lwc1 $f4, 0x28($sp) -/* A10B28 802402A8 46002002 */ mul.s $f0, $f4, $f0 -/* A10B2C 802402AC 00000000 */ nop -/* A10B30 802402B0 2404000A */ addiu $a0, $zero, 0xa -/* A10B34 802402B4 0C00A67F */ jal rand_int -/* A10B38 802402B8 4600B581 */ sub.s $f22, $f22, $f0 -/* A10B3C 802402BC 0000202D */ daddu $a0, $zero, $zero -/* A10B40 802402C0 2442000A */ addiu $v0, $v0, 0xa -/* A10B44 802402C4 8FA50020 */ lw $a1, 0x20($sp) -/* A10B48 802402C8 8FA60024 */ lw $a2, 0x24($sp) -/* A10B4C 802402CC 4407F000 */ mfc1 $a3, $f30 -/* A10B50 802402D0 44820000 */ mtc1 $v0, $f0 -/* A10B54 802402D4 00000000 */ nop -/* A10B58 802402D8 46800020 */ cvt.s.w $f0, $f0 -/* A10B5C 802402DC E7B80010 */ swc1 $f24, 0x10($sp) -/* A10B60 802402E0 E7BA0014 */ swc1 $f26, 0x14($sp) -/* A10B64 802402E4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A10B68 802402E8 0C01BF8C */ jal func_8006FE30 -/* A10B6C 802402EC E7B60018 */ swc1 $f22, 0x18($sp) -/* A10B70 802402F0 8FBF0034 */ lw $ra, 0x34($sp) -/* A10B74 802402F4 8FB00030 */ lw $s0, 0x30($sp) -/* A10B78 802402F8 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* A10B7C 802402FC D7BC0058 */ ldc1 $f28, 0x58($sp) -/* A10B80 80240300 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* A10B84 80240304 D7B80048 */ ldc1 $f24, 0x48($sp) -/* A10B88 80240308 D7B60040 */ ldc1 $f22, 0x40($sp) -/* A10B8C 8024030C D7B40038 */ ldc1 $f20, 0x38($sp) -/* A10B90 80240310 24020002 */ addiu $v0, $zero, 2 -/* A10B94 80240314 03E00008 */ jr $ra -/* A10B98 80240318 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_hos/hos_01/func_8024031C_A10880.s b/asm/nonmatchings/world/area_hos/hos_01/func_8024031C_A10880.s deleted file mode 100644 index fa510cdf0f..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/func_8024031C_A10880.s +++ /dev/null @@ -1,139 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024031C_A10B9C -/* A10B9C 8024031C 27BDFF98 */ addiu $sp, $sp, -0x68 -/* A10BA0 80240320 3C01800B */ lui $at, 0x800b -/* A10BA4 80240324 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* A10BA8 80240328 3C014334 */ lui $at, 0x4334 -/* A10BAC 8024032C 44811000 */ mtc1 $at, $f2 -/* A10BB0 80240330 3C014049 */ lui $at, 0x4049 -/* A10BB4 80240334 34210FD8 */ ori $at, $at, 0xfd8 -/* A10BB8 80240338 44812000 */ mtc1 $at, $f4 -/* A10BBC 8024033C 2404012C */ addiu $a0, $zero, 0x12c -/* A10BC0 80240340 AFBF0034 */ sw $ra, 0x34($sp) -/* A10BC4 80240344 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* A10BC8 80240348 46020003 */ div.s $f0, $f0, $f2 -/* A10BCC 8024034C 46040782 */ mul.s $f30, $f0, $f4 -/* A10BD0 80240350 00000000 */ nop -/* A10BD4 80240354 AFB00030 */ sw $s0, 0x30($sp) -/* A10BD8 80240358 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* A10BDC 8024035C F7BA0050 */ sdc1 $f26, 0x50($sp) -/* A10BE0 80240360 3C018024 */ lui $at, 0x8024 -/* A10BE4 80240364 D4225978 */ ldc1 $f2, 0x5978($at) -/* A10BE8 80240368 4600F021 */ cvt.d.s $f0, $f30 -/* A10BEC 8024036C 46220100 */ add.d $f4, $f0, $f2 -/* A10BF0 80240370 F7B80048 */ sdc1 $f24, 0x48($sp) -/* A10BF4 80240374 F7B60040 */ sdc1 $f22, 0x40($sp) -/* A10BF8 80240378 46220001 */ sub.d $f0, $f0, $f2 -/* A10BFC 8024037C F7B40038 */ sdc1 $f20, 0x38($sp) -/* A10C00 80240380 46202120 */ cvt.s.d $f4, $f4 -/* A10C04 80240384 46200020 */ cvt.s.d $f0, $f0 -/* A10C08 80240388 E7A40020 */ swc1 $f4, 0x20($sp) -/* A10C0C 8024038C 0C00A67F */ jal rand_int -/* A10C10 80240390 E7A00024 */ swc1 $f0, 0x24($sp) -/* A10C14 80240394 2442FF6A */ addiu $v0, $v0, -0x96 -/* A10C18 80240398 4482B000 */ mtc1 $v0, $f22 -/* A10C1C 8024039C 00000000 */ nop -/* A10C20 802403A0 4680B5A0 */ cvt.s.w $f22, $f22 -/* A10C24 802403A4 0C00A67F */ jal rand_int -/* A10C28 802403A8 2404012C */ addiu $a0, $zero, 0x12c -/* A10C2C 802403AC 24040064 */ addiu $a0, $zero, 0x64 -/* A10C30 802403B0 2442FF6A */ addiu $v0, $v0, -0x96 -/* A10C34 802403B4 44823000 */ mtc1 $v0, $f6 -/* A10C38 802403B8 00000000 */ nop -/* A10C3C 802403BC 468031A0 */ cvt.s.w $f6, $f6 -/* A10C40 802403C0 0C00A67F */ jal rand_int -/* A10C44 802403C4 E7A60028 */ swc1 $f6, 0x28($sp) -/* A10C48 802403C8 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A10C4C 802403CC 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A10C50 802403D0 24420032 */ addiu $v0, $v0, 0x32 -/* A10C54 802403D4 C602002C */ lwc1 $f2, 0x2c($s0) -/* A10C58 802403D8 3C01437A */ lui $at, 0x437a -/* A10C5C 802403DC 44810000 */ mtc1 $at, $f0 -/* A10C60 802403E0 4482A000 */ mtc1 $v0, $f20 -/* A10C64 802403E4 00000000 */ nop -/* A10C68 802403E8 4680A520 */ cvt.s.w $f20, $f20 -/* A10C6C 802403EC 4602003E */ c.le.s $f0, $f2 -/* A10C70 802403F0 00000000 */ nop -/* A10C74 802403F4 45010045 */ bc1t .L8024050C -/* A10C78 802403F8 24020002 */ addiu $v0, $zero, 2 -/* A10C7C 802403FC 0C00A85B */ jal sin_rad -/* A10C80 80240400 4600F306 */ mov.s $f12, $f30 -/* A10C84 80240404 4600A002 */ mul.s $f0, $f20, $f0 -/* A10C88 80240408 00000000 */ nop -/* A10C8C 8024040C C61A0028 */ lwc1 $f26, 0x28($s0) -/* A10C90 80240410 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* A10C94 80240414 0C00A85B */ jal sin_rad -/* A10C98 80240418 4600D681 */ sub.s $f26, $f26, $f0 -/* A10C9C 8024041C 4600B002 */ mul.s $f0, $f22, $f0 -/* A10CA0 80240420 00000000 */ nop -/* A10CA4 80240424 C61C002C */ lwc1 $f28, 0x2c($s0) -/* A10CA8 80240428 4600D680 */ add.s $f26, $f26, $f0 -/* A10CAC 8024042C 3C014348 */ lui $at, 0x4348 -/* A10CB0 80240430 44810000 */ mtc1 $at, $f0 -/* A10CB4 80240434 00000000 */ nop -/* A10CB8 80240438 4600E700 */ add.s $f28, $f28, $f0 -/* A10CBC 8024043C 0C00A874 */ jal cos_rad -/* A10CC0 80240440 4600F306 */ mov.s $f12, $f30 -/* A10CC4 80240444 4600A002 */ mul.s $f0, $f20, $f0 -/* A10CC8 80240448 00000000 */ nop -/* A10CCC 8024044C C6180030 */ lwc1 $f24, 0x30($s0) -/* A10CD0 80240450 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* A10CD4 80240454 0C00A874 */ jal cos_rad -/* A10CD8 80240458 4600C600 */ add.s $f24, $f24, $f0 -/* A10CDC 8024045C 4600B002 */ mul.s $f0, $f22, $f0 -/* A10CE0 80240460 00000000 */ nop -/* A10CE4 80240464 4600C601 */ sub.s $f24, $f24, $f0 -/* A10CE8 80240468 0C00A85B */ jal sin_rad -/* A10CEC 8024046C 4600F306 */ mov.s $f12, $f30 -/* A10CF0 80240470 4600A002 */ mul.s $f0, $f20, $f0 -/* A10CF4 80240474 00000000 */ nop -/* A10CF8 80240478 C6160028 */ lwc1 $f22, 0x28($s0) -/* A10CFC 8024047C C7AC0024 */ lwc1 $f12, 0x24($sp) -/* A10D00 80240480 0C00A85B */ jal sin_rad -/* A10D04 80240484 4600B581 */ sub.s $f22, $f22, $f0 -/* A10D08 80240488 C7A60028 */ lwc1 $f6, 0x28($sp) -/* A10D0C 8024048C 46003002 */ mul.s $f0, $f6, $f0 -/* A10D10 80240490 00000000 */ nop -/* A10D14 80240494 4600F306 */ mov.s $f12, $f30 -/* A10D18 80240498 C61E002C */ lwc1 $f30, 0x2c($s0) -/* A10D1C 8024049C 0C00A874 */ jal cos_rad -/* A10D20 802404A0 4600B580 */ add.s $f22, $f22, $f0 -/* A10D24 802404A4 4600A002 */ mul.s $f0, $f20, $f0 -/* A10D28 802404A8 00000000 */ nop -/* A10D2C 802404AC C6140030 */ lwc1 $f20, 0x30($s0) -/* A10D30 802404B0 C7AC0024 */ lwc1 $f12, 0x24($sp) -/* A10D34 802404B4 0C00A874 */ jal cos_rad -/* A10D38 802404B8 4600A500 */ add.s $f20, $f20, $f0 -/* A10D3C 802404BC C7A60028 */ lwc1 $f6, 0x28($sp) -/* A10D40 802404C0 46003002 */ mul.s $f0, $f6, $f0 -/* A10D44 802404C4 00000000 */ nop -/* A10D48 802404C8 2404000A */ addiu $a0, $zero, 0xa -/* A10D4C 802404CC 0C00A67F */ jal rand_int -/* A10D50 802404D0 4600A501 */ sub.s $f20, $f20, $f0 -/* A10D54 802404D4 24040001 */ addiu $a0, $zero, 1 -/* A10D58 802404D8 2442000A */ addiu $v0, $v0, 0xa -/* A10D5C 802404DC 4405D000 */ mfc1 $a1, $f26 -/* A10D60 802404E0 4406E000 */ mfc1 $a2, $f28 -/* A10D64 802404E4 4407C000 */ mfc1 $a3, $f24 -/* A10D68 802404E8 44820000 */ mtc1 $v0, $f0 -/* A10D6C 802404EC 00000000 */ nop -/* A10D70 802404F0 46800020 */ cvt.s.w $f0, $f0 -/* A10D74 802404F4 E7B60010 */ swc1 $f22, 0x10($sp) -/* A10D78 802404F8 E7BE0014 */ swc1 $f30, 0x14($sp) -/* A10D7C 802404FC E7A0001C */ swc1 $f0, 0x1c($sp) -/* A10D80 80240500 0C01BF8C */ jal func_8006FE30 -/* A10D84 80240504 E7B40018 */ swc1 $f20, 0x18($sp) -/* A10D88 80240508 24020002 */ addiu $v0, $zero, 2 -.L8024050C: -/* A10D8C 8024050C 8FBF0034 */ lw $ra, 0x34($sp) -/* A10D90 80240510 8FB00030 */ lw $s0, 0x30($sp) -/* A10D94 80240514 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* A10D98 80240518 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* A10D9C 8024051C D7BA0050 */ ldc1 $f26, 0x50($sp) -/* A10DA0 80240520 D7B80048 */ ldc1 $f24, 0x48($sp) -/* A10DA4 80240524 D7B60040 */ ldc1 $f22, 0x40($sp) -/* A10DA8 80240528 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A10DAC 8024052C 03E00008 */ jr $ra -/* A10DB0 80240530 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_hos/hos_01/func_80240768_A10880.s b/asm/nonmatchings/world/area_hos/hos_01/func_80240768_A10880.s deleted file mode 100644 index 5e961ca77a..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/func_80240768_A10880.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240768_A10FE8 -/* A10FE8 80240768 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A10FEC 8024076C AFBF0010 */ sw $ra, 0x10($sp) -/* A10FF0 80240770 8C82000C */ lw $v0, 0xc($a0) -/* A10FF4 80240774 3C068016 */ lui $a2, 0x8016 -/* A10FF8 80240778 84C6A552 */ lh $a2, -0x5aae($a2) -/* A10FFC 8024077C 0C0B2026 */ jal set_variable -/* A11000 80240780 8C450000 */ lw $a1, ($v0) -/* A11004 80240784 8FBF0010 */ lw $ra, 0x10($sp) -/* A11008 80240788 24020002 */ addiu $v0, $zero, 2 -/* A1100C 8024078C 03E00008 */ jr $ra -/* A11010 80240790 27BD0018 */ addiu $sp, $sp, 0x18 -/* A11014 80240794 00000000 */ nop -/* A11018 80240798 00000000 */ nop -/* A1101C 8024079C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_01/func_802407A0_A10880.s b/asm/nonmatchings/world/area_hos/hos_01/func_802407A0_A10880.s deleted file mode 100644 index 013e28d533..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/func_802407A0_A10880.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A0_A11020 -/* A11020 802407A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A11024 802407A4 AFB00010 */ sw $s0, 0x10($sp) -/* A11028 802407A8 0080802D */ daddu $s0, $a0, $zero -/* A1102C 802407AC AFBF0014 */ sw $ra, 0x14($sp) -/* A11030 802407B0 8E0300A8 */ lw $v1, 0xa8($s0) -/* A11034 802407B4 8E020088 */ lw $v0, 0x88($s0) -/* A11038 802407B8 00621821 */ addu $v1, $v1, $v0 -/* A1103C 802407BC 04610004 */ bgez $v1, .L802407D0 -/* A11040 802407C0 AE0300A8 */ sw $v1, 0xa8($s0) -/* A11044 802407C4 3C020002 */ lui $v0, 2 -/* A11048 802407C8 080901F8 */ j .L802407E0 -/* A1104C 802407CC 00621021 */ addu $v0, $v1, $v0 -.L802407D0: -/* A11050 802407D0 3C040002 */ lui $a0, 2 -/* A11054 802407D4 0083102A */ slt $v0, $a0, $v1 -/* A11058 802407D8 10400002 */ beqz $v0, .L802407E4 -/* A1105C 802407DC 00641023 */ subu $v0, $v1, $a0 -.L802407E0: -/* A11060 802407E0 AE0200A8 */ sw $v0, 0xa8($s0) -.L802407E4: -/* A11064 802407E4 8E0300AC */ lw $v1, 0xac($s0) -/* A11068 802407E8 8E02008C */ lw $v0, 0x8c($s0) -/* A1106C 802407EC 00621821 */ addu $v1, $v1, $v0 -/* A11070 802407F0 04610004 */ bgez $v1, .L80240804 -/* A11074 802407F4 AE0300AC */ sw $v1, 0xac($s0) -/* A11078 802407F8 3C020002 */ lui $v0, 2 -/* A1107C 802407FC 08090205 */ j .L80240814 -/* A11080 80240800 00621021 */ addu $v0, $v1, $v0 -.L80240804: -/* A11084 80240804 3C040002 */ lui $a0, 2 -/* A11088 80240808 0083102A */ slt $v0, $a0, $v1 -/* A1108C 8024080C 10400002 */ beqz $v0, .L80240818 -/* A11090 80240810 00641023 */ subu $v0, $v1, $a0 -.L80240814: -/* A11094 80240814 AE0200AC */ sw $v0, 0xac($s0) -.L80240818: -/* A11098 80240818 8E0300B0 */ lw $v1, 0xb0($s0) -/* A1109C 8024081C 8E020090 */ lw $v0, 0x90($s0) -/* A110A0 80240820 00621821 */ addu $v1, $v1, $v0 -/* A110A4 80240824 04610004 */ bgez $v1, .L80240838 -/* A110A8 80240828 AE0300B0 */ sw $v1, 0xb0($s0) -/* A110AC 8024082C 3C020002 */ lui $v0, 2 -/* A110B0 80240830 08090212 */ j .L80240848 -/* A110B4 80240834 00621021 */ addu $v0, $v1, $v0 -.L80240838: -/* A110B8 80240838 3C040002 */ lui $a0, 2 -/* A110BC 8024083C 0083102A */ slt $v0, $a0, $v1 -/* A110C0 80240840 10400002 */ beqz $v0, .L8024084C -/* A110C4 80240844 00641023 */ subu $v0, $v1, $a0 -.L80240848: -/* A110C8 80240848 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024084C: -/* A110CC 8024084C 8E0300B4 */ lw $v1, 0xb4($s0) -/* A110D0 80240850 8E020094 */ lw $v0, 0x94($s0) -/* A110D4 80240854 00621821 */ addu $v1, $v1, $v0 -/* A110D8 80240858 04610004 */ bgez $v1, .L8024086C -/* A110DC 8024085C AE0300B4 */ sw $v1, 0xb4($s0) -/* A110E0 80240860 3C020002 */ lui $v0, 2 -/* A110E4 80240864 0809021F */ j .L8024087C -/* A110E8 80240868 00621021 */ addu $v0, $v1, $v0 -.L8024086C: -/* A110EC 8024086C 3C040002 */ lui $a0, 2 -/* A110F0 80240870 0083102A */ slt $v0, $a0, $v1 -/* A110F4 80240874 10400002 */ beqz $v0, .L80240880 -/* A110F8 80240878 00641023 */ subu $v0, $v1, $a0 -.L8024087C: -/* A110FC 8024087C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240880: -/* A11100 80240880 8E040084 */ lw $a0, 0x84($s0) -/* A11104 80240884 0C046F07 */ jal set_main_pan_u -/* A11108 80240888 8E0500A8 */ lw $a1, 0xa8($s0) -/* A1110C 8024088C 8E040084 */ lw $a0, 0x84($s0) -/* A11110 80240890 0C046F0D */ jal set_main_pan_v -/* A11114 80240894 8E0500AC */ lw $a1, 0xac($s0) -/* A11118 80240898 8E040084 */ lw $a0, 0x84($s0) -/* A1111C 8024089C 0C046F13 */ jal set_aux_pan_u -/* A11120 802408A0 8E0500B0 */ lw $a1, 0xb0($s0) -/* A11124 802408A4 8E040084 */ lw $a0, 0x84($s0) -/* A11128 802408A8 0C046F19 */ jal set_aux_pan_v -/* A1112C 802408AC 8E0500B4 */ lw $a1, 0xb4($s0) -/* A11130 802408B0 8FBF0014 */ lw $ra, 0x14($sp) -/* A11134 802408B4 8FB00010 */ lw $s0, 0x10($sp) -/* A11138 802408B8 0000102D */ daddu $v0, $zero, $zero -/* A1113C 802408BC 03E00008 */ jr $ra -/* A11140 802408C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_01/func_80240AAC_A10880.s b/asm/nonmatchings/world/area_hos/hos_01/func_80240AAC_A10880.s deleted file mode 100644 index 6bd22733e1..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/func_80240AAC_A10880.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AAC_A1132C -/* A1132C 80240AAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A11330 80240AB0 AFBF0010 */ sw $ra, 0x10($sp) -/* A11334 80240AB4 8C82000C */ lw $v0, 0xc($a0) -/* A11338 80240AB8 0C0B1EAF */ jal get_variable -/* A1133C 80240ABC 8C450000 */ lw $a1, ($v0) -/* A11340 80240AC0 8C43000C */ lw $v1, 0xc($v0) -/* A11344 80240AC4 3C01433E */ lui $at, 0x433e -/* A11348 80240AC8 44810000 */ mtc1 $at, $f0 -/* A1134C 80240ACC 00000000 */ nop -/* A11350 80240AD0 E4600078 */ swc1 $f0, 0x78($v1) -/* A11354 80240AD4 8C43000C */ lw $v1, 0xc($v0) -/* A11358 80240AD8 3C01435C */ lui $at, 0x435c -/* A1135C 80240ADC 44810000 */ mtc1 $at, $f0 -/* A11360 80240AE0 00000000 */ nop -/* A11364 80240AE4 E460007C */ swc1 $f0, 0x7c($v1) -/* A11368 80240AE8 8C43000C */ lw $v1, 0xc($v0) -/* A1136C 80240AEC 3C013F33 */ lui $at, 0x3f33 -/* A11370 80240AF0 34213333 */ ori $at, $at, 0x3333 -/* A11374 80240AF4 44810000 */ mtc1 $at, $f0 -/* A11378 80240AF8 00000000 */ nop -/* A1137C 80240AFC E4600068 */ swc1 $f0, 0x68($v1) -/* A11380 80240B00 8FBF0010 */ lw $ra, 0x10($sp) -/* A11384 80240B04 24020002 */ addiu $v0, $zero, 2 -/* A11388 80240B08 03E00008 */ jr $ra -/* A1138C 80240B0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_01/func_80240B10_A10880.s b/asm/nonmatchings/world/area_hos/hos_01/func_80240B10_A10880.s deleted file mode 100644 index 570cdd8510..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/func_80240B10_A10880.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B10_A11390 -/* A11390 80240B10 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A11394 80240B14 AFBF0010 */ sw $ra, 0x10($sp) -/* A11398 80240B18 8C82000C */ lw $v0, 0xc($a0) -/* A1139C 80240B1C 0C0B1EAF */ jal get_variable -/* A113A0 80240B20 8C450000 */ lw $a1, ($v0) -/* A113A4 80240B24 8C43000C */ lw $v1, 0xc($v0) -/* A113A8 80240B28 3C01432A */ lui $at, 0x432a -/* A113AC 80240B2C 44810000 */ mtc1 $at, $f0 -/* A113B0 80240B30 00000000 */ nop -/* A113B4 80240B34 E4600078 */ swc1 $f0, 0x78($v1) -/* A113B8 80240B38 8C43000C */ lw $v1, 0xc($v0) -/* A113BC 80240B3C E460007C */ swc1 $f0, 0x7c($v1) -/* A113C0 80240B40 8C43000C */ lw $v1, 0xc($v0) -/* A113C4 80240B44 3C014000 */ lui $at, 0x4000 -/* A113C8 80240B48 44810000 */ mtc1 $at, $f0 -/* A113CC 80240B4C 00000000 */ nop -/* A113D0 80240B50 E4600068 */ swc1 $f0, 0x68($v1) -/* A113D4 80240B54 8FBF0010 */ lw $ra, 0x10($sp) -/* A113D8 80240B58 24020002 */ addiu $v0, $zero, 2 -/* A113DC 80240B5C 03E00008 */ jr $ra -/* A113E0 80240B60 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_01/func_80240B64_A10880.s b/asm/nonmatchings/world/area_hos/hos_01/func_80240B64_A10880.s deleted file mode 100644 index 67c6727c96..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/func_80240B64_A10880.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B64_A113E4 -/* A113E4 80240B64 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A113E8 80240B68 AFB10014 */ sw $s1, 0x14($sp) -/* A113EC 80240B6C 0080882D */ daddu $s1, $a0, $zero -/* A113F0 80240B70 AFBF0018 */ sw $ra, 0x18($sp) -/* A113F4 80240B74 AFB00010 */ sw $s0, 0x10($sp) -/* A113F8 80240B78 8E30000C */ lw $s0, 0xc($s1) -/* A113FC 80240B7C 8E050000 */ lw $a1, ($s0) -/* A11400 80240B80 0C0B1EAF */ jal get_variable -/* A11404 80240B84 26100004 */ addiu $s0, $s0, 4 -/* A11408 80240B88 0220202D */ daddu $a0, $s1, $zero -/* A1140C 80240B8C 8E050000 */ lw $a1, ($s0) -/* A11410 80240B90 0C0B1EAF */ jal get_variable -/* A11414 80240B94 0040802D */ daddu $s0, $v0, $zero -/* A11418 80240B98 8E03000C */ lw $v1, 0xc($s0) -/* A1141C 80240B9C AC620038 */ sw $v0, 0x38($v1) -/* A11420 80240BA0 8FBF0018 */ lw $ra, 0x18($sp) -/* A11424 80240BA4 8FB10014 */ lw $s1, 0x14($sp) -/* A11428 80240BA8 8FB00010 */ lw $s0, 0x10($sp) -/* A1142C 80240BAC 24020002 */ addiu $v0, $zero, 2 -/* A11430 80240BB0 03E00008 */ jr $ra -/* A11434 80240BB4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_01/func_80240BB8_A10880.s b/asm/nonmatchings/world/area_hos/hos_01/func_80240BB8_A10880.s deleted file mode 100644 index 23a54e59f4..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/func_80240BB8_A10880.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BB8_A11438 -/* A11438 80240BB8 3C06FC12 */ lui $a2, 0xfc12 -/* A1143C 80240BBC 34C61624 */ ori $a2, $a2, 0x1624 -/* A11440 80240BC0 3C05FF2F */ lui $a1, 0xff2f -/* A11444 80240BC4 3C04800A */ lui $a0, 0x800a -/* A11448 80240BC8 2484A66C */ addiu $a0, $a0, -0x5994 -/* A1144C 80240BCC 8C820000 */ lw $v0, ($a0) -/* A11450 80240BD0 34A5FFFF */ ori $a1, $a1, 0xffff -/* A11454 80240BD4 0040182D */ daddu $v1, $v0, $zero -/* A11458 80240BD8 24420008 */ addiu $v0, $v0, 8 -/* A1145C 80240BDC AC820000 */ sw $v0, ($a0) -/* A11460 80240BE0 AC660000 */ sw $a2, ($v1) -/* A11464 80240BE4 AC650004 */ sw $a1, 4($v1) -/* A11468 80240BE8 24430008 */ addiu $v1, $v0, 8 -/* A1146C 80240BEC AC830000 */ sw $v1, ($a0) -/* A11470 80240BF0 3C048024 */ lui $a0, 0x8024 -/* A11474 80240BF4 90841C2F */ lbu $a0, 0x1c2f($a0) -/* A11478 80240BF8 3C03FA00 */ lui $v1, 0xfa00 -/* A1147C 80240BFC AC430000 */ sw $v1, ($v0) -/* A11480 80240C00 03E00008 */ jr $ra -/* A11484 80240C04 AC440004 */ sw $a0, 4($v0) diff --git a/asm/nonmatchings/world/area_hos/hos_01/func_80240C34_A10880.s b/asm/nonmatchings/world/area_hos/hos_01/func_80240C34_A10880.s deleted file mode 100644 index c0f989f437..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/func_80240C34_A10880.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C34_A114B4 -/* A114B4 80240C34 3C06FC12 */ lui $a2, 0xfc12 -/* A114B8 80240C38 34C61624 */ ori $a2, $a2, 0x1624 -/* A114BC 80240C3C 3C05FF2F */ lui $a1, 0xff2f -/* A114C0 80240C40 3C04800A */ lui $a0, 0x800a -/* A114C4 80240C44 2484A66C */ addiu $a0, $a0, -0x5994 -/* A114C8 80240C48 8C820000 */ lw $v0, ($a0) -/* A114CC 80240C4C 34A5FFFF */ ori $a1, $a1, 0xffff -/* A114D0 80240C50 0040182D */ daddu $v1, $v0, $zero -/* A114D4 80240C54 24420008 */ addiu $v0, $v0, 8 -/* A114D8 80240C58 AC820000 */ sw $v0, ($a0) -/* A114DC 80240C5C AC660000 */ sw $a2, ($v1) -/* A114E0 80240C60 AC650004 */ sw $a1, 4($v1) -/* A114E4 80240C64 24430008 */ addiu $v1, $v0, 8 -/* A114E8 80240C68 AC830000 */ sw $v1, ($a0) -/* A114EC 80240C6C 3C048024 */ lui $a0, 0x8024 -/* A114F0 80240C70 90841C33 */ lbu $a0, 0x1c33($a0) -/* A114F4 80240C74 3C03FA00 */ lui $v1, 0xfa00 -/* A114F8 80240C78 AC430000 */ sw $v1, ($v0) -/* A114FC 80240C7C 03E00008 */ jr $ra -/* A11500 80240C80 AC440004 */ sw $a0, 4($v0) diff --git a/asm/nonmatchings/world/area_hos/hos_01/func_80240C84_A10880.s b/asm/nonmatchings/world/area_hos/hos_01/func_80240C84_A10880.s deleted file mode 100644 index e6db04e5c5..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/func_80240C84_A10880.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C84_A11504 -/* A11504 80240C84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A11508 80240C88 AFBF0010 */ sw $ra, 0x10($sp) -/* A1150C 80240C8C 8C82000C */ lw $v0, 0xc($a0) -/* A11510 80240C90 0C0B1EAF */ jal get_variable -/* A11514 80240C94 8C450000 */ lw $a1, ($v0) -/* A11518 80240C98 8FBF0010 */ lw $ra, 0x10($sp) -/* A1151C 80240C9C 3C018024 */ lui $at, 0x8024 -/* A11520 80240CA0 AC221C30 */ sw $v0, 0x1c30($at) -/* A11524 80240CA4 24020002 */ addiu $v0, $zero, 2 -/* A11528 80240CA8 03E00008 */ jr $ra -/* A1152C 80240CAC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_01/func_80240CB0_A10880.s b/asm/nonmatchings/world/area_hos/hos_01/func_80240CB0_A10880.s deleted file mode 100644 index 07eff84f13..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/func_80240CB0_A10880.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CB0_A11530 -/* A11530 80240CB0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A11534 80240CB4 AFBF0010 */ sw $ra, 0x10($sp) -/* A11538 80240CB8 8C82000C */ lw $v0, 0xc($a0) -/* A1153C 80240CBC 0C0B1EAF */ jal get_variable -/* A11540 80240CC0 8C450000 */ lw $a1, ($v0) -/* A11544 80240CC4 0C03AC5A */ jal func_800EB168 -/* A11548 80240CC8 0040202D */ daddu $a0, $v0, $zero -/* A1154C 80240CCC 8FBF0010 */ lw $ra, 0x10($sp) -/* A11550 80240CD0 24020002 */ addiu $v0, $zero, 2 -/* A11554 80240CD4 03E00008 */ jr $ra -/* A11558 80240CD8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_01/func_80240DD0_A10880.s b/asm/nonmatchings/world/area_hos/hos_01/func_80240DD0_A10880.s deleted file mode 100644 index 73e5a9b404..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/func_80240DD0_A10880.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DD0_A11650 -/* A11650 80240DD0 3C03800B */ lui $v1, %hi(gCameras) -/* A11654 80240DD4 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* A11658 80240DD8 94620002 */ lhu $v0, 2($v1) -/* A1165C 80240DDC 3042FFFE */ andi $v0, $v0, 0xfffe -/* A11660 80240DE0 A4620002 */ sh $v0, 2($v1) -/* A11664 80240DE4 03E00008 */ jr $ra -/* A11668 80240DE8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80240FF0.s b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80240FF0.s new file mode 100644 index 0000000000..b58475b5ef --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80240FF0.s @@ -0,0 +1,116 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FF0 +/* A17210 80240FF0 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A17214 80240FF4 AFB3002C */ sw $s3, 0x2c($sp) +/* A17218 80240FF8 0080982D */ daddu $s3, $a0, $zero +/* A1721C 80240FFC AFBF0030 */ sw $ra, 0x30($sp) +/* A17220 80241000 AFB20028 */ sw $s2, 0x28($sp) +/* A17224 80241004 AFB10024 */ sw $s1, 0x24($sp) +/* A17228 80241008 AFB00020 */ sw $s0, 0x20($sp) +/* A1722C 8024100C 8E710148 */ lw $s1, 0x148($s3) +/* A17230 80241010 86240008 */ lh $a0, 8($s1) +/* A17234 80241014 0C00EABB */ jal get_npc_unsafe +/* A17238 80241018 00A0902D */ daddu $s2, $a1, $zero +/* A1723C 8024101C 8E440004 */ lw $a0, 4($s2) +/* A17240 80241020 0040802D */ daddu $s0, $v0, $zero +/* A17244 80241024 00041FC2 */ srl $v1, $a0, 0x1f +/* A17248 80241028 00832021 */ addu $a0, $a0, $v1 +/* A1724C 8024102C 00042043 */ sra $a0, $a0, 1 +/* A17250 80241030 0C00A67F */ jal rand_int +/* A17254 80241034 24840001 */ addiu $a0, $a0, 1 +/* A17258 80241038 8E430004 */ lw $v1, 4($s2) +/* A1725C 8024103C 000327C2 */ srl $a0, $v1, 0x1f +/* A17260 80241040 00641821 */ addu $v1, $v1, $a0 +/* A17264 80241044 00031843 */ sra $v1, $v1, 1 +/* A17268 80241048 00621821 */ addu $v1, $v1, $v0 +/* A1726C 8024104C A603008E */ sh $v1, 0x8e($s0) +/* A17270 80241050 8E2300D0 */ lw $v1, 0xd0($s1) +/* A17274 80241054 C6000040 */ lwc1 $f0, 0x40($s0) +/* A17278 80241058 C4640000 */ lwc1 $f4, ($v1) +/* A1727C 8024105C 46802120 */ cvt.s.w $f4, $f4 +/* A17280 80241060 C4620008 */ lwc1 $f2, 8($v1) +/* A17284 80241064 468010A0 */ cvt.s.w $f2, $f2 +/* A17288 80241068 E7A00010 */ swc1 $f0, 0x10($sp) +/* A1728C 8024106C 8E2200D0 */ lw $v0, 0xd0($s1) +/* A17290 80241070 44061000 */ mfc1 $a2, $f2 +/* A17294 80241074 C440000C */ lwc1 $f0, 0xc($v0) +/* A17298 80241078 46800020 */ cvt.s.w $f0, $f0 +/* A1729C 8024107C E7A00014 */ swc1 $f0, 0x14($sp) +/* A172A0 80241080 8E2200D0 */ lw $v0, 0xd0($s1) +/* A172A4 80241084 44052000 */ mfc1 $a1, $f4 +/* A172A8 80241088 C4400010 */ lwc1 $f0, 0x10($v0) +/* A172AC 8024108C 46800020 */ cvt.s.w $f0, $f0 +/* A172B0 80241090 E7A00018 */ swc1 $f0, 0x18($sp) +/* A172B4 80241094 8C640018 */ lw $a0, 0x18($v1) +/* A172B8 80241098 0C0123F5 */ jal is_point_within_region +/* A172BC 8024109C 8E070038 */ lw $a3, 0x38($s0) +/* A172C0 802410A0 1040000E */ beqz $v0, .L802410DC +/* A172C4 802410A4 00000000 */ nop +/* A172C8 802410A8 8E2200D0 */ lw $v0, 0xd0($s1) +/* A172CC 802410AC C60C0038 */ lwc1 $f12, 0x38($s0) +/* A172D0 802410B0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A172D4 802410B4 C4460000 */ lwc1 $f6, ($v0) +/* A172D8 802410B8 468031A0 */ cvt.s.w $f6, $f6 +/* A172DC 802410BC 44063000 */ mfc1 $a2, $f6 +/* A172E0 802410C0 C4460008 */ lwc1 $f6, 8($v0) +/* A172E4 802410C4 468031A0 */ cvt.s.w $f6, $f6 +/* A172E8 802410C8 44073000 */ mfc1 $a3, $f6 +/* A172EC 802410CC 0C00A720 */ jal atan2 +/* A172F0 802410D0 00000000 */ nop +/* A172F4 802410D4 08090443 */ j .L8024110C +/* A172F8 802410D8 E600000C */ swc1 $f0, 0xc($s0) +.L802410DC: +/* A172FC 802410DC 0C00A67F */ jal rand_int +/* A17300 802410E0 2404003C */ addiu $a0, $zero, 0x3c +/* A17304 802410E4 C60C000C */ lwc1 $f12, 0xc($s0) +/* A17308 802410E8 44820000 */ mtc1 $v0, $f0 +/* A1730C 802410EC 00000000 */ nop +/* A17310 802410F0 46800020 */ cvt.s.w $f0, $f0 +/* A17314 802410F4 46006300 */ add.s $f12, $f12, $f0 +/* A17318 802410F8 3C0141F0 */ lui $at, 0x41f0 +/* A1731C 802410FC 44810000 */ mtc1 $at, $f0 +/* A17320 80241100 0C00A6C9 */ jal clamp_angle +/* A17324 80241104 46006301 */ sub.s $f12, $f12, $f0 +/* A17328 80241108 E600000C */ swc1 $f0, 0xc($s0) +.L8024110C: +/* A1732C 8024110C 8E2200CC */ lw $v0, 0xcc($s1) +/* A17330 80241110 8C420004 */ lw $v0, 4($v0) +/* A17334 80241114 AE020028 */ sw $v0, 0x28($s0) +/* A17338 80241118 AE600074 */ sw $zero, 0x74($s3) +/* A1733C 8024111C 8E2200D0 */ lw $v0, 0xd0($s1) +/* A17340 80241120 8C420014 */ lw $v0, 0x14($v0) +/* A17344 80241124 04410004 */ bgez $v0, .L80241138 +/* A17348 80241128 00000000 */ nop +/* A1734C 8024112C C6400000 */ lwc1 $f0, ($s2) +/* A17350 80241130 08090456 */ j .L80241158 +/* A17354 80241134 E6000018 */ swc1 $f0, 0x18($s0) +.L80241138: +/* A17358 80241138 3C018024 */ lui $at, 0x8024 +/* A1735C 8024113C D4224E20 */ ldc1 $f2, 0x4e20($at) +/* A17360 80241140 44820000 */ mtc1 $v0, $f0 +/* A17364 80241144 00000000 */ nop +/* A17368 80241148 46800021 */ cvt.d.w $f0, $f0 +/* A1736C 8024114C 46220003 */ div.d $f0, $f0, $f2 +/* A17370 80241150 46200020 */ cvt.s.d $f0, $f0 +/* A17374 80241154 E6000018 */ swc1 $f0, 0x18($s0) +.L80241158: +/* A17378 80241158 C600003C */ lwc1 $f0, 0x3c($s0) +/* A1737C 8024115C 3C014059 */ lui $at, 0x4059 +/* A17380 80241160 44811800 */ mtc1 $at, $f3 +/* A17384 80241164 44801000 */ mtc1 $zero, $f2 +/* A17388 80241168 46000021 */ cvt.d.s $f0, $f0 +/* A1738C 8024116C 46220002 */ mul.d $f0, $f0, $f2 +/* A17390 80241170 00000000 */ nop +/* A17394 80241174 24020001 */ addiu $v0, $zero, 1 +/* A17398 80241178 4620018D */ trunc.w.d $f6, $f0 +/* A1739C 8024117C E626007C */ swc1 $f6, 0x7c($s1) +/* A173A0 80241180 AE620070 */ sw $v0, 0x70($s3) +/* A173A4 80241184 8FBF0030 */ lw $ra, 0x30($sp) +/* A173A8 80241188 8FB3002C */ lw $s3, 0x2c($sp) +/* A173AC 8024118C 8FB20028 */ lw $s2, 0x28($sp) +/* A173B0 80241190 8FB10024 */ lw $s1, 0x24($sp) +/* A173B4 80241194 8FB00020 */ lw $s0, 0x20($sp) +/* A173B8 80241198 03E00008 */ jr $ra +/* A173BC 8024119C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_802411A0.s b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_802411A0.s new file mode 100644 index 0000000000..5e4ce30ca9 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_802411A0.s @@ -0,0 +1,418 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411A0 +/* A173C0 802411A0 27BDFF80 */ addiu $sp, $sp, -0x80 +/* A173C4 802411A4 AFB3004C */ sw $s3, 0x4c($sp) +/* A173C8 802411A8 0080982D */ daddu $s3, $a0, $zero +/* A173CC 802411AC AFBF0058 */ sw $ra, 0x58($sp) +/* A173D0 802411B0 AFB50054 */ sw $s5, 0x54($sp) +/* A173D4 802411B4 AFB40050 */ sw $s4, 0x50($sp) +/* A173D8 802411B8 AFB20048 */ sw $s2, 0x48($sp) +/* A173DC 802411BC AFB10044 */ sw $s1, 0x44($sp) +/* A173E0 802411C0 AFB00040 */ sw $s0, 0x40($sp) +/* A173E4 802411C4 F7BA0078 */ sdc1 $f26, 0x78($sp) +/* A173E8 802411C8 F7B80070 */ sdc1 $f24, 0x70($sp) +/* A173EC 802411CC F7B60068 */ sdc1 $f22, 0x68($sp) +/* A173F0 802411D0 F7B40060 */ sdc1 $f20, 0x60($sp) +/* A173F4 802411D4 8E710148 */ lw $s1, 0x148($s3) +/* A173F8 802411D8 00A0902D */ daddu $s2, $a1, $zero +/* A173FC 802411DC 86240008 */ lh $a0, 8($s1) +/* A17400 802411E0 0C00EABB */ jal get_npc_unsafe +/* A17404 802411E4 00C0A82D */ daddu $s5, $a2, $zero +/* A17408 802411E8 0040802D */ daddu $s0, $v0, $zero +/* A1740C 802411EC 0000A02D */ daddu $s4, $zero, $zero +/* A17410 802411F0 C624007C */ lwc1 $f4, 0x7c($s1) +/* A17414 802411F4 46802120 */ cvt.s.w $f4, $f4 +/* A17418 802411F8 C6220088 */ lwc1 $f2, 0x88($s1) +/* A1741C 802411FC 468010A0 */ cvt.s.w $f2, $f2 +/* A17420 80241200 460010A1 */ cvt.d.s $f2, $f2 +/* A17424 80241204 46002121 */ cvt.d.s $f4, $f4 +/* A17428 80241208 C600003C */ lwc1 $f0, 0x3c($s0) +/* A1742C 8024120C 3C014059 */ lui $at, 0x4059 +/* A17430 80241210 44813800 */ mtc1 $at, $f7 +/* A17434 80241214 44803000 */ mtc1 $zero, $f6 +/* A17438 80241218 46000021 */ cvt.d.s $f0, $f0 +/* A1743C 8024121C 46260002 */ mul.d $f0, $f0, $f6 +/* A17440 80241220 00000000 */ nop +/* A17444 80241224 24020001 */ addiu $v0, $zero, 1 +/* A17448 80241228 8E24006C */ lw $a0, 0x6c($s1) +/* A1744C 8024122C 46261083 */ div.d $f2, $f2, $f6 +/* A17450 80241230 462010A0 */ cvt.s.d $f2, $f2 +/* A17454 80241234 46262103 */ div.d $f4, $f4, $f6 +/* A17458 80241238 46202520 */ cvt.s.d $f20, $f4 +/* A1745C 8024123C 30830011 */ andi $v1, $a0, 0x11 +/* A17460 80241240 4620020D */ trunc.w.d $f8, $f0 +/* A17464 80241244 E628007C */ swc1 $f8, 0x7c($s1) +/* A17468 80241248 C6200078 */ lwc1 $f0, 0x78($s1) +/* A1746C 8024124C 46800020 */ cvt.s.w $f0, $f0 +/* A17470 80241250 46000021 */ cvt.d.s $f0, $f0 +/* A17474 80241254 46260003 */ div.d $f0, $f0, $f6 +/* A17478 80241258 462006A0 */ cvt.s.d $f26, $f0 +/* A1747C 8024125C C6200070 */ lwc1 $f0, 0x70($s1) +/* A17480 80241260 46800020 */ cvt.s.w $f0, $f0 +/* A17484 80241264 46000021 */ cvt.d.s $f0, $f0 +/* A17488 80241268 46260003 */ div.d $f0, $f0, $f6 +/* A1748C 8024126C 462005A0 */ cvt.s.d $f22, $f0 +/* A17490 80241270 14620025 */ bne $v1, $v0, .L80241308 +/* A17494 80241274 4602D600 */ add.s $f24, $f26, $f2 +/* A17498 80241278 8E020000 */ lw $v0, ($s0) +/* A1749C 8024127C 30420008 */ andi $v0, $v0, 8 +/* A174A0 80241280 10400009 */ beqz $v0, .L802412A8 +/* A174A4 80241284 27A50028 */ addiu $a1, $sp, 0x28 +/* A174A8 80241288 C600003C */ lwc1 $f0, 0x3c($s0) +/* A174AC 8024128C 4600C001 */ sub.s $f0, $f24, $f0 +/* A174B0 80241290 4600B03C */ c.lt.s $f22, $f0 +/* A174B4 80241294 00000000 */ nop +/* A174B8 80241298 4500001B */ bc1f .L80241308 +/* A174BC 8024129C 34820010 */ ori $v0, $a0, 0x10 +/* A174C0 802412A0 080904C2 */ j .L80241308 +/* A174C4 802412A4 AE22006C */ sw $v0, 0x6c($s1) +.L802412A8: +/* A174C8 802412A8 27A6002C */ addiu $a2, $sp, 0x2c +/* A174CC 802412AC C6000038 */ lwc1 $f0, 0x38($s0) +/* A174D0 802412B0 C602003C */ lwc1 $f2, 0x3c($s0) +/* A174D4 802412B4 C6040040 */ lwc1 $f4, 0x40($s0) +/* A174D8 802412B8 3C01447A */ lui $at, 0x447a +/* A174DC 802412BC 44813000 */ mtc1 $at, $f6 +/* A174E0 802412C0 27A20034 */ addiu $v0, $sp, 0x34 +/* A174E4 802412C4 E7A00028 */ swc1 $f0, 0x28($sp) +/* A174E8 802412C8 E7A2002C */ swc1 $f2, 0x2c($sp) +/* A174EC 802412CC E7A40030 */ swc1 $f4, 0x30($sp) +/* A174F0 802412D0 E7A60034 */ swc1 $f6, 0x34($sp) +/* A174F4 802412D4 AFA20010 */ sw $v0, 0x10($sp) +/* A174F8 802412D8 8E040080 */ lw $a0, 0x80($s0) +/* A174FC 802412DC 0C0372DF */ jal func_800DCB7C +/* A17500 802412E0 27A70030 */ addiu $a3, $sp, 0x30 +/* A17504 802412E4 C7A00034 */ lwc1 $f0, 0x34($sp) +/* A17508 802412E8 4600D001 */ sub.s $f0, $f26, $f0 +/* A1750C 802412EC 4600B03C */ c.lt.s $f22, $f0 +/* A17510 802412F0 00000000 */ nop +/* A17514 802412F4 45000004 */ bc1f .L80241308 +/* A17518 802412F8 00000000 */ nop +/* A1751C 802412FC 8E22006C */ lw $v0, 0x6c($s1) +/* A17520 80241300 34420010 */ ori $v0, $v0, 0x10 +/* A17524 80241304 AE22006C */ sw $v0, 0x6c($s1) +.L80241308: +/* A17528 80241308 8E22006C */ lw $v0, 0x6c($s1) +/* A1752C 8024130C 24030011 */ addiu $v1, $zero, 0x11 +/* A17530 80241310 30420011 */ andi $v0, $v0, 0x11 +/* A17534 80241314 14430039 */ bne $v0, $v1, .L802413FC +/* A17538 80241318 00000000 */ nop +/* A1753C 8024131C 8E020000 */ lw $v0, ($s0) +/* A17540 80241320 30420008 */ andi $v0, $v0, 8 +/* A17544 80241324 1040000A */ beqz $v0, .L80241350 +/* A17548 80241328 4600C106 */ mov.s $f4, $f24 +/* A1754C 8024132C 4614C081 */ sub.s $f2, $f24, $f20 +/* A17550 80241330 3C018024 */ lui $at, 0x8024 +/* A17554 80241334 D4204E28 */ ldc1 $f0, 0x4e28($at) +/* A17558 80241338 460010A1 */ cvt.d.s $f2, $f2 +/* A1755C 8024133C 46201082 */ mul.d $f2, $f2, $f0 +/* A17560 80241340 00000000 */ nop +/* A17564 80241344 4600A021 */ cvt.d.s $f0, $f20 +/* A17568 80241348 080904ED */ j .L802413B4 +/* A1756C 8024134C 46220000 */ add.d $f0, $f0, $f2 +.L80241350: +/* A17570 80241350 27A50028 */ addiu $a1, $sp, 0x28 +/* A17574 80241354 27A6002C */ addiu $a2, $sp, 0x2c +/* A17578 80241358 C6000038 */ lwc1 $f0, 0x38($s0) +/* A1757C 8024135C C6020040 */ lwc1 $f2, 0x40($s0) +/* A17580 80241360 3C01447A */ lui $at, 0x447a +/* A17584 80241364 44812000 */ mtc1 $at, $f4 +/* A17588 80241368 27A20034 */ addiu $v0, $sp, 0x34 +/* A1758C 8024136C E7B4002C */ swc1 $f20, 0x2c($sp) +/* A17590 80241370 E7A00028 */ swc1 $f0, 0x28($sp) +/* A17594 80241374 E7A20030 */ swc1 $f2, 0x30($sp) +/* A17598 80241378 E7A40034 */ swc1 $f4, 0x34($sp) +/* A1759C 8024137C AFA20010 */ sw $v0, 0x10($sp) +/* A175A0 80241380 8E040080 */ lw $a0, 0x80($s0) +/* A175A4 80241384 0C0372DF */ jal func_800DCB7C +/* A175A8 80241388 27A70030 */ addiu $a3, $sp, 0x30 +/* A175AC 8024138C C7A4002C */ lwc1 $f4, 0x2c($sp) +/* A175B0 80241390 461A2100 */ add.s $f4, $f4, $f26 +/* A175B4 80241394 46142081 */ sub.s $f2, $f4, $f20 +/* A175B8 80241398 3C018024 */ lui $at, 0x8024 +/* A175BC 8024139C D4204E30 */ ldc1 $f0, 0x4e30($at) +/* A175C0 802413A0 460010A1 */ cvt.d.s $f2, $f2 +/* A175C4 802413A4 46201082 */ mul.d $f2, $f2, $f0 +/* A175C8 802413A8 00000000 */ nop +/* A175CC 802413AC 4600A021 */ cvt.d.s $f0, $f20 +/* A175D0 802413B0 46220000 */ add.d $f0, $f0, $f2 +.L802413B4: +/* A175D4 802413B4 46200020 */ cvt.s.d $f0, $f0 +/* A175D8 802413B8 E600003C */ swc1 $f0, 0x3c($s0) +/* A175DC 802413BC C600003C */ lwc1 $f0, 0x3c($s0) +/* A175E0 802413C0 46002001 */ sub.s $f0, $f4, $f0 +/* A175E4 802413C4 3C013FF0 */ lui $at, 0x3ff0 +/* A175E8 802413C8 44811800 */ mtc1 $at, $f3 +/* A175EC 802413CC 44801000 */ mtc1 $zero, $f2 +/* A175F0 802413D0 46000005 */ abs.s $f0, $f0 +/* A175F4 802413D4 46000021 */ cvt.d.s $f0, $f0 +/* A175F8 802413D8 4622003C */ c.lt.d $f0, $f2 +/* A175FC 802413DC 00000000 */ nop +/* A17600 802413E0 45000036 */ bc1f .L802414BC +/* A17604 802413E4 2403FFEF */ addiu $v1, $zero, -0x11 +/* A17608 802413E8 E604003C */ swc1 $f4, 0x3c($s0) +/* A1760C 802413EC 8E22006C */ lw $v0, 0x6c($s1) +/* A17610 802413F0 00431024 */ and $v0, $v0, $v1 +/* A17614 802413F4 0809052F */ j .L802414BC +/* A17618 802413F8 AE22006C */ sw $v0, 0x6c($s1) +.L802413FC: +/* A1761C 802413FC 8E220070 */ lw $v0, 0x70($s1) +/* A17620 80241400 1840002E */ blez $v0, .L802414BC +/* A17624 80241404 00000000 */ nop +/* A17628 80241408 C62C0074 */ lwc1 $f12, 0x74($s1) +/* A1762C 8024140C 0C00A8BB */ jal sin_deg +/* A17630 80241410 46806320 */ cvt.s.w $f12, $f12 +/* A17634 80241414 8E020000 */ lw $v0, ($s0) +/* A17638 80241418 30420008 */ andi $v0, $v0, 8 +/* A1763C 8024141C 10400003 */ beqz $v0, .L8024142C +/* A17640 80241420 46000506 */ mov.s $f20, $f0 +/* A17644 80241424 0809051B */ j .L8024146C +/* A17648 80241428 0000102D */ daddu $v0, $zero, $zero +.L8024142C: +/* A1764C 8024142C 27A50028 */ addiu $a1, $sp, 0x28 +/* A17650 80241430 27A6002C */ addiu $a2, $sp, 0x2c +/* A17654 80241434 C6000038 */ lwc1 $f0, 0x38($s0) +/* A17658 80241438 C602003C */ lwc1 $f2, 0x3c($s0) +/* A1765C 8024143C C6040040 */ lwc1 $f4, 0x40($s0) +/* A17660 80241440 3C01447A */ lui $at, 0x447a +/* A17664 80241444 44813000 */ mtc1 $at, $f6 +/* A17668 80241448 27A20034 */ addiu $v0, $sp, 0x34 +/* A1766C 8024144C E7A00028 */ swc1 $f0, 0x28($sp) +/* A17670 80241450 E7A2002C */ swc1 $f2, 0x2c($sp) +/* A17674 80241454 E7A40030 */ swc1 $f4, 0x30($sp) +/* A17678 80241458 E7A60034 */ swc1 $f6, 0x34($sp) +/* A1767C 8024145C AFA20010 */ sw $v0, 0x10($sp) +/* A17680 80241460 8E040080 */ lw $a0, 0x80($s0) +/* A17684 80241464 0C0372DF */ jal func_800DCB7C +/* A17688 80241468 27A70030 */ addiu $a3, $sp, 0x30 +.L8024146C: +/* A1768C 8024146C 10400007 */ beqz $v0, .L8024148C +/* A17690 80241470 00000000 */ nop +/* A17694 80241474 4616A082 */ mul.s $f2, $f20, $f22 +/* A17698 80241478 00000000 */ nop +/* A1769C 8024147C C7A0002C */ lwc1 $f0, 0x2c($sp) +/* A176A0 80241480 461A0000 */ add.s $f0, $f0, $f26 +/* A176A4 80241484 08090526 */ j .L80241498 +/* A176A8 80241488 46020000 */ add.s $f0, $f0, $f2 +.L8024148C: +/* A176AC 8024148C 4616A002 */ mul.s $f0, $f20, $f22 +/* A176B0 80241490 00000000 */ nop +/* A176B4 80241494 4600C000 */ add.s $f0, $f24, $f0 +.L80241498: +/* A176B8 80241498 E600003C */ swc1 $f0, 0x3c($s0) +/* A176BC 8024149C 8E220074 */ lw $v0, 0x74($s1) +/* A176C0 802414A0 2442000A */ addiu $v0, $v0, 0xa +/* A176C4 802414A4 44826000 */ mtc1 $v0, $f12 +/* A176C8 802414A8 00000000 */ nop +/* A176CC 802414AC 0C00A6C9 */ jal clamp_angle +/* A176D0 802414B0 46806320 */ cvt.s.w $f12, $f12 +/* A176D4 802414B4 4600020D */ trunc.w.s $f8, $f0 +/* A176D8 802414B8 E6280074 */ swc1 $f8, 0x74($s1) +.L802414BC: +/* A176DC 802414BC 8E220090 */ lw $v0, 0x90($s1) +/* A176E0 802414C0 1C40004A */ bgtz $v0, .L802415EC +/* A176E4 802414C4 2442FFFF */ addiu $v0, $v0, -1 +/* A176E8 802414C8 8E430014 */ lw $v1, 0x14($s2) +/* A176EC 802414CC 04600048 */ bltz $v1, .L802415F0 +/* A176F0 802414D0 00000000 */ nop +/* A176F4 802414D4 8E620074 */ lw $v0, 0x74($s3) +/* A176F8 802414D8 1C400042 */ bgtz $v0, .L802415E4 +/* A176FC 802414DC 2442FFFF */ addiu $v0, $v0, -1 +/* A17700 802414E0 AE630074 */ sw $v1, 0x74($s3) +/* A17704 802414E4 860200A8 */ lh $v0, 0xa8($s0) +/* A17708 802414E8 C602003C */ lwc1 $f2, 0x3c($s0) +/* A1770C 802414EC 44820000 */ mtc1 $v0, $f0 +/* A17710 802414F0 00000000 */ nop +/* A17714 802414F4 46800020 */ cvt.s.w $f0, $f0 +/* A17718 802414F8 46001080 */ add.s $f2, $f2, $f0 +/* A1771C 802414FC 3C014024 */ lui $at, 0x4024 +/* A17720 80241500 44810800 */ mtc1 $at, $f1 +/* A17724 80241504 44800000 */ mtc1 $zero, $f0 +/* A17728 80241508 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A1772C 8024150C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A17730 80241510 460010A1 */ cvt.d.s $f2, $f2 +/* A17734 80241514 46201080 */ add.d $f2, $f2, $f0 +/* A17738 80241518 C440002C */ lwc1 $f0, 0x2c($v0) +/* A1773C 8024151C 46000021 */ cvt.d.s $f0, $f0 +/* A17740 80241520 4622003C */ c.lt.d $f0, $f2 +/* A17744 80241524 00000000 */ nop +/* A17748 80241528 4500002C */ bc1f .L802415DC +/* A1774C 8024152C 02A0202D */ daddu $a0, $s5, $zero +/* A17750 80241530 AFA00010 */ sw $zero, 0x10($sp) +/* A17754 80241534 8E46000C */ lw $a2, 0xc($s2) +/* A17758 80241538 8E470010 */ lw $a3, 0x10($s2) +/* A1775C 8024153C 0C01242D */ jal func_800490B4 +/* A17760 80241540 0220282D */ daddu $a1, $s1, $zero +/* A17764 80241544 10400025 */ beqz $v0, .L802415DC +/* A17768 80241548 0000202D */ daddu $a0, $zero, $zero +/* A1776C 8024154C 0200282D */ daddu $a1, $s0, $zero +/* A17770 80241550 0000302D */ daddu $a2, $zero, $zero +/* A17774 80241554 2412000C */ addiu $s2, $zero, 0xc +/* A17778 80241558 860300A8 */ lh $v1, 0xa8($s0) +/* A1777C 8024155C 3C013F80 */ lui $at, 0x3f80 +/* A17780 80241560 44810000 */ mtc1 $at, $f0 +/* A17784 80241564 3C014000 */ lui $at, 0x4000 +/* A17788 80241568 44811000 */ mtc1 $at, $f2 +/* A1778C 8024156C 3C01C1A0 */ lui $at, 0xc1a0 +/* A17790 80241570 44812000 */ mtc1 $at, $f4 +/* A17794 80241574 44834000 */ mtc1 $v1, $f8 +/* A17798 80241578 00000000 */ nop +/* A1779C 8024157C 46804220 */ cvt.s.w $f8, $f8 +/* A177A0 80241580 44074000 */ mfc1 $a3, $f8 +/* A177A4 80241584 27A20038 */ addiu $v0, $sp, 0x38 +/* A177A8 80241588 AFB2001C */ sw $s2, 0x1c($sp) +/* A177AC 8024158C AFA20020 */ sw $v0, 0x20($sp) +/* A177B0 80241590 E7A00010 */ swc1 $f0, 0x10($sp) +/* A177B4 80241594 E7A20014 */ swc1 $f2, 0x14($sp) +/* A177B8 80241598 0C01BFA4 */ jal fx_emote +/* A177BC 8024159C E7A40018 */ swc1 $f4, 0x18($sp) +/* A177C0 802415A0 0200202D */ daddu $a0, $s0, $zero +/* A177C4 802415A4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* A177C8 802415A8 C480003C */ lwc1 $f0, 0x3c($a0) +/* A177CC 802415AC 3C060020 */ lui $a2, 0x20 +/* A177D0 802415B0 0C012530 */ jal func_800494C0 +/* A177D4 802415B4 E4800064 */ swc1 $f0, 0x64($a0) +/* A177D8 802415B8 8E220018 */ lw $v0, 0x18($s1) +/* A177DC 802415BC 9442002A */ lhu $v0, 0x2a($v0) +/* A177E0 802415C0 30420001 */ andi $v0, $v0, 1 +/* A177E4 802415C4 10400003 */ beqz $v0, .L802415D4 +/* A177E8 802415C8 2402000A */ addiu $v0, $zero, 0xa +/* A177EC 802415CC 080905E5 */ j .L80241794 +/* A177F0 802415D0 AE620070 */ sw $v0, 0x70($s3) +.L802415D4: +/* A177F4 802415D4 080905E5 */ j .L80241794 +/* A177F8 802415D8 AE720070 */ sw $s2, 0x70($s3) +.L802415DC: +/* A177FC 802415DC 8E620074 */ lw $v0, 0x74($s3) +/* A17800 802415E0 2442FFFF */ addiu $v0, $v0, -1 +.L802415E4: +/* A17804 802415E4 0809057C */ j .L802415F0 +/* A17808 802415E8 AE620074 */ sw $v0, 0x74($s3) +.L802415EC: +/* A1780C 802415EC AE220090 */ sw $v0, 0x90($s1) +.L802415F0: +/* A17810 802415F0 8E2300D0 */ lw $v1, 0xd0($s1) +/* A17814 802415F4 C6000040 */ lwc1 $f0, 0x40($s0) +/* A17818 802415F8 C4620000 */ lwc1 $f2, ($v1) +/* A1781C 802415FC 468010A0 */ cvt.s.w $f2, $f2 +/* A17820 80241600 C4640008 */ lwc1 $f4, 8($v1) +/* A17824 80241604 46802120 */ cvt.s.w $f4, $f4 +/* A17828 80241608 E7A00010 */ swc1 $f0, 0x10($sp) +/* A1782C 8024160C 8E2200D0 */ lw $v0, 0xd0($s1) +/* A17830 80241610 44051000 */ mfc1 $a1, $f2 +/* A17834 80241614 C440000C */ lwc1 $f0, 0xc($v0) +/* A17838 80241618 46800020 */ cvt.s.w $f0, $f0 +/* A1783C 8024161C E7A00014 */ swc1 $f0, 0x14($sp) +/* A17840 80241620 8E2200D0 */ lw $v0, 0xd0($s1) +/* A17844 80241624 44062000 */ mfc1 $a2, $f4 +/* A17848 80241628 C4400010 */ lwc1 $f0, 0x10($v0) +/* A1784C 8024162C 46800020 */ cvt.s.w $f0, $f0 +/* A17850 80241630 E7A00018 */ swc1 $f0, 0x18($sp) +/* A17854 80241634 8C640018 */ lw $a0, 0x18($v1) +/* A17858 80241638 0C0123F5 */ jal is_point_within_region +/* A1785C 8024163C 8E070038 */ lw $a3, 0x38($s0) +/* A17860 80241640 1040001A */ beqz $v0, .L802416AC +/* A17864 80241644 00000000 */ nop +/* A17868 80241648 8E060038 */ lw $a2, 0x38($s0) +/* A1786C 8024164C 8E2200D0 */ lw $v0, 0xd0($s1) +/* A17870 80241650 8E070040 */ lw $a3, 0x40($s0) +/* A17874 80241654 C44C0000 */ lwc1 $f12, ($v0) +/* A17878 80241658 46806320 */ cvt.s.w $f12, $f12 +/* A1787C 8024165C C44E0008 */ lwc1 $f14, 8($v0) +/* A17880 80241660 0C00A7B5 */ jal dist2D +/* A17884 80241664 468073A0 */ cvt.s.w $f14, $f14 +/* A17888 80241668 C6020018 */ lwc1 $f2, 0x18($s0) +/* A1788C 8024166C 4600103C */ c.lt.s $f2, $f0 +/* A17890 80241670 00000000 */ nop +/* A17894 80241674 4500000D */ bc1f .L802416AC +/* A17898 80241678 E7A00034 */ swc1 $f0, 0x34($sp) +/* A1789C 8024167C C60C0038 */ lwc1 $f12, 0x38($s0) +/* A178A0 80241680 8E2200D0 */ lw $v0, 0xd0($s1) +/* A178A4 80241684 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A178A8 80241688 C4480000 */ lwc1 $f8, ($v0) +/* A178AC 8024168C 46804220 */ cvt.s.w $f8, $f8 +/* A178B0 80241690 44064000 */ mfc1 $a2, $f8 +/* A178B4 80241694 C4480008 */ lwc1 $f8, 8($v0) +/* A178B8 80241698 46804220 */ cvt.s.w $f8, $f8 +/* A178BC 8024169C 44074000 */ mfc1 $a3, $f8 +/* A178C0 802416A0 0C00A720 */ jal atan2 +/* A178C4 802416A4 24140001 */ addiu $s4, $zero, 1 +/* A178C8 802416A8 E600000C */ swc1 $f0, 0xc($s0) +.L802416AC: +/* A178CC 802416AC 8E2200D0 */ lw $v0, 0xd0($s1) +/* A178D0 802416B0 8C43000C */ lw $v1, 0xc($v0) +/* A178D4 802416B4 8C420010 */ lw $v0, 0x10($v0) +/* A178D8 802416B8 00621825 */ or $v1, $v1, $v0 +/* A178DC 802416BC 00741825 */ or $v1, $v1, $s4 +/* A178E0 802416C0 10600008 */ beqz $v1, .L802416E4 +/* A178E4 802416C4 00000000 */ nop +/* A178E8 802416C8 8602008C */ lh $v0, 0x8c($s0) +/* A178EC 802416CC 14400031 */ bnez $v0, .L80241794 +/* A178F0 802416D0 00000000 */ nop +/* A178F4 802416D4 8E050018 */ lw $a1, 0x18($s0) +/* A178F8 802416D8 8E06000C */ lw $a2, 0xc($s0) +/* A178FC 802416DC 0C00EA95 */ jal npc_move_heading +/* A17900 802416E0 0200202D */ daddu $a0, $s0, $zero +.L802416E4: +/* A17904 802416E4 C600003C */ lwc1 $f0, 0x3c($s0) +/* A17908 802416E8 3C014059 */ lui $at, 0x4059 +/* A1790C 802416EC 44811800 */ mtc1 $at, $f3 +/* A17910 802416F0 44801000 */ mtc1 $zero, $f2 +/* A17914 802416F4 46000021 */ cvt.d.s $f0, $f0 +/* A17918 802416F8 46220002 */ mul.d $f0, $f0, $f2 +/* A1791C 802416FC 00000000 */ nop +/* A17920 80241700 4620020D */ trunc.w.d $f8, $f0 +/* A17924 80241704 E628007C */ swc1 $f8, 0x7c($s1) +/* A17928 80241708 8E420004 */ lw $v0, 4($s2) +/* A1792C 8024170C 18400021 */ blez $v0, .L80241794 +/* A17930 80241710 00000000 */ nop +/* A17934 80241714 8602008E */ lh $v0, 0x8e($s0) +/* A17938 80241718 9603008E */ lhu $v1, 0x8e($s0) +/* A1793C 8024171C 18400005 */ blez $v0, .L80241734 +/* A17940 80241720 2462FFFF */ addiu $v0, $v1, -1 +/* A17944 80241724 A602008E */ sh $v0, 0x8e($s0) +/* A17948 80241728 00021400 */ sll $v0, $v0, 0x10 +/* A1794C 8024172C 1C400019 */ bgtz $v0, .L80241794 +/* A17950 80241730 00000000 */ nop +.L80241734: +/* A17954 80241734 240403E8 */ addiu $a0, $zero, 0x3e8 +/* A17958 80241738 24020002 */ addiu $v0, $zero, 2 +/* A1795C 8024173C 0C00A67F */ jal rand_int +/* A17960 80241740 AE620070 */ sw $v0, 0x70($s3) +/* A17964 80241744 3C035555 */ lui $v1, 0x5555 +/* A17968 80241748 34635556 */ ori $v1, $v1, 0x5556 +/* A1796C 8024174C 00430018 */ mult $v0, $v1 +/* A17970 80241750 000227C3 */ sra $a0, $v0, 0x1f +/* A17974 80241754 00004010 */ mfhi $t0 +/* A17978 80241758 01042023 */ subu $a0, $t0, $a0 +/* A1797C 8024175C 00041840 */ sll $v1, $a0, 1 +/* A17980 80241760 00641821 */ addu $v1, $v1, $a0 +/* A17984 80241764 00431023 */ subu $v0, $v0, $v1 +/* A17988 80241768 24430002 */ addiu $v1, $v0, 2 +/* A1798C 8024176C AE630074 */ sw $v1, 0x74($s3) +/* A17990 80241770 8E42002C */ lw $v0, 0x2c($s2) +/* A17994 80241774 58400007 */ blezl $v0, .L80241794 +/* A17998 80241778 AE600070 */ sw $zero, 0x70($s3) +/* A1799C 8024177C 8E420008 */ lw $v0, 8($s2) +/* A179A0 80241780 18400003 */ blez $v0, .L80241790 +/* A179A4 80241784 28620003 */ slti $v0, $v1, 3 +/* A179A8 80241788 10400002 */ beqz $v0, .L80241794 +/* A179AC 8024178C 00000000 */ nop +.L80241790: +/* A179B0 80241790 AE600070 */ sw $zero, 0x70($s3) +.L80241794: +/* A179B4 80241794 8FBF0058 */ lw $ra, 0x58($sp) +/* A179B8 80241798 8FB50054 */ lw $s5, 0x54($sp) +/* A179BC 8024179C 8FB40050 */ lw $s4, 0x50($sp) +/* A179C0 802417A0 8FB3004C */ lw $s3, 0x4c($sp) +/* A179C4 802417A4 8FB20048 */ lw $s2, 0x48($sp) +/* A179C8 802417A8 8FB10044 */ lw $s1, 0x44($sp) +/* A179CC 802417AC 8FB00040 */ lw $s0, 0x40($sp) +/* A179D0 802417B0 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* A179D4 802417B4 D7B80070 */ ldc1 $f24, 0x70($sp) +/* A179D8 802417B8 D7B60068 */ ldc1 $f22, 0x68($sp) +/* A179DC 802417BC D7B40060 */ ldc1 $f20, 0x60($sp) +/* A179E0 802417C0 03E00008 */ jr $ra +/* A179E4 802417C4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_802417C8.s b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_802417C8.s new file mode 100644 index 0000000000..0b906e3d65 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_802417C8.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417C8 +/* A179E8 802417C8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A179EC 802417CC AFB3001C */ sw $s3, 0x1c($sp) +/* A179F0 802417D0 0080982D */ daddu $s3, $a0, $zero +/* A179F4 802417D4 AFBF0020 */ sw $ra, 0x20($sp) +/* A179F8 802417D8 AFB20018 */ sw $s2, 0x18($sp) +/* A179FC 802417DC AFB10014 */ sw $s1, 0x14($sp) +/* A17A00 802417E0 AFB00010 */ sw $s0, 0x10($sp) +/* A17A04 802417E4 8E720148 */ lw $s2, 0x148($s3) +/* A17A08 802417E8 86440008 */ lh $a0, 8($s2) +/* A17A0C 802417EC 0C00EABB */ jal get_npc_unsafe +/* A17A10 802417F0 00A0882D */ daddu $s1, $a1, $zero +/* A17A14 802417F4 8E240008 */ lw $a0, 8($s1) +/* A17A18 802417F8 0040802D */ daddu $s0, $v0, $zero +/* A17A1C 802417FC 00041FC2 */ srl $v1, $a0, 0x1f +/* A17A20 80241800 00832021 */ addu $a0, $a0, $v1 +/* A17A24 80241804 00042043 */ sra $a0, $a0, 1 +/* A17A28 80241808 0C00A67F */ jal rand_int +/* A17A2C 8024180C 24840001 */ addiu $a0, $a0, 1 +/* A17A30 80241810 8E230008 */ lw $v1, 8($s1) +/* A17A34 80241814 240400B4 */ addiu $a0, $zero, 0xb4 +/* A17A38 80241818 00032FC2 */ srl $a1, $v1, 0x1f +/* A17A3C 8024181C 00651821 */ addu $v1, $v1, $a1 +/* A17A40 80241820 00031843 */ sra $v1, $v1, 1 +/* A17A44 80241824 00621821 */ addu $v1, $v1, $v0 +/* A17A48 80241828 0C00A67F */ jal rand_int +/* A17A4C 8024182C A603008E */ sh $v1, 0x8e($s0) +/* A17A50 80241830 C60C000C */ lwc1 $f12, 0xc($s0) +/* A17A54 80241834 44820000 */ mtc1 $v0, $f0 +/* A17A58 80241838 00000000 */ nop +/* A17A5C 8024183C 46800020 */ cvt.s.w $f0, $f0 +/* A17A60 80241840 46006300 */ add.s $f12, $f12, $f0 +/* A17A64 80241844 3C0142B4 */ lui $at, 0x42b4 +/* A17A68 80241848 44810000 */ mtc1 $at, $f0 +/* A17A6C 8024184C 0C00A6C9 */ jal clamp_angle +/* A17A70 80241850 46006301 */ sub.s $f12, $f12, $f0 +/* A17A74 80241854 E600000C */ swc1 $f0, 0xc($s0) +/* A17A78 80241858 8E4200CC */ lw $v0, 0xcc($s2) +/* A17A7C 8024185C 8C420000 */ lw $v0, ($v0) +/* A17A80 80241860 AE020028 */ sw $v0, 0x28($s0) +/* A17A84 80241864 24020003 */ addiu $v0, $zero, 3 +/* A17A88 80241868 AE620070 */ sw $v0, 0x70($s3) +/* A17A8C 8024186C 8FBF0020 */ lw $ra, 0x20($sp) +/* A17A90 80241870 8FB3001C */ lw $s3, 0x1c($sp) +/* A17A94 80241874 8FB20018 */ lw $s2, 0x18($sp) +/* A17A98 80241878 8FB10014 */ lw $s1, 0x14($sp) +/* A17A9C 8024187C 8FB00010 */ lw $s0, 0x10($sp) +/* A17AA0 80241880 03E00008 */ jr $ra +/* A17AA4 80241884 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241888.s b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241888.s new file mode 100644 index 0000000000..0f947be484 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241888.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241888 +/* A17AA8 80241888 27BDFF88 */ addiu $sp, $sp, -0x78 +/* A17AAC 8024188C AFB3004C */ sw $s3, 0x4c($sp) +/* A17AB0 80241890 0080982D */ daddu $s3, $a0, $zero +/* A17AB4 80241894 AFBF0054 */ sw $ra, 0x54($sp) +/* A17AB8 80241898 AFB40050 */ sw $s4, 0x50($sp) +/* A17ABC 8024189C AFB20048 */ sw $s2, 0x48($sp) +/* A17AC0 802418A0 AFB10044 */ sw $s1, 0x44($sp) +/* A17AC4 802418A4 AFB00040 */ sw $s0, 0x40($sp) +/* A17AC8 802418A8 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* A17ACC 802418AC F7B80068 */ sdc1 $f24, 0x68($sp) +/* A17AD0 802418B0 F7B60060 */ sdc1 $f22, 0x60($sp) +/* A17AD4 802418B4 F7B40058 */ sdc1 $f20, 0x58($sp) +/* A17AD8 802418B8 8E710148 */ lw $s1, 0x148($s3) +/* A17ADC 802418BC 00A0902D */ daddu $s2, $a1, $zero +/* A17AE0 802418C0 86240008 */ lh $a0, 8($s1) +/* A17AE4 802418C4 0C00EABB */ jal get_npc_unsafe +/* A17AE8 802418C8 00C0A02D */ daddu $s4, $a2, $zero +/* A17AEC 802418CC 0040802D */ daddu $s0, $v0, $zero +/* A17AF0 802418D0 C6200078 */ lwc1 $f0, 0x78($s1) +/* A17AF4 802418D4 46800020 */ cvt.s.w $f0, $f0 +/* A17AF8 802418D8 46000021 */ cvt.d.s $f0, $f0 +/* A17AFC 802418DC 3C014059 */ lui $at, 0x4059 +/* A17B00 802418E0 44811800 */ mtc1 $at, $f3 +/* A17B04 802418E4 44801000 */ mtc1 $zero, $f2 +/* A17B08 802418E8 8602008E */ lh $v0, 0x8e($s0) +/* A17B0C 802418EC 9603008E */ lhu $v1, 0x8e($s0) +/* A17B10 802418F0 46220003 */ div.d $f0, $f0, $f2 +/* A17B14 802418F4 46200620 */ cvt.s.d $f24, $f0 +/* A17B18 802418F8 C6200088 */ lwc1 $f0, 0x88($s1) +/* A17B1C 802418FC 46800020 */ cvt.s.w $f0, $f0 +/* A17B20 80241900 46000021 */ cvt.d.s $f0, $f0 +/* A17B24 80241904 46220003 */ div.d $f0, $f0, $f2 +/* A17B28 80241908 46200020 */ cvt.s.d $f0, $f0 +/* A17B2C 8024190C 18400003 */ blez $v0, .L8024191C +/* A17B30 80241910 4600C680 */ add.s $f26, $f24, $f0 +/* A17B34 80241914 2462FFFF */ addiu $v0, $v1, -1 +/* A17B38 80241918 A602008E */ sh $v0, 0x8e($s0) +.L8024191C: +/* A17B3C 8024191C 8E220070 */ lw $v0, 0x70($s1) +/* A17B40 80241920 18400034 */ blez $v0, .L802419F4 +/* A17B44 80241924 00000000 */ nop +/* A17B48 80241928 C62C0074 */ lwc1 $f12, 0x74($s1) +/* A17B4C 8024192C 46806320 */ cvt.s.w $f12, $f12 +/* A17B50 80241930 44820000 */ mtc1 $v0, $f0 +/* A17B54 80241934 00000000 */ nop +/* A17B58 80241938 46800020 */ cvt.s.w $f0, $f0 +/* A17B5C 8024193C 46000021 */ cvt.d.s $f0, $f0 +/* A17B60 80241940 46220003 */ div.d $f0, $f0, $f2 +/* A17B64 80241944 0C00A8BB */ jal sin_deg +/* A17B68 80241948 462005A0 */ cvt.s.d $f22, $f0 +/* A17B6C 8024194C 8E020000 */ lw $v0, ($s0) +/* A17B70 80241950 30420008 */ andi $v0, $v0, 8 +/* A17B74 80241954 10400003 */ beqz $v0, .L80241964 +/* A17B78 80241958 46000506 */ mov.s $f20, $f0 +/* A17B7C 8024195C 08090669 */ j .L802419A4 +/* A17B80 80241960 0000102D */ daddu $v0, $zero, $zero +.L80241964: +/* A17B84 80241964 27A50028 */ addiu $a1, $sp, 0x28 +/* A17B88 80241968 27A6002C */ addiu $a2, $sp, 0x2c +/* A17B8C 8024196C C6000038 */ lwc1 $f0, 0x38($s0) +/* A17B90 80241970 C602003C */ lwc1 $f2, 0x3c($s0) +/* A17B94 80241974 C6040040 */ lwc1 $f4, 0x40($s0) +/* A17B98 80241978 3C01447A */ lui $at, 0x447a +/* A17B9C 8024197C 44813000 */ mtc1 $at, $f6 +/* A17BA0 80241980 27A20034 */ addiu $v0, $sp, 0x34 +/* A17BA4 80241984 E7A00028 */ swc1 $f0, 0x28($sp) +/* A17BA8 80241988 E7A2002C */ swc1 $f2, 0x2c($sp) +/* A17BAC 8024198C E7A40030 */ swc1 $f4, 0x30($sp) +/* A17BB0 80241990 E7A60034 */ swc1 $f6, 0x34($sp) +/* A17BB4 80241994 AFA20010 */ sw $v0, 0x10($sp) +/* A17BB8 80241998 8E040080 */ lw $a0, 0x80($s0) +/* A17BBC 8024199C 0C0372DF */ jal func_800DCB7C +/* A17BC0 802419A0 27A70030 */ addiu $a3, $sp, 0x30 +.L802419A4: +/* A17BC4 802419A4 10400007 */ beqz $v0, .L802419C4 +/* A17BC8 802419A8 00000000 */ nop +/* A17BCC 802419AC 4616A082 */ mul.s $f2, $f20, $f22 +/* A17BD0 802419B0 00000000 */ nop +/* A17BD4 802419B4 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* A17BD8 802419B8 46180000 */ add.s $f0, $f0, $f24 +/* A17BDC 802419BC 08090674 */ j .L802419D0 +/* A17BE0 802419C0 46020000 */ add.s $f0, $f0, $f2 +.L802419C4: +/* A17BE4 802419C4 4616A002 */ mul.s $f0, $f20, $f22 +/* A17BE8 802419C8 00000000 */ nop +/* A17BEC 802419CC 4600D000 */ add.s $f0, $f26, $f0 +.L802419D0: +/* A17BF0 802419D0 E600003C */ swc1 $f0, 0x3c($s0) +/* A17BF4 802419D4 8E220074 */ lw $v0, 0x74($s1) +/* A17BF8 802419D8 2442000A */ addiu $v0, $v0, 0xa +/* A17BFC 802419DC 44826000 */ mtc1 $v0, $f12 +/* A17C00 802419E0 00000000 */ nop +/* A17C04 802419E4 0C00A6C9 */ jal clamp_angle +/* A17C08 802419E8 46806320 */ cvt.s.w $f12, $f12 +/* A17C0C 802419EC 4600020D */ trunc.w.s $f8, $f0 +/* A17C10 802419F0 E6280074 */ swc1 $f8, 0x74($s1) +.L802419F4: +/* A17C14 802419F4 8E220090 */ lw $v0, 0x90($s1) +/* A17C18 802419F8 1C400040 */ bgtz $v0, .L80241AFC +/* A17C1C 802419FC 2442FFFF */ addiu $v0, $v0, -1 +/* A17C20 80241A00 860200A8 */ lh $v0, 0xa8($s0) +/* A17C24 80241A04 C600003C */ lwc1 $f0, 0x3c($s0) +/* A17C28 80241A08 44821000 */ mtc1 $v0, $f2 +/* A17C2C 80241A0C 00000000 */ nop +/* A17C30 80241A10 468010A0 */ cvt.s.w $f2, $f2 +/* A17C34 80241A14 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A17C38 80241A18 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A17C3C 80241A1C 46020000 */ add.s $f0, $f0, $f2 +/* A17C40 80241A20 3C014024 */ lui $at, 0x4024 +/* A17C44 80241A24 44812800 */ mtc1 $at, $f5 +/* A17C48 80241A28 44802000 */ mtc1 $zero, $f4 +/* A17C4C 80241A2C C442002C */ lwc1 $f2, 0x2c($v0) +/* A17C50 80241A30 46000021 */ cvt.d.s $f0, $f0 +/* A17C54 80241A34 46240000 */ add.d $f0, $f0, $f4 +/* A17C58 80241A38 460010A1 */ cvt.d.s $f2, $f2 +/* A17C5C 80241A3C 4620103C */ c.lt.d $f2, $f0 +/* A17C60 80241A40 00000000 */ nop +/* A17C64 80241A44 4500002E */ bc1f .L80241B00 +/* A17C68 80241A48 0280202D */ daddu $a0, $s4, $zero +/* A17C6C 80241A4C 24020001 */ addiu $v0, $zero, 1 +/* A17C70 80241A50 AFA20010 */ sw $v0, 0x10($sp) +/* A17C74 80241A54 8E460024 */ lw $a2, 0x24($s2) +/* A17C78 80241A58 8E470028 */ lw $a3, 0x28($s2) +/* A17C7C 80241A5C 0C01242D */ jal func_800490B4 +/* A17C80 80241A60 0220282D */ daddu $a1, $s1, $zero +/* A17C84 80241A64 10400026 */ beqz $v0, .L80241B00 +/* A17C88 80241A68 0000202D */ daddu $a0, $zero, $zero +/* A17C8C 80241A6C 0200282D */ daddu $a1, $s0, $zero +/* A17C90 80241A70 0000302D */ daddu $a2, $zero, $zero +/* A17C94 80241A74 2412000C */ addiu $s2, $zero, 0xc +/* A17C98 80241A78 860300A8 */ lh $v1, 0xa8($s0) +/* A17C9C 80241A7C 3C013F80 */ lui $at, 0x3f80 +/* A17CA0 80241A80 44810000 */ mtc1 $at, $f0 +/* A17CA4 80241A84 3C014000 */ lui $at, 0x4000 +/* A17CA8 80241A88 44811000 */ mtc1 $at, $f2 +/* A17CAC 80241A8C 3C01C1A0 */ lui $at, 0xc1a0 +/* A17CB0 80241A90 44812000 */ mtc1 $at, $f4 +/* A17CB4 80241A94 44834000 */ mtc1 $v1, $f8 +/* A17CB8 80241A98 00000000 */ nop +/* A17CBC 80241A9C 46804220 */ cvt.s.w $f8, $f8 +/* A17CC0 80241AA0 44074000 */ mfc1 $a3, $f8 +/* A17CC4 80241AA4 27A20038 */ addiu $v0, $sp, 0x38 +/* A17CC8 80241AA8 AFB2001C */ sw $s2, 0x1c($sp) +/* A17CCC 80241AAC AFA20020 */ sw $v0, 0x20($sp) +/* A17CD0 80241AB0 E7A00010 */ swc1 $f0, 0x10($sp) +/* A17CD4 80241AB4 E7A20014 */ swc1 $f2, 0x14($sp) +/* A17CD8 80241AB8 0C01BFA4 */ jal fx_emote +/* A17CDC 80241ABC E7A40018 */ swc1 $f4, 0x18($sp) +/* A17CE0 80241AC0 0200202D */ daddu $a0, $s0, $zero +/* A17CE4 80241AC4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* A17CE8 80241AC8 C480003C */ lwc1 $f0, 0x3c($a0) +/* A17CEC 80241ACC 3C060020 */ lui $a2, 0x20 +/* A17CF0 80241AD0 0C012530 */ jal func_800494C0 +/* A17CF4 80241AD4 E4800064 */ swc1 $f0, 0x64($a0) +/* A17CF8 80241AD8 8E220018 */ lw $v0, 0x18($s1) +/* A17CFC 80241ADC 9442002A */ lhu $v0, 0x2a($v0) +/* A17D00 80241AE0 30420001 */ andi $v0, $v0, 1 +/* A17D04 80241AE4 10400003 */ beqz $v0, .L80241AF4 +/* A17D08 80241AE8 2402000A */ addiu $v0, $zero, 0xa +/* A17D0C 80241AEC 080906E7 */ j .L80241B9C +/* A17D10 80241AF0 AE620070 */ sw $v0, 0x70($s3) +.L80241AF4: +/* A17D14 80241AF4 080906E7 */ j .L80241B9C +/* A17D18 80241AF8 AE720070 */ sw $s2, 0x70($s3) +.L80241AFC: +/* A17D1C 80241AFC AE220090 */ sw $v0, 0x90($s1) +.L80241B00: +/* A17D20 80241B00 8602008C */ lh $v0, 0x8c($s0) +/* A17D24 80241B04 14400025 */ bnez $v0, .L80241B9C +/* A17D28 80241B08 00000000 */ nop +/* A17D2C 80241B0C 8602008E */ lh $v0, 0x8e($s0) +/* A17D30 80241B10 1C400022 */ bgtz $v0, .L80241B9C +/* A17D34 80241B14 00000000 */ nop +/* A17D38 80241B18 8E620074 */ lw $v0, 0x74($s3) +/* A17D3C 80241B1C 2442FFFF */ addiu $v0, $v0, -1 +/* A17D40 80241B20 1840001D */ blez $v0, .L80241B98 +/* A17D44 80241B24 AE620074 */ sw $v0, 0x74($s3) +/* A17D48 80241B28 8E220018 */ lw $v0, 0x18($s1) +/* A17D4C 80241B2C 9442002A */ lhu $v0, 0x2a($v0) +/* A17D50 80241B30 30420010 */ andi $v0, $v0, 0x10 +/* A17D54 80241B34 14400007 */ bnez $v0, .L80241B54 +/* A17D58 80241B38 00000000 */ nop +/* A17D5C 80241B3C C600000C */ lwc1 $f0, 0xc($s0) +/* A17D60 80241B40 3C014334 */ lui $at, 0x4334 +/* A17D64 80241B44 44816000 */ mtc1 $at, $f12 +/* A17D68 80241B48 0C00A6C9 */ jal clamp_angle +/* A17D6C 80241B4C 460C0300 */ add.s $f12, $f0, $f12 +/* A17D70 80241B50 E600000C */ swc1 $f0, 0xc($s0) +.L80241B54: +/* A17D74 80241B54 0C00A67F */ jal rand_int +/* A17D78 80241B58 240403E8 */ addiu $a0, $zero, 0x3e8 +/* A17D7C 80241B5C 3C032E8B */ lui $v1, 0x2e8b +/* A17D80 80241B60 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* A17D84 80241B64 00430018 */ mult $v0, $v1 +/* A17D88 80241B68 00021FC3 */ sra $v1, $v0, 0x1f +/* A17D8C 80241B6C 00004010 */ mfhi $t0 +/* A17D90 80241B70 00082043 */ sra $a0, $t0, 1 +/* A17D94 80241B74 00832023 */ subu $a0, $a0, $v1 +/* A17D98 80241B78 00041840 */ sll $v1, $a0, 1 +/* A17D9C 80241B7C 00641821 */ addu $v1, $v1, $a0 +/* A17DA0 80241B80 00031880 */ sll $v1, $v1, 2 +/* A17DA4 80241B84 00641823 */ subu $v1, $v1, $a0 +/* A17DA8 80241B88 00431023 */ subu $v0, $v0, $v1 +/* A17DAC 80241B8C 24420005 */ addiu $v0, $v0, 5 +/* A17DB0 80241B90 080906E7 */ j .L80241B9C +/* A17DB4 80241B94 A602008E */ sh $v0, 0x8e($s0) +.L80241B98: +/* A17DB8 80241B98 AE600070 */ sw $zero, 0x70($s3) +.L80241B9C: +/* A17DBC 80241B9C 8FBF0054 */ lw $ra, 0x54($sp) +/* A17DC0 80241BA0 8FB40050 */ lw $s4, 0x50($sp) +/* A17DC4 80241BA4 8FB3004C */ lw $s3, 0x4c($sp) +/* A17DC8 80241BA8 8FB20048 */ lw $s2, 0x48($sp) +/* A17DCC 80241BAC 8FB10044 */ lw $s1, 0x44($sp) +/* A17DD0 80241BB0 8FB00040 */ lw $s0, 0x40($sp) +/* A17DD4 80241BB4 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* A17DD8 80241BB8 D7B80068 */ ldc1 $f24, 0x68($sp) +/* A17DDC 80241BBC D7B60060 */ ldc1 $f22, 0x60($sp) +/* A17DE0 80241BC0 D7B40058 */ ldc1 $f20, 0x58($sp) +/* A17DE4 80241BC4 03E00008 */ jr $ra +/* A17DE8 80241BC8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241BCC.s b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241BCC.s new file mode 100644 index 0000000000..effff62997 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241BCC.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BCC +/* A17DEC 80241BCC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A17DF0 80241BD0 AFB20018 */ sw $s2, 0x18($sp) +/* A17DF4 80241BD4 0080902D */ daddu $s2, $a0, $zero +/* A17DF8 80241BD8 AFBF001C */ sw $ra, 0x1c($sp) +/* A17DFC 80241BDC AFB10014 */ sw $s1, 0x14($sp) +/* A17E00 80241BE0 AFB00010 */ sw $s0, 0x10($sp) +/* A17E04 80241BE4 8E510148 */ lw $s1, 0x148($s2) +/* A17E08 80241BE8 0C00EABB */ jal get_npc_unsafe +/* A17E0C 80241BEC 86240008 */ lh $a0, 8($s1) +/* A17E10 80241BF0 0040802D */ daddu $s0, $v0, $zero +/* A17E14 80241BF4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A17E18 80241BF8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A17E1C 80241BFC C60C0038 */ lwc1 $f12, 0x38($s0) +/* A17E20 80241C00 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A17E24 80241C04 A600008E */ sh $zero, 0x8e($s0) +/* A17E28 80241C08 8C460028 */ lw $a2, 0x28($v0) +/* A17E2C 80241C0C 0C00A720 */ jal atan2 +/* A17E30 80241C10 8C470030 */ lw $a3, 0x30($v0) +/* A17E34 80241C14 E600000C */ swc1 $f0, 0xc($s0) +/* A17E38 80241C18 8E2200CC */ lw $v0, 0xcc($s1) +/* A17E3C 80241C1C 8C420020 */ lw $v0, 0x20($v0) +/* A17E40 80241C20 AE020028 */ sw $v0, 0x28($s0) +/* A17E44 80241C24 2402000B */ addiu $v0, $zero, 0xb +/* A17E48 80241C28 AE420070 */ sw $v0, 0x70($s2) +/* A17E4C 80241C2C 8FBF001C */ lw $ra, 0x1c($sp) +/* A17E50 80241C30 8FB20018 */ lw $s2, 0x18($sp) +/* A17E54 80241C34 8FB10014 */ lw $s1, 0x14($sp) +/* A17E58 80241C38 8FB00010 */ lw $s0, 0x10($sp) +/* A17E5C 80241C3C 03E00008 */ jr $ra +/* A17E60 80241C40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241C44.s b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241C44.s new file mode 100644 index 0000000000..2c7d242d75 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241C44.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C44 +/* A17E64 80241C44 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A17E68 80241C48 AFB00010 */ sw $s0, 0x10($sp) +/* A17E6C 80241C4C 0080802D */ daddu $s0, $a0, $zero +/* A17E70 80241C50 AFBF0014 */ sw $ra, 0x14($sp) +/* A17E74 80241C54 8E020148 */ lw $v0, 0x148($s0) +/* A17E78 80241C58 0C00EABB */ jal get_npc_unsafe +/* A17E7C 80241C5C 84440008 */ lh $a0, 8($v0) +/* A17E80 80241C60 9443008E */ lhu $v1, 0x8e($v0) +/* A17E84 80241C64 C440003C */ lwc1 $f0, 0x3c($v0) +/* A17E88 80241C68 24640001 */ addiu $a0, $v1, 1 +/* A17E8C 80241C6C 00031C00 */ sll $v1, $v1, 0x10 +/* A17E90 80241C70 00031B83 */ sra $v1, $v1, 0xe +/* A17E94 80241C74 A444008E */ sh $a0, 0x8e($v0) +/* A17E98 80241C78 3C018024 */ lui $at, 0x8024 +/* A17E9C 80241C7C 00230821 */ addu $at, $at, $v1 +/* A17EA0 80241C80 C4224490 */ lwc1 $f2, 0x4490($at) +/* A17EA4 80241C84 8443008E */ lh $v1, 0x8e($v0) +/* A17EA8 80241C88 46020000 */ add.s $f0, $f0, $f2 +/* A17EAC 80241C8C 28630005 */ slti $v1, $v1, 5 +/* A17EB0 80241C90 14600003 */ bnez $v1, .L80241CA0 +/* A17EB4 80241C94 E440003C */ swc1 $f0, 0x3c($v0) +/* A17EB8 80241C98 2402000C */ addiu $v0, $zero, 0xc +/* A17EBC 80241C9C AE020070 */ sw $v0, 0x70($s0) +.L80241CA0: +/* A17EC0 80241CA0 8FBF0014 */ lw $ra, 0x14($sp) +/* A17EC4 80241CA4 8FB00010 */ lw $s0, 0x10($sp) +/* A17EC8 80241CA8 03E00008 */ jr $ra +/* A17ECC 80241CAC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241CB0.s b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241CB0.s new file mode 100644 index 0000000000..91ce529cf1 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241CB0.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CB0 +/* A17ED0 80241CB0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A17ED4 80241CB4 AFB3001C */ sw $s3, 0x1c($sp) +/* A17ED8 80241CB8 0080982D */ daddu $s3, $a0, $zero +/* A17EDC 80241CBC AFBF0020 */ sw $ra, 0x20($sp) +/* A17EE0 80241CC0 AFB20018 */ sw $s2, 0x18($sp) +/* A17EE4 80241CC4 AFB10014 */ sw $s1, 0x14($sp) +/* A17EE8 80241CC8 AFB00010 */ sw $s0, 0x10($sp) +/* A17EEC 80241CCC 8E720148 */ lw $s2, 0x148($s3) +/* A17EF0 80241CD0 86440008 */ lh $a0, 8($s2) +/* A17EF4 80241CD4 0C00EABB */ jal get_npc_unsafe +/* A17EF8 80241CD8 00A0802D */ daddu $s0, $a1, $zero +/* A17EFC 80241CDC 0040882D */ daddu $s1, $v0, $zero +/* A17F00 80241CE0 C6420080 */ lwc1 $f2, 0x80($s2) +/* A17F04 80241CE4 468010A0 */ cvt.s.w $f2, $f2 +/* A17F08 80241CE8 460010A1 */ cvt.d.s $f2, $f2 +/* A17F0C 80241CEC C6400084 */ lwc1 $f0, 0x84($s2) +/* A17F10 80241CF0 46800020 */ cvt.s.w $f0, $f0 +/* A17F14 80241CF4 46000021 */ cvt.d.s $f0, $f0 +/* A17F18 80241CF8 3C014059 */ lui $at, 0x4059 +/* A17F1C 80241CFC 44812800 */ mtc1 $at, $f5 +/* A17F20 80241D00 44802000 */ mtc1 $zero, $f4 +/* A17F24 80241D04 8E4200CC */ lw $v0, 0xcc($s2) +/* A17F28 80241D08 C62C0038 */ lwc1 $f12, 0x38($s1) +/* A17F2C 80241D0C C62E0040 */ lwc1 $f14, 0x40($s1) +/* A17F30 80241D10 46241083 */ div.d $f2, $f2, $f4 +/* A17F34 80241D14 462010A0 */ cvt.s.d $f2, $f2 +/* A17F38 80241D18 46240003 */ div.d $f0, $f0, $f4 +/* A17F3C 80241D1C 8C420020 */ lw $v0, 0x20($v0) +/* A17F40 80241D20 46200020 */ cvt.s.d $f0, $f0 +/* A17F44 80241D24 E622001C */ swc1 $f2, 0x1c($s1) +/* A17F48 80241D28 E6200014 */ swc1 $f0, 0x14($s1) +/* A17F4C 80241D2C AE220028 */ sw $v0, 0x28($s1) +/* A17F50 80241D30 C6000018 */ lwc1 $f0, 0x18($s0) +/* A17F54 80241D34 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A17F58 80241D38 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A17F5C 80241D3C E6200018 */ swc1 $f0, 0x18($s1) +/* A17F60 80241D40 8C460028 */ lw $a2, 0x28($v0) +/* A17F64 80241D44 0C00A720 */ jal atan2 +/* A17F68 80241D48 8C470030 */ lw $a3, 0x30($v0) +/* A17F6C 80241D4C E620000C */ swc1 $f0, 0xc($s1) +/* A17F70 80241D50 8E420018 */ lw $v0, 0x18($s2) +/* A17F74 80241D54 AE400074 */ sw $zero, 0x74($s2) +/* A17F78 80241D58 9442002A */ lhu $v0, 0x2a($v0) +/* A17F7C 80241D5C 30420002 */ andi $v0, $v0, 2 +/* A17F80 80241D60 10400005 */ beqz $v0, .L80241D78 +/* A17F84 80241D64 24020003 */ addiu $v0, $zero, 3 +/* A17F88 80241D68 A622008E */ sh $v0, 0x8e($s1) +/* A17F8C 80241D6C 2402000D */ addiu $v0, $zero, 0xd +/* A17F90 80241D70 08090772 */ j .L80241DC8 +/* A17F94 80241D74 AE620070 */ sw $v0, 0x70($s3) +.L80241D78: +/* A17F98 80241D78 24030001 */ addiu $v1, $zero, 1 +/* A17F9C 80241D7C 2402000E */ addiu $v0, $zero, 0xe +/* A17FA0 80241D80 A623008E */ sh $v1, 0x8e($s1) +/* A17FA4 80241D84 AE620070 */ sw $v0, 0x70($s3) +/* A17FA8 80241D88 C6200038 */ lwc1 $f0, 0x38($s1) +/* A17FAC 80241D8C 4600018D */ trunc.w.s $f6, $f0 +/* A17FB0 80241D90 44023000 */ mfc1 $v0, $f6 +/* A17FB4 80241D94 00000000 */ nop +/* A17FB8 80241D98 A6420010 */ sh $v0, 0x10($s2) +/* A17FBC 80241D9C C620003C */ lwc1 $f0, 0x3c($s1) +/* A17FC0 80241DA0 4600018D */ trunc.w.s $f6, $f0 +/* A17FC4 80241DA4 44023000 */ mfc1 $v0, $f6 +/* A17FC8 80241DA8 00000000 */ nop +/* A17FCC 80241DAC A6420012 */ sh $v0, 0x12($s2) +/* A17FD0 80241DB0 C6200040 */ lwc1 $f0, 0x40($s1) +/* A17FD4 80241DB4 A2430007 */ sb $v1, 7($s2) +/* A17FD8 80241DB8 4600018D */ trunc.w.s $f6, $f0 +/* A17FDC 80241DBC 44023000 */ mfc1 $v0, $f6 +/* A17FE0 80241DC0 00000000 */ nop +/* A17FE4 80241DC4 A6420014 */ sh $v0, 0x14($s2) +.L80241DC8: +/* A17FE8 80241DC8 8FBF0020 */ lw $ra, 0x20($sp) +/* A17FEC 80241DCC 8FB3001C */ lw $s3, 0x1c($sp) +/* A17FF0 80241DD0 8FB20018 */ lw $s2, 0x18($sp) +/* A17FF4 80241DD4 8FB10014 */ lw $s1, 0x14($sp) +/* A17FF8 80241DD8 8FB00010 */ lw $s0, 0x10($sp) +/* A17FFC 80241DDC 03E00008 */ jr $ra +/* A18000 80241DE0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241DE4.s b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241DE4.s new file mode 100644 index 0000000000..073d0008da --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241DE4.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241DE4 +/* A18004 80241DE4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A18008 80241DE8 AFB00010 */ sw $s0, 0x10($sp) +/* A1800C 80241DEC 0080802D */ daddu $s0, $a0, $zero +/* A18010 80241DF0 AFBF0014 */ sw $ra, 0x14($sp) +/* A18014 80241DF4 8E020148 */ lw $v0, 0x148($s0) +/* A18018 80241DF8 0C00EABB */ jal get_npc_unsafe +/* A1801C 80241DFC 84440008 */ lh $a0, 8($v0) +/* A18020 80241E00 0040202D */ daddu $a0, $v0, $zero +/* A18024 80241E04 8482008E */ lh $v0, 0x8e($a0) +/* A18028 80241E08 9483008E */ lhu $v1, 0x8e($a0) +/* A1802C 80241E0C 18400005 */ blez $v0, .L80241E24 +/* A18030 80241E10 2462FFFF */ addiu $v0, $v1, -1 +/* A18034 80241E14 A482008E */ sh $v0, 0x8e($a0) +/* A18038 80241E18 00021400 */ sll $v0, $v0, 0x10 +/* A1803C 80241E1C 1C400006 */ bgtz $v0, .L80241E38 +/* A18040 80241E20 00000000 */ nop +.L80241E24: +/* A18044 80241E24 8482008C */ lh $v0, 0x8c($a0) +/* A18048 80241E28 14400003 */ bnez $v0, .L80241E38 +/* A1804C 80241E2C 2402000E */ addiu $v0, $zero, 0xe +/* A18050 80241E30 A480008E */ sh $zero, 0x8e($a0) +/* A18054 80241E34 AE020070 */ sw $v0, 0x70($s0) +.L80241E38: +/* A18058 80241E38 8FBF0014 */ lw $ra, 0x14($sp) +/* A1805C 80241E3C 8FB00010 */ lw $s0, 0x10($sp) +/* A18060 80241E40 03E00008 */ jr $ra +/* A18064 80241E44 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241E48.s b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241E48.s new file mode 100644 index 0000000000..0402ea3bef --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80241E48.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E48 +/* A18068 80241E48 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* A1806C 80241E4C AFB20030 */ sw $s2, 0x30($sp) +/* A18070 80241E50 0080902D */ daddu $s2, $a0, $zero +/* A18074 80241E54 AFBF0038 */ sw $ra, 0x38($sp) +/* A18078 80241E58 AFB30034 */ sw $s3, 0x34($sp) +/* A1807C 80241E5C AFB1002C */ sw $s1, 0x2c($sp) +/* A18080 80241E60 AFB00028 */ sw $s0, 0x28($sp) +/* A18084 80241E64 F7B60048 */ sdc1 $f22, 0x48($sp) +/* A18088 80241E68 F7B40040 */ sdc1 $f20, 0x40($sp) +/* A1808C 80241E6C 8E510148 */ lw $s1, 0x148($s2) +/* A18090 80241E70 86240008 */ lh $a0, 8($s1) +/* A18094 80241E74 0C00EABB */ jal get_npc_unsafe +/* A18098 80241E78 00A0982D */ daddu $s3, $a1, $zero +/* A1809C 80241E7C 0040802D */ daddu $s0, $v0, $zero +/* A180A0 80241E80 0200202D */ daddu $a0, $s0, $zero +/* A180A4 80241E84 C6220088 */ lwc1 $f2, 0x88($s1) +/* A180A8 80241E88 468010A0 */ cvt.s.w $f2, $f2 +/* A180AC 80241E8C 460010A1 */ cvt.d.s $f2, $f2 +/* A180B0 80241E90 C604001C */ lwc1 $f4, 0x1c($s0) +/* A180B4 80241E94 C6000014 */ lwc1 $f0, 0x14($s0) +/* A180B8 80241E98 8E050018 */ lw $a1, 0x18($s0) +/* A180BC 80241E9C 46002100 */ add.s $f4, $f4, $f0 +/* A180C0 80241EA0 8E06000C */ lw $a2, 0xc($s0) +/* A180C4 80241EA4 C6200078 */ lwc1 $f0, 0x78($s1) +/* A180C8 80241EA8 46800020 */ cvt.s.w $f0, $f0 +/* A180CC 80241EAC E604001C */ swc1 $f4, 0x1c($s0) +/* A180D0 80241EB0 3C014059 */ lui $at, 0x4059 +/* A180D4 80241EB4 44812800 */ mtc1 $at, $f5 +/* A180D8 80241EB8 44802000 */ mtc1 $zero, $f4 +/* A180DC 80241EBC 46000021 */ cvt.d.s $f0, $f0 +/* A180E0 80241EC0 46240003 */ div.d $f0, $f0, $f4 +/* A180E4 80241EC4 46200520 */ cvt.s.d $f20, $f0 +/* A180E8 80241EC8 46241083 */ div.d $f2, $f2, $f4 +/* A180EC 80241ECC 0C00EA95 */ jal npc_move_heading +/* A180F0 80241ED0 462015A0 */ cvt.s.d $f22, $f2 +/* A180F4 80241ED4 C604001C */ lwc1 $f4, 0x1c($s0) +/* A180F8 80241ED8 44801000 */ mtc1 $zero, $f2 +/* A180FC 80241EDC 44801800 */ mtc1 $zero, $f3 +/* A18100 80241EE0 46002021 */ cvt.d.s $f0, $f4 +/* A18104 80241EE4 4620103E */ c.le.d $f2, $f0 +/* A18108 80241EE8 00000000 */ nop +/* A1810C 80241EEC 45000030 */ bc1f .L80241FB0 +/* A18110 80241EF0 00000000 */ nop +/* A18114 80241EF4 C600003C */ lwc1 $f0, 0x3c($s0) +/* A18118 80241EF8 46040000 */ add.s $f0, $f0, $f4 +/* A1811C 80241EFC E600003C */ swc1 $f0, 0x3c($s0) +/* A18120 80241F00 8E2200CC */ lw $v0, 0xcc($s1) +/* A18124 80241F04 8C420024 */ lw $v0, 0x24($v0) +/* A18128 80241F08 AE020028 */ sw $v0, 0x28($s0) +/* A1812C 80241F0C A2200007 */ sb $zero, 7($s1) +/* A18130 80241F10 8E020000 */ lw $v0, ($s0) +/* A18134 80241F14 30420008 */ andi $v0, $v0, 8 +/* A18138 80241F18 14400011 */ bnez $v0, .L80241F60 +/* A1813C 80241F1C 0000102D */ daddu $v0, $zero, $zero +/* A18140 80241F20 27A50018 */ addiu $a1, $sp, 0x18 +/* A18144 80241F24 27A6001C */ addiu $a2, $sp, 0x1c +/* A18148 80241F28 C6000038 */ lwc1 $f0, 0x38($s0) +/* A1814C 80241F2C C602003C */ lwc1 $f2, 0x3c($s0) +/* A18150 80241F30 C6040040 */ lwc1 $f4, 0x40($s0) +/* A18154 80241F34 3C01447A */ lui $at, 0x447a +/* A18158 80241F38 44813000 */ mtc1 $at, $f6 +/* A1815C 80241F3C 27A20024 */ addiu $v0, $sp, 0x24 +/* A18160 80241F40 E7A00018 */ swc1 $f0, 0x18($sp) +/* A18164 80241F44 E7A2001C */ swc1 $f2, 0x1c($sp) +/* A18168 80241F48 E7A40020 */ swc1 $f4, 0x20($sp) +/* A1816C 80241F4C E7A60024 */ swc1 $f6, 0x24($sp) +/* A18170 80241F50 AFA20010 */ sw $v0, 0x10($sp) +/* A18174 80241F54 8E040080 */ lw $a0, 0x80($s0) +/* A18178 80241F58 0C0372DF */ jal func_800DCB7C +/* A1817C 80241F5C 27A70020 */ addiu $a3, $sp, 0x20 +.L80241F60: +/* A18180 80241F60 1040000B */ beqz $v0, .L80241F90 +/* A18184 80241F64 00000000 */ nop +/* A18188 80241F68 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* A1818C 80241F6C 46140080 */ add.s $f2, $f0, $f20 +/* A18190 80241F70 C600003C */ lwc1 $f0, 0x3c($s0) +/* A18194 80241F74 4600103E */ c.le.s $f2, $f0 +/* A18198 80241F78 00000000 */ nop +/* A1819C 80241F7C 4500008D */ bc1f .L802421B4 +/* A181A0 80241F80 00000000 */ nop +/* A181A4 80241F84 E602003C */ swc1 $f2, 0x3c($s0) +/* A181A8 80241F88 0809086D */ j .L802421B4 +/* A181AC 80241F8C AE400070 */ sw $zero, 0x70($s2) +.L80241F90: +/* A181B0 80241F90 C602003C */ lwc1 $f2, 0x3c($s0) +/* A181B4 80241F94 C6000064 */ lwc1 $f0, 0x64($s0) +/* A181B8 80241F98 4602003E */ c.le.s $f0, $f2 +/* A181BC 80241F9C 00000000 */ nop +/* A181C0 80241FA0 45030084 */ bc1tl .L802421B4 +/* A181C4 80241FA4 AE400070 */ sw $zero, 0x70($s2) +/* A181C8 80241FA8 0809086D */ j .L802421B4 +/* A181CC 80241FAC 00000000 */ nop +.L80241FB0: +/* A181D0 80241FB0 4622003C */ c.lt.d $f0, $f2 +/* A181D4 80241FB4 00000000 */ nop +/* A181D8 80241FB8 4500007E */ bc1f .L802421B4 +/* A181DC 80241FBC 00000000 */ nop +/* A181E0 80241FC0 9602008E */ lhu $v0, 0x8e($s0) +/* A181E4 80241FC4 24420001 */ addiu $v0, $v0, 1 +/* A181E8 80241FC8 A602008E */ sh $v0, 0x8e($s0) +/* A181EC 80241FCC 00021400 */ sll $v0, $v0, 0x10 +/* A181F0 80241FD0 8E630020 */ lw $v1, 0x20($s3) +/* A181F4 80241FD4 00021403 */ sra $v0, $v0, 0x10 +/* A181F8 80241FD8 0043102A */ slt $v0, $v0, $v1 +/* A181FC 80241FDC 14400026 */ bnez $v0, .L80242078 +/* A18200 80241FE0 00000000 */ nop +/* A18204 80241FE4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A18208 80241FE8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A1820C 80241FEC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A18210 80241FF0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A18214 80241FF4 A600008E */ sh $zero, 0x8e($s0) +/* A18218 80241FF8 8C460028 */ lw $a2, 0x28($v0) +/* A1821C 80241FFC 0C00A720 */ jal atan2 +/* A18220 80242000 8C470030 */ lw $a3, 0x30($v0) +/* A18224 80242004 46000506 */ mov.s $f20, $f0 +/* A18228 80242008 C60C000C */ lwc1 $f12, 0xc($s0) +/* A1822C 8024200C 0C00A70A */ jal get_clamped_angle_diff +/* A18230 80242010 4600A386 */ mov.s $f14, $f20 +/* A18234 80242014 46000086 */ mov.s $f2, $f0 +/* A18238 80242018 8E62001C */ lw $v0, 0x1c($s3) +/* A1823C 8024201C 46001005 */ abs.s $f0, $f2 +/* A18240 80242020 44822000 */ mtc1 $v0, $f4 +/* A18244 80242024 00000000 */ nop +/* A18248 80242028 46802120 */ cvt.s.w $f4, $f4 +/* A1824C 8024202C 4600203C */ c.lt.s $f4, $f0 +/* A18250 80242030 00000000 */ nop +/* A18254 80242034 4500000D */ bc1f .L8024206C +/* A18258 80242038 00000000 */ nop +/* A1825C 8024203C 44800000 */ mtc1 $zero, $f0 +/* A18260 80242040 C614000C */ lwc1 $f20, 0xc($s0) +/* A18264 80242044 4600103C */ c.lt.s $f2, $f0 +/* A18268 80242048 00000000 */ nop +/* A1826C 8024204C 45000006 */ bc1f .L80242068 +/* A18270 80242050 00021023 */ negu $v0, $v0 +/* A18274 80242054 44820000 */ mtc1 $v0, $f0 +/* A18278 80242058 00000000 */ nop +/* A1827C 8024205C 46800020 */ cvt.s.w $f0, $f0 +/* A18280 80242060 0809081B */ j .L8024206C +/* A18284 80242064 4600A500 */ add.s $f20, $f20, $f0 +.L80242068: +/* A18288 80242068 4604A500 */ add.s $f20, $f20, $f4 +.L8024206C: +/* A1828C 8024206C 0C00A6C9 */ jal clamp_angle +/* A18290 80242070 4600A306 */ mov.s $f12, $f20 +/* A18294 80242074 E600000C */ swc1 $f0, 0xc($s0) +.L80242078: +/* A18298 80242078 8E020000 */ lw $v0, ($s0) +/* A1829C 8024207C 30420008 */ andi $v0, $v0, 8 +/* A182A0 80242080 1040000A */ beqz $v0, .L802420AC +/* A182A4 80242084 27A50018 */ addiu $a1, $sp, 0x18 +/* A182A8 80242088 C602003C */ lwc1 $f2, 0x3c($s0) +/* A182AC 8024208C C600001C */ lwc1 $f0, 0x1c($s0) +/* A182B0 80242090 46001080 */ add.s $f2, $f2, $f0 +/* A182B4 80242094 4616103C */ c.lt.s $f2, $f22 +/* A182B8 80242098 00000000 */ nop +/* A182BC 8024209C 45020045 */ bc1fl .L802421B4 +/* A182C0 802420A0 E602003C */ swc1 $f2, 0x3c($s0) +/* A182C4 802420A4 0809086C */ j .L802421B0 +/* A182C8 802420A8 E616003C */ swc1 $f22, 0x3c($s0) +.L802420AC: +/* A182CC 802420AC C6000038 */ lwc1 $f0, 0x38($s0) +/* A182D0 802420B0 27A6001C */ addiu $a2, $sp, 0x1c +/* A182D4 802420B4 E7A00018 */ swc1 $f0, 0x18($sp) +/* A182D8 802420B8 860200A8 */ lh $v0, 0xa8($s0) +/* A182DC 802420BC C600001C */ lwc1 $f0, 0x1c($s0) +/* A182E0 802420C0 C604003C */ lwc1 $f4, 0x3c($s0) +/* A182E4 802420C4 44821000 */ mtc1 $v0, $f2 +/* A182E8 802420C8 00000000 */ nop +/* A182EC 802420CC 468010A0 */ cvt.s.w $f2, $f2 +/* A182F0 802420D0 46000005 */ abs.s $f0, $f0 +/* A182F4 802420D4 46020000 */ add.s $f0, $f0, $f2 +/* A182F8 802420D8 C6060040 */ lwc1 $f6, 0x40($s0) +/* A182FC 802420DC 27A20024 */ addiu $v0, $sp, 0x24 +/* A18300 802420E0 46022100 */ add.s $f4, $f4, $f2 +/* A18304 802420E4 3C014024 */ lui $at, 0x4024 +/* A18308 802420E8 44811800 */ mtc1 $at, $f3 +/* A1830C 802420EC 44801000 */ mtc1 $zero, $f2 +/* A18310 802420F0 46000021 */ cvt.d.s $f0, $f0 +/* A18314 802420F4 46220000 */ add.d $f0, $f0, $f2 +/* A18318 802420F8 E7A60020 */ swc1 $f6, 0x20($sp) +/* A1831C 802420FC E7A4001C */ swc1 $f4, 0x1c($sp) +/* A18320 80242100 46200020 */ cvt.s.d $f0, $f0 +/* A18324 80242104 E7A00024 */ swc1 $f0, 0x24($sp) +/* A18328 80242108 AFA20010 */ sw $v0, 0x10($sp) +/* A1832C 8024210C 8E040080 */ lw $a0, 0x80($s0) +/* A18330 80242110 0C0372DF */ jal func_800DCB7C +/* A18334 80242114 27A70020 */ addiu $a3, $sp, 0x20 +/* A18338 80242118 10400015 */ beqz $v0, .L80242170 +/* A1833C 8024211C 00000000 */ nop +/* A18340 80242120 860200A8 */ lh $v0, 0xa8($s0) +/* A18344 80242124 C604001C */ lwc1 $f4, 0x1c($s0) +/* A18348 80242128 44820000 */ mtc1 $v0, $f0 +/* A1834C 8024212C 00000000 */ nop +/* A18350 80242130 46800020 */ cvt.s.w $f0, $f0 +/* A18354 80242134 46002085 */ abs.s $f2, $f4 +/* A18358 80242138 46020000 */ add.s $f0, $f0, $f2 +/* A1835C 8024213C C7A20024 */ lwc1 $f2, 0x24($sp) +/* A18360 80242140 4600103E */ c.le.s $f2, $f0 +/* A18364 80242144 00000000 */ nop +/* A18368 80242148 45000005 */ bc1f .L80242160 +/* A1836C 8024214C 00000000 */ nop +/* A18370 80242150 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* A18374 80242154 AE00001C */ sw $zero, 0x1c($s0) +/* A18378 80242158 0809086D */ j .L802421B4 +/* A1837C 8024215C E600003C */ swc1 $f0, 0x3c($s0) +.L80242160: +/* A18380 80242160 C600003C */ lwc1 $f0, 0x3c($s0) +/* A18384 80242164 46040000 */ add.s $f0, $f0, $f4 +/* A18388 80242168 0809086D */ j .L802421B4 +/* A1838C 8024216C E600003C */ swc1 $f0, 0x3c($s0) +.L80242170: +/* A18390 80242170 C606003C */ lwc1 $f6, 0x3c($s0) +/* A18394 80242174 860200A8 */ lh $v0, 0xa8($s0) +/* A18398 80242178 46163081 */ sub.s $f2, $f6, $f22 +/* A1839C 8024217C 44820000 */ mtc1 $v0, $f0 +/* A183A0 80242180 00000000 */ nop +/* A183A4 80242184 46800020 */ cvt.s.w $f0, $f0 +/* A183A8 80242188 46001080 */ add.s $f2, $f2, $f0 +/* A183AC 8024218C C604001C */ lwc1 $f4, 0x1c($s0) +/* A183B0 80242190 46002005 */ abs.s $f0, $f4 +/* A183B4 80242194 4602003C */ c.lt.s $f0, $f2 +/* A183B8 80242198 00000000 */ nop +/* A183BC 8024219C 45020005 */ bc1fl .L802421B4 +/* A183C0 802421A0 AE00001C */ sw $zero, 0x1c($s0) +/* A183C4 802421A4 46043000 */ add.s $f0, $f6, $f4 +/* A183C8 802421A8 0809086D */ j .L802421B4 +/* A183CC 802421AC E600003C */ swc1 $f0, 0x3c($s0) +.L802421B0: +/* A183D0 802421B0 AE00001C */ sw $zero, 0x1c($s0) +.L802421B4: +/* A183D4 802421B4 8FBF0038 */ lw $ra, 0x38($sp) +/* A183D8 802421B8 8FB30034 */ lw $s3, 0x34($sp) +/* A183DC 802421BC 8FB20030 */ lw $s2, 0x30($sp) +/* A183E0 802421C0 8FB1002C */ lw $s1, 0x2c($sp) +/* A183E4 802421C4 8FB00028 */ lw $s0, 0x28($sp) +/* A183E8 802421C8 D7B60048 */ ldc1 $f22, 0x48($sp) +/* A183EC 802421CC D7B40040 */ ldc1 $f20, 0x40($sp) +/* A183F0 802421D0 03E00008 */ jr $ra +/* A183F4 802421D4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_802421D8.s b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_802421D8.s new file mode 100644 index 0000000000..10edc1e6ac --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_802421D8.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802421D8 +/* A183F8 802421D8 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A183FC 802421DC AFB00028 */ sw $s0, 0x28($sp) +/* A18400 802421E0 00A0802D */ daddu $s0, $a1, $zero +/* A18404 802421E4 AFB1002C */ sw $s1, 0x2c($sp) +/* A18408 802421E8 00C0882D */ daddu $s1, $a2, $zero +/* A1840C 802421EC AFBF0034 */ sw $ra, 0x34($sp) +/* A18410 802421F0 AFB20030 */ sw $s2, 0x30($sp) +/* A18414 802421F4 AE200070 */ sw $zero, 0x70($s1) +/* A18418 802421F8 8C830000 */ lw $v1, ($a0) +/* A1841C 802421FC 2402FDFF */ addiu $v0, $zero, -0x201 +/* A18420 80242200 A480008E */ sh $zero, 0x8e($a0) +/* A18424 80242204 00621824 */ and $v1, $v1, $v0 +/* A18428 80242208 34650800 */ ori $a1, $v1, 0x800 +/* A1842C 8024220C AC850000 */ sw $a1, ($a0) +/* A18430 80242210 8E0200D0 */ lw $v0, 0xd0($s0) +/* A18434 80242214 8C420034 */ lw $v0, 0x34($v0) +/* A18438 80242218 10400003 */ beqz $v0, .L80242228 +/* A1843C 8024221C 00E0902D */ daddu $s2, $a3, $zero +/* A18440 80242220 0809088C */ j .L80242230 +/* A18444 80242224 34620808 */ ori $v0, $v1, 0x808 +.L80242228: +/* A18448 80242228 2402FFF7 */ addiu $v0, $zero, -9 +/* A1844C 8024222C 00A21024 */ and $v0, $a1, $v0 +.L80242230: +/* A18450 80242230 AC820000 */ sw $v0, ($a0) +/* A18454 80242234 27A20024 */ addiu $v0, $sp, 0x24 +/* A18458 80242238 27A50018 */ addiu $a1, $sp, 0x18 +/* A1845C 8024223C C4800038 */ lwc1 $f0, 0x38($a0) +/* A18460 80242240 C482003C */ lwc1 $f2, 0x3c($a0) +/* A18464 80242244 C4840040 */ lwc1 $f4, 0x40($a0) +/* A18468 80242248 3C01447A */ lui $at, 0x447a +/* A1846C 8024224C 44813000 */ mtc1 $at, $f6 +/* A18470 80242250 27A6001C */ addiu $a2, $sp, 0x1c +/* A18474 80242254 E7A00018 */ swc1 $f0, 0x18($sp) +/* A18478 80242258 E7A2001C */ swc1 $f2, 0x1c($sp) +/* A1847C 8024225C E7A40020 */ swc1 $f4, 0x20($sp) +/* A18480 80242260 E7A60024 */ swc1 $f6, 0x24($sp) +/* A18484 80242264 AFA20010 */ sw $v0, 0x10($sp) +/* A18488 80242268 8C840080 */ lw $a0, 0x80($a0) +/* A1848C 8024226C 0C0372DF */ jal func_800DCB7C +/* A18490 80242270 27A70020 */ addiu $a3, $sp, 0x20 +/* A18494 80242274 C7A20024 */ lwc1 $f2, 0x24($sp) +/* A18498 80242278 3C014059 */ lui $at, 0x4059 +/* A1849C 8024227C 44812800 */ mtc1 $at, $f5 +/* A184A0 80242280 44802000 */ mtc1 $zero, $f4 +/* A184A4 80242284 460010A1 */ cvt.d.s $f2, $f2 +/* A184A8 80242288 46241082 */ mul.d $f2, $f2, $f4 +/* A184AC 8024228C 00000000 */ nop +/* A184B0 80242290 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* A184B4 80242294 46000021 */ cvt.d.s $f0, $f0 +/* A184B8 80242298 46240002 */ mul.d $f0, $f0, $f4 +/* A184BC 8024229C 00000000 */ nop +/* A184C0 802422A0 3C013FE0 */ lui $at, 0x3fe0 +/* A184C4 802422A4 44812800 */ mtc1 $at, $f5 +/* A184C8 802422A8 44802000 */ mtc1 $zero, $f4 +/* A184CC 802422AC 00000000 */ nop +/* A184D0 802422B0 46241080 */ add.d $f2, $f2, $f4 +/* A184D4 802422B4 AE000074 */ sw $zero, 0x74($s0) +/* A184D8 802422B8 46240000 */ add.d $f0, $f0, $f4 +/* A184DC 802422BC AE000090 */ sw $zero, 0x90($s0) +/* A184E0 802422C0 4620120D */ trunc.w.d $f8, $f2 +/* A184E4 802422C4 E6080078 */ swc1 $f8, 0x78($s0) +/* A184E8 802422C8 4620020D */ trunc.w.d $f8, $f0 +/* A184EC 802422CC E6080088 */ swc1 $f8, 0x88($s0) +/* A184F0 802422D0 8E420014 */ lw $v0, 0x14($s2) +/* A184F4 802422D4 AE220074 */ sw $v0, 0x74($s1) +/* A184F8 802422D8 8E0200B0 */ lw $v0, 0xb0($s0) +/* A184FC 802422DC 34420010 */ ori $v0, $v0, 0x10 +/* A18500 802422E0 AE0200B0 */ sw $v0, 0xb0($s0) +/* A18504 802422E4 8FBF0034 */ lw $ra, 0x34($sp) +/* A18508 802422E8 8FB20030 */ lw $s2, 0x30($sp) +/* A1850C 802422EC 8FB1002C */ lw $s1, 0x2c($sp) +/* A18510 802422F0 8FB00028 */ lw $s0, 0x28($sp) +/* A18514 802422F4 03E00008 */ jr $ra +/* A18518 802422F8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_02/func_802422FC_A16220.s b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_802422FC_A1851C.s similarity index 100% rename from asm/nonmatchings/world/area_hos/hos_02/func_802422FC_A16220.s rename to asm/nonmatchings/world/area_hos/hos_02/_A17210/func_802422FC_A1851C.s diff --git a/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_802424E8.s b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_802424E8.s new file mode 100644 index 0000000000..29212667ab --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_802424E8.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802424E8 +/* A18708 802424E8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* A1870C 802424EC AFB3001C */ sw $s3, 0x1c($sp) +/* A18710 802424F0 0080982D */ daddu $s3, $a0, $zero +/* A18714 802424F4 AFBF0020 */ sw $ra, 0x20($sp) +/* A18718 802424F8 AFB20018 */ sw $s2, 0x18($sp) +/* A1871C 802424FC AFB10014 */ sw $s1, 0x14($sp) +/* A18720 80242500 AFB00010 */ sw $s0, 0x10($sp) +/* A18724 80242504 F7B40028 */ sdc1 $f20, 0x28($sp) +/* A18728 80242508 8E710148 */ lw $s1, 0x148($s3) +/* A1872C 8024250C 86240008 */ lh $a0, 8($s1) +/* A18730 80242510 0C00EABB */ jal get_npc_unsafe +/* A18734 80242514 00A0802D */ daddu $s0, $a1, $zero +/* A18738 80242518 8E040020 */ lw $a0, 0x20($s0) +/* A1873C 8024251C 0040902D */ daddu $s2, $v0, $zero +/* A18740 80242520 00041FC2 */ srl $v1, $a0, 0x1f +/* A18744 80242524 00832021 */ addu $a0, $a0, $v1 +/* A18748 80242528 00042043 */ sra $a0, $a0, 1 +/* A1874C 8024252C 0C00A67F */ jal rand_int +/* A18750 80242530 24840001 */ addiu $a0, $a0, 1 +/* A18754 80242534 8E030020 */ lw $v1, 0x20($s0) +/* A18758 80242538 C64C0038 */ lwc1 $f12, 0x38($s2) +/* A1875C 8024253C 000327C2 */ srl $a0, $v1, 0x1f +/* A18760 80242540 00641821 */ addu $v1, $v1, $a0 +/* A18764 80242544 00031843 */ sra $v1, $v1, 1 +/* A18768 80242548 00621821 */ addu $v1, $v1, $v0 +/* A1876C 8024254C A643008E */ sh $v1, 0x8e($s2) +/* A18770 80242550 8E2200CC */ lw $v0, 0xcc($s1) +/* A18774 80242554 C64E0040 */ lwc1 $f14, 0x40($s2) +/* A18778 80242558 8C42000C */ lw $v0, 0xc($v0) +/* A1877C 8024255C AE420028 */ sw $v0, 0x28($s2) +/* A18780 80242560 C6000018 */ lwc1 $f0, 0x18($s0) +/* A18784 80242564 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A18788 80242568 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A1878C 8024256C E6400018 */ swc1 $f0, 0x18($s2) +/* A18790 80242570 8C460028 */ lw $a2, 0x28($v0) +/* A18794 80242574 0C00A720 */ jal atan2 +/* A18798 80242578 8C470030 */ lw $a3, 0x30($v0) +/* A1879C 8024257C 46000506 */ mov.s $f20, $f0 +/* A187A0 80242580 C64C000C */ lwc1 $f12, 0xc($s2) +/* A187A4 80242584 0C00A70A */ jal get_clamped_angle_diff +/* A187A8 80242588 4600A386 */ mov.s $f14, $f20 +/* A187AC 8024258C 46000086 */ mov.s $f2, $f0 +/* A187B0 80242590 8E02001C */ lw $v0, 0x1c($s0) +/* A187B4 80242594 46001005 */ abs.s $f0, $f2 +/* A187B8 80242598 44822000 */ mtc1 $v0, $f4 +/* A187BC 8024259C 00000000 */ nop +/* A187C0 802425A0 46802120 */ cvt.s.w $f4, $f4 +/* A187C4 802425A4 4600203C */ c.lt.s $f4, $f0 +/* A187C8 802425A8 00000000 */ nop +/* A187CC 802425AC 4500000D */ bc1f .L802425E4 +/* A187D0 802425B0 00000000 */ nop +/* A187D4 802425B4 44800000 */ mtc1 $zero, $f0 +/* A187D8 802425B8 C654000C */ lwc1 $f20, 0xc($s2) +/* A187DC 802425BC 4600103C */ c.lt.s $f2, $f0 +/* A187E0 802425C0 00000000 */ nop +/* A187E4 802425C4 45000006 */ bc1f .L802425E0 +/* A187E8 802425C8 00021023 */ negu $v0, $v0 +/* A187EC 802425CC 44820000 */ mtc1 $v0, $f0 +/* A187F0 802425D0 00000000 */ nop +/* A187F4 802425D4 46800020 */ cvt.s.w $f0, $f0 +/* A187F8 802425D8 08090979 */ j .L802425E4 +/* A187FC 802425DC 4600A500 */ add.s $f20, $f20, $f0 +.L802425E0: +/* A18800 802425E0 4604A500 */ add.s $f20, $f20, $f4 +.L802425E4: +/* A18804 802425E4 0C00A6C9 */ jal clamp_angle +/* A18808 802425E8 4600A306 */ mov.s $f12, $f20 +/* A1880C 802425EC 2402000D */ addiu $v0, $zero, 0xd +/* A18810 802425F0 E640000C */ swc1 $f0, 0xc($s2) +/* A18814 802425F4 AE620070 */ sw $v0, 0x70($s3) +/* A18818 802425F8 8FBF0020 */ lw $ra, 0x20($sp) +/* A1881C 802425FC 8FB3001C */ lw $s3, 0x1c($sp) +/* A18820 80242600 8FB20018 */ lw $s2, 0x18($sp) +/* A18824 80242604 8FB10014 */ lw $s1, 0x14($sp) +/* A18828 80242608 8FB00010 */ lw $s0, 0x10($sp) +/* A1882C 8024260C D7B40028 */ ldc1 $f20, 0x28($sp) +/* A18830 80242610 03E00008 */ jr $ra +/* A18834 80242614 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80242618.s b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80242618.s new file mode 100644 index 0000000000..59b646877f --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80242618.s @@ -0,0 +1,172 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242618 +/* A18838 80242618 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* A1883C 8024261C AFB3004C */ sw $s3, 0x4c($sp) +/* A18840 80242620 0080982D */ daddu $s3, $a0, $zero +/* A18844 80242624 AFBF0050 */ sw $ra, 0x50($sp) +/* A18848 80242628 AFB20048 */ sw $s2, 0x48($sp) +/* A1884C 8024262C AFB10044 */ sw $s1, 0x44($sp) +/* A18850 80242630 AFB00040 */ sw $s0, 0x40($sp) +/* A18854 80242634 8E720148 */ lw $s2, 0x148($s3) +/* A18858 80242638 00A0882D */ daddu $s1, $a1, $zero +/* A1885C 8024263C 86440008 */ lh $a0, 8($s2) +/* A18860 80242640 0C00EABB */ jal get_npc_unsafe +/* A18864 80242644 00C0802D */ daddu $s0, $a2, $zero +/* A18868 80242648 0200202D */ daddu $a0, $s0, $zero +/* A1886C 8024264C 0240282D */ daddu $a1, $s2, $zero +/* A18870 80242650 24030001 */ addiu $v1, $zero, 1 +/* A18874 80242654 AFA30010 */ sw $v1, 0x10($sp) +/* A18878 80242658 8E260024 */ lw $a2, 0x24($s1) +/* A1887C 8024265C 8E270028 */ lw $a3, 0x28($s1) +/* A18880 80242660 0C01242D */ jal func_800490B4 +/* A18884 80242664 0040802D */ daddu $s0, $v0, $zero +/* A18888 80242668 14400020 */ bnez $v0, .L802426EC +/* A1888C 8024266C 24040002 */ addiu $a0, $zero, 2 +/* A18890 80242670 0200282D */ daddu $a1, $s0, $zero +/* A18894 80242674 0000302D */ daddu $a2, $zero, $zero +/* A18898 80242678 860300A8 */ lh $v1, 0xa8($s0) +/* A1889C 8024267C 3C013F80 */ lui $at, 0x3f80 +/* A188A0 80242680 44810000 */ mtc1 $at, $f0 +/* A188A4 80242684 3C014000 */ lui $at, 0x4000 +/* A188A8 80242688 44811000 */ mtc1 $at, $f2 +/* A188AC 8024268C 3C01C1A0 */ lui $at, 0xc1a0 +/* A188B0 80242690 44812000 */ mtc1 $at, $f4 +/* A188B4 80242694 2402000F */ addiu $v0, $zero, 0xf +/* A188B8 80242698 AFA2001C */ sw $v0, 0x1c($sp) +/* A188BC 8024269C 44834000 */ mtc1 $v1, $f8 +/* A188C0 802426A0 00000000 */ nop +/* A188C4 802426A4 46804220 */ cvt.s.w $f8, $f8 +/* A188C8 802426A8 44074000 */ mfc1 $a3, $f8 +/* A188CC 802426AC 27A20028 */ addiu $v0, $sp, 0x28 +/* A188D0 802426B0 AFA20020 */ sw $v0, 0x20($sp) +/* A188D4 802426B4 E7A00010 */ swc1 $f0, 0x10($sp) +/* A188D8 802426B8 E7A20014 */ swc1 $f2, 0x14($sp) +/* A188DC 802426BC 0C01BFA4 */ jal fx_emote +/* A188E0 802426C0 E7A40018 */ swc1 $f4, 0x18($sp) +/* A188E4 802426C4 8E4200CC */ lw $v0, 0xcc($s2) +/* A188E8 802426C8 8C430000 */ lw $v1, ($v0) +/* A188EC 802426CC 2402001E */ addiu $v0, $zero, 0x1e +/* A188F0 802426D0 A602008E */ sh $v0, 0x8e($s0) +/* A188F4 802426D4 24020014 */ addiu $v0, $zero, 0x14 +/* A188F8 802426D8 AE030028 */ sw $v1, 0x28($s0) +/* A188FC 802426DC AE620070 */ sw $v0, 0x70($s3) +/* A18900 802426E0 2402001E */ addiu $v0, $zero, 0x1e +/* A18904 802426E4 08090A1F */ j .L8024287C +/* A18908 802426E8 AE420090 */ sw $v0, 0x90($s2) +.L802426EC: +/* A1890C 802426EC 8E050018 */ lw $a1, 0x18($s0) +/* A18910 802426F0 8E06000C */ lw $a2, 0xc($s0) +/* A18914 802426F4 0C00EA95 */ jal npc_move_heading +/* A18918 802426F8 0200202D */ daddu $a0, $s0, $zero +/* A1891C 802426FC 8E020000 */ lw $v0, ($s0) +/* A18920 80242700 30420008 */ andi $v0, $v0, 8 +/* A18924 80242704 14400028 */ bnez $v0, .L802427A8 +/* A18928 80242708 0000882D */ daddu $s1, $zero, $zero +/* A1892C 8024270C 27A5002C */ addiu $a1, $sp, 0x2c +/* A18930 80242710 27A60030 */ addiu $a2, $sp, 0x30 +/* A18934 80242714 860200A8 */ lh $v0, 0xa8($s0) +/* A18938 80242718 C6000038 */ lwc1 $f0, 0x38($s0) +/* A1893C 8024271C 44821000 */ mtc1 $v0, $f2 +/* A18940 80242720 00000000 */ nop +/* A18944 80242724 468010A0 */ cvt.s.w $f2, $f2 +/* A18948 80242728 E7A0002C */ swc1 $f0, 0x2c($sp) +/* A1894C 8024272C 860200A8 */ lh $v0, 0xa8($s0) +/* A18950 80242730 C604003C */ lwc1 $f4, 0x3c($s0) +/* A18954 80242734 C6060040 */ lwc1 $f6, 0x40($s0) +/* A18958 80242738 44820000 */ mtc1 $v0, $f0 +/* A1895C 8024273C 00000000 */ nop +/* A18960 80242740 46800021 */ cvt.d.w $f0, $f0 +/* A18964 80242744 46022100 */ add.s $f4, $f4, $f2 +/* A18968 80242748 3C014008 */ lui $at, 0x4008 +/* A1896C 8024274C 44811800 */ mtc1 $at, $f3 +/* A18970 80242750 44801000 */ mtc1 $zero, $f2 +/* A18974 80242754 27A20038 */ addiu $v0, $sp, 0x38 +/* A18978 80242758 46220000 */ add.d $f0, $f0, $f2 +/* A1897C 8024275C E7A60034 */ swc1 $f6, 0x34($sp) +/* A18980 80242760 E7A40030 */ swc1 $f4, 0x30($sp) +/* A18984 80242764 46200020 */ cvt.s.d $f0, $f0 +/* A18988 80242768 E7A00038 */ swc1 $f0, 0x38($sp) +/* A1898C 8024276C AFA20010 */ sw $v0, 0x10($sp) +/* A18990 80242770 8E040080 */ lw $a0, 0x80($s0) +/* A18994 80242774 0C0372DF */ jal func_800DCB7C +/* A18998 80242778 27A70034 */ addiu $a3, $sp, 0x34 +/* A1899C 8024277C 1040000A */ beqz $v0, .L802427A8 +/* A189A0 80242780 00000000 */ nop +/* A189A4 80242784 860200A8 */ lh $v0, 0xa8($s0) +/* A189A8 80242788 C7A20038 */ lwc1 $f2, 0x38($sp) +/* A189AC 8024278C 44820000 */ mtc1 $v0, $f0 +/* A189B0 80242790 00000000 */ nop +/* A189B4 80242794 46800020 */ cvt.s.w $f0, $f0 +/* A189B8 80242798 4600103C */ c.lt.s $f2, $f0 +/* A189BC 8024279C 00000000 */ nop +/* A189C0 802427A0 45030001 */ bc1tl .L802427A8 +/* A189C4 802427A4 24110001 */ addiu $s1, $zero, 1 +.L802427A8: +/* A189C8 802427A8 12200008 */ beqz $s1, .L802427CC +/* A189CC 802427AC 00000000 */ nop +/* A189D0 802427B0 C7A00030 */ lwc1 $f0, 0x30($sp) +/* A189D4 802427B4 3C013FF0 */ lui $at, 0x3ff0 +/* A189D8 802427B8 44811800 */ mtc1 $at, $f3 +/* A189DC 802427BC 44801000 */ mtc1 $zero, $f2 +/* A189E0 802427C0 46000021 */ cvt.d.s $f0, $f0 +/* A189E4 802427C4 08090A15 */ j .L80242854 +/* A189E8 802427C8 46220000 */ add.d $f0, $f0, $f2 +.L802427CC: +/* A189EC 802427CC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A189F0 802427D0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A189F4 802427D4 3C014018 */ lui $at, 0x4018 +/* A189F8 802427D8 44811800 */ mtc1 $at, $f3 +/* A189FC 802427DC 44801000 */ mtc1 $zero, $f2 +/* A18A00 802427E0 C440002C */ lwc1 $f0, 0x2c($v0) +/* A18A04 802427E4 C604003C */ lwc1 $f4, 0x3c($s0) +/* A18A08 802427E8 46000021 */ cvt.d.s $f0, $f0 +/* A18A0C 802427EC 46220000 */ add.d $f0, $f0, $f2 +/* A18A10 802427F0 46002121 */ cvt.d.s $f4, $f4 +/* A18A14 802427F4 46202001 */ sub.d $f0, $f4, $f0 +/* A18A18 802427F8 462001A0 */ cvt.s.d $f6, $f0 +/* A18A1C 802427FC 44800000 */ mtc1 $zero, $f0 +/* A18A20 80242800 44800800 */ mtc1 $zero, $f1 +/* A18A24 80242804 460030A1 */ cvt.d.s $f2, $f6 +/* A18A28 80242808 4620103C */ c.lt.d $f2, $f0 +/* A18A2C 8024280C 00000000 */ nop +/* A18A30 80242810 45010009 */ bc1t .L80242838 +/* A18A34 80242814 00000000 */ nop +/* A18A38 80242818 3C014010 */ lui $at, 0x4010 +/* A18A3C 8024281C 44810800 */ mtc1 $at, $f1 +/* A18A40 80242820 44800000 */ mtc1 $zero, $f0 +/* A18A44 80242824 00000000 */ nop +/* A18A48 80242828 4622003C */ c.lt.d $f0, $f2 +/* A18A4C 8024282C 00000000 */ nop +/* A18A50 80242830 4500000A */ bc1f .L8024285C +/* A18A54 80242834 00000000 */ nop +.L80242838: +/* A18A58 80242838 3C018024 */ lui $at, 0x8024 +/* A18A5C 8024283C D4224E78 */ ldc1 $f2, 0x4e78($at) +/* A18A60 80242840 46003187 */ neg.s $f6, $f6 +/* A18A64 80242844 46003021 */ cvt.d.s $f0, $f6 +/* A18A68 80242848 46220002 */ mul.d $f0, $f0, $f2 +/* A18A6C 8024284C 00000000 */ nop +/* A18A70 80242850 46202000 */ add.d $f0, $f4, $f0 +.L80242854: +/* A18A74 80242854 46200020 */ cvt.s.d $f0, $f0 +/* A18A78 80242858 E600003C */ swc1 $f0, 0x3c($s0) +.L8024285C: +/* A18A7C 8024285C 8602008E */ lh $v0, 0x8e($s0) +/* A18A80 80242860 9603008E */ lhu $v1, 0x8e($s0) +/* A18A84 80242864 18400003 */ blez $v0, .L80242874 +/* A18A88 80242868 2462FFFF */ addiu $v0, $v1, -1 +/* A18A8C 8024286C 08090A1F */ j .L8024287C +/* A18A90 80242870 A602008E */ sh $v0, 0x8e($s0) +.L80242874: +/* A18A94 80242874 2402000C */ addiu $v0, $zero, 0xc +/* A18A98 80242878 AE620070 */ sw $v0, 0x70($s3) +.L8024287C: +/* A18A9C 8024287C 8FBF0050 */ lw $ra, 0x50($sp) +/* A18AA0 80242880 8FB3004C */ lw $s3, 0x4c($sp) +/* A18AA4 80242884 8FB20048 */ lw $s2, 0x48($sp) +/* A18AA8 80242888 8FB10044 */ lw $s1, 0x44($sp) +/* A18AAC 8024288C 8FB00040 */ lw $s0, 0x40($sp) +/* A18AB0 80242890 03E00008 */ jr $ra +/* A18AB4 80242894 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_hos/hos_02/func_80242898_A16220.s b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80242898_A18AB8.s similarity index 100% rename from asm/nonmatchings/world/area_hos/hos_02/func_80242898_A16220.s rename to asm/nonmatchings/world/area_hos/hos_02/_A17210/func_80242898_A18AB8.s diff --git a/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_802428F4.s b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_802428F4.s new file mode 100644 index 0000000000..1c098fa6f1 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/_A17210/func_802428F4.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802428F4 +/* A18B14 802428F4 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* A18B18 802428F8 AFB40040 */ sw $s4, 0x40($sp) +/* A18B1C 802428FC 0080A02D */ daddu $s4, $a0, $zero +/* A18B20 80242900 AFBF0048 */ sw $ra, 0x48($sp) +/* A18B24 80242904 AFB50044 */ sw $s5, 0x44($sp) +/* A18B28 80242908 AFB3003C */ sw $s3, 0x3c($sp) +/* A18B2C 8024290C AFB20038 */ sw $s2, 0x38($sp) +/* A18B30 80242910 AFB10034 */ sw $s1, 0x34($sp) +/* A18B34 80242914 AFB00030 */ sw $s0, 0x30($sp) +/* A18B38 80242918 8E920148 */ lw $s2, 0x148($s4) +/* A18B3C 8024291C 86440008 */ lh $a0, 8($s2) +/* A18B40 80242920 8E90000C */ lw $s0, 0xc($s4) +/* A18B44 80242924 0C00EABB */ jal get_npc_unsafe +/* A18B48 80242928 00A0882D */ daddu $s1, $a1, $zero +/* A18B4C 8024292C 0280202D */ daddu $a0, $s4, $zero +/* A18B50 80242930 8E050000 */ lw $a1, ($s0) +/* A18B54 80242934 0C0B1EAF */ jal get_variable +/* A18B58 80242938 0040A82D */ daddu $s5, $v0, $zero +/* A18B5C 8024293C AFA00010 */ sw $zero, 0x10($sp) +/* A18B60 80242940 8E4300D0 */ lw $v1, 0xd0($s2) +/* A18B64 80242944 8C630030 */ lw $v1, 0x30($v1) +/* A18B68 80242948 AFA30014 */ sw $v1, 0x14($sp) +/* A18B6C 8024294C 8E4300D0 */ lw $v1, 0xd0($s2) +/* A18B70 80242950 8C63001C */ lw $v1, 0x1c($v1) +/* A18B74 80242954 AFA30018 */ sw $v1, 0x18($sp) +/* A18B78 80242958 8E4300D0 */ lw $v1, 0xd0($s2) +/* A18B7C 8024295C 8C630024 */ lw $v1, 0x24($v1) +/* A18B80 80242960 AFA3001C */ sw $v1, 0x1c($sp) +/* A18B84 80242964 8E4300D0 */ lw $v1, 0xd0($s2) +/* A18B88 80242968 8C630028 */ lw $v1, 0x28($v1) +/* A18B8C 8024296C 27B30010 */ addiu $s3, $sp, 0x10 +/* A18B90 80242970 AFA30020 */ sw $v1, 0x20($sp) +/* A18B94 80242974 8E4300D0 */ lw $v1, 0xd0($s2) +/* A18B98 80242978 3C0142F0 */ lui $at, 0x42f0 +/* A18B9C 8024297C 44810000 */ mtc1 $at, $f0 +/* A18BA0 80242980 8C63002C */ lw $v1, 0x2c($v1) +/* A18BA4 80242984 0040802D */ daddu $s0, $v0, $zero +/* A18BA8 80242988 E7A00028 */ swc1 $f0, 0x28($sp) +/* A18BAC 8024298C A7A0002C */ sh $zero, 0x2c($sp) +/* A18BB0 80242990 12200007 */ beqz $s1, .L802429B0 +/* A18BB4 80242994 AFA30024 */ sw $v1, 0x24($sp) +/* A18BB8 80242998 02A0202D */ daddu $a0, $s5, $zero +/* A18BBC 8024299C 0240282D */ daddu $a1, $s2, $zero +/* A18BC0 802429A0 0280302D */ daddu $a2, $s4, $zero +/* A18BC4 802429A4 0C090876 */ jal func_802421D8 +/* A18BC8 802429A8 0200382D */ daddu $a3, $s0, $zero +/* A18BCC 802429AC AE800070 */ sw $zero, 0x70($s4) +.L802429B0: +/* A18BD0 802429B0 2402FFFE */ addiu $v0, $zero, -2 +/* A18BD4 802429B4 A2A200AB */ sb $v0, 0xab($s5) +/* A18BD8 802429B8 8E4300B0 */ lw $v1, 0xb0($s2) +/* A18BDC 802429BC 30620004 */ andi $v0, $v1, 4 +/* A18BE0 802429C0 10400007 */ beqz $v0, .L802429E0 +/* A18BE4 802429C4 00000000 */ nop +/* A18BE8 802429C8 824200B4 */ lb $v0, 0xb4($s2) +/* A18BEC 802429CC 1440003A */ bnez $v0, .L80242AB8 +/* A18BF0 802429D0 0000102D */ daddu $v0, $zero, $zero +/* A18BF4 802429D4 2402FFFB */ addiu $v0, $zero, -5 +/* A18BF8 802429D8 00621024 */ and $v0, $v1, $v0 +/* A18BFC 802429DC AE4200B0 */ sw $v0, 0xb0($s2) +.L802429E0: +/* A18C00 802429E0 8E830070 */ lw $v1, 0x70($s4) +/* A18C04 802429E4 2C620015 */ sltiu $v0, $v1, 0x15 +/* A18C08 802429E8 10400032 */ beqz $v0, .L80242AB4 +/* A18C0C 802429EC 00031080 */ sll $v0, $v1, 2 +/* A18C10 802429F0 3C018024 */ lui $at, 0x8024 +/* A18C14 802429F4 00220821 */ addu $at, $at, $v0 +/* A18C18 802429F8 8C224E80 */ lw $v0, 0x4e80($at) +/* A18C1C 802429FC 00400008 */ jr $v0 +/* A18C20 80242A00 00000000 */ nop +/* A18C24 80242A04 0280202D */ daddu $a0, $s4, $zero +/* A18C28 80242A08 0200282D */ daddu $a1, $s0, $zero +/* A18C2C 80242A0C 0C0903FC */ jal func_80240FF0 +/* A18C30 80242A10 0260302D */ daddu $a2, $s3, $zero +/* A18C34 80242A14 0280202D */ daddu $a0, $s4, $zero +/* A18C38 80242A18 0200282D */ daddu $a1, $s0, $zero +/* A18C3C 80242A1C 0C090468 */ jal func_802411A0 +/* A18C40 80242A20 0260302D */ daddu $a2, $s3, $zero +/* A18C44 80242A24 08090AAE */ j .L80242AB8 +/* A18C48 80242A28 0000102D */ daddu $v0, $zero, $zero +/* A18C4C 80242A2C 0280202D */ daddu $a0, $s4, $zero +/* A18C50 80242A30 0200282D */ daddu $a1, $s0, $zero +/* A18C54 80242A34 0C0905F2 */ jal func_802417C8 +/* A18C58 80242A38 0260302D */ daddu $a2, $s3, $zero +/* A18C5C 80242A3C 0280202D */ daddu $a0, $s4, $zero +/* A18C60 80242A40 0200282D */ daddu $a1, $s0, $zero +/* A18C64 80242A44 0C090622 */ jal func_80241888 +/* A18C68 80242A48 0260302D */ daddu $a2, $s3, $zero +/* A18C6C 80242A4C 08090AAE */ j .L80242AB8 +/* A18C70 80242A50 0000102D */ daddu $v0, $zero, $zero +/* A18C74 80242A54 0280202D */ daddu $a0, $s4, $zero +/* A18C78 80242A58 0200282D */ daddu $a1, $s0, $zero +/* A18C7C 80242A5C 0C0906F3 */ jal func_80241BCC +/* A18C80 80242A60 0260302D */ daddu $a2, $s3, $zero +/* A18C84 80242A64 0280202D */ daddu $a0, $s4, $zero +/* A18C88 80242A68 0200282D */ daddu $a1, $s0, $zero +/* A18C8C 80242A6C 0C090711 */ jal func_80241C44 +/* A18C90 80242A70 0260302D */ daddu $a2, $s3, $zero +/* A18C94 80242A74 08090AAE */ j .L80242AB8 +/* A18C98 80242A78 0000102D */ daddu $v0, $zero, $zero +/* A18C9C 80242A7C 0280202D */ daddu $a0, $s4, $zero +/* A18CA0 80242A80 0200282D */ daddu $a1, $s0, $zero +/* A18CA4 80242A84 0C09093A */ jal func_802424E8 +/* A18CA8 80242A88 0260302D */ daddu $a2, $s3, $zero +/* A18CAC 80242A8C 0280202D */ daddu $a0, $s4, $zero +/* A18CB0 80242A90 0200282D */ daddu $a1, $s0, $zero +/* A18CB4 80242A94 0C090986 */ jal func_80242618 +/* A18CB8 80242A98 0260302D */ daddu $a2, $s3, $zero +/* A18CBC 80242A9C 08090AAE */ j .L80242AB8 +/* A18CC0 80242AA0 0000102D */ daddu $v0, $zero, $zero +/* A18CC4 80242AA4 0280202D */ daddu $a0, $s4, $zero +/* A18CC8 80242AA8 0200282D */ daddu $a1, $s0, $zero +/* A18CCC 80242AAC 0C090A26 */ jal func_80242898 +/* A18CD0 80242AB0 0260302D */ daddu $a2, $s3, $zero +.L80242AB4: +/* A18CD4 80242AB4 0000102D */ daddu $v0, $zero, $zero +.L80242AB8: +/* A18CD8 80242AB8 8FBF0048 */ lw $ra, 0x48($sp) +/* A18CDC 80242ABC 8FB50044 */ lw $s5, 0x44($sp) +/* A18CE0 80242AC0 8FB40040 */ lw $s4, 0x40($sp) +/* A18CE4 80242AC4 8FB3003C */ lw $s3, 0x3c($sp) +/* A18CE8 80242AC8 8FB20038 */ lw $s2, 0x38($sp) +/* A18CEC 80242ACC 8FB10034 */ lw $s1, 0x34($sp) +/* A18CF0 80242AD0 8FB00030 */ lw $s0, 0x30($sp) +/* A18CF4 80242AD4 03E00008 */ jr $ra +/* A18CF8 80242AD8 27BD0050 */ addiu $sp, $sp, 0x50 +/* A18CFC 80242ADC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_02/func_80240124_A16220.s b/asm/nonmatchings/world/area_hos/hos_02/func_80240124_A16220.s deleted file mode 100644 index 2185a014ac..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/func_80240124_A16220.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A16344 -/* A16344 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A16348 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A1634C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A16350 80240130 10A00005 */ beqz $a1, .L80240148 -/* A16354 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A16358 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A1635C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A16360 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A16364 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A16368 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A1636C 8024014C 1440000E */ bnez $v0, .L80240188 -/* A16370 80240150 00000000 */ nop -/* A16374 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A16378 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A1637C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A16380 80240160 04610004 */ bgez $v1, .L80240174 -/* A16384 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A16388 80240168 3C020002 */ lui $v0, 2 -/* A1638C 8024016C 08090061 */ j .L80240184 -/* A16390 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A16394 80240174 3C040002 */ lui $a0, 2 -/* A16398 80240178 0083102A */ slt $v0, $a0, $v1 -/* A1639C 8024017C 10400002 */ beqz $v0, .L80240188 -/* A163A0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A163A4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A163A8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A163AC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A163B0 80240190 00000000 */ nop -/* A163B4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A163B8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A163BC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A163C0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A163C4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A163C8 802401A8 3C020002 */ lui $v0, 2 -/* A163CC 802401AC 08090071 */ j .L802401C4 -/* A163D0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A163D4 802401B4 3C040002 */ lui $a0, 2 -/* A163D8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A163DC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A163E0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A163E4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A163E8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A163EC 802401CC 1440000E */ bnez $v0, .L80240208 -/* A163F0 802401D0 00000000 */ nop -/* A163F4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A163F8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A163FC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A16400 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A16404 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A16408 802401E8 3C020002 */ lui $v0, 2 -/* A1640C 802401EC 08090081 */ j .L80240204 -/* A16410 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A16414 802401F4 3C040002 */ lui $a0, 2 -/* A16418 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A1641C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A16420 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A16424 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A16428 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A1642C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A16430 80240210 00000000 */ nop -/* A16434 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A16438 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A1643C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A16440 80240220 04610004 */ bgez $v1, .L80240234 -/* A16444 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A16448 80240228 3C020002 */ lui $v0, 2 -/* A1644C 8024022C 08090091 */ j .L80240244 -/* A16450 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A16454 80240234 3C040002 */ lui $a0, 2 -/* A16458 80240238 0083102A */ slt $v0, $a0, $v1 -/* A1645C 8024023C 10400002 */ beqz $v0, .L80240248 -/* A16460 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A16464 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A16468 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A1646C 8024024C 0C046F07 */ jal set_main_pan_u -/* A16470 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A16474 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A16478 80240258 0C046F0D */ jal set_main_pan_v -/* A1647C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A16480 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A16484 80240264 0C046F13 */ jal set_aux_pan_u -/* A16488 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A1648C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A16490 80240270 0C046F19 */ jal set_aux_pan_v -/* A16494 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A16498 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A1649C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A164A0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A164A4 80240284 24420001 */ addiu $v0, $v0, 1 -/* A164A8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A164AC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A164B0 80240290 24630001 */ addiu $v1, $v1, 1 -/* A164B4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A164B8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A164BC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A164C0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A164C4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A164C8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A164CC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A164D0 802402B0 14600002 */ bnez $v1, .L802402BC -/* A164D4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A164D8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A164DC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A164E0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A164E4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A164E8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A164EC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A164F0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A164F4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A164F8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A164FC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A16500 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A16504 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A16508 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A1650C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A16510 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A16514 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A16518 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A1651C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A16520 80240300 0000102D */ daddu $v0, $zero, $zero -/* A16524 80240304 03E00008 */ jr $ra -/* A16528 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_02/func_8024030C_A16220.s b/asm/nonmatchings/world/area_hos/hos_02/func_8024030C_A16220.s deleted file mode 100644 index 3b6ba78ff4..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/func_8024030C_A16220.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_A1652C -/* A1652C 8024030C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A16530 80240310 AFB10014 */ sw $s1, 0x14($sp) -/* A16534 80240314 3C118024 */ lui $s1, 0x8024 -/* A16538 80240318 263133AC */ addiu $s1, $s1, 0x33ac -/* A1653C 8024031C AFBF0020 */ sw $ra, 0x20($sp) -/* A16540 80240320 AFB3001C */ sw $s3, 0x1c($sp) -/* A16544 80240324 AFB20018 */ sw $s2, 0x18($sp) -/* A16548 80240328 AFB00010 */ sw $s0, 0x10($sp) -/* A1654C 8024032C 96240000 */ lhu $a0, ($s1) -/* A16550 80240330 0C01917C */ jal sins -/* A16554 80240334 3C130001 */ lui $s3, 1 -/* A16558 80240338 00021400 */ sll $v0, $v0, 0x10 -/* A1655C 8024033C 00021403 */ sra $v0, $v0, 0x10 -/* A16560 80240340 3C013800 */ lui $at, 0x3800 -/* A16564 80240344 44811000 */ mtc1 $at, $f2 -/* A16568 80240348 44820000 */ mtc1 $v0, $f0 -/* A1656C 8024034C 00000000 */ nop -/* A16570 80240350 46800020 */ cvt.s.w $f0, $f0 -/* A16574 80240354 46020002 */ mul.s $f0, $f0, $f2 -/* A16578 80240358 00000000 */ nop -/* A1657C 8024035C 3C013FE0 */ lui $at, 0x3fe0 -/* A16580 80240360 44811800 */ mtc1 $at, $f3 -/* A16584 80240364 44801000 */ mtc1 $zero, $f2 -/* A16588 80240368 46000021 */ cvt.d.s $f0, $f0 -/* A1658C 8024036C 46220002 */ mul.d $f0, $f0, $f2 -/* A16590 80240370 00000000 */ nop -/* A16594 80240374 36731630 */ ori $s3, $s3, 0x1630 -/* A16598 80240378 46220002 */ mul.d $f0, $f0, $f2 -/* A1659C 8024037C 00000000 */ nop -/* A165A0 80240380 3C12800A */ lui $s2, 0x800a -/* A165A4 80240384 2652A674 */ addiu $s2, $s2, -0x598c -/* A165A8 80240388 3C108007 */ lui $s0, 0x8007 -/* A165AC 8024038C 261041F0 */ addiu $s0, $s0, 0x41f0 -/* A165B0 80240390 96040000 */ lhu $a0, ($s0) -/* A165B4 80240394 8E420000 */ lw $v0, ($s2) -/* A165B8 80240398 00042180 */ sll $a0, $a0, 6 -/* A165BC 8024039C 3C018024 */ lui $at, 0x8024 -/* A165C0 802403A0 D4224DE0 */ ldc1 $f2, 0x4de0($at) -/* A165C4 802403A4 00932021 */ addu $a0, $a0, $s3 -/* A165C8 802403A8 46220000 */ add.d $f0, $f0, $f2 -/* A165CC 802403AC 00442021 */ addu $a0, $v0, $a0 -/* A165D0 802403B0 96220000 */ lhu $v0, ($s1) -/* A165D4 802403B4 46200020 */ cvt.s.d $f0, $f0 -/* A165D8 802403B8 44050000 */ mfc1 $a1, $f0 -/* A165DC 802403BC 24420199 */ addiu $v0, $v0, 0x199 -/* A165E0 802403C0 A6220000 */ sh $v0, ($s1) -/* A165E4 802403C4 00A0302D */ daddu $a2, $a1, $zero -/* A165E8 802403C8 0C019DC0 */ jal guScale -/* A165EC 802403CC 00A0382D */ daddu $a3, $a1, $zero -/* A165F0 802403D0 3C05DA38 */ lui $a1, 0xda38 -/* A165F4 802403D4 3C04800A */ lui $a0, 0x800a -/* A165F8 802403D8 2484A66C */ addiu $a0, $a0, -0x5994 -/* A165FC 802403DC 34A50001 */ ori $a1, $a1, 1 -/* A16600 802403E0 8C830000 */ lw $v1, ($a0) -/* A16604 802403E4 96020000 */ lhu $v0, ($s0) -/* A16608 802403E8 0060302D */ daddu $a2, $v1, $zero -/* A1660C 802403EC 24630008 */ addiu $v1, $v1, 8 -/* A16610 802403F0 AC830000 */ sw $v1, ($a0) -/* A16614 802403F4 24430001 */ addiu $v1, $v0, 1 -/* A16618 802403F8 3042FFFF */ andi $v0, $v0, 0xffff -/* A1661C 802403FC 00021180 */ sll $v0, $v0, 6 -/* A16620 80240400 ACC50000 */ sw $a1, ($a2) -/* A16624 80240404 A6030000 */ sh $v1, ($s0) -/* A16628 80240408 8E430000 */ lw $v1, ($s2) -/* A1662C 8024040C 00531021 */ addu $v0, $v0, $s3 -/* A16630 80240410 00621821 */ addu $v1, $v1, $v0 -/* A16634 80240414 ACC30004 */ sw $v1, 4($a2) -/* A16638 80240418 8FBF0020 */ lw $ra, 0x20($sp) -/* A1663C 8024041C 8FB3001C */ lw $s3, 0x1c($sp) -/* A16640 80240420 8FB20018 */ lw $s2, 0x18($sp) -/* A16644 80240424 8FB10014 */ lw $s1, 0x14($sp) -/* A16648 80240428 8FB00010 */ lw $s0, 0x10($sp) -/* A1664C 8024042C 03E00008 */ jr $ra -/* A16650 80240430 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_02/func_80240434_A16220.s b/asm/nonmatchings/world/area_hos/hos_02/func_80240434_A16220.s deleted file mode 100644 index 55647e110d..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/func_80240434_A16220.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240434_A16654 -/* A16654 80240434 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A16658 80240438 0000202D */ daddu $a0, $zero, $zero -/* A1665C 8024043C 27A50010 */ addiu $a1, $sp, 0x10 -/* A16660 80240440 27A60014 */ addiu $a2, $sp, 0x14 -/* A16664 80240444 27A70018 */ addiu $a3, $sp, 0x18 -/* A16668 80240448 AFBF0038 */ sw $ra, 0x38($sp) -/* A1666C 8024044C AFB50034 */ sw $s5, 0x34($sp) -/* A16670 80240450 AFB40030 */ sw $s4, 0x30($sp) -/* A16674 80240454 AFB3002C */ sw $s3, 0x2c($sp) -/* A16678 80240458 AFB20028 */ sw $s2, 0x28($sp) -/* A1667C 8024045C AFB10024 */ sw $s1, 0x24($sp) -/* A16680 80240460 0C0470AC */ jal func_8011C2B0 -/* A16684 80240464 AFB00020 */ sw $s0, 0x20($sp) -/* A16688 80240468 8FA20018 */ lw $v0, 0x18($sp) -/* A1668C 8024046C 1840004F */ blez $v0, .L802405AC -/* A16690 80240470 0000802D */ daddu $s0, $zero, $zero -/* A16694 80240474 3C158024 */ lui $s5, 0x8024 -/* A16698 80240478 26B533AE */ addiu $s5, $s5, 0x33ae -/* A1669C 8024047C 3C135555 */ lui $s3, 0x5555 -/* A166A0 80240480 36735556 */ ori $s3, $s3, 0x5556 -/* A166A4 80240484 34148000 */ ori $s4, $zero, 0x8000 -/* A166A8 80240488 02130018 */ mult $s0, $s3 -.L8024048C: -/* A166AC 8024048C 001097C3 */ sra $s2, $s0, 0x1f -/* A166B0 80240490 00001810 */ mfhi $v1 -/* A166B4 80240494 00721823 */ subu $v1, $v1, $s2 -/* A166B8 80240498 00031040 */ sll $v0, $v1, 1 -/* A166BC 8024049C 00431021 */ addu $v0, $v0, $v1 -/* A166C0 802404A0 02021023 */ subu $v0, $s0, $v0 -/* A166C4 802404A4 96A30000 */ lhu $v1, ($s5) -/* A166C8 802404A8 24420001 */ addiu $v0, $v0, 1 -/* A166CC 802404AC 00620018 */ mult $v1, $v0 -/* A166D0 802404B0 00101100 */ sll $v0, $s0, 4 -/* A166D4 802404B4 00001812 */ mflo $v1 -/* A166D8 802404B8 00702021 */ addu $a0, $v1, $s0 -/* A166DC 802404BC 8FA30014 */ lw $v1, 0x14($sp) -/* A166E0 802404C0 3084FFFF */ andi $a0, $a0, 0xffff -/* A166E4 802404C4 0C01917C */ jal sins -/* A166E8 802404C8 00628821 */ addu $s1, $v1, $v0 -/* A166EC 802404CC 00021400 */ sll $v0, $v0, 0x10 -/* A166F0 802404D0 00021403 */ sra $v0, $v0, 0x10 -/* A166F4 802404D4 00541021 */ addu $v0, $v0, $s4 -/* A166F8 802404D8 00021FC2 */ srl $v1, $v0, 0x1f -/* A166FC 802404DC 00431021 */ addu $v0, $v0, $v1 -/* A16700 802404E0 000213C0 */ sll $v0, $v0, 0xf -/* A16704 802404E4 00021403 */ sra $v0, $v0, 0x10 -/* A16708 802404E8 00021880 */ sll $v1, $v0, 2 -/* A1670C 802404EC 00621821 */ addu $v1, $v1, $v0 -/* A16710 802404F0 00031140 */ sll $v0, $v1, 5 -/* A16714 802404F4 00431823 */ subu $v1, $v0, $v1 -/* A16718 802404F8 04610002 */ bgez $v1, .L80240504 -/* A1671C 802404FC 0060102D */ daddu $v0, $v1, $zero -/* A16720 80240500 24627FFF */ addiu $v0, $v1, 0x7fff -.L80240504: -/* A16724 80240504 000213C3 */ sra $v0, $v0, 0xf -/* A16728 80240508 24420064 */ addiu $v0, $v0, 0x64 -/* A1672C 8024050C A222000C */ sb $v0, 0xc($s1) -/* A16730 80240510 02121823 */ subu $v1, $s0, $s2 -/* A16734 80240514 00032843 */ sra $a1, $v1, 1 -/* A16738 80240518 00B30018 */ mult $a1, $s3 -/* A1673C 8024051C A222000D */ sb $v0, 0xd($s1) -/* A16740 80240520 96A40000 */ lhu $a0, ($s5) -/* A16744 80240524 00031FC3 */ sra $v1, $v1, 0x1f -/* A16748 80240528 000433C2 */ srl $a2, $a0, 0xf -/* A1674C 8024052C 00004810 */ mfhi $t1 -/* A16750 80240530 01231823 */ subu $v1, $t1, $v1 -/* A16754 80240534 00031040 */ sll $v0, $v1, 1 -/* A16758 80240538 00431021 */ addu $v0, $v0, $v1 -/* A1675C 8024053C 00A22823 */ subu $a1, $a1, $v0 -/* A16760 80240540 24A50001 */ addiu $a1, $a1, 1 -/* A16764 80240544 00052BC0 */ sll $a1, $a1, 0xf -/* A16768 80240548 00C50018 */ mult $a2, $a1 -/* A1676C 8024054C 00042382 */ srl $a0, $a0, 0xe -/* A16770 80240550 000423C0 */ sll $a0, $a0, 0xf -/* A16774 80240554 00001812 */ mflo $v1 -/* A16778 80240558 00642021 */ addu $a0, $v1, $a0 -/* A1677C 8024055C 00902021 */ addu $a0, $a0, $s0 -/* A16780 80240560 0C01917C */ jal sins -/* A16784 80240564 3084FFFF */ andi $a0, $a0, 0xffff -/* A16788 80240568 00021400 */ sll $v0, $v0, 0x10 -/* A1678C 8024056C 00021403 */ sra $v0, $v0, 0x10 -/* A16790 80240570 9223000C */ lbu $v1, 0xc($s1) -/* A16794 80240574 00541021 */ addu $v0, $v0, $s4 -/* A16798 80240578 00620018 */ mult $v1, $v0 -/* A1679C 8024057C 00001812 */ mflo $v1 -/* A167A0 80240580 04610004 */ bgez $v1, .L80240594 -/* A167A4 80240584 00031403 */ sra $v0, $v1, 0x10 -/* A167A8 80240588 3402FFFF */ ori $v0, $zero, 0xffff -/* A167AC 8024058C 00621821 */ addu $v1, $v1, $v0 -/* A167B0 80240590 00031403 */ sra $v0, $v1, 0x10 -.L80240594: -/* A167B4 80240594 A222000E */ sb $v0, 0xe($s1) -/* A167B8 80240598 8FA20018 */ lw $v0, 0x18($sp) -/* A167BC 8024059C 26100001 */ addiu $s0, $s0, 1 -/* A167C0 802405A0 0202102A */ slt $v0, $s0, $v0 -/* A167C4 802405A4 1440FFB9 */ bnez $v0, .L8024048C -/* A167C8 802405A8 02130018 */ mult $s0, $s3 -.L802405AC: -/* A167CC 802405AC 3C03800A */ lui $v1, 0x800a -/* A167D0 802405B0 2463A66C */ addiu $v1, $v1, -0x5994 -/* A167D4 802405B4 8C620000 */ lw $v0, ($v1) -/* A167D8 802405B8 0000202D */ daddu $a0, $zero, $zero -/* A167DC 802405BC 0040802D */ daddu $s0, $v0, $zero -/* A167E0 802405C0 24420008 */ addiu $v0, $v0, 8 -/* A167E4 802405C4 AC620000 */ sw $v0, ($v1) -/* A167E8 802405C8 3C02DE00 */ lui $v0, 0xde00 -/* A167EC 802405CC 0C0470BB */ jal func_8011C2EC -/* A167F0 802405D0 AE020000 */ sw $v0, ($s0) -/* A167F4 802405D4 3C048024 */ lui $a0, 0x8024 -/* A167F8 802405D8 248433AE */ addiu $a0, $a0, 0x33ae -/* A167FC 802405DC 94830000 */ lhu $v1, ($a0) -/* A16800 802405E0 AE020004 */ sw $v0, 4($s0) -/* A16804 802405E4 24630253 */ addiu $v1, $v1, 0x253 -/* A16808 802405E8 A4830000 */ sh $v1, ($a0) -/* A1680C 802405EC 8FBF0038 */ lw $ra, 0x38($sp) -/* A16810 802405F0 8FB50034 */ lw $s5, 0x34($sp) -/* A16814 802405F4 8FB40030 */ lw $s4, 0x30($sp) -/* A16818 802405F8 8FB3002C */ lw $s3, 0x2c($sp) -/* A1681C 802405FC 8FB20028 */ lw $s2, 0x28($sp) -/* A16820 80240600 8FB10024 */ lw $s1, 0x24($sp) -/* A16824 80240604 8FB00020 */ lw $s0, 0x20($sp) -/* A16828 80240608 03E00008 */ jr $ra -/* A1682C 8024060C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_hos/hos_02/func_80240904_A16220.s b/asm/nonmatchings/world/area_hos/hos_02/func_80240904_A16220.s deleted file mode 100644 index 77483fd476..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/func_80240904_A16220.s +++ /dev/null @@ -1,205 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240904_A16B24 -/* A16B24 80240904 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A16B28 80240908 24040002 */ addiu $a0, $zero, 2 -/* A16B2C 8024090C 27A50010 */ addiu $a1, $sp, 0x10 -/* A16B30 80240910 27A60014 */ addiu $a2, $sp, 0x14 -/* A16B34 80240914 AFBF0034 */ sw $ra, 0x34($sp) -/* A16B38 80240918 AFB40030 */ sw $s4, 0x30($sp) -/* A16B3C 8024091C AFB3002C */ sw $s3, 0x2c($sp) -/* A16B40 80240920 AFB20028 */ sw $s2, 0x28($sp) -/* A16B44 80240924 AFB10024 */ sw $s1, 0x24($sp) -/* A16B48 80240928 AFB00020 */ sw $s0, 0x20($sp) -/* A16B4C 8024092C F7B40038 */ sdc1 $f20, 0x38($sp) -/* A16B50 80240930 0C0470AC */ jal func_8011C2B0 -/* A16B54 80240934 27A70018 */ addiu $a3, $sp, 0x18 -/* A16B58 80240938 8FA20018 */ lw $v0, 0x18($sp) -/* A16B5C 8024093C 18400096 */ blez $v0, .L80240B98 -/* A16B60 80240940 0000802D */ daddu $s0, $zero, $zero -/* A16B64 80240944 3C125555 */ lui $s2, 0x5555 -/* A16B68 80240948 36525556 */ ori $s2, $s2, 0x5556 -/* A16B6C 8024094C 34148000 */ ori $s4, $zero, 0x8000 -/* A16B70 80240950 3C0141E0 */ lui $at, 0x41e0 -/* A16B74 80240954 4481A800 */ mtc1 $at, $f21 -/* A16B78 80240958 4480A000 */ mtc1 $zero, $f20 -/* A16B7C 8024095C 3C138000 */ lui $s3, 0x8000 -/* A16B80 80240960 02120018 */ mult $s0, $s2 -.L80240964: -/* A16B84 80240964 00101FC3 */ sra $v1, $s0, 0x1f -/* A16B88 80240968 00004810 */ mfhi $t1 -/* A16B8C 8024096C 01231823 */ subu $v1, $t1, $v1 -/* A16B90 80240970 00031040 */ sll $v0, $v1, 1 -/* A16B94 80240974 00431021 */ addu $v0, $v0, $v1 -/* A16B98 80240978 02021023 */ subu $v0, $s0, $v0 -/* A16B9C 8024097C 3C038024 */ lui $v1, 0x8024 -/* A16BA0 80240980 946333B2 */ lhu $v1, 0x33b2($v1) -/* A16BA4 80240984 24420001 */ addiu $v0, $v0, 1 -/* A16BA8 80240988 00620018 */ mult $v1, $v0 -/* A16BAC 8024098C 8FA20014 */ lw $v0, 0x14($sp) -/* A16BB0 80240990 00001812 */ mflo $v1 -/* A16BB4 80240994 00702021 */ addu $a0, $v1, $s0 -/* A16BB8 80240998 3084FFFF */ andi $a0, $a0, 0xffff -/* A16BBC 8024099C 00101900 */ sll $v1, $s0, 4 -/* A16BC0 802409A0 00431021 */ addu $v0, $v0, $v1 -/* A16BC4 802409A4 0C01917C */ jal sins -/* A16BC8 802409A8 2451000C */ addiu $s1, $v0, 0xc -/* A16BCC 802409AC 00021400 */ sll $v0, $v0, 0x10 -/* A16BD0 802409B0 00021403 */ sra $v0, $v0, 0x10 -/* A16BD4 802409B4 00541021 */ addu $v0, $v0, $s4 -/* A16BD8 802409B8 00021FC2 */ srl $v1, $v0, 0x1f -/* A16BDC 802409BC 00431021 */ addu $v0, $v0, $v1 -/* A16BE0 802409C0 00021043 */ sra $v0, $v0, 1 -/* A16BE4 802409C4 00021C00 */ sll $v1, $v0, 0x10 -/* A16BE8 802409C8 00031C03 */ sra $v1, $v1, 0x10 -/* A16BEC 802409CC 00032080 */ sll $a0, $v1, 2 -/* A16BF0 802409D0 00832021 */ addu $a0, $a0, $v1 -/* A16BF4 802409D4 00041940 */ sll $v1, $a0, 5 -/* A16BF8 802409D8 00641823 */ subu $v1, $v1, $a0 -/* A16BFC 802409DC 04610002 */ bgez $v1, .L802409E8 -/* A16C00 802409E0 0040202D */ daddu $a0, $v0, $zero -/* A16C04 802409E4 24637FFF */ addiu $v1, $v1, 0x7fff -.L802409E8: -/* A16C08 802409E8 000313C3 */ sra $v0, $v1, 0xf -/* A16C0C 802409EC 3C018024 */ lui $at, 0x8024 -/* A16C10 802409F0 D4224E00 */ ldc1 $f2, 0x4e00($at) -/* A16C14 802409F4 44820000 */ mtc1 $v0, $f0 -/* A16C18 802409F8 00000000 */ nop -/* A16C1C 802409FC 46800021 */ cvt.d.w $f0, $f0 -/* A16C20 80240A00 46220000 */ add.d $f0, $f0, $f2 -/* A16C24 80240A04 4620A03E */ c.le.d $f20, $f0 -/* A16C28 80240A08 00000000 */ nop -/* A16C2C 80240A0C 45030005 */ bc1tl .L80240A24 -/* A16C30 80240A10 46340001 */ sub.d $f0, $f0, $f20 -/* A16C34 80240A14 4620010D */ trunc.w.d $f4, $f0 -/* A16C38 80240A18 44022000 */ mfc1 $v0, $f4 -/* A16C3C 80240A1C 0809028E */ j .L80240A38 -/* A16C40 80240A20 A2220000 */ sb $v0, ($s1) -.L80240A24: -/* A16C44 80240A24 4620010D */ trunc.w.d $f4, $f0 -/* A16C48 80240A28 44022000 */ mfc1 $v0, $f4 -/* A16C4C 80240A2C 00000000 */ nop -/* A16C50 80240A30 00531025 */ or $v0, $v0, $s3 -/* A16C54 80240A34 A2220000 */ sb $v0, ($s1) -.L80240A38: -/* A16C58 80240A38 00041400 */ sll $v0, $a0, 0x10 -/* A16C5C 80240A3C 00021403 */ sra $v0, $v0, 0x10 -/* A16C60 80240A40 00021880 */ sll $v1, $v0, 2 -/* A16C64 80240A44 00621821 */ addu $v1, $v1, $v0 -/* A16C68 80240A48 00031140 */ sll $v0, $v1, 5 -/* A16C6C 80240A4C 00431023 */ subu $v0, $v0, $v1 -/* A16C70 80240A50 04410002 */ bgez $v0, .L80240A5C -/* A16C74 80240A54 26230001 */ addiu $v1, $s1, 1 -/* A16C78 80240A58 24427FFF */ addiu $v0, $v0, 0x7fff -.L80240A5C: -/* A16C7C 80240A5C 000213C3 */ sra $v0, $v0, 0xf -/* A16C80 80240A60 3C014059 */ lui $at, 0x4059 -/* A16C84 80240A64 44811800 */ mtc1 $at, $f3 -/* A16C88 80240A68 44801000 */ mtc1 $zero, $f2 -/* A16C8C 80240A6C 44820000 */ mtc1 $v0, $f0 -/* A16C90 80240A70 00000000 */ nop -/* A16C94 80240A74 46800021 */ cvt.d.w $f0, $f0 -/* A16C98 80240A78 46220000 */ add.d $f0, $f0, $f2 -/* A16C9C 80240A7C 4620A03E */ c.le.d $f20, $f0 -/* A16CA0 80240A80 00000000 */ nop -/* A16CA4 80240A84 45030005 */ bc1tl .L80240A9C -/* A16CA8 80240A88 46340001 */ sub.d $f0, $f0, $f20 -/* A16CAC 80240A8C 4620010D */ trunc.w.d $f4, $f0 -/* A16CB0 80240A90 44022000 */ mfc1 $v0, $f4 -/* A16CB4 80240A94 080902AC */ j .L80240AB0 -/* A16CB8 80240A98 A0620000 */ sb $v0, ($v1) -.L80240A9C: -/* A16CBC 80240A9C 4620010D */ trunc.w.d $f4, $f0 -/* A16CC0 80240AA0 44022000 */ mfc1 $v0, $f4 -/* A16CC4 80240AA4 00000000 */ nop -/* A16CC8 80240AA8 00531025 */ or $v0, $v0, $s3 -/* A16CCC 80240AAC A0620000 */ sb $v0, ($v1) -.L80240AB0: -/* A16CD0 80240AB0 00101FC2 */ srl $v1, $s0, 0x1f -/* A16CD4 80240AB4 02031821 */ addu $v1, $s0, $v1 -/* A16CD8 80240AB8 00032843 */ sra $a1, $v1, 1 -/* A16CDC 80240ABC 00B20018 */ mult $a1, $s2 -/* A16CE0 80240AC0 3C048024 */ lui $a0, 0x8024 -/* A16CE4 80240AC4 948433B2 */ lhu $a0, 0x33b2($a0) -/* A16CE8 80240AC8 00031FC3 */ sra $v1, $v1, 0x1f -/* A16CEC 80240ACC 000433C2 */ srl $a2, $a0, 0xf -/* A16CF0 80240AD0 00004810 */ mfhi $t1 -/* A16CF4 80240AD4 01231823 */ subu $v1, $t1, $v1 -/* A16CF8 80240AD8 00031040 */ sll $v0, $v1, 1 -/* A16CFC 80240ADC 00431021 */ addu $v0, $v0, $v1 -/* A16D00 80240AE0 00A22823 */ subu $a1, $a1, $v0 -/* A16D04 80240AE4 24A50001 */ addiu $a1, $a1, 1 -/* A16D08 80240AE8 00052BC0 */ sll $a1, $a1, 0xf -/* A16D0C 80240AEC 00C50018 */ mult $a2, $a1 -/* A16D10 80240AF0 00042382 */ srl $a0, $a0, 0xe -/* A16D14 80240AF4 000423C0 */ sll $a0, $a0, 0xf -/* A16D18 80240AF8 00001812 */ mflo $v1 -/* A16D1C 80240AFC 00642021 */ addu $a0, $v1, $a0 -/* A16D20 80240B00 00902021 */ addu $a0, $a0, $s0 -/* A16D24 80240B04 0C01917C */ jal sins -/* A16D28 80240B08 3084FFFF */ andi $a0, $a0, 0xffff -/* A16D2C 80240B0C 00021400 */ sll $v0, $v0, 0x10 -/* A16D30 80240B10 00021403 */ sra $v0, $v0, 0x10 -/* A16D34 80240B14 92230000 */ lbu $v1, ($s1) -/* A16D38 80240B18 00541021 */ addu $v0, $v0, $s4 -/* A16D3C 80240B1C 00620018 */ mult $v1, $v0 -/* A16D40 80240B20 00001812 */ mflo $v1 -/* A16D44 80240B24 04610003 */ bgez $v1, .L80240B34 -/* A16D48 80240B28 26240002 */ addiu $a0, $s1, 2 -/* A16D4C 80240B2C 3402FFFF */ ori $v0, $zero, 0xffff -/* A16D50 80240B30 00621821 */ addu $v1, $v1, $v0 -.L80240B34: -/* A16D54 80240B34 00031403 */ sra $v0, $v1, 0x10 -/* A16D58 80240B38 3C018024 */ lui $at, 0x8024 -/* A16D5C 80240B3C D4224E08 */ ldc1 $f2, 0x4e08($at) -/* A16D60 80240B40 44820000 */ mtc1 $v0, $f0 -/* A16D64 80240B44 00000000 */ nop -/* A16D68 80240B48 46800021 */ cvt.d.w $f0, $f0 -/* A16D6C 80240B4C 46220000 */ add.d $f0, $f0, $f2 -/* A16D70 80240B50 4620A03E */ c.le.d $f20, $f0 -/* A16D74 80240B54 00000000 */ nop -/* A16D78 80240B58 45030005 */ bc1tl .L80240B70 -/* A16D7C 80240B5C 46340001 */ sub.d $f0, $f0, $f20 -/* A16D80 80240B60 4620010D */ trunc.w.d $f4, $f0 -/* A16D84 80240B64 44022000 */ mfc1 $v0, $f4 -/* A16D88 80240B68 080902E1 */ j .L80240B84 -/* A16D8C 80240B6C A0820000 */ sb $v0, ($a0) -.L80240B70: -/* A16D90 80240B70 4620010D */ trunc.w.d $f4, $f0 -/* A16D94 80240B74 44022000 */ mfc1 $v0, $f4 -/* A16D98 80240B78 00000000 */ nop -/* A16D9C 80240B7C 00531025 */ or $v0, $v0, $s3 -/* A16DA0 80240B80 A0820000 */ sb $v0, ($a0) -.L80240B84: -/* A16DA4 80240B84 8FA20018 */ lw $v0, 0x18($sp) -/* A16DA8 80240B88 26100001 */ addiu $s0, $s0, 1 -/* A16DAC 80240B8C 0202102A */ slt $v0, $s0, $v0 -/* A16DB0 80240B90 1440FF74 */ bnez $v0, .L80240964 -/* A16DB4 80240B94 02120018 */ mult $s0, $s2 -.L80240B98: -/* A16DB8 80240B98 3C03800A */ lui $v1, 0x800a -/* A16DBC 80240B9C 2463A66C */ addiu $v1, $v1, -0x5994 -/* A16DC0 80240BA0 8C620000 */ lw $v0, ($v1) -/* A16DC4 80240BA4 24040002 */ addiu $a0, $zero, 2 -/* A16DC8 80240BA8 0040802D */ daddu $s0, $v0, $zero -/* A16DCC 80240BAC 24420008 */ addiu $v0, $v0, 8 -/* A16DD0 80240BB0 AC620000 */ sw $v0, ($v1) -/* A16DD4 80240BB4 3C02DE00 */ lui $v0, 0xde00 -/* A16DD8 80240BB8 0C0470BB */ jal func_8011C2EC -/* A16DDC 80240BBC AE020000 */ sw $v0, ($s0) -/* A16DE0 80240BC0 3C048024 */ lui $a0, 0x8024 -/* A16DE4 80240BC4 248433B2 */ addiu $a0, $a0, 0x33b2 -/* A16DE8 80240BC8 94830000 */ lhu $v1, ($a0) -/* A16DEC 80240BCC AE020004 */ sw $v0, 4($s0) -/* A16DF0 80240BD0 24630253 */ addiu $v1, $v1, 0x253 -/* A16DF4 80240BD4 A4830000 */ sh $v1, ($a0) -/* A16DF8 80240BD8 8FBF0034 */ lw $ra, 0x34($sp) -/* A16DFC 80240BDC 8FB40030 */ lw $s4, 0x30($sp) -/* A16E00 80240BE0 8FB3002C */ lw $s3, 0x2c($sp) -/* A16E04 80240BE4 8FB20028 */ lw $s2, 0x28($sp) -/* A16E08 80240BE8 8FB10024 */ lw $s1, 0x24($sp) -/* A16E0C 80240BEC 8FB00020 */ lw $s0, 0x20($sp) -/* A16E10 80240BF0 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A16E14 80240BF4 03E00008 */ jr $ra -/* A16E18 80240BF8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_hos/hos_02/func_80240EF4_A16220.s b/asm/nonmatchings/world/area_hos/hos_02/func_80240EF4_A16220.s deleted file mode 100644 index 8f25757d45..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/func_80240EF4_A16220.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EF4_A17114 -/* A17114 80240EF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A17118 80240EF8 AFBF0010 */ sw $ra, 0x10($sp) -/* A1711C 80240EFC 8C82000C */ lw $v0, 0xc($a0) -/* A17120 80240F00 0C0B1EAF */ jal get_variable -/* A17124 80240F04 8C450000 */ lw $a1, ($v0) -/* A17128 80240F08 0040182D */ daddu $v1, $v0, $zero -/* A1712C 80240F0C 8C62000C */ lw $v0, 0xc($v1) -/* A17130 80240F10 3C01433E */ lui $at, 0x433e -/* A17134 80240F14 44810000 */ mtc1 $at, $f0 -/* A17138 80240F18 00000000 */ nop -/* A1713C 80240F1C E4400078 */ swc1 $f0, 0x78($v0) -/* A17140 80240F20 8C62000C */ lw $v0, 0xc($v1) -/* A17144 80240F24 3C01435C */ lui $at, 0x435c -/* A17148 80240F28 44810000 */ mtc1 $at, $f0 -/* A1714C 80240F2C 00000000 */ nop -/* A17150 80240F30 E440007C */ swc1 $f0, 0x7c($v0) -/* A17154 80240F34 8C64000C */ lw $a0, 0xc($v1) -/* A17158 80240F38 3C013F33 */ lui $at, 0x3f33 -/* A1715C 80240F3C 34213333 */ ori $at, $at, 0x3333 -/* A17160 80240F40 44810000 */ mtc1 $at, $f0 -/* A17164 80240F44 00000000 */ nop -/* A17168 80240F48 E4800068 */ swc1 $f0, 0x68($a0) -/* A1716C 80240F4C 8C64000C */ lw $a0, 0xc($v1) -/* A17170 80240F50 240300FF */ addiu $v1, $zero, 0xff -/* A17174 80240F54 AC830038 */ sw $v1, 0x38($a0) -/* A17178 80240F58 8FBF0010 */ lw $ra, 0x10($sp) -/* A1717C 80240F5C 24020002 */ addiu $v0, $zero, 2 -/* A17180 80240F60 03E00008 */ jr $ra -/* A17184 80240F64 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_02/func_80240F68_A16220.s b/asm/nonmatchings/world/area_hos/hos_02/func_80240F68_A16220.s deleted file mode 100644 index d3ca24f749..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/func_80240F68_A16220.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F68_A17188 -/* A17188 80240F68 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1718C 80240F6C AFBF0010 */ sw $ra, 0x10($sp) -/* A17190 80240F70 8C82000C */ lw $v0, 0xc($a0) -/* A17194 80240F74 0C0B1EAF */ jal get_variable -/* A17198 80240F78 8C450000 */ lw $a1, ($v0) -/* A1719C 80240F7C 0040182D */ daddu $v1, $v0, $zero -/* A171A0 80240F80 8C62000C */ lw $v0, 0xc($v1) -/* A171A4 80240F84 3C01432A */ lui $at, 0x432a -/* A171A8 80240F88 44810000 */ mtc1 $at, $f0 -/* A171AC 80240F8C 00000000 */ nop -/* A171B0 80240F90 E4400078 */ swc1 $f0, 0x78($v0) -/* A171B4 80240F94 8C62000C */ lw $v0, 0xc($v1) -/* A171B8 80240F98 E440007C */ swc1 $f0, 0x7c($v0) -/* A171BC 80240F9C 8C64000C */ lw $a0, 0xc($v1) -/* A171C0 80240FA0 3C014000 */ lui $at, 0x4000 -/* A171C4 80240FA4 44810000 */ mtc1 $at, $f0 -/* A171C8 80240FA8 00000000 */ nop -/* A171CC 80240FAC E4800068 */ swc1 $f0, 0x68($a0) -/* A171D0 80240FB0 8C64000C */ lw $a0, 0xc($v1) -/* A171D4 80240FB4 240300FF */ addiu $v1, $zero, 0xff -/* A171D8 80240FB8 AC830038 */ sw $v1, 0x38($a0) -/* A171DC 80240FBC 8FBF0010 */ lw $ra, 0x10($sp) -/* A171E0 80240FC0 24020002 */ addiu $v0, $zero, 2 -/* A171E4 80240FC4 03E00008 */ jr $ra -/* A171E8 80240FC8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A171EC 80240FCC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_02/func_80240FD0_A16220.s b/asm/nonmatchings/world/area_hos/hos_02/func_80240FD0_A16220.s deleted file mode 100644 index 476038b74b..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/func_80240FD0_A16220.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD0_A171F0 -/* A171F0 80240FD0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* A171F4 80240FD4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* A171F8 80240FD8 8442008E */ lh $v0, 0x8e($v0) -/* A171FC 80240FDC AC820084 */ sw $v0, 0x84($a0) -/* A17200 80240FE0 03E00008 */ jr $ra -/* A17204 80240FE4 24020002 */ addiu $v0, $zero, 2 -/* A17208 80240FE8 00000000 */ nop -/* A1720C 80240FEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_80240A70_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/_A1BB70/func_80240A70_A1BB70.s similarity index 100% rename from asm/nonmatchings/world/area_hos/hos_03/func_80240A70_A1B100.s rename to asm/nonmatchings/world/area_hos/hos_03/_A1BB70/func_80240A70_A1BB70.s diff --git a/asm/nonmatchings/world/area_hos/hos_03/_A1BB70/func_80240AE0.s b/asm/nonmatchings/world/area_hos/hos_03/_A1BB70/func_80240AE0.s new file mode 100644 index 0000000000..d6279a7a12 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/_A1BB70/func_80240AE0.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AE0 +/* A1BBE0 80240AE0 27BDFF78 */ addiu $sp, $sp, -0x88 +/* A1BBE4 80240AE4 AFB10054 */ sw $s1, 0x54($sp) +/* A1BBE8 80240AE8 0080882D */ daddu $s1, $a0, $zero +/* A1BBEC 80240AEC AFBF005C */ sw $ra, 0x5c($sp) +/* A1BBF0 80240AF0 AFB20058 */ sw $s2, 0x58($sp) +/* A1BBF4 80240AF4 AFB00050 */ sw $s0, 0x50($sp) +/* A1BBF8 80240AF8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* A1BBFC 80240AFC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* A1BC00 80240B00 F7B80070 */ sdc1 $f24, 0x70($sp) +/* A1BC04 80240B04 F7B60068 */ sdc1 $f22, 0x68($sp) +/* A1BC08 80240B08 F7B40060 */ sdc1 $f20, 0x60($sp) +/* A1BC0C 80240B0C 8E30000C */ lw $s0, 0xc($s1) +/* A1BC10 80240B10 8E050000 */ lw $a1, ($s0) +/* A1BC14 80240B14 0C0B1EAF */ jal get_variable +/* A1BC18 80240B18 26100004 */ addiu $s0, $s0, 4 +/* A1BC1C 80240B1C 0C046C04 */ jal get_model_list_index_from_tree_index +/* A1BC20 80240B20 0040202D */ daddu $a0, $v0, $zero +/* A1BC24 80240B24 8E050000 */ lw $a1, ($s0) +/* A1BC28 80240B28 26100004 */ addiu $s0, $s0, 4 +/* A1BC2C 80240B2C 0220202D */ daddu $a0, $s1, $zero +/* A1BC30 80240B30 0C0B210B */ jal get_float_variable +/* A1BC34 80240B34 0040902D */ daddu $s2, $v0, $zero +/* A1BC38 80240B38 8E050000 */ lw $a1, ($s0) +/* A1BC3C 80240B3C 26100004 */ addiu $s0, $s0, 4 +/* A1BC40 80240B40 0220202D */ daddu $a0, $s1, $zero +/* A1BC44 80240B44 0C0B210B */ jal get_float_variable +/* A1BC48 80240B48 46000706 */ mov.s $f28, $f0 +/* A1BC4C 80240B4C 8E050000 */ lw $a1, ($s0) +/* A1BC50 80240B50 26100004 */ addiu $s0, $s0, 4 +/* A1BC54 80240B54 0220202D */ daddu $a0, $s1, $zero +/* A1BC58 80240B58 0C0B210B */ jal get_float_variable +/* A1BC5C 80240B5C 46000686 */ mov.s $f26, $f0 +/* A1BC60 80240B60 0220202D */ daddu $a0, $s1, $zero +/* A1BC64 80240B64 8E050000 */ lw $a1, ($s0) +/* A1BC68 80240B68 0C0B210B */ jal get_float_variable +/* A1BC6C 80240B6C 46000586 */ mov.s $f22, $f0 +/* A1BC70 80240B70 0240202D */ daddu $a0, $s2, $zero +/* A1BC74 80240B74 0C046B4C */ jal get_model_from_list_index +/* A1BC78 80240B78 46000606 */ mov.s $f24, $f0 +/* A1BC7C 80240B7C 0040882D */ daddu $s1, $v0, $zero +/* A1BC80 80240B80 96220000 */ lhu $v0, ($s1) +/* A1BC84 80240B84 30420400 */ andi $v0, $v0, 0x400 +/* A1BC88 80240B88 1440001E */ bnez $v0, .L80240C04 +/* A1BC8C 80240B8C 26300058 */ addiu $s0, $s1, 0x58 +/* A1BC90 80240B90 4480A000 */ mtc1 $zero, $f20 +/* A1BC94 80240B94 4406B000 */ mfc1 $a2, $f22 +/* A1BC98 80240B98 4405A000 */ mfc1 $a1, $f20 +/* A1BC9C 80240B9C 4407A000 */ mfc1 $a3, $f20 +/* A1BCA0 80240BA0 0C019E40 */ jal guTranslateF +/* A1BCA4 80240BA4 0200202D */ daddu $a0, $s0, $zero +/* A1BCA8 80240BA8 4405E000 */ mfc1 $a1, $f28 +/* A1BCAC 80240BAC 4406D000 */ mfc1 $a2, $f26 +/* A1BCB0 80240BB0 4407C000 */ mfc1 $a3, $f24 +/* A1BCB4 80240BB4 0C09029C */ jal func_80240A70 +/* A1BCB8 80240BB8 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BCBC 80240BBC 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BCC0 80240BC0 0200282D */ daddu $a1, $s0, $zero +/* A1BCC4 80240BC4 0C019D80 */ jal guMtxCatF +/* A1BCC8 80240BC8 0200302D */ daddu $a2, $s0, $zero +/* A1BCCC 80240BCC 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BCD0 80240BD0 4600B587 */ neg.s $f22, $f22 +/* A1BCD4 80240BD4 4405A000 */ mfc1 $a1, $f20 +/* A1BCD8 80240BD8 4406B000 */ mfc1 $a2, $f22 +/* A1BCDC 80240BDC 0C019E40 */ jal guTranslateF +/* A1BCE0 80240BE0 00A0382D */ daddu $a3, $a1, $zero +/* A1BCE4 80240BE4 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BCE8 80240BE8 0200282D */ daddu $a1, $s0, $zero +/* A1BCEC 80240BEC 0C019D80 */ jal guMtxCatF +/* A1BCF0 80240BF0 00A0302D */ daddu $a2, $a1, $zero +/* A1BCF4 80240BF4 96220000 */ lhu $v0, ($s1) +/* A1BCF8 80240BF8 34421400 */ ori $v0, $v0, 0x1400 +/* A1BCFC 80240BFC 0809031F */ j .L80240C7C +/* A1BD00 80240C00 A6220000 */ sh $v0, ($s1) +.L80240C04: +/* A1BD04 80240C04 4480A000 */ mtc1 $zero, $f20 +/* A1BD08 80240C08 4406B000 */ mfc1 $a2, $f22 +/* A1BD0C 80240C0C 4405A000 */ mfc1 $a1, $f20 +/* A1BD10 80240C10 4407A000 */ mfc1 $a3, $f20 +/* A1BD14 80240C14 0C019E40 */ jal guTranslateF +/* A1BD18 80240C18 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BD1C 80240C1C 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BD20 80240C20 26300058 */ addiu $s0, $s1, 0x58 +/* A1BD24 80240C24 0200282D */ daddu $a1, $s0, $zero +/* A1BD28 80240C28 0C019D80 */ jal guMtxCatF +/* A1BD2C 80240C2C 0200302D */ daddu $a2, $s0, $zero +/* A1BD30 80240C30 4405E000 */ mfc1 $a1, $f28 +/* A1BD34 80240C34 4406D000 */ mfc1 $a2, $f26 +/* A1BD38 80240C38 4407C000 */ mfc1 $a3, $f24 +/* A1BD3C 80240C3C 0C09029C */ jal func_80240A70 +/* A1BD40 80240C40 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BD44 80240C44 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BD48 80240C48 0200282D */ daddu $a1, $s0, $zero +/* A1BD4C 80240C4C 0C019D80 */ jal guMtxCatF +/* A1BD50 80240C50 0200302D */ daddu $a2, $s0, $zero +/* A1BD54 80240C54 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BD58 80240C58 4600B587 */ neg.s $f22, $f22 +/* A1BD5C 80240C5C 4405A000 */ mfc1 $a1, $f20 +/* A1BD60 80240C60 4406B000 */ mfc1 $a2, $f22 +/* A1BD64 80240C64 0C019E40 */ jal guTranslateF +/* A1BD68 80240C68 00A0382D */ daddu $a3, $a1, $zero +/* A1BD6C 80240C6C 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BD70 80240C70 0200282D */ daddu $a1, $s0, $zero +/* A1BD74 80240C74 0C019D80 */ jal guMtxCatF +/* A1BD78 80240C78 00A0302D */ daddu $a2, $a1, $zero +.L80240C7C: +/* A1BD7C 80240C7C 8FBF005C */ lw $ra, 0x5c($sp) +/* A1BD80 80240C80 8FB20058 */ lw $s2, 0x58($sp) +/* A1BD84 80240C84 8FB10054 */ lw $s1, 0x54($sp) +/* A1BD88 80240C88 8FB00050 */ lw $s0, 0x50($sp) +/* A1BD8C 80240C8C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* A1BD90 80240C90 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* A1BD94 80240C94 D7B80070 */ ldc1 $f24, 0x70($sp) +/* A1BD98 80240C98 D7B60068 */ ldc1 $f22, 0x68($sp) +/* A1BD9C 80240C9C D7B40060 */ ldc1 $f20, 0x60($sp) +/* A1BDA0 80240CA0 24020002 */ addiu $v0, $zero, 2 +/* A1BDA4 80240CA4 03E00008 */ jr $ra +/* A1BDA8 80240CA8 27BD0088 */ addiu $sp, $sp, 0x88 +/* A1BDAC 80240CAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_80240030_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_80240030_A1B100.s deleted file mode 100644 index 214a04d63d..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_80240030_A1B100.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240030_A1B130 -/* A1B130 80240030 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1B134 80240034 AFB00010 */ sw $s0, 0x10($sp) -/* A1B138 80240038 0080802D */ daddu $s0, $a0, $zero -/* A1B13C 8024003C AFBF0014 */ sw $ra, 0x14($sp) -/* A1B140 80240040 8E0300A8 */ lw $v1, 0xa8($s0) -/* A1B144 80240044 8E020088 */ lw $v0, 0x88($s0) -/* A1B148 80240048 00621821 */ addu $v1, $v1, $v0 -/* A1B14C 8024004C 04610004 */ bgez $v1, .L80240060 -/* A1B150 80240050 AE0300A8 */ sw $v1, 0xa8($s0) -/* A1B154 80240054 3C020002 */ lui $v0, 2 -/* A1B158 80240058 0809001C */ j .L80240070 -/* A1B15C 8024005C 00621021 */ addu $v0, $v1, $v0 -.L80240060: -/* A1B160 80240060 3C040002 */ lui $a0, 2 -/* A1B164 80240064 0083102A */ slt $v0, $a0, $v1 -/* A1B168 80240068 10400002 */ beqz $v0, .L80240074 -/* A1B16C 8024006C 00641023 */ subu $v0, $v1, $a0 -.L80240070: -/* A1B170 80240070 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240074: -/* A1B174 80240074 8E0300AC */ lw $v1, 0xac($s0) -/* A1B178 80240078 8E02008C */ lw $v0, 0x8c($s0) -/* A1B17C 8024007C 00621821 */ addu $v1, $v1, $v0 -/* A1B180 80240080 04610004 */ bgez $v1, .L80240094 -/* A1B184 80240084 AE0300AC */ sw $v1, 0xac($s0) -/* A1B188 80240088 3C020002 */ lui $v0, 2 -/* A1B18C 8024008C 08090029 */ j .L802400A4 -/* A1B190 80240090 00621021 */ addu $v0, $v1, $v0 -.L80240094: -/* A1B194 80240094 3C040002 */ lui $a0, 2 -/* A1B198 80240098 0083102A */ slt $v0, $a0, $v1 -/* A1B19C 8024009C 10400002 */ beqz $v0, .L802400A8 -/* A1B1A0 802400A0 00641023 */ subu $v0, $v1, $a0 -.L802400A4: -/* A1B1A4 802400A4 AE0200AC */ sw $v0, 0xac($s0) -.L802400A8: -/* A1B1A8 802400A8 8E0300B0 */ lw $v1, 0xb0($s0) -/* A1B1AC 802400AC 8E020090 */ lw $v0, 0x90($s0) -/* A1B1B0 802400B0 00621821 */ addu $v1, $v1, $v0 -/* A1B1B4 802400B4 04610004 */ bgez $v1, .L802400C8 -/* A1B1B8 802400B8 AE0300B0 */ sw $v1, 0xb0($s0) -/* A1B1BC 802400BC 3C020002 */ lui $v0, 2 -/* A1B1C0 802400C0 08090036 */ j .L802400D8 -/* A1B1C4 802400C4 00621021 */ addu $v0, $v1, $v0 -.L802400C8: -/* A1B1C8 802400C8 3C040002 */ lui $a0, 2 -/* A1B1CC 802400CC 0083102A */ slt $v0, $a0, $v1 -/* A1B1D0 802400D0 10400002 */ beqz $v0, .L802400DC -/* A1B1D4 802400D4 00641023 */ subu $v0, $v1, $a0 -.L802400D8: -/* A1B1D8 802400D8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400DC: -/* A1B1DC 802400DC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A1B1E0 802400E0 8E020094 */ lw $v0, 0x94($s0) -/* A1B1E4 802400E4 00621821 */ addu $v1, $v1, $v0 -/* A1B1E8 802400E8 04610004 */ bgez $v1, .L802400FC -/* A1B1EC 802400EC AE0300B4 */ sw $v1, 0xb4($s0) -/* A1B1F0 802400F0 3C020002 */ lui $v0, 2 -/* A1B1F4 802400F4 08090043 */ j .L8024010C -/* A1B1F8 802400F8 00621021 */ addu $v0, $v1, $v0 -.L802400FC: -/* A1B1FC 802400FC 3C040002 */ lui $a0, 2 -/* A1B200 80240100 0083102A */ slt $v0, $a0, $v1 -/* A1B204 80240104 10400002 */ beqz $v0, .L80240110 -/* A1B208 80240108 00641023 */ subu $v0, $v1, $a0 -.L8024010C: -/* A1B20C 8024010C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240110: -/* A1B210 80240110 8E040084 */ lw $a0, 0x84($s0) -/* A1B214 80240114 0C046F07 */ jal set_main_pan_u -/* A1B218 80240118 8E0500A8 */ lw $a1, 0xa8($s0) -/* A1B21C 8024011C 8E040084 */ lw $a0, 0x84($s0) -/* A1B220 80240120 0C046F0D */ jal set_main_pan_v -/* A1B224 80240124 8E0500AC */ lw $a1, 0xac($s0) -/* A1B228 80240128 8E040084 */ lw $a0, 0x84($s0) -/* A1B22C 8024012C 0C046F13 */ jal set_aux_pan_u -/* A1B230 80240130 8E0500B0 */ lw $a1, 0xb0($s0) -/* A1B234 80240134 8E040084 */ lw $a0, 0x84($s0) -/* A1B238 80240138 0C046F19 */ jal set_aux_pan_v -/* A1B23C 8024013C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A1B240 80240140 8FBF0014 */ lw $ra, 0x14($sp) -/* A1B244 80240144 8FB00010 */ lw $s0, 0x10($sp) -/* A1B248 80240148 0000102D */ daddu $v0, $zero, $zero -/* A1B24C 8024014C 03E00008 */ jr $ra -/* A1B250 80240150 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_80240154_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_80240154_A1B100.s deleted file mode 100644 index b3c99e1910..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_80240154_A1B100.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240154_A1B254 -/* A1B254 80240154 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1B258 80240158 AFB00010 */ sw $s0, 0x10($sp) -/* A1B25C 8024015C 0080802D */ daddu $s0, $a0, $zero -/* A1B260 80240160 10A00005 */ beqz $a1, .L80240178 -/* A1B264 80240164 AFBF0014 */ sw $ra, 0x14($sp) -/* A1B268 80240168 AE000070 */ sw $zero, 0x70($s0) -/* A1B26C 8024016C AE000074 */ sw $zero, 0x74($s0) -/* A1B270 80240170 AE000078 */ sw $zero, 0x78($s0) -/* A1B274 80240174 AE00007C */ sw $zero, 0x7c($s0) -.L80240178: -/* A1B278 80240178 8E020070 */ lw $v0, 0x70($s0) -/* A1B27C 8024017C 1440000E */ bnez $v0, .L802401B8 -/* A1B280 80240180 00000000 */ nop -/* A1B284 80240184 8E0300A8 */ lw $v1, 0xa8($s0) -/* A1B288 80240188 8E020088 */ lw $v0, 0x88($s0) -/* A1B28C 8024018C 00621821 */ addu $v1, $v1, $v0 -/* A1B290 80240190 04610004 */ bgez $v1, .L802401A4 -/* A1B294 80240194 AE0300A8 */ sw $v1, 0xa8($s0) -/* A1B298 80240198 3C020002 */ lui $v0, 2 -/* A1B29C 8024019C 0809006D */ j .L802401B4 -/* A1B2A0 802401A0 00621021 */ addu $v0, $v1, $v0 -.L802401A4: -/* A1B2A4 802401A4 3C040002 */ lui $a0, 2 -/* A1B2A8 802401A8 0083102A */ slt $v0, $a0, $v1 -/* A1B2AC 802401AC 10400002 */ beqz $v0, .L802401B8 -/* A1B2B0 802401B0 00641023 */ subu $v0, $v1, $a0 -.L802401B4: -/* A1B2B4 802401B4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401B8: -/* A1B2B8 802401B8 8E020074 */ lw $v0, 0x74($s0) -/* A1B2BC 802401BC 1440000E */ bnez $v0, .L802401F8 -/* A1B2C0 802401C0 00000000 */ nop -/* A1B2C4 802401C4 8E0300AC */ lw $v1, 0xac($s0) -/* A1B2C8 802401C8 8E02008C */ lw $v0, 0x8c($s0) -/* A1B2CC 802401CC 00621821 */ addu $v1, $v1, $v0 -/* A1B2D0 802401D0 04610004 */ bgez $v1, .L802401E4 -/* A1B2D4 802401D4 AE0300AC */ sw $v1, 0xac($s0) -/* A1B2D8 802401D8 3C020002 */ lui $v0, 2 -/* A1B2DC 802401DC 0809007D */ j .L802401F4 -/* A1B2E0 802401E0 00621021 */ addu $v0, $v1, $v0 -.L802401E4: -/* A1B2E4 802401E4 3C040002 */ lui $a0, 2 -/* A1B2E8 802401E8 0083102A */ slt $v0, $a0, $v1 -/* A1B2EC 802401EC 10400002 */ beqz $v0, .L802401F8 -/* A1B2F0 802401F0 00641023 */ subu $v0, $v1, $a0 -.L802401F4: -/* A1B2F4 802401F4 AE0200AC */ sw $v0, 0xac($s0) -.L802401F8: -/* A1B2F8 802401F8 8E020078 */ lw $v0, 0x78($s0) -/* A1B2FC 802401FC 1440000E */ bnez $v0, .L80240238 -/* A1B300 80240200 00000000 */ nop -/* A1B304 80240204 8E0300B0 */ lw $v1, 0xb0($s0) -/* A1B308 80240208 8E020090 */ lw $v0, 0x90($s0) -/* A1B30C 8024020C 00621821 */ addu $v1, $v1, $v0 -/* A1B310 80240210 04610004 */ bgez $v1, .L80240224 -/* A1B314 80240214 AE0300B0 */ sw $v1, 0xb0($s0) -/* A1B318 80240218 3C020002 */ lui $v0, 2 -/* A1B31C 8024021C 0809008D */ j .L80240234 -/* A1B320 80240220 00621021 */ addu $v0, $v1, $v0 -.L80240224: -/* A1B324 80240224 3C040002 */ lui $a0, 2 -/* A1B328 80240228 0083102A */ slt $v0, $a0, $v1 -/* A1B32C 8024022C 10400002 */ beqz $v0, .L80240238 -/* A1B330 80240230 00641023 */ subu $v0, $v1, $a0 -.L80240234: -/* A1B334 80240234 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240238: -/* A1B338 80240238 8E02007C */ lw $v0, 0x7c($s0) -/* A1B33C 8024023C 1440000E */ bnez $v0, .L80240278 -/* A1B340 80240240 00000000 */ nop -/* A1B344 80240244 8E0300B4 */ lw $v1, 0xb4($s0) -/* A1B348 80240248 8E020094 */ lw $v0, 0x94($s0) -/* A1B34C 8024024C 00621821 */ addu $v1, $v1, $v0 -/* A1B350 80240250 04610004 */ bgez $v1, .L80240264 -/* A1B354 80240254 AE0300B4 */ sw $v1, 0xb4($s0) -/* A1B358 80240258 3C020002 */ lui $v0, 2 -/* A1B35C 8024025C 0809009D */ j .L80240274 -/* A1B360 80240260 00621021 */ addu $v0, $v1, $v0 -.L80240264: -/* A1B364 80240264 3C040002 */ lui $a0, 2 -/* A1B368 80240268 0083102A */ slt $v0, $a0, $v1 -/* A1B36C 8024026C 10400002 */ beqz $v0, .L80240278 -/* A1B370 80240270 00641023 */ subu $v0, $v1, $a0 -.L80240274: -/* A1B374 80240274 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240278: -/* A1B378 80240278 8E040084 */ lw $a0, 0x84($s0) -/* A1B37C 8024027C 0C046F07 */ jal set_main_pan_u -/* A1B380 80240280 8E0500A8 */ lw $a1, 0xa8($s0) -/* A1B384 80240284 8E040084 */ lw $a0, 0x84($s0) -/* A1B388 80240288 0C046F0D */ jal set_main_pan_v -/* A1B38C 8024028C 8E0500AC */ lw $a1, 0xac($s0) -/* A1B390 80240290 8E040084 */ lw $a0, 0x84($s0) -/* A1B394 80240294 0C046F13 */ jal set_aux_pan_u -/* A1B398 80240298 8E0500B0 */ lw $a1, 0xb0($s0) -/* A1B39C 8024029C 8E040084 */ lw $a0, 0x84($s0) -/* A1B3A0 802402A0 0C046F19 */ jal set_aux_pan_v -/* A1B3A4 802402A4 8E0500B4 */ lw $a1, 0xb4($s0) -/* A1B3A8 802402A8 8E020070 */ lw $v0, 0x70($s0) -/* A1B3AC 802402AC 8E030078 */ lw $v1, 0x78($s0) -/* A1B3B0 802402B0 8E040098 */ lw $a0, 0x98($s0) -/* A1B3B4 802402B4 24420001 */ addiu $v0, $v0, 1 -/* A1B3B8 802402B8 AE020070 */ sw $v0, 0x70($s0) -/* A1B3BC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A1B3C0 802402C0 24630001 */ addiu $v1, $v1, 1 -/* A1B3C4 802402C4 AE030078 */ sw $v1, 0x78($s0) -/* A1B3C8 802402C8 8E030070 */ lw $v1, 0x70($s0) -/* A1B3CC 802402CC 24420001 */ addiu $v0, $v0, 1 -/* A1B3D0 802402D0 AE020074 */ sw $v0, 0x74($s0) -/* A1B3D4 802402D4 8E02007C */ lw $v0, 0x7c($s0) -/* A1B3D8 802402D8 0064182A */ slt $v1, $v1, $a0 -/* A1B3DC 802402DC 24420001 */ addiu $v0, $v0, 1 -/* A1B3E0 802402E0 14600002 */ bnez $v1, .L802402EC -/* A1B3E4 802402E4 AE02007C */ sw $v0, 0x7c($s0) -/* A1B3E8 802402E8 AE000070 */ sw $zero, 0x70($s0) -.L802402EC: -/* A1B3EC 802402EC 8E020074 */ lw $v0, 0x74($s0) -/* A1B3F0 802402F0 8E03009C */ lw $v1, 0x9c($s0) -/* A1B3F4 802402F4 0043102A */ slt $v0, $v0, $v1 -/* A1B3F8 802402F8 50400001 */ beql $v0, $zero, .L80240300 -/* A1B3FC 802402FC AE000074 */ sw $zero, 0x74($s0) -.L80240300: -/* A1B400 80240300 8E020078 */ lw $v0, 0x78($s0) -/* A1B404 80240304 8E0300A0 */ lw $v1, 0xa0($s0) -/* A1B408 80240308 0043102A */ slt $v0, $v0, $v1 -/* A1B40C 8024030C 50400001 */ beql $v0, $zero, .L80240314 -/* A1B410 80240310 AE000078 */ sw $zero, 0x78($s0) -.L80240314: -/* A1B414 80240314 8E02007C */ lw $v0, 0x7c($s0) -/* A1B418 80240318 8E0300A4 */ lw $v1, 0xa4($s0) -/* A1B41C 8024031C 0043102A */ slt $v0, $v0, $v1 -/* A1B420 80240320 50400001 */ beql $v0, $zero, .L80240328 -/* A1B424 80240324 AE00007C */ sw $zero, 0x7c($s0) -.L80240328: -/* A1B428 80240328 8FBF0014 */ lw $ra, 0x14($sp) -/* A1B42C 8024032C 8FB00010 */ lw $s0, 0x10($sp) -/* A1B430 80240330 0000102D */ daddu $v0, $zero, $zero -/* A1B434 80240334 03E00008 */ jr $ra -/* A1B438 80240338 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_8024033C_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_8024033C_A1B100.s deleted file mode 100644 index bcef5e3357..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_8024033C_A1B100.s +++ /dev/null @@ -1,188 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024033C_A1B43C -/* A1B43C 8024033C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A1B440 80240340 AFB30034 */ sw $s3, 0x34($sp) -/* A1B444 80240344 3C130001 */ lui $s3, 1 -/* A1B448 80240348 AFB00028 */ sw $s0, 0x28($sp) -/* A1B44C 8024034C 3C108024 */ lui $s0, 0x8024 -/* A1B450 80240350 26103BCC */ addiu $s0, $s0, 0x3bcc -/* A1B454 80240354 AFBF0040 */ sw $ra, 0x40($sp) -/* A1B458 80240358 AFB5003C */ sw $s5, 0x3c($sp) -/* A1B45C 8024035C AFB40038 */ sw $s4, 0x38($sp) -/* A1B460 80240360 AFB20030 */ sw $s2, 0x30($sp) -/* A1B464 80240364 AFB1002C */ sw $s1, 0x2c($sp) -/* A1B468 80240368 96040000 */ lhu $a0, ($s0) -/* A1B46C 8024036C 0C01917C */ jal sins -/* A1B470 80240370 36731630 */ ori $s3, $s3, 0x1630 -/* A1B474 80240374 00021400 */ sll $v0, $v0, 0x10 -/* A1B478 80240378 00021403 */ sra $v0, $v0, 0x10 -/* A1B47C 8024037C 44821000 */ mtc1 $v0, $f2 -/* A1B480 80240380 00000000 */ nop -/* A1B484 80240384 468010A0 */ cvt.s.w $f2, $f2 -/* A1B488 80240388 3C12800A */ lui $s2, 0x800a -/* A1B48C 8024038C 2652A674 */ addiu $s2, $s2, -0x598c -/* A1B490 80240390 3C118007 */ lui $s1, 0x8007 -/* A1B494 80240394 263141F0 */ addiu $s1, $s1, 0x41f0 -/* A1B498 80240398 3C073F80 */ lui $a3, 0x3f80 -/* A1B49C 8024039C 3C013800 */ lui $at, 0x3800 -/* A1B4A0 802403A0 44810000 */ mtc1 $at, $f0 -/* A1B4A4 802403A4 96240000 */ lhu $a0, ($s1) -/* A1B4A8 802403A8 46001082 */ mul.s $f2, $f2, $f0 -/* A1B4AC 802403AC 00000000 */ nop -/* A1B4B0 802403B0 8E420000 */ lw $v0, ($s2) -/* A1B4B4 802403B4 00042180 */ sll $a0, $a0, 6 -/* A1B4B8 802403B8 3C014234 */ lui $at, 0x4234 -/* A1B4BC 802403BC 44810000 */ mtc1 $at, $f0 -/* A1B4C0 802403C0 00932021 */ addu $a0, $a0, $s3 -/* A1B4C4 802403C4 46001082 */ mul.s $f2, $f2, $f0 -/* A1B4C8 802403C8 00000000 */ nop -/* A1B4CC 802403CC 00442021 */ addu $a0, $v0, $a0 -/* A1B4D0 802403D0 44800000 */ mtc1 $zero, $f0 -/* A1B4D4 802403D4 96020000 */ lhu $v0, ($s0) -/* A1B4D8 802403D8 44060000 */ mfc1 $a2, $f0 -/* A1B4DC 802403DC 44051000 */ mfc1 $a1, $f2 -/* A1B4E0 802403E0 24420400 */ addiu $v0, $v0, 0x400 -/* A1B4E4 802403E4 A6020000 */ sh $v0, ($s0) -/* A1B4E8 802403E8 0C019F20 */ jal guRotate -/* A1B4EC 802403EC AFA60010 */ sw $a2, 0x10($sp) -/* A1B4F0 802403F0 3C0ADA38 */ lui $t2, 0xda38 -/* A1B4F4 802403F4 354A0001 */ ori $t2, $t2, 1 -/* A1B4F8 802403F8 24040001 */ addiu $a0, $zero, 1 -/* A1B4FC 802403FC 27A50018 */ addiu $a1, $sp, 0x18 -/* A1B500 80240400 27A6001C */ addiu $a2, $sp, 0x1c -/* A1B504 80240404 3C08800A */ lui $t0, 0x800a -/* A1B508 80240408 2508A66C */ addiu $t0, $t0, -0x5994 -/* A1B50C 8024040C 27A70020 */ addiu $a3, $sp, 0x20 -/* A1B510 80240410 8D030000 */ lw $v1, ($t0) -/* A1B514 80240414 96220000 */ lhu $v0, ($s1) -/* A1B518 80240418 0060482D */ daddu $t1, $v1, $zero -/* A1B51C 8024041C 24630008 */ addiu $v1, $v1, 8 -/* A1B520 80240420 AD030000 */ sw $v1, ($t0) -/* A1B524 80240424 00441821 */ addu $v1, $v0, $a0 -/* A1B528 80240428 3042FFFF */ andi $v0, $v0, 0xffff -/* A1B52C 8024042C 00021180 */ sll $v0, $v0, 6 -/* A1B530 80240430 AD2A0000 */ sw $t2, ($t1) -/* A1B534 80240434 A6230000 */ sh $v1, ($s1) -/* A1B538 80240438 8E430000 */ lw $v1, ($s2) -/* A1B53C 8024043C 00531021 */ addu $v0, $v0, $s3 -/* A1B540 80240440 00621821 */ addu $v1, $v1, $v0 -/* A1B544 80240444 0C0470AC */ jal func_8011C2B0 -/* A1B548 80240448 AD230004 */ sw $v1, 4($t1) -/* A1B54C 8024044C 8FA20020 */ lw $v0, 0x20($sp) -/* A1B550 80240450 1840004F */ blez $v0, .L80240590 -/* A1B554 80240454 0000802D */ daddu $s0, $zero, $zero -/* A1B558 80240458 3C158024 */ lui $s5, 0x8024 -/* A1B55C 8024045C 26B53BCE */ addiu $s5, $s5, 0x3bce -/* A1B560 80240460 3C135555 */ lui $s3, 0x5555 -/* A1B564 80240464 36735556 */ ori $s3, $s3, 0x5556 -/* A1B568 80240468 34148000 */ ori $s4, $zero, 0x8000 -/* A1B56C 8024046C 02130018 */ mult $s0, $s3 -.L80240470: -/* A1B570 80240470 001097C3 */ sra $s2, $s0, 0x1f -/* A1B574 80240474 00001810 */ mfhi $v1 -/* A1B578 80240478 00721823 */ subu $v1, $v1, $s2 -/* A1B57C 8024047C 00031040 */ sll $v0, $v1, 1 -/* A1B580 80240480 00431021 */ addu $v0, $v0, $v1 -/* A1B584 80240484 02021023 */ subu $v0, $s0, $v0 -/* A1B588 80240488 96A30000 */ lhu $v1, ($s5) -/* A1B58C 8024048C 24420001 */ addiu $v0, $v0, 1 -/* A1B590 80240490 00620018 */ mult $v1, $v0 -/* A1B594 80240494 00101100 */ sll $v0, $s0, 4 -/* A1B598 80240498 00001812 */ mflo $v1 -/* A1B59C 8024049C 00702021 */ addu $a0, $v1, $s0 -/* A1B5A0 802404A0 8FA3001C */ lw $v1, 0x1c($sp) -/* A1B5A4 802404A4 3084FFFF */ andi $a0, $a0, 0xffff -/* A1B5A8 802404A8 0C01917C */ jal sins -/* A1B5AC 802404AC 00628821 */ addu $s1, $v1, $v0 -/* A1B5B0 802404B0 00021400 */ sll $v0, $v0, 0x10 -/* A1B5B4 802404B4 00021403 */ sra $v0, $v0, 0x10 -/* A1B5B8 802404B8 00541021 */ addu $v0, $v0, $s4 -/* A1B5BC 802404BC 00021FC2 */ srl $v1, $v0, 0x1f -/* A1B5C0 802404C0 00431021 */ addu $v0, $v0, $v1 -/* A1B5C4 802404C4 000213C0 */ sll $v0, $v0, 0xf -/* A1B5C8 802404C8 00021403 */ sra $v0, $v0, 0x10 -/* A1B5CC 802404CC 00021880 */ sll $v1, $v0, 2 -/* A1B5D0 802404D0 00621821 */ addu $v1, $v1, $v0 -/* A1B5D4 802404D4 00031140 */ sll $v0, $v1, 5 -/* A1B5D8 802404D8 00431823 */ subu $v1, $v0, $v1 -/* A1B5DC 802404DC 04610002 */ bgez $v1, .L802404E8 -/* A1B5E0 802404E0 0060102D */ daddu $v0, $v1, $zero -/* A1B5E4 802404E4 24627FFF */ addiu $v0, $v1, 0x7fff -.L802404E8: -/* A1B5E8 802404E8 000213C3 */ sra $v0, $v0, 0xf -/* A1B5EC 802404EC 24420064 */ addiu $v0, $v0, 0x64 -/* A1B5F0 802404F0 A222000C */ sb $v0, 0xc($s1) -/* A1B5F4 802404F4 02121823 */ subu $v1, $s0, $s2 -/* A1B5F8 802404F8 00032843 */ sra $a1, $v1, 1 -/* A1B5FC 802404FC 00B30018 */ mult $a1, $s3 -/* A1B600 80240500 A222000D */ sb $v0, 0xd($s1) -/* A1B604 80240504 96A40000 */ lhu $a0, ($s5) -/* A1B608 80240508 00031FC3 */ sra $v1, $v1, 0x1f -/* A1B60C 8024050C 000433C2 */ srl $a2, $a0, 0xf -/* A1B610 80240510 00004010 */ mfhi $t0 -/* A1B614 80240514 01031823 */ subu $v1, $t0, $v1 -/* A1B618 80240518 00031040 */ sll $v0, $v1, 1 -/* A1B61C 8024051C 00431021 */ addu $v0, $v0, $v1 -/* A1B620 80240520 00A22823 */ subu $a1, $a1, $v0 -/* A1B624 80240524 24A50001 */ addiu $a1, $a1, 1 -/* A1B628 80240528 00052BC0 */ sll $a1, $a1, 0xf -/* A1B62C 8024052C 00C50018 */ mult $a2, $a1 -/* A1B630 80240530 00042382 */ srl $a0, $a0, 0xe -/* A1B634 80240534 000423C0 */ sll $a0, $a0, 0xf -/* A1B638 80240538 00001812 */ mflo $v1 -/* A1B63C 8024053C 00642021 */ addu $a0, $v1, $a0 -/* A1B640 80240540 00902021 */ addu $a0, $a0, $s0 -/* A1B644 80240544 0C01917C */ jal sins -/* A1B648 80240548 3084FFFF */ andi $a0, $a0, 0xffff -/* A1B64C 8024054C 00021400 */ sll $v0, $v0, 0x10 -/* A1B650 80240550 00021403 */ sra $v0, $v0, 0x10 -/* A1B654 80240554 9223000C */ lbu $v1, 0xc($s1) -/* A1B658 80240558 00541021 */ addu $v0, $v0, $s4 -/* A1B65C 8024055C 00620018 */ mult $v1, $v0 -/* A1B660 80240560 00001812 */ mflo $v1 -/* A1B664 80240564 04610004 */ bgez $v1, .L80240578 -/* A1B668 80240568 00031403 */ sra $v0, $v1, 0x10 -/* A1B66C 8024056C 3402FFFF */ ori $v0, $zero, 0xffff -/* A1B670 80240570 00621821 */ addu $v1, $v1, $v0 -/* A1B674 80240574 00031403 */ sra $v0, $v1, 0x10 -.L80240578: -/* A1B678 80240578 A222000E */ sb $v0, 0xe($s1) -/* A1B67C 8024057C 8FA20020 */ lw $v0, 0x20($sp) -/* A1B680 80240580 26100001 */ addiu $s0, $s0, 1 -/* A1B684 80240584 0202102A */ slt $v0, $s0, $v0 -/* A1B688 80240588 1440FFB9 */ bnez $v0, .L80240470 -/* A1B68C 8024058C 02130018 */ mult $s0, $s3 -.L80240590: -/* A1B690 80240590 3C05D9FF */ lui $a1, 0xd9ff -/* A1B694 80240594 34A5F9FF */ ori $a1, $a1, 0xf9ff -/* A1B698 80240598 3C03800A */ lui $v1, 0x800a -/* A1B69C 8024059C 2463A66C */ addiu $v1, $v1, -0x5994 -/* A1B6A0 802405A0 8C700000 */ lw $s0, ($v1) -/* A1B6A4 802405A4 24040001 */ addiu $a0, $zero, 1 -/* A1B6A8 802405A8 0200102D */ daddu $v0, $s0, $zero -/* A1B6AC 802405AC 26100008 */ addiu $s0, $s0, 8 -/* A1B6B0 802405B0 AC700000 */ sw $s0, ($v1) -/* A1B6B4 802405B4 AC450000 */ sw $a1, ($v0) -/* A1B6B8 802405B8 AC400004 */ sw $zero, 4($v0) -/* A1B6BC 802405BC 26020008 */ addiu $v0, $s0, 8 -/* A1B6C0 802405C0 AC620000 */ sw $v0, ($v1) -/* A1B6C4 802405C4 3C02DE00 */ lui $v0, 0xde00 -/* A1B6C8 802405C8 0C0470BB */ jal func_8011C2EC -/* A1B6CC 802405CC AE020000 */ sw $v0, ($s0) -/* A1B6D0 802405D0 3C048024 */ lui $a0, 0x8024 -/* A1B6D4 802405D4 24843BCE */ addiu $a0, $a0, 0x3bce -/* A1B6D8 802405D8 94830000 */ lhu $v1, ($a0) -/* A1B6DC 802405DC AE020004 */ sw $v0, 4($s0) -/* A1B6E0 802405E0 24630666 */ addiu $v1, $v1, 0x666 -/* A1B6E4 802405E4 A4830000 */ sh $v1, ($a0) -/* A1B6E8 802405E8 8FBF0040 */ lw $ra, 0x40($sp) -/* A1B6EC 802405EC 8FB5003C */ lw $s5, 0x3c($sp) -/* A1B6F0 802405F0 8FB40038 */ lw $s4, 0x38($sp) -/* A1B6F4 802405F4 8FB30034 */ lw $s3, 0x34($sp) -/* A1B6F8 802405F8 8FB20030 */ lw $s2, 0x30($sp) -/* A1B6FC 802405FC 8FB1002C */ lw $s1, 0x2c($sp) -/* A1B700 80240600 8FB00028 */ lw $s0, 0x28($sp) -/* A1B704 80240604 03E00008 */ jr $ra -/* A1B708 80240608 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_8024060C_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_8024060C_A1B100.s deleted file mode 100644 index 3d159ab329..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_8024060C_A1B100.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024060C_A1B70C -/* A1B70C 8024060C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A1B710 80240610 24040002 */ addiu $a0, $zero, 2 -/* A1B714 80240614 27A50010 */ addiu $a1, $sp, 0x10 -/* A1B718 80240618 27A60014 */ addiu $a2, $sp, 0x14 -/* A1B71C 8024061C 27A70018 */ addiu $a3, $sp, 0x18 -/* A1B720 80240620 AFBF0038 */ sw $ra, 0x38($sp) -/* A1B724 80240624 AFB50034 */ sw $s5, 0x34($sp) -/* A1B728 80240628 AFB40030 */ sw $s4, 0x30($sp) -/* A1B72C 8024062C AFB3002C */ sw $s3, 0x2c($sp) -/* A1B730 80240630 AFB20028 */ sw $s2, 0x28($sp) -/* A1B734 80240634 AFB10024 */ sw $s1, 0x24($sp) -/* A1B738 80240638 0C0470AC */ jal func_8011C2B0 -/* A1B73C 8024063C AFB00020 */ sw $s0, 0x20($sp) -/* A1B740 80240640 8FA20018 */ lw $v0, 0x18($sp) -/* A1B744 80240644 1840004F */ blez $v0, .L80240784 -/* A1B748 80240648 0000802D */ daddu $s0, $zero, $zero -/* A1B74C 8024064C 3C158024 */ lui $s5, 0x8024 -/* A1B750 80240650 26B53BD0 */ addiu $s5, $s5, 0x3bd0 -/* A1B754 80240654 3C135555 */ lui $s3, 0x5555 -/* A1B758 80240658 36735556 */ ori $s3, $s3, 0x5556 -/* A1B75C 8024065C 34148000 */ ori $s4, $zero, 0x8000 -/* A1B760 80240660 02130018 */ mult $s0, $s3 -.L80240664: -/* A1B764 80240664 001097C3 */ sra $s2, $s0, 0x1f -/* A1B768 80240668 00001810 */ mfhi $v1 -/* A1B76C 8024066C 00721823 */ subu $v1, $v1, $s2 -/* A1B770 80240670 00031040 */ sll $v0, $v1, 1 -/* A1B774 80240674 00431021 */ addu $v0, $v0, $v1 -/* A1B778 80240678 02021023 */ subu $v0, $s0, $v0 -/* A1B77C 8024067C 96A30000 */ lhu $v1, ($s5) -/* A1B780 80240680 24420001 */ addiu $v0, $v0, 1 -/* A1B784 80240684 00620018 */ mult $v1, $v0 -/* A1B788 80240688 00101100 */ sll $v0, $s0, 4 -/* A1B78C 8024068C 00001812 */ mflo $v1 -/* A1B790 80240690 00702021 */ addu $a0, $v1, $s0 -/* A1B794 80240694 8FA30014 */ lw $v1, 0x14($sp) -/* A1B798 80240698 3084FFFF */ andi $a0, $a0, 0xffff -/* A1B79C 8024069C 0C01917C */ jal sins -/* A1B7A0 802406A0 00628821 */ addu $s1, $v1, $v0 -/* A1B7A4 802406A4 00021400 */ sll $v0, $v0, 0x10 -/* A1B7A8 802406A8 00021403 */ sra $v0, $v0, 0x10 -/* A1B7AC 802406AC 00541021 */ addu $v0, $v0, $s4 -/* A1B7B0 802406B0 00021FC2 */ srl $v1, $v0, 0x1f -/* A1B7B4 802406B4 00431021 */ addu $v0, $v0, $v1 -/* A1B7B8 802406B8 000213C0 */ sll $v0, $v0, 0xf -/* A1B7BC 802406BC 00021403 */ sra $v0, $v0, 0x10 -/* A1B7C0 802406C0 00021880 */ sll $v1, $v0, 2 -/* A1B7C4 802406C4 00621821 */ addu $v1, $v1, $v0 -/* A1B7C8 802406C8 00031140 */ sll $v0, $v1, 5 -/* A1B7CC 802406CC 00431823 */ subu $v1, $v0, $v1 -/* A1B7D0 802406D0 04610002 */ bgez $v1, .L802406DC -/* A1B7D4 802406D4 0060102D */ daddu $v0, $v1, $zero -/* A1B7D8 802406D8 24627FFF */ addiu $v0, $v1, 0x7fff -.L802406DC: -/* A1B7DC 802406DC 000213C3 */ sra $v0, $v0, 0xf -/* A1B7E0 802406E0 24420064 */ addiu $v0, $v0, 0x64 -/* A1B7E4 802406E4 A222000C */ sb $v0, 0xc($s1) -/* A1B7E8 802406E8 02121823 */ subu $v1, $s0, $s2 -/* A1B7EC 802406EC 00032843 */ sra $a1, $v1, 1 -/* A1B7F0 802406F0 00B30018 */ mult $a1, $s3 -/* A1B7F4 802406F4 A222000D */ sb $v0, 0xd($s1) -/* A1B7F8 802406F8 96A40000 */ lhu $a0, ($s5) -/* A1B7FC 802406FC 00031FC3 */ sra $v1, $v1, 0x1f -/* A1B800 80240700 000433C2 */ srl $a2, $a0, 0xf -/* A1B804 80240704 00004810 */ mfhi $t1 -/* A1B808 80240708 01231823 */ subu $v1, $t1, $v1 -/* A1B80C 8024070C 00031040 */ sll $v0, $v1, 1 -/* A1B810 80240710 00431021 */ addu $v0, $v0, $v1 -/* A1B814 80240714 00A22823 */ subu $a1, $a1, $v0 -/* A1B818 80240718 24A50001 */ addiu $a1, $a1, 1 -/* A1B81C 8024071C 00052BC0 */ sll $a1, $a1, 0xf -/* A1B820 80240720 00C50018 */ mult $a2, $a1 -/* A1B824 80240724 00042382 */ srl $a0, $a0, 0xe -/* A1B828 80240728 000423C0 */ sll $a0, $a0, 0xf -/* A1B82C 8024072C 00001812 */ mflo $v1 -/* A1B830 80240730 00642021 */ addu $a0, $v1, $a0 -/* A1B834 80240734 00902021 */ addu $a0, $a0, $s0 -/* A1B838 80240738 0C01917C */ jal sins -/* A1B83C 8024073C 3084FFFF */ andi $a0, $a0, 0xffff -/* A1B840 80240740 00021400 */ sll $v0, $v0, 0x10 -/* A1B844 80240744 00021403 */ sra $v0, $v0, 0x10 -/* A1B848 80240748 9223000C */ lbu $v1, 0xc($s1) -/* A1B84C 8024074C 00541021 */ addu $v0, $v0, $s4 -/* A1B850 80240750 00620018 */ mult $v1, $v0 -/* A1B854 80240754 00001812 */ mflo $v1 -/* A1B858 80240758 04610004 */ bgez $v1, .L8024076C -/* A1B85C 8024075C 00031403 */ sra $v0, $v1, 0x10 -/* A1B860 80240760 3402FFFF */ ori $v0, $zero, 0xffff -/* A1B864 80240764 00621821 */ addu $v1, $v1, $v0 -/* A1B868 80240768 00031403 */ sra $v0, $v1, 0x10 -.L8024076C: -/* A1B86C 8024076C A222000E */ sb $v0, 0xe($s1) -/* A1B870 80240770 8FA20018 */ lw $v0, 0x18($sp) -/* A1B874 80240774 26100001 */ addiu $s0, $s0, 1 -/* A1B878 80240778 0202102A */ slt $v0, $s0, $v0 -/* A1B87C 8024077C 1440FFB9 */ bnez $v0, .L80240664 -/* A1B880 80240780 02130018 */ mult $s0, $s3 -.L80240784: -/* A1B884 80240784 3C03800A */ lui $v1, 0x800a -/* A1B888 80240788 2463A66C */ addiu $v1, $v1, -0x5994 -/* A1B88C 8024078C 8C620000 */ lw $v0, ($v1) -/* A1B890 80240790 24040002 */ addiu $a0, $zero, 2 -/* A1B894 80240794 0040802D */ daddu $s0, $v0, $zero -/* A1B898 80240798 24420008 */ addiu $v0, $v0, 8 -/* A1B89C 8024079C AC620000 */ sw $v0, ($v1) -/* A1B8A0 802407A0 3C02DE00 */ lui $v0, 0xde00 -/* A1B8A4 802407A4 0C0470BB */ jal func_8011C2EC -/* A1B8A8 802407A8 AE020000 */ sw $v0, ($s0) -/* A1B8AC 802407AC 3C048024 */ lui $a0, 0x8024 -/* A1B8B0 802407B0 24843BD0 */ addiu $a0, $a0, 0x3bd0 -/* A1B8B4 802407B4 94830000 */ lhu $v1, ($a0) -/* A1B8B8 802407B8 AE020004 */ sw $v0, 4($s0) -/* A1B8BC 802407BC 24630253 */ addiu $v1, $v1, 0x253 -/* A1B8C0 802407C0 A4830000 */ sh $v1, ($a0) -/* A1B8C4 802407C4 8FBF0038 */ lw $ra, 0x38($sp) -/* A1B8C8 802407C8 8FB50034 */ lw $s5, 0x34($sp) -/* A1B8CC 802407CC 8FB40030 */ lw $s4, 0x30($sp) -/* A1B8D0 802407D0 8FB3002C */ lw $s3, 0x2c($sp) -/* A1B8D4 802407D4 8FB20028 */ lw $s2, 0x28($sp) -/* A1B8D8 802407D8 8FB10024 */ lw $s1, 0x24($sp) -/* A1B8DC 802407DC 8FB00020 */ lw $s0, 0x20($sp) -/* A1B8E0 802407E0 03E00008 */ jr $ra -/* A1B8E4 802407E4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_80240CB0_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_80240CB0_A1B100.s deleted file mode 100644 index 2276f00b3d..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_80240CB0_A1B100.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CB0_A1BDB0 -/* A1BDB0 80240CB0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A1BDB4 80240CB4 AFB3002C */ sw $s3, 0x2c($sp) -/* A1BDB8 80240CB8 0080982D */ daddu $s3, $a0, $zero -/* A1BDBC 80240CBC AFBF0030 */ sw $ra, 0x30($sp) -/* A1BDC0 80240CC0 AFB20028 */ sw $s2, 0x28($sp) -/* A1BDC4 80240CC4 AFB10024 */ sw $s1, 0x24($sp) -/* A1BDC8 80240CC8 AFB00020 */ sw $s0, 0x20($sp) -/* A1BDCC 80240CCC 8E710148 */ lw $s1, 0x148($s3) -/* A1BDD0 80240CD0 86240008 */ lh $a0, 8($s1) -/* A1BDD4 80240CD4 0C00EABB */ jal get_npc_unsafe -/* A1BDD8 80240CD8 00A0902D */ daddu $s2, $a1, $zero -/* A1BDDC 80240CDC 8E440004 */ lw $a0, 4($s2) -/* A1BDE0 80240CE0 0040802D */ daddu $s0, $v0, $zero -/* A1BDE4 80240CE4 00041FC2 */ srl $v1, $a0, 0x1f -/* A1BDE8 80240CE8 00832021 */ addu $a0, $a0, $v1 -/* A1BDEC 80240CEC 00042043 */ sra $a0, $a0, 1 -/* A1BDF0 80240CF0 0C00A67F */ jal rand_int -/* A1BDF4 80240CF4 24840001 */ addiu $a0, $a0, 1 -/* A1BDF8 80240CF8 8E430004 */ lw $v1, 4($s2) -/* A1BDFC 80240CFC 000327C2 */ srl $a0, $v1, 0x1f -/* A1BE00 80240D00 00641821 */ addu $v1, $v1, $a0 -/* A1BE04 80240D04 00031843 */ sra $v1, $v1, 1 -/* A1BE08 80240D08 00621821 */ addu $v1, $v1, $v0 -/* A1BE0C 80240D0C A603008E */ sh $v1, 0x8e($s0) -/* A1BE10 80240D10 8E2300D0 */ lw $v1, 0xd0($s1) -/* A1BE14 80240D14 C6000040 */ lwc1 $f0, 0x40($s0) -/* A1BE18 80240D18 C4640000 */ lwc1 $f4, ($v1) -/* A1BE1C 80240D1C 46802120 */ cvt.s.w $f4, $f4 -/* A1BE20 80240D20 C4620008 */ lwc1 $f2, 8($v1) -/* A1BE24 80240D24 468010A0 */ cvt.s.w $f2, $f2 -/* A1BE28 80240D28 E7A00010 */ swc1 $f0, 0x10($sp) -/* A1BE2C 80240D2C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1BE30 80240D30 44061000 */ mfc1 $a2, $f2 -/* A1BE34 80240D34 C440000C */ lwc1 $f0, 0xc($v0) -/* A1BE38 80240D38 46800020 */ cvt.s.w $f0, $f0 -/* A1BE3C 80240D3C E7A00014 */ swc1 $f0, 0x14($sp) -/* A1BE40 80240D40 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1BE44 80240D44 44052000 */ mfc1 $a1, $f4 -/* A1BE48 80240D48 C4400010 */ lwc1 $f0, 0x10($v0) -/* A1BE4C 80240D4C 46800020 */ cvt.s.w $f0, $f0 -/* A1BE50 80240D50 E7A00018 */ swc1 $f0, 0x18($sp) -/* A1BE54 80240D54 8C640018 */ lw $a0, 0x18($v1) -/* A1BE58 80240D58 0C0123F5 */ jal is_point_within_region -/* A1BE5C 80240D5C 8E070038 */ lw $a3, 0x38($s0) -/* A1BE60 80240D60 1040000E */ beqz $v0, .L80240D9C -/* A1BE64 80240D64 00000000 */ nop -/* A1BE68 80240D68 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1BE6C 80240D6C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A1BE70 80240D70 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A1BE74 80240D74 C4460000 */ lwc1 $f6, ($v0) -/* A1BE78 80240D78 468031A0 */ cvt.s.w $f6, $f6 -/* A1BE7C 80240D7C 44063000 */ mfc1 $a2, $f6 -/* A1BE80 80240D80 C4460008 */ lwc1 $f6, 8($v0) -/* A1BE84 80240D84 468031A0 */ cvt.s.w $f6, $f6 -/* A1BE88 80240D88 44073000 */ mfc1 $a3, $f6 -/* A1BE8C 80240D8C 0C00A720 */ jal atan2 -/* A1BE90 80240D90 00000000 */ nop -/* A1BE94 80240D94 08090373 */ j .L80240DCC -/* A1BE98 80240D98 E600000C */ swc1 $f0, 0xc($s0) -.L80240D9C: -/* A1BE9C 80240D9C 0C00A67F */ jal rand_int -/* A1BEA0 80240DA0 2404003C */ addiu $a0, $zero, 0x3c -/* A1BEA4 80240DA4 C60C000C */ lwc1 $f12, 0xc($s0) -/* A1BEA8 80240DA8 44820000 */ mtc1 $v0, $f0 -/* A1BEAC 80240DAC 00000000 */ nop -/* A1BEB0 80240DB0 46800020 */ cvt.s.w $f0, $f0 -/* A1BEB4 80240DB4 46006300 */ add.s $f12, $f12, $f0 -/* A1BEB8 80240DB8 3C0141F0 */ lui $at, 0x41f0 -/* A1BEBC 80240DBC 44810000 */ mtc1 $at, $f0 -/* A1BEC0 80240DC0 0C00A6C9 */ jal clamp_angle -/* A1BEC4 80240DC4 46006301 */ sub.s $f12, $f12, $f0 -/* A1BEC8 80240DC8 E600000C */ swc1 $f0, 0xc($s0) -.L80240DCC: -/* A1BECC 80240DCC 8E2200CC */ lw $v0, 0xcc($s1) -/* A1BED0 80240DD0 8C420004 */ lw $v0, 4($v0) -/* A1BED4 80240DD4 AE020028 */ sw $v0, 0x28($s0) -/* A1BED8 80240DD8 AE600074 */ sw $zero, 0x74($s3) -/* A1BEDC 80240DDC 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1BEE0 80240DE0 8C420014 */ lw $v0, 0x14($v0) -/* A1BEE4 80240DE4 04410004 */ bgez $v0, .L80240DF8 -/* A1BEE8 80240DE8 00000000 */ nop -/* A1BEEC 80240DEC C6400000 */ lwc1 $f0, ($s2) -/* A1BEF0 80240DF0 08090386 */ j .L80240E18 -/* A1BEF4 80240DF4 E6000018 */ swc1 $f0, 0x18($s0) -.L80240DF8: -/* A1BEF8 80240DF8 3C018025 */ lui $at, 0x8025 -/* A1BEFC 80240DFC D422BD70 */ ldc1 $f2, -0x4290($at) -/* A1BF00 80240E00 44820000 */ mtc1 $v0, $f0 -/* A1BF04 80240E04 00000000 */ nop -/* A1BF08 80240E08 46800021 */ cvt.d.w $f0, $f0 -/* A1BF0C 80240E0C 46220003 */ div.d $f0, $f0, $f2 -/* A1BF10 80240E10 46200020 */ cvt.s.d $f0, $f0 -/* A1BF14 80240E14 E6000018 */ swc1 $f0, 0x18($s0) -.L80240E18: -/* A1BF18 80240E18 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1BF1C 80240E1C 3C014059 */ lui $at, 0x4059 -/* A1BF20 80240E20 44811800 */ mtc1 $at, $f3 -/* A1BF24 80240E24 44801000 */ mtc1 $zero, $f2 -/* A1BF28 80240E28 46000021 */ cvt.d.s $f0, $f0 -/* A1BF2C 80240E2C 46220002 */ mul.d $f0, $f0, $f2 -/* A1BF30 80240E30 00000000 */ nop -/* A1BF34 80240E34 24020001 */ addiu $v0, $zero, 1 -/* A1BF38 80240E38 4620018D */ trunc.w.d $f6, $f0 -/* A1BF3C 80240E3C E626007C */ swc1 $f6, 0x7c($s1) -/* A1BF40 80240E40 AE620070 */ sw $v0, 0x70($s3) -/* A1BF44 80240E44 8FBF0030 */ lw $ra, 0x30($sp) -/* A1BF48 80240E48 8FB3002C */ lw $s3, 0x2c($sp) -/* A1BF4C 80240E4C 8FB20028 */ lw $s2, 0x28($sp) -/* A1BF50 80240E50 8FB10024 */ lw $s1, 0x24($sp) -/* A1BF54 80240E54 8FB00020 */ lw $s0, 0x20($sp) -/* A1BF58 80240E58 03E00008 */ jr $ra -/* A1BF5C 80240E5C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_80240E60_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_80240E60_A1B100.s deleted file mode 100644 index 3bcc8190f1..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_80240E60_A1B100.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E60_A1BF60 -/* A1BF60 80240E60 27BDFF80 */ addiu $sp, $sp, -0x80 -/* A1BF64 80240E64 AFB3004C */ sw $s3, 0x4c($sp) -/* A1BF68 80240E68 0080982D */ daddu $s3, $a0, $zero -/* A1BF6C 80240E6C AFBF0058 */ sw $ra, 0x58($sp) -/* A1BF70 80240E70 AFB50054 */ sw $s5, 0x54($sp) -/* A1BF74 80240E74 AFB40050 */ sw $s4, 0x50($sp) -/* A1BF78 80240E78 AFB20048 */ sw $s2, 0x48($sp) -/* A1BF7C 80240E7C AFB10044 */ sw $s1, 0x44($sp) -/* A1BF80 80240E80 AFB00040 */ sw $s0, 0x40($sp) -/* A1BF84 80240E84 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* A1BF88 80240E88 F7B80070 */ sdc1 $f24, 0x70($sp) -/* A1BF8C 80240E8C F7B60068 */ sdc1 $f22, 0x68($sp) -/* A1BF90 80240E90 F7B40060 */ sdc1 $f20, 0x60($sp) -/* A1BF94 80240E94 8E710148 */ lw $s1, 0x148($s3) -/* A1BF98 80240E98 00A0902D */ daddu $s2, $a1, $zero -/* A1BF9C 80240E9C 86240008 */ lh $a0, 8($s1) -/* A1BFA0 80240EA0 0C00EABB */ jal get_npc_unsafe -/* A1BFA4 80240EA4 00C0A82D */ daddu $s5, $a2, $zero -/* A1BFA8 80240EA8 0040802D */ daddu $s0, $v0, $zero -/* A1BFAC 80240EAC 0000A02D */ daddu $s4, $zero, $zero -/* A1BFB0 80240EB0 C624007C */ lwc1 $f4, 0x7c($s1) -/* A1BFB4 80240EB4 46802120 */ cvt.s.w $f4, $f4 -/* A1BFB8 80240EB8 C6220088 */ lwc1 $f2, 0x88($s1) -/* A1BFBC 80240EBC 468010A0 */ cvt.s.w $f2, $f2 -/* A1BFC0 80240EC0 460010A1 */ cvt.d.s $f2, $f2 -/* A1BFC4 80240EC4 46002121 */ cvt.d.s $f4, $f4 -/* A1BFC8 80240EC8 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1BFCC 80240ECC 3C014059 */ lui $at, 0x4059 -/* A1BFD0 80240ED0 44813800 */ mtc1 $at, $f7 -/* A1BFD4 80240ED4 44803000 */ mtc1 $zero, $f6 -/* A1BFD8 80240ED8 46000021 */ cvt.d.s $f0, $f0 -/* A1BFDC 80240EDC 46260002 */ mul.d $f0, $f0, $f6 -/* A1BFE0 80240EE0 00000000 */ nop -/* A1BFE4 80240EE4 24020001 */ addiu $v0, $zero, 1 -/* A1BFE8 80240EE8 8E24006C */ lw $a0, 0x6c($s1) -/* A1BFEC 80240EEC 46261083 */ div.d $f2, $f2, $f6 -/* A1BFF0 80240EF0 462010A0 */ cvt.s.d $f2, $f2 -/* A1BFF4 80240EF4 46262103 */ div.d $f4, $f4, $f6 -/* A1BFF8 80240EF8 46202520 */ cvt.s.d $f20, $f4 -/* A1BFFC 80240EFC 30830011 */ andi $v1, $a0, 0x11 -/* A1C000 80240F00 4620020D */ trunc.w.d $f8, $f0 -/* A1C004 80240F04 E628007C */ swc1 $f8, 0x7c($s1) -/* A1C008 80240F08 C6200078 */ lwc1 $f0, 0x78($s1) -/* A1C00C 80240F0C 46800020 */ cvt.s.w $f0, $f0 -/* A1C010 80240F10 46000021 */ cvt.d.s $f0, $f0 -/* A1C014 80240F14 46260003 */ div.d $f0, $f0, $f6 -/* A1C018 80240F18 462006A0 */ cvt.s.d $f26, $f0 -/* A1C01C 80240F1C C6200070 */ lwc1 $f0, 0x70($s1) -/* A1C020 80240F20 46800020 */ cvt.s.w $f0, $f0 -/* A1C024 80240F24 46000021 */ cvt.d.s $f0, $f0 -/* A1C028 80240F28 46260003 */ div.d $f0, $f0, $f6 -/* A1C02C 80240F2C 462005A0 */ cvt.s.d $f22, $f0 -/* A1C030 80240F30 14620025 */ bne $v1, $v0, .L80240FC8 -/* A1C034 80240F34 4602D600 */ add.s $f24, $f26, $f2 -/* A1C038 80240F38 8E020000 */ lw $v0, ($s0) -/* A1C03C 80240F3C 30420008 */ andi $v0, $v0, 8 -/* A1C040 80240F40 10400009 */ beqz $v0, .L80240F68 -/* A1C044 80240F44 27A50028 */ addiu $a1, $sp, 0x28 -/* A1C048 80240F48 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1C04C 80240F4C 4600C001 */ sub.s $f0, $f24, $f0 -/* A1C050 80240F50 4600B03C */ c.lt.s $f22, $f0 -/* A1C054 80240F54 00000000 */ nop -/* A1C058 80240F58 4500001B */ bc1f .L80240FC8 -/* A1C05C 80240F5C 34820010 */ ori $v0, $a0, 0x10 -/* A1C060 80240F60 080903F2 */ j .L80240FC8 -/* A1C064 80240F64 AE22006C */ sw $v0, 0x6c($s1) -.L80240F68: -/* A1C068 80240F68 27A6002C */ addiu $a2, $sp, 0x2c -/* A1C06C 80240F6C C6000038 */ lwc1 $f0, 0x38($s0) -/* A1C070 80240F70 C602003C */ lwc1 $f2, 0x3c($s0) -/* A1C074 80240F74 C6040040 */ lwc1 $f4, 0x40($s0) -/* A1C078 80240F78 3C01447A */ lui $at, 0x447a -/* A1C07C 80240F7C 44813000 */ mtc1 $at, $f6 -/* A1C080 80240F80 27A20034 */ addiu $v0, $sp, 0x34 -/* A1C084 80240F84 E7A00028 */ swc1 $f0, 0x28($sp) -/* A1C088 80240F88 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A1C08C 80240F8C E7A40030 */ swc1 $f4, 0x30($sp) -/* A1C090 80240F90 E7A60034 */ swc1 $f6, 0x34($sp) -/* A1C094 80240F94 AFA20010 */ sw $v0, 0x10($sp) -/* A1C098 80240F98 8E040080 */ lw $a0, 0x80($s0) -/* A1C09C 80240F9C 0C0372DF */ jal func_800DCB7C -/* A1C0A0 80240FA0 27A70030 */ addiu $a3, $sp, 0x30 -/* A1C0A4 80240FA4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* A1C0A8 80240FA8 4600D001 */ sub.s $f0, $f26, $f0 -/* A1C0AC 80240FAC 4600B03C */ c.lt.s $f22, $f0 -/* A1C0B0 80240FB0 00000000 */ nop -/* A1C0B4 80240FB4 45000004 */ bc1f .L80240FC8 -/* A1C0B8 80240FB8 00000000 */ nop -/* A1C0BC 80240FBC 8E22006C */ lw $v0, 0x6c($s1) -/* A1C0C0 80240FC0 34420010 */ ori $v0, $v0, 0x10 -/* A1C0C4 80240FC4 AE22006C */ sw $v0, 0x6c($s1) -.L80240FC8: -/* A1C0C8 80240FC8 8E22006C */ lw $v0, 0x6c($s1) -/* A1C0CC 80240FCC 24030011 */ addiu $v1, $zero, 0x11 -/* A1C0D0 80240FD0 30420011 */ andi $v0, $v0, 0x11 -/* A1C0D4 80240FD4 14430039 */ bne $v0, $v1, .L802410BC -/* A1C0D8 80240FD8 00000000 */ nop -/* A1C0DC 80240FDC 8E020000 */ lw $v0, ($s0) -/* A1C0E0 80240FE0 30420008 */ andi $v0, $v0, 8 -/* A1C0E4 80240FE4 1040000A */ beqz $v0, .L80241010 -/* A1C0E8 80240FE8 4600C106 */ mov.s $f4, $f24 -/* A1C0EC 80240FEC 4614C081 */ sub.s $f2, $f24, $f20 -/* A1C0F0 80240FF0 3C018025 */ lui $at, 0x8025 -/* A1C0F4 80240FF4 D420BD78 */ ldc1 $f0, -0x4288($at) -/* A1C0F8 80240FF8 460010A1 */ cvt.d.s $f2, $f2 -/* A1C0FC 80240FFC 46201082 */ mul.d $f2, $f2, $f0 -/* A1C100 80241000 00000000 */ nop -/* A1C104 80241004 4600A021 */ cvt.d.s $f0, $f20 -/* A1C108 80241008 0809041D */ j .L80241074 -/* A1C10C 8024100C 46220000 */ add.d $f0, $f0, $f2 -.L80241010: -/* A1C110 80241010 27A50028 */ addiu $a1, $sp, 0x28 -/* A1C114 80241014 27A6002C */ addiu $a2, $sp, 0x2c -/* A1C118 80241018 C6000038 */ lwc1 $f0, 0x38($s0) -/* A1C11C 8024101C C6020040 */ lwc1 $f2, 0x40($s0) -/* A1C120 80241020 3C01447A */ lui $at, 0x447a -/* A1C124 80241024 44812000 */ mtc1 $at, $f4 -/* A1C128 80241028 27A20034 */ addiu $v0, $sp, 0x34 -/* A1C12C 8024102C E7B4002C */ swc1 $f20, 0x2c($sp) -/* A1C130 80241030 E7A00028 */ swc1 $f0, 0x28($sp) -/* A1C134 80241034 E7A20030 */ swc1 $f2, 0x30($sp) -/* A1C138 80241038 E7A40034 */ swc1 $f4, 0x34($sp) -/* A1C13C 8024103C AFA20010 */ sw $v0, 0x10($sp) -/* A1C140 80241040 8E040080 */ lw $a0, 0x80($s0) -/* A1C144 80241044 0C0372DF */ jal func_800DCB7C -/* A1C148 80241048 27A70030 */ addiu $a3, $sp, 0x30 -/* A1C14C 8024104C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* A1C150 80241050 461A2100 */ add.s $f4, $f4, $f26 -/* A1C154 80241054 46142081 */ sub.s $f2, $f4, $f20 -/* A1C158 80241058 3C018025 */ lui $at, 0x8025 -/* A1C15C 8024105C D420BD80 */ ldc1 $f0, -0x4280($at) -/* A1C160 80241060 460010A1 */ cvt.d.s $f2, $f2 -/* A1C164 80241064 46201082 */ mul.d $f2, $f2, $f0 -/* A1C168 80241068 00000000 */ nop -/* A1C16C 8024106C 4600A021 */ cvt.d.s $f0, $f20 -/* A1C170 80241070 46220000 */ add.d $f0, $f0, $f2 -.L80241074: -/* A1C174 80241074 46200020 */ cvt.s.d $f0, $f0 -/* A1C178 80241078 E600003C */ swc1 $f0, 0x3c($s0) -/* A1C17C 8024107C C600003C */ lwc1 $f0, 0x3c($s0) -/* A1C180 80241080 46002001 */ sub.s $f0, $f4, $f0 -/* A1C184 80241084 3C013FF0 */ lui $at, 0x3ff0 -/* A1C188 80241088 44811800 */ mtc1 $at, $f3 -/* A1C18C 8024108C 44801000 */ mtc1 $zero, $f2 -/* A1C190 80241090 46000005 */ abs.s $f0, $f0 -/* A1C194 80241094 46000021 */ cvt.d.s $f0, $f0 -/* A1C198 80241098 4622003C */ c.lt.d $f0, $f2 -/* A1C19C 8024109C 00000000 */ nop -/* A1C1A0 802410A0 45000036 */ bc1f .L8024117C -/* A1C1A4 802410A4 2403FFEF */ addiu $v1, $zero, -0x11 -/* A1C1A8 802410A8 E604003C */ swc1 $f4, 0x3c($s0) -/* A1C1AC 802410AC 8E22006C */ lw $v0, 0x6c($s1) -/* A1C1B0 802410B0 00431024 */ and $v0, $v0, $v1 -/* A1C1B4 802410B4 0809045F */ j .L8024117C -/* A1C1B8 802410B8 AE22006C */ sw $v0, 0x6c($s1) -.L802410BC: -/* A1C1BC 802410BC 8E220070 */ lw $v0, 0x70($s1) -/* A1C1C0 802410C0 1840002E */ blez $v0, .L8024117C -/* A1C1C4 802410C4 00000000 */ nop -/* A1C1C8 802410C8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* A1C1CC 802410CC 0C00A8BB */ jal sin_deg -/* A1C1D0 802410D0 46806320 */ cvt.s.w $f12, $f12 -/* A1C1D4 802410D4 8E020000 */ lw $v0, ($s0) -/* A1C1D8 802410D8 30420008 */ andi $v0, $v0, 8 -/* A1C1DC 802410DC 10400003 */ beqz $v0, .L802410EC -/* A1C1E0 802410E0 46000506 */ mov.s $f20, $f0 -/* A1C1E4 802410E4 0809044B */ j .L8024112C -/* A1C1E8 802410E8 0000102D */ daddu $v0, $zero, $zero -.L802410EC: -/* A1C1EC 802410EC 27A50028 */ addiu $a1, $sp, 0x28 -/* A1C1F0 802410F0 27A6002C */ addiu $a2, $sp, 0x2c -/* A1C1F4 802410F4 C6000038 */ lwc1 $f0, 0x38($s0) -/* A1C1F8 802410F8 C602003C */ lwc1 $f2, 0x3c($s0) -/* A1C1FC 802410FC C6040040 */ lwc1 $f4, 0x40($s0) -/* A1C200 80241100 3C01447A */ lui $at, 0x447a -/* A1C204 80241104 44813000 */ mtc1 $at, $f6 -/* A1C208 80241108 27A20034 */ addiu $v0, $sp, 0x34 -/* A1C20C 8024110C E7A00028 */ swc1 $f0, 0x28($sp) -/* A1C210 80241110 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A1C214 80241114 E7A40030 */ swc1 $f4, 0x30($sp) -/* A1C218 80241118 E7A60034 */ swc1 $f6, 0x34($sp) -/* A1C21C 8024111C AFA20010 */ sw $v0, 0x10($sp) -/* A1C220 80241120 8E040080 */ lw $a0, 0x80($s0) -/* A1C224 80241124 0C0372DF */ jal func_800DCB7C -/* A1C228 80241128 27A70030 */ addiu $a3, $sp, 0x30 -.L8024112C: -/* A1C22C 8024112C 10400007 */ beqz $v0, .L8024114C -/* A1C230 80241130 00000000 */ nop -/* A1C234 80241134 4616A082 */ mul.s $f2, $f20, $f22 -/* A1C238 80241138 00000000 */ nop -/* A1C23C 8024113C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A1C240 80241140 461A0000 */ add.s $f0, $f0, $f26 -/* A1C244 80241144 08090456 */ j .L80241158 -/* A1C248 80241148 46020000 */ add.s $f0, $f0, $f2 -.L8024114C: -/* A1C24C 8024114C 4616A002 */ mul.s $f0, $f20, $f22 -/* A1C250 80241150 00000000 */ nop -/* A1C254 80241154 4600C000 */ add.s $f0, $f24, $f0 -.L80241158: -/* A1C258 80241158 E600003C */ swc1 $f0, 0x3c($s0) -/* A1C25C 8024115C 8E220074 */ lw $v0, 0x74($s1) -/* A1C260 80241160 2442000A */ addiu $v0, $v0, 0xa -/* A1C264 80241164 44826000 */ mtc1 $v0, $f12 -/* A1C268 80241168 00000000 */ nop -/* A1C26C 8024116C 0C00A6C9 */ jal clamp_angle -/* A1C270 80241170 46806320 */ cvt.s.w $f12, $f12 -/* A1C274 80241174 4600020D */ trunc.w.s $f8, $f0 -/* A1C278 80241178 E6280074 */ swc1 $f8, 0x74($s1) -.L8024117C: -/* A1C27C 8024117C 8E220090 */ lw $v0, 0x90($s1) -/* A1C280 80241180 1C40004A */ bgtz $v0, .L802412AC -/* A1C284 80241184 2442FFFF */ addiu $v0, $v0, -1 -/* A1C288 80241188 8E430014 */ lw $v1, 0x14($s2) -/* A1C28C 8024118C 04600048 */ bltz $v1, .L802412B0 -/* A1C290 80241190 00000000 */ nop -/* A1C294 80241194 8E620074 */ lw $v0, 0x74($s3) -/* A1C298 80241198 1C400042 */ bgtz $v0, .L802412A4 -/* A1C29C 8024119C 2442FFFF */ addiu $v0, $v0, -1 -/* A1C2A0 802411A0 AE630074 */ sw $v1, 0x74($s3) -/* A1C2A4 802411A4 860200A8 */ lh $v0, 0xa8($s0) -/* A1C2A8 802411A8 C602003C */ lwc1 $f2, 0x3c($s0) -/* A1C2AC 802411AC 44820000 */ mtc1 $v0, $f0 -/* A1C2B0 802411B0 00000000 */ nop -/* A1C2B4 802411B4 46800020 */ cvt.s.w $f0, $f0 -/* A1C2B8 802411B8 46001080 */ add.s $f2, $f2, $f0 -/* A1C2BC 802411BC 3C014024 */ lui $at, 0x4024 -/* A1C2C0 802411C0 44810800 */ mtc1 $at, $f1 -/* A1C2C4 802411C4 44800000 */ mtc1 $zero, $f0 -/* A1C2C8 802411C8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A1C2CC 802411CC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A1C2D0 802411D0 460010A1 */ cvt.d.s $f2, $f2 -/* A1C2D4 802411D4 46201080 */ add.d $f2, $f2, $f0 -/* A1C2D8 802411D8 C440002C */ lwc1 $f0, 0x2c($v0) -/* A1C2DC 802411DC 46000021 */ cvt.d.s $f0, $f0 -/* A1C2E0 802411E0 4622003C */ c.lt.d $f0, $f2 -/* A1C2E4 802411E4 00000000 */ nop -/* A1C2E8 802411E8 4500002C */ bc1f .L8024129C -/* A1C2EC 802411EC 02A0202D */ daddu $a0, $s5, $zero -/* A1C2F0 802411F0 AFA00010 */ sw $zero, 0x10($sp) -/* A1C2F4 802411F4 8E46000C */ lw $a2, 0xc($s2) -/* A1C2F8 802411F8 8E470010 */ lw $a3, 0x10($s2) -/* A1C2FC 802411FC 0C01242D */ jal func_800490B4 -/* A1C300 80241200 0220282D */ daddu $a1, $s1, $zero -/* A1C304 80241204 10400025 */ beqz $v0, .L8024129C -/* A1C308 80241208 0000202D */ daddu $a0, $zero, $zero -/* A1C30C 8024120C 0200282D */ daddu $a1, $s0, $zero -/* A1C310 80241210 0000302D */ daddu $a2, $zero, $zero -/* A1C314 80241214 2412000C */ addiu $s2, $zero, 0xc -/* A1C318 80241218 860300A8 */ lh $v1, 0xa8($s0) -/* A1C31C 8024121C 3C013F80 */ lui $at, 0x3f80 -/* A1C320 80241220 44810000 */ mtc1 $at, $f0 -/* A1C324 80241224 3C014000 */ lui $at, 0x4000 -/* A1C328 80241228 44811000 */ mtc1 $at, $f2 -/* A1C32C 8024122C 3C01C1A0 */ lui $at, 0xc1a0 -/* A1C330 80241230 44812000 */ mtc1 $at, $f4 -/* A1C334 80241234 44834000 */ mtc1 $v1, $f8 -/* A1C338 80241238 00000000 */ nop -/* A1C33C 8024123C 46804220 */ cvt.s.w $f8, $f8 -/* A1C340 80241240 44074000 */ mfc1 $a3, $f8 -/* A1C344 80241244 27A20038 */ addiu $v0, $sp, 0x38 -/* A1C348 80241248 AFB2001C */ sw $s2, 0x1c($sp) -/* A1C34C 8024124C AFA20020 */ sw $v0, 0x20($sp) -/* A1C350 80241250 E7A00010 */ swc1 $f0, 0x10($sp) -/* A1C354 80241254 E7A20014 */ swc1 $f2, 0x14($sp) -/* A1C358 80241258 0C01BFA4 */ jal fx_emote -/* A1C35C 8024125C E7A40018 */ swc1 $f4, 0x18($sp) -/* A1C360 80241260 0200202D */ daddu $a0, $s0, $zero -/* A1C364 80241264 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A1C368 80241268 C480003C */ lwc1 $f0, 0x3c($a0) -/* A1C36C 8024126C 3C060020 */ lui $a2, 0x20 -/* A1C370 80241270 0C012530 */ jal func_800494C0 -/* A1C374 80241274 E4800064 */ swc1 $f0, 0x64($a0) -/* A1C378 80241278 8E220018 */ lw $v0, 0x18($s1) -/* A1C37C 8024127C 9442002A */ lhu $v0, 0x2a($v0) -/* A1C380 80241280 30420001 */ andi $v0, $v0, 1 -/* A1C384 80241284 10400003 */ beqz $v0, .L80241294 -/* A1C388 80241288 2402000A */ addiu $v0, $zero, 0xa -/* A1C38C 8024128C 08090515 */ j .L80241454 -/* A1C390 80241290 AE620070 */ sw $v0, 0x70($s3) -.L80241294: -/* A1C394 80241294 08090515 */ j .L80241454 -/* A1C398 80241298 AE720070 */ sw $s2, 0x70($s3) -.L8024129C: -/* A1C39C 8024129C 8E620074 */ lw $v0, 0x74($s3) -/* A1C3A0 802412A0 2442FFFF */ addiu $v0, $v0, -1 -.L802412A4: -/* A1C3A4 802412A4 080904AC */ j .L802412B0 -/* A1C3A8 802412A8 AE620074 */ sw $v0, 0x74($s3) -.L802412AC: -/* A1C3AC 802412AC AE220090 */ sw $v0, 0x90($s1) -.L802412B0: -/* A1C3B0 802412B0 8E2300D0 */ lw $v1, 0xd0($s1) -/* A1C3B4 802412B4 C6000040 */ lwc1 $f0, 0x40($s0) -/* A1C3B8 802412B8 C4620000 */ lwc1 $f2, ($v1) -/* A1C3BC 802412BC 468010A0 */ cvt.s.w $f2, $f2 -/* A1C3C0 802412C0 C4640008 */ lwc1 $f4, 8($v1) -/* A1C3C4 802412C4 46802120 */ cvt.s.w $f4, $f4 -/* A1C3C8 802412C8 E7A00010 */ swc1 $f0, 0x10($sp) -/* A1C3CC 802412CC 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1C3D0 802412D0 44051000 */ mfc1 $a1, $f2 -/* A1C3D4 802412D4 C440000C */ lwc1 $f0, 0xc($v0) -/* A1C3D8 802412D8 46800020 */ cvt.s.w $f0, $f0 -/* A1C3DC 802412DC E7A00014 */ swc1 $f0, 0x14($sp) -/* A1C3E0 802412E0 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1C3E4 802412E4 44062000 */ mfc1 $a2, $f4 -/* A1C3E8 802412E8 C4400010 */ lwc1 $f0, 0x10($v0) -/* A1C3EC 802412EC 46800020 */ cvt.s.w $f0, $f0 -/* A1C3F0 802412F0 E7A00018 */ swc1 $f0, 0x18($sp) -/* A1C3F4 802412F4 8C640018 */ lw $a0, 0x18($v1) -/* A1C3F8 802412F8 0C0123F5 */ jal is_point_within_region -/* A1C3FC 802412FC 8E070038 */ lw $a3, 0x38($s0) -/* A1C400 80241300 1040001A */ beqz $v0, .L8024136C -/* A1C404 80241304 00000000 */ nop -/* A1C408 80241308 8E060038 */ lw $a2, 0x38($s0) -/* A1C40C 8024130C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1C410 80241310 8E070040 */ lw $a3, 0x40($s0) -/* A1C414 80241314 C44C0000 */ lwc1 $f12, ($v0) -/* A1C418 80241318 46806320 */ cvt.s.w $f12, $f12 -/* A1C41C 8024131C C44E0008 */ lwc1 $f14, 8($v0) -/* A1C420 80241320 0C00A7B5 */ jal dist2D -/* A1C424 80241324 468073A0 */ cvt.s.w $f14, $f14 -/* A1C428 80241328 C6020018 */ lwc1 $f2, 0x18($s0) -/* A1C42C 8024132C 4600103C */ c.lt.s $f2, $f0 -/* A1C430 80241330 00000000 */ nop -/* A1C434 80241334 4500000D */ bc1f .L8024136C -/* A1C438 80241338 E7A00034 */ swc1 $f0, 0x34($sp) -/* A1C43C 8024133C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A1C440 80241340 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1C444 80241344 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A1C448 80241348 C4480000 */ lwc1 $f8, ($v0) -/* A1C44C 8024134C 46804220 */ cvt.s.w $f8, $f8 -/* A1C450 80241350 44064000 */ mfc1 $a2, $f8 -/* A1C454 80241354 C4480008 */ lwc1 $f8, 8($v0) -/* A1C458 80241358 46804220 */ cvt.s.w $f8, $f8 -/* A1C45C 8024135C 44074000 */ mfc1 $a3, $f8 -/* A1C460 80241360 0C00A720 */ jal atan2 -/* A1C464 80241364 24140001 */ addiu $s4, $zero, 1 -/* A1C468 80241368 E600000C */ swc1 $f0, 0xc($s0) -.L8024136C: -/* A1C46C 8024136C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1C470 80241370 8C43000C */ lw $v1, 0xc($v0) -/* A1C474 80241374 8C420010 */ lw $v0, 0x10($v0) -/* A1C478 80241378 00621825 */ or $v1, $v1, $v0 -/* A1C47C 8024137C 00741825 */ or $v1, $v1, $s4 -/* A1C480 80241380 10600008 */ beqz $v1, .L802413A4 -/* A1C484 80241384 00000000 */ nop -/* A1C488 80241388 8602008C */ lh $v0, 0x8c($s0) -/* A1C48C 8024138C 14400031 */ bnez $v0, .L80241454 -/* A1C490 80241390 00000000 */ nop -/* A1C494 80241394 8E050018 */ lw $a1, 0x18($s0) -/* A1C498 80241398 8E06000C */ lw $a2, 0xc($s0) -/* A1C49C 8024139C 0C00EA95 */ jal npc_move_heading -/* A1C4A0 802413A0 0200202D */ daddu $a0, $s0, $zero -.L802413A4: -/* A1C4A4 802413A4 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1C4A8 802413A8 3C014059 */ lui $at, 0x4059 -/* A1C4AC 802413AC 44811800 */ mtc1 $at, $f3 -/* A1C4B0 802413B0 44801000 */ mtc1 $zero, $f2 -/* A1C4B4 802413B4 46000021 */ cvt.d.s $f0, $f0 -/* A1C4B8 802413B8 46220002 */ mul.d $f0, $f0, $f2 -/* A1C4BC 802413BC 00000000 */ nop -/* A1C4C0 802413C0 4620020D */ trunc.w.d $f8, $f0 -/* A1C4C4 802413C4 E628007C */ swc1 $f8, 0x7c($s1) -/* A1C4C8 802413C8 8E420004 */ lw $v0, 4($s2) -/* A1C4CC 802413CC 18400021 */ blez $v0, .L80241454 -/* A1C4D0 802413D0 00000000 */ nop -/* A1C4D4 802413D4 8602008E */ lh $v0, 0x8e($s0) -/* A1C4D8 802413D8 9603008E */ lhu $v1, 0x8e($s0) -/* A1C4DC 802413DC 18400005 */ blez $v0, .L802413F4 -/* A1C4E0 802413E0 2462FFFF */ addiu $v0, $v1, -1 -/* A1C4E4 802413E4 A602008E */ sh $v0, 0x8e($s0) -/* A1C4E8 802413E8 00021400 */ sll $v0, $v0, 0x10 -/* A1C4EC 802413EC 1C400019 */ bgtz $v0, .L80241454 -/* A1C4F0 802413F0 00000000 */ nop -.L802413F4: -/* A1C4F4 802413F4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A1C4F8 802413F8 24020002 */ addiu $v0, $zero, 2 -/* A1C4FC 802413FC 0C00A67F */ jal rand_int -/* A1C500 80241400 AE620070 */ sw $v0, 0x70($s3) -/* A1C504 80241404 3C035555 */ lui $v1, 0x5555 -/* A1C508 80241408 34635556 */ ori $v1, $v1, 0x5556 -/* A1C50C 8024140C 00430018 */ mult $v0, $v1 -/* A1C510 80241410 000227C3 */ sra $a0, $v0, 0x1f -/* A1C514 80241414 00004010 */ mfhi $t0 -/* A1C518 80241418 01042023 */ subu $a0, $t0, $a0 -/* A1C51C 8024141C 00041840 */ sll $v1, $a0, 1 -/* A1C520 80241420 00641821 */ addu $v1, $v1, $a0 -/* A1C524 80241424 00431023 */ subu $v0, $v0, $v1 -/* A1C528 80241428 24430002 */ addiu $v1, $v0, 2 -/* A1C52C 8024142C AE630074 */ sw $v1, 0x74($s3) -/* A1C530 80241430 8E42002C */ lw $v0, 0x2c($s2) -/* A1C534 80241434 58400007 */ blezl $v0, .L80241454 -/* A1C538 80241438 AE600070 */ sw $zero, 0x70($s3) -/* A1C53C 8024143C 8E420008 */ lw $v0, 8($s2) -/* A1C540 80241440 18400003 */ blez $v0, .L80241450 -/* A1C544 80241444 28620003 */ slti $v0, $v1, 3 -/* A1C548 80241448 10400002 */ beqz $v0, .L80241454 -/* A1C54C 8024144C 00000000 */ nop -.L80241450: -/* A1C550 80241450 AE600070 */ sw $zero, 0x70($s3) -.L80241454: -/* A1C554 80241454 8FBF0058 */ lw $ra, 0x58($sp) -/* A1C558 80241458 8FB50054 */ lw $s5, 0x54($sp) -/* A1C55C 8024145C 8FB40050 */ lw $s4, 0x50($sp) -/* A1C560 80241460 8FB3004C */ lw $s3, 0x4c($sp) -/* A1C564 80241464 8FB20048 */ lw $s2, 0x48($sp) -/* A1C568 80241468 8FB10044 */ lw $s1, 0x44($sp) -/* A1C56C 8024146C 8FB00040 */ lw $s0, 0x40($sp) -/* A1C570 80241470 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* A1C574 80241474 D7B80070 */ ldc1 $f24, 0x70($sp) -/* A1C578 80241478 D7B60068 */ ldc1 $f22, 0x68($sp) -/* A1C57C 8024147C D7B40060 */ ldc1 $f20, 0x60($sp) -/* A1C580 80241480 03E00008 */ jr $ra -/* A1C584 80241484 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_8024188C_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_8024188C_A1B100.s deleted file mode 100644 index 48edbbc2bd..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_8024188C_A1B100.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024188C_A1C98C -/* A1C98C 8024188C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A1C990 80241890 AFB20018 */ sw $s2, 0x18($sp) -/* A1C994 80241894 0080902D */ daddu $s2, $a0, $zero -/* A1C998 80241898 AFBF001C */ sw $ra, 0x1c($sp) -/* A1C99C 8024189C AFB10014 */ sw $s1, 0x14($sp) -/* A1C9A0 802418A0 AFB00010 */ sw $s0, 0x10($sp) -/* A1C9A4 802418A4 8E510148 */ lw $s1, 0x148($s2) -/* A1C9A8 802418A8 0C00EABB */ jal get_npc_unsafe -/* A1C9AC 802418AC 86240008 */ lh $a0, 8($s1) -/* A1C9B0 802418B0 0040802D */ daddu $s0, $v0, $zero -/* A1C9B4 802418B4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A1C9B8 802418B8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A1C9BC 802418BC C60C0038 */ lwc1 $f12, 0x38($s0) -/* A1C9C0 802418C0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A1C9C4 802418C4 A600008E */ sh $zero, 0x8e($s0) -/* A1C9C8 802418C8 8C460028 */ lw $a2, 0x28($v0) -/* A1C9CC 802418CC 0C00A720 */ jal atan2 -/* A1C9D0 802418D0 8C470030 */ lw $a3, 0x30($v0) -/* A1C9D4 802418D4 E600000C */ swc1 $f0, 0xc($s0) -/* A1C9D8 802418D8 8E2200CC */ lw $v0, 0xcc($s1) -/* A1C9DC 802418DC 8C420020 */ lw $v0, 0x20($v0) -/* A1C9E0 802418E0 AE020028 */ sw $v0, 0x28($s0) -/* A1C9E4 802418E4 2402000B */ addiu $v0, $zero, 0xb -/* A1C9E8 802418E8 AE420070 */ sw $v0, 0x70($s2) -/* A1C9EC 802418EC 8FBF001C */ lw $ra, 0x1c($sp) -/* A1C9F0 802418F0 8FB20018 */ lw $s2, 0x18($sp) -/* A1C9F4 802418F4 8FB10014 */ lw $s1, 0x14($sp) -/* A1C9F8 802418F8 8FB00010 */ lw $s0, 0x10($sp) -/* A1C9FC 802418FC 03E00008 */ jr $ra -/* A1CA00 80241900 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_8024226C_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_8024226C_A1B100.s deleted file mode 100644 index d0803cac96..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_8024226C_A1B100.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024226C_A1D36C -/* A1D36C 8024226C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A1D370 80242270 AFB10014 */ sw $s1, 0x14($sp) -/* A1D374 80242274 0080882D */ daddu $s1, $a0, $zero -/* A1D378 80242278 AFBF0018 */ sw $ra, 0x18($sp) -/* A1D37C 8024227C AFB00010 */ sw $s0, 0x10($sp) -/* A1D380 80242280 8E30000C */ lw $s0, 0xc($s1) -/* A1D384 80242284 8E050000 */ lw $a1, ($s0) -/* A1D388 80242288 0C0B1EAF */ jal get_variable -/* A1D38C 8024228C 26100004 */ addiu $s0, $s0, 4 -/* A1D390 80242290 0220202D */ daddu $a0, $s1, $zero -/* A1D394 80242294 8E050000 */ lw $a1, ($s0) -/* A1D398 80242298 0C0B1EAF */ jal get_variable -/* A1D39C 8024229C 0040802D */ daddu $s0, $v0, $zero -/* A1D3A0 802422A0 44820000 */ mtc1 $v0, $f0 -/* A1D3A4 802422A4 00000000 */ nop -/* A1D3A8 802422A8 46800020 */ cvt.s.w $f0, $f0 -/* A1D3AC 802422AC 24020002 */ addiu $v0, $zero, 2 -/* A1D3B0 802422B0 00501804 */ sllv $v1, $s0, $v0 -/* A1D3B4 802422B4 00701821 */ addu $v1, $v1, $s0 -/* A1D3B8 802422B8 00431804 */ sllv $v1, $v1, $v0 -/* A1D3BC 802422BC 00701823 */ subu $v1, $v1, $s0 -/* A1D3C0 802422C0 000320C0 */ sll $a0, $v1, 3 -/* A1D3C4 802422C4 00641821 */ addu $v1, $v1, $a0 -/* A1D3C8 802422C8 000318C0 */ sll $v1, $v1, 3 -/* A1D3CC 802422CC 3C01800B */ lui $at, 0x800b -/* A1D3D0 802422D0 00230821 */ addu $at, $at, $v1 -/* A1D3D4 802422D4 E4201D98 */ swc1 $f0, 0x1d98($at) -/* A1D3D8 802422D8 8FBF0018 */ lw $ra, 0x18($sp) -/* A1D3DC 802422DC 8FB10014 */ lw $s1, 0x14($sp) -/* A1D3E0 802422E0 8FB00010 */ lw $s0, 0x10($sp) -/* A1D3E4 802422E4 03E00008 */ jr $ra -/* A1D3E8 802422E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_802422EC_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_802422EC_A1B100.s deleted file mode 100644 index c9f8d55b7c..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_802422EC_A1B100.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422EC_A1D3EC -/* A1D3EC 802422EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D3F0 802422F0 AFBF0010 */ sw $ra, 0x10($sp) -/* A1D3F4 802422F4 8C82000C */ lw $v0, 0xc($a0) -/* A1D3F8 802422F8 0C0B1EAF */ jal get_variable -/* A1D3FC 802422FC 8C450000 */ lw $a1, ($v0) -/* A1D400 80242300 0C0B1059 */ jal does_script_exist -/* A1D404 80242304 0040202D */ daddu $a0, $v0, $zero -/* A1D408 80242308 2C420001 */ sltiu $v0, $v0, 1 -/* A1D40C 8024230C 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D410 80242310 00021040 */ sll $v0, $v0, 1 -/* A1D414 80242314 03E00008 */ jr $ra -/* A1D418 80242318 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_8024231C_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_8024231C_A1B100.s deleted file mode 100644 index 0fef1c1081..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_8024231C_A1B100.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024231C_A1D41C -/* A1D41C 8024231C 3C028011 */ lui $v0, 0x8011 -/* A1D420 80242320 8042F2A2 */ lb $v0, -0xd5e($v0) -/* A1D424 80242324 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D428 80242328 10400003 */ beqz $v0, .L80242338 -/* A1D42C 8024232C AFBF0010 */ sw $ra, 0x10($sp) -/* A1D430 80242330 0C03AE06 */ jal partner_suspend_ability_script -/* A1D434 80242334 00000000 */ nop -.L80242338: -/* A1D438 80242338 24020002 */ addiu $v0, $zero, 2 -/* A1D43C 8024233C 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D440 80242340 03E00008 */ jr $ra -/* A1D444 80242344 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_802425E0_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_802425E0_A1B100.s deleted file mode 100644 index 36d6fd0e2f..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_802425E0_A1B100.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425E0_A1D6E0 -/* A1D6E0 802425E0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A1D6E4 802425E4 AFB10024 */ sw $s1, 0x24($sp) -/* A1D6E8 802425E8 0080882D */ daddu $s1, $a0, $zero -/* A1D6EC 802425EC 3C05F840 */ lui $a1, 0xf840 -/* A1D6F0 802425F0 AFBF0044 */ sw $ra, 0x44($sp) -/* A1D6F4 802425F4 AFBE0040 */ sw $fp, 0x40($sp) -/* A1D6F8 802425F8 AFB7003C */ sw $s7, 0x3c($sp) -/* A1D6FC 802425FC AFB60038 */ sw $s6, 0x38($sp) -/* A1D700 80242600 AFB50034 */ sw $s5, 0x34($sp) -/* A1D704 80242604 AFB40030 */ sw $s4, 0x30($sp) -/* A1D708 80242608 AFB3002C */ sw $s3, 0x2c($sp) -/* A1D70C 8024260C AFB20028 */ sw $s2, 0x28($sp) -/* A1D710 80242610 AFB00020 */ sw $s0, 0x20($sp) -/* A1D714 80242614 8E3E0148 */ lw $fp, 0x148($s1) -/* A1D718 80242618 0C0B1EAF */ jal get_variable -/* A1D71C 8024261C 34A56268 */ ori $a1, $a1, 0x6268 -/* A1D720 80242620 0040802D */ daddu $s0, $v0, $zero -/* A1D724 80242624 0220202D */ daddu $a0, $s1, $zero -/* A1D728 80242628 3C05F840 */ lui $a1, 0xf840 -/* A1D72C 8024262C 0C0B1EAF */ jal get_variable -/* A1D730 80242630 34A56269 */ ori $a1, $a1, 0x6269 -/* A1D734 80242634 0040B82D */ daddu $s7, $v0, $zero -/* A1D738 80242638 0220202D */ daddu $a0, $s1, $zero -/* A1D73C 8024263C 3C05F5DE */ lui $a1, 0xf5de -/* A1D740 80242640 0C0B1EAF */ jal get_variable -/* A1D744 80242644 34A502DE */ ori $a1, $a1, 0x2de -/* A1D748 80242648 0040B02D */ daddu $s6, $v0, $zero -/* A1D74C 8024264C 0220202D */ daddu $a0, $s1, $zero -/* A1D750 80242650 3C05F5DE */ lui $a1, 0xf5de -/* A1D754 80242654 0C0B1EAF */ jal get_variable -/* A1D758 80242658 34A502DF */ ori $a1, $a1, 0x2df -/* A1D75C 8024265C 0040A82D */ daddu $s5, $v0, $zero -/* A1D760 80242660 93D3006D */ lbu $s3, 0x6d($fp) -/* A1D764 80242664 32C2FFFF */ andi $v0, $s6, 0xffff -/* A1D768 80242668 A7B30010 */ sh $s3, 0x10($sp) -/* A1D76C 8024266C 93D2006E */ lbu $s2, 0x6e($fp) -/* A1D770 80242670 93C7006F */ lbu $a3, 0x6f($fp) -/* A1D774 80242674 3274FFFF */ andi $s4, $s3, 0xffff -/* A1D778 80242678 12820003 */ beq $s4, $v0, .L80242688 -/* A1D77C 8024267C A7A7001E */ sh $a3, 0x1e($sp) -/* A1D780 80242680 0000B82D */ daddu $s7, $zero, $zero -/* A1D784 80242684 02E0802D */ daddu $s0, $s7, $zero -.L80242688: -/* A1D788 80242688 3202FFFF */ andi $v0, $s0, 0xffff -/* A1D78C 8024268C 14400016 */ bnez $v0, .L802426E8 -/* A1D790 80242690 0220202D */ daddu $a0, $s1, $zero -/* A1D794 80242694 0C00A67F */ jal rand_int -/* A1D798 80242698 24040064 */ addiu $a0, $zero, 0x64 -/* A1D79C 8024269C 2842001E */ slti $v0, $v0, 0x1e -/* A1D7A0 802426A0 10400011 */ beqz $v0, .L802426E8 -/* A1D7A4 802426A4 0220202D */ daddu $a0, $s1, $zero -/* A1D7A8 802426A8 0C00A67F */ jal rand_int -/* A1D7AC 802426AC 2644FFFF */ addiu $a0, $s2, -1 -/* A1D7B0 802426B0 0040A82D */ daddu $s5, $v0, $zero -/* A1D7B4 802426B4 0260B02D */ daddu $s6, $s3, $zero -/* A1D7B8 802426B8 0220202D */ daddu $a0, $s1, $zero -/* A1D7BC 802426BC 3C05F5DE */ lui $a1, 0xf5de -/* A1D7C0 802426C0 34A502DE */ ori $a1, $a1, 0x2de -/* A1D7C4 802426C4 0C0B2026 */ jal set_variable -/* A1D7C8 802426C8 0280302D */ daddu $a2, $s4, $zero -/* A1D7CC 802426CC 0220202D */ daddu $a0, $s1, $zero -/* A1D7D0 802426D0 3C05F5DE */ lui $a1, 0xf5de -/* A1D7D4 802426D4 34A502DF */ ori $a1, $a1, 0x2df -/* A1D7D8 802426D8 0C0B2026 */ jal set_variable -/* A1D7DC 802426DC 32A6FFFF */ andi $a2, $s5, 0xffff -/* A1D7E0 802426E0 24100001 */ addiu $s0, $zero, 1 -/* A1D7E4 802426E4 0220202D */ daddu $a0, $s1, $zero -.L802426E8: -/* A1D7E8 802426E8 3C05F840 */ lui $a1, 0xf840 -/* A1D7EC 802426EC 34A56268 */ ori $a1, $a1, 0x6268 -/* A1D7F0 802426F0 0C0B2026 */ jal set_variable -/* A1D7F4 802426F4 3206FFFF */ andi $a2, $s0, 0xffff -/* A1D7F8 802426F8 0220202D */ daddu $a0, $s1, $zero -/* A1D7FC 802426FC 3C05F840 */ lui $a1, 0xf840 -/* A1D800 80242700 34A56269 */ ori $a1, $a1, 0x6269 -/* A1D804 80242704 0C0B2026 */ jal set_variable -/* A1D808 80242708 32E6FFFF */ andi $a2, $s7, 0xffff -/* A1D80C 8024270C 0000202D */ daddu $a0, $zero, $zero -/* A1D810 80242710 3C05F5DE */ lui $a1, 0xf5de -/* A1D814 80242714 0C0B1EAF */ jal get_variable -/* A1D818 80242718 34A502E0 */ ori $a1, $a1, 0x2e0 -/* A1D81C 8024271C 0000202D */ daddu $a0, $zero, $zero -/* A1D820 80242720 3C05F5DE */ lui $a1, 0xf5de -/* A1D824 80242724 34A50180 */ ori $a1, $a1, 0x180 -/* A1D828 80242728 0C0B1EAF */ jal get_variable -/* A1D82C 8024272C 0040802D */ daddu $s0, $v0, $zero -/* A1D830 80242730 0040282D */ daddu $a1, $v0, $zero -/* A1D834 80242734 0000182D */ daddu $v1, $zero, $zero -/* A1D838 80242738 3C068025 */ lui $a2, 0x8025 -/* A1D83C 8024273C 24C680C0 */ addiu $a2, $a2, -0x7f40 -/* A1D840 80242740 00C0202D */ daddu $a0, $a2, $zero -.L80242744: -/* A1D844 80242744 8C820000 */ lw $v0, ($a0) -/* A1D848 80242748 00A2102A */ slt $v0, $a1, $v0 -/* A1D84C 8024274C 14400006 */ bnez $v0, .L80242768 -/* A1D850 80242750 000310C0 */ sll $v0, $v1, 3 -/* A1D854 80242754 24630001 */ addiu $v1, $v1, 1 -/* A1D858 80242758 28620008 */ slti $v0, $v1, 8 -/* A1D85C 8024275C 1440FFF9 */ bnez $v0, .L80242744 -/* A1D860 80242760 24840008 */ addiu $a0, $a0, 8 -/* A1D864 80242764 000310C0 */ sll $v0, $v1, 3 -.L80242768: -/* A1D868 80242768 00461021 */ addu $v0, $v0, $a2 -/* A1D86C 8024276C 8C420004 */ lw $v0, 4($v0) -/* A1D870 80242770 97A30010 */ lhu $v1, 0x10($sp) -/* A1D874 80242774 0202202A */ slt $a0, $s0, $v0 -/* A1D878 80242778 32C2FFFF */ andi $v0, $s6, 0xffff -/* A1D87C 8024277C 14620008 */ bne $v1, $v0, .L802427A0 -/* A1D880 80242780 32A2FFFF */ andi $v0, $s5, 0xffff -/* A1D884 80242784 97A7001E */ lhu $a3, 0x1e($sp) -/* A1D888 80242788 14E20005 */ bne $a3, $v0, .L802427A0 -/* A1D88C 8024278C 32E2FFFF */ andi $v0, $s7, 0xffff -/* A1D890 80242790 14400003 */ bnez $v0, .L802427A0 -/* A1D894 80242794 00000000 */ nop -/* A1D898 80242798 14800008 */ bnez $a0, .L802427BC -/* A1D89C 8024279C 24020001 */ addiu $v0, $zero, 1 -.L802427A0: -/* A1D8A0 802427A0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* A1D8A4 802427A4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* A1D8A8 802427A8 80420075 */ lb $v0, 0x75($v0) -/* A1D8AC 802427AC 10400005 */ beqz $v0, .L802427C4 -/* A1D8B0 802427B0 00000000 */ nop -/* A1D8B4 802427B4 10800003 */ beqz $a0, .L802427C4 -/* A1D8B8 802427B8 24020001 */ addiu $v0, $zero, 1 -.L802427BC: -/* A1D8BC 802427BC 080909F4 */ j .L802427D0 -/* A1D8C0 802427C0 AE220084 */ sw $v0, 0x84($s1) -.L802427C4: -/* A1D8C4 802427C4 0C00F9EB */ jal kill_enemy -/* A1D8C8 802427C8 03C0202D */ daddu $a0, $fp, $zero -/* A1D8CC 802427CC AE200084 */ sw $zero, 0x84($s1) -.L802427D0: -/* A1D8D0 802427D0 8FBF0044 */ lw $ra, 0x44($sp) -/* A1D8D4 802427D4 8FBE0040 */ lw $fp, 0x40($sp) -/* A1D8D8 802427D8 8FB7003C */ lw $s7, 0x3c($sp) -/* A1D8DC 802427DC 8FB60038 */ lw $s6, 0x38($sp) -/* A1D8E0 802427E0 8FB50034 */ lw $s5, 0x34($sp) -/* A1D8E4 802427E4 8FB40030 */ lw $s4, 0x30($sp) -/* A1D8E8 802427E8 8FB3002C */ lw $s3, 0x2c($sp) -/* A1D8EC 802427EC 8FB20028 */ lw $s2, 0x28($sp) -/* A1D8F0 802427F0 8FB10024 */ lw $s1, 0x24($sp) -/* A1D8F4 802427F4 8FB00020 */ lw $s0, 0x20($sp) -/* A1D8F8 802427F8 24020002 */ addiu $v0, $zero, 2 -/* A1D8FC 802427FC 03E00008 */ jr $ra -/* A1D900 80242800 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_80242804_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_80242804_A1B100.s deleted file mode 100644 index 5c14863d04..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_80242804_A1B100.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242804_A1D904 -/* A1D904 80242804 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D908 80242808 AFBF0014 */ sw $ra, 0x14($sp) -/* A1D90C 8024280C AFB00010 */ sw $s0, 0x10($sp) -/* A1D910 80242810 0C00EABB */ jal get_npc_unsafe -/* A1D914 80242814 8C84014C */ lw $a0, 0x14c($a0) -/* A1D918 80242818 24040008 */ addiu $a0, $zero, 8 -/* A1D91C 8024281C 0040802D */ daddu $s0, $v0, $zero -/* A1D920 80242820 3C028024 */ lui $v0, 0x8024 -/* A1D924 80242824 24422870 */ addiu $v0, $v0, 0x2870 -/* A1D928 80242828 0C00AB39 */ jal heap_malloc -/* A1D92C 8024282C AE020008 */ sw $v0, 8($s0) -/* A1D930 80242830 0040182D */ daddu $v1, $v0, $zero -/* A1D934 80242834 AE030020 */ sw $v1, 0x20($s0) -/* A1D938 80242838 AC600000 */ sw $zero, ($v1) -/* A1D93C 8024283C 8FBF0014 */ lw $ra, 0x14($sp) -/* A1D940 80242840 8FB00010 */ lw $s0, 0x10($sp) -/* A1D944 80242844 24020001 */ addiu $v0, $zero, 1 -/* A1D948 80242848 03E00008 */ jr $ra -/* A1D94C 8024284C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_80242870_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_80242870_A1B100.s deleted file mode 100644 index 5926c4e5f1..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_80242870_A1B100.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242870_A1D970 -/* A1D970 80242870 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D974 80242874 3C03800A */ lui $v1, 0x800a -/* A1D978 80242878 8463A634 */ lh $v1, -0x59cc($v1) -/* A1D97C 8024287C 3C05800B */ lui $a1, %hi(gCameras) -/* A1D980 80242880 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A1D984 80242884 AFBF0010 */ sw $ra, 0x10($sp) -/* A1D988 80242888 00031080 */ sll $v0, $v1, 2 -/* A1D98C 8024288C 00431021 */ addu $v0, $v0, $v1 -/* A1D990 80242890 00021080 */ sll $v0, $v0, 2 -/* A1D994 80242894 00431023 */ subu $v0, $v0, $v1 -/* A1D998 80242898 000218C0 */ sll $v1, $v0, 3 -/* A1D99C 8024289C 00431021 */ addu $v0, $v0, $v1 -/* A1D9A0 802428A0 8C830020 */ lw $v1, 0x20($a0) -/* A1D9A4 802428A4 000210C0 */ sll $v0, $v0, 3 -/* A1D9A8 802428A8 8C630000 */ lw $v1, ($v1) -/* A1D9AC 802428AC 30630001 */ andi $v1, $v1, 1 -/* A1D9B0 802428B0 10600004 */ beqz $v1, .L802428C4 -/* A1D9B4 802428B4 00451021 */ addu $v0, $v0, $a1 -/* A1D9B8 802428B8 C44C006C */ lwc1 $f12, 0x6c($v0) -/* A1D9BC 802428BC 0C00A6C9 */ jal clamp_angle -/* A1D9C0 802428C0 46006307 */ neg.s $f12, $f12 -.L802428C4: -/* A1D9C4 802428C4 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D9C8 802428C8 03E00008 */ jr $ra -/* A1D9CC 802428CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_80242B90_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_80242B90_A1B100.s deleted file mode 100644 index ed37e193ff..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_80242B90_A1B100.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B90_A1DC90 -/* A1DC90 80242B90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A1DC94 80242B94 AFB00010 */ sw $s0, 0x10($sp) -/* A1DC98 80242B98 3C108011 */ lui $s0, %hi(gPlayerData) -/* A1DC9C 80242B9C 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* A1DCA0 80242BA0 AFBF0018 */ sw $ra, 0x18($sp) -/* A1DCA4 80242BA4 AFB10014 */ sw $s1, 0x14($sp) -/* A1DCA8 80242BA8 960302C0 */ lhu $v1, 0x2c0($s0) -/* A1DCAC 80242BAC 2C6203E7 */ sltiu $v0, $v1, 0x3e7 -/* A1DCB0 80242BB0 10400003 */ beqz $v0, .L80242BC0 -/* A1DCB4 80242BB4 0080882D */ daddu $s1, $a0, $zero -/* A1DCB8 80242BB8 24620001 */ addiu $v0, $v1, 1 -/* A1DCBC 80242BBC A60202C0 */ sh $v0, 0x2c0($s0) -.L80242BC0: -/* A1DCC0 80242BC0 3C05F5DE */ lui $a1, 0xf5de -/* A1DCC4 80242BC4 34A502E0 */ ori $a1, $a1, 0x2e0 -/* A1DCC8 80242BC8 0C0B1EAF */ jal get_variable -/* A1DCCC 80242BCC 0000202D */ daddu $a0, $zero, $zero -/* A1DCD0 80242BD0 3C038025 */ lui $v1, 0x8025 -/* A1DCD4 80242BD4 00621821 */ addu $v1, $v1, $v0 -/* A1DCD8 80242BD8 90638080 */ lbu $v1, -0x7f80($v1) -/* A1DCDC 80242BDC 8E220084 */ lw $v0, 0x84($s1) -/* A1DCE0 80242BE0 54430006 */ bnel $v0, $v1, .L80242BFC -/* A1DCE4 80242BE4 AE200084 */ sw $zero, 0x84($s1) -/* A1DCE8 80242BE8 24020001 */ addiu $v0, $zero, 1 -/* A1DCEC 80242BEC AE220084 */ sw $v0, 0x84($s1) -/* A1DCF0 80242BF0 960202C2 */ lhu $v0, 0x2c2($s0) -/* A1DCF4 80242BF4 24420001 */ addiu $v0, $v0, 1 -/* A1DCF8 80242BF8 A60202C2 */ sh $v0, 0x2c2($s0) -.L80242BFC: -/* A1DCFC 80242BFC 8FBF0018 */ lw $ra, 0x18($sp) -/* A1DD00 80242C00 8FB10014 */ lw $s1, 0x14($sp) -/* A1DD04 80242C04 8FB00010 */ lw $s0, 0x10($sp) -/* A1DD08 80242C08 24020002 */ addiu $v0, $zero, 2 -/* A1DD0C 80242C0C 03E00008 */ jr $ra -/* A1DD10 80242C10 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_80242E2C_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_80242E2C_A1B100.s deleted file mode 100644 index 280573941a..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_80242E2C_A1B100.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E2C_A1DF2C -/* A1DF2C 80242E2C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1DF30 80242E30 10A0000B */ beqz $a1, .L80242E60 -/* A1DF34 80242E34 AFBF0010 */ sw $ra, 0x10($sp) -/* A1DF38 80242E38 3C038025 */ lui $v1, 0x8025 -/* A1DF3C 80242E3C 8C63BDF4 */ lw $v1, -0x420c($v1) -/* A1DF40 80242E40 8C620000 */ lw $v0, ($v1) -/* A1DF44 80242E44 3C048025 */ lui $a0, 0x8025 -/* A1DF48 80242E48 8C84BDF8 */ lw $a0, -0x4208($a0) -/* A1DF4C 80242E4C 34420010 */ ori $v0, $v0, 0x10 -/* A1DF50 80242E50 AC620000 */ sw $v0, ($v1) -/* A1DF54 80242E54 8C820000 */ lw $v0, ($a0) -/* A1DF58 80242E58 34420010 */ ori $v0, $v0, 0x10 -/* A1DF5C 80242E5C AC820000 */ sw $v0, ($a0) -.L80242E60: -/* A1DF60 80242E60 3C048025 */ lui $a0, 0x8025 -/* A1DF64 80242E64 8C84BDF0 */ lw $a0, -0x4210($a0) -/* A1DF68 80242E68 8C85000C */ lw $a1, 0xc($a0) -/* A1DF6C 80242E6C 8CA20018 */ lw $v0, 0x18($a1) -/* A1DF70 80242E70 8CA30020 */ lw $v1, 0x20($a1) -/* A1DF74 80242E74 2442FFF6 */ addiu $v0, $v0, -0xa -/* A1DF78 80242E78 ACA20018 */ sw $v0, 0x18($a1) -/* A1DF7C 80242E7C 8CA20024 */ lw $v0, 0x24($a1) -/* A1DF80 80242E80 2463FFF6 */ addiu $v1, $v1, -0xa -/* A1DF84 80242E84 ACA30020 */ sw $v1, 0x20($a1) -/* A1DF88 80242E88 8CA30028 */ lw $v1, 0x28($a1) -/* A1DF8C 80242E8C 2442FFF6 */ addiu $v0, $v0, -0xa -/* A1DF90 80242E90 ACA20024 */ sw $v0, 0x24($a1) -/* A1DF94 80242E94 8CA2001C */ lw $v0, 0x1c($a1) -/* A1DF98 80242E98 2463FFF6 */ addiu $v1, $v1, -0xa -/* A1DF9C 80242E9C ACA30028 */ sw $v1, 0x28($a1) -/* A1DFA0 80242EA0 8CA30018 */ lw $v1, 0x18($a1) -/* A1DFA4 80242EA4 2442FFF6 */ addiu $v0, $v0, -0xa -/* A1DFA8 80242EA8 18600003 */ blez $v1, .L80242EB8 -/* A1DFAC 80242EAC ACA2001C */ sw $v0, 0x1c($a1) -/* A1DFB0 80242EB0 08090BB5 */ j .L80242ED4 -/* A1DFB4 80242EB4 0000102D */ daddu $v0, $zero, $zero -.L80242EB8: -/* A1DFB8 80242EB8 0C016914 */ jal remove_effect -/* A1DFBC 80242EBC ACA00018 */ sw $zero, 0x18($a1) -/* A1DFC0 80242EC0 3C048025 */ lui $a0, 0x8025 -/* A1DFC4 80242EC4 8C84BDD0 */ lw $a0, -0x4230($a0) -/* A1DFC8 80242EC8 0C048D70 */ jal func_801235C0 -/* A1DFCC 80242ECC 00000000 */ nop -/* A1DFD0 80242ED0 24020002 */ addiu $v0, $zero, 2 -.L80242ED4: -/* A1DFD4 80242ED4 8FBF0010 */ lw $ra, 0x10($sp) -/* A1DFD8 80242ED8 03E00008 */ jr $ra -/* A1DFDC 80242EDC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_80242FE0_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_80242FE0_A1B100.s deleted file mode 100644 index b17c26eeea..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_80242FE0_A1B100.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FE0_A1E0E0 -/* A1E0E0 80242FE0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1E0E4 80242FE4 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* A1E0E8 80242FE8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* A1E0EC 80242FEC 3C05FE36 */ lui $a1, 0xfe36 -/* A1E0F0 80242FF0 AFBF0010 */ sw $ra, 0x10($sp) -/* A1E0F4 80242FF4 80460075 */ lb $a2, 0x75($v0) -/* A1E0F8 80242FF8 0C0B2026 */ jal set_variable -/* A1E0FC 80242FFC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A1E100 80243000 8FBF0010 */ lw $ra, 0x10($sp) -/* A1E104 80243004 24020002 */ addiu $v0, $zero, 2 -/* A1E108 80243008 03E00008 */ jr $ra -/* A1E10C 8024300C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_80243010_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_80243010_A1B100.s deleted file mode 100644 index f5f24adf59..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_80243010_A1B100.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243010_A1E110 -/* A1E110 80243010 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A1E114 80243014 AFB10014 */ sw $s1, 0x14($sp) -/* A1E118 80243018 0080882D */ daddu $s1, $a0, $zero -/* A1E11C 8024301C AFBF0018 */ sw $ra, 0x18($sp) -/* A1E120 80243020 AFB00010 */ sw $s0, 0x10($sp) -/* A1E124 80243024 8E30000C */ lw $s0, 0xc($s1) -/* A1E128 80243028 8E050000 */ lw $a1, ($s0) -/* A1E12C 8024302C 0C0B1EAF */ jal get_variable -/* A1E130 80243030 26100004 */ addiu $s0, $s0, 4 -/* A1E134 80243034 0220202D */ daddu $a0, $s1, $zero -/* A1E138 80243038 8E050000 */ lw $a1, ($s0) -/* A1E13C 8024303C 0C0B210B */ jal get_float_variable -/* A1E140 80243040 0040802D */ daddu $s0, $v0, $zero -/* A1E144 80243044 24020002 */ addiu $v0, $zero, 2 -/* A1E148 80243048 00501804 */ sllv $v1, $s0, $v0 -/* A1E14C 8024304C 00701821 */ addu $v1, $v1, $s0 -/* A1E150 80243050 00431804 */ sllv $v1, $v1, $v0 -/* A1E154 80243054 00701823 */ subu $v1, $v1, $s0 -/* A1E158 80243058 000320C0 */ sll $a0, $v1, 3 -/* A1E15C 8024305C 00641821 */ addu $v1, $v1, $a0 -/* A1E160 80243060 000318C0 */ sll $v1, $v1, 3 -/* A1E164 80243064 3C01800B */ lui $at, 0x800b -/* A1E168 80243068 00230821 */ addu $at, $at, $v1 -/* A1E16C 8024306C E4201D98 */ swc1 $f0, 0x1d98($at) -/* A1E170 80243070 8FBF0018 */ lw $ra, 0x18($sp) -/* A1E174 80243074 8FB10014 */ lw $s1, 0x14($sp) -/* A1E178 80243078 8FB00010 */ lw $s0, 0x10($sp) -/* A1E17C 8024307C 03E00008 */ jr $ra -/* A1E180 80243080 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_80243084_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_80243084_A1B100.s deleted file mode 100644 index 67116b2bc8..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_80243084_A1B100.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243084_A1E184 -/* A1E184 80243084 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A1E188 80243088 AFB10014 */ sw $s1, 0x14($sp) -/* A1E18C 8024308C 0080882D */ daddu $s1, $a0, $zero -/* A1E190 80243090 AFBF0018 */ sw $ra, 0x18($sp) -/* A1E194 80243094 AFB00010 */ sw $s0, 0x10($sp) -/* A1E198 80243098 8E30000C */ lw $s0, 0xc($s1) -/* A1E19C 8024309C 8E050000 */ lw $a1, ($s0) -/* A1E1A0 802430A0 0C0B1EAF */ jal get_variable -/* A1E1A4 802430A4 26100004 */ addiu $s0, $s0, 4 -/* A1E1A8 802430A8 00021880 */ sll $v1, $v0, 2 -/* A1E1AC 802430AC 00621821 */ addu $v1, $v1, $v0 -/* A1E1B0 802430B0 00031880 */ sll $v1, $v1, 2 -/* A1E1B4 802430B4 00621823 */ subu $v1, $v1, $v0 -/* A1E1B8 802430B8 000310C0 */ sll $v0, $v1, 3 -/* A1E1BC 802430BC 00621821 */ addu $v1, $v1, $v0 -/* A1E1C0 802430C0 000318C0 */ sll $v1, $v1, 3 -/* A1E1C4 802430C4 3C01800B */ lui $at, 0x800b -/* A1E1C8 802430C8 00230821 */ addu $at, $at, $v1 -/* A1E1CC 802430CC C4221D98 */ lwc1 $f2, 0x1d98($at) -/* A1E1D0 802430D0 3C014480 */ lui $at, 0x4480 -/* A1E1D4 802430D4 44810000 */ mtc1 $at, $f0 -/* A1E1D8 802430D8 00000000 */ nop -/* A1E1DC 802430DC 46001082 */ mul.s $f2, $f2, $f0 -/* A1E1E0 802430E0 00000000 */ nop -/* A1E1E4 802430E4 3C01CD5B */ lui $at, 0xcd5b -/* A1E1E8 802430E8 34215858 */ ori $at, $at, 0x5858 -/* A1E1EC 802430EC 44810000 */ mtc1 $at, $f0 -/* A1E1F0 802430F0 00000000 */ nop -/* A1E1F4 802430F4 46001080 */ add.s $f2, $f2, $f0 -/* A1E1F8 802430F8 8E050000 */ lw $a1, ($s0) -/* A1E1FC 802430FC 4600110D */ trunc.w.s $f4, $f2 -/* A1E200 80243100 44062000 */ mfc1 $a2, $f4 -/* A1E204 80243104 0C0B2026 */ jal set_variable -/* A1E208 80243108 0220202D */ daddu $a0, $s1, $zero -/* A1E20C 8024310C 8FBF0018 */ lw $ra, 0x18($sp) -/* A1E210 80243110 8FB10014 */ lw $s1, 0x14($sp) -/* A1E214 80243114 8FB00010 */ lw $s0, 0x10($sp) -/* A1E218 80243118 24020002 */ addiu $v0, $zero, 2 -/* A1E21C 8024311C 03E00008 */ jr $ra -/* A1E220 80243120 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_80243124_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_80243124_A1B100.s deleted file mode 100644 index a559277c47..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_80243124_A1B100.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243124_A1E224 -/* A1E224 80243124 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A1E228 80243128 AFB20018 */ sw $s2, 0x18($sp) -/* A1E22C 8024312C 0080902D */ daddu $s2, $a0, $zero -/* A1E230 80243130 AFBF0030 */ sw $ra, 0x30($sp) -/* A1E234 80243134 AFB7002C */ sw $s7, 0x2c($sp) -/* A1E238 80243138 AFB60028 */ sw $s6, 0x28($sp) -/* A1E23C 8024313C AFB50024 */ sw $s5, 0x24($sp) -/* A1E240 80243140 AFB40020 */ sw $s4, 0x20($sp) -/* A1E244 80243144 AFB3001C */ sw $s3, 0x1c($sp) -/* A1E248 80243148 AFB10014 */ sw $s1, 0x14($sp) -/* A1E24C 8024314C AFB00010 */ sw $s0, 0x10($sp) -/* A1E250 80243150 F7B60040 */ sdc1 $f22, 0x40($sp) -/* A1E254 80243154 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A1E258 80243158 8E50000C */ lw $s0, 0xc($s2) -/* A1E25C 8024315C 8E050000 */ lw $a1, ($s0) -/* A1E260 80243160 0C0B1EAF */ jal get_variable -/* A1E264 80243164 26100004 */ addiu $s0, $s0, 4 -/* A1E268 80243168 8E050000 */ lw $a1, ($s0) -/* A1E26C 8024316C 26100004 */ addiu $s0, $s0, 4 -/* A1E270 80243170 0240202D */ daddu $a0, $s2, $zero -/* A1E274 80243174 0C0B1EAF */ jal get_variable -/* A1E278 80243178 0040B82D */ daddu $s7, $v0, $zero -/* A1E27C 8024317C 8E050000 */ lw $a1, ($s0) -/* A1E280 80243180 26100004 */ addiu $s0, $s0, 4 -/* A1E284 80243184 0240202D */ daddu $a0, $s2, $zero -/* A1E288 80243188 0C0B1EAF */ jal get_variable -/* A1E28C 8024318C 0040B02D */ daddu $s6, $v0, $zero -/* A1E290 80243190 0240202D */ daddu $a0, $s2, $zero -/* A1E294 80243194 3C05F4AC */ lui $a1, 0xf4ac -/* A1E298 80243198 34A5D481 */ ori $a1, $a1, 0xd481 -/* A1E29C 8024319C 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* A1E2A0 802431A0 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* A1E2A4 802431A4 8E140000 */ lw $s4, ($s0) -/* A1E2A8 802431A8 00061880 */ sll $v1, $a2, 2 -/* A1E2AC 802431AC 00661821 */ addu $v1, $v1, $a2 -/* A1E2B0 802431B0 00031880 */ sll $v1, $v1, 2 -/* A1E2B4 802431B4 00661823 */ subu $v1, $v1, $a2 -/* A1E2B8 802431B8 000330C0 */ sll $a2, $v1, 3 -/* A1E2BC 802431BC 00661821 */ addu $v1, $v1, $a2 -/* A1E2C0 802431C0 000318C0 */ sll $v1, $v1, 3 -/* A1E2C4 802431C4 3C01800B */ lui $at, 0x800b -/* A1E2C8 802431C8 00230821 */ addu $at, $at, $v1 -/* A1E2CC 802431CC C4201DEC */ lwc1 $f0, 0x1dec($at) -/* A1E2D0 802431D0 8E150004 */ lw $s5, 4($s0) -/* A1E2D4 802431D4 4600010D */ trunc.w.s $f4, $f0 -/* A1E2D8 802431D8 44112000 */ mfc1 $s1, $f4 -/* A1E2DC 802431DC 0C0B1EAF */ jal get_variable -/* A1E2E0 802431E0 0040982D */ daddu $s3, $v0, $zero -/* A1E2E4 802431E4 4491B000 */ mtc1 $s1, $f22 -/* A1E2E8 802431E8 00000000 */ nop -/* A1E2EC 802431EC 4680B5A0 */ cvt.s.w $f22, $f22 -/* A1E2F0 802431F0 4600B306 */ mov.s $f12, $f22 -/* A1E2F4 802431F4 0C00A8D4 */ jal cos_deg -/* A1E2F8 802431F8 0040802D */ daddu $s0, $v0, $zero -/* A1E2FC 802431FC 4493A000 */ mtc1 $s3, $f20 -/* A1E300 80243200 00000000 */ nop -/* A1E304 80243204 4680A520 */ cvt.s.w $f20, $f20 -/* A1E308 80243208 4600A002 */ mul.s $f0, $f20, $f0 -/* A1E30C 8024320C 00000000 */ nop -/* A1E310 80243210 0240202D */ daddu $a0, $s2, $zero -/* A1E314 80243214 44901000 */ mtc1 $s0, $f2 -/* A1E318 80243218 00000000 */ nop -/* A1E31C 8024321C 468010A0 */ cvt.s.w $f2, $f2 -/* A1E320 80243220 46001081 */ sub.s $f2, $f2, $f0 -/* A1E324 80243224 3C05F4AC */ lui $a1, 0xf4ac -/* A1E328 80243228 4600110D */ trunc.w.s $f4, $f2 -/* A1E32C 8024322C 44102000 */ mfc1 $s0, $f4 -/* A1E330 80243230 0C0B1EAF */ jal get_variable -/* A1E334 80243234 34A5D483 */ ori $a1, $a1, 0xd483 -/* A1E338 80243238 4600B306 */ mov.s $f12, $f22 -/* A1E33C 8024323C 0C00A8BB */ jal sin_deg -/* A1E340 80243240 0040882D */ daddu $s1, $v0, $zero -/* A1E344 80243244 4600A502 */ mul.s $f20, $f20, $f0 -/* A1E348 80243248 00000000 */ nop -/* A1E34C 8024324C 0240202D */ daddu $a0, $s2, $zero -/* A1E350 80243250 44910000 */ mtc1 $s1, $f0 -/* A1E354 80243254 00000000 */ nop -/* A1E358 80243258 46800020 */ cvt.s.w $f0, $f0 -/* A1E35C 8024325C 46140001 */ sub.s $f0, $f0, $f20 -/* A1E360 80243260 0280282D */ daddu $a1, $s4, $zero -/* A1E364 80243264 02173023 */ subu $a2, $s0, $s7 -/* A1E368 80243268 4600010D */ trunc.w.s $f4, $f0 -/* A1E36C 8024326C 44102000 */ mfc1 $s0, $f4 -/* A1E370 80243270 0C0B2026 */ jal set_variable -/* A1E374 80243274 02168023 */ subu $s0, $s0, $s6 -/* A1E378 80243278 0240202D */ daddu $a0, $s2, $zero -/* A1E37C 8024327C 02A0282D */ daddu $a1, $s5, $zero -/* A1E380 80243280 0C0B2026 */ jal set_variable -/* A1E384 80243284 0200302D */ daddu $a2, $s0, $zero -/* A1E388 80243288 8FBF0030 */ lw $ra, 0x30($sp) -/* A1E38C 8024328C 8FB7002C */ lw $s7, 0x2c($sp) -/* A1E390 80243290 8FB60028 */ lw $s6, 0x28($sp) -/* A1E394 80243294 8FB50024 */ lw $s5, 0x24($sp) -/* A1E398 80243298 8FB40020 */ lw $s4, 0x20($sp) -/* A1E39C 8024329C 8FB3001C */ lw $s3, 0x1c($sp) -/* A1E3A0 802432A0 8FB20018 */ lw $s2, 0x18($sp) -/* A1E3A4 802432A4 8FB10014 */ lw $s1, 0x14($sp) -/* A1E3A8 802432A8 8FB00010 */ lw $s0, 0x10($sp) -/* A1E3AC 802432AC D7B60040 */ ldc1 $f22, 0x40($sp) -/* A1E3B0 802432B0 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A1E3B4 802432B4 24020002 */ addiu $v0, $zero, 2 -/* A1E3B8 802432B8 03E00008 */ jr $ra -/* A1E3BC 802432BC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_hos/hos_03/func_802432C0_A1B100.s b/asm/nonmatchings/world/area_hos/hos_03/func_802432C0_A1B100.s deleted file mode 100644 index ee127bf8d8..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/func_802432C0_A1B100.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802432C0_A1E3C0 -/* A1E3C0 802432C0 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* A1E3C4 802432C4 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* A1E3C8 802432C8 10A00002 */ beqz $a1, .L802432D4 -/* A1E3CC 802432CC 2402003C */ addiu $v0, $zero, 0x3c -/* A1E3D0 802432D0 AC820070 */ sw $v0, 0x70($a0) -.L802432D4: -/* A1E3D4 802432D4 C4620080 */ lwc1 $f2, 0x80($v1) -/* A1E3D8 802432D8 3C0141F0 */ lui $at, 0x41f0 -/* A1E3DC 802432DC 44810000 */ mtc1 $at, $f0 -/* A1E3E0 802432E0 00000000 */ nop -/* A1E3E4 802432E4 46001000 */ add.s $f0, $f2, $f0 -/* A1E3E8 802432E8 3C0143B4 */ lui $at, 0x43b4 -/* A1E3EC 802432EC 44811000 */ mtc1 $at, $f2 -/* A1E3F0 802432F0 00000000 */ nop -/* A1E3F4 802432F4 4600103E */ c.le.s $f2, $f0 -/* A1E3F8 802432F8 00000000 */ nop -/* A1E3FC 802432FC 45000003 */ bc1f .L8024330C -/* A1E400 80243300 E4600080 */ swc1 $f0, 0x80($v1) -/* A1E404 80243304 46020001 */ sub.s $f0, $f0, $f2 -/* A1E408 80243308 E4600080 */ swc1 $f0, 0x80($v1) -.L8024330C: -/* A1E40C 8024330C 8C820070 */ lw $v0, 0x70($a0) -/* A1E410 80243310 2442FFFF */ addiu $v0, $v0, -1 -/* A1E414 80243314 AC820070 */ sw $v0, 0x70($a0) -/* A1E418 80243318 000217C3 */ sra $v0, $v0, 0x1f -/* A1E41C 8024331C 03E00008 */ jr $ra -/* A1E420 80243320 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_04/func_80240154_A26ED0.s b/asm/nonmatchings/world/area_hos/hos_04/func_80240154_A26ED0.s deleted file mode 100644 index 30a63b281b..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/func_80240154_A26ED0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240154_A27024 -/* A27024 80240154 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A27028 80240158 AFB00010 */ sw $s0, 0x10($sp) -/* A2702C 8024015C 3C108024 */ lui $s0, 0x8024 -/* A27030 80240160 261016F0 */ addiu $s0, $s0, 0x16f0 -/* A27034 80240164 AFBF001C */ sw $ra, 0x1c($sp) -/* A27038 80240168 AFB20018 */ sw $s2, 0x18($sp) -/* A2703C 8024016C AFB10014 */ sw $s1, 0x14($sp) -/* A27040 80240170 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A27044 80240174 96020000 */ lhu $v0, ($s0) -/* A27048 80240178 3C013D00 */ lui $at, 0x3d00 -/* A2704C 8024017C 44810000 */ mtc1 $at, $f0 -/* A27050 80240180 44826000 */ mtc1 $v0, $f12 -/* A27054 80240184 00000000 */ nop -/* A27058 80240188 46806320 */ cvt.s.w $f12, $f12 -/* A2705C 8024018C 46006302 */ mul.s $f12, $f12, $f0 -/* A27060 80240190 00000000 */ nop -/* A27064 80240194 0C00A85B */ jal sin_rad -/* A27068 80240198 3C120001 */ lui $s2, 1 -/* A2706C 8024019C 3C014120 */ lui $at, 0x4120 -/* A27070 802401A0 44811000 */ mtc1 $at, $f2 -/* A27074 802401A4 00000000 */ nop -/* A27078 802401A8 46020502 */ mul.s $f20, $f0, $f2 -/* A2707C 802401AC 00000000 */ nop -/* A27080 802401B0 96020000 */ lhu $v0, ($s0) -/* A27084 802401B4 3C013E80 */ lui $at, 0x3e80 -/* A27088 802401B8 44810000 */ mtc1 $at, $f0 -/* A2708C 802401BC 44826000 */ mtc1 $v0, $f12 -/* A27090 802401C0 00000000 */ nop -/* A27094 802401C4 46806320 */ cvt.s.w $f12, $f12 -/* A27098 802401C8 46006302 */ mul.s $f12, $f12, $f0 -/* A2709C 802401CC 00000000 */ nop -/* A270A0 802401D0 36521630 */ ori $s2, $s2, 0x1630 -/* A270A4 802401D4 3C013FF8 */ lui $at, 0x3ff8 -/* A270A8 802401D8 44810800 */ mtc1 $at, $f1 -/* A270AC 802401DC 44800000 */ mtc1 $zero, $f0 -/* A270B0 802401E0 4600A521 */ cvt.d.s $f20, $f20 -/* A270B4 802401E4 0C00A85B */ jal sin_rad -/* A270B8 802401E8 4620A500 */ add.d $f20, $f20, $f0 -/* A270BC 802401EC 3C014004 */ lui $at, 0x4004 -/* A270C0 802401F0 44811800 */ mtc1 $at, $f3 -/* A270C4 802401F4 44801000 */ mtc1 $zero, $f2 -/* A270C8 802401F8 46000021 */ cvt.d.s $f0, $f0 -/* A270CC 802401FC 46220002 */ mul.d $f0, $f0, $f2 -/* A270D0 80240200 00000000 */ nop -/* A270D4 80240204 3C108007 */ lui $s0, 0x8007 -/* A270D8 80240208 261041F0 */ addiu $s0, $s0, 0x41f0 -/* A270DC 8024020C 3C11800A */ lui $s1, 0x800a -/* A270E0 80240210 2631A674 */ addiu $s1, $s1, -0x598c -/* A270E4 80240214 96040000 */ lhu $a0, ($s0) -/* A270E8 80240218 8E220000 */ lw $v0, ($s1) -/* A270EC 8024021C 00042180 */ sll $a0, $a0, 6 -/* A270F0 80240220 00922021 */ addu $a0, $a0, $s2 -/* A270F4 80240224 44801000 */ mtc1 $zero, $f2 -/* A270F8 80240228 4620A500 */ add.d $f20, $f20, $f0 -/* A270FC 8024022C 00442021 */ addu $a0, $v0, $a0 -/* A27100 80240230 44051000 */ mfc1 $a1, $f2 -/* A27104 80240234 4620A520 */ cvt.s.d $f20, $f20 -/* A27108 80240238 4406A000 */ mfc1 $a2, $f20 -/* A2710C 8024023C 0C019E08 */ jal guTranslate -/* A27110 80240240 00A0382D */ daddu $a3, $a1, $zero -/* A27114 80240244 3C05DA38 */ lui $a1, 0xda38 -/* A27118 80240248 3C04800A */ lui $a0, 0x800a -/* A2711C 8024024C 2484A66C */ addiu $a0, $a0, -0x5994 -/* A27120 80240250 34A50001 */ ori $a1, $a1, 1 -/* A27124 80240254 8C830000 */ lw $v1, ($a0) -/* A27128 80240258 96020000 */ lhu $v0, ($s0) -/* A2712C 8024025C 0060302D */ daddu $a2, $v1, $zero -/* A27130 80240260 24630008 */ addiu $v1, $v1, 8 -/* A27134 80240264 AC830000 */ sw $v1, ($a0) -/* A27138 80240268 24430001 */ addiu $v1, $v0, 1 -/* A2713C 8024026C 3042FFFF */ andi $v0, $v0, 0xffff -/* A27140 80240270 00021180 */ sll $v0, $v0, 6 -/* A27144 80240274 ACC50000 */ sw $a1, ($a2) -/* A27148 80240278 A6030000 */ sh $v1, ($s0) -/* A2714C 8024027C 8E230000 */ lw $v1, ($s1) -/* A27150 80240280 00521021 */ addu $v0, $v0, $s2 -/* A27154 80240284 00621821 */ addu $v1, $v1, $v0 -/* A27158 80240288 ACC30004 */ sw $v1, 4($a2) -/* A2715C 8024028C 8FBF001C */ lw $ra, 0x1c($sp) -/* A27160 80240290 8FB20018 */ lw $s2, 0x18($sp) -/* A27164 80240294 8FB10014 */ lw $s1, 0x14($sp) -/* A27168 80240298 8FB00010 */ lw $s0, 0x10($sp) -/* A2716C 8024029C D7B40020 */ ldc1 $f20, 0x20($sp) -/* A27170 802402A0 03E00008 */ jr $ra -/* A27174 802402A4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_04/func_802405E0_A26ED0.s b/asm/nonmatchings/world/area_hos/hos_04/func_802405E0_A26ED0.s deleted file mode 100644 index ac1e88224b..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/func_802405E0_A26ED0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405E0_A274B0 -/* A274B0 802405E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A274B4 802405E4 AFB10014 */ sw $s1, 0x14($sp) -/* A274B8 802405E8 0080882D */ daddu $s1, $a0, $zero -/* A274BC 802405EC AFBF0018 */ sw $ra, 0x18($sp) -/* A274C0 802405F0 AFB00010 */ sw $s0, 0x10($sp) -/* A274C4 802405F4 8E30000C */ lw $s0, 0xc($s1) -/* A274C8 802405F8 8E050000 */ lw $a1, ($s0) -/* A274CC 802405FC 0C0B1EAF */ jal get_variable -/* A274D0 80240600 26100004 */ addiu $s0, $s0, 4 -/* A274D4 80240604 0220202D */ daddu $a0, $s1, $zero -/* A274D8 80240608 8E050000 */ lw $a1, ($s0) -/* A274DC 8024060C 0C0B210B */ jal get_float_variable -/* A274E0 80240610 0040802D */ daddu $s0, $v0, $zero -/* A274E4 80240614 24020002 */ addiu $v0, $zero, 2 -/* A274E8 80240618 00501804 */ sllv $v1, $s0, $v0 -/* A274EC 8024061C 00701821 */ addu $v1, $v1, $s0 -/* A274F0 80240620 00431804 */ sllv $v1, $v1, $v0 -/* A274F4 80240624 00701823 */ subu $v1, $v1, $s0 -/* A274F8 80240628 000320C0 */ sll $a0, $v1, 3 -/* A274FC 8024062C 00641821 */ addu $v1, $v1, $a0 -/* A27500 80240630 000318C0 */ sll $v1, $v1, 3 -/* A27504 80240634 3C01800B */ lui $at, 0x800b -/* A27508 80240638 00230821 */ addu $at, $at, $v1 -/* A2750C 8024063C E4201D98 */ swc1 $f0, 0x1d98($at) -/* A27510 80240640 8FBF0018 */ lw $ra, 0x18($sp) -/* A27514 80240644 8FB10014 */ lw $s1, 0x14($sp) -/* A27518 80240648 8FB00010 */ lw $s0, 0x10($sp) -/* A2751C 8024064C 03E00008 */ jr $ra -/* A27520 80240650 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_04/func_80240694_A26ED0.s b/asm/nonmatchings/world/area_hos/hos_04/func_80240694_A26ED0.s deleted file mode 100644 index 3628e9dae4..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/func_80240694_A26ED0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240694_A27564 -/* A27564 80240694 460C7301 */ sub.s $f12, $f14, $f12 -/* A27568 80240698 44863000 */ mtc1 $a2, $f6 -/* A2756C 8024069C 44800000 */ mtc1 $zero, $f0 -/* A27570 802406A0 44872000 */ mtc1 $a3, $f4 -/* A27574 802406A4 8FA20010 */ lw $v0, 0x10($sp) -/* A27578 802406A8 460C003C */ c.lt.s $f0, $f12 -/* A2757C 802406AC 00000000 */ nop -/* A27580 802406B0 4500000F */ bc1f .L802406F0 -/* A27584 802406B4 46067081 */ sub.s $f2, $f14, $f6 -/* A27588 802406B8 4600103C */ c.lt.s $f2, $f0 -/* A2758C 802406BC 00000000 */ nop -/* A27590 802406C0 45000003 */ bc1f .L802406D0 -/* A27594 802406C4 00000000 */ nop -.L802406C8: -/* A27598 802406C8 03E00008 */ jr $ra -/* A2759C 802406CC E44E0000 */ swc1 $f14, ($v0) -.L802406D0: -/* A275A0 802406D0 4602203C */ c.lt.s $f4, $f2 -/* A275A4 802406D4 00000000 */ nop -/* A275A8 802406D8 45000012 */ bc1f .L80240724 -/* A275AC 802406DC 00000000 */ nop -/* A275B0 802406E0 C4400000 */ lwc1 $f0, ($v0) -/* A275B4 802406E4 46040000 */ add.s $f0, $f0, $f4 -/* A275B8 802406E8 03E00008 */ jr $ra -/* A275BC 802406EC E4400000 */ swc1 $f0, ($v0) -.L802406F0: -/* A275C0 802406F0 4602003C */ c.lt.s $f0, $f2 -/* A275C4 802406F4 00000000 */ nop -/* A275C8 802406F8 4501FFF3 */ bc1t .L802406C8 -/* A275CC 802406FC 00000000 */ nop -/* A275D0 80240700 46002007 */ neg.s $f0, $f4 -/* A275D4 80240704 4600103C */ c.lt.s $f2, $f0 -/* A275D8 80240708 00000000 */ nop -/* A275DC 8024070C 45000005 */ bc1f .L80240724 -/* A275E0 80240710 00000000 */ nop -/* A275E4 80240714 C4400000 */ lwc1 $f0, ($v0) -/* A275E8 80240718 46040001 */ sub.s $f0, $f0, $f4 -/* A275EC 8024071C 03E00008 */ jr $ra -/* A275F0 80240720 E4400000 */ swc1 $f0, ($v0) -.L80240724: -/* A275F4 80240724 C4400000 */ lwc1 $f0, ($v0) -/* A275F8 80240728 46020000 */ add.s $f0, $f0, $f2 -/* A275FC 8024072C 03E00008 */ jr $ra -/* A27600 80240730 E4400000 */ swc1 $f0, ($v0) diff --git a/asm/nonmatchings/world/area_hos/hos_04/func_80240734_A26ED0.s b/asm/nonmatchings/world/area_hos/hos_04/func_80240734_A26ED0.s deleted file mode 100644 index a6b1d6ab1a..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/func_80240734_A26ED0.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240734_A27604 -/* A27604 80240734 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A27608 80240738 F7B40018 */ sdc1 $f20, 0x18($sp) -/* A2760C 8024073C 4485A000 */ mtc1 $a1, $f20 -/* A27610 80240740 F7B60020 */ sdc1 $f22, 0x20($sp) -/* A27614 80240744 4486B000 */ mtc1 $a2, $f22 -/* A27618 80240748 44876000 */ mtc1 $a3, $f12 -/* A2761C 8024074C C7A20038 */ lwc1 $f2, 0x38($sp) -/* A27620 80240750 460C103C */ c.lt.s $f2, $f12 -/* A27624 80240754 00000000 */ nop -/* A27628 80240758 45000002 */ bc1f .L80240764 -/* A2762C 8024075C AFBF0010 */ sw $ra, 0x10($sp) -/* A27630 80240760 46001306 */ mov.s $f12, $f2 -.L80240764: -/* A27634 80240764 2484FFFF */ addiu $a0, $a0, -1 -/* A27638 80240768 2C820005 */ sltiu $v0, $a0, 5 -/* A2763C 8024076C 10400056 */ beqz $v0, .L802408C8 -/* A27640 80240770 00041080 */ sll $v0, $a0, 2 -/* A27644 80240774 3C018024 */ lui $at, 0x8024 -/* A27648 80240778 00220821 */ addu $at, $at, $v0 -/* A2764C 8024077C 8C223310 */ lw $v0, 0x3310($at) -/* A27650 80240780 00400008 */ jr $v0 -/* A27654 80240784 00000000 */ nop -/* A27658 80240788 3C0142B4 */ lui $at, 0x42b4 -/* A2765C 8024078C 44810000 */ mtc1 $at, $f0 -/* A27660 80240790 46026303 */ div.s $f12, $f12, $f2 -/* A27664 80240794 46006302 */ mul.s $f12, $f12, $f0 -/* A27668 80240798 0C00A8BB */ jal sin_deg -/* A2766C 8024079C 00000000 */ nop -/* A27670 802407A0 08090233 */ j .L802408CC -/* A27674 802407A4 46000306 */ mov.s $f12, $f0 -/* A27678 802407A8 3C0141F0 */ lui $at, 0x41f0 -/* A2767C 802407AC 44810000 */ mtc1 $at, $f0 -/* A27680 802407B0 00000000 */ nop -/* A27684 802407B4 4600603C */ c.lt.s $f12, $f0 -/* A27688 802407B8 00000000 */ nop -/* A2768C 802407BC 45020004 */ bc1fl .L802407D0 -/* A27690 802407C0 46006301 */ sub.s $f12, $f12, $f0 -/* A27694 802407C4 44806000 */ mtc1 $zero, $f12 -/* A27698 802407C8 08090234 */ j .L802408D0 -/* A2769C 802407CC 4614B001 */ sub.s $f0, $f22, $f20 -.L802407D0: -/* A276A0 802407D0 46001001 */ sub.s $f0, $f2, $f0 -/* A276A4 802407D4 3C0142B4 */ lui $at, 0x42b4 -/* A276A8 802407D8 44811000 */ mtc1 $at, $f2 -/* A276AC 802407DC 46006303 */ div.s $f12, $f12, $f0 -/* A276B0 802407E0 46026302 */ mul.s $f12, $f12, $f2 -/* A276B4 802407E4 00000000 */ nop -/* A276B8 802407E8 3C01C2B4 */ lui $at, 0xc2b4 -/* A276BC 802407EC 44810000 */ mtc1 $at, $f0 -/* A276C0 802407F0 08090219 */ j .L80240864 -/* A276C4 802407F4 46006300 */ add.s $f12, $f12, $f0 -/* A276C8 802407F8 3C014334 */ lui $at, 0x4334 -/* A276CC 802407FC 44810000 */ mtc1 $at, $f0 -/* A276D0 80240800 46026303 */ div.s $f12, $f12, $f2 -/* A276D4 80240804 46006302 */ mul.s $f12, $f12, $f0 -/* A276D8 80240808 00000000 */ nop -/* A276DC 8024080C 3C0142B4 */ lui $at, 0x42b4 -/* A276E0 80240810 44810000 */ mtc1 $at, $f0 -/* A276E4 80240814 0C00A8BB */ jal sin_deg -/* A276E8 80240818 46006301 */ sub.s $f12, $f12, $f0 -/* A276EC 8024081C 3C013F80 */ lui $at, 0x3f80 -/* A276F0 80240820 44811000 */ mtc1 $at, $f2 -/* A276F4 80240824 00000000 */ nop -/* A276F8 80240828 46020000 */ add.s $f0, $f0, $f2 -/* A276FC 8024082C 3C013FE0 */ lui $at, 0x3fe0 -/* A27700 80240830 44811800 */ mtc1 $at, $f3 -/* A27704 80240834 44801000 */ mtc1 $zero, $f2 -/* A27708 80240838 46000021 */ cvt.d.s $f0, $f0 -/* A2770C 8024083C 46220002 */ mul.d $f0, $f0, $f2 -/* A27710 80240840 00000000 */ nop -/* A27714 80240844 08090233 */ j .L802408CC -/* A27718 80240848 46200320 */ cvt.s.d $f12, $f0 -/* A2771C 8024084C 3C0142B4 */ lui $at, 0x42b4 -/* A27720 80240850 44810000 */ mtc1 $at, $f0 -/* A27724 80240854 46026303 */ div.s $f12, $f12, $f2 -/* A27728 80240858 46006302 */ mul.s $f12, $f12, $f0 -/* A2772C 8024085C 00000000 */ nop -/* A27730 80240860 46006301 */ sub.s $f12, $f12, $f0 -.L80240864: -/* A27734 80240864 0C00A8BB */ jal sin_deg -/* A27738 80240868 00000000 */ nop -/* A2773C 8024086C 3C013F80 */ lui $at, 0x3f80 -/* A27740 80240870 44811000 */ mtc1 $at, $f2 -/* A27744 80240874 08090233 */ j .L802408CC -/* A27748 80240878 46020300 */ add.s $f12, $f0, $f2 -/* A2774C 8024087C 3C014270 */ lui $at, 0x4270 -/* A27750 80240880 44810000 */ mtc1 $at, $f0 -/* A27754 80240884 46026303 */ div.s $f12, $f12, $f2 -/* A27758 80240888 46006302 */ mul.s $f12, $f12, $f0 -/* A2775C 8024088C 00000000 */ nop -/* A27760 80240890 0C00A8BB */ jal sin_deg -/* A27764 80240894 46006301 */ sub.s $f12, $f12, $f0 -/* A27768 80240898 3C013F5D */ lui $at, 0x3f5d -/* A2776C 8024089C 3421B3D7 */ ori $at, $at, 0xb3d7 -/* A27770 802408A0 44811000 */ mtc1 $at, $f2 -/* A27774 802408A4 00000000 */ nop -/* A27778 802408A8 46020000 */ add.s $f0, $f0, $f2 -/* A2777C 802408AC 46000021 */ cvt.d.s $f0, $f0 -/* A27780 802408B0 46200000 */ add.d $f0, $f0, $f0 -/* A27784 802408B4 3C018024 */ lui $at, 0x8024 -/* A27788 802408B8 D4223328 */ ldc1 $f2, 0x3328($at) -/* A2778C 802408BC 46220003 */ div.d $f0, $f0, $f2 -/* A27790 802408C0 08090233 */ j .L802408CC -/* A27794 802408C4 46200320 */ cvt.s.d $f12, $f0 -.L802408C8: -/* A27798 802408C8 46026303 */ div.s $f12, $f12, $f2 -.L802408CC: -/* A2779C 802408CC 4614B001 */ sub.s $f0, $f22, $f20 -.L802408D0: -/* A277A0 802408D0 460C0002 */ mul.s $f0, $f0, $f12 -/* A277A4 802408D4 00000000 */ nop -/* A277A8 802408D8 4600A000 */ add.s $f0, $f20, $f0 -/* A277AC 802408DC 8FA2003C */ lw $v0, 0x3c($sp) -/* A277B0 802408E0 E4400000 */ swc1 $f0, ($v0) -/* A277B4 802408E4 8FBF0010 */ lw $ra, 0x10($sp) -/* A277B8 802408E8 D7B60020 */ ldc1 $f22, 0x20($sp) -/* A277BC 802408EC D7B40018 */ ldc1 $f20, 0x18($sp) -/* A277C0 802408F0 03E00008 */ jr $ra -/* A277C4 802408F4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_04/func_80240BD0_A26ED0.s b/asm/nonmatchings/world/area_hos/hos_04/func_80240BD0_A26ED0.s deleted file mode 100644 index 9334cf0cae..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/func_80240BD0_A26ED0.s +++ /dev/null @@ -1,171 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BD0_A27AA0 -/* A27AA0 80240BD0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A27AA4 80240BD4 3C038024 */ lui $v1, 0x8024 -/* A27AA8 80240BD8 24633258 */ addiu $v1, $v1, 0x3258 -/* A27AAC 80240BDC AFBF0034 */ sw $ra, 0x34($sp) -/* A27AB0 80240BE0 AFB20030 */ sw $s2, 0x30($sp) -/* A27AB4 80240BE4 AFB1002C */ sw $s1, 0x2c($sp) -/* A27AB8 80240BE8 AFB00028 */ sw $s0, 0x28($sp) -/* A27ABC 80240BEC 8C620000 */ lw $v0, ($v1) -/* A27AC0 80240BF0 14400007 */ bnez $v0, .L80240C10 -/* A27AC4 80240BF4 00000000 */ nop -/* A27AC8 80240BF8 3C028007 */ lui $v0, %hi(D_800779B0) -/* A27ACC 80240BFC 904279B0 */ lbu $v0, %lo(D_800779B0)($v0) -/* A27AD0 80240C00 00021080 */ sll $v0, $v0, 2 -/* A27AD4 80240C04 00441021 */ addu $v0, $v0, $a0 -/* A27AD8 80240C08 8C420000 */ lw $v0, ($v0) -/* A27ADC 80240C0C AC620000 */ sw $v0, ($v1) -.L80240C10: -/* A27AE0 80240C10 3C038024 */ lui $v1, 0x8024 -/* A27AE4 80240C14 8C633250 */ lw $v1, 0x3250($v1) -/* A27AE8 80240C18 2C620005 */ sltiu $v0, $v1, 5 -/* A27AEC 80240C1C 10400050 */ beqz $v0, .L80240D60 -/* A27AF0 80240C20 00031080 */ sll $v0, $v1, 2 -/* A27AF4 80240C24 3C018024 */ lui $at, 0x8024 -/* A27AF8 80240C28 00220821 */ addu $at, $at, $v0 -/* A27AFC 80240C2C 8C223358 */ lw $v0, 0x3358($at) -/* A27B00 80240C30 00400008 */ jr $v0 -/* A27B04 80240C34 00000000 */ nop -/* A27B08 80240C38 3C048024 */ lui $a0, 0x8024 -/* A27B0C 80240C3C 8C843258 */ lw $a0, 0x3258($a0) -/* A27B10 80240C40 8C830000 */ lw $v1, ($a0) -/* A27B14 80240C44 2402FFFF */ addiu $v0, $zero, -1 -/* A27B18 80240C48 14620004 */ bne $v1, $v0, .L80240C5C -/* A27B1C 80240C4C 24020004 */ addiu $v0, $zero, 4 -/* A27B20 80240C50 8C830004 */ lw $v1, 4($a0) -/* A27B24 80240C54 08090323 */ j .L80240C8C -/* A27B28 80240C58 00000000 */ nop -.L80240C5C: -/* A27B2C 80240C5C 3C038024 */ lui $v1, 0x8024 -/* A27B30 80240C60 24633254 */ addiu $v1, $v1, 0x3254 -/* A27B34 80240C64 8C620000 */ lw $v0, ($v1) -/* A27B38 80240C68 2442000A */ addiu $v0, $v0, 0xa -/* A27B3C 80240C6C AC620000 */ sw $v0, ($v1) -/* A27B40 80240C70 28420100 */ slti $v0, $v0, 0x100 -/* A27B44 80240C74 5440003B */ bnel $v0, $zero, .L80240D64 -/* A27B48 80240C78 24040001 */ addiu $a0, $zero, 1 -/* A27B4C 80240C7C 240200FF */ addiu $v0, $zero, 0xff -/* A27B50 80240C80 AC620000 */ sw $v0, ($v1) -/* A27B54 80240C84 8C830004 */ lw $v1, 4($a0) -/* A27B58 80240C88 24020001 */ addiu $v0, $zero, 1 -.L80240C8C: -/* A27B5C 80240C8C 3C018024 */ lui $at, 0x8024 -/* A27B60 80240C90 AC223250 */ sw $v0, 0x3250($at) -/* A27B64 80240C94 3C018024 */ lui $at, 0x8024 -/* A27B68 80240C98 AC233380 */ sw $v1, 0x3380($at) -/* A27B6C 80240C9C 08090359 */ j .L80240D64 -/* A27B70 80240CA0 24040001 */ addiu $a0, $zero, 1 -/* A27B74 80240CA4 3C038024 */ lui $v1, 0x8024 -/* A27B78 80240CA8 24633380 */ addiu $v1, $v1, 0x3380 -/* A27B7C 80240CAC 8C620000 */ lw $v0, ($v1) -/* A27B80 80240CB0 1440001B */ bnez $v0, .L80240D20 -/* A27B84 80240CB4 2442FFFF */ addiu $v0, $v0, -1 -/* A27B88 80240CB8 24020002 */ addiu $v0, $zero, 2 -/* A27B8C 80240CBC 3C018024 */ lui $at, 0x8024 -/* A27B90 80240CC0 AC223250 */ sw $v0, 0x3250($at) -/* A27B94 80240CC4 08090359 */ j .L80240D64 -/* A27B98 80240CC8 24040001 */ addiu $a0, $zero, 1 -/* A27B9C 80240CCC 3C048024 */ lui $a0, 0x8024 -/* A27BA0 80240CD0 24843254 */ addiu $a0, $a0, 0x3254 -/* A27BA4 80240CD4 8C820000 */ lw $v0, ($a0) -/* A27BA8 80240CD8 2442FFF6 */ addiu $v0, $v0, -0xa -/* A27BAC 80240CDC 04410020 */ bgez $v0, .L80240D60 -/* A27BB0 80240CE0 AC820000 */ sw $v0, ($a0) -/* A27BB4 80240CE4 3C028024 */ lui $v0, 0x8024 -/* A27BB8 80240CE8 24423258 */ addiu $v0, $v0, 0x3258 -/* A27BBC 80240CEC 8C430000 */ lw $v1, ($v0) -/* A27BC0 80240CF0 AC800000 */ sw $zero, ($a0) -/* A27BC4 80240CF4 8C640008 */ lw $a0, 8($v1) -/* A27BC8 80240CF8 24630008 */ addiu $v1, $v1, 8 -/* A27BCC 80240CFC 10800011 */ beqz $a0, .L80240D44 -/* A27BD0 80240D00 AC430000 */ sw $v1, ($v0) -/* A27BD4 80240D04 08090356 */ j .L80240D58 -/* A27BD8 80240D08 00000000 */ nop -/* A27BDC 80240D0C 3C038024 */ lui $v1, 0x8024 -/* A27BE0 80240D10 24633380 */ addiu $v1, $v1, 0x3380 -/* A27BE4 80240D14 8C620000 */ lw $v0, ($v1) -/* A27BE8 80240D18 10400003 */ beqz $v0, .L80240D28 -/* A27BEC 80240D1C 2442FFFF */ addiu $v0, $v0, -1 -.L80240D20: -/* A27BF0 80240D20 08090358 */ j .L80240D60 -/* A27BF4 80240D24 AC620000 */ sw $v0, ($v1) -.L80240D28: -/* A27BF8 80240D28 3C028024 */ lui $v0, 0x8024 -/* A27BFC 80240D2C 24423258 */ addiu $v0, $v0, 0x3258 -/* A27C00 80240D30 8C430000 */ lw $v1, ($v0) -/* A27C04 80240D34 8C640008 */ lw $a0, 8($v1) -/* A27C08 80240D38 24630008 */ addiu $v1, $v1, 8 -/* A27C0C 80240D3C 14800006 */ bnez $a0, .L80240D58 -/* A27C10 80240D40 AC430000 */ sw $v1, ($v0) -.L80240D44: -/* A27C14 80240D44 24020003 */ addiu $v0, $zero, 3 -/* A27C18 80240D48 3C018024 */ lui $at, 0x8024 -/* A27C1C 80240D4C AC223250 */ sw $v0, 0x3250($at) -/* A27C20 80240D50 08090359 */ j .L80240D64 -/* A27C24 80240D54 24040001 */ addiu $a0, $zero, 1 -.L80240D58: -/* A27C28 80240D58 3C018024 */ lui $at, 0x8024 -/* A27C2C 80240D5C AC203250 */ sw $zero, 0x3250($at) -.L80240D60: -/* A27C30 80240D60 24040001 */ addiu $a0, $zero, 1 -.L80240D64: -/* A27C34 80240D64 27B00018 */ addiu $s0, $sp, 0x18 -/* A27C38 80240D68 0200282D */ daddu $a1, $s0, $zero -/* A27C3C 80240D6C 0C04DF70 */ jal func_80137DC0 -/* A27C40 80240D70 27A6001C */ addiu $a2, $sp, 0x1c -/* A27C44 80240D74 0000202D */ daddu $a0, $zero, $zero -/* A27C48 80240D78 0200282D */ daddu $a1, $s0, $zero -/* A27C4C 80240D7C 0C04DF70 */ jal func_80137DC0 -/* A27C50 80240D80 27A60020 */ addiu $a2, $sp, 0x20 -/* A27C54 80240D84 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* A27C58 80240D88 3C01437F */ lui $at, 0x437f -/* A27C5C 80240D8C 44812000 */ mtc1 $at, $f4 -/* A27C60 80240D90 00000000 */ nop -/* A27C64 80240D94 46022081 */ sub.s $f2, $f4, $f2 -/* A27C68 80240D98 3C018024 */ lui $at, 0x8024 -/* A27C6C 80240D9C C4203254 */ lwc1 $f0, 0x3254($at) -/* A27C70 80240DA0 46800020 */ cvt.s.w $f0, $f0 -/* A27C74 80240DA4 46020002 */ mul.s $f0, $f0, $f2 -/* A27C78 80240DA8 00000000 */ nop -/* A27C7C 80240DAC C7A20020 */ lwc1 $f2, 0x20($sp) -/* A27C80 80240DB0 46022081 */ sub.s $f2, $f4, $f2 -/* A27C84 80240DB4 46020002 */ mul.s $f0, $f0, $f2 -/* A27C88 80240DB8 00000000 */ nop -/* A27C8C 80240DBC 46040003 */ div.s $f0, $f0, $f4 -/* A27C90 80240DC0 46040003 */ div.s $f0, $f0, $f4 -/* A27C94 80240DC4 4600018D */ trunc.w.s $f6, $f0 -/* A27C98 80240DC8 44113000 */ mfc1 $s1, $f6 -/* A27C9C 80240DCC 00000000 */ nop -/* A27CA0 80240DD0 1A200015 */ blez $s1, .L80240E28 -/* A27CA4 80240DD4 00000000 */ nop -/* A27CA8 80240DD8 3C128024 */ lui $s2, 0x8024 -/* A27CAC 80240DDC 26523258 */ addiu $s2, $s2, 0x3258 -/* A27CB0 80240DE0 8E420000 */ lw $v0, ($s2) -/* A27CB4 80240DE4 8C440000 */ lw $a0, ($v0) -/* A27CB8 80240DE8 1080000F */ beqz $a0, .L80240E28 -/* A27CBC 80240DEC 00000000 */ nop -/* A27CC0 80240DF0 0C04992C */ jal func_801264B0 -/* A27CC4 80240DF4 0000802D */ daddu $s0, $zero, $zero -/* A27CC8 80240DF8 28420002 */ slti $v0, $v0, 2 -/* A27CCC 80240DFC 50400001 */ beql $v0, $zero, .L80240E04 -/* A27CD0 80240E00 2410FFF9 */ addiu $s0, $zero, -7 -.L80240E04: -/* A27CD4 80240E04 0000282D */ daddu $a1, $zero, $zero -/* A27CD8 80240E08 260600C4 */ addiu $a2, $s0, 0xc4 -/* A27CDC 80240E0C 8E430000 */ lw $v1, ($s2) -/* A27CE0 80240E10 2402FFFF */ addiu $v0, $zero, -1 -/* A27CE4 80240E14 AFA20010 */ sw $v0, 0x10($sp) -/* A27CE8 80240E18 AFA00014 */ sw $zero, 0x14($sp) -/* A27CEC 80240E1C 8C640000 */ lw $a0, ($v1) -/* A27CF0 80240E20 0C04993B */ jal draw_string -/* A27CF4 80240E24 0220382D */ daddu $a3, $s1, $zero -.L80240E28: -/* A27CF8 80240E28 8FBF0034 */ lw $ra, 0x34($sp) -/* A27CFC 80240E2C 8FB20030 */ lw $s2, 0x30($sp) -/* A27D00 80240E30 8FB1002C */ lw $s1, 0x2c($sp) -/* A27D04 80240E34 8FB00028 */ lw $s0, 0x28($sp) -/* A27D08 80240E38 03E00008 */ jr $ra -/* A27D0C 80240E3C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_04/func_80240E6C_A26ED0.s b/asm/nonmatchings/world/area_hos/hos_04/func_80240E6C_A26ED0.s deleted file mode 100644 index cdde7110d3..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/func_80240E6C_A26ED0.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E6C_A27D3C -/* A27D3C 80240E6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A27D40 80240E70 3C048024 */ lui $a0, 0x8024 -/* A27D44 80240E74 24843284 */ addiu $a0, $a0, 0x3284 -/* A27D48 80240E78 AFBF0010 */ sw $ra, 0x10($sp) -/* A27D4C 80240E7C 0C0902F4 */ jal func_80240BD0 -/* A27D50 80240E80 00000000 */ nop -/* A27D54 80240E84 8FBF0010 */ lw $ra, 0x10($sp) -/* A27D58 80240E88 03E00008 */ jr $ra -/* A27D5C 80240E8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/func_80240124_A2A240.s b/asm/nonmatchings/world/area_hos/hos_05/func_80240124_A2A240.s deleted file mode 100644 index bd24af57d4..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/func_80240124_A2A240.s +++ /dev/null @@ -1,126 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A2A364 -/* A2A364 80240124 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A2A368 80240128 AFB10034 */ sw $s1, 0x34($sp) -/* A2A36C 8024012C 0080882D */ daddu $s1, $a0, $zero -/* A2A370 80240130 AFBF0054 */ sw $ra, 0x54($sp) -/* A2A374 80240134 AFBE0050 */ sw $fp, 0x50($sp) -/* A2A378 80240138 AFB7004C */ sw $s7, 0x4c($sp) -/* A2A37C 8024013C AFB60048 */ sw $s6, 0x48($sp) -/* A2A380 80240140 AFB50044 */ sw $s5, 0x44($sp) -/* A2A384 80240144 AFB40040 */ sw $s4, 0x40($sp) -/* A2A388 80240148 AFB3003C */ sw $s3, 0x3c($sp) -/* A2A38C 8024014C AFB20038 */ sw $s2, 0x38($sp) -/* A2A390 80240150 AFB00030 */ sw $s0, 0x30($sp) -/* A2A394 80240154 8E30000C */ lw $s0, 0xc($s1) -/* A2A398 80240158 8E050000 */ lw $a1, ($s0) -/* A2A39C 8024015C 0C0B1EAF */ jal get_variable -/* A2A3A0 80240160 26100004 */ addiu $s0, $s0, 4 -/* A2A3A4 80240164 8E050000 */ lw $a1, ($s0) -/* A2A3A8 80240168 26100004 */ addiu $s0, $s0, 4 -/* A2A3AC 8024016C 0220202D */ daddu $a0, $s1, $zero -/* A2A3B0 80240170 0C0B1EAF */ jal get_variable -/* A2A3B4 80240174 0040982D */ daddu $s3, $v0, $zero -/* A2A3B8 80240178 8E050000 */ lw $a1, ($s0) -/* A2A3BC 8024017C 26100004 */ addiu $s0, $s0, 4 -/* A2A3C0 80240180 0220202D */ daddu $a0, $s1, $zero -/* A2A3C4 80240184 0C0B1EAF */ jal get_variable -/* A2A3C8 80240188 0040B02D */ daddu $s6, $v0, $zero -/* A2A3CC 8024018C 8E050000 */ lw $a1, ($s0) -/* A2A3D0 80240190 26100004 */ addiu $s0, $s0, 4 -/* A2A3D4 80240194 0220202D */ daddu $a0, $s1, $zero -/* A2A3D8 80240198 0C0B1EAF */ jal get_variable -/* A2A3DC 8024019C 0040A82D */ daddu $s5, $v0, $zero -/* A2A3E0 802401A0 8E050000 */ lw $a1, ($s0) -/* A2A3E4 802401A4 26100004 */ addiu $s0, $s0, 4 -/* A2A3E8 802401A8 0220202D */ daddu $a0, $s1, $zero -/* A2A3EC 802401AC 0C0B1EAF */ jal get_variable -/* A2A3F0 802401B0 0040A02D */ daddu $s4, $v0, $zero -/* A2A3F4 802401B4 8E050000 */ lw $a1, ($s0) -/* A2A3F8 802401B8 26100004 */ addiu $s0, $s0, 4 -/* A2A3FC 802401BC 0220202D */ daddu $a0, $s1, $zero -/* A2A400 802401C0 0C0B1EAF */ jal get_variable -/* A2A404 802401C4 0040902D */ daddu $s2, $v0, $zero -/* A2A408 802401C8 8E050000 */ lw $a1, ($s0) -/* A2A40C 802401CC 26100004 */ addiu $s0, $s0, 4 -/* A2A410 802401D0 0220202D */ daddu $a0, $s1, $zero -/* A2A414 802401D4 0C0B1EAF */ jal get_variable -/* A2A418 802401D8 AFA20028 */ sw $v0, 0x28($sp) -/* A2A41C 802401DC 8E050000 */ lw $a1, ($s0) -/* A2A420 802401E0 26100004 */ addiu $s0, $s0, 4 -/* A2A424 802401E4 0220202D */ daddu $a0, $s1, $zero -/* A2A428 802401E8 0C0B1EAF */ jal get_variable -/* A2A42C 802401EC 0040F02D */ daddu $fp, $v0, $zero -/* A2A430 802401F0 8E050000 */ lw $a1, ($s0) -/* A2A434 802401F4 26100004 */ addiu $s0, $s0, 4 -/* A2A438 802401F8 0220202D */ daddu $a0, $s1, $zero -/* A2A43C 802401FC 0C0B1EAF */ jal get_variable -/* A2A440 80240200 0040B82D */ daddu $s7, $v0, $zero -/* A2A444 80240204 0220202D */ daddu $a0, $s1, $zero -/* A2A448 80240208 8E050000 */ lw $a1, ($s0) -/* A2A44C 8024020C 0C0B1EAF */ jal get_variable -/* A2A450 80240210 0040802D */ daddu $s0, $v0, $zero -/* A2A454 80240214 0040182D */ daddu $v1, $v0, $zero -/* A2A458 80240218 24020002 */ addiu $v0, $zero, 2 -/* A2A45C 8024021C 12620012 */ beq $s3, $v0, .L80240268 -/* A2A460 80240220 2A620003 */ slti $v0, $s3, 3 -/* A2A464 80240224 10400005 */ beqz $v0, .L8024023C -/* A2A468 80240228 24020001 */ addiu $v0, $zero, 1 -/* A2A46C 8024022C 12620008 */ beq $s3, $v0, .L80240250 -/* A2A470 80240230 32C400FF */ andi $a0, $s6, 0xff -/* A2A474 80240234 080900B1 */ j .L802402C4 -/* A2A478 80240238 00000000 */ nop -.L8024023C: -/* A2A47C 8024023C 24020003 */ addiu $v0, $zero, 3 -/* A2A480 80240240 12620018 */ beq $s3, $v0, .L802402A4 -/* A2A484 80240244 32C400FF */ andi $a0, $s6, 0xff -/* A2A488 80240248 080900B1 */ j .L802402C4 -/* A2A48C 8024024C 00000000 */ nop -.L80240250: -/* A2A490 80240250 32A500FF */ andi $a1, $s5, 0xff -/* A2A494 80240254 328600FF */ andi $a2, $s4, 0xff -/* A2A498 80240258 0C046F97 */ jal set_background_color_blend -/* A2A49C 8024025C 324700FF */ andi $a3, $s2, 0xff -/* A2A4A0 80240260 080900B1 */ j .L802402C4 -/* A2A4A4 80240264 00000000 */ nop -.L80240268: -/* A2A4A8 80240268 32C400FF */ andi $a0, $s6, 0xff -/* A2A4AC 8024026C 32A500FF */ andi $a1, $s5, 0xff -/* A2A4B0 80240270 328600FF */ andi $a2, $s4, 0xff -/* A2A4B4 80240274 324700FF */ andi $a3, $s2, 0xff -/* A2A4B8 80240278 93A2002B */ lbu $v0, 0x2b($sp) -/* A2A4BC 8024027C AFB0001C */ sw $s0, 0x1c($sp) -/* A2A4C0 80240280 AFA30020 */ sw $v1, 0x20($sp) -/* A2A4C4 80240284 AFA20010 */ sw $v0, 0x10($sp) -/* A2A4C8 80240288 33C200FF */ andi $v0, $fp, 0xff -/* A2A4CC 8024028C AFA20014 */ sw $v0, 0x14($sp) -/* A2A4D0 80240290 32E200FF */ andi $v0, $s7, 0xff -/* A2A4D4 80240294 0C046FAD */ jal func_8011BEB4 -/* A2A4D8 80240298 AFA20018 */ sw $v0, 0x18($sp) -/* A2A4DC 8024029C 080900B1 */ j .L802402C4 -/* A2A4E0 802402A0 00000000 */ nop -.L802402A4: -/* A2A4E4 802402A4 32A500FF */ andi $a1, $s5, 0xff -/* A2A4E8 802402A8 328600FF */ andi $a2, $s4, 0xff -/* A2A4EC 802402AC 324700FF */ andi $a3, $s2, 0xff -/* A2A4F0 802402B0 93A2002B */ lbu $v0, 0x2b($sp) -/* A2A4F4 802402B4 AFA20010 */ sw $v0, 0x10($sp) -/* A2A4F8 802402B8 33C200FF */ andi $v0, $fp, 0xff -/* A2A4FC 802402BC 0C046FE6 */ jal func_8011BF98 -/* A2A500 802402C0 AFA20014 */ sw $v0, 0x14($sp) -.L802402C4: -/* A2A504 802402C4 8FBF0054 */ lw $ra, 0x54($sp) -/* A2A508 802402C8 8FBE0050 */ lw $fp, 0x50($sp) -/* A2A50C 802402CC 8FB7004C */ lw $s7, 0x4c($sp) -/* A2A510 802402D0 8FB60048 */ lw $s6, 0x48($sp) -/* A2A514 802402D4 8FB50044 */ lw $s5, 0x44($sp) -/* A2A518 802402D8 8FB40040 */ lw $s4, 0x40($sp) -/* A2A51C 802402DC 8FB3003C */ lw $s3, 0x3c($sp) -/* A2A520 802402E0 8FB20038 */ lw $s2, 0x38($sp) -/* A2A524 802402E4 8FB10034 */ lw $s1, 0x34($sp) -/* A2A528 802402E8 8FB00030 */ lw $s0, 0x30($sp) -/* A2A52C 802402EC 24020002 */ addiu $v0, $zero, 2 -/* A2A530 802402F0 03E00008 */ jr $ra -/* A2A534 802402F4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_hos/hos_05/func_8024041C_A2A240.s b/asm/nonmatchings/world/area_hos/hos_05/func_8024041C_A2A240.s deleted file mode 100644 index d16cdd1b9f..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/func_8024041C_A2A240.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024041C_A2A65C -/* A2A65C 8024041C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2A660 80240420 AFB00010 */ sw $s0, 0x10($sp) -/* A2A664 80240424 0080802D */ daddu $s0, $a0, $zero -/* A2A668 80240428 10A00005 */ beqz $a1, .L80240440 -/* A2A66C 8024042C AFBF0014 */ sw $ra, 0x14($sp) -/* A2A670 80240430 AE000070 */ sw $zero, 0x70($s0) -/* A2A674 80240434 AE000074 */ sw $zero, 0x74($s0) -/* A2A678 80240438 AE000078 */ sw $zero, 0x78($s0) -/* A2A67C 8024043C AE00007C */ sw $zero, 0x7c($s0) -.L80240440: -/* A2A680 80240440 8E020070 */ lw $v0, 0x70($s0) -/* A2A684 80240444 1440000E */ bnez $v0, .L80240480 -/* A2A688 80240448 00000000 */ nop -/* A2A68C 8024044C 8E0300A8 */ lw $v1, 0xa8($s0) -/* A2A690 80240450 8E020088 */ lw $v0, 0x88($s0) -/* A2A694 80240454 00621821 */ addu $v1, $v1, $v0 -/* A2A698 80240458 04610004 */ bgez $v1, .L8024046C -/* A2A69C 8024045C AE0300A8 */ sw $v1, 0xa8($s0) -/* A2A6A0 80240460 3C020002 */ lui $v0, 2 -/* A2A6A4 80240464 0809011F */ j .L8024047C -/* A2A6A8 80240468 00621021 */ addu $v0, $v1, $v0 -.L8024046C: -/* A2A6AC 8024046C 3C040002 */ lui $a0, 2 -/* A2A6B0 80240470 0083102A */ slt $v0, $a0, $v1 -/* A2A6B4 80240474 10400002 */ beqz $v0, .L80240480 -/* A2A6B8 80240478 00641023 */ subu $v0, $v1, $a0 -.L8024047C: -/* A2A6BC 8024047C AE0200A8 */ sw $v0, 0xa8($s0) -.L80240480: -/* A2A6C0 80240480 8E020074 */ lw $v0, 0x74($s0) -/* A2A6C4 80240484 1440000E */ bnez $v0, .L802404C0 -/* A2A6C8 80240488 00000000 */ nop -/* A2A6CC 8024048C 8E0300AC */ lw $v1, 0xac($s0) -/* A2A6D0 80240490 8E02008C */ lw $v0, 0x8c($s0) -/* A2A6D4 80240494 00621821 */ addu $v1, $v1, $v0 -/* A2A6D8 80240498 04610004 */ bgez $v1, .L802404AC -/* A2A6DC 8024049C AE0300AC */ sw $v1, 0xac($s0) -/* A2A6E0 802404A0 3C020002 */ lui $v0, 2 -/* A2A6E4 802404A4 0809012F */ j .L802404BC -/* A2A6E8 802404A8 00621021 */ addu $v0, $v1, $v0 -.L802404AC: -/* A2A6EC 802404AC 3C040002 */ lui $a0, 2 -/* A2A6F0 802404B0 0083102A */ slt $v0, $a0, $v1 -/* A2A6F4 802404B4 10400002 */ beqz $v0, .L802404C0 -/* A2A6F8 802404B8 00641023 */ subu $v0, $v1, $a0 -.L802404BC: -/* A2A6FC 802404BC AE0200AC */ sw $v0, 0xac($s0) -.L802404C0: -/* A2A700 802404C0 8E020078 */ lw $v0, 0x78($s0) -/* A2A704 802404C4 1440000E */ bnez $v0, .L80240500 -/* A2A708 802404C8 00000000 */ nop -/* A2A70C 802404CC 8E0300B0 */ lw $v1, 0xb0($s0) -/* A2A710 802404D0 8E020090 */ lw $v0, 0x90($s0) -/* A2A714 802404D4 00621821 */ addu $v1, $v1, $v0 -/* A2A718 802404D8 04610004 */ bgez $v1, .L802404EC -/* A2A71C 802404DC AE0300B0 */ sw $v1, 0xb0($s0) -/* A2A720 802404E0 3C020002 */ lui $v0, 2 -/* A2A724 802404E4 0809013F */ j .L802404FC -/* A2A728 802404E8 00621021 */ addu $v0, $v1, $v0 -.L802404EC: -/* A2A72C 802404EC 3C040002 */ lui $a0, 2 -/* A2A730 802404F0 0083102A */ slt $v0, $a0, $v1 -/* A2A734 802404F4 10400002 */ beqz $v0, .L80240500 -/* A2A738 802404F8 00641023 */ subu $v0, $v1, $a0 -.L802404FC: -/* A2A73C 802404FC AE0200B0 */ sw $v0, 0xb0($s0) -.L80240500: -/* A2A740 80240500 8E02007C */ lw $v0, 0x7c($s0) -/* A2A744 80240504 1440000E */ bnez $v0, .L80240540 -/* A2A748 80240508 00000000 */ nop -/* A2A74C 8024050C 8E0300B4 */ lw $v1, 0xb4($s0) -/* A2A750 80240510 8E020094 */ lw $v0, 0x94($s0) -/* A2A754 80240514 00621821 */ addu $v1, $v1, $v0 -/* A2A758 80240518 04610004 */ bgez $v1, .L8024052C -/* A2A75C 8024051C AE0300B4 */ sw $v1, 0xb4($s0) -/* A2A760 80240520 3C020002 */ lui $v0, 2 -/* A2A764 80240524 0809014F */ j .L8024053C -/* A2A768 80240528 00621021 */ addu $v0, $v1, $v0 -.L8024052C: -/* A2A76C 8024052C 3C040002 */ lui $a0, 2 -/* A2A770 80240530 0083102A */ slt $v0, $a0, $v1 -/* A2A774 80240534 10400002 */ beqz $v0, .L80240540 -/* A2A778 80240538 00641023 */ subu $v0, $v1, $a0 -.L8024053C: -/* A2A77C 8024053C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240540: -/* A2A780 80240540 8E040084 */ lw $a0, 0x84($s0) -/* A2A784 80240544 0C046F07 */ jal set_main_pan_u -/* A2A788 80240548 8E0500A8 */ lw $a1, 0xa8($s0) -/* A2A78C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* A2A790 80240550 0C046F0D */ jal set_main_pan_v -/* A2A794 80240554 8E0500AC */ lw $a1, 0xac($s0) -/* A2A798 80240558 8E040084 */ lw $a0, 0x84($s0) -/* A2A79C 8024055C 0C046F13 */ jal set_aux_pan_u -/* A2A7A0 80240560 8E0500B0 */ lw $a1, 0xb0($s0) -/* A2A7A4 80240564 8E040084 */ lw $a0, 0x84($s0) -/* A2A7A8 80240568 0C046F19 */ jal set_aux_pan_v -/* A2A7AC 8024056C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A2A7B0 80240570 8E020070 */ lw $v0, 0x70($s0) -/* A2A7B4 80240574 8E030078 */ lw $v1, 0x78($s0) -/* A2A7B8 80240578 8E040098 */ lw $a0, 0x98($s0) -/* A2A7BC 8024057C 24420001 */ addiu $v0, $v0, 1 -/* A2A7C0 80240580 AE020070 */ sw $v0, 0x70($s0) -/* A2A7C4 80240584 8E020074 */ lw $v0, 0x74($s0) -/* A2A7C8 80240588 24630001 */ addiu $v1, $v1, 1 -/* A2A7CC 8024058C AE030078 */ sw $v1, 0x78($s0) -/* A2A7D0 80240590 8E030070 */ lw $v1, 0x70($s0) -/* A2A7D4 80240594 24420001 */ addiu $v0, $v0, 1 -/* A2A7D8 80240598 AE020074 */ sw $v0, 0x74($s0) -/* A2A7DC 8024059C 8E02007C */ lw $v0, 0x7c($s0) -/* A2A7E0 802405A0 0064182A */ slt $v1, $v1, $a0 -/* A2A7E4 802405A4 24420001 */ addiu $v0, $v0, 1 -/* A2A7E8 802405A8 14600002 */ bnez $v1, .L802405B4 -/* A2A7EC 802405AC AE02007C */ sw $v0, 0x7c($s0) -/* A2A7F0 802405B0 AE000070 */ sw $zero, 0x70($s0) -.L802405B4: -/* A2A7F4 802405B4 8E020074 */ lw $v0, 0x74($s0) -/* A2A7F8 802405B8 8E03009C */ lw $v1, 0x9c($s0) -/* A2A7FC 802405BC 0043102A */ slt $v0, $v0, $v1 -/* A2A800 802405C0 50400001 */ beql $v0, $zero, .L802405C8 -/* A2A804 802405C4 AE000074 */ sw $zero, 0x74($s0) -.L802405C8: -/* A2A808 802405C8 8E020078 */ lw $v0, 0x78($s0) -/* A2A80C 802405CC 8E0300A0 */ lw $v1, 0xa0($s0) -/* A2A810 802405D0 0043102A */ slt $v0, $v0, $v1 -/* A2A814 802405D4 50400001 */ beql $v0, $zero, .L802405DC -/* A2A818 802405D8 AE000078 */ sw $zero, 0x78($s0) -.L802405DC: -/* A2A81C 802405DC 8E02007C */ lw $v0, 0x7c($s0) -/* A2A820 802405E0 8E0300A4 */ lw $v1, 0xa4($s0) -/* A2A824 802405E4 0043102A */ slt $v0, $v0, $v1 -/* A2A828 802405E8 50400001 */ beql $v0, $zero, .L802405F0 -/* A2A82C 802405EC AE00007C */ sw $zero, 0x7c($s0) -.L802405F0: -/* A2A830 802405F0 8FBF0014 */ lw $ra, 0x14($sp) -/* A2A834 802405F4 8FB00010 */ lw $s0, 0x10($sp) -/* A2A838 802405F8 0000102D */ daddu $v0, $zero, $zero -/* A2A83C 802405FC 03E00008 */ jr $ra -/* A2A840 80240600 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/func_80240880_A2A240.s b/asm/nonmatchings/world/area_hos/hos_05/func_80240880_A2A240.s deleted file mode 100644 index f52228211c..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/func_80240880_A2A240.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240880_A2AAC0 -/* A2AAC0 80240880 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A2AAC4 80240884 AFB1002C */ sw $s1, 0x2c($sp) -/* A2AAC8 80240888 0080882D */ daddu $s1, $a0, $zero -/* A2AACC 8024088C AFBF004C */ sw $ra, 0x4c($sp) -/* A2AAD0 80240890 AFBE0048 */ sw $fp, 0x48($sp) -/* A2AAD4 80240894 AFB70044 */ sw $s7, 0x44($sp) -/* A2AAD8 80240898 AFB60040 */ sw $s6, 0x40($sp) -/* A2AADC 8024089C AFB5003C */ sw $s5, 0x3c($sp) -/* A2AAE0 802408A0 AFB40038 */ sw $s4, 0x38($sp) -/* A2AAE4 802408A4 AFB30034 */ sw $s3, 0x34($sp) -/* A2AAE8 802408A8 AFB20030 */ sw $s2, 0x30($sp) -/* A2AAEC 802408AC AFB00028 */ sw $s0, 0x28($sp) -/* A2AAF0 802408B0 8E30000C */ lw $s0, 0xc($s1) -/* A2AAF4 802408B4 8E050000 */ lw $a1, ($s0) -/* A2AAF8 802408B8 0C0B1EAF */ jal get_variable -/* A2AAFC 802408BC 26100004 */ addiu $s0, $s0, 4 -/* A2AB00 802408C0 8E050000 */ lw $a1, ($s0) -/* A2AB04 802408C4 26100004 */ addiu $s0, $s0, 4 -/* A2AB08 802408C8 0220202D */ daddu $a0, $s1, $zero -/* A2AB0C 802408CC 0C0B1EAF */ jal get_variable -/* A2AB10 802408D0 0040F02D */ daddu $fp, $v0, $zero -/* A2AB14 802408D4 8E050000 */ lw $a1, ($s0) -/* A2AB18 802408D8 26100004 */ addiu $s0, $s0, 4 -/* A2AB1C 802408DC 0220202D */ daddu $a0, $s1, $zero -/* A2AB20 802408E0 0C0B1EAF */ jal get_variable -/* A2AB24 802408E4 0040B02D */ daddu $s6, $v0, $zero -/* A2AB28 802408E8 8E050000 */ lw $a1, ($s0) -/* A2AB2C 802408EC 26100004 */ addiu $s0, $s0, 4 -/* A2AB30 802408F0 0220202D */ daddu $a0, $s1, $zero -/* A2AB34 802408F4 0C0B1EAF */ jal get_variable -/* A2AB38 802408F8 0040B82D */ daddu $s7, $v0, $zero -/* A2AB3C 802408FC 8E050000 */ lw $a1, ($s0) -/* A2AB40 80240900 26100004 */ addiu $s0, $s0, 4 -/* A2AB44 80240904 0220202D */ daddu $a0, $s1, $zero -/* A2AB48 80240908 0C0B1EAF */ jal get_variable -/* A2AB4C 8024090C 0040A82D */ daddu $s5, $v0, $zero -/* A2AB50 80240910 8E050000 */ lw $a1, ($s0) -/* A2AB54 80240914 26100004 */ addiu $s0, $s0, 4 -/* A2AB58 80240918 0220202D */ daddu $a0, $s1, $zero -/* A2AB5C 8024091C 0C0B1EAF */ jal get_variable -/* A2AB60 80240920 0040A02D */ daddu $s4, $v0, $zero -/* A2AB64 80240924 8E050000 */ lw $a1, ($s0) -/* A2AB68 80240928 26100004 */ addiu $s0, $s0, 4 -/* A2AB6C 8024092C 0220202D */ daddu $a0, $s1, $zero -/* A2AB70 80240930 0C0B1EAF */ jal get_variable -/* A2AB74 80240934 0040982D */ daddu $s3, $v0, $zero -/* A2AB78 80240938 8E050000 */ lw $a1, ($s0) -/* A2AB7C 8024093C 26100004 */ addiu $s0, $s0, 4 -/* A2AB80 80240940 0220202D */ daddu $a0, $s1, $zero -/* A2AB84 80240944 0C0B1EAF */ jal get_variable -/* A2AB88 80240948 0040902D */ daddu $s2, $v0, $zero -/* A2AB8C 8024094C 0220202D */ daddu $a0, $s1, $zero -/* A2AB90 80240950 8E050000 */ lw $a1, ($s0) -/* A2AB94 80240954 0C0B1EAF */ jal get_variable -/* A2AB98 80240958 0040802D */ daddu $s0, $v0, $zero -/* A2AB9C 8024095C 33C400FF */ andi $a0, $fp, 0xff -/* A2ABA0 80240960 32C500FF */ andi $a1, $s6, 0xff -/* A2ABA4 80240964 329400FF */ andi $s4, $s4, 0xff -/* A2ABA8 80240968 327300FF */ andi $s3, $s3, 0xff -/* A2ABAC 8024096C 325200FF */ andi $s2, $s2, 0xff -/* A2ABB0 80240970 32E600FF */ andi $a2, $s7, 0xff -/* A2ABB4 80240974 32A700FF */ andi $a3, $s5, 0xff -/* A2ABB8 80240978 AFB40010 */ sw $s4, 0x10($sp) -/* A2ABBC 8024097C AFB30014 */ sw $s3, 0x14($sp) -/* A2ABC0 80240980 AFB20018 */ sw $s2, 0x18($sp) -/* A2ABC4 80240984 AFB0001C */ sw $s0, 0x1c($sp) -/* A2ABC8 80240988 0C046FAD */ jal func_8011BEB4 -/* A2ABCC 8024098C AFA20020 */ sw $v0, 0x20($sp) -/* A2ABD0 80240990 8FBF004C */ lw $ra, 0x4c($sp) -/* A2ABD4 80240994 8FBE0048 */ lw $fp, 0x48($sp) -/* A2ABD8 80240998 8FB70044 */ lw $s7, 0x44($sp) -/* A2ABDC 8024099C 8FB60040 */ lw $s6, 0x40($sp) -/* A2ABE0 802409A0 8FB5003C */ lw $s5, 0x3c($sp) -/* A2ABE4 802409A4 8FB40038 */ lw $s4, 0x38($sp) -/* A2ABE8 802409A8 8FB30034 */ lw $s3, 0x34($sp) -/* A2ABEC 802409AC 8FB20030 */ lw $s2, 0x30($sp) -/* A2ABF0 802409B0 8FB1002C */ lw $s1, 0x2c($sp) -/* A2ABF4 802409B4 8FB00028 */ lw $s0, 0x28($sp) -/* A2ABF8 802409B8 24020002 */ addiu $v0, $zero, 2 -/* A2ABFC 802409BC 03E00008 */ jr $ra -/* A2AC00 802409C0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_hos/hos_05/func_80240DA0_A2A240.s b/asm/nonmatchings/world/area_hos/hos_05/func_80240DA0_A2A240.s deleted file mode 100644 index 26baabcb23..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/func_80240DA0_A2A240.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DA0_A2AFE0 -/* A2AFE0 80240DA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A2AFE4 80240DA4 AFB10014 */ sw $s1, 0x14($sp) -/* A2AFE8 80240DA8 0080882D */ daddu $s1, $a0, $zero -/* A2AFEC 80240DAC AFBF0018 */ sw $ra, 0x18($sp) -/* A2AFF0 80240DB0 AFB00010 */ sw $s0, 0x10($sp) -/* A2AFF4 80240DB4 8E30000C */ lw $s0, 0xc($s1) -/* A2AFF8 80240DB8 8E050000 */ lw $a1, ($s0) -/* A2AFFC 80240DBC 0C0B1EAF */ jal get_variable -/* A2B000 80240DC0 26100004 */ addiu $s0, $s0, 4 -/* A2B004 80240DC4 0220202D */ daddu $a0, $s1, $zero -/* A2B008 80240DC8 8E050000 */ lw $a1, ($s0) -/* A2B00C 80240DCC 0C0B210B */ jal get_float_variable -/* A2B010 80240DD0 0040802D */ daddu $s0, $v0, $zero -/* A2B014 80240DD4 44050000 */ mfc1 $a1, $f0 -/* A2B018 80240DD8 0C090355 */ jal func_80240D54 -/* A2B01C 80240DDC 0200202D */ daddu $a0, $s0, $zero -/* A2B020 80240DE0 8FBF0018 */ lw $ra, 0x18($sp) -/* A2B024 80240DE4 8FB10014 */ lw $s1, 0x14($sp) -/* A2B028 80240DE8 8FB00010 */ lw $s0, 0x10($sp) -/* A2B02C 80240DEC 24020002 */ addiu $v0, $zero, 2 -/* A2B030 80240DF0 03E00008 */ jr $ra -/* A2B034 80240DF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_05/func_80240DF8_A2A240.s b/asm/nonmatchings/world/area_hos/hos_05/func_80240DF8_A2A240.s deleted file mode 100644 index 5691af112b..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/func_80240DF8_A2A240.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF8_A2B038 -/* A2B038 80240DF8 3C048007 */ lui $a0, %hi(gGameStatusPtr) -/* A2B03C 80240DFC 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) -/* A2B040 80240E00 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2B044 80240E04 AFBF0010 */ sw $ra, 0x10($sp) -/* A2B048 80240E08 908300A8 */ lbu $v1, 0xa8($a0) -/* A2B04C 80240E0C 2C620005 */ sltiu $v0, $v1, 5 -/* A2B050 80240E10 10400003 */ beqz $v0, .L80240E20 -/* A2B054 80240E14 24620001 */ addiu $v0, $v1, 1 -/* A2B058 80240E18 0C00D994 */ jal begin_state_intro -/* A2B05C 80240E1C A08200A8 */ sb $v0, 0xa8($a0) -.L80240E20: -/* A2B060 80240E20 8FBF0010 */ lw $ra, 0x10($sp) -/* A2B064 80240E24 24020001 */ addiu $v0, $zero, 1 -/* A2B068 80240E28 03E00008 */ jr $ra -/* A2B06C 80240E2C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/func_80240E30_A2A240.s b/asm/nonmatchings/world/area_hos/hos_05/func_80240E30_A2A240.s deleted file mode 100644 index bd08cc35b5..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/func_80240E30_A2A240.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E30_A2B070 -/* A2B070 80240E30 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2B074 80240E34 AFBF0010 */ sw $ra, 0x10($sp) -/* A2B078 80240E38 0C04760B */ jal func_8011D82C -/* A2B07C 80240E3C 24040003 */ addiu $a0, $zero, 3 -/* A2B080 80240E40 8FBF0010 */ lw $ra, 0x10($sp) -/* A2B084 80240E44 24020002 */ addiu $v0, $zero, 2 -/* A2B088 80240E48 03E00008 */ jr $ra -/* A2B08C 80240E4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/func_80240F30_A2A240.s b/asm/nonmatchings/world/area_hos/hos_05/func_80240F30_A2A240.s deleted file mode 100644 index 64c0a66f9e..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/func_80240F30_A2A240.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F30_A2B170 -/* A2B170 80240F30 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2B174 80240F34 3C05F4AC */ lui $a1, 0xf4ac -/* A2B178 80240F38 AFBF0010 */ sw $ra, 0x10($sp) -/* A2B17C 80240F3C 0C0B1EAF */ jal get_variable -/* A2B180 80240F40 34A5D480 */ ori $a1, $a1, 0xd480 -/* A2B184 80240F44 3C058025 */ lui $a1, 0x8025 -/* A2B188 80240F48 24A595DC */ addiu $a1, $a1, -0x6a24 -/* A2B18C 80240F4C 8CA40000 */ lw $a0, ($a1) -/* A2B190 80240F50 8C42000C */ lw $v0, 0xc($v0) -/* A2B194 80240F54 00041840 */ sll $v1, $a0, 1 -/* A2B198 80240F58 00641821 */ addu $v1, $v1, $a0 -/* A2B19C 80240F5C 00031900 */ sll $v1, $v1, 4 -/* A2B1A0 80240F60 00621821 */ addu $v1, $v1, $v0 -/* A2B1A4 80240F64 24020001 */ addiu $v0, $zero, 1 -/* A2B1A8 80240F68 A0620059 */ sb $v0, 0x59($v1) -/* A2B1AC 80240F6C 8CA30000 */ lw $v1, ($a1) -/* A2B1B0 80240F70 24630001 */ addiu $v1, $v1, 1 -/* A2B1B4 80240F74 ACA30000 */ sw $v1, ($a1) -/* A2B1B8 80240F78 8FBF0010 */ lw $ra, 0x10($sp) -/* A2B1BC 80240F7C 24020002 */ addiu $v0, $zero, 2 -/* A2B1C0 80240F80 03E00008 */ jr $ra -/* A2B1C4 80240F84 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/func_80240FE0_A2A240.s b/asm/nonmatchings/world/area_hos/hos_05/func_80240FE0_A2A240.s deleted file mode 100644 index 52a6b8f39e..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/func_80240FE0_A2A240.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FE0_A2B220 -/* A2B220 80240FE0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2B224 80240FE4 AFB00010 */ sw $s0, 0x10($sp) -/* A2B228 80240FE8 0080802D */ daddu $s0, $a0, $zero -/* A2B22C 80240FEC 3C05F4AC */ lui $a1, 0xf4ac -/* A2B230 80240FF0 AFBF0014 */ sw $ra, 0x14($sp) -/* A2B234 80240FF4 0C0B1EAF */ jal get_variable -/* A2B238 80240FF8 34A5D490 */ ori $a1, $a1, 0xd490 -/* A2B23C 80240FFC 0040182D */ daddu $v1, $v0, $zero -/* A2B240 80241000 8C64000C */ lw $a0, 0xc($v1) -/* A2B244 80241004 C6000084 */ lwc1 $f0, 0x84($s0) -/* A2B248 80241008 46800020 */ cvt.s.w $f0, $f0 -/* A2B24C 8024100C E4800010 */ swc1 $f0, 0x10($a0) -/* A2B250 80241010 8C64000C */ lw $a0, 0xc($v1) -/* A2B254 80241014 C6000088 */ lwc1 $f0, 0x88($s0) -/* A2B258 80241018 46800020 */ cvt.s.w $f0, $f0 -/* A2B25C 8024101C E4800014 */ swc1 $f0, 0x14($a0) -/* A2B260 80241020 8C63000C */ lw $v1, 0xc($v1) -/* A2B264 80241024 C600008C */ lwc1 $f0, 0x8c($s0) -/* A2B268 80241028 46800020 */ cvt.s.w $f0, $f0 -/* A2B26C 8024102C E4600018 */ swc1 $f0, 0x18($v1) -/* A2B270 80241030 8FBF0014 */ lw $ra, 0x14($sp) -/* A2B274 80241034 8FB00010 */ lw $s0, 0x10($sp) -/* A2B278 80241038 24020002 */ addiu $v0, $zero, 2 -/* A2B27C 8024103C 03E00008 */ jr $ra -/* A2B280 80241040 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/func_8024146C_A2A240.s b/asm/nonmatchings/world/area_hos/hos_05/func_8024146C_A2A240.s deleted file mode 100644 index cafbd75c1c..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/func_8024146C_A2A240.s +++ /dev/null @@ -1,155 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024146C_A2B6AC -/* A2B6AC 8024146C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A2B6B0 80241470 3C04800B */ lui $a0, %hi(gCameras) -/* A2B6B4 80241474 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A2B6B8 80241478 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A2B6BC 8024147C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A2B6C0 80241480 3C05800A */ lui $a1, 0x800a -/* A2B6C4 80241484 8CA5A64C */ lw $a1, -0x59b4($a1) -/* A2B6C8 80241488 3C088025 */ lui $t0, 0x8025 -/* A2B6CC 8024148C 250898D4 */ addiu $t0, $t0, -0x672c -/* A2B6D0 80241490 AFBF0034 */ sw $ra, 0x34($sp) -/* A2B6D4 80241494 AFB60030 */ sw $s6, 0x30($sp) -/* A2B6D8 80241498 AFB5002C */ sw $s5, 0x2c($sp) -/* A2B6DC 8024149C AFB40028 */ sw $s4, 0x28($sp) -/* A2B6E0 802414A0 AFB30024 */ sw $s3, 0x24($sp) -/* A2B6E4 802414A4 AFB20020 */ sw $s2, 0x20($sp) -/* A2B6E8 802414A8 AFB1001C */ sw $s1, 0x1c($sp) -/* A2B6EC 802414AC AFB00018 */ sw $s0, 0x18($sp) -/* A2B6F0 802414B0 F7B60040 */ sdc1 $f22, 0x40($sp) -/* A2B6F4 802414B4 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A2B6F8 802414B8 00031080 */ sll $v0, $v1, 2 -/* A2B6FC 802414BC 00431021 */ addu $v0, $v0, $v1 -/* A2B700 802414C0 00021080 */ sll $v0, $v0, 2 -/* A2B704 802414C4 00431023 */ subu $v0, $v0, $v1 -/* A2B708 802414C8 000218C0 */ sll $v1, $v0, 3 -/* A2B70C 802414CC 00431021 */ addu $v0, $v0, $v1 -/* A2B710 802414D0 000210C0 */ sll $v0, $v0, 3 -/* A2B714 802414D4 8D030000 */ lw $v1, ($t0) -/* A2B718 802414D8 14A30003 */ bne $a1, $v1, .L802414E8 -/* A2B71C 802414DC 0044B021 */ addu $s6, $v0, $a0 -/* A2B720 802414E0 080905A3 */ j .L8024168C -/* A2B724 802414E4 0000102D */ daddu $v0, $zero, $zero -.L802414E8: -/* A2B728 802414E8 3C138025 */ lui $s3, 0x8025 -/* A2B72C 802414EC 267398D0 */ addiu $s3, $s3, -0x6730 -/* A2B730 802414F0 3C01437A */ lui $at, 0x437a -/* A2B734 802414F4 44816000 */ mtc1 $at, $f12 -/* A2B738 802414F8 8E660000 */ lw $a2, ($s3) -/* A2B73C 802414FC 3C073F00 */ lui $a3, 0x3f00 -/* A2B740 80241500 4480B000 */ mtc1 $zero, $f22 -/* A2B744 80241504 AD050000 */ sw $a1, ($t0) -/* A2B748 80241508 AFB30010 */ sw $s3, 0x10($sp) -/* A2B74C 8024150C 0C090411 */ jal func_80241044 -/* A2B750 80241510 4600B386 */ mov.s $f14, $f22 -/* A2B754 80241514 24040002 */ addiu $a0, $zero, 2 -/* A2B758 80241518 3C108025 */ lui $s0, 0x8025 -/* A2B75C 8024151C 2610963C */ addiu $s0, $s0, -0x69c4 -/* A2B760 80241520 3C148025 */ lui $s4, 0x8025 -/* A2B764 80241524 269498FC */ addiu $s4, $s4, -0x6704 -/* A2B768 80241528 C6800000 */ lwc1 $f0, ($s4) -/* A2B76C 8024152C 46800020 */ cvt.s.w $f0, $f0 -/* A2B770 80241530 3C054302 */ lui $a1, 0x4302 -/* A2B774 80241534 34A56666 */ ori $a1, $a1, 0x6666 -/* A2B778 80241538 8E060004 */ lw $a2, 4($s0) -/* A2B77C 8024153C 44070000 */ mfc1 $a3, $f0 -/* A2B780 80241540 3C0143EB */ lui $at, 0x43eb -/* A2B784 80241544 44810000 */ mtc1 $at, $f0 -/* A2B788 80241548 3C158025 */ lui $s5, 0x8025 -/* A2B78C 8024154C 26B598E8 */ addiu $s5, $s5, -0x6718 -/* A2B790 80241550 AFB50014 */ sw $s5, 0x14($sp) -/* A2B794 80241554 0C090439 */ jal func_802410E4 -/* A2B798 80241558 E7A00010 */ swc1 $f0, 0x10($sp) -/* A2B79C 8024155C 3C128025 */ lui $s2, 0x8025 -/* A2B7A0 80241560 265298EC */ addiu $s2, $s2, -0x6714 -/* A2B7A4 80241564 3C014146 */ lui $at, 0x4146 -/* A2B7A8 80241568 34216666 */ ori $at, $at, 0x6666 -/* A2B7AC 8024156C 44816000 */ mtc1 $at, $f12 -/* A2B7B0 80241570 C60E0008 */ lwc1 $f14, 8($s0) -/* A2B7B4 80241574 3C013D4C */ lui $at, 0x3d4c -/* A2B7B8 80241578 3421CCCD */ ori $at, $at, 0xcccd -/* A2B7BC 8024157C 4481A000 */ mtc1 $at, $f20 -/* A2B7C0 80241580 8E460000 */ lw $a2, ($s2) -/* A2B7C4 80241584 4407A000 */ mfc1 $a3, $f20 -/* A2B7C8 80241588 0C090411 */ jal func_80241044 -/* A2B7CC 8024158C AFB20010 */ sw $s2, 0x10($sp) -/* A2B7D0 80241590 3C118025 */ lui $s1, 0x8025 -/* A2B7D4 80241594 263198F0 */ addiu $s1, $s1, -0x6710 -/* A2B7D8 80241598 3C01C186 */ lui $at, 0xc186 -/* A2B7DC 8024159C 34216666 */ ori $at, $at, 0x6666 -/* A2B7E0 802415A0 44816000 */ mtc1 $at, $f12 -/* A2B7E4 802415A4 C60E0024 */ lwc1 $f14, 0x24($s0) -/* A2B7E8 802415A8 8E260000 */ lw $a2, ($s1) -/* A2B7EC 802415AC 4407A000 */ mfc1 $a3, $f20 -/* A2B7F0 802415B0 0C090411 */ jal func_80241044 -/* A2B7F4 802415B4 AFB10010 */ sw $s1, 0x10($sp) -/* A2B7F8 802415B8 3C108025 */ lui $s0, 0x8025 -/* A2B7FC 802415BC 261098F4 */ addiu $s0, $s0, -0x670c -/* A2B800 802415C0 3C014278 */ lui $at, 0x4278 -/* A2B804 802415C4 44816000 */ mtc1 $at, $f12 -/* A2B808 802415C8 3C014244 */ lui $at, 0x4244 -/* A2B80C 802415CC 44817000 */ mtc1 $at, $f14 -/* A2B810 802415D0 8E060000 */ lw $a2, ($s0) -/* A2B814 802415D4 3C073DCC */ lui $a3, 0x3dcc -/* A2B818 802415D8 34E7CCCD */ ori $a3, $a3, 0xcccd -/* A2B81C 802415DC 0C090411 */ jal func_80241044 -/* A2B820 802415E0 AFB00010 */ sw $s0, 0x10($sp) -/* A2B824 802415E4 8E050000 */ lw $a1, ($s0) -/* A2B828 802415E8 0C090355 */ jal func_80240D54 -/* A2B82C 802415EC 0000202D */ daddu $a0, $zero, $zero -/* A2B830 802415F0 C6A00000 */ lwc1 $f0, ($s5) -/* A2B834 802415F4 C66C0000 */ lwc1 $f12, ($s3) -/* A2B838 802415F8 C6420000 */ lwc1 $f2, ($s2) -/* A2B83C 802415FC C6240000 */ lwc1 $f4, ($s1) -/* A2B840 80241600 E6C004DC */ swc1 $f0, 0x4dc($s6) -/* A2B844 80241604 E6C204E0 */ swc1 $f2, 0x4e0($s6) -/* A2B848 80241608 0C00A8BB */ jal sin_deg -/* A2B84C 8024160C E6C404FC */ swc1 $f4, 0x4fc($s6) -/* A2B850 80241610 3C0143FA */ lui $at, 0x43fa -/* A2B854 80241614 44811000 */ mtc1 $at, $f2 -/* A2B858 80241618 00000000 */ nop -/* A2B85C 8024161C 46020002 */ mul.s $f0, $f0, $f2 -/* A2B860 80241620 00000000 */ nop -/* A2B864 80241624 C66C0000 */ lwc1 $f12, ($s3) -/* A2B868 80241628 0C00A8D4 */ jal cos_deg -/* A2B86C 8024162C E6C004F0 */ swc1 $f0, 0x4f0($s6) -/* A2B870 80241630 3C01C3FA */ lui $at, 0xc3fa -/* A2B874 80241634 44811000 */ mtc1 $at, $f2 -/* A2B878 80241638 24020001 */ addiu $v0, $zero, 1 -/* A2B87C 8024163C A6C20506 */ sh $v0, 0x506($s6) -/* A2B880 80241640 46020002 */ mul.s $f0, $f0, $f2 -/* A2B884 80241644 00000000 */ nop -/* A2B888 80241648 8E820000 */ lw $v0, ($s4) -/* A2B88C 8024164C C6620000 */ lwc1 $f2, ($s3) -/* A2B890 80241650 24420001 */ addiu $v0, $v0, 1 -/* A2B894 80241654 AE820000 */ sw $v0, ($s4) -/* A2B898 80241658 46161032 */ c.eq.s $f2, $f22 -/* A2B89C 8024165C 00000000 */ nop -/* A2B8A0 80241660 45000006 */ bc1f .L8024167C -/* A2B8A4 80241664 E6C004F8 */ swc1 $f0, 0x4f8($s6) -/* A2B8A8 80241668 3C038025 */ lui $v1, 0x8025 -/* A2B8AC 8024166C 246398F8 */ addiu $v1, $v1, -0x6708 -/* A2B8B0 80241670 8C620000 */ lw $v0, ($v1) -/* A2B8B4 80241674 24420001 */ addiu $v0, $v0, 1 -/* A2B8B8 80241678 AC620000 */ sw $v0, ($v1) -.L8024167C: -/* A2B8BC 8024167C 3C028025 */ lui $v0, 0x8025 -/* A2B8C0 80241680 8C4298F8 */ lw $v0, -0x6708($v0) -/* A2B8C4 80241684 2842001F */ slti $v0, $v0, 0x1f -/* A2B8C8 80241688 38420001 */ xori $v0, $v0, 1 -.L8024168C: -/* A2B8CC 8024168C 8FBF0034 */ lw $ra, 0x34($sp) -/* A2B8D0 80241690 8FB60030 */ lw $s6, 0x30($sp) -/* A2B8D4 80241694 8FB5002C */ lw $s5, 0x2c($sp) -/* A2B8D8 80241698 8FB40028 */ lw $s4, 0x28($sp) -/* A2B8DC 8024169C 8FB30024 */ lw $s3, 0x24($sp) -/* A2B8E0 802416A0 8FB20020 */ lw $s2, 0x20($sp) -/* A2B8E4 802416A4 8FB1001C */ lw $s1, 0x1c($sp) -/* A2B8E8 802416A8 8FB00018 */ lw $s0, 0x18($sp) -/* A2B8EC 802416AC D7B60040 */ ldc1 $f22, 0x40($sp) -/* A2B8F0 802416B0 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A2B8F4 802416B4 03E00008 */ jr $ra -/* A2B8F8 802416B8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_hos/hos_05/func_80241D08_A2A240.s b/asm/nonmatchings/world/area_hos/hos_05/func_80241D08_A2A240.s deleted file mode 100644 index 2619359a01..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/func_80241D08_A2A240.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D08_A2BF48 -/* A2BF48 80241D08 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2BF4C 80241D0C 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A2BF50 80241D10 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A2BF54 80241D14 3C04800B */ lui $a0, %hi(gCameras) -/* A2BF58 80241D18 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A2BF5C 80241D1C AFBF0010 */ sw $ra, 0x10($sp) -/* A2BF60 80241D20 00031080 */ sll $v0, $v1, 2 -/* A2BF64 80241D24 00431021 */ addu $v0, $v0, $v1 -/* A2BF68 80241D28 00021080 */ sll $v0, $v0, 2 -/* A2BF6C 80241D2C 00431023 */ subu $v0, $v0, $v1 -/* A2BF70 80241D30 000218C0 */ sll $v1, $v0, 3 -/* A2BF74 80241D34 00431021 */ addu $v0, $v0, $v1 -/* A2BF78 80241D38 000210C0 */ sll $v0, $v0, 3 -/* A2BF7C 80241D3C 10A00004 */ beqz $a1, .L80241D50 -/* A2BF80 80241D40 00442021 */ addu $a0, $v0, $a0 -/* A2BF84 80241D44 94820000 */ lhu $v0, ($a0) -/* A2BF88 80241D48 3042FFF7 */ andi $v0, $v0, 0xfff7 -/* A2BF8C 80241D4C A4820000 */ sh $v0, ($a0) -.L80241D50: -/* A2BF90 80241D50 44800000 */ mtc1 $zero, $f0 -/* A2BF94 80241D54 00000000 */ nop -/* A2BF98 80241D58 44050000 */ mfc1 $a1, $f0 -/* A2BF9C 80241D5C 24840194 */ addiu $a0, $a0, 0x194 -/* A2BFA0 80241D60 00A0302D */ daddu $a2, $a1, $zero -/* A2BFA4 80241D64 0C019E40 */ jal guTranslateF -/* A2BFA8 80241D68 00A0382D */ daddu $a3, $a1, $zero -/* A2BFAC 80241D6C 8FBF0010 */ lw $ra, 0x10($sp) -/* A2BFB0 80241D70 24020002 */ addiu $v0, $zero, 2 -/* A2BFB4 80241D74 03E00008 */ jr $ra -/* A2BFB8 80241D78 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/func_80242F74_A2A240.s b/asm/nonmatchings/world/area_hos/hos_05/func_80242F74_A2A240.s deleted file mode 100644 index b0515e0ba8..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/func_80242F74_A2A240.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F74_A2D1B4 -/* A2D1B4 80242F74 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A2D1B8 80242F78 AFB1001C */ sw $s1, 0x1c($sp) -/* A2D1BC 80242F7C 3C118025 */ lui $s1, 0x8025 -/* A2D1C0 80242F80 2631A9C8 */ addiu $s1, $s1, -0x5638 -/* A2D1C4 80242F84 3C028007 */ lui $v0, %hi(gCurrentCameraID) -/* A2D1C8 80242F88 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) -/* A2D1CC 80242F8C 3C018025 */ lui $at, 0x8025 -/* A2D1D0 80242F90 C42C987C */ lwc1 $f12, -0x6784($at) -/* A2D1D4 80242F94 3C018025 */ lui $at, 0x8025 -/* A2D1D8 80242F98 C42E98A8 */ lwc1 $f14, -0x6758($at) -/* A2D1DC 80242F9C 3C03800B */ lui $v1, %hi(gCameras) -/* A2D1E0 80242FA0 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* A2D1E4 80242FA4 AFBF0020 */ sw $ra, 0x20($sp) -/* A2D1E8 80242FA8 AFB00018 */ sw $s0, 0x18($sp) -/* A2D1EC 80242FAC AFB10010 */ sw $s1, 0x10($sp) -/* A2D1F0 80242FB0 8E260000 */ lw $a2, ($s1) -/* A2D1F4 80242FB4 3C073F80 */ lui $a3, 0x3f80 -/* A2D1F8 80242FB8 00028080 */ sll $s0, $v0, 2 -/* A2D1FC 80242FBC 02028021 */ addu $s0, $s0, $v0 -/* A2D200 80242FC0 00108080 */ sll $s0, $s0, 2 -/* A2D204 80242FC4 02028023 */ subu $s0, $s0, $v0 -/* A2D208 80242FC8 001010C0 */ sll $v0, $s0, 3 -/* A2D20C 80242FCC 02028021 */ addu $s0, $s0, $v0 -/* A2D210 80242FD0 001080C0 */ sll $s0, $s0, 3 -/* A2D214 80242FD4 0C090411 */ jal func_80241044 -/* A2D218 80242FD8 02038021 */ addu $s0, $s0, $v1 -/* A2D21C 80242FDC 24020001 */ addiu $v0, $zero, 1 -/* A2D220 80242FE0 C6200000 */ lwc1 $f0, ($s1) -/* A2D224 80242FE4 3C01442F */ lui $at, 0x442f -/* A2D228 80242FE8 44811000 */ mtc1 $at, $f2 -/* A2D22C 80242FEC 0040182D */ daddu $v1, $v0, $zero -/* A2D230 80242FF0 A6030506 */ sh $v1, 0x506($s0) -/* A2D234 80242FF4 46020032 */ c.eq.s $f0, $f2 -/* A2D238 80242FF8 00000000 */ nop -/* A2D23C 80242FFC 45010002 */ bc1t .L80243008 -/* A2D240 80243000 E60004DC */ swc1 $f0, 0x4dc($s0) -/* A2D244 80243004 0000102D */ daddu $v0, $zero, $zero -.L80243008: -/* A2D248 80243008 8FBF0020 */ lw $ra, 0x20($sp) -/* A2D24C 8024300C 8FB1001C */ lw $s1, 0x1c($sp) -/* A2D250 80243010 8FB00018 */ lw $s0, 0x18($sp) -/* A2D254 80243014 03E00008 */ jr $ra -/* A2D258 80243018 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_05/func_802456C8_A2A240.s b/asm/nonmatchings/world/area_hos/hos_05/func_802456C8_A2A240.s deleted file mode 100644 index d1147f2bab..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/func_802456C8_A2A240.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802456C8_A2F908 -/* A2F908 802456C8 3C06FC12 */ lui $a2, 0xfc12 -/* A2F90C 802456CC 34C61624 */ ori $a2, $a2, 0x1624 -/* A2F910 802456D0 3C05FF2F */ lui $a1, 0xff2f -/* A2F914 802456D4 3C04800A */ lui $a0, 0x800a -/* A2F918 802456D8 2484A66C */ addiu $a0, $a0, -0x5994 -/* A2F91C 802456DC 8C820000 */ lw $v0, ($a0) -/* A2F920 802456E0 34A5FFFF */ ori $a1, $a1, 0xffff -/* A2F924 802456E4 0040182D */ daddu $v1, $v0, $zero -/* A2F928 802456E8 24420008 */ addiu $v0, $v0, 8 -/* A2F92C 802456EC AC820000 */ sw $v0, ($a0) -/* A2F930 802456F0 AC660000 */ sw $a2, ($v1) -/* A2F934 802456F4 AC650004 */ sw $a1, 4($v1) -/* A2F938 802456F8 24430008 */ addiu $v1, $v0, 8 -/* A2F93C 802456FC AC830000 */ sw $v1, ($a0) -/* A2F940 80245700 3C048025 */ lui $a0, 0x8025 -/* A2F944 80245704 9084DCCF */ lbu $a0, -0x2331($a0) -/* A2F948 80245708 3C03FA00 */ lui $v1, 0xfa00 -/* A2F94C 8024570C AC430000 */ sw $v1, ($v0) -/* A2F950 80245710 03E00008 */ jr $ra -/* A2F954 80245714 AC440004 */ sw $a0, 4($v0) diff --git a/asm/nonmatchings/world/area_hos/hos_05/func_80245718_A2A240.s b/asm/nonmatchings/world/area_hos/hos_05/func_80245718_A2A240.s deleted file mode 100644 index 5218d498d5..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/func_80245718_A2A240.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245718_A2F958 -/* A2F958 80245718 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2F95C 8024571C AFBF0010 */ sw $ra, 0x10($sp) -/* A2F960 80245720 8C82000C */ lw $v0, 0xc($a0) -/* A2F964 80245724 0C0B1EAF */ jal get_variable -/* A2F968 80245728 8C450000 */ lw $a1, ($v0) -/* A2F96C 8024572C 8FBF0010 */ lw $ra, 0x10($sp) -/* A2F970 80245730 3C018025 */ lui $at, 0x8025 -/* A2F974 80245734 AC22DCCC */ sw $v0, -0x2334($at) -/* A2F978 80245738 24020002 */ addiu $v0, $zero, 2 -/* A2F97C 8024573C 03E00008 */ jr $ra -/* A2F980 80245740 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/pause_tabs_draw_badges_A2A240.s b/asm/nonmatchings/world/area_hos/hos_05/pause_tabs_draw_badges_A2A240.s deleted file mode 100644 index 5c4aff40ea..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/pause_tabs_draw_badges_A2A240.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_tabs_draw_badges_A2EF00 -/* A2EF00 80244CC0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A2EF04 80244CC4 AFB10014 */ sw $s1, 0x14($sp) -/* A2EF08 80244CC8 0080882D */ daddu $s1, $a0, $zero -/* A2EF0C 80244CCC AFBF001C */ sw $ra, 0x1c($sp) -/* A2EF10 80244CD0 AFB20018 */ sw $s2, 0x18($sp) -/* A2EF14 80244CD4 AFB00010 */ sw $s0, 0x10($sp) -/* A2EF18 80244CD8 8E30000C */ lw $s0, 0xc($s1) -/* A2EF1C 80244CDC 8E050000 */ lw $a1, ($s0) -/* A2EF20 80244CE0 0C0B1EAF */ jal get_variable -/* A2EF24 80244CE4 26100004 */ addiu $s0, $s0, 4 -/* A2EF28 80244CE8 8E050000 */ lw $a1, ($s0) -/* A2EF2C 80244CEC 26100004 */ addiu $s0, $s0, 4 -/* A2EF30 80244CF0 0220202D */ daddu $a0, $s1, $zero -/* A2EF34 80244CF4 0C0B1EAF */ jal get_variable -/* A2EF38 80244CF8 0040902D */ daddu $s2, $v0, $zero -/* A2EF3C 80244CFC 0220202D */ daddu $a0, $s1, $zero -/* A2EF40 80244D00 8E050000 */ lw $a1, ($s0) -/* A2EF44 80244D04 0C0B1EAF */ jal get_variable -/* A2EF48 80244D08 0040802D */ daddu $s0, $v0, $zero -/* A2EF4C 80244D0C 0040882D */ daddu $s1, $v0, $zero -/* A2EF50 80244D10 2402FFFF */ addiu $v0, $zero, -1 -/* A2EF54 80244D14 16020005 */ bne $s0, $v0, .L80244D2C -/* A2EF58 80244D18 24020001 */ addiu $v0, $zero, 1 -/* A2EF5C 80244D1C 0C04760B */ jal func_8011D82C -/* A2EF60 80244D20 0220202D */ daddu $a0, $s1, $zero -/* A2EF64 80244D24 08091373 */ j .L80244DCC -/* A2EF68 80244D28 24020002 */ addiu $v0, $zero, 2 -.L80244D2C: -/* A2EF6C 80244D2C 12420018 */ beq $s2, $v0, .L80244D90 -/* A2EF70 80244D30 2A420002 */ slti $v0, $s2, 2 -/* A2EF74 80244D34 10400005 */ beqz $v0, .L80244D4C -/* A2EF78 80244D38 24020002 */ addiu $v0, $zero, 2 -/* A2EF7C 80244D3C 12400007 */ beqz $s2, .L80244D5C -/* A2EF80 80244D40 3412FFFF */ ori $s2, $zero, 0xffff -/* A2EF84 80244D44 08091373 */ j .L80244DCC -/* A2EF88 80244D48 00000000 */ nop -.L80244D4C: -/* A2EF8C 80244D4C 1242001B */ beq $s2, $v0, .L80244DBC -/* A2EF90 80244D50 24020002 */ addiu $v0, $zero, 2 -/* A2EF94 80244D54 08091373 */ j .L80244DCC -/* A2EF98 80244D58 00000000 */ nop -.L80244D5C: -/* A2EF9C 80244D5C 8E040000 */ lw $a0, ($s0) -/* A2EFA0 80244D60 1092001A */ beq $a0, $s2, .L80244DCC -/* A2EFA4 80244D64 24020002 */ addiu $v0, $zero, 2 -/* A2EFA8 80244D68 0C046C04 */ jal get_model_list_index_from_tree_index -/* A2EFAC 80244D6C 26100004 */ addiu $s0, $s0, 4 -/* A2EFB0 80244D70 0C046B4C */ jal get_model_from_list_index -/* A2EFB4 80244D74 0040202D */ daddu $a0, $v0, $zero -/* A2EFB8 80244D78 0040202D */ daddu $a0, $v0, $zero -/* A2EFBC 80244D7C 2405FFFF */ addiu $a1, $zero, -1 -/* A2EFC0 80244D80 0C046F1F */ jal func_8011BC7C -/* A2EFC4 80244D84 0220302D */ daddu $a2, $s1, $zero -/* A2EFC8 80244D88 08091357 */ j .L80244D5C -/* A2EFCC 80244D8C 00000000 */ nop -.L80244D90: -/* A2EFD0 80244D90 3412FFFF */ ori $s2, $zero, 0xffff -.L80244D94: -/* A2EFD4 80244D94 8E020000 */ lw $v0, ($s0) -/* A2EFD8 80244D98 1052000B */ beq $v0, $s2, .L80244DC8 -/* A2EFDC 80244D9C 2405FFFF */ addiu $a1, $zero, -1 -/* A2EFE0 80244DA0 96040002 */ lhu $a0, 2($s0) -/* A2EFE4 80244DA4 0220302D */ daddu $a2, $s1, $zero -/* A2EFE8 80244DA8 26100004 */ addiu $s0, $s0, 4 -/* A2EFEC 80244DAC 0C046E54 */ jal func_8011B950 -/* A2EFF0 80244DB0 0000382D */ daddu $a3, $zero, $zero -/* A2EFF4 80244DB4 08091365 */ j .L80244D94 -/* A2EFF8 80244DB8 00000000 */ nop -.L80244DBC: -/* A2EFFC 80244DBC 3C028015 */ lui $v0, 0x8015 -/* A2F000 80244DC0 8C4212F0 */ lw $v0, 0x12f0($v0) -/* A2F004 80244DC4 A0510000 */ sb $s1, ($v0) -.L80244DC8: -/* A2F008 80244DC8 24020002 */ addiu $v0, $zero, 2 -.L80244DCC: -/* A2F00C 80244DCC 8FBF001C */ lw $ra, 0x1c($sp) -/* A2F010 80244DD0 8FB20018 */ lw $s2, 0x18($sp) -/* A2F014 80244DD4 8FB10014 */ lw $s1, 0x14($sp) -/* A2F018 80244DD8 8FB00010 */ lw $s0, 0x10($sp) -/* A2F01C 80244DDC 03E00008 */ jr $ra -/* A2F020 80244DE0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_05/update_heroes_start_turn_A2A240.s b/asm/nonmatchings/world/area_hos/hos_05/update_heroes_start_turn_A2A240.s deleted file mode 100644 index fe9f09d277..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/update_heroes_start_turn_A2A240.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_heroes_start_turn_A2C264 -/* A2C264 80242024 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A2C268 80242028 AFB30034 */ sw $s3, 0x34($sp) -/* A2C26C 8024202C 0080982D */ daddu $s3, $a0, $zero -/* A2C270 80242030 0000202D */ daddu $a0, $zero, $zero -/* A2C274 80242034 AFB20030 */ sw $s2, 0x30($sp) -/* A2C278 80242038 3C128025 */ lui $s2, 0x8025 -/* A2C27C 8024203C 26529A70 */ addiu $s2, $s2, -0x6590 -/* A2C280 80242040 AFBF0038 */ sw $ra, 0x38($sp) -/* A2C284 80242044 AFB1002C */ sw $s1, 0x2c($sp) -/* A2C288 80242048 AFB00028 */ sw $s0, 0x28($sp) -/* A2C28C 8024204C F7B40040 */ sdc1 $f20, 0x40($sp) -/* A2C290 80242050 C6400000 */ lwc1 $f0, ($s2) -/* A2C294 80242054 46800020 */ cvt.s.w $f0, $f0 -/* A2C298 80242058 3C118025 */ lui $s1, 0x8025 -/* A2C29C 8024205C 26319A6C */ addiu $s1, $s1, -0x6594 -/* A2C2A0 80242060 3C0542F3 */ lui $a1, 0x42f3 -/* A2C2A4 80242064 34A53333 */ ori $a1, $a1, 0x3333 -/* A2C2A8 80242068 3C0142B4 */ lui $at, 0x42b4 -/* A2C2AC 8024206C 4481A000 */ mtc1 $at, $f20 -/* A2C2B0 80242070 44070000 */ mfc1 $a3, $f0 -/* A2C2B4 80242074 3C014220 */ lui $at, 0x4220 -/* A2C2B8 80242078 44810000 */ mtc1 $at, $f0 -/* A2C2BC 8024207C 3C028007 */ lui $v0, %hi(gCurrentCameraID) -/* A2C2C0 80242080 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) -/* A2C2C4 80242084 3C03800B */ lui $v1, %hi(gCameras) -/* A2C2C8 80242088 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* A2C2CC 8024208C AFB10014 */ sw $s1, 0x14($sp) -/* A2C2D0 80242090 00028080 */ sll $s0, $v0, 2 -/* A2C2D4 80242094 02028021 */ addu $s0, $s0, $v0 -/* A2C2D8 80242098 00108080 */ sll $s0, $s0, 2 -/* A2C2DC 8024209C 02028023 */ subu $s0, $s0, $v0 -/* A2C2E0 802420A0 001010C0 */ sll $v0, $s0, 3 -/* A2C2E4 802420A4 02028021 */ addu $s0, $s0, $v0 -/* A2C2E8 802420A8 001080C0 */ sll $s0, $s0, 3 -/* A2C2EC 802420AC 4406A000 */ mfc1 $a2, $f20 -/* A2C2F0 802420B0 02038021 */ addu $s0, $s0, $v1 -/* A2C2F4 802420B4 0C090439 */ jal func_802410E4 -/* A2C2F8 802420B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* A2C2FC 802420BC 3C026666 */ lui $v0, 0x6666 -/* A2C300 802420C0 34426667 */ ori $v0, $v0, 0x6667 -/* A2C304 802420C4 8E440000 */ lw $a0, ($s2) -/* A2C308 802420C8 C6200000 */ lwc1 $f0, ($s1) -/* A2C30C 802420CC 00820018 */ mult $a0, $v0 -/* A2C310 802420D0 24020001 */ addiu $v0, $zero, 1 -/* A2C314 802420D4 A6020506 */ sh $v0, 0x506($s0) -/* A2C318 802420D8 000417C3 */ sra $v0, $a0, 0x1f -/* A2C31C 802420DC 00004010 */ mfhi $t0 -/* A2C320 802420E0 00081843 */ sra $v1, $t0, 1 -/* A2C324 802420E4 00621823 */ subu $v1, $v1, $v0 -/* A2C328 802420E8 00031080 */ sll $v0, $v1, 2 -/* A2C32C 802420EC 00431021 */ addu $v0, $v0, $v1 -/* A2C330 802420F0 1482002C */ bne $a0, $v0, .L802421A4 -/* A2C334 802420F4 E60004DC */ swc1 $f0, 0x4dc($s0) -/* A2C338 802420F8 46140032 */ c.eq.s $f0, $f20 -/* A2C33C 802420FC 00000000 */ nop -/* A2C340 80242100 45010028 */ bc1t .L802421A4 -/* A2C344 80242104 0260202D */ daddu $a0, $s3, $zero -/* A2C348 80242108 0C0B36B0 */ jal resolve_npc -/* A2C34C 8024210C 24050007 */ addiu $a1, $zero, 7 -/* A2C350 80242110 C6600084 */ lwc1 $f0, 0x84($s3) -/* A2C354 80242114 46800020 */ cvt.s.w $f0, $f0 -/* A2C358 80242118 C6680088 */ lwc1 $f8, 0x88($s3) -/* A2C35C 8024211C 46804220 */ cvt.s.w $f8, $f8 -/* A2C360 80242120 C666008C */ lwc1 $f6, 0x8c($s3) -/* A2C364 80242124 468031A0 */ cvt.s.w $f6, $f6 -/* A2C368 80242128 44050000 */ mfc1 $a1, $f0 -/* A2C36C 8024212C 8E630090 */ lw $v1, 0x90($s3) -/* A2C370 80242130 C444003C */ lwc1 $f4, 0x3c($v0) -/* A2C374 80242134 3C014316 */ lui $at, 0x4316 -/* A2C378 80242138 44810000 */ mtc1 $at, $f0 -/* A2C37C 8024213C 2463FFFB */ addiu $v1, $v1, -5 -/* A2C380 80242140 44831000 */ mtc1 $v1, $f2 -/* A2C384 80242144 00000000 */ nop -/* A2C388 80242148 468010A0 */ cvt.s.w $f2, $f2 -/* A2C38C 8024214C 46002101 */ sub.s $f4, $f4, $f0 -/* A2C390 80242150 E7A20010 */ swc1 $f2, 0x10($sp) -/* A2C394 80242154 C6600094 */ lwc1 $f0, 0x94($s3) -/* A2C398 80242158 46800020 */ cvt.s.w $f0, $f0 -/* A2C39C 8024215C 46040000 */ add.s $f0, $f0, $f4 -/* A2C3A0 80242160 24040001 */ addiu $a0, $zero, 1 -/* A2C3A4 80242164 44073000 */ mfc1 $a3, $f6 -/* A2C3A8 80242168 46044200 */ add.s $f8, $f8, $f4 -/* A2C3AC 8024216C E7A00014 */ swc1 $f0, 0x14($sp) -/* A2C3B0 80242170 8E630098 */ lw $v1, 0x98($s3) -/* A2C3B4 80242174 44064000 */ mfc1 $a2, $f8 -/* A2C3B8 80242178 24020005 */ addiu $v0, $zero, 5 -/* A2C3BC 8024217C AFA20020 */ sw $v0, 0x20($sp) -/* A2C3C0 80242180 24020014 */ addiu $v0, $zero, 0x14 -/* A2C3C4 80242184 AFA0001C */ sw $zero, 0x1c($sp) -/* A2C3C8 80242188 AFA20024 */ sw $v0, 0x24($sp) -/* A2C3CC 8024218C 2463FFE2 */ addiu $v1, $v1, -0x1e -/* A2C3D0 80242190 44830000 */ mtc1 $v1, $f0 -/* A2C3D4 80242194 00000000 */ nop -/* A2C3D8 80242198 46800020 */ cvt.s.w $f0, $f0 -/* A2C3DC 8024219C 0C01C34C */ jal func_80070D30 -/* A2C3E0 802421A0 E7A00018 */ swc1 $f0, 0x18($sp) -.L802421A4: -/* A2C3E4 802421A4 3C038025 */ lui $v1, 0x8025 -/* A2C3E8 802421A8 24639A70 */ addiu $v1, $v1, -0x6590 -/* A2C3EC 802421AC 8C640000 */ lw $a0, ($v1) -/* A2C3F0 802421B0 24840001 */ addiu $a0, $a0, 1 -/* A2C3F4 802421B4 28820029 */ slti $v0, $a0, 0x29 -/* A2C3F8 802421B8 AC640000 */ sw $a0, ($v1) -/* A2C3FC 802421BC 8FBF0038 */ lw $ra, 0x38($sp) -/* A2C400 802421C0 8FB30034 */ lw $s3, 0x34($sp) -/* A2C404 802421C4 8FB20030 */ lw $s2, 0x30($sp) -/* A2C408 802421C8 8FB1002C */ lw $s1, 0x2c($sp) -/* A2C40C 802421CC 8FB00028 */ lw $s0, 0x28($sp) -/* A2C410 802421D0 D7B40040 */ ldc1 $f20, 0x40($sp) -/* A2C414 802421D4 38420001 */ xori $v0, $v0, 1 -/* A2C418 802421D8 03E00008 */ jr $ra -/* A2C41C 802421DC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_hos/hos_06/func_80240D30_A394E0.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A210/func_80240D30_A3A210.s similarity index 100% rename from asm/nonmatchings/world/area_hos/hos_06/func_80240D30_A394E0.s rename to asm/nonmatchings/world/area_hos/hos_06/_A3A210/func_80240D30_A3A210.s diff --git a/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80240D50.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80240D50.s new file mode 100644 index 0000000000..ede83b69de --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80240D50.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D50 +/* A3A230 80240D50 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A3A234 80240D54 AFB10014 */ sw $s1, 0x14($sp) +/* A3A238 80240D58 0080882D */ daddu $s1, $a0, $zero +/* A3A23C 80240D5C AFBF0018 */ sw $ra, 0x18($sp) +/* A3A240 80240D60 AFB00010 */ sw $s0, 0x10($sp) +/* A3A244 80240D64 8E30000C */ lw $s0, 0xc($s1) +/* A3A248 80240D68 8E050000 */ lw $a1, ($s0) +/* A3A24C 80240D6C 0C0B1EAF */ jal get_variable +/* A3A250 80240D70 26100004 */ addiu $s0, $s0, 4 +/* A3A254 80240D74 0C00EAD2 */ jal get_npc_safe +/* A3A258 80240D78 0040202D */ daddu $a0, $v0, $zero +/* A3A25C 80240D7C 10400005 */ beqz $v0, .L80240D94 +/* A3A260 80240D80 00000000 */ nop +/* A3A264 80240D84 8E050000 */ lw $a1, ($s0) +/* A3A268 80240D88 844600A8 */ lh $a2, 0xa8($v0) +/* A3A26C 80240D8C 0C0B2026 */ jal set_variable +/* A3A270 80240D90 0220202D */ daddu $a0, $s1, $zero +.L80240D94: +/* A3A274 80240D94 8FBF0018 */ lw $ra, 0x18($sp) +/* A3A278 80240D98 8FB10014 */ lw $s1, 0x14($sp) +/* A3A27C 80240D9C 8FB00010 */ lw $s0, 0x10($sp) +/* A3A280 80240DA0 24020002 */ addiu $v0, $zero, 2 +/* A3A284 80240DA4 03E00008 */ jr $ra +/* A3A288 80240DA8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80240DAC.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80240DAC.s new file mode 100644 index 0000000000..266ebfdea8 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80240DAC.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DAC +/* A3A28C 80240DAC 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* A3A290 80240DB0 AFB10014 */ sw $s1, 0x14($sp) +/* A3A294 80240DB4 0080882D */ daddu $s1, $a0, $zero +/* A3A298 80240DB8 AFBF0024 */ sw $ra, 0x24($sp) +/* A3A29C 80240DBC AFB40020 */ sw $s4, 0x20($sp) +/* A3A2A0 80240DC0 AFB3001C */ sw $s3, 0x1c($sp) +/* A3A2A4 80240DC4 AFB20018 */ sw $s2, 0x18($sp) +/* A3A2A8 80240DC8 AFB00010 */ sw $s0, 0x10($sp) +/* A3A2AC 80240DCC F7BC0048 */ sdc1 $f28, 0x48($sp) +/* A3A2B0 80240DD0 F7BA0040 */ sdc1 $f26, 0x40($sp) +/* A3A2B4 80240DD4 F7B80038 */ sdc1 $f24, 0x38($sp) +/* A3A2B8 80240DD8 F7B60030 */ sdc1 $f22, 0x30($sp) +/* A3A2BC 80240DDC F7B40028 */ sdc1 $f20, 0x28($sp) +/* A3A2C0 80240DE0 8E30000C */ lw $s0, 0xc($s1) +/* A3A2C4 80240DE4 8E130000 */ lw $s3, ($s0) +/* A3A2C8 80240DE8 26100004 */ addiu $s0, $s0, 4 +/* A3A2CC 80240DEC 0C0B1EAF */ jal get_variable +/* A3A2D0 80240DF0 0260282D */ daddu $a1, $s3, $zero +/* A3A2D4 80240DF4 4482E000 */ mtc1 $v0, $f28 +/* A3A2D8 80240DF8 00000000 */ nop +/* A3A2DC 80240DFC 4680E720 */ cvt.s.w $f28, $f28 +/* A3A2E0 80240E00 8E140000 */ lw $s4, ($s0) +/* A3A2E4 80240E04 26100004 */ addiu $s0, $s0, 4 +/* A3A2E8 80240E08 0220202D */ daddu $a0, $s1, $zero +/* A3A2EC 80240E0C 0C0B1EAF */ jal get_variable +/* A3A2F0 80240E10 0280282D */ daddu $a1, $s4, $zero +/* A3A2F4 80240E14 4482D000 */ mtc1 $v0, $f26 +/* A3A2F8 80240E18 00000000 */ nop +/* A3A2FC 80240E1C 4680D6A0 */ cvt.s.w $f26, $f26 +/* A3A300 80240E20 8E100000 */ lw $s0, ($s0) +/* A3A304 80240E24 0220202D */ daddu $a0, $s1, $zero +/* A3A308 80240E28 0C0B1EAF */ jal get_variable +/* A3A30C 80240E2C 0200282D */ daddu $a1, $s0, $zero +/* A3A310 80240E30 4482C000 */ mtc1 $v0, $f24 +/* A3A314 80240E34 00000000 */ nop +/* A3A318 80240E38 4680C620 */ cvt.s.w $f24, $f24 +/* A3A31C 80240E3C 3C128011 */ lui $s2, %hi(gPlayerStatus) +/* A3A320 80240E40 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) +/* A3A324 80240E44 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* A3A328 80240E48 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* A3A32C 80240E4C C64200A8 */ lwc1 $f2, 0xa8($s2) +/* A3A330 80240E50 44800000 */ mtc1 $zero, $f0 +/* A3A334 80240E54 00031080 */ sll $v0, $v1, 2 +/* A3A338 80240E58 00431021 */ addu $v0, $v0, $v1 +/* A3A33C 80240E5C 00021080 */ sll $v0, $v0, 2 +/* A3A340 80240E60 00431023 */ subu $v0, $v0, $v1 +/* A3A344 80240E64 000218C0 */ sll $v1, $v0, 3 +/* A3A348 80240E68 00431021 */ addu $v0, $v0, $v1 +/* A3A34C 80240E6C 000210C0 */ sll $v0, $v0, 3 +/* A3A350 80240E70 46001032 */ c.eq.s $f2, $f0 +/* A3A354 80240E74 3C01800B */ lui $at, 0x800b +/* A3A358 80240E78 00220821 */ addu $at, $at, $v0 +/* A3A35C 80240E7C C4361DEC */ lwc1 $f22, 0x1dec($at) +/* A3A360 80240E80 45000005 */ bc1f .L80240E98 +/* A3A364 80240E84 00000000 */ nop +/* A3A368 80240E88 3C0142C8 */ lui $at, 0x42c8 +/* A3A36C 80240E8C 44810000 */ mtc1 $at, $f0 +/* A3A370 80240E90 080903AA */ j .L80240EA8 +/* A3A374 80240E94 4600B581 */ sub.s $f22, $f22, $f0 +.L80240E98: +/* A3A378 80240E98 3C0142C8 */ lui $at, 0x42c8 +/* A3A37C 80240E9C 44810000 */ mtc1 $at, $f0 +/* A3A380 80240EA0 00000000 */ nop +/* A3A384 80240EA4 4600B580 */ add.s $f22, $f22, $f0 +.L80240EA8: +/* A3A388 80240EA8 0C00A6C9 */ jal clamp_angle +/* A3A38C 80240EAC 4600B306 */ mov.s $f12, $f22 +/* A3A390 80240EB0 46000586 */ mov.s $f22, $f0 +/* A3A394 80240EB4 3C014170 */ lui $at, 0x4170 +/* A3A398 80240EB8 4481A000 */ mtc1 $at, $f20 +/* A3A39C 80240EBC 0C00A8BB */ jal sin_deg +/* A3A3A0 80240EC0 4600B306 */ mov.s $f12, $f22 +/* A3A3A4 80240EC4 46140002 */ mul.s $f0, $f0, $f20 +/* A3A3A8 80240EC8 00000000 */ nop +/* A3A3AC 80240ECC 864200B0 */ lh $v0, 0xb0($s2) +/* A3A3B0 80240ED0 3C013F00 */ lui $at, 0x3f00 +/* A3A3B4 80240ED4 44812000 */ mtc1 $at, $f4 +/* A3A3B8 80240ED8 44821000 */ mtc1 $v0, $f2 +/* A3A3BC 80240EDC 00000000 */ nop +/* A3A3C0 80240EE0 468010A0 */ cvt.s.w $f2, $f2 +/* A3A3C4 80240EE4 46041082 */ mul.s $f2, $f2, $f4 +/* A3A3C8 80240EE8 00000000 */ nop +/* A3A3CC 80240EEC 4600E700 */ add.s $f28, $f28, $f0 +/* A3A3D0 80240EF0 4602D680 */ add.s $f26, $f26, $f2 +/* A3A3D4 80240EF4 0C00A8D4 */ jal cos_deg +/* A3A3D8 80240EF8 4600B306 */ mov.s $f12, $f22 +/* A3A3DC 80240EFC 46140002 */ mul.s $f0, $f0, $f20 +/* A3A3E0 80240F00 00000000 */ nop +/* A3A3E4 80240F04 0220202D */ daddu $a0, $s1, $zero +/* A3A3E8 80240F08 0260282D */ daddu $a1, $s3, $zero +/* A3A3EC 80240F0C 4600E18D */ trunc.w.s $f6, $f28 +/* A3A3F0 80240F10 44063000 */ mfc1 $a2, $f6 +/* A3A3F4 80240F14 0C0B2026 */ jal set_variable +/* A3A3F8 80240F18 4600C601 */ sub.s $f24, $f24, $f0 +/* A3A3FC 80240F1C 0220202D */ daddu $a0, $s1, $zero +/* A3A400 80240F20 4600D18D */ trunc.w.s $f6, $f26 +/* A3A404 80240F24 44063000 */ mfc1 $a2, $f6 +/* A3A408 80240F28 0C0B2026 */ jal set_variable +/* A3A40C 80240F2C 0280282D */ daddu $a1, $s4, $zero +/* A3A410 80240F30 0220202D */ daddu $a0, $s1, $zero +/* A3A414 80240F34 4600C18D */ trunc.w.s $f6, $f24 +/* A3A418 80240F38 44063000 */ mfc1 $a2, $f6 +/* A3A41C 80240F3C 0C0B2026 */ jal set_variable +/* A3A420 80240F40 0200282D */ daddu $a1, $s0, $zero +/* A3A424 80240F44 8FBF0024 */ lw $ra, 0x24($sp) +/* A3A428 80240F48 8FB40020 */ lw $s4, 0x20($sp) +/* A3A42C 80240F4C 8FB3001C */ lw $s3, 0x1c($sp) +/* A3A430 80240F50 8FB20018 */ lw $s2, 0x18($sp) +/* A3A434 80240F54 8FB10014 */ lw $s1, 0x14($sp) +/* A3A438 80240F58 8FB00010 */ lw $s0, 0x10($sp) +/* A3A43C 80240F5C D7BC0048 */ ldc1 $f28, 0x48($sp) +/* A3A440 80240F60 D7BA0040 */ ldc1 $f26, 0x40($sp) +/* A3A444 80240F64 D7B80038 */ ldc1 $f24, 0x38($sp) +/* A3A448 80240F68 D7B60030 */ ldc1 $f22, 0x30($sp) +/* A3A44C 80240F6C D7B40028 */ ldc1 $f20, 0x28($sp) +/* A3A450 80240F70 24020002 */ addiu $v0, $zero, 2 +/* A3A454 80240F74 03E00008 */ jr $ra +/* A3A458 80240F78 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80240F7C.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80240F7C.s new file mode 100644 index 0000000000..579d27d0f5 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80240F7C.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F7C +/* A3A45C 80240F7C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A3A460 80240F80 AFBF0010 */ sw $ra, 0x10($sp) +/* A3A464 80240F84 10A00003 */ beqz $a1, .L80240F94 +/* A3A468 80240F88 8C86000C */ lw $a2, 0xc($a0) +/* A3A46C 80240F8C 3C018024 */ lui $at, 0x8024 +/* A3A470 80240F90 AC2045D0 */ sw $zero, 0x45d0($at) +.L80240F94: +/* A3A474 80240F94 3C038024 */ lui $v1, 0x8024 +/* A3A478 80240F98 246345D0 */ addiu $v1, $v1, 0x45d0 +/* A3A47C 80240F9C 8C620000 */ lw $v0, ($v1) +/* A3A480 80240FA0 54400003 */ bnel $v0, $zero, .L80240FB0 +/* A3A484 80240FA4 AC600000 */ sw $zero, ($v1) +/* A3A488 80240FA8 080903F1 */ j .L80240FC4 +/* A3A48C 80240FAC 0000102D */ daddu $v0, $zero, $zero +.L80240FB0: +/* A3A490 80240FB0 8CC50000 */ lw $a1, ($a2) +/* A3A494 80240FB4 3C068024 */ lui $a2, 0x8024 +/* A3A498 80240FB8 0C0B2026 */ jal set_variable +/* A3A49C 80240FBC 8CC645D4 */ lw $a2, 0x45d4($a2) +/* A3A4A0 80240FC0 24020002 */ addiu $v0, $zero, 2 +.L80240FC4: +/* A3A4A4 80240FC4 8FBF0010 */ lw $ra, 0x10($sp) +/* A3A4A8 80240FC8 03E00008 */ jr $ra +/* A3A4AC 80240FCC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/func_80240FD0_A394E0.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80240FD0_A3A4B0.s similarity index 100% rename from asm/nonmatchings/world/area_hos/hos_06/func_80240FD0_A394E0.s rename to asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80240FD0_A3A4B0.s diff --git a/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241008.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241008.s new file mode 100644 index 0000000000..31e5ffb863 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241008.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241008 +/* A3A4E8 80241008 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A3A4EC 8024100C AFBF0010 */ sw $ra, 0x10($sp) +/* A3A4F0 80241010 8C82000C */ lw $v0, 0xc($a0) +/* A3A4F4 80241014 0C0B1EAF */ jal get_variable +/* A3A4F8 80241018 8C450000 */ lw $a1, ($v0) +/* A3A4FC 8024101C 0040182D */ daddu $v1, $v0, $zero +/* A3A500 80241020 10600012 */ beqz $v1, .L8024106C +/* A3A504 80241024 0000202D */ daddu $a0, $zero, $zero +/* A3A508 80241028 8C620000 */ lw $v0, ($v1) +/* A3A50C 8024102C 5040000A */ beql $v0, $zero, .L80241058 +/* A3A510 80241030 00041080 */ sll $v0, $a0, 2 +/* A3A514 80241034 3C058024 */ lui $a1, 0x8024 +/* A3A518 80241038 24A56430 */ addiu $a1, $a1, 0x6430 +.L8024103C: +/* A3A51C 8024103C 24630004 */ addiu $v1, $v1, 4 +/* A3A520 80241040 24840001 */ addiu $a0, $a0, 1 +/* A3A524 80241044 ACA20000 */ sw $v0, ($a1) +/* A3A528 80241048 8C620000 */ lw $v0, ($v1) +/* A3A52C 8024104C 1440FFFB */ bnez $v0, .L8024103C +/* A3A530 80241050 24A50004 */ addiu $a1, $a1, 4 +/* A3A534 80241054 00041080 */ sll $v0, $a0, 2 +.L80241058: +/* A3A538 80241058 3C018024 */ lui $at, 0x8024 +/* A3A53C 8024105C 00220821 */ addu $at, $at, $v0 +/* A3A540 80241060 AC206430 */ sw $zero, 0x6430($at) +/* A3A544 80241064 08090425 */ j .L80241094 +/* A3A548 80241068 00000000 */ nop +.L8024106C: +/* A3A54C 8024106C 3C038024 */ lui $v1, 0x8024 +/* A3A550 80241070 24636430 */ addiu $v1, $v1, 0x6430 +/* A3A554 80241074 0060282D */ daddu $a1, $v1, $zero +.L80241078: +/* A3A558 80241078 24820010 */ addiu $v0, $a0, 0x10 +/* A3A55C 8024107C AC620000 */ sw $v0, ($v1) +/* A3A560 80241080 24630004 */ addiu $v1, $v1, 4 +/* A3A564 80241084 24840001 */ addiu $a0, $a0, 1 +/* A3A568 80241088 28820070 */ slti $v0, $a0, 0x70 +/* A3A56C 8024108C 1440FFFA */ bnez $v0, .L80241078 +/* A3A570 80241090 ACA001C0 */ sw $zero, 0x1c0($a1) +.L80241094: +/* A3A574 80241094 8FBF0010 */ lw $ra, 0x10($sp) +/* A3A578 80241098 24020002 */ addiu $v0, $zero, 2 +/* A3A57C 8024109C 03E00008 */ jr $ra +/* A3A580 802410A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802410A4.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802410A4.s new file mode 100644 index 0000000000..99c7fd1cd6 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802410A4.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410A4 +/* A3A584 802410A4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A3A588 802410A8 AFB00010 */ sw $s0, 0x10($sp) +/* A3A58C 802410AC 3C108024 */ lui $s0, 0x8024 +/* A3A590 802410B0 2610476C */ addiu $s0, $s0, 0x476c +/* A3A594 802410B4 AFBF0018 */ sw $ra, 0x18($sp) +/* A3A598 802410B8 AFB10014 */ sw $s1, 0x14($sp) +/* A3A59C 802410BC 8E020000 */ lw $v0, ($s0) +/* A3A5A0 802410C0 14400010 */ bnez $v0, .L80241104 +/* A3A5A4 802410C4 0080882D */ daddu $s1, $a0, $zero +/* A3A5A8 802410C8 0C00AB39 */ jal heap_malloc +/* A3A5AC 802410CC 24040040 */ addiu $a0, $zero, 0x40 +/* A3A5B0 802410D0 AE020000 */ sw $v0, ($s0) +/* A3A5B4 802410D4 0000182D */ daddu $v1, $zero, $zero +/* A3A5B8 802410D8 0040282D */ daddu $a1, $v0, $zero +/* A3A5BC 802410DC 0220202D */ daddu $a0, $s1, $zero +.L802410E0: +/* A3A5C0 802410E0 8C820084 */ lw $v0, 0x84($a0) +/* A3A5C4 802410E4 24840004 */ addiu $a0, $a0, 4 +/* A3A5C8 802410E8 24630001 */ addiu $v1, $v1, 1 +/* A3A5CC 802410EC ACA20000 */ sw $v0, ($a1) +/* A3A5D0 802410F0 28620010 */ slti $v0, $v1, 0x10 +/* A3A5D4 802410F4 1440FFFA */ bnez $v0, .L802410E0 +/* A3A5D8 802410F8 24A50004 */ addiu $a1, $a1, 4 +/* A3A5DC 802410FC 08090450 */ j .L80241140 +/* A3A5E0 80241100 00000000 */ nop +.L80241104: +/* A3A5E4 80241104 0000182D */ daddu $v1, $zero, $zero +/* A3A5E8 80241108 0040282D */ daddu $a1, $v0, $zero +/* A3A5EC 8024110C 0220202D */ daddu $a0, $s1, $zero +.L80241110: +/* A3A5F0 80241110 8CA20000 */ lw $v0, ($a1) +/* A3A5F4 80241114 24A50004 */ addiu $a1, $a1, 4 +/* A3A5F8 80241118 24630001 */ addiu $v1, $v1, 1 +/* A3A5FC 8024111C AC820084 */ sw $v0, 0x84($a0) +/* A3A600 80241120 28620010 */ slti $v0, $v1, 0x10 +/* A3A604 80241124 1440FFFA */ bnez $v0, .L80241110 +/* A3A608 80241128 24840004 */ addiu $a0, $a0, 4 +/* A3A60C 8024112C 3C108024 */ lui $s0, 0x8024 +/* A3A610 80241130 2610476C */ addiu $s0, $s0, 0x476c +/* A3A614 80241134 0C00AB4B */ jal heap_free +/* A3A618 80241138 8E040000 */ lw $a0, ($s0) +/* A3A61C 8024113C AE000000 */ sw $zero, ($s0) +.L80241140: +/* A3A620 80241140 8FBF0018 */ lw $ra, 0x18($sp) +/* A3A624 80241144 8FB10014 */ lw $s1, 0x14($sp) +/* A3A628 80241148 8FB00010 */ lw $s0, 0x10($sp) +/* A3A62C 8024114C 24020002 */ addiu $v0, $zero, 2 +/* A3A630 80241150 03E00008 */ jr $ra +/* A3A634 80241154 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241158.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241158.s new file mode 100644 index 0000000000..ff427fd2d7 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241158.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241158 +/* A3A638 80241158 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A3A63C 8024115C AFB00010 */ sw $s0, 0x10($sp) +/* A3A640 80241160 0080802D */ daddu $s0, $a0, $zero +/* A3A644 80241164 AFBF0018 */ sw $ra, 0x18($sp) +/* A3A648 80241168 AFB10014 */ sw $s1, 0x14($sp) +/* A3A64C 8024116C 8E02000C */ lw $v0, 0xc($s0) +/* A3A650 80241170 8C510000 */ lw $s1, ($v0) +/* A3A654 80241174 0C0B1EAF */ jal get_variable +/* A3A658 80241178 0220282D */ daddu $a1, $s1, $zero +/* A3A65C 8024117C 3C03FFF0 */ lui $v1, 0xfff0 +/* A3A660 80241180 3463FFFF */ ori $v1, $v1, 0xffff +/* A3A664 80241184 0200202D */ daddu $a0, $s0, $zero +/* A3A668 80241188 00431024 */ and $v0, $v0, $v1 +/* A3A66C 8024118C 00021140 */ sll $v0, $v0, 5 +/* A3A670 80241190 3C068008 */ lui $a2, %hi(gItemTable) +/* A3A674 80241194 00C23021 */ addu $a2, $a2, $v0 +/* A3A678 80241198 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) +/* A3A67C 8024119C 0C0B2026 */ jal set_variable +/* A3A680 802411A0 0220282D */ daddu $a1, $s1, $zero +/* A3A684 802411A4 8FBF0018 */ lw $ra, 0x18($sp) +/* A3A688 802411A8 8FB10014 */ lw $s1, 0x14($sp) +/* A3A68C 802411AC 8FB00010 */ lw $s0, 0x10($sp) +/* A3A690 802411B0 24020002 */ addiu $v0, $zero, 2 +/* A3A694 802411B4 03E00008 */ jr $ra +/* A3A698 802411B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802411BC.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802411BC.s new file mode 100644 index 0000000000..70c8f25f7f --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802411BC.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411BC +/* A3A69C 802411BC 0000282D */ daddu $a1, $zero, $zero +/* A3A6A0 802411C0 3C038011 */ lui $v1, %hi(gPlayerData) +/* A3A6A4 802411C4 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +.L802411C8: +/* A3A6A8 802411C8 846200B4 */ lh $v0, 0xb4($v1) +/* A3A6AC 802411CC 14440003 */ bne $v0, $a0, .L802411DC +/* A3A6B0 802411D0 24A50001 */ addiu $a1, $a1, 1 +/* A3A6B4 802411D4 03E00008 */ jr $ra +/* A3A6B8 802411D8 24020001 */ addiu $v0, $zero, 1 +.L802411DC: +/* A3A6BC 802411DC 28A20080 */ slti $v0, $a1, 0x80 +/* A3A6C0 802411E0 1440FFF9 */ bnez $v0, .L802411C8 +/* A3A6C4 802411E4 24630002 */ addiu $v1, $v1, 2 +/* A3A6C8 802411E8 03E00008 */ jr $ra +/* A3A6CC 802411EC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802411F0.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802411F0.s new file mode 100644 index 0000000000..2bf4e957f7 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802411F0.s @@ -0,0 +1,37 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411F0 +/* A3A6D0 802411F0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A3A6D4 802411F4 AFB00010 */ sw $s0, 0x10($sp) +/* A3A6D8 802411F8 0000802D */ daddu $s0, $zero, $zero +/* A3A6DC 802411FC AFB10014 */ sw $s1, 0x14($sp) +/* A3A6E0 80241200 3C11F971 */ lui $s1, 0xf971 +/* A3A6E4 80241204 36318883 */ ori $s1, $s1, 0x8883 +/* A3A6E8 80241208 AFBF0018 */ sw $ra, 0x18($sp) +/* A3A6EC 8024120C 0000202D */ daddu $a0, $zero, $zero +.L80241210: +/* A3A6F0 80241210 02112821 */ addu $a1, $s0, $s1 +/* A3A6F4 80241214 0C0B2026 */ jal set_variable +/* A3A6F8 80241218 0080302D */ daddu $a2, $a0, $zero +/* A3A6FC 8024121C 26100001 */ addiu $s0, $s0, 1 +/* A3A700 80241220 2E02004F */ sltiu $v0, $s0, 0x4f +/* A3A704 80241224 1440FFFA */ bnez $v0, .L80241210 +/* A3A708 80241228 0000202D */ daddu $a0, $zero, $zero +/* A3A70C 8024122C 0000802D */ daddu $s0, $zero, $zero +/* A3A710 80241230 3C11F971 */ lui $s1, 0xf971 +/* A3A714 80241234 363188E4 */ ori $s1, $s1, 0x88e4 +.L80241238: +/* A3A718 80241238 02112821 */ addu $a1, $s0, $s1 +/* A3A71C 8024123C 0C0B2026 */ jal set_variable +/* A3A720 80241240 0080302D */ daddu $a2, $a0, $zero +/* A3A724 80241244 26100001 */ addiu $s0, $s0, 1 +/* A3A728 80241248 2E020010 */ sltiu $v0, $s0, 0x10 +/* A3A72C 8024124C 1440FFFA */ bnez $v0, .L80241238 +/* A3A730 80241250 0000202D */ daddu $a0, $zero, $zero +/* A3A734 80241254 8FBF0018 */ lw $ra, 0x18($sp) +/* A3A738 80241258 8FB10014 */ lw $s1, 0x14($sp) +/* A3A73C 8024125C 8FB00010 */ lw $s0, 0x10($sp) +/* A3A740 80241260 24020002 */ addiu $v0, $zero, 2 +/* A3A744 80241264 03E00008 */ jr $ra +/* A3A748 80241268 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_8024126C.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_8024126C.s new file mode 100644 index 0000000000..79ef16e7eb --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_8024126C.s @@ -0,0 +1,177 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024126C +/* A3A74C 8024126C 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A3A750 80241270 AFBE0030 */ sw $fp, 0x30($sp) +/* A3A754 80241274 0080F02D */ daddu $fp, $a0, $zero +/* A3A758 80241278 0000202D */ daddu $a0, $zero, $zero +/* A3A75C 8024127C 3C05F5DE */ lui $a1, 0xf5de +/* A3A760 80241280 34A50180 */ ori $a1, $a1, 0x180 +/* A3A764 80241284 AFBF0034 */ sw $ra, 0x34($sp) +/* A3A768 80241288 AFB7002C */ sw $s7, 0x2c($sp) +/* A3A76C 8024128C AFB60028 */ sw $s6, 0x28($sp) +/* A3A770 80241290 AFB50024 */ sw $s5, 0x24($sp) +/* A3A774 80241294 AFB40020 */ sw $s4, 0x20($sp) +/* A3A778 80241298 AFB3001C */ sw $s3, 0x1c($sp) +/* A3A77C 8024129C AFB20018 */ sw $s2, 0x18($sp) +/* A3A780 802412A0 AFB10014 */ sw $s1, 0x14($sp) +/* A3A784 802412A4 0C0B1EAF */ jal get_variable +/* A3A788 802412A8 AFB00010 */ sw $s0, 0x10($sp) +/* A3A78C 802412AC 0040B02D */ daddu $s6, $v0, $zero +/* A3A790 802412B0 0000A02D */ daddu $s4, $zero, $zero +/* A3A794 802412B4 0280802D */ daddu $s0, $s4, $zero +/* A3A798 802412B8 3C12F971 */ lui $s2, 0xf971 +/* A3A79C 802412BC 36528883 */ ori $s2, $s2, 0x8883 +/* A3A7A0 802412C0 3C118024 */ lui $s1, 0x8024 +/* A3A7A4 802412C4 263147D8 */ addiu $s1, $s1, 0x47d8 +/* A3A7A8 802412C8 AFC00088 */ sw $zero, 0x88($fp) +.L802412CC: +/* A3A7AC 802412CC 8E220004 */ lw $v0, 4($s1) +/* A3A7B0 802412D0 02C2102A */ slt $v0, $s6, $v0 +/* A3A7B4 802412D4 5440000C */ bnel $v0, $zero, .L80241308 +/* A3A7B8 802412D8 26100001 */ addiu $s0, $s0, 1 +/* A3A7BC 802412DC 8E240000 */ lw $a0, ($s1) +/* A3A7C0 802412E0 0C09046F */ jal func_802411BC +/* A3A7C4 802412E4 00000000 */ nop +/* A3A7C8 802412E8 54400007 */ bnel $v0, $zero, .L80241308 +/* A3A7CC 802412EC 26100001 */ addiu $s0, $s0, 1 +/* A3A7D0 802412F0 0000202D */ daddu $a0, $zero, $zero +/* A3A7D4 802412F4 0C0B1EAF */ jal get_variable +/* A3A7D8 802412F8 02122821 */ addu $a1, $s0, $s2 +/* A3A7DC 802412FC 50400001 */ beql $v0, $zero, .L80241304 +/* A3A7E0 80241300 26940001 */ addiu $s4, $s4, 1 +.L80241304: +/* A3A7E4 80241304 26100001 */ addiu $s0, $s0, 1 +.L80241308: +/* A3A7E8 80241308 2E02004F */ sltiu $v0, $s0, 0x4f +/* A3A7EC 8024130C 1440FFEF */ bnez $v0, .L802412CC +/* A3A7F0 80241310 2631000C */ addiu $s1, $s1, 0xc +/* A3A7F4 80241314 3C118024 */ lui $s1, 0x8024 +/* A3A7F8 80241318 263147D4 */ addiu $s1, $s1, 0x47d4 +/* A3A7FC 8024131C 1280002D */ beqz $s4, .L802413D4 +/* A3A800 80241320 0000802D */ daddu $s0, $zero, $zero +/* A3A804 80241324 0C00A67F */ jal rand_int +/* A3A808 80241328 2684FFFF */ addiu $a0, $s4, -1 +/* A3A80C 8024132C 0040A82D */ daddu $s5, $v0, $zero +/* A3A810 80241330 0220982D */ daddu $s3, $s1, $zero +/* A3A814 80241334 0000A02D */ daddu $s4, $zero, $zero +/* A3A818 80241338 0280802D */ daddu $s0, $s4, $zero +/* A3A81C 8024133C 3C17F971 */ lui $s7, 0xf971 +/* A3A820 80241340 36F78883 */ ori $s7, $s7, 0x8883 +/* A3A824 80241344 26720004 */ addiu $s2, $s3, 4 +.L80241348: +/* A3A828 80241348 8E420004 */ lw $v0, 4($s2) +/* A3A82C 8024134C 02C2102A */ slt $v0, $s6, $v0 +/* A3A830 80241350 5440000F */ bnel $v0, $zero, .L80241390 +/* A3A834 80241354 26100001 */ addiu $s0, $s0, 1 +/* A3A838 80241358 8E440000 */ lw $a0, ($s2) +/* A3A83C 8024135C 0C09046F */ jal func_802411BC +/* A3A840 80241360 00000000 */ nop +/* A3A844 80241364 5440000A */ bnel $v0, $zero, .L80241390 +/* A3A848 80241368 26100001 */ addiu $s0, $s0, 1 +/* A3A84C 8024136C 0000202D */ daddu $a0, $zero, $zero +/* A3A850 80241370 02178821 */ addu $s1, $s0, $s7 +/* A3A854 80241374 0C0B1EAF */ jal get_variable +/* A3A858 80241378 0220282D */ daddu $a1, $s1, $zero +/* A3A85C 8024137C 54400004 */ bnel $v0, $zero, .L80241390 +/* A3A860 80241380 26100001 */ addiu $s0, $s0, 1 +/* A3A864 80241384 12950008 */ beq $s4, $s5, .L802413A8 +/* A3A868 80241388 26940001 */ addiu $s4, $s4, 1 +/* A3A86C 8024138C 26100001 */ addiu $s0, $s0, 1 +.L80241390: +/* A3A870 80241390 2652000C */ addiu $s2, $s2, 0xc +/* A3A874 80241394 2E02004F */ sltiu $v0, $s0, 0x4f +/* A3A878 80241398 1440FFEB */ bnez $v0, .L80241348 +/* A3A87C 8024139C 2673000C */ addiu $s3, $s3, 0xc +/* A3A880 802413A0 0809052D */ j .L802414B4 +/* A3A884 802413A4 24020002 */ addiu $v0, $zero, 2 +.L802413A8: +/* A3A888 802413A8 0000202D */ daddu $a0, $zero, $zero +/* A3A88C 802413AC 080904EF */ j .L802413BC +/* A3A890 802413B0 0220282D */ daddu $a1, $s1, $zero +.L802413B4: +/* A3A894 802413B4 0000202D */ daddu $a0, $zero, $zero +/* A3A898 802413B8 0240282D */ daddu $a1, $s2, $zero +.L802413BC: +/* A3A89C 802413BC 8E620000 */ lw $v0, ($s3) +/* A3A8A0 802413C0 24060001 */ addiu $a2, $zero, 1 +/* A3A8A4 802413C4 0C0B2026 */ jal set_variable +/* A3A8A8 802413C8 AFC20088 */ sw $v0, 0x88($fp) +/* A3A8AC 802413CC 0809052D */ j .L802414B4 +/* A3A8B0 802413D0 24020002 */ addiu $v0, $zero, 2 +.L802413D4: +/* A3A8B4 802413D4 24132712 */ addiu $s3, $zero, 0x2712 +/* A3A8B8 802413D8 3C12F971 */ lui $s2, 0xf971 +/* A3A8BC 802413DC 36528883 */ ori $s2, $s2, 0x8883 +/* A3A8C0 802413E0 26310004 */ addiu $s1, $s1, 4 +.L802413E4: +/* A3A8C4 802413E4 8E220004 */ lw $v0, 4($s1) +/* A3A8C8 802413E8 5453000C */ bnel $v0, $s3, .L8024141C +/* A3A8CC 802413EC 26100001 */ addiu $s0, $s0, 1 +/* A3A8D0 802413F0 8E240000 */ lw $a0, ($s1) +/* A3A8D4 802413F4 0C09046F */ jal func_802411BC +/* A3A8D8 802413F8 00000000 */ nop +/* A3A8DC 802413FC 54400007 */ bnel $v0, $zero, .L8024141C +/* A3A8E0 80241400 26100001 */ addiu $s0, $s0, 1 +/* A3A8E4 80241404 0000202D */ daddu $a0, $zero, $zero +/* A3A8E8 80241408 0C0B1EAF */ jal get_variable +/* A3A8EC 8024140C 02122821 */ addu $a1, $s0, $s2 +/* A3A8F0 80241410 50400001 */ beql $v0, $zero, .L80241418 +/* A3A8F4 80241414 26940001 */ addiu $s4, $s4, 1 +.L80241418: +/* A3A8F8 80241418 26100001 */ addiu $s0, $s0, 1 +.L8024141C: +/* A3A8FC 8024141C 2E02004F */ sltiu $v0, $s0, 0x4f +/* A3A900 80241420 1440FFF0 */ bnez $v0, .L802413E4 +/* A3A904 80241424 2631000C */ addiu $s1, $s1, 0xc +/* A3A908 80241428 12800022 */ beqz $s4, .L802414B4 +/* A3A90C 8024142C 24020002 */ addiu $v0, $zero, 2 +/* A3A910 80241430 0C00A67F */ jal rand_int +/* A3A914 80241434 2684FFFF */ addiu $a0, $s4, -1 +/* A3A918 80241438 0040A82D */ daddu $s5, $v0, $zero +/* A3A91C 8024143C 3C138024 */ lui $s3, 0x8024 +/* A3A920 80241440 267347D4 */ addiu $s3, $s3, 0x47d4 +/* A3A924 80241444 0000A02D */ daddu $s4, $zero, $zero +/* A3A928 80241448 0280802D */ daddu $s0, $s4, $zero +/* A3A92C 8024144C 24172712 */ addiu $s7, $zero, 0x2712 +/* A3A930 80241450 3C16F971 */ lui $s6, 0xf971 +/* A3A934 80241454 36D68883 */ ori $s6, $s6, 0x8883 +/* A3A938 80241458 26710004 */ addiu $s1, $s3, 4 +.L8024145C: +/* A3A93C 8024145C 8E220004 */ lw $v0, 4($s1) +/* A3A940 80241460 5457000F */ bnel $v0, $s7, .L802414A0 +/* A3A944 80241464 26100001 */ addiu $s0, $s0, 1 +/* A3A948 80241468 8E240000 */ lw $a0, ($s1) +/* A3A94C 8024146C 0C09046F */ jal func_802411BC +/* A3A950 80241470 00000000 */ nop +/* A3A954 80241474 5440000A */ bnel $v0, $zero, .L802414A0 +/* A3A958 80241478 26100001 */ addiu $s0, $s0, 1 +/* A3A95C 8024147C 0000202D */ daddu $a0, $zero, $zero +/* A3A960 80241480 02169021 */ addu $s2, $s0, $s6 +/* A3A964 80241484 0C0B1EAF */ jal get_variable +/* A3A968 80241488 0240282D */ daddu $a1, $s2, $zero +/* A3A96C 8024148C 54400004 */ bnel $v0, $zero, .L802414A0 +/* A3A970 80241490 26100001 */ addiu $s0, $s0, 1 +/* A3A974 80241494 1295FFC7 */ beq $s4, $s5, .L802413B4 +/* A3A978 80241498 26940001 */ addiu $s4, $s4, 1 +/* A3A97C 8024149C 26100001 */ addiu $s0, $s0, 1 +.L802414A0: +/* A3A980 802414A0 2631000C */ addiu $s1, $s1, 0xc +/* A3A984 802414A4 2E02004F */ sltiu $v0, $s0, 0x4f +/* A3A988 802414A8 1440FFEC */ bnez $v0, .L8024145C +/* A3A98C 802414AC 2673000C */ addiu $s3, $s3, 0xc +/* A3A990 802414B0 24020002 */ addiu $v0, $zero, 2 +.L802414B4: +/* A3A994 802414B4 8FBF0034 */ lw $ra, 0x34($sp) +/* A3A998 802414B8 8FBE0030 */ lw $fp, 0x30($sp) +/* A3A99C 802414BC 8FB7002C */ lw $s7, 0x2c($sp) +/* A3A9A0 802414C0 8FB60028 */ lw $s6, 0x28($sp) +/* A3A9A4 802414C4 8FB50024 */ lw $s5, 0x24($sp) +/* A3A9A8 802414C8 8FB40020 */ lw $s4, 0x20($sp) +/* A3A9AC 802414CC 8FB3001C */ lw $s3, 0x1c($sp) +/* A3A9B0 802414D0 8FB20018 */ lw $s2, 0x18($sp) +/* A3A9B4 802414D4 8FB10014 */ lw $s1, 0x14($sp) +/* A3A9B8 802414D8 8FB00010 */ lw $s0, 0x10($sp) +/* A3A9BC 802414DC 03E00008 */ jr $ra +/* A3A9C0 802414E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802414E4.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802414E4.s new file mode 100644 index 0000000000..b4607b9313 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802414E4.s @@ -0,0 +1,108 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414E4 +/* A3A9C4 802414E4 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A3A9C8 802414E8 AFBE0030 */ sw $fp, 0x30($sp) +/* A3A9CC 802414EC 0080F02D */ daddu $fp, $a0, $zero +/* A3A9D0 802414F0 0000202D */ daddu $a0, $zero, $zero +/* A3A9D4 802414F4 3C05F5DE */ lui $a1, 0xf5de +/* A3A9D8 802414F8 34A50180 */ ori $a1, $a1, 0x180 +/* A3A9DC 802414FC AFBF0034 */ sw $ra, 0x34($sp) +/* A3A9E0 80241500 AFB7002C */ sw $s7, 0x2c($sp) +/* A3A9E4 80241504 AFB60028 */ sw $s6, 0x28($sp) +/* A3A9E8 80241508 AFB50024 */ sw $s5, 0x24($sp) +/* A3A9EC 8024150C AFB40020 */ sw $s4, 0x20($sp) +/* A3A9F0 80241510 AFB3001C */ sw $s3, 0x1c($sp) +/* A3A9F4 80241514 AFB20018 */ sw $s2, 0x18($sp) +/* A3A9F8 80241518 AFB10014 */ sw $s1, 0x14($sp) +/* A3A9FC 8024151C 0C0B1EAF */ jal get_variable +/* A3AA00 80241520 AFB00010 */ sw $s0, 0x10($sp) +/* A3AA04 80241524 0040A82D */ daddu $s5, $v0, $zero +/* A3AA08 80241528 0000A02D */ daddu $s4, $zero, $zero +/* A3AA0C 8024152C 0280802D */ daddu $s0, $s4, $zero +/* A3AA10 80241530 3C12F971 */ lui $s2, 0xf971 +/* A3AA14 80241534 365288E4 */ ori $s2, $s2, 0x88e4 +/* A3AA18 80241538 3C118024 */ lui $s1, 0x8024 +/* A3AA1C 8024153C 26314B8C */ addiu $s1, $s1, 0x4b8c +/* A3AA20 80241540 AFC00088 */ sw $zero, 0x88($fp) +.L80241544: +/* A3AA24 80241544 8E220004 */ lw $v0, 4($s1) +/* A3AA28 80241548 02A2102A */ slt $v0, $s5, $v0 +/* A3AA2C 8024154C 5440000C */ bnel $v0, $zero, .L80241580 +/* A3AA30 80241550 26100001 */ addiu $s0, $s0, 1 +/* A3AA34 80241554 8E250000 */ lw $a1, ($s1) +/* A3AA38 80241558 0C0B1EAF */ jal get_variable +/* A3AA3C 8024155C 0000202D */ daddu $a0, $zero, $zero +/* A3AA40 80241560 54400007 */ bnel $v0, $zero, .L80241580 +/* A3AA44 80241564 26100001 */ addiu $s0, $s0, 1 +/* A3AA48 80241568 0000202D */ daddu $a0, $zero, $zero +/* A3AA4C 8024156C 0C0B1EAF */ jal get_variable +/* A3AA50 80241570 02122821 */ addu $a1, $s0, $s2 +/* A3AA54 80241574 50400001 */ beql $v0, $zero, .L8024157C +/* A3AA58 80241578 26940001 */ addiu $s4, $s4, 1 +.L8024157C: +/* A3AA5C 8024157C 26100001 */ addiu $s0, $s0, 1 +.L80241580: +/* A3AA60 80241580 2E020010 */ sltiu $v0, $s0, 0x10 +/* A3AA64 80241584 1440FFEF */ bnez $v0, .L80241544 +/* A3AA68 80241588 2631000C */ addiu $s1, $s1, 0xc +/* A3AA6C 8024158C 12800029 */ beqz $s4, .L80241634 +/* A3AA70 80241590 00000000 */ nop +/* A3AA74 80241594 0C00A67F */ jal rand_int +/* A3AA78 80241598 2684FFFF */ addiu $a0, $s4, -1 +/* A3AA7C 8024159C 0040B82D */ daddu $s7, $v0, $zero +/* A3AA80 802415A0 3C138024 */ lui $s3, 0x8024 +/* A3AA84 802415A4 26734B88 */ addiu $s3, $s3, 0x4b88 +/* A3AA88 802415A8 0000A02D */ daddu $s4, $zero, $zero +/* A3AA8C 802415AC 0280802D */ daddu $s0, $s4, $zero +/* A3AA90 802415B0 3C16F971 */ lui $s6, 0xf971 +/* A3AA94 802415B4 36D688E4 */ ori $s6, $s6, 0x88e4 +/* A3AA98 802415B8 26720004 */ addiu $s2, $s3, 4 +.L802415BC: +/* A3AA9C 802415BC 8E420004 */ lw $v0, 4($s2) +/* A3AAA0 802415C0 02A2102A */ slt $v0, $s5, $v0 +/* A3AAA4 802415C4 54400017 */ bnel $v0, $zero, .L80241624 +/* A3AAA8 802415C8 26100001 */ addiu $s0, $s0, 1 +/* A3AAAC 802415CC 8E450000 */ lw $a1, ($s2) +/* A3AAB0 802415D0 0C0B1EAF */ jal get_variable +/* A3AAB4 802415D4 0000202D */ daddu $a0, $zero, $zero +/* A3AAB8 802415D8 54400012 */ bnel $v0, $zero, .L80241624 +/* A3AABC 802415DC 26100001 */ addiu $s0, $s0, 1 +/* A3AAC0 802415E0 0000202D */ daddu $a0, $zero, $zero +/* A3AAC4 802415E4 02168821 */ addu $s1, $s0, $s6 +/* A3AAC8 802415E8 0C0B1EAF */ jal get_variable +/* A3AACC 802415EC 0220282D */ daddu $a1, $s1, $zero +/* A3AAD0 802415F0 5440000C */ bnel $v0, $zero, .L80241624 +/* A3AAD4 802415F4 26100001 */ addiu $s0, $s0, 1 +/* A3AAD8 802415F8 16970009 */ bne $s4, $s7, .L80241620 +/* A3AADC 802415FC 26940001 */ addiu $s4, $s4, 1 +/* A3AAE0 80241600 0000202D */ daddu $a0, $zero, $zero +/* A3AAE4 80241604 0220282D */ daddu $a1, $s1, $zero +/* A3AAE8 80241608 8E620000 */ lw $v0, ($s3) +/* A3AAEC 8024160C 24060001 */ addiu $a2, $zero, 1 +/* A3AAF0 80241610 0C0B2026 */ jal set_variable +/* A3AAF4 80241614 AFC20088 */ sw $v0, 0x88($fp) +/* A3AAF8 80241618 0809058D */ j .L80241634 +/* A3AAFC 8024161C 00000000 */ nop +.L80241620: +/* A3AB00 80241620 26100001 */ addiu $s0, $s0, 1 +.L80241624: +/* A3AB04 80241624 2652000C */ addiu $s2, $s2, 0xc +/* A3AB08 80241628 2E020010 */ sltiu $v0, $s0, 0x10 +/* A3AB0C 8024162C 1440FFE3 */ bnez $v0, .L802415BC +/* A3AB10 80241630 2673000C */ addiu $s3, $s3, 0xc +.L80241634: +/* A3AB14 80241634 8FBF0034 */ lw $ra, 0x34($sp) +/* A3AB18 80241638 8FBE0030 */ lw $fp, 0x30($sp) +/* A3AB1C 8024163C 8FB7002C */ lw $s7, 0x2c($sp) +/* A3AB20 80241640 8FB60028 */ lw $s6, 0x28($sp) +/* A3AB24 80241644 8FB50024 */ lw $s5, 0x24($sp) +/* A3AB28 80241648 8FB40020 */ lw $s4, 0x20($sp) +/* A3AB2C 8024164C 8FB3001C */ lw $s3, 0x1c($sp) +/* A3AB30 80241650 8FB20018 */ lw $s2, 0x18($sp) +/* A3AB34 80241654 8FB10014 */ lw $s1, 0x14($sp) +/* A3AB38 80241658 8FB00010 */ lw $s0, 0x10($sp) +/* A3AB3C 8024165C 24020002 */ addiu $v0, $zero, 2 +/* A3AB40 80241660 03E00008 */ jr $ra +/* A3AB44 80241664 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241668.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241668.s new file mode 100644 index 0000000000..210840847c --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241668.s @@ -0,0 +1,108 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241668 +/* A3AB48 80241668 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A3AB4C 8024166C AFBE0030 */ sw $fp, 0x30($sp) +/* A3AB50 80241670 0080F02D */ daddu $fp, $a0, $zero +/* A3AB54 80241674 0000202D */ daddu $a0, $zero, $zero +/* A3AB58 80241678 3C05F5DE */ lui $a1, 0xf5de +/* A3AB5C 8024167C 34A50180 */ ori $a1, $a1, 0x180 +/* A3AB60 80241680 AFBF0034 */ sw $ra, 0x34($sp) +/* A3AB64 80241684 AFB7002C */ sw $s7, 0x2c($sp) +/* A3AB68 80241688 AFB60028 */ sw $s6, 0x28($sp) +/* A3AB6C 8024168C AFB50024 */ sw $s5, 0x24($sp) +/* A3AB70 80241690 AFB40020 */ sw $s4, 0x20($sp) +/* A3AB74 80241694 AFB3001C */ sw $s3, 0x1c($sp) +/* A3AB78 80241698 AFB20018 */ sw $s2, 0x18($sp) +/* A3AB7C 8024169C AFB10014 */ sw $s1, 0x14($sp) +/* A3AB80 802416A0 0C0B1EAF */ jal get_variable +/* A3AB84 802416A4 AFB00010 */ sw $s0, 0x10($sp) +/* A3AB88 802416A8 0040A82D */ daddu $s5, $v0, $zero +/* A3AB8C 802416AC 0000A02D */ daddu $s4, $zero, $zero +/* A3AB90 802416B0 0280802D */ daddu $s0, $s4, $zero +/* A3AB94 802416B4 3C12F971 */ lui $s2, 0xf971 +/* A3AB98 802416B8 365288F4 */ ori $s2, $s2, 0x88f4 +/* A3AB9C 802416BC 3C118024 */ lui $s1, 0x8024 +/* A3ABA0 802416C0 26314C4C */ addiu $s1, $s1, 0x4c4c +/* A3ABA4 802416C4 AFC00088 */ sw $zero, 0x88($fp) +.L802416C8: +/* A3ABA8 802416C8 8E220004 */ lw $v0, 4($s1) +/* A3ABAC 802416CC 02A2102A */ slt $v0, $s5, $v0 +/* A3ABB0 802416D0 5440000C */ bnel $v0, $zero, .L80241704 +/* A3ABB4 802416D4 26100001 */ addiu $s0, $s0, 1 +/* A3ABB8 802416D8 8E250000 */ lw $a1, ($s1) +/* A3ABBC 802416DC 0C0B1EAF */ jal get_variable +/* A3ABC0 802416E0 0000202D */ daddu $a0, $zero, $zero +/* A3ABC4 802416E4 54400007 */ bnel $v0, $zero, .L80241704 +/* A3ABC8 802416E8 26100001 */ addiu $s0, $s0, 1 +/* A3ABCC 802416EC 0000202D */ daddu $a0, $zero, $zero +/* A3ABD0 802416F0 0C0B1EAF */ jal get_variable +/* A3ABD4 802416F4 02122821 */ addu $a1, $s0, $s2 +/* A3ABD8 802416F8 50400001 */ beql $v0, $zero, .L80241700 +/* A3ABDC 802416FC 26940001 */ addiu $s4, $s4, 1 +.L80241700: +/* A3ABE0 80241700 26100001 */ addiu $s0, $s0, 1 +.L80241704: +/* A3ABE4 80241704 2E02003F */ sltiu $v0, $s0, 0x3f +/* A3ABE8 80241708 1440FFEF */ bnez $v0, .L802416C8 +/* A3ABEC 8024170C 2631000C */ addiu $s1, $s1, 0xc +/* A3ABF0 80241710 12800029 */ beqz $s4, .L802417B8 +/* A3ABF4 80241714 00000000 */ nop +/* A3ABF8 80241718 0C00A67F */ jal rand_int +/* A3ABFC 8024171C 2684FFFF */ addiu $a0, $s4, -1 +/* A3AC00 80241720 0040B82D */ daddu $s7, $v0, $zero +/* A3AC04 80241724 3C138024 */ lui $s3, 0x8024 +/* A3AC08 80241728 26734C48 */ addiu $s3, $s3, 0x4c48 +/* A3AC0C 8024172C 0000A02D */ daddu $s4, $zero, $zero +/* A3AC10 80241730 0280802D */ daddu $s0, $s4, $zero +/* A3AC14 80241734 3C16F971 */ lui $s6, 0xf971 +/* A3AC18 80241738 36D688F4 */ ori $s6, $s6, 0x88f4 +/* A3AC1C 8024173C 26720004 */ addiu $s2, $s3, 4 +.L80241740: +/* A3AC20 80241740 8E420004 */ lw $v0, 4($s2) +/* A3AC24 80241744 02A2102A */ slt $v0, $s5, $v0 +/* A3AC28 80241748 54400017 */ bnel $v0, $zero, .L802417A8 +/* A3AC2C 8024174C 26100001 */ addiu $s0, $s0, 1 +/* A3AC30 80241750 8E450000 */ lw $a1, ($s2) +/* A3AC34 80241754 0C0B1EAF */ jal get_variable +/* A3AC38 80241758 0000202D */ daddu $a0, $zero, $zero +/* A3AC3C 8024175C 54400012 */ bnel $v0, $zero, .L802417A8 +/* A3AC40 80241760 26100001 */ addiu $s0, $s0, 1 +/* A3AC44 80241764 0000202D */ daddu $a0, $zero, $zero +/* A3AC48 80241768 02168821 */ addu $s1, $s0, $s6 +/* A3AC4C 8024176C 0C0B1EAF */ jal get_variable +/* A3AC50 80241770 0220282D */ daddu $a1, $s1, $zero +/* A3AC54 80241774 5440000C */ bnel $v0, $zero, .L802417A8 +/* A3AC58 80241778 26100001 */ addiu $s0, $s0, 1 +/* A3AC5C 8024177C 16970009 */ bne $s4, $s7, .L802417A4 +/* A3AC60 80241780 26940001 */ addiu $s4, $s4, 1 +/* A3AC64 80241784 0000202D */ daddu $a0, $zero, $zero +/* A3AC68 80241788 0220282D */ daddu $a1, $s1, $zero +/* A3AC6C 8024178C 8E620000 */ lw $v0, ($s3) +/* A3AC70 80241790 24060001 */ addiu $a2, $zero, 1 +/* A3AC74 80241794 0C0B2026 */ jal set_variable +/* A3AC78 80241798 AFC20088 */ sw $v0, 0x88($fp) +/* A3AC7C 8024179C 080905EE */ j .L802417B8 +/* A3AC80 802417A0 00000000 */ nop +.L802417A4: +/* A3AC84 802417A4 26100001 */ addiu $s0, $s0, 1 +.L802417A8: +/* A3AC88 802417A8 2652000C */ addiu $s2, $s2, 0xc +/* A3AC8C 802417AC 2E02003F */ sltiu $v0, $s0, 0x3f +/* A3AC90 802417B0 1440FFE3 */ bnez $v0, .L80241740 +/* A3AC94 802417B4 2673000C */ addiu $s3, $s3, 0xc +.L802417B8: +/* A3AC98 802417B8 8FBF0034 */ lw $ra, 0x34($sp) +/* A3AC9C 802417BC 8FBE0030 */ lw $fp, 0x30($sp) +/* A3ACA0 802417C0 8FB7002C */ lw $s7, 0x2c($sp) +/* A3ACA4 802417C4 8FB60028 */ lw $s6, 0x28($sp) +/* A3ACA8 802417C8 8FB50024 */ lw $s5, 0x24($sp) +/* A3ACAC 802417CC 8FB40020 */ lw $s4, 0x20($sp) +/* A3ACB0 802417D0 8FB3001C */ lw $s3, 0x1c($sp) +/* A3ACB4 802417D4 8FB20018 */ lw $s2, 0x18($sp) +/* A3ACB8 802417D8 8FB10014 */ lw $s1, 0x14($sp) +/* A3ACBC 802417DC 8FB00010 */ lw $s0, 0x10($sp) +/* A3ACC0 802417E0 24020002 */ addiu $v0, $zero, 2 +/* A3ACC4 802417E4 03E00008 */ jr $ra +/* A3ACC8 802417E8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_06/func_802417EC_A394E0.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802417EC_A3ACCC.s similarity index 100% rename from asm/nonmatchings/world/area_hos/hos_06/func_802417EC_A394E0.s rename to asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802417EC_A3ACCC.s diff --git a/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241860.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241860.s new file mode 100644 index 0000000000..807779f52f --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241860.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241860 +/* A3AD40 80241860 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A3AD44 80241864 AFBF0010 */ sw $ra, 0x10($sp) +/* A3AD48 80241868 8C82000C */ lw $v0, 0xc($a0) +/* A3AD4C 8024186C 0C0B1EAF */ jal get_variable +/* A3AD50 80241870 8C450000 */ lw $a1, ($v0) +/* A3AD54 80241874 3C058011 */ lui $a1, %hi(gPlayerData) +/* A3AD58 80241878 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) +/* A3AD5C 8024187C 3C048024 */ lui $a0, 0x8024 +/* A3AD60 80241880 00822021 */ addu $a0, $a0, $v0 +/* A3AD64 80241884 908447D0 */ lbu $a0, 0x47d0($a0) +/* A3AD68 80241888 94A3000C */ lhu $v1, 0xc($a1) +/* A3AD6C 8024188C 00641823 */ subu $v1, $v1, $a0 +/* A3AD70 80241890 A4A3000C */ sh $v1, 0xc($a1) +/* A3AD74 80241894 8FBF0010 */ lw $ra, 0x10($sp) +/* A3AD78 80241898 24020002 */ addiu $v0, $zero, 2 +/* A3AD7C 8024189C 03E00008 */ jr $ra +/* A3AD80 802418A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/func_802418A4_A394E0.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802418A4_A3AD84.s similarity index 100% rename from asm/nonmatchings/world/area_hos/hos_06/func_802418A4_A394E0.s rename to asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802418A4_A3AD84.s diff --git a/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802418E8.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802418E8.s new file mode 100644 index 0000000000..d8cca8b1e8 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_802418E8.s @@ -0,0 +1,98 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802418E8 +/* A3ADC8 802418E8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A3ADCC 802418EC AFB00018 */ sw $s0, 0x18($sp) +/* A3ADD0 802418F0 0080802D */ daddu $s0, $a0, $zero +/* A3ADD4 802418F4 10A00042 */ beqz $a1, .L80241A00 +/* A3ADD8 802418F8 AFBF001C */ sw $ra, 0x1c($sp) +/* A3ADDC 802418FC 0C046C04 */ jal get_model_list_index_from_tree_index +/* A3ADE0 80241900 24040079 */ addiu $a0, $zero, 0x79 +/* A3ADE4 80241904 0C046B4C */ jal get_model_from_list_index +/* A3ADE8 80241908 0040202D */ daddu $a0, $v0, $zero +/* A3ADEC 8024190C 0040202D */ daddu $a0, $v0, $zero +/* A3ADF0 80241910 2405FFFF */ addiu $a1, $zero, -1 +/* A3ADF4 80241914 0C046F1F */ jal func_8011BC7C +/* A3ADF8 80241918 24060003 */ addiu $a2, $zero, 3 +/* A3ADFC 8024191C 0C046C04 */ jal get_model_list_index_from_tree_index +/* A3AE00 80241920 2404007A */ addiu $a0, $zero, 0x7a +/* A3AE04 80241924 0C046B4C */ jal get_model_from_list_index +/* A3AE08 80241928 0040202D */ daddu $a0, $v0, $zero +/* A3AE0C 8024192C 0040202D */ daddu $a0, $v0, $zero +/* A3AE10 80241930 2405FFFF */ addiu $a1, $zero, -1 +/* A3AE14 80241934 0C046F1F */ jal func_8011BC7C +/* A3AE18 80241938 24060003 */ addiu $a2, $zero, 3 +/* A3AE1C 8024193C 0C046C04 */ jal get_model_list_index_from_tree_index +/* A3AE20 80241940 2404007B */ addiu $a0, $zero, 0x7b +/* A3AE24 80241944 0C046B4C */ jal get_model_from_list_index +/* A3AE28 80241948 0040202D */ daddu $a0, $v0, $zero +/* A3AE2C 8024194C 0040202D */ daddu $a0, $v0, $zero +/* A3AE30 80241950 2405FFFF */ addiu $a1, $zero, -1 +/* A3AE34 80241954 0C046F1F */ jal func_8011BC7C +/* A3AE38 80241958 24060003 */ addiu $a2, $zero, 3 +/* A3AE3C 8024195C 0C046C04 */ jal get_model_list_index_from_tree_index +/* A3AE40 80241960 2404007C */ addiu $a0, $zero, 0x7c +/* A3AE44 80241964 0C046B4C */ jal get_model_from_list_index +/* A3AE48 80241968 0040202D */ daddu $a0, $v0, $zero +/* A3AE4C 8024196C 0040202D */ daddu $a0, $v0, $zero +/* A3AE50 80241970 2405FFFF */ addiu $a1, $zero, -1 +/* A3AE54 80241974 0C046F1F */ jal func_8011BC7C +/* A3AE58 80241978 24060003 */ addiu $a2, $zero, 3 +/* A3AE5C 8024197C 0C046C04 */ jal get_model_list_index_from_tree_index +/* A3AE60 80241980 2404007D */ addiu $a0, $zero, 0x7d +/* A3AE64 80241984 0C046B4C */ jal get_model_from_list_index +/* A3AE68 80241988 0040202D */ daddu $a0, $v0, $zero +/* A3AE6C 8024198C 0040202D */ daddu $a0, $v0, $zero +/* A3AE70 80241990 2405FFFF */ addiu $a1, $zero, -1 +/* A3AE74 80241994 0C046F1F */ jal func_8011BC7C +/* A3AE78 80241998 24060003 */ addiu $a2, $zero, 3 +/* A3AE7C 8024199C 0C046C04 */ jal get_model_list_index_from_tree_index +/* A3AE80 802419A0 2404007F */ addiu $a0, $zero, 0x7f +/* A3AE84 802419A4 0C046B4C */ jal get_model_from_list_index +/* A3AE88 802419A8 0040202D */ daddu $a0, $v0, $zero +/* A3AE8C 802419AC 0040202D */ daddu $a0, $v0, $zero +/* A3AE90 802419B0 2405FFFF */ addiu $a1, $zero, -1 +/* A3AE94 802419B4 0C046F1F */ jal func_8011BC7C +/* A3AE98 802419B8 24060003 */ addiu $a2, $zero, 3 +/* A3AE9C 802419BC 0C046C04 */ jal get_model_list_index_from_tree_index +/* A3AEA0 802419C0 240400D0 */ addiu $a0, $zero, 0xd0 +/* A3AEA4 802419C4 0C046B4C */ jal get_model_from_list_index +/* A3AEA8 802419C8 0040202D */ daddu $a0, $v0, $zero +/* A3AEAC 802419CC 0040202D */ daddu $a0, $v0, $zero +/* A3AEB0 802419D0 2405FFFF */ addiu $a1, $zero, -1 +/* A3AEB4 802419D4 0C046F1F */ jal func_8011BC7C +/* A3AEB8 802419D8 24060003 */ addiu $a2, $zero, 3 +/* A3AEBC 802419DC 240400FF */ addiu $a0, $zero, 0xff +/* A3AEC0 802419E0 0080282D */ daddu $a1, $a0, $zero +/* A3AEC4 802419E4 0080302D */ daddu $a2, $a0, $zero +/* A3AEC8 802419E8 0000382D */ daddu $a3, $zero, $zero +/* A3AECC 802419EC AFA00010 */ sw $zero, 0x10($sp) +/* A3AED0 802419F0 0C046FE6 */ jal func_8011BF98 +/* A3AED4 802419F4 AFA00014 */ sw $zero, 0x14($sp) +/* A3AED8 802419F8 240200FF */ addiu $v0, $zero, 0xff +/* A3AEDC 802419FC AE020070 */ sw $v0, 0x70($s0) +.L80241A00: +/* A3AEE0 80241A00 8E020070 */ lw $v0, 0x70($s0) +/* A3AEE4 80241A04 2442FFFC */ addiu $v0, $v0, -4 +/* A3AEE8 80241A08 AE020070 */ sw $v0, 0x70($s0) +/* A3AEEC 80241A0C 28420040 */ slti $v0, $v0, 0x40 +/* A3AEF0 80241A10 10400002 */ beqz $v0, .L80241A1C +/* A3AEF4 80241A14 24020040 */ addiu $v0, $zero, 0x40 +/* A3AEF8 80241A18 AE020070 */ sw $v0, 0x70($s0) +.L80241A1C: +/* A3AEFC 80241A1C 92040073 */ lbu $a0, 0x73($s0) +/* A3AF00 80241A20 0000382D */ daddu $a3, $zero, $zero +/* A3AF04 80241A24 AFA00010 */ sw $zero, 0x10($sp) +/* A3AF08 80241A28 AFA00014 */ sw $zero, 0x14($sp) +/* A3AF0C 80241A2C 0080282D */ daddu $a1, $a0, $zero +/* A3AF10 80241A30 0C046FE6 */ jal func_8011BF98 +/* A3AF14 80241A34 0080302D */ daddu $a2, $a0, $zero +/* A3AF18 80241A38 8E020070 */ lw $v0, 0x70($s0) +/* A3AF1C 80241A3C 8FBF001C */ lw $ra, 0x1c($sp) +/* A3AF20 80241A40 8FB00018 */ lw $s0, 0x18($sp) +/* A3AF24 80241A44 38420040 */ xori $v0, $v0, 0x40 +/* A3AF28 80241A48 2C420001 */ sltiu $v0, $v0, 1 +/* A3AF2C 80241A4C 00021040 */ sll $v0, $v0, 1 +/* A3AF30 80241A50 03E00008 */ jr $ra +/* A3AF34 80241A54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241A58.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241A58.s new file mode 100644 index 0000000000..c1d2747ea1 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241A58.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A58 +/* A3AF38 80241A58 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A3AF3C 80241A5C AFB00018 */ sw $s0, 0x18($sp) +/* A3AF40 80241A60 0080802D */ daddu $s0, $a0, $zero +/* A3AF44 80241A64 10A00005 */ beqz $a1, .L80241A7C +/* A3AF48 80241A68 AFBF001C */ sw $ra, 0x1c($sp) +/* A3AF4C 80241A6C 24020040 */ addiu $v0, $zero, 0x40 +/* A3AF50 80241A70 AE020070 */ sw $v0, 0x70($s0) +/* A3AF54 80241A74 AE020078 */ sw $v0, 0x78($s0) +/* A3AF58 80241A78 AE000074 */ sw $zero, 0x74($s0) +.L80241A7C: +/* A3AF5C 80241A7C 8E020074 */ lw $v0, 0x74($s0) +/* A3AF60 80241A80 1440001A */ bnez $v0, .L80241AEC +/* A3AF64 80241A84 00000000 */ nop +/* A3AF68 80241A88 8E020070 */ lw $v0, 0x70($s0) +/* A3AF6C 80241A8C 24420004 */ addiu $v0, $v0, 4 +/* A3AF70 80241A90 AE020070 */ sw $v0, 0x70($s0) +/* A3AF74 80241A94 8E020078 */ lw $v0, 0x78($s0) +/* A3AF78 80241A98 8E030070 */ lw $v1, 0x70($s0) +/* A3AF7C 80241A9C 24420004 */ addiu $v0, $v0, 4 +/* A3AF80 80241AA0 28630080 */ slti $v1, $v1, 0x80 +/* A3AF84 80241AA4 14600003 */ bnez $v1, .L80241AB4 +/* A3AF88 80241AA8 AE020078 */ sw $v0, 0x78($s0) +/* A3AF8C 80241AAC 2402007F */ addiu $v0, $zero, 0x7f +/* A3AF90 80241AB0 AE020070 */ sw $v0, 0x70($s0) +.L80241AB4: +/* A3AF94 80241AB4 8E020078 */ lw $v0, 0x78($s0) +/* A3AF98 80241AB8 28420080 */ slti $v0, $v0, 0x80 +/* A3AF9C 80241ABC 14400002 */ bnez $v0, .L80241AC8 +/* A3AFA0 80241AC0 2402007F */ addiu $v0, $zero, 0x7f +/* A3AFA4 80241AC4 AE020078 */ sw $v0, 0x78($s0) +.L80241AC8: +/* A3AFA8 80241AC8 8E030070 */ lw $v1, 0x70($s0) +/* A3AFAC 80241ACC 2402007F */ addiu $v0, $zero, 0x7f +/* A3AFB0 80241AD0 14620014 */ bne $v1, $v0, .L80241B24 +/* A3AFB4 80241AD4 00000000 */ nop +/* A3AFB8 80241AD8 8E020078 */ lw $v0, 0x78($s0) +/* A3AFBC 80241ADC 14430011 */ bne $v0, $v1, .L80241B24 +/* A3AFC0 80241AE0 24020001 */ addiu $v0, $zero, 1 +/* A3AFC4 80241AE4 080906C9 */ j .L80241B24 +/* A3AFC8 80241AE8 AE020074 */ sw $v0, 0x74($s0) +.L80241AEC: +/* A3AFCC 80241AEC 8E020070 */ lw $v0, 0x70($s0) +/* A3AFD0 80241AF0 2442FFFC */ addiu $v0, $v0, -4 +/* A3AFD4 80241AF4 AE020070 */ sw $v0, 0x70($s0) +/* A3AFD8 80241AF8 8E020078 */ lw $v0, 0x78($s0) +/* A3AFDC 80241AFC 8E030070 */ lw $v1, 0x70($s0) +/* A3AFE0 80241B00 2442FFFC */ addiu $v0, $v0, -4 +/* A3AFE4 80241B04 28630040 */ slti $v1, $v1, 0x40 +/* A3AFE8 80241B08 10600003 */ beqz $v1, .L80241B18 +/* A3AFEC 80241B0C AE020078 */ sw $v0, 0x78($s0) +/* A3AFF0 80241B10 24020040 */ addiu $v0, $zero, 0x40 +/* A3AFF4 80241B14 AE020070 */ sw $v0, 0x70($s0) +.L80241B18: +/* A3AFF8 80241B18 8E020078 */ lw $v0, 0x78($s0) +/* A3AFFC 80241B1C 04420001 */ bltzl $v0, .L80241B24 +/* A3B000 80241B20 AE000078 */ sw $zero, 0x78($s0) +.L80241B24: +/* A3B004 80241B24 92040073 */ lbu $a0, 0x73($s0) +/* A3B008 80241B28 9207007B */ lbu $a3, 0x7b($s0) +/* A3B00C 80241B2C 0080282D */ daddu $a1, $a0, $zero +/* A3B010 80241B30 AFA70010 */ sw $a3, 0x10($sp) +/* A3B014 80241B34 9202007B */ lbu $v0, 0x7b($s0) +/* A3B018 80241B38 0080302D */ daddu $a2, $a0, $zero +/* A3B01C 80241B3C 0C046FE6 */ jal func_8011BF98 +/* A3B020 80241B40 AFA20014 */ sw $v0, 0x14($sp) +/* A3B024 80241B44 8E030070 */ lw $v1, 0x70($s0) +/* A3B028 80241B48 24020040 */ addiu $v0, $zero, 0x40 +/* A3B02C 80241B4C 14620005 */ bne $v1, $v0, .L80241B64 +/* A3B030 80241B50 0000102D */ daddu $v0, $zero, $zero +/* A3B034 80241B54 8E030078 */ lw $v1, 0x78($s0) +/* A3B038 80241B58 10600002 */ beqz $v1, .L80241B64 +/* A3B03C 80241B5C 24020002 */ addiu $v0, $zero, 2 +/* A3B040 80241B60 0000102D */ daddu $v0, $zero, $zero +.L80241B64: +/* A3B044 80241B64 8FBF001C */ lw $ra, 0x1c($sp) +/* A3B048 80241B68 8FB00018 */ lw $s0, 0x18($sp) +/* A3B04C 80241B6C 03E00008 */ jr $ra +/* A3B050 80241B70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/func_80241B74_A394E0.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241B74_A3B054.s similarity index 100% rename from asm/nonmatchings/world/area_hos/hos_06/func_80241B74_A394E0.s rename to asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241B74_A3B054.s diff --git a/asm/nonmatchings/world/area_hos/hos_06/func_80241CCC_A394E0.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241CCC_A3B1AC.s similarity index 100% rename from asm/nonmatchings/world/area_hos/hos_06/func_80241CCC_A394E0.s rename to asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241CCC_A3B1AC.s diff --git a/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241F98.s b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241F98.s new file mode 100644 index 0000000000..2ef708e6b7 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/_A3A230/func_80241F98.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F98 +/* A3B478 80241F98 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A3B47C 80241F9C AFBF0010 */ sw $ra, 0x10($sp) +/* A3B480 80241FA0 8C82000C */ lw $v0, 0xc($a0) +/* A3B484 80241FA4 0C0B1EAF */ jal get_variable +/* A3B488 80241FA8 8C450000 */ lw $a1, ($v0) +/* A3B48C 80241FAC 8C44000C */ lw $a0, 0xc($v0) +/* A3B490 80241FB0 8C83001C */ lw $v1, 0x1c($a0) +/* A3B494 80241FB4 24630001 */ addiu $v1, $v1, 1 +/* A3B498 80241FB8 AC83001C */ sw $v1, 0x1c($a0) +/* A3B49C 80241FBC 8FBF0010 */ lw $ra, 0x10($sp) +/* A3B4A0 80241FC0 24020002 */ addiu $v0, $zero, 2 +/* A3B4A4 80241FC4 03E00008 */ jr $ra +/* A3B4A8 80241FC8 27BD0018 */ addiu $sp, $sp, 0x18 +/* A3B4AC 80241FCC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_06/func_80240124_A394E0.s b/asm/nonmatchings/world/area_hos/hos_06/func_80240124_A394E0.s deleted file mode 100644 index 72b91f1316..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/func_80240124_A394E0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A39604 -/* A39604 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A39608 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A3960C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A39610 80240130 10A00005 */ beqz $a1, .L80240148 -/* A39614 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A39618 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A3961C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A39620 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A39624 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A39628 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A3962C 8024014C 1440000E */ bnez $v0, .L80240188 -/* A39630 80240150 00000000 */ nop -/* A39634 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A39638 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A3963C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A39640 80240160 04610004 */ bgez $v1, .L80240174 -/* A39644 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A39648 80240168 3C020002 */ lui $v0, 2 -/* A3964C 8024016C 08090061 */ j .L80240184 -/* A39650 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A39654 80240174 3C040002 */ lui $a0, 2 -/* A39658 80240178 0083102A */ slt $v0, $a0, $v1 -/* A3965C 8024017C 10400002 */ beqz $v0, .L80240188 -/* A39660 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A39664 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A39668 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A3966C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A39670 80240190 00000000 */ nop -/* A39674 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A39678 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A3967C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A39680 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A39684 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A39688 802401A8 3C020002 */ lui $v0, 2 -/* A3968C 802401AC 08090071 */ j .L802401C4 -/* A39690 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A39694 802401B4 3C040002 */ lui $a0, 2 -/* A39698 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A3969C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A396A0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A396A4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A396A8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A396AC 802401CC 1440000E */ bnez $v0, .L80240208 -/* A396B0 802401D0 00000000 */ nop -/* A396B4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A396B8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A396BC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A396C0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A396C4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A396C8 802401E8 3C020002 */ lui $v0, 2 -/* A396CC 802401EC 08090081 */ j .L80240204 -/* A396D0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A396D4 802401F4 3C040002 */ lui $a0, 2 -/* A396D8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A396DC 802401FC 10400002 */ beqz $v0, .L80240208 -/* A396E0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A396E4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A396E8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A396EC 8024020C 1440000E */ bnez $v0, .L80240248 -/* A396F0 80240210 00000000 */ nop -/* A396F4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A396F8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A396FC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A39700 80240220 04610004 */ bgez $v1, .L80240234 -/* A39704 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A39708 80240228 3C020002 */ lui $v0, 2 -/* A3970C 8024022C 08090091 */ j .L80240244 -/* A39710 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A39714 80240234 3C040002 */ lui $a0, 2 -/* A39718 80240238 0083102A */ slt $v0, $a0, $v1 -/* A3971C 8024023C 10400002 */ beqz $v0, .L80240248 -/* A39720 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A39724 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A39728 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A3972C 8024024C 0C046F07 */ jal set_main_pan_u -/* A39730 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A39734 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A39738 80240258 0C046F0D */ jal set_main_pan_v -/* A3973C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A39740 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A39744 80240264 0C046F13 */ jal set_aux_pan_u -/* A39748 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A3974C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A39750 80240270 0C046F19 */ jal set_aux_pan_v -/* A39754 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A39758 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A3975C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A39760 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A39764 80240284 24420001 */ addiu $v0, $v0, 1 -/* A39768 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A3976C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A39770 80240290 24630001 */ addiu $v1, $v1, 1 -/* A39774 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A39778 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A3977C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A39780 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A39784 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A39788 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A3978C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A39790 802402B0 14600002 */ bnez $v1, .L802402BC -/* A39794 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A39798 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A3979C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A397A0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A397A4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A397A8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A397AC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A397B0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A397B4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A397B8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A397BC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A397C0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A397C4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A397C8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A397CC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A397D0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A397D4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A397D8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A397DC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A397E0 80240300 0000102D */ daddu $v0, $zero, $zero -/* A397E4 80240304 03E00008 */ jr $ra -/* A397E8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A397EC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_06/func_80240310_A394E0.s b/asm/nonmatchings/world/area_hos/hos_06/func_80240310_A394E0.s deleted file mode 100644 index 7e1dd3382f..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/func_80240310_A394E0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_A397F0 -/* A397F0 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A397F4 80240314 AFB00010 */ sw $s0, 0x10($sp) -/* A397F8 80240318 3C108024 */ lui $s0, 0x8024 -/* A397FC 8024031C 26102C08 */ addiu $s0, $s0, 0x2c08 -/* A39800 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* A39804 80240324 AFB10014 */ sw $s1, 0x14($sp) -/* A39808 80240328 8E020000 */ lw $v0, ($s0) -/* A3980C 8024032C 14400010 */ bnez $v0, .L80240370 -/* A39810 80240330 0080882D */ daddu $s1, $a0, $zero -/* A39814 80240334 0C00AB39 */ jal heap_malloc -/* A39818 80240338 24040040 */ addiu $a0, $zero, 0x40 -/* A3981C 8024033C AE020000 */ sw $v0, ($s0) -/* A39820 80240340 0000182D */ daddu $v1, $zero, $zero -/* A39824 80240344 0040282D */ daddu $a1, $v0, $zero -/* A39828 80240348 0220202D */ daddu $a0, $s1, $zero -.L8024034C: -/* A3982C 8024034C 8C820084 */ lw $v0, 0x84($a0) -/* A39830 80240350 24840004 */ addiu $a0, $a0, 4 -/* A39834 80240354 24630001 */ addiu $v1, $v1, 1 -/* A39838 80240358 ACA20000 */ sw $v0, ($a1) -/* A3983C 8024035C 28620010 */ slti $v0, $v1, 0x10 -/* A39840 80240360 1440FFFA */ bnez $v0, .L8024034C -/* A39844 80240364 24A50004 */ addiu $a1, $a1, 4 -/* A39848 80240368 080900EB */ j .L802403AC -/* A3984C 8024036C 00000000 */ nop -.L80240370: -/* A39850 80240370 0000182D */ daddu $v1, $zero, $zero -/* A39854 80240374 0040282D */ daddu $a1, $v0, $zero -/* A39858 80240378 0220202D */ daddu $a0, $s1, $zero -.L8024037C: -/* A3985C 8024037C 8CA20000 */ lw $v0, ($a1) -/* A39860 80240380 24A50004 */ addiu $a1, $a1, 4 -/* A39864 80240384 24630001 */ addiu $v1, $v1, 1 -/* A39868 80240388 AC820084 */ sw $v0, 0x84($a0) -/* A3986C 8024038C 28620010 */ slti $v0, $v1, 0x10 -/* A39870 80240390 1440FFFA */ bnez $v0, .L8024037C -/* A39874 80240394 24840004 */ addiu $a0, $a0, 4 -/* A39878 80240398 3C108024 */ lui $s0, 0x8024 -/* A3987C 8024039C 26102C08 */ addiu $s0, $s0, 0x2c08 -/* A39880 802403A0 0C00AB4B */ jal heap_free -/* A39884 802403A4 8E040000 */ lw $a0, ($s0) -/* A39888 802403A8 AE000000 */ sw $zero, ($s0) -.L802403AC: -/* A3988C 802403AC 8FBF0018 */ lw $ra, 0x18($sp) -/* A39890 802403B0 8FB10014 */ lw $s1, 0x14($sp) -/* A39894 802403B4 8FB00010 */ lw $s0, 0x10($sp) -/* A39898 802403B8 24020002 */ addiu $v0, $zero, 2 -/* A3989C 802403BC 03E00008 */ jr $ra -/* A398A0 802403C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/func_802403C4_A394E0.s b/asm/nonmatchings/world/area_hos/hos_06/func_802403C4_A394E0.s deleted file mode 100644 index 4b69f1e5f8..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/func_802403C4_A394E0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C4_A398A4 -/* A398A4 802403C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A398A8 802403C8 AFB00010 */ sw $s0, 0x10($sp) -/* A398AC 802403CC 0080802D */ daddu $s0, $a0, $zero -/* A398B0 802403D0 AFBF0018 */ sw $ra, 0x18($sp) -/* A398B4 802403D4 AFB10014 */ sw $s1, 0x14($sp) -/* A398B8 802403D8 8E02000C */ lw $v0, 0xc($s0) -/* A398BC 802403DC 8C510000 */ lw $s1, ($v0) -/* A398C0 802403E0 0C0B1EAF */ jal get_variable -/* A398C4 802403E4 0220282D */ daddu $a1, $s1, $zero -/* A398C8 802403E8 3C03FFF0 */ lui $v1, 0xfff0 -/* A398CC 802403EC 3463FFFF */ ori $v1, $v1, 0xffff -/* A398D0 802403F0 0200202D */ daddu $a0, $s0, $zero -/* A398D4 802403F4 00431024 */ and $v0, $v0, $v1 -/* A398D8 802403F8 00021140 */ sll $v0, $v0, 5 -/* A398DC 802403FC 3C068008 */ lui $a2, %hi(gItemTable) -/* A398E0 80240400 00C23021 */ addu $a2, $a2, $v0 -/* A398E4 80240404 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* A398E8 80240408 0C0B2026 */ jal set_variable -/* A398EC 8024040C 0220282D */ daddu $a1, $s1, $zero -/* A398F0 80240410 8FBF0018 */ lw $ra, 0x18($sp) -/* A398F4 80240414 8FB10014 */ lw $s1, 0x14($sp) -/* A398F8 80240418 8FB00010 */ lw $s0, 0x10($sp) -/* A398FC 8024041C 24020002 */ addiu $v0, $zero, 2 -/* A39900 80240420 03E00008 */ jr $ra -/* A39904 80240424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/func_80240428_A394E0.s b/asm/nonmatchings/world/area_hos/hos_06/func_80240428_A394E0.s deleted file mode 100644 index ee6d1d3fd5..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/func_80240428_A394E0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240428_A39908 -/* A39908 80240428 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A3990C 8024042C AFB10014 */ sw $s1, 0x14($sp) -/* A39910 80240430 0080882D */ daddu $s1, $a0, $zero -/* A39914 80240434 AFBF0018 */ sw $ra, 0x18($sp) -/* A39918 80240438 AFB00010 */ sw $s0, 0x10($sp) -/* A3991C 8024043C 8E30000C */ lw $s0, 0xc($s1) -/* A39920 80240440 8E050000 */ lw $a1, ($s0) -/* A39924 80240444 0C0B1EAF */ jal get_variable -/* A39928 80240448 26100004 */ addiu $s0, $s0, 4 -/* A3992C 8024044C 0C00EAD2 */ jal get_npc_safe -/* A39930 80240450 0040202D */ daddu $a0, $v0, $zero -/* A39934 80240454 10400005 */ beqz $v0, .L8024046C -/* A39938 80240458 00000000 */ nop -/* A3993C 8024045C 8E050000 */ lw $a1, ($s0) -/* A39940 80240460 844600A8 */ lh $a2, 0xa8($v0) -/* A39944 80240464 0C0B2026 */ jal set_variable -/* A39948 80240468 0220202D */ daddu $a0, $s1, $zero -.L8024046C: -/* A3994C 8024046C 8FBF0018 */ lw $ra, 0x18($sp) -/* A39950 80240470 8FB10014 */ lw $s1, 0x14($sp) -/* A39954 80240474 8FB00010 */ lw $s0, 0x10($sp) -/* A39958 80240478 24020002 */ addiu $v0, $zero, 2 -/* A3995C 8024047C 03E00008 */ jr $ra -/* A39960 80240480 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/func_80240654_A394E0.s b/asm/nonmatchings/world/area_hos/hos_06/func_80240654_A394E0.s deleted file mode 100644 index 18b2129f42..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/func_80240654_A394E0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240654_A39B34 -/* A39B34 80240654 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A39B38 80240658 AFBF0010 */ sw $ra, 0x10($sp) -/* A39B3C 8024065C 10A00003 */ beqz $a1, .L8024066C -/* A39B40 80240660 8C86000C */ lw $a2, 0xc($a0) -/* A39B44 80240664 3C018024 */ lui $at, 0x8024 -/* A39B48 80240668 AC202C6C */ sw $zero, 0x2c6c($at) -.L8024066C: -/* A39B4C 8024066C 3C038024 */ lui $v1, 0x8024 -/* A39B50 80240670 24632C6C */ addiu $v1, $v1, 0x2c6c -/* A39B54 80240674 8C620000 */ lw $v0, ($v1) -/* A39B58 80240678 54400003 */ bnel $v0, $zero, .L80240688 -/* A39B5C 8024067C AC600000 */ sw $zero, ($v1) -/* A39B60 80240680 080901A7 */ j .L8024069C -/* A39B64 80240684 0000102D */ daddu $v0, $zero, $zero -.L80240688: -/* A39B68 80240688 8CC50000 */ lw $a1, ($a2) -/* A39B6C 8024068C 3C068024 */ lui $a2, 0x8024 -/* A39B70 80240690 0C0B2026 */ jal set_variable -/* A39B74 80240694 8CC62C70 */ lw $a2, 0x2c70($a2) -/* A39B78 80240698 24020002 */ addiu $v0, $zero, 2 -.L8024069C: -/* A39B7C 8024069C 8FBF0010 */ lw $ra, 0x10($sp) -/* A39B80 802406A0 03E00008 */ jr $ra -/* A39B84 802406A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/func_802406E0_A394E0.s b/asm/nonmatchings/world/area_hos/hos_06/func_802406E0_A394E0.s deleted file mode 100644 index 97460ba2ae..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/func_802406E0_A394E0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406E0_A39BC0 -/* A39BC0 802406E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A39BC4 802406E4 AFBF0010 */ sw $ra, 0x10($sp) -/* A39BC8 802406E8 8C82000C */ lw $v0, 0xc($a0) -/* A39BCC 802406EC 0C0B1EAF */ jal get_variable -/* A39BD0 802406F0 8C450000 */ lw $a1, ($v0) -/* A39BD4 802406F4 0040182D */ daddu $v1, $v0, $zero -/* A39BD8 802406F8 10600012 */ beqz $v1, .L80240744 -/* A39BDC 802406FC 0000202D */ daddu $a0, $zero, $zero -/* A39BE0 80240700 8C620000 */ lw $v0, ($v1) -/* A39BE4 80240704 5040000A */ beql $v0, $zero, .L80240730 -/* A39BE8 80240708 00041080 */ sll $v0, $a0, 2 -/* A39BEC 8024070C 3C058024 */ lui $a1, 0x8024 -/* A39BF0 80240710 24A56260 */ addiu $a1, $a1, 0x6260 -.L80240714: -/* A39BF4 80240714 24630004 */ addiu $v1, $v1, 4 -/* A39BF8 80240718 24840001 */ addiu $a0, $a0, 1 -/* A39BFC 8024071C ACA20000 */ sw $v0, ($a1) -/* A39C00 80240720 8C620000 */ lw $v0, ($v1) -/* A39C04 80240724 1440FFFB */ bnez $v0, .L80240714 -/* A39C08 80240728 24A50004 */ addiu $a1, $a1, 4 -/* A39C0C 8024072C 00041080 */ sll $v0, $a0, 2 -.L80240730: -/* A39C10 80240730 3C018024 */ lui $at, 0x8024 -/* A39C14 80240734 00220821 */ addu $at, $at, $v0 -/* A39C18 80240738 AC206260 */ sw $zero, 0x6260($at) -/* A39C1C 8024073C 080901DB */ j .L8024076C -/* A39C20 80240740 00000000 */ nop -.L80240744: -/* A39C24 80240744 3C038024 */ lui $v1, 0x8024 -/* A39C28 80240748 24636260 */ addiu $v1, $v1, 0x6260 -/* A39C2C 8024074C 0060282D */ daddu $a1, $v1, $zero -.L80240750: -/* A39C30 80240750 24820010 */ addiu $v0, $a0, 0x10 -/* A39C34 80240754 AC620000 */ sw $v0, ($v1) -/* A39C38 80240758 24630004 */ addiu $v1, $v1, 4 -/* A39C3C 8024075C 24840001 */ addiu $a0, $a0, 1 -/* A39C40 80240760 28820070 */ slti $v0, $a0, 0x70 -/* A39C44 80240764 1440FFFA */ bnez $v0, .L80240750 -/* A39C48 80240768 ACA001C0 */ sw $zero, 0x1c0($a1) -.L8024076C: -/* A39C4C 8024076C 8FBF0010 */ lw $ra, 0x10($sp) -/* A39C50 80240770 24020002 */ addiu $v0, $zero, 2 -/* A39C54 80240774 03E00008 */ jr $ra -/* A39C58 80240778 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/func_80240AD0_A394E0.s b/asm/nonmatchings/world/area_hos/hos_06/func_80240AD0_A394E0.s deleted file mode 100644 index c5ce7fa7f1..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/func_80240AD0_A394E0.s +++ /dev/null @@ -1,166 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD0_A39FB0 -/* A39FB0 80240AD0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A39FB4 80240AD4 AFB3001C */ sw $s3, 0x1c($sp) -/* A39FB8 80240AD8 0080982D */ daddu $s3, $a0, $zero -/* A39FBC 80240ADC AFB60028 */ sw $s6, 0x28($sp) -/* A39FC0 80240AE0 3C168011 */ lui $s6, %hi(gPlayerData) -/* A39FC4 80240AE4 26D6F290 */ addiu $s6, $s6, %lo(gPlayerData) -/* A39FC8 80240AE8 AFBF0034 */ sw $ra, 0x34($sp) -/* A39FCC 80240AEC AFBE0030 */ sw $fp, 0x30($sp) -/* A39FD0 80240AF0 AFB7002C */ sw $s7, 0x2c($sp) -/* A39FD4 80240AF4 AFB50024 */ sw $s5, 0x24($sp) -/* A39FD8 80240AF8 AFB40020 */ sw $s4, 0x20($sp) -/* A39FDC 80240AFC AFB20018 */ sw $s2, 0x18($sp) -/* A39FE0 80240B00 AFB10014 */ sw $s1, 0x14($sp) -/* A39FE4 80240B04 10A0003E */ beqz $a1, .L80240C00 -/* A39FE8 80240B08 AFB00010 */ sw $s0, 0x10($sp) -/* A39FEC 80240B0C 0C00AB39 */ jal heap_malloc -/* A39FF0 80240B10 24040330 */ addiu $a0, $zero, 0x330 -/* A39FF4 80240B14 AE620078 */ sw $v0, 0x78($s3) -/* A39FF8 80240B18 0040A82D */ daddu $s5, $v0, $zero -/* A39FFC 80240B1C 0000A02D */ daddu $s4, $zero, $zero -/* A3A000 80240B20 0280902D */ daddu $s2, $s4, $zero -/* A3A004 80240B24 3C17F840 */ lui $s7, 0xf840 -/* A3A008 80240B28 36F7626B */ ori $s7, $s7, 0x626b -/* A3A00C 80240B2C 3C1E8009 */ lui $fp, 0x8009 -/* A3A010 80240B30 27DEA680 */ addiu $fp, $fp, -0x5980 -/* A3A014 80240B34 3C118024 */ lui $s1, 0x8024 -/* A3A018 80240B38 263135EC */ addiu $s1, $s1, 0x35ec -/* A3A01C 80240B3C 02A0802D */ daddu $s0, $s5, $zero -.L80240B40: -/* A3A020 80240B40 0000202D */ daddu $a0, $zero, $zero -/* A3A024 80240B44 0C0B1EAF */ jal get_variable -/* A3A028 80240B48 02572821 */ addu $a1, $s2, $s7 -/* A3A02C 80240B4C 54400022 */ bnel $v0, $zero, .L80240BD8 -/* A3A030 80240B50 26520001 */ addiu $s2, $s2, 1 -/* A3A034 80240B54 8E220000 */ lw $v0, ($s1) -/* A3A038 80240B58 3C068008 */ lui $a2, %hi(gItemTable) -/* A3A03C 80240B5C 24C678E0 */ addiu $a2, $a2, %lo(gItemTable) -/* A3A040 80240B60 00021140 */ sll $v0, $v0, 5 -/* A3A044 80240B64 00461021 */ addu $v0, $v0, $a2 -/* A3A048 80240B68 84430004 */ lh $v1, 4($v0) -/* A3A04C 80240B6C AE120108 */ sw $s2, 0x108($s0) -/* A3A050 80240B70 8C420000 */ lw $v0, ($v0) -/* A3A054 80240B74 000318C0 */ sll $v1, $v1, 3 -/* A3A058 80240B78 007E2021 */ addu $a0, $v1, $fp -/* A3A05C 80240B7C AE020084 */ sw $v0, 0x84($s0) -/* A3A060 80240B80 8C820000 */ lw $v0, ($a0) -/* A3A064 80240B84 AE020000 */ sw $v0, ($s0) -/* A3A068 80240B88 92C2000F */ lbu $v0, 0xf($s6) -/* A3A06C 80240B8C 8E230004 */ lw $v1, 4($s1) -/* A3A070 80240B90 0043102A */ slt $v0, $v0, $v1 -/* A3A074 80240B94 38420001 */ xori $v0, $v0, 1 -/* A3A078 80240B98 AE02018C */ sw $v0, 0x18c($s0) -/* A3A07C 80240B9C 92C2000F */ lbu $v0, 0xf($s6) -/* A3A080 80240BA0 8E230004 */ lw $v1, 4($s1) -/* A3A084 80240BA4 0043102A */ slt $v0, $v0, $v1 -/* A3A088 80240BA8 10400004 */ beqz $v0, .L80240BBC -/* A3A08C 80240BAC 00000000 */ nop -/* A3A090 80240BB0 8C820004 */ lw $v0, 4($a0) -/* A3A094 80240BB4 AE00018C */ sw $zero, 0x18c($s0) -/* A3A098 80240BB8 AE020000 */ sw $v0, ($s0) -.L80240BBC: -/* A3A09C 80240BBC 8E220008 */ lw $v0, 8($s1) -/* A3A0A0 80240BC0 AE020294 */ sw $v0, 0x294($s0) -/* A3A0A4 80240BC4 8E220004 */ lw $v0, 4($s1) -/* A3A0A8 80240BC8 26940001 */ addiu $s4, $s4, 1 -/* A3A0AC 80240BCC AE020210 */ sw $v0, 0x210($s0) -/* A3A0B0 80240BD0 26100004 */ addiu $s0, $s0, 4 -/* A3A0B4 80240BD4 26520001 */ addiu $s2, $s2, 1 -.L80240BD8: -/* A3A0B8 80240BD8 2A42000F */ slti $v0, $s2, 0xf -/* A3A0BC 80240BDC 1440FFD8 */ bnez $v0, .L80240B40 -/* A3A0C0 80240BE0 2631000C */ addiu $s1, $s1, 0xc -/* A3A0C4 80240BE4 02A0202D */ daddu $a0, $s5, $zero -/* A3A0C8 80240BE8 24020003 */ addiu $v0, $zero, 3 -/* A3A0CC 80240BEC AC820318 */ sw $v0, 0x318($a0) -/* A3A0D0 80240BF0 AC940324 */ sw $s4, 0x324($a0) -/* A3A0D4 80240BF4 0C03D390 */ jal func_800F4E40 -/* A3A0D8 80240BF8 AC800328 */ sw $zero, 0x328($a0) -/* A3A0DC 80240BFC AE600070 */ sw $zero, 0x70($s3) -.L80240C00: -/* A3A0E0 80240C00 8E620070 */ lw $v0, 0x70($s3) -/* A3A0E4 80240C04 8E750078 */ lw $s5, 0x78($s3) -/* A3A0E8 80240C08 14400008 */ bnez $v0, .L80240C2C -/* A3A0EC 80240C0C 24420001 */ addiu $v0, $v0, 1 -/* A3A0F0 80240C10 86A2032C */ lh $v0, 0x32c($s5) -/* A3A0F4 80240C14 10400009 */ beqz $v0, .L80240C3C -/* A3A0F8 80240C18 AE620074 */ sw $v0, 0x74($s3) -/* A3A0FC 80240C1C 0C03C4EC */ jal func_800F13B0 -/* A3A100 80240C20 00000000 */ nop -/* A3A104 80240C24 8E620070 */ lw $v0, 0x70($s3) -/* A3A108 80240C28 24420001 */ addiu $v0, $v0, 1 -.L80240C2C: -/* A3A10C 80240C2C AE620070 */ sw $v0, 0x70($s3) -/* A3A110 80240C30 28420014 */ slti $v0, $v0, 0x14 -/* A3A114 80240C34 10400003 */ beqz $v0, .L80240C44 -/* A3A118 80240C38 00000000 */ nop -.L80240C3C: -/* A3A11C 80240C3C 0809033D */ j .L80240CF4 -/* A3A120 80240C40 0000102D */ daddu $v0, $zero, $zero -.L80240C44: -/* A3A124 80240C44 0C03C54E */ jal func_800F1538 -/* A3A128 80240C48 00000000 */ nop -/* A3A12C 80240C4C 8E630074 */ lw $v1, 0x74($s3) -/* A3A130 80240C50 240200FF */ addiu $v0, $zero, 0xff -/* A3A134 80240C54 10620022 */ beq $v1, $v0, .L80240CE0 -/* A3A138 80240C58 2462FFFF */ addiu $v0, $v1, -1 -/* A3A13C 80240C5C 00021080 */ sll $v0, $v0, 2 -/* A3A140 80240C60 02A21021 */ addu $v0, $s5, $v0 -/* A3A144 80240C64 8C520108 */ lw $s2, 0x108($v0) -/* A3A148 80240C68 3C028024 */ lui $v0, 0x8024 -/* A3A14C 80240C6C 244235EC */ addiu $v0, $v0, 0x35ec -/* A3A150 80240C70 00121840 */ sll $v1, $s2, 1 -/* A3A154 80240C74 00721821 */ addu $v1, $v1, $s2 -/* A3A158 80240C78 00031880 */ sll $v1, $v1, 2 -/* A3A15C 80240C7C 00621821 */ addu $v1, $v1, $v0 -/* A3A160 80240C80 8C620000 */ lw $v0, ($v1) -/* A3A164 80240C84 AE620084 */ sw $v0, 0x84($s3) -/* A3A168 80240C88 8C620004 */ lw $v0, 4($v1) -/* A3A16C 80240C8C AE72008C */ sw $s2, 0x8c($s3) -/* A3A170 80240C90 AE620088 */ sw $v0, 0x88($s3) -/* A3A174 80240C94 8C620000 */ lw $v0, ($v1) -/* A3A178 80240C98 00021140 */ sll $v0, $v0, 5 -/* A3A17C 80240C9C 3C018008 */ lui $at, 0x8008 -/* A3A180 80240CA0 00220821 */ addu $at, $at, $v0 -/* A3A184 80240CA4 8C2278E0 */ lw $v0, 0x78e0($at) -/* A3A188 80240CA8 AE620094 */ sw $v0, 0x94($s3) -/* A3A18C 80240CAC 8C620000 */ lw $v0, ($v1) -/* A3A190 80240CB0 00021140 */ sll $v0, $v0, 5 -/* A3A194 80240CB4 3C038008 */ lui $v1, 0x8008 -/* A3A198 80240CB8 00621821 */ addu $v1, $v1, $v0 -/* A3A19C 80240CBC 906378FA */ lbu $v1, 0x78fa($v1) -/* A3A1A0 80240CC0 00031080 */ sll $v0, $v1, 2 -/* A3A1A4 80240CC4 00431021 */ addu $v0, $v0, $v1 -/* A3A1A8 80240CC8 00021080 */ sll $v0, $v0, 2 -/* A3A1AC 80240CCC 3C018009 */ lui $at, 0x8009 -/* A3A1B0 80240CD0 00220821 */ addu $at, $at, $v0 -/* A3A1B4 80240CD4 8022F072 */ lb $v0, -0xf8e($at) -/* A3A1B8 80240CD8 0809033A */ j .L80240CE8 -/* A3A1BC 80240CDC AE620098 */ sw $v0, 0x98($s3) -.L80240CE0: -/* A3A1C0 80240CE0 2402FFFF */ addiu $v0, $zero, -1 -/* A3A1C4 80240CE4 AE620084 */ sw $v0, 0x84($s3) -.L80240CE8: -/* A3A1C8 80240CE8 0C00AB4B */ jal heap_free -/* A3A1CC 80240CEC 8E640078 */ lw $a0, 0x78($s3) -/* A3A1D0 80240CF0 24020002 */ addiu $v0, $zero, 2 -.L80240CF4: -/* A3A1D4 80240CF4 8FBF0034 */ lw $ra, 0x34($sp) -/* A3A1D8 80240CF8 8FBE0030 */ lw $fp, 0x30($sp) -/* A3A1DC 80240CFC 8FB7002C */ lw $s7, 0x2c($sp) -/* A3A1E0 80240D00 8FB60028 */ lw $s6, 0x28($sp) -/* A3A1E4 80240D04 8FB50024 */ lw $s5, 0x24($sp) -/* A3A1E8 80240D08 8FB40020 */ lw $s4, 0x20($sp) -/* A3A1EC 80240D0C 8FB3001C */ lw $s3, 0x1c($sp) -/* A3A1F0 80240D10 8FB20018 */ lw $s2, 0x18($sp) -/* A3A1F4 80240D14 8FB10014 */ lw $s1, 0x14($sp) -/* A3A1F8 80240D18 8FB00010 */ lw $s0, 0x10($sp) -/* A3A1FC 80240D1C 03E00008 */ jr $ra -/* A3A200 80240D20 27BD0038 */ addiu $sp, $sp, 0x38 -/* A3A204 80240D24 00000000 */ nop -/* A3A208 80240D28 00000000 */ nop -/* A3A20C 80240D2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_06/func_80241FD0_A394E0.s b/asm/nonmatchings/world/area_hos/hos_06/func_80241FD0_A394E0.s deleted file mode 100644 index 4965af9db1..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/func_80241FD0_A394E0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FD0_A3B4B0 -/* A3B4B0 80241FD0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A3B4B4 80241FD4 AFB00010 */ sw $s0, 0x10($sp) -/* A3B4B8 80241FD8 3C108024 */ lui $s0, 0x8024 -/* A3B4BC 80241FDC 26105E80 */ addiu $s0, $s0, 0x5e80 -/* A3B4C0 80241FE0 AFBF0018 */ sw $ra, 0x18($sp) -/* A3B4C4 80241FE4 AFB10014 */ sw $s1, 0x14($sp) -/* A3B4C8 80241FE8 8E020000 */ lw $v0, ($s0) -/* A3B4CC 80241FEC 14400010 */ bnez $v0, .L80242030 -/* A3B4D0 80241FF0 0080882D */ daddu $s1, $a0, $zero -/* A3B4D4 80241FF4 0C00AB39 */ jal heap_malloc -/* A3B4D8 80241FF8 24040040 */ addiu $a0, $zero, 0x40 -/* A3B4DC 80241FFC AE020000 */ sw $v0, ($s0) -/* A3B4E0 80242000 0000182D */ daddu $v1, $zero, $zero -/* A3B4E4 80242004 0040282D */ daddu $a1, $v0, $zero -/* A3B4E8 80242008 0220202D */ daddu $a0, $s1, $zero -.L8024200C: -/* A3B4EC 8024200C 8C820084 */ lw $v0, 0x84($a0) -/* A3B4F0 80242010 24840004 */ addiu $a0, $a0, 4 -/* A3B4F4 80242014 24630001 */ addiu $v1, $v1, 1 -/* A3B4F8 80242018 ACA20000 */ sw $v0, ($a1) -/* A3B4FC 8024201C 28620010 */ slti $v0, $v1, 0x10 -/* A3B500 80242020 1440FFFA */ bnez $v0, .L8024200C -/* A3B504 80242024 24A50004 */ addiu $a1, $a1, 4 -/* A3B508 80242028 0809081B */ j .L8024206C -/* A3B50C 8024202C 00000000 */ nop -.L80242030: -/* A3B510 80242030 0000182D */ daddu $v1, $zero, $zero -/* A3B514 80242034 0040282D */ daddu $a1, $v0, $zero -/* A3B518 80242038 0220202D */ daddu $a0, $s1, $zero -.L8024203C: -/* A3B51C 8024203C 8CA20000 */ lw $v0, ($a1) -/* A3B520 80242040 24A50004 */ addiu $a1, $a1, 4 -/* A3B524 80242044 24630001 */ addiu $v1, $v1, 1 -/* A3B528 80242048 AC820084 */ sw $v0, 0x84($a0) -/* A3B52C 8024204C 28620010 */ slti $v0, $v1, 0x10 -/* A3B530 80242050 1440FFFA */ bnez $v0, .L8024203C -/* A3B534 80242054 24840004 */ addiu $a0, $a0, 4 -/* A3B538 80242058 3C108024 */ lui $s0, 0x8024 -/* A3B53C 8024205C 26105E80 */ addiu $s0, $s0, 0x5e80 -/* A3B540 80242060 0C00AB4B */ jal heap_free -/* A3B544 80242064 8E040000 */ lw $a0, ($s0) -/* A3B548 80242068 AE000000 */ sw $zero, ($s0) -.L8024206C: -/* A3B54C 8024206C 8FBF0018 */ lw $ra, 0x18($sp) -/* A3B550 80242070 8FB10014 */ lw $s1, 0x14($sp) -/* A3B554 80242074 8FB00010 */ lw $s0, 0x10($sp) -/* A3B558 80242078 24020002 */ addiu $v0, $zero, 2 -/* A3B55C 8024207C 03E00008 */ jr $ra -/* A3B560 80242080 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/func_80242084_A394E0.s b/asm/nonmatchings/world/area_hos/hos_06/func_80242084_A394E0.s deleted file mode 100644 index c1db92aa39..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/func_80242084_A394E0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242084_A3B564 -/* A3B564 80242084 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A3B568 80242088 AFB00010 */ sw $s0, 0x10($sp) -/* A3B56C 8024208C 0080802D */ daddu $s0, $a0, $zero -/* A3B570 80242090 AFBF0018 */ sw $ra, 0x18($sp) -/* A3B574 80242094 AFB10014 */ sw $s1, 0x14($sp) -/* A3B578 80242098 8E02000C */ lw $v0, 0xc($s0) -/* A3B57C 8024209C 8C510000 */ lw $s1, ($v0) -/* A3B580 802420A0 0C0B1EAF */ jal get_variable -/* A3B584 802420A4 0220282D */ daddu $a1, $s1, $zero -/* A3B588 802420A8 3C03FFF0 */ lui $v1, 0xfff0 -/* A3B58C 802420AC 3463FFFF */ ori $v1, $v1, 0xffff -/* A3B590 802420B0 0200202D */ daddu $a0, $s0, $zero -/* A3B594 802420B4 00431024 */ and $v0, $v0, $v1 -/* A3B598 802420B8 00021140 */ sll $v0, $v0, 5 -/* A3B59C 802420BC 3C068008 */ lui $a2, %hi(gItemTable) -/* A3B5A0 802420C0 00C23021 */ addu $a2, $a2, $v0 -/* A3B5A4 802420C4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* A3B5A8 802420C8 0C0B2026 */ jal set_variable -/* A3B5AC 802420CC 0220282D */ daddu $a1, $s1, $zero -/* A3B5B0 802420D0 8FBF0018 */ lw $ra, 0x18($sp) -/* A3B5B4 802420D4 8FB10014 */ lw $s1, 0x14($sp) -/* A3B5B8 802420D8 8FB00010 */ lw $s0, 0x10($sp) -/* A3B5BC 802420DC 24020002 */ addiu $v0, $zero, 2 -/* A3B5C0 802420E0 03E00008 */ jr $ra -/* A3B5C4 802420E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/func_8024228C_A394E0.s b/asm/nonmatchings/world/area_hos/hos_06/func_8024228C_A394E0.s deleted file mode 100644 index 05207daec1..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/func_8024228C_A394E0.s +++ /dev/null @@ -1,161 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024228C_A3B76C -/* A3B76C 8024228C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A3B770 80242290 AFB3001C */ sw $s3, 0x1c($sp) -/* A3B774 80242294 0080982D */ daddu $s3, $a0, $zero -/* A3B778 80242298 AFBF0034 */ sw $ra, 0x34($sp) -/* A3B77C 8024229C AFBE0030 */ sw $fp, 0x30($sp) -/* A3B780 802422A0 AFB7002C */ sw $s7, 0x2c($sp) -/* A3B784 802422A4 AFB60028 */ sw $s6, 0x28($sp) -/* A3B788 802422A8 AFB50024 */ sw $s5, 0x24($sp) -/* A3B78C 802422AC AFB40020 */ sw $s4, 0x20($sp) -/* A3B790 802422B0 AFB20018 */ sw $s2, 0x18($sp) -/* A3B794 802422B4 AFB10014 */ sw $s1, 0x14($sp) -/* A3B798 802422B8 10A0004B */ beqz $a1, .L802423E8 -/* A3B79C 802422BC AFB00010 */ sw $s0, 0x10($sp) -/* A3B7A0 802422C0 0C00AB39 */ jal heap_malloc -/* A3B7A4 802422C4 24040330 */ addiu $a0, $zero, 0x330 -/* A3B7A8 802422C8 8E630084 */ lw $v1, 0x84($s3) -/* A3B7AC 802422CC 0040A82D */ daddu $s5, $v0, $zero -/* A3B7B0 802422D0 AE750078 */ sw $s5, 0x78($s3) -/* A3B7B4 802422D4 14600008 */ bnez $v1, .L802422F8 -/* A3B7B8 802422D8 AE6300AC */ sw $v1, 0xac($s3) -/* A3B7BC 802422DC 3C03F840 */ lui $v1, 0xf840 -/* A3B7C0 802422E0 34635D64 */ ori $v1, $v1, 0x5d64 -/* A3B7C4 802422E4 3C02F840 */ lui $v0, 0xf840 -/* A3B7C8 802422E8 34425D69 */ ori $v0, $v0, 0x5d69 -/* A3B7CC 802422EC AE62008C */ sw $v0, 0x8c($s3) -/* A3B7D0 802422F0 080908C4 */ j .L80242310 -/* A3B7D4 802422F4 2402000C */ addiu $v0, $zero, 0xc -.L802422F8: -/* A3B7D8 802422F8 3C03F840 */ lui $v1, 0xf840 -/* A3B7DC 802422FC 34635D69 */ ori $v1, $v1, 0x5d69 -/* A3B7E0 80242300 3C02F840 */ lui $v0, 0xf840 -/* A3B7E4 80242304 34425D6E */ ori $v0, $v0, 0x5d6e -/* A3B7E8 80242308 AE62008C */ sw $v0, 0x8c($s3) -/* A3B7EC 8024230C 24020009 */ addiu $v0, $zero, 9 -.L80242310: -/* A3B7F0 80242310 AE630088 */ sw $v1, 0x88($s3) -/* A3B7F4 80242314 AEA20318 */ sw $v0, 0x318($s5) -/* A3B7F8 80242318 0000B02D */ daddu $s6, $zero, $zero -/* A3B7FC 8024231C 02C0902D */ daddu $s2, $s6, $zero -/* A3B800 80242320 3C1E8009 */ lui $fp, 0x8009 -/* A3B804 80242324 27DEA680 */ addiu $fp, $fp, -0x5980 -/* A3B808 80242328 24170001 */ addiu $s7, $zero, 1 -/* A3B80C 8024232C 3C148024 */ lui $s4, 0x8024 -/* A3B810 80242330 26945EEC */ addiu $s4, $s4, 0x5eec -/* A3B814 80242334 02A0882D */ daddu $s1, $s5, $zero -.L80242338: -/* A3B818 80242338 8E650088 */ lw $a1, 0x88($s3) -/* A3B81C 8024233C 0000202D */ daddu $a0, $zero, $zero -/* A3B820 80242340 0C0B1EAF */ jal get_variable -/* A3B824 80242344 00B22821 */ addu $a1, $a1, $s2 -/* A3B828 80242348 0000202D */ daddu $a0, $zero, $zero -/* A3B82C 8024234C 8E65008C */ lw $a1, 0x8c($s3) -/* A3B830 80242350 0040802D */ daddu $s0, $v0, $zero -/* A3B834 80242354 0C0B1EAF */ jal get_variable -/* A3B838 80242358 00B22821 */ addu $a1, $a1, $s2 -/* A3B83C 8024235C 52000016 */ beql $s0, $zero, .L802423B8 -/* A3B840 80242360 26520001 */ addiu $s2, $s2, 1 -/* A3B844 80242364 54400014 */ bnel $v0, $zero, .L802423B8 -/* A3B848 80242368 26520001 */ addiu $s2, $s2, 1 -/* A3B84C 8024236C 8E830000 */ lw $v1, ($s4) -/* A3B850 80242370 3C078008 */ lui $a3, %hi(gItemTable) -/* A3B854 80242374 24E778E0 */ addiu $a3, $a3, %lo(gItemTable) -/* A3B858 80242378 00031940 */ sll $v1, $v1, 5 -/* A3B85C 8024237C 00671821 */ addu $v1, $v1, $a3 -/* A3B860 80242380 84620004 */ lh $v0, 4($v1) -/* A3B864 80242384 000210C0 */ sll $v0, $v0, 3 -/* A3B868 80242388 005E1021 */ addu $v0, $v0, $fp -/* A3B86C 8024238C 8C420000 */ lw $v0, ($v0) -/* A3B870 80242390 AE320108 */ sw $s2, 0x108($s1) -/* A3B874 80242394 AE37018C */ sw $s7, 0x18c($s1) -/* A3B878 80242398 AE220000 */ sw $v0, ($s1) -/* A3B87C 8024239C 8C620000 */ lw $v0, ($v1) -/* A3B880 802423A0 AE220084 */ sw $v0, 0x84($s1) -/* A3B884 802423A4 8C620014 */ lw $v0, 0x14($v1) -/* A3B888 802423A8 26D60001 */ addiu $s6, $s6, 1 -/* A3B88C 802423AC AE220294 */ sw $v0, 0x294($s1) -/* A3B890 802423B0 26310004 */ addiu $s1, $s1, 4 -/* A3B894 802423B4 26520001 */ addiu $s2, $s2, 1 -.L802423B8: -/* A3B898 802423B8 2A420005 */ slti $v0, $s2, 5 -/* A3B89C 802423BC 1440FFDE */ bnez $v0, .L80242338 -/* A3B8A0 802423C0 26940004 */ addiu $s4, $s4, 4 -/* A3B8A4 802423C4 16C00004 */ bnez $s6, .L802423D8 -/* A3B8A8 802423C8 02A0202D */ daddu $a0, $s5, $zero -/* A3B8AC 802423CC AE600084 */ sw $zero, 0x84($s3) -/* A3B8B0 802423D0 08090927 */ j .L8024249C -/* A3B8B4 802423D4 24020001 */ addiu $v0, $zero, 1 -.L802423D8: -/* A3B8B8 802423D8 AC960324 */ sw $s6, 0x324($a0) -/* A3B8BC 802423DC 0C03D390 */ jal func_800F4E40 -/* A3B8C0 802423E0 AC800328 */ sw $zero, 0x328($a0) -/* A3B8C4 802423E4 AE600070 */ sw $zero, 0x70($s3) -.L802423E8: -/* A3B8C8 802423E8 8E620070 */ lw $v0, 0x70($s3) -/* A3B8CC 802423EC 8E750078 */ lw $s5, 0x78($s3) -/* A3B8D0 802423F0 14400008 */ bnez $v0, .L80242414 -/* A3B8D4 802423F4 24420001 */ addiu $v0, $v0, 1 -/* A3B8D8 802423F8 86A2032C */ lh $v0, 0x32c($s5) -/* A3B8DC 802423FC 10400009 */ beqz $v0, .L80242424 -/* A3B8E0 80242400 AE620074 */ sw $v0, 0x74($s3) -/* A3B8E4 80242404 0C03C4EC */ jal func_800F13B0 -/* A3B8E8 80242408 00000000 */ nop -/* A3B8EC 8024240C 8E620070 */ lw $v0, 0x70($s3) -/* A3B8F0 80242410 24420001 */ addiu $v0, $v0, 1 -.L80242414: -/* A3B8F4 80242414 AE620070 */ sw $v0, 0x70($s3) -/* A3B8F8 80242418 2842000F */ slti $v0, $v0, 0xf -/* A3B8FC 8024241C 10400003 */ beqz $v0, .L8024242C -/* A3B900 80242420 00000000 */ nop -.L80242424: -/* A3B904 80242424 08090927 */ j .L8024249C -/* A3B908 80242428 0000102D */ daddu $v0, $zero, $zero -.L8024242C: -/* A3B90C 8024242C 0C03C54E */ jal func_800F1538 -/* A3B910 80242430 00000000 */ nop -/* A3B914 80242434 8E630074 */ lw $v1, 0x74($s3) -/* A3B918 80242438 240200FF */ addiu $v0, $zero, 0xff -/* A3B91C 8024243C 14620004 */ bne $v1, $v0, .L80242450 -/* A3B920 80242440 2462FFFF */ addiu $v0, $v1, -1 -/* A3B924 80242444 2402FFFF */ addiu $v0, $zero, -1 -/* A3B928 80242448 08090926 */ j .L80242498 -/* A3B92C 8024244C AE620084 */ sw $v0, 0x84($s3) -.L80242450: -/* A3B930 80242450 00021080 */ sll $v0, $v0, 2 -/* A3B934 80242454 02A21021 */ addu $v0, $s5, $v0 -/* A3B938 80242458 8C460108 */ lw $a2, 0x108($v0) -/* A3B93C 8024245C 8E6300AC */ lw $v1, 0xac($s3) -/* A3B940 80242460 00061080 */ sll $v0, $a2, 2 -/* A3B944 80242464 3C018024 */ lui $at, 0x8024 -/* A3B948 80242468 00220821 */ addu $at, $at, $v0 -/* A3B94C 8024246C 8C225EEC */ lw $v0, 0x5eec($at) -/* A3B950 80242470 14600006 */ bnez $v1, .L8024248C -/* A3B954 80242474 AE620084 */ sw $v0, 0x84($s3) -/* A3B958 80242478 8E65008C */ lw $a1, 0x8c($s3) -/* A3B95C 8024247C 0000202D */ daddu $a0, $zero, $zero -/* A3B960 80242480 00A62821 */ addu $a1, $a1, $a2 -/* A3B964 80242484 0C0B2026 */ jal set_variable -/* A3B968 80242488 24060001 */ addiu $a2, $zero, 1 -.L8024248C: -/* A3B96C 8024248C 8E640078 */ lw $a0, 0x78($s3) -/* A3B970 80242490 0C00AB4B */ jal heap_free -/* A3B974 80242494 00000000 */ nop -.L80242498: -/* A3B978 80242498 24020002 */ addiu $v0, $zero, 2 -.L8024249C: -/* A3B97C 8024249C 8FBF0034 */ lw $ra, 0x34($sp) -/* A3B980 802424A0 8FBE0030 */ lw $fp, 0x30($sp) -/* A3B984 802424A4 8FB7002C */ lw $s7, 0x2c($sp) -/* A3B988 802424A8 8FB60028 */ lw $s6, 0x28($sp) -/* A3B98C 802424AC 8FB50024 */ lw $s5, 0x24($sp) -/* A3B990 802424B0 8FB40020 */ lw $s4, 0x20($sp) -/* A3B994 802424B4 8FB3001C */ lw $s3, 0x1c($sp) -/* A3B998 802424B8 8FB20018 */ lw $s2, 0x18($sp) -/* A3B99C 802424BC 8FB10014 */ lw $s1, 0x14($sp) -/* A3B9A0 802424C0 8FB00010 */ lw $s0, 0x10($sp) -/* A3B9A4 802424C4 03E00008 */ jr $ra -/* A3B9A8 802424C8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_10/func_80240020_A3F740.s b/asm/nonmatchings/world/area_hos/hos_10/func_80240020_A3F740.s deleted file mode 100644 index b090998486..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_10/func_80240020_A3F740.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_A3F760 -/* A3F760 80240020 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3F764 80240024 AFB00010 */ sw $s0, 0x10($sp) -/* A3F768 80240028 0080802D */ daddu $s0, $a0, $zero -/* A3F76C 8024002C AFBF0014 */ sw $ra, 0x14($sp) -/* A3F770 80240030 8E0300A8 */ lw $v1, 0xa8($s0) -/* A3F774 80240034 8E020088 */ lw $v0, 0x88($s0) -/* A3F778 80240038 00621821 */ addu $v1, $v1, $v0 -/* A3F77C 8024003C 04610004 */ bgez $v1, .L80240050 -/* A3F780 80240040 AE0300A8 */ sw $v1, 0xa8($s0) -/* A3F784 80240044 3C020002 */ lui $v0, 2 -/* A3F788 80240048 08090018 */ j .L80240060 -/* A3F78C 8024004C 00621021 */ addu $v0, $v1, $v0 -.L80240050: -/* A3F790 80240050 3C040002 */ lui $a0, 2 -/* A3F794 80240054 0083102A */ slt $v0, $a0, $v1 -/* A3F798 80240058 10400002 */ beqz $v0, .L80240064 -/* A3F79C 8024005C 00641023 */ subu $v0, $v1, $a0 -.L80240060: -/* A3F7A0 80240060 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240064: -/* A3F7A4 80240064 8E0300AC */ lw $v1, 0xac($s0) -/* A3F7A8 80240068 8E02008C */ lw $v0, 0x8c($s0) -/* A3F7AC 8024006C 00621821 */ addu $v1, $v1, $v0 -/* A3F7B0 80240070 04610004 */ bgez $v1, .L80240084 -/* A3F7B4 80240074 AE0300AC */ sw $v1, 0xac($s0) -/* A3F7B8 80240078 3C020002 */ lui $v0, 2 -/* A3F7BC 8024007C 08090025 */ j .L80240094 -/* A3F7C0 80240080 00621021 */ addu $v0, $v1, $v0 -.L80240084: -/* A3F7C4 80240084 3C040002 */ lui $a0, 2 -/* A3F7C8 80240088 0083102A */ slt $v0, $a0, $v1 -/* A3F7CC 8024008C 10400002 */ beqz $v0, .L80240098 -/* A3F7D0 80240090 00641023 */ subu $v0, $v1, $a0 -.L80240094: -/* A3F7D4 80240094 AE0200AC */ sw $v0, 0xac($s0) -.L80240098: -/* A3F7D8 80240098 8E0300B0 */ lw $v1, 0xb0($s0) -/* A3F7DC 8024009C 8E020090 */ lw $v0, 0x90($s0) -/* A3F7E0 802400A0 00621821 */ addu $v1, $v1, $v0 -/* A3F7E4 802400A4 04610004 */ bgez $v1, .L802400B8 -/* A3F7E8 802400A8 AE0300B0 */ sw $v1, 0xb0($s0) -/* A3F7EC 802400AC 3C020002 */ lui $v0, 2 -/* A3F7F0 802400B0 08090032 */ j .L802400C8 -/* A3F7F4 802400B4 00621021 */ addu $v0, $v1, $v0 -.L802400B8: -/* A3F7F8 802400B8 3C040002 */ lui $a0, 2 -/* A3F7FC 802400BC 0083102A */ slt $v0, $a0, $v1 -/* A3F800 802400C0 10400002 */ beqz $v0, .L802400CC -/* A3F804 802400C4 00641023 */ subu $v0, $v1, $a0 -.L802400C8: -/* A3F808 802400C8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400CC: -/* A3F80C 802400CC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A3F810 802400D0 8E020094 */ lw $v0, 0x94($s0) -/* A3F814 802400D4 00621821 */ addu $v1, $v1, $v0 -/* A3F818 802400D8 04610004 */ bgez $v1, .L802400EC -/* A3F81C 802400DC AE0300B4 */ sw $v1, 0xb4($s0) -/* A3F820 802400E0 3C020002 */ lui $v0, 2 -/* A3F824 802400E4 0809003F */ j .L802400FC -/* A3F828 802400E8 00621021 */ addu $v0, $v1, $v0 -.L802400EC: -/* A3F82C 802400EC 3C040002 */ lui $a0, 2 -/* A3F830 802400F0 0083102A */ slt $v0, $a0, $v1 -/* A3F834 802400F4 10400002 */ beqz $v0, .L80240100 -/* A3F838 802400F8 00641023 */ subu $v0, $v1, $a0 -.L802400FC: -/* A3F83C 802400FC AE0200B4 */ sw $v0, 0xb4($s0) -.L80240100: -/* A3F840 80240100 8E040084 */ lw $a0, 0x84($s0) -/* A3F844 80240104 0C046F07 */ jal set_main_pan_u -/* A3F848 80240108 8E0500A8 */ lw $a1, 0xa8($s0) -/* A3F84C 8024010C 8E040084 */ lw $a0, 0x84($s0) -/* A3F850 80240110 0C046F0D */ jal set_main_pan_v -/* A3F854 80240114 8E0500AC */ lw $a1, 0xac($s0) -/* A3F858 80240118 8E040084 */ lw $a0, 0x84($s0) -/* A3F85C 8024011C 0C046F13 */ jal set_aux_pan_u -/* A3F860 80240120 8E0500B0 */ lw $a1, 0xb0($s0) -/* A3F864 80240124 8E040084 */ lw $a0, 0x84($s0) -/* A3F868 80240128 0C046F19 */ jal set_aux_pan_v -/* A3F86C 8024012C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A3F870 80240130 8FBF0014 */ lw $ra, 0x14($sp) -/* A3F874 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* A3F878 80240138 0000102D */ daddu $v0, $zero, $zero -/* A3F87C 8024013C 03E00008 */ jr $ra -/* A3F880 80240140 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_10/func_8024032C_A3F740.s b/asm/nonmatchings/world/area_hos/hos_10/func_8024032C_A3F740.s deleted file mode 100644 index 0bb4c22eb7..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_10/func_8024032C_A3F740.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024032C_A3FA6C -/* A3FA6C 8024032C 3C048007 */ lui $a0, %hi(gGameStatusPtr) -/* A3FA70 80240330 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) -/* A3FA74 80240334 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3FA78 80240338 AFBF0010 */ sw $ra, 0x10($sp) -/* A3FA7C 8024033C 908300A8 */ lbu $v1, 0xa8($a0) -/* A3FA80 80240340 2C620005 */ sltiu $v0, $v1, 5 -/* A3FA84 80240344 10400003 */ beqz $v0, .L80240354 -/* A3FA88 80240348 24620001 */ addiu $v0, $v1, 1 -/* A3FA8C 8024034C 0C00D994 */ jal begin_state_intro -/* A3FA90 80240350 A08200A8 */ sb $v0, 0xa8($a0) -.L80240354: -/* A3FA94 80240354 8FBF0010 */ lw $ra, 0x10($sp) -/* A3FA98 80240358 24020001 */ addiu $v0, $zero, 1 -/* A3FA9C 8024035C 03E00008 */ jr $ra -/* A3FAA0 80240360 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_10/func_80240364_A3F740.s b/asm/nonmatchings/world/area_hos/hos_10/func_80240364_A3F740.s deleted file mode 100644 index 15ba2b48fa..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_10/func_80240364_A3F740.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240364_A3FAA4 -/* A3FAA4 80240364 460C7301 */ sub.s $f12, $f14, $f12 -/* A3FAA8 80240368 44863000 */ mtc1 $a2, $f6 -/* A3FAAC 8024036C 44800000 */ mtc1 $zero, $f0 -/* A3FAB0 80240370 44872000 */ mtc1 $a3, $f4 -/* A3FAB4 80240374 8FA20010 */ lw $v0, 0x10($sp) -/* A3FAB8 80240378 460C003C */ c.lt.s $f0, $f12 -/* A3FABC 8024037C 00000000 */ nop -/* A3FAC0 80240380 4500000F */ bc1f .L802403C0 -/* A3FAC4 80240384 46067081 */ sub.s $f2, $f14, $f6 -/* A3FAC8 80240388 4600103C */ c.lt.s $f2, $f0 -/* A3FACC 8024038C 00000000 */ nop -/* A3FAD0 80240390 45000003 */ bc1f .L802403A0 -/* A3FAD4 80240394 00000000 */ nop -.L80240398: -/* A3FAD8 80240398 03E00008 */ jr $ra -/* A3FADC 8024039C E44E0000 */ swc1 $f14, ($v0) -.L802403A0: -/* A3FAE0 802403A0 4602203C */ c.lt.s $f4, $f2 -/* A3FAE4 802403A4 00000000 */ nop -/* A3FAE8 802403A8 45000012 */ bc1f .L802403F4 -/* A3FAEC 802403AC 00000000 */ nop -/* A3FAF0 802403B0 C4400000 */ lwc1 $f0, ($v0) -/* A3FAF4 802403B4 46040000 */ add.s $f0, $f0, $f4 -/* A3FAF8 802403B8 03E00008 */ jr $ra -/* A3FAFC 802403BC E4400000 */ swc1 $f0, ($v0) -.L802403C0: -/* A3FB00 802403C0 4602003C */ c.lt.s $f0, $f2 -/* A3FB04 802403C4 00000000 */ nop -/* A3FB08 802403C8 4501FFF3 */ bc1t .L80240398 -/* A3FB0C 802403CC 00000000 */ nop -/* A3FB10 802403D0 46002007 */ neg.s $f0, $f4 -/* A3FB14 802403D4 4600103C */ c.lt.s $f2, $f0 -/* A3FB18 802403D8 00000000 */ nop -/* A3FB1C 802403DC 45000005 */ bc1f .L802403F4 -/* A3FB20 802403E0 00000000 */ nop -/* A3FB24 802403E4 C4400000 */ lwc1 $f0, ($v0) -/* A3FB28 802403E8 46040001 */ sub.s $f0, $f0, $f4 -/* A3FB2C 802403EC 03E00008 */ jr $ra -/* A3FB30 802403F0 E4400000 */ swc1 $f0, ($v0) -.L802403F4: -/* A3FB34 802403F4 C4400000 */ lwc1 $f0, ($v0) -/* A3FB38 802403F8 46020000 */ add.s $f0, $f0, $f2 -/* A3FB3C 802403FC 03E00008 */ jr $ra -/* A3FB40 80240400 E4400000 */ swc1 $f0, ($v0) diff --git a/asm/nonmatchings/world/area_hos/hos_10/func_80240404_A3F740.s b/asm/nonmatchings/world/area_hos/hos_10/func_80240404_A3F740.s deleted file mode 100644 index 22d36fbc8e..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_10/func_80240404_A3F740.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_A3FB44 -/* A3FB44 80240404 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A3FB48 80240408 3C01C396 */ lui $at, 0xc396 -/* A3FB4C 8024040C 44810000 */ mtc1 $at, $f0 -/* A3FB50 80240410 3C01C2C8 */ lui $at, 0xc2c8 -/* A3FB54 80240414 44811000 */ mtc1 $at, $f2 -/* A3FB58 80240418 3C0141F0 */ lui $at, 0x41f0 -/* A3FB5C 8024041C 44812000 */ mtc1 $at, $f4 -/* A3FB60 80240420 3C054348 */ lui $a1, 0x4348 -/* A3FB64 80240424 3C0643C8 */ lui $a2, 0x43c8 -/* A3FB68 80240428 3C074496 */ lui $a3, 0x4496 -/* A3FB6C 8024042C 24040001 */ addiu $a0, $zero, 1 -/* A3FB70 80240430 AFBF0020 */ sw $ra, 0x20($sp) -/* A3FB74 80240434 AFA00018 */ sw $zero, 0x18($sp) -/* A3FB78 80240438 E7A00010 */ swc1 $f0, 0x10($sp) -/* A3FB7C 8024043C E7A20014 */ swc1 $f2, 0x14($sp) -/* A3FB80 80240440 0C01BF8C */ jal func_8006FE30 -/* A3FB84 80240444 E7A4001C */ swc1 $f4, 0x1c($sp) -/* A3FB88 80240448 8FBF0020 */ lw $ra, 0x20($sp) -/* A3FB8C 8024044C 24020002 */ addiu $v0, $zero, 2 -/* A3FB90 80240450 03E00008 */ jr $ra -/* A3FB94 80240454 27BD0028 */ addiu $sp, $sp, 0x28 -/* A3FB98 80240458 00000000 */ nop -/* A3FB9C 8024045C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_10/func_80240460_A3F740.s b/asm/nonmatchings/world/area_hos/hos_10/func_80240460_A3F740.s deleted file mode 100644 index 1f68531d3b..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_10/func_80240460_A3F740.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240460_A3FBA0 -/* A3FBA0 80240460 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3FBA4 80240464 AFB00010 */ sw $s0, 0x10($sp) -/* A3FBA8 80240468 0080802D */ daddu $s0, $a0, $zero -/* A3FBAC 8024046C AFBF0014 */ sw $ra, 0x14($sp) -/* A3FBB0 80240470 8E0300A8 */ lw $v1, 0xa8($s0) -/* A3FBB4 80240474 8E020088 */ lw $v0, 0x88($s0) -/* A3FBB8 80240478 00621821 */ addu $v1, $v1, $v0 -/* A3FBBC 8024047C 04610004 */ bgez $v1, .L80240490 -/* A3FBC0 80240480 AE0300A8 */ sw $v1, 0xa8($s0) -/* A3FBC4 80240484 3C020002 */ lui $v0, 2 -/* A3FBC8 80240488 08090128 */ j .L802404A0 -/* A3FBCC 8024048C 00621021 */ addu $v0, $v1, $v0 -.L80240490: -/* A3FBD0 80240490 3C040002 */ lui $a0, 2 -/* A3FBD4 80240494 0083102A */ slt $v0, $a0, $v1 -/* A3FBD8 80240498 10400002 */ beqz $v0, .L802404A4 -/* A3FBDC 8024049C 00641023 */ subu $v0, $v1, $a0 -.L802404A0: -/* A3FBE0 802404A0 AE0200A8 */ sw $v0, 0xa8($s0) -.L802404A4: -/* A3FBE4 802404A4 8E0300AC */ lw $v1, 0xac($s0) -/* A3FBE8 802404A8 8E02008C */ lw $v0, 0x8c($s0) -/* A3FBEC 802404AC 00621821 */ addu $v1, $v1, $v0 -/* A3FBF0 802404B0 04610004 */ bgez $v1, .L802404C4 -/* A3FBF4 802404B4 AE0300AC */ sw $v1, 0xac($s0) -/* A3FBF8 802404B8 3C020002 */ lui $v0, 2 -/* A3FBFC 802404BC 08090135 */ j .L802404D4 -/* A3FC00 802404C0 00621021 */ addu $v0, $v1, $v0 -.L802404C4: -/* A3FC04 802404C4 3C040002 */ lui $a0, 2 -/* A3FC08 802404C8 0083102A */ slt $v0, $a0, $v1 -/* A3FC0C 802404CC 10400002 */ beqz $v0, .L802404D8 -/* A3FC10 802404D0 00641023 */ subu $v0, $v1, $a0 -.L802404D4: -/* A3FC14 802404D4 AE0200AC */ sw $v0, 0xac($s0) -.L802404D8: -/* A3FC18 802404D8 8E0300B0 */ lw $v1, 0xb0($s0) -/* A3FC1C 802404DC 8E020090 */ lw $v0, 0x90($s0) -/* A3FC20 802404E0 00621821 */ addu $v1, $v1, $v0 -/* A3FC24 802404E4 04610004 */ bgez $v1, .L802404F8 -/* A3FC28 802404E8 AE0300B0 */ sw $v1, 0xb0($s0) -/* A3FC2C 802404EC 3C020002 */ lui $v0, 2 -/* A3FC30 802404F0 08090142 */ j .L80240508 -/* A3FC34 802404F4 00621021 */ addu $v0, $v1, $v0 -.L802404F8: -/* A3FC38 802404F8 3C040002 */ lui $a0, 2 -/* A3FC3C 802404FC 0083102A */ slt $v0, $a0, $v1 -/* A3FC40 80240500 10400002 */ beqz $v0, .L8024050C -/* A3FC44 80240504 00641023 */ subu $v0, $v1, $a0 -.L80240508: -/* A3FC48 80240508 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024050C: -/* A3FC4C 8024050C 8E0300B4 */ lw $v1, 0xb4($s0) -/* A3FC50 80240510 8E020094 */ lw $v0, 0x94($s0) -/* A3FC54 80240514 00621821 */ addu $v1, $v1, $v0 -/* A3FC58 80240518 04610004 */ bgez $v1, .L8024052C -/* A3FC5C 8024051C AE0300B4 */ sw $v1, 0xb4($s0) -/* A3FC60 80240520 3C020002 */ lui $v0, 2 -/* A3FC64 80240524 0809014F */ j .L8024053C -/* A3FC68 80240528 00621021 */ addu $v0, $v1, $v0 -.L8024052C: -/* A3FC6C 8024052C 3C040002 */ lui $a0, 2 -/* A3FC70 80240530 0083102A */ slt $v0, $a0, $v1 -/* A3FC74 80240534 10400002 */ beqz $v0, .L80240540 -/* A3FC78 80240538 00641023 */ subu $v0, $v1, $a0 -.L8024053C: -/* A3FC7C 8024053C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240540: -/* A3FC80 80240540 8E040084 */ lw $a0, 0x84($s0) -/* A3FC84 80240544 0C046F07 */ jal set_main_pan_u -/* A3FC88 80240548 8E0500A8 */ lw $a1, 0xa8($s0) -/* A3FC8C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* A3FC90 80240550 0C046F0D */ jal set_main_pan_v -/* A3FC94 80240554 8E0500AC */ lw $a1, 0xac($s0) -/* A3FC98 80240558 8E040084 */ lw $a0, 0x84($s0) -/* A3FC9C 8024055C 0C046F13 */ jal set_aux_pan_u -/* A3FCA0 80240560 8E0500B0 */ lw $a1, 0xb0($s0) -/* A3FCA4 80240564 8E040084 */ lw $a0, 0x84($s0) -/* A3FCA8 80240568 0C046F19 */ jal set_aux_pan_v -/* A3FCAC 8024056C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A3FCB0 80240570 8FBF0014 */ lw $ra, 0x14($sp) -/* A3FCB4 80240574 8FB00010 */ lw $s0, 0x10($sp) -/* A3FCB8 80240578 0000102D */ daddu $v0, $zero, $zero -/* A3FCBC 8024057C 03E00008 */ jr $ra -/* A3FCC0 80240580 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_10/func_80240584_A3F740.s b/asm/nonmatchings/world/area_hos/hos_10/func_80240584_A3F740.s deleted file mode 100644 index 74594cca3d..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_10/func_80240584_A3F740.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240584_A3FCC4 -/* A3FCC4 80240584 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3FCC8 80240588 AFB00010 */ sw $s0, 0x10($sp) -/* A3FCCC 8024058C 0080802D */ daddu $s0, $a0, $zero -/* A3FCD0 80240590 10A00005 */ beqz $a1, .L802405A8 -/* A3FCD4 80240594 AFBF0014 */ sw $ra, 0x14($sp) -/* A3FCD8 80240598 AE000070 */ sw $zero, 0x70($s0) -/* A3FCDC 8024059C AE000074 */ sw $zero, 0x74($s0) -/* A3FCE0 802405A0 AE000078 */ sw $zero, 0x78($s0) -/* A3FCE4 802405A4 AE00007C */ sw $zero, 0x7c($s0) -.L802405A8: -/* A3FCE8 802405A8 8E020070 */ lw $v0, 0x70($s0) -/* A3FCEC 802405AC 1440000E */ bnez $v0, .L802405E8 -/* A3FCF0 802405B0 00000000 */ nop -/* A3FCF4 802405B4 8E0300A8 */ lw $v1, 0xa8($s0) -/* A3FCF8 802405B8 8E020088 */ lw $v0, 0x88($s0) -/* A3FCFC 802405BC 00621821 */ addu $v1, $v1, $v0 -/* A3FD00 802405C0 04610004 */ bgez $v1, .L802405D4 -/* A3FD04 802405C4 AE0300A8 */ sw $v1, 0xa8($s0) -/* A3FD08 802405C8 3C020002 */ lui $v0, 2 -/* A3FD0C 802405CC 08090179 */ j .L802405E4 -/* A3FD10 802405D0 00621021 */ addu $v0, $v1, $v0 -.L802405D4: -/* A3FD14 802405D4 3C040002 */ lui $a0, 2 -/* A3FD18 802405D8 0083102A */ slt $v0, $a0, $v1 -/* A3FD1C 802405DC 10400002 */ beqz $v0, .L802405E8 -/* A3FD20 802405E0 00641023 */ subu $v0, $v1, $a0 -.L802405E4: -/* A3FD24 802405E4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802405E8: -/* A3FD28 802405E8 8E020074 */ lw $v0, 0x74($s0) -/* A3FD2C 802405EC 1440000E */ bnez $v0, .L80240628 -/* A3FD30 802405F0 00000000 */ nop -/* A3FD34 802405F4 8E0300AC */ lw $v1, 0xac($s0) -/* A3FD38 802405F8 8E02008C */ lw $v0, 0x8c($s0) -/* A3FD3C 802405FC 00621821 */ addu $v1, $v1, $v0 -/* A3FD40 80240600 04610004 */ bgez $v1, .L80240614 -/* A3FD44 80240604 AE0300AC */ sw $v1, 0xac($s0) -/* A3FD48 80240608 3C020002 */ lui $v0, 2 -/* A3FD4C 8024060C 08090189 */ j .L80240624 -/* A3FD50 80240610 00621021 */ addu $v0, $v1, $v0 -.L80240614: -/* A3FD54 80240614 3C040002 */ lui $a0, 2 -/* A3FD58 80240618 0083102A */ slt $v0, $a0, $v1 -/* A3FD5C 8024061C 10400002 */ beqz $v0, .L80240628 -/* A3FD60 80240620 00641023 */ subu $v0, $v1, $a0 -.L80240624: -/* A3FD64 80240624 AE0200AC */ sw $v0, 0xac($s0) -.L80240628: -/* A3FD68 80240628 8E020078 */ lw $v0, 0x78($s0) -/* A3FD6C 8024062C 1440000E */ bnez $v0, .L80240668 -/* A3FD70 80240630 00000000 */ nop -/* A3FD74 80240634 8E0300B0 */ lw $v1, 0xb0($s0) -/* A3FD78 80240638 8E020090 */ lw $v0, 0x90($s0) -/* A3FD7C 8024063C 00621821 */ addu $v1, $v1, $v0 -/* A3FD80 80240640 04610004 */ bgez $v1, .L80240654 -/* A3FD84 80240644 AE0300B0 */ sw $v1, 0xb0($s0) -/* A3FD88 80240648 3C020002 */ lui $v0, 2 -/* A3FD8C 8024064C 08090199 */ j .L80240664 -/* A3FD90 80240650 00621021 */ addu $v0, $v1, $v0 -.L80240654: -/* A3FD94 80240654 3C040002 */ lui $a0, 2 -/* A3FD98 80240658 0083102A */ slt $v0, $a0, $v1 -/* A3FD9C 8024065C 10400002 */ beqz $v0, .L80240668 -/* A3FDA0 80240660 00641023 */ subu $v0, $v1, $a0 -.L80240664: -/* A3FDA4 80240664 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240668: -/* A3FDA8 80240668 8E02007C */ lw $v0, 0x7c($s0) -/* A3FDAC 8024066C 1440000E */ bnez $v0, .L802406A8 -/* A3FDB0 80240670 00000000 */ nop -/* A3FDB4 80240674 8E0300B4 */ lw $v1, 0xb4($s0) -/* A3FDB8 80240678 8E020094 */ lw $v0, 0x94($s0) -/* A3FDBC 8024067C 00621821 */ addu $v1, $v1, $v0 -/* A3FDC0 80240680 04610004 */ bgez $v1, .L80240694 -/* A3FDC4 80240684 AE0300B4 */ sw $v1, 0xb4($s0) -/* A3FDC8 80240688 3C020002 */ lui $v0, 2 -/* A3FDCC 8024068C 080901A9 */ j .L802406A4 -/* A3FDD0 80240690 00621021 */ addu $v0, $v1, $v0 -.L80240694: -/* A3FDD4 80240694 3C040002 */ lui $a0, 2 -/* A3FDD8 80240698 0083102A */ slt $v0, $a0, $v1 -/* A3FDDC 8024069C 10400002 */ beqz $v0, .L802406A8 -/* A3FDE0 802406A0 00641023 */ subu $v0, $v1, $a0 -.L802406A4: -/* A3FDE4 802406A4 AE0200B4 */ sw $v0, 0xb4($s0) -.L802406A8: -/* A3FDE8 802406A8 8E040084 */ lw $a0, 0x84($s0) -/* A3FDEC 802406AC 0C046F07 */ jal set_main_pan_u -/* A3FDF0 802406B0 8E0500A8 */ lw $a1, 0xa8($s0) -/* A3FDF4 802406B4 8E040084 */ lw $a0, 0x84($s0) -/* A3FDF8 802406B8 0C046F0D */ jal set_main_pan_v -/* A3FDFC 802406BC 8E0500AC */ lw $a1, 0xac($s0) -/* A3FE00 802406C0 8E040084 */ lw $a0, 0x84($s0) -/* A3FE04 802406C4 0C046F13 */ jal set_aux_pan_u -/* A3FE08 802406C8 8E0500B0 */ lw $a1, 0xb0($s0) -/* A3FE0C 802406CC 8E040084 */ lw $a0, 0x84($s0) -/* A3FE10 802406D0 0C046F19 */ jal set_aux_pan_v -/* A3FE14 802406D4 8E0500B4 */ lw $a1, 0xb4($s0) -/* A3FE18 802406D8 8E020070 */ lw $v0, 0x70($s0) -/* A3FE1C 802406DC 8E030078 */ lw $v1, 0x78($s0) -/* A3FE20 802406E0 8E040098 */ lw $a0, 0x98($s0) -/* A3FE24 802406E4 24420001 */ addiu $v0, $v0, 1 -/* A3FE28 802406E8 AE020070 */ sw $v0, 0x70($s0) -/* A3FE2C 802406EC 8E020074 */ lw $v0, 0x74($s0) -/* A3FE30 802406F0 24630001 */ addiu $v1, $v1, 1 -/* A3FE34 802406F4 AE030078 */ sw $v1, 0x78($s0) -/* A3FE38 802406F8 8E030070 */ lw $v1, 0x70($s0) -/* A3FE3C 802406FC 24420001 */ addiu $v0, $v0, 1 -/* A3FE40 80240700 AE020074 */ sw $v0, 0x74($s0) -/* A3FE44 80240704 8E02007C */ lw $v0, 0x7c($s0) -/* A3FE48 80240708 0064182A */ slt $v1, $v1, $a0 -/* A3FE4C 8024070C 24420001 */ addiu $v0, $v0, 1 -/* A3FE50 80240710 14600002 */ bnez $v1, .L8024071C -/* A3FE54 80240714 AE02007C */ sw $v0, 0x7c($s0) -/* A3FE58 80240718 AE000070 */ sw $zero, 0x70($s0) -.L8024071C: -/* A3FE5C 8024071C 8E020074 */ lw $v0, 0x74($s0) -/* A3FE60 80240720 8E03009C */ lw $v1, 0x9c($s0) -/* A3FE64 80240724 0043102A */ slt $v0, $v0, $v1 -/* A3FE68 80240728 50400001 */ beql $v0, $zero, .L80240730 -/* A3FE6C 8024072C AE000074 */ sw $zero, 0x74($s0) -.L80240730: -/* A3FE70 80240730 8E020078 */ lw $v0, 0x78($s0) -/* A3FE74 80240734 8E0300A0 */ lw $v1, 0xa0($s0) -/* A3FE78 80240738 0043102A */ slt $v0, $v0, $v1 -/* A3FE7C 8024073C 50400001 */ beql $v0, $zero, .L80240744 -/* A3FE80 80240740 AE000078 */ sw $zero, 0x78($s0) -.L80240744: -/* A3FE84 80240744 8E02007C */ lw $v0, 0x7c($s0) -/* A3FE88 80240748 8E0300A4 */ lw $v1, 0xa4($s0) -/* A3FE8C 8024074C 0043102A */ slt $v0, $v0, $v1 -/* A3FE90 80240750 50400001 */ beql $v0, $zero, .L80240758 -/* A3FE94 80240754 AE00007C */ sw $zero, 0x7c($s0) -.L80240758: -/* A3FE98 80240758 8FBF0014 */ lw $ra, 0x14($sp) -/* A3FE9C 8024075C 8FB00010 */ lw $s0, 0x10($sp) -/* A3FEA0 80240760 0000102D */ daddu $v0, $zero, $zero -/* A3FEA4 80240764 03E00008 */ jr $ra -/* A3FEA8 80240768 27BD0018 */ addiu $sp, $sp, 0x18 -/* A3FEAC 8024076C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_10/func_80240770_A3F740.s b/asm/nonmatchings/world/area_hos/hos_10/func_80240770_A3F740.s deleted file mode 100644 index b1bd48ae26..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_10/func_80240770_A3F740.s +++ /dev/null @@ -1,208 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240770_A3FEB0 -/* A3FEB0 80240770 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A3FEB4 80240774 AFB1001C */ sw $s1, 0x1c($sp) -/* A3FEB8 80240778 0080882D */ daddu $s1, $a0, $zero -/* A3FEBC 8024077C AFB20020 */ sw $s2, 0x20($sp) -/* A3FEC0 80240780 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* A3FEC4 80240784 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* A3FEC8 80240788 AFBF0024 */ sw $ra, 0x24($sp) -/* A3FECC 8024078C AFB00018 */ sw $s0, 0x18($sp) -/* A3FED0 80240790 10A00010 */ beqz $a1, .L802407D4 -/* A3FED4 80240794 8E30000C */ lw $s0, 0xc($s1) -/* A3FED8 80240798 8E050000 */ lw $a1, ($s0) -/* A3FEDC 8024079C 0C0B1EAF */ jal get_variable -/* A3FEE0 802407A0 26100004 */ addiu $s0, $s0, 4 -/* A3FEE4 802407A4 AE220074 */ sw $v0, 0x74($s1) -/* A3FEE8 802407A8 8E050000 */ lw $a1, ($s0) -/* A3FEEC 802407AC 26100004 */ addiu $s0, $s0, 4 -/* A3FEF0 802407B0 0C0B1EAF */ jal get_variable -/* A3FEF4 802407B4 0220202D */ daddu $a0, $s1, $zero -/* A3FEF8 802407B8 AE220078 */ sw $v0, 0x78($s1) -/* A3FEFC 802407BC 8E050000 */ lw $a1, ($s0) -/* A3FF00 802407C0 0C0B1EAF */ jal get_variable -/* A3FF04 802407C4 0220202D */ daddu $a0, $s1, $zero -/* A3FF08 802407C8 AE2200C0 */ sw $v0, 0xc0($s1) -/* A3FF0C 802407CC AE200070 */ sw $zero, 0x70($s1) -/* A3FF10 802407D0 AE20007C */ sw $zero, 0x7c($s1) -.L802407D4: -/* A3FF14 802407D4 0C00EABB */ jal get_npc_unsafe -/* A3FF18 802407D8 8E240074 */ lw $a0, 0x74($s1) -/* A3FF1C 802407DC 8E230070 */ lw $v1, 0x70($s1) -/* A3FF20 802407E0 10600006 */ beqz $v1, .L802407FC -/* A3FF24 802407E4 0040802D */ daddu $s0, $v0, $zero -/* A3FF28 802407E8 24020001 */ addiu $v0, $zero, 1 -/* A3FF2C 802407EC 10620048 */ beq $v1, $v0, .L80240910 -/* A3FF30 802407F0 26040038 */ addiu $a0, $s0, 0x38 -/* A3FF34 802407F4 08090293 */ j .L80240A4C -/* A3FF38 802407F8 00000000 */ nop -.L802407FC: -/* A3FF3C 802407FC C6400028 */ lwc1 $f0, 0x28($s2) -/* A3FF40 80240800 E6000038 */ swc1 $f0, 0x38($s0) -/* A3FF44 80240804 C640002C */ lwc1 $f0, 0x2c($s2) -/* A3FF48 80240808 E600003C */ swc1 $f0, 0x3c($s0) -/* A3FF4C 8024080C C6400030 */ lwc1 $f0, 0x30($s2) -/* A3FF50 80240810 E6000040 */ swc1 $f0, 0x40($s0) -/* A3FF54 80240814 8E23007C */ lw $v1, 0x7c($s1) -/* A3FF58 80240818 3C014040 */ lui $at, 0x4040 -/* A3FF5C 8024081C 44810000 */ mtc1 $at, $f0 -/* A3FF60 80240820 00031040 */ sll $v0, $v1, 1 -/* A3FF64 80240824 00431021 */ addu $v0, $v0, $v1 -/* A3FF68 80240828 E6000064 */ swc1 $f0, 0x64($s0) -/* A3FF6C 8024082C 44820000 */ mtc1 $v0, $f0 -/* A3FF70 80240830 00000000 */ nop -/* A3FF74 80240834 46800020 */ cvt.s.w $f0, $f0 -/* A3FF78 80240838 E6000060 */ swc1 $f0, 0x60($s0) -/* A3FF7C 8024083C 8E230078 */ lw $v1, 0x78($s1) -/* A3FF80 80240840 46000086 */ mov.s $f2, $f0 -/* A3FF84 80240844 00031040 */ sll $v0, $v1, 1 -/* A3FF88 80240848 00431021 */ addu $v0, $v0, $v1 -/* A3FF8C 8024084C 00021900 */ sll $v1, $v0, 4 -/* A3FF90 80240850 00431021 */ addu $v0, $v0, $v1 -/* A3FF94 80240854 44820000 */ mtc1 $v0, $f0 -/* A3FF98 80240858 00000000 */ nop -/* A3FF9C 8024085C 46800020 */ cvt.s.w $f0, $f0 -/* A3FFA0 80240860 46001080 */ add.s $f2, $f2, $f0 -/* A3FFA4 80240864 3C014319 */ lui $at, 0x4319 -/* A3FFA8 80240868 44810000 */ mtc1 $at, $f0 -/* A3FFAC 8024086C 00000000 */ nop -/* A3FFB0 80240870 46001080 */ add.s $f2, $f2, $f0 -/* A3FFB4 80240874 26040038 */ addiu $a0, $s0, 0x38 -/* A3FFB8 80240878 3C06428C */ lui $a2, 0x428c -/* A3FFBC 8024087C 44071000 */ mfc1 $a3, $f2 -/* A3FFC0 80240880 0C00A7E7 */ jal add_vec2D_polar -/* A3FFC4 80240884 26050040 */ addiu $a1, $s0, 0x40 -/* A3FFC8 80240888 3C034EC4 */ lui $v1, 0x4ec4 -/* A3FFCC 8024088C 8E24007C */ lw $a0, 0x7c($s1) -/* A3FFD0 80240890 8E220078 */ lw $v0, 0x78($s1) -/* A3FFD4 80240894 3463EC4F */ ori $v1, $v1, 0xec4f -/* A3FFD8 80240898 00822021 */ addu $a0, $a0, $v0 -/* A3FFDC 8024089C 00830018 */ mult $a0, $v1 -/* A3FFE0 802408A0 000417C3 */ sra $v0, $a0, 0x1f -/* A3FFE4 802408A4 00004010 */ mfhi $t0 -/* A3FFE8 802408A8 00081883 */ sra $v1, $t0, 2 -/* A3FFEC 802408AC 00621823 */ subu $v1, $v1, $v0 -/* A3FFF0 802408B0 00031040 */ sll $v0, $v1, 1 -/* A3FFF4 802408B4 00431021 */ addu $v0, $v0, $v1 -/* A3FFF8 802408B8 00021080 */ sll $v0, $v0, 2 -/* A3FFFC 802408BC 00431021 */ addu $v0, $v0, $v1 -/* A40000 802408C0 1482000C */ bne $a0, $v0, .L802408F4 -/* A40004 802408C4 00000000 */ nop -/* A40008 802408C8 C602003C */ lwc1 $f2, 0x3c($s0) -/* A4000C 802408CC 3C014120 */ lui $at, 0x4120 -/* A40010 802408D0 44810000 */ mtc1 $at, $f0 -/* A40014 802408D4 00000000 */ nop -/* A40018 802408D8 46001080 */ add.s $f2, $f2, $f0 -/* A4001C 802408DC E7A00010 */ swc1 $f0, 0x10($sp) -/* A40020 802408E0 8E050038 */ lw $a1, 0x38($s0) -/* A40024 802408E4 8E070040 */ lw $a3, 0x40($s0) -/* A40028 802408E8 44061000 */ mfc1 $a2, $f2 -/* A4002C 802408EC 0C01BFBC */ jal func_8006FEF0 -/* A40030 802408F0 24040003 */ addiu $a0, $zero, 3 -.L802408F4: -/* A40034 802408F4 8E22007C */ lw $v0, 0x7c($s1) -/* A40038 802408F8 2842015F */ slti $v0, $v0, 0x15f -/* A4003C 802408FC 14400053 */ bnez $v0, .L80240A4C -/* A40040 80240900 24020001 */ addiu $v0, $zero, 1 -/* A40044 80240904 AE220070 */ sw $v0, 0x70($s1) -/* A40048 80240908 08090293 */ j .L80240A4C -/* A4004C 8024090C AE20007C */ sw $zero, 0x7c($s1) -.L80240910: -/* A40050 80240910 C6400028 */ lwc1 $f0, 0x28($s2) -/* A40054 80240914 3C014040 */ lui $at, 0x4040 -/* A40058 80240918 44813000 */ mtc1 $at, $f6 -/* A4005C 8024091C E6000038 */ swc1 $f0, 0x38($s0) -/* A40060 80240920 C640002C */ lwc1 $f0, 0x2c($s2) -/* A40064 80240924 E600003C */ swc1 $f0, 0x3c($s0) -/* A40068 80240928 C6400030 */ lwc1 $f0, 0x30($s2) -/* A4006C 8024092C E6000040 */ swc1 $f0, 0x40($s0) -/* A40070 80240930 8E23007C */ lw $v1, 0x7c($s1) -/* A40074 80240934 E6060064 */ swc1 $f6, 0x64($s0) -/* A40078 80240938 00031040 */ sll $v0, $v1, 1 -/* A4007C 8024093C 00431021 */ addu $v0, $v0, $v1 -/* A40080 80240940 44820000 */ mtc1 $v0, $f0 -/* A40084 80240944 00000000 */ nop -/* A40088 80240948 46800020 */ cvt.s.w $f0, $f0 -/* A4008C 8024094C 240200BE */ addiu $v0, $zero, 0xbe -/* A40090 80240950 E6000060 */ swc1 $f0, 0x60($s0) -/* A40094 80240954 8E23007C */ lw $v1, 0x7c($s1) -/* A40098 80240958 3C01433E */ lui $at, 0x433e -/* A4009C 8024095C 44810000 */ mtc1 $at, $f0 -/* A400A0 80240960 00431023 */ subu $v0, $v0, $v1 -/* A400A4 80240964 44822000 */ mtc1 $v0, $f4 -/* A400A8 80240968 00000000 */ nop -/* A400AC 8024096C 46802120 */ cvt.s.w $f4, $f4 -/* A400B0 80240970 46002103 */ div.s $f4, $f4, $f0 -/* A400B4 80240974 8E230078 */ lw $v1, 0x78($s1) -/* A400B8 80240978 3C014286 */ lui $at, 0x4286 -/* A400BC 8024097C 44810000 */ mtc1 $at, $f0 -/* A400C0 80240980 00031040 */ sll $v0, $v1, 1 -/* A400C4 80240984 00431021 */ addu $v0, $v0, $v1 -/* A400C8 80240988 46002102 */ mul.s $f4, $f4, $f0 -/* A400CC 8024098C 00000000 */ nop -/* A400D0 80240990 00021900 */ sll $v1, $v0, 4 -/* A400D4 80240994 00431021 */ addu $v0, $v0, $v1 -/* A400D8 80240998 C6000060 */ lwc1 $f0, 0x60($s0) -/* A400DC 8024099C 44821000 */ mtc1 $v0, $f2 -/* A400E0 802409A0 00000000 */ nop -/* A400E4 802409A4 468010A0 */ cvt.s.w $f2, $f2 -/* A400E8 802409A8 46020000 */ add.s $f0, $f0, $f2 -/* A400EC 802409AC 3C014319 */ lui $at, 0x4319 -/* A400F0 802409B0 44811000 */ mtc1 $at, $f2 -/* A400F4 802409B4 00000000 */ nop -/* A400F8 802409B8 46020000 */ add.s $f0, $f0, $f2 -/* A400FC 802409BC 46062100 */ add.s $f4, $f4, $f6 -/* A40100 802409C0 44070000 */ mfc1 $a3, $f0 -/* A40104 802409C4 44062000 */ mfc1 $a2, $f4 -/* A40108 802409C8 0C00A7E7 */ jal add_vec2D_polar -/* A4010C 802409CC 26050040 */ addiu $a1, $s0, 0x40 -/* A40110 802409D0 3C034EC4 */ lui $v1, 0x4ec4 -/* A40114 802409D4 8E24007C */ lw $a0, 0x7c($s1) -/* A40118 802409D8 8E220078 */ lw $v0, 0x78($s1) -/* A4011C 802409DC 3463EC4F */ ori $v1, $v1, 0xec4f -/* A40120 802409E0 00822021 */ addu $a0, $a0, $v0 -/* A40124 802409E4 00830018 */ mult $a0, $v1 -/* A40128 802409E8 000417C3 */ sra $v0, $a0, 0x1f -/* A4012C 802409EC 00004010 */ mfhi $t0 -/* A40130 802409F0 00081883 */ sra $v1, $t0, 2 -/* A40134 802409F4 00621823 */ subu $v1, $v1, $v0 -/* A40138 802409F8 00031040 */ sll $v0, $v1, 1 -/* A4013C 802409FC 00431021 */ addu $v0, $v0, $v1 -/* A40140 80240A00 00021080 */ sll $v0, $v0, 2 -/* A40144 80240A04 00431021 */ addu $v0, $v0, $v1 -/* A40148 80240A08 1482000C */ bne $a0, $v0, .L80240A3C -/* A4014C 80240A0C 00000000 */ nop -/* A40150 80240A10 C602003C */ lwc1 $f2, 0x3c($s0) -/* A40154 80240A14 3C014120 */ lui $at, 0x4120 -/* A40158 80240A18 44810000 */ mtc1 $at, $f0 -/* A4015C 80240A1C 00000000 */ nop -/* A40160 80240A20 46001080 */ add.s $f2, $f2, $f0 -/* A40164 80240A24 E7A00010 */ swc1 $f0, 0x10($sp) -/* A40168 80240A28 8E050038 */ lw $a1, 0x38($s0) -/* A4016C 80240A2C 8E070040 */ lw $a3, 0x40($s0) -/* A40170 80240A30 44061000 */ mfc1 $a2, $f2 -/* A40174 80240A34 0C01BFBC */ jal func_8006FEF0 -/* A40178 80240A38 24040003 */ addiu $a0, $zero, 3 -.L80240A3C: -/* A4017C 80240A3C 8E22007C */ lw $v0, 0x7c($s1) -/* A40180 80240A40 284200BF */ slti $v0, $v0, 0xbf -/* A40184 80240A44 10400009 */ beqz $v0, .L80240A6C -/* A40188 80240A48 24020002 */ addiu $v0, $zero, 2 -.L80240A4C: -/* A4018C 80240A4C 8E22007C */ lw $v0, 0x7c($s1) -/* A40190 80240A50 24420001 */ addiu $v0, $v0, 1 -/* A40194 80240A54 AE22007C */ sw $v0, 0x7c($s1) -/* A40198 80240A58 C6000060 */ lwc1 $f0, 0x60($s0) -/* A4019C 80240A5C C6020064 */ lwc1 $f2, 0x64($s0) -/* A401A0 80240A60 46020000 */ add.s $f0, $f0, $f2 -/* A401A4 80240A64 0000102D */ daddu $v0, $zero, $zero -/* A401A8 80240A68 E6000060 */ swc1 $f0, 0x60($s0) -.L80240A6C: -/* A401AC 80240A6C 8FBF0024 */ lw $ra, 0x24($sp) -/* A401B0 80240A70 8FB20020 */ lw $s2, 0x20($sp) -/* A401B4 80240A74 8FB1001C */ lw $s1, 0x1c($sp) -/* A401B8 80240A78 8FB00018 */ lw $s0, 0x18($sp) -/* A401BC 80240A7C 03E00008 */ jr $ra -/* A401C0 80240A80 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_10/func_80240A84_A3F740.s b/asm/nonmatchings/world/area_hos/hos_10/func_80240A84_A3F740.s deleted file mode 100644 index 45e62c65a7..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_10/func_80240A84_A3F740.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A84_A401C4 -/* A401C4 80240A84 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A401C8 80240A88 AFB10014 */ sw $s1, 0x14($sp) -/* A401CC 80240A8C 0080882D */ daddu $s1, $a0, $zero -/* A401D0 80240A90 AFBF001C */ sw $ra, 0x1c($sp) -/* A401D4 80240A94 AFB20018 */ sw $s2, 0x18($sp) -/* A401D8 80240A98 AFB00010 */ sw $s0, 0x10($sp) -/* A401DC 80240A9C F7B60028 */ sdc1 $f22, 0x28($sp) -/* A401E0 80240AA0 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A401E4 80240AA4 8E30000C */ lw $s0, 0xc($s1) -/* A401E8 80240AA8 8E050000 */ lw $a1, ($s0) -/* A401EC 80240AAC 0C0B1EAF */ jal get_variable -/* A401F0 80240AB0 26100004 */ addiu $s0, $s0, 4 -/* A401F4 80240AB4 8E050000 */ lw $a1, ($s0) -/* A401F8 80240AB8 26100004 */ addiu $s0, $s0, 4 -/* A401FC 80240ABC 0220202D */ daddu $a0, $s1, $zero -/* A40200 80240AC0 0C0B1EAF */ jal get_variable -/* A40204 80240AC4 0040902D */ daddu $s2, $v0, $zero -/* A40208 80240AC8 8E050000 */ lw $a1, ($s0) -/* A4020C 80240ACC 26100004 */ addiu $s0, $s0, 4 -/* A40210 80240AD0 4482B000 */ mtc1 $v0, $f22 -/* A40214 80240AD4 00000000 */ nop -/* A40218 80240AD8 4680B5A0 */ cvt.s.w $f22, $f22 -/* A4021C 80240ADC 0C0B1EAF */ jal get_variable -/* A40220 80240AE0 0220202D */ daddu $a0, $s1, $zero -/* A40224 80240AE4 8E050000 */ lw $a1, ($s0) -/* A40228 80240AE8 4482A000 */ mtc1 $v0, $f20 -/* A4022C 80240AEC 00000000 */ nop -/* A40230 80240AF0 4680A520 */ cvt.s.w $f20, $f20 -/* A40234 80240AF4 0C0B1EAF */ jal get_variable -/* A40238 80240AF8 0220202D */ daddu $a0, $s1, $zero -/* A4023C 80240AFC 8E43000C */ lw $v1, 0xc($s2) -/* A40240 80240B00 E4760004 */ swc1 $f22, 4($v1) -/* A40244 80240B04 8E43000C */ lw $v1, 0xc($s2) -/* A40248 80240B08 E4740008 */ swc1 $f20, 8($v1) -/* A4024C 80240B0C 8E43000C */ lw $v1, 0xc($s2) -/* A40250 80240B10 44820000 */ mtc1 $v0, $f0 -/* A40254 80240B14 00000000 */ nop -/* A40258 80240B18 46800020 */ cvt.s.w $f0, $f0 -/* A4025C 80240B1C E460000C */ swc1 $f0, 0xc($v1) -/* A40260 80240B20 8FBF001C */ lw $ra, 0x1c($sp) -/* A40264 80240B24 8FB20018 */ lw $s2, 0x18($sp) -/* A40268 80240B28 8FB10014 */ lw $s1, 0x14($sp) -/* A4026C 80240B2C 8FB00010 */ lw $s0, 0x10($sp) -/* A40270 80240B30 D7B60028 */ ldc1 $f22, 0x28($sp) -/* A40274 80240B34 D7B40020 */ ldc1 $f20, 0x20($sp) -/* A40278 80240B38 24020002 */ addiu $v0, $zero, 2 -/* A4027C 80240B3C 03E00008 */ jr $ra -/* A40280 80240B40 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_hos/hos_10/func_80240B44_A3F740.s b/asm/nonmatchings/world/area_hos/hos_10/func_80240B44_A3F740.s deleted file mode 100644 index 00e685c62e..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_10/func_80240B44_A3F740.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B44_A40284 -/* A40284 80240B44 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A40288 80240B48 AFB10014 */ sw $s1, 0x14($sp) -/* A4028C 80240B4C 0080882D */ daddu $s1, $a0, $zero -/* A40290 80240B50 AFBF0018 */ sw $ra, 0x18($sp) -/* A40294 80240B54 AFB00010 */ sw $s0, 0x10($sp) -/* A40298 80240B58 8E30000C */ lw $s0, 0xc($s1) -/* A4029C 80240B5C 8E050000 */ lw $a1, ($s0) -/* A402A0 80240B60 0C0B1EAF */ jal get_variable -/* A402A4 80240B64 26100004 */ addiu $s0, $s0, 4 -/* A402A8 80240B68 0220202D */ daddu $a0, $s1, $zero -/* A402AC 80240B6C 8E050000 */ lw $a1, ($s0) -/* A402B0 80240B70 0C0B210B */ jal get_float_variable -/* A402B4 80240B74 0040802D */ daddu $s0, $v0, $zero -/* A402B8 80240B78 8E03000C */ lw $v1, 0xc($s0) -/* A402BC 80240B7C E4600010 */ swc1 $f0, 0x10($v1) -/* A402C0 80240B80 8FBF0018 */ lw $ra, 0x18($sp) -/* A402C4 80240B84 8FB10014 */ lw $s1, 0x14($sp) -/* A402C8 80240B88 8FB00010 */ lw $s0, 0x10($sp) -/* A402CC 80240B8C 24020002 */ addiu $v0, $zero, 2 -/* A402D0 80240B90 03E00008 */ jr $ra -/* A402D4 80240B94 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_10/func_80240B98_A3F740.s b/asm/nonmatchings/world/area_hos/hos_10/func_80240B98_A3F740.s deleted file mode 100644 index 6ab5c6af8c..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_10/func_80240B98_A3F740.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B98_A402D8 -/* A402D8 80240B98 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A402DC 80240B9C AFB10014 */ sw $s1, 0x14($sp) -/* A402E0 80240BA0 0080882D */ daddu $s1, $a0, $zero -/* A402E4 80240BA4 AFBF0018 */ sw $ra, 0x18($sp) -/* A402E8 80240BA8 AFB00010 */ sw $s0, 0x10($sp) -/* A402EC 80240BAC 8E30000C */ lw $s0, 0xc($s1) -/* A402F0 80240BB0 8E050000 */ lw $a1, ($s0) -/* A402F4 80240BB4 0C0B1EAF */ jal get_variable -/* A402F8 80240BB8 26100004 */ addiu $s0, $s0, 4 -/* A402FC 80240BBC 0220202D */ daddu $a0, $s1, $zero -/* A40300 80240BC0 8E050000 */ lw $a1, ($s0) -/* A40304 80240BC4 0C0B1EAF */ jal get_variable -/* A40308 80240BC8 0040802D */ daddu $s0, $v0, $zero -/* A4030C 80240BCC 8E03000C */ lw $v1, 0xc($s0) -/* A40310 80240BD0 AC620018 */ sw $v0, 0x18($v1) -/* A40314 80240BD4 8FBF0018 */ lw $ra, 0x18($sp) -/* A40318 80240BD8 8FB10014 */ lw $s1, 0x14($sp) -/* A4031C 80240BDC 8FB00010 */ lw $s0, 0x10($sp) -/* A40320 80240BE0 24020002 */ addiu $v0, $zero, 2 -/* A40324 80240BE4 03E00008 */ jr $ra -/* A40328 80240BE8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_10/func_80240BFC_A3F740.s b/asm/nonmatchings/world/area_hos/hos_10/func_80240BFC_A3F740.s deleted file mode 100644 index 07ee885c90..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_10/func_80240BFC_A3F740.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BFC_A4033C -/* A4033C 80240BFC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A40340 80240C00 AFB00010 */ sw $s0, 0x10($sp) -/* A40344 80240C04 0080802D */ daddu $s0, $a0, $zero -/* A40348 80240C08 10A00002 */ beqz $a1, .L80240C14 -/* A4034C 80240C0C AFBF0014 */ sw $ra, 0x14($sp) -/* A40350 80240C10 AE000074 */ sw $zero, 0x74($s0) -.L80240C14: -/* A40354 80240C14 0000202D */ daddu $a0, $zero, $zero -/* A40358 80240C18 240500D0 */ addiu $a1, $zero, 0xd0 -/* A4035C 80240C1C 00A0302D */ daddu $a2, $a1, $zero -/* A40360 80240C20 0C04DF84 */ jal func_80137E10 -/* A40364 80240C24 00A0382D */ daddu $a3, $a1, $zero -/* A40368 80240C28 C6000074 */ lwc1 $f0, 0x74($s0) -/* A4036C 80240C2C 46800020 */ cvt.s.w $f0, $f0 -/* A40370 80240C30 44050000 */ mfc1 $a1, $f0 -/* A40374 80240C34 0C04DF62 */ jal func_80137D88 -/* A40378 80240C38 24040001 */ addiu $a0, $zero, 1 -/* A4037C 80240C3C 8E020074 */ lw $v0, 0x74($s0) -/* A40380 80240C40 240300FF */ addiu $v1, $zero, 0xff -/* A40384 80240C44 14430003 */ bne $v0, $v1, .L80240C54 -/* A40388 80240C48 24420007 */ addiu $v0, $v0, 7 -/* A4038C 80240C4C 0809031A */ j .L80240C68 -/* A40390 80240C50 24020002 */ addiu $v0, $zero, 2 -.L80240C54: -/* A40394 80240C54 AE020074 */ sw $v0, 0x74($s0) -/* A40398 80240C58 28420100 */ slti $v0, $v0, 0x100 -/* A4039C 80240C5C 50400001 */ beql $v0, $zero, .L80240C64 -/* A403A0 80240C60 AE030074 */ sw $v1, 0x74($s0) -.L80240C64: -/* A403A4 80240C64 0000102D */ daddu $v0, $zero, $zero -.L80240C68: -/* A403A8 80240C68 8FBF0014 */ lw $ra, 0x14($sp) -/* A403AC 80240C6C 8FB00010 */ lw $s0, 0x10($sp) -/* A403B0 80240C70 03E00008 */ jr $ra -/* A403B4 80240C74 27BD0018 */ addiu $sp, $sp, 0x18 -/* A403B8 80240C78 00000000 */ nop -/* A403BC 80240C7C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_20/func_80240124_A45930.s b/asm/nonmatchings/world/area_hos/hos_20/func_80240124_A45930.s deleted file mode 100644 index 5ec968a62c..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_20/func_80240124_A45930.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A45A54 -/* A45A54 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A45A58 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A45A5C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A45A60 80240130 10A00005 */ beqz $a1, .L80240148 -/* A45A64 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A45A68 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A45A6C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A45A70 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A45A74 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A45A78 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A45A7C 8024014C 1440000E */ bnez $v0, .L80240188 -/* A45A80 80240150 00000000 */ nop -/* A45A84 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A45A88 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A45A8C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A45A90 80240160 04610004 */ bgez $v1, .L80240174 -/* A45A94 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A45A98 80240168 3C020002 */ lui $v0, 2 -/* A45A9C 8024016C 08090061 */ j .L80240184 -/* A45AA0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A45AA4 80240174 3C040002 */ lui $a0, 2 -/* A45AA8 80240178 0083102A */ slt $v0, $a0, $v1 -/* A45AAC 8024017C 10400002 */ beqz $v0, .L80240188 -/* A45AB0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A45AB4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A45AB8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A45ABC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A45AC0 80240190 00000000 */ nop -/* A45AC4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A45AC8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A45ACC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A45AD0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A45AD4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A45AD8 802401A8 3C020002 */ lui $v0, 2 -/* A45ADC 802401AC 08090071 */ j .L802401C4 -/* A45AE0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A45AE4 802401B4 3C040002 */ lui $a0, 2 -/* A45AE8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A45AEC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A45AF0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A45AF4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A45AF8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A45AFC 802401CC 1440000E */ bnez $v0, .L80240208 -/* A45B00 802401D0 00000000 */ nop -/* A45B04 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A45B08 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A45B0C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A45B10 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A45B14 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A45B18 802401E8 3C020002 */ lui $v0, 2 -/* A45B1C 802401EC 08090081 */ j .L80240204 -/* A45B20 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A45B24 802401F4 3C040002 */ lui $a0, 2 -/* A45B28 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A45B2C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A45B30 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A45B34 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A45B38 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A45B3C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A45B40 80240210 00000000 */ nop -/* A45B44 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A45B48 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A45B4C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A45B50 80240220 04610004 */ bgez $v1, .L80240234 -/* A45B54 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A45B58 80240228 3C020002 */ lui $v0, 2 -/* A45B5C 8024022C 08090091 */ j .L80240244 -/* A45B60 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A45B64 80240234 3C040002 */ lui $a0, 2 -/* A45B68 80240238 0083102A */ slt $v0, $a0, $v1 -/* A45B6C 8024023C 10400002 */ beqz $v0, .L80240248 -/* A45B70 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A45B74 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A45B78 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A45B7C 8024024C 0C046F07 */ jal set_main_pan_u -/* A45B80 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A45B84 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A45B88 80240258 0C046F0D */ jal set_main_pan_v -/* A45B8C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A45B90 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A45B94 80240264 0C046F13 */ jal set_aux_pan_u -/* A45B98 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A45B9C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A45BA0 80240270 0C046F19 */ jal set_aux_pan_v -/* A45BA4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A45BA8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A45BAC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A45BB0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A45BB4 80240284 24420001 */ addiu $v0, $v0, 1 -/* A45BB8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A45BBC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A45BC0 80240290 24630001 */ addiu $v1, $v1, 1 -/* A45BC4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A45BC8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A45BCC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A45BD0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A45BD4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A45BD8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A45BDC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A45BE0 802402B0 14600002 */ bnez $v1, .L802402BC -/* A45BE4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A45BE8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A45BEC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A45BF0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A45BF4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A45BF8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A45BFC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A45C00 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A45C04 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A45C08 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A45C0C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A45C10 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A45C14 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A45C18 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A45C1C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A45C20 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A45C24 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A45C28 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A45C2C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A45C30 80240300 0000102D */ daddu $v0, $zero, $zero -/* A45C34 80240304 03E00008 */ jr $ra -/* A45C38 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A45C3C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_20/func_80240310_A45930.s b/asm/nonmatchings/world/area_hos/hos_20/func_80240310_A45930.s deleted file mode 100644 index 76badaf188..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_20/func_80240310_A45930.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_A45C40 -/* A45C40 80240310 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* A45C44 80240314 2463419C */ addiu $v1, $v1, %lo(gGameStatusPtr) -/* A45C48 80240318 8C620000 */ lw $v0, ($v1) -/* A45C4C 8024031C AC8000A4 */ sw $zero, 0xa4($a0) -/* A45C50 80240320 8C420010 */ lw $v0, 0x10($v0) -/* A45C54 80240324 30428000 */ andi $v0, $v0, 0x8000 -/* A45C58 80240328 10400002 */ beqz $v0, .L80240334 -/* A45C5C 8024032C 24020001 */ addiu $v0, $zero, 1 -/* A45C60 80240330 AC8200A4 */ sw $v0, 0xa4($a0) -.L80240334: -/* A45C64 80240334 8C620000 */ lw $v0, ($v1) -/* A45C68 80240338 8C420010 */ lw $v0, 0x10($v0) -/* A45C6C 8024033C 30424000 */ andi $v0, $v0, 0x4000 -/* A45C70 80240340 10400002 */ beqz $v0, .L8024034C -/* A45C74 80240344 24020001 */ addiu $v0, $zero, 1 -/* A45C78 80240348 AC8200A4 */ sw $v0, 0xa4($a0) -.L8024034C: -/* A45C7C 8024034C 03E00008 */ jr $ra -/* A45C80 80240350 24020002 */ addiu $v0, $zero, 2 -/* A45C84 80240354 00000000 */ nop -/* A45C88 80240358 00000000 */ nop -/* A45C8C 8024035C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_02/func_80240040_978710.s b/asm/nonmatchings/world/area_isk/isk_02/func_80240040_978710.s deleted file mode 100644 index 398710ae12..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_02/func_80240040_978710.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_978750 -/* 978750 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 978754 80240044 AFB10014 */ sw $s1, 0x14($sp) -/* 978758 80240048 0080882D */ daddu $s1, $a0, $zero -/* 97875C 8024004C AFBF0018 */ sw $ra, 0x18($sp) -/* 978760 80240050 AFB00010 */ sw $s0, 0x10($sp) -/* 978764 80240054 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 978768 80240058 8E30000C */ lw $s0, 0xc($s1) -/* 97876C 8024005C 8E050000 */ lw $a1, ($s0) -/* 978770 80240060 0C0B1EAF */ jal get_variable -/* 978774 80240064 26100004 */ addiu $s0, $s0, 4 -/* 978778 80240068 8E050000 */ lw $a1, ($s0) -/* 97877C 8024006C 4482A000 */ mtc1 $v0, $f20 -/* 978780 80240070 00000000 */ nop -/* 978784 80240074 4680A520 */ cvt.s.w $f20, $f20 -/* 978788 80240078 0C0B1EAF */ jal get_variable -/* 97878C 8024007C 0220202D */ daddu $a0, $s1, $zero -/* 978790 80240080 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 978794 80240084 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 978798 80240088 8C660028 */ lw $a2, 0x28($v1) -/* 97879C 8024008C 8C670030 */ lw $a3, 0x30($v1) -/* 9787A0 80240090 44827000 */ mtc1 $v0, $f14 -/* 9787A4 80240094 00000000 */ nop -/* 9787A8 80240098 468073A0 */ cvt.s.w $f14, $f14 -/* 9787AC 8024009C 0C00A7B5 */ jal dist2D -/* 9787B0 802400A0 4600A306 */ mov.s $f12, $f20 -/* 9787B4 802400A4 3C01437A */ lui $at, 0x437a -/* 9787B8 802400A8 44811000 */ mtc1 $at, $f2 -/* 9787BC 802400AC 00000000 */ nop -/* 9787C0 802400B0 4600103C */ c.lt.s $f2, $f0 -/* 9787C4 802400B4 00000000 */ nop -/* 9787C8 802400B8 45000003 */ bc1f .L802400C8 -/* 9787CC 802400BC 24020001 */ addiu $v0, $zero, 1 -/* 9787D0 802400C0 08090033 */ j .L802400CC -/* 9787D4 802400C4 AE200084 */ sw $zero, 0x84($s1) -.L802400C8: -/* 9787D8 802400C8 AE220084 */ sw $v0, 0x84($s1) -.L802400CC: -/* 9787DC 802400CC 8FBF0018 */ lw $ra, 0x18($sp) -/* 9787E0 802400D0 8FB10014 */ lw $s1, 0x14($sp) -/* 9787E4 802400D4 8FB00010 */ lw $s0, 0x10($sp) -/* 9787E8 802400D8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9787EC 802400DC 24020002 */ addiu $v0, $zero, 2 -/* 9787F0 802400E0 03E00008 */ jr $ra -/* 9787F4 802400E4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9787F8 802400E8 00000000 */ nop -/* 9787FC 802400EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_02/func_802400F0_978710.s b/asm/nonmatchings/world/area_isk/isk_02/func_802400F0_978710.s deleted file mode 100644 index 52bae55010..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_02/func_802400F0_978710.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_978800 -/* 978800 802400F0 8C830148 */ lw $v1, 0x148($a0) -/* 978804 802400F4 24020003 */ addiu $v0, $zero, 3 -/* 978808 802400F8 A06200B5 */ sb $v0, 0xb5($v1) -/* 97880C 802400FC 03E00008 */ jr $ra -/* 978810 80240100 24020002 */ addiu $v0, $zero, 2 -/* 978814 80240104 00000000 */ nop -/* 978818 80240108 00000000 */ nop -/* 97881C 8024010C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_04/func_80240040_97B630.s b/asm/nonmatchings/world/area_isk/isk_04/func_80240040_97B630.s deleted file mode 100644 index b86738b5b0..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_04/func_80240040_97B630.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_97B670 -/* 97B670 80240040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 97B674 80240044 AFB20018 */ sw $s2, 0x18($sp) -/* 97B678 80240048 0080902D */ daddu $s2, $a0, $zero -/* 97B67C 8024004C AFBF001C */ sw $ra, 0x1c($sp) -/* 97B680 80240050 AFB10014 */ sw $s1, 0x14($sp) -/* 97B684 80240054 AFB00010 */ sw $s0, 0x10($sp) -/* 97B688 80240058 8E510148 */ lw $s1, 0x148($s2) -/* 97B68C 8024005C 0C00EABB */ jal get_npc_unsafe -/* 97B690 80240060 86240008 */ lh $a0, 8($s1) -/* 97B694 80240064 0040802D */ daddu $s0, $v0, $zero -/* 97B698 80240068 8E2300CC */ lw $v1, 0xcc($s1) -/* 97B69C 8024006C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 97B6A0 80240070 8C630020 */ lw $v1, 0x20($v1) -/* 97B6A4 80240074 AE030028 */ sw $v1, 0x28($s0) -/* 97B6A8 80240078 96220076 */ lhu $v0, 0x76($s1) -/* 97B6AC 8024007C A602008E */ sh $v0, 0x8e($s0) -/* 97B6B0 80240080 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 97B6B4 80240084 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 97B6B8 80240088 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 97B6BC 8024008C 8C460028 */ lw $a2, 0x28($v0) -/* 97B6C0 80240090 0C00A720 */ jal atan2 -/* 97B6C4 80240094 8C470030 */ lw $a3, 0x30($v0) -/* 97B6C8 80240098 2402000D */ addiu $v0, $zero, 0xd -/* 97B6CC 8024009C E600000C */ swc1 $f0, 0xc($s0) -/* 97B6D0 802400A0 AE420070 */ sw $v0, 0x70($s2) -/* 97B6D4 802400A4 8FBF001C */ lw $ra, 0x1c($sp) -/* 97B6D8 802400A8 8FB20018 */ lw $s2, 0x18($sp) -/* 97B6DC 802400AC 8FB10014 */ lw $s1, 0x14($sp) -/* 97B6E0 802400B0 8FB00010 */ lw $s0, 0x10($sp) -/* 97B6E4 802400B4 03E00008 */ jr $ra -/* 97B6E8 802400B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_04/func_802400BC_97B630.s b/asm/nonmatchings/world/area_isk/isk_04/func_802400BC_97B630.s deleted file mode 100644 index 5879210b28..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_04/func_802400BC_97B630.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400BC_97B6EC -/* 97B6EC 802400BC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 97B6F0 802400C0 AFB3001C */ sw $s3, 0x1c($sp) -/* 97B6F4 802400C4 0080982D */ daddu $s3, $a0, $zero -/* 97B6F8 802400C8 AFBF0020 */ sw $ra, 0x20($sp) -/* 97B6FC 802400CC AFB20018 */ sw $s2, 0x18($sp) -/* 97B700 802400D0 AFB10014 */ sw $s1, 0x14($sp) -/* 97B704 802400D4 AFB00010 */ sw $s0, 0x10($sp) -/* 97B708 802400D8 8E710148 */ lw $s1, 0x148($s3) -/* 97B70C 802400DC 86240008 */ lh $a0, 8($s1) -/* 97B710 802400E0 0C00EABB */ jal get_npc_unsafe -/* 97B714 802400E4 00A0902D */ daddu $s2, $a1, $zero -/* 97B718 802400E8 0040802D */ daddu $s0, $v0, $zero -/* 97B71C 802400EC 8602008E */ lh $v0, 0x8e($s0) -/* 97B720 802400F0 9603008E */ lhu $v1, 0x8e($s0) -/* 97B724 802400F4 18400005 */ blez $v0, .L8024010C -/* 97B728 802400F8 2462FFFF */ addiu $v0, $v1, -1 -/* 97B72C 802400FC A602008E */ sh $v0, 0x8e($s0) -/* 97B730 80240100 00021400 */ sll $v0, $v0, 0x10 -/* 97B734 80240104 1C400033 */ bgtz $v0, .L802401D4 -/* 97B738 80240108 00000000 */ nop -.L8024010C: -/* 97B73C 8024010C 8602008C */ lh $v0, 0x8c($s0) -/* 97B740 80240110 14400030 */ bnez $v0, .L802401D4 -/* 97B744 80240114 00000000 */ nop -/* 97B748 80240118 8E2200CC */ lw $v0, 0xcc($s1) -/* 97B74C 8024011C 8C420024 */ lw $v0, 0x24($v0) -/* 97B750 80240120 AE020028 */ sw $v0, 0x28($s0) -/* 97B754 80240124 C6400018 */ lwc1 $f0, 0x18($s2) -/* 97B758 80240128 E6000018 */ swc1 $f0, 0x18($s0) -/* 97B75C 8024012C 8E230088 */ lw $v1, 0x88($s1) -/* 97B760 80240130 24020005 */ addiu $v0, $zero, 5 -/* 97B764 80240134 10620005 */ beq $v1, $v0, .L8024014C -/* 97B768 80240138 00000000 */ nop -/* 97B76C 8024013C 10600003 */ beqz $v1, .L8024014C -/* 97B770 80240140 24020001 */ addiu $v0, $zero, 1 -/* 97B774 80240144 14620006 */ bne $v1, $v0, .L80240160 -/* 97B778 80240148 00000000 */ nop -.L8024014C: -/* 97B77C 8024014C 8E220084 */ lw $v0, 0x84($s1) -/* 97B780 80240150 00021FC2 */ srl $v1, $v0, 0x1f -/* 97B784 80240154 00431021 */ addu $v0, $v0, $v1 -/* 97B788 80240158 00021043 */ sra $v0, $v0, 1 -/* 97B78C 8024015C A60200A8 */ sh $v0, 0xa8($s0) -.L80240160: -/* 97B790 80240160 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 97B794 80240164 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 97B798 80240168 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 97B79C 8024016C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 97B7A0 80240170 8C460028 */ lw $a2, 0x28($v0) -/* 97B7A4 80240174 0C00A7B5 */ jal dist2D -/* 97B7A8 80240178 8C470030 */ lw $a3, 0x30($v0) -/* 97B7AC 8024017C C6020018 */ lwc1 $f2, 0x18($s0) -/* 97B7B0 80240180 46020003 */ div.s $f0, $f0, $f2 -/* 97B7B4 80240184 3C018024 */ lui $at, 0x8024 -/* 97B7B8 80240188 D4222430 */ ldc1 $f2, 0x2430($at) -/* 97B7BC 8024018C 46000021 */ cvt.d.s $f0, $f0 -/* 97B7C0 80240190 46220000 */ add.d $f0, $f0, $f2 -/* 97B7C4 80240194 4620010D */ trunc.w.d $f4, $f0 -/* 97B7C8 80240198 44022000 */ mfc1 $v0, $f4 -/* 97B7CC 8024019C 00000000 */ nop -/* 97B7D0 802401A0 A602008E */ sh $v0, 0x8e($s0) -/* 97B7D4 802401A4 00021400 */ sll $v0, $v0, 0x10 -/* 97B7D8 802401A8 8E230078 */ lw $v1, 0x78($s1) -/* 97B7DC 802401AC 00021403 */ sra $v0, $v0, 0x10 -/* 97B7E0 802401B0 0043102A */ slt $v0, $v0, $v1 -/* 97B7E4 802401B4 10400003 */ beqz $v0, .L802401C4 -/* 97B7E8 802401B8 00000000 */ nop -/* 97B7EC 802401BC 9622007A */ lhu $v0, 0x7a($s1) -/* 97B7F0 802401C0 A602008E */ sh $v0, 0x8e($s0) -.L802401C4: -/* 97B7F4 802401C4 8602008E */ lh $v0, 0x8e($s0) -/* 97B7F8 802401C8 AE22007C */ sw $v0, 0x7c($s1) -/* 97B7FC 802401CC 2402000E */ addiu $v0, $zero, 0xe -/* 97B800 802401D0 AE620070 */ sw $v0, 0x70($s3) -.L802401D4: -/* 97B804 802401D4 8FBF0020 */ lw $ra, 0x20($sp) -/* 97B808 802401D8 8FB3001C */ lw $s3, 0x1c($sp) -/* 97B80C 802401DC 8FB20018 */ lw $s2, 0x18($sp) -/* 97B810 802401E0 8FB10014 */ lw $s1, 0x14($sp) -/* 97B814 802401E4 8FB00010 */ lw $s0, 0x10($sp) -/* 97B818 802401E8 03E00008 */ jr $ra -/* 97B81C 802401EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_04/func_80240354_97B630.s b/asm/nonmatchings/world/area_isk/isk_04/func_80240354_97B630.s deleted file mode 100644 index beb0524a2d..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_04/func_80240354_97B630.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240354_97B984 -/* 97B984 80240354 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 97B988 80240358 AFB10014 */ sw $s1, 0x14($sp) -/* 97B98C 8024035C 0080882D */ daddu $s1, $a0, $zero -/* 97B990 80240360 AFBF0018 */ sw $ra, 0x18($sp) -/* 97B994 80240364 AFB00010 */ sw $s0, 0x10($sp) -/* 97B998 80240368 8E300148 */ lw $s0, 0x148($s1) -/* 97B99C 8024036C 0C00EABB */ jal get_npc_unsafe -/* 97B9A0 80240370 86040008 */ lh $a0, 8($s0) -/* 97B9A4 80240374 0040202D */ daddu $a0, $v0, $zero -/* 97B9A8 80240378 9482008E */ lhu $v0, 0x8e($a0) -/* 97B9AC 8024037C 24030003 */ addiu $v1, $zero, 3 -/* 97B9B0 80240380 24420001 */ addiu $v0, $v0, 1 -/* 97B9B4 80240384 A482008E */ sh $v0, 0x8e($a0) -/* 97B9B8 80240388 00021400 */ sll $v0, $v0, 0x10 -/* 97B9BC 8024038C 00021403 */ sra $v0, $v0, 0x10 -/* 97B9C0 80240390 14430003 */ bne $v0, $v1, .L802403A0 -/* 97B9C4 80240394 00000000 */ nop -/* 97B9C8 80240398 96020086 */ lhu $v0, 0x86($s0) -/* 97B9CC 8024039C A48200A8 */ sh $v0, 0xa8($a0) -.L802403A0: -/* 97B9D0 802403A0 8482008E */ lh $v0, 0x8e($a0) -/* 97B9D4 802403A4 8E030080 */ lw $v1, 0x80($s0) -/* 97B9D8 802403A8 0043102A */ slt $v0, $v0, $v1 -/* 97B9DC 802403AC 14400004 */ bnez $v0, .L802403C0 -/* 97B9E0 802403B0 00000000 */ nop -/* 97B9E4 802403B4 96020086 */ lhu $v0, 0x86($s0) -/* 97B9E8 802403B8 A48200A8 */ sh $v0, 0xa8($a0) -/* 97B9EC 802403BC AE200070 */ sw $zero, 0x70($s1) -.L802403C0: -/* 97B9F0 802403C0 8FBF0018 */ lw $ra, 0x18($sp) -/* 97B9F4 802403C4 8FB10014 */ lw $s1, 0x14($sp) -/* 97B9F8 802403C8 8FB00010 */ lw $s0, 0x10($sp) -/* 97B9FC 802403CC 03E00008 */ jr $ra -/* 97BA00 802403D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_04/func_8024085C_97B630.s b/asm/nonmatchings/world/area_isk/isk_04/func_8024085C_97B630.s deleted file mode 100644 index a789806b0c..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_04/func_8024085C_97B630.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024085C_97BE8C -/* 97BE8C 8024085C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 97BE90 80240860 AFBF0010 */ sw $ra, 0x10($sp) -/* 97BE94 80240864 0C00EAD2 */ jal get_npc_safe -/* 97BE98 80240868 8C84014C */ lw $a0, 0x14c($a0) -/* 97BE9C 8024086C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 97BEA0 80240870 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 97BEA4 80240874 C44C0038 */ lwc1 $f12, 0x38($v0) -/* 97BEA8 80240878 C44E0040 */ lwc1 $f14, 0x40($v0) -/* 97BEAC 8024087C 8C660028 */ lw $a2, 0x28($v1) -/* 97BEB0 80240880 0C00A7B5 */ jal dist2D -/* 97BEB4 80240884 8C670030 */ lw $a3, 0x30($v1) -/* 97BEB8 80240888 3C014248 */ lui $at, 0x4248 -/* 97BEBC 8024088C 44811000 */ mtc1 $at, $f2 -/* 97BEC0 80240890 00000000 */ nop -/* 97BEC4 80240894 4602003C */ c.lt.s $f0, $f2 -/* 97BEC8 80240898 00000000 */ nop -/* 97BECC 8024089C 45010002 */ bc1t .L802408A8 -/* 97BED0 802408A0 24020002 */ addiu $v0, $zero, 2 -/* 97BED4 802408A4 0000102D */ daddu $v0, $zero, $zero -.L802408A8: -/* 97BED8 802408A8 8FBF0010 */ lw $ra, 0x10($sp) -/* 97BEDC 802408AC 03E00008 */ jr $ra -/* 97BEE0 802408B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_04/func_802408B4_97B630.s b/asm/nonmatchings/world/area_isk/isk_04/func_802408B4_97B630.s deleted file mode 100644 index 08239ce470..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_04/func_802408B4_97B630.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408B4_97BEE4 -/* 97BEE4 802408B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 97BEE8 802408B8 0080102D */ daddu $v0, $a0, $zero -/* 97BEEC 802408BC AFB00010 */ sw $s0, 0x10($sp) -/* 97BEF0 802408C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 97BEF4 802408C4 AFB10014 */ sw $s1, 0x14($sp) -/* 97BEF8 802408C8 8C44014C */ lw $a0, 0x14c($v0) -/* 97BEFC 802408CC 8C510148 */ lw $s1, 0x148($v0) -/* 97BF00 802408D0 0C00EAD2 */ jal get_npc_safe -/* 97BF04 802408D4 00A0802D */ daddu $s0, $a1, $zero -/* 97BF08 802408D8 56000001 */ bnel $s0, $zero, .L802408E0 -/* 97BF0C 802408DC A04000AB */ sb $zero, 0xab($v0) -.L802408E0: -/* 97BF10 802408E0 8C420000 */ lw $v0, ($v0) -/* 97BF14 802408E4 30421000 */ andi $v0, $v0, 0x1000 -/* 97BF18 802408E8 1040000A */ beqz $v0, .L80240914 -/* 97BF1C 802408EC 0000102D */ daddu $v0, $zero, $zero -/* 97BF20 802408F0 82220004 */ lb $v0, 4($s1) -/* 97BF24 802408F4 3C03800B */ lui $v1, %hi(gCurrentEncounter) -/* 97BF28 802408F8 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) -/* 97BF2C 802408FC 00021080 */ sll $v0, $v0, 2 -/* 97BF30 80240900 00431021 */ addu $v0, $v0, $v1 -/* 97BF34 80240904 8C440028 */ lw $a0, 0x28($v0) -/* 97BF38 80240908 9623006E */ lhu $v1, 0x6e($s1) -/* 97BF3C 8024090C 24020002 */ addiu $v0, $zero, 2 -/* 97BF40 80240910 A4830044 */ sh $v1, 0x44($a0) -.L80240914: -/* 97BF44 80240914 8FBF0018 */ lw $ra, 0x18($sp) -/* 97BF48 80240918 8FB10014 */ lw $s1, 0x14($sp) -/* 97BF4C 8024091C 8FB00010 */ lw $s0, 0x10($sp) -/* 97BF50 80240920 03E00008 */ jr $ra -/* 97BF54 80240924 27BD0020 */ addiu $sp, $sp, 0x20 -/* 97BF58 80240928 00000000 */ nop -/* 97BF5C 8024092C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_04/func_80240930_97B630.s b/asm/nonmatchings/world/area_isk/isk_04/func_80240930_97B630.s deleted file mode 100644 index 79a89c73c2..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_04/func_80240930_97B630.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240930_97BF60 -/* 97BF60 80240930 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 97BF64 80240934 AFBF0010 */ sw $ra, 0x10($sp) -/* 97BF68 80240938 8C82000C */ lw $v0, 0xc($a0) -/* 97BF6C 8024093C 0C0B1EAF */ jal get_variable -/* 97BF70 80240940 8C450000 */ lw $a1, ($v0) -/* 97BF74 80240944 0C03AC5A */ jal func_800EB168 -/* 97BF78 80240948 0040202D */ daddu $a0, $v0, $zero -/* 97BF7C 8024094C 8FBF0010 */ lw $ra, 0x10($sp) -/* 97BF80 80240950 24020002 */ addiu $v0, $zero, 2 -/* 97BF84 80240954 03E00008 */ jr $ra -/* 97BF88 80240958 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_04/func_8024095C_97B630.s b/asm/nonmatchings/world/area_isk/isk_04/func_8024095C_97B630.s deleted file mode 100644 index 03ffc39587..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_04/func_8024095C_97B630.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024095C_97BF8C -/* 97BF8C 8024095C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 97BF90 80240960 3C048024 */ lui $a0, 0x8024 -/* 97BF94 80240964 24842288 */ addiu $a0, $a0, 0x2288 -/* 97BF98 80240968 AFBF0018 */ sw $ra, 0x18($sp) -/* 97BF9C 8024096C AFB10014 */ sw $s1, 0x14($sp) -/* 97BFA0 80240970 AFB00010 */ sw $s0, 0x10($sp) -/* 97BFA4 80240974 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 97BFA8 80240978 8C830000 */ lw $v1, ($a0) -/* 97BFAC 8024097C 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* 97BFB0 80240980 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* 97BFB4 80240984 28620003 */ slti $v0, $v1, 3 -/* 97BFB8 80240988 50400007 */ beql $v0, $zero, .L802409A8 -/* 97BFBC 8024098C 24020003 */ addiu $v0, $zero, 3 -/* 97BFC0 80240990 1C60000C */ bgtz $v1, .L802409C4 -/* 97BFC4 80240994 24620001 */ addiu $v0, $v1, 1 -/* 97BFC8 80240998 10600007 */ beqz $v1, .L802409B8 -/* 97BFCC 8024099C 0000102D */ daddu $v0, $zero, $zero -/* 97BFD0 802409A0 08090295 */ j .L80240A54 -/* 97BFD4 802409A4 00000000 */ nop -.L802409A8: -/* 97BFD8 802409A8 10620008 */ beq $v1, $v0, .L802409CC -/* 97BFDC 802409AC 0000102D */ daddu $v0, $zero, $zero -/* 97BFE0 802409B0 08090295 */ j .L80240A54 -/* 97BFE4 802409B4 00000000 */ nop -.L802409B8: -/* 97BFE8 802409B8 24020001 */ addiu $v0, $zero, 1 -/* 97BFEC 802409BC 08090294 */ j .L80240A50 -/* 97BFF0 802409C0 AC820000 */ sw $v0, ($a0) -.L802409C4: -/* 97BFF4 802409C4 08090294 */ j .L80240A50 -/* 97BFF8 802409C8 AC820000 */ sw $v0, ($a0) -.L802409CC: -/* 97BFFC 802409CC C6200028 */ lwc1 $f0, 0x28($s1) -/* 97C000 802409D0 3C0141F0 */ lui $at, 0x41f0 -/* 97C004 802409D4 44811000 */ mtc1 $at, $f2 -/* 97C008 802409D8 3C108011 */ lui $s0, 0x8011 -/* 97C00C 802409DC 2610C930 */ addiu $s0, $s0, -0x36d0 -/* 97C010 802409E0 46020001 */ sub.s $f0, $f0, $f2 -/* 97C014 802409E4 8E040000 */ lw $a0, ($s0) -/* 97C018 802409E8 E4800038 */ swc1 $f0, 0x38($a0) -/* 97C01C 802409EC C6200030 */ lwc1 $f0, 0x30($s1) -/* 97C020 802409F0 46020000 */ add.s $f0, $f0, $f2 -/* 97C024 802409F4 0C03BD17 */ jal clear_partner_move_history -/* 97C028 802409F8 E4800040 */ swc1 $f0, 0x40($a0) -/* 97C02C 802409FC C6200028 */ lwc1 $f0, 0x28($s1) -/* 97C030 80240A00 C6220030 */ lwc1 $f2, 0x30($s1) -/* 97C034 80240A04 4600010D */ trunc.w.s $f4, $f0 -/* 97C038 80240A08 44042000 */ mfc1 $a0, $f4 -/* 97C03C 80240A0C 4600110D */ trunc.w.s $f4, $f2 -/* 97C040 80240A10 44052000 */ mfc1 $a1, $f4 -/* 97C044 80240A14 0C03BCF0 */ jal func_800EF3C0 -/* 97C048 80240A18 00000000 */ nop -/* 97C04C 80240A1C 0C03BCF5 */ jal func_800EF3D4 -/* 97C050 80240A20 0000202D */ daddu $a0, $zero, $zero -/* 97C054 80240A24 3C0142B4 */ lui $at, 0x42b4 -/* 97C058 80240A28 4481A000 */ mtc1 $at, $f20 -/* 97C05C 80240A2C 8E040000 */ lw $a0, ($s0) -/* 97C060 80240A30 4405A000 */ mfc1 $a1, $f20 -/* 97C064 80240A34 0C00ECD0 */ jal set_npc_yaw -/* 97C068 80240A38 00000000 */ nop -/* 97C06C 80240A3C 24020002 */ addiu $v0, $zero, 2 -/* 97C070 80240A40 E6340080 */ swc1 $f20, 0x80($s1) -/* 97C074 80240A44 E6340084 */ swc1 $f20, 0x84($s1) -/* 97C078 80240A48 08090295 */ j .L80240A54 -/* 97C07C 80240A4C AE2000A8 */ sw $zero, 0xa8($s1) -.L80240A50: -/* 97C080 80240A50 0000102D */ daddu $v0, $zero, $zero -.L80240A54: -/* 97C084 80240A54 8FBF0018 */ lw $ra, 0x18($sp) -/* 97C088 80240A58 8FB10014 */ lw $s1, 0x14($sp) -/* 97C08C 80240A5C 8FB00010 */ lw $s0, 0x10($sp) -/* 97C090 80240A60 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 97C094 80240A64 03E00008 */ jr $ra -/* 97C098 80240A68 27BD0028 */ addiu $sp, $sp, 0x28 -/* 97C09C 80240A6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_05/func_80240628_97DAD0.s b/asm/nonmatchings/world/area_isk/isk_05/func_80240628_97DAD0.s deleted file mode 100644 index 72845c5bc1..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/func_80240628_97DAD0.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240628_97E0F8 -/* 97E0F8 80240628 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 97E0FC 8024062C AFB40040 */ sw $s4, 0x40($sp) -/* 97E100 80240630 0080A02D */ daddu $s4, $a0, $zero -/* 97E104 80240634 AFBF0044 */ sw $ra, 0x44($sp) -/* 97E108 80240638 AFB3003C */ sw $s3, 0x3c($sp) -/* 97E10C 8024063C AFB20038 */ sw $s2, 0x38($sp) -/* 97E110 80240640 AFB10034 */ sw $s1, 0x34($sp) -/* 97E114 80240644 AFB00030 */ sw $s0, 0x30($sp) -/* 97E118 80240648 8E920148 */ lw $s2, 0x148($s4) -/* 97E11C 8024064C 00A0882D */ daddu $s1, $a1, $zero -/* 97E120 80240650 86440008 */ lh $a0, 8($s2) -/* 97E124 80240654 0C00EABB */ jal get_npc_unsafe -/* 97E128 80240658 00C0982D */ daddu $s3, $a2, $zero -/* 97E12C 8024065C 8E230014 */ lw $v1, 0x14($s1) -/* 97E130 80240660 0460002D */ bltz $v1, .L80240718 -/* 97E134 80240664 0040802D */ daddu $s0, $v0, $zero -/* 97E138 80240668 0260202D */ daddu $a0, $s3, $zero -/* 97E13C 8024066C AFA00010 */ sw $zero, 0x10($sp) -/* 97E140 80240670 8E260024 */ lw $a2, 0x24($s1) -/* 97E144 80240674 8E270028 */ lw $a3, 0x28($s1) -/* 97E148 80240678 0C01242D */ jal func_800490B4 -/* 97E14C 8024067C 0240282D */ daddu $a1, $s2, $zero -/* 97E150 80240680 10400025 */ beqz $v0, .L80240718 -/* 97E154 80240684 0000202D */ daddu $a0, $zero, $zero -/* 97E158 80240688 0200282D */ daddu $a1, $s0, $zero -/* 97E15C 8024068C 0000302D */ daddu $a2, $zero, $zero -/* 97E160 80240690 860300A8 */ lh $v1, 0xa8($s0) -/* 97E164 80240694 3C013F80 */ lui $at, 0x3f80 -/* 97E168 80240698 44810000 */ mtc1 $at, $f0 -/* 97E16C 8024069C 3C014000 */ lui $at, 0x4000 -/* 97E170 802406A0 44811000 */ mtc1 $at, $f2 -/* 97E174 802406A4 3C01C1A0 */ lui $at, 0xc1a0 -/* 97E178 802406A8 44812000 */ mtc1 $at, $f4 -/* 97E17C 802406AC 2402000F */ addiu $v0, $zero, 0xf -/* 97E180 802406B0 AFA2001C */ sw $v0, 0x1c($sp) -/* 97E184 802406B4 44833000 */ mtc1 $v1, $f6 -/* 97E188 802406B8 00000000 */ nop -/* 97E18C 802406BC 468031A0 */ cvt.s.w $f6, $f6 -/* 97E190 802406C0 44073000 */ mfc1 $a3, $f6 -/* 97E194 802406C4 27A20028 */ addiu $v0, $sp, 0x28 -/* 97E198 802406C8 AFA20020 */ sw $v0, 0x20($sp) -/* 97E19C 802406CC E7A00010 */ swc1 $f0, 0x10($sp) -/* 97E1A0 802406D0 E7A20014 */ swc1 $f2, 0x14($sp) -/* 97E1A4 802406D4 0C01BFA4 */ jal fx_emote -/* 97E1A8 802406D8 E7A40018 */ swc1 $f4, 0x18($sp) -/* 97E1AC 802406DC 0200202D */ daddu $a0, $s0, $zero -/* 97E1B0 802406E0 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 97E1B4 802406E4 0C012530 */ jal func_800494C0 -/* 97E1B8 802406E8 3C060020 */ lui $a2, 0x20 -/* 97E1BC 802406EC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 97E1C0 802406F0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 97E1C4 802406F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 97E1C8 802406F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 97E1CC 802406FC 8C460028 */ lw $a2, 0x28($v0) -/* 97E1D0 80240700 0C00A720 */ jal atan2 -/* 97E1D4 80240704 8C470030 */ lw $a3, 0x30($v0) -/* 97E1D8 80240708 2402000C */ addiu $v0, $zero, 0xc -/* 97E1DC 8024070C E600000C */ swc1 $f0, 0xc($s0) -/* 97E1E0 80240710 080901EB */ j .L802407AC -/* 97E1E4 80240714 AE820070 */ sw $v0, 0x70($s4) -.L80240718: -/* 97E1E8 80240718 8602008C */ lh $v0, 0x8c($s0) -/* 97E1EC 8024071C 14400023 */ bnez $v0, .L802407AC -/* 97E1F0 80240720 00000000 */ nop -/* 97E1F4 80240724 9602008E */ lhu $v0, 0x8e($s0) -/* 97E1F8 80240728 2442FFFF */ addiu $v0, $v0, -1 -/* 97E1FC 8024072C A602008E */ sh $v0, 0x8e($s0) -/* 97E200 80240730 00021400 */ sll $v0, $v0, 0x10 -/* 97E204 80240734 1C40001D */ bgtz $v0, .L802407AC -/* 97E208 80240738 00000000 */ nop -/* 97E20C 8024073C 8E820074 */ lw $v0, 0x74($s4) -/* 97E210 80240740 2442FFFF */ addiu $v0, $v0, -1 -/* 97E214 80240744 18400018 */ blez $v0, .L802407A8 -/* 97E218 80240748 AE820074 */ sw $v0, 0x74($s4) -/* 97E21C 8024074C C600000C */ lwc1 $f0, 0xc($s0) -/* 97E220 80240750 3C014334 */ lui $at, 0x4334 -/* 97E224 80240754 44816000 */ mtc1 $at, $f12 -/* 97E228 80240758 0C00A6C9 */ jal clamp_angle -/* 97E22C 8024075C 460C0300 */ add.s $f12, $f0, $f12 -/* 97E230 80240760 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 97E234 80240764 0C00A67F */ jal rand_int -/* 97E238 80240768 E600000C */ swc1 $f0, 0xc($s0) -/* 97E23C 8024076C 3C032E8B */ lui $v1, 0x2e8b -/* 97E240 80240770 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 97E244 80240774 00430018 */ mult $v0, $v1 -/* 97E248 80240778 00021FC3 */ sra $v1, $v0, 0x1f -/* 97E24C 8024077C 00004010 */ mfhi $t0 -/* 97E250 80240780 00082043 */ sra $a0, $t0, 1 -/* 97E254 80240784 00832023 */ subu $a0, $a0, $v1 -/* 97E258 80240788 00041840 */ sll $v1, $a0, 1 -/* 97E25C 8024078C 00641821 */ addu $v1, $v1, $a0 -/* 97E260 80240790 00031880 */ sll $v1, $v1, 2 -/* 97E264 80240794 00641823 */ subu $v1, $v1, $a0 -/* 97E268 80240798 00431023 */ subu $v0, $v0, $v1 -/* 97E26C 8024079C 24420005 */ addiu $v0, $v0, 5 -/* 97E270 802407A0 080901EB */ j .L802407AC -/* 97E274 802407A4 A602008E */ sh $v0, 0x8e($s0) -.L802407A8: -/* 97E278 802407A8 AE800070 */ sw $zero, 0x70($s4) -.L802407AC: -/* 97E27C 802407AC 8FBF0044 */ lw $ra, 0x44($sp) -/* 97E280 802407B0 8FB40040 */ lw $s4, 0x40($sp) -/* 97E284 802407B4 8FB3003C */ lw $s3, 0x3c($sp) -/* 97E288 802407B8 8FB20038 */ lw $s2, 0x38($sp) -/* 97E28C 802407BC 8FB10034 */ lw $s1, 0x34($sp) -/* 97E290 802407C0 8FB00030 */ lw $s0, 0x30($sp) -/* 97E294 802407C4 03E00008 */ jr $ra -/* 97E298 802407C8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_isk/isk_05/func_80240BF0_97DAD0.s b/asm/nonmatchings/world/area_isk/isk_05/func_80240BF0_97DAD0.s deleted file mode 100644 index 0ba6270228..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/func_80240BF0_97DAD0.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BF0_97E6C0 -/* 97E6C0 80240BF0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 97E6C4 80240BF4 AFB3003C */ sw $s3, 0x3c($sp) -/* 97E6C8 80240BF8 0080982D */ daddu $s3, $a0, $zero -/* 97E6CC 80240BFC AFBF0048 */ sw $ra, 0x48($sp) -/* 97E6D0 80240C00 AFB50044 */ sw $s5, 0x44($sp) -/* 97E6D4 80240C04 AFB40040 */ sw $s4, 0x40($sp) -/* 97E6D8 80240C08 AFB20038 */ sw $s2, 0x38($sp) -/* 97E6DC 80240C0C AFB10034 */ sw $s1, 0x34($sp) -/* 97E6E0 80240C10 AFB00030 */ sw $s0, 0x30($sp) -/* 97E6E4 80240C14 8E720148 */ lw $s2, 0x148($s3) -/* 97E6E8 80240C18 86440008 */ lh $a0, 8($s2) -/* 97E6EC 80240C1C 8E70000C */ lw $s0, 0xc($s3) -/* 97E6F0 80240C20 0C00EABB */ jal get_npc_unsafe -/* 97E6F4 80240C24 00A0882D */ daddu $s1, $a1, $zero -/* 97E6F8 80240C28 8E050000 */ lw $a1, ($s0) -/* 97E6FC 80240C2C 26100004 */ addiu $s0, $s0, 4 -/* 97E700 80240C30 0260202D */ daddu $a0, $s3, $zero -/* 97E704 80240C34 0C0B1EAF */ jal get_variable -/* 97E708 80240C38 0040A82D */ daddu $s5, $v0, $zero -/* 97E70C 80240C3C 0260202D */ daddu $a0, $s3, $zero -/* 97E710 80240C40 8E050000 */ lw $a1, ($s0) -/* 97E714 80240C44 0C0B1EAF */ jal get_variable -/* 97E718 80240C48 0040A02D */ daddu $s4, $v0, $zero -/* 97E71C 80240C4C AE420094 */ sw $v0, 0x94($s2) -/* 97E720 80240C50 AFA00010 */ sw $zero, 0x10($sp) -/* 97E724 80240C54 8E4200D0 */ lw $v0, 0xd0($s2) -/* 97E728 80240C58 8C420030 */ lw $v0, 0x30($v0) -/* 97E72C 80240C5C AFA20014 */ sw $v0, 0x14($sp) -/* 97E730 80240C60 8E4200D0 */ lw $v0, 0xd0($s2) -/* 97E734 80240C64 8C42001C */ lw $v0, 0x1c($v0) -/* 97E738 80240C68 AFA20018 */ sw $v0, 0x18($sp) -/* 97E73C 80240C6C 8E4200D0 */ lw $v0, 0xd0($s2) -/* 97E740 80240C70 8C420024 */ lw $v0, 0x24($v0) -/* 97E744 80240C74 AFA2001C */ sw $v0, 0x1c($sp) -/* 97E748 80240C78 8E4200D0 */ lw $v0, 0xd0($s2) -/* 97E74C 80240C7C 8C420028 */ lw $v0, 0x28($v0) -/* 97E750 80240C80 AFA20020 */ sw $v0, 0x20($sp) -/* 97E754 80240C84 8E4200D0 */ lw $v0, 0xd0($s2) -/* 97E758 80240C88 3C0142C8 */ lui $at, 0x42c8 -/* 97E75C 80240C8C 44810000 */ mtc1 $at, $f0 -/* 97E760 80240C90 8C42002C */ lw $v0, 0x2c($v0) -/* 97E764 80240C94 27B00010 */ addiu $s0, $sp, 0x10 -/* 97E768 80240C98 E7A00028 */ swc1 $f0, 0x28($sp) -/* 97E76C 80240C9C A7A0002C */ sh $zero, 0x2c($sp) -/* 97E770 80240CA0 12200019 */ beqz $s1, .L80240D08 -/* 97E774 80240CA4 AFA20024 */ sw $v0, 0x24($sp) -/* 97E778 80240CA8 AE600070 */ sw $zero, 0x70($s3) -/* 97E77C 80240CAC A6A0008E */ sh $zero, 0x8e($s5) -/* 97E780 80240CB0 AE600074 */ sw $zero, 0x74($s3) -/* 97E784 80240CB4 8EA20000 */ lw $v0, ($s5) -/* 97E788 80240CB8 2403F7FF */ addiu $v1, $zero, -0x801 -/* 97E78C 80240CBC 00431024 */ and $v0, $v0, $v1 -/* 97E790 80240CC0 2403FDFF */ addiu $v1, $zero, -0x201 -/* 97E794 80240CC4 00431024 */ and $v0, $v0, $v1 -/* 97E798 80240CC8 34420008 */ ori $v0, $v0, 8 -/* 97E79C 80240CCC AEA20000 */ sw $v0, ($s5) -/* 97E7A0 80240CD0 8E4200B0 */ lw $v0, 0xb0($s2) -/* 97E7A4 80240CD4 34420018 */ ori $v0, $v0, 0x18 -/* 97E7A8 80240CD8 AE4200B0 */ sw $v0, 0xb0($s2) -/* 97E7AC 80240CDC 8E420000 */ lw $v0, ($s2) -/* 97E7B0 80240CE0 3C034000 */ lui $v1, 0x4000 -/* 97E7B4 80240CE4 00431024 */ and $v0, $v0, $v1 -/* 97E7B8 80240CE8 10400007 */ beqz $v0, .L80240D08 -/* 97E7BC 80240CEC 3C03BFFF */ lui $v1, 0xbfff -/* 97E7C0 80240CF0 2402000C */ addiu $v0, $zero, 0xc -/* 97E7C4 80240CF4 AE620070 */ sw $v0, 0x70($s3) -/* 97E7C8 80240CF8 8E420000 */ lw $v0, ($s2) -/* 97E7CC 80240CFC 3463FFFF */ ori $v1, $v1, 0xffff -/* 97E7D0 80240D00 00431024 */ and $v0, $v0, $v1 -/* 97E7D4 80240D04 AE420000 */ sw $v0, ($s2) -.L80240D08: -/* 97E7D8 80240D08 8E4300B0 */ lw $v1, 0xb0($s2) -/* 97E7DC 80240D0C 30620004 */ andi $v0, $v1, 4 -/* 97E7E0 80240D10 10400007 */ beqz $v0, .L80240D30 -/* 97E7E4 80240D14 00000000 */ nop -/* 97E7E8 80240D18 824200B4 */ lb $v0, 0xb4($s2) -/* 97E7EC 80240D1C 14400034 */ bnez $v0, .L80240DF0 -/* 97E7F0 80240D20 0000102D */ daddu $v0, $zero, $zero -/* 97E7F4 80240D24 2402FFFB */ addiu $v0, $zero, -5 -/* 97E7F8 80240D28 00621024 */ and $v0, $v1, $v0 -/* 97E7FC 80240D2C AE4200B0 */ sw $v0, 0xb0($s2) -.L80240D30: -/* 97E800 80240D30 8E630070 */ lw $v1, 0x70($s3) -/* 97E804 80240D34 2C62000F */ sltiu $v0, $v1, 0xf -/* 97E808 80240D38 1040002C */ beqz $v0, .L80240DEC -/* 97E80C 80240D3C 00031080 */ sll $v0, $v1, 2 -/* 97E810 80240D40 3C018024 */ lui $at, 0x8024 -/* 97E814 80240D44 00220821 */ addu $at, $at, $v0 -/* 97E818 80240D48 8C222EB8 */ lw $v0, 0x2eb8($at) -/* 97E81C 80240D4C 00400008 */ jr $v0 -/* 97E820 80240D50 00000000 */ nop -/* 97E824 80240D54 0260202D */ daddu $a0, $s3, $zero -/* 97E828 80240D58 0280282D */ daddu $a1, $s4, $zero -/* 97E82C 80240D5C 0C090000 */ jal func_80240000 -/* 97E830 80240D60 0200302D */ daddu $a2, $s0, $zero -/* 97E834 80240D64 0260202D */ daddu $a0, $s3, $zero -/* 97E838 80240D68 0280282D */ daddu $a1, $s4, $zero -/* 97E83C 80240D6C 0C09008C */ jal func_80240230 -/* 97E840 80240D70 0200302D */ daddu $a2, $s0, $zero -/* 97E844 80240D74 0809037C */ j .L80240DF0 -/* 97E848 80240D78 0000102D */ daddu $v0, $zero, $zero -/* 97E84C 80240D7C 0260202D */ daddu $a0, $s3, $zero -/* 97E850 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 97E854 80240D84 0C09015A */ jal func_80240568 -/* 97E858 80240D88 0200302D */ daddu $a2, $s0, $zero -/* 97E85C 80240D8C 8E630070 */ lw $v1, 0x70($s3) -/* 97E860 80240D90 24020003 */ addiu $v0, $zero, 3 -/* 97E864 80240D94 14620016 */ bne $v1, $v0, .L80240DF0 -/* 97E868 80240D98 0000102D */ daddu $v0, $zero, $zero -/* 97E86C 80240D9C 0260202D */ daddu $a0, $s3, $zero -/* 97E870 80240DA0 0280282D */ daddu $a1, $s4, $zero -/* 97E874 80240DA4 0C09018A */ jal func_80240628 -/* 97E878 80240DA8 0200302D */ daddu $a2, $s0, $zero -/* 97E87C 80240DAC 0809037C */ j .L80240DF0 -/* 97E880 80240DB0 0000102D */ daddu $v0, $zero, $zero -/* 97E884 80240DB4 0260202D */ daddu $a0, $s3, $zero -/* 97E888 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* 97E88C 80240DBC 0C0901F3 */ jal func_802407CC -/* 97E890 80240DC0 0200302D */ daddu $a2, $s0, $zero -/* 97E894 80240DC4 0260202D */ daddu $a0, $s3, $zero -/* 97E898 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* 97E89C 80240DCC 0C09022B */ jal func_802408AC -/* 97E8A0 80240DD0 0200302D */ daddu $a2, $s0, $zero -/* 97E8A4 80240DD4 0809037C */ j .L80240DF0 -/* 97E8A8 80240DD8 0000102D */ daddu $v0, $zero, $zero -/* 97E8AC 80240DDC 0260202D */ daddu $a0, $s3, $zero -/* 97E8B0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 97E8B4 80240DE4 0C0902EB */ jal func_80240BAC -/* 97E8B8 80240DE8 0200302D */ daddu $a2, $s0, $zero -.L80240DEC: -/* 97E8BC 80240DEC 0000102D */ daddu $v0, $zero, $zero -.L80240DF0: -/* 97E8C0 80240DF0 8FBF0048 */ lw $ra, 0x48($sp) -/* 97E8C4 80240DF4 8FB50044 */ lw $s5, 0x44($sp) -/* 97E8C8 80240DF8 8FB40040 */ lw $s4, 0x40($sp) -/* 97E8CC 80240DFC 8FB3003C */ lw $s3, 0x3c($sp) -/* 97E8D0 80240E00 8FB20038 */ lw $s2, 0x38($sp) -/* 97E8D4 80240E04 8FB10034 */ lw $s1, 0x34($sp) -/* 97E8D8 80240E08 8FB00030 */ lw $s0, 0x30($sp) -/* 97E8DC 80240E0C 03E00008 */ jr $ra -/* 97E8E0 80240E10 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_isk/isk_05/func_80240EA8_97DAD0.s b/asm/nonmatchings/world/area_isk/isk_05/func_80240EA8_97DAD0.s deleted file mode 100644 index 0e6f3eb980..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/func_80240EA8_97DAD0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EA8_97E978 -/* 97E978 80240EA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 97E97C 80240EAC AFB00010 */ sw $s0, 0x10($sp) -/* 97E980 80240EB0 0080802D */ daddu $s0, $a0, $zero -/* 97E984 80240EB4 AFBF001C */ sw $ra, 0x1c($sp) -/* 97E988 80240EB8 AFB20018 */ sw $s2, 0x18($sp) -/* 97E98C 80240EBC AFB10014 */ sw $s1, 0x14($sp) -/* 97E990 80240EC0 8E020148 */ lw $v0, 0x148($s0) -/* 97E994 80240EC4 00A0882D */ daddu $s1, $a1, $zero -/* 97E998 80240EC8 84440008 */ lh $a0, 8($v0) -/* 97E99C 80240ECC 0C00EABB */ jal get_npc_unsafe -/* 97E9A0 80240ED0 00C0902D */ daddu $s2, $a2, $zero -/* 97E9A4 80240ED4 0200202D */ daddu $a0, $s0, $zero -/* 97E9A8 80240ED8 0040802D */ daddu $s0, $v0, $zero -/* 97E9AC 80240EDC 0220282D */ daddu $a1, $s1, $zero -/* 97E9B0 80240EE0 0C0127DF */ jal func_80049F7C -/* 97E9B4 80240EE4 0240302D */ daddu $a2, $s2, $zero -/* 97E9B8 80240EE8 0C00A67F */ jal rand_int -/* 97E9BC 80240EEC 24040005 */ addiu $a0, $zero, 5 -/* 97E9C0 80240EF0 3C014014 */ lui $at, 0x4014 -/* 97E9C4 80240EF4 44811800 */ mtc1 $at, $f3 -/* 97E9C8 80240EF8 44801000 */ mtc1 $zero, $f2 -/* 97E9CC 80240EFC 44820000 */ mtc1 $v0, $f0 -/* 97E9D0 80240F00 00000000 */ nop -/* 97E9D4 80240F04 46800021 */ cvt.d.w $f0, $f0 -/* 97E9D8 80240F08 46220000 */ add.d $f0, $f0, $f2 -/* 97E9DC 80240F0C 3C013FC0 */ lui $at, 0x3fc0 -/* 97E9E0 80240F10 44811000 */ mtc1 $at, $f2 -/* 97E9E4 80240F14 00000000 */ nop -/* 97E9E8 80240F18 E6020014 */ swc1 $f2, 0x14($s0) -/* 97E9EC 80240F1C 46200020 */ cvt.s.d $f0, $f0 -/* 97E9F0 80240F20 E600001C */ swc1 $f0, 0x1c($s0) -/* 97E9F4 80240F24 8FBF001C */ lw $ra, 0x1c($sp) -/* 97E9F8 80240F28 8FB20018 */ lw $s2, 0x18($sp) -/* 97E9FC 80240F2C 8FB10014 */ lw $s1, 0x14($sp) -/* 97EA00 80240F30 8FB00010 */ lw $s0, 0x10($sp) -/* 97EA04 80240F34 03E00008 */ jr $ra -/* 97EA08 80240F38 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_05/func_80241DF8_97DAD0.s b/asm/nonmatchings/world/area_isk/isk_05/func_80241DF8_97DAD0.s deleted file mode 100644 index 65a55df53c..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/func_80241DF8_97DAD0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DF8_97F8C8 -/* 97F8C8 80241DF8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 97F8CC 80241DFC AFBF0010 */ sw $ra, 0x10($sp) -/* 97F8D0 80241E00 8C82000C */ lw $v0, 0xc($a0) -/* 97F8D4 80241E04 0C0B1EAF */ jal get_variable -/* 97F8D8 80241E08 8C450000 */ lw $a1, ($v0) -/* 97F8DC 80241E0C 8FBF0010 */ lw $ra, 0x10($sp) -/* 97F8E0 80241E10 3C018024 */ lui $at, 0x8024 -/* 97F8E4 80241E14 AC22264C */ sw $v0, 0x264c($at) -/* 97F8E8 80241E18 24020002 */ addiu $v0, $zero, 2 -/* 97F8EC 80241E1C 03E00008 */ jr $ra -/* 97F8F0 80241E20 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_07/func_802400B0_982440.s b/asm/nonmatchings/world/area_isk/isk_07/func_802400B0_982440.s deleted file mode 100644 index 54c773bcca..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_07/func_802400B0_982440.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B0_9824F0 -/* 9824F0 802400B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9824F4 802400B4 AFBF0010 */ sw $ra, 0x10($sp) -/* 9824F8 802400B8 0C04417A */ jal get_entity_by_index -/* 9824FC 802400BC 8C840084 */ lw $a0, 0x84($a0) -/* 982500 802400C0 0040182D */ daddu $v1, $v0, $zero -/* 982504 802400C4 8C640000 */ lw $a0, ($v1) -/* 982508 802400C8 3C050010 */ lui $a1, 0x10 -/* 98250C 802400CC 00852025 */ or $a0, $a0, $a1 -/* 982510 802400D0 AC640000 */ sw $a0, ($v1) -/* 982514 802400D4 8FBF0010 */ lw $ra, 0x10($sp) -/* 982518 802400D8 24020002 */ addiu $v0, $zero, 2 -/* 98251C 802400DC 03E00008 */ jr $ra -/* 982520 802400E0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 982524 802400E4 00000000 */ nop -/* 982528 802400E8 00000000 */ nop -/* 98252C 802400EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_07/func_802400F0_982440.s b/asm/nonmatchings/world/area_isk/isk_07/func_802400F0_982440.s deleted file mode 100644 index 75477f499c..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_07/func_802400F0_982440.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_982530 -/* 982530 802400F0 3C028016 */ lui $v0, 0x8016 -/* 982534 802400F4 8442A552 */ lh $v0, -0x5aae($v0) -/* 982538 802400F8 38420025 */ xori $v0, $v0, 0x25 -/* 98253C 802400FC 0002102B */ sltu $v0, $zero, $v0 -/* 982540 80240100 03E00008 */ jr $ra -/* 982544 80240104 00021040 */ sll $v0, $v0, 1 -/* 982548 80240108 00000000 */ nop -/* 98254C 8024010C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_08/func_802401B0_984E30.s b/asm/nonmatchings/world/area_isk/isk_08/func_802401B0_984E30.s deleted file mode 100644 index c562ad6df5..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_08/func_802401B0_984E30.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_984FE0 -/* 984FE0 802401B0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 984FE4 802401B4 AFB3003C */ sw $s3, 0x3c($sp) -/* 984FE8 802401B8 0080982D */ daddu $s3, $a0, $zero -/* 984FEC 802401BC AFBF0040 */ sw $ra, 0x40($sp) -/* 984FF0 802401C0 AFB20038 */ sw $s2, 0x38($sp) -/* 984FF4 802401C4 AFB10034 */ sw $s1, 0x34($sp) -/* 984FF8 802401C8 AFB00030 */ sw $s0, 0x30($sp) -/* 984FFC 802401CC 8E710148 */ lw $s1, 0x148($s3) -/* 985000 802401D0 0C00EABB */ jal get_npc_unsafe -/* 985004 802401D4 86240008 */ lh $a0, 8($s1) -/* 985008 802401D8 0040802D */ daddu $s0, $v0, $zero -/* 98500C 802401DC 8E22007C */ lw $v0, 0x7c($s1) -/* 985010 802401E0 8603008E */ lh $v1, 0x8e($s0) -/* 985014 802401E4 2442FFFF */ addiu $v0, $v0, -1 -/* 985018 802401E8 14620012 */ bne $v1, $v0, .L80240234 -/* 98501C 802401EC 00000000 */ nop -/* 985020 802401F0 C6000038 */ lwc1 $f0, 0x38($s0) -/* 985024 802401F4 4600020D */ trunc.w.s $f8, $f0 -/* 985028 802401F8 44024000 */ mfc1 $v0, $f8 -/* 98502C 802401FC 00000000 */ nop -/* 985030 80240200 A6220010 */ sh $v0, 0x10($s1) -/* 985034 80240204 C600003C */ lwc1 $f0, 0x3c($s0) -/* 985038 80240208 4600020D */ trunc.w.s $f8, $f0 -/* 98503C 8024020C 44024000 */ mfc1 $v0, $f8 -/* 985040 80240210 00000000 */ nop -/* 985044 80240214 A6220012 */ sh $v0, 0x12($s1) -/* 985048 80240218 C6000040 */ lwc1 $f0, 0x40($s0) -/* 98504C 8024021C 24020001 */ addiu $v0, $zero, 1 -/* 985050 80240220 A2220007 */ sb $v0, 7($s1) -/* 985054 80240224 4600020D */ trunc.w.s $f8, $f0 -/* 985058 80240228 44024000 */ mfc1 $v0, $f8 -/* 98505C 8024022C 00000000 */ nop -/* 985060 80240230 A6220014 */ sh $v0, 0x14($s1) -.L80240234: -/* 985064 80240234 C6000038 */ lwc1 $f0, 0x38($s0) -/* 985068 80240238 C602003C */ lwc1 $f2, 0x3c($s0) -/* 98506C 8024023C C6040040 */ lwc1 $f4, 0x40($s0) -/* 985070 80240240 C6060018 */ lwc1 $f6, 0x18($s0) -/* 985074 80240244 E7A00020 */ swc1 $f0, 0x20($sp) -/* 985078 80240248 E7A20024 */ swc1 $f2, 0x24($sp) -/* 98507C 8024024C E7A40028 */ swc1 $f4, 0x28($sp) -/* 985080 80240250 E7A60010 */ swc1 $f6, 0x10($sp) -/* 985084 80240254 C600000C */ lwc1 $f0, 0xc($s0) -/* 985088 80240258 E7A00014 */ swc1 $f0, 0x14($sp) -/* 98508C 8024025C 860200A8 */ lh $v0, 0xa8($s0) -/* 985090 80240260 27A50020 */ addiu $a1, $sp, 0x20 -/* 985094 80240264 44820000 */ mtc1 $v0, $f0 -/* 985098 80240268 00000000 */ nop -/* 98509C 8024026C 46800020 */ cvt.s.w $f0, $f0 -/* 9850A0 80240270 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9850A4 80240274 860200A6 */ lh $v0, 0xa6($s0) -/* 9850A8 80240278 27A60024 */ addiu $a2, $sp, 0x24 -/* 9850AC 8024027C 44820000 */ mtc1 $v0, $f0 -/* 9850B0 80240280 00000000 */ nop -/* 9850B4 80240284 46800020 */ cvt.s.w $f0, $f0 -/* 9850B8 80240288 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 9850BC 8024028C 8E040080 */ lw $a0, 0x80($s0) -/* 9850C0 80240290 0C037711 */ jal func_800DDC44 -/* 9850C4 80240294 27A70028 */ addiu $a3, $sp, 0x28 -/* 9850C8 80240298 0040902D */ daddu $s2, $v0, $zero -/* 9850CC 8024029C 16400005 */ bnez $s2, .L802402B4 -/* 9850D0 802402A0 00000000 */ nop -/* 9850D4 802402A4 8E050018 */ lw $a1, 0x18($s0) -/* 9850D8 802402A8 8E06000C */ lw $a2, 0xc($s0) -/* 9850DC 802402AC 0C00EA95 */ jal npc_move_heading -/* 9850E0 802402B0 0200202D */ daddu $a0, $s0, $zero -.L802402B4: -/* 9850E4 802402B4 8602008E */ lh $v0, 0x8e($s0) -/* 9850E8 802402B8 9603008E */ lhu $v1, 0x8e($s0) -/* 9850EC 802402BC 18400007 */ blez $v0, .L802402DC -/* 9850F0 802402C0 2462FFFF */ addiu $v0, $v1, -1 -/* 9850F4 802402C4 A602008E */ sh $v0, 0x8e($s0) -/* 9850F8 802402C8 00021400 */ sll $v0, $v0, 0x10 -/* 9850FC 802402CC 18400003 */ blez $v0, .L802402DC -/* 985100 802402D0 00000000 */ nop -/* 985104 802402D4 12400008 */ beqz $s2, .L802402F8 -/* 985108 802402D8 00000000 */ nop -.L802402DC: -/* 98510C 802402DC 8E2200CC */ lw $v0, 0xcc($s1) -/* 985110 802402E0 A2200007 */ sb $zero, 7($s1) -/* 985114 802402E4 8C420028 */ lw $v0, 0x28($v0) -/* 985118 802402E8 A600008E */ sh $zero, 0x8e($s0) -/* 98511C 802402EC AE020028 */ sw $v0, 0x28($s0) -/* 985120 802402F0 2402000F */ addiu $v0, $zero, 0xf -/* 985124 802402F4 AE620070 */ sw $v0, 0x70($s3) -.L802402F8: -/* 985128 802402F8 8FBF0040 */ lw $ra, 0x40($sp) -/* 98512C 802402FC 8FB3003C */ lw $s3, 0x3c($sp) -/* 985130 80240300 8FB20038 */ lw $s2, 0x38($sp) -/* 985134 80240304 8FB10034 */ lw $s1, 0x34($sp) -/* 985138 80240308 8FB00030 */ lw $s0, 0x30($sp) -/* 98513C 8024030C 03E00008 */ jr $ra -/* 985140 80240310 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_isk/isk_08/func_80240314_984E30.s b/asm/nonmatchings/world/area_isk/isk_08/func_80240314_984E30.s deleted file mode 100644 index dc32c6c79b..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_08/func_80240314_984E30.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240314_985144 -/* 985144 80240314 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 985148 80240318 AFB10014 */ sw $s1, 0x14($sp) -/* 98514C 8024031C 0080882D */ daddu $s1, $a0, $zero -/* 985150 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* 985154 80240324 AFB00010 */ sw $s0, 0x10($sp) -/* 985158 80240328 8E300148 */ lw $s0, 0x148($s1) -/* 98515C 8024032C 0C00EABB */ jal get_npc_unsafe -/* 985160 80240330 86040008 */ lh $a0, 8($s0) -/* 985164 80240334 0040202D */ daddu $a0, $v0, $zero -/* 985168 80240338 9482008E */ lhu $v0, 0x8e($a0) -/* 98516C 8024033C 24030003 */ addiu $v1, $zero, 3 -/* 985170 80240340 24420001 */ addiu $v0, $v0, 1 -/* 985174 80240344 A482008E */ sh $v0, 0x8e($a0) -/* 985178 80240348 00021400 */ sll $v0, $v0, 0x10 -/* 98517C 8024034C 00021403 */ sra $v0, $v0, 0x10 -/* 985180 80240350 14430003 */ bne $v0, $v1, .L80240360 -/* 985184 80240354 00000000 */ nop -/* 985188 80240358 96020086 */ lhu $v0, 0x86($s0) -/* 98518C 8024035C A48200A8 */ sh $v0, 0xa8($a0) -.L80240360: -/* 985190 80240360 8482008E */ lh $v0, 0x8e($a0) -/* 985194 80240364 8E030080 */ lw $v1, 0x80($s0) -/* 985198 80240368 0043102A */ slt $v0, $v0, $v1 -/* 98519C 8024036C 14400004 */ bnez $v0, .L80240380 -/* 9851A0 80240370 00000000 */ nop -/* 9851A4 80240374 96020086 */ lhu $v0, 0x86($s0) -/* 9851A8 80240378 A48200A8 */ sh $v0, 0xa8($a0) -/* 9851AC 8024037C AE200070 */ sw $zero, 0x70($s1) -.L80240380: -/* 9851B0 80240380 8FBF0018 */ lw $ra, 0x18($sp) -/* 9851B4 80240384 8FB10014 */ lw $s1, 0x14($sp) -/* 9851B8 80240388 8FB00010 */ lw $s0, 0x10($sp) -/* 9851BC 8024038C 03E00008 */ jr $ra -/* 9851C0 80240390 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_09/func_802400B4_9864E0.s b/asm/nonmatchings/world/area_isk/isk_09/func_802400B4_9864E0.s deleted file mode 100644 index 5039480e02..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_09/func_802400B4_9864E0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_986594 -/* 986594 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 986598 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* 98659C 802400BC 0080802D */ daddu $s0, $a0, $zero -/* 9865A0 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9865A4 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* 9865A8 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* 9865AC 802400CC 8C510000 */ lw $s1, ($v0) -/* 9865B0 802400D0 0C0B1EAF */ jal get_variable -/* 9865B4 802400D4 0220282D */ daddu $a1, $s1, $zero -/* 9865B8 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* 9865BC 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* 9865C0 802400E0 0200202D */ daddu $a0, $s0, $zero -/* 9865C4 802400E4 00431024 */ and $v0, $v0, $v1 -/* 9865C8 802400E8 00021140 */ sll $v0, $v0, 5 -/* 9865CC 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* 9865D0 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* 9865D4 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 9865D8 802400F8 0C0B2026 */ jal set_variable -/* 9865DC 802400FC 0220282D */ daddu $a1, $s1, $zero -/* 9865E0 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* 9865E4 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* 9865E8 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* 9865EC 8024010C 24020002 */ addiu $v0, $zero, 2 -/* 9865F0 80240110 03E00008 */ jr $ra -/* 9865F4 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_09/func_80240118_9864E0.s b/asm/nonmatchings/world/area_isk/isk_09/func_80240118_9864E0.s deleted file mode 100644 index 467af68977..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_09/func_80240118_9864E0.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_isk/isk_09/func_80240268_9864E0.s b/asm/nonmatchings/world/area_isk/isk_09/func_80240268_9864E0.s deleted file mode 100644 index 71f2fc41b1..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_09/func_80240268_9864E0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_986748 -/* 986748 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 98674C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* 986750 80240270 0080802D */ daddu $s0, $a0, $zero -/* 986754 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* 986758 80240278 8E02000C */ lw $v0, 0xc($s0) -/* 98675C 8024027C 0C0B1EAF */ jal get_variable -/* 986760 80240280 8C450000 */ lw $a1, ($v0) -/* 986764 80240284 00021140 */ sll $v0, $v0, 5 -/* 986768 80240288 AE000084 */ sw $zero, 0x84($s0) -/* 98676C 8024028C 3C018008 */ lui $at, 0x8008 -/* 986770 80240290 00220821 */ addu $at, $at, $v0 -/* 986774 80240294 942278F8 */ lhu $v0, 0x78f8($at) -/* 986778 80240298 30420040 */ andi $v0, $v0, 0x40 -/* 98677C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* 986780 802402A0 24020001 */ addiu $v0, $zero, 1 -/* 986784 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* 986788 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* 98678C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* 986790 802402B0 24020002 */ addiu $v0, $zero, 2 -/* 986794 802402B4 03E00008 */ jr $ra -/* 986798 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_09/func_802402BC_9864E0.s b/asm/nonmatchings/world/area_isk/isk_09/func_802402BC_9864E0.s deleted file mode 100644 index 7663670515..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_09/func_802402BC_9864E0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402BC_98679C -/* 98679C 802402BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9867A0 802402C0 AFBF0010 */ sw $ra, 0x10($sp) -/* 9867A4 802402C4 0C04417A */ jal get_entity_by_index -/* 9867A8 802402C8 8C840084 */ lw $a0, 0x84($a0) -/* 9867AC 802402CC 8C440040 */ lw $a0, 0x40($v0) -/* 9867B0 802402D0 24030001 */ addiu $v1, $zero, 1 -/* 9867B4 802402D4 A0830030 */ sb $v1, 0x30($a0) -/* 9867B8 802402D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 9867BC 802402DC 24020002 */ addiu $v0, $zero, 2 -/* 9867C0 802402E0 03E00008 */ jr $ra -/* 9867C4 802402E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9867C8 802402E8 00000000 */ nop -/* 9867CC 802402EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_09/func_802402F0_9864E0.s b/asm/nonmatchings/world/area_isk/isk_09/func_802402F0_9864E0.s deleted file mode 100644 index d0350701d2..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_09/func_802402F0_9864E0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_9867D0 -/* 9867D0 802402F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9867D4 802402F4 AFBF0010 */ sw $ra, 0x10($sp) -/* 9867D8 802402F8 8C82000C */ lw $v0, 0xc($a0) -/* 9867DC 802402FC 0C0B1EAF */ jal get_variable -/* 9867E0 80240300 8C450000 */ lw $a1, ($v0) -/* 9867E4 80240304 3C038016 */ lui $v1, 0x8016 -/* 9867E8 80240308 8463A552 */ lh $v1, -0x5aae($v1) -/* 9867EC 8024030C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9867F0 80240310 00621826 */ xor $v1, $v1, $v0 -/* 9867F4 80240314 0003182B */ sltu $v1, $zero, $v1 -/* 9867F8 80240318 00031040 */ sll $v0, $v1, 1 -/* 9867FC 8024031C 03E00008 */ jr $ra -/* 986800 80240320 27BD0018 */ addiu $sp, $sp, 0x18 -/* 986804 80240324 00000000 */ nop -/* 986808 80240328 00000000 */ nop -/* 98680C 8024032C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_10/func_80240120_988B60.s b/asm/nonmatchings/world/area_isk/isk_10/func_80240120_988B60.s deleted file mode 100644 index dc3311e58e..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/func_80240120_988B60.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240120_988C80 -/* 988C80 80240120 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 988C84 80240124 AFB3001C */ sw $s3, 0x1c($sp) -/* 988C88 80240128 0080982D */ daddu $s3, $a0, $zero -/* 988C8C 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* 988C90 80240130 24100001 */ addiu $s0, $zero, 1 -/* 988C94 80240134 AFB40020 */ sw $s4, 0x20($sp) -/* 988C98 80240138 2414FFFF */ addiu $s4, $zero, -1 -/* 988C9C 8024013C AFB50024 */ sw $s5, 0x24($sp) -/* 988CA0 80240140 0200A82D */ daddu $s5, $s0, $zero -/* 988CA4 80240144 AFB10014 */ sw $s1, 0x14($sp) -/* 988CA8 80240148 3C118011 */ lui $s1, 0x8011 -/* 988CAC 8024014C 2631F298 */ addiu $s1, $s1, -0xd68 -/* 988CB0 80240150 AFBF0028 */ sw $ra, 0x28($sp) -/* 988CB4 80240154 AFB20018 */ sw $s2, 0x18($sp) -/* 988CB8 80240158 8E6200B4 */ lw $v0, 0xb4($s3) -/* 988CBC 8024015C 0280182D */ daddu $v1, $s4, $zero -/* 988CC0 80240160 AE630084 */ sw $v1, 0x84($s3) -/* 988CC4 80240164 00021027 */ nor $v0, $zero, $v0 -/* 988CC8 80240168 000217C2 */ srl $v0, $v0, 0x1f -/* 988CCC 8024016C 00029400 */ sll $s2, $v0, 0x10 -.L80240170: -/* 988CD0 80240170 92220014 */ lbu $v0, 0x14($s1) -/* 988CD4 80240174 50400008 */ beql $v0, $zero, .L80240198 -/* 988CD8 80240178 26100001 */ addiu $s0, $s0, 1 -/* 988CDC 8024017C 0200202D */ daddu $a0, $s0, $zero -/* 988CE0 80240180 0C090035 */ jal func_802400D4 -/* 988CE4 80240184 00122C03 */ sra $a1, $s2, 0x10 -/* 988CE8 80240188 10540003 */ beq $v0, $s4, .L80240198 -/* 988CEC 8024018C 26100001 */ addiu $s0, $s0, 1 -/* 988CF0 80240190 08090069 */ j .L802401A4 -/* 988CF4 80240194 AE750084 */ sw $s5, 0x84($s3) -.L80240198: -/* 988CF8 80240198 2A02000C */ slti $v0, $s0, 0xc -/* 988CFC 8024019C 1440FFF4 */ bnez $v0, .L80240170 -/* 988D00 802401A0 26310008 */ addiu $s1, $s1, 8 -.L802401A4: -/* 988D04 802401A4 8FBF0028 */ lw $ra, 0x28($sp) -/* 988D08 802401A8 8FB50024 */ lw $s5, 0x24($sp) -/* 988D0C 802401AC 8FB40020 */ lw $s4, 0x20($sp) -/* 988D10 802401B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 988D14 802401B4 8FB20018 */ lw $s2, 0x18($sp) -/* 988D18 802401B8 8FB10014 */ lw $s1, 0x14($sp) -/* 988D1C 802401BC 8FB00010 */ lw $s0, 0x10($sp) -/* 988D20 802401C0 24020002 */ addiu $v0, $zero, 2 -/* 988D24 802401C4 03E00008 */ jr $ra -/* 988D28 802401C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_isk/isk_10/func_80240480_988B60.s b/asm/nonmatchings/world/area_isk/isk_10/func_80240480_988B60.s deleted file mode 100644 index d5a4f55050..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/func_80240480_988B60.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240480_988FE0 -/* 988FE0 80240480 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 988FE4 80240484 AFB1001C */ sw $s1, 0x1c($sp) -/* 988FE8 80240488 0080882D */ daddu $s1, $a0, $zero -/* 988FEC 8024048C AFBF0020 */ sw $ra, 0x20($sp) -/* 988FF0 80240490 AFB00018 */ sw $s0, 0x18($sp) -/* 988FF4 80240494 8E30000C */ lw $s0, 0xc($s1) -/* 988FF8 80240498 8E050000 */ lw $a1, ($s0) -/* 988FFC 8024049C 0C0B1EAF */ jal get_variable -/* 989000 802404A0 26100004 */ addiu $s0, $s0, 4 -/* 989004 802404A4 0C04417A */ jal get_entity_by_index -/* 989008 802404A8 0040202D */ daddu $a0, $v0, $zero -/* 98900C 802404AC 8E100000 */ lw $s0, ($s0) -/* 989010 802404B0 C444004C */ lwc1 $f4, 0x4c($v0) -/* 989014 802404B4 3C014148 */ lui $at, 0x4148 -/* 989018 802404B8 44810000 */ mtc1 $at, $f0 -/* 98901C 802404BC 3C013F33 */ lui $at, 0x3f33 -/* 989020 802404C0 34213333 */ ori $at, $at, 0x3333 -/* 989024 802404C4 44811000 */ mtc1 $at, $f2 -/* 989028 802404C8 AFA00014 */ sw $zero, 0x14($sp) -/* 98902C 802404CC 46002100 */ add.s $f4, $f4, $f0 -/* 989030 802404D0 E7A20010 */ swc1 $f2, 0x10($sp) -/* 989034 802404D4 8C450048 */ lw $a1, 0x48($v0) -/* 989038 802404D8 8C470050 */ lw $a3, 0x50($v0) -/* 98903C 802404DC 44062000 */ mfc1 $a2, $f4 -/* 989040 802404E0 0C01C5D4 */ jal func_80071750 -/* 989044 802404E4 0000202D */ daddu $a0, $zero, $zero -/* 989048 802404E8 0220202D */ daddu $a0, $s1, $zero -/* 98904C 802404EC 0200282D */ daddu $a1, $s0, $zero -/* 989050 802404F0 0C0B2026 */ jal set_variable -/* 989054 802404F4 0040302D */ daddu $a2, $v0, $zero -/* 989058 802404F8 8FBF0020 */ lw $ra, 0x20($sp) -/* 98905C 802404FC 8FB1001C */ lw $s1, 0x1c($sp) -/* 989060 80240500 8FB00018 */ lw $s0, 0x18($sp) -/* 989064 80240504 24020002 */ addiu $v0, $zero, 2 -/* 989068 80240508 03E00008 */ jr $ra -/* 98906C 8024050C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_10/func_80240544_988B60.s b/asm/nonmatchings/world/area_isk/isk_10/func_80240544_988B60.s deleted file mode 100644 index f02632554c..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/func_80240544_988B60.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240544_9890A4 -/* 9890A4 80240544 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9890A8 80240548 AFBF0018 */ sw $ra, 0x18($sp) -/* 9890AC 8024054C 8C82000C */ lw $v0, 0xc($a0) -/* 9890B0 80240550 0C0B1EAF */ jal get_variable -/* 9890B4 80240554 8C450000 */ lw $a1, ($v0) -/* 9890B8 80240558 0C04417A */ jal get_entity_by_index -/* 9890BC 8024055C 0040202D */ daddu $a0, $v0, $zero -/* 9890C0 80240560 3C013F80 */ lui $at, 0x3f80 -/* 9890C4 80240564 44810000 */ mtc1 $at, $f0 -/* 9890C8 80240568 C442004C */ lwc1 $f2, 0x4c($v0) -/* 9890CC 8024056C E7A00010 */ swc1 $f0, 0x10($sp) -/* 9890D0 80240570 3C014148 */ lui $at, 0x4148 -/* 9890D4 80240574 44810000 */ mtc1 $at, $f0 -/* 9890D8 80240578 2403004B */ addiu $v1, $zero, 0x4b -/* 9890DC 8024057C AFA30014 */ sw $v1, 0x14($sp) -/* 9890E0 80240580 46001080 */ add.s $f2, $f2, $f0 -/* 9890E4 80240584 8C450048 */ lw $a1, 0x48($v0) -/* 9890E8 80240588 8C470050 */ lw $a3, 0x50($v0) -/* 9890EC 8024058C 44061000 */ mfc1 $a2, $f2 -/* 9890F0 80240590 0C01C2EC */ jal func_80070BB0 -/* 9890F4 80240594 24040004 */ addiu $a0, $zero, 4 -/* 9890F8 80240598 8FBF0018 */ lw $ra, 0x18($sp) -/* 9890FC 8024059C 24020002 */ addiu $v0, $zero, 2 -/* 989100 802405A0 03E00008 */ jr $ra -/* 989104 802405A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_10/func_802405A8_988B60.s b/asm/nonmatchings/world/area_isk/isk_10/func_802405A8_988B60.s deleted file mode 100644 index a389ebe9a9..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/func_802405A8_988B60.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A8_989108 -/* 989108 802405A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 98910C 802405AC AFBF0018 */ sw $ra, 0x18($sp) -/* 989110 802405B0 0C00EAD2 */ jal get_npc_safe -/* 989114 802405B4 2404FFFC */ addiu $a0, $zero, -4 -/* 989118 802405B8 C444003C */ lwc1 $f4, 0x3c($v0) -/* 98911C 802405BC 3C014148 */ lui $at, 0x4148 -/* 989120 802405C0 44811000 */ mtc1 $at, $f2 -/* 989124 802405C4 3C013F80 */ lui $at, 0x3f80 -/* 989128 802405C8 44810000 */ mtc1 $at, $f0 -/* 98912C 802405CC 2403001E */ addiu $v1, $zero, 0x1e -/* 989130 802405D0 AFA30014 */ sw $v1, 0x14($sp) -/* 989134 802405D4 46022100 */ add.s $f4, $f4, $f2 -/* 989138 802405D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 98913C 802405DC 8C450038 */ lw $a1, 0x38($v0) -/* 989140 802405E0 8C470040 */ lw $a3, 0x40($v0) -/* 989144 802405E4 44062000 */ mfc1 $a2, $f4 -/* 989148 802405E8 0C01C2EC */ jal func_80070BB0 -/* 98914C 802405EC 24040009 */ addiu $a0, $zero, 9 -/* 989150 802405F0 8FBF0018 */ lw $ra, 0x18($sp) -/* 989154 802405F4 24020002 */ addiu $v0, $zero, 2 -/* 989158 802405F8 03E00008 */ jr $ra -/* 98915C 802405FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_10/func_80240CC0_988B60.s b/asm/nonmatchings/world/area_isk/isk_10/func_80240CC0_988B60.s deleted file mode 100644 index 5327bc50e9..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/func_80240CC0_988B60.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_989820 -/* 989820 80240CC0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 989824 80240CC4 AFBF0018 */ sw $ra, 0x18($sp) -/* 989828 80240CC8 0C00EAD2 */ jal get_npc_safe -/* 98982C 80240CCC 2404FFFC */ addiu $a0, $zero, -4 -/* 989830 80240CD0 3C0141F0 */ lui $at, 0x41f0 -/* 989834 80240CD4 44810000 */ mtc1 $at, $f0 -/* 989838 80240CD8 C442003C */ lwc1 $f2, 0x3c($v0) -/* 98983C 80240CDC 46001080 */ add.s $f2, $f2, $f0 -/* 989840 80240CE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 989844 80240CE4 8C450038 */ lw $a1, 0x38($v0) -/* 989848 80240CE8 8C470040 */ lw $a3, 0x40($v0) -/* 98984C 80240CEC 44061000 */ mfc1 $a2, $f2 -/* 989850 80240CF0 0C01BFBC */ jal func_8006FEF0 -/* 989854 80240CF4 24040004 */ addiu $a0, $zero, 4 -/* 989858 80240CF8 8FBF0018 */ lw $ra, 0x18($sp) -/* 98985C 80240CFC 24020002 */ addiu $v0, $zero, 2 -/* 989860 80240D00 03E00008 */ jr $ra -/* 989864 80240D04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_10/func_80240D38_988B60.s b/asm/nonmatchings/world/area_isk/isk_10/func_80240D38_988B60.s deleted file mode 100644 index 8021cc8534..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/func_80240D38_988B60.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D38_989898 -/* 989898 80240D38 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 98989C 80240D3C 3C028011 */ lui $v0, 0x8011 -/* 9898A0 80240D40 8442EFE0 */ lh $v0, -0x1020($v0) -/* 9898A4 80240D44 3C018024 */ lui $at, 0x8024 -/* 9898A8 80240D48 D4201EA0 */ ldc1 $f0, 0x1ea0($at) -/* 9898AC 80240D4C 2406FFFF */ addiu $a2, $zero, -1 -/* 9898B0 80240D50 44821000 */ mtc1 $v0, $f2 -/* 9898B4 80240D54 00000000 */ nop -/* 9898B8 80240D58 468010A1 */ cvt.d.w $f2, $f2 -/* 9898BC 80240D5C 4622003C */ c.lt.d $f0, $f2 -/* 9898C0 80240D60 00000000 */ nop -/* 9898C4 80240D64 45000002 */ bc1f .L80240D70 -/* 9898C8 80240D68 AFBF0010 */ sw $ra, 0x10($sp) -/* 9898CC 80240D6C 0000302D */ daddu $a2, $zero, $zero -.L80240D70: -/* 9898D0 80240D70 3C018024 */ lui $at, 0x8024 -/* 9898D4 80240D74 D4201EA8 */ ldc1 $f0, 0x1ea8($at) -/* 9898D8 80240D78 4620103C */ c.lt.d $f2, $f0 -/* 9898DC 80240D7C 00000000 */ nop -/* 9898E0 80240D80 45030001 */ bc1tl .L80240D88 -/* 9898E4 80240D84 24060001 */ addiu $a2, $zero, 1 -.L80240D88: -/* 9898E8 80240D88 04C00004 */ bltz $a2, .L80240D9C -/* 9898EC 80240D8C 00000000 */ nop -/* 9898F0 80240D90 3C05FD05 */ lui $a1, 0xfd05 -/* 9898F4 80240D94 0C0B2026 */ jal set_variable -/* 9898F8 80240D98 34A50F89 */ ori $a1, $a1, 0xf89 -.L80240D9C: -/* 9898FC 80240D9C 8FBF0010 */ lw $ra, 0x10($sp) -/* 989900 80240DA0 0000102D */ daddu $v0, $zero, $zero -/* 989904 80240DA4 03E00008 */ jr $ra -/* 989908 80240DA8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 98990C 80240DAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_11/func_802400B0_98AA10.s b/asm/nonmatchings/world/area_isk/isk_11/func_802400B0_98AA10.s deleted file mode 100644 index 976ff01238..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_11/func_802400B0_98AA10.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B0_98AAC0 -/* 98AAC0 802400B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 98AAC4 802400B4 AFB10014 */ sw $s1, 0x14($sp) -/* 98AAC8 802400B8 0080882D */ daddu $s1, $a0, $zero -/* 98AACC 802400BC AFBF0018 */ sw $ra, 0x18($sp) -/* 98AAD0 802400C0 AFB00010 */ sw $s0, 0x10($sp) -/* 98AAD4 802400C4 8E30000C */ lw $s0, 0xc($s1) -/* 98AAD8 802400C8 8E050000 */ lw $a1, ($s0) -/* 98AADC 802400CC 0C0B1EAF */ jal get_variable -/* 98AAE0 802400D0 26100004 */ addiu $s0, $s0, 4 -/* 98AAE4 802400D4 3C03FFF0 */ lui $v1, 0xfff0 -/* 98AAE8 802400D8 3463FFFF */ ori $v1, $v1, 0xffff -/* 98AAEC 802400DC 00431024 */ and $v0, $v0, $v1 -/* 98AAF0 802400E0 00021140 */ sll $v0, $v0, 5 -/* 98AAF4 802400E4 8E050000 */ lw $a1, ($s0) -/* 98AAF8 802400E8 3C068008 */ lui $a2, %hi(gItemTable) -/* 98AAFC 802400EC 00C23021 */ addu $a2, $a2, $v0 -/* 98AB00 802400F0 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 98AB04 802400F4 0C0B2026 */ jal set_variable -/* 98AB08 802400F8 0220202D */ daddu $a0, $s1, $zero -/* 98AB0C 802400FC 8FBF0018 */ lw $ra, 0x18($sp) -/* 98AB10 80240100 8FB10014 */ lw $s1, 0x14($sp) -/* 98AB14 80240104 8FB00010 */ lw $s0, 0x10($sp) -/* 98AB18 80240108 24020002 */ addiu $v0, $zero, 2 -/* 98AB1C 8024010C 03E00008 */ jr $ra -/* 98AB20 80240110 27BD0020 */ addiu $sp, $sp, 0x20 -/* 98AB24 80240114 00000000 */ nop -/* 98AB28 80240118 00000000 */ nop -/* 98AB2C 8024011C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_11/func_80240120_98AA10.s b/asm/nonmatchings/world/area_isk/isk_11/func_80240120_98AA10.s deleted file mode 100644 index 34a913143e..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_11/func_80240120_98AA10.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240120_98AB30 -/* 98AB30 80240120 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 98AB34 80240124 AFBF0010 */ sw $ra, 0x10($sp) -/* 98AB38 80240128 0C04417A */ jal get_entity_by_index -/* 98AB3C 8024012C 8C840084 */ lw $a0, 0x84($a0) -/* 98AB40 80240130 0040182D */ daddu $v1, $v0, $zero -/* 98AB44 80240134 8C640000 */ lw $a0, ($v1) -/* 98AB48 80240138 3C050010 */ lui $a1, 0x10 -/* 98AB4C 8024013C 00852025 */ or $a0, $a0, $a1 -/* 98AB50 80240140 AC640000 */ sw $a0, ($v1) -/* 98AB54 80240144 8FBF0010 */ lw $ra, 0x10($sp) -/* 98AB58 80240148 24020002 */ addiu $v0, $zero, 2 -/* 98AB5C 8024014C 03E00008 */ jr $ra -/* 98AB60 80240150 27BD0018 */ addiu $sp, $sp, 0x18 -/* 98AB64 80240154 00000000 */ nop -/* 98AB68 80240158 00000000 */ nop -/* 98AB6C 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_13/func_80240230_98F7E0.s b/asm/nonmatchings/world/area_isk/isk_13/func_80240230_98F7E0.s deleted file mode 100644 index 17fd90daf4..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/func_80240230_98F7E0.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240230_98FA10 -/* 98FA10 80240230 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 98FA14 80240234 AFB3004C */ sw $s3, 0x4c($sp) -/* 98FA18 80240238 0080982D */ daddu $s3, $a0, $zero -/* 98FA1C 8024023C AFBF0054 */ sw $ra, 0x54($sp) -/* 98FA20 80240240 AFB40050 */ sw $s4, 0x50($sp) -/* 98FA24 80240244 AFB20048 */ sw $s2, 0x48($sp) -/* 98FA28 80240248 AFB10044 */ sw $s1, 0x44($sp) -/* 98FA2C 8024024C AFB00040 */ sw $s0, 0x40($sp) -/* 98FA30 80240250 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 98FA34 80240254 8E710148 */ lw $s1, 0x148($s3) -/* 98FA38 80240258 00A0A02D */ daddu $s4, $a1, $zero -/* 98FA3C 8024025C 86240008 */ lh $a0, 8($s1) -/* 98FA40 80240260 0C00EABB */ jal get_npc_unsafe -/* 98FA44 80240264 00C0902D */ daddu $s2, $a2, $zero -/* 98FA48 80240268 8E830014 */ lw $v1, 0x14($s4) -/* 98FA4C 8024026C 04600034 */ bltz $v1, .L80240340 -/* 98FA50 80240270 0040802D */ daddu $s0, $v0, $zero -/* 98FA54 80240274 8E620074 */ lw $v0, 0x74($s3) -/* 98FA58 80240278 1C400030 */ bgtz $v0, .L8024033C -/* 98FA5C 8024027C 2442FFFF */ addiu $v0, $v0, -1 -/* 98FA60 80240280 0240202D */ daddu $a0, $s2, $zero -/* 98FA64 80240284 AE630074 */ sw $v1, 0x74($s3) -/* 98FA68 80240288 AFA00010 */ sw $zero, 0x10($sp) -/* 98FA6C 8024028C 8E86000C */ lw $a2, 0xc($s4) -/* 98FA70 80240290 8E870010 */ lw $a3, 0x10($s4) -/* 98FA74 80240294 0C01242D */ jal func_800490B4 -/* 98FA78 80240298 0220282D */ daddu $a1, $s1, $zero -/* 98FA7C 8024029C 10400025 */ beqz $v0, .L80240334 -/* 98FA80 802402A0 0000202D */ daddu $a0, $zero, $zero -/* 98FA84 802402A4 0200282D */ daddu $a1, $s0, $zero -/* 98FA88 802402A8 0000302D */ daddu $a2, $zero, $zero -/* 98FA8C 802402AC 860300A8 */ lh $v1, 0xa8($s0) -/* 98FA90 802402B0 3C013F80 */ lui $at, 0x3f80 -/* 98FA94 802402B4 44810000 */ mtc1 $at, $f0 -/* 98FA98 802402B8 3C014000 */ lui $at, 0x4000 -/* 98FA9C 802402BC 44811000 */ mtc1 $at, $f2 -/* 98FAA0 802402C0 3C01C1A0 */ lui $at, 0xc1a0 -/* 98FAA4 802402C4 44812000 */ mtc1 $at, $f4 -/* 98FAA8 802402C8 2402000F */ addiu $v0, $zero, 0xf -/* 98FAAC 802402CC AFA2001C */ sw $v0, 0x1c($sp) -/* 98FAB0 802402D0 44835000 */ mtc1 $v1, $f10 -/* 98FAB4 802402D4 00000000 */ nop -/* 98FAB8 802402D8 468052A0 */ cvt.s.w $f10, $f10 -/* 98FABC 802402DC 44075000 */ mfc1 $a3, $f10 -/* 98FAC0 802402E0 27A20028 */ addiu $v0, $sp, 0x28 -/* 98FAC4 802402E4 AFA20020 */ sw $v0, 0x20($sp) -/* 98FAC8 802402E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 98FACC 802402EC E7A20014 */ swc1 $f2, 0x14($sp) -/* 98FAD0 802402F0 0C01BFA4 */ jal fx_emote -/* 98FAD4 802402F4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 98FAD8 802402F8 0200202D */ daddu $a0, $s0, $zero -/* 98FADC 802402FC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 98FAE0 80240300 0C012530 */ jal func_800494C0 -/* 98FAE4 80240304 3C060020 */ lui $a2, 0x20 -/* 98FAE8 80240308 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 98FAEC 8024030C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 98FAF0 80240310 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 98FAF4 80240314 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 98FAF8 80240318 8C460028 */ lw $a2, 0x28($v0) -/* 98FAFC 8024031C 0C00A720 */ jal atan2 -/* 98FB00 80240320 8C470030 */ lw $a3, 0x30($v0) -/* 98FB04 80240324 2402000C */ addiu $v0, $zero, 0xc -/* 98FB08 80240328 E600000C */ swc1 $f0, 0xc($s0) -/* 98FB0C 8024032C 08090151 */ j .L80240544 -/* 98FB10 80240330 AE620070 */ sw $v0, 0x70($s3) -.L80240334: -/* 98FB14 80240334 8E620074 */ lw $v0, 0x74($s3) -/* 98FB18 80240338 2442FFFF */ addiu $v0, $v0, -1 -.L8024033C: -/* 98FB1C 8024033C AE620074 */ sw $v0, 0x74($s3) -.L80240340: -/* 98FB20 80240340 C6000018 */ lwc1 $f0, 0x18($s0) -/* 98FB24 80240344 44801000 */ mtc1 $zero, $f2 -/* 98FB28 80240348 44801800 */ mtc1 $zero, $f3 -/* 98FB2C 8024034C 46000021 */ cvt.d.s $f0, $f0 -/* 98FB30 80240350 4620103C */ c.lt.d $f2, $f0 -/* 98FB34 80240354 00000000 */ nop -/* 98FB38 80240358 45000025 */ bc1f .L802403F0 -/* 98FB3C 8024035C 27A5002C */ addiu $a1, $sp, 0x2c -/* 98FB40 80240360 C6000038 */ lwc1 $f0, 0x38($s0) -/* 98FB44 80240364 860200A6 */ lh $v0, 0xa6($s0) -/* 98FB48 80240368 3C018024 */ lui $at, 0x8024 -/* 98FB4C 8024036C D4222EB0 */ ldc1 $f2, 0x2eb0($at) -/* 98FB50 80240370 27A60030 */ addiu $a2, $sp, 0x30 -/* 98FB54 80240374 E7A0002C */ swc1 $f0, 0x2c($sp) -/* 98FB58 80240378 44820000 */ mtc1 $v0, $f0 -/* 98FB5C 8024037C 00000000 */ nop -/* 98FB60 80240380 46800020 */ cvt.s.w $f0, $f0 -/* 98FB64 80240384 46000021 */ cvt.d.s $f0, $f0 -/* 98FB68 80240388 C604003C */ lwc1 $f4, 0x3c($s0) -/* 98FB6C 8024038C C6060040 */ lwc1 $f6, 0x40($s0) -/* 98FB70 80240390 C6080018 */ lwc1 $f8, 0x18($s0) -/* 98FB74 80240394 860200A8 */ lh $v0, 0xa8($s0) -/* 98FB78 80240398 46220002 */ mul.d $f0, $f0, $f2 -/* 98FB7C 8024039C 00000000 */ nop -/* 98FB80 802403A0 E7A40030 */ swc1 $f4, 0x30($sp) -/* 98FB84 802403A4 E7A60034 */ swc1 $f6, 0x34($sp) -/* 98FB88 802403A8 E7A80010 */ swc1 $f8, 0x10($sp) -/* 98FB8C 802403AC C604000C */ lwc1 $f4, 0xc($s0) -/* 98FB90 802403B0 44821000 */ mtc1 $v0, $f2 -/* 98FB94 802403B4 00000000 */ nop -/* 98FB98 802403B8 468010A0 */ cvt.s.w $f2, $f2 -/* 98FB9C 802403BC E7A20018 */ swc1 $f2, 0x18($sp) -/* 98FBA0 802403C0 E7A40014 */ swc1 $f4, 0x14($sp) -/* 98FBA4 802403C4 46200020 */ cvt.s.d $f0, $f0 -/* 98FBA8 802403C8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 98FBAC 802403CC 8E040080 */ lw $a0, 0x80($s0) -/* 98FBB0 802403D0 0C037711 */ jal func_800DDC44 -/* 98FBB4 802403D4 27A70034 */ addiu $a3, $sp, 0x34 -/* 98FBB8 802403D8 54400005 */ bnel $v0, $zero, .L802403F0 -/* 98FBBC 802403DC AE000018 */ sw $zero, 0x18($s0) -/* 98FBC0 802403E0 8E050018 */ lw $a1, 0x18($s0) -/* 98FBC4 802403E4 8E06000C */ lw $a2, 0xc($s0) -/* 98FBC8 802403E8 0C00EA95 */ jal npc_move_heading -/* 98FBCC 802403EC 0200202D */ daddu $a0, $s0, $zero -.L802403F0: -/* 98FBD0 802403F0 C600001C */ lwc1 $f0, 0x1c($s0) -/* 98FBD4 802403F4 44801000 */ mtc1 $zero, $f2 -/* 98FBD8 802403F8 44801800 */ mtc1 $zero, $f3 -/* 98FBDC 802403FC 46000021 */ cvt.d.s $f0, $f0 -/* 98FBE0 80240400 4622003C */ c.lt.d $f0, $f2 -/* 98FBE4 80240404 00000000 */ nop -/* 98FBE8 80240408 45000047 */ bc1f .L80240528 -/* 98FBEC 8024040C 27A5002C */ addiu $a1, $sp, 0x2c -/* 98FBF0 80240410 27A60030 */ addiu $a2, $sp, 0x30 -/* 98FBF4 80240414 27A20038 */ addiu $v0, $sp, 0x38 -/* 98FBF8 80240418 C602003C */ lwc1 $f2, 0x3c($s0) -/* 98FBFC 8024041C C6060038 */ lwc1 $f6, 0x38($s0) -/* 98FC00 80240420 3C01402A */ lui $at, 0x402a -/* 98FC04 80240424 4481A800 */ mtc1 $at, $f21 -/* 98FC08 80240428 4480A000 */ mtc1 $zero, $f20 -/* 98FC0C 8024042C 460010A1 */ cvt.d.s $f2, $f2 -/* 98FC10 80240430 46341080 */ add.d $f2, $f2, $f20 -/* 98FC14 80240434 C600001C */ lwc1 $f0, 0x1c($s0) -/* 98FC18 80240438 C6040040 */ lwc1 $f4, 0x40($s0) -/* 98FC1C 8024043C 46000005 */ abs.s $f0, $f0 -/* 98FC20 80240440 E7A40034 */ swc1 $f4, 0x34($sp) -/* 98FC24 80240444 3C014030 */ lui $at, 0x4030 -/* 98FC28 80240448 44812800 */ mtc1 $at, $f5 -/* 98FC2C 8024044C 44802000 */ mtc1 $zero, $f4 -/* 98FC30 80240450 46000021 */ cvt.d.s $f0, $f0 -/* 98FC34 80240454 E7A6002C */ swc1 $f6, 0x2c($sp) -/* 98FC38 80240458 46240000 */ add.d $f0, $f0, $f4 -/* 98FC3C 8024045C 462010A0 */ cvt.s.d $f2, $f2 -/* 98FC40 80240460 E7A20030 */ swc1 $f2, 0x30($sp) -/* 98FC44 80240464 46200020 */ cvt.s.d $f0, $f0 -/* 98FC48 80240468 E7A00038 */ swc1 $f0, 0x38($sp) -/* 98FC4C 8024046C AFA20010 */ sw $v0, 0x10($sp) -/* 98FC50 80240470 8E040080 */ lw $a0, 0x80($s0) -/* 98FC54 80240474 0C0372DF */ jal func_800DCB7C -/* 98FC58 80240478 27A70034 */ addiu $a3, $sp, 0x34 -/* 98FC5C 8024047C 1040002A */ beqz $v0, .L80240528 -/* 98FC60 80240480 00000000 */ nop -/* 98FC64 80240484 C600001C */ lwc1 $f0, 0x1c($s0) -/* 98FC68 80240488 C7A20038 */ lwc1 $f2, 0x38($sp) -/* 98FC6C 8024048C 46000005 */ abs.s $f0, $f0 -/* 98FC70 80240490 46000021 */ cvt.d.s $f0, $f0 -/* 98FC74 80240494 46340000 */ add.d $f0, $f0, $f20 -/* 98FC78 80240498 460010A1 */ cvt.d.s $f2, $f2 -/* 98FC7C 8024049C 4620103E */ c.le.d $f2, $f0 -/* 98FC80 802404A0 00000000 */ nop -/* 98FC84 802404A4 45000020 */ bc1f .L80240528 -/* 98FC88 802404A8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 98FC8C 802404AC C7A00030 */ lwc1 $f0, 0x30($sp) -/* 98FC90 802404B0 8E020000 */ lw $v0, ($s0) -/* 98FC94 802404B4 2403F7FF */ addiu $v1, $zero, -0x801 -/* 98FC98 802404B8 AE00001C */ sw $zero, 0x1c($s0) -/* 98FC9C 802404BC 00431024 */ and $v0, $v0, $v1 -/* 98FCA0 802404C0 AE020000 */ sw $v0, ($s0) -/* 98FCA4 802404C4 24020002 */ addiu $v0, $zero, 2 -/* 98FCA8 802404C8 E600003C */ swc1 $f0, 0x3c($s0) -/* 98FCAC 802404CC 0C00A67F */ jal rand_int -/* 98FCB0 802404D0 AE620070 */ sw $v0, 0x70($s3) -/* 98FCB4 802404D4 3C035555 */ lui $v1, 0x5555 -/* 98FCB8 802404D8 34635556 */ ori $v1, $v1, 0x5556 -/* 98FCBC 802404DC 00430018 */ mult $v0, $v1 -/* 98FCC0 802404E0 000227C3 */ sra $a0, $v0, 0x1f -/* 98FCC4 802404E4 00004010 */ mfhi $t0 -/* 98FCC8 802404E8 01042023 */ subu $a0, $t0, $a0 -/* 98FCCC 802404EC 00041840 */ sll $v1, $a0, 1 -/* 98FCD0 802404F0 00641821 */ addu $v1, $v1, $a0 -/* 98FCD4 802404F4 00431023 */ subu $v0, $v0, $v1 -/* 98FCD8 802404F8 24430002 */ addiu $v1, $v0, 2 -/* 98FCDC 802404FC AE630074 */ sw $v1, 0x74($s3) -/* 98FCE0 80240500 8E82002C */ lw $v0, 0x2c($s4) -/* 98FCE4 80240504 5840000F */ blezl $v0, .L80240544 -/* 98FCE8 80240508 AE600070 */ sw $zero, 0x70($s3) -/* 98FCEC 8024050C 8E820004 */ lw $v0, 4($s4) -/* 98FCF0 80240510 5840000C */ blezl $v0, .L80240544 -/* 98FCF4 80240514 AE600070 */ sw $zero, 0x70($s3) -/* 98FCF8 80240518 1460000A */ bnez $v1, .L80240544 -/* 98FCFC 8024051C 00000000 */ nop -/* 98FD00 80240520 08090151 */ j .L80240544 -/* 98FD04 80240524 AE600070 */ sw $zero, 0x70($s3) -.L80240528: -/* 98FD08 80240528 C604003C */ lwc1 $f4, 0x3c($s0) -/* 98FD0C 8024052C C600001C */ lwc1 $f0, 0x1c($s0) -/* 98FD10 80240530 46002100 */ add.s $f4, $f4, $f0 -/* 98FD14 80240534 C6020014 */ lwc1 $f2, 0x14($s0) -/* 98FD18 80240538 46020001 */ sub.s $f0, $f0, $f2 -/* 98FD1C 8024053C E604003C */ swc1 $f4, 0x3c($s0) -/* 98FD20 80240540 E600001C */ swc1 $f0, 0x1c($s0) -.L80240544: -/* 98FD24 80240544 8FBF0054 */ lw $ra, 0x54($sp) -/* 98FD28 80240548 8FB40050 */ lw $s4, 0x50($sp) -/* 98FD2C 8024054C 8FB3004C */ lw $s3, 0x4c($sp) -/* 98FD30 80240550 8FB20048 */ lw $s2, 0x48($sp) -/* 98FD34 80240554 8FB10044 */ lw $s1, 0x44($sp) -/* 98FD38 80240558 8FB00040 */ lw $s0, 0x40($sp) -/* 98FD3C 8024055C D7B40058 */ ldc1 $f20, 0x58($sp) -/* 98FD40 80240560 03E00008 */ jr $ra -/* 98FD44 80240564 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_isk/isk_13/func_80240568_98F7E0.s b/asm/nonmatchings/world/area_isk/isk_13/func_80240568_98F7E0.s deleted file mode 100644 index a38159cd92..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/func_80240568_98F7E0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_98FD48 -/* 98FD48 80240568 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 98FD4C 8024056C AFB3001C */ sw $s3, 0x1c($sp) -/* 98FD50 80240570 0080982D */ daddu $s3, $a0, $zero -/* 98FD54 80240574 AFBF0020 */ sw $ra, 0x20($sp) -/* 98FD58 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* 98FD5C 8024057C AFB10014 */ sw $s1, 0x14($sp) -/* 98FD60 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* 98FD64 80240584 8E720148 */ lw $s2, 0x148($s3) -/* 98FD68 80240588 86440008 */ lh $a0, 8($s2) -/* 98FD6C 8024058C 0C00EABB */ jal get_npc_unsafe -/* 98FD70 80240590 00A0882D */ daddu $s1, $a1, $zero -/* 98FD74 80240594 8E240008 */ lw $a0, 8($s1) -/* 98FD78 80240598 0040802D */ daddu $s0, $v0, $zero -/* 98FD7C 8024059C 00041FC2 */ srl $v1, $a0, 0x1f -/* 98FD80 802405A0 00832021 */ addu $a0, $a0, $v1 -/* 98FD84 802405A4 00042043 */ sra $a0, $a0, 1 -/* 98FD88 802405A8 0C00A67F */ jal rand_int -/* 98FD8C 802405AC 24840001 */ addiu $a0, $a0, 1 -/* 98FD90 802405B0 8E230008 */ lw $v1, 8($s1) -/* 98FD94 802405B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* 98FD98 802405B8 00032FC2 */ srl $a1, $v1, 0x1f -/* 98FD9C 802405BC 00651821 */ addu $v1, $v1, $a1 -/* 98FDA0 802405C0 00031843 */ sra $v1, $v1, 1 -/* 98FDA4 802405C4 00621821 */ addu $v1, $v1, $v0 -/* 98FDA8 802405C8 0C00A67F */ jal rand_int -/* 98FDAC 802405CC A603008E */ sh $v1, 0x8e($s0) -/* 98FDB0 802405D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* 98FDB4 802405D4 44820000 */ mtc1 $v0, $f0 -/* 98FDB8 802405D8 00000000 */ nop -/* 98FDBC 802405DC 46800020 */ cvt.s.w $f0, $f0 -/* 98FDC0 802405E0 46006300 */ add.s $f12, $f12, $f0 -/* 98FDC4 802405E4 3C0142B4 */ lui $at, 0x42b4 -/* 98FDC8 802405E8 44810000 */ mtc1 $at, $f0 -/* 98FDCC 802405EC 0C00A6C9 */ jal clamp_angle -/* 98FDD0 802405F0 46006301 */ sub.s $f12, $f12, $f0 -/* 98FDD4 802405F4 E600000C */ swc1 $f0, 0xc($s0) -/* 98FDD8 802405F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 98FDDC 802405FC 8C420000 */ lw $v0, ($v0) -/* 98FDE0 80240600 AE020028 */ sw $v0, 0x28($s0) -/* 98FDE4 80240604 24020003 */ addiu $v0, $zero, 3 -/* 98FDE8 80240608 AE620070 */ sw $v0, 0x70($s3) -/* 98FDEC 8024060C 8FBF0020 */ lw $ra, 0x20($sp) -/* 98FDF0 80240610 8FB3001C */ lw $s3, 0x1c($sp) -/* 98FDF4 80240614 8FB20018 */ lw $s2, 0x18($sp) -/* 98FDF8 80240618 8FB10014 */ lw $s1, 0x14($sp) -/* 98FDFC 8024061C 8FB00010 */ lw $s0, 0x10($sp) -/* 98FE00 80240620 03E00008 */ jr $ra -/* 98FE04 80240624 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_13/func_80240628_98F7E0.s b/asm/nonmatchings/world/area_isk/isk_13/func_80240628_98F7E0.s deleted file mode 100644 index 137ca28269..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/func_80240628_98F7E0.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240628_98FE08 -/* 98FE08 80240628 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 98FE0C 8024062C AFB40040 */ sw $s4, 0x40($sp) -/* 98FE10 80240630 0080A02D */ daddu $s4, $a0, $zero -/* 98FE14 80240634 AFBF0044 */ sw $ra, 0x44($sp) -/* 98FE18 80240638 AFB3003C */ sw $s3, 0x3c($sp) -/* 98FE1C 8024063C AFB20038 */ sw $s2, 0x38($sp) -/* 98FE20 80240640 AFB10034 */ sw $s1, 0x34($sp) -/* 98FE24 80240644 AFB00030 */ sw $s0, 0x30($sp) -/* 98FE28 80240648 8E920148 */ lw $s2, 0x148($s4) -/* 98FE2C 8024064C 00A0882D */ daddu $s1, $a1, $zero -/* 98FE30 80240650 86440008 */ lh $a0, 8($s2) -/* 98FE34 80240654 0C00EABB */ jal get_npc_unsafe -/* 98FE38 80240658 00C0982D */ daddu $s3, $a2, $zero -/* 98FE3C 8024065C 8E230014 */ lw $v1, 0x14($s1) -/* 98FE40 80240660 0460002D */ bltz $v1, .L80240718 -/* 98FE44 80240664 0040802D */ daddu $s0, $v0, $zero -/* 98FE48 80240668 0260202D */ daddu $a0, $s3, $zero -/* 98FE4C 8024066C AFA00010 */ sw $zero, 0x10($sp) -/* 98FE50 80240670 8E260024 */ lw $a2, 0x24($s1) -/* 98FE54 80240674 8E270028 */ lw $a3, 0x28($s1) -/* 98FE58 80240678 0C01242D */ jal func_800490B4 -/* 98FE5C 8024067C 0240282D */ daddu $a1, $s2, $zero -/* 98FE60 80240680 10400025 */ beqz $v0, .L80240718 -/* 98FE64 80240684 0000202D */ daddu $a0, $zero, $zero -/* 98FE68 80240688 0200282D */ daddu $a1, $s0, $zero -/* 98FE6C 8024068C 0000302D */ daddu $a2, $zero, $zero -/* 98FE70 80240690 860300A8 */ lh $v1, 0xa8($s0) -/* 98FE74 80240694 3C013F80 */ lui $at, 0x3f80 -/* 98FE78 80240698 44810000 */ mtc1 $at, $f0 -/* 98FE7C 8024069C 3C014000 */ lui $at, 0x4000 -/* 98FE80 802406A0 44811000 */ mtc1 $at, $f2 -/* 98FE84 802406A4 3C01C1A0 */ lui $at, 0xc1a0 -/* 98FE88 802406A8 44812000 */ mtc1 $at, $f4 -/* 98FE8C 802406AC 2402000F */ addiu $v0, $zero, 0xf -/* 98FE90 802406B0 AFA2001C */ sw $v0, 0x1c($sp) -/* 98FE94 802406B4 44833000 */ mtc1 $v1, $f6 -/* 98FE98 802406B8 00000000 */ nop -/* 98FE9C 802406BC 468031A0 */ cvt.s.w $f6, $f6 -/* 98FEA0 802406C0 44073000 */ mfc1 $a3, $f6 -/* 98FEA4 802406C4 27A20028 */ addiu $v0, $sp, 0x28 -/* 98FEA8 802406C8 AFA20020 */ sw $v0, 0x20($sp) -/* 98FEAC 802406CC E7A00010 */ swc1 $f0, 0x10($sp) -/* 98FEB0 802406D0 E7A20014 */ swc1 $f2, 0x14($sp) -/* 98FEB4 802406D4 0C01BFA4 */ jal fx_emote -/* 98FEB8 802406D8 E7A40018 */ swc1 $f4, 0x18($sp) -/* 98FEBC 802406DC 0200202D */ daddu $a0, $s0, $zero -/* 98FEC0 802406E0 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 98FEC4 802406E4 0C012530 */ jal func_800494C0 -/* 98FEC8 802406E8 3C060020 */ lui $a2, 0x20 -/* 98FECC 802406EC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 98FED0 802406F0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 98FED4 802406F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 98FED8 802406F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 98FEDC 802406FC 8C460028 */ lw $a2, 0x28($v0) -/* 98FEE0 80240700 0C00A720 */ jal atan2 -/* 98FEE4 80240704 8C470030 */ lw $a3, 0x30($v0) -/* 98FEE8 80240708 2402000C */ addiu $v0, $zero, 0xc -/* 98FEEC 8024070C E600000C */ swc1 $f0, 0xc($s0) -/* 98FEF0 80240710 080901EB */ j .L802407AC -/* 98FEF4 80240714 AE820070 */ sw $v0, 0x70($s4) -.L80240718: -/* 98FEF8 80240718 8602008C */ lh $v0, 0x8c($s0) -/* 98FEFC 8024071C 14400023 */ bnez $v0, .L802407AC -/* 98FF00 80240720 00000000 */ nop -/* 98FF04 80240724 9602008E */ lhu $v0, 0x8e($s0) -/* 98FF08 80240728 2442FFFF */ addiu $v0, $v0, -1 -/* 98FF0C 8024072C A602008E */ sh $v0, 0x8e($s0) -/* 98FF10 80240730 00021400 */ sll $v0, $v0, 0x10 -/* 98FF14 80240734 1C40001D */ bgtz $v0, .L802407AC -/* 98FF18 80240738 00000000 */ nop -/* 98FF1C 8024073C 8E820074 */ lw $v0, 0x74($s4) -/* 98FF20 80240740 2442FFFF */ addiu $v0, $v0, -1 -/* 98FF24 80240744 18400018 */ blez $v0, .L802407A8 -/* 98FF28 80240748 AE820074 */ sw $v0, 0x74($s4) -/* 98FF2C 8024074C C600000C */ lwc1 $f0, 0xc($s0) -/* 98FF30 80240750 3C014334 */ lui $at, 0x4334 -/* 98FF34 80240754 44816000 */ mtc1 $at, $f12 -/* 98FF38 80240758 0C00A6C9 */ jal clamp_angle -/* 98FF3C 8024075C 460C0300 */ add.s $f12, $f0, $f12 -/* 98FF40 80240760 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 98FF44 80240764 0C00A67F */ jal rand_int -/* 98FF48 80240768 E600000C */ swc1 $f0, 0xc($s0) -/* 98FF4C 8024076C 3C032E8B */ lui $v1, 0x2e8b -/* 98FF50 80240770 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 98FF54 80240774 00430018 */ mult $v0, $v1 -/* 98FF58 80240778 00021FC3 */ sra $v1, $v0, 0x1f -/* 98FF5C 8024077C 00004010 */ mfhi $t0 -/* 98FF60 80240780 00082043 */ sra $a0, $t0, 1 -/* 98FF64 80240784 00832023 */ subu $a0, $a0, $v1 -/* 98FF68 80240788 00041840 */ sll $v1, $a0, 1 -/* 98FF6C 8024078C 00641821 */ addu $v1, $v1, $a0 -/* 98FF70 80240790 00031880 */ sll $v1, $v1, 2 -/* 98FF74 80240794 00641823 */ subu $v1, $v1, $a0 -/* 98FF78 80240798 00431023 */ subu $v0, $v0, $v1 -/* 98FF7C 8024079C 24420005 */ addiu $v0, $v0, 5 -/* 98FF80 802407A0 080901EB */ j .L802407AC -/* 98FF84 802407A4 A602008E */ sh $v0, 0x8e($s0) -.L802407A8: -/* 98FF88 802407A8 AE800070 */ sw $zero, 0x70($s4) -.L802407AC: -/* 98FF8C 802407AC 8FBF0044 */ lw $ra, 0x44($sp) -/* 98FF90 802407B0 8FB40040 */ lw $s4, 0x40($sp) -/* 98FF94 802407B4 8FB3003C */ lw $s3, 0x3c($sp) -/* 98FF98 802407B8 8FB20038 */ lw $s2, 0x38($sp) -/* 98FF9C 802407BC 8FB10034 */ lw $s1, 0x34($sp) -/* 98FFA0 802407C0 8FB00030 */ lw $s0, 0x30($sp) -/* 98FFA4 802407C4 03E00008 */ jr $ra -/* 98FFA8 802407C8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_isk/isk_13/func_802407CC_98F7E0.s b/asm/nonmatchings/world/area_isk/isk_13/func_802407CC_98F7E0.s deleted file mode 100644 index 22e7a9440e..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/func_802407CC_98F7E0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407CC_98FFAC -/* 98FFAC 802407CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 98FFB0 802407D0 AFB10014 */ sw $s1, 0x14($sp) -/* 98FFB4 802407D4 0080882D */ daddu $s1, $a0, $zero -/* 98FFB8 802407D8 AFBF001C */ sw $ra, 0x1c($sp) -/* 98FFBC 802407DC AFB20018 */ sw $s2, 0x18($sp) -/* 98FFC0 802407E0 AFB00010 */ sw $s0, 0x10($sp) -/* 98FFC4 802407E4 8E220148 */ lw $v0, 0x148($s1) -/* 98FFC8 802407E8 00A0902D */ daddu $s2, $a1, $zero -/* 98FFCC 802407EC 84440008 */ lh $a0, 8($v0) -/* 98FFD0 802407F0 0C00EABB */ jal get_npc_unsafe -/* 98FFD4 802407F4 00C0802D */ daddu $s0, $a2, $zero -/* 98FFD8 802407F8 0220202D */ daddu $a0, $s1, $zero -/* 98FFDC 802407FC 0240282D */ daddu $a1, $s2, $zero -/* 98FFE0 80240800 0200302D */ daddu $a2, $s0, $zero -/* 98FFE4 80240804 0C0127DF */ jal func_80049F7C -/* 98FFE8 80240808 0040802D */ daddu $s0, $v0, $zero -/* 98FFEC 8024080C 8E020000 */ lw $v0, ($s0) -/* 98FFF0 80240810 24040005 */ addiu $a0, $zero, 5 -/* 98FFF4 80240814 34420800 */ ori $v0, $v0, 0x800 -/* 98FFF8 80240818 0C00A67F */ jal rand_int -/* 98FFFC 8024081C AE020000 */ sw $v0, ($s0) -/* 990000 80240820 44820000 */ mtc1 $v0, $f0 -/* 990004 80240824 00000000 */ nop -/* 990008 80240828 46800021 */ cvt.d.w $f0, $f0 -/* 99000C 8024082C 3C014024 */ lui $at, 0x4024 -/* 990010 80240830 44811800 */ mtc1 $at, $f3 -/* 990014 80240834 44801000 */ mtc1 $zero, $f2 -/* 990018 80240838 3C013FC0 */ lui $at, 0x3fc0 -/* 99001C 8024083C 44812000 */ mtc1 $at, $f4 -/* 990020 80240840 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 990024 80240844 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 990028 80240848 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 99002C 8024084C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 990030 80240850 46220000 */ add.d $f0, $f0, $f2 -/* 990034 80240854 E6040014 */ swc1 $f4, 0x14($s0) -/* 990038 80240858 46200020 */ cvt.s.d $f0, $f0 -/* 99003C 8024085C E600001C */ swc1 $f0, 0x1c($s0) -/* 990040 80240860 8C460028 */ lw $a2, 0x28($v0) -/* 990044 80240864 0C00A720 */ jal atan2 -/* 990048 80240868 8C470030 */ lw $a3, 0x30($v0) -/* 99004C 8024086C 0200202D */ daddu $a0, $s0, $zero -/* 990050 80240870 3C05B000 */ lui $a1, 0xb000 -/* 990054 80240874 34A50017 */ ori $a1, $a1, 0x17 -/* 990058 80240878 0000302D */ daddu $a2, $zero, $zero -/* 99005C 8024087C E480000C */ swc1 $f0, 0xc($a0) -/* 990060 80240880 C6400018 */ lwc1 $f0, 0x18($s2) -/* 990064 80240884 2402000D */ addiu $v0, $zero, 0xd -/* 990068 80240888 E4800018 */ swc1 $f0, 0x18($a0) -/* 99006C 8024088C 0C012530 */ jal func_800494C0 -/* 990070 80240890 AE220070 */ sw $v0, 0x70($s1) -/* 990074 80240894 8FBF001C */ lw $ra, 0x1c($sp) -/* 990078 80240898 8FB20018 */ lw $s2, 0x18($sp) -/* 99007C 8024089C 8FB10014 */ lw $s1, 0x14($sp) -/* 990080 802408A0 8FB00010 */ lw $s0, 0x10($sp) -/* 990084 802408A4 03E00008 */ jr $ra -/* 990088 802408A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_13/func_802408AC_98F7E0.s b/asm/nonmatchings/world/area_isk/isk_13/func_802408AC_98F7E0.s deleted file mode 100644 index a8cb4ebad8..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/func_802408AC_98F7E0.s +++ /dev/null @@ -1,200 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408AC_99008C -/* 99008C 802408AC 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 990090 802408B0 AFB40050 */ sw $s4, 0x50($sp) -/* 990094 802408B4 0080A02D */ daddu $s4, $a0, $zero -/* 990098 802408B8 AFBF0060 */ sw $ra, 0x60($sp) -/* 99009C 802408BC AFB7005C */ sw $s7, 0x5c($sp) -/* 9900A0 802408C0 AFB60058 */ sw $s6, 0x58($sp) -/* 9900A4 802408C4 AFB50054 */ sw $s5, 0x54($sp) -/* 9900A8 802408C8 AFB3004C */ sw $s3, 0x4c($sp) -/* 9900AC 802408CC AFB20048 */ sw $s2, 0x48($sp) -/* 9900B0 802408D0 AFB10044 */ sw $s1, 0x44($sp) -/* 9900B4 802408D4 AFB00040 */ sw $s0, 0x40($sp) -/* 9900B8 802408D8 F7B40068 */ sdc1 $f20, 0x68($sp) -/* 9900BC 802408DC 8E950148 */ lw $s5, 0x148($s4) -/* 9900C0 802408E0 00A0B02D */ daddu $s6, $a1, $zero -/* 9900C4 802408E4 86A40008 */ lh $a0, 8($s5) -/* 9900C8 802408E8 0C00EABB */ jal get_npc_unsafe -/* 9900CC 802408EC 00C0B82D */ daddu $s7, $a2, $zero -/* 9900D0 802408F0 0040982D */ daddu $s3, $v0, $zero -/* 9900D4 802408F4 C6600018 */ lwc1 $f0, 0x18($s3) -/* 9900D8 802408F8 44801000 */ mtc1 $zero, $f2 -/* 9900DC 802408FC 44801800 */ mtc1 $zero, $f3 -/* 9900E0 80240900 46000021 */ cvt.d.s $f0, $f0 -/* 9900E4 80240904 4620103C */ c.lt.d $f2, $f0 -/* 9900E8 80240908 00000000 */ nop -/* 9900EC 8024090C 45000021 */ bc1f .L80240994 -/* 9900F0 80240910 27A50028 */ addiu $a1, $sp, 0x28 -/* 9900F4 80240914 C6600038 */ lwc1 $f0, 0x38($s3) -/* 9900F8 80240918 C662003C */ lwc1 $f2, 0x3c($s3) -/* 9900FC 8024091C C6640040 */ lwc1 $f4, 0x40($s3) -/* 990100 80240920 C6660018 */ lwc1 $f6, 0x18($s3) -/* 990104 80240924 E7A00028 */ swc1 $f0, 0x28($sp) -/* 990108 80240928 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 99010C 8024092C E7A40030 */ swc1 $f4, 0x30($sp) -/* 990110 80240930 E7A60010 */ swc1 $f6, 0x10($sp) -/* 990114 80240934 C660000C */ lwc1 $f0, 0xc($s3) -/* 990118 80240938 E7A00014 */ swc1 $f0, 0x14($sp) -/* 99011C 8024093C 866200A8 */ lh $v0, 0xa8($s3) -/* 990120 80240940 44820000 */ mtc1 $v0, $f0 -/* 990124 80240944 00000000 */ nop -/* 990128 80240948 46800020 */ cvt.s.w $f0, $f0 -/* 99012C 8024094C E7A00018 */ swc1 $f0, 0x18($sp) -/* 990130 80240950 866200A6 */ lh $v0, 0xa6($s3) -/* 990134 80240954 27A6002C */ addiu $a2, $sp, 0x2c -/* 990138 80240958 44820000 */ mtc1 $v0, $f0 -/* 99013C 8024095C 00000000 */ nop -/* 990140 80240960 46800020 */ cvt.s.w $f0, $f0 -/* 990144 80240964 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 990148 80240968 8E640080 */ lw $a0, 0x80($s3) -/* 99014C 8024096C 0C037711 */ jal func_800DDC44 -/* 990150 80240970 27A70030 */ addiu $a3, $sp, 0x30 -/* 990154 80240974 10400003 */ beqz $v0, .L80240984 -/* 990158 80240978 00000000 */ nop -/* 99015C 8024097C 08090265 */ j .L80240994 -/* 990160 80240980 AE600018 */ sw $zero, 0x18($s3) -.L80240984: -/* 990164 80240984 8E650018 */ lw $a1, 0x18($s3) -/* 990168 80240988 8E66000C */ lw $a2, 0xc($s3) -/* 99016C 8024098C 0C00EA95 */ jal npc_move_heading -/* 990170 80240990 0260202D */ daddu $a0, $s3, $zero -.L80240994: -/* 990174 80240994 C660001C */ lwc1 $f0, 0x1c($s3) -/* 990178 80240998 44801000 */ mtc1 $zero, $f2 -/* 99017C 8024099C 44801800 */ mtc1 $zero, $f3 -/* 990180 802409A0 46000021 */ cvt.d.s $f0, $f0 -/* 990184 802409A4 4622003C */ c.lt.d $f0, $f2 -/* 990188 802409A8 00000000 */ nop -/* 99018C 802409AC 4500006C */ bc1f .L80240B60 -/* 990190 802409B0 27B00028 */ addiu $s0, $sp, 0x28 -/* 990194 802409B4 0200282D */ daddu $a1, $s0, $zero -/* 990198 802409B8 27A60034 */ addiu $a2, $sp, 0x34 -/* 99019C 802409BC 27B20038 */ addiu $s2, $sp, 0x38 -/* 9901A0 802409C0 C6600038 */ lwc1 $f0, 0x38($s3) -/* 9901A4 802409C4 3C0142C8 */ lui $at, 0x42c8 -/* 9901A8 802409C8 44811000 */ mtc1 $at, $f2 -/* 9901AC 802409CC C6640040 */ lwc1 $f4, 0x40($s3) -/* 9901B0 802409D0 3C01447A */ lui $at, 0x447a -/* 9901B4 802409D4 44813000 */ mtc1 $at, $f6 -/* 9901B8 802409D8 27B10030 */ addiu $s1, $sp, 0x30 -/* 9901BC 802409DC E7A00028 */ swc1 $f0, 0x28($sp) -/* 9901C0 802409E0 E7A20034 */ swc1 $f2, 0x34($sp) -/* 9901C4 802409E4 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9901C8 802409E8 E7A60038 */ swc1 $f6, 0x38($sp) -/* 9901CC 802409EC AFB20010 */ sw $s2, 0x10($sp) -/* 9901D0 802409F0 8E640080 */ lw $a0, 0x80($s3) -/* 9901D4 802409F4 0C0372DF */ jal func_800DCB7C -/* 9901D8 802409F8 0220382D */ daddu $a3, $s1, $zero -/* 9901DC 802409FC 0200282D */ daddu $a1, $s0, $zero -/* 9901E0 80240A00 27A6002C */ addiu $a2, $sp, 0x2c -/* 9901E4 80240A04 C662003C */ lwc1 $f2, 0x3c($s3) -/* 9901E8 80240A08 C6660038 */ lwc1 $f6, 0x38($s3) -/* 9901EC 80240A0C 3C01402A */ lui $at, 0x402a -/* 9901F0 80240A10 4481A800 */ mtc1 $at, $f21 -/* 9901F4 80240A14 4480A000 */ mtc1 $zero, $f20 -/* 9901F8 80240A18 460010A1 */ cvt.d.s $f2, $f2 -/* 9901FC 80240A1C 46341080 */ add.d $f2, $f2, $f20 -/* 990200 80240A20 C660001C */ lwc1 $f0, 0x1c($s3) -/* 990204 80240A24 C6640040 */ lwc1 $f4, 0x40($s3) -/* 990208 80240A28 46000005 */ abs.s $f0, $f0 -/* 99020C 80240A2C E7A40030 */ swc1 $f4, 0x30($sp) -/* 990210 80240A30 3C014030 */ lui $at, 0x4030 -/* 990214 80240A34 44812800 */ mtc1 $at, $f5 -/* 990218 80240A38 44802000 */ mtc1 $zero, $f4 -/* 99021C 80240A3C 46000021 */ cvt.d.s $f0, $f0 -/* 990220 80240A40 E7A60028 */ swc1 $f6, 0x28($sp) -/* 990224 80240A44 46240000 */ add.d $f0, $f0, $f4 -/* 990228 80240A48 462010A0 */ cvt.s.d $f2, $f2 -/* 99022C 80240A4C E7A2002C */ swc1 $f2, 0x2c($sp) -/* 990230 80240A50 46200020 */ cvt.s.d $f0, $f0 -/* 990234 80240A54 E7A00038 */ swc1 $f0, 0x38($sp) -/* 990238 80240A58 AFB20010 */ sw $s2, 0x10($sp) -/* 99023C 80240A5C 8E640080 */ lw $a0, 0x80($s3) -/* 990240 80240A60 0C0372DF */ jal func_800DCB7C -/* 990244 80240A64 0220382D */ daddu $a3, $s1, $zero -/* 990248 80240A68 1040003D */ beqz $v0, .L80240B60 -/* 99024C 80240A6C 00000000 */ nop -/* 990250 80240A70 C660001C */ lwc1 $f0, 0x1c($s3) -/* 990254 80240A74 C7A20038 */ lwc1 $f2, 0x38($sp) -/* 990258 80240A78 46000005 */ abs.s $f0, $f0 -/* 99025C 80240A7C 46000021 */ cvt.d.s $f0, $f0 -/* 990260 80240A80 46340000 */ add.d $f0, $f0, $f20 -/* 990264 80240A84 460010A1 */ cvt.d.s $f2, $f2 -/* 990268 80240A88 4620103E */ c.le.d $f2, $f0 -/* 99026C 80240A8C 00000000 */ nop -/* 990270 80240A90 45000033 */ bc1f .L80240B60 -/* 990274 80240A94 2403F7FF */ addiu $v1, $zero, -0x801 -/* 990278 80240A98 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 99027C 80240A9C 8E620000 */ lw $v0, ($s3) -/* 990280 80240AA0 AE60001C */ sw $zero, 0x1c($s3) -/* 990284 80240AA4 00431024 */ and $v0, $v0, $v1 -/* 990288 80240AA8 E660003C */ swc1 $f0, 0x3c($s3) -/* 99028C 80240AAC AE620000 */ sw $v0, ($s3) -/* 990290 80240AB0 AFA00010 */ sw $zero, 0x10($sp) -/* 990294 80240AB4 AFA00014 */ sw $zero, 0x14($sp) -/* 990298 80240AB8 8E650038 */ lw $a1, 0x38($s3) -/* 99029C 80240ABC 8E66003C */ lw $a2, 0x3c($s3) -/* 9902A0 80240AC0 8E670040 */ lw $a3, 0x40($s3) -/* 9902A4 80240AC4 0C01BECC */ jal fx_walk_normal -/* 9902A8 80240AC8 24040002 */ addiu $a0, $zero, 2 -/* 9902AC 80240ACC 02E0202D */ daddu $a0, $s7, $zero -/* 9902B0 80240AD0 2402000C */ addiu $v0, $zero, 0xc -/* 9902B4 80240AD4 AE820070 */ sw $v0, 0x70($s4) -/* 9902B8 80240AD8 24020001 */ addiu $v0, $zero, 1 -/* 9902BC 80240ADC AFA20010 */ sw $v0, 0x10($sp) -/* 9902C0 80240AE0 8EC60024 */ lw $a2, 0x24($s6) -/* 9902C4 80240AE4 8EC70028 */ lw $a3, 0x28($s6) -/* 9902C8 80240AE8 0C01242D */ jal func_800490B4 -/* 9902CC 80240AEC 02A0282D */ daddu $a1, $s5, $zero -/* 9902D0 80240AF0 14400022 */ bnez $v0, .L80240B7C -/* 9902D4 80240AF4 24040002 */ addiu $a0, $zero, 2 -/* 9902D8 80240AF8 0260282D */ daddu $a1, $s3, $zero -/* 9902DC 80240AFC 0000302D */ daddu $a2, $zero, $zero -/* 9902E0 80240B00 866300A8 */ lh $v1, 0xa8($s3) -/* 9902E4 80240B04 3C013F80 */ lui $at, 0x3f80 -/* 9902E8 80240B08 44810000 */ mtc1 $at, $f0 -/* 9902EC 80240B0C 3C014000 */ lui $at, 0x4000 -/* 9902F0 80240B10 44811000 */ mtc1 $at, $f2 -/* 9902F4 80240B14 3C01C1A0 */ lui $at, 0xc1a0 -/* 9902F8 80240B18 44812000 */ mtc1 $at, $f4 -/* 9902FC 80240B1C 2402000F */ addiu $v0, $zero, 0xf -/* 990300 80240B20 AFA2001C */ sw $v0, 0x1c($sp) -/* 990304 80240B24 44834000 */ mtc1 $v1, $f8 -/* 990308 80240B28 00000000 */ nop -/* 99030C 80240B2C 46804220 */ cvt.s.w $f8, $f8 -/* 990310 80240B30 44074000 */ mfc1 $a3, $f8 -/* 990314 80240B34 27A2003C */ addiu $v0, $sp, 0x3c -/* 990318 80240B38 AFA20020 */ sw $v0, 0x20($sp) -/* 99031C 80240B3C E7A00010 */ swc1 $f0, 0x10($sp) -/* 990320 80240B40 E7A20014 */ swc1 $f2, 0x14($sp) -/* 990324 80240B44 0C01BFA4 */ jal fx_emote -/* 990328 80240B48 E7A40018 */ swc1 $f4, 0x18($sp) -/* 99032C 80240B4C 24020019 */ addiu $v0, $zero, 0x19 -/* 990330 80240B50 A662008E */ sh $v0, 0x8e($s3) -/* 990334 80240B54 2402000E */ addiu $v0, $zero, 0xe -/* 990338 80240B58 080902DF */ j .L80240B7C -/* 99033C 80240B5C AE820070 */ sw $v0, 0x70($s4) -.L80240B60: -/* 990340 80240B60 C664003C */ lwc1 $f4, 0x3c($s3) -/* 990344 80240B64 C660001C */ lwc1 $f0, 0x1c($s3) -/* 990348 80240B68 46002100 */ add.s $f4, $f4, $f0 -/* 99034C 80240B6C C6620014 */ lwc1 $f2, 0x14($s3) -/* 990350 80240B70 46020001 */ sub.s $f0, $f0, $f2 -/* 990354 80240B74 E664003C */ swc1 $f4, 0x3c($s3) -/* 990358 80240B78 E660001C */ swc1 $f0, 0x1c($s3) -.L80240B7C: -/* 99035C 80240B7C 8FBF0060 */ lw $ra, 0x60($sp) -/* 990360 80240B80 8FB7005C */ lw $s7, 0x5c($sp) -/* 990364 80240B84 8FB60058 */ lw $s6, 0x58($sp) -/* 990368 80240B88 8FB50054 */ lw $s5, 0x54($sp) -/* 99036C 80240B8C 8FB40050 */ lw $s4, 0x50($sp) -/* 990370 80240B90 8FB3004C */ lw $s3, 0x4c($sp) -/* 990374 80240B94 8FB20048 */ lw $s2, 0x48($sp) -/* 990378 80240B98 8FB10044 */ lw $s1, 0x44($sp) -/* 99037C 80240B9C 8FB00040 */ lw $s0, 0x40($sp) -/* 990380 80240BA0 D7B40068 */ ldc1 $f20, 0x68($sp) -/* 990384 80240BA4 03E00008 */ jr $ra -/* 990388 80240BA8 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_isk/isk_13/func_80240BAC_98F7E0.s b/asm/nonmatchings/world/area_isk/isk_13/func_80240BAC_98F7E0.s deleted file mode 100644 index 66e706a3a9..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/func_80240BAC_98F7E0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BAC_99038C -/* 99038C 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 990390 80240BB0 AFB00010 */ sw $s0, 0x10($sp) -/* 990394 80240BB4 0080802D */ daddu $s0, $a0, $zero -/* 990398 80240BB8 AFBF0014 */ sw $ra, 0x14($sp) -/* 99039C 80240BBC 8E020148 */ lw $v0, 0x148($s0) -/* 9903A0 80240BC0 0C00EABB */ jal get_npc_unsafe -/* 9903A4 80240BC4 84440008 */ lh $a0, 8($v0) -/* 9903A8 80240BC8 9443008E */ lhu $v1, 0x8e($v0) -/* 9903AC 80240BCC 2463FFFF */ addiu $v1, $v1, -1 -/* 9903B0 80240BD0 A443008E */ sh $v1, 0x8e($v0) -/* 9903B4 80240BD4 00031C00 */ sll $v1, $v1, 0x10 -/* 9903B8 80240BD8 58600001 */ blezl $v1, .L80240BE0 -/* 9903BC 80240BDC AE000070 */ sw $zero, 0x70($s0) -.L80240BE0: -/* 9903C0 80240BE0 8FBF0014 */ lw $ra, 0x14($sp) -/* 9903C4 80240BE4 8FB00010 */ lw $s0, 0x10($sp) -/* 9903C8 80240BE8 03E00008 */ jr $ra -/* 9903CC 80240BEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_13/func_80240BF0_98F7E0.s b/asm/nonmatchings/world/area_isk/isk_13/func_80240BF0_98F7E0.s deleted file mode 100644 index 59c9f0a907..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/func_80240BF0_98F7E0.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BF0_9903D0 -/* 9903D0 80240BF0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9903D4 80240BF4 AFB3003C */ sw $s3, 0x3c($sp) -/* 9903D8 80240BF8 0080982D */ daddu $s3, $a0, $zero -/* 9903DC 80240BFC AFBF0048 */ sw $ra, 0x48($sp) -/* 9903E0 80240C00 AFB50044 */ sw $s5, 0x44($sp) -/* 9903E4 80240C04 AFB40040 */ sw $s4, 0x40($sp) -/* 9903E8 80240C08 AFB20038 */ sw $s2, 0x38($sp) -/* 9903EC 80240C0C AFB10034 */ sw $s1, 0x34($sp) -/* 9903F0 80240C10 AFB00030 */ sw $s0, 0x30($sp) -/* 9903F4 80240C14 8E720148 */ lw $s2, 0x148($s3) -/* 9903F8 80240C18 86440008 */ lh $a0, 8($s2) -/* 9903FC 80240C1C 8E70000C */ lw $s0, 0xc($s3) -/* 990400 80240C20 0C00EABB */ jal get_npc_unsafe -/* 990404 80240C24 00A0882D */ daddu $s1, $a1, $zero -/* 990408 80240C28 8E050000 */ lw $a1, ($s0) -/* 99040C 80240C2C 26100004 */ addiu $s0, $s0, 4 -/* 990410 80240C30 0260202D */ daddu $a0, $s3, $zero -/* 990414 80240C34 0C0B1EAF */ jal get_variable -/* 990418 80240C38 0040A82D */ daddu $s5, $v0, $zero -/* 99041C 80240C3C 0260202D */ daddu $a0, $s3, $zero -/* 990420 80240C40 8E050000 */ lw $a1, ($s0) -/* 990424 80240C44 0C0B1EAF */ jal get_variable -/* 990428 80240C48 0040A02D */ daddu $s4, $v0, $zero -/* 99042C 80240C4C AE420094 */ sw $v0, 0x94($s2) -/* 990430 80240C50 AFA00010 */ sw $zero, 0x10($sp) -/* 990434 80240C54 8E4200D0 */ lw $v0, 0xd0($s2) -/* 990438 80240C58 8C420030 */ lw $v0, 0x30($v0) -/* 99043C 80240C5C AFA20014 */ sw $v0, 0x14($sp) -/* 990440 80240C60 8E4200D0 */ lw $v0, 0xd0($s2) -/* 990444 80240C64 8C42001C */ lw $v0, 0x1c($v0) -/* 990448 80240C68 AFA20018 */ sw $v0, 0x18($sp) -/* 99044C 80240C6C 8E4200D0 */ lw $v0, 0xd0($s2) -/* 990450 80240C70 8C420024 */ lw $v0, 0x24($v0) -/* 990454 80240C74 AFA2001C */ sw $v0, 0x1c($sp) -/* 990458 80240C78 8E4200D0 */ lw $v0, 0xd0($s2) -/* 99045C 80240C7C 8C420028 */ lw $v0, 0x28($v0) -/* 990460 80240C80 AFA20020 */ sw $v0, 0x20($sp) -/* 990464 80240C84 8E4200D0 */ lw $v0, 0xd0($s2) -/* 990468 80240C88 3C0142C8 */ lui $at, 0x42c8 -/* 99046C 80240C8C 44810000 */ mtc1 $at, $f0 -/* 990470 80240C90 8C42002C */ lw $v0, 0x2c($v0) -/* 990474 80240C94 27B00010 */ addiu $s0, $sp, 0x10 -/* 990478 80240C98 E7A00028 */ swc1 $f0, 0x28($sp) -/* 99047C 80240C9C A7A0002C */ sh $zero, 0x2c($sp) -/* 990480 80240CA0 12200019 */ beqz $s1, .L80240D08 -/* 990484 80240CA4 AFA20024 */ sw $v0, 0x24($sp) -/* 990488 80240CA8 AE600070 */ sw $zero, 0x70($s3) -/* 99048C 80240CAC A6A0008E */ sh $zero, 0x8e($s5) -/* 990490 80240CB0 AE600074 */ sw $zero, 0x74($s3) -/* 990494 80240CB4 8EA20000 */ lw $v0, ($s5) -/* 990498 80240CB8 2403F7FF */ addiu $v1, $zero, -0x801 -/* 99049C 80240CBC 00431024 */ and $v0, $v0, $v1 -/* 9904A0 80240CC0 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9904A4 80240CC4 00431024 */ and $v0, $v0, $v1 -/* 9904A8 80240CC8 34420008 */ ori $v0, $v0, 8 -/* 9904AC 80240CCC AEA20000 */ sw $v0, ($s5) -/* 9904B0 80240CD0 8E4200B0 */ lw $v0, 0xb0($s2) -/* 9904B4 80240CD4 34420018 */ ori $v0, $v0, 0x18 -/* 9904B8 80240CD8 AE4200B0 */ sw $v0, 0xb0($s2) -/* 9904BC 80240CDC 8E420000 */ lw $v0, ($s2) -/* 9904C0 80240CE0 3C034000 */ lui $v1, 0x4000 -/* 9904C4 80240CE4 00431024 */ and $v0, $v0, $v1 -/* 9904C8 80240CE8 10400007 */ beqz $v0, .L80240D08 -/* 9904CC 80240CEC 3C03BFFF */ lui $v1, 0xbfff -/* 9904D0 80240CF0 2402000C */ addiu $v0, $zero, 0xc -/* 9904D4 80240CF4 AE620070 */ sw $v0, 0x70($s3) -/* 9904D8 80240CF8 8E420000 */ lw $v0, ($s2) -/* 9904DC 80240CFC 3463FFFF */ ori $v1, $v1, 0xffff -/* 9904E0 80240D00 00431024 */ and $v0, $v0, $v1 -/* 9904E4 80240D04 AE420000 */ sw $v0, ($s2) -.L80240D08: -/* 9904E8 80240D08 8E4300B0 */ lw $v1, 0xb0($s2) -/* 9904EC 80240D0C 30620004 */ andi $v0, $v1, 4 -/* 9904F0 80240D10 10400007 */ beqz $v0, .L80240D30 -/* 9904F4 80240D14 00000000 */ nop -/* 9904F8 80240D18 824200B4 */ lb $v0, 0xb4($s2) -/* 9904FC 80240D1C 14400034 */ bnez $v0, .L80240DF0 -/* 990500 80240D20 0000102D */ daddu $v0, $zero, $zero -/* 990504 80240D24 2402FFFB */ addiu $v0, $zero, -5 -/* 990508 80240D28 00621024 */ and $v0, $v1, $v0 -/* 99050C 80240D2C AE4200B0 */ sw $v0, 0xb0($s2) -.L80240D30: -/* 990510 80240D30 8E630070 */ lw $v1, 0x70($s3) -/* 990514 80240D34 2C62000F */ sltiu $v0, $v1, 0xf -/* 990518 80240D38 1040002C */ beqz $v0, .L80240DEC -/* 99051C 80240D3C 00031080 */ sll $v0, $v1, 2 -/* 990520 80240D40 3C018024 */ lui $at, 0x8024 -/* 990524 80240D44 00220821 */ addu $at, $at, $v0 -/* 990528 80240D48 8C222EB8 */ lw $v0, 0x2eb8($at) -/* 99052C 80240D4C 00400008 */ jr $v0 -/* 990530 80240D50 00000000 */ nop -/* 990534 80240D54 0260202D */ daddu $a0, $s3, $zero -/* 990538 80240D58 0280282D */ daddu $a1, $s4, $zero -/* 99053C 80240D5C 0C090000 */ jal func_80240000 -/* 990540 80240D60 0200302D */ daddu $a2, $s0, $zero -/* 990544 80240D64 0260202D */ daddu $a0, $s3, $zero -/* 990548 80240D68 0280282D */ daddu $a1, $s4, $zero -/* 99054C 80240D6C 0C09008C */ jal func_80240230 -/* 990550 80240D70 0200302D */ daddu $a2, $s0, $zero -/* 990554 80240D74 0809037C */ j .L80240DF0 -/* 990558 80240D78 0000102D */ daddu $v0, $zero, $zero -/* 99055C 80240D7C 0260202D */ daddu $a0, $s3, $zero -/* 990560 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 990564 80240D84 0C09015A */ jal func_80240568 -/* 990568 80240D88 0200302D */ daddu $a2, $s0, $zero -/* 99056C 80240D8C 8E630070 */ lw $v1, 0x70($s3) -/* 990570 80240D90 24020003 */ addiu $v0, $zero, 3 -/* 990574 80240D94 14620016 */ bne $v1, $v0, .L80240DF0 -/* 990578 80240D98 0000102D */ daddu $v0, $zero, $zero -/* 99057C 80240D9C 0260202D */ daddu $a0, $s3, $zero -/* 990580 80240DA0 0280282D */ daddu $a1, $s4, $zero -/* 990584 80240DA4 0C09018A */ jal func_80240628 -/* 990588 80240DA8 0200302D */ daddu $a2, $s0, $zero -/* 99058C 80240DAC 0809037C */ j .L80240DF0 -/* 990590 80240DB0 0000102D */ daddu $v0, $zero, $zero -/* 990594 80240DB4 0260202D */ daddu $a0, $s3, $zero -/* 990598 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* 99059C 80240DBC 0C0901F3 */ jal func_802407CC -/* 9905A0 80240DC0 0200302D */ daddu $a2, $s0, $zero -/* 9905A4 80240DC4 0260202D */ daddu $a0, $s3, $zero -/* 9905A8 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* 9905AC 80240DCC 0C09022B */ jal func_802408AC -/* 9905B0 80240DD0 0200302D */ daddu $a2, $s0, $zero -/* 9905B4 80240DD4 0809037C */ j .L80240DF0 -/* 9905B8 80240DD8 0000102D */ daddu $v0, $zero, $zero -/* 9905BC 80240DDC 0260202D */ daddu $a0, $s3, $zero -/* 9905C0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 9905C4 80240DE4 0C0902EB */ jal func_80240BAC -/* 9905C8 80240DE8 0200302D */ daddu $a2, $s0, $zero -.L80240DEC: -/* 9905CC 80240DEC 0000102D */ daddu $v0, $zero, $zero -.L80240DF0: -/* 9905D0 80240DF0 8FBF0048 */ lw $ra, 0x48($sp) -/* 9905D4 80240DF4 8FB50044 */ lw $s5, 0x44($sp) -/* 9905D8 80240DF8 8FB40040 */ lw $s4, 0x40($sp) -/* 9905DC 80240DFC 8FB3003C */ lw $s3, 0x3c($sp) -/* 9905E0 80240E00 8FB20038 */ lw $s2, 0x38($sp) -/* 9905E4 80240E04 8FB10034 */ lw $s1, 0x34($sp) -/* 9905E8 80240E08 8FB00030 */ lw $s0, 0x30($sp) -/* 9905EC 80240E0C 03E00008 */ jr $ra -/* 9905F0 80240E10 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_isk/isk_13/func_80240E14_98F7E0.s b/asm/nonmatchings/world/area_isk/isk_13/func_80240E14_98F7E0.s deleted file mode 100644 index 5dd79c0428..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/func_80240E14_98F7E0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E14_9905F4 -/* 9905F4 80240E14 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9905F8 80240E18 AFB00010 */ sw $s0, 0x10($sp) -/* 9905FC 80240E1C 0080802D */ daddu $s0, $a0, $zero -/* 990600 80240E20 AFBF001C */ sw $ra, 0x1c($sp) -/* 990604 80240E24 AFB20018 */ sw $s2, 0x18($sp) -/* 990608 80240E28 AFB10014 */ sw $s1, 0x14($sp) -/* 99060C 80240E2C 8E020148 */ lw $v0, 0x148($s0) -/* 990610 80240E30 00A0882D */ daddu $s1, $a1, $zero -/* 990614 80240E34 84440008 */ lh $a0, 8($v0) -/* 990618 80240E38 0C00EABB */ jal get_npc_unsafe -/* 99061C 80240E3C 00C0902D */ daddu $s2, $a2, $zero -/* 990620 80240E40 0200202D */ daddu $a0, $s0, $zero -/* 990624 80240E44 0040802D */ daddu $s0, $v0, $zero -/* 990628 80240E48 0220282D */ daddu $a1, $s1, $zero -/* 99062C 80240E4C 0C012568 */ jal func_800495A0 -/* 990630 80240E50 0240302D */ daddu $a2, $s2, $zero -/* 990634 80240E54 0C00A67F */ jal rand_int -/* 990638 80240E58 24040005 */ addiu $a0, $zero, 5 -/* 99063C 80240E5C 3C014020 */ lui $at, 0x4020 -/* 990640 80240E60 44811800 */ mtc1 $at, $f3 -/* 990644 80240E64 44801000 */ mtc1 $zero, $f2 -/* 990648 80240E68 44820000 */ mtc1 $v0, $f0 -/* 99064C 80240E6C 00000000 */ nop -/* 990650 80240E70 46800021 */ cvt.d.w $f0, $f0 -/* 990654 80240E74 46220000 */ add.d $f0, $f0, $f2 -/* 990658 80240E78 3C013FC0 */ lui $at, 0x3fc0 -/* 99065C 80240E7C 44811000 */ mtc1 $at, $f2 -/* 990660 80240E80 00000000 */ nop -/* 990664 80240E84 E6020014 */ swc1 $f2, 0x14($s0) -/* 990668 80240E88 46200020 */ cvt.s.d $f0, $f0 -/* 99066C 80240E8C E600001C */ swc1 $f0, 0x1c($s0) -/* 990670 80240E90 8FBF001C */ lw $ra, 0x1c($sp) -/* 990674 80240E94 8FB20018 */ lw $s2, 0x18($sp) -/* 990678 80240E98 8FB10014 */ lw $s1, 0x14($sp) -/* 99067C 80240E9C 8FB00010 */ lw $s0, 0x10($sp) -/* 990680 80240EA0 03E00008 */ jr $ra -/* 990684 80240EA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_13/func_80240EA8_98F7E0.s b/asm/nonmatchings/world/area_isk/isk_13/func_80240EA8_98F7E0.s deleted file mode 100644 index 19e060af41..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/func_80240EA8_98F7E0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EA8_990688 -/* 990688 80240EA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 99068C 80240EAC AFB00010 */ sw $s0, 0x10($sp) -/* 990690 80240EB0 0080802D */ daddu $s0, $a0, $zero -/* 990694 80240EB4 AFBF001C */ sw $ra, 0x1c($sp) -/* 990698 80240EB8 AFB20018 */ sw $s2, 0x18($sp) -/* 99069C 80240EBC AFB10014 */ sw $s1, 0x14($sp) -/* 9906A0 80240EC0 8E020148 */ lw $v0, 0x148($s0) -/* 9906A4 80240EC4 00A0882D */ daddu $s1, $a1, $zero -/* 9906A8 80240EC8 84440008 */ lh $a0, 8($v0) -/* 9906AC 80240ECC 0C00EABB */ jal get_npc_unsafe -/* 9906B0 80240ED0 00C0902D */ daddu $s2, $a2, $zero -/* 9906B4 80240ED4 0200202D */ daddu $a0, $s0, $zero -/* 9906B8 80240ED8 0040802D */ daddu $s0, $v0, $zero -/* 9906BC 80240EDC 0220282D */ daddu $a1, $s1, $zero -/* 9906C0 80240EE0 0C0127DF */ jal func_80049F7C -/* 9906C4 80240EE4 0240302D */ daddu $a2, $s2, $zero -/* 9906C8 80240EE8 0C00A67F */ jal rand_int -/* 9906CC 80240EEC 24040005 */ addiu $a0, $zero, 5 -/* 9906D0 80240EF0 3C014014 */ lui $at, 0x4014 -/* 9906D4 80240EF4 44811800 */ mtc1 $at, $f3 -/* 9906D8 80240EF8 44801000 */ mtc1 $zero, $f2 -/* 9906DC 80240EFC 44820000 */ mtc1 $v0, $f0 -/* 9906E0 80240F00 00000000 */ nop -/* 9906E4 80240F04 46800021 */ cvt.d.w $f0, $f0 -/* 9906E8 80240F08 46220000 */ add.d $f0, $f0, $f2 -/* 9906EC 80240F0C 3C013FC0 */ lui $at, 0x3fc0 -/* 9906F0 80240F10 44811000 */ mtc1 $at, $f2 -/* 9906F4 80240F14 00000000 */ nop -/* 9906F8 80240F18 E6020014 */ swc1 $f2, 0x14($s0) -/* 9906FC 80240F1C 46200020 */ cvt.s.d $f0, $f0 -/* 990700 80240F20 E600001C */ swc1 $f0, 0x1c($s0) -/* 990704 80240F24 8FBF001C */ lw $ra, 0x1c($sp) -/* 990708 80240F28 8FB20018 */ lw $s2, 0x18($sp) -/* 99070C 80240F2C 8FB10014 */ lw $s1, 0x14($sp) -/* 990710 80240F30 8FB00010 */ lw $s0, 0x10($sp) -/* 990714 80240F34 03E00008 */ jr $ra -/* 990718 80240F38 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_13/func_80240F3C_98F7E0.s b/asm/nonmatchings/world/area_isk/isk_13/func_80240F3C_98F7E0.s deleted file mode 100644 index 30b5bf95b1..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/func_80240F3C_98F7E0.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F3C_99071C -/* 99071C 80240F3C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 990720 80240F40 AFB40040 */ sw $s4, 0x40($sp) -/* 990724 80240F44 0080A02D */ daddu $s4, $a0, $zero -/* 990728 80240F48 AFBF0048 */ sw $ra, 0x48($sp) -/* 99072C 80240F4C AFB50044 */ sw $s5, 0x44($sp) -/* 990730 80240F50 AFB3003C */ sw $s3, 0x3c($sp) -/* 990734 80240F54 AFB20038 */ sw $s2, 0x38($sp) -/* 990738 80240F58 AFB10034 */ sw $s1, 0x34($sp) -/* 99073C 80240F5C AFB00030 */ sw $s0, 0x30($sp) -/* 990740 80240F60 8E920148 */ lw $s2, 0x148($s4) -/* 990744 80240F64 86440008 */ lh $a0, 8($s2) -/* 990748 80240F68 8E90000C */ lw $s0, 0xc($s4) -/* 99074C 80240F6C 0C00EABB */ jal get_npc_unsafe -/* 990750 80240F70 00A0882D */ daddu $s1, $a1, $zero -/* 990754 80240F74 0280202D */ daddu $a0, $s4, $zero -/* 990758 80240F78 8E050000 */ lw $a1, ($s0) -/* 99075C 80240F7C 0C0B1EAF */ jal get_variable -/* 990760 80240F80 0040A82D */ daddu $s5, $v0, $zero -/* 990764 80240F84 AFA00010 */ sw $zero, 0x10($sp) -/* 990768 80240F88 8E4300D0 */ lw $v1, 0xd0($s2) -/* 99076C 80240F8C 8C630030 */ lw $v1, 0x30($v1) -/* 990770 80240F90 AFA30014 */ sw $v1, 0x14($sp) -/* 990774 80240F94 8E4300D0 */ lw $v1, 0xd0($s2) -/* 990778 80240F98 8C63001C */ lw $v1, 0x1c($v1) -/* 99077C 80240F9C AFA30018 */ sw $v1, 0x18($sp) -/* 990780 80240FA0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 990784 80240FA4 8C630024 */ lw $v1, 0x24($v1) -/* 990788 80240FA8 AFA3001C */ sw $v1, 0x1c($sp) -/* 99078C 80240FAC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 990790 80240FB0 8C630028 */ lw $v1, 0x28($v1) -/* 990794 80240FB4 27B30010 */ addiu $s3, $sp, 0x10 -/* 990798 80240FB8 AFA30020 */ sw $v1, 0x20($sp) -/* 99079C 80240FBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9907A0 80240FC0 3C0142C8 */ lui $at, 0x42c8 -/* 9907A4 80240FC4 44810000 */ mtc1 $at, $f0 -/* 9907A8 80240FC8 8C63002C */ lw $v1, 0x2c($v1) -/* 9907AC 80240FCC 0040802D */ daddu $s0, $v0, $zero -/* 9907B0 80240FD0 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9907B4 80240FD4 A7A0002C */ sh $zero, 0x2c($sp) -/* 9907B8 80240FD8 12200016 */ beqz $s1, .L80241034 -/* 9907BC 80240FDC AFA30024 */ sw $v1, 0x24($sp) -/* 9907C0 80240FE0 8EA20000 */ lw $v0, ($s5) -/* 9907C4 80240FE4 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9907C8 80240FE8 A6A0008E */ sh $zero, 0x8e($s5) -/* 9907CC 80240FEC 00431024 */ and $v0, $v0, $v1 -/* 9907D0 80240FF0 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9907D4 80240FF4 00431024 */ and $v0, $v0, $v1 -/* 9907D8 80240FF8 34420008 */ ori $v0, $v0, 8 -/* 9907DC 80240FFC AEA20000 */ sw $v0, ($s5) -/* 9907E0 80241000 AE800074 */ sw $zero, 0x74($s4) -/* 9907E4 80241004 AE800070 */ sw $zero, 0x70($s4) -/* 9907E8 80241008 8E420000 */ lw $v0, ($s2) -/* 9907EC 8024100C 3C034000 */ lui $v1, 0x4000 -/* 9907F0 80241010 00431024 */ and $v0, $v0, $v1 -/* 9907F4 80241014 10400007 */ beqz $v0, .L80241034 -/* 9907F8 80241018 3C03BFFF */ lui $v1, 0xbfff -/* 9907FC 8024101C 2402000C */ addiu $v0, $zero, 0xc -/* 990800 80241020 AE820070 */ sw $v0, 0x70($s4) -/* 990804 80241024 8E420000 */ lw $v0, ($s2) -/* 990808 80241028 3463FFFF */ ori $v1, $v1, 0xffff -/* 99080C 8024102C 00431024 */ and $v0, $v0, $v1 -/* 990810 80241030 AE420000 */ sw $v0, ($s2) -.L80241034: -/* 990814 80241034 8E830070 */ lw $v1, 0x70($s4) -/* 990818 80241038 2C62000F */ sltiu $v0, $v1, 0xf -/* 99081C 8024103C 10400028 */ beqz $v0, .L802410E0 -/* 990820 80241040 00031080 */ sll $v0, $v1, 2 -/* 990824 80241044 3C018024 */ lui $at, 0x8024 -/* 990828 80241048 00220821 */ addu $at, $at, $v0 -/* 99082C 8024104C 8C222EF8 */ lw $v0, 0x2ef8($at) -/* 990830 80241050 00400008 */ jr $v0 -/* 990834 80241054 00000000 */ nop -/* 990838 80241058 0280202D */ daddu $a0, $s4, $zero -/* 99083C 8024105C 0200282D */ daddu $a1, $s0, $zero -/* 990840 80241060 0C090385 */ jal func_80240E14 -/* 990844 80241064 0260302D */ daddu $a2, $s3, $zero -/* 990848 80241068 0280202D */ daddu $a0, $s4, $zero -/* 99084C 8024106C 0200282D */ daddu $a1, $s0, $zero -/* 990850 80241070 0C09008C */ jal func_80240230 -/* 990854 80241074 0260302D */ daddu $a2, $s3, $zero -/* 990858 80241078 08090438 */ j .L802410E0 -/* 99085C 8024107C 00000000 */ nop -/* 990860 80241080 0280202D */ daddu $a0, $s4, $zero -/* 990864 80241084 0200282D */ daddu $a1, $s0, $zero -/* 990868 80241088 0C09015A */ jal func_80240568 -/* 99086C 8024108C 0260302D */ daddu $a2, $s3, $zero -/* 990870 80241090 0280202D */ daddu $a0, $s4, $zero -/* 990874 80241094 0200282D */ daddu $a1, $s0, $zero -/* 990878 80241098 0C09018A */ jal func_80240628 -/* 99087C 8024109C 0260302D */ daddu $a2, $s3, $zero -/* 990880 802410A0 08090438 */ j .L802410E0 -/* 990884 802410A4 00000000 */ nop -/* 990888 802410A8 0280202D */ daddu $a0, $s4, $zero -/* 99088C 802410AC 0200282D */ daddu $a1, $s0, $zero -/* 990890 802410B0 0C0903AA */ jal func_80240EA8 -/* 990894 802410B4 0260302D */ daddu $a2, $s3, $zero -/* 990898 802410B8 0280202D */ daddu $a0, $s4, $zero -/* 99089C 802410BC 0200282D */ daddu $a1, $s0, $zero -/* 9908A0 802410C0 0C09022B */ jal func_802408AC -/* 9908A4 802410C4 0260302D */ daddu $a2, $s3, $zero -/* 9908A8 802410C8 08090438 */ j .L802410E0 -/* 9908AC 802410CC 00000000 */ nop -/* 9908B0 802410D0 0280202D */ daddu $a0, $s4, $zero -/* 9908B4 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 9908B8 802410D8 0C0902EB */ jal func_80240BAC -/* 9908BC 802410DC 0260302D */ daddu $a2, $s3, $zero -.L802410E0: -/* 9908C0 802410E0 8FBF0048 */ lw $ra, 0x48($sp) -/* 9908C4 802410E4 8FB50044 */ lw $s5, 0x44($sp) -/* 9908C8 802410E8 8FB40040 */ lw $s4, 0x40($sp) -/* 9908CC 802410EC 8FB3003C */ lw $s3, 0x3c($sp) -/* 9908D0 802410F0 8FB20038 */ lw $s2, 0x38($sp) -/* 9908D4 802410F4 8FB10034 */ lw $s1, 0x34($sp) -/* 9908D8 802410F8 8FB00030 */ lw $s0, 0x30($sp) -/* 9908DC 802410FC 0000102D */ daddu $v0, $zero, $zero -/* 9908E0 80241100 03E00008 */ jr $ra -/* 9908E4 80241104 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_isk/isk_13/func_80241108_98F7E0.s b/asm/nonmatchings/world/area_isk/isk_13/func_80241108_98F7E0.s deleted file mode 100644 index 282f00345a..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/func_80241108_98F7E0.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241108_9908E8 -/* 9908E8 80241108 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 9908EC 8024110C AFB40030 */ sw $s4, 0x30($sp) -/* 9908F0 80241110 27B40010 */ addiu $s4, $sp, 0x10 -/* 9908F4 80241114 AFB3002C */ sw $s3, 0x2c($sp) -/* 9908F8 80241118 0000982D */ daddu $s3, $zero, $zero -/* 9908FC 8024111C AFBF0038 */ sw $ra, 0x38($sp) -/* 990900 80241120 AFB50034 */ sw $s5, 0x34($sp) -/* 990904 80241124 AFB20028 */ sw $s2, 0x28($sp) -/* 990908 80241128 AFB10024 */ sw $s1, 0x24($sp) -/* 99090C 8024112C AFB00020 */ sw $s0, 0x20($sp) -/* 990910 80241130 8C84014C */ lw $a0, 0x14c($a0) -/* 990914 80241134 0C00EAD2 */ jal get_npc_safe -/* 990918 80241138 24150003 */ addiu $s5, $zero, 3 -/* 99091C 8024113C 24040080 */ addiu $a0, $zero, 0x80 -/* 990920 80241140 0C00AB39 */ jal heap_malloc -/* 990924 80241144 0040882D */ daddu $s1, $v0, $zero -/* 990928 80241148 0040902D */ daddu $s2, $v0, $zero -/* 99092C 8024114C 3C030035 */ lui $v1, 0x35 -/* 990930 80241150 34630002 */ ori $v1, $v1, 2 -/* 990934 80241154 2650000C */ addiu $s0, $s2, 0xc -/* 990938 80241158 3402814A */ ori $v0, $zero, 0x814a -/* 99093C 8024115C AE320020 */ sw $s2, 0x20($s1) -/* 990940 80241160 AFA20010 */ sw $v0, 0x10($sp) -/* 990944 80241164 AFA30014 */ sw $v1, 0x14($sp) -/* 990948 80241168 AFA00018 */ sw $zero, 0x18($sp) -/* 99094C 8024116C AFA0001C */ sw $zero, 0x1c($sp) -.L80241170: -/* 990950 80241170 0C00E211 */ jal create_basic_npc -/* 990954 80241174 0280202D */ daddu $a0, $s4, $zero -/* 990958 80241178 0C00E2B7 */ jal get_npc_by_index -/* 99095C 8024117C 0040202D */ daddu $a0, $v0, $zero -/* 990960 80241180 AE420000 */ sw $v0, ($s2) -/* 990964 80241184 C6200038 */ lwc1 $f0, 0x38($s1) -/* 990968 80241188 E4400038 */ swc1 $f0, 0x38($v0) -/* 99096C 8024118C C620003C */ lwc1 $f0, 0x3c($s1) -/* 990970 80241190 0040202D */ daddu $a0, $v0, $zero -/* 990974 80241194 E480003C */ swc1 $f0, 0x3c($a0) -/* 990978 80241198 C6200040 */ lwc1 $f0, 0x40($s1) -/* 99097C 8024119C 26730001 */ addiu $s3, $s3, 1 -/* 990980 802411A0 E4800040 */ swc1 $f0, 0x40($a0) -/* 990984 802411A4 C620000C */ lwc1 $f0, 0xc($s1) -/* 990988 802411A8 26520010 */ addiu $s2, $s2, 0x10 -/* 99098C 802411AC A09500AB */ sb $s5, 0xab($a0) -/* 990990 802411B0 0C00EAFF */ jal disable_npc_shadow -/* 990994 802411B4 E480000C */ swc1 $f0, 0xc($a0) -/* 990998 802411B8 AE00FFF8 */ sw $zero, -8($s0) -/* 99099C 802411BC AE00FFFC */ sw $zero, -4($s0) -/* 9909A0 802411C0 AE000000 */ sw $zero, ($s0) -/* 9909A4 802411C4 2A620008 */ slti $v0, $s3, 8 -/* 9909A8 802411C8 1440FFE9 */ bnez $v0, .L80241170 -/* 9909AC 802411CC 26100010 */ addiu $s0, $s0, 0x10 -/* 9909B0 802411D0 8FBF0038 */ lw $ra, 0x38($sp) -/* 9909B4 802411D4 8FB50034 */ lw $s5, 0x34($sp) -/* 9909B8 802411D8 8FB40030 */ lw $s4, 0x30($sp) -/* 9909BC 802411DC 8FB3002C */ lw $s3, 0x2c($sp) -/* 9909C0 802411E0 8FB20028 */ lw $s2, 0x28($sp) -/* 9909C4 802411E4 8FB10024 */ lw $s1, 0x24($sp) -/* 9909C8 802411E8 8FB00020 */ lw $s0, 0x20($sp) -/* 9909CC 802411EC 24020002 */ addiu $v0, $zero, 2 -/* 9909D0 802411F0 03E00008 */ jr $ra -/* 9909D4 802411F4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_isk/isk_13/func_802411F8_98F7E0.s b/asm/nonmatchings/world/area_isk/isk_13/func_802411F8_98F7E0.s deleted file mode 100644 index dec6f70f24..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/func_802411F8_98F7E0.s +++ /dev/null @@ -1,254 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411F8_9909D8 -/* 9909D8 802411F8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 9909DC 802411FC AFBF0034 */ sw $ra, 0x34($sp) -/* 9909E0 80241200 AFB40030 */ sw $s4, 0x30($sp) -/* 9909E4 80241204 AFB3002C */ sw $s3, 0x2c($sp) -/* 9909E8 80241208 AFB20028 */ sw $s2, 0x28($sp) -/* 9909EC 8024120C AFB10024 */ sw $s1, 0x24($sp) -/* 9909F0 80241210 AFB00020 */ sw $s0, 0x20($sp) -/* 9909F4 80241214 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* 9909F8 80241218 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* 9909FC 8024121C F7BA0050 */ sdc1 $f26, 0x50($sp) -/* 990A00 80241220 F7B80048 */ sdc1 $f24, 0x48($sp) -/* 990A04 80241224 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 990A08 80241228 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 990A0C 8024122C 8C820148 */ lw $v0, 0x148($a0) -/* 990A10 80241230 8C84014C */ lw $a0, 0x14c($a0) -/* 990A14 80241234 C45A006C */ lwc1 $f26, 0x6c($v0) -/* 990A18 80241238 0C00EAD2 */ jal get_npc_safe -/* 990A1C 8024123C 4680D6A0 */ cvt.s.w $f26, $f26 -/* 990A20 80241240 0040A02D */ daddu $s4, $v0, $zero -/* 990A24 80241244 8E930020 */ lw $s3, 0x20($s4) -/* 990A28 80241248 868200A8 */ lh $v0, 0xa8($s4) -/* 990A2C 8024124C 3C013E4C */ lui $at, 0x3e4c -/* 990A30 80241250 3421CCCD */ ori $at, $at, 0xcccd -/* 990A34 80241254 44810000 */ mtc1 $at, $f0 -/* 990A38 80241258 C6860038 */ lwc1 $f6, 0x38($s4) -/* 990A3C 8024125C 44821000 */ mtc1 $v0, $f2 -/* 990A40 80241260 00000000 */ nop -/* 990A44 80241264 468010A0 */ cvt.s.w $f2, $f2 -/* 990A48 80241268 46001082 */ mul.s $f2, $f2, $f0 -/* 990A4C 8024126C 00000000 */ nop -/* 990A50 80241270 C688003C */ lwc1 $f8, 0x3c($s4) -/* 990A54 80241274 3C014334 */ lui $at, 0x4334 -/* 990A58 80241278 44816000 */ mtc1 $at, $f12 -/* 990A5C 8024127C C6800034 */ lwc1 $f0, 0x34($s4) -/* 990A60 80241280 C6840040 */ lwc1 $f4, 0x40($s4) -/* 990A64 80241284 460C0300 */ add.s $f12, $f0, $f12 -/* 990A68 80241288 E7A60018 */ swc1 $f6, 0x18($sp) -/* 990A6C 8024128C E7A4001C */ swc1 $f4, 0x1c($sp) -/* 990A70 80241290 0C00A6C9 */ jal clamp_angle -/* 990A74 80241294 46024500 */ add.s $f20, $f8, $f2 -/* 990A78 80241298 868200A6 */ lh $v0, 0xa6($s4) -/* 990A7C 8024129C 3C013E99 */ lui $at, 0x3e99 -/* 990A80 802412A0 3421999A */ ori $at, $at, 0x999a -/* 990A84 802412A4 44812000 */ mtc1 $at, $f4 -/* 990A88 802412A8 44821000 */ mtc1 $v0, $f2 -/* 990A8C 802412AC 00000000 */ nop -/* 990A90 802412B0 468010A0 */ cvt.s.w $f2, $f2 -/* 990A94 802412B4 46041082 */ mul.s $f2, $f2, $f4 -/* 990A98 802412B8 00000000 */ nop -/* 990A9C 802412BC 27A40018 */ addiu $a0, $sp, 0x18 -/* 990AA0 802412C0 44070000 */ mfc1 $a3, $f0 -/* 990AA4 802412C4 44061000 */ mfc1 $a2, $f2 -/* 990AA8 802412C8 0C00A7E7 */ jal add_vec2D_polar -/* 990AAC 802412CC 27A5001C */ addiu $a1, $sp, 0x1c -/* 990AB0 802412D0 8E820000 */ lw $v0, ($s4) -/* 990AB4 802412D4 30420002 */ andi $v0, $v0, 2 -/* 990AB8 802412D8 1040000D */ beqz $v0, .L80241310 -/* 990ABC 802412DC 0000902D */ daddu $s2, $zero, $zero -/* 990AC0 802412E0 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 990AC4 802412E4 C7A0001C */ lwc1 $f0, 0x1c($sp) -.L802412E8: -/* 990AC8 802412E8 26520001 */ addiu $s2, $s2, 1 -/* 990ACC 802412EC 8E700000 */ lw $s0, ($s3) -/* 990AD0 802412F0 26730010 */ addiu $s3, $s3, 0x10 -/* 990AD4 802412F4 2A420008 */ slti $v0, $s2, 8 -/* 990AD8 802412F8 E6020038 */ swc1 $f2, 0x38($s0) -/* 990ADC 802412FC E614003C */ swc1 $f20, 0x3c($s0) -/* 990AE0 80241300 1440FFF9 */ bnez $v0, .L802412E8 -/* 990AE4 80241304 E6000040 */ swc1 $f0, 0x40($s0) -/* 990AE8 80241308 08090562 */ j .L80241588 -/* 990AEC 8024130C 0000102D */ daddu $v0, $zero, $zero -.L80241310: -/* 990AF0 80241310 26710008 */ addiu $s1, $s3, 8 -/* 990AF4 80241314 3C014024 */ lui $at, 0x4024 -/* 990AF8 80241318 4481C800 */ mtc1 $at, $f25 -/* 990AFC 8024131C 4480C000 */ mtc1 $zero, $f24 -/* 990B00 80241320 3C013F4C */ lui $at, 0x3f4c -/* 990B04 80241324 3421CCCD */ ori $at, $at, 0xcccd -/* 990B08 80241328 4481B000 */ mtc1 $at, $f22 -/* 990B0C 8024132C 3C013F33 */ lui $at, 0x3f33 -/* 990B10 80241330 34213333 */ ori $at, $at, 0x3333 -/* 990B14 80241334 4481E000 */ mtc1 $at, $f28 -/* 990B18 80241338 3C01C120 */ lui $at, 0xc120 -/* 990B1C 8024133C 4481F000 */ mtc1 $at, $f30 -.L80241340: -/* 990B20 80241340 8E700000 */ lw $s0, ($s3) -/* 990B24 80241344 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 990B28 80241348 E7B40010 */ swc1 $f20, 0x10($sp) -/* 990B2C 8024134C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 990B30 80241350 E7A00014 */ swc1 $f0, 0x14($sp) -/* 990B34 80241354 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 990B38 80241358 C60E003C */ lwc1 $f14, 0x3c($s0) -/* 990B3C 8024135C 8E060040 */ lw $a2, 0x40($s0) -/* 990B40 80241360 44071000 */ mfc1 $a3, $f2 -/* 990B44 80241364 0C00A7CB */ jal dist3D -/* 990B48 80241368 00000000 */ nop -/* 990B4C 8024136C 46000021 */ cvt.d.s $f0, $f0 -/* 990B50 80241370 4620C03E */ c.le.d $f24, $f0 -/* 990B54 80241374 00000000 */ nop -/* 990B58 80241378 45000047 */ bc1f .L80241498 -/* 990B5C 8024137C 00000000 */ nop -/* 990B60 80241380 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 990B64 80241384 C7A40018 */ lwc1 $f4, 0x18($sp) -/* 990B68 80241388 46046301 */ sub.s $f12, $f12, $f4 -/* 990B6C 8024138C 46166302 */ mul.s $f12, $f12, $f22 -/* 990B70 80241390 00000000 */ nop -/* 990B74 80241394 C6000040 */ lwc1 $f0, 0x40($s0) -/* 990B78 80241398 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 990B7C 8024139C 46020001 */ sub.s $f0, $f0, $f2 -/* 990B80 802413A0 46160002 */ mul.s $f0, $f0, $f22 -/* 990B84 802413A4 00000000 */ nop -/* 990B88 802413A8 E7B40010 */ swc1 $f20, 0x10($sp) -/* 990B8C 802413AC E7A20014 */ swc1 $f2, 0x14($sp) -/* 990B90 802413B0 46020000 */ add.s $f0, $f0, $f2 -/* 990B94 802413B4 C60E003C */ lwc1 $f14, 0x3c($s0) -/* 990B98 802413B8 44072000 */ mfc1 $a3, $f4 -/* 990B9C 802413BC 44060000 */ mfc1 $a2, $f0 -/* 990BA0 802413C0 0C00A7CB */ jal dist3D -/* 990BA4 802413C4 46046300 */ add.s $f12, $f12, $f4 -/* 990BA8 802413C8 C6080038 */ lwc1 $f8, 0x38($s0) -/* 990BAC 802413CC C7A20018 */ lwc1 $f2, 0x18($sp) -/* 990BB0 802413D0 46024201 */ sub.s $f8, $f8, $f2 -/* 990BB4 802413D4 46164202 */ mul.s $f8, $f8, $f22 -/* 990BB8 802413D8 00000000 */ nop -/* 990BBC 802413DC C606003C */ lwc1 $f6, 0x3c($s0) -/* 990BC0 802413E0 46000021 */ cvt.d.s $f0, $f0 -/* 990BC4 802413E4 46143181 */ sub.s $f6, $f6, $f20 -/* 990BC8 802413E8 4620C003 */ div.d $f0, $f24, $f0 -/* 990BCC 802413EC 46200020 */ cvt.s.d $f0, $f0 -/* 990BD0 802413F0 46003182 */ mul.s $f6, $f6, $f0 -/* 990BD4 802413F4 00000000 */ nop -/* 990BD8 802413F8 C6040040 */ lwc1 $f4, 0x40($s0) -/* 990BDC 802413FC C7AA001C */ lwc1 $f10, 0x1c($sp) -/* 990BE0 80241400 460A2101 */ sub.s $f4, $f4, $f10 -/* 990BE4 80241404 46162102 */ mul.s $f4, $f4, $f22 -/* 990BE8 80241408 00000000 */ nop -/* 990BEC 8024140C 46004202 */ mul.s $f8, $f8, $f0 -/* 990BF0 80241410 00000000 */ nop -/* 990BF4 80241414 46002102 */ mul.s $f4, $f4, $f0 -/* 990BF8 80241418 00000000 */ nop -/* 990BFC 8024141C 46024200 */ add.s $f8, $f8, $f2 -/* 990C00 80241420 C6020038 */ lwc1 $f2, 0x38($s0) -/* 990C04 80241424 46024081 */ sub.s $f2, $f8, $f2 -/* 990C08 80241428 461C1082 */ mul.s $f2, $f2, $f28 -/* 990C0C 8024142C 00000000 */ nop -/* 990C10 80241430 4606A500 */ add.s $f20, $f20, $f6 -/* 990C14 80241434 E622FFFC */ swc1 $f2, -4($s1) -/* 990C18 80241438 C602003C */ lwc1 $f2, 0x3c($s0) -/* 990C1C 8024143C 4602A081 */ sub.s $f2, $f20, $f2 -/* 990C20 80241440 461C1082 */ mul.s $f2, $f2, $f28 -/* 990C24 80241444 00000000 */ nop -/* 990C28 80241448 460A2100 */ add.s $f4, $f4, $f10 -/* 990C2C 8024144C E6220000 */ swc1 $f2, ($s1) -/* 990C30 80241450 C6000040 */ lwc1 $f0, 0x40($s0) -/* 990C34 80241454 46002001 */ sub.s $f0, $f4, $f0 -/* 990C38 80241458 461C0002 */ mul.s $f0, $f0, $f28 -/* 990C3C 8024145C 00000000 */ nop -/* 990C40 80241460 3C014120 */ lui $at, 0x4120 -/* 990C44 80241464 44818000 */ mtc1 $at, $f16 -/* 990C48 80241468 E6200004 */ swc1 $f0, 4($s1) -/* 990C4C 8024146C E6080038 */ swc1 $f8, 0x38($s0) -/* 990C50 80241470 E614003C */ swc1 $f20, 0x3c($s0) -/* 990C54 80241474 E6040040 */ swc1 $f4, 0x40($s0) -/* 990C58 80241478 C6200000 */ lwc1 $f0, ($s1) -/* 990C5C 8024147C E7A80018 */ swc1 $f8, 0x18($sp) -/* 990C60 80241480 4600803C */ c.lt.s $f16, $f0 -/* 990C64 80241484 00000000 */ nop -/* 990C68 80241488 45000016 */ bc1f .L802414E4 -/* 990C6C 8024148C E7A4001C */ swc1 $f4, 0x1c($sp) -/* 990C70 80241490 08090539 */ j .L802414E4 -/* 990C74 80241494 E6300000 */ swc1 $f16, ($s1) -.L80241498: -/* 990C78 80241498 C622FFFC */ lwc1 $f2, -4($s1) -/* 990C7C 8024149C 3C013F66 */ lui $at, 0x3f66 -/* 990C80 802414A0 34216666 */ ori $at, $at, 0x6666 -/* 990C84 802414A4 44818000 */ mtc1 $at, $f16 -/* 990C88 802414A8 00000000 */ nop -/* 990C8C 802414AC 46101082 */ mul.s $f2, $f2, $f16 -/* 990C90 802414B0 00000000 */ nop -/* 990C94 802414B4 C6200004 */ lwc1 $f0, 4($s1) -/* 990C98 802414B8 46100002 */ mul.s $f0, $f0, $f16 -/* 990C9C 802414BC 00000000 */ nop -/* 990CA0 802414C0 E622FFFC */ swc1 $f2, -4($s1) -/* 990CA4 802414C4 E6200004 */ swc1 $f0, 4($s1) -/* 990CA8 802414C8 C6000038 */ lwc1 $f0, 0x38($s0) -/* 990CAC 802414CC 46020000 */ add.s $f0, $f0, $f2 -/* 990CB0 802414D0 E6000038 */ swc1 $f0, 0x38($s0) -/* 990CB4 802414D4 C6000040 */ lwc1 $f0, 0x40($s0) -/* 990CB8 802414D8 C6220004 */ lwc1 $f2, 4($s1) -/* 990CBC 802414DC 46020000 */ add.s $f0, $f0, $f2 -/* 990CC0 802414E0 E6000040 */ swc1 $f0, 0x40($s0) -.L802414E4: -/* 990CC4 802414E4 C6220000 */ lwc1 $f2, ($s1) -/* 990CC8 802414E8 3C013F80 */ lui $at, 0x3f80 -/* 990CCC 802414EC 44810000 */ mtc1 $at, $f0 -/* 990CD0 802414F0 00000000 */ nop -/* 990CD4 802414F4 46001081 */ sub.s $f2, $f2, $f0 -/* 990CD8 802414F8 461E103C */ c.lt.s $f2, $f30 -/* 990CDC 802414FC 00000000 */ nop -/* 990CE0 80241500 45000002 */ bc1f .L8024150C -/* 990CE4 80241504 E6220000 */ swc1 $f2, ($s1) -/* 990CE8 80241508 E63E0000 */ swc1 $f30, ($s1) -.L8024150C: -/* 990CEC 8024150C C602003C */ lwc1 $f2, 0x3c($s0) -/* 990CF0 80241510 C6200000 */ lwc1 $f0, ($s1) -/* 990CF4 80241514 46001080 */ add.s $f2, $f2, $f0 -/* 990CF8 80241518 461A103E */ c.le.s $f2, $f26 -/* 990CFC 8024151C 00000000 */ nop -/* 990D00 80241520 4500000C */ bc1f .L80241554 -/* 990D04 80241524 E602003C */ swc1 $f2, 0x3c($s0) -/* 990D08 80241528 E61A003C */ swc1 $f26, 0x3c($s0) -/* 990D0C 8024152C C6200000 */ lwc1 $f0, ($s1) -/* 990D10 80241530 3C013FE0 */ lui $at, 0x3fe0 -/* 990D14 80241534 44811800 */ mtc1 $at, $f3 -/* 990D18 80241538 44801000 */ mtc1 $zero, $f2 -/* 990D1C 8024153C 46000007 */ neg.s $f0, $f0 -/* 990D20 80241540 46000021 */ cvt.d.s $f0, $f0 -/* 990D24 80241544 46220002 */ mul.d $f0, $f0, $f2 -/* 990D28 80241548 00000000 */ nop -/* 990D2C 8024154C 46200020 */ cvt.s.d $f0, $f0 -/* 990D30 80241550 E6200000 */ swc1 $f0, ($s1) -.L80241554: -/* 990D34 80241554 26520001 */ addiu $s2, $s2, 1 -/* 990D38 80241558 26310010 */ addiu $s1, $s1, 0x10 -/* 990D3C 8024155C C614003C */ lwc1 $f20, 0x3c($s0) -/* 990D40 80241560 C6000038 */ lwc1 $f0, 0x38($s0) -/* 990D44 80241564 C6020040 */ lwc1 $f2, 0x40($s0) -/* 990D48 80241568 8E820000 */ lw $v0, ($s4) -/* 990D4C 8024156C E7A00018 */ swc1 $f0, 0x18($sp) -/* 990D50 80241570 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 990D54 80241574 AE020000 */ sw $v0, ($s0) -/* 990D58 80241578 2A420008 */ slti $v0, $s2, 8 -/* 990D5C 8024157C 1440FF70 */ bnez $v0, .L80241340 -/* 990D60 80241580 26730010 */ addiu $s3, $s3, 0x10 -/* 990D64 80241584 0000102D */ daddu $v0, $zero, $zero -.L80241588: -/* 990D68 80241588 8FBF0034 */ lw $ra, 0x34($sp) -/* 990D6C 8024158C 8FB40030 */ lw $s4, 0x30($sp) -/* 990D70 80241590 8FB3002C */ lw $s3, 0x2c($sp) -/* 990D74 80241594 8FB20028 */ lw $s2, 0x28($sp) -/* 990D78 80241598 8FB10024 */ lw $s1, 0x24($sp) -/* 990D7C 8024159C 8FB00020 */ lw $s0, 0x20($sp) -/* 990D80 802415A0 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* 990D84 802415A4 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* 990D88 802415A8 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* 990D8C 802415AC D7B80048 */ ldc1 $f24, 0x48($sp) -/* 990D90 802415B0 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 990D94 802415B4 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 990D98 802415B8 03E00008 */ jr $ra -/* 990D9C 802415BC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_isk/isk_13/func_802415C0_98F7E0.s b/asm/nonmatchings/world/area_isk/isk_13/func_802415C0_98F7E0.s deleted file mode 100644 index 1d61d77198..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/func_802415C0_98F7E0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415C0_990DA0 -/* 990DA0 802415C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 990DA4 802415C4 AFBF0018 */ sw $ra, 0x18($sp) -/* 990DA8 802415C8 AFB10014 */ sw $s1, 0x14($sp) -/* 990DAC 802415CC AFB00010 */ sw $s0, 0x10($sp) -/* 990DB0 802415D0 8C84014C */ lw $a0, 0x14c($a0) -/* 990DB4 802415D4 0C00EAD2 */ jal get_npc_safe -/* 990DB8 802415D8 0000882D */ daddu $s1, $zero, $zero -/* 990DBC 802415DC 8C500020 */ lw $s0, 0x20($v0) -.L802415E0: -/* 990DC0 802415E0 8E040000 */ lw $a0, ($s0) -/* 990DC4 802415E4 26310001 */ addiu $s1, $s1, 1 -/* 990DC8 802415E8 0C00E273 */ jal free_npc -/* 990DCC 802415EC 26100010 */ addiu $s0, $s0, 0x10 -/* 990DD0 802415F0 2A220008 */ slti $v0, $s1, 8 -/* 990DD4 802415F4 1440FFFA */ bnez $v0, .L802415E0 -/* 990DD8 802415F8 24020002 */ addiu $v0, $zero, 2 -/* 990DDC 802415FC 8FBF0018 */ lw $ra, 0x18($sp) -/* 990DE0 80241600 8FB10014 */ lw $s1, 0x14($sp) -/* 990DE4 80241604 8FB00010 */ lw $s0, 0x10($sp) -/* 990DE8 80241608 03E00008 */ jr $ra -/* 990DEC 8024160C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_13/func_80241610_98F7E0.s b/asm/nonmatchings/world/area_isk/isk_13/func_80241610_98F7E0.s deleted file mode 100644 index c5d49f38b2..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/func_80241610_98F7E0.s +++ /dev/null @@ -1,365 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241610_990DF0 -/* 990DF0 80241610 27BDFEF8 */ addiu $sp, $sp, -0x108 -/* 990DF4 80241614 0000202D */ daddu $a0, $zero, $zero -/* 990DF8 80241618 3C05FD05 */ lui $a1, 0xfd05 -/* 990DFC 8024161C AFBF00F4 */ sw $ra, 0xf4($sp) -/* 990E00 80241620 AFBE00F0 */ sw $fp, 0xf0($sp) -/* 990E04 80241624 AFB700EC */ sw $s7, 0xec($sp) -/* 990E08 80241628 AFB600E8 */ sw $s6, 0xe8($sp) -/* 990E0C 8024162C AFB500E4 */ sw $s5, 0xe4($sp) -/* 990E10 80241630 AFB400E0 */ sw $s4, 0xe0($sp) -/* 990E14 80241634 AFB300DC */ sw $s3, 0xdc($sp) -/* 990E18 80241638 AFB200D8 */ sw $s2, 0xd8($sp) -/* 990E1C 8024163C AFB100D4 */ sw $s1, 0xd4($sp) -/* 990E20 80241640 AFB000D0 */ sw $s0, 0xd0($sp) -/* 990E24 80241644 F7B60100 */ sdc1 $f22, 0x100($sp) -/* 990E28 80241648 F7B400F8 */ sdc1 $f20, 0xf8($sp) -/* 990E2C 8024164C 0C0B1EAF */ jal get_variable -/* 990E30 80241650 34A50F8A */ ori $a1, $a1, 0xf8a -/* 990E34 80241654 3C03DC08 */ lui $v1, 0xdc08 -/* 990E38 80241658 3C1E800A */ lui $fp, 0x800a -/* 990E3C 8024165C 27DEA66C */ addiu $fp, $fp, -0x5994 -/* 990E40 80241660 34630008 */ ori $v1, $v1, 8 -/* 990E44 80241664 8FC60000 */ lw $a2, ($fp) -/* 990E48 80241668 3C168007 */ lui $s6, %hi(gCurrentCameraID) -/* 990E4C 8024166C 26D67410 */ addiu $s6, $s6, %lo(gCurrentCameraID) -/* 990E50 80241670 00C0282D */ daddu $a1, $a2, $zero -/* 990E54 80241674 24C60008 */ addiu $a2, $a2, 8 -/* 990E58 80241678 AFC60000 */ sw $a2, ($fp) -/* 990E5C 8024167C ACA30000 */ sw $v1, ($a1) -/* 990E60 80241680 8EC40000 */ lw $a0, ($s6) -/* 990E64 80241684 3C18800B */ lui $t8, %hi(gCameras) -/* 990E68 80241688 27181D80 */ addiu $t8, $t8, %lo(gCameras) -/* 990E6C 8024168C 00041880 */ sll $v1, $a0, 2 -/* 990E70 80241690 00641821 */ addu $v1, $v1, $a0 -/* 990E74 80241694 00031880 */ sll $v1, $v1, 2 -/* 990E78 80241698 00641823 */ subu $v1, $v1, $a0 -/* 990E7C 8024169C 000320C0 */ sll $a0, $v1, 3 -/* 990E80 802416A0 00641821 */ addu $v1, $v1, $a0 -/* 990E84 802416A4 000318C0 */ sll $v1, $v1, 3 -/* 990E88 802416A8 00782021 */ addu $a0, $v1, $t8 -/* 990E8C 802416AC 248300A0 */ addiu $v1, $a0, 0xa0 -/* 990E90 802416B0 ACA30004 */ sw $v1, 4($a1) -/* 990E94 802416B4 94830000 */ lhu $v1, ($a0) -/* 990E98 802416B8 30630010 */ andi $v1, $v1, 0x10 -/* 990E9C 802416BC 14600007 */ bnez $v1, .L802416DC -/* 990EA0 802416C0 0040B82D */ daddu $s7, $v0, $zero -/* 990EA4 802416C4 3C02DB0E */ lui $v0, 0xdb0e -/* 990EA8 802416C8 ACC20000 */ sw $v0, ($a2) -/* 990EAC 802416CC 94830038 */ lhu $v1, 0x38($a0) -/* 990EB0 802416D0 24C20008 */ addiu $v0, $a2, 8 -/* 990EB4 802416D4 AFC20000 */ sw $v0, ($fp) -/* 990EB8 802416D8 ACC30004 */ sw $v1, 4($a2) -.L802416DC: -/* 990EBC 802416DC 248400D4 */ addiu $a0, $a0, 0xd4 -/* 990EC0 802416E0 3C180001 */ lui $t8, 1 -/* 990EC4 802416E4 3C12800A */ lui $s2, 0x800a -/* 990EC8 802416E8 2652A674 */ addiu $s2, $s2, -0x598c -/* 990ECC 802416EC AFB800C8 */ sw $t8, 0xc8($sp) -/* 990ED0 802416F0 8EC50000 */ lw $a1, ($s6) -/* 990ED4 802416F4 8E420000 */ lw $v0, ($s2) -/* 990ED8 802416F8 00052980 */ sll $a1, $a1, 6 -/* 990EDC 802416FC 24A50030 */ addiu $a1, $a1, 0x30 -/* 990EE0 80241700 0C019D40 */ jal guMtxF2L -/* 990EE4 80241704 00452821 */ addu $a1, $v0, $a1 -/* 990EE8 80241708 3C03DA38 */ lui $v1, 0xda38 -/* 990EEC 8024170C 34630007 */ ori $v1, $v1, 7 -/* 990EF0 80241710 3C07E300 */ lui $a3, 0xe300 -/* 990EF4 80241714 34E70A01 */ ori $a3, $a3, 0xa01 -/* 990EF8 80241718 3C08D9C0 */ lui $t0, 0xd9c0 -/* 990EFC 8024171C 3508F9FB */ ori $t0, $t0, 0xf9fb -/* 990F00 80241720 3C0AD9FF */ lui $t2, 0xd9ff -/* 990F04 80241724 354AFFFF */ ori $t2, $t2, 0xffff -/* 990F08 80241728 3C090020 */ lui $t1, 0x20 -/* 990F0C 8024172C 35290005 */ ori $t1, $t1, 5 -/* 990F10 80241730 3C0BD700 */ lui $t3, 0xd700 -/* 990F14 80241734 356B0002 */ ori $t3, $t3, 2 -/* 990F18 80241738 3C0CE300 */ lui $t4, 0xe300 -/* 990F1C 8024173C 358C0F00 */ ori $t4, $t4, 0xf00 -/* 990F20 80241740 3C0DE300 */ lui $t5, 0xe300 -/* 990F24 80241744 35AD0C00 */ ori $t5, $t5, 0xc00 -/* 990F28 80241748 3C0EE300 */ lui $t6, 0xe300 -/* 990F2C 8024174C 35CE1201 */ ori $t6, $t6, 0x1201 -/* 990F30 80241750 3C0FE300 */ lui $t7, 0xe300 -/* 990F34 80241754 35EF1801 */ ori $t7, $t7, 0x1801 -/* 990F38 80241758 3C10E300 */ lui $s0, 0xe300 -/* 990F3C 8024175C 36100D01 */ ori $s0, $s0, 0xd01 -/* 990F40 80241760 3C13E300 */ lui $s3, 0xe300 -/* 990F44 80241764 36731402 */ ori $s3, $s3, 0x1402 -/* 990F48 80241768 3C14E300 */ lui $s4, 0xe300 -/* 990F4C 8024176C 36941700 */ ori $s4, $s4, 0x1700 -/* 990F50 80241770 3C15E200 */ lui $s5, 0xe200 -/* 990F54 80241774 36B51E01 */ ori $s5, $s5, 0x1e01 -/* 990F58 80241778 27B10048 */ addiu $s1, $sp, 0x48 -/* 990F5C 8024177C 0220202D */ daddu $a0, $s1, $zero -/* 990F60 80241780 8FC20000 */ lw $v0, ($fp) -/* 990F64 80241784 8EC50000 */ lw $a1, ($s6) -/* 990F68 80241788 0040302D */ daddu $a2, $v0, $zero -/* 990F6C 8024178C 24420008 */ addiu $v0, $v0, 8 -/* 990F70 80241790 00052980 */ sll $a1, $a1, 6 -/* 990F74 80241794 AFC20000 */ sw $v0, ($fp) -/* 990F78 80241798 ACC30000 */ sw $v1, ($a2) -/* 990F7C 8024179C 8E430000 */ lw $v1, ($s2) -/* 990F80 802417A0 24A50030 */ addiu $a1, $a1, 0x30 -/* 990F84 802417A4 00651821 */ addu $v1, $v1, $a1 -/* 990F88 802417A8 ACC30004 */ sw $v1, 4($a2) -/* 990F8C 802417AC 24430008 */ addiu $v1, $v0, 8 -/* 990F90 802417B0 AFC30000 */ sw $v1, ($fp) -/* 990F94 802417B4 3C03E700 */ lui $v1, 0xe700 -/* 990F98 802417B8 AC430000 */ sw $v1, ($v0) -/* 990F9C 802417BC 24430010 */ addiu $v1, $v0, 0x10 -/* 990FA0 802417C0 AC400004 */ sw $zero, 4($v0) -/* 990FA4 802417C4 AFC30000 */ sw $v1, ($fp) -/* 990FA8 802417C8 24430018 */ addiu $v1, $v0, 0x18 -/* 990FAC 802417CC AC470008 */ sw $a3, 8($v0) -/* 990FB0 802417D0 AC40000C */ sw $zero, 0xc($v0) -/* 990FB4 802417D4 AFC30000 */ sw $v1, ($fp) -/* 990FB8 802417D8 24430020 */ addiu $v1, $v0, 0x20 -/* 990FBC 802417DC AC480010 */ sw $t0, 0x10($v0) -/* 990FC0 802417E0 AC400014 */ sw $zero, 0x14($v0) -/* 990FC4 802417E4 AFC30000 */ sw $v1, ($fp) -/* 990FC8 802417E8 24430028 */ addiu $v1, $v0, 0x28 -/* 990FCC 802417EC AC4A0018 */ sw $t2, 0x18($v0) -/* 990FD0 802417F0 AC49001C */ sw $t1, 0x1c($v0) -/* 990FD4 802417F4 AFC30000 */ sw $v1, ($fp) -/* 990FD8 802417F8 2403FFFF */ addiu $v1, $zero, -1 -/* 990FDC 802417FC AC430024 */ sw $v1, 0x24($v0) -/* 990FE0 80241800 24430030 */ addiu $v1, $v0, 0x30 -/* 990FE4 80241804 AC4B0020 */ sw $t3, 0x20($v0) -/* 990FE8 80241808 AFC30000 */ sw $v1, ($fp) -/* 990FEC 8024180C 24430038 */ addiu $v1, $v0, 0x38 -/* 990FF0 80241810 AC4C0028 */ sw $t4, 0x28($v0) -/* 990FF4 80241814 AC40002C */ sw $zero, 0x2c($v0) -/* 990FF8 80241818 AFC30000 */ sw $v1, ($fp) -/* 990FFC 8024181C 3C030008 */ lui $v1, 8 -/* 991000 80241820 AC430034 */ sw $v1, 0x34($v0) -/* 991004 80241824 24430040 */ addiu $v1, $v0, 0x40 -/* 991008 80241828 AC4D0030 */ sw $t5, 0x30($v0) -/* 99100C 8024182C AFC30000 */ sw $v1, ($fp) -/* 991010 80241830 24032000 */ addiu $v1, $zero, 0x2000 -/* 991014 80241834 AC43003C */ sw $v1, 0x3c($v0) -/* 991018 80241838 24430048 */ addiu $v1, $v0, 0x48 -/* 99101C 8024183C AC4E0038 */ sw $t6, 0x38($v0) -/* 991020 80241840 AFC30000 */ sw $v1, ($fp) -/* 991024 80241844 240300C0 */ addiu $v1, $zero, 0xc0 -/* 991028 80241848 AC430044 */ sw $v1, 0x44($v0) -/* 99102C 8024184C 24430050 */ addiu $v1, $v0, 0x50 -/* 991030 80241850 AC4F0040 */ sw $t7, 0x40($v0) -/* 991034 80241854 AFC30000 */ sw $v1, ($fp) -/* 991038 80241858 24030C00 */ addiu $v1, $zero, 0xc00 -/* 99103C 8024185C AC500048 */ sw $s0, 0x48($v0) -/* 991040 80241860 AC40004C */ sw $zero, 0x4c($v0) -/* 991044 80241864 AC530050 */ sw $s3, 0x50($v0) -/* 991048 80241868 AC430054 */ sw $v1, 0x54($v0) -/* 99104C 8024186C AC540058 */ sw $s4, 0x58($v0) -/* 991050 80241870 AC40005C */ sw $zero, 0x5c($v0) -/* 991054 80241874 AC550060 */ sw $s5, 0x60($v0) -/* 991058 80241878 AC400064 */ sw $zero, 0x64($v0) -/* 99105C 8024187C 8EE50014 */ lw $a1, 0x14($s7) -/* 991060 80241880 8EE60018 */ lw $a2, 0x18($s7) -/* 991064 80241884 8EE7001C */ lw $a3, 0x1c($s7) -/* 991068 80241888 24430058 */ addiu $v1, $v0, 0x58 -/* 99106C 8024188C AFC30000 */ sw $v1, ($fp) -/* 991070 80241890 24430060 */ addiu $v1, $v0, 0x60 -/* 991074 80241894 24420068 */ addiu $v0, $v0, 0x68 -/* 991078 80241898 AFC30000 */ sw $v1, ($fp) -/* 99107C 8024189C 0C019E40 */ jal guTranslateF -/* 991080 802418A0 AFC20000 */ sw $v0, ($fp) -/* 991084 802418A4 27B00088 */ addiu $s0, $sp, 0x88 -/* 991088 802418A8 8FB800C8 */ lw $t8, 0xc8($sp) -/* 99108C 802418AC 8EC30000 */ lw $v1, ($s6) -/* 991090 802418B0 37181630 */ ori $t8, $t8, 0x1630 -/* 991094 802418B4 00031080 */ sll $v0, $v1, 2 -/* 991098 802418B8 00431021 */ addu $v0, $v0, $v1 -/* 99109C 802418BC 00021080 */ sll $v0, $v0, 2 -/* 9910A0 802418C0 00431023 */ subu $v0, $v0, $v1 -/* 9910A4 802418C4 000218C0 */ sll $v1, $v0, 3 -/* 9910A8 802418C8 00431021 */ addu $v0, $v0, $v1 -/* 9910AC 802418CC 000210C0 */ sll $v0, $v0, 3 -/* 9910B0 802418D0 AFB800C8 */ sw $t8, 0xc8($sp) -/* 9910B4 802418D4 3C18800B */ lui $t8, %hi(gCameras) -/* 9910B8 802418D8 27181D80 */ addiu $t8, $t8, %lo(gCameras) -/* 9910BC 802418DC 00581021 */ addu $v0, $v0, $t8 -/* 9910C0 802418E0 C6E00024 */ lwc1 $f0, 0x24($s7) -/* 9910C4 802418E4 C442006C */ lwc1 $f2, 0x6c($v0) -/* 9910C8 802418E8 4480A000 */ mtc1 $zero, $f20 -/* 9910CC 802418EC 46020000 */ add.s $f0, $f0, $f2 -/* 9910D0 802418F0 C6E20038 */ lwc1 $f2, 0x38($s7) -/* 9910D4 802418F4 3C013F80 */ lui $at, 0x3f80 -/* 9910D8 802418F8 4481B000 */ mtc1 $at, $f22 -/* 9910DC 802418FC 46020000 */ add.s $f0, $f0, $f2 -/* 9910E0 80241900 4406A000 */ mfc1 $a2, $f20 -/* 9910E4 80241904 4407B000 */ mfc1 $a3, $f22 -/* 9910E8 80241908 44050000 */ mfc1 $a1, $f0 -/* 9910EC 8024190C 0200202D */ daddu $a0, $s0, $zero -/* 9910F0 80241910 0C019EC8 */ jal guRotateF -/* 9910F4 80241914 E7B40010 */ swc1 $f20, 0x10($sp) -/* 9910F8 80241918 0200202D */ daddu $a0, $s0, $zero -/* 9910FC 8024191C 0220282D */ daddu $a1, $s1, $zero -/* 991100 80241920 0C019D80 */ jal guMtxCatF -/* 991104 80241924 0220302D */ daddu $a2, $s1, $zero -/* 991108 80241928 E7B60010 */ swc1 $f22, 0x10($sp) -/* 99110C 8024192C 8EE50028 */ lw $a1, 0x28($s7) -/* 991110 80241930 4406A000 */ mfc1 $a2, $f20 -/* 991114 80241934 4407A000 */ mfc1 $a3, $f20 -/* 991118 80241938 0C019EC8 */ jal guRotateF -/* 99111C 8024193C 0200202D */ daddu $a0, $s0, $zero -/* 991120 80241940 0200202D */ daddu $a0, $s0, $zero -/* 991124 80241944 0220282D */ daddu $a1, $s1, $zero -/* 991128 80241948 0C019D80 */ jal guMtxCatF -/* 99112C 8024194C 0220302D */ daddu $a2, $s1, $zero -/* 991130 80241950 E7B40010 */ swc1 $f20, 0x10($sp) -/* 991134 80241954 8EE50020 */ lw $a1, 0x20($s7) -/* 991138 80241958 4406B000 */ mfc1 $a2, $f22 -/* 99113C 8024195C 4407A000 */ mfc1 $a3, $f20 -/* 991140 80241960 0C019EC8 */ jal guRotateF -/* 991144 80241964 0200202D */ daddu $a0, $s0, $zero -/* 991148 80241968 0200202D */ daddu $a0, $s0, $zero -/* 99114C 8024196C 0220282D */ daddu $a1, $s1, $zero -/* 991150 80241970 0C019D80 */ jal guMtxCatF -/* 991154 80241974 0220302D */ daddu $a2, $s1, $zero -/* 991158 80241978 8EE5002C */ lw $a1, 0x2c($s7) -/* 99115C 8024197C 8EE60030 */ lw $a2, 0x30($s7) -/* 991160 80241980 8EE70034 */ lw $a3, 0x34($s7) -/* 991164 80241984 0C019DF0 */ jal guScaleF -/* 991168 80241988 0200202D */ daddu $a0, $s0, $zero -/* 99116C 8024198C 0200202D */ daddu $a0, $s0, $zero -/* 991170 80241990 0220282D */ daddu $a1, $s1, $zero -/* 991174 80241994 0C019D80 */ jal guMtxCatF -/* 991178 80241998 0220302D */ daddu $a2, $s1, $zero -/* 99117C 8024199C 3C108007 */ lui $s0, 0x8007 -/* 991180 802419A0 261041F0 */ addiu $s0, $s0, 0x41f0 -/* 991184 802419A4 0220202D */ daddu $a0, $s1, $zero -/* 991188 802419A8 96050000 */ lhu $a1, ($s0) -/* 99118C 802419AC 8E420000 */ lw $v0, ($s2) -/* 991190 802419B0 8FB800C8 */ lw $t8, 0xc8($sp) -/* 991194 802419B4 00052980 */ sll $a1, $a1, 6 -/* 991198 802419B8 00B82821 */ addu $a1, $a1, $t8 -/* 99119C 802419BC 0C019D40 */ jal guMtxF2L -/* 9911A0 802419C0 00452821 */ addu $a1, $v0, $a1 -/* 9911A4 802419C4 3C03DA38 */ lui $v1, 0xda38 -/* 9911A8 802419C8 34630002 */ ori $v1, $v1, 2 -/* 9911AC 802419CC 8FC20000 */ lw $v0, ($fp) -/* 9911B0 802419D0 96040000 */ lhu $a0, ($s0) -/* 9911B4 802419D4 0040282D */ daddu $a1, $v0, $zero -/* 9911B8 802419D8 24420008 */ addiu $v0, $v0, 8 -/* 9911BC 802419DC AFC20000 */ sw $v0, ($fp) -/* 9911C0 802419E0 3082FFFF */ andi $v0, $a0, 0xffff -/* 9911C4 802419E4 00021180 */ sll $v0, $v0, 6 -/* 9911C8 802419E8 ACA30000 */ sw $v1, ($a1) -/* 9911CC 802419EC 8FB800C8 */ lw $t8, 0xc8($sp) -/* 9911D0 802419F0 8E430000 */ lw $v1, ($s2) -/* 9911D4 802419F4 00581021 */ addu $v0, $v0, $t8 -/* 9911D8 802419F8 00621821 */ addu $v1, $v1, $v0 -/* 9911DC 802419FC 3C028000 */ lui $v0, 0x8000 -/* 9911E0 80241A00 00621821 */ addu $v1, $v1, $v0 -/* 9911E4 80241A04 ACA30004 */ sw $v1, 4($a1) -/* 9911E8 80241A08 8EE20000 */ lw $v0, ($s7) -/* 9911EC 80241A0C 24840001 */ addiu $a0, $a0, 1 -/* 9911F0 80241A10 10400014 */ beqz $v0, .L80241A64 -/* 9911F4 80241A14 A6040000 */ sh $a0, ($s0) -/* 9911F8 80241A18 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 9911FC 80241A1C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 991200 80241A20 94430134 */ lhu $v1, 0x134($v0) -/* 991204 80241A24 3C02CCCC */ lui $v0, 0xcccc -/* 991208 80241A28 3442CCCD */ ori $v0, $v0, 0xcccd -/* 99120C 80241A2C 00620019 */ multu $v1, $v0 -/* 991210 80241A30 0000C010 */ mfhi $t8 -/* 991214 80241A34 001820C2 */ srl $a0, $t8, 3 -/* 991218 80241A38 00041080 */ sll $v0, $a0, 2 -/* 99121C 80241A3C 00441021 */ addu $v0, $v0, $a0 -/* 991220 80241A40 00021040 */ sll $v0, $v0, 1 -/* 991224 80241A44 00621823 */ subu $v1, $v1, $v0 -/* 991228 80241A48 3063FFFF */ andi $v1, $v1, 0xffff -/* 99122C 80241A4C 2C630005 */ sltiu $v1, $v1, 5 -/* 991230 80241A50 10600003 */ beqz $v1, .L80241A60 -/* 991234 80241A54 24020002 */ addiu $v0, $zero, 2 -/* 991238 80241A58 08090699 */ j .L80241A64 -/* 99123C 80241A5C AEE00010 */ sw $zero, 0x10($s7) -.L80241A60: -/* 991240 80241A60 AEE20010 */ sw $v0, 0x10($s7) -.L80241A64: -/* 991244 80241A64 8EE5000C */ lw $a1, 0xc($s7) -/* 991248 80241A68 8EE60010 */ lw $a2, 0x10($s7) -/* 99124C 80241A6C 0C0B7A76 */ jal func_802DE9D8 -/* 991250 80241A70 27A40038 */ addiu $a0, $sp, 0x38 -/* 991254 80241A74 97A20042 */ lhu $v0, 0x42($sp) -/* 991258 80241A78 8FA30038 */ lw $v1, 0x38($sp) -/* 99125C 80241A7C 8FA4003C */ lw $a0, 0x3c($sp) -/* 991260 80241A80 A7A20028 */ sh $v0, 0x28($sp) -/* 991264 80241A84 3042FFFF */ andi $v0, $v0, 0xffff -/* 991268 80241A88 44820000 */ mtc1 $v0, $f0 -/* 99126C 80241A8C 00000000 */ nop -/* 991270 80241A90 46800020 */ cvt.s.w $f0, $f0 -/* 991274 80241A94 AFA30020 */ sw $v1, 0x20($sp) -/* 991278 80241A98 AFA40024 */ sw $a0, 0x24($sp) -/* 99127C 80241A9C E6E0004C */ swc1 $f0, 0x4c($s7) -/* 991280 80241AA0 97A20046 */ lhu $v0, 0x46($sp) -/* 991284 80241AA4 A7A2002A */ sh $v0, 0x2a($sp) -/* 991288 80241AA8 3042FFFF */ andi $v0, $v0, 0xffff -/* 99128C 80241AAC 44820000 */ mtc1 $v0, $f0 -/* 991290 80241AB0 00000000 */ nop -/* 991294 80241AB4 46800020 */ cvt.s.w $f0, $f0 -/* 991298 80241AB8 E6E00050 */ swc1 $f0, 0x50($s7) -/* 99129C 80241ABC 8FA20040 */ lw $v0, 0x40($sp) -/* 9912A0 80241AC0 240300FF */ addiu $v1, $zero, 0xff -/* 9912A4 80241AC4 A3A30030 */ sb $v1, 0x30($sp) -/* 9912A8 80241AC8 00021FC2 */ srl $v1, $v0, 0x1f -/* 9912AC 80241ACC 00431021 */ addu $v0, $v0, $v1 -/* 9912B0 80241AD0 00021043 */ sra $v0, $v0, 1 -/* 9912B4 80241AD4 8FA30044 */ lw $v1, 0x44($sp) -/* 9912B8 80241AD8 00021023 */ negu $v0, $v0 -/* 9912BC 80241ADC A7A2002C */ sh $v0, 0x2c($sp) -/* 9912C0 80241AE0 000317C2 */ srl $v0, $v1, 0x1f -/* 9912C4 80241AE4 00621821 */ addu $v1, $v1, $v0 -/* 9912C8 80241AE8 00031843 */ sra $v1, $v1, 1 -/* 9912CC 80241AEC A7A3002E */ sh $v1, 0x2e($sp) -/* 9912D0 80241AF0 C6E2003C */ lwc1 $f2, 0x3c($s7) -/* 9912D4 80241AF4 C6E00044 */ lwc1 $f0, 0x44($s7) -/* 9912D8 80241AF8 C6E40040 */ lwc1 $f4, 0x40($s7) -/* 9912DC 80241AFC 4600018D */ trunc.w.s $f6, $f0 -/* 9912E0 80241B00 E7A60010 */ swc1 $f6, 0x10($sp) -/* 9912E4 80241B04 C6E00048 */ lwc1 $f0, 0x48($s7) -/* 9912E8 80241B08 4600118D */ trunc.w.s $f6, $f2 -/* 9912EC 80241B0C 44063000 */ mfc1 $a2, $f6 -/* 9912F0 80241B10 AFA00018 */ sw $zero, 0x18($sp) -/* 9912F4 80241B14 4600018D */ trunc.w.s $f6, $f0 -/* 9912F8 80241B18 E7A60014 */ swc1 $f6, 0x14($sp) -/* 9912FC 80241B1C 8EE40004 */ lw $a0, 4($s7) -/* 991300 80241B20 4600218D */ trunc.w.s $f6, $f4 -/* 991304 80241B24 44073000 */ mfc1 $a3, $f6 -/* 991308 80241B28 0C04EAA7 */ jal func_8013AA9C -/* 99130C 80241B2C 24050008 */ addiu $a1, $zero, 8 -/* 991310 80241B30 27A50020 */ addiu $a1, $sp, 0x20 -/* 991314 80241B34 0000302D */ daddu $a2, $zero, $zero -/* 991318 80241B38 8EE40004 */ lw $a0, 4($s7) -/* 99131C 80241B3C 0C04EBDC */ jal func_8013AF70 -/* 991320 80241B40 27A70048 */ addiu $a3, $sp, 0x48 -/* 991324 80241B44 3C05D838 */ lui $a1, 0xd838 -/* 991328 80241B48 3C03800A */ lui $v1, 0x800a -/* 99132C 80241B4C 2463A66C */ addiu $v1, $v1, -0x5994 -/* 991330 80241B50 8C620000 */ lw $v0, ($v1) -/* 991334 80241B54 34A50002 */ ori $a1, $a1, 2 -/* 991338 80241B58 0040202D */ daddu $a0, $v0, $zero -/* 99133C 80241B5C 24420008 */ addiu $v0, $v0, 8 -/* 991340 80241B60 AC620000 */ sw $v0, ($v1) -/* 991344 80241B64 24020040 */ addiu $v0, $zero, 0x40 -/* 991348 80241B68 AC850000 */ sw $a1, ($a0) -/* 99134C 80241B6C AC820004 */ sw $v0, 4($a0) -/* 991350 80241B70 8FBF00F4 */ lw $ra, 0xf4($sp) -/* 991354 80241B74 8FBE00F0 */ lw $fp, 0xf0($sp) -/* 991358 80241B78 8FB700EC */ lw $s7, 0xec($sp) -/* 99135C 80241B7C 8FB600E8 */ lw $s6, 0xe8($sp) -/* 991360 80241B80 8FB500E4 */ lw $s5, 0xe4($sp) -/* 991364 80241B84 8FB400E0 */ lw $s4, 0xe0($sp) -/* 991368 80241B88 8FB300DC */ lw $s3, 0xdc($sp) -/* 99136C 80241B8C 8FB200D8 */ lw $s2, 0xd8($sp) -/* 991370 80241B90 8FB100D4 */ lw $s1, 0xd4($sp) -/* 991374 80241B94 8FB000D0 */ lw $s0, 0xd0($sp) -/* 991378 80241B98 D7B60100 */ ldc1 $f22, 0x100($sp) -/* 99137C 80241B9C D7B400F8 */ ldc1 $f20, 0xf8($sp) -/* 991380 80241BA0 03E00008 */ jr $ra -/* 991384 80241BA4 27BD0108 */ addiu $sp, $sp, 0x108 diff --git a/asm/nonmatchings/world/area_isk/isk_13/func_80241D38_98F7E0.s b/asm/nonmatchings/world/area_isk/isk_13/func_80241D38_98F7E0.s deleted file mode 100644 index bdc5d5830a..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/func_80241D38_98F7E0.s +++ /dev/null @@ -1,67 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D38_991518 -/* 991518 80241D38 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 99151C 80241D3C AFB10014 */ sw $s1, 0x14($sp) -/* 991520 80241D40 0080882D */ daddu $s1, $a0, $zero -/* 991524 80241D44 AFBF0020 */ sw $ra, 0x20($sp) -/* 991528 80241D48 AFB3001C */ sw $s3, 0x1c($sp) -/* 99152C 80241D4C AFB20018 */ sw $s2, 0x18($sp) -/* 991530 80241D50 AFB00010 */ sw $s0, 0x10($sp) -/* 991534 80241D54 8E30000C */ lw $s0, 0xc($s1) -/* 991538 80241D58 8E050000 */ lw $a1, ($s0) -/* 99153C 80241D5C 0C0B210B */ jal get_float_variable -/* 991540 80241D60 26100004 */ addiu $s0, $s0, 4 -/* 991544 80241D64 8E050000 */ lw $a1, ($s0) -/* 991548 80241D68 26100004 */ addiu $s0, $s0, 4 -/* 99154C 80241D6C 4600010D */ trunc.w.s $f4, $f0 -/* 991550 80241D70 44132000 */ mfc1 $s3, $f4 -/* 991554 80241D74 0C0B210B */ jal get_float_variable -/* 991558 80241D78 0220202D */ daddu $a0, $s1, $zero -/* 99155C 80241D7C 8E050000 */ lw $a1, ($s0) -/* 991560 80241D80 4600010D */ trunc.w.s $f4, $f0 -/* 991564 80241D84 44122000 */ mfc1 $s2, $f4 -/* 991568 80241D88 0C0B210B */ jal get_float_variable -/* 99156C 80241D8C 0220202D */ daddu $a0, $s1, $zero -/* 991570 80241D90 0220202D */ daddu $a0, $s1, $zero -/* 991574 80241D94 3C05FD05 */ lui $a1, 0xfd05 -/* 991578 80241D98 4600010D */ trunc.w.s $f4, $f0 -/* 99157C 80241D9C 44102000 */ mfc1 $s0, $f4 -/* 991580 80241DA0 0C0B1EAF */ jal get_variable -/* 991584 80241DA4 34A50F8A */ ori $a1, $a1, 0xf8a -/* 991588 80241DA8 0040182D */ daddu $v1, $v0, $zero -/* 99158C 80241DAC C4600050 */ lwc1 $f0, 0x50($v1) -/* 991590 80241DB0 3C018024 */ lui $at, 0x8024 -/* 991594 80241DB4 D4222F40 */ ldc1 $f2, 0x2f40($at) -/* 991598 80241DB8 46000021 */ cvt.d.s $f0, $f0 -/* 99159C 80241DBC 46220002 */ mul.d $f0, $f0, $f2 -/* 9915A0 80241DC0 00000000 */ nop -/* 9915A4 80241DC4 3C013FE0 */ lui $at, 0x3fe0 -/* 9915A8 80241DC8 44811800 */ mtc1 $at, $f3 -/* 9915AC 80241DCC 44801000 */ mtc1 $zero, $f2 -/* 9915B0 80241DD0 00000000 */ nop -/* 9915B4 80241DD4 46220002 */ mul.d $f0, $f0, $f2 -/* 9915B8 80241DD8 00000000 */ nop -/* 9915BC 80241DDC 44931000 */ mtc1 $s3, $f2 -/* 9915C0 80241DE0 00000000 */ nop -/* 9915C4 80241DE4 468010A0 */ cvt.s.w $f2, $f2 -/* 9915C8 80241DE8 E4620014 */ swc1 $f2, 0x14($v1) -/* 9915CC 80241DEC 44921000 */ mtc1 $s2, $f2 -/* 9915D0 80241DF0 00000000 */ nop -/* 9915D4 80241DF4 468010A1 */ cvt.d.w $f2, $f2 -/* 9915D8 80241DF8 46201080 */ add.d $f2, $f2, $f0 -/* 9915DC 80241DFC 44900000 */ mtc1 $s0, $f0 -/* 9915E0 80241E00 00000000 */ nop -/* 9915E4 80241E04 46800020 */ cvt.s.w $f0, $f0 -/* 9915E8 80241E08 E460001C */ swc1 $f0, 0x1c($v1) -/* 9915EC 80241E0C 462010A0 */ cvt.s.d $f2, $f2 -/* 9915F0 80241E10 E4620018 */ swc1 $f2, 0x18($v1) -/* 9915F4 80241E14 8FBF0020 */ lw $ra, 0x20($sp) -/* 9915F8 80241E18 8FB3001C */ lw $s3, 0x1c($sp) -/* 9915FC 80241E1C 8FB20018 */ lw $s2, 0x18($sp) -/* 991600 80241E20 8FB10014 */ lw $s1, 0x14($sp) -/* 991604 80241E24 8FB00010 */ lw $s0, 0x10($sp) -/* 991608 80241E28 24020002 */ addiu $v0, $zero, 2 -/* 99160C 80241E2C 03E00008 */ jr $ra -/* 991610 80241E30 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_13/func_80242044_98F7E0.s b/asm/nonmatchings/world/area_isk/isk_13/func_80242044_98F7E0.s deleted file mode 100644 index 2e2d9724d7..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/func_80242044_98F7E0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242044_991824 -/* 991824 80242044 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 991828 80242048 3C05FD05 */ lui $a1, 0xfd05 -/* 99182C 8024204C AFBF0010 */ sw $ra, 0x10($sp) -/* 991830 80242050 0C0B1EAF */ jal get_variable -/* 991834 80242054 34A50F8A */ ori $a1, $a1, 0xf8a -/* 991838 80242058 24030001 */ addiu $v1, $zero, 1 -/* 99183C 8024205C AC430000 */ sw $v1, ($v0) -/* 991840 80242060 8FBF0010 */ lw $ra, 0x10($sp) -/* 991844 80242064 24020002 */ addiu $v0, $zero, 2 -/* 991848 80242068 03E00008 */ jr $ra -/* 99184C 8024206C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_14/func_80240230_992730.s b/asm/nonmatchings/world/area_isk/isk_14/func_80240230_992730.s deleted file mode 100644 index bf8537515d..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/func_80240230_992730.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240230_992960 -/* 992960 80240230 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 992964 80240234 AFB3004C */ sw $s3, 0x4c($sp) -/* 992968 80240238 0080982D */ daddu $s3, $a0, $zero -/* 99296C 8024023C AFBF0054 */ sw $ra, 0x54($sp) -/* 992970 80240240 AFB40050 */ sw $s4, 0x50($sp) -/* 992974 80240244 AFB20048 */ sw $s2, 0x48($sp) -/* 992978 80240248 AFB10044 */ sw $s1, 0x44($sp) -/* 99297C 8024024C AFB00040 */ sw $s0, 0x40($sp) -/* 992980 80240250 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 992984 80240254 8E710148 */ lw $s1, 0x148($s3) -/* 992988 80240258 00A0A02D */ daddu $s4, $a1, $zero -/* 99298C 8024025C 86240008 */ lh $a0, 8($s1) -/* 992990 80240260 0C00EABB */ jal get_npc_unsafe -/* 992994 80240264 00C0902D */ daddu $s2, $a2, $zero -/* 992998 80240268 8E830014 */ lw $v1, 0x14($s4) -/* 99299C 8024026C 04600034 */ bltz $v1, .L80240340 -/* 9929A0 80240270 0040802D */ daddu $s0, $v0, $zero -/* 9929A4 80240274 8E620074 */ lw $v0, 0x74($s3) -/* 9929A8 80240278 1C400030 */ bgtz $v0, .L8024033C -/* 9929AC 8024027C 2442FFFF */ addiu $v0, $v0, -1 -/* 9929B0 80240280 0240202D */ daddu $a0, $s2, $zero -/* 9929B4 80240284 AE630074 */ sw $v1, 0x74($s3) -/* 9929B8 80240288 AFA00010 */ sw $zero, 0x10($sp) -/* 9929BC 8024028C 8E86000C */ lw $a2, 0xc($s4) -/* 9929C0 80240290 8E870010 */ lw $a3, 0x10($s4) -/* 9929C4 80240294 0C01242D */ jal func_800490B4 -/* 9929C8 80240298 0220282D */ daddu $a1, $s1, $zero -/* 9929CC 8024029C 10400025 */ beqz $v0, .L80240334 -/* 9929D0 802402A0 0000202D */ daddu $a0, $zero, $zero -/* 9929D4 802402A4 0200282D */ daddu $a1, $s0, $zero -/* 9929D8 802402A8 0000302D */ daddu $a2, $zero, $zero -/* 9929DC 802402AC 860300A8 */ lh $v1, 0xa8($s0) -/* 9929E0 802402B0 3C013F80 */ lui $at, 0x3f80 -/* 9929E4 802402B4 44810000 */ mtc1 $at, $f0 -/* 9929E8 802402B8 3C014000 */ lui $at, 0x4000 -/* 9929EC 802402BC 44811000 */ mtc1 $at, $f2 -/* 9929F0 802402C0 3C01C1A0 */ lui $at, 0xc1a0 -/* 9929F4 802402C4 44812000 */ mtc1 $at, $f4 -/* 9929F8 802402C8 2402000F */ addiu $v0, $zero, 0xf -/* 9929FC 802402CC AFA2001C */ sw $v0, 0x1c($sp) -/* 992A00 802402D0 44835000 */ mtc1 $v1, $f10 -/* 992A04 802402D4 00000000 */ nop -/* 992A08 802402D8 468052A0 */ cvt.s.w $f10, $f10 -/* 992A0C 802402DC 44075000 */ mfc1 $a3, $f10 -/* 992A10 802402E0 27A20028 */ addiu $v0, $sp, 0x28 -/* 992A14 802402E4 AFA20020 */ sw $v0, 0x20($sp) -/* 992A18 802402E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 992A1C 802402EC E7A20014 */ swc1 $f2, 0x14($sp) -/* 992A20 802402F0 0C01BFA4 */ jal fx_emote -/* 992A24 802402F4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 992A28 802402F8 0200202D */ daddu $a0, $s0, $zero -/* 992A2C 802402FC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 992A30 80240300 0C012530 */ jal func_800494C0 -/* 992A34 80240304 3C060020 */ lui $a2, 0x20 -/* 992A38 80240308 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 992A3C 8024030C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 992A40 80240310 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 992A44 80240314 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 992A48 80240318 8C460028 */ lw $a2, 0x28($v0) -/* 992A4C 8024031C 0C00A720 */ jal atan2 -/* 992A50 80240320 8C470030 */ lw $a3, 0x30($v0) -/* 992A54 80240324 2402000C */ addiu $v0, $zero, 0xc -/* 992A58 80240328 E600000C */ swc1 $f0, 0xc($s0) -/* 992A5C 8024032C 08090151 */ j .L80240544 -/* 992A60 80240330 AE620070 */ sw $v0, 0x70($s3) -.L80240334: -/* 992A64 80240334 8E620074 */ lw $v0, 0x74($s3) -/* 992A68 80240338 2442FFFF */ addiu $v0, $v0, -1 -.L8024033C: -/* 992A6C 8024033C AE620074 */ sw $v0, 0x74($s3) -.L80240340: -/* 992A70 80240340 C6000018 */ lwc1 $f0, 0x18($s0) -/* 992A74 80240344 44801000 */ mtc1 $zero, $f2 -/* 992A78 80240348 44801800 */ mtc1 $zero, $f3 -/* 992A7C 8024034C 46000021 */ cvt.d.s $f0, $f0 -/* 992A80 80240350 4620103C */ c.lt.d $f2, $f0 -/* 992A84 80240354 00000000 */ nop -/* 992A88 80240358 45000025 */ bc1f .L802403F0 -/* 992A8C 8024035C 27A5002C */ addiu $a1, $sp, 0x2c -/* 992A90 80240360 C6000038 */ lwc1 $f0, 0x38($s0) -/* 992A94 80240364 860200A6 */ lh $v0, 0xa6($s0) -/* 992A98 80240368 3C018024 */ lui $at, 0x8024 -/* 992A9C 8024036C D4222A30 */ ldc1 $f2, 0x2a30($at) -/* 992AA0 80240370 27A60030 */ addiu $a2, $sp, 0x30 -/* 992AA4 80240374 E7A0002C */ swc1 $f0, 0x2c($sp) -/* 992AA8 80240378 44820000 */ mtc1 $v0, $f0 -/* 992AAC 8024037C 00000000 */ nop -/* 992AB0 80240380 46800020 */ cvt.s.w $f0, $f0 -/* 992AB4 80240384 46000021 */ cvt.d.s $f0, $f0 -/* 992AB8 80240388 C604003C */ lwc1 $f4, 0x3c($s0) -/* 992ABC 8024038C C6060040 */ lwc1 $f6, 0x40($s0) -/* 992AC0 80240390 C6080018 */ lwc1 $f8, 0x18($s0) -/* 992AC4 80240394 860200A8 */ lh $v0, 0xa8($s0) -/* 992AC8 80240398 46220002 */ mul.d $f0, $f0, $f2 -/* 992ACC 8024039C 00000000 */ nop -/* 992AD0 802403A0 E7A40030 */ swc1 $f4, 0x30($sp) -/* 992AD4 802403A4 E7A60034 */ swc1 $f6, 0x34($sp) -/* 992AD8 802403A8 E7A80010 */ swc1 $f8, 0x10($sp) -/* 992ADC 802403AC C604000C */ lwc1 $f4, 0xc($s0) -/* 992AE0 802403B0 44821000 */ mtc1 $v0, $f2 -/* 992AE4 802403B4 00000000 */ nop -/* 992AE8 802403B8 468010A0 */ cvt.s.w $f2, $f2 -/* 992AEC 802403BC E7A20018 */ swc1 $f2, 0x18($sp) -/* 992AF0 802403C0 E7A40014 */ swc1 $f4, 0x14($sp) -/* 992AF4 802403C4 46200020 */ cvt.s.d $f0, $f0 -/* 992AF8 802403C8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 992AFC 802403CC 8E040080 */ lw $a0, 0x80($s0) -/* 992B00 802403D0 0C037711 */ jal func_800DDC44 -/* 992B04 802403D4 27A70034 */ addiu $a3, $sp, 0x34 -/* 992B08 802403D8 54400005 */ bnel $v0, $zero, .L802403F0 -/* 992B0C 802403DC AE000018 */ sw $zero, 0x18($s0) -/* 992B10 802403E0 8E050018 */ lw $a1, 0x18($s0) -/* 992B14 802403E4 8E06000C */ lw $a2, 0xc($s0) -/* 992B18 802403E8 0C00EA95 */ jal npc_move_heading -/* 992B1C 802403EC 0200202D */ daddu $a0, $s0, $zero -.L802403F0: -/* 992B20 802403F0 C600001C */ lwc1 $f0, 0x1c($s0) -/* 992B24 802403F4 44801000 */ mtc1 $zero, $f2 -/* 992B28 802403F8 44801800 */ mtc1 $zero, $f3 -/* 992B2C 802403FC 46000021 */ cvt.d.s $f0, $f0 -/* 992B30 80240400 4622003C */ c.lt.d $f0, $f2 -/* 992B34 80240404 00000000 */ nop -/* 992B38 80240408 45000047 */ bc1f .L80240528 -/* 992B3C 8024040C 27A5002C */ addiu $a1, $sp, 0x2c -/* 992B40 80240410 27A60030 */ addiu $a2, $sp, 0x30 -/* 992B44 80240414 27A20038 */ addiu $v0, $sp, 0x38 -/* 992B48 80240418 C602003C */ lwc1 $f2, 0x3c($s0) -/* 992B4C 8024041C C6060038 */ lwc1 $f6, 0x38($s0) -/* 992B50 80240420 3C01402A */ lui $at, 0x402a -/* 992B54 80240424 4481A800 */ mtc1 $at, $f21 -/* 992B58 80240428 4480A000 */ mtc1 $zero, $f20 -/* 992B5C 8024042C 460010A1 */ cvt.d.s $f2, $f2 -/* 992B60 80240430 46341080 */ add.d $f2, $f2, $f20 -/* 992B64 80240434 C600001C */ lwc1 $f0, 0x1c($s0) -/* 992B68 80240438 C6040040 */ lwc1 $f4, 0x40($s0) -/* 992B6C 8024043C 46000005 */ abs.s $f0, $f0 -/* 992B70 80240440 E7A40034 */ swc1 $f4, 0x34($sp) -/* 992B74 80240444 3C014030 */ lui $at, 0x4030 -/* 992B78 80240448 44812800 */ mtc1 $at, $f5 -/* 992B7C 8024044C 44802000 */ mtc1 $zero, $f4 -/* 992B80 80240450 46000021 */ cvt.d.s $f0, $f0 -/* 992B84 80240454 E7A6002C */ swc1 $f6, 0x2c($sp) -/* 992B88 80240458 46240000 */ add.d $f0, $f0, $f4 -/* 992B8C 8024045C 462010A0 */ cvt.s.d $f2, $f2 -/* 992B90 80240460 E7A20030 */ swc1 $f2, 0x30($sp) -/* 992B94 80240464 46200020 */ cvt.s.d $f0, $f0 -/* 992B98 80240468 E7A00038 */ swc1 $f0, 0x38($sp) -/* 992B9C 8024046C AFA20010 */ sw $v0, 0x10($sp) -/* 992BA0 80240470 8E040080 */ lw $a0, 0x80($s0) -/* 992BA4 80240474 0C0372DF */ jal func_800DCB7C -/* 992BA8 80240478 27A70034 */ addiu $a3, $sp, 0x34 -/* 992BAC 8024047C 1040002A */ beqz $v0, .L80240528 -/* 992BB0 80240480 00000000 */ nop -/* 992BB4 80240484 C600001C */ lwc1 $f0, 0x1c($s0) -/* 992BB8 80240488 C7A20038 */ lwc1 $f2, 0x38($sp) -/* 992BBC 8024048C 46000005 */ abs.s $f0, $f0 -/* 992BC0 80240490 46000021 */ cvt.d.s $f0, $f0 -/* 992BC4 80240494 46340000 */ add.d $f0, $f0, $f20 -/* 992BC8 80240498 460010A1 */ cvt.d.s $f2, $f2 -/* 992BCC 8024049C 4620103E */ c.le.d $f2, $f0 -/* 992BD0 802404A0 00000000 */ nop -/* 992BD4 802404A4 45000020 */ bc1f .L80240528 -/* 992BD8 802404A8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 992BDC 802404AC C7A00030 */ lwc1 $f0, 0x30($sp) -/* 992BE0 802404B0 8E020000 */ lw $v0, ($s0) -/* 992BE4 802404B4 2403F7FF */ addiu $v1, $zero, -0x801 -/* 992BE8 802404B8 AE00001C */ sw $zero, 0x1c($s0) -/* 992BEC 802404BC 00431024 */ and $v0, $v0, $v1 -/* 992BF0 802404C0 AE020000 */ sw $v0, ($s0) -/* 992BF4 802404C4 24020002 */ addiu $v0, $zero, 2 -/* 992BF8 802404C8 E600003C */ swc1 $f0, 0x3c($s0) -/* 992BFC 802404CC 0C00A67F */ jal rand_int -/* 992C00 802404D0 AE620070 */ sw $v0, 0x70($s3) -/* 992C04 802404D4 3C035555 */ lui $v1, 0x5555 -/* 992C08 802404D8 34635556 */ ori $v1, $v1, 0x5556 -/* 992C0C 802404DC 00430018 */ mult $v0, $v1 -/* 992C10 802404E0 000227C3 */ sra $a0, $v0, 0x1f -/* 992C14 802404E4 00004010 */ mfhi $t0 -/* 992C18 802404E8 01042023 */ subu $a0, $t0, $a0 -/* 992C1C 802404EC 00041840 */ sll $v1, $a0, 1 -/* 992C20 802404F0 00641821 */ addu $v1, $v1, $a0 -/* 992C24 802404F4 00431023 */ subu $v0, $v0, $v1 -/* 992C28 802404F8 24430002 */ addiu $v1, $v0, 2 -/* 992C2C 802404FC AE630074 */ sw $v1, 0x74($s3) -/* 992C30 80240500 8E82002C */ lw $v0, 0x2c($s4) -/* 992C34 80240504 5840000F */ blezl $v0, .L80240544 -/* 992C38 80240508 AE600070 */ sw $zero, 0x70($s3) -/* 992C3C 8024050C 8E820004 */ lw $v0, 4($s4) -/* 992C40 80240510 5840000C */ blezl $v0, .L80240544 -/* 992C44 80240514 AE600070 */ sw $zero, 0x70($s3) -/* 992C48 80240518 1460000A */ bnez $v1, .L80240544 -/* 992C4C 8024051C 00000000 */ nop -/* 992C50 80240520 08090151 */ j .L80240544 -/* 992C54 80240524 AE600070 */ sw $zero, 0x70($s3) -.L80240528: -/* 992C58 80240528 C604003C */ lwc1 $f4, 0x3c($s0) -/* 992C5C 8024052C C600001C */ lwc1 $f0, 0x1c($s0) -/* 992C60 80240530 46002100 */ add.s $f4, $f4, $f0 -/* 992C64 80240534 C6020014 */ lwc1 $f2, 0x14($s0) -/* 992C68 80240538 46020001 */ sub.s $f0, $f0, $f2 -/* 992C6C 8024053C E604003C */ swc1 $f4, 0x3c($s0) -/* 992C70 80240540 E600001C */ swc1 $f0, 0x1c($s0) -.L80240544: -/* 992C74 80240544 8FBF0054 */ lw $ra, 0x54($sp) -/* 992C78 80240548 8FB40050 */ lw $s4, 0x50($sp) -/* 992C7C 8024054C 8FB3004C */ lw $s3, 0x4c($sp) -/* 992C80 80240550 8FB20048 */ lw $s2, 0x48($sp) -/* 992C84 80240554 8FB10044 */ lw $s1, 0x44($sp) -/* 992C88 80240558 8FB00040 */ lw $s0, 0x40($sp) -/* 992C8C 8024055C D7B40058 */ ldc1 $f20, 0x58($sp) -/* 992C90 80240560 03E00008 */ jr $ra -/* 992C94 80240564 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_isk/isk_14/func_80240568_992730.s b/asm/nonmatchings/world/area_isk/isk_14/func_80240568_992730.s deleted file mode 100644 index 1c6989bd2f..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/func_80240568_992730.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_992C98 -/* 992C98 80240568 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 992C9C 8024056C AFB3001C */ sw $s3, 0x1c($sp) -/* 992CA0 80240570 0080982D */ daddu $s3, $a0, $zero -/* 992CA4 80240574 AFBF0020 */ sw $ra, 0x20($sp) -/* 992CA8 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* 992CAC 8024057C AFB10014 */ sw $s1, 0x14($sp) -/* 992CB0 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* 992CB4 80240584 8E720148 */ lw $s2, 0x148($s3) -/* 992CB8 80240588 86440008 */ lh $a0, 8($s2) -/* 992CBC 8024058C 0C00EABB */ jal get_npc_unsafe -/* 992CC0 80240590 00A0882D */ daddu $s1, $a1, $zero -/* 992CC4 80240594 8E240008 */ lw $a0, 8($s1) -/* 992CC8 80240598 0040802D */ daddu $s0, $v0, $zero -/* 992CCC 8024059C 00041FC2 */ srl $v1, $a0, 0x1f -/* 992CD0 802405A0 00832021 */ addu $a0, $a0, $v1 -/* 992CD4 802405A4 00042043 */ sra $a0, $a0, 1 -/* 992CD8 802405A8 0C00A67F */ jal rand_int -/* 992CDC 802405AC 24840001 */ addiu $a0, $a0, 1 -/* 992CE0 802405B0 8E230008 */ lw $v1, 8($s1) -/* 992CE4 802405B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* 992CE8 802405B8 00032FC2 */ srl $a1, $v1, 0x1f -/* 992CEC 802405BC 00651821 */ addu $v1, $v1, $a1 -/* 992CF0 802405C0 00031843 */ sra $v1, $v1, 1 -/* 992CF4 802405C4 00621821 */ addu $v1, $v1, $v0 -/* 992CF8 802405C8 0C00A67F */ jal rand_int -/* 992CFC 802405CC A603008E */ sh $v1, 0x8e($s0) -/* 992D00 802405D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* 992D04 802405D4 44820000 */ mtc1 $v0, $f0 -/* 992D08 802405D8 00000000 */ nop -/* 992D0C 802405DC 46800020 */ cvt.s.w $f0, $f0 -/* 992D10 802405E0 46006300 */ add.s $f12, $f12, $f0 -/* 992D14 802405E4 3C0142B4 */ lui $at, 0x42b4 -/* 992D18 802405E8 44810000 */ mtc1 $at, $f0 -/* 992D1C 802405EC 0C00A6C9 */ jal clamp_angle -/* 992D20 802405F0 46006301 */ sub.s $f12, $f12, $f0 -/* 992D24 802405F4 E600000C */ swc1 $f0, 0xc($s0) -/* 992D28 802405F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 992D2C 802405FC 8C420000 */ lw $v0, ($v0) -/* 992D30 80240600 AE020028 */ sw $v0, 0x28($s0) -/* 992D34 80240604 24020003 */ addiu $v0, $zero, 3 -/* 992D38 80240608 AE620070 */ sw $v0, 0x70($s3) -/* 992D3C 8024060C 8FBF0020 */ lw $ra, 0x20($sp) -/* 992D40 80240610 8FB3001C */ lw $s3, 0x1c($sp) -/* 992D44 80240614 8FB20018 */ lw $s2, 0x18($sp) -/* 992D48 80240618 8FB10014 */ lw $s1, 0x14($sp) -/* 992D4C 8024061C 8FB00010 */ lw $s0, 0x10($sp) -/* 992D50 80240620 03E00008 */ jr $ra -/* 992D54 80240624 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_14/func_80240628_992730.s b/asm/nonmatchings/world/area_isk/isk_14/func_80240628_992730.s deleted file mode 100644 index 803359363d..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/func_80240628_992730.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240628_992D58 -/* 992D58 80240628 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 992D5C 8024062C AFB40040 */ sw $s4, 0x40($sp) -/* 992D60 80240630 0080A02D */ daddu $s4, $a0, $zero -/* 992D64 80240634 AFBF0044 */ sw $ra, 0x44($sp) -/* 992D68 80240638 AFB3003C */ sw $s3, 0x3c($sp) -/* 992D6C 8024063C AFB20038 */ sw $s2, 0x38($sp) -/* 992D70 80240640 AFB10034 */ sw $s1, 0x34($sp) -/* 992D74 80240644 AFB00030 */ sw $s0, 0x30($sp) -/* 992D78 80240648 8E920148 */ lw $s2, 0x148($s4) -/* 992D7C 8024064C 00A0882D */ daddu $s1, $a1, $zero -/* 992D80 80240650 86440008 */ lh $a0, 8($s2) -/* 992D84 80240654 0C00EABB */ jal get_npc_unsafe -/* 992D88 80240658 00C0982D */ daddu $s3, $a2, $zero -/* 992D8C 8024065C 8E230014 */ lw $v1, 0x14($s1) -/* 992D90 80240660 0460002D */ bltz $v1, .L80240718 -/* 992D94 80240664 0040802D */ daddu $s0, $v0, $zero -/* 992D98 80240668 0260202D */ daddu $a0, $s3, $zero -/* 992D9C 8024066C AFA00010 */ sw $zero, 0x10($sp) -/* 992DA0 80240670 8E260024 */ lw $a2, 0x24($s1) -/* 992DA4 80240674 8E270028 */ lw $a3, 0x28($s1) -/* 992DA8 80240678 0C01242D */ jal func_800490B4 -/* 992DAC 8024067C 0240282D */ daddu $a1, $s2, $zero -/* 992DB0 80240680 10400025 */ beqz $v0, .L80240718 -/* 992DB4 80240684 0000202D */ daddu $a0, $zero, $zero -/* 992DB8 80240688 0200282D */ daddu $a1, $s0, $zero -/* 992DBC 8024068C 0000302D */ daddu $a2, $zero, $zero -/* 992DC0 80240690 860300A8 */ lh $v1, 0xa8($s0) -/* 992DC4 80240694 3C013F80 */ lui $at, 0x3f80 -/* 992DC8 80240698 44810000 */ mtc1 $at, $f0 -/* 992DCC 8024069C 3C014000 */ lui $at, 0x4000 -/* 992DD0 802406A0 44811000 */ mtc1 $at, $f2 -/* 992DD4 802406A4 3C01C1A0 */ lui $at, 0xc1a0 -/* 992DD8 802406A8 44812000 */ mtc1 $at, $f4 -/* 992DDC 802406AC 2402000F */ addiu $v0, $zero, 0xf -/* 992DE0 802406B0 AFA2001C */ sw $v0, 0x1c($sp) -/* 992DE4 802406B4 44833000 */ mtc1 $v1, $f6 -/* 992DE8 802406B8 00000000 */ nop -/* 992DEC 802406BC 468031A0 */ cvt.s.w $f6, $f6 -/* 992DF0 802406C0 44073000 */ mfc1 $a3, $f6 -/* 992DF4 802406C4 27A20028 */ addiu $v0, $sp, 0x28 -/* 992DF8 802406C8 AFA20020 */ sw $v0, 0x20($sp) -/* 992DFC 802406CC E7A00010 */ swc1 $f0, 0x10($sp) -/* 992E00 802406D0 E7A20014 */ swc1 $f2, 0x14($sp) -/* 992E04 802406D4 0C01BFA4 */ jal fx_emote -/* 992E08 802406D8 E7A40018 */ swc1 $f4, 0x18($sp) -/* 992E0C 802406DC 0200202D */ daddu $a0, $s0, $zero -/* 992E10 802406E0 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 992E14 802406E4 0C012530 */ jal func_800494C0 -/* 992E18 802406E8 3C060020 */ lui $a2, 0x20 -/* 992E1C 802406EC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 992E20 802406F0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 992E24 802406F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 992E28 802406F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 992E2C 802406FC 8C460028 */ lw $a2, 0x28($v0) -/* 992E30 80240700 0C00A720 */ jal atan2 -/* 992E34 80240704 8C470030 */ lw $a3, 0x30($v0) -/* 992E38 80240708 2402000C */ addiu $v0, $zero, 0xc -/* 992E3C 8024070C E600000C */ swc1 $f0, 0xc($s0) -/* 992E40 80240710 080901EB */ j .L802407AC -/* 992E44 80240714 AE820070 */ sw $v0, 0x70($s4) -.L80240718: -/* 992E48 80240718 8602008C */ lh $v0, 0x8c($s0) -/* 992E4C 8024071C 14400023 */ bnez $v0, .L802407AC -/* 992E50 80240720 00000000 */ nop -/* 992E54 80240724 9602008E */ lhu $v0, 0x8e($s0) -/* 992E58 80240728 2442FFFF */ addiu $v0, $v0, -1 -/* 992E5C 8024072C A602008E */ sh $v0, 0x8e($s0) -/* 992E60 80240730 00021400 */ sll $v0, $v0, 0x10 -/* 992E64 80240734 1C40001D */ bgtz $v0, .L802407AC -/* 992E68 80240738 00000000 */ nop -/* 992E6C 8024073C 8E820074 */ lw $v0, 0x74($s4) -/* 992E70 80240740 2442FFFF */ addiu $v0, $v0, -1 -/* 992E74 80240744 18400018 */ blez $v0, .L802407A8 -/* 992E78 80240748 AE820074 */ sw $v0, 0x74($s4) -/* 992E7C 8024074C C600000C */ lwc1 $f0, 0xc($s0) -/* 992E80 80240750 3C014334 */ lui $at, 0x4334 -/* 992E84 80240754 44816000 */ mtc1 $at, $f12 -/* 992E88 80240758 0C00A6C9 */ jal clamp_angle -/* 992E8C 8024075C 460C0300 */ add.s $f12, $f0, $f12 -/* 992E90 80240760 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 992E94 80240764 0C00A67F */ jal rand_int -/* 992E98 80240768 E600000C */ swc1 $f0, 0xc($s0) -/* 992E9C 8024076C 3C032E8B */ lui $v1, 0x2e8b -/* 992EA0 80240770 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 992EA4 80240774 00430018 */ mult $v0, $v1 -/* 992EA8 80240778 00021FC3 */ sra $v1, $v0, 0x1f -/* 992EAC 8024077C 00004010 */ mfhi $t0 -/* 992EB0 80240780 00082043 */ sra $a0, $t0, 1 -/* 992EB4 80240784 00832023 */ subu $a0, $a0, $v1 -/* 992EB8 80240788 00041840 */ sll $v1, $a0, 1 -/* 992EBC 8024078C 00641821 */ addu $v1, $v1, $a0 -/* 992EC0 80240790 00031880 */ sll $v1, $v1, 2 -/* 992EC4 80240794 00641823 */ subu $v1, $v1, $a0 -/* 992EC8 80240798 00431023 */ subu $v0, $v0, $v1 -/* 992ECC 8024079C 24420005 */ addiu $v0, $v0, 5 -/* 992ED0 802407A0 080901EB */ j .L802407AC -/* 992ED4 802407A4 A602008E */ sh $v0, 0x8e($s0) -.L802407A8: -/* 992ED8 802407A8 AE800070 */ sw $zero, 0x70($s4) -.L802407AC: -/* 992EDC 802407AC 8FBF0044 */ lw $ra, 0x44($sp) -/* 992EE0 802407B0 8FB40040 */ lw $s4, 0x40($sp) -/* 992EE4 802407B4 8FB3003C */ lw $s3, 0x3c($sp) -/* 992EE8 802407B8 8FB20038 */ lw $s2, 0x38($sp) -/* 992EEC 802407BC 8FB10034 */ lw $s1, 0x34($sp) -/* 992EF0 802407C0 8FB00030 */ lw $s0, 0x30($sp) -/* 992EF4 802407C4 03E00008 */ jr $ra -/* 992EF8 802407C8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_isk/isk_14/func_802407CC_992730.s b/asm/nonmatchings/world/area_isk/isk_14/func_802407CC_992730.s deleted file mode 100644 index 71bd9806f7..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/func_802407CC_992730.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407CC_992EFC -/* 992EFC 802407CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 992F00 802407D0 AFB10014 */ sw $s1, 0x14($sp) -/* 992F04 802407D4 0080882D */ daddu $s1, $a0, $zero -/* 992F08 802407D8 AFBF001C */ sw $ra, 0x1c($sp) -/* 992F0C 802407DC AFB20018 */ sw $s2, 0x18($sp) -/* 992F10 802407E0 AFB00010 */ sw $s0, 0x10($sp) -/* 992F14 802407E4 8E220148 */ lw $v0, 0x148($s1) -/* 992F18 802407E8 00A0902D */ daddu $s2, $a1, $zero -/* 992F1C 802407EC 84440008 */ lh $a0, 8($v0) -/* 992F20 802407F0 0C00EABB */ jal get_npc_unsafe -/* 992F24 802407F4 00C0802D */ daddu $s0, $a2, $zero -/* 992F28 802407F8 0220202D */ daddu $a0, $s1, $zero -/* 992F2C 802407FC 0240282D */ daddu $a1, $s2, $zero -/* 992F30 80240800 0200302D */ daddu $a2, $s0, $zero -/* 992F34 80240804 0C0127DF */ jal func_80049F7C -/* 992F38 80240808 0040802D */ daddu $s0, $v0, $zero -/* 992F3C 8024080C 8E020000 */ lw $v0, ($s0) -/* 992F40 80240810 24040005 */ addiu $a0, $zero, 5 -/* 992F44 80240814 34420800 */ ori $v0, $v0, 0x800 -/* 992F48 80240818 0C00A67F */ jal rand_int -/* 992F4C 8024081C AE020000 */ sw $v0, ($s0) -/* 992F50 80240820 44820000 */ mtc1 $v0, $f0 -/* 992F54 80240824 00000000 */ nop -/* 992F58 80240828 46800021 */ cvt.d.w $f0, $f0 -/* 992F5C 8024082C 3C014024 */ lui $at, 0x4024 -/* 992F60 80240830 44811800 */ mtc1 $at, $f3 -/* 992F64 80240834 44801000 */ mtc1 $zero, $f2 -/* 992F68 80240838 3C013FC0 */ lui $at, 0x3fc0 -/* 992F6C 8024083C 44812000 */ mtc1 $at, $f4 -/* 992F70 80240840 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 992F74 80240844 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 992F78 80240848 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 992F7C 8024084C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 992F80 80240850 46220000 */ add.d $f0, $f0, $f2 -/* 992F84 80240854 E6040014 */ swc1 $f4, 0x14($s0) -/* 992F88 80240858 46200020 */ cvt.s.d $f0, $f0 -/* 992F8C 8024085C E600001C */ swc1 $f0, 0x1c($s0) -/* 992F90 80240860 8C460028 */ lw $a2, 0x28($v0) -/* 992F94 80240864 0C00A720 */ jal atan2 -/* 992F98 80240868 8C470030 */ lw $a3, 0x30($v0) -/* 992F9C 8024086C 0200202D */ daddu $a0, $s0, $zero -/* 992FA0 80240870 3C05B000 */ lui $a1, 0xb000 -/* 992FA4 80240874 34A50017 */ ori $a1, $a1, 0x17 -/* 992FA8 80240878 0000302D */ daddu $a2, $zero, $zero -/* 992FAC 8024087C E480000C */ swc1 $f0, 0xc($a0) -/* 992FB0 80240880 C6400018 */ lwc1 $f0, 0x18($s2) -/* 992FB4 80240884 2402000D */ addiu $v0, $zero, 0xd -/* 992FB8 80240888 E4800018 */ swc1 $f0, 0x18($a0) -/* 992FBC 8024088C 0C012530 */ jal func_800494C0 -/* 992FC0 80240890 AE220070 */ sw $v0, 0x70($s1) -/* 992FC4 80240894 8FBF001C */ lw $ra, 0x1c($sp) -/* 992FC8 80240898 8FB20018 */ lw $s2, 0x18($sp) -/* 992FCC 8024089C 8FB10014 */ lw $s1, 0x14($sp) -/* 992FD0 802408A0 8FB00010 */ lw $s0, 0x10($sp) -/* 992FD4 802408A4 03E00008 */ jr $ra -/* 992FD8 802408A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_14/func_802408AC_992730.s b/asm/nonmatchings/world/area_isk/isk_14/func_802408AC_992730.s deleted file mode 100644 index 60688c0364..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/func_802408AC_992730.s +++ /dev/null @@ -1,200 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408AC_992FDC -/* 992FDC 802408AC 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 992FE0 802408B0 AFB40050 */ sw $s4, 0x50($sp) -/* 992FE4 802408B4 0080A02D */ daddu $s4, $a0, $zero -/* 992FE8 802408B8 AFBF0060 */ sw $ra, 0x60($sp) -/* 992FEC 802408BC AFB7005C */ sw $s7, 0x5c($sp) -/* 992FF0 802408C0 AFB60058 */ sw $s6, 0x58($sp) -/* 992FF4 802408C4 AFB50054 */ sw $s5, 0x54($sp) -/* 992FF8 802408C8 AFB3004C */ sw $s3, 0x4c($sp) -/* 992FFC 802408CC AFB20048 */ sw $s2, 0x48($sp) -/* 993000 802408D0 AFB10044 */ sw $s1, 0x44($sp) -/* 993004 802408D4 AFB00040 */ sw $s0, 0x40($sp) -/* 993008 802408D8 F7B40068 */ sdc1 $f20, 0x68($sp) -/* 99300C 802408DC 8E950148 */ lw $s5, 0x148($s4) -/* 993010 802408E0 00A0B02D */ daddu $s6, $a1, $zero -/* 993014 802408E4 86A40008 */ lh $a0, 8($s5) -/* 993018 802408E8 0C00EABB */ jal get_npc_unsafe -/* 99301C 802408EC 00C0B82D */ daddu $s7, $a2, $zero -/* 993020 802408F0 0040982D */ daddu $s3, $v0, $zero -/* 993024 802408F4 C6600018 */ lwc1 $f0, 0x18($s3) -/* 993028 802408F8 44801000 */ mtc1 $zero, $f2 -/* 99302C 802408FC 44801800 */ mtc1 $zero, $f3 -/* 993030 80240900 46000021 */ cvt.d.s $f0, $f0 -/* 993034 80240904 4620103C */ c.lt.d $f2, $f0 -/* 993038 80240908 00000000 */ nop -/* 99303C 8024090C 45000021 */ bc1f .L80240994 -/* 993040 80240910 27A50028 */ addiu $a1, $sp, 0x28 -/* 993044 80240914 C6600038 */ lwc1 $f0, 0x38($s3) -/* 993048 80240918 C662003C */ lwc1 $f2, 0x3c($s3) -/* 99304C 8024091C C6640040 */ lwc1 $f4, 0x40($s3) -/* 993050 80240920 C6660018 */ lwc1 $f6, 0x18($s3) -/* 993054 80240924 E7A00028 */ swc1 $f0, 0x28($sp) -/* 993058 80240928 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 99305C 8024092C E7A40030 */ swc1 $f4, 0x30($sp) -/* 993060 80240930 E7A60010 */ swc1 $f6, 0x10($sp) -/* 993064 80240934 C660000C */ lwc1 $f0, 0xc($s3) -/* 993068 80240938 E7A00014 */ swc1 $f0, 0x14($sp) -/* 99306C 8024093C 866200A8 */ lh $v0, 0xa8($s3) -/* 993070 80240940 44820000 */ mtc1 $v0, $f0 -/* 993074 80240944 00000000 */ nop -/* 993078 80240948 46800020 */ cvt.s.w $f0, $f0 -/* 99307C 8024094C E7A00018 */ swc1 $f0, 0x18($sp) -/* 993080 80240950 866200A6 */ lh $v0, 0xa6($s3) -/* 993084 80240954 27A6002C */ addiu $a2, $sp, 0x2c -/* 993088 80240958 44820000 */ mtc1 $v0, $f0 -/* 99308C 8024095C 00000000 */ nop -/* 993090 80240960 46800020 */ cvt.s.w $f0, $f0 -/* 993094 80240964 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 993098 80240968 8E640080 */ lw $a0, 0x80($s3) -/* 99309C 8024096C 0C037711 */ jal func_800DDC44 -/* 9930A0 80240970 27A70030 */ addiu $a3, $sp, 0x30 -/* 9930A4 80240974 10400003 */ beqz $v0, .L80240984 -/* 9930A8 80240978 00000000 */ nop -/* 9930AC 8024097C 08090265 */ j .L80240994 -/* 9930B0 80240980 AE600018 */ sw $zero, 0x18($s3) -.L80240984: -/* 9930B4 80240984 8E650018 */ lw $a1, 0x18($s3) -/* 9930B8 80240988 8E66000C */ lw $a2, 0xc($s3) -/* 9930BC 8024098C 0C00EA95 */ jal npc_move_heading -/* 9930C0 80240990 0260202D */ daddu $a0, $s3, $zero -.L80240994: -/* 9930C4 80240994 C660001C */ lwc1 $f0, 0x1c($s3) -/* 9930C8 80240998 44801000 */ mtc1 $zero, $f2 -/* 9930CC 8024099C 44801800 */ mtc1 $zero, $f3 -/* 9930D0 802409A0 46000021 */ cvt.d.s $f0, $f0 -/* 9930D4 802409A4 4622003C */ c.lt.d $f0, $f2 -/* 9930D8 802409A8 00000000 */ nop -/* 9930DC 802409AC 4500006C */ bc1f .L80240B60 -/* 9930E0 802409B0 27B00028 */ addiu $s0, $sp, 0x28 -/* 9930E4 802409B4 0200282D */ daddu $a1, $s0, $zero -/* 9930E8 802409B8 27A60034 */ addiu $a2, $sp, 0x34 -/* 9930EC 802409BC 27B20038 */ addiu $s2, $sp, 0x38 -/* 9930F0 802409C0 C6600038 */ lwc1 $f0, 0x38($s3) -/* 9930F4 802409C4 3C0142C8 */ lui $at, 0x42c8 -/* 9930F8 802409C8 44811000 */ mtc1 $at, $f2 -/* 9930FC 802409CC C6640040 */ lwc1 $f4, 0x40($s3) -/* 993100 802409D0 3C01447A */ lui $at, 0x447a -/* 993104 802409D4 44813000 */ mtc1 $at, $f6 -/* 993108 802409D8 27B10030 */ addiu $s1, $sp, 0x30 -/* 99310C 802409DC E7A00028 */ swc1 $f0, 0x28($sp) -/* 993110 802409E0 E7A20034 */ swc1 $f2, 0x34($sp) -/* 993114 802409E4 E7A40030 */ swc1 $f4, 0x30($sp) -/* 993118 802409E8 E7A60038 */ swc1 $f6, 0x38($sp) -/* 99311C 802409EC AFB20010 */ sw $s2, 0x10($sp) -/* 993120 802409F0 8E640080 */ lw $a0, 0x80($s3) -/* 993124 802409F4 0C0372DF */ jal func_800DCB7C -/* 993128 802409F8 0220382D */ daddu $a3, $s1, $zero -/* 99312C 802409FC 0200282D */ daddu $a1, $s0, $zero -/* 993130 80240A00 27A6002C */ addiu $a2, $sp, 0x2c -/* 993134 80240A04 C662003C */ lwc1 $f2, 0x3c($s3) -/* 993138 80240A08 C6660038 */ lwc1 $f6, 0x38($s3) -/* 99313C 80240A0C 3C01402A */ lui $at, 0x402a -/* 993140 80240A10 4481A800 */ mtc1 $at, $f21 -/* 993144 80240A14 4480A000 */ mtc1 $zero, $f20 -/* 993148 80240A18 460010A1 */ cvt.d.s $f2, $f2 -/* 99314C 80240A1C 46341080 */ add.d $f2, $f2, $f20 -/* 993150 80240A20 C660001C */ lwc1 $f0, 0x1c($s3) -/* 993154 80240A24 C6640040 */ lwc1 $f4, 0x40($s3) -/* 993158 80240A28 46000005 */ abs.s $f0, $f0 -/* 99315C 80240A2C E7A40030 */ swc1 $f4, 0x30($sp) -/* 993160 80240A30 3C014030 */ lui $at, 0x4030 -/* 993164 80240A34 44812800 */ mtc1 $at, $f5 -/* 993168 80240A38 44802000 */ mtc1 $zero, $f4 -/* 99316C 80240A3C 46000021 */ cvt.d.s $f0, $f0 -/* 993170 80240A40 E7A60028 */ swc1 $f6, 0x28($sp) -/* 993174 80240A44 46240000 */ add.d $f0, $f0, $f4 -/* 993178 80240A48 462010A0 */ cvt.s.d $f2, $f2 -/* 99317C 80240A4C E7A2002C */ swc1 $f2, 0x2c($sp) -/* 993180 80240A50 46200020 */ cvt.s.d $f0, $f0 -/* 993184 80240A54 E7A00038 */ swc1 $f0, 0x38($sp) -/* 993188 80240A58 AFB20010 */ sw $s2, 0x10($sp) -/* 99318C 80240A5C 8E640080 */ lw $a0, 0x80($s3) -/* 993190 80240A60 0C0372DF */ jal func_800DCB7C -/* 993194 80240A64 0220382D */ daddu $a3, $s1, $zero -/* 993198 80240A68 1040003D */ beqz $v0, .L80240B60 -/* 99319C 80240A6C 00000000 */ nop -/* 9931A0 80240A70 C660001C */ lwc1 $f0, 0x1c($s3) -/* 9931A4 80240A74 C7A20038 */ lwc1 $f2, 0x38($sp) -/* 9931A8 80240A78 46000005 */ abs.s $f0, $f0 -/* 9931AC 80240A7C 46000021 */ cvt.d.s $f0, $f0 -/* 9931B0 80240A80 46340000 */ add.d $f0, $f0, $f20 -/* 9931B4 80240A84 460010A1 */ cvt.d.s $f2, $f2 -/* 9931B8 80240A88 4620103E */ c.le.d $f2, $f0 -/* 9931BC 80240A8C 00000000 */ nop -/* 9931C0 80240A90 45000033 */ bc1f .L80240B60 -/* 9931C4 80240A94 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9931C8 80240A98 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 9931CC 80240A9C 8E620000 */ lw $v0, ($s3) -/* 9931D0 80240AA0 AE60001C */ sw $zero, 0x1c($s3) -/* 9931D4 80240AA4 00431024 */ and $v0, $v0, $v1 -/* 9931D8 80240AA8 E660003C */ swc1 $f0, 0x3c($s3) -/* 9931DC 80240AAC AE620000 */ sw $v0, ($s3) -/* 9931E0 80240AB0 AFA00010 */ sw $zero, 0x10($sp) -/* 9931E4 80240AB4 AFA00014 */ sw $zero, 0x14($sp) -/* 9931E8 80240AB8 8E650038 */ lw $a1, 0x38($s3) -/* 9931EC 80240ABC 8E66003C */ lw $a2, 0x3c($s3) -/* 9931F0 80240AC0 8E670040 */ lw $a3, 0x40($s3) -/* 9931F4 80240AC4 0C01BECC */ jal fx_walk_normal -/* 9931F8 80240AC8 24040002 */ addiu $a0, $zero, 2 -/* 9931FC 80240ACC 02E0202D */ daddu $a0, $s7, $zero -/* 993200 80240AD0 2402000C */ addiu $v0, $zero, 0xc -/* 993204 80240AD4 AE820070 */ sw $v0, 0x70($s4) -/* 993208 80240AD8 24020001 */ addiu $v0, $zero, 1 -/* 99320C 80240ADC AFA20010 */ sw $v0, 0x10($sp) -/* 993210 80240AE0 8EC60024 */ lw $a2, 0x24($s6) -/* 993214 80240AE4 8EC70028 */ lw $a3, 0x28($s6) -/* 993218 80240AE8 0C01242D */ jal func_800490B4 -/* 99321C 80240AEC 02A0282D */ daddu $a1, $s5, $zero -/* 993220 80240AF0 14400022 */ bnez $v0, .L80240B7C -/* 993224 80240AF4 24040002 */ addiu $a0, $zero, 2 -/* 993228 80240AF8 0260282D */ daddu $a1, $s3, $zero -/* 99322C 80240AFC 0000302D */ daddu $a2, $zero, $zero -/* 993230 80240B00 866300A8 */ lh $v1, 0xa8($s3) -/* 993234 80240B04 3C013F80 */ lui $at, 0x3f80 -/* 993238 80240B08 44810000 */ mtc1 $at, $f0 -/* 99323C 80240B0C 3C014000 */ lui $at, 0x4000 -/* 993240 80240B10 44811000 */ mtc1 $at, $f2 -/* 993244 80240B14 3C01C1A0 */ lui $at, 0xc1a0 -/* 993248 80240B18 44812000 */ mtc1 $at, $f4 -/* 99324C 80240B1C 2402000F */ addiu $v0, $zero, 0xf -/* 993250 80240B20 AFA2001C */ sw $v0, 0x1c($sp) -/* 993254 80240B24 44834000 */ mtc1 $v1, $f8 -/* 993258 80240B28 00000000 */ nop -/* 99325C 80240B2C 46804220 */ cvt.s.w $f8, $f8 -/* 993260 80240B30 44074000 */ mfc1 $a3, $f8 -/* 993264 80240B34 27A2003C */ addiu $v0, $sp, 0x3c -/* 993268 80240B38 AFA20020 */ sw $v0, 0x20($sp) -/* 99326C 80240B3C E7A00010 */ swc1 $f0, 0x10($sp) -/* 993270 80240B40 E7A20014 */ swc1 $f2, 0x14($sp) -/* 993274 80240B44 0C01BFA4 */ jal fx_emote -/* 993278 80240B48 E7A40018 */ swc1 $f4, 0x18($sp) -/* 99327C 80240B4C 24020019 */ addiu $v0, $zero, 0x19 -/* 993280 80240B50 A662008E */ sh $v0, 0x8e($s3) -/* 993284 80240B54 2402000E */ addiu $v0, $zero, 0xe -/* 993288 80240B58 080902DF */ j .L80240B7C -/* 99328C 80240B5C AE820070 */ sw $v0, 0x70($s4) -.L80240B60: -/* 993290 80240B60 C664003C */ lwc1 $f4, 0x3c($s3) -/* 993294 80240B64 C660001C */ lwc1 $f0, 0x1c($s3) -/* 993298 80240B68 46002100 */ add.s $f4, $f4, $f0 -/* 99329C 80240B6C C6620014 */ lwc1 $f2, 0x14($s3) -/* 9932A0 80240B70 46020001 */ sub.s $f0, $f0, $f2 -/* 9932A4 80240B74 E664003C */ swc1 $f4, 0x3c($s3) -/* 9932A8 80240B78 E660001C */ swc1 $f0, 0x1c($s3) -.L80240B7C: -/* 9932AC 80240B7C 8FBF0060 */ lw $ra, 0x60($sp) -/* 9932B0 80240B80 8FB7005C */ lw $s7, 0x5c($sp) -/* 9932B4 80240B84 8FB60058 */ lw $s6, 0x58($sp) -/* 9932B8 80240B88 8FB50054 */ lw $s5, 0x54($sp) -/* 9932BC 80240B8C 8FB40050 */ lw $s4, 0x50($sp) -/* 9932C0 80240B90 8FB3004C */ lw $s3, 0x4c($sp) -/* 9932C4 80240B94 8FB20048 */ lw $s2, 0x48($sp) -/* 9932C8 80240B98 8FB10044 */ lw $s1, 0x44($sp) -/* 9932CC 80240B9C 8FB00040 */ lw $s0, 0x40($sp) -/* 9932D0 80240BA0 D7B40068 */ ldc1 $f20, 0x68($sp) -/* 9932D4 80240BA4 03E00008 */ jr $ra -/* 9932D8 80240BA8 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_isk/isk_14/func_80240BAC_992730.s b/asm/nonmatchings/world/area_isk/isk_14/func_80240BAC_992730.s deleted file mode 100644 index d077bee2ca..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/func_80240BAC_992730.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BAC_9932DC -/* 9932DC 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9932E0 80240BB0 AFB00010 */ sw $s0, 0x10($sp) -/* 9932E4 80240BB4 0080802D */ daddu $s0, $a0, $zero -/* 9932E8 80240BB8 AFBF0014 */ sw $ra, 0x14($sp) -/* 9932EC 80240BBC 8E020148 */ lw $v0, 0x148($s0) -/* 9932F0 80240BC0 0C00EABB */ jal get_npc_unsafe -/* 9932F4 80240BC4 84440008 */ lh $a0, 8($v0) -/* 9932F8 80240BC8 9443008E */ lhu $v1, 0x8e($v0) -/* 9932FC 80240BCC 2463FFFF */ addiu $v1, $v1, -1 -/* 993300 80240BD0 A443008E */ sh $v1, 0x8e($v0) -/* 993304 80240BD4 00031C00 */ sll $v1, $v1, 0x10 -/* 993308 80240BD8 58600001 */ blezl $v1, .L80240BE0 -/* 99330C 80240BDC AE000070 */ sw $zero, 0x70($s0) -.L80240BE0: -/* 993310 80240BE0 8FBF0014 */ lw $ra, 0x14($sp) -/* 993314 80240BE4 8FB00010 */ lw $s0, 0x10($sp) -/* 993318 80240BE8 03E00008 */ jr $ra -/* 99331C 80240BEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_14/func_80240BF0_992730.s b/asm/nonmatchings/world/area_isk/isk_14/func_80240BF0_992730.s deleted file mode 100644 index 4978209cbd..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/func_80240BF0_992730.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BF0_993320 -/* 993320 80240BF0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 993324 80240BF4 AFB3003C */ sw $s3, 0x3c($sp) -/* 993328 80240BF8 0080982D */ daddu $s3, $a0, $zero -/* 99332C 80240BFC AFBF0048 */ sw $ra, 0x48($sp) -/* 993330 80240C00 AFB50044 */ sw $s5, 0x44($sp) -/* 993334 80240C04 AFB40040 */ sw $s4, 0x40($sp) -/* 993338 80240C08 AFB20038 */ sw $s2, 0x38($sp) -/* 99333C 80240C0C AFB10034 */ sw $s1, 0x34($sp) -/* 993340 80240C10 AFB00030 */ sw $s0, 0x30($sp) -/* 993344 80240C14 8E720148 */ lw $s2, 0x148($s3) -/* 993348 80240C18 86440008 */ lh $a0, 8($s2) -/* 99334C 80240C1C 8E70000C */ lw $s0, 0xc($s3) -/* 993350 80240C20 0C00EABB */ jal get_npc_unsafe -/* 993354 80240C24 00A0882D */ daddu $s1, $a1, $zero -/* 993358 80240C28 8E050000 */ lw $a1, ($s0) -/* 99335C 80240C2C 26100004 */ addiu $s0, $s0, 4 -/* 993360 80240C30 0260202D */ daddu $a0, $s3, $zero -/* 993364 80240C34 0C0B1EAF */ jal get_variable -/* 993368 80240C38 0040A82D */ daddu $s5, $v0, $zero -/* 99336C 80240C3C 0260202D */ daddu $a0, $s3, $zero -/* 993370 80240C40 8E050000 */ lw $a1, ($s0) -/* 993374 80240C44 0C0B1EAF */ jal get_variable -/* 993378 80240C48 0040A02D */ daddu $s4, $v0, $zero -/* 99337C 80240C4C AE420094 */ sw $v0, 0x94($s2) -/* 993380 80240C50 AFA00010 */ sw $zero, 0x10($sp) -/* 993384 80240C54 8E4200D0 */ lw $v0, 0xd0($s2) -/* 993388 80240C58 8C420030 */ lw $v0, 0x30($v0) -/* 99338C 80240C5C AFA20014 */ sw $v0, 0x14($sp) -/* 993390 80240C60 8E4200D0 */ lw $v0, 0xd0($s2) -/* 993394 80240C64 8C42001C */ lw $v0, 0x1c($v0) -/* 993398 80240C68 AFA20018 */ sw $v0, 0x18($sp) -/* 99339C 80240C6C 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9933A0 80240C70 8C420024 */ lw $v0, 0x24($v0) -/* 9933A4 80240C74 AFA2001C */ sw $v0, 0x1c($sp) -/* 9933A8 80240C78 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9933AC 80240C7C 8C420028 */ lw $v0, 0x28($v0) -/* 9933B0 80240C80 AFA20020 */ sw $v0, 0x20($sp) -/* 9933B4 80240C84 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9933B8 80240C88 3C0142C8 */ lui $at, 0x42c8 -/* 9933BC 80240C8C 44810000 */ mtc1 $at, $f0 -/* 9933C0 80240C90 8C42002C */ lw $v0, 0x2c($v0) -/* 9933C4 80240C94 27B00010 */ addiu $s0, $sp, 0x10 -/* 9933C8 80240C98 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9933CC 80240C9C A7A0002C */ sh $zero, 0x2c($sp) -/* 9933D0 80240CA0 12200019 */ beqz $s1, .L80240D08 -/* 9933D4 80240CA4 AFA20024 */ sw $v0, 0x24($sp) -/* 9933D8 80240CA8 AE600070 */ sw $zero, 0x70($s3) -/* 9933DC 80240CAC A6A0008E */ sh $zero, 0x8e($s5) -/* 9933E0 80240CB0 AE600074 */ sw $zero, 0x74($s3) -/* 9933E4 80240CB4 8EA20000 */ lw $v0, ($s5) -/* 9933E8 80240CB8 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9933EC 80240CBC 00431024 */ and $v0, $v0, $v1 -/* 9933F0 80240CC0 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9933F4 80240CC4 00431024 */ and $v0, $v0, $v1 -/* 9933F8 80240CC8 34420008 */ ori $v0, $v0, 8 -/* 9933FC 80240CCC AEA20000 */ sw $v0, ($s5) -/* 993400 80240CD0 8E4200B0 */ lw $v0, 0xb0($s2) -/* 993404 80240CD4 34420018 */ ori $v0, $v0, 0x18 -/* 993408 80240CD8 AE4200B0 */ sw $v0, 0xb0($s2) -/* 99340C 80240CDC 8E420000 */ lw $v0, ($s2) -/* 993410 80240CE0 3C034000 */ lui $v1, 0x4000 -/* 993414 80240CE4 00431024 */ and $v0, $v0, $v1 -/* 993418 80240CE8 10400007 */ beqz $v0, .L80240D08 -/* 99341C 80240CEC 3C03BFFF */ lui $v1, 0xbfff -/* 993420 80240CF0 2402000C */ addiu $v0, $zero, 0xc -/* 993424 80240CF4 AE620070 */ sw $v0, 0x70($s3) -/* 993428 80240CF8 8E420000 */ lw $v0, ($s2) -/* 99342C 80240CFC 3463FFFF */ ori $v1, $v1, 0xffff -/* 993430 80240D00 00431024 */ and $v0, $v0, $v1 -/* 993434 80240D04 AE420000 */ sw $v0, ($s2) -.L80240D08: -/* 993438 80240D08 8E4300B0 */ lw $v1, 0xb0($s2) -/* 99343C 80240D0C 30620004 */ andi $v0, $v1, 4 -/* 993440 80240D10 10400007 */ beqz $v0, .L80240D30 -/* 993444 80240D14 00000000 */ nop -/* 993448 80240D18 824200B4 */ lb $v0, 0xb4($s2) -/* 99344C 80240D1C 14400034 */ bnez $v0, .L80240DF0 -/* 993450 80240D20 0000102D */ daddu $v0, $zero, $zero -/* 993454 80240D24 2402FFFB */ addiu $v0, $zero, -5 -/* 993458 80240D28 00621024 */ and $v0, $v1, $v0 -/* 99345C 80240D2C AE4200B0 */ sw $v0, 0xb0($s2) -.L80240D30: -/* 993460 80240D30 8E630070 */ lw $v1, 0x70($s3) -/* 993464 80240D34 2C62000F */ sltiu $v0, $v1, 0xf -/* 993468 80240D38 1040002C */ beqz $v0, .L80240DEC -/* 99346C 80240D3C 00031080 */ sll $v0, $v1, 2 -/* 993470 80240D40 3C018024 */ lui $at, 0x8024 -/* 993474 80240D44 00220821 */ addu $at, $at, $v0 -/* 993478 80240D48 8C222A38 */ lw $v0, 0x2a38($at) -/* 99347C 80240D4C 00400008 */ jr $v0 -/* 993480 80240D50 00000000 */ nop -/* 993484 80240D54 0260202D */ daddu $a0, $s3, $zero -/* 993488 80240D58 0280282D */ daddu $a1, $s4, $zero -/* 99348C 80240D5C 0C090000 */ jal func_80240000 -/* 993490 80240D60 0200302D */ daddu $a2, $s0, $zero -/* 993494 80240D64 0260202D */ daddu $a0, $s3, $zero -/* 993498 80240D68 0280282D */ daddu $a1, $s4, $zero -/* 99349C 80240D6C 0C09008C */ jal func_80240230 -/* 9934A0 80240D70 0200302D */ daddu $a2, $s0, $zero -/* 9934A4 80240D74 0809037C */ j .L80240DF0 -/* 9934A8 80240D78 0000102D */ daddu $v0, $zero, $zero -/* 9934AC 80240D7C 0260202D */ daddu $a0, $s3, $zero -/* 9934B0 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 9934B4 80240D84 0C09015A */ jal func_80240568 -/* 9934B8 80240D88 0200302D */ daddu $a2, $s0, $zero -/* 9934BC 80240D8C 8E630070 */ lw $v1, 0x70($s3) -/* 9934C0 80240D90 24020003 */ addiu $v0, $zero, 3 -/* 9934C4 80240D94 14620016 */ bne $v1, $v0, .L80240DF0 -/* 9934C8 80240D98 0000102D */ daddu $v0, $zero, $zero -/* 9934CC 80240D9C 0260202D */ daddu $a0, $s3, $zero -/* 9934D0 80240DA0 0280282D */ daddu $a1, $s4, $zero -/* 9934D4 80240DA4 0C09018A */ jal func_80240628 -/* 9934D8 80240DA8 0200302D */ daddu $a2, $s0, $zero -/* 9934DC 80240DAC 0809037C */ j .L80240DF0 -/* 9934E0 80240DB0 0000102D */ daddu $v0, $zero, $zero -/* 9934E4 80240DB4 0260202D */ daddu $a0, $s3, $zero -/* 9934E8 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* 9934EC 80240DBC 0C0901F3 */ jal func_802407CC -/* 9934F0 80240DC0 0200302D */ daddu $a2, $s0, $zero -/* 9934F4 80240DC4 0260202D */ daddu $a0, $s3, $zero -/* 9934F8 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* 9934FC 80240DCC 0C09022B */ jal func_802408AC -/* 993500 80240DD0 0200302D */ daddu $a2, $s0, $zero -/* 993504 80240DD4 0809037C */ j .L80240DF0 -/* 993508 80240DD8 0000102D */ daddu $v0, $zero, $zero -/* 99350C 80240DDC 0260202D */ daddu $a0, $s3, $zero -/* 993510 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 993514 80240DE4 0C0902EB */ jal func_80240BAC -/* 993518 80240DE8 0200302D */ daddu $a2, $s0, $zero -.L80240DEC: -/* 99351C 80240DEC 0000102D */ daddu $v0, $zero, $zero -.L80240DF0: -/* 993520 80240DF0 8FBF0048 */ lw $ra, 0x48($sp) -/* 993524 80240DF4 8FB50044 */ lw $s5, 0x44($sp) -/* 993528 80240DF8 8FB40040 */ lw $s4, 0x40($sp) -/* 99352C 80240DFC 8FB3003C */ lw $s3, 0x3c($sp) -/* 993530 80240E00 8FB20038 */ lw $s2, 0x38($sp) -/* 993534 80240E04 8FB10034 */ lw $s1, 0x34($sp) -/* 993538 80240E08 8FB00030 */ lw $s0, 0x30($sp) -/* 99353C 80240E0C 03E00008 */ jr $ra -/* 993540 80240E10 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_isk/isk_14/func_80240E14_992730.s b/asm/nonmatchings/world/area_isk/isk_14/func_80240E14_992730.s deleted file mode 100644 index 9234d61273..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/func_80240E14_992730.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E14_993544 -/* 993544 80240E14 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 993548 80240E18 AFB00010 */ sw $s0, 0x10($sp) -/* 99354C 80240E1C 0080802D */ daddu $s0, $a0, $zero -/* 993550 80240E20 AFBF001C */ sw $ra, 0x1c($sp) -/* 993554 80240E24 AFB20018 */ sw $s2, 0x18($sp) -/* 993558 80240E28 AFB10014 */ sw $s1, 0x14($sp) -/* 99355C 80240E2C 8E020148 */ lw $v0, 0x148($s0) -/* 993560 80240E30 00A0882D */ daddu $s1, $a1, $zero -/* 993564 80240E34 84440008 */ lh $a0, 8($v0) -/* 993568 80240E38 0C00EABB */ jal get_npc_unsafe -/* 99356C 80240E3C 00C0902D */ daddu $s2, $a2, $zero -/* 993570 80240E40 0200202D */ daddu $a0, $s0, $zero -/* 993574 80240E44 0040802D */ daddu $s0, $v0, $zero -/* 993578 80240E48 0220282D */ daddu $a1, $s1, $zero -/* 99357C 80240E4C 0C012568 */ jal func_800495A0 -/* 993580 80240E50 0240302D */ daddu $a2, $s2, $zero -/* 993584 80240E54 0C00A67F */ jal rand_int -/* 993588 80240E58 24040005 */ addiu $a0, $zero, 5 -/* 99358C 80240E5C 3C014020 */ lui $at, 0x4020 -/* 993590 80240E60 44811800 */ mtc1 $at, $f3 -/* 993594 80240E64 44801000 */ mtc1 $zero, $f2 -/* 993598 80240E68 44820000 */ mtc1 $v0, $f0 -/* 99359C 80240E6C 00000000 */ nop -/* 9935A0 80240E70 46800021 */ cvt.d.w $f0, $f0 -/* 9935A4 80240E74 46220000 */ add.d $f0, $f0, $f2 -/* 9935A8 80240E78 3C013FC0 */ lui $at, 0x3fc0 -/* 9935AC 80240E7C 44811000 */ mtc1 $at, $f2 -/* 9935B0 80240E80 00000000 */ nop -/* 9935B4 80240E84 E6020014 */ swc1 $f2, 0x14($s0) -/* 9935B8 80240E88 46200020 */ cvt.s.d $f0, $f0 -/* 9935BC 80240E8C E600001C */ swc1 $f0, 0x1c($s0) -/* 9935C0 80240E90 8FBF001C */ lw $ra, 0x1c($sp) -/* 9935C4 80240E94 8FB20018 */ lw $s2, 0x18($sp) -/* 9935C8 80240E98 8FB10014 */ lw $s1, 0x14($sp) -/* 9935CC 80240E9C 8FB00010 */ lw $s0, 0x10($sp) -/* 9935D0 80240EA0 03E00008 */ jr $ra -/* 9935D4 80240EA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_14/func_80240EA8_992730.s b/asm/nonmatchings/world/area_isk/isk_14/func_80240EA8_992730.s deleted file mode 100644 index c037dad3d4..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/func_80240EA8_992730.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EA8_9935D8 -/* 9935D8 80240EA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9935DC 80240EAC AFB00010 */ sw $s0, 0x10($sp) -/* 9935E0 80240EB0 0080802D */ daddu $s0, $a0, $zero -/* 9935E4 80240EB4 AFBF001C */ sw $ra, 0x1c($sp) -/* 9935E8 80240EB8 AFB20018 */ sw $s2, 0x18($sp) -/* 9935EC 80240EBC AFB10014 */ sw $s1, 0x14($sp) -/* 9935F0 80240EC0 8E020148 */ lw $v0, 0x148($s0) -/* 9935F4 80240EC4 00A0882D */ daddu $s1, $a1, $zero -/* 9935F8 80240EC8 84440008 */ lh $a0, 8($v0) -/* 9935FC 80240ECC 0C00EABB */ jal get_npc_unsafe -/* 993600 80240ED0 00C0902D */ daddu $s2, $a2, $zero -/* 993604 80240ED4 0200202D */ daddu $a0, $s0, $zero -/* 993608 80240ED8 0040802D */ daddu $s0, $v0, $zero -/* 99360C 80240EDC 0220282D */ daddu $a1, $s1, $zero -/* 993610 80240EE0 0C0127DF */ jal func_80049F7C -/* 993614 80240EE4 0240302D */ daddu $a2, $s2, $zero -/* 993618 80240EE8 0C00A67F */ jal rand_int -/* 99361C 80240EEC 24040005 */ addiu $a0, $zero, 5 -/* 993620 80240EF0 3C014014 */ lui $at, 0x4014 -/* 993624 80240EF4 44811800 */ mtc1 $at, $f3 -/* 993628 80240EF8 44801000 */ mtc1 $zero, $f2 -/* 99362C 80240EFC 44820000 */ mtc1 $v0, $f0 -/* 993630 80240F00 00000000 */ nop -/* 993634 80240F04 46800021 */ cvt.d.w $f0, $f0 -/* 993638 80240F08 46220000 */ add.d $f0, $f0, $f2 -/* 99363C 80240F0C 3C013FC0 */ lui $at, 0x3fc0 -/* 993640 80240F10 44811000 */ mtc1 $at, $f2 -/* 993644 80240F14 00000000 */ nop -/* 993648 80240F18 E6020014 */ swc1 $f2, 0x14($s0) -/* 99364C 80240F1C 46200020 */ cvt.s.d $f0, $f0 -/* 993650 80240F20 E600001C */ swc1 $f0, 0x1c($s0) -/* 993654 80240F24 8FBF001C */ lw $ra, 0x1c($sp) -/* 993658 80240F28 8FB20018 */ lw $s2, 0x18($sp) -/* 99365C 80240F2C 8FB10014 */ lw $s1, 0x14($sp) -/* 993660 80240F30 8FB00010 */ lw $s0, 0x10($sp) -/* 993664 80240F34 03E00008 */ jr $ra -/* 993668 80240F38 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_14/func_80240F3C_992730.s b/asm/nonmatchings/world/area_isk/isk_14/func_80240F3C_992730.s deleted file mode 100644 index b513410ca6..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/func_80240F3C_992730.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F3C_99366C -/* 99366C 80240F3C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 993670 80240F40 AFB40040 */ sw $s4, 0x40($sp) -/* 993674 80240F44 0080A02D */ daddu $s4, $a0, $zero -/* 993678 80240F48 AFBF0048 */ sw $ra, 0x48($sp) -/* 99367C 80240F4C AFB50044 */ sw $s5, 0x44($sp) -/* 993680 80240F50 AFB3003C */ sw $s3, 0x3c($sp) -/* 993684 80240F54 AFB20038 */ sw $s2, 0x38($sp) -/* 993688 80240F58 AFB10034 */ sw $s1, 0x34($sp) -/* 99368C 80240F5C AFB00030 */ sw $s0, 0x30($sp) -/* 993690 80240F60 8E920148 */ lw $s2, 0x148($s4) -/* 993694 80240F64 86440008 */ lh $a0, 8($s2) -/* 993698 80240F68 8E90000C */ lw $s0, 0xc($s4) -/* 99369C 80240F6C 0C00EABB */ jal get_npc_unsafe -/* 9936A0 80240F70 00A0882D */ daddu $s1, $a1, $zero -/* 9936A4 80240F74 0280202D */ daddu $a0, $s4, $zero -/* 9936A8 80240F78 8E050000 */ lw $a1, ($s0) -/* 9936AC 80240F7C 0C0B1EAF */ jal get_variable -/* 9936B0 80240F80 0040A82D */ daddu $s5, $v0, $zero -/* 9936B4 80240F84 AFA00010 */ sw $zero, 0x10($sp) -/* 9936B8 80240F88 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9936BC 80240F8C 8C630030 */ lw $v1, 0x30($v1) -/* 9936C0 80240F90 AFA30014 */ sw $v1, 0x14($sp) -/* 9936C4 80240F94 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9936C8 80240F98 8C63001C */ lw $v1, 0x1c($v1) -/* 9936CC 80240F9C AFA30018 */ sw $v1, 0x18($sp) -/* 9936D0 80240FA0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9936D4 80240FA4 8C630024 */ lw $v1, 0x24($v1) -/* 9936D8 80240FA8 AFA3001C */ sw $v1, 0x1c($sp) -/* 9936DC 80240FAC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9936E0 80240FB0 8C630028 */ lw $v1, 0x28($v1) -/* 9936E4 80240FB4 27B30010 */ addiu $s3, $sp, 0x10 -/* 9936E8 80240FB8 AFA30020 */ sw $v1, 0x20($sp) -/* 9936EC 80240FBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9936F0 80240FC0 3C0142C8 */ lui $at, 0x42c8 -/* 9936F4 80240FC4 44810000 */ mtc1 $at, $f0 -/* 9936F8 80240FC8 8C63002C */ lw $v1, 0x2c($v1) -/* 9936FC 80240FCC 0040802D */ daddu $s0, $v0, $zero -/* 993700 80240FD0 E7A00028 */ swc1 $f0, 0x28($sp) -/* 993704 80240FD4 A7A0002C */ sh $zero, 0x2c($sp) -/* 993708 80240FD8 12200016 */ beqz $s1, .L80241034 -/* 99370C 80240FDC AFA30024 */ sw $v1, 0x24($sp) -/* 993710 80240FE0 8EA20000 */ lw $v0, ($s5) -/* 993714 80240FE4 2403F7FF */ addiu $v1, $zero, -0x801 -/* 993718 80240FE8 A6A0008E */ sh $zero, 0x8e($s5) -/* 99371C 80240FEC 00431024 */ and $v0, $v0, $v1 -/* 993720 80240FF0 2403FDFF */ addiu $v1, $zero, -0x201 -/* 993724 80240FF4 00431024 */ and $v0, $v0, $v1 -/* 993728 80240FF8 34420008 */ ori $v0, $v0, 8 -/* 99372C 80240FFC AEA20000 */ sw $v0, ($s5) -/* 993730 80241000 AE800074 */ sw $zero, 0x74($s4) -/* 993734 80241004 AE800070 */ sw $zero, 0x70($s4) -/* 993738 80241008 8E420000 */ lw $v0, ($s2) -/* 99373C 8024100C 3C034000 */ lui $v1, 0x4000 -/* 993740 80241010 00431024 */ and $v0, $v0, $v1 -/* 993744 80241014 10400007 */ beqz $v0, .L80241034 -/* 993748 80241018 3C03BFFF */ lui $v1, 0xbfff -/* 99374C 8024101C 2402000C */ addiu $v0, $zero, 0xc -/* 993750 80241020 AE820070 */ sw $v0, 0x70($s4) -/* 993754 80241024 8E420000 */ lw $v0, ($s2) -/* 993758 80241028 3463FFFF */ ori $v1, $v1, 0xffff -/* 99375C 8024102C 00431024 */ and $v0, $v0, $v1 -/* 993760 80241030 AE420000 */ sw $v0, ($s2) -.L80241034: -/* 993764 80241034 8E830070 */ lw $v1, 0x70($s4) -/* 993768 80241038 2C62000F */ sltiu $v0, $v1, 0xf -/* 99376C 8024103C 10400028 */ beqz $v0, .L802410E0 -/* 993770 80241040 00031080 */ sll $v0, $v1, 2 -/* 993774 80241044 3C018024 */ lui $at, 0x8024 -/* 993778 80241048 00220821 */ addu $at, $at, $v0 -/* 99377C 8024104C 8C222A78 */ lw $v0, 0x2a78($at) -/* 993780 80241050 00400008 */ jr $v0 -/* 993784 80241054 00000000 */ nop -/* 993788 80241058 0280202D */ daddu $a0, $s4, $zero -/* 99378C 8024105C 0200282D */ daddu $a1, $s0, $zero -/* 993790 80241060 0C090385 */ jal func_80240E14 -/* 993794 80241064 0260302D */ daddu $a2, $s3, $zero -/* 993798 80241068 0280202D */ daddu $a0, $s4, $zero -/* 99379C 8024106C 0200282D */ daddu $a1, $s0, $zero -/* 9937A0 80241070 0C09008C */ jal func_80240230 -/* 9937A4 80241074 0260302D */ daddu $a2, $s3, $zero -/* 9937A8 80241078 08090438 */ j .L802410E0 -/* 9937AC 8024107C 00000000 */ nop -/* 9937B0 80241080 0280202D */ daddu $a0, $s4, $zero -/* 9937B4 80241084 0200282D */ daddu $a1, $s0, $zero -/* 9937B8 80241088 0C09015A */ jal func_80240568 -/* 9937BC 8024108C 0260302D */ daddu $a2, $s3, $zero -/* 9937C0 80241090 0280202D */ daddu $a0, $s4, $zero -/* 9937C4 80241094 0200282D */ daddu $a1, $s0, $zero -/* 9937C8 80241098 0C09018A */ jal func_80240628 -/* 9937CC 8024109C 0260302D */ daddu $a2, $s3, $zero -/* 9937D0 802410A0 08090438 */ j .L802410E0 -/* 9937D4 802410A4 00000000 */ nop -/* 9937D8 802410A8 0280202D */ daddu $a0, $s4, $zero -/* 9937DC 802410AC 0200282D */ daddu $a1, $s0, $zero -/* 9937E0 802410B0 0C0903AA */ jal func_80240EA8 -/* 9937E4 802410B4 0260302D */ daddu $a2, $s3, $zero -/* 9937E8 802410B8 0280202D */ daddu $a0, $s4, $zero -/* 9937EC 802410BC 0200282D */ daddu $a1, $s0, $zero -/* 9937F0 802410C0 0C09022B */ jal func_802408AC -/* 9937F4 802410C4 0260302D */ daddu $a2, $s3, $zero -/* 9937F8 802410C8 08090438 */ j .L802410E0 -/* 9937FC 802410CC 00000000 */ nop -/* 993800 802410D0 0280202D */ daddu $a0, $s4, $zero -/* 993804 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 993808 802410D8 0C0902EB */ jal func_80240BAC -/* 99380C 802410DC 0260302D */ daddu $a2, $s3, $zero -.L802410E0: -/* 993810 802410E0 8FBF0048 */ lw $ra, 0x48($sp) -/* 993814 802410E4 8FB50044 */ lw $s5, 0x44($sp) -/* 993818 802410E8 8FB40040 */ lw $s4, 0x40($sp) -/* 99381C 802410EC 8FB3003C */ lw $s3, 0x3c($sp) -/* 993820 802410F0 8FB20038 */ lw $s2, 0x38($sp) -/* 993824 802410F4 8FB10034 */ lw $s1, 0x34($sp) -/* 993828 802410F8 8FB00030 */ lw $s0, 0x30($sp) -/* 99382C 802410FC 0000102D */ daddu $v0, $zero, $zero -/* 993830 80241100 03E00008 */ jr $ra -/* 993834 80241104 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_isk/isk_14/func_80241108_992730.s b/asm/nonmatchings/world/area_isk/isk_14/func_80241108_992730.s deleted file mode 100644 index 4b7cc660f4..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/func_80241108_992730.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241108_993838 -/* 993838 80241108 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 99383C 8024110C AFB40030 */ sw $s4, 0x30($sp) -/* 993840 80241110 27B40010 */ addiu $s4, $sp, 0x10 -/* 993844 80241114 AFB3002C */ sw $s3, 0x2c($sp) -/* 993848 80241118 0000982D */ daddu $s3, $zero, $zero -/* 99384C 8024111C AFBF0038 */ sw $ra, 0x38($sp) -/* 993850 80241120 AFB50034 */ sw $s5, 0x34($sp) -/* 993854 80241124 AFB20028 */ sw $s2, 0x28($sp) -/* 993858 80241128 AFB10024 */ sw $s1, 0x24($sp) -/* 99385C 8024112C AFB00020 */ sw $s0, 0x20($sp) -/* 993860 80241130 8C84014C */ lw $a0, 0x14c($a0) -/* 993864 80241134 0C00EAD2 */ jal get_npc_safe -/* 993868 80241138 24150003 */ addiu $s5, $zero, 3 -/* 99386C 8024113C 24040080 */ addiu $a0, $zero, 0x80 -/* 993870 80241140 0C00AB39 */ jal heap_malloc -/* 993874 80241144 0040882D */ daddu $s1, $v0, $zero -/* 993878 80241148 0040902D */ daddu $s2, $v0, $zero -/* 99387C 8024114C 3C030035 */ lui $v1, 0x35 -/* 993880 80241150 34630002 */ ori $v1, $v1, 2 -/* 993884 80241154 2650000C */ addiu $s0, $s2, 0xc -/* 993888 80241158 3402814A */ ori $v0, $zero, 0x814a -/* 99388C 8024115C AE320020 */ sw $s2, 0x20($s1) -/* 993890 80241160 AFA20010 */ sw $v0, 0x10($sp) -/* 993894 80241164 AFA30014 */ sw $v1, 0x14($sp) -/* 993898 80241168 AFA00018 */ sw $zero, 0x18($sp) -/* 99389C 8024116C AFA0001C */ sw $zero, 0x1c($sp) -.L80241170: -/* 9938A0 80241170 0C00E211 */ jal create_basic_npc -/* 9938A4 80241174 0280202D */ daddu $a0, $s4, $zero -/* 9938A8 80241178 0C00E2B7 */ jal get_npc_by_index -/* 9938AC 8024117C 0040202D */ daddu $a0, $v0, $zero -/* 9938B0 80241180 AE420000 */ sw $v0, ($s2) -/* 9938B4 80241184 C6200038 */ lwc1 $f0, 0x38($s1) -/* 9938B8 80241188 E4400038 */ swc1 $f0, 0x38($v0) -/* 9938BC 8024118C C620003C */ lwc1 $f0, 0x3c($s1) -/* 9938C0 80241190 0040202D */ daddu $a0, $v0, $zero -/* 9938C4 80241194 E480003C */ swc1 $f0, 0x3c($a0) -/* 9938C8 80241198 C6200040 */ lwc1 $f0, 0x40($s1) -/* 9938CC 8024119C 26730001 */ addiu $s3, $s3, 1 -/* 9938D0 802411A0 E4800040 */ swc1 $f0, 0x40($a0) -/* 9938D4 802411A4 C620000C */ lwc1 $f0, 0xc($s1) -/* 9938D8 802411A8 26520010 */ addiu $s2, $s2, 0x10 -/* 9938DC 802411AC A09500AB */ sb $s5, 0xab($a0) -/* 9938E0 802411B0 0C00EAFF */ jal disable_npc_shadow -/* 9938E4 802411B4 E480000C */ swc1 $f0, 0xc($a0) -/* 9938E8 802411B8 AE00FFF8 */ sw $zero, -8($s0) -/* 9938EC 802411BC AE00FFFC */ sw $zero, -4($s0) -/* 9938F0 802411C0 AE000000 */ sw $zero, ($s0) -/* 9938F4 802411C4 2A620008 */ slti $v0, $s3, 8 -/* 9938F8 802411C8 1440FFE9 */ bnez $v0, .L80241170 -/* 9938FC 802411CC 26100010 */ addiu $s0, $s0, 0x10 -/* 993900 802411D0 8FBF0038 */ lw $ra, 0x38($sp) -/* 993904 802411D4 8FB50034 */ lw $s5, 0x34($sp) -/* 993908 802411D8 8FB40030 */ lw $s4, 0x30($sp) -/* 99390C 802411DC 8FB3002C */ lw $s3, 0x2c($sp) -/* 993910 802411E0 8FB20028 */ lw $s2, 0x28($sp) -/* 993914 802411E4 8FB10024 */ lw $s1, 0x24($sp) -/* 993918 802411E8 8FB00020 */ lw $s0, 0x20($sp) -/* 99391C 802411EC 24020002 */ addiu $v0, $zero, 2 -/* 993920 802411F0 03E00008 */ jr $ra -/* 993924 802411F4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_isk/isk_14/func_802411F8_992730.s b/asm/nonmatchings/world/area_isk/isk_14/func_802411F8_992730.s deleted file mode 100644 index c13b6206ba..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/func_802411F8_992730.s +++ /dev/null @@ -1,254 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411F8_993928 -/* 993928 802411F8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 99392C 802411FC AFBF0034 */ sw $ra, 0x34($sp) -/* 993930 80241200 AFB40030 */ sw $s4, 0x30($sp) -/* 993934 80241204 AFB3002C */ sw $s3, 0x2c($sp) -/* 993938 80241208 AFB20028 */ sw $s2, 0x28($sp) -/* 99393C 8024120C AFB10024 */ sw $s1, 0x24($sp) -/* 993940 80241210 AFB00020 */ sw $s0, 0x20($sp) -/* 993944 80241214 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* 993948 80241218 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* 99394C 8024121C F7BA0050 */ sdc1 $f26, 0x50($sp) -/* 993950 80241220 F7B80048 */ sdc1 $f24, 0x48($sp) -/* 993954 80241224 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 993958 80241228 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 99395C 8024122C 8C820148 */ lw $v0, 0x148($a0) -/* 993960 80241230 8C84014C */ lw $a0, 0x14c($a0) -/* 993964 80241234 C45A006C */ lwc1 $f26, 0x6c($v0) -/* 993968 80241238 0C00EAD2 */ jal get_npc_safe -/* 99396C 8024123C 4680D6A0 */ cvt.s.w $f26, $f26 -/* 993970 80241240 0040A02D */ daddu $s4, $v0, $zero -/* 993974 80241244 8E930020 */ lw $s3, 0x20($s4) -/* 993978 80241248 868200A8 */ lh $v0, 0xa8($s4) -/* 99397C 8024124C 3C013E4C */ lui $at, 0x3e4c -/* 993980 80241250 3421CCCD */ ori $at, $at, 0xcccd -/* 993984 80241254 44810000 */ mtc1 $at, $f0 -/* 993988 80241258 C6860038 */ lwc1 $f6, 0x38($s4) -/* 99398C 8024125C 44821000 */ mtc1 $v0, $f2 -/* 993990 80241260 00000000 */ nop -/* 993994 80241264 468010A0 */ cvt.s.w $f2, $f2 -/* 993998 80241268 46001082 */ mul.s $f2, $f2, $f0 -/* 99399C 8024126C 00000000 */ nop -/* 9939A0 80241270 C688003C */ lwc1 $f8, 0x3c($s4) -/* 9939A4 80241274 3C014334 */ lui $at, 0x4334 -/* 9939A8 80241278 44816000 */ mtc1 $at, $f12 -/* 9939AC 8024127C C6800034 */ lwc1 $f0, 0x34($s4) -/* 9939B0 80241280 C6840040 */ lwc1 $f4, 0x40($s4) -/* 9939B4 80241284 460C0300 */ add.s $f12, $f0, $f12 -/* 9939B8 80241288 E7A60018 */ swc1 $f6, 0x18($sp) -/* 9939BC 8024128C E7A4001C */ swc1 $f4, 0x1c($sp) -/* 9939C0 80241290 0C00A6C9 */ jal clamp_angle -/* 9939C4 80241294 46024500 */ add.s $f20, $f8, $f2 -/* 9939C8 80241298 868200A6 */ lh $v0, 0xa6($s4) -/* 9939CC 8024129C 3C013E99 */ lui $at, 0x3e99 -/* 9939D0 802412A0 3421999A */ ori $at, $at, 0x999a -/* 9939D4 802412A4 44812000 */ mtc1 $at, $f4 -/* 9939D8 802412A8 44821000 */ mtc1 $v0, $f2 -/* 9939DC 802412AC 00000000 */ nop -/* 9939E0 802412B0 468010A0 */ cvt.s.w $f2, $f2 -/* 9939E4 802412B4 46041082 */ mul.s $f2, $f2, $f4 -/* 9939E8 802412B8 00000000 */ nop -/* 9939EC 802412BC 27A40018 */ addiu $a0, $sp, 0x18 -/* 9939F0 802412C0 44070000 */ mfc1 $a3, $f0 -/* 9939F4 802412C4 44061000 */ mfc1 $a2, $f2 -/* 9939F8 802412C8 0C00A7E7 */ jal add_vec2D_polar -/* 9939FC 802412CC 27A5001C */ addiu $a1, $sp, 0x1c -/* 993A00 802412D0 8E820000 */ lw $v0, ($s4) -/* 993A04 802412D4 30420002 */ andi $v0, $v0, 2 -/* 993A08 802412D8 1040000D */ beqz $v0, .L80241310 -/* 993A0C 802412DC 0000902D */ daddu $s2, $zero, $zero -/* 993A10 802412E0 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 993A14 802412E4 C7A0001C */ lwc1 $f0, 0x1c($sp) -.L802412E8: -/* 993A18 802412E8 26520001 */ addiu $s2, $s2, 1 -/* 993A1C 802412EC 8E700000 */ lw $s0, ($s3) -/* 993A20 802412F0 26730010 */ addiu $s3, $s3, 0x10 -/* 993A24 802412F4 2A420008 */ slti $v0, $s2, 8 -/* 993A28 802412F8 E6020038 */ swc1 $f2, 0x38($s0) -/* 993A2C 802412FC E614003C */ swc1 $f20, 0x3c($s0) -/* 993A30 80241300 1440FFF9 */ bnez $v0, .L802412E8 -/* 993A34 80241304 E6000040 */ swc1 $f0, 0x40($s0) -/* 993A38 80241308 08090562 */ j .L80241588 -/* 993A3C 8024130C 0000102D */ daddu $v0, $zero, $zero -.L80241310: -/* 993A40 80241310 26710008 */ addiu $s1, $s3, 8 -/* 993A44 80241314 3C014024 */ lui $at, 0x4024 -/* 993A48 80241318 4481C800 */ mtc1 $at, $f25 -/* 993A4C 8024131C 4480C000 */ mtc1 $zero, $f24 -/* 993A50 80241320 3C013F4C */ lui $at, 0x3f4c -/* 993A54 80241324 3421CCCD */ ori $at, $at, 0xcccd -/* 993A58 80241328 4481B000 */ mtc1 $at, $f22 -/* 993A5C 8024132C 3C013F33 */ lui $at, 0x3f33 -/* 993A60 80241330 34213333 */ ori $at, $at, 0x3333 -/* 993A64 80241334 4481E000 */ mtc1 $at, $f28 -/* 993A68 80241338 3C01C120 */ lui $at, 0xc120 -/* 993A6C 8024133C 4481F000 */ mtc1 $at, $f30 -.L80241340: -/* 993A70 80241340 8E700000 */ lw $s0, ($s3) -/* 993A74 80241344 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 993A78 80241348 E7B40010 */ swc1 $f20, 0x10($sp) -/* 993A7C 8024134C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 993A80 80241350 E7A00014 */ swc1 $f0, 0x14($sp) -/* 993A84 80241354 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 993A88 80241358 C60E003C */ lwc1 $f14, 0x3c($s0) -/* 993A8C 8024135C 8E060040 */ lw $a2, 0x40($s0) -/* 993A90 80241360 44071000 */ mfc1 $a3, $f2 -/* 993A94 80241364 0C00A7CB */ jal dist3D -/* 993A98 80241368 00000000 */ nop -/* 993A9C 8024136C 46000021 */ cvt.d.s $f0, $f0 -/* 993AA0 80241370 4620C03E */ c.le.d $f24, $f0 -/* 993AA4 80241374 00000000 */ nop -/* 993AA8 80241378 45000047 */ bc1f .L80241498 -/* 993AAC 8024137C 00000000 */ nop -/* 993AB0 80241380 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 993AB4 80241384 C7A40018 */ lwc1 $f4, 0x18($sp) -/* 993AB8 80241388 46046301 */ sub.s $f12, $f12, $f4 -/* 993ABC 8024138C 46166302 */ mul.s $f12, $f12, $f22 -/* 993AC0 80241390 00000000 */ nop -/* 993AC4 80241394 C6000040 */ lwc1 $f0, 0x40($s0) -/* 993AC8 80241398 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 993ACC 8024139C 46020001 */ sub.s $f0, $f0, $f2 -/* 993AD0 802413A0 46160002 */ mul.s $f0, $f0, $f22 -/* 993AD4 802413A4 00000000 */ nop -/* 993AD8 802413A8 E7B40010 */ swc1 $f20, 0x10($sp) -/* 993ADC 802413AC E7A20014 */ swc1 $f2, 0x14($sp) -/* 993AE0 802413B0 46020000 */ add.s $f0, $f0, $f2 -/* 993AE4 802413B4 C60E003C */ lwc1 $f14, 0x3c($s0) -/* 993AE8 802413B8 44072000 */ mfc1 $a3, $f4 -/* 993AEC 802413BC 44060000 */ mfc1 $a2, $f0 -/* 993AF0 802413C0 0C00A7CB */ jal dist3D -/* 993AF4 802413C4 46046300 */ add.s $f12, $f12, $f4 -/* 993AF8 802413C8 C6080038 */ lwc1 $f8, 0x38($s0) -/* 993AFC 802413CC C7A20018 */ lwc1 $f2, 0x18($sp) -/* 993B00 802413D0 46024201 */ sub.s $f8, $f8, $f2 -/* 993B04 802413D4 46164202 */ mul.s $f8, $f8, $f22 -/* 993B08 802413D8 00000000 */ nop -/* 993B0C 802413DC C606003C */ lwc1 $f6, 0x3c($s0) -/* 993B10 802413E0 46000021 */ cvt.d.s $f0, $f0 -/* 993B14 802413E4 46143181 */ sub.s $f6, $f6, $f20 -/* 993B18 802413E8 4620C003 */ div.d $f0, $f24, $f0 -/* 993B1C 802413EC 46200020 */ cvt.s.d $f0, $f0 -/* 993B20 802413F0 46003182 */ mul.s $f6, $f6, $f0 -/* 993B24 802413F4 00000000 */ nop -/* 993B28 802413F8 C6040040 */ lwc1 $f4, 0x40($s0) -/* 993B2C 802413FC C7AA001C */ lwc1 $f10, 0x1c($sp) -/* 993B30 80241400 460A2101 */ sub.s $f4, $f4, $f10 -/* 993B34 80241404 46162102 */ mul.s $f4, $f4, $f22 -/* 993B38 80241408 00000000 */ nop -/* 993B3C 8024140C 46004202 */ mul.s $f8, $f8, $f0 -/* 993B40 80241410 00000000 */ nop -/* 993B44 80241414 46002102 */ mul.s $f4, $f4, $f0 -/* 993B48 80241418 00000000 */ nop -/* 993B4C 8024141C 46024200 */ add.s $f8, $f8, $f2 -/* 993B50 80241420 C6020038 */ lwc1 $f2, 0x38($s0) -/* 993B54 80241424 46024081 */ sub.s $f2, $f8, $f2 -/* 993B58 80241428 461C1082 */ mul.s $f2, $f2, $f28 -/* 993B5C 8024142C 00000000 */ nop -/* 993B60 80241430 4606A500 */ add.s $f20, $f20, $f6 -/* 993B64 80241434 E622FFFC */ swc1 $f2, -4($s1) -/* 993B68 80241438 C602003C */ lwc1 $f2, 0x3c($s0) -/* 993B6C 8024143C 4602A081 */ sub.s $f2, $f20, $f2 -/* 993B70 80241440 461C1082 */ mul.s $f2, $f2, $f28 -/* 993B74 80241444 00000000 */ nop -/* 993B78 80241448 460A2100 */ add.s $f4, $f4, $f10 -/* 993B7C 8024144C E6220000 */ swc1 $f2, ($s1) -/* 993B80 80241450 C6000040 */ lwc1 $f0, 0x40($s0) -/* 993B84 80241454 46002001 */ sub.s $f0, $f4, $f0 -/* 993B88 80241458 461C0002 */ mul.s $f0, $f0, $f28 -/* 993B8C 8024145C 00000000 */ nop -/* 993B90 80241460 3C014120 */ lui $at, 0x4120 -/* 993B94 80241464 44818000 */ mtc1 $at, $f16 -/* 993B98 80241468 E6200004 */ swc1 $f0, 4($s1) -/* 993B9C 8024146C E6080038 */ swc1 $f8, 0x38($s0) -/* 993BA0 80241470 E614003C */ swc1 $f20, 0x3c($s0) -/* 993BA4 80241474 E6040040 */ swc1 $f4, 0x40($s0) -/* 993BA8 80241478 C6200000 */ lwc1 $f0, ($s1) -/* 993BAC 8024147C E7A80018 */ swc1 $f8, 0x18($sp) -/* 993BB0 80241480 4600803C */ c.lt.s $f16, $f0 -/* 993BB4 80241484 00000000 */ nop -/* 993BB8 80241488 45000016 */ bc1f .L802414E4 -/* 993BBC 8024148C E7A4001C */ swc1 $f4, 0x1c($sp) -/* 993BC0 80241490 08090539 */ j .L802414E4 -/* 993BC4 80241494 E6300000 */ swc1 $f16, ($s1) -.L80241498: -/* 993BC8 80241498 C622FFFC */ lwc1 $f2, -4($s1) -/* 993BCC 8024149C 3C013F66 */ lui $at, 0x3f66 -/* 993BD0 802414A0 34216666 */ ori $at, $at, 0x6666 -/* 993BD4 802414A4 44818000 */ mtc1 $at, $f16 -/* 993BD8 802414A8 00000000 */ nop -/* 993BDC 802414AC 46101082 */ mul.s $f2, $f2, $f16 -/* 993BE0 802414B0 00000000 */ nop -/* 993BE4 802414B4 C6200004 */ lwc1 $f0, 4($s1) -/* 993BE8 802414B8 46100002 */ mul.s $f0, $f0, $f16 -/* 993BEC 802414BC 00000000 */ nop -/* 993BF0 802414C0 E622FFFC */ swc1 $f2, -4($s1) -/* 993BF4 802414C4 E6200004 */ swc1 $f0, 4($s1) -/* 993BF8 802414C8 C6000038 */ lwc1 $f0, 0x38($s0) -/* 993BFC 802414CC 46020000 */ add.s $f0, $f0, $f2 -/* 993C00 802414D0 E6000038 */ swc1 $f0, 0x38($s0) -/* 993C04 802414D4 C6000040 */ lwc1 $f0, 0x40($s0) -/* 993C08 802414D8 C6220004 */ lwc1 $f2, 4($s1) -/* 993C0C 802414DC 46020000 */ add.s $f0, $f0, $f2 -/* 993C10 802414E0 E6000040 */ swc1 $f0, 0x40($s0) -.L802414E4: -/* 993C14 802414E4 C6220000 */ lwc1 $f2, ($s1) -/* 993C18 802414E8 3C013F80 */ lui $at, 0x3f80 -/* 993C1C 802414EC 44810000 */ mtc1 $at, $f0 -/* 993C20 802414F0 00000000 */ nop -/* 993C24 802414F4 46001081 */ sub.s $f2, $f2, $f0 -/* 993C28 802414F8 461E103C */ c.lt.s $f2, $f30 -/* 993C2C 802414FC 00000000 */ nop -/* 993C30 80241500 45000002 */ bc1f .L8024150C -/* 993C34 80241504 E6220000 */ swc1 $f2, ($s1) -/* 993C38 80241508 E63E0000 */ swc1 $f30, ($s1) -.L8024150C: -/* 993C3C 8024150C C602003C */ lwc1 $f2, 0x3c($s0) -/* 993C40 80241510 C6200000 */ lwc1 $f0, ($s1) -/* 993C44 80241514 46001080 */ add.s $f2, $f2, $f0 -/* 993C48 80241518 461A103E */ c.le.s $f2, $f26 -/* 993C4C 8024151C 00000000 */ nop -/* 993C50 80241520 4500000C */ bc1f .L80241554 -/* 993C54 80241524 E602003C */ swc1 $f2, 0x3c($s0) -/* 993C58 80241528 E61A003C */ swc1 $f26, 0x3c($s0) -/* 993C5C 8024152C C6200000 */ lwc1 $f0, ($s1) -/* 993C60 80241530 3C013FE0 */ lui $at, 0x3fe0 -/* 993C64 80241534 44811800 */ mtc1 $at, $f3 -/* 993C68 80241538 44801000 */ mtc1 $zero, $f2 -/* 993C6C 8024153C 46000007 */ neg.s $f0, $f0 -/* 993C70 80241540 46000021 */ cvt.d.s $f0, $f0 -/* 993C74 80241544 46220002 */ mul.d $f0, $f0, $f2 -/* 993C78 80241548 00000000 */ nop -/* 993C7C 8024154C 46200020 */ cvt.s.d $f0, $f0 -/* 993C80 80241550 E6200000 */ swc1 $f0, ($s1) -.L80241554: -/* 993C84 80241554 26520001 */ addiu $s2, $s2, 1 -/* 993C88 80241558 26310010 */ addiu $s1, $s1, 0x10 -/* 993C8C 8024155C C614003C */ lwc1 $f20, 0x3c($s0) -/* 993C90 80241560 C6000038 */ lwc1 $f0, 0x38($s0) -/* 993C94 80241564 C6020040 */ lwc1 $f2, 0x40($s0) -/* 993C98 80241568 8E820000 */ lw $v0, ($s4) -/* 993C9C 8024156C E7A00018 */ swc1 $f0, 0x18($sp) -/* 993CA0 80241570 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 993CA4 80241574 AE020000 */ sw $v0, ($s0) -/* 993CA8 80241578 2A420008 */ slti $v0, $s2, 8 -/* 993CAC 8024157C 1440FF70 */ bnez $v0, .L80241340 -/* 993CB0 80241580 26730010 */ addiu $s3, $s3, 0x10 -/* 993CB4 80241584 0000102D */ daddu $v0, $zero, $zero -.L80241588: -/* 993CB8 80241588 8FBF0034 */ lw $ra, 0x34($sp) -/* 993CBC 8024158C 8FB40030 */ lw $s4, 0x30($sp) -/* 993CC0 80241590 8FB3002C */ lw $s3, 0x2c($sp) -/* 993CC4 80241594 8FB20028 */ lw $s2, 0x28($sp) -/* 993CC8 80241598 8FB10024 */ lw $s1, 0x24($sp) -/* 993CCC 8024159C 8FB00020 */ lw $s0, 0x20($sp) -/* 993CD0 802415A0 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* 993CD4 802415A4 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* 993CD8 802415A8 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* 993CDC 802415AC D7B80048 */ ldc1 $f24, 0x48($sp) -/* 993CE0 802415B0 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 993CE4 802415B4 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 993CE8 802415B8 03E00008 */ jr $ra -/* 993CEC 802415BC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_isk/isk_14/func_802415C0_992730.s b/asm/nonmatchings/world/area_isk/isk_14/func_802415C0_992730.s deleted file mode 100644 index 4f3c8b6d71..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/func_802415C0_992730.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415C0_993CF0 -/* 993CF0 802415C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 993CF4 802415C4 AFBF0018 */ sw $ra, 0x18($sp) -/* 993CF8 802415C8 AFB10014 */ sw $s1, 0x14($sp) -/* 993CFC 802415CC AFB00010 */ sw $s0, 0x10($sp) -/* 993D00 802415D0 8C84014C */ lw $a0, 0x14c($a0) -/* 993D04 802415D4 0C00EAD2 */ jal get_npc_safe -/* 993D08 802415D8 0000882D */ daddu $s1, $zero, $zero -/* 993D0C 802415DC 8C500020 */ lw $s0, 0x20($v0) -.L802415E0: -/* 993D10 802415E0 8E040000 */ lw $a0, ($s0) -/* 993D14 802415E4 26310001 */ addiu $s1, $s1, 1 -/* 993D18 802415E8 0C00E273 */ jal free_npc -/* 993D1C 802415EC 26100010 */ addiu $s0, $s0, 0x10 -/* 993D20 802415F0 2A220008 */ slti $v0, $s1, 8 -/* 993D24 802415F4 1440FFFA */ bnez $v0, .L802415E0 -/* 993D28 802415F8 24020002 */ addiu $v0, $zero, 2 -/* 993D2C 802415FC 8FBF0018 */ lw $ra, 0x18($sp) -/* 993D30 80241600 8FB10014 */ lw $s1, 0x14($sp) -/* 993D34 80241604 8FB00010 */ lw $s0, 0x10($sp) -/* 993D38 80241608 03E00008 */ jr $ra -/* 993D3C 8024160C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_14/func_80241610_992730.s b/asm/nonmatchings/world/area_isk/isk_14/func_80241610_992730.s deleted file mode 100644 index 2da4925817..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/func_80241610_992730.s +++ /dev/null @@ -1,317 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241610_993D40 -/* 993D40 80241610 27BDFF00 */ addiu $sp, $sp, -0x100 -/* 993D44 80241614 3C02DC08 */ lui $v0, 0xdc08 -/* 993D48 80241618 AFB700E4 */ sw $s7, 0xe4($sp) -/* 993D4C 8024161C 3C17800A */ lui $s7, 0x800a -/* 993D50 80241620 26F7A66C */ addiu $s7, $s7, -0x5994 -/* 993D54 80241624 34420008 */ ori $v0, $v0, 8 -/* 993D58 80241628 AFBF00EC */ sw $ra, 0xec($sp) -/* 993D5C 8024162C AFBE00E8 */ sw $fp, 0xe8($sp) -/* 993D60 80241630 AFB600E0 */ sw $s6, 0xe0($sp) -/* 993D64 80241634 AFB500DC */ sw $s5, 0xdc($sp) -/* 993D68 80241638 AFB400D8 */ sw $s4, 0xd8($sp) -/* 993D6C 8024163C AFB300D4 */ sw $s3, 0xd4($sp) -/* 993D70 80241640 AFB200D0 */ sw $s2, 0xd0($sp) -/* 993D74 80241644 AFB100CC */ sw $s1, 0xcc($sp) -/* 993D78 80241648 AFB000C8 */ sw $s0, 0xc8($sp) -/* 993D7C 8024164C F7B600F8 */ sdc1 $f22, 0xf8($sp) -/* 993D80 80241650 F7B400F0 */ sdc1 $f20, 0xf0($sp) -/* 993D84 80241654 8EE50000 */ lw $a1, ($s7) -/* 993D88 80241658 3C168007 */ lui $s6, %hi(gCurrentCameraID) -/* 993D8C 8024165C 26D67410 */ addiu $s6, $s6, %lo(gCurrentCameraID) -/* 993D90 80241660 00A0202D */ daddu $a0, $a1, $zero -/* 993D94 80241664 24A50008 */ addiu $a1, $a1, 8 -/* 993D98 80241668 AEE50000 */ sw $a1, ($s7) -/* 993D9C 8024166C AC820000 */ sw $v0, ($a0) -/* 993DA0 80241670 8EC30000 */ lw $v1, ($s6) -/* 993DA4 80241674 3C18800B */ lui $t8, %hi(gCameras) -/* 993DA8 80241678 27181D80 */ addiu $t8, $t8, %lo(gCameras) -/* 993DAC 8024167C 00031080 */ sll $v0, $v1, 2 -/* 993DB0 80241680 00431021 */ addu $v0, $v0, $v1 -/* 993DB4 80241684 00021080 */ sll $v0, $v0, 2 -/* 993DB8 80241688 00431023 */ subu $v0, $v0, $v1 -/* 993DBC 8024168C 000218C0 */ sll $v1, $v0, 3 -/* 993DC0 80241690 00431021 */ addu $v0, $v0, $v1 -/* 993DC4 80241694 000210C0 */ sll $v0, $v0, 3 -/* 993DC8 80241698 00583021 */ addu $a2, $v0, $t8 -/* 993DCC 8024169C 24C200A0 */ addiu $v0, $a2, 0xa0 -/* 993DD0 802416A0 AC820004 */ sw $v0, 4($a0) -/* 993DD4 802416A4 94C20000 */ lhu $v0, ($a2) -/* 993DD8 802416A8 3C1E8024 */ lui $fp, 0x8024 -/* 993DDC 802416AC 27DE2AC0 */ addiu $fp, $fp, 0x2ac0 -/* 993DE0 802416B0 30420010 */ andi $v0, $v0, 0x10 -/* 993DE4 802416B4 14400007 */ bnez $v0, .L802416D4 -/* 993DE8 802416B8 24C400D4 */ addiu $a0, $a2, 0xd4 -/* 993DEC 802416BC 3C02DB0E */ lui $v0, 0xdb0e -/* 993DF0 802416C0 ACA20000 */ sw $v0, ($a1) -/* 993DF4 802416C4 94C30038 */ lhu $v1, 0x38($a2) -/* 993DF8 802416C8 24A20008 */ addiu $v0, $a1, 8 -/* 993DFC 802416CC AEE20000 */ sw $v0, ($s7) -/* 993E00 802416D0 ACA30004 */ sw $v1, 4($a1) -.L802416D4: -/* 993E04 802416D4 3C180001 */ lui $t8, 1 -/* 993E08 802416D8 3C12800A */ lui $s2, 0x800a -/* 993E0C 802416DC 2652A674 */ addiu $s2, $s2, -0x598c -/* 993E10 802416E0 AFB800C0 */ sw $t8, 0xc0($sp) -/* 993E14 802416E4 8EC50000 */ lw $a1, ($s6) -/* 993E18 802416E8 8E420000 */ lw $v0, ($s2) -/* 993E1C 802416EC 00052980 */ sll $a1, $a1, 6 -/* 993E20 802416F0 24A50030 */ addiu $a1, $a1, 0x30 -/* 993E24 802416F4 0C019D40 */ jal guMtxF2L -/* 993E28 802416F8 00452821 */ addu $a1, $v0, $a1 -/* 993E2C 802416FC 3C03DA38 */ lui $v1, 0xda38 -/* 993E30 80241700 34630007 */ ori $v1, $v1, 7 -/* 993E34 80241704 3C07E300 */ lui $a3, 0xe300 -/* 993E38 80241708 34E70A01 */ ori $a3, $a3, 0xa01 -/* 993E3C 8024170C 3C08D9C0 */ lui $t0, 0xd9c0 -/* 993E40 80241710 3508F9FB */ ori $t0, $t0, 0xf9fb -/* 993E44 80241714 3C0AD9FF */ lui $t2, 0xd9ff -/* 993E48 80241718 354AFFFF */ ori $t2, $t2, 0xffff -/* 993E4C 8024171C 3C090020 */ lui $t1, 0x20 -/* 993E50 80241720 35290005 */ ori $t1, $t1, 5 -/* 993E54 80241724 3C0BD700 */ lui $t3, 0xd700 -/* 993E58 80241728 356B0002 */ ori $t3, $t3, 2 -/* 993E5C 8024172C 3C0CE300 */ lui $t4, 0xe300 -/* 993E60 80241730 358C0F00 */ ori $t4, $t4, 0xf00 -/* 993E64 80241734 3C0DE300 */ lui $t5, 0xe300 -/* 993E68 80241738 35AD0C00 */ ori $t5, $t5, 0xc00 -/* 993E6C 8024173C 3C0EE300 */ lui $t6, 0xe300 -/* 993E70 80241740 35CE1201 */ ori $t6, $t6, 0x1201 -/* 993E74 80241744 3C0FE300 */ lui $t7, 0xe300 -/* 993E78 80241748 35EF1801 */ ori $t7, $t7, 0x1801 -/* 993E7C 8024174C 3C10E300 */ lui $s0, 0xe300 -/* 993E80 80241750 36100D01 */ ori $s0, $s0, 0xd01 -/* 993E84 80241754 3C13E300 */ lui $s3, 0xe300 -/* 993E88 80241758 36731402 */ ori $s3, $s3, 0x1402 -/* 993E8C 8024175C 3C14E300 */ lui $s4, 0xe300 -/* 993E90 80241760 36941700 */ ori $s4, $s4, 0x1700 -/* 993E94 80241764 3C15E200 */ lui $s5, 0xe200 -/* 993E98 80241768 36B51E01 */ ori $s5, $s5, 0x1e01 -/* 993E9C 8024176C 27B10040 */ addiu $s1, $sp, 0x40 -/* 993EA0 80241770 0220202D */ daddu $a0, $s1, $zero -/* 993EA4 80241774 8EE20000 */ lw $v0, ($s7) -/* 993EA8 80241778 8EC50000 */ lw $a1, ($s6) -/* 993EAC 8024177C 0040302D */ daddu $a2, $v0, $zero -/* 993EB0 80241780 24420008 */ addiu $v0, $v0, 8 -/* 993EB4 80241784 00052980 */ sll $a1, $a1, 6 -/* 993EB8 80241788 AEE20000 */ sw $v0, ($s7) -/* 993EBC 8024178C ACC30000 */ sw $v1, ($a2) -/* 993EC0 80241790 8E430000 */ lw $v1, ($s2) -/* 993EC4 80241794 24A50030 */ addiu $a1, $a1, 0x30 -/* 993EC8 80241798 00651821 */ addu $v1, $v1, $a1 -/* 993ECC 8024179C ACC30004 */ sw $v1, 4($a2) -/* 993ED0 802417A0 24430008 */ addiu $v1, $v0, 8 -/* 993ED4 802417A4 AEE30000 */ sw $v1, ($s7) -/* 993ED8 802417A8 3C03E700 */ lui $v1, 0xe700 -/* 993EDC 802417AC AC430000 */ sw $v1, ($v0) -/* 993EE0 802417B0 24430010 */ addiu $v1, $v0, 0x10 -/* 993EE4 802417B4 AC400004 */ sw $zero, 4($v0) -/* 993EE8 802417B8 AEE30000 */ sw $v1, ($s7) -/* 993EEC 802417BC 24430018 */ addiu $v1, $v0, 0x18 -/* 993EF0 802417C0 AC470008 */ sw $a3, 8($v0) -/* 993EF4 802417C4 AC40000C */ sw $zero, 0xc($v0) -/* 993EF8 802417C8 AEE30000 */ sw $v1, ($s7) -/* 993EFC 802417CC 24430020 */ addiu $v1, $v0, 0x20 -/* 993F00 802417D0 AC480010 */ sw $t0, 0x10($v0) -/* 993F04 802417D4 AC400014 */ sw $zero, 0x14($v0) -/* 993F08 802417D8 AEE30000 */ sw $v1, ($s7) -/* 993F0C 802417DC 24430028 */ addiu $v1, $v0, 0x28 -/* 993F10 802417E0 AC4A0018 */ sw $t2, 0x18($v0) -/* 993F14 802417E4 AC49001C */ sw $t1, 0x1c($v0) -/* 993F18 802417E8 AEE30000 */ sw $v1, ($s7) -/* 993F1C 802417EC 2403FFFF */ addiu $v1, $zero, -1 -/* 993F20 802417F0 AC430024 */ sw $v1, 0x24($v0) -/* 993F24 802417F4 24430030 */ addiu $v1, $v0, 0x30 -/* 993F28 802417F8 AC4B0020 */ sw $t3, 0x20($v0) -/* 993F2C 802417FC AEE30000 */ sw $v1, ($s7) -/* 993F30 80241800 24430038 */ addiu $v1, $v0, 0x38 -/* 993F34 80241804 AC4C0028 */ sw $t4, 0x28($v0) -/* 993F38 80241808 AC40002C */ sw $zero, 0x2c($v0) -/* 993F3C 8024180C AEE30000 */ sw $v1, ($s7) -/* 993F40 80241810 3C030008 */ lui $v1, 8 -/* 993F44 80241814 AC430034 */ sw $v1, 0x34($v0) -/* 993F48 80241818 24430040 */ addiu $v1, $v0, 0x40 -/* 993F4C 8024181C AC4D0030 */ sw $t5, 0x30($v0) -/* 993F50 80241820 AEE30000 */ sw $v1, ($s7) -/* 993F54 80241824 24032000 */ addiu $v1, $zero, 0x2000 -/* 993F58 80241828 AC43003C */ sw $v1, 0x3c($v0) -/* 993F5C 8024182C 24430048 */ addiu $v1, $v0, 0x48 -/* 993F60 80241830 AC4E0038 */ sw $t6, 0x38($v0) -/* 993F64 80241834 AEE30000 */ sw $v1, ($s7) -/* 993F68 80241838 240300C0 */ addiu $v1, $zero, 0xc0 -/* 993F6C 8024183C AC430044 */ sw $v1, 0x44($v0) -/* 993F70 80241840 24430050 */ addiu $v1, $v0, 0x50 -/* 993F74 80241844 AC4F0040 */ sw $t7, 0x40($v0) -/* 993F78 80241848 AEE30000 */ sw $v1, ($s7) -/* 993F7C 8024184C 24030C00 */ addiu $v1, $zero, 0xc00 -/* 993F80 80241850 AC500048 */ sw $s0, 0x48($v0) -/* 993F84 80241854 AC40004C */ sw $zero, 0x4c($v0) -/* 993F88 80241858 AC530050 */ sw $s3, 0x50($v0) -/* 993F8C 8024185C AC430054 */ sw $v1, 0x54($v0) -/* 993F90 80241860 AC540058 */ sw $s4, 0x58($v0) -/* 993F94 80241864 AC40005C */ sw $zero, 0x5c($v0) -/* 993F98 80241868 AC550060 */ sw $s5, 0x60($v0) -/* 993F9C 8024186C AC400064 */ sw $zero, 0x64($v0) -/* 993FA0 80241870 8FC50010 */ lw $a1, 0x10($fp) -/* 993FA4 80241874 8FC60014 */ lw $a2, 0x14($fp) -/* 993FA8 80241878 8FC70018 */ lw $a3, 0x18($fp) -/* 993FAC 8024187C 24430058 */ addiu $v1, $v0, 0x58 -/* 993FB0 80241880 AEE30000 */ sw $v1, ($s7) -/* 993FB4 80241884 24430060 */ addiu $v1, $v0, 0x60 -/* 993FB8 80241888 24420068 */ addiu $v0, $v0, 0x68 -/* 993FBC 8024188C AEE30000 */ sw $v1, ($s7) -/* 993FC0 80241890 0C019E40 */ jal guTranslateF -/* 993FC4 80241894 AEE20000 */ sw $v0, ($s7) -/* 993FC8 80241898 27B00080 */ addiu $s0, $sp, 0x80 -/* 993FCC 8024189C 8FB800C0 */ lw $t8, 0xc0($sp) -/* 993FD0 802418A0 8EC30000 */ lw $v1, ($s6) -/* 993FD4 802418A4 37181630 */ ori $t8, $t8, 0x1630 -/* 993FD8 802418A8 00031080 */ sll $v0, $v1, 2 -/* 993FDC 802418AC 00431021 */ addu $v0, $v0, $v1 -/* 993FE0 802418B0 00021080 */ sll $v0, $v0, 2 -/* 993FE4 802418B4 00431023 */ subu $v0, $v0, $v1 -/* 993FE8 802418B8 000218C0 */ sll $v1, $v0, 3 -/* 993FEC 802418BC 00431021 */ addu $v0, $v0, $v1 -/* 993FF0 802418C0 000210C0 */ sll $v0, $v0, 3 -/* 993FF4 802418C4 AFB800C0 */ sw $t8, 0xc0($sp) -/* 993FF8 802418C8 3C18800B */ lui $t8, %hi(gCameras) -/* 993FFC 802418CC 27181D80 */ addiu $t8, $t8, %lo(gCameras) -/* 994000 802418D0 00581021 */ addu $v0, $v0, $t8 -/* 994004 802418D4 C7C00020 */ lwc1 $f0, 0x20($fp) -/* 994008 802418D8 C442006C */ lwc1 $f2, 0x6c($v0) -/* 99400C 802418DC 4480A000 */ mtc1 $zero, $f20 -/* 994010 802418E0 46020000 */ add.s $f0, $f0, $f2 -/* 994014 802418E4 C7C20034 */ lwc1 $f2, 0x34($fp) -/* 994018 802418E8 3C013F80 */ lui $at, 0x3f80 -/* 99401C 802418EC 4481B000 */ mtc1 $at, $f22 -/* 994020 802418F0 46020000 */ add.s $f0, $f0, $f2 -/* 994024 802418F4 4406A000 */ mfc1 $a2, $f20 -/* 994028 802418F8 4407B000 */ mfc1 $a3, $f22 -/* 99402C 802418FC 44050000 */ mfc1 $a1, $f0 -/* 994030 80241900 0200202D */ daddu $a0, $s0, $zero -/* 994034 80241904 0C019EC8 */ jal guRotateF -/* 994038 80241908 E7B40010 */ swc1 $f20, 0x10($sp) -/* 99403C 8024190C 0200202D */ daddu $a0, $s0, $zero -/* 994040 80241910 0220282D */ daddu $a1, $s1, $zero -/* 994044 80241914 0C019D80 */ jal guMtxCatF -/* 994048 80241918 0220302D */ daddu $a2, $s1, $zero -/* 99404C 8024191C 8FC50024 */ lw $a1, 0x24($fp) -/* 994050 80241920 4406A000 */ mfc1 $a2, $f20 -/* 994054 80241924 4407A000 */ mfc1 $a3, $f20 -/* 994058 80241928 0200202D */ daddu $a0, $s0, $zero -/* 99405C 8024192C 0C019EC8 */ jal guRotateF -/* 994060 80241930 E7B60010 */ swc1 $f22, 0x10($sp) -/* 994064 80241934 0200202D */ daddu $a0, $s0, $zero -/* 994068 80241938 0220282D */ daddu $a1, $s1, $zero -/* 99406C 8024193C 0C019D80 */ jal guMtxCatF -/* 994070 80241940 0220302D */ daddu $a2, $s1, $zero -/* 994074 80241944 8FC5001C */ lw $a1, 0x1c($fp) -/* 994078 80241948 4406B000 */ mfc1 $a2, $f22 -/* 99407C 8024194C 4407A000 */ mfc1 $a3, $f20 -/* 994080 80241950 0200202D */ daddu $a0, $s0, $zero -/* 994084 80241954 0C019EC8 */ jal guRotateF -/* 994088 80241958 AFA70010 */ sw $a3, 0x10($sp) -/* 99408C 8024195C 0200202D */ daddu $a0, $s0, $zero -/* 994090 80241960 0220282D */ daddu $a1, $s1, $zero -/* 994094 80241964 0C019D80 */ jal guMtxCatF -/* 994098 80241968 0220302D */ daddu $a2, $s1, $zero -/* 99409C 8024196C 8FC50028 */ lw $a1, 0x28($fp) -/* 9940A0 80241970 8FC6002C */ lw $a2, 0x2c($fp) -/* 9940A4 80241974 8FC70030 */ lw $a3, 0x30($fp) -/* 9940A8 80241978 0C019DF0 */ jal guScaleF -/* 9940AC 8024197C 0200202D */ daddu $a0, $s0, $zero -/* 9940B0 80241980 0200202D */ daddu $a0, $s0, $zero -/* 9940B4 80241984 0220282D */ daddu $a1, $s1, $zero -/* 9940B8 80241988 0C019D80 */ jal guMtxCatF -/* 9940BC 8024198C 0220302D */ daddu $a2, $s1, $zero -/* 9940C0 80241990 3C108007 */ lui $s0, 0x8007 -/* 9940C4 80241994 261041F0 */ addiu $s0, $s0, 0x41f0 -/* 9940C8 80241998 0220202D */ daddu $a0, $s1, $zero -/* 9940CC 8024199C 96050000 */ lhu $a1, ($s0) -/* 9940D0 802419A0 8E420000 */ lw $v0, ($s2) -/* 9940D4 802419A4 8FB800C0 */ lw $t8, 0xc0($sp) -/* 9940D8 802419A8 00052980 */ sll $a1, $a1, 6 -/* 9940DC 802419AC 00B82821 */ addu $a1, $a1, $t8 -/* 9940E0 802419B0 0C019D40 */ jal guMtxF2L -/* 9940E4 802419B4 00452821 */ addu $a1, $v0, $a1 -/* 9940E8 802419B8 3C02DA38 */ lui $v0, 0xda38 -/* 9940EC 802419BC 34420002 */ ori $v0, $v0, 2 -/* 9940F0 802419C0 27A40030 */ addiu $a0, $sp, 0x30 -/* 9940F4 802419C4 8EE70000 */ lw $a3, ($s7) -/* 9940F8 802419C8 96080000 */ lhu $t0, ($s0) -/* 9940FC 802419CC 00E0282D */ daddu $a1, $a3, $zero -/* 994100 802419D0 ACA20000 */ sw $v0, ($a1) -/* 994104 802419D4 3102FFFF */ andi $v0, $t0, 0xffff -/* 994108 802419D8 00021180 */ sll $v0, $v0, 6 -/* 99410C 802419DC 24E70008 */ addiu $a3, $a3, 8 -/* 994110 802419E0 8FB800C0 */ lw $t8, 0xc0($sp) -/* 994114 802419E4 8E430000 */ lw $v1, ($s2) -/* 994118 802419E8 00581021 */ addu $v0, $v0, $t8 -/* 99411C 802419EC 00621821 */ addu $v1, $v1, $v0 -/* 994120 802419F0 3C028000 */ lui $v0, 0x8000 -/* 994124 802419F4 00621821 */ addu $v1, $v1, $v0 -/* 994128 802419F8 ACA30004 */ sw $v1, 4($a1) -/* 99412C 802419FC 8FC50008 */ lw $a1, 8($fp) -/* 994130 80241A00 8FC6000C */ lw $a2, 0xc($fp) -/* 994134 80241A04 25080001 */ addiu $t0, $t0, 1 -/* 994138 80241A08 AEE70000 */ sw $a3, ($s7) -/* 99413C 80241A0C 0C0B7A76 */ jal func_802DE9D8 -/* 994140 80241A10 A6080000 */ sh $t0, ($s0) -/* 994144 80241A14 27A50018 */ addiu $a1, $sp, 0x18 -/* 994148 80241A18 0000302D */ daddu $a2, $zero, $zero -/* 99414C 80241A1C 0220382D */ daddu $a3, $s1, $zero -/* 994150 80241A20 8FC40000 */ lw $a0, ($fp) -/* 994154 80241A24 8FA80030 */ lw $t0, 0x30($sp) -/* 994158 80241A28 8FA90034 */ lw $t1, 0x34($sp) -/* 99415C 80241A2C 97A3003A */ lhu $v1, 0x3a($sp) -/* 994160 80241A30 240200FF */ addiu $v0, $zero, 0xff -/* 994164 80241A34 A3A20028 */ sb $v0, 0x28($sp) -/* 994168 80241A38 A7A30020 */ sh $v1, 0x20($sp) -/* 99416C 80241A3C 3063FFFF */ andi $v1, $v1, 0xffff -/* 994170 80241A40 AFA80018 */ sw $t0, 0x18($sp) -/* 994174 80241A44 97A8003E */ lhu $t0, 0x3e($sp) -/* 994178 80241A48 44830000 */ mtc1 $v1, $f0 -/* 99417C 80241A4C 00000000 */ nop -/* 994180 80241A50 46800020 */ cvt.s.w $f0, $f0 -/* 994184 80241A54 AFA9001C */ sw $t1, 0x1c($sp) -/* 994188 80241A58 E7C00038 */ swc1 $f0, 0x38($fp) -/* 99418C 80241A5C 8FA20038 */ lw $v0, 0x38($sp) -/* 994190 80241A60 3103FFFF */ andi $v1, $t0, 0xffff -/* 994194 80241A64 44830000 */ mtc1 $v1, $f0 -/* 994198 80241A68 00000000 */ nop -/* 99419C 80241A6C 46800020 */ cvt.s.w $f0, $f0 -/* 9941A0 80241A70 00021FC2 */ srl $v1, $v0, 0x1f -/* 9941A4 80241A74 00431021 */ addu $v0, $v0, $v1 -/* 9941A8 80241A78 00021043 */ sra $v0, $v0, 1 -/* 9941AC 80241A7C 00021023 */ negu $v0, $v0 -/* 9941B0 80241A80 A7A80022 */ sh $t0, 0x22($sp) -/* 9941B4 80241A84 E7C0003C */ swc1 $f0, 0x3c($fp) -/* 9941B8 80241A88 A7A20024 */ sh $v0, 0x24($sp) -/* 9941BC 80241A8C 0C04EBDC */ jal func_8013AF70 -/* 9941C0 80241A90 A7A80026 */ sh $t0, 0x26($sp) -/* 9941C4 80241A94 3C04D838 */ lui $a0, 0xd838 -/* 9941C8 80241A98 8EE20000 */ lw $v0, ($s7) -/* 9941CC 80241A9C 34840002 */ ori $a0, $a0, 2 -/* 9941D0 80241AA0 0040182D */ daddu $v1, $v0, $zero -/* 9941D4 80241AA4 24420008 */ addiu $v0, $v0, 8 -/* 9941D8 80241AA8 AEE20000 */ sw $v0, ($s7) -/* 9941DC 80241AAC 24020040 */ addiu $v0, $zero, 0x40 -/* 9941E0 80241AB0 AC640000 */ sw $a0, ($v1) -/* 9941E4 80241AB4 AC620004 */ sw $v0, 4($v1) -/* 9941E8 80241AB8 8FBF00EC */ lw $ra, 0xec($sp) -/* 9941EC 80241ABC 8FBE00E8 */ lw $fp, 0xe8($sp) -/* 9941F0 80241AC0 8FB700E4 */ lw $s7, 0xe4($sp) -/* 9941F4 80241AC4 8FB600E0 */ lw $s6, 0xe0($sp) -/* 9941F8 80241AC8 8FB500DC */ lw $s5, 0xdc($sp) -/* 9941FC 80241ACC 8FB400D8 */ lw $s4, 0xd8($sp) -/* 994200 80241AD0 8FB300D4 */ lw $s3, 0xd4($sp) -/* 994204 80241AD4 8FB200D0 */ lw $s2, 0xd0($sp) -/* 994208 80241AD8 8FB100CC */ lw $s1, 0xcc($sp) -/* 99420C 80241ADC 8FB000C8 */ lw $s0, 0xc8($sp) -/* 994210 80241AE0 D7B600F8 */ ldc1 $f22, 0xf8($sp) -/* 994214 80241AE4 D7B400F0 */ ldc1 $f20, 0xf0($sp) -/* 994218 80241AE8 03E00008 */ jr $ra -/* 99421C 80241AEC 27BD0100 */ addiu $sp, $sp, 0x100 diff --git a/asm/nonmatchings/world/area_isk/isk_14/func_80241BEC_992730.s b/asm/nonmatchings/world/area_isk/isk_14/func_80241BEC_992730.s deleted file mode 100644 index f99bbafb66..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/func_80241BEC_992730.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BEC_99431C -/* 99431C 80241BEC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 994320 80241BF0 AFB10014 */ sw $s1, 0x14($sp) -/* 994324 80241BF4 0080882D */ daddu $s1, $a0, $zero -/* 994328 80241BF8 AFBF001C */ sw $ra, 0x1c($sp) -/* 99432C 80241BFC AFB20018 */ sw $s2, 0x18($sp) -/* 994330 80241C00 AFB00010 */ sw $s0, 0x10($sp) -/* 994334 80241C04 8E30000C */ lw $s0, 0xc($s1) -/* 994338 80241C08 8E050000 */ lw $a1, ($s0) -/* 99433C 80241C0C 0C0B210B */ jal get_float_variable -/* 994340 80241C10 26100004 */ addiu $s0, $s0, 4 -/* 994344 80241C14 8E050000 */ lw $a1, ($s0) -/* 994348 80241C18 26100004 */ addiu $s0, $s0, 4 -/* 99434C 80241C1C 4600010D */ trunc.w.s $f4, $f0 -/* 994350 80241C20 44122000 */ mfc1 $s2, $f4 -/* 994354 80241C24 0C0B210B */ jal get_float_variable -/* 994358 80241C28 0220202D */ daddu $a0, $s1, $zero -/* 99435C 80241C2C 8E050000 */ lw $a1, ($s0) -/* 994360 80241C30 4600010D */ trunc.w.s $f4, $f0 -/* 994364 80241C34 44102000 */ mfc1 $s0, $f4 -/* 994368 80241C38 0C0B210B */ jal get_float_variable -/* 99436C 80241C3C 0220202D */ daddu $a0, $s1, $zero -/* 994370 80241C40 3C038024 */ lui $v1, 0x8024 -/* 994374 80241C44 24632AC0 */ addiu $v1, $v1, 0x2ac0 -/* 994378 80241C48 44921000 */ mtc1 $s2, $f2 -/* 99437C 80241C4C 00000000 */ nop -/* 994380 80241C50 468010A0 */ cvt.s.w $f2, $f2 -/* 994384 80241C54 E4620010 */ swc1 $f2, 0x10($v1) -/* 994388 80241C58 44901000 */ mtc1 $s0, $f2 -/* 99438C 80241C5C 00000000 */ nop -/* 994390 80241C60 468010A0 */ cvt.s.w $f2, $f2 -/* 994394 80241C64 4600010D */ trunc.w.s $f4, $f0 -/* 994398 80241C68 44022000 */ mfc1 $v0, $f4 -/* 99439C 80241C6C 00000000 */ nop -/* 9943A0 80241C70 44820000 */ mtc1 $v0, $f0 -/* 9943A4 80241C74 00000000 */ nop -/* 9943A8 80241C78 46800020 */ cvt.s.w $f0, $f0 -/* 9943AC 80241C7C E4620014 */ swc1 $f2, 0x14($v1) -/* 9943B0 80241C80 E4600018 */ swc1 $f0, 0x18($v1) -/* 9943B4 80241C84 8FBF001C */ lw $ra, 0x1c($sp) -/* 9943B8 80241C88 8FB20018 */ lw $s2, 0x18($sp) -/* 9943BC 80241C8C 8FB10014 */ lw $s1, 0x14($sp) -/* 9943C0 80241C90 8FB00010 */ lw $s0, 0x10($sp) -/* 9943C4 80241C94 24020002 */ addiu $v0, $zero, 2 -/* 9943C8 80241C98 03E00008 */ jr $ra -/* 9943CC 80241C9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_16/func_8024004C_9951F0.s b/asm/nonmatchings/world/area_isk/isk_16/func_8024004C_9951F0.s deleted file mode 100644 index 3d0c2a37fa..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_16/func_8024004C_9951F0.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024004C_99523C -/* 99523C 8024004C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 995240 80240050 AFB20020 */ sw $s2, 0x20($sp) -/* 995244 80240054 0080902D */ daddu $s2, $a0, $zero -/* 995248 80240058 AFBF0024 */ sw $ra, 0x24($sp) -/* 99524C 8024005C AFB1001C */ sw $s1, 0x1c($sp) -/* 995250 80240060 AFB00018 */ sw $s0, 0x18($sp) -/* 995254 80240064 10A0004A */ beqz $a1, .L80240190 -/* 995258 80240068 8E51000C */ lw $s1, 0xc($s2) -/* 99525C 8024006C 0C00AB39 */ jal heap_malloc -/* 995260 80240070 24040058 */ addiu $a0, $zero, 0x58 -/* 995264 80240074 0000202D */ daddu $a0, $zero, $zero -/* 995268 80240078 3C05FD05 */ lui $a1, 0xfd05 -/* 99526C 8024007C 34A50F81 */ ori $a1, $a1, 0xf81 -/* 995270 80240080 0040802D */ daddu $s0, $v0, $zero -/* 995274 80240084 0200302D */ daddu $a2, $s0, $zero -/* 995278 80240088 0C0B2026 */ jal set_variable -/* 99527C 8024008C AE500084 */ sw $s0, 0x84($s2) -/* 995280 80240090 8E250000 */ lw $a1, ($s1) -/* 995284 80240094 26310004 */ addiu $s1, $s1, 4 -/* 995288 80240098 0C0B1EAF */ jal get_variable -/* 99528C 8024009C 0240202D */ daddu $a0, $s2, $zero -/* 995290 802400A0 AE020038 */ sw $v0, 0x38($s0) -/* 995294 802400A4 8E250000 */ lw $a1, ($s1) -/* 995298 802400A8 26310004 */ addiu $s1, $s1, 4 -/* 99529C 802400AC 0C0B1EAF */ jal get_variable -/* 9952A0 802400B0 0240202D */ daddu $a0, $s2, $zero -/* 9952A4 802400B4 AE02003C */ sw $v0, 0x3c($s0) -/* 9952A8 802400B8 8E250000 */ lw $a1, ($s1) -/* 9952AC 802400BC 26310004 */ addiu $s1, $s1, 4 -/* 9952B0 802400C0 0C0B210B */ jal get_float_variable -/* 9952B4 802400C4 0240202D */ daddu $a0, $s2, $zero -/* 9952B8 802400C8 E600000C */ swc1 $f0, 0xc($s0) -/* 9952BC 802400CC 8E250000 */ lw $a1, ($s1) -/* 9952C0 802400D0 26310004 */ addiu $s1, $s1, 4 -/* 9952C4 802400D4 0C0B210B */ jal get_float_variable -/* 9952C8 802400D8 0240202D */ daddu $a0, $s2, $zero -/* 9952CC 802400DC E6000010 */ swc1 $f0, 0x10($s0) -/* 9952D0 802400E0 8E250000 */ lw $a1, ($s1) -/* 9952D4 802400E4 26310004 */ addiu $s1, $s1, 4 -/* 9952D8 802400E8 0C0B210B */ jal get_float_variable -/* 9952DC 802400EC 0240202D */ daddu $a0, $s2, $zero -/* 9952E0 802400F0 E6000014 */ swc1 $f0, 0x14($s0) -/* 9952E4 802400F4 8E250000 */ lw $a1, ($s1) -/* 9952E8 802400F8 26310004 */ addiu $s1, $s1, 4 -/* 9952EC 802400FC 0C0B210B */ jal get_float_variable -/* 9952F0 80240100 0240202D */ daddu $a0, $s2, $zero -/* 9952F4 80240104 E6000018 */ swc1 $f0, 0x18($s0) -/* 9952F8 80240108 8E250000 */ lw $a1, ($s1) -/* 9952FC 8024010C 26310004 */ addiu $s1, $s1, 4 -/* 995300 80240110 0C0B210B */ jal get_float_variable -/* 995304 80240114 0240202D */ daddu $a0, $s2, $zero -/* 995308 80240118 E600001C */ swc1 $f0, 0x1c($s0) -/* 99530C 8024011C 8E250000 */ lw $a1, ($s1) -/* 995310 80240120 26310004 */ addiu $s1, $s1, 4 -/* 995314 80240124 0C0B210B */ jal get_float_variable -/* 995318 80240128 0240202D */ daddu $a0, $s2, $zero -/* 99531C 8024012C E6000020 */ swc1 $f0, 0x20($s0) -/* 995320 80240130 8E250000 */ lw $a1, ($s1) -/* 995324 80240134 26310004 */ addiu $s1, $s1, 4 -/* 995328 80240138 0C0B210B */ jal get_float_variable -/* 99532C 8024013C 0240202D */ daddu $a0, $s2, $zero -/* 995330 80240140 E6000024 */ swc1 $f0, 0x24($s0) -/* 995334 80240144 8E250000 */ lw $a1, ($s1) -/* 995338 80240148 0C0B210B */ jal get_float_variable -/* 99533C 8024014C 0240202D */ daddu $a0, $s2, $zero -/* 995340 80240150 3C013F80 */ lui $at, 0x3f80 -/* 995344 80240154 44811000 */ mtc1 $at, $f2 -/* 995348 80240158 E6000028 */ swc1 $f0, 0x28($s0) -/* 99534C 8024015C AFA00014 */ sw $zero, 0x14($sp) -/* 995350 80240160 E7A20010 */ swc1 $f2, 0x10($sp) -/* 995354 80240164 8E05000C */ lw $a1, 0xc($s0) -/* 995358 80240168 8E060010 */ lw $a2, 0x10($s0) -/* 99535C 8024016C 8E070014 */ lw $a3, 0x14($s0) -/* 995360 80240170 0C01CA6C */ jal func_800729B0 -/* 995364 80240174 24040002 */ addiu $a0, $zero, 2 -/* 995368 80240178 AE020050 */ sw $v0, 0x50($s0) -/* 99536C 8024017C A600004E */ sh $zero, 0x4e($s0) -/* 995370 80240180 A6000048 */ sh $zero, 0x48($s0) -/* 995374 80240184 A600004A */ sh $zero, 0x4a($s0) -/* 995378 80240188 A6000044 */ sh $zero, 0x44($s0) -/* 99537C 8024018C A6000046 */ sh $zero, 0x46($s0) -.L80240190: -/* 995380 80240190 8FBF0024 */ lw $ra, 0x24($sp) -/* 995384 80240194 8FB20020 */ lw $s2, 0x20($sp) -/* 995388 80240198 8FB1001C */ lw $s1, 0x1c($sp) -/* 99538C 8024019C 8FB00018 */ lw $s0, 0x18($sp) -/* 995390 802401A0 24020002 */ addiu $v0, $zero, 2 -/* 995394 802401A4 03E00008 */ jr $ra -/* 995398 802401A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_16/func_802405BC_9951F0.s b/asm/nonmatchings/world/area_isk/isk_16/func_802405BC_9951F0.s deleted file mode 100644 index b74c344348..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_16/func_802405BC_9951F0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405BC_9957AC -/* 9957AC 802405BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9957B0 802405C0 AFB00010 */ sw $s0, 0x10($sp) -/* 9957B4 802405C4 0080802D */ daddu $s0, $a0, $zero -/* 9957B8 802405C8 AFBF0014 */ sw $ra, 0x14($sp) -/* 9957BC 802405CC 8E02000C */ lw $v0, 0xc($s0) -/* 9957C0 802405D0 0C0B1EAF */ jal get_variable -/* 9957C4 802405D4 8C450000 */ lw $a1, ($v0) -/* 9957C8 802405D8 8E030084 */ lw $v1, 0x84($s0) -/* 9957CC 802405DC 8FBF0014 */ lw $ra, 0x14($sp) -/* 9957D0 802405E0 8463004E */ lh $v1, 0x4e($v1) -/* 9957D4 802405E4 8FB00010 */ lw $s0, 0x10($sp) -/* 9957D8 802405E8 00621826 */ xor $v1, $v1, $v0 -/* 9957DC 802405EC 2C630001 */ sltiu $v1, $v1, 1 -/* 9957E0 802405F0 00031040 */ sll $v0, $v1, 1 -/* 9957E4 802405F4 03E00008 */ jr $ra -/* 9957E8 802405F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_16/func_80240800_9951F0.s b/asm/nonmatchings/world/area_isk/isk_16/func_80240800_9951F0.s deleted file mode 100644 index a61f407176..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_16/func_80240800_9951F0.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240800_9959F0 -/* 9959F0 80240800 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9959F4 80240804 AFB10014 */ sw $s1, 0x14($sp) -/* 9959F8 80240808 0080882D */ daddu $s1, $a0, $zero -/* 9959FC 8024080C AFBF001C */ sw $ra, 0x1c($sp) -/* 995A00 80240810 AFB20018 */ sw $s2, 0x18($sp) -/* 995A04 80240814 AFB00010 */ sw $s0, 0x10($sp) -/* 995A08 80240818 8E30000C */ lw $s0, 0xc($s1) -/* 995A0C 8024081C 8E050000 */ lw $a1, ($s0) -/* 995A10 80240820 0C0B1EAF */ jal get_variable -/* 995A14 80240824 26100004 */ addiu $s0, $s0, 4 -/* 995A18 80240828 8E050000 */ lw $a1, ($s0) -/* 995A1C 8024082C 26100004 */ addiu $s0, $s0, 4 -/* 995A20 80240830 0220202D */ daddu $a0, $s1, $zero -/* 995A24 80240834 0C0B1EAF */ jal get_variable -/* 995A28 80240838 0040902D */ daddu $s2, $v0, $zero -/* 995A2C 8024083C 0220202D */ daddu $a0, $s1, $zero -/* 995A30 80240840 8E050000 */ lw $a1, ($s0) -/* 995A34 80240844 0C0B1EAF */ jal get_variable -/* 995A38 80240848 0040802D */ daddu $s0, $v0, $zero -/* 995A3C 8024084C 0040882D */ daddu $s1, $v0, $zero -/* 995A40 80240850 2402FFFF */ addiu $v0, $zero, -1 -/* 995A44 80240854 16020005 */ bne $s0, $v0, .L8024086C -/* 995A48 80240858 24020001 */ addiu $v0, $zero, 1 -/* 995A4C 8024085C 0C04760B */ jal func_8011D82C -/* 995A50 80240860 0220202D */ daddu $a0, $s1, $zero -/* 995A54 80240864 08090243 */ j .L8024090C -/* 995A58 80240868 24020002 */ addiu $v0, $zero, 2 -.L8024086C: -/* 995A5C 8024086C 12420018 */ beq $s2, $v0, .L802408D0 -/* 995A60 80240870 2A420002 */ slti $v0, $s2, 2 -/* 995A64 80240874 10400005 */ beqz $v0, .L8024088C -/* 995A68 80240878 24020002 */ addiu $v0, $zero, 2 -/* 995A6C 8024087C 12400007 */ beqz $s2, .L8024089C -/* 995A70 80240880 3412FFFF */ ori $s2, $zero, 0xffff -/* 995A74 80240884 08090243 */ j .L8024090C -/* 995A78 80240888 00000000 */ nop -.L8024088C: -/* 995A7C 8024088C 1242001B */ beq $s2, $v0, .L802408FC -/* 995A80 80240890 24020002 */ addiu $v0, $zero, 2 -/* 995A84 80240894 08090243 */ j .L8024090C -/* 995A88 80240898 00000000 */ nop -.L8024089C: -/* 995A8C 8024089C 8E040000 */ lw $a0, ($s0) -/* 995A90 802408A0 1092001A */ beq $a0, $s2, .L8024090C -/* 995A94 802408A4 24020002 */ addiu $v0, $zero, 2 -/* 995A98 802408A8 0C046C04 */ jal get_model_list_index_from_tree_index -/* 995A9C 802408AC 26100004 */ addiu $s0, $s0, 4 -/* 995AA0 802408B0 0C046B4C */ jal get_model_from_list_index -/* 995AA4 802408B4 0040202D */ daddu $a0, $v0, $zero -/* 995AA8 802408B8 0040202D */ daddu $a0, $v0, $zero -/* 995AAC 802408BC 2405FFFF */ addiu $a1, $zero, -1 -/* 995AB0 802408C0 0C046F1F */ jal func_8011BC7C -/* 995AB4 802408C4 0220302D */ daddu $a2, $s1, $zero -/* 995AB8 802408C8 08090227 */ j .L8024089C -/* 995ABC 802408CC 00000000 */ nop -.L802408D0: -/* 995AC0 802408D0 3412FFFF */ ori $s2, $zero, 0xffff -.L802408D4: -/* 995AC4 802408D4 8E020000 */ lw $v0, ($s0) -/* 995AC8 802408D8 1052000B */ beq $v0, $s2, .L80240908 -/* 995ACC 802408DC 2405FFFF */ addiu $a1, $zero, -1 -/* 995AD0 802408E0 96040002 */ lhu $a0, 2($s0) -/* 995AD4 802408E4 0220302D */ daddu $a2, $s1, $zero -/* 995AD8 802408E8 26100004 */ addiu $s0, $s0, 4 -/* 995ADC 802408EC 0C046E54 */ jal func_8011B950 -/* 995AE0 802408F0 0000382D */ daddu $a3, $zero, $zero -/* 995AE4 802408F4 08090235 */ j .L802408D4 -/* 995AE8 802408F8 00000000 */ nop -.L802408FC: -/* 995AEC 802408FC 3C028015 */ lui $v0, 0x8015 -/* 995AF0 80240900 8C4212F0 */ lw $v0, 0x12f0($v0) -/* 995AF4 80240904 A0510000 */ sb $s1, ($v0) -.L80240908: -/* 995AF8 80240908 24020002 */ addiu $v0, $zero, 2 -.L8024090C: -/* 995AFC 8024090C 8FBF001C */ lw $ra, 0x1c($sp) -/* 995B00 80240910 8FB20018 */ lw $s2, 0x18($sp) -/* 995B04 80240914 8FB10014 */ lw $s1, 0x14($sp) -/* 995B08 80240918 8FB00010 */ lw $s0, 0x10($sp) -/* 995B0C 8024091C 03E00008 */ jr $ra -/* 995B10 80240920 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_18/func_8024007C_997F70.s b/asm/nonmatchings/world/area_isk/isk_18/func_8024007C_997F70.s deleted file mode 100644 index d37479a8b7..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_18/func_8024007C_997F70.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024007C_997FEC -/* 997FEC 8024007C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 997FF0 80240080 AFB3001C */ sw $s3, 0x1c($sp) -/* 997FF4 80240084 0080982D */ daddu $s3, $a0, $zero -/* 997FF8 80240088 AFBF0020 */ sw $ra, 0x20($sp) -/* 997FFC 8024008C AFB20018 */ sw $s2, 0x18($sp) -/* 998000 80240090 AFB10014 */ sw $s1, 0x14($sp) -/* 998004 80240094 AFB00010 */ sw $s0, 0x10($sp) -/* 998008 80240098 8E710148 */ lw $s1, 0x148($s3) -/* 99800C 8024009C 86240008 */ lh $a0, 8($s1) -/* 998010 802400A0 0C00EABB */ jal get_npc_unsafe -/* 998014 802400A4 00A0902D */ daddu $s2, $a1, $zero -/* 998018 802400A8 0040802D */ daddu $s0, $v0, $zero -/* 99801C 802400AC 8602008E */ lh $v0, 0x8e($s0) -/* 998020 802400B0 9603008E */ lhu $v1, 0x8e($s0) -/* 998024 802400B4 18400005 */ blez $v0, .L802400CC -/* 998028 802400B8 2462FFFF */ addiu $v0, $v1, -1 -/* 99802C 802400BC A602008E */ sh $v0, 0x8e($s0) -/* 998030 802400C0 00021400 */ sll $v0, $v0, 0x10 -/* 998034 802400C4 1C400033 */ bgtz $v0, .L80240194 -/* 998038 802400C8 00000000 */ nop -.L802400CC: -/* 99803C 802400CC 8602008C */ lh $v0, 0x8c($s0) -/* 998040 802400D0 14400030 */ bnez $v0, .L80240194 -/* 998044 802400D4 00000000 */ nop -/* 998048 802400D8 8E2200CC */ lw $v0, 0xcc($s1) -/* 99804C 802400DC 8C420024 */ lw $v0, 0x24($v0) -/* 998050 802400E0 AE020028 */ sw $v0, 0x28($s0) -/* 998054 802400E4 C6400018 */ lwc1 $f0, 0x18($s2) -/* 998058 802400E8 E6000018 */ swc1 $f0, 0x18($s0) -/* 99805C 802400EC 8E230088 */ lw $v1, 0x88($s1) -/* 998060 802400F0 24020005 */ addiu $v0, $zero, 5 -/* 998064 802400F4 10620005 */ beq $v1, $v0, .L8024010C -/* 998068 802400F8 00000000 */ nop -/* 99806C 802400FC 10600003 */ beqz $v1, .L8024010C -/* 998070 80240100 24020001 */ addiu $v0, $zero, 1 -/* 998074 80240104 14620006 */ bne $v1, $v0, .L80240120 -/* 998078 80240108 00000000 */ nop -.L8024010C: -/* 99807C 8024010C 8E220084 */ lw $v0, 0x84($s1) -/* 998080 80240110 00021FC2 */ srl $v1, $v0, 0x1f -/* 998084 80240114 00431021 */ addu $v0, $v0, $v1 -/* 998088 80240118 00021043 */ sra $v0, $v0, 1 -/* 99808C 8024011C A60200A8 */ sh $v0, 0xa8($s0) -.L80240120: -/* 998090 80240120 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 998094 80240124 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 998098 80240128 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 99809C 8024012C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9980A0 80240130 8C460028 */ lw $a2, 0x28($v0) -/* 9980A4 80240134 0C00A7B5 */ jal dist2D -/* 9980A8 80240138 8C470030 */ lw $a3, 0x30($v0) -/* 9980AC 8024013C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9980B0 80240140 46020003 */ div.s $f0, $f0, $f2 -/* 9980B4 80240144 3C018024 */ lui $at, 0x8024 -/* 9980B8 80240148 D4221770 */ ldc1 $f2, 0x1770($at) -/* 9980BC 8024014C 46000021 */ cvt.d.s $f0, $f0 -/* 9980C0 80240150 46220000 */ add.d $f0, $f0, $f2 -/* 9980C4 80240154 4620010D */ trunc.w.d $f4, $f0 -/* 9980C8 80240158 44022000 */ mfc1 $v0, $f4 -/* 9980CC 8024015C 00000000 */ nop -/* 9980D0 80240160 A602008E */ sh $v0, 0x8e($s0) -/* 9980D4 80240164 00021400 */ sll $v0, $v0, 0x10 -/* 9980D8 80240168 8E230078 */ lw $v1, 0x78($s1) -/* 9980DC 8024016C 00021403 */ sra $v0, $v0, 0x10 -/* 9980E0 80240170 0043102A */ slt $v0, $v0, $v1 -/* 9980E4 80240174 10400003 */ beqz $v0, .L80240184 -/* 9980E8 80240178 00000000 */ nop -/* 9980EC 8024017C 9622007A */ lhu $v0, 0x7a($s1) -/* 9980F0 80240180 A602008E */ sh $v0, 0x8e($s0) -.L80240184: -/* 9980F4 80240184 8602008E */ lh $v0, 0x8e($s0) -/* 9980F8 80240188 AE22007C */ sw $v0, 0x7c($s1) -/* 9980FC 8024018C 2402000E */ addiu $v0, $zero, 0xe -/* 998100 80240190 AE620070 */ sw $v0, 0x70($s3) -.L80240194: -/* 998104 80240194 8FBF0020 */ lw $ra, 0x20($sp) -/* 998108 80240198 8FB3001C */ lw $s3, 0x1c($sp) -/* 99810C 8024019C 8FB20018 */ lw $s2, 0x18($sp) -/* 998110 802401A0 8FB10014 */ lw $s1, 0x14($sp) -/* 998114 802401A4 8FB00010 */ lw $s0, 0x10($sp) -/* 998118 802401A8 03E00008 */ jr $ra -/* 99811C 802401AC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_18/func_802401B0_997F70.s b/asm/nonmatchings/world/area_isk/isk_18/func_802401B0_997F70.s deleted file mode 100644 index a1a1432340..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_18/func_802401B0_997F70.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_998120 -/* 998120 802401B0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 998124 802401B4 AFB3003C */ sw $s3, 0x3c($sp) -/* 998128 802401B8 0080982D */ daddu $s3, $a0, $zero -/* 99812C 802401BC AFBF0040 */ sw $ra, 0x40($sp) -/* 998130 802401C0 AFB20038 */ sw $s2, 0x38($sp) -/* 998134 802401C4 AFB10034 */ sw $s1, 0x34($sp) -/* 998138 802401C8 AFB00030 */ sw $s0, 0x30($sp) -/* 99813C 802401CC 8E710148 */ lw $s1, 0x148($s3) -/* 998140 802401D0 0C00EABB */ jal get_npc_unsafe -/* 998144 802401D4 86240008 */ lh $a0, 8($s1) -/* 998148 802401D8 0040802D */ daddu $s0, $v0, $zero -/* 99814C 802401DC 8E22007C */ lw $v0, 0x7c($s1) -/* 998150 802401E0 8603008E */ lh $v1, 0x8e($s0) -/* 998154 802401E4 2442FFFF */ addiu $v0, $v0, -1 -/* 998158 802401E8 14620012 */ bne $v1, $v0, .L80240234 -/* 99815C 802401EC 00000000 */ nop -/* 998160 802401F0 C6000038 */ lwc1 $f0, 0x38($s0) -/* 998164 802401F4 4600020D */ trunc.w.s $f8, $f0 -/* 998168 802401F8 44024000 */ mfc1 $v0, $f8 -/* 99816C 802401FC 00000000 */ nop -/* 998170 80240200 A6220010 */ sh $v0, 0x10($s1) -/* 998174 80240204 C600003C */ lwc1 $f0, 0x3c($s0) -/* 998178 80240208 4600020D */ trunc.w.s $f8, $f0 -/* 99817C 8024020C 44024000 */ mfc1 $v0, $f8 -/* 998180 80240210 00000000 */ nop -/* 998184 80240214 A6220012 */ sh $v0, 0x12($s1) -/* 998188 80240218 C6000040 */ lwc1 $f0, 0x40($s0) -/* 99818C 8024021C 24020001 */ addiu $v0, $zero, 1 -/* 998190 80240220 A2220007 */ sb $v0, 7($s1) -/* 998194 80240224 4600020D */ trunc.w.s $f8, $f0 -/* 998198 80240228 44024000 */ mfc1 $v0, $f8 -/* 99819C 8024022C 00000000 */ nop -/* 9981A0 80240230 A6220014 */ sh $v0, 0x14($s1) -.L80240234: -/* 9981A4 80240234 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9981A8 80240238 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9981AC 8024023C C6040040 */ lwc1 $f4, 0x40($s0) -/* 9981B0 80240240 C6060018 */ lwc1 $f6, 0x18($s0) -/* 9981B4 80240244 E7A00020 */ swc1 $f0, 0x20($sp) -/* 9981B8 80240248 E7A20024 */ swc1 $f2, 0x24($sp) -/* 9981BC 8024024C E7A40028 */ swc1 $f4, 0x28($sp) -/* 9981C0 80240250 E7A60010 */ swc1 $f6, 0x10($sp) -/* 9981C4 80240254 C600000C */ lwc1 $f0, 0xc($s0) -/* 9981C8 80240258 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9981CC 8024025C 860200A8 */ lh $v0, 0xa8($s0) -/* 9981D0 80240260 27A50020 */ addiu $a1, $sp, 0x20 -/* 9981D4 80240264 44820000 */ mtc1 $v0, $f0 -/* 9981D8 80240268 00000000 */ nop -/* 9981DC 8024026C 46800020 */ cvt.s.w $f0, $f0 -/* 9981E0 80240270 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9981E4 80240274 860200A6 */ lh $v0, 0xa6($s0) -/* 9981E8 80240278 27A60024 */ addiu $a2, $sp, 0x24 -/* 9981EC 8024027C 44820000 */ mtc1 $v0, $f0 -/* 9981F0 80240280 00000000 */ nop -/* 9981F4 80240284 46800020 */ cvt.s.w $f0, $f0 -/* 9981F8 80240288 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 9981FC 8024028C 8E040080 */ lw $a0, 0x80($s0) -/* 998200 80240290 0C037711 */ jal func_800DDC44 -/* 998204 80240294 27A70028 */ addiu $a3, $sp, 0x28 -/* 998208 80240298 0040902D */ daddu $s2, $v0, $zero -/* 99820C 8024029C 16400005 */ bnez $s2, .L802402B4 -/* 998210 802402A0 00000000 */ nop -/* 998214 802402A4 8E050018 */ lw $a1, 0x18($s0) -/* 998218 802402A8 8E06000C */ lw $a2, 0xc($s0) -/* 99821C 802402AC 0C00EA95 */ jal npc_move_heading -/* 998220 802402B0 0200202D */ daddu $a0, $s0, $zero -.L802402B4: -/* 998224 802402B4 8602008E */ lh $v0, 0x8e($s0) -/* 998228 802402B8 9603008E */ lhu $v1, 0x8e($s0) -/* 99822C 802402BC 18400007 */ blez $v0, .L802402DC -/* 998230 802402C0 2462FFFF */ addiu $v0, $v1, -1 -/* 998234 802402C4 A602008E */ sh $v0, 0x8e($s0) -/* 998238 802402C8 00021400 */ sll $v0, $v0, 0x10 -/* 99823C 802402CC 18400003 */ blez $v0, .L802402DC -/* 998240 802402D0 00000000 */ nop -/* 998244 802402D4 12400008 */ beqz $s2, .L802402F8 -/* 998248 802402D8 00000000 */ nop -.L802402DC: -/* 99824C 802402DC 8E2200CC */ lw $v0, 0xcc($s1) -/* 998250 802402E0 A2200007 */ sb $zero, 7($s1) -/* 998254 802402E4 8C420028 */ lw $v0, 0x28($v0) -/* 998258 802402E8 A600008E */ sh $zero, 0x8e($s0) -/* 99825C 802402EC AE020028 */ sw $v0, 0x28($s0) -/* 998260 802402F0 2402000F */ addiu $v0, $zero, 0xf -/* 998264 802402F4 AE620070 */ sw $v0, 0x70($s3) -.L802402F8: -/* 998268 802402F8 8FBF0040 */ lw $ra, 0x40($sp) -/* 99826C 802402FC 8FB3003C */ lw $s3, 0x3c($sp) -/* 998270 80240300 8FB20038 */ lw $s2, 0x38($sp) -/* 998274 80240304 8FB10034 */ lw $s1, 0x34($sp) -/* 998278 80240308 8FB00030 */ lw $s0, 0x30($sp) -/* 99827C 8024030C 03E00008 */ jr $ra -/* 998280 80240310 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_isk/isk_18/func_80240314_997F70.s b/asm/nonmatchings/world/area_isk/isk_18/func_80240314_997F70.s deleted file mode 100644 index 86b358d17c..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_18/func_80240314_997F70.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240314_998284 -/* 998284 80240314 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 998288 80240318 AFB10014 */ sw $s1, 0x14($sp) -/* 99828C 8024031C 0080882D */ daddu $s1, $a0, $zero -/* 998290 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* 998294 80240324 AFB00010 */ sw $s0, 0x10($sp) -/* 998298 80240328 8E300148 */ lw $s0, 0x148($s1) -/* 99829C 8024032C 0C00EABB */ jal get_npc_unsafe -/* 9982A0 80240330 86040008 */ lh $a0, 8($s0) -/* 9982A4 80240334 0040202D */ daddu $a0, $v0, $zero -/* 9982A8 80240338 9482008E */ lhu $v0, 0x8e($a0) -/* 9982AC 8024033C 24030003 */ addiu $v1, $zero, 3 -/* 9982B0 80240340 24420001 */ addiu $v0, $v0, 1 -/* 9982B4 80240344 A482008E */ sh $v0, 0x8e($a0) -/* 9982B8 80240348 00021400 */ sll $v0, $v0, 0x10 -/* 9982BC 8024034C 00021403 */ sra $v0, $v0, 0x10 -/* 9982C0 80240350 14430003 */ bne $v0, $v1, .L80240360 -/* 9982C4 80240354 00000000 */ nop -/* 9982C8 80240358 96020086 */ lhu $v0, 0x86($s0) -/* 9982CC 8024035C A48200A8 */ sh $v0, 0xa8($a0) -.L80240360: -/* 9982D0 80240360 8482008E */ lh $v0, 0x8e($a0) -/* 9982D4 80240364 8E030080 */ lw $v1, 0x80($s0) -/* 9982D8 80240368 0043102A */ slt $v0, $v0, $v1 -/* 9982DC 8024036C 14400004 */ bnez $v0, .L80240380 -/* 9982E0 80240370 00000000 */ nop -/* 9982E4 80240374 96020086 */ lhu $v0, 0x86($s0) -/* 9982E8 80240378 A48200A8 */ sh $v0, 0xa8($a0) -/* 9982EC 8024037C AE200070 */ sw $zero, 0x70($s1) -.L80240380: -/* 9982F0 80240380 8FBF0018 */ lw $ra, 0x18($sp) -/* 9982F4 80240384 8FB10014 */ lw $s1, 0x14($sp) -/* 9982F8 80240388 8FB00010 */ lw $s0, 0x10($sp) -/* 9982FC 8024038C 03E00008 */ jr $ra -/* 998300 80240390 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_18/func_80240394_997F70.s b/asm/nonmatchings/world/area_isk/isk_18/func_80240394_997F70.s deleted file mode 100644 index f4eb722b2e..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_18/func_80240394_997F70.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240394_998304 -/* 998304 80240394 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 998308 80240398 AFB3005C */ sw $s3, 0x5c($sp) -/* 99830C 8024039C 0080982D */ daddu $s3, $a0, $zero -/* 998310 802403A0 AFBF0068 */ sw $ra, 0x68($sp) -/* 998314 802403A4 AFB50064 */ sw $s5, 0x64($sp) -/* 998318 802403A8 AFB40060 */ sw $s4, 0x60($sp) -/* 99831C 802403AC AFB20058 */ sw $s2, 0x58($sp) -/* 998320 802403B0 AFB10054 */ sw $s1, 0x54($sp) -/* 998324 802403B4 AFB00050 */ sw $s0, 0x50($sp) -/* 998328 802403B8 8E710148 */ lw $s1, 0x148($s3) -/* 99832C 802403BC 86240008 */ lh $a0, 8($s1) -/* 998330 802403C0 0C00EABB */ jal get_npc_unsafe -/* 998334 802403C4 00A0802D */ daddu $s0, $a1, $zero -/* 998338 802403C8 8E63000C */ lw $v1, 0xc($s3) -/* 99833C 802403CC 0260202D */ daddu $a0, $s3, $zero -/* 998340 802403D0 8C650000 */ lw $a1, ($v1) -/* 998344 802403D4 0C0B1EAF */ jal get_variable -/* 998348 802403D8 0040902D */ daddu $s2, $v0, $zero -/* 99834C 802403DC AFA00028 */ sw $zero, 0x28($sp) -/* 998350 802403E0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 998354 802403E4 8C630030 */ lw $v1, 0x30($v1) -/* 998358 802403E8 AFA3002C */ sw $v1, 0x2c($sp) -/* 99835C 802403EC 8E2300D0 */ lw $v1, 0xd0($s1) -/* 998360 802403F0 8C63001C */ lw $v1, 0x1c($v1) -/* 998364 802403F4 AFA30030 */ sw $v1, 0x30($sp) -/* 998368 802403F8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 99836C 802403FC 8C630024 */ lw $v1, 0x24($v1) -/* 998370 80240400 AFA30034 */ sw $v1, 0x34($sp) -/* 998374 80240404 8E2300D0 */ lw $v1, 0xd0($s1) -/* 998378 80240408 8C630028 */ lw $v1, 0x28($v1) -/* 99837C 8024040C 27B50028 */ addiu $s5, $sp, 0x28 -/* 998380 80240410 AFA30038 */ sw $v1, 0x38($sp) -/* 998384 80240414 8E2300D0 */ lw $v1, 0xd0($s1) -/* 998388 80240418 3C0142C8 */ lui $at, 0x42c8 -/* 99838C 8024041C 44810000 */ mtc1 $at, $f0 -/* 998390 80240420 8C63002C */ lw $v1, 0x2c($v1) -/* 998394 80240424 0040A02D */ daddu $s4, $v0, $zero -/* 998398 80240428 E7A00040 */ swc1 $f0, 0x40($sp) -/* 99839C 8024042C A7A00044 */ sh $zero, 0x44($sp) -/* 9983A0 80240430 12000009 */ beqz $s0, .L80240458 -/* 9983A4 80240434 AFA3003C */ sw $v1, 0x3c($sp) -/* 9983A8 80240438 864300A8 */ lh $v1, 0xa8($s2) -/* 9983AC 8024043C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9983B0 80240440 AE20008C */ sw $zero, 0x8c($s1) -/* 9983B4 80240444 A22000B5 */ sb $zero, 0xb5($s1) -/* 9983B8 80240448 34420008 */ ori $v0, $v0, 8 -/* 9983BC 8024044C AE230084 */ sw $v1, 0x84($s1) -/* 9983C0 80240450 0809011A */ j .L80240468 -/* 9983C4 80240454 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240458: -/* 9983C8 80240458 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9983CC 8024045C 30420004 */ andi $v0, $v0, 4 -/* 9983D0 80240460 10400047 */ beqz $v0, .L80240580 -/* 9983D4 80240464 00000000 */ nop -.L80240468: -/* 9983D8 80240468 AE600070 */ sw $zero, 0x70($s3) -/* 9983DC 8024046C A640008E */ sh $zero, 0x8e($s2) -/* 9983E0 80240470 8E2300CC */ lw $v1, 0xcc($s1) -/* 9983E4 80240474 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9983E8 80240478 A2200007 */ sb $zero, 7($s1) -/* 9983EC 8024047C 8E420000 */ lw $v0, ($s2) -/* 9983F0 80240480 8C630000 */ lw $v1, ($v1) -/* 9983F4 80240484 00441024 */ and $v0, $v0, $a0 -/* 9983F8 80240488 AE420000 */ sw $v0, ($s2) -/* 9983FC 8024048C AE430028 */ sw $v1, 0x28($s2) -/* 998400 80240490 96220086 */ lhu $v0, 0x86($s1) -/* 998404 80240494 A64200A8 */ sh $v0, 0xa8($s2) -/* 998408 80240498 8E2200D0 */ lw $v0, 0xd0($s1) -/* 99840C 8024049C AE200090 */ sw $zero, 0x90($s1) -/* 998410 802404A0 8C420034 */ lw $v0, 0x34($v0) -/* 998414 802404A4 14400006 */ bnez $v0, .L802404C0 -/* 998418 802404A8 2403FDFF */ addiu $v1, $zero, -0x201 -/* 99841C 802404AC 8E420000 */ lw $v0, ($s2) -/* 998420 802404B0 2403FFF7 */ addiu $v1, $zero, -9 -/* 998424 802404B4 34420200 */ ori $v0, $v0, 0x200 -/* 998428 802404B8 08090133 */ j .L802404CC -/* 99842C 802404BC 00431024 */ and $v0, $v0, $v1 -.L802404C0: -/* 998430 802404C0 8E420000 */ lw $v0, ($s2) -/* 998434 802404C4 00431024 */ and $v0, $v0, $v1 -/* 998438 802404C8 34420008 */ ori $v0, $v0, 8 -.L802404CC: -/* 99843C 802404CC AE420000 */ sw $v0, ($s2) -/* 998440 802404D0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 998444 802404D4 30420004 */ andi $v0, $v0, 4 -/* 998448 802404D8 1040001E */ beqz $v0, .L80240554 -/* 99844C 802404DC 24040002 */ addiu $a0, $zero, 2 -/* 998450 802404E0 0240282D */ daddu $a1, $s2, $zero -/* 998454 802404E4 0000302D */ daddu $a2, $zero, $zero -/* 998458 802404E8 24020063 */ addiu $v0, $zero, 0x63 -/* 99845C 802404EC AE620070 */ sw $v0, 0x70($s3) -/* 998460 802404F0 AE600074 */ sw $zero, 0x74($s3) -/* 998464 802404F4 864300A8 */ lh $v1, 0xa8($s2) -/* 998468 802404F8 3C013F80 */ lui $at, 0x3f80 -/* 99846C 802404FC 44810000 */ mtc1 $at, $f0 -/* 998470 80240500 3C014000 */ lui $at, 0x4000 -/* 998474 80240504 44811000 */ mtc1 $at, $f2 -/* 998478 80240508 3C01C1A0 */ lui $at, 0xc1a0 -/* 99847C 8024050C 44812000 */ mtc1 $at, $f4 -/* 998480 80240510 24020028 */ addiu $v0, $zero, 0x28 -/* 998484 80240514 AFA2001C */ sw $v0, 0x1c($sp) -/* 998488 80240518 44833000 */ mtc1 $v1, $f6 -/* 99848C 8024051C 00000000 */ nop -/* 998490 80240520 468031A0 */ cvt.s.w $f6, $f6 -/* 998494 80240524 44073000 */ mfc1 $a3, $f6 -/* 998498 80240528 27A20048 */ addiu $v0, $sp, 0x48 -/* 99849C 8024052C AFA20020 */ sw $v0, 0x20($sp) -/* 9984A0 80240530 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9984A4 80240534 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9984A8 80240538 0C01BFA4 */ jal fx_emote -/* 9984AC 8024053C E7A40018 */ swc1 $f4, 0x18($sp) -/* 9984B0 80240540 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9984B4 80240544 2403FFFB */ addiu $v1, $zero, -5 -/* 9984B8 80240548 00431024 */ and $v0, $v0, $v1 -/* 9984BC 8024054C 08090160 */ j .L80240580 -/* 9984C0 80240550 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240554: -/* 9984C4 80240554 8E220000 */ lw $v0, ($s1) -/* 9984C8 80240558 3C034000 */ lui $v1, 0x4000 -/* 9984CC 8024055C 00431024 */ and $v0, $v0, $v1 -/* 9984D0 80240560 10400007 */ beqz $v0, .L80240580 -/* 9984D4 80240564 3C03BFFF */ lui $v1, 0xbfff -/* 9984D8 80240568 2402000C */ addiu $v0, $zero, 0xc -/* 9984DC 8024056C AE620070 */ sw $v0, 0x70($s3) -/* 9984E0 80240570 8E220000 */ lw $v0, ($s1) -/* 9984E4 80240574 3463FFFF */ ori $v1, $v1, 0xffff -/* 9984E8 80240578 00431024 */ and $v0, $v0, $v1 -/* 9984EC 8024057C AE220000 */ sw $v0, ($s1) -.L80240580: -/* 9984F0 80240580 8E220090 */ lw $v0, 0x90($s1) -/* 9984F4 80240584 1840000C */ blez $v0, .L802405B8 -/* 9984F8 80240588 2442FFFF */ addiu $v0, $v0, -1 -/* 9984FC 8024058C 14400087 */ bnez $v0, .L802407AC -/* 998500 80240590 AE220090 */ sw $v0, 0x90($s1) -/* 998504 80240594 3C03FFAA */ lui $v1, 0xffaa -/* 998508 80240598 8E420028 */ lw $v0, 0x28($s2) -/* 99850C 8024059C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 998510 802405A0 00431021 */ addu $v0, $v0, $v1 -/* 998514 802405A4 2C420002 */ sltiu $v0, $v0, 2 -/* 998518 802405A8 10400003 */ beqz $v0, .L802405B8 -/* 99851C 802405AC 3C020055 */ lui $v0, 0x55 -/* 998520 802405B0 3442000C */ ori $v0, $v0, 0xc -/* 998524 802405B4 AE420028 */ sw $v0, 0x28($s2) -.L802405B8: -/* 998528 802405B8 8E630070 */ lw $v1, 0x70($s3) -/* 99852C 802405BC 2402000C */ addiu $v0, $zero, 0xc -/* 998530 802405C0 10620048 */ beq $v1, $v0, .L802406E4 -/* 998534 802405C4 2862000D */ slti $v0, $v1, 0xd -/* 998538 802405C8 1040000F */ beqz $v0, .L80240608 -/* 99853C 802405CC 24100001 */ addiu $s0, $zero, 1 -/* 998540 802405D0 1070001E */ beq $v1, $s0, .L8024064C -/* 998544 802405D4 28620002 */ slti $v0, $v1, 2 -/* 998548 802405D8 10400005 */ beqz $v0, .L802405F0 -/* 99854C 802405DC 24020002 */ addiu $v0, $zero, 2 -/* 998550 802405E0 10600015 */ beqz $v1, .L80240638 -/* 998554 802405E4 0260202D */ daddu $a0, $s3, $zero -/* 998558 802405E8 080901D0 */ j .L80240740 -/* 99855C 802405EC 00000000 */ nop -.L802405F0: -/* 998560 802405F0 1062001C */ beq $v1, $v0, .L80240664 -/* 998564 802405F4 24020003 */ addiu $v0, $zero, 3 -/* 998568 802405F8 10620035 */ beq $v1, $v0, .L802406D0 -/* 99856C 802405FC 0260202D */ daddu $a0, $s3, $zero -/* 998570 80240600 080901D0 */ j .L80240740 -/* 998574 80240604 00000000 */ nop -.L80240608: -/* 998578 80240608 2402000E */ addiu $v0, $zero, 0xe -/* 99857C 8024060C 1062003F */ beq $v1, $v0, .L8024070C -/* 998580 80240610 0062102A */ slt $v0, $v1, $v0 -/* 998584 80240614 14400038 */ bnez $v0, .L802406F8 -/* 998588 80240618 0260202D */ daddu $a0, $s3, $zero -/* 99858C 8024061C 2402000F */ addiu $v0, $zero, 0xf -/* 998590 80240620 10620040 */ beq $v1, $v0, .L80240724 -/* 998594 80240624 24020063 */ addiu $v0, $zero, 0x63 -/* 998598 80240628 10620043 */ beq $v1, $v0, .L80240738 -/* 99859C 8024062C 00000000 */ nop -/* 9985A0 80240630 080901D0 */ j .L80240740 -/* 9985A4 80240634 00000000 */ nop -.L80240638: -/* 9985A8 80240638 0280282D */ daddu $a1, $s4, $zero -/* 9985AC 8024063C 0C012568 */ jal func_800495A0 -/* 9985B0 80240640 02A0302D */ daddu $a2, $s5, $zero -/* 9985B4 80240644 96220086 */ lhu $v0, 0x86($s1) -/* 9985B8 80240648 A64200A8 */ sh $v0, 0xa8($s2) -.L8024064C: -/* 9985BC 8024064C 0260202D */ daddu $a0, $s3, $zero -/* 9985C0 80240650 0280282D */ daddu $a1, $s4, $zero -/* 9985C4 80240654 0C0125AE */ jal func_800496B8 -/* 9985C8 80240658 02A0302D */ daddu $a2, $s5, $zero -/* 9985CC 8024065C 080901D0 */ j .L80240740 -/* 9985D0 80240660 00000000 */ nop -.L80240664: -/* 9985D4 80240664 0260202D */ daddu $a0, $s3, $zero -/* 9985D8 80240668 0280282D */ daddu $a1, $s4, $zero -/* 9985DC 8024066C 0C0126D1 */ jal func_80049B44 -/* 9985E0 80240670 02A0302D */ daddu $a2, $s5, $zero -/* 9985E4 80240674 8E230088 */ lw $v1, 0x88($s1) -/* 9985E8 80240678 24020006 */ addiu $v0, $zero, 6 -/* 9985EC 8024067C 14620014 */ bne $v1, $v0, .L802406D0 -/* 9985F0 80240680 0260202D */ daddu $a0, $s3, $zero -/* 9985F4 80240684 0C00A67F */ jal rand_int -/* 9985F8 80240688 24040064 */ addiu $a0, $zero, 0x64 -/* 9985FC 8024068C 28420021 */ slti $v0, $v0, 0x21 -/* 998600 80240690 5040000F */ beql $v0, $zero, .L802406D0 -/* 998604 80240694 0260202D */ daddu $a0, $s3, $zero -/* 998608 80240698 8E22008C */ lw $v0, 0x8c($s1) -/* 99860C 8024069C 10400005 */ beqz $v0, .L802406B4 -/* 998610 802406A0 3C020055 */ lui $v0, 0x55 -/* 998614 802406A4 3442002F */ ori $v0, $v0, 0x2f -/* 998618 802406A8 AE20008C */ sw $zero, 0x8c($s1) -/* 99861C 802406AC 080901B0 */ j .L802406C0 -/* 998620 802406B0 A22000B5 */ sb $zero, 0xb5($s1) -.L802406B4: -/* 998624 802406B4 3442002E */ ori $v0, $v0, 0x2e -/* 998628 802406B8 AE30008C */ sw $s0, 0x8c($s1) -/* 99862C 802406BC A23000B5 */ sb $s0, 0xb5($s1) -.L802406C0: -/* 998630 802406C0 AE420028 */ sw $v0, 0x28($s2) -/* 998634 802406C4 24020007 */ addiu $v0, $zero, 7 -/* 998638 802406C8 080901EB */ j .L802407AC -/* 99863C 802406CC AE220090 */ sw $v0, 0x90($s1) -.L802406D0: -/* 998640 802406D0 0280282D */ daddu $a1, $s4, $zero -/* 998644 802406D4 0C012701 */ jal func_80049C04 -/* 998648 802406D8 02A0302D */ daddu $a2, $s5, $zero -/* 99864C 802406DC 080901D0 */ j .L80240740 -/* 998650 802406E0 00000000 */ nop -.L802406E4: -/* 998654 802406E4 0260202D */ daddu $a0, $s3, $zero -/* 998658 802406E8 0280282D */ daddu $a1, $s4, $zero -/* 99865C 802406EC 0C090000 */ jal func_80240000 -/* 998660 802406F0 02A0302D */ daddu $a2, $s5, $zero -/* 998664 802406F4 0260202D */ daddu $a0, $s3, $zero -.L802406F8: -/* 998668 802406F8 0280282D */ daddu $a1, $s4, $zero -/* 99866C 802406FC 0C09001F */ jal func_8024007C -/* 998670 80240700 02A0302D */ daddu $a2, $s5, $zero -/* 998674 80240704 080901D0 */ j .L80240740 -/* 998678 80240708 00000000 */ nop -.L8024070C: -/* 99867C 8024070C 0260202D */ daddu $a0, $s3, $zero -/* 998680 80240710 0280282D */ daddu $a1, $s4, $zero -/* 998684 80240714 0C09006C */ jal func_802401B0 -/* 998688 80240718 02A0302D */ daddu $a2, $s5, $zero -/* 99868C 8024071C 080901D0 */ j .L80240740 -/* 998690 80240720 00000000 */ nop -.L80240724: -/* 998694 80240724 0280282D */ daddu $a1, $s4, $zero -/* 998698 80240728 0C0900C5 */ jal func_80240314 -/* 99869C 8024072C 02A0302D */ daddu $a2, $s5, $zero -/* 9986A0 80240730 080901D0 */ j .L80240740 -/* 9986A4 80240734 00000000 */ nop -.L80240738: -/* 9986A8 80240738 0C0129CF */ jal func_8004A73C -/* 9986AC 8024073C 0260202D */ daddu $a0, $s3, $zero -.L80240740: -/* 9986B0 80240740 8E230088 */ lw $v1, 0x88($s1) -/* 9986B4 80240744 24020006 */ addiu $v0, $zero, 6 -/* 9986B8 80240748 14620019 */ bne $v1, $v0, .L802407B0 -/* 9986BC 8024074C 0000102D */ daddu $v0, $zero, $zero -/* 9986C0 80240750 8E22008C */ lw $v0, 0x8c($s1) -/* 9986C4 80240754 10400003 */ beqz $v0, .L80240764 -/* 9986C8 80240758 24020001 */ addiu $v0, $zero, 1 -/* 9986CC 8024075C 080901DA */ j .L80240768 -/* 9986D0 80240760 A22200B5 */ sb $v0, 0xb5($s1) -.L80240764: -/* 9986D4 80240764 A22000B5 */ sb $zero, 0xb5($s1) -.L80240768: -/* 9986D8 80240768 8E22008C */ lw $v0, 0x8c($s1) -/* 9986DC 8024076C 1040000F */ beqz $v0, .L802407AC -/* 9986E0 80240770 3C03FFAA */ lui $v1, 0xffaa -/* 9986E4 80240774 8E420028 */ lw $v0, 0x28($s2) -/* 9986E8 80240778 3463FFFC */ ori $v1, $v1, 0xfffc -/* 9986EC 8024077C 00431821 */ addu $v1, $v0, $v1 -/* 9986F0 80240780 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9986F4 80240784 10400009 */ beqz $v0, .L802407AC -/* 9986F8 80240788 00031080 */ sll $v0, $v1, 2 -/* 9986FC 8024078C 3C018024 */ lui $at, 0x8024 -/* 998700 80240790 00220821 */ addu $at, $at, $v0 -/* 998704 80240794 8C221778 */ lw $v0, 0x1778($at) -/* 998708 80240798 00400008 */ jr $v0 -/* 99870C 8024079C 00000000 */ nop -/* 998710 802407A0 8E420028 */ lw $v0, 0x28($s2) -/* 998714 802407A4 24420001 */ addiu $v0, $v0, 1 -/* 998718 802407A8 AE420028 */ sw $v0, 0x28($s2) -.L802407AC: -/* 99871C 802407AC 0000102D */ daddu $v0, $zero, $zero -.L802407B0: -/* 998720 802407B0 8FBF0068 */ lw $ra, 0x68($sp) -/* 998724 802407B4 8FB50064 */ lw $s5, 0x64($sp) -/* 998728 802407B8 8FB40060 */ lw $s4, 0x60($sp) -/* 99872C 802407BC 8FB3005C */ lw $s3, 0x5c($sp) -/* 998730 802407C0 8FB20058 */ lw $s2, 0x58($sp) -/* 998734 802407C4 8FB10054 */ lw $s1, 0x54($sp) -/* 998738 802407C8 8FB00050 */ lw $s0, 0x50($sp) -/* 99873C 802407CC 03E00008 */ jr $ra -/* 998740 802407D0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_isk/isk_18/func_802407D4_997F70.s b/asm/nonmatchings/world/area_isk/isk_18/func_802407D4_997F70.s deleted file mode 100644 index f9e5c50207..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_18/func_802407D4_997F70.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D4_998744 -/* 998744 802407D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 998748 802407D8 AFBF0010 */ sw $ra, 0x10($sp) -/* 99874C 802407DC 0C00EAD2 */ jal get_npc_safe -/* 998750 802407E0 8C84014C */ lw $a0, 0x14c($a0) -/* 998754 802407E4 0040182D */ daddu $v1, $v0, $zero -/* 998758 802407E8 846200A8 */ lh $v0, 0xa8($v1) -/* 99875C 802407EC C462003C */ lwc1 $f2, 0x3c($v1) -/* 998760 802407F0 906400A9 */ lbu $a0, 0xa9($v1) -/* 998764 802407F4 44820000 */ mtc1 $v0, $f0 -/* 998768 802407F8 00000000 */ nop -/* 99876C 802407FC 46800020 */ cvt.s.w $f0, $f0 -/* 998770 80240800 46001081 */ sub.s $f2, $f2, $f0 -/* 998774 80240804 A06400AB */ sb $a0, 0xab($v1) -/* 998778 80240808 E462003C */ swc1 $f2, 0x3c($v1) -/* 99877C 8024080C 8FBF0010 */ lw $ra, 0x10($sp) -/* 998780 80240810 24020002 */ addiu $v0, $zero, 2 -/* 998784 80240814 03E00008 */ jr $ra -/* 998788 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_18/func_8024081C_997F70.s b/asm/nonmatchings/world/area_isk/isk_18/func_8024081C_997F70.s deleted file mode 100644 index 817390b51a..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_18/func_8024081C_997F70.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024081C_99878C -/* 99878C 8024081C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 998790 80240820 AFBF0010 */ sw $ra, 0x10($sp) -/* 998794 80240824 0C00EAD2 */ jal get_npc_safe -/* 998798 80240828 8C84014C */ lw $a0, 0x14c($a0) -/* 99879C 8024082C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 9987A0 80240830 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 9987A4 80240834 C44C0038 */ lwc1 $f12, 0x38($v0) -/* 9987A8 80240838 C44E0040 */ lwc1 $f14, 0x40($v0) -/* 9987AC 8024083C 8C660028 */ lw $a2, 0x28($v1) -/* 9987B0 80240840 0C00A7B5 */ jal dist2D -/* 9987B4 80240844 8C670030 */ lw $a3, 0x30($v1) -/* 9987B8 80240848 3C014248 */ lui $at, 0x4248 -/* 9987BC 8024084C 44811000 */ mtc1 $at, $f2 -/* 9987C0 80240850 00000000 */ nop -/* 9987C4 80240854 4602003C */ c.lt.s $f0, $f2 -/* 9987C8 80240858 00000000 */ nop -/* 9987CC 8024085C 45010002 */ bc1t .L80240868 -/* 9987D0 80240860 24020002 */ addiu $v0, $zero, 2 -/* 9987D4 80240864 0000102D */ daddu $v0, $zero, $zero -.L80240868: -/* 9987D8 80240868 8FBF0010 */ lw $ra, 0x10($sp) -/* 9987DC 8024086C 03E00008 */ jr $ra -/* 9987E0 80240870 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_18/func_80240874_997F70.s b/asm/nonmatchings/world/area_isk/isk_18/func_80240874_997F70.s deleted file mode 100644 index 21aa509255..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_18/func_80240874_997F70.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240874_9987E4 -/* 9987E4 80240874 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9987E8 80240878 0080102D */ daddu $v0, $a0, $zero -/* 9987EC 8024087C AFB00010 */ sw $s0, 0x10($sp) -/* 9987F0 80240880 AFBF0018 */ sw $ra, 0x18($sp) -/* 9987F4 80240884 AFB10014 */ sw $s1, 0x14($sp) -/* 9987F8 80240888 8C44014C */ lw $a0, 0x14c($v0) -/* 9987FC 8024088C 8C510148 */ lw $s1, 0x148($v0) -/* 998800 80240890 0C00EAD2 */ jal get_npc_safe -/* 998804 80240894 00A0802D */ daddu $s0, $a1, $zero -/* 998808 80240898 56000001 */ bnel $s0, $zero, .L802408A0 -/* 99880C 8024089C A04000AB */ sb $zero, 0xab($v0) -.L802408A0: -/* 998810 802408A0 8C420000 */ lw $v0, ($v0) -/* 998814 802408A4 30421000 */ andi $v0, $v0, 0x1000 -/* 998818 802408A8 1040000A */ beqz $v0, .L802408D4 -/* 99881C 802408AC 0000102D */ daddu $v0, $zero, $zero -/* 998820 802408B0 82220004 */ lb $v0, 4($s1) -/* 998824 802408B4 3C03800B */ lui $v1, %hi(gCurrentEncounter) -/* 998828 802408B8 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) -/* 99882C 802408BC 00021080 */ sll $v0, $v0, 2 -/* 998830 802408C0 00431021 */ addu $v0, $v0, $v1 -/* 998834 802408C4 8C440028 */ lw $a0, 0x28($v0) -/* 998838 802408C8 9623006E */ lhu $v1, 0x6e($s1) -/* 99883C 802408CC 24020002 */ addiu $v0, $zero, 2 -/* 998840 802408D0 A4830044 */ sh $v1, 0x44($a0) -.L802408D4: -/* 998844 802408D4 8FBF0018 */ lw $ra, 0x18($sp) -/* 998848 802408D8 8FB10014 */ lw $s1, 0x14($sp) -/* 99884C 802408DC 8FB00010 */ lw $s0, 0x10($sp) -/* 998850 802408E0 03E00008 */ jr $ra -/* 998854 802408E4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 998858 802408E8 00000000 */ nop -/* 99885C 802408EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_00/func_802400B4_90CC40.s b/asm/nonmatchings/world/area_iwa/iwa_00/func_802400B4_90CC40.s deleted file mode 100644 index cdf4fdf652..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_00/func_802400B4_90CC40.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_90CCF4 -/* 90CCF4 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 90CCF8 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* 90CCFC 802400BC 0080802D */ daddu $s0, $a0, $zero -/* 90CD00 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 90CD04 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* 90CD08 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* 90CD0C 802400CC 8C510000 */ lw $s1, ($v0) -/* 90CD10 802400D0 0C0B1EAF */ jal get_variable -/* 90CD14 802400D4 0220282D */ daddu $a1, $s1, $zero -/* 90CD18 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* 90CD1C 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* 90CD20 802400E0 0200202D */ daddu $a0, $s0, $zero -/* 90CD24 802400E4 00431024 */ and $v0, $v0, $v1 -/* 90CD28 802400E8 00021140 */ sll $v0, $v0, 5 -/* 90CD2C 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* 90CD30 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* 90CD34 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 90CD38 802400F8 0C0B2026 */ jal set_variable -/* 90CD3C 802400FC 0220282D */ daddu $a1, $s1, $zero -/* 90CD40 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* 90CD44 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* 90CD48 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* 90CD4C 8024010C 24020002 */ addiu $v0, $zero, 2 -/* 90CD50 80240110 03E00008 */ jr $ra -/* 90CD54 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_00/func_80240118_90CC40.s b/asm/nonmatchings/world/area_iwa/iwa_00/func_80240118_90CC40.s deleted file mode 100644 index 643126b404..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_00/func_80240118_90CC40.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_90CD58 -/* 90CD58 80240118 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 90CD5C 8024011C AFB20028 */ sw $s2, 0x28($sp) -/* 90CD60 80240120 0080902D */ daddu $s2, $a0, $zero -/* 90CD64 80240124 AFBF0030 */ sw $ra, 0x30($sp) -/* 90CD68 80240128 AFB3002C */ sw $s3, 0x2c($sp) -/* 90CD6C 8024012C AFB10024 */ sw $s1, 0x24($sp) -/* 90CD70 80240130 AFB00020 */ sw $s0, 0x20($sp) -/* 90CD74 80240134 8E530148 */ lw $s3, 0x148($s2) -/* 90CD78 80240138 86640008 */ lh $a0, 8($s3) -/* 90CD7C 8024013C 0C00EABB */ jal get_npc_unsafe -/* 90CD80 80240140 00A0802D */ daddu $s0, $a1, $zero -/* 90CD84 80240144 12000004 */ beqz $s0, .L80240158 -/* 90CD88 80240148 0040882D */ daddu $s1, $v0, $zero -/* 90CD8C 8024014C 24020014 */ addiu $v0, $zero, 0x14 -/* 90CD90 80240150 AE400070 */ sw $zero, 0x70($s2) -/* 90CD94 80240154 AE420074 */ sw $v0, 0x74($s2) -.L80240158: -/* 90CD98 80240158 8E420074 */ lw $v0, 0x74($s2) -/* 90CD9C 8024015C 30420001 */ andi $v0, $v0, 1 -/* 90CDA0 80240160 10400004 */ beqz $v0, .L80240174 -/* 90CDA4 80240164 2403FFFD */ addiu $v1, $zero, -3 -/* 90CDA8 80240168 8E220000 */ lw $v0, ($s1) -/* 90CDAC 8024016C 0809005F */ j .L8024017C -/* 90CDB0 80240170 00431024 */ and $v0, $v0, $v1 -.L80240174: -/* 90CDB4 80240174 8E220000 */ lw $v0, ($s1) -/* 90CDB8 80240178 34420002 */ ori $v0, $v0, 2 -.L8024017C: -/* 90CDBC 8024017C AE220000 */ sw $v0, ($s1) -/* 90CDC0 80240180 8E430074 */ lw $v1, 0x74($s2) -/* 90CDC4 80240184 2402000F */ addiu $v0, $zero, 0xf -/* 90CDC8 80240188 1462002A */ bne $v1, $v0, .L80240234 -/* 90CDCC 8024018C 00000000 */ nop -/* 90CDD0 80240190 240403E5 */ addiu $a0, $zero, 0x3e5 -/* 90CDD4 80240194 962300A8 */ lhu $v1, 0xa8($s1) -/* 90CDD8 80240198 C620003C */ lwc1 $f0, 0x3c($s1) -/* 90CDDC 8024019C C6220040 */ lwc1 $f2, 0x40($s1) -/* 90CDE0 802401A0 00031C00 */ sll $v1, $v1, 0x10 -/* 90CDE4 802401A4 00031403 */ sra $v0, $v1, 0x10 -/* 90CDE8 802401A8 00031FC2 */ srl $v1, $v1, 0x1f -/* 90CDEC 802401AC 00431021 */ addu $v0, $v0, $v1 -/* 90CDF0 802401B0 00021043 */ sra $v0, $v0, 1 -/* 90CDF4 802401B4 44822000 */ mtc1 $v0, $f4 -/* 90CDF8 802401B8 00000000 */ nop -/* 90CDFC 802401BC 46802120 */ cvt.s.w $f4, $f4 -/* 90CE00 802401C0 46040000 */ add.s $f0, $f0, $f4 -/* 90CE04 802401C4 E7A20010 */ swc1 $f2, 0x10($sp) -/* 90CE08 802401C8 8E260038 */ lw $a2, 0x38($s1) -/* 90CE0C 802401CC 44070000 */ mfc1 $a3, $f0 -/* 90CE10 802401D0 0C052757 */ jal play_sound_at_position -/* 90CE14 802401D4 0000282D */ daddu $a1, $zero, $zero -/* 90CE18 802401D8 962300A8 */ lhu $v1, 0xa8($s1) -/* 90CE1C 802401DC C624003C */ lwc1 $f4, 0x3c($s1) -/* 90CE20 802401E0 3C01BF80 */ lui $at, 0xbf80 -/* 90CE24 802401E4 44811000 */ mtc1 $at, $f2 -/* 90CE28 802401E8 2402000A */ addiu $v0, $zero, 0xa -/* 90CE2C 802401EC AFA00010 */ sw $zero, 0x10($sp) -/* 90CE30 802401F0 AFA00018 */ sw $zero, 0x18($sp) -/* 90CE34 802401F4 AFA2001C */ sw $v0, 0x1c($sp) -/* 90CE38 802401F8 00031C00 */ sll $v1, $v1, 0x10 -/* 90CE3C 802401FC 00031403 */ sra $v0, $v1, 0x10 -/* 90CE40 80240200 00031FC2 */ srl $v1, $v1, 0x1f -/* 90CE44 80240204 00431021 */ addu $v0, $v0, $v1 -/* 90CE48 80240208 00021043 */ sra $v0, $v0, 1 -/* 90CE4C 8024020C 44820000 */ mtc1 $v0, $f0 -/* 90CE50 80240210 00000000 */ nop -/* 90CE54 80240214 46800020 */ cvt.s.w $f0, $f0 -/* 90CE58 80240218 46002100 */ add.s $f4, $f4, $f0 -/* 90CE5C 8024021C E7A20014 */ swc1 $f2, 0x14($sp) -/* 90CE60 80240220 8E250038 */ lw $a1, 0x38($s1) -/* 90CE64 80240224 8E270040 */ lw $a3, 0x40($s1) -/* 90CE68 80240228 44062000 */ mfc1 $a2, $f4 -/* 90CE6C 8024022C 0C01C064 */ jal func_80070190 -/* 90CE70 80240230 24040001 */ addiu $a0, $zero, 1 -.L80240234: -/* 90CE74 80240234 8E500074 */ lw $s0, 0x74($s2) -/* 90CE78 80240238 2402000A */ addiu $v0, $zero, 0xa -/* 90CE7C 8024023C 1602000F */ bne $s0, $v0, .L8024027C -/* 90CE80 80240240 00000000 */ nop -/* 90CE84 80240244 3C014120 */ lui $at, 0x4120 -/* 90CE88 80240248 44811000 */ mtc1 $at, $f2 -/* 90CE8C 8024024C C6200040 */ lwc1 $f0, 0x40($s1) -/* 90CE90 80240250 46020000 */ add.s $f0, $f0, $f2 -/* 90CE94 80240254 C62E003C */ lwc1 $f14, 0x3c($s1) -/* 90CE98 80240258 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 90CE9C 8024025C 44060000 */ mfc1 $a2, $f0 -/* 90CEA0 80240260 0C01BE3C */ jal func_8006F8F0 -/* 90CEA4 80240264 46027380 */ add.s $f14, $f14, $f2 -/* 90CEA8 80240268 8E420074 */ lw $v0, 0x74($s2) -/* 90CEAC 8024026C 14500003 */ bne $v0, $s0, .L8024027C -/* 90CEB0 80240270 00000000 */ nop -/* 90CEB4 80240274 0C0120A0 */ jal spawn_drops -/* 90CEB8 80240278 0260202D */ daddu $a0, $s3, $zero -.L8024027C: -/* 90CEBC 8024027C 8E430074 */ lw $v1, 0x74($s2) -/* 90CEC0 80240280 2463FFFF */ addiu $v1, $v1, -1 -/* 90CEC4 80240284 AE430074 */ sw $v1, 0x74($s2) -/* 90CEC8 80240288 8FBF0030 */ lw $ra, 0x30($sp) -/* 90CECC 8024028C 8FB3002C */ lw $s3, 0x2c($sp) -/* 90CED0 80240290 8FB20028 */ lw $s2, 0x28($sp) -/* 90CED4 80240294 8FB10024 */ lw $s1, 0x24($sp) -/* 90CED8 80240298 8FB00020 */ lw $s0, 0x20($sp) -/* 90CEDC 8024029C 2C620001 */ sltiu $v0, $v1, 1 -/* 90CEE0 802402A0 03E00008 */ jr $ra -/* 90CEE4 802402A4 27BD0038 */ addiu $sp, $sp, 0x38 -/* 90CEE8 802402A8 00000000 */ nop -/* 90CEEC 802402AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/func_80240710_90F6B0.s b/asm/nonmatchings/world/area_iwa/iwa_01/func_80240710_90F6B0.s deleted file mode 100644 index d8f1265e3b..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/func_80240710_90F6B0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240710_90FDC0 -/* 90FDC0 80240710 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 90FDC4 80240714 AFB20038 */ sw $s2, 0x38($sp) -/* 90FDC8 80240718 0080902D */ daddu $s2, $a0, $zero -/* 90FDCC 8024071C AFB00030 */ sw $s0, 0x30($sp) -/* 90FDD0 80240720 AFBF003C */ sw $ra, 0x3c($sp) -/* 90FDD4 80240724 AFB10034 */ sw $s1, 0x34($sp) -/* 90FDD8 80240728 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 90FDDC 8024072C F7B40040 */ sdc1 $f20, 0x40($sp) -/* 90FDE0 80240730 8E510148 */ lw $s1, 0x148($s2) -/* 90FDE4 80240734 4485A000 */ mtc1 $a1, $f20 -/* 90FDE8 80240738 86240008 */ lh $a0, 8($s1) -/* 90FDEC 8024073C 4486B000 */ mtc1 $a2, $f22 -/* 90FDF0 80240740 0C00EABB */ jal get_npc_unsafe -/* 90FDF4 80240744 00E0802D */ daddu $s0, $a3, $zero -/* 90FDF8 80240748 0200202D */ daddu $a0, $s0, $zero -/* 90FDFC 8024074C 0220282D */ daddu $a1, $s1, $zero -/* 90FE00 80240750 24030001 */ addiu $v1, $zero, 1 -/* 90FE04 80240754 4406A000 */ mfc1 $a2, $f20 -/* 90FE08 80240758 4407B000 */ mfc1 $a3, $f22 -/* 90FE0C 8024075C 0040802D */ daddu $s0, $v0, $zero -/* 90FE10 80240760 0C01242D */ jal func_800490B4 -/* 90FE14 80240764 AFA30010 */ sw $v1, 0x10($sp) -/* 90FE18 80240768 1440001D */ bnez $v0, .L802407E0 -/* 90FE1C 8024076C 24040002 */ addiu $a0, $zero, 2 -/* 90FE20 80240770 0200282D */ daddu $a1, $s0, $zero -/* 90FE24 80240774 0000302D */ daddu $a2, $zero, $zero -/* 90FE28 80240778 860300A8 */ lh $v1, 0xa8($s0) -/* 90FE2C 8024077C 3C013F80 */ lui $at, 0x3f80 -/* 90FE30 80240780 44810000 */ mtc1 $at, $f0 -/* 90FE34 80240784 3C014000 */ lui $at, 0x4000 -/* 90FE38 80240788 44811000 */ mtc1 $at, $f2 -/* 90FE3C 8024078C 3C01C1A0 */ lui $at, 0xc1a0 -/* 90FE40 80240790 44812000 */ mtc1 $at, $f4 -/* 90FE44 80240794 2402000F */ addiu $v0, $zero, 0xf -/* 90FE48 80240798 AFA2001C */ sw $v0, 0x1c($sp) -/* 90FE4C 8024079C 44833000 */ mtc1 $v1, $f6 -/* 90FE50 802407A0 00000000 */ nop -/* 90FE54 802407A4 468031A0 */ cvt.s.w $f6, $f6 -/* 90FE58 802407A8 44073000 */ mfc1 $a3, $f6 -/* 90FE5C 802407AC 27A20028 */ addiu $v0, $sp, 0x28 -/* 90FE60 802407B0 AFA20020 */ sw $v0, 0x20($sp) -/* 90FE64 802407B4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 90FE68 802407B8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 90FE6C 802407BC 0C01BFA4 */ jal fx_emote -/* 90FE70 802407C0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 90FE74 802407C4 8E2200CC */ lw $v0, 0xcc($s1) -/* 90FE78 802407C8 8C430000 */ lw $v1, ($v0) -/* 90FE7C 802407CC 24020014 */ addiu $v0, $zero, 0x14 -/* 90FE80 802407D0 A602008E */ sh $v0, 0x8e($s0) -/* 90FE84 802407D4 24020021 */ addiu $v0, $zero, 0x21 -/* 90FE88 802407D8 0809020C */ j .L80240830 -/* 90FE8C 802407DC AE030028 */ sw $v1, 0x28($s0) -.L802407E0: -/* 90FE90 802407E0 0C090148 */ jal func_80240520 -/* 90FE94 802407E4 0240202D */ daddu $a0, $s2, $zero -/* 90FE98 802407E8 0040202D */ daddu $a0, $v0, $zero -/* 90FE9C 802407EC 2402FFFF */ addiu $v0, $zero, -1 -/* 90FEA0 802407F0 10820010 */ beq $a0, $v0, .L80240834 -/* 90FEA4 802407F4 00000000 */ nop -/* 90FEA8 802407F8 0C00FB3A */ jal get_enemy -/* 90FEAC 802407FC 00000000 */ nop -/* 90FEB0 80240800 8C42006C */ lw $v0, 0x6c($v0) -/* 90FEB4 80240804 1440000B */ bnez $v0, .L80240834 -/* 90FEB8 80240808 00000000 */ nop -/* 90FEBC 8024080C 8602008C */ lh $v0, 0x8c($s0) -/* 90FEC0 80240810 14400008 */ bnez $v0, .L80240834 -/* 90FEC4 80240814 00000000 */ nop -/* 90FEC8 80240818 8E2200CC */ lw $v0, 0xcc($s1) -/* 90FECC 8024081C 8C420020 */ lw $v0, 0x20($v0) -/* 90FED0 80240820 AE020028 */ sw $v0, 0x28($s0) -/* 90FED4 80240824 96220072 */ lhu $v0, 0x72($s1) -/* 90FED8 80240828 A602008E */ sh $v0, 0x8e($s0) -/* 90FEDC 8024082C 2402001E */ addiu $v0, $zero, 0x1e -.L80240830: -/* 90FEE0 80240830 AE420070 */ sw $v0, 0x70($s2) -.L80240834: -/* 90FEE4 80240834 8FBF003C */ lw $ra, 0x3c($sp) -/* 90FEE8 80240838 8FB20038 */ lw $s2, 0x38($sp) -/* 90FEEC 8024083C 8FB10034 */ lw $s1, 0x34($sp) -/* 90FEF0 80240840 8FB00030 */ lw $s0, 0x30($sp) -/* 90FEF4 80240844 D7B60048 */ ldc1 $f22, 0x48($sp) -/* 90FEF8 80240848 D7B40040 */ ldc1 $f20, 0x40($sp) -/* 90FEFC 8024084C 03E00008 */ jr $ra -/* 90FF00 80240850 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/func_80240A38_90F6B0.s b/asm/nonmatchings/world/area_iwa/iwa_01/func_80240A38_90F6B0.s deleted file mode 100644 index fe37336b9e..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/func_80240A38_90F6B0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A38_9100E8 -/* 9100E8 80240A38 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9100EC 80240A3C AFB00010 */ sw $s0, 0x10($sp) -/* 9100F0 80240A40 0080802D */ daddu $s0, $a0, $zero -/* 9100F4 80240A44 AFBF0014 */ sw $ra, 0x14($sp) -/* 9100F8 80240A48 8E020148 */ lw $v0, 0x148($s0) -/* 9100FC 80240A4C 0C00EABB */ jal get_npc_unsafe -/* 910100 80240A50 84440008 */ lh $a0, 8($v0) -/* 910104 80240A54 9443008E */ lhu $v1, 0x8e($v0) -/* 910108 80240A58 2463FFFF */ addiu $v1, $v1, -1 -/* 91010C 80240A5C A443008E */ sh $v1, 0x8e($v0) -/* 910110 80240A60 00031C00 */ sll $v1, $v1, 0x10 -/* 910114 80240A64 58600001 */ blezl $v1, .L80240A6C -/* 910118 80240A68 AE000070 */ sw $zero, 0x70($s0) -.L80240A6C: -/* 91011C 80240A6C 8FBF0014 */ lw $ra, 0x14($sp) -/* 910120 80240A70 8FB00010 */ lw $s0, 0x10($sp) -/* 910124 80240A74 03E00008 */ jr $ra -/* 910128 80240A78 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/func_80240A7C_90F6B0.s b/asm/nonmatchings/world/area_iwa/iwa_01/func_80240A7C_90F6B0.s deleted file mode 100644 index 3cbd8cfc52..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/func_80240A7C_90F6B0.s +++ /dev/null @@ -1,354 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A7C_91012C -/* 91012C 80240A7C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 910130 80240A80 AFB7004C */ sw $s7, 0x4c($sp) -/* 910134 80240A84 0080B82D */ daddu $s7, $a0, $zero -/* 910138 80240A88 AFB10034 */ sw $s1, 0x34($sp) -/* 91013C 80240A8C 00A0882D */ daddu $s1, $a1, $zero -/* 910140 80240A90 AFBF0050 */ sw $ra, 0x50($sp) -/* 910144 80240A94 AFB60048 */ sw $s6, 0x48($sp) -/* 910148 80240A98 AFB50044 */ sw $s5, 0x44($sp) -/* 91014C 80240A9C AFB40040 */ sw $s4, 0x40($sp) -/* 910150 80240AA0 AFB3003C */ sw $s3, 0x3c($sp) -/* 910154 80240AA4 AFB20038 */ sw $s2, 0x38($sp) -/* 910158 80240AA8 AFB00030 */ sw $s0, 0x30($sp) -/* 91015C 80240AAC 8EF30148 */ lw $s3, 0x148($s7) -/* 910160 80240AB0 86640008 */ lh $a0, 8($s3) -/* 910164 80240AB4 8EF0000C */ lw $s0, 0xc($s7) -/* 910168 80240AB8 0C00FB5A */ jal get_enemy_safe -/* 91016C 80240ABC 0000B02D */ daddu $s6, $zero, $zero -/* 910170 80240AC0 10400131 */ beqz $v0, .L80240F88 -/* 910174 80240AC4 24020005 */ addiu $v0, $zero, 5 -/* 910178 80240AC8 8E63006C */ lw $v1, 0x6c($s3) -/* 91017C 80240ACC 1062012F */ beq $v1, $v0, .L80240F8C -/* 910180 80240AD0 0000102D */ daddu $v0, $zero, $zero -/* 910184 80240AD4 8E050000 */ lw $a1, ($s0) -/* 910188 80240AD8 0C0B1EAF */ jal get_variable -/* 91018C 80240ADC 02E0202D */ daddu $a0, $s7, $zero -/* 910190 80240AE0 86640008 */ lh $a0, 8($s3) -/* 910194 80240AE4 0C00EABB */ jal get_npc_unsafe -/* 910198 80240AE8 0040A82D */ daddu $s5, $v0, $zero -/* 91019C 80240AEC 8E630070 */ lw $v1, 0x70($s3) -/* 9101A0 80240AF0 30630002 */ andi $v1, $v1, 2 -/* 9101A4 80240AF4 10600008 */ beqz $v1, .L80240B18 -/* 9101A8 80240AF8 0040902D */ daddu $s2, $v0, $zero -/* 9101AC 80240AFC 964200A8 */ lhu $v0, 0xa8($s2) -/* 9101B0 80240B00 00021400 */ sll $v0, $v0, 0x10 -/* 9101B4 80240B04 00021C03 */ sra $v1, $v0, 0x10 -/* 9101B8 80240B08 000217C2 */ srl $v0, $v0, 0x1f -/* 9101BC 80240B0C 00621821 */ addu $v1, $v1, $v0 -/* 9101C0 80240B10 00031843 */ sra $v1, $v1, 1 -/* 9101C4 80240B14 A24300AB */ sb $v1, 0xab($s2) -.L80240B18: -/* 9101C8 80240B18 16200005 */ bnez $s1, .L80240B30 -/* 9101CC 80240B1C 3C030004 */ lui $v1, 4 -/* 9101D0 80240B20 8E6200B0 */ lw $v0, 0xb0($s3) -/* 9101D4 80240B24 30420004 */ andi $v0, $v0, 4 -/* 9101D8 80240B28 10400019 */ beqz $v0, .L80240B90 -/* 9101DC 80240B2C 00000000 */ nop -.L80240B30: -/* 9101E0 80240B30 34630102 */ ori $v1, $v1, 0x102 -/* 9101E4 80240B34 AEE00070 */ sw $zero, 0x70($s7) -/* 9101E8 80240B38 8E420000 */ lw $v0, ($s2) -/* 9101EC 80240B3C 0240202D */ daddu $a0, $s2, $zero -/* 9101F0 80240B40 A640008E */ sh $zero, 0x8e($s2) -/* 9101F4 80240B44 00431025 */ or $v0, $v0, $v1 -/* 9101F8 80240B48 0C00EAFF */ jal disable_npc_shadow -/* 9101FC 80240B4C AE420000 */ sw $v0, ($s2) -/* 910200 80240B50 3C041F30 */ lui $a0, 0x1f30 -/* 910204 80240B54 8E420000 */ lw $v0, ($s2) -/* 910208 80240B58 2403F7FF */ addiu $v1, $zero, -0x801 -/* 91020C 80240B5C 00431024 */ and $v0, $v0, $v1 -/* 910210 80240B60 AE420000 */ sw $v0, ($s2) -/* 910214 80240B64 8E620000 */ lw $v0, ($s3) -/* 910218 80240B68 8E6300B0 */ lw $v1, 0xb0($s3) -/* 91021C 80240B6C 34840040 */ ori $a0, $a0, 0x40 -/* 910220 80240B70 AE60006C */ sw $zero, 0x6c($s3) -/* 910224 80240B74 00441025 */ or $v0, $v0, $a0 -/* 910228 80240B78 AE620000 */ sw $v0, ($s3) -/* 91022C 80240B7C 30620004 */ andi $v0, $v1, 4 -/* 910230 80240B80 10400003 */ beqz $v0, .L80240B90 -/* 910234 80240B84 2402FFFB */ addiu $v0, $zero, -5 -/* 910238 80240B88 00621024 */ and $v0, $v1, $v0 -/* 91023C 80240B8C AE6200B0 */ sw $v0, 0xb0($s3) -.L80240B90: -/* 910240 80240B90 8EE30070 */ lw $v1, 0x70($s7) -/* 910244 80240B94 24100001 */ addiu $s0, $zero, 1 -/* 910248 80240B98 10700012 */ beq $v1, $s0, .L80240BE4 -/* 91024C 80240B9C 28620002 */ slti $v0, $v1, 2 -/* 910250 80240BA0 10400005 */ beqz $v0, .L80240BB8 -/* 910254 80240BA4 24020002 */ addiu $v0, $zero, 2 -/* 910258 80240BA8 10600007 */ beqz $v1, .L80240BC8 -/* 91025C 80240BAC 0000102D */ daddu $v0, $zero, $zero -/* 910260 80240BB0 080903E3 */ j .L80240F8C -/* 910264 80240BB4 00000000 */ nop -.L80240BB8: -/* 910268 80240BB8 1062005B */ beq $v1, $v0, .L80240D28 -/* 91026C 80240BBC 0000102D */ daddu $v0, $zero, $zero -/* 910270 80240BC0 080903E3 */ j .L80240F8C -/* 910274 80240BC4 00000000 */ nop -.L80240BC8: -/* 910278 80240BC8 8E420000 */ lw $v0, ($s2) -/* 91027C 80240BCC 0240202D */ daddu $a0, $s2, $zero -/* 910280 80240BD0 34420002 */ ori $v0, $v0, 2 -/* 910284 80240BD4 0C00EAFF */ jal disable_npc_shadow -/* 910288 80240BD8 AE420000 */ sw $v0, ($s2) -/* 91028C 80240BDC AE60006C */ sw $zero, 0x6c($s3) -/* 910290 80240BE0 AEF00070 */ sw $s0, 0x70($s7) -.L80240BE4: -/* 910294 80240BE4 8E74006C */ lw $s4, 0x6c($s3) -/* 910298 80240BE8 24020001 */ addiu $v0, $zero, 1 -/* 91029C 80240BEC 168200E7 */ bne $s4, $v0, .L80240F8C -/* 9102A0 80240BF0 0000102D */ daddu $v0, $zero, $zero -/* 9102A4 80240BF4 8E64007C */ lw $a0, 0x7c($s3) -/* 9102A8 80240BF8 24110002 */ addiu $s1, $zero, 2 -/* 9102AC 80240BFC 0C00EABB */ jal get_npc_unsafe -/* 9102B0 80240C00 AE71006C */ sw $s1, 0x6c($s3) -/* 9102B4 80240C04 0040802D */ daddu $s0, $v0, $zero -/* 9102B8 80240C08 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9102BC 80240C0C E6400038 */ swc1 $f0, 0x38($s2) -/* 9102C0 80240C10 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9102C4 80240C14 E6400040 */ swc1 $f0, 0x40($s2) -/* 9102C8 80240C18 C6020034 */ lwc1 $f2, 0x34($s0) -/* 9102CC 80240C1C 3C014387 */ lui $at, 0x4387 -/* 9102D0 80240C20 44810000 */ mtc1 $at, $f0 -/* 9102D4 80240C24 26440038 */ addiu $a0, $s2, 0x38 -/* 9102D8 80240C28 46020001 */ sub.s $f0, $f0, $f2 -/* 9102DC 80240C2C C6680078 */ lwc1 $f8, 0x78($s3) -/* 9102E0 80240C30 46804220 */ cvt.s.w $f8, $f8 -/* 9102E4 80240C34 44064000 */ mfc1 $a2, $f8 -/* 9102E8 80240C38 44070000 */ mfc1 $a3, $f0 -/* 9102EC 80240C3C 0C00A7E7 */ jal add_vec2D_polar -/* 9102F0 80240C40 26450040 */ addiu $a1, $s2, 0x40 -/* 9102F4 80240C44 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9102F8 80240C48 C6620074 */ lwc1 $f2, 0x74($s3) -/* 9102FC 80240C4C 468010A0 */ cvt.s.w $f2, $f2 -/* 910300 80240C50 46020000 */ add.s $f0, $f0, $f2 -/* 910304 80240C54 E640003C */ swc1 $f0, 0x3c($s2) -/* 910308 80240C58 A2740007 */ sb $s4, 7($s3) -/* 91030C 80240C5C C6400038 */ lwc1 $f0, 0x38($s2) -/* 910310 80240C60 4600020D */ trunc.w.s $f8, $f0 -/* 910314 80240C64 44024000 */ mfc1 $v0, $f8 -/* 910318 80240C68 00000000 */ nop -/* 91031C 80240C6C A6620010 */ sh $v0, 0x10($s3) -/* 910320 80240C70 C640003C */ lwc1 $f0, 0x3c($s2) -/* 910324 80240C74 4600020D */ trunc.w.s $f8, $f0 -/* 910328 80240C78 44024000 */ mfc1 $v0, $f8 -/* 91032C 80240C7C 00000000 */ nop -/* 910330 80240C80 A6620012 */ sh $v0, 0x12($s3) -/* 910334 80240C84 C6400040 */ lwc1 $f0, 0x40($s2) -/* 910338 80240C88 4600020D */ trunc.w.s $f8, $f0 -/* 91033C 80240C8C 44024000 */ mfc1 $v0, $f8 -/* 910340 80240C90 00000000 */ nop -/* 910344 80240C94 A6620014 */ sh $v0, 0x14($s3) -/* 910348 80240C98 AE400044 */ sw $zero, 0x44($s2) -/* 91034C 80240C9C AE400048 */ sw $zero, 0x48($s2) -/* 910350 80240CA0 AE40004C */ sw $zero, 0x4c($s2) -/* 910354 80240CA4 C6A00000 */ lwc1 $f0, ($s5) -/* 910358 80240CA8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 91035C 80240CAC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 910360 80240CB0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* 910364 80240CB4 C64E0040 */ lwc1 $f14, 0x40($s2) -/* 910368 80240CB8 E6400018 */ swc1 $f0, 0x18($s2) -/* 91036C 80240CBC 8C460028 */ lw $a2, 0x28($v0) -/* 910370 80240CC0 0C00A720 */ jal atan2 -/* 910374 80240CC4 8C470030 */ lw $a3, 0x30($v0) -/* 910378 80240CC8 E640000C */ swc1 $f0, 0xc($s2) -/* 91037C 80240CCC C6A0000C */ lwc1 $f0, 0xc($s5) -/* 910380 80240CD0 8E420000 */ lw $v0, ($s2) -/* 910384 80240CD4 0240202D */ daddu $a0, $s2, $zero -/* 910388 80240CD8 E640001C */ swc1 $f0, 0x1c($s2) -/* 91038C 80240CDC C6A00010 */ lwc1 $f0, 0x10($s5) -/* 910390 80240CE0 2403FFFD */ addiu $v1, $zero, -3 -/* 910394 80240CE4 E6400014 */ swc1 $f0, 0x14($s2) -/* 910398 80240CE8 C600003C */ lwc1 $f0, 0x3c($s0) -/* 91039C 80240CEC 00431024 */ and $v0, $v0, $v1 -/* 9103A0 80240CF0 AE420000 */ sw $v0, ($s2) -/* 9103A4 80240CF4 0C00EAE8 */ jal enable_npc_shadow -/* 9103A8 80240CF8 E6400064 */ swc1 $f0, 0x64($s2) -/* 9103AC 80240CFC 8E420000 */ lw $v0, ($s2) -/* 9103B0 80240D00 3C03E0FF */ lui $v1, 0xe0ff -/* 9103B4 80240D04 34420800 */ ori $v0, $v0, 0x800 -/* 9103B8 80240D08 AE420000 */ sw $v0, ($s2) -/* 9103BC 80240D0C 8E620000 */ lw $v0, ($s3) -/* 9103C0 80240D10 3463FFFF */ ori $v1, $v1, 0xffff -/* 9103C4 80240D14 00431024 */ and $v0, $v0, $v1 -/* 9103C8 80240D18 AE620000 */ sw $v0, ($s3) -/* 9103CC 80240D1C 2402005A */ addiu $v0, $zero, 0x5a -/* 9103D0 80240D20 A642008E */ sh $v0, 0x8e($s2) -/* 9103D4 80240D24 AEF10070 */ sw $s1, 0x70($s7) -.L80240D28: -/* 9103D8 80240D28 0000202D */ daddu $a0, $zero, $zero -/* 9103DC 80240D2C 27B00020 */ addiu $s0, $sp, 0x20 -/* 9103E0 80240D30 864200A8 */ lh $v0, 0xa8($s2) -/* 9103E4 80240D34 3C013FE0 */ lui $at, 0x3fe0 -/* 9103E8 80240D38 44810800 */ mtc1 $at, $f1 -/* 9103EC 80240D3C 44800000 */ mtc1 $zero, $f0 -/* 9103F0 80240D40 44821000 */ mtc1 $v0, $f2 -/* 9103F4 80240D44 00000000 */ nop -/* 9103F8 80240D48 468010A1 */ cvt.d.w $f2, $f2 -/* 9103FC 80240D4C 46201082 */ mul.d $f2, $f2, $f0 -/* 910400 80240D50 00000000 */ nop -/* 910404 80240D54 0200282D */ daddu $a1, $s0, $zero -/* 910408 80240D58 C6440038 */ lwc1 $f4, 0x38($s2) -/* 91040C 80240D5C C640003C */ lwc1 $f0, 0x3c($s2) -/* 910410 80240D60 27B10024 */ addiu $s1, $sp, 0x24 -/* 910414 80240D64 E7A40020 */ swc1 $f4, 0x20($sp) -/* 910418 80240D68 C6440040 */ lwc1 $f4, 0x40($s2) -/* 91041C 80240D6C 46000021 */ cvt.d.s $f0, $f0 -/* 910420 80240D70 46220000 */ add.d $f0, $f0, $f2 -/* 910424 80240D74 E7A40028 */ swc1 $f4, 0x28($sp) -/* 910428 80240D78 C6420018 */ lwc1 $f2, 0x18($s2) -/* 91042C 80240D7C 46200020 */ cvt.s.d $f0, $f0 -/* 910430 80240D80 E7A00024 */ swc1 $f0, 0x24($sp) -/* 910434 80240D84 E7A20010 */ swc1 $f2, 0x10($sp) -/* 910438 80240D88 C640000C */ lwc1 $f0, 0xc($s2) -/* 91043C 80240D8C 0220302D */ daddu $a2, $s1, $zero -/* 910440 80240D90 E7A00014 */ swc1 $f0, 0x14($sp) -/* 910444 80240D94 864200A6 */ lh $v0, 0xa6($s2) -/* 910448 80240D98 27B40028 */ addiu $s4, $sp, 0x28 -/* 91044C 80240D9C 44820000 */ mtc1 $v0, $f0 -/* 910450 80240DA0 00000000 */ nop -/* 910454 80240DA4 46800020 */ cvt.s.w $f0, $f0 -/* 910458 80240DA8 E7A00018 */ swc1 $f0, 0x18($sp) -/* 91045C 80240DAC 864200A8 */ lh $v0, 0xa8($s2) -/* 910460 80240DB0 0280382D */ daddu $a3, $s4, $zero -/* 910464 80240DB4 44820000 */ mtc1 $v0, $f0 -/* 910468 80240DB8 00000000 */ nop -/* 91046C 80240DBC 46800020 */ cvt.s.w $f0, $f0 -/* 910470 80240DC0 0C0376B9 */ jal func_800DDAE4 -/* 910474 80240DC4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 910478 80240DC8 54400001 */ bnel $v0, $zero, .L80240DD0 -/* 91047C 80240DCC 24160001 */ addiu $s6, $zero, 1 -.L80240DD0: -/* 910480 80240DD0 0200282D */ daddu $a1, $s0, $zero -/* 910484 80240DD4 0220302D */ daddu $a2, $s1, $zero -/* 910488 80240DD8 C6400038 */ lwc1 $f0, 0x38($s2) -/* 91048C 80240DDC C642003C */ lwc1 $f2, 0x3c($s2) -/* 910490 80240DE0 C6440040 */ lwc1 $f4, 0x40($s2) -/* 910494 80240DE4 3C01447A */ lui $at, 0x447a -/* 910498 80240DE8 44813000 */ mtc1 $at, $f6 -/* 91049C 80240DEC 27A2002C */ addiu $v0, $sp, 0x2c -/* 9104A0 80240DF0 E7A00020 */ swc1 $f0, 0x20($sp) -/* 9104A4 80240DF4 E7A20024 */ swc1 $f2, 0x24($sp) -/* 9104A8 80240DF8 E7A40028 */ swc1 $f4, 0x28($sp) -/* 9104AC 80240DFC E7A6002C */ swc1 $f6, 0x2c($sp) -/* 9104B0 80240E00 AFA20010 */ sw $v0, 0x10($sp) -/* 9104B4 80240E04 8E440080 */ lw $a0, 0x80($s2) -/* 9104B8 80240E08 0C0372DF */ jal func_800DCB7C -/* 9104BC 80240E0C 0280382D */ daddu $a3, $s4, $zero -/* 9104C0 80240E10 10400019 */ beqz $v0, .L80240E78 -/* 9104C4 80240E14 00000000 */ nop -/* 9104C8 80240E18 C640001C */ lwc1 $f0, 0x1c($s2) -/* 9104CC 80240E1C C7A2002C */ lwc1 $f2, 0x2c($sp) -/* 9104D0 80240E20 46000005 */ abs.s $f0, $f0 -/* 9104D4 80240E24 4600103C */ c.lt.s $f2, $f0 -/* 9104D8 80240E28 00000000 */ nop -/* 9104DC 80240E2C 45000012 */ bc1f .L80240E78 -/* 9104E0 80240E30 00000000 */ nop -/* 9104E4 80240E34 C7A40024 */ lwc1 $f4, 0x24($sp) -/* 9104E8 80240E38 C6400064 */ lwc1 $f0, 0x64($s2) -/* 9104EC 80240E3C 46002001 */ sub.s $f0, $f4, $f0 -/* 9104F0 80240E40 3C014034 */ lui $at, 0x4034 -/* 9104F4 80240E44 44811800 */ mtc1 $at, $f3 -/* 9104F8 80240E48 44801000 */ mtc1 $zero, $f2 -/* 9104FC 80240E4C 46000005 */ abs.s $f0, $f0 -/* 910500 80240E50 46000021 */ cvt.d.s $f0, $f0 -/* 910504 80240E54 4622003C */ c.lt.d $f0, $f2 -/* 910508 80240E58 00000000 */ nop -/* 91050C 80240E5C 45000006 */ bc1f .L80240E78 -/* 910510 80240E60 0240202D */ daddu $a0, $s2, $zero -/* 910514 80240E64 8E450018 */ lw $a1, 0x18($s2) -/* 910518 80240E68 8E46000C */ lw $a2, 0xc($s2) -/* 91051C 80240E6C 2416000A */ addiu $s6, $zero, 0xa -/* 910520 80240E70 0C00EA95 */ jal npc_move_heading -/* 910524 80240E74 E644003C */ swc1 $f4, 0x3c($s2) -.L80240E78: -/* 910528 80240E78 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 91052C 80240E7C 3C013FF0 */ lui $at, 0x3ff0 -/* 910530 80240E80 44811800 */ mtc1 $at, $f3 -/* 910534 80240E84 44801000 */ mtc1 $zero, $f2 -/* 910538 80240E88 46000021 */ cvt.d.s $f0, $f0 -/* 91053C 80240E8C 4622003C */ c.lt.d $f0, $f2 -/* 910540 80240E90 00000000 */ nop -/* 910544 80240E94 45030001 */ bc1tl .L80240E9C -/* 910548 80240E98 2416000B */ addiu $s6, $zero, 0xb -.L80240E9C: -/* 91054C 80240E9C 9642008E */ lhu $v0, 0x8e($s2) -/* 910550 80240EA0 2442FFFF */ addiu $v0, $v0, -1 -/* 910554 80240EA4 A642008E */ sh $v0, 0x8e($s2) -/* 910558 80240EA8 00021400 */ sll $v0, $v0, 0x10 -/* 91055C 80240EAC 58400001 */ blezl $v0, .L80240EB4 -/* 910560 80240EB0 24160014 */ addiu $s6, $zero, 0x14 -.L80240EB4: -/* 910564 80240EB4 56C00019 */ bnel $s6, $zero, .L80240F1C -/* 910568 80240EB8 AFA00010 */ sw $zero, 0x10($sp) -/* 91056C 80240EBC 8E620070 */ lw $v0, 0x70($s3) -/* 910570 80240EC0 30420001 */ andi $v0, $v0, 1 -/* 910574 80240EC4 10400009 */ beqz $v0, .L80240EEC -/* 910578 80240EC8 00000000 */ nop -/* 91057C 80240ECC C640004C */ lwc1 $f0, 0x4c($s2) -/* 910580 80240ED0 3C014044 */ lui $at, 0x4044 -/* 910584 80240ED4 44811800 */ mtc1 $at, $f3 -/* 910588 80240ED8 44801000 */ mtc1 $zero, $f2 -/* 91058C 80240EDC 46000021 */ cvt.d.s $f0, $f0 -/* 910590 80240EE0 46220000 */ add.d $f0, $f0, $f2 -/* 910594 80240EE4 46200020 */ cvt.s.d $f0, $f0 -/* 910598 80240EE8 E640004C */ swc1 $f0, 0x4c($s2) -.L80240EEC: -/* 91059C 80240EEC 8E450018 */ lw $a1, 0x18($s2) -/* 9105A0 80240EF0 8E46000C */ lw $a2, 0xc($s2) -/* 9105A4 80240EF4 0C00EA95 */ jal npc_move_heading -/* 9105A8 80240EF8 0240202D */ daddu $a0, $s2, $zero -/* 9105AC 80240EFC C644003C */ lwc1 $f4, 0x3c($s2) -/* 9105B0 80240F00 C640001C */ lwc1 $f0, 0x1c($s2) -/* 9105B4 80240F04 46002100 */ add.s $f4, $f4, $f0 -/* 9105B8 80240F08 C6420014 */ lwc1 $f2, 0x14($s2) -/* 9105BC 80240F0C 46020001 */ sub.s $f0, $f0, $f2 -/* 9105C0 80240F10 E644003C */ swc1 $f4, 0x3c($s2) -/* 9105C4 80240F14 080903E2 */ j .L80240F88 -/* 9105C8 80240F18 E640001C */ swc1 $f0, 0x1c($s2) -.L80240F1C: -/* 9105CC 80240F1C AFA00014 */ sw $zero, 0x14($sp) -/* 9105D0 80240F20 8E450038 */ lw $a1, 0x38($s2) -/* 9105D4 80240F24 8E46003C */ lw $a2, 0x3c($s2) -/* 9105D8 80240F28 8E470040 */ lw $a3, 0x40($s2) -/* 9105DC 80240F2C 0C01BECC */ jal fx_walk_normal -/* 9105E0 80240F30 24040002 */ addiu $a0, $zero, 2 -/* 9105E4 80240F34 3C01C47A */ lui $at, 0xc47a -/* 9105E8 80240F38 44810000 */ mtc1 $at, $f0 -/* 9105EC 80240F3C AE60006C */ sw $zero, 0x6c($s3) -/* 9105F0 80240F40 8E420000 */ lw $v0, ($s2) -/* 9105F4 80240F44 0240202D */ daddu $a0, $s2, $zero -/* 9105F8 80240F48 AE400038 */ sw $zero, 0x38($s2) -/* 9105FC 80240F4C AE400040 */ sw $zero, 0x40($s2) -/* 910600 80240F50 AE40001C */ sw $zero, 0x1c($s2) -/* 910604 80240F54 34420002 */ ori $v0, $v0, 2 -/* 910608 80240F58 E640003C */ swc1 $f0, 0x3c($s2) -/* 91060C 80240F5C 0C00EAFF */ jal disable_npc_shadow -/* 910610 80240F60 AE420000 */ sw $v0, ($s2) -/* 910614 80240F64 8E420000 */ lw $v0, ($s2) -/* 910618 80240F68 2403F7FF */ addiu $v1, $zero, -0x801 -/* 91061C 80240F6C 00431024 */ and $v0, $v0, $v1 -/* 910620 80240F70 AE420000 */ sw $v0, ($s2) -/* 910624 80240F74 8E620000 */ lw $v0, ($s3) -/* 910628 80240F78 3C031F00 */ lui $v1, 0x1f00 -/* 91062C 80240F7C 00431025 */ or $v0, $v0, $v1 -/* 910630 80240F80 AE620000 */ sw $v0, ($s3) -/* 910634 80240F84 AEE00070 */ sw $zero, 0x70($s7) -.L80240F88: -/* 910638 80240F88 0000102D */ daddu $v0, $zero, $zero -.L80240F8C: -/* 91063C 80240F8C 8FBF0050 */ lw $ra, 0x50($sp) -/* 910640 80240F90 8FB7004C */ lw $s7, 0x4c($sp) -/* 910644 80240F94 8FB60048 */ lw $s6, 0x48($sp) -/* 910648 80240F98 8FB50044 */ lw $s5, 0x44($sp) -/* 91064C 80240F9C 8FB40040 */ lw $s4, 0x40($sp) -/* 910650 80240FA0 8FB3003C */ lw $s3, 0x3c($sp) -/* 910654 80240FA4 8FB20038 */ lw $s2, 0x38($sp) -/* 910658 80240FA8 8FB10034 */ lw $s1, 0x34($sp) -/* 91065C 80240FAC 8FB00030 */ lw $s0, 0x30($sp) -/* 910660 80240FB0 03E00008 */ jr $ra -/* 910664 80240FB4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/func_80240FB8_90F6B0.s b/asm/nonmatchings/world/area_iwa/iwa_01/func_80240FB8_90F6B0.s deleted file mode 100644 index 4e7de8d770..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/func_80240FB8_90F6B0.s +++ /dev/null @@ -1,298 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FB8_910668 -/* 910668 80240FB8 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 91066C 80240FBC AFB3003C */ sw $s3, 0x3c($sp) -/* 910670 80240FC0 0080982D */ daddu $s3, $a0, $zero -/* 910674 80240FC4 AFB40040 */ sw $s4, 0x40($sp) -/* 910678 80240FC8 0000A02D */ daddu $s4, $zero, $zero -/* 91067C 80240FCC 3C03800A */ lui $v1, 0x800a -/* 910680 80240FD0 8463A634 */ lh $v1, -0x59cc($v1) -/* 910684 80240FD4 3C04800B */ lui $a0, %hi(gCameras) -/* 910688 80240FD8 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* 91068C 80240FDC AFBF0044 */ sw $ra, 0x44($sp) -/* 910690 80240FE0 AFB20038 */ sw $s2, 0x38($sp) -/* 910694 80240FE4 AFB10034 */ sw $s1, 0x34($sp) -/* 910698 80240FE8 AFB00030 */ sw $s0, 0x30($sp) -/* 91069C 80240FEC F7B80058 */ sdc1 $f24, 0x58($sp) -/* 9106A0 80240FF0 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 9106A4 80240FF4 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 9106A8 80240FF8 8E710148 */ lw $s1, 0x148($s3) -/* 9106AC 80240FFC 00031080 */ sll $v0, $v1, 2 -/* 9106B0 80241000 00431021 */ addu $v0, $v0, $v1 -/* 9106B4 80241004 00021080 */ sll $v0, $v0, 2 -/* 9106B8 80241008 00431023 */ subu $v0, $v0, $v1 -/* 9106BC 8024100C 000218C0 */ sll $v1, $v0, 3 -/* 9106C0 80241010 00431021 */ addu $v0, $v0, $v1 -/* 9106C4 80241014 000210C0 */ sll $v0, $v0, 3 -/* 9106C8 80241018 10A00002 */ beqz $a1, .L80241024 -/* 9106CC 8024101C 00449021 */ addu $s2, $v0, $a0 -/* 9106D0 80241020 AE600070 */ sw $zero, 0x70($s3) -.L80241024: -/* 9106D4 80241024 0C00FB5A */ jal get_enemy_safe -/* 9106D8 80241028 86240008 */ lh $a0, 8($s1) -/* 9106DC 8024102C 14400006 */ bnez $v0, .L80241048 -/* 9106E0 80241030 24020005 */ addiu $v0, $zero, 5 -/* 9106E4 80241034 0260202D */ daddu $a0, $s3, $zero -/* 9106E8 80241038 3C05FE36 */ lui $a1, 0xfe36 -/* 9106EC 8024103C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 9106F0 80241040 080904EA */ j .L802413A8 -/* 9106F4 80241044 0000302D */ daddu $a2, $zero, $zero -.L80241048: -/* 9106F8 80241048 8E23006C */ lw $v1, 0x6c($s1) -/* 9106FC 8024104C 14620005 */ bne $v1, $v0, .L80241064 -/* 910700 80241050 0260202D */ daddu $a0, $s3, $zero -/* 910704 80241054 3C05FE36 */ lui $a1, 0xfe36 -/* 910708 80241058 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 91070C 8024105C 080904EA */ j .L802413A8 -/* 910710 80241060 0000302D */ daddu $a2, $zero, $zero -.L80241064: -/* 910714 80241064 86240008 */ lh $a0, 8($s1) -/* 910718 80241068 0C00FB5A */ jal get_enemy_safe -/* 91071C 8024106C 00000000 */ nop -/* 910720 80241070 14400005 */ bnez $v0, .L80241088 -/* 910724 80241074 0260202D */ daddu $a0, $s3, $zero -/* 910728 80241078 3C05FE36 */ lui $a1, 0xfe36 -/* 91072C 8024107C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 910730 80241080 080904EA */ j .L802413A8 -/* 910734 80241084 0000302D */ daddu $a2, $zero, $zero -.L80241088: -/* 910738 80241088 86240008 */ lh $a0, 8($s1) -/* 91073C 8024108C 0C00EABB */ jal get_npc_unsafe -/* 910740 80241090 00000000 */ nop -/* 910744 80241094 8E630070 */ lw $v1, 0x70($s3) -/* 910748 80241098 10600006 */ beqz $v1, .L802410B4 -/* 91074C 8024109C 0040802D */ daddu $s0, $v0, $zero -/* 910750 802410A0 24020001 */ addiu $v0, $zero, 1 -/* 910754 802410A4 1062003F */ beq $v1, $v0, .L802411A4 -/* 910758 802410A8 0000102D */ daddu $v0, $zero, $zero -/* 91075C 802410AC 080904FA */ j .L802413E8 -/* 910760 802410B0 00000000 */ nop -.L802410B4: -/* 910764 802410B4 AFA00010 */ sw $zero, 0x10($sp) -/* 910768 802410B8 AFA00014 */ sw $zero, 0x14($sp) -/* 91076C 802410BC 8E050038 */ lw $a1, 0x38($s0) -/* 910770 802410C0 8E06003C */ lw $a2, 0x3c($s0) -/* 910774 802410C4 8E070040 */ lw $a3, 0x40($s0) -/* 910778 802410C8 0C01BECC */ jal fx_walk_normal -/* 91077C 802410CC 24040002 */ addiu $a0, $zero, 2 -/* 910780 802410D0 C64C006C */ lwc1 $f12, 0x6c($s2) -/* 910784 802410D4 0C00A6C9 */ jal clamp_angle -/* 910788 802410D8 00000000 */ nop -/* 91078C 802410DC 3C018024 */ lui $at, 0x8024 -/* 910790 802410E0 D43863A0 */ ldc1 $f24, 0x63a0($at) -/* 910794 802410E4 46000521 */ cvt.d.s $f20, $f0 -/* 910798 802410E8 4638A300 */ add.d $f12, $f20, $f24 -/* 91079C 802410EC 3C018024 */ lui $at, 0x8024 -/* 9107A0 802410F0 D43663A8 */ ldc1 $f22, 0x63a8($at) -/* 9107A4 802410F4 0C00A6C9 */ jal clamp_angle -/* 9107A8 802410F8 46206320 */ cvt.s.d $f12, $f12 -/* 9107AC 802410FC 4636A500 */ add.d $f20, $f20, $f22 -/* 9107B0 80241100 4620A320 */ cvt.s.d $f12, $f20 -/* 9107B4 80241104 0C00A6C9 */ jal clamp_angle -/* 9107B8 80241108 46000506 */ mov.s $f20, $f0 -/* 9107BC 8024110C 4600A521 */ cvt.d.s $f20, $f20 -/* 9107C0 80241110 4636A500 */ add.d $f20, $f20, $f22 -/* 9107C4 80241114 46000586 */ mov.s $f22, $f0 -/* 9107C8 80241118 0C00A6C9 */ jal clamp_angle -/* 9107CC 8024111C 4620A320 */ cvt.s.d $f12, $f20 -/* 9107D0 80241120 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9107D4 80241124 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9107D8 80241128 C64C006C */ lwc1 $f12, 0x6c($s2) -/* 9107DC 8024112C C44E0084 */ lwc1 $f14, 0x84($v0) -/* 9107E0 80241130 0C00A70A */ jal get_clamped_angle_diff -/* 9107E4 80241134 46000506 */ mov.s $f20, $f0 -/* 9107E8 80241138 0C00A6C9 */ jal clamp_angle -/* 9107EC 8024113C 46000306 */ mov.s $f12, $f0 -/* 9107F0 80241140 46000021 */ cvt.d.s $f0, $f0 -/* 9107F4 80241144 4638003C */ c.lt.d $f0, $f24 -/* 9107F8 80241148 00000000 */ nop -/* 9107FC 8024114C 45020002 */ bc1fl .L80241158 -/* 910800 80241150 E614000C */ swc1 $f20, 0xc($s0) -/* 910804 80241154 E616000C */ swc1 $f22, 0xc($s0) -.L80241158: -/* 910808 80241158 C6000018 */ lwc1 $f0, 0x18($s0) -/* 91080C 8024115C 3C018024 */ lui $at, 0x8024 -/* 910810 80241160 D42263B0 */ ldc1 $f2, 0x63b0($at) -/* 910814 80241164 46000021 */ cvt.d.s $f0, $f0 -/* 910818 80241168 46220002 */ mul.d $f0, $f0, $f2 -/* 91081C 8024116C 00000000 */ nop -/* 910820 80241170 3C013F66 */ lui $at, 0x3f66 -/* 910824 80241174 34216666 */ ori $at, $at, 0x6666 -/* 910828 80241178 44812000 */ mtc1 $at, $f4 -/* 91082C 8024117C 2402001E */ addiu $v0, $zero, 0x1e -/* 910830 80241180 A602008E */ sh $v0, 0x8e($s0) -/* 910834 80241184 3C014120 */ lui $at, 0x4120 -/* 910838 80241188 44811000 */ mtc1 $at, $f2 -/* 91083C 8024118C 24020001 */ addiu $v0, $zero, 1 -/* 910840 80241190 E6040014 */ swc1 $f4, 0x14($s0) -/* 910844 80241194 E602001C */ swc1 $f2, 0x1c($s0) -/* 910848 80241198 46200020 */ cvt.s.d $f0, $f0 -/* 91084C 8024119C E6000018 */ swc1 $f0, 0x18($s0) -/* 910850 802411A0 AE620070 */ sw $v0, 0x70($s3) -.L802411A4: -/* 910854 802411A4 C6000038 */ lwc1 $f0, 0x38($s0) -/* 910858 802411A8 C602003C */ lwc1 $f2, 0x3c($s0) -/* 91085C 802411AC C6040040 */ lwc1 $f4, 0x40($s0) -/* 910860 802411B0 C6060018 */ lwc1 $f6, 0x18($s0) -/* 910864 802411B4 0000202D */ daddu $a0, $zero, $zero -/* 910868 802411B8 E7A00020 */ swc1 $f0, 0x20($sp) -/* 91086C 802411BC E7A20024 */ swc1 $f2, 0x24($sp) -/* 910870 802411C0 E7A40028 */ swc1 $f4, 0x28($sp) -/* 910874 802411C4 E7A60010 */ swc1 $f6, 0x10($sp) -/* 910878 802411C8 C600000C */ lwc1 $f0, 0xc($s0) -/* 91087C 802411CC 27A50020 */ addiu $a1, $sp, 0x20 -/* 910880 802411D0 E7A00014 */ swc1 $f0, 0x14($sp) -/* 910884 802411D4 860200A6 */ lh $v0, 0xa6($s0) -/* 910888 802411D8 27A60024 */ addiu $a2, $sp, 0x24 -/* 91088C 802411DC 44820000 */ mtc1 $v0, $f0 -/* 910890 802411E0 00000000 */ nop -/* 910894 802411E4 46800020 */ cvt.s.w $f0, $f0 -/* 910898 802411E8 E7A00018 */ swc1 $f0, 0x18($sp) -/* 91089C 802411EC 860200A8 */ lh $v0, 0xa8($s0) -/* 9108A0 802411F0 27A70028 */ addiu $a3, $sp, 0x28 -/* 9108A4 802411F4 44820000 */ mtc1 $v0, $f0 -/* 9108A8 802411F8 00000000 */ nop -/* 9108AC 802411FC 46800020 */ cvt.s.w $f0, $f0 -/* 9108B0 80241200 0C037711 */ jal func_800DDC44 -/* 9108B4 80241204 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 9108B8 80241208 54400007 */ bnel $v0, $zero, .L80241228 -/* 9108BC 8024120C 24140001 */ addiu $s4, $zero, 1 -/* 9108C0 80241210 8E050018 */ lw $a1, 0x18($s0) -/* 9108C4 80241214 8E06000C */ lw $a2, 0xc($s0) -/* 9108C8 80241218 0C00EA95 */ jal npc_move_heading -/* 9108CC 8024121C 0200202D */ daddu $a0, $s0, $zero -/* 9108D0 80241220 0809048B */ j .L8024122C -/* 9108D4 80241224 0000902D */ daddu $s2, $zero, $zero -.L80241228: -/* 9108D8 80241228 0000902D */ daddu $s2, $zero, $zero -.L8024122C: -/* 9108DC 8024122C C600001C */ lwc1 $f0, 0x1c($s0) -/* 9108E0 80241230 44801000 */ mtc1 $zero, $f2 -/* 9108E4 80241234 44801800 */ mtc1 $zero, $f3 -/* 9108E8 80241238 46000021 */ cvt.d.s $f0, $f0 -/* 9108EC 8024123C 4622003C */ c.lt.d $f0, $f2 -/* 9108F0 80241240 00000000 */ nop -/* 9108F4 80241244 45000028 */ bc1f .L802412E8 -/* 9108F8 80241248 27A50020 */ addiu $a1, $sp, 0x20 -/* 9108FC 8024124C 27A60024 */ addiu $a2, $sp, 0x24 -/* 910900 80241250 27A2002C */ addiu $v0, $sp, 0x2c -/* 910904 80241254 C602003C */ lwc1 $f2, 0x3c($s0) -/* 910908 80241258 C6060038 */ lwc1 $f6, 0x38($s0) -/* 91090C 8024125C 3C01402A */ lui $at, 0x402a -/* 910910 80241260 4481A800 */ mtc1 $at, $f21 -/* 910914 80241264 4480A000 */ mtc1 $zero, $f20 -/* 910918 80241268 460010A1 */ cvt.d.s $f2, $f2 -/* 91091C 8024126C 46341080 */ add.d $f2, $f2, $f20 -/* 910920 80241270 C600001C */ lwc1 $f0, 0x1c($s0) -/* 910924 80241274 C6040040 */ lwc1 $f4, 0x40($s0) -/* 910928 80241278 46000005 */ abs.s $f0, $f0 -/* 91092C 8024127C E7A40028 */ swc1 $f4, 0x28($sp) -/* 910930 80241280 3C014030 */ lui $at, 0x4030 -/* 910934 80241284 44812800 */ mtc1 $at, $f5 -/* 910938 80241288 44802000 */ mtc1 $zero, $f4 -/* 91093C 8024128C 46000021 */ cvt.d.s $f0, $f0 -/* 910940 80241290 E7A60020 */ swc1 $f6, 0x20($sp) -/* 910944 80241294 46240000 */ add.d $f0, $f0, $f4 -/* 910948 80241298 462010A0 */ cvt.s.d $f2, $f2 -/* 91094C 8024129C E7A20024 */ swc1 $f2, 0x24($sp) -/* 910950 802412A0 46200020 */ cvt.s.d $f0, $f0 -/* 910954 802412A4 E7A0002C */ swc1 $f0, 0x2c($sp) -/* 910958 802412A8 AFA20010 */ sw $v0, 0x10($sp) -/* 91095C 802412AC 8E040080 */ lw $a0, 0x80($s0) -/* 910960 802412B0 0C0372DF */ jal func_800DCB7C -/* 910964 802412B4 27A70028 */ addiu $a3, $sp, 0x28 -/* 910968 802412B8 1040000B */ beqz $v0, .L802412E8 -/* 91096C 802412BC 00000000 */ nop -/* 910970 802412C0 C600001C */ lwc1 $f0, 0x1c($s0) -/* 910974 802412C4 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* 910978 802412C8 46000005 */ abs.s $f0, $f0 -/* 91097C 802412CC 46000021 */ cvt.d.s $f0, $f0 -/* 910980 802412D0 46340000 */ add.d $f0, $f0, $f20 -/* 910984 802412D4 460010A1 */ cvt.d.s $f2, $f2 -/* 910988 802412D8 4620103E */ c.le.d $f2, $f0 -/* 91098C 802412DC 00000000 */ nop -/* 910990 802412E0 45030001 */ bc1tl .L802412E8 -/* 910994 802412E4 24120001 */ addiu $s2, $zero, 1 -.L802412E8: -/* 910998 802412E8 56400008 */ bnel $s2, $zero, .L8024130C -/* 91099C 802412EC 2414000A */ addiu $s4, $zero, 0xa -/* 9109A0 802412F0 C604003C */ lwc1 $f4, 0x3c($s0) -/* 9109A4 802412F4 C600001C */ lwc1 $f0, 0x1c($s0) -/* 9109A8 802412F8 46002100 */ add.s $f4, $f4, $f0 -/* 9109AC 802412FC C6020014 */ lwc1 $f2, 0x14($s0) -/* 9109B0 80241300 46020001 */ sub.s $f0, $f0, $f2 -/* 9109B4 80241304 E604003C */ swc1 $f4, 0x3c($s0) -/* 9109B8 80241308 E600001C */ swc1 $f0, 0x1c($s0) -.L8024130C: -/* 9109BC 8024130C 9602008E */ lhu $v0, 0x8e($s0) -/* 9109C0 80241310 2442FFFF */ addiu $v0, $v0, -1 -/* 9109C4 80241314 A602008E */ sh $v0, 0x8e($s0) -/* 9109C8 80241318 00021400 */ sll $v0, $v0, 0x10 -/* 9109CC 8024131C 58400001 */ blezl $v0, .L80241324 -/* 9109D0 80241320 2414000B */ addiu $s4, $zero, 0xb -.L80241324: -/* 9109D4 80241324 12800024 */ beqz $s4, .L802413B8 -/* 9109D8 80241328 00000000 */ nop -/* 9109DC 8024132C AFA00010 */ sw $zero, 0x10($sp) -/* 9109E0 80241330 AFA00014 */ sw $zero, 0x14($sp) -/* 9109E4 80241334 8E050038 */ lw $a1, 0x38($s0) -/* 9109E8 80241338 8E06003C */ lw $a2, 0x3c($s0) -/* 9109EC 8024133C 8E070040 */ lw $a3, 0x40($s0) -/* 9109F0 80241340 0C01BECC */ jal fx_walk_normal -/* 9109F4 80241344 24040002 */ addiu $a0, $zero, 2 -/* 9109F8 80241348 3C01C47A */ lui $at, 0xc47a -/* 9109FC 8024134C 44810000 */ mtc1 $at, $f0 -/* 910A00 80241350 AE20006C */ sw $zero, 0x6c($s1) -/* 910A04 80241354 8E020000 */ lw $v0, ($s0) -/* 910A08 80241358 0200202D */ daddu $a0, $s0, $zero -/* 910A0C 8024135C AE000038 */ sw $zero, 0x38($s0) -/* 910A10 80241360 AE000040 */ sw $zero, 0x40($s0) -/* 910A14 80241364 34420002 */ ori $v0, $v0, 2 -/* 910A18 80241368 E600003C */ swc1 $f0, 0x3c($s0) -/* 910A1C 8024136C 0C00EAFF */ jal disable_npc_shadow -/* 910A20 80241370 AE020000 */ sw $v0, ($s0) -/* 910A24 80241374 0260202D */ daddu $a0, $s3, $zero -/* 910A28 80241378 3C05FE36 */ lui $a1, 0xfe36 -/* 910A2C 8024137C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 910A30 80241380 24060001 */ addiu $a2, $zero, 1 -/* 910A34 80241384 8E020000 */ lw $v0, ($s0) -/* 910A38 80241388 2403F7FF */ addiu $v1, $zero, -0x801 -/* 910A3C 8024138C 00431024 */ and $v0, $v0, $v1 -/* 910A40 80241390 AE020000 */ sw $v0, ($s0) -/* 910A44 80241394 8E220000 */ lw $v0, ($s1) -/* 910A48 80241398 3C031F00 */ lui $v1, 0x1f00 -/* 910A4C 8024139C 00431025 */ or $v0, $v0, $v1 -/* 910A50 802413A0 AE220000 */ sw $v0, ($s1) -/* 910A54 802413A4 AC800070 */ sw $zero, 0x70($a0) -.L802413A8: -/* 910A58 802413A8 0C0B2026 */ jal set_variable -/* 910A5C 802413AC 00000000 */ nop -/* 910A60 802413B0 080904FA */ j .L802413E8 -/* 910A64 802413B4 24020002 */ addiu $v0, $zero, 2 -.L802413B8: -/* 910A68 802413B8 8E220070 */ lw $v0, 0x70($s1) -/* 910A6C 802413BC 30420001 */ andi $v0, $v0, 1 -/* 910A70 802413C0 10400009 */ beqz $v0, .L802413E8 -/* 910A74 802413C4 0000102D */ daddu $v0, $zero, $zero -/* 910A78 802413C8 C600004C */ lwc1 $f0, 0x4c($s0) -/* 910A7C 802413CC 3C01404E */ lui $at, 0x404e -/* 910A80 802413D0 44811800 */ mtc1 $at, $f3 -/* 910A84 802413D4 44801000 */ mtc1 $zero, $f2 -/* 910A88 802413D8 46000021 */ cvt.d.s $f0, $f0 -/* 910A8C 802413DC 46220000 */ add.d $f0, $f0, $f2 -/* 910A90 802413E0 46200020 */ cvt.s.d $f0, $f0 -/* 910A94 802413E4 E600004C */ swc1 $f0, 0x4c($s0) -.L802413E8: -/* 910A98 802413E8 8FBF0044 */ lw $ra, 0x44($sp) -/* 910A9C 802413EC 8FB40040 */ lw $s4, 0x40($sp) -/* 910AA0 802413F0 8FB3003C */ lw $s3, 0x3c($sp) -/* 910AA4 802413F4 8FB20038 */ lw $s2, 0x38($sp) -/* 910AA8 802413F8 8FB10034 */ lw $s1, 0x34($sp) -/* 910AAC 802413FC 8FB00030 */ lw $s0, 0x30($sp) -/* 910AB0 80241400 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 910AB4 80241404 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 910AB8 80241408 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 910ABC 8024140C 03E00008 */ jr $ra -/* 910AC0 80241410 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/func_80241414_90F6B0.s b/asm/nonmatchings/world/area_iwa/iwa_01/func_80241414_90F6B0.s deleted file mode 100644 index 1a51f392a1..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/func_80241414_90F6B0.s +++ /dev/null @@ -1,124 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241414_910AC4 -/* 910AC4 80241414 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 910AC8 80241418 AFB00018 */ sw $s0, 0x18($sp) -/* 910ACC 8024141C AFBF0024 */ sw $ra, 0x24($sp) -/* 910AD0 80241420 AFB20020 */ sw $s2, 0x20($sp) -/* 910AD4 80241424 AFB1001C */ sw $s1, 0x1c($sp) -/* 910AD8 80241428 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 910ADC 8024142C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 910AE0 80241430 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 910AE4 80241434 8C910148 */ lw $s1, 0x148($a0) -/* 910AE8 80241438 4486A000 */ mtc1 $a2, $f20 -/* 910AEC 8024143C 86240008 */ lh $a0, 8($s1) -/* 910AF0 80241440 4487B000 */ mtc1 $a3, $f22 -/* 910AF4 80241444 0C00EABB */ jal get_npc_unsafe -/* 910AF8 80241448 00A0802D */ daddu $s0, $a1, $zero -/* 910AFC 8024144C 4600A521 */ cvt.d.s $f20, $f20 -/* 910B00 80241450 0200202D */ daddu $a0, $s0, $zero -/* 910B04 80241454 0040902D */ daddu $s2, $v0, $zero -/* 910B08 80241458 3C03800B */ lui $v1, %hi(gCameras) -/* 910B0C 8024145C 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 910B10 80241460 3C018024 */ lui $at, 0x8024 -/* 910B14 80241464 D42063B8 */ ldc1 $f0, 0x63b8($at) -/* 910B18 80241468 3C014387 */ lui $at, 0x4387 -/* 910B1C 8024146C 4481C000 */ mtc1 $at, $f24 -/* 910B20 80241470 4407B000 */ mfc1 $a3, $f22 -/* 910B24 80241474 3C02800A */ lui $v0, 0x800a -/* 910B28 80241478 8442A634 */ lh $v0, -0x59cc($v0) -/* 910B2C 8024147C 0220282D */ daddu $a1, $s1, $zero -/* 910B30 80241480 AFA00010 */ sw $zero, 0x10($sp) -/* 910B34 80241484 4620A502 */ mul.d $f20, $f20, $f0 -/* 910B38 80241488 00000000 */ nop -/* 910B3C 8024148C 00028080 */ sll $s0, $v0, 2 -/* 910B40 80241490 02028021 */ addu $s0, $s0, $v0 -/* 910B44 80241494 00108080 */ sll $s0, $s0, 2 -/* 910B48 80241498 02028023 */ subu $s0, $s0, $v0 -/* 910B4C 8024149C 001010C0 */ sll $v0, $s0, 3 -/* 910B50 802414A0 02028021 */ addu $s0, $s0, $v0 -/* 910B54 802414A4 001080C0 */ sll $s0, $s0, 3 -/* 910B58 802414A8 4620A520 */ cvt.s.d $f20, $f20 -/* 910B5C 802414AC 4406A000 */ mfc1 $a2, $f20 -/* 910B60 802414B0 0C01242D */ jal func_800490B4 -/* 910B64 802414B4 02038021 */ addu $s0, $s0, $v1 -/* 910B68 802414B8 C60C006C */ lwc1 $f12, 0x6c($s0) -/* 910B6C 802414BC C64E000C */ lwc1 $f14, 0xc($s2) -/* 910B70 802414C0 0C00A70A */ jal get_clamped_angle_diff -/* 910B74 802414C4 0002802B */ sltu $s0, $zero, $v0 -/* 910B78 802414C8 0C00A6C9 */ jal clamp_angle -/* 910B7C 802414CC 46000306 */ mov.s $f12, $f0 -/* 910B80 802414D0 3C018024 */ lui $at, 0x8024 -/* 910B84 802414D4 D42263C0 */ ldc1 $f2, 0x63c0($at) -/* 910B88 802414D8 46000021 */ cvt.d.s $f0, $f0 -/* 910B8C 802414DC 4622003C */ c.lt.d $f0, $f2 -/* 910B90 802414E0 00000000 */ nop -/* 910B94 802414E4 45000003 */ bc1f .L802414F4 -/* 910B98 802414E8 00000000 */ nop -/* 910B9C 802414EC 3C0142B4 */ lui $at, 0x42b4 -/* 910BA0 802414F0 4481C000 */ mtc1 $at, $f24 -.L802414F4: -/* 910BA4 802414F4 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* 910BA8 802414F8 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* 910BAC 802414FC C64C0038 */ lwc1 $f12, 0x38($s2) -/* 910BB0 80241500 8E220000 */ lw $v0, ($s1) -/* 910BB4 80241504 C64E0040 */ lwc1 $f14, 0x40($s2) -/* 910BB8 80241508 8C460028 */ lw $a2, 0x28($v0) -/* 910BBC 8024150C 0C00A720 */ jal atan2 -/* 910BC0 80241510 8C470030 */ lw $a3, 0x30($v0) -/* 910BC4 80241514 4600C306 */ mov.s $f12, $f24 -/* 910BC8 80241518 0C00A70A */ jal get_clamped_angle_diff -/* 910BCC 8024151C 46000386 */ mov.s $f14, $f0 -/* 910BD0 80241520 46000005 */ abs.s $f0, $f0 -/* 910BD4 80241524 3C01404E */ lui $at, 0x404e -/* 910BD8 80241528 44811800 */ mtc1 $at, $f3 -/* 910BDC 8024152C 44801000 */ mtc1 $zero, $f2 -/* 910BE0 80241530 46000021 */ cvt.d.s $f0, $f0 -/* 910BE4 80241534 4620103C */ c.lt.d $f2, $f0 -/* 910BE8 80241538 00000000 */ nop -/* 910BEC 8024153C 45030001 */ bc1tl .L80241544 -/* 910BF0 80241540 0000802D */ daddu $s0, $zero, $zero -.L80241544: -/* 910BF4 80241544 C64C0038 */ lwc1 $f12, 0x38($s2) -/* 910BF8 80241548 0C038022 */ jal func_800E0088 -/* 910BFC 8024154C C64E0040 */ lwc1 $f14, 0x40($s2) -/* 910C00 80241550 8E240000 */ lw $a0, ($s1) -/* 910C04 80241554 864300A6 */ lh $v1, 0xa6($s2) -/* 910C08 80241558 848200B2 */ lh $v0, 0xb2($a0) -/* 910C0C 8024155C 00431021 */ addu $v0, $v0, $v1 -/* 910C10 80241560 44821000 */ mtc1 $v0, $f2 -/* 910C14 80241564 00000000 */ nop -/* 910C18 80241568 468010A0 */ cvt.s.w $f2, $f2 -/* 910C1C 8024156C 4602003C */ c.lt.s $f0, $f2 -/* 910C20 80241570 00000000 */ nop -/* 910C24 80241574 45030001 */ bc1tl .L8024157C -/* 910C28 80241578 0000802D */ daddu $s0, $zero, $zero -.L8024157C: -/* 910C2C 8024157C C640003C */ lwc1 $f0, 0x3c($s2) -/* 910C30 80241580 C482002C */ lwc1 $f2, 0x2c($a0) -/* 910C34 80241584 46020001 */ sub.s $f0, $f0, $f2 -/* 910C38 80241588 3C014220 */ lui $at, 0x4220 -/* 910C3C 8024158C 44811000 */ mtc1 $at, $f2 -/* 910C40 80241590 46000005 */ abs.s $f0, $f0 -/* 910C44 80241594 4600103E */ c.le.s $f2, $f0 -/* 910C48 80241598 00000000 */ nop -/* 910C4C 8024159C 45030001 */ bc1tl .L802415A4 -/* 910C50 802415A0 0000802D */ daddu $s0, $zero, $zero -.L802415A4: -/* 910C54 802415A4 3C038011 */ lui $v1, 0x8011 -/* 910C58 802415A8 8063EBB3 */ lb $v1, -0x144d($v1) -/* 910C5C 802415AC 24020009 */ addiu $v0, $zero, 9 -/* 910C60 802415B0 50620001 */ beql $v1, $v0, .L802415B8 -/* 910C64 802415B4 0000802D */ daddu $s0, $zero, $zero -.L802415B8: -/* 910C68 802415B8 0200102D */ daddu $v0, $s0, $zero -/* 910C6C 802415BC 8FBF0024 */ lw $ra, 0x24($sp) -/* 910C70 802415C0 8FB20020 */ lw $s2, 0x20($sp) -/* 910C74 802415C4 8FB1001C */ lw $s1, 0x1c($sp) -/* 910C78 802415C8 8FB00018 */ lw $s0, 0x18($sp) -/* 910C7C 802415CC D7B80038 */ ldc1 $f24, 0x38($sp) -/* 910C80 802415D0 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 910C84 802415D4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 910C88 802415D8 03E00008 */ jr $ra -/* 910C8C 802415DC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/func_80241C78_90F6B0.s b/asm/nonmatchings/world/area_iwa/iwa_01/func_80241C78_90F6B0.s deleted file mode 100644 index 2657d58da8..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/func_80241C78_90F6B0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C78_911328 -/* 911328 80241C78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91132C 80241C7C AFB10014 */ sw $s1, 0x14($sp) -/* 911330 80241C80 0080882D */ daddu $s1, $a0, $zero -/* 911334 80241C84 AFBF0018 */ sw $ra, 0x18($sp) -/* 911338 80241C88 AFB00010 */ sw $s0, 0x10($sp) -/* 91133C 80241C8C 8E220148 */ lw $v0, 0x148($s1) -/* 911340 80241C90 0C00EABB */ jal get_npc_unsafe -/* 911344 80241C94 84440008 */ lh $a0, 8($v0) -/* 911348 80241C98 0040802D */ daddu $s0, $v0, $zero -/* 91134C 80241C9C 9602008E */ lhu $v0, 0x8e($s0) -/* 911350 80241CA0 2442FFFF */ addiu $v0, $v0, -1 -/* 911354 80241CA4 A602008E */ sh $v0, 0x8e($s0) -/* 911358 80241CA8 00021400 */ sll $v0, $v0, 0x10 -/* 91135C 80241CAC 1C40000B */ bgtz $v0, .L80241CDC -/* 911360 80241CB0 0200202D */ daddu $a0, $s0, $zero -/* 911364 80241CB4 24050322 */ addiu $a1, $zero, 0x322 -/* 911368 80241CB8 0C012530 */ jal func_800494C0 -/* 91136C 80241CBC 0000302D */ daddu $a2, $zero, $zero -/* 911370 80241CC0 3C02002F */ lui $v0, 0x2f -/* 911374 80241CC4 34420011 */ ori $v0, $v0, 0x11 -/* 911378 80241CC8 2403000B */ addiu $v1, $zero, 0xb -/* 91137C 80241CCC AE020028 */ sw $v0, 0x28($s0) -/* 911380 80241CD0 24020015 */ addiu $v0, $zero, 0x15 -/* 911384 80241CD4 A603008E */ sh $v1, 0x8e($s0) -/* 911388 80241CD8 AE220070 */ sw $v0, 0x70($s1) -.L80241CDC: -/* 91138C 80241CDC 8FBF0018 */ lw $ra, 0x18($sp) -/* 911390 80241CE0 8FB10014 */ lw $s1, 0x14($sp) -/* 911394 80241CE4 8FB00010 */ lw $s0, 0x10($sp) -/* 911398 80241CE8 03E00008 */ jr $ra -/* 91139C 80241CEC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/func_80241CF0_90F6B0.s b/asm/nonmatchings/world/area_iwa/iwa_01/func_80241CF0_90F6B0.s deleted file mode 100644 index 711cb71b1d..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/func_80241CF0_90F6B0.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CF0_9113A0 -/* 9113A0 80241CF0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9113A4 80241CF4 AFB10014 */ sw $s1, 0x14($sp) -/* 9113A8 80241CF8 0080882D */ daddu $s1, $a0, $zero -/* 9113AC 80241CFC AFBF0018 */ sw $ra, 0x18($sp) -/* 9113B0 80241D00 AFB00010 */ sw $s0, 0x10($sp) -/* 9113B4 80241D04 8E300148 */ lw $s0, 0x148($s1) -/* 9113B8 80241D08 0C00EABB */ jal get_npc_unsafe -/* 9113BC 80241D0C 86040008 */ lh $a0, 8($s0) -/* 9113C0 80241D10 0040202D */ daddu $a0, $v0, $zero -/* 9113C4 80241D14 9482008E */ lhu $v0, 0x8e($a0) -/* 9113C8 80241D18 24030003 */ addiu $v1, $zero, 3 -/* 9113CC 80241D1C 2442FFFF */ addiu $v0, $v0, -1 -/* 9113D0 80241D20 A482008E */ sh $v0, 0x8e($a0) -/* 9113D4 80241D24 00021400 */ sll $v0, $v0, 0x10 -/* 9113D8 80241D28 00021403 */ sra $v0, $v0, 0x10 -/* 9113DC 80241D2C 14430004 */ bne $v0, $v1, .L80241D40 -/* 9113E0 80241D30 3C031F10 */ lui $v1, 0x1f10 -/* 9113E4 80241D34 8E020000 */ lw $v0, ($s0) -/* 9113E8 80241D38 00431025 */ or $v0, $v0, $v1 -/* 9113EC 80241D3C AE020000 */ sw $v0, ($s0) -.L80241D40: -/* 9113F0 80241D40 8482008E */ lh $v0, 0x8e($a0) -/* 9113F4 80241D44 1C400005 */ bgtz $v0, .L80241D5C -/* 9113F8 80241D48 00000000 */ nop -/* 9113FC 80241D4C 8C820000 */ lw $v0, ($a0) -/* 911400 80241D50 34420002 */ ori $v0, $v0, 2 -/* 911404 80241D54 AC820000 */ sw $v0, ($a0) -/* 911408 80241D58 AE200070 */ sw $zero, 0x70($s1) -.L80241D5C: -/* 91140C 80241D5C 8FBF0018 */ lw $ra, 0x18($sp) -/* 911410 80241D60 8FB10014 */ lw $s1, 0x14($sp) -/* 911414 80241D64 8FB00010 */ lw $s0, 0x10($sp) -/* 911418 80241D68 03E00008 */ jr $ra -/* 91141C 80241D6C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/func_80241D70_90F6B0.s b/asm/nonmatchings/world/area_iwa/iwa_01/func_80241D70_90F6B0.s deleted file mode 100644 index c33f3ba486..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/func_80241D70_90F6B0.s +++ /dev/null @@ -1,135 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D70_911420 -/* 911420 80241D70 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 911424 80241D74 AFB40040 */ sw $s4, 0x40($sp) -/* 911428 80241D78 0080A02D */ daddu $s4, $a0, $zero -/* 91142C 80241D7C AFBF0048 */ sw $ra, 0x48($sp) -/* 911430 80241D80 AFB50044 */ sw $s5, 0x44($sp) -/* 911434 80241D84 AFB3003C */ sw $s3, 0x3c($sp) -/* 911438 80241D88 AFB20038 */ sw $s2, 0x38($sp) -/* 91143C 80241D8C AFB10034 */ sw $s1, 0x34($sp) -/* 911440 80241D90 AFB00030 */ sw $s0, 0x30($sp) -/* 911444 80241D94 8E920148 */ lw $s2, 0x148($s4) -/* 911448 80241D98 86440008 */ lh $a0, 8($s2) -/* 91144C 80241D9C 8E90000C */ lw $s0, 0xc($s4) -/* 911450 80241DA0 0C00EABB */ jal get_npc_unsafe -/* 911454 80241DA4 00A0882D */ daddu $s1, $a1, $zero -/* 911458 80241DA8 0280202D */ daddu $a0, $s4, $zero -/* 91145C 80241DAC 8E050000 */ lw $a1, ($s0) -/* 911460 80241DB0 0C0B1EAF */ jal get_variable -/* 911464 80241DB4 0040A82D */ daddu $s5, $v0, $zero -/* 911468 80241DB8 AFA00010 */ sw $zero, 0x10($sp) -/* 91146C 80241DBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 911470 80241DC0 8C630030 */ lw $v1, 0x30($v1) -/* 911474 80241DC4 AFA30014 */ sw $v1, 0x14($sp) -/* 911478 80241DC8 8E4300D0 */ lw $v1, 0xd0($s2) -/* 91147C 80241DCC 8C63001C */ lw $v1, 0x1c($v1) -/* 911480 80241DD0 AFA30018 */ sw $v1, 0x18($sp) -/* 911484 80241DD4 8E4300D0 */ lw $v1, 0xd0($s2) -/* 911488 80241DD8 8C630024 */ lw $v1, 0x24($v1) -/* 91148C 80241DDC AFA3001C */ sw $v1, 0x1c($sp) -/* 911490 80241DE0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 911494 80241DE4 8C630028 */ lw $v1, 0x28($v1) -/* 911498 80241DE8 27B30010 */ addiu $s3, $sp, 0x10 -/* 91149C 80241DEC AFA30020 */ sw $v1, 0x20($sp) -/* 9114A0 80241DF0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9114A4 80241DF4 3C014282 */ lui $at, 0x4282 -/* 9114A8 80241DF8 44810000 */ mtc1 $at, $f0 -/* 9114AC 80241DFC 8C63002C */ lw $v1, 0x2c($v1) -/* 9114B0 80241E00 0040802D */ daddu $s0, $v0, $zero -/* 9114B4 80241E04 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9114B8 80241E08 A7A0002C */ sh $zero, 0x2c($sp) -/* 9114BC 80241E0C 1220000A */ beqz $s1, .L80241E38 -/* 9114C0 80241E10 AFA30024 */ sw $v1, 0x24($sp) -/* 9114C4 80241E14 AE800070 */ sw $zero, 0x70($s4) -/* 9114C8 80241E18 8EA20000 */ lw $v0, ($s5) -/* 9114CC 80241E1C 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9114D0 80241E20 A6A0008E */ sh $zero, 0x8e($s5) -/* 9114D4 80241E24 00431024 */ and $v0, $v0, $v1 -/* 9114D8 80241E28 AEA20000 */ sw $v0, ($s5) -/* 9114DC 80241E2C 8E4200B0 */ lw $v0, 0xb0($s2) -/* 9114E0 80241E30 34420018 */ ori $v0, $v0, 0x18 -/* 9114E4 80241E34 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241E38: -/* 9114E8 80241E38 8E4300B0 */ lw $v1, 0xb0($s2) -/* 9114EC 80241E3C 30620004 */ andi $v0, $v1, 4 -/* 9114F0 80241E40 10400007 */ beqz $v0, .L80241E60 -/* 9114F4 80241E44 00000000 */ nop -/* 9114F8 80241E48 824200B4 */ lb $v0, 0xb4($s2) -/* 9114FC 80241E4C 1440003E */ bnez $v0, .L80241F48 -/* 911500 80241E50 0000102D */ daddu $v0, $zero, $zero -/* 911504 80241E54 2402FFFB */ addiu $v0, $zero, -5 -/* 911508 80241E58 00621024 */ and $v0, $v1, $v0 -/* 91150C 80241E5C AE4200B0 */ sw $v0, 0xb0($s2) -.L80241E60: -/* 911510 80241E60 8E830070 */ lw $v1, 0x70($s4) -/* 911514 80241E64 2C620016 */ sltiu $v0, $v1, 0x16 -/* 911518 80241E68 10400036 */ beqz $v0, .L80241F44 -/* 91151C 80241E6C 00031080 */ sll $v0, $v1, 2 -/* 911520 80241E70 3C018024 */ lui $at, 0x8024 -/* 911524 80241E74 00220821 */ addu $at, $at, $v0 -/* 911528 80241E78 8C2263D8 */ lw $v0, 0x63d8($at) -/* 91152C 80241E7C 00400008 */ jr $v0 -/* 911530 80241E80 00000000 */ nop -/* 911534 80241E84 0280202D */ daddu $a0, $s4, $zero -/* 911538 80241E88 0200282D */ daddu $a1, $s0, $zero -/* 91153C 80241E8C 0C090578 */ jal func_802415E0 -/* 911540 80241E90 0260302D */ daddu $a2, $s3, $zero -/* 911544 80241E94 0280202D */ daddu $a0, $s4, $zero -/* 911548 80241E98 0200282D */ daddu $a1, $s0, $zero -/* 91154C 80241E9C 0C0905BC */ jal func_802416F0 -/* 911550 80241EA0 0260302D */ daddu $a2, $s3, $zero -/* 911554 80241EA4 080907D2 */ j .L80241F48 -/* 911558 80241EA8 0000102D */ daddu $v0, $zero, $zero -/* 91155C 80241EAC 0280202D */ daddu $a0, $s4, $zero -/* 911560 80241EB0 0200282D */ daddu $a1, $s0, $zero -/* 911564 80241EB4 0C09064B */ jal func_8024192C -/* 911568 80241EB8 0260302D */ daddu $a2, $s3, $zero -/* 91156C 80241EBC 0280202D */ daddu $a0, $s4, $zero -/* 911570 80241EC0 0200282D */ daddu $a1, $s0, $zero -/* 911574 80241EC4 0C090670 */ jal func_802419C0 -/* 911578 80241EC8 0260302D */ daddu $a2, $s3, $zero -/* 91157C 80241ECC 8E830070 */ lw $v1, 0x70($s4) -/* 911580 80241ED0 2402000E */ addiu $v0, $zero, 0xe -/* 911584 80241ED4 1462001C */ bne $v1, $v0, .L80241F48 -/* 911588 80241ED8 0000102D */ daddu $v0, $zero, $zero -/* 91158C 80241EDC 0280202D */ daddu $a0, $s4, $zero -/* 911590 80241EE0 0200282D */ daddu $a1, $s0, $zero -/* 911594 80241EE4 0C090693 */ jal func_80241A4C -/* 911598 80241EE8 0260302D */ daddu $a2, $s3, $zero -/* 91159C 80241EEC 8E830070 */ lw $v1, 0x70($s4) -/* 9115A0 80241EF0 2402000F */ addiu $v0, $zero, 0xf -/* 9115A4 80241EF4 14620014 */ bne $v1, $v0, .L80241F48 -/* 9115A8 80241EF8 0000102D */ daddu $v0, $zero, $zero -/* 9115AC 80241EFC 0280202D */ daddu $a0, $s4, $zero -/* 9115B0 80241F00 0200282D */ daddu $a1, $s0, $zero -/* 9115B4 80241F04 0C0906DD */ jal func_80241B74 -/* 9115B8 80241F08 0260302D */ daddu $a2, $s3, $zero -/* 9115BC 80241F0C 8E830070 */ lw $v1, 0x70($s4) -/* 9115C0 80241F10 24020010 */ addiu $v0, $zero, 0x10 -/* 9115C4 80241F14 1462000C */ bne $v1, $v0, .L80241F48 -/* 9115C8 80241F18 0000102D */ daddu $v0, $zero, $zero -/* 9115CC 80241F1C 0280202D */ daddu $a0, $s4, $zero -/* 9115D0 80241F20 0200282D */ daddu $a1, $s0, $zero -/* 9115D4 80241F24 0C09071E */ jal func_80241C78 -/* 9115D8 80241F28 0260302D */ daddu $a2, $s3, $zero -/* 9115DC 80241F2C 080907D2 */ j .L80241F48 -/* 9115E0 80241F30 0000102D */ daddu $v0, $zero, $zero -/* 9115E4 80241F34 0280202D */ daddu $a0, $s4, $zero -/* 9115E8 80241F38 0200282D */ daddu $a1, $s0, $zero -/* 9115EC 80241F3C 0C09073C */ jal func_80241CF0 -/* 9115F0 80241F40 0260302D */ daddu $a2, $s3, $zero -.L80241F44: -/* 9115F4 80241F44 0000102D */ daddu $v0, $zero, $zero -.L80241F48: -/* 9115F8 80241F48 8FBF0048 */ lw $ra, 0x48($sp) -/* 9115FC 80241F4C 8FB50044 */ lw $s5, 0x44($sp) -/* 911600 80241F50 8FB40040 */ lw $s4, 0x40($sp) -/* 911604 80241F54 8FB3003C */ lw $s3, 0x3c($sp) -/* 911608 80241F58 8FB20038 */ lw $s2, 0x38($sp) -/* 91160C 80241F5C 8FB10034 */ lw $s1, 0x34($sp) -/* 911610 80241F60 8FB00030 */ lw $s0, 0x30($sp) -/* 911614 80241F64 03E00008 */ jr $ra -/* 911618 80241F68 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/func_80241F6C_90F6B0.s b/asm/nonmatchings/world/area_iwa/iwa_01/func_80241F6C_90F6B0.s deleted file mode 100644 index 7612e2ee9a..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/func_80241F6C_90F6B0.s +++ /dev/null @@ -1,213 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F6C_91161C -/* 91161C 80241F6C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 911620 80241F70 AFB3003C */ sw $s3, 0x3c($sp) -/* 911624 80241F74 0080982D */ daddu $s3, $a0, $zero -/* 911628 80241F78 AFBF0048 */ sw $ra, 0x48($sp) -/* 91162C 80241F7C AFB50044 */ sw $s5, 0x44($sp) -/* 911630 80241F80 AFB40040 */ sw $s4, 0x40($sp) -/* 911634 80241F84 AFB20038 */ sw $s2, 0x38($sp) -/* 911638 80241F88 AFB10034 */ sw $s1, 0x34($sp) -/* 91163C 80241F8C AFB00030 */ sw $s0, 0x30($sp) -/* 911640 80241F90 8E720148 */ lw $s2, 0x148($s3) -/* 911644 80241F94 86440008 */ lh $a0, 8($s2) -/* 911648 80241F98 8E70000C */ lw $s0, 0xc($s3) -/* 91164C 80241F9C 0C00EABB */ jal get_npc_unsafe -/* 911650 80241FA0 00A0882D */ daddu $s1, $a1, $zero -/* 911654 80241FA4 0260202D */ daddu $a0, $s3, $zero -/* 911658 80241FA8 8E050000 */ lw $a1, ($s0) -/* 91165C 80241FAC 0C0B1EAF */ jal get_variable -/* 911660 80241FB0 0040A02D */ daddu $s4, $v0, $zero -/* 911664 80241FB4 AFA00010 */ sw $zero, 0x10($sp) -/* 911668 80241FB8 8E4300D0 */ lw $v1, 0xd0($s2) -/* 91166C 80241FBC 8C630030 */ lw $v1, 0x30($v1) -/* 911670 80241FC0 AFA30014 */ sw $v1, 0x14($sp) -/* 911674 80241FC4 8E4300D0 */ lw $v1, 0xd0($s2) -/* 911678 80241FC8 8C63001C */ lw $v1, 0x1c($v1) -/* 91167C 80241FCC AFA30018 */ sw $v1, 0x18($sp) -/* 911680 80241FD0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 911684 80241FD4 8C630024 */ lw $v1, 0x24($v1) -/* 911688 80241FD8 AFA3001C */ sw $v1, 0x1c($sp) -/* 91168C 80241FDC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 911690 80241FE0 8C630028 */ lw $v1, 0x28($v1) -/* 911694 80241FE4 27B50010 */ addiu $s5, $sp, 0x10 -/* 911698 80241FE8 AFA30020 */ sw $v1, 0x20($sp) -/* 91169C 80241FEC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9116A0 80241FF0 3C014220 */ lui $at, 0x4220 -/* 9116A4 80241FF4 44810000 */ mtc1 $at, $f0 -/* 9116A8 80241FF8 8C63002C */ lw $v1, 0x2c($v1) -/* 9116AC 80241FFC 0040802D */ daddu $s0, $v0, $zero -/* 9116B0 80242000 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9116B4 80242004 A7A0002C */ sh $zero, 0x2c($sp) -/* 9116B8 80242008 16200005 */ bnez $s1, .L80242020 -/* 9116BC 8024200C AFA30024 */ sw $v1, 0x24($sp) -/* 9116C0 80242010 8E4200B0 */ lw $v0, 0xb0($s2) -/* 9116C4 80242014 30420004 */ andi $v0, $v0, 4 -/* 9116C8 80242018 1040002F */ beqz $v0, .L802420D8 -/* 9116CC 8024201C 00000000 */ nop -.L80242020: -/* 9116D0 80242020 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9116D4 80242024 AE600070 */ sw $zero, 0x70($s3) -/* 9116D8 80242028 A680008E */ sh $zero, 0x8e($s4) -/* 9116DC 8024202C 8E4200CC */ lw $v0, 0xcc($s2) -/* 9116E0 80242030 8E830000 */ lw $v1, ($s4) -/* 9116E4 80242034 8C420000 */ lw $v0, ($v0) -/* 9116E8 80242038 00641824 */ and $v1, $v1, $a0 -/* 9116EC 8024203C AE830000 */ sw $v1, ($s4) -/* 9116F0 80242040 AE820028 */ sw $v0, 0x28($s4) -/* 9116F4 80242044 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9116F8 80242048 8C420034 */ lw $v0, 0x34($v0) -/* 9116FC 8024204C 54400005 */ bnel $v0, $zero, .L80242064 -/* 911700 80242050 2402FDFF */ addiu $v0, $zero, -0x201 -/* 911704 80242054 34620200 */ ori $v0, $v1, 0x200 -/* 911708 80242058 2403FFF7 */ addiu $v1, $zero, -9 -/* 91170C 8024205C 0809081B */ j .L8024206C -/* 911710 80242060 00431024 */ and $v0, $v0, $v1 -.L80242064: -/* 911714 80242064 00621024 */ and $v0, $v1, $v0 -/* 911718 80242068 34420008 */ ori $v0, $v0, 8 -.L8024206C: -/* 91171C 8024206C AE820000 */ sw $v0, ($s4) -/* 911720 80242070 8E4200B0 */ lw $v0, 0xb0($s2) -/* 911724 80242074 30420004 */ andi $v0, $v0, 4 -/* 911728 80242078 10400008 */ beqz $v0, .L8024209C -/* 91172C 8024207C 24020063 */ addiu $v0, $zero, 0x63 -/* 911730 80242080 AE620070 */ sw $v0, 0x70($s3) -/* 911734 80242084 AE600074 */ sw $zero, 0x74($s3) -/* 911738 80242088 8E4200B0 */ lw $v0, 0xb0($s2) -/* 91173C 8024208C 2403FFFB */ addiu $v1, $zero, -5 -/* 911740 80242090 00431024 */ and $v0, $v0, $v1 -/* 911744 80242094 0809082D */ j .L802420B4 -/* 911748 80242098 AE4200B0 */ sw $v0, 0xb0($s2) -.L8024209C: -/* 91174C 8024209C 8E420000 */ lw $v0, ($s2) -/* 911750 802420A0 3C034000 */ lui $v1, 0x4000 -/* 911754 802420A4 00431024 */ and $v0, $v0, $v1 -/* 911758 802420A8 10400002 */ beqz $v0, .L802420B4 -/* 91175C 802420AC 2402000C */ addiu $v0, $zero, 0xc -/* 911760 802420B0 AE620070 */ sw $v0, 0x70($s3) -.L802420B4: -/* 911764 802420B4 3C05BFFF */ lui $a1, 0xbfff -/* 911768 802420B8 34A5FFFF */ ori $a1, $a1, 0xffff -/* 91176C 802420BC 2404FFFB */ addiu $a0, $zero, -5 -/* 911770 802420C0 8E4200B0 */ lw $v0, 0xb0($s2) -/* 911774 802420C4 8E430000 */ lw $v1, ($s2) -/* 911778 802420C8 00441024 */ and $v0, $v0, $a0 -/* 91177C 802420CC 00651824 */ and $v1, $v1, $a1 -/* 911780 802420D0 AE4200B0 */ sw $v0, 0xb0($s2) -/* 911784 802420D4 AE430000 */ sw $v1, ($s2) -.L802420D8: -/* 911788 802420D8 8E630070 */ lw $v1, 0x70($s3) -/* 91178C 802420DC 2C620064 */ sltiu $v0, $v1, 0x64 -/* 911790 802420E0 10400060 */ beqz $v0, .L80242264 -/* 911794 802420E4 00031080 */ sll $v0, $v1, 2 -/* 911798 802420E8 3C018024 */ lui $at, 0x8024 -/* 91179C 802420EC 00220821 */ addu $at, $at, $v0 -/* 9117A0 802420F0 8C226430 */ lw $v0, 0x6430($at) -/* 9117A4 802420F4 00400008 */ jr $v0 -/* 9117A8 802420F8 00000000 */ nop -/* 9117AC 802420FC 0260202D */ daddu $a0, $s3, $zero -/* 9117B0 80242100 0200282D */ daddu $a1, $s0, $zero -/* 9117B4 80242104 0C012568 */ jal func_800495A0 -/* 9117B8 80242108 02A0302D */ daddu $a2, $s5, $zero -/* 9117BC 8024210C 0260202D */ daddu $a0, $s3, $zero -/* 9117C0 80242110 0200282D */ daddu $a1, $s0, $zero -/* 9117C4 80242114 0C0125AE */ jal func_800496B8 -/* 9117C8 80242118 02A0302D */ daddu $a2, $s5, $zero -/* 9117CC 8024211C 08090899 */ j .L80242264 -/* 9117D0 80242120 00000000 */ nop -/* 9117D4 80242124 0260202D */ daddu $a0, $s3, $zero -/* 9117D8 80242128 0200282D */ daddu $a1, $s0, $zero -/* 9117DC 8024212C 0C0126D1 */ jal func_80049B44 -/* 9117E0 80242130 02A0302D */ daddu $a2, $s5, $zero -/* 9117E4 80242134 0260202D */ daddu $a0, $s3, $zero -/* 9117E8 80242138 0200282D */ daddu $a1, $s0, $zero -/* 9117EC 8024213C 0C012701 */ jal func_80049C04 -/* 9117F0 80242140 02A0302D */ daddu $a2, $s5, $zero -/* 9117F4 80242144 08090899 */ j .L80242264 -/* 9117F8 80242148 00000000 */ nop -/* 9117FC 8024214C 0260202D */ daddu $a0, $s3, $zero -/* 911800 80242150 0200282D */ daddu $a1, $s0, $zero -/* 911804 80242154 0C01278F */ jal func_80049E3C -/* 911808 80242158 02A0302D */ daddu $a2, $s5, $zero -/* 91180C 8024215C 0260202D */ daddu $a0, $s3, $zero -/* 911810 80242160 0200282D */ daddu $a1, $s0, $zero -/* 911814 80242164 0C0127B3 */ jal func_80049ECC -/* 911818 80242168 02A0302D */ daddu $a2, $s5, $zero -/* 91181C 8024216C 08090899 */ j .L80242264 -/* 911820 80242170 00000000 */ nop -/* 911824 80242174 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 911828 80242178 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 91182C 8024217C C68C0038 */ lwc1 $f12, 0x38($s4) -/* 911830 80242180 C68E0040 */ lwc1 $f14, 0x40($s4) -/* 911834 80242184 8C460028 */ lw $a2, 0x28($v0) -/* 911838 80242188 0C00A7B5 */ jal dist2D -/* 91183C 8024218C 8C470030 */ lw $a3, 0x30($v0) -/* 911840 80242190 8E42006C */ lw $v0, 0x6c($s2) -/* 911844 80242194 10400008 */ beqz $v0, .L802421B8 -/* 911848 80242198 46000086 */ mov.s $f2, $f0 -/* 91184C 8024219C 44820000 */ mtc1 $v0, $f0 -/* 911850 802421A0 00000000 */ nop -/* 911854 802421A4 46800020 */ cvt.s.w $f0, $f0 -/* 911858 802421A8 4602003C */ c.lt.s $f0, $f2 -/* 91185C 802421AC 00000000 */ nop -/* 911860 802421B0 4500000B */ bc1f .L802421E0 -/* 911864 802421B4 0260202D */ daddu $a0, $s3, $zero -.L802421B8: -/* 911868 802421B8 0260202D */ daddu $a0, $s3, $zero -/* 91186C 802421BC 8E050024 */ lw $a1, 0x24($s0) -/* 911870 802421C0 8E060028 */ lw $a2, 0x28($s0) -/* 911874 802421C4 0C0901C4 */ jal func_80240710 -/* 911878 802421C8 02A0382D */ daddu $a3, $s5, $zero -/* 91187C 802421CC 8E630070 */ lw $v1, 0x70($s3) -/* 911880 802421D0 2402000C */ addiu $v0, $zero, 0xc -/* 911884 802421D4 14620023 */ bne $v1, $v0, .L80242264 -/* 911888 802421D8 00000000 */ nop -/* 91188C 802421DC 0260202D */ daddu $a0, $s3, $zero -.L802421E0: -/* 911890 802421E0 0200282D */ daddu $a1, $s0, $zero -/* 911894 802421E4 0C0127DF */ jal func_80049F7C -/* 911898 802421E8 02A0302D */ daddu $a2, $s5, $zero -/* 91189C 802421EC 0260202D */ daddu $a0, $s3, $zero -/* 9118A0 802421F0 0200282D */ daddu $a1, $s0, $zero -/* 9118A4 802421F4 0C012849 */ jal func_8004A124 -/* 9118A8 802421F8 02A0302D */ daddu $a2, $s5, $zero -/* 9118AC 802421FC 08090899 */ j .L80242264 -/* 9118B0 80242200 00000000 */ nop -/* 9118B4 80242204 0260202D */ daddu $a0, $s3, $zero -/* 9118B8 80242208 0200282D */ daddu $a1, $s0, $zero -/* 9118BC 8024220C 0C0128FA */ jal func_8004A3E8 -/* 9118C0 80242210 02A0302D */ daddu $a2, $s5, $zero -/* 9118C4 80242214 08090899 */ j .L80242264 -/* 9118C8 80242218 00000000 */ nop -/* 9118CC 8024221C 0C090215 */ jal func_80240854 -/* 9118D0 80242220 0260202D */ daddu $a0, $s3, $zero -/* 9118D4 80242224 08090899 */ j .L80242264 -/* 9118D8 80242228 00000000 */ nop -/* 9118DC 8024222C 0C090255 */ jal func_80240954 -/* 9118E0 80242230 0260202D */ daddu $a0, $s3, $zero -/* 9118E4 80242234 08090899 */ j .L80242264 -/* 9118E8 80242238 00000000 */ nop -/* 9118EC 8024223C 0C090266 */ jal func_80240998 -/* 9118F0 80242240 0260202D */ daddu $a0, $s3, $zero -/* 9118F4 80242244 08090899 */ j .L80242264 -/* 9118F8 80242248 00000000 */ nop -/* 9118FC 8024224C 0C09028E */ jal func_80240A38 -/* 911900 80242250 0260202D */ daddu $a0, $s3, $zero -/* 911904 80242254 08090899 */ j .L80242264 -/* 911908 80242258 00000000 */ nop -/* 91190C 8024225C 0C0129CF */ jal func_8004A73C -/* 911910 80242260 0260202D */ daddu $a0, $s3, $zero -.L80242264: -/* 911914 80242264 8FBF0048 */ lw $ra, 0x48($sp) -/* 911918 80242268 8FB50044 */ lw $s5, 0x44($sp) -/* 91191C 8024226C 8FB40040 */ lw $s4, 0x40($sp) -/* 911920 80242270 8FB3003C */ lw $s3, 0x3c($sp) -/* 911924 80242274 8FB20038 */ lw $s2, 0x38($sp) -/* 911928 80242278 8FB10034 */ lw $s1, 0x34($sp) -/* 91192C 8024227C 8FB00030 */ lw $s0, 0x30($sp) -/* 911930 80242280 0000102D */ daddu $v0, $zero, $zero -/* 911934 80242284 03E00008 */ jr $ra -/* 911938 80242288 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/func_8024228C_90F6B0.s b/asm/nonmatchings/world/area_iwa/iwa_01/func_8024228C_90F6B0.s deleted file mode 100644 index 380bfad5c4..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/func_8024228C_90F6B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024228C_91193C -/* 91193C 8024228C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 911940 80242290 3C05FE36 */ lui $a1, 0xfe36 -/* 911944 80242294 AFBF0010 */ sw $ra, 0x10($sp) -/* 911948 80242298 8C820148 */ lw $v0, 0x148($a0) -/* 91194C 8024229C 3C06800B */ lui $a2, 0x800b -/* 911950 802422A0 8CC60F9C */ lw $a2, 0xf9c($a2) -/* 911954 802422A4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 911958 802422A8 00C23026 */ xor $a2, $a2, $v0 -/* 91195C 802422AC 0C0B2026 */ jal set_variable -/* 911960 802422B0 2CC60001 */ sltiu $a2, $a2, 1 -/* 911964 802422B4 8FBF0010 */ lw $ra, 0x10($sp) -/* 911968 802422B8 24020002 */ addiu $v0, $zero, 2 -/* 91196C 802422BC 03E00008 */ jr $ra -/* 911970 802422C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/func_80242424_90F6B0.s b/asm/nonmatchings/world/area_iwa/iwa_01/func_80242424_90F6B0.s deleted file mode 100644 index 12ff39d442..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/func_80242424_90F6B0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242424_911AD4 -/* 911AD4 80242424 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 911AD8 80242428 AFB10014 */ sw $s1, 0x14($sp) -/* 911ADC 8024242C 0080882D */ daddu $s1, $a0, $zero -/* 911AE0 80242430 AFBF001C */ sw $ra, 0x1c($sp) -/* 911AE4 80242434 AFB20018 */ sw $s2, 0x18($sp) -/* 911AE8 80242438 AFB00010 */ sw $s0, 0x10($sp) -/* 911AEC 8024243C 8E320148 */ lw $s2, 0x148($s1) -/* 911AF0 80242440 0C00EABB */ jal get_npc_unsafe -/* 911AF4 80242444 86440008 */ lh $a0, 8($s2) -/* 911AF8 80242448 0040802D */ daddu $s0, $v0, $zero -/* 911AFC 8024244C 0C00EAFF */ jal disable_npc_shadow -/* 911B00 80242450 0200202D */ daddu $a0, $s0, $zero -/* 911B04 80242454 24020016 */ addiu $v0, $zero, 0x16 -/* 911B08 80242458 A60200A8 */ sh $v0, 0xa8($s0) -/* 911B0C 8024245C 24020018 */ addiu $v0, $zero, 0x18 -/* 911B10 80242460 A60200A6 */ sh $v0, 0xa6($s0) -/* 911B14 80242464 AE200074 */ sw $zero, 0x74($s1) -/* 911B18 80242468 A600008E */ sh $zero, 0x8e($s0) -/* 911B1C 8024246C 8E4200CC */ lw $v0, 0xcc($s2) -/* 911B20 80242470 8C420020 */ lw $v0, 0x20($v0) -/* 911B24 80242474 AE020028 */ sw $v0, 0x28($s0) -/* 911B28 80242478 24020001 */ addiu $v0, $zero, 1 -/* 911B2C 8024247C AE220070 */ sw $v0, 0x70($s1) -/* 911B30 80242480 8FBF001C */ lw $ra, 0x1c($sp) -/* 911B34 80242484 8FB20018 */ lw $s2, 0x18($sp) -/* 911B38 80242488 8FB10014 */ lw $s1, 0x14($sp) -/* 911B3C 8024248C 8FB00010 */ lw $s0, 0x10($sp) -/* 911B40 80242490 03E00008 */ jr $ra -/* 911B44 80242494 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/func_80240160_915D70.s b/asm/nonmatchings/world/area_iwa/iwa_02/func_80240160_915D70.s deleted file mode 100644 index 36bae0b64e..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/func_80240160_915D70.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240160_915ED0 -/* 915ED0 80240160 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 915ED4 80240164 AFB10014 */ sw $s1, 0x14($sp) -/* 915ED8 80240168 0080882D */ daddu $s1, $a0, $zero -/* 915EDC 8024016C AFBF001C */ sw $ra, 0x1c($sp) -/* 915EE0 80240170 AFB20018 */ sw $s2, 0x18($sp) -/* 915EE4 80240174 AFB00010 */ sw $s0, 0x10($sp) -/* 915EE8 80240178 8E320148 */ lw $s2, 0x148($s1) -/* 915EEC 8024017C 0C00EABB */ jal get_npc_unsafe -/* 915EF0 80240180 86440008 */ lh $a0, 8($s2) -/* 915EF4 80240184 0040802D */ daddu $s0, $v0, $zero -/* 915EF8 80240188 0C00EAFF */ jal disable_npc_shadow -/* 915EFC 8024018C 0200202D */ daddu $a0, $s0, $zero -/* 915F00 80240190 24020016 */ addiu $v0, $zero, 0x16 -/* 915F04 80240194 A60200A8 */ sh $v0, 0xa8($s0) -/* 915F08 80240198 24020018 */ addiu $v0, $zero, 0x18 -/* 915F0C 8024019C A60200A6 */ sh $v0, 0xa6($s0) -/* 915F10 802401A0 AE200074 */ sw $zero, 0x74($s1) -/* 915F14 802401A4 A600008E */ sh $zero, 0x8e($s0) -/* 915F18 802401A8 8E4200CC */ lw $v0, 0xcc($s2) -/* 915F1C 802401AC 8C420020 */ lw $v0, 0x20($v0) -/* 915F20 802401B0 AE020028 */ sw $v0, 0x28($s0) -/* 915F24 802401B4 24020001 */ addiu $v0, $zero, 1 -/* 915F28 802401B8 AE220070 */ sw $v0, 0x70($s1) -/* 915F2C 802401BC 8FBF001C */ lw $ra, 0x1c($sp) -/* 915F30 802401C0 8FB20018 */ lw $s2, 0x18($sp) -/* 915F34 802401C4 8FB10014 */ lw $s1, 0x14($sp) -/* 915F38 802401C8 8FB00010 */ lw $s0, 0x10($sp) -/* 915F3C 802401CC 03E00008 */ jr $ra -/* 915F40 802401D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/func_802401D4_915D70.s b/asm/nonmatchings/world/area_iwa/iwa_02/func_802401D4_915D70.s deleted file mode 100644 index 39c2d5f94f..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/func_802401D4_915D70.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D4_915F44 -/* 915F44 802401D4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 915F48 802401D8 AFB3003C */ sw $s3, 0x3c($sp) -/* 915F4C 802401DC 0080982D */ daddu $s3, $a0, $zero -/* 915F50 802401E0 AFBF0044 */ sw $ra, 0x44($sp) -/* 915F54 802401E4 AFB40040 */ sw $s4, 0x40($sp) -/* 915F58 802401E8 AFB20038 */ sw $s2, 0x38($sp) -/* 915F5C 802401EC AFB10034 */ sw $s1, 0x34($sp) -/* 915F60 802401F0 AFB00030 */ sw $s0, 0x30($sp) -/* 915F64 802401F4 8E700148 */ lw $s0, 0x148($s3) -/* 915F68 802401F8 00A0902D */ daddu $s2, $a1, $zero -/* 915F6C 802401FC 86040008 */ lh $a0, 8($s0) -/* 915F70 80240200 0C00EABB */ jal get_npc_unsafe -/* 915F74 80240204 00C0A02D */ daddu $s4, $a2, $zero -/* 915F78 80240208 8E630074 */ lw $v1, 0x74($s3) -/* 915F7C 8024020C 1C600032 */ bgtz $v1, .L802402D8 -/* 915F80 80240210 0040882D */ daddu $s1, $v0, $zero -/* 915F84 80240214 8E420014 */ lw $v0, 0x14($s2) -/* 915F88 80240218 AE620074 */ sw $v0, 0x74($s3) -/* 915F8C 8024021C C640000C */ lwc1 $f0, 0xc($s2) -/* 915F90 80240220 3C018024 */ lui $at, 0x8024 -/* 915F94 80240224 D4222D50 */ ldc1 $f2, 0x2d50($at) -/* 915F98 80240228 46000021 */ cvt.d.s $f0, $f0 -/* 915F9C 8024022C 46220002 */ mul.d $f0, $f0, $f2 -/* 915FA0 80240230 00000000 */ nop -/* 915FA4 80240234 0280202D */ daddu $a0, $s4, $zero -/* 915FA8 80240238 AFA00010 */ sw $zero, 0x10($sp) -/* 915FAC 8024023C 8E470010 */ lw $a3, 0x10($s2) -/* 915FB0 80240240 46200020 */ cvt.s.d $f0, $f0 -/* 915FB4 80240244 44060000 */ mfc1 $a2, $f0 -/* 915FB8 80240248 0C01242D */ jal func_800490B4 -/* 915FBC 8024024C 0200282D */ daddu $a1, $s0, $zero -/* 915FC0 80240250 10400021 */ beqz $v0, .L802402D8 -/* 915FC4 80240254 0000202D */ daddu $a0, $zero, $zero -/* 915FC8 80240258 0220282D */ daddu $a1, $s1, $zero -/* 915FCC 8024025C 0000302D */ daddu $a2, $zero, $zero -/* 915FD0 80240260 8E0200CC */ lw $v0, 0xcc($s0) -/* 915FD4 80240264 3C013F80 */ lui $at, 0x3f80 -/* 915FD8 80240268 44810000 */ mtc1 $at, $f0 -/* 915FDC 8024026C 3C014000 */ lui $at, 0x4000 -/* 915FE0 80240270 44811000 */ mtc1 $at, $f2 -/* 915FE4 80240274 8C430024 */ lw $v1, 0x24($v0) -/* 915FE8 80240278 862200A8 */ lh $v0, 0xa8($s1) -/* 915FEC 8024027C 3C01C1A0 */ lui $at, 0xc1a0 -/* 915FF0 80240280 44812000 */ mtc1 $at, $f4 -/* 915FF4 80240284 44823000 */ mtc1 $v0, $f6 -/* 915FF8 80240288 00000000 */ nop -/* 915FFC 8024028C 468031A0 */ cvt.s.w $f6, $f6 -/* 916000 80240290 44073000 */ mfc1 $a3, $f6 -/* 916004 80240294 2402000F */ addiu $v0, $zero, 0xf -/* 916008 80240298 AE230028 */ sw $v1, 0x28($s1) -/* 91600C 8024029C AFA2001C */ sw $v0, 0x1c($sp) -/* 916010 802402A0 27A20028 */ addiu $v0, $sp, 0x28 -/* 916014 802402A4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 916018 802402A8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 91601C 802402AC E7A40018 */ swc1 $f4, 0x18($sp) -/* 916020 802402B0 0C01BFA4 */ jal fx_emote -/* 916024 802402B4 AFA20020 */ sw $v0, 0x20($sp) -/* 916028 802402B8 0220202D */ daddu $a0, $s1, $zero -/* 91602C 802402BC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 916030 802402C0 0C012530 */ jal func_800494C0 -/* 916034 802402C4 3C060020 */ lui $a2, 0x20 -/* 916038 802402C8 2402000C */ addiu $v0, $zero, 0xc -/* 91603C 802402CC A622008E */ sh $v0, 0x8e($s1) -/* 916040 802402D0 24020002 */ addiu $v0, $zero, 2 -/* 916044 802402D4 AE620070 */ sw $v0, 0x70($s3) -.L802402D8: -/* 916048 802402D8 8E620074 */ lw $v0, 0x74($s3) -/* 91604C 802402DC 2442FFFF */ addiu $v0, $v0, -1 -/* 916050 802402E0 AE620074 */ sw $v0, 0x74($s3) -/* 916054 802402E4 8FBF0044 */ lw $ra, 0x44($sp) -/* 916058 802402E8 8FB40040 */ lw $s4, 0x40($sp) -/* 91605C 802402EC 8FB3003C */ lw $s3, 0x3c($sp) -/* 916060 802402F0 8FB20038 */ lw $s2, 0x38($sp) -/* 916064 802402F4 8FB10034 */ lw $s1, 0x34($sp) -/* 916068 802402F8 8FB00030 */ lw $s0, 0x30($sp) -/* 91606C 802402FC 03E00008 */ jr $ra -/* 916070 80240300 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/func_80240304_915D70.s b/asm/nonmatchings/world/area_iwa/iwa_02/func_80240304_915D70.s deleted file mode 100644 index 8a9ffd2448..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/func_80240304_915D70.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240304_916074 -/* 916074 80240304 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 916078 80240308 AFB20018 */ sw $s2, 0x18($sp) -/* 91607C 8024030C 0080902D */ daddu $s2, $a0, $zero -/* 916080 80240310 AFBF001C */ sw $ra, 0x1c($sp) -/* 916084 80240314 AFB10014 */ sw $s1, 0x14($sp) -/* 916088 80240318 AFB00010 */ sw $s0, 0x10($sp) -/* 91608C 8024031C 8E510148 */ lw $s1, 0x148($s2) -/* 916090 80240320 0C00EABB */ jal get_npc_unsafe -/* 916094 80240324 86240008 */ lh $a0, 8($s1) -/* 916098 80240328 0040802D */ daddu $s0, $v0, $zero -/* 91609C 8024032C 9602008E */ lhu $v0, 0x8e($s0) -/* 9160A0 80240330 2442FFFF */ addiu $v0, $v0, -1 -/* 9160A4 80240334 A602008E */ sh $v0, 0x8e($s0) -/* 9160A8 80240338 00021400 */ sll $v0, $v0, 0x10 -/* 9160AC 8024033C 1C400012 */ bgtz $v0, .L80240388 -/* 9160B0 80240340 00000000 */ nop -/* 9160B4 80240344 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9160B8 80240348 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9160BC 8024034C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9160C0 80240350 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9160C4 80240354 8C460028 */ lw $a2, 0x28($v0) -/* 9160C8 80240358 0C00A720 */ jal atan2 -/* 9160CC 8024035C 8C470030 */ lw $a3, 0x30($v0) -/* 9160D0 80240360 0200202D */ daddu $a0, $s0, $zero -/* 9160D4 80240364 0C00EAE8 */ jal enable_npc_shadow -/* 9160D8 80240368 E600000C */ swc1 $f0, 0xc($s0) -/* 9160DC 8024036C 8E2200CC */ lw $v0, 0xcc($s1) -/* 9160E0 80240370 8C430028 */ lw $v1, 0x28($v0) -/* 9160E4 80240374 24020008 */ addiu $v0, $zero, 8 -/* 9160E8 80240378 A602008E */ sh $v0, 0x8e($s0) -/* 9160EC 8024037C 24020003 */ addiu $v0, $zero, 3 -/* 9160F0 80240380 AE030028 */ sw $v1, 0x28($s0) -/* 9160F4 80240384 AE420070 */ sw $v0, 0x70($s2) -.L80240388: -/* 9160F8 80240388 8FBF001C */ lw $ra, 0x1c($sp) -/* 9160FC 8024038C 8FB20018 */ lw $s2, 0x18($sp) -/* 916100 80240390 8FB10014 */ lw $s1, 0x14($sp) -/* 916104 80240394 8FB00010 */ lw $s0, 0x10($sp) -/* 916108 80240398 03E00008 */ jr $ra -/* 91610C 8024039C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/func_802403A0_915D70.s b/asm/nonmatchings/world/area_iwa/iwa_02/func_802403A0_915D70.s deleted file mode 100644 index 44ff5f8e13..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/func_802403A0_915D70.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403A0_916110 -/* 916110 802403A0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 916114 802403A4 AFB10014 */ sw $s1, 0x14($sp) -/* 916118 802403A8 0080882D */ daddu $s1, $a0, $zero -/* 91611C 802403AC AFBF0018 */ sw $ra, 0x18($sp) -/* 916120 802403B0 AFB00010 */ sw $s0, 0x10($sp) -/* 916124 802403B4 8E220148 */ lw $v0, 0x148($s1) -/* 916128 802403B8 0C00EABB */ jal get_npc_unsafe -/* 91612C 802403BC 84440008 */ lh $a0, 8($v0) -/* 916130 802403C0 0040802D */ daddu $s0, $v0, $zero -/* 916134 802403C4 9602008E */ lhu $v0, 0x8e($s0) -/* 916138 802403C8 2442FFFF */ addiu $v0, $v0, -1 -/* 91613C 802403CC A602008E */ sh $v0, 0x8e($s0) -/* 916140 802403D0 00021400 */ sll $v0, $v0, 0x10 -/* 916144 802403D4 1C40000F */ bgtz $v0, .L80240414 -/* 916148 802403D8 00000000 */ nop -/* 91614C 802403DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 916150 802403E0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 916154 802403E4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 916158 802403E8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91615C 802403EC 8C460028 */ lw $a2, 0x28($v0) -/* 916160 802403F0 0C00A720 */ jal atan2 -/* 916164 802403F4 8C470030 */ lw $a3, 0x30($v0) -/* 916168 802403F8 2402001A */ addiu $v0, $zero, 0x1a -/* 91616C 802403FC A60200A8 */ sh $v0, 0xa8($s0) -/* 916170 80240400 24020018 */ addiu $v0, $zero, 0x18 -/* 916174 80240404 A60200A6 */ sh $v0, 0xa6($s0) -/* 916178 80240408 24020004 */ addiu $v0, $zero, 4 -/* 91617C 8024040C E600000C */ swc1 $f0, 0xc($s0) -/* 916180 80240410 AE220070 */ sw $v0, 0x70($s1) -.L80240414: -/* 916184 80240414 8FBF0018 */ lw $ra, 0x18($sp) -/* 916188 80240418 8FB10014 */ lw $s1, 0x14($sp) -/* 91618C 8024041C 8FB00010 */ lw $s0, 0x10($sp) -/* 916190 80240420 03E00008 */ jr $ra -/* 916194 80240424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/func_80240428_915D70.s b/asm/nonmatchings/world/area_iwa/iwa_02/func_80240428_915D70.s deleted file mode 100644 index af86815b50..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/func_80240428_915D70.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240428_916198 -/* 916198 80240428 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91619C 8024042C AFB10014 */ sw $s1, 0x14($sp) -/* 9161A0 80240430 0080882D */ daddu $s1, $a0, $zero -/* 9161A4 80240434 AFBF001C */ sw $ra, 0x1c($sp) -/* 9161A8 80240438 AFB20018 */ sw $s2, 0x18($sp) -/* 9161AC 8024043C AFB00010 */ sw $s0, 0x10($sp) -/* 9161B0 80240440 8E320148 */ lw $s2, 0x148($s1) -/* 9161B4 80240444 0C00EABB */ jal get_npc_unsafe -/* 9161B8 80240448 86440008 */ lh $a0, 8($s2) -/* 9161BC 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9161C0 80240450 0C00A67F */ jal rand_int -/* 9161C4 80240454 0040802D */ daddu $s0, $v0, $zero -/* 9161C8 80240458 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9161CC 8024045C 44820000 */ mtc1 $v0, $f0 -/* 9161D0 80240460 00000000 */ nop -/* 9161D4 80240464 46800020 */ cvt.s.w $f0, $f0 -/* 9161D8 80240468 46006300 */ add.s $f12, $f12, $f0 -/* 9161DC 8024046C 3C0142B4 */ lui $at, 0x42b4 -/* 9161E0 80240470 44810000 */ mtc1 $at, $f0 -/* 9161E4 80240474 0C00A6C9 */ jal clamp_angle -/* 9161E8 80240478 46006301 */ sub.s $f12, $f12, $f0 -/* 9161EC 8024047C E600000C */ swc1 $f0, 0xc($s0) -/* 9161F0 80240480 8E4200CC */ lw $v0, 0xcc($s2) -/* 9161F4 80240484 8C420000 */ lw $v0, ($v0) -/* 9161F8 80240488 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9161FC 8024048C 0C00A67F */ jal rand_int -/* 916200 80240490 AE020028 */ sw $v0, 0x28($s0) -/* 916204 80240494 00021FC2 */ srl $v1, $v0, 0x1f -/* 916208 80240498 00431821 */ addu $v1, $v0, $v1 -/* 91620C 8024049C 00031843 */ sra $v1, $v1, 1 -/* 916210 802404A0 00031840 */ sll $v1, $v1, 1 -/* 916214 802404A4 00431023 */ subu $v0, $v0, $v1 -/* 916218 802404A8 24420002 */ addiu $v0, $v0, 2 -/* 91621C 802404AC AE220074 */ sw $v0, 0x74($s1) -/* 916220 802404B0 24020005 */ addiu $v0, $zero, 5 -/* 916224 802404B4 AE220070 */ sw $v0, 0x70($s1) -/* 916228 802404B8 8FBF001C */ lw $ra, 0x1c($sp) -/* 91622C 802404BC 8FB20018 */ lw $s2, 0x18($sp) -/* 916230 802404C0 8FB10014 */ lw $s1, 0x14($sp) -/* 916234 802404C4 8FB00010 */ lw $s0, 0x10($sp) -/* 916238 802404C8 03E00008 */ jr $ra -/* 91623C 802404CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/func_80240984_915D70.s b/asm/nonmatchings/world/area_iwa/iwa_02/func_80240984_915D70.s deleted file mode 100644 index 05037d5e46..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/func_80240984_915D70.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240984_9166F4 -/* 9166F4 80240984 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9166F8 80240988 AFB20018 */ sw $s2, 0x18($sp) -/* 9166FC 8024098C 0080902D */ daddu $s2, $a0, $zero -/* 916700 80240990 AFBF001C */ sw $ra, 0x1c($sp) -/* 916704 80240994 AFB10014 */ sw $s1, 0x14($sp) -/* 916708 80240998 AFB00010 */ sw $s0, 0x10($sp) -/* 91670C 8024099C 8E500148 */ lw $s0, 0x148($s2) -/* 916710 802409A0 86040008 */ lh $a0, 8($s0) -/* 916714 802409A4 0C00EABB */ jal get_npc_unsafe -/* 916718 802409A8 00A0882D */ daddu $s1, $a1, $zero -/* 91671C 802409AC 0040182D */ daddu $v1, $v0, $zero -/* 916720 802409B0 9462008E */ lhu $v0, 0x8e($v1) -/* 916724 802409B4 2442FFFF */ addiu $v0, $v0, -1 -/* 916728 802409B8 A462008E */ sh $v0, 0x8e($v1) -/* 91672C 802409BC 00021400 */ sll $v0, $v0, 0x10 -/* 916730 802409C0 1C400015 */ bgtz $v0, .L80240A18 -/* 916734 802409C4 00000000 */ nop -/* 916738 802409C8 8E0200CC */ lw $v0, 0xcc($s0) -/* 91673C 802409CC 8C420004 */ lw $v0, 4($v0) -/* 916740 802409D0 AC620028 */ sw $v0, 0x28($v1) -/* 916744 802409D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* 916748 802409D8 8C420014 */ lw $v0, 0x14($v0) -/* 91674C 802409DC 04410004 */ bgez $v0, .L802409F0 -/* 916750 802409E0 00000000 */ nop -/* 916754 802409E4 C6200000 */ lwc1 $f0, ($s1) -/* 916758 802409E8 08090284 */ j .L80240A10 -/* 91675C 802409EC E4600018 */ swc1 $f0, 0x18($v1) -.L802409F0: -/* 916760 802409F0 3C018024 */ lui $at, 0x8024 -/* 916764 802409F4 D4222D60 */ ldc1 $f2, 0x2d60($at) -/* 916768 802409F8 44820000 */ mtc1 $v0, $f0 -/* 91676C 802409FC 00000000 */ nop -/* 916770 80240A00 46800021 */ cvt.d.w $f0, $f0 -/* 916774 80240A04 46220003 */ div.d $f0, $f0, $f2 -/* 916778 80240A08 46200020 */ cvt.s.d $f0, $f0 -/* 91677C 80240A0C E4600018 */ swc1 $f0, 0x18($v1) -.L80240A10: -/* 916780 80240A10 24020029 */ addiu $v0, $zero, 0x29 -/* 916784 80240A14 AE420070 */ sw $v0, 0x70($s2) -.L80240A18: -/* 916788 80240A18 8FBF001C */ lw $ra, 0x1c($sp) -/* 91678C 80240A1C 8FB20018 */ lw $s2, 0x18($sp) -/* 916790 80240A20 8FB10014 */ lw $s1, 0x14($sp) -/* 916794 80240A24 8FB00010 */ lw $s0, 0x10($sp) -/* 916798 80240A28 03E00008 */ jr $ra -/* 91679C 80240A2C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/func_80240A30_915D70.s b/asm/nonmatchings/world/area_iwa/iwa_02/func_80240A30_915D70.s deleted file mode 100644 index 589e6d3656..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/func_80240A30_915D70.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A30_9167A0 -/* 9167A0 80240A30 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9167A4 80240A34 AFB30024 */ sw $s3, 0x24($sp) -/* 9167A8 80240A38 0080982D */ daddu $s3, $a0, $zero -/* 9167AC 80240A3C AFBF0028 */ sw $ra, 0x28($sp) -/* 9167B0 80240A40 AFB20020 */ sw $s2, 0x20($sp) -/* 9167B4 80240A44 AFB1001C */ sw $s1, 0x1c($sp) -/* 9167B8 80240A48 AFB00018 */ sw $s0, 0x18($sp) -/* 9167BC 80240A4C 8E720148 */ lw $s2, 0x148($s3) -/* 9167C0 80240A50 00A0882D */ daddu $s1, $a1, $zero -/* 9167C4 80240A54 86440008 */ lh $a0, 8($s2) -/* 9167C8 80240A58 0C00EABB */ jal get_npc_unsafe -/* 9167CC 80240A5C 00C0802D */ daddu $s0, $a2, $zero -/* 9167D0 80240A60 0200202D */ daddu $a0, $s0, $zero -/* 9167D4 80240A64 0240282D */ daddu $a1, $s2, $zero -/* 9167D8 80240A68 AFA00010 */ sw $zero, 0x10($sp) -/* 9167DC 80240A6C 8E260024 */ lw $a2, 0x24($s1) -/* 9167E0 80240A70 8E270028 */ lw $a3, 0x28($s1) -/* 9167E4 80240A74 0C01242D */ jal func_800490B4 -/* 9167E8 80240A78 0040802D */ daddu $s0, $v0, $zero -/* 9167EC 80240A7C 1040000C */ beqz $v0, .L80240AB0 -/* 9167F0 80240A80 00000000 */ nop -/* 9167F4 80240A84 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9167F8 80240A88 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9167FC 80240A8C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 916800 80240A90 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 916804 80240A94 8C460028 */ lw $a2, 0x28($v0) -/* 916808 80240A98 0C00A720 */ jal atan2 -/* 91680C 80240A9C 8C470030 */ lw $a3, 0x30($v0) -/* 916810 80240AA0 2402000C */ addiu $v0, $zero, 0xc -/* 916814 80240AA4 E600000C */ swc1 $f0, 0xc($s0) -/* 916818 80240AA8 080902D3 */ j .L80240B4C -/* 91681C 80240AAC AE620070 */ sw $v0, 0x70($s3) -.L80240AB0: -/* 916820 80240AB0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 916824 80240AB4 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916828 80240AB8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91682C 80240ABC C4440000 */ lwc1 $f4, ($v0) -/* 916830 80240AC0 46802120 */ cvt.s.w $f4, $f4 -/* 916834 80240AC4 44062000 */ mfc1 $a2, $f4 -/* 916838 80240AC8 C4440008 */ lwc1 $f4, 8($v0) -/* 91683C 80240ACC 46802120 */ cvt.s.w $f4, $f4 -/* 916840 80240AD0 44072000 */ mfc1 $a3, $f4 -/* 916844 80240AD4 0C00A7B5 */ jal dist2D -/* 916848 80240AD8 00000000 */ nop -/* 91684C 80240ADC C6020018 */ lwc1 $f2, 0x18($s0) -/* 916850 80240AE0 4602003E */ c.le.s $f0, $f2 -/* 916854 80240AE4 00000000 */ nop -/* 916858 80240AE8 45000005 */ bc1f .L80240B00 -/* 91685C 80240AEC 2402000A */ addiu $v0, $zero, 0xa -/* 916860 80240AF0 A602008E */ sh $v0, 0x8e($s0) -/* 916864 80240AF4 24020032 */ addiu $v0, $zero, 0x32 -/* 916868 80240AF8 080902D3 */ j .L80240B4C -/* 91686C 80240AFC AE620070 */ sw $v0, 0x70($s3) -.L80240B00: -/* 916870 80240B00 8602008C */ lh $v0, 0x8c($s0) -/* 916874 80240B04 14400011 */ bnez $v0, .L80240B4C -/* 916878 80240B08 00000000 */ nop -/* 91687C 80240B0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 916880 80240B10 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916884 80240B14 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 916888 80240B18 C4440000 */ lwc1 $f4, ($v0) -/* 91688C 80240B1C 46802120 */ cvt.s.w $f4, $f4 -/* 916890 80240B20 44062000 */ mfc1 $a2, $f4 -/* 916894 80240B24 C4440008 */ lwc1 $f4, 8($v0) -/* 916898 80240B28 46802120 */ cvt.s.w $f4, $f4 -/* 91689C 80240B2C 44072000 */ mfc1 $a3, $f4 -/* 9168A0 80240B30 0C00A720 */ jal atan2 -/* 9168A4 80240B34 00000000 */ nop -/* 9168A8 80240B38 8E050018 */ lw $a1, 0x18($s0) -/* 9168AC 80240B3C 44060000 */ mfc1 $a2, $f0 -/* 9168B0 80240B40 0200202D */ daddu $a0, $s0, $zero -/* 9168B4 80240B44 0C00EA95 */ jal npc_move_heading -/* 9168B8 80240B48 AC86000C */ sw $a2, 0xc($a0) -.L80240B4C: -/* 9168BC 80240B4C 8FBF0028 */ lw $ra, 0x28($sp) -/* 9168C0 80240B50 8FB30024 */ lw $s3, 0x24($sp) -/* 9168C4 80240B54 8FB20020 */ lw $s2, 0x20($sp) -/* 9168C8 80240B58 8FB1001C */ lw $s1, 0x1c($sp) -/* 9168CC 80240B5C 8FB00018 */ lw $s0, 0x18($sp) -/* 9168D0 80240B60 03E00008 */ jr $ra -/* 9168D4 80240B64 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/func_80240B68_915D70.s b/asm/nonmatchings/world/area_iwa/iwa_02/func_80240B68_915D70.s deleted file mode 100644 index 6374ddb5c5..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/func_80240B68_915D70.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B68_9168D8 -/* 9168D8 80240B68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9168DC 80240B6C AFB10014 */ sw $s1, 0x14($sp) -/* 9168E0 80240B70 0080882D */ daddu $s1, $a0, $zero -/* 9168E4 80240B74 AFBF0018 */ sw $ra, 0x18($sp) -/* 9168E8 80240B78 AFB00010 */ sw $s0, 0x10($sp) -/* 9168EC 80240B7C 8E300148 */ lw $s0, 0x148($s1) -/* 9168F0 80240B80 0C00EABB */ jal get_npc_unsafe -/* 9168F4 80240B84 86040008 */ lh $a0, 8($s0) -/* 9168F8 80240B88 0040202D */ daddu $a0, $v0, $zero -/* 9168FC 80240B8C 8482008E */ lh $v0, 0x8e($a0) -/* 916900 80240B90 9483008E */ lhu $v1, 0x8e($a0) -/* 916904 80240B94 18400002 */ blez $v0, .L80240BA0 -/* 916908 80240B98 2462FFFF */ addiu $v0, $v1, -1 -/* 91690C 80240B9C A482008E */ sh $v0, 0x8e($a0) -.L80240BA0: -/* 916910 80240BA0 8482008C */ lh $v0, 0x8c($a0) -/* 916914 80240BA4 1440000A */ bnez $v0, .L80240BD0 -/* 916918 80240BA8 00000000 */ nop -/* 91691C 80240BAC 8482008E */ lh $v0, 0x8e($a0) -/* 916920 80240BB0 1C400007 */ bgtz $v0, .L80240BD0 -/* 916924 80240BB4 24020008 */ addiu $v0, $zero, 8 -/* 916928 80240BB8 A482008E */ sh $v0, 0x8e($a0) -/* 91692C 80240BBC 8E0200CC */ lw $v0, 0xcc($s0) -/* 916930 80240BC0 8C42002C */ lw $v0, 0x2c($v0) -/* 916934 80240BC4 AC820028 */ sw $v0, 0x28($a0) -/* 916938 80240BC8 24020033 */ addiu $v0, $zero, 0x33 -/* 91693C 80240BCC AE220070 */ sw $v0, 0x70($s1) -.L80240BD0: -/* 916940 80240BD0 8FBF0018 */ lw $ra, 0x18($sp) -/* 916944 80240BD4 8FB10014 */ lw $s1, 0x14($sp) -/* 916948 80240BD8 8FB00010 */ lw $s0, 0x10($sp) -/* 91694C 80240BDC 03E00008 */ jr $ra -/* 916950 80240BE0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/func_802400B4_918BB0.s b/asm/nonmatchings/world/area_iwa/iwa_03/func_802400B4_918BB0.s deleted file mode 100644 index 77bf9c3f90..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/func_802400B4_918BB0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_918C64 -/* 918C64 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 918C68 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* 918C6C 802400BC 0080802D */ daddu $s0, $a0, $zero -/* 918C70 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 918C74 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* 918C78 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* 918C7C 802400CC 8C510000 */ lw $s1, ($v0) -/* 918C80 802400D0 0C0B1EAF */ jal get_variable -/* 918C84 802400D4 0220282D */ daddu $a1, $s1, $zero -/* 918C88 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* 918C8C 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* 918C90 802400E0 0200202D */ daddu $a0, $s0, $zero -/* 918C94 802400E4 00431024 */ and $v0, $v0, $v1 -/* 918C98 802400E8 00021140 */ sll $v0, $v0, 5 -/* 918C9C 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* 918CA0 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* 918CA4 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 918CA8 802400F8 0C0B2026 */ jal set_variable -/* 918CAC 802400FC 0220282D */ daddu $a1, $s1, $zero -/* 918CB0 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* 918CB4 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* 918CB8 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* 918CBC 8024010C 24020002 */ addiu $v0, $zero, 2 -/* 918CC0 80240110 03E00008 */ jr $ra -/* 918CC4 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/func_80240118_918BB0.s b/asm/nonmatchings/world/area_iwa/iwa_03/func_80240118_918BB0.s deleted file mode 100644 index 24597a62b0..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/func_80240118_918BB0.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_iwa/iwa_03/func_80240268_918BB0.s b/asm/nonmatchings/world/area_iwa/iwa_03/func_80240268_918BB0.s deleted file mode 100644 index 53b15ea335..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/func_80240268_918BB0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_918E18 -/* 918E18 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 918E1C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* 918E20 80240270 0080802D */ daddu $s0, $a0, $zero -/* 918E24 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* 918E28 80240278 8E02000C */ lw $v0, 0xc($s0) -/* 918E2C 8024027C 0C0B1EAF */ jal get_variable -/* 918E30 80240280 8C450000 */ lw $a1, ($v0) -/* 918E34 80240284 00021140 */ sll $v0, $v0, 5 -/* 918E38 80240288 AE000084 */ sw $zero, 0x84($s0) -/* 918E3C 8024028C 3C018008 */ lui $at, 0x8008 -/* 918E40 80240290 00220821 */ addu $at, $at, $v0 -/* 918E44 80240294 942278F8 */ lhu $v0, 0x78f8($at) -/* 918E48 80240298 30420040 */ andi $v0, $v0, 0x40 -/* 918E4C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* 918E50 802402A0 24020001 */ addiu $v0, $zero, 1 -/* 918E54 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* 918E58 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* 918E5C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* 918E60 802402B0 24020002 */ addiu $v0, $zero, 2 -/* 918E64 802402B4 03E00008 */ jr $ra -/* 918E68 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/func_802402BC_918BB0.s b/asm/nonmatchings/world/area_iwa/iwa_03/func_802402BC_918BB0.s deleted file mode 100644 index 0cc6c4b83c..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/func_802402BC_918BB0.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402BC_918E6C -/* 918E6C 802402BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 918E70 802402C0 3C028011 */ lui $v0, 0x8011 -/* 918E74 802402C4 8442EFE0 */ lh $v0, -0x1020($v0) -/* 918E78 802402C8 3C014069 */ lui $at, 0x4069 -/* 918E7C 802402CC 44810800 */ mtc1 $at, $f1 -/* 918E80 802402D0 44800000 */ mtc1 $zero, $f0 -/* 918E84 802402D4 2406FFFF */ addiu $a2, $zero, -1 -/* 918E88 802402D8 44821000 */ mtc1 $v0, $f2 -/* 918E8C 802402DC 00000000 */ nop -/* 918E90 802402E0 468010A1 */ cvt.d.w $f2, $f2 -/* 918E94 802402E4 4622003C */ c.lt.d $f0, $f2 -/* 918E98 802402E8 00000000 */ nop -/* 918E9C 802402EC 45000002 */ bc1f .L802402F8 -/* 918EA0 802402F0 AFBF0010 */ sw $ra, 0x10($sp) -/* 918EA4 802402F4 0000302D */ daddu $a2, $zero, $zero -.L802402F8: -/* 918EA8 802402F8 3C014044 */ lui $at, 0x4044 -/* 918EAC 802402FC 44810800 */ mtc1 $at, $f1 -/* 918EB0 80240300 44800000 */ mtc1 $zero, $f0 -/* 918EB4 80240304 00000000 */ nop -/* 918EB8 80240308 4620103C */ c.lt.d $f2, $f0 -/* 918EBC 8024030C 00000000 */ nop -/* 918EC0 80240310 45030001 */ bc1tl .L80240318 -/* 918EC4 80240314 24060001 */ addiu $a2, $zero, 1 -.L80240318: -/* 918EC8 80240318 04C00004 */ bltz $a2, .L8024032C -/* 918ECC 8024031C 00000000 */ nop -/* 918ED0 80240320 3C05FD05 */ lui $a1, 0xfd05 -/* 918ED4 80240324 0C0B2026 */ jal set_variable -/* 918ED8 80240328 34A50F89 */ ori $a1, $a1, 0xf89 -.L8024032C: -/* 918EDC 8024032C 8FBF0010 */ lw $ra, 0x10($sp) -/* 918EE0 80240330 0000102D */ daddu $v0, $zero, $zero -/* 918EE4 80240334 03E00008 */ jr $ra -/* 918EE8 80240338 27BD0018 */ addiu $sp, $sp, 0x18 -/* 918EEC 8024033C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/func_80240340_918BB0.s b/asm/nonmatchings/world/area_iwa/iwa_03/func_80240340_918BB0.s deleted file mode 100644 index 3790724b68..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/func_80240340_918BB0.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240340_918EF0 -/* 918EF0 80240340 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 918EF4 80240344 AFBF001C */ sw $ra, 0x1c($sp) -/* 918EF8 80240348 AFB20018 */ sw $s2, 0x18($sp) -/* 918EFC 8024034C AFB10014 */ sw $s1, 0x14($sp) -/* 918F00 80240350 AFB00010 */ sw $s0, 0x10($sp) -/* 918F04 80240354 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 918F08 80240358 8C900148 */ lw $s0, 0x148($a0) -/* 918F0C 8024035C 86040008 */ lh $a0, 8($s0) -/* 918F10 80240360 3C014387 */ lui $at, 0x4387 -/* 918F14 80240364 4481A000 */ mtc1 $at, $f20 -/* 918F18 80240368 0C00EABB */ jal get_npc_unsafe -/* 918F1C 8024036C 00A0882D */ daddu $s1, $a1, $zero -/* 918F20 80240370 0200202D */ daddu $a0, $s0, $zero -/* 918F24 80240374 8E26000C */ lw $a2, 0xc($s1) -/* 918F28 80240378 8E270010 */ lw $a3, 0x10($s1) -/* 918F2C 8024037C 0040882D */ daddu $s1, $v0, $zero -/* 918F30 80240380 3C03800B */ lui $v1, %hi(gCameras) -/* 918F34 80240384 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 918F38 80240388 3C02800A */ lui $v0, 0x800a -/* 918F3C 8024038C 8442A634 */ lh $v0, -0x59cc($v0) -/* 918F40 80240390 0000282D */ daddu $a1, $zero, $zero -/* 918F44 80240394 00028080 */ sll $s0, $v0, 2 -/* 918F48 80240398 02028021 */ addu $s0, $s0, $v0 -/* 918F4C 8024039C 00108080 */ sll $s0, $s0, 2 -/* 918F50 802403A0 02028023 */ subu $s0, $s0, $v0 -/* 918F54 802403A4 001010C0 */ sll $v0, $s0, 3 -/* 918F58 802403A8 02028021 */ addu $s0, $s0, $v0 -/* 918F5C 802403AC 001080C0 */ sll $s0, $s0, 3 -/* 918F60 802403B0 0C0124FB */ jal func_800493EC -/* 918F64 802403B4 02038021 */ addu $s0, $s0, $v1 -/* 918F68 802403B8 C60C006C */ lwc1 $f12, 0x6c($s0) -/* 918F6C 802403BC C62E000C */ lwc1 $f14, 0xc($s1) -/* 918F70 802403C0 0C00A70A */ jal get_clamped_angle_diff -/* 918F74 802403C4 0002802B */ sltu $s0, $zero, $v0 -/* 918F78 802403C8 0C00A6C9 */ jal clamp_angle -/* 918F7C 802403CC 46000306 */ mov.s $f12, $f0 -/* 918F80 802403D0 3C018024 */ lui $at, 0x8024 -/* 918F84 802403D4 D4222C30 */ ldc1 $f2, 0x2c30($at) -/* 918F88 802403D8 46000021 */ cvt.d.s $f0, $f0 -/* 918F8C 802403DC 4622003C */ c.lt.d $f0, $f2 -/* 918F90 802403E0 00000000 */ nop -/* 918F94 802403E4 45000003 */ bc1f .L802403F4 -/* 918F98 802403E8 00000000 */ nop -/* 918F9C 802403EC 3C0142B4 */ lui $at, 0x42b4 -/* 918FA0 802403F0 4481A000 */ mtc1 $at, $f20 -.L802403F4: -/* 918FA4 802403F4 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 918FA8 802403F8 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 918FAC 802403FC C62C0038 */ lwc1 $f12, 0x38($s1) -/* 918FB0 80240400 8E420000 */ lw $v0, ($s2) -/* 918FB4 80240404 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 918FB8 80240408 8C460028 */ lw $a2, 0x28($v0) -/* 918FBC 8024040C 0C00A720 */ jal atan2 -/* 918FC0 80240410 8C470030 */ lw $a3, 0x30($v0) -/* 918FC4 80240414 4600A306 */ mov.s $f12, $f20 -/* 918FC8 80240418 0C00A70A */ jal get_clamped_angle_diff -/* 918FCC 8024041C 46000386 */ mov.s $f14, $f0 -/* 918FD0 80240420 46000005 */ abs.s $f0, $f0 -/* 918FD4 80240424 3C018024 */ lui $at, 0x8024 -/* 918FD8 80240428 D4222C38 */ ldc1 $f2, 0x2c38($at) -/* 918FDC 8024042C 46000021 */ cvt.d.s $f0, $f0 -/* 918FE0 80240430 4620103C */ c.lt.d $f2, $f0 -/* 918FE4 80240434 00000000 */ nop -/* 918FE8 80240438 45030001 */ bc1tl .L80240440 -/* 918FEC 8024043C 0000802D */ daddu $s0, $zero, $zero -.L80240440: -/* 918FF0 80240440 8E420000 */ lw $v0, ($s2) -/* 918FF4 80240444 C620003C */ lwc1 $f0, 0x3c($s1) -/* 918FF8 80240448 C442002C */ lwc1 $f2, 0x2c($v0) -/* 918FFC 8024044C 46020001 */ sub.s $f0, $f0, $f2 -/* 919000 80240450 3C014220 */ lui $at, 0x4220 -/* 919004 80240454 44811000 */ mtc1 $at, $f2 -/* 919008 80240458 46000005 */ abs.s $f0, $f0 -/* 91900C 8024045C 4600103E */ c.le.s $f2, $f0 -/* 919010 80240460 00000000 */ nop -/* 919014 80240464 45030001 */ bc1tl .L8024046C -/* 919018 80240468 0000802D */ daddu $s0, $zero, $zero -.L8024046C: -/* 91901C 8024046C 3C038011 */ lui $v1, 0x8011 -/* 919020 80240470 8063EBB3 */ lb $v1, -0x144d($v1) -/* 919024 80240474 24020009 */ addiu $v0, $zero, 9 -/* 919028 80240478 50620001 */ beql $v1, $v0, .L80240480 -/* 91902C 8024047C 0000802D */ daddu $s0, $zero, $zero -.L80240480: -/* 919030 80240480 0200102D */ daddu $v0, $s0, $zero -/* 919034 80240484 8FBF001C */ lw $ra, 0x1c($sp) -/* 919038 80240488 8FB20018 */ lw $s2, 0x18($sp) -/* 91903C 8024048C 8FB10014 */ lw $s1, 0x14($sp) -/* 919040 80240490 8FB00010 */ lw $s0, 0x10($sp) -/* 919044 80240494 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 919048 80240498 03E00008 */ jr $ra -/* 91904C 8024049C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/func_802404A0_918BB0.s b/asm/nonmatchings/world/area_iwa/iwa_03/func_802404A0_918BB0.s deleted file mode 100644 index c2d4c49655..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/func_802404A0_918BB0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404A0_919050 -/* 919050 802404A0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 919054 802404A4 AFB10014 */ sw $s1, 0x14($sp) -/* 919058 802404A8 0080882D */ daddu $s1, $a0, $zero -/* 91905C 802404AC AFBF001C */ sw $ra, 0x1c($sp) -/* 919060 802404B0 AFB20018 */ sw $s2, 0x18($sp) -/* 919064 802404B4 AFB00010 */ sw $s0, 0x10($sp) -/* 919068 802404B8 8E320148 */ lw $s2, 0x148($s1) -/* 91906C 802404BC 0C00EABB */ jal get_npc_unsafe -/* 919070 802404C0 86440008 */ lh $a0, 8($s2) -/* 919074 802404C4 0040802D */ daddu $s0, $v0, $zero -/* 919078 802404C8 0C00EAFF */ jal disable_npc_shadow -/* 91907C 802404CC 0200202D */ daddu $a0, $s0, $zero -/* 919080 802404D0 24020016 */ addiu $v0, $zero, 0x16 -/* 919084 802404D4 A60200A8 */ sh $v0, 0xa8($s0) -/* 919088 802404D8 24020018 */ addiu $v0, $zero, 0x18 -/* 91908C 802404DC A60200A6 */ sh $v0, 0xa6($s0) -/* 919090 802404E0 AE200074 */ sw $zero, 0x74($s1) -/* 919094 802404E4 A600008E */ sh $zero, 0x8e($s0) -/* 919098 802404E8 8E4200CC */ lw $v0, 0xcc($s2) -/* 91909C 802404EC 8C420020 */ lw $v0, 0x20($v0) -/* 9190A0 802404F0 AE020028 */ sw $v0, 0x28($s0) -/* 9190A4 802404F4 24020001 */ addiu $v0, $zero, 1 -/* 9190A8 802404F8 AE220070 */ sw $v0, 0x70($s1) -/* 9190AC 802404FC 8FBF001C */ lw $ra, 0x1c($sp) -/* 9190B0 80240500 8FB20018 */ lw $s2, 0x18($sp) -/* 9190B4 80240504 8FB10014 */ lw $s1, 0x14($sp) -/* 9190B8 80240508 8FB00010 */ lw $s0, 0x10($sp) -/* 9190BC 8024050C 03E00008 */ jr $ra -/* 9190C0 80240510 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/func_80240514_918BB0.s b/asm/nonmatchings/world/area_iwa/iwa_03/func_80240514_918BB0.s deleted file mode 100644 index 3e16c8bbad..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/func_80240514_918BB0.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240514_9190C4 -/* 9190C4 80240514 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9190C8 80240518 AFB3003C */ sw $s3, 0x3c($sp) -/* 9190CC 8024051C 0080982D */ daddu $s3, $a0, $zero -/* 9190D0 80240520 AFBF0044 */ sw $ra, 0x44($sp) -/* 9190D4 80240524 AFB40040 */ sw $s4, 0x40($sp) -/* 9190D8 80240528 AFB20038 */ sw $s2, 0x38($sp) -/* 9190DC 8024052C AFB10034 */ sw $s1, 0x34($sp) -/* 9190E0 80240530 AFB00030 */ sw $s0, 0x30($sp) -/* 9190E4 80240534 8E700148 */ lw $s0, 0x148($s3) -/* 9190E8 80240538 00A0902D */ daddu $s2, $a1, $zero -/* 9190EC 8024053C 86040008 */ lh $a0, 8($s0) -/* 9190F0 80240540 0C00EABB */ jal get_npc_unsafe -/* 9190F4 80240544 00C0A02D */ daddu $s4, $a2, $zero -/* 9190F8 80240548 8E630074 */ lw $v1, 0x74($s3) -/* 9190FC 8024054C 1C600032 */ bgtz $v1, .L80240618 -/* 919100 80240550 0040882D */ daddu $s1, $v0, $zero -/* 919104 80240554 8E420014 */ lw $v0, 0x14($s2) -/* 919108 80240558 AE620074 */ sw $v0, 0x74($s3) -/* 91910C 8024055C C640000C */ lwc1 $f0, 0xc($s2) -/* 919110 80240560 3C018024 */ lui $at, 0x8024 -/* 919114 80240564 D4222C40 */ ldc1 $f2, 0x2c40($at) -/* 919118 80240568 46000021 */ cvt.d.s $f0, $f0 -/* 91911C 8024056C 46220002 */ mul.d $f0, $f0, $f2 -/* 919120 80240570 00000000 */ nop -/* 919124 80240574 0280202D */ daddu $a0, $s4, $zero -/* 919128 80240578 AFA00010 */ sw $zero, 0x10($sp) -/* 91912C 8024057C 8E470010 */ lw $a3, 0x10($s2) -/* 919130 80240580 46200020 */ cvt.s.d $f0, $f0 -/* 919134 80240584 44060000 */ mfc1 $a2, $f0 -/* 919138 80240588 0C01242D */ jal func_800490B4 -/* 91913C 8024058C 0200282D */ daddu $a1, $s0, $zero -/* 919140 80240590 10400021 */ beqz $v0, .L80240618 -/* 919144 80240594 0000202D */ daddu $a0, $zero, $zero -/* 919148 80240598 0220282D */ daddu $a1, $s1, $zero -/* 91914C 8024059C 0000302D */ daddu $a2, $zero, $zero -/* 919150 802405A0 8E0200CC */ lw $v0, 0xcc($s0) -/* 919154 802405A4 3C013F80 */ lui $at, 0x3f80 -/* 919158 802405A8 44810000 */ mtc1 $at, $f0 -/* 91915C 802405AC 3C014000 */ lui $at, 0x4000 -/* 919160 802405B0 44811000 */ mtc1 $at, $f2 -/* 919164 802405B4 8C430024 */ lw $v1, 0x24($v0) -/* 919168 802405B8 862200A8 */ lh $v0, 0xa8($s1) -/* 91916C 802405BC 3C01C1A0 */ lui $at, 0xc1a0 -/* 919170 802405C0 44812000 */ mtc1 $at, $f4 -/* 919174 802405C4 44823000 */ mtc1 $v0, $f6 -/* 919178 802405C8 00000000 */ nop -/* 91917C 802405CC 468031A0 */ cvt.s.w $f6, $f6 -/* 919180 802405D0 44073000 */ mfc1 $a3, $f6 -/* 919184 802405D4 2402000F */ addiu $v0, $zero, 0xf -/* 919188 802405D8 AE230028 */ sw $v1, 0x28($s1) -/* 91918C 802405DC AFA2001C */ sw $v0, 0x1c($sp) -/* 919190 802405E0 27A20028 */ addiu $v0, $sp, 0x28 -/* 919194 802405E4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 919198 802405E8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 91919C 802405EC E7A40018 */ swc1 $f4, 0x18($sp) -/* 9191A0 802405F0 0C01BFA4 */ jal fx_emote -/* 9191A4 802405F4 AFA20020 */ sw $v0, 0x20($sp) -/* 9191A8 802405F8 0220202D */ daddu $a0, $s1, $zero -/* 9191AC 802405FC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9191B0 80240600 0C012530 */ jal func_800494C0 -/* 9191B4 80240604 3C060020 */ lui $a2, 0x20 -/* 9191B8 80240608 2402000C */ addiu $v0, $zero, 0xc -/* 9191BC 8024060C A622008E */ sh $v0, 0x8e($s1) -/* 9191C0 80240610 24020002 */ addiu $v0, $zero, 2 -/* 9191C4 80240614 AE620070 */ sw $v0, 0x70($s3) -.L80240618: -/* 9191C8 80240618 8E620074 */ lw $v0, 0x74($s3) -/* 9191CC 8024061C 2442FFFF */ addiu $v0, $v0, -1 -/* 9191D0 80240620 AE620074 */ sw $v0, 0x74($s3) -/* 9191D4 80240624 8FBF0044 */ lw $ra, 0x44($sp) -/* 9191D8 80240628 8FB40040 */ lw $s4, 0x40($sp) -/* 9191DC 8024062C 8FB3003C */ lw $s3, 0x3c($sp) -/* 9191E0 80240630 8FB20038 */ lw $s2, 0x38($sp) -/* 9191E4 80240634 8FB10034 */ lw $s1, 0x34($sp) -/* 9191E8 80240638 8FB00030 */ lw $s0, 0x30($sp) -/* 9191EC 8024063C 03E00008 */ jr $ra -/* 9191F0 80240640 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/func_80240644_918BB0.s b/asm/nonmatchings/world/area_iwa/iwa_03/func_80240644_918BB0.s deleted file mode 100644 index de0c1f72b8..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/func_80240644_918BB0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240644_9191F4 -/* 9191F4 80240644 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9191F8 80240648 AFB20018 */ sw $s2, 0x18($sp) -/* 9191FC 8024064C 0080902D */ daddu $s2, $a0, $zero -/* 919200 80240650 AFBF001C */ sw $ra, 0x1c($sp) -/* 919204 80240654 AFB10014 */ sw $s1, 0x14($sp) -/* 919208 80240658 AFB00010 */ sw $s0, 0x10($sp) -/* 91920C 8024065C 8E510148 */ lw $s1, 0x148($s2) -/* 919210 80240660 0C00EABB */ jal get_npc_unsafe -/* 919214 80240664 86240008 */ lh $a0, 8($s1) -/* 919218 80240668 0040802D */ daddu $s0, $v0, $zero -/* 91921C 8024066C 9602008E */ lhu $v0, 0x8e($s0) -/* 919220 80240670 2442FFFF */ addiu $v0, $v0, -1 -/* 919224 80240674 A602008E */ sh $v0, 0x8e($s0) -/* 919228 80240678 00021400 */ sll $v0, $v0, 0x10 -/* 91922C 8024067C 1C400012 */ bgtz $v0, .L802406C8 -/* 919230 80240680 00000000 */ nop -/* 919234 80240684 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 919238 80240688 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 91923C 8024068C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 919240 80240690 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 919244 80240694 8C460028 */ lw $a2, 0x28($v0) -/* 919248 80240698 0C00A720 */ jal atan2 -/* 91924C 8024069C 8C470030 */ lw $a3, 0x30($v0) -/* 919250 802406A0 0200202D */ daddu $a0, $s0, $zero -/* 919254 802406A4 0C00EAE8 */ jal enable_npc_shadow -/* 919258 802406A8 E600000C */ swc1 $f0, 0xc($s0) -/* 91925C 802406AC 8E2200CC */ lw $v0, 0xcc($s1) -/* 919260 802406B0 8C430028 */ lw $v1, 0x28($v0) -/* 919264 802406B4 24020008 */ addiu $v0, $zero, 8 -/* 919268 802406B8 A602008E */ sh $v0, 0x8e($s0) -/* 91926C 802406BC 24020003 */ addiu $v0, $zero, 3 -/* 919270 802406C0 AE030028 */ sw $v1, 0x28($s0) -/* 919274 802406C4 AE420070 */ sw $v0, 0x70($s2) -.L802406C8: -/* 919278 802406C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 91927C 802406CC 8FB20018 */ lw $s2, 0x18($sp) -/* 919280 802406D0 8FB10014 */ lw $s1, 0x14($sp) -/* 919284 802406D4 8FB00010 */ lw $s0, 0x10($sp) -/* 919288 802406D8 03E00008 */ jr $ra -/* 91928C 802406DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/func_80240810_918BB0.s b/asm/nonmatchings/world/area_iwa/iwa_03/func_80240810_918BB0.s deleted file mode 100644 index 4fdf15b106..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/func_80240810_918BB0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240810_9193C0 -/* 9193C0 80240810 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9193C4 80240814 AFB3003C */ sw $s3, 0x3c($sp) -/* 9193C8 80240818 0080982D */ daddu $s3, $a0, $zero -/* 9193CC 8024081C AFBF0040 */ sw $ra, 0x40($sp) -/* 9193D0 80240820 AFB20038 */ sw $s2, 0x38($sp) -/* 9193D4 80240824 AFB10034 */ sw $s1, 0x34($sp) -/* 9193D8 80240828 AFB00030 */ sw $s0, 0x30($sp) -/* 9193DC 8024082C 8E700148 */ lw $s0, 0x148($s3) -/* 9193E0 80240830 00A0902D */ daddu $s2, $a1, $zero -/* 9193E4 80240834 86040008 */ lh $a0, 8($s0) -/* 9193E8 80240838 0C00EABB */ jal get_npc_unsafe -/* 9193EC 8024083C 00C0882D */ daddu $s1, $a2, $zero -/* 9193F0 80240840 0220202D */ daddu $a0, $s1, $zero -/* 9193F4 80240844 0200282D */ daddu $a1, $s0, $zero -/* 9193F8 80240848 AFA00010 */ sw $zero, 0x10($sp) -/* 9193FC 8024084C 8E460024 */ lw $a2, 0x24($s2) -/* 919400 80240850 8E470028 */ lw $a3, 0x28($s2) -/* 919404 80240854 0C01242D */ jal func_800490B4 -/* 919408 80240858 0040802D */ daddu $s0, $v0, $zero -/* 91940C 8024085C 1040000B */ beqz $v0, .L8024088C -/* 919410 80240860 00000000 */ nop -/* 919414 80240864 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 919418 80240868 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 91941C 8024086C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 919420 80240870 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 919424 80240874 8C460028 */ lw $a2, 0x28($v0) -/* 919428 80240878 0C00A720 */ jal atan2 -/* 91942C 8024087C 8C470030 */ lw $a3, 0x30($v0) -/* 919430 80240880 2402000C */ addiu $v0, $zero, 0xc -/* 919434 80240884 08090259 */ j .L80240964 -/* 919438 80240888 E600000C */ swc1 $f0, 0xc($s0) -.L8024088C: -/* 91943C 8024088C 9602008E */ lhu $v0, 0x8e($s0) -/* 919440 80240890 2442FFFF */ addiu $v0, $v0, -1 -/* 919444 80240894 A602008E */ sh $v0, 0x8e($s0) -/* 919448 80240898 00021400 */ sll $v0, $v0, 0x10 -/* 91944C 8024089C 1C400032 */ bgtz $v0, .L80240968 -/* 919450 802408A0 00000000 */ nop -/* 919454 802408A4 8E620074 */ lw $v0, 0x74($s3) -/* 919458 802408A8 2442FFFF */ addiu $v0, $v0, -1 -/* 91945C 802408AC 18400014 */ blez $v0, .L80240900 -/* 919460 802408B0 AE620074 */ sw $v0, 0x74($s3) -/* 919464 802408B4 C600000C */ lwc1 $f0, 0xc($s0) -/* 919468 802408B8 3C014334 */ lui $at, 0x4334 -/* 91946C 802408BC 44816000 */ mtc1 $at, $f12 -/* 919470 802408C0 0C00A6C9 */ jal clamp_angle -/* 919474 802408C4 460C0300 */ add.s $f12, $f0, $f12 -/* 919478 802408C8 E600000C */ swc1 $f0, 0xc($s0) -/* 91947C 802408CC 8E440008 */ lw $a0, 8($s2) -/* 919480 802408D0 000417C2 */ srl $v0, $a0, 0x1f -/* 919484 802408D4 00822021 */ addu $a0, $a0, $v0 -/* 919488 802408D8 00042043 */ sra $a0, $a0, 1 -/* 91948C 802408DC 0C00A67F */ jal rand_int -/* 919490 802408E0 24840001 */ addiu $a0, $a0, 1 -/* 919494 802408E4 8E430008 */ lw $v1, 8($s2) -/* 919498 802408E8 000327C2 */ srl $a0, $v1, 0x1f -/* 91949C 802408EC 00641821 */ addu $v1, $v1, $a0 -/* 9194A0 802408F0 00031843 */ sra $v1, $v1, 1 -/* 9194A4 802408F4 00621821 */ addu $v1, $v1, $v0 -/* 9194A8 802408F8 0809025A */ j .L80240968 -/* 9194AC 802408FC A603008E */ sh $v1, 0x8e($s0) -.L80240900: -/* 9194B0 80240900 24040002 */ addiu $a0, $zero, 2 -/* 9194B4 80240904 0200282D */ daddu $a1, $s0, $zero -/* 9194B8 80240908 0000302D */ daddu $a2, $zero, $zero -/* 9194BC 8024090C 860300A8 */ lh $v1, 0xa8($s0) -/* 9194C0 80240910 3C013F80 */ lui $at, 0x3f80 -/* 9194C4 80240914 44810000 */ mtc1 $at, $f0 -/* 9194C8 80240918 3C014000 */ lui $at, 0x4000 -/* 9194CC 8024091C 44811000 */ mtc1 $at, $f2 -/* 9194D0 80240920 3C01C1A0 */ lui $at, 0xc1a0 -/* 9194D4 80240924 44812000 */ mtc1 $at, $f4 -/* 9194D8 80240928 2402000C */ addiu $v0, $zero, 0xc -/* 9194DC 8024092C AFA2001C */ sw $v0, 0x1c($sp) -/* 9194E0 80240930 44833000 */ mtc1 $v1, $f6 -/* 9194E4 80240934 00000000 */ nop -/* 9194E8 80240938 468031A0 */ cvt.s.w $f6, $f6 -/* 9194EC 8024093C 44073000 */ mfc1 $a3, $f6 -/* 9194F0 80240940 27A20028 */ addiu $v0, $sp, 0x28 -/* 9194F4 80240944 AFA20020 */ sw $v0, 0x20($sp) -/* 9194F8 80240948 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9194FC 8024094C E7A20014 */ swc1 $f2, 0x14($sp) -/* 919500 80240950 0C01BFA4 */ jal fx_emote -/* 919504 80240954 E7A40018 */ swc1 $f4, 0x18($sp) -/* 919508 80240958 2402000F */ addiu $v0, $zero, 0xf -/* 91950C 8024095C A602008E */ sh $v0, 0x8e($s0) -/* 919510 80240960 24020028 */ addiu $v0, $zero, 0x28 -.L80240964: -/* 919514 80240964 AE620070 */ sw $v0, 0x70($s3) -.L80240968: -/* 919518 80240968 8FBF0040 */ lw $ra, 0x40($sp) -/* 91951C 8024096C 8FB3003C */ lw $s3, 0x3c($sp) -/* 919520 80240970 8FB20038 */ lw $s2, 0x38($sp) -/* 919524 80240974 8FB10034 */ lw $s1, 0x34($sp) -/* 919528 80240978 8FB00030 */ lw $s0, 0x30($sp) -/* 91952C 8024097C 03E00008 */ jr $ra -/* 919530 80240980 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/func_80240984_918BB0.s b/asm/nonmatchings/world/area_iwa/iwa_03/func_80240984_918BB0.s deleted file mode 100644 index e0a7c8441a..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/func_80240984_918BB0.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240984_919534 -/* 919534 80240984 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 919538 80240988 AFB10014 */ sw $s1, 0x14($sp) -/* 91953C 8024098C 0080882D */ daddu $s1, $a0, $zero -/* 919540 80240990 AFBF0018 */ sw $ra, 0x18($sp) -/* 919544 80240994 AFB00010 */ sw $s0, 0x10($sp) -/* 919548 80240998 8E300148 */ lw $s0, 0x148($s1) -/* 91954C 8024099C 0C00EABB */ jal get_npc_unsafe -/* 919550 802409A0 86040008 */ lh $a0, 8($s0) -/* 919554 802409A4 96030096 */ lhu $v1, 0x96($s0) -/* 919558 802409A8 A443008E */ sh $v1, 0x8e($v0) -/* 91955C 802409AC 8E0300CC */ lw $v1, 0xcc($s0) -/* 919560 802409B0 8C630034 */ lw $v1, 0x34($v1) -/* 919564 802409B4 AC430028 */ sw $v1, 0x28($v0) -/* 919568 802409B8 24020015 */ addiu $v0, $zero, 0x15 -/* 91956C 802409BC AE220070 */ sw $v0, 0x70($s1) -/* 919570 802409C0 8FBF0018 */ lw $ra, 0x18($sp) -/* 919574 802409C4 8FB10014 */ lw $s1, 0x14($sp) -/* 919578 802409C8 8FB00010 */ lw $s0, 0x10($sp) -/* 91957C 802409CC 03E00008 */ jr $ra -/* 919580 802409D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/func_80240D70_918BB0.s b/asm/nonmatchings/world/area_iwa/iwa_03/func_80240D70_918BB0.s deleted file mode 100644 index 88f9eeeda5..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/func_80240D70_918BB0.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D70_919920 -/* 919920 80240D70 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 919924 80240D74 AFB30024 */ sw $s3, 0x24($sp) -/* 919928 80240D78 0080982D */ daddu $s3, $a0, $zero -/* 91992C 80240D7C AFBF0028 */ sw $ra, 0x28($sp) -/* 919930 80240D80 AFB20020 */ sw $s2, 0x20($sp) -/* 919934 80240D84 AFB1001C */ sw $s1, 0x1c($sp) -/* 919938 80240D88 AFB00018 */ sw $s0, 0x18($sp) -/* 91993C 80240D8C 8E720148 */ lw $s2, 0x148($s3) -/* 919940 80240D90 00A0882D */ daddu $s1, $a1, $zero -/* 919944 80240D94 86440008 */ lh $a0, 8($s2) -/* 919948 80240D98 0C00EABB */ jal get_npc_unsafe -/* 91994C 80240D9C 00C0802D */ daddu $s0, $a2, $zero -/* 919950 80240DA0 0200202D */ daddu $a0, $s0, $zero -/* 919954 80240DA4 0240282D */ daddu $a1, $s2, $zero -/* 919958 80240DA8 AFA00010 */ sw $zero, 0x10($sp) -/* 91995C 80240DAC 8E260024 */ lw $a2, 0x24($s1) -/* 919960 80240DB0 8E270028 */ lw $a3, 0x28($s1) -/* 919964 80240DB4 0C01242D */ jal func_800490B4 -/* 919968 80240DB8 0040802D */ daddu $s0, $v0, $zero -/* 91996C 80240DBC 1040000C */ beqz $v0, .L80240DF0 -/* 919970 80240DC0 00000000 */ nop -/* 919974 80240DC4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 919978 80240DC8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 91997C 80240DCC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 919980 80240DD0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 919984 80240DD4 8C460028 */ lw $a2, 0x28($v0) -/* 919988 80240DD8 0C00A720 */ jal atan2 -/* 91998C 80240DDC 8C470030 */ lw $a3, 0x30($v0) -/* 919990 80240DE0 2402000C */ addiu $v0, $zero, 0xc -/* 919994 80240DE4 E600000C */ swc1 $f0, 0xc($s0) -/* 919998 80240DE8 080903A3 */ j .L80240E8C -/* 91999C 80240DEC AE620070 */ sw $v0, 0x70($s3) -.L80240DF0: -/* 9199A0 80240DF0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9199A4 80240DF4 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9199A8 80240DF8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9199AC 80240DFC C4440000 */ lwc1 $f4, ($v0) -/* 9199B0 80240E00 46802120 */ cvt.s.w $f4, $f4 -/* 9199B4 80240E04 44062000 */ mfc1 $a2, $f4 -/* 9199B8 80240E08 C4440008 */ lwc1 $f4, 8($v0) -/* 9199BC 80240E0C 46802120 */ cvt.s.w $f4, $f4 -/* 9199C0 80240E10 44072000 */ mfc1 $a3, $f4 -/* 9199C4 80240E14 0C00A7B5 */ jal dist2D -/* 9199C8 80240E18 00000000 */ nop -/* 9199CC 80240E1C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9199D0 80240E20 4602003E */ c.le.s $f0, $f2 -/* 9199D4 80240E24 00000000 */ nop -/* 9199D8 80240E28 45000005 */ bc1f .L80240E40 -/* 9199DC 80240E2C 2402000A */ addiu $v0, $zero, 0xa -/* 9199E0 80240E30 A602008E */ sh $v0, 0x8e($s0) -/* 9199E4 80240E34 24020032 */ addiu $v0, $zero, 0x32 -/* 9199E8 80240E38 080903A3 */ j .L80240E8C -/* 9199EC 80240E3C AE620070 */ sw $v0, 0x70($s3) -.L80240E40: -/* 9199F0 80240E40 8602008C */ lh $v0, 0x8c($s0) -/* 9199F4 80240E44 14400011 */ bnez $v0, .L80240E8C -/* 9199F8 80240E48 00000000 */ nop -/* 9199FC 80240E4C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 919A00 80240E50 8E4200D0 */ lw $v0, 0xd0($s2) -/* 919A04 80240E54 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 919A08 80240E58 C4440000 */ lwc1 $f4, ($v0) -/* 919A0C 80240E5C 46802120 */ cvt.s.w $f4, $f4 -/* 919A10 80240E60 44062000 */ mfc1 $a2, $f4 -/* 919A14 80240E64 C4440008 */ lwc1 $f4, 8($v0) -/* 919A18 80240E68 46802120 */ cvt.s.w $f4, $f4 -/* 919A1C 80240E6C 44072000 */ mfc1 $a3, $f4 -/* 919A20 80240E70 0C00A720 */ jal atan2 -/* 919A24 80240E74 00000000 */ nop -/* 919A28 80240E78 8E050018 */ lw $a1, 0x18($s0) -/* 919A2C 80240E7C 44060000 */ mfc1 $a2, $f0 -/* 919A30 80240E80 0200202D */ daddu $a0, $s0, $zero -/* 919A34 80240E84 0C00EA95 */ jal npc_move_heading -/* 919A38 80240E88 AC86000C */ sw $a2, 0xc($a0) -.L80240E8C: -/* 919A3C 80240E8C 8FBF0028 */ lw $ra, 0x28($sp) -/* 919A40 80240E90 8FB30024 */ lw $s3, 0x24($sp) -/* 919A44 80240E94 8FB20020 */ lw $s2, 0x20($sp) -/* 919A48 80240E98 8FB1001C */ lw $s1, 0x1c($sp) -/* 919A4C 80240E9C 8FB00018 */ lw $s0, 0x18($sp) -/* 919A50 80240EA0 03E00008 */ jr $ra -/* 919A54 80240EA4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/func_80241320_918BB0.s b/asm/nonmatchings/world/area_iwa/iwa_03/func_80241320_918BB0.s deleted file mode 100644 index 2945dc47ab..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/func_80241320_918BB0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241320_919ED0 -/* 919ED0 80241320 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 919ED4 80241324 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 919ED8 80241328 8C430000 */ lw $v1, ($v0) -/* 919EDC 8024132C 8C840084 */ lw $a0, 0x84($a0) -/* 919EE0 80241330 34630010 */ ori $v1, $v1, 0x10 -/* 919EE4 80241334 AC4400D0 */ sw $a0, 0xd0($v0) -/* 919EE8 80241338 AC430000 */ sw $v1, ($v0) -/* 919EEC 8024133C 03E00008 */ jr $ra -/* 919EF0 80241340 24020002 */ addiu $v0, $zero, 2 -/* 919EF4 80241344 00000000 */ nop -/* 919EF8 80241348 00000000 */ nop -/* 919EFC 8024134C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/func_802401E0_91B8E0.s b/asm/nonmatchings/world/area_iwa/iwa_04/func_802401E0_91B8E0.s deleted file mode 100644 index 28a2eff00e..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/func_802401E0_91B8E0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401E0_91BAC0 -/* 91BAC0 802401E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91BAC4 802401E4 AFB10014 */ sw $s1, 0x14($sp) -/* 91BAC8 802401E8 0080882D */ daddu $s1, $a0, $zero -/* 91BACC 802401EC AFBF001C */ sw $ra, 0x1c($sp) -/* 91BAD0 802401F0 AFB20018 */ sw $s2, 0x18($sp) -/* 91BAD4 802401F4 AFB00010 */ sw $s0, 0x10($sp) -/* 91BAD8 802401F8 8E320148 */ lw $s2, 0x148($s1) -/* 91BADC 802401FC 0C00EABB */ jal get_npc_unsafe -/* 91BAE0 80240200 86440008 */ lh $a0, 8($s2) -/* 91BAE4 80240204 0040802D */ daddu $s0, $v0, $zero -/* 91BAE8 80240208 0C00EAFF */ jal disable_npc_shadow -/* 91BAEC 8024020C 0200202D */ daddu $a0, $s0, $zero -/* 91BAF0 80240210 24020016 */ addiu $v0, $zero, 0x16 -/* 91BAF4 80240214 A60200A8 */ sh $v0, 0xa8($s0) -/* 91BAF8 80240218 24020018 */ addiu $v0, $zero, 0x18 -/* 91BAFC 8024021C A60200A6 */ sh $v0, 0xa6($s0) -/* 91BB00 80240220 AE200074 */ sw $zero, 0x74($s1) -/* 91BB04 80240224 A600008E */ sh $zero, 0x8e($s0) -/* 91BB08 80240228 8E4200CC */ lw $v0, 0xcc($s2) -/* 91BB0C 8024022C 8C420020 */ lw $v0, 0x20($v0) -/* 91BB10 80240230 AE020028 */ sw $v0, 0x28($s0) -/* 91BB14 80240234 24020001 */ addiu $v0, $zero, 1 -/* 91BB18 80240238 AE220070 */ sw $v0, 0x70($s1) -/* 91BB1C 8024023C 8FBF001C */ lw $ra, 0x1c($sp) -/* 91BB20 80240240 8FB20018 */ lw $s2, 0x18($sp) -/* 91BB24 80240244 8FB10014 */ lw $s1, 0x14($sp) -/* 91BB28 80240248 8FB00010 */ lw $s0, 0x10($sp) -/* 91BB2C 8024024C 03E00008 */ jr $ra -/* 91BB30 80240250 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/func_802404A8_91B8E0.s b/asm/nonmatchings/world/area_iwa/iwa_04/func_802404A8_91B8E0.s deleted file mode 100644 index 1dbb910c38..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/func_802404A8_91B8E0.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404A8_91BD88 -/* 91BD88 802404A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91BD8C 802404AC AFB10014 */ sw $s1, 0x14($sp) -/* 91BD90 802404B0 0080882D */ daddu $s1, $a0, $zero -/* 91BD94 802404B4 AFBF001C */ sw $ra, 0x1c($sp) -/* 91BD98 802404B8 AFB20018 */ sw $s2, 0x18($sp) -/* 91BD9C 802404BC AFB00010 */ sw $s0, 0x10($sp) -/* 91BDA0 802404C0 8E320148 */ lw $s2, 0x148($s1) -/* 91BDA4 802404C4 0C00EABB */ jal get_npc_unsafe -/* 91BDA8 802404C8 86440008 */ lh $a0, 8($s2) -/* 91BDAC 802404CC 240400B4 */ addiu $a0, $zero, 0xb4 -/* 91BDB0 802404D0 0C00A67F */ jal rand_int -/* 91BDB4 802404D4 0040802D */ daddu $s0, $v0, $zero -/* 91BDB8 802404D8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 91BDBC 802404DC 44820000 */ mtc1 $v0, $f0 -/* 91BDC0 802404E0 00000000 */ nop -/* 91BDC4 802404E4 46800020 */ cvt.s.w $f0, $f0 -/* 91BDC8 802404E8 46006300 */ add.s $f12, $f12, $f0 -/* 91BDCC 802404EC 3C0142B4 */ lui $at, 0x42b4 -/* 91BDD0 802404F0 44810000 */ mtc1 $at, $f0 -/* 91BDD4 802404F4 0C00A6C9 */ jal clamp_angle -/* 91BDD8 802404F8 46006301 */ sub.s $f12, $f12, $f0 -/* 91BDDC 802404FC E600000C */ swc1 $f0, 0xc($s0) -/* 91BDE0 80240500 8E4200CC */ lw $v0, 0xcc($s2) -/* 91BDE4 80240504 8C420000 */ lw $v0, ($v0) -/* 91BDE8 80240508 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 91BDEC 8024050C 0C00A67F */ jal rand_int -/* 91BDF0 80240510 AE020028 */ sw $v0, 0x28($s0) -/* 91BDF4 80240514 00021FC2 */ srl $v1, $v0, 0x1f -/* 91BDF8 80240518 00431821 */ addu $v1, $v0, $v1 -/* 91BDFC 8024051C 00031843 */ sra $v1, $v1, 1 -/* 91BE00 80240520 00031840 */ sll $v1, $v1, 1 -/* 91BE04 80240524 00431023 */ subu $v0, $v0, $v1 -/* 91BE08 80240528 24420002 */ addiu $v0, $v0, 2 -/* 91BE0C 8024052C AE220074 */ sw $v0, 0x74($s1) -/* 91BE10 80240530 24020005 */ addiu $v0, $zero, 5 -/* 91BE14 80240534 AE220070 */ sw $v0, 0x70($s1) -/* 91BE18 80240538 8FBF001C */ lw $ra, 0x1c($sp) -/* 91BE1C 8024053C 8FB20018 */ lw $s2, 0x18($sp) -/* 91BE20 80240540 8FB10014 */ lw $s1, 0x14($sp) -/* 91BE24 80240544 8FB00010 */ lw $s0, 0x10($sp) -/* 91BE28 80240548 03E00008 */ jr $ra -/* 91BE2C 8024054C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/func_802406C4_91B8E0.s b/asm/nonmatchings/world/area_iwa/iwa_04/func_802406C4_91B8E0.s deleted file mode 100644 index 9b1e7f68e7..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/func_802406C4_91B8E0.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406C4_91BFA4 -/* 91BFA4 802406C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91BFA8 802406C8 AFB10014 */ sw $s1, 0x14($sp) -/* 91BFAC 802406CC 0080882D */ daddu $s1, $a0, $zero -/* 91BFB0 802406D0 AFBF0018 */ sw $ra, 0x18($sp) -/* 91BFB4 802406D4 AFB00010 */ sw $s0, 0x10($sp) -/* 91BFB8 802406D8 8E300148 */ lw $s0, 0x148($s1) -/* 91BFBC 802406DC 0C00EABB */ jal get_npc_unsafe -/* 91BFC0 802406E0 86040008 */ lh $a0, 8($s0) -/* 91BFC4 802406E4 96030096 */ lhu $v1, 0x96($s0) -/* 91BFC8 802406E8 A443008E */ sh $v1, 0x8e($v0) -/* 91BFCC 802406EC 8E0300CC */ lw $v1, 0xcc($s0) -/* 91BFD0 802406F0 8C630034 */ lw $v1, 0x34($v1) -/* 91BFD4 802406F4 AC430028 */ sw $v1, 0x28($v0) -/* 91BFD8 802406F8 24020015 */ addiu $v0, $zero, 0x15 -/* 91BFDC 802406FC AE220070 */ sw $v0, 0x70($s1) -/* 91BFE0 80240700 8FBF0018 */ lw $ra, 0x18($sp) -/* 91BFE4 80240704 8FB10014 */ lw $s1, 0x14($sp) -/* 91BFE8 80240708 8FB00010 */ lw $s0, 0x10($sp) -/* 91BFEC 8024070C 03E00008 */ jr $ra -/* 91BFF0 80240710 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/func_80241060_91B8E0.s b/asm/nonmatchings/world/area_iwa/iwa_04/func_80241060_91B8E0.s deleted file mode 100644 index c5a7bbfc7f..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/func_80241060_91B8E0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241060_91C940 -/* 91C940 80241060 3C013F80 */ lui $at, 0x3f80 -/* 91C944 80241064 44810000 */ mtc1 $at, $f0 -/* 91C948 80241068 00000000 */ nop -/* 91C94C 8024106C 3C01800B */ lui $at, 0x800b -/* 91C950 80241070 E4202218 */ swc1 $f0, 0x2218($at) -/* 91C954 80241074 03E00008 */ jr $ra -/* 91C958 80241078 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/func_80240040_91E570.s b/asm/nonmatchings/world/area_iwa/iwa_10/func_80240040_91E570.s deleted file mode 100644 index e4384b4adc..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/func_80240040_91E570.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_91E5B0 -/* 91E5B0 80240040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91E5B4 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* 91E5B8 80240048 3C108024 */ lui $s0, 0x8024 -/* 91E5BC 8024004C 26101DD0 */ addiu $s0, $s0, 0x1dd0 -/* 91E5C0 80240050 AFBF0018 */ sw $ra, 0x18($sp) -/* 91E5C4 80240054 AFB10014 */ sw $s1, 0x14($sp) -/* 91E5C8 80240058 8E020000 */ lw $v0, ($s0) -/* 91E5CC 8024005C 14400010 */ bnez $v0, .L802400A0 -/* 91E5D0 80240060 0080882D */ daddu $s1, $a0, $zero -/* 91E5D4 80240064 0C00AB39 */ jal heap_malloc -/* 91E5D8 80240068 24040040 */ addiu $a0, $zero, 0x40 -/* 91E5DC 8024006C AE020000 */ sw $v0, ($s0) -/* 91E5E0 80240070 0000182D */ daddu $v1, $zero, $zero -/* 91E5E4 80240074 0040282D */ daddu $a1, $v0, $zero -/* 91E5E8 80240078 0220202D */ daddu $a0, $s1, $zero -.L8024007C: -/* 91E5EC 8024007C 8C820084 */ lw $v0, 0x84($a0) -/* 91E5F0 80240080 24840004 */ addiu $a0, $a0, 4 -/* 91E5F4 80240084 24630001 */ addiu $v1, $v1, 1 -/* 91E5F8 80240088 ACA20000 */ sw $v0, ($a1) -/* 91E5FC 8024008C 28620010 */ slti $v0, $v1, 0x10 -/* 91E600 80240090 1440FFFA */ bnez $v0, .L8024007C -/* 91E604 80240094 24A50004 */ addiu $a1, $a1, 4 -/* 91E608 80240098 08090037 */ j .L802400DC -/* 91E60C 8024009C 00000000 */ nop -.L802400A0: -/* 91E610 802400A0 0000182D */ daddu $v1, $zero, $zero -/* 91E614 802400A4 0040282D */ daddu $a1, $v0, $zero -/* 91E618 802400A8 0220202D */ daddu $a0, $s1, $zero -.L802400AC: -/* 91E61C 802400AC 8CA20000 */ lw $v0, ($a1) -/* 91E620 802400B0 24A50004 */ addiu $a1, $a1, 4 -/* 91E624 802400B4 24630001 */ addiu $v1, $v1, 1 -/* 91E628 802400B8 AC820084 */ sw $v0, 0x84($a0) -/* 91E62C 802400BC 28620010 */ slti $v0, $v1, 0x10 -/* 91E630 802400C0 1440FFFA */ bnez $v0, .L802400AC -/* 91E634 802400C4 24840004 */ addiu $a0, $a0, 4 -/* 91E638 802400C8 3C108024 */ lui $s0, 0x8024 -/* 91E63C 802400CC 26101DD0 */ addiu $s0, $s0, 0x1dd0 -/* 91E640 802400D0 0C00AB4B */ jal heap_free -/* 91E644 802400D4 8E040000 */ lw $a0, ($s0) -/* 91E648 802400D8 AE000000 */ sw $zero, ($s0) -.L802400DC: -/* 91E64C 802400DC 8FBF0018 */ lw $ra, 0x18($sp) -/* 91E650 802400E0 8FB10014 */ lw $s1, 0x14($sp) -/* 91E654 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 91E658 802400E8 24020002 */ addiu $v0, $zero, 2 -/* 91E65C 802400EC 03E00008 */ jr $ra -/* 91E660 802400F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/func_80240160_91E570.s b/asm/nonmatchings/world/area_iwa/iwa_10/func_80240160_91E570.s deleted file mode 100644 index c7ece9fa2e..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/func_80240160_91E570.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240160_91E6D0 -/* 91E6D0 80240160 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 91E6D4 80240164 AFB20018 */ sw $s2, 0x18($sp) -/* 91E6D8 80240168 0080902D */ daddu $s2, $a0, $zero -/* 91E6DC 8024016C AFBF0028 */ sw $ra, 0x28($sp) -/* 91E6E0 80240170 AFB50024 */ sw $s5, 0x24($sp) -/* 91E6E4 80240174 AFB40020 */ sw $s4, 0x20($sp) -/* 91E6E8 80240178 AFB3001C */ sw $s3, 0x1c($sp) -/* 91E6EC 8024017C AFB10014 */ sw $s1, 0x14($sp) -/* 91E6F0 80240180 AFB00010 */ sw $s0, 0x10($sp) -/* 91E6F4 80240184 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 91E6F8 80240188 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 91E6FC 8024018C F7B40030 */ sdc1 $f20, 0x30($sp) -/* 91E700 80240190 8E50000C */ lw $s0, 0xc($s2) -/* 91E704 80240194 8E140000 */ lw $s4, ($s0) -/* 91E708 80240198 26100004 */ addiu $s0, $s0, 4 -/* 91E70C 8024019C 0C0B1EAF */ jal get_variable -/* 91E710 802401A0 0280282D */ daddu $a1, $s4, $zero -/* 91E714 802401A4 0040982D */ daddu $s3, $v0, $zero -/* 91E718 802401A8 8E150000 */ lw $s5, ($s0) -/* 91E71C 802401AC 26100004 */ addiu $s0, $s0, 4 -/* 91E720 802401B0 8E050000 */ lw $a1, ($s0) -/* 91E724 802401B4 26100004 */ addiu $s0, $s0, 4 -/* 91E728 802401B8 0C0B210B */ jal get_float_variable -/* 91E72C 802401BC 0240202D */ daddu $a0, $s2, $zero -/* 91E730 802401C0 8E050000 */ lw $a1, ($s0) -/* 91E734 802401C4 26100004 */ addiu $s0, $s0, 4 -/* 91E738 802401C8 0240202D */ daddu $a0, $s2, $zero -/* 91E73C 802401CC 0C0B210B */ jal get_float_variable -/* 91E740 802401D0 46000606 */ mov.s $f24, $f0 -/* 91E744 802401D4 8E050000 */ lw $a1, ($s0) -/* 91E748 802401D8 26100004 */ addiu $s0, $s0, 4 -/* 91E74C 802401DC 0240202D */ daddu $a0, $s2, $zero -/* 91E750 802401E0 0C0B1EAF */ jal get_variable -/* 91E754 802401E4 46000506 */ mov.s $f20, $f0 -/* 91E758 802401E8 8E050000 */ lw $a1, ($s0) -/* 91E75C 802401EC 26100004 */ addiu $s0, $s0, 4 -/* 91E760 802401F0 0240202D */ daddu $a0, $s2, $zero -/* 91E764 802401F4 0C0B1EAF */ jal get_variable -/* 91E768 802401F8 0040882D */ daddu $s1, $v0, $zero -/* 91E76C 802401FC 0240202D */ daddu $a0, $s2, $zero -/* 91E770 80240200 8E050000 */ lw $a1, ($s0) -/* 91E774 80240204 0C0B210B */ jal get_float_variable -/* 91E778 80240208 0040802D */ daddu $s0, $v0, $zero -/* 91E77C 8024020C 3C014334 */ lui $at, 0x4334 -/* 91E780 80240210 44811000 */ mtc1 $at, $f2 -/* 91E784 80240214 3C014049 */ lui $at, 0x4049 -/* 91E788 80240218 34210FD8 */ ori $at, $at, 0xfd8 -/* 91E78C 8024021C 44812000 */ mtc1 $at, $f4 -/* 91E790 80240220 46020003 */ div.s $f0, $f0, $f2 -/* 91E794 80240224 46040582 */ mul.s $f22, $f0, $f4 -/* 91E798 80240228 00000000 */ nop -/* 91E79C 8024022C 4618A501 */ sub.s $f20, $f20, $f24 -/* 91E7A0 80240230 3C013F00 */ lui $at, 0x3f00 -/* 91E7A4 80240234 44810000 */ mtc1 $at, $f0 -/* 91E7A8 80240238 00000000 */ nop -/* 91E7AC 8024023C 4600A502 */ mul.s $f20, $f20, $f0 -/* 91E7B0 80240240 00000000 */ nop -/* 91E7B4 80240244 12000007 */ beqz $s0, .L80240264 -/* 91E7B8 80240248 0233102A */ slt $v0, $s1, $s3 -/* 91E7BC 8024024C 10400005 */ beqz $v0, .L80240264 -/* 91E7C0 80240250 0240202D */ daddu $a0, $s2, $zero -/* 91E7C4 80240254 0220982D */ daddu $s3, $s1, $zero -/* 91E7C8 80240258 0280282D */ daddu $a1, $s4, $zero -/* 91E7CC 8024025C 0C0B2026 */ jal set_variable -/* 91E7D0 80240260 0220302D */ daddu $a2, $s1, $zero -.L80240264: -/* 91E7D4 80240264 3C014049 */ lui $at, 0x4049 -/* 91E7D8 80240268 34210FD8 */ ori $at, $at, 0xfd8 -/* 91E7DC 8024026C 44810000 */ mtc1 $at, $f0 -/* 91E7E0 80240270 44936000 */ mtc1 $s3, $f12 -/* 91E7E4 80240274 00000000 */ nop -/* 91E7E8 80240278 46806320 */ cvt.s.w $f12, $f12 -/* 91E7EC 8024027C 46006302 */ mul.s $f12, $f12, $f0 -/* 91E7F0 80240280 00000000 */ nop -/* 91E7F4 80240284 44910000 */ mtc1 $s1, $f0 -/* 91E7F8 80240288 00000000 */ nop -/* 91E7FC 8024028C 46800020 */ cvt.s.w $f0, $f0 -/* 91E800 80240290 46006303 */ div.s $f12, $f12, $f0 -/* 91E804 80240294 0C00A874 */ jal cos_rad -/* 91E808 80240298 46166300 */ add.s $f12, $f12, $f22 -/* 91E80C 8024029C 4600A002 */ mul.s $f0, $f20, $f0 -/* 91E810 802402A0 00000000 */ nop -/* 91E814 802402A4 4614C080 */ add.s $f2, $f24, $f20 -/* 91E818 802402A8 46001081 */ sub.s $f2, $f2, $f0 -/* 91E81C 802402AC 0240202D */ daddu $a0, $s2, $zero -/* 91E820 802402B0 44061000 */ mfc1 $a2, $f2 -/* 91E824 802402B4 0C0B2190 */ jal set_float_variable -/* 91E828 802402B8 02A0282D */ daddu $a1, $s5, $zero -/* 91E82C 802402BC 8FBF0028 */ lw $ra, 0x28($sp) -/* 91E830 802402C0 8FB50024 */ lw $s5, 0x24($sp) -/* 91E834 802402C4 8FB40020 */ lw $s4, 0x20($sp) -/* 91E838 802402C8 8FB3001C */ lw $s3, 0x1c($sp) -/* 91E83C 802402CC 8FB20018 */ lw $s2, 0x18($sp) -/* 91E840 802402D0 8FB10014 */ lw $s1, 0x14($sp) -/* 91E844 802402D4 8FB00010 */ lw $s0, 0x10($sp) -/* 91E848 802402D8 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 91E84C 802402DC D7B60038 */ ldc1 $f22, 0x38($sp) -/* 91E850 802402E0 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 91E854 802402E4 24020002 */ addiu $v0, $zero, 2 -/* 91E858 802402E8 03E00008 */ jr $ra -/* 91E85C 802402EC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/func_8024030C_91E570.s b/asm/nonmatchings/world/area_iwa/iwa_10/func_8024030C_91E570.s deleted file mode 100644 index dffc98af34..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/func_8024030C_91E570.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_91E87C -/* 91E87C 8024030C 3C02800A */ lui $v0, %hi(D_8009A650) -/* 91E880 80240310 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* 91E884 80240314 8C430000 */ lw $v1, ($v0) -/* 91E888 80240318 2404FFBF */ addiu $a0, $zero, -0x41 -/* 91E88C 8024031C 00641824 */ and $v1, $v1, $a0 -/* 91E890 80240320 AC430000 */ sw $v1, ($v0) -/* 91E894 80240324 03E00008 */ jr $ra -/* 91E898 80240328 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/func_8024032C_91E570.s b/asm/nonmatchings/world/area_iwa/iwa_10/func_8024032C_91E570.s deleted file mode 100644 index f037fbf436..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/func_8024032C_91E570.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024032C_91E89C -/* 91E89C 8024032C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 91E8A0 80240330 AFBF0010 */ sw $ra, 0x10($sp) -/* 91E8A4 80240334 8C82000C */ lw $v0, 0xc($a0) -/* 91E8A8 80240338 0C0B1EAF */ jal get_variable -/* 91E8AC 8024033C 8C450000 */ lw $a1, ($v0) -/* 91E8B0 80240340 0C0B95A4 */ jal func_802E5690 -/* 91E8B4 80240344 0040202D */ daddu $a0, $v0, $zero -/* 91E8B8 80240348 8FBF0010 */ lw $ra, 0x10($sp) -/* 91E8BC 8024034C 24020002 */ addiu $v0, $zero, 2 -/* 91E8C0 80240350 03E00008 */ jr $ra -/* 91E8C4 80240354 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/func_80240358_91E570.s b/asm/nonmatchings/world/area_iwa/iwa_10/func_80240358_91E570.s deleted file mode 100644 index 8b65c7fff9..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/func_80240358_91E570.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240358_91E8C8 -/* 91E8C8 80240358 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91E8CC 8024035C AFB00010 */ sw $s0, 0x10($sp) -/* 91E8D0 80240360 0080802D */ daddu $s0, $a0, $zero -/* 91E8D4 80240364 AFBF0018 */ sw $ra, 0x18($sp) -/* 91E8D8 80240368 AFB10014 */ sw $s1, 0x14($sp) -/* 91E8DC 8024036C 8E11000C */ lw $s1, 0xc($s0) -/* 91E8E0 80240370 8E250000 */ lw $a1, ($s1) -/* 91E8E4 80240374 0C0B1EAF */ jal get_variable -/* 91E8E8 80240378 26310004 */ addiu $s1, $s1, 4 -/* 91E8EC 8024037C 0200202D */ daddu $a0, $s0, $zero -/* 91E8F0 80240380 3C038011 */ lui $v1, %hi(gPlayerData) -/* 91E8F4 80240384 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 91E8F8 80240388 000210C0 */ sll $v0, $v0, 3 -/* 91E8FC 8024038C 00431021 */ addu $v0, $v0, $v1 -/* 91E900 80240390 90460015 */ lbu $a2, 0x15($v0) -/* 91E904 80240394 8E250000 */ lw $a1, ($s1) -/* 91E908 80240398 24C60001 */ addiu $a2, $a2, 1 -/* 91E90C 8024039C A0460015 */ sb $a2, 0x15($v0) -/* 91E910 802403A0 00063600 */ sll $a2, $a2, 0x18 -/* 91E914 802403A4 0C0B2026 */ jal set_variable -/* 91E918 802403A8 00063603 */ sra $a2, $a2, 0x18 -/* 91E91C 802403AC 8FBF0018 */ lw $ra, 0x18($sp) -/* 91E920 802403B0 8FB10014 */ lw $s1, 0x14($sp) -/* 91E924 802403B4 8FB00010 */ lw $s0, 0x10($sp) -/* 91E928 802403B8 24020002 */ addiu $v0, $zero, 2 -/* 91E92C 802403BC 03E00008 */ jr $ra -/* 91E930 802403C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/func_802403C4_91E570.s b/asm/nonmatchings/world/area_iwa/iwa_10/func_802403C4_91E570.s deleted file mode 100644 index 656df75bc8..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/func_802403C4_91E570.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C4_91E934 -/* 91E934 802403C4 3C028011 */ lui $v0, %hi(gPlayerData) -/* 91E938 802403C8 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 91E93C 802403CC 000420C0 */ sll $a0, $a0, 3 -/* 91E940 802403D0 00822021 */ addu $a0, $a0, $v0 -/* 91E944 802403D4 90820014 */ lbu $v0, 0x14($a0) -/* 91E948 802403D8 10400009 */ beqz $v0, .L80240400 -/* 91E94C 802403DC 00000000 */ nop -/* 91E950 802403E0 90820015 */ lbu $v0, 0x15($a0) -/* 91E954 802403E4 00022600 */ sll $a0, $v0, 0x18 -/* 91E958 802403E8 00041E03 */ sra $v1, $a0, 0x18 -/* 91E95C 802403EC 00051400 */ sll $v0, $a1, 0x10 -/* 91E960 802403F0 00021403 */ sra $v0, $v0, 0x10 -/* 91E964 802403F4 0043102A */ slt $v0, $v0, $v1 -/* 91E968 802403F8 10400003 */ beqz $v0, .L80240408 -/* 91E96C 802403FC 00000000 */ nop -.L80240400: -/* 91E970 80240400 03E00008 */ jr $ra -/* 91E974 80240404 2402FFFF */ addiu $v0, $zero, -1 -.L80240408: -/* 91E978 80240408 03E00008 */ jr $ra -/* 91E97C 8024040C 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/func_80240410_91E570.s b/asm/nonmatchings/world/area_iwa/iwa_10/func_80240410_91E570.s deleted file mode 100644 index 8d47fd48c4..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/func_80240410_91E570.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240410_91E980 -/* 91E980 80240410 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 91E984 80240414 AFB3001C */ sw $s3, 0x1c($sp) -/* 91E988 80240418 0080982D */ daddu $s3, $a0, $zero -/* 91E98C 8024041C AFB00010 */ sw $s0, 0x10($sp) -/* 91E990 80240420 24100001 */ addiu $s0, $zero, 1 -/* 91E994 80240424 AFB40020 */ sw $s4, 0x20($sp) -/* 91E998 80240428 2414FFFF */ addiu $s4, $zero, -1 -/* 91E99C 8024042C AFB50024 */ sw $s5, 0x24($sp) -/* 91E9A0 80240430 0200A82D */ daddu $s5, $s0, $zero -/* 91E9A4 80240434 AFB10014 */ sw $s1, 0x14($sp) -/* 91E9A8 80240438 3C118011 */ lui $s1, 0x8011 -/* 91E9AC 8024043C 2631F298 */ addiu $s1, $s1, -0xd68 -/* 91E9B0 80240440 AFBF0028 */ sw $ra, 0x28($sp) -/* 91E9B4 80240444 AFB20018 */ sw $s2, 0x18($sp) -/* 91E9B8 80240448 8E6200B4 */ lw $v0, 0xb4($s3) -/* 91E9BC 8024044C 0280182D */ daddu $v1, $s4, $zero -/* 91E9C0 80240450 AE630084 */ sw $v1, 0x84($s3) -/* 91E9C4 80240454 00021027 */ nor $v0, $zero, $v0 -/* 91E9C8 80240458 000217C2 */ srl $v0, $v0, 0x1f -/* 91E9CC 8024045C 00029400 */ sll $s2, $v0, 0x10 -.L80240460: -/* 91E9D0 80240460 92220014 */ lbu $v0, 0x14($s1) -/* 91E9D4 80240464 50400008 */ beql $v0, $zero, .L80240488 -/* 91E9D8 80240468 26100001 */ addiu $s0, $s0, 1 -/* 91E9DC 8024046C 0200202D */ daddu $a0, $s0, $zero -/* 91E9E0 80240470 0C0900F1 */ jal func_802403C4 -/* 91E9E4 80240474 00122C03 */ sra $a1, $s2, 0x10 -/* 91E9E8 80240478 10540003 */ beq $v0, $s4, .L80240488 -/* 91E9EC 8024047C 26100001 */ addiu $s0, $s0, 1 -/* 91E9F0 80240480 08090125 */ j .L80240494 -/* 91E9F4 80240484 AE750084 */ sw $s5, 0x84($s3) -.L80240488: -/* 91E9F8 80240488 2A02000C */ slti $v0, $s0, 0xc -/* 91E9FC 8024048C 1440FFF4 */ bnez $v0, .L80240460 -/* 91EA00 80240490 26310008 */ addiu $s1, $s1, 8 -.L80240494: -/* 91EA04 80240494 8FBF0028 */ lw $ra, 0x28($sp) -/* 91EA08 80240498 8FB50024 */ lw $s5, 0x24($sp) -/* 91EA0C 8024049C 8FB40020 */ lw $s4, 0x20($sp) -/* 91EA10 802404A0 8FB3001C */ lw $s3, 0x1c($sp) -/* 91EA14 802404A4 8FB20018 */ lw $s2, 0x18($sp) -/* 91EA18 802404A8 8FB10014 */ lw $s1, 0x14($sp) -/* 91EA1C 802404AC 8FB00010 */ lw $s0, 0x10($sp) -/* 91EA20 802404B0 24020002 */ addiu $v0, $zero, 2 -/* 91EA24 802404B4 03E00008 */ jr $ra -/* 91EA28 802404B8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/func_802404BC_91E570.s b/asm/nonmatchings/world/area_iwa/iwa_10/func_802404BC_91E570.s deleted file mode 100644 index 38df538efe..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/func_802404BC_91E570.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404BC_91EA2C -/* 91EA2C 802404BC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 91EA30 802404C0 AFB5002C */ sw $s5, 0x2c($sp) -/* 91EA34 802404C4 0080A82D */ daddu $s5, $a0, $zero -/* 91EA38 802404C8 AFBE0038 */ sw $fp, 0x38($sp) -/* 91EA3C 802404CC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* 91EA40 802404D0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* 91EA44 802404D4 AFBF003C */ sw $ra, 0x3c($sp) -/* 91EA48 802404D8 AFB70034 */ sw $s7, 0x34($sp) -/* 91EA4C 802404DC AFB60030 */ sw $s6, 0x30($sp) -/* 91EA50 802404E0 AFB40028 */ sw $s4, 0x28($sp) -/* 91EA54 802404E4 AFB30024 */ sw $s3, 0x24($sp) -/* 91EA58 802404E8 AFB20020 */ sw $s2, 0x20($sp) -/* 91EA5C 802404EC AFB1001C */ sw $s1, 0x1c($sp) -/* 91EA60 802404F0 10A0004F */ beqz $a1, .L80240630 -/* 91EA64 802404F4 AFB00018 */ sw $s0, 0x18($sp) -/* 91EA68 802404F8 0C00AB39 */ jal heap_malloc -/* 91EA6C 802404FC 24040330 */ addiu $a0, $zero, 0x330 -/* 91EA70 80240500 0040982D */ daddu $s3, $v0, $zero -/* 91EA74 80240504 0000B02D */ daddu $s6, $zero, $zero -/* 91EA78 80240508 02C0902D */ daddu $s2, $s6, $zero -/* 91EA7C 8024050C 3C148024 */ lui $s4, 0x8024 -/* 91EA80 80240510 26945A68 */ addiu $s4, $s4, 0x5a68 -/* 91EA84 80240514 0260882D */ daddu $s1, $s3, $zero -/* 91EA88 80240518 8EA200B4 */ lw $v0, 0xb4($s5) -/* 91EA8C 8024051C 3C038024 */ lui $v1, 0x8024 -/* 91EA90 80240520 24635A60 */ addiu $v1, $v1, 0x5a60 -/* 91EA94 80240524 AEB30078 */ sw $s3, 0x78($s5) -/* 91EA98 80240528 00021027 */ nor $v0, $zero, $v0 -/* 91EA9C 8024052C 0002BFC2 */ srl $s7, $v0, 0x1f -/* 91EAA0 80240530 00171080 */ sll $v0, $s7, 2 -/* 91EAA4 80240534 00431021 */ addu $v0, $v0, $v1 -/* 91EAA8 80240538 AFA20010 */ sw $v0, 0x10($sp) -.L8024053C: -/* 91EAAC 8024053C 86900000 */ lh $s0, ($s4) -/* 91EAB0 80240540 001010C0 */ sll $v0, $s0, 3 -/* 91EAB4 80240544 03C21021 */ addu $v0, $fp, $v0 -/* 91EAB8 80240548 90420014 */ lbu $v0, 0x14($v0) -/* 91EABC 8024054C 5040002E */ beql $v0, $zero, .L80240608 -/* 91EAC0 80240550 26520001 */ addiu $s2, $s2, 1 -/* 91EAC4 80240554 00101100 */ sll $v0, $s0, 4 -/* 91EAC8 80240558 3C068009 */ lui $a2, 0x8009 -/* 91EACC 8024055C 24C6EF20 */ addiu $a2, $a2, -0x10e0 -/* 91EAD0 80240560 00461021 */ addu $v0, $v0, $a2 -/* 91EAD4 80240564 0200202D */ daddu $a0, $s0, $zero -/* 91EAD8 80240568 AE300108 */ sw $s0, 0x108($s1) -/* 91EADC 8024056C 8C420000 */ lw $v0, ($v0) -/* 91EAE0 80240570 02E0282D */ daddu $a1, $s7, $zero -/* 91EAE4 80240574 0C0900F1 */ jal func_802403C4 -/* 91EAE8 80240578 AE220084 */ sw $v0, 0x84($s1) -/* 91EAEC 8024057C 0040202D */ daddu $a0, $v0, $zero -/* 91EAF0 80240580 04800011 */ bltz $a0, .L802405C8 -/* 91EAF4 80240584 00101080 */ sll $v0, $s0, 2 -/* 91EAF8 80240588 3C06800F */ lui $a2, 0x800f -/* 91EAFC 8024058C 24C67F00 */ addiu $a2, $a2, 0x7f00 -/* 91EB00 80240590 00461021 */ addu $v0, $v0, $a2 -/* 91EB04 80240594 8C430000 */ lw $v1, ($v0) -/* 91EB08 80240598 24020001 */ addiu $v0, $zero, 1 -/* 91EB0C 8024059C AE22018C */ sw $v0, 0x18c($s1) -/* 91EB10 802405A0 00041080 */ sll $v0, $a0, 2 -/* 91EB14 802405A4 3C068024 */ lui $a2, 0x8024 -/* 91EB18 802405A8 24C65A78 */ addiu $a2, $a2, 0x5a78 -/* 91EB1C 802405AC AE230000 */ sw $v1, ($s1) -/* 91EB20 802405B0 001218C0 */ sll $v1, $s2, 3 -/* 91EB24 802405B4 00431021 */ addu $v0, $v0, $v1 -/* 91EB28 802405B8 00461021 */ addu $v0, $v0, $a2 -/* 91EB2C 802405BC 8C420000 */ lw $v0, ($v0) -/* 91EB30 802405C0 0809017B */ j .L802405EC -/* 91EB34 802405C4 AE220294 */ sw $v0, 0x294($s1) -.L802405C8: -/* 91EB38 802405C8 3C06800F */ lui $a2, 0x800f -/* 91EB3C 802405CC 24C67F40 */ addiu $a2, $a2, 0x7f40 -/* 91EB40 802405D0 00461021 */ addu $v0, $v0, $a2 -/* 91EB44 802405D4 8C420000 */ lw $v0, ($v0) -/* 91EB48 802405D8 AE20018C */ sw $zero, 0x18c($s1) -/* 91EB4C 802405DC AE220000 */ sw $v0, ($s1) -/* 91EB50 802405E0 8FA60010 */ lw $a2, 0x10($sp) -/* 91EB54 802405E4 8CC20000 */ lw $v0, ($a2) -/* 91EB58 802405E8 AE220294 */ sw $v0, 0x294($s1) -.L802405EC: -/* 91EB5C 802405EC 001010C0 */ sll $v0, $s0, 3 -/* 91EB60 802405F0 03C21021 */ addu $v0, $fp, $v0 -/* 91EB64 802405F4 80420015 */ lb $v0, 0x15($v0) -/* 91EB68 802405F8 26D60001 */ addiu $s6, $s6, 1 -/* 91EB6C 802405FC AE220210 */ sw $v0, 0x210($s1) -/* 91EB70 80240600 26310004 */ addiu $s1, $s1, 4 -/* 91EB74 80240604 26520001 */ addiu $s2, $s2, 1 -.L80240608: -/* 91EB78 80240608 2A420008 */ slti $v0, $s2, 8 -/* 91EB7C 8024060C 1440FFCB */ bnez $v0, .L8024053C -/* 91EB80 80240610 26940002 */ addiu $s4, $s4, 2 -/* 91EB84 80240614 0260202D */ daddu $a0, $s3, $zero -/* 91EB88 80240618 24020004 */ addiu $v0, $zero, 4 -/* 91EB8C 8024061C AC820318 */ sw $v0, 0x318($a0) -/* 91EB90 80240620 AC960324 */ sw $s6, 0x324($a0) -/* 91EB94 80240624 0C03D390 */ jal func_800F4E40 -/* 91EB98 80240628 AC800328 */ sw $zero, 0x328($a0) -/* 91EB9C 8024062C AEA00070 */ sw $zero, 0x70($s5) -.L80240630: -/* 91EBA0 80240630 8EA20070 */ lw $v0, 0x70($s5) -/* 91EBA4 80240634 8EB30078 */ lw $s3, 0x78($s5) -/* 91EBA8 80240638 14400008 */ bnez $v0, .L8024065C -/* 91EBAC 8024063C 24420001 */ addiu $v0, $v0, 1 -/* 91EBB0 80240640 8662032C */ lh $v0, 0x32c($s3) -/* 91EBB4 80240644 10400009 */ beqz $v0, .L8024066C -/* 91EBB8 80240648 AEA20074 */ sw $v0, 0x74($s5) -/* 91EBBC 8024064C 0C03C4EC */ jal func_800F13B0 -/* 91EBC0 80240650 00000000 */ nop -/* 91EBC4 80240654 8EA20070 */ lw $v0, 0x70($s5) -/* 91EBC8 80240658 24420001 */ addiu $v0, $v0, 1 -.L8024065C: -/* 91EBCC 8024065C AEA20070 */ sw $v0, 0x70($s5) -/* 91EBD0 80240660 2842000F */ slti $v0, $v0, 0xf -/* 91EBD4 80240664 10400003 */ beqz $v0, .L80240674 -/* 91EBD8 80240668 00000000 */ nop -.L8024066C: -/* 91EBDC 8024066C 080901B7 */ j .L802406DC -/* 91EBE0 80240670 0000102D */ daddu $v0, $zero, $zero -.L80240674: -/* 91EBE4 80240674 0C03C54E */ jal func_800F1538 -/* 91EBE8 80240678 00000000 */ nop -/* 91EBEC 8024067C 8EA30074 */ lw $v1, 0x74($s5) -/* 91EBF0 80240680 240200FF */ addiu $v0, $zero, 0xff -/* 91EBF4 80240684 10620010 */ beq $v1, $v0, .L802406C8 -/* 91EBF8 80240688 2462FFFF */ addiu $v0, $v1, -1 -/* 91EBFC 8024068C 00021080 */ sll $v0, $v0, 2 -/* 91EC00 80240690 02621021 */ addu $v0, $s3, $v0 -/* 91EC04 80240694 8C420108 */ lw $v0, 0x108($v0) -/* 91EC08 80240698 00021100 */ sll $v0, $v0, 4 -/* 91EC0C 8024069C 3C038009 */ lui $v1, 0x8009 -/* 91EC10 802406A0 00621821 */ addu $v1, $v1, $v0 -/* 91EC14 802406A4 8C63EF20 */ lw $v1, -0x10e0($v1) -/* 91EC18 802406A8 8EA20074 */ lw $v0, 0x74($s5) -/* 91EC1C 802406AC 2442FFFF */ addiu $v0, $v0, -1 -/* 91EC20 802406B0 00021080 */ sll $v0, $v0, 2 -/* 91EC24 802406B4 02621021 */ addu $v0, $s3, $v0 -/* 91EC28 802406B8 AEA30084 */ sw $v1, 0x84($s5) -/* 91EC2C 802406BC 8C420108 */ lw $v0, 0x108($v0) -/* 91EC30 802406C0 080901B4 */ j .L802406D0 -/* 91EC34 802406C4 AEA20088 */ sw $v0, 0x88($s5) -.L802406C8: -/* 91EC38 802406C8 2402FFFF */ addiu $v0, $zero, -1 -/* 91EC3C 802406CC AEA20084 */ sw $v0, 0x84($s5) -.L802406D0: -/* 91EC40 802406D0 0C00AB4B */ jal heap_free -/* 91EC44 802406D4 8EA40078 */ lw $a0, 0x78($s5) -/* 91EC48 802406D8 24020002 */ addiu $v0, $zero, 2 -.L802406DC: -/* 91EC4C 802406DC 8FBF003C */ lw $ra, 0x3c($sp) -/* 91EC50 802406E0 8FBE0038 */ lw $fp, 0x38($sp) -/* 91EC54 802406E4 8FB70034 */ lw $s7, 0x34($sp) -/* 91EC58 802406E8 8FB60030 */ lw $s6, 0x30($sp) -/* 91EC5C 802406EC 8FB5002C */ lw $s5, 0x2c($sp) -/* 91EC60 802406F0 8FB40028 */ lw $s4, 0x28($sp) -/* 91EC64 802406F4 8FB30024 */ lw $s3, 0x24($sp) -/* 91EC68 802406F8 8FB20020 */ lw $s2, 0x20($sp) -/* 91EC6C 802406FC 8FB1001C */ lw $s1, 0x1c($sp) -/* 91EC70 80240700 8FB00018 */ lw $s0, 0x18($sp) -/* 91EC74 80240704 03E00008 */ jr $ra -/* 91EC78 80240708 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/func_80240770_91E570.s b/asm/nonmatchings/world/area_iwa/iwa_10/func_80240770_91E570.s deleted file mode 100644 index 5f6f2c5d96..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/func_80240770_91E570.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240770_91ECE0 -/* 91ECE0 80240770 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 91ECE4 80240774 AFB1001C */ sw $s1, 0x1c($sp) -/* 91ECE8 80240778 0080882D */ daddu $s1, $a0, $zero -/* 91ECEC 8024077C AFBF0020 */ sw $ra, 0x20($sp) -/* 91ECF0 80240780 AFB00018 */ sw $s0, 0x18($sp) -/* 91ECF4 80240784 8E30000C */ lw $s0, 0xc($s1) -/* 91ECF8 80240788 8E050000 */ lw $a1, ($s0) -/* 91ECFC 8024078C 0C0B1EAF */ jal get_variable -/* 91ED00 80240790 26100004 */ addiu $s0, $s0, 4 -/* 91ED04 80240794 0C04417A */ jal get_entity_by_index -/* 91ED08 80240798 0040202D */ daddu $a0, $v0, $zero -/* 91ED0C 8024079C 8E100000 */ lw $s0, ($s0) -/* 91ED10 802407A0 C444004C */ lwc1 $f4, 0x4c($v0) -/* 91ED14 802407A4 3C014148 */ lui $at, 0x4148 -/* 91ED18 802407A8 44810000 */ mtc1 $at, $f0 -/* 91ED1C 802407AC 3C013F33 */ lui $at, 0x3f33 -/* 91ED20 802407B0 34213333 */ ori $at, $at, 0x3333 -/* 91ED24 802407B4 44811000 */ mtc1 $at, $f2 -/* 91ED28 802407B8 AFA00014 */ sw $zero, 0x14($sp) -/* 91ED2C 802407BC 46002100 */ add.s $f4, $f4, $f0 -/* 91ED30 802407C0 E7A20010 */ swc1 $f2, 0x10($sp) -/* 91ED34 802407C4 8C450048 */ lw $a1, 0x48($v0) -/* 91ED38 802407C8 8C470050 */ lw $a3, 0x50($v0) -/* 91ED3C 802407CC 44062000 */ mfc1 $a2, $f4 -/* 91ED40 802407D0 0C01C5D4 */ jal func_80071750 -/* 91ED44 802407D4 0000202D */ daddu $a0, $zero, $zero -/* 91ED48 802407D8 0220202D */ daddu $a0, $s1, $zero -/* 91ED4C 802407DC 0200282D */ daddu $a1, $s0, $zero -/* 91ED50 802407E0 0C0B2026 */ jal set_variable -/* 91ED54 802407E4 0040302D */ daddu $a2, $v0, $zero -/* 91ED58 802407E8 8FBF0020 */ lw $ra, 0x20($sp) -/* 91ED5C 802407EC 8FB1001C */ lw $s1, 0x1c($sp) -/* 91ED60 802407F0 8FB00018 */ lw $s0, 0x18($sp) -/* 91ED64 802407F4 24020002 */ addiu $v0, $zero, 2 -/* 91ED68 802407F8 03E00008 */ jr $ra -/* 91ED6C 802407FC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/func_80240834_91E570.s b/asm/nonmatchings/world/area_iwa/iwa_10/func_80240834_91E570.s deleted file mode 100644 index c5cc64da0f..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/func_80240834_91E570.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240834_91EDA4 -/* 91EDA4 80240834 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91EDA8 80240838 AFBF0018 */ sw $ra, 0x18($sp) -/* 91EDAC 8024083C 8C82000C */ lw $v0, 0xc($a0) -/* 91EDB0 80240840 0C0B1EAF */ jal get_variable -/* 91EDB4 80240844 8C450000 */ lw $a1, ($v0) -/* 91EDB8 80240848 0C04417A */ jal get_entity_by_index -/* 91EDBC 8024084C 0040202D */ daddu $a0, $v0, $zero -/* 91EDC0 80240850 3C013F80 */ lui $at, 0x3f80 -/* 91EDC4 80240854 44810000 */ mtc1 $at, $f0 -/* 91EDC8 80240858 C442004C */ lwc1 $f2, 0x4c($v0) -/* 91EDCC 8024085C E7A00010 */ swc1 $f0, 0x10($sp) -/* 91EDD0 80240860 3C014148 */ lui $at, 0x4148 -/* 91EDD4 80240864 44810000 */ mtc1 $at, $f0 -/* 91EDD8 80240868 2403004B */ addiu $v1, $zero, 0x4b -/* 91EDDC 8024086C AFA30014 */ sw $v1, 0x14($sp) -/* 91EDE0 80240870 46001080 */ add.s $f2, $f2, $f0 -/* 91EDE4 80240874 8C450048 */ lw $a1, 0x48($v0) -/* 91EDE8 80240878 8C470050 */ lw $a3, 0x50($v0) -/* 91EDEC 8024087C 44061000 */ mfc1 $a2, $f2 -/* 91EDF0 80240880 0C01C2EC */ jal func_80070BB0 -/* 91EDF4 80240884 24040004 */ addiu $a0, $zero, 4 -/* 91EDF8 80240888 8FBF0018 */ lw $ra, 0x18($sp) -/* 91EDFC 8024088C 24020002 */ addiu $v0, $zero, 2 -/* 91EE00 80240890 03E00008 */ jr $ra -/* 91EE04 80240894 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/func_80240898_91E570.s b/asm/nonmatchings/world/area_iwa/iwa_10/func_80240898_91E570.s deleted file mode 100644 index ae1de31da9..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/func_80240898_91E570.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240898_91EE08 -/* 91EE08 80240898 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91EE0C 8024089C AFBF0018 */ sw $ra, 0x18($sp) -/* 91EE10 802408A0 0C00EAD2 */ jal get_npc_safe -/* 91EE14 802408A4 2404FFFC */ addiu $a0, $zero, -4 -/* 91EE18 802408A8 C444003C */ lwc1 $f4, 0x3c($v0) -/* 91EE1C 802408AC 3C014148 */ lui $at, 0x4148 -/* 91EE20 802408B0 44811000 */ mtc1 $at, $f2 -/* 91EE24 802408B4 3C013F80 */ lui $at, 0x3f80 -/* 91EE28 802408B8 44810000 */ mtc1 $at, $f0 -/* 91EE2C 802408BC 2403001E */ addiu $v1, $zero, 0x1e -/* 91EE30 802408C0 AFA30014 */ sw $v1, 0x14($sp) -/* 91EE34 802408C4 46022100 */ add.s $f4, $f4, $f2 -/* 91EE38 802408C8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 91EE3C 802408CC 8C450038 */ lw $a1, 0x38($v0) -/* 91EE40 802408D0 8C470040 */ lw $a3, 0x40($v0) -/* 91EE44 802408D4 44062000 */ mfc1 $a2, $f4 -/* 91EE48 802408D8 0C01C2EC */ jal func_80070BB0 -/* 91EE4C 802408DC 24040009 */ addiu $a0, $zero, 9 -/* 91EE50 802408E0 8FBF0018 */ lw $ra, 0x18($sp) -/* 91EE54 802408E4 24020002 */ addiu $v0, $zero, 2 -/* 91EE58 802408E8 03E00008 */ jr $ra -/* 91EE5C 802408EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/func_802408F0_91E570.s b/asm/nonmatchings/world/area_iwa/iwa_10/func_802408F0_91E570.s deleted file mode 100644 index c4d468dcf4..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/func_802408F0_91E570.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408F0_91EE60 -/* 91EE60 802408F0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 91EE64 802408F4 AFB60040 */ sw $s6, 0x40($sp) -/* 91EE68 802408F8 0080B02D */ daddu $s6, $a0, $zero -/* 91EE6C 802408FC AFB00028 */ sw $s0, 0x28($sp) -/* 91EE70 80240900 00A0802D */ daddu $s0, $a1, $zero -/* 91EE74 80240904 AFBF0044 */ sw $ra, 0x44($sp) -/* 91EE78 80240908 AFB5003C */ sw $s5, 0x3c($sp) -/* 91EE7C 8024090C AFB40038 */ sw $s4, 0x38($sp) -/* 91EE80 80240910 AFB30034 */ sw $s3, 0x34($sp) -/* 91EE84 80240914 AFB20030 */ sw $s2, 0x30($sp) -/* 91EE88 80240918 AFB1002C */ sw $s1, 0x2c($sp) -/* 91EE8C 8024091C F7B80058 */ sdc1 $f24, 0x58($sp) -/* 91EE90 80240920 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 91EE94 80240924 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 91EE98 80240928 8ED3000C */ lw $s3, 0xc($s6) -/* 91EE9C 8024092C 0C00EAD2 */ jal get_npc_safe -/* 91EEA0 80240930 2404FFFC */ addiu $a0, $zero, -4 -/* 91EEA4 80240934 27A50018 */ addiu $a1, $sp, 0x18 -/* 91EEA8 80240938 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 91EEAC 8024093C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 91EEB0 80240940 27A6001C */ addiu $a2, $sp, 0x1c -/* 91EEB4 80240944 00041880 */ sll $v1, $a0, 2 -/* 91EEB8 80240948 00641821 */ addu $v1, $v1, $a0 -/* 91EEBC 8024094C 00031880 */ sll $v1, $v1, 2 -/* 91EEC0 80240950 00641823 */ subu $v1, $v1, $a0 -/* 91EEC4 80240954 000320C0 */ sll $a0, $v1, 3 -/* 91EEC8 80240958 00641821 */ addu $v1, $v1, $a0 -/* 91EECC 8024095C 000318C0 */ sll $v1, $v1, 3 -/* 91EED0 80240960 3C01800B */ lui $at, 0x800b -/* 91EED4 80240964 00230821 */ addu $at, $at, $v1 -/* 91EED8 80240968 C42C1DEC */ lwc1 $f12, 0x1dec($at) -/* 91EEDC 8024096C 0C00A88D */ jal sin_cos_deg -/* 91EEE0 80240970 0040A82D */ daddu $s5, $v0, $zero -/* 91EEE4 80240974 1200005D */ beqz $s0, .L80240AEC -/* 91EEE8 80240978 00000000 */ nop -/* 91EEEC 8024097C 0C00AB0A */ jal general_heap_malloc -/* 91EEF0 80240980 24040068 */ addiu $a0, $zero, 0x68 -/* 91EEF4 80240984 0040902D */ daddu $s2, $v0, $zero -/* 91EEF8 80240988 02C0202D */ daddu $a0, $s6, $zero -/* 91EEFC 8024098C 0000882D */ daddu $s1, $zero, $zero -/* 91EF00 80240990 2414FFFF */ addiu $s4, $zero, -1 -/* 91EF04 80240994 AED20060 */ sw $s2, 0x60($s6) -/* 91EF08 80240998 8E650000 */ lw $a1, ($s3) -/* 91EF0C 8024099C 3C014148 */ lui $at, 0x4148 -/* 91EF10 802409A0 4481C000 */ mtc1 $at, $f24 -/* 91EF14 802409A4 3C013F80 */ lui $at, 0x3f80 -/* 91EF18 802409A8 4481B000 */ mtc1 $at, $f22 -/* 91EF1C 802409AC 4480A000 */ mtc1 $zero, $f20 -/* 91EF20 802409B0 0C0B1EAF */ jal get_variable -/* 91EF24 802409B4 0240802D */ daddu $s0, $s2, $zero -/* 91EF28 802409B8 0C04417A */ jal get_entity_by_index -/* 91EF2C 802409BC 0040202D */ daddu $a0, $v0, $zero -/* 91EF30 802409C0 AE42005C */ sw $v0, 0x5c($s2) -.L802409C4: -/* 91EF34 802409C4 8E42005C */ lw $v0, 0x5c($s2) -/* 91EF38 802409C8 C440004C */ lwc1 $f0, 0x4c($v0) -/* 91EF3C 802409CC 0000202D */ daddu $a0, $zero, $zero -/* 91EF40 802409D0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 91EF44 802409D4 AFB40014 */ sw $s4, 0x14($sp) -/* 91EF48 802409D8 46180000 */ add.s $f0, $f0, $f24 -/* 91EF4C 802409DC 8C450048 */ lw $a1, 0x48($v0) -/* 91EF50 802409E0 8C470050 */ lw $a3, 0x50($v0) -/* 91EF54 802409E4 44060000 */ mfc1 $a2, $f0 -/* 91EF58 802409E8 0C01C5BC */ jal func_800716F0 -/* 91EF5C 802409EC 26310001 */ addiu $s1, $s1, 1 -/* 91EF60 802409F0 AE020008 */ sw $v0, 8($s0) -/* 91EF64 802409F4 E614002C */ swc1 $f20, 0x2c($s0) -/* 91EF68 802409F8 E6140020 */ swc1 $f20, 0x20($s0) -/* 91EF6C 802409FC E6140014 */ swc1 $f20, 0x14($s0) -/* 91EF70 80240A00 E6140050 */ swc1 $f20, 0x50($s0) -/* 91EF74 80240A04 E6140044 */ swc1 $f20, 0x44($s0) -/* 91EF78 80240A08 E6140038 */ swc1 $f20, 0x38($s0) -/* 91EF7C 80240A0C 2A220003 */ slti $v0, $s1, 3 -/* 91EF80 80240A10 1440FFEC */ bnez $v0, .L802409C4 -/* 91EF84 80240A14 26100004 */ addiu $s0, $s0, 4 -/* 91EF88 80240A18 0000882D */ daddu $s1, $zero, $zero -/* 91EF8C 80240A1C 0240802D */ daddu $s0, $s2, $zero -/* 91EF90 80240A20 3C148024 */ lui $s4, 0x8024 -/* 91EF94 80240A24 26945AB8 */ addiu $s4, $s4, 0x5ab8 -/* 91EF98 80240A28 3C014248 */ lui $at, 0x4248 -/* 91EF9C 80240A2C 4481A000 */ mtc1 $at, $f20 -/* 91EFA0 80240A30 24130044 */ addiu $s3, $zero, 0x44 -/* 91EFA4 80240A34 AE400000 */ sw $zero, ($s2) -/* 91EFA8 80240A38 AE400004 */ sw $zero, 4($s2) -/* 91EFAC 80240A3C AE400060 */ sw $zero, 0x60($s2) -/* 91EFB0 80240A40 AE400064 */ sw $zero, 0x64($s2) -.L80240A44: -/* 91EFB4 80240A44 27A40020 */ addiu $a0, $sp, 0x20 -/* 91EFB8 80240A48 4406A000 */ mfc1 $a2, $f20 -/* 91EFBC 80240A4C 8E870000 */ lw $a3, ($s4) -/* 91EFC0 80240A50 02532821 */ addu $a1, $s2, $s3 -/* 91EFC4 80240A54 0C00A7E7 */ jal add_vec2D_polar -/* 91EFC8 80240A58 AFA00020 */ sw $zero, 0x20($sp) -/* 91EFCC 80240A5C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 91EFD0 80240A60 C7A40020 */ lwc1 $f4, 0x20($sp) -/* 91EFD4 80240A64 46041082 */ mul.s $f2, $f2, $f4 -/* 91EFD8 80240A68 00000000 */ nop -/* 91EFDC 80240A6C C7A00018 */ lwc1 $f0, 0x18($sp) -/* 91EFE0 80240A70 46040002 */ mul.s $f0, $f0, $f4 -/* 91EFE4 80240A74 00000000 */ nop -/* 91EFE8 80240A78 E6020038 */ swc1 $f2, 0x38($s0) -/* 91EFEC 80240A7C E6000050 */ swc1 $f0, 0x50($s0) -/* 91EFF0 80240A80 8E42005C */ lw $v0, 0x5c($s2) -/* 91EFF4 80240A84 C6000038 */ lwc1 $f0, 0x38($s0) -/* 91EFF8 80240A88 C4420048 */ lwc1 $f2, 0x48($v0) -/* 91EFFC 80240A8C 46001080 */ add.s $f2, $f2, $f0 -/* 91F000 80240A90 C6A00038 */ lwc1 $f0, 0x38($s5) -/* 91F004 80240A94 46020001 */ sub.s $f0, $f0, $f2 -/* 91F008 80240A98 E6000038 */ swc1 $f0, 0x38($s0) -/* 91F00C 80240A9C 8E42005C */ lw $v0, 0x5c($s2) -/* 91F010 80240AA0 C6000044 */ lwc1 $f0, 0x44($s0) -/* 91F014 80240AA4 C442004C */ lwc1 $f2, 0x4c($v0) -/* 91F018 80240AA8 46001080 */ add.s $f2, $f2, $f0 -/* 91F01C 80240AAC C6A0003C */ lwc1 $f0, 0x3c($s5) -/* 91F020 80240AB0 46020001 */ sub.s $f0, $f0, $f2 -/* 91F024 80240AB4 E6000044 */ swc1 $f0, 0x44($s0) -/* 91F028 80240AB8 8E42005C */ lw $v0, 0x5c($s2) -/* 91F02C 80240ABC C6000050 */ lwc1 $f0, 0x50($s0) -/* 91F030 80240AC0 C4420050 */ lwc1 $f2, 0x50($v0) -/* 91F034 80240AC4 26940004 */ addiu $s4, $s4, 4 -/* 91F038 80240AC8 46001080 */ add.s $f2, $f2, $f0 -/* 91F03C 80240ACC C6A00040 */ lwc1 $f0, 0x40($s5) -/* 91F040 80240AD0 26730004 */ addiu $s3, $s3, 4 -/* 91F044 80240AD4 46020001 */ sub.s $f0, $f0, $f2 -/* 91F048 80240AD8 26310001 */ addiu $s1, $s1, 1 -/* 91F04C 80240ADC 2A220003 */ slti $v0, $s1, 3 -/* 91F050 80240AE0 E6000050 */ swc1 $f0, 0x50($s0) -/* 91F054 80240AE4 1440FFD7 */ bnez $v0, .L80240A44 -/* 91F058 80240AE8 26100004 */ addiu $s0, $s0, 4 -.L80240AEC: -/* 91F05C 80240AEC 8ED20060 */ lw $s2, 0x60($s6) -/* 91F060 80240AF0 8E430000 */ lw $v1, ($s2) -/* 91F064 80240AF4 24020001 */ addiu $v0, $zero, 1 -/* 91F068 80240AF8 10620038 */ beq $v1, $v0, .L80240BDC -/* 91F06C 80240AFC 28620002 */ slti $v0, $v1, 2 -/* 91F070 80240B00 50400005 */ beql $v0, $zero, .L80240B18 -/* 91F074 80240B04 24020002 */ addiu $v0, $zero, 2 -/* 91F078 80240B08 10600007 */ beqz $v1, .L80240B28 -/* 91F07C 80240B0C 24040005 */ addiu $a0, $zero, 5 -/* 91F080 80240B10 08090330 */ j .L80240CC0 -/* 91F084 80240B14 00000000 */ nop -.L80240B18: -/* 91F088 80240B18 10620058 */ beq $v1, $v0, .L80240C7C -/* 91F08C 80240B1C 00000000 */ nop -/* 91F090 80240B20 08090330 */ j .L80240CC0 -/* 91F094 80240B24 00000000 */ nop -.L80240B28: -/* 91F098 80240B28 0000882D */ daddu $s1, $zero, $zero -/* 91F09C 80240B2C 3C148024 */ lui $s4, 0x8024 -/* 91F0A0 80240B30 26945AB8 */ addiu $s4, $s4, 0x5ab8 -/* 91F0A4 80240B34 24130020 */ addiu $s3, $zero, 0x20 -/* 91F0A8 80240B38 3C064248 */ lui $a2, 0x4248 -/* 91F0AC 80240B3C 44800000 */ mtc1 $zero, $f0 -/* 91F0B0 80240B40 24020014 */ addiu $v0, $zero, 0x14 -/* 91F0B4 80240B44 AFA20010 */ sw $v0, 0x10($sp) -/* 91F0B8 80240B48 44050000 */ mfc1 $a1, $f0 -/* 91F0BC 80240B4C 8E470060 */ lw $a3, 0x60($s2) -/* 91F0C0 80240B50 4485B000 */ mtc1 $a1, $f22 -/* 91F0C4 80240B54 0C00A8ED */ jal update_lerp -/* 91F0C8 80240B58 0240802D */ daddu $s0, $s2, $zero -/* 91F0CC 80240B5C 46000506 */ mov.s $f20, $f0 -.L80240B60: -/* 91F0D0 80240B60 4406A000 */ mfc1 $a2, $f20 -/* 91F0D4 80240B64 27A40020 */ addiu $a0, $sp, 0x20 -/* 91F0D8 80240B68 E6160020 */ swc1 $f22, 0x20($s0) -/* 91F0DC 80240B6C 8E870000 */ lw $a3, ($s4) -/* 91F0E0 80240B70 02532821 */ addu $a1, $s2, $s3 -/* 91F0E4 80240B74 0C00A7E7 */ jal add_vec2D_polar -/* 91F0E8 80240B78 E7B60020 */ swc1 $f22, 0x20($sp) -/* 91F0EC 80240B7C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 91F0F0 80240B80 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 91F0F4 80240B84 46002102 */ mul.s $f4, $f4, $f0 -/* 91F0F8 80240B88 00000000 */ nop -/* 91F0FC 80240B8C C7A20018 */ lwc1 $f2, 0x18($sp) -/* 91F100 80240B90 26940004 */ addiu $s4, $s4, 4 -/* 91F104 80240B94 46001082 */ mul.s $f2, $f2, $f0 -/* 91F108 80240B98 00000000 */ nop -/* 91F10C 80240B9C 26730004 */ addiu $s3, $s3, 4 -/* 91F110 80240BA0 26310001 */ addiu $s1, $s1, 1 -/* 91F114 80240BA4 2A220003 */ slti $v0, $s1, 3 -/* 91F118 80240BA8 E6040014 */ swc1 $f4, 0x14($s0) -/* 91F11C 80240BAC E602002C */ swc1 $f2, 0x2c($s0) -/* 91F120 80240BB0 1440FFEB */ bnez $v0, .L80240B60 -/* 91F124 80240BB4 26100004 */ addiu $s0, $s0, 4 -/* 91F128 80240BB8 8E420060 */ lw $v0, 0x60($s2) -/* 91F12C 80240BBC 24420001 */ addiu $v0, $v0, 1 -/* 91F130 80240BC0 AE420060 */ sw $v0, 0x60($s2) -/* 91F134 80240BC4 28420015 */ slti $v0, $v0, 0x15 -/* 91F138 80240BC8 1440003D */ bnez $v0, .L80240CC0 -/* 91F13C 80240BCC 24020001 */ addiu $v0, $zero, 1 -/* 91F140 80240BD0 AE420000 */ sw $v0, ($s2) -/* 91F144 80240BD4 08090330 */ j .L80240CC0 -/* 91F148 80240BD8 AE400060 */ sw $zero, 0x60($s2) -.L80240BDC: -/* 91F14C 80240BDC 0000882D */ daddu $s1, $zero, $zero -/* 91F150 80240BE0 3C148024 */ lui $s4, 0x8024 -/* 91F154 80240BE4 26945AB8 */ addiu $s4, $s4, 0x5ab8 -/* 91F158 80240BE8 24130020 */ addiu $s3, $zero, 0x20 -/* 91F15C 80240BEC 0240802D */ daddu $s0, $s2, $zero -/* 91F160 80240BF0 3C014248 */ lui $at, 0x4248 -/* 91F164 80240BF4 4481A000 */ mtc1 $at, $f20 -/* 91F168 80240BF8 4480B000 */ mtc1 $zero, $f22 -.L80240BFC: -/* 91F16C 80240BFC 4406A000 */ mfc1 $a2, $f20 -/* 91F170 80240C00 27A40020 */ addiu $a0, $sp, 0x20 -/* 91F174 80240C04 E6160020 */ swc1 $f22, 0x20($s0) -/* 91F178 80240C08 8E870000 */ lw $a3, ($s4) -/* 91F17C 80240C0C 02532821 */ addu $a1, $s2, $s3 -/* 91F180 80240C10 0C00A7E7 */ jal add_vec2D_polar -/* 91F184 80240C14 E7B60020 */ swc1 $f22, 0x20($sp) -/* 91F188 80240C18 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 91F18C 80240C1C C7A00020 */ lwc1 $f0, 0x20($sp) -/* 91F190 80240C20 46002102 */ mul.s $f4, $f4, $f0 -/* 91F194 80240C24 00000000 */ nop -/* 91F198 80240C28 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 91F19C 80240C2C 26940004 */ addiu $s4, $s4, 4 -/* 91F1A0 80240C30 46001082 */ mul.s $f2, $f2, $f0 -/* 91F1A4 80240C34 00000000 */ nop -/* 91F1A8 80240C38 26730004 */ addiu $s3, $s3, 4 -/* 91F1AC 80240C3C 26310001 */ addiu $s1, $s1, 1 -/* 91F1B0 80240C40 2A220003 */ slti $v0, $s1, 3 -/* 91F1B4 80240C44 E6040014 */ swc1 $f4, 0x14($s0) -/* 91F1B8 80240C48 E602002C */ swc1 $f2, 0x2c($s0) -/* 91F1BC 80240C4C 1440FFEB */ bnez $v0, .L80240BFC -/* 91F1C0 80240C50 26100004 */ addiu $s0, $s0, 4 -/* 91F1C4 80240C54 8E420060 */ lw $v0, 0x60($s2) -/* 91F1C8 80240C58 24420001 */ addiu $v0, $v0, 1 -/* 91F1CC 80240C5C AE420060 */ sw $v0, 0x60($s2) -/* 91F1D0 80240C60 28420010 */ slti $v0, $v0, 0x10 -/* 91F1D4 80240C64 14400016 */ bnez $v0, .L80240CC0 -/* 91F1D8 80240C68 2402000F */ addiu $v0, $zero, 0xf -/* 91F1DC 80240C6C AE420060 */ sw $v0, 0x60($s2) -/* 91F1E0 80240C70 24020002 */ addiu $v0, $zero, 2 -/* 91F1E4 80240C74 08090330 */ j .L80240CC0 -/* 91F1E8 80240C78 AE420000 */ sw $v0, ($s2) -.L80240C7C: -/* 91F1EC 80240C7C 8E420060 */ lw $v0, 0x60($s2) -/* 91F1F0 80240C80 24420001 */ addiu $v0, $v0, 1 -/* 91F1F4 80240C84 AE420060 */ sw $v0, 0x60($s2) -/* 91F1F8 80240C88 2842001F */ slti $v0, $v0, 0x1f -/* 91F1FC 80240C8C 1440000C */ bnez $v0, .L80240CC0 -/* 91F200 80240C90 0000882D */ daddu $s1, $zero, $zero -/* 91F204 80240C94 0240282D */ daddu $a1, $s2, $zero -.L80240C98: -/* 91F208 80240C98 8CA20008 */ lw $v0, 8($a1) -/* 91F20C 80240C9C 8C430000 */ lw $v1, ($v0) -/* 91F210 80240CA0 26310001 */ addiu $s1, $s1, 1 -/* 91F214 80240CA4 34630010 */ ori $v1, $v1, 0x10 -/* 91F218 80240CA8 AC430000 */ sw $v1, ($v0) -/* 91F21C 80240CAC 2A220003 */ slti $v0, $s1, 3 -/* 91F220 80240CB0 1440FFF9 */ bnez $v0, .L80240C98 -/* 91F224 80240CB4 24A50004 */ addiu $a1, $a1, 4 -/* 91F228 80240CB8 0809037D */ j .L80240DF4 -/* 91F22C 80240CBC 24020002 */ addiu $v0, $zero, 2 -.L80240CC0: -/* 91F230 80240CC0 8E430004 */ lw $v1, 4($s2) -/* 91F234 80240CC4 10600005 */ beqz $v1, .L80240CDC -/* 91F238 80240CC8 24020001 */ addiu $v0, $zero, 1 -/* 91F23C 80240CCC 1062000B */ beq $v1, $v0, .L80240CFC -/* 91F240 80240CD0 0000882D */ daddu $s1, $zero, $zero -/* 91F244 80240CD4 0809036C */ j .L80240DB0 -/* 91F248 80240CD8 0240282D */ daddu $a1, $s2, $zero -.L80240CDC: -/* 91F24C 80240CDC 8E420064 */ lw $v0, 0x64($s2) -/* 91F250 80240CE0 24420001 */ addiu $v0, $v0, 1 -/* 91F254 80240CE4 AE420064 */ sw $v0, 0x64($s2) -/* 91F258 80240CE8 28420010 */ slti $v0, $v0, 0x10 -/* 91F25C 80240CEC 1440002F */ bnez $v0, .L80240DAC -/* 91F260 80240CF0 0000882D */ daddu $s1, $zero, $zero -/* 91F264 80240CF4 08090368 */ j .L80240DA0 -/* 91F268 80240CF8 24020001 */ addiu $v0, $zero, 1 -.L80240CFC: -/* 91F26C 80240CFC 4480A000 */ mtc1 $zero, $f20 -/* 91F270 80240D00 24130014 */ addiu $s3, $zero, 0x14 -/* 91F274 80240D04 0240802D */ daddu $s0, $s2, $zero -.L80240D08: -/* 91F278 80240D08 4405A000 */ mfc1 $a1, $f20 -/* 91F27C 80240D0C AFB30010 */ sw $s3, 0x10($sp) -/* 91F280 80240D10 8E060038 */ lw $a2, 0x38($s0) -/* 91F284 80240D14 8E470064 */ lw $a3, 0x64($s2) -/* 91F288 80240D18 0C00A8ED */ jal update_lerp -/* 91F28C 80240D1C 24040001 */ addiu $a0, $zero, 1 -/* 91F290 80240D20 C6020014 */ lwc1 $f2, 0x14($s0) -/* 91F294 80240D24 46001080 */ add.s $f2, $f2, $f0 -/* 91F298 80240D28 4405A000 */ mfc1 $a1, $f20 -/* 91F29C 80240D2C E6020014 */ swc1 $f2, 0x14($s0) -/* 91F2A0 80240D30 AFB30010 */ sw $s3, 0x10($sp) -/* 91F2A4 80240D34 8E060044 */ lw $a2, 0x44($s0) -/* 91F2A8 80240D38 8E470064 */ lw $a3, 0x64($s2) -/* 91F2AC 80240D3C 0C00A8ED */ jal update_lerp -/* 91F2B0 80240D40 24040001 */ addiu $a0, $zero, 1 -/* 91F2B4 80240D44 C6020020 */ lwc1 $f2, 0x20($s0) -/* 91F2B8 80240D48 46001080 */ add.s $f2, $f2, $f0 -/* 91F2BC 80240D4C 4405A000 */ mfc1 $a1, $f20 -/* 91F2C0 80240D50 E6020020 */ swc1 $f2, 0x20($s0) -/* 91F2C4 80240D54 AFB30010 */ sw $s3, 0x10($sp) -/* 91F2C8 80240D58 8E060050 */ lw $a2, 0x50($s0) -/* 91F2CC 80240D5C 8E470064 */ lw $a3, 0x64($s2) -/* 91F2D0 80240D60 0C00A8ED */ jal update_lerp -/* 91F2D4 80240D64 24040001 */ addiu $a0, $zero, 1 -/* 91F2D8 80240D68 C602002C */ lwc1 $f2, 0x2c($s0) -/* 91F2DC 80240D6C 46001080 */ add.s $f2, $f2, $f0 -/* 91F2E0 80240D70 26310001 */ addiu $s1, $s1, 1 -/* 91F2E4 80240D74 2A220003 */ slti $v0, $s1, 3 -/* 91F2E8 80240D78 E602002C */ swc1 $f2, 0x2c($s0) -/* 91F2EC 80240D7C 1440FFE2 */ bnez $v0, .L80240D08 -/* 91F2F0 80240D80 26100004 */ addiu $s0, $s0, 4 -/* 91F2F4 80240D84 8E420064 */ lw $v0, 0x64($s2) -/* 91F2F8 80240D88 24420001 */ addiu $v0, $v0, 1 -/* 91F2FC 80240D8C AE420064 */ sw $v0, 0x64($s2) -/* 91F300 80240D90 28420015 */ slti $v0, $v0, 0x15 -/* 91F304 80240D94 14400005 */ bnez $v0, .L80240DAC -/* 91F308 80240D98 0000882D */ daddu $s1, $zero, $zero -/* 91F30C 80240D9C 24020002 */ addiu $v0, $zero, 2 -.L80240DA0: -/* 91F310 80240DA0 AE420004 */ sw $v0, 4($s2) -/* 91F314 80240DA4 AE400064 */ sw $zero, 0x64($s2) -/* 91F318 80240DA8 0000882D */ daddu $s1, $zero, $zero -.L80240DAC: -/* 91F31C 80240DAC 0240282D */ daddu $a1, $s2, $zero -.L80240DB0: -/* 91F320 80240DB0 8CA20008 */ lw $v0, 8($a1) -/* 91F324 80240DB4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* 91F328 80240DB8 8C42000C */ lw $v0, 0xc($v0) -/* 91F32C 80240DBC E4400010 */ swc1 $f0, 0x10($v0) -/* 91F330 80240DC0 8CA20008 */ lw $v0, 8($a1) -/* 91F334 80240DC4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* 91F338 80240DC8 8C42000C */ lw $v0, 0xc($v0) -/* 91F33C 80240DCC 26310001 */ addiu $s1, $s1, 1 -/* 91F340 80240DD0 E4400014 */ swc1 $f0, 0x14($v0) -/* 91F344 80240DD4 8CA20008 */ lw $v0, 8($a1) -/* 91F348 80240DD8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 91F34C 80240DDC 8C42000C */ lw $v0, 0xc($v0) -/* 91F350 80240DE0 E4400018 */ swc1 $f0, 0x18($v0) -/* 91F354 80240DE4 2A220003 */ slti $v0, $s1, 3 -/* 91F358 80240DE8 1440FFF1 */ bnez $v0, .L80240DB0 -/* 91F35C 80240DEC 24A50004 */ addiu $a1, $a1, 4 -/* 91F360 80240DF0 0000102D */ daddu $v0, $zero, $zero -.L80240DF4: -/* 91F364 80240DF4 8FBF0044 */ lw $ra, 0x44($sp) -/* 91F368 80240DF8 8FB60040 */ lw $s6, 0x40($sp) -/* 91F36C 80240DFC 8FB5003C */ lw $s5, 0x3c($sp) -/* 91F370 80240E00 8FB40038 */ lw $s4, 0x38($sp) -/* 91F374 80240E04 8FB30034 */ lw $s3, 0x34($sp) -/* 91F378 80240E08 8FB20030 */ lw $s2, 0x30($sp) -/* 91F37C 80240E0C 8FB1002C */ lw $s1, 0x2c($sp) -/* 91F380 80240E10 8FB00028 */ lw $s0, 0x28($sp) -/* 91F384 80240E14 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 91F388 80240E18 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 91F38C 80240E1C D7B40048 */ ldc1 $f20, 0x48($sp) -/* 91F390 80240E20 03E00008 */ jr $ra -/* 91F394 80240E24 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/func_80240F68_91E570.s b/asm/nonmatchings/world/area_iwa/iwa_10/func_80240F68_91E570.s deleted file mode 100644 index 7a27d1f31c..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/func_80240F68_91E570.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F68_91F4D8 -/* 91F4D8 80240F68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91F4DC 80240F6C AFBF0018 */ sw $ra, 0x18($sp) -/* 91F4E0 80240F70 0C00EAD2 */ jal get_npc_safe -/* 91F4E4 80240F74 2404FFFC */ addiu $a0, $zero, -4 -/* 91F4E8 80240F78 3C0141F0 */ lui $at, 0x41f0 -/* 91F4EC 80240F7C 44810000 */ mtc1 $at, $f0 -/* 91F4F0 80240F80 C442003C */ lwc1 $f2, 0x3c($v0) -/* 91F4F4 80240F84 46001080 */ add.s $f2, $f2, $f0 -/* 91F4F8 80240F88 E7A00010 */ swc1 $f0, 0x10($sp) -/* 91F4FC 80240F8C 8C450038 */ lw $a1, 0x38($v0) -/* 91F500 80240F90 8C470040 */ lw $a3, 0x40($v0) -/* 91F504 80240F94 44061000 */ mfc1 $a2, $f2 -/* 91F508 80240F98 0C01BFBC */ jal func_8006FEF0 -/* 91F50C 80240F9C 24040002 */ addiu $a0, $zero, 2 -/* 91F510 80240FA0 8FBF0018 */ lw $ra, 0x18($sp) -/* 91F514 80240FA4 24020002 */ addiu $v0, $zero, 2 -/* 91F518 80240FA8 03E00008 */ jr $ra -/* 91F51C 80240FAC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/func_80241210_91E570.s b/asm/nonmatchings/world/area_iwa/iwa_10/func_80241210_91E570.s deleted file mode 100644 index 9826005b9a..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/func_80241210_91E570.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241210_91F780 -/* 91F780 80241210 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 91F784 80241214 AFB10014 */ sw $s1, 0x14($sp) -/* 91F788 80241218 0080882D */ daddu $s1, $a0, $zero -/* 91F78C 8024121C AFBF0024 */ sw $ra, 0x24($sp) -/* 91F790 80241220 AFB40020 */ sw $s4, 0x20($sp) -/* 91F794 80241224 AFB3001C */ sw $s3, 0x1c($sp) -/* 91F798 80241228 AFB20018 */ sw $s2, 0x18($sp) -/* 91F79C 8024122C AFB00010 */ sw $s0, 0x10($sp) -/* 91F7A0 80241230 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 91F7A4 80241234 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 91F7A8 80241238 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 91F7AC 8024123C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 91F7B0 80241240 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 91F7B4 80241244 8E30000C */ lw $s0, 0xc($s1) -/* 91F7B8 80241248 8E130000 */ lw $s3, ($s0) -/* 91F7BC 8024124C 26100004 */ addiu $s0, $s0, 4 -/* 91F7C0 80241250 0C0B1EAF */ jal get_variable -/* 91F7C4 80241254 0260282D */ daddu $a1, $s3, $zero -/* 91F7C8 80241258 4482E000 */ mtc1 $v0, $f28 -/* 91F7CC 8024125C 00000000 */ nop -/* 91F7D0 80241260 4680E720 */ cvt.s.w $f28, $f28 -/* 91F7D4 80241264 8E140000 */ lw $s4, ($s0) -/* 91F7D8 80241268 26100004 */ addiu $s0, $s0, 4 -/* 91F7DC 8024126C 0220202D */ daddu $a0, $s1, $zero -/* 91F7E0 80241270 0C0B1EAF */ jal get_variable -/* 91F7E4 80241274 0280282D */ daddu $a1, $s4, $zero -/* 91F7E8 80241278 4482D000 */ mtc1 $v0, $f26 -/* 91F7EC 8024127C 00000000 */ nop -/* 91F7F0 80241280 4680D6A0 */ cvt.s.w $f26, $f26 -/* 91F7F4 80241284 8E100000 */ lw $s0, ($s0) -/* 91F7F8 80241288 0220202D */ daddu $a0, $s1, $zero -/* 91F7FC 8024128C 0C0B1EAF */ jal get_variable -/* 91F800 80241290 0200282D */ daddu $a1, $s0, $zero -/* 91F804 80241294 4482C000 */ mtc1 $v0, $f24 -/* 91F808 80241298 00000000 */ nop -/* 91F80C 8024129C 4680C620 */ cvt.s.w $f24, $f24 -/* 91F810 802412A0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 91F814 802412A4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 91F818 802412A8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 91F81C 802412AC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 91F820 802412B0 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 91F824 802412B4 44800000 */ mtc1 $zero, $f0 -/* 91F828 802412B8 00031080 */ sll $v0, $v1, 2 -/* 91F82C 802412BC 00431021 */ addu $v0, $v0, $v1 -/* 91F830 802412C0 00021080 */ sll $v0, $v0, 2 -/* 91F834 802412C4 00431023 */ subu $v0, $v0, $v1 -/* 91F838 802412C8 000218C0 */ sll $v1, $v0, 3 -/* 91F83C 802412CC 00431021 */ addu $v0, $v0, $v1 -/* 91F840 802412D0 000210C0 */ sll $v0, $v0, 3 -/* 91F844 802412D4 46001032 */ c.eq.s $f2, $f0 -/* 91F848 802412D8 3C01800B */ lui $at, 0x800b -/* 91F84C 802412DC 00220821 */ addu $at, $at, $v0 -/* 91F850 802412E0 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 91F854 802412E4 45000005 */ bc1f .L802412FC -/* 91F858 802412E8 00000000 */ nop -/* 91F85C 802412EC 3C0142C8 */ lui $at, 0x42c8 -/* 91F860 802412F0 44810000 */ mtc1 $at, $f0 -/* 91F864 802412F4 080904C3 */ j .L8024130C -/* 91F868 802412F8 4600B581 */ sub.s $f22, $f22, $f0 -.L802412FC: -/* 91F86C 802412FC 3C0142C8 */ lui $at, 0x42c8 -/* 91F870 80241300 44810000 */ mtc1 $at, $f0 -/* 91F874 80241304 00000000 */ nop -/* 91F878 80241308 4600B580 */ add.s $f22, $f22, $f0 -.L8024130C: -/* 91F87C 8024130C 0C00A6C9 */ jal clamp_angle -/* 91F880 80241310 4600B306 */ mov.s $f12, $f22 -/* 91F884 80241314 46000586 */ mov.s $f22, $f0 -/* 91F888 80241318 3C014170 */ lui $at, 0x4170 -/* 91F88C 8024131C 4481A000 */ mtc1 $at, $f20 -/* 91F890 80241320 0C00A8BB */ jal sin_deg -/* 91F894 80241324 4600B306 */ mov.s $f12, $f22 -/* 91F898 80241328 46140002 */ mul.s $f0, $f0, $f20 -/* 91F89C 8024132C 00000000 */ nop -/* 91F8A0 80241330 864200B0 */ lh $v0, 0xb0($s2) -/* 91F8A4 80241334 3C013F00 */ lui $at, 0x3f00 -/* 91F8A8 80241338 44812000 */ mtc1 $at, $f4 -/* 91F8AC 8024133C 44821000 */ mtc1 $v0, $f2 -/* 91F8B0 80241340 00000000 */ nop -/* 91F8B4 80241344 468010A0 */ cvt.s.w $f2, $f2 -/* 91F8B8 80241348 46041082 */ mul.s $f2, $f2, $f4 -/* 91F8BC 8024134C 00000000 */ nop -/* 91F8C0 80241350 4600E700 */ add.s $f28, $f28, $f0 -/* 91F8C4 80241354 4602D680 */ add.s $f26, $f26, $f2 -/* 91F8C8 80241358 0C00A8D4 */ jal cos_deg -/* 91F8CC 8024135C 4600B306 */ mov.s $f12, $f22 -/* 91F8D0 80241360 46140002 */ mul.s $f0, $f0, $f20 -/* 91F8D4 80241364 00000000 */ nop -/* 91F8D8 80241368 0220202D */ daddu $a0, $s1, $zero -/* 91F8DC 8024136C 0260282D */ daddu $a1, $s3, $zero -/* 91F8E0 80241370 4600E18D */ trunc.w.s $f6, $f28 -/* 91F8E4 80241374 44063000 */ mfc1 $a2, $f6 -/* 91F8E8 80241378 0C0B2026 */ jal set_variable -/* 91F8EC 8024137C 4600C601 */ sub.s $f24, $f24, $f0 -/* 91F8F0 80241380 0220202D */ daddu $a0, $s1, $zero -/* 91F8F4 80241384 4600D18D */ trunc.w.s $f6, $f26 -/* 91F8F8 80241388 44063000 */ mfc1 $a2, $f6 -/* 91F8FC 8024138C 0C0B2026 */ jal set_variable -/* 91F900 80241390 0280282D */ daddu $a1, $s4, $zero -/* 91F904 80241394 0220202D */ daddu $a0, $s1, $zero -/* 91F908 80241398 4600C18D */ trunc.w.s $f6, $f24 -/* 91F90C 8024139C 44063000 */ mfc1 $a2, $f6 -/* 91F910 802413A0 0C0B2026 */ jal set_variable -/* 91F914 802413A4 0200282D */ daddu $a1, $s0, $zero -/* 91F918 802413A8 8FBF0024 */ lw $ra, 0x24($sp) -/* 91F91C 802413AC 8FB40020 */ lw $s4, 0x20($sp) -/* 91F920 802413B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 91F924 802413B4 8FB20018 */ lw $s2, 0x18($sp) -/* 91F928 802413B8 8FB10014 */ lw $s1, 0x14($sp) -/* 91F92C 802413BC 8FB00010 */ lw $s0, 0x10($sp) -/* 91F930 802413C0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 91F934 802413C4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 91F938 802413C8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 91F93C 802413CC D7B60030 */ ldc1 $f22, 0x30($sp) -/* 91F940 802413D0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 91F944 802413D4 24020002 */ addiu $v0, $zero, 2 -/* 91F948 802413D8 03E00008 */ jr $ra -/* 91F94C 802413DC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/func_80241620_91E570.s b/asm/nonmatchings/world/area_iwa/iwa_10/func_80241620_91E570.s deleted file mode 100644 index 26dbdecc76..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/func_80241620_91E570.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241620_91FB90 -/* 91FB90 80241620 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 91FB94 80241624 AFB10054 */ sw $s1, 0x54($sp) -/* 91FB98 80241628 0080882D */ daddu $s1, $a0, $zero -/* 91FB9C 8024162C AFBF005C */ sw $ra, 0x5c($sp) -/* 91FBA0 80241630 AFB20058 */ sw $s2, 0x58($sp) -/* 91FBA4 80241634 AFB00050 */ sw $s0, 0x50($sp) -/* 91FBA8 80241638 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 91FBAC 8024163C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 91FBB0 80241640 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 91FBB4 80241644 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 91FBB8 80241648 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 91FBBC 8024164C 8E30000C */ lw $s0, 0xc($s1) -/* 91FBC0 80241650 8E050000 */ lw $a1, ($s0) -/* 91FBC4 80241654 0C0B1EAF */ jal get_variable -/* 91FBC8 80241658 26100004 */ addiu $s0, $s0, 4 -/* 91FBCC 8024165C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 91FBD0 80241660 0040202D */ daddu $a0, $v0, $zero -/* 91FBD4 80241664 8E050000 */ lw $a1, ($s0) -/* 91FBD8 80241668 26100004 */ addiu $s0, $s0, 4 -/* 91FBDC 8024166C 0220202D */ daddu $a0, $s1, $zero -/* 91FBE0 80241670 0C0B210B */ jal get_float_variable -/* 91FBE4 80241674 0040902D */ daddu $s2, $v0, $zero -/* 91FBE8 80241678 8E050000 */ lw $a1, ($s0) -/* 91FBEC 8024167C 26100004 */ addiu $s0, $s0, 4 -/* 91FBF0 80241680 0220202D */ daddu $a0, $s1, $zero -/* 91FBF4 80241684 0C0B210B */ jal get_float_variable -/* 91FBF8 80241688 46000706 */ mov.s $f28, $f0 -/* 91FBFC 8024168C 8E050000 */ lw $a1, ($s0) -/* 91FC00 80241690 26100004 */ addiu $s0, $s0, 4 -/* 91FC04 80241694 0220202D */ daddu $a0, $s1, $zero -/* 91FC08 80241698 0C0B210B */ jal get_float_variable -/* 91FC0C 8024169C 46000686 */ mov.s $f26, $f0 -/* 91FC10 802416A0 0220202D */ daddu $a0, $s1, $zero -/* 91FC14 802416A4 8E050000 */ lw $a1, ($s0) -/* 91FC18 802416A8 0C0B210B */ jal get_float_variable -/* 91FC1C 802416AC 46000586 */ mov.s $f22, $f0 -/* 91FC20 802416B0 0240202D */ daddu $a0, $s2, $zero -/* 91FC24 802416B4 0C046B4C */ jal get_model_from_list_index -/* 91FC28 802416B8 46000606 */ mov.s $f24, $f0 -/* 91FC2C 802416BC 0040882D */ daddu $s1, $v0, $zero -/* 91FC30 802416C0 96220000 */ lhu $v0, ($s1) -/* 91FC34 802416C4 30420400 */ andi $v0, $v0, 0x400 -/* 91FC38 802416C8 1440001E */ bnez $v0, .L80241744 -/* 91FC3C 802416CC 26300058 */ addiu $s0, $s1, 0x58 -/* 91FC40 802416D0 4480A000 */ mtc1 $zero, $f20 -/* 91FC44 802416D4 4406B000 */ mfc1 $a2, $f22 -/* 91FC48 802416D8 4405A000 */ mfc1 $a1, $f20 -/* 91FC4C 802416DC 4407A000 */ mfc1 $a3, $f20 -/* 91FC50 802416E0 0C019E40 */ jal guTranslateF -/* 91FC54 802416E4 0200202D */ daddu $a0, $s0, $zero -/* 91FC58 802416E8 4405E000 */ mfc1 $a1, $f28 -/* 91FC5C 802416EC 4406D000 */ mfc1 $a2, $f26 -/* 91FC60 802416F0 4407C000 */ mfc1 $a3, $f24 -/* 91FC64 802416F4 0C09056C */ jal func_802415B0 -/* 91FC68 802416F8 27A40010 */ addiu $a0, $sp, 0x10 -/* 91FC6C 802416FC 27A40010 */ addiu $a0, $sp, 0x10 -/* 91FC70 80241700 0200282D */ daddu $a1, $s0, $zero -/* 91FC74 80241704 0C019D80 */ jal guMtxCatF -/* 91FC78 80241708 0200302D */ daddu $a2, $s0, $zero -/* 91FC7C 8024170C 27A40010 */ addiu $a0, $sp, 0x10 -/* 91FC80 80241710 4600B587 */ neg.s $f22, $f22 -/* 91FC84 80241714 4405A000 */ mfc1 $a1, $f20 -/* 91FC88 80241718 4406B000 */ mfc1 $a2, $f22 -/* 91FC8C 8024171C 0C019E40 */ jal guTranslateF -/* 91FC90 80241720 00A0382D */ daddu $a3, $a1, $zero -/* 91FC94 80241724 27A40010 */ addiu $a0, $sp, 0x10 -/* 91FC98 80241728 0200282D */ daddu $a1, $s0, $zero -/* 91FC9C 8024172C 0C019D80 */ jal guMtxCatF -/* 91FCA0 80241730 00A0302D */ daddu $a2, $a1, $zero -/* 91FCA4 80241734 96220000 */ lhu $v0, ($s1) -/* 91FCA8 80241738 34421400 */ ori $v0, $v0, 0x1400 -/* 91FCAC 8024173C 080905EF */ j .L802417BC -/* 91FCB0 80241740 A6220000 */ sh $v0, ($s1) -.L80241744: -/* 91FCB4 80241744 4480A000 */ mtc1 $zero, $f20 -/* 91FCB8 80241748 4406B000 */ mfc1 $a2, $f22 -/* 91FCBC 8024174C 4405A000 */ mfc1 $a1, $f20 -/* 91FCC0 80241750 4407A000 */ mfc1 $a3, $f20 -/* 91FCC4 80241754 0C019E40 */ jal guTranslateF -/* 91FCC8 80241758 27A40010 */ addiu $a0, $sp, 0x10 -/* 91FCCC 8024175C 27A40010 */ addiu $a0, $sp, 0x10 -/* 91FCD0 80241760 26300058 */ addiu $s0, $s1, 0x58 -/* 91FCD4 80241764 0200282D */ daddu $a1, $s0, $zero -/* 91FCD8 80241768 0C019D80 */ jal guMtxCatF -/* 91FCDC 8024176C 0200302D */ daddu $a2, $s0, $zero -/* 91FCE0 80241770 4405E000 */ mfc1 $a1, $f28 -/* 91FCE4 80241774 4406D000 */ mfc1 $a2, $f26 -/* 91FCE8 80241778 4407C000 */ mfc1 $a3, $f24 -/* 91FCEC 8024177C 0C09056C */ jal func_802415B0 -/* 91FCF0 80241780 27A40010 */ addiu $a0, $sp, 0x10 -/* 91FCF4 80241784 27A40010 */ addiu $a0, $sp, 0x10 -/* 91FCF8 80241788 0200282D */ daddu $a1, $s0, $zero -/* 91FCFC 8024178C 0C019D80 */ jal guMtxCatF -/* 91FD00 80241790 0200302D */ daddu $a2, $s0, $zero -/* 91FD04 80241794 27A40010 */ addiu $a0, $sp, 0x10 -/* 91FD08 80241798 4600B587 */ neg.s $f22, $f22 -/* 91FD0C 8024179C 4405A000 */ mfc1 $a1, $f20 -/* 91FD10 802417A0 4406B000 */ mfc1 $a2, $f22 -/* 91FD14 802417A4 0C019E40 */ jal guTranslateF -/* 91FD18 802417A8 00A0382D */ daddu $a3, $a1, $zero -/* 91FD1C 802417AC 27A40010 */ addiu $a0, $sp, 0x10 -/* 91FD20 802417B0 0200282D */ daddu $a1, $s0, $zero -/* 91FD24 802417B4 0C019D80 */ jal guMtxCatF -/* 91FD28 802417B8 00A0302D */ daddu $a2, $a1, $zero -.L802417BC: -/* 91FD2C 802417BC 8FBF005C */ lw $ra, 0x5c($sp) -/* 91FD30 802417C0 8FB20058 */ lw $s2, 0x58($sp) -/* 91FD34 802417C4 8FB10054 */ lw $s1, 0x54($sp) -/* 91FD38 802417C8 8FB00050 */ lw $s0, 0x50($sp) -/* 91FD3C 802417CC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 91FD40 802417D0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 91FD44 802417D4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 91FD48 802417D8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 91FD4C 802417DC D7B40060 */ ldc1 $f20, 0x60($sp) -/* 91FD50 802417E0 24020002 */ addiu $v0, $zero, 2 -/* 91FD54 802417E4 03E00008 */ jr $ra -/* 91FD58 802417E8 27BD0088 */ addiu $sp, $sp, 0x88 -/* 91FD5C 802417EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_11/func_80240020_9269F0.s b/asm/nonmatchings/world/area_iwa/iwa_11/func_80240020_9269F0.s deleted file mode 100644 index d5a5692866..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_11/func_80240020_9269F0.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_926A10 -/* 926A10 80240020 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 926A14 80240024 AFB20018 */ sw $s2, 0x18($sp) -/* 926A18 80240028 0080902D */ daddu $s2, $a0, $zero -/* 926A1C 8024002C AFBF0028 */ sw $ra, 0x28($sp) -/* 926A20 80240030 AFB50024 */ sw $s5, 0x24($sp) -/* 926A24 80240034 AFB40020 */ sw $s4, 0x20($sp) -/* 926A28 80240038 AFB3001C */ sw $s3, 0x1c($sp) -/* 926A2C 8024003C AFB10014 */ sw $s1, 0x14($sp) -/* 926A30 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 926A34 80240044 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 926A38 80240048 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 926A3C 8024004C F7B40030 */ sdc1 $f20, 0x30($sp) -/* 926A40 80240050 8E50000C */ lw $s0, 0xc($s2) -/* 926A44 80240054 8E140000 */ lw $s4, ($s0) -/* 926A48 80240058 26100004 */ addiu $s0, $s0, 4 -/* 926A4C 8024005C 0C0B1EAF */ jal get_variable -/* 926A50 80240060 0280282D */ daddu $a1, $s4, $zero -/* 926A54 80240064 0040982D */ daddu $s3, $v0, $zero -/* 926A58 80240068 8E150000 */ lw $s5, ($s0) -/* 926A5C 8024006C 26100004 */ addiu $s0, $s0, 4 -/* 926A60 80240070 8E050000 */ lw $a1, ($s0) -/* 926A64 80240074 26100004 */ addiu $s0, $s0, 4 -/* 926A68 80240078 0C0B210B */ jal get_float_variable -/* 926A6C 8024007C 0240202D */ daddu $a0, $s2, $zero -/* 926A70 80240080 8E050000 */ lw $a1, ($s0) -/* 926A74 80240084 26100004 */ addiu $s0, $s0, 4 -/* 926A78 80240088 0240202D */ daddu $a0, $s2, $zero -/* 926A7C 8024008C 0C0B210B */ jal get_float_variable -/* 926A80 80240090 46000606 */ mov.s $f24, $f0 -/* 926A84 80240094 8E050000 */ lw $a1, ($s0) -/* 926A88 80240098 26100004 */ addiu $s0, $s0, 4 -/* 926A8C 8024009C 0240202D */ daddu $a0, $s2, $zero -/* 926A90 802400A0 0C0B1EAF */ jal get_variable -/* 926A94 802400A4 46000506 */ mov.s $f20, $f0 -/* 926A98 802400A8 8E050000 */ lw $a1, ($s0) -/* 926A9C 802400AC 26100004 */ addiu $s0, $s0, 4 -/* 926AA0 802400B0 0240202D */ daddu $a0, $s2, $zero -/* 926AA4 802400B4 0C0B1EAF */ jal get_variable -/* 926AA8 802400B8 0040882D */ daddu $s1, $v0, $zero -/* 926AAC 802400BC 0240202D */ daddu $a0, $s2, $zero -/* 926AB0 802400C0 8E050000 */ lw $a1, ($s0) -/* 926AB4 802400C4 0C0B210B */ jal get_float_variable -/* 926AB8 802400C8 0040802D */ daddu $s0, $v0, $zero -/* 926ABC 802400CC 3C014334 */ lui $at, 0x4334 -/* 926AC0 802400D0 44811000 */ mtc1 $at, $f2 -/* 926AC4 802400D4 3C014049 */ lui $at, 0x4049 -/* 926AC8 802400D8 34210FD8 */ ori $at, $at, 0xfd8 -/* 926ACC 802400DC 44812000 */ mtc1 $at, $f4 -/* 926AD0 802400E0 46020003 */ div.s $f0, $f0, $f2 -/* 926AD4 802400E4 46040582 */ mul.s $f22, $f0, $f4 -/* 926AD8 802400E8 00000000 */ nop -/* 926ADC 802400EC 4618A501 */ sub.s $f20, $f20, $f24 -/* 926AE0 802400F0 3C013F00 */ lui $at, 0x3f00 -/* 926AE4 802400F4 44810000 */ mtc1 $at, $f0 -/* 926AE8 802400F8 00000000 */ nop -/* 926AEC 802400FC 4600A502 */ mul.s $f20, $f20, $f0 -/* 926AF0 80240100 00000000 */ nop -/* 926AF4 80240104 12000007 */ beqz $s0, .L80240124 -/* 926AF8 80240108 0233102A */ slt $v0, $s1, $s3 -/* 926AFC 8024010C 10400005 */ beqz $v0, .L80240124 -/* 926B00 80240110 0240202D */ daddu $a0, $s2, $zero -/* 926B04 80240114 0220982D */ daddu $s3, $s1, $zero -/* 926B08 80240118 0280282D */ daddu $a1, $s4, $zero -/* 926B0C 8024011C 0C0B2026 */ jal set_variable -/* 926B10 80240120 0220302D */ daddu $a2, $s1, $zero -.L80240124: -/* 926B14 80240124 3C014049 */ lui $at, 0x4049 -/* 926B18 80240128 34210FD8 */ ori $at, $at, 0xfd8 -/* 926B1C 8024012C 44810000 */ mtc1 $at, $f0 -/* 926B20 80240130 44936000 */ mtc1 $s3, $f12 -/* 926B24 80240134 00000000 */ nop -/* 926B28 80240138 46806320 */ cvt.s.w $f12, $f12 -/* 926B2C 8024013C 46006302 */ mul.s $f12, $f12, $f0 -/* 926B30 80240140 00000000 */ nop -/* 926B34 80240144 44910000 */ mtc1 $s1, $f0 -/* 926B38 80240148 00000000 */ nop -/* 926B3C 8024014C 46800020 */ cvt.s.w $f0, $f0 -/* 926B40 80240150 46006303 */ div.s $f12, $f12, $f0 -/* 926B44 80240154 0C00A874 */ jal cos_rad -/* 926B48 80240158 46166300 */ add.s $f12, $f12, $f22 -/* 926B4C 8024015C 4600A002 */ mul.s $f0, $f20, $f0 -/* 926B50 80240160 00000000 */ nop -/* 926B54 80240164 4614C080 */ add.s $f2, $f24, $f20 -/* 926B58 80240168 46001081 */ sub.s $f2, $f2, $f0 -/* 926B5C 8024016C 0240202D */ daddu $a0, $s2, $zero -/* 926B60 80240170 44061000 */ mfc1 $a2, $f2 -/* 926B64 80240174 0C0B2190 */ jal set_float_variable -/* 926B68 80240178 02A0282D */ daddu $a1, $s5, $zero -/* 926B6C 8024017C 8FBF0028 */ lw $ra, 0x28($sp) -/* 926B70 80240180 8FB50024 */ lw $s5, 0x24($sp) -/* 926B74 80240184 8FB40020 */ lw $s4, 0x20($sp) -/* 926B78 80240188 8FB3001C */ lw $s3, 0x1c($sp) -/* 926B7C 8024018C 8FB20018 */ lw $s2, 0x18($sp) -/* 926B80 80240190 8FB10014 */ lw $s1, 0x14($sp) -/* 926B84 80240194 8FB00010 */ lw $s0, 0x10($sp) -/* 926B88 80240198 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 926B8C 8024019C D7B60038 */ ldc1 $f22, 0x38($sp) -/* 926B90 802401A0 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 926B94 802401A4 24020002 */ addiu $v0, $zero, 2 -/* 926B98 802401A8 03E00008 */ jr $ra -/* 926B9C 802401AC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_11/func_802401B0_9269F0.s b/asm/nonmatchings/world/area_iwa/iwa_11/func_802401B0_9269F0.s deleted file mode 100644 index 855319718c..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_11/func_802401B0_9269F0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_926BA0 -/* 926BA0 802401B0 3C01C019 */ lui $at, 0xc019 -/* 926BA4 802401B4 3421999A */ ori $at, $at, 0x999a -/* 926BA8 802401B8 44810000 */ mtc1 $at, $f0 -/* 926BAC 802401BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 926BB0 802401C0 AFB00010 */ sw $s0, 0x10($sp) -/* 926BB4 802401C4 0080802D */ daddu $s0, $a0, $zero -/* 926BB8 802401C8 AFBF0014 */ sw $ra, 0x14($sp) -/* 926BBC 802401CC C60C008C */ lwc1 $f12, 0x8c($s0) -/* 926BC0 802401D0 46806320 */ cvt.s.w $f12, $f12 -/* 926BC4 802401D4 46006302 */ mul.s $f12, $f12, $f0 -/* 926BC8 802401D8 0C00A6C9 */ jal clamp_angle -/* 926BCC 802401DC 00000000 */ nop -/* 926BD0 802401E0 3C05FE36 */ lui $a1, 0xfe36 -/* 926BD4 802401E4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 926BD8 802401E8 44060000 */ mfc1 $a2, $f0 -/* 926BDC 802401EC 0C0B2190 */ jal set_float_variable -/* 926BE0 802401F0 0200202D */ daddu $a0, $s0, $zero -/* 926BE4 802401F4 8FBF0014 */ lw $ra, 0x14($sp) -/* 926BE8 802401F8 8FB00010 */ lw $s0, 0x10($sp) -/* 926BEC 802401FC 24020002 */ addiu $v0, $zero, 2 -/* 926BF0 80240200 03E00008 */ jr $ra -/* 926BF4 80240204 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_11/func_80240208_9269F0.s b/asm/nonmatchings/world/area_iwa/iwa_11/func_80240208_9269F0.s deleted file mode 100644 index bc6f5a6a3d..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_11/func_80240208_9269F0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240208_926BF8 -/* 926BF8 80240208 3C01C019 */ lui $at, 0xc019 -/* 926BFC 8024020C 3421999A */ ori $at, $at, 0x999a -/* 926C00 80240210 44810000 */ mtc1 $at, $f0 -/* 926C04 80240214 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 926C08 80240218 AFB00010 */ sw $s0, 0x10($sp) -/* 926C0C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 926C10 80240220 AFBF0014 */ sw $ra, 0x14($sp) -/* 926C14 80240224 C60C008C */ lwc1 $f12, 0x8c($s0) -/* 926C18 80240228 46806320 */ cvt.s.w $f12, $f12 -/* 926C1C 8024022C 46006302 */ mul.s $f12, $f12, $f0 -/* 926C20 80240230 00000000 */ nop -/* 926C24 80240234 3C013F19 */ lui $at, 0x3f19 -/* 926C28 80240238 3421999A */ ori $at, $at, 0x999a -/* 926C2C 8024023C 44810000 */ mtc1 $at, $f0 -/* 926C30 80240240 00000000 */ nop -/* 926C34 80240244 46006302 */ mul.s $f12, $f12, $f0 -/* 926C38 80240248 0C00A6C9 */ jal clamp_angle -/* 926C3C 8024024C 00000000 */ nop -/* 926C40 80240250 3C05FE36 */ lui $a1, 0xfe36 -/* 926C44 80240254 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 926C48 80240258 44060000 */ mfc1 $a2, $f0 -/* 926C4C 8024025C 0C0B2190 */ jal set_float_variable -/* 926C50 80240260 0200202D */ daddu $a0, $s0, $zero -/* 926C54 80240264 8FBF0014 */ lw $ra, 0x14($sp) -/* 926C58 80240268 8FB00010 */ lw $s0, 0x10($sp) -/* 926C5C 8024026C 24020002 */ addiu $v0, $zero, 2 -/* 926C60 80240270 03E00008 */ jr $ra -/* 926C64 80240274 27BD0018 */ addiu $sp, $sp, 0x18 -/* 926C68 80240278 00000000 */ nop -/* 926C6C 8024027C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_80240124_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_80240124_B20540.s deleted file mode 100644 index 373f9dfef0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_80240124_B20540.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_B20664 -/* B20664 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B20668 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* B2066C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* B20670 80240130 10A00005 */ beqz $a1, .L80240148 -/* B20674 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* B20678 80240138 AE000070 */ sw $zero, 0x70($s0) -/* B2067C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* B20680 80240140 AE000078 */ sw $zero, 0x78($s0) -/* B20684 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* B20688 80240148 8E020070 */ lw $v0, 0x70($s0) -/* B2068C 8024014C 1440000E */ bnez $v0, .L80240188 -/* B20690 80240150 00000000 */ nop -/* B20694 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* B20698 80240158 8E020088 */ lw $v0, 0x88($s0) -/* B2069C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* B206A0 80240160 04610004 */ bgez $v1, .L80240174 -/* B206A4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* B206A8 80240168 3C020002 */ lui $v0, 2 -/* B206AC 8024016C 08090061 */ j .L80240184 -/* B206B0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* B206B4 80240174 3C040002 */ lui $a0, 2 -/* B206B8 80240178 0083102A */ slt $v0, $a0, $v1 -/* B206BC 8024017C 10400002 */ beqz $v0, .L80240188 -/* B206C0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* B206C4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* B206C8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* B206CC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* B206D0 80240190 00000000 */ nop -/* B206D4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* B206D8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* B206DC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* B206E0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* B206E4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* B206E8 802401A8 3C020002 */ lui $v0, 2 -/* B206EC 802401AC 08090071 */ j .L802401C4 -/* B206F0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* B206F4 802401B4 3C040002 */ lui $a0, 2 -/* B206F8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* B206FC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* B20700 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* B20704 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* B20708 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* B2070C 802401CC 1440000E */ bnez $v0, .L80240208 -/* B20710 802401D0 00000000 */ nop -/* B20714 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* B20718 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* B2071C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* B20720 802401E0 04610004 */ bgez $v1, .L802401F4 -/* B20724 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* B20728 802401E8 3C020002 */ lui $v0, 2 -/* B2072C 802401EC 08090081 */ j .L80240204 -/* B20730 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* B20734 802401F4 3C040002 */ lui $a0, 2 -/* B20738 802401F8 0083102A */ slt $v0, $a0, $v1 -/* B2073C 802401FC 10400002 */ beqz $v0, .L80240208 -/* B20740 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* B20744 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* B20748 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* B2074C 8024020C 1440000E */ bnez $v0, .L80240248 -/* B20750 80240210 00000000 */ nop -/* B20754 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* B20758 80240218 8E020094 */ lw $v0, 0x94($s0) -/* B2075C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* B20760 80240220 04610004 */ bgez $v1, .L80240234 -/* B20764 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* B20768 80240228 3C020002 */ lui $v0, 2 -/* B2076C 8024022C 08090091 */ j .L80240244 -/* B20770 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* B20774 80240234 3C040002 */ lui $a0, 2 -/* B20778 80240238 0083102A */ slt $v0, $a0, $v1 -/* B2077C 8024023C 10400002 */ beqz $v0, .L80240248 -/* B20780 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* B20784 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* B20788 80240248 8E040084 */ lw $a0, 0x84($s0) -/* B2078C 8024024C 0C046F07 */ jal set_main_pan_u -/* B20790 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* B20794 80240254 8E040084 */ lw $a0, 0x84($s0) -/* B20798 80240258 0C046F0D */ jal set_main_pan_v -/* B2079C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* B207A0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* B207A4 80240264 0C046F13 */ jal set_aux_pan_u -/* B207A8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* B207AC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* B207B0 80240270 0C046F19 */ jal set_aux_pan_v -/* B207B4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* B207B8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* B207BC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* B207C0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* B207C4 80240284 24420001 */ addiu $v0, $v0, 1 -/* B207C8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* B207CC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* B207D0 80240290 24630001 */ addiu $v1, $v1, 1 -/* B207D4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* B207D8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* B207DC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* B207E0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* B207E4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* B207E8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* B207EC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* B207F0 802402B0 14600002 */ bnez $v1, .L802402BC -/* B207F4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* B207F8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* B207FC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* B20800 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* B20804 802402C4 0043102A */ slt $v0, $v0, $v1 -/* B20808 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* B2080C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* B20810 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* B20814 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* B20818 802402D8 0043102A */ slt $v0, $v0, $v1 -/* B2081C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* B20820 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* B20824 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* B20828 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* B2082C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* B20830 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* B20834 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* B20838 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B2083C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* B20840 80240300 0000102D */ daddu $v0, $zero, $zero -/* B20844 80240304 03E00008 */ jr $ra -/* B20848 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_8024030C_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_8024030C_B20540.s deleted file mode 100644 index c265b7874a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_8024030C_B20540.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_B2084C -/* B2084C 8024030C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B20850 80240310 0000202D */ daddu $a0, $zero, $zero -/* B20854 80240314 0080282D */ daddu $a1, $a0, $zero -/* B20858 80240318 0080302D */ daddu $a2, $a0, $zero -/* B2085C 8024031C 0080382D */ daddu $a3, $a0, $zero -/* B20860 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* B20864 80240324 AFA00010 */ sw $zero, 0x10($sp) -/* B20868 80240328 0C01CA54 */ jal func_80072950 -/* B2086C 8024032C AFA00014 */ sw $zero, 0x14($sp) -/* B20870 80240330 8FBF0018 */ lw $ra, 0x18($sp) -/* B20874 80240334 24020002 */ addiu $v0, $zero, 2 -/* B20878 80240338 03E00008 */ jr $ra -/* B2087C 8024033C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_80240340_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_80240340_B20540.s deleted file mode 100644 index 8244ce351c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_80240340_B20540.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240340_B20880 -/* B20880 80240340 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B20884 80240344 AFBF0020 */ sw $ra, 0x20($sp) -/* B20888 80240348 AFB1001C */ sw $s1, 0x1c($sp) -/* B2088C 8024034C AFB00018 */ sw $s0, 0x18($sp) -/* B20890 80240350 8C910148 */ lw $s1, 0x148($a0) -/* B20894 80240354 0C00EABB */ jal get_npc_unsafe -/* B20898 80240358 86240008 */ lh $a0, 8($s1) -/* B2089C 8024035C 8E23006C */ lw $v1, 0x6c($s1) -/* B208A0 80240360 28630005 */ slti $v1, $v1, 5 -/* B208A4 80240364 1060001D */ beqz $v1, .L802403DC -/* B208A8 80240368 0040802D */ daddu $s0, $v0, $zero -/* B208AC 8024036C 0C00A67F */ jal rand_int -/* B208B0 80240370 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B208B4 80240374 2842012D */ slti $v0, $v0, 0x12d -/* B208B8 80240378 14400018 */ bnez $v0, .L802403DC -/* B208BC 8024037C 24020003 */ addiu $v0, $zero, 3 -/* B208C0 80240380 860300A8 */ lh $v1, 0xa8($s0) -/* B208C4 80240384 C604003C */ lwc1 $f4, 0x3c($s0) -/* B208C8 80240388 C6000040 */ lwc1 $f0, 0x40($s0) -/* B208CC 8024038C 3C014014 */ lui $at, 0x4014 -/* B208D0 80240390 44811800 */ mtc1 $at, $f3 -/* B208D4 80240394 44801000 */ mtc1 $zero, $f2 -/* B208D8 80240398 AFA20010 */ sw $v0, 0x10($sp) -/* B208DC 8024039C 46000021 */ cvt.d.s $f0, $f0 -/* B208E0 802403A0 46220000 */ add.d $f0, $f0, $f2 -/* B208E4 802403A4 AFA00014 */ sw $zero, 0x14($sp) -/* B208E8 802403A8 44831000 */ mtc1 $v1, $f2 -/* B208EC 802403AC 00000000 */ nop -/* B208F0 802403B0 468010A0 */ cvt.s.w $f2, $f2 -/* B208F4 802403B4 46022100 */ add.s $f4, $f4, $f2 -/* B208F8 802403B8 8E050038 */ lw $a1, 0x38($s0) -/* B208FC 802403BC 46200020 */ cvt.s.d $f0, $f0 -/* B20900 802403C0 44062000 */ mfc1 $a2, $f4 -/* B20904 802403C4 44070000 */ mfc1 $a3, $f0 -/* B20908 802403C8 0C04C6A5 */ jal make_item_entity_nodelay -/* B2090C 802403CC 24040156 */ addiu $a0, $zero, 0x156 -/* B20910 802403D0 8E22006C */ lw $v0, 0x6c($s1) -/* B20914 802403D4 24420001 */ addiu $v0, $v0, 1 -/* B20918 802403D8 AE22006C */ sw $v0, 0x6c($s1) -.L802403DC: -/* B2091C 802403DC 8FBF0020 */ lw $ra, 0x20($sp) -/* B20920 802403E0 8FB1001C */ lw $s1, 0x1c($sp) -/* B20924 802403E4 8FB00018 */ lw $s0, 0x18($sp) -/* B20928 802403E8 24020002 */ addiu $v0, $zero, 2 -/* B2092C 802403EC 03E00008 */ jr $ra -/* B20930 802403F0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_802403F4_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_802403F4_B20540.s deleted file mode 100644 index 4c51cc1c23..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_802403F4_B20540.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F4_B20934 -/* B20934 802403F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B20938 802403F8 AFB00010 */ sw $s0, 0x10($sp) -/* B2093C 802403FC 3C108024 */ lui $s0, 0x8024 -/* B20940 80240400 261023C8 */ addiu $s0, $s0, 0x23c8 -/* B20944 80240404 AFBF0018 */ sw $ra, 0x18($sp) -/* B20948 80240408 AFB10014 */ sw $s1, 0x14($sp) -/* B2094C 8024040C 8E020000 */ lw $v0, ($s0) -/* B20950 80240410 14400010 */ bnez $v0, .L80240454 -/* B20954 80240414 0080882D */ daddu $s1, $a0, $zero -/* B20958 80240418 0C00AB39 */ jal heap_malloc -/* B2095C 8024041C 24040040 */ addiu $a0, $zero, 0x40 -/* B20960 80240420 AE020000 */ sw $v0, ($s0) -/* B20964 80240424 0000182D */ daddu $v1, $zero, $zero -/* B20968 80240428 0040282D */ daddu $a1, $v0, $zero -/* B2096C 8024042C 0220202D */ daddu $a0, $s1, $zero -.L80240430: -/* B20970 80240430 8C820084 */ lw $v0, 0x84($a0) -/* B20974 80240434 24840004 */ addiu $a0, $a0, 4 -/* B20978 80240438 24630001 */ addiu $v1, $v1, 1 -/* B2097C 8024043C ACA20000 */ sw $v0, ($a1) -/* B20980 80240440 28620010 */ slti $v0, $v1, 0x10 -/* B20984 80240444 1440FFFA */ bnez $v0, .L80240430 -/* B20988 80240448 24A50004 */ addiu $a1, $a1, 4 -/* B2098C 8024044C 08090124 */ j .L80240490 -/* B20990 80240450 00000000 */ nop -.L80240454: -/* B20994 80240454 0000182D */ daddu $v1, $zero, $zero -/* B20998 80240458 0040282D */ daddu $a1, $v0, $zero -/* B2099C 8024045C 0220202D */ daddu $a0, $s1, $zero -.L80240460: -/* B209A0 80240460 8CA20000 */ lw $v0, ($a1) -/* B209A4 80240464 24A50004 */ addiu $a1, $a1, 4 -/* B209A8 80240468 24630001 */ addiu $v1, $v1, 1 -/* B209AC 8024046C AC820084 */ sw $v0, 0x84($a0) -/* B209B0 80240470 28620010 */ slti $v0, $v1, 0x10 -/* B209B4 80240474 1440FFFA */ bnez $v0, .L80240460 -/* B209B8 80240478 24840004 */ addiu $a0, $a0, 4 -/* B209BC 8024047C 3C108024 */ lui $s0, 0x8024 -/* B209C0 80240480 261023C8 */ addiu $s0, $s0, 0x23c8 -/* B209C4 80240484 0C00AB4B */ jal heap_free -/* B209C8 80240488 8E040000 */ lw $a0, ($s0) -/* B209CC 8024048C AE000000 */ sw $zero, ($s0) -.L80240490: -/* B209D0 80240490 8FBF0018 */ lw $ra, 0x18($sp) -/* B209D4 80240494 8FB10014 */ lw $s1, 0x14($sp) -/* B209D8 80240498 8FB00010 */ lw $s0, 0x10($sp) -/* B209DC 8024049C 24020002 */ addiu $v0, $zero, 2 -/* B209E0 802404A0 03E00008 */ jr $ra -/* B209E4 802404A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_802404A8_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_802404A8_B20540.s deleted file mode 100644 index 5ce7aed7f5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_802404A8_B20540.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404A8_B209E8 -/* B209E8 802404A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B209EC 802404AC AFB00010 */ sw $s0, 0x10($sp) -/* B209F0 802404B0 0080802D */ daddu $s0, $a0, $zero -/* B209F4 802404B4 AFBF0018 */ sw $ra, 0x18($sp) -/* B209F8 802404B8 AFB10014 */ sw $s1, 0x14($sp) -/* B209FC 802404BC 8E02000C */ lw $v0, 0xc($s0) -/* B20A00 802404C0 8C510000 */ lw $s1, ($v0) -/* B20A04 802404C4 0C0B1EAF */ jal get_variable -/* B20A08 802404C8 0220282D */ daddu $a1, $s1, $zero -/* B20A0C 802404CC 3C03FFF0 */ lui $v1, 0xfff0 -/* B20A10 802404D0 3463FFFF */ ori $v1, $v1, 0xffff -/* B20A14 802404D4 0200202D */ daddu $a0, $s0, $zero -/* B20A18 802404D8 00431024 */ and $v0, $v0, $v1 -/* B20A1C 802404DC 00021140 */ sll $v0, $v0, 5 -/* B20A20 802404E0 3C068008 */ lui $a2, %hi(gItemTable) -/* B20A24 802404E4 00C23021 */ addu $a2, $a2, $v0 -/* B20A28 802404E8 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* B20A2C 802404EC 0C0B2026 */ jal set_variable -/* B20A30 802404F0 0220282D */ daddu $a1, $s1, $zero -/* B20A34 802404F4 8FBF0018 */ lw $ra, 0x18($sp) -/* B20A38 802404F8 8FB10014 */ lw $s1, 0x14($sp) -/* B20A3C 802404FC 8FB00010 */ lw $s0, 0x10($sp) -/* B20A40 80240500 24020002 */ addiu $v0, $zero, 2 -/* B20A44 80240504 03E00008 */ jr $ra -/* B20A48 80240508 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_8024050C_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_8024050C_B20540.s deleted file mode 100644 index 76852889a9..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_8024050C_B20540.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024050C_B20A4C -/* B20A4C 8024050C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B20A50 80240510 AFB10014 */ sw $s1, 0x14($sp) -/* B20A54 80240514 0080882D */ daddu $s1, $a0, $zero -/* B20A58 80240518 AFBF0018 */ sw $ra, 0x18($sp) -/* B20A5C 8024051C AFB00010 */ sw $s0, 0x10($sp) -/* B20A60 80240520 8E30000C */ lw $s0, 0xc($s1) -/* B20A64 80240524 8E050000 */ lw $a1, ($s0) -/* B20A68 80240528 0C0B1EAF */ jal get_variable -/* B20A6C 8024052C 26100004 */ addiu $s0, $s0, 4 -/* B20A70 80240530 0C00EAD2 */ jal get_npc_safe -/* B20A74 80240534 0040202D */ daddu $a0, $v0, $zero -/* B20A78 80240538 10400005 */ beqz $v0, .L80240550 -/* B20A7C 8024053C 00000000 */ nop -/* B20A80 80240540 8E050000 */ lw $a1, ($s0) -/* B20A84 80240544 844600A8 */ lh $a2, 0xa8($v0) -/* B20A88 80240548 0C0B2026 */ jal set_variable -/* B20A8C 8024054C 0220202D */ daddu $a0, $s1, $zero -.L80240550: -/* B20A90 80240550 8FBF0018 */ lw $ra, 0x18($sp) -/* B20A94 80240554 8FB10014 */ lw $s1, 0x14($sp) -/* B20A98 80240558 8FB00010 */ lw $s0, 0x10($sp) -/* B20A9C 8024055C 24020002 */ addiu $v0, $zero, 2 -/* B20AA0 80240560 03E00008 */ jr $ra -/* B20AA4 80240564 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_80240568_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_80240568_B20540.s deleted file mode 100644 index 68d3c53c81..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_80240568_B20540.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_B20AA8 -/* B20AA8 80240568 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B20AAC 8024056C AFB10014 */ sw $s1, 0x14($sp) -/* B20AB0 80240570 0080882D */ daddu $s1, $a0, $zero -/* B20AB4 80240574 AFBF0024 */ sw $ra, 0x24($sp) -/* B20AB8 80240578 AFB40020 */ sw $s4, 0x20($sp) -/* B20ABC 8024057C AFB3001C */ sw $s3, 0x1c($sp) -/* B20AC0 80240580 AFB20018 */ sw $s2, 0x18($sp) -/* B20AC4 80240584 AFB00010 */ sw $s0, 0x10($sp) -/* B20AC8 80240588 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* B20ACC 8024058C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* B20AD0 80240590 F7B80038 */ sdc1 $f24, 0x38($sp) -/* B20AD4 80240594 F7B60030 */ sdc1 $f22, 0x30($sp) -/* B20AD8 80240598 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B20ADC 8024059C 8E30000C */ lw $s0, 0xc($s1) -/* B20AE0 802405A0 8E130000 */ lw $s3, ($s0) -/* B20AE4 802405A4 26100004 */ addiu $s0, $s0, 4 -/* B20AE8 802405A8 0C0B1EAF */ jal get_variable -/* B20AEC 802405AC 0260282D */ daddu $a1, $s3, $zero -/* B20AF0 802405B0 4482E000 */ mtc1 $v0, $f28 -/* B20AF4 802405B4 00000000 */ nop -/* B20AF8 802405B8 4680E720 */ cvt.s.w $f28, $f28 -/* B20AFC 802405BC 8E140000 */ lw $s4, ($s0) -/* B20B00 802405C0 26100004 */ addiu $s0, $s0, 4 -/* B20B04 802405C4 0220202D */ daddu $a0, $s1, $zero -/* B20B08 802405C8 0C0B1EAF */ jal get_variable -/* B20B0C 802405CC 0280282D */ daddu $a1, $s4, $zero -/* B20B10 802405D0 4482D000 */ mtc1 $v0, $f26 -/* B20B14 802405D4 00000000 */ nop -/* B20B18 802405D8 4680D6A0 */ cvt.s.w $f26, $f26 -/* B20B1C 802405DC 8E100000 */ lw $s0, ($s0) -/* B20B20 802405E0 0220202D */ daddu $a0, $s1, $zero -/* B20B24 802405E4 0C0B1EAF */ jal get_variable -/* B20B28 802405E8 0200282D */ daddu $a1, $s0, $zero -/* B20B2C 802405EC 4482C000 */ mtc1 $v0, $f24 -/* B20B30 802405F0 00000000 */ nop -/* B20B34 802405F4 4680C620 */ cvt.s.w $f24, $f24 -/* B20B38 802405F8 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* B20B3C 802405FC 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* B20B40 80240600 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* B20B44 80240604 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* B20B48 80240608 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* B20B4C 8024060C 44800000 */ mtc1 $zero, $f0 -/* B20B50 80240610 00031080 */ sll $v0, $v1, 2 -/* B20B54 80240614 00431021 */ addu $v0, $v0, $v1 -/* B20B58 80240618 00021080 */ sll $v0, $v0, 2 -/* B20B5C 8024061C 00431023 */ subu $v0, $v0, $v1 -/* B20B60 80240620 000218C0 */ sll $v1, $v0, 3 -/* B20B64 80240624 00431021 */ addu $v0, $v0, $v1 -/* B20B68 80240628 000210C0 */ sll $v0, $v0, 3 -/* B20B6C 8024062C 46001032 */ c.eq.s $f2, $f0 -/* B20B70 80240630 3C01800B */ lui $at, 0x800b -/* B20B74 80240634 00220821 */ addu $at, $at, $v0 -/* B20B78 80240638 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* B20B7C 8024063C 45000005 */ bc1f .L80240654 -/* B20B80 80240640 00000000 */ nop -/* B20B84 80240644 3C0142C8 */ lui $at, 0x42c8 -/* B20B88 80240648 44810000 */ mtc1 $at, $f0 -/* B20B8C 8024064C 08090199 */ j .L80240664 -/* B20B90 80240650 4600B581 */ sub.s $f22, $f22, $f0 -.L80240654: -/* B20B94 80240654 3C0142C8 */ lui $at, 0x42c8 -/* B20B98 80240658 44810000 */ mtc1 $at, $f0 -/* B20B9C 8024065C 00000000 */ nop -/* B20BA0 80240660 4600B580 */ add.s $f22, $f22, $f0 -.L80240664: -/* B20BA4 80240664 0C00A6C9 */ jal clamp_angle -/* B20BA8 80240668 4600B306 */ mov.s $f12, $f22 -/* B20BAC 8024066C 46000586 */ mov.s $f22, $f0 -/* B20BB0 80240670 3C014170 */ lui $at, 0x4170 -/* B20BB4 80240674 4481A000 */ mtc1 $at, $f20 -/* B20BB8 80240678 0C00A8BB */ jal sin_deg -/* B20BBC 8024067C 4600B306 */ mov.s $f12, $f22 -/* B20BC0 80240680 46140002 */ mul.s $f0, $f0, $f20 -/* B20BC4 80240684 00000000 */ nop -/* B20BC8 80240688 864200B0 */ lh $v0, 0xb0($s2) -/* B20BCC 8024068C 3C013F00 */ lui $at, 0x3f00 -/* B20BD0 80240690 44812000 */ mtc1 $at, $f4 -/* B20BD4 80240694 44821000 */ mtc1 $v0, $f2 -/* B20BD8 80240698 00000000 */ nop -/* B20BDC 8024069C 468010A0 */ cvt.s.w $f2, $f2 -/* B20BE0 802406A0 46041082 */ mul.s $f2, $f2, $f4 -/* B20BE4 802406A4 00000000 */ nop -/* B20BE8 802406A8 4600E700 */ add.s $f28, $f28, $f0 -/* B20BEC 802406AC 4602D680 */ add.s $f26, $f26, $f2 -/* B20BF0 802406B0 0C00A8D4 */ jal cos_deg -/* B20BF4 802406B4 4600B306 */ mov.s $f12, $f22 -/* B20BF8 802406B8 46140002 */ mul.s $f0, $f0, $f20 -/* B20BFC 802406BC 00000000 */ nop -/* B20C00 802406C0 0220202D */ daddu $a0, $s1, $zero -/* B20C04 802406C4 0260282D */ daddu $a1, $s3, $zero -/* B20C08 802406C8 4600E18D */ trunc.w.s $f6, $f28 -/* B20C0C 802406CC 44063000 */ mfc1 $a2, $f6 -/* B20C10 802406D0 0C0B2026 */ jal set_variable -/* B20C14 802406D4 4600C601 */ sub.s $f24, $f24, $f0 -/* B20C18 802406D8 0220202D */ daddu $a0, $s1, $zero -/* B20C1C 802406DC 4600D18D */ trunc.w.s $f6, $f26 -/* B20C20 802406E0 44063000 */ mfc1 $a2, $f6 -/* B20C24 802406E4 0C0B2026 */ jal set_variable -/* B20C28 802406E8 0280282D */ daddu $a1, $s4, $zero -/* B20C2C 802406EC 0220202D */ daddu $a0, $s1, $zero -/* B20C30 802406F0 4600C18D */ trunc.w.s $f6, $f24 -/* B20C34 802406F4 44063000 */ mfc1 $a2, $f6 -/* B20C38 802406F8 0C0B2026 */ jal set_variable -/* B20C3C 802406FC 0200282D */ daddu $a1, $s0, $zero -/* B20C40 80240700 8FBF0024 */ lw $ra, 0x24($sp) -/* B20C44 80240704 8FB40020 */ lw $s4, 0x20($sp) -/* B20C48 80240708 8FB3001C */ lw $s3, 0x1c($sp) -/* B20C4C 8024070C 8FB20018 */ lw $s2, 0x18($sp) -/* B20C50 80240710 8FB10014 */ lw $s1, 0x14($sp) -/* B20C54 80240714 8FB00010 */ lw $s0, 0x10($sp) -/* B20C58 80240718 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* B20C5C 8024071C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* B20C60 80240720 D7B80038 */ ldc1 $f24, 0x38($sp) -/* B20C64 80240724 D7B60030 */ ldc1 $f22, 0x30($sp) -/* B20C68 80240728 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B20C6C 8024072C 24020002 */ addiu $v0, $zero, 2 -/* B20C70 80240730 03E00008 */ jr $ra -/* B20C74 80240734 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_80240738_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_80240738_B20540.s deleted file mode 100644 index 48ed16b568..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_80240738_B20540.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240738_B20C78 -/* B20C78 80240738 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B20C7C 8024073C AFBF0010 */ sw $ra, 0x10($sp) -/* B20C80 80240740 10A00003 */ beqz $a1, .L80240750 -/* B20C84 80240744 8C86000C */ lw $a2, 0xc($a0) -/* B20C88 80240748 3C018024 */ lui $at, 0x8024 -/* B20C8C 8024074C AC20242C */ sw $zero, 0x242c($at) -.L80240750: -/* B20C90 80240750 3C038024 */ lui $v1, 0x8024 -/* B20C94 80240754 2463242C */ addiu $v1, $v1, 0x242c -/* B20C98 80240758 8C620000 */ lw $v0, ($v1) -/* B20C9C 8024075C 54400003 */ bnel $v0, $zero, .L8024076C -/* B20CA0 80240760 AC600000 */ sw $zero, ($v1) -/* B20CA4 80240764 080901E0 */ j .L80240780 -/* B20CA8 80240768 0000102D */ daddu $v0, $zero, $zero -.L8024076C: -/* B20CAC 8024076C 8CC50000 */ lw $a1, ($a2) -/* B20CB0 80240770 3C068024 */ lui $a2, 0x8024 -/* B20CB4 80240774 0C0B2026 */ jal set_variable -/* B20CB8 80240778 8CC62430 */ lw $a2, 0x2430($a2) -/* B20CBC 8024077C 24020002 */ addiu $v0, $zero, 2 -.L80240780: -/* B20CC0 80240780 8FBF0010 */ lw $ra, 0x10($sp) -/* B20CC4 80240784 03E00008 */ jr $ra -/* B20CC8 80240788 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_802407C4_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_802407C4_B20540.s deleted file mode 100644 index 147d39b70e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_802407C4_B20540.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407C4_B20D04 -/* B20D04 802407C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B20D08 802407C8 AFBF0010 */ sw $ra, 0x10($sp) -/* B20D0C 802407CC 8C82000C */ lw $v0, 0xc($a0) -/* B20D10 802407D0 0C0B1EAF */ jal get_variable -/* B20D14 802407D4 8C450000 */ lw $a1, ($v0) -/* B20D18 802407D8 0040182D */ daddu $v1, $v0, $zero -/* B20D1C 802407DC 10600012 */ beqz $v1, .L80240828 -/* B20D20 802407E0 0000202D */ daddu $a0, $zero, $zero -/* B20D24 802407E4 8C620000 */ lw $v0, ($v1) -/* B20D28 802407E8 5040000A */ beql $v0, $zero, .L80240814 -/* B20D2C 802407EC 00041080 */ sll $v0, $a0, 2 -/* B20D30 802407F0 3C058024 */ lui $a1, 0x8024 -/* B20D34 802407F4 24A57AF0 */ addiu $a1, $a1, 0x7af0 -.L802407F8: -/* B20D38 802407F8 24630004 */ addiu $v1, $v1, 4 -/* B20D3C 802407FC 24840001 */ addiu $a0, $a0, 1 -/* B20D40 80240800 ACA20000 */ sw $v0, ($a1) -/* B20D44 80240804 8C620000 */ lw $v0, ($v1) -/* B20D48 80240808 1440FFFB */ bnez $v0, .L802407F8 -/* B20D4C 8024080C 24A50004 */ addiu $a1, $a1, 4 -/* B20D50 80240810 00041080 */ sll $v0, $a0, 2 -.L80240814: -/* B20D54 80240814 3C018024 */ lui $at, 0x8024 -/* B20D58 80240818 00220821 */ addu $at, $at, $v0 -/* B20D5C 8024081C AC207AF0 */ sw $zero, 0x7af0($at) -/* B20D60 80240820 08090214 */ j .L80240850 -/* B20D64 80240824 00000000 */ nop -.L80240828: -/* B20D68 80240828 3C038024 */ lui $v1, 0x8024 -/* B20D6C 8024082C 24637AF0 */ addiu $v1, $v1, 0x7af0 -/* B20D70 80240830 0060282D */ daddu $a1, $v1, $zero -.L80240834: -/* B20D74 80240834 24820010 */ addiu $v0, $a0, 0x10 -/* B20D78 80240838 AC620000 */ sw $v0, ($v1) -/* B20D7C 8024083C 24630004 */ addiu $v1, $v1, 4 -/* B20D80 80240840 24840001 */ addiu $a0, $a0, 1 -/* B20D84 80240844 28820070 */ slti $v0, $a0, 0x70 -/* B20D88 80240848 1440FFFA */ bnez $v0, .L80240834 -/* B20D8C 8024084C ACA001C0 */ sw $zero, 0x1c0($a1) -.L80240850: -/* B20D90 80240850 8FBF0010 */ lw $ra, 0x10($sp) -/* B20D94 80240854 24020002 */ addiu $v0, $zero, 2 -/* B20D98 80240858 03E00008 */ jr $ra -/* B20D9C 8024085C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_80240950_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_80240950_B20540.s deleted file mode 100644 index 0e32a5d1ff..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_80240950_B20540.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240950_B20E90 -/* B20E90 80240950 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B20E94 80240954 AFB1001C */ sw $s1, 0x1c($sp) -/* B20E98 80240958 0080882D */ daddu $s1, $a0, $zero -/* B20E9C 8024095C AFBF0034 */ sw $ra, 0x34($sp) -/* B20EA0 80240960 AFB60030 */ sw $s6, 0x30($sp) -/* B20EA4 80240964 AFB5002C */ sw $s5, 0x2c($sp) -/* B20EA8 80240968 AFB40028 */ sw $s4, 0x28($sp) -/* B20EAC 8024096C AFB30024 */ sw $s3, 0x24($sp) -/* B20EB0 80240970 AFB20020 */ sw $s2, 0x20($sp) -/* B20EB4 80240974 AFB00018 */ sw $s0, 0x18($sp) -/* B20EB8 80240978 F7B60040 */ sdc1 $f22, 0x40($sp) -/* B20EBC 8024097C F7B40038 */ sdc1 $f20, 0x38($sp) -/* B20EC0 80240980 8E30000C */ lw $s0, 0xc($s1) -/* B20EC4 80240984 8E160000 */ lw $s6, ($s0) -/* B20EC8 80240988 26100004 */ addiu $s0, $s0, 4 -/* B20ECC 8024098C 0C0B1EAF */ jal get_variable -/* B20ED0 80240990 02C0282D */ daddu $a1, $s6, $zero -/* B20ED4 80240994 44820000 */ mtc1 $v0, $f0 -/* B20ED8 80240998 00000000 */ nop -/* B20EDC 8024099C 46800020 */ cvt.s.w $f0, $f0 -/* B20EE0 802409A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* B20EE4 802409A4 8E140000 */ lw $s4, ($s0) -/* B20EE8 802409A8 26100004 */ addiu $s0, $s0, 4 -/* B20EEC 802409AC 0220202D */ daddu $a0, $s1, $zero -/* B20EF0 802409B0 0C0B1EAF */ jal get_variable -/* B20EF4 802409B4 0280282D */ daddu $a1, $s4, $zero -/* B20EF8 802409B8 0220202D */ daddu $a0, $s1, $zero -/* B20EFC 802409BC 8E150000 */ lw $s5, ($s0) -/* B20F00 802409C0 4482B000 */ mtc1 $v0, $f22 -/* B20F04 802409C4 00000000 */ nop -/* B20F08 802409C8 4680B5A0 */ cvt.s.w $f22, $f22 -/* B20F0C 802409CC 0C0B1EAF */ jal get_variable -/* B20F10 802409D0 02A0282D */ daddu $a1, $s5, $zero -/* B20F14 802409D4 2404FFFC */ addiu $a0, $zero, -4 -/* B20F18 802409D8 44820000 */ mtc1 $v0, $f0 -/* B20F1C 802409DC 00000000 */ nop -/* B20F20 802409E0 46800020 */ cvt.s.w $f0, $f0 -/* B20F24 802409E4 0C00EABB */ jal get_npc_unsafe -/* B20F28 802409E8 E7A00014 */ swc1 $f0, 0x14($sp) -/* B20F2C 802409EC 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* B20F30 802409F0 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* B20F34 802409F4 3C014334 */ lui $at, 0x4334 -/* B20F38 802409F8 44816000 */ mtc1 $at, $f12 -/* B20F3C 802409FC 00041880 */ sll $v1, $a0, 2 -/* B20F40 80240A00 00641821 */ addu $v1, $v1, $a0 -/* B20F44 80240A04 00031880 */ sll $v1, $v1, 2 -/* B20F48 80240A08 00641823 */ subu $v1, $v1, $a0 -/* B20F4C 80240A0C 000320C0 */ sll $a0, $v1, 3 -/* B20F50 80240A10 00641821 */ addu $v1, $v1, $a0 -/* B20F54 80240A14 000318C0 */ sll $v1, $v1, 3 -/* B20F58 80240A18 3C01800B */ lui $at, 0x800b -/* B20F5C 80240A1C 00230821 */ addu $at, $at, $v1 -/* B20F60 80240A20 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* B20F64 80240A24 460C0300 */ add.s $f12, $f0, $f12 -/* B20F68 80240A28 0C00A6C9 */ jal clamp_angle -/* B20F6C 80240A2C 0040982D */ daddu $s3, $v0, $zero -/* B20F70 80240A30 27B00010 */ addiu $s0, $sp, 0x10 -/* B20F74 80240A34 0200202D */ daddu $a0, $s0, $zero -/* B20F78 80240A38 27B20014 */ addiu $s2, $sp, 0x14 -/* B20F7C 80240A3C 0240282D */ daddu $a1, $s2, $zero -/* B20F80 80240A40 3C064170 */ lui $a2, 0x4170 -/* B20F84 80240A44 8E67000C */ lw $a3, 0xc($s3) -/* B20F88 80240A48 0C00A7E7 */ jal add_vec2D_polar -/* B20F8C 80240A4C 46000506 */ mov.s $f20, $f0 -/* B20F90 80240A50 0200202D */ daddu $a0, $s0, $zero -/* B20F94 80240A54 3C064120 */ lui $a2, 0x4120 -/* B20F98 80240A58 4407A000 */ mfc1 $a3, $f20 -/* B20F9C 80240A5C 0C00A7E7 */ jal add_vec2D_polar -/* B20FA0 80240A60 0240282D */ daddu $a1, $s2, $zero -/* B20FA4 80240A64 0220202D */ daddu $a0, $s1, $zero -/* B20FA8 80240A68 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B20FAC 80240A6C 4600008D */ trunc.w.s $f2, $f0 -/* B20FB0 80240A70 44061000 */ mfc1 $a2, $f2 -/* B20FB4 80240A74 0C0B2026 */ jal set_variable -/* B20FB8 80240A78 02C0282D */ daddu $a1, $s6, $zero -/* B20FBC 80240A7C 0220202D */ daddu $a0, $s1, $zero -/* B20FC0 80240A80 4600B08D */ trunc.w.s $f2, $f22 -/* B20FC4 80240A84 44061000 */ mfc1 $a2, $f2 -/* B20FC8 80240A88 0C0B2026 */ jal set_variable -/* B20FCC 80240A8C 0280282D */ daddu $a1, $s4, $zero -/* B20FD0 80240A90 0220202D */ daddu $a0, $s1, $zero -/* B20FD4 80240A94 C7A00014 */ lwc1 $f0, 0x14($sp) -/* B20FD8 80240A98 4600008D */ trunc.w.s $f2, $f0 -/* B20FDC 80240A9C 44061000 */ mfc1 $a2, $f2 -/* B20FE0 80240AA0 0C0B2026 */ jal set_variable -/* B20FE4 80240AA4 02A0282D */ daddu $a1, $s5, $zero -/* B20FE8 80240AA8 8FBF0034 */ lw $ra, 0x34($sp) -/* B20FEC 80240AAC 8FB60030 */ lw $s6, 0x30($sp) -/* B20FF0 80240AB0 8FB5002C */ lw $s5, 0x2c($sp) -/* B20FF4 80240AB4 8FB40028 */ lw $s4, 0x28($sp) -/* B20FF8 80240AB8 8FB30024 */ lw $s3, 0x24($sp) -/* B20FFC 80240ABC 8FB20020 */ lw $s2, 0x20($sp) -/* B21000 80240AC0 8FB1001C */ lw $s1, 0x1c($sp) -/* B21004 80240AC4 8FB00018 */ lw $s0, 0x18($sp) -/* B21008 80240AC8 D7B60040 */ ldc1 $f22, 0x40($sp) -/* B2100C 80240ACC D7B40038 */ ldc1 $f20, 0x38($sp) -/* B21010 80240AD0 24020002 */ addiu $v0, $zero, 2 -/* B21014 80240AD4 03E00008 */ jr $ra -/* B21018 80240AD8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_80240B20_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_80240B20_B20540.s deleted file mode 100644 index af3d199586..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_80240B20_B20540.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B20_B21060 -/* B21060 80240B20 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B21064 80240B24 AFBF0010 */ sw $ra, 0x10($sp) -/* B21068 80240B28 0C00EABB */ jal get_npc_unsafe -/* B2106C 80240B2C 8C84008C */ lw $a0, 0x8c($a0) -/* B21070 80240B30 3C038024 */ lui $v1, 0x8024 -/* B21074 80240B34 8C637CB4 */ lw $v1, 0x7cb4($v1) -/* B21078 80240B38 AC430028 */ sw $v1, 0x28($v0) -/* B2107C 80240B3C 8FBF0010 */ lw $ra, 0x10($sp) -/* B21080 80240B40 24020002 */ addiu $v0, $zero, 2 -/* B21084 80240B44 03E00008 */ jr $ra -/* B21088 80240B48 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_80240B4C_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_80240B4C_B20540.s deleted file mode 100644 index c57c66db89..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_80240B4C_B20540.s +++ /dev/null @@ -1,118 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B4C_B2108C -/* B2108C 80240B4C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B21090 80240B50 AFB20018 */ sw $s2, 0x18($sp) -/* B21094 80240B54 0080902D */ daddu $s2, $a0, $zero -/* B21098 80240B58 AFBF0028 */ sw $ra, 0x28($sp) -/* B2109C 80240B5C AFB50024 */ sw $s5, 0x24($sp) -/* B210A0 80240B60 AFB40020 */ sw $s4, 0x20($sp) -/* B210A4 80240B64 AFB3001C */ sw $s3, 0x1c($sp) -/* B210A8 80240B68 AFB10014 */ sw $s1, 0x14($sp) -/* B210AC 80240B6C AFB00010 */ sw $s0, 0x10($sp) -/* B210B0 80240B70 F7BA0048 */ sdc1 $f26, 0x48($sp) -/* B210B4 80240B74 F7B80040 */ sdc1 $f24, 0x40($sp) -/* B210B8 80240B78 F7B60038 */ sdc1 $f22, 0x38($sp) -/* B210BC 80240B7C F7B40030 */ sdc1 $f20, 0x30($sp) -/* B210C0 80240B80 8E50000C */ lw $s0, 0xc($s2) -/* B210C4 80240B84 4480A000 */ mtc1 $zero, $f20 -/* B210C8 80240B88 8E050000 */ lw $a1, ($s0) -/* B210CC 80240B8C 26100004 */ addiu $s0, $s0, 4 -/* B210D0 80240B90 4600A686 */ mov.s $f26, $f20 -/* B210D4 80240B94 0C0B1EAF */ jal get_variable -/* B210D8 80240B98 4600A606 */ mov.s $f24, $f20 -/* B210DC 80240B9C 8E130000 */ lw $s3, ($s0) -/* B210E0 80240BA0 26100004 */ addiu $s0, $s0, 4 -/* B210E4 80240BA4 0000202D */ daddu $a0, $zero, $zero -/* B210E8 80240BA8 8E140000 */ lw $s4, ($s0) -/* B210EC 80240BAC 8E150004 */ lw $s5, 4($s0) -/* B210F0 80240BB0 0C00EAD2 */ jal get_npc_safe -/* B210F4 80240BB4 0040882D */ daddu $s1, $v0, $zero -/* B210F8 80240BB8 0040802D */ daddu $s0, $v0, $zero -/* B210FC 80240BBC 24020001 */ addiu $v0, $zero, 1 -/* B21100 80240BC0 1222000F */ beq $s1, $v0, .L80240C00 -/* B21104 80240BC4 2A220002 */ slti $v0, $s1, 2 -/* B21108 80240BC8 10400005 */ beqz $v0, .L80240BE0 -/* B2110C 80240BCC 24020002 */ addiu $v0, $zero, 2 -/* B21110 80240BD0 12200007 */ beqz $s1, .L80240BF0 -/* B21114 80240BD4 00000000 */ nop -/* B21118 80240BD8 08090308 */ j .L80240C20 -/* B2111C 80240BDC 00000000 */ nop -.L80240BE0: -/* B21120 80240BE0 1222000B */ beq $s1, $v0, .L80240C10 -/* B21124 80240BE4 00000000 */ nop -/* B21128 80240BE8 08090308 */ j .L80240C20 -/* B2112C 80240BEC 00000000 */ nop -.L80240BF0: -/* B21130 80240BF0 3C014302 */ lui $at, 0x4302 -/* B21134 80240BF4 4481B000 */ mtc1 $at, $f22 -/* B21138 80240BF8 0809030B */ j .L80240C2C -/* B2113C 80240BFC 2A220004 */ slti $v0, $s1, 4 -.L80240C00: -/* B21140 80240C00 3C014320 */ lui $at, 0x4320 -/* B21144 80240C04 4481B000 */ mtc1 $at, $f22 -/* B21148 80240C08 0809030B */ j .L80240C2C -/* B2114C 80240C0C 2A220004 */ slti $v0, $s1, 4 -.L80240C10: -/* B21150 80240C10 3C0142C8 */ lui $at, 0x42c8 -/* B21154 80240C14 4481B000 */ mtc1 $at, $f22 -/* B21158 80240C18 0809030B */ j .L80240C2C -/* B2115C 80240C1C 2A220004 */ slti $v0, $s1, 4 -.L80240C20: -/* B21160 80240C20 3C0142A0 */ lui $at, 0x42a0 -/* B21164 80240C24 4481B000 */ mtc1 $at, $f22 -/* B21168 80240C28 2A220004 */ slti $v0, $s1, 4 -.L80240C2C: -/* B2116C 80240C2C 10400019 */ beqz $v0, .L80240C94 -/* B21170 80240C30 0240202D */ daddu $a0, $s2, $zero -/* B21174 80240C34 C614000C */ lwc1 $f20, 0xc($s0) -/* B21178 80240C38 4600A507 */ neg.s $f20, $f20 -/* B2117C 80240C3C 0C00A8BB */ jal sin_deg -/* B21180 80240C40 4600A306 */ mov.s $f12, $f20 -/* B21184 80240C44 46160002 */ mul.s $f0, $f0, $f22 -/* B21188 80240C48 00000000 */ nop -/* B2118C 80240C4C C6020038 */ lwc1 $f2, 0x38($s0) -/* B21190 80240C50 3C0141F0 */ lui $at, 0x41f0 -/* B21194 80240C54 44812000 */ mtc1 $at, $f4 -/* B21198 80240C58 00000000 */ nop -/* B2119C 80240C5C 46041080 */ add.s $f2, $f2, $f4 -/* B211A0 80240C60 46001680 */ add.s $f26, $f2, $f0 -/* B211A4 80240C64 0C00A8D4 */ jal cos_deg -/* B211A8 80240C68 4600A306 */ mov.s $f12, $f20 -/* B211AC 80240C6C 46160002 */ mul.s $f0, $f0, $f22 -/* B211B0 80240C70 00000000 */ nop -/* B211B4 80240C74 C604003C */ lwc1 $f4, 0x3c($s0) -/* B211B8 80240C78 3C014248 */ lui $at, 0x4248 -/* B211BC 80240C7C 44811000 */ mtc1 $at, $f2 -/* B211C0 80240C80 00000000 */ nop -/* B211C4 80240C84 46022500 */ add.s $f20, $f4, $f2 -/* B211C8 80240C88 C6020040 */ lwc1 $f2, 0x40($s0) -/* B211CC 80240C8C 46001600 */ add.s $f24, $f2, $f0 -/* B211D0 80240C90 0240202D */ daddu $a0, $s2, $zero -.L80240C94: -/* B211D4 80240C94 4406D000 */ mfc1 $a2, $f26 -/* B211D8 80240C98 0C0B2190 */ jal set_float_variable -/* B211DC 80240C9C 0260282D */ daddu $a1, $s3, $zero -/* B211E0 80240CA0 0240202D */ daddu $a0, $s2, $zero -/* B211E4 80240CA4 4406A000 */ mfc1 $a2, $f20 -/* B211E8 80240CA8 0C0B2190 */ jal set_float_variable -/* B211EC 80240CAC 0280282D */ daddu $a1, $s4, $zero -/* B211F0 80240CB0 0240202D */ daddu $a0, $s2, $zero -/* B211F4 80240CB4 4406C000 */ mfc1 $a2, $f24 -/* B211F8 80240CB8 0C0B2190 */ jal set_float_variable -/* B211FC 80240CBC 02A0282D */ daddu $a1, $s5, $zero -/* B21200 80240CC0 8FBF0028 */ lw $ra, 0x28($sp) -/* B21204 80240CC4 8FB50024 */ lw $s5, 0x24($sp) -/* B21208 80240CC8 8FB40020 */ lw $s4, 0x20($sp) -/* B2120C 80240CCC 8FB3001C */ lw $s3, 0x1c($sp) -/* B21210 80240CD0 8FB20018 */ lw $s2, 0x18($sp) -/* B21214 80240CD4 8FB10014 */ lw $s1, 0x14($sp) -/* B21218 80240CD8 8FB00010 */ lw $s0, 0x10($sp) -/* B2121C 80240CDC D7BA0048 */ ldc1 $f26, 0x48($sp) -/* B21220 80240CE0 D7B80040 */ ldc1 $f24, 0x40($sp) -/* B21224 80240CE4 D7B60038 */ ldc1 $f22, 0x38($sp) -/* B21228 80240CE8 D7B40030 */ ldc1 $f20, 0x30($sp) -/* B2122C 80240CEC 24020002 */ addiu $v0, $zero, 2 -/* B21230 80240CF0 03E00008 */ jr $ra -/* B21234 80240CF4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_80240CF8_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_80240CF8_B20540.s deleted file mode 100644 index 0c5473ea93..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_80240CF8_B20540.s +++ /dev/null @@ -1,150 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CF8_B21238 -/* B21238 80240CF8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B2123C 80240CFC AFB3001C */ sw $s3, 0x1c($sp) -/* B21240 80240D00 0080982D */ daddu $s3, $a0, $zero -/* B21244 80240D04 AFB00010 */ sw $s0, 0x10($sp) -/* B21248 80240D08 00A0802D */ daddu $s0, $a1, $zero -/* B2124C 80240D0C AFBF0020 */ sw $ra, 0x20($sp) -/* B21250 80240D10 AFB20018 */ sw $s2, 0x18($sp) -/* B21254 80240D14 AFB10014 */ sw $s1, 0x14($sp) -/* B21258 80240D18 F7B80038 */ sdc1 $f24, 0x38($sp) -/* B2125C 80240D1C F7B60030 */ sdc1 $f22, 0x30($sp) -/* B21260 80240D20 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B21264 80240D24 8E72000C */ lw $s2, 0xc($s3) -/* B21268 80240D28 0C00EAD2 */ jal get_npc_safe -/* B2126C 80240D2C 0000202D */ daddu $a0, $zero, $zero -/* B21270 80240D30 12000010 */ beqz $s0, .L80240D74 -/* B21274 80240D34 0040882D */ daddu $s1, $v0, $zero -/* B21278 80240D38 8E450000 */ lw $a1, ($s2) -/* B2127C 80240D3C 0C0B1EAF */ jal get_variable -/* B21280 80240D40 0260202D */ daddu $a0, $s3, $zero -/* B21284 80240D44 0040182D */ daddu $v1, $v0, $zero -/* B21288 80240D48 10600006 */ beqz $v1, .L80240D64 -/* B2128C 80240D4C AE630070 */ sw $v1, 0x70($s3) -/* B21290 80240D50 24020001 */ addiu $v0, $zero, 1 -/* B21294 80240D54 10620005 */ beq $v1, $v0, .L80240D6C -/* B21298 80240D58 24020019 */ addiu $v0, $zero, 0x19 -/* B2129C 80240D5C 0809035D */ j .L80240D74 -/* B212A0 80240D60 AE620074 */ sw $v0, 0x74($s3) -.L80240D64: -/* B212A4 80240D64 0809035C */ j .L80240D70 -/* B212A8 80240D68 24020037 */ addiu $v0, $zero, 0x37 -.L80240D6C: -/* B212AC 80240D6C 24020055 */ addiu $v0, $zero, 0x55 -.L80240D70: -/* B212B0 80240D70 AE620074 */ sw $v0, 0x74($s3) -.L80240D74: -/* B212B4 80240D74 C634000C */ lwc1 $f20, 0xc($s1) -/* B212B8 80240D78 C6760074 */ lwc1 $f22, 0x74($s3) -/* B212BC 80240D7C 4680B5A0 */ cvt.s.w $f22, $f22 -/* B212C0 80240D80 4600A507 */ neg.s $f20, $f20 -/* B212C4 80240D84 0C00A8BB */ jal sin_deg -/* B212C8 80240D88 4600A306 */ mov.s $f12, $f20 -/* B212CC 80240D8C 46160002 */ mul.s $f0, $f0, $f22 -/* B212D0 80240D90 00000000 */ nop -/* B212D4 80240D94 C6220038 */ lwc1 $f2, 0x38($s1) -/* B212D8 80240D98 3C0141F0 */ lui $at, 0x41f0 -/* B212DC 80240D9C 44812000 */ mtc1 $at, $f4 -/* B212E0 80240DA0 00000000 */ nop -/* B212E4 80240DA4 46041080 */ add.s $f2, $f2, $f4 -/* B212E8 80240DA8 3C014296 */ lui $at, 0x4296 -/* B212EC 80240DAC 44812000 */ mtc1 $at, $f4 -/* B212F0 80240DB0 00000000 */ nop -/* B212F4 80240DB4 46041081 */ sub.s $f2, $f2, $f4 -/* B212F8 80240DB8 46001600 */ add.s $f24, $f2, $f0 -/* B212FC 80240DBC 0C00A8D4 */ jal cos_deg -/* B21300 80240DC0 4600A306 */ mov.s $f12, $f20 -/* B21304 80240DC4 46160002 */ mul.s $f0, $f0, $f22 -/* B21308 80240DC8 00000000 */ nop -/* B2130C 80240DCC 24020001 */ addiu $v0, $zero, 1 -/* B21310 80240DD0 C6220040 */ lwc1 $f2, 0x40($s1) -/* B21314 80240DD4 C624003C */ lwc1 $f4, 0x3c($s1) -/* B21318 80240DD8 46001580 */ add.s $f22, $f2, $f0 -/* B2131C 80240DDC 3C014248 */ lui $at, 0x4248 -/* B21320 80240DE0 44810000 */ mtc1 $at, $f0 -/* B21324 80240DE4 8E640070 */ lw $a0, 0x70($s3) -/* B21328 80240DE8 1082001C */ beq $a0, $v0, .L80240E5C -/* B2132C 80240DEC 46002500 */ add.s $f20, $f4, $f0 -/* B21330 80240DF0 28820002 */ slti $v0, $a0, 2 -/* B21334 80240DF4 10400005 */ beqz $v0, .L80240E0C -/* B21338 80240DF8 24020002 */ addiu $v0, $zero, 2 -/* B2133C 80240DFC 10800007 */ beqz $a0, .L80240E1C -/* B21340 80240E00 0000102D */ daddu $v0, $zero, $zero -/* B21344 80240E04 080903BB */ j .L80240EEC -/* B21348 80240E08 00000000 */ nop -.L80240E0C: -/* B2134C 80240E0C 10820027 */ beq $a0, $v0, .L80240EAC -/* B21350 80240E10 0000102D */ daddu $v0, $zero, $zero -/* B21354 80240E14 080903BB */ j .L80240EEC -/* B21358 80240E18 00000000 */ nop -.L80240E1C: -/* B2135C 80240E1C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* B21360 80240E20 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* B21364 80240E24 3C030001 */ lui $v1, 1 -/* B21368 80240E28 E4580028 */ swc1 $f24, 0x28($v0) -/* B2136C 80240E2C E454002C */ swc1 $f20, 0x2c($v0) -/* B21370 80240E30 E4560030 */ swc1 $f22, 0x30($v0) -/* B21374 80240E34 C6200038 */ lwc1 $f0, 0x38($s1) -/* B21378 80240E38 C622003C */ lwc1 $f2, 0x3c($s1) -/* B2137C 80240E3C 8E220000 */ lw $v0, ($s1) -/* B21380 80240E40 C6240040 */ lwc1 $f4, 0x40($s1) -/* B21384 80240E44 00431025 */ or $v0, $v0, $v1 -/* B21388 80240E48 E620006C */ swc1 $f0, 0x6c($s1) -/* B2138C 80240E4C E6220070 */ swc1 $f2, 0x70($s1) -/* B21390 80240E50 E6240074 */ swc1 $f4, 0x74($s1) -/* B21394 80240E54 080903BA */ j .L80240EE8 -/* B21398 80240E58 AE220000 */ sw $v0, ($s1) -.L80240E5C: -/* B2139C 80240E5C 0C00EAD2 */ jal get_npc_safe -/* B213A0 80240E60 2404FFFC */ addiu $a0, $zero, -4 -/* B213A4 80240E64 0040202D */ daddu $a0, $v0, $zero -/* B213A8 80240E68 54800003 */ bnel $a0, $zero, .L80240E78 -/* B213AC 80240E6C E4980038 */ swc1 $f24, 0x38($a0) -/* B213B0 80240E70 080903BB */ j .L80240EEC -/* B213B4 80240E74 24020002 */ addiu $v0, $zero, 2 -.L80240E78: -/* B213B8 80240E78 4600C006 */ mov.s $f0, $f24 -/* B213BC 80240E7C E494003C */ swc1 $f20, 0x3c($a0) -/* B213C0 80240E80 4600A086 */ mov.s $f2, $f20 -/* B213C4 80240E84 E4960040 */ swc1 $f22, 0x40($a0) -/* B213C8 80240E88 4600B106 */ mov.s $f4, $f22 -/* B213CC 80240E8C 8C820000 */ lw $v0, ($a0) -/* B213D0 80240E90 3C030001 */ lui $v1, 1 -/* B213D4 80240E94 E480006C */ swc1 $f0, 0x6c($a0) -/* B213D8 80240E98 E4820070 */ swc1 $f2, 0x70($a0) -/* B213DC 80240E9C E4840074 */ swc1 $f4, 0x74($a0) -/* B213E0 80240EA0 00431025 */ or $v0, $v0, $v1 -/* B213E4 80240EA4 080903BA */ j .L80240EE8 -/* B213E8 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* B213EC 80240EAC 0C00EAD2 */ jal get_npc_safe -/* B213F0 80240EB0 24040001 */ addiu $a0, $zero, 1 -/* B213F4 80240EB4 E4580038 */ swc1 $f24, 0x38($v0) -/* B213F8 80240EB8 4600C006 */ mov.s $f0, $f24 -/* B213FC 80240EBC E454003C */ swc1 $f20, 0x3c($v0) -/* B21400 80240EC0 4600A086 */ mov.s $f2, $f20 -/* B21404 80240EC4 E4560040 */ swc1 $f22, 0x40($v0) -/* B21408 80240EC8 4600B106 */ mov.s $f4, $f22 -/* B2140C 80240ECC 8C430000 */ lw $v1, ($v0) -/* B21410 80240ED0 3C040001 */ lui $a0, 1 -/* B21414 80240ED4 E440006C */ swc1 $f0, 0x6c($v0) -/* B21418 80240ED8 E4420070 */ swc1 $f2, 0x70($v0) -/* B2141C 80240EDC E4440074 */ swc1 $f4, 0x74($v0) -/* B21420 80240EE0 00641825 */ or $v1, $v1, $a0 -/* B21424 80240EE4 AC430000 */ sw $v1, ($v0) -.L80240EE8: -/* B21428 80240EE8 0000102D */ daddu $v0, $zero, $zero -.L80240EEC: -/* B2142C 80240EEC 8FBF0020 */ lw $ra, 0x20($sp) -/* B21430 80240EF0 8FB3001C */ lw $s3, 0x1c($sp) -/* B21434 80240EF4 8FB20018 */ lw $s2, 0x18($sp) -/* B21438 80240EF8 8FB10014 */ lw $s1, 0x14($sp) -/* B2143C 80240EFC 8FB00010 */ lw $s0, 0x10($sp) -/* B21440 80240F00 D7B80038 */ ldc1 $f24, 0x38($sp) -/* B21444 80240F04 D7B60030 */ ldc1 $f22, 0x30($sp) -/* B21448 80240F08 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B2144C 80240F0C 03E00008 */ jr $ra -/* B21450 80240F10 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_80241134_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_80241134_B20540.s deleted file mode 100644 index a39f0e37eb..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_80241134_B20540.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241134_B21674 -/* B21674 80241134 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B21678 80241138 AFBF0018 */ sw $ra, 0x18($sp) -/* B2167C 8024113C 0C00EAD2 */ jal get_npc_safe -/* B21680 80241140 24040002 */ addiu $a0, $zero, 2 -/* B21684 80241144 C4420040 */ lwc1 $f2, 0x40($v0) -/* B21688 80241148 3C0141A0 */ lui $at, 0x41a0 -/* B2168C 8024114C 44810000 */ mtc1 $at, $f0 -/* B21690 80241150 C444003C */ lwc1 $f4, 0x3c($v0) -/* B21694 80241154 46001081 */ sub.s $f2, $f2, $f0 -/* B21698 80241158 44803000 */ mtc1 $zero, $f6 -/* B2169C 8024115C 00000000 */ nop -/* B216A0 80241160 4606203C */ c.lt.s $f4, $f6 -/* B216A4 80241164 C4400038 */ lwc1 $f0, 0x38($v0) -/* B216A8 80241168 45000006 */ bc1f .L80241184 -/* B216AC 8024116C 0000202D */ daddu $a0, $zero, $zero -/* B216B0 80241170 44050000 */ mfc1 $a1, $f0 -/* B216B4 80241174 44062000 */ mfc1 $a2, $f4 -/* B216B8 80241178 44071000 */ mfc1 $a3, $f2 -/* B216BC 8024117C 0C01C16C */ jal func_800705B0 -/* B216C0 80241180 E7A60010 */ swc1 $f6, 0x10($sp) -.L80241184: -/* B216C4 80241184 8FBF0018 */ lw $ra, 0x18($sp) -/* B216C8 80241188 0000102D */ daddu $v0, $zero, $zero -/* B216CC 8024118C 03E00008 */ jr $ra -/* B216D0 80241190 27BD0020 */ addiu $sp, $sp, 0x20 -/* B216D4 80241194 00000000 */ nop -/* B216D8 80241198 00000000 */ nop -/* B216DC 8024119C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_802411A0_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_802411A0_B20540.s deleted file mode 100644 index f26212db3f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_802411A0_B20540.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411A0_B216E0 -/* B216E0 802411A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B216E4 802411A4 0080182D */ daddu $v1, $a0, $zero -/* B216E8 802411A8 00A0202D */ daddu $a0, $a1, $zero -/* B216EC 802411AC 2402FFFF */ addiu $v0, $zero, -1 -/* B216F0 802411B0 14820004 */ bne $a0, $v0, .L802411C4 -/* B216F4 802411B4 AFBF0010 */ sw $ra, 0x10($sp) -/* B216F8 802411B8 8C64014C */ lw $a0, 0x14c($v1) -/* B216FC 802411BC 08090476 */ j .L802411D8 -/* B21700 802411C0 00000000 */ nop -.L802411C4: -/* B21704 802411C4 3C02EFE8 */ lui $v0, 0xefe8 -/* B21708 802411C8 34422080 */ ori $v0, $v0, 0x2080 -/* B2170C 802411CC 0082102A */ slt $v0, $a0, $v0 -/* B21710 802411D0 14400003 */ bnez $v0, .L802411E0 -/* B21714 802411D4 0080102D */ daddu $v0, $a0, $zero -.L802411D8: -/* B21718 802411D8 0C00EAD2 */ jal get_npc_safe -/* B2171C 802411DC 00000000 */ nop -.L802411E0: -/* B21720 802411E0 8FBF0010 */ lw $ra, 0x10($sp) -/* B21724 802411E4 03E00008 */ jr $ra -/* B21728 802411E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_802415B0_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_802415B0_B20540.s deleted file mode 100644 index 43b0b1a89d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_802415B0_B20540.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415B0_B21AF0 -/* B21AF0 802415B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B21AF4 802415B4 24040001 */ addiu $a0, $zero, 1 -/* B21AF8 802415B8 27A50010 */ addiu $a1, $sp, 0x10 -/* B21AFC 802415BC 27A60014 */ addiu $a2, $sp, 0x14 -/* B21B00 802415C0 27A70018 */ addiu $a3, $sp, 0x18 -/* B21B04 802415C4 AFBF0028 */ sw $ra, 0x28($sp) -/* B21B08 802415C8 AFB10024 */ sw $s1, 0x24($sp) -/* B21B0C 802415CC 0C0470AC */ jal func_8011C2B0 -/* B21B10 802415D0 AFB00020 */ sw $s0, 0x20($sp) -/* B21B14 802415D4 3C118024 */ lui $s1, 0x8024 -/* B21B18 802415D8 26315954 */ addiu $s1, $s1, 0x5954 -/* B21B1C 802415DC 8FA40010 */ lw $a0, 0x10($sp) -/* B21B20 802415E0 8FA50014 */ lw $a1, 0x14($sp) -/* B21B24 802415E4 8FA60018 */ lw $a2, 0x18($sp) -/* B21B28 802415E8 0C0904CE */ jal func_80241338 -/* B21B2C 802415EC 0220382D */ daddu $a3, $s1, $zero -/* B21B30 802415F0 3C03800A */ lui $v1, 0x800a -/* B21B34 802415F4 2463A66C */ addiu $v1, $v1, -0x5994 -/* B21B38 802415F8 8C620000 */ lw $v0, ($v1) -/* B21B3C 802415FC 24040001 */ addiu $a0, $zero, 1 -/* B21B40 80241600 0040802D */ daddu $s0, $v0, $zero -/* B21B44 80241604 24420008 */ addiu $v0, $v0, 8 -/* B21B48 80241608 AC620000 */ sw $v0, ($v1) -/* B21B4C 8024160C 3C02DE00 */ lui $v0, 0xde00 -/* B21B50 80241610 0C0470BB */ jal func_8011C2EC -/* B21B54 80241614 AE020000 */ sw $v0, ($s0) -/* B21B58 80241618 8E230000 */ lw $v1, ($s1) -/* B21B5C 8024161C 04600003 */ bltz $v1, .L8024162C -/* B21B60 80241620 AE020004 */ sw $v0, 4($s0) -/* B21B64 80241624 24620004 */ addiu $v0, $v1, 4 -/* B21B68 80241628 AE220000 */ sw $v0, ($s1) -.L8024162C: -/* B21B6C 8024162C 8E220000 */ lw $v0, ($s1) -/* B21B70 80241630 28420168 */ slti $v0, $v0, 0x168 -/* B21B74 80241634 14400002 */ bnez $v0, .L80241640 -/* B21B78 80241638 2402FFFF */ addiu $v0, $zero, -1 -/* B21B7C 8024163C AE220000 */ sw $v0, ($s1) -.L80241640: -/* B21B80 80241640 8FBF0028 */ lw $ra, 0x28($sp) -/* B21B84 80241644 8FB10024 */ lw $s1, 0x24($sp) -/* B21B88 80241648 8FB00020 */ lw $s0, 0x20($sp) -/* B21B8C 8024164C 03E00008 */ jr $ra -/* B21B90 80241650 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_80241654_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_80241654_B20540.s deleted file mode 100644 index 6f4918340d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_80241654_B20540.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241654_B21B94 -/* B21B94 80241654 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B21B98 80241658 24040002 */ addiu $a0, $zero, 2 -/* B21B9C 8024165C 27A50010 */ addiu $a1, $sp, 0x10 -/* B21BA0 80241660 27A60014 */ addiu $a2, $sp, 0x14 -/* B21BA4 80241664 27A70018 */ addiu $a3, $sp, 0x18 -/* B21BA8 80241668 AFBF0028 */ sw $ra, 0x28($sp) -/* B21BAC 8024166C AFB10024 */ sw $s1, 0x24($sp) -/* B21BB0 80241670 0C0470AC */ jal func_8011C2B0 -/* B21BB4 80241674 AFB00020 */ sw $s0, 0x20($sp) -/* B21BB8 80241678 3C118024 */ lui $s1, 0x8024 -/* B21BBC 8024167C 26315958 */ addiu $s1, $s1, 0x5958 -/* B21BC0 80241680 8FA40010 */ lw $a0, 0x10($sp) -/* B21BC4 80241684 8FA50014 */ lw $a1, 0x14($sp) -/* B21BC8 80241688 8FA60018 */ lw $a2, 0x18($sp) -/* B21BCC 8024168C 0C0904CE */ jal func_80241338 -/* B21BD0 80241690 0220382D */ daddu $a3, $s1, $zero -/* B21BD4 80241694 3C03800A */ lui $v1, 0x800a -/* B21BD8 80241698 2463A66C */ addiu $v1, $v1, -0x5994 -/* B21BDC 8024169C 8C620000 */ lw $v0, ($v1) -/* B21BE0 802416A0 24040002 */ addiu $a0, $zero, 2 -/* B21BE4 802416A4 0040802D */ daddu $s0, $v0, $zero -/* B21BE8 802416A8 24420008 */ addiu $v0, $v0, 8 -/* B21BEC 802416AC AC620000 */ sw $v0, ($v1) -/* B21BF0 802416B0 3C02DE00 */ lui $v0, 0xde00 -/* B21BF4 802416B4 0C0470BB */ jal func_8011C2EC -/* B21BF8 802416B8 AE020000 */ sw $v0, ($s0) -/* B21BFC 802416BC 8E230000 */ lw $v1, ($s1) -/* B21C00 802416C0 04600003 */ bltz $v1, .L802416D0 -/* B21C04 802416C4 AE020004 */ sw $v0, 4($s0) -/* B21C08 802416C8 24620004 */ addiu $v0, $v1, 4 -/* B21C0C 802416CC AE220000 */ sw $v0, ($s1) -.L802416D0: -/* B21C10 802416D0 8E220000 */ lw $v0, ($s1) -/* B21C14 802416D4 28420168 */ slti $v0, $v0, 0x168 -/* B21C18 802416D8 14400002 */ bnez $v0, .L802416E4 -/* B21C1C 802416DC 2402FFFF */ addiu $v0, $zero, -1 -/* B21C20 802416E0 AE220000 */ sw $v0, ($s1) -.L802416E4: -/* B21C24 802416E4 8FBF0028 */ lw $ra, 0x28($sp) -/* B21C28 802416E8 8FB10024 */ lw $s1, 0x24($sp) -/* B21C2C 802416EC 8FB00020 */ lw $s0, 0x20($sp) -/* B21C30 802416F0 03E00008 */ jr $ra -/* B21C34 802416F4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_80241960_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_80241960_B20540.s deleted file mode 100644 index f4c1ddf97c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_80241960_B20540.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241960_B21EA0 -/* B21EA0 80241960 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B21EA4 80241964 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B21EA8 80241968 4485A000 */ mtc1 $a1, $f20 -/* B21EAC 8024196C F7B60020 */ sdc1 $f22, 0x20($sp) -/* B21EB0 80241970 4486B000 */ mtc1 $a2, $f22 -/* B21EB4 80241974 AFB00010 */ sw $s0, 0x10($sp) -/* B21EB8 80241978 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B21EBC 8024197C 4487C000 */ mtc1 $a3, $f24 -/* B21EC0 80241980 AFBF0014 */ sw $ra, 0x14($sp) -/* B21EC4 80241984 0C019D28 */ jal guMtxIdentF -/* B21EC8 80241988 0080802D */ daddu $s0, $a0, $zero -/* B21ECC 8024198C 4616A582 */ mul.s $f22, $f20, $f22 -/* B21ED0 80241990 00000000 */ nop -/* B21ED4 80241994 4618A502 */ mul.s $f20, $f20, $f24 -/* B21ED8 80241998 00000000 */ nop -/* B21EDC 8024199C 3C013F80 */ lui $at, 0x3f80 -/* B21EE0 802419A0 44810000 */ mtc1 $at, $f0 -/* B21EE4 802419A4 00000000 */ nop -/* B21EE8 802419A8 E6000014 */ swc1 $f0, 0x14($s0) -/* B21EEC 802419AC E6160010 */ swc1 $f22, 0x10($s0) -/* B21EF0 802419B0 E6140018 */ swc1 $f20, 0x18($s0) -/* B21EF4 802419B4 8FBF0014 */ lw $ra, 0x14($sp) -/* B21EF8 802419B8 8FB00010 */ lw $s0, 0x10($sp) -/* B21EFC 802419BC D7B80028 */ ldc1 $f24, 0x28($sp) -/* B21F00 802419C0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B21F04 802419C4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B21F08 802419C8 03E00008 */ jr $ra -/* B21F0C 802419CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_00/func_802419D0_B20540.s b/asm/nonmatchings/world/area_jan/jan_00/func_802419D0_B20540.s deleted file mode 100644 index 9c473e0b25..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/func_802419D0_B20540.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419D0_B21F10 -/* B21F10 802419D0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B21F14 802419D4 AFB10054 */ sw $s1, 0x54($sp) -/* B21F18 802419D8 0080882D */ daddu $s1, $a0, $zero -/* B21F1C 802419DC AFBF005C */ sw $ra, 0x5c($sp) -/* B21F20 802419E0 AFB20058 */ sw $s2, 0x58($sp) -/* B21F24 802419E4 AFB00050 */ sw $s0, 0x50($sp) -/* B21F28 802419E8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B21F2C 802419EC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B21F30 802419F0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B21F34 802419F4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B21F38 802419F8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B21F3C 802419FC 8E30000C */ lw $s0, 0xc($s1) -/* B21F40 80241A00 8E050000 */ lw $a1, ($s0) -/* B21F44 80241A04 0C0B1EAF */ jal get_variable -/* B21F48 80241A08 26100004 */ addiu $s0, $s0, 4 -/* B21F4C 80241A0C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B21F50 80241A10 0040202D */ daddu $a0, $v0, $zero -/* B21F54 80241A14 8E050000 */ lw $a1, ($s0) -/* B21F58 80241A18 26100004 */ addiu $s0, $s0, 4 -/* B21F5C 80241A1C 0220202D */ daddu $a0, $s1, $zero -/* B21F60 80241A20 0C0B210B */ jal get_float_variable -/* B21F64 80241A24 0040902D */ daddu $s2, $v0, $zero -/* B21F68 80241A28 8E050000 */ lw $a1, ($s0) -/* B21F6C 80241A2C 26100004 */ addiu $s0, $s0, 4 -/* B21F70 80241A30 0220202D */ daddu $a0, $s1, $zero -/* B21F74 80241A34 0C0B210B */ jal get_float_variable -/* B21F78 80241A38 46000706 */ mov.s $f28, $f0 -/* B21F7C 80241A3C 8E050000 */ lw $a1, ($s0) -/* B21F80 80241A40 26100004 */ addiu $s0, $s0, 4 -/* B21F84 80241A44 0220202D */ daddu $a0, $s1, $zero -/* B21F88 80241A48 0C0B210B */ jal get_float_variable -/* B21F8C 80241A4C 46000686 */ mov.s $f26, $f0 -/* B21F90 80241A50 0220202D */ daddu $a0, $s1, $zero -/* B21F94 80241A54 8E050000 */ lw $a1, ($s0) -/* B21F98 80241A58 0C0B210B */ jal get_float_variable -/* B21F9C 80241A5C 46000586 */ mov.s $f22, $f0 -/* B21FA0 80241A60 0240202D */ daddu $a0, $s2, $zero -/* B21FA4 80241A64 0C046B4C */ jal get_model_from_list_index -/* B21FA8 80241A68 46000606 */ mov.s $f24, $f0 -/* B21FAC 80241A6C 0040882D */ daddu $s1, $v0, $zero -/* B21FB0 80241A70 96220000 */ lhu $v0, ($s1) -/* B21FB4 80241A74 30420400 */ andi $v0, $v0, 0x400 -/* B21FB8 80241A78 1440001E */ bnez $v0, .L80241AF4 -/* B21FBC 80241A7C 26300058 */ addiu $s0, $s1, 0x58 -/* B21FC0 80241A80 4480A000 */ mtc1 $zero, $f20 -/* B21FC4 80241A84 4406B000 */ mfc1 $a2, $f22 -/* B21FC8 80241A88 4405A000 */ mfc1 $a1, $f20 -/* B21FCC 80241A8C 4407A000 */ mfc1 $a3, $f20 -/* B21FD0 80241A90 0C019E40 */ jal guTranslateF -/* B21FD4 80241A94 0200202D */ daddu $a0, $s0, $zero -/* B21FD8 80241A98 4405E000 */ mfc1 $a1, $f28 -/* B21FDC 80241A9C 4406D000 */ mfc1 $a2, $f26 -/* B21FE0 80241AA0 4407C000 */ mfc1 $a3, $f24 -/* B21FE4 80241AA4 0C090658 */ jal func_80241960 -/* B21FE8 80241AA8 27A40010 */ addiu $a0, $sp, 0x10 -/* B21FEC 80241AAC 27A40010 */ addiu $a0, $sp, 0x10 -/* B21FF0 80241AB0 0200282D */ daddu $a1, $s0, $zero -/* B21FF4 80241AB4 0C019D80 */ jal guMtxCatF -/* B21FF8 80241AB8 0200302D */ daddu $a2, $s0, $zero -/* B21FFC 80241ABC 27A40010 */ addiu $a0, $sp, 0x10 -/* B22000 80241AC0 4600B587 */ neg.s $f22, $f22 -/* B22004 80241AC4 4405A000 */ mfc1 $a1, $f20 -/* B22008 80241AC8 4406B000 */ mfc1 $a2, $f22 -/* B2200C 80241ACC 0C019E40 */ jal guTranslateF -/* B22010 80241AD0 00A0382D */ daddu $a3, $a1, $zero -/* B22014 80241AD4 27A40010 */ addiu $a0, $sp, 0x10 -/* B22018 80241AD8 0200282D */ daddu $a1, $s0, $zero -/* B2201C 80241ADC 0C019D80 */ jal guMtxCatF -/* B22020 80241AE0 00A0302D */ daddu $a2, $a1, $zero -/* B22024 80241AE4 96220000 */ lhu $v0, ($s1) -/* B22028 80241AE8 34421400 */ ori $v0, $v0, 0x1400 -/* B2202C 80241AEC 080906DB */ j .L80241B6C -/* B22030 80241AF0 A6220000 */ sh $v0, ($s1) -.L80241AF4: -/* B22034 80241AF4 4480A000 */ mtc1 $zero, $f20 -/* B22038 80241AF8 4406B000 */ mfc1 $a2, $f22 -/* B2203C 80241AFC 4405A000 */ mfc1 $a1, $f20 -/* B22040 80241B00 4407A000 */ mfc1 $a3, $f20 -/* B22044 80241B04 0C019E40 */ jal guTranslateF -/* B22048 80241B08 27A40010 */ addiu $a0, $sp, 0x10 -/* B2204C 80241B0C 27A40010 */ addiu $a0, $sp, 0x10 -/* B22050 80241B10 26300058 */ addiu $s0, $s1, 0x58 -/* B22054 80241B14 0200282D */ daddu $a1, $s0, $zero -/* B22058 80241B18 0C019D80 */ jal guMtxCatF -/* B2205C 80241B1C 0200302D */ daddu $a2, $s0, $zero -/* B22060 80241B20 4405E000 */ mfc1 $a1, $f28 -/* B22064 80241B24 4406D000 */ mfc1 $a2, $f26 -/* B22068 80241B28 4407C000 */ mfc1 $a3, $f24 -/* B2206C 80241B2C 0C090658 */ jal func_80241960 -/* B22070 80241B30 27A40010 */ addiu $a0, $sp, 0x10 -/* B22074 80241B34 27A40010 */ addiu $a0, $sp, 0x10 -/* B22078 80241B38 0200282D */ daddu $a1, $s0, $zero -/* B2207C 80241B3C 0C019D80 */ jal guMtxCatF -/* B22080 80241B40 0200302D */ daddu $a2, $s0, $zero -/* B22084 80241B44 27A40010 */ addiu $a0, $sp, 0x10 -/* B22088 80241B48 4600B587 */ neg.s $f22, $f22 -/* B2208C 80241B4C 4405A000 */ mfc1 $a1, $f20 -/* B22090 80241B50 4406B000 */ mfc1 $a2, $f22 -/* B22094 80241B54 0C019E40 */ jal guTranslateF -/* B22098 80241B58 00A0382D */ daddu $a3, $a1, $zero -/* B2209C 80241B5C 27A40010 */ addiu $a0, $sp, 0x10 -/* B220A0 80241B60 0200282D */ daddu $a1, $s0, $zero -/* B220A4 80241B64 0C019D80 */ jal guMtxCatF -/* B220A8 80241B68 00A0302D */ daddu $a2, $a1, $zero -.L80241B6C: -/* B220AC 80241B6C 8FBF005C */ lw $ra, 0x5c($sp) -/* B220B0 80241B70 8FB20058 */ lw $s2, 0x58($sp) -/* B220B4 80241B74 8FB10054 */ lw $s1, 0x54($sp) -/* B220B8 80241B78 8FB00050 */ lw $s0, 0x50($sp) -/* B220BC 80241B7C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B220C0 80241B80 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B220C4 80241B84 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B220C8 80241B88 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B220CC 80241B8C D7B40060 */ ldc1 $f20, 0x60($sp) -/* B220D0 80241B90 24020002 */ addiu $v0, $zero, 2 -/* B220D4 80241B94 03E00008 */ jr $ra -/* B220D8 80241B98 27BD0088 */ addiu $sp, $sp, 0x88 -/* B220DC 80241B9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_01/func_80240124_B28030.s b/asm/nonmatchings/world/area_jan/jan_01/func_80240124_B28030.s deleted file mode 100644 index df7324b32a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/func_80240124_B28030.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_B28154 -/* B28154 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B28158 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* B2815C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* B28160 80240130 10A00005 */ beqz $a1, .L80240148 -/* B28164 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* B28168 80240138 AE000070 */ sw $zero, 0x70($s0) -/* B2816C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* B28170 80240140 AE000078 */ sw $zero, 0x78($s0) -/* B28174 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* B28178 80240148 8E020070 */ lw $v0, 0x70($s0) -/* B2817C 8024014C 1440000E */ bnez $v0, .L80240188 -/* B28180 80240150 00000000 */ nop -/* B28184 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* B28188 80240158 8E020088 */ lw $v0, 0x88($s0) -/* B2818C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* B28190 80240160 04610004 */ bgez $v1, .L80240174 -/* B28194 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* B28198 80240168 3C020002 */ lui $v0, 2 -/* B2819C 8024016C 08090061 */ j .L80240184 -/* B281A0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* B281A4 80240174 3C040002 */ lui $a0, 2 -/* B281A8 80240178 0083102A */ slt $v0, $a0, $v1 -/* B281AC 8024017C 10400002 */ beqz $v0, .L80240188 -/* B281B0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* B281B4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* B281B8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* B281BC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* B281C0 80240190 00000000 */ nop -/* B281C4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* B281C8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* B281CC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* B281D0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* B281D4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* B281D8 802401A8 3C020002 */ lui $v0, 2 -/* B281DC 802401AC 08090071 */ j .L802401C4 -/* B281E0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* B281E4 802401B4 3C040002 */ lui $a0, 2 -/* B281E8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* B281EC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* B281F0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* B281F4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* B281F8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* B281FC 802401CC 1440000E */ bnez $v0, .L80240208 -/* B28200 802401D0 00000000 */ nop -/* B28204 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* B28208 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* B2820C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* B28210 802401E0 04610004 */ bgez $v1, .L802401F4 -/* B28214 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* B28218 802401E8 3C020002 */ lui $v0, 2 -/* B2821C 802401EC 08090081 */ j .L80240204 -/* B28220 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* B28224 802401F4 3C040002 */ lui $a0, 2 -/* B28228 802401F8 0083102A */ slt $v0, $a0, $v1 -/* B2822C 802401FC 10400002 */ beqz $v0, .L80240208 -/* B28230 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* B28234 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* B28238 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* B2823C 8024020C 1440000E */ bnez $v0, .L80240248 -/* B28240 80240210 00000000 */ nop -/* B28244 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* B28248 80240218 8E020094 */ lw $v0, 0x94($s0) -/* B2824C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* B28250 80240220 04610004 */ bgez $v1, .L80240234 -/* B28254 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* B28258 80240228 3C020002 */ lui $v0, 2 -/* B2825C 8024022C 08090091 */ j .L80240244 -/* B28260 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* B28264 80240234 3C040002 */ lui $a0, 2 -/* B28268 80240238 0083102A */ slt $v0, $a0, $v1 -/* B2826C 8024023C 10400002 */ beqz $v0, .L80240248 -/* B28270 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* B28274 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* B28278 80240248 8E040084 */ lw $a0, 0x84($s0) -/* B2827C 8024024C 0C046F07 */ jal set_main_pan_u -/* B28280 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* B28284 80240254 8E040084 */ lw $a0, 0x84($s0) -/* B28288 80240258 0C046F0D */ jal set_main_pan_v -/* B2828C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* B28290 80240260 8E040084 */ lw $a0, 0x84($s0) -/* B28294 80240264 0C046F13 */ jal set_aux_pan_u -/* B28298 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* B2829C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* B282A0 80240270 0C046F19 */ jal set_aux_pan_v -/* B282A4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* B282A8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* B282AC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* B282B0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* B282B4 80240284 24420001 */ addiu $v0, $v0, 1 -/* B282B8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* B282BC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* B282C0 80240290 24630001 */ addiu $v1, $v1, 1 -/* B282C4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* B282C8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* B282CC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* B282D0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* B282D4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* B282D8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* B282DC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* B282E0 802402B0 14600002 */ bnez $v1, .L802402BC -/* B282E4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* B282E8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* B282EC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* B282F0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* B282F4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* B282F8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* B282FC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* B28300 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* B28304 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* B28308 802402D8 0043102A */ slt $v0, $v0, $v1 -/* B2830C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* B28310 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* B28314 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* B28318 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* B2831C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* B28320 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* B28324 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* B28328 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B2832C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* B28330 80240300 0000102D */ daddu $v0, $zero, $zero -/* B28334 80240304 03E00008 */ jr $ra -/* B28338 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_01/func_8024030C_B28030.s b/asm/nonmatchings/world/area_jan/jan_01/func_8024030C_B28030.s deleted file mode 100644 index 7ece28ff91..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/func_8024030C_B28030.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_B2833C -/* B2833C 8024030C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B28340 80240310 0000202D */ daddu $a0, $zero, $zero -/* B28344 80240314 0080282D */ daddu $a1, $a0, $zero -/* B28348 80240318 0080302D */ daddu $a2, $a0, $zero -/* B2834C 8024031C 0080382D */ daddu $a3, $a0, $zero -/* B28350 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* B28354 80240324 AFA00010 */ sw $zero, 0x10($sp) -/* B28358 80240328 0C01CA54 */ jal func_80072950 -/* B2835C 8024032C AFA00014 */ sw $zero, 0x14($sp) -/* B28360 80240330 8FBF0018 */ lw $ra, 0x18($sp) -/* B28364 80240334 24020002 */ addiu $v0, $zero, 2 -/* B28368 80240338 03E00008 */ jr $ra -/* B2836C 8024033C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_01/func_80240340_B28030.s b/asm/nonmatchings/world/area_jan/jan_01/func_80240340_B28030.s deleted file mode 100644 index 91f5114d4a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/func_80240340_B28030.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240340_B28370 -/* B28370 80240340 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B28374 80240344 AFB00030 */ sw $s0, 0x30($sp) -/* B28378 80240348 0080802D */ daddu $s0, $a0, $zero -/* B2837C 8024034C AFBF0040 */ sw $ra, 0x40($sp) -/* B28380 80240350 AFB3003C */ sw $s3, 0x3c($sp) -/* B28384 80240354 AFB20038 */ sw $s2, 0x38($sp) -/* B28388 80240358 AFB10034 */ sw $s1, 0x34($sp) -/* B2838C 8024035C F7B60050 */ sdc1 $f22, 0x50($sp) -/* B28390 80240360 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B28394 80240364 8E130148 */ lw $s3, 0x148($s0) -/* B28398 80240368 00A0882D */ daddu $s1, $a1, $zero -/* B2839C 8024036C 86640008 */ lh $a0, 8($s3) -/* B283A0 80240370 0C00EABB */ jal get_npc_unsafe -/* B283A4 80240374 00C0902D */ daddu $s2, $a2, $zero -/* B283A8 80240378 0200202D */ daddu $a0, $s0, $zero -/* B283AC 8024037C 0220282D */ daddu $a1, $s1, $zero -/* B283B0 80240380 0240302D */ daddu $a2, $s2, $zero -/* B283B4 80240384 0C012568 */ jal func_800495A0 -/* B283B8 80240388 0040802D */ daddu $s0, $v0, $zero -/* B283BC 8024038C 8E020000 */ lw $v0, ($s0) -/* B283C0 80240390 2404002D */ addiu $a0, $zero, 0x2d -/* B283C4 80240394 34420800 */ ori $v0, $v0, 0x800 -/* B283C8 80240398 0C00A67F */ jal rand_int -/* B283CC 8024039C AE020000 */ sw $v0, ($s0) -/* B283D0 802403A0 0200202D */ daddu $a0, $s0, $zero -/* B283D4 802403A4 3C05B000 */ lui $a1, 0xb000 -/* B283D8 802403A8 34A50017 */ ori $a1, $a1, 0x17 -/* B283DC 802403AC 44820000 */ mtc1 $v0, $f0 -/* B283E0 802403B0 00000000 */ nop -/* B283E4 802403B4 46800021 */ cvt.d.w $f0, $f0 -/* B283E8 802403B8 3C014024 */ lui $at, 0x4024 -/* B283EC 802403BC 44811800 */ mtc1 $at, $f3 -/* B283F0 802403C0 44801000 */ mtc1 $zero, $f2 -/* B283F4 802403C4 3C014020 */ lui $at, 0x4020 -/* B283F8 802403C8 44812800 */ mtc1 $at, $f5 -/* B283FC 802403CC 44802000 */ mtc1 $zero, $f4 -/* B28400 802403D0 46220003 */ div.d $f0, $f0, $f2 -/* B28404 802403D4 46240000 */ add.d $f0, $f0, $f4 -/* B28408 802403D8 3C013FC0 */ lui $at, 0x3fc0 -/* B2840C 802403DC 44811000 */ mtc1 $at, $f2 -/* B28410 802403E0 0000302D */ daddu $a2, $zero, $zero -/* B28414 802403E4 E6020014 */ swc1 $f2, 0x14($s0) -/* B28418 802403E8 46200020 */ cvt.s.d $f0, $f0 -/* B2841C 802403EC 0C012530 */ jal func_800494C0 -/* B28420 802403F0 E600001C */ swc1 $f0, 0x1c($s0) -/* B28424 802403F4 8E6300D0 */ lw $v1, 0xd0($s3) -/* B28428 802403F8 C6000040 */ lwc1 $f0, 0x40($s0) -/* B2842C 802403FC C4620000 */ lwc1 $f2, ($v1) -/* B28430 80240400 468010A0 */ cvt.s.w $f2, $f2 -/* B28434 80240404 C4640008 */ lwc1 $f4, 8($v1) -/* B28438 80240408 46802120 */ cvt.s.w $f4, $f4 -/* B2843C 8024040C E7A00010 */ swc1 $f0, 0x10($sp) -/* B28440 80240410 8E6200D0 */ lw $v0, 0xd0($s3) -/* B28444 80240414 44051000 */ mfc1 $a1, $f2 -/* B28448 80240418 C440000C */ lwc1 $f0, 0xc($v0) -/* B2844C 8024041C 46800020 */ cvt.s.w $f0, $f0 -/* B28450 80240420 E7A00014 */ swc1 $f0, 0x14($sp) -/* B28454 80240424 8E6200D0 */ lw $v0, 0xd0($s3) -/* B28458 80240428 44062000 */ mfc1 $a2, $f4 -/* B2845C 8024042C C4400010 */ lwc1 $f0, 0x10($v0) -/* B28460 80240430 46800020 */ cvt.s.w $f0, $f0 -/* B28464 80240434 E7A00018 */ swc1 $f0, 0x18($sp) -/* B28468 80240438 8C640018 */ lw $a0, 0x18($v1) -/* B2846C 8024043C 0C0123F5 */ jal is_point_within_region -/* B28470 80240440 8E070038 */ lw $a3, 0x38($s0) -/* B28474 80240444 10400035 */ beqz $v0, .L8024051C -/* B28478 80240448 00000000 */ nop -/* B2847C 8024044C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B28480 80240450 3C0141C8 */ lui $at, 0x41c8 -/* B28484 80240454 4481B000 */ mtc1 $at, $f22 -/* B28488 80240458 8E6200D0 */ lw $v0, 0xd0($s3) -/* B2848C 8024045C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B28490 80240460 C4480000 */ lwc1 $f8, ($v0) -/* B28494 80240464 46804220 */ cvt.s.w $f8, $f8 -/* B28498 80240468 44064000 */ mfc1 $a2, $f8 -/* B2849C 8024046C C4480008 */ lwc1 $f8, 8($v0) -/* B284A0 80240470 46804220 */ cvt.s.w $f8, $f8 -/* B284A4 80240474 44074000 */ mfc1 $a3, $f8 -/* B284A8 80240478 3C01403E */ lui $at, 0x403e -/* B284AC 8024047C 4481A800 */ mtc1 $at, $f21 -/* B284B0 80240480 4480A000 */ mtc1 $zero, $f20 -/* B284B4 80240484 0C00A720 */ jal atan2 -/* B284B8 80240488 0000882D */ daddu $s1, $zero, $zero -/* B284BC 8024048C C6020038 */ lwc1 $f2, 0x38($s0) -/* B284C0 80240490 C604003C */ lwc1 $f4, 0x3c($s0) -/* B284C4 80240494 C6060040 */ lwc1 $f6, 0x40($s0) -/* B284C8 80240498 E600000C */ swc1 $f0, 0xc($s0) -/* B284CC 8024049C E7A20020 */ swc1 $f2, 0x20($sp) -/* B284D0 802404A0 E7A40024 */ swc1 $f4, 0x24($sp) -/* B284D4 802404A4 E7A60028 */ swc1 $f6, 0x28($sp) -.L802404A8: -/* B284D8 802404A8 E7B60010 */ swc1 $f22, 0x10($sp) -/* B284DC 802404AC C600000C */ lwc1 $f0, 0xc($s0) -/* B284E0 802404B0 E7A00014 */ swc1 $f0, 0x14($sp) -/* B284E4 802404B4 860200A8 */ lh $v0, 0xa8($s0) -/* B284E8 802404B8 27A50020 */ addiu $a1, $sp, 0x20 -/* B284EC 802404BC 44820000 */ mtc1 $v0, $f0 -/* B284F0 802404C0 00000000 */ nop -/* B284F4 802404C4 46800020 */ cvt.s.w $f0, $f0 -/* B284F8 802404C8 E7A00018 */ swc1 $f0, 0x18($sp) -/* B284FC 802404CC 860200A6 */ lh $v0, 0xa6($s0) -/* B28500 802404D0 27A60024 */ addiu $a2, $sp, 0x24 -/* B28504 802404D4 44820000 */ mtc1 $v0, $f0 -/* B28508 802404D8 00000000 */ nop -/* B2850C 802404DC 46800020 */ cvt.s.w $f0, $f0 -/* B28510 802404E0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B28514 802404E4 8E040080 */ lw $a0, 0x80($s0) -/* B28518 802404E8 0C037711 */ jal func_800DDC44 -/* B2851C 802404EC 27A70028 */ addiu $a3, $sp, 0x28 -/* B28520 802404F0 10400016 */ beqz $v0, .L8024054C -/* B28524 802404F4 26310001 */ addiu $s1, $s1, 1 -/* B28528 802404F8 C600000C */ lwc1 $f0, 0xc($s0) -/* B2852C 802404FC 46000021 */ cvt.d.s $f0, $f0 -/* B28530 80240500 46340000 */ add.d $f0, $f0, $f20 -/* B28534 80240504 2A220006 */ slti $v0, $s1, 6 -/* B28538 80240508 46200020 */ cvt.s.d $f0, $f0 -/* B2853C 8024050C 1440FFE6 */ bnez $v0, .L802404A8 -/* B28540 80240510 E600000C */ swc1 $f0, 0xc($s0) -/* B28544 80240514 08090153 */ j .L8024054C -/* B28548 80240518 00000000 */ nop -.L8024051C: -/* B2854C 8024051C 0C00A67F */ jal rand_int -/* B28550 80240520 2404003C */ addiu $a0, $zero, 0x3c -/* B28554 80240524 C60C000C */ lwc1 $f12, 0xc($s0) -/* B28558 80240528 44820000 */ mtc1 $v0, $f0 -/* B2855C 8024052C 00000000 */ nop -/* B28560 80240530 46800020 */ cvt.s.w $f0, $f0 -/* B28564 80240534 46006300 */ add.s $f12, $f12, $f0 -/* B28568 80240538 3C0141F0 */ lui $at, 0x41f0 -/* B2856C 8024053C 44810000 */ mtc1 $at, $f0 -/* B28570 80240540 0C00A6C9 */ jal clamp_angle -/* B28574 80240544 46006301 */ sub.s $f12, $f12, $f0 -/* B28578 80240548 E600000C */ swc1 $f0, 0xc($s0) -.L8024054C: -/* B2857C 8024054C 8FBF0040 */ lw $ra, 0x40($sp) -/* B28580 80240550 8FB3003C */ lw $s3, 0x3c($sp) -/* B28584 80240554 8FB20038 */ lw $s2, 0x38($sp) -/* B28588 80240558 8FB10034 */ lw $s1, 0x34($sp) -/* B2858C 8024055C 8FB00030 */ lw $s0, 0x30($sp) -/* B28590 80240560 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B28594 80240564 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B28598 80240568 03E00008 */ jr $ra -/* B2859C 8024056C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_01/func_80240570_B28030.s b/asm/nonmatchings/world/area_jan/jan_01/func_80240570_B28030.s deleted file mode 100644 index c78fae13e6..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/func_80240570_B28030.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240570_B285A0 -/* B285A0 80240570 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* B285A4 80240574 AFB3004C */ sw $s3, 0x4c($sp) -/* B285A8 80240578 0080982D */ daddu $s3, $a0, $zero -/* B285AC 8024057C AFBF0054 */ sw $ra, 0x54($sp) -/* B285B0 80240580 AFB40050 */ sw $s4, 0x50($sp) -/* B285B4 80240584 AFB20048 */ sw $s2, 0x48($sp) -/* B285B8 80240588 AFB10044 */ sw $s1, 0x44($sp) -/* B285BC 8024058C AFB00040 */ sw $s0, 0x40($sp) -/* B285C0 80240590 F7B40058 */ sdc1 $f20, 0x58($sp) -/* B285C4 80240594 8E710148 */ lw $s1, 0x148($s3) -/* B285C8 80240598 00A0A02D */ daddu $s4, $a1, $zero -/* B285CC 8024059C 86240008 */ lh $a0, 8($s1) -/* B285D0 802405A0 0C00EABB */ jal get_npc_unsafe -/* B285D4 802405A4 00C0902D */ daddu $s2, $a2, $zero -/* B285D8 802405A8 8E830014 */ lw $v1, 0x14($s4) -/* B285DC 802405AC 04600034 */ bltz $v1, .L80240680 -/* B285E0 802405B0 0040802D */ daddu $s0, $v0, $zero -/* B285E4 802405B4 8E620074 */ lw $v0, 0x74($s3) -/* B285E8 802405B8 1C400030 */ bgtz $v0, .L8024067C -/* B285EC 802405BC 2442FFFF */ addiu $v0, $v0, -1 -/* B285F0 802405C0 0240202D */ daddu $a0, $s2, $zero -/* B285F4 802405C4 AE630074 */ sw $v1, 0x74($s3) -/* B285F8 802405C8 AFA00010 */ sw $zero, 0x10($sp) -/* B285FC 802405CC 8E86000C */ lw $a2, 0xc($s4) -/* B28600 802405D0 8E870010 */ lw $a3, 0x10($s4) -/* B28604 802405D4 0C01242D */ jal func_800490B4 -/* B28608 802405D8 0220282D */ daddu $a1, $s1, $zero -/* B2860C 802405DC 10400025 */ beqz $v0, .L80240674 -/* B28610 802405E0 0000202D */ daddu $a0, $zero, $zero -/* B28614 802405E4 0200282D */ daddu $a1, $s0, $zero -/* B28618 802405E8 0000302D */ daddu $a2, $zero, $zero -/* B2861C 802405EC 860300A8 */ lh $v1, 0xa8($s0) -/* B28620 802405F0 3C013F80 */ lui $at, 0x3f80 -/* B28624 802405F4 44810000 */ mtc1 $at, $f0 -/* B28628 802405F8 3C014000 */ lui $at, 0x4000 -/* B2862C 802405FC 44811000 */ mtc1 $at, $f2 -/* B28630 80240600 3C01C1A0 */ lui $at, 0xc1a0 -/* B28634 80240604 44812000 */ mtc1 $at, $f4 -/* B28638 80240608 2402000F */ addiu $v0, $zero, 0xf -/* B2863C 8024060C AFA2001C */ sw $v0, 0x1c($sp) -/* B28640 80240610 44835000 */ mtc1 $v1, $f10 -/* B28644 80240614 00000000 */ nop -/* B28648 80240618 468052A0 */ cvt.s.w $f10, $f10 -/* B2864C 8024061C 44075000 */ mfc1 $a3, $f10 -/* B28650 80240620 27A20028 */ addiu $v0, $sp, 0x28 -/* B28654 80240624 AFA20020 */ sw $v0, 0x20($sp) -/* B28658 80240628 E7A00010 */ swc1 $f0, 0x10($sp) -/* B2865C 8024062C E7A20014 */ swc1 $f2, 0x14($sp) -/* B28660 80240630 0C01BFA4 */ jal fx_emote -/* B28664 80240634 E7A40018 */ swc1 $f4, 0x18($sp) -/* B28668 80240638 0200202D */ daddu $a0, $s0, $zero -/* B2866C 8024063C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B28670 80240640 0C012530 */ jal func_800494C0 -/* B28674 80240644 3C060020 */ lui $a2, 0x20 -/* B28678 80240648 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B2867C 8024064C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B28680 80240650 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B28684 80240654 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B28688 80240658 8C460028 */ lw $a2, 0x28($v0) -/* B2868C 8024065C 0C00A720 */ jal atan2 -/* B28690 80240660 8C470030 */ lw $a3, 0x30($v0) -/* B28694 80240664 2402000C */ addiu $v0, $zero, 0xc -/* B28698 80240668 E600000C */ swc1 $f0, 0xc($s0) -/* B2869C 8024066C 08090221 */ j .L80240884 -/* B286A0 80240670 AE620070 */ sw $v0, 0x70($s3) -.L80240674: -/* B286A4 80240674 8E620074 */ lw $v0, 0x74($s3) -/* B286A8 80240678 2442FFFF */ addiu $v0, $v0, -1 -.L8024067C: -/* B286AC 8024067C AE620074 */ sw $v0, 0x74($s3) -.L80240680: -/* B286B0 80240680 C6000018 */ lwc1 $f0, 0x18($s0) -/* B286B4 80240684 44801000 */ mtc1 $zero, $f2 -/* B286B8 80240688 44801800 */ mtc1 $zero, $f3 -/* B286BC 8024068C 46000021 */ cvt.d.s $f0, $f0 -/* B286C0 80240690 4620103C */ c.lt.d $f2, $f0 -/* B286C4 80240694 00000000 */ nop -/* B286C8 80240698 45000025 */ bc1f .L80240730 -/* B286CC 8024069C 27A5002C */ addiu $a1, $sp, 0x2c -/* B286D0 802406A0 C6000038 */ lwc1 $f0, 0x38($s0) -/* B286D4 802406A4 860200A6 */ lh $v0, 0xa6($s0) -/* B286D8 802406A8 3C018024 */ lui $at, 0x8024 -/* B286DC 802406AC D42243F0 */ ldc1 $f2, 0x43f0($at) -/* B286E0 802406B0 27A60030 */ addiu $a2, $sp, 0x30 -/* B286E4 802406B4 E7A0002C */ swc1 $f0, 0x2c($sp) -/* B286E8 802406B8 44820000 */ mtc1 $v0, $f0 -/* B286EC 802406BC 00000000 */ nop -/* B286F0 802406C0 46800020 */ cvt.s.w $f0, $f0 -/* B286F4 802406C4 46000021 */ cvt.d.s $f0, $f0 -/* B286F8 802406C8 C604003C */ lwc1 $f4, 0x3c($s0) -/* B286FC 802406CC C6060040 */ lwc1 $f6, 0x40($s0) -/* B28700 802406D0 C6080018 */ lwc1 $f8, 0x18($s0) -/* B28704 802406D4 860200A8 */ lh $v0, 0xa8($s0) -/* B28708 802406D8 46220002 */ mul.d $f0, $f0, $f2 -/* B2870C 802406DC 00000000 */ nop -/* B28710 802406E0 E7A40030 */ swc1 $f4, 0x30($sp) -/* B28714 802406E4 E7A60034 */ swc1 $f6, 0x34($sp) -/* B28718 802406E8 E7A80010 */ swc1 $f8, 0x10($sp) -/* B2871C 802406EC C604000C */ lwc1 $f4, 0xc($s0) -/* B28720 802406F0 44821000 */ mtc1 $v0, $f2 -/* B28724 802406F4 00000000 */ nop -/* B28728 802406F8 468010A0 */ cvt.s.w $f2, $f2 -/* B2872C 802406FC E7A20018 */ swc1 $f2, 0x18($sp) -/* B28730 80240700 E7A40014 */ swc1 $f4, 0x14($sp) -/* B28734 80240704 46200020 */ cvt.s.d $f0, $f0 -/* B28738 80240708 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B2873C 8024070C 8E040080 */ lw $a0, 0x80($s0) -/* B28740 80240710 0C037711 */ jal func_800DDC44 -/* B28744 80240714 27A70034 */ addiu $a3, $sp, 0x34 -/* B28748 80240718 54400005 */ bnel $v0, $zero, .L80240730 -/* B2874C 8024071C AE000018 */ sw $zero, 0x18($s0) -/* B28750 80240720 8E050018 */ lw $a1, 0x18($s0) -/* B28754 80240724 8E06000C */ lw $a2, 0xc($s0) -/* B28758 80240728 0C00EA95 */ jal npc_move_heading -/* B2875C 8024072C 0200202D */ daddu $a0, $s0, $zero -.L80240730: -/* B28760 80240730 C600001C */ lwc1 $f0, 0x1c($s0) -/* B28764 80240734 44801000 */ mtc1 $zero, $f2 -/* B28768 80240738 44801800 */ mtc1 $zero, $f3 -/* B2876C 8024073C 46000021 */ cvt.d.s $f0, $f0 -/* B28770 80240740 4622003C */ c.lt.d $f0, $f2 -/* B28774 80240744 00000000 */ nop -/* B28778 80240748 45000047 */ bc1f .L80240868 -/* B2877C 8024074C 27A5002C */ addiu $a1, $sp, 0x2c -/* B28780 80240750 27A60030 */ addiu $a2, $sp, 0x30 -/* B28784 80240754 27A20038 */ addiu $v0, $sp, 0x38 -/* B28788 80240758 C602003C */ lwc1 $f2, 0x3c($s0) -/* B2878C 8024075C C6060038 */ lwc1 $f6, 0x38($s0) -/* B28790 80240760 3C01402A */ lui $at, 0x402a -/* B28794 80240764 4481A800 */ mtc1 $at, $f21 -/* B28798 80240768 4480A000 */ mtc1 $zero, $f20 -/* B2879C 8024076C 460010A1 */ cvt.d.s $f2, $f2 -/* B287A0 80240770 46341080 */ add.d $f2, $f2, $f20 -/* B287A4 80240774 C600001C */ lwc1 $f0, 0x1c($s0) -/* B287A8 80240778 C6040040 */ lwc1 $f4, 0x40($s0) -/* B287AC 8024077C 46000005 */ abs.s $f0, $f0 -/* B287B0 80240780 E7A40034 */ swc1 $f4, 0x34($sp) -/* B287B4 80240784 3C014030 */ lui $at, 0x4030 -/* B287B8 80240788 44812800 */ mtc1 $at, $f5 -/* B287BC 8024078C 44802000 */ mtc1 $zero, $f4 -/* B287C0 80240790 46000021 */ cvt.d.s $f0, $f0 -/* B287C4 80240794 E7A6002C */ swc1 $f6, 0x2c($sp) -/* B287C8 80240798 46240000 */ add.d $f0, $f0, $f4 -/* B287CC 8024079C 462010A0 */ cvt.s.d $f2, $f2 -/* B287D0 802407A0 E7A20030 */ swc1 $f2, 0x30($sp) -/* B287D4 802407A4 46200020 */ cvt.s.d $f0, $f0 -/* B287D8 802407A8 E7A00038 */ swc1 $f0, 0x38($sp) -/* B287DC 802407AC AFA20010 */ sw $v0, 0x10($sp) -/* B287E0 802407B0 8E040080 */ lw $a0, 0x80($s0) -/* B287E4 802407B4 0C0372DF */ jal func_800DCB7C -/* B287E8 802407B8 27A70034 */ addiu $a3, $sp, 0x34 -/* B287EC 802407BC 1040002A */ beqz $v0, .L80240868 -/* B287F0 802407C0 00000000 */ nop -/* B287F4 802407C4 C600001C */ lwc1 $f0, 0x1c($s0) -/* B287F8 802407C8 C7A20038 */ lwc1 $f2, 0x38($sp) -/* B287FC 802407CC 46000005 */ abs.s $f0, $f0 -/* B28800 802407D0 46000021 */ cvt.d.s $f0, $f0 -/* B28804 802407D4 46340000 */ add.d $f0, $f0, $f20 -/* B28808 802407D8 460010A1 */ cvt.d.s $f2, $f2 -/* B2880C 802407DC 4620103E */ c.le.d $f2, $f0 -/* B28810 802407E0 00000000 */ nop -/* B28814 802407E4 45000020 */ bc1f .L80240868 -/* B28818 802407E8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B2881C 802407EC C7A00030 */ lwc1 $f0, 0x30($sp) -/* B28820 802407F0 8E020000 */ lw $v0, ($s0) -/* B28824 802407F4 2403F7FF */ addiu $v1, $zero, -0x801 -/* B28828 802407F8 AE00001C */ sw $zero, 0x1c($s0) -/* B2882C 802407FC 00431024 */ and $v0, $v0, $v1 -/* B28830 80240800 AE020000 */ sw $v0, ($s0) -/* B28834 80240804 24020002 */ addiu $v0, $zero, 2 -/* B28838 80240808 E600003C */ swc1 $f0, 0x3c($s0) -/* B2883C 8024080C 0C00A67F */ jal rand_int -/* B28840 80240810 AE620070 */ sw $v0, 0x70($s3) -/* B28844 80240814 3C035555 */ lui $v1, 0x5555 -/* B28848 80240818 34635556 */ ori $v1, $v1, 0x5556 -/* B2884C 8024081C 00430018 */ mult $v0, $v1 -/* B28850 80240820 000227C3 */ sra $a0, $v0, 0x1f -/* B28854 80240824 00004010 */ mfhi $t0 -/* B28858 80240828 01042023 */ subu $a0, $t0, $a0 -/* B2885C 8024082C 00041840 */ sll $v1, $a0, 1 -/* B28860 80240830 00641821 */ addu $v1, $v1, $a0 -/* B28864 80240834 00431023 */ subu $v0, $v0, $v1 -/* B28868 80240838 24430002 */ addiu $v1, $v0, 2 -/* B2886C 8024083C AE630074 */ sw $v1, 0x74($s3) -/* B28870 80240840 8E82002C */ lw $v0, 0x2c($s4) -/* B28874 80240844 5840000F */ blezl $v0, .L80240884 -/* B28878 80240848 AE600070 */ sw $zero, 0x70($s3) -/* B2887C 8024084C 8E820004 */ lw $v0, 4($s4) -/* B28880 80240850 5840000C */ blezl $v0, .L80240884 -/* B28884 80240854 AE600070 */ sw $zero, 0x70($s3) -/* B28888 80240858 1460000A */ bnez $v1, .L80240884 -/* B2888C 8024085C 00000000 */ nop -/* B28890 80240860 08090221 */ j .L80240884 -/* B28894 80240864 AE600070 */ sw $zero, 0x70($s3) -.L80240868: -/* B28898 80240868 C604003C */ lwc1 $f4, 0x3c($s0) -/* B2889C 8024086C C600001C */ lwc1 $f0, 0x1c($s0) -/* B288A0 80240870 46002100 */ add.s $f4, $f4, $f0 -/* B288A4 80240874 C6020014 */ lwc1 $f2, 0x14($s0) -/* B288A8 80240878 46020001 */ sub.s $f0, $f0, $f2 -/* B288AC 8024087C E604003C */ swc1 $f4, 0x3c($s0) -/* B288B0 80240880 E600001C */ swc1 $f0, 0x1c($s0) -.L80240884: -/* B288B4 80240884 8FBF0054 */ lw $ra, 0x54($sp) -/* B288B8 80240888 8FB40050 */ lw $s4, 0x50($sp) -/* B288BC 8024088C 8FB3004C */ lw $s3, 0x4c($sp) -/* B288C0 80240890 8FB20048 */ lw $s2, 0x48($sp) -/* B288C4 80240894 8FB10044 */ lw $s1, 0x44($sp) -/* B288C8 80240898 8FB00040 */ lw $s0, 0x40($sp) -/* B288CC 8024089C D7B40058 */ ldc1 $f20, 0x58($sp) -/* B288D0 802408A0 03E00008 */ jr $ra -/* B288D4 802408A4 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_jan/jan_01/func_80240B0C_B28030.s b/asm/nonmatchings/world/area_jan/jan_01/func_80240B0C_B28030.s deleted file mode 100644 index b8d9566497..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/func_80240B0C_B28030.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B0C_B28B3C -/* B28B3C 80240B0C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B28B40 80240B10 AFB10014 */ sw $s1, 0x14($sp) -/* B28B44 80240B14 0080882D */ daddu $s1, $a0, $zero -/* B28B48 80240B18 AFBF001C */ sw $ra, 0x1c($sp) -/* B28B4C 80240B1C AFB20018 */ sw $s2, 0x18($sp) -/* B28B50 80240B20 AFB00010 */ sw $s0, 0x10($sp) -/* B28B54 80240B24 8E220148 */ lw $v0, 0x148($s1) -/* B28B58 80240B28 00A0902D */ daddu $s2, $a1, $zero -/* B28B5C 80240B2C 84440008 */ lh $a0, 8($v0) -/* B28B60 80240B30 0C00EABB */ jal get_npc_unsafe -/* B28B64 80240B34 00C0802D */ daddu $s0, $a2, $zero -/* B28B68 80240B38 0220202D */ daddu $a0, $s1, $zero -/* B28B6C 80240B3C 0240282D */ daddu $a1, $s2, $zero -/* B28B70 80240B40 0200302D */ daddu $a2, $s0, $zero -/* B28B74 80240B44 0C0127DF */ jal func_80049F7C -/* B28B78 80240B48 0040802D */ daddu $s0, $v0, $zero -/* B28B7C 80240B4C 8E020000 */ lw $v0, ($s0) -/* B28B80 80240B50 24040005 */ addiu $a0, $zero, 5 -/* B28B84 80240B54 34420800 */ ori $v0, $v0, 0x800 -/* B28B88 80240B58 0C00A67F */ jal rand_int -/* B28B8C 80240B5C AE020000 */ sw $v0, ($s0) -/* B28B90 80240B60 44820000 */ mtc1 $v0, $f0 -/* B28B94 80240B64 00000000 */ nop -/* B28B98 80240B68 46800021 */ cvt.d.w $f0, $f0 -/* B28B9C 80240B6C 3C014024 */ lui $at, 0x4024 -/* B28BA0 80240B70 44811800 */ mtc1 $at, $f3 -/* B28BA4 80240B74 44801000 */ mtc1 $zero, $f2 -/* B28BA8 80240B78 3C013FC0 */ lui $at, 0x3fc0 -/* B28BAC 80240B7C 44812000 */ mtc1 $at, $f4 -/* B28BB0 80240B80 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B28BB4 80240B84 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B28BB8 80240B88 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B28BBC 80240B8C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B28BC0 80240B90 46220000 */ add.d $f0, $f0, $f2 -/* B28BC4 80240B94 E6040014 */ swc1 $f4, 0x14($s0) -/* B28BC8 80240B98 46200020 */ cvt.s.d $f0, $f0 -/* B28BCC 80240B9C E600001C */ swc1 $f0, 0x1c($s0) -/* B28BD0 80240BA0 8C460028 */ lw $a2, 0x28($v0) -/* B28BD4 80240BA4 0C00A720 */ jal atan2 -/* B28BD8 80240BA8 8C470030 */ lw $a3, 0x30($v0) -/* B28BDC 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* B28BE0 80240BB0 3C05B000 */ lui $a1, 0xb000 -/* B28BE4 80240BB4 34A50017 */ ori $a1, $a1, 0x17 -/* B28BE8 80240BB8 0000302D */ daddu $a2, $zero, $zero -/* B28BEC 80240BBC E480000C */ swc1 $f0, 0xc($a0) -/* B28BF0 80240BC0 C6400018 */ lwc1 $f0, 0x18($s2) -/* B28BF4 80240BC4 2402000D */ addiu $v0, $zero, 0xd -/* B28BF8 80240BC8 E4800018 */ swc1 $f0, 0x18($a0) -/* B28BFC 80240BCC 0C012530 */ jal func_800494C0 -/* B28C00 80240BD0 AE220070 */ sw $v0, 0x70($s1) -/* B28C04 80240BD4 8FBF001C */ lw $ra, 0x1c($sp) -/* B28C08 80240BD8 8FB20018 */ lw $s2, 0x18($sp) -/* B28C0C 80240BDC 8FB10014 */ lw $s1, 0x14($sp) -/* B28C10 80240BE0 8FB00010 */ lw $s0, 0x10($sp) -/* B28C14 80240BE4 03E00008 */ jr $ra -/* B28C18 80240BE8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_01/func_80240BEC_B28030.s b/asm/nonmatchings/world/area_jan/jan_01/func_80240BEC_B28030.s deleted file mode 100644 index 884ab868c3..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/func_80240BEC_B28030.s +++ /dev/null @@ -1,200 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BEC_B28C1C -/* B28C1C 80240BEC 27BDFF90 */ addiu $sp, $sp, -0x70 -/* B28C20 80240BF0 AFB40050 */ sw $s4, 0x50($sp) -/* B28C24 80240BF4 0080A02D */ daddu $s4, $a0, $zero -/* B28C28 80240BF8 AFBF0060 */ sw $ra, 0x60($sp) -/* B28C2C 80240BFC AFB7005C */ sw $s7, 0x5c($sp) -/* B28C30 80240C00 AFB60058 */ sw $s6, 0x58($sp) -/* B28C34 80240C04 AFB50054 */ sw $s5, 0x54($sp) -/* B28C38 80240C08 AFB3004C */ sw $s3, 0x4c($sp) -/* B28C3C 80240C0C AFB20048 */ sw $s2, 0x48($sp) -/* B28C40 80240C10 AFB10044 */ sw $s1, 0x44($sp) -/* B28C44 80240C14 AFB00040 */ sw $s0, 0x40($sp) -/* B28C48 80240C18 F7B40068 */ sdc1 $f20, 0x68($sp) -/* B28C4C 80240C1C 8E950148 */ lw $s5, 0x148($s4) -/* B28C50 80240C20 00A0B02D */ daddu $s6, $a1, $zero -/* B28C54 80240C24 86A40008 */ lh $a0, 8($s5) -/* B28C58 80240C28 0C00EABB */ jal get_npc_unsafe -/* B28C5C 80240C2C 00C0B82D */ daddu $s7, $a2, $zero -/* B28C60 80240C30 0040982D */ daddu $s3, $v0, $zero -/* B28C64 80240C34 C6600018 */ lwc1 $f0, 0x18($s3) -/* B28C68 80240C38 44801000 */ mtc1 $zero, $f2 -/* B28C6C 80240C3C 44801800 */ mtc1 $zero, $f3 -/* B28C70 80240C40 46000021 */ cvt.d.s $f0, $f0 -/* B28C74 80240C44 4620103C */ c.lt.d $f2, $f0 -/* B28C78 80240C48 00000000 */ nop -/* B28C7C 80240C4C 45000021 */ bc1f .L80240CD4 -/* B28C80 80240C50 27A50028 */ addiu $a1, $sp, 0x28 -/* B28C84 80240C54 C6600038 */ lwc1 $f0, 0x38($s3) -/* B28C88 80240C58 C662003C */ lwc1 $f2, 0x3c($s3) -/* B28C8C 80240C5C C6640040 */ lwc1 $f4, 0x40($s3) -/* B28C90 80240C60 C6660018 */ lwc1 $f6, 0x18($s3) -/* B28C94 80240C64 E7A00028 */ swc1 $f0, 0x28($sp) -/* B28C98 80240C68 E7A2002C */ swc1 $f2, 0x2c($sp) -/* B28C9C 80240C6C E7A40030 */ swc1 $f4, 0x30($sp) -/* B28CA0 80240C70 E7A60010 */ swc1 $f6, 0x10($sp) -/* B28CA4 80240C74 C660000C */ lwc1 $f0, 0xc($s3) -/* B28CA8 80240C78 E7A00014 */ swc1 $f0, 0x14($sp) -/* B28CAC 80240C7C 866200A8 */ lh $v0, 0xa8($s3) -/* B28CB0 80240C80 44820000 */ mtc1 $v0, $f0 -/* B28CB4 80240C84 00000000 */ nop -/* B28CB8 80240C88 46800020 */ cvt.s.w $f0, $f0 -/* B28CBC 80240C8C E7A00018 */ swc1 $f0, 0x18($sp) -/* B28CC0 80240C90 866200A6 */ lh $v0, 0xa6($s3) -/* B28CC4 80240C94 27A6002C */ addiu $a2, $sp, 0x2c -/* B28CC8 80240C98 44820000 */ mtc1 $v0, $f0 -/* B28CCC 80240C9C 00000000 */ nop -/* B28CD0 80240CA0 46800020 */ cvt.s.w $f0, $f0 -/* B28CD4 80240CA4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B28CD8 80240CA8 8E640080 */ lw $a0, 0x80($s3) -/* B28CDC 80240CAC 0C037711 */ jal func_800DDC44 -/* B28CE0 80240CB0 27A70030 */ addiu $a3, $sp, 0x30 -/* B28CE4 80240CB4 10400003 */ beqz $v0, .L80240CC4 -/* B28CE8 80240CB8 00000000 */ nop -/* B28CEC 80240CBC 08090335 */ j .L80240CD4 -/* B28CF0 80240CC0 AE600018 */ sw $zero, 0x18($s3) -.L80240CC4: -/* B28CF4 80240CC4 8E650018 */ lw $a1, 0x18($s3) -/* B28CF8 80240CC8 8E66000C */ lw $a2, 0xc($s3) -/* B28CFC 80240CCC 0C00EA95 */ jal npc_move_heading -/* B28D00 80240CD0 0260202D */ daddu $a0, $s3, $zero -.L80240CD4: -/* B28D04 80240CD4 C660001C */ lwc1 $f0, 0x1c($s3) -/* B28D08 80240CD8 44801000 */ mtc1 $zero, $f2 -/* B28D0C 80240CDC 44801800 */ mtc1 $zero, $f3 -/* B28D10 80240CE0 46000021 */ cvt.d.s $f0, $f0 -/* B28D14 80240CE4 4622003C */ c.lt.d $f0, $f2 -/* B28D18 80240CE8 00000000 */ nop -/* B28D1C 80240CEC 4500006C */ bc1f .L80240EA0 -/* B28D20 80240CF0 27B00028 */ addiu $s0, $sp, 0x28 -/* B28D24 80240CF4 0200282D */ daddu $a1, $s0, $zero -/* B28D28 80240CF8 27A60034 */ addiu $a2, $sp, 0x34 -/* B28D2C 80240CFC 27B20038 */ addiu $s2, $sp, 0x38 -/* B28D30 80240D00 C6600038 */ lwc1 $f0, 0x38($s3) -/* B28D34 80240D04 3C0142C8 */ lui $at, 0x42c8 -/* B28D38 80240D08 44811000 */ mtc1 $at, $f2 -/* B28D3C 80240D0C C6640040 */ lwc1 $f4, 0x40($s3) -/* B28D40 80240D10 3C01447A */ lui $at, 0x447a -/* B28D44 80240D14 44813000 */ mtc1 $at, $f6 -/* B28D48 80240D18 27B10030 */ addiu $s1, $sp, 0x30 -/* B28D4C 80240D1C E7A00028 */ swc1 $f0, 0x28($sp) -/* B28D50 80240D20 E7A20034 */ swc1 $f2, 0x34($sp) -/* B28D54 80240D24 E7A40030 */ swc1 $f4, 0x30($sp) -/* B28D58 80240D28 E7A60038 */ swc1 $f6, 0x38($sp) -/* B28D5C 80240D2C AFB20010 */ sw $s2, 0x10($sp) -/* B28D60 80240D30 8E640080 */ lw $a0, 0x80($s3) -/* B28D64 80240D34 0C0372DF */ jal func_800DCB7C -/* B28D68 80240D38 0220382D */ daddu $a3, $s1, $zero -/* B28D6C 80240D3C 0200282D */ daddu $a1, $s0, $zero -/* B28D70 80240D40 27A6002C */ addiu $a2, $sp, 0x2c -/* B28D74 80240D44 C662003C */ lwc1 $f2, 0x3c($s3) -/* B28D78 80240D48 C6660038 */ lwc1 $f6, 0x38($s3) -/* B28D7C 80240D4C 3C01402A */ lui $at, 0x402a -/* B28D80 80240D50 4481A800 */ mtc1 $at, $f21 -/* B28D84 80240D54 4480A000 */ mtc1 $zero, $f20 -/* B28D88 80240D58 460010A1 */ cvt.d.s $f2, $f2 -/* B28D8C 80240D5C 46341080 */ add.d $f2, $f2, $f20 -/* B28D90 80240D60 C660001C */ lwc1 $f0, 0x1c($s3) -/* B28D94 80240D64 C6640040 */ lwc1 $f4, 0x40($s3) -/* B28D98 80240D68 46000005 */ abs.s $f0, $f0 -/* B28D9C 80240D6C E7A40030 */ swc1 $f4, 0x30($sp) -/* B28DA0 80240D70 3C014030 */ lui $at, 0x4030 -/* B28DA4 80240D74 44812800 */ mtc1 $at, $f5 -/* B28DA8 80240D78 44802000 */ mtc1 $zero, $f4 -/* B28DAC 80240D7C 46000021 */ cvt.d.s $f0, $f0 -/* B28DB0 80240D80 E7A60028 */ swc1 $f6, 0x28($sp) -/* B28DB4 80240D84 46240000 */ add.d $f0, $f0, $f4 -/* B28DB8 80240D88 462010A0 */ cvt.s.d $f2, $f2 -/* B28DBC 80240D8C E7A2002C */ swc1 $f2, 0x2c($sp) -/* B28DC0 80240D90 46200020 */ cvt.s.d $f0, $f0 -/* B28DC4 80240D94 E7A00038 */ swc1 $f0, 0x38($sp) -/* B28DC8 80240D98 AFB20010 */ sw $s2, 0x10($sp) -/* B28DCC 80240D9C 8E640080 */ lw $a0, 0x80($s3) -/* B28DD0 80240DA0 0C0372DF */ jal func_800DCB7C -/* B28DD4 80240DA4 0220382D */ daddu $a3, $s1, $zero -/* B28DD8 80240DA8 1040003D */ beqz $v0, .L80240EA0 -/* B28DDC 80240DAC 00000000 */ nop -/* B28DE0 80240DB0 C660001C */ lwc1 $f0, 0x1c($s3) -/* B28DE4 80240DB4 C7A20038 */ lwc1 $f2, 0x38($sp) -/* B28DE8 80240DB8 46000005 */ abs.s $f0, $f0 -/* B28DEC 80240DBC 46000021 */ cvt.d.s $f0, $f0 -/* B28DF0 80240DC0 46340000 */ add.d $f0, $f0, $f20 -/* B28DF4 80240DC4 460010A1 */ cvt.d.s $f2, $f2 -/* B28DF8 80240DC8 4620103E */ c.le.d $f2, $f0 -/* B28DFC 80240DCC 00000000 */ nop -/* B28E00 80240DD0 45000033 */ bc1f .L80240EA0 -/* B28E04 80240DD4 2403F7FF */ addiu $v1, $zero, -0x801 -/* B28E08 80240DD8 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* B28E0C 80240DDC 8E620000 */ lw $v0, ($s3) -/* B28E10 80240DE0 AE60001C */ sw $zero, 0x1c($s3) -/* B28E14 80240DE4 00431024 */ and $v0, $v0, $v1 -/* B28E18 80240DE8 E660003C */ swc1 $f0, 0x3c($s3) -/* B28E1C 80240DEC AE620000 */ sw $v0, ($s3) -/* B28E20 80240DF0 AFA00010 */ sw $zero, 0x10($sp) -/* B28E24 80240DF4 AFA00014 */ sw $zero, 0x14($sp) -/* B28E28 80240DF8 8E650038 */ lw $a1, 0x38($s3) -/* B28E2C 80240DFC 8E66003C */ lw $a2, 0x3c($s3) -/* B28E30 80240E00 8E670040 */ lw $a3, 0x40($s3) -/* B28E34 80240E04 0C01BECC */ jal fx_walk_normal -/* B28E38 80240E08 24040002 */ addiu $a0, $zero, 2 -/* B28E3C 80240E0C 02E0202D */ daddu $a0, $s7, $zero -/* B28E40 80240E10 2402000C */ addiu $v0, $zero, 0xc -/* B28E44 80240E14 AE820070 */ sw $v0, 0x70($s4) -/* B28E48 80240E18 24020001 */ addiu $v0, $zero, 1 -/* B28E4C 80240E1C AFA20010 */ sw $v0, 0x10($sp) -/* B28E50 80240E20 8EC60024 */ lw $a2, 0x24($s6) -/* B28E54 80240E24 8EC70028 */ lw $a3, 0x28($s6) -/* B28E58 80240E28 0C01242D */ jal func_800490B4 -/* B28E5C 80240E2C 02A0282D */ daddu $a1, $s5, $zero -/* B28E60 80240E30 14400022 */ bnez $v0, .L80240EBC -/* B28E64 80240E34 24040002 */ addiu $a0, $zero, 2 -/* B28E68 80240E38 0260282D */ daddu $a1, $s3, $zero -/* B28E6C 80240E3C 0000302D */ daddu $a2, $zero, $zero -/* B28E70 80240E40 866300A8 */ lh $v1, 0xa8($s3) -/* B28E74 80240E44 3C013F80 */ lui $at, 0x3f80 -/* B28E78 80240E48 44810000 */ mtc1 $at, $f0 -/* B28E7C 80240E4C 3C014000 */ lui $at, 0x4000 -/* B28E80 80240E50 44811000 */ mtc1 $at, $f2 -/* B28E84 80240E54 3C01C1A0 */ lui $at, 0xc1a0 -/* B28E88 80240E58 44812000 */ mtc1 $at, $f4 -/* B28E8C 80240E5C 2402000F */ addiu $v0, $zero, 0xf -/* B28E90 80240E60 AFA2001C */ sw $v0, 0x1c($sp) -/* B28E94 80240E64 44834000 */ mtc1 $v1, $f8 -/* B28E98 80240E68 00000000 */ nop -/* B28E9C 80240E6C 46804220 */ cvt.s.w $f8, $f8 -/* B28EA0 80240E70 44074000 */ mfc1 $a3, $f8 -/* B28EA4 80240E74 27A2003C */ addiu $v0, $sp, 0x3c -/* B28EA8 80240E78 AFA20020 */ sw $v0, 0x20($sp) -/* B28EAC 80240E7C E7A00010 */ swc1 $f0, 0x10($sp) -/* B28EB0 80240E80 E7A20014 */ swc1 $f2, 0x14($sp) -/* B28EB4 80240E84 0C01BFA4 */ jal fx_emote -/* B28EB8 80240E88 E7A40018 */ swc1 $f4, 0x18($sp) -/* B28EBC 80240E8C 24020019 */ addiu $v0, $zero, 0x19 -/* B28EC0 80240E90 A662008E */ sh $v0, 0x8e($s3) -/* B28EC4 80240E94 2402000E */ addiu $v0, $zero, 0xe -/* B28EC8 80240E98 080903AF */ j .L80240EBC -/* B28ECC 80240E9C AE820070 */ sw $v0, 0x70($s4) -.L80240EA0: -/* B28ED0 80240EA0 C664003C */ lwc1 $f4, 0x3c($s3) -/* B28ED4 80240EA4 C660001C */ lwc1 $f0, 0x1c($s3) -/* B28ED8 80240EA8 46002100 */ add.s $f4, $f4, $f0 -/* B28EDC 80240EAC C6620014 */ lwc1 $f2, 0x14($s3) -/* B28EE0 80240EB0 46020001 */ sub.s $f0, $f0, $f2 -/* B28EE4 80240EB4 E664003C */ swc1 $f4, 0x3c($s3) -/* B28EE8 80240EB8 E660001C */ swc1 $f0, 0x1c($s3) -.L80240EBC: -/* B28EEC 80240EBC 8FBF0060 */ lw $ra, 0x60($sp) -/* B28EF0 80240EC0 8FB7005C */ lw $s7, 0x5c($sp) -/* B28EF4 80240EC4 8FB60058 */ lw $s6, 0x58($sp) -/* B28EF8 80240EC8 8FB50054 */ lw $s5, 0x54($sp) -/* B28EFC 80240ECC 8FB40050 */ lw $s4, 0x50($sp) -/* B28F00 80240ED0 8FB3004C */ lw $s3, 0x4c($sp) -/* B28F04 80240ED4 8FB20048 */ lw $s2, 0x48($sp) -/* B28F08 80240ED8 8FB10044 */ lw $s1, 0x44($sp) -/* B28F0C 80240EDC 8FB00040 */ lw $s0, 0x40($sp) -/* B28F10 80240EE0 D7B40068 */ ldc1 $f20, 0x68($sp) -/* B28F14 80240EE4 03E00008 */ jr $ra -/* B28F18 80240EE8 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_jan/jan_01/func_80240EEC_B28030.s b/asm/nonmatchings/world/area_jan/jan_01/func_80240EEC_B28030.s deleted file mode 100644 index ad1ffa7704..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/func_80240EEC_B28030.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_B28F1C -/* B28F1C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B28F20 80240EF0 AFB00010 */ sw $s0, 0x10($sp) -/* B28F24 80240EF4 0080802D */ daddu $s0, $a0, $zero -/* B28F28 80240EF8 AFBF0014 */ sw $ra, 0x14($sp) -/* B28F2C 80240EFC 8E020148 */ lw $v0, 0x148($s0) -/* B28F30 80240F00 0C00EABB */ jal get_npc_unsafe -/* B28F34 80240F04 84440008 */ lh $a0, 8($v0) -/* B28F38 80240F08 9443008E */ lhu $v1, 0x8e($v0) -/* B28F3C 80240F0C 2463FFFF */ addiu $v1, $v1, -1 -/* B28F40 80240F10 A443008E */ sh $v1, 0x8e($v0) -/* B28F44 80240F14 00031C00 */ sll $v1, $v1, 0x10 -/* B28F48 80240F18 58600001 */ blezl $v1, .L80240F20 -/* B28F4C 80240F1C AE000070 */ sw $zero, 0x70($s0) -.L80240F20: -/* B28F50 80240F20 8FBF0014 */ lw $ra, 0x14($sp) -/* B28F54 80240F24 8FB00010 */ lw $s0, 0x10($sp) -/* B28F58 80240F28 03E00008 */ jr $ra -/* B28F5C 80240F2C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_01/func_80240F30_B28030.s b/asm/nonmatchings/world/area_jan/jan_01/func_80240F30_B28030.s deleted file mode 100644 index ab922d92fa..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/func_80240F30_B28030.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F30_B28F60 -/* B28F60 80240F30 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B28F64 80240F34 AFB3003C */ sw $s3, 0x3c($sp) -/* B28F68 80240F38 0080982D */ daddu $s3, $a0, $zero -/* B28F6C 80240F3C AFBF0048 */ sw $ra, 0x48($sp) -/* B28F70 80240F40 AFB50044 */ sw $s5, 0x44($sp) -/* B28F74 80240F44 AFB40040 */ sw $s4, 0x40($sp) -/* B28F78 80240F48 AFB20038 */ sw $s2, 0x38($sp) -/* B28F7C 80240F4C AFB10034 */ sw $s1, 0x34($sp) -/* B28F80 80240F50 AFB00030 */ sw $s0, 0x30($sp) -/* B28F84 80240F54 8E720148 */ lw $s2, 0x148($s3) -/* B28F88 80240F58 86440008 */ lh $a0, 8($s2) -/* B28F8C 80240F5C 8E70000C */ lw $s0, 0xc($s3) -/* B28F90 80240F60 0C00EABB */ jal get_npc_unsafe -/* B28F94 80240F64 00A0882D */ daddu $s1, $a1, $zero -/* B28F98 80240F68 8E050000 */ lw $a1, ($s0) -/* B28F9C 80240F6C 26100004 */ addiu $s0, $s0, 4 -/* B28FA0 80240F70 0260202D */ daddu $a0, $s3, $zero -/* B28FA4 80240F74 0C0B1EAF */ jal get_variable -/* B28FA8 80240F78 0040A82D */ daddu $s5, $v0, $zero -/* B28FAC 80240F7C 0260202D */ daddu $a0, $s3, $zero -/* B28FB0 80240F80 8E050000 */ lw $a1, ($s0) -/* B28FB4 80240F84 0C0B1EAF */ jal get_variable -/* B28FB8 80240F88 0040A02D */ daddu $s4, $v0, $zero -/* B28FBC 80240F8C AE420094 */ sw $v0, 0x94($s2) -/* B28FC0 80240F90 AFA00010 */ sw $zero, 0x10($sp) -/* B28FC4 80240F94 8E4200D0 */ lw $v0, 0xd0($s2) -/* B28FC8 80240F98 8C420030 */ lw $v0, 0x30($v0) -/* B28FCC 80240F9C AFA20014 */ sw $v0, 0x14($sp) -/* B28FD0 80240FA0 8E4200D0 */ lw $v0, 0xd0($s2) -/* B28FD4 80240FA4 8C42001C */ lw $v0, 0x1c($v0) -/* B28FD8 80240FA8 AFA20018 */ sw $v0, 0x18($sp) -/* B28FDC 80240FAC 8E4200D0 */ lw $v0, 0xd0($s2) -/* B28FE0 80240FB0 8C420024 */ lw $v0, 0x24($v0) -/* B28FE4 80240FB4 AFA2001C */ sw $v0, 0x1c($sp) -/* B28FE8 80240FB8 8E4200D0 */ lw $v0, 0xd0($s2) -/* B28FEC 80240FBC 8C420028 */ lw $v0, 0x28($v0) -/* B28FF0 80240FC0 AFA20020 */ sw $v0, 0x20($sp) -/* B28FF4 80240FC4 8E4200D0 */ lw $v0, 0xd0($s2) -/* B28FF8 80240FC8 3C0142C8 */ lui $at, 0x42c8 -/* B28FFC 80240FCC 44810000 */ mtc1 $at, $f0 -/* B29000 80240FD0 8C42002C */ lw $v0, 0x2c($v0) -/* B29004 80240FD4 27B00010 */ addiu $s0, $sp, 0x10 -/* B29008 80240FD8 E7A00028 */ swc1 $f0, 0x28($sp) -/* B2900C 80240FDC A7A0002C */ sh $zero, 0x2c($sp) -/* B29010 80240FE0 12200019 */ beqz $s1, .L80241048 -/* B29014 80240FE4 AFA20024 */ sw $v0, 0x24($sp) -/* B29018 80240FE8 AE600070 */ sw $zero, 0x70($s3) -/* B2901C 80240FEC A6A0008E */ sh $zero, 0x8e($s5) -/* B29020 80240FF0 AE600074 */ sw $zero, 0x74($s3) -/* B29024 80240FF4 8EA20000 */ lw $v0, ($s5) -/* B29028 80240FF8 2403F7FF */ addiu $v1, $zero, -0x801 -/* B2902C 80240FFC 00431024 */ and $v0, $v0, $v1 -/* B29030 80241000 2403FDFF */ addiu $v1, $zero, -0x201 -/* B29034 80241004 00431024 */ and $v0, $v0, $v1 -/* B29038 80241008 34420008 */ ori $v0, $v0, 8 -/* B2903C 8024100C AEA20000 */ sw $v0, ($s5) -/* B29040 80241010 8E4200B0 */ lw $v0, 0xb0($s2) -/* B29044 80241014 34420018 */ ori $v0, $v0, 0x18 -/* B29048 80241018 AE4200B0 */ sw $v0, 0xb0($s2) -/* B2904C 8024101C 8E420000 */ lw $v0, ($s2) -/* B29050 80241020 3C034000 */ lui $v1, 0x4000 -/* B29054 80241024 00431024 */ and $v0, $v0, $v1 -/* B29058 80241028 10400007 */ beqz $v0, .L80241048 -/* B2905C 8024102C 3C03BFFF */ lui $v1, 0xbfff -/* B29060 80241030 2402000C */ addiu $v0, $zero, 0xc -/* B29064 80241034 AE620070 */ sw $v0, 0x70($s3) -/* B29068 80241038 8E420000 */ lw $v0, ($s2) -/* B2906C 8024103C 3463FFFF */ ori $v1, $v1, 0xffff -/* B29070 80241040 00431024 */ and $v0, $v0, $v1 -/* B29074 80241044 AE420000 */ sw $v0, ($s2) -.L80241048: -/* B29078 80241048 8E4300B0 */ lw $v1, 0xb0($s2) -/* B2907C 8024104C 30620004 */ andi $v0, $v1, 4 -/* B29080 80241050 10400007 */ beqz $v0, .L80241070 -/* B29084 80241054 00000000 */ nop -/* B29088 80241058 824200B4 */ lb $v0, 0xb4($s2) -/* B2908C 8024105C 14400034 */ bnez $v0, .L80241130 -/* B29090 80241060 0000102D */ daddu $v0, $zero, $zero -/* B29094 80241064 2402FFFB */ addiu $v0, $zero, -5 -/* B29098 80241068 00621024 */ and $v0, $v1, $v0 -/* B2909C 8024106C AE4200B0 */ sw $v0, 0xb0($s2) -.L80241070: -/* B290A0 80241070 8E630070 */ lw $v1, 0x70($s3) -/* B290A4 80241074 2C62000F */ sltiu $v0, $v1, 0xf -/* B290A8 80241078 1040002C */ beqz $v0, .L8024112C -/* B290AC 8024107C 00031080 */ sll $v0, $v1, 2 -/* B290B0 80241080 3C018024 */ lui $at, 0x8024 -/* B290B4 80241084 00220821 */ addu $at, $at, $v0 -/* B290B8 80241088 8C2243F8 */ lw $v0, 0x43f8($at) -/* B290BC 8024108C 00400008 */ jr $v0 -/* B290C0 80241090 00000000 */ nop -/* B290C4 80241094 0260202D */ daddu $a0, $s3, $zero -/* B290C8 80241098 0280282D */ daddu $a1, $s4, $zero -/* B290CC 8024109C 0C0900D0 */ jal func_80240340 -/* B290D0 802410A0 0200302D */ daddu $a2, $s0, $zero -/* B290D4 802410A4 0260202D */ daddu $a0, $s3, $zero -/* B290D8 802410A8 0280282D */ daddu $a1, $s4, $zero -/* B290DC 802410AC 0C09015C */ jal func_80240570 -/* B290E0 802410B0 0200302D */ daddu $a2, $s0, $zero -/* B290E4 802410B4 0809044C */ j .L80241130 -/* B290E8 802410B8 0000102D */ daddu $v0, $zero, $zero -/* B290EC 802410BC 0260202D */ daddu $a0, $s3, $zero -/* B290F0 802410C0 0280282D */ daddu $a1, $s4, $zero -/* B290F4 802410C4 0C09022A */ jal func_802408A8 -/* B290F8 802410C8 0200302D */ daddu $a2, $s0, $zero -/* B290FC 802410CC 8E630070 */ lw $v1, 0x70($s3) -/* B29100 802410D0 24020003 */ addiu $v0, $zero, 3 -/* B29104 802410D4 14620016 */ bne $v1, $v0, .L80241130 -/* B29108 802410D8 0000102D */ daddu $v0, $zero, $zero -/* B2910C 802410DC 0260202D */ daddu $a0, $s3, $zero -/* B29110 802410E0 0280282D */ daddu $a1, $s4, $zero -/* B29114 802410E4 0C09025A */ jal func_80240968 -/* B29118 802410E8 0200302D */ daddu $a2, $s0, $zero -/* B2911C 802410EC 0809044C */ j .L80241130 -/* B29120 802410F0 0000102D */ daddu $v0, $zero, $zero -/* B29124 802410F4 0260202D */ daddu $a0, $s3, $zero -/* B29128 802410F8 0280282D */ daddu $a1, $s4, $zero -/* B2912C 802410FC 0C0902C3 */ jal func_80240B0C -/* B29130 80241100 0200302D */ daddu $a2, $s0, $zero -/* B29134 80241104 0260202D */ daddu $a0, $s3, $zero -/* B29138 80241108 0280282D */ daddu $a1, $s4, $zero -/* B2913C 8024110C 0C0902FB */ jal func_80240BEC -/* B29140 80241110 0200302D */ daddu $a2, $s0, $zero -/* B29144 80241114 0809044C */ j .L80241130 -/* B29148 80241118 0000102D */ daddu $v0, $zero, $zero -/* B2914C 8024111C 0260202D */ daddu $a0, $s3, $zero -/* B29150 80241120 0280282D */ daddu $a1, $s4, $zero -/* B29154 80241124 0C0903BB */ jal func_80240EEC -/* B29158 80241128 0200302D */ daddu $a2, $s0, $zero -.L8024112C: -/* B2915C 8024112C 0000102D */ daddu $v0, $zero, $zero -.L80241130: -/* B29160 80241130 8FBF0048 */ lw $ra, 0x48($sp) -/* B29164 80241134 8FB50044 */ lw $s5, 0x44($sp) -/* B29168 80241138 8FB40040 */ lw $s4, 0x40($sp) -/* B2916C 8024113C 8FB3003C */ lw $s3, 0x3c($sp) -/* B29170 80241140 8FB20038 */ lw $s2, 0x38($sp) -/* B29174 80241144 8FB10034 */ lw $s1, 0x34($sp) -/* B29178 80241148 8FB00030 */ lw $s0, 0x30($sp) -/* B2917C 8024114C 03E00008 */ jr $ra -/* B29180 80241150 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_01/func_80241154_B28030.s b/asm/nonmatchings/world/area_jan/jan_01/func_80241154_B28030.s deleted file mode 100644 index aa89bd5d1c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/func_80241154_B28030.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241154_B29184 -/* B29184 80241154 3C03800B */ lui $v1, %hi(gCameras) -/* B29188 80241158 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* B2918C 8024115C 94620000 */ lhu $v0, ($v1) -/* B29190 80241160 34421000 */ ori $v0, $v0, 0x1000 -/* B29194 80241164 A4620000 */ sh $v0, ($v1) -/* B29198 80241168 03E00008 */ jr $ra -/* B2919C 8024116C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_01/func_80241190_B28030.s b/asm/nonmatchings/world/area_jan/jan_01/func_80241190_B28030.s deleted file mode 100644 index 3af82a23af..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/func_80241190_B28030.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241190_B291C0 -/* B291C0 80241190 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B291C4 80241194 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B291C8 80241198 4485A000 */ mtc1 $a1, $f20 -/* B291CC 8024119C F7B60020 */ sdc1 $f22, 0x20($sp) -/* B291D0 802411A0 4486B000 */ mtc1 $a2, $f22 -/* B291D4 802411A4 AFB00010 */ sw $s0, 0x10($sp) -/* B291D8 802411A8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B291DC 802411AC 4487C000 */ mtc1 $a3, $f24 -/* B291E0 802411B0 AFBF0014 */ sw $ra, 0x14($sp) -/* B291E4 802411B4 0C019D28 */ jal guMtxIdentF -/* B291E8 802411B8 0080802D */ daddu $s0, $a0, $zero -/* B291EC 802411BC 4616A582 */ mul.s $f22, $f20, $f22 -/* B291F0 802411C0 00000000 */ nop -/* B291F4 802411C4 4618A502 */ mul.s $f20, $f20, $f24 -/* B291F8 802411C8 00000000 */ nop -/* B291FC 802411CC 3C013F80 */ lui $at, 0x3f80 -/* B29200 802411D0 44810000 */ mtc1 $at, $f0 -/* B29204 802411D4 00000000 */ nop -/* B29208 802411D8 E6000014 */ swc1 $f0, 0x14($s0) -/* B2920C 802411DC E6160010 */ swc1 $f22, 0x10($s0) -/* B29210 802411E0 E6140018 */ swc1 $f20, 0x18($s0) -/* B29214 802411E4 8FBF0014 */ lw $ra, 0x14($sp) -/* B29218 802411E8 8FB00010 */ lw $s0, 0x10($sp) -/* B2921C 802411EC D7B80028 */ ldc1 $f24, 0x28($sp) -/* B29220 802411F0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B29224 802411F4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B29228 802411F8 03E00008 */ jr $ra -/* B2922C 802411FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_01/func_80241200_B28030.s b/asm/nonmatchings/world/area_jan/jan_01/func_80241200_B28030.s deleted file mode 100644 index 517c004de9..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/func_80241200_B28030.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241200_B29230 -/* B29230 80241200 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B29234 80241204 AFB10054 */ sw $s1, 0x54($sp) -/* B29238 80241208 0080882D */ daddu $s1, $a0, $zero -/* B2923C 8024120C AFBF005C */ sw $ra, 0x5c($sp) -/* B29240 80241210 AFB20058 */ sw $s2, 0x58($sp) -/* B29244 80241214 AFB00050 */ sw $s0, 0x50($sp) -/* B29248 80241218 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B2924C 8024121C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B29250 80241220 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B29254 80241224 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B29258 80241228 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B2925C 8024122C 8E30000C */ lw $s0, 0xc($s1) -/* B29260 80241230 8E050000 */ lw $a1, ($s0) -/* B29264 80241234 0C0B1EAF */ jal get_variable -/* B29268 80241238 26100004 */ addiu $s0, $s0, 4 -/* B2926C 8024123C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B29270 80241240 0040202D */ daddu $a0, $v0, $zero -/* B29274 80241244 8E050000 */ lw $a1, ($s0) -/* B29278 80241248 26100004 */ addiu $s0, $s0, 4 -/* B2927C 8024124C 0220202D */ daddu $a0, $s1, $zero -/* B29280 80241250 0C0B210B */ jal get_float_variable -/* B29284 80241254 0040902D */ daddu $s2, $v0, $zero -/* B29288 80241258 8E050000 */ lw $a1, ($s0) -/* B2928C 8024125C 26100004 */ addiu $s0, $s0, 4 -/* B29290 80241260 0220202D */ daddu $a0, $s1, $zero -/* B29294 80241264 0C0B210B */ jal get_float_variable -/* B29298 80241268 46000706 */ mov.s $f28, $f0 -/* B2929C 8024126C 8E050000 */ lw $a1, ($s0) -/* B292A0 80241270 26100004 */ addiu $s0, $s0, 4 -/* B292A4 80241274 0220202D */ daddu $a0, $s1, $zero -/* B292A8 80241278 0C0B210B */ jal get_float_variable -/* B292AC 8024127C 46000686 */ mov.s $f26, $f0 -/* B292B0 80241280 0220202D */ daddu $a0, $s1, $zero -/* B292B4 80241284 8E050000 */ lw $a1, ($s0) -/* B292B8 80241288 0C0B210B */ jal get_float_variable -/* B292BC 8024128C 46000586 */ mov.s $f22, $f0 -/* B292C0 80241290 0240202D */ daddu $a0, $s2, $zero -/* B292C4 80241294 0C046B4C */ jal get_model_from_list_index -/* B292C8 80241298 46000606 */ mov.s $f24, $f0 -/* B292CC 8024129C 0040882D */ daddu $s1, $v0, $zero -/* B292D0 802412A0 96220000 */ lhu $v0, ($s1) -/* B292D4 802412A4 30420400 */ andi $v0, $v0, 0x400 -/* B292D8 802412A8 1440001E */ bnez $v0, .L80241324 -/* B292DC 802412AC 26300058 */ addiu $s0, $s1, 0x58 -/* B292E0 802412B0 4480A000 */ mtc1 $zero, $f20 -/* B292E4 802412B4 4406B000 */ mfc1 $a2, $f22 -/* B292E8 802412B8 4405A000 */ mfc1 $a1, $f20 -/* B292EC 802412BC 4407A000 */ mfc1 $a3, $f20 -/* B292F0 802412C0 0C019E40 */ jal guTranslateF -/* B292F4 802412C4 0200202D */ daddu $a0, $s0, $zero -/* B292F8 802412C8 4405E000 */ mfc1 $a1, $f28 -/* B292FC 802412CC 4406D000 */ mfc1 $a2, $f26 -/* B29300 802412D0 4407C000 */ mfc1 $a3, $f24 -/* B29304 802412D4 0C090464 */ jal func_80241190 -/* B29308 802412D8 27A40010 */ addiu $a0, $sp, 0x10 -/* B2930C 802412DC 27A40010 */ addiu $a0, $sp, 0x10 -/* B29310 802412E0 0200282D */ daddu $a1, $s0, $zero -/* B29314 802412E4 0C019D80 */ jal guMtxCatF -/* B29318 802412E8 0200302D */ daddu $a2, $s0, $zero -/* B2931C 802412EC 27A40010 */ addiu $a0, $sp, 0x10 -/* B29320 802412F0 4600B587 */ neg.s $f22, $f22 -/* B29324 802412F4 4405A000 */ mfc1 $a1, $f20 -/* B29328 802412F8 4406B000 */ mfc1 $a2, $f22 -/* B2932C 802412FC 0C019E40 */ jal guTranslateF -/* B29330 80241300 00A0382D */ daddu $a3, $a1, $zero -/* B29334 80241304 27A40010 */ addiu $a0, $sp, 0x10 -/* B29338 80241308 0200282D */ daddu $a1, $s0, $zero -/* B2933C 8024130C 0C019D80 */ jal guMtxCatF -/* B29340 80241310 00A0302D */ daddu $a2, $a1, $zero -/* B29344 80241314 96220000 */ lhu $v0, ($s1) -/* B29348 80241318 34421400 */ ori $v0, $v0, 0x1400 -/* B2934C 8024131C 080904E7 */ j .L8024139C -/* B29350 80241320 A6220000 */ sh $v0, ($s1) -.L80241324: -/* B29354 80241324 4480A000 */ mtc1 $zero, $f20 -/* B29358 80241328 4406B000 */ mfc1 $a2, $f22 -/* B2935C 8024132C 4405A000 */ mfc1 $a1, $f20 -/* B29360 80241330 4407A000 */ mfc1 $a3, $f20 -/* B29364 80241334 0C019E40 */ jal guTranslateF -/* B29368 80241338 27A40010 */ addiu $a0, $sp, 0x10 -/* B2936C 8024133C 27A40010 */ addiu $a0, $sp, 0x10 -/* B29370 80241340 26300058 */ addiu $s0, $s1, 0x58 -/* B29374 80241344 0200282D */ daddu $a1, $s0, $zero -/* B29378 80241348 0C019D80 */ jal guMtxCatF -/* B2937C 8024134C 0200302D */ daddu $a2, $s0, $zero -/* B29380 80241350 4405E000 */ mfc1 $a1, $f28 -/* B29384 80241354 4406D000 */ mfc1 $a2, $f26 -/* B29388 80241358 4407C000 */ mfc1 $a3, $f24 -/* B2938C 8024135C 0C090464 */ jal func_80241190 -/* B29390 80241360 27A40010 */ addiu $a0, $sp, 0x10 -/* B29394 80241364 27A40010 */ addiu $a0, $sp, 0x10 -/* B29398 80241368 0200282D */ daddu $a1, $s0, $zero -/* B2939C 8024136C 0C019D80 */ jal guMtxCatF -/* B293A0 80241370 0200302D */ daddu $a2, $s0, $zero -/* B293A4 80241374 27A40010 */ addiu $a0, $sp, 0x10 -/* B293A8 80241378 4600B587 */ neg.s $f22, $f22 -/* B293AC 8024137C 4405A000 */ mfc1 $a1, $f20 -/* B293B0 80241380 4406B000 */ mfc1 $a2, $f22 -/* B293B4 80241384 0C019E40 */ jal guTranslateF -/* B293B8 80241388 00A0382D */ daddu $a3, $a1, $zero -/* B293BC 8024138C 27A40010 */ addiu $a0, $sp, 0x10 -/* B293C0 80241390 0200282D */ daddu $a1, $s0, $zero -/* B293C4 80241394 0C019D80 */ jal guMtxCatF -/* B293C8 80241398 00A0302D */ daddu $a2, $a1, $zero -.L8024139C: -/* B293CC 8024139C 8FBF005C */ lw $ra, 0x5c($sp) -/* B293D0 802413A0 8FB20058 */ lw $s2, 0x58($sp) -/* B293D4 802413A4 8FB10054 */ lw $s1, 0x54($sp) -/* B293D8 802413A8 8FB00050 */ lw $s0, 0x50($sp) -/* B293DC 802413AC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B293E0 802413B0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B293E4 802413B4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B293E8 802413B8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B293EC 802413BC D7B40060 */ ldc1 $f20, 0x60($sp) -/* B293F0 802413C0 24020002 */ addiu $v0, $zero, 2 -/* B293F4 802413C4 03E00008 */ jr $ra -/* B293F8 802413C8 27BD0088 */ addiu $sp, $sp, 0x88 -/* B293FC 802413CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80240030_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80240030_B2C470.s deleted file mode 100644 index 7eae0fe52b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80240030_B2C470.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240030_B2C4A0 -/* B2C4A0 80240030 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2C4A4 80240034 AFB00010 */ sw $s0, 0x10($sp) -/* B2C4A8 80240038 0080802D */ daddu $s0, $a0, $zero -/* B2C4AC 8024003C AFBF0014 */ sw $ra, 0x14($sp) -/* B2C4B0 80240040 8E0300A8 */ lw $v1, 0xa8($s0) -/* B2C4B4 80240044 8E020088 */ lw $v0, 0x88($s0) -/* B2C4B8 80240048 00621821 */ addu $v1, $v1, $v0 -/* B2C4BC 8024004C 04610004 */ bgez $v1, .L80240060 -/* B2C4C0 80240050 AE0300A8 */ sw $v1, 0xa8($s0) -/* B2C4C4 80240054 3C020002 */ lui $v0, 2 -/* B2C4C8 80240058 0809001C */ j .L80240070 -/* B2C4CC 8024005C 00621021 */ addu $v0, $v1, $v0 -.L80240060: -/* B2C4D0 80240060 3C040002 */ lui $a0, 2 -/* B2C4D4 80240064 0083102A */ slt $v0, $a0, $v1 -/* B2C4D8 80240068 10400002 */ beqz $v0, .L80240074 -/* B2C4DC 8024006C 00641023 */ subu $v0, $v1, $a0 -.L80240070: -/* B2C4E0 80240070 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240074: -/* B2C4E4 80240074 8E0300AC */ lw $v1, 0xac($s0) -/* B2C4E8 80240078 8E02008C */ lw $v0, 0x8c($s0) -/* B2C4EC 8024007C 00621821 */ addu $v1, $v1, $v0 -/* B2C4F0 80240080 04610004 */ bgez $v1, .L80240094 -/* B2C4F4 80240084 AE0300AC */ sw $v1, 0xac($s0) -/* B2C4F8 80240088 3C020002 */ lui $v0, 2 -/* B2C4FC 8024008C 08090029 */ j .L802400A4 -/* B2C500 80240090 00621021 */ addu $v0, $v1, $v0 -.L80240094: -/* B2C504 80240094 3C040002 */ lui $a0, 2 -/* B2C508 80240098 0083102A */ slt $v0, $a0, $v1 -/* B2C50C 8024009C 10400002 */ beqz $v0, .L802400A8 -/* B2C510 802400A0 00641023 */ subu $v0, $v1, $a0 -.L802400A4: -/* B2C514 802400A4 AE0200AC */ sw $v0, 0xac($s0) -.L802400A8: -/* B2C518 802400A8 8E0300B0 */ lw $v1, 0xb0($s0) -/* B2C51C 802400AC 8E020090 */ lw $v0, 0x90($s0) -/* B2C520 802400B0 00621821 */ addu $v1, $v1, $v0 -/* B2C524 802400B4 04610004 */ bgez $v1, .L802400C8 -/* B2C528 802400B8 AE0300B0 */ sw $v1, 0xb0($s0) -/* B2C52C 802400BC 3C020002 */ lui $v0, 2 -/* B2C530 802400C0 08090036 */ j .L802400D8 -/* B2C534 802400C4 00621021 */ addu $v0, $v1, $v0 -.L802400C8: -/* B2C538 802400C8 3C040002 */ lui $a0, 2 -/* B2C53C 802400CC 0083102A */ slt $v0, $a0, $v1 -/* B2C540 802400D0 10400002 */ beqz $v0, .L802400DC -/* B2C544 802400D4 00641023 */ subu $v0, $v1, $a0 -.L802400D8: -/* B2C548 802400D8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400DC: -/* B2C54C 802400DC 8E0300B4 */ lw $v1, 0xb4($s0) -/* B2C550 802400E0 8E020094 */ lw $v0, 0x94($s0) -/* B2C554 802400E4 00621821 */ addu $v1, $v1, $v0 -/* B2C558 802400E8 04610004 */ bgez $v1, .L802400FC -/* B2C55C 802400EC AE0300B4 */ sw $v1, 0xb4($s0) -/* B2C560 802400F0 3C020002 */ lui $v0, 2 -/* B2C564 802400F4 08090043 */ j .L8024010C -/* B2C568 802400F8 00621021 */ addu $v0, $v1, $v0 -.L802400FC: -/* B2C56C 802400FC 3C040002 */ lui $a0, 2 -/* B2C570 80240100 0083102A */ slt $v0, $a0, $v1 -/* B2C574 80240104 10400002 */ beqz $v0, .L80240110 -/* B2C578 80240108 00641023 */ subu $v0, $v1, $a0 -.L8024010C: -/* B2C57C 8024010C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240110: -/* B2C580 80240110 8E040084 */ lw $a0, 0x84($s0) -/* B2C584 80240114 0C046F07 */ jal set_main_pan_u -/* B2C588 80240118 8E0500A8 */ lw $a1, 0xa8($s0) -/* B2C58C 8024011C 8E040084 */ lw $a0, 0x84($s0) -/* B2C590 80240120 0C046F0D */ jal set_main_pan_v -/* B2C594 80240124 8E0500AC */ lw $a1, 0xac($s0) -/* B2C598 80240128 8E040084 */ lw $a0, 0x84($s0) -/* B2C59C 8024012C 0C046F13 */ jal set_aux_pan_u -/* B2C5A0 80240130 8E0500B0 */ lw $a1, 0xb0($s0) -/* B2C5A4 80240134 8E040084 */ lw $a0, 0x84($s0) -/* B2C5A8 80240138 0C046F19 */ jal set_aux_pan_v -/* B2C5AC 8024013C 8E0500B4 */ lw $a1, 0xb4($s0) -/* B2C5B0 80240140 8FBF0014 */ lw $ra, 0x14($sp) -/* B2C5B4 80240144 8FB00010 */ lw $s0, 0x10($sp) -/* B2C5B8 80240148 0000102D */ daddu $v0, $zero, $zero -/* B2C5BC 8024014C 03E00008 */ jr $ra -/* B2C5C0 80240150 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80240154_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80240154_B2C470.s deleted file mode 100644 index 5dc2f1a2b2..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80240154_B2C470.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240154_B2C5C4 -/* B2C5C4 80240154 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2C5C8 80240158 AFB00010 */ sw $s0, 0x10($sp) -/* B2C5CC 8024015C 0080802D */ daddu $s0, $a0, $zero -/* B2C5D0 80240160 10A00005 */ beqz $a1, .L80240178 -/* B2C5D4 80240164 AFBF0014 */ sw $ra, 0x14($sp) -/* B2C5D8 80240168 AE000070 */ sw $zero, 0x70($s0) -/* B2C5DC 8024016C AE000074 */ sw $zero, 0x74($s0) -/* B2C5E0 80240170 AE000078 */ sw $zero, 0x78($s0) -/* B2C5E4 80240174 AE00007C */ sw $zero, 0x7c($s0) -.L80240178: -/* B2C5E8 80240178 8E020070 */ lw $v0, 0x70($s0) -/* B2C5EC 8024017C 1440000E */ bnez $v0, .L802401B8 -/* B2C5F0 80240180 00000000 */ nop -/* B2C5F4 80240184 8E0300A8 */ lw $v1, 0xa8($s0) -/* B2C5F8 80240188 8E020088 */ lw $v0, 0x88($s0) -/* B2C5FC 8024018C 00621821 */ addu $v1, $v1, $v0 -/* B2C600 80240190 04610004 */ bgez $v1, .L802401A4 -/* B2C604 80240194 AE0300A8 */ sw $v1, 0xa8($s0) -/* B2C608 80240198 3C020002 */ lui $v0, 2 -/* B2C60C 8024019C 0809006D */ j .L802401B4 -/* B2C610 802401A0 00621021 */ addu $v0, $v1, $v0 -.L802401A4: -/* B2C614 802401A4 3C040002 */ lui $a0, 2 -/* B2C618 802401A8 0083102A */ slt $v0, $a0, $v1 -/* B2C61C 802401AC 10400002 */ beqz $v0, .L802401B8 -/* B2C620 802401B0 00641023 */ subu $v0, $v1, $a0 -.L802401B4: -/* B2C624 802401B4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401B8: -/* B2C628 802401B8 8E020074 */ lw $v0, 0x74($s0) -/* B2C62C 802401BC 1440000E */ bnez $v0, .L802401F8 -/* B2C630 802401C0 00000000 */ nop -/* B2C634 802401C4 8E0300AC */ lw $v1, 0xac($s0) -/* B2C638 802401C8 8E02008C */ lw $v0, 0x8c($s0) -/* B2C63C 802401CC 00621821 */ addu $v1, $v1, $v0 -/* B2C640 802401D0 04610004 */ bgez $v1, .L802401E4 -/* B2C644 802401D4 AE0300AC */ sw $v1, 0xac($s0) -/* B2C648 802401D8 3C020002 */ lui $v0, 2 -/* B2C64C 802401DC 0809007D */ j .L802401F4 -/* B2C650 802401E0 00621021 */ addu $v0, $v1, $v0 -.L802401E4: -/* B2C654 802401E4 3C040002 */ lui $a0, 2 -/* B2C658 802401E8 0083102A */ slt $v0, $a0, $v1 -/* B2C65C 802401EC 10400002 */ beqz $v0, .L802401F8 -/* B2C660 802401F0 00641023 */ subu $v0, $v1, $a0 -.L802401F4: -/* B2C664 802401F4 AE0200AC */ sw $v0, 0xac($s0) -.L802401F8: -/* B2C668 802401F8 8E020078 */ lw $v0, 0x78($s0) -/* B2C66C 802401FC 1440000E */ bnez $v0, .L80240238 -/* B2C670 80240200 00000000 */ nop -/* B2C674 80240204 8E0300B0 */ lw $v1, 0xb0($s0) -/* B2C678 80240208 8E020090 */ lw $v0, 0x90($s0) -/* B2C67C 8024020C 00621821 */ addu $v1, $v1, $v0 -/* B2C680 80240210 04610004 */ bgez $v1, .L80240224 -/* B2C684 80240214 AE0300B0 */ sw $v1, 0xb0($s0) -/* B2C688 80240218 3C020002 */ lui $v0, 2 -/* B2C68C 8024021C 0809008D */ j .L80240234 -/* B2C690 80240220 00621021 */ addu $v0, $v1, $v0 -.L80240224: -/* B2C694 80240224 3C040002 */ lui $a0, 2 -/* B2C698 80240228 0083102A */ slt $v0, $a0, $v1 -/* B2C69C 8024022C 10400002 */ beqz $v0, .L80240238 -/* B2C6A0 80240230 00641023 */ subu $v0, $v1, $a0 -.L80240234: -/* B2C6A4 80240234 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240238: -/* B2C6A8 80240238 8E02007C */ lw $v0, 0x7c($s0) -/* B2C6AC 8024023C 1440000E */ bnez $v0, .L80240278 -/* B2C6B0 80240240 00000000 */ nop -/* B2C6B4 80240244 8E0300B4 */ lw $v1, 0xb4($s0) -/* B2C6B8 80240248 8E020094 */ lw $v0, 0x94($s0) -/* B2C6BC 8024024C 00621821 */ addu $v1, $v1, $v0 -/* B2C6C0 80240250 04610004 */ bgez $v1, .L80240264 -/* B2C6C4 80240254 AE0300B4 */ sw $v1, 0xb4($s0) -/* B2C6C8 80240258 3C020002 */ lui $v0, 2 -/* B2C6CC 8024025C 0809009D */ j .L80240274 -/* B2C6D0 80240260 00621021 */ addu $v0, $v1, $v0 -.L80240264: -/* B2C6D4 80240264 3C040002 */ lui $a0, 2 -/* B2C6D8 80240268 0083102A */ slt $v0, $a0, $v1 -/* B2C6DC 8024026C 10400002 */ beqz $v0, .L80240278 -/* B2C6E0 80240270 00641023 */ subu $v0, $v1, $a0 -.L80240274: -/* B2C6E4 80240274 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240278: -/* B2C6E8 80240278 8E040084 */ lw $a0, 0x84($s0) -/* B2C6EC 8024027C 0C046F07 */ jal set_main_pan_u -/* B2C6F0 80240280 8E0500A8 */ lw $a1, 0xa8($s0) -/* B2C6F4 80240284 8E040084 */ lw $a0, 0x84($s0) -/* B2C6F8 80240288 0C046F0D */ jal set_main_pan_v -/* B2C6FC 8024028C 8E0500AC */ lw $a1, 0xac($s0) -/* B2C700 80240290 8E040084 */ lw $a0, 0x84($s0) -/* B2C704 80240294 0C046F13 */ jal set_aux_pan_u -/* B2C708 80240298 8E0500B0 */ lw $a1, 0xb0($s0) -/* B2C70C 8024029C 8E040084 */ lw $a0, 0x84($s0) -/* B2C710 802402A0 0C046F19 */ jal set_aux_pan_v -/* B2C714 802402A4 8E0500B4 */ lw $a1, 0xb4($s0) -/* B2C718 802402A8 8E020070 */ lw $v0, 0x70($s0) -/* B2C71C 802402AC 8E030078 */ lw $v1, 0x78($s0) -/* B2C720 802402B0 8E040098 */ lw $a0, 0x98($s0) -/* B2C724 802402B4 24420001 */ addiu $v0, $v0, 1 -/* B2C728 802402B8 AE020070 */ sw $v0, 0x70($s0) -/* B2C72C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* B2C730 802402C0 24630001 */ addiu $v1, $v1, 1 -/* B2C734 802402C4 AE030078 */ sw $v1, 0x78($s0) -/* B2C738 802402C8 8E030070 */ lw $v1, 0x70($s0) -/* B2C73C 802402CC 24420001 */ addiu $v0, $v0, 1 -/* B2C740 802402D0 AE020074 */ sw $v0, 0x74($s0) -/* B2C744 802402D4 8E02007C */ lw $v0, 0x7c($s0) -/* B2C748 802402D8 0064182A */ slt $v1, $v1, $a0 -/* B2C74C 802402DC 24420001 */ addiu $v0, $v0, 1 -/* B2C750 802402E0 14600002 */ bnez $v1, .L802402EC -/* B2C754 802402E4 AE02007C */ sw $v0, 0x7c($s0) -/* B2C758 802402E8 AE000070 */ sw $zero, 0x70($s0) -.L802402EC: -/* B2C75C 802402EC 8E020074 */ lw $v0, 0x74($s0) -/* B2C760 802402F0 8E03009C */ lw $v1, 0x9c($s0) -/* B2C764 802402F4 0043102A */ slt $v0, $v0, $v1 -/* B2C768 802402F8 50400001 */ beql $v0, $zero, .L80240300 -/* B2C76C 802402FC AE000074 */ sw $zero, 0x74($s0) -.L80240300: -/* B2C770 80240300 8E020078 */ lw $v0, 0x78($s0) -/* B2C774 80240304 8E0300A0 */ lw $v1, 0xa0($s0) -/* B2C778 80240308 0043102A */ slt $v0, $v0, $v1 -/* B2C77C 8024030C 50400001 */ beql $v0, $zero, .L80240314 -/* B2C780 80240310 AE000078 */ sw $zero, 0x78($s0) -.L80240314: -/* B2C784 80240314 8E02007C */ lw $v0, 0x7c($s0) -/* B2C788 80240318 8E0300A4 */ lw $v1, 0xa4($s0) -/* B2C78C 8024031C 0043102A */ slt $v0, $v0, $v1 -/* B2C790 80240320 50400001 */ beql $v0, $zero, .L80240328 -/* B2C794 80240324 AE00007C */ sw $zero, 0x7c($s0) -.L80240328: -/* B2C798 80240328 8FBF0014 */ lw $ra, 0x14($sp) -/* B2C79C 8024032C 8FB00010 */ lw $s0, 0x10($sp) -/* B2C7A0 80240330 0000102D */ daddu $v0, $zero, $zero -/* B2C7A4 80240334 03E00008 */ jr $ra -/* B2C7A8 80240338 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_8024033C_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_8024033C_B2C470.s deleted file mode 100644 index 9551bc6c08..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_8024033C_B2C470.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024033C_B2C7AC -/* B2C7AC 8024033C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2C7B0 80240340 0000202D */ daddu $a0, $zero, $zero -/* B2C7B4 80240344 AFBF0010 */ sw $ra, 0x10($sp) -/* B2C7B8 80240348 0C052AD8 */ jal func_8014AB60 -/* B2C7BC 8024034C 0080282D */ daddu $a1, $a0, $zero -/* B2C7C0 80240350 8FBF0010 */ lw $ra, 0x10($sp) -/* B2C7C4 80240354 24020002 */ addiu $v0, $zero, 2 -/* B2C7C8 80240358 03E00008 */ jr $ra -/* B2C7CC 8024035C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80240360_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80240360_B2C470.s deleted file mode 100644 index 41f08945d3..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80240360_B2C470.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240360_B2C7D0 -/* B2C7D0 80240360 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2C7D4 80240364 AFB00010 */ sw $s0, 0x10($sp) -/* B2C7D8 80240368 3C108024 */ lui $s0, 0x8024 -/* B2C7DC 8024036C 26102BD8 */ addiu $s0, $s0, 0x2bd8 -/* B2C7E0 80240370 AFBF0014 */ sw $ra, 0x14($sp) -/* B2C7E4 80240374 8E020000 */ lw $v0, ($s0) -/* B2C7E8 80240378 3C038016 */ lui $v1, 0x8016 -/* B2C7EC 8024037C 9463A552 */ lhu $v1, -0x5aae($v1) -/* B2C7F0 80240380 1040000C */ beqz $v0, .L802403B4 -/* B2C7F4 80240384 2402000A */ addiu $v0, $zero, 0xa -/* B2C7F8 80240388 3063FFFF */ andi $v1, $v1, 0xffff -/* B2C7FC 8024038C 10620003 */ beq $v1, $v0, .L8024039C -/* B2C800 80240390 2402000D */ addiu $v0, $zero, 0xd -/* B2C804 80240394 14620013 */ bne $v1, $v0, .L802403E4 -/* B2C808 80240398 00000000 */ nop -.L8024039C: -/* B2C80C 8024039C 24040009 */ addiu $a0, $zero, 9 -/* B2C810 802403A0 24050002 */ addiu $a1, $zero, 2 -/* B2C814 802403A4 0C046DF0 */ jal func_8011B7C0 -/* B2C818 802403A8 0000302D */ daddu $a2, $zero, $zero -/* B2C81C 802403AC 080900F9 */ j .L802403E4 -/* B2C820 802403B0 AE000000 */ sw $zero, ($s0) -.L802403B4: -/* B2C824 802403B4 3063FFFF */ andi $v1, $v1, 0xffff -/* B2C828 802403B8 2402002E */ addiu $v0, $zero, 0x2e -/* B2C82C 802403BC 10620003 */ beq $v1, $v0, .L802403CC -/* B2C830 802403C0 2402002B */ addiu $v0, $zero, 0x2b -/* B2C834 802403C4 14620007 */ bne $v1, $v0, .L802403E4 -/* B2C838 802403C8 00000000 */ nop -.L802403CC: -/* B2C83C 802403CC 24040009 */ addiu $a0, $zero, 9 -/* B2C840 802403D0 24050002 */ addiu $a1, $zero, 2 -/* B2C844 802403D4 0C046DF0 */ jal func_8011B7C0 -/* B2C848 802403D8 24060001 */ addiu $a2, $zero, 1 -/* B2C84C 802403DC 24020001 */ addiu $v0, $zero, 1 -/* B2C850 802403E0 AE020000 */ sw $v0, ($s0) -.L802403E4: -/* B2C854 802403E4 8FBF0014 */ lw $ra, 0x14($sp) -/* B2C858 802403E8 8FB00010 */ lw $s0, 0x10($sp) -/* B2C85C 802403EC 0000102D */ daddu $v0, $zero, $zero -/* B2C860 802403F0 03E00008 */ jr $ra -/* B2C864 802403F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_802403F8_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_802403F8_B2C470.s deleted file mode 100644 index 236883b525..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_802403F8_B2C470.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F8_B2C868 -/* B2C868 802403F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2C86C 802403FC 0000202D */ daddu $a0, $zero, $zero -/* B2C870 80240400 0080282D */ daddu $a1, $a0, $zero -/* B2C874 80240404 0080302D */ daddu $a2, $a0, $zero -/* B2C878 80240408 0080382D */ daddu $a3, $a0, $zero -/* B2C87C 8024040C AFBF0018 */ sw $ra, 0x18($sp) -/* B2C880 80240410 AFA00010 */ sw $zero, 0x10($sp) -/* B2C884 80240414 0C01CA54 */ jal func_80072950 -/* B2C888 80240418 AFA00014 */ sw $zero, 0x14($sp) -/* B2C88C 8024041C 8FBF0018 */ lw $ra, 0x18($sp) -/* B2C890 80240420 24020002 */ addiu $v0, $zero, 2 -/* B2C894 80240424 03E00008 */ jr $ra -/* B2C898 80240428 27BD0020 */ addiu $sp, $sp, 0x20 -/* B2C89C 8024042C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80240830_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80240830_B2C470.s deleted file mode 100644 index 140e1a0d97..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80240830_B2C470.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240830_B2CCA0 -/* B2CCA0 80240830 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B2CCA4 80240834 AFB3001C */ sw $s3, 0x1c($sp) -/* B2CCA8 80240838 0080982D */ daddu $s3, $a0, $zero -/* B2CCAC 8024083C AFBF0020 */ sw $ra, 0x20($sp) -/* B2CCB0 80240840 AFB20018 */ sw $s2, 0x18($sp) -/* B2CCB4 80240844 AFB10014 */ sw $s1, 0x14($sp) -/* B2CCB8 80240848 AFB00010 */ sw $s0, 0x10($sp) -/* B2CCBC 8024084C 8E720148 */ lw $s2, 0x148($s3) -/* B2CCC0 80240850 86440008 */ lh $a0, 8($s2) -/* B2CCC4 80240854 0C00EABB */ jal get_npc_unsafe -/* B2CCC8 80240858 00A0882D */ daddu $s1, $a1, $zero -/* B2CCCC 8024085C 8E240008 */ lw $a0, 8($s1) -/* B2CCD0 80240860 0040802D */ daddu $s0, $v0, $zero -/* B2CCD4 80240864 00041FC2 */ srl $v1, $a0, 0x1f -/* B2CCD8 80240868 00832021 */ addu $a0, $a0, $v1 -/* B2CCDC 8024086C 00042043 */ sra $a0, $a0, 1 -/* B2CCE0 80240870 0C00A67F */ jal rand_int -/* B2CCE4 80240874 24840001 */ addiu $a0, $a0, 1 -/* B2CCE8 80240878 8E230008 */ lw $v1, 8($s1) -/* B2CCEC 8024087C 240400B4 */ addiu $a0, $zero, 0xb4 -/* B2CCF0 80240880 00032FC2 */ srl $a1, $v1, 0x1f -/* B2CCF4 80240884 00651821 */ addu $v1, $v1, $a1 -/* B2CCF8 80240888 00031843 */ sra $v1, $v1, 1 -/* B2CCFC 8024088C 00621821 */ addu $v1, $v1, $v0 -/* B2CD00 80240890 0C00A67F */ jal rand_int -/* B2CD04 80240894 A603008E */ sh $v1, 0x8e($s0) -/* B2CD08 80240898 C60C000C */ lwc1 $f12, 0xc($s0) -/* B2CD0C 8024089C 44820000 */ mtc1 $v0, $f0 -/* B2CD10 802408A0 00000000 */ nop -/* B2CD14 802408A4 46800020 */ cvt.s.w $f0, $f0 -/* B2CD18 802408A8 46006300 */ add.s $f12, $f12, $f0 -/* B2CD1C 802408AC 3C0142B4 */ lui $at, 0x42b4 -/* B2CD20 802408B0 44810000 */ mtc1 $at, $f0 -/* B2CD24 802408B4 0C00A6C9 */ jal clamp_angle -/* B2CD28 802408B8 46006301 */ sub.s $f12, $f12, $f0 -/* B2CD2C 802408BC E600000C */ swc1 $f0, 0xc($s0) -/* B2CD30 802408C0 8E4200CC */ lw $v0, 0xcc($s2) -/* B2CD34 802408C4 8C420000 */ lw $v0, ($v0) -/* B2CD38 802408C8 AE020028 */ sw $v0, 0x28($s0) -/* B2CD3C 802408CC 24020003 */ addiu $v0, $zero, 3 -/* B2CD40 802408D0 AE620070 */ sw $v0, 0x70($s3) -/* B2CD44 802408D4 8FBF0020 */ lw $ra, 0x20($sp) -/* B2CD48 802408D8 8FB3001C */ lw $s3, 0x1c($sp) -/* B2CD4C 802408DC 8FB20018 */ lw $s2, 0x18($sp) -/* B2CD50 802408E0 8FB10014 */ lw $s1, 0x14($sp) -/* B2CD54 802408E4 8FB00010 */ lw $s0, 0x10($sp) -/* B2CD58 802408E8 03E00008 */ jr $ra -/* B2CD5C 802408EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_802408F0_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_802408F0_B2C470.s deleted file mode 100644 index 46d3502ead..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_802408F0_B2C470.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408F0_B2CD60 -/* B2CD60 802408F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B2CD64 802408F4 AFB40040 */ sw $s4, 0x40($sp) -/* B2CD68 802408F8 0080A02D */ daddu $s4, $a0, $zero -/* B2CD6C 802408FC AFBF0044 */ sw $ra, 0x44($sp) -/* B2CD70 80240900 AFB3003C */ sw $s3, 0x3c($sp) -/* B2CD74 80240904 AFB20038 */ sw $s2, 0x38($sp) -/* B2CD78 80240908 AFB10034 */ sw $s1, 0x34($sp) -/* B2CD7C 8024090C AFB00030 */ sw $s0, 0x30($sp) -/* B2CD80 80240910 8E910148 */ lw $s1, 0x148($s4) -/* B2CD84 80240914 00A0902D */ daddu $s2, $a1, $zero -/* B2CD88 80240918 86240008 */ lh $a0, 8($s1) -/* B2CD8C 8024091C 0C00EABB */ jal get_npc_unsafe -/* B2CD90 80240920 00C0982D */ daddu $s3, $a2, $zero -/* B2CD94 80240924 8E430014 */ lw $v1, 0x14($s2) -/* B2CD98 80240928 04600031 */ bltz $v1, .L802409F0 -/* B2CD9C 8024092C 0040802D */ daddu $s0, $v0, $zero -/* B2CDA0 80240930 0260202D */ daddu $a0, $s3, $zero -/* B2CDA4 80240934 AFA00010 */ sw $zero, 0x10($sp) -/* B2CDA8 80240938 8E460024 */ lw $a2, 0x24($s2) -/* B2CDAC 8024093C 8E470028 */ lw $a3, 0x28($s2) -/* B2CDB0 80240940 0C01242D */ jal func_800490B4 -/* B2CDB4 80240944 0220282D */ daddu $a1, $s1, $zero -/* B2CDB8 80240948 10400029 */ beqz $v0, .L802409F0 -/* B2CDBC 8024094C 0000202D */ daddu $a0, $zero, $zero -/* B2CDC0 80240950 0200282D */ daddu $a1, $s0, $zero -/* B2CDC4 80240954 0000302D */ daddu $a2, $zero, $zero -/* B2CDC8 80240958 860300A8 */ lh $v1, 0xa8($s0) -/* B2CDCC 8024095C 3C013F80 */ lui $at, 0x3f80 -/* B2CDD0 80240960 44810000 */ mtc1 $at, $f0 -/* B2CDD4 80240964 3C014000 */ lui $at, 0x4000 -/* B2CDD8 80240968 44811000 */ mtc1 $at, $f2 -/* B2CDDC 8024096C 3C01C1A0 */ lui $at, 0xc1a0 -/* B2CDE0 80240970 44812000 */ mtc1 $at, $f4 -/* B2CDE4 80240974 2402000F */ addiu $v0, $zero, 0xf -/* B2CDE8 80240978 AFA2001C */ sw $v0, 0x1c($sp) -/* B2CDEC 8024097C 44833000 */ mtc1 $v1, $f6 -/* B2CDF0 80240980 00000000 */ nop -/* B2CDF4 80240984 468031A0 */ cvt.s.w $f6, $f6 -/* B2CDF8 80240988 44073000 */ mfc1 $a3, $f6 -/* B2CDFC 8024098C 27A20028 */ addiu $v0, $sp, 0x28 -/* B2CE00 80240990 AFA20020 */ sw $v0, 0x20($sp) -/* B2CE04 80240994 E7A00010 */ swc1 $f0, 0x10($sp) -/* B2CE08 80240998 E7A20014 */ swc1 $f2, 0x14($sp) -/* B2CE0C 8024099C 0C01BFA4 */ jal fx_emote -/* B2CE10 802409A0 E7A40018 */ swc1 $f4, 0x18($sp) -/* B2CE14 802409A4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B2CE18 802409A8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B2CE1C 802409AC C60C0038 */ lwc1 $f12, 0x38($s0) -/* B2CE20 802409B0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B2CE24 802409B4 8C460028 */ lw $a2, 0x28($v0) -/* B2CE28 802409B8 0C00A720 */ jal atan2 -/* B2CE2C 802409BC 8C470030 */ lw $a3, 0x30($v0) -/* B2CE30 802409C0 0200202D */ daddu $a0, $s0, $zero -/* B2CE34 802409C4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B2CE38 802409C8 3C060020 */ lui $a2, 0x20 -/* B2CE3C 802409CC 0C012530 */ jal func_800494C0 -/* B2CE40 802409D0 E480000C */ swc1 $f0, 0xc($a0) -/* B2CE44 802409D4 8E220018 */ lw $v0, 0x18($s1) -/* B2CE48 802409D8 9442002A */ lhu $v0, 0x2a($v0) -/* B2CE4C 802409DC 30420001 */ andi $v0, $v0, 1 -/* B2CE50 802409E0 14400029 */ bnez $v0, .L80240A88 -/* B2CE54 802409E4 2402000A */ addiu $v0, $zero, 0xa -/* B2CE58 802409E8 080902A2 */ j .L80240A88 -/* B2CE5C 802409EC 2402000C */ addiu $v0, $zero, 0xc -.L802409F0: -/* B2CE60 802409F0 8602008C */ lh $v0, 0x8c($s0) -/* B2CE64 802409F4 14400025 */ bnez $v0, .L80240A8C -/* B2CE68 802409F8 00000000 */ nop -/* B2CE6C 802409FC 9602008E */ lhu $v0, 0x8e($s0) -/* B2CE70 80240A00 2442FFFF */ addiu $v0, $v0, -1 -/* B2CE74 80240A04 A602008E */ sh $v0, 0x8e($s0) -/* B2CE78 80240A08 00021400 */ sll $v0, $v0, 0x10 -/* B2CE7C 80240A0C 1440001F */ bnez $v0, .L80240A8C -/* B2CE80 80240A10 00000000 */ nop -/* B2CE84 80240A14 8E820074 */ lw $v0, 0x74($s4) -/* B2CE88 80240A18 2442FFFF */ addiu $v0, $v0, -1 -/* B2CE8C 80240A1C 10400019 */ beqz $v0, .L80240A84 -/* B2CE90 80240A20 AE820074 */ sw $v0, 0x74($s4) -/* B2CE94 80240A24 8E220018 */ lw $v0, 0x18($s1) -/* B2CE98 80240A28 9442002A */ lhu $v0, 0x2a($v0) -/* B2CE9C 80240A2C 30420010 */ andi $v0, $v0, 0x10 -/* B2CEA0 80240A30 14400007 */ bnez $v0, .L80240A50 -/* B2CEA4 80240A34 00000000 */ nop -/* B2CEA8 80240A38 C600000C */ lwc1 $f0, 0xc($s0) -/* B2CEAC 80240A3C 3C014334 */ lui $at, 0x4334 -/* B2CEB0 80240A40 44816000 */ mtc1 $at, $f12 -/* B2CEB4 80240A44 0C00A6C9 */ jal clamp_angle -/* B2CEB8 80240A48 460C0300 */ add.s $f12, $f0, $f12 -/* B2CEBC 80240A4C E600000C */ swc1 $f0, 0xc($s0) -.L80240A50: -/* B2CEC0 80240A50 8E440008 */ lw $a0, 8($s2) -/* B2CEC4 80240A54 000417C2 */ srl $v0, $a0, 0x1f -/* B2CEC8 80240A58 00822021 */ addu $a0, $a0, $v0 -/* B2CECC 80240A5C 00042043 */ sra $a0, $a0, 1 -/* B2CED0 80240A60 0C00A67F */ jal rand_int -/* B2CED4 80240A64 24840001 */ addiu $a0, $a0, 1 -/* B2CED8 80240A68 8E430008 */ lw $v1, 8($s2) -/* B2CEDC 80240A6C 000327C2 */ srl $a0, $v1, 0x1f -/* B2CEE0 80240A70 00641821 */ addu $v1, $v1, $a0 -/* B2CEE4 80240A74 00031843 */ sra $v1, $v1, 1 -/* B2CEE8 80240A78 00621821 */ addu $v1, $v1, $v0 -/* B2CEEC 80240A7C 080902A3 */ j .L80240A8C -/* B2CEF0 80240A80 A603008E */ sh $v1, 0x8e($s0) -.L80240A84: -/* B2CEF4 80240A84 24020004 */ addiu $v0, $zero, 4 -.L80240A88: -/* B2CEF8 80240A88 AE820070 */ sw $v0, 0x70($s4) -.L80240A8C: -/* B2CEFC 80240A8C 8FBF0044 */ lw $ra, 0x44($sp) -/* B2CF00 80240A90 8FB40040 */ lw $s4, 0x40($sp) -/* B2CF04 80240A94 8FB3003C */ lw $s3, 0x3c($sp) -/* B2CF08 80240A98 8FB20038 */ lw $s2, 0x38($sp) -/* B2CF0C 80240A9C 8FB10034 */ lw $s1, 0x34($sp) -/* B2CF10 80240AA0 8FB00030 */ lw $s0, 0x30($sp) -/* B2CF14 80240AA4 03E00008 */ jr $ra -/* B2CF18 80240AA8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80240AAC_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80240AAC_B2C470.s deleted file mode 100644 index 4c2c27a33c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80240AAC_B2C470.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AAC_B2CF1C -/* B2CF1C 80240AAC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2CF20 80240AB0 AFB10014 */ sw $s1, 0x14($sp) -/* B2CF24 80240AB4 0080882D */ daddu $s1, $a0, $zero -/* B2CF28 80240AB8 AFBF001C */ sw $ra, 0x1c($sp) -/* B2CF2C 80240ABC AFB20018 */ sw $s2, 0x18($sp) -/* B2CF30 80240AC0 AFB00010 */ sw $s0, 0x10($sp) -/* B2CF34 80240AC4 8E300148 */ lw $s0, 0x148($s1) -/* B2CF38 80240AC8 86040008 */ lh $a0, 8($s0) -/* B2CF3C 80240ACC 0C00EABB */ jal get_npc_unsafe -/* B2CF40 80240AD0 00A0902D */ daddu $s2, $a1, $zero -/* B2CF44 80240AD4 8E230078 */ lw $v1, 0x78($s1) -/* B2CF48 80240AD8 24630001 */ addiu $v1, $v1, 1 -/* B2CF4C 80240ADC AE230078 */ sw $v1, 0x78($s1) -/* B2CF50 80240AE0 8E0400D0 */ lw $a0, 0xd0($s0) -/* B2CF54 80240AE4 8C840000 */ lw $a0, ($a0) -/* B2CF58 80240AE8 0064182A */ slt $v1, $v1, $a0 -/* B2CF5C 80240AEC 14600002 */ bnez $v1, .L80240AF8 -/* B2CF60 80240AF0 0040282D */ daddu $a1, $v0, $zero -/* B2CF64 80240AF4 AE200078 */ sw $zero, 0x78($s1) -.L80240AF8: -/* B2CF68 80240AF8 8E0200CC */ lw $v0, 0xcc($s0) -/* B2CF6C 80240AFC 8C420004 */ lw $v0, 4($v0) -/* B2CF70 80240B00 ACA20028 */ sw $v0, 0x28($a1) -/* B2CF74 80240B04 8E0200D0 */ lw $v0, 0xd0($s0) -/* B2CF78 80240B08 8C42007C */ lw $v0, 0x7c($v0) -/* B2CF7C 80240B0C 04410004 */ bgez $v0, .L80240B20 -/* B2CF80 80240B10 00000000 */ nop -/* B2CF84 80240B14 C6400000 */ lwc1 $f0, ($s2) -/* B2CF88 80240B18 080902D0 */ j .L80240B40 -/* B2CF8C 80240B1C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240B20: -/* B2CF90 80240B20 3C018025 */ lui $at, 0x8025 -/* B2CF94 80240B24 D42285C8 */ ldc1 $f2, -0x7a38($at) -/* B2CF98 80240B28 44820000 */ mtc1 $v0, $f0 -/* B2CF9C 80240B2C 00000000 */ nop -/* B2CFA0 80240B30 46800021 */ cvt.d.w $f0, $f0 -/* B2CFA4 80240B34 46220003 */ div.d $f0, $f0, $f2 -/* B2CFA8 80240B38 46200020 */ cvt.s.d $f0, $f0 -/* B2CFAC 80240B3C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240B40: -/* B2CFB0 80240B40 24020001 */ addiu $v0, $zero, 1 -/* B2CFB4 80240B44 AE220070 */ sw $v0, 0x70($s1) -/* B2CFB8 80240B48 8FBF001C */ lw $ra, 0x1c($sp) -/* B2CFBC 80240B4C 8FB20018 */ lw $s2, 0x18($sp) -/* B2CFC0 80240B50 8FB10014 */ lw $s1, 0x14($sp) -/* B2CFC4 80240B54 8FB00010 */ lw $s0, 0x10($sp) -/* B2CFC8 80240B58 03E00008 */ jr $ra -/* B2CFCC 80240B5C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80240B60_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80240B60_B2C470.s deleted file mode 100644 index 06ab47a00a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80240B60_B2C470.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B60_B2CFD0 -/* B2CFD0 80240B60 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2CFD4 80240B64 AFB10014 */ sw $s1, 0x14($sp) -/* B2CFD8 80240B68 0080882D */ daddu $s1, $a0, $zero -/* B2CFDC 80240B6C AFBF0018 */ sw $ra, 0x18($sp) -/* B2CFE0 80240B70 AFB00010 */ sw $s0, 0x10($sp) -/* B2CFE4 80240B74 8E300148 */ lw $s0, 0x148($s1) -/* B2CFE8 80240B78 0C00EABB */ jal get_npc_unsafe -/* B2CFEC 80240B7C 86040008 */ lh $a0, 8($s0) -/* B2CFF0 80240B80 8E0300CC */ lw $v1, 0xcc($s0) -/* B2CFF4 80240B84 3C014120 */ lui $at, 0x4120 -/* B2CFF8 80240B88 44812000 */ mtc1 $at, $f4 -/* B2CFFC 80240B8C 3C014000 */ lui $at, 0x4000 -/* B2D000 80240B90 44810000 */ mtc1 $at, $f0 -/* B2D004 80240B94 C442003C */ lwc1 $f2, 0x3c($v0) -/* B2D008 80240B98 8C640010 */ lw $a0, 0x10($v1) -/* B2D00C 80240B9C 8C430000 */ lw $v1, ($v0) -/* B2D010 80240BA0 E444001C */ swc1 $f4, 0x1c($v0) -/* B2D014 80240BA4 E4400014 */ swc1 $f0, 0x14($v0) -/* B2D018 80240BA8 E4420064 */ swc1 $f2, 0x64($v0) -/* B2D01C 80240BAC 34630800 */ ori $v1, $v1, 0x800 -/* B2D020 80240BB0 AC430000 */ sw $v1, ($v0) -/* B2D024 80240BB4 AC440028 */ sw $a0, 0x28($v0) -/* B2D028 80240BB8 2402000B */ addiu $v0, $zero, 0xb -/* B2D02C 80240BBC AE220070 */ sw $v0, 0x70($s1) -/* B2D030 80240BC0 8FBF0018 */ lw $ra, 0x18($sp) -/* B2D034 80240BC4 8FB10014 */ lw $s1, 0x14($sp) -/* B2D038 80240BC8 8FB00010 */ lw $s0, 0x10($sp) -/* B2D03C 80240BCC 03E00008 */ jr $ra -/* B2D040 80240BD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80240BD4_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80240BD4_B2C470.s deleted file mode 100644 index 6d863dd452..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80240BD4_B2C470.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BD4_B2D044 -/* B2D044 80240BD4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2D048 80240BD8 AFB00010 */ sw $s0, 0x10($sp) -/* B2D04C 80240BDC 0080802D */ daddu $s0, $a0, $zero -/* B2D050 80240BE0 AFBF0014 */ sw $ra, 0x14($sp) -/* B2D054 80240BE4 8E020148 */ lw $v0, 0x148($s0) -/* B2D058 80240BE8 0C00EABB */ jal get_npc_unsafe -/* B2D05C 80240BEC 84440008 */ lh $a0, 8($v0) -/* B2D060 80240BF0 0040202D */ daddu $a0, $v0, $zero -/* B2D064 80240BF4 C482003C */ lwc1 $f2, 0x3c($a0) -/* B2D068 80240BF8 C480001C */ lwc1 $f0, 0x1c($a0) -/* B2D06C 80240BFC 46001080 */ add.s $f2, $f2, $f0 -/* B2D070 80240C00 C4840014 */ lwc1 $f4, 0x14($a0) -/* B2D074 80240C04 46040001 */ sub.s $f0, $f0, $f4 -/* B2D078 80240C08 C4840064 */ lwc1 $f4, 0x64($a0) -/* B2D07C 80240C0C 4602203C */ c.lt.s $f4, $f2 -/* B2D080 80240C10 E482003C */ swc1 $f2, 0x3c($a0) -/* B2D084 80240C14 45010009 */ bc1t .L80240C3C -/* B2D088 80240C18 E480001C */ swc1 $f0, 0x1c($a0) -/* B2D08C 80240C1C 8C820000 */ lw $v0, ($a0) -/* B2D090 80240C20 2403F7FF */ addiu $v1, $zero, -0x801 -/* B2D094 80240C24 E484003C */ swc1 $f4, 0x3c($a0) -/* B2D098 80240C28 AC80001C */ sw $zero, 0x1c($a0) -/* B2D09C 80240C2C 00431024 */ and $v0, $v0, $v1 -/* B2D0A0 80240C30 AC820000 */ sw $v0, ($a0) -/* B2D0A4 80240C34 2402000C */ addiu $v0, $zero, 0xc -/* B2D0A8 80240C38 AE020070 */ sw $v0, 0x70($s0) -.L80240C3C: -/* B2D0AC 80240C3C 8FBF0014 */ lw $ra, 0x14($sp) -/* B2D0B0 80240C40 8FB00010 */ lw $s0, 0x10($sp) -/* B2D0B4 80240C44 03E00008 */ jr $ra -/* B2D0B8 80240C48 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80240C4C_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80240C4C_B2C470.s deleted file mode 100644 index 84888a42b2..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80240C4C_B2C470.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_B2D0BC -/* B2D0BC 80240C4C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B2D0C0 80240C50 AFB3001C */ sw $s3, 0x1c($sp) -/* B2D0C4 80240C54 0080982D */ daddu $s3, $a0, $zero -/* B2D0C8 80240C58 AFBF0020 */ sw $ra, 0x20($sp) -/* B2D0CC 80240C5C AFB20018 */ sw $s2, 0x18($sp) -/* B2D0D0 80240C60 AFB10014 */ sw $s1, 0x14($sp) -/* B2D0D4 80240C64 AFB00010 */ sw $s0, 0x10($sp) -/* B2D0D8 80240C68 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B2D0DC 80240C6C 8E710148 */ lw $s1, 0x148($s3) -/* B2D0E0 80240C70 86240008 */ lh $a0, 8($s1) -/* B2D0E4 80240C74 0C00EABB */ jal get_npc_unsafe -/* B2D0E8 80240C78 00A0802D */ daddu $s0, $a1, $zero -/* B2D0EC 80240C7C 8E040020 */ lw $a0, 0x20($s0) -/* B2D0F0 80240C80 0040902D */ daddu $s2, $v0, $zero -/* B2D0F4 80240C84 00041FC2 */ srl $v1, $a0, 0x1f -/* B2D0F8 80240C88 00832021 */ addu $a0, $a0, $v1 -/* B2D0FC 80240C8C 00042043 */ sra $a0, $a0, 1 -/* B2D100 80240C90 0C00A67F */ jal rand_int -/* B2D104 80240C94 24840001 */ addiu $a0, $a0, 1 -/* B2D108 80240C98 8E030020 */ lw $v1, 0x20($s0) -/* B2D10C 80240C9C C64C0038 */ lwc1 $f12, 0x38($s2) -/* B2D110 80240CA0 000327C2 */ srl $a0, $v1, 0x1f -/* B2D114 80240CA4 00641821 */ addu $v1, $v1, $a0 -/* B2D118 80240CA8 00031843 */ sra $v1, $v1, 1 -/* B2D11C 80240CAC 00621821 */ addu $v1, $v1, $v0 -/* B2D120 80240CB0 A643008E */ sh $v1, 0x8e($s2) -/* B2D124 80240CB4 8E2200CC */ lw $v0, 0xcc($s1) -/* B2D128 80240CB8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* B2D12C 80240CBC 8C42000C */ lw $v0, 0xc($v0) -/* B2D130 80240CC0 AE420028 */ sw $v0, 0x28($s2) -/* B2D134 80240CC4 C6000018 */ lwc1 $f0, 0x18($s0) -/* B2D138 80240CC8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B2D13C 80240CCC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B2D140 80240CD0 E6400018 */ swc1 $f0, 0x18($s2) -/* B2D144 80240CD4 8C460028 */ lw $a2, 0x28($v0) -/* B2D148 80240CD8 0C00A720 */ jal atan2 -/* B2D14C 80240CDC 8C470030 */ lw $a3, 0x30($v0) -/* B2D150 80240CE0 46000506 */ mov.s $f20, $f0 -/* B2D154 80240CE4 C64C000C */ lwc1 $f12, 0xc($s2) -/* B2D158 80240CE8 0C00A70A */ jal get_clamped_angle_diff -/* B2D15C 80240CEC 4600A386 */ mov.s $f14, $f20 -/* B2D160 80240CF0 46000086 */ mov.s $f2, $f0 -/* B2D164 80240CF4 8E02001C */ lw $v0, 0x1c($s0) -/* B2D168 80240CF8 46001005 */ abs.s $f0, $f2 -/* B2D16C 80240CFC 44822000 */ mtc1 $v0, $f4 -/* B2D170 80240D00 00000000 */ nop -/* B2D174 80240D04 46802120 */ cvt.s.w $f4, $f4 -/* B2D178 80240D08 4600203C */ c.lt.s $f4, $f0 -/* B2D17C 80240D0C 00000000 */ nop -/* B2D180 80240D10 4500000D */ bc1f .L80240D48 -/* B2D184 80240D14 00000000 */ nop -/* B2D188 80240D18 44800000 */ mtc1 $zero, $f0 -/* B2D18C 80240D1C C654000C */ lwc1 $f20, 0xc($s2) -/* B2D190 80240D20 4600103C */ c.lt.s $f2, $f0 -/* B2D194 80240D24 00000000 */ nop -/* B2D198 80240D28 45000006 */ bc1f .L80240D44 -/* B2D19C 80240D2C 00021023 */ negu $v0, $v0 -/* B2D1A0 80240D30 44820000 */ mtc1 $v0, $f0 -/* B2D1A4 80240D34 00000000 */ nop -/* B2D1A8 80240D38 46800020 */ cvt.s.w $f0, $f0 -/* B2D1AC 80240D3C 08090352 */ j .L80240D48 -/* B2D1B0 80240D40 4600A500 */ add.s $f20, $f20, $f0 -.L80240D44: -/* B2D1B4 80240D44 4604A500 */ add.s $f20, $f20, $f4 -.L80240D48: -/* B2D1B8 80240D48 0C00A6C9 */ jal clamp_angle -/* B2D1BC 80240D4C 4600A306 */ mov.s $f12, $f20 -/* B2D1C0 80240D50 2402000D */ addiu $v0, $zero, 0xd -/* B2D1C4 80240D54 E640000C */ swc1 $f0, 0xc($s2) -/* B2D1C8 80240D58 AE620070 */ sw $v0, 0x70($s3) -/* B2D1CC 80240D5C 8FBF0020 */ lw $ra, 0x20($sp) -/* B2D1D0 80240D60 8FB3001C */ lw $s3, 0x1c($sp) -/* B2D1D4 80240D64 8FB20018 */ lw $s2, 0x18($sp) -/* B2D1D8 80240D68 8FB10014 */ lw $s1, 0x14($sp) -/* B2D1DC 80240D6C 8FB00010 */ lw $s0, 0x10($sp) -/* B2D1E0 80240D70 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B2D1E4 80240D74 03E00008 */ jr $ra -/* B2D1E8 80240D78 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80240E9C_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80240E9C_B2C470.s deleted file mode 100644 index dc96d5ef47..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80240E9C_B2C470.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E9C_B2D30C -/* B2D30C 80240E9C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2D310 80240EA0 AFB10014 */ sw $s1, 0x14($sp) -/* B2D314 80240EA4 0080882D */ daddu $s1, $a0, $zero -/* B2D318 80240EA8 AFBF0018 */ sw $ra, 0x18($sp) -/* B2D31C 80240EAC AFB00010 */ sw $s0, 0x10($sp) -/* B2D320 80240EB0 8E300148 */ lw $s0, 0x148($s1) -/* B2D324 80240EB4 0C00EABB */ jal get_npc_unsafe -/* B2D328 80240EB8 86040008 */ lh $a0, 8($s0) -/* B2D32C 80240EBC 9443008E */ lhu $v1, 0x8e($v0) -/* B2D330 80240EC0 2463FFFF */ addiu $v1, $v1, -1 -/* B2D334 80240EC4 A443008E */ sh $v1, 0x8e($v0) -/* B2D338 80240EC8 00031C00 */ sll $v1, $v1, 0x10 -/* B2D33C 80240ECC 14600008 */ bnez $v1, .L80240EF0 -/* B2D340 80240ED0 00000000 */ nop -/* B2D344 80240ED4 8E0200B0 */ lw $v0, 0xb0($s0) -/* B2D348 80240ED8 30420080 */ andi $v0, $v0, 0x80 -/* B2D34C 80240EDC 10400003 */ beqz $v0, .L80240EEC -/* B2D350 80240EE0 2402000F */ addiu $v0, $zero, 0xf -/* B2D354 80240EE4 080903BC */ j .L80240EF0 -/* B2D358 80240EE8 AE220070 */ sw $v0, 0x70($s1) -.L80240EEC: -/* B2D35C 80240EEC AE200070 */ sw $zero, 0x70($s1) -.L80240EF0: -/* B2D360 80240EF0 8FBF0018 */ lw $ra, 0x18($sp) -/* B2D364 80240EF4 8FB10014 */ lw $s1, 0x14($sp) -/* B2D368 80240EF8 8FB00010 */ lw $s0, 0x10($sp) -/* B2D36C 80240EFC 03E00008 */ jr $ra -/* B2D370 80240F00 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80240F04_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80240F04_B2C470.s deleted file mode 100644 index 633ea7c3c1..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80240F04_B2C470.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F04_B2D374 -/* B2D374 80240F04 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2D378 80240F08 AFB10014 */ sw $s1, 0x14($sp) -/* B2D37C 80240F0C 0080882D */ daddu $s1, $a0, $zero -/* B2D380 80240F10 AFBF001C */ sw $ra, 0x1c($sp) -/* B2D384 80240F14 AFB20018 */ sw $s2, 0x18($sp) -/* B2D388 80240F18 AFB00010 */ sw $s0, 0x10($sp) -/* B2D38C 80240F1C 8E300148 */ lw $s0, 0x148($s1) -/* B2D390 80240F20 86040008 */ lh $a0, 8($s0) -/* B2D394 80240F24 0C00EABB */ jal get_npc_unsafe -/* B2D398 80240F28 00A0902D */ daddu $s2, $a1, $zero -/* B2D39C 80240F2C 8E0300D0 */ lw $v1, 0xd0($s0) -/* B2D3A0 80240F30 8E240078 */ lw $a0, 0x78($s1) -/* B2D3A4 80240F34 8C630000 */ lw $v1, ($v1) -/* B2D3A8 80240F38 0083182A */ slt $v1, $a0, $v1 -/* B2D3AC 80240F3C 10600013 */ beqz $v1, .L80240F8C -/* B2D3B0 80240F40 0040302D */ daddu $a2, $v0, $zero -/* B2D3B4 80240F44 00041040 */ sll $v0, $a0, 1 -/* B2D3B8 80240F48 00441021 */ addu $v0, $v0, $a0 -/* B2D3BC 80240F4C 00022880 */ sll $a1, $v0, 2 -.L80240F50: -/* B2D3C0 80240F50 8E0300D0 */ lw $v1, 0xd0($s0) -/* B2D3C4 80240F54 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* B2D3C8 80240F58 00A31021 */ addu $v0, $a1, $v1 -/* B2D3CC 80240F5C C4400008 */ lwc1 $f0, 8($v0) -/* B2D3D0 80240F60 46800020 */ cvt.s.w $f0, $f0 -/* B2D3D4 80240F64 4602003E */ c.le.s $f0, $f2 -/* B2D3D8 80240F68 00000000 */ nop -/* B2D3DC 80240F6C 45020003 */ bc1fl .L80240F7C -/* B2D3E0 80240F70 24840001 */ addiu $a0, $a0, 1 -/* B2D3E4 80240F74 080903E3 */ j .L80240F8C -/* B2D3E8 80240F78 AE240078 */ sw $a0, 0x78($s1) -.L80240F7C: -/* B2D3EC 80240F7C 8C620000 */ lw $v0, ($v1) -/* B2D3F0 80240F80 0082102A */ slt $v0, $a0, $v0 -/* B2D3F4 80240F84 1440FFF2 */ bnez $v0, .L80240F50 -/* B2D3F8 80240F88 24A5000C */ addiu $a1, $a1, 0xc -.L80240F8C: -/* B2D3FC 80240F8C C6400000 */ lwc1 $f0, ($s2) -/* B2D400 80240F90 E4C00018 */ swc1 $f0, 0x18($a2) -/* B2D404 80240F94 8E0200CC */ lw $v0, 0xcc($s0) -/* B2D408 80240F98 8C420004 */ lw $v0, 4($v0) -/* B2D40C 80240F9C ACC20028 */ sw $v0, 0x28($a2) -/* B2D410 80240FA0 24020001 */ addiu $v0, $zero, 1 -/* B2D414 80240FA4 AE200074 */ sw $zero, 0x74($s1) -/* B2D418 80240FA8 AE220070 */ sw $v0, 0x70($s1) -/* B2D41C 80240FAC 8FBF001C */ lw $ra, 0x1c($sp) -/* B2D420 80240FB0 8FB20018 */ lw $s2, 0x18($sp) -/* B2D424 80240FB4 8FB10014 */ lw $s1, 0x14($sp) -/* B2D428 80240FB8 8FB00010 */ lw $s0, 0x10($sp) -/* B2D42C 80240FBC 03E00008 */ jr $ra -/* B2D430 80240FC0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_802412C0_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_802412C0_B2C470.s deleted file mode 100644 index a025292923..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_802412C0_B2C470.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412C0_B2D730 -/* B2D730 802412C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2D734 802412C4 AFB10014 */ sw $s1, 0x14($sp) -/* B2D738 802412C8 0080882D */ daddu $s1, $a0, $zero -/* B2D73C 802412CC AFBF0018 */ sw $ra, 0x18($sp) -/* B2D740 802412D0 AFB00010 */ sw $s0, 0x10($sp) -/* B2D744 802412D4 8E30000C */ lw $s0, 0xc($s1) -/* B2D748 802412D8 8E050000 */ lw $a1, ($s0) -/* B2D74C 802412DC 0C0B1EAF */ jal get_variable -/* B2D750 802412E0 26100004 */ addiu $s0, $s0, 4 -/* B2D754 802412E4 0C00EAD2 */ jal get_npc_safe -/* B2D758 802412E8 0040202D */ daddu $a0, $v0, $zero -/* B2D75C 802412EC 10400005 */ beqz $v0, .L80241304 -/* B2D760 802412F0 00000000 */ nop -/* B2D764 802412F4 8E050000 */ lw $a1, ($s0) -/* B2D768 802412F8 844600A8 */ lh $a2, 0xa8($v0) -/* B2D76C 802412FC 0C0B2026 */ jal set_variable -/* B2D770 80241300 0220202D */ daddu $a0, $s1, $zero -.L80241304: -/* B2D774 80241304 8FBF0018 */ lw $ra, 0x18($sp) -/* B2D778 80241308 8FB10014 */ lw $s1, 0x14($sp) -/* B2D77C 8024130C 8FB00010 */ lw $s0, 0x10($sp) -/* B2D780 80241310 24020002 */ addiu $v0, $zero, 2 -/* B2D784 80241314 03E00008 */ jr $ra -/* B2D788 80241318 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_802414EC_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_802414EC_B2C470.s deleted file mode 100644 index cfaef3065e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_802414EC_B2C470.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414EC_B2D95C -/* B2D95C 802414EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2D960 802414F0 AFBF0010 */ sw $ra, 0x10($sp) -/* B2D964 802414F4 10A00003 */ beqz $a1, .L80241504 -/* B2D968 802414F8 8C86000C */ lw $a2, 0xc($a0) -/* B2D96C 802414FC 3C018024 */ lui $at, 0x8024 -/* B2D970 80241500 AC203048 */ sw $zero, 0x3048($at) -.L80241504: -/* B2D974 80241504 3C038024 */ lui $v1, 0x8024 -/* B2D978 80241508 24633048 */ addiu $v1, $v1, 0x3048 -/* B2D97C 8024150C 8C620000 */ lw $v0, ($v1) -/* B2D980 80241510 54400003 */ bnel $v0, $zero, .L80241520 -/* B2D984 80241514 AC600000 */ sw $zero, ($v1) -/* B2D988 80241518 0809054D */ j .L80241534 -/* B2D98C 8024151C 0000102D */ daddu $v0, $zero, $zero -.L80241520: -/* B2D990 80241520 8CC50000 */ lw $a1, ($a2) -/* B2D994 80241524 3C068024 */ lui $a2, 0x8024 -/* B2D998 80241528 0C0B2026 */ jal set_variable -/* B2D99C 8024152C 8CC6304C */ lw $a2, 0x304c($a2) -/* B2D9A0 80241530 24020002 */ addiu $v0, $zero, 2 -.L80241534: -/* B2D9A4 80241534 8FBF0010 */ lw $ra, 0x10($sp) -/* B2D9A8 80241538 03E00008 */ jr $ra -/* B2D9AC 8024153C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80241540_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80241540_B2C470.s deleted file mode 100644 index 2aeada36e0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80241540_B2C470.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241540_B2D9B0 -/* B2D9B0 80241540 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2D9B4 80241544 AFBF0010 */ sw $ra, 0x10($sp) -/* B2D9B8 80241548 8C82000C */ lw $v0, 0xc($a0) -/* B2D9BC 8024154C 0C0B1EAF */ jal get_variable -/* B2D9C0 80241550 8C450000 */ lw $a1, ($v0) -/* B2D9C4 80241554 3C018024 */ lui $at, 0x8024 -/* B2D9C8 80241558 AC22304C */ sw $v0, 0x304c($at) -/* B2D9CC 8024155C 24020002 */ addiu $v0, $zero, 2 -/* B2D9D0 80241560 8FBF0010 */ lw $ra, 0x10($sp) -/* B2D9D4 80241564 24030001 */ addiu $v1, $zero, 1 -/* B2D9D8 80241568 3C018024 */ lui $at, 0x8024 -/* B2D9DC 8024156C AC233048 */ sw $v1, 0x3048($at) -/* B2D9E0 80241570 03E00008 */ jr $ra -/* B2D9E4 80241574 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80241614_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80241614_B2C470.s deleted file mode 100644 index 77c1f675a0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80241614_B2C470.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241614_B2DA84 -/* B2DA84 80241614 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2DA88 80241618 AFB00010 */ sw $s0, 0x10($sp) -/* B2DA8C 8024161C 3C108024 */ lui $s0, 0x8024 -/* B2DA90 80241620 261031E4 */ addiu $s0, $s0, 0x31e4 -/* B2DA94 80241624 AFBF0018 */ sw $ra, 0x18($sp) -/* B2DA98 80241628 AFB10014 */ sw $s1, 0x14($sp) -/* B2DA9C 8024162C 8E020000 */ lw $v0, ($s0) -/* B2DAA0 80241630 14400010 */ bnez $v0, .L80241674 -/* B2DAA4 80241634 0080882D */ daddu $s1, $a0, $zero -/* B2DAA8 80241638 0C00AB39 */ jal heap_malloc -/* B2DAAC 8024163C 24040040 */ addiu $a0, $zero, 0x40 -/* B2DAB0 80241640 AE020000 */ sw $v0, ($s0) -/* B2DAB4 80241644 0000182D */ daddu $v1, $zero, $zero -/* B2DAB8 80241648 0040282D */ daddu $a1, $v0, $zero -/* B2DABC 8024164C 0220202D */ daddu $a0, $s1, $zero -.L80241650: -/* B2DAC0 80241650 8C820084 */ lw $v0, 0x84($a0) -/* B2DAC4 80241654 24840004 */ addiu $a0, $a0, 4 -/* B2DAC8 80241658 24630001 */ addiu $v1, $v1, 1 -/* B2DACC 8024165C ACA20000 */ sw $v0, ($a1) -/* B2DAD0 80241660 28620010 */ slti $v0, $v1, 0x10 -/* B2DAD4 80241664 1440FFFA */ bnez $v0, .L80241650 -/* B2DAD8 80241668 24A50004 */ addiu $a1, $a1, 4 -/* B2DADC 8024166C 080905AC */ j .L802416B0 -/* B2DAE0 80241670 00000000 */ nop -.L80241674: -/* B2DAE4 80241674 0000182D */ daddu $v1, $zero, $zero -/* B2DAE8 80241678 0040282D */ daddu $a1, $v0, $zero -/* B2DAEC 8024167C 0220202D */ daddu $a0, $s1, $zero -.L80241680: -/* B2DAF0 80241680 8CA20000 */ lw $v0, ($a1) -/* B2DAF4 80241684 24A50004 */ addiu $a1, $a1, 4 -/* B2DAF8 80241688 24630001 */ addiu $v1, $v1, 1 -/* B2DAFC 8024168C AC820084 */ sw $v0, 0x84($a0) -/* B2DB00 80241690 28620010 */ slti $v0, $v1, 0x10 -/* B2DB04 80241694 1440FFFA */ bnez $v0, .L80241680 -/* B2DB08 80241698 24840004 */ addiu $a0, $a0, 4 -/* B2DB0C 8024169C 3C108024 */ lui $s0, 0x8024 -/* B2DB10 802416A0 261031E4 */ addiu $s0, $s0, 0x31e4 -/* B2DB14 802416A4 0C00AB4B */ jal heap_free -/* B2DB18 802416A8 8E040000 */ lw $a0, ($s0) -/* B2DB1C 802416AC AE000000 */ sw $zero, ($s0) -.L802416B0: -/* B2DB20 802416B0 8FBF0018 */ lw $ra, 0x18($sp) -/* B2DB24 802416B4 8FB10014 */ lw $s1, 0x14($sp) -/* B2DB28 802416B8 8FB00010 */ lw $s0, 0x10($sp) -/* B2DB2C 802416BC 24020002 */ addiu $v0, $zero, 2 -/* B2DB30 802416C0 03E00008 */ jr $ra -/* B2DB34 802416C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_802416C8_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_802416C8_B2C470.s deleted file mode 100644 index d181eec6cf..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_802416C8_B2C470.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416C8_B2DB38 -/* B2DB38 802416C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2DB3C 802416CC AFB00010 */ sw $s0, 0x10($sp) -/* B2DB40 802416D0 0080802D */ daddu $s0, $a0, $zero -/* B2DB44 802416D4 AFBF0018 */ sw $ra, 0x18($sp) -/* B2DB48 802416D8 AFB10014 */ sw $s1, 0x14($sp) -/* B2DB4C 802416DC 8E02000C */ lw $v0, 0xc($s0) -/* B2DB50 802416E0 8C510000 */ lw $s1, ($v0) -/* B2DB54 802416E4 0C0B1EAF */ jal get_variable -/* B2DB58 802416E8 0220282D */ daddu $a1, $s1, $zero -/* B2DB5C 802416EC 3C03FFF0 */ lui $v1, 0xfff0 -/* B2DB60 802416F0 3463FFFF */ ori $v1, $v1, 0xffff -/* B2DB64 802416F4 0200202D */ daddu $a0, $s0, $zero -/* B2DB68 802416F8 00431024 */ and $v0, $v0, $v1 -/* B2DB6C 802416FC 00021140 */ sll $v0, $v0, 5 -/* B2DB70 80241700 3C068008 */ lui $a2, %hi(gItemTable) -/* B2DB74 80241704 00C23021 */ addu $a2, $a2, $v0 -/* B2DB78 80241708 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* B2DB7C 8024170C 0C0B2026 */ jal set_variable -/* B2DB80 80241710 0220282D */ daddu $a1, $s1, $zero -/* B2DB84 80241714 8FBF0018 */ lw $ra, 0x18($sp) -/* B2DB88 80241718 8FB10014 */ lw $s1, 0x14($sp) -/* B2DB8C 8024171C 8FB00010 */ lw $s0, 0x10($sp) -/* B2DB90 80241720 24020002 */ addiu $v0, $zero, 2 -/* B2DB94 80241724 03E00008 */ jr $ra -/* B2DB98 80241728 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_802419C0_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_802419C0_B2C470.s deleted file mode 100644 index 216750a4e5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_802419C0_B2C470.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419C0_B2DE30 -/* B2DE30 802419C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2DE34 802419C4 AFBF0010 */ sw $ra, 0x10($sp) -/* B2DE38 802419C8 0C00EABB */ jal get_npc_unsafe -/* B2DE3C 802419CC 8C84014C */ lw $a0, 0x14c($a0) -/* B2DE40 802419D0 8FBF0010 */ lw $ra, 0x10($sp) -/* B2DE44 802419D4 0000102D */ daddu $v0, $zero, $zero -/* B2DE48 802419D8 03E00008 */ jr $ra -/* B2DE4C 802419DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80241B8C_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80241B8C_B2C470.s deleted file mode 100644 index 167a0ff4f5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80241B8C_B2C470.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B8C_B2DFFC -/* B2DFFC 80241B8C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B2E000 80241B90 AFB00010 */ sw $s0, 0x10($sp) -/* B2E004 80241B94 0080802D */ daddu $s0, $a0, $zero -/* B2E008 80241B98 AFBF0020 */ sw $ra, 0x20($sp) -/* B2E00C 80241B9C AFB3001C */ sw $s3, 0x1c($sp) -/* B2E010 80241BA0 AFB20018 */ sw $s2, 0x18($sp) -/* B2E014 80241BA4 10A00009 */ beqz $a1, .L80241BCC -/* B2E018 80241BA8 AFB10014 */ sw $s1, 0x14($sp) -/* B2E01C 80241BAC 0000202D */ daddu $a0, $zero, $zero -/* B2E020 80241BB0 0080282D */ daddu $a1, $a0, $zero -/* B2E024 80241BB4 0080302D */ daddu $a2, $a0, $zero -/* B2E028 80241BB8 0C046F97 */ jal set_background_color_blend -/* B2E02C 80241BBC 240700FF */ addiu $a3, $zero, 0xff -/* B2E030 80241BC0 240200FF */ addiu $v0, $zero, 0xff -/* B2E034 80241BC4 AE020070 */ sw $v0, 0x70($s0) -/* B2E038 80241BC8 AE000074 */ sw $zero, 0x74($s0) -.L80241BCC: -/* B2E03C 80241BCC 8E020070 */ lw $v0, 0x70($s0) -/* B2E040 80241BD0 2442FFF8 */ addiu $v0, $v0, -8 -/* B2E044 80241BD4 04410002 */ bgez $v0, .L80241BE0 -/* B2E048 80241BD8 AE020070 */ sw $v0, 0x70($s0) -/* B2E04C 80241BDC AE000070 */ sw $zero, 0x70($s0) -.L80241BE0: -/* B2E050 80241BE0 0000202D */ daddu $a0, $zero, $zero -/* B2E054 80241BE4 0080282D */ daddu $a1, $a0, $zero -/* B2E058 80241BE8 92070073 */ lbu $a3, 0x73($s0) -/* B2E05C 80241BEC 0C046F97 */ jal set_background_color_blend -/* B2E060 80241BF0 0080302D */ daddu $a2, $a0, $zero -/* B2E064 80241BF4 8E020070 */ lw $v0, 0x70($s0) -/* B2E068 80241BF8 14400006 */ bnez $v0, .L80241C14 -/* B2E06C 80241BFC 00000000 */ nop -/* B2E070 80241C00 8E020074 */ lw $v0, 0x74($s0) -/* B2E074 80241C04 14400003 */ bnez $v0, .L80241C14 -/* B2E078 80241C08 24020001 */ addiu $v0, $zero, 1 -/* B2E07C 80241C0C 08090738 */ j .L80241CE0 -/* B2E080 80241C10 AE020074 */ sw $v0, 0x74($s0) -.L80241C14: -/* B2E084 80241C14 8E030074 */ lw $v1, 0x74($s0) -/* B2E088 80241C18 24020001 */ addiu $v0, $zero, 1 -/* B2E08C 80241C1C 14620031 */ bne $v1, $v0, .L80241CE4 -/* B2E090 80241C20 0000102D */ daddu $v0, $zero, $zero -/* B2E094 80241C24 0C04760B */ jal func_8011D82C -/* B2E098 80241C28 0000202D */ daddu $a0, $zero, $zero -/* B2E09C 80241C2C 0000802D */ daddu $s0, $zero, $zero -/* B2E0A0 80241C30 2413FFFC */ addiu $s3, $zero, -4 -/* B2E0A4 80241C34 24120005 */ addiu $s2, $zero, 5 -/* B2E0A8 80241C38 3C11FF7F */ lui $s1, 0xff7f -/* B2E0AC 80241C3C 3C028015 */ lui $v0, 0x8015 -/* B2E0B0 80241C40 8C4212F0 */ lw $v0, 0x12f0($v0) -/* B2E0B4 80241C44 3631FFFF */ ori $s1, $s1, 0xffff -/* B2E0B8 80241C48 A0400000 */ sb $zero, ($v0) -.L80241C4C: -/* B2E0BC 80241C4C 0C00E2B7 */ jal get_npc_by_index -/* B2E0C0 80241C50 0200202D */ daddu $a0, $s0, $zero -/* B2E0C4 80241C54 0040202D */ daddu $a0, $v0, $zero -/* B2E0C8 80241C58 5080000B */ beql $a0, $zero, .L80241C88 -/* B2E0CC 80241C5C 26100001 */ addiu $s0, $s0, 1 -/* B2E0D0 80241C60 8C820000 */ lw $v0, ($a0) -/* B2E0D4 80241C64 50400008 */ beql $v0, $zero, .L80241C88 -/* B2E0D8 80241C68 26100001 */ addiu $s0, $s0, 1 -/* B2E0DC 80241C6C 808300A4 */ lb $v1, 0xa4($a0) -/* B2E0E0 80241C70 10730005 */ beq $v1, $s3, .L80241C88 -/* B2E0E4 80241C74 26100001 */ addiu $s0, $s0, 1 -/* B2E0E8 80241C78 10720003 */ beq $v1, $s2, .L80241C88 -/* B2E0EC 80241C7C 00000000 */ nop -/* B2E0F0 80241C80 00511024 */ and $v0, $v0, $s1 -/* B2E0F4 80241C84 AC820000 */ sw $v0, ($a0) -.L80241C88: -/* B2E0F8 80241C88 2A020040 */ slti $v0, $s0, 0x40 -/* B2E0FC 80241C8C 1440FFEF */ bnez $v0, .L80241C4C -/* B2E100 80241C90 00000000 */ nop -/* B2E104 80241C94 0000802D */ daddu $s0, $zero, $zero -/* B2E108 80241C98 3C11F7FF */ lui $s1, 0xf7ff -/* B2E10C 80241C9C 3631FFFF */ ori $s1, $s1, 0xffff -.L80241CA0: -/* B2E110 80241CA0 0C04C3D6 */ jal get_item_entity -/* B2E114 80241CA4 0200202D */ daddu $a0, $s0, $zero -/* B2E118 80241CA8 0040182D */ daddu $v1, $v0, $zero -/* B2E11C 80241CAC 10600007 */ beqz $v1, .L80241CCC -/* B2E120 80241CB0 26100001 */ addiu $s0, $s0, 1 -/* B2E124 80241CB4 8C640000 */ lw $a0, ($v1) -/* B2E128 80241CB8 30820010 */ andi $v0, $a0, 0x10 -/* B2E12C 80241CBC 10400003 */ beqz $v0, .L80241CCC -/* B2E130 80241CC0 00000000 */ nop -/* B2E134 80241CC4 00911024 */ and $v0, $a0, $s1 -/* B2E138 80241CC8 AC620000 */ sw $v0, ($v1) -.L80241CCC: -/* B2E13C 80241CCC 2A020100 */ slti $v0, $s0, 0x100 -/* B2E140 80241CD0 1440FFF3 */ bnez $v0, .L80241CA0 -/* B2E144 80241CD4 24020002 */ addiu $v0, $zero, 2 -/* B2E148 80241CD8 08090739 */ j .L80241CE4 -/* B2E14C 80241CDC 00000000 */ nop -.L80241CE0: -/* B2E150 80241CE0 0000102D */ daddu $v0, $zero, $zero -.L80241CE4: -/* B2E154 80241CE4 8FBF0020 */ lw $ra, 0x20($sp) -/* B2E158 80241CE8 8FB3001C */ lw $s3, 0x1c($sp) -/* B2E15C 80241CEC 8FB20018 */ lw $s2, 0x18($sp) -/* B2E160 80241CF0 8FB10014 */ lw $s1, 0x14($sp) -/* B2E164 80241CF4 8FB00010 */ lw $s0, 0x10($sp) -/* B2E168 80241CF8 03E00008 */ jr $ra -/* B2E16C 80241CFC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80241D00_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80241D00_B2C470.s deleted file mode 100644 index 31a5d70721..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80241D00_B2C470.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D00_B2E170 -/* B2E170 80241D00 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2E174 80241D04 AFB00010 */ sw $s0, 0x10($sp) -/* B2E178 80241D08 3C108011 */ lui $s0, %hi(gPlayerData) -/* B2E17C 80241D0C 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* B2E180 80241D10 AFBF0018 */ sw $ra, 0x18($sp) -/* B2E184 80241D14 AFB10014 */ sw $s1, 0x14($sp) -/* B2E188 80241D18 960302C0 */ lhu $v1, 0x2c0($s0) -/* B2E18C 80241D1C 2C6203E7 */ sltiu $v0, $v1, 0x3e7 -/* B2E190 80241D20 10400003 */ beqz $v0, .L80241D30 -/* B2E194 80241D24 0080882D */ daddu $s1, $a0, $zero -/* B2E198 80241D28 24620001 */ addiu $v0, $v1, 1 -/* B2E19C 80241D2C A60202C0 */ sh $v0, 0x2c0($s0) -.L80241D30: -/* B2E1A0 80241D30 3C05F5DE */ lui $a1, 0xf5de -/* B2E1A4 80241D34 34A502E0 */ ori $a1, $a1, 0x2e0 -/* B2E1A8 80241D38 0C0B1EAF */ jal get_variable -/* B2E1AC 80241D3C 0000202D */ daddu $a0, $zero, $zero -/* B2E1B0 80241D40 3C038024 */ lui $v1, 0x8024 -/* B2E1B4 80241D44 00621821 */ addu $v1, $v1, $v0 -/* B2E1B8 80241D48 90633248 */ lbu $v1, 0x3248($v1) -/* B2E1BC 80241D4C 8E220084 */ lw $v0, 0x84($s1) -/* B2E1C0 80241D50 54430006 */ bnel $v0, $v1, .L80241D6C -/* B2E1C4 80241D54 AE200084 */ sw $zero, 0x84($s1) -/* B2E1C8 80241D58 24020001 */ addiu $v0, $zero, 1 -/* B2E1CC 80241D5C AE220084 */ sw $v0, 0x84($s1) -/* B2E1D0 80241D60 960202C2 */ lhu $v0, 0x2c2($s0) -/* B2E1D4 80241D64 24420001 */ addiu $v0, $v0, 1 -/* B2E1D8 80241D68 A60202C2 */ sh $v0, 0x2c2($s0) -.L80241D6C: -/* B2E1DC 80241D6C 8FBF0018 */ lw $ra, 0x18($sp) -/* B2E1E0 80241D70 8FB10014 */ lw $s1, 0x14($sp) -/* B2E1E4 80241D74 8FB00010 */ lw $s0, 0x10($sp) -/* B2E1E8 80241D78 24020002 */ addiu $v0, $zero, 2 -/* B2E1EC 80241D7C 03E00008 */ jr $ra -/* B2E1F0 80241D80 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80241D84_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80241D84_B2C470.s deleted file mode 100644 index e48b5e781e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80241D84_B2C470.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D84_B2E1F4 -/* B2E1F4 80241D84 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B2E1F8 80241D88 AFB1001C */ sw $s1, 0x1c($sp) -/* B2E1FC 80241D8C AFBF0020 */ sw $ra, 0x20($sp) -/* B2E200 80241D90 AFB00018 */ sw $s0, 0x18($sp) -/* B2E204 80241D94 F7B60030 */ sdc1 $f22, 0x30($sp) -/* B2E208 80241D98 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B2E20C 80241D9C 10A00060 */ beqz $a1, .L80241F20 -/* B2E210 80241DA0 0080882D */ daddu $s1, $a0, $zero -/* B2E214 80241DA4 3C05F4AC */ lui $a1, 0xf4ac -/* B2E218 80241DA8 0C0B1EAF */ jal get_variable -/* B2E21C 80241DAC 34A5D481 */ ori $a1, $a1, 0xd481 -/* B2E220 80241DB0 0220202D */ daddu $a0, $s1, $zero -/* B2E224 80241DB4 3C05F4AC */ lui $a1, 0xf4ac -/* B2E228 80241DB8 4482B000 */ mtc1 $v0, $f22 -/* B2E22C 80241DBC 00000000 */ nop -/* B2E230 80241DC0 4680B5A0 */ cvt.s.w $f22, $f22 -/* B2E234 80241DC4 0C0B1EAF */ jal get_variable -/* B2E238 80241DC8 34A5D482 */ ori $a1, $a1, 0xd482 -/* B2E23C 80241DCC 0220202D */ daddu $a0, $s1, $zero -/* B2E240 80241DD0 3C05F4AC */ lui $a1, 0xf4ac -/* B2E244 80241DD4 4482A000 */ mtc1 $v0, $f20 -/* B2E248 80241DD8 00000000 */ nop -/* B2E24C 80241DDC 4680A520 */ cvt.s.w $f20, $f20 -/* B2E250 80241DE0 0C0B1EAF */ jal get_variable -/* B2E254 80241DE4 34A5D483 */ ori $a1, $a1, 0xd483 -/* B2E258 80241DE8 44821000 */ mtc1 $v0, $f2 -/* B2E25C 80241DEC 00000000 */ nop -/* B2E260 80241DF0 468010A0 */ cvt.s.w $f2, $f2 -/* B2E264 80241DF4 4405B000 */ mfc1 $a1, $f22 -/* B2E268 80241DF8 4406A000 */ mfc1 $a2, $f20 -/* B2E26C 80241DFC 44071000 */ mfc1 $a3, $f2 -/* B2E270 80241E00 0C01C574 */ jal func_800715D0 -/* B2E274 80241E04 0000202D */ daddu $a0, $zero, $zero -/* B2E278 80241E08 0220202D */ daddu $a0, $s1, $zero -/* B2E27C 80241E0C 3C05F4AC */ lui $a1, 0xf4ac -/* B2E280 80241E10 34A5D481 */ ori $a1, $a1, 0xd481 -/* B2E284 80241E14 3C108025 */ lui $s0, 0x8025 -/* B2E288 80241E18 26108940 */ addiu $s0, $s0, -0x76c0 -/* B2E28C 80241E1C 0C0B1EAF */ jal get_variable -/* B2E290 80241E20 AE020000 */ sw $v0, ($s0) -/* B2E294 80241E24 0220202D */ daddu $a0, $s1, $zero -/* B2E298 80241E28 3C05F4AC */ lui $a1, 0xf4ac -/* B2E29C 80241E2C 4482B000 */ mtc1 $v0, $f22 -/* B2E2A0 80241E30 00000000 */ nop -/* B2E2A4 80241E34 4680B5A0 */ cvt.s.w $f22, $f22 -/* B2E2A8 80241E38 0C0B1EAF */ jal get_variable -/* B2E2AC 80241E3C 34A5D482 */ ori $a1, $a1, 0xd482 -/* B2E2B0 80241E40 0220202D */ daddu $a0, $s1, $zero -/* B2E2B4 80241E44 3C05F4AC */ lui $a1, 0xf4ac -/* B2E2B8 80241E48 4482A000 */ mtc1 $v0, $f20 -/* B2E2BC 80241E4C 00000000 */ nop -/* B2E2C0 80241E50 4680A520 */ cvt.s.w $f20, $f20 -/* B2E2C4 80241E54 0C0B1EAF */ jal get_variable -/* B2E2C8 80241E58 34A5D483 */ ori $a1, $a1, 0xd483 -/* B2E2CC 80241E5C 44821000 */ mtc1 $v0, $f2 -/* B2E2D0 80241E60 00000000 */ nop -/* B2E2D4 80241E64 468010A0 */ cvt.s.w $f2, $f2 -/* B2E2D8 80241E68 4405B000 */ mfc1 $a1, $f22 -/* B2E2DC 80241E6C 4406A000 */ mfc1 $a2, $f20 -/* B2E2E0 80241E70 44071000 */ mfc1 $a3, $f2 -/* B2E2E4 80241E74 0C01C604 */ jal func_80071810 -/* B2E2E8 80241E78 0000202D */ daddu $a0, $zero, $zero -/* B2E2EC 80241E7C 0220202D */ daddu $a0, $s1, $zero -/* B2E2F0 80241E80 3C05F4AC */ lui $a1, 0xf4ac -/* B2E2F4 80241E84 3C018025 */ lui $at, 0x8025 -/* B2E2F8 80241E88 AC228944 */ sw $v0, -0x76bc($at) -/* B2E2FC 80241E8C 0C0B1EAF */ jal get_variable -/* B2E300 80241E90 34A5D481 */ ori $a1, $a1, 0xd481 -/* B2E304 80241E94 0220202D */ daddu $a0, $s1, $zero -/* B2E308 80241E98 3C05F4AC */ lui $a1, 0xf4ac -/* B2E30C 80241E9C 4482B000 */ mtc1 $v0, $f22 -/* B2E310 80241EA0 00000000 */ nop -/* B2E314 80241EA4 4680B5A0 */ cvt.s.w $f22, $f22 -/* B2E318 80241EA8 0C0B1EAF */ jal get_variable -/* B2E31C 80241EAC 34A5D482 */ ori $a1, $a1, 0xd482 -/* B2E320 80241EB0 0220202D */ daddu $a0, $s1, $zero -/* B2E324 80241EB4 3C05F4AC */ lui $a1, 0xf4ac -/* B2E328 80241EB8 4482A000 */ mtc1 $v0, $f20 -/* B2E32C 80241EBC 00000000 */ nop -/* B2E330 80241EC0 4680A520 */ cvt.s.w $f20, $f20 -/* B2E334 80241EC4 0C0B1EAF */ jal get_variable -/* B2E338 80241EC8 34A5D483 */ ori $a1, $a1, 0xd483 -/* B2E33C 80241ECC 44821000 */ mtc1 $v0, $f2 -/* B2E340 80241ED0 00000000 */ nop -/* B2E344 80241ED4 468010A0 */ cvt.s.w $f2, $f2 -/* B2E348 80241ED8 4405B000 */ mfc1 $a1, $f22 -/* B2E34C 80241EDC 4406A000 */ mfc1 $a2, $f20 -/* B2E350 80241EE0 3C013F80 */ lui $at, 0x3f80 -/* B2E354 80241EE4 44810000 */ mtc1 $at, $f0 -/* B2E358 80241EE8 44071000 */ mfc1 $a3, $f2 -/* B2E35C 80241EEC 0000202D */ daddu $a0, $zero, $zero -/* B2E360 80241EF0 AFA00014 */ sw $zero, 0x14($sp) -/* B2E364 80241EF4 0C01CA24 */ jal func_80072890 -/* B2E368 80241EF8 E7A00010 */ swc1 $f0, 0x10($sp) -/* B2E36C 80241EFC 8E030000 */ lw $v1, ($s0) -/* B2E370 80241F00 8C64000C */ lw $a0, 0xc($v1) -/* B2E374 80241F04 3C018025 */ lui $at, 0x8025 -/* B2E378 80241F08 AC228948 */ sw $v0, -0x76b8($at) -/* B2E37C 80241F0C AC800018 */ sw $zero, 0x18($a0) -/* B2E380 80241F10 AC800020 */ sw $zero, 0x20($a0) -/* B2E384 80241F14 AC800024 */ sw $zero, 0x24($a0) -/* B2E388 80241F18 AC800028 */ sw $zero, 0x28($a0) -/* B2E38C 80241F1C AC80001C */ sw $zero, 0x1c($a0) -.L80241F20: -/* B2E390 80241F20 3C028025 */ lui $v0, 0x8025 -/* B2E394 80241F24 8C428940 */ lw $v0, -0x76c0($v0) -/* B2E398 80241F28 8C44000C */ lw $a0, 0xc($v0) -/* B2E39C 80241F2C 8C820020 */ lw $v0, 0x20($a0) -/* B2E3A0 80241F30 8C830028 */ lw $v1, 0x28($a0) -/* B2E3A4 80241F34 2442000A */ addiu $v0, $v0, 0xa -/* B2E3A8 80241F38 AC820020 */ sw $v0, 0x20($a0) -/* B2E3AC 80241F3C 8C820024 */ lw $v0, 0x24($a0) -/* B2E3B0 80241F40 2463000A */ addiu $v1, $v1, 0xa -/* B2E3B4 80241F44 AC830028 */ sw $v1, 0x28($a0) -/* B2E3B8 80241F48 8C830018 */ lw $v1, 0x18($a0) -/* B2E3BC 80241F4C 2442000A */ addiu $v0, $v0, 0xa -/* B2E3C0 80241F50 AC820024 */ sw $v0, 0x24($a0) -/* B2E3C4 80241F54 8C82001C */ lw $v0, 0x1c($a0) -/* B2E3C8 80241F58 2463000A */ addiu $v1, $v1, 0xa -/* B2E3CC 80241F5C AC830018 */ sw $v1, 0x18($a0) -/* B2E3D0 80241F60 286300FF */ slti $v1, $v1, 0xff -/* B2E3D4 80241F64 2442000A */ addiu $v0, $v0, 0xa -/* B2E3D8 80241F68 AC82001C */ sw $v0, 0x1c($a0) -/* B2E3DC 80241F6C 14600004 */ bnez $v1, .L80241F80 -/* B2E3E0 80241F70 0000102D */ daddu $v0, $zero, $zero -/* B2E3E4 80241F74 240200FF */ addiu $v0, $zero, 0xff -/* B2E3E8 80241F78 AC820018 */ sw $v0, 0x18($a0) -/* B2E3EC 80241F7C 24020002 */ addiu $v0, $zero, 2 -.L80241F80: -/* B2E3F0 80241F80 8FBF0020 */ lw $ra, 0x20($sp) -/* B2E3F4 80241F84 8FB1001C */ lw $s1, 0x1c($sp) -/* B2E3F8 80241F88 8FB00018 */ lw $s0, 0x18($sp) -/* B2E3FC 80241F8C D7B60030 */ ldc1 $f22, 0x30($sp) -/* B2E400 80241F90 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B2E404 80241F94 03E00008 */ jr $ra -/* B2E408 80241F98 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80242050_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80242050_B2C470.s deleted file mode 100644 index 84f539dcb1..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80242050_B2C470.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242050_B2E4C0 -/* B2E4C0 80242050 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2E4C4 80242054 AFBF0010 */ sw $ra, 0x10($sp) -/* B2E4C8 80242058 8C82000C */ lw $v0, 0xc($a0) -/* B2E4CC 8024205C 0C0B1EAF */ jal get_variable -/* B2E4D0 80242060 8C450000 */ lw $a1, ($v0) -/* B2E4D4 80242064 3C038025 */ lui $v1, 0x8025 -/* B2E4D8 80242068 8C638940 */ lw $v1, -0x76c0($v1) -/* B2E4DC 8024206C 8C63000C */ lw $v1, 0xc($v1) -/* B2E4E0 80242070 AC620034 */ sw $v0, 0x34($v1) -/* B2E4E4 80242074 8FBF0010 */ lw $ra, 0x10($sp) -/* B2E4E8 80242078 24020002 */ addiu $v0, $zero, 2 -/* B2E4EC 8024207C 03E00008 */ jr $ra -/* B2E4F0 80242080 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80242084_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80242084_B2C470.s deleted file mode 100644 index b85e85aa54..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80242084_B2C470.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242084_B2E4F4 -/* B2E4F4 80242084 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2E4F8 80242088 AFBF0010 */ sw $ra, 0x10($sp) -/* B2E4FC 8024208C 8C82000C */ lw $v0, 0xc($a0) -/* B2E500 80242090 0C0B1EAF */ jal get_variable -/* B2E504 80242094 8C450000 */ lw $a1, ($v0) -/* B2E508 80242098 0040202D */ daddu $a0, $v0, $zero -/* B2E50C 8024209C 3C028025 */ lui $v0, 0x8025 -/* B2E510 802420A0 8C428940 */ lw $v0, -0x76c0($v0) -/* B2E514 802420A4 24030001 */ addiu $v1, $zero, 1 -/* B2E518 802420A8 8C45000C */ lw $a1, 0xc($v0) -/* B2E51C 802420AC 1083000D */ beq $a0, $v1, .L802420E4 -/* B2E520 802420B0 28820002 */ slti $v0, $a0, 2 -/* B2E524 802420B4 10400005 */ beqz $v0, .L802420CC -/* B2E528 802420B8 24020002 */ addiu $v0, $zero, 2 -/* B2E52C 802420BC 10800007 */ beqz $a0, .L802420DC -/* B2E530 802420C0 240200C0 */ addiu $v0, $zero, 0xc0 -/* B2E534 802420C4 0809083D */ j .L802420F4 -/* B2E538 802420C8 ACA00038 */ sw $zero, 0x38($a1) -.L802420CC: -/* B2E53C 802420CC 10820008 */ beq $a0, $v0, .L802420F0 -/* B2E540 802420D0 24020040 */ addiu $v0, $zero, 0x40 -/* B2E544 802420D4 0809083D */ j .L802420F4 -/* B2E548 802420D8 ACA00038 */ sw $zero, 0x38($a1) -.L802420DC: -/* B2E54C 802420DC 0809083D */ j .L802420F4 -/* B2E550 802420E0 ACA20038 */ sw $v0, 0x38($a1) -.L802420E4: -/* B2E554 802420E4 24020080 */ addiu $v0, $zero, 0x80 -/* B2E558 802420E8 0809083D */ j .L802420F4 -/* B2E55C 802420EC ACA20038 */ sw $v0, 0x38($a1) -.L802420F0: -/* B2E560 802420F0 ACA20038 */ sw $v0, 0x38($a1) -.L802420F4: -/* B2E564 802420F4 8FBF0010 */ lw $ra, 0x10($sp) -/* B2E568 802420F8 24020002 */ addiu $v0, $zero, 2 -/* B2E56C 802420FC 03E00008 */ jr $ra -/* B2E570 80242100 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80242104_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80242104_B2C470.s deleted file mode 100644 index 6f2dcd6a46..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80242104_B2C470.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242104_B2E574 -/* B2E574 80242104 3C028025 */ lui $v0, 0x8025 -/* B2E578 80242108 8C428948 */ lw $v0, -0x76b8($v0) -/* B2E57C 8024210C 8C42000C */ lw $v0, 0xc($v0) -/* B2E580 80242110 AC40001C */ sw $zero, 0x1c($v0) -/* B2E584 80242114 03E00008 */ jr $ra -/* B2E588 80242118 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_02/func_80242150_B2C470.s b/asm/nonmatchings/world/area_jan/jan_02/func_80242150_B2C470.s deleted file mode 100644 index d52189f12e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/func_80242150_B2C470.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242150_B2E5C0 -/* B2E5C0 80242150 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2E5C4 80242154 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* B2E5C8 80242158 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* B2E5CC 8024215C 3C05FE36 */ lui $a1, 0xfe36 -/* B2E5D0 80242160 AFBF0010 */ sw $ra, 0x10($sp) -/* B2E5D4 80242164 80460075 */ lb $a2, 0x75($v0) -/* B2E5D8 80242168 0C0B2026 */ jal set_variable -/* B2E5DC 8024216C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B2E5E0 80242170 8FBF0010 */ lw $ra, 0x10($sp) -/* B2E5E4 80242174 24020002 */ addiu $v0, $zero, 2 -/* B2E5E8 80242178 03E00008 */ jr $ra -/* B2E5EC 8024217C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_80240020_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_80240020_B34BD0.s deleted file mode 100644 index 804cdb4019..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_80240020_B34BD0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_B34BF0 -/* B34BF0 80240020 3C028016 */ lui $v0, 0x8016 -/* B34BF4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* B34BF8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* B34BFC 8024002C 03E00008 */ jr $ra -/* B34C00 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_80240034_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_80240034_B34BD0.s deleted file mode 100644 index ccfe10d98f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_80240034_B34BD0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_B34C04 -/* B34C04 80240034 3C038016 */ lui $v1, 0x8016 -/* B34C08 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* B34C0C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B34C10 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* B34C14 80240044 0080802D */ daddu $s0, $a0, $zero -/* B34C18 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* B34C1C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* B34C20 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* B34C24 80240054 24020002 */ addiu $v0, $zero, 2 -/* B34C28 80240058 08090038 */ j .L802400E0 -/* B34C2C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* B34C30 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* B34C34 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* B34C38 80240068 80620040 */ lb $v0, 0x40($v1) -/* B34C3C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* B34C40 80240070 04420001 */ bltzl $v0, .L80240078 -/* B34C44 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* B34C48 80240078 14400003 */ bnez $v0, .L80240088 -/* B34C4C 8024007C 00000000 */ nop -/* B34C50 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* B34C54 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* B34C58 80240088 44822000 */ mtc1 $v0, $f4 -/* B34C5C 8024008C 00000000 */ nop -/* B34C60 80240090 46802120 */ cvt.s.w $f4, $f4 -/* B34C64 80240094 44062000 */ mfc1 $a2, $f4 -/* B34C68 80240098 44872000 */ mtc1 $a3, $f4 -/* B34C6C 8024009C 00000000 */ nop -/* B34C70 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* B34C74 802400A4 44806000 */ mtc1 $zero, $f12 -/* B34C78 802400A8 44072000 */ mfc1 $a3, $f4 -/* B34C7C 802400AC 0C00A720 */ jal atan2 -/* B34C80 802400B0 46006386 */ mov.s $f14, $f12 -/* B34C84 802400B4 3C014270 */ lui $at, 0x4270 -/* B34C88 802400B8 44811000 */ mtc1 $at, $f2 -/* B34C8C 802400BC 00000000 */ nop -/* B34C90 802400C0 4602003C */ c.lt.s $f0, $f2 -/* B34C94 802400C4 00000000 */ nop -/* B34C98 802400C8 45000004 */ bc1f .L802400DC -/* B34C9C 802400CC 24020001 */ addiu $v0, $zero, 1 -/* B34CA0 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* B34CA4 802400D4 08090038 */ j .L802400E0 -/* B34CA8 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* B34CAC 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* B34CB0 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* B34CB4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* B34CB8 802400E8 03E00008 */ jr $ra -/* B34CBC 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_802400F0_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_802400F0_B34BD0.s deleted file mode 100644 index 06b17b8424..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_802400F0_B34BD0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_B34CC0 -/* B34CC0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B34CC4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* B34CC8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* B34CCC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* B34CD0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* B34CD4 80240104 0C016AFA */ jal get_current_map_header -/* B34CD8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* B34CDC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* B34CE0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* B34CE4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B34CE8 80240118 0C0B1EAF */ jal get_variable -/* B34CEC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* B34CF0 80240120 0220202D */ daddu $a0, $s1, $zero -/* B34CF4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* B34CF8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* B34CFC 8024012C 00028100 */ sll $s0, $v0, 4 -/* B34D00 80240130 02031821 */ addu $v1, $s0, $v1 -/* B34D04 80240134 C4600000 */ lwc1 $f0, ($v1) -/* B34D08 80240138 4600008D */ trunc.w.s $f2, $f0 -/* B34D0C 8024013C 44061000 */ mfc1 $a2, $f2 -/* B34D10 80240140 0C0B2026 */ jal set_variable -/* B34D14 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B34D18 80240148 0220202D */ daddu $a0, $s1, $zero -/* B34D1C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* B34D20 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* B34D24 80240154 02021021 */ addu $v0, $s0, $v0 -/* B34D28 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* B34D2C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* B34D30 80240160 44061000 */ mfc1 $a2, $f2 -/* B34D34 80240164 0C0B2026 */ jal set_variable -/* B34D38 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* B34D3C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* B34D40 80240170 8E420014 */ lw $v0, 0x14($s2) -/* B34D44 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* B34D48 80240178 02021021 */ addu $v0, $s0, $v0 -/* B34D4C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* B34D50 80240180 4600008D */ trunc.w.s $f2, $f0 -/* B34D54 80240184 44061000 */ mfc1 $a2, $f2 -/* B34D58 80240188 0C0B2026 */ jal set_variable -/* B34D5C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* B34D60 80240190 0220202D */ daddu $a0, $s1, $zero -/* B34D64 80240194 8E420014 */ lw $v0, 0x14($s2) -/* B34D68 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* B34D6C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* B34D70 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* B34D74 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* B34D78 802401A8 44061000 */ mfc1 $a2, $f2 -/* B34D7C 802401AC 0C0B2026 */ jal set_variable -/* B34D80 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* B34D84 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* B34D88 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* B34D8C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* B34D90 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* B34D94 802401C4 24020002 */ addiu $v0, $zero, 2 -/* B34D98 802401C8 03E00008 */ jr $ra -/* B34D9C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_802401D0_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_802401D0_B34BD0.s deleted file mode 100644 index 62880ba7e4..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_802401D0_B34BD0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_B34DA0 -/* B34DA0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* B34DA4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* B34DA8 802401D8 3C014334 */ lui $at, 0x4334 -/* B34DAC 802401DC 44816000 */ mtc1 $at, $f12 -/* B34DB0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B34DB4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* B34DB8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* B34DBC 802401EC 00031080 */ sll $v0, $v1, 2 -/* B34DC0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* B34DC4 802401F4 00021080 */ sll $v0, $v0, 2 -/* B34DC8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* B34DCC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* B34DD0 80240200 00431021 */ addu $v0, $v0, $v1 -/* B34DD4 80240204 000210C0 */ sll $v0, $v0, 3 -/* B34DD8 80240208 3C01800B */ lui $at, 0x800b -/* B34DDC 8024020C 00220821 */ addu $at, $at, $v0 -/* B34DE0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* B34DE4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* B34DE8 80240218 0C00A6C9 */ jal clamp_angle -/* B34DEC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* B34DF0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* B34DF4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* B34DF8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* B34DFC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* B34E00 80240230 24020002 */ addiu $v0, $zero, 2 -/* B34E04 80240234 03E00008 */ jr $ra -/* B34E08 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_8024023C_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_8024023C_B34BD0.s deleted file mode 100644 index 4928a7f2a1..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_8024023C_B34BD0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_B34E0C -/* B34E0C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B34E10 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* B34E14 80240244 0080802D */ daddu $s0, $a0, $zero -/* B34E18 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* B34E1C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* B34E20 80240250 8E02000C */ lw $v0, 0xc($s0) -/* B34E24 80240254 0C0B210B */ jal get_float_variable -/* B34E28 80240258 8C450000 */ lw $a1, ($v0) -/* B34E2C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* B34E30 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* B34E34 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* B34E38 80240268 44060000 */ mfc1 $a2, $f0 -/* B34E3C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* B34E40 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* B34E44 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* B34E48 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* B34E4C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* B34E50 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* B34E54 80240284 0C00A7E7 */ jal add_vec2D_polar -/* B34E58 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* B34E5C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* B34E60 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* B34E64 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* B34E68 80240298 0C0B2190 */ jal set_float_variable -/* B34E6C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B34E70 802402A0 0200202D */ daddu $a0, $s0, $zero -/* B34E74 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* B34E78 802402A8 4406A000 */ mfc1 $a2, $f20 -/* B34E7C 802402AC 0C0B2190 */ jal set_float_variable -/* B34E80 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B34E84 802402B4 0200202D */ daddu $a0, $s0, $zero -/* B34E88 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* B34E8C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* B34E90 802402C0 0C0B2190 */ jal set_float_variable -/* B34E94 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* B34E98 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* B34E9C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* B34EA0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B34EA4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* B34EA8 802402D8 03E00008 */ jr $ra -/* B34EAC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_802402E0_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_802402E0_B34BD0.s deleted file mode 100644 index 6134a5cc38..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_802402E0_B34BD0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_B34EB0 -/* B34EB0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B34EB4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* B34EB8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* B34EBC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* B34EC0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* B34EC4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* B34EC8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* B34ECC 802402FC 04610004 */ bgez $v1, .L80240310 -/* B34ED0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* B34ED4 80240304 3C020002 */ lui $v0, 2 -/* B34ED8 80240308 080900C8 */ j .L80240320 -/* B34EDC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* B34EE0 80240310 3C040002 */ lui $a0, 2 -/* B34EE4 80240314 0083102A */ slt $v0, $a0, $v1 -/* B34EE8 80240318 10400002 */ beqz $v0, .L80240324 -/* B34EEC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* B34EF0 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* B34EF4 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* B34EF8 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* B34EFC 8024032C 00621821 */ addu $v1, $v1, $v0 -/* B34F00 80240330 04610004 */ bgez $v1, .L80240344 -/* B34F04 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* B34F08 80240338 3C020002 */ lui $v0, 2 -/* B34F0C 8024033C 080900D5 */ j .L80240354 -/* B34F10 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* B34F14 80240344 3C040002 */ lui $a0, 2 -/* B34F18 80240348 0083102A */ slt $v0, $a0, $v1 -/* B34F1C 8024034C 10400002 */ beqz $v0, .L80240358 -/* B34F20 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* B34F24 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* B34F28 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* B34F2C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* B34F30 80240360 00621821 */ addu $v1, $v1, $v0 -/* B34F34 80240364 04610004 */ bgez $v1, .L80240378 -/* B34F38 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* B34F3C 8024036C 3C020002 */ lui $v0, 2 -/* B34F40 80240370 080900E2 */ j .L80240388 -/* B34F44 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* B34F48 80240378 3C040002 */ lui $a0, 2 -/* B34F4C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* B34F50 80240380 10400002 */ beqz $v0, .L8024038C -/* B34F54 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* B34F58 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* B34F5C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* B34F60 80240390 8E020094 */ lw $v0, 0x94($s0) -/* B34F64 80240394 00621821 */ addu $v1, $v1, $v0 -/* B34F68 80240398 04610004 */ bgez $v1, .L802403AC -/* B34F6C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* B34F70 802403A0 3C020002 */ lui $v0, 2 -/* B34F74 802403A4 080900EF */ j .L802403BC -/* B34F78 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* B34F7C 802403AC 3C040002 */ lui $a0, 2 -/* B34F80 802403B0 0083102A */ slt $v0, $a0, $v1 -/* B34F84 802403B4 10400002 */ beqz $v0, .L802403C0 -/* B34F88 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* B34F8C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* B34F90 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* B34F94 802403C4 0C046F07 */ jal set_main_pan_u -/* B34F98 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* B34F9C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* B34FA0 802403D0 0C046F0D */ jal set_main_pan_v -/* B34FA4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* B34FA8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* B34FAC 802403DC 0C046F13 */ jal set_aux_pan_u -/* B34FB0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* B34FB4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* B34FB8 802403E8 0C046F19 */ jal set_aux_pan_v -/* B34FBC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* B34FC0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* B34FC4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* B34FC8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* B34FCC 802403FC 03E00008 */ jr $ra -/* B34FD0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_80240404_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_80240404_B34BD0.s deleted file mode 100644 index f6cf025e55..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_80240404_B34BD0.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_B34FD4 -/* B34FD4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B34FD8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* B34FDC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* B34FE0 80240410 10A00005 */ beqz $a1, .L80240428 -/* B34FE4 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* B34FE8 80240418 AE000070 */ sw $zero, 0x70($s0) -/* B34FEC 8024041C AE000074 */ sw $zero, 0x74($s0) -/* B34FF0 80240420 AE000078 */ sw $zero, 0x78($s0) -/* B34FF4 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* B34FF8 80240428 8E020070 */ lw $v0, 0x70($s0) -/* B34FFC 8024042C 1440000E */ bnez $v0, .L80240468 -/* B35000 80240430 00000000 */ nop -/* B35004 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* B35008 80240438 8E020088 */ lw $v0, 0x88($s0) -/* B3500C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* B35010 80240440 04610004 */ bgez $v1, .L80240454 -/* B35014 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* B35018 80240448 3C020002 */ lui $v0, 2 -/* B3501C 8024044C 08090119 */ j .L80240464 -/* B35020 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* B35024 80240454 3C040002 */ lui $a0, 2 -/* B35028 80240458 0083102A */ slt $v0, $a0, $v1 -/* B3502C 8024045C 10400002 */ beqz $v0, .L80240468 -/* B35030 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* B35034 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* B35038 80240468 8E020074 */ lw $v0, 0x74($s0) -/* B3503C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* B35040 80240470 00000000 */ nop -/* B35044 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* B35048 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* B3504C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* B35050 80240480 04610004 */ bgez $v1, .L80240494 -/* B35054 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* B35058 80240488 3C020002 */ lui $v0, 2 -/* B3505C 8024048C 08090129 */ j .L802404A4 -/* B35060 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* B35064 80240494 3C040002 */ lui $a0, 2 -/* B35068 80240498 0083102A */ slt $v0, $a0, $v1 -/* B3506C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* B35070 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* B35074 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* B35078 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* B3507C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* B35080 802404B0 00000000 */ nop -/* B35084 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* B35088 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* B3508C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* B35090 802404C0 04610004 */ bgez $v1, .L802404D4 -/* B35094 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* B35098 802404C8 3C020002 */ lui $v0, 2 -/* B3509C 802404CC 08090139 */ j .L802404E4 -/* B350A0 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* B350A4 802404D4 3C040002 */ lui $a0, 2 -/* B350A8 802404D8 0083102A */ slt $v0, $a0, $v1 -/* B350AC 802404DC 10400002 */ beqz $v0, .L802404E8 -/* B350B0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* B350B4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* B350B8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* B350BC 802404EC 1440000E */ bnez $v0, .L80240528 -/* B350C0 802404F0 00000000 */ nop -/* B350C4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* B350C8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* B350CC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* B350D0 80240500 04610004 */ bgez $v1, .L80240514 -/* B350D4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* B350D8 80240508 3C020002 */ lui $v0, 2 -/* B350DC 8024050C 08090149 */ j .L80240524 -/* B350E0 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* B350E4 80240514 3C040002 */ lui $a0, 2 -/* B350E8 80240518 0083102A */ slt $v0, $a0, $v1 -/* B350EC 8024051C 10400002 */ beqz $v0, .L80240528 -/* B350F0 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* B350F4 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* B350F8 80240528 8E040084 */ lw $a0, 0x84($s0) -/* B350FC 8024052C 0C046F07 */ jal set_main_pan_u -/* B35100 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* B35104 80240534 8E040084 */ lw $a0, 0x84($s0) -/* B35108 80240538 0C046F0D */ jal set_main_pan_v -/* B3510C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* B35110 80240540 8E040084 */ lw $a0, 0x84($s0) -/* B35114 80240544 0C046F13 */ jal set_aux_pan_u -/* B35118 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* B3511C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* B35120 80240550 0C046F19 */ jal set_aux_pan_v -/* B35124 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* B35128 80240558 8E020070 */ lw $v0, 0x70($s0) -/* B3512C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* B35130 80240560 8E040098 */ lw $a0, 0x98($s0) -/* B35134 80240564 24420001 */ addiu $v0, $v0, 1 -/* B35138 80240568 AE020070 */ sw $v0, 0x70($s0) -/* B3513C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* B35140 80240570 24630001 */ addiu $v1, $v1, 1 -/* B35144 80240574 AE030078 */ sw $v1, 0x78($s0) -/* B35148 80240578 8E030070 */ lw $v1, 0x70($s0) -/* B3514C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* B35150 80240580 AE020074 */ sw $v0, 0x74($s0) -/* B35154 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* B35158 80240588 0064182A */ slt $v1, $v1, $a0 -/* B3515C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* B35160 80240590 14600002 */ bnez $v1, .L8024059C -/* B35164 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* B35168 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* B3516C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* B35170 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* B35174 802405A4 0043102A */ slt $v0, $v0, $v1 -/* B35178 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* B3517C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* B35180 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* B35184 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* B35188 802405B8 0043102A */ slt $v0, $v0, $v1 -/* B3518C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* B35190 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* B35194 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* B35198 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* B3519C 802405CC 0043102A */ slt $v0, $v0, $v1 -/* B351A0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* B351A4 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* B351A8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* B351AC 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* B351B0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* B351B4 802405E4 03E00008 */ jr $ra -/* B351B8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_802405EC_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_802405EC_B34BD0.s deleted file mode 100644 index f7c692f9a9..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_802405EC_B34BD0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_B351BC -/* B351BC 802405EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B351C0 802405F0 0000202D */ daddu $a0, $zero, $zero -/* B351C4 802405F4 0080282D */ daddu $a1, $a0, $zero -/* B351C8 802405F8 0080302D */ daddu $a2, $a0, $zero -/* B351CC 802405FC 0080382D */ daddu $a3, $a0, $zero -/* B351D0 80240600 AFBF0018 */ sw $ra, 0x18($sp) -/* B351D4 80240604 AFA00010 */ sw $zero, 0x10($sp) -/* B351D8 80240608 0C01CA54 */ jal func_80072950 -/* B351DC 8024060C AFA00014 */ sw $zero, 0x14($sp) -/* B351E0 80240610 8FBF0018 */ lw $ra, 0x18($sp) -/* B351E4 80240614 24020002 */ addiu $v0, $zero, 2 -/* B351E8 80240618 03E00008 */ jr $ra -/* B351EC 8024061C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_80240AE0_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_80240AE0_B34BD0.s deleted file mode 100644 index efd5ee7344..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_80240AE0_B34BD0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AE0_B356B0 -/* B356B0 80240AE0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B356B4 80240AE4 AFB40040 */ sw $s4, 0x40($sp) -/* B356B8 80240AE8 0080A02D */ daddu $s4, $a0, $zero -/* B356BC 80240AEC AFBF0044 */ sw $ra, 0x44($sp) -/* B356C0 80240AF0 AFB3003C */ sw $s3, 0x3c($sp) -/* B356C4 80240AF4 AFB20038 */ sw $s2, 0x38($sp) -/* B356C8 80240AF8 AFB10034 */ sw $s1, 0x34($sp) -/* B356CC 80240AFC AFB00030 */ sw $s0, 0x30($sp) -/* B356D0 80240B00 8E910148 */ lw $s1, 0x148($s4) -/* B356D4 80240B04 00A0902D */ daddu $s2, $a1, $zero -/* B356D8 80240B08 86240008 */ lh $a0, 8($s1) -/* B356DC 80240B0C 0C00EABB */ jal get_npc_unsafe -/* B356E0 80240B10 00C0982D */ daddu $s3, $a2, $zero -/* B356E4 80240B14 8E430014 */ lw $v1, 0x14($s2) -/* B356E8 80240B18 04600031 */ bltz $v1, .L80240BE0 -/* B356EC 80240B1C 0040802D */ daddu $s0, $v0, $zero -/* B356F0 80240B20 0260202D */ daddu $a0, $s3, $zero -/* B356F4 80240B24 AFA00010 */ sw $zero, 0x10($sp) -/* B356F8 80240B28 8E460024 */ lw $a2, 0x24($s2) -/* B356FC 80240B2C 8E470028 */ lw $a3, 0x28($s2) -/* B35700 80240B30 0C01242D */ jal func_800490B4 -/* B35704 80240B34 0220282D */ daddu $a1, $s1, $zero -/* B35708 80240B38 10400029 */ beqz $v0, .L80240BE0 -/* B3570C 80240B3C 0000202D */ daddu $a0, $zero, $zero -/* B35710 80240B40 0200282D */ daddu $a1, $s0, $zero -/* B35714 80240B44 0000302D */ daddu $a2, $zero, $zero -/* B35718 80240B48 860300A8 */ lh $v1, 0xa8($s0) -/* B3571C 80240B4C 3C013F80 */ lui $at, 0x3f80 -/* B35720 80240B50 44810000 */ mtc1 $at, $f0 -/* B35724 80240B54 3C014000 */ lui $at, 0x4000 -/* B35728 80240B58 44811000 */ mtc1 $at, $f2 -/* B3572C 80240B5C 3C01C1A0 */ lui $at, 0xc1a0 -/* B35730 80240B60 44812000 */ mtc1 $at, $f4 -/* B35734 80240B64 2402000F */ addiu $v0, $zero, 0xf -/* B35738 80240B68 AFA2001C */ sw $v0, 0x1c($sp) -/* B3573C 80240B6C 44833000 */ mtc1 $v1, $f6 -/* B35740 80240B70 00000000 */ nop -/* B35744 80240B74 468031A0 */ cvt.s.w $f6, $f6 -/* B35748 80240B78 44073000 */ mfc1 $a3, $f6 -/* B3574C 80240B7C 27A20028 */ addiu $v0, $sp, 0x28 -/* B35750 80240B80 AFA20020 */ sw $v0, 0x20($sp) -/* B35754 80240B84 E7A00010 */ swc1 $f0, 0x10($sp) -/* B35758 80240B88 E7A20014 */ swc1 $f2, 0x14($sp) -/* B3575C 80240B8C 0C01BFA4 */ jal fx_emote -/* B35760 80240B90 E7A40018 */ swc1 $f4, 0x18($sp) -/* B35764 80240B94 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B35768 80240B98 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B3576C 80240B9C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B35770 80240BA0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B35774 80240BA4 8C460028 */ lw $a2, 0x28($v0) -/* B35778 80240BA8 0C00A720 */ jal atan2 -/* B3577C 80240BAC 8C470030 */ lw $a3, 0x30($v0) -/* B35780 80240BB0 0200202D */ daddu $a0, $s0, $zero -/* B35784 80240BB4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B35788 80240BB8 3C060020 */ lui $a2, 0x20 -/* B3578C 80240BBC 0C012530 */ jal func_800494C0 -/* B35790 80240BC0 E480000C */ swc1 $f0, 0xc($a0) -/* B35794 80240BC4 8E220018 */ lw $v0, 0x18($s1) -/* B35798 80240BC8 9442002A */ lhu $v0, 0x2a($v0) -/* B3579C 80240BCC 30420001 */ andi $v0, $v0, 1 -/* B357A0 80240BD0 14400029 */ bnez $v0, .L80240C78 -/* B357A4 80240BD4 2402000A */ addiu $v0, $zero, 0xa -/* B357A8 80240BD8 0809031E */ j .L80240C78 -/* B357AC 80240BDC 2402000C */ addiu $v0, $zero, 0xc -.L80240BE0: -/* B357B0 80240BE0 8602008C */ lh $v0, 0x8c($s0) -/* B357B4 80240BE4 14400025 */ bnez $v0, .L80240C7C -/* B357B8 80240BE8 00000000 */ nop -/* B357BC 80240BEC 9602008E */ lhu $v0, 0x8e($s0) -/* B357C0 80240BF0 2442FFFF */ addiu $v0, $v0, -1 -/* B357C4 80240BF4 A602008E */ sh $v0, 0x8e($s0) -/* B357C8 80240BF8 00021400 */ sll $v0, $v0, 0x10 -/* B357CC 80240BFC 1440001F */ bnez $v0, .L80240C7C -/* B357D0 80240C00 00000000 */ nop -/* B357D4 80240C04 8E820074 */ lw $v0, 0x74($s4) -/* B357D8 80240C08 2442FFFF */ addiu $v0, $v0, -1 -/* B357DC 80240C0C 10400019 */ beqz $v0, .L80240C74 -/* B357E0 80240C10 AE820074 */ sw $v0, 0x74($s4) -/* B357E4 80240C14 8E220018 */ lw $v0, 0x18($s1) -/* B357E8 80240C18 9442002A */ lhu $v0, 0x2a($v0) -/* B357EC 80240C1C 30420010 */ andi $v0, $v0, 0x10 -/* B357F0 80240C20 14400007 */ bnez $v0, .L80240C40 -/* B357F4 80240C24 00000000 */ nop -/* B357F8 80240C28 C600000C */ lwc1 $f0, 0xc($s0) -/* B357FC 80240C2C 3C014334 */ lui $at, 0x4334 -/* B35800 80240C30 44816000 */ mtc1 $at, $f12 -/* B35804 80240C34 0C00A6C9 */ jal clamp_angle -/* B35808 80240C38 460C0300 */ add.s $f12, $f0, $f12 -/* B3580C 80240C3C E600000C */ swc1 $f0, 0xc($s0) -.L80240C40: -/* B35810 80240C40 8E440008 */ lw $a0, 8($s2) -/* B35814 80240C44 000417C2 */ srl $v0, $a0, 0x1f -/* B35818 80240C48 00822021 */ addu $a0, $a0, $v0 -/* B3581C 80240C4C 00042043 */ sra $a0, $a0, 1 -/* B35820 80240C50 0C00A67F */ jal rand_int -/* B35824 80240C54 24840001 */ addiu $a0, $a0, 1 -/* B35828 80240C58 8E430008 */ lw $v1, 8($s2) -/* B3582C 80240C5C 000327C2 */ srl $a0, $v1, 0x1f -/* B35830 80240C60 00641821 */ addu $v1, $v1, $a0 -/* B35834 80240C64 00031843 */ sra $v1, $v1, 1 -/* B35838 80240C68 00621821 */ addu $v1, $v1, $v0 -/* B3583C 80240C6C 0809031F */ j .L80240C7C -/* B35840 80240C70 A603008E */ sh $v1, 0x8e($s0) -.L80240C74: -/* B35844 80240C74 24020004 */ addiu $v0, $zero, 4 -.L80240C78: -/* B35848 80240C78 AE820070 */ sw $v0, 0x70($s4) -.L80240C7C: -/* B3584C 80240C7C 8FBF0044 */ lw $ra, 0x44($sp) -/* B35850 80240C80 8FB40040 */ lw $s4, 0x40($sp) -/* B35854 80240C84 8FB3003C */ lw $s3, 0x3c($sp) -/* B35858 80240C88 8FB20038 */ lw $s2, 0x38($sp) -/* B3585C 80240C8C 8FB10034 */ lw $s1, 0x34($sp) -/* B35860 80240C90 8FB00030 */ lw $s0, 0x30($sp) -/* B35864 80240C94 03E00008 */ jr $ra -/* B35868 80240C98 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_80240D50_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_80240D50_B34BD0.s deleted file mode 100644 index 933f2131a5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_80240D50_B34BD0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D50_B35920 -/* B35920 80240D50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B35924 80240D54 AFB10014 */ sw $s1, 0x14($sp) -/* B35928 80240D58 0080882D */ daddu $s1, $a0, $zero -/* B3592C 80240D5C AFBF0018 */ sw $ra, 0x18($sp) -/* B35930 80240D60 AFB00010 */ sw $s0, 0x10($sp) -/* B35934 80240D64 8E300148 */ lw $s0, 0x148($s1) -/* B35938 80240D68 0C00EABB */ jal get_npc_unsafe -/* B3593C 80240D6C 86040008 */ lh $a0, 8($s0) -/* B35940 80240D70 8E0300CC */ lw $v1, 0xcc($s0) -/* B35944 80240D74 3C014120 */ lui $at, 0x4120 -/* B35948 80240D78 44812000 */ mtc1 $at, $f4 -/* B3594C 80240D7C 3C014000 */ lui $at, 0x4000 -/* B35950 80240D80 44810000 */ mtc1 $at, $f0 -/* B35954 80240D84 C442003C */ lwc1 $f2, 0x3c($v0) -/* B35958 80240D88 8C640010 */ lw $a0, 0x10($v1) -/* B3595C 80240D8C 8C430000 */ lw $v1, ($v0) -/* B35960 80240D90 E444001C */ swc1 $f4, 0x1c($v0) -/* B35964 80240D94 E4400014 */ swc1 $f0, 0x14($v0) -/* B35968 80240D98 E4420064 */ swc1 $f2, 0x64($v0) -/* B3596C 80240D9C 34630800 */ ori $v1, $v1, 0x800 -/* B35970 80240DA0 AC430000 */ sw $v1, ($v0) -/* B35974 80240DA4 AC440028 */ sw $a0, 0x28($v0) -/* B35978 80240DA8 2402000B */ addiu $v0, $zero, 0xb -/* B3597C 80240DAC AE220070 */ sw $v0, 0x70($s1) -/* B35980 80240DB0 8FBF0018 */ lw $ra, 0x18($sp) -/* B35984 80240DB4 8FB10014 */ lw $s1, 0x14($sp) -/* B35988 80240DB8 8FB00010 */ lw $s0, 0x10($sp) -/* B3598C 80240DBC 03E00008 */ jr $ra -/* B35990 80240DC0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_80240DC4_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_80240DC4_B34BD0.s deleted file mode 100644 index 1944e27a9a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_80240DC4_B34BD0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DC4_B35994 -/* B35994 80240DC4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B35998 80240DC8 AFB00010 */ sw $s0, 0x10($sp) -/* B3599C 80240DCC 0080802D */ daddu $s0, $a0, $zero -/* B359A0 80240DD0 AFBF0014 */ sw $ra, 0x14($sp) -/* B359A4 80240DD4 8E020148 */ lw $v0, 0x148($s0) -/* B359A8 80240DD8 0C00EABB */ jal get_npc_unsafe -/* B359AC 80240DDC 84440008 */ lh $a0, 8($v0) -/* B359B0 80240DE0 0040202D */ daddu $a0, $v0, $zero -/* B359B4 80240DE4 C482003C */ lwc1 $f2, 0x3c($a0) -/* B359B8 80240DE8 C480001C */ lwc1 $f0, 0x1c($a0) -/* B359BC 80240DEC 46001080 */ add.s $f2, $f2, $f0 -/* B359C0 80240DF0 C4840014 */ lwc1 $f4, 0x14($a0) -/* B359C4 80240DF4 46040001 */ sub.s $f0, $f0, $f4 -/* B359C8 80240DF8 C4840064 */ lwc1 $f4, 0x64($a0) -/* B359CC 80240DFC 4602203C */ c.lt.s $f4, $f2 -/* B359D0 80240E00 E482003C */ swc1 $f2, 0x3c($a0) -/* B359D4 80240E04 45010009 */ bc1t .L80240E2C -/* B359D8 80240E08 E480001C */ swc1 $f0, 0x1c($a0) -/* B359DC 80240E0C 8C820000 */ lw $v0, ($a0) -/* B359E0 80240E10 2403F7FF */ addiu $v1, $zero, -0x801 -/* B359E4 80240E14 E484003C */ swc1 $f4, 0x3c($a0) -/* B359E8 80240E18 AC80001C */ sw $zero, 0x1c($a0) -/* B359EC 80240E1C 00431024 */ and $v0, $v0, $v1 -/* B359F0 80240E20 AC820000 */ sw $v0, ($a0) -/* B359F4 80240E24 2402000C */ addiu $v0, $zero, 0xc -/* B359F8 80240E28 AE020070 */ sw $v0, 0x70($s0) -.L80240E2C: -/* B359FC 80240E2C 8FBF0014 */ lw $ra, 0x14($sp) -/* B35A00 80240E30 8FB00010 */ lw $s0, 0x10($sp) -/* B35A04 80240E34 03E00008 */ jr $ra -/* B35A08 80240E38 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_80240E3C_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_80240E3C_B34BD0.s deleted file mode 100644 index 0d0141ff9e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_80240E3C_B34BD0.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E3C_B35A0C -/* B35A0C 80240E3C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B35A10 80240E40 AFB3001C */ sw $s3, 0x1c($sp) -/* B35A14 80240E44 0080982D */ daddu $s3, $a0, $zero -/* B35A18 80240E48 AFBF0020 */ sw $ra, 0x20($sp) -/* B35A1C 80240E4C AFB20018 */ sw $s2, 0x18($sp) -/* B35A20 80240E50 AFB10014 */ sw $s1, 0x14($sp) -/* B35A24 80240E54 AFB00010 */ sw $s0, 0x10($sp) -/* B35A28 80240E58 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B35A2C 80240E5C 8E710148 */ lw $s1, 0x148($s3) -/* B35A30 80240E60 86240008 */ lh $a0, 8($s1) -/* B35A34 80240E64 0C00EABB */ jal get_npc_unsafe -/* B35A38 80240E68 00A0802D */ daddu $s0, $a1, $zero -/* B35A3C 80240E6C 8E040020 */ lw $a0, 0x20($s0) -/* B35A40 80240E70 0040902D */ daddu $s2, $v0, $zero -/* B35A44 80240E74 00041FC2 */ srl $v1, $a0, 0x1f -/* B35A48 80240E78 00832021 */ addu $a0, $a0, $v1 -/* B35A4C 80240E7C 00042043 */ sra $a0, $a0, 1 -/* B35A50 80240E80 0C00A67F */ jal rand_int -/* B35A54 80240E84 24840001 */ addiu $a0, $a0, 1 -/* B35A58 80240E88 8E030020 */ lw $v1, 0x20($s0) -/* B35A5C 80240E8C C64C0038 */ lwc1 $f12, 0x38($s2) -/* B35A60 80240E90 000327C2 */ srl $a0, $v1, 0x1f -/* B35A64 80240E94 00641821 */ addu $v1, $v1, $a0 -/* B35A68 80240E98 00031843 */ sra $v1, $v1, 1 -/* B35A6C 80240E9C 00621821 */ addu $v1, $v1, $v0 -/* B35A70 80240EA0 A643008E */ sh $v1, 0x8e($s2) -/* B35A74 80240EA4 8E2200CC */ lw $v0, 0xcc($s1) -/* B35A78 80240EA8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* B35A7C 80240EAC 8C42000C */ lw $v0, 0xc($v0) -/* B35A80 80240EB0 AE420028 */ sw $v0, 0x28($s2) -/* B35A84 80240EB4 C6000018 */ lwc1 $f0, 0x18($s0) -/* B35A88 80240EB8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B35A8C 80240EBC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B35A90 80240EC0 E6400018 */ swc1 $f0, 0x18($s2) -/* B35A94 80240EC4 8C460028 */ lw $a2, 0x28($v0) -/* B35A98 80240EC8 0C00A720 */ jal atan2 -/* B35A9C 80240ECC 8C470030 */ lw $a3, 0x30($v0) -/* B35AA0 80240ED0 46000506 */ mov.s $f20, $f0 -/* B35AA4 80240ED4 C64C000C */ lwc1 $f12, 0xc($s2) -/* B35AA8 80240ED8 0C00A70A */ jal get_clamped_angle_diff -/* B35AAC 80240EDC 4600A386 */ mov.s $f14, $f20 -/* B35AB0 80240EE0 46000086 */ mov.s $f2, $f0 -/* B35AB4 80240EE4 8E02001C */ lw $v0, 0x1c($s0) -/* B35AB8 80240EE8 46001005 */ abs.s $f0, $f2 -/* B35ABC 80240EEC 44822000 */ mtc1 $v0, $f4 -/* B35AC0 80240EF0 00000000 */ nop -/* B35AC4 80240EF4 46802120 */ cvt.s.w $f4, $f4 -/* B35AC8 80240EF8 4600203C */ c.lt.s $f4, $f0 -/* B35ACC 80240EFC 00000000 */ nop -/* B35AD0 80240F00 4500000D */ bc1f .L80240F38 -/* B35AD4 80240F04 00000000 */ nop -/* B35AD8 80240F08 44800000 */ mtc1 $zero, $f0 -/* B35ADC 80240F0C C654000C */ lwc1 $f20, 0xc($s2) -/* B35AE0 80240F10 4600103C */ c.lt.s $f2, $f0 -/* B35AE4 80240F14 00000000 */ nop -/* B35AE8 80240F18 45000006 */ bc1f .L80240F34 -/* B35AEC 80240F1C 00021023 */ negu $v0, $v0 -/* B35AF0 80240F20 44820000 */ mtc1 $v0, $f0 -/* B35AF4 80240F24 00000000 */ nop -/* B35AF8 80240F28 46800020 */ cvt.s.w $f0, $f0 -/* B35AFC 80240F2C 080903CE */ j .L80240F38 -/* B35B00 80240F30 4600A500 */ add.s $f20, $f20, $f0 -.L80240F34: -/* B35B04 80240F34 4604A500 */ add.s $f20, $f20, $f4 -.L80240F38: -/* B35B08 80240F38 0C00A6C9 */ jal clamp_angle -/* B35B0C 80240F3C 4600A306 */ mov.s $f12, $f20 -/* B35B10 80240F40 2402000D */ addiu $v0, $zero, 0xd -/* B35B14 80240F44 E640000C */ swc1 $f0, 0xc($s2) -/* B35B18 80240F48 AE620070 */ sw $v0, 0x70($s3) -/* B35B1C 80240F4C 8FBF0020 */ lw $ra, 0x20($sp) -/* B35B20 80240F50 8FB3001C */ lw $s3, 0x1c($sp) -/* B35B24 80240F54 8FB20018 */ lw $s2, 0x18($sp) -/* B35B28 80240F58 8FB10014 */ lw $s1, 0x14($sp) -/* B35B2C 80240F5C 8FB00010 */ lw $s0, 0x10($sp) -/* B35B30 80240F60 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B35B34 80240F64 03E00008 */ jr $ra -/* B35B38 80240F68 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_802411B4_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_802411B4_B34BD0.s deleted file mode 100644 index 0eceddb3b2..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_802411B4_B34BD0.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411B4_B35D84 -/* B35D84 802411B4 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B35D88 802411B8 AFB40058 */ sw $s4, 0x58($sp) -/* B35D8C 802411BC 0080A02D */ daddu $s4, $a0, $zero -/* B35D90 802411C0 AFBF0060 */ sw $ra, 0x60($sp) -/* B35D94 802411C4 AFB5005C */ sw $s5, 0x5c($sp) -/* B35D98 802411C8 AFB30054 */ sw $s3, 0x54($sp) -/* B35D9C 802411CC AFB20050 */ sw $s2, 0x50($sp) -/* B35DA0 802411D0 AFB1004C */ sw $s1, 0x4c($sp) -/* B35DA4 802411D4 AFB00048 */ sw $s0, 0x48($sp) -/* B35DA8 802411D8 8E910148 */ lw $s1, 0x148($s4) -/* B35DAC 802411DC 86240008 */ lh $a0, 8($s1) -/* B35DB0 802411E0 0C00EABB */ jal get_npc_unsafe -/* B35DB4 802411E4 00A0802D */ daddu $s0, $a1, $zero -/* B35DB8 802411E8 8E83000C */ lw $v1, 0xc($s4) -/* B35DBC 802411EC 0280202D */ daddu $a0, $s4, $zero -/* B35DC0 802411F0 8C650000 */ lw $a1, ($v1) -/* B35DC4 802411F4 0C0B1EAF */ jal get_variable -/* B35DC8 802411F8 0040902D */ daddu $s2, $v0, $zero -/* B35DCC 802411FC AFA00018 */ sw $zero, 0x18($sp) -/* B35DD0 80241200 8E2300D0 */ lw $v1, 0xd0($s1) -/* B35DD4 80241204 8C630094 */ lw $v1, 0x94($v1) -/* B35DD8 80241208 AFA3001C */ sw $v1, 0x1c($sp) -/* B35DDC 8024120C 8E2300D0 */ lw $v1, 0xd0($s1) -/* B35DE0 80241210 8C630080 */ lw $v1, 0x80($v1) -/* B35DE4 80241214 AFA30020 */ sw $v1, 0x20($sp) -/* B35DE8 80241218 8E2300D0 */ lw $v1, 0xd0($s1) -/* B35DEC 8024121C 8C630088 */ lw $v1, 0x88($v1) -/* B35DF0 80241220 AFA30024 */ sw $v1, 0x24($sp) -/* B35DF4 80241224 8E2300D0 */ lw $v1, 0xd0($s1) -/* B35DF8 80241228 8C63008C */ lw $v1, 0x8c($v1) -/* B35DFC 8024122C 27B50018 */ addiu $s5, $sp, 0x18 -/* B35E00 80241230 AFA30028 */ sw $v1, 0x28($sp) -/* B35E04 80241234 8E2300D0 */ lw $v1, 0xd0($s1) -/* B35E08 80241238 3C014282 */ lui $at, 0x4282 -/* B35E0C 8024123C 44810000 */ mtc1 $at, $f0 -/* B35E10 80241240 8C630090 */ lw $v1, 0x90($v1) -/* B35E14 80241244 0040982D */ daddu $s3, $v0, $zero -/* B35E18 80241248 E7A00030 */ swc1 $f0, 0x30($sp) -/* B35E1C 8024124C A7A00034 */ sh $zero, 0x34($sp) -/* B35E20 80241250 16000005 */ bnez $s0, .L80241268 -/* B35E24 80241254 AFA3002C */ sw $v1, 0x2c($sp) -/* B35E28 80241258 8E2200B0 */ lw $v0, 0xb0($s1) -/* B35E2C 8024125C 30420004 */ andi $v0, $v0, 4 -/* B35E30 80241260 10400044 */ beqz $v0, .L80241374 -/* B35E34 80241264 00000000 */ nop -.L80241268: -/* B35E38 80241268 2404F7FF */ addiu $a0, $zero, -0x801 -/* B35E3C 8024126C AE800070 */ sw $zero, 0x70($s4) -/* B35E40 80241270 A640008E */ sh $zero, 0x8e($s2) -/* B35E44 80241274 8E2200CC */ lw $v0, 0xcc($s1) -/* B35E48 80241278 8E430000 */ lw $v1, ($s2) -/* B35E4C 8024127C 8C420000 */ lw $v0, ($v0) -/* B35E50 80241280 00641824 */ and $v1, $v1, $a0 -/* B35E54 80241284 AE430000 */ sw $v1, ($s2) -/* B35E58 80241288 AE420028 */ sw $v0, 0x28($s2) -/* B35E5C 8024128C 8E2200D0 */ lw $v0, 0xd0($s1) -/* B35E60 80241290 8C420098 */ lw $v0, 0x98($v0) -/* B35E64 80241294 54400005 */ bnel $v0, $zero, .L802412AC -/* B35E68 80241298 2402FDFF */ addiu $v0, $zero, -0x201 -/* B35E6C 8024129C 34620200 */ ori $v0, $v1, 0x200 -/* B35E70 802412A0 2403FFF7 */ addiu $v1, $zero, -9 -/* B35E74 802412A4 080904AD */ j .L802412B4 -/* B35E78 802412A8 00431024 */ and $v0, $v0, $v1 -.L802412AC: -/* B35E7C 802412AC 00621024 */ and $v0, $v1, $v0 -/* B35E80 802412B0 34420008 */ ori $v0, $v0, 8 -.L802412B4: -/* B35E84 802412B4 AE420000 */ sw $v0, ($s2) -/* B35E88 802412B8 8E2200B0 */ lw $v0, 0xb0($s1) -/* B35E8C 802412BC 30420004 */ andi $v0, $v0, 4 -/* B35E90 802412C0 10400008 */ beqz $v0, .L802412E4 -/* B35E94 802412C4 24020063 */ addiu $v0, $zero, 0x63 -/* B35E98 802412C8 AE820070 */ sw $v0, 0x70($s4) -/* B35E9C 802412CC AE800074 */ sw $zero, 0x74($s4) -/* B35EA0 802412D0 8E2200B0 */ lw $v0, 0xb0($s1) -/* B35EA4 802412D4 2403FFFB */ addiu $v1, $zero, -5 -/* B35EA8 802412D8 00431024 */ and $v0, $v0, $v1 -/* B35EAC 802412DC 080904C4 */ j .L80241310 -/* B35EB0 802412E0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802412E4: -/* B35EB4 802412E4 8E220000 */ lw $v0, ($s1) -/* B35EB8 802412E8 3C034000 */ lui $v1, 0x4000 -/* B35EBC 802412EC 00431024 */ and $v0, $v0, $v1 -/* B35EC0 802412F0 10400007 */ beqz $v0, .L80241310 -/* B35EC4 802412F4 3C03BFFF */ lui $v1, 0xbfff -/* B35EC8 802412F8 2402000C */ addiu $v0, $zero, 0xc -/* B35ECC 802412FC AE820070 */ sw $v0, 0x70($s4) -/* B35ED0 80241300 8E220000 */ lw $v0, ($s1) -/* B35ED4 80241304 3463FFFF */ ori $v1, $v1, 0xffff -/* B35ED8 80241308 00431024 */ and $v0, $v0, $v1 -/* B35EDC 8024130C AE220000 */ sw $v0, ($s1) -.L80241310: -/* B35EE0 80241310 27A50038 */ addiu $a1, $sp, 0x38 -/* B35EE4 80241314 27A6003C */ addiu $a2, $sp, 0x3c -/* B35EE8 80241318 C6400038 */ lwc1 $f0, 0x38($s2) -/* B35EEC 8024131C 864200A8 */ lh $v0, 0xa8($s2) -/* B35EF0 80241320 3C0142C8 */ lui $at, 0x42c8 -/* B35EF4 80241324 44812000 */ mtc1 $at, $f4 -/* B35EF8 80241328 44823000 */ mtc1 $v0, $f6 -/* B35EFC 8024132C 00000000 */ nop -/* B35F00 80241330 468031A0 */ cvt.s.w $f6, $f6 -/* B35F04 80241334 27A20044 */ addiu $v0, $sp, 0x44 -/* B35F08 80241338 E7A00038 */ swc1 $f0, 0x38($sp) -/* B35F0C 8024133C C640003C */ lwc1 $f0, 0x3c($s2) -/* B35F10 80241340 C6420040 */ lwc1 $f2, 0x40($s2) -/* B35F14 80241344 46060000 */ add.s $f0, $f0, $f6 -/* B35F18 80241348 E7A40044 */ swc1 $f4, 0x44($sp) -/* B35F1C 8024134C E7A20040 */ swc1 $f2, 0x40($sp) -/* B35F20 80241350 E7A0003C */ swc1 $f0, 0x3c($sp) -/* B35F24 80241354 AFA20010 */ sw $v0, 0x10($sp) -/* B35F28 80241358 8E440080 */ lw $a0, 0x80($s2) -/* B35F2C 8024135C 0C0372DF */ jal func_800DCB7C -/* B35F30 80241360 27A70040 */ addiu $a3, $sp, 0x40 -/* B35F34 80241364 10400003 */ beqz $v0, .L80241374 -/* B35F38 80241368 00000000 */ nop -/* B35F3C 8024136C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* B35F40 80241370 E640003C */ swc1 $f0, 0x3c($s2) -.L80241374: -/* B35F44 80241374 8E830070 */ lw $v1, 0x70($s4) -/* B35F48 80241378 2C620064 */ sltiu $v0, $v1, 0x64 -/* B35F4C 8024137C 10400042 */ beqz $v0, .L80241488 -/* B35F50 80241380 00031080 */ sll $v0, $v1, 2 -/* B35F54 80241384 3C018025 */ lui $at, 0x8025 -/* B35F58 80241388 00220821 */ addu $at, $at, $v0 -/* B35F5C 8024138C 8C22FA00 */ lw $v0, -0x600($at) -/* B35F60 80241390 00400008 */ jr $v0 -/* B35F64 80241394 00000000 */ nop -/* B35F68 80241398 0280202D */ daddu $a0, $s4, $zero -/* B35F6C 8024139C 0260282D */ daddu $a1, $s3, $zero -/* B35F70 802413A0 0C090188 */ jal func_80240620 -/* B35F74 802413A4 02A0302D */ daddu $a2, $s5, $zero -/* B35F78 802413A8 0280202D */ daddu $a0, $s4, $zero -/* B35F7C 802413AC 0260282D */ daddu $a1, $s3, $zero -/* B35F80 802413B0 0C0901DE */ jal func_80240778 -/* B35F84 802413B4 02A0302D */ daddu $a2, $s5, $zero -/* B35F88 802413B8 08090522 */ j .L80241488 -/* B35F8C 802413BC 00000000 */ nop -/* B35F90 802413C0 0280202D */ daddu $a0, $s4, $zero -/* B35F94 802413C4 0260282D */ daddu $a1, $s3, $zero -/* B35F98 802413C8 0C090288 */ jal func_80240A20 -/* B35F9C 802413CC 02A0302D */ daddu $a2, $s5, $zero -/* B35FA0 802413D0 0280202D */ daddu $a0, $s4, $zero -/* B35FA4 802413D4 0260282D */ daddu $a1, $s3, $zero -/* B35FA8 802413D8 0C0902B8 */ jal func_80240AE0 -/* B35FAC 802413DC 02A0302D */ daddu $a2, $s5, $zero -/* B35FB0 802413E0 08090522 */ j .L80241488 -/* B35FB4 802413E4 00000000 */ nop -/* B35FB8 802413E8 0280202D */ daddu $a0, $s4, $zero -/* B35FBC 802413EC 0260282D */ daddu $a1, $s3, $zero -/* B35FC0 802413F0 0C090327 */ jal func_80240C9C -/* B35FC4 802413F4 02A0302D */ daddu $a2, $s5, $zero -/* B35FC8 802413F8 08090522 */ j .L80241488 -/* B35FCC 802413FC 00000000 */ nop -/* B35FD0 80241400 0280202D */ daddu $a0, $s4, $zero -/* B35FD4 80241404 0260282D */ daddu $a1, $s3, $zero -/* B35FD8 80241408 0C090354 */ jal func_80240D50 -/* B35FDC 8024140C 02A0302D */ daddu $a2, $s5, $zero -/* B35FE0 80241410 0280202D */ daddu $a0, $s4, $zero -/* B35FE4 80241414 0260282D */ daddu $a1, $s3, $zero -/* B35FE8 80241418 0C090371 */ jal func_80240DC4 -/* B35FEC 8024141C 02A0302D */ daddu $a2, $s5, $zero -/* B35FF0 80241420 08090522 */ j .L80241488 -/* B35FF4 80241424 00000000 */ nop -/* B35FF8 80241428 0280202D */ daddu $a0, $s4, $zero -/* B35FFC 8024142C 0260282D */ daddu $a1, $s3, $zero -/* B36000 80241430 0C09038F */ jal func_80240E3C -/* B36004 80241434 02A0302D */ daddu $a2, $s5, $zero -/* B36008 80241438 0280202D */ daddu $a0, $s4, $zero -/* B3600C 8024143C 0260282D */ daddu $a1, $s3, $zero -/* B36010 80241440 0C0903DB */ jal func_80240F6C -/* B36014 80241444 02A0302D */ daddu $a2, $s5, $zero -/* B36018 80241448 08090522 */ j .L80241488 -/* B3601C 8024144C 00000000 */ nop -/* B36020 80241450 0280202D */ daddu $a0, $s4, $zero -/* B36024 80241454 0260282D */ daddu $a1, $s3, $zero -/* B36028 80241458 0C090423 */ jal func_8024108C -/* B3602C 8024145C 02A0302D */ daddu $a2, $s5, $zero -/* B36030 80241460 08090522 */ j .L80241488 -/* B36034 80241464 00000000 */ nop -/* B36038 80241468 0280202D */ daddu $a0, $s4, $zero -/* B3603C 8024146C 0260282D */ daddu $a1, $s3, $zero -/* B36040 80241470 0C09043D */ jal func_802410F4 -/* B36044 80241474 02A0302D */ daddu $a2, $s5, $zero -/* B36048 80241478 08090522 */ j .L80241488 -/* B3604C 8024147C 00000000 */ nop -/* B36050 80241480 0C0129CF */ jal func_8004A73C -/* B36054 80241484 0280202D */ daddu $a0, $s4, $zero -.L80241488: -/* B36058 80241488 8FBF0060 */ lw $ra, 0x60($sp) -/* B3605C 8024148C 8FB5005C */ lw $s5, 0x5c($sp) -/* B36060 80241490 8FB40058 */ lw $s4, 0x58($sp) -/* B36064 80241494 8FB30054 */ lw $s3, 0x54($sp) -/* B36068 80241498 8FB20050 */ lw $s2, 0x50($sp) -/* B3606C 8024149C 8FB1004C */ lw $s1, 0x4c($sp) -/* B36070 802414A0 8FB00048 */ lw $s0, 0x48($sp) -/* B36074 802414A4 0000102D */ daddu $v0, $zero, $zero -/* B36078 802414A8 03E00008 */ jr $ra -/* B3607C 802414AC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_802414B0_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_802414B0_B34BD0.s deleted file mode 100644 index 5c822db0c3..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_802414B0_B34BD0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414B0_B36080 -/* B36080 802414B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36084 802414B4 AFBF0010 */ sw $ra, 0x10($sp) -/* B36088 802414B8 0C03A625 */ jal func_800E9894 -/* B3608C 802414BC 00000000 */ nop -/* B36090 802414C0 8FBF0010 */ lw $ra, 0x10($sp) -/* B36094 802414C4 24020002 */ addiu $v0, $zero, 2 -/* B36098 802414C8 03E00008 */ jr $ra -/* B3609C 802414CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_802414F8_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_802414F8_B34BD0.s deleted file mode 100644 index 355bd3c89e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_802414F8_B34BD0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414F8_B360C8 -/* B360C8 802414F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B360CC 802414FC AFB10014 */ sw $s1, 0x14($sp) -/* B360D0 80241500 0080882D */ daddu $s1, $a0, $zero -/* B360D4 80241504 AFBF0018 */ sw $ra, 0x18($sp) -/* B360D8 80241508 AFB00010 */ sw $s0, 0x10($sp) -/* B360DC 8024150C 8E30000C */ lw $s0, 0xc($s1) -/* B360E0 80241510 8E050000 */ lw $a1, ($s0) -/* B360E4 80241514 0C0B1EAF */ jal get_variable -/* B360E8 80241518 26100004 */ addiu $s0, $s0, 4 -/* B360EC 8024151C 0220202D */ daddu $a0, $s1, $zero -/* B360F0 80241520 8E050000 */ lw $a1, ($s0) -/* B360F4 80241524 0C0B1EAF */ jal get_variable -/* B360F8 80241528 0040882D */ daddu $s1, $v0, $zero -/* B360FC 8024152C 0000202D */ daddu $a0, $zero, $zero -/* B36100 80241530 0080282D */ daddu $a1, $a0, $zero -/* B36104 80241534 0040802D */ daddu $s0, $v0, $zero -/* B36108 80241538 240600BE */ addiu $a2, $zero, 0xbe -/* B3610C 8024153C 0C04DF93 */ jal func_80137E4C -/* B36110 80241540 24070091 */ addiu $a3, $zero, 0x91 -/* B36114 80241544 44900000 */ mtc1 $s0, $f0 -/* B36118 80241548 00000000 */ nop -/* B3611C 8024154C 46800020 */ cvt.s.w $f0, $f0 -/* B36120 80241550 44050000 */ mfc1 $a1, $f0 -/* B36124 80241554 0C04DF62 */ jal func_80137D88 -/* B36128 80241558 322400FF */ andi $a0, $s1, 0xff -/* B3612C 8024155C 8FBF0018 */ lw $ra, 0x18($sp) -/* B36130 80241560 8FB10014 */ lw $s1, 0x14($sp) -/* B36134 80241564 8FB00010 */ lw $s0, 0x10($sp) -/* B36138 80241568 24020002 */ addiu $v0, $zero, 2 -/* B3613C 8024156C 03E00008 */ jr $ra -/* B36140 80241570 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_80241650_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_80241650_B34BD0.s deleted file mode 100644 index af5b8f82cd..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_80241650_B34BD0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241650_B36220 -/* B36220 80241650 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36224 80241654 AFBF0010 */ sw $ra, 0x10($sp) -/* B36228 80241658 0C03AE18 */ jal partner_resume_ability_script -/* B3622C 8024165C 00000000 */ nop -/* B36230 80241660 8FBF0010 */ lw $ra, 0x10($sp) -/* B36234 80241664 24020002 */ addiu $v0, $zero, 2 -/* B36238 80241668 03E00008 */ jr $ra -/* B3623C 8024166C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_802416C4_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_802416C4_B34BD0.s deleted file mode 100644 index 3a62ee67f5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_802416C4_B34BD0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416C4_B36294 -/* B36294 802416C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B36298 802416C8 AFB10014 */ sw $s1, 0x14($sp) -/* B3629C 802416CC 0080882D */ daddu $s1, $a0, $zero -/* B362A0 802416D0 AFBF001C */ sw $ra, 0x1c($sp) -/* B362A4 802416D4 AFB20018 */ sw $s2, 0x18($sp) -/* B362A8 802416D8 AFB00010 */ sw $s0, 0x10($sp) -/* B362AC 802416DC 8E30000C */ lw $s0, 0xc($s1) -/* B362B0 802416E0 8E050000 */ lw $a1, ($s0) -/* B362B4 802416E4 0C0B1EAF */ jal get_variable -/* B362B8 802416E8 26100004 */ addiu $s0, $s0, 4 -/* B362BC 802416EC 8E050000 */ lw $a1, ($s0) -/* B362C0 802416F0 26100004 */ addiu $s0, $s0, 4 -/* B362C4 802416F4 0220202D */ daddu $a0, $s1, $zero -/* B362C8 802416F8 0C0B1EAF */ jal get_variable -/* B362CC 802416FC 0040902D */ daddu $s2, $v0, $zero -/* B362D0 80241700 0220202D */ daddu $a0, $s1, $zero -/* B362D4 80241704 8E050000 */ lw $a1, ($s0) -/* B362D8 80241708 0C0B1EAF */ jal get_variable -/* B362DC 8024170C 0040802D */ daddu $s0, $v0, $zero -/* B362E0 80241710 0000202D */ daddu $a0, $zero, $zero -/* B362E4 80241714 324500FF */ andi $a1, $s2, 0xff -/* B362E8 80241718 320600FF */ andi $a2, $s0, 0xff -/* B362EC 8024171C 0C04DF84 */ jal func_80137E10 -/* B362F0 80241720 304700FF */ andi $a3, $v0, 0xff -/* B362F4 80241724 8FBF001C */ lw $ra, 0x1c($sp) -/* B362F8 80241728 8FB20018 */ lw $s2, 0x18($sp) -/* B362FC 8024172C 8FB10014 */ lw $s1, 0x14($sp) -/* B36300 80241730 8FB00010 */ lw $s0, 0x10($sp) -/* B36304 80241734 24020002 */ addiu $v0, $zero, 2 -/* B36308 80241738 03E00008 */ jr $ra -/* B3630C 8024173C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_80241740_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_80241740_B34BD0.s deleted file mode 100644 index e6fbcb7c61..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_80241740_B34BD0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241740_B36310 -/* B36310 80241740 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36314 80241744 AFBF0010 */ sw $ra, 0x10($sp) -/* B36318 80241748 8C82000C */ lw $v0, 0xc($a0) -/* B3631C 8024174C 3C068011 */ lui $a2, 0x8011 -/* B36320 80241750 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* B36324 80241754 0C0B2026 */ jal set_variable -/* B36328 80241758 8C450000 */ lw $a1, ($v0) -/* B3632C 8024175C 0C03AC5A */ jal func_800EB168 -/* B36330 80241760 0000202D */ daddu $a0, $zero, $zero -/* B36334 80241764 8FBF0010 */ lw $ra, 0x10($sp) -/* B36338 80241768 24020002 */ addiu $v0, $zero, 2 -/* B3633C 8024176C 03E00008 */ jr $ra -/* B36340 80241770 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_80241774_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_80241774_B34BD0.s deleted file mode 100644 index cf4e2e0fa6..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_80241774_B34BD0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241774_B36344 -/* B36344 80241774 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36348 80241778 AFBF0010 */ sw $ra, 0x10($sp) -/* B3634C 8024177C 8C82000C */ lw $v0, 0xc($a0) -/* B36350 80241780 0C0B1EAF */ jal get_variable -/* B36354 80241784 8C450000 */ lw $a1, ($v0) -/* B36358 80241788 00021600 */ sll $v0, $v0, 0x18 -/* B3635C 8024178C 0C03AC5A */ jal func_800EB168 -/* B36360 80241790 00022603 */ sra $a0, $v0, 0x18 -/* B36364 80241794 8FBF0010 */ lw $ra, 0x10($sp) -/* B36368 80241798 24020002 */ addiu $v0, $zero, 2 -/* B3636C 8024179C 03E00008 */ jr $ra -/* B36370 802417A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_802417A4_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_802417A4_B34BD0.s deleted file mode 100644 index 34e096fc88..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_802417A4_B34BD0.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417A4_B36374 -/* B36374 802417A4 03E00008 */ jr $ra -/* B36378 802417A8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_802417AC_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_802417AC_B34BD0.s deleted file mode 100644 index 3a416b595e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_802417AC_B34BD0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417AC_B3637C -/* B3637C 802417AC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B36380 802417B0 AFB10014 */ sw $s1, 0x14($sp) -/* B36384 802417B4 0080882D */ daddu $s1, $a0, $zero -/* B36388 802417B8 AFBF0018 */ sw $ra, 0x18($sp) -/* B3638C 802417BC AFB00010 */ sw $s0, 0x10($sp) -/* B36390 802417C0 8E30000C */ lw $s0, 0xc($s1) -/* B36394 802417C4 8E050000 */ lw $a1, ($s0) -/* B36398 802417C8 0C0B1EAF */ jal get_variable -/* B3639C 802417CC 26100004 */ addiu $s0, $s0, 4 -/* B363A0 802417D0 0C00EAD2 */ jal get_npc_safe -/* B363A4 802417D4 0040202D */ daddu $a0, $v0, $zero -/* B363A8 802417D8 10400005 */ beqz $v0, .L802417F0 -/* B363AC 802417DC 00000000 */ nop -/* B363B0 802417E0 8E050000 */ lw $a1, ($s0) -/* B363B4 802417E4 844600A8 */ lh $a2, 0xa8($v0) -/* B363B8 802417E8 0C0B2026 */ jal set_variable -/* B363BC 802417EC 0220202D */ daddu $a0, $s1, $zero -.L802417F0: -/* B363C0 802417F0 8FBF0018 */ lw $ra, 0x18($sp) -/* B363C4 802417F4 8FB10014 */ lw $s1, 0x14($sp) -/* B363C8 802417F8 8FB00010 */ lw $s0, 0x10($sp) -/* B363CC 802417FC 24020002 */ addiu $v0, $zero, 2 -/* B363D0 80241800 03E00008 */ jr $ra -/* B363D4 80241804 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_80241A64_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_80241A64_B34BD0.s deleted file mode 100644 index aa1f594872..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_80241A64_B34BD0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A64_B36634 -/* B36634 80241A64 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36638 80241A68 AFBF0010 */ sw $ra, 0x10($sp) -/* B3663C 80241A6C 8C82000C */ lw $v0, 0xc($a0) -/* B36640 80241A70 0C0B1EAF */ jal get_variable -/* B36644 80241A74 8C450000 */ lw $a1, ($v0) -/* B36648 80241A78 0040182D */ daddu $v1, $v0, $zero -/* B3664C 80241A7C 10600012 */ beqz $v1, .L80241AC8 -/* B36650 80241A80 0000202D */ daddu $a0, $zero, $zero -/* B36654 80241A84 8C620000 */ lw $v0, ($v1) -/* B36658 80241A88 5040000A */ beql $v0, $zero, .L80241AB4 -/* B3665C 80241A8C 00041080 */ sll $v0, $a0, 2 -/* B36660 80241A90 3C058025 */ lui $a1, 0x8025 -/* B36664 80241A94 24A5FBA0 */ addiu $a1, $a1, -0x460 -.L80241A98: -/* B36668 80241A98 24630004 */ addiu $v1, $v1, 4 -/* B3666C 80241A9C 24840001 */ addiu $a0, $a0, 1 -/* B36670 80241AA0 ACA20000 */ sw $v0, ($a1) -/* B36674 80241AA4 8C620000 */ lw $v0, ($v1) -/* B36678 80241AA8 1440FFFB */ bnez $v0, .L80241A98 -/* B3667C 80241AAC 24A50004 */ addiu $a1, $a1, 4 -/* B36680 80241AB0 00041080 */ sll $v0, $a0, 2 -.L80241AB4: -/* B36684 80241AB4 3C018025 */ lui $at, 0x8025 -/* B36688 80241AB8 00220821 */ addu $at, $at, $v0 -/* B3668C 80241ABC AC20FBA0 */ sw $zero, -0x460($at) -/* B36690 80241AC0 080906BC */ j .L80241AF0 -/* B36694 80241AC4 00000000 */ nop -.L80241AC8: -/* B36698 80241AC8 3C038025 */ lui $v1, 0x8025 -/* B3669C 80241ACC 2463FBA0 */ addiu $v1, $v1, -0x460 -/* B366A0 80241AD0 0060282D */ daddu $a1, $v1, $zero -.L80241AD4: -/* B366A4 80241AD4 24820010 */ addiu $v0, $a0, 0x10 -/* B366A8 80241AD8 AC620000 */ sw $v0, ($v1) -/* B366AC 80241ADC 24630004 */ addiu $v1, $v1, 4 -/* B366B0 80241AE0 24840001 */ addiu $a0, $a0, 1 -/* B366B4 80241AE4 28820070 */ slti $v0, $a0, 0x70 -/* B366B8 80241AE8 1440FFFA */ bnez $v0, .L80241AD4 -/* B366BC 80241AEC ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241AF0: -/* B366C0 80241AF0 8FBF0010 */ lw $ra, 0x10($sp) -/* B366C4 80241AF4 24020002 */ addiu $v0, $zero, 2 -/* B366C8 80241AF8 03E00008 */ jr $ra -/* B366CC 80241AFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_80241CC8_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_80241CC8_B34BD0.s deleted file mode 100644 index 4d608bced3..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_80241CC8_B34BD0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CC8_B36898 -/* B36898 80241CC8 3C018015 */ lui $at, %hi(D_80151310) -/* B3689C 80241CCC AC201310 */ sw $zero, %lo(D_80151310)($at) -/* B368A0 80241CD0 03E00008 */ jr $ra -/* B368A4 80241CD4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_80241FC8_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_80241FC8_B34BD0.s deleted file mode 100644 index b8757a8ca6..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_80241FC8_B34BD0.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FC8_B36B98 -/* B36B98 80241FC8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B36B9C 80241FCC AFB10014 */ sw $s1, 0x14($sp) -/* B36BA0 80241FD0 0080882D */ daddu $s1, $a0, $zero -/* B36BA4 80241FD4 AFBF0024 */ sw $ra, 0x24($sp) -/* B36BA8 80241FD8 AFB40020 */ sw $s4, 0x20($sp) -/* B36BAC 80241FDC AFB3001C */ sw $s3, 0x1c($sp) -/* B36BB0 80241FE0 AFB20018 */ sw $s2, 0x18($sp) -/* B36BB4 80241FE4 10A00033 */ beqz $a1, .L802420B4 -/* B36BB8 80241FE8 AFB00010 */ sw $s0, 0x10($sp) -/* B36BBC 80241FEC 0C04760B */ jal func_8011D82C -/* B36BC0 80241FF0 24040001 */ addiu $a0, $zero, 1 -/* B36BC4 80241FF4 0000202D */ daddu $a0, $zero, $zero -/* B36BC8 80241FF8 0080282D */ daddu $a1, $a0, $zero -/* B36BCC 80241FFC 0080302D */ daddu $a2, $a0, $zero -/* B36BD0 80242000 0080382D */ daddu $a3, $a0, $zero -/* B36BD4 80242004 0080802D */ daddu $s0, $a0, $zero -/* B36BD8 80242008 2414FFFC */ addiu $s4, $zero, -4 -/* B36BDC 8024200C 24130011 */ addiu $s3, $zero, 0x11 -/* B36BE0 80242010 3C120080 */ lui $s2, 0x80 -/* B36BE4 80242014 3C038015 */ lui $v1, 0x8015 -/* B36BE8 80242018 8C6312F0 */ lw $v1, 0x12f0($v1) -/* B36BEC 8024201C 24020001 */ addiu $v0, $zero, 1 -/* B36BF0 80242020 0C046F97 */ jal set_background_color_blend -/* B36BF4 80242024 A0620000 */ sb $v0, ($v1) -.L80242028: -/* B36BF8 80242028 0C00E2B7 */ jal get_npc_by_index -/* B36BFC 8024202C 0200202D */ daddu $a0, $s0, $zero -/* B36C00 80242030 0040202D */ daddu $a0, $v0, $zero -/* B36C04 80242034 5080000B */ beql $a0, $zero, .L80242064 -/* B36C08 80242038 26100001 */ addiu $s0, $s0, 1 -/* B36C0C 8024203C 8C820000 */ lw $v0, ($a0) -/* B36C10 80242040 50400008 */ beql $v0, $zero, .L80242064 -/* B36C14 80242044 26100001 */ addiu $s0, $s0, 1 -/* B36C18 80242048 808300A4 */ lb $v1, 0xa4($a0) -/* B36C1C 8024204C 10740005 */ beq $v1, $s4, .L80242064 -/* B36C20 80242050 26100001 */ addiu $s0, $s0, 1 -/* B36C24 80242054 10730003 */ beq $v1, $s3, .L80242064 -/* B36C28 80242058 00000000 */ nop -/* B36C2C 8024205C 00521025 */ or $v0, $v0, $s2 -/* B36C30 80242060 AC820000 */ sw $v0, ($a0) -.L80242064: -/* B36C34 80242064 2A020040 */ slti $v0, $s0, 0x40 -/* B36C38 80242068 1440FFEF */ bnez $v0, .L80242028 -/* B36C3C 8024206C 00000000 */ nop -/* B36C40 80242070 0000802D */ daddu $s0, $zero, $zero -/* B36C44 80242074 3C120800 */ lui $s2, 0x800 -.L80242078: -/* B36C48 80242078 0C04C3D6 */ jal get_item_entity -/* B36C4C 8024207C 0200202D */ daddu $a0, $s0, $zero -/* B36C50 80242080 0040182D */ daddu $v1, $v0, $zero -/* B36C54 80242084 10600007 */ beqz $v1, .L802420A4 -/* B36C58 80242088 26100001 */ addiu $s0, $s0, 1 -/* B36C5C 8024208C 8C640000 */ lw $a0, ($v1) -/* B36C60 80242090 30820010 */ andi $v0, $a0, 0x10 -/* B36C64 80242094 10400003 */ beqz $v0, .L802420A4 -/* B36C68 80242098 00000000 */ nop -/* B36C6C 8024209C 00921025 */ or $v0, $a0, $s2 -/* B36C70 802420A0 AC620000 */ sw $v0, ($v1) -.L802420A4: -/* B36C74 802420A4 2A020100 */ slti $v0, $s0, 0x100 -/* B36C78 802420A8 1440FFF3 */ bnez $v0, .L80242078 -/* B36C7C 802420AC 00000000 */ nop -/* B36C80 802420B0 AE200070 */ sw $zero, 0x70($s1) -.L802420B4: -/* B36C84 802420B4 8E220070 */ lw $v0, 0x70($s1) -/* B36C88 802420B8 24420008 */ addiu $v0, $v0, 8 -/* B36C8C 802420BC AE220070 */ sw $v0, 0x70($s1) -/* B36C90 802420C0 28420100 */ slti $v0, $v0, 0x100 -/* B36C94 802420C4 14400003 */ bnez $v0, .L802420D4 -/* B36C98 802420C8 0000202D */ daddu $a0, $zero, $zero -/* B36C9C 802420CC 240200FF */ addiu $v0, $zero, 0xff -/* B36CA0 802420D0 AE220070 */ sw $v0, 0x70($s1) -.L802420D4: -/* B36CA4 802420D4 0080282D */ daddu $a1, $a0, $zero -/* B36CA8 802420D8 92270073 */ lbu $a3, 0x73($s1) -/* B36CAC 802420DC 0C046F97 */ jal set_background_color_blend -/* B36CB0 802420E0 0080302D */ daddu $a2, $a0, $zero -/* B36CB4 802420E4 8E220070 */ lw $v0, 0x70($s1) -/* B36CB8 802420E8 8FBF0024 */ lw $ra, 0x24($sp) -/* B36CBC 802420EC 8FB40020 */ lw $s4, 0x20($sp) -/* B36CC0 802420F0 8FB3001C */ lw $s3, 0x1c($sp) -/* B36CC4 802420F4 8FB20018 */ lw $s2, 0x18($sp) -/* B36CC8 802420F8 8FB10014 */ lw $s1, 0x14($sp) -/* B36CCC 802420FC 8FB00010 */ lw $s0, 0x10($sp) -/* B36CD0 80242100 384200FF */ xori $v0, $v0, 0xff -/* B36CD4 80242104 2C420001 */ sltiu $v0, $v0, 1 -/* B36CD8 80242108 00021040 */ sll $v0, $v0, 1 -/* B36CDC 8024210C 03E00008 */ jr $ra -/* B36CE0 80242110 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_80242524_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_80242524_B34BD0.s deleted file mode 100644 index 44f1b61d14..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_80242524_B34BD0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242524_B370F4 -/* B370F4 80242524 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B370F8 80242528 10A0000B */ beqz $a1, .L80242558 -/* B370FC 8024252C AFBF0010 */ sw $ra, 0x10($sp) -/* B37100 80242530 3C038025 */ lui $v1, 0x8025 -/* B37104 80242534 8C63FEFC */ lw $v1, -0x104($v1) -/* B37108 80242538 8C620000 */ lw $v0, ($v1) -/* B3710C 8024253C 3C048025 */ lui $a0, 0x8025 -/* B37110 80242540 8C84FF00 */ lw $a0, -0x100($a0) -/* B37114 80242544 34420010 */ ori $v0, $v0, 0x10 -/* B37118 80242548 AC620000 */ sw $v0, ($v1) -/* B3711C 8024254C 8C820000 */ lw $v0, ($a0) -/* B37120 80242550 34420010 */ ori $v0, $v0, 0x10 -/* B37124 80242554 AC820000 */ sw $v0, ($a0) -.L80242558: -/* B37128 80242558 3C048025 */ lui $a0, 0x8025 -/* B3712C 8024255C 8C84FEF8 */ lw $a0, -0x108($a0) -/* B37130 80242560 8C85000C */ lw $a1, 0xc($a0) -/* B37134 80242564 8CA20018 */ lw $v0, 0x18($a1) -/* B37138 80242568 8CA30020 */ lw $v1, 0x20($a1) -/* B3713C 8024256C 2442FFF6 */ addiu $v0, $v0, -0xa -/* B37140 80242570 ACA20018 */ sw $v0, 0x18($a1) -/* B37144 80242574 8CA20024 */ lw $v0, 0x24($a1) -/* B37148 80242578 2463FFF6 */ addiu $v1, $v1, -0xa -/* B3714C 8024257C ACA30020 */ sw $v1, 0x20($a1) -/* B37150 80242580 8CA30028 */ lw $v1, 0x28($a1) -/* B37154 80242584 2442FFF6 */ addiu $v0, $v0, -0xa -/* B37158 80242588 ACA20024 */ sw $v0, 0x24($a1) -/* B3715C 8024258C 8CA2001C */ lw $v0, 0x1c($a1) -/* B37160 80242590 2463FFF6 */ addiu $v1, $v1, -0xa -/* B37164 80242594 ACA30028 */ sw $v1, 0x28($a1) -/* B37168 80242598 8CA30018 */ lw $v1, 0x18($a1) -/* B3716C 8024259C 2442FFF6 */ addiu $v0, $v0, -0xa -/* B37170 802425A0 18600003 */ blez $v1, .L802425B0 -/* B37174 802425A4 ACA2001C */ sw $v0, 0x1c($a1) -/* B37178 802425A8 08090973 */ j .L802425CC -/* B3717C 802425AC 0000102D */ daddu $v0, $zero, $zero -.L802425B0: -/* B37180 802425B0 0C016914 */ jal remove_effect -/* B37184 802425B4 ACA00018 */ sw $zero, 0x18($a1) -/* B37188 802425B8 3C048025 */ lui $a0, 0x8025 -/* B3718C 802425BC 8C84FED8 */ lw $a0, -0x128($a0) -/* B37190 802425C0 0C048D70 */ jal func_801235C0 -/* B37194 802425C4 00000000 */ nop -/* B37198 802425C8 24020002 */ addiu $v0, $zero, 2 -.L802425CC: -/* B3719C 802425CC 8FBF0010 */ lw $ra, 0x10($sp) -/* B371A0 802425D0 03E00008 */ jr $ra -/* B371A4 802425D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_802425D8_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_802425D8_B34BD0.s deleted file mode 100644 index a3d9ef886d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_802425D8_B34BD0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425D8_B371A8 -/* B371A8 802425D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B371AC 802425DC AFBF0010 */ sw $ra, 0x10($sp) -/* B371B0 802425E0 8C82000C */ lw $v0, 0xc($a0) -/* B371B4 802425E4 0C0B1EAF */ jal get_variable -/* B371B8 802425E8 8C450000 */ lw $a1, ($v0) -/* B371BC 802425EC 3C038025 */ lui $v1, 0x8025 -/* B371C0 802425F0 8C63FEF8 */ lw $v1, -0x108($v1) -/* B371C4 802425F4 8C63000C */ lw $v1, 0xc($v1) -/* B371C8 802425F8 AC620034 */ sw $v0, 0x34($v1) -/* B371CC 802425FC 8FBF0010 */ lw $ra, 0x10($sp) -/* B371D0 80242600 24020002 */ addiu $v0, $zero, 2 -/* B371D4 80242604 03E00008 */ jr $ra -/* B371D8 80242608 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_8024260C_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_8024260C_B34BD0.s deleted file mode 100644 index e4ac48a1dc..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_8024260C_B34BD0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024260C_B371DC -/* B371DC 8024260C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B371E0 80242610 AFBF0010 */ sw $ra, 0x10($sp) -/* B371E4 80242614 8C82000C */ lw $v0, 0xc($a0) -/* B371E8 80242618 0C0B1EAF */ jal get_variable -/* B371EC 8024261C 8C450000 */ lw $a1, ($v0) -/* B371F0 80242620 0040202D */ daddu $a0, $v0, $zero -/* B371F4 80242624 3C028025 */ lui $v0, 0x8025 -/* B371F8 80242628 8C42FEF8 */ lw $v0, -0x108($v0) -/* B371FC 8024262C 24030001 */ addiu $v1, $zero, 1 -/* B37200 80242630 8C45000C */ lw $a1, 0xc($v0) -/* B37204 80242634 1083000D */ beq $a0, $v1, .L8024266C -/* B37208 80242638 28820002 */ slti $v0, $a0, 2 -/* B3720C 8024263C 10400005 */ beqz $v0, .L80242654 -/* B37210 80242640 24020002 */ addiu $v0, $zero, 2 -/* B37214 80242644 10800007 */ beqz $a0, .L80242664 -/* B37218 80242648 240200C0 */ addiu $v0, $zero, 0xc0 -/* B3721C 8024264C 0809099F */ j .L8024267C -/* B37220 80242650 ACA00038 */ sw $zero, 0x38($a1) -.L80242654: -/* B37224 80242654 10820008 */ beq $a0, $v0, .L80242678 -/* B37228 80242658 24020040 */ addiu $v0, $zero, 0x40 -/* B3722C 8024265C 0809099F */ j .L8024267C -/* B37230 80242660 ACA00038 */ sw $zero, 0x38($a1) -.L80242664: -/* B37234 80242664 0809099F */ j .L8024267C -/* B37238 80242668 ACA20038 */ sw $v0, 0x38($a1) -.L8024266C: -/* B3723C 8024266C 24020080 */ addiu $v0, $zero, 0x80 -/* B37240 80242670 0809099F */ j .L8024267C -/* B37244 80242674 ACA20038 */ sw $v0, 0x38($a1) -.L80242678: -/* B37248 80242678 ACA20038 */ sw $v0, 0x38($a1) -.L8024267C: -/* B3724C 8024267C 8FBF0010 */ lw $ra, 0x10($sp) -/* B37250 80242680 24020002 */ addiu $v0, $zero, 2 -/* B37254 80242684 03E00008 */ jr $ra -/* B37258 80242688 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_802426A4_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_802426A4_B34BD0.s deleted file mode 100644 index 1346e29b47..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_802426A4_B34BD0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426A4_B37274 -/* B37274 802426A4 3C028025 */ lui $v0, 0x8025 -/* B37278 802426A8 8C42FF00 */ lw $v0, -0x100($v0) -/* B3727C 802426AC 8C43000C */ lw $v1, 0xc($v0) -/* B37280 802426B0 24020001 */ addiu $v0, $zero, 1 -/* B37284 802426B4 AC62001C */ sw $v0, 0x1c($v1) -/* B37288 802426B8 03E00008 */ jr $ra -/* B3728C 802426BC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_80242708_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_80242708_B34BD0.s deleted file mode 100644 index a050d494b2..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_80242708_B34BD0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242708_B372D8 -/* B372D8 80242708 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B372DC 8024270C AFB10014 */ sw $s1, 0x14($sp) -/* B372E0 80242710 0080882D */ daddu $s1, $a0, $zero -/* B372E4 80242714 AFBF0018 */ sw $ra, 0x18($sp) -/* B372E8 80242718 AFB00010 */ sw $s0, 0x10($sp) -/* B372EC 8024271C 8E30000C */ lw $s0, 0xc($s1) -/* B372F0 80242720 8E050000 */ lw $a1, ($s0) -/* B372F4 80242724 0C0B1EAF */ jal get_variable -/* B372F8 80242728 26100004 */ addiu $s0, $s0, 4 -/* B372FC 8024272C 0220202D */ daddu $a0, $s1, $zero -/* B37300 80242730 8E050000 */ lw $a1, ($s0) -/* B37304 80242734 0C0B210B */ jal get_float_variable -/* B37308 80242738 0040802D */ daddu $s0, $v0, $zero -/* B3730C 8024273C 24020002 */ addiu $v0, $zero, 2 -/* B37310 80242740 00501804 */ sllv $v1, $s0, $v0 -/* B37314 80242744 00701821 */ addu $v1, $v1, $s0 -/* B37318 80242748 00431804 */ sllv $v1, $v1, $v0 -/* B3731C 8024274C 00701823 */ subu $v1, $v1, $s0 -/* B37320 80242750 000320C0 */ sll $a0, $v1, 3 -/* B37324 80242754 00641821 */ addu $v1, $v1, $a0 -/* B37328 80242758 000318C0 */ sll $v1, $v1, 3 -/* B3732C 8024275C 3C01800B */ lui $at, 0x800b -/* B37330 80242760 00230821 */ addu $at, $at, $v1 -/* B37334 80242764 E4201D98 */ swc1 $f0, 0x1d98($at) -/* B37338 80242768 8FBF0018 */ lw $ra, 0x18($sp) -/* B3733C 8024276C 8FB10014 */ lw $s1, 0x14($sp) -/* B37340 80242770 8FB00010 */ lw $s0, 0x10($sp) -/* B37344 80242774 03E00008 */ jr $ra -/* B37348 80242778 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_80242A1C_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_80242A1C_B34BD0.s deleted file mode 100644 index e7d25b3e55..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_80242A1C_B34BD0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A1C_B375EC -/* B375EC 80242A1C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B375F0 80242A20 AFB10014 */ sw $s1, 0x14($sp) -/* B375F4 80242A24 0080882D */ daddu $s1, $a0, $zero -/* B375F8 80242A28 AFB00010 */ sw $s0, 0x10($sp) -/* B375FC 80242A2C 00A0802D */ daddu $s0, $a1, $zero -/* B37600 80242A30 AFBF0018 */ sw $ra, 0x18($sp) -/* B37604 80242A34 0C00EABB */ jal get_npc_unsafe -/* B37608 80242A38 2404FFFC */ addiu $a0, $zero, -4 -/* B3760C 80242A3C 12000003 */ beqz $s0, .L80242A4C -/* B37610 80242A40 0040182D */ daddu $v1, $v0, $zero -/* B37614 80242A44 2402003C */ addiu $v0, $zero, 0x3c -/* B37618 80242A48 AE220070 */ sw $v0, 0x70($s1) -.L80242A4C: -/* B3761C 80242A4C C462000C */ lwc1 $f2, 0xc($v1) -/* B37620 80242A50 3C0141F0 */ lui $at, 0x41f0 -/* B37624 80242A54 44810000 */ mtc1 $at, $f0 -/* B37628 80242A58 00000000 */ nop -/* B3762C 80242A5C 46001000 */ add.s $f0, $f2, $f0 -/* B37630 80242A60 3C0143B4 */ lui $at, 0x43b4 -/* B37634 80242A64 44811000 */ mtc1 $at, $f2 -/* B37638 80242A68 00000000 */ nop -/* B3763C 80242A6C 4600103E */ c.le.s $f2, $f0 -/* B37640 80242A70 00000000 */ nop -/* B37644 80242A74 45000003 */ bc1f .L80242A84 -/* B37648 80242A78 E460000C */ swc1 $f0, 0xc($v1) -/* B3764C 80242A7C 46020001 */ sub.s $f0, $f0, $f2 -/* B37650 80242A80 E460000C */ swc1 $f0, 0xc($v1) -.L80242A84: -/* B37654 80242A84 8E230070 */ lw $v1, 0x70($s1) -/* B37658 80242A88 2463FFFF */ addiu $v1, $v1, -1 -/* B3765C 80242A8C 000317C3 */ sra $v0, $v1, 0x1f -/* B37660 80242A90 AE230070 */ sw $v1, 0x70($s1) -/* B37664 80242A94 8FBF0018 */ lw $ra, 0x18($sp) -/* B37668 80242A98 8FB10014 */ lw $s1, 0x14($sp) -/* B3766C 80242A9C 8FB00010 */ lw $s0, 0x10($sp) -/* B37670 80242AA0 30420002 */ andi $v0, $v0, 2 -/* B37674 80242AA4 03E00008 */ jr $ra -/* B37678 80242AA8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/func_80242EAC_B34BD0.s b/asm/nonmatchings/world/area_jan/jan_03/func_80242EAC_B34BD0.s deleted file mode 100644 index 6f83dce1ab..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/func_80242EAC_B34BD0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242EAC_B37A7C -/* B37A7C 80242EAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B37A80 80242EB0 AFB00010 */ sw $s0, 0x10($sp) -/* B37A84 80242EB4 0080802D */ daddu $s0, $a0, $zero -/* B37A88 80242EB8 AFBF0014 */ sw $ra, 0x14($sp) -/* B37A8C 80242EBC 0C00EABB */ jal get_npc_unsafe -/* B37A90 80242EC0 8E04008C */ lw $a0, 0x8c($s0) -/* B37A94 80242EC4 0040282D */ daddu $a1, $v0, $zero -/* B37A98 80242EC8 8E040094 */ lw $a0, 0x94($s0) -/* B37A9C 80242ECC 8CA30028 */ lw $v1, 0x28($a1) -/* B37AA0 80242ED0 ACA40028 */ sw $a0, 0x28($a1) -/* B37AA4 80242ED4 8FBF0014 */ lw $ra, 0x14($sp) -/* B37AA8 80242ED8 8FB00010 */ lw $s0, 0x10($sp) -/* B37AAC 80242EDC 24020002 */ addiu $v0, $zero, 2 -/* B37AB0 80242EE0 3C018025 */ lui $at, 0x8025 -/* B37AB4 80242EE4 AC23FF04 */ sw $v1, -0xfc($at) -/* B37AB8 80242EE8 03E00008 */ jr $ra -/* B37ABC 80242EEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_04/func_80240040_B44770.s b/asm/nonmatchings/world/area_jan/jan_04/func_80240040_B44770.s deleted file mode 100644 index bb7b1ad2f6..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/func_80240040_B44770.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_B447B0 -/* B447B0 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B447B4 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* B447B8 80240048 0080802D */ daddu $s0, $a0, $zero -/* B447BC 8024004C AFBF0014 */ sw $ra, 0x14($sp) -/* B447C0 80240050 8E0300A8 */ lw $v1, 0xa8($s0) -/* B447C4 80240054 8E020088 */ lw $v0, 0x88($s0) -/* B447C8 80240058 00621821 */ addu $v1, $v1, $v0 -/* B447CC 8024005C 04610004 */ bgez $v1, .L80240070 -/* B447D0 80240060 AE0300A8 */ sw $v1, 0xa8($s0) -/* B447D4 80240064 3C020002 */ lui $v0, 2 -/* B447D8 80240068 08090020 */ j .L80240080 -/* B447DC 8024006C 00621021 */ addu $v0, $v1, $v0 -.L80240070: -/* B447E0 80240070 3C040002 */ lui $a0, 2 -/* B447E4 80240074 0083102A */ slt $v0, $a0, $v1 -/* B447E8 80240078 10400002 */ beqz $v0, .L80240084 -/* B447EC 8024007C 00641023 */ subu $v0, $v1, $a0 -.L80240080: -/* B447F0 80240080 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240084: -/* B447F4 80240084 8E0300AC */ lw $v1, 0xac($s0) -/* B447F8 80240088 8E02008C */ lw $v0, 0x8c($s0) -/* B447FC 8024008C 00621821 */ addu $v1, $v1, $v0 -/* B44800 80240090 04610004 */ bgez $v1, .L802400A4 -/* B44804 80240094 AE0300AC */ sw $v1, 0xac($s0) -/* B44808 80240098 3C020002 */ lui $v0, 2 -/* B4480C 8024009C 0809002D */ j .L802400B4 -/* B44810 802400A0 00621021 */ addu $v0, $v1, $v0 -.L802400A4: -/* B44814 802400A4 3C040002 */ lui $a0, 2 -/* B44818 802400A8 0083102A */ slt $v0, $a0, $v1 -/* B4481C 802400AC 10400002 */ beqz $v0, .L802400B8 -/* B44820 802400B0 00641023 */ subu $v0, $v1, $a0 -.L802400B4: -/* B44824 802400B4 AE0200AC */ sw $v0, 0xac($s0) -.L802400B8: -/* B44828 802400B8 8E0300B0 */ lw $v1, 0xb0($s0) -/* B4482C 802400BC 8E020090 */ lw $v0, 0x90($s0) -/* B44830 802400C0 00621821 */ addu $v1, $v1, $v0 -/* B44834 802400C4 04610004 */ bgez $v1, .L802400D8 -/* B44838 802400C8 AE0300B0 */ sw $v1, 0xb0($s0) -/* B4483C 802400CC 3C020002 */ lui $v0, 2 -/* B44840 802400D0 0809003A */ j .L802400E8 -/* B44844 802400D4 00621021 */ addu $v0, $v1, $v0 -.L802400D8: -/* B44848 802400D8 3C040002 */ lui $a0, 2 -/* B4484C 802400DC 0083102A */ slt $v0, $a0, $v1 -/* B44850 802400E0 10400002 */ beqz $v0, .L802400EC -/* B44854 802400E4 00641023 */ subu $v0, $v1, $a0 -.L802400E8: -/* B44858 802400E8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400EC: -/* B4485C 802400EC 8E0300B4 */ lw $v1, 0xb4($s0) -/* B44860 802400F0 8E020094 */ lw $v0, 0x94($s0) -/* B44864 802400F4 00621821 */ addu $v1, $v1, $v0 -/* B44868 802400F8 04610004 */ bgez $v1, .L8024010C -/* B4486C 802400FC AE0300B4 */ sw $v1, 0xb4($s0) -/* B44870 80240100 3C020002 */ lui $v0, 2 -/* B44874 80240104 08090047 */ j .L8024011C -/* B44878 80240108 00621021 */ addu $v0, $v1, $v0 -.L8024010C: -/* B4487C 8024010C 3C040002 */ lui $a0, 2 -/* B44880 80240110 0083102A */ slt $v0, $a0, $v1 -/* B44884 80240114 10400002 */ beqz $v0, .L80240120 -/* B44888 80240118 00641023 */ subu $v0, $v1, $a0 -.L8024011C: -/* B4488C 8024011C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240120: -/* B44890 80240120 8E040084 */ lw $a0, 0x84($s0) -/* B44894 80240124 0C046F07 */ jal set_main_pan_u -/* B44898 80240128 8E0500A8 */ lw $a1, 0xa8($s0) -/* B4489C 8024012C 8E040084 */ lw $a0, 0x84($s0) -/* B448A0 80240130 0C046F0D */ jal set_main_pan_v -/* B448A4 80240134 8E0500AC */ lw $a1, 0xac($s0) -/* B448A8 80240138 8E040084 */ lw $a0, 0x84($s0) -/* B448AC 8024013C 0C046F13 */ jal set_aux_pan_u -/* B448B0 80240140 8E0500B0 */ lw $a1, 0xb0($s0) -/* B448B4 80240144 8E040084 */ lw $a0, 0x84($s0) -/* B448B8 80240148 0C046F19 */ jal set_aux_pan_v -/* B448BC 8024014C 8E0500B4 */ lw $a1, 0xb4($s0) -/* B448C0 80240150 8FBF0014 */ lw $ra, 0x14($sp) -/* B448C4 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* B448C8 80240158 0000102D */ daddu $v0, $zero, $zero -/* B448CC 8024015C 03E00008 */ jr $ra -/* B448D0 80240160 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_04/func_80240164_B44770.s b/asm/nonmatchings/world/area_jan/jan_04/func_80240164_B44770.s deleted file mode 100644 index f04649d297..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/func_80240164_B44770.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240164_B448D4 -/* B448D4 80240164 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B448D8 80240168 AFB00010 */ sw $s0, 0x10($sp) -/* B448DC 8024016C 0080802D */ daddu $s0, $a0, $zero -/* B448E0 80240170 10A00005 */ beqz $a1, .L80240188 -/* B448E4 80240174 AFBF0014 */ sw $ra, 0x14($sp) -/* B448E8 80240178 AE000070 */ sw $zero, 0x70($s0) -/* B448EC 8024017C AE000074 */ sw $zero, 0x74($s0) -/* B448F0 80240180 AE000078 */ sw $zero, 0x78($s0) -/* B448F4 80240184 AE00007C */ sw $zero, 0x7c($s0) -.L80240188: -/* B448F8 80240188 8E020070 */ lw $v0, 0x70($s0) -/* B448FC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* B44900 80240190 00000000 */ nop -/* B44904 80240194 8E0300A8 */ lw $v1, 0xa8($s0) -/* B44908 80240198 8E020088 */ lw $v0, 0x88($s0) -/* B4490C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* B44910 802401A0 04610004 */ bgez $v1, .L802401B4 -/* B44914 802401A4 AE0300A8 */ sw $v1, 0xa8($s0) -/* B44918 802401A8 3C020002 */ lui $v0, 2 -/* B4491C 802401AC 08090071 */ j .L802401C4 -/* B44920 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* B44924 802401B4 3C040002 */ lui $a0, 2 -/* B44928 802401B8 0083102A */ slt $v0, $a0, $v1 -/* B4492C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* B44930 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* B44934 802401C4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401C8: -/* B44938 802401C8 8E020074 */ lw $v0, 0x74($s0) -/* B4493C 802401CC 1440000E */ bnez $v0, .L80240208 -/* B44940 802401D0 00000000 */ nop -/* B44944 802401D4 8E0300AC */ lw $v1, 0xac($s0) -/* B44948 802401D8 8E02008C */ lw $v0, 0x8c($s0) -/* B4494C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* B44950 802401E0 04610004 */ bgez $v1, .L802401F4 -/* B44954 802401E4 AE0300AC */ sw $v1, 0xac($s0) -/* B44958 802401E8 3C020002 */ lui $v0, 2 -/* B4495C 802401EC 08090081 */ j .L80240204 -/* B44960 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* B44964 802401F4 3C040002 */ lui $a0, 2 -/* B44968 802401F8 0083102A */ slt $v0, $a0, $v1 -/* B4496C 802401FC 10400002 */ beqz $v0, .L80240208 -/* B44970 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* B44974 80240204 AE0200AC */ sw $v0, 0xac($s0) -.L80240208: -/* B44978 80240208 8E020078 */ lw $v0, 0x78($s0) -/* B4497C 8024020C 1440000E */ bnez $v0, .L80240248 -/* B44980 80240210 00000000 */ nop -/* B44984 80240214 8E0300B0 */ lw $v1, 0xb0($s0) -/* B44988 80240218 8E020090 */ lw $v0, 0x90($s0) -/* B4498C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* B44990 80240220 04610004 */ bgez $v1, .L80240234 -/* B44994 80240224 AE0300B0 */ sw $v1, 0xb0($s0) -/* B44998 80240228 3C020002 */ lui $v0, 2 -/* B4499C 8024022C 08090091 */ j .L80240244 -/* B449A0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* B449A4 80240234 3C040002 */ lui $a0, 2 -/* B449A8 80240238 0083102A */ slt $v0, $a0, $v1 -/* B449AC 8024023C 10400002 */ beqz $v0, .L80240248 -/* B449B0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* B449B4 80240244 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240248: -/* B449B8 80240248 8E02007C */ lw $v0, 0x7c($s0) -/* B449BC 8024024C 1440000E */ bnez $v0, .L80240288 -/* B449C0 80240250 00000000 */ nop -/* B449C4 80240254 8E0300B4 */ lw $v1, 0xb4($s0) -/* B449C8 80240258 8E020094 */ lw $v0, 0x94($s0) -/* B449CC 8024025C 00621821 */ addu $v1, $v1, $v0 -/* B449D0 80240260 04610004 */ bgez $v1, .L80240274 -/* B449D4 80240264 AE0300B4 */ sw $v1, 0xb4($s0) -/* B449D8 80240268 3C020002 */ lui $v0, 2 -/* B449DC 8024026C 080900A1 */ j .L80240284 -/* B449E0 80240270 00621021 */ addu $v0, $v1, $v0 -.L80240274: -/* B449E4 80240274 3C040002 */ lui $a0, 2 -/* B449E8 80240278 0083102A */ slt $v0, $a0, $v1 -/* B449EC 8024027C 10400002 */ beqz $v0, .L80240288 -/* B449F0 80240280 00641023 */ subu $v0, $v1, $a0 -.L80240284: -/* B449F4 80240284 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240288: -/* B449F8 80240288 8E040084 */ lw $a0, 0x84($s0) -/* B449FC 8024028C 0C046F07 */ jal set_main_pan_u -/* B44A00 80240290 8E0500A8 */ lw $a1, 0xa8($s0) -/* B44A04 80240294 8E040084 */ lw $a0, 0x84($s0) -/* B44A08 80240298 0C046F0D */ jal set_main_pan_v -/* B44A0C 8024029C 8E0500AC */ lw $a1, 0xac($s0) -/* B44A10 802402A0 8E040084 */ lw $a0, 0x84($s0) -/* B44A14 802402A4 0C046F13 */ jal set_aux_pan_u -/* B44A18 802402A8 8E0500B0 */ lw $a1, 0xb0($s0) -/* B44A1C 802402AC 8E040084 */ lw $a0, 0x84($s0) -/* B44A20 802402B0 0C046F19 */ jal set_aux_pan_v -/* B44A24 802402B4 8E0500B4 */ lw $a1, 0xb4($s0) -/* B44A28 802402B8 8E020070 */ lw $v0, 0x70($s0) -/* B44A2C 802402BC 8E030078 */ lw $v1, 0x78($s0) -/* B44A30 802402C0 8E040098 */ lw $a0, 0x98($s0) -/* B44A34 802402C4 24420001 */ addiu $v0, $v0, 1 -/* B44A38 802402C8 AE020070 */ sw $v0, 0x70($s0) -/* B44A3C 802402CC 8E020074 */ lw $v0, 0x74($s0) -/* B44A40 802402D0 24630001 */ addiu $v1, $v1, 1 -/* B44A44 802402D4 AE030078 */ sw $v1, 0x78($s0) -/* B44A48 802402D8 8E030070 */ lw $v1, 0x70($s0) -/* B44A4C 802402DC 24420001 */ addiu $v0, $v0, 1 -/* B44A50 802402E0 AE020074 */ sw $v0, 0x74($s0) -/* B44A54 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* B44A58 802402E8 0064182A */ slt $v1, $v1, $a0 -/* B44A5C 802402EC 24420001 */ addiu $v0, $v0, 1 -/* B44A60 802402F0 14600002 */ bnez $v1, .L802402FC -/* B44A64 802402F4 AE02007C */ sw $v0, 0x7c($s0) -/* B44A68 802402F8 AE000070 */ sw $zero, 0x70($s0) -.L802402FC: -/* B44A6C 802402FC 8E020074 */ lw $v0, 0x74($s0) -/* B44A70 80240300 8E03009C */ lw $v1, 0x9c($s0) -/* B44A74 80240304 0043102A */ slt $v0, $v0, $v1 -/* B44A78 80240308 50400001 */ beql $v0, $zero, .L80240310 -/* B44A7C 8024030C AE000074 */ sw $zero, 0x74($s0) -.L80240310: -/* B44A80 80240310 8E020078 */ lw $v0, 0x78($s0) -/* B44A84 80240314 8E0300A0 */ lw $v1, 0xa0($s0) -/* B44A88 80240318 0043102A */ slt $v0, $v0, $v1 -/* B44A8C 8024031C 50400001 */ beql $v0, $zero, .L80240324 -/* B44A90 80240320 AE000078 */ sw $zero, 0x78($s0) -.L80240324: -/* B44A94 80240324 8E02007C */ lw $v0, 0x7c($s0) -/* B44A98 80240328 8E0300A4 */ lw $v1, 0xa4($s0) -/* B44A9C 8024032C 0043102A */ slt $v0, $v0, $v1 -/* B44AA0 80240330 50400001 */ beql $v0, $zero, .L80240338 -/* B44AA4 80240334 AE00007C */ sw $zero, 0x7c($s0) -.L80240338: -/* B44AA8 80240338 8FBF0014 */ lw $ra, 0x14($sp) -/* B44AAC 8024033C 8FB00010 */ lw $s0, 0x10($sp) -/* B44AB0 80240340 0000102D */ daddu $v0, $zero, $zero -/* B44AB4 80240344 03E00008 */ jr $ra -/* B44AB8 80240348 27BD0018 */ addiu $sp, $sp, 0x18 -/* B44ABC 8024034C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_04/func_80240350_B44770.s b/asm/nonmatchings/world/area_jan/jan_04/func_80240350_B44770.s deleted file mode 100644 index bd8debaa3c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/func_80240350_B44770.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240350_B44AC0 -/* B44AC0 80240350 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B44AC4 80240354 AFB00010 */ sw $s0, 0x10($sp) -/* B44AC8 80240358 3C108024 */ lui $s0, 0x8024 -/* B44ACC 8024035C 26101800 */ addiu $s0, $s0, 0x1800 -/* B44AD0 80240360 AFBF0018 */ sw $ra, 0x18($sp) -/* B44AD4 80240364 AFB10014 */ sw $s1, 0x14($sp) -/* B44AD8 80240368 8E020000 */ lw $v0, ($s0) -/* B44ADC 8024036C 14400010 */ bnez $v0, .L802403B0 -/* B44AE0 80240370 0080882D */ daddu $s1, $a0, $zero -/* B44AE4 80240374 0C00AB39 */ jal heap_malloc -/* B44AE8 80240378 24040040 */ addiu $a0, $zero, 0x40 -/* B44AEC 8024037C AE020000 */ sw $v0, ($s0) -/* B44AF0 80240380 0000182D */ daddu $v1, $zero, $zero -/* B44AF4 80240384 0040282D */ daddu $a1, $v0, $zero -/* B44AF8 80240388 0220202D */ daddu $a0, $s1, $zero -.L8024038C: -/* B44AFC 8024038C 8C820084 */ lw $v0, 0x84($a0) -/* B44B00 80240390 24840004 */ addiu $a0, $a0, 4 -/* B44B04 80240394 24630001 */ addiu $v1, $v1, 1 -/* B44B08 80240398 ACA20000 */ sw $v0, ($a1) -/* B44B0C 8024039C 28620010 */ slti $v0, $v1, 0x10 -/* B44B10 802403A0 1440FFFA */ bnez $v0, .L8024038C -/* B44B14 802403A4 24A50004 */ addiu $a1, $a1, 4 -/* B44B18 802403A8 080900FB */ j .L802403EC -/* B44B1C 802403AC 00000000 */ nop -.L802403B0: -/* B44B20 802403B0 0000182D */ daddu $v1, $zero, $zero -/* B44B24 802403B4 0040282D */ daddu $a1, $v0, $zero -/* B44B28 802403B8 0220202D */ daddu $a0, $s1, $zero -.L802403BC: -/* B44B2C 802403BC 8CA20000 */ lw $v0, ($a1) -/* B44B30 802403C0 24A50004 */ addiu $a1, $a1, 4 -/* B44B34 802403C4 24630001 */ addiu $v1, $v1, 1 -/* B44B38 802403C8 AC820084 */ sw $v0, 0x84($a0) -/* B44B3C 802403CC 28620010 */ slti $v0, $v1, 0x10 -/* B44B40 802403D0 1440FFFA */ bnez $v0, .L802403BC -/* B44B44 802403D4 24840004 */ addiu $a0, $a0, 4 -/* B44B48 802403D8 3C108024 */ lui $s0, 0x8024 -/* B44B4C 802403DC 26101800 */ addiu $s0, $s0, 0x1800 -/* B44B50 802403E0 0C00AB4B */ jal heap_free -/* B44B54 802403E4 8E040000 */ lw $a0, ($s0) -/* B44B58 802403E8 AE000000 */ sw $zero, ($s0) -.L802403EC: -/* B44B5C 802403EC 8FBF0018 */ lw $ra, 0x18($sp) -/* B44B60 802403F0 8FB10014 */ lw $s1, 0x14($sp) -/* B44B64 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* B44B68 802403F8 24020002 */ addiu $v0, $zero, 2 -/* B44B6C 802403FC 03E00008 */ jr $ra -/* B44B70 80240400 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_04/func_80240404_B44770.s b/asm/nonmatchings/world/area_jan/jan_04/func_80240404_B44770.s deleted file mode 100644 index 94b3a904da..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/func_80240404_B44770.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_B44B74 -/* B44B74 80240404 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B44B78 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* B44B7C 8024040C 0080802D */ daddu $s0, $a0, $zero -/* B44B80 80240410 AFBF0018 */ sw $ra, 0x18($sp) -/* B44B84 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* B44B88 80240418 8E02000C */ lw $v0, 0xc($s0) -/* B44B8C 8024041C 8C510000 */ lw $s1, ($v0) -/* B44B90 80240420 0C0B1EAF */ jal get_variable -/* B44B94 80240424 0220282D */ daddu $a1, $s1, $zero -/* B44B98 80240428 3C03FFF0 */ lui $v1, 0xfff0 -/* B44B9C 8024042C 3463FFFF */ ori $v1, $v1, 0xffff -/* B44BA0 80240430 0200202D */ daddu $a0, $s0, $zero -/* B44BA4 80240434 00431024 */ and $v0, $v0, $v1 -/* B44BA8 80240438 00021140 */ sll $v0, $v0, 5 -/* B44BAC 8024043C 3C068008 */ lui $a2, %hi(gItemTable) -/* B44BB0 80240440 00C23021 */ addu $a2, $a2, $v0 -/* B44BB4 80240444 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* B44BB8 80240448 0C0B2026 */ jal set_variable -/* B44BBC 8024044C 0220282D */ daddu $a1, $s1, $zero -/* B44BC0 80240450 8FBF0018 */ lw $ra, 0x18($sp) -/* B44BC4 80240454 8FB10014 */ lw $s1, 0x14($sp) -/* B44BC8 80240458 8FB00010 */ lw $s0, 0x10($sp) -/* B44BCC 8024045C 24020002 */ addiu $v0, $zero, 2 -/* B44BD0 80240460 03E00008 */ jr $ra -/* B44BD4 80240464 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_04/func_802405B8_B44770.s b/asm/nonmatchings/world/area_jan/jan_04/func_802405B8_B44770.s deleted file mode 100644 index 7329f118d5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/func_802405B8_B44770.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405B8_B44D28 -/* B44D28 802405B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B44D2C 802405BC AFB00010 */ sw $s0, 0x10($sp) -/* B44D30 802405C0 0080802D */ daddu $s0, $a0, $zero -/* B44D34 802405C4 AFBF0014 */ sw $ra, 0x14($sp) -/* B44D38 802405C8 8E02000C */ lw $v0, 0xc($s0) -/* B44D3C 802405CC 0C0B1EAF */ jal get_variable -/* B44D40 802405D0 8C450000 */ lw $a1, ($v0) -/* B44D44 802405D4 00021140 */ sll $v0, $v0, 5 -/* B44D48 802405D8 AE000084 */ sw $zero, 0x84($s0) -/* B44D4C 802405DC 3C018008 */ lui $at, 0x8008 -/* B44D50 802405E0 00220821 */ addu $at, $at, $v0 -/* B44D54 802405E4 942278F8 */ lhu $v0, 0x78f8($at) -/* B44D58 802405E8 30420040 */ andi $v0, $v0, 0x40 -/* B44D5C 802405EC 10400002 */ beqz $v0, .L802405F8 -/* B44D60 802405F0 24020001 */ addiu $v0, $zero, 1 -/* B44D64 802405F4 AE020084 */ sw $v0, 0x84($s0) -.L802405F8: -/* B44D68 802405F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B44D6C 802405FC 8FB00010 */ lw $s0, 0x10($sp) -/* B44D70 80240600 24020002 */ addiu $v0, $zero, 2 -/* B44D74 80240604 03E00008 */ jr $ra -/* B44D78 80240608 27BD0018 */ addiu $sp, $sp, 0x18 -/* B44D7C 8024060C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_04/func_80240610_B44770.s b/asm/nonmatchings/world/area_jan/jan_04/func_80240610_B44770.s deleted file mode 100644 index 0eca582e42..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/func_80240610_B44770.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240610_B44D80 -/* B44D80 80240610 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B44D84 80240614 AFB20018 */ sw $s2, 0x18($sp) -/* B44D88 80240618 0080902D */ daddu $s2, $a0, $zero -/* B44D8C 8024061C AFB10014 */ sw $s1, 0x14($sp) -/* B44D90 80240620 00A0882D */ daddu $s1, $a1, $zero -/* B44D94 80240624 AFBF0024 */ sw $ra, 0x24($sp) -/* B44D98 80240628 AFB40020 */ sw $s4, 0x20($sp) -/* B44D9C 8024062C AFB3001C */ sw $s3, 0x1c($sp) -/* B44DA0 80240630 AFB00010 */ sw $s0, 0x10($sp) -/* B44DA4 80240634 8E50000C */ lw $s0, 0xc($s2) -/* B44DA8 80240638 8E050000 */ lw $a1, ($s0) -/* B44DAC 8024063C 0C0B1EAF */ jal get_variable -/* B44DB0 80240640 26100004 */ addiu $s0, $s0, 4 -/* B44DB4 80240644 0240202D */ daddu $a0, $s2, $zero -/* B44DB8 80240648 8E050000 */ lw $a1, ($s0) -/* B44DBC 8024064C 0C0B1EAF */ jal get_variable -/* B44DC0 80240650 0040802D */ daddu $s0, $v0, $zero -/* B44DC4 80240654 0200202D */ daddu $a0, $s0, $zero -/* B44DC8 80240658 0C00EAD2 */ jal get_npc_safe -/* B44DCC 8024065C 0040A02D */ daddu $s4, $v0, $zero -/* B44DD0 80240660 3C138011 */ lui $s3, %hi(gPlayerData) -/* B44DD4 80240664 2673F290 */ addiu $s3, $s3, %lo(gPlayerData) -/* B44DD8 80240668 12200006 */ beqz $s1, .L80240684 -/* B44DDC 8024066C 0040802D */ daddu $s0, $v0, $zero -/* B44DE0 80240670 82620012 */ lb $v0, 0x12($s3) -/* B44DE4 80240674 54400003 */ bnel $v0, $zero, .L80240684 -/* B44DE8 80240678 AE400070 */ sw $zero, 0x70($s2) -/* B44DEC 8024067C 24020002 */ addiu $v0, $zero, 2 -/* B44DF0 80240680 AE420070 */ sw $v0, 0x70($s2) -.L80240684: -/* B44DF4 80240684 8E430070 */ lw $v1, 0x70($s2) -/* B44DF8 80240688 24110001 */ addiu $s1, $zero, 1 -/* B44DFC 8024068C 10710013 */ beq $v1, $s1, .L802406DC -/* B44E00 80240690 28620002 */ slti $v0, $v1, 2 -/* B44E04 80240694 10400005 */ beqz $v0, .L802406AC -/* B44E08 80240698 24020002 */ addiu $v0, $zero, 2 -/* B44E0C 8024069C 10600009 */ beqz $v1, .L802406C4 -/* B44E10 802406A0 0000102D */ daddu $v0, $zero, $zero -/* B44E14 802406A4 080901DD */ j .L80240774 -/* B44E18 802406A8 00000000 */ nop -.L802406AC: -/* B44E1C 802406AC 10620013 */ beq $v1, $v0, .L802406FC -/* B44E20 802406B0 24020003 */ addiu $v0, $zero, 3 -/* B44E24 802406B4 1062001E */ beq $v1, $v0, .L80240730 -/* B44E28 802406B8 0000102D */ daddu $v0, $zero, $zero -/* B44E2C 802406BC 080901DD */ j .L80240774 -/* B44E30 802406C0 00000000 */ nop -.L802406C4: -/* B44E34 802406C4 0C03AC5A */ jal func_800EB168 -/* B44E38 802406C8 0000202D */ daddu $a0, $zero, $zero -/* B44E3C 802406CC 2402001E */ addiu $v0, $zero, 0x1e -/* B44E40 802406D0 AE420074 */ sw $v0, 0x74($s2) -/* B44E44 802406D4 080901DC */ j .L80240770 -/* B44E48 802406D8 AE510070 */ sw $s1, 0x70($s2) -.L802406DC: -/* B44E4C 802406DC 8E420074 */ lw $v0, 0x74($s2) -/* B44E50 802406E0 2403FFFF */ addiu $v1, $zero, -1 -/* B44E54 802406E4 2442FFFF */ addiu $v0, $v0, -1 -/* B44E58 802406E8 14430021 */ bne $v0, $v1, .L80240770 -/* B44E5C 802406EC AE420074 */ sw $v0, 0x74($s2) -/* B44E60 802406F0 24020002 */ addiu $v0, $zero, 2 -/* B44E64 802406F4 080901DC */ j .L80240770 -/* B44E68 802406F8 AE420070 */ sw $v0, 0x70($s2) -.L802406FC: -/* B44E6C 802406FC 0200202D */ daddu $a0, $s0, $zero -/* B44E70 80240700 00141600 */ sll $v0, $s4, 0x18 -/* B44E74 80240704 00021543 */ sra $v0, $v0, 0x15 -/* B44E78 80240708 02621021 */ addu $v0, $s3, $v0 -/* B44E7C 8024070C A2740012 */ sb $s4, 0x12($s3) -/* B44E80 80240710 0C03BD17 */ jal clear_partner_move_history -/* B44E84 80240714 A0510014 */ sb $s1, 0x14($v0) -/* B44E88 80240718 82640012 */ lb $a0, 0x12($s3) -/* B44E8C 8024071C 0C03ACA9 */ jal func_800EB2A4 -/* B44E90 80240720 00000000 */ nop -/* B44E94 80240724 24020003 */ addiu $v0, $zero, 3 -/* B44E98 80240728 080901DC */ j .L80240770 -/* B44E9C 8024072C AE420070 */ sw $v0, 0x70($s2) -.L80240730: -/* B44EA0 80240730 0C00EAD2 */ jal get_npc_safe -/* B44EA4 80240734 2404FFFC */ addiu $a0, $zero, -4 -/* B44EA8 80240738 8E05000C */ lw $a1, 0xc($s0) -/* B44EAC 8024073C 0C00ECD0 */ jal set_npc_yaw -/* B44EB0 80240740 0040202D */ daddu $a0, $v0, $zero -/* B44EB4 80240744 0200202D */ daddu $a0, $s0, $zero -/* B44EB8 80240748 8E020000 */ lw $v0, ($s0) -/* B44EBC 8024074C 2403FFFB */ addiu $v1, $zero, -5 -/* B44EC0 80240750 00431024 */ and $v0, $v0, $v1 -/* B44EC4 80240754 0C00EAFF */ jal disable_npc_shadow -/* B44EC8 80240758 AE020000 */ sw $v0, ($s0) -/* B44ECC 8024075C 3C01C47A */ lui $at, 0xc47a -/* B44ED0 80240760 44810000 */ mtc1 $at, $f0 -/* B44ED4 80240764 24020002 */ addiu $v0, $zero, 2 -/* B44ED8 80240768 080901DD */ j .L80240774 -/* B44EDC 8024076C E600003C */ swc1 $f0, 0x3c($s0) -.L80240770: -/* B44EE0 80240770 0000102D */ daddu $v0, $zero, $zero -.L80240774: -/* B44EE4 80240774 8FBF0024 */ lw $ra, 0x24($sp) -/* B44EE8 80240778 8FB40020 */ lw $s4, 0x20($sp) -/* B44EEC 8024077C 8FB3001C */ lw $s3, 0x1c($sp) -/* B44EF0 80240780 8FB20018 */ lw $s2, 0x18($sp) -/* B44EF4 80240784 8FB10014 */ lw $s1, 0x14($sp) -/* B44EF8 80240788 8FB00010 */ lw $s0, 0x10($sp) -/* B44EFC 8024078C 03E00008 */ jr $ra -/* B44F00 80240790 27BD0028 */ addiu $sp, $sp, 0x28 -/* B44F04 80240794 00000000 */ nop -/* B44F08 80240798 00000000 */ nop -/* B44F0C 8024079C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_04/func_802407A0_B44770.s b/asm/nonmatchings/world/area_jan/jan_04/func_802407A0_B44770.s deleted file mode 100644 index 7685ac69f6..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/func_802407A0_B44770.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A0_B44F10 -/* B44F10 802407A0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B44F14 802407A4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B44F18 802407A8 4485A000 */ mtc1 $a1, $f20 -/* B44F1C 802407AC F7B60020 */ sdc1 $f22, 0x20($sp) -/* B44F20 802407B0 4486B000 */ mtc1 $a2, $f22 -/* B44F24 802407B4 AFB00010 */ sw $s0, 0x10($sp) -/* B44F28 802407B8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B44F2C 802407BC 4487C000 */ mtc1 $a3, $f24 -/* B44F30 802407C0 AFBF0014 */ sw $ra, 0x14($sp) -/* B44F34 802407C4 0C019D28 */ jal guMtxIdentF -/* B44F38 802407C8 0080802D */ daddu $s0, $a0, $zero -/* B44F3C 802407CC 4616A582 */ mul.s $f22, $f20, $f22 -/* B44F40 802407D0 00000000 */ nop -/* B44F44 802407D4 4618A502 */ mul.s $f20, $f20, $f24 -/* B44F48 802407D8 00000000 */ nop -/* B44F4C 802407DC 3C013F80 */ lui $at, 0x3f80 -/* B44F50 802407E0 44810000 */ mtc1 $at, $f0 -/* B44F54 802407E4 00000000 */ nop -/* B44F58 802407E8 E6000014 */ swc1 $f0, 0x14($s0) -/* B44F5C 802407EC E6160010 */ swc1 $f22, 0x10($s0) -/* B44F60 802407F0 E6140018 */ swc1 $f20, 0x18($s0) -/* B44F64 802407F4 8FBF0014 */ lw $ra, 0x14($sp) -/* B44F68 802407F8 8FB00010 */ lw $s0, 0x10($sp) -/* B44F6C 802407FC D7B80028 */ ldc1 $f24, 0x28($sp) -/* B44F70 80240800 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B44F74 80240804 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B44F78 80240808 03E00008 */ jr $ra -/* B44F7C 8024080C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_04/func_80240810_B44770.s b/asm/nonmatchings/world/area_jan/jan_04/func_80240810_B44770.s deleted file mode 100644 index b11ebc45c8..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/func_80240810_B44770.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240810_B44F80 -/* B44F80 80240810 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B44F84 80240814 AFB10054 */ sw $s1, 0x54($sp) -/* B44F88 80240818 0080882D */ daddu $s1, $a0, $zero -/* B44F8C 8024081C AFBF005C */ sw $ra, 0x5c($sp) -/* B44F90 80240820 AFB20058 */ sw $s2, 0x58($sp) -/* B44F94 80240824 AFB00050 */ sw $s0, 0x50($sp) -/* B44F98 80240828 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B44F9C 8024082C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B44FA0 80240830 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B44FA4 80240834 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B44FA8 80240838 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B44FAC 8024083C 8E30000C */ lw $s0, 0xc($s1) -/* B44FB0 80240840 8E050000 */ lw $a1, ($s0) -/* B44FB4 80240844 0C0B1EAF */ jal get_variable -/* B44FB8 80240848 26100004 */ addiu $s0, $s0, 4 -/* B44FBC 8024084C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B44FC0 80240850 0040202D */ daddu $a0, $v0, $zero -/* B44FC4 80240854 8E050000 */ lw $a1, ($s0) -/* B44FC8 80240858 26100004 */ addiu $s0, $s0, 4 -/* B44FCC 8024085C 0220202D */ daddu $a0, $s1, $zero -/* B44FD0 80240860 0C0B210B */ jal get_float_variable -/* B44FD4 80240864 0040902D */ daddu $s2, $v0, $zero -/* B44FD8 80240868 8E050000 */ lw $a1, ($s0) -/* B44FDC 8024086C 26100004 */ addiu $s0, $s0, 4 -/* B44FE0 80240870 0220202D */ daddu $a0, $s1, $zero -/* B44FE4 80240874 0C0B210B */ jal get_float_variable -/* B44FE8 80240878 46000706 */ mov.s $f28, $f0 -/* B44FEC 8024087C 8E050000 */ lw $a1, ($s0) -/* B44FF0 80240880 26100004 */ addiu $s0, $s0, 4 -/* B44FF4 80240884 0220202D */ daddu $a0, $s1, $zero -/* B44FF8 80240888 0C0B210B */ jal get_float_variable -/* B44FFC 8024088C 46000686 */ mov.s $f26, $f0 -/* B45000 80240890 0220202D */ daddu $a0, $s1, $zero -/* B45004 80240894 8E050000 */ lw $a1, ($s0) -/* B45008 80240898 0C0B210B */ jal get_float_variable -/* B4500C 8024089C 46000586 */ mov.s $f22, $f0 -/* B45010 802408A0 0240202D */ daddu $a0, $s2, $zero -/* B45014 802408A4 0C046B4C */ jal get_model_from_list_index -/* B45018 802408A8 46000606 */ mov.s $f24, $f0 -/* B4501C 802408AC 0040882D */ daddu $s1, $v0, $zero -/* B45020 802408B0 96220000 */ lhu $v0, ($s1) -/* B45024 802408B4 30420400 */ andi $v0, $v0, 0x400 -/* B45028 802408B8 1440001E */ bnez $v0, .L80240934 -/* B4502C 802408BC 26300058 */ addiu $s0, $s1, 0x58 -/* B45030 802408C0 4480A000 */ mtc1 $zero, $f20 -/* B45034 802408C4 4406B000 */ mfc1 $a2, $f22 -/* B45038 802408C8 4405A000 */ mfc1 $a1, $f20 -/* B4503C 802408CC 4407A000 */ mfc1 $a3, $f20 -/* B45040 802408D0 0C019E40 */ jal guTranslateF -/* B45044 802408D4 0200202D */ daddu $a0, $s0, $zero -/* B45048 802408D8 4405E000 */ mfc1 $a1, $f28 -/* B4504C 802408DC 4406D000 */ mfc1 $a2, $f26 -/* B45050 802408E0 4407C000 */ mfc1 $a3, $f24 -/* B45054 802408E4 0C0901E8 */ jal func_802407A0 -/* B45058 802408E8 27A40010 */ addiu $a0, $sp, 0x10 -/* B4505C 802408EC 27A40010 */ addiu $a0, $sp, 0x10 -/* B45060 802408F0 0200282D */ daddu $a1, $s0, $zero -/* B45064 802408F4 0C019D80 */ jal guMtxCatF -/* B45068 802408F8 0200302D */ daddu $a2, $s0, $zero -/* B4506C 802408FC 27A40010 */ addiu $a0, $sp, 0x10 -/* B45070 80240900 4600B587 */ neg.s $f22, $f22 -/* B45074 80240904 4405A000 */ mfc1 $a1, $f20 -/* B45078 80240908 4406B000 */ mfc1 $a2, $f22 -/* B4507C 8024090C 0C019E40 */ jal guTranslateF -/* B45080 80240910 00A0382D */ daddu $a3, $a1, $zero -/* B45084 80240914 27A40010 */ addiu $a0, $sp, 0x10 -/* B45088 80240918 0200282D */ daddu $a1, $s0, $zero -/* B4508C 8024091C 0C019D80 */ jal guMtxCatF -/* B45090 80240920 00A0302D */ daddu $a2, $a1, $zero -/* B45094 80240924 96220000 */ lhu $v0, ($s1) -/* B45098 80240928 34421400 */ ori $v0, $v0, 0x1400 -/* B4509C 8024092C 0809026B */ j .L802409AC -/* B450A0 80240930 A6220000 */ sh $v0, ($s1) -.L80240934: -/* B450A4 80240934 4480A000 */ mtc1 $zero, $f20 -/* B450A8 80240938 4406B000 */ mfc1 $a2, $f22 -/* B450AC 8024093C 4405A000 */ mfc1 $a1, $f20 -/* B450B0 80240940 4407A000 */ mfc1 $a3, $f20 -/* B450B4 80240944 0C019E40 */ jal guTranslateF -/* B450B8 80240948 27A40010 */ addiu $a0, $sp, 0x10 -/* B450BC 8024094C 27A40010 */ addiu $a0, $sp, 0x10 -/* B450C0 80240950 26300058 */ addiu $s0, $s1, 0x58 -/* B450C4 80240954 0200282D */ daddu $a1, $s0, $zero -/* B450C8 80240958 0C019D80 */ jal guMtxCatF -/* B450CC 8024095C 0200302D */ daddu $a2, $s0, $zero -/* B450D0 80240960 4405E000 */ mfc1 $a1, $f28 -/* B450D4 80240964 4406D000 */ mfc1 $a2, $f26 -/* B450D8 80240968 4407C000 */ mfc1 $a3, $f24 -/* B450DC 8024096C 0C0901E8 */ jal func_802407A0 -/* B450E0 80240970 27A40010 */ addiu $a0, $sp, 0x10 -/* B450E4 80240974 27A40010 */ addiu $a0, $sp, 0x10 -/* B450E8 80240978 0200282D */ daddu $a1, $s0, $zero -/* B450EC 8024097C 0C019D80 */ jal guMtxCatF -/* B450F0 80240980 0200302D */ daddu $a2, $s0, $zero -/* B450F4 80240984 27A40010 */ addiu $a0, $sp, 0x10 -/* B450F8 80240988 4600B587 */ neg.s $f22, $f22 -/* B450FC 8024098C 4405A000 */ mfc1 $a1, $f20 -/* B45100 80240990 4406B000 */ mfc1 $a2, $f22 -/* B45104 80240994 0C019E40 */ jal guTranslateF -/* B45108 80240998 00A0382D */ daddu $a3, $a1, $zero -/* B4510C 8024099C 27A40010 */ addiu $a0, $sp, 0x10 -/* B45110 802409A0 0200282D */ daddu $a1, $s0, $zero -/* B45114 802409A4 0C019D80 */ jal guMtxCatF -/* B45118 802409A8 00A0302D */ daddu $a2, $a1, $zero -.L802409AC: -/* B4511C 802409AC 8FBF005C */ lw $ra, 0x5c($sp) -/* B45120 802409B0 8FB20058 */ lw $s2, 0x58($sp) -/* B45124 802409B4 8FB10054 */ lw $s1, 0x54($sp) -/* B45128 802409B8 8FB00050 */ lw $s0, 0x50($sp) -/* B4512C 802409BC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B45130 802409C0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B45134 802409C4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B45138 802409C8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B4513C 802409CC D7B40060 */ ldc1 $f20, 0x60($sp) -/* B45140 802409D0 24020002 */ addiu $v0, $zero, 2 -/* B45144 802409D4 03E00008 */ jr $ra -/* B45148 802409D8 27BD0088 */ addiu $sp, $sp, 0x88 -/* B4514C 802409DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_04/func_802409E0_B44770.s b/asm/nonmatchings/world/area_jan/jan_04/func_802409E0_B44770.s deleted file mode 100644 index d8d62db4dc..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/func_802409E0_B44770.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409E0_B45150 -/* B45150 802409E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B45154 802409E4 3C048024 */ lui $a0, 0x8024 -/* B45158 802409E8 248462C0 */ addiu $a0, $a0, 0x62c0 -/* B4515C 802409EC 27A50010 */ addiu $a1, $sp, 0x10 -/* B45160 802409F0 AFBF0020 */ sw $ra, 0x20($sp) -/* B45164 802409F4 AFB1001C */ sw $s1, 0x1c($sp) -/* B45168 802409F8 0C016B3A */ jal load_asset_by_name -/* B4516C 802409FC AFB00018 */ sw $s0, 0x18($sp) -/* B45170 80240A00 0040802D */ daddu $s0, $v0, $zero -/* B45174 80240A04 0200202D */ daddu $a0, $s0, $zero -/* B45178 80240A08 3C118024 */ lui $s1, 0x8024 -/* B4517C 80240A0C 26316300 */ addiu $s1, $s1, 0x6300 -/* B45180 80240A10 0C01BB7C */ jal decode_yay0 -/* B45184 80240A14 0220282D */ daddu $a1, $s1, $zero -/* B45188 80240A18 0C00AB1E */ jal general_heap_free -/* B4518C 80240A1C 0200202D */ daddu $a0, $s0, $zero -/* B45190 80240A20 3C048025 */ lui $a0, 0x8025 -/* B45194 80240A24 2484A2A0 */ addiu $a0, $a0, -0x5d60 -/* B45198 80240A28 3C028024 */ lui $v0, 0x8024 -/* B4519C 80240A2C 24426500 */ addiu $v0, $v0, 0x6500 -/* B451A0 80240A30 AC820000 */ sw $v0, ($a0) -/* B451A4 80240A34 24020096 */ addiu $v0, $zero, 0x96 -/* B451A8 80240A38 A4820008 */ sh $v0, 8($a0) -/* B451AC 80240A3C 24020069 */ addiu $v0, $zero, 0x69 -/* B451B0 80240A40 A482000A */ sh $v0, 0xa($a0) -/* B451B4 80240A44 24020002 */ addiu $v0, $zero, 2 -/* B451B8 80240A48 AC82000C */ sw $v0, 0xc($a0) -/* B451BC 80240A4C 24020001 */ addiu $v0, $zero, 1 -/* B451C0 80240A50 AC910004 */ sw $s1, 4($a0) -/* B451C4 80240A54 0C0496CB */ jal set_message_images -/* B451C8 80240A58 AC820010 */ sw $v0, 0x10($a0) -/* B451CC 80240A5C 8FBF0020 */ lw $ra, 0x20($sp) -/* B451D0 80240A60 8FB1001C */ lw $s1, 0x1c($sp) -/* B451D4 80240A64 8FB00018 */ lw $s0, 0x18($sp) -/* B451D8 80240A68 24020002 */ addiu $v0, $zero, 2 -/* B451DC 80240A6C 03E00008 */ jr $ra -/* B451E0 80240A70 27BD0028 */ addiu $sp, $sp, 0x28 -/* B451E4 80240A74 00000000 */ nop -/* B451E8 80240A78 00000000 */ nop -/* B451EC 80240A7C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_04/func_80240A80_B44770.s b/asm/nonmatchings/world/area_jan/jan_04/func_80240A80_B44770.s deleted file mode 100644 index 6910183f17..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/func_80240A80_B44770.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A80_B451F0 -/* B451F0 80240A80 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B451F4 80240A84 AFB10014 */ sw $s1, 0x14($sp) -/* B451F8 80240A88 0080882D */ daddu $s1, $a0, $zero -/* B451FC 80240A8C AFBF001C */ sw $ra, 0x1c($sp) -/* B45200 80240A90 AFB20018 */ sw $s2, 0x18($sp) -/* B45204 80240A94 AFB00010 */ sw $s0, 0x10($sp) -/* B45208 80240A98 F7B80030 */ sdc1 $f24, 0x30($sp) -/* B4520C 80240A9C F7B60028 */ sdc1 $f22, 0x28($sp) -/* B45210 80240AA0 F7B40020 */ sdc1 $f20, 0x20($sp) -/* B45214 80240AA4 8E30000C */ lw $s0, 0xc($s1) -/* B45218 80240AA8 8E050000 */ lw $a1, ($s0) -/* B4521C 80240AAC 0C0B1EAF */ jal get_variable -/* B45220 80240AB0 26100004 */ addiu $s0, $s0, 4 -/* B45224 80240AB4 8E050000 */ lw $a1, ($s0) -/* B45228 80240AB8 26100004 */ addiu $s0, $s0, 4 -/* B4522C 80240ABC 0220202D */ daddu $a0, $s1, $zero -/* B45230 80240AC0 0C0B1EAF */ jal get_variable -/* B45234 80240AC4 0040902D */ daddu $s2, $v0, $zero -/* B45238 80240AC8 8E050000 */ lw $a1, ($s0) -/* B4523C 80240ACC 26100004 */ addiu $s0, $s0, 4 -/* B45240 80240AD0 4482C000 */ mtc1 $v0, $f24 -/* B45244 80240AD4 00000000 */ nop -/* B45248 80240AD8 4680C620 */ cvt.s.w $f24, $f24 -/* B4524C 80240ADC 0C0B1EAF */ jal get_variable -/* B45250 80240AE0 0220202D */ daddu $a0, $s1, $zero -/* B45254 80240AE4 8E050000 */ lw $a1, ($s0) -/* B45258 80240AE8 4482B000 */ mtc1 $v0, $f22 -/* B4525C 80240AEC 00000000 */ nop -/* B45260 80240AF0 4680B5A0 */ cvt.s.w $f22, $f22 -/* B45264 80240AF4 0C0B1EAF */ jal get_variable -/* B45268 80240AF8 0220202D */ daddu $a0, $s1, $zero -/* B4526C 80240AFC 4482A000 */ mtc1 $v0, $f20 -/* B45270 80240B00 00000000 */ nop -/* B45274 80240B04 4680A520 */ cvt.s.w $f20, $f20 -/* B45278 80240B08 0C04417A */ jal get_entity_by_index -/* B4527C 80240B0C 0240202D */ daddu $a0, $s2, $zero -/* B45280 80240B10 0040182D */ daddu $v1, $v0, $zero -/* B45284 80240B14 E4780048 */ swc1 $f24, 0x48($v1) -/* B45288 80240B18 E476004C */ swc1 $f22, 0x4c($v1) -/* B4528C 80240B1C E4740050 */ swc1 $f20, 0x50($v1) -/* B45290 80240B20 8FBF001C */ lw $ra, 0x1c($sp) -/* B45294 80240B24 8FB20018 */ lw $s2, 0x18($sp) -/* B45298 80240B28 8FB10014 */ lw $s1, 0x14($sp) -/* B4529C 80240B2C 8FB00010 */ lw $s0, 0x10($sp) -/* B452A0 80240B30 D7B80030 */ ldc1 $f24, 0x30($sp) -/* B452A4 80240B34 D7B60028 */ ldc1 $f22, 0x28($sp) -/* B452A8 80240B38 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B452AC 80240B3C 24020002 */ addiu $v0, $zero, 2 -/* B452B0 80240B40 03E00008 */ jr $ra -/* B452B4 80240B44 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_jan/jan_04/func_80240B48_B44770.s b/asm/nonmatchings/world/area_jan/jan_04/func_80240B48_B44770.s deleted file mode 100644 index 7fd975a179..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/func_80240B48_B44770.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B48_B452B8 -/* B452B8 80240B48 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B452BC 80240B4C AFB20018 */ sw $s2, 0x18($sp) -/* B452C0 80240B50 0080902D */ daddu $s2, $a0, $zero -/* B452C4 80240B54 AFBF001C */ sw $ra, 0x1c($sp) -/* B452C8 80240B58 AFB10014 */ sw $s1, 0x14($sp) -/* B452CC 80240B5C AFB00010 */ sw $s0, 0x10($sp) -/* B452D0 80240B60 8E50000C */ lw $s0, 0xc($s2) -/* B452D4 80240B64 8E050000 */ lw $a1, ($s0) -/* B452D8 80240B68 0C0B1EAF */ jal get_variable -/* B452DC 80240B6C 26100004 */ addiu $s0, $s0, 4 -/* B452E0 80240B70 0C04417A */ jal get_entity_by_index -/* B452E4 80240B74 0040202D */ daddu $a0, $v0, $zero -/* B452E8 80240B78 8E050000 */ lw $a1, ($s0) -/* B452EC 80240B7C 26100004 */ addiu $s0, $s0, 4 -/* B452F0 80240B80 0040882D */ daddu $s1, $v0, $zero -/* B452F4 80240B84 C6200048 */ lwc1 $f0, 0x48($s1) -/* B452F8 80240B88 4600008D */ trunc.w.s $f2, $f0 -/* B452FC 80240B8C 44061000 */ mfc1 $a2, $f2 -/* B45300 80240B90 0C0B2026 */ jal set_variable -/* B45304 80240B94 0240202D */ daddu $a0, $s2, $zero -/* B45308 80240B98 8E050000 */ lw $a1, ($s0) -/* B4530C 80240B9C 26100004 */ addiu $s0, $s0, 4 -/* B45310 80240BA0 C620004C */ lwc1 $f0, 0x4c($s1) -/* B45314 80240BA4 4600008D */ trunc.w.s $f2, $f0 -/* B45318 80240BA8 44061000 */ mfc1 $a2, $f2 -/* B4531C 80240BAC 0C0B2026 */ jal set_variable -/* B45320 80240BB0 0240202D */ daddu $a0, $s2, $zero -/* B45324 80240BB4 C6200050 */ lwc1 $f0, 0x50($s1) -/* B45328 80240BB8 8E050000 */ lw $a1, ($s0) -/* B4532C 80240BBC 4600008D */ trunc.w.s $f2, $f0 -/* B45330 80240BC0 44061000 */ mfc1 $a2, $f2 -/* B45334 80240BC4 0C0B2026 */ jal set_variable -/* B45338 80240BC8 0240202D */ daddu $a0, $s2, $zero -/* B4533C 80240BCC 8FBF001C */ lw $ra, 0x1c($sp) -/* B45340 80240BD0 8FB20018 */ lw $s2, 0x18($sp) -/* B45344 80240BD4 8FB10014 */ lw $s1, 0x14($sp) -/* B45348 80240BD8 8FB00010 */ lw $s0, 0x10($sp) -/* B4534C 80240BDC 24020002 */ addiu $v0, $zero, 2 -/* B45350 80240BE0 03E00008 */ jr $ra -/* B45354 80240BE4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_04/func_80240BE8_B44770.s b/asm/nonmatchings/world/area_jan/jan_04/func_80240BE8_B44770.s deleted file mode 100644 index 8d98a709a5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/func_80240BE8_B44770.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BE8_B45358 -/* B45358 80240BE8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B4535C 80240BEC AFB20018 */ sw $s2, 0x18($sp) -/* B45360 80240BF0 0080902D */ daddu $s2, $a0, $zero -/* B45364 80240BF4 AFBF001C */ sw $ra, 0x1c($sp) -/* B45368 80240BF8 AFB10014 */ sw $s1, 0x14($sp) -/* B4536C 80240BFC AFB00010 */ sw $s0, 0x10($sp) -/* B45370 80240C00 8E4400AC */ lw $a0, 0xac($s2) -/* B45374 80240C04 0C04417A */ jal get_entity_by_index -/* B45378 80240C08 00A0802D */ daddu $s0, $a1, $zero -/* B4537C 80240C0C 12000004 */ beqz $s0, .L80240C20 -/* B45380 80240C10 0040882D */ daddu $s1, $v0, $zero -/* B45384 80240C14 2402003C */ addiu $v0, $zero, 0x3c -/* B45388 80240C18 AE400070 */ sw $zero, 0x70($s2) -/* B4538C 80240C1C AE420074 */ sw $v0, 0x74($s2) -.L80240C20: -/* B45390 80240C20 2403003C */ addiu $v1, $zero, 0x3c -/* B45394 80240C24 8E420074 */ lw $v0, 0x74($s2) -/* B45398 80240C28 3C014270 */ lui $at, 0x4270 -/* B4539C 80240C2C 44811000 */ mtc1 $at, $f2 -/* B453A0 80240C30 00621023 */ subu $v0, $v1, $v0 -/* B453A4 80240C34 44820000 */ mtc1 $v0, $f0 -/* B453A8 80240C38 00000000 */ nop -/* B453AC 80240C3C 46800020 */ cvt.s.w $f0, $f0 -/* B453B0 80240C40 46020003 */ div.s $f0, $f0, $f2 -/* B453B4 80240C44 E6200054 */ swc1 $f0, 0x54($s1) -/* B453B8 80240C48 8E420074 */ lw $v0, 0x74($s2) -/* B453BC 80240C4C 3C014049 */ lui $at, 0x4049 -/* B453C0 80240C50 34210FD8 */ ori $at, $at, 0xfd8 -/* B453C4 80240C54 44816000 */ mtc1 $at, $f12 -/* B453C8 80240C58 00621023 */ subu $v0, $v1, $v0 -/* B453CC 80240C5C 44820000 */ mtc1 $v0, $f0 -/* B453D0 80240C60 00000000 */ nop -/* B453D4 80240C64 46800020 */ cvt.s.w $f0, $f0 -/* B453D8 80240C68 46020003 */ div.s $f0, $f0, $f2 -/* B453DC 80240C6C E6200058 */ swc1 $f0, 0x58($s1) -/* B453E0 80240C70 8E420074 */ lw $v0, 0x74($s2) -/* B453E4 80240C74 460C0302 */ mul.s $f12, $f0, $f12 -/* B453E8 80240C78 00000000 */ nop -/* B453EC 80240C7C 00621823 */ subu $v1, $v1, $v0 -/* B453F0 80240C80 44830000 */ mtc1 $v1, $f0 -/* B453F4 80240C84 00000000 */ nop -/* B453F8 80240C88 46800020 */ cvt.s.w $f0, $f0 -/* B453FC 80240C8C 46020003 */ div.s $f0, $f0, $f2 -/* B45400 80240C90 0C00A874 */ jal cos_rad -/* B45404 80240C94 E620005C */ swc1 $f0, 0x5c($s1) -/* B45408 80240C98 3C013F80 */ lui $at, 0x3f80 -/* B4540C 80240C9C 44811000 */ mtc1 $at, $f2 -/* B45410 80240CA0 00000000 */ nop -/* B45414 80240CA4 46001081 */ sub.s $f2, $f2, $f0 -/* B45418 80240CA8 3C018024 */ lui $at, 0x8024 -/* B4541C 80240CAC D42062E0 */ ldc1 $f0, 0x62e0($at) -/* B45420 80240CB0 460010A1 */ cvt.d.s $f2, $f2 -/* B45424 80240CB4 46201082 */ mul.d $f2, $f2, $f0 -/* B45428 80240CB8 00000000 */ nop -/* B4542C 80240CBC 3C013FD0 */ lui $at, 0x3fd0 -/* B45430 80240CC0 44810800 */ mtc1 $at, $f1 -/* B45434 80240CC4 44800000 */ mtc1 $zero, $f0 -/* B45438 80240CC8 00000000 */ nop -/* B4543C 80240CCC 46201082 */ mul.d $f2, $f2, $f0 -/* B45440 80240CD0 00000000 */ nop -/* B45444 80240CD4 462010A0 */ cvt.s.d $f2, $f2 -/* B45448 80240CD8 E6220064 */ swc1 $f2, 0x64($s1) -/* B4544C 80240CDC 8E430074 */ lw $v1, 0x74($s2) -/* B45450 80240CE0 2463FFFF */ addiu $v1, $v1, -1 -/* B45454 80240CE4 00031027 */ nor $v0, $zero, $v1 -/* B45458 80240CE8 2C420001 */ sltiu $v0, $v0, 1 -/* B4545C 80240CEC AE430074 */ sw $v1, 0x74($s2) -/* B45460 80240CF0 8FBF001C */ lw $ra, 0x1c($sp) -/* B45464 80240CF4 8FB20018 */ lw $s2, 0x18($sp) -/* B45468 80240CF8 8FB10014 */ lw $s1, 0x14($sp) -/* B4546C 80240CFC 8FB00010 */ lw $s0, 0x10($sp) -/* B45470 80240D00 00021040 */ sll $v0, $v0, 1 -/* B45474 80240D04 03E00008 */ jr $ra -/* B45478 80240D08 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_04/func_80240DF0_B44770.s b/asm/nonmatchings/world/area_jan/jan_04/func_80240DF0_B44770.s deleted file mode 100644 index 7c576c7d10..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/func_80240DF0_B44770.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF0_B45560 -/* B45560 80240DF0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B45564 80240DF4 AFB10054 */ sw $s1, 0x54($sp) -/* B45568 80240DF8 0080882D */ daddu $s1, $a0, $zero -/* B4556C 80240DFC AFBF005C */ sw $ra, 0x5c($sp) -/* B45570 80240E00 AFB20058 */ sw $s2, 0x58($sp) -/* B45574 80240E04 AFB00050 */ sw $s0, 0x50($sp) -/* B45578 80240E08 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B4557C 80240E0C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B45580 80240E10 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B45584 80240E14 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B45588 80240E18 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B4558C 80240E1C 8E30000C */ lw $s0, 0xc($s1) -/* B45590 80240E20 8E050000 */ lw $a1, ($s0) -/* B45594 80240E24 0C0B1EAF */ jal get_variable -/* B45598 80240E28 26100004 */ addiu $s0, $s0, 4 -/* B4559C 80240E2C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B455A0 80240E30 0040202D */ daddu $a0, $v0, $zero -/* B455A4 80240E34 8E050000 */ lw $a1, ($s0) -/* B455A8 80240E38 26100004 */ addiu $s0, $s0, 4 -/* B455AC 80240E3C 0220202D */ daddu $a0, $s1, $zero -/* B455B0 80240E40 0C0B210B */ jal get_float_variable -/* B455B4 80240E44 0040902D */ daddu $s2, $v0, $zero -/* B455B8 80240E48 8E050000 */ lw $a1, ($s0) -/* B455BC 80240E4C 26100004 */ addiu $s0, $s0, 4 -/* B455C0 80240E50 0220202D */ daddu $a0, $s1, $zero -/* B455C4 80240E54 0C0B210B */ jal get_float_variable -/* B455C8 80240E58 46000706 */ mov.s $f28, $f0 -/* B455CC 80240E5C 8E050000 */ lw $a1, ($s0) -/* B455D0 80240E60 26100004 */ addiu $s0, $s0, 4 -/* B455D4 80240E64 0220202D */ daddu $a0, $s1, $zero -/* B455D8 80240E68 0C0B210B */ jal get_float_variable -/* B455DC 80240E6C 46000686 */ mov.s $f26, $f0 -/* B455E0 80240E70 0220202D */ daddu $a0, $s1, $zero -/* B455E4 80240E74 8E050000 */ lw $a1, ($s0) -/* B455E8 80240E78 0C0B210B */ jal get_float_variable -/* B455EC 80240E7C 46000586 */ mov.s $f22, $f0 -/* B455F0 80240E80 0240202D */ daddu $a0, $s2, $zero -/* B455F4 80240E84 0C046B4C */ jal get_model_from_list_index -/* B455F8 80240E88 46000606 */ mov.s $f24, $f0 -/* B455FC 80240E8C 0040882D */ daddu $s1, $v0, $zero -/* B45600 80240E90 96220000 */ lhu $v0, ($s1) -/* B45604 80240E94 30420400 */ andi $v0, $v0, 0x400 -/* B45608 80240E98 1440001E */ bnez $v0, .L80240F14 -/* B4560C 80240E9C 26300058 */ addiu $s0, $s1, 0x58 -/* B45610 80240EA0 4480A000 */ mtc1 $zero, $f20 -/* B45614 80240EA4 4406B000 */ mfc1 $a2, $f22 -/* B45618 80240EA8 4405A000 */ mfc1 $a1, $f20 -/* B4561C 80240EAC 4407A000 */ mfc1 $a3, $f20 -/* B45620 80240EB0 0C019E40 */ jal guTranslateF -/* B45624 80240EB4 0200202D */ daddu $a0, $s0, $zero -/* B45628 80240EB8 4405E000 */ mfc1 $a1, $f28 -/* B4562C 80240EBC 4406D000 */ mfc1 $a2, $f26 -/* B45630 80240EC0 4407C000 */ mfc1 $a3, $f24 -/* B45634 80240EC4 0C090360 */ jal func_80240D80 -/* B45638 80240EC8 27A40010 */ addiu $a0, $sp, 0x10 -/* B4563C 80240ECC 27A40010 */ addiu $a0, $sp, 0x10 -/* B45640 80240ED0 0200282D */ daddu $a1, $s0, $zero -/* B45644 80240ED4 0C019D80 */ jal guMtxCatF -/* B45648 80240ED8 0200302D */ daddu $a2, $s0, $zero -/* B4564C 80240EDC 27A40010 */ addiu $a0, $sp, 0x10 -/* B45650 80240EE0 4600B587 */ neg.s $f22, $f22 -/* B45654 80240EE4 4405A000 */ mfc1 $a1, $f20 -/* B45658 80240EE8 4406B000 */ mfc1 $a2, $f22 -/* B4565C 80240EEC 0C019E40 */ jal guTranslateF -/* B45660 80240EF0 00A0382D */ daddu $a3, $a1, $zero -/* B45664 80240EF4 27A40010 */ addiu $a0, $sp, 0x10 -/* B45668 80240EF8 0200282D */ daddu $a1, $s0, $zero -/* B4566C 80240EFC 0C019D80 */ jal guMtxCatF -/* B45670 80240F00 00A0302D */ daddu $a2, $a1, $zero -/* B45674 80240F04 96220000 */ lhu $v0, ($s1) -/* B45678 80240F08 34421400 */ ori $v0, $v0, 0x1400 -/* B4567C 80240F0C 080903E3 */ j .L80240F8C -/* B45680 80240F10 A6220000 */ sh $v0, ($s1) -.L80240F14: -/* B45684 80240F14 4480A000 */ mtc1 $zero, $f20 -/* B45688 80240F18 4406B000 */ mfc1 $a2, $f22 -/* B4568C 80240F1C 4405A000 */ mfc1 $a1, $f20 -/* B45690 80240F20 4407A000 */ mfc1 $a3, $f20 -/* B45694 80240F24 0C019E40 */ jal guTranslateF -/* B45698 80240F28 27A40010 */ addiu $a0, $sp, 0x10 -/* B4569C 80240F2C 27A40010 */ addiu $a0, $sp, 0x10 -/* B456A0 80240F30 26300058 */ addiu $s0, $s1, 0x58 -/* B456A4 80240F34 0200282D */ daddu $a1, $s0, $zero -/* B456A8 80240F38 0C019D80 */ jal guMtxCatF -/* B456AC 80240F3C 0200302D */ daddu $a2, $s0, $zero -/* B456B0 80240F40 4405E000 */ mfc1 $a1, $f28 -/* B456B4 80240F44 4406D000 */ mfc1 $a2, $f26 -/* B456B8 80240F48 4407C000 */ mfc1 $a3, $f24 -/* B456BC 80240F4C 0C090360 */ jal func_80240D80 -/* B456C0 80240F50 27A40010 */ addiu $a0, $sp, 0x10 -/* B456C4 80240F54 27A40010 */ addiu $a0, $sp, 0x10 -/* B456C8 80240F58 0200282D */ daddu $a1, $s0, $zero -/* B456CC 80240F5C 0C019D80 */ jal guMtxCatF -/* B456D0 80240F60 0200302D */ daddu $a2, $s0, $zero -/* B456D4 80240F64 27A40010 */ addiu $a0, $sp, 0x10 -/* B456D8 80240F68 4600B587 */ neg.s $f22, $f22 -/* B456DC 80240F6C 4405A000 */ mfc1 $a1, $f20 -/* B456E0 80240F70 4406B000 */ mfc1 $a2, $f22 -/* B456E4 80240F74 0C019E40 */ jal guTranslateF -/* B456E8 80240F78 00A0382D */ daddu $a3, $a1, $zero -/* B456EC 80240F7C 27A40010 */ addiu $a0, $sp, 0x10 -/* B456F0 80240F80 0200282D */ daddu $a1, $s0, $zero -/* B456F4 80240F84 0C019D80 */ jal guMtxCatF -/* B456F8 80240F88 00A0302D */ daddu $a2, $a1, $zero -.L80240F8C: -/* B456FC 80240F8C 8FBF005C */ lw $ra, 0x5c($sp) -/* B45700 80240F90 8FB20058 */ lw $s2, 0x58($sp) -/* B45704 80240F94 8FB10054 */ lw $s1, 0x54($sp) -/* B45708 80240F98 8FB00050 */ lw $s0, 0x50($sp) -/* B4570C 80240F9C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B45710 80240FA0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B45714 80240FA4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B45718 80240FA8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B4571C 80240FAC D7B40060 */ ldc1 $f20, 0x60($sp) -/* B45720 80240FB0 24020002 */ addiu $v0, $zero, 2 -/* B45724 80240FB4 03E00008 */ jr $ra -/* B45728 80240FB8 27BD0088 */ addiu $sp, $sp, 0x88 -/* B4572C 80240FBC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_05/func_80240040_B4AA70.s b/asm/nonmatchings/world/area_jan/jan_05/func_80240040_B4AA70.s deleted file mode 100644 index 3ee38883e2..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/func_80240040_B4AA70.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_B4AAB0 -/* B4AAB0 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B4AAB4 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* B4AAB8 80240048 0080802D */ daddu $s0, $a0, $zero -/* B4AABC 8024004C AFBF0014 */ sw $ra, 0x14($sp) -/* B4AAC0 80240050 8E0300A8 */ lw $v1, 0xa8($s0) -/* B4AAC4 80240054 8E020088 */ lw $v0, 0x88($s0) -/* B4AAC8 80240058 00621821 */ addu $v1, $v1, $v0 -/* B4AACC 8024005C 04610004 */ bgez $v1, .L80240070 -/* B4AAD0 80240060 AE0300A8 */ sw $v1, 0xa8($s0) -/* B4AAD4 80240064 3C020002 */ lui $v0, 2 -/* B4AAD8 80240068 08090020 */ j .L80240080 -/* B4AADC 8024006C 00621021 */ addu $v0, $v1, $v0 -.L80240070: -/* B4AAE0 80240070 3C040002 */ lui $a0, 2 -/* B4AAE4 80240074 0083102A */ slt $v0, $a0, $v1 -/* B4AAE8 80240078 10400002 */ beqz $v0, .L80240084 -/* B4AAEC 8024007C 00641023 */ subu $v0, $v1, $a0 -.L80240080: -/* B4AAF0 80240080 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240084: -/* B4AAF4 80240084 8E0300AC */ lw $v1, 0xac($s0) -/* B4AAF8 80240088 8E02008C */ lw $v0, 0x8c($s0) -/* B4AAFC 8024008C 00621821 */ addu $v1, $v1, $v0 -/* B4AB00 80240090 04610004 */ bgez $v1, .L802400A4 -/* B4AB04 80240094 AE0300AC */ sw $v1, 0xac($s0) -/* B4AB08 80240098 3C020002 */ lui $v0, 2 -/* B4AB0C 8024009C 0809002D */ j .L802400B4 -/* B4AB10 802400A0 00621021 */ addu $v0, $v1, $v0 -.L802400A4: -/* B4AB14 802400A4 3C040002 */ lui $a0, 2 -/* B4AB18 802400A8 0083102A */ slt $v0, $a0, $v1 -/* B4AB1C 802400AC 10400002 */ beqz $v0, .L802400B8 -/* B4AB20 802400B0 00641023 */ subu $v0, $v1, $a0 -.L802400B4: -/* B4AB24 802400B4 AE0200AC */ sw $v0, 0xac($s0) -.L802400B8: -/* B4AB28 802400B8 8E0300B0 */ lw $v1, 0xb0($s0) -/* B4AB2C 802400BC 8E020090 */ lw $v0, 0x90($s0) -/* B4AB30 802400C0 00621821 */ addu $v1, $v1, $v0 -/* B4AB34 802400C4 04610004 */ bgez $v1, .L802400D8 -/* B4AB38 802400C8 AE0300B0 */ sw $v1, 0xb0($s0) -/* B4AB3C 802400CC 3C020002 */ lui $v0, 2 -/* B4AB40 802400D0 0809003A */ j .L802400E8 -/* B4AB44 802400D4 00621021 */ addu $v0, $v1, $v0 -.L802400D8: -/* B4AB48 802400D8 3C040002 */ lui $a0, 2 -/* B4AB4C 802400DC 0083102A */ slt $v0, $a0, $v1 -/* B4AB50 802400E0 10400002 */ beqz $v0, .L802400EC -/* B4AB54 802400E4 00641023 */ subu $v0, $v1, $a0 -.L802400E8: -/* B4AB58 802400E8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400EC: -/* B4AB5C 802400EC 8E0300B4 */ lw $v1, 0xb4($s0) -/* B4AB60 802400F0 8E020094 */ lw $v0, 0x94($s0) -/* B4AB64 802400F4 00621821 */ addu $v1, $v1, $v0 -/* B4AB68 802400F8 04610004 */ bgez $v1, .L8024010C -/* B4AB6C 802400FC AE0300B4 */ sw $v1, 0xb4($s0) -/* B4AB70 80240100 3C020002 */ lui $v0, 2 -/* B4AB74 80240104 08090047 */ j .L8024011C -/* B4AB78 80240108 00621021 */ addu $v0, $v1, $v0 -.L8024010C: -/* B4AB7C 8024010C 3C040002 */ lui $a0, 2 -/* B4AB80 80240110 0083102A */ slt $v0, $a0, $v1 -/* B4AB84 80240114 10400002 */ beqz $v0, .L80240120 -/* B4AB88 80240118 00641023 */ subu $v0, $v1, $a0 -.L8024011C: -/* B4AB8C 8024011C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240120: -/* B4AB90 80240120 8E040084 */ lw $a0, 0x84($s0) -/* B4AB94 80240124 0C046F07 */ jal set_main_pan_u -/* B4AB98 80240128 8E0500A8 */ lw $a1, 0xa8($s0) -/* B4AB9C 8024012C 8E040084 */ lw $a0, 0x84($s0) -/* B4ABA0 80240130 0C046F0D */ jal set_main_pan_v -/* B4ABA4 80240134 8E0500AC */ lw $a1, 0xac($s0) -/* B4ABA8 80240138 8E040084 */ lw $a0, 0x84($s0) -/* B4ABAC 8024013C 0C046F13 */ jal set_aux_pan_u -/* B4ABB0 80240140 8E0500B0 */ lw $a1, 0xb0($s0) -/* B4ABB4 80240144 8E040084 */ lw $a0, 0x84($s0) -/* B4ABB8 80240148 0C046F19 */ jal set_aux_pan_v -/* B4ABBC 8024014C 8E0500B4 */ lw $a1, 0xb4($s0) -/* B4ABC0 80240150 8FBF0014 */ lw $ra, 0x14($sp) -/* B4ABC4 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* B4ABC8 80240158 0000102D */ daddu $v0, $zero, $zero -/* B4ABCC 8024015C 03E00008 */ jr $ra -/* B4ABD0 80240160 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_05/func_80240164_B4AA70.s b/asm/nonmatchings/world/area_jan/jan_05/func_80240164_B4AA70.s deleted file mode 100644 index 5f420c063e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/func_80240164_B4AA70.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240164_B4ABD4 -/* B4ABD4 80240164 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B4ABD8 80240168 AFB00010 */ sw $s0, 0x10($sp) -/* B4ABDC 8024016C 0080802D */ daddu $s0, $a0, $zero -/* B4ABE0 80240170 10A00005 */ beqz $a1, .L80240188 -/* B4ABE4 80240174 AFBF0014 */ sw $ra, 0x14($sp) -/* B4ABE8 80240178 AE000070 */ sw $zero, 0x70($s0) -/* B4ABEC 8024017C AE000074 */ sw $zero, 0x74($s0) -/* B4ABF0 80240180 AE000078 */ sw $zero, 0x78($s0) -/* B4ABF4 80240184 AE00007C */ sw $zero, 0x7c($s0) -.L80240188: -/* B4ABF8 80240188 8E020070 */ lw $v0, 0x70($s0) -/* B4ABFC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* B4AC00 80240190 00000000 */ nop -/* B4AC04 80240194 8E0300A8 */ lw $v1, 0xa8($s0) -/* B4AC08 80240198 8E020088 */ lw $v0, 0x88($s0) -/* B4AC0C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* B4AC10 802401A0 04610004 */ bgez $v1, .L802401B4 -/* B4AC14 802401A4 AE0300A8 */ sw $v1, 0xa8($s0) -/* B4AC18 802401A8 3C020002 */ lui $v0, 2 -/* B4AC1C 802401AC 08090071 */ j .L802401C4 -/* B4AC20 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* B4AC24 802401B4 3C040002 */ lui $a0, 2 -/* B4AC28 802401B8 0083102A */ slt $v0, $a0, $v1 -/* B4AC2C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* B4AC30 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* B4AC34 802401C4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401C8: -/* B4AC38 802401C8 8E020074 */ lw $v0, 0x74($s0) -/* B4AC3C 802401CC 1440000E */ bnez $v0, .L80240208 -/* B4AC40 802401D0 00000000 */ nop -/* B4AC44 802401D4 8E0300AC */ lw $v1, 0xac($s0) -/* B4AC48 802401D8 8E02008C */ lw $v0, 0x8c($s0) -/* B4AC4C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* B4AC50 802401E0 04610004 */ bgez $v1, .L802401F4 -/* B4AC54 802401E4 AE0300AC */ sw $v1, 0xac($s0) -/* B4AC58 802401E8 3C020002 */ lui $v0, 2 -/* B4AC5C 802401EC 08090081 */ j .L80240204 -/* B4AC60 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* B4AC64 802401F4 3C040002 */ lui $a0, 2 -/* B4AC68 802401F8 0083102A */ slt $v0, $a0, $v1 -/* B4AC6C 802401FC 10400002 */ beqz $v0, .L80240208 -/* B4AC70 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* B4AC74 80240204 AE0200AC */ sw $v0, 0xac($s0) -.L80240208: -/* B4AC78 80240208 8E020078 */ lw $v0, 0x78($s0) -/* B4AC7C 8024020C 1440000E */ bnez $v0, .L80240248 -/* B4AC80 80240210 00000000 */ nop -/* B4AC84 80240214 8E0300B0 */ lw $v1, 0xb0($s0) -/* B4AC88 80240218 8E020090 */ lw $v0, 0x90($s0) -/* B4AC8C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* B4AC90 80240220 04610004 */ bgez $v1, .L80240234 -/* B4AC94 80240224 AE0300B0 */ sw $v1, 0xb0($s0) -/* B4AC98 80240228 3C020002 */ lui $v0, 2 -/* B4AC9C 8024022C 08090091 */ j .L80240244 -/* B4ACA0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* B4ACA4 80240234 3C040002 */ lui $a0, 2 -/* B4ACA8 80240238 0083102A */ slt $v0, $a0, $v1 -/* B4ACAC 8024023C 10400002 */ beqz $v0, .L80240248 -/* B4ACB0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* B4ACB4 80240244 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240248: -/* B4ACB8 80240248 8E02007C */ lw $v0, 0x7c($s0) -/* B4ACBC 8024024C 1440000E */ bnez $v0, .L80240288 -/* B4ACC0 80240250 00000000 */ nop -/* B4ACC4 80240254 8E0300B4 */ lw $v1, 0xb4($s0) -/* B4ACC8 80240258 8E020094 */ lw $v0, 0x94($s0) -/* B4ACCC 8024025C 00621821 */ addu $v1, $v1, $v0 -/* B4ACD0 80240260 04610004 */ bgez $v1, .L80240274 -/* B4ACD4 80240264 AE0300B4 */ sw $v1, 0xb4($s0) -/* B4ACD8 80240268 3C020002 */ lui $v0, 2 -/* B4ACDC 8024026C 080900A1 */ j .L80240284 -/* B4ACE0 80240270 00621021 */ addu $v0, $v1, $v0 -.L80240274: -/* B4ACE4 80240274 3C040002 */ lui $a0, 2 -/* B4ACE8 80240278 0083102A */ slt $v0, $a0, $v1 -/* B4ACEC 8024027C 10400002 */ beqz $v0, .L80240288 -/* B4ACF0 80240280 00641023 */ subu $v0, $v1, $a0 -.L80240284: -/* B4ACF4 80240284 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240288: -/* B4ACF8 80240288 8E040084 */ lw $a0, 0x84($s0) -/* B4ACFC 8024028C 0C046F07 */ jal set_main_pan_u -/* B4AD00 80240290 8E0500A8 */ lw $a1, 0xa8($s0) -/* B4AD04 80240294 8E040084 */ lw $a0, 0x84($s0) -/* B4AD08 80240298 0C046F0D */ jal set_main_pan_v -/* B4AD0C 8024029C 8E0500AC */ lw $a1, 0xac($s0) -/* B4AD10 802402A0 8E040084 */ lw $a0, 0x84($s0) -/* B4AD14 802402A4 0C046F13 */ jal set_aux_pan_u -/* B4AD18 802402A8 8E0500B0 */ lw $a1, 0xb0($s0) -/* B4AD1C 802402AC 8E040084 */ lw $a0, 0x84($s0) -/* B4AD20 802402B0 0C046F19 */ jal set_aux_pan_v -/* B4AD24 802402B4 8E0500B4 */ lw $a1, 0xb4($s0) -/* B4AD28 802402B8 8E020070 */ lw $v0, 0x70($s0) -/* B4AD2C 802402BC 8E030078 */ lw $v1, 0x78($s0) -/* B4AD30 802402C0 8E040098 */ lw $a0, 0x98($s0) -/* B4AD34 802402C4 24420001 */ addiu $v0, $v0, 1 -/* B4AD38 802402C8 AE020070 */ sw $v0, 0x70($s0) -/* B4AD3C 802402CC 8E020074 */ lw $v0, 0x74($s0) -/* B4AD40 802402D0 24630001 */ addiu $v1, $v1, 1 -/* B4AD44 802402D4 AE030078 */ sw $v1, 0x78($s0) -/* B4AD48 802402D8 8E030070 */ lw $v1, 0x70($s0) -/* B4AD4C 802402DC 24420001 */ addiu $v0, $v0, 1 -/* B4AD50 802402E0 AE020074 */ sw $v0, 0x74($s0) -/* B4AD54 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* B4AD58 802402E8 0064182A */ slt $v1, $v1, $a0 -/* B4AD5C 802402EC 24420001 */ addiu $v0, $v0, 1 -/* B4AD60 802402F0 14600002 */ bnez $v1, .L802402FC -/* B4AD64 802402F4 AE02007C */ sw $v0, 0x7c($s0) -/* B4AD68 802402F8 AE000070 */ sw $zero, 0x70($s0) -.L802402FC: -/* B4AD6C 802402FC 8E020074 */ lw $v0, 0x74($s0) -/* B4AD70 80240300 8E03009C */ lw $v1, 0x9c($s0) -/* B4AD74 80240304 0043102A */ slt $v0, $v0, $v1 -/* B4AD78 80240308 50400001 */ beql $v0, $zero, .L80240310 -/* B4AD7C 8024030C AE000074 */ sw $zero, 0x74($s0) -.L80240310: -/* B4AD80 80240310 8E020078 */ lw $v0, 0x78($s0) -/* B4AD84 80240314 8E0300A0 */ lw $v1, 0xa0($s0) -/* B4AD88 80240318 0043102A */ slt $v0, $v0, $v1 -/* B4AD8C 8024031C 50400001 */ beql $v0, $zero, .L80240324 -/* B4AD90 80240320 AE000078 */ sw $zero, 0x78($s0) -.L80240324: -/* B4AD94 80240324 8E02007C */ lw $v0, 0x7c($s0) -/* B4AD98 80240328 8E0300A4 */ lw $v1, 0xa4($s0) -/* B4AD9C 8024032C 0043102A */ slt $v0, $v0, $v1 -/* B4ADA0 80240330 50400001 */ beql $v0, $zero, .L80240338 -/* B4ADA4 80240334 AE00007C */ sw $zero, 0x7c($s0) -.L80240338: -/* B4ADA8 80240338 8FBF0014 */ lw $ra, 0x14($sp) -/* B4ADAC 8024033C 8FB00010 */ lw $s0, 0x10($sp) -/* B4ADB0 80240340 0000102D */ daddu $v0, $zero, $zero -/* B4ADB4 80240344 03E00008 */ jr $ra -/* B4ADB8 80240348 27BD0018 */ addiu $sp, $sp, 0x18 -/* B4ADBC 8024034C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_05/func_80240350_B4AA70.s b/asm/nonmatchings/world/area_jan/jan_05/func_80240350_B4AA70.s deleted file mode 100644 index b5133f58a8..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/func_80240350_B4AA70.s +++ /dev/null @@ -1,91 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240350_B4ADC0 -/* B4ADC0 80240350 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B4ADC4 80240354 AFB10034 */ sw $s1, 0x34($sp) -/* B4ADC8 80240358 0080882D */ daddu $s1, $a0, $zero -/* B4ADCC 8024035C AFBF0038 */ sw $ra, 0x38($sp) -/* B4ADD0 80240360 AFB00030 */ sw $s0, 0x30($sp) -/* B4ADD4 80240364 10A00016 */ beqz $a1, .L802403C0 -/* B4ADD8 80240368 8E30000C */ lw $s0, 0xc($s1) -/* B4ADDC 8024036C 8E050000 */ lw $a1, ($s0) -/* B4ADE0 80240370 0C0B1EAF */ jal get_variable -/* B4ADE4 80240374 26100004 */ addiu $s0, $s0, 4 -/* B4ADE8 80240378 8E030000 */ lw $v1, ($s0) -/* B4ADEC 8024037C 0040202D */ daddu $a0, $v0, $zero -/* B4ADF0 80240380 0C046C04 */ jal get_model_list_index_from_tree_index -/* B4ADF4 80240384 AE23007C */ sw $v1, 0x7c($s1) -/* B4ADF8 80240388 0C046B4C */ jal get_model_from_list_index -/* B4ADFC 8024038C 0040202D */ daddu $a0, $v0, $zero -/* B4AE00 80240390 0040802D */ daddu $s0, $v0, $zero -/* B4AE04 80240394 0000202D */ daddu $a0, $zero, $zero -/* B4AE08 80240398 AE300074 */ sw $s0, 0x74($s1) -/* B4AE0C 8024039C 8E050098 */ lw $a1, 0x98($s0) -/* B4AE10 802403A0 8E0700A0 */ lw $a3, 0xa0($s0) -/* B4AE14 802403A4 0C044898 */ jal create_shadow_type -/* B4AE18 802403A8 0000302D */ daddu $a2, $zero, $zero -/* B4AE1C 802403AC 0220202D */ daddu $a0, $s1, $zero -/* B4AE20 802403B0 8E25007C */ lw $a1, 0x7c($s1) -/* B4AE24 802403B4 0000302D */ daddu $a2, $zero, $zero -/* B4AE28 802403B8 0C0B2026 */ jal set_variable -/* B4AE2C 802403BC AE220078 */ sw $v0, 0x78($s1) -.L802403C0: -/* B4AE30 802403C0 8E25007C */ lw $a1, 0x7c($s1) -/* B4AE34 802403C4 0C0B1EAF */ jal get_variable -/* B4AE38 802403C8 0220202D */ daddu $a0, $s1, $zero -/* B4AE3C 802403CC 1440002A */ bnez $v0, .L80240478 -/* B4AE40 802403D0 00000000 */ nop -/* B4AE44 802403D4 8E240078 */ lw $a0, 0x78($s1) -/* B4AE48 802403D8 0C044181 */ jal get_shadow_by_index -/* B4AE4C 802403DC 8E300074 */ lw $s0, 0x74($s1) -/* B4AE50 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* B4AE54 802403E4 27A5001C */ addiu $a1, $sp, 0x1c -/* B4AE58 802403E8 27A60020 */ addiu $a2, $sp, 0x20 -/* B4AE5C 802403EC 27A70024 */ addiu $a3, $sp, 0x24 -/* B4AE60 802403F0 27A30028 */ addiu $v1, $sp, 0x28 -/* B4AE64 802403F4 C6000098 */ lwc1 $f0, 0x98($s0) -/* B4AE68 802403F8 C602009C */ lwc1 $f2, 0x9c($s0) -/* B4AE6C 802403FC C60400A0 */ lwc1 $f4, 0xa0($s0) -/* B4AE70 80240400 0040802D */ daddu $s0, $v0, $zero -/* B4AE74 80240404 E7A00018 */ swc1 $f0, 0x18($sp) -/* B4AE78 80240408 E7A2001C */ swc1 $f2, 0x1c($sp) -/* B4AE7C 8024040C E7A40020 */ swc1 $f4, 0x20($sp) -/* B4AE80 80240410 AFA30010 */ sw $v1, 0x10($sp) -/* B4AE84 80240414 27A3002C */ addiu $v1, $sp, 0x2c -/* B4AE88 80240418 0C04497A */ jal func_801125E8 -/* B4AE8C 8024041C AFA30014 */ sw $v1, 0x14($sp) -/* B4AE90 80240420 8FA5002C */ lw $a1, 0x2c($sp) -/* B4AE94 80240424 0C044A17 */ jal set_standard_shadow_scale -/* B4AE98 80240428 0200202D */ daddu $a0, $s0, $zero -/* B4AE9C 8024042C C7A00018 */ lwc1 $f0, 0x18($sp) -/* B4AEA0 80240430 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* B4AEA4 80240434 C7A60020 */ lwc1 $f6, 0x20($sp) -/* B4AEA8 80240438 C7A80024 */ lwc1 $f8, 0x24($sp) -/* B4AEAC 8024043C C604001C */ lwc1 $f4, 0x1c($s0) -/* B4AEB0 80240440 0000102D */ daddu $v0, $zero, $zero -/* B4AEB4 80240444 AE00002C */ sw $zero, 0x2c($s0) -/* B4AEB8 80240448 E6000010 */ swc1 $f0, 0x10($s0) -/* B4AEBC 8024044C C6000024 */ lwc1 $f0, 0x24($s0) -/* B4AEC0 80240450 46042100 */ add.s $f4, $f4, $f4 -/* B4AEC4 80240454 E6020014 */ swc1 $f2, 0x14($s0) -/* B4AEC8 80240458 E6060018 */ swc1 $f6, 0x18($s0) -/* B4AECC 8024045C E6080028 */ swc1 $f8, 0x28($s0) -/* B4AED0 80240460 C7A20028 */ lwc1 $f2, 0x28($sp) -/* B4AED4 80240464 46000000 */ add.s $f0, $f0, $f0 -/* B4AED8 80240468 E6020030 */ swc1 $f2, 0x30($s0) -/* B4AEDC 8024046C E604001C */ swc1 $f4, 0x1c($s0) -/* B4AEE0 80240470 08090122 */ j .L80240488 -/* B4AEE4 80240474 E6000024 */ swc1 $f0, 0x24($s0) -.L80240478: -/* B4AEE8 80240478 8E240078 */ lw $a0, 0x78($s1) -/* B4AEEC 8024047C 0C0448CA */ jal func_80112328 -/* B4AEF0 80240480 00000000 */ nop -/* B4AEF4 80240484 24020002 */ addiu $v0, $zero, 2 -.L80240488: -/* B4AEF8 80240488 8FBF0038 */ lw $ra, 0x38($sp) -/* B4AEFC 8024048C 8FB10034 */ lw $s1, 0x34($sp) -/* B4AF00 80240490 8FB00030 */ lw $s0, 0x30($sp) -/* B4AF04 80240494 03E00008 */ jr $ra -/* B4AF08 80240498 27BD0040 */ addiu $sp, $sp, 0x40 -/* B4AF0C 8024049C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_05/func_802404A0_B4AA70.s b/asm/nonmatchings/world/area_jan/jan_05/func_802404A0_B4AA70.s deleted file mode 100644 index 64d20def17..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/func_802404A0_B4AA70.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404A0_B4AF10 -/* B4AF10 802404A0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B4AF14 802404A4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B4AF18 802404A8 4485A000 */ mtc1 $a1, $f20 -/* B4AF1C 802404AC F7B60020 */ sdc1 $f22, 0x20($sp) -/* B4AF20 802404B0 4486B000 */ mtc1 $a2, $f22 -/* B4AF24 802404B4 AFB00010 */ sw $s0, 0x10($sp) -/* B4AF28 802404B8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B4AF2C 802404BC 4487C000 */ mtc1 $a3, $f24 -/* B4AF30 802404C0 AFBF0014 */ sw $ra, 0x14($sp) -/* B4AF34 802404C4 0C019D28 */ jal guMtxIdentF -/* B4AF38 802404C8 0080802D */ daddu $s0, $a0, $zero -/* B4AF3C 802404CC 4616A582 */ mul.s $f22, $f20, $f22 -/* B4AF40 802404D0 00000000 */ nop -/* B4AF44 802404D4 4618A502 */ mul.s $f20, $f20, $f24 -/* B4AF48 802404D8 00000000 */ nop -/* B4AF4C 802404DC 3C013F80 */ lui $at, 0x3f80 -/* B4AF50 802404E0 44810000 */ mtc1 $at, $f0 -/* B4AF54 802404E4 00000000 */ nop -/* B4AF58 802404E8 E6000014 */ swc1 $f0, 0x14($s0) -/* B4AF5C 802404EC E6160010 */ swc1 $f22, 0x10($s0) -/* B4AF60 802404F0 E6140018 */ swc1 $f20, 0x18($s0) -/* B4AF64 802404F4 8FBF0014 */ lw $ra, 0x14($sp) -/* B4AF68 802404F8 8FB00010 */ lw $s0, 0x10($sp) -/* B4AF6C 802404FC D7B80028 */ ldc1 $f24, 0x28($sp) -/* B4AF70 80240500 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B4AF74 80240504 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B4AF78 80240508 03E00008 */ jr $ra -/* B4AF7C 8024050C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_05/func_80240510_B4AA70.s b/asm/nonmatchings/world/area_jan/jan_05/func_80240510_B4AA70.s deleted file mode 100644 index 01d9075d60..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/func_80240510_B4AA70.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240510_B4AF80 -/* B4AF80 80240510 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B4AF84 80240514 AFB10054 */ sw $s1, 0x54($sp) -/* B4AF88 80240518 0080882D */ daddu $s1, $a0, $zero -/* B4AF8C 8024051C AFBF005C */ sw $ra, 0x5c($sp) -/* B4AF90 80240520 AFB20058 */ sw $s2, 0x58($sp) -/* B4AF94 80240524 AFB00050 */ sw $s0, 0x50($sp) -/* B4AF98 80240528 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B4AF9C 8024052C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B4AFA0 80240530 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B4AFA4 80240534 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B4AFA8 80240538 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B4AFAC 8024053C 8E30000C */ lw $s0, 0xc($s1) -/* B4AFB0 80240540 8E050000 */ lw $a1, ($s0) -/* B4AFB4 80240544 0C0B1EAF */ jal get_variable -/* B4AFB8 80240548 26100004 */ addiu $s0, $s0, 4 -/* B4AFBC 8024054C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B4AFC0 80240550 0040202D */ daddu $a0, $v0, $zero -/* B4AFC4 80240554 8E050000 */ lw $a1, ($s0) -/* B4AFC8 80240558 26100004 */ addiu $s0, $s0, 4 -/* B4AFCC 8024055C 0220202D */ daddu $a0, $s1, $zero -/* B4AFD0 80240560 0C0B210B */ jal get_float_variable -/* B4AFD4 80240564 0040902D */ daddu $s2, $v0, $zero -/* B4AFD8 80240568 8E050000 */ lw $a1, ($s0) -/* B4AFDC 8024056C 26100004 */ addiu $s0, $s0, 4 -/* B4AFE0 80240570 0220202D */ daddu $a0, $s1, $zero -/* B4AFE4 80240574 0C0B210B */ jal get_float_variable -/* B4AFE8 80240578 46000706 */ mov.s $f28, $f0 -/* B4AFEC 8024057C 8E050000 */ lw $a1, ($s0) -/* B4AFF0 80240580 26100004 */ addiu $s0, $s0, 4 -/* B4AFF4 80240584 0220202D */ daddu $a0, $s1, $zero -/* B4AFF8 80240588 0C0B210B */ jal get_float_variable -/* B4AFFC 8024058C 46000686 */ mov.s $f26, $f0 -/* B4B000 80240590 0220202D */ daddu $a0, $s1, $zero -/* B4B004 80240594 8E050000 */ lw $a1, ($s0) -/* B4B008 80240598 0C0B210B */ jal get_float_variable -/* B4B00C 8024059C 46000586 */ mov.s $f22, $f0 -/* B4B010 802405A0 0240202D */ daddu $a0, $s2, $zero -/* B4B014 802405A4 0C046B4C */ jal get_model_from_list_index -/* B4B018 802405A8 46000606 */ mov.s $f24, $f0 -/* B4B01C 802405AC 0040882D */ daddu $s1, $v0, $zero -/* B4B020 802405B0 96220000 */ lhu $v0, ($s1) -/* B4B024 802405B4 30420400 */ andi $v0, $v0, 0x400 -/* B4B028 802405B8 1440001E */ bnez $v0, .L80240634 -/* B4B02C 802405BC 26300058 */ addiu $s0, $s1, 0x58 -/* B4B030 802405C0 4480A000 */ mtc1 $zero, $f20 -/* B4B034 802405C4 4406B000 */ mfc1 $a2, $f22 -/* B4B038 802405C8 4405A000 */ mfc1 $a1, $f20 -/* B4B03C 802405CC 4407A000 */ mfc1 $a3, $f20 -/* B4B040 802405D0 0C019E40 */ jal guTranslateF -/* B4B044 802405D4 0200202D */ daddu $a0, $s0, $zero -/* B4B048 802405D8 4405E000 */ mfc1 $a1, $f28 -/* B4B04C 802405DC 4406D000 */ mfc1 $a2, $f26 -/* B4B050 802405E0 4407C000 */ mfc1 $a3, $f24 -/* B4B054 802405E4 0C090128 */ jal func_802404A0 -/* B4B058 802405E8 27A40010 */ addiu $a0, $sp, 0x10 -/* B4B05C 802405EC 27A40010 */ addiu $a0, $sp, 0x10 -/* B4B060 802405F0 0200282D */ daddu $a1, $s0, $zero -/* B4B064 802405F4 0C019D80 */ jal guMtxCatF -/* B4B068 802405F8 0200302D */ daddu $a2, $s0, $zero -/* B4B06C 802405FC 27A40010 */ addiu $a0, $sp, 0x10 -/* B4B070 80240600 4600B587 */ neg.s $f22, $f22 -/* B4B074 80240604 4405A000 */ mfc1 $a1, $f20 -/* B4B078 80240608 4406B000 */ mfc1 $a2, $f22 -/* B4B07C 8024060C 0C019E40 */ jal guTranslateF -/* B4B080 80240610 00A0382D */ daddu $a3, $a1, $zero -/* B4B084 80240614 27A40010 */ addiu $a0, $sp, 0x10 -/* B4B088 80240618 0200282D */ daddu $a1, $s0, $zero -/* B4B08C 8024061C 0C019D80 */ jal guMtxCatF -/* B4B090 80240620 00A0302D */ daddu $a2, $a1, $zero -/* B4B094 80240624 96220000 */ lhu $v0, ($s1) -/* B4B098 80240628 34421400 */ ori $v0, $v0, 0x1400 -/* B4B09C 8024062C 080901AB */ j .L802406AC -/* B4B0A0 80240630 A6220000 */ sh $v0, ($s1) -.L80240634: -/* B4B0A4 80240634 4480A000 */ mtc1 $zero, $f20 -/* B4B0A8 80240638 4406B000 */ mfc1 $a2, $f22 -/* B4B0AC 8024063C 4405A000 */ mfc1 $a1, $f20 -/* B4B0B0 80240640 4407A000 */ mfc1 $a3, $f20 -/* B4B0B4 80240644 0C019E40 */ jal guTranslateF -/* B4B0B8 80240648 27A40010 */ addiu $a0, $sp, 0x10 -/* B4B0BC 8024064C 27A40010 */ addiu $a0, $sp, 0x10 -/* B4B0C0 80240650 26300058 */ addiu $s0, $s1, 0x58 -/* B4B0C4 80240654 0200282D */ daddu $a1, $s0, $zero -/* B4B0C8 80240658 0C019D80 */ jal guMtxCatF -/* B4B0CC 8024065C 0200302D */ daddu $a2, $s0, $zero -/* B4B0D0 80240660 4405E000 */ mfc1 $a1, $f28 -/* B4B0D4 80240664 4406D000 */ mfc1 $a2, $f26 -/* B4B0D8 80240668 4407C000 */ mfc1 $a3, $f24 -/* B4B0DC 8024066C 0C090128 */ jal func_802404A0 -/* B4B0E0 80240670 27A40010 */ addiu $a0, $sp, 0x10 -/* B4B0E4 80240674 27A40010 */ addiu $a0, $sp, 0x10 -/* B4B0E8 80240678 0200282D */ daddu $a1, $s0, $zero -/* B4B0EC 8024067C 0C019D80 */ jal guMtxCatF -/* B4B0F0 80240680 0200302D */ daddu $a2, $s0, $zero -/* B4B0F4 80240684 27A40010 */ addiu $a0, $sp, 0x10 -/* B4B0F8 80240688 4600B587 */ neg.s $f22, $f22 -/* B4B0FC 8024068C 4405A000 */ mfc1 $a1, $f20 -/* B4B100 80240690 4406B000 */ mfc1 $a2, $f22 -/* B4B104 80240694 0C019E40 */ jal guTranslateF -/* B4B108 80240698 00A0382D */ daddu $a3, $a1, $zero -/* B4B10C 8024069C 27A40010 */ addiu $a0, $sp, 0x10 -/* B4B110 802406A0 0200282D */ daddu $a1, $s0, $zero -/* B4B114 802406A4 0C019D80 */ jal guMtxCatF -/* B4B118 802406A8 00A0302D */ daddu $a2, $a1, $zero -.L802406AC: -/* B4B11C 802406AC 8FBF005C */ lw $ra, 0x5c($sp) -/* B4B120 802406B0 8FB20058 */ lw $s2, 0x58($sp) -/* B4B124 802406B4 8FB10054 */ lw $s1, 0x54($sp) -/* B4B128 802406B8 8FB00050 */ lw $s0, 0x50($sp) -/* B4B12C 802406BC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B4B130 802406C0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B4B134 802406C4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B4B138 802406C8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B4B13C 802406CC D7B40060 */ ldc1 $f20, 0x60($sp) -/* B4B140 802406D0 24020002 */ addiu $v0, $zero, 2 -/* B4B144 802406D4 03E00008 */ jr $ra -/* B4B148 802406D8 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_jan/jan_05/func_80240738_B4AA70.s b/asm/nonmatchings/world/area_jan/jan_05/func_80240738_B4AA70.s deleted file mode 100644 index 3692f40b12..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/func_80240738_B4AA70.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240738_B4B1A8 -/* B4B1A8 80240738 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B4B1AC 8024073C AFB10054 */ sw $s1, 0x54($sp) -/* B4B1B0 80240740 0080882D */ daddu $s1, $a0, $zero -/* B4B1B4 80240744 AFBF0058 */ sw $ra, 0x58($sp) -/* B4B1B8 80240748 AFB00050 */ sw $s0, 0x50($sp) -/* B4B1BC 8024074C F7B40060 */ sdc1 $f20, 0x60($sp) -/* B4B1C0 80240750 8E30000C */ lw $s0, 0xc($s1) -/* B4B1C4 80240754 8E050000 */ lw $a1, ($s0) -/* B4B1C8 80240758 0C0B1EAF */ jal get_variable -/* B4B1CC 8024075C 26100004 */ addiu $s0, $s0, 4 -/* B4B1D0 80240760 0C046C04 */ jal get_model_list_index_from_tree_index -/* B4B1D4 80240764 0040202D */ daddu $a0, $v0, $zero -/* B4B1D8 80240768 0220202D */ daddu $a0, $s1, $zero -/* B4B1DC 8024076C 8E050000 */ lw $a1, ($s0) -/* B4B1E0 80240770 0C0B210B */ jal get_float_variable -/* B4B1E4 80240774 0040802D */ daddu $s0, $v0, $zero -/* B4B1E8 80240778 0200202D */ daddu $a0, $s0, $zero -/* B4B1EC 8024077C 0C046B4C */ jal get_model_from_list_index -/* B4B1F0 80240780 46000506 */ mov.s $f20, $f0 -/* B4B1F4 80240784 0040802D */ daddu $s0, $v0, $zero -/* B4B1F8 80240788 96020000 */ lhu $v0, ($s0) -/* B4B1FC 8024078C 30420400 */ andi $v0, $v0, 0x400 -/* B4B200 80240790 14400008 */ bnez $v0, .L802407B4 -/* B4B204 80240794 00000000 */ nop -/* B4B208 80240798 4405A000 */ mfc1 $a1, $f20 -/* B4B20C 8024079C 0C0901B7 */ jal func_802406DC -/* B4B210 802407A0 26040058 */ addiu $a0, $s0, 0x58 -/* B4B214 802407A4 96020000 */ lhu $v0, ($s0) -/* B4B218 802407A8 34421400 */ ori $v0, $v0, 0x1400 -/* B4B21C 802407AC 080901F4 */ j .L802407D0 -/* B4B220 802407B0 A6020000 */ sh $v0, ($s0) -.L802407B4: -/* B4B224 802407B4 4405A000 */ mfc1 $a1, $f20 -/* B4B228 802407B8 0C0901B7 */ jal func_802406DC -/* B4B22C 802407BC 27A40010 */ addiu $a0, $sp, 0x10 -/* B4B230 802407C0 27A40010 */ addiu $a0, $sp, 0x10 -/* B4B234 802407C4 26050058 */ addiu $a1, $s0, 0x58 -/* B4B238 802407C8 0C019D80 */ jal guMtxCatF -/* B4B23C 802407CC 00A0302D */ daddu $a2, $a1, $zero -.L802407D0: -/* B4B240 802407D0 8FBF0058 */ lw $ra, 0x58($sp) -/* B4B244 802407D4 8FB10054 */ lw $s1, 0x54($sp) -/* B4B248 802407D8 8FB00050 */ lw $s0, 0x50($sp) -/* B4B24C 802407DC D7B40060 */ ldc1 $f20, 0x60($sp) -/* B4B250 802407E0 24020002 */ addiu $v0, $zero, 2 -/* B4B254 802407E4 03E00008 */ jr $ra -/* B4B258 802407E8 27BD0068 */ addiu $sp, $sp, 0x68 -/* B4B25C 802407EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_05/func_802407F0_B4AA70.s b/asm/nonmatchings/world/area_jan/jan_05/func_802407F0_B4AA70.s deleted file mode 100644 index b83d67b7b1..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/func_802407F0_B4AA70.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407F0_B4B260 -/* B4B260 802407F0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B4B264 802407F4 AFBF0020 */ sw $ra, 0x20($sp) -/* B4B268 802407F8 AFB1001C */ sw $s1, 0x1c($sp) -/* B4B26C 802407FC AFB00018 */ sw $s0, 0x18($sp) -/* B4B270 80240800 8C910148 */ lw $s1, 0x148($a0) -/* B4B274 80240804 0C00EABB */ jal get_npc_unsafe -/* B4B278 80240808 86240008 */ lh $a0, 8($s1) -/* B4B27C 8024080C 8E23006C */ lw $v1, 0x6c($s1) -/* B4B280 80240810 28630005 */ slti $v1, $v1, 5 -/* B4B284 80240814 1060001D */ beqz $v1, .L8024088C -/* B4B288 80240818 0040802D */ daddu $s0, $v0, $zero -/* B4B28C 8024081C 0C00A67F */ jal rand_int -/* B4B290 80240820 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B4B294 80240824 2842012D */ slti $v0, $v0, 0x12d -/* B4B298 80240828 14400018 */ bnez $v0, .L8024088C -/* B4B29C 8024082C 24020003 */ addiu $v0, $zero, 3 -/* B4B2A0 80240830 860300A8 */ lh $v1, 0xa8($s0) -/* B4B2A4 80240834 C604003C */ lwc1 $f4, 0x3c($s0) -/* B4B2A8 80240838 C6000040 */ lwc1 $f0, 0x40($s0) -/* B4B2AC 8024083C 3C014014 */ lui $at, 0x4014 -/* B4B2B0 80240840 44811800 */ mtc1 $at, $f3 -/* B4B2B4 80240844 44801000 */ mtc1 $zero, $f2 -/* B4B2B8 80240848 AFA20010 */ sw $v0, 0x10($sp) -/* B4B2BC 8024084C 46000021 */ cvt.d.s $f0, $f0 -/* B4B2C0 80240850 46220000 */ add.d $f0, $f0, $f2 -/* B4B2C4 80240854 AFA00014 */ sw $zero, 0x14($sp) -/* B4B2C8 80240858 44831000 */ mtc1 $v1, $f2 -/* B4B2CC 8024085C 00000000 */ nop -/* B4B2D0 80240860 468010A0 */ cvt.s.w $f2, $f2 -/* B4B2D4 80240864 46022100 */ add.s $f4, $f4, $f2 -/* B4B2D8 80240868 8E050038 */ lw $a1, 0x38($s0) -/* B4B2DC 8024086C 46200020 */ cvt.s.d $f0, $f0 -/* B4B2E0 80240870 44062000 */ mfc1 $a2, $f4 -/* B4B2E4 80240874 44070000 */ mfc1 $a3, $f0 -/* B4B2E8 80240878 0C04C6A5 */ jal make_item_entity_nodelay -/* B4B2EC 8024087C 24040156 */ addiu $a0, $zero, 0x156 -/* B4B2F0 80240880 8E22006C */ lw $v0, 0x6c($s1) -/* B4B2F4 80240884 24420001 */ addiu $v0, $v0, 1 -/* B4B2F8 80240888 AE22006C */ sw $v0, 0x6c($s1) -.L8024088C: -/* B4B2FC 8024088C 8FBF0020 */ lw $ra, 0x20($sp) -/* B4B300 80240890 8FB1001C */ lw $s1, 0x1c($sp) -/* B4B304 80240894 8FB00018 */ lw $s0, 0x18($sp) -/* B4B308 80240898 24020002 */ addiu $v0, $zero, 2 -/* B4B30C 8024089C 03E00008 */ jr $ra -/* B4B310 802408A0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_05/func_802408A4_B4AA70.s b/asm/nonmatchings/world/area_jan/jan_05/func_802408A4_B4AA70.s deleted file mode 100644 index bb47648b34..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/func_802408A4_B4AA70.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A4_B4B314 -/* B4B314 802408A4 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B4B318 802408A8 AFB00030 */ sw $s0, 0x30($sp) -/* B4B31C 802408AC 0080802D */ daddu $s0, $a0, $zero -/* B4B320 802408B0 AFBF0040 */ sw $ra, 0x40($sp) -/* B4B324 802408B4 AFB3003C */ sw $s3, 0x3c($sp) -/* B4B328 802408B8 AFB20038 */ sw $s2, 0x38($sp) -/* B4B32C 802408BC AFB10034 */ sw $s1, 0x34($sp) -/* B4B330 802408C0 F7B60050 */ sdc1 $f22, 0x50($sp) -/* B4B334 802408C4 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B4B338 802408C8 8E130148 */ lw $s3, 0x148($s0) -/* B4B33C 802408CC 00A0882D */ daddu $s1, $a1, $zero -/* B4B340 802408D0 86640008 */ lh $a0, 8($s3) -/* B4B344 802408D4 0C00EABB */ jal get_npc_unsafe -/* B4B348 802408D8 00C0902D */ daddu $s2, $a2, $zero -/* B4B34C 802408DC 0200202D */ daddu $a0, $s0, $zero -/* B4B350 802408E0 0220282D */ daddu $a1, $s1, $zero -/* B4B354 802408E4 0240302D */ daddu $a2, $s2, $zero -/* B4B358 802408E8 0C012568 */ jal func_800495A0 -/* B4B35C 802408EC 0040802D */ daddu $s0, $v0, $zero -/* B4B360 802408F0 8E020000 */ lw $v0, ($s0) -/* B4B364 802408F4 2404002D */ addiu $a0, $zero, 0x2d -/* B4B368 802408F8 34420800 */ ori $v0, $v0, 0x800 -/* B4B36C 802408FC 0C00A67F */ jal rand_int -/* B4B370 80240900 AE020000 */ sw $v0, ($s0) -/* B4B374 80240904 0200202D */ daddu $a0, $s0, $zero -/* B4B378 80240908 3C05B000 */ lui $a1, 0xb000 -/* B4B37C 8024090C 34A50017 */ ori $a1, $a1, 0x17 -/* B4B380 80240910 44820000 */ mtc1 $v0, $f0 -/* B4B384 80240914 00000000 */ nop -/* B4B388 80240918 46800021 */ cvt.d.w $f0, $f0 -/* B4B38C 8024091C 3C014024 */ lui $at, 0x4024 -/* B4B390 80240920 44811800 */ mtc1 $at, $f3 -/* B4B394 80240924 44801000 */ mtc1 $zero, $f2 -/* B4B398 80240928 3C014020 */ lui $at, 0x4020 -/* B4B39C 8024092C 44812800 */ mtc1 $at, $f5 -/* B4B3A0 80240930 44802000 */ mtc1 $zero, $f4 -/* B4B3A4 80240934 46220003 */ div.d $f0, $f0, $f2 -/* B4B3A8 80240938 46240000 */ add.d $f0, $f0, $f4 -/* B4B3AC 8024093C 3C013FC0 */ lui $at, 0x3fc0 -/* B4B3B0 80240940 44811000 */ mtc1 $at, $f2 -/* B4B3B4 80240944 0000302D */ daddu $a2, $zero, $zero -/* B4B3B8 80240948 E6020014 */ swc1 $f2, 0x14($s0) -/* B4B3BC 8024094C 46200020 */ cvt.s.d $f0, $f0 -/* B4B3C0 80240950 0C012530 */ jal func_800494C0 -/* B4B3C4 80240954 E600001C */ swc1 $f0, 0x1c($s0) -/* B4B3C8 80240958 8E6300D0 */ lw $v1, 0xd0($s3) -/* B4B3CC 8024095C C6000040 */ lwc1 $f0, 0x40($s0) -/* B4B3D0 80240960 C4620000 */ lwc1 $f2, ($v1) -/* B4B3D4 80240964 468010A0 */ cvt.s.w $f2, $f2 -/* B4B3D8 80240968 C4640008 */ lwc1 $f4, 8($v1) -/* B4B3DC 8024096C 46802120 */ cvt.s.w $f4, $f4 -/* B4B3E0 80240970 E7A00010 */ swc1 $f0, 0x10($sp) -/* B4B3E4 80240974 8E6200D0 */ lw $v0, 0xd0($s3) -/* B4B3E8 80240978 44051000 */ mfc1 $a1, $f2 -/* B4B3EC 8024097C C440000C */ lwc1 $f0, 0xc($v0) -/* B4B3F0 80240980 46800020 */ cvt.s.w $f0, $f0 -/* B4B3F4 80240984 E7A00014 */ swc1 $f0, 0x14($sp) -/* B4B3F8 80240988 8E6200D0 */ lw $v0, 0xd0($s3) -/* B4B3FC 8024098C 44062000 */ mfc1 $a2, $f4 -/* B4B400 80240990 C4400010 */ lwc1 $f0, 0x10($v0) -/* B4B404 80240994 46800020 */ cvt.s.w $f0, $f0 -/* B4B408 80240998 E7A00018 */ swc1 $f0, 0x18($sp) -/* B4B40C 8024099C 8C640018 */ lw $a0, 0x18($v1) -/* B4B410 802409A0 0C0123F5 */ jal is_point_within_region -/* B4B414 802409A4 8E070038 */ lw $a3, 0x38($s0) -/* B4B418 802409A8 10400035 */ beqz $v0, .L80240A80 -/* B4B41C 802409AC 00000000 */ nop -/* B4B420 802409B0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B4B424 802409B4 3C0141C8 */ lui $at, 0x41c8 -/* B4B428 802409B8 4481B000 */ mtc1 $at, $f22 -/* B4B42C 802409BC 8E6200D0 */ lw $v0, 0xd0($s3) -/* B4B430 802409C0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B4B434 802409C4 C4480000 */ lwc1 $f8, ($v0) -/* B4B438 802409C8 46804220 */ cvt.s.w $f8, $f8 -/* B4B43C 802409CC 44064000 */ mfc1 $a2, $f8 -/* B4B440 802409D0 C4480008 */ lwc1 $f8, 8($v0) -/* B4B444 802409D4 46804220 */ cvt.s.w $f8, $f8 -/* B4B448 802409D8 44074000 */ mfc1 $a3, $f8 -/* B4B44C 802409DC 3C01403E */ lui $at, 0x403e -/* B4B450 802409E0 4481A800 */ mtc1 $at, $f21 -/* B4B454 802409E4 4480A000 */ mtc1 $zero, $f20 -/* B4B458 802409E8 0C00A720 */ jal atan2 -/* B4B45C 802409EC 0000882D */ daddu $s1, $zero, $zero -/* B4B460 802409F0 C6020038 */ lwc1 $f2, 0x38($s0) -/* B4B464 802409F4 C604003C */ lwc1 $f4, 0x3c($s0) -/* B4B468 802409F8 C6060040 */ lwc1 $f6, 0x40($s0) -/* B4B46C 802409FC E600000C */ swc1 $f0, 0xc($s0) -/* B4B470 80240A00 E7A20020 */ swc1 $f2, 0x20($sp) -/* B4B474 80240A04 E7A40024 */ swc1 $f4, 0x24($sp) -/* B4B478 80240A08 E7A60028 */ swc1 $f6, 0x28($sp) -.L80240A0C: -/* B4B47C 80240A0C E7B60010 */ swc1 $f22, 0x10($sp) -/* B4B480 80240A10 C600000C */ lwc1 $f0, 0xc($s0) -/* B4B484 80240A14 E7A00014 */ swc1 $f0, 0x14($sp) -/* B4B488 80240A18 860200A8 */ lh $v0, 0xa8($s0) -/* B4B48C 80240A1C 27A50020 */ addiu $a1, $sp, 0x20 -/* B4B490 80240A20 44820000 */ mtc1 $v0, $f0 -/* B4B494 80240A24 00000000 */ nop -/* B4B498 80240A28 46800020 */ cvt.s.w $f0, $f0 -/* B4B49C 80240A2C E7A00018 */ swc1 $f0, 0x18($sp) -/* B4B4A0 80240A30 860200A6 */ lh $v0, 0xa6($s0) -/* B4B4A4 80240A34 27A60024 */ addiu $a2, $sp, 0x24 -/* B4B4A8 80240A38 44820000 */ mtc1 $v0, $f0 -/* B4B4AC 80240A3C 00000000 */ nop -/* B4B4B0 80240A40 46800020 */ cvt.s.w $f0, $f0 -/* B4B4B4 80240A44 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B4B4B8 80240A48 8E040080 */ lw $a0, 0x80($s0) -/* B4B4BC 80240A4C 0C037711 */ jal func_800DDC44 -/* B4B4C0 80240A50 27A70028 */ addiu $a3, $sp, 0x28 -/* B4B4C4 80240A54 10400016 */ beqz $v0, .L80240AB0 -/* B4B4C8 80240A58 26310001 */ addiu $s1, $s1, 1 -/* B4B4CC 80240A5C C600000C */ lwc1 $f0, 0xc($s0) -/* B4B4D0 80240A60 46000021 */ cvt.d.s $f0, $f0 -/* B4B4D4 80240A64 46340000 */ add.d $f0, $f0, $f20 -/* B4B4D8 80240A68 2A220006 */ slti $v0, $s1, 6 -/* B4B4DC 80240A6C 46200020 */ cvt.s.d $f0, $f0 -/* B4B4E0 80240A70 1440FFE6 */ bnez $v0, .L80240A0C -/* B4B4E4 80240A74 E600000C */ swc1 $f0, 0xc($s0) -/* B4B4E8 80240A78 080902AC */ j .L80240AB0 -/* B4B4EC 80240A7C 00000000 */ nop -.L80240A80: -/* B4B4F0 80240A80 0C00A67F */ jal rand_int -/* B4B4F4 80240A84 2404003C */ addiu $a0, $zero, 0x3c -/* B4B4F8 80240A88 C60C000C */ lwc1 $f12, 0xc($s0) -/* B4B4FC 80240A8C 44820000 */ mtc1 $v0, $f0 -/* B4B500 80240A90 00000000 */ nop -/* B4B504 80240A94 46800020 */ cvt.s.w $f0, $f0 -/* B4B508 80240A98 46006300 */ add.s $f12, $f12, $f0 -/* B4B50C 80240A9C 3C0141F0 */ lui $at, 0x41f0 -/* B4B510 80240AA0 44810000 */ mtc1 $at, $f0 -/* B4B514 80240AA4 0C00A6C9 */ jal clamp_angle -/* B4B518 80240AA8 46006301 */ sub.s $f12, $f12, $f0 -/* B4B51C 80240AAC E600000C */ swc1 $f0, 0xc($s0) -.L80240AB0: -/* B4B520 80240AB0 8FBF0040 */ lw $ra, 0x40($sp) -/* B4B524 80240AB4 8FB3003C */ lw $s3, 0x3c($sp) -/* B4B528 80240AB8 8FB20038 */ lw $s2, 0x38($sp) -/* B4B52C 80240ABC 8FB10034 */ lw $s1, 0x34($sp) -/* B4B530 80240AC0 8FB00030 */ lw $s0, 0x30($sp) -/* B4B534 80240AC4 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B4B538 80240AC8 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B4B53C 80240ACC 03E00008 */ jr $ra -/* B4B540 80240AD0 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_05/func_80240AD4_B4AA70.s b/asm/nonmatchings/world/area_jan/jan_05/func_80240AD4_B4AA70.s deleted file mode 100644 index c81330a28c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/func_80240AD4_B4AA70.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD4_B4B544 -/* B4B544 80240AD4 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* B4B548 80240AD8 AFB3004C */ sw $s3, 0x4c($sp) -/* B4B54C 80240ADC 0080982D */ daddu $s3, $a0, $zero -/* B4B550 80240AE0 AFBF0054 */ sw $ra, 0x54($sp) -/* B4B554 80240AE4 AFB40050 */ sw $s4, 0x50($sp) -/* B4B558 80240AE8 AFB20048 */ sw $s2, 0x48($sp) -/* B4B55C 80240AEC AFB10044 */ sw $s1, 0x44($sp) -/* B4B560 80240AF0 AFB00040 */ sw $s0, 0x40($sp) -/* B4B564 80240AF4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* B4B568 80240AF8 8E710148 */ lw $s1, 0x148($s3) -/* B4B56C 80240AFC 00A0A02D */ daddu $s4, $a1, $zero -/* B4B570 80240B00 86240008 */ lh $a0, 8($s1) -/* B4B574 80240B04 0C00EABB */ jal get_npc_unsafe -/* B4B578 80240B08 00C0902D */ daddu $s2, $a2, $zero -/* B4B57C 80240B0C 8E830014 */ lw $v1, 0x14($s4) -/* B4B580 80240B10 04600034 */ bltz $v1, .L80240BE4 -/* B4B584 80240B14 0040802D */ daddu $s0, $v0, $zero -/* B4B588 80240B18 8E620074 */ lw $v0, 0x74($s3) -/* B4B58C 80240B1C 1C400030 */ bgtz $v0, .L80240BE0 -/* B4B590 80240B20 2442FFFF */ addiu $v0, $v0, -1 -/* B4B594 80240B24 0240202D */ daddu $a0, $s2, $zero -/* B4B598 80240B28 AE630074 */ sw $v1, 0x74($s3) -/* B4B59C 80240B2C AFA00010 */ sw $zero, 0x10($sp) -/* B4B5A0 80240B30 8E86000C */ lw $a2, 0xc($s4) -/* B4B5A4 80240B34 8E870010 */ lw $a3, 0x10($s4) -/* B4B5A8 80240B38 0C01242D */ jal func_800490B4 -/* B4B5AC 80240B3C 0220282D */ daddu $a1, $s1, $zero -/* B4B5B0 80240B40 10400025 */ beqz $v0, .L80240BD8 -/* B4B5B4 80240B44 0000202D */ daddu $a0, $zero, $zero -/* B4B5B8 80240B48 0200282D */ daddu $a1, $s0, $zero -/* B4B5BC 80240B4C 0000302D */ daddu $a2, $zero, $zero -/* B4B5C0 80240B50 860300A8 */ lh $v1, 0xa8($s0) -/* B4B5C4 80240B54 3C013F80 */ lui $at, 0x3f80 -/* B4B5C8 80240B58 44810000 */ mtc1 $at, $f0 -/* B4B5CC 80240B5C 3C014000 */ lui $at, 0x4000 -/* B4B5D0 80240B60 44811000 */ mtc1 $at, $f2 -/* B4B5D4 80240B64 3C01C1A0 */ lui $at, 0xc1a0 -/* B4B5D8 80240B68 44812000 */ mtc1 $at, $f4 -/* B4B5DC 80240B6C 2402000F */ addiu $v0, $zero, 0xf -/* B4B5E0 80240B70 AFA2001C */ sw $v0, 0x1c($sp) -/* B4B5E4 80240B74 44835000 */ mtc1 $v1, $f10 -/* B4B5E8 80240B78 00000000 */ nop -/* B4B5EC 80240B7C 468052A0 */ cvt.s.w $f10, $f10 -/* B4B5F0 80240B80 44075000 */ mfc1 $a3, $f10 -/* B4B5F4 80240B84 27A20028 */ addiu $v0, $sp, 0x28 -/* B4B5F8 80240B88 AFA20020 */ sw $v0, 0x20($sp) -/* B4B5FC 80240B8C E7A00010 */ swc1 $f0, 0x10($sp) -/* B4B600 80240B90 E7A20014 */ swc1 $f2, 0x14($sp) -/* B4B604 80240B94 0C01BFA4 */ jal fx_emote -/* B4B608 80240B98 E7A40018 */ swc1 $f4, 0x18($sp) -/* B4B60C 80240B9C 0200202D */ daddu $a0, $s0, $zero -/* B4B610 80240BA0 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B4B614 80240BA4 0C012530 */ jal func_800494C0 -/* B4B618 80240BA8 3C060020 */ lui $a2, 0x20 -/* B4B61C 80240BAC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B4B620 80240BB0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B4B624 80240BB4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B4B628 80240BB8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B4B62C 80240BBC 8C460028 */ lw $a2, 0x28($v0) -/* B4B630 80240BC0 0C00A720 */ jal atan2 -/* B4B634 80240BC4 8C470030 */ lw $a3, 0x30($v0) -/* B4B638 80240BC8 2402000C */ addiu $v0, $zero, 0xc -/* B4B63C 80240BCC E600000C */ swc1 $f0, 0xc($s0) -/* B4B640 80240BD0 0809037A */ j .L80240DE8 -/* B4B644 80240BD4 AE620070 */ sw $v0, 0x70($s3) -.L80240BD8: -/* B4B648 80240BD8 8E620074 */ lw $v0, 0x74($s3) -/* B4B64C 80240BDC 2442FFFF */ addiu $v0, $v0, -1 -.L80240BE0: -/* B4B650 80240BE0 AE620074 */ sw $v0, 0x74($s3) -.L80240BE4: -/* B4B654 80240BE4 C6000018 */ lwc1 $f0, 0x18($s0) -/* B4B658 80240BE8 44801000 */ mtc1 $zero, $f2 -/* B4B65C 80240BEC 44801800 */ mtc1 $zero, $f3 -/* B4B660 80240BF0 46000021 */ cvt.d.s $f0, $f0 -/* B4B664 80240BF4 4620103C */ c.lt.d $f2, $f0 -/* B4B668 80240BF8 00000000 */ nop -/* B4B66C 80240BFC 45000025 */ bc1f .L80240C94 -/* B4B670 80240C00 27A5002C */ addiu $a1, $sp, 0x2c -/* B4B674 80240C04 C6000038 */ lwc1 $f0, 0x38($s0) -/* B4B678 80240C08 860200A6 */ lh $v0, 0xa6($s0) -/* B4B67C 80240C0C 3C018024 */ lui $at, 0x8024 -/* B4B680 80240C10 D4227A30 */ ldc1 $f2, 0x7a30($at) -/* B4B684 80240C14 27A60030 */ addiu $a2, $sp, 0x30 -/* B4B688 80240C18 E7A0002C */ swc1 $f0, 0x2c($sp) -/* B4B68C 80240C1C 44820000 */ mtc1 $v0, $f0 -/* B4B690 80240C20 00000000 */ nop -/* B4B694 80240C24 46800020 */ cvt.s.w $f0, $f0 -/* B4B698 80240C28 46000021 */ cvt.d.s $f0, $f0 -/* B4B69C 80240C2C C604003C */ lwc1 $f4, 0x3c($s0) -/* B4B6A0 80240C30 C6060040 */ lwc1 $f6, 0x40($s0) -/* B4B6A4 80240C34 C6080018 */ lwc1 $f8, 0x18($s0) -/* B4B6A8 80240C38 860200A8 */ lh $v0, 0xa8($s0) -/* B4B6AC 80240C3C 46220002 */ mul.d $f0, $f0, $f2 -/* B4B6B0 80240C40 00000000 */ nop -/* B4B6B4 80240C44 E7A40030 */ swc1 $f4, 0x30($sp) -/* B4B6B8 80240C48 E7A60034 */ swc1 $f6, 0x34($sp) -/* B4B6BC 80240C4C E7A80010 */ swc1 $f8, 0x10($sp) -/* B4B6C0 80240C50 C604000C */ lwc1 $f4, 0xc($s0) -/* B4B6C4 80240C54 44821000 */ mtc1 $v0, $f2 -/* B4B6C8 80240C58 00000000 */ nop -/* B4B6CC 80240C5C 468010A0 */ cvt.s.w $f2, $f2 -/* B4B6D0 80240C60 E7A20018 */ swc1 $f2, 0x18($sp) -/* B4B6D4 80240C64 E7A40014 */ swc1 $f4, 0x14($sp) -/* B4B6D8 80240C68 46200020 */ cvt.s.d $f0, $f0 -/* B4B6DC 80240C6C E7A0001C */ swc1 $f0, 0x1c($sp) -/* B4B6E0 80240C70 8E040080 */ lw $a0, 0x80($s0) -/* B4B6E4 80240C74 0C037711 */ jal func_800DDC44 -/* B4B6E8 80240C78 27A70034 */ addiu $a3, $sp, 0x34 -/* B4B6EC 80240C7C 54400005 */ bnel $v0, $zero, .L80240C94 -/* B4B6F0 80240C80 AE000018 */ sw $zero, 0x18($s0) -/* B4B6F4 80240C84 8E050018 */ lw $a1, 0x18($s0) -/* B4B6F8 80240C88 8E06000C */ lw $a2, 0xc($s0) -/* B4B6FC 80240C8C 0C00EA95 */ jal npc_move_heading -/* B4B700 80240C90 0200202D */ daddu $a0, $s0, $zero -.L80240C94: -/* B4B704 80240C94 C600001C */ lwc1 $f0, 0x1c($s0) -/* B4B708 80240C98 44801000 */ mtc1 $zero, $f2 -/* B4B70C 80240C9C 44801800 */ mtc1 $zero, $f3 -/* B4B710 80240CA0 46000021 */ cvt.d.s $f0, $f0 -/* B4B714 80240CA4 4622003C */ c.lt.d $f0, $f2 -/* B4B718 80240CA8 00000000 */ nop -/* B4B71C 80240CAC 45000047 */ bc1f .L80240DCC -/* B4B720 80240CB0 27A5002C */ addiu $a1, $sp, 0x2c -/* B4B724 80240CB4 27A60030 */ addiu $a2, $sp, 0x30 -/* B4B728 80240CB8 27A20038 */ addiu $v0, $sp, 0x38 -/* B4B72C 80240CBC C602003C */ lwc1 $f2, 0x3c($s0) -/* B4B730 80240CC0 C6060038 */ lwc1 $f6, 0x38($s0) -/* B4B734 80240CC4 3C01402A */ lui $at, 0x402a -/* B4B738 80240CC8 4481A800 */ mtc1 $at, $f21 -/* B4B73C 80240CCC 4480A000 */ mtc1 $zero, $f20 -/* B4B740 80240CD0 460010A1 */ cvt.d.s $f2, $f2 -/* B4B744 80240CD4 46341080 */ add.d $f2, $f2, $f20 -/* B4B748 80240CD8 C600001C */ lwc1 $f0, 0x1c($s0) -/* B4B74C 80240CDC C6040040 */ lwc1 $f4, 0x40($s0) -/* B4B750 80240CE0 46000005 */ abs.s $f0, $f0 -/* B4B754 80240CE4 E7A40034 */ swc1 $f4, 0x34($sp) -/* B4B758 80240CE8 3C014030 */ lui $at, 0x4030 -/* B4B75C 80240CEC 44812800 */ mtc1 $at, $f5 -/* B4B760 80240CF0 44802000 */ mtc1 $zero, $f4 -/* B4B764 80240CF4 46000021 */ cvt.d.s $f0, $f0 -/* B4B768 80240CF8 E7A6002C */ swc1 $f6, 0x2c($sp) -/* B4B76C 80240CFC 46240000 */ add.d $f0, $f0, $f4 -/* B4B770 80240D00 462010A0 */ cvt.s.d $f2, $f2 -/* B4B774 80240D04 E7A20030 */ swc1 $f2, 0x30($sp) -/* B4B778 80240D08 46200020 */ cvt.s.d $f0, $f0 -/* B4B77C 80240D0C E7A00038 */ swc1 $f0, 0x38($sp) -/* B4B780 80240D10 AFA20010 */ sw $v0, 0x10($sp) -/* B4B784 80240D14 8E040080 */ lw $a0, 0x80($s0) -/* B4B788 80240D18 0C0372DF */ jal func_800DCB7C -/* B4B78C 80240D1C 27A70034 */ addiu $a3, $sp, 0x34 -/* B4B790 80240D20 1040002A */ beqz $v0, .L80240DCC -/* B4B794 80240D24 00000000 */ nop -/* B4B798 80240D28 C600001C */ lwc1 $f0, 0x1c($s0) -/* B4B79C 80240D2C C7A20038 */ lwc1 $f2, 0x38($sp) -/* B4B7A0 80240D30 46000005 */ abs.s $f0, $f0 -/* B4B7A4 80240D34 46000021 */ cvt.d.s $f0, $f0 -/* B4B7A8 80240D38 46340000 */ add.d $f0, $f0, $f20 -/* B4B7AC 80240D3C 460010A1 */ cvt.d.s $f2, $f2 -/* B4B7B0 80240D40 4620103E */ c.le.d $f2, $f0 -/* B4B7B4 80240D44 00000000 */ nop -/* B4B7B8 80240D48 45000020 */ bc1f .L80240DCC -/* B4B7BC 80240D4C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B4B7C0 80240D50 C7A00030 */ lwc1 $f0, 0x30($sp) -/* B4B7C4 80240D54 8E020000 */ lw $v0, ($s0) -/* B4B7C8 80240D58 2403F7FF */ addiu $v1, $zero, -0x801 -/* B4B7CC 80240D5C AE00001C */ sw $zero, 0x1c($s0) -/* B4B7D0 80240D60 00431024 */ and $v0, $v0, $v1 -/* B4B7D4 80240D64 AE020000 */ sw $v0, ($s0) -/* B4B7D8 80240D68 24020002 */ addiu $v0, $zero, 2 -/* B4B7DC 80240D6C E600003C */ swc1 $f0, 0x3c($s0) -/* B4B7E0 80240D70 0C00A67F */ jal rand_int -/* B4B7E4 80240D74 AE620070 */ sw $v0, 0x70($s3) -/* B4B7E8 80240D78 3C035555 */ lui $v1, 0x5555 -/* B4B7EC 80240D7C 34635556 */ ori $v1, $v1, 0x5556 -/* B4B7F0 80240D80 00430018 */ mult $v0, $v1 -/* B4B7F4 80240D84 000227C3 */ sra $a0, $v0, 0x1f -/* B4B7F8 80240D88 00004010 */ mfhi $t0 -/* B4B7FC 80240D8C 01042023 */ subu $a0, $t0, $a0 -/* B4B800 80240D90 00041840 */ sll $v1, $a0, 1 -/* B4B804 80240D94 00641821 */ addu $v1, $v1, $a0 -/* B4B808 80240D98 00431023 */ subu $v0, $v0, $v1 -/* B4B80C 80240D9C 24430002 */ addiu $v1, $v0, 2 -/* B4B810 80240DA0 AE630074 */ sw $v1, 0x74($s3) -/* B4B814 80240DA4 8E82002C */ lw $v0, 0x2c($s4) -/* B4B818 80240DA8 5840000F */ blezl $v0, .L80240DE8 -/* B4B81C 80240DAC AE600070 */ sw $zero, 0x70($s3) -/* B4B820 80240DB0 8E820004 */ lw $v0, 4($s4) -/* B4B824 80240DB4 5840000C */ blezl $v0, .L80240DE8 -/* B4B828 80240DB8 AE600070 */ sw $zero, 0x70($s3) -/* B4B82C 80240DBC 1460000A */ bnez $v1, .L80240DE8 -/* B4B830 80240DC0 00000000 */ nop -/* B4B834 80240DC4 0809037A */ j .L80240DE8 -/* B4B838 80240DC8 AE600070 */ sw $zero, 0x70($s3) -.L80240DCC: -/* B4B83C 80240DCC C604003C */ lwc1 $f4, 0x3c($s0) -/* B4B840 80240DD0 C600001C */ lwc1 $f0, 0x1c($s0) -/* B4B844 80240DD4 46002100 */ add.s $f4, $f4, $f0 -/* B4B848 80240DD8 C6020014 */ lwc1 $f2, 0x14($s0) -/* B4B84C 80240DDC 46020001 */ sub.s $f0, $f0, $f2 -/* B4B850 80240DE0 E604003C */ swc1 $f4, 0x3c($s0) -/* B4B854 80240DE4 E600001C */ swc1 $f0, 0x1c($s0) -.L80240DE8: -/* B4B858 80240DE8 8FBF0054 */ lw $ra, 0x54($sp) -/* B4B85C 80240DEC 8FB40050 */ lw $s4, 0x50($sp) -/* B4B860 80240DF0 8FB3004C */ lw $s3, 0x4c($sp) -/* B4B864 80240DF4 8FB20048 */ lw $s2, 0x48($sp) -/* B4B868 80240DF8 8FB10044 */ lw $s1, 0x44($sp) -/* B4B86C 80240DFC 8FB00040 */ lw $s0, 0x40($sp) -/* B4B870 80240E00 D7B40058 */ ldc1 $f20, 0x58($sp) -/* B4B874 80240E04 03E00008 */ jr $ra -/* B4B878 80240E08 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_jan/jan_05/func_80240ECC_B4AA70.s b/asm/nonmatchings/world/area_jan/jan_05/func_80240ECC_B4AA70.s deleted file mode 100644 index b6b2027f12..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/func_80240ECC_B4AA70.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ECC_B4B93C -/* B4B93C 80240ECC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B4B940 80240ED0 AFB40040 */ sw $s4, 0x40($sp) -/* B4B944 80240ED4 0080A02D */ daddu $s4, $a0, $zero -/* B4B948 80240ED8 AFBF0044 */ sw $ra, 0x44($sp) -/* B4B94C 80240EDC AFB3003C */ sw $s3, 0x3c($sp) -/* B4B950 80240EE0 AFB20038 */ sw $s2, 0x38($sp) -/* B4B954 80240EE4 AFB10034 */ sw $s1, 0x34($sp) -/* B4B958 80240EE8 AFB00030 */ sw $s0, 0x30($sp) -/* B4B95C 80240EEC 8E920148 */ lw $s2, 0x148($s4) -/* B4B960 80240EF0 00A0882D */ daddu $s1, $a1, $zero -/* B4B964 80240EF4 86440008 */ lh $a0, 8($s2) -/* B4B968 80240EF8 0C00EABB */ jal get_npc_unsafe -/* B4B96C 80240EFC 00C0982D */ daddu $s3, $a2, $zero -/* B4B970 80240F00 8E230014 */ lw $v1, 0x14($s1) -/* B4B974 80240F04 0460002D */ bltz $v1, .L80240FBC -/* B4B978 80240F08 0040802D */ daddu $s0, $v0, $zero -/* B4B97C 80240F0C 0260202D */ daddu $a0, $s3, $zero -/* B4B980 80240F10 AFA00010 */ sw $zero, 0x10($sp) -/* B4B984 80240F14 8E260024 */ lw $a2, 0x24($s1) -/* B4B988 80240F18 8E270028 */ lw $a3, 0x28($s1) -/* B4B98C 80240F1C 0C01242D */ jal func_800490B4 -/* B4B990 80240F20 0240282D */ daddu $a1, $s2, $zero -/* B4B994 80240F24 10400025 */ beqz $v0, .L80240FBC -/* B4B998 80240F28 0000202D */ daddu $a0, $zero, $zero -/* B4B99C 80240F2C 0200282D */ daddu $a1, $s0, $zero -/* B4B9A0 80240F30 0000302D */ daddu $a2, $zero, $zero -/* B4B9A4 80240F34 860300A8 */ lh $v1, 0xa8($s0) -/* B4B9A8 80240F38 3C013F80 */ lui $at, 0x3f80 -/* B4B9AC 80240F3C 44810000 */ mtc1 $at, $f0 -/* B4B9B0 80240F40 3C014000 */ lui $at, 0x4000 -/* B4B9B4 80240F44 44811000 */ mtc1 $at, $f2 -/* B4B9B8 80240F48 3C01C1A0 */ lui $at, 0xc1a0 -/* B4B9BC 80240F4C 44812000 */ mtc1 $at, $f4 -/* B4B9C0 80240F50 2402000F */ addiu $v0, $zero, 0xf -/* B4B9C4 80240F54 AFA2001C */ sw $v0, 0x1c($sp) -/* B4B9C8 80240F58 44833000 */ mtc1 $v1, $f6 -/* B4B9CC 80240F5C 00000000 */ nop -/* B4B9D0 80240F60 468031A0 */ cvt.s.w $f6, $f6 -/* B4B9D4 80240F64 44073000 */ mfc1 $a3, $f6 -/* B4B9D8 80240F68 27A20028 */ addiu $v0, $sp, 0x28 -/* B4B9DC 80240F6C AFA20020 */ sw $v0, 0x20($sp) -/* B4B9E0 80240F70 E7A00010 */ swc1 $f0, 0x10($sp) -/* B4B9E4 80240F74 E7A20014 */ swc1 $f2, 0x14($sp) -/* B4B9E8 80240F78 0C01BFA4 */ jal fx_emote -/* B4B9EC 80240F7C E7A40018 */ swc1 $f4, 0x18($sp) -/* B4B9F0 80240F80 0200202D */ daddu $a0, $s0, $zero -/* B4B9F4 80240F84 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B4B9F8 80240F88 0C012530 */ jal func_800494C0 -/* B4B9FC 80240F8C 3C060020 */ lui $a2, 0x20 -/* B4BA00 80240F90 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B4BA04 80240F94 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B4BA08 80240F98 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B4BA0C 80240F9C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B4BA10 80240FA0 8C460028 */ lw $a2, 0x28($v0) -/* B4BA14 80240FA4 0C00A720 */ jal atan2 -/* B4BA18 80240FA8 8C470030 */ lw $a3, 0x30($v0) -/* B4BA1C 80240FAC 2402000C */ addiu $v0, $zero, 0xc -/* B4BA20 80240FB0 E600000C */ swc1 $f0, 0xc($s0) -/* B4BA24 80240FB4 08090414 */ j .L80241050 -/* B4BA28 80240FB8 AE820070 */ sw $v0, 0x70($s4) -.L80240FBC: -/* B4BA2C 80240FBC 8602008C */ lh $v0, 0x8c($s0) -/* B4BA30 80240FC0 14400023 */ bnez $v0, .L80241050 -/* B4BA34 80240FC4 00000000 */ nop -/* B4BA38 80240FC8 9602008E */ lhu $v0, 0x8e($s0) -/* B4BA3C 80240FCC 2442FFFF */ addiu $v0, $v0, -1 -/* B4BA40 80240FD0 A602008E */ sh $v0, 0x8e($s0) -/* B4BA44 80240FD4 00021400 */ sll $v0, $v0, 0x10 -/* B4BA48 80240FD8 1C40001D */ bgtz $v0, .L80241050 -/* B4BA4C 80240FDC 00000000 */ nop -/* B4BA50 80240FE0 8E820074 */ lw $v0, 0x74($s4) -/* B4BA54 80240FE4 2442FFFF */ addiu $v0, $v0, -1 -/* B4BA58 80240FE8 18400018 */ blez $v0, .L8024104C -/* B4BA5C 80240FEC AE820074 */ sw $v0, 0x74($s4) -/* B4BA60 80240FF0 C600000C */ lwc1 $f0, 0xc($s0) -/* B4BA64 80240FF4 3C014334 */ lui $at, 0x4334 -/* B4BA68 80240FF8 44816000 */ mtc1 $at, $f12 -/* B4BA6C 80240FFC 0C00A6C9 */ jal clamp_angle -/* B4BA70 80241000 460C0300 */ add.s $f12, $f0, $f12 -/* B4BA74 80241004 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B4BA78 80241008 0C00A67F */ jal rand_int -/* B4BA7C 8024100C E600000C */ swc1 $f0, 0xc($s0) -/* B4BA80 80241010 3C032E8B */ lui $v1, 0x2e8b -/* B4BA84 80241014 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* B4BA88 80241018 00430018 */ mult $v0, $v1 -/* B4BA8C 8024101C 00021FC3 */ sra $v1, $v0, 0x1f -/* B4BA90 80241020 00004010 */ mfhi $t0 -/* B4BA94 80241024 00082043 */ sra $a0, $t0, 1 -/* B4BA98 80241028 00832023 */ subu $a0, $a0, $v1 -/* B4BA9C 8024102C 00041840 */ sll $v1, $a0, 1 -/* B4BAA0 80241030 00641821 */ addu $v1, $v1, $a0 -/* B4BAA4 80241034 00031880 */ sll $v1, $v1, 2 -/* B4BAA8 80241038 00641823 */ subu $v1, $v1, $a0 -/* B4BAAC 8024103C 00431023 */ subu $v0, $v0, $v1 -/* B4BAB0 80241040 24420005 */ addiu $v0, $v0, 5 -/* B4BAB4 80241044 08090414 */ j .L80241050 -/* B4BAB8 80241048 A602008E */ sh $v0, 0x8e($s0) -.L8024104C: -/* B4BABC 8024104C AE800070 */ sw $zero, 0x70($s4) -.L80241050: -/* B4BAC0 80241050 8FBF0044 */ lw $ra, 0x44($sp) -/* B4BAC4 80241054 8FB40040 */ lw $s4, 0x40($sp) -/* B4BAC8 80241058 8FB3003C */ lw $s3, 0x3c($sp) -/* B4BACC 8024105C 8FB20038 */ lw $s2, 0x38($sp) -/* B4BAD0 80241060 8FB10034 */ lw $s1, 0x34($sp) -/* B4BAD4 80241064 8FB00030 */ lw $s0, 0x30($sp) -/* B4BAD8 80241068 03E00008 */ jr $ra -/* B4BADC 8024106C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_05/func_80241494_B4AA70.s b/asm/nonmatchings/world/area_jan/jan_05/func_80241494_B4AA70.s deleted file mode 100644 index 6fbd08fe3d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/func_80241494_B4AA70.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241494_B4BF04 -/* B4BF04 80241494 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B4BF08 80241498 AFB3003C */ sw $s3, 0x3c($sp) -/* B4BF0C 8024149C 0080982D */ daddu $s3, $a0, $zero -/* B4BF10 802414A0 AFBF0048 */ sw $ra, 0x48($sp) -/* B4BF14 802414A4 AFB50044 */ sw $s5, 0x44($sp) -/* B4BF18 802414A8 AFB40040 */ sw $s4, 0x40($sp) -/* B4BF1C 802414AC AFB20038 */ sw $s2, 0x38($sp) -/* B4BF20 802414B0 AFB10034 */ sw $s1, 0x34($sp) -/* B4BF24 802414B4 AFB00030 */ sw $s0, 0x30($sp) -/* B4BF28 802414B8 8E720148 */ lw $s2, 0x148($s3) -/* B4BF2C 802414BC 86440008 */ lh $a0, 8($s2) -/* B4BF30 802414C0 8E70000C */ lw $s0, 0xc($s3) -/* B4BF34 802414C4 0C00EABB */ jal get_npc_unsafe -/* B4BF38 802414C8 00A0882D */ daddu $s1, $a1, $zero -/* B4BF3C 802414CC 8E050000 */ lw $a1, ($s0) -/* B4BF40 802414D0 26100004 */ addiu $s0, $s0, 4 -/* B4BF44 802414D4 0260202D */ daddu $a0, $s3, $zero -/* B4BF48 802414D8 0C0B1EAF */ jal get_variable -/* B4BF4C 802414DC 0040A82D */ daddu $s5, $v0, $zero -/* B4BF50 802414E0 0260202D */ daddu $a0, $s3, $zero -/* B4BF54 802414E4 8E050000 */ lw $a1, ($s0) -/* B4BF58 802414E8 0C0B1EAF */ jal get_variable -/* B4BF5C 802414EC 0040A02D */ daddu $s4, $v0, $zero -/* B4BF60 802414F0 AE420094 */ sw $v0, 0x94($s2) -/* B4BF64 802414F4 AFA00010 */ sw $zero, 0x10($sp) -/* B4BF68 802414F8 8E4200D0 */ lw $v0, 0xd0($s2) -/* B4BF6C 802414FC 8C420030 */ lw $v0, 0x30($v0) -/* B4BF70 80241500 AFA20014 */ sw $v0, 0x14($sp) -/* B4BF74 80241504 8E4200D0 */ lw $v0, 0xd0($s2) -/* B4BF78 80241508 8C42001C */ lw $v0, 0x1c($v0) -/* B4BF7C 8024150C AFA20018 */ sw $v0, 0x18($sp) -/* B4BF80 80241510 8E4200D0 */ lw $v0, 0xd0($s2) -/* B4BF84 80241514 8C420024 */ lw $v0, 0x24($v0) -/* B4BF88 80241518 AFA2001C */ sw $v0, 0x1c($sp) -/* B4BF8C 8024151C 8E4200D0 */ lw $v0, 0xd0($s2) -/* B4BF90 80241520 8C420028 */ lw $v0, 0x28($v0) -/* B4BF94 80241524 AFA20020 */ sw $v0, 0x20($sp) -/* B4BF98 80241528 8E4200D0 */ lw $v0, 0xd0($s2) -/* B4BF9C 8024152C 3C0142C8 */ lui $at, 0x42c8 -/* B4BFA0 80241530 44810000 */ mtc1 $at, $f0 -/* B4BFA4 80241534 8C42002C */ lw $v0, 0x2c($v0) -/* B4BFA8 80241538 27B00010 */ addiu $s0, $sp, 0x10 -/* B4BFAC 8024153C E7A00028 */ swc1 $f0, 0x28($sp) -/* B4BFB0 80241540 A7A0002C */ sh $zero, 0x2c($sp) -/* B4BFB4 80241544 12200019 */ beqz $s1, .L802415AC -/* B4BFB8 80241548 AFA20024 */ sw $v0, 0x24($sp) -/* B4BFBC 8024154C AE600070 */ sw $zero, 0x70($s3) -/* B4BFC0 80241550 A6A0008E */ sh $zero, 0x8e($s5) -/* B4BFC4 80241554 AE600074 */ sw $zero, 0x74($s3) -/* B4BFC8 80241558 8EA20000 */ lw $v0, ($s5) -/* B4BFCC 8024155C 2403F7FF */ addiu $v1, $zero, -0x801 -/* B4BFD0 80241560 00431024 */ and $v0, $v0, $v1 -/* B4BFD4 80241564 2403FDFF */ addiu $v1, $zero, -0x201 -/* B4BFD8 80241568 00431024 */ and $v0, $v0, $v1 -/* B4BFDC 8024156C 34420008 */ ori $v0, $v0, 8 -/* B4BFE0 80241570 AEA20000 */ sw $v0, ($s5) -/* B4BFE4 80241574 8E4200B0 */ lw $v0, 0xb0($s2) -/* B4BFE8 80241578 34420018 */ ori $v0, $v0, 0x18 -/* B4BFEC 8024157C AE4200B0 */ sw $v0, 0xb0($s2) -/* B4BFF0 80241580 8E420000 */ lw $v0, ($s2) -/* B4BFF4 80241584 3C034000 */ lui $v1, 0x4000 -/* B4BFF8 80241588 00431024 */ and $v0, $v0, $v1 -/* B4BFFC 8024158C 10400007 */ beqz $v0, .L802415AC -/* B4C000 80241590 3C03BFFF */ lui $v1, 0xbfff -/* B4C004 80241594 2402000C */ addiu $v0, $zero, 0xc -/* B4C008 80241598 AE620070 */ sw $v0, 0x70($s3) -/* B4C00C 8024159C 8E420000 */ lw $v0, ($s2) -/* B4C010 802415A0 3463FFFF */ ori $v1, $v1, 0xffff -/* B4C014 802415A4 00431024 */ and $v0, $v0, $v1 -/* B4C018 802415A8 AE420000 */ sw $v0, ($s2) -.L802415AC: -/* B4C01C 802415AC 8E4300B0 */ lw $v1, 0xb0($s2) -/* B4C020 802415B0 30620004 */ andi $v0, $v1, 4 -/* B4C024 802415B4 10400007 */ beqz $v0, .L802415D4 -/* B4C028 802415B8 00000000 */ nop -/* B4C02C 802415BC 824200B4 */ lb $v0, 0xb4($s2) -/* B4C030 802415C0 14400034 */ bnez $v0, .L80241694 -/* B4C034 802415C4 0000102D */ daddu $v0, $zero, $zero -/* B4C038 802415C8 2402FFFB */ addiu $v0, $zero, -5 -/* B4C03C 802415CC 00621024 */ and $v0, $v1, $v0 -/* B4C040 802415D0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802415D4: -/* B4C044 802415D4 8E630070 */ lw $v1, 0x70($s3) -/* B4C048 802415D8 2C62000F */ sltiu $v0, $v1, 0xf -/* B4C04C 802415DC 1040002C */ beqz $v0, .L80241690 -/* B4C050 802415E0 00031080 */ sll $v0, $v1, 2 -/* B4C054 802415E4 3C018024 */ lui $at, 0x8024 -/* B4C058 802415E8 00220821 */ addu $at, $at, $v0 -/* B4C05C 802415EC 8C227A38 */ lw $v0, 0x7a38($at) -/* B4C060 802415F0 00400008 */ jr $v0 -/* B4C064 802415F4 00000000 */ nop -/* B4C068 802415F8 0260202D */ daddu $a0, $s3, $zero -/* B4C06C 802415FC 0280282D */ daddu $a1, $s4, $zero -/* B4C070 80241600 0C090229 */ jal func_802408A4 -/* B4C074 80241604 0200302D */ daddu $a2, $s0, $zero -/* B4C078 80241608 0260202D */ daddu $a0, $s3, $zero -/* B4C07C 8024160C 0280282D */ daddu $a1, $s4, $zero -/* B4C080 80241610 0C0902B5 */ jal func_80240AD4 -/* B4C084 80241614 0200302D */ daddu $a2, $s0, $zero -/* B4C088 80241618 080905A5 */ j .L80241694 -/* B4C08C 8024161C 0000102D */ daddu $v0, $zero, $zero -/* B4C090 80241620 0260202D */ daddu $a0, $s3, $zero -/* B4C094 80241624 0280282D */ daddu $a1, $s4, $zero -/* B4C098 80241628 0C090383 */ jal func_80240E0C -/* B4C09C 8024162C 0200302D */ daddu $a2, $s0, $zero -/* B4C0A0 80241630 8E630070 */ lw $v1, 0x70($s3) -/* B4C0A4 80241634 24020003 */ addiu $v0, $zero, 3 -/* B4C0A8 80241638 14620016 */ bne $v1, $v0, .L80241694 -/* B4C0AC 8024163C 0000102D */ daddu $v0, $zero, $zero -/* B4C0B0 80241640 0260202D */ daddu $a0, $s3, $zero -/* B4C0B4 80241644 0280282D */ daddu $a1, $s4, $zero -/* B4C0B8 80241648 0C0903B3 */ jal func_80240ECC -/* B4C0BC 8024164C 0200302D */ daddu $a2, $s0, $zero -/* B4C0C0 80241650 080905A5 */ j .L80241694 -/* B4C0C4 80241654 0000102D */ daddu $v0, $zero, $zero -/* B4C0C8 80241658 0260202D */ daddu $a0, $s3, $zero -/* B4C0CC 8024165C 0280282D */ daddu $a1, $s4, $zero -/* B4C0D0 80241660 0C09041C */ jal func_80241070 -/* B4C0D4 80241664 0200302D */ daddu $a2, $s0, $zero -/* B4C0D8 80241668 0260202D */ daddu $a0, $s3, $zero -/* B4C0DC 8024166C 0280282D */ daddu $a1, $s4, $zero -/* B4C0E0 80241670 0C090454 */ jal func_80241150 -/* B4C0E4 80241674 0200302D */ daddu $a2, $s0, $zero -/* B4C0E8 80241678 080905A5 */ j .L80241694 -/* B4C0EC 8024167C 0000102D */ daddu $v0, $zero, $zero -/* B4C0F0 80241680 0260202D */ daddu $a0, $s3, $zero -/* B4C0F4 80241684 0280282D */ daddu $a1, $s4, $zero -/* B4C0F8 80241688 0C090514 */ jal func_80241450 -/* B4C0FC 8024168C 0200302D */ daddu $a2, $s0, $zero -.L80241690: -/* B4C100 80241690 0000102D */ daddu $v0, $zero, $zero -.L80241694: -/* B4C104 80241694 8FBF0048 */ lw $ra, 0x48($sp) -/* B4C108 80241698 8FB50044 */ lw $s5, 0x44($sp) -/* B4C10C 8024169C 8FB40040 */ lw $s4, 0x40($sp) -/* B4C110 802416A0 8FB3003C */ lw $s3, 0x3c($sp) -/* B4C114 802416A4 8FB20038 */ lw $s2, 0x38($sp) -/* B4C118 802416A8 8FB10034 */ lw $s1, 0x34($sp) -/* B4C11C 802416AC 8FB00030 */ lw $s0, 0x30($sp) -/* B4C120 802416B0 03E00008 */ jr $ra -/* B4C124 802416B4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_05/func_80241708_B4AA70.s b/asm/nonmatchings/world/area_jan/jan_05/func_80241708_B4AA70.s deleted file mode 100644 index 3389478de9..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/func_80241708_B4AA70.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241708_B4C178 -/* B4C178 80241708 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B4C17C 8024170C AFB20028 */ sw $s2, 0x28($sp) -/* B4C180 80241710 0080902D */ daddu $s2, $a0, $zero -/* B4C184 80241714 AFBF002C */ sw $ra, 0x2c($sp) -/* B4C188 80241718 AFB10024 */ sw $s1, 0x24($sp) -/* B4C18C 8024171C AFB00020 */ sw $s0, 0x20($sp) -/* B4C190 80241720 8E500148 */ lw $s0, 0x148($s2) -/* B4C194 80241724 0C00EABB */ jal get_npc_unsafe -/* B4C198 80241728 86040008 */ lh $a0, 8($s0) -/* B4C19C 8024172C 8E03006C */ lw $v1, 0x6c($s0) -/* B4C1A0 80241730 1460000B */ bnez $v1, .L80241760 -/* B4C1A4 80241734 0040882D */ daddu $s1, $v0, $zero -/* B4C1A8 80241738 0C00A67F */ jal rand_int -/* B4C1AC 8024173C 24040064 */ addiu $a0, $zero, 0x64 -/* B4C1B0 80241740 28420032 */ slti $v0, $v0, 0x32 -/* B4C1B4 80241744 14400002 */ bnez $v0, .L80241750 -/* B4C1B8 80241748 24020001 */ addiu $v0, $zero, 1 -/* B4C1BC 8024174C 24020003 */ addiu $v0, $zero, 3 -.L80241750: -/* B4C1C0 80241750 AE02006C */ sw $v0, 0x6c($s0) -/* B4C1C4 80241754 3C054387 */ lui $a1, 0x4387 -/* B4C1C8 80241758 0C00ECD0 */ jal set_npc_yaw -/* B4C1CC 8024175C 0220202D */ daddu $a0, $s1, $zero -.L80241760: -/* B4C1D0 80241760 8E02006C */ lw $v0, 0x6c($s0) -/* B4C1D4 80241764 2443FFFF */ addiu $v1, $v0, -1 -/* B4C1D8 80241768 2C620006 */ sltiu $v0, $v1, 6 -/* B4C1DC 8024176C 1040004D */ beqz $v0, .L802418A4 -/* B4C1E0 80241770 00031080 */ sll $v0, $v1, 2 -/* B4C1E4 80241774 3C018024 */ lui $at, 0x8024 -/* B4C1E8 80241778 00220821 */ addu $at, $at, $v0 -/* B4C1EC 8024177C 8C227A78 */ lw $v0, 0x7a78($at) -/* B4C1F0 80241780 00400008 */ jr $v0 -/* B4C1F4 80241784 00000000 */ nop -/* B4C1F8 80241788 3C030042 */ lui $v1, 0x42 -/* B4C1FC 8024178C 3463000F */ ori $v1, $v1, 0xf -/* B4C200 80241790 24020002 */ addiu $v0, $zero, 2 -/* B4C204 80241794 AE02006C */ sw $v0, 0x6c($s0) -/* B4C208 80241798 AE000070 */ sw $zero, 0x70($s0) -/* B4C20C 8024179C AE230028 */ sw $v1, 0x28($s1) -/* B4C210 802417A0 8E020070 */ lw $v0, 0x70($s0) -/* B4C214 802417A4 24420001 */ addiu $v0, $v0, 1 -/* B4C218 802417A8 AE020070 */ sw $v0, 0x70($s0) -/* B4C21C 802417AC 28420033 */ slti $v0, $v0, 0x33 -/* B4C220 802417B0 1440003C */ bnez $v0, .L802418A4 -/* B4C224 802417B4 24020005 */ addiu $v0, $zero, 5 -/* B4C228 802417B8 08090629 */ j .L802418A4 -/* B4C22C 802417BC AE02006C */ sw $v0, 0x6c($s0) -/* B4C230 802417C0 3C030042 */ lui $v1, 0x42 -/* B4C234 802417C4 34630010 */ ori $v1, $v1, 0x10 -/* B4C238 802417C8 24020004 */ addiu $v0, $zero, 4 -/* B4C23C 802417CC AE02006C */ sw $v0, 0x6c($s0) -/* B4C240 802417D0 AE000070 */ sw $zero, 0x70($s0) -/* B4C244 802417D4 AE230028 */ sw $v1, 0x28($s1) -/* B4C248 802417D8 8E020070 */ lw $v0, 0x70($s0) -/* B4C24C 802417DC 24030019 */ addiu $v1, $zero, 0x19 -/* B4C250 802417E0 24420001 */ addiu $v0, $v0, 1 -/* B4C254 802417E4 14430005 */ bne $v0, $v1, .L802417FC -/* B4C258 802417E8 AE020070 */ sw $v0, 0x70($s0) -/* B4C25C 802417EC 3C0142B4 */ lui $at, 0x42b4 -/* B4C260 802417F0 44810000 */ mtc1 $at, $f0 -/* B4C264 802417F4 00000000 */ nop -/* B4C268 802417F8 E620000C */ swc1 $f0, 0xc($s1) -.L802417FC: -/* B4C26C 802417FC 8E020070 */ lw $v0, 0x70($s0) -/* B4C270 80241800 2842003D */ slti $v0, $v0, 0x3d -/* B4C274 80241804 14400027 */ bnez $v0, .L802418A4 -/* B4C278 80241808 24020005 */ addiu $v0, $zero, 5 -/* B4C27C 8024180C 08090629 */ j .L802418A4 -/* B4C280 80241810 AE02006C */ sw $v0, 0x6c($s0) -/* B4C284 80241814 3C030042 */ lui $v1, 0x42 -/* B4C288 80241818 24020006 */ addiu $v0, $zero, 6 -/* B4C28C 8024181C 34630003 */ ori $v1, $v1, 3 -/* B4C290 80241820 AE02006C */ sw $v0, 0x6c($s0) -/* B4C294 80241824 AE000070 */ sw $zero, 0x70($s0) -/* B4C298 80241828 862400A8 */ lh $a0, 0xa8($s1) -/* B4C29C 8024182C 2402000A */ addiu $v0, $zero, 0xa -/* B4C2A0 80241830 AE230028 */ sw $v1, 0x28($s1) -/* B4C2A4 80241834 AFA00014 */ sw $zero, 0x14($sp) -/* B4C2A8 80241838 AFA20018 */ sw $v0, 0x18($sp) -/* B4C2AC 8024183C 44840000 */ mtc1 $a0, $f0 -/* B4C2B0 80241840 00000000 */ nop -/* B4C2B4 80241844 46800020 */ cvt.s.w $f0, $f0 -/* B4C2B8 80241848 E7A00010 */ swc1 $f0, 0x10($sp) -/* B4C2BC 8024184C 8E250038 */ lw $a1, 0x38($s1) -/* B4C2C0 80241850 8E26003C */ lw $a2, 0x3c($s1) -/* B4C2C4 80241854 8E270040 */ lw $a3, 0x40($s1) -/* B4C2C8 80241858 0C01C1E4 */ jal fx_sweat -/* B4C2CC 8024185C 0000202D */ daddu $a0, $zero, $zero -/* B4C2D0 80241860 8E020070 */ lw $v0, 0x70($s0) -/* B4C2D4 80241864 24420001 */ addiu $v0, $v0, 1 -/* B4C2D8 80241868 AE020070 */ sw $v0, 0x70($s0) -/* B4C2DC 8024186C 2842000B */ slti $v0, $v0, 0xb -/* B4C2E0 80241870 1440000C */ bnez $v0, .L802418A4 -/* B4C2E4 80241874 00000000 */ nop -/* B4C2E8 80241878 0C00A67F */ jal rand_int -/* B4C2EC 8024187C 24040064 */ addiu $a0, $zero, 0x64 -/* B4C2F0 80241880 0040182D */ daddu $v1, $v0, $zero -/* B4C2F4 80241884 2862005A */ slti $v0, $v1, 0x5a -/* B4C2F8 80241888 14400005 */ bnez $v0, .L802418A0 -/* B4C2FC 8024188C 24020007 */ addiu $v0, $zero, 7 -/* B4C300 80241890 2862005F */ slti $v0, $v1, 0x5f -/* B4C304 80241894 14400002 */ bnez $v0, .L802418A0 -/* B4C308 80241898 24020001 */ addiu $v0, $zero, 1 -/* B4C30C 8024189C 24020003 */ addiu $v0, $zero, 3 -.L802418A0: -/* B4C310 802418A0 AE02006C */ sw $v0, 0x6c($s0) -.L802418A4: -/* B4C314 802418A4 8E03006C */ lw $v1, 0x6c($s0) -/* B4C318 802418A8 24020007 */ addiu $v0, $zero, 7 -/* B4C31C 802418AC 50620001 */ beql $v1, $v0, .L802418B4 -/* B4C320 802418B0 AE400070 */ sw $zero, 0x70($s2) -.L802418B4: -/* B4C324 802418B4 8FBF002C */ lw $ra, 0x2c($sp) -/* B4C328 802418B8 8FB20028 */ lw $s2, 0x28($sp) -/* B4C32C 802418BC 8FB10024 */ lw $s1, 0x24($sp) -/* B4C330 802418C0 8FB00020 */ lw $s0, 0x20($sp) -/* B4C334 802418C4 03E00008 */ jr $ra -/* B4C338 802418C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_05/func_802418CC_B4AA70.s b/asm/nonmatchings/world/area_jan/jan_05/func_802418CC_B4AA70.s deleted file mode 100644 index 5484829d2f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/func_802418CC_B4AA70.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418CC_B4C33C -/* B4C33C 802418CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B4C340 802418D0 AFB10014 */ sw $s1, 0x14($sp) -/* B4C344 802418D4 0080882D */ daddu $s1, $a0, $zero -/* B4C348 802418D8 AFBF0018 */ sw $ra, 0x18($sp) -/* B4C34C 802418DC AFB00010 */ sw $s0, 0x10($sp) -/* B4C350 802418E0 8E300148 */ lw $s0, 0x148($s1) -/* B4C354 802418E4 0C00EABB */ jal get_npc_unsafe -/* B4C358 802418E8 86040008 */ lh $a0, 8($s0) -/* B4C35C 802418EC 24030001 */ addiu $v1, $zero, 1 -/* B4C360 802418F0 0040202D */ daddu $a0, $v0, $zero -/* B4C364 802418F4 AE03006C */ sw $v1, 0x6c($s0) -/* B4C368 802418F8 8482008C */ lh $v0, 0x8c($a0) -/* B4C36C 802418FC 14400009 */ bnez $v0, .L80241924 -/* B4C370 80241900 24020002 */ addiu $v0, $zero, 2 -/* B4C374 80241904 96030072 */ lhu $v1, 0x72($s0) -/* B4C378 80241908 AE02006C */ sw $v0, 0x6c($s0) -/* B4C37C 8024190C A483008E */ sh $v1, 0x8e($a0) -/* B4C380 80241910 8E0200CC */ lw $v0, 0xcc($s0) -/* B4C384 80241914 8C420020 */ lw $v0, 0x20($v0) -/* B4C388 80241918 AC820028 */ sw $v0, 0x28($a0) -/* B4C38C 8024191C 2402001F */ addiu $v0, $zero, 0x1f -/* B4C390 80241920 AE220070 */ sw $v0, 0x70($s1) -.L80241924: -/* B4C394 80241924 8FBF0018 */ lw $ra, 0x18($sp) -/* B4C398 80241928 8FB10014 */ lw $s1, 0x14($sp) -/* B4C39C 8024192C 8FB00010 */ lw $s0, 0x10($sp) -/* B4C3A0 80241930 03E00008 */ jr $ra -/* B4C3A4 80241934 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_05/func_80241C88_B4AA70.s b/asm/nonmatchings/world/area_jan/jan_05/func_80241C88_B4AA70.s deleted file mode 100644 index 0bab27e883..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/func_80241C88_B4AA70.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C88_B4C6F8 -/* B4C6F8 80241C88 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B4C6FC 80241C8C AFB40028 */ sw $s4, 0x28($sp) -/* B4C700 80241C90 0080A02D */ daddu $s4, $a0, $zero -/* B4C704 80241C94 AFBF002C */ sw $ra, 0x2c($sp) -/* B4C708 80241C98 AFB30024 */ sw $s3, 0x24($sp) -/* B4C70C 80241C9C AFB20020 */ sw $s2, 0x20($sp) -/* B4C710 80241CA0 AFB1001C */ sw $s1, 0x1c($sp) -/* B4C714 80241CA4 AFB00018 */ sw $s0, 0x18($sp) -/* B4C718 80241CA8 8E910148 */ lw $s1, 0x148($s4) -/* B4C71C 80241CAC 86240008 */ lh $a0, 8($s1) -/* B4C720 80241CB0 0C00EABB */ jal get_npc_unsafe -/* B4C724 80241CB4 00A0802D */ daddu $s0, $a1, $zero -/* B4C728 80241CB8 16000005 */ bnez $s0, .L80241CD0 -/* B4C72C 80241CBC 0040902D */ daddu $s2, $v0, $zero -/* B4C730 80241CC0 8E2200B0 */ lw $v0, 0xb0($s1) -/* B4C734 80241CC4 30420004 */ andi $v0, $v0, 4 -/* B4C738 80241CC8 10400015 */ beqz $v0, .L80241D20 -/* B4C73C 80241CCC 00000000 */ nop -.L80241CD0: -/* B4C740 80241CD0 AE800070 */ sw $zero, 0x70($s4) -/* B4C744 80241CD4 8E420000 */ lw $v0, ($s2) -/* B4C748 80241CD8 3C031F30 */ lui $v1, 0x1f30 -/* B4C74C 80241CDC A640008E */ sh $zero, 0x8e($s2) -/* B4C750 80241CE0 34420102 */ ori $v0, $v0, 0x102 -/* B4C754 80241CE4 AE420000 */ sw $v0, ($s2) -/* B4C758 80241CE8 8E220000 */ lw $v0, ($s1) -/* B4C75C 80241CEC 3C01C47A */ lui $at, 0xc47a -/* B4C760 80241CF0 44810000 */ mtc1 $at, $f0 -/* B4C764 80241CF4 00431025 */ or $v0, $v0, $v1 -/* B4C768 80241CF8 AE220000 */ sw $v0, ($s1) -/* B4C76C 80241CFC AE400038 */ sw $zero, 0x38($s2) -/* B4C770 80241D00 E640003C */ swc1 $f0, 0x3c($s2) -/* B4C774 80241D04 AE400040 */ sw $zero, 0x40($s2) -/* B4C778 80241D08 8E2300B0 */ lw $v1, 0xb0($s1) -/* B4C77C 80241D0C 30620004 */ andi $v0, $v1, 4 -/* B4C780 80241D10 10400003 */ beqz $v0, .L80241D20 -/* B4C784 80241D14 2402FFFB */ addiu $v0, $zero, -5 -/* B4C788 80241D18 00621024 */ and $v0, $v1, $v0 -/* B4C78C 80241D1C AE2200B0 */ sw $v0, 0xb0($s1) -.L80241D20: -/* B4C790 80241D20 8E930070 */ lw $s3, 0x70($s4) -/* B4C794 80241D24 12600005 */ beqz $s3, .L80241D3C -/* B4C798 80241D28 24020001 */ addiu $v0, $zero, 1 -/* B4C79C 80241D2C 12620048 */ beq $s3, $v0, .L80241E50 -/* B4C7A0 80241D30 00000000 */ nop -/* B4C7A4 80241D34 080907B1 */ j .L80241EC4 -/* B4C7A8 80241D38 00000000 */ nop -.L80241D3C: -/* B4C7AC 80241D3C 86240008 */ lh $a0, 8($s1) -/* B4C7B0 80241D40 0C00FB3A */ jal get_enemy -/* B4C7B4 80241D44 2484FFFF */ addiu $a0, $a0, -1 -/* B4C7B8 80241D48 0040802D */ daddu $s0, $v0, $zero -/* B4C7BC 80241D4C 0C00EABB */ jal get_npc_unsafe -/* B4C7C0 80241D50 86040008 */ lh $a0, 8($s0) -/* B4C7C4 80241D54 24030001 */ addiu $v1, $zero, 1 -/* B4C7C8 80241D58 0040982D */ daddu $s3, $v0, $zero -/* B4C7CC 80241D5C A2230007 */ sb $v1, 7($s1) -/* B4C7D0 80241D60 8E03006C */ lw $v1, 0x6c($s0) -/* B4C7D4 80241D64 24020003 */ addiu $v0, $zero, 3 -/* B4C7D8 80241D68 14620056 */ bne $v1, $v0, .L80241EC4 -/* B4C7DC 80241D6C 00000000 */ nop -/* B4C7E0 80241D70 8E2500A8 */ lw $a1, 0xa8($s1) -/* B4C7E4 80241D74 10A00003 */ beqz $a1, .L80241D84 -/* B4C7E8 80241D78 0260202D */ daddu $a0, $s3, $zero -/* B4C7EC 80241D7C 0C012530 */ jal func_800494C0 -/* B4C7F0 80241D80 0000302D */ daddu $a2, $zero, $zero -.L80241D84: -/* B4C7F4 80241D84 27A40010 */ addiu $a0, $sp, 0x10 -/* B4C7F8 80241D88 C6280070 */ lwc1 $f8, 0x70($s1) -/* B4C7FC 80241D8C 46804220 */ cvt.s.w $f8, $f8 -/* B4C800 80241D90 C6620034 */ lwc1 $f2, 0x34($s3) -/* B4C804 80241D94 3C014387 */ lui $at, 0x4387 -/* B4C808 80241D98 44810000 */ mtc1 $at, $f0 -/* B4C80C 80241D9C 44064000 */ mfc1 $a2, $f8 -/* B4C810 80241DA0 46020001 */ sub.s $f0, $f0, $f2 -/* B4C814 80241DA4 C6660038 */ lwc1 $f6, 0x38($s3) -/* B4C818 80241DA8 C6640040 */ lwc1 $f4, 0x40($s3) -/* B4C81C 80241DAC 44070000 */ mfc1 $a3, $f0 -/* B4C820 80241DB0 27A50014 */ addiu $a1, $sp, 0x14 -/* B4C824 80241DB4 E7A60010 */ swc1 $f6, 0x10($sp) -/* B4C828 80241DB8 0C00A7E7 */ jal add_vec2D_polar -/* B4C82C 80241DBC E7A40014 */ swc1 $f4, 0x14($sp) -/* B4C830 80241DC0 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B4C834 80241DC4 4600020D */ trunc.w.s $f8, $f0 -/* B4C838 80241DC8 44024000 */ mfc1 $v0, $f8 -/* B4C83C 80241DCC E6400038 */ swc1 $f0, 0x38($s2) -/* B4C840 80241DD0 A6220010 */ sh $v0, 0x10($s1) -/* B4C844 80241DD4 C660003C */ lwc1 $f0, 0x3c($s3) -/* B4C848 80241DD8 C622006C */ lwc1 $f2, 0x6c($s1) -/* B4C84C 80241DDC 468010A0 */ cvt.s.w $f2, $f2 -/* B4C850 80241DE0 46020000 */ add.s $f0, $f0, $f2 -/* B4C854 80241DE4 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* B4C858 80241DE8 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* B4C85C 80241DEC E640003C */ swc1 $f0, 0x3c($s2) -/* B4C860 80241DF0 C7A20014 */ lwc1 $f2, 0x14($sp) -/* B4C864 80241DF4 4600020D */ trunc.w.s $f8, $f0 -/* B4C868 80241DF8 44024000 */ mfc1 $v0, $f8 -/* B4C86C 80241DFC 00000000 */ nop -/* B4C870 80241E00 A6220012 */ sh $v0, 0x12($s1) -/* B4C874 80241E04 4600120D */ trunc.w.s $f8, $f2 -/* B4C878 80241E08 44024000 */ mfc1 $v0, $f8 -/* B4C87C 80241E0C E6420040 */ swc1 $f2, 0x40($s2) -/* B4C880 80241E10 A6220014 */ sh $v0, 0x14($s1) -/* B4C884 80241E14 8C660028 */ lw $a2, 0x28($v1) -/* B4C888 80241E18 8C670030 */ lw $a3, 0x30($v1) -/* B4C88C 80241E1C C64C0038 */ lwc1 $f12, 0x38($s2) -/* B4C890 80241E20 0C00A720 */ jal atan2 -/* B4C894 80241E24 C64E0040 */ lwc1 $f14, 0x40($s2) -/* B4C898 80241E28 3C03E0EF */ lui $v1, 0xe0ef -/* B4C89C 80241E2C E640000C */ swc1 $f0, 0xc($s2) -/* B4C8A0 80241E30 8E220000 */ lw $v0, ($s1) -/* B4C8A4 80241E34 3463FFFF */ ori $v1, $v1, 0xffff -/* B4C8A8 80241E38 00431024 */ and $v0, $v0, $v1 -/* B4C8AC 80241E3C AE220000 */ sw $v0, ($s1) -/* B4C8B0 80241E40 24020001 */ addiu $v0, $zero, 1 -/* B4C8B4 80241E44 A640008E */ sh $zero, 0x8e($s2) -/* B4C8B8 80241E48 080907B1 */ j .L80241EC4 -/* B4C8BC 80241E4C AE820070 */ sw $v0, 0x70($s4) -.L80241E50: -/* B4C8C0 80241E50 86240008 */ lh $a0, 8($s1) -/* B4C8C4 80241E54 0C00FB3A */ jal get_enemy -/* B4C8C8 80241E58 2484FFFF */ addiu $a0, $a0, -1 -/* B4C8CC 80241E5C 0040802D */ daddu $s0, $v0, $zero -/* B4C8D0 80241E60 0C00EABB */ jal get_npc_unsafe -/* B4C8D4 80241E64 86040008 */ lh $a0, 8($s0) -/* B4C8D8 80241E68 9642008E */ lhu $v0, 0x8e($s2) -/* B4C8DC 80241E6C 24420001 */ addiu $v0, $v0, 1 -/* B4C8E0 80241E70 A642008E */ sh $v0, 0x8e($s2) -/* B4C8E4 80241E74 00021400 */ sll $v0, $v0, 0x10 -/* B4C8E8 80241E78 8E23007C */ lw $v1, 0x7c($s1) -/* B4C8EC 80241E7C 00021403 */ sra $v0, $v0, 0x10 -/* B4C8F0 80241E80 0043102A */ slt $v0, $v0, $v1 -/* B4C8F4 80241E84 50400001 */ beql $v0, $zero, .L80241E8C -/* B4C8F8 80241E88 A2200007 */ sb $zero, 7($s1) -.L80241E8C: -/* B4C8FC 80241E8C 8E03006C */ lw $v1, 0x6c($s0) -/* B4C900 80241E90 24020004 */ addiu $v0, $zero, 4 -/* B4C904 80241E94 1462000B */ bne $v1, $v0, .L80241EC4 -/* B4C908 80241E98 3C021F10 */ lui $v0, 0x1f10 -/* B4C90C 80241E9C 8E230000 */ lw $v1, ($s1) -/* B4C910 80241EA0 3C01C47A */ lui $at, 0xc47a -/* B4C914 80241EA4 44810000 */ mtc1 $at, $f0 -/* B4C918 80241EA8 00621825 */ or $v1, $v1, $v0 -/* B4C91C 80241EAC AE230000 */ sw $v1, ($s1) -/* B4C920 80241EB0 AE400038 */ sw $zero, 0x38($s2) -/* B4C924 80241EB4 E640003C */ swc1 $f0, 0x3c($s2) -/* B4C928 80241EB8 AE400040 */ sw $zero, 0x40($s2) -/* B4C92C 80241EBC A2330007 */ sb $s3, 7($s1) -/* B4C930 80241EC0 AE800070 */ sw $zero, 0x70($s4) -.L80241EC4: -/* B4C934 80241EC4 8FBF002C */ lw $ra, 0x2c($sp) -/* B4C938 80241EC8 8FB40028 */ lw $s4, 0x28($sp) -/* B4C93C 80241ECC 8FB30024 */ lw $s3, 0x24($sp) -/* B4C940 80241ED0 8FB20020 */ lw $s2, 0x20($sp) -/* B4C944 80241ED4 8FB1001C */ lw $s1, 0x1c($sp) -/* B4C948 80241ED8 8FB00018 */ lw $s0, 0x18($sp) -/* B4C94C 80241EDC 0000102D */ daddu $v0, $zero, $zero -/* B4C950 80241EE0 03E00008 */ jr $ra -/* B4C954 80241EE4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_05/func_8024268C_B4AA70.s b/asm/nonmatchings/world/area_jan/jan_05/func_8024268C_B4AA70.s deleted file mode 100644 index d15cd96c72..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/func_8024268C_B4AA70.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024268C_B4D0FC -/* B4D0FC 8024268C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B4D100 80242690 AFB00010 */ sw $s0, 0x10($sp) -/* B4D104 80242694 0080802D */ daddu $s0, $a0, $zero -/* B4D108 80242698 AFBF0014 */ sw $ra, 0x14($sp) -/* B4D10C 8024269C 0C00FB5A */ jal get_enemy_safe -/* B4D110 802426A0 0000202D */ daddu $a0, $zero, $zero -/* B4D114 802426A4 14400003 */ bnez $v0, .L802426B4 -/* B4D118 802426A8 24020001 */ addiu $v0, $zero, 1 -/* B4D11C 802426AC 080909AE */ j .L802426B8 -/* B4D120 802426B0 AE000084 */ sw $zero, 0x84($s0) -.L802426B4: -/* B4D124 802426B4 AE020084 */ sw $v0, 0x84($s0) -.L802426B8: -/* B4D128 802426B8 8FBF0014 */ lw $ra, 0x14($sp) -/* B4D12C 802426BC 8FB00010 */ lw $s0, 0x10($sp) -/* B4D130 802426C0 24020002 */ addiu $v0, $zero, 2 -/* B4D134 802426C4 03E00008 */ jr $ra -/* B4D138 802426C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B4D13C 802426CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/delete_player_actor_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/delete_player_actor_B52830.s deleted file mode 100644 index 2819a7d50d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/delete_player_actor_B52830.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel delete_player_actor_B53598 -/* B53598 80240D68 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B5359C 80240D6C AFB40040 */ sw $s4, 0x40($sp) -/* B535A0 80240D70 0080A02D */ daddu $s4, $a0, $zero -/* B535A4 80240D74 AFBF0044 */ sw $ra, 0x44($sp) -/* B535A8 80240D78 AFB3003C */ sw $s3, 0x3c($sp) -/* B535AC 80240D7C AFB20038 */ sw $s2, 0x38($sp) -/* B535B0 80240D80 AFB10034 */ sw $s1, 0x34($sp) -/* B535B4 80240D84 AFB00030 */ sw $s0, 0x30($sp) -/* B535B8 80240D88 8E920148 */ lw $s2, 0x148($s4) -/* B535BC 80240D8C 00A0882D */ daddu $s1, $a1, $zero -/* B535C0 80240D90 86440008 */ lh $a0, 8($s2) -/* B535C4 80240D94 0C00EABB */ jal get_npc_unsafe -/* B535C8 80240D98 00C0982D */ daddu $s3, $a2, $zero -/* B535CC 80240D9C 8E230014 */ lw $v1, 0x14($s1) -/* B535D0 80240DA0 0460002D */ bltz $v1, .L80240E58 -/* B535D4 80240DA4 0040802D */ daddu $s0, $v0, $zero -/* B535D8 80240DA8 0260202D */ daddu $a0, $s3, $zero -/* B535DC 80240DAC AFA00010 */ sw $zero, 0x10($sp) -/* B535E0 80240DB0 8E260024 */ lw $a2, 0x24($s1) -/* B535E4 80240DB4 8E270028 */ lw $a3, 0x28($s1) -/* B535E8 80240DB8 0C01242D */ jal func_800490B4 -/* B535EC 80240DBC 0240282D */ daddu $a1, $s2, $zero -/* B535F0 80240DC0 10400025 */ beqz $v0, .L80240E58 -/* B535F4 80240DC4 0000202D */ daddu $a0, $zero, $zero -/* B535F8 80240DC8 0200282D */ daddu $a1, $s0, $zero -/* B535FC 80240DCC 0000302D */ daddu $a2, $zero, $zero -/* B53600 80240DD0 860300A8 */ lh $v1, 0xa8($s0) -/* B53604 80240DD4 3C013F80 */ lui $at, 0x3f80 -/* B53608 80240DD8 44810000 */ mtc1 $at, $f0 -/* B5360C 80240DDC 3C014000 */ lui $at, 0x4000 -/* B53610 80240DE0 44811000 */ mtc1 $at, $f2 -/* B53614 80240DE4 3C01C1A0 */ lui $at, 0xc1a0 -/* B53618 80240DE8 44812000 */ mtc1 $at, $f4 -/* B5361C 80240DEC 2402000F */ addiu $v0, $zero, 0xf -/* B53620 80240DF0 AFA2001C */ sw $v0, 0x1c($sp) -/* B53624 80240DF4 44833000 */ mtc1 $v1, $f6 -/* B53628 80240DF8 00000000 */ nop -/* B5362C 80240DFC 468031A0 */ cvt.s.w $f6, $f6 -/* B53630 80240E00 44073000 */ mfc1 $a3, $f6 -/* B53634 80240E04 27A20028 */ addiu $v0, $sp, 0x28 -/* B53638 80240E08 AFA20020 */ sw $v0, 0x20($sp) -/* B5363C 80240E0C E7A00010 */ swc1 $f0, 0x10($sp) -/* B53640 80240E10 E7A20014 */ swc1 $f2, 0x14($sp) -/* B53644 80240E14 0C01BFA4 */ jal fx_emote -/* B53648 80240E18 E7A40018 */ swc1 $f4, 0x18($sp) -/* B5364C 80240E1C 0200202D */ daddu $a0, $s0, $zero -/* B53650 80240E20 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B53654 80240E24 0C012530 */ jal func_800494C0 -/* B53658 80240E28 3C060020 */ lui $a2, 0x20 -/* B5365C 80240E2C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B53660 80240E30 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B53664 80240E34 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B53668 80240E38 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B5366C 80240E3C 8C460028 */ lw $a2, 0x28($v0) -/* B53670 80240E40 0C00A720 */ jal atan2 -/* B53674 80240E44 8C470030 */ lw $a3, 0x30($v0) -/* B53678 80240E48 2402000C */ addiu $v0, $zero, 0xc -/* B5367C 80240E4C E600000C */ swc1 $f0, 0xc($s0) -/* B53680 80240E50 080903BB */ j .L80240EEC -/* B53684 80240E54 AE820070 */ sw $v0, 0x70($s4) -.L80240E58: -/* B53688 80240E58 8602008C */ lh $v0, 0x8c($s0) -/* B5368C 80240E5C 14400023 */ bnez $v0, .L80240EEC -/* B53690 80240E60 00000000 */ nop -/* B53694 80240E64 9602008E */ lhu $v0, 0x8e($s0) -/* B53698 80240E68 2442FFFF */ addiu $v0, $v0, -1 -/* B5369C 80240E6C A602008E */ sh $v0, 0x8e($s0) -/* B536A0 80240E70 00021400 */ sll $v0, $v0, 0x10 -/* B536A4 80240E74 1C40001D */ bgtz $v0, .L80240EEC -/* B536A8 80240E78 00000000 */ nop -/* B536AC 80240E7C 8E820074 */ lw $v0, 0x74($s4) -/* B536B0 80240E80 2442FFFF */ addiu $v0, $v0, -1 -/* B536B4 80240E84 18400018 */ blez $v0, .L80240EE8 -/* B536B8 80240E88 AE820074 */ sw $v0, 0x74($s4) -/* B536BC 80240E8C C600000C */ lwc1 $f0, 0xc($s0) -/* B536C0 80240E90 3C014334 */ lui $at, 0x4334 -/* B536C4 80240E94 44816000 */ mtc1 $at, $f12 -/* B536C8 80240E98 0C00A6C9 */ jal clamp_angle -/* B536CC 80240E9C 460C0300 */ add.s $f12, $f0, $f12 -/* B536D0 80240EA0 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B536D4 80240EA4 0C00A67F */ jal rand_int -/* B536D8 80240EA8 E600000C */ swc1 $f0, 0xc($s0) -/* B536DC 80240EAC 3C032E8B */ lui $v1, 0x2e8b -/* B536E0 80240EB0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* B536E4 80240EB4 00430018 */ mult $v0, $v1 -/* B536E8 80240EB8 00021FC3 */ sra $v1, $v0, 0x1f -/* B536EC 80240EBC 00004010 */ mfhi $t0 -/* B536F0 80240EC0 00082043 */ sra $a0, $t0, 1 -/* B536F4 80240EC4 00832023 */ subu $a0, $a0, $v1 -/* B536F8 80240EC8 00041840 */ sll $v1, $a0, 1 -/* B536FC 80240ECC 00641821 */ addu $v1, $v1, $a0 -/* B53700 80240ED0 00031880 */ sll $v1, $v1, 2 -/* B53704 80240ED4 00641823 */ subu $v1, $v1, $a0 -/* B53708 80240ED8 00431023 */ subu $v0, $v0, $v1 -/* B5370C 80240EDC 24420005 */ addiu $v0, $v0, 5 -/* B53710 80240EE0 080903BB */ j .L80240EEC -/* B53714 80240EE4 A602008E */ sh $v0, 0x8e($s0) -.L80240EE8: -/* B53718 80240EE8 AE800070 */ sw $zero, 0x70($s4) -.L80240EEC: -/* B5371C 80240EEC 8FBF0044 */ lw $ra, 0x44($sp) -/* B53720 80240EF0 8FB40040 */ lw $s4, 0x40($sp) -/* B53724 80240EF4 8FB3003C */ lw $s3, 0x3c($sp) -/* B53728 80240EF8 8FB20038 */ lw $s2, 0x38($sp) -/* B5372C 80240EFC 8FB10034 */ lw $s1, 0x34($sp) -/* B53730 80240F00 8FB00030 */ lw $s0, 0x30($sp) -/* B53734 80240F04 03E00008 */ jr $ra -/* B53738 80240F08 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_80240124_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_80240124_B52830.s deleted file mode 100644 index 9149f6ba59..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_80240124_B52830.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_B52954 -/* B52954 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B52958 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* B5295C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* B52960 80240130 10A00005 */ beqz $a1, .L80240148 -/* B52964 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* B52968 80240138 AE000070 */ sw $zero, 0x70($s0) -/* B5296C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* B52970 80240140 AE000078 */ sw $zero, 0x78($s0) -/* B52974 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* B52978 80240148 8E020070 */ lw $v0, 0x70($s0) -/* B5297C 8024014C 1440000E */ bnez $v0, .L80240188 -/* B52980 80240150 00000000 */ nop -/* B52984 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* B52988 80240158 8E020088 */ lw $v0, 0x88($s0) -/* B5298C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* B52990 80240160 04610004 */ bgez $v1, .L80240174 -/* B52994 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* B52998 80240168 3C020002 */ lui $v0, 2 -/* B5299C 8024016C 08090061 */ j .L80240184 -/* B529A0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* B529A4 80240174 3C040002 */ lui $a0, 2 -/* B529A8 80240178 0083102A */ slt $v0, $a0, $v1 -/* B529AC 8024017C 10400002 */ beqz $v0, .L80240188 -/* B529B0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* B529B4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* B529B8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* B529BC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* B529C0 80240190 00000000 */ nop -/* B529C4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* B529C8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* B529CC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* B529D0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* B529D4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* B529D8 802401A8 3C020002 */ lui $v0, 2 -/* B529DC 802401AC 08090071 */ j .L802401C4 -/* B529E0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* B529E4 802401B4 3C040002 */ lui $a0, 2 -/* B529E8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* B529EC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* B529F0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* B529F4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* B529F8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* B529FC 802401CC 1440000E */ bnez $v0, .L80240208 -/* B52A00 802401D0 00000000 */ nop -/* B52A04 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* B52A08 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* B52A0C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* B52A10 802401E0 04610004 */ bgez $v1, .L802401F4 -/* B52A14 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* B52A18 802401E8 3C020002 */ lui $v0, 2 -/* B52A1C 802401EC 08090081 */ j .L80240204 -/* B52A20 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* B52A24 802401F4 3C040002 */ lui $a0, 2 -/* B52A28 802401F8 0083102A */ slt $v0, $a0, $v1 -/* B52A2C 802401FC 10400002 */ beqz $v0, .L80240208 -/* B52A30 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* B52A34 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* B52A38 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* B52A3C 8024020C 1440000E */ bnez $v0, .L80240248 -/* B52A40 80240210 00000000 */ nop -/* B52A44 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* B52A48 80240218 8E020094 */ lw $v0, 0x94($s0) -/* B52A4C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* B52A50 80240220 04610004 */ bgez $v1, .L80240234 -/* B52A54 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* B52A58 80240228 3C020002 */ lui $v0, 2 -/* B52A5C 8024022C 08090091 */ j .L80240244 -/* B52A60 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* B52A64 80240234 3C040002 */ lui $a0, 2 -/* B52A68 80240238 0083102A */ slt $v0, $a0, $v1 -/* B52A6C 8024023C 10400002 */ beqz $v0, .L80240248 -/* B52A70 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* B52A74 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* B52A78 80240248 8E040084 */ lw $a0, 0x84($s0) -/* B52A7C 8024024C 0C046F07 */ jal set_main_pan_u -/* B52A80 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* B52A84 80240254 8E040084 */ lw $a0, 0x84($s0) -/* B52A88 80240258 0C046F0D */ jal set_main_pan_v -/* B52A8C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* B52A90 80240260 8E040084 */ lw $a0, 0x84($s0) -/* B52A94 80240264 0C046F13 */ jal set_aux_pan_u -/* B52A98 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* B52A9C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* B52AA0 80240270 0C046F19 */ jal set_aux_pan_v -/* B52AA4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* B52AA8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* B52AAC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* B52AB0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* B52AB4 80240284 24420001 */ addiu $v0, $v0, 1 -/* B52AB8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* B52ABC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* B52AC0 80240290 24630001 */ addiu $v1, $v1, 1 -/* B52AC4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* B52AC8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* B52ACC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* B52AD0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* B52AD4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* B52AD8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* B52ADC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* B52AE0 802402B0 14600002 */ bnez $v1, .L802402BC -/* B52AE4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* B52AE8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* B52AEC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* B52AF0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* B52AF4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* B52AF8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* B52AFC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* B52B00 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* B52B04 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* B52B08 802402D8 0043102A */ slt $v0, $v0, $v1 -/* B52B0C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* B52B10 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* B52B14 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* B52B18 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* B52B1C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* B52B20 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* B52B24 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* B52B28 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B52B2C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* B52B30 80240300 0000102D */ daddu $v0, $zero, $zero -/* B52B34 80240304 03E00008 */ jr $ra -/* B52B38 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* B52B3C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_80240310_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_80240310_B52830.s deleted file mode 100644 index 4832f6ec17..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_80240310_B52830.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_B52B40 -/* B52B40 80240310 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B52B44 80240314 AFB1001C */ sw $s1, 0x1c($sp) -/* B52B48 80240318 0080882D */ daddu $s1, $a0, $zero -/* B52B4C 8024031C AFBF0020 */ sw $ra, 0x20($sp) -/* B52B50 80240320 AFB00018 */ sw $s0, 0x18($sp) -/* B52B54 80240324 8E30000C */ lw $s0, 0xc($s1) -/* B52B58 80240328 8E050000 */ lw $a1, ($s0) -/* B52B5C 8024032C 0C0B1EAF */ jal get_variable -/* B52B60 80240330 26100004 */ addiu $s0, $s0, 4 -/* B52B64 80240334 AE220070 */ sw $v0, 0x70($s1) -/* B52B68 80240338 8E050000 */ lw $a1, ($s0) -/* B52B6C 8024033C 26100004 */ addiu $s0, $s0, 4 -/* B52B70 80240340 0C0B1EAF */ jal get_variable -/* B52B74 80240344 0220202D */ daddu $a0, $s1, $zero -/* B52B78 80240348 AE220074 */ sw $v0, 0x74($s1) -/* B52B7C 8024034C 8E050000 */ lw $a1, ($s0) -/* B52B80 80240350 0C0B1EAF */ jal get_variable -/* B52B84 80240354 0220202D */ daddu $a0, $s1, $zero -/* B52B88 80240358 2404009E */ addiu $a0, $zero, 0x9e -/* B52B8C 8024035C 0000282D */ daddu $a1, $zero, $zero -/* B52B90 80240360 C6200070 */ lwc1 $f0, 0x70($s1) -/* B52B94 80240364 46800020 */ cvt.s.w $f0, $f0 -/* B52B98 80240368 C6220074 */ lwc1 $f2, 0x74($s1) -/* B52B9C 8024036C 468010A0 */ cvt.s.w $f2, $f2 -/* B52BA0 80240370 44060000 */ mfc1 $a2, $f0 -/* B52BA4 80240374 44071000 */ mfc1 $a3, $f2 -/* B52BA8 80240378 44820000 */ mtc1 $v0, $f0 -/* B52BAC 8024037C 00000000 */ nop -/* B52BB0 80240380 46800020 */ cvt.s.w $f0, $f0 -/* B52BB4 80240384 AE220078 */ sw $v0, 0x78($s1) -/* B52BB8 80240388 0C05267B */ jal func_801499EC -/* B52BBC 8024038C E7A00010 */ swc1 $f0, 0x10($sp) -/* B52BC0 80240390 8FBF0020 */ lw $ra, 0x20($sp) -/* B52BC4 80240394 8FB1001C */ lw $s1, 0x1c($sp) -/* B52BC8 80240398 8FB00018 */ lw $s0, 0x18($sp) -/* B52BCC 8024039C 24020002 */ addiu $v0, $zero, 2 -/* B52BD0 802403A0 03E00008 */ jr $ra -/* B52BD4 802403A4 27BD0028 */ addiu $sp, $sp, 0x28 -/* B52BD8 802403A8 00000000 */ nop -/* B52BDC 802403AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_80240500_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_80240500_B52830.s deleted file mode 100644 index 24d1d0ac16..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_80240500_B52830.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_B52D30 -/* B52D30 80240500 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B52D34 80240504 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B52D38 80240508 4485A000 */ mtc1 $a1, $f20 -/* B52D3C 8024050C F7B60020 */ sdc1 $f22, 0x20($sp) -/* B52D40 80240510 4486B000 */ mtc1 $a2, $f22 -/* B52D44 80240514 AFB00010 */ sw $s0, 0x10($sp) -/* B52D48 80240518 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B52D4C 8024051C 4487C000 */ mtc1 $a3, $f24 -/* B52D50 80240520 AFBF0014 */ sw $ra, 0x14($sp) -/* B52D54 80240524 0C019D28 */ jal guMtxIdentF -/* B52D58 80240528 0080802D */ daddu $s0, $a0, $zero -/* B52D5C 8024052C 4616A582 */ mul.s $f22, $f20, $f22 -/* B52D60 80240530 00000000 */ nop -/* B52D64 80240534 4618A502 */ mul.s $f20, $f20, $f24 -/* B52D68 80240538 00000000 */ nop -/* B52D6C 8024053C 3C013F80 */ lui $at, 0x3f80 -/* B52D70 80240540 44810000 */ mtc1 $at, $f0 -/* B52D74 80240544 00000000 */ nop -/* B52D78 80240548 E6000014 */ swc1 $f0, 0x14($s0) -/* B52D7C 8024054C E6160010 */ swc1 $f22, 0x10($s0) -/* B52D80 80240550 E6140018 */ swc1 $f20, 0x18($s0) -/* B52D84 80240554 8FBF0014 */ lw $ra, 0x14($sp) -/* B52D88 80240558 8FB00010 */ lw $s0, 0x10($sp) -/* B52D8C 8024055C D7B80028 */ ldc1 $f24, 0x28($sp) -/* B52D90 80240560 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B52D94 80240564 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B52D98 80240568 03E00008 */ jr $ra -/* B52D9C 8024056C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_80240570_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_80240570_B52830.s deleted file mode 100644 index 864a5d78db..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_80240570_B52830.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240570_B52DA0 -/* B52DA0 80240570 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B52DA4 80240574 AFB10054 */ sw $s1, 0x54($sp) -/* B52DA8 80240578 0080882D */ daddu $s1, $a0, $zero -/* B52DAC 8024057C AFBF005C */ sw $ra, 0x5c($sp) -/* B52DB0 80240580 AFB20058 */ sw $s2, 0x58($sp) -/* B52DB4 80240584 AFB00050 */ sw $s0, 0x50($sp) -/* B52DB8 80240588 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B52DBC 8024058C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B52DC0 80240590 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B52DC4 80240594 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B52DC8 80240598 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B52DCC 8024059C 8E30000C */ lw $s0, 0xc($s1) -/* B52DD0 802405A0 8E050000 */ lw $a1, ($s0) -/* B52DD4 802405A4 0C0B1EAF */ jal get_variable -/* B52DD8 802405A8 26100004 */ addiu $s0, $s0, 4 -/* B52DDC 802405AC 0C046C04 */ jal get_model_list_index_from_tree_index -/* B52DE0 802405B0 0040202D */ daddu $a0, $v0, $zero -/* B52DE4 802405B4 8E050000 */ lw $a1, ($s0) -/* B52DE8 802405B8 26100004 */ addiu $s0, $s0, 4 -/* B52DEC 802405BC 0220202D */ daddu $a0, $s1, $zero -/* B52DF0 802405C0 0C0B210B */ jal get_float_variable -/* B52DF4 802405C4 0040902D */ daddu $s2, $v0, $zero -/* B52DF8 802405C8 8E050000 */ lw $a1, ($s0) -/* B52DFC 802405CC 26100004 */ addiu $s0, $s0, 4 -/* B52E00 802405D0 0220202D */ daddu $a0, $s1, $zero -/* B52E04 802405D4 0C0B210B */ jal get_float_variable -/* B52E08 802405D8 46000706 */ mov.s $f28, $f0 -/* B52E0C 802405DC 8E050000 */ lw $a1, ($s0) -/* B52E10 802405E0 26100004 */ addiu $s0, $s0, 4 -/* B52E14 802405E4 0220202D */ daddu $a0, $s1, $zero -/* B52E18 802405E8 0C0B210B */ jal get_float_variable -/* B52E1C 802405EC 46000686 */ mov.s $f26, $f0 -/* B52E20 802405F0 0220202D */ daddu $a0, $s1, $zero -/* B52E24 802405F4 8E050000 */ lw $a1, ($s0) -/* B52E28 802405F8 0C0B210B */ jal get_float_variable -/* B52E2C 802405FC 46000586 */ mov.s $f22, $f0 -/* B52E30 80240600 0240202D */ daddu $a0, $s2, $zero -/* B52E34 80240604 0C046B4C */ jal get_model_from_list_index -/* B52E38 80240608 46000606 */ mov.s $f24, $f0 -/* B52E3C 8024060C 0040882D */ daddu $s1, $v0, $zero -/* B52E40 80240610 96220000 */ lhu $v0, ($s1) -/* B52E44 80240614 30420400 */ andi $v0, $v0, 0x400 -/* B52E48 80240618 1440001E */ bnez $v0, .L80240694 -/* B52E4C 8024061C 26300058 */ addiu $s0, $s1, 0x58 -/* B52E50 80240620 4480A000 */ mtc1 $zero, $f20 -/* B52E54 80240624 4406B000 */ mfc1 $a2, $f22 -/* B52E58 80240628 4405A000 */ mfc1 $a1, $f20 -/* B52E5C 8024062C 4407A000 */ mfc1 $a3, $f20 -/* B52E60 80240630 0C019E40 */ jal guTranslateF -/* B52E64 80240634 0200202D */ daddu $a0, $s0, $zero -/* B52E68 80240638 4405E000 */ mfc1 $a1, $f28 -/* B52E6C 8024063C 4406D000 */ mfc1 $a2, $f26 -/* B52E70 80240640 4407C000 */ mfc1 $a3, $f24 -/* B52E74 80240644 0C090140 */ jal func_80240500 -/* B52E78 80240648 27A40010 */ addiu $a0, $sp, 0x10 -/* B52E7C 8024064C 27A40010 */ addiu $a0, $sp, 0x10 -/* B52E80 80240650 0200282D */ daddu $a1, $s0, $zero -/* B52E84 80240654 0C019D80 */ jal guMtxCatF -/* B52E88 80240658 0200302D */ daddu $a2, $s0, $zero -/* B52E8C 8024065C 27A40010 */ addiu $a0, $sp, 0x10 -/* B52E90 80240660 4600B587 */ neg.s $f22, $f22 -/* B52E94 80240664 4405A000 */ mfc1 $a1, $f20 -/* B52E98 80240668 4406B000 */ mfc1 $a2, $f22 -/* B52E9C 8024066C 0C019E40 */ jal guTranslateF -/* B52EA0 80240670 00A0382D */ daddu $a3, $a1, $zero -/* B52EA4 80240674 27A40010 */ addiu $a0, $sp, 0x10 -/* B52EA8 80240678 0200282D */ daddu $a1, $s0, $zero -/* B52EAC 8024067C 0C019D80 */ jal guMtxCatF -/* B52EB0 80240680 00A0302D */ daddu $a2, $a1, $zero -/* B52EB4 80240684 96220000 */ lhu $v0, ($s1) -/* B52EB8 80240688 34421400 */ ori $v0, $v0, 0x1400 -/* B52EBC 8024068C 080901C3 */ j .L8024070C -/* B52EC0 80240690 A6220000 */ sh $v0, ($s1) -.L80240694: -/* B52EC4 80240694 4480A000 */ mtc1 $zero, $f20 -/* B52EC8 80240698 4406B000 */ mfc1 $a2, $f22 -/* B52ECC 8024069C 4405A000 */ mfc1 $a1, $f20 -/* B52ED0 802406A0 4407A000 */ mfc1 $a3, $f20 -/* B52ED4 802406A4 0C019E40 */ jal guTranslateF -/* B52ED8 802406A8 27A40010 */ addiu $a0, $sp, 0x10 -/* B52EDC 802406AC 27A40010 */ addiu $a0, $sp, 0x10 -/* B52EE0 802406B0 26300058 */ addiu $s0, $s1, 0x58 -/* B52EE4 802406B4 0200282D */ daddu $a1, $s0, $zero -/* B52EE8 802406B8 0C019D80 */ jal guMtxCatF -/* B52EEC 802406BC 0200302D */ daddu $a2, $s0, $zero -/* B52EF0 802406C0 4405E000 */ mfc1 $a1, $f28 -/* B52EF4 802406C4 4406D000 */ mfc1 $a2, $f26 -/* B52EF8 802406C8 4407C000 */ mfc1 $a3, $f24 -/* B52EFC 802406CC 0C090140 */ jal func_80240500 -/* B52F00 802406D0 27A40010 */ addiu $a0, $sp, 0x10 -/* B52F04 802406D4 27A40010 */ addiu $a0, $sp, 0x10 -/* B52F08 802406D8 0200282D */ daddu $a1, $s0, $zero -/* B52F0C 802406DC 0C019D80 */ jal guMtxCatF -/* B52F10 802406E0 0200302D */ daddu $a2, $s0, $zero -/* B52F14 802406E4 27A40010 */ addiu $a0, $sp, 0x10 -/* B52F18 802406E8 4600B587 */ neg.s $f22, $f22 -/* B52F1C 802406EC 4405A000 */ mfc1 $a1, $f20 -/* B52F20 802406F0 4406B000 */ mfc1 $a2, $f22 -/* B52F24 802406F4 0C019E40 */ jal guTranslateF -/* B52F28 802406F8 00A0382D */ daddu $a3, $a1, $zero -/* B52F2C 802406FC 27A40010 */ addiu $a0, $sp, 0x10 -/* B52F30 80240700 0200282D */ daddu $a1, $s0, $zero -/* B52F34 80240704 0C019D80 */ jal guMtxCatF -/* B52F38 80240708 00A0302D */ daddu $a2, $a1, $zero -.L8024070C: -/* B52F3C 8024070C 8FBF005C */ lw $ra, 0x5c($sp) -/* B52F40 80240710 8FB20058 */ lw $s2, 0x58($sp) -/* B52F44 80240714 8FB10054 */ lw $s1, 0x54($sp) -/* B52F48 80240718 8FB00050 */ lw $s0, 0x50($sp) -/* B52F4C 8024071C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B52F50 80240720 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B52F54 80240724 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B52F58 80240728 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B52F5C 8024072C D7B40060 */ ldc1 $f20, 0x60($sp) -/* B52F60 80240730 24020002 */ addiu $v0, $zero, 2 -/* B52F64 80240734 03E00008 */ jr $ra -/* B52F68 80240738 27BD0088 */ addiu $sp, $sp, 0x88 -/* B52F6C 8024073C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_80240970_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_80240970_B52830.s deleted file mode 100644 index 70675ce271..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_80240970_B52830.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240970_B531A0 -/* B531A0 80240970 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* B531A4 80240974 AFB3004C */ sw $s3, 0x4c($sp) -/* B531A8 80240978 0080982D */ daddu $s3, $a0, $zero -/* B531AC 8024097C AFBF0054 */ sw $ra, 0x54($sp) -/* B531B0 80240980 AFB40050 */ sw $s4, 0x50($sp) -/* B531B4 80240984 AFB20048 */ sw $s2, 0x48($sp) -/* B531B8 80240988 AFB10044 */ sw $s1, 0x44($sp) -/* B531BC 8024098C AFB00040 */ sw $s0, 0x40($sp) -/* B531C0 80240990 F7B40058 */ sdc1 $f20, 0x58($sp) -/* B531C4 80240994 8E710148 */ lw $s1, 0x148($s3) -/* B531C8 80240998 00A0A02D */ daddu $s4, $a1, $zero -/* B531CC 8024099C 86240008 */ lh $a0, 8($s1) -/* B531D0 802409A0 0C00EABB */ jal get_npc_unsafe -/* B531D4 802409A4 00C0902D */ daddu $s2, $a2, $zero -/* B531D8 802409A8 8E830014 */ lw $v1, 0x14($s4) -/* B531DC 802409AC 04600034 */ bltz $v1, .L80240A80 -/* B531E0 802409B0 0040802D */ daddu $s0, $v0, $zero -/* B531E4 802409B4 8E620074 */ lw $v0, 0x74($s3) -/* B531E8 802409B8 1C400030 */ bgtz $v0, .L80240A7C -/* B531EC 802409BC 2442FFFF */ addiu $v0, $v0, -1 -/* B531F0 802409C0 0240202D */ daddu $a0, $s2, $zero -/* B531F4 802409C4 AE630074 */ sw $v1, 0x74($s3) -/* B531F8 802409C8 AFA00010 */ sw $zero, 0x10($sp) -/* B531FC 802409CC 8E86000C */ lw $a2, 0xc($s4) -/* B53200 802409D0 8E870010 */ lw $a3, 0x10($s4) -/* B53204 802409D4 0C01242D */ jal func_800490B4 -/* B53208 802409D8 0220282D */ daddu $a1, $s1, $zero -/* B5320C 802409DC 10400025 */ beqz $v0, .L80240A74 -/* B53210 802409E0 0000202D */ daddu $a0, $zero, $zero -/* B53214 802409E4 0200282D */ daddu $a1, $s0, $zero -/* B53218 802409E8 0000302D */ daddu $a2, $zero, $zero -/* B5321C 802409EC 860300A8 */ lh $v1, 0xa8($s0) -/* B53220 802409F0 3C013F80 */ lui $at, 0x3f80 -/* B53224 802409F4 44810000 */ mtc1 $at, $f0 -/* B53228 802409F8 3C014000 */ lui $at, 0x4000 -/* B5322C 802409FC 44811000 */ mtc1 $at, $f2 -/* B53230 80240A00 3C01C1A0 */ lui $at, 0xc1a0 -/* B53234 80240A04 44812000 */ mtc1 $at, $f4 -/* B53238 80240A08 2402000F */ addiu $v0, $zero, 0xf -/* B5323C 80240A0C AFA2001C */ sw $v0, 0x1c($sp) -/* B53240 80240A10 44835000 */ mtc1 $v1, $f10 -/* B53244 80240A14 00000000 */ nop -/* B53248 80240A18 468052A0 */ cvt.s.w $f10, $f10 -/* B5324C 80240A1C 44075000 */ mfc1 $a3, $f10 -/* B53250 80240A20 27A20028 */ addiu $v0, $sp, 0x28 -/* B53254 80240A24 AFA20020 */ sw $v0, 0x20($sp) -/* B53258 80240A28 E7A00010 */ swc1 $f0, 0x10($sp) -/* B5325C 80240A2C E7A20014 */ swc1 $f2, 0x14($sp) -/* B53260 80240A30 0C01BFA4 */ jal fx_emote -/* B53264 80240A34 E7A40018 */ swc1 $f4, 0x18($sp) -/* B53268 80240A38 0200202D */ daddu $a0, $s0, $zero -/* B5326C 80240A3C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B53270 80240A40 0C012530 */ jal func_800494C0 -/* B53274 80240A44 3C060020 */ lui $a2, 0x20 -/* B53278 80240A48 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B5327C 80240A4C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B53280 80240A50 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B53284 80240A54 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B53288 80240A58 8C460028 */ lw $a2, 0x28($v0) -/* B5328C 80240A5C 0C00A720 */ jal atan2 -/* B53290 80240A60 8C470030 */ lw $a3, 0x30($v0) -/* B53294 80240A64 2402000C */ addiu $v0, $zero, 0xc -/* B53298 80240A68 E600000C */ swc1 $f0, 0xc($s0) -/* B5329C 80240A6C 08090321 */ j .L80240C84 -/* B532A0 80240A70 AE620070 */ sw $v0, 0x70($s3) -.L80240A74: -/* B532A4 80240A74 8E620074 */ lw $v0, 0x74($s3) -/* B532A8 80240A78 2442FFFF */ addiu $v0, $v0, -1 -.L80240A7C: -/* B532AC 80240A7C AE620074 */ sw $v0, 0x74($s3) -.L80240A80: -/* B532B0 80240A80 C6000018 */ lwc1 $f0, 0x18($s0) -/* B532B4 80240A84 44801000 */ mtc1 $zero, $f2 -/* B532B8 80240A88 44801800 */ mtc1 $zero, $f3 -/* B532BC 80240A8C 46000021 */ cvt.d.s $f0, $f0 -/* B532C0 80240A90 4620103C */ c.lt.d $f2, $f0 -/* B532C4 80240A94 00000000 */ nop -/* B532C8 80240A98 45000025 */ bc1f .L80240B30 -/* B532CC 80240A9C 27A5002C */ addiu $a1, $sp, 0x2c -/* B532D0 80240AA0 C6000038 */ lwc1 $f0, 0x38($s0) -/* B532D4 80240AA4 860200A6 */ lh $v0, 0xa6($s0) -/* B532D8 80240AA8 3C018024 */ lui $at, 0x8024 -/* B532DC 80240AAC D4226CB0 */ ldc1 $f2, 0x6cb0($at) -/* B532E0 80240AB0 27A60030 */ addiu $a2, $sp, 0x30 -/* B532E4 80240AB4 E7A0002C */ swc1 $f0, 0x2c($sp) -/* B532E8 80240AB8 44820000 */ mtc1 $v0, $f0 -/* B532EC 80240ABC 00000000 */ nop -/* B532F0 80240AC0 46800020 */ cvt.s.w $f0, $f0 -/* B532F4 80240AC4 46000021 */ cvt.d.s $f0, $f0 -/* B532F8 80240AC8 C604003C */ lwc1 $f4, 0x3c($s0) -/* B532FC 80240ACC C6060040 */ lwc1 $f6, 0x40($s0) -/* B53300 80240AD0 C6080018 */ lwc1 $f8, 0x18($s0) -/* B53304 80240AD4 860200A8 */ lh $v0, 0xa8($s0) -/* B53308 80240AD8 46220002 */ mul.d $f0, $f0, $f2 -/* B5330C 80240ADC 00000000 */ nop -/* B53310 80240AE0 E7A40030 */ swc1 $f4, 0x30($sp) -/* B53314 80240AE4 E7A60034 */ swc1 $f6, 0x34($sp) -/* B53318 80240AE8 E7A80010 */ swc1 $f8, 0x10($sp) -/* B5331C 80240AEC C604000C */ lwc1 $f4, 0xc($s0) -/* B53320 80240AF0 44821000 */ mtc1 $v0, $f2 -/* B53324 80240AF4 00000000 */ nop -/* B53328 80240AF8 468010A0 */ cvt.s.w $f2, $f2 -/* B5332C 80240AFC E7A20018 */ swc1 $f2, 0x18($sp) -/* B53330 80240B00 E7A40014 */ swc1 $f4, 0x14($sp) -/* B53334 80240B04 46200020 */ cvt.s.d $f0, $f0 -/* B53338 80240B08 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B5333C 80240B0C 8E040080 */ lw $a0, 0x80($s0) -/* B53340 80240B10 0C037711 */ jal func_800DDC44 -/* B53344 80240B14 27A70034 */ addiu $a3, $sp, 0x34 -/* B53348 80240B18 54400005 */ bnel $v0, $zero, .L80240B30 -/* B5334C 80240B1C AE000018 */ sw $zero, 0x18($s0) -/* B53350 80240B20 8E050018 */ lw $a1, 0x18($s0) -/* B53354 80240B24 8E06000C */ lw $a2, 0xc($s0) -/* B53358 80240B28 0C00EA95 */ jal npc_move_heading -/* B5335C 80240B2C 0200202D */ daddu $a0, $s0, $zero -.L80240B30: -/* B53360 80240B30 C600001C */ lwc1 $f0, 0x1c($s0) -/* B53364 80240B34 44801000 */ mtc1 $zero, $f2 -/* B53368 80240B38 44801800 */ mtc1 $zero, $f3 -/* B5336C 80240B3C 46000021 */ cvt.d.s $f0, $f0 -/* B53370 80240B40 4622003C */ c.lt.d $f0, $f2 -/* B53374 80240B44 00000000 */ nop -/* B53378 80240B48 45000047 */ bc1f .L80240C68 -/* B5337C 80240B4C 27A5002C */ addiu $a1, $sp, 0x2c -/* B53380 80240B50 27A60030 */ addiu $a2, $sp, 0x30 -/* B53384 80240B54 27A20038 */ addiu $v0, $sp, 0x38 -/* B53388 80240B58 C602003C */ lwc1 $f2, 0x3c($s0) -/* B5338C 80240B5C C6060038 */ lwc1 $f6, 0x38($s0) -/* B53390 80240B60 3C01402A */ lui $at, 0x402a -/* B53394 80240B64 4481A800 */ mtc1 $at, $f21 -/* B53398 80240B68 4480A000 */ mtc1 $zero, $f20 -/* B5339C 80240B6C 460010A1 */ cvt.d.s $f2, $f2 -/* B533A0 80240B70 46341080 */ add.d $f2, $f2, $f20 -/* B533A4 80240B74 C600001C */ lwc1 $f0, 0x1c($s0) -/* B533A8 80240B78 C6040040 */ lwc1 $f4, 0x40($s0) -/* B533AC 80240B7C 46000005 */ abs.s $f0, $f0 -/* B533B0 80240B80 E7A40034 */ swc1 $f4, 0x34($sp) -/* B533B4 80240B84 3C014030 */ lui $at, 0x4030 -/* B533B8 80240B88 44812800 */ mtc1 $at, $f5 -/* B533BC 80240B8C 44802000 */ mtc1 $zero, $f4 -/* B533C0 80240B90 46000021 */ cvt.d.s $f0, $f0 -/* B533C4 80240B94 E7A6002C */ swc1 $f6, 0x2c($sp) -/* B533C8 80240B98 46240000 */ add.d $f0, $f0, $f4 -/* B533CC 80240B9C 462010A0 */ cvt.s.d $f2, $f2 -/* B533D0 80240BA0 E7A20030 */ swc1 $f2, 0x30($sp) -/* B533D4 80240BA4 46200020 */ cvt.s.d $f0, $f0 -/* B533D8 80240BA8 E7A00038 */ swc1 $f0, 0x38($sp) -/* B533DC 80240BAC AFA20010 */ sw $v0, 0x10($sp) -/* B533E0 80240BB0 8E040080 */ lw $a0, 0x80($s0) -/* B533E4 80240BB4 0C0372DF */ jal func_800DCB7C -/* B533E8 80240BB8 27A70034 */ addiu $a3, $sp, 0x34 -/* B533EC 80240BBC 1040002A */ beqz $v0, .L80240C68 -/* B533F0 80240BC0 00000000 */ nop -/* B533F4 80240BC4 C600001C */ lwc1 $f0, 0x1c($s0) -/* B533F8 80240BC8 C7A20038 */ lwc1 $f2, 0x38($sp) -/* B533FC 80240BCC 46000005 */ abs.s $f0, $f0 -/* B53400 80240BD0 46000021 */ cvt.d.s $f0, $f0 -/* B53404 80240BD4 46340000 */ add.d $f0, $f0, $f20 -/* B53408 80240BD8 460010A1 */ cvt.d.s $f2, $f2 -/* B5340C 80240BDC 4620103E */ c.le.d $f2, $f0 -/* B53410 80240BE0 00000000 */ nop -/* B53414 80240BE4 45000020 */ bc1f .L80240C68 -/* B53418 80240BE8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B5341C 80240BEC C7A00030 */ lwc1 $f0, 0x30($sp) -/* B53420 80240BF0 8E020000 */ lw $v0, ($s0) -/* B53424 80240BF4 2403F7FF */ addiu $v1, $zero, -0x801 -/* B53428 80240BF8 AE00001C */ sw $zero, 0x1c($s0) -/* B5342C 80240BFC 00431024 */ and $v0, $v0, $v1 -/* B53430 80240C00 AE020000 */ sw $v0, ($s0) -/* B53434 80240C04 24020002 */ addiu $v0, $zero, 2 -/* B53438 80240C08 E600003C */ swc1 $f0, 0x3c($s0) -/* B5343C 80240C0C 0C00A67F */ jal rand_int -/* B53440 80240C10 AE620070 */ sw $v0, 0x70($s3) -/* B53444 80240C14 3C035555 */ lui $v1, 0x5555 -/* B53448 80240C18 34635556 */ ori $v1, $v1, 0x5556 -/* B5344C 80240C1C 00430018 */ mult $v0, $v1 -/* B53450 80240C20 000227C3 */ sra $a0, $v0, 0x1f -/* B53454 80240C24 00004010 */ mfhi $t0 -/* B53458 80240C28 01042023 */ subu $a0, $t0, $a0 -/* B5345C 80240C2C 00041840 */ sll $v1, $a0, 1 -/* B53460 80240C30 00641821 */ addu $v1, $v1, $a0 -/* B53464 80240C34 00431023 */ subu $v0, $v0, $v1 -/* B53468 80240C38 24430002 */ addiu $v1, $v0, 2 -/* B5346C 80240C3C AE630074 */ sw $v1, 0x74($s3) -/* B53470 80240C40 8E82002C */ lw $v0, 0x2c($s4) -/* B53474 80240C44 5840000F */ blezl $v0, .L80240C84 -/* B53478 80240C48 AE600070 */ sw $zero, 0x70($s3) -/* B5347C 80240C4C 8E820004 */ lw $v0, 4($s4) -/* B53480 80240C50 5840000C */ blezl $v0, .L80240C84 -/* B53484 80240C54 AE600070 */ sw $zero, 0x70($s3) -/* B53488 80240C58 1460000A */ bnez $v1, .L80240C84 -/* B5348C 80240C5C 00000000 */ nop -/* B53490 80240C60 08090321 */ j .L80240C84 -/* B53494 80240C64 AE600070 */ sw $zero, 0x70($s3) -.L80240C68: -/* B53498 80240C68 C604003C */ lwc1 $f4, 0x3c($s0) -/* B5349C 80240C6C C600001C */ lwc1 $f0, 0x1c($s0) -/* B534A0 80240C70 46002100 */ add.s $f4, $f4, $f0 -/* B534A4 80240C74 C6020014 */ lwc1 $f2, 0x14($s0) -/* B534A8 80240C78 46020001 */ sub.s $f0, $f0, $f2 -/* B534AC 80240C7C E604003C */ swc1 $f4, 0x3c($s0) -/* B534B0 80240C80 E600001C */ swc1 $f0, 0x1c($s0) -.L80240C84: -/* B534B4 80240C84 8FBF0054 */ lw $ra, 0x54($sp) -/* B534B8 80240C88 8FB40050 */ lw $s4, 0x50($sp) -/* B534BC 80240C8C 8FB3004C */ lw $s3, 0x4c($sp) -/* B534C0 80240C90 8FB20048 */ lw $s2, 0x48($sp) -/* B534C4 80240C94 8FB10044 */ lw $s1, 0x44($sp) -/* B534C8 80240C98 8FB00040 */ lw $s0, 0x40($sp) -/* B534CC 80240C9C D7B40058 */ ldc1 $f20, 0x58($sp) -/* B534D0 80240CA0 03E00008 */ jr $ra -/* B534D4 80240CA4 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_80240CA8_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_80240CA8_B52830.s deleted file mode 100644 index 4403cad1cb..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_80240CA8_B52830.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CA8_B534D8 -/* B534D8 80240CA8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B534DC 80240CAC AFB3001C */ sw $s3, 0x1c($sp) -/* B534E0 80240CB0 0080982D */ daddu $s3, $a0, $zero -/* B534E4 80240CB4 AFBF0020 */ sw $ra, 0x20($sp) -/* B534E8 80240CB8 AFB20018 */ sw $s2, 0x18($sp) -/* B534EC 80240CBC AFB10014 */ sw $s1, 0x14($sp) -/* B534F0 80240CC0 AFB00010 */ sw $s0, 0x10($sp) -/* B534F4 80240CC4 8E720148 */ lw $s2, 0x148($s3) -/* B534F8 80240CC8 86440008 */ lh $a0, 8($s2) -/* B534FC 80240CCC 0C00EABB */ jal get_npc_unsafe -/* B53500 80240CD0 00A0882D */ daddu $s1, $a1, $zero -/* B53504 80240CD4 8E240008 */ lw $a0, 8($s1) -/* B53508 80240CD8 0040802D */ daddu $s0, $v0, $zero -/* B5350C 80240CDC 00041FC2 */ srl $v1, $a0, 0x1f -/* B53510 80240CE0 00832021 */ addu $a0, $a0, $v1 -/* B53514 80240CE4 00042043 */ sra $a0, $a0, 1 -/* B53518 80240CE8 0C00A67F */ jal rand_int -/* B5351C 80240CEC 24840001 */ addiu $a0, $a0, 1 -/* B53520 80240CF0 8E230008 */ lw $v1, 8($s1) -/* B53524 80240CF4 240400B4 */ addiu $a0, $zero, 0xb4 -/* B53528 80240CF8 00032FC2 */ srl $a1, $v1, 0x1f -/* B5352C 80240CFC 00651821 */ addu $v1, $v1, $a1 -/* B53530 80240D00 00031843 */ sra $v1, $v1, 1 -/* B53534 80240D04 00621821 */ addu $v1, $v1, $v0 -/* B53538 80240D08 0C00A67F */ jal rand_int -/* B5353C 80240D0C A603008E */ sh $v1, 0x8e($s0) -/* B53540 80240D10 C60C000C */ lwc1 $f12, 0xc($s0) -/* B53544 80240D14 44820000 */ mtc1 $v0, $f0 -/* B53548 80240D18 00000000 */ nop -/* B5354C 80240D1C 46800020 */ cvt.s.w $f0, $f0 -/* B53550 80240D20 46006300 */ add.s $f12, $f12, $f0 -/* B53554 80240D24 3C0142B4 */ lui $at, 0x42b4 -/* B53558 80240D28 44810000 */ mtc1 $at, $f0 -/* B5355C 80240D2C 0C00A6C9 */ jal clamp_angle -/* B53560 80240D30 46006301 */ sub.s $f12, $f12, $f0 -/* B53564 80240D34 E600000C */ swc1 $f0, 0xc($s0) -/* B53568 80240D38 8E4200CC */ lw $v0, 0xcc($s2) -/* B5356C 80240D3C 8C420000 */ lw $v0, ($v0) -/* B53570 80240D40 AE020028 */ sw $v0, 0x28($s0) -/* B53574 80240D44 24020003 */ addiu $v0, $zero, 3 -/* B53578 80240D48 AE620070 */ sw $v0, 0x70($s3) -/* B5357C 80240D4C 8FBF0020 */ lw $ra, 0x20($sp) -/* B53580 80240D50 8FB3001C */ lw $s3, 0x1c($sp) -/* B53584 80240D54 8FB20018 */ lw $s2, 0x18($sp) -/* B53588 80240D58 8FB10014 */ lw $s1, 0x14($sp) -/* B5358C 80240D5C 8FB00010 */ lw $s0, 0x10($sp) -/* B53590 80240D60 03E00008 */ jr $ra -/* B53594 80240D64 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_80240F0C_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_80240F0C_B52830.s deleted file mode 100644 index 56035526df..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_80240F0C_B52830.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F0C_B5373C -/* B5373C 80240F0C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B53740 80240F10 AFB10014 */ sw $s1, 0x14($sp) -/* B53744 80240F14 0080882D */ daddu $s1, $a0, $zero -/* B53748 80240F18 AFBF001C */ sw $ra, 0x1c($sp) -/* B5374C 80240F1C AFB20018 */ sw $s2, 0x18($sp) -/* B53750 80240F20 AFB00010 */ sw $s0, 0x10($sp) -/* B53754 80240F24 8E220148 */ lw $v0, 0x148($s1) -/* B53758 80240F28 00A0902D */ daddu $s2, $a1, $zero -/* B5375C 80240F2C 84440008 */ lh $a0, 8($v0) -/* B53760 80240F30 0C00EABB */ jal get_npc_unsafe -/* B53764 80240F34 00C0802D */ daddu $s0, $a2, $zero -/* B53768 80240F38 0220202D */ daddu $a0, $s1, $zero -/* B5376C 80240F3C 0240282D */ daddu $a1, $s2, $zero -/* B53770 80240F40 0200302D */ daddu $a2, $s0, $zero -/* B53774 80240F44 0C0127DF */ jal func_80049F7C -/* B53778 80240F48 0040802D */ daddu $s0, $v0, $zero -/* B5377C 80240F4C 8E020000 */ lw $v0, ($s0) -/* B53780 80240F50 24040005 */ addiu $a0, $zero, 5 -/* B53784 80240F54 34420800 */ ori $v0, $v0, 0x800 -/* B53788 80240F58 0C00A67F */ jal rand_int -/* B5378C 80240F5C AE020000 */ sw $v0, ($s0) -/* B53790 80240F60 44820000 */ mtc1 $v0, $f0 -/* B53794 80240F64 00000000 */ nop -/* B53798 80240F68 46800021 */ cvt.d.w $f0, $f0 -/* B5379C 80240F6C 3C014024 */ lui $at, 0x4024 -/* B537A0 80240F70 44811800 */ mtc1 $at, $f3 -/* B537A4 80240F74 44801000 */ mtc1 $zero, $f2 -/* B537A8 80240F78 3C013FC0 */ lui $at, 0x3fc0 -/* B537AC 80240F7C 44812000 */ mtc1 $at, $f4 -/* B537B0 80240F80 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B537B4 80240F84 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B537B8 80240F88 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B537BC 80240F8C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B537C0 80240F90 46220000 */ add.d $f0, $f0, $f2 -/* B537C4 80240F94 E6040014 */ swc1 $f4, 0x14($s0) -/* B537C8 80240F98 46200020 */ cvt.s.d $f0, $f0 -/* B537CC 80240F9C E600001C */ swc1 $f0, 0x1c($s0) -/* B537D0 80240FA0 8C460028 */ lw $a2, 0x28($v0) -/* B537D4 80240FA4 0C00A720 */ jal atan2 -/* B537D8 80240FA8 8C470030 */ lw $a3, 0x30($v0) -/* B537DC 80240FAC 0200202D */ daddu $a0, $s0, $zero -/* B537E0 80240FB0 3C05B000 */ lui $a1, 0xb000 -/* B537E4 80240FB4 34A50017 */ ori $a1, $a1, 0x17 -/* B537E8 80240FB8 0000302D */ daddu $a2, $zero, $zero -/* B537EC 80240FBC E480000C */ swc1 $f0, 0xc($a0) -/* B537F0 80240FC0 C6400018 */ lwc1 $f0, 0x18($s2) -/* B537F4 80240FC4 2402000D */ addiu $v0, $zero, 0xd -/* B537F8 80240FC8 E4800018 */ swc1 $f0, 0x18($a0) -/* B537FC 80240FCC 0C012530 */ jal func_800494C0 -/* B53800 80240FD0 AE220070 */ sw $v0, 0x70($s1) -/* B53804 80240FD4 8FBF001C */ lw $ra, 0x1c($sp) -/* B53808 80240FD8 8FB20018 */ lw $s2, 0x18($sp) -/* B5380C 80240FDC 8FB10014 */ lw $s1, 0x14($sp) -/* B53810 80240FE0 8FB00010 */ lw $s0, 0x10($sp) -/* B53814 80240FE4 03E00008 */ jr $ra -/* B53818 80240FE8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_80240FEC_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_80240FEC_B52830.s deleted file mode 100644 index f3253c49f1..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_80240FEC_B52830.s +++ /dev/null @@ -1,200 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FEC_B5381C -/* B5381C 80240FEC 27BDFF90 */ addiu $sp, $sp, -0x70 -/* B53820 80240FF0 AFB40050 */ sw $s4, 0x50($sp) -/* B53824 80240FF4 0080A02D */ daddu $s4, $a0, $zero -/* B53828 80240FF8 AFBF0060 */ sw $ra, 0x60($sp) -/* B5382C 80240FFC AFB7005C */ sw $s7, 0x5c($sp) -/* B53830 80241000 AFB60058 */ sw $s6, 0x58($sp) -/* B53834 80241004 AFB50054 */ sw $s5, 0x54($sp) -/* B53838 80241008 AFB3004C */ sw $s3, 0x4c($sp) -/* B5383C 8024100C AFB20048 */ sw $s2, 0x48($sp) -/* B53840 80241010 AFB10044 */ sw $s1, 0x44($sp) -/* B53844 80241014 AFB00040 */ sw $s0, 0x40($sp) -/* B53848 80241018 F7B40068 */ sdc1 $f20, 0x68($sp) -/* B5384C 8024101C 8E950148 */ lw $s5, 0x148($s4) -/* B53850 80241020 00A0B02D */ daddu $s6, $a1, $zero -/* B53854 80241024 86A40008 */ lh $a0, 8($s5) -/* B53858 80241028 0C00EABB */ jal get_npc_unsafe -/* B5385C 8024102C 00C0B82D */ daddu $s7, $a2, $zero -/* B53860 80241030 0040982D */ daddu $s3, $v0, $zero -/* B53864 80241034 C6600018 */ lwc1 $f0, 0x18($s3) -/* B53868 80241038 44801000 */ mtc1 $zero, $f2 -/* B5386C 8024103C 44801800 */ mtc1 $zero, $f3 -/* B53870 80241040 46000021 */ cvt.d.s $f0, $f0 -/* B53874 80241044 4620103C */ c.lt.d $f2, $f0 -/* B53878 80241048 00000000 */ nop -/* B5387C 8024104C 45000021 */ bc1f .L802410D4 -/* B53880 80241050 27A50028 */ addiu $a1, $sp, 0x28 -/* B53884 80241054 C6600038 */ lwc1 $f0, 0x38($s3) -/* B53888 80241058 C662003C */ lwc1 $f2, 0x3c($s3) -/* B5388C 8024105C C6640040 */ lwc1 $f4, 0x40($s3) -/* B53890 80241060 C6660018 */ lwc1 $f6, 0x18($s3) -/* B53894 80241064 E7A00028 */ swc1 $f0, 0x28($sp) -/* B53898 80241068 E7A2002C */ swc1 $f2, 0x2c($sp) -/* B5389C 8024106C E7A40030 */ swc1 $f4, 0x30($sp) -/* B538A0 80241070 E7A60010 */ swc1 $f6, 0x10($sp) -/* B538A4 80241074 C660000C */ lwc1 $f0, 0xc($s3) -/* B538A8 80241078 E7A00014 */ swc1 $f0, 0x14($sp) -/* B538AC 8024107C 866200A8 */ lh $v0, 0xa8($s3) -/* B538B0 80241080 44820000 */ mtc1 $v0, $f0 -/* B538B4 80241084 00000000 */ nop -/* B538B8 80241088 46800020 */ cvt.s.w $f0, $f0 -/* B538BC 8024108C E7A00018 */ swc1 $f0, 0x18($sp) -/* B538C0 80241090 866200A6 */ lh $v0, 0xa6($s3) -/* B538C4 80241094 27A6002C */ addiu $a2, $sp, 0x2c -/* B538C8 80241098 44820000 */ mtc1 $v0, $f0 -/* B538CC 8024109C 00000000 */ nop -/* B538D0 802410A0 46800020 */ cvt.s.w $f0, $f0 -/* B538D4 802410A4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B538D8 802410A8 8E640080 */ lw $a0, 0x80($s3) -/* B538DC 802410AC 0C037711 */ jal func_800DDC44 -/* B538E0 802410B0 27A70030 */ addiu $a3, $sp, 0x30 -/* B538E4 802410B4 10400003 */ beqz $v0, .L802410C4 -/* B538E8 802410B8 00000000 */ nop -/* B538EC 802410BC 08090435 */ j .L802410D4 -/* B538F0 802410C0 AE600018 */ sw $zero, 0x18($s3) -.L802410C4: -/* B538F4 802410C4 8E650018 */ lw $a1, 0x18($s3) -/* B538F8 802410C8 8E66000C */ lw $a2, 0xc($s3) -/* B538FC 802410CC 0C00EA95 */ jal npc_move_heading -/* B53900 802410D0 0260202D */ daddu $a0, $s3, $zero -.L802410D4: -/* B53904 802410D4 C660001C */ lwc1 $f0, 0x1c($s3) -/* B53908 802410D8 44801000 */ mtc1 $zero, $f2 -/* B5390C 802410DC 44801800 */ mtc1 $zero, $f3 -/* B53910 802410E0 46000021 */ cvt.d.s $f0, $f0 -/* B53914 802410E4 4622003C */ c.lt.d $f0, $f2 -/* B53918 802410E8 00000000 */ nop -/* B5391C 802410EC 4500006C */ bc1f .L802412A0 -/* B53920 802410F0 27B00028 */ addiu $s0, $sp, 0x28 -/* B53924 802410F4 0200282D */ daddu $a1, $s0, $zero -/* B53928 802410F8 27A60034 */ addiu $a2, $sp, 0x34 -/* B5392C 802410FC 27B20038 */ addiu $s2, $sp, 0x38 -/* B53930 80241100 C6600038 */ lwc1 $f0, 0x38($s3) -/* B53934 80241104 3C0142C8 */ lui $at, 0x42c8 -/* B53938 80241108 44811000 */ mtc1 $at, $f2 -/* B5393C 8024110C C6640040 */ lwc1 $f4, 0x40($s3) -/* B53940 80241110 3C01447A */ lui $at, 0x447a -/* B53944 80241114 44813000 */ mtc1 $at, $f6 -/* B53948 80241118 27B10030 */ addiu $s1, $sp, 0x30 -/* B5394C 8024111C E7A00028 */ swc1 $f0, 0x28($sp) -/* B53950 80241120 E7A20034 */ swc1 $f2, 0x34($sp) -/* B53954 80241124 E7A40030 */ swc1 $f4, 0x30($sp) -/* B53958 80241128 E7A60038 */ swc1 $f6, 0x38($sp) -/* B5395C 8024112C AFB20010 */ sw $s2, 0x10($sp) -/* B53960 80241130 8E640080 */ lw $a0, 0x80($s3) -/* B53964 80241134 0C0372DF */ jal func_800DCB7C -/* B53968 80241138 0220382D */ daddu $a3, $s1, $zero -/* B5396C 8024113C 0200282D */ daddu $a1, $s0, $zero -/* B53970 80241140 27A6002C */ addiu $a2, $sp, 0x2c -/* B53974 80241144 C662003C */ lwc1 $f2, 0x3c($s3) -/* B53978 80241148 C6660038 */ lwc1 $f6, 0x38($s3) -/* B5397C 8024114C 3C01402A */ lui $at, 0x402a -/* B53980 80241150 4481A800 */ mtc1 $at, $f21 -/* B53984 80241154 4480A000 */ mtc1 $zero, $f20 -/* B53988 80241158 460010A1 */ cvt.d.s $f2, $f2 -/* B5398C 8024115C 46341080 */ add.d $f2, $f2, $f20 -/* B53990 80241160 C660001C */ lwc1 $f0, 0x1c($s3) -/* B53994 80241164 C6640040 */ lwc1 $f4, 0x40($s3) -/* B53998 80241168 46000005 */ abs.s $f0, $f0 -/* B5399C 8024116C E7A40030 */ swc1 $f4, 0x30($sp) -/* B539A0 80241170 3C014030 */ lui $at, 0x4030 -/* B539A4 80241174 44812800 */ mtc1 $at, $f5 -/* B539A8 80241178 44802000 */ mtc1 $zero, $f4 -/* B539AC 8024117C 46000021 */ cvt.d.s $f0, $f0 -/* B539B0 80241180 E7A60028 */ swc1 $f6, 0x28($sp) -/* B539B4 80241184 46240000 */ add.d $f0, $f0, $f4 -/* B539B8 80241188 462010A0 */ cvt.s.d $f2, $f2 -/* B539BC 8024118C E7A2002C */ swc1 $f2, 0x2c($sp) -/* B539C0 80241190 46200020 */ cvt.s.d $f0, $f0 -/* B539C4 80241194 E7A00038 */ swc1 $f0, 0x38($sp) -/* B539C8 80241198 AFB20010 */ sw $s2, 0x10($sp) -/* B539CC 8024119C 8E640080 */ lw $a0, 0x80($s3) -/* B539D0 802411A0 0C0372DF */ jal func_800DCB7C -/* B539D4 802411A4 0220382D */ daddu $a3, $s1, $zero -/* B539D8 802411A8 1040003D */ beqz $v0, .L802412A0 -/* B539DC 802411AC 00000000 */ nop -/* B539E0 802411B0 C660001C */ lwc1 $f0, 0x1c($s3) -/* B539E4 802411B4 C7A20038 */ lwc1 $f2, 0x38($sp) -/* B539E8 802411B8 46000005 */ abs.s $f0, $f0 -/* B539EC 802411BC 46000021 */ cvt.d.s $f0, $f0 -/* B539F0 802411C0 46340000 */ add.d $f0, $f0, $f20 -/* B539F4 802411C4 460010A1 */ cvt.d.s $f2, $f2 -/* B539F8 802411C8 4620103E */ c.le.d $f2, $f0 -/* B539FC 802411CC 00000000 */ nop -/* B53A00 802411D0 45000033 */ bc1f .L802412A0 -/* B53A04 802411D4 2403F7FF */ addiu $v1, $zero, -0x801 -/* B53A08 802411D8 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* B53A0C 802411DC 8E620000 */ lw $v0, ($s3) -/* B53A10 802411E0 AE60001C */ sw $zero, 0x1c($s3) -/* B53A14 802411E4 00431024 */ and $v0, $v0, $v1 -/* B53A18 802411E8 E660003C */ swc1 $f0, 0x3c($s3) -/* B53A1C 802411EC AE620000 */ sw $v0, ($s3) -/* B53A20 802411F0 AFA00010 */ sw $zero, 0x10($sp) -/* B53A24 802411F4 AFA00014 */ sw $zero, 0x14($sp) -/* B53A28 802411F8 8E650038 */ lw $a1, 0x38($s3) -/* B53A2C 802411FC 8E66003C */ lw $a2, 0x3c($s3) -/* B53A30 80241200 8E670040 */ lw $a3, 0x40($s3) -/* B53A34 80241204 0C01BECC */ jal fx_walk_normal -/* B53A38 80241208 24040002 */ addiu $a0, $zero, 2 -/* B53A3C 8024120C 02E0202D */ daddu $a0, $s7, $zero -/* B53A40 80241210 2402000C */ addiu $v0, $zero, 0xc -/* B53A44 80241214 AE820070 */ sw $v0, 0x70($s4) -/* B53A48 80241218 24020001 */ addiu $v0, $zero, 1 -/* B53A4C 8024121C AFA20010 */ sw $v0, 0x10($sp) -/* B53A50 80241220 8EC60024 */ lw $a2, 0x24($s6) -/* B53A54 80241224 8EC70028 */ lw $a3, 0x28($s6) -/* B53A58 80241228 0C01242D */ jal func_800490B4 -/* B53A5C 8024122C 02A0282D */ daddu $a1, $s5, $zero -/* B53A60 80241230 14400022 */ bnez $v0, .L802412BC -/* B53A64 80241234 24040002 */ addiu $a0, $zero, 2 -/* B53A68 80241238 0260282D */ daddu $a1, $s3, $zero -/* B53A6C 8024123C 0000302D */ daddu $a2, $zero, $zero -/* B53A70 80241240 866300A8 */ lh $v1, 0xa8($s3) -/* B53A74 80241244 3C013F80 */ lui $at, 0x3f80 -/* B53A78 80241248 44810000 */ mtc1 $at, $f0 -/* B53A7C 8024124C 3C014000 */ lui $at, 0x4000 -/* B53A80 80241250 44811000 */ mtc1 $at, $f2 -/* B53A84 80241254 3C01C1A0 */ lui $at, 0xc1a0 -/* B53A88 80241258 44812000 */ mtc1 $at, $f4 -/* B53A8C 8024125C 2402000F */ addiu $v0, $zero, 0xf -/* B53A90 80241260 AFA2001C */ sw $v0, 0x1c($sp) -/* B53A94 80241264 44834000 */ mtc1 $v1, $f8 -/* B53A98 80241268 00000000 */ nop -/* B53A9C 8024126C 46804220 */ cvt.s.w $f8, $f8 -/* B53AA0 80241270 44074000 */ mfc1 $a3, $f8 -/* B53AA4 80241274 27A2003C */ addiu $v0, $sp, 0x3c -/* B53AA8 80241278 AFA20020 */ sw $v0, 0x20($sp) -/* B53AAC 8024127C E7A00010 */ swc1 $f0, 0x10($sp) -/* B53AB0 80241280 E7A20014 */ swc1 $f2, 0x14($sp) -/* B53AB4 80241284 0C01BFA4 */ jal fx_emote -/* B53AB8 80241288 E7A40018 */ swc1 $f4, 0x18($sp) -/* B53ABC 8024128C 24020019 */ addiu $v0, $zero, 0x19 -/* B53AC0 80241290 A662008E */ sh $v0, 0x8e($s3) -/* B53AC4 80241294 2402000E */ addiu $v0, $zero, 0xe -/* B53AC8 80241298 080904AF */ j .L802412BC -/* B53ACC 8024129C AE820070 */ sw $v0, 0x70($s4) -.L802412A0: -/* B53AD0 802412A0 C664003C */ lwc1 $f4, 0x3c($s3) -/* B53AD4 802412A4 C660001C */ lwc1 $f0, 0x1c($s3) -/* B53AD8 802412A8 46002100 */ add.s $f4, $f4, $f0 -/* B53ADC 802412AC C6620014 */ lwc1 $f2, 0x14($s3) -/* B53AE0 802412B0 46020001 */ sub.s $f0, $f0, $f2 -/* B53AE4 802412B4 E664003C */ swc1 $f4, 0x3c($s3) -/* B53AE8 802412B8 E660001C */ swc1 $f0, 0x1c($s3) -.L802412BC: -/* B53AEC 802412BC 8FBF0060 */ lw $ra, 0x60($sp) -/* B53AF0 802412C0 8FB7005C */ lw $s7, 0x5c($sp) -/* B53AF4 802412C4 8FB60058 */ lw $s6, 0x58($sp) -/* B53AF8 802412C8 8FB50054 */ lw $s5, 0x54($sp) -/* B53AFC 802412CC 8FB40050 */ lw $s4, 0x50($sp) -/* B53B00 802412D0 8FB3004C */ lw $s3, 0x4c($sp) -/* B53B04 802412D4 8FB20048 */ lw $s2, 0x48($sp) -/* B53B08 802412D8 8FB10044 */ lw $s1, 0x44($sp) -/* B53B0C 802412DC 8FB00040 */ lw $s0, 0x40($sp) -/* B53B10 802412E0 D7B40068 */ ldc1 $f20, 0x68($sp) -/* B53B14 802412E4 03E00008 */ jr $ra -/* B53B18 802412E8 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_80241330_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_80241330_B52830.s deleted file mode 100644 index 6ded4b1c9e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_80241330_B52830.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241330_B53B60 -/* B53B60 80241330 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B53B64 80241334 AFB3003C */ sw $s3, 0x3c($sp) -/* B53B68 80241338 0080982D */ daddu $s3, $a0, $zero -/* B53B6C 8024133C AFBF0048 */ sw $ra, 0x48($sp) -/* B53B70 80241340 AFB50044 */ sw $s5, 0x44($sp) -/* B53B74 80241344 AFB40040 */ sw $s4, 0x40($sp) -/* B53B78 80241348 AFB20038 */ sw $s2, 0x38($sp) -/* B53B7C 8024134C AFB10034 */ sw $s1, 0x34($sp) -/* B53B80 80241350 AFB00030 */ sw $s0, 0x30($sp) -/* B53B84 80241354 8E720148 */ lw $s2, 0x148($s3) -/* B53B88 80241358 86440008 */ lh $a0, 8($s2) -/* B53B8C 8024135C 8E70000C */ lw $s0, 0xc($s3) -/* B53B90 80241360 0C00EABB */ jal get_npc_unsafe -/* B53B94 80241364 00A0882D */ daddu $s1, $a1, $zero -/* B53B98 80241368 8E050000 */ lw $a1, ($s0) -/* B53B9C 8024136C 26100004 */ addiu $s0, $s0, 4 -/* B53BA0 80241370 0260202D */ daddu $a0, $s3, $zero -/* B53BA4 80241374 0C0B1EAF */ jal get_variable -/* B53BA8 80241378 0040A82D */ daddu $s5, $v0, $zero -/* B53BAC 8024137C 0260202D */ daddu $a0, $s3, $zero -/* B53BB0 80241380 8E050000 */ lw $a1, ($s0) -/* B53BB4 80241384 0C0B1EAF */ jal get_variable -/* B53BB8 80241388 0040A02D */ daddu $s4, $v0, $zero -/* B53BBC 8024138C AE420094 */ sw $v0, 0x94($s2) -/* B53BC0 80241390 AFA00010 */ sw $zero, 0x10($sp) -/* B53BC4 80241394 8E4200D0 */ lw $v0, 0xd0($s2) -/* B53BC8 80241398 8C420030 */ lw $v0, 0x30($v0) -/* B53BCC 8024139C AFA20014 */ sw $v0, 0x14($sp) -/* B53BD0 802413A0 8E4200D0 */ lw $v0, 0xd0($s2) -/* B53BD4 802413A4 8C42001C */ lw $v0, 0x1c($v0) -/* B53BD8 802413A8 AFA20018 */ sw $v0, 0x18($sp) -/* B53BDC 802413AC 8E4200D0 */ lw $v0, 0xd0($s2) -/* B53BE0 802413B0 8C420024 */ lw $v0, 0x24($v0) -/* B53BE4 802413B4 AFA2001C */ sw $v0, 0x1c($sp) -/* B53BE8 802413B8 8E4200D0 */ lw $v0, 0xd0($s2) -/* B53BEC 802413BC 8C420028 */ lw $v0, 0x28($v0) -/* B53BF0 802413C0 AFA20020 */ sw $v0, 0x20($sp) -/* B53BF4 802413C4 8E4200D0 */ lw $v0, 0xd0($s2) -/* B53BF8 802413C8 3C0142C8 */ lui $at, 0x42c8 -/* B53BFC 802413CC 44810000 */ mtc1 $at, $f0 -/* B53C00 802413D0 8C42002C */ lw $v0, 0x2c($v0) -/* B53C04 802413D4 27B00010 */ addiu $s0, $sp, 0x10 -/* B53C08 802413D8 E7A00028 */ swc1 $f0, 0x28($sp) -/* B53C0C 802413DC A7A0002C */ sh $zero, 0x2c($sp) -/* B53C10 802413E0 12200019 */ beqz $s1, .L80241448 -/* B53C14 802413E4 AFA20024 */ sw $v0, 0x24($sp) -/* B53C18 802413E8 AE600070 */ sw $zero, 0x70($s3) -/* B53C1C 802413EC A6A0008E */ sh $zero, 0x8e($s5) -/* B53C20 802413F0 AE600074 */ sw $zero, 0x74($s3) -/* B53C24 802413F4 8EA20000 */ lw $v0, ($s5) -/* B53C28 802413F8 2403F7FF */ addiu $v1, $zero, -0x801 -/* B53C2C 802413FC 00431024 */ and $v0, $v0, $v1 -/* B53C30 80241400 2403FDFF */ addiu $v1, $zero, -0x201 -/* B53C34 80241404 00431024 */ and $v0, $v0, $v1 -/* B53C38 80241408 34420008 */ ori $v0, $v0, 8 -/* B53C3C 8024140C AEA20000 */ sw $v0, ($s5) -/* B53C40 80241410 8E4200B0 */ lw $v0, 0xb0($s2) -/* B53C44 80241414 34420018 */ ori $v0, $v0, 0x18 -/* B53C48 80241418 AE4200B0 */ sw $v0, 0xb0($s2) -/* B53C4C 8024141C 8E420000 */ lw $v0, ($s2) -/* B53C50 80241420 3C034000 */ lui $v1, 0x4000 -/* B53C54 80241424 00431024 */ and $v0, $v0, $v1 -/* B53C58 80241428 10400007 */ beqz $v0, .L80241448 -/* B53C5C 8024142C 3C03BFFF */ lui $v1, 0xbfff -/* B53C60 80241430 2402000C */ addiu $v0, $zero, 0xc -/* B53C64 80241434 AE620070 */ sw $v0, 0x70($s3) -/* B53C68 80241438 8E420000 */ lw $v0, ($s2) -/* B53C6C 8024143C 3463FFFF */ ori $v1, $v1, 0xffff -/* B53C70 80241440 00431024 */ and $v0, $v0, $v1 -/* B53C74 80241444 AE420000 */ sw $v0, ($s2) -.L80241448: -/* B53C78 80241448 8E4300B0 */ lw $v1, 0xb0($s2) -/* B53C7C 8024144C 30620004 */ andi $v0, $v1, 4 -/* B53C80 80241450 10400007 */ beqz $v0, .L80241470 -/* B53C84 80241454 00000000 */ nop -/* B53C88 80241458 824200B4 */ lb $v0, 0xb4($s2) -/* B53C8C 8024145C 14400034 */ bnez $v0, .L80241530 -/* B53C90 80241460 0000102D */ daddu $v0, $zero, $zero -/* B53C94 80241464 2402FFFB */ addiu $v0, $zero, -5 -/* B53C98 80241468 00621024 */ and $v0, $v1, $v0 -/* B53C9C 8024146C AE4200B0 */ sw $v0, 0xb0($s2) -.L80241470: -/* B53CA0 80241470 8E630070 */ lw $v1, 0x70($s3) -/* B53CA4 80241474 2C62000F */ sltiu $v0, $v1, 0xf -/* B53CA8 80241478 1040002C */ beqz $v0, .L8024152C -/* B53CAC 8024147C 00031080 */ sll $v0, $v1, 2 -/* B53CB0 80241480 3C018024 */ lui $at, 0x8024 -/* B53CB4 80241484 00220821 */ addu $at, $at, $v0 -/* B53CB8 80241488 8C226CB8 */ lw $v0, 0x6cb8($at) -/* B53CBC 8024148C 00400008 */ jr $v0 -/* B53CC0 80241490 00000000 */ nop -/* B53CC4 80241494 0260202D */ daddu $a0, $s3, $zero -/* B53CC8 80241498 0280282D */ daddu $a1, $s4, $zero -/* B53CCC 8024149C 0C0901D0 */ jal func_80240740 -/* B53CD0 802414A0 0200302D */ daddu $a2, $s0, $zero -/* B53CD4 802414A4 0260202D */ daddu $a0, $s3, $zero -/* B53CD8 802414A8 0280282D */ daddu $a1, $s4, $zero -/* B53CDC 802414AC 0C09025C */ jal func_80240970 -/* B53CE0 802414B0 0200302D */ daddu $a2, $s0, $zero -/* B53CE4 802414B4 0809054C */ j .L80241530 -/* B53CE8 802414B8 0000102D */ daddu $v0, $zero, $zero -/* B53CEC 802414BC 0260202D */ daddu $a0, $s3, $zero -/* B53CF0 802414C0 0280282D */ daddu $a1, $s4, $zero -/* B53CF4 802414C4 0C09032A */ jal func_80240CA8 -/* B53CF8 802414C8 0200302D */ daddu $a2, $s0, $zero -/* B53CFC 802414CC 8E630070 */ lw $v1, 0x70($s3) -/* B53D00 802414D0 24020003 */ addiu $v0, $zero, 3 -/* B53D04 802414D4 14620016 */ bne $v1, $v0, .L80241530 -/* B53D08 802414D8 0000102D */ daddu $v0, $zero, $zero -/* B53D0C 802414DC 0260202D */ daddu $a0, $s3, $zero -/* B53D10 802414E0 0280282D */ daddu $a1, $s4, $zero -/* B53D14 802414E4 0C09035A */ jal delete_player_actor -/* B53D18 802414E8 0200302D */ daddu $a2, $s0, $zero -/* B53D1C 802414EC 0809054C */ j .L80241530 -/* B53D20 802414F0 0000102D */ daddu $v0, $zero, $zero -/* B53D24 802414F4 0260202D */ daddu $a0, $s3, $zero -/* B53D28 802414F8 0280282D */ daddu $a1, $s4, $zero -/* B53D2C 802414FC 0C0903C3 */ jal func_80240F0C -/* B53D30 80241500 0200302D */ daddu $a2, $s0, $zero -/* B53D34 80241504 0260202D */ daddu $a0, $s3, $zero -/* B53D38 80241508 0280282D */ daddu $a1, $s4, $zero -/* B53D3C 8024150C 0C0903FB */ jal func_80240FEC -/* B53D40 80241510 0200302D */ daddu $a2, $s0, $zero -/* B53D44 80241514 0809054C */ j .L80241530 -/* B53D48 80241518 0000102D */ daddu $v0, $zero, $zero -/* B53D4C 8024151C 0260202D */ daddu $a0, $s3, $zero -/* B53D50 80241520 0280282D */ daddu $a1, $s4, $zero -/* B53D54 80241524 0C0904BB */ jal func_802412EC -/* B53D58 80241528 0200302D */ daddu $a2, $s0, $zero -.L8024152C: -/* B53D5C 8024152C 0000102D */ daddu $v0, $zero, $zero -.L80241530: -/* B53D60 80241530 8FBF0048 */ lw $ra, 0x48($sp) -/* B53D64 80241534 8FB50044 */ lw $s5, 0x44($sp) -/* B53D68 80241538 8FB40040 */ lw $s4, 0x40($sp) -/* B53D6C 8024153C 8FB3003C */ lw $s3, 0x3c($sp) -/* B53D70 80241540 8FB20038 */ lw $s2, 0x38($sp) -/* B53D74 80241544 8FB10034 */ lw $s1, 0x34($sp) -/* B53D78 80241548 8FB00030 */ lw $s0, 0x30($sp) -/* B53D7C 8024154C 03E00008 */ jr $ra -/* B53D80 80241550 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_80241554_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_80241554_B52830.s deleted file mode 100644 index 75c16bc8a9..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_80241554_B52830.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241554_B53D84 -/* B53D84 80241554 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B53D88 80241558 AFBF0020 */ sw $ra, 0x20($sp) -/* B53D8C 8024155C AFB1001C */ sw $s1, 0x1c($sp) -/* B53D90 80241560 AFB00018 */ sw $s0, 0x18($sp) -/* B53D94 80241564 8C910148 */ lw $s1, 0x148($a0) -/* B53D98 80241568 0C00EABB */ jal get_npc_unsafe -/* B53D9C 8024156C 86240008 */ lh $a0, 8($s1) -/* B53DA0 80241570 8E23006C */ lw $v1, 0x6c($s1) -/* B53DA4 80241574 28630005 */ slti $v1, $v1, 5 -/* B53DA8 80241578 1060001D */ beqz $v1, .L802415F0 -/* B53DAC 8024157C 0040802D */ daddu $s0, $v0, $zero -/* B53DB0 80241580 0C00A67F */ jal rand_int -/* B53DB4 80241584 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B53DB8 80241588 2842012D */ slti $v0, $v0, 0x12d -/* B53DBC 8024158C 14400018 */ bnez $v0, .L802415F0 -/* B53DC0 80241590 24020003 */ addiu $v0, $zero, 3 -/* B53DC4 80241594 860300A8 */ lh $v1, 0xa8($s0) -/* B53DC8 80241598 C604003C */ lwc1 $f4, 0x3c($s0) -/* B53DCC 8024159C C6000040 */ lwc1 $f0, 0x40($s0) -/* B53DD0 802415A0 3C014014 */ lui $at, 0x4014 -/* B53DD4 802415A4 44811800 */ mtc1 $at, $f3 -/* B53DD8 802415A8 44801000 */ mtc1 $zero, $f2 -/* B53DDC 802415AC AFA20010 */ sw $v0, 0x10($sp) -/* B53DE0 802415B0 46000021 */ cvt.d.s $f0, $f0 -/* B53DE4 802415B4 46220000 */ add.d $f0, $f0, $f2 -/* B53DE8 802415B8 AFA00014 */ sw $zero, 0x14($sp) -/* B53DEC 802415BC 44831000 */ mtc1 $v1, $f2 -/* B53DF0 802415C0 00000000 */ nop -/* B53DF4 802415C4 468010A0 */ cvt.s.w $f2, $f2 -/* B53DF8 802415C8 46022100 */ add.s $f4, $f4, $f2 -/* B53DFC 802415CC 8E050038 */ lw $a1, 0x38($s0) -/* B53E00 802415D0 46200020 */ cvt.s.d $f0, $f0 -/* B53E04 802415D4 44062000 */ mfc1 $a2, $f4 -/* B53E08 802415D8 44070000 */ mfc1 $a3, $f0 -/* B53E0C 802415DC 0C04C6A5 */ jal make_item_entity_nodelay -/* B53E10 802415E0 24040156 */ addiu $a0, $zero, 0x156 -/* B53E14 802415E4 8E22006C */ lw $v0, 0x6c($s1) -/* B53E18 802415E8 24420001 */ addiu $v0, $v0, 1 -/* B53E1C 802415EC AE22006C */ sw $v0, 0x6c($s1) -.L802415F0: -/* B53E20 802415F0 8FBF0020 */ lw $ra, 0x20($sp) -/* B53E24 802415F4 8FB1001C */ lw $s1, 0x1c($sp) -/* B53E28 802415F8 8FB00018 */ lw $s0, 0x18($sp) -/* B53E2C 802415FC 24020002 */ addiu $v0, $zero, 2 -/* B53E30 80241600 03E00008 */ jr $ra -/* B53E34 80241604 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_80241608_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_80241608_B52830.s deleted file mode 100644 index 8a374ca252..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_80241608_B52830.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241608_B53E38 -/* B53E38 80241608 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B53E3C 8024160C AFB10014 */ sw $s1, 0x14($sp) -/* B53E40 80241610 0080882D */ daddu $s1, $a0, $zero -/* B53E44 80241614 AFBF0018 */ sw $ra, 0x18($sp) -/* B53E48 80241618 AFB00010 */ sw $s0, 0x10($sp) -/* B53E4C 8024161C 8E300148 */ lw $s0, 0x148($s1) -/* B53E50 80241620 0C00EABB */ jal get_npc_unsafe -/* B53E54 80241624 86040008 */ lh $a0, 8($s0) -/* B53E58 80241628 3C054387 */ lui $a1, 0x4387 -/* B53E5C 8024162C 0040202D */ daddu $a0, $v0, $zero -/* B53E60 80241630 0C00ECD0 */ jal set_npc_yaw -/* B53E64 80241634 A480008E */ sh $zero, 0x8e($a0) -/* B53E68 80241638 24020003 */ addiu $v0, $zero, 3 -/* B53E6C 8024163C AE00006C */ sw $zero, 0x6c($s0) -/* B53E70 80241640 AE220070 */ sw $v0, 0x70($s1) -/* B53E74 80241644 8FBF0018 */ lw $ra, 0x18($sp) -/* B53E78 80241648 8FB10014 */ lw $s1, 0x14($sp) -/* B53E7C 8024164C 8FB00010 */ lw $s0, 0x10($sp) -/* B53E80 80241650 03E00008 */ jr $ra -/* B53E84 80241654 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_80241658_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_80241658_B52830.s deleted file mode 100644 index 7693d8a396..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_80241658_B52830.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241658_B53E88 -/* B53E88 80241658 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B53E8C 8024165C AFB20028 */ sw $s2, 0x28($sp) -/* B53E90 80241660 0080902D */ daddu $s2, $a0, $zero -/* B53E94 80241664 AFBF002C */ sw $ra, 0x2c($sp) -/* B53E98 80241668 AFB10024 */ sw $s1, 0x24($sp) -/* B53E9C 8024166C AFB00020 */ sw $s0, 0x20($sp) -/* B53EA0 80241670 8E500148 */ lw $s0, 0x148($s2) -/* B53EA4 80241674 0C00EABB */ jal get_npc_unsafe -/* B53EA8 80241678 86040008 */ lh $a0, 8($s0) -/* B53EAC 8024167C 8E03006C */ lw $v1, 0x6c($s0) -/* B53EB0 80241680 1460000B */ bnez $v1, .L802416B0 -/* B53EB4 80241684 0040882D */ daddu $s1, $v0, $zero -/* B53EB8 80241688 0C00A67F */ jal rand_int -/* B53EBC 8024168C 24040064 */ addiu $a0, $zero, 0x64 -/* B53EC0 80241690 28420032 */ slti $v0, $v0, 0x32 -/* B53EC4 80241694 14400002 */ bnez $v0, .L802416A0 -/* B53EC8 80241698 24020001 */ addiu $v0, $zero, 1 -/* B53ECC 8024169C 24020003 */ addiu $v0, $zero, 3 -.L802416A0: -/* B53ED0 802416A0 AE02006C */ sw $v0, 0x6c($s0) -/* B53ED4 802416A4 3C054387 */ lui $a1, 0x4387 -/* B53ED8 802416A8 0C00ECD0 */ jal set_npc_yaw -/* B53EDC 802416AC 0220202D */ daddu $a0, $s1, $zero -.L802416B0: -/* B53EE0 802416B0 8E02006C */ lw $v0, 0x6c($s0) -/* B53EE4 802416B4 2443FFFF */ addiu $v1, $v0, -1 -/* B53EE8 802416B8 2C620006 */ sltiu $v0, $v1, 6 -/* B53EEC 802416BC 1040004D */ beqz $v0, .L802417F4 -/* B53EF0 802416C0 00031080 */ sll $v0, $v1, 2 -/* B53EF4 802416C4 3C018024 */ lui $at, 0x8024 -/* B53EF8 802416C8 00220821 */ addu $at, $at, $v0 -/* B53EFC 802416CC 8C226CF8 */ lw $v0, 0x6cf8($at) -/* B53F00 802416D0 00400008 */ jr $v0 -/* B53F04 802416D4 00000000 */ nop -/* B53F08 802416D8 3C030042 */ lui $v1, 0x42 -/* B53F0C 802416DC 3463000F */ ori $v1, $v1, 0xf -/* B53F10 802416E0 24020002 */ addiu $v0, $zero, 2 -/* B53F14 802416E4 AE02006C */ sw $v0, 0x6c($s0) -/* B53F18 802416E8 AE000070 */ sw $zero, 0x70($s0) -/* B53F1C 802416EC AE230028 */ sw $v1, 0x28($s1) -/* B53F20 802416F0 8E020070 */ lw $v0, 0x70($s0) -/* B53F24 802416F4 24420001 */ addiu $v0, $v0, 1 -/* B53F28 802416F8 AE020070 */ sw $v0, 0x70($s0) -/* B53F2C 802416FC 28420033 */ slti $v0, $v0, 0x33 -/* B53F30 80241700 1440003C */ bnez $v0, .L802417F4 -/* B53F34 80241704 24020005 */ addiu $v0, $zero, 5 -/* B53F38 80241708 080905FD */ j .L802417F4 -/* B53F3C 8024170C AE02006C */ sw $v0, 0x6c($s0) -/* B53F40 80241710 3C030042 */ lui $v1, 0x42 -/* B53F44 80241714 34630010 */ ori $v1, $v1, 0x10 -/* B53F48 80241718 24020004 */ addiu $v0, $zero, 4 -/* B53F4C 8024171C AE02006C */ sw $v0, 0x6c($s0) -/* B53F50 80241720 AE000070 */ sw $zero, 0x70($s0) -/* B53F54 80241724 AE230028 */ sw $v1, 0x28($s1) -/* B53F58 80241728 8E020070 */ lw $v0, 0x70($s0) -/* B53F5C 8024172C 24030019 */ addiu $v1, $zero, 0x19 -/* B53F60 80241730 24420001 */ addiu $v0, $v0, 1 -/* B53F64 80241734 14430005 */ bne $v0, $v1, .L8024174C -/* B53F68 80241738 AE020070 */ sw $v0, 0x70($s0) -/* B53F6C 8024173C 3C0142B4 */ lui $at, 0x42b4 -/* B53F70 80241740 44810000 */ mtc1 $at, $f0 -/* B53F74 80241744 00000000 */ nop -/* B53F78 80241748 E620000C */ swc1 $f0, 0xc($s1) -.L8024174C: -/* B53F7C 8024174C 8E020070 */ lw $v0, 0x70($s0) -/* B53F80 80241750 2842003D */ slti $v0, $v0, 0x3d -/* B53F84 80241754 14400027 */ bnez $v0, .L802417F4 -/* B53F88 80241758 24020005 */ addiu $v0, $zero, 5 -/* B53F8C 8024175C 080905FD */ j .L802417F4 -/* B53F90 80241760 AE02006C */ sw $v0, 0x6c($s0) -/* B53F94 80241764 3C030042 */ lui $v1, 0x42 -/* B53F98 80241768 24020006 */ addiu $v0, $zero, 6 -/* B53F9C 8024176C 34630003 */ ori $v1, $v1, 3 -/* B53FA0 80241770 AE02006C */ sw $v0, 0x6c($s0) -/* B53FA4 80241774 AE000070 */ sw $zero, 0x70($s0) -/* B53FA8 80241778 862400A8 */ lh $a0, 0xa8($s1) -/* B53FAC 8024177C 2402000A */ addiu $v0, $zero, 0xa -/* B53FB0 80241780 AE230028 */ sw $v1, 0x28($s1) -/* B53FB4 80241784 AFA00014 */ sw $zero, 0x14($sp) -/* B53FB8 80241788 AFA20018 */ sw $v0, 0x18($sp) -/* B53FBC 8024178C 44840000 */ mtc1 $a0, $f0 -/* B53FC0 80241790 00000000 */ nop -/* B53FC4 80241794 46800020 */ cvt.s.w $f0, $f0 -/* B53FC8 80241798 E7A00010 */ swc1 $f0, 0x10($sp) -/* B53FCC 8024179C 8E250038 */ lw $a1, 0x38($s1) -/* B53FD0 802417A0 8E26003C */ lw $a2, 0x3c($s1) -/* B53FD4 802417A4 8E270040 */ lw $a3, 0x40($s1) -/* B53FD8 802417A8 0C01C1E4 */ jal fx_sweat -/* B53FDC 802417AC 0000202D */ daddu $a0, $zero, $zero -/* B53FE0 802417B0 8E020070 */ lw $v0, 0x70($s0) -/* B53FE4 802417B4 24420001 */ addiu $v0, $v0, 1 -/* B53FE8 802417B8 AE020070 */ sw $v0, 0x70($s0) -/* B53FEC 802417BC 2842000B */ slti $v0, $v0, 0xb -/* B53FF0 802417C0 1440000C */ bnez $v0, .L802417F4 -/* B53FF4 802417C4 00000000 */ nop -/* B53FF8 802417C8 0C00A67F */ jal rand_int -/* B53FFC 802417CC 24040064 */ addiu $a0, $zero, 0x64 -/* B54000 802417D0 0040182D */ daddu $v1, $v0, $zero -/* B54004 802417D4 2862005A */ slti $v0, $v1, 0x5a -/* B54008 802417D8 14400005 */ bnez $v0, .L802417F0 -/* B5400C 802417DC 24020007 */ addiu $v0, $zero, 7 -/* B54010 802417E0 2862005F */ slti $v0, $v1, 0x5f -/* B54014 802417E4 14400002 */ bnez $v0, .L802417F0 -/* B54018 802417E8 24020001 */ addiu $v0, $zero, 1 -/* B5401C 802417EC 24020003 */ addiu $v0, $zero, 3 -.L802417F0: -/* B54020 802417F0 AE02006C */ sw $v0, 0x6c($s0) -.L802417F4: -/* B54024 802417F4 8E03006C */ lw $v1, 0x6c($s0) -/* B54028 802417F8 24020007 */ addiu $v0, $zero, 7 -/* B5402C 802417FC 50620001 */ beql $v1, $v0, .L80241804 -/* B54030 80241800 AE400070 */ sw $zero, 0x70($s2) -.L80241804: -/* B54034 80241804 8FBF002C */ lw $ra, 0x2c($sp) -/* B54038 80241808 8FB20028 */ lw $s2, 0x28($sp) -/* B5403C 8024180C 8FB10024 */ lw $s1, 0x24($sp) -/* B54040 80241810 8FB00020 */ lw $s0, 0x20($sp) -/* B54044 80241814 03E00008 */ jr $ra -/* B54048 80241818 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_8024181C_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_8024181C_B52830.s deleted file mode 100644 index 1f947ce7eb..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_8024181C_B52830.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024181C_B5404C -/* B5404C 8024181C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B54050 80241820 AFB10014 */ sw $s1, 0x14($sp) -/* B54054 80241824 0080882D */ daddu $s1, $a0, $zero -/* B54058 80241828 AFBF0018 */ sw $ra, 0x18($sp) -/* B5405C 8024182C AFB00010 */ sw $s0, 0x10($sp) -/* B54060 80241830 8E300148 */ lw $s0, 0x148($s1) -/* B54064 80241834 0C00EABB */ jal get_npc_unsafe -/* B54068 80241838 86040008 */ lh $a0, 8($s0) -/* B5406C 8024183C 24030001 */ addiu $v1, $zero, 1 -/* B54070 80241840 0040202D */ daddu $a0, $v0, $zero -/* B54074 80241844 AE03006C */ sw $v1, 0x6c($s0) -/* B54078 80241848 8482008C */ lh $v0, 0x8c($a0) -/* B5407C 8024184C 14400009 */ bnez $v0, .L80241874 -/* B54080 80241850 24020002 */ addiu $v0, $zero, 2 -/* B54084 80241854 96030072 */ lhu $v1, 0x72($s0) -/* B54088 80241858 AE02006C */ sw $v0, 0x6c($s0) -/* B5408C 8024185C A483008E */ sh $v1, 0x8e($a0) -/* B54090 80241860 8E0200CC */ lw $v0, 0xcc($s0) -/* B54094 80241864 8C420020 */ lw $v0, 0x20($v0) -/* B54098 80241868 AC820028 */ sw $v0, 0x28($a0) -/* B5409C 8024186C 2402001F */ addiu $v0, $zero, 0x1f -/* B540A0 80241870 AE220070 */ sw $v0, 0x70($s1) -.L80241874: -/* B540A4 80241874 8FBF0018 */ lw $ra, 0x18($sp) -/* B540A8 80241878 8FB10014 */ lw $s1, 0x14($sp) -/* B540AC 8024187C 8FB00010 */ lw $s0, 0x10($sp) -/* B540B0 80241880 03E00008 */ jr $ra -/* B540B4 80241884 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_80241888_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_80241888_B52830.s deleted file mode 100644 index 3a56e24358..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_80241888_B52830.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241888_B540B8 -/* B540B8 80241888 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B540BC 8024188C AFB10014 */ sw $s1, 0x14($sp) -/* B540C0 80241890 0080882D */ daddu $s1, $a0, $zero -/* B540C4 80241894 AFBF0018 */ sw $ra, 0x18($sp) -/* B540C8 80241898 AFB00010 */ sw $s0, 0x10($sp) -/* B540CC 8024189C 8E300148 */ lw $s0, 0x148($s1) -/* B540D0 802418A0 0C00EABB */ jal get_npc_unsafe -/* B540D4 802418A4 86040008 */ lh $a0, 8($s0) -/* B540D8 802418A8 0040202D */ daddu $a0, $v0, $zero -/* B540DC 802418AC 9482008E */ lhu $v0, 0x8e($a0) -/* B540E0 802418B0 2442FFFF */ addiu $v0, $v0, -1 -/* B540E4 802418B4 A482008E */ sh $v0, 0x8e($a0) -/* B540E8 802418B8 00021400 */ sll $v0, $v0, 0x10 -/* B540EC 802418BC 1C400009 */ bgtz $v0, .L802418E4 -/* B540F0 802418C0 24020003 */ addiu $v0, $zero, 3 -/* B540F4 802418C4 96030076 */ lhu $v1, 0x76($s0) -/* B540F8 802418C8 AE02006C */ sw $v0, 0x6c($s0) -/* B540FC 802418CC A483008E */ sh $v1, 0x8e($a0) -/* B54100 802418D0 8E0200CC */ lw $v0, 0xcc($s0) -/* B54104 802418D4 8C420024 */ lw $v0, 0x24($v0) -/* B54108 802418D8 AC820028 */ sw $v0, 0x28($a0) -/* B5410C 802418DC 24020020 */ addiu $v0, $zero, 0x20 -/* B54110 802418E0 AE220070 */ sw $v0, 0x70($s1) -.L802418E4: -/* B54114 802418E4 8FBF0018 */ lw $ra, 0x18($sp) -/* B54118 802418E8 8FB10014 */ lw $s1, 0x14($sp) -/* B5411C 802418EC 8FB00010 */ lw $s0, 0x10($sp) -/* B54120 802418F0 03E00008 */ jr $ra -/* B54124 802418F4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_802419D0_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_802419D0_B52830.s deleted file mode 100644 index d83ba7654d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_802419D0_B52830.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419D0_B54200 -/* B54200 802419D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B54204 802419D4 AFB10014 */ sw $s1, 0x14($sp) -/* B54208 802419D8 0080882D */ daddu $s1, $a0, $zero -/* B5420C 802419DC AFBF0018 */ sw $ra, 0x18($sp) -/* B54210 802419E0 AFB00010 */ sw $s0, 0x10($sp) -/* B54214 802419E4 8E300148 */ lw $s0, 0x148($s1) -/* B54218 802419E8 0C00EABB */ jal get_npc_unsafe -/* B5421C 802419EC 86040008 */ lh $a0, 8($s0) -/* B54220 802419F0 9443008E */ lhu $v1, 0x8e($v0) -/* B54224 802419F4 2463FFFF */ addiu $v1, $v1, -1 -/* B54228 802419F8 A443008E */ sh $v1, 0x8e($v0) -/* B5422C 802419FC 00031C00 */ sll $v1, $v1, 0x10 -/* B54230 80241A00 1C600003 */ bgtz $v1, .L80241A10 -/* B54234 80241A04 2402000C */ addiu $v0, $zero, 0xc -/* B54238 80241A08 AE00006C */ sw $zero, 0x6c($s0) -/* B5423C 80241A0C AE220070 */ sw $v0, 0x70($s1) -.L80241A10: -/* B54240 80241A10 8FBF0018 */ lw $ra, 0x18($sp) -/* B54244 80241A14 8FB10014 */ lw $s1, 0x14($sp) -/* B54248 80241A18 8FB00010 */ lw $s0, 0x10($sp) -/* B5424C 80241A1C 03E00008 */ jr $ra -/* B54250 80241A20 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_80241BD8_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_80241BD8_B52830.s deleted file mode 100644 index b76c33d5f5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_80241BD8_B52830.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BD8_B54408 -/* B54408 80241BD8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B5440C 80241BDC AFB40028 */ sw $s4, 0x28($sp) -/* B54410 80241BE0 0080A02D */ daddu $s4, $a0, $zero -/* B54414 80241BE4 AFBF002C */ sw $ra, 0x2c($sp) -/* B54418 80241BE8 AFB30024 */ sw $s3, 0x24($sp) -/* B5441C 80241BEC AFB20020 */ sw $s2, 0x20($sp) -/* B54420 80241BF0 AFB1001C */ sw $s1, 0x1c($sp) -/* B54424 80241BF4 AFB00018 */ sw $s0, 0x18($sp) -/* B54428 80241BF8 8E910148 */ lw $s1, 0x148($s4) -/* B5442C 80241BFC 86240008 */ lh $a0, 8($s1) -/* B54430 80241C00 0C00EABB */ jal get_npc_unsafe -/* B54434 80241C04 00A0802D */ daddu $s0, $a1, $zero -/* B54438 80241C08 16000005 */ bnez $s0, .L80241C20 -/* B5443C 80241C0C 0040902D */ daddu $s2, $v0, $zero -/* B54440 80241C10 8E2200B0 */ lw $v0, 0xb0($s1) -/* B54444 80241C14 30420004 */ andi $v0, $v0, 4 -/* B54448 80241C18 10400015 */ beqz $v0, .L80241C70 -/* B5444C 80241C1C 00000000 */ nop -.L80241C20: -/* B54450 80241C20 AE800070 */ sw $zero, 0x70($s4) -/* B54454 80241C24 8E420000 */ lw $v0, ($s2) -/* B54458 80241C28 3C031F30 */ lui $v1, 0x1f30 -/* B5445C 80241C2C A640008E */ sh $zero, 0x8e($s2) -/* B54460 80241C30 34420102 */ ori $v0, $v0, 0x102 -/* B54464 80241C34 AE420000 */ sw $v0, ($s2) -/* B54468 80241C38 8E220000 */ lw $v0, ($s1) -/* B5446C 80241C3C 3C01C47A */ lui $at, 0xc47a -/* B54470 80241C40 44810000 */ mtc1 $at, $f0 -/* B54474 80241C44 00431025 */ or $v0, $v0, $v1 -/* B54478 80241C48 AE220000 */ sw $v0, ($s1) -/* B5447C 80241C4C AE400038 */ sw $zero, 0x38($s2) -/* B54480 80241C50 E640003C */ swc1 $f0, 0x3c($s2) -/* B54484 80241C54 AE400040 */ sw $zero, 0x40($s2) -/* B54488 80241C58 8E2300B0 */ lw $v1, 0xb0($s1) -/* B5448C 80241C5C 30620004 */ andi $v0, $v1, 4 -/* B54490 80241C60 10400003 */ beqz $v0, .L80241C70 -/* B54494 80241C64 2402FFFB */ addiu $v0, $zero, -5 -/* B54498 80241C68 00621024 */ and $v0, $v1, $v0 -/* B5449C 80241C6C AE2200B0 */ sw $v0, 0xb0($s1) -.L80241C70: -/* B544A0 80241C70 8E930070 */ lw $s3, 0x70($s4) -/* B544A4 80241C74 12600005 */ beqz $s3, .L80241C8C -/* B544A8 80241C78 24020001 */ addiu $v0, $zero, 1 -/* B544AC 80241C7C 12620048 */ beq $s3, $v0, .L80241DA0 -/* B544B0 80241C80 00000000 */ nop -/* B544B4 80241C84 08090785 */ j .L80241E14 -/* B544B8 80241C88 00000000 */ nop -.L80241C8C: -/* B544BC 80241C8C 86240008 */ lh $a0, 8($s1) -/* B544C0 80241C90 0C00FB3A */ jal get_enemy -/* B544C4 80241C94 2484FFFF */ addiu $a0, $a0, -1 -/* B544C8 80241C98 0040802D */ daddu $s0, $v0, $zero -/* B544CC 80241C9C 0C00EABB */ jal get_npc_unsafe -/* B544D0 80241CA0 86040008 */ lh $a0, 8($s0) -/* B544D4 80241CA4 24030001 */ addiu $v1, $zero, 1 -/* B544D8 80241CA8 0040982D */ daddu $s3, $v0, $zero -/* B544DC 80241CAC A2230007 */ sb $v1, 7($s1) -/* B544E0 80241CB0 8E03006C */ lw $v1, 0x6c($s0) -/* B544E4 80241CB4 24020003 */ addiu $v0, $zero, 3 -/* B544E8 80241CB8 14620056 */ bne $v1, $v0, .L80241E14 -/* B544EC 80241CBC 00000000 */ nop -/* B544F0 80241CC0 8E2500A8 */ lw $a1, 0xa8($s1) -/* B544F4 80241CC4 10A00003 */ beqz $a1, .L80241CD4 -/* B544F8 80241CC8 0260202D */ daddu $a0, $s3, $zero -/* B544FC 80241CCC 0C012530 */ jal func_800494C0 -/* B54500 80241CD0 0000302D */ daddu $a2, $zero, $zero -.L80241CD4: -/* B54504 80241CD4 27A40010 */ addiu $a0, $sp, 0x10 -/* B54508 80241CD8 C6280070 */ lwc1 $f8, 0x70($s1) -/* B5450C 80241CDC 46804220 */ cvt.s.w $f8, $f8 -/* B54510 80241CE0 C6620034 */ lwc1 $f2, 0x34($s3) -/* B54514 80241CE4 3C014387 */ lui $at, 0x4387 -/* B54518 80241CE8 44810000 */ mtc1 $at, $f0 -/* B5451C 80241CEC 44064000 */ mfc1 $a2, $f8 -/* B54520 80241CF0 46020001 */ sub.s $f0, $f0, $f2 -/* B54524 80241CF4 C6660038 */ lwc1 $f6, 0x38($s3) -/* B54528 80241CF8 C6640040 */ lwc1 $f4, 0x40($s3) -/* B5452C 80241CFC 44070000 */ mfc1 $a3, $f0 -/* B54530 80241D00 27A50014 */ addiu $a1, $sp, 0x14 -/* B54534 80241D04 E7A60010 */ swc1 $f6, 0x10($sp) -/* B54538 80241D08 0C00A7E7 */ jal add_vec2D_polar -/* B5453C 80241D0C E7A40014 */ swc1 $f4, 0x14($sp) -/* B54540 80241D10 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B54544 80241D14 4600020D */ trunc.w.s $f8, $f0 -/* B54548 80241D18 44024000 */ mfc1 $v0, $f8 -/* B5454C 80241D1C E6400038 */ swc1 $f0, 0x38($s2) -/* B54550 80241D20 A6220010 */ sh $v0, 0x10($s1) -/* B54554 80241D24 C660003C */ lwc1 $f0, 0x3c($s3) -/* B54558 80241D28 C622006C */ lwc1 $f2, 0x6c($s1) -/* B5455C 80241D2C 468010A0 */ cvt.s.w $f2, $f2 -/* B54560 80241D30 46020000 */ add.s $f0, $f0, $f2 -/* B54564 80241D34 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* B54568 80241D38 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* B5456C 80241D3C E640003C */ swc1 $f0, 0x3c($s2) -/* B54570 80241D40 C7A20014 */ lwc1 $f2, 0x14($sp) -/* B54574 80241D44 4600020D */ trunc.w.s $f8, $f0 -/* B54578 80241D48 44024000 */ mfc1 $v0, $f8 -/* B5457C 80241D4C 00000000 */ nop -/* B54580 80241D50 A6220012 */ sh $v0, 0x12($s1) -/* B54584 80241D54 4600120D */ trunc.w.s $f8, $f2 -/* B54588 80241D58 44024000 */ mfc1 $v0, $f8 -/* B5458C 80241D5C E6420040 */ swc1 $f2, 0x40($s2) -/* B54590 80241D60 A6220014 */ sh $v0, 0x14($s1) -/* B54594 80241D64 8C660028 */ lw $a2, 0x28($v1) -/* B54598 80241D68 8C670030 */ lw $a3, 0x30($v1) -/* B5459C 80241D6C C64C0038 */ lwc1 $f12, 0x38($s2) -/* B545A0 80241D70 0C00A720 */ jal atan2 -/* B545A4 80241D74 C64E0040 */ lwc1 $f14, 0x40($s2) -/* B545A8 80241D78 3C03E0EF */ lui $v1, 0xe0ef -/* B545AC 80241D7C E640000C */ swc1 $f0, 0xc($s2) -/* B545B0 80241D80 8E220000 */ lw $v0, ($s1) -/* B545B4 80241D84 3463FFFF */ ori $v1, $v1, 0xffff -/* B545B8 80241D88 00431024 */ and $v0, $v0, $v1 -/* B545BC 80241D8C AE220000 */ sw $v0, ($s1) -/* B545C0 80241D90 24020001 */ addiu $v0, $zero, 1 -/* B545C4 80241D94 A640008E */ sh $zero, 0x8e($s2) -/* B545C8 80241D98 08090785 */ j .L80241E14 -/* B545CC 80241D9C AE820070 */ sw $v0, 0x70($s4) -.L80241DA0: -/* B545D0 80241DA0 86240008 */ lh $a0, 8($s1) -/* B545D4 80241DA4 0C00FB3A */ jal get_enemy -/* B545D8 80241DA8 2484FFFF */ addiu $a0, $a0, -1 -/* B545DC 80241DAC 0040802D */ daddu $s0, $v0, $zero -/* B545E0 80241DB0 0C00EABB */ jal get_npc_unsafe -/* B545E4 80241DB4 86040008 */ lh $a0, 8($s0) -/* B545E8 80241DB8 9642008E */ lhu $v0, 0x8e($s2) -/* B545EC 80241DBC 24420001 */ addiu $v0, $v0, 1 -/* B545F0 80241DC0 A642008E */ sh $v0, 0x8e($s2) -/* B545F4 80241DC4 00021400 */ sll $v0, $v0, 0x10 -/* B545F8 80241DC8 8E23007C */ lw $v1, 0x7c($s1) -/* B545FC 80241DCC 00021403 */ sra $v0, $v0, 0x10 -/* B54600 80241DD0 0043102A */ slt $v0, $v0, $v1 -/* B54604 80241DD4 50400001 */ beql $v0, $zero, .L80241DDC -/* B54608 80241DD8 A2200007 */ sb $zero, 7($s1) -.L80241DDC: -/* B5460C 80241DDC 8E03006C */ lw $v1, 0x6c($s0) -/* B54610 80241DE0 24020004 */ addiu $v0, $zero, 4 -/* B54614 80241DE4 1462000B */ bne $v1, $v0, .L80241E14 -/* B54618 80241DE8 3C021F10 */ lui $v0, 0x1f10 -/* B5461C 80241DEC 8E230000 */ lw $v1, ($s1) -/* B54620 80241DF0 3C01C47A */ lui $at, 0xc47a -/* B54624 80241DF4 44810000 */ mtc1 $at, $f0 -/* B54628 80241DF8 00621825 */ or $v1, $v1, $v0 -/* B5462C 80241DFC AE230000 */ sw $v1, ($s1) -/* B54630 80241E00 AE400038 */ sw $zero, 0x38($s2) -/* B54634 80241E04 E640003C */ swc1 $f0, 0x3c($s2) -/* B54638 80241E08 AE400040 */ sw $zero, 0x40($s2) -/* B5463C 80241E0C A2330007 */ sb $s3, 7($s1) -/* B54640 80241E10 AE800070 */ sw $zero, 0x70($s4) -.L80241E14: -/* B54644 80241E14 8FBF002C */ lw $ra, 0x2c($sp) -/* B54648 80241E18 8FB40028 */ lw $s4, 0x28($sp) -/* B5464C 80241E1C 8FB30024 */ lw $s3, 0x24($sp) -/* B54650 80241E20 8FB20020 */ lw $s2, 0x20($sp) -/* B54654 80241E24 8FB1001C */ lw $s1, 0x1c($sp) -/* B54658 80241E28 8FB00018 */ lw $s0, 0x18($sp) -/* B5465C 80241E2C 0000102D */ daddu $v0, $zero, $zero -/* B54660 80241E30 03E00008 */ jr $ra -/* B54664 80241E34 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_802420EC_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_802420EC_B52830.s deleted file mode 100644 index e867d4ec30..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_802420EC_B52830.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420EC_B5491C -/* B5491C 802420EC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B54920 802420F0 AFB20038 */ sw $s2, 0x38($sp) -/* B54924 802420F4 0080902D */ daddu $s2, $a0, $zero -/* B54928 802420F8 AFBF0048 */ sw $ra, 0x48($sp) -/* B5492C 802420FC AFB50044 */ sw $s5, 0x44($sp) -/* B54930 80242100 AFB40040 */ sw $s4, 0x40($sp) -/* B54934 80242104 AFB3003C */ sw $s3, 0x3c($sp) -/* B54938 80242108 AFB10034 */ sw $s1, 0x34($sp) -/* B5493C 8024210C AFB00030 */ sw $s0, 0x30($sp) -/* B54940 80242110 8E510148 */ lw $s1, 0x148($s2) -/* B54944 80242114 86240008 */ lh $a0, 8($s1) -/* B54948 80242118 0C00EABB */ jal get_npc_unsafe -/* B5494C 8024211C 00A0802D */ daddu $s0, $a1, $zero -/* B54950 80242120 8E43000C */ lw $v1, 0xc($s2) -/* B54954 80242124 0240202D */ daddu $a0, $s2, $zero -/* B54958 80242128 8C650000 */ lw $a1, ($v1) -/* B5495C 8024212C 0C0B1EAF */ jal get_variable -/* B54960 80242130 0040A82D */ daddu $s5, $v0, $zero -/* B54964 80242134 AFA00010 */ sw $zero, 0x10($sp) -/* B54968 80242138 8E2300D0 */ lw $v1, 0xd0($s1) -/* B5496C 8024213C 8C630030 */ lw $v1, 0x30($v1) -/* B54970 80242140 AFA30014 */ sw $v1, 0x14($sp) -/* B54974 80242144 8E2300D0 */ lw $v1, 0xd0($s1) -/* B54978 80242148 8C63001C */ lw $v1, 0x1c($v1) -/* B5497C 8024214C AFA30018 */ sw $v1, 0x18($sp) -/* B54980 80242150 8E2300D0 */ lw $v1, 0xd0($s1) -/* B54984 80242154 8C630024 */ lw $v1, 0x24($v1) -/* B54988 80242158 AFA3001C */ sw $v1, 0x1c($sp) -/* B5498C 8024215C 8E2300D0 */ lw $v1, 0xd0($s1) -/* B54990 80242160 8C630028 */ lw $v1, 0x28($v1) -/* B54994 80242164 27B40010 */ addiu $s4, $sp, 0x10 -/* B54998 80242168 AFA30020 */ sw $v1, 0x20($sp) -/* B5499C 8024216C 8E2300D0 */ lw $v1, 0xd0($s1) -/* B549A0 80242170 3C014282 */ lui $at, 0x4282 -/* B549A4 80242174 44810000 */ mtc1 $at, $f0 -/* B549A8 80242178 8C63002C */ lw $v1, 0x2c($v1) -/* B549AC 8024217C 0040982D */ daddu $s3, $v0, $zero -/* B549B0 80242180 E7A00028 */ swc1 $f0, 0x28($sp) -/* B549B4 80242184 A7A0002C */ sh $zero, 0x2c($sp) -/* B549B8 80242188 16000005 */ bnez $s0, .L802421A0 -/* B549BC 8024218C AFA30024 */ sw $v1, 0x24($sp) -/* B549C0 80242190 8E2200B0 */ lw $v0, 0xb0($s1) -/* B549C4 80242194 30420004 */ andi $v0, $v0, 4 -/* B549C8 80242198 10400020 */ beqz $v0, .L8024221C -/* B549CC 8024219C 00000000 */ nop -.L802421A0: -/* B549D0 802421A0 2404F7FF */ addiu $a0, $zero, -0x801 -/* B549D4 802421A4 AE400070 */ sw $zero, 0x70($s2) -/* B549D8 802421A8 A6A0008E */ sh $zero, 0x8e($s5) -/* B549DC 802421AC 8E2200CC */ lw $v0, 0xcc($s1) -/* B549E0 802421B0 8EA30000 */ lw $v1, ($s5) -/* B549E4 802421B4 8C420000 */ lw $v0, ($v0) -/* B549E8 802421B8 00641824 */ and $v1, $v1, $a0 -/* B549EC 802421BC AEA30000 */ sw $v1, ($s5) -/* B549F0 802421C0 AEA20028 */ sw $v0, 0x28($s5) -/* B549F4 802421C4 8E2200D0 */ lw $v0, 0xd0($s1) -/* B549F8 802421C8 8C420034 */ lw $v0, 0x34($v0) -/* B549FC 802421CC 54400005 */ bnel $v0, $zero, .L802421E4 -/* B54A00 802421D0 2402FDFF */ addiu $v0, $zero, -0x201 -/* B54A04 802421D4 34620200 */ ori $v0, $v1, 0x200 -/* B54A08 802421D8 2403FFF7 */ addiu $v1, $zero, -9 -/* B54A0C 802421DC 0809087B */ j .L802421EC -/* B54A10 802421E0 00431024 */ and $v0, $v0, $v1 -.L802421E4: -/* B54A14 802421E4 00621024 */ and $v0, $v1, $v0 -/* B54A18 802421E8 34420008 */ ori $v0, $v0, 8 -.L802421EC: -/* B54A1C 802421EC AEA20000 */ sw $v0, ($s5) -/* B54A20 802421F0 8E2200B0 */ lw $v0, 0xb0($s1) -/* B54A24 802421F4 30420004 */ andi $v0, $v0, 4 -/* B54A28 802421F8 10400007 */ beqz $v0, .L80242218 -/* B54A2C 802421FC 24020063 */ addiu $v0, $zero, 0x63 -/* B54A30 80242200 AE420070 */ sw $v0, 0x70($s2) -/* B54A34 80242204 AE400074 */ sw $zero, 0x74($s2) -/* B54A38 80242208 8E2200B0 */ lw $v0, 0xb0($s1) -/* B54A3C 8024220C 2403FFFB */ addiu $v1, $zero, -5 -/* B54A40 80242210 00431024 */ and $v0, $v0, $v1 -/* B54A44 80242214 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242218: -/* B54A48 80242218 AE20006C */ sw $zero, 0x6c($s1) -.L8024221C: -/* B54A4C 8024221C 8E420070 */ lw $v0, 0x70($s2) -/* B54A50 80242220 2842001E */ slti $v0, $v0, 0x1e -/* B54A54 80242224 10400009 */ beqz $v0, .L8024224C -/* B54A58 80242228 00000000 */ nop -/* B54A5C 8024222C 8E22006C */ lw $v0, 0x6c($s1) -/* B54A60 80242230 14400006 */ bnez $v0, .L8024224C -/* B54A64 80242234 00000000 */ nop -/* B54A68 80242238 0C090689 */ jal func_80241A24 -/* B54A6C 8024223C 0240202D */ daddu $a0, $s2, $zero -/* B54A70 80242240 10400002 */ beqz $v0, .L8024224C -/* B54A74 80242244 2402001E */ addiu $v0, $zero, 0x1e -/* B54A78 80242248 AE420070 */ sw $v0, 0x70($s2) -.L8024224C: -/* B54A7C 8024224C 8E430070 */ lw $v1, 0x70($s2) -/* B54A80 80242250 2C620064 */ sltiu $v0, $v1, 0x64 -/* B54A84 80242254 10400048 */ beqz $v0, .L80242378 -/* B54A88 80242258 00031080 */ sll $v0, $v1, 2 -/* B54A8C 8024225C 3C018024 */ lui $at, 0x8024 -/* B54A90 80242260 00220821 */ addu $at, $at, $v0 -/* B54A94 80242264 8C226EA8 */ lw $v0, 0x6ea8($at) -/* B54A98 80242268 00400008 */ jr $v0 -/* B54A9C 8024226C 00000000 */ nop -/* B54AA0 80242270 0240202D */ daddu $a0, $s2, $zero -/* B54AA4 80242274 0260282D */ daddu $a1, $s3, $zero -/* B54AA8 80242278 0C012568 */ jal func_800495A0 -/* B54AAC 8024227C 0280302D */ daddu $a2, $s4, $zero -/* B54AB0 80242280 0240202D */ daddu $a0, $s2, $zero -/* B54AB4 80242284 0260282D */ daddu $a1, $s3, $zero -/* B54AB8 80242288 0C0125AE */ jal func_800496B8 -/* B54ABC 8024228C 0280302D */ daddu $a2, $s4, $zero -/* B54AC0 80242290 080908DE */ j .L80242378 -/* B54AC4 80242294 00000000 */ nop -/* B54AC8 80242298 0240202D */ daddu $a0, $s2, $zero -/* B54ACC 8024229C 0260282D */ daddu $a1, $s3, $zero -/* B54AD0 802422A0 0C090582 */ jal func_80241608 -/* B54AD4 802422A4 0280302D */ daddu $a2, $s4, $zero -/* B54AD8 802422A8 0240202D */ daddu $a0, $s2, $zero -/* B54ADC 802422AC 0260282D */ daddu $a1, $s3, $zero -/* B54AE0 802422B0 0C090596 */ jal func_80241658 -/* B54AE4 802422B4 0280302D */ daddu $a2, $s4, $zero -/* B54AE8 802422B8 080908DE */ j .L80242378 -/* B54AEC 802422BC 00000000 */ nop -/* B54AF0 802422C0 0240202D */ daddu $a0, $s2, $zero -/* B54AF4 802422C4 0260282D */ daddu $a1, $s3, $zero -/* B54AF8 802422C8 0C01278F */ jal func_80049E3C -/* B54AFC 802422CC 0280302D */ daddu $a2, $s4, $zero -/* B54B00 802422D0 0240202D */ daddu $a0, $s2, $zero -/* B54B04 802422D4 0260282D */ daddu $a1, $s3, $zero -/* B54B08 802422D8 0C0127B3 */ jal func_80049ECC -/* B54B0C 802422DC 0280302D */ daddu $a2, $s4, $zero -/* B54B10 802422E0 080908DE */ j .L80242378 -/* B54B14 802422E4 00000000 */ nop -/* B54B18 802422E8 0240202D */ daddu $a0, $s2, $zero -/* B54B1C 802422EC 0260282D */ daddu $a1, $s3, $zero -/* B54B20 802422F0 0C0127DF */ jal func_80049F7C -/* B54B24 802422F4 0280302D */ daddu $a2, $s4, $zero -/* B54B28 802422F8 0240202D */ daddu $a0, $s2, $zero -/* B54B2C 802422FC 0260282D */ daddu $a1, $s3, $zero -/* B54B30 80242300 0C012849 */ jal func_8004A124 -/* B54B34 80242304 0280302D */ daddu $a2, $s4, $zero -/* B54B38 80242308 080908DE */ j .L80242378 -/* B54B3C 8024230C 00000000 */ nop -/* B54B40 80242310 0240202D */ daddu $a0, $s2, $zero -/* B54B44 80242314 0260282D */ daddu $a1, $s3, $zero -/* B54B48 80242318 0C0128FA */ jal func_8004A3E8 -/* B54B4C 8024231C 0280302D */ daddu $a2, $s4, $zero -/* B54B50 80242320 080908DE */ j .L80242378 -/* B54B54 80242324 00000000 */ nop -/* B54B58 80242328 0C090607 */ jal func_8024181C -/* B54B5C 8024232C 0240202D */ daddu $a0, $s2, $zero -/* B54B60 80242330 0C090622 */ jal func_80241888 -/* B54B64 80242334 0240202D */ daddu $a0, $s2, $zero -/* B54B68 80242338 8E430070 */ lw $v1, 0x70($s2) -/* B54B6C 8024233C 24020020 */ addiu $v0, $zero, 0x20 -/* B54B70 80242340 1462000D */ bne $v1, $v0, .L80242378 -/* B54B74 80242344 00000000 */ nop -/* B54B78 80242348 0C09063E */ jal func_802418F8 -/* B54B7C 8024234C 0240202D */ daddu $a0, $s2, $zero -/* B54B80 80242350 8E430070 */ lw $v1, 0x70($s2) -/* B54B84 80242354 24020021 */ addiu $v0, $zero, 0x21 -/* B54B88 80242358 14620007 */ bne $v1, $v0, .L80242378 -/* B54B8C 8024235C 00000000 */ nop -/* B54B90 80242360 0C090674 */ jal func_802419D0 -/* B54B94 80242364 0240202D */ daddu $a0, $s2, $zero -/* B54B98 80242368 080908DE */ j .L80242378 -/* B54B9C 8024236C 00000000 */ nop -/* B54BA0 80242370 0C0129CF */ jal func_8004A73C -/* B54BA4 80242374 0240202D */ daddu $a0, $s2, $zero -.L80242378: -/* B54BA8 80242378 8FBF0048 */ lw $ra, 0x48($sp) -/* B54BAC 8024237C 8FB50044 */ lw $s5, 0x44($sp) -/* B54BB0 80242380 8FB40040 */ lw $s4, 0x40($sp) -/* B54BB4 80242384 8FB3003C */ lw $s3, 0x3c($sp) -/* B54BB8 80242388 8FB20038 */ lw $s2, 0x38($sp) -/* B54BBC 8024238C 8FB10034 */ lw $s1, 0x34($sp) -/* B54BC0 80242390 8FB00030 */ lw $s0, 0x30($sp) -/* B54BC4 80242394 0000102D */ daddu $v0, $zero, $zero -/* B54BC8 80242398 03E00008 */ jr $ra -/* B54BCC 8024239C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_802423A0_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_802423A0_B52830.s deleted file mode 100644 index 8be80f9699..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_802423A0_B52830.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423A0_B54BD0 -/* B54BD0 802423A0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B54BD4 802423A4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B54BD8 802423A8 4485A000 */ mtc1 $a1, $f20 -/* B54BDC 802423AC F7B60020 */ sdc1 $f22, 0x20($sp) -/* B54BE0 802423B0 4486B000 */ mtc1 $a2, $f22 -/* B54BE4 802423B4 AFB00010 */ sw $s0, 0x10($sp) -/* B54BE8 802423B8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B54BEC 802423BC 4487C000 */ mtc1 $a3, $f24 -/* B54BF0 802423C0 AFBF0014 */ sw $ra, 0x14($sp) -/* B54BF4 802423C4 0C019D28 */ jal guMtxIdentF -/* B54BF8 802423C8 0080802D */ daddu $s0, $a0, $zero -/* B54BFC 802423CC 4616A582 */ mul.s $f22, $f20, $f22 -/* B54C00 802423D0 00000000 */ nop -/* B54C04 802423D4 4618A502 */ mul.s $f20, $f20, $f24 -/* B54C08 802423D8 00000000 */ nop -/* B54C0C 802423DC 3C013F80 */ lui $at, 0x3f80 -/* B54C10 802423E0 44810000 */ mtc1 $at, $f0 -/* B54C14 802423E4 00000000 */ nop -/* B54C18 802423E8 E6000014 */ swc1 $f0, 0x14($s0) -/* B54C1C 802423EC E6160010 */ swc1 $f22, 0x10($s0) -/* B54C20 802423F0 E6140018 */ swc1 $f20, 0x18($s0) -/* B54C24 802423F4 8FBF0014 */ lw $ra, 0x14($sp) -/* B54C28 802423F8 8FB00010 */ lw $s0, 0x10($sp) -/* B54C2C 802423FC D7B80028 */ ldc1 $f24, 0x28($sp) -/* B54C30 80242400 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B54C34 80242404 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B54C38 80242408 03E00008 */ jr $ra -/* B54C3C 8024240C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_06/func_80242410_B52830.s b/asm/nonmatchings/world/area_jan/jan_06/func_80242410_B52830.s deleted file mode 100644 index 86136c61af..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/func_80242410_B52830.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242410_B54C40 -/* B54C40 80242410 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B54C44 80242414 AFB10054 */ sw $s1, 0x54($sp) -/* B54C48 80242418 0080882D */ daddu $s1, $a0, $zero -/* B54C4C 8024241C AFBF005C */ sw $ra, 0x5c($sp) -/* B54C50 80242420 AFB20058 */ sw $s2, 0x58($sp) -/* B54C54 80242424 AFB00050 */ sw $s0, 0x50($sp) -/* B54C58 80242428 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B54C5C 8024242C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B54C60 80242430 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B54C64 80242434 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B54C68 80242438 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B54C6C 8024243C 8E30000C */ lw $s0, 0xc($s1) -/* B54C70 80242440 8E050000 */ lw $a1, ($s0) -/* B54C74 80242444 0C0B1EAF */ jal get_variable -/* B54C78 80242448 26100004 */ addiu $s0, $s0, 4 -/* B54C7C 8024244C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B54C80 80242450 0040202D */ daddu $a0, $v0, $zero -/* B54C84 80242454 8E050000 */ lw $a1, ($s0) -/* B54C88 80242458 26100004 */ addiu $s0, $s0, 4 -/* B54C8C 8024245C 0220202D */ daddu $a0, $s1, $zero -/* B54C90 80242460 0C0B210B */ jal get_float_variable -/* B54C94 80242464 0040902D */ daddu $s2, $v0, $zero -/* B54C98 80242468 8E050000 */ lw $a1, ($s0) -/* B54C9C 8024246C 26100004 */ addiu $s0, $s0, 4 -/* B54CA0 80242470 0220202D */ daddu $a0, $s1, $zero -/* B54CA4 80242474 0C0B210B */ jal get_float_variable -/* B54CA8 80242478 46000706 */ mov.s $f28, $f0 -/* B54CAC 8024247C 8E050000 */ lw $a1, ($s0) -/* B54CB0 80242480 26100004 */ addiu $s0, $s0, 4 -/* B54CB4 80242484 0220202D */ daddu $a0, $s1, $zero -/* B54CB8 80242488 0C0B210B */ jal get_float_variable -/* B54CBC 8024248C 46000686 */ mov.s $f26, $f0 -/* B54CC0 80242490 0220202D */ daddu $a0, $s1, $zero -/* B54CC4 80242494 8E050000 */ lw $a1, ($s0) -/* B54CC8 80242498 0C0B210B */ jal get_float_variable -/* B54CCC 8024249C 46000586 */ mov.s $f22, $f0 -/* B54CD0 802424A0 0240202D */ daddu $a0, $s2, $zero -/* B54CD4 802424A4 0C046B4C */ jal get_model_from_list_index -/* B54CD8 802424A8 46000606 */ mov.s $f24, $f0 -/* B54CDC 802424AC 0040882D */ daddu $s1, $v0, $zero -/* B54CE0 802424B0 96220000 */ lhu $v0, ($s1) -/* B54CE4 802424B4 30420400 */ andi $v0, $v0, 0x400 -/* B54CE8 802424B8 1440001E */ bnez $v0, .L80242534 -/* B54CEC 802424BC 26300058 */ addiu $s0, $s1, 0x58 -/* B54CF0 802424C0 4480A000 */ mtc1 $zero, $f20 -/* B54CF4 802424C4 4406B000 */ mfc1 $a2, $f22 -/* B54CF8 802424C8 4405A000 */ mfc1 $a1, $f20 -/* B54CFC 802424CC 4407A000 */ mfc1 $a3, $f20 -/* B54D00 802424D0 0C019E40 */ jal guTranslateF -/* B54D04 802424D4 0200202D */ daddu $a0, $s0, $zero -/* B54D08 802424D8 4405E000 */ mfc1 $a1, $f28 -/* B54D0C 802424DC 4406D000 */ mfc1 $a2, $f26 -/* B54D10 802424E0 4407C000 */ mfc1 $a3, $f24 -/* B54D14 802424E4 0C0908E8 */ jal func_802423A0 -/* B54D18 802424E8 27A40010 */ addiu $a0, $sp, 0x10 -/* B54D1C 802424EC 27A40010 */ addiu $a0, $sp, 0x10 -/* B54D20 802424F0 0200282D */ daddu $a1, $s0, $zero -/* B54D24 802424F4 0C019D80 */ jal guMtxCatF -/* B54D28 802424F8 0200302D */ daddu $a2, $s0, $zero -/* B54D2C 802424FC 27A40010 */ addiu $a0, $sp, 0x10 -/* B54D30 80242500 4600B587 */ neg.s $f22, $f22 -/* B54D34 80242504 4405A000 */ mfc1 $a1, $f20 -/* B54D38 80242508 4406B000 */ mfc1 $a2, $f22 -/* B54D3C 8024250C 0C019E40 */ jal guTranslateF -/* B54D40 80242510 00A0382D */ daddu $a3, $a1, $zero -/* B54D44 80242514 27A40010 */ addiu $a0, $sp, 0x10 -/* B54D48 80242518 0200282D */ daddu $a1, $s0, $zero -/* B54D4C 8024251C 0C019D80 */ jal guMtxCatF -/* B54D50 80242520 00A0302D */ daddu $a2, $a1, $zero -/* B54D54 80242524 96220000 */ lhu $v0, ($s1) -/* B54D58 80242528 34421400 */ ori $v0, $v0, 0x1400 -/* B54D5C 8024252C 0809096B */ j .L802425AC -/* B54D60 80242530 A6220000 */ sh $v0, ($s1) -.L80242534: -/* B54D64 80242534 4480A000 */ mtc1 $zero, $f20 -/* B54D68 80242538 4406B000 */ mfc1 $a2, $f22 -/* B54D6C 8024253C 4405A000 */ mfc1 $a1, $f20 -/* B54D70 80242540 4407A000 */ mfc1 $a3, $f20 -/* B54D74 80242544 0C019E40 */ jal guTranslateF -/* B54D78 80242548 27A40010 */ addiu $a0, $sp, 0x10 -/* B54D7C 8024254C 27A40010 */ addiu $a0, $sp, 0x10 -/* B54D80 80242550 26300058 */ addiu $s0, $s1, 0x58 -/* B54D84 80242554 0200282D */ daddu $a1, $s0, $zero -/* B54D88 80242558 0C019D80 */ jal guMtxCatF -/* B54D8C 8024255C 0200302D */ daddu $a2, $s0, $zero -/* B54D90 80242560 4405E000 */ mfc1 $a1, $f28 -/* B54D94 80242564 4406D000 */ mfc1 $a2, $f26 -/* B54D98 80242568 4407C000 */ mfc1 $a3, $f24 -/* B54D9C 8024256C 0C0908E8 */ jal func_802423A0 -/* B54DA0 80242570 27A40010 */ addiu $a0, $sp, 0x10 -/* B54DA4 80242574 27A40010 */ addiu $a0, $sp, 0x10 -/* B54DA8 80242578 0200282D */ daddu $a1, $s0, $zero -/* B54DAC 8024257C 0C019D80 */ jal guMtxCatF -/* B54DB0 80242580 0200302D */ daddu $a2, $s0, $zero -/* B54DB4 80242584 27A40010 */ addiu $a0, $sp, 0x10 -/* B54DB8 80242588 4600B587 */ neg.s $f22, $f22 -/* B54DBC 8024258C 4405A000 */ mfc1 $a1, $f20 -/* B54DC0 80242590 4406B000 */ mfc1 $a2, $f22 -/* B54DC4 80242594 0C019E40 */ jal guTranslateF -/* B54DC8 80242598 00A0382D */ daddu $a3, $a1, $zero -/* B54DCC 8024259C 27A40010 */ addiu $a0, $sp, 0x10 -/* B54DD0 802425A0 0200282D */ daddu $a1, $s0, $zero -/* B54DD4 802425A4 0C019D80 */ jal guMtxCatF -/* B54DD8 802425A8 00A0302D */ daddu $a2, $a1, $zero -.L802425AC: -/* B54DDC 802425AC 8FBF005C */ lw $ra, 0x5c($sp) -/* B54DE0 802425B0 8FB20058 */ lw $s2, 0x58($sp) -/* B54DE4 802425B4 8FB10054 */ lw $s1, 0x54($sp) -/* B54DE8 802425B8 8FB00050 */ lw $s0, 0x50($sp) -/* B54DEC 802425BC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B54DF0 802425C0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B54DF4 802425C4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B54DF8 802425C8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B54DFC 802425CC D7B40060 */ ldc1 $f20, 0x60($sp) -/* B54E00 802425D0 24020002 */ addiu $v0, $zero, 2 -/* B54E04 802425D4 03E00008 */ jr $ra -/* B54E08 802425D8 27BD0088 */ addiu $sp, $sp, 0x88 -/* B54E0C 802425DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_07/func_80240050_B59870.s b/asm/nonmatchings/world/area_jan/jan_07/func_80240050_B59870.s deleted file mode 100644 index 5ec63e6259..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/func_80240050_B59870.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_B598C0 -/* B598C0 80240050 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B598C4 80240054 AFB20028 */ sw $s2, 0x28($sp) -/* B598C8 80240058 0080902D */ daddu $s2, $a0, $zero -/* B598CC 8024005C AFBF002C */ sw $ra, 0x2c($sp) -/* B598D0 80240060 AFB10024 */ sw $s1, 0x24($sp) -/* B598D4 80240064 AFB00020 */ sw $s0, 0x20($sp) -/* B598D8 80240068 8E500148 */ lw $s0, 0x148($s2) -/* B598DC 8024006C 0C00EABB */ jal get_npc_unsafe -/* B598E0 80240070 86040008 */ lh $a0, 8($s0) -/* B598E4 80240074 8E03006C */ lw $v1, 0x6c($s0) -/* B598E8 80240078 1460000B */ bnez $v1, .L802400A8 -/* B598EC 8024007C 0040882D */ daddu $s1, $v0, $zero -/* B598F0 80240080 0C00A67F */ jal rand_int -/* B598F4 80240084 24040064 */ addiu $a0, $zero, 0x64 -/* B598F8 80240088 28420032 */ slti $v0, $v0, 0x32 -/* B598FC 8024008C 14400002 */ bnez $v0, .L80240098 -/* B59900 80240090 24020001 */ addiu $v0, $zero, 1 -/* B59904 80240094 24020003 */ addiu $v0, $zero, 3 -.L80240098: -/* B59908 80240098 AE02006C */ sw $v0, 0x6c($s0) -/* B5990C 8024009C 3C054387 */ lui $a1, 0x4387 -/* B59910 802400A0 0C00ECD0 */ jal set_npc_yaw -/* B59914 802400A4 0220202D */ daddu $a0, $s1, $zero -.L802400A8: -/* B59918 802400A8 8E02006C */ lw $v0, 0x6c($s0) -/* B5991C 802400AC 2443FFFF */ addiu $v1, $v0, -1 -/* B59920 802400B0 2C620006 */ sltiu $v0, $v1, 6 -/* B59924 802400B4 1040004D */ beqz $v0, .L802401EC -/* B59928 802400B8 00031080 */ sll $v0, $v1, 2 -/* B5992C 802400BC 3C018024 */ lui $at, 0x8024 -/* B59930 802400C0 00220821 */ addu $at, $at, $v0 -/* B59934 802400C4 8C224700 */ lw $v0, 0x4700($at) -/* B59938 802400C8 00400008 */ jr $v0 -/* B5993C 802400CC 00000000 */ nop -/* B59940 802400D0 3C030042 */ lui $v1, 0x42 -/* B59944 802400D4 3463000F */ ori $v1, $v1, 0xf -/* B59948 802400D8 24020002 */ addiu $v0, $zero, 2 -/* B5994C 802400DC AE02006C */ sw $v0, 0x6c($s0) -/* B59950 802400E0 AE000070 */ sw $zero, 0x70($s0) -/* B59954 802400E4 AE230028 */ sw $v1, 0x28($s1) -/* B59958 802400E8 8E020070 */ lw $v0, 0x70($s0) -/* B5995C 802400EC 24420001 */ addiu $v0, $v0, 1 -/* B59960 802400F0 AE020070 */ sw $v0, 0x70($s0) -/* B59964 802400F4 28420033 */ slti $v0, $v0, 0x33 -/* B59968 802400F8 1440003C */ bnez $v0, .L802401EC -/* B5996C 802400FC 24020005 */ addiu $v0, $zero, 5 -/* B59970 80240100 0809007B */ j .L802401EC -/* B59974 80240104 AE02006C */ sw $v0, 0x6c($s0) -/* B59978 80240108 3C030042 */ lui $v1, 0x42 -/* B5997C 8024010C 34630010 */ ori $v1, $v1, 0x10 -/* B59980 80240110 24020004 */ addiu $v0, $zero, 4 -/* B59984 80240114 AE02006C */ sw $v0, 0x6c($s0) -/* B59988 80240118 AE000070 */ sw $zero, 0x70($s0) -/* B5998C 8024011C AE230028 */ sw $v1, 0x28($s1) -/* B59990 80240120 8E020070 */ lw $v0, 0x70($s0) -/* B59994 80240124 24030019 */ addiu $v1, $zero, 0x19 -/* B59998 80240128 24420001 */ addiu $v0, $v0, 1 -/* B5999C 8024012C 14430005 */ bne $v0, $v1, .L80240144 -/* B599A0 80240130 AE020070 */ sw $v0, 0x70($s0) -/* B599A4 80240134 3C0142B4 */ lui $at, 0x42b4 -/* B599A8 80240138 44810000 */ mtc1 $at, $f0 -/* B599AC 8024013C 00000000 */ nop -/* B599B0 80240140 E620000C */ swc1 $f0, 0xc($s1) -.L80240144: -/* B599B4 80240144 8E020070 */ lw $v0, 0x70($s0) -/* B599B8 80240148 2842003D */ slti $v0, $v0, 0x3d -/* B599BC 8024014C 14400027 */ bnez $v0, .L802401EC -/* B599C0 80240150 24020005 */ addiu $v0, $zero, 5 -/* B599C4 80240154 0809007B */ j .L802401EC -/* B599C8 80240158 AE02006C */ sw $v0, 0x6c($s0) -/* B599CC 8024015C 3C030042 */ lui $v1, 0x42 -/* B599D0 80240160 24020006 */ addiu $v0, $zero, 6 -/* B599D4 80240164 34630003 */ ori $v1, $v1, 3 -/* B599D8 80240168 AE02006C */ sw $v0, 0x6c($s0) -/* B599DC 8024016C AE000070 */ sw $zero, 0x70($s0) -/* B599E0 80240170 862400A8 */ lh $a0, 0xa8($s1) -/* B599E4 80240174 2402000A */ addiu $v0, $zero, 0xa -/* B599E8 80240178 AE230028 */ sw $v1, 0x28($s1) -/* B599EC 8024017C AFA00014 */ sw $zero, 0x14($sp) -/* B599F0 80240180 AFA20018 */ sw $v0, 0x18($sp) -/* B599F4 80240184 44840000 */ mtc1 $a0, $f0 -/* B599F8 80240188 00000000 */ nop -/* B599FC 8024018C 46800020 */ cvt.s.w $f0, $f0 -/* B59A00 80240190 E7A00010 */ swc1 $f0, 0x10($sp) -/* B59A04 80240194 8E250038 */ lw $a1, 0x38($s1) -/* B59A08 80240198 8E26003C */ lw $a2, 0x3c($s1) -/* B59A0C 8024019C 8E270040 */ lw $a3, 0x40($s1) -/* B59A10 802401A0 0C01C1E4 */ jal fx_sweat -/* B59A14 802401A4 0000202D */ daddu $a0, $zero, $zero -/* B59A18 802401A8 8E020070 */ lw $v0, 0x70($s0) -/* B59A1C 802401AC 24420001 */ addiu $v0, $v0, 1 -/* B59A20 802401B0 AE020070 */ sw $v0, 0x70($s0) -/* B59A24 802401B4 2842000B */ slti $v0, $v0, 0xb -/* B59A28 802401B8 1440000C */ bnez $v0, .L802401EC -/* B59A2C 802401BC 00000000 */ nop -/* B59A30 802401C0 0C00A67F */ jal rand_int -/* B59A34 802401C4 24040064 */ addiu $a0, $zero, 0x64 -/* B59A38 802401C8 0040182D */ daddu $v1, $v0, $zero -/* B59A3C 802401CC 2862005A */ slti $v0, $v1, 0x5a -/* B59A40 802401D0 14400005 */ bnez $v0, .L802401E8 -/* B59A44 802401D4 24020007 */ addiu $v0, $zero, 7 -/* B59A48 802401D8 2862005F */ slti $v0, $v1, 0x5f -/* B59A4C 802401DC 14400002 */ bnez $v0, .L802401E8 -/* B59A50 802401E0 24020001 */ addiu $v0, $zero, 1 -/* B59A54 802401E4 24020003 */ addiu $v0, $zero, 3 -.L802401E8: -/* B59A58 802401E8 AE02006C */ sw $v0, 0x6c($s0) -.L802401EC: -/* B59A5C 802401EC 8E03006C */ lw $v1, 0x6c($s0) -/* B59A60 802401F0 24020007 */ addiu $v0, $zero, 7 -/* B59A64 802401F4 50620001 */ beql $v1, $v0, .L802401FC -/* B59A68 802401F8 AE400070 */ sw $zero, 0x70($s2) -.L802401FC: -/* B59A6C 802401FC 8FBF002C */ lw $ra, 0x2c($sp) -/* B59A70 80240200 8FB20028 */ lw $s2, 0x28($sp) -/* B59A74 80240204 8FB10024 */ lw $s1, 0x24($sp) -/* B59A78 80240208 8FB00020 */ lw $s0, 0x20($sp) -/* B59A7C 8024020C 03E00008 */ jr $ra -/* B59A80 80240210 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_07/func_80240280_B59870.s b/asm/nonmatchings/world/area_jan/jan_07/func_80240280_B59870.s deleted file mode 100644 index 1073480651..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/func_80240280_B59870.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240280_B59AF0 -/* B59AF0 80240280 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B59AF4 80240284 AFB10014 */ sw $s1, 0x14($sp) -/* B59AF8 80240288 0080882D */ daddu $s1, $a0, $zero -/* B59AFC 8024028C AFBF0018 */ sw $ra, 0x18($sp) -/* B59B00 80240290 AFB00010 */ sw $s0, 0x10($sp) -/* B59B04 80240294 8E300148 */ lw $s0, 0x148($s1) -/* B59B08 80240298 0C00EABB */ jal get_npc_unsafe -/* B59B0C 8024029C 86040008 */ lh $a0, 8($s0) -/* B59B10 802402A0 0040202D */ daddu $a0, $v0, $zero -/* B59B14 802402A4 9482008E */ lhu $v0, 0x8e($a0) -/* B59B18 802402A8 2442FFFF */ addiu $v0, $v0, -1 -/* B59B1C 802402AC A482008E */ sh $v0, 0x8e($a0) -/* B59B20 802402B0 00021400 */ sll $v0, $v0, 0x10 -/* B59B24 802402B4 1C400009 */ bgtz $v0, .L802402DC -/* B59B28 802402B8 24020003 */ addiu $v0, $zero, 3 -/* B59B2C 802402BC 96030076 */ lhu $v1, 0x76($s0) -/* B59B30 802402C0 AE02006C */ sw $v0, 0x6c($s0) -/* B59B34 802402C4 A483008E */ sh $v1, 0x8e($a0) -/* B59B38 802402C8 8E0200CC */ lw $v0, 0xcc($s0) -/* B59B3C 802402CC 8C420024 */ lw $v0, 0x24($v0) -/* B59B40 802402D0 AC820028 */ sw $v0, 0x28($a0) -/* B59B44 802402D4 24020020 */ addiu $v0, $zero, 0x20 -/* B59B48 802402D8 AE220070 */ sw $v0, 0x70($s1) -.L802402DC: -/* B59B4C 802402DC 8FBF0018 */ lw $ra, 0x18($sp) -/* B59B50 802402E0 8FB10014 */ lw $s1, 0x14($sp) -/* B59B54 802402E4 8FB00010 */ lw $s0, 0x10($sp) -/* B59B58 802402E8 03E00008 */ jr $ra -/* B59B5C 802402EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_07/func_802402F0_B59870.s b/asm/nonmatchings/world/area_jan/jan_07/func_802402F0_B59870.s deleted file mode 100644 index 14435f1289..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/func_802402F0_B59870.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_B59B60 -/* B59B60 802402F0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B59B64 802402F4 AFB10034 */ sw $s1, 0x34($sp) -/* B59B68 802402F8 0080882D */ daddu $s1, $a0, $zero -/* B59B6C 802402FC AFBF0038 */ sw $ra, 0x38($sp) -/* B59B70 80240300 AFB00030 */ sw $s0, 0x30($sp) -/* B59B74 80240304 8E300148 */ lw $s0, 0x148($s1) -/* B59B78 80240308 0C00EABB */ jal get_npc_unsafe -/* B59B7C 8024030C 86040008 */ lh $a0, 8($s0) -/* B59B80 80240310 0040282D */ daddu $a1, $v0, $zero -/* B59B84 80240314 94A2008E */ lhu $v0, 0x8e($a1) -/* B59B88 80240318 2442FFFF */ addiu $v0, $v0, -1 -/* B59B8C 8024031C A4A2008E */ sh $v0, 0x8e($a1) -/* B59B90 80240320 00021400 */ sll $v0, $v0, 0x10 -/* B59B94 80240324 1C400023 */ bgtz $v0, .L802403B4 -/* B59B98 80240328 24020004 */ addiu $v0, $zero, 4 -/* B59B9C 8024032C 8E0300CC */ lw $v1, 0xcc($s0) -/* B59BA0 80240330 AE02006C */ sw $v0, 0x6c($s0) -/* B59BA4 80240334 8C620000 */ lw $v0, ($v1) -/* B59BA8 80240338 ACA20028 */ sw $v0, 0x28($a1) -/* B59BAC 8024033C 9602007A */ lhu $v0, 0x7a($s0) -/* B59BB0 80240340 A4A2008E */ sh $v0, 0x8e($a1) -/* B59BB4 80240344 8E020078 */ lw $v0, 0x78($s0) -/* B59BB8 80240348 28420008 */ slti $v0, $v0, 8 -/* B59BBC 8024034C 14400018 */ bnez $v0, .L802403B0 -/* B59BC0 80240350 24020021 */ addiu $v0, $zero, 0x21 -/* B59BC4 80240354 24040003 */ addiu $a0, $zero, 3 -/* B59BC8 80240358 27A30028 */ addiu $v1, $sp, 0x28 -/* B59BCC 8024035C 84A700A8 */ lh $a3, 0xa8($a1) -/* B59BD0 80240360 3C013F80 */ lui $at, 0x3f80 -/* B59BD4 80240364 44810000 */ mtc1 $at, $f0 -/* B59BD8 80240368 3C014000 */ lui $at, 0x4000 -/* B59BDC 8024036C 44811000 */ mtc1 $at, $f2 -/* B59BE0 80240370 3C01C1A0 */ lui $at, 0xc1a0 -/* B59BE4 80240374 44812000 */ mtc1 $at, $f4 -/* B59BE8 80240378 44873000 */ mtc1 $a3, $f6 -/* B59BEC 8024037C 00000000 */ nop -/* B59BF0 80240380 468031A0 */ cvt.s.w $f6, $f6 -/* B59BF4 80240384 E7A00010 */ swc1 $f0, 0x10($sp) -/* B59BF8 80240388 E7A20014 */ swc1 $f2, 0x14($sp) -/* B59BFC 8024038C E7A40018 */ swc1 $f4, 0x18($sp) -/* B59C00 80240390 8E020078 */ lw $v0, 0x78($s0) -/* B59C04 80240394 44073000 */ mfc1 $a3, $f6 -/* B59C08 80240398 0000302D */ daddu $a2, $zero, $zero -/* B59C0C 8024039C AFA30020 */ sw $v1, 0x20($sp) -/* B59C10 802403A0 2442FFFF */ addiu $v0, $v0, -1 -/* B59C14 802403A4 0C01BFA4 */ jal fx_emote -/* B59C18 802403A8 AFA2001C */ sw $v0, 0x1c($sp) -/* B59C1C 802403AC 24020021 */ addiu $v0, $zero, 0x21 -.L802403B0: -/* B59C20 802403B0 AE220070 */ sw $v0, 0x70($s1) -.L802403B4: -/* B59C24 802403B4 8FBF0038 */ lw $ra, 0x38($sp) -/* B59C28 802403B8 8FB10034 */ lw $s1, 0x34($sp) -/* B59C2C 802403BC 8FB00030 */ lw $s0, 0x30($sp) -/* B59C30 802403C0 03E00008 */ jr $ra -/* B59C34 802403C4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_jan/jan_07/func_8024041C_B59870.s b/asm/nonmatchings/world/area_jan/jan_07/func_8024041C_B59870.s deleted file mode 100644 index d8a805a04d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/func_8024041C_B59870.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024041C_B59C8C -/* B59C8C 8024041C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B59C90 80240420 AFBF0024 */ sw $ra, 0x24($sp) -/* B59C94 80240424 AFB40020 */ sw $s4, 0x20($sp) -/* B59C98 80240428 AFB3001C */ sw $s3, 0x1c($sp) -/* B59C9C 8024042C AFB20018 */ sw $s2, 0x18($sp) -/* B59CA0 80240430 AFB10014 */ sw $s1, 0x14($sp) -/* B59CA4 80240434 AFB00010 */ sw $s0, 0x10($sp) -/* B59CA8 80240438 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B59CAC 8024043C 8C900148 */ lw $s0, 0x148($a0) -/* B59CB0 80240440 86040008 */ lh $a0, 8($s0) -/* B59CB4 80240444 0C00EABB */ jal get_npc_unsafe -/* B59CB8 80240448 24110001 */ addiu $s1, $zero, 1 -/* B59CBC 8024044C 86040008 */ lh $a0, 8($s0) -/* B59CC0 80240450 0040802D */ daddu $s0, $v0, $zero -/* B59CC4 80240454 3C05800B */ lui $a1, %hi(gCameras) -/* B59CC8 80240458 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* B59CCC 8024045C 3C03800A */ lui $v1, 0x800a -/* B59CD0 80240460 8463A634 */ lh $v1, -0x59cc($v1) -/* B59CD4 80240464 00912021 */ addu $a0, $a0, $s1 -/* B59CD8 80240468 00031080 */ sll $v0, $v1, 2 -/* B59CDC 8024046C 00431021 */ addu $v0, $v0, $v1 -/* B59CE0 80240470 00021080 */ sll $v0, $v0, 2 -/* B59CE4 80240474 00431023 */ subu $v0, $v0, $v1 -/* B59CE8 80240478 000218C0 */ sll $v1, $v0, 3 -/* B59CEC 8024047C 00431021 */ addu $v0, $v0, $v1 -/* B59CF0 80240480 000210C0 */ sll $v0, $v0, 3 -/* B59CF4 80240484 0C00FB3A */ jal get_enemy -/* B59CF8 80240488 00459021 */ addu $s2, $v0, $a1 -/* B59CFC 8024048C 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* B59D00 80240490 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* B59D04 80240494 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B59D08 80240498 8E830000 */ lw $v1, ($s4) -/* B59D0C 8024049C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B59D10 802404A0 8C660028 */ lw $a2, 0x28($v1) -/* B59D14 802404A4 8C670030 */ lw $a3, 0x30($v1) -/* B59D18 802404A8 0C00A7B5 */ jal dist2D -/* B59D1C 802404AC 0040982D */ daddu $s3, $v0, $zero -/* B59D20 802404B0 C6620074 */ lwc1 $f2, 0x74($s3) -/* B59D24 802404B4 468010A0 */ cvt.s.w $f2, $f2 -/* B59D28 802404B8 4600103C */ c.lt.s $f2, $f0 -/* B59D2C 802404BC 00000000 */ nop -/* B59D30 802404C0 45030001 */ bc1tl .L802404C8 -/* B59D34 802404C4 0000882D */ daddu $s1, $zero, $zero -.L802404C8: -/* B59D38 802404C8 C64C006C */ lwc1 $f12, 0x6c($s2) -/* B59D3C 802404CC C60E000C */ lwc1 $f14, 0xc($s0) -/* B59D40 802404D0 3C014387 */ lui $at, 0x4387 -/* B59D44 802404D4 4481A000 */ mtc1 $at, $f20 -/* B59D48 802404D8 0C00A70A */ jal get_clamped_angle_diff -/* B59D4C 802404DC 00000000 */ nop -/* B59D50 802404E0 0C00A6C9 */ jal clamp_angle -/* B59D54 802404E4 46000306 */ mov.s $f12, $f0 -/* B59D58 802404E8 3C018024 */ lui $at, 0x8024 -/* B59D5C 802404EC D4224718 */ ldc1 $f2, 0x4718($at) -/* B59D60 802404F0 46000021 */ cvt.d.s $f0, $f0 -/* B59D64 802404F4 4622003C */ c.lt.d $f0, $f2 -/* B59D68 802404F8 00000000 */ nop -/* B59D6C 802404FC 45000003 */ bc1f .L8024050C -/* B59D70 80240500 00000000 */ nop -/* B59D74 80240504 3C0142B4 */ lui $at, 0x42b4 -/* B59D78 80240508 4481A000 */ mtc1 $at, $f20 -.L8024050C: -/* B59D7C 8024050C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B59D80 80240510 8E820000 */ lw $v0, ($s4) -/* B59D84 80240514 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B59D88 80240518 8C460028 */ lw $a2, 0x28($v0) -/* B59D8C 8024051C 0C00A720 */ jal atan2 -/* B59D90 80240520 8C470030 */ lw $a3, 0x30($v0) -/* B59D94 80240524 4600A306 */ mov.s $f12, $f20 -/* B59D98 80240528 0C00A70A */ jal get_clamped_angle_diff -/* B59D9C 8024052C 46000386 */ mov.s $f14, $f0 -/* B59DA0 80240530 C6620078 */ lwc1 $f2, 0x78($s3) -/* B59DA4 80240534 468010A0 */ cvt.s.w $f2, $f2 -/* B59DA8 80240538 46000005 */ abs.s $f0, $f0 -/* B59DAC 8024053C 4600103C */ c.lt.s $f2, $f0 -/* B59DB0 80240540 00000000 */ nop -/* B59DB4 80240544 45030001 */ bc1tl .L8024054C -/* B59DB8 80240548 0000882D */ daddu $s1, $zero, $zero -.L8024054C: -/* B59DBC 8024054C 8E820000 */ lw $v0, ($s4) -/* B59DC0 80240550 C600003C */ lwc1 $f0, 0x3c($s0) -/* B59DC4 80240554 C442002C */ lwc1 $f2, 0x2c($v0) -/* B59DC8 80240558 860200A8 */ lh $v0, 0xa8($s0) -/* B59DCC 8024055C 46020001 */ sub.s $f0, $f0, $f2 -/* B59DD0 80240560 44821000 */ mtc1 $v0, $f2 -/* B59DD4 80240564 00000000 */ nop -/* B59DD8 80240568 468010A1 */ cvt.d.w $f2, $f2 -/* B59DDC 8024056C 46221080 */ add.d $f2, $f2, $f2 -/* B59DE0 80240570 46000005 */ abs.s $f0, $f0 -/* B59DE4 80240574 46000021 */ cvt.d.s $f0, $f0 -/* B59DE8 80240578 4620103E */ c.le.d $f2, $f0 -/* B59DEC 8024057C 00000000 */ nop -/* B59DF0 80240580 45030001 */ bc1tl .L80240588 -/* B59DF4 80240584 0000882D */ daddu $s1, $zero, $zero -.L80240588: -/* B59DF8 80240588 3C038011 */ lui $v1, 0x8011 -/* B59DFC 8024058C 8063EBB3 */ lb $v1, -0x144d($v1) -/* B59E00 80240590 24020009 */ addiu $v0, $zero, 9 -/* B59E04 80240594 50620001 */ beql $v1, $v0, .L8024059C -/* B59E08 80240598 0000882D */ daddu $s1, $zero, $zero -.L8024059C: -/* B59E0C 8024059C 24020007 */ addiu $v0, $zero, 7 -/* B59E10 802405A0 50620001 */ beql $v1, $v0, .L802405A8 -/* B59E14 802405A4 0000882D */ daddu $s1, $zero, $zero -.L802405A8: -/* B59E18 802405A8 0220102D */ daddu $v0, $s1, $zero -/* B59E1C 802405AC 8FBF0024 */ lw $ra, 0x24($sp) -/* B59E20 802405B0 8FB40020 */ lw $s4, 0x20($sp) -/* B59E24 802405B4 8FB3001C */ lw $s3, 0x1c($sp) -/* B59E28 802405B8 8FB20018 */ lw $s2, 0x18($sp) -/* B59E2C 802405BC 8FB10014 */ lw $s1, 0x14($sp) -/* B59E30 802405C0 8FB00010 */ lw $s0, 0x10($sp) -/* B59E34 802405C4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B59E38 802405C8 03E00008 */ jr $ra -/* B59E3C 802405CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_07/func_802405D0_B59870.s b/asm/nonmatchings/world/area_jan/jan_07/func_802405D0_B59870.s deleted file mode 100644 index 172c988f80..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/func_802405D0_B59870.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405D0_B59E40 -/* B59E40 802405D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B59E44 802405D4 AFB40028 */ sw $s4, 0x28($sp) -/* B59E48 802405D8 0080A02D */ daddu $s4, $a0, $zero -/* B59E4C 802405DC AFBF002C */ sw $ra, 0x2c($sp) -/* B59E50 802405E0 AFB30024 */ sw $s3, 0x24($sp) -/* B59E54 802405E4 AFB20020 */ sw $s2, 0x20($sp) -/* B59E58 802405E8 AFB1001C */ sw $s1, 0x1c($sp) -/* B59E5C 802405EC AFB00018 */ sw $s0, 0x18($sp) -/* B59E60 802405F0 8E910148 */ lw $s1, 0x148($s4) -/* B59E64 802405F4 86240008 */ lh $a0, 8($s1) -/* B59E68 802405F8 0C00EABB */ jal get_npc_unsafe -/* B59E6C 802405FC 00A0802D */ daddu $s0, $a1, $zero -/* B59E70 80240600 16000005 */ bnez $s0, .L80240618 -/* B59E74 80240604 0040902D */ daddu $s2, $v0, $zero -/* B59E78 80240608 8E2200B0 */ lw $v0, 0xb0($s1) -/* B59E7C 8024060C 30420004 */ andi $v0, $v0, 4 -/* B59E80 80240610 10400015 */ beqz $v0, .L80240668 -/* B59E84 80240614 00000000 */ nop -.L80240618: -/* B59E88 80240618 AE800070 */ sw $zero, 0x70($s4) -/* B59E8C 8024061C 8E420000 */ lw $v0, ($s2) -/* B59E90 80240620 3C031F30 */ lui $v1, 0x1f30 -/* B59E94 80240624 A640008E */ sh $zero, 0x8e($s2) -/* B59E98 80240628 34420102 */ ori $v0, $v0, 0x102 -/* B59E9C 8024062C AE420000 */ sw $v0, ($s2) -/* B59EA0 80240630 8E220000 */ lw $v0, ($s1) -/* B59EA4 80240634 3C01C47A */ lui $at, 0xc47a -/* B59EA8 80240638 44810000 */ mtc1 $at, $f0 -/* B59EAC 8024063C 00431025 */ or $v0, $v0, $v1 -/* B59EB0 80240640 AE220000 */ sw $v0, ($s1) -/* B59EB4 80240644 AE400038 */ sw $zero, 0x38($s2) -/* B59EB8 80240648 E640003C */ swc1 $f0, 0x3c($s2) -/* B59EBC 8024064C AE400040 */ sw $zero, 0x40($s2) -/* B59EC0 80240650 8E2300B0 */ lw $v1, 0xb0($s1) -/* B59EC4 80240654 30620004 */ andi $v0, $v1, 4 -/* B59EC8 80240658 10400003 */ beqz $v0, .L80240668 -/* B59ECC 8024065C 2402FFFB */ addiu $v0, $zero, -5 -/* B59ED0 80240660 00621024 */ and $v0, $v1, $v0 -/* B59ED4 80240664 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240668: -/* B59ED8 80240668 8E930070 */ lw $s3, 0x70($s4) -/* B59EDC 8024066C 12600005 */ beqz $s3, .L80240684 -/* B59EE0 80240670 24020001 */ addiu $v0, $zero, 1 -/* B59EE4 80240674 12620048 */ beq $s3, $v0, .L80240798 -/* B59EE8 80240678 00000000 */ nop -/* B59EEC 8024067C 08090203 */ j .L8024080C -/* B59EF0 80240680 00000000 */ nop -.L80240684: -/* B59EF4 80240684 86240008 */ lh $a0, 8($s1) -/* B59EF8 80240688 0C00FB3A */ jal get_enemy -/* B59EFC 8024068C 2484FFFF */ addiu $a0, $a0, -1 -/* B59F00 80240690 0040802D */ daddu $s0, $v0, $zero -/* B59F04 80240694 0C00EABB */ jal get_npc_unsafe -/* B59F08 80240698 86040008 */ lh $a0, 8($s0) -/* B59F0C 8024069C 24030001 */ addiu $v1, $zero, 1 -/* B59F10 802406A0 0040982D */ daddu $s3, $v0, $zero -/* B59F14 802406A4 A2230007 */ sb $v1, 7($s1) -/* B59F18 802406A8 8E03006C */ lw $v1, 0x6c($s0) -/* B59F1C 802406AC 24020003 */ addiu $v0, $zero, 3 -/* B59F20 802406B0 14620056 */ bne $v1, $v0, .L8024080C -/* B59F24 802406B4 00000000 */ nop -/* B59F28 802406B8 8E2500A8 */ lw $a1, 0xa8($s1) -/* B59F2C 802406BC 10A00003 */ beqz $a1, .L802406CC -/* B59F30 802406C0 0260202D */ daddu $a0, $s3, $zero -/* B59F34 802406C4 0C012530 */ jal func_800494C0 -/* B59F38 802406C8 0000302D */ daddu $a2, $zero, $zero -.L802406CC: -/* B59F3C 802406CC 27A40010 */ addiu $a0, $sp, 0x10 -/* B59F40 802406D0 C6280070 */ lwc1 $f8, 0x70($s1) -/* B59F44 802406D4 46804220 */ cvt.s.w $f8, $f8 -/* B59F48 802406D8 C6620034 */ lwc1 $f2, 0x34($s3) -/* B59F4C 802406DC 3C014387 */ lui $at, 0x4387 -/* B59F50 802406E0 44810000 */ mtc1 $at, $f0 -/* B59F54 802406E4 44064000 */ mfc1 $a2, $f8 -/* B59F58 802406E8 46020001 */ sub.s $f0, $f0, $f2 -/* B59F5C 802406EC C6660038 */ lwc1 $f6, 0x38($s3) -/* B59F60 802406F0 C6640040 */ lwc1 $f4, 0x40($s3) -/* B59F64 802406F4 44070000 */ mfc1 $a3, $f0 -/* B59F68 802406F8 27A50014 */ addiu $a1, $sp, 0x14 -/* B59F6C 802406FC E7A60010 */ swc1 $f6, 0x10($sp) -/* B59F70 80240700 0C00A7E7 */ jal add_vec2D_polar -/* B59F74 80240704 E7A40014 */ swc1 $f4, 0x14($sp) -/* B59F78 80240708 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B59F7C 8024070C 4600020D */ trunc.w.s $f8, $f0 -/* B59F80 80240710 44024000 */ mfc1 $v0, $f8 -/* B59F84 80240714 E6400038 */ swc1 $f0, 0x38($s2) -/* B59F88 80240718 A6220010 */ sh $v0, 0x10($s1) -/* B59F8C 8024071C C660003C */ lwc1 $f0, 0x3c($s3) -/* B59F90 80240720 C622006C */ lwc1 $f2, 0x6c($s1) -/* B59F94 80240724 468010A0 */ cvt.s.w $f2, $f2 -/* B59F98 80240728 46020000 */ add.s $f0, $f0, $f2 -/* B59F9C 8024072C 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* B59FA0 80240730 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* B59FA4 80240734 E640003C */ swc1 $f0, 0x3c($s2) -/* B59FA8 80240738 C7A20014 */ lwc1 $f2, 0x14($sp) -/* B59FAC 8024073C 4600020D */ trunc.w.s $f8, $f0 -/* B59FB0 80240740 44024000 */ mfc1 $v0, $f8 -/* B59FB4 80240744 00000000 */ nop -/* B59FB8 80240748 A6220012 */ sh $v0, 0x12($s1) -/* B59FBC 8024074C 4600120D */ trunc.w.s $f8, $f2 -/* B59FC0 80240750 44024000 */ mfc1 $v0, $f8 -/* B59FC4 80240754 E6420040 */ swc1 $f2, 0x40($s2) -/* B59FC8 80240758 A6220014 */ sh $v0, 0x14($s1) -/* B59FCC 8024075C 8C660028 */ lw $a2, 0x28($v1) -/* B59FD0 80240760 8C670030 */ lw $a3, 0x30($v1) -/* B59FD4 80240764 C64C0038 */ lwc1 $f12, 0x38($s2) -/* B59FD8 80240768 0C00A720 */ jal atan2 -/* B59FDC 8024076C C64E0040 */ lwc1 $f14, 0x40($s2) -/* B59FE0 80240770 3C03E0EF */ lui $v1, 0xe0ef -/* B59FE4 80240774 E640000C */ swc1 $f0, 0xc($s2) -/* B59FE8 80240778 8E220000 */ lw $v0, ($s1) -/* B59FEC 8024077C 3463FFFF */ ori $v1, $v1, 0xffff -/* B59FF0 80240780 00431024 */ and $v0, $v0, $v1 -/* B59FF4 80240784 AE220000 */ sw $v0, ($s1) -/* B59FF8 80240788 24020001 */ addiu $v0, $zero, 1 -/* B59FFC 8024078C A640008E */ sh $zero, 0x8e($s2) -/* B5A000 80240790 08090203 */ j .L8024080C -/* B5A004 80240794 AE820070 */ sw $v0, 0x70($s4) -.L80240798: -/* B5A008 80240798 86240008 */ lh $a0, 8($s1) -/* B5A00C 8024079C 0C00FB3A */ jal get_enemy -/* B5A010 802407A0 2484FFFF */ addiu $a0, $a0, -1 -/* B5A014 802407A4 0040802D */ daddu $s0, $v0, $zero -/* B5A018 802407A8 0C00EABB */ jal get_npc_unsafe -/* B5A01C 802407AC 86040008 */ lh $a0, 8($s0) -/* B5A020 802407B0 9642008E */ lhu $v0, 0x8e($s2) -/* B5A024 802407B4 24420001 */ addiu $v0, $v0, 1 -/* B5A028 802407B8 A642008E */ sh $v0, 0x8e($s2) -/* B5A02C 802407BC 00021400 */ sll $v0, $v0, 0x10 -/* B5A030 802407C0 8E23007C */ lw $v1, 0x7c($s1) -/* B5A034 802407C4 00021403 */ sra $v0, $v0, 0x10 -/* B5A038 802407C8 0043102A */ slt $v0, $v0, $v1 -/* B5A03C 802407CC 50400001 */ beql $v0, $zero, .L802407D4 -/* B5A040 802407D0 A2200007 */ sb $zero, 7($s1) -.L802407D4: -/* B5A044 802407D4 8E03006C */ lw $v1, 0x6c($s0) -/* B5A048 802407D8 24020004 */ addiu $v0, $zero, 4 -/* B5A04C 802407DC 1462000B */ bne $v1, $v0, .L8024080C -/* B5A050 802407E0 3C021F10 */ lui $v0, 0x1f10 -/* B5A054 802407E4 8E230000 */ lw $v1, ($s1) -/* B5A058 802407E8 3C01C47A */ lui $at, 0xc47a -/* B5A05C 802407EC 44810000 */ mtc1 $at, $f0 -/* B5A060 802407F0 00621825 */ or $v1, $v1, $v0 -/* B5A064 802407F4 AE230000 */ sw $v1, ($s1) -/* B5A068 802407F8 AE400038 */ sw $zero, 0x38($s2) -/* B5A06C 802407FC E640003C */ swc1 $f0, 0x3c($s2) -/* B5A070 80240800 AE400040 */ sw $zero, 0x40($s2) -/* B5A074 80240804 A2330007 */ sb $s3, 7($s1) -/* B5A078 80240808 AE800070 */ sw $zero, 0x70($s4) -.L8024080C: -/* B5A07C 8024080C 8FBF002C */ lw $ra, 0x2c($sp) -/* B5A080 80240810 8FB40028 */ lw $s4, 0x28($sp) -/* B5A084 80240814 8FB30024 */ lw $s3, 0x24($sp) -/* B5A088 80240818 8FB20020 */ lw $s2, 0x20($sp) -/* B5A08C 8024081C 8FB1001C */ lw $s1, 0x1c($sp) -/* B5A090 80240820 8FB00018 */ lw $s0, 0x18($sp) -/* B5A094 80240824 0000102D */ daddu $v0, $zero, $zero -/* B5A098 80240828 03E00008 */ jr $ra -/* B5A09C 8024082C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_07/func_80240830_B59870.s b/asm/nonmatchings/world/area_jan/jan_07/func_80240830_B59870.s deleted file mode 100644 index c01fedab56..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/func_80240830_B59870.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240830_B5A0A0 -/* B5A0A0 80240830 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B5A0A4 80240834 AFB20038 */ sw $s2, 0x38($sp) -/* B5A0A8 80240838 0080902D */ daddu $s2, $a0, $zero -/* B5A0AC 8024083C AFBF0048 */ sw $ra, 0x48($sp) -/* B5A0B0 80240840 AFB50044 */ sw $s5, 0x44($sp) -/* B5A0B4 80240844 AFB40040 */ sw $s4, 0x40($sp) -/* B5A0B8 80240848 AFB3003C */ sw $s3, 0x3c($sp) -/* B5A0BC 8024084C AFB10034 */ sw $s1, 0x34($sp) -/* B5A0C0 80240850 AFB00030 */ sw $s0, 0x30($sp) -/* B5A0C4 80240854 8E510148 */ lw $s1, 0x148($s2) -/* B5A0C8 80240858 86240008 */ lh $a0, 8($s1) -/* B5A0CC 8024085C 0C00EABB */ jal get_npc_unsafe -/* B5A0D0 80240860 00A0802D */ daddu $s0, $a1, $zero -/* B5A0D4 80240864 8E43000C */ lw $v1, 0xc($s2) -/* B5A0D8 80240868 0240202D */ daddu $a0, $s2, $zero -/* B5A0DC 8024086C 8C650000 */ lw $a1, ($v1) -/* B5A0E0 80240870 0C0B1EAF */ jal get_variable -/* B5A0E4 80240874 0040A82D */ daddu $s5, $v0, $zero -/* B5A0E8 80240878 AFA00010 */ sw $zero, 0x10($sp) -/* B5A0EC 8024087C 8E2300D0 */ lw $v1, 0xd0($s1) -/* B5A0F0 80240880 8C630030 */ lw $v1, 0x30($v1) -/* B5A0F4 80240884 AFA30014 */ sw $v1, 0x14($sp) -/* B5A0F8 80240888 8E2300D0 */ lw $v1, 0xd0($s1) -/* B5A0FC 8024088C 8C63001C */ lw $v1, 0x1c($v1) -/* B5A100 80240890 AFA30018 */ sw $v1, 0x18($sp) -/* B5A104 80240894 8E2300D0 */ lw $v1, 0xd0($s1) -/* B5A108 80240898 8C630024 */ lw $v1, 0x24($v1) -/* B5A10C 8024089C AFA3001C */ sw $v1, 0x1c($sp) -/* B5A110 802408A0 8E2300D0 */ lw $v1, 0xd0($s1) -/* B5A114 802408A4 8C630028 */ lw $v1, 0x28($v1) -/* B5A118 802408A8 27B40010 */ addiu $s4, $sp, 0x10 -/* B5A11C 802408AC AFA30020 */ sw $v1, 0x20($sp) -/* B5A120 802408B0 8E2300D0 */ lw $v1, 0xd0($s1) -/* B5A124 802408B4 3C014282 */ lui $at, 0x4282 -/* B5A128 802408B8 44810000 */ mtc1 $at, $f0 -/* B5A12C 802408BC 8C63002C */ lw $v1, 0x2c($v1) -/* B5A130 802408C0 0040982D */ daddu $s3, $v0, $zero -/* B5A134 802408C4 E7A00028 */ swc1 $f0, 0x28($sp) -/* B5A138 802408C8 A7A0002C */ sh $zero, 0x2c($sp) -/* B5A13C 802408CC 16000005 */ bnez $s0, .L802408E4 -/* B5A140 802408D0 AFA30024 */ sw $v1, 0x24($sp) -/* B5A144 802408D4 8E2200B0 */ lw $v0, 0xb0($s1) -/* B5A148 802408D8 30420004 */ andi $v0, $v0, 4 -/* B5A14C 802408DC 10400020 */ beqz $v0, .L80240960 -/* B5A150 802408E0 00000000 */ nop -.L802408E4: -/* B5A154 802408E4 2404F7FF */ addiu $a0, $zero, -0x801 -/* B5A158 802408E8 AE400070 */ sw $zero, 0x70($s2) -/* B5A15C 802408EC A6A0008E */ sh $zero, 0x8e($s5) -/* B5A160 802408F0 8E2200CC */ lw $v0, 0xcc($s1) -/* B5A164 802408F4 8EA30000 */ lw $v1, ($s5) -/* B5A168 802408F8 8C420000 */ lw $v0, ($v0) -/* B5A16C 802408FC 00641824 */ and $v1, $v1, $a0 -/* B5A170 80240900 AEA30000 */ sw $v1, ($s5) -/* B5A174 80240904 AEA20028 */ sw $v0, 0x28($s5) -/* B5A178 80240908 8E2200D0 */ lw $v0, 0xd0($s1) -/* B5A17C 8024090C 8C420034 */ lw $v0, 0x34($v0) -/* B5A180 80240910 54400005 */ bnel $v0, $zero, .L80240928 -/* B5A184 80240914 2402FDFF */ addiu $v0, $zero, -0x201 -/* B5A188 80240918 34620200 */ ori $v0, $v1, 0x200 -/* B5A18C 8024091C 2403FFF7 */ addiu $v1, $zero, -9 -/* B5A190 80240920 0809024C */ j .L80240930 -/* B5A194 80240924 00431024 */ and $v0, $v0, $v1 -.L80240928: -/* B5A198 80240928 00621024 */ and $v0, $v1, $v0 -/* B5A19C 8024092C 34420008 */ ori $v0, $v0, 8 -.L80240930: -/* B5A1A0 80240930 AEA20000 */ sw $v0, ($s5) -/* B5A1A4 80240934 8E2200B0 */ lw $v0, 0xb0($s1) -/* B5A1A8 80240938 30420004 */ andi $v0, $v0, 4 -/* B5A1AC 8024093C 10400007 */ beqz $v0, .L8024095C -/* B5A1B0 80240940 24020063 */ addiu $v0, $zero, 0x63 -/* B5A1B4 80240944 AE420070 */ sw $v0, 0x70($s2) -/* B5A1B8 80240948 AE400074 */ sw $zero, 0x74($s2) -/* B5A1BC 8024094C 8E2200B0 */ lw $v0, 0xb0($s1) -/* B5A1C0 80240950 2403FFFB */ addiu $v1, $zero, -5 -/* B5A1C4 80240954 00431024 */ and $v0, $v0, $v1 -/* B5A1C8 80240958 AE2200B0 */ sw $v0, 0xb0($s1) -.L8024095C: -/* B5A1CC 8024095C AE20006C */ sw $zero, 0x6c($s1) -.L80240960: -/* B5A1D0 80240960 8E420070 */ lw $v0, 0x70($s2) -/* B5A1D4 80240964 2842001E */ slti $v0, $v0, 0x1e -/* B5A1D8 80240968 10400009 */ beqz $v0, .L80240990 -/* B5A1DC 8024096C 00000000 */ nop -/* B5A1E0 80240970 8E22006C */ lw $v0, 0x6c($s1) -/* B5A1E4 80240974 14400006 */ bnez $v0, .L80240990 -/* B5A1E8 80240978 00000000 */ nop -/* B5A1EC 8024097C 0C090107 */ jal func_8024041C -/* B5A1F0 80240980 0240202D */ daddu $a0, $s2, $zero -/* B5A1F4 80240984 10400002 */ beqz $v0, .L80240990 -/* B5A1F8 80240988 2402001E */ addiu $v0, $zero, 0x1e -/* B5A1FC 8024098C AE420070 */ sw $v0, 0x70($s2) -.L80240990: -/* B5A200 80240990 8E430070 */ lw $v1, 0x70($s2) -/* B5A204 80240994 2C620064 */ sltiu $v0, $v1, 0x64 -/* B5A208 80240998 10400048 */ beqz $v0, .L80240ABC -/* B5A20C 8024099C 00031080 */ sll $v0, $v1, 2 -/* B5A210 802409A0 3C018024 */ lui $at, 0x8024 -/* B5A214 802409A4 00220821 */ addu $at, $at, $v0 -/* B5A218 802409A8 8C224720 */ lw $v0, 0x4720($at) -/* B5A21C 802409AC 00400008 */ jr $v0 -/* B5A220 802409B0 00000000 */ nop -/* B5A224 802409B4 0240202D */ daddu $a0, $s2, $zero -/* B5A228 802409B8 0260282D */ daddu $a1, $s3, $zero -/* B5A22C 802409BC 0C012568 */ jal func_800495A0 -/* B5A230 802409C0 0280302D */ daddu $a2, $s4, $zero -/* B5A234 802409C4 0240202D */ daddu $a0, $s2, $zero -/* B5A238 802409C8 0260282D */ daddu $a1, $s3, $zero -/* B5A23C 802409CC 0C0125AE */ jal func_800496B8 -/* B5A240 802409D0 0280302D */ daddu $a2, $s4, $zero -/* B5A244 802409D4 080902AF */ j .L80240ABC -/* B5A248 802409D8 00000000 */ nop -/* B5A24C 802409DC 0240202D */ daddu $a0, $s2, $zero -/* B5A250 802409E0 0260282D */ daddu $a1, $s3, $zero -/* B5A254 802409E4 0C0126D1 */ jal func_80049B44 -/* B5A258 802409E8 0280302D */ daddu $a2, $s4, $zero -/* B5A25C 802409EC 0240202D */ daddu $a0, $s2, $zero -/* B5A260 802409F0 0260282D */ daddu $a1, $s3, $zero -/* B5A264 802409F4 0C012701 */ jal func_80049C04 -/* B5A268 802409F8 0280302D */ daddu $a2, $s4, $zero -/* B5A26C 802409FC 080902AF */ j .L80240ABC -/* B5A270 80240A00 00000000 */ nop -/* B5A274 80240A04 0240202D */ daddu $a0, $s2, $zero -/* B5A278 80240A08 0260282D */ daddu $a1, $s3, $zero -/* B5A27C 80240A0C 0C01278F */ jal func_80049E3C -/* B5A280 80240A10 0280302D */ daddu $a2, $s4, $zero -/* B5A284 80240A14 0240202D */ daddu $a0, $s2, $zero -/* B5A288 80240A18 0260282D */ daddu $a1, $s3, $zero -/* B5A28C 80240A1C 0C0127B3 */ jal func_80049ECC -/* B5A290 80240A20 0280302D */ daddu $a2, $s4, $zero -/* B5A294 80240A24 080902AF */ j .L80240ABC -/* B5A298 80240A28 00000000 */ nop -/* B5A29C 80240A2C 0240202D */ daddu $a0, $s2, $zero -/* B5A2A0 80240A30 0260282D */ daddu $a1, $s3, $zero -/* B5A2A4 80240A34 0C0127DF */ jal func_80049F7C -/* B5A2A8 80240A38 0280302D */ daddu $a2, $s4, $zero -/* B5A2AC 80240A3C 0240202D */ daddu $a0, $s2, $zero -/* B5A2B0 80240A40 0260282D */ daddu $a1, $s3, $zero -/* B5A2B4 80240A44 0C012849 */ jal func_8004A124 -/* B5A2B8 80240A48 0280302D */ daddu $a2, $s4, $zero -/* B5A2BC 80240A4C 080902AF */ j .L80240ABC -/* B5A2C0 80240A50 00000000 */ nop -/* B5A2C4 80240A54 0240202D */ daddu $a0, $s2, $zero -/* B5A2C8 80240A58 0260282D */ daddu $a1, $s3, $zero -/* B5A2CC 80240A5C 0C0128FA */ jal func_8004A3E8 -/* B5A2D0 80240A60 0280302D */ daddu $a2, $s4, $zero -/* B5A2D4 80240A64 080902AF */ j .L80240ABC -/* B5A2D8 80240A68 00000000 */ nop -/* B5A2DC 80240A6C 0C090085 */ jal func_80240214 -/* B5A2E0 80240A70 0240202D */ daddu $a0, $s2, $zero -/* B5A2E4 80240A74 0C0900A0 */ jal func_80240280 -/* B5A2E8 80240A78 0240202D */ daddu $a0, $s2, $zero -/* B5A2EC 80240A7C 8E430070 */ lw $v1, 0x70($s2) -/* B5A2F0 80240A80 24020020 */ addiu $v0, $zero, 0x20 -/* B5A2F4 80240A84 1462000D */ bne $v1, $v0, .L80240ABC -/* B5A2F8 80240A88 00000000 */ nop -/* B5A2FC 80240A8C 0C0900BC */ jal func_802402F0 -/* B5A300 80240A90 0240202D */ daddu $a0, $s2, $zero -/* B5A304 80240A94 8E430070 */ lw $v1, 0x70($s2) -/* B5A308 80240A98 24020021 */ addiu $v0, $zero, 0x21 -/* B5A30C 80240A9C 14620007 */ bne $v1, $v0, .L80240ABC -/* B5A310 80240AA0 00000000 */ nop -/* B5A314 80240AA4 0C0900F2 */ jal func_802403C8 -/* B5A318 80240AA8 0240202D */ daddu $a0, $s2, $zero -/* B5A31C 80240AAC 080902AF */ j .L80240ABC -/* B5A320 80240AB0 00000000 */ nop -/* B5A324 80240AB4 0C0129CF */ jal func_8004A73C -/* B5A328 80240AB8 0240202D */ daddu $a0, $s2, $zero -.L80240ABC: -/* B5A32C 80240ABC 8FBF0048 */ lw $ra, 0x48($sp) -/* B5A330 80240AC0 8FB50044 */ lw $s5, 0x44($sp) -/* B5A334 80240AC4 8FB40040 */ lw $s4, 0x40($sp) -/* B5A338 80240AC8 8FB3003C */ lw $s3, 0x3c($sp) -/* B5A33C 80240ACC 8FB20038 */ lw $s2, 0x38($sp) -/* B5A340 80240AD0 8FB10034 */ lw $s1, 0x34($sp) -/* B5A344 80240AD4 8FB00030 */ lw $s0, 0x30($sp) -/* B5A348 80240AD8 0000102D */ daddu $v0, $zero, $zero -/* B5A34C 80240ADC 03E00008 */ jr $ra -/* B5A350 80240AE0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_07/func_80240AE4_B59870.s b/asm/nonmatchings/world/area_jan/jan_07/func_80240AE4_B59870.s deleted file mode 100644 index 44db78b2f6..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/func_80240AE4_B59870.s +++ /dev/null @@ -1,186 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AE4_B5A354 -/* B5A354 80240AE4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B5A358 80240AE8 AFB20038 */ sw $s2, 0x38($sp) -/* B5A35C 80240AEC 0080902D */ daddu $s2, $a0, $zero -/* B5A360 80240AF0 AFBF0048 */ sw $ra, 0x48($sp) -/* B5A364 80240AF4 AFB50044 */ sw $s5, 0x44($sp) -/* B5A368 80240AF8 AFB40040 */ sw $s4, 0x40($sp) -/* B5A36C 80240AFC AFB3003C */ sw $s3, 0x3c($sp) -/* B5A370 80240B00 AFB10034 */ sw $s1, 0x34($sp) -/* B5A374 80240B04 AFB00030 */ sw $s0, 0x30($sp) -/* B5A378 80240B08 8E510148 */ lw $s1, 0x148($s2) -/* B5A37C 80240B0C 86240008 */ lh $a0, 8($s1) -/* B5A380 80240B10 0C00EABB */ jal get_npc_unsafe -/* B5A384 80240B14 00A0802D */ daddu $s0, $a1, $zero -/* B5A388 80240B18 8E43000C */ lw $v1, 0xc($s2) -/* B5A38C 80240B1C 0240202D */ daddu $a0, $s2, $zero -/* B5A390 80240B20 8C650000 */ lw $a1, ($v1) -/* B5A394 80240B24 0C0B1EAF */ jal get_variable -/* B5A398 80240B28 0040A82D */ daddu $s5, $v0, $zero -/* B5A39C 80240B2C AFA00010 */ sw $zero, 0x10($sp) -/* B5A3A0 80240B30 8E2300D0 */ lw $v1, 0xd0($s1) -/* B5A3A4 80240B34 8C630030 */ lw $v1, 0x30($v1) -/* B5A3A8 80240B38 AFA30014 */ sw $v1, 0x14($sp) -/* B5A3AC 80240B3C 8E2300D0 */ lw $v1, 0xd0($s1) -/* B5A3B0 80240B40 8C63001C */ lw $v1, 0x1c($v1) -/* B5A3B4 80240B44 AFA30018 */ sw $v1, 0x18($sp) -/* B5A3B8 80240B48 8E2300D0 */ lw $v1, 0xd0($s1) -/* B5A3BC 80240B4C 8C630024 */ lw $v1, 0x24($v1) -/* B5A3C0 80240B50 AFA3001C */ sw $v1, 0x1c($sp) -/* B5A3C4 80240B54 8E2300D0 */ lw $v1, 0xd0($s1) -/* B5A3C8 80240B58 8C630028 */ lw $v1, 0x28($v1) -/* B5A3CC 80240B5C 27B40010 */ addiu $s4, $sp, 0x10 -/* B5A3D0 80240B60 AFA30020 */ sw $v1, 0x20($sp) -/* B5A3D4 80240B64 8E2300D0 */ lw $v1, 0xd0($s1) -/* B5A3D8 80240B68 3C014282 */ lui $at, 0x4282 -/* B5A3DC 80240B6C 44810000 */ mtc1 $at, $f0 -/* B5A3E0 80240B70 8C63002C */ lw $v1, 0x2c($v1) -/* B5A3E4 80240B74 0040982D */ daddu $s3, $v0, $zero -/* B5A3E8 80240B78 E7A00028 */ swc1 $f0, 0x28($sp) -/* B5A3EC 80240B7C A7A0002C */ sh $zero, 0x2c($sp) -/* B5A3F0 80240B80 16000005 */ bnez $s0, .L80240B98 -/* B5A3F4 80240B84 AFA30024 */ sw $v1, 0x24($sp) -/* B5A3F8 80240B88 8E2200B0 */ lw $v0, 0xb0($s1) -/* B5A3FC 80240B8C 30420004 */ andi $v0, $v0, 4 -/* B5A400 80240B90 10400020 */ beqz $v0, .L80240C14 -/* B5A404 80240B94 00000000 */ nop -.L80240B98: -/* B5A408 80240B98 2404F7FF */ addiu $a0, $zero, -0x801 -/* B5A40C 80240B9C AE400070 */ sw $zero, 0x70($s2) -/* B5A410 80240BA0 A6A0008E */ sh $zero, 0x8e($s5) -/* B5A414 80240BA4 8E2200CC */ lw $v0, 0xcc($s1) -/* B5A418 80240BA8 8EA30000 */ lw $v1, ($s5) -/* B5A41C 80240BAC 8C420000 */ lw $v0, ($v0) -/* B5A420 80240BB0 00641824 */ and $v1, $v1, $a0 -/* B5A424 80240BB4 AEA30000 */ sw $v1, ($s5) -/* B5A428 80240BB8 AEA20028 */ sw $v0, 0x28($s5) -/* B5A42C 80240BBC 8E2200D0 */ lw $v0, 0xd0($s1) -/* B5A430 80240BC0 8C420034 */ lw $v0, 0x34($v0) -/* B5A434 80240BC4 54400005 */ bnel $v0, $zero, .L80240BDC -/* B5A438 80240BC8 2402FDFF */ addiu $v0, $zero, -0x201 -/* B5A43C 80240BCC 34620200 */ ori $v0, $v1, 0x200 -/* B5A440 80240BD0 2403FFF7 */ addiu $v1, $zero, -9 -/* B5A444 80240BD4 080902F9 */ j .L80240BE4 -/* B5A448 80240BD8 00431024 */ and $v0, $v0, $v1 -.L80240BDC: -/* B5A44C 80240BDC 00621024 */ and $v0, $v1, $v0 -/* B5A450 80240BE0 34420008 */ ori $v0, $v0, 8 -.L80240BE4: -/* B5A454 80240BE4 AEA20000 */ sw $v0, ($s5) -/* B5A458 80240BE8 8E2200B0 */ lw $v0, 0xb0($s1) -/* B5A45C 80240BEC 30420004 */ andi $v0, $v0, 4 -/* B5A460 80240BF0 10400007 */ beqz $v0, .L80240C10 -/* B5A464 80240BF4 24020063 */ addiu $v0, $zero, 0x63 -/* B5A468 80240BF8 AE420070 */ sw $v0, 0x70($s2) -/* B5A46C 80240BFC AE400074 */ sw $zero, 0x74($s2) -/* B5A470 80240C00 8E2200B0 */ lw $v0, 0xb0($s1) -/* B5A474 80240C04 2403FFFB */ addiu $v1, $zero, -5 -/* B5A478 80240C08 00431024 */ and $v0, $v0, $v1 -/* B5A47C 80240C0C AE2200B0 */ sw $v0, 0xb0($s1) -.L80240C10: -/* B5A480 80240C10 AE20006C */ sw $zero, 0x6c($s1) -.L80240C14: -/* B5A484 80240C14 8E420070 */ lw $v0, 0x70($s2) -/* B5A488 80240C18 2842001E */ slti $v0, $v0, 0x1e -/* B5A48C 80240C1C 10400009 */ beqz $v0, .L80240C44 -/* B5A490 80240C20 00000000 */ nop -/* B5A494 80240C24 8E22006C */ lw $v0, 0x6c($s1) -/* B5A498 80240C28 14400006 */ bnez $v0, .L80240C44 -/* B5A49C 80240C2C 00000000 */ nop -/* B5A4A0 80240C30 0C090107 */ jal func_8024041C -/* B5A4A4 80240C34 0240202D */ daddu $a0, $s2, $zero -/* B5A4A8 80240C38 10400002 */ beqz $v0, .L80240C44 -/* B5A4AC 80240C3C 2402001E */ addiu $v0, $zero, 0x1e -/* B5A4B0 80240C40 AE420070 */ sw $v0, 0x70($s2) -.L80240C44: -/* B5A4B4 80240C44 8E430070 */ lw $v1, 0x70($s2) -/* B5A4B8 80240C48 2C620064 */ sltiu $v0, $v1, 0x64 -/* B5A4BC 80240C4C 10400048 */ beqz $v0, .L80240D70 -/* B5A4C0 80240C50 00031080 */ sll $v0, $v1, 2 -/* B5A4C4 80240C54 3C018024 */ lui $at, 0x8024 -/* B5A4C8 80240C58 00220821 */ addu $at, $at, $v0 -/* B5A4CC 80240C5C 8C2248B0 */ lw $v0, 0x48b0($at) -/* B5A4D0 80240C60 00400008 */ jr $v0 -/* B5A4D4 80240C64 00000000 */ nop -/* B5A4D8 80240C68 0240202D */ daddu $a0, $s2, $zero -/* B5A4DC 80240C6C 0260282D */ daddu $a1, $s3, $zero -/* B5A4E0 80240C70 0C012568 */ jal func_800495A0 -/* B5A4E4 80240C74 0280302D */ daddu $a2, $s4, $zero -/* B5A4E8 80240C78 0240202D */ daddu $a0, $s2, $zero -/* B5A4EC 80240C7C 0260282D */ daddu $a1, $s3, $zero -/* B5A4F0 80240C80 0C0125AE */ jal func_800496B8 -/* B5A4F4 80240C84 0280302D */ daddu $a2, $s4, $zero -/* B5A4F8 80240C88 0809035C */ j .L80240D70 -/* B5A4FC 80240C8C 00000000 */ nop -/* B5A500 80240C90 0240202D */ daddu $a0, $s2, $zero -/* B5A504 80240C94 0260282D */ daddu $a1, $s3, $zero -/* B5A508 80240C98 0C090000 */ jal func_80240000 -/* B5A50C 80240C9C 0280302D */ daddu $a2, $s4, $zero -/* B5A510 80240CA0 0240202D */ daddu $a0, $s2, $zero -/* B5A514 80240CA4 0260282D */ daddu $a1, $s3, $zero -/* B5A518 80240CA8 0C090014 */ jal func_80240050 -/* B5A51C 80240CAC 0280302D */ daddu $a2, $s4, $zero -/* B5A520 80240CB0 0809035C */ j .L80240D70 -/* B5A524 80240CB4 00000000 */ nop -/* B5A528 80240CB8 0240202D */ daddu $a0, $s2, $zero -/* B5A52C 80240CBC 0260282D */ daddu $a1, $s3, $zero -/* B5A530 80240CC0 0C01278F */ jal func_80049E3C -/* B5A534 80240CC4 0280302D */ daddu $a2, $s4, $zero -/* B5A538 80240CC8 0240202D */ daddu $a0, $s2, $zero -/* B5A53C 80240CCC 0260282D */ daddu $a1, $s3, $zero -/* B5A540 80240CD0 0C0127B3 */ jal func_80049ECC -/* B5A544 80240CD4 0280302D */ daddu $a2, $s4, $zero -/* B5A548 80240CD8 0809035C */ j .L80240D70 -/* B5A54C 80240CDC 00000000 */ nop -/* B5A550 80240CE0 0240202D */ daddu $a0, $s2, $zero -/* B5A554 80240CE4 0260282D */ daddu $a1, $s3, $zero -/* B5A558 80240CE8 0C0127DF */ jal func_80049F7C -/* B5A55C 80240CEC 0280302D */ daddu $a2, $s4, $zero -/* B5A560 80240CF0 0240202D */ daddu $a0, $s2, $zero -/* B5A564 80240CF4 0260282D */ daddu $a1, $s3, $zero -/* B5A568 80240CF8 0C012849 */ jal func_8004A124 -/* B5A56C 80240CFC 0280302D */ daddu $a2, $s4, $zero -/* B5A570 80240D00 0809035C */ j .L80240D70 -/* B5A574 80240D04 00000000 */ nop -/* B5A578 80240D08 0240202D */ daddu $a0, $s2, $zero -/* B5A57C 80240D0C 0260282D */ daddu $a1, $s3, $zero -/* B5A580 80240D10 0C0128FA */ jal func_8004A3E8 -/* B5A584 80240D14 0280302D */ daddu $a2, $s4, $zero -/* B5A588 80240D18 0809035C */ j .L80240D70 -/* B5A58C 80240D1C 00000000 */ nop -/* B5A590 80240D20 0C090085 */ jal func_80240214 -/* B5A594 80240D24 0240202D */ daddu $a0, $s2, $zero -/* B5A598 80240D28 0C0900A0 */ jal func_80240280 -/* B5A59C 80240D2C 0240202D */ daddu $a0, $s2, $zero -/* B5A5A0 80240D30 8E430070 */ lw $v1, 0x70($s2) -/* B5A5A4 80240D34 24020020 */ addiu $v0, $zero, 0x20 -/* B5A5A8 80240D38 1462000D */ bne $v1, $v0, .L80240D70 -/* B5A5AC 80240D3C 00000000 */ nop -/* B5A5B0 80240D40 0C0900BC */ jal func_802402F0 -/* B5A5B4 80240D44 0240202D */ daddu $a0, $s2, $zero -/* B5A5B8 80240D48 8E430070 */ lw $v1, 0x70($s2) -/* B5A5BC 80240D4C 24020021 */ addiu $v0, $zero, 0x21 -/* B5A5C0 80240D50 14620007 */ bne $v1, $v0, .L80240D70 -/* B5A5C4 80240D54 00000000 */ nop -/* B5A5C8 80240D58 0C0900F2 */ jal func_802403C8 -/* B5A5CC 80240D5C 0240202D */ daddu $a0, $s2, $zero -/* B5A5D0 80240D60 0809035C */ j .L80240D70 -/* B5A5D4 80240D64 00000000 */ nop -/* B5A5D8 80240D68 0C0129CF */ jal func_8004A73C -/* B5A5DC 80240D6C 0240202D */ daddu $a0, $s2, $zero -.L80240D70: -/* B5A5E0 80240D70 8FBF0048 */ lw $ra, 0x48($sp) -/* B5A5E4 80240D74 8FB50044 */ lw $s5, 0x44($sp) -/* B5A5E8 80240D78 8FB40040 */ lw $s4, 0x40($sp) -/* B5A5EC 80240D7C 8FB3003C */ lw $s3, 0x3c($sp) -/* B5A5F0 80240D80 8FB20038 */ lw $s2, 0x38($sp) -/* B5A5F4 80240D84 8FB10034 */ lw $s1, 0x34($sp) -/* B5A5F8 80240D88 8FB00030 */ lw $s0, 0x30($sp) -/* B5A5FC 80240D8C 0000102D */ daddu $v0, $zero, $zero -/* B5A600 80240D90 03E00008 */ jr $ra -/* B5A604 80240D94 27BD0050 */ addiu $sp, $sp, 0x50 -/* B5A608 80240D98 00000000 */ nop -/* B5A60C 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_07/func_80240DA0_B59870.s b/asm/nonmatchings/world/area_jan/jan_07/func_80240DA0_B59870.s deleted file mode 100644 index cbccad2372..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/func_80240DA0_B59870.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DA0_B5A610 -/* B5A610 80240DA0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B5A614 80240DA4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B5A618 80240DA8 4485A000 */ mtc1 $a1, $f20 -/* B5A61C 80240DAC F7B60020 */ sdc1 $f22, 0x20($sp) -/* B5A620 80240DB0 4486B000 */ mtc1 $a2, $f22 -/* B5A624 80240DB4 AFB00010 */ sw $s0, 0x10($sp) -/* B5A628 80240DB8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B5A62C 80240DBC 4487C000 */ mtc1 $a3, $f24 -/* B5A630 80240DC0 AFBF0014 */ sw $ra, 0x14($sp) -/* B5A634 80240DC4 0C019D28 */ jal guMtxIdentF -/* B5A638 80240DC8 0080802D */ daddu $s0, $a0, $zero -/* B5A63C 80240DCC 4616A582 */ mul.s $f22, $f20, $f22 -/* B5A640 80240DD0 00000000 */ nop -/* B5A644 80240DD4 4618A502 */ mul.s $f20, $f20, $f24 -/* B5A648 80240DD8 00000000 */ nop -/* B5A64C 80240DDC 3C013F80 */ lui $at, 0x3f80 -/* B5A650 80240DE0 44810000 */ mtc1 $at, $f0 -/* B5A654 80240DE4 00000000 */ nop -/* B5A658 80240DE8 E6000014 */ swc1 $f0, 0x14($s0) -/* B5A65C 80240DEC E6160010 */ swc1 $f22, 0x10($s0) -/* B5A660 80240DF0 E6140018 */ swc1 $f20, 0x18($s0) -/* B5A664 80240DF4 8FBF0014 */ lw $ra, 0x14($sp) -/* B5A668 80240DF8 8FB00010 */ lw $s0, 0x10($sp) -/* B5A66C 80240DFC D7B80028 */ ldc1 $f24, 0x28($sp) -/* B5A670 80240E00 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B5A674 80240E04 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B5A678 80240E08 03E00008 */ jr $ra -/* B5A67C 80240E0C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_07/func_80240FE0_B59870.s b/asm/nonmatchings/world/area_jan/jan_07/func_80240FE0_B59870.s deleted file mode 100644 index 2c37bcff58..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/func_80240FE0_B59870.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FE0_B5A850 -/* B5A850 80240FE0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B5A854 80240FE4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B5A858 80240FE8 4485A000 */ mtc1 $a1, $f20 -/* B5A85C 80240FEC F7B60020 */ sdc1 $f22, 0x20($sp) -/* B5A860 80240FF0 4486B000 */ mtc1 $a2, $f22 -/* B5A864 80240FF4 AFB00010 */ sw $s0, 0x10($sp) -/* B5A868 80240FF8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B5A86C 80240FFC 4487C000 */ mtc1 $a3, $f24 -/* B5A870 80241000 AFBF0014 */ sw $ra, 0x14($sp) -/* B5A874 80241004 0C019D28 */ jal guMtxIdentF -/* B5A878 80241008 0080802D */ daddu $s0, $a0, $zero -/* B5A87C 8024100C 4616A582 */ mul.s $f22, $f20, $f22 -/* B5A880 80241010 00000000 */ nop -/* B5A884 80241014 4618A502 */ mul.s $f20, $f20, $f24 -/* B5A888 80241018 00000000 */ nop -/* B5A88C 8024101C 3C013F80 */ lui $at, 0x3f80 -/* B5A890 80241020 44810000 */ mtc1 $at, $f0 -/* B5A894 80241024 00000000 */ nop -/* B5A898 80241028 E6000014 */ swc1 $f0, 0x14($s0) -/* B5A89C 8024102C E6160010 */ swc1 $f22, 0x10($s0) -/* B5A8A0 80241030 E6140018 */ swc1 $f20, 0x18($s0) -/* B5A8A4 80241034 8FBF0014 */ lw $ra, 0x14($sp) -/* B5A8A8 80241038 8FB00010 */ lw $s0, 0x10($sp) -/* B5A8AC 8024103C D7B80028 */ ldc1 $f24, 0x28($sp) -/* B5A8B0 80241040 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B5A8B4 80241044 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B5A8B8 80241048 03E00008 */ jr $ra -/* B5A8BC 8024104C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_07/func_80241050_B59870.s b/asm/nonmatchings/world/area_jan/jan_07/func_80241050_B59870.s deleted file mode 100644 index 49b112a6ee..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/func_80241050_B59870.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241050_B5A8C0 -/* B5A8C0 80241050 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B5A8C4 80241054 AFB10054 */ sw $s1, 0x54($sp) -/* B5A8C8 80241058 0080882D */ daddu $s1, $a0, $zero -/* B5A8CC 8024105C AFBF005C */ sw $ra, 0x5c($sp) -/* B5A8D0 80241060 AFB20058 */ sw $s2, 0x58($sp) -/* B5A8D4 80241064 AFB00050 */ sw $s0, 0x50($sp) -/* B5A8D8 80241068 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B5A8DC 8024106C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B5A8E0 80241070 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B5A8E4 80241074 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B5A8E8 80241078 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B5A8EC 8024107C 8E30000C */ lw $s0, 0xc($s1) -/* B5A8F0 80241080 8E050000 */ lw $a1, ($s0) -/* B5A8F4 80241084 0C0B1EAF */ jal get_variable -/* B5A8F8 80241088 26100004 */ addiu $s0, $s0, 4 -/* B5A8FC 8024108C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B5A900 80241090 0040202D */ daddu $a0, $v0, $zero -/* B5A904 80241094 8E050000 */ lw $a1, ($s0) -/* B5A908 80241098 26100004 */ addiu $s0, $s0, 4 -/* B5A90C 8024109C 0220202D */ daddu $a0, $s1, $zero -/* B5A910 802410A0 0C0B210B */ jal get_float_variable -/* B5A914 802410A4 0040902D */ daddu $s2, $v0, $zero -/* B5A918 802410A8 8E050000 */ lw $a1, ($s0) -/* B5A91C 802410AC 26100004 */ addiu $s0, $s0, 4 -/* B5A920 802410B0 0220202D */ daddu $a0, $s1, $zero -/* B5A924 802410B4 0C0B210B */ jal get_float_variable -/* B5A928 802410B8 46000706 */ mov.s $f28, $f0 -/* B5A92C 802410BC 8E050000 */ lw $a1, ($s0) -/* B5A930 802410C0 26100004 */ addiu $s0, $s0, 4 -/* B5A934 802410C4 0220202D */ daddu $a0, $s1, $zero -/* B5A938 802410C8 0C0B210B */ jal get_float_variable -/* B5A93C 802410CC 46000686 */ mov.s $f26, $f0 -/* B5A940 802410D0 0220202D */ daddu $a0, $s1, $zero -/* B5A944 802410D4 8E050000 */ lw $a1, ($s0) -/* B5A948 802410D8 0C0B210B */ jal get_float_variable -/* B5A94C 802410DC 46000586 */ mov.s $f22, $f0 -/* B5A950 802410E0 0240202D */ daddu $a0, $s2, $zero -/* B5A954 802410E4 0C046B4C */ jal get_model_from_list_index -/* B5A958 802410E8 46000606 */ mov.s $f24, $f0 -/* B5A95C 802410EC 0040882D */ daddu $s1, $v0, $zero -/* B5A960 802410F0 96220000 */ lhu $v0, ($s1) -/* B5A964 802410F4 30420400 */ andi $v0, $v0, 0x400 -/* B5A968 802410F8 1440001E */ bnez $v0, .L80241174 -/* B5A96C 802410FC 26300058 */ addiu $s0, $s1, 0x58 -/* B5A970 80241100 4480A000 */ mtc1 $zero, $f20 -/* B5A974 80241104 4406B000 */ mfc1 $a2, $f22 -/* B5A978 80241108 4405A000 */ mfc1 $a1, $f20 -/* B5A97C 8024110C 4407A000 */ mfc1 $a3, $f20 -/* B5A980 80241110 0C019E40 */ jal guTranslateF -/* B5A984 80241114 0200202D */ daddu $a0, $s0, $zero -/* B5A988 80241118 4405E000 */ mfc1 $a1, $f28 -/* B5A98C 8024111C 4406D000 */ mfc1 $a2, $f26 -/* B5A990 80241120 4407C000 */ mfc1 $a3, $f24 -/* B5A994 80241124 0C0903F8 */ jal func_80240FE0 -/* B5A998 80241128 27A40010 */ addiu $a0, $sp, 0x10 -/* B5A99C 8024112C 27A40010 */ addiu $a0, $sp, 0x10 -/* B5A9A0 80241130 0200282D */ daddu $a1, $s0, $zero -/* B5A9A4 80241134 0C019D80 */ jal guMtxCatF -/* B5A9A8 80241138 0200302D */ daddu $a2, $s0, $zero -/* B5A9AC 8024113C 27A40010 */ addiu $a0, $sp, 0x10 -/* B5A9B0 80241140 4600B587 */ neg.s $f22, $f22 -/* B5A9B4 80241144 4405A000 */ mfc1 $a1, $f20 -/* B5A9B8 80241148 4406B000 */ mfc1 $a2, $f22 -/* B5A9BC 8024114C 0C019E40 */ jal guTranslateF -/* B5A9C0 80241150 00A0382D */ daddu $a3, $a1, $zero -/* B5A9C4 80241154 27A40010 */ addiu $a0, $sp, 0x10 -/* B5A9C8 80241158 0200282D */ daddu $a1, $s0, $zero -/* B5A9CC 8024115C 0C019D80 */ jal guMtxCatF -/* B5A9D0 80241160 00A0302D */ daddu $a2, $a1, $zero -/* B5A9D4 80241164 96220000 */ lhu $v0, ($s1) -/* B5A9D8 80241168 34421400 */ ori $v0, $v0, 0x1400 -/* B5A9DC 8024116C 0809047B */ j .L802411EC -/* B5A9E0 80241170 A6220000 */ sh $v0, ($s1) -.L80241174: -/* B5A9E4 80241174 4480A000 */ mtc1 $zero, $f20 -/* B5A9E8 80241178 4406B000 */ mfc1 $a2, $f22 -/* B5A9EC 8024117C 4405A000 */ mfc1 $a1, $f20 -/* B5A9F0 80241180 4407A000 */ mfc1 $a3, $f20 -/* B5A9F4 80241184 0C019E40 */ jal guTranslateF -/* B5A9F8 80241188 27A40010 */ addiu $a0, $sp, 0x10 -/* B5A9FC 8024118C 27A40010 */ addiu $a0, $sp, 0x10 -/* B5AA00 80241190 26300058 */ addiu $s0, $s1, 0x58 -/* B5AA04 80241194 0200282D */ daddu $a1, $s0, $zero -/* B5AA08 80241198 0C019D80 */ jal guMtxCatF -/* B5AA0C 8024119C 0200302D */ daddu $a2, $s0, $zero -/* B5AA10 802411A0 4405E000 */ mfc1 $a1, $f28 -/* B5AA14 802411A4 4406D000 */ mfc1 $a2, $f26 -/* B5AA18 802411A8 4407C000 */ mfc1 $a3, $f24 -/* B5AA1C 802411AC 0C0903F8 */ jal func_80240FE0 -/* B5AA20 802411B0 27A40010 */ addiu $a0, $sp, 0x10 -/* B5AA24 802411B4 27A40010 */ addiu $a0, $sp, 0x10 -/* B5AA28 802411B8 0200282D */ daddu $a1, $s0, $zero -/* B5AA2C 802411BC 0C019D80 */ jal guMtxCatF -/* B5AA30 802411C0 0200302D */ daddu $a2, $s0, $zero -/* B5AA34 802411C4 27A40010 */ addiu $a0, $sp, 0x10 -/* B5AA38 802411C8 4600B587 */ neg.s $f22, $f22 -/* B5AA3C 802411CC 4405A000 */ mfc1 $a1, $f20 -/* B5AA40 802411D0 4406B000 */ mfc1 $a2, $f22 -/* B5AA44 802411D4 0C019E40 */ jal guTranslateF -/* B5AA48 802411D8 00A0382D */ daddu $a3, $a1, $zero -/* B5AA4C 802411DC 27A40010 */ addiu $a0, $sp, 0x10 -/* B5AA50 802411E0 0200282D */ daddu $a1, $s0, $zero -/* B5AA54 802411E4 0C019D80 */ jal guMtxCatF -/* B5AA58 802411E8 00A0302D */ daddu $a2, $a1, $zero -.L802411EC: -/* B5AA5C 802411EC 8FBF005C */ lw $ra, 0x5c($sp) -/* B5AA60 802411F0 8FB20058 */ lw $s2, 0x58($sp) -/* B5AA64 802411F4 8FB10054 */ lw $s1, 0x54($sp) -/* B5AA68 802411F8 8FB00050 */ lw $s0, 0x50($sp) -/* B5AA6C 802411FC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B5AA70 80241200 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B5AA74 80241204 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B5AA78 80241208 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B5AA7C 8024120C D7B40060 */ ldc1 $f20, 0x60($sp) -/* B5AA80 80241210 24020002 */ addiu $v0, $zero, 2 -/* B5AA84 80241214 03E00008 */ jr $ra -/* B5AA88 80241218 27BD0088 */ addiu $sp, $sp, 0x88 -/* B5AA8C 8024121C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80240124_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80240124_B5E2B0.s deleted file mode 100644 index d970fb3872..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80240124_B5E2B0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_B5E3D4 -/* B5E3D4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5E3D8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* B5E3DC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* B5E3E0 80240130 10A00005 */ beqz $a1, .L80240148 -/* B5E3E4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* B5E3E8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* B5E3EC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* B5E3F0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* B5E3F4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* B5E3F8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* B5E3FC 8024014C 1440000E */ bnez $v0, .L80240188 -/* B5E400 80240150 00000000 */ nop -/* B5E404 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* B5E408 80240158 8E020088 */ lw $v0, 0x88($s0) -/* B5E40C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* B5E410 80240160 04610004 */ bgez $v1, .L80240174 -/* B5E414 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* B5E418 80240168 3C020002 */ lui $v0, 2 -/* B5E41C 8024016C 08090061 */ j .L80240184 -/* B5E420 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* B5E424 80240174 3C040002 */ lui $a0, 2 -/* B5E428 80240178 0083102A */ slt $v0, $a0, $v1 -/* B5E42C 8024017C 10400002 */ beqz $v0, .L80240188 -/* B5E430 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* B5E434 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* B5E438 80240188 8E020074 */ lw $v0, 0x74($s0) -/* B5E43C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* B5E440 80240190 00000000 */ nop -/* B5E444 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* B5E448 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* B5E44C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* B5E450 802401A0 04610004 */ bgez $v1, .L802401B4 -/* B5E454 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* B5E458 802401A8 3C020002 */ lui $v0, 2 -/* B5E45C 802401AC 08090071 */ j .L802401C4 -/* B5E460 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* B5E464 802401B4 3C040002 */ lui $a0, 2 -/* B5E468 802401B8 0083102A */ slt $v0, $a0, $v1 -/* B5E46C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* B5E470 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* B5E474 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* B5E478 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* B5E47C 802401CC 1440000E */ bnez $v0, .L80240208 -/* B5E480 802401D0 00000000 */ nop -/* B5E484 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* B5E488 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* B5E48C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* B5E490 802401E0 04610004 */ bgez $v1, .L802401F4 -/* B5E494 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* B5E498 802401E8 3C020002 */ lui $v0, 2 -/* B5E49C 802401EC 08090081 */ j .L80240204 -/* B5E4A0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* B5E4A4 802401F4 3C040002 */ lui $a0, 2 -/* B5E4A8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* B5E4AC 802401FC 10400002 */ beqz $v0, .L80240208 -/* B5E4B0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* B5E4B4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* B5E4B8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* B5E4BC 8024020C 1440000E */ bnez $v0, .L80240248 -/* B5E4C0 80240210 00000000 */ nop -/* B5E4C4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* B5E4C8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* B5E4CC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* B5E4D0 80240220 04610004 */ bgez $v1, .L80240234 -/* B5E4D4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* B5E4D8 80240228 3C020002 */ lui $v0, 2 -/* B5E4DC 8024022C 08090091 */ j .L80240244 -/* B5E4E0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* B5E4E4 80240234 3C040002 */ lui $a0, 2 -/* B5E4E8 80240238 0083102A */ slt $v0, $a0, $v1 -/* B5E4EC 8024023C 10400002 */ beqz $v0, .L80240248 -/* B5E4F0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* B5E4F4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* B5E4F8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* B5E4FC 8024024C 0C046F07 */ jal set_main_pan_u -/* B5E500 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* B5E504 80240254 8E040084 */ lw $a0, 0x84($s0) -/* B5E508 80240258 0C046F0D */ jal set_main_pan_v -/* B5E50C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* B5E510 80240260 8E040084 */ lw $a0, 0x84($s0) -/* B5E514 80240264 0C046F13 */ jal set_aux_pan_u -/* B5E518 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* B5E51C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* B5E520 80240270 0C046F19 */ jal set_aux_pan_v -/* B5E524 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* B5E528 80240278 8E020070 */ lw $v0, 0x70($s0) -/* B5E52C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* B5E530 80240280 8E040098 */ lw $a0, 0x98($s0) -/* B5E534 80240284 24420001 */ addiu $v0, $v0, 1 -/* B5E538 80240288 AE020070 */ sw $v0, 0x70($s0) -/* B5E53C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* B5E540 80240290 24630001 */ addiu $v1, $v1, 1 -/* B5E544 80240294 AE030078 */ sw $v1, 0x78($s0) -/* B5E548 80240298 8E030070 */ lw $v1, 0x70($s0) -/* B5E54C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* B5E550 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* B5E554 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* B5E558 802402A8 0064182A */ slt $v1, $v1, $a0 -/* B5E55C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* B5E560 802402B0 14600002 */ bnez $v1, .L802402BC -/* B5E564 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* B5E568 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* B5E56C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* B5E570 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* B5E574 802402C4 0043102A */ slt $v0, $v0, $v1 -/* B5E578 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* B5E57C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* B5E580 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* B5E584 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* B5E588 802402D8 0043102A */ slt $v0, $v0, $v1 -/* B5E58C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* B5E590 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* B5E594 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* B5E598 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* B5E59C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* B5E5A0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* B5E5A4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* B5E5A8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B5E5AC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* B5E5B0 80240300 0000102D */ daddu $v0, $zero, $zero -/* B5E5B4 80240304 03E00008 */ jr $ra -/* B5E5B8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5E5BC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80240310_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80240310_B5E2B0.s deleted file mode 100644 index fbcb18d6ef..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80240310_B5E2B0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_B5E5C0 -/* B5E5C0 80240310 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B5E5C4 80240314 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B5E5C8 80240318 4485A000 */ mtc1 $a1, $f20 -/* B5E5CC 8024031C F7B60020 */ sdc1 $f22, 0x20($sp) -/* B5E5D0 80240320 4486B000 */ mtc1 $a2, $f22 -/* B5E5D4 80240324 AFB00010 */ sw $s0, 0x10($sp) -/* B5E5D8 80240328 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B5E5DC 8024032C 4487C000 */ mtc1 $a3, $f24 -/* B5E5E0 80240330 AFBF0014 */ sw $ra, 0x14($sp) -/* B5E5E4 80240334 0C019D28 */ jal guMtxIdentF -/* B5E5E8 80240338 0080802D */ daddu $s0, $a0, $zero -/* B5E5EC 8024033C 4616A582 */ mul.s $f22, $f20, $f22 -/* B5E5F0 80240340 00000000 */ nop -/* B5E5F4 80240344 4618A502 */ mul.s $f20, $f20, $f24 -/* B5E5F8 80240348 00000000 */ nop -/* B5E5FC 8024034C 3C013F80 */ lui $at, 0x3f80 -/* B5E600 80240350 44810000 */ mtc1 $at, $f0 -/* B5E604 80240354 00000000 */ nop -/* B5E608 80240358 E6000014 */ swc1 $f0, 0x14($s0) -/* B5E60C 8024035C E6160010 */ swc1 $f22, 0x10($s0) -/* B5E610 80240360 E6140018 */ swc1 $f20, 0x18($s0) -/* B5E614 80240364 8FBF0014 */ lw $ra, 0x14($sp) -/* B5E618 80240368 8FB00010 */ lw $s0, 0x10($sp) -/* B5E61C 8024036C D7B80028 */ ldc1 $f24, 0x28($sp) -/* B5E620 80240370 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B5E624 80240374 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B5E628 80240378 03E00008 */ jr $ra -/* B5E62C 8024037C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80240380_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80240380_B5E2B0.s deleted file mode 100644 index 35adcc7ed7..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80240380_B5E2B0.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240380_B5E630 -/* B5E630 80240380 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B5E634 80240384 AFB10054 */ sw $s1, 0x54($sp) -/* B5E638 80240388 0080882D */ daddu $s1, $a0, $zero -/* B5E63C 8024038C AFBF005C */ sw $ra, 0x5c($sp) -/* B5E640 80240390 AFB20058 */ sw $s2, 0x58($sp) -/* B5E644 80240394 AFB00050 */ sw $s0, 0x50($sp) -/* B5E648 80240398 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B5E64C 8024039C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B5E650 802403A0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B5E654 802403A4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B5E658 802403A8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B5E65C 802403AC 8E30000C */ lw $s0, 0xc($s1) -/* B5E660 802403B0 8E050000 */ lw $a1, ($s0) -/* B5E664 802403B4 0C0B1EAF */ jal get_variable -/* B5E668 802403B8 26100004 */ addiu $s0, $s0, 4 -/* B5E66C 802403BC 0C046C04 */ jal get_model_list_index_from_tree_index -/* B5E670 802403C0 0040202D */ daddu $a0, $v0, $zero -/* B5E674 802403C4 8E050000 */ lw $a1, ($s0) -/* B5E678 802403C8 26100004 */ addiu $s0, $s0, 4 -/* B5E67C 802403CC 0220202D */ daddu $a0, $s1, $zero -/* B5E680 802403D0 0C0B210B */ jal get_float_variable -/* B5E684 802403D4 0040902D */ daddu $s2, $v0, $zero -/* B5E688 802403D8 8E050000 */ lw $a1, ($s0) -/* B5E68C 802403DC 26100004 */ addiu $s0, $s0, 4 -/* B5E690 802403E0 0220202D */ daddu $a0, $s1, $zero -/* B5E694 802403E4 0C0B210B */ jal get_float_variable -/* B5E698 802403E8 46000706 */ mov.s $f28, $f0 -/* B5E69C 802403EC 8E050000 */ lw $a1, ($s0) -/* B5E6A0 802403F0 26100004 */ addiu $s0, $s0, 4 -/* B5E6A4 802403F4 0220202D */ daddu $a0, $s1, $zero -/* B5E6A8 802403F8 0C0B210B */ jal get_float_variable -/* B5E6AC 802403FC 46000686 */ mov.s $f26, $f0 -/* B5E6B0 80240400 0220202D */ daddu $a0, $s1, $zero -/* B5E6B4 80240404 8E050000 */ lw $a1, ($s0) -/* B5E6B8 80240408 0C0B210B */ jal get_float_variable -/* B5E6BC 8024040C 46000586 */ mov.s $f22, $f0 -/* B5E6C0 80240410 0240202D */ daddu $a0, $s2, $zero -/* B5E6C4 80240414 0C046B4C */ jal get_model_from_list_index -/* B5E6C8 80240418 46000606 */ mov.s $f24, $f0 -/* B5E6CC 8024041C 0040882D */ daddu $s1, $v0, $zero -/* B5E6D0 80240420 96220000 */ lhu $v0, ($s1) -/* B5E6D4 80240424 30420400 */ andi $v0, $v0, 0x400 -/* B5E6D8 80240428 1440001E */ bnez $v0, .L802404A4 -/* B5E6DC 8024042C 26300058 */ addiu $s0, $s1, 0x58 -/* B5E6E0 80240430 4480A000 */ mtc1 $zero, $f20 -/* B5E6E4 80240434 4406B000 */ mfc1 $a2, $f22 -/* B5E6E8 80240438 4405A000 */ mfc1 $a1, $f20 -/* B5E6EC 8024043C 4407A000 */ mfc1 $a3, $f20 -/* B5E6F0 80240440 0C019E40 */ jal guTranslateF -/* B5E6F4 80240444 0200202D */ daddu $a0, $s0, $zero -/* B5E6F8 80240448 4405E000 */ mfc1 $a1, $f28 -/* B5E6FC 8024044C 4406D000 */ mfc1 $a2, $f26 -/* B5E700 80240450 4407C000 */ mfc1 $a3, $f24 -/* B5E704 80240454 0C0900C4 */ jal func_80240310 -/* B5E708 80240458 27A40010 */ addiu $a0, $sp, 0x10 -/* B5E70C 8024045C 27A40010 */ addiu $a0, $sp, 0x10 -/* B5E710 80240460 0200282D */ daddu $a1, $s0, $zero -/* B5E714 80240464 0C019D80 */ jal guMtxCatF -/* B5E718 80240468 0200302D */ daddu $a2, $s0, $zero -/* B5E71C 8024046C 27A40010 */ addiu $a0, $sp, 0x10 -/* B5E720 80240470 4600B587 */ neg.s $f22, $f22 -/* B5E724 80240474 4405A000 */ mfc1 $a1, $f20 -/* B5E728 80240478 4406B000 */ mfc1 $a2, $f22 -/* B5E72C 8024047C 0C019E40 */ jal guTranslateF -/* B5E730 80240480 00A0382D */ daddu $a3, $a1, $zero -/* B5E734 80240484 27A40010 */ addiu $a0, $sp, 0x10 -/* B5E738 80240488 0200282D */ daddu $a1, $s0, $zero -/* B5E73C 8024048C 0C019D80 */ jal guMtxCatF -/* B5E740 80240490 00A0302D */ daddu $a2, $a1, $zero -/* B5E744 80240494 96220000 */ lhu $v0, ($s1) -/* B5E748 80240498 34421400 */ ori $v0, $v0, 0x1400 -/* B5E74C 8024049C 08090147 */ j .L8024051C -/* B5E750 802404A0 A6220000 */ sh $v0, ($s1) -.L802404A4: -/* B5E754 802404A4 4480A000 */ mtc1 $zero, $f20 -/* B5E758 802404A8 4406B000 */ mfc1 $a2, $f22 -/* B5E75C 802404AC 4405A000 */ mfc1 $a1, $f20 -/* B5E760 802404B0 4407A000 */ mfc1 $a3, $f20 -/* B5E764 802404B4 0C019E40 */ jal guTranslateF -/* B5E768 802404B8 27A40010 */ addiu $a0, $sp, 0x10 -/* B5E76C 802404BC 27A40010 */ addiu $a0, $sp, 0x10 -/* B5E770 802404C0 26300058 */ addiu $s0, $s1, 0x58 -/* B5E774 802404C4 0200282D */ daddu $a1, $s0, $zero -/* B5E778 802404C8 0C019D80 */ jal guMtxCatF -/* B5E77C 802404CC 0200302D */ daddu $a2, $s0, $zero -/* B5E780 802404D0 4405E000 */ mfc1 $a1, $f28 -/* B5E784 802404D4 4406D000 */ mfc1 $a2, $f26 -/* B5E788 802404D8 4407C000 */ mfc1 $a3, $f24 -/* B5E78C 802404DC 0C0900C4 */ jal func_80240310 -/* B5E790 802404E0 27A40010 */ addiu $a0, $sp, 0x10 -/* B5E794 802404E4 27A40010 */ addiu $a0, $sp, 0x10 -/* B5E798 802404E8 0200282D */ daddu $a1, $s0, $zero -/* B5E79C 802404EC 0C019D80 */ jal guMtxCatF -/* B5E7A0 802404F0 0200302D */ daddu $a2, $s0, $zero -/* B5E7A4 802404F4 27A40010 */ addiu $a0, $sp, 0x10 -/* B5E7A8 802404F8 4600B587 */ neg.s $f22, $f22 -/* B5E7AC 802404FC 4405A000 */ mfc1 $a1, $f20 -/* B5E7B0 80240500 4406B000 */ mfc1 $a2, $f22 -/* B5E7B4 80240504 0C019E40 */ jal guTranslateF -/* B5E7B8 80240508 00A0382D */ daddu $a3, $a1, $zero -/* B5E7BC 8024050C 27A40010 */ addiu $a0, $sp, 0x10 -/* B5E7C0 80240510 0200282D */ daddu $a1, $s0, $zero -/* B5E7C4 80240514 0C019D80 */ jal guMtxCatF -/* B5E7C8 80240518 00A0302D */ daddu $a2, $a1, $zero -.L8024051C: -/* B5E7CC 8024051C 8FBF005C */ lw $ra, 0x5c($sp) -/* B5E7D0 80240520 8FB20058 */ lw $s2, 0x58($sp) -/* B5E7D4 80240524 8FB10054 */ lw $s1, 0x54($sp) -/* B5E7D8 80240528 8FB00050 */ lw $s0, 0x50($sp) -/* B5E7DC 8024052C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B5E7E0 80240530 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B5E7E4 80240534 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B5E7E8 80240538 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B5E7EC 8024053C D7B40060 */ ldc1 $f20, 0x60($sp) -/* B5E7F0 80240540 24020002 */ addiu $v0, $zero, 2 -/* B5E7F4 80240544 03E00008 */ jr $ra -/* B5E7F8 80240548 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_802405A8_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_802405A8_B5E2B0.s deleted file mode 100644 index 48eec6a373..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_802405A8_B5E2B0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A8_B5E858 -/* B5E858 802405A8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B5E85C 802405AC AFB10054 */ sw $s1, 0x54($sp) -/* B5E860 802405B0 0080882D */ daddu $s1, $a0, $zero -/* B5E864 802405B4 AFBF0058 */ sw $ra, 0x58($sp) -/* B5E868 802405B8 AFB00050 */ sw $s0, 0x50($sp) -/* B5E86C 802405BC F7B40060 */ sdc1 $f20, 0x60($sp) -/* B5E870 802405C0 8E30000C */ lw $s0, 0xc($s1) -/* B5E874 802405C4 8E050000 */ lw $a1, ($s0) -/* B5E878 802405C8 0C0B1EAF */ jal get_variable -/* B5E87C 802405CC 26100004 */ addiu $s0, $s0, 4 -/* B5E880 802405D0 0C046C04 */ jal get_model_list_index_from_tree_index -/* B5E884 802405D4 0040202D */ daddu $a0, $v0, $zero -/* B5E888 802405D8 0220202D */ daddu $a0, $s1, $zero -/* B5E88C 802405DC 8E050000 */ lw $a1, ($s0) -/* B5E890 802405E0 0C0B210B */ jal get_float_variable -/* B5E894 802405E4 0040802D */ daddu $s0, $v0, $zero -/* B5E898 802405E8 0200202D */ daddu $a0, $s0, $zero -/* B5E89C 802405EC 0C046B4C */ jal get_model_from_list_index -/* B5E8A0 802405F0 46000506 */ mov.s $f20, $f0 -/* B5E8A4 802405F4 0040802D */ daddu $s0, $v0, $zero -/* B5E8A8 802405F8 96020000 */ lhu $v0, ($s0) -/* B5E8AC 802405FC 30420400 */ andi $v0, $v0, 0x400 -/* B5E8B0 80240600 14400008 */ bnez $v0, .L80240624 -/* B5E8B4 80240604 00000000 */ nop -/* B5E8B8 80240608 4405A000 */ mfc1 $a1, $f20 -/* B5E8BC 8024060C 0C090153 */ jal func_8024054C -/* B5E8C0 80240610 26040058 */ addiu $a0, $s0, 0x58 -/* B5E8C4 80240614 96020000 */ lhu $v0, ($s0) -/* B5E8C8 80240618 34421400 */ ori $v0, $v0, 0x1400 -/* B5E8CC 8024061C 08090190 */ j .L80240640 -/* B5E8D0 80240620 A6020000 */ sh $v0, ($s0) -.L80240624: -/* B5E8D4 80240624 4405A000 */ mfc1 $a1, $f20 -/* B5E8D8 80240628 0C090153 */ jal func_8024054C -/* B5E8DC 8024062C 27A40010 */ addiu $a0, $sp, 0x10 -/* B5E8E0 80240630 27A40010 */ addiu $a0, $sp, 0x10 -/* B5E8E4 80240634 26050058 */ addiu $a1, $s0, 0x58 -/* B5E8E8 80240638 0C019D80 */ jal guMtxCatF -/* B5E8EC 8024063C 00A0302D */ daddu $a2, $a1, $zero -.L80240640: -/* B5E8F0 80240640 8FBF0058 */ lw $ra, 0x58($sp) -/* B5E8F4 80240644 8FB10054 */ lw $s1, 0x54($sp) -/* B5E8F8 80240648 8FB00050 */ lw $s0, 0x50($sp) -/* B5E8FC 8024064C D7B40060 */ ldc1 $f20, 0x60($sp) -/* B5E900 80240650 24020002 */ addiu $v0, $zero, 2 -/* B5E904 80240654 03E00008 */ jr $ra -/* B5E908 80240658 27BD0068 */ addiu $sp, $sp, 0x68 -/* B5E90C 8024065C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80240660_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80240660_B5E2B0.s deleted file mode 100644 index 28d52fb115..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80240660_B5E2B0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240660_B5E910 -/* B5E910 80240660 3C03800A */ lui $v1, %hi(D_8009A650) -/* B5E914 80240664 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* B5E918 80240668 8C620000 */ lw $v0, ($v1) -/* B5E91C 8024066C 34420040 */ ori $v0, $v0, 0x40 -/* B5E920 80240670 AC620000 */ sw $v0, ($v1) -/* B5E924 80240674 03E00008 */ jr $ra -/* B5E928 80240678 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_8024067C_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_8024067C_B5E2B0.s deleted file mode 100644 index 44579ab331..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_8024067C_B5E2B0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024067C_B5E92C -/* B5E92C 8024067C 3C02800A */ lui $v0, %hi(D_8009A650) -/* B5E930 80240680 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* B5E934 80240684 8C430000 */ lw $v1, ($v0) -/* B5E938 80240688 2404FFBF */ addiu $a0, $zero, -0x41 -/* B5E93C 8024068C 00641824 */ and $v1, $v1, $a0 -/* B5E940 80240690 AC430000 */ sw $v1, ($v0) -/* B5E944 80240694 03E00008 */ jr $ra -/* B5E948 80240698 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_8024069C_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_8024069C_B5E2B0.s deleted file mode 100644 index e4d2ddb12b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_8024069C_B5E2B0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024069C_B5E94C -/* B5E94C 8024069C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5E950 802406A0 AFBF0010 */ sw $ra, 0x10($sp) -/* B5E954 802406A4 8C82000C */ lw $v0, 0xc($a0) -/* B5E958 802406A8 0C0B1EAF */ jal get_variable -/* B5E95C 802406AC 8C450000 */ lw $a1, ($v0) -/* B5E960 802406B0 0C0B95A4 */ jal func_802E5690 -/* B5E964 802406B4 0040202D */ daddu $a0, $v0, $zero -/* B5E968 802406B8 8FBF0010 */ lw $ra, 0x10($sp) -/* B5E96C 802406BC 24020002 */ addiu $v0, $zero, 2 -/* B5E970 802406C0 03E00008 */ jr $ra -/* B5E974 802406C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_802406C8_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_802406C8_B5E2B0.s deleted file mode 100644 index 690eb8a044..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_802406C8_B5E2B0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406C8_B5E978 -/* B5E978 802406C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5E97C 802406CC AFB00010 */ sw $s0, 0x10($sp) -/* B5E980 802406D0 0080802D */ daddu $s0, $a0, $zero -/* B5E984 802406D4 AFBF0018 */ sw $ra, 0x18($sp) -/* B5E988 802406D8 AFB10014 */ sw $s1, 0x14($sp) -/* B5E98C 802406DC 8E11000C */ lw $s1, 0xc($s0) -/* B5E990 802406E0 8E250000 */ lw $a1, ($s1) -/* B5E994 802406E4 0C0B1EAF */ jal get_variable -/* B5E998 802406E8 26310004 */ addiu $s1, $s1, 4 -/* B5E99C 802406EC 0200202D */ daddu $a0, $s0, $zero -/* B5E9A0 802406F0 3C038011 */ lui $v1, %hi(gPlayerData) -/* B5E9A4 802406F4 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* B5E9A8 802406F8 000210C0 */ sll $v0, $v0, 3 -/* B5E9AC 802406FC 00431021 */ addu $v0, $v0, $v1 -/* B5E9B0 80240700 90460015 */ lbu $a2, 0x15($v0) -/* B5E9B4 80240704 8E250000 */ lw $a1, ($s1) -/* B5E9B8 80240708 24C60001 */ addiu $a2, $a2, 1 -/* B5E9BC 8024070C A0460015 */ sb $a2, 0x15($v0) -/* B5E9C0 80240710 00063600 */ sll $a2, $a2, 0x18 -/* B5E9C4 80240714 0C0B2026 */ jal set_variable -/* B5E9C8 80240718 00063603 */ sra $a2, $a2, 0x18 -/* B5E9CC 8024071C 8FBF0018 */ lw $ra, 0x18($sp) -/* B5E9D0 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* B5E9D4 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* B5E9D8 80240728 24020002 */ addiu $v0, $zero, 2 -/* B5E9DC 8024072C 03E00008 */ jr $ra -/* B5E9E0 80240730 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80240734_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80240734_B5E2B0.s deleted file mode 100644 index c8589e614f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80240734_B5E2B0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240734_B5E9E4 -/* B5E9E4 80240734 3C028011 */ lui $v0, %hi(gPlayerData) -/* B5E9E8 80240738 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* B5E9EC 8024073C 000420C0 */ sll $a0, $a0, 3 -/* B5E9F0 80240740 00822021 */ addu $a0, $a0, $v0 -/* B5E9F4 80240744 90820014 */ lbu $v0, 0x14($a0) -/* B5E9F8 80240748 10400009 */ beqz $v0, .L80240770 -/* B5E9FC 8024074C 00000000 */ nop -/* B5EA00 80240750 90820015 */ lbu $v0, 0x15($a0) -/* B5EA04 80240754 00022600 */ sll $a0, $v0, 0x18 -/* B5EA08 80240758 00041E03 */ sra $v1, $a0, 0x18 -/* B5EA0C 8024075C 00051400 */ sll $v0, $a1, 0x10 -/* B5EA10 80240760 00021403 */ sra $v0, $v0, 0x10 -/* B5EA14 80240764 0043102A */ slt $v0, $v0, $v1 -/* B5EA18 80240768 10400003 */ beqz $v0, .L80240778 -/* B5EA1C 8024076C 00000000 */ nop -.L80240770: -/* B5EA20 80240770 03E00008 */ jr $ra -/* B5EA24 80240774 2402FFFF */ addiu $v0, $zero, -1 -.L80240778: -/* B5EA28 80240778 03E00008 */ jr $ra -/* B5EA2C 8024077C 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80240780_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80240780_B5E2B0.s deleted file mode 100644 index ea213b214d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80240780_B5E2B0.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240780_B5EA30 -/* B5EA30 80240780 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B5EA34 80240784 AFB3001C */ sw $s3, 0x1c($sp) -/* B5EA38 80240788 0080982D */ daddu $s3, $a0, $zero -/* B5EA3C 8024078C AFB00010 */ sw $s0, 0x10($sp) -/* B5EA40 80240790 24100001 */ addiu $s0, $zero, 1 -/* B5EA44 80240794 AFB40020 */ sw $s4, 0x20($sp) -/* B5EA48 80240798 2414FFFF */ addiu $s4, $zero, -1 -/* B5EA4C 8024079C AFB50024 */ sw $s5, 0x24($sp) -/* B5EA50 802407A0 0200A82D */ daddu $s5, $s0, $zero -/* B5EA54 802407A4 AFB10014 */ sw $s1, 0x14($sp) -/* B5EA58 802407A8 3C118011 */ lui $s1, 0x8011 -/* B5EA5C 802407AC 2631F298 */ addiu $s1, $s1, -0xd68 -/* B5EA60 802407B0 AFBF0028 */ sw $ra, 0x28($sp) -/* B5EA64 802407B4 AFB20018 */ sw $s2, 0x18($sp) -/* B5EA68 802407B8 8E6200B4 */ lw $v0, 0xb4($s3) -/* B5EA6C 802407BC 0280182D */ daddu $v1, $s4, $zero -/* B5EA70 802407C0 AE630084 */ sw $v1, 0x84($s3) -/* B5EA74 802407C4 00021027 */ nor $v0, $zero, $v0 -/* B5EA78 802407C8 000217C2 */ srl $v0, $v0, 0x1f -/* B5EA7C 802407CC 00029400 */ sll $s2, $v0, 0x10 -.L802407D0: -/* B5EA80 802407D0 92220014 */ lbu $v0, 0x14($s1) -/* B5EA84 802407D4 50400008 */ beql $v0, $zero, .L802407F8 -/* B5EA88 802407D8 26100001 */ addiu $s0, $s0, 1 -/* B5EA8C 802407DC 0200202D */ daddu $a0, $s0, $zero -/* B5EA90 802407E0 0C0901CD */ jal func_80240734 -/* B5EA94 802407E4 00122C03 */ sra $a1, $s2, 0x10 -/* B5EA98 802407E8 10540003 */ beq $v0, $s4, .L802407F8 -/* B5EA9C 802407EC 26100001 */ addiu $s0, $s0, 1 -/* B5EAA0 802407F0 08090201 */ j .L80240804 -/* B5EAA4 802407F4 AE750084 */ sw $s5, 0x84($s3) -.L802407F8: -/* B5EAA8 802407F8 2A02000C */ slti $v0, $s0, 0xc -/* B5EAAC 802407FC 1440FFF4 */ bnez $v0, .L802407D0 -/* B5EAB0 80240800 26310008 */ addiu $s1, $s1, 8 -.L80240804: -/* B5EAB4 80240804 8FBF0028 */ lw $ra, 0x28($sp) -/* B5EAB8 80240808 8FB50024 */ lw $s5, 0x24($sp) -/* B5EABC 8024080C 8FB40020 */ lw $s4, 0x20($sp) -/* B5EAC0 80240810 8FB3001C */ lw $s3, 0x1c($sp) -/* B5EAC4 80240814 8FB20018 */ lw $s2, 0x18($sp) -/* B5EAC8 80240818 8FB10014 */ lw $s1, 0x14($sp) -/* B5EACC 8024081C 8FB00010 */ lw $s0, 0x10($sp) -/* B5EAD0 80240820 24020002 */ addiu $v0, $zero, 2 -/* B5EAD4 80240824 03E00008 */ jr $ra -/* B5EAD8 80240828 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_8024082C_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_8024082C_B5E2B0.s deleted file mode 100644 index 885465981f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_8024082C_B5E2B0.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024082C_B5EADC -/* B5EADC 8024082C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B5EAE0 80240830 AFB5002C */ sw $s5, 0x2c($sp) -/* B5EAE4 80240834 0080A82D */ daddu $s5, $a0, $zero -/* B5EAE8 80240838 AFBE0038 */ sw $fp, 0x38($sp) -/* B5EAEC 8024083C 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* B5EAF0 80240840 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* B5EAF4 80240844 AFBF003C */ sw $ra, 0x3c($sp) -/* B5EAF8 80240848 AFB70034 */ sw $s7, 0x34($sp) -/* B5EAFC 8024084C AFB60030 */ sw $s6, 0x30($sp) -/* B5EB00 80240850 AFB40028 */ sw $s4, 0x28($sp) -/* B5EB04 80240854 AFB30024 */ sw $s3, 0x24($sp) -/* B5EB08 80240858 AFB20020 */ sw $s2, 0x20($sp) -/* B5EB0C 8024085C AFB1001C */ sw $s1, 0x1c($sp) -/* B5EB10 80240860 10A0004F */ beqz $a1, .L802409A0 -/* B5EB14 80240864 AFB00018 */ sw $s0, 0x18($sp) -/* B5EB18 80240868 0C00AB39 */ jal heap_malloc -/* B5EB1C 8024086C 24040330 */ addiu $a0, $zero, 0x330 -/* B5EB20 80240870 0040982D */ daddu $s3, $v0, $zero -/* B5EB24 80240874 0000B02D */ daddu $s6, $zero, $zero -/* B5EB28 80240878 02C0902D */ daddu $s2, $s6, $zero -/* B5EB2C 8024087C 3C148024 */ lui $s4, 0x8024 -/* B5EB30 80240880 26943E08 */ addiu $s4, $s4, 0x3e08 -/* B5EB34 80240884 0260882D */ daddu $s1, $s3, $zero -/* B5EB38 80240888 8EA200B4 */ lw $v0, 0xb4($s5) -/* B5EB3C 8024088C 3C038024 */ lui $v1, 0x8024 -/* B5EB40 80240890 24633E00 */ addiu $v1, $v1, 0x3e00 -/* B5EB44 80240894 AEB30078 */ sw $s3, 0x78($s5) -/* B5EB48 80240898 00021027 */ nor $v0, $zero, $v0 -/* B5EB4C 8024089C 0002BFC2 */ srl $s7, $v0, 0x1f -/* B5EB50 802408A0 00171080 */ sll $v0, $s7, 2 -/* B5EB54 802408A4 00431021 */ addu $v0, $v0, $v1 -/* B5EB58 802408A8 AFA20010 */ sw $v0, 0x10($sp) -.L802408AC: -/* B5EB5C 802408AC 86900000 */ lh $s0, ($s4) -/* B5EB60 802408B0 001010C0 */ sll $v0, $s0, 3 -/* B5EB64 802408B4 03C21021 */ addu $v0, $fp, $v0 -/* B5EB68 802408B8 90420014 */ lbu $v0, 0x14($v0) -/* B5EB6C 802408BC 5040002E */ beql $v0, $zero, .L80240978 -/* B5EB70 802408C0 26520001 */ addiu $s2, $s2, 1 -/* B5EB74 802408C4 00101100 */ sll $v0, $s0, 4 -/* B5EB78 802408C8 3C068009 */ lui $a2, 0x8009 -/* B5EB7C 802408CC 24C6EF20 */ addiu $a2, $a2, -0x10e0 -/* B5EB80 802408D0 00461021 */ addu $v0, $v0, $a2 -/* B5EB84 802408D4 0200202D */ daddu $a0, $s0, $zero -/* B5EB88 802408D8 AE300108 */ sw $s0, 0x108($s1) -/* B5EB8C 802408DC 8C420000 */ lw $v0, ($v0) -/* B5EB90 802408E0 02E0282D */ daddu $a1, $s7, $zero -/* B5EB94 802408E4 0C0901CD */ jal func_80240734 -/* B5EB98 802408E8 AE220084 */ sw $v0, 0x84($s1) -/* B5EB9C 802408EC 0040202D */ daddu $a0, $v0, $zero -/* B5EBA0 802408F0 04800011 */ bltz $a0, .L80240938 -/* B5EBA4 802408F4 00101080 */ sll $v0, $s0, 2 -/* B5EBA8 802408F8 3C06800F */ lui $a2, 0x800f -/* B5EBAC 802408FC 24C67F00 */ addiu $a2, $a2, 0x7f00 -/* B5EBB0 80240900 00461021 */ addu $v0, $v0, $a2 -/* B5EBB4 80240904 8C430000 */ lw $v1, ($v0) -/* B5EBB8 80240908 24020001 */ addiu $v0, $zero, 1 -/* B5EBBC 8024090C AE22018C */ sw $v0, 0x18c($s1) -/* B5EBC0 80240910 00041080 */ sll $v0, $a0, 2 -/* B5EBC4 80240914 3C068024 */ lui $a2, 0x8024 -/* B5EBC8 80240918 24C63E18 */ addiu $a2, $a2, 0x3e18 -/* B5EBCC 8024091C AE230000 */ sw $v1, ($s1) -/* B5EBD0 80240920 001218C0 */ sll $v1, $s2, 3 -/* B5EBD4 80240924 00431021 */ addu $v0, $v0, $v1 -/* B5EBD8 80240928 00461021 */ addu $v0, $v0, $a2 -/* B5EBDC 8024092C 8C420000 */ lw $v0, ($v0) -/* B5EBE0 80240930 08090257 */ j .L8024095C -/* B5EBE4 80240934 AE220294 */ sw $v0, 0x294($s1) -.L80240938: -/* B5EBE8 80240938 3C06800F */ lui $a2, 0x800f -/* B5EBEC 8024093C 24C67F40 */ addiu $a2, $a2, 0x7f40 -/* B5EBF0 80240940 00461021 */ addu $v0, $v0, $a2 -/* B5EBF4 80240944 8C420000 */ lw $v0, ($v0) -/* B5EBF8 80240948 AE20018C */ sw $zero, 0x18c($s1) -/* B5EBFC 8024094C AE220000 */ sw $v0, ($s1) -/* B5EC00 80240950 8FA60010 */ lw $a2, 0x10($sp) -/* B5EC04 80240954 8CC20000 */ lw $v0, ($a2) -/* B5EC08 80240958 AE220294 */ sw $v0, 0x294($s1) -.L8024095C: -/* B5EC0C 8024095C 001010C0 */ sll $v0, $s0, 3 -/* B5EC10 80240960 03C21021 */ addu $v0, $fp, $v0 -/* B5EC14 80240964 80420015 */ lb $v0, 0x15($v0) -/* B5EC18 80240968 26D60001 */ addiu $s6, $s6, 1 -/* B5EC1C 8024096C AE220210 */ sw $v0, 0x210($s1) -/* B5EC20 80240970 26310004 */ addiu $s1, $s1, 4 -/* B5EC24 80240974 26520001 */ addiu $s2, $s2, 1 -.L80240978: -/* B5EC28 80240978 2A420008 */ slti $v0, $s2, 8 -/* B5EC2C 8024097C 1440FFCB */ bnez $v0, .L802408AC -/* B5EC30 80240980 26940002 */ addiu $s4, $s4, 2 -/* B5EC34 80240984 0260202D */ daddu $a0, $s3, $zero -/* B5EC38 80240988 24020004 */ addiu $v0, $zero, 4 -/* B5EC3C 8024098C AC820318 */ sw $v0, 0x318($a0) -/* B5EC40 80240990 AC960324 */ sw $s6, 0x324($a0) -/* B5EC44 80240994 0C03D390 */ jal func_800F4E40 -/* B5EC48 80240998 AC800328 */ sw $zero, 0x328($a0) -/* B5EC4C 8024099C AEA00070 */ sw $zero, 0x70($s5) -.L802409A0: -/* B5EC50 802409A0 8EA20070 */ lw $v0, 0x70($s5) -/* B5EC54 802409A4 8EB30078 */ lw $s3, 0x78($s5) -/* B5EC58 802409A8 14400008 */ bnez $v0, .L802409CC -/* B5EC5C 802409AC 24420001 */ addiu $v0, $v0, 1 -/* B5EC60 802409B0 8662032C */ lh $v0, 0x32c($s3) -/* B5EC64 802409B4 10400009 */ beqz $v0, .L802409DC -/* B5EC68 802409B8 AEA20074 */ sw $v0, 0x74($s5) -/* B5EC6C 802409BC 0C03C4EC */ jal func_800F13B0 -/* B5EC70 802409C0 00000000 */ nop -/* B5EC74 802409C4 8EA20070 */ lw $v0, 0x70($s5) -/* B5EC78 802409C8 24420001 */ addiu $v0, $v0, 1 -.L802409CC: -/* B5EC7C 802409CC AEA20070 */ sw $v0, 0x70($s5) -/* B5EC80 802409D0 2842000F */ slti $v0, $v0, 0xf -/* B5EC84 802409D4 10400003 */ beqz $v0, .L802409E4 -/* B5EC88 802409D8 00000000 */ nop -.L802409DC: -/* B5EC8C 802409DC 08090293 */ j .L80240A4C -/* B5EC90 802409E0 0000102D */ daddu $v0, $zero, $zero -.L802409E4: -/* B5EC94 802409E4 0C03C54E */ jal func_800F1538 -/* B5EC98 802409E8 00000000 */ nop -/* B5EC9C 802409EC 8EA30074 */ lw $v1, 0x74($s5) -/* B5ECA0 802409F0 240200FF */ addiu $v0, $zero, 0xff -/* B5ECA4 802409F4 10620010 */ beq $v1, $v0, .L80240A38 -/* B5ECA8 802409F8 2462FFFF */ addiu $v0, $v1, -1 -/* B5ECAC 802409FC 00021080 */ sll $v0, $v0, 2 -/* B5ECB0 80240A00 02621021 */ addu $v0, $s3, $v0 -/* B5ECB4 80240A04 8C420108 */ lw $v0, 0x108($v0) -/* B5ECB8 80240A08 00021100 */ sll $v0, $v0, 4 -/* B5ECBC 80240A0C 3C038009 */ lui $v1, 0x8009 -/* B5ECC0 80240A10 00621821 */ addu $v1, $v1, $v0 -/* B5ECC4 80240A14 8C63EF20 */ lw $v1, -0x10e0($v1) -/* B5ECC8 80240A18 8EA20074 */ lw $v0, 0x74($s5) -/* B5ECCC 80240A1C 2442FFFF */ addiu $v0, $v0, -1 -/* B5ECD0 80240A20 00021080 */ sll $v0, $v0, 2 -/* B5ECD4 80240A24 02621021 */ addu $v0, $s3, $v0 -/* B5ECD8 80240A28 AEA30084 */ sw $v1, 0x84($s5) -/* B5ECDC 80240A2C 8C420108 */ lw $v0, 0x108($v0) -/* B5ECE0 80240A30 08090290 */ j .L80240A40 -/* B5ECE4 80240A34 AEA20088 */ sw $v0, 0x88($s5) -.L80240A38: -/* B5ECE8 80240A38 2402FFFF */ addiu $v0, $zero, -1 -/* B5ECEC 80240A3C AEA20084 */ sw $v0, 0x84($s5) -.L80240A40: -/* B5ECF0 80240A40 0C00AB4B */ jal heap_free -/* B5ECF4 80240A44 8EA40078 */ lw $a0, 0x78($s5) -/* B5ECF8 80240A48 24020002 */ addiu $v0, $zero, 2 -.L80240A4C: -/* B5ECFC 80240A4C 8FBF003C */ lw $ra, 0x3c($sp) -/* B5ED00 80240A50 8FBE0038 */ lw $fp, 0x38($sp) -/* B5ED04 80240A54 8FB70034 */ lw $s7, 0x34($sp) -/* B5ED08 80240A58 8FB60030 */ lw $s6, 0x30($sp) -/* B5ED0C 80240A5C 8FB5002C */ lw $s5, 0x2c($sp) -/* B5ED10 80240A60 8FB40028 */ lw $s4, 0x28($sp) -/* B5ED14 80240A64 8FB30024 */ lw $s3, 0x24($sp) -/* B5ED18 80240A68 8FB20020 */ lw $s2, 0x20($sp) -/* B5ED1C 80240A6C 8FB1001C */ lw $s1, 0x1c($sp) -/* B5ED20 80240A70 8FB00018 */ lw $s0, 0x18($sp) -/* B5ED24 80240A74 03E00008 */ jr $ra -/* B5ED28 80240A78 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80240A7C_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80240A7C_B5E2B0.s deleted file mode 100644 index 3100c0e67d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80240A7C_B5E2B0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A7C_B5ED2C -/* B5ED2C 80240A7C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5ED30 80240A80 AFBF0010 */ sw $ra, 0x10($sp) -/* B5ED34 80240A84 8C82000C */ lw $v0, 0xc($a0) -/* B5ED38 80240A88 0C0B1EAF */ jal get_variable -/* B5ED3C 80240A8C 8C450000 */ lw $a1, ($v0) -/* B5ED40 80240A90 0C03AC5A */ jal func_800EB168 -/* B5ED44 80240A94 0040202D */ daddu $a0, $v0, $zero -/* B5ED48 80240A98 8FBF0010 */ lw $ra, 0x10($sp) -/* B5ED4C 80240A9C 24020002 */ addiu $v0, $zero, 2 -/* B5ED50 80240AA0 03E00008 */ jr $ra -/* B5ED54 80240AA4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80240AA8_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80240AA8_B5E2B0.s deleted file mode 100644 index 5ad0aa5525..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80240AA8_B5E2B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AA8_B5ED58 -/* B5ED58 80240AA8 3C028011 */ lui $v0, 0x8011 -/* B5ED5C 80240AAC 8042F2A2 */ lb $v0, -0xd5e($v0) -/* B5ED60 80240AB0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5ED64 80240AB4 AFBF0010 */ sw $ra, 0x10($sp) -/* B5ED68 80240AB8 00021100 */ sll $v0, $v0, 4 -/* B5ED6C 80240ABC 3C048009 */ lui $a0, 0x8009 -/* B5ED70 80240AC0 00822021 */ addu $a0, $a0, $v0 -/* B5ED74 80240AC4 8C84EF20 */ lw $a0, -0x10e0($a0) -/* B5ED78 80240AC8 0C0496CF */ jal set_message_string -/* B5ED7C 80240ACC 0000282D */ daddu $a1, $zero, $zero -/* B5ED80 80240AD0 8FBF0010 */ lw $ra, 0x10($sp) -/* B5ED84 80240AD4 24020002 */ addiu $v0, $zero, 2 -/* B5ED88 80240AD8 03E00008 */ jr $ra -/* B5ED8C 80240ADC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80240AE0_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80240AE0_B5E2B0.s deleted file mode 100644 index 3e68e7d156..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80240AE0_B5E2B0.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AE0_B5ED90 -/* B5ED90 80240AE0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B5ED94 80240AE4 AFB1001C */ sw $s1, 0x1c($sp) -/* B5ED98 80240AE8 0080882D */ daddu $s1, $a0, $zero -/* B5ED9C 80240AEC AFBF0020 */ sw $ra, 0x20($sp) -/* B5EDA0 80240AF0 AFB00018 */ sw $s0, 0x18($sp) -/* B5EDA4 80240AF4 8E30000C */ lw $s0, 0xc($s1) -/* B5EDA8 80240AF8 8E050000 */ lw $a1, ($s0) -/* B5EDAC 80240AFC 0C0B1EAF */ jal get_variable -/* B5EDB0 80240B00 26100004 */ addiu $s0, $s0, 4 -/* B5EDB4 80240B04 0C04417A */ jal get_entity_by_index -/* B5EDB8 80240B08 0040202D */ daddu $a0, $v0, $zero -/* B5EDBC 80240B0C 8E100000 */ lw $s0, ($s0) -/* B5EDC0 80240B10 C444004C */ lwc1 $f4, 0x4c($v0) -/* B5EDC4 80240B14 3C014148 */ lui $at, 0x4148 -/* B5EDC8 80240B18 44810000 */ mtc1 $at, $f0 -/* B5EDCC 80240B1C 3C013F33 */ lui $at, 0x3f33 -/* B5EDD0 80240B20 34213333 */ ori $at, $at, 0x3333 -/* B5EDD4 80240B24 44811000 */ mtc1 $at, $f2 -/* B5EDD8 80240B28 AFA00014 */ sw $zero, 0x14($sp) -/* B5EDDC 80240B2C 46002100 */ add.s $f4, $f4, $f0 -/* B5EDE0 80240B30 E7A20010 */ swc1 $f2, 0x10($sp) -/* B5EDE4 80240B34 8C450048 */ lw $a1, 0x48($v0) -/* B5EDE8 80240B38 8C470050 */ lw $a3, 0x50($v0) -/* B5EDEC 80240B3C 44062000 */ mfc1 $a2, $f4 -/* B5EDF0 80240B40 0C01C5D4 */ jal func_80071750 -/* B5EDF4 80240B44 0000202D */ daddu $a0, $zero, $zero -/* B5EDF8 80240B48 0220202D */ daddu $a0, $s1, $zero -/* B5EDFC 80240B4C 0200282D */ daddu $a1, $s0, $zero -/* B5EE00 80240B50 0C0B2026 */ jal set_variable -/* B5EE04 80240B54 0040302D */ daddu $a2, $v0, $zero -/* B5EE08 80240B58 8FBF0020 */ lw $ra, 0x20($sp) -/* B5EE0C 80240B5C 8FB1001C */ lw $s1, 0x1c($sp) -/* B5EE10 80240B60 8FB00018 */ lw $s0, 0x18($sp) -/* B5EE14 80240B64 24020002 */ addiu $v0, $zero, 2 -/* B5EE18 80240B68 03E00008 */ jr $ra -/* B5EE1C 80240B6C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80240C08_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80240C08_B5E2B0.s deleted file mode 100644 index 5cbcb22095..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80240C08_B5E2B0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C08_B5EEB8 -/* B5EEB8 80240C08 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5EEBC 80240C0C AFBF0018 */ sw $ra, 0x18($sp) -/* B5EEC0 80240C10 0C00EAD2 */ jal get_npc_safe -/* B5EEC4 80240C14 2404FFFC */ addiu $a0, $zero, -4 -/* B5EEC8 80240C18 C444003C */ lwc1 $f4, 0x3c($v0) -/* B5EECC 80240C1C 3C014148 */ lui $at, 0x4148 -/* B5EED0 80240C20 44811000 */ mtc1 $at, $f2 -/* B5EED4 80240C24 3C013F80 */ lui $at, 0x3f80 -/* B5EED8 80240C28 44810000 */ mtc1 $at, $f0 -/* B5EEDC 80240C2C 2403001E */ addiu $v1, $zero, 0x1e -/* B5EEE0 80240C30 AFA30014 */ sw $v1, 0x14($sp) -/* B5EEE4 80240C34 46022100 */ add.s $f4, $f4, $f2 -/* B5EEE8 80240C38 E7A00010 */ swc1 $f0, 0x10($sp) -/* B5EEEC 80240C3C 8C450038 */ lw $a1, 0x38($v0) -/* B5EEF0 80240C40 8C470040 */ lw $a3, 0x40($v0) -/* B5EEF4 80240C44 44062000 */ mfc1 $a2, $f4 -/* B5EEF8 80240C48 0C01C2EC */ jal func_80070BB0 -/* B5EEFC 80240C4C 24040009 */ addiu $a0, $zero, 9 -/* B5EF00 80240C50 8FBF0018 */ lw $ra, 0x18($sp) -/* B5EF04 80240C54 24020002 */ addiu $v0, $zero, 2 -/* B5EF08 80240C58 03E00008 */ jr $ra -/* B5EF0C 80240C5C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80240C60_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80240C60_B5E2B0.s deleted file mode 100644 index b808b24280..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80240C60_B5E2B0.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C60_B5EF10 -/* B5EF10 80240C60 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* B5EF14 80240C64 AFB60040 */ sw $s6, 0x40($sp) -/* B5EF18 80240C68 0080B02D */ daddu $s6, $a0, $zero -/* B5EF1C 80240C6C AFB00028 */ sw $s0, 0x28($sp) -/* B5EF20 80240C70 00A0802D */ daddu $s0, $a1, $zero -/* B5EF24 80240C74 AFBF0044 */ sw $ra, 0x44($sp) -/* B5EF28 80240C78 AFB5003C */ sw $s5, 0x3c($sp) -/* B5EF2C 80240C7C AFB40038 */ sw $s4, 0x38($sp) -/* B5EF30 80240C80 AFB30034 */ sw $s3, 0x34($sp) -/* B5EF34 80240C84 AFB20030 */ sw $s2, 0x30($sp) -/* B5EF38 80240C88 AFB1002C */ sw $s1, 0x2c($sp) -/* B5EF3C 80240C8C F7B80058 */ sdc1 $f24, 0x58($sp) -/* B5EF40 80240C90 F7B60050 */ sdc1 $f22, 0x50($sp) -/* B5EF44 80240C94 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B5EF48 80240C98 8ED3000C */ lw $s3, 0xc($s6) -/* B5EF4C 80240C9C 0C00EAD2 */ jal get_npc_safe -/* B5EF50 80240CA0 2404FFFC */ addiu $a0, $zero, -4 -/* B5EF54 80240CA4 27A50018 */ addiu $a1, $sp, 0x18 -/* B5EF58 80240CA8 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* B5EF5C 80240CAC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* B5EF60 80240CB0 27A6001C */ addiu $a2, $sp, 0x1c -/* B5EF64 80240CB4 00041880 */ sll $v1, $a0, 2 -/* B5EF68 80240CB8 00641821 */ addu $v1, $v1, $a0 -/* B5EF6C 80240CBC 00031880 */ sll $v1, $v1, 2 -/* B5EF70 80240CC0 00641823 */ subu $v1, $v1, $a0 -/* B5EF74 80240CC4 000320C0 */ sll $a0, $v1, 3 -/* B5EF78 80240CC8 00641821 */ addu $v1, $v1, $a0 -/* B5EF7C 80240CCC 000318C0 */ sll $v1, $v1, 3 -/* B5EF80 80240CD0 3C01800B */ lui $at, 0x800b -/* B5EF84 80240CD4 00230821 */ addu $at, $at, $v1 -/* B5EF88 80240CD8 C42C1DEC */ lwc1 $f12, 0x1dec($at) -/* B5EF8C 80240CDC 0C00A88D */ jal sin_cos_deg -/* B5EF90 80240CE0 0040A82D */ daddu $s5, $v0, $zero -/* B5EF94 80240CE4 1200005D */ beqz $s0, .L80240E5C -/* B5EF98 80240CE8 00000000 */ nop -/* B5EF9C 80240CEC 0C00AB0A */ jal general_heap_malloc -/* B5EFA0 80240CF0 24040068 */ addiu $a0, $zero, 0x68 -/* B5EFA4 80240CF4 0040902D */ daddu $s2, $v0, $zero -/* B5EFA8 80240CF8 02C0202D */ daddu $a0, $s6, $zero -/* B5EFAC 80240CFC 0000882D */ daddu $s1, $zero, $zero -/* B5EFB0 80240D00 2414FFFF */ addiu $s4, $zero, -1 -/* B5EFB4 80240D04 AED20060 */ sw $s2, 0x60($s6) -/* B5EFB8 80240D08 8E650000 */ lw $a1, ($s3) -/* B5EFBC 80240D0C 3C014148 */ lui $at, 0x4148 -/* B5EFC0 80240D10 4481C000 */ mtc1 $at, $f24 -/* B5EFC4 80240D14 3C013F80 */ lui $at, 0x3f80 -/* B5EFC8 80240D18 4481B000 */ mtc1 $at, $f22 -/* B5EFCC 80240D1C 4480A000 */ mtc1 $zero, $f20 -/* B5EFD0 80240D20 0C0B1EAF */ jal get_variable -/* B5EFD4 80240D24 0240802D */ daddu $s0, $s2, $zero -/* B5EFD8 80240D28 0C04417A */ jal get_entity_by_index -/* B5EFDC 80240D2C 0040202D */ daddu $a0, $v0, $zero -/* B5EFE0 80240D30 AE42005C */ sw $v0, 0x5c($s2) -.L80240D34: -/* B5EFE4 80240D34 8E42005C */ lw $v0, 0x5c($s2) -/* B5EFE8 80240D38 C440004C */ lwc1 $f0, 0x4c($v0) -/* B5EFEC 80240D3C 0000202D */ daddu $a0, $zero, $zero -/* B5EFF0 80240D40 E7B60010 */ swc1 $f22, 0x10($sp) -/* B5EFF4 80240D44 AFB40014 */ sw $s4, 0x14($sp) -/* B5EFF8 80240D48 46180000 */ add.s $f0, $f0, $f24 -/* B5EFFC 80240D4C 8C450048 */ lw $a1, 0x48($v0) -/* B5F000 80240D50 8C470050 */ lw $a3, 0x50($v0) -/* B5F004 80240D54 44060000 */ mfc1 $a2, $f0 -/* B5F008 80240D58 0C01C5BC */ jal func_800716F0 -/* B5F00C 80240D5C 26310001 */ addiu $s1, $s1, 1 -/* B5F010 80240D60 AE020008 */ sw $v0, 8($s0) -/* B5F014 80240D64 E614002C */ swc1 $f20, 0x2c($s0) -/* B5F018 80240D68 E6140020 */ swc1 $f20, 0x20($s0) -/* B5F01C 80240D6C E6140014 */ swc1 $f20, 0x14($s0) -/* B5F020 80240D70 E6140050 */ swc1 $f20, 0x50($s0) -/* B5F024 80240D74 E6140044 */ swc1 $f20, 0x44($s0) -/* B5F028 80240D78 E6140038 */ swc1 $f20, 0x38($s0) -/* B5F02C 80240D7C 2A220003 */ slti $v0, $s1, 3 -/* B5F030 80240D80 1440FFEC */ bnez $v0, .L80240D34 -/* B5F034 80240D84 26100004 */ addiu $s0, $s0, 4 -/* B5F038 80240D88 0000882D */ daddu $s1, $zero, $zero -/* B5F03C 80240D8C 0240802D */ daddu $s0, $s2, $zero -/* B5F040 80240D90 3C148024 */ lui $s4, 0x8024 -/* B5F044 80240D94 26943E58 */ addiu $s4, $s4, 0x3e58 -/* B5F048 80240D98 3C014248 */ lui $at, 0x4248 -/* B5F04C 80240D9C 4481A000 */ mtc1 $at, $f20 -/* B5F050 80240DA0 24130044 */ addiu $s3, $zero, 0x44 -/* B5F054 80240DA4 AE400000 */ sw $zero, ($s2) -/* B5F058 80240DA8 AE400004 */ sw $zero, 4($s2) -/* B5F05C 80240DAC AE400060 */ sw $zero, 0x60($s2) -/* B5F060 80240DB0 AE400064 */ sw $zero, 0x64($s2) -.L80240DB4: -/* B5F064 80240DB4 27A40020 */ addiu $a0, $sp, 0x20 -/* B5F068 80240DB8 4406A000 */ mfc1 $a2, $f20 -/* B5F06C 80240DBC 8E870000 */ lw $a3, ($s4) -/* B5F070 80240DC0 02532821 */ addu $a1, $s2, $s3 -/* B5F074 80240DC4 0C00A7E7 */ jal add_vec2D_polar -/* B5F078 80240DC8 AFA00020 */ sw $zero, 0x20($sp) -/* B5F07C 80240DCC C7A2001C */ lwc1 $f2, 0x1c($sp) -/* B5F080 80240DD0 C7A40020 */ lwc1 $f4, 0x20($sp) -/* B5F084 80240DD4 46041082 */ mul.s $f2, $f2, $f4 -/* B5F088 80240DD8 00000000 */ nop -/* B5F08C 80240DDC C7A00018 */ lwc1 $f0, 0x18($sp) -/* B5F090 80240DE0 46040002 */ mul.s $f0, $f0, $f4 -/* B5F094 80240DE4 00000000 */ nop -/* B5F098 80240DE8 E6020038 */ swc1 $f2, 0x38($s0) -/* B5F09C 80240DEC E6000050 */ swc1 $f0, 0x50($s0) -/* B5F0A0 80240DF0 8E42005C */ lw $v0, 0x5c($s2) -/* B5F0A4 80240DF4 C6000038 */ lwc1 $f0, 0x38($s0) -/* B5F0A8 80240DF8 C4420048 */ lwc1 $f2, 0x48($v0) -/* B5F0AC 80240DFC 46001080 */ add.s $f2, $f2, $f0 -/* B5F0B0 80240E00 C6A00038 */ lwc1 $f0, 0x38($s5) -/* B5F0B4 80240E04 46020001 */ sub.s $f0, $f0, $f2 -/* B5F0B8 80240E08 E6000038 */ swc1 $f0, 0x38($s0) -/* B5F0BC 80240E0C 8E42005C */ lw $v0, 0x5c($s2) -/* B5F0C0 80240E10 C6000044 */ lwc1 $f0, 0x44($s0) -/* B5F0C4 80240E14 C442004C */ lwc1 $f2, 0x4c($v0) -/* B5F0C8 80240E18 46001080 */ add.s $f2, $f2, $f0 -/* B5F0CC 80240E1C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* B5F0D0 80240E20 46020001 */ sub.s $f0, $f0, $f2 -/* B5F0D4 80240E24 E6000044 */ swc1 $f0, 0x44($s0) -/* B5F0D8 80240E28 8E42005C */ lw $v0, 0x5c($s2) -/* B5F0DC 80240E2C C6000050 */ lwc1 $f0, 0x50($s0) -/* B5F0E0 80240E30 C4420050 */ lwc1 $f2, 0x50($v0) -/* B5F0E4 80240E34 26940004 */ addiu $s4, $s4, 4 -/* B5F0E8 80240E38 46001080 */ add.s $f2, $f2, $f0 -/* B5F0EC 80240E3C C6A00040 */ lwc1 $f0, 0x40($s5) -/* B5F0F0 80240E40 26730004 */ addiu $s3, $s3, 4 -/* B5F0F4 80240E44 46020001 */ sub.s $f0, $f0, $f2 -/* B5F0F8 80240E48 26310001 */ addiu $s1, $s1, 1 -/* B5F0FC 80240E4C 2A220003 */ slti $v0, $s1, 3 -/* B5F100 80240E50 E6000050 */ swc1 $f0, 0x50($s0) -/* B5F104 80240E54 1440FFD7 */ bnez $v0, .L80240DB4 -/* B5F108 80240E58 26100004 */ addiu $s0, $s0, 4 -.L80240E5C: -/* B5F10C 80240E5C 8ED20060 */ lw $s2, 0x60($s6) -/* B5F110 80240E60 8E430000 */ lw $v1, ($s2) -/* B5F114 80240E64 24020001 */ addiu $v0, $zero, 1 -/* B5F118 80240E68 10620038 */ beq $v1, $v0, .L80240F4C -/* B5F11C 80240E6C 28620002 */ slti $v0, $v1, 2 -/* B5F120 80240E70 50400005 */ beql $v0, $zero, .L80240E88 -/* B5F124 80240E74 24020002 */ addiu $v0, $zero, 2 -/* B5F128 80240E78 10600007 */ beqz $v1, .L80240E98 -/* B5F12C 80240E7C 24040005 */ addiu $a0, $zero, 5 -/* B5F130 80240E80 0809040C */ j .L80241030 -/* B5F134 80240E84 00000000 */ nop -.L80240E88: -/* B5F138 80240E88 10620058 */ beq $v1, $v0, .L80240FEC -/* B5F13C 80240E8C 00000000 */ nop -/* B5F140 80240E90 0809040C */ j .L80241030 -/* B5F144 80240E94 00000000 */ nop -.L80240E98: -/* B5F148 80240E98 0000882D */ daddu $s1, $zero, $zero -/* B5F14C 80240E9C 3C148024 */ lui $s4, 0x8024 -/* B5F150 80240EA0 26943E58 */ addiu $s4, $s4, 0x3e58 -/* B5F154 80240EA4 24130020 */ addiu $s3, $zero, 0x20 -/* B5F158 80240EA8 3C064248 */ lui $a2, 0x4248 -/* B5F15C 80240EAC 44800000 */ mtc1 $zero, $f0 -/* B5F160 80240EB0 24020014 */ addiu $v0, $zero, 0x14 -/* B5F164 80240EB4 AFA20010 */ sw $v0, 0x10($sp) -/* B5F168 80240EB8 44050000 */ mfc1 $a1, $f0 -/* B5F16C 80240EBC 8E470060 */ lw $a3, 0x60($s2) -/* B5F170 80240EC0 4485B000 */ mtc1 $a1, $f22 -/* B5F174 80240EC4 0C00A8ED */ jal update_lerp -/* B5F178 80240EC8 0240802D */ daddu $s0, $s2, $zero -/* B5F17C 80240ECC 46000506 */ mov.s $f20, $f0 -.L80240ED0: -/* B5F180 80240ED0 4406A000 */ mfc1 $a2, $f20 -/* B5F184 80240ED4 27A40020 */ addiu $a0, $sp, 0x20 -/* B5F188 80240ED8 E6160020 */ swc1 $f22, 0x20($s0) -/* B5F18C 80240EDC 8E870000 */ lw $a3, ($s4) -/* B5F190 80240EE0 02532821 */ addu $a1, $s2, $s3 -/* B5F194 80240EE4 0C00A7E7 */ jal add_vec2D_polar -/* B5F198 80240EE8 E7B60020 */ swc1 $f22, 0x20($sp) -/* B5F19C 80240EEC C7A4001C */ lwc1 $f4, 0x1c($sp) -/* B5F1A0 80240EF0 C7A00020 */ lwc1 $f0, 0x20($sp) -/* B5F1A4 80240EF4 46002102 */ mul.s $f4, $f4, $f0 -/* B5F1A8 80240EF8 00000000 */ nop -/* B5F1AC 80240EFC C7A20018 */ lwc1 $f2, 0x18($sp) -/* B5F1B0 80240F00 26940004 */ addiu $s4, $s4, 4 -/* B5F1B4 80240F04 46001082 */ mul.s $f2, $f2, $f0 -/* B5F1B8 80240F08 00000000 */ nop -/* B5F1BC 80240F0C 26730004 */ addiu $s3, $s3, 4 -/* B5F1C0 80240F10 26310001 */ addiu $s1, $s1, 1 -/* B5F1C4 80240F14 2A220003 */ slti $v0, $s1, 3 -/* B5F1C8 80240F18 E6040014 */ swc1 $f4, 0x14($s0) -/* B5F1CC 80240F1C E602002C */ swc1 $f2, 0x2c($s0) -/* B5F1D0 80240F20 1440FFEB */ bnez $v0, .L80240ED0 -/* B5F1D4 80240F24 26100004 */ addiu $s0, $s0, 4 -/* B5F1D8 80240F28 8E420060 */ lw $v0, 0x60($s2) -/* B5F1DC 80240F2C 24420001 */ addiu $v0, $v0, 1 -/* B5F1E0 80240F30 AE420060 */ sw $v0, 0x60($s2) -/* B5F1E4 80240F34 28420015 */ slti $v0, $v0, 0x15 -/* B5F1E8 80240F38 1440003D */ bnez $v0, .L80241030 -/* B5F1EC 80240F3C 24020001 */ addiu $v0, $zero, 1 -/* B5F1F0 80240F40 AE420000 */ sw $v0, ($s2) -/* B5F1F4 80240F44 0809040C */ j .L80241030 -/* B5F1F8 80240F48 AE400060 */ sw $zero, 0x60($s2) -.L80240F4C: -/* B5F1FC 80240F4C 0000882D */ daddu $s1, $zero, $zero -/* B5F200 80240F50 3C148024 */ lui $s4, 0x8024 -/* B5F204 80240F54 26943E58 */ addiu $s4, $s4, 0x3e58 -/* B5F208 80240F58 24130020 */ addiu $s3, $zero, 0x20 -/* B5F20C 80240F5C 0240802D */ daddu $s0, $s2, $zero -/* B5F210 80240F60 3C014248 */ lui $at, 0x4248 -/* B5F214 80240F64 4481A000 */ mtc1 $at, $f20 -/* B5F218 80240F68 4480B000 */ mtc1 $zero, $f22 -.L80240F6C: -/* B5F21C 80240F6C 4406A000 */ mfc1 $a2, $f20 -/* B5F220 80240F70 27A40020 */ addiu $a0, $sp, 0x20 -/* B5F224 80240F74 E6160020 */ swc1 $f22, 0x20($s0) -/* B5F228 80240F78 8E870000 */ lw $a3, ($s4) -/* B5F22C 80240F7C 02532821 */ addu $a1, $s2, $s3 -/* B5F230 80240F80 0C00A7E7 */ jal add_vec2D_polar -/* B5F234 80240F84 E7B60020 */ swc1 $f22, 0x20($sp) -/* B5F238 80240F88 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* B5F23C 80240F8C C7A00020 */ lwc1 $f0, 0x20($sp) -/* B5F240 80240F90 46002102 */ mul.s $f4, $f4, $f0 -/* B5F244 80240F94 00000000 */ nop -/* B5F248 80240F98 C7A20018 */ lwc1 $f2, 0x18($sp) -/* B5F24C 80240F9C 26940004 */ addiu $s4, $s4, 4 -/* B5F250 80240FA0 46001082 */ mul.s $f2, $f2, $f0 -/* B5F254 80240FA4 00000000 */ nop -/* B5F258 80240FA8 26730004 */ addiu $s3, $s3, 4 -/* B5F25C 80240FAC 26310001 */ addiu $s1, $s1, 1 -/* B5F260 80240FB0 2A220003 */ slti $v0, $s1, 3 -/* B5F264 80240FB4 E6040014 */ swc1 $f4, 0x14($s0) -/* B5F268 80240FB8 E602002C */ swc1 $f2, 0x2c($s0) -/* B5F26C 80240FBC 1440FFEB */ bnez $v0, .L80240F6C -/* B5F270 80240FC0 26100004 */ addiu $s0, $s0, 4 -/* B5F274 80240FC4 8E420060 */ lw $v0, 0x60($s2) -/* B5F278 80240FC8 24420001 */ addiu $v0, $v0, 1 -/* B5F27C 80240FCC AE420060 */ sw $v0, 0x60($s2) -/* B5F280 80240FD0 28420010 */ slti $v0, $v0, 0x10 -/* B5F284 80240FD4 14400016 */ bnez $v0, .L80241030 -/* B5F288 80240FD8 2402000F */ addiu $v0, $zero, 0xf -/* B5F28C 80240FDC AE420060 */ sw $v0, 0x60($s2) -/* B5F290 80240FE0 24020002 */ addiu $v0, $zero, 2 -/* B5F294 80240FE4 0809040C */ j .L80241030 -/* B5F298 80240FE8 AE420000 */ sw $v0, ($s2) -.L80240FEC: -/* B5F29C 80240FEC 8E420060 */ lw $v0, 0x60($s2) -/* B5F2A0 80240FF0 24420001 */ addiu $v0, $v0, 1 -/* B5F2A4 80240FF4 AE420060 */ sw $v0, 0x60($s2) -/* B5F2A8 80240FF8 2842001F */ slti $v0, $v0, 0x1f -/* B5F2AC 80240FFC 1440000C */ bnez $v0, .L80241030 -/* B5F2B0 80241000 0000882D */ daddu $s1, $zero, $zero -/* B5F2B4 80241004 0240282D */ daddu $a1, $s2, $zero -.L80241008: -/* B5F2B8 80241008 8CA20008 */ lw $v0, 8($a1) -/* B5F2BC 8024100C 8C430000 */ lw $v1, ($v0) -/* B5F2C0 80241010 26310001 */ addiu $s1, $s1, 1 -/* B5F2C4 80241014 34630010 */ ori $v1, $v1, 0x10 -/* B5F2C8 80241018 AC430000 */ sw $v1, ($v0) -/* B5F2CC 8024101C 2A220003 */ slti $v0, $s1, 3 -/* B5F2D0 80241020 1440FFF9 */ bnez $v0, .L80241008 -/* B5F2D4 80241024 24A50004 */ addiu $a1, $a1, 4 -/* B5F2D8 80241028 08090459 */ j .L80241164 -/* B5F2DC 8024102C 24020002 */ addiu $v0, $zero, 2 -.L80241030: -/* B5F2E0 80241030 8E430004 */ lw $v1, 4($s2) -/* B5F2E4 80241034 10600005 */ beqz $v1, .L8024104C -/* B5F2E8 80241038 24020001 */ addiu $v0, $zero, 1 -/* B5F2EC 8024103C 1062000B */ beq $v1, $v0, .L8024106C -/* B5F2F0 80241040 0000882D */ daddu $s1, $zero, $zero -/* B5F2F4 80241044 08090448 */ j .L80241120 -/* B5F2F8 80241048 0240282D */ daddu $a1, $s2, $zero -.L8024104C: -/* B5F2FC 8024104C 8E420064 */ lw $v0, 0x64($s2) -/* B5F300 80241050 24420001 */ addiu $v0, $v0, 1 -/* B5F304 80241054 AE420064 */ sw $v0, 0x64($s2) -/* B5F308 80241058 28420010 */ slti $v0, $v0, 0x10 -/* B5F30C 8024105C 1440002F */ bnez $v0, .L8024111C -/* B5F310 80241060 0000882D */ daddu $s1, $zero, $zero -/* B5F314 80241064 08090444 */ j .L80241110 -/* B5F318 80241068 24020001 */ addiu $v0, $zero, 1 -.L8024106C: -/* B5F31C 8024106C 4480A000 */ mtc1 $zero, $f20 -/* B5F320 80241070 24130014 */ addiu $s3, $zero, 0x14 -/* B5F324 80241074 0240802D */ daddu $s0, $s2, $zero -.L80241078: -/* B5F328 80241078 4405A000 */ mfc1 $a1, $f20 -/* B5F32C 8024107C AFB30010 */ sw $s3, 0x10($sp) -/* B5F330 80241080 8E060038 */ lw $a2, 0x38($s0) -/* B5F334 80241084 8E470064 */ lw $a3, 0x64($s2) -/* B5F338 80241088 0C00A8ED */ jal update_lerp -/* B5F33C 8024108C 24040001 */ addiu $a0, $zero, 1 -/* B5F340 80241090 C6020014 */ lwc1 $f2, 0x14($s0) -/* B5F344 80241094 46001080 */ add.s $f2, $f2, $f0 -/* B5F348 80241098 4405A000 */ mfc1 $a1, $f20 -/* B5F34C 8024109C E6020014 */ swc1 $f2, 0x14($s0) -/* B5F350 802410A0 AFB30010 */ sw $s3, 0x10($sp) -/* B5F354 802410A4 8E060044 */ lw $a2, 0x44($s0) -/* B5F358 802410A8 8E470064 */ lw $a3, 0x64($s2) -/* B5F35C 802410AC 0C00A8ED */ jal update_lerp -/* B5F360 802410B0 24040001 */ addiu $a0, $zero, 1 -/* B5F364 802410B4 C6020020 */ lwc1 $f2, 0x20($s0) -/* B5F368 802410B8 46001080 */ add.s $f2, $f2, $f0 -/* B5F36C 802410BC 4405A000 */ mfc1 $a1, $f20 -/* B5F370 802410C0 E6020020 */ swc1 $f2, 0x20($s0) -/* B5F374 802410C4 AFB30010 */ sw $s3, 0x10($sp) -/* B5F378 802410C8 8E060050 */ lw $a2, 0x50($s0) -/* B5F37C 802410CC 8E470064 */ lw $a3, 0x64($s2) -/* B5F380 802410D0 0C00A8ED */ jal update_lerp -/* B5F384 802410D4 24040001 */ addiu $a0, $zero, 1 -/* B5F388 802410D8 C602002C */ lwc1 $f2, 0x2c($s0) -/* B5F38C 802410DC 46001080 */ add.s $f2, $f2, $f0 -/* B5F390 802410E0 26310001 */ addiu $s1, $s1, 1 -/* B5F394 802410E4 2A220003 */ slti $v0, $s1, 3 -/* B5F398 802410E8 E602002C */ swc1 $f2, 0x2c($s0) -/* B5F39C 802410EC 1440FFE2 */ bnez $v0, .L80241078 -/* B5F3A0 802410F0 26100004 */ addiu $s0, $s0, 4 -/* B5F3A4 802410F4 8E420064 */ lw $v0, 0x64($s2) -/* B5F3A8 802410F8 24420001 */ addiu $v0, $v0, 1 -/* B5F3AC 802410FC AE420064 */ sw $v0, 0x64($s2) -/* B5F3B0 80241100 28420015 */ slti $v0, $v0, 0x15 -/* B5F3B4 80241104 14400005 */ bnez $v0, .L8024111C -/* B5F3B8 80241108 0000882D */ daddu $s1, $zero, $zero -/* B5F3BC 8024110C 24020002 */ addiu $v0, $zero, 2 -.L80241110: -/* B5F3C0 80241110 AE420004 */ sw $v0, 4($s2) -/* B5F3C4 80241114 AE400064 */ sw $zero, 0x64($s2) -/* B5F3C8 80241118 0000882D */ daddu $s1, $zero, $zero -.L8024111C: -/* B5F3CC 8024111C 0240282D */ daddu $a1, $s2, $zero -.L80241120: -/* B5F3D0 80241120 8CA20008 */ lw $v0, 8($a1) -/* B5F3D4 80241124 C4A00014 */ lwc1 $f0, 0x14($a1) -/* B5F3D8 80241128 8C42000C */ lw $v0, 0xc($v0) -/* B5F3DC 8024112C E4400010 */ swc1 $f0, 0x10($v0) -/* B5F3E0 80241130 8CA20008 */ lw $v0, 8($a1) -/* B5F3E4 80241134 C4A00020 */ lwc1 $f0, 0x20($a1) -/* B5F3E8 80241138 8C42000C */ lw $v0, 0xc($v0) -/* B5F3EC 8024113C 26310001 */ addiu $s1, $s1, 1 -/* B5F3F0 80241140 E4400014 */ swc1 $f0, 0x14($v0) -/* B5F3F4 80241144 8CA20008 */ lw $v0, 8($a1) -/* B5F3F8 80241148 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* B5F3FC 8024114C 8C42000C */ lw $v0, 0xc($v0) -/* B5F400 80241150 E4400018 */ swc1 $f0, 0x18($v0) -/* B5F404 80241154 2A220003 */ slti $v0, $s1, 3 -/* B5F408 80241158 1440FFF1 */ bnez $v0, .L80241120 -/* B5F40C 8024115C 24A50004 */ addiu $a1, $a1, 4 -/* B5F410 80241160 0000102D */ daddu $v0, $zero, $zero -.L80241164: -/* B5F414 80241164 8FBF0044 */ lw $ra, 0x44($sp) -/* B5F418 80241168 8FB60040 */ lw $s6, 0x40($sp) -/* B5F41C 8024116C 8FB5003C */ lw $s5, 0x3c($sp) -/* B5F420 80241170 8FB40038 */ lw $s4, 0x38($sp) -/* B5F424 80241174 8FB30034 */ lw $s3, 0x34($sp) -/* B5F428 80241178 8FB20030 */ lw $s2, 0x30($sp) -/* B5F42C 8024117C 8FB1002C */ lw $s1, 0x2c($sp) -/* B5F430 80241180 8FB00028 */ lw $s0, 0x28($sp) -/* B5F434 80241184 D7B80058 */ ldc1 $f24, 0x58($sp) -/* B5F438 80241188 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B5F43C 8024118C D7B40048 */ ldc1 $f20, 0x48($sp) -/* B5F440 80241190 03E00008 */ jr $ra -/* B5F444 80241194 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80241320_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80241320_B5E2B0.s deleted file mode 100644 index 36207e9597..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80241320_B5E2B0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241320_B5F5D0 -/* B5F5D0 80241320 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5F5D4 80241324 AFBF0018 */ sw $ra, 0x18($sp) -/* B5F5D8 80241328 0C00EAD2 */ jal get_npc_safe -/* B5F5DC 8024132C 2404FFFC */ addiu $a0, $zero, -4 -/* B5F5E0 80241330 3C0141F0 */ lui $at, 0x41f0 -/* B5F5E4 80241334 44810000 */ mtc1 $at, $f0 -/* B5F5E8 80241338 C442003C */ lwc1 $f2, 0x3c($v0) -/* B5F5EC 8024133C 46001080 */ add.s $f2, $f2, $f0 -/* B5F5F0 80241340 E7A00010 */ swc1 $f0, 0x10($sp) -/* B5F5F4 80241344 8C450038 */ lw $a1, 0x38($v0) -/* B5F5F8 80241348 8C470040 */ lw $a3, 0x40($v0) -/* B5F5FC 8024134C 44061000 */ mfc1 $a2, $f2 -/* B5F600 80241350 0C01BFBC */ jal func_8006FEF0 -/* B5F604 80241354 24040004 */ addiu $a0, $zero, 4 -/* B5F608 80241358 8FBF0018 */ lw $ra, 0x18($sp) -/* B5F60C 8024135C 24020002 */ addiu $v0, $zero, 2 -/* B5F610 80241360 03E00008 */ jr $ra -/* B5F614 80241364 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80241368_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80241368_B5E2B0.s deleted file mode 100644 index de0e5de4d4..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80241368_B5E2B0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241368_B5F618 -/* B5F618 80241368 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* B5F61C 8024136C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* B5F620 80241370 AC800084 */ sw $zero, 0x84($a0) -/* B5F624 80241374 80620000 */ lb $v0, ($v1) -/* B5F628 80241378 10400005 */ beqz $v0, .L80241390 -/* B5F62C 8024137C 24020003 */ addiu $v0, $zero, 3 -/* B5F630 80241380 80630003 */ lb $v1, 3($v1) -/* B5F634 80241384 14620002 */ bne $v1, $v0, .L80241390 -/* B5F638 80241388 24020001 */ addiu $v0, $zero, 1 -/* B5F63C 8024138C AC820084 */ sw $v0, 0x84($a0) -.L80241390: -/* B5F640 80241390 03E00008 */ jr $ra -/* B5F644 80241394 24020002 */ addiu $v0, $zero, 2 -/* B5F648 80241398 00000000 */ nop -/* B5F64C 8024139C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80241454_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80241454_B5E2B0.s deleted file mode 100644 index 75e5be0dc9..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80241454_B5E2B0.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241454_B5F704 -/* B5F704 80241454 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5F708 80241458 AFB10014 */ sw $s1, 0x14($sp) -/* B5F70C 8024145C 0080882D */ daddu $s1, $a0, $zero -/* B5F710 80241460 AFBF0018 */ sw $ra, 0x18($sp) -/* B5F714 80241464 AFB00010 */ sw $s0, 0x10($sp) -/* B5F718 80241468 8E300148 */ lw $s0, 0x148($s1) -/* B5F71C 8024146C 0C00EABB */ jal get_npc_unsafe -/* B5F720 80241470 86040008 */ lh $a0, 8($s0) -/* B5F724 80241474 3C054387 */ lui $a1, 0x4387 -/* B5F728 80241478 0040202D */ daddu $a0, $v0, $zero -/* B5F72C 8024147C 0C00ECD0 */ jal set_npc_yaw -/* B5F730 80241480 A480008E */ sh $zero, 0x8e($a0) -/* B5F734 80241484 24020003 */ addiu $v0, $zero, 3 -/* B5F738 80241488 AE00006C */ sw $zero, 0x6c($s0) -/* B5F73C 8024148C AE220070 */ sw $v0, 0x70($s1) -/* B5F740 80241490 8FBF0018 */ lw $ra, 0x18($sp) -/* B5F744 80241494 8FB10014 */ lw $s1, 0x14($sp) -/* B5F748 80241498 8FB00010 */ lw $s0, 0x10($sp) -/* B5F74C 8024149C 03E00008 */ jr $ra -/* B5F750 802414A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80241668_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80241668_B5E2B0.s deleted file mode 100644 index be84961136..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80241668_B5E2B0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241668_B5F918 -/* B5F918 80241668 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5F91C 8024166C AFB10014 */ sw $s1, 0x14($sp) -/* B5F920 80241670 0080882D */ daddu $s1, $a0, $zero -/* B5F924 80241674 AFBF0018 */ sw $ra, 0x18($sp) -/* B5F928 80241678 AFB00010 */ sw $s0, 0x10($sp) -/* B5F92C 8024167C 8E300148 */ lw $s0, 0x148($s1) -/* B5F930 80241680 0C00EABB */ jal get_npc_unsafe -/* B5F934 80241684 86040008 */ lh $a0, 8($s0) -/* B5F938 80241688 24030001 */ addiu $v1, $zero, 1 -/* B5F93C 8024168C 0040202D */ daddu $a0, $v0, $zero -/* B5F940 80241690 AE03006C */ sw $v1, 0x6c($s0) -/* B5F944 80241694 8482008C */ lh $v0, 0x8c($a0) -/* B5F948 80241698 14400009 */ bnez $v0, .L802416C0 -/* B5F94C 8024169C 24020002 */ addiu $v0, $zero, 2 -/* B5F950 802416A0 96030072 */ lhu $v1, 0x72($s0) -/* B5F954 802416A4 AE02006C */ sw $v0, 0x6c($s0) -/* B5F958 802416A8 A483008E */ sh $v1, 0x8e($a0) -/* B5F95C 802416AC 8E0200CC */ lw $v0, 0xcc($s0) -/* B5F960 802416B0 8C420020 */ lw $v0, 0x20($v0) -/* B5F964 802416B4 AC820028 */ sw $v0, 0x28($a0) -/* B5F968 802416B8 2402001F */ addiu $v0, $zero, 0x1f -/* B5F96C 802416BC AE220070 */ sw $v0, 0x70($s1) -.L802416C0: -/* B5F970 802416C0 8FBF0018 */ lw $ra, 0x18($sp) -/* B5F974 802416C4 8FB10014 */ lw $s1, 0x14($sp) -/* B5F978 802416C8 8FB00010 */ lw $s0, 0x10($sp) -/* B5F97C 802416CC 03E00008 */ jr $ra -/* B5F980 802416D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_802416D4_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_802416D4_B5E2B0.s deleted file mode 100644 index ff1e37b259..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_802416D4_B5E2B0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416D4_B5F984 -/* B5F984 802416D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5F988 802416D8 AFB10014 */ sw $s1, 0x14($sp) -/* B5F98C 802416DC 0080882D */ daddu $s1, $a0, $zero -/* B5F990 802416E0 AFBF0018 */ sw $ra, 0x18($sp) -/* B5F994 802416E4 AFB00010 */ sw $s0, 0x10($sp) -/* B5F998 802416E8 8E300148 */ lw $s0, 0x148($s1) -/* B5F99C 802416EC 0C00EABB */ jal get_npc_unsafe -/* B5F9A0 802416F0 86040008 */ lh $a0, 8($s0) -/* B5F9A4 802416F4 0040202D */ daddu $a0, $v0, $zero -/* B5F9A8 802416F8 9482008E */ lhu $v0, 0x8e($a0) -/* B5F9AC 802416FC 2442FFFF */ addiu $v0, $v0, -1 -/* B5F9B0 80241700 A482008E */ sh $v0, 0x8e($a0) -/* B5F9B4 80241704 00021400 */ sll $v0, $v0, 0x10 -/* B5F9B8 80241708 1C400009 */ bgtz $v0, .L80241730 -/* B5F9BC 8024170C 24020003 */ addiu $v0, $zero, 3 -/* B5F9C0 80241710 96030076 */ lhu $v1, 0x76($s0) -/* B5F9C4 80241714 AE02006C */ sw $v0, 0x6c($s0) -/* B5F9C8 80241718 A483008E */ sh $v1, 0x8e($a0) -/* B5F9CC 8024171C 8E0200CC */ lw $v0, 0xcc($s0) -/* B5F9D0 80241720 8C420024 */ lw $v0, 0x24($v0) -/* B5F9D4 80241724 AC820028 */ sw $v0, 0x28($a0) -/* B5F9D8 80241728 24020020 */ addiu $v0, $zero, 0x20 -/* B5F9DC 8024172C AE220070 */ sw $v0, 0x70($s1) -.L80241730: -/* B5F9E0 80241730 8FBF0018 */ lw $ra, 0x18($sp) -/* B5F9E4 80241734 8FB10014 */ lw $s1, 0x14($sp) -/* B5F9E8 80241738 8FB00010 */ lw $s0, 0x10($sp) -/* B5F9EC 8024173C 03E00008 */ jr $ra -/* B5F9F0 80241740 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80241744_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80241744_B5E2B0.s deleted file mode 100644 index 27ead89470..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80241744_B5E2B0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241744_B5F9F4 -/* B5F9F4 80241744 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B5F9F8 80241748 AFB10034 */ sw $s1, 0x34($sp) -/* B5F9FC 8024174C 0080882D */ daddu $s1, $a0, $zero -/* B5FA00 80241750 AFBF0038 */ sw $ra, 0x38($sp) -/* B5FA04 80241754 AFB00030 */ sw $s0, 0x30($sp) -/* B5FA08 80241758 8E300148 */ lw $s0, 0x148($s1) -/* B5FA0C 8024175C 0C00EABB */ jal get_npc_unsafe -/* B5FA10 80241760 86040008 */ lh $a0, 8($s0) -/* B5FA14 80241764 0040282D */ daddu $a1, $v0, $zero -/* B5FA18 80241768 94A2008E */ lhu $v0, 0x8e($a1) -/* B5FA1C 8024176C 2442FFFF */ addiu $v0, $v0, -1 -/* B5FA20 80241770 A4A2008E */ sh $v0, 0x8e($a1) -/* B5FA24 80241774 00021400 */ sll $v0, $v0, 0x10 -/* B5FA28 80241778 1C400023 */ bgtz $v0, .L80241808 -/* B5FA2C 8024177C 24020004 */ addiu $v0, $zero, 4 -/* B5FA30 80241780 8E0300CC */ lw $v1, 0xcc($s0) -/* B5FA34 80241784 AE02006C */ sw $v0, 0x6c($s0) -/* B5FA38 80241788 8C620000 */ lw $v0, ($v1) -/* B5FA3C 8024178C ACA20028 */ sw $v0, 0x28($a1) -/* B5FA40 80241790 9602007A */ lhu $v0, 0x7a($s0) -/* B5FA44 80241794 A4A2008E */ sh $v0, 0x8e($a1) -/* B5FA48 80241798 8E020078 */ lw $v0, 0x78($s0) -/* B5FA4C 8024179C 28420008 */ slti $v0, $v0, 8 -/* B5FA50 802417A0 14400018 */ bnez $v0, .L80241804 -/* B5FA54 802417A4 24020021 */ addiu $v0, $zero, 0x21 -/* B5FA58 802417A8 24040003 */ addiu $a0, $zero, 3 -/* B5FA5C 802417AC 27A30028 */ addiu $v1, $sp, 0x28 -/* B5FA60 802417B0 84A700A8 */ lh $a3, 0xa8($a1) -/* B5FA64 802417B4 3C013F80 */ lui $at, 0x3f80 -/* B5FA68 802417B8 44810000 */ mtc1 $at, $f0 -/* B5FA6C 802417BC 3C014000 */ lui $at, 0x4000 -/* B5FA70 802417C0 44811000 */ mtc1 $at, $f2 -/* B5FA74 802417C4 3C01C1A0 */ lui $at, 0xc1a0 -/* B5FA78 802417C8 44812000 */ mtc1 $at, $f4 -/* B5FA7C 802417CC 44873000 */ mtc1 $a3, $f6 -/* B5FA80 802417D0 00000000 */ nop -/* B5FA84 802417D4 468031A0 */ cvt.s.w $f6, $f6 -/* B5FA88 802417D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* B5FA8C 802417DC E7A20014 */ swc1 $f2, 0x14($sp) -/* B5FA90 802417E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* B5FA94 802417E4 8E020078 */ lw $v0, 0x78($s0) -/* B5FA98 802417E8 44073000 */ mfc1 $a3, $f6 -/* B5FA9C 802417EC 0000302D */ daddu $a2, $zero, $zero -/* B5FAA0 802417F0 AFA30020 */ sw $v1, 0x20($sp) -/* B5FAA4 802417F4 2442FFFF */ addiu $v0, $v0, -1 -/* B5FAA8 802417F8 0C01BFA4 */ jal fx_emote -/* B5FAAC 802417FC AFA2001C */ sw $v0, 0x1c($sp) -/* B5FAB0 80241800 24020021 */ addiu $v0, $zero, 0x21 -.L80241804: -/* B5FAB4 80241804 AE220070 */ sw $v0, 0x70($s1) -.L80241808: -/* B5FAB8 80241808 8FBF0038 */ lw $ra, 0x38($sp) -/* B5FABC 8024180C 8FB10034 */ lw $s1, 0x34($sp) -/* B5FAC0 80241810 8FB00030 */ lw $s0, 0x30($sp) -/* B5FAC4 80241814 03E00008 */ jr $ra -/* B5FAC8 80241818 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_8024181C_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_8024181C_B5E2B0.s deleted file mode 100644 index e8f17bafb9..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_8024181C_B5E2B0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024181C_B5FACC -/* B5FACC 8024181C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5FAD0 80241820 AFB10014 */ sw $s1, 0x14($sp) -/* B5FAD4 80241824 0080882D */ daddu $s1, $a0, $zero -/* B5FAD8 80241828 AFBF0018 */ sw $ra, 0x18($sp) -/* B5FADC 8024182C AFB00010 */ sw $s0, 0x10($sp) -/* B5FAE0 80241830 8E300148 */ lw $s0, 0x148($s1) -/* B5FAE4 80241834 0C00EABB */ jal get_npc_unsafe -/* B5FAE8 80241838 86040008 */ lh $a0, 8($s0) -/* B5FAEC 8024183C 9443008E */ lhu $v1, 0x8e($v0) -/* B5FAF0 80241840 2463FFFF */ addiu $v1, $v1, -1 -/* B5FAF4 80241844 A443008E */ sh $v1, 0x8e($v0) -/* B5FAF8 80241848 00031C00 */ sll $v1, $v1, 0x10 -/* B5FAFC 8024184C 1C600003 */ bgtz $v1, .L8024185C -/* B5FB00 80241850 2402000C */ addiu $v0, $zero, 0xc -/* B5FB04 80241854 AE00006C */ sw $zero, 0x6c($s0) -/* B5FB08 80241858 AE220070 */ sw $v0, 0x70($s1) -.L8024185C: -/* B5FB0C 8024185C 8FBF0018 */ lw $ra, 0x18($sp) -/* B5FB10 80241860 8FB10014 */ lw $s1, 0x14($sp) -/* B5FB14 80241864 8FB00010 */ lw $s0, 0x10($sp) -/* B5FB18 80241868 03E00008 */ jr $ra -/* B5FB1C 8024186C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80241870_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80241870_B5E2B0.s deleted file mode 100644 index 6c89860112..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80241870_B5E2B0.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241870_B5FB20 -/* B5FB20 80241870 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B5FB24 80241874 AFBF0024 */ sw $ra, 0x24($sp) -/* B5FB28 80241878 AFB40020 */ sw $s4, 0x20($sp) -/* B5FB2C 8024187C AFB3001C */ sw $s3, 0x1c($sp) -/* B5FB30 80241880 AFB20018 */ sw $s2, 0x18($sp) -/* B5FB34 80241884 AFB10014 */ sw $s1, 0x14($sp) -/* B5FB38 80241888 AFB00010 */ sw $s0, 0x10($sp) -/* B5FB3C 8024188C F7B40028 */ sdc1 $f20, 0x28($sp) -/* B5FB40 80241890 8C900148 */ lw $s0, 0x148($a0) -/* B5FB44 80241894 86040008 */ lh $a0, 8($s0) -/* B5FB48 80241898 0C00EABB */ jal get_npc_unsafe -/* B5FB4C 8024189C 24110001 */ addiu $s1, $zero, 1 -/* B5FB50 802418A0 86040008 */ lh $a0, 8($s0) -/* B5FB54 802418A4 0040802D */ daddu $s0, $v0, $zero -/* B5FB58 802418A8 3C05800B */ lui $a1, %hi(gCameras) -/* B5FB5C 802418AC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* B5FB60 802418B0 3C03800A */ lui $v1, 0x800a -/* B5FB64 802418B4 8463A634 */ lh $v1, -0x59cc($v1) -/* B5FB68 802418B8 00912021 */ addu $a0, $a0, $s1 -/* B5FB6C 802418BC 00031080 */ sll $v0, $v1, 2 -/* B5FB70 802418C0 00431021 */ addu $v0, $v0, $v1 -/* B5FB74 802418C4 00021080 */ sll $v0, $v0, 2 -/* B5FB78 802418C8 00431023 */ subu $v0, $v0, $v1 -/* B5FB7C 802418CC 000218C0 */ sll $v1, $v0, 3 -/* B5FB80 802418D0 00431021 */ addu $v0, $v0, $v1 -/* B5FB84 802418D4 000210C0 */ sll $v0, $v0, 3 -/* B5FB88 802418D8 0C00FB3A */ jal get_enemy -/* B5FB8C 802418DC 00459021 */ addu $s2, $v0, $a1 -/* B5FB90 802418E0 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* B5FB94 802418E4 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* B5FB98 802418E8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B5FB9C 802418EC 8E830000 */ lw $v1, ($s4) -/* B5FBA0 802418F0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B5FBA4 802418F4 8C660028 */ lw $a2, 0x28($v1) -/* B5FBA8 802418F8 8C670030 */ lw $a3, 0x30($v1) -/* B5FBAC 802418FC 0C00A7B5 */ jal dist2D -/* B5FBB0 80241900 0040982D */ daddu $s3, $v0, $zero -/* B5FBB4 80241904 C6620074 */ lwc1 $f2, 0x74($s3) -/* B5FBB8 80241908 468010A0 */ cvt.s.w $f2, $f2 -/* B5FBBC 8024190C 4600103C */ c.lt.s $f2, $f0 -/* B5FBC0 80241910 00000000 */ nop -/* B5FBC4 80241914 45030001 */ bc1tl .L8024191C -/* B5FBC8 80241918 0000882D */ daddu $s1, $zero, $zero -.L8024191C: -/* B5FBCC 8024191C C64C006C */ lwc1 $f12, 0x6c($s2) -/* B5FBD0 80241920 C60E000C */ lwc1 $f14, 0xc($s0) -/* B5FBD4 80241924 3C014387 */ lui $at, 0x4387 -/* B5FBD8 80241928 4481A000 */ mtc1 $at, $f20 -/* B5FBDC 8024192C 0C00A70A */ jal get_clamped_angle_diff -/* B5FBE0 80241930 00000000 */ nop -/* B5FBE4 80241934 0C00A6C9 */ jal clamp_angle -/* B5FBE8 80241938 46000306 */ mov.s $f12, $f0 -/* B5FBEC 8024193C 3C018024 */ lui $at, 0x8024 -/* B5FBF0 80241940 D42274D8 */ ldc1 $f2, 0x74d8($at) -/* B5FBF4 80241944 46000021 */ cvt.d.s $f0, $f0 -/* B5FBF8 80241948 4622003C */ c.lt.d $f0, $f2 -/* B5FBFC 8024194C 00000000 */ nop -/* B5FC00 80241950 45000003 */ bc1f .L80241960 -/* B5FC04 80241954 00000000 */ nop -/* B5FC08 80241958 3C0142B4 */ lui $at, 0x42b4 -/* B5FC0C 8024195C 4481A000 */ mtc1 $at, $f20 -.L80241960: -/* B5FC10 80241960 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B5FC14 80241964 8E820000 */ lw $v0, ($s4) -/* B5FC18 80241968 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B5FC1C 8024196C 8C460028 */ lw $a2, 0x28($v0) -/* B5FC20 80241970 0C00A720 */ jal atan2 -/* B5FC24 80241974 8C470030 */ lw $a3, 0x30($v0) -/* B5FC28 80241978 4600A306 */ mov.s $f12, $f20 -/* B5FC2C 8024197C 0C00A70A */ jal get_clamped_angle_diff -/* B5FC30 80241980 46000386 */ mov.s $f14, $f0 -/* B5FC34 80241984 C6620078 */ lwc1 $f2, 0x78($s3) -/* B5FC38 80241988 468010A0 */ cvt.s.w $f2, $f2 -/* B5FC3C 8024198C 46000005 */ abs.s $f0, $f0 -/* B5FC40 80241990 4600103C */ c.lt.s $f2, $f0 -/* B5FC44 80241994 00000000 */ nop -/* B5FC48 80241998 45030001 */ bc1tl .L802419A0 -/* B5FC4C 8024199C 0000882D */ daddu $s1, $zero, $zero -.L802419A0: -/* B5FC50 802419A0 8E820000 */ lw $v0, ($s4) -/* B5FC54 802419A4 C600003C */ lwc1 $f0, 0x3c($s0) -/* B5FC58 802419A8 C442002C */ lwc1 $f2, 0x2c($v0) -/* B5FC5C 802419AC 860200A8 */ lh $v0, 0xa8($s0) -/* B5FC60 802419B0 46020001 */ sub.s $f0, $f0, $f2 -/* B5FC64 802419B4 44821000 */ mtc1 $v0, $f2 -/* B5FC68 802419B8 00000000 */ nop -/* B5FC6C 802419BC 468010A1 */ cvt.d.w $f2, $f2 -/* B5FC70 802419C0 46221080 */ add.d $f2, $f2, $f2 -/* B5FC74 802419C4 46000005 */ abs.s $f0, $f0 -/* B5FC78 802419C8 46000021 */ cvt.d.s $f0, $f0 -/* B5FC7C 802419CC 4620103E */ c.le.d $f2, $f0 -/* B5FC80 802419D0 00000000 */ nop -/* B5FC84 802419D4 45030001 */ bc1tl .L802419DC -/* B5FC88 802419D8 0000882D */ daddu $s1, $zero, $zero -.L802419DC: -/* B5FC8C 802419DC 3C038011 */ lui $v1, 0x8011 -/* B5FC90 802419E0 8063EBB3 */ lb $v1, -0x144d($v1) -/* B5FC94 802419E4 24020009 */ addiu $v0, $zero, 9 -/* B5FC98 802419E8 50620001 */ beql $v1, $v0, .L802419F0 -/* B5FC9C 802419EC 0000882D */ daddu $s1, $zero, $zero -.L802419F0: -/* B5FCA0 802419F0 24020007 */ addiu $v0, $zero, 7 -/* B5FCA4 802419F4 50620001 */ beql $v1, $v0, .L802419FC -/* B5FCA8 802419F8 0000882D */ daddu $s1, $zero, $zero -.L802419FC: -/* B5FCAC 802419FC 0220102D */ daddu $v0, $s1, $zero -/* B5FCB0 80241A00 8FBF0024 */ lw $ra, 0x24($sp) -/* B5FCB4 80241A04 8FB40020 */ lw $s4, 0x20($sp) -/* B5FCB8 80241A08 8FB3001C */ lw $s3, 0x1c($sp) -/* B5FCBC 80241A0C 8FB20018 */ lw $s2, 0x18($sp) -/* B5FCC0 80241A10 8FB10014 */ lw $s1, 0x14($sp) -/* B5FCC4 80241A14 8FB00010 */ lw $s0, 0x10($sp) -/* B5FCC8 80241A18 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B5FCCC 80241A1C 03E00008 */ jr $ra -/* B5FCD0 80241A20 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_80241A24_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_80241A24_B5E2B0.s deleted file mode 100644 index 89006d094b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_80241A24_B5E2B0.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A24_B5FCD4 -/* B5FCD4 80241A24 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B5FCD8 80241A28 AFB40028 */ sw $s4, 0x28($sp) -/* B5FCDC 80241A2C 0080A02D */ daddu $s4, $a0, $zero -/* B5FCE0 80241A30 AFBF002C */ sw $ra, 0x2c($sp) -/* B5FCE4 80241A34 AFB30024 */ sw $s3, 0x24($sp) -/* B5FCE8 80241A38 AFB20020 */ sw $s2, 0x20($sp) -/* B5FCEC 80241A3C AFB1001C */ sw $s1, 0x1c($sp) -/* B5FCF0 80241A40 AFB00018 */ sw $s0, 0x18($sp) -/* B5FCF4 80241A44 8E910148 */ lw $s1, 0x148($s4) -/* B5FCF8 80241A48 86240008 */ lh $a0, 8($s1) -/* B5FCFC 80241A4C 0C00EABB */ jal get_npc_unsafe -/* B5FD00 80241A50 00A0802D */ daddu $s0, $a1, $zero -/* B5FD04 80241A54 16000005 */ bnez $s0, .L80241A6C -/* B5FD08 80241A58 0040902D */ daddu $s2, $v0, $zero -/* B5FD0C 80241A5C 8E2200B0 */ lw $v0, 0xb0($s1) -/* B5FD10 80241A60 30420004 */ andi $v0, $v0, 4 -/* B5FD14 80241A64 10400015 */ beqz $v0, .L80241ABC -/* B5FD18 80241A68 00000000 */ nop -.L80241A6C: -/* B5FD1C 80241A6C AE800070 */ sw $zero, 0x70($s4) -/* B5FD20 80241A70 8E420000 */ lw $v0, ($s2) -/* B5FD24 80241A74 3C031F30 */ lui $v1, 0x1f30 -/* B5FD28 80241A78 A640008E */ sh $zero, 0x8e($s2) -/* B5FD2C 80241A7C 34420102 */ ori $v0, $v0, 0x102 -/* B5FD30 80241A80 AE420000 */ sw $v0, ($s2) -/* B5FD34 80241A84 8E220000 */ lw $v0, ($s1) -/* B5FD38 80241A88 3C01C47A */ lui $at, 0xc47a -/* B5FD3C 80241A8C 44810000 */ mtc1 $at, $f0 -/* B5FD40 80241A90 00431025 */ or $v0, $v0, $v1 -/* B5FD44 80241A94 AE220000 */ sw $v0, ($s1) -/* B5FD48 80241A98 AE400038 */ sw $zero, 0x38($s2) -/* B5FD4C 80241A9C E640003C */ swc1 $f0, 0x3c($s2) -/* B5FD50 80241AA0 AE400040 */ sw $zero, 0x40($s2) -/* B5FD54 80241AA4 8E2300B0 */ lw $v1, 0xb0($s1) -/* B5FD58 80241AA8 30620004 */ andi $v0, $v1, 4 -/* B5FD5C 80241AAC 10400003 */ beqz $v0, .L80241ABC -/* B5FD60 80241AB0 2402FFFB */ addiu $v0, $zero, -5 -/* B5FD64 80241AB4 00621024 */ and $v0, $v1, $v0 -/* B5FD68 80241AB8 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241ABC: -/* B5FD6C 80241ABC 8E930070 */ lw $s3, 0x70($s4) -/* B5FD70 80241AC0 12600005 */ beqz $s3, .L80241AD8 -/* B5FD74 80241AC4 24020001 */ addiu $v0, $zero, 1 -/* B5FD78 80241AC8 12620048 */ beq $s3, $v0, .L80241BEC -/* B5FD7C 80241ACC 00000000 */ nop -/* B5FD80 80241AD0 08090718 */ j .L80241C60 -/* B5FD84 80241AD4 00000000 */ nop -.L80241AD8: -/* B5FD88 80241AD8 86240008 */ lh $a0, 8($s1) -/* B5FD8C 80241ADC 0C00FB3A */ jal get_enemy -/* B5FD90 80241AE0 2484FFFF */ addiu $a0, $a0, -1 -/* B5FD94 80241AE4 0040802D */ daddu $s0, $v0, $zero -/* B5FD98 80241AE8 0C00EABB */ jal get_npc_unsafe -/* B5FD9C 80241AEC 86040008 */ lh $a0, 8($s0) -/* B5FDA0 80241AF0 24030001 */ addiu $v1, $zero, 1 -/* B5FDA4 80241AF4 0040982D */ daddu $s3, $v0, $zero -/* B5FDA8 80241AF8 A2230007 */ sb $v1, 7($s1) -/* B5FDAC 80241AFC 8E03006C */ lw $v1, 0x6c($s0) -/* B5FDB0 80241B00 24020003 */ addiu $v0, $zero, 3 -/* B5FDB4 80241B04 14620056 */ bne $v1, $v0, .L80241C60 -/* B5FDB8 80241B08 00000000 */ nop -/* B5FDBC 80241B0C 8E2500A8 */ lw $a1, 0xa8($s1) -/* B5FDC0 80241B10 10A00003 */ beqz $a1, .L80241B20 -/* B5FDC4 80241B14 0260202D */ daddu $a0, $s3, $zero -/* B5FDC8 80241B18 0C012530 */ jal func_800494C0 -/* B5FDCC 80241B1C 0000302D */ daddu $a2, $zero, $zero -.L80241B20: -/* B5FDD0 80241B20 27A40010 */ addiu $a0, $sp, 0x10 -/* B5FDD4 80241B24 C6280070 */ lwc1 $f8, 0x70($s1) -/* B5FDD8 80241B28 46804220 */ cvt.s.w $f8, $f8 -/* B5FDDC 80241B2C C6620034 */ lwc1 $f2, 0x34($s3) -/* B5FDE0 80241B30 3C014387 */ lui $at, 0x4387 -/* B5FDE4 80241B34 44810000 */ mtc1 $at, $f0 -/* B5FDE8 80241B38 44064000 */ mfc1 $a2, $f8 -/* B5FDEC 80241B3C 46020001 */ sub.s $f0, $f0, $f2 -/* B5FDF0 80241B40 C6660038 */ lwc1 $f6, 0x38($s3) -/* B5FDF4 80241B44 C6640040 */ lwc1 $f4, 0x40($s3) -/* B5FDF8 80241B48 44070000 */ mfc1 $a3, $f0 -/* B5FDFC 80241B4C 27A50014 */ addiu $a1, $sp, 0x14 -/* B5FE00 80241B50 E7A60010 */ swc1 $f6, 0x10($sp) -/* B5FE04 80241B54 0C00A7E7 */ jal add_vec2D_polar -/* B5FE08 80241B58 E7A40014 */ swc1 $f4, 0x14($sp) -/* B5FE0C 80241B5C C7A00010 */ lwc1 $f0, 0x10($sp) -/* B5FE10 80241B60 4600020D */ trunc.w.s $f8, $f0 -/* B5FE14 80241B64 44024000 */ mfc1 $v0, $f8 -/* B5FE18 80241B68 E6400038 */ swc1 $f0, 0x38($s2) -/* B5FE1C 80241B6C A6220010 */ sh $v0, 0x10($s1) -/* B5FE20 80241B70 C660003C */ lwc1 $f0, 0x3c($s3) -/* B5FE24 80241B74 C622006C */ lwc1 $f2, 0x6c($s1) -/* B5FE28 80241B78 468010A0 */ cvt.s.w $f2, $f2 -/* B5FE2C 80241B7C 46020000 */ add.s $f0, $f0, $f2 -/* B5FE30 80241B80 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* B5FE34 80241B84 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* B5FE38 80241B88 E640003C */ swc1 $f0, 0x3c($s2) -/* B5FE3C 80241B8C C7A20014 */ lwc1 $f2, 0x14($sp) -/* B5FE40 80241B90 4600020D */ trunc.w.s $f8, $f0 -/* B5FE44 80241B94 44024000 */ mfc1 $v0, $f8 -/* B5FE48 80241B98 00000000 */ nop -/* B5FE4C 80241B9C A6220012 */ sh $v0, 0x12($s1) -/* B5FE50 80241BA0 4600120D */ trunc.w.s $f8, $f2 -/* B5FE54 80241BA4 44024000 */ mfc1 $v0, $f8 -/* B5FE58 80241BA8 E6420040 */ swc1 $f2, 0x40($s2) -/* B5FE5C 80241BAC A6220014 */ sh $v0, 0x14($s1) -/* B5FE60 80241BB0 8C660028 */ lw $a2, 0x28($v1) -/* B5FE64 80241BB4 8C670030 */ lw $a3, 0x30($v1) -/* B5FE68 80241BB8 C64C0038 */ lwc1 $f12, 0x38($s2) -/* B5FE6C 80241BBC 0C00A720 */ jal atan2 -/* B5FE70 80241BC0 C64E0040 */ lwc1 $f14, 0x40($s2) -/* B5FE74 80241BC4 3C03E0EF */ lui $v1, 0xe0ef -/* B5FE78 80241BC8 E640000C */ swc1 $f0, 0xc($s2) -/* B5FE7C 80241BCC 8E220000 */ lw $v0, ($s1) -/* B5FE80 80241BD0 3463FFFF */ ori $v1, $v1, 0xffff -/* B5FE84 80241BD4 00431024 */ and $v0, $v0, $v1 -/* B5FE88 80241BD8 AE220000 */ sw $v0, ($s1) -/* B5FE8C 80241BDC 24020001 */ addiu $v0, $zero, 1 -/* B5FE90 80241BE0 A640008E */ sh $zero, 0x8e($s2) -/* B5FE94 80241BE4 08090718 */ j .L80241C60 -/* B5FE98 80241BE8 AE820070 */ sw $v0, 0x70($s4) -.L80241BEC: -/* B5FE9C 80241BEC 86240008 */ lh $a0, 8($s1) -/* B5FEA0 80241BF0 0C00FB3A */ jal get_enemy -/* B5FEA4 80241BF4 2484FFFF */ addiu $a0, $a0, -1 -/* B5FEA8 80241BF8 0040802D */ daddu $s0, $v0, $zero -/* B5FEAC 80241BFC 0C00EABB */ jal get_npc_unsafe -/* B5FEB0 80241C00 86040008 */ lh $a0, 8($s0) -/* B5FEB4 80241C04 9642008E */ lhu $v0, 0x8e($s2) -/* B5FEB8 80241C08 24420001 */ addiu $v0, $v0, 1 -/* B5FEBC 80241C0C A642008E */ sh $v0, 0x8e($s2) -/* B5FEC0 80241C10 00021400 */ sll $v0, $v0, 0x10 -/* B5FEC4 80241C14 8E23007C */ lw $v1, 0x7c($s1) -/* B5FEC8 80241C18 00021403 */ sra $v0, $v0, 0x10 -/* B5FECC 80241C1C 0043102A */ slt $v0, $v0, $v1 -/* B5FED0 80241C20 50400001 */ beql $v0, $zero, .L80241C28 -/* B5FED4 80241C24 A2200007 */ sb $zero, 7($s1) -.L80241C28: -/* B5FED8 80241C28 8E03006C */ lw $v1, 0x6c($s0) -/* B5FEDC 80241C2C 24020004 */ addiu $v0, $zero, 4 -/* B5FEE0 80241C30 1462000B */ bne $v1, $v0, .L80241C60 -/* B5FEE4 80241C34 3C021F10 */ lui $v0, 0x1f10 -/* B5FEE8 80241C38 8E230000 */ lw $v1, ($s1) -/* B5FEEC 80241C3C 3C01C47A */ lui $at, 0xc47a -/* B5FEF0 80241C40 44810000 */ mtc1 $at, $f0 -/* B5FEF4 80241C44 00621825 */ or $v1, $v1, $v0 -/* B5FEF8 80241C48 AE230000 */ sw $v1, ($s1) -/* B5FEFC 80241C4C AE400038 */ sw $zero, 0x38($s2) -/* B5FF00 80241C50 E640003C */ swc1 $f0, 0x3c($s2) -/* B5FF04 80241C54 AE400040 */ sw $zero, 0x40($s2) -/* B5FF08 80241C58 A2330007 */ sb $s3, 7($s1) -/* B5FF0C 80241C5C AE800070 */ sw $zero, 0x70($s4) -.L80241C60: -/* B5FF10 80241C60 8FBF002C */ lw $ra, 0x2c($sp) -/* B5FF14 80241C64 8FB40028 */ lw $s4, 0x28($sp) -/* B5FF18 80241C68 8FB30024 */ lw $s3, 0x24($sp) -/* B5FF1C 80241C6C 8FB20020 */ lw $s2, 0x20($sp) -/* B5FF20 80241C70 8FB1001C */ lw $s1, 0x1c($sp) -/* B5FF24 80241C74 8FB00018 */ lw $s0, 0x18($sp) -/* B5FF28 80241C78 0000102D */ daddu $v0, $zero, $zero -/* B5FF2C 80241C7C 03E00008 */ jr $ra -/* B5FF30 80241C80 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_08/func_802421F0_B5E2B0.s b/asm/nonmatchings/world/area_jan/jan_08/func_802421F0_B5E2B0.s deleted file mode 100644 index b664219547..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/func_802421F0_B5E2B0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421F0_B604A0 -/* B604A0 802421F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B604A4 802421F4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B604A8 802421F8 4485A000 */ mtc1 $a1, $f20 -/* B604AC 802421FC F7B60020 */ sdc1 $f22, 0x20($sp) -/* B604B0 80242200 4486B000 */ mtc1 $a2, $f22 -/* B604B4 80242204 AFB00010 */ sw $s0, 0x10($sp) -/* B604B8 80242208 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B604BC 8024220C 4487C000 */ mtc1 $a3, $f24 -/* B604C0 80242210 AFBF0014 */ sw $ra, 0x14($sp) -/* B604C4 80242214 0C019D28 */ jal guMtxIdentF -/* B604C8 80242218 0080802D */ daddu $s0, $a0, $zero -/* B604CC 8024221C 4616A582 */ mul.s $f22, $f20, $f22 -/* B604D0 80242220 00000000 */ nop -/* B604D4 80242224 4618A502 */ mul.s $f20, $f20, $f24 -/* B604D8 80242228 00000000 */ nop -/* B604DC 8024222C 3C013F80 */ lui $at, 0x3f80 -/* B604E0 80242230 44810000 */ mtc1 $at, $f0 -/* B604E4 80242234 00000000 */ nop -/* B604E8 80242238 E6000014 */ swc1 $f0, 0x14($s0) -/* B604EC 8024223C E6160010 */ swc1 $f22, 0x10($s0) -/* B604F0 80242240 E6140018 */ swc1 $f20, 0x18($s0) -/* B604F4 80242244 8FBF0014 */ lw $ra, 0x14($sp) -/* B604F8 80242248 8FB00010 */ lw $s0, 0x10($sp) -/* B604FC 8024224C D7B80028 */ ldc1 $f24, 0x28($sp) -/* B60500 80242250 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B60504 80242254 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B60508 80242258 03E00008 */ jr $ra -/* B6050C 8024225C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_80240020_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_80240020_B65AB0.s deleted file mode 100644 index 160d22120c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_80240020_B65AB0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_B65AD0 -/* B65AD0 80240020 3C028016 */ lui $v0, 0x8016 -/* B65AD4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* B65AD8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* B65ADC 8024002C 03E00008 */ jr $ra -/* B65AE0 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_80240034_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_80240034_B65AB0.s deleted file mode 100644 index eaaa49a6a6..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_80240034_B65AB0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_B65AE4 -/* B65AE4 80240034 3C038016 */ lui $v1, 0x8016 -/* B65AE8 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* B65AEC 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B65AF0 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* B65AF4 80240044 0080802D */ daddu $s0, $a0, $zero -/* B65AF8 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* B65AFC 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* B65B00 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* B65B04 80240054 24020002 */ addiu $v0, $zero, 2 -/* B65B08 80240058 08090038 */ j .L802400E0 -/* B65B0C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* B65B10 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* B65B14 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* B65B18 80240068 80620040 */ lb $v0, 0x40($v1) -/* B65B1C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* B65B20 80240070 04420001 */ bltzl $v0, .L80240078 -/* B65B24 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* B65B28 80240078 14400003 */ bnez $v0, .L80240088 -/* B65B2C 8024007C 00000000 */ nop -/* B65B30 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* B65B34 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* B65B38 80240088 44822000 */ mtc1 $v0, $f4 -/* B65B3C 8024008C 00000000 */ nop -/* B65B40 80240090 46802120 */ cvt.s.w $f4, $f4 -/* B65B44 80240094 44062000 */ mfc1 $a2, $f4 -/* B65B48 80240098 44872000 */ mtc1 $a3, $f4 -/* B65B4C 8024009C 00000000 */ nop -/* B65B50 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* B65B54 802400A4 44806000 */ mtc1 $zero, $f12 -/* B65B58 802400A8 44072000 */ mfc1 $a3, $f4 -/* B65B5C 802400AC 0C00A720 */ jal atan2 -/* B65B60 802400B0 46006386 */ mov.s $f14, $f12 -/* B65B64 802400B4 3C014270 */ lui $at, 0x4270 -/* B65B68 802400B8 44811000 */ mtc1 $at, $f2 -/* B65B6C 802400BC 00000000 */ nop -/* B65B70 802400C0 4602003C */ c.lt.s $f0, $f2 -/* B65B74 802400C4 00000000 */ nop -/* B65B78 802400C8 45000004 */ bc1f .L802400DC -/* B65B7C 802400CC 24020001 */ addiu $v0, $zero, 1 -/* B65B80 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* B65B84 802400D4 08090038 */ j .L802400E0 -/* B65B88 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* B65B8C 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* B65B90 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* B65B94 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* B65B98 802400E8 03E00008 */ jr $ra -/* B65B9C 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_802400F0_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_802400F0_B65AB0.s deleted file mode 100644 index da04950534..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_802400F0_B65AB0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_B65BA0 -/* B65BA0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B65BA4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* B65BA8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* B65BAC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* B65BB0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* B65BB4 80240104 0C016AFA */ jal get_current_map_header -/* B65BB8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* B65BBC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* B65BC0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* B65BC4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B65BC8 80240118 0C0B1EAF */ jal get_variable -/* B65BCC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* B65BD0 80240120 0220202D */ daddu $a0, $s1, $zero -/* B65BD4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* B65BD8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* B65BDC 8024012C 00028100 */ sll $s0, $v0, 4 -/* B65BE0 80240130 02031821 */ addu $v1, $s0, $v1 -/* B65BE4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* B65BE8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* B65BEC 8024013C 44061000 */ mfc1 $a2, $f2 -/* B65BF0 80240140 0C0B2026 */ jal set_variable -/* B65BF4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B65BF8 80240148 0220202D */ daddu $a0, $s1, $zero -/* B65BFC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* B65C00 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* B65C04 80240154 02021021 */ addu $v0, $s0, $v0 -/* B65C08 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* B65C0C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* B65C10 80240160 44061000 */ mfc1 $a2, $f2 -/* B65C14 80240164 0C0B2026 */ jal set_variable -/* B65C18 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* B65C1C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* B65C20 80240170 8E420014 */ lw $v0, 0x14($s2) -/* B65C24 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* B65C28 80240178 02021021 */ addu $v0, $s0, $v0 -/* B65C2C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* B65C30 80240180 4600008D */ trunc.w.s $f2, $f0 -/* B65C34 80240184 44061000 */ mfc1 $a2, $f2 -/* B65C38 80240188 0C0B2026 */ jal set_variable -/* B65C3C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* B65C40 80240190 0220202D */ daddu $a0, $s1, $zero -/* B65C44 80240194 8E420014 */ lw $v0, 0x14($s2) -/* B65C48 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* B65C4C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* B65C50 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* B65C54 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* B65C58 802401A8 44061000 */ mfc1 $a2, $f2 -/* B65C5C 802401AC 0C0B2026 */ jal set_variable -/* B65C60 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* B65C64 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* B65C68 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* B65C6C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* B65C70 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* B65C74 802401C4 24020002 */ addiu $v0, $zero, 2 -/* B65C78 802401C8 03E00008 */ jr $ra -/* B65C7C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_802401D0_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_802401D0_B65AB0.s deleted file mode 100644 index 73d3b5dfc8..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_802401D0_B65AB0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_B65C80 -/* B65C80 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* B65C84 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* B65C88 802401D8 3C014334 */ lui $at, 0x4334 -/* B65C8C 802401DC 44816000 */ mtc1 $at, $f12 -/* B65C90 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B65C94 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* B65C98 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* B65C9C 802401EC 00031080 */ sll $v0, $v1, 2 -/* B65CA0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* B65CA4 802401F4 00021080 */ sll $v0, $v0, 2 -/* B65CA8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* B65CAC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* B65CB0 80240200 00431021 */ addu $v0, $v0, $v1 -/* B65CB4 80240204 000210C0 */ sll $v0, $v0, 3 -/* B65CB8 80240208 3C01800B */ lui $at, 0x800b -/* B65CBC 8024020C 00220821 */ addu $at, $at, $v0 -/* B65CC0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* B65CC4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* B65CC8 80240218 0C00A6C9 */ jal clamp_angle -/* B65CCC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* B65CD0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* B65CD4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* B65CD8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* B65CDC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* B65CE0 80240230 24020002 */ addiu $v0, $zero, 2 -/* B65CE4 80240234 03E00008 */ jr $ra -/* B65CE8 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_8024023C_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_8024023C_B65AB0.s deleted file mode 100644 index cabb58319a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_8024023C_B65AB0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_B65CEC -/* B65CEC 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B65CF0 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* B65CF4 80240244 0080802D */ daddu $s0, $a0, $zero -/* B65CF8 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* B65CFC 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* B65D00 80240250 8E02000C */ lw $v0, 0xc($s0) -/* B65D04 80240254 0C0B210B */ jal get_float_variable -/* B65D08 80240258 8C450000 */ lw $a1, ($v0) -/* B65D0C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* B65D10 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* B65D14 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* B65D18 80240268 44060000 */ mfc1 $a2, $f0 -/* B65D1C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* B65D20 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* B65D24 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* B65D28 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* B65D2C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* B65D30 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* B65D34 80240284 0C00A7E7 */ jal add_vec2D_polar -/* B65D38 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* B65D3C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* B65D40 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* B65D44 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* B65D48 80240298 0C0B2190 */ jal set_float_variable -/* B65D4C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B65D50 802402A0 0200202D */ daddu $a0, $s0, $zero -/* B65D54 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* B65D58 802402A8 4406A000 */ mfc1 $a2, $f20 -/* B65D5C 802402AC 0C0B2190 */ jal set_float_variable -/* B65D60 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B65D64 802402B4 0200202D */ daddu $a0, $s0, $zero -/* B65D68 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* B65D6C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* B65D70 802402C0 0C0B2190 */ jal set_float_variable -/* B65D74 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* B65D78 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* B65D7C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* B65D80 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B65D84 802402D4 24020002 */ addiu $v0, $zero, 2 -/* B65D88 802402D8 03E00008 */ jr $ra -/* B65D8C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_802402E0_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_802402E0_B65AB0.s deleted file mode 100644 index 5135baf24b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_802402E0_B65AB0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_B65D90 -/* B65D90 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B65D94 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* B65D98 802402E8 0080802D */ daddu $s0, $a0, $zero -/* B65D9C 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* B65DA0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* B65DA4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* B65DA8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* B65DAC 802402FC 04610004 */ bgez $v1, .L80240310 -/* B65DB0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* B65DB4 80240304 3C020002 */ lui $v0, 2 -/* B65DB8 80240308 080900C8 */ j .L80240320 -/* B65DBC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* B65DC0 80240310 3C040002 */ lui $a0, 2 -/* B65DC4 80240314 0083102A */ slt $v0, $a0, $v1 -/* B65DC8 80240318 10400002 */ beqz $v0, .L80240324 -/* B65DCC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* B65DD0 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* B65DD4 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* B65DD8 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* B65DDC 8024032C 00621821 */ addu $v1, $v1, $v0 -/* B65DE0 80240330 04610004 */ bgez $v1, .L80240344 -/* B65DE4 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* B65DE8 80240338 3C020002 */ lui $v0, 2 -/* B65DEC 8024033C 080900D5 */ j .L80240354 -/* B65DF0 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* B65DF4 80240344 3C040002 */ lui $a0, 2 -/* B65DF8 80240348 0083102A */ slt $v0, $a0, $v1 -/* B65DFC 8024034C 10400002 */ beqz $v0, .L80240358 -/* B65E00 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* B65E04 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* B65E08 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* B65E0C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* B65E10 80240360 00621821 */ addu $v1, $v1, $v0 -/* B65E14 80240364 04610004 */ bgez $v1, .L80240378 -/* B65E18 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* B65E1C 8024036C 3C020002 */ lui $v0, 2 -/* B65E20 80240370 080900E2 */ j .L80240388 -/* B65E24 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* B65E28 80240378 3C040002 */ lui $a0, 2 -/* B65E2C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* B65E30 80240380 10400002 */ beqz $v0, .L8024038C -/* B65E34 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* B65E38 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* B65E3C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* B65E40 80240390 8E020094 */ lw $v0, 0x94($s0) -/* B65E44 80240394 00621821 */ addu $v1, $v1, $v0 -/* B65E48 80240398 04610004 */ bgez $v1, .L802403AC -/* B65E4C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* B65E50 802403A0 3C020002 */ lui $v0, 2 -/* B65E54 802403A4 080900EF */ j .L802403BC -/* B65E58 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* B65E5C 802403AC 3C040002 */ lui $a0, 2 -/* B65E60 802403B0 0083102A */ slt $v0, $a0, $v1 -/* B65E64 802403B4 10400002 */ beqz $v0, .L802403C0 -/* B65E68 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* B65E6C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* B65E70 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* B65E74 802403C4 0C046F07 */ jal set_main_pan_u -/* B65E78 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* B65E7C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* B65E80 802403D0 0C046F0D */ jal set_main_pan_v -/* B65E84 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* B65E88 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* B65E8C 802403DC 0C046F13 */ jal set_aux_pan_u -/* B65E90 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* B65E94 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* B65E98 802403E8 0C046F19 */ jal set_aux_pan_v -/* B65E9C 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* B65EA0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* B65EA4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* B65EA8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* B65EAC 802403FC 03E00008 */ jr $ra -/* B65EB0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_80240404_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_80240404_B65AB0.s deleted file mode 100644 index 15afc78187..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_80240404_B65AB0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_B65EB4 -/* B65EB4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B65EB8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* B65EBC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* B65EC0 80240410 10A00005 */ beqz $a1, .L80240428 -/* B65EC4 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* B65EC8 80240418 AE000070 */ sw $zero, 0x70($s0) -/* B65ECC 8024041C AE000074 */ sw $zero, 0x74($s0) -/* B65ED0 80240420 AE000078 */ sw $zero, 0x78($s0) -/* B65ED4 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* B65ED8 80240428 8E020070 */ lw $v0, 0x70($s0) -/* B65EDC 8024042C 1440000E */ bnez $v0, .L80240468 -/* B65EE0 80240430 00000000 */ nop -/* B65EE4 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* B65EE8 80240438 8E020088 */ lw $v0, 0x88($s0) -/* B65EEC 8024043C 00621821 */ addu $v1, $v1, $v0 -/* B65EF0 80240440 04610004 */ bgez $v1, .L80240454 -/* B65EF4 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* B65EF8 80240448 3C020002 */ lui $v0, 2 -/* B65EFC 8024044C 08090119 */ j .L80240464 -/* B65F00 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* B65F04 80240454 3C040002 */ lui $a0, 2 -/* B65F08 80240458 0083102A */ slt $v0, $a0, $v1 -/* B65F0C 8024045C 10400002 */ beqz $v0, .L80240468 -/* B65F10 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* B65F14 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* B65F18 80240468 8E020074 */ lw $v0, 0x74($s0) -/* B65F1C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* B65F20 80240470 00000000 */ nop -/* B65F24 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* B65F28 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* B65F2C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* B65F30 80240480 04610004 */ bgez $v1, .L80240494 -/* B65F34 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* B65F38 80240488 3C020002 */ lui $v0, 2 -/* B65F3C 8024048C 08090129 */ j .L802404A4 -/* B65F40 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* B65F44 80240494 3C040002 */ lui $a0, 2 -/* B65F48 80240498 0083102A */ slt $v0, $a0, $v1 -/* B65F4C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* B65F50 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* B65F54 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* B65F58 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* B65F5C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* B65F60 802404B0 00000000 */ nop -/* B65F64 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* B65F68 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* B65F6C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* B65F70 802404C0 04610004 */ bgez $v1, .L802404D4 -/* B65F74 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* B65F78 802404C8 3C020002 */ lui $v0, 2 -/* B65F7C 802404CC 08090139 */ j .L802404E4 -/* B65F80 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* B65F84 802404D4 3C040002 */ lui $a0, 2 -/* B65F88 802404D8 0083102A */ slt $v0, $a0, $v1 -/* B65F8C 802404DC 10400002 */ beqz $v0, .L802404E8 -/* B65F90 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* B65F94 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* B65F98 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* B65F9C 802404EC 1440000E */ bnez $v0, .L80240528 -/* B65FA0 802404F0 00000000 */ nop -/* B65FA4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* B65FA8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* B65FAC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* B65FB0 80240500 04610004 */ bgez $v1, .L80240514 -/* B65FB4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* B65FB8 80240508 3C020002 */ lui $v0, 2 -/* B65FBC 8024050C 08090149 */ j .L80240524 -/* B65FC0 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* B65FC4 80240514 3C040002 */ lui $a0, 2 -/* B65FC8 80240518 0083102A */ slt $v0, $a0, $v1 -/* B65FCC 8024051C 10400002 */ beqz $v0, .L80240528 -/* B65FD0 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* B65FD4 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* B65FD8 80240528 8E040084 */ lw $a0, 0x84($s0) -/* B65FDC 8024052C 0C046F07 */ jal set_main_pan_u -/* B65FE0 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* B65FE4 80240534 8E040084 */ lw $a0, 0x84($s0) -/* B65FE8 80240538 0C046F0D */ jal set_main_pan_v -/* B65FEC 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* B65FF0 80240540 8E040084 */ lw $a0, 0x84($s0) -/* B65FF4 80240544 0C046F13 */ jal set_aux_pan_u -/* B65FF8 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* B65FFC 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* B66000 80240550 0C046F19 */ jal set_aux_pan_v -/* B66004 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* B66008 80240558 8E020070 */ lw $v0, 0x70($s0) -/* B6600C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* B66010 80240560 8E040098 */ lw $a0, 0x98($s0) -/* B66014 80240564 24420001 */ addiu $v0, $v0, 1 -/* B66018 80240568 AE020070 */ sw $v0, 0x70($s0) -/* B6601C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* B66020 80240570 24630001 */ addiu $v1, $v1, 1 -/* B66024 80240574 AE030078 */ sw $v1, 0x78($s0) -/* B66028 80240578 8E030070 */ lw $v1, 0x70($s0) -/* B6602C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* B66030 80240580 AE020074 */ sw $v0, 0x74($s0) -/* B66034 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* B66038 80240588 0064182A */ slt $v1, $v1, $a0 -/* B6603C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* B66040 80240590 14600002 */ bnez $v1, .L8024059C -/* B66044 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* B66048 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* B6604C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* B66050 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* B66054 802405A4 0043102A */ slt $v0, $v0, $v1 -/* B66058 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* B6605C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* B66060 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* B66064 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* B66068 802405B8 0043102A */ slt $v0, $v0, $v1 -/* B6606C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* B66070 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* B66074 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* B66078 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* B6607C 802405CC 0043102A */ slt $v0, $v0, $v1 -/* B66080 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* B66084 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* B66088 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* B6608C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* B66090 802405E0 0000102D */ daddu $v0, $zero, $zero -/* B66094 802405E4 03E00008 */ jr $ra -/* B66098 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6609C 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_802405F0_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_802405F0_B65AB0.s deleted file mode 100644 index ccca835477..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_802405F0_B65AB0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_B660A0 -/* B660A0 802405F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B660A4 802405F4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B660A8 802405F8 4485A000 */ mtc1 $a1, $f20 -/* B660AC 802405FC F7B60020 */ sdc1 $f22, 0x20($sp) -/* B660B0 80240600 4486B000 */ mtc1 $a2, $f22 -/* B660B4 80240604 AFB00010 */ sw $s0, 0x10($sp) -/* B660B8 80240608 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B660BC 8024060C 4487C000 */ mtc1 $a3, $f24 -/* B660C0 80240610 AFBF0014 */ sw $ra, 0x14($sp) -/* B660C4 80240614 0C019D28 */ jal guMtxIdentF -/* B660C8 80240618 0080802D */ daddu $s0, $a0, $zero -/* B660CC 8024061C 4616A582 */ mul.s $f22, $f20, $f22 -/* B660D0 80240620 00000000 */ nop -/* B660D4 80240624 4618A502 */ mul.s $f20, $f20, $f24 -/* B660D8 80240628 00000000 */ nop -/* B660DC 8024062C 3C013F80 */ lui $at, 0x3f80 -/* B660E0 80240630 44810000 */ mtc1 $at, $f0 -/* B660E4 80240634 00000000 */ nop -/* B660E8 80240638 E6000014 */ swc1 $f0, 0x14($s0) -/* B660EC 8024063C E6160010 */ swc1 $f22, 0x10($s0) -/* B660F0 80240640 E6140018 */ swc1 $f20, 0x18($s0) -/* B660F4 80240644 8FBF0014 */ lw $ra, 0x14($sp) -/* B660F8 80240648 8FB00010 */ lw $s0, 0x10($sp) -/* B660FC 8024064C D7B80028 */ ldc1 $f24, 0x28($sp) -/* B66100 80240650 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B66104 80240654 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B66108 80240658 03E00008 */ jr $ra -/* B6610C 8024065C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_80240660_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_80240660_B65AB0.s deleted file mode 100644 index 081225f4dc..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_80240660_B65AB0.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240660_B66110 -/* B66110 80240660 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B66114 80240664 AFB10054 */ sw $s1, 0x54($sp) -/* B66118 80240668 0080882D */ daddu $s1, $a0, $zero -/* B6611C 8024066C AFBF005C */ sw $ra, 0x5c($sp) -/* B66120 80240670 AFB20058 */ sw $s2, 0x58($sp) -/* B66124 80240674 AFB00050 */ sw $s0, 0x50($sp) -/* B66128 80240678 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B6612C 8024067C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B66130 80240680 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B66134 80240684 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B66138 80240688 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B6613C 8024068C 8E30000C */ lw $s0, 0xc($s1) -/* B66140 80240690 8E050000 */ lw $a1, ($s0) -/* B66144 80240694 0C0B1EAF */ jal get_variable -/* B66148 80240698 26100004 */ addiu $s0, $s0, 4 -/* B6614C 8024069C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B66150 802406A0 0040202D */ daddu $a0, $v0, $zero -/* B66154 802406A4 8E050000 */ lw $a1, ($s0) -/* B66158 802406A8 26100004 */ addiu $s0, $s0, 4 -/* B6615C 802406AC 0220202D */ daddu $a0, $s1, $zero -/* B66160 802406B0 0C0B210B */ jal get_float_variable -/* B66164 802406B4 0040902D */ daddu $s2, $v0, $zero -/* B66168 802406B8 8E050000 */ lw $a1, ($s0) -/* B6616C 802406BC 26100004 */ addiu $s0, $s0, 4 -/* B66170 802406C0 0220202D */ daddu $a0, $s1, $zero -/* B66174 802406C4 0C0B210B */ jal get_float_variable -/* B66178 802406C8 46000706 */ mov.s $f28, $f0 -/* B6617C 802406CC 8E050000 */ lw $a1, ($s0) -/* B66180 802406D0 26100004 */ addiu $s0, $s0, 4 -/* B66184 802406D4 0220202D */ daddu $a0, $s1, $zero -/* B66188 802406D8 0C0B210B */ jal get_float_variable -/* B6618C 802406DC 46000686 */ mov.s $f26, $f0 -/* B66190 802406E0 0220202D */ daddu $a0, $s1, $zero -/* B66194 802406E4 8E050000 */ lw $a1, ($s0) -/* B66198 802406E8 0C0B210B */ jal get_float_variable -/* B6619C 802406EC 46000586 */ mov.s $f22, $f0 -/* B661A0 802406F0 0240202D */ daddu $a0, $s2, $zero -/* B661A4 802406F4 0C046B4C */ jal get_model_from_list_index -/* B661A8 802406F8 46000606 */ mov.s $f24, $f0 -/* B661AC 802406FC 0040882D */ daddu $s1, $v0, $zero -/* B661B0 80240700 96220000 */ lhu $v0, ($s1) -/* B661B4 80240704 30420400 */ andi $v0, $v0, 0x400 -/* B661B8 80240708 1440001E */ bnez $v0, .L80240784 -/* B661BC 8024070C 26300058 */ addiu $s0, $s1, 0x58 -/* B661C0 80240710 4480A000 */ mtc1 $zero, $f20 -/* B661C4 80240714 4406B000 */ mfc1 $a2, $f22 -/* B661C8 80240718 4405A000 */ mfc1 $a1, $f20 -/* B661CC 8024071C 4407A000 */ mfc1 $a3, $f20 -/* B661D0 80240720 0C019E40 */ jal guTranslateF -/* B661D4 80240724 0200202D */ daddu $a0, $s0, $zero -/* B661D8 80240728 4405E000 */ mfc1 $a1, $f28 -/* B661DC 8024072C 4406D000 */ mfc1 $a2, $f26 -/* B661E0 80240730 4407C000 */ mfc1 $a3, $f24 -/* B661E4 80240734 0C09017C */ jal func_802405F0 -/* B661E8 80240738 27A40010 */ addiu $a0, $sp, 0x10 -/* B661EC 8024073C 27A40010 */ addiu $a0, $sp, 0x10 -/* B661F0 80240740 0200282D */ daddu $a1, $s0, $zero -/* B661F4 80240744 0C019D80 */ jal guMtxCatF -/* B661F8 80240748 0200302D */ daddu $a2, $s0, $zero -/* B661FC 8024074C 27A40010 */ addiu $a0, $sp, 0x10 -/* B66200 80240750 4600B587 */ neg.s $f22, $f22 -/* B66204 80240754 4405A000 */ mfc1 $a1, $f20 -/* B66208 80240758 4406B000 */ mfc1 $a2, $f22 -/* B6620C 8024075C 0C019E40 */ jal guTranslateF -/* B66210 80240760 00A0382D */ daddu $a3, $a1, $zero -/* B66214 80240764 27A40010 */ addiu $a0, $sp, 0x10 -/* B66218 80240768 0200282D */ daddu $a1, $s0, $zero -/* B6621C 8024076C 0C019D80 */ jal guMtxCatF -/* B66220 80240770 00A0302D */ daddu $a2, $a1, $zero -/* B66224 80240774 96220000 */ lhu $v0, ($s1) -/* B66228 80240778 34421400 */ ori $v0, $v0, 0x1400 -/* B6622C 8024077C 080901FF */ j .L802407FC -/* B66230 80240780 A6220000 */ sh $v0, ($s1) -.L80240784: -/* B66234 80240784 4480A000 */ mtc1 $zero, $f20 -/* B66238 80240788 4406B000 */ mfc1 $a2, $f22 -/* B6623C 8024078C 4405A000 */ mfc1 $a1, $f20 -/* B66240 80240790 4407A000 */ mfc1 $a3, $f20 -/* B66244 80240794 0C019E40 */ jal guTranslateF -/* B66248 80240798 27A40010 */ addiu $a0, $sp, 0x10 -/* B6624C 8024079C 27A40010 */ addiu $a0, $sp, 0x10 -/* B66250 802407A0 26300058 */ addiu $s0, $s1, 0x58 -/* B66254 802407A4 0200282D */ daddu $a1, $s0, $zero -/* B66258 802407A8 0C019D80 */ jal guMtxCatF -/* B6625C 802407AC 0200302D */ daddu $a2, $s0, $zero -/* B66260 802407B0 4405E000 */ mfc1 $a1, $f28 -/* B66264 802407B4 4406D000 */ mfc1 $a2, $f26 -/* B66268 802407B8 4407C000 */ mfc1 $a3, $f24 -/* B6626C 802407BC 0C09017C */ jal func_802405F0 -/* B66270 802407C0 27A40010 */ addiu $a0, $sp, 0x10 -/* B66274 802407C4 27A40010 */ addiu $a0, $sp, 0x10 -/* B66278 802407C8 0200282D */ daddu $a1, $s0, $zero -/* B6627C 802407CC 0C019D80 */ jal guMtxCatF -/* B66280 802407D0 0200302D */ daddu $a2, $s0, $zero -/* B66284 802407D4 27A40010 */ addiu $a0, $sp, 0x10 -/* B66288 802407D8 4600B587 */ neg.s $f22, $f22 -/* B6628C 802407DC 4405A000 */ mfc1 $a1, $f20 -/* B66290 802407E0 4406B000 */ mfc1 $a2, $f22 -/* B66294 802407E4 0C019E40 */ jal guTranslateF -/* B66298 802407E8 00A0382D */ daddu $a3, $a1, $zero -/* B6629C 802407EC 27A40010 */ addiu $a0, $sp, 0x10 -/* B662A0 802407F0 0200282D */ daddu $a1, $s0, $zero -/* B662A4 802407F4 0C019D80 */ jal guMtxCatF -/* B662A8 802407F8 00A0302D */ daddu $a2, $a1, $zero -.L802407FC: -/* B662AC 802407FC 8FBF005C */ lw $ra, 0x5c($sp) -/* B662B0 80240800 8FB20058 */ lw $s2, 0x58($sp) -/* B662B4 80240804 8FB10054 */ lw $s1, 0x54($sp) -/* B662B8 80240808 8FB00050 */ lw $s0, 0x50($sp) -/* B662BC 8024080C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B662C0 80240810 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B662C4 80240814 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B662C8 80240818 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B662CC 8024081C D7B40060 */ ldc1 $f20, 0x60($sp) -/* B662D0 80240820 24020002 */ addiu $v0, $zero, 2 -/* B662D4 80240824 03E00008 */ jr $ra -/* B662D8 80240828 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_8024082C_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_8024082C_B65AB0.s deleted file mode 100644 index 8cf065bd55..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_8024082C_B65AB0.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024082C_B662DC -/* B662DC 8024082C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B662E0 80240830 AFB00010 */ sw $s0, 0x10($sp) -/* B662E4 80240834 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B662E8 80240838 4485A000 */ mtc1 $a1, $f20 -/* B662EC 8024083C AFBF0014 */ sw $ra, 0x14($sp) -/* B662F0 80240840 0C019D28 */ jal guMtxIdentF -/* B662F4 80240844 0080802D */ daddu $s0, $a0, $zero -/* B662F8 80240848 3C018024 */ lui $at, 0x8024 -/* B662FC 8024084C D4206590 */ ldc1 $f0, 0x6590($at) -/* B66300 80240850 4600A521 */ cvt.d.s $f20, $f20 -/* B66304 80240854 4620A502 */ mul.d $f20, $f20, $f0 -/* B66308 80240858 00000000 */ nop -/* B6630C 8024085C 3C013F80 */ lui $at, 0x3f80 -/* B66310 80240860 44810000 */ mtc1 $at, $f0 -/* B66314 80240864 AE000018 */ sw $zero, 0x18($s0) -/* B66318 80240868 E6000014 */ swc1 $f0, 0x14($s0) -/* B6631C 8024086C 4620A520 */ cvt.s.d $f20, $f20 -/* B66320 80240870 E6140010 */ swc1 $f20, 0x10($s0) -/* B66324 80240874 8FBF0014 */ lw $ra, 0x14($sp) -/* B66328 80240878 8FB00010 */ lw $s0, 0x10($sp) -/* B6632C 8024087C D7B40018 */ ldc1 $f20, 0x18($sp) -/* B66330 80240880 03E00008 */ jr $ra -/* B66334 80240884 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_80240888_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_80240888_B65AB0.s deleted file mode 100644 index b355ed1cbc..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_80240888_B65AB0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240888_B66338 -/* B66338 80240888 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B6633C 8024088C AFB10054 */ sw $s1, 0x54($sp) -/* B66340 80240890 0080882D */ daddu $s1, $a0, $zero -/* B66344 80240894 AFBF0058 */ sw $ra, 0x58($sp) -/* B66348 80240898 AFB00050 */ sw $s0, 0x50($sp) -/* B6634C 8024089C F7B40060 */ sdc1 $f20, 0x60($sp) -/* B66350 802408A0 8E30000C */ lw $s0, 0xc($s1) -/* B66354 802408A4 8E050000 */ lw $a1, ($s0) -/* B66358 802408A8 0C0B1EAF */ jal get_variable -/* B6635C 802408AC 26100004 */ addiu $s0, $s0, 4 -/* B66360 802408B0 0C046C04 */ jal get_model_list_index_from_tree_index -/* B66364 802408B4 0040202D */ daddu $a0, $v0, $zero -/* B66368 802408B8 0220202D */ daddu $a0, $s1, $zero -/* B6636C 802408BC 8E050000 */ lw $a1, ($s0) -/* B66370 802408C0 0C0B210B */ jal get_float_variable -/* B66374 802408C4 0040802D */ daddu $s0, $v0, $zero -/* B66378 802408C8 0200202D */ daddu $a0, $s0, $zero -/* B6637C 802408CC 0C046B4C */ jal get_model_from_list_index -/* B66380 802408D0 46000506 */ mov.s $f20, $f0 -/* B66384 802408D4 0040802D */ daddu $s0, $v0, $zero -/* B66388 802408D8 96020000 */ lhu $v0, ($s0) -/* B6638C 802408DC 30420400 */ andi $v0, $v0, 0x400 -/* B66390 802408E0 14400008 */ bnez $v0, .L80240904 -/* B66394 802408E4 00000000 */ nop -/* B66398 802408E8 4405A000 */ mfc1 $a1, $f20 -/* B6639C 802408EC 0C09020B */ jal func_8024082C -/* B663A0 802408F0 26040058 */ addiu $a0, $s0, 0x58 -/* B663A4 802408F4 96020000 */ lhu $v0, ($s0) -/* B663A8 802408F8 34421400 */ ori $v0, $v0, 0x1400 -/* B663AC 802408FC 08090248 */ j .L80240920 -/* B663B0 80240900 A6020000 */ sh $v0, ($s0) -.L80240904: -/* B663B4 80240904 4405A000 */ mfc1 $a1, $f20 -/* B663B8 80240908 0C09020B */ jal func_8024082C -/* B663BC 8024090C 27A40010 */ addiu $a0, $sp, 0x10 -/* B663C0 80240910 27A40010 */ addiu $a0, $sp, 0x10 -/* B663C4 80240914 26050058 */ addiu $a1, $s0, 0x58 -/* B663C8 80240918 0C019D80 */ jal guMtxCatF -/* B663CC 8024091C 00A0302D */ daddu $a2, $a1, $zero -.L80240920: -/* B663D0 80240920 8FBF0058 */ lw $ra, 0x58($sp) -/* B663D4 80240924 8FB10054 */ lw $s1, 0x54($sp) -/* B663D8 80240928 8FB00050 */ lw $s0, 0x50($sp) -/* B663DC 8024092C D7B40060 */ ldc1 $f20, 0x60($sp) -/* B663E0 80240930 24020002 */ addiu $v0, $zero, 2 -/* B663E4 80240934 03E00008 */ jr $ra -/* B663E8 80240938 27BD0068 */ addiu $sp, $sp, 0x68 -/* B663EC 8024093C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_80240940_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_80240940_B65AB0.s deleted file mode 100644 index cbb606d9a5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_80240940_B65AB0.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240940_B663F0 -/* B663F0 80240940 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B663F4 80240944 AFB10014 */ sw $s1, 0x14($sp) -/* B663F8 80240948 0080882D */ daddu $s1, $a0, $zero -/* B663FC 8024094C AFBF0018 */ sw $ra, 0x18($sp) -/* B66400 80240950 AFB00010 */ sw $s0, 0x10($sp) -/* B66404 80240954 8E300148 */ lw $s0, 0x148($s1) -/* B66408 80240958 0C00EABB */ jal get_npc_unsafe -/* B6640C 8024095C 86040008 */ lh $a0, 8($s0) -/* B66410 80240960 3C054387 */ lui $a1, 0x4387 -/* B66414 80240964 0040202D */ daddu $a0, $v0, $zero -/* B66418 80240968 0C00ECD0 */ jal set_npc_yaw -/* B6641C 8024096C A480008E */ sh $zero, 0x8e($a0) -/* B66420 80240970 24020003 */ addiu $v0, $zero, 3 -/* B66424 80240974 AE00006C */ sw $zero, 0x6c($s0) -/* B66428 80240978 AE220070 */ sw $v0, 0x70($s1) -/* B6642C 8024097C 8FBF0018 */ lw $ra, 0x18($sp) -/* B66430 80240980 8FB10014 */ lw $s1, 0x14($sp) -/* B66434 80240984 8FB00010 */ lw $s0, 0x10($sp) -/* B66438 80240988 03E00008 */ jr $ra -/* B6643C 8024098C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_80240990_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_80240990_B65AB0.s deleted file mode 100644 index 428bc2acf7..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_80240990_B65AB0.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240990_B66440 -/* B66440 80240990 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B66444 80240994 AFB20028 */ sw $s2, 0x28($sp) -/* B66448 80240998 0080902D */ daddu $s2, $a0, $zero -/* B6644C 8024099C AFBF002C */ sw $ra, 0x2c($sp) -/* B66450 802409A0 AFB10024 */ sw $s1, 0x24($sp) -/* B66454 802409A4 AFB00020 */ sw $s0, 0x20($sp) -/* B66458 802409A8 8E500148 */ lw $s0, 0x148($s2) -/* B6645C 802409AC 0C00EABB */ jal get_npc_unsafe -/* B66460 802409B0 86040008 */ lh $a0, 8($s0) -/* B66464 802409B4 8E03006C */ lw $v1, 0x6c($s0) -/* B66468 802409B8 1460000B */ bnez $v1, .L802409E8 -/* B6646C 802409BC 0040882D */ daddu $s1, $v0, $zero -/* B66470 802409C0 0C00A67F */ jal rand_int -/* B66474 802409C4 24040064 */ addiu $a0, $zero, 0x64 -/* B66478 802409C8 28420032 */ slti $v0, $v0, 0x32 -/* B6647C 802409CC 14400002 */ bnez $v0, .L802409D8 -/* B66480 802409D0 24020001 */ addiu $v0, $zero, 1 -/* B66484 802409D4 24020003 */ addiu $v0, $zero, 3 -.L802409D8: -/* B66488 802409D8 AE02006C */ sw $v0, 0x6c($s0) -/* B6648C 802409DC 3C054387 */ lui $a1, 0x4387 -/* B66490 802409E0 0C00ECD0 */ jal set_npc_yaw -/* B66494 802409E4 0220202D */ daddu $a0, $s1, $zero -.L802409E8: -/* B66498 802409E8 8E02006C */ lw $v0, 0x6c($s0) -/* B6649C 802409EC 2443FFFF */ addiu $v1, $v0, -1 -/* B664A0 802409F0 2C620006 */ sltiu $v0, $v1, 6 -/* B664A4 802409F4 1040004D */ beqz $v0, .L80240B2C -/* B664A8 802409F8 00031080 */ sll $v0, $v1, 2 -/* B664AC 802409FC 3C018024 */ lui $at, 0x8024 -/* B664B0 80240A00 00220821 */ addu $at, $at, $v0 -/* B664B4 80240A04 8C2265A0 */ lw $v0, 0x65a0($at) -/* B664B8 80240A08 00400008 */ jr $v0 -/* B664BC 80240A0C 00000000 */ nop -/* B664C0 80240A10 3C030042 */ lui $v1, 0x42 -/* B664C4 80240A14 3463000F */ ori $v1, $v1, 0xf -/* B664C8 80240A18 24020002 */ addiu $v0, $zero, 2 -/* B664CC 80240A1C AE02006C */ sw $v0, 0x6c($s0) -/* B664D0 80240A20 AE000070 */ sw $zero, 0x70($s0) -/* B664D4 80240A24 AE230028 */ sw $v1, 0x28($s1) -/* B664D8 80240A28 8E020070 */ lw $v0, 0x70($s0) -/* B664DC 80240A2C 24420001 */ addiu $v0, $v0, 1 -/* B664E0 80240A30 AE020070 */ sw $v0, 0x70($s0) -/* B664E4 80240A34 28420033 */ slti $v0, $v0, 0x33 -/* B664E8 80240A38 1440003C */ bnez $v0, .L80240B2C -/* B664EC 80240A3C 24020005 */ addiu $v0, $zero, 5 -/* B664F0 80240A40 080902CB */ j .L80240B2C -/* B664F4 80240A44 AE02006C */ sw $v0, 0x6c($s0) -/* B664F8 80240A48 3C030042 */ lui $v1, 0x42 -/* B664FC 80240A4C 34630010 */ ori $v1, $v1, 0x10 -/* B66500 80240A50 24020004 */ addiu $v0, $zero, 4 -/* B66504 80240A54 AE02006C */ sw $v0, 0x6c($s0) -/* B66508 80240A58 AE000070 */ sw $zero, 0x70($s0) -/* B6650C 80240A5C AE230028 */ sw $v1, 0x28($s1) -/* B66510 80240A60 8E020070 */ lw $v0, 0x70($s0) -/* B66514 80240A64 24030019 */ addiu $v1, $zero, 0x19 -/* B66518 80240A68 24420001 */ addiu $v0, $v0, 1 -/* B6651C 80240A6C 14430005 */ bne $v0, $v1, .L80240A84 -/* B66520 80240A70 AE020070 */ sw $v0, 0x70($s0) -/* B66524 80240A74 3C0142B4 */ lui $at, 0x42b4 -/* B66528 80240A78 44810000 */ mtc1 $at, $f0 -/* B6652C 80240A7C 00000000 */ nop -/* B66530 80240A80 E620000C */ swc1 $f0, 0xc($s1) -.L80240A84: -/* B66534 80240A84 8E020070 */ lw $v0, 0x70($s0) -/* B66538 80240A88 2842003D */ slti $v0, $v0, 0x3d -/* B6653C 80240A8C 14400027 */ bnez $v0, .L80240B2C -/* B66540 80240A90 24020005 */ addiu $v0, $zero, 5 -/* B66544 80240A94 080902CB */ j .L80240B2C -/* B66548 80240A98 AE02006C */ sw $v0, 0x6c($s0) -/* B6654C 80240A9C 3C030042 */ lui $v1, 0x42 -/* B66550 80240AA0 24020006 */ addiu $v0, $zero, 6 -/* B66554 80240AA4 34630003 */ ori $v1, $v1, 3 -/* B66558 80240AA8 AE02006C */ sw $v0, 0x6c($s0) -/* B6655C 80240AAC AE000070 */ sw $zero, 0x70($s0) -/* B66560 80240AB0 862400A8 */ lh $a0, 0xa8($s1) -/* B66564 80240AB4 2402000A */ addiu $v0, $zero, 0xa -/* B66568 80240AB8 AE230028 */ sw $v1, 0x28($s1) -/* B6656C 80240ABC AFA00014 */ sw $zero, 0x14($sp) -/* B66570 80240AC0 AFA20018 */ sw $v0, 0x18($sp) -/* B66574 80240AC4 44840000 */ mtc1 $a0, $f0 -/* B66578 80240AC8 00000000 */ nop -/* B6657C 80240ACC 46800020 */ cvt.s.w $f0, $f0 -/* B66580 80240AD0 E7A00010 */ swc1 $f0, 0x10($sp) -/* B66584 80240AD4 8E250038 */ lw $a1, 0x38($s1) -/* B66588 80240AD8 8E26003C */ lw $a2, 0x3c($s1) -/* B6658C 80240ADC 8E270040 */ lw $a3, 0x40($s1) -/* B66590 80240AE0 0C01C1E4 */ jal fx_sweat -/* B66594 80240AE4 0000202D */ daddu $a0, $zero, $zero -/* B66598 80240AE8 8E020070 */ lw $v0, 0x70($s0) -/* B6659C 80240AEC 24420001 */ addiu $v0, $v0, 1 -/* B665A0 80240AF0 AE020070 */ sw $v0, 0x70($s0) -/* B665A4 80240AF4 2842000B */ slti $v0, $v0, 0xb -/* B665A8 80240AF8 1440000C */ bnez $v0, .L80240B2C -/* B665AC 80240AFC 00000000 */ nop -/* B665B0 80240B00 0C00A67F */ jal rand_int -/* B665B4 80240B04 24040064 */ addiu $a0, $zero, 0x64 -/* B665B8 80240B08 0040182D */ daddu $v1, $v0, $zero -/* B665BC 80240B0C 2862005A */ slti $v0, $v1, 0x5a -/* B665C0 80240B10 14400005 */ bnez $v0, .L80240B28 -/* B665C4 80240B14 24020007 */ addiu $v0, $zero, 7 -/* B665C8 80240B18 2862005F */ slti $v0, $v1, 0x5f -/* B665CC 80240B1C 14400002 */ bnez $v0, .L80240B28 -/* B665D0 80240B20 24020001 */ addiu $v0, $zero, 1 -/* B665D4 80240B24 24020003 */ addiu $v0, $zero, 3 -.L80240B28: -/* B665D8 80240B28 AE02006C */ sw $v0, 0x6c($s0) -.L80240B2C: -/* B665DC 80240B2C 8E03006C */ lw $v1, 0x6c($s0) -/* B665E0 80240B30 24020007 */ addiu $v0, $zero, 7 -/* B665E4 80240B34 50620001 */ beql $v1, $v0, .L80240B3C -/* B665E8 80240B38 AE400070 */ sw $zero, 0x70($s2) -.L80240B3C: -/* B665EC 80240B3C 8FBF002C */ lw $ra, 0x2c($sp) -/* B665F0 80240B40 8FB20028 */ lw $s2, 0x28($sp) -/* B665F4 80240B44 8FB10024 */ lw $s1, 0x24($sp) -/* B665F8 80240B48 8FB00020 */ lw $s0, 0x20($sp) -/* B665FC 80240B4C 03E00008 */ jr $ra -/* B66600 80240B50 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_80240B54_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_80240B54_B65AB0.s deleted file mode 100644 index 37908a611b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_80240B54_B65AB0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B54_B66604 -/* B66604 80240B54 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B66608 80240B58 AFB10014 */ sw $s1, 0x14($sp) -/* B6660C 80240B5C 0080882D */ daddu $s1, $a0, $zero -/* B66610 80240B60 AFBF0018 */ sw $ra, 0x18($sp) -/* B66614 80240B64 AFB00010 */ sw $s0, 0x10($sp) -/* B66618 80240B68 8E300148 */ lw $s0, 0x148($s1) -/* B6661C 80240B6C 0C00EABB */ jal get_npc_unsafe -/* B66620 80240B70 86040008 */ lh $a0, 8($s0) -/* B66624 80240B74 24030001 */ addiu $v1, $zero, 1 -/* B66628 80240B78 0040202D */ daddu $a0, $v0, $zero -/* B6662C 80240B7C AE03006C */ sw $v1, 0x6c($s0) -/* B66630 80240B80 8482008C */ lh $v0, 0x8c($a0) -/* B66634 80240B84 14400009 */ bnez $v0, .L80240BAC -/* B66638 80240B88 24020002 */ addiu $v0, $zero, 2 -/* B6663C 80240B8C 96030072 */ lhu $v1, 0x72($s0) -/* B66640 80240B90 AE02006C */ sw $v0, 0x6c($s0) -/* B66644 80240B94 A483008E */ sh $v1, 0x8e($a0) -/* B66648 80240B98 8E0200CC */ lw $v0, 0xcc($s0) -/* B6664C 80240B9C 8C420020 */ lw $v0, 0x20($v0) -/* B66650 80240BA0 AC820028 */ sw $v0, 0x28($a0) -/* B66654 80240BA4 2402001F */ addiu $v0, $zero, 0x1f -/* B66658 80240BA8 AE220070 */ sw $v0, 0x70($s1) -.L80240BAC: -/* B6665C 80240BAC 8FBF0018 */ lw $ra, 0x18($sp) -/* B66660 80240BB0 8FB10014 */ lw $s1, 0x14($sp) -/* B66664 80240BB4 8FB00010 */ lw $s0, 0x10($sp) -/* B66668 80240BB8 03E00008 */ jr $ra -/* B6666C 80240BBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_80240BC0_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_80240BC0_B65AB0.s deleted file mode 100644 index 162bde7b22..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_80240BC0_B65AB0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BC0_B66670 -/* B66670 80240BC0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B66674 80240BC4 AFB10014 */ sw $s1, 0x14($sp) -/* B66678 80240BC8 0080882D */ daddu $s1, $a0, $zero -/* B6667C 80240BCC AFBF0018 */ sw $ra, 0x18($sp) -/* B66680 80240BD0 AFB00010 */ sw $s0, 0x10($sp) -/* B66684 80240BD4 8E300148 */ lw $s0, 0x148($s1) -/* B66688 80240BD8 0C00EABB */ jal get_npc_unsafe -/* B6668C 80240BDC 86040008 */ lh $a0, 8($s0) -/* B66690 80240BE0 0040202D */ daddu $a0, $v0, $zero -/* B66694 80240BE4 9482008E */ lhu $v0, 0x8e($a0) -/* B66698 80240BE8 2442FFFF */ addiu $v0, $v0, -1 -/* B6669C 80240BEC A482008E */ sh $v0, 0x8e($a0) -/* B666A0 80240BF0 00021400 */ sll $v0, $v0, 0x10 -/* B666A4 80240BF4 1C400009 */ bgtz $v0, .L80240C1C -/* B666A8 80240BF8 24020003 */ addiu $v0, $zero, 3 -/* B666AC 80240BFC 96030076 */ lhu $v1, 0x76($s0) -/* B666B0 80240C00 AE02006C */ sw $v0, 0x6c($s0) -/* B666B4 80240C04 A483008E */ sh $v1, 0x8e($a0) -/* B666B8 80240C08 8E0200CC */ lw $v0, 0xcc($s0) -/* B666BC 80240C0C 8C420024 */ lw $v0, 0x24($v0) -/* B666C0 80240C10 AC820028 */ sw $v0, 0x28($a0) -/* B666C4 80240C14 24020020 */ addiu $v0, $zero, 0x20 -/* B666C8 80240C18 AE220070 */ sw $v0, 0x70($s1) -.L80240C1C: -/* B666CC 80240C1C 8FBF0018 */ lw $ra, 0x18($sp) -/* B666D0 80240C20 8FB10014 */ lw $s1, 0x14($sp) -/* B666D4 80240C24 8FB00010 */ lw $s0, 0x10($sp) -/* B666D8 80240C28 03E00008 */ jr $ra -/* B666DC 80240C2C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_80240D08_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_80240D08_B65AB0.s deleted file mode 100644 index fdfdb00000..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_80240D08_B65AB0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D08_B667B8 -/* B667B8 80240D08 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B667BC 80240D0C AFB10014 */ sw $s1, 0x14($sp) -/* B667C0 80240D10 0080882D */ daddu $s1, $a0, $zero -/* B667C4 80240D14 AFBF0018 */ sw $ra, 0x18($sp) -/* B667C8 80240D18 AFB00010 */ sw $s0, 0x10($sp) -/* B667CC 80240D1C 8E300148 */ lw $s0, 0x148($s1) -/* B667D0 80240D20 0C00EABB */ jal get_npc_unsafe -/* B667D4 80240D24 86040008 */ lh $a0, 8($s0) -/* B667D8 80240D28 9443008E */ lhu $v1, 0x8e($v0) -/* B667DC 80240D2C 2463FFFF */ addiu $v1, $v1, -1 -/* B667E0 80240D30 A443008E */ sh $v1, 0x8e($v0) -/* B667E4 80240D34 00031C00 */ sll $v1, $v1, 0x10 -/* B667E8 80240D38 1C600003 */ bgtz $v1, .L80240D48 -/* B667EC 80240D3C 2402000C */ addiu $v0, $zero, 0xc -/* B667F0 80240D40 AE00006C */ sw $zero, 0x6c($s0) -/* B667F4 80240D44 AE220070 */ sw $v0, 0x70($s1) -.L80240D48: -/* B667F8 80240D48 8FBF0018 */ lw $ra, 0x18($sp) -/* B667FC 80240D4C 8FB10014 */ lw $s1, 0x14($sp) -/* B66800 80240D50 8FB00010 */ lw $s0, 0x10($sp) -/* B66804 80240D54 03E00008 */ jr $ra -/* B66808 80240D58 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_80240D5C_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_80240D5C_B65AB0.s deleted file mode 100644 index 4843fc2db6..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_80240D5C_B65AB0.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D5C_B6680C -/* B6680C 80240D5C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B66810 80240D60 AFBF0024 */ sw $ra, 0x24($sp) -/* B66814 80240D64 AFB40020 */ sw $s4, 0x20($sp) -/* B66818 80240D68 AFB3001C */ sw $s3, 0x1c($sp) -/* B6681C 80240D6C AFB20018 */ sw $s2, 0x18($sp) -/* B66820 80240D70 AFB10014 */ sw $s1, 0x14($sp) -/* B66824 80240D74 AFB00010 */ sw $s0, 0x10($sp) -/* B66828 80240D78 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B6682C 80240D7C 8C900148 */ lw $s0, 0x148($a0) -/* B66830 80240D80 86040008 */ lh $a0, 8($s0) -/* B66834 80240D84 0C00EABB */ jal get_npc_unsafe -/* B66838 80240D88 24110001 */ addiu $s1, $zero, 1 -/* B6683C 80240D8C 86040008 */ lh $a0, 8($s0) -/* B66840 80240D90 0040802D */ daddu $s0, $v0, $zero -/* B66844 80240D94 3C05800B */ lui $a1, %hi(gCameras) -/* B66848 80240D98 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* B6684C 80240D9C 3C03800A */ lui $v1, 0x800a -/* B66850 80240DA0 8463A634 */ lh $v1, -0x59cc($v1) -/* B66854 80240DA4 00912021 */ addu $a0, $a0, $s1 -/* B66858 80240DA8 00031080 */ sll $v0, $v1, 2 -/* B6685C 80240DAC 00431021 */ addu $v0, $v0, $v1 -/* B66860 80240DB0 00021080 */ sll $v0, $v0, 2 -/* B66864 80240DB4 00431023 */ subu $v0, $v0, $v1 -/* B66868 80240DB8 000218C0 */ sll $v1, $v0, 3 -/* B6686C 80240DBC 00431021 */ addu $v0, $v0, $v1 -/* B66870 80240DC0 000210C0 */ sll $v0, $v0, 3 -/* B66874 80240DC4 0C00FB3A */ jal get_enemy -/* B66878 80240DC8 00459021 */ addu $s2, $v0, $a1 -/* B6687C 80240DCC 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* B66880 80240DD0 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* B66884 80240DD4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B66888 80240DD8 8E830000 */ lw $v1, ($s4) -/* B6688C 80240DDC C60E0040 */ lwc1 $f14, 0x40($s0) -/* B66890 80240DE0 8C660028 */ lw $a2, 0x28($v1) -/* B66894 80240DE4 8C670030 */ lw $a3, 0x30($v1) -/* B66898 80240DE8 0C00A7B5 */ jal dist2D -/* B6689C 80240DEC 0040982D */ daddu $s3, $v0, $zero -/* B668A0 80240DF0 C6620074 */ lwc1 $f2, 0x74($s3) -/* B668A4 80240DF4 468010A0 */ cvt.s.w $f2, $f2 -/* B668A8 80240DF8 4600103C */ c.lt.s $f2, $f0 -/* B668AC 80240DFC 00000000 */ nop -/* B668B0 80240E00 45030001 */ bc1tl .L80240E08 -/* B668B4 80240E04 0000882D */ daddu $s1, $zero, $zero -.L80240E08: -/* B668B8 80240E08 C64C006C */ lwc1 $f12, 0x6c($s2) -/* B668BC 80240E0C C60E000C */ lwc1 $f14, 0xc($s0) -/* B668C0 80240E10 3C014387 */ lui $at, 0x4387 -/* B668C4 80240E14 4481A000 */ mtc1 $at, $f20 -/* B668C8 80240E18 0C00A70A */ jal get_clamped_angle_diff -/* B668CC 80240E1C 00000000 */ nop -/* B668D0 80240E20 0C00A6C9 */ jal clamp_angle -/* B668D4 80240E24 46000306 */ mov.s $f12, $f0 -/* B668D8 80240E28 3C018024 */ lui $at, 0x8024 -/* B668DC 80240E2C D42265B8 */ ldc1 $f2, 0x65b8($at) -/* B668E0 80240E30 46000021 */ cvt.d.s $f0, $f0 -/* B668E4 80240E34 4622003C */ c.lt.d $f0, $f2 -/* B668E8 80240E38 00000000 */ nop -/* B668EC 80240E3C 45000003 */ bc1f .L80240E4C -/* B668F0 80240E40 00000000 */ nop -/* B668F4 80240E44 3C0142B4 */ lui $at, 0x42b4 -/* B668F8 80240E48 4481A000 */ mtc1 $at, $f20 -.L80240E4C: -/* B668FC 80240E4C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B66900 80240E50 8E820000 */ lw $v0, ($s4) -/* B66904 80240E54 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B66908 80240E58 8C460028 */ lw $a2, 0x28($v0) -/* B6690C 80240E5C 0C00A720 */ jal atan2 -/* B66910 80240E60 8C470030 */ lw $a3, 0x30($v0) -/* B66914 80240E64 4600A306 */ mov.s $f12, $f20 -/* B66918 80240E68 0C00A70A */ jal get_clamped_angle_diff -/* B6691C 80240E6C 46000386 */ mov.s $f14, $f0 -/* B66920 80240E70 C6620078 */ lwc1 $f2, 0x78($s3) -/* B66924 80240E74 468010A0 */ cvt.s.w $f2, $f2 -/* B66928 80240E78 46000005 */ abs.s $f0, $f0 -/* B6692C 80240E7C 4600103C */ c.lt.s $f2, $f0 -/* B66930 80240E80 00000000 */ nop -/* B66934 80240E84 45030001 */ bc1tl .L80240E8C -/* B66938 80240E88 0000882D */ daddu $s1, $zero, $zero -.L80240E8C: -/* B6693C 80240E8C 8E820000 */ lw $v0, ($s4) -/* B66940 80240E90 C600003C */ lwc1 $f0, 0x3c($s0) -/* B66944 80240E94 C442002C */ lwc1 $f2, 0x2c($v0) -/* B66948 80240E98 860200A8 */ lh $v0, 0xa8($s0) -/* B6694C 80240E9C 46020001 */ sub.s $f0, $f0, $f2 -/* B66950 80240EA0 44821000 */ mtc1 $v0, $f2 -/* B66954 80240EA4 00000000 */ nop -/* B66958 80240EA8 468010A1 */ cvt.d.w $f2, $f2 -/* B6695C 80240EAC 46221080 */ add.d $f2, $f2, $f2 -/* B66960 80240EB0 46000005 */ abs.s $f0, $f0 -/* B66964 80240EB4 46000021 */ cvt.d.s $f0, $f0 -/* B66968 80240EB8 4620103E */ c.le.d $f2, $f0 -/* B6696C 80240EBC 00000000 */ nop -/* B66970 80240EC0 45030001 */ bc1tl .L80240EC8 -/* B66974 80240EC4 0000882D */ daddu $s1, $zero, $zero -.L80240EC8: -/* B66978 80240EC8 3C038011 */ lui $v1, 0x8011 -/* B6697C 80240ECC 8063EBB3 */ lb $v1, -0x144d($v1) -/* B66980 80240ED0 24020009 */ addiu $v0, $zero, 9 -/* B66984 80240ED4 50620001 */ beql $v1, $v0, .L80240EDC -/* B66988 80240ED8 0000882D */ daddu $s1, $zero, $zero -.L80240EDC: -/* B6698C 80240EDC 24020007 */ addiu $v0, $zero, 7 -/* B66990 80240EE0 50620001 */ beql $v1, $v0, .L80240EE8 -/* B66994 80240EE4 0000882D */ daddu $s1, $zero, $zero -.L80240EE8: -/* B66998 80240EE8 0220102D */ daddu $v0, $s1, $zero -/* B6699C 80240EEC 8FBF0024 */ lw $ra, 0x24($sp) -/* B669A0 80240EF0 8FB40020 */ lw $s4, 0x20($sp) -/* B669A4 80240EF4 8FB3001C */ lw $s3, 0x1c($sp) -/* B669A8 80240EF8 8FB20018 */ lw $s2, 0x18($sp) -/* B669AC 80240EFC 8FB10014 */ lw $s1, 0x14($sp) -/* B669B0 80240F00 8FB00010 */ lw $s0, 0x10($sp) -/* B669B4 80240F04 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B669B8 80240F08 03E00008 */ jr $ra -/* B669BC 80240F0C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_80240F10_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_80240F10_B65AB0.s deleted file mode 100644 index 61ad28525f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_80240F10_B65AB0.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F10_B669C0 -/* B669C0 80240F10 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B669C4 80240F14 AFB40028 */ sw $s4, 0x28($sp) -/* B669C8 80240F18 0080A02D */ daddu $s4, $a0, $zero -/* B669CC 80240F1C AFBF002C */ sw $ra, 0x2c($sp) -/* B669D0 80240F20 AFB30024 */ sw $s3, 0x24($sp) -/* B669D4 80240F24 AFB20020 */ sw $s2, 0x20($sp) -/* B669D8 80240F28 AFB1001C */ sw $s1, 0x1c($sp) -/* B669DC 80240F2C AFB00018 */ sw $s0, 0x18($sp) -/* B669E0 80240F30 8E910148 */ lw $s1, 0x148($s4) -/* B669E4 80240F34 86240008 */ lh $a0, 8($s1) -/* B669E8 80240F38 0C00EABB */ jal get_npc_unsafe -/* B669EC 80240F3C 00A0802D */ daddu $s0, $a1, $zero -/* B669F0 80240F40 16000005 */ bnez $s0, .L80240F58 -/* B669F4 80240F44 0040902D */ daddu $s2, $v0, $zero -/* B669F8 80240F48 8E2200B0 */ lw $v0, 0xb0($s1) -/* B669FC 80240F4C 30420004 */ andi $v0, $v0, 4 -/* B66A00 80240F50 10400015 */ beqz $v0, .L80240FA8 -/* B66A04 80240F54 00000000 */ nop -.L80240F58: -/* B66A08 80240F58 AE800070 */ sw $zero, 0x70($s4) -/* B66A0C 80240F5C 8E420000 */ lw $v0, ($s2) -/* B66A10 80240F60 3C031F30 */ lui $v1, 0x1f30 -/* B66A14 80240F64 A640008E */ sh $zero, 0x8e($s2) -/* B66A18 80240F68 34420102 */ ori $v0, $v0, 0x102 -/* B66A1C 80240F6C AE420000 */ sw $v0, ($s2) -/* B66A20 80240F70 8E220000 */ lw $v0, ($s1) -/* B66A24 80240F74 3C01C47A */ lui $at, 0xc47a -/* B66A28 80240F78 44810000 */ mtc1 $at, $f0 -/* B66A2C 80240F7C 00431025 */ or $v0, $v0, $v1 -/* B66A30 80240F80 AE220000 */ sw $v0, ($s1) -/* B66A34 80240F84 AE400038 */ sw $zero, 0x38($s2) -/* B66A38 80240F88 E640003C */ swc1 $f0, 0x3c($s2) -/* B66A3C 80240F8C AE400040 */ sw $zero, 0x40($s2) -/* B66A40 80240F90 8E2300B0 */ lw $v1, 0xb0($s1) -/* B66A44 80240F94 30620004 */ andi $v0, $v1, 4 -/* B66A48 80240F98 10400003 */ beqz $v0, .L80240FA8 -/* B66A4C 80240F9C 2402FFFB */ addiu $v0, $zero, -5 -/* B66A50 80240FA0 00621024 */ and $v0, $v1, $v0 -/* B66A54 80240FA4 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240FA8: -/* B66A58 80240FA8 8E930070 */ lw $s3, 0x70($s4) -/* B66A5C 80240FAC 12600005 */ beqz $s3, .L80240FC4 -/* B66A60 80240FB0 24020001 */ addiu $v0, $zero, 1 -/* B66A64 80240FB4 12620048 */ beq $s3, $v0, .L802410D8 -/* B66A68 80240FB8 00000000 */ nop -/* B66A6C 80240FBC 08090453 */ j .L8024114C -/* B66A70 80240FC0 00000000 */ nop -.L80240FC4: -/* B66A74 80240FC4 86240008 */ lh $a0, 8($s1) -/* B66A78 80240FC8 0C00FB3A */ jal get_enemy -/* B66A7C 80240FCC 2484FFFF */ addiu $a0, $a0, -1 -/* B66A80 80240FD0 0040802D */ daddu $s0, $v0, $zero -/* B66A84 80240FD4 0C00EABB */ jal get_npc_unsafe -/* B66A88 80240FD8 86040008 */ lh $a0, 8($s0) -/* B66A8C 80240FDC 24030001 */ addiu $v1, $zero, 1 -/* B66A90 80240FE0 0040982D */ daddu $s3, $v0, $zero -/* B66A94 80240FE4 A2230007 */ sb $v1, 7($s1) -/* B66A98 80240FE8 8E03006C */ lw $v1, 0x6c($s0) -/* B66A9C 80240FEC 24020003 */ addiu $v0, $zero, 3 -/* B66AA0 80240FF0 14620056 */ bne $v1, $v0, .L8024114C -/* B66AA4 80240FF4 00000000 */ nop -/* B66AA8 80240FF8 8E2500A8 */ lw $a1, 0xa8($s1) -/* B66AAC 80240FFC 10A00003 */ beqz $a1, .L8024100C -/* B66AB0 80241000 0260202D */ daddu $a0, $s3, $zero -/* B66AB4 80241004 0C012530 */ jal func_800494C0 -/* B66AB8 80241008 0000302D */ daddu $a2, $zero, $zero -.L8024100C: -/* B66ABC 8024100C 27A40010 */ addiu $a0, $sp, 0x10 -/* B66AC0 80241010 C6280070 */ lwc1 $f8, 0x70($s1) -/* B66AC4 80241014 46804220 */ cvt.s.w $f8, $f8 -/* B66AC8 80241018 C6620034 */ lwc1 $f2, 0x34($s3) -/* B66ACC 8024101C 3C014387 */ lui $at, 0x4387 -/* B66AD0 80241020 44810000 */ mtc1 $at, $f0 -/* B66AD4 80241024 44064000 */ mfc1 $a2, $f8 -/* B66AD8 80241028 46020001 */ sub.s $f0, $f0, $f2 -/* B66ADC 8024102C C6660038 */ lwc1 $f6, 0x38($s3) -/* B66AE0 80241030 C6640040 */ lwc1 $f4, 0x40($s3) -/* B66AE4 80241034 44070000 */ mfc1 $a3, $f0 -/* B66AE8 80241038 27A50014 */ addiu $a1, $sp, 0x14 -/* B66AEC 8024103C E7A60010 */ swc1 $f6, 0x10($sp) -/* B66AF0 80241040 0C00A7E7 */ jal add_vec2D_polar -/* B66AF4 80241044 E7A40014 */ swc1 $f4, 0x14($sp) -/* B66AF8 80241048 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B66AFC 8024104C 4600020D */ trunc.w.s $f8, $f0 -/* B66B00 80241050 44024000 */ mfc1 $v0, $f8 -/* B66B04 80241054 E6400038 */ swc1 $f0, 0x38($s2) -/* B66B08 80241058 A6220010 */ sh $v0, 0x10($s1) -/* B66B0C 8024105C C660003C */ lwc1 $f0, 0x3c($s3) -/* B66B10 80241060 C622006C */ lwc1 $f2, 0x6c($s1) -/* B66B14 80241064 468010A0 */ cvt.s.w $f2, $f2 -/* B66B18 80241068 46020000 */ add.s $f0, $f0, $f2 -/* B66B1C 8024106C 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* B66B20 80241070 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* B66B24 80241074 E640003C */ swc1 $f0, 0x3c($s2) -/* B66B28 80241078 C7A20014 */ lwc1 $f2, 0x14($sp) -/* B66B2C 8024107C 4600020D */ trunc.w.s $f8, $f0 -/* B66B30 80241080 44024000 */ mfc1 $v0, $f8 -/* B66B34 80241084 00000000 */ nop -/* B66B38 80241088 A6220012 */ sh $v0, 0x12($s1) -/* B66B3C 8024108C 4600120D */ trunc.w.s $f8, $f2 -/* B66B40 80241090 44024000 */ mfc1 $v0, $f8 -/* B66B44 80241094 E6420040 */ swc1 $f2, 0x40($s2) -/* B66B48 80241098 A6220014 */ sh $v0, 0x14($s1) -/* B66B4C 8024109C 8C660028 */ lw $a2, 0x28($v1) -/* B66B50 802410A0 8C670030 */ lw $a3, 0x30($v1) -/* B66B54 802410A4 C64C0038 */ lwc1 $f12, 0x38($s2) -/* B66B58 802410A8 0C00A720 */ jal atan2 -/* B66B5C 802410AC C64E0040 */ lwc1 $f14, 0x40($s2) -/* B66B60 802410B0 3C03E0EF */ lui $v1, 0xe0ef -/* B66B64 802410B4 E640000C */ swc1 $f0, 0xc($s2) -/* B66B68 802410B8 8E220000 */ lw $v0, ($s1) -/* B66B6C 802410BC 3463FFFF */ ori $v1, $v1, 0xffff -/* B66B70 802410C0 00431024 */ and $v0, $v0, $v1 -/* B66B74 802410C4 AE220000 */ sw $v0, ($s1) -/* B66B78 802410C8 24020001 */ addiu $v0, $zero, 1 -/* B66B7C 802410CC A640008E */ sh $zero, 0x8e($s2) -/* B66B80 802410D0 08090453 */ j .L8024114C -/* B66B84 802410D4 AE820070 */ sw $v0, 0x70($s4) -.L802410D8: -/* B66B88 802410D8 86240008 */ lh $a0, 8($s1) -/* B66B8C 802410DC 0C00FB3A */ jal get_enemy -/* B66B90 802410E0 2484FFFF */ addiu $a0, $a0, -1 -/* B66B94 802410E4 0040802D */ daddu $s0, $v0, $zero -/* B66B98 802410E8 0C00EABB */ jal get_npc_unsafe -/* B66B9C 802410EC 86040008 */ lh $a0, 8($s0) -/* B66BA0 802410F0 9642008E */ lhu $v0, 0x8e($s2) -/* B66BA4 802410F4 24420001 */ addiu $v0, $v0, 1 -/* B66BA8 802410F8 A642008E */ sh $v0, 0x8e($s2) -/* B66BAC 802410FC 00021400 */ sll $v0, $v0, 0x10 -/* B66BB0 80241100 8E23007C */ lw $v1, 0x7c($s1) -/* B66BB4 80241104 00021403 */ sra $v0, $v0, 0x10 -/* B66BB8 80241108 0043102A */ slt $v0, $v0, $v1 -/* B66BBC 8024110C 50400001 */ beql $v0, $zero, .L80241114 -/* B66BC0 80241110 A2200007 */ sb $zero, 7($s1) -.L80241114: -/* B66BC4 80241114 8E03006C */ lw $v1, 0x6c($s0) -/* B66BC8 80241118 24020004 */ addiu $v0, $zero, 4 -/* B66BCC 8024111C 1462000B */ bne $v1, $v0, .L8024114C -/* B66BD0 80241120 3C021F10 */ lui $v0, 0x1f10 -/* B66BD4 80241124 8E230000 */ lw $v1, ($s1) -/* B66BD8 80241128 3C01C47A */ lui $at, 0xc47a -/* B66BDC 8024112C 44810000 */ mtc1 $at, $f0 -/* B66BE0 80241130 00621825 */ or $v1, $v1, $v0 -/* B66BE4 80241134 AE230000 */ sw $v1, ($s1) -/* B66BE8 80241138 AE400038 */ sw $zero, 0x38($s2) -/* B66BEC 8024113C E640003C */ swc1 $f0, 0x3c($s2) -/* B66BF0 80241140 AE400040 */ sw $zero, 0x40($s2) -/* B66BF4 80241144 A2330007 */ sb $s3, 7($s1) -/* B66BF8 80241148 AE800070 */ sw $zero, 0x70($s4) -.L8024114C: -/* B66BFC 8024114C 8FBF002C */ lw $ra, 0x2c($sp) -/* B66C00 80241150 8FB40028 */ lw $s4, 0x28($sp) -/* B66C04 80241154 8FB30024 */ lw $s3, 0x24($sp) -/* B66C08 80241158 8FB20020 */ lw $s2, 0x20($sp) -/* B66C0C 8024115C 8FB1001C */ lw $s1, 0x1c($sp) -/* B66C10 80241160 8FB00018 */ lw $s0, 0x18($sp) -/* B66C14 80241164 0000102D */ daddu $v0, $zero, $zero -/* B66C18 80241168 03E00008 */ jr $ra -/* B66C1C 8024116C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_80241170_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_80241170_B65AB0.s deleted file mode 100644 index da1fe12421..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_80241170_B65AB0.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241170_B66C20 -/* B66C20 80241170 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B66C24 80241174 AFB20038 */ sw $s2, 0x38($sp) -/* B66C28 80241178 0080902D */ daddu $s2, $a0, $zero -/* B66C2C 8024117C AFBF0048 */ sw $ra, 0x48($sp) -/* B66C30 80241180 AFB50044 */ sw $s5, 0x44($sp) -/* B66C34 80241184 AFB40040 */ sw $s4, 0x40($sp) -/* B66C38 80241188 AFB3003C */ sw $s3, 0x3c($sp) -/* B66C3C 8024118C AFB10034 */ sw $s1, 0x34($sp) -/* B66C40 80241190 AFB00030 */ sw $s0, 0x30($sp) -/* B66C44 80241194 8E510148 */ lw $s1, 0x148($s2) -/* B66C48 80241198 86240008 */ lh $a0, 8($s1) -/* B66C4C 8024119C 0C00EABB */ jal get_npc_unsafe -/* B66C50 802411A0 00A0802D */ daddu $s0, $a1, $zero -/* B66C54 802411A4 8E43000C */ lw $v1, 0xc($s2) -/* B66C58 802411A8 0240202D */ daddu $a0, $s2, $zero -/* B66C5C 802411AC 8C650000 */ lw $a1, ($v1) -/* B66C60 802411B0 0C0B1EAF */ jal get_variable -/* B66C64 802411B4 0040A82D */ daddu $s5, $v0, $zero -/* B66C68 802411B8 AFA00010 */ sw $zero, 0x10($sp) -/* B66C6C 802411BC 8E2300D0 */ lw $v1, 0xd0($s1) -/* B66C70 802411C0 8C630030 */ lw $v1, 0x30($v1) -/* B66C74 802411C4 AFA30014 */ sw $v1, 0x14($sp) -/* B66C78 802411C8 8E2300D0 */ lw $v1, 0xd0($s1) -/* B66C7C 802411CC 8C63001C */ lw $v1, 0x1c($v1) -/* B66C80 802411D0 AFA30018 */ sw $v1, 0x18($sp) -/* B66C84 802411D4 8E2300D0 */ lw $v1, 0xd0($s1) -/* B66C88 802411D8 8C630024 */ lw $v1, 0x24($v1) -/* B66C8C 802411DC AFA3001C */ sw $v1, 0x1c($sp) -/* B66C90 802411E0 8E2300D0 */ lw $v1, 0xd0($s1) -/* B66C94 802411E4 8C630028 */ lw $v1, 0x28($v1) -/* B66C98 802411E8 27B40010 */ addiu $s4, $sp, 0x10 -/* B66C9C 802411EC AFA30020 */ sw $v1, 0x20($sp) -/* B66CA0 802411F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* B66CA4 802411F4 3C014282 */ lui $at, 0x4282 -/* B66CA8 802411F8 44810000 */ mtc1 $at, $f0 -/* B66CAC 802411FC 8C63002C */ lw $v1, 0x2c($v1) -/* B66CB0 80241200 0040982D */ daddu $s3, $v0, $zero -/* B66CB4 80241204 E7A00028 */ swc1 $f0, 0x28($sp) -/* B66CB8 80241208 A7A0002C */ sh $zero, 0x2c($sp) -/* B66CBC 8024120C 16000005 */ bnez $s0, .L80241224 -/* B66CC0 80241210 AFA30024 */ sw $v1, 0x24($sp) -/* B66CC4 80241214 8E2200B0 */ lw $v0, 0xb0($s1) -/* B66CC8 80241218 30420004 */ andi $v0, $v0, 4 -/* B66CCC 8024121C 10400020 */ beqz $v0, .L802412A0 -/* B66CD0 80241220 00000000 */ nop -.L80241224: -/* B66CD4 80241224 2404F7FF */ addiu $a0, $zero, -0x801 -/* B66CD8 80241228 AE400070 */ sw $zero, 0x70($s2) -/* B66CDC 8024122C A6A0008E */ sh $zero, 0x8e($s5) -/* B66CE0 80241230 8E2200CC */ lw $v0, 0xcc($s1) -/* B66CE4 80241234 8EA30000 */ lw $v1, ($s5) -/* B66CE8 80241238 8C420000 */ lw $v0, ($v0) -/* B66CEC 8024123C 00641824 */ and $v1, $v1, $a0 -/* B66CF0 80241240 AEA30000 */ sw $v1, ($s5) -/* B66CF4 80241244 AEA20028 */ sw $v0, 0x28($s5) -/* B66CF8 80241248 8E2200D0 */ lw $v0, 0xd0($s1) -/* B66CFC 8024124C 8C420034 */ lw $v0, 0x34($v0) -/* B66D00 80241250 54400005 */ bnel $v0, $zero, .L80241268 -/* B66D04 80241254 2402FDFF */ addiu $v0, $zero, -0x201 -/* B66D08 80241258 34620200 */ ori $v0, $v1, 0x200 -/* B66D0C 8024125C 2403FFF7 */ addiu $v1, $zero, -9 -/* B66D10 80241260 0809049C */ j .L80241270 -/* B66D14 80241264 00431024 */ and $v0, $v0, $v1 -.L80241268: -/* B66D18 80241268 00621024 */ and $v0, $v1, $v0 -/* B66D1C 8024126C 34420008 */ ori $v0, $v0, 8 -.L80241270: -/* B66D20 80241270 AEA20000 */ sw $v0, ($s5) -/* B66D24 80241274 8E2200B0 */ lw $v0, 0xb0($s1) -/* B66D28 80241278 30420004 */ andi $v0, $v0, 4 -/* B66D2C 8024127C 10400007 */ beqz $v0, .L8024129C -/* B66D30 80241280 24020063 */ addiu $v0, $zero, 0x63 -/* B66D34 80241284 AE420070 */ sw $v0, 0x70($s2) -/* B66D38 80241288 AE400074 */ sw $zero, 0x74($s2) -/* B66D3C 8024128C 8E2200B0 */ lw $v0, 0xb0($s1) -/* B66D40 80241290 2403FFFB */ addiu $v1, $zero, -5 -/* B66D44 80241294 00431024 */ and $v0, $v0, $v1 -/* B66D48 80241298 AE2200B0 */ sw $v0, 0xb0($s1) -.L8024129C: -/* B66D4C 8024129C AE20006C */ sw $zero, 0x6c($s1) -.L802412A0: -/* B66D50 802412A0 8E420070 */ lw $v0, 0x70($s2) -/* B66D54 802412A4 2842001E */ slti $v0, $v0, 0x1e -/* B66D58 802412A8 10400009 */ beqz $v0, .L802412D0 -/* B66D5C 802412AC 00000000 */ nop -/* B66D60 802412B0 8E22006C */ lw $v0, 0x6c($s1) -/* B66D64 802412B4 14400006 */ bnez $v0, .L802412D0 -/* B66D68 802412B8 00000000 */ nop -/* B66D6C 802412BC 0C090357 */ jal func_80240D5C -/* B66D70 802412C0 0240202D */ daddu $a0, $s2, $zero -/* B66D74 802412C4 10400002 */ beqz $v0, .L802412D0 -/* B66D78 802412C8 2402001E */ addiu $v0, $zero, 0x1e -/* B66D7C 802412CC AE420070 */ sw $v0, 0x70($s2) -.L802412D0: -/* B66D80 802412D0 8E430070 */ lw $v1, 0x70($s2) -/* B66D84 802412D4 2C620064 */ sltiu $v0, $v1, 0x64 -/* B66D88 802412D8 10400048 */ beqz $v0, .L802413FC -/* B66D8C 802412DC 00031080 */ sll $v0, $v1, 2 -/* B66D90 802412E0 3C018024 */ lui $at, 0x8024 -/* B66D94 802412E4 00220821 */ addu $at, $at, $v0 -/* B66D98 802412E8 8C2265C0 */ lw $v0, 0x65c0($at) -/* B66D9C 802412EC 00400008 */ jr $v0 -/* B66DA0 802412F0 00000000 */ nop -/* B66DA4 802412F4 0240202D */ daddu $a0, $s2, $zero -/* B66DA8 802412F8 0260282D */ daddu $a1, $s3, $zero -/* B66DAC 802412FC 0C012568 */ jal func_800495A0 -/* B66DB0 80241300 0280302D */ daddu $a2, $s4, $zero -/* B66DB4 80241304 0240202D */ daddu $a0, $s2, $zero -/* B66DB8 80241308 0260282D */ daddu $a1, $s3, $zero -/* B66DBC 8024130C 0C0125AE */ jal func_800496B8 -/* B66DC0 80241310 0280302D */ daddu $a2, $s4, $zero -/* B66DC4 80241314 080904FF */ j .L802413FC -/* B66DC8 80241318 00000000 */ nop -/* B66DCC 8024131C 0240202D */ daddu $a0, $s2, $zero -/* B66DD0 80241320 0260282D */ daddu $a1, $s3, $zero -/* B66DD4 80241324 0C0126D1 */ jal func_80049B44 -/* B66DD8 80241328 0280302D */ daddu $a2, $s4, $zero -/* B66DDC 8024132C 0240202D */ daddu $a0, $s2, $zero -/* B66DE0 80241330 0260282D */ daddu $a1, $s3, $zero -/* B66DE4 80241334 0C012701 */ jal func_80049C04 -/* B66DE8 80241338 0280302D */ daddu $a2, $s4, $zero -/* B66DEC 8024133C 080904FF */ j .L802413FC -/* B66DF0 80241340 00000000 */ nop -/* B66DF4 80241344 0240202D */ daddu $a0, $s2, $zero -/* B66DF8 80241348 0260282D */ daddu $a1, $s3, $zero -/* B66DFC 8024134C 0C01278F */ jal func_80049E3C -/* B66E00 80241350 0280302D */ daddu $a2, $s4, $zero -/* B66E04 80241354 0240202D */ daddu $a0, $s2, $zero -/* B66E08 80241358 0260282D */ daddu $a1, $s3, $zero -/* B66E0C 8024135C 0C0127B3 */ jal func_80049ECC -/* B66E10 80241360 0280302D */ daddu $a2, $s4, $zero -/* B66E14 80241364 080904FF */ j .L802413FC -/* B66E18 80241368 00000000 */ nop -/* B66E1C 8024136C 0240202D */ daddu $a0, $s2, $zero -/* B66E20 80241370 0260282D */ daddu $a1, $s3, $zero -/* B66E24 80241374 0C0127DF */ jal func_80049F7C -/* B66E28 80241378 0280302D */ daddu $a2, $s4, $zero -/* B66E2C 8024137C 0240202D */ daddu $a0, $s2, $zero -/* B66E30 80241380 0260282D */ daddu $a1, $s3, $zero -/* B66E34 80241384 0C012849 */ jal func_8004A124 -/* B66E38 80241388 0280302D */ daddu $a2, $s4, $zero -/* B66E3C 8024138C 080904FF */ j .L802413FC -/* B66E40 80241390 00000000 */ nop -/* B66E44 80241394 0240202D */ daddu $a0, $s2, $zero -/* B66E48 80241398 0260282D */ daddu $a1, $s3, $zero -/* B66E4C 8024139C 0C0128FA */ jal func_8004A3E8 -/* B66E50 802413A0 0280302D */ daddu $a2, $s4, $zero -/* B66E54 802413A4 080904FF */ j .L802413FC -/* B66E58 802413A8 00000000 */ nop -/* B66E5C 802413AC 0C0902D5 */ jal func_80240B54 -/* B66E60 802413B0 0240202D */ daddu $a0, $s2, $zero -/* B66E64 802413B4 0C0902F0 */ jal func_80240BC0 -/* B66E68 802413B8 0240202D */ daddu $a0, $s2, $zero -/* B66E6C 802413BC 8E430070 */ lw $v1, 0x70($s2) -/* B66E70 802413C0 24020020 */ addiu $v0, $zero, 0x20 -/* B66E74 802413C4 1462000D */ bne $v1, $v0, .L802413FC -/* B66E78 802413C8 00000000 */ nop -/* B66E7C 802413CC 0C09030C */ jal func_80240C30 -/* B66E80 802413D0 0240202D */ daddu $a0, $s2, $zero -/* B66E84 802413D4 8E430070 */ lw $v1, 0x70($s2) -/* B66E88 802413D8 24020021 */ addiu $v0, $zero, 0x21 -/* B66E8C 802413DC 14620007 */ bne $v1, $v0, .L802413FC -/* B66E90 802413E0 00000000 */ nop -/* B66E94 802413E4 0C090342 */ jal func_80240D08 -/* B66E98 802413E8 0240202D */ daddu $a0, $s2, $zero -/* B66E9C 802413EC 080904FF */ j .L802413FC -/* B66EA0 802413F0 00000000 */ nop -/* B66EA4 802413F4 0C0129CF */ jal func_8004A73C -/* B66EA8 802413F8 0240202D */ daddu $a0, $s2, $zero -.L802413FC: -/* B66EAC 802413FC 8FBF0048 */ lw $ra, 0x48($sp) -/* B66EB0 80241400 8FB50044 */ lw $s5, 0x44($sp) -/* B66EB4 80241404 8FB40040 */ lw $s4, 0x40($sp) -/* B66EB8 80241408 8FB3003C */ lw $s3, 0x3c($sp) -/* B66EBC 8024140C 8FB20038 */ lw $s2, 0x38($sp) -/* B66EC0 80241410 8FB10034 */ lw $s1, 0x34($sp) -/* B66EC4 80241414 8FB00030 */ lw $s0, 0x30($sp) -/* B66EC8 80241418 0000102D */ daddu $v0, $zero, $zero -/* B66ECC 8024141C 03E00008 */ jr $ra -/* B66ED0 80241420 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_80241424_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_80241424_B65AB0.s deleted file mode 100644 index 7878a2be72..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_80241424_B65AB0.s +++ /dev/null @@ -1,186 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241424_B66ED4 -/* B66ED4 80241424 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B66ED8 80241428 AFB20038 */ sw $s2, 0x38($sp) -/* B66EDC 8024142C 0080902D */ daddu $s2, $a0, $zero -/* B66EE0 80241430 AFBF0048 */ sw $ra, 0x48($sp) -/* B66EE4 80241434 AFB50044 */ sw $s5, 0x44($sp) -/* B66EE8 80241438 AFB40040 */ sw $s4, 0x40($sp) -/* B66EEC 8024143C AFB3003C */ sw $s3, 0x3c($sp) -/* B66EF0 80241440 AFB10034 */ sw $s1, 0x34($sp) -/* B66EF4 80241444 AFB00030 */ sw $s0, 0x30($sp) -/* B66EF8 80241448 8E510148 */ lw $s1, 0x148($s2) -/* B66EFC 8024144C 86240008 */ lh $a0, 8($s1) -/* B66F00 80241450 0C00EABB */ jal get_npc_unsafe -/* B66F04 80241454 00A0802D */ daddu $s0, $a1, $zero -/* B66F08 80241458 8E43000C */ lw $v1, 0xc($s2) -/* B66F0C 8024145C 0240202D */ daddu $a0, $s2, $zero -/* B66F10 80241460 8C650000 */ lw $a1, ($v1) -/* B66F14 80241464 0C0B1EAF */ jal get_variable -/* B66F18 80241468 0040A82D */ daddu $s5, $v0, $zero -/* B66F1C 8024146C AFA00010 */ sw $zero, 0x10($sp) -/* B66F20 80241470 8E2300D0 */ lw $v1, 0xd0($s1) -/* B66F24 80241474 8C630030 */ lw $v1, 0x30($v1) -/* B66F28 80241478 AFA30014 */ sw $v1, 0x14($sp) -/* B66F2C 8024147C 8E2300D0 */ lw $v1, 0xd0($s1) -/* B66F30 80241480 8C63001C */ lw $v1, 0x1c($v1) -/* B66F34 80241484 AFA30018 */ sw $v1, 0x18($sp) -/* B66F38 80241488 8E2300D0 */ lw $v1, 0xd0($s1) -/* B66F3C 8024148C 8C630024 */ lw $v1, 0x24($v1) -/* B66F40 80241490 AFA3001C */ sw $v1, 0x1c($sp) -/* B66F44 80241494 8E2300D0 */ lw $v1, 0xd0($s1) -/* B66F48 80241498 8C630028 */ lw $v1, 0x28($v1) -/* B66F4C 8024149C 27B40010 */ addiu $s4, $sp, 0x10 -/* B66F50 802414A0 AFA30020 */ sw $v1, 0x20($sp) -/* B66F54 802414A4 8E2300D0 */ lw $v1, 0xd0($s1) -/* B66F58 802414A8 3C014282 */ lui $at, 0x4282 -/* B66F5C 802414AC 44810000 */ mtc1 $at, $f0 -/* B66F60 802414B0 8C63002C */ lw $v1, 0x2c($v1) -/* B66F64 802414B4 0040982D */ daddu $s3, $v0, $zero -/* B66F68 802414B8 E7A00028 */ swc1 $f0, 0x28($sp) -/* B66F6C 802414BC A7A0002C */ sh $zero, 0x2c($sp) -/* B66F70 802414C0 16000005 */ bnez $s0, .L802414D8 -/* B66F74 802414C4 AFA30024 */ sw $v1, 0x24($sp) -/* B66F78 802414C8 8E2200B0 */ lw $v0, 0xb0($s1) -/* B66F7C 802414CC 30420004 */ andi $v0, $v0, 4 -/* B66F80 802414D0 10400020 */ beqz $v0, .L80241554 -/* B66F84 802414D4 00000000 */ nop -.L802414D8: -/* B66F88 802414D8 2404F7FF */ addiu $a0, $zero, -0x801 -/* B66F8C 802414DC AE400070 */ sw $zero, 0x70($s2) -/* B66F90 802414E0 A6A0008E */ sh $zero, 0x8e($s5) -/* B66F94 802414E4 8E2200CC */ lw $v0, 0xcc($s1) -/* B66F98 802414E8 8EA30000 */ lw $v1, ($s5) -/* B66F9C 802414EC 8C420000 */ lw $v0, ($v0) -/* B66FA0 802414F0 00641824 */ and $v1, $v1, $a0 -/* B66FA4 802414F4 AEA30000 */ sw $v1, ($s5) -/* B66FA8 802414F8 AEA20028 */ sw $v0, 0x28($s5) -/* B66FAC 802414FC 8E2200D0 */ lw $v0, 0xd0($s1) -/* B66FB0 80241500 8C420034 */ lw $v0, 0x34($v0) -/* B66FB4 80241504 54400005 */ bnel $v0, $zero, .L8024151C -/* B66FB8 80241508 2402FDFF */ addiu $v0, $zero, -0x201 -/* B66FBC 8024150C 34620200 */ ori $v0, $v1, 0x200 -/* B66FC0 80241510 2403FFF7 */ addiu $v1, $zero, -9 -/* B66FC4 80241514 08090549 */ j .L80241524 -/* B66FC8 80241518 00431024 */ and $v0, $v0, $v1 -.L8024151C: -/* B66FCC 8024151C 00621024 */ and $v0, $v1, $v0 -/* B66FD0 80241520 34420008 */ ori $v0, $v0, 8 -.L80241524: -/* B66FD4 80241524 AEA20000 */ sw $v0, ($s5) -/* B66FD8 80241528 8E2200B0 */ lw $v0, 0xb0($s1) -/* B66FDC 8024152C 30420004 */ andi $v0, $v0, 4 -/* B66FE0 80241530 10400007 */ beqz $v0, .L80241550 -/* B66FE4 80241534 24020063 */ addiu $v0, $zero, 0x63 -/* B66FE8 80241538 AE420070 */ sw $v0, 0x70($s2) -/* B66FEC 8024153C AE400074 */ sw $zero, 0x74($s2) -/* B66FF0 80241540 8E2200B0 */ lw $v0, 0xb0($s1) -/* B66FF4 80241544 2403FFFB */ addiu $v1, $zero, -5 -/* B66FF8 80241548 00431024 */ and $v0, $v0, $v1 -/* B66FFC 8024154C AE2200B0 */ sw $v0, 0xb0($s1) -.L80241550: -/* B67000 80241550 AE20006C */ sw $zero, 0x6c($s1) -.L80241554: -/* B67004 80241554 8E420070 */ lw $v0, 0x70($s2) -/* B67008 80241558 2842001E */ slti $v0, $v0, 0x1e -/* B6700C 8024155C 10400009 */ beqz $v0, .L80241584 -/* B67010 80241560 00000000 */ nop -/* B67014 80241564 8E22006C */ lw $v0, 0x6c($s1) -/* B67018 80241568 14400006 */ bnez $v0, .L80241584 -/* B6701C 8024156C 00000000 */ nop -/* B67020 80241570 0C090357 */ jal func_80240D5C -/* B67024 80241574 0240202D */ daddu $a0, $s2, $zero -/* B67028 80241578 10400002 */ beqz $v0, .L80241584 -/* B6702C 8024157C 2402001E */ addiu $v0, $zero, 0x1e -/* B67030 80241580 AE420070 */ sw $v0, 0x70($s2) -.L80241584: -/* B67034 80241584 8E430070 */ lw $v1, 0x70($s2) -/* B67038 80241588 2C620064 */ sltiu $v0, $v1, 0x64 -/* B6703C 8024158C 10400048 */ beqz $v0, .L802416B0 -/* B67040 80241590 00031080 */ sll $v0, $v1, 2 -/* B67044 80241594 3C018024 */ lui $at, 0x8024 -/* B67048 80241598 00220821 */ addu $at, $at, $v0 -/* B6704C 8024159C 8C226750 */ lw $v0, 0x6750($at) -/* B67050 802415A0 00400008 */ jr $v0 -/* B67054 802415A4 00000000 */ nop -/* B67058 802415A8 0240202D */ daddu $a0, $s2, $zero -/* B6705C 802415AC 0260282D */ daddu $a1, $s3, $zero -/* B67060 802415B0 0C012568 */ jal func_800495A0 -/* B67064 802415B4 0280302D */ daddu $a2, $s4, $zero -/* B67068 802415B8 0240202D */ daddu $a0, $s2, $zero -/* B6706C 802415BC 0260282D */ daddu $a1, $s3, $zero -/* B67070 802415C0 0C0125AE */ jal func_800496B8 -/* B67074 802415C4 0280302D */ daddu $a2, $s4, $zero -/* B67078 802415C8 080905AC */ j .L802416B0 -/* B6707C 802415CC 00000000 */ nop -/* B67080 802415D0 0240202D */ daddu $a0, $s2, $zero -/* B67084 802415D4 0260282D */ daddu $a1, $s3, $zero -/* B67088 802415D8 0C090250 */ jal func_80240940 -/* B6708C 802415DC 0280302D */ daddu $a2, $s4, $zero -/* B67090 802415E0 0240202D */ daddu $a0, $s2, $zero -/* B67094 802415E4 0260282D */ daddu $a1, $s3, $zero -/* B67098 802415E8 0C090264 */ jal func_80240990 -/* B6709C 802415EC 0280302D */ daddu $a2, $s4, $zero -/* B670A0 802415F0 080905AC */ j .L802416B0 -/* B670A4 802415F4 00000000 */ nop -/* B670A8 802415F8 0240202D */ daddu $a0, $s2, $zero -/* B670AC 802415FC 0260282D */ daddu $a1, $s3, $zero -/* B670B0 80241600 0C01278F */ jal func_80049E3C -/* B670B4 80241604 0280302D */ daddu $a2, $s4, $zero -/* B670B8 80241608 0240202D */ daddu $a0, $s2, $zero -/* B670BC 8024160C 0260282D */ daddu $a1, $s3, $zero -/* B670C0 80241610 0C0127B3 */ jal func_80049ECC -/* B670C4 80241614 0280302D */ daddu $a2, $s4, $zero -/* B670C8 80241618 080905AC */ j .L802416B0 -/* B670CC 8024161C 00000000 */ nop -/* B670D0 80241620 0240202D */ daddu $a0, $s2, $zero -/* B670D4 80241624 0260282D */ daddu $a1, $s3, $zero -/* B670D8 80241628 0C0127DF */ jal func_80049F7C -/* B670DC 8024162C 0280302D */ daddu $a2, $s4, $zero -/* B670E0 80241630 0240202D */ daddu $a0, $s2, $zero -/* B670E4 80241634 0260282D */ daddu $a1, $s3, $zero -/* B670E8 80241638 0C012849 */ jal func_8004A124 -/* B670EC 8024163C 0280302D */ daddu $a2, $s4, $zero -/* B670F0 80241640 080905AC */ j .L802416B0 -/* B670F4 80241644 00000000 */ nop -/* B670F8 80241648 0240202D */ daddu $a0, $s2, $zero -/* B670FC 8024164C 0260282D */ daddu $a1, $s3, $zero -/* B67100 80241650 0C0128FA */ jal func_8004A3E8 -/* B67104 80241654 0280302D */ daddu $a2, $s4, $zero -/* B67108 80241658 080905AC */ j .L802416B0 -/* B6710C 8024165C 00000000 */ nop -/* B67110 80241660 0C0902D5 */ jal func_80240B54 -/* B67114 80241664 0240202D */ daddu $a0, $s2, $zero -/* B67118 80241668 0C0902F0 */ jal func_80240BC0 -/* B6711C 8024166C 0240202D */ daddu $a0, $s2, $zero -/* B67120 80241670 8E430070 */ lw $v1, 0x70($s2) -/* B67124 80241674 24020020 */ addiu $v0, $zero, 0x20 -/* B67128 80241678 1462000D */ bne $v1, $v0, .L802416B0 -/* B6712C 8024167C 00000000 */ nop -/* B67130 80241680 0C09030C */ jal func_80240C30 -/* B67134 80241684 0240202D */ daddu $a0, $s2, $zero -/* B67138 80241688 8E430070 */ lw $v1, 0x70($s2) -/* B6713C 8024168C 24020021 */ addiu $v0, $zero, 0x21 -/* B67140 80241690 14620007 */ bne $v1, $v0, .L802416B0 -/* B67144 80241694 00000000 */ nop -/* B67148 80241698 0C090342 */ jal func_80240D08 -/* B6714C 8024169C 0240202D */ daddu $a0, $s2, $zero -/* B67150 802416A0 080905AC */ j .L802416B0 -/* B67154 802416A4 00000000 */ nop -/* B67158 802416A8 0C0129CF */ jal func_8004A73C -/* B6715C 802416AC 0240202D */ daddu $a0, $s2, $zero -.L802416B0: -/* B67160 802416B0 8FBF0048 */ lw $ra, 0x48($sp) -/* B67164 802416B4 8FB50044 */ lw $s5, 0x44($sp) -/* B67168 802416B8 8FB40040 */ lw $s4, 0x40($sp) -/* B6716C 802416BC 8FB3003C */ lw $s3, 0x3c($sp) -/* B67170 802416C0 8FB20038 */ lw $s2, 0x38($sp) -/* B67174 802416C4 8FB10034 */ lw $s1, 0x34($sp) -/* B67178 802416C8 8FB00030 */ lw $s0, 0x30($sp) -/* B6717C 802416CC 0000102D */ daddu $v0, $zero, $zero -/* B67180 802416D0 03E00008 */ jr $ra -/* B67184 802416D4 27BD0050 */ addiu $sp, $sp, 0x50 -/* B67188 802416D8 00000000 */ nop -/* B6718C 802416DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_09/func_80241750_B65AB0.s b/asm/nonmatchings/world/area_jan/jan_09/func_80241750_B65AB0.s deleted file mode 100644 index bc18c00ea1..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/func_80241750_B65AB0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241750_B67200 -/* B67200 80241750 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B67204 80241754 AFB10054 */ sw $s1, 0x54($sp) -/* B67208 80241758 0080882D */ daddu $s1, $a0, $zero -/* B6720C 8024175C AFBF005C */ sw $ra, 0x5c($sp) -/* B67210 80241760 AFB20058 */ sw $s2, 0x58($sp) -/* B67214 80241764 AFB00050 */ sw $s0, 0x50($sp) -/* B67218 80241768 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B6721C 8024176C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B67220 80241770 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B67224 80241774 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B67228 80241778 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B6722C 8024177C 8E30000C */ lw $s0, 0xc($s1) -/* B67230 80241780 8E050000 */ lw $a1, ($s0) -/* B67234 80241784 0C0B1EAF */ jal get_variable -/* B67238 80241788 26100004 */ addiu $s0, $s0, 4 -/* B6723C 8024178C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B67240 80241790 0040202D */ daddu $a0, $v0, $zero -/* B67244 80241794 8E050000 */ lw $a1, ($s0) -/* B67248 80241798 26100004 */ addiu $s0, $s0, 4 -/* B6724C 8024179C 0220202D */ daddu $a0, $s1, $zero -/* B67250 802417A0 0C0B210B */ jal get_float_variable -/* B67254 802417A4 0040902D */ daddu $s2, $v0, $zero -/* B67258 802417A8 8E050000 */ lw $a1, ($s0) -/* B6725C 802417AC 26100004 */ addiu $s0, $s0, 4 -/* B67260 802417B0 0220202D */ daddu $a0, $s1, $zero -/* B67264 802417B4 0C0B210B */ jal get_float_variable -/* B67268 802417B8 46000706 */ mov.s $f28, $f0 -/* B6726C 802417BC 8E050000 */ lw $a1, ($s0) -/* B67270 802417C0 26100004 */ addiu $s0, $s0, 4 -/* B67274 802417C4 0220202D */ daddu $a0, $s1, $zero -/* B67278 802417C8 0C0B210B */ jal get_float_variable -/* B6727C 802417CC 46000686 */ mov.s $f26, $f0 -/* B67280 802417D0 0220202D */ daddu $a0, $s1, $zero -/* B67284 802417D4 8E050000 */ lw $a1, ($s0) -/* B67288 802417D8 0C0B210B */ jal get_float_variable -/* B6728C 802417DC 46000586 */ mov.s $f22, $f0 -/* B67290 802417E0 0240202D */ daddu $a0, $s2, $zero -/* B67294 802417E4 0C046B4C */ jal get_model_from_list_index -/* B67298 802417E8 46000606 */ mov.s $f24, $f0 -/* B6729C 802417EC 0040882D */ daddu $s1, $v0, $zero -/* B672A0 802417F0 96220000 */ lhu $v0, ($s1) -/* B672A4 802417F4 30420400 */ andi $v0, $v0, 0x400 -/* B672A8 802417F8 1440001E */ bnez $v0, .L80241874 -/* B672AC 802417FC 26300058 */ addiu $s0, $s1, 0x58 -/* B672B0 80241800 4480A000 */ mtc1 $zero, $f20 -/* B672B4 80241804 4406B000 */ mfc1 $a2, $f22 -/* B672B8 80241808 4405A000 */ mfc1 $a1, $f20 -/* B672BC 8024180C 4407A000 */ mfc1 $a3, $f20 -/* B672C0 80241810 0C019E40 */ jal guTranslateF -/* B672C4 80241814 0200202D */ daddu $a0, $s0, $zero -/* B672C8 80241818 4405E000 */ mfc1 $a1, $f28 -/* B672CC 8024181C 4406D000 */ mfc1 $a2, $f26 -/* B672D0 80241820 4407C000 */ mfc1 $a3, $f24 -/* B672D4 80241824 0C0905B8 */ jal func_802416E0 -/* B672D8 80241828 27A40010 */ addiu $a0, $sp, 0x10 -/* B672DC 8024182C 27A40010 */ addiu $a0, $sp, 0x10 -/* B672E0 80241830 0200282D */ daddu $a1, $s0, $zero -/* B672E4 80241834 0C019D80 */ jal guMtxCatF -/* B672E8 80241838 0200302D */ daddu $a2, $s0, $zero -/* B672EC 8024183C 27A40010 */ addiu $a0, $sp, 0x10 -/* B672F0 80241840 4600B587 */ neg.s $f22, $f22 -/* B672F4 80241844 4405A000 */ mfc1 $a1, $f20 -/* B672F8 80241848 4406B000 */ mfc1 $a2, $f22 -/* B672FC 8024184C 0C019E40 */ jal guTranslateF -/* B67300 80241850 00A0382D */ daddu $a3, $a1, $zero -/* B67304 80241854 27A40010 */ addiu $a0, $sp, 0x10 -/* B67308 80241858 0200282D */ daddu $a1, $s0, $zero -/* B6730C 8024185C 0C019D80 */ jal guMtxCatF -/* B67310 80241860 00A0302D */ daddu $a2, $a1, $zero -/* B67314 80241864 96220000 */ lhu $v0, ($s1) -/* B67318 80241868 34421400 */ ori $v0, $v0, 0x1400 -/* B6731C 8024186C 0809063B */ j .L802418EC -/* B67320 80241870 A6220000 */ sh $v0, ($s1) -.L80241874: -/* B67324 80241874 4480A000 */ mtc1 $zero, $f20 -/* B67328 80241878 4406B000 */ mfc1 $a2, $f22 -/* B6732C 8024187C 4405A000 */ mfc1 $a1, $f20 -/* B67330 80241880 4407A000 */ mfc1 $a3, $f20 -/* B67334 80241884 0C019E40 */ jal guTranslateF -/* B67338 80241888 27A40010 */ addiu $a0, $sp, 0x10 -/* B6733C 8024188C 27A40010 */ addiu $a0, $sp, 0x10 -/* B67340 80241890 26300058 */ addiu $s0, $s1, 0x58 -/* B67344 80241894 0200282D */ daddu $a1, $s0, $zero -/* B67348 80241898 0C019D80 */ jal guMtxCatF -/* B6734C 8024189C 0200302D */ daddu $a2, $s0, $zero -/* B67350 802418A0 4405E000 */ mfc1 $a1, $f28 -/* B67354 802418A4 4406D000 */ mfc1 $a2, $f26 -/* B67358 802418A8 4407C000 */ mfc1 $a3, $f24 -/* B6735C 802418AC 0C0905B8 */ jal func_802416E0 -/* B67360 802418B0 27A40010 */ addiu $a0, $sp, 0x10 -/* B67364 802418B4 27A40010 */ addiu $a0, $sp, 0x10 -/* B67368 802418B8 0200282D */ daddu $a1, $s0, $zero -/* B6736C 802418BC 0C019D80 */ jal guMtxCatF -/* B67370 802418C0 0200302D */ daddu $a2, $s0, $zero -/* B67374 802418C4 27A40010 */ addiu $a0, $sp, 0x10 -/* B67378 802418C8 4600B587 */ neg.s $f22, $f22 -/* B6737C 802418CC 4405A000 */ mfc1 $a1, $f20 -/* B67380 802418D0 4406B000 */ mfc1 $a2, $f22 -/* B67384 802418D4 0C019E40 */ jal guTranslateF -/* B67388 802418D8 00A0382D */ daddu $a3, $a1, $zero -/* B6738C 802418DC 27A40010 */ addiu $a0, $sp, 0x10 -/* B67390 802418E0 0200282D */ daddu $a1, $s0, $zero -/* B67394 802418E4 0C019D80 */ jal guMtxCatF -/* B67398 802418E8 00A0302D */ daddu $a2, $a1, $zero -.L802418EC: -/* B6739C 802418EC 8FBF005C */ lw $ra, 0x5c($sp) -/* B673A0 802418F0 8FB20058 */ lw $s2, 0x58($sp) -/* B673A4 802418F4 8FB10054 */ lw $s1, 0x54($sp) -/* B673A8 802418F8 8FB00050 */ lw $s0, 0x50($sp) -/* B673AC 802418FC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B673B0 80241900 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B673B4 80241904 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B673B8 80241908 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B673BC 8024190C D7B40060 */ ldc1 $f20, 0x60($sp) -/* B673C0 80241910 24020002 */ addiu $v0, $zero, 2 -/* B673C4 80241914 03E00008 */ jr $ra -/* B673C8 80241918 27BD0088 */ addiu $sp, $sp, 0x88 -/* B673CC 8024191C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_10/delete_actor_B6C390.s b/asm/nonmatchings/world/area_jan/jan_10/delete_actor_B6C390.s deleted file mode 100644 index 832af5d694..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/delete_actor_B6C390.s +++ /dev/null @@ -1,200 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel delete_actor_B6CF4C -/* B6CF4C 80240BBC 27BDFF90 */ addiu $sp, $sp, -0x70 -/* B6CF50 80240BC0 AFB40050 */ sw $s4, 0x50($sp) -/* B6CF54 80240BC4 0080A02D */ daddu $s4, $a0, $zero -/* B6CF58 80240BC8 AFBF0060 */ sw $ra, 0x60($sp) -/* B6CF5C 80240BCC AFB7005C */ sw $s7, 0x5c($sp) -/* B6CF60 80240BD0 AFB60058 */ sw $s6, 0x58($sp) -/* B6CF64 80240BD4 AFB50054 */ sw $s5, 0x54($sp) -/* B6CF68 80240BD8 AFB3004C */ sw $s3, 0x4c($sp) -/* B6CF6C 80240BDC AFB20048 */ sw $s2, 0x48($sp) -/* B6CF70 80240BE0 AFB10044 */ sw $s1, 0x44($sp) -/* B6CF74 80240BE4 AFB00040 */ sw $s0, 0x40($sp) -/* B6CF78 80240BE8 F7B40068 */ sdc1 $f20, 0x68($sp) -/* B6CF7C 80240BEC 8E950148 */ lw $s5, 0x148($s4) -/* B6CF80 80240BF0 00A0B02D */ daddu $s6, $a1, $zero -/* B6CF84 80240BF4 86A40008 */ lh $a0, 8($s5) -/* B6CF88 80240BF8 0C00EABB */ jal get_npc_unsafe -/* B6CF8C 80240BFC 00C0B82D */ daddu $s7, $a2, $zero -/* B6CF90 80240C00 0040982D */ daddu $s3, $v0, $zero -/* B6CF94 80240C04 C6600018 */ lwc1 $f0, 0x18($s3) -/* B6CF98 80240C08 44801000 */ mtc1 $zero, $f2 -/* B6CF9C 80240C0C 44801800 */ mtc1 $zero, $f3 -/* B6CFA0 80240C10 46000021 */ cvt.d.s $f0, $f0 -/* B6CFA4 80240C14 4620103C */ c.lt.d $f2, $f0 -/* B6CFA8 80240C18 00000000 */ nop -/* B6CFAC 80240C1C 45000021 */ bc1f .L80240CA4 -/* B6CFB0 80240C20 27A50028 */ addiu $a1, $sp, 0x28 -/* B6CFB4 80240C24 C6600038 */ lwc1 $f0, 0x38($s3) -/* B6CFB8 80240C28 C662003C */ lwc1 $f2, 0x3c($s3) -/* B6CFBC 80240C2C C6640040 */ lwc1 $f4, 0x40($s3) -/* B6CFC0 80240C30 C6660018 */ lwc1 $f6, 0x18($s3) -/* B6CFC4 80240C34 E7A00028 */ swc1 $f0, 0x28($sp) -/* B6CFC8 80240C38 E7A2002C */ swc1 $f2, 0x2c($sp) -/* B6CFCC 80240C3C E7A40030 */ swc1 $f4, 0x30($sp) -/* B6CFD0 80240C40 E7A60010 */ swc1 $f6, 0x10($sp) -/* B6CFD4 80240C44 C660000C */ lwc1 $f0, 0xc($s3) -/* B6CFD8 80240C48 E7A00014 */ swc1 $f0, 0x14($sp) -/* B6CFDC 80240C4C 866200A8 */ lh $v0, 0xa8($s3) -/* B6CFE0 80240C50 44820000 */ mtc1 $v0, $f0 -/* B6CFE4 80240C54 00000000 */ nop -/* B6CFE8 80240C58 46800020 */ cvt.s.w $f0, $f0 -/* B6CFEC 80240C5C E7A00018 */ swc1 $f0, 0x18($sp) -/* B6CFF0 80240C60 866200A6 */ lh $v0, 0xa6($s3) -/* B6CFF4 80240C64 27A6002C */ addiu $a2, $sp, 0x2c -/* B6CFF8 80240C68 44820000 */ mtc1 $v0, $f0 -/* B6CFFC 80240C6C 00000000 */ nop -/* B6D000 80240C70 46800020 */ cvt.s.w $f0, $f0 -/* B6D004 80240C74 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B6D008 80240C78 8E640080 */ lw $a0, 0x80($s3) -/* B6D00C 80240C7C 0C037711 */ jal func_800DDC44 -/* B6D010 80240C80 27A70030 */ addiu $a3, $sp, 0x30 -/* B6D014 80240C84 10400003 */ beqz $v0, .L80240C94 -/* B6D018 80240C88 00000000 */ nop -/* B6D01C 80240C8C 08090329 */ j .L80240CA4 -/* B6D020 80240C90 AE600018 */ sw $zero, 0x18($s3) -.L80240C94: -/* B6D024 80240C94 8E650018 */ lw $a1, 0x18($s3) -/* B6D028 80240C98 8E66000C */ lw $a2, 0xc($s3) -/* B6D02C 80240C9C 0C00EA95 */ jal npc_move_heading -/* B6D030 80240CA0 0260202D */ daddu $a0, $s3, $zero -.L80240CA4: -/* B6D034 80240CA4 C660001C */ lwc1 $f0, 0x1c($s3) -/* B6D038 80240CA8 44801000 */ mtc1 $zero, $f2 -/* B6D03C 80240CAC 44801800 */ mtc1 $zero, $f3 -/* B6D040 80240CB0 46000021 */ cvt.d.s $f0, $f0 -/* B6D044 80240CB4 4622003C */ c.lt.d $f0, $f2 -/* B6D048 80240CB8 00000000 */ nop -/* B6D04C 80240CBC 4500006C */ bc1f .L80240E70 -/* B6D050 80240CC0 27B00028 */ addiu $s0, $sp, 0x28 -/* B6D054 80240CC4 0200282D */ daddu $a1, $s0, $zero -/* B6D058 80240CC8 27A60034 */ addiu $a2, $sp, 0x34 -/* B6D05C 80240CCC 27B20038 */ addiu $s2, $sp, 0x38 -/* B6D060 80240CD0 C6600038 */ lwc1 $f0, 0x38($s3) -/* B6D064 80240CD4 3C0142C8 */ lui $at, 0x42c8 -/* B6D068 80240CD8 44811000 */ mtc1 $at, $f2 -/* B6D06C 80240CDC C6640040 */ lwc1 $f4, 0x40($s3) -/* B6D070 80240CE0 3C01447A */ lui $at, 0x447a -/* B6D074 80240CE4 44813000 */ mtc1 $at, $f6 -/* B6D078 80240CE8 27B10030 */ addiu $s1, $sp, 0x30 -/* B6D07C 80240CEC E7A00028 */ swc1 $f0, 0x28($sp) -/* B6D080 80240CF0 E7A20034 */ swc1 $f2, 0x34($sp) -/* B6D084 80240CF4 E7A40030 */ swc1 $f4, 0x30($sp) -/* B6D088 80240CF8 E7A60038 */ swc1 $f6, 0x38($sp) -/* B6D08C 80240CFC AFB20010 */ sw $s2, 0x10($sp) -/* B6D090 80240D00 8E640080 */ lw $a0, 0x80($s3) -/* B6D094 80240D04 0C0372DF */ jal func_800DCB7C -/* B6D098 80240D08 0220382D */ daddu $a3, $s1, $zero -/* B6D09C 80240D0C 0200282D */ daddu $a1, $s0, $zero -/* B6D0A0 80240D10 27A6002C */ addiu $a2, $sp, 0x2c -/* B6D0A4 80240D14 C662003C */ lwc1 $f2, 0x3c($s3) -/* B6D0A8 80240D18 C6660038 */ lwc1 $f6, 0x38($s3) -/* B6D0AC 80240D1C 3C01402A */ lui $at, 0x402a -/* B6D0B0 80240D20 4481A800 */ mtc1 $at, $f21 -/* B6D0B4 80240D24 4480A000 */ mtc1 $zero, $f20 -/* B6D0B8 80240D28 460010A1 */ cvt.d.s $f2, $f2 -/* B6D0BC 80240D2C 46341080 */ add.d $f2, $f2, $f20 -/* B6D0C0 80240D30 C660001C */ lwc1 $f0, 0x1c($s3) -/* B6D0C4 80240D34 C6640040 */ lwc1 $f4, 0x40($s3) -/* B6D0C8 80240D38 46000005 */ abs.s $f0, $f0 -/* B6D0CC 80240D3C E7A40030 */ swc1 $f4, 0x30($sp) -/* B6D0D0 80240D40 3C014030 */ lui $at, 0x4030 -/* B6D0D4 80240D44 44812800 */ mtc1 $at, $f5 -/* B6D0D8 80240D48 44802000 */ mtc1 $zero, $f4 -/* B6D0DC 80240D4C 46000021 */ cvt.d.s $f0, $f0 -/* B6D0E0 80240D50 E7A60028 */ swc1 $f6, 0x28($sp) -/* B6D0E4 80240D54 46240000 */ add.d $f0, $f0, $f4 -/* B6D0E8 80240D58 462010A0 */ cvt.s.d $f2, $f2 -/* B6D0EC 80240D5C E7A2002C */ swc1 $f2, 0x2c($sp) -/* B6D0F0 80240D60 46200020 */ cvt.s.d $f0, $f0 -/* B6D0F4 80240D64 E7A00038 */ swc1 $f0, 0x38($sp) -/* B6D0F8 80240D68 AFB20010 */ sw $s2, 0x10($sp) -/* B6D0FC 80240D6C 8E640080 */ lw $a0, 0x80($s3) -/* B6D100 80240D70 0C0372DF */ jal func_800DCB7C -/* B6D104 80240D74 0220382D */ daddu $a3, $s1, $zero -/* B6D108 80240D78 1040003D */ beqz $v0, .L80240E70 -/* B6D10C 80240D7C 00000000 */ nop -/* B6D110 80240D80 C660001C */ lwc1 $f0, 0x1c($s3) -/* B6D114 80240D84 C7A20038 */ lwc1 $f2, 0x38($sp) -/* B6D118 80240D88 46000005 */ abs.s $f0, $f0 -/* B6D11C 80240D8C 46000021 */ cvt.d.s $f0, $f0 -/* B6D120 80240D90 46340000 */ add.d $f0, $f0, $f20 -/* B6D124 80240D94 460010A1 */ cvt.d.s $f2, $f2 -/* B6D128 80240D98 4620103E */ c.le.d $f2, $f0 -/* B6D12C 80240D9C 00000000 */ nop -/* B6D130 80240DA0 45000033 */ bc1f .L80240E70 -/* B6D134 80240DA4 2403F7FF */ addiu $v1, $zero, -0x801 -/* B6D138 80240DA8 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* B6D13C 80240DAC 8E620000 */ lw $v0, ($s3) -/* B6D140 80240DB0 AE60001C */ sw $zero, 0x1c($s3) -/* B6D144 80240DB4 00431024 */ and $v0, $v0, $v1 -/* B6D148 80240DB8 E660003C */ swc1 $f0, 0x3c($s3) -/* B6D14C 80240DBC AE620000 */ sw $v0, ($s3) -/* B6D150 80240DC0 AFA00010 */ sw $zero, 0x10($sp) -/* B6D154 80240DC4 AFA00014 */ sw $zero, 0x14($sp) -/* B6D158 80240DC8 8E650038 */ lw $a1, 0x38($s3) -/* B6D15C 80240DCC 8E66003C */ lw $a2, 0x3c($s3) -/* B6D160 80240DD0 8E670040 */ lw $a3, 0x40($s3) -/* B6D164 80240DD4 0C01BECC */ jal fx_walk_normal -/* B6D168 80240DD8 24040002 */ addiu $a0, $zero, 2 -/* B6D16C 80240DDC 02E0202D */ daddu $a0, $s7, $zero -/* B6D170 80240DE0 2402000C */ addiu $v0, $zero, 0xc -/* B6D174 80240DE4 AE820070 */ sw $v0, 0x70($s4) -/* B6D178 80240DE8 24020001 */ addiu $v0, $zero, 1 -/* B6D17C 80240DEC AFA20010 */ sw $v0, 0x10($sp) -/* B6D180 80240DF0 8EC60024 */ lw $a2, 0x24($s6) -/* B6D184 80240DF4 8EC70028 */ lw $a3, 0x28($s6) -/* B6D188 80240DF8 0C01242D */ jal func_800490B4 -/* B6D18C 80240DFC 02A0282D */ daddu $a1, $s5, $zero -/* B6D190 80240E00 14400022 */ bnez $v0, .L80240E8C -/* B6D194 80240E04 24040002 */ addiu $a0, $zero, 2 -/* B6D198 80240E08 0260282D */ daddu $a1, $s3, $zero -/* B6D19C 80240E0C 0000302D */ daddu $a2, $zero, $zero -/* B6D1A0 80240E10 866300A8 */ lh $v1, 0xa8($s3) -/* B6D1A4 80240E14 3C013F80 */ lui $at, 0x3f80 -/* B6D1A8 80240E18 44810000 */ mtc1 $at, $f0 -/* B6D1AC 80240E1C 3C014000 */ lui $at, 0x4000 -/* B6D1B0 80240E20 44811000 */ mtc1 $at, $f2 -/* B6D1B4 80240E24 3C01C1A0 */ lui $at, 0xc1a0 -/* B6D1B8 80240E28 44812000 */ mtc1 $at, $f4 -/* B6D1BC 80240E2C 2402000F */ addiu $v0, $zero, 0xf -/* B6D1C0 80240E30 AFA2001C */ sw $v0, 0x1c($sp) -/* B6D1C4 80240E34 44834000 */ mtc1 $v1, $f8 -/* B6D1C8 80240E38 00000000 */ nop -/* B6D1CC 80240E3C 46804220 */ cvt.s.w $f8, $f8 -/* B6D1D0 80240E40 44074000 */ mfc1 $a3, $f8 -/* B6D1D4 80240E44 27A2003C */ addiu $v0, $sp, 0x3c -/* B6D1D8 80240E48 AFA20020 */ sw $v0, 0x20($sp) -/* B6D1DC 80240E4C E7A00010 */ swc1 $f0, 0x10($sp) -/* B6D1E0 80240E50 E7A20014 */ swc1 $f2, 0x14($sp) -/* B6D1E4 80240E54 0C01BFA4 */ jal fx_emote -/* B6D1E8 80240E58 E7A40018 */ swc1 $f4, 0x18($sp) -/* B6D1EC 80240E5C 24020019 */ addiu $v0, $zero, 0x19 -/* B6D1F0 80240E60 A662008E */ sh $v0, 0x8e($s3) -/* B6D1F4 80240E64 2402000E */ addiu $v0, $zero, 0xe -/* B6D1F8 80240E68 080903A3 */ j .L80240E8C -/* B6D1FC 80240E6C AE820070 */ sw $v0, 0x70($s4) -.L80240E70: -/* B6D200 80240E70 C664003C */ lwc1 $f4, 0x3c($s3) -/* B6D204 80240E74 C660001C */ lwc1 $f0, 0x1c($s3) -/* B6D208 80240E78 46002100 */ add.s $f4, $f4, $f0 -/* B6D20C 80240E7C C6620014 */ lwc1 $f2, 0x14($s3) -/* B6D210 80240E80 46020001 */ sub.s $f0, $f0, $f2 -/* B6D214 80240E84 E664003C */ swc1 $f4, 0x3c($s3) -/* B6D218 80240E88 E660001C */ swc1 $f0, 0x1c($s3) -.L80240E8C: -/* B6D21C 80240E8C 8FBF0060 */ lw $ra, 0x60($sp) -/* B6D220 80240E90 8FB7005C */ lw $s7, 0x5c($sp) -/* B6D224 80240E94 8FB60058 */ lw $s6, 0x58($sp) -/* B6D228 80240E98 8FB50054 */ lw $s5, 0x54($sp) -/* B6D22C 80240E9C 8FB40050 */ lw $s4, 0x50($sp) -/* B6D230 80240EA0 8FB3004C */ lw $s3, 0x4c($sp) -/* B6D234 80240EA4 8FB20048 */ lw $s2, 0x48($sp) -/* B6D238 80240EA8 8FB10044 */ lw $s1, 0x44($sp) -/* B6D23C 80240EAC 8FB00040 */ lw $s0, 0x40($sp) -/* B6D240 80240EB0 D7B40068 */ ldc1 $f20, 0x68($sp) -/* B6D244 80240EB4 03E00008 */ jr $ra -/* B6D248 80240EB8 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_jan/jan_10/func_80240124_B6C390.s b/asm/nonmatchings/world/area_jan/jan_10/func_80240124_B6C390.s deleted file mode 100644 index 905b0ed820..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/func_80240124_B6C390.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_B6C4B4 -/* B6C4B4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6C4B8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* B6C4BC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* B6C4C0 80240130 10A00005 */ beqz $a1, .L80240148 -/* B6C4C4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* B6C4C8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* B6C4CC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* B6C4D0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* B6C4D4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* B6C4D8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* B6C4DC 8024014C 1440000E */ bnez $v0, .L80240188 -/* B6C4E0 80240150 00000000 */ nop -/* B6C4E4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* B6C4E8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* B6C4EC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* B6C4F0 80240160 04610004 */ bgez $v1, .L80240174 -/* B6C4F4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* B6C4F8 80240168 3C020002 */ lui $v0, 2 -/* B6C4FC 8024016C 08090061 */ j .L80240184 -/* B6C500 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* B6C504 80240174 3C040002 */ lui $a0, 2 -/* B6C508 80240178 0083102A */ slt $v0, $a0, $v1 -/* B6C50C 8024017C 10400002 */ beqz $v0, .L80240188 -/* B6C510 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* B6C514 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* B6C518 80240188 8E020074 */ lw $v0, 0x74($s0) -/* B6C51C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* B6C520 80240190 00000000 */ nop -/* B6C524 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* B6C528 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* B6C52C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* B6C530 802401A0 04610004 */ bgez $v1, .L802401B4 -/* B6C534 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* B6C538 802401A8 3C020002 */ lui $v0, 2 -/* B6C53C 802401AC 08090071 */ j .L802401C4 -/* B6C540 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* B6C544 802401B4 3C040002 */ lui $a0, 2 -/* B6C548 802401B8 0083102A */ slt $v0, $a0, $v1 -/* B6C54C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* B6C550 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* B6C554 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* B6C558 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* B6C55C 802401CC 1440000E */ bnez $v0, .L80240208 -/* B6C560 802401D0 00000000 */ nop -/* B6C564 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* B6C568 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* B6C56C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* B6C570 802401E0 04610004 */ bgez $v1, .L802401F4 -/* B6C574 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* B6C578 802401E8 3C020002 */ lui $v0, 2 -/* B6C57C 802401EC 08090081 */ j .L80240204 -/* B6C580 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* B6C584 802401F4 3C040002 */ lui $a0, 2 -/* B6C588 802401F8 0083102A */ slt $v0, $a0, $v1 -/* B6C58C 802401FC 10400002 */ beqz $v0, .L80240208 -/* B6C590 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* B6C594 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* B6C598 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* B6C59C 8024020C 1440000E */ bnez $v0, .L80240248 -/* B6C5A0 80240210 00000000 */ nop -/* B6C5A4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* B6C5A8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* B6C5AC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* B6C5B0 80240220 04610004 */ bgez $v1, .L80240234 -/* B6C5B4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* B6C5B8 80240228 3C020002 */ lui $v0, 2 -/* B6C5BC 8024022C 08090091 */ j .L80240244 -/* B6C5C0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* B6C5C4 80240234 3C040002 */ lui $a0, 2 -/* B6C5C8 80240238 0083102A */ slt $v0, $a0, $v1 -/* B6C5CC 8024023C 10400002 */ beqz $v0, .L80240248 -/* B6C5D0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* B6C5D4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* B6C5D8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* B6C5DC 8024024C 0C046F07 */ jal set_main_pan_u -/* B6C5E0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* B6C5E4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* B6C5E8 80240258 0C046F0D */ jal set_main_pan_v -/* B6C5EC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* B6C5F0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* B6C5F4 80240264 0C046F13 */ jal set_aux_pan_u -/* B6C5F8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* B6C5FC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* B6C600 80240270 0C046F19 */ jal set_aux_pan_v -/* B6C604 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* B6C608 80240278 8E020070 */ lw $v0, 0x70($s0) -/* B6C60C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* B6C610 80240280 8E040098 */ lw $a0, 0x98($s0) -/* B6C614 80240284 24420001 */ addiu $v0, $v0, 1 -/* B6C618 80240288 AE020070 */ sw $v0, 0x70($s0) -/* B6C61C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* B6C620 80240290 24630001 */ addiu $v1, $v1, 1 -/* B6C624 80240294 AE030078 */ sw $v1, 0x78($s0) -/* B6C628 80240298 8E030070 */ lw $v1, 0x70($s0) -/* B6C62C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* B6C630 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* B6C634 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* B6C638 802402A8 0064182A */ slt $v1, $v1, $a0 -/* B6C63C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* B6C640 802402B0 14600002 */ bnez $v1, .L802402BC -/* B6C644 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* B6C648 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* B6C64C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* B6C650 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* B6C654 802402C4 0043102A */ slt $v0, $v0, $v1 -/* B6C658 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* B6C65C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* B6C660 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* B6C664 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* B6C668 802402D8 0043102A */ slt $v0, $v0, $v1 -/* B6C66C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* B6C670 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* B6C674 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* B6C678 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* B6C67C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* B6C680 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* B6C684 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* B6C688 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B6C68C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* B6C690 80240300 0000102D */ daddu $v0, $zero, $zero -/* B6C694 80240304 03E00008 */ jr $ra -/* B6C698 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6C69C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_10/func_80240310_B6C390.s b/asm/nonmatchings/world/area_jan/jan_10/func_80240310_B6C390.s deleted file mode 100644 index 693e50ac8d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/func_80240310_B6C390.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_B6C6A0 -/* B6C6A0 80240310 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B6C6A4 80240314 AFB00030 */ sw $s0, 0x30($sp) -/* B6C6A8 80240318 0080802D */ daddu $s0, $a0, $zero -/* B6C6AC 8024031C AFBF0040 */ sw $ra, 0x40($sp) -/* B6C6B0 80240320 AFB3003C */ sw $s3, 0x3c($sp) -/* B6C6B4 80240324 AFB20038 */ sw $s2, 0x38($sp) -/* B6C6B8 80240328 AFB10034 */ sw $s1, 0x34($sp) -/* B6C6BC 8024032C F7B60050 */ sdc1 $f22, 0x50($sp) -/* B6C6C0 80240330 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B6C6C4 80240334 8E130148 */ lw $s3, 0x148($s0) -/* B6C6C8 80240338 00A0882D */ daddu $s1, $a1, $zero -/* B6C6CC 8024033C 86640008 */ lh $a0, 8($s3) -/* B6C6D0 80240340 0C00EABB */ jal get_npc_unsafe -/* B6C6D4 80240344 00C0902D */ daddu $s2, $a2, $zero -/* B6C6D8 80240348 0200202D */ daddu $a0, $s0, $zero -/* B6C6DC 8024034C 0220282D */ daddu $a1, $s1, $zero -/* B6C6E0 80240350 0240302D */ daddu $a2, $s2, $zero -/* B6C6E4 80240354 0C012568 */ jal func_800495A0 -/* B6C6E8 80240358 0040802D */ daddu $s0, $v0, $zero -/* B6C6EC 8024035C 8E020000 */ lw $v0, ($s0) -/* B6C6F0 80240360 2404002D */ addiu $a0, $zero, 0x2d -/* B6C6F4 80240364 34420800 */ ori $v0, $v0, 0x800 -/* B6C6F8 80240368 0C00A67F */ jal rand_int -/* B6C6FC 8024036C AE020000 */ sw $v0, ($s0) -/* B6C700 80240370 0200202D */ daddu $a0, $s0, $zero -/* B6C704 80240374 3C05B000 */ lui $a1, 0xb000 -/* B6C708 80240378 34A50017 */ ori $a1, $a1, 0x17 -/* B6C70C 8024037C 44820000 */ mtc1 $v0, $f0 -/* B6C710 80240380 00000000 */ nop -/* B6C714 80240384 46800021 */ cvt.d.w $f0, $f0 -/* B6C718 80240388 3C014024 */ lui $at, 0x4024 -/* B6C71C 8024038C 44811800 */ mtc1 $at, $f3 -/* B6C720 80240390 44801000 */ mtc1 $zero, $f2 -/* B6C724 80240394 3C014020 */ lui $at, 0x4020 -/* B6C728 80240398 44812800 */ mtc1 $at, $f5 -/* B6C72C 8024039C 44802000 */ mtc1 $zero, $f4 -/* B6C730 802403A0 46220003 */ div.d $f0, $f0, $f2 -/* B6C734 802403A4 46240000 */ add.d $f0, $f0, $f4 -/* B6C738 802403A8 3C013FC0 */ lui $at, 0x3fc0 -/* B6C73C 802403AC 44811000 */ mtc1 $at, $f2 -/* B6C740 802403B0 0000302D */ daddu $a2, $zero, $zero -/* B6C744 802403B4 E6020014 */ swc1 $f2, 0x14($s0) -/* B6C748 802403B8 46200020 */ cvt.s.d $f0, $f0 -/* B6C74C 802403BC 0C012530 */ jal func_800494C0 -/* B6C750 802403C0 E600001C */ swc1 $f0, 0x1c($s0) -/* B6C754 802403C4 8E6300D0 */ lw $v1, 0xd0($s3) -/* B6C758 802403C8 C6000040 */ lwc1 $f0, 0x40($s0) -/* B6C75C 802403CC C4620000 */ lwc1 $f2, ($v1) -/* B6C760 802403D0 468010A0 */ cvt.s.w $f2, $f2 -/* B6C764 802403D4 C4640008 */ lwc1 $f4, 8($v1) -/* B6C768 802403D8 46802120 */ cvt.s.w $f4, $f4 -/* B6C76C 802403DC E7A00010 */ swc1 $f0, 0x10($sp) -/* B6C770 802403E0 8E6200D0 */ lw $v0, 0xd0($s3) -/* B6C774 802403E4 44051000 */ mfc1 $a1, $f2 -/* B6C778 802403E8 C440000C */ lwc1 $f0, 0xc($v0) -/* B6C77C 802403EC 46800020 */ cvt.s.w $f0, $f0 -/* B6C780 802403F0 E7A00014 */ swc1 $f0, 0x14($sp) -/* B6C784 802403F4 8E6200D0 */ lw $v0, 0xd0($s3) -/* B6C788 802403F8 44062000 */ mfc1 $a2, $f4 -/* B6C78C 802403FC C4400010 */ lwc1 $f0, 0x10($v0) -/* B6C790 80240400 46800020 */ cvt.s.w $f0, $f0 -/* B6C794 80240404 E7A00018 */ swc1 $f0, 0x18($sp) -/* B6C798 80240408 8C640018 */ lw $a0, 0x18($v1) -/* B6C79C 8024040C 0C0123F5 */ jal is_point_within_region -/* B6C7A0 80240410 8E070038 */ lw $a3, 0x38($s0) -/* B6C7A4 80240414 10400035 */ beqz $v0, .L802404EC -/* B6C7A8 80240418 00000000 */ nop -/* B6C7AC 8024041C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B6C7B0 80240420 3C0141C8 */ lui $at, 0x41c8 -/* B6C7B4 80240424 4481B000 */ mtc1 $at, $f22 -/* B6C7B8 80240428 8E6200D0 */ lw $v0, 0xd0($s3) -/* B6C7BC 8024042C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B6C7C0 80240430 C4480000 */ lwc1 $f8, ($v0) -/* B6C7C4 80240434 46804220 */ cvt.s.w $f8, $f8 -/* B6C7C8 80240438 44064000 */ mfc1 $a2, $f8 -/* B6C7CC 8024043C C4480008 */ lwc1 $f8, 8($v0) -/* B6C7D0 80240440 46804220 */ cvt.s.w $f8, $f8 -/* B6C7D4 80240444 44074000 */ mfc1 $a3, $f8 -/* B6C7D8 80240448 3C01403E */ lui $at, 0x403e -/* B6C7DC 8024044C 4481A800 */ mtc1 $at, $f21 -/* B6C7E0 80240450 4480A000 */ mtc1 $zero, $f20 -/* B6C7E4 80240454 0C00A720 */ jal atan2 -/* B6C7E8 80240458 0000882D */ daddu $s1, $zero, $zero -/* B6C7EC 8024045C C6020038 */ lwc1 $f2, 0x38($s0) -/* B6C7F0 80240460 C604003C */ lwc1 $f4, 0x3c($s0) -/* B6C7F4 80240464 C6060040 */ lwc1 $f6, 0x40($s0) -/* B6C7F8 80240468 E600000C */ swc1 $f0, 0xc($s0) -/* B6C7FC 8024046C E7A20020 */ swc1 $f2, 0x20($sp) -/* B6C800 80240470 E7A40024 */ swc1 $f4, 0x24($sp) -/* B6C804 80240474 E7A60028 */ swc1 $f6, 0x28($sp) -.L80240478: -/* B6C808 80240478 E7B60010 */ swc1 $f22, 0x10($sp) -/* B6C80C 8024047C C600000C */ lwc1 $f0, 0xc($s0) -/* B6C810 80240480 E7A00014 */ swc1 $f0, 0x14($sp) -/* B6C814 80240484 860200A8 */ lh $v0, 0xa8($s0) -/* B6C818 80240488 27A50020 */ addiu $a1, $sp, 0x20 -/* B6C81C 8024048C 44820000 */ mtc1 $v0, $f0 -/* B6C820 80240490 00000000 */ nop -/* B6C824 80240494 46800020 */ cvt.s.w $f0, $f0 -/* B6C828 80240498 E7A00018 */ swc1 $f0, 0x18($sp) -/* B6C82C 8024049C 860200A6 */ lh $v0, 0xa6($s0) -/* B6C830 802404A0 27A60024 */ addiu $a2, $sp, 0x24 -/* B6C834 802404A4 44820000 */ mtc1 $v0, $f0 -/* B6C838 802404A8 00000000 */ nop -/* B6C83C 802404AC 46800020 */ cvt.s.w $f0, $f0 -/* B6C840 802404B0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B6C844 802404B4 8E040080 */ lw $a0, 0x80($s0) -/* B6C848 802404B8 0C037711 */ jal func_800DDC44 -/* B6C84C 802404BC 27A70028 */ addiu $a3, $sp, 0x28 -/* B6C850 802404C0 10400016 */ beqz $v0, .L8024051C -/* B6C854 802404C4 26310001 */ addiu $s1, $s1, 1 -/* B6C858 802404C8 C600000C */ lwc1 $f0, 0xc($s0) -/* B6C85C 802404CC 46000021 */ cvt.d.s $f0, $f0 -/* B6C860 802404D0 46340000 */ add.d $f0, $f0, $f20 -/* B6C864 802404D4 2A220006 */ slti $v0, $s1, 6 -/* B6C868 802404D8 46200020 */ cvt.s.d $f0, $f0 -/* B6C86C 802404DC 1440FFE6 */ bnez $v0, .L80240478 -/* B6C870 802404E0 E600000C */ swc1 $f0, 0xc($s0) -/* B6C874 802404E4 08090147 */ j .L8024051C -/* B6C878 802404E8 00000000 */ nop -.L802404EC: -/* B6C87C 802404EC 0C00A67F */ jal rand_int -/* B6C880 802404F0 2404003C */ addiu $a0, $zero, 0x3c -/* B6C884 802404F4 C60C000C */ lwc1 $f12, 0xc($s0) -/* B6C888 802404F8 44820000 */ mtc1 $v0, $f0 -/* B6C88C 802404FC 00000000 */ nop -/* B6C890 80240500 46800020 */ cvt.s.w $f0, $f0 -/* B6C894 80240504 46006300 */ add.s $f12, $f12, $f0 -/* B6C898 80240508 3C0141F0 */ lui $at, 0x41f0 -/* B6C89C 8024050C 44810000 */ mtc1 $at, $f0 -/* B6C8A0 80240510 0C00A6C9 */ jal clamp_angle -/* B6C8A4 80240514 46006301 */ sub.s $f12, $f12, $f0 -/* B6C8A8 80240518 E600000C */ swc1 $f0, 0xc($s0) -.L8024051C: -/* B6C8AC 8024051C 8FBF0040 */ lw $ra, 0x40($sp) -/* B6C8B0 80240520 8FB3003C */ lw $s3, 0x3c($sp) -/* B6C8B4 80240524 8FB20038 */ lw $s2, 0x38($sp) -/* B6C8B8 80240528 8FB10034 */ lw $s1, 0x34($sp) -/* B6C8BC 8024052C 8FB00030 */ lw $s0, 0x30($sp) -/* B6C8C0 80240530 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B6C8C4 80240534 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B6C8C8 80240538 03E00008 */ jr $ra -/* B6C8CC 8024053C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_10/func_80240540_B6C390.s b/asm/nonmatchings/world/area_jan/jan_10/func_80240540_B6C390.s deleted file mode 100644 index b388f204f3..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/func_80240540_B6C390.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240540_B6C8D0 -/* B6C8D0 80240540 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* B6C8D4 80240544 AFB3004C */ sw $s3, 0x4c($sp) -/* B6C8D8 80240548 0080982D */ daddu $s3, $a0, $zero -/* B6C8DC 8024054C AFBF0054 */ sw $ra, 0x54($sp) -/* B6C8E0 80240550 AFB40050 */ sw $s4, 0x50($sp) -/* B6C8E4 80240554 AFB20048 */ sw $s2, 0x48($sp) -/* B6C8E8 80240558 AFB10044 */ sw $s1, 0x44($sp) -/* B6C8EC 8024055C AFB00040 */ sw $s0, 0x40($sp) -/* B6C8F0 80240560 F7B40058 */ sdc1 $f20, 0x58($sp) -/* B6C8F4 80240564 8E710148 */ lw $s1, 0x148($s3) -/* B6C8F8 80240568 00A0A02D */ daddu $s4, $a1, $zero -/* B6C8FC 8024056C 86240008 */ lh $a0, 8($s1) -/* B6C900 80240570 0C00EABB */ jal get_npc_unsafe -/* B6C904 80240574 00C0902D */ daddu $s2, $a2, $zero -/* B6C908 80240578 8E830014 */ lw $v1, 0x14($s4) -/* B6C90C 8024057C 04600034 */ bltz $v1, .L80240650 -/* B6C910 80240580 0040802D */ daddu $s0, $v0, $zero -/* B6C914 80240584 8E620074 */ lw $v0, 0x74($s3) -/* B6C918 80240588 1C400030 */ bgtz $v0, .L8024064C -/* B6C91C 8024058C 2442FFFF */ addiu $v0, $v0, -1 -/* B6C920 80240590 0240202D */ daddu $a0, $s2, $zero -/* B6C924 80240594 AE630074 */ sw $v1, 0x74($s3) -/* B6C928 80240598 AFA00010 */ sw $zero, 0x10($sp) -/* B6C92C 8024059C 8E86000C */ lw $a2, 0xc($s4) -/* B6C930 802405A0 8E870010 */ lw $a3, 0x10($s4) -/* B6C934 802405A4 0C01242D */ jal func_800490B4 -/* B6C938 802405A8 0220282D */ daddu $a1, $s1, $zero -/* B6C93C 802405AC 10400025 */ beqz $v0, .L80240644 -/* B6C940 802405B0 0000202D */ daddu $a0, $zero, $zero -/* B6C944 802405B4 0200282D */ daddu $a1, $s0, $zero -/* B6C948 802405B8 0000302D */ daddu $a2, $zero, $zero -/* B6C94C 802405BC 860300A8 */ lh $v1, 0xa8($s0) -/* B6C950 802405C0 3C013F80 */ lui $at, 0x3f80 -/* B6C954 802405C4 44810000 */ mtc1 $at, $f0 -/* B6C958 802405C8 3C014000 */ lui $at, 0x4000 -/* B6C95C 802405CC 44811000 */ mtc1 $at, $f2 -/* B6C960 802405D0 3C01C1A0 */ lui $at, 0xc1a0 -/* B6C964 802405D4 44812000 */ mtc1 $at, $f4 -/* B6C968 802405D8 2402000F */ addiu $v0, $zero, 0xf -/* B6C96C 802405DC AFA2001C */ sw $v0, 0x1c($sp) -/* B6C970 802405E0 44835000 */ mtc1 $v1, $f10 -/* B6C974 802405E4 00000000 */ nop -/* B6C978 802405E8 468052A0 */ cvt.s.w $f10, $f10 -/* B6C97C 802405EC 44075000 */ mfc1 $a3, $f10 -/* B6C980 802405F0 27A20028 */ addiu $v0, $sp, 0x28 -/* B6C984 802405F4 AFA20020 */ sw $v0, 0x20($sp) -/* B6C988 802405F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* B6C98C 802405FC E7A20014 */ swc1 $f2, 0x14($sp) -/* B6C990 80240600 0C01BFA4 */ jal fx_emote -/* B6C994 80240604 E7A40018 */ swc1 $f4, 0x18($sp) -/* B6C998 80240608 0200202D */ daddu $a0, $s0, $zero -/* B6C99C 8024060C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B6C9A0 80240610 0C012530 */ jal func_800494C0 -/* B6C9A4 80240614 3C060020 */ lui $a2, 0x20 -/* B6C9A8 80240618 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B6C9AC 8024061C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B6C9B0 80240620 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B6C9B4 80240624 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B6C9B8 80240628 8C460028 */ lw $a2, 0x28($v0) -/* B6C9BC 8024062C 0C00A720 */ jal atan2 -/* B6C9C0 80240630 8C470030 */ lw $a3, 0x30($v0) -/* B6C9C4 80240634 2402000C */ addiu $v0, $zero, 0xc -/* B6C9C8 80240638 E600000C */ swc1 $f0, 0xc($s0) -/* B6C9CC 8024063C 08090215 */ j .L80240854 -/* B6C9D0 80240640 AE620070 */ sw $v0, 0x70($s3) -.L80240644: -/* B6C9D4 80240644 8E620074 */ lw $v0, 0x74($s3) -/* B6C9D8 80240648 2442FFFF */ addiu $v0, $v0, -1 -.L8024064C: -/* B6C9DC 8024064C AE620074 */ sw $v0, 0x74($s3) -.L80240650: -/* B6C9E0 80240650 C6000018 */ lwc1 $f0, 0x18($s0) -/* B6C9E4 80240654 44801000 */ mtc1 $zero, $f2 -/* B6C9E8 80240658 44801800 */ mtc1 $zero, $f3 -/* B6C9EC 8024065C 46000021 */ cvt.d.s $f0, $f0 -/* B6C9F0 80240660 4620103C */ c.lt.d $f2, $f0 -/* B6C9F4 80240664 00000000 */ nop -/* B6C9F8 80240668 45000025 */ bc1f .L80240700 -/* B6C9FC 8024066C 27A5002C */ addiu $a1, $sp, 0x2c -/* B6CA00 80240670 C6000038 */ lwc1 $f0, 0x38($s0) -/* B6CA04 80240674 860200A6 */ lh $v0, 0xa6($s0) -/* B6CA08 80240678 3C018024 */ lui $at, 0x8024 -/* B6CA0C 8024067C D4224480 */ ldc1 $f2, 0x4480($at) -/* B6CA10 80240680 27A60030 */ addiu $a2, $sp, 0x30 -/* B6CA14 80240684 E7A0002C */ swc1 $f0, 0x2c($sp) -/* B6CA18 80240688 44820000 */ mtc1 $v0, $f0 -/* B6CA1C 8024068C 00000000 */ nop -/* B6CA20 80240690 46800020 */ cvt.s.w $f0, $f0 -/* B6CA24 80240694 46000021 */ cvt.d.s $f0, $f0 -/* B6CA28 80240698 C604003C */ lwc1 $f4, 0x3c($s0) -/* B6CA2C 8024069C C6060040 */ lwc1 $f6, 0x40($s0) -/* B6CA30 802406A0 C6080018 */ lwc1 $f8, 0x18($s0) -/* B6CA34 802406A4 860200A8 */ lh $v0, 0xa8($s0) -/* B6CA38 802406A8 46220002 */ mul.d $f0, $f0, $f2 -/* B6CA3C 802406AC 00000000 */ nop -/* B6CA40 802406B0 E7A40030 */ swc1 $f4, 0x30($sp) -/* B6CA44 802406B4 E7A60034 */ swc1 $f6, 0x34($sp) -/* B6CA48 802406B8 E7A80010 */ swc1 $f8, 0x10($sp) -/* B6CA4C 802406BC C604000C */ lwc1 $f4, 0xc($s0) -/* B6CA50 802406C0 44821000 */ mtc1 $v0, $f2 -/* B6CA54 802406C4 00000000 */ nop -/* B6CA58 802406C8 468010A0 */ cvt.s.w $f2, $f2 -/* B6CA5C 802406CC E7A20018 */ swc1 $f2, 0x18($sp) -/* B6CA60 802406D0 E7A40014 */ swc1 $f4, 0x14($sp) -/* B6CA64 802406D4 46200020 */ cvt.s.d $f0, $f0 -/* B6CA68 802406D8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B6CA6C 802406DC 8E040080 */ lw $a0, 0x80($s0) -/* B6CA70 802406E0 0C037711 */ jal func_800DDC44 -/* B6CA74 802406E4 27A70034 */ addiu $a3, $sp, 0x34 -/* B6CA78 802406E8 54400005 */ bnel $v0, $zero, .L80240700 -/* B6CA7C 802406EC AE000018 */ sw $zero, 0x18($s0) -/* B6CA80 802406F0 8E050018 */ lw $a1, 0x18($s0) -/* B6CA84 802406F4 8E06000C */ lw $a2, 0xc($s0) -/* B6CA88 802406F8 0C00EA95 */ jal npc_move_heading -/* B6CA8C 802406FC 0200202D */ daddu $a0, $s0, $zero -.L80240700: -/* B6CA90 80240700 C600001C */ lwc1 $f0, 0x1c($s0) -/* B6CA94 80240704 44801000 */ mtc1 $zero, $f2 -/* B6CA98 80240708 44801800 */ mtc1 $zero, $f3 -/* B6CA9C 8024070C 46000021 */ cvt.d.s $f0, $f0 -/* B6CAA0 80240710 4622003C */ c.lt.d $f0, $f2 -/* B6CAA4 80240714 00000000 */ nop -/* B6CAA8 80240718 45000047 */ bc1f .L80240838 -/* B6CAAC 8024071C 27A5002C */ addiu $a1, $sp, 0x2c -/* B6CAB0 80240720 27A60030 */ addiu $a2, $sp, 0x30 -/* B6CAB4 80240724 27A20038 */ addiu $v0, $sp, 0x38 -/* B6CAB8 80240728 C602003C */ lwc1 $f2, 0x3c($s0) -/* B6CABC 8024072C C6060038 */ lwc1 $f6, 0x38($s0) -/* B6CAC0 80240730 3C01402A */ lui $at, 0x402a -/* B6CAC4 80240734 4481A800 */ mtc1 $at, $f21 -/* B6CAC8 80240738 4480A000 */ mtc1 $zero, $f20 -/* B6CACC 8024073C 460010A1 */ cvt.d.s $f2, $f2 -/* B6CAD0 80240740 46341080 */ add.d $f2, $f2, $f20 -/* B6CAD4 80240744 C600001C */ lwc1 $f0, 0x1c($s0) -/* B6CAD8 80240748 C6040040 */ lwc1 $f4, 0x40($s0) -/* B6CADC 8024074C 46000005 */ abs.s $f0, $f0 -/* B6CAE0 80240750 E7A40034 */ swc1 $f4, 0x34($sp) -/* B6CAE4 80240754 3C014030 */ lui $at, 0x4030 -/* B6CAE8 80240758 44812800 */ mtc1 $at, $f5 -/* B6CAEC 8024075C 44802000 */ mtc1 $zero, $f4 -/* B6CAF0 80240760 46000021 */ cvt.d.s $f0, $f0 -/* B6CAF4 80240764 E7A6002C */ swc1 $f6, 0x2c($sp) -/* B6CAF8 80240768 46240000 */ add.d $f0, $f0, $f4 -/* B6CAFC 8024076C 462010A0 */ cvt.s.d $f2, $f2 -/* B6CB00 80240770 E7A20030 */ swc1 $f2, 0x30($sp) -/* B6CB04 80240774 46200020 */ cvt.s.d $f0, $f0 -/* B6CB08 80240778 E7A00038 */ swc1 $f0, 0x38($sp) -/* B6CB0C 8024077C AFA20010 */ sw $v0, 0x10($sp) -/* B6CB10 80240780 8E040080 */ lw $a0, 0x80($s0) -/* B6CB14 80240784 0C0372DF */ jal func_800DCB7C -/* B6CB18 80240788 27A70034 */ addiu $a3, $sp, 0x34 -/* B6CB1C 8024078C 1040002A */ beqz $v0, .L80240838 -/* B6CB20 80240790 00000000 */ nop -/* B6CB24 80240794 C600001C */ lwc1 $f0, 0x1c($s0) -/* B6CB28 80240798 C7A20038 */ lwc1 $f2, 0x38($sp) -/* B6CB2C 8024079C 46000005 */ abs.s $f0, $f0 -/* B6CB30 802407A0 46000021 */ cvt.d.s $f0, $f0 -/* B6CB34 802407A4 46340000 */ add.d $f0, $f0, $f20 -/* B6CB38 802407A8 460010A1 */ cvt.d.s $f2, $f2 -/* B6CB3C 802407AC 4620103E */ c.le.d $f2, $f0 -/* B6CB40 802407B0 00000000 */ nop -/* B6CB44 802407B4 45000020 */ bc1f .L80240838 -/* B6CB48 802407B8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B6CB4C 802407BC C7A00030 */ lwc1 $f0, 0x30($sp) -/* B6CB50 802407C0 8E020000 */ lw $v0, ($s0) -/* B6CB54 802407C4 2403F7FF */ addiu $v1, $zero, -0x801 -/* B6CB58 802407C8 AE00001C */ sw $zero, 0x1c($s0) -/* B6CB5C 802407CC 00431024 */ and $v0, $v0, $v1 -/* B6CB60 802407D0 AE020000 */ sw $v0, ($s0) -/* B6CB64 802407D4 24020002 */ addiu $v0, $zero, 2 -/* B6CB68 802407D8 E600003C */ swc1 $f0, 0x3c($s0) -/* B6CB6C 802407DC 0C00A67F */ jal rand_int -/* B6CB70 802407E0 AE620070 */ sw $v0, 0x70($s3) -/* B6CB74 802407E4 3C035555 */ lui $v1, 0x5555 -/* B6CB78 802407E8 34635556 */ ori $v1, $v1, 0x5556 -/* B6CB7C 802407EC 00430018 */ mult $v0, $v1 -/* B6CB80 802407F0 000227C3 */ sra $a0, $v0, 0x1f -/* B6CB84 802407F4 00004010 */ mfhi $t0 -/* B6CB88 802407F8 01042023 */ subu $a0, $t0, $a0 -/* B6CB8C 802407FC 00041840 */ sll $v1, $a0, 1 -/* B6CB90 80240800 00641821 */ addu $v1, $v1, $a0 -/* B6CB94 80240804 00431023 */ subu $v0, $v0, $v1 -/* B6CB98 80240808 24430002 */ addiu $v1, $v0, 2 -/* B6CB9C 8024080C AE630074 */ sw $v1, 0x74($s3) -/* B6CBA0 80240810 8E82002C */ lw $v0, 0x2c($s4) -/* B6CBA4 80240814 5840000F */ blezl $v0, .L80240854 -/* B6CBA8 80240818 AE600070 */ sw $zero, 0x70($s3) -/* B6CBAC 8024081C 8E820004 */ lw $v0, 4($s4) -/* B6CBB0 80240820 5840000C */ blezl $v0, .L80240854 -/* B6CBB4 80240824 AE600070 */ sw $zero, 0x70($s3) -/* B6CBB8 80240828 1460000A */ bnez $v1, .L80240854 -/* B6CBBC 8024082C 00000000 */ nop -/* B6CBC0 80240830 08090215 */ j .L80240854 -/* B6CBC4 80240834 AE600070 */ sw $zero, 0x70($s3) -.L80240838: -/* B6CBC8 80240838 C604003C */ lwc1 $f4, 0x3c($s0) -/* B6CBCC 8024083C C600001C */ lwc1 $f0, 0x1c($s0) -/* B6CBD0 80240840 46002100 */ add.s $f4, $f4, $f0 -/* B6CBD4 80240844 C6020014 */ lwc1 $f2, 0x14($s0) -/* B6CBD8 80240848 46020001 */ sub.s $f0, $f0, $f2 -/* B6CBDC 8024084C E604003C */ swc1 $f4, 0x3c($s0) -/* B6CBE0 80240850 E600001C */ swc1 $f0, 0x1c($s0) -.L80240854: -/* B6CBE4 80240854 8FBF0054 */ lw $ra, 0x54($sp) -/* B6CBE8 80240858 8FB40050 */ lw $s4, 0x50($sp) -/* B6CBEC 8024085C 8FB3004C */ lw $s3, 0x4c($sp) -/* B6CBF0 80240860 8FB20048 */ lw $s2, 0x48($sp) -/* B6CBF4 80240864 8FB10044 */ lw $s1, 0x44($sp) -/* B6CBF8 80240868 8FB00040 */ lw $s0, 0x40($sp) -/* B6CBFC 8024086C D7B40058 */ ldc1 $f20, 0x58($sp) -/* B6CC00 80240870 03E00008 */ jr $ra -/* B6CC04 80240874 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_jan/jan_10/func_80240878_B6C390.s b/asm/nonmatchings/world/area_jan/jan_10/func_80240878_B6C390.s deleted file mode 100644 index d5b113d141..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/func_80240878_B6C390.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240878_B6CC08 -/* B6CC08 80240878 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B6CC0C 8024087C AFB3001C */ sw $s3, 0x1c($sp) -/* B6CC10 80240880 0080982D */ daddu $s3, $a0, $zero -/* B6CC14 80240884 AFBF0020 */ sw $ra, 0x20($sp) -/* B6CC18 80240888 AFB20018 */ sw $s2, 0x18($sp) -/* B6CC1C 8024088C AFB10014 */ sw $s1, 0x14($sp) -/* B6CC20 80240890 AFB00010 */ sw $s0, 0x10($sp) -/* B6CC24 80240894 8E720148 */ lw $s2, 0x148($s3) -/* B6CC28 80240898 86440008 */ lh $a0, 8($s2) -/* B6CC2C 8024089C 0C00EABB */ jal get_npc_unsafe -/* B6CC30 802408A0 00A0882D */ daddu $s1, $a1, $zero -/* B6CC34 802408A4 8E240008 */ lw $a0, 8($s1) -/* B6CC38 802408A8 0040802D */ daddu $s0, $v0, $zero -/* B6CC3C 802408AC 00041FC2 */ srl $v1, $a0, 0x1f -/* B6CC40 802408B0 00832021 */ addu $a0, $a0, $v1 -/* B6CC44 802408B4 00042043 */ sra $a0, $a0, 1 -/* B6CC48 802408B8 0C00A67F */ jal rand_int -/* B6CC4C 802408BC 24840001 */ addiu $a0, $a0, 1 -/* B6CC50 802408C0 8E230008 */ lw $v1, 8($s1) -/* B6CC54 802408C4 240400B4 */ addiu $a0, $zero, 0xb4 -/* B6CC58 802408C8 00032FC2 */ srl $a1, $v1, 0x1f -/* B6CC5C 802408CC 00651821 */ addu $v1, $v1, $a1 -/* B6CC60 802408D0 00031843 */ sra $v1, $v1, 1 -/* B6CC64 802408D4 00621821 */ addu $v1, $v1, $v0 -/* B6CC68 802408D8 0C00A67F */ jal rand_int -/* B6CC6C 802408DC A603008E */ sh $v1, 0x8e($s0) -/* B6CC70 802408E0 C60C000C */ lwc1 $f12, 0xc($s0) -/* B6CC74 802408E4 44820000 */ mtc1 $v0, $f0 -/* B6CC78 802408E8 00000000 */ nop -/* B6CC7C 802408EC 46800020 */ cvt.s.w $f0, $f0 -/* B6CC80 802408F0 46006300 */ add.s $f12, $f12, $f0 -/* B6CC84 802408F4 3C0142B4 */ lui $at, 0x42b4 -/* B6CC88 802408F8 44810000 */ mtc1 $at, $f0 -/* B6CC8C 802408FC 0C00A6C9 */ jal clamp_angle -/* B6CC90 80240900 46006301 */ sub.s $f12, $f12, $f0 -/* B6CC94 80240904 E600000C */ swc1 $f0, 0xc($s0) -/* B6CC98 80240908 8E4200CC */ lw $v0, 0xcc($s2) -/* B6CC9C 8024090C 8C420000 */ lw $v0, ($v0) -/* B6CCA0 80240910 AE020028 */ sw $v0, 0x28($s0) -/* B6CCA4 80240914 24020003 */ addiu $v0, $zero, 3 -/* B6CCA8 80240918 AE620070 */ sw $v0, 0x70($s3) -/* B6CCAC 8024091C 8FBF0020 */ lw $ra, 0x20($sp) -/* B6CCB0 80240920 8FB3001C */ lw $s3, 0x1c($sp) -/* B6CCB4 80240924 8FB20018 */ lw $s2, 0x18($sp) -/* B6CCB8 80240928 8FB10014 */ lw $s1, 0x14($sp) -/* B6CCBC 8024092C 8FB00010 */ lw $s0, 0x10($sp) -/* B6CCC0 80240930 03E00008 */ jr $ra -/* B6CCC4 80240934 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_10/func_80240ADC_B6C390.s b/asm/nonmatchings/world/area_jan/jan_10/func_80240ADC_B6C390.s deleted file mode 100644 index 67b3507e5b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/func_80240ADC_B6C390.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ADC_B6CE6C -/* B6CE6C 80240ADC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6CE70 80240AE0 AFB10014 */ sw $s1, 0x14($sp) -/* B6CE74 80240AE4 0080882D */ daddu $s1, $a0, $zero -/* B6CE78 80240AE8 AFBF001C */ sw $ra, 0x1c($sp) -/* B6CE7C 80240AEC AFB20018 */ sw $s2, 0x18($sp) -/* B6CE80 80240AF0 AFB00010 */ sw $s0, 0x10($sp) -/* B6CE84 80240AF4 8E220148 */ lw $v0, 0x148($s1) -/* B6CE88 80240AF8 00A0902D */ daddu $s2, $a1, $zero -/* B6CE8C 80240AFC 84440008 */ lh $a0, 8($v0) -/* B6CE90 80240B00 0C00EABB */ jal get_npc_unsafe -/* B6CE94 80240B04 00C0802D */ daddu $s0, $a2, $zero -/* B6CE98 80240B08 0220202D */ daddu $a0, $s1, $zero -/* B6CE9C 80240B0C 0240282D */ daddu $a1, $s2, $zero -/* B6CEA0 80240B10 0200302D */ daddu $a2, $s0, $zero -/* B6CEA4 80240B14 0C0127DF */ jal func_80049F7C -/* B6CEA8 80240B18 0040802D */ daddu $s0, $v0, $zero -/* B6CEAC 80240B1C 8E020000 */ lw $v0, ($s0) -/* B6CEB0 80240B20 24040005 */ addiu $a0, $zero, 5 -/* B6CEB4 80240B24 34420800 */ ori $v0, $v0, 0x800 -/* B6CEB8 80240B28 0C00A67F */ jal rand_int -/* B6CEBC 80240B2C AE020000 */ sw $v0, ($s0) -/* B6CEC0 80240B30 44820000 */ mtc1 $v0, $f0 -/* B6CEC4 80240B34 00000000 */ nop -/* B6CEC8 80240B38 46800021 */ cvt.d.w $f0, $f0 -/* B6CECC 80240B3C 3C014024 */ lui $at, 0x4024 -/* B6CED0 80240B40 44811800 */ mtc1 $at, $f3 -/* B6CED4 80240B44 44801000 */ mtc1 $zero, $f2 -/* B6CED8 80240B48 3C013FC0 */ lui $at, 0x3fc0 -/* B6CEDC 80240B4C 44812000 */ mtc1 $at, $f4 -/* B6CEE0 80240B50 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B6CEE4 80240B54 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B6CEE8 80240B58 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B6CEEC 80240B5C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B6CEF0 80240B60 46220000 */ add.d $f0, $f0, $f2 -/* B6CEF4 80240B64 E6040014 */ swc1 $f4, 0x14($s0) -/* B6CEF8 80240B68 46200020 */ cvt.s.d $f0, $f0 -/* B6CEFC 80240B6C E600001C */ swc1 $f0, 0x1c($s0) -/* B6CF00 80240B70 8C460028 */ lw $a2, 0x28($v0) -/* B6CF04 80240B74 0C00A720 */ jal atan2 -/* B6CF08 80240B78 8C470030 */ lw $a3, 0x30($v0) -/* B6CF0C 80240B7C 0200202D */ daddu $a0, $s0, $zero -/* B6CF10 80240B80 3C05B000 */ lui $a1, 0xb000 -/* B6CF14 80240B84 34A50017 */ ori $a1, $a1, 0x17 -/* B6CF18 80240B88 0000302D */ daddu $a2, $zero, $zero -/* B6CF1C 80240B8C E480000C */ swc1 $f0, 0xc($a0) -/* B6CF20 80240B90 C6400018 */ lwc1 $f0, 0x18($s2) -/* B6CF24 80240B94 2402000D */ addiu $v0, $zero, 0xd -/* B6CF28 80240B98 E4800018 */ swc1 $f0, 0x18($a0) -/* B6CF2C 80240B9C 0C012530 */ jal func_800494C0 -/* B6CF30 80240BA0 AE220070 */ sw $v0, 0x70($s1) -/* B6CF34 80240BA4 8FBF001C */ lw $ra, 0x1c($sp) -/* B6CF38 80240BA8 8FB20018 */ lw $s2, 0x18($sp) -/* B6CF3C 80240BAC 8FB10014 */ lw $s1, 0x14($sp) -/* B6CF40 80240BB0 8FB00010 */ lw $s0, 0x10($sp) -/* B6CF44 80240BB4 03E00008 */ jr $ra -/* B6CF48 80240BB8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_10/func_80241130_B6C390.s b/asm/nonmatchings/world/area_jan/jan_10/func_80241130_B6C390.s deleted file mode 100644 index 94d23ee5f8..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/func_80241130_B6C390.s +++ /dev/null @@ -1,91 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241130_B6D4C0 -/* B6D4C0 80241130 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B6D4C4 80241134 AFB10034 */ sw $s1, 0x34($sp) -/* B6D4C8 80241138 0080882D */ daddu $s1, $a0, $zero -/* B6D4CC 8024113C AFBF0038 */ sw $ra, 0x38($sp) -/* B6D4D0 80241140 AFB00030 */ sw $s0, 0x30($sp) -/* B6D4D4 80241144 10A00016 */ beqz $a1, .L802411A0 -/* B6D4D8 80241148 8E30000C */ lw $s0, 0xc($s1) -/* B6D4DC 8024114C 8E050000 */ lw $a1, ($s0) -/* B6D4E0 80241150 0C0B1EAF */ jal get_variable -/* B6D4E4 80241154 26100004 */ addiu $s0, $s0, 4 -/* B6D4E8 80241158 8E030000 */ lw $v1, ($s0) -/* B6D4EC 8024115C 0040202D */ daddu $a0, $v0, $zero -/* B6D4F0 80241160 0C046C04 */ jal get_model_list_index_from_tree_index -/* B6D4F4 80241164 AE23007C */ sw $v1, 0x7c($s1) -/* B6D4F8 80241168 0C046B4C */ jal get_model_from_list_index -/* B6D4FC 8024116C 0040202D */ daddu $a0, $v0, $zero -/* B6D500 80241170 0040802D */ daddu $s0, $v0, $zero -/* B6D504 80241174 0000202D */ daddu $a0, $zero, $zero -/* B6D508 80241178 AE300074 */ sw $s0, 0x74($s1) -/* B6D50C 8024117C 8E050098 */ lw $a1, 0x98($s0) -/* B6D510 80241180 8E0700A0 */ lw $a3, 0xa0($s0) -/* B6D514 80241184 0C044898 */ jal create_shadow_type -/* B6D518 80241188 0000302D */ daddu $a2, $zero, $zero -/* B6D51C 8024118C 0220202D */ daddu $a0, $s1, $zero -/* B6D520 80241190 8E25007C */ lw $a1, 0x7c($s1) -/* B6D524 80241194 0000302D */ daddu $a2, $zero, $zero -/* B6D528 80241198 0C0B2026 */ jal set_variable -/* B6D52C 8024119C AE220078 */ sw $v0, 0x78($s1) -.L802411A0: -/* B6D530 802411A0 8E25007C */ lw $a1, 0x7c($s1) -/* B6D534 802411A4 0C0B1EAF */ jal get_variable -/* B6D538 802411A8 0220202D */ daddu $a0, $s1, $zero -/* B6D53C 802411AC 1440002A */ bnez $v0, .L80241258 -/* B6D540 802411B0 00000000 */ nop -/* B6D544 802411B4 8E240078 */ lw $a0, 0x78($s1) -/* B6D548 802411B8 0C044181 */ jal get_shadow_by_index -/* B6D54C 802411BC 8E300074 */ lw $s0, 0x74($s1) -/* B6D550 802411C0 27A40018 */ addiu $a0, $sp, 0x18 -/* B6D554 802411C4 27A5001C */ addiu $a1, $sp, 0x1c -/* B6D558 802411C8 27A60020 */ addiu $a2, $sp, 0x20 -/* B6D55C 802411CC 27A70024 */ addiu $a3, $sp, 0x24 -/* B6D560 802411D0 27A30028 */ addiu $v1, $sp, 0x28 -/* B6D564 802411D4 C6000098 */ lwc1 $f0, 0x98($s0) -/* B6D568 802411D8 C602009C */ lwc1 $f2, 0x9c($s0) -/* B6D56C 802411DC C60400A0 */ lwc1 $f4, 0xa0($s0) -/* B6D570 802411E0 0040802D */ daddu $s0, $v0, $zero -/* B6D574 802411E4 E7A00018 */ swc1 $f0, 0x18($sp) -/* B6D578 802411E8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* B6D57C 802411EC E7A40020 */ swc1 $f4, 0x20($sp) -/* B6D580 802411F0 AFA30010 */ sw $v1, 0x10($sp) -/* B6D584 802411F4 27A3002C */ addiu $v1, $sp, 0x2c -/* B6D588 802411F8 0C04497A */ jal func_801125E8 -/* B6D58C 802411FC AFA30014 */ sw $v1, 0x14($sp) -/* B6D590 80241200 8FA5002C */ lw $a1, 0x2c($sp) -/* B6D594 80241204 0C044A17 */ jal set_standard_shadow_scale -/* B6D598 80241208 0200202D */ daddu $a0, $s0, $zero -/* B6D59C 8024120C C7A00018 */ lwc1 $f0, 0x18($sp) -/* B6D5A0 80241210 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* B6D5A4 80241214 C7A60020 */ lwc1 $f6, 0x20($sp) -/* B6D5A8 80241218 C7A80024 */ lwc1 $f8, 0x24($sp) -/* B6D5AC 8024121C C604001C */ lwc1 $f4, 0x1c($s0) -/* B6D5B0 80241220 0000102D */ daddu $v0, $zero, $zero -/* B6D5B4 80241224 AE00002C */ sw $zero, 0x2c($s0) -/* B6D5B8 80241228 E6000010 */ swc1 $f0, 0x10($s0) -/* B6D5BC 8024122C C6000024 */ lwc1 $f0, 0x24($s0) -/* B6D5C0 80241230 46042100 */ add.s $f4, $f4, $f4 -/* B6D5C4 80241234 E6020014 */ swc1 $f2, 0x14($s0) -/* B6D5C8 80241238 E6060018 */ swc1 $f6, 0x18($s0) -/* B6D5CC 8024123C E6080028 */ swc1 $f8, 0x28($s0) -/* B6D5D0 80241240 C7A20028 */ lwc1 $f2, 0x28($sp) -/* B6D5D4 80241244 46000000 */ add.s $f0, $f0, $f0 -/* B6D5D8 80241248 E6020030 */ swc1 $f2, 0x30($s0) -/* B6D5DC 8024124C E604001C */ swc1 $f4, 0x1c($s0) -/* B6D5E0 80241250 0809049A */ j .L80241268 -/* B6D5E4 80241254 E6000024 */ swc1 $f0, 0x24($s0) -.L80241258: -/* B6D5E8 80241258 8E240078 */ lw $a0, 0x78($s1) -/* B6D5EC 8024125C 0C0448CA */ jal func_80112328 -/* B6D5F0 80241260 00000000 */ nop -/* B6D5F4 80241264 24020002 */ addiu $v0, $zero, 2 -.L80241268: -/* B6D5F8 80241268 8FBF0038 */ lw $ra, 0x38($sp) -/* B6D5FC 8024126C 8FB10034 */ lw $s1, 0x34($sp) -/* B6D600 80241270 8FB00030 */ lw $s0, 0x30($sp) -/* B6D604 80241274 03E00008 */ jr $ra -/* B6D608 80241278 27BD0040 */ addiu $sp, $sp, 0x40 -/* B6D60C 8024127C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_10/func_80241500_B6C390.s b/asm/nonmatchings/world/area_jan/jan_10/func_80241500_B6C390.s deleted file mode 100644 index 9a52b81cc0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/func_80241500_B6C390.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241500_B6D890 -/* B6D890 80241500 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B6D894 80241504 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B6D898 80241508 4485A000 */ mtc1 $a1, $f20 -/* B6D89C 8024150C F7B60020 */ sdc1 $f22, 0x20($sp) -/* B6D8A0 80241510 4486B000 */ mtc1 $a2, $f22 -/* B6D8A4 80241514 AFB00010 */ sw $s0, 0x10($sp) -/* B6D8A8 80241518 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B6D8AC 8024151C 4487C000 */ mtc1 $a3, $f24 -/* B6D8B0 80241520 AFBF0014 */ sw $ra, 0x14($sp) -/* B6D8B4 80241524 0C019D28 */ jal guMtxIdentF -/* B6D8B8 80241528 0080802D */ daddu $s0, $a0, $zero -/* B6D8BC 8024152C 4616A582 */ mul.s $f22, $f20, $f22 -/* B6D8C0 80241530 00000000 */ nop -/* B6D8C4 80241534 4618A502 */ mul.s $f20, $f20, $f24 -/* B6D8C8 80241538 00000000 */ nop -/* B6D8CC 8024153C 3C013F80 */ lui $at, 0x3f80 -/* B6D8D0 80241540 44810000 */ mtc1 $at, $f0 -/* B6D8D4 80241544 00000000 */ nop -/* B6D8D8 80241548 E6000014 */ swc1 $f0, 0x14($s0) -/* B6D8DC 8024154C E6160010 */ swc1 $f22, 0x10($s0) -/* B6D8E0 80241550 E6140018 */ swc1 $f20, 0x18($s0) -/* B6D8E4 80241554 8FBF0014 */ lw $ra, 0x14($sp) -/* B6D8E8 80241558 8FB00010 */ lw $s0, 0x10($sp) -/* B6D8EC 8024155C D7B80028 */ ldc1 $f24, 0x28($sp) -/* B6D8F0 80241560 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B6D8F4 80241564 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B6D8F8 80241568 03E00008 */ jr $ra -/* B6D8FC 8024156C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_10/func_80241570_B6C390.s b/asm/nonmatchings/world/area_jan/jan_10/func_80241570_B6C390.s deleted file mode 100644 index 507c088916..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/func_80241570_B6C390.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241570_B6D900 -/* B6D900 80241570 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B6D904 80241574 AFB10054 */ sw $s1, 0x54($sp) -/* B6D908 80241578 0080882D */ daddu $s1, $a0, $zero -/* B6D90C 8024157C AFBF005C */ sw $ra, 0x5c($sp) -/* B6D910 80241580 AFB20058 */ sw $s2, 0x58($sp) -/* B6D914 80241584 AFB00050 */ sw $s0, 0x50($sp) -/* B6D918 80241588 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B6D91C 8024158C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B6D920 80241590 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B6D924 80241594 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B6D928 80241598 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B6D92C 8024159C 8E30000C */ lw $s0, 0xc($s1) -/* B6D930 802415A0 8E050000 */ lw $a1, ($s0) -/* B6D934 802415A4 0C0B1EAF */ jal get_variable -/* B6D938 802415A8 26100004 */ addiu $s0, $s0, 4 -/* B6D93C 802415AC 0C046C04 */ jal get_model_list_index_from_tree_index -/* B6D940 802415B0 0040202D */ daddu $a0, $v0, $zero -/* B6D944 802415B4 8E050000 */ lw $a1, ($s0) -/* B6D948 802415B8 26100004 */ addiu $s0, $s0, 4 -/* B6D94C 802415BC 0220202D */ daddu $a0, $s1, $zero -/* B6D950 802415C0 0C0B210B */ jal get_float_variable -/* B6D954 802415C4 0040902D */ daddu $s2, $v0, $zero -/* B6D958 802415C8 8E050000 */ lw $a1, ($s0) -/* B6D95C 802415CC 26100004 */ addiu $s0, $s0, 4 -/* B6D960 802415D0 0220202D */ daddu $a0, $s1, $zero -/* B6D964 802415D4 0C0B210B */ jal get_float_variable -/* B6D968 802415D8 46000706 */ mov.s $f28, $f0 -/* B6D96C 802415DC 8E050000 */ lw $a1, ($s0) -/* B6D970 802415E0 26100004 */ addiu $s0, $s0, 4 -/* B6D974 802415E4 0220202D */ daddu $a0, $s1, $zero -/* B6D978 802415E8 0C0B210B */ jal get_float_variable -/* B6D97C 802415EC 46000686 */ mov.s $f26, $f0 -/* B6D980 802415F0 0220202D */ daddu $a0, $s1, $zero -/* B6D984 802415F4 8E050000 */ lw $a1, ($s0) -/* B6D988 802415F8 0C0B210B */ jal get_float_variable -/* B6D98C 802415FC 46000586 */ mov.s $f22, $f0 -/* B6D990 80241600 0240202D */ daddu $a0, $s2, $zero -/* B6D994 80241604 0C046B4C */ jal get_model_from_list_index -/* B6D998 80241608 46000606 */ mov.s $f24, $f0 -/* B6D99C 8024160C 0040882D */ daddu $s1, $v0, $zero -/* B6D9A0 80241610 96220000 */ lhu $v0, ($s1) -/* B6D9A4 80241614 30420400 */ andi $v0, $v0, 0x400 -/* B6D9A8 80241618 1440001E */ bnez $v0, .L80241694 -/* B6D9AC 8024161C 26300058 */ addiu $s0, $s1, 0x58 -/* B6D9B0 80241620 4480A000 */ mtc1 $zero, $f20 -/* B6D9B4 80241624 4406B000 */ mfc1 $a2, $f22 -/* B6D9B8 80241628 4405A000 */ mfc1 $a1, $f20 -/* B6D9BC 8024162C 4407A000 */ mfc1 $a3, $f20 -/* B6D9C0 80241630 0C019E40 */ jal guTranslateF -/* B6D9C4 80241634 0200202D */ daddu $a0, $s0, $zero -/* B6D9C8 80241638 4405E000 */ mfc1 $a1, $f28 -/* B6D9CC 8024163C 4406D000 */ mfc1 $a2, $f26 -/* B6D9D0 80241640 4407C000 */ mfc1 $a3, $f24 -/* B6D9D4 80241644 0C090540 */ jal func_80241500 -/* B6D9D8 80241648 27A40010 */ addiu $a0, $sp, 0x10 -/* B6D9DC 8024164C 27A40010 */ addiu $a0, $sp, 0x10 -/* B6D9E0 80241650 0200282D */ daddu $a1, $s0, $zero -/* B6D9E4 80241654 0C019D80 */ jal guMtxCatF -/* B6D9E8 80241658 0200302D */ daddu $a2, $s0, $zero -/* B6D9EC 8024165C 27A40010 */ addiu $a0, $sp, 0x10 -/* B6D9F0 80241660 4600B587 */ neg.s $f22, $f22 -/* B6D9F4 80241664 4405A000 */ mfc1 $a1, $f20 -/* B6D9F8 80241668 4406B000 */ mfc1 $a2, $f22 -/* B6D9FC 8024166C 0C019E40 */ jal guTranslateF -/* B6DA00 80241670 00A0382D */ daddu $a3, $a1, $zero -/* B6DA04 80241674 27A40010 */ addiu $a0, $sp, 0x10 -/* B6DA08 80241678 0200282D */ daddu $a1, $s0, $zero -/* B6DA0C 8024167C 0C019D80 */ jal guMtxCatF -/* B6DA10 80241680 00A0302D */ daddu $a2, $a1, $zero -/* B6DA14 80241684 96220000 */ lhu $v0, ($s1) -/* B6DA18 80241688 34421400 */ ori $v0, $v0, 0x1400 -/* B6DA1C 8024168C 080905C3 */ j .L8024170C -/* B6DA20 80241690 A6220000 */ sh $v0, ($s1) -.L80241694: -/* B6DA24 80241694 4480A000 */ mtc1 $zero, $f20 -/* B6DA28 80241698 4406B000 */ mfc1 $a2, $f22 -/* B6DA2C 8024169C 4405A000 */ mfc1 $a1, $f20 -/* B6DA30 802416A0 4407A000 */ mfc1 $a3, $f20 -/* B6DA34 802416A4 0C019E40 */ jal guTranslateF -/* B6DA38 802416A8 27A40010 */ addiu $a0, $sp, 0x10 -/* B6DA3C 802416AC 27A40010 */ addiu $a0, $sp, 0x10 -/* B6DA40 802416B0 26300058 */ addiu $s0, $s1, 0x58 -/* B6DA44 802416B4 0200282D */ daddu $a1, $s0, $zero -/* B6DA48 802416B8 0C019D80 */ jal guMtxCatF -/* B6DA4C 802416BC 0200302D */ daddu $a2, $s0, $zero -/* B6DA50 802416C0 4405E000 */ mfc1 $a1, $f28 -/* B6DA54 802416C4 4406D000 */ mfc1 $a2, $f26 -/* B6DA58 802416C8 4407C000 */ mfc1 $a3, $f24 -/* B6DA5C 802416CC 0C090540 */ jal func_80241500 -/* B6DA60 802416D0 27A40010 */ addiu $a0, $sp, 0x10 -/* B6DA64 802416D4 27A40010 */ addiu $a0, $sp, 0x10 -/* B6DA68 802416D8 0200282D */ daddu $a1, $s0, $zero -/* B6DA6C 802416DC 0C019D80 */ jal guMtxCatF -/* B6DA70 802416E0 0200302D */ daddu $a2, $s0, $zero -/* B6DA74 802416E4 27A40010 */ addiu $a0, $sp, 0x10 -/* B6DA78 802416E8 4600B587 */ neg.s $f22, $f22 -/* B6DA7C 802416EC 4405A000 */ mfc1 $a1, $f20 -/* B6DA80 802416F0 4406B000 */ mfc1 $a2, $f22 -/* B6DA84 802416F4 0C019E40 */ jal guTranslateF -/* B6DA88 802416F8 00A0382D */ daddu $a3, $a1, $zero -/* B6DA8C 802416FC 27A40010 */ addiu $a0, $sp, 0x10 -/* B6DA90 80241700 0200282D */ daddu $a1, $s0, $zero -/* B6DA94 80241704 0C019D80 */ jal guMtxCatF -/* B6DA98 80241708 00A0302D */ daddu $a2, $a1, $zero -.L8024170C: -/* B6DA9C 8024170C 8FBF005C */ lw $ra, 0x5c($sp) -/* B6DAA0 80241710 8FB20058 */ lw $s2, 0x58($sp) -/* B6DAA4 80241714 8FB10054 */ lw $s1, 0x54($sp) -/* B6DAA8 80241718 8FB00050 */ lw $s0, 0x50($sp) -/* B6DAAC 8024171C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B6DAB0 80241720 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B6DAB4 80241724 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B6DAB8 80241728 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B6DABC 8024172C D7B40060 */ ldc1 $f20, 0x60($sp) -/* B6DAC0 80241730 24020002 */ addiu $v0, $zero, 2 -/* B6DAC4 80241734 03E00008 */ jr $ra -/* B6DAC8 80241738 27BD0088 */ addiu $sp, $sp, 0x88 -/* B6DACC 8024173C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_11/func_80240158_B70860.s b/asm/nonmatchings/world/area_jan/jan_11/func_80240158_B70860.s deleted file mode 100644 index 4ba70a853b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_11/func_80240158_B70860.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_B709B8 -/* B709B8 80240158 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B709BC 8024015C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B709C0 80240160 8C430004 */ lw $v1, 4($v0) -/* B709C4 80240164 3C040010 */ lui $a0, 0x10 -/* B709C8 80240168 00641825 */ or $v1, $v1, $a0 -/* B709CC 8024016C AC430004 */ sw $v1, 4($v0) -/* B709D0 80240170 03E00008 */ jr $ra -/* B709D4 80240174 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_11/func_80240178_B70860.s b/asm/nonmatchings/world/area_jan/jan_11/func_80240178_B70860.s deleted file mode 100644 index d1f52c9fa3..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_11/func_80240178_B70860.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240178_B709D8 -/* B709D8 80240178 3C028016 */ lui $v0, 0x8016 -/* B709DC 8024017C 8442A552 */ lh $v0, -0x5aae($v0) -/* B709E0 80240180 AC820084 */ sw $v0, 0x84($a0) -/* B709E4 80240184 03E00008 */ jr $ra -/* B709E8 80240188 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_11/func_80240394_B70860.s b/asm/nonmatchings/world/area_jan/jan_11/func_80240394_B70860.s deleted file mode 100644 index 2ea65fc2a0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_11/func_80240394_B70860.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240394_B70BF4 -/* B70BF4 80240394 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B70BF8 80240398 AFB00018 */ sw $s0, 0x18($sp) -/* B70BFC 8024039C 0080802D */ daddu $s0, $a0, $zero -/* B70C00 802403A0 AFBF001C */ sw $ra, 0x1c($sp) -/* B70C04 802403A4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* B70C08 802403A8 8E02000C */ lw $v0, 0xc($s0) -/* B70C0C 802403AC 0C0B210B */ jal get_float_variable -/* B70C10 802403B0 8C450000 */ lw $a1, ($v0) -/* B70C14 802403B4 27A40010 */ addiu $a0, $sp, 0x10 -/* B70C18 802403B8 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* B70C1C 802403BC 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* B70C20 802403C0 44060000 */ mfc1 $a2, $f0 -/* B70C24 802403C4 C4400028 */ lwc1 $f0, 0x28($v0) -/* B70C28 802403C8 C4420030 */ lwc1 $f2, 0x30($v0) -/* B70C2C 802403CC E7A00010 */ swc1 $f0, 0x10($sp) -/* B70C30 802403D0 E7A20014 */ swc1 $f2, 0x14($sp) -/* B70C34 802403D4 8C470080 */ lw $a3, 0x80($v0) -/* B70C38 802403D8 C454002C */ lwc1 $f20, 0x2c($v0) -/* B70C3C 802403DC 0C00A7E7 */ jal add_vec2D_polar -/* B70C40 802403E0 27A50014 */ addiu $a1, $sp, 0x14 -/* B70C44 802403E4 0200202D */ daddu $a0, $s0, $zero -/* B70C48 802403E8 3C05FE36 */ lui $a1, 0xfe36 -/* B70C4C 802403EC 8FA60010 */ lw $a2, 0x10($sp) -/* B70C50 802403F0 0C0B2190 */ jal set_float_variable -/* B70C54 802403F4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B70C58 802403F8 0200202D */ daddu $a0, $s0, $zero -/* B70C5C 802403FC 3C05FE36 */ lui $a1, 0xfe36 -/* B70C60 80240400 4406A000 */ mfc1 $a2, $f20 -/* B70C64 80240404 0C0B2190 */ jal set_float_variable -/* B70C68 80240408 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B70C6C 8024040C 0200202D */ daddu $a0, $s0, $zero -/* B70C70 80240410 3C05FE36 */ lui $a1, 0xfe36 -/* B70C74 80240414 8FA60014 */ lw $a2, 0x14($sp) -/* B70C78 80240418 0C0B2190 */ jal set_float_variable -/* B70C7C 8024041C 34A53C82 */ ori $a1, $a1, 0x3c82 -/* B70C80 80240420 8FBF001C */ lw $ra, 0x1c($sp) -/* B70C84 80240424 8FB00018 */ lw $s0, 0x18($sp) -/* B70C88 80240428 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B70C8C 8024042C 24020002 */ addiu $v0, $zero, 2 -/* B70C90 80240430 03E00008 */ jr $ra -/* B70C94 80240434 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_12/func_80240170_B730B0.s b/asm/nonmatchings/world/area_jan/jan_12/func_80240170_B730B0.s deleted file mode 100644 index db1d495d0b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/func_80240170_B730B0.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240170_B73220 -/* B73220 80240170 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B73224 80240174 AFB00010 */ sw $s0, 0x10($sp) -/* B73228 80240178 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B7322C 8024017C 4485A000 */ mtc1 $a1, $f20 -/* B73230 80240180 AFBF0014 */ sw $ra, 0x14($sp) -/* B73234 80240184 0C019D28 */ jal guMtxIdentF -/* B73238 80240188 0080802D */ daddu $s0, $a0, $zero -/* B7323C 8024018C 3C018024 */ lui $at, 0x8024 -/* B73240 80240190 D42033B0 */ ldc1 $f0, 0x33b0($at) -/* B73244 80240194 4600A521 */ cvt.d.s $f20, $f20 -/* B73248 80240198 4620A502 */ mul.d $f20, $f20, $f0 -/* B7324C 8024019C 00000000 */ nop -/* B73250 802401A0 3C013F80 */ lui $at, 0x3f80 -/* B73254 802401A4 44810000 */ mtc1 $at, $f0 -/* B73258 802401A8 AE000018 */ sw $zero, 0x18($s0) -/* B7325C 802401AC E6000014 */ swc1 $f0, 0x14($s0) -/* B73260 802401B0 4620A520 */ cvt.s.d $f20, $f20 -/* B73264 802401B4 E6140010 */ swc1 $f20, 0x10($s0) -/* B73268 802401B8 8FBF0014 */ lw $ra, 0x14($sp) -/* B7326C 802401BC 8FB00010 */ lw $s0, 0x10($sp) -/* B73270 802401C0 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B73274 802401C4 03E00008 */ jr $ra -/* B73278 802401C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_12/func_802401CC_B730B0.s b/asm/nonmatchings/world/area_jan/jan_12/func_802401CC_B730B0.s deleted file mode 100644 index 211ee62865..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/func_802401CC_B730B0.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401CC_B7327C -/* B7327C 802401CC 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B73280 802401D0 AFB10054 */ sw $s1, 0x54($sp) -/* B73284 802401D4 0080882D */ daddu $s1, $a0, $zero -/* B73288 802401D8 AFBF0058 */ sw $ra, 0x58($sp) -/* B7328C 802401DC AFB00050 */ sw $s0, 0x50($sp) -/* B73290 802401E0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B73294 802401E4 8E30000C */ lw $s0, 0xc($s1) -/* B73298 802401E8 8E050000 */ lw $a1, ($s0) -/* B7329C 802401EC 0C0B1EAF */ jal get_variable -/* B732A0 802401F0 26100004 */ addiu $s0, $s0, 4 -/* B732A4 802401F4 0C046C04 */ jal get_model_list_index_from_tree_index -/* B732A8 802401F8 0040202D */ daddu $a0, $v0, $zero -/* B732AC 802401FC 0220202D */ daddu $a0, $s1, $zero -/* B732B0 80240200 8E050000 */ lw $a1, ($s0) -/* B732B4 80240204 0C0B210B */ jal get_float_variable -/* B732B8 80240208 0040802D */ daddu $s0, $v0, $zero -/* B732BC 8024020C 0200202D */ daddu $a0, $s0, $zero -/* B732C0 80240210 0C046B4C */ jal get_model_from_list_index -/* B732C4 80240214 46000506 */ mov.s $f20, $f0 -/* B732C8 80240218 0040802D */ daddu $s0, $v0, $zero -/* B732CC 8024021C 96020000 */ lhu $v0, ($s0) -/* B732D0 80240220 30420400 */ andi $v0, $v0, 0x400 -/* B732D4 80240224 14400008 */ bnez $v0, .L80240248 -/* B732D8 80240228 00000000 */ nop -/* B732DC 8024022C 4405A000 */ mfc1 $a1, $f20 -/* B732E0 80240230 0C09005C */ jal func_80240170 -/* B732E4 80240234 26040058 */ addiu $a0, $s0, 0x58 -/* B732E8 80240238 96020000 */ lhu $v0, ($s0) -/* B732EC 8024023C 34421400 */ ori $v0, $v0, 0x1400 -/* B732F0 80240240 08090099 */ j .L80240264 -/* B732F4 80240244 A6020000 */ sh $v0, ($s0) -.L80240248: -/* B732F8 80240248 4405A000 */ mfc1 $a1, $f20 -/* B732FC 8024024C 0C09005C */ jal func_80240170 -/* B73300 80240250 27A40010 */ addiu $a0, $sp, 0x10 -/* B73304 80240254 27A40010 */ addiu $a0, $sp, 0x10 -/* B73308 80240258 26050058 */ addiu $a1, $s0, 0x58 -/* B7330C 8024025C 0C019D80 */ jal guMtxCatF -/* B73310 80240260 00A0302D */ daddu $a2, $a1, $zero -.L80240264: -/* B73314 80240264 8FBF0058 */ lw $ra, 0x58($sp) -/* B73318 80240268 8FB10054 */ lw $s1, 0x54($sp) -/* B7331C 8024026C 8FB00050 */ lw $s0, 0x50($sp) -/* B73320 80240270 D7B40060 */ ldc1 $f20, 0x60($sp) -/* B73324 80240274 24020002 */ addiu $v0, $zero, 2 -/* B73328 80240278 03E00008 */ jr $ra -/* B7332C 8024027C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_jan/jan_12/func_80240280_B730B0.s b/asm/nonmatchings/world/area_jan/jan_12/func_80240280_B730B0.s deleted file mode 100644 index ca5f07e774..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/func_80240280_B730B0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240280_B73330 -/* B73330 80240280 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B73334 80240284 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B73338 80240288 4485A000 */ mtc1 $a1, $f20 -/* B7333C 8024028C F7B60020 */ sdc1 $f22, 0x20($sp) -/* B73340 80240290 4486B000 */ mtc1 $a2, $f22 -/* B73344 80240294 AFB00010 */ sw $s0, 0x10($sp) -/* B73348 80240298 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B7334C 8024029C 4487C000 */ mtc1 $a3, $f24 -/* B73350 802402A0 AFBF0014 */ sw $ra, 0x14($sp) -/* B73354 802402A4 0C019D28 */ jal guMtxIdentF -/* B73358 802402A8 0080802D */ daddu $s0, $a0, $zero -/* B7335C 802402AC 4616A582 */ mul.s $f22, $f20, $f22 -/* B73360 802402B0 00000000 */ nop -/* B73364 802402B4 4618A502 */ mul.s $f20, $f20, $f24 -/* B73368 802402B8 00000000 */ nop -/* B7336C 802402BC 3C013F80 */ lui $at, 0x3f80 -/* B73370 802402C0 44810000 */ mtc1 $at, $f0 -/* B73374 802402C4 00000000 */ nop -/* B73378 802402C8 E6000014 */ swc1 $f0, 0x14($s0) -/* B7337C 802402CC E6160010 */ swc1 $f22, 0x10($s0) -/* B73380 802402D0 E6140018 */ swc1 $f20, 0x18($s0) -/* B73384 802402D4 8FBF0014 */ lw $ra, 0x14($sp) -/* B73388 802402D8 8FB00010 */ lw $s0, 0x10($sp) -/* B7338C 802402DC D7B80028 */ ldc1 $f24, 0x28($sp) -/* B73390 802402E0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B73394 802402E4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B73398 802402E8 03E00008 */ jr $ra -/* B7339C 802402EC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_12/func_802402F0_B730B0.s b/asm/nonmatchings/world/area_jan/jan_12/func_802402F0_B730B0.s deleted file mode 100644 index 3f40f3effa..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/func_802402F0_B730B0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_B733A0 -/* B733A0 802402F0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B733A4 802402F4 AFB10054 */ sw $s1, 0x54($sp) -/* B733A8 802402F8 0080882D */ daddu $s1, $a0, $zero -/* B733AC 802402FC AFBF005C */ sw $ra, 0x5c($sp) -/* B733B0 80240300 AFB20058 */ sw $s2, 0x58($sp) -/* B733B4 80240304 AFB00050 */ sw $s0, 0x50($sp) -/* B733B8 80240308 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B733BC 8024030C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B733C0 80240310 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B733C4 80240314 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B733C8 80240318 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B733CC 8024031C 8E30000C */ lw $s0, 0xc($s1) -/* B733D0 80240320 8E050000 */ lw $a1, ($s0) -/* B733D4 80240324 0C0B1EAF */ jal get_variable -/* B733D8 80240328 26100004 */ addiu $s0, $s0, 4 -/* B733DC 8024032C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B733E0 80240330 0040202D */ daddu $a0, $v0, $zero -/* B733E4 80240334 8E050000 */ lw $a1, ($s0) -/* B733E8 80240338 26100004 */ addiu $s0, $s0, 4 -/* B733EC 8024033C 0220202D */ daddu $a0, $s1, $zero -/* B733F0 80240340 0C0B210B */ jal get_float_variable -/* B733F4 80240344 0040902D */ daddu $s2, $v0, $zero -/* B733F8 80240348 8E050000 */ lw $a1, ($s0) -/* B733FC 8024034C 26100004 */ addiu $s0, $s0, 4 -/* B73400 80240350 0220202D */ daddu $a0, $s1, $zero -/* B73404 80240354 0C0B210B */ jal get_float_variable -/* B73408 80240358 46000706 */ mov.s $f28, $f0 -/* B7340C 8024035C 8E050000 */ lw $a1, ($s0) -/* B73410 80240360 26100004 */ addiu $s0, $s0, 4 -/* B73414 80240364 0220202D */ daddu $a0, $s1, $zero -/* B73418 80240368 0C0B210B */ jal get_float_variable -/* B7341C 8024036C 46000686 */ mov.s $f26, $f0 -/* B73420 80240370 0220202D */ daddu $a0, $s1, $zero -/* B73424 80240374 8E050000 */ lw $a1, ($s0) -/* B73428 80240378 0C0B210B */ jal get_float_variable -/* B7342C 8024037C 46000586 */ mov.s $f22, $f0 -/* B73430 80240380 0240202D */ daddu $a0, $s2, $zero -/* B73434 80240384 0C046B4C */ jal get_model_from_list_index -/* B73438 80240388 46000606 */ mov.s $f24, $f0 -/* B7343C 8024038C 0040882D */ daddu $s1, $v0, $zero -/* B73440 80240390 96220000 */ lhu $v0, ($s1) -/* B73444 80240394 30420400 */ andi $v0, $v0, 0x400 -/* B73448 80240398 1440001E */ bnez $v0, .L80240414 -/* B7344C 8024039C 26300058 */ addiu $s0, $s1, 0x58 -/* B73450 802403A0 4480A000 */ mtc1 $zero, $f20 -/* B73454 802403A4 4406B000 */ mfc1 $a2, $f22 -/* B73458 802403A8 4405A000 */ mfc1 $a1, $f20 -/* B7345C 802403AC 4407A000 */ mfc1 $a3, $f20 -/* B73460 802403B0 0C019E40 */ jal guTranslateF -/* B73464 802403B4 0200202D */ daddu $a0, $s0, $zero -/* B73468 802403B8 4405E000 */ mfc1 $a1, $f28 -/* B7346C 802403BC 4406D000 */ mfc1 $a2, $f26 -/* B73470 802403C0 4407C000 */ mfc1 $a3, $f24 -/* B73474 802403C4 0C0900A0 */ jal func_80240280 -/* B73478 802403C8 27A40010 */ addiu $a0, $sp, 0x10 -/* B7347C 802403CC 27A40010 */ addiu $a0, $sp, 0x10 -/* B73480 802403D0 0200282D */ daddu $a1, $s0, $zero -/* B73484 802403D4 0C019D80 */ jal guMtxCatF -/* B73488 802403D8 0200302D */ daddu $a2, $s0, $zero -/* B7348C 802403DC 27A40010 */ addiu $a0, $sp, 0x10 -/* B73490 802403E0 4600B587 */ neg.s $f22, $f22 -/* B73494 802403E4 4405A000 */ mfc1 $a1, $f20 -/* B73498 802403E8 4406B000 */ mfc1 $a2, $f22 -/* B7349C 802403EC 0C019E40 */ jal guTranslateF -/* B734A0 802403F0 00A0382D */ daddu $a3, $a1, $zero -/* B734A4 802403F4 27A40010 */ addiu $a0, $sp, 0x10 -/* B734A8 802403F8 0200282D */ daddu $a1, $s0, $zero -/* B734AC 802403FC 0C019D80 */ jal guMtxCatF -/* B734B0 80240400 00A0302D */ daddu $a2, $a1, $zero -/* B734B4 80240404 96220000 */ lhu $v0, ($s1) -/* B734B8 80240408 34421400 */ ori $v0, $v0, 0x1400 -/* B734BC 8024040C 08090123 */ j .L8024048C -/* B734C0 80240410 A6220000 */ sh $v0, ($s1) -.L80240414: -/* B734C4 80240414 4480A000 */ mtc1 $zero, $f20 -/* B734C8 80240418 4406B000 */ mfc1 $a2, $f22 -/* B734CC 8024041C 4405A000 */ mfc1 $a1, $f20 -/* B734D0 80240420 4407A000 */ mfc1 $a3, $f20 -/* B734D4 80240424 0C019E40 */ jal guTranslateF -/* B734D8 80240428 27A40010 */ addiu $a0, $sp, 0x10 -/* B734DC 8024042C 27A40010 */ addiu $a0, $sp, 0x10 -/* B734E0 80240430 26300058 */ addiu $s0, $s1, 0x58 -/* B734E4 80240434 0200282D */ daddu $a1, $s0, $zero -/* B734E8 80240438 0C019D80 */ jal guMtxCatF -/* B734EC 8024043C 0200302D */ daddu $a2, $s0, $zero -/* B734F0 80240440 4405E000 */ mfc1 $a1, $f28 -/* B734F4 80240444 4406D000 */ mfc1 $a2, $f26 -/* B734F8 80240448 4407C000 */ mfc1 $a3, $f24 -/* B734FC 8024044C 0C0900A0 */ jal func_80240280 -/* B73500 80240450 27A40010 */ addiu $a0, $sp, 0x10 -/* B73504 80240454 27A40010 */ addiu $a0, $sp, 0x10 -/* B73508 80240458 0200282D */ daddu $a1, $s0, $zero -/* B7350C 8024045C 0C019D80 */ jal guMtxCatF -/* B73510 80240460 0200302D */ daddu $a2, $s0, $zero -/* B73514 80240464 27A40010 */ addiu $a0, $sp, 0x10 -/* B73518 80240468 4600B587 */ neg.s $f22, $f22 -/* B7351C 8024046C 4405A000 */ mfc1 $a1, $f20 -/* B73520 80240470 4406B000 */ mfc1 $a2, $f22 -/* B73524 80240474 0C019E40 */ jal guTranslateF -/* B73528 80240478 00A0382D */ daddu $a3, $a1, $zero -/* B7352C 8024047C 27A40010 */ addiu $a0, $sp, 0x10 -/* B73530 80240480 0200282D */ daddu $a1, $s0, $zero -/* B73534 80240484 0C019D80 */ jal guMtxCatF -/* B73538 80240488 00A0302D */ daddu $a2, $a1, $zero -.L8024048C: -/* B7353C 8024048C 8FBF005C */ lw $ra, 0x5c($sp) -/* B73540 80240490 8FB20058 */ lw $s2, 0x58($sp) -/* B73544 80240494 8FB10054 */ lw $s1, 0x54($sp) -/* B73548 80240498 8FB00050 */ lw $s0, 0x50($sp) -/* B7354C 8024049C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B73550 802404A0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B73554 802404A4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B73558 802404A8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B7355C 802404AC D7B40060 */ ldc1 $f20, 0x60($sp) -/* B73560 802404B0 24020002 */ addiu $v0, $zero, 2 -/* B73564 802404B4 03E00008 */ jr $ra -/* B73568 802404B8 27BD0088 */ addiu $sp, $sp, 0x88 -/* B7356C 802404BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_12/func_802404C0_B730B0.s b/asm/nonmatchings/world/area_jan/jan_12/func_802404C0_B730B0.s deleted file mode 100644 index 0a5af6835d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/func_802404C0_B730B0.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_B73570 -/* B73570 802404C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B73574 802404C4 AFB10014 */ sw $s1, 0x14($sp) -/* B73578 802404C8 0080882D */ daddu $s1, $a0, $zero -/* B7357C 802404CC AFBF0018 */ sw $ra, 0x18($sp) -/* B73580 802404D0 AFB00010 */ sw $s0, 0x10($sp) -/* B73584 802404D4 8E300148 */ lw $s0, 0x148($s1) -/* B73588 802404D8 0C00EABB */ jal get_npc_unsafe -/* B7358C 802404DC 86040008 */ lh $a0, 8($s0) -/* B73590 802404E0 3C054387 */ lui $a1, 0x4387 -/* B73594 802404E4 0040202D */ daddu $a0, $v0, $zero -/* B73598 802404E8 0C00ECD0 */ jal set_npc_yaw -/* B7359C 802404EC A480008E */ sh $zero, 0x8e($a0) -/* B735A0 802404F0 24020003 */ addiu $v0, $zero, 3 -/* B735A4 802404F4 AE00006C */ sw $zero, 0x6c($s0) -/* B735A8 802404F8 AE220070 */ sw $v0, 0x70($s1) -/* B735AC 802404FC 8FBF0018 */ lw $ra, 0x18($sp) -/* B735B0 80240500 8FB10014 */ lw $s1, 0x14($sp) -/* B735B4 80240504 8FB00010 */ lw $s0, 0x10($sp) -/* B735B8 80240508 03E00008 */ jr $ra -/* B735BC 8024050C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_12/func_80240510_B730B0.s b/asm/nonmatchings/world/area_jan/jan_12/func_80240510_B730B0.s deleted file mode 100644 index edc5779f50..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/func_80240510_B730B0.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240510_B735C0 -/* B735C0 80240510 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B735C4 80240514 AFB20028 */ sw $s2, 0x28($sp) -/* B735C8 80240518 0080902D */ daddu $s2, $a0, $zero -/* B735CC 8024051C AFBF002C */ sw $ra, 0x2c($sp) -/* B735D0 80240520 AFB10024 */ sw $s1, 0x24($sp) -/* B735D4 80240524 AFB00020 */ sw $s0, 0x20($sp) -/* B735D8 80240528 8E500148 */ lw $s0, 0x148($s2) -/* B735DC 8024052C 0C00EABB */ jal get_npc_unsafe -/* B735E0 80240530 86040008 */ lh $a0, 8($s0) -/* B735E4 80240534 8E03006C */ lw $v1, 0x6c($s0) -/* B735E8 80240538 1460000B */ bnez $v1, .L80240568 -/* B735EC 8024053C 0040882D */ daddu $s1, $v0, $zero -/* B735F0 80240540 0C00A67F */ jal rand_int -/* B735F4 80240544 24040064 */ addiu $a0, $zero, 0x64 -/* B735F8 80240548 28420032 */ slti $v0, $v0, 0x32 -/* B735FC 8024054C 14400002 */ bnez $v0, .L80240558 -/* B73600 80240550 24020001 */ addiu $v0, $zero, 1 -/* B73604 80240554 24020003 */ addiu $v0, $zero, 3 -.L80240558: -/* B73608 80240558 AE02006C */ sw $v0, 0x6c($s0) -/* B7360C 8024055C 3C054387 */ lui $a1, 0x4387 -/* B73610 80240560 0C00ECD0 */ jal set_npc_yaw -/* B73614 80240564 0220202D */ daddu $a0, $s1, $zero -.L80240568: -/* B73618 80240568 8E02006C */ lw $v0, 0x6c($s0) -/* B7361C 8024056C 2443FFFF */ addiu $v1, $v0, -1 -/* B73620 80240570 2C620006 */ sltiu $v0, $v1, 6 -/* B73624 80240574 1040004D */ beqz $v0, .L802406AC -/* B73628 80240578 00031080 */ sll $v0, $v1, 2 -/* B7362C 8024057C 3C018024 */ lui $at, 0x8024 -/* B73630 80240580 00220821 */ addu $at, $at, $v0 -/* B73634 80240584 8C2233C0 */ lw $v0, 0x33c0($at) -/* B73638 80240588 00400008 */ jr $v0 -/* B7363C 8024058C 00000000 */ nop -/* B73640 80240590 3C030042 */ lui $v1, 0x42 -/* B73644 80240594 3463000F */ ori $v1, $v1, 0xf -/* B73648 80240598 24020002 */ addiu $v0, $zero, 2 -/* B7364C 8024059C AE02006C */ sw $v0, 0x6c($s0) -/* B73650 802405A0 AE000070 */ sw $zero, 0x70($s0) -/* B73654 802405A4 AE230028 */ sw $v1, 0x28($s1) -/* B73658 802405A8 8E020070 */ lw $v0, 0x70($s0) -/* B7365C 802405AC 24420001 */ addiu $v0, $v0, 1 -/* B73660 802405B0 AE020070 */ sw $v0, 0x70($s0) -/* B73664 802405B4 28420033 */ slti $v0, $v0, 0x33 -/* B73668 802405B8 1440003C */ bnez $v0, .L802406AC -/* B7366C 802405BC 24020005 */ addiu $v0, $zero, 5 -/* B73670 802405C0 080901AB */ j .L802406AC -/* B73674 802405C4 AE02006C */ sw $v0, 0x6c($s0) -/* B73678 802405C8 3C030042 */ lui $v1, 0x42 -/* B7367C 802405CC 34630010 */ ori $v1, $v1, 0x10 -/* B73680 802405D0 24020004 */ addiu $v0, $zero, 4 -/* B73684 802405D4 AE02006C */ sw $v0, 0x6c($s0) -/* B73688 802405D8 AE000070 */ sw $zero, 0x70($s0) -/* B7368C 802405DC AE230028 */ sw $v1, 0x28($s1) -/* B73690 802405E0 8E020070 */ lw $v0, 0x70($s0) -/* B73694 802405E4 24030019 */ addiu $v1, $zero, 0x19 -/* B73698 802405E8 24420001 */ addiu $v0, $v0, 1 -/* B7369C 802405EC 14430005 */ bne $v0, $v1, .L80240604 -/* B736A0 802405F0 AE020070 */ sw $v0, 0x70($s0) -/* B736A4 802405F4 3C0142B4 */ lui $at, 0x42b4 -/* B736A8 802405F8 44810000 */ mtc1 $at, $f0 -/* B736AC 802405FC 00000000 */ nop -/* B736B0 80240600 E620000C */ swc1 $f0, 0xc($s1) -.L80240604: -/* B736B4 80240604 8E020070 */ lw $v0, 0x70($s0) -/* B736B8 80240608 2842003D */ slti $v0, $v0, 0x3d -/* B736BC 8024060C 14400027 */ bnez $v0, .L802406AC -/* B736C0 80240610 24020005 */ addiu $v0, $zero, 5 -/* B736C4 80240614 080901AB */ j .L802406AC -/* B736C8 80240618 AE02006C */ sw $v0, 0x6c($s0) -/* B736CC 8024061C 3C030042 */ lui $v1, 0x42 -/* B736D0 80240620 24020006 */ addiu $v0, $zero, 6 -/* B736D4 80240624 34630003 */ ori $v1, $v1, 3 -/* B736D8 80240628 AE02006C */ sw $v0, 0x6c($s0) -/* B736DC 8024062C AE000070 */ sw $zero, 0x70($s0) -/* B736E0 80240630 862400A8 */ lh $a0, 0xa8($s1) -/* B736E4 80240634 2402000A */ addiu $v0, $zero, 0xa -/* B736E8 80240638 AE230028 */ sw $v1, 0x28($s1) -/* B736EC 8024063C AFA00014 */ sw $zero, 0x14($sp) -/* B736F0 80240640 AFA20018 */ sw $v0, 0x18($sp) -/* B736F4 80240644 44840000 */ mtc1 $a0, $f0 -/* B736F8 80240648 00000000 */ nop -/* B736FC 8024064C 46800020 */ cvt.s.w $f0, $f0 -/* B73700 80240650 E7A00010 */ swc1 $f0, 0x10($sp) -/* B73704 80240654 8E250038 */ lw $a1, 0x38($s1) -/* B73708 80240658 8E26003C */ lw $a2, 0x3c($s1) -/* B7370C 8024065C 8E270040 */ lw $a3, 0x40($s1) -/* B73710 80240660 0C01C1E4 */ jal fx_sweat -/* B73714 80240664 0000202D */ daddu $a0, $zero, $zero -/* B73718 80240668 8E020070 */ lw $v0, 0x70($s0) -/* B7371C 8024066C 24420001 */ addiu $v0, $v0, 1 -/* B73720 80240670 AE020070 */ sw $v0, 0x70($s0) -/* B73724 80240674 2842000B */ slti $v0, $v0, 0xb -/* B73728 80240678 1440000C */ bnez $v0, .L802406AC -/* B7372C 8024067C 00000000 */ nop -/* B73730 80240680 0C00A67F */ jal rand_int -/* B73734 80240684 24040064 */ addiu $a0, $zero, 0x64 -/* B73738 80240688 0040182D */ daddu $v1, $v0, $zero -/* B7373C 8024068C 2862005A */ slti $v0, $v1, 0x5a -/* B73740 80240690 14400005 */ bnez $v0, .L802406A8 -/* B73744 80240694 24020007 */ addiu $v0, $zero, 7 -/* B73748 80240698 2862005F */ slti $v0, $v1, 0x5f -/* B7374C 8024069C 14400002 */ bnez $v0, .L802406A8 -/* B73750 802406A0 24020001 */ addiu $v0, $zero, 1 -/* B73754 802406A4 24020003 */ addiu $v0, $zero, 3 -.L802406A8: -/* B73758 802406A8 AE02006C */ sw $v0, 0x6c($s0) -.L802406AC: -/* B7375C 802406AC 8E03006C */ lw $v1, 0x6c($s0) -/* B73760 802406B0 24020007 */ addiu $v0, $zero, 7 -/* B73764 802406B4 50620001 */ beql $v1, $v0, .L802406BC -/* B73768 802406B8 AE400070 */ sw $zero, 0x70($s2) -.L802406BC: -/* B7376C 802406BC 8FBF002C */ lw $ra, 0x2c($sp) -/* B73770 802406C0 8FB20028 */ lw $s2, 0x28($sp) -/* B73774 802406C4 8FB10024 */ lw $s1, 0x24($sp) -/* B73778 802406C8 8FB00020 */ lw $s0, 0x20($sp) -/* B7377C 802406CC 03E00008 */ jr $ra -/* B73780 802406D0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_12/func_802406D4_B730B0.s b/asm/nonmatchings/world/area_jan/jan_12/func_802406D4_B730B0.s deleted file mode 100644 index 6618c812e0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/func_802406D4_B730B0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406D4_B73784 -/* B73784 802406D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B73788 802406D8 AFB10014 */ sw $s1, 0x14($sp) -/* B7378C 802406DC 0080882D */ daddu $s1, $a0, $zero -/* B73790 802406E0 AFBF0018 */ sw $ra, 0x18($sp) -/* B73794 802406E4 AFB00010 */ sw $s0, 0x10($sp) -/* B73798 802406E8 8E300148 */ lw $s0, 0x148($s1) -/* B7379C 802406EC 0C00EABB */ jal get_npc_unsafe -/* B737A0 802406F0 86040008 */ lh $a0, 8($s0) -/* B737A4 802406F4 24030001 */ addiu $v1, $zero, 1 -/* B737A8 802406F8 0040202D */ daddu $a0, $v0, $zero -/* B737AC 802406FC AE03006C */ sw $v1, 0x6c($s0) -/* B737B0 80240700 8482008C */ lh $v0, 0x8c($a0) -/* B737B4 80240704 14400009 */ bnez $v0, .L8024072C -/* B737B8 80240708 24020002 */ addiu $v0, $zero, 2 -/* B737BC 8024070C 96030072 */ lhu $v1, 0x72($s0) -/* B737C0 80240710 AE02006C */ sw $v0, 0x6c($s0) -/* B737C4 80240714 A483008E */ sh $v1, 0x8e($a0) -/* B737C8 80240718 8E0200CC */ lw $v0, 0xcc($s0) -/* B737CC 8024071C 8C420020 */ lw $v0, 0x20($v0) -/* B737D0 80240720 AC820028 */ sw $v0, 0x28($a0) -/* B737D4 80240724 2402001F */ addiu $v0, $zero, 0x1f -/* B737D8 80240728 AE220070 */ sw $v0, 0x70($s1) -.L8024072C: -/* B737DC 8024072C 8FBF0018 */ lw $ra, 0x18($sp) -/* B737E0 80240730 8FB10014 */ lw $s1, 0x14($sp) -/* B737E4 80240734 8FB00010 */ lw $s0, 0x10($sp) -/* B737E8 80240738 03E00008 */ jr $ra -/* B737EC 8024073C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_12/func_80240740_B730B0.s b/asm/nonmatchings/world/area_jan/jan_12/func_80240740_B730B0.s deleted file mode 100644 index 63a4ff8f2d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/func_80240740_B730B0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240740_B737F0 -/* B737F0 80240740 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B737F4 80240744 AFB10014 */ sw $s1, 0x14($sp) -/* B737F8 80240748 0080882D */ daddu $s1, $a0, $zero -/* B737FC 8024074C AFBF0018 */ sw $ra, 0x18($sp) -/* B73800 80240750 AFB00010 */ sw $s0, 0x10($sp) -/* B73804 80240754 8E300148 */ lw $s0, 0x148($s1) -/* B73808 80240758 0C00EABB */ jal get_npc_unsafe -/* B7380C 8024075C 86040008 */ lh $a0, 8($s0) -/* B73810 80240760 0040202D */ daddu $a0, $v0, $zero -/* B73814 80240764 9482008E */ lhu $v0, 0x8e($a0) -/* B73818 80240768 2442FFFF */ addiu $v0, $v0, -1 -/* B7381C 8024076C A482008E */ sh $v0, 0x8e($a0) -/* B73820 80240770 00021400 */ sll $v0, $v0, 0x10 -/* B73824 80240774 1C400009 */ bgtz $v0, .L8024079C -/* B73828 80240778 24020003 */ addiu $v0, $zero, 3 -/* B7382C 8024077C 96030076 */ lhu $v1, 0x76($s0) -/* B73830 80240780 AE02006C */ sw $v0, 0x6c($s0) -/* B73834 80240784 A483008E */ sh $v1, 0x8e($a0) -/* B73838 80240788 8E0200CC */ lw $v0, 0xcc($s0) -/* B7383C 8024078C 8C420024 */ lw $v0, 0x24($v0) -/* B73840 80240790 AC820028 */ sw $v0, 0x28($a0) -/* B73844 80240794 24020020 */ addiu $v0, $zero, 0x20 -/* B73848 80240798 AE220070 */ sw $v0, 0x70($s1) -.L8024079C: -/* B7384C 8024079C 8FBF0018 */ lw $ra, 0x18($sp) -/* B73850 802407A0 8FB10014 */ lw $s1, 0x14($sp) -/* B73854 802407A4 8FB00010 */ lw $s0, 0x10($sp) -/* B73858 802407A8 03E00008 */ jr $ra -/* B7385C 802407AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_12/func_802407B0_B730B0.s b/asm/nonmatchings/world/area_jan/jan_12/func_802407B0_B730B0.s deleted file mode 100644 index baede32ccb..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/func_802407B0_B730B0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407B0_B73860 -/* B73860 802407B0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B73864 802407B4 AFB10034 */ sw $s1, 0x34($sp) -/* B73868 802407B8 0080882D */ daddu $s1, $a0, $zero -/* B7386C 802407BC AFBF0038 */ sw $ra, 0x38($sp) -/* B73870 802407C0 AFB00030 */ sw $s0, 0x30($sp) -/* B73874 802407C4 8E300148 */ lw $s0, 0x148($s1) -/* B73878 802407C8 0C00EABB */ jal get_npc_unsafe -/* B7387C 802407CC 86040008 */ lh $a0, 8($s0) -/* B73880 802407D0 0040282D */ daddu $a1, $v0, $zero -/* B73884 802407D4 94A2008E */ lhu $v0, 0x8e($a1) -/* B73888 802407D8 2442FFFF */ addiu $v0, $v0, -1 -/* B7388C 802407DC A4A2008E */ sh $v0, 0x8e($a1) -/* B73890 802407E0 00021400 */ sll $v0, $v0, 0x10 -/* B73894 802407E4 1C400023 */ bgtz $v0, .L80240874 -/* B73898 802407E8 24020004 */ addiu $v0, $zero, 4 -/* B7389C 802407EC 8E0300CC */ lw $v1, 0xcc($s0) -/* B738A0 802407F0 AE02006C */ sw $v0, 0x6c($s0) -/* B738A4 802407F4 8C620000 */ lw $v0, ($v1) -/* B738A8 802407F8 ACA20028 */ sw $v0, 0x28($a1) -/* B738AC 802407FC 9602007A */ lhu $v0, 0x7a($s0) -/* B738B0 80240800 A4A2008E */ sh $v0, 0x8e($a1) -/* B738B4 80240804 8E020078 */ lw $v0, 0x78($s0) -/* B738B8 80240808 28420008 */ slti $v0, $v0, 8 -/* B738BC 8024080C 14400018 */ bnez $v0, .L80240870 -/* B738C0 80240810 24020021 */ addiu $v0, $zero, 0x21 -/* B738C4 80240814 24040003 */ addiu $a0, $zero, 3 -/* B738C8 80240818 27A30028 */ addiu $v1, $sp, 0x28 -/* B738CC 8024081C 84A700A8 */ lh $a3, 0xa8($a1) -/* B738D0 80240820 3C013F80 */ lui $at, 0x3f80 -/* B738D4 80240824 44810000 */ mtc1 $at, $f0 -/* B738D8 80240828 3C014000 */ lui $at, 0x4000 -/* B738DC 8024082C 44811000 */ mtc1 $at, $f2 -/* B738E0 80240830 3C01C1A0 */ lui $at, 0xc1a0 -/* B738E4 80240834 44812000 */ mtc1 $at, $f4 -/* B738E8 80240838 44873000 */ mtc1 $a3, $f6 -/* B738EC 8024083C 00000000 */ nop -/* B738F0 80240840 468031A0 */ cvt.s.w $f6, $f6 -/* B738F4 80240844 E7A00010 */ swc1 $f0, 0x10($sp) -/* B738F8 80240848 E7A20014 */ swc1 $f2, 0x14($sp) -/* B738FC 8024084C E7A40018 */ swc1 $f4, 0x18($sp) -/* B73900 80240850 8E020078 */ lw $v0, 0x78($s0) -/* B73904 80240854 44073000 */ mfc1 $a3, $f6 -/* B73908 80240858 0000302D */ daddu $a2, $zero, $zero -/* B7390C 8024085C AFA30020 */ sw $v1, 0x20($sp) -/* B73910 80240860 2442FFFF */ addiu $v0, $v0, -1 -/* B73914 80240864 0C01BFA4 */ jal fx_emote -/* B73918 80240868 AFA2001C */ sw $v0, 0x1c($sp) -/* B7391C 8024086C 24020021 */ addiu $v0, $zero, 0x21 -.L80240870: -/* B73920 80240870 AE220070 */ sw $v0, 0x70($s1) -.L80240874: -/* B73924 80240874 8FBF0038 */ lw $ra, 0x38($sp) -/* B73928 80240878 8FB10034 */ lw $s1, 0x34($sp) -/* B7392C 8024087C 8FB00030 */ lw $s0, 0x30($sp) -/* B73930 80240880 03E00008 */ jr $ra -/* B73934 80240884 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_jan/jan_12/func_80240888_B730B0.s b/asm/nonmatchings/world/area_jan/jan_12/func_80240888_B730B0.s deleted file mode 100644 index 9318f47da5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/func_80240888_B730B0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240888_B73938 -/* B73938 80240888 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B7393C 8024088C AFB10014 */ sw $s1, 0x14($sp) -/* B73940 80240890 0080882D */ daddu $s1, $a0, $zero -/* B73944 80240894 AFBF0018 */ sw $ra, 0x18($sp) -/* B73948 80240898 AFB00010 */ sw $s0, 0x10($sp) -/* B7394C 8024089C 8E300148 */ lw $s0, 0x148($s1) -/* B73950 802408A0 0C00EABB */ jal get_npc_unsafe -/* B73954 802408A4 86040008 */ lh $a0, 8($s0) -/* B73958 802408A8 9443008E */ lhu $v1, 0x8e($v0) -/* B7395C 802408AC 2463FFFF */ addiu $v1, $v1, -1 -/* B73960 802408B0 A443008E */ sh $v1, 0x8e($v0) -/* B73964 802408B4 00031C00 */ sll $v1, $v1, 0x10 -/* B73968 802408B8 1C600003 */ bgtz $v1, .L802408C8 -/* B7396C 802408BC 2402000C */ addiu $v0, $zero, 0xc -/* B73970 802408C0 AE00006C */ sw $zero, 0x6c($s0) -/* B73974 802408C4 AE220070 */ sw $v0, 0x70($s1) -.L802408C8: -/* B73978 802408C8 8FBF0018 */ lw $ra, 0x18($sp) -/* B7397C 802408CC 8FB10014 */ lw $s1, 0x14($sp) -/* B73980 802408D0 8FB00010 */ lw $s0, 0x10($sp) -/* B73984 802408D4 03E00008 */ jr $ra -/* B73988 802408D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_12/func_802408DC_B730B0.s b/asm/nonmatchings/world/area_jan/jan_12/func_802408DC_B730B0.s deleted file mode 100644 index 09876b52d9..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/func_802408DC_B730B0.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408DC_B7398C -/* B7398C 802408DC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B73990 802408E0 AFBF0024 */ sw $ra, 0x24($sp) -/* B73994 802408E4 AFB40020 */ sw $s4, 0x20($sp) -/* B73998 802408E8 AFB3001C */ sw $s3, 0x1c($sp) -/* B7399C 802408EC AFB20018 */ sw $s2, 0x18($sp) -/* B739A0 802408F0 AFB10014 */ sw $s1, 0x14($sp) -/* B739A4 802408F4 AFB00010 */ sw $s0, 0x10($sp) -/* B739A8 802408F8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B739AC 802408FC 8C900148 */ lw $s0, 0x148($a0) -/* B739B0 80240900 86040008 */ lh $a0, 8($s0) -/* B739B4 80240904 0C00EABB */ jal get_npc_unsafe -/* B739B8 80240908 24110001 */ addiu $s1, $zero, 1 -/* B739BC 8024090C 86040008 */ lh $a0, 8($s0) -/* B739C0 80240910 0040802D */ daddu $s0, $v0, $zero -/* B739C4 80240914 3C05800B */ lui $a1, %hi(gCameras) -/* B739C8 80240918 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* B739CC 8024091C 3C03800A */ lui $v1, 0x800a -/* B739D0 80240920 8463A634 */ lh $v1, -0x59cc($v1) -/* B739D4 80240924 00912021 */ addu $a0, $a0, $s1 -/* B739D8 80240928 00031080 */ sll $v0, $v1, 2 -/* B739DC 8024092C 00431021 */ addu $v0, $v0, $v1 -/* B739E0 80240930 00021080 */ sll $v0, $v0, 2 -/* B739E4 80240934 00431023 */ subu $v0, $v0, $v1 -/* B739E8 80240938 000218C0 */ sll $v1, $v0, 3 -/* B739EC 8024093C 00431021 */ addu $v0, $v0, $v1 -/* B739F0 80240940 000210C0 */ sll $v0, $v0, 3 -/* B739F4 80240944 0C00FB3A */ jal get_enemy -/* B739F8 80240948 00459021 */ addu $s2, $v0, $a1 -/* B739FC 8024094C 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* B73A00 80240950 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* B73A04 80240954 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B73A08 80240958 8E830000 */ lw $v1, ($s4) -/* B73A0C 8024095C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B73A10 80240960 8C660028 */ lw $a2, 0x28($v1) -/* B73A14 80240964 8C670030 */ lw $a3, 0x30($v1) -/* B73A18 80240968 0C00A7B5 */ jal dist2D -/* B73A1C 8024096C 0040982D */ daddu $s3, $v0, $zero -/* B73A20 80240970 C6620074 */ lwc1 $f2, 0x74($s3) -/* B73A24 80240974 468010A0 */ cvt.s.w $f2, $f2 -/* B73A28 80240978 4600103C */ c.lt.s $f2, $f0 -/* B73A2C 8024097C 00000000 */ nop -/* B73A30 80240980 45030001 */ bc1tl .L80240988 -/* B73A34 80240984 0000882D */ daddu $s1, $zero, $zero -.L80240988: -/* B73A38 80240988 C64C006C */ lwc1 $f12, 0x6c($s2) -/* B73A3C 8024098C C60E000C */ lwc1 $f14, 0xc($s0) -/* B73A40 80240990 3C014387 */ lui $at, 0x4387 -/* B73A44 80240994 4481A000 */ mtc1 $at, $f20 -/* B73A48 80240998 0C00A70A */ jal get_clamped_angle_diff -/* B73A4C 8024099C 00000000 */ nop -/* B73A50 802409A0 0C00A6C9 */ jal clamp_angle -/* B73A54 802409A4 46000306 */ mov.s $f12, $f0 -/* B73A58 802409A8 3C018024 */ lui $at, 0x8024 -/* B73A5C 802409AC D42233D8 */ ldc1 $f2, 0x33d8($at) -/* B73A60 802409B0 46000021 */ cvt.d.s $f0, $f0 -/* B73A64 802409B4 4622003C */ c.lt.d $f0, $f2 -/* B73A68 802409B8 00000000 */ nop -/* B73A6C 802409BC 45000003 */ bc1f .L802409CC -/* B73A70 802409C0 00000000 */ nop -/* B73A74 802409C4 3C0142B4 */ lui $at, 0x42b4 -/* B73A78 802409C8 4481A000 */ mtc1 $at, $f20 -.L802409CC: -/* B73A7C 802409CC C60C0038 */ lwc1 $f12, 0x38($s0) -/* B73A80 802409D0 8E820000 */ lw $v0, ($s4) -/* B73A84 802409D4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B73A88 802409D8 8C460028 */ lw $a2, 0x28($v0) -/* B73A8C 802409DC 0C00A720 */ jal atan2 -/* B73A90 802409E0 8C470030 */ lw $a3, 0x30($v0) -/* B73A94 802409E4 4600A306 */ mov.s $f12, $f20 -/* B73A98 802409E8 0C00A70A */ jal get_clamped_angle_diff -/* B73A9C 802409EC 46000386 */ mov.s $f14, $f0 -/* B73AA0 802409F0 C6620078 */ lwc1 $f2, 0x78($s3) -/* B73AA4 802409F4 468010A0 */ cvt.s.w $f2, $f2 -/* B73AA8 802409F8 46000005 */ abs.s $f0, $f0 -/* B73AAC 802409FC 4600103C */ c.lt.s $f2, $f0 -/* B73AB0 80240A00 00000000 */ nop -/* B73AB4 80240A04 45030001 */ bc1tl .L80240A0C -/* B73AB8 80240A08 0000882D */ daddu $s1, $zero, $zero -.L80240A0C: -/* B73ABC 80240A0C 8E820000 */ lw $v0, ($s4) -/* B73AC0 80240A10 C600003C */ lwc1 $f0, 0x3c($s0) -/* B73AC4 80240A14 C442002C */ lwc1 $f2, 0x2c($v0) -/* B73AC8 80240A18 860200A8 */ lh $v0, 0xa8($s0) -/* B73ACC 80240A1C 46020001 */ sub.s $f0, $f0, $f2 -/* B73AD0 80240A20 44821000 */ mtc1 $v0, $f2 -/* B73AD4 80240A24 00000000 */ nop -/* B73AD8 80240A28 468010A1 */ cvt.d.w $f2, $f2 -/* B73ADC 80240A2C 46221080 */ add.d $f2, $f2, $f2 -/* B73AE0 80240A30 46000005 */ abs.s $f0, $f0 -/* B73AE4 80240A34 46000021 */ cvt.d.s $f0, $f0 -/* B73AE8 80240A38 4620103E */ c.le.d $f2, $f0 -/* B73AEC 80240A3C 00000000 */ nop -/* B73AF0 80240A40 45030001 */ bc1tl .L80240A48 -/* B73AF4 80240A44 0000882D */ daddu $s1, $zero, $zero -.L80240A48: -/* B73AF8 80240A48 3C038011 */ lui $v1, 0x8011 -/* B73AFC 80240A4C 8063EBB3 */ lb $v1, -0x144d($v1) -/* B73B00 80240A50 24020009 */ addiu $v0, $zero, 9 -/* B73B04 80240A54 50620001 */ beql $v1, $v0, .L80240A5C -/* B73B08 80240A58 0000882D */ daddu $s1, $zero, $zero -.L80240A5C: -/* B73B0C 80240A5C 24020007 */ addiu $v0, $zero, 7 -/* B73B10 80240A60 50620001 */ beql $v1, $v0, .L80240A68 -/* B73B14 80240A64 0000882D */ daddu $s1, $zero, $zero -.L80240A68: -/* B73B18 80240A68 0220102D */ daddu $v0, $s1, $zero -/* B73B1C 80240A6C 8FBF0024 */ lw $ra, 0x24($sp) -/* B73B20 80240A70 8FB40020 */ lw $s4, 0x20($sp) -/* B73B24 80240A74 8FB3001C */ lw $s3, 0x1c($sp) -/* B73B28 80240A78 8FB20018 */ lw $s2, 0x18($sp) -/* B73B2C 80240A7C 8FB10014 */ lw $s1, 0x14($sp) -/* B73B30 80240A80 8FB00010 */ lw $s0, 0x10($sp) -/* B73B34 80240A84 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B73B38 80240A88 03E00008 */ jr $ra -/* B73B3C 80240A8C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_12/func_80240CF0_B730B0.s b/asm/nonmatchings/world/area_jan/jan_12/func_80240CF0_B730B0.s deleted file mode 100644 index 1f9c03ae56..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/func_80240CF0_B730B0.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CF0_B73DA0 -/* B73DA0 80240CF0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B73DA4 80240CF4 AFB20038 */ sw $s2, 0x38($sp) -/* B73DA8 80240CF8 0080902D */ daddu $s2, $a0, $zero -/* B73DAC 80240CFC AFBF0048 */ sw $ra, 0x48($sp) -/* B73DB0 80240D00 AFB50044 */ sw $s5, 0x44($sp) -/* B73DB4 80240D04 AFB40040 */ sw $s4, 0x40($sp) -/* B73DB8 80240D08 AFB3003C */ sw $s3, 0x3c($sp) -/* B73DBC 80240D0C AFB10034 */ sw $s1, 0x34($sp) -/* B73DC0 80240D10 AFB00030 */ sw $s0, 0x30($sp) -/* B73DC4 80240D14 8E510148 */ lw $s1, 0x148($s2) -/* B73DC8 80240D18 86240008 */ lh $a0, 8($s1) -/* B73DCC 80240D1C 0C00EABB */ jal get_npc_unsafe -/* B73DD0 80240D20 00A0802D */ daddu $s0, $a1, $zero -/* B73DD4 80240D24 8E43000C */ lw $v1, 0xc($s2) -/* B73DD8 80240D28 0240202D */ daddu $a0, $s2, $zero -/* B73DDC 80240D2C 8C650000 */ lw $a1, ($v1) -/* B73DE0 80240D30 0C0B1EAF */ jal get_variable -/* B73DE4 80240D34 0040A82D */ daddu $s5, $v0, $zero -/* B73DE8 80240D38 AFA00010 */ sw $zero, 0x10($sp) -/* B73DEC 80240D3C 8E2300D0 */ lw $v1, 0xd0($s1) -/* B73DF0 80240D40 8C630030 */ lw $v1, 0x30($v1) -/* B73DF4 80240D44 AFA30014 */ sw $v1, 0x14($sp) -/* B73DF8 80240D48 8E2300D0 */ lw $v1, 0xd0($s1) -/* B73DFC 80240D4C 8C63001C */ lw $v1, 0x1c($v1) -/* B73E00 80240D50 AFA30018 */ sw $v1, 0x18($sp) -/* B73E04 80240D54 8E2300D0 */ lw $v1, 0xd0($s1) -/* B73E08 80240D58 8C630024 */ lw $v1, 0x24($v1) -/* B73E0C 80240D5C AFA3001C */ sw $v1, 0x1c($sp) -/* B73E10 80240D60 8E2300D0 */ lw $v1, 0xd0($s1) -/* B73E14 80240D64 8C630028 */ lw $v1, 0x28($v1) -/* B73E18 80240D68 27B40010 */ addiu $s4, $sp, 0x10 -/* B73E1C 80240D6C AFA30020 */ sw $v1, 0x20($sp) -/* B73E20 80240D70 8E2300D0 */ lw $v1, 0xd0($s1) -/* B73E24 80240D74 3C014282 */ lui $at, 0x4282 -/* B73E28 80240D78 44810000 */ mtc1 $at, $f0 -/* B73E2C 80240D7C 8C63002C */ lw $v1, 0x2c($v1) -/* B73E30 80240D80 0040982D */ daddu $s3, $v0, $zero -/* B73E34 80240D84 E7A00028 */ swc1 $f0, 0x28($sp) -/* B73E38 80240D88 A7A0002C */ sh $zero, 0x2c($sp) -/* B73E3C 80240D8C 16000005 */ bnez $s0, .L80240DA4 -/* B73E40 80240D90 AFA30024 */ sw $v1, 0x24($sp) -/* B73E44 80240D94 8E2200B0 */ lw $v0, 0xb0($s1) -/* B73E48 80240D98 30420004 */ andi $v0, $v0, 4 -/* B73E4C 80240D9C 10400020 */ beqz $v0, .L80240E20 -/* B73E50 80240DA0 00000000 */ nop -.L80240DA4: -/* B73E54 80240DA4 2404F7FF */ addiu $a0, $zero, -0x801 -/* B73E58 80240DA8 AE400070 */ sw $zero, 0x70($s2) -/* B73E5C 80240DAC A6A0008E */ sh $zero, 0x8e($s5) -/* B73E60 80240DB0 8E2200CC */ lw $v0, 0xcc($s1) -/* B73E64 80240DB4 8EA30000 */ lw $v1, ($s5) -/* B73E68 80240DB8 8C420000 */ lw $v0, ($v0) -/* B73E6C 80240DBC 00641824 */ and $v1, $v1, $a0 -/* B73E70 80240DC0 AEA30000 */ sw $v1, ($s5) -/* B73E74 80240DC4 AEA20028 */ sw $v0, 0x28($s5) -/* B73E78 80240DC8 8E2200D0 */ lw $v0, 0xd0($s1) -/* B73E7C 80240DCC 8C420034 */ lw $v0, 0x34($v0) -/* B73E80 80240DD0 54400005 */ bnel $v0, $zero, .L80240DE8 -/* B73E84 80240DD4 2402FDFF */ addiu $v0, $zero, -0x201 -/* B73E88 80240DD8 34620200 */ ori $v0, $v1, 0x200 -/* B73E8C 80240DDC 2403FFF7 */ addiu $v1, $zero, -9 -/* B73E90 80240DE0 0809037C */ j .L80240DF0 -/* B73E94 80240DE4 00431024 */ and $v0, $v0, $v1 -.L80240DE8: -/* B73E98 80240DE8 00621024 */ and $v0, $v1, $v0 -/* B73E9C 80240DEC 34420008 */ ori $v0, $v0, 8 -.L80240DF0: -/* B73EA0 80240DF0 AEA20000 */ sw $v0, ($s5) -/* B73EA4 80240DF4 8E2200B0 */ lw $v0, 0xb0($s1) -/* B73EA8 80240DF8 30420004 */ andi $v0, $v0, 4 -/* B73EAC 80240DFC 10400007 */ beqz $v0, .L80240E1C -/* B73EB0 80240E00 24020063 */ addiu $v0, $zero, 0x63 -/* B73EB4 80240E04 AE420070 */ sw $v0, 0x70($s2) -/* B73EB8 80240E08 AE400074 */ sw $zero, 0x74($s2) -/* B73EBC 80240E0C 8E2200B0 */ lw $v0, 0xb0($s1) -/* B73EC0 80240E10 2403FFFB */ addiu $v1, $zero, -5 -/* B73EC4 80240E14 00431024 */ and $v0, $v0, $v1 -/* B73EC8 80240E18 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240E1C: -/* B73ECC 80240E1C AE20006C */ sw $zero, 0x6c($s1) -.L80240E20: -/* B73ED0 80240E20 8E420070 */ lw $v0, 0x70($s2) -/* B73ED4 80240E24 2842001E */ slti $v0, $v0, 0x1e -/* B73ED8 80240E28 10400009 */ beqz $v0, .L80240E50 -/* B73EDC 80240E2C 00000000 */ nop -/* B73EE0 80240E30 8E22006C */ lw $v0, 0x6c($s1) -/* B73EE4 80240E34 14400006 */ bnez $v0, .L80240E50 -/* B73EE8 80240E38 00000000 */ nop -/* B73EEC 80240E3C 0C090237 */ jal func_802408DC -/* B73EF0 80240E40 0240202D */ daddu $a0, $s2, $zero -/* B73EF4 80240E44 10400002 */ beqz $v0, .L80240E50 -/* B73EF8 80240E48 2402001E */ addiu $v0, $zero, 0x1e -/* B73EFC 80240E4C AE420070 */ sw $v0, 0x70($s2) -.L80240E50: -/* B73F00 80240E50 8E430070 */ lw $v1, 0x70($s2) -/* B73F04 80240E54 2C620064 */ sltiu $v0, $v1, 0x64 -/* B73F08 80240E58 10400048 */ beqz $v0, .L80240F7C -/* B73F0C 80240E5C 00031080 */ sll $v0, $v1, 2 -/* B73F10 80240E60 3C018024 */ lui $at, 0x8024 -/* B73F14 80240E64 00220821 */ addu $at, $at, $v0 -/* B73F18 80240E68 8C2233E0 */ lw $v0, 0x33e0($at) -/* B73F1C 80240E6C 00400008 */ jr $v0 -/* B73F20 80240E70 00000000 */ nop -/* B73F24 80240E74 0240202D */ daddu $a0, $s2, $zero -/* B73F28 80240E78 0260282D */ daddu $a1, $s3, $zero -/* B73F2C 80240E7C 0C012568 */ jal func_800495A0 -/* B73F30 80240E80 0280302D */ daddu $a2, $s4, $zero -/* B73F34 80240E84 0240202D */ daddu $a0, $s2, $zero -/* B73F38 80240E88 0260282D */ daddu $a1, $s3, $zero -/* B73F3C 80240E8C 0C0125AE */ jal func_800496B8 -/* B73F40 80240E90 0280302D */ daddu $a2, $s4, $zero -/* B73F44 80240E94 080903DF */ j .L80240F7C -/* B73F48 80240E98 00000000 */ nop -/* B73F4C 80240E9C 0240202D */ daddu $a0, $s2, $zero -/* B73F50 80240EA0 0260282D */ daddu $a1, $s3, $zero -/* B73F54 80240EA4 0C0126D1 */ jal func_80049B44 -/* B73F58 80240EA8 0280302D */ daddu $a2, $s4, $zero -/* B73F5C 80240EAC 0240202D */ daddu $a0, $s2, $zero -/* B73F60 80240EB0 0260282D */ daddu $a1, $s3, $zero -/* B73F64 80240EB4 0C012701 */ jal func_80049C04 -/* B73F68 80240EB8 0280302D */ daddu $a2, $s4, $zero -/* B73F6C 80240EBC 080903DF */ j .L80240F7C -/* B73F70 80240EC0 00000000 */ nop -/* B73F74 80240EC4 0240202D */ daddu $a0, $s2, $zero -/* B73F78 80240EC8 0260282D */ daddu $a1, $s3, $zero -/* B73F7C 80240ECC 0C01278F */ jal func_80049E3C -/* B73F80 80240ED0 0280302D */ daddu $a2, $s4, $zero -/* B73F84 80240ED4 0240202D */ daddu $a0, $s2, $zero -/* B73F88 80240ED8 0260282D */ daddu $a1, $s3, $zero -/* B73F8C 80240EDC 0C0127B3 */ jal func_80049ECC -/* B73F90 80240EE0 0280302D */ daddu $a2, $s4, $zero -/* B73F94 80240EE4 080903DF */ j .L80240F7C -/* B73F98 80240EE8 00000000 */ nop -/* B73F9C 80240EEC 0240202D */ daddu $a0, $s2, $zero -/* B73FA0 80240EF0 0260282D */ daddu $a1, $s3, $zero -/* B73FA4 80240EF4 0C0127DF */ jal func_80049F7C -/* B73FA8 80240EF8 0280302D */ daddu $a2, $s4, $zero -/* B73FAC 80240EFC 0240202D */ daddu $a0, $s2, $zero -/* B73FB0 80240F00 0260282D */ daddu $a1, $s3, $zero -/* B73FB4 80240F04 0C012849 */ jal func_8004A124 -/* B73FB8 80240F08 0280302D */ daddu $a2, $s4, $zero -/* B73FBC 80240F0C 080903DF */ j .L80240F7C -/* B73FC0 80240F10 00000000 */ nop -/* B73FC4 80240F14 0240202D */ daddu $a0, $s2, $zero -/* B73FC8 80240F18 0260282D */ daddu $a1, $s3, $zero -/* B73FCC 80240F1C 0C0128FA */ jal func_8004A3E8 -/* B73FD0 80240F20 0280302D */ daddu $a2, $s4, $zero -/* B73FD4 80240F24 080903DF */ j .L80240F7C -/* B73FD8 80240F28 00000000 */ nop -/* B73FDC 80240F2C 0C0901B5 */ jal func_802406D4 -/* B73FE0 80240F30 0240202D */ daddu $a0, $s2, $zero -/* B73FE4 80240F34 0C0901D0 */ jal func_80240740 -/* B73FE8 80240F38 0240202D */ daddu $a0, $s2, $zero -/* B73FEC 80240F3C 8E430070 */ lw $v1, 0x70($s2) -/* B73FF0 80240F40 24020020 */ addiu $v0, $zero, 0x20 -/* B73FF4 80240F44 1462000D */ bne $v1, $v0, .L80240F7C -/* B73FF8 80240F48 00000000 */ nop -/* B73FFC 80240F4C 0C0901EC */ jal func_802407B0 -/* B74000 80240F50 0240202D */ daddu $a0, $s2, $zero -/* B74004 80240F54 8E430070 */ lw $v1, 0x70($s2) -/* B74008 80240F58 24020021 */ addiu $v0, $zero, 0x21 -/* B7400C 80240F5C 14620007 */ bne $v1, $v0, .L80240F7C -/* B74010 80240F60 00000000 */ nop -/* B74014 80240F64 0C090222 */ jal func_80240888 -/* B74018 80240F68 0240202D */ daddu $a0, $s2, $zero -/* B7401C 80240F6C 080903DF */ j .L80240F7C -/* B74020 80240F70 00000000 */ nop -/* B74024 80240F74 0C0129CF */ jal func_8004A73C -/* B74028 80240F78 0240202D */ daddu $a0, $s2, $zero -.L80240F7C: -/* B7402C 80240F7C 8FBF0048 */ lw $ra, 0x48($sp) -/* B74030 80240F80 8FB50044 */ lw $s5, 0x44($sp) -/* B74034 80240F84 8FB40040 */ lw $s4, 0x40($sp) -/* B74038 80240F88 8FB3003C */ lw $s3, 0x3c($sp) -/* B7403C 80240F8C 8FB20038 */ lw $s2, 0x38($sp) -/* B74040 80240F90 8FB10034 */ lw $s1, 0x34($sp) -/* B74044 80240F94 8FB00030 */ lw $s0, 0x30($sp) -/* B74048 80240F98 0000102D */ daddu $v0, $zero, $zero -/* B7404C 80240F9C 03E00008 */ jr $ra -/* B74050 80240FA0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_13/func_802401AC_B767B0.s b/asm/nonmatchings/world/area_jan/jan_13/func_802401AC_B767B0.s deleted file mode 100644 index 4c35d3c495..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_13/func_802401AC_B767B0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401AC_B7695C -/* B7695C 802401AC C4820088 */ lwc1 $f2, 0x88($a0) -/* B76960 802401B0 468010A0 */ cvt.s.w $f2, $f2 -/* B76964 802401B4 3C0142C8 */ lui $at, 0x42c8 -/* B76968 802401B8 44812000 */ mtc1 $at, $f4 -/* B7696C 802401BC 3C014480 */ lui $at, 0x4480 -/* B76970 802401C0 44813000 */ mtc1 $at, $f6 -/* B76974 802401C4 46041083 */ div.s $f2, $f2, $f4 -/* B76978 802401C8 46061082 */ mul.s $f2, $f2, $f6 -/* B7697C 802401CC 00000000 */ nop -/* B76980 802401D0 C4800088 */ lwc1 $f0, 0x88($a0) -/* B76984 802401D4 46800020 */ cvt.s.w $f0, $f0 -/* B76988 802401D8 46040003 */ div.s $f0, $f0, $f4 -/* B7698C 802401DC 46060002 */ mul.s $f0, $f0, $f6 -/* B76990 802401E0 00000000 */ nop -/* B76994 802401E4 3C01CD5B */ lui $at, 0xcd5b -/* B76998 802401E8 34215858 */ ori $at, $at, 0x5858 -/* B7699C 802401EC 44812000 */ mtc1 $at, $f4 -/* B769A0 802401F0 00000000 */ nop -/* B769A4 802401F4 46041080 */ add.s $f2, $f2, $f4 -/* B769A8 802401F8 46040000 */ add.s $f0, $f0, $f4 -/* B769AC 802401FC 4600120D */ trunc.w.s $f8, $f2 -/* B769B0 80240200 E488008C */ swc1 $f8, 0x8c($a0) -/* B769B4 80240204 4600020D */ trunc.w.s $f8, $f0 -/* B769B8 80240208 E4880090 */ swc1 $f8, 0x90($a0) -/* B769BC 8024020C 03E00008 */ jr $ra -/* B769C0 80240210 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_13/func_80240214_B767B0.s b/asm/nonmatchings/world/area_jan/jan_13/func_80240214_B767B0.s deleted file mode 100644 index 90a638a695..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_13/func_80240214_B767B0.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240214_B769C4 -/* B769C4 80240214 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B769C8 80240218 AFB1001C */ sw $s1, 0x1c($sp) -/* B769CC 8024021C 0080882D */ daddu $s1, $a0, $zero -/* B769D0 80240220 AFBF0020 */ sw $ra, 0x20($sp) -/* B769D4 80240224 AFB00018 */ sw $s0, 0x18($sp) -/* B769D8 80240228 8E30000C */ lw $s0, 0xc($s1) -/* B769DC 8024022C 8E020000 */ lw $v0, ($s0) -/* B769E0 80240230 1040001B */ beqz $v0, .L802402A0 -/* B769E4 80240234 26100004 */ addiu $s0, $s0, 4 -/* B769E8 80240238 8E050000 */ lw $a1, ($s0) -/* B769EC 8024023C 0C0B1EAF */ jal get_variable -/* B769F0 80240240 26100004 */ addiu $s0, $s0, 4 -/* B769F4 80240244 AE220070 */ sw $v0, 0x70($s1) -/* B769F8 80240248 8E050000 */ lw $a1, ($s0) -/* B769FC 8024024C 26100004 */ addiu $s0, $s0, 4 -/* B76A00 80240250 0C0B1EAF */ jal get_variable -/* B76A04 80240254 0220202D */ daddu $a0, $s1, $zero -/* B76A08 80240258 AE220074 */ sw $v0, 0x74($s1) -/* B76A0C 8024025C 8E050000 */ lw $a1, ($s0) -/* B76A10 80240260 0C0B1EAF */ jal get_variable -/* B76A14 80240264 0220202D */ daddu $a0, $s1, $zero -/* B76A18 80240268 2404004E */ addiu $a0, $zero, 0x4e -/* B76A1C 8024026C 0000282D */ daddu $a1, $zero, $zero -/* B76A20 80240270 C6200070 */ lwc1 $f0, 0x70($s1) -/* B76A24 80240274 46800020 */ cvt.s.w $f0, $f0 -/* B76A28 80240278 C6220074 */ lwc1 $f2, 0x74($s1) -/* B76A2C 8024027C 468010A0 */ cvt.s.w $f2, $f2 -/* B76A30 80240280 44060000 */ mfc1 $a2, $f0 -/* B76A34 80240284 44071000 */ mfc1 $a3, $f2 -/* B76A38 80240288 44820000 */ mtc1 $v0, $f0 -/* B76A3C 8024028C 00000000 */ nop -/* B76A40 80240290 46800020 */ cvt.s.w $f0, $f0 -/* B76A44 80240294 AE220078 */ sw $v0, 0x78($s1) -/* B76A48 80240298 0C05267B */ jal func_801499EC -/* B76A4C 8024029C E7A00010 */ swc1 $f0, 0x10($sp) -.L802402A0: -/* B76A50 802402A0 8FBF0020 */ lw $ra, 0x20($sp) -/* B76A54 802402A4 8FB1001C */ lw $s1, 0x1c($sp) -/* B76A58 802402A8 8FB00018 */ lw $s0, 0x18($sp) -/* B76A5C 802402AC 24020002 */ addiu $v0, $zero, 2 -/* B76A60 802402B0 03E00008 */ jr $ra -/* B76A64 802402B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_13/func_802402B8_B767B0.s b/asm/nonmatchings/world/area_jan/jan_13/func_802402B8_B767B0.s deleted file mode 100644 index 20bff0509b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_13/func_802402B8_B767B0.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402B8_B76A68 -/* B76A68 802402B8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B76A6C 802402BC AFB20018 */ sw $s2, 0x18($sp) -/* B76A70 802402C0 0080902D */ daddu $s2, $a0, $zero -/* B76A74 802402C4 AFBF001C */ sw $ra, 0x1c($sp) -/* B76A78 802402C8 AFB10014 */ sw $s1, 0x14($sp) -/* B76A7C 802402CC AFB00010 */ sw $s0, 0x10($sp) -/* B76A80 802402D0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* B76A84 802402D4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* B76A88 802402D8 8E510084 */ lw $s1, 0x84($s2) -/* B76A8C 802402DC 8E420088 */ lw $v0, 0x88($s2) -/* B76A90 802402E0 8E50008C */ lw $s0, 0x8c($s2) -/* B76A94 802402E4 2842FF9D */ slti $v0, $v0, -0x63 -/* B76A98 802402E8 5440001E */ bnel $v0, $zero, .L80240364 -/* B76A9C 802402EC 26100019 */ addiu $s0, $s0, 0x19 -/* B76AA0 802402F0 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* B76AA4 802402F4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* B76AA8 802402F8 C4540080 */ lwc1 $f20, 0x80($v0) -/* B76AAC 802402FC 3C014334 */ lui $at, 0x4334 -/* B76AB0 80240300 44810000 */ mtc1 $at, $f0 -/* B76AB4 80240304 3C014049 */ lui $at, 0x4049 -/* B76AB8 80240308 34210FD8 */ ori $at, $at, 0xfd8 -/* B76ABC 8024030C 44811000 */ mtc1 $at, $f2 -/* B76AC0 80240310 4600A503 */ div.s $f20, $f20, $f0 -/* B76AC4 80240314 4602A502 */ mul.s $f20, $f20, $f2 -/* B76AC8 80240318 00000000 */ nop -/* B76ACC 8024031C 3C0141C8 */ lui $at, 0x41c8 -/* B76AD0 80240320 4481B000 */ mtc1 $at, $f22 -/* B76AD4 80240324 0C00A85B */ jal sin_rad -/* B76AD8 80240328 4600A306 */ mov.s $f12, $f20 -/* B76ADC 8024032C 46160002 */ mul.s $f0, $f0, $f22 -/* B76AE0 80240330 00000000 */ nop -/* B76AE4 80240334 4600A306 */ mov.s $f12, $f20 -/* B76AE8 80240338 4600010D */ trunc.w.s $f4, $f0 -/* B76AEC 8024033C 44022000 */ mfc1 $v0, $f4 -/* B76AF0 80240340 0C00A874 */ jal cos_rad -/* B76AF4 80240344 02228823 */ subu $s1, $s1, $v0 -/* B76AF8 80240348 46000007 */ neg.s $f0, $f0 -/* B76AFC 8024034C 46160002 */ mul.s $f0, $f0, $f22 -/* B76B00 80240350 00000000 */ nop -/* B76B04 80240354 4600010D */ trunc.w.s $f4, $f0 -/* B76B08 80240358 44022000 */ mfc1 $v0, $f4 -/* B76B0C 8024035C 00000000 */ nop -/* B76B10 80240360 02028023 */ subu $s0, $s0, $v0 -.L80240364: -/* B76B14 80240364 AE510084 */ sw $s1, 0x84($s2) -/* B76B18 80240368 AE50008C */ sw $s0, 0x8c($s2) -/* B76B1C 8024036C 8FBF001C */ lw $ra, 0x1c($sp) -/* B76B20 80240370 8FB20018 */ lw $s2, 0x18($sp) -/* B76B24 80240374 8FB10014 */ lw $s1, 0x14($sp) -/* B76B28 80240378 8FB00010 */ lw $s0, 0x10($sp) -/* B76B2C 8024037C D7B60028 */ ldc1 $f22, 0x28($sp) -/* B76B30 80240380 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B76B34 80240384 24020002 */ addiu $v0, $zero, 2 -/* B76B38 80240388 03E00008 */ jr $ra -/* B76B3C 8024038C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_13/func_80240390_B767B0.s b/asm/nonmatchings/world/area_jan/jan_13/func_80240390_B767B0.s deleted file mode 100644 index eb97edd902..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_13/func_80240390_B767B0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240390_B76B40 -/* B76B40 80240390 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B76B44 80240394 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B76B48 80240398 4485A000 */ mtc1 $a1, $f20 -/* B76B4C 8024039C F7B60020 */ sdc1 $f22, 0x20($sp) -/* B76B50 802403A0 4486B000 */ mtc1 $a2, $f22 -/* B76B54 802403A4 AFB00010 */ sw $s0, 0x10($sp) -/* B76B58 802403A8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B76B5C 802403AC 4487C000 */ mtc1 $a3, $f24 -/* B76B60 802403B0 AFBF0014 */ sw $ra, 0x14($sp) -/* B76B64 802403B4 0C019D28 */ jal guMtxIdentF -/* B76B68 802403B8 0080802D */ daddu $s0, $a0, $zero -/* B76B6C 802403BC 4616A582 */ mul.s $f22, $f20, $f22 -/* B76B70 802403C0 00000000 */ nop -/* B76B74 802403C4 4618A502 */ mul.s $f20, $f20, $f24 -/* B76B78 802403C8 00000000 */ nop -/* B76B7C 802403CC 3C013F80 */ lui $at, 0x3f80 -/* B76B80 802403D0 44810000 */ mtc1 $at, $f0 -/* B76B84 802403D4 00000000 */ nop -/* B76B88 802403D8 E6000014 */ swc1 $f0, 0x14($s0) -/* B76B8C 802403DC E6160010 */ swc1 $f22, 0x10($s0) -/* B76B90 802403E0 E6140018 */ swc1 $f20, 0x18($s0) -/* B76B94 802403E4 8FBF0014 */ lw $ra, 0x14($sp) -/* B76B98 802403E8 8FB00010 */ lw $s0, 0x10($sp) -/* B76B9C 802403EC D7B80028 */ ldc1 $f24, 0x28($sp) -/* B76BA0 802403F0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B76BA4 802403F4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B76BA8 802403F8 03E00008 */ jr $ra -/* B76BAC 802403FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_13/func_80240400_B767B0.s b/asm/nonmatchings/world/area_jan/jan_13/func_80240400_B767B0.s deleted file mode 100644 index b2553ce395..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_13/func_80240400_B767B0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_B76BB0 -/* B76BB0 80240400 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B76BB4 80240404 AFB10054 */ sw $s1, 0x54($sp) -/* B76BB8 80240408 0080882D */ daddu $s1, $a0, $zero -/* B76BBC 8024040C AFBF005C */ sw $ra, 0x5c($sp) -/* B76BC0 80240410 AFB20058 */ sw $s2, 0x58($sp) -/* B76BC4 80240414 AFB00050 */ sw $s0, 0x50($sp) -/* B76BC8 80240418 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B76BCC 8024041C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B76BD0 80240420 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B76BD4 80240424 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B76BD8 80240428 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B76BDC 8024042C 8E30000C */ lw $s0, 0xc($s1) -/* B76BE0 80240430 8E050000 */ lw $a1, ($s0) -/* B76BE4 80240434 0C0B1EAF */ jal get_variable -/* B76BE8 80240438 26100004 */ addiu $s0, $s0, 4 -/* B76BEC 8024043C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B76BF0 80240440 0040202D */ daddu $a0, $v0, $zero -/* B76BF4 80240444 8E050000 */ lw $a1, ($s0) -/* B76BF8 80240448 26100004 */ addiu $s0, $s0, 4 -/* B76BFC 8024044C 0220202D */ daddu $a0, $s1, $zero -/* B76C00 80240450 0C0B210B */ jal get_float_variable -/* B76C04 80240454 0040902D */ daddu $s2, $v0, $zero -/* B76C08 80240458 8E050000 */ lw $a1, ($s0) -/* B76C0C 8024045C 26100004 */ addiu $s0, $s0, 4 -/* B76C10 80240460 0220202D */ daddu $a0, $s1, $zero -/* B76C14 80240464 0C0B210B */ jal get_float_variable -/* B76C18 80240468 46000706 */ mov.s $f28, $f0 -/* B76C1C 8024046C 8E050000 */ lw $a1, ($s0) -/* B76C20 80240470 26100004 */ addiu $s0, $s0, 4 -/* B76C24 80240474 0220202D */ daddu $a0, $s1, $zero -/* B76C28 80240478 0C0B210B */ jal get_float_variable -/* B76C2C 8024047C 46000686 */ mov.s $f26, $f0 -/* B76C30 80240480 0220202D */ daddu $a0, $s1, $zero -/* B76C34 80240484 8E050000 */ lw $a1, ($s0) -/* B76C38 80240488 0C0B210B */ jal get_float_variable -/* B76C3C 8024048C 46000586 */ mov.s $f22, $f0 -/* B76C40 80240490 0240202D */ daddu $a0, $s2, $zero -/* B76C44 80240494 0C046B4C */ jal get_model_from_list_index -/* B76C48 80240498 46000606 */ mov.s $f24, $f0 -/* B76C4C 8024049C 0040882D */ daddu $s1, $v0, $zero -/* B76C50 802404A0 96220000 */ lhu $v0, ($s1) -/* B76C54 802404A4 30420400 */ andi $v0, $v0, 0x400 -/* B76C58 802404A8 1440001E */ bnez $v0, .L80240524 -/* B76C5C 802404AC 26300058 */ addiu $s0, $s1, 0x58 -/* B76C60 802404B0 4480A000 */ mtc1 $zero, $f20 -/* B76C64 802404B4 4406B000 */ mfc1 $a2, $f22 -/* B76C68 802404B8 4405A000 */ mfc1 $a1, $f20 -/* B76C6C 802404BC 4407A000 */ mfc1 $a3, $f20 -/* B76C70 802404C0 0C019E40 */ jal guTranslateF -/* B76C74 802404C4 0200202D */ daddu $a0, $s0, $zero -/* B76C78 802404C8 4405E000 */ mfc1 $a1, $f28 -/* B76C7C 802404CC 4406D000 */ mfc1 $a2, $f26 -/* B76C80 802404D0 4407C000 */ mfc1 $a3, $f24 -/* B76C84 802404D4 0C0900E4 */ jal func_80240390 -/* B76C88 802404D8 27A40010 */ addiu $a0, $sp, 0x10 -/* B76C8C 802404DC 27A40010 */ addiu $a0, $sp, 0x10 -/* B76C90 802404E0 0200282D */ daddu $a1, $s0, $zero -/* B76C94 802404E4 0C019D80 */ jal guMtxCatF -/* B76C98 802404E8 0200302D */ daddu $a2, $s0, $zero -/* B76C9C 802404EC 27A40010 */ addiu $a0, $sp, 0x10 -/* B76CA0 802404F0 4600B587 */ neg.s $f22, $f22 -/* B76CA4 802404F4 4405A000 */ mfc1 $a1, $f20 -/* B76CA8 802404F8 4406B000 */ mfc1 $a2, $f22 -/* B76CAC 802404FC 0C019E40 */ jal guTranslateF -/* B76CB0 80240500 00A0382D */ daddu $a3, $a1, $zero -/* B76CB4 80240504 27A40010 */ addiu $a0, $sp, 0x10 -/* B76CB8 80240508 0200282D */ daddu $a1, $s0, $zero -/* B76CBC 8024050C 0C019D80 */ jal guMtxCatF -/* B76CC0 80240510 00A0302D */ daddu $a2, $a1, $zero -/* B76CC4 80240514 96220000 */ lhu $v0, ($s1) -/* B76CC8 80240518 34421400 */ ori $v0, $v0, 0x1400 -/* B76CCC 8024051C 08090167 */ j .L8024059C -/* B76CD0 80240520 A6220000 */ sh $v0, ($s1) -.L80240524: -/* B76CD4 80240524 4480A000 */ mtc1 $zero, $f20 -/* B76CD8 80240528 4406B000 */ mfc1 $a2, $f22 -/* B76CDC 8024052C 4405A000 */ mfc1 $a1, $f20 -/* B76CE0 80240530 4407A000 */ mfc1 $a3, $f20 -/* B76CE4 80240534 0C019E40 */ jal guTranslateF -/* B76CE8 80240538 27A40010 */ addiu $a0, $sp, 0x10 -/* B76CEC 8024053C 27A40010 */ addiu $a0, $sp, 0x10 -/* B76CF0 80240540 26300058 */ addiu $s0, $s1, 0x58 -/* B76CF4 80240544 0200282D */ daddu $a1, $s0, $zero -/* B76CF8 80240548 0C019D80 */ jal guMtxCatF -/* B76CFC 8024054C 0200302D */ daddu $a2, $s0, $zero -/* B76D00 80240550 4405E000 */ mfc1 $a1, $f28 -/* B76D04 80240554 4406D000 */ mfc1 $a2, $f26 -/* B76D08 80240558 4407C000 */ mfc1 $a3, $f24 -/* B76D0C 8024055C 0C0900E4 */ jal func_80240390 -/* B76D10 80240560 27A40010 */ addiu $a0, $sp, 0x10 -/* B76D14 80240564 27A40010 */ addiu $a0, $sp, 0x10 -/* B76D18 80240568 0200282D */ daddu $a1, $s0, $zero -/* B76D1C 8024056C 0C019D80 */ jal guMtxCatF -/* B76D20 80240570 0200302D */ daddu $a2, $s0, $zero -/* B76D24 80240574 27A40010 */ addiu $a0, $sp, 0x10 -/* B76D28 80240578 4600B587 */ neg.s $f22, $f22 -/* B76D2C 8024057C 4405A000 */ mfc1 $a1, $f20 -/* B76D30 80240580 4406B000 */ mfc1 $a2, $f22 -/* B76D34 80240584 0C019E40 */ jal guTranslateF -/* B76D38 80240588 00A0382D */ daddu $a3, $a1, $zero -/* B76D3C 8024058C 27A40010 */ addiu $a0, $sp, 0x10 -/* B76D40 80240590 0200282D */ daddu $a1, $s0, $zero -/* B76D44 80240594 0C019D80 */ jal guMtxCatF -/* B76D48 80240598 00A0302D */ daddu $a2, $a1, $zero -.L8024059C: -/* B76D4C 8024059C 8FBF005C */ lw $ra, 0x5c($sp) -/* B76D50 802405A0 8FB20058 */ lw $s2, 0x58($sp) -/* B76D54 802405A4 8FB10054 */ lw $s1, 0x54($sp) -/* B76D58 802405A8 8FB00050 */ lw $s0, 0x50($sp) -/* B76D5C 802405AC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B76D60 802405B0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B76D64 802405B4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B76D68 802405B8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B76D6C 802405BC D7B40060 */ ldc1 $f20, 0x60($sp) -/* B76D70 802405C0 24020002 */ addiu $v0, $zero, 2 -/* B76D74 802405C4 03E00008 */ jr $ra -/* B76D78 802405C8 27BD0088 */ addiu $sp, $sp, 0x88 -/* B76D7C 802405CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_14/func_802400F8_B7A050.s b/asm/nonmatchings/world/area_jan/jan_14/func_802400F8_B7A050.s deleted file mode 100644 index c9ccec5362..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_14/func_802400F8_B7A050.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F8_B7A148 -/* B7A148 802400F8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B7A14C 802400FC AFB10014 */ sw $s1, 0x14($sp) -/* B7A150 80240100 0080882D */ daddu $s1, $a0, $zero -/* B7A154 80240104 AFBF0018 */ sw $ra, 0x18($sp) -/* B7A158 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* B7A15C 8024010C F7B40020 */ sdc1 $f20, 0x20($sp) -/* B7A160 80240110 8E30000C */ lw $s0, 0xc($s1) -/* B7A164 80240114 8E050000 */ lw $a1, ($s0) -/* B7A168 80240118 0C0B210B */ jal get_float_variable -/* B7A16C 8024011C 26100004 */ addiu $s0, $s0, 4 -/* B7A170 80240120 8E050000 */ lw $a1, ($s0) -/* B7A174 80240124 26100004 */ addiu $s0, $s0, 4 -/* B7A178 80240128 0220202D */ daddu $a0, $s1, $zero -/* B7A17C 8024012C 0C0B210B */ jal get_float_variable -/* B7A180 80240130 46000506 */ mov.s $f20, $f0 -/* B7A184 80240134 46140001 */ sub.s $f0, $f0, $f20 -/* B7A188 80240138 3C014120 */ lui $at, 0x4120 -/* B7A18C 8024013C 44811000 */ mtc1 $at, $f2 -/* B7A190 80240140 8E050000 */ lw $a1, ($s0) -/* B7A194 80240144 46020003 */ div.s $f0, $f0, $f2 -/* B7A198 80240148 44060000 */ mfc1 $a2, $f0 -/* B7A19C 8024014C 0C0B2190 */ jal set_float_variable -/* B7A1A0 80240150 0220202D */ daddu $a0, $s1, $zero -/* B7A1A4 80240154 8FBF0018 */ lw $ra, 0x18($sp) -/* B7A1A8 80240158 8FB10014 */ lw $s1, 0x14($sp) -/* B7A1AC 8024015C 8FB00010 */ lw $s0, 0x10($sp) -/* B7A1B0 80240160 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B7A1B4 80240164 24020002 */ addiu $v0, $zero, 2 -/* B7A1B8 80240168 03E00008 */ jr $ra -/* B7A1BC 8024016C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_14/func_80240170_B7A050.s b/asm/nonmatchings/world/area_jan/jan_14/func_80240170_B7A050.s deleted file mode 100644 index 43222efa4e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_14/func_80240170_B7A050.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240170_B7A1C0 -/* B7A1C0 80240170 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B7A1C4 80240174 AFB00010 */ sw $s0, 0x10($sp) -/* B7A1C8 80240178 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B7A1CC 8024017C 4485A000 */ mtc1 $a1, $f20 -/* B7A1D0 80240180 AFBF0014 */ sw $ra, 0x14($sp) -/* B7A1D4 80240184 0C019D28 */ jal guMtxIdentF -/* B7A1D8 80240188 0080802D */ daddu $s0, $a0, $zero -/* B7A1DC 8024018C 3C018024 */ lui $at, 0x8024 -/* B7A1E0 80240190 D4203870 */ ldc1 $f0, 0x3870($at) -/* B7A1E4 80240194 4600A521 */ cvt.d.s $f20, $f20 -/* B7A1E8 80240198 4620A502 */ mul.d $f20, $f20, $f0 -/* B7A1EC 8024019C 00000000 */ nop -/* B7A1F0 802401A0 3C013F80 */ lui $at, 0x3f80 -/* B7A1F4 802401A4 44810000 */ mtc1 $at, $f0 -/* B7A1F8 802401A8 AE000018 */ sw $zero, 0x18($s0) -/* B7A1FC 802401AC E6000014 */ swc1 $f0, 0x14($s0) -/* B7A200 802401B0 4620A520 */ cvt.s.d $f20, $f20 -/* B7A204 802401B4 E6140010 */ swc1 $f20, 0x10($s0) -/* B7A208 802401B8 8FBF0014 */ lw $ra, 0x14($sp) -/* B7A20C 802401BC 8FB00010 */ lw $s0, 0x10($sp) -/* B7A210 802401C0 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B7A214 802401C4 03E00008 */ jr $ra -/* B7A218 802401C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_14/func_802401CC_B7A050.s b/asm/nonmatchings/world/area_jan/jan_14/func_802401CC_B7A050.s deleted file mode 100644 index 03c922a1c7..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_14/func_802401CC_B7A050.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401CC_B7A21C -/* B7A21C 802401CC 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B7A220 802401D0 AFB10054 */ sw $s1, 0x54($sp) -/* B7A224 802401D4 0080882D */ daddu $s1, $a0, $zero -/* B7A228 802401D8 AFBF0058 */ sw $ra, 0x58($sp) -/* B7A22C 802401DC AFB00050 */ sw $s0, 0x50($sp) -/* B7A230 802401E0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B7A234 802401E4 8E30000C */ lw $s0, 0xc($s1) -/* B7A238 802401E8 8E050000 */ lw $a1, ($s0) -/* B7A23C 802401EC 0C0B1EAF */ jal get_variable -/* B7A240 802401F0 26100004 */ addiu $s0, $s0, 4 -/* B7A244 802401F4 0C046C04 */ jal get_model_list_index_from_tree_index -/* B7A248 802401F8 0040202D */ daddu $a0, $v0, $zero -/* B7A24C 802401FC 0220202D */ daddu $a0, $s1, $zero -/* B7A250 80240200 8E050000 */ lw $a1, ($s0) -/* B7A254 80240204 0C0B210B */ jal get_float_variable -/* B7A258 80240208 0040802D */ daddu $s0, $v0, $zero -/* B7A25C 8024020C 0200202D */ daddu $a0, $s0, $zero -/* B7A260 80240210 0C046B4C */ jal get_model_from_list_index -/* B7A264 80240214 46000506 */ mov.s $f20, $f0 -/* B7A268 80240218 0040802D */ daddu $s0, $v0, $zero -/* B7A26C 8024021C 96020000 */ lhu $v0, ($s0) -/* B7A270 80240220 30420400 */ andi $v0, $v0, 0x400 -/* B7A274 80240224 14400008 */ bnez $v0, .L80240248 -/* B7A278 80240228 00000000 */ nop -/* B7A27C 8024022C 4405A000 */ mfc1 $a1, $f20 -/* B7A280 80240230 0C09005C */ jal func_80240170 -/* B7A284 80240234 26040058 */ addiu $a0, $s0, 0x58 -/* B7A288 80240238 96020000 */ lhu $v0, ($s0) -/* B7A28C 8024023C 34421400 */ ori $v0, $v0, 0x1400 -/* B7A290 80240240 08090099 */ j .L80240264 -/* B7A294 80240244 A6020000 */ sh $v0, ($s0) -.L80240248: -/* B7A298 80240248 4405A000 */ mfc1 $a1, $f20 -/* B7A29C 8024024C 0C09005C */ jal func_80240170 -/* B7A2A0 80240250 27A40010 */ addiu $a0, $sp, 0x10 -/* B7A2A4 80240254 27A40010 */ addiu $a0, $sp, 0x10 -/* B7A2A8 80240258 26050058 */ addiu $a1, $s0, 0x58 -/* B7A2AC 8024025C 0C019D80 */ jal guMtxCatF -/* B7A2B0 80240260 00A0302D */ daddu $a2, $a1, $zero -.L80240264: -/* B7A2B4 80240264 8FBF0058 */ lw $ra, 0x58($sp) -/* B7A2B8 80240268 8FB10054 */ lw $s1, 0x54($sp) -/* B7A2BC 8024026C 8FB00050 */ lw $s0, 0x50($sp) -/* B7A2C0 80240270 D7B40060 */ ldc1 $f20, 0x60($sp) -/* B7A2C4 80240274 24020002 */ addiu $v0, $zero, 2 -/* B7A2C8 80240278 03E00008 */ jr $ra -/* B7A2CC 8024027C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_jan/jan_14/func_80240280_B7A050.s b/asm/nonmatchings/world/area_jan/jan_14/func_80240280_B7A050.s deleted file mode 100644 index 7880a126b1..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_14/func_80240280_B7A050.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240280_B7A2D0 -/* B7A2D0 80240280 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B7A2D4 80240284 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B7A2D8 80240288 4485A000 */ mtc1 $a1, $f20 -/* B7A2DC 8024028C F7B60020 */ sdc1 $f22, 0x20($sp) -/* B7A2E0 80240290 4486B000 */ mtc1 $a2, $f22 -/* B7A2E4 80240294 AFB00010 */ sw $s0, 0x10($sp) -/* B7A2E8 80240298 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B7A2EC 8024029C 4487C000 */ mtc1 $a3, $f24 -/* B7A2F0 802402A0 AFBF0014 */ sw $ra, 0x14($sp) -/* B7A2F4 802402A4 0C019D28 */ jal guMtxIdentF -/* B7A2F8 802402A8 0080802D */ daddu $s0, $a0, $zero -/* B7A2FC 802402AC 4616A582 */ mul.s $f22, $f20, $f22 -/* B7A300 802402B0 00000000 */ nop -/* B7A304 802402B4 4618A502 */ mul.s $f20, $f20, $f24 -/* B7A308 802402B8 00000000 */ nop -/* B7A30C 802402BC 3C013F80 */ lui $at, 0x3f80 -/* B7A310 802402C0 44810000 */ mtc1 $at, $f0 -/* B7A314 802402C4 00000000 */ nop -/* B7A318 802402C8 E6000014 */ swc1 $f0, 0x14($s0) -/* B7A31C 802402CC E6160010 */ swc1 $f22, 0x10($s0) -/* B7A320 802402D0 E6140018 */ swc1 $f20, 0x18($s0) -/* B7A324 802402D4 8FBF0014 */ lw $ra, 0x14($sp) -/* B7A328 802402D8 8FB00010 */ lw $s0, 0x10($sp) -/* B7A32C 802402DC D7B80028 */ ldc1 $f24, 0x28($sp) -/* B7A330 802402E0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B7A334 802402E4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B7A338 802402E8 03E00008 */ jr $ra -/* B7A33C 802402EC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_14/func_802402F0_B7A050.s b/asm/nonmatchings/world/area_jan/jan_14/func_802402F0_B7A050.s deleted file mode 100644 index a418e1b421..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_14/func_802402F0_B7A050.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_B7A340 -/* B7A340 802402F0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B7A344 802402F4 AFB10054 */ sw $s1, 0x54($sp) -/* B7A348 802402F8 0080882D */ daddu $s1, $a0, $zero -/* B7A34C 802402FC AFBF005C */ sw $ra, 0x5c($sp) -/* B7A350 80240300 AFB20058 */ sw $s2, 0x58($sp) -/* B7A354 80240304 AFB00050 */ sw $s0, 0x50($sp) -/* B7A358 80240308 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B7A35C 8024030C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B7A360 80240310 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B7A364 80240314 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B7A368 80240318 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B7A36C 8024031C 8E30000C */ lw $s0, 0xc($s1) -/* B7A370 80240320 8E050000 */ lw $a1, ($s0) -/* B7A374 80240324 0C0B1EAF */ jal get_variable -/* B7A378 80240328 26100004 */ addiu $s0, $s0, 4 -/* B7A37C 8024032C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B7A380 80240330 0040202D */ daddu $a0, $v0, $zero -/* B7A384 80240334 8E050000 */ lw $a1, ($s0) -/* B7A388 80240338 26100004 */ addiu $s0, $s0, 4 -/* B7A38C 8024033C 0220202D */ daddu $a0, $s1, $zero -/* B7A390 80240340 0C0B210B */ jal get_float_variable -/* B7A394 80240344 0040902D */ daddu $s2, $v0, $zero -/* B7A398 80240348 8E050000 */ lw $a1, ($s0) -/* B7A39C 8024034C 26100004 */ addiu $s0, $s0, 4 -/* B7A3A0 80240350 0220202D */ daddu $a0, $s1, $zero -/* B7A3A4 80240354 0C0B210B */ jal get_float_variable -/* B7A3A8 80240358 46000706 */ mov.s $f28, $f0 -/* B7A3AC 8024035C 8E050000 */ lw $a1, ($s0) -/* B7A3B0 80240360 26100004 */ addiu $s0, $s0, 4 -/* B7A3B4 80240364 0220202D */ daddu $a0, $s1, $zero -/* B7A3B8 80240368 0C0B210B */ jal get_float_variable -/* B7A3BC 8024036C 46000686 */ mov.s $f26, $f0 -/* B7A3C0 80240370 0220202D */ daddu $a0, $s1, $zero -/* B7A3C4 80240374 8E050000 */ lw $a1, ($s0) -/* B7A3C8 80240378 0C0B210B */ jal get_float_variable -/* B7A3CC 8024037C 46000586 */ mov.s $f22, $f0 -/* B7A3D0 80240380 0240202D */ daddu $a0, $s2, $zero -/* B7A3D4 80240384 0C046B4C */ jal get_model_from_list_index -/* B7A3D8 80240388 46000606 */ mov.s $f24, $f0 -/* B7A3DC 8024038C 0040882D */ daddu $s1, $v0, $zero -/* B7A3E0 80240390 96220000 */ lhu $v0, ($s1) -/* B7A3E4 80240394 30420400 */ andi $v0, $v0, 0x400 -/* B7A3E8 80240398 1440001E */ bnez $v0, .L80240414 -/* B7A3EC 8024039C 26300058 */ addiu $s0, $s1, 0x58 -/* B7A3F0 802403A0 4480A000 */ mtc1 $zero, $f20 -/* B7A3F4 802403A4 4406B000 */ mfc1 $a2, $f22 -/* B7A3F8 802403A8 4405A000 */ mfc1 $a1, $f20 -/* B7A3FC 802403AC 4407A000 */ mfc1 $a3, $f20 -/* B7A400 802403B0 0C019E40 */ jal guTranslateF -/* B7A404 802403B4 0200202D */ daddu $a0, $s0, $zero -/* B7A408 802403B8 4405E000 */ mfc1 $a1, $f28 -/* B7A40C 802403BC 4406D000 */ mfc1 $a2, $f26 -/* B7A410 802403C0 4407C000 */ mfc1 $a3, $f24 -/* B7A414 802403C4 0C0900A0 */ jal func_80240280 -/* B7A418 802403C8 27A40010 */ addiu $a0, $sp, 0x10 -/* B7A41C 802403CC 27A40010 */ addiu $a0, $sp, 0x10 -/* B7A420 802403D0 0200282D */ daddu $a1, $s0, $zero -/* B7A424 802403D4 0C019D80 */ jal guMtxCatF -/* B7A428 802403D8 0200302D */ daddu $a2, $s0, $zero -/* B7A42C 802403DC 27A40010 */ addiu $a0, $sp, 0x10 -/* B7A430 802403E0 4600B587 */ neg.s $f22, $f22 -/* B7A434 802403E4 4405A000 */ mfc1 $a1, $f20 -/* B7A438 802403E8 4406B000 */ mfc1 $a2, $f22 -/* B7A43C 802403EC 0C019E40 */ jal guTranslateF -/* B7A440 802403F0 00A0382D */ daddu $a3, $a1, $zero -/* B7A444 802403F4 27A40010 */ addiu $a0, $sp, 0x10 -/* B7A448 802403F8 0200282D */ daddu $a1, $s0, $zero -/* B7A44C 802403FC 0C019D80 */ jal guMtxCatF -/* B7A450 80240400 00A0302D */ daddu $a2, $a1, $zero -/* B7A454 80240404 96220000 */ lhu $v0, ($s1) -/* B7A458 80240408 34421400 */ ori $v0, $v0, 0x1400 -/* B7A45C 8024040C 08090123 */ j .L8024048C -/* B7A460 80240410 A6220000 */ sh $v0, ($s1) -.L80240414: -/* B7A464 80240414 4480A000 */ mtc1 $zero, $f20 -/* B7A468 80240418 4406B000 */ mfc1 $a2, $f22 -/* B7A46C 8024041C 4405A000 */ mfc1 $a1, $f20 -/* B7A470 80240420 4407A000 */ mfc1 $a3, $f20 -/* B7A474 80240424 0C019E40 */ jal guTranslateF -/* B7A478 80240428 27A40010 */ addiu $a0, $sp, 0x10 -/* B7A47C 8024042C 27A40010 */ addiu $a0, $sp, 0x10 -/* B7A480 80240430 26300058 */ addiu $s0, $s1, 0x58 -/* B7A484 80240434 0200282D */ daddu $a1, $s0, $zero -/* B7A488 80240438 0C019D80 */ jal guMtxCatF -/* B7A48C 8024043C 0200302D */ daddu $a2, $s0, $zero -/* B7A490 80240440 4405E000 */ mfc1 $a1, $f28 -/* B7A494 80240444 4406D000 */ mfc1 $a2, $f26 -/* B7A498 80240448 4407C000 */ mfc1 $a3, $f24 -/* B7A49C 8024044C 0C0900A0 */ jal func_80240280 -/* B7A4A0 80240450 27A40010 */ addiu $a0, $sp, 0x10 -/* B7A4A4 80240454 27A40010 */ addiu $a0, $sp, 0x10 -/* B7A4A8 80240458 0200282D */ daddu $a1, $s0, $zero -/* B7A4AC 8024045C 0C019D80 */ jal guMtxCatF -/* B7A4B0 80240460 0200302D */ daddu $a2, $s0, $zero -/* B7A4B4 80240464 27A40010 */ addiu $a0, $sp, 0x10 -/* B7A4B8 80240468 4600B587 */ neg.s $f22, $f22 -/* B7A4BC 8024046C 4405A000 */ mfc1 $a1, $f20 -/* B7A4C0 80240470 4406B000 */ mfc1 $a2, $f22 -/* B7A4C4 80240474 0C019E40 */ jal guTranslateF -/* B7A4C8 80240478 00A0382D */ daddu $a3, $a1, $zero -/* B7A4CC 8024047C 27A40010 */ addiu $a0, $sp, 0x10 -/* B7A4D0 80240480 0200282D */ daddu $a1, $s0, $zero -/* B7A4D4 80240484 0C019D80 */ jal guMtxCatF -/* B7A4D8 80240488 00A0302D */ daddu $a2, $a1, $zero -.L8024048C: -/* B7A4DC 8024048C 8FBF005C */ lw $ra, 0x5c($sp) -/* B7A4E0 80240490 8FB20058 */ lw $s2, 0x58($sp) -/* B7A4E4 80240494 8FB10054 */ lw $s1, 0x54($sp) -/* B7A4E8 80240498 8FB00050 */ lw $s0, 0x50($sp) -/* B7A4EC 8024049C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B7A4F0 802404A0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B7A4F4 802404A4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B7A4F8 802404A8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B7A4FC 802404AC D7B40060 */ ldc1 $f20, 0x60($sp) -/* B7A500 802404B0 24020002 */ addiu $v0, $zero, 2 -/* B7A504 802404B4 03E00008 */ jr $ra -/* B7A508 802404B8 27BD0088 */ addiu $sp, $sp, 0x88 -/* B7A50C 802404BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_14/func_802404C0_B7A050.s b/asm/nonmatchings/world/area_jan/jan_14/func_802404C0_B7A050.s deleted file mode 100644 index 770f6979ed..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_14/func_802404C0_B7A050.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_B7A510 -/* B7A510 802404C0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B7A514 802404C4 AFB00030 */ sw $s0, 0x30($sp) -/* B7A518 802404C8 0080802D */ daddu $s0, $a0, $zero -/* B7A51C 802404CC AFBF0040 */ sw $ra, 0x40($sp) -/* B7A520 802404D0 AFB3003C */ sw $s3, 0x3c($sp) -/* B7A524 802404D4 AFB20038 */ sw $s2, 0x38($sp) -/* B7A528 802404D8 AFB10034 */ sw $s1, 0x34($sp) -/* B7A52C 802404DC F7B60050 */ sdc1 $f22, 0x50($sp) -/* B7A530 802404E0 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B7A534 802404E4 8E130148 */ lw $s3, 0x148($s0) -/* B7A538 802404E8 00A0882D */ daddu $s1, $a1, $zero -/* B7A53C 802404EC 86640008 */ lh $a0, 8($s3) -/* B7A540 802404F0 0C00EABB */ jal get_npc_unsafe -/* B7A544 802404F4 00C0902D */ daddu $s2, $a2, $zero -/* B7A548 802404F8 0200202D */ daddu $a0, $s0, $zero -/* B7A54C 802404FC 0220282D */ daddu $a1, $s1, $zero -/* B7A550 80240500 0240302D */ daddu $a2, $s2, $zero -/* B7A554 80240504 0C012568 */ jal func_800495A0 -/* B7A558 80240508 0040802D */ daddu $s0, $v0, $zero -/* B7A55C 8024050C 8E020000 */ lw $v0, ($s0) -/* B7A560 80240510 2404002D */ addiu $a0, $zero, 0x2d -/* B7A564 80240514 34420800 */ ori $v0, $v0, 0x800 -/* B7A568 80240518 0C00A67F */ jal rand_int -/* B7A56C 8024051C AE020000 */ sw $v0, ($s0) -/* B7A570 80240520 0200202D */ daddu $a0, $s0, $zero -/* B7A574 80240524 3C05B000 */ lui $a1, 0xb000 -/* B7A578 80240528 34A50017 */ ori $a1, $a1, 0x17 -/* B7A57C 8024052C 44820000 */ mtc1 $v0, $f0 -/* B7A580 80240530 00000000 */ nop -/* B7A584 80240534 46800021 */ cvt.d.w $f0, $f0 -/* B7A588 80240538 3C014024 */ lui $at, 0x4024 -/* B7A58C 8024053C 44811800 */ mtc1 $at, $f3 -/* B7A590 80240540 44801000 */ mtc1 $zero, $f2 -/* B7A594 80240544 3C014020 */ lui $at, 0x4020 -/* B7A598 80240548 44812800 */ mtc1 $at, $f5 -/* B7A59C 8024054C 44802000 */ mtc1 $zero, $f4 -/* B7A5A0 80240550 46220003 */ div.d $f0, $f0, $f2 -/* B7A5A4 80240554 46240000 */ add.d $f0, $f0, $f4 -/* B7A5A8 80240558 3C013FC0 */ lui $at, 0x3fc0 -/* B7A5AC 8024055C 44811000 */ mtc1 $at, $f2 -/* B7A5B0 80240560 0000302D */ daddu $a2, $zero, $zero -/* B7A5B4 80240564 E6020014 */ swc1 $f2, 0x14($s0) -/* B7A5B8 80240568 46200020 */ cvt.s.d $f0, $f0 -/* B7A5BC 8024056C 0C012530 */ jal func_800494C0 -/* B7A5C0 80240570 E600001C */ swc1 $f0, 0x1c($s0) -/* B7A5C4 80240574 8E6300D0 */ lw $v1, 0xd0($s3) -/* B7A5C8 80240578 C6000040 */ lwc1 $f0, 0x40($s0) -/* B7A5CC 8024057C C4620000 */ lwc1 $f2, ($v1) -/* B7A5D0 80240580 468010A0 */ cvt.s.w $f2, $f2 -/* B7A5D4 80240584 C4640008 */ lwc1 $f4, 8($v1) -/* B7A5D8 80240588 46802120 */ cvt.s.w $f4, $f4 -/* B7A5DC 8024058C E7A00010 */ swc1 $f0, 0x10($sp) -/* B7A5E0 80240590 8E6200D0 */ lw $v0, 0xd0($s3) -/* B7A5E4 80240594 44051000 */ mfc1 $a1, $f2 -/* B7A5E8 80240598 C440000C */ lwc1 $f0, 0xc($v0) -/* B7A5EC 8024059C 46800020 */ cvt.s.w $f0, $f0 -/* B7A5F0 802405A0 E7A00014 */ swc1 $f0, 0x14($sp) -/* B7A5F4 802405A4 8E6200D0 */ lw $v0, 0xd0($s3) -/* B7A5F8 802405A8 44062000 */ mfc1 $a2, $f4 -/* B7A5FC 802405AC C4400010 */ lwc1 $f0, 0x10($v0) -/* B7A600 802405B0 46800020 */ cvt.s.w $f0, $f0 -/* B7A604 802405B4 E7A00018 */ swc1 $f0, 0x18($sp) -/* B7A608 802405B8 8C640018 */ lw $a0, 0x18($v1) -/* B7A60C 802405BC 0C0123F5 */ jal is_point_within_region -/* B7A610 802405C0 8E070038 */ lw $a3, 0x38($s0) -/* B7A614 802405C4 10400035 */ beqz $v0, .L8024069C -/* B7A618 802405C8 00000000 */ nop -/* B7A61C 802405CC C60C0038 */ lwc1 $f12, 0x38($s0) -/* B7A620 802405D0 3C0141C8 */ lui $at, 0x41c8 -/* B7A624 802405D4 4481B000 */ mtc1 $at, $f22 -/* B7A628 802405D8 8E6200D0 */ lw $v0, 0xd0($s3) -/* B7A62C 802405DC C60E0040 */ lwc1 $f14, 0x40($s0) -/* B7A630 802405E0 C4480000 */ lwc1 $f8, ($v0) -/* B7A634 802405E4 46804220 */ cvt.s.w $f8, $f8 -/* B7A638 802405E8 44064000 */ mfc1 $a2, $f8 -/* B7A63C 802405EC C4480008 */ lwc1 $f8, 8($v0) -/* B7A640 802405F0 46804220 */ cvt.s.w $f8, $f8 -/* B7A644 802405F4 44074000 */ mfc1 $a3, $f8 -/* B7A648 802405F8 3C01403E */ lui $at, 0x403e -/* B7A64C 802405FC 4481A800 */ mtc1 $at, $f21 -/* B7A650 80240600 4480A000 */ mtc1 $zero, $f20 -/* B7A654 80240604 0C00A720 */ jal atan2 -/* B7A658 80240608 0000882D */ daddu $s1, $zero, $zero -/* B7A65C 8024060C C6020038 */ lwc1 $f2, 0x38($s0) -/* B7A660 80240610 C604003C */ lwc1 $f4, 0x3c($s0) -/* B7A664 80240614 C6060040 */ lwc1 $f6, 0x40($s0) -/* B7A668 80240618 E600000C */ swc1 $f0, 0xc($s0) -/* B7A66C 8024061C E7A20020 */ swc1 $f2, 0x20($sp) -/* B7A670 80240620 E7A40024 */ swc1 $f4, 0x24($sp) -/* B7A674 80240624 E7A60028 */ swc1 $f6, 0x28($sp) -.L80240628: -/* B7A678 80240628 E7B60010 */ swc1 $f22, 0x10($sp) -/* B7A67C 8024062C C600000C */ lwc1 $f0, 0xc($s0) -/* B7A680 80240630 E7A00014 */ swc1 $f0, 0x14($sp) -/* B7A684 80240634 860200A8 */ lh $v0, 0xa8($s0) -/* B7A688 80240638 27A50020 */ addiu $a1, $sp, 0x20 -/* B7A68C 8024063C 44820000 */ mtc1 $v0, $f0 -/* B7A690 80240640 00000000 */ nop -/* B7A694 80240644 46800020 */ cvt.s.w $f0, $f0 -/* B7A698 80240648 E7A00018 */ swc1 $f0, 0x18($sp) -/* B7A69C 8024064C 860200A6 */ lh $v0, 0xa6($s0) -/* B7A6A0 80240650 27A60024 */ addiu $a2, $sp, 0x24 -/* B7A6A4 80240654 44820000 */ mtc1 $v0, $f0 -/* B7A6A8 80240658 00000000 */ nop -/* B7A6AC 8024065C 46800020 */ cvt.s.w $f0, $f0 -/* B7A6B0 80240660 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B7A6B4 80240664 8E040080 */ lw $a0, 0x80($s0) -/* B7A6B8 80240668 0C037711 */ jal func_800DDC44 -/* B7A6BC 8024066C 27A70028 */ addiu $a3, $sp, 0x28 -/* B7A6C0 80240670 10400016 */ beqz $v0, .L802406CC -/* B7A6C4 80240674 26310001 */ addiu $s1, $s1, 1 -/* B7A6C8 80240678 C600000C */ lwc1 $f0, 0xc($s0) -/* B7A6CC 8024067C 46000021 */ cvt.d.s $f0, $f0 -/* B7A6D0 80240680 46340000 */ add.d $f0, $f0, $f20 -/* B7A6D4 80240684 2A220006 */ slti $v0, $s1, 6 -/* B7A6D8 80240688 46200020 */ cvt.s.d $f0, $f0 -/* B7A6DC 8024068C 1440FFE6 */ bnez $v0, .L80240628 -/* B7A6E0 80240690 E600000C */ swc1 $f0, 0xc($s0) -/* B7A6E4 80240694 080901B3 */ j .L802406CC -/* B7A6E8 80240698 00000000 */ nop -.L8024069C: -/* B7A6EC 8024069C 0C00A67F */ jal rand_int -/* B7A6F0 802406A0 2404003C */ addiu $a0, $zero, 0x3c -/* B7A6F4 802406A4 C60C000C */ lwc1 $f12, 0xc($s0) -/* B7A6F8 802406A8 44820000 */ mtc1 $v0, $f0 -/* B7A6FC 802406AC 00000000 */ nop -/* B7A700 802406B0 46800020 */ cvt.s.w $f0, $f0 -/* B7A704 802406B4 46006300 */ add.s $f12, $f12, $f0 -/* B7A708 802406B8 3C0141F0 */ lui $at, 0x41f0 -/* B7A70C 802406BC 44810000 */ mtc1 $at, $f0 -/* B7A710 802406C0 0C00A6C9 */ jal clamp_angle -/* B7A714 802406C4 46006301 */ sub.s $f12, $f12, $f0 -/* B7A718 802406C8 E600000C */ swc1 $f0, 0xc($s0) -.L802406CC: -/* B7A71C 802406CC 8FBF0040 */ lw $ra, 0x40($sp) -/* B7A720 802406D0 8FB3003C */ lw $s3, 0x3c($sp) -/* B7A724 802406D4 8FB20038 */ lw $s2, 0x38($sp) -/* B7A728 802406D8 8FB10034 */ lw $s1, 0x34($sp) -/* B7A72C 802406DC 8FB00030 */ lw $s0, 0x30($sp) -/* B7A730 802406E0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B7A734 802406E4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B7A738 802406E8 03E00008 */ jr $ra -/* B7A73C 802406EC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_14/func_802406F0_B7A050.s b/asm/nonmatchings/world/area_jan/jan_14/func_802406F0_B7A050.s deleted file mode 100644 index 1fd863a35f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_14/func_802406F0_B7A050.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406F0_B7A740 -/* B7A740 802406F0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* B7A744 802406F4 AFB3004C */ sw $s3, 0x4c($sp) -/* B7A748 802406F8 0080982D */ daddu $s3, $a0, $zero -/* B7A74C 802406FC AFBF0054 */ sw $ra, 0x54($sp) -/* B7A750 80240700 AFB40050 */ sw $s4, 0x50($sp) -/* B7A754 80240704 AFB20048 */ sw $s2, 0x48($sp) -/* B7A758 80240708 AFB10044 */ sw $s1, 0x44($sp) -/* B7A75C 8024070C AFB00040 */ sw $s0, 0x40($sp) -/* B7A760 80240710 F7B40058 */ sdc1 $f20, 0x58($sp) -/* B7A764 80240714 8E710148 */ lw $s1, 0x148($s3) -/* B7A768 80240718 00A0A02D */ daddu $s4, $a1, $zero -/* B7A76C 8024071C 86240008 */ lh $a0, 8($s1) -/* B7A770 80240720 0C00EABB */ jal get_npc_unsafe -/* B7A774 80240724 00C0902D */ daddu $s2, $a2, $zero -/* B7A778 80240728 8E830014 */ lw $v1, 0x14($s4) -/* B7A77C 8024072C 04600034 */ bltz $v1, .L80240800 -/* B7A780 80240730 0040802D */ daddu $s0, $v0, $zero -/* B7A784 80240734 8E620074 */ lw $v0, 0x74($s3) -/* B7A788 80240738 1C400030 */ bgtz $v0, .L802407FC -/* B7A78C 8024073C 2442FFFF */ addiu $v0, $v0, -1 -/* B7A790 80240740 0240202D */ daddu $a0, $s2, $zero -/* B7A794 80240744 AE630074 */ sw $v1, 0x74($s3) -/* B7A798 80240748 AFA00010 */ sw $zero, 0x10($sp) -/* B7A79C 8024074C 8E86000C */ lw $a2, 0xc($s4) -/* B7A7A0 80240750 8E870010 */ lw $a3, 0x10($s4) -/* B7A7A4 80240754 0C01242D */ jal func_800490B4 -/* B7A7A8 80240758 0220282D */ daddu $a1, $s1, $zero -/* B7A7AC 8024075C 10400025 */ beqz $v0, .L802407F4 -/* B7A7B0 80240760 0000202D */ daddu $a0, $zero, $zero -/* B7A7B4 80240764 0200282D */ daddu $a1, $s0, $zero -/* B7A7B8 80240768 0000302D */ daddu $a2, $zero, $zero -/* B7A7BC 8024076C 860300A8 */ lh $v1, 0xa8($s0) -/* B7A7C0 80240770 3C013F80 */ lui $at, 0x3f80 -/* B7A7C4 80240774 44810000 */ mtc1 $at, $f0 -/* B7A7C8 80240778 3C014000 */ lui $at, 0x4000 -/* B7A7CC 8024077C 44811000 */ mtc1 $at, $f2 -/* B7A7D0 80240780 3C01C1A0 */ lui $at, 0xc1a0 -/* B7A7D4 80240784 44812000 */ mtc1 $at, $f4 -/* B7A7D8 80240788 2402000F */ addiu $v0, $zero, 0xf -/* B7A7DC 8024078C AFA2001C */ sw $v0, 0x1c($sp) -/* B7A7E0 80240790 44835000 */ mtc1 $v1, $f10 -/* B7A7E4 80240794 00000000 */ nop -/* B7A7E8 80240798 468052A0 */ cvt.s.w $f10, $f10 -/* B7A7EC 8024079C 44075000 */ mfc1 $a3, $f10 -/* B7A7F0 802407A0 27A20028 */ addiu $v0, $sp, 0x28 -/* B7A7F4 802407A4 AFA20020 */ sw $v0, 0x20($sp) -/* B7A7F8 802407A8 E7A00010 */ swc1 $f0, 0x10($sp) -/* B7A7FC 802407AC E7A20014 */ swc1 $f2, 0x14($sp) -/* B7A800 802407B0 0C01BFA4 */ jal fx_emote -/* B7A804 802407B4 E7A40018 */ swc1 $f4, 0x18($sp) -/* B7A808 802407B8 0200202D */ daddu $a0, $s0, $zero -/* B7A80C 802407BC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B7A810 802407C0 0C012530 */ jal func_800494C0 -/* B7A814 802407C4 3C060020 */ lui $a2, 0x20 -/* B7A818 802407C8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B7A81C 802407CC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B7A820 802407D0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B7A824 802407D4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B7A828 802407D8 8C460028 */ lw $a2, 0x28($v0) -/* B7A82C 802407DC 0C00A720 */ jal atan2 -/* B7A830 802407E0 8C470030 */ lw $a3, 0x30($v0) -/* B7A834 802407E4 2402000C */ addiu $v0, $zero, 0xc -/* B7A838 802407E8 E600000C */ swc1 $f0, 0xc($s0) -/* B7A83C 802407EC 08090281 */ j .L80240A04 -/* B7A840 802407F0 AE620070 */ sw $v0, 0x70($s3) -.L802407F4: -/* B7A844 802407F4 8E620074 */ lw $v0, 0x74($s3) -/* B7A848 802407F8 2442FFFF */ addiu $v0, $v0, -1 -.L802407FC: -/* B7A84C 802407FC AE620074 */ sw $v0, 0x74($s3) -.L80240800: -/* B7A850 80240800 C6000018 */ lwc1 $f0, 0x18($s0) -/* B7A854 80240804 44801000 */ mtc1 $zero, $f2 -/* B7A858 80240808 44801800 */ mtc1 $zero, $f3 -/* B7A85C 8024080C 46000021 */ cvt.d.s $f0, $f0 -/* B7A860 80240810 4620103C */ c.lt.d $f2, $f0 -/* B7A864 80240814 00000000 */ nop -/* B7A868 80240818 45000025 */ bc1f .L802408B0 -/* B7A86C 8024081C 27A5002C */ addiu $a1, $sp, 0x2c -/* B7A870 80240820 C6000038 */ lwc1 $f0, 0x38($s0) -/* B7A874 80240824 860200A6 */ lh $v0, 0xa6($s0) -/* B7A878 80240828 3C018024 */ lui $at, 0x8024 -/* B7A87C 8024082C D4223880 */ ldc1 $f2, 0x3880($at) -/* B7A880 80240830 27A60030 */ addiu $a2, $sp, 0x30 -/* B7A884 80240834 E7A0002C */ swc1 $f0, 0x2c($sp) -/* B7A888 80240838 44820000 */ mtc1 $v0, $f0 -/* B7A88C 8024083C 00000000 */ nop -/* B7A890 80240840 46800020 */ cvt.s.w $f0, $f0 -/* B7A894 80240844 46000021 */ cvt.d.s $f0, $f0 -/* B7A898 80240848 C604003C */ lwc1 $f4, 0x3c($s0) -/* B7A89C 8024084C C6060040 */ lwc1 $f6, 0x40($s0) -/* B7A8A0 80240850 C6080018 */ lwc1 $f8, 0x18($s0) -/* B7A8A4 80240854 860200A8 */ lh $v0, 0xa8($s0) -/* B7A8A8 80240858 46220002 */ mul.d $f0, $f0, $f2 -/* B7A8AC 8024085C 00000000 */ nop -/* B7A8B0 80240860 E7A40030 */ swc1 $f4, 0x30($sp) -/* B7A8B4 80240864 E7A60034 */ swc1 $f6, 0x34($sp) -/* B7A8B8 80240868 E7A80010 */ swc1 $f8, 0x10($sp) -/* B7A8BC 8024086C C604000C */ lwc1 $f4, 0xc($s0) -/* B7A8C0 80240870 44821000 */ mtc1 $v0, $f2 -/* B7A8C4 80240874 00000000 */ nop -/* B7A8C8 80240878 468010A0 */ cvt.s.w $f2, $f2 -/* B7A8CC 8024087C E7A20018 */ swc1 $f2, 0x18($sp) -/* B7A8D0 80240880 E7A40014 */ swc1 $f4, 0x14($sp) -/* B7A8D4 80240884 46200020 */ cvt.s.d $f0, $f0 -/* B7A8D8 80240888 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B7A8DC 8024088C 8E040080 */ lw $a0, 0x80($s0) -/* B7A8E0 80240890 0C037711 */ jal func_800DDC44 -/* B7A8E4 80240894 27A70034 */ addiu $a3, $sp, 0x34 -/* B7A8E8 80240898 54400005 */ bnel $v0, $zero, .L802408B0 -/* B7A8EC 8024089C AE000018 */ sw $zero, 0x18($s0) -/* B7A8F0 802408A0 8E050018 */ lw $a1, 0x18($s0) -/* B7A8F4 802408A4 8E06000C */ lw $a2, 0xc($s0) -/* B7A8F8 802408A8 0C00EA95 */ jal npc_move_heading -/* B7A8FC 802408AC 0200202D */ daddu $a0, $s0, $zero -.L802408B0: -/* B7A900 802408B0 C600001C */ lwc1 $f0, 0x1c($s0) -/* B7A904 802408B4 44801000 */ mtc1 $zero, $f2 -/* B7A908 802408B8 44801800 */ mtc1 $zero, $f3 -/* B7A90C 802408BC 46000021 */ cvt.d.s $f0, $f0 -/* B7A910 802408C0 4622003C */ c.lt.d $f0, $f2 -/* B7A914 802408C4 00000000 */ nop -/* B7A918 802408C8 45000047 */ bc1f .L802409E8 -/* B7A91C 802408CC 27A5002C */ addiu $a1, $sp, 0x2c -/* B7A920 802408D0 27A60030 */ addiu $a2, $sp, 0x30 -/* B7A924 802408D4 27A20038 */ addiu $v0, $sp, 0x38 -/* B7A928 802408D8 C602003C */ lwc1 $f2, 0x3c($s0) -/* B7A92C 802408DC C6060038 */ lwc1 $f6, 0x38($s0) -/* B7A930 802408E0 3C01402A */ lui $at, 0x402a -/* B7A934 802408E4 4481A800 */ mtc1 $at, $f21 -/* B7A938 802408E8 4480A000 */ mtc1 $zero, $f20 -/* B7A93C 802408EC 460010A1 */ cvt.d.s $f2, $f2 -/* B7A940 802408F0 46341080 */ add.d $f2, $f2, $f20 -/* B7A944 802408F4 C600001C */ lwc1 $f0, 0x1c($s0) -/* B7A948 802408F8 C6040040 */ lwc1 $f4, 0x40($s0) -/* B7A94C 802408FC 46000005 */ abs.s $f0, $f0 -/* B7A950 80240900 E7A40034 */ swc1 $f4, 0x34($sp) -/* B7A954 80240904 3C014030 */ lui $at, 0x4030 -/* B7A958 80240908 44812800 */ mtc1 $at, $f5 -/* B7A95C 8024090C 44802000 */ mtc1 $zero, $f4 -/* B7A960 80240910 46000021 */ cvt.d.s $f0, $f0 -/* B7A964 80240914 E7A6002C */ swc1 $f6, 0x2c($sp) -/* B7A968 80240918 46240000 */ add.d $f0, $f0, $f4 -/* B7A96C 8024091C 462010A0 */ cvt.s.d $f2, $f2 -/* B7A970 80240920 E7A20030 */ swc1 $f2, 0x30($sp) -/* B7A974 80240924 46200020 */ cvt.s.d $f0, $f0 -/* B7A978 80240928 E7A00038 */ swc1 $f0, 0x38($sp) -/* B7A97C 8024092C AFA20010 */ sw $v0, 0x10($sp) -/* B7A980 80240930 8E040080 */ lw $a0, 0x80($s0) -/* B7A984 80240934 0C0372DF */ jal func_800DCB7C -/* B7A988 80240938 27A70034 */ addiu $a3, $sp, 0x34 -/* B7A98C 8024093C 1040002A */ beqz $v0, .L802409E8 -/* B7A990 80240940 00000000 */ nop -/* B7A994 80240944 C600001C */ lwc1 $f0, 0x1c($s0) -/* B7A998 80240948 C7A20038 */ lwc1 $f2, 0x38($sp) -/* B7A99C 8024094C 46000005 */ abs.s $f0, $f0 -/* B7A9A0 80240950 46000021 */ cvt.d.s $f0, $f0 -/* B7A9A4 80240954 46340000 */ add.d $f0, $f0, $f20 -/* B7A9A8 80240958 460010A1 */ cvt.d.s $f2, $f2 -/* B7A9AC 8024095C 4620103E */ c.le.d $f2, $f0 -/* B7A9B0 80240960 00000000 */ nop -/* B7A9B4 80240964 45000020 */ bc1f .L802409E8 -/* B7A9B8 80240968 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B7A9BC 8024096C C7A00030 */ lwc1 $f0, 0x30($sp) -/* B7A9C0 80240970 8E020000 */ lw $v0, ($s0) -/* B7A9C4 80240974 2403F7FF */ addiu $v1, $zero, -0x801 -/* B7A9C8 80240978 AE00001C */ sw $zero, 0x1c($s0) -/* B7A9CC 8024097C 00431024 */ and $v0, $v0, $v1 -/* B7A9D0 80240980 AE020000 */ sw $v0, ($s0) -/* B7A9D4 80240984 24020002 */ addiu $v0, $zero, 2 -/* B7A9D8 80240988 E600003C */ swc1 $f0, 0x3c($s0) -/* B7A9DC 8024098C 0C00A67F */ jal rand_int -/* B7A9E0 80240990 AE620070 */ sw $v0, 0x70($s3) -/* B7A9E4 80240994 3C035555 */ lui $v1, 0x5555 -/* B7A9E8 80240998 34635556 */ ori $v1, $v1, 0x5556 -/* B7A9EC 8024099C 00430018 */ mult $v0, $v1 -/* B7A9F0 802409A0 000227C3 */ sra $a0, $v0, 0x1f -/* B7A9F4 802409A4 00004010 */ mfhi $t0 -/* B7A9F8 802409A8 01042023 */ subu $a0, $t0, $a0 -/* B7A9FC 802409AC 00041840 */ sll $v1, $a0, 1 -/* B7AA00 802409B0 00641821 */ addu $v1, $v1, $a0 -/* B7AA04 802409B4 00431023 */ subu $v0, $v0, $v1 -/* B7AA08 802409B8 24430002 */ addiu $v1, $v0, 2 -/* B7AA0C 802409BC AE630074 */ sw $v1, 0x74($s3) -/* B7AA10 802409C0 8E82002C */ lw $v0, 0x2c($s4) -/* B7AA14 802409C4 5840000F */ blezl $v0, .L80240A04 -/* B7AA18 802409C8 AE600070 */ sw $zero, 0x70($s3) -/* B7AA1C 802409CC 8E820004 */ lw $v0, 4($s4) -/* B7AA20 802409D0 5840000C */ blezl $v0, .L80240A04 -/* B7AA24 802409D4 AE600070 */ sw $zero, 0x70($s3) -/* B7AA28 802409D8 1460000A */ bnez $v1, .L80240A04 -/* B7AA2C 802409DC 00000000 */ nop -/* B7AA30 802409E0 08090281 */ j .L80240A04 -/* B7AA34 802409E4 AE600070 */ sw $zero, 0x70($s3) -.L802409E8: -/* B7AA38 802409E8 C604003C */ lwc1 $f4, 0x3c($s0) -/* B7AA3C 802409EC C600001C */ lwc1 $f0, 0x1c($s0) -/* B7AA40 802409F0 46002100 */ add.s $f4, $f4, $f0 -/* B7AA44 802409F4 C6020014 */ lwc1 $f2, 0x14($s0) -/* B7AA48 802409F8 46020001 */ sub.s $f0, $f0, $f2 -/* B7AA4C 802409FC E604003C */ swc1 $f4, 0x3c($s0) -/* B7AA50 80240A00 E600001C */ swc1 $f0, 0x1c($s0) -.L80240A04: -/* B7AA54 80240A04 8FBF0054 */ lw $ra, 0x54($sp) -/* B7AA58 80240A08 8FB40050 */ lw $s4, 0x50($sp) -/* B7AA5C 80240A0C 8FB3004C */ lw $s3, 0x4c($sp) -/* B7AA60 80240A10 8FB20048 */ lw $s2, 0x48($sp) -/* B7AA64 80240A14 8FB10044 */ lw $s1, 0x44($sp) -/* B7AA68 80240A18 8FB00040 */ lw $s0, 0x40($sp) -/* B7AA6C 80240A1C D7B40058 */ ldc1 $f20, 0x58($sp) -/* B7AA70 80240A20 03E00008 */ jr $ra -/* B7AA74 80240A24 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_jan/jan_14/func_80240A28_B7A050.s b/asm/nonmatchings/world/area_jan/jan_14/func_80240A28_B7A050.s deleted file mode 100644 index b2f37f953e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_14/func_80240A28_B7A050.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A28_B7AA78 -/* B7AA78 80240A28 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B7AA7C 80240A2C AFB3001C */ sw $s3, 0x1c($sp) -/* B7AA80 80240A30 0080982D */ daddu $s3, $a0, $zero -/* B7AA84 80240A34 AFBF0020 */ sw $ra, 0x20($sp) -/* B7AA88 80240A38 AFB20018 */ sw $s2, 0x18($sp) -/* B7AA8C 80240A3C AFB10014 */ sw $s1, 0x14($sp) -/* B7AA90 80240A40 AFB00010 */ sw $s0, 0x10($sp) -/* B7AA94 80240A44 8E720148 */ lw $s2, 0x148($s3) -/* B7AA98 80240A48 86440008 */ lh $a0, 8($s2) -/* B7AA9C 80240A4C 0C00EABB */ jal get_npc_unsafe -/* B7AAA0 80240A50 00A0882D */ daddu $s1, $a1, $zero -/* B7AAA4 80240A54 8E240008 */ lw $a0, 8($s1) -/* B7AAA8 80240A58 0040802D */ daddu $s0, $v0, $zero -/* B7AAAC 80240A5C 00041FC2 */ srl $v1, $a0, 0x1f -/* B7AAB0 80240A60 00832021 */ addu $a0, $a0, $v1 -/* B7AAB4 80240A64 00042043 */ sra $a0, $a0, 1 -/* B7AAB8 80240A68 0C00A67F */ jal rand_int -/* B7AABC 80240A6C 24840001 */ addiu $a0, $a0, 1 -/* B7AAC0 80240A70 8E230008 */ lw $v1, 8($s1) -/* B7AAC4 80240A74 240400B4 */ addiu $a0, $zero, 0xb4 -/* B7AAC8 80240A78 00032FC2 */ srl $a1, $v1, 0x1f -/* B7AACC 80240A7C 00651821 */ addu $v1, $v1, $a1 -/* B7AAD0 80240A80 00031843 */ sra $v1, $v1, 1 -/* B7AAD4 80240A84 00621821 */ addu $v1, $v1, $v0 -/* B7AAD8 80240A88 0C00A67F */ jal rand_int -/* B7AADC 80240A8C A603008E */ sh $v1, 0x8e($s0) -/* B7AAE0 80240A90 C60C000C */ lwc1 $f12, 0xc($s0) -/* B7AAE4 80240A94 44820000 */ mtc1 $v0, $f0 -/* B7AAE8 80240A98 00000000 */ nop -/* B7AAEC 80240A9C 46800020 */ cvt.s.w $f0, $f0 -/* B7AAF0 80240AA0 46006300 */ add.s $f12, $f12, $f0 -/* B7AAF4 80240AA4 3C0142B4 */ lui $at, 0x42b4 -/* B7AAF8 80240AA8 44810000 */ mtc1 $at, $f0 -/* B7AAFC 80240AAC 0C00A6C9 */ jal clamp_angle -/* B7AB00 80240AB0 46006301 */ sub.s $f12, $f12, $f0 -/* B7AB04 80240AB4 E600000C */ swc1 $f0, 0xc($s0) -/* B7AB08 80240AB8 8E4200CC */ lw $v0, 0xcc($s2) -/* B7AB0C 80240ABC 8C420000 */ lw $v0, ($v0) -/* B7AB10 80240AC0 AE020028 */ sw $v0, 0x28($s0) -/* B7AB14 80240AC4 24020003 */ addiu $v0, $zero, 3 -/* B7AB18 80240AC8 AE620070 */ sw $v0, 0x70($s3) -/* B7AB1C 80240ACC 8FBF0020 */ lw $ra, 0x20($sp) -/* B7AB20 80240AD0 8FB3001C */ lw $s3, 0x1c($sp) -/* B7AB24 80240AD4 8FB20018 */ lw $s2, 0x18($sp) -/* B7AB28 80240AD8 8FB10014 */ lw $s1, 0x14($sp) -/* B7AB2C 80240ADC 8FB00010 */ lw $s0, 0x10($sp) -/* B7AB30 80240AE0 03E00008 */ jr $ra -/* B7AB34 80240AE4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_14/func_8024106C_B7A050.s b/asm/nonmatchings/world/area_jan/jan_14/func_8024106C_B7A050.s deleted file mode 100644 index 76d8372fc7..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_14/func_8024106C_B7A050.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024106C_B7B0BC -/* B7B0BC 8024106C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B7B0C0 80241070 AFB00010 */ sw $s0, 0x10($sp) -/* B7B0C4 80241074 0080802D */ daddu $s0, $a0, $zero -/* B7B0C8 80241078 AFBF0014 */ sw $ra, 0x14($sp) -/* B7B0CC 8024107C 8E020148 */ lw $v0, 0x148($s0) -/* B7B0D0 80241080 0C00EABB */ jal get_npc_unsafe -/* B7B0D4 80241084 84440008 */ lh $a0, 8($v0) -/* B7B0D8 80241088 9443008E */ lhu $v1, 0x8e($v0) -/* B7B0DC 8024108C 2463FFFF */ addiu $v1, $v1, -1 -/* B7B0E0 80241090 A443008E */ sh $v1, 0x8e($v0) -/* B7B0E4 80241094 00031C00 */ sll $v1, $v1, 0x10 -/* B7B0E8 80241098 58600001 */ blezl $v1, .L802410A0 -/* B7B0EC 8024109C AE000070 */ sw $zero, 0x70($s0) -.L802410A0: -/* B7B0F0 802410A0 8FBF0014 */ lw $ra, 0x14($sp) -/* B7B0F4 802410A4 8FB00010 */ lw $s0, 0x10($sp) -/* B7B0F8 802410A8 03E00008 */ jr $ra -/* B7B0FC 802410AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_15/func_802400C0_B7D920.s b/asm/nonmatchings/world/area_jan/jan_15/func_802400C0_B7D920.s deleted file mode 100644 index 32e25cac26..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_15/func_802400C0_B7D920.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400C0_B7D9E0 -/* B7D9E0 802400C0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B7D9E4 802400C4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B7D9E8 802400C8 4485A000 */ mtc1 $a1, $f20 -/* B7D9EC 802400CC F7B60020 */ sdc1 $f22, 0x20($sp) -/* B7D9F0 802400D0 4486B000 */ mtc1 $a2, $f22 -/* B7D9F4 802400D4 AFB00010 */ sw $s0, 0x10($sp) -/* B7D9F8 802400D8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B7D9FC 802400DC 4487C000 */ mtc1 $a3, $f24 -/* B7DA00 802400E0 AFBF0014 */ sw $ra, 0x14($sp) -/* B7DA04 802400E4 0C019D28 */ jal guMtxIdentF -/* B7DA08 802400E8 0080802D */ daddu $s0, $a0, $zero -/* B7DA0C 802400EC 4616A582 */ mul.s $f22, $f20, $f22 -/* B7DA10 802400F0 00000000 */ nop -/* B7DA14 802400F4 4618A502 */ mul.s $f20, $f20, $f24 -/* B7DA18 802400F8 00000000 */ nop -/* B7DA1C 802400FC 3C013F80 */ lui $at, 0x3f80 -/* B7DA20 80240100 44810000 */ mtc1 $at, $f0 -/* B7DA24 80240104 00000000 */ nop -/* B7DA28 80240108 E6000014 */ swc1 $f0, 0x14($s0) -/* B7DA2C 8024010C E6160010 */ swc1 $f22, 0x10($s0) -/* B7DA30 80240110 E6140018 */ swc1 $f20, 0x18($s0) -/* B7DA34 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* B7DA38 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* B7DA3C 8024011C D7B80028 */ ldc1 $f24, 0x28($sp) -/* B7DA40 80240120 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B7DA44 80240124 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B7DA48 80240128 03E00008 */ jr $ra -/* B7DA4C 8024012C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_16/func_80240124_B80000.s b/asm/nonmatchings/world/area_jan/jan_16/func_80240124_B80000.s deleted file mode 100644 index b7e13ca2a0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_16/func_80240124_B80000.s +++ /dev/null @@ -1,128 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_B80124 -/* B80124 80240124 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B80128 80240128 AFB10034 */ sw $s1, 0x34($sp) -/* B8012C 8024012C 0080882D */ daddu $s1, $a0, $zero -/* B80130 80240130 AFBF0054 */ sw $ra, 0x54($sp) -/* B80134 80240134 AFBE0050 */ sw $fp, 0x50($sp) -/* B80138 80240138 AFB7004C */ sw $s7, 0x4c($sp) -/* B8013C 8024013C AFB60048 */ sw $s6, 0x48($sp) -/* B80140 80240140 AFB50044 */ sw $s5, 0x44($sp) -/* B80144 80240144 AFB40040 */ sw $s4, 0x40($sp) -/* B80148 80240148 AFB3003C */ sw $s3, 0x3c($sp) -/* B8014C 8024014C AFB20038 */ sw $s2, 0x38($sp) -/* B80150 80240150 AFB00030 */ sw $s0, 0x30($sp) -/* B80154 80240154 8E30000C */ lw $s0, 0xc($s1) -/* B80158 80240158 8E050000 */ lw $a1, ($s0) -/* B8015C 8024015C 0C0B1EAF */ jal get_variable -/* B80160 80240160 26100004 */ addiu $s0, $s0, 4 -/* B80164 80240164 8E050000 */ lw $a1, ($s0) -/* B80168 80240168 26100004 */ addiu $s0, $s0, 4 -/* B8016C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* B80170 80240170 0C0B1EAF */ jal get_variable -/* B80174 80240174 0040982D */ daddu $s3, $v0, $zero -/* B80178 80240178 8E050000 */ lw $a1, ($s0) -/* B8017C 8024017C 26100004 */ addiu $s0, $s0, 4 -/* B80180 80240180 0220202D */ daddu $a0, $s1, $zero -/* B80184 80240184 0C0B1EAF */ jal get_variable -/* B80188 80240188 0040B02D */ daddu $s6, $v0, $zero -/* B8018C 8024018C 8E050000 */ lw $a1, ($s0) -/* B80190 80240190 26100004 */ addiu $s0, $s0, 4 -/* B80194 80240194 0220202D */ daddu $a0, $s1, $zero -/* B80198 80240198 0C0B1EAF */ jal get_variable -/* B8019C 8024019C 0040A82D */ daddu $s5, $v0, $zero -/* B801A0 802401A0 8E050000 */ lw $a1, ($s0) -/* B801A4 802401A4 26100004 */ addiu $s0, $s0, 4 -/* B801A8 802401A8 0220202D */ daddu $a0, $s1, $zero -/* B801AC 802401AC 0C0B1EAF */ jal get_variable -/* B801B0 802401B0 0040A02D */ daddu $s4, $v0, $zero -/* B801B4 802401B4 8E050000 */ lw $a1, ($s0) -/* B801B8 802401B8 26100004 */ addiu $s0, $s0, 4 -/* B801BC 802401BC 0220202D */ daddu $a0, $s1, $zero -/* B801C0 802401C0 0C0B1EAF */ jal get_variable -/* B801C4 802401C4 0040902D */ daddu $s2, $v0, $zero -/* B801C8 802401C8 8E050000 */ lw $a1, ($s0) -/* B801CC 802401CC 26100004 */ addiu $s0, $s0, 4 -/* B801D0 802401D0 0220202D */ daddu $a0, $s1, $zero -/* B801D4 802401D4 0C0B1EAF */ jal get_variable -/* B801D8 802401D8 AFA20028 */ sw $v0, 0x28($sp) -/* B801DC 802401DC 8E050000 */ lw $a1, ($s0) -/* B801E0 802401E0 26100004 */ addiu $s0, $s0, 4 -/* B801E4 802401E4 0220202D */ daddu $a0, $s1, $zero -/* B801E8 802401E8 0C0B1EAF */ jal get_variable -/* B801EC 802401EC 0040F02D */ daddu $fp, $v0, $zero -/* B801F0 802401F0 8E050000 */ lw $a1, ($s0) -/* B801F4 802401F4 26100004 */ addiu $s0, $s0, 4 -/* B801F8 802401F8 0220202D */ daddu $a0, $s1, $zero -/* B801FC 802401FC 0C0B1EAF */ jal get_variable -/* B80200 80240200 0040B82D */ daddu $s7, $v0, $zero -/* B80204 80240204 0220202D */ daddu $a0, $s1, $zero -/* B80208 80240208 8E050000 */ lw $a1, ($s0) -/* B8020C 8024020C 0C0B1EAF */ jal get_variable -/* B80210 80240210 0040802D */ daddu $s0, $v0, $zero -/* B80214 80240214 0040182D */ daddu $v1, $v0, $zero -/* B80218 80240218 24020002 */ addiu $v0, $zero, 2 -/* B8021C 8024021C 12620012 */ beq $s3, $v0, .L80240268 -/* B80220 80240220 2A620003 */ slti $v0, $s3, 3 -/* B80224 80240224 10400005 */ beqz $v0, .L8024023C -/* B80228 80240228 24020001 */ addiu $v0, $zero, 1 -/* B8022C 8024022C 12620008 */ beq $s3, $v0, .L80240250 -/* B80230 80240230 32C400FF */ andi $a0, $s6, 0xff -/* B80234 80240234 080900B1 */ j .L802402C4 -/* B80238 80240238 00000000 */ nop -.L8024023C: -/* B8023C 8024023C 24020003 */ addiu $v0, $zero, 3 -/* B80240 80240240 12620018 */ beq $s3, $v0, .L802402A4 -/* B80244 80240244 32C400FF */ andi $a0, $s6, 0xff -/* B80248 80240248 080900B1 */ j .L802402C4 -/* B8024C 8024024C 00000000 */ nop -.L80240250: -/* B80250 80240250 32A500FF */ andi $a1, $s5, 0xff -/* B80254 80240254 328600FF */ andi $a2, $s4, 0xff -/* B80258 80240258 0C046F97 */ jal set_background_color_blend -/* B8025C 8024025C 324700FF */ andi $a3, $s2, 0xff -/* B80260 80240260 080900B1 */ j .L802402C4 -/* B80264 80240264 00000000 */ nop -.L80240268: -/* B80268 80240268 32C400FF */ andi $a0, $s6, 0xff -/* B8026C 8024026C 32A500FF */ andi $a1, $s5, 0xff -/* B80270 80240270 328600FF */ andi $a2, $s4, 0xff -/* B80274 80240274 324700FF */ andi $a3, $s2, 0xff -/* B80278 80240278 93A2002B */ lbu $v0, 0x2b($sp) -/* B8027C 8024027C AFB0001C */ sw $s0, 0x1c($sp) -/* B80280 80240280 AFA30020 */ sw $v1, 0x20($sp) -/* B80284 80240284 AFA20010 */ sw $v0, 0x10($sp) -/* B80288 80240288 33C200FF */ andi $v0, $fp, 0xff -/* B8028C 8024028C AFA20014 */ sw $v0, 0x14($sp) -/* B80290 80240290 32E200FF */ andi $v0, $s7, 0xff -/* B80294 80240294 0C046FAD */ jal func_8011BEB4 -/* B80298 80240298 AFA20018 */ sw $v0, 0x18($sp) -/* B8029C 8024029C 080900B1 */ j .L802402C4 -/* B802A0 802402A0 00000000 */ nop -.L802402A4: -/* B802A4 802402A4 32A500FF */ andi $a1, $s5, 0xff -/* B802A8 802402A8 328600FF */ andi $a2, $s4, 0xff -/* B802AC 802402AC 324700FF */ andi $a3, $s2, 0xff -/* B802B0 802402B0 93A2002B */ lbu $v0, 0x2b($sp) -/* B802B4 802402B4 AFA20010 */ sw $v0, 0x10($sp) -/* B802B8 802402B8 33C200FF */ andi $v0, $fp, 0xff -/* B802BC 802402BC 0C046FE6 */ jal func_8011BF98 -/* B802C0 802402C0 AFA20014 */ sw $v0, 0x14($sp) -.L802402C4: -/* B802C4 802402C4 8FBF0054 */ lw $ra, 0x54($sp) -/* B802C8 802402C8 8FBE0050 */ lw $fp, 0x50($sp) -/* B802CC 802402CC 8FB7004C */ lw $s7, 0x4c($sp) -/* B802D0 802402D0 8FB60048 */ lw $s6, 0x48($sp) -/* B802D4 802402D4 8FB50044 */ lw $s5, 0x44($sp) -/* B802D8 802402D8 8FB40040 */ lw $s4, 0x40($sp) -/* B802DC 802402DC 8FB3003C */ lw $s3, 0x3c($sp) -/* B802E0 802402E0 8FB20038 */ lw $s2, 0x38($sp) -/* B802E4 802402E4 8FB10034 */ lw $s1, 0x34($sp) -/* B802E8 802402E8 8FB00030 */ lw $s0, 0x30($sp) -/* B802EC 802402EC 24020002 */ addiu $v0, $zero, 2 -/* B802F0 802402F0 03E00008 */ jr $ra -/* B802F4 802402F4 27BD0058 */ addiu $sp, $sp, 0x58 -/* B802F8 802402F8 00000000 */ nop -/* B802FC 802402FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_16/func_80240300_B80000.s b/asm/nonmatchings/world/area_jan/jan_16/func_80240300_B80000.s deleted file mode 100644 index 533725d758..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_16/func_80240300_B80000.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240300_B80300 -/* B80300 80240300 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B80304 80240304 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B80308 80240308 4485A000 */ mtc1 $a1, $f20 -/* B8030C 8024030C F7B60020 */ sdc1 $f22, 0x20($sp) -/* B80310 80240310 4486B000 */ mtc1 $a2, $f22 -/* B80314 80240314 AFB00010 */ sw $s0, 0x10($sp) -/* B80318 80240318 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B8031C 8024031C 4487C000 */ mtc1 $a3, $f24 -/* B80320 80240320 AFBF0014 */ sw $ra, 0x14($sp) -/* B80324 80240324 0C019D28 */ jal guMtxIdentF -/* B80328 80240328 0080802D */ daddu $s0, $a0, $zero -/* B8032C 8024032C 4616A582 */ mul.s $f22, $f20, $f22 -/* B80330 80240330 00000000 */ nop -/* B80334 80240334 4618A502 */ mul.s $f20, $f20, $f24 -/* B80338 80240338 00000000 */ nop -/* B8033C 8024033C 3C013F80 */ lui $at, 0x3f80 -/* B80340 80240340 44810000 */ mtc1 $at, $f0 -/* B80344 80240344 00000000 */ nop -/* B80348 80240348 E6000014 */ swc1 $f0, 0x14($s0) -/* B8034C 8024034C E6160010 */ swc1 $f22, 0x10($s0) -/* B80350 80240350 E6140018 */ swc1 $f20, 0x18($s0) -/* B80354 80240354 8FBF0014 */ lw $ra, 0x14($sp) -/* B80358 80240358 8FB00010 */ lw $s0, 0x10($sp) -/* B8035C 8024035C D7B80028 */ ldc1 $f24, 0x28($sp) -/* B80360 80240360 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B80364 80240364 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B80368 80240368 03E00008 */ jr $ra -/* B8036C 8024036C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_16/func_80240370_B80000.s b/asm/nonmatchings/world/area_jan/jan_16/func_80240370_B80000.s deleted file mode 100644 index 4bd1684c52..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_16/func_80240370_B80000.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240370_B80370 -/* B80370 80240370 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B80374 80240374 AFB10054 */ sw $s1, 0x54($sp) -/* B80378 80240378 0080882D */ daddu $s1, $a0, $zero -/* B8037C 8024037C AFBF005C */ sw $ra, 0x5c($sp) -/* B80380 80240380 AFB20058 */ sw $s2, 0x58($sp) -/* B80384 80240384 AFB00050 */ sw $s0, 0x50($sp) -/* B80388 80240388 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B8038C 8024038C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B80390 80240390 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B80394 80240394 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B80398 80240398 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B8039C 8024039C 8E30000C */ lw $s0, 0xc($s1) -/* B803A0 802403A0 8E050000 */ lw $a1, ($s0) -/* B803A4 802403A4 0C0B1EAF */ jal get_variable -/* B803A8 802403A8 26100004 */ addiu $s0, $s0, 4 -/* B803AC 802403AC 0C046C04 */ jal get_model_list_index_from_tree_index -/* B803B0 802403B0 0040202D */ daddu $a0, $v0, $zero -/* B803B4 802403B4 8E050000 */ lw $a1, ($s0) -/* B803B8 802403B8 26100004 */ addiu $s0, $s0, 4 -/* B803BC 802403BC 0220202D */ daddu $a0, $s1, $zero -/* B803C0 802403C0 0C0B210B */ jal get_float_variable -/* B803C4 802403C4 0040902D */ daddu $s2, $v0, $zero -/* B803C8 802403C8 8E050000 */ lw $a1, ($s0) -/* B803CC 802403CC 26100004 */ addiu $s0, $s0, 4 -/* B803D0 802403D0 0220202D */ daddu $a0, $s1, $zero -/* B803D4 802403D4 0C0B210B */ jal get_float_variable -/* B803D8 802403D8 46000706 */ mov.s $f28, $f0 -/* B803DC 802403DC 8E050000 */ lw $a1, ($s0) -/* B803E0 802403E0 26100004 */ addiu $s0, $s0, 4 -/* B803E4 802403E4 0220202D */ daddu $a0, $s1, $zero -/* B803E8 802403E8 0C0B210B */ jal get_float_variable -/* B803EC 802403EC 46000686 */ mov.s $f26, $f0 -/* B803F0 802403F0 0220202D */ daddu $a0, $s1, $zero -/* B803F4 802403F4 8E050000 */ lw $a1, ($s0) -/* B803F8 802403F8 0C0B210B */ jal get_float_variable -/* B803FC 802403FC 46000586 */ mov.s $f22, $f0 -/* B80400 80240400 0240202D */ daddu $a0, $s2, $zero -/* B80404 80240404 0C046B4C */ jal get_model_from_list_index -/* B80408 80240408 46000606 */ mov.s $f24, $f0 -/* B8040C 8024040C 0040882D */ daddu $s1, $v0, $zero -/* B80410 80240410 96220000 */ lhu $v0, ($s1) -/* B80414 80240414 30420400 */ andi $v0, $v0, 0x400 -/* B80418 80240418 1440001E */ bnez $v0, .L80240494 -/* B8041C 8024041C 26300058 */ addiu $s0, $s1, 0x58 -/* B80420 80240420 4480A000 */ mtc1 $zero, $f20 -/* B80424 80240424 4406B000 */ mfc1 $a2, $f22 -/* B80428 80240428 4405A000 */ mfc1 $a1, $f20 -/* B8042C 8024042C 4407A000 */ mfc1 $a3, $f20 -/* B80430 80240430 0C019E40 */ jal guTranslateF -/* B80434 80240434 0200202D */ daddu $a0, $s0, $zero -/* B80438 80240438 4405E000 */ mfc1 $a1, $f28 -/* B8043C 8024043C 4406D000 */ mfc1 $a2, $f26 -/* B80440 80240440 4407C000 */ mfc1 $a3, $f24 -/* B80444 80240444 0C0900C0 */ jal func_80240300 -/* B80448 80240448 27A40010 */ addiu $a0, $sp, 0x10 -/* B8044C 8024044C 27A40010 */ addiu $a0, $sp, 0x10 -/* B80450 80240450 0200282D */ daddu $a1, $s0, $zero -/* B80454 80240454 0C019D80 */ jal guMtxCatF -/* B80458 80240458 0200302D */ daddu $a2, $s0, $zero -/* B8045C 8024045C 27A40010 */ addiu $a0, $sp, 0x10 -/* B80460 80240460 4600B587 */ neg.s $f22, $f22 -/* B80464 80240464 4405A000 */ mfc1 $a1, $f20 -/* B80468 80240468 4406B000 */ mfc1 $a2, $f22 -/* B8046C 8024046C 0C019E40 */ jal guTranslateF -/* B80470 80240470 00A0382D */ daddu $a3, $a1, $zero -/* B80474 80240474 27A40010 */ addiu $a0, $sp, 0x10 -/* B80478 80240478 0200282D */ daddu $a1, $s0, $zero -/* B8047C 8024047C 0C019D80 */ jal guMtxCatF -/* B80480 80240480 00A0302D */ daddu $a2, $a1, $zero -/* B80484 80240484 96220000 */ lhu $v0, ($s1) -/* B80488 80240488 34421400 */ ori $v0, $v0, 0x1400 -/* B8048C 8024048C 08090143 */ j .L8024050C -/* B80490 80240490 A6220000 */ sh $v0, ($s1) -.L80240494: -/* B80494 80240494 4480A000 */ mtc1 $zero, $f20 -/* B80498 80240498 4406B000 */ mfc1 $a2, $f22 -/* B8049C 8024049C 4405A000 */ mfc1 $a1, $f20 -/* B804A0 802404A0 4407A000 */ mfc1 $a3, $f20 -/* B804A4 802404A4 0C019E40 */ jal guTranslateF -/* B804A8 802404A8 27A40010 */ addiu $a0, $sp, 0x10 -/* B804AC 802404AC 27A40010 */ addiu $a0, $sp, 0x10 -/* B804B0 802404B0 26300058 */ addiu $s0, $s1, 0x58 -/* B804B4 802404B4 0200282D */ daddu $a1, $s0, $zero -/* B804B8 802404B8 0C019D80 */ jal guMtxCatF -/* B804BC 802404BC 0200302D */ daddu $a2, $s0, $zero -/* B804C0 802404C0 4405E000 */ mfc1 $a1, $f28 -/* B804C4 802404C4 4406D000 */ mfc1 $a2, $f26 -/* B804C8 802404C8 4407C000 */ mfc1 $a3, $f24 -/* B804CC 802404CC 0C0900C0 */ jal func_80240300 -/* B804D0 802404D0 27A40010 */ addiu $a0, $sp, 0x10 -/* B804D4 802404D4 27A40010 */ addiu $a0, $sp, 0x10 -/* B804D8 802404D8 0200282D */ daddu $a1, $s0, $zero -/* B804DC 802404DC 0C019D80 */ jal guMtxCatF -/* B804E0 802404E0 0200302D */ daddu $a2, $s0, $zero -/* B804E4 802404E4 27A40010 */ addiu $a0, $sp, 0x10 -/* B804E8 802404E8 4600B587 */ neg.s $f22, $f22 -/* B804EC 802404EC 4405A000 */ mfc1 $a1, $f20 -/* B804F0 802404F0 4406B000 */ mfc1 $a2, $f22 -/* B804F4 802404F4 0C019E40 */ jal guTranslateF -/* B804F8 802404F8 00A0382D */ daddu $a3, $a1, $zero -/* B804FC 802404FC 27A40010 */ addiu $a0, $sp, 0x10 -/* B80500 80240500 0200282D */ daddu $a1, $s0, $zero -/* B80504 80240504 0C019D80 */ jal guMtxCatF -/* B80508 80240508 00A0302D */ daddu $a2, $a1, $zero -.L8024050C: -/* B8050C 8024050C 8FBF005C */ lw $ra, 0x5c($sp) -/* B80510 80240510 8FB20058 */ lw $s2, 0x58($sp) -/* B80514 80240514 8FB10054 */ lw $s1, 0x54($sp) -/* B80518 80240518 8FB00050 */ lw $s0, 0x50($sp) -/* B8051C 8024051C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B80520 80240520 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B80524 80240524 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B80528 80240528 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B8052C 8024052C D7B40060 */ ldc1 $f20, 0x60($sp) -/* B80530 80240530 24020002 */ addiu $v0, $zero, 2 -/* B80534 80240534 03E00008 */ jr $ra -/* B80538 80240538 27BD0088 */ addiu $sp, $sp, 0x88 -/* B8053C 8024053C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_80240158_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_80240158_B84180.s deleted file mode 100644 index 252427b68c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_80240158_B84180.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_B842D8 -/* B842D8 80240158 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B842DC 8024015C AFB20038 */ sw $s2, 0x38($sp) -/* B842E0 80240160 0080902D */ daddu $s2, $a0, $zero -/* B842E4 80240164 AFBF0044 */ sw $ra, 0x44($sp) -/* B842E8 80240168 AFB40040 */ sw $s4, 0x40($sp) -/* B842EC 8024016C AFB3003C */ sw $s3, 0x3c($sp) -/* B842F0 80240170 AFB10034 */ sw $s1, 0x34($sp) -/* B842F4 80240174 AFB00030 */ sw $s0, 0x30($sp) -/* B842F8 80240178 F7B60050 */ sdc1 $f22, 0x50($sp) -/* B842FC 8024017C F7B40048 */ sdc1 $f20, 0x48($sp) -/* B84300 80240180 8E510148 */ lw $s1, 0x148($s2) -/* B84304 80240184 00A0982D */ daddu $s3, $a1, $zero -/* B84308 80240188 86240008 */ lh $a0, 8($s1) -/* B8430C 8024018C 0C00EABB */ jal get_npc_unsafe -/* B84310 80240190 00C0A02D */ daddu $s4, $a2, $zero -/* B84314 80240194 8E630014 */ lw $v1, 0x14($s3) -/* B84318 80240198 04600030 */ bltz $v1, .L8024025C -/* B8431C 8024019C 0040802D */ daddu $s0, $v0, $zero -/* B84320 802401A0 8E420074 */ lw $v0, 0x74($s2) -/* B84324 802401A4 1C40002C */ bgtz $v0, .L80240258 -/* B84328 802401A8 2442FFFF */ addiu $v0, $v0, -1 -/* B8432C 802401AC 0280202D */ daddu $a0, $s4, $zero -/* B84330 802401B0 AE430074 */ sw $v1, 0x74($s2) -/* B84334 802401B4 AFA00010 */ sw $zero, 0x10($sp) -/* B84338 802401B8 8E66000C */ lw $a2, 0xc($s3) -/* B8433C 802401BC 8E670010 */ lw $a3, 0x10($s3) -/* B84340 802401C0 0C01242D */ jal func_800490B4 -/* B84344 802401C4 0220282D */ daddu $a1, $s1, $zero -/* B84348 802401C8 10400021 */ beqz $v0, .L80240250 -/* B8434C 802401CC 0000202D */ daddu $a0, $zero, $zero -/* B84350 802401D0 0200282D */ daddu $a1, $s0, $zero -/* B84354 802401D4 0000302D */ daddu $a2, $zero, $zero -/* B84358 802401D8 860300A8 */ lh $v1, 0xa8($s0) -/* B8435C 802401DC 3C013F80 */ lui $at, 0x3f80 -/* B84360 802401E0 44810000 */ mtc1 $at, $f0 -/* B84364 802401E4 3C014000 */ lui $at, 0x4000 -/* B84368 802401E8 44811000 */ mtc1 $at, $f2 -/* B8436C 802401EC 3C01C1A0 */ lui $at, 0xc1a0 -/* B84370 802401F0 44812000 */ mtc1 $at, $f4 -/* B84374 802401F4 2402000F */ addiu $v0, $zero, 0xf -/* B84378 802401F8 AFA2001C */ sw $v0, 0x1c($sp) -/* B8437C 802401FC 44833000 */ mtc1 $v1, $f6 -/* B84380 80240200 00000000 */ nop -/* B84384 80240204 468031A0 */ cvt.s.w $f6, $f6 -/* B84388 80240208 44073000 */ mfc1 $a3, $f6 -/* B8438C 8024020C 27A20028 */ addiu $v0, $sp, 0x28 -/* B84390 80240210 AFA20020 */ sw $v0, 0x20($sp) -/* B84394 80240214 E7A00010 */ swc1 $f0, 0x10($sp) -/* B84398 80240218 E7A20014 */ swc1 $f2, 0x14($sp) -/* B8439C 8024021C 0C01BFA4 */ jal fx_emote -/* B843A0 80240220 E7A40018 */ swc1 $f4, 0x18($sp) -/* B843A4 80240224 0200202D */ daddu $a0, $s0, $zero -/* B843A8 80240228 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B843AC 8024022C 0C012530 */ jal func_800494C0 -/* B843B0 80240230 3C060020 */ lui $a2, 0x20 -/* B843B4 80240234 8E220018 */ lw $v0, 0x18($s1) -/* B843B8 80240238 9442002A */ lhu $v0, 0x2a($v0) -/* B843BC 8024023C 30420001 */ andi $v0, $v0, 1 -/* B843C0 80240240 14400064 */ bnez $v0, .L802403D4 -/* B843C4 80240244 2402000A */ addiu $v0, $zero, 0xa -/* B843C8 80240248 080900F5 */ j .L802403D4 -/* B843CC 8024024C 2402000C */ addiu $v0, $zero, 0xc -.L80240250: -/* B843D0 80240250 8E420074 */ lw $v0, 0x74($s2) -/* B843D4 80240254 2442FFFF */ addiu $v0, $v0, -1 -.L80240258: -/* B843D8 80240258 AE420074 */ sw $v0, 0x74($s2) -.L8024025C: -/* B843DC 8024025C 8602008C */ lh $v0, 0x8c($s0) -/* B843E0 80240260 1440005D */ bnez $v0, .L802403D8 -/* B843E4 80240264 00000000 */ nop -/* B843E8 80240268 C6000018 */ lwc1 $f0, 0x18($s0) -/* B843EC 8024026C 3C014010 */ lui $at, 0x4010 -/* B843F0 80240270 44811800 */ mtc1 $at, $f3 -/* B843F4 80240274 44801000 */ mtc1 $zero, $f2 -/* B843F8 80240278 46000021 */ cvt.d.s $f0, $f0 -/* B843FC 8024027C 4622003C */ c.lt.d $f0, $f2 -/* B84400 80240280 00000000 */ nop -/* B84404 80240284 45000003 */ bc1f .L80240294 -/* B84408 80240288 0200202D */ daddu $a0, $s0, $zero -/* B8440C 8024028C 080900A6 */ j .L80240298 -/* B84410 80240290 0000282D */ daddu $a1, $zero, $zero -.L80240294: -/* B84414 80240294 24050001 */ addiu $a1, $zero, 1 -.L80240298: -/* B84418 80240298 0C00F598 */ jal func_8003D660 -/* B8441C 8024029C 00000000 */ nop -/* B84420 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B84424 802402A4 8E430078 */ lw $v1, 0x78($s2) -/* B84428 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B8442C 802402AC 00031040 */ sll $v0, $v1, 1 -/* B84430 802402B0 00431021 */ addu $v0, $v0, $v1 -/* B84434 802402B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* B84438 802402B8 00021080 */ sll $v0, $v0, 2 -/* B8443C 802402BC 00431021 */ addu $v0, $v0, $v1 -/* B84440 802402C0 C4560004 */ lwc1 $f22, 4($v0) -/* B84444 802402C4 4680B5A0 */ cvt.s.w $f22, $f22 -/* B84448 802402C8 C454000C */ lwc1 $f20, 0xc($v0) -/* B8444C 802402CC 4680A520 */ cvt.s.w $f20, $f20 -/* B84450 802402D0 4406B000 */ mfc1 $a2, $f22 -/* B84454 802402D4 4407A000 */ mfc1 $a3, $f20 -/* B84458 802402D8 0C00A720 */ jal atan2 -/* B8445C 802402DC 00000000 */ nop -/* B84460 802402E0 8E050018 */ lw $a1, 0x18($s0) -/* B84464 802402E4 44060000 */ mfc1 $a2, $f0 -/* B84468 802402E8 0200202D */ daddu $a0, $s0, $zero -/* B8446C 802402EC 0C00EA95 */ jal npc_move_heading -/* B84470 802402F0 AE06000C */ sw $a2, 0xc($s0) -/* B84474 802402F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B84478 802402F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B8447C 802402FC 4406B000 */ mfc1 $a2, $f22 -/* B84480 80240300 4407A000 */ mfc1 $a3, $f20 -/* B84484 80240304 0C00A7B5 */ jal dist2D -/* B84488 80240308 00000000 */ nop -/* B8448C 8024030C C6020018 */ lwc1 $f2, 0x18($s0) -/* B84490 80240310 4602003E */ c.le.s $f0, $f2 -/* B84494 80240314 00000000 */ nop -/* B84498 80240318 4500002F */ bc1f .L802403D8 -/* B8449C 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B844A0 80240320 24020002 */ addiu $v0, $zero, 2 -/* B844A4 80240324 0C00A67F */ jal rand_int -/* B844A8 80240328 AE420070 */ sw $v0, 0x70($s2) -/* B844AC 8024032C 3C035555 */ lui $v1, 0x5555 -/* B844B0 80240330 34635556 */ ori $v1, $v1, 0x5556 -/* B844B4 80240334 00430018 */ mult $v0, $v1 -/* B844B8 80240338 000227C3 */ sra $a0, $v0, 0x1f -/* B844BC 8024033C 00004010 */ mfhi $t0 -/* B844C0 80240340 01042023 */ subu $a0, $t0, $a0 -/* B844C4 80240344 00041840 */ sll $v1, $a0, 1 -/* B844C8 80240348 00641821 */ addu $v1, $v1, $a0 -/* B844CC 8024034C 00431023 */ subu $v0, $v0, $v1 -/* B844D0 80240350 24430002 */ addiu $v1, $v0, 2 -/* B844D4 80240354 AE430074 */ sw $v1, 0x74($s2) -/* B844D8 80240358 8E62002C */ lw $v0, 0x2c($s3) -/* B844DC 8024035C 18400009 */ blez $v0, .L80240384 -/* B844E0 80240360 24020004 */ addiu $v0, $zero, 4 -/* B844E4 80240364 8E620004 */ lw $v0, 4($s3) -/* B844E8 80240368 18400006 */ blez $v0, .L80240384 -/* B844EC 8024036C 24020004 */ addiu $v0, $zero, 4 -/* B844F0 80240370 8E620008 */ lw $v0, 8($s3) -/* B844F4 80240374 18400003 */ blez $v0, .L80240384 -/* B844F8 80240378 24020004 */ addiu $v0, $zero, 4 -/* B844FC 8024037C 14600002 */ bnez $v1, .L80240388 -/* B84500 80240380 00000000 */ nop -.L80240384: -/* B84504 80240384 AE420070 */ sw $v0, 0x70($s2) -.L80240388: -/* B84508 80240388 0C00A67F */ jal rand_int -/* B8450C 8024038C 24042710 */ addiu $a0, $zero, 0x2710 -/* B84510 80240390 3C0351EB */ lui $v1, 0x51eb -/* B84514 80240394 3463851F */ ori $v1, $v1, 0x851f -/* B84518 80240398 00430018 */ mult $v0, $v1 -/* B8451C 8024039C 00021FC3 */ sra $v1, $v0, 0x1f -/* B84520 802403A0 00004010 */ mfhi $t0 -/* B84524 802403A4 00082143 */ sra $a0, $t0, 5 -/* B84528 802403A8 00832023 */ subu $a0, $a0, $v1 -/* B8452C 802403AC 00041840 */ sll $v1, $a0, 1 -/* B84530 802403B0 00641821 */ addu $v1, $v1, $a0 -/* B84534 802403B4 000318C0 */ sll $v1, $v1, 3 -/* B84538 802403B8 00641821 */ addu $v1, $v1, $a0 -/* B8453C 802403BC 00031880 */ sll $v1, $v1, 2 -/* B84540 802403C0 8E640004 */ lw $a0, 4($s3) -/* B84544 802403C4 00431023 */ subu $v0, $v0, $v1 -/* B84548 802403C8 0044102A */ slt $v0, $v0, $a0 -/* B8454C 802403CC 10400002 */ beqz $v0, .L802403D8 -/* B84550 802403D0 24020004 */ addiu $v0, $zero, 4 -.L802403D4: -/* B84554 802403D4 AE420070 */ sw $v0, 0x70($s2) -.L802403D8: -/* B84558 802403D8 8FBF0044 */ lw $ra, 0x44($sp) -/* B8455C 802403DC 8FB40040 */ lw $s4, 0x40($sp) -/* B84560 802403E0 8FB3003C */ lw $s3, 0x3c($sp) -/* B84564 802403E4 8FB20038 */ lw $s2, 0x38($sp) -/* B84568 802403E8 8FB10034 */ lw $s1, 0x34($sp) -/* B8456C 802403EC 8FB00030 */ lw $s0, 0x30($sp) -/* B84570 802403F0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B84574 802403F4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B84578 802403F8 03E00008 */ jr $ra -/* B8457C 802403FC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_80240400_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_80240400_B84180.s deleted file mode 100644 index bf199fac51..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_80240400_B84180.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_B84580 -/* B84580 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B84584 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* B84588 80240408 0080982D */ daddu $s3, $a0, $zero -/* B8458C 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* B84590 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* B84594 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* B84598 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* B8459C 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* B845A0 80240420 86440008 */ lh $a0, 8($s2) -/* B845A4 80240424 0C00EABB */ jal get_npc_unsafe -/* B845A8 80240428 00A0882D */ daddu $s1, $a1, $zero -/* B845AC 8024042C 8E240008 */ lw $a0, 8($s1) -/* B845B0 80240430 0040802D */ daddu $s0, $v0, $zero -/* B845B4 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* B845B8 80240438 00832021 */ addu $a0, $a0, $v1 -/* B845BC 8024043C 00042043 */ sra $a0, $a0, 1 -/* B845C0 80240440 0C00A67F */ jal rand_int -/* B845C4 80240444 24840001 */ addiu $a0, $a0, 1 -/* B845C8 80240448 8E230008 */ lw $v1, 8($s1) -/* B845CC 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* B845D0 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* B845D4 80240454 00651821 */ addu $v1, $v1, $a1 -/* B845D8 80240458 00031843 */ sra $v1, $v1, 1 -/* B845DC 8024045C 00621821 */ addu $v1, $v1, $v0 -/* B845E0 80240460 0C00A67F */ jal rand_int -/* B845E4 80240464 A603008E */ sh $v1, 0x8e($s0) -/* B845E8 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* B845EC 8024046C 44820000 */ mtc1 $v0, $f0 -/* B845F0 80240470 00000000 */ nop -/* B845F4 80240474 46800020 */ cvt.s.w $f0, $f0 -/* B845F8 80240478 46006300 */ add.s $f12, $f12, $f0 -/* B845FC 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* B84600 80240480 44810000 */ mtc1 $at, $f0 -/* B84604 80240484 0C00A6C9 */ jal clamp_angle -/* B84608 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* B8460C 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* B84610 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* B84614 80240494 8C420000 */ lw $v0, ($v0) -/* B84618 80240498 AE020028 */ sw $v0, 0x28($s0) -/* B8461C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* B84620 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* B84624 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* B84628 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* B8462C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* B84630 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* B84634 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* B84638 802404B8 03E00008 */ jr $ra -/* B8463C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_802404C0_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_802404C0_B84180.s deleted file mode 100644 index 6b74eff290..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_802404C0_B84180.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_B84640 -/* B84640 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B84644 802404C4 AFB40040 */ sw $s4, 0x40($sp) -/* B84648 802404C8 0080A02D */ daddu $s4, $a0, $zero -/* B8464C 802404CC AFBF0044 */ sw $ra, 0x44($sp) -/* B84650 802404D0 AFB3003C */ sw $s3, 0x3c($sp) -/* B84654 802404D4 AFB20038 */ sw $s2, 0x38($sp) -/* B84658 802404D8 AFB10034 */ sw $s1, 0x34($sp) -/* B8465C 802404DC AFB00030 */ sw $s0, 0x30($sp) -/* B84660 802404E0 8E910148 */ lw $s1, 0x148($s4) -/* B84664 802404E4 00A0902D */ daddu $s2, $a1, $zero -/* B84668 802404E8 86240008 */ lh $a0, 8($s1) -/* B8466C 802404EC 0C00EABB */ jal get_npc_unsafe -/* B84670 802404F0 00C0982D */ daddu $s3, $a2, $zero -/* B84674 802404F4 8E430014 */ lw $v1, 0x14($s2) -/* B84678 802404F8 04600031 */ bltz $v1, .L802405C0 -/* B8467C 802404FC 0040802D */ daddu $s0, $v0, $zero -/* B84680 80240500 0260202D */ daddu $a0, $s3, $zero -/* B84684 80240504 AFA00010 */ sw $zero, 0x10($sp) -/* B84688 80240508 8E460024 */ lw $a2, 0x24($s2) -/* B8468C 8024050C 8E470028 */ lw $a3, 0x28($s2) -/* B84690 80240510 0C01242D */ jal func_800490B4 -/* B84694 80240514 0220282D */ daddu $a1, $s1, $zero -/* B84698 80240518 10400029 */ beqz $v0, .L802405C0 -/* B8469C 8024051C 0000202D */ daddu $a0, $zero, $zero -/* B846A0 80240520 0200282D */ daddu $a1, $s0, $zero -/* B846A4 80240524 0000302D */ daddu $a2, $zero, $zero -/* B846A8 80240528 860300A8 */ lh $v1, 0xa8($s0) -/* B846AC 8024052C 3C013F80 */ lui $at, 0x3f80 -/* B846B0 80240530 44810000 */ mtc1 $at, $f0 -/* B846B4 80240534 3C014000 */ lui $at, 0x4000 -/* B846B8 80240538 44811000 */ mtc1 $at, $f2 -/* B846BC 8024053C 3C01C1A0 */ lui $at, 0xc1a0 -/* B846C0 80240540 44812000 */ mtc1 $at, $f4 -/* B846C4 80240544 2402000F */ addiu $v0, $zero, 0xf -/* B846C8 80240548 AFA2001C */ sw $v0, 0x1c($sp) -/* B846CC 8024054C 44833000 */ mtc1 $v1, $f6 -/* B846D0 80240550 00000000 */ nop -/* B846D4 80240554 468031A0 */ cvt.s.w $f6, $f6 -/* B846D8 80240558 44073000 */ mfc1 $a3, $f6 -/* B846DC 8024055C 27A20028 */ addiu $v0, $sp, 0x28 -/* B846E0 80240560 AFA20020 */ sw $v0, 0x20($sp) -/* B846E4 80240564 E7A00010 */ swc1 $f0, 0x10($sp) -/* B846E8 80240568 E7A20014 */ swc1 $f2, 0x14($sp) -/* B846EC 8024056C 0C01BFA4 */ jal fx_emote -/* B846F0 80240570 E7A40018 */ swc1 $f4, 0x18($sp) -/* B846F4 80240574 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B846F8 80240578 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B846FC 8024057C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B84700 80240580 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B84704 80240584 8C460028 */ lw $a2, 0x28($v0) -/* B84708 80240588 0C00A720 */ jal atan2 -/* B8470C 8024058C 8C470030 */ lw $a3, 0x30($v0) -/* B84710 80240590 0200202D */ daddu $a0, $s0, $zero -/* B84714 80240594 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B84718 80240598 3C060020 */ lui $a2, 0x20 -/* B8471C 8024059C 0C012530 */ jal func_800494C0 -/* B84720 802405A0 E480000C */ swc1 $f0, 0xc($a0) -/* B84724 802405A4 8E220018 */ lw $v0, 0x18($s1) -/* B84728 802405A8 9442002A */ lhu $v0, 0x2a($v0) -/* B8472C 802405AC 30420001 */ andi $v0, $v0, 1 -/* B84730 802405B0 14400029 */ bnez $v0, .L80240658 -/* B84734 802405B4 2402000A */ addiu $v0, $zero, 0xa -/* B84738 802405B8 08090196 */ j .L80240658 -/* B8473C 802405BC 2402000C */ addiu $v0, $zero, 0xc -.L802405C0: -/* B84740 802405C0 8602008C */ lh $v0, 0x8c($s0) -/* B84744 802405C4 14400025 */ bnez $v0, .L8024065C -/* B84748 802405C8 00000000 */ nop -/* B8474C 802405CC 9602008E */ lhu $v0, 0x8e($s0) -/* B84750 802405D0 2442FFFF */ addiu $v0, $v0, -1 -/* B84754 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* B84758 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* B8475C 802405DC 1440001F */ bnez $v0, .L8024065C -/* B84760 802405E0 00000000 */ nop -/* B84764 802405E4 8E820074 */ lw $v0, 0x74($s4) -/* B84768 802405E8 2442FFFF */ addiu $v0, $v0, -1 -/* B8476C 802405EC 10400019 */ beqz $v0, .L80240654 -/* B84770 802405F0 AE820074 */ sw $v0, 0x74($s4) -/* B84774 802405F4 8E220018 */ lw $v0, 0x18($s1) -/* B84778 802405F8 9442002A */ lhu $v0, 0x2a($v0) -/* B8477C 802405FC 30420010 */ andi $v0, $v0, 0x10 -/* B84780 80240600 14400007 */ bnez $v0, .L80240620 -/* B84784 80240604 00000000 */ nop -/* B84788 80240608 C600000C */ lwc1 $f0, 0xc($s0) -/* B8478C 8024060C 3C014334 */ lui $at, 0x4334 -/* B84790 80240610 44816000 */ mtc1 $at, $f12 -/* B84794 80240614 0C00A6C9 */ jal clamp_angle -/* B84798 80240618 460C0300 */ add.s $f12, $f0, $f12 -/* B8479C 8024061C E600000C */ swc1 $f0, 0xc($s0) -.L80240620: -/* B847A0 80240620 8E440008 */ lw $a0, 8($s2) -/* B847A4 80240624 000417C2 */ srl $v0, $a0, 0x1f -/* B847A8 80240628 00822021 */ addu $a0, $a0, $v0 -/* B847AC 8024062C 00042043 */ sra $a0, $a0, 1 -/* B847B0 80240630 0C00A67F */ jal rand_int -/* B847B4 80240634 24840001 */ addiu $a0, $a0, 1 -/* B847B8 80240638 8E430008 */ lw $v1, 8($s2) -/* B847BC 8024063C 000327C2 */ srl $a0, $v1, 0x1f -/* B847C0 80240640 00641821 */ addu $v1, $v1, $a0 -/* B847C4 80240644 00031843 */ sra $v1, $v1, 1 -/* B847C8 80240648 00621821 */ addu $v1, $v1, $v0 -/* B847CC 8024064C 08090197 */ j .L8024065C -/* B847D0 80240650 A603008E */ sh $v1, 0x8e($s0) -.L80240654: -/* B847D4 80240654 24020004 */ addiu $v0, $zero, 4 -.L80240658: -/* B847D8 80240658 AE820070 */ sw $v0, 0x70($s4) -.L8024065C: -/* B847DC 8024065C 8FBF0044 */ lw $ra, 0x44($sp) -/* B847E0 80240660 8FB40040 */ lw $s4, 0x40($sp) -/* B847E4 80240664 8FB3003C */ lw $s3, 0x3c($sp) -/* B847E8 80240668 8FB20038 */ lw $s2, 0x38($sp) -/* B847EC 8024066C 8FB10034 */ lw $s1, 0x34($sp) -/* B847F0 80240670 8FB00030 */ lw $s0, 0x30($sp) -/* B847F4 80240674 03E00008 */ jr $ra -/* B847F8 80240678 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_8024067C_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_8024067C_B84180.s deleted file mode 100644 index 26df9cf9e3..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_8024067C_B84180.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024067C_B847FC -/* B847FC 8024067C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B84800 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* B84804 80240684 0080882D */ daddu $s1, $a0, $zero -/* B84808 80240688 AFBF001C */ sw $ra, 0x1c($sp) -/* B8480C 8024068C AFB20018 */ sw $s2, 0x18($sp) -/* B84810 80240690 AFB00010 */ sw $s0, 0x10($sp) -/* B84814 80240694 8E300148 */ lw $s0, 0x148($s1) -/* B84818 80240698 86040008 */ lh $a0, 8($s0) -/* B8481C 8024069C 0C00EABB */ jal get_npc_unsafe -/* B84820 802406A0 00A0902D */ daddu $s2, $a1, $zero -/* B84824 802406A4 8E230078 */ lw $v1, 0x78($s1) -/* B84828 802406A8 24630001 */ addiu $v1, $v1, 1 -/* B8482C 802406AC AE230078 */ sw $v1, 0x78($s1) -/* B84830 802406B0 8E0400D0 */ lw $a0, 0xd0($s0) -/* B84834 802406B4 8C840000 */ lw $a0, ($a0) -/* B84838 802406B8 0064182A */ slt $v1, $v1, $a0 -/* B8483C 802406BC 14600002 */ bnez $v1, .L802406C8 -/* B84840 802406C0 0040282D */ daddu $a1, $v0, $zero -/* B84844 802406C4 AE200078 */ sw $zero, 0x78($s1) -.L802406C8: -/* B84848 802406C8 8E0200CC */ lw $v0, 0xcc($s0) -/* B8484C 802406CC 8C420004 */ lw $v0, 4($v0) -/* B84850 802406D0 ACA20028 */ sw $v0, 0x28($a1) -/* B84854 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* B84858 802406D8 8C42007C */ lw $v0, 0x7c($v0) -/* B8485C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* B84860 802406E0 00000000 */ nop -/* B84864 802406E4 C6400000 */ lwc1 $f0, ($s2) -/* B84868 802406E8 080901C4 */ j .L80240710 -/* B8486C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) -.L802406F0: -/* B84870 802406F0 3C018025 */ lui $at, 0x8025 -/* B84874 802406F4 D422B9A8 */ ldc1 $f2, -0x4658($at) -/* B84878 802406F8 44820000 */ mtc1 $v0, $f0 -/* B8487C 802406FC 00000000 */ nop -/* B84880 80240700 46800021 */ cvt.d.w $f0, $f0 -/* B84884 80240704 46220003 */ div.d $f0, $f0, $f2 -/* B84888 80240708 46200020 */ cvt.s.d $f0, $f0 -/* B8488C 8024070C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240710: -/* B84890 80240710 24020001 */ addiu $v0, $zero, 1 -/* B84894 80240714 AE220070 */ sw $v0, 0x70($s1) -/* B84898 80240718 8FBF001C */ lw $ra, 0x1c($sp) -/* B8489C 8024071C 8FB20018 */ lw $s2, 0x18($sp) -/* B848A0 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* B848A4 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* B848A8 80240728 03E00008 */ jr $ra -/* B848AC 8024072C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_80240730_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_80240730_B84180.s deleted file mode 100644 index c2cf13da92..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_80240730_B84180.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_B848B0 -/* B848B0 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B848B4 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* B848B8 80240738 0080882D */ daddu $s1, $a0, $zero -/* B848BC 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* B848C0 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* B848C4 80240744 8E300148 */ lw $s0, 0x148($s1) -/* B848C8 80240748 0C00EABB */ jal get_npc_unsafe -/* B848CC 8024074C 86040008 */ lh $a0, 8($s0) -/* B848D0 80240750 8E0300CC */ lw $v1, 0xcc($s0) -/* B848D4 80240754 3C014120 */ lui $at, 0x4120 -/* B848D8 80240758 44812000 */ mtc1 $at, $f4 -/* B848DC 8024075C 3C014000 */ lui $at, 0x4000 -/* B848E0 80240760 44810000 */ mtc1 $at, $f0 -/* B848E4 80240764 C442003C */ lwc1 $f2, 0x3c($v0) -/* B848E8 80240768 8C640010 */ lw $a0, 0x10($v1) -/* B848EC 8024076C 8C430000 */ lw $v1, ($v0) -/* B848F0 80240770 E444001C */ swc1 $f4, 0x1c($v0) -/* B848F4 80240774 E4400014 */ swc1 $f0, 0x14($v0) -/* B848F8 80240778 E4420064 */ swc1 $f2, 0x64($v0) -/* B848FC 8024077C 34630800 */ ori $v1, $v1, 0x800 -/* B84900 80240780 AC430000 */ sw $v1, ($v0) -/* B84904 80240784 AC440028 */ sw $a0, 0x28($v0) -/* B84908 80240788 2402000B */ addiu $v0, $zero, 0xb -/* B8490C 8024078C AE220070 */ sw $v0, 0x70($s1) -/* B84910 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* B84914 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* B84918 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* B8491C 8024079C 03E00008 */ jr $ra -/* B84920 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_802407A4_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_802407A4_B84180.s deleted file mode 100644 index c328dd7368..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_802407A4_B84180.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4_B84924 -/* B84924 802407A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B84928 802407A8 AFB00010 */ sw $s0, 0x10($sp) -/* B8492C 802407AC 0080802D */ daddu $s0, $a0, $zero -/* B84930 802407B0 AFBF0014 */ sw $ra, 0x14($sp) -/* B84934 802407B4 8E020148 */ lw $v0, 0x148($s0) -/* B84938 802407B8 0C00EABB */ jal get_npc_unsafe -/* B8493C 802407BC 84440008 */ lh $a0, 8($v0) -/* B84940 802407C0 0040202D */ daddu $a0, $v0, $zero -/* B84944 802407C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* B84948 802407C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* B8494C 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* B84950 802407D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* B84954 802407D4 46040001 */ sub.s $f0, $f0, $f4 -/* B84958 802407D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* B8495C 802407DC 4602203C */ c.lt.s $f4, $f2 -/* B84960 802407E0 E482003C */ swc1 $f2, 0x3c($a0) -/* B84964 802407E4 45010009 */ bc1t .L8024080C -/* B84968 802407E8 E480001C */ swc1 $f0, 0x1c($a0) -/* B8496C 802407EC 8C820000 */ lw $v0, ($a0) -/* B84970 802407F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* B84974 802407F4 E484003C */ swc1 $f4, 0x3c($a0) -/* B84978 802407F8 AC80001C */ sw $zero, 0x1c($a0) -/* B8497C 802407FC 00431024 */ and $v0, $v0, $v1 -/* B84980 80240800 AC820000 */ sw $v0, ($a0) -/* B84984 80240804 2402000C */ addiu $v0, $zero, 0xc -/* B84988 80240808 AE020070 */ sw $v0, 0x70($s0) -.L8024080C: -/* B8498C 8024080C 8FBF0014 */ lw $ra, 0x14($sp) -/* B84990 80240810 8FB00010 */ lw $s0, 0x10($sp) -/* B84994 80240814 03E00008 */ jr $ra -/* B84998 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_8024081C_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_8024081C_B84180.s deleted file mode 100644 index ef5f4e4b40..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_8024081C_B84180.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024081C_B8499C -/* B8499C 8024081C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B849A0 80240820 AFB3001C */ sw $s3, 0x1c($sp) -/* B849A4 80240824 0080982D */ daddu $s3, $a0, $zero -/* B849A8 80240828 AFBF0020 */ sw $ra, 0x20($sp) -/* B849AC 8024082C AFB20018 */ sw $s2, 0x18($sp) -/* B849B0 80240830 AFB10014 */ sw $s1, 0x14($sp) -/* B849B4 80240834 AFB00010 */ sw $s0, 0x10($sp) -/* B849B8 80240838 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B849BC 8024083C 8E710148 */ lw $s1, 0x148($s3) -/* B849C0 80240840 86240008 */ lh $a0, 8($s1) -/* B849C4 80240844 0C00EABB */ jal get_npc_unsafe -/* B849C8 80240848 00A0802D */ daddu $s0, $a1, $zero -/* B849CC 8024084C 8E040020 */ lw $a0, 0x20($s0) -/* B849D0 80240850 0040902D */ daddu $s2, $v0, $zero -/* B849D4 80240854 00041FC2 */ srl $v1, $a0, 0x1f -/* B849D8 80240858 00832021 */ addu $a0, $a0, $v1 -/* B849DC 8024085C 00042043 */ sra $a0, $a0, 1 -/* B849E0 80240860 0C00A67F */ jal rand_int -/* B849E4 80240864 24840001 */ addiu $a0, $a0, 1 -/* B849E8 80240868 8E030020 */ lw $v1, 0x20($s0) -/* B849EC 8024086C C64C0038 */ lwc1 $f12, 0x38($s2) -/* B849F0 80240870 000327C2 */ srl $a0, $v1, 0x1f -/* B849F4 80240874 00641821 */ addu $v1, $v1, $a0 -/* B849F8 80240878 00031843 */ sra $v1, $v1, 1 -/* B849FC 8024087C 00621821 */ addu $v1, $v1, $v0 -/* B84A00 80240880 A643008E */ sh $v1, 0x8e($s2) -/* B84A04 80240884 8E2200CC */ lw $v0, 0xcc($s1) -/* B84A08 80240888 C64E0040 */ lwc1 $f14, 0x40($s2) -/* B84A0C 8024088C 8C42000C */ lw $v0, 0xc($v0) -/* B84A10 80240890 AE420028 */ sw $v0, 0x28($s2) -/* B84A14 80240894 C6000018 */ lwc1 $f0, 0x18($s0) -/* B84A18 80240898 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B84A1C 8024089C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B84A20 802408A0 E6400018 */ swc1 $f0, 0x18($s2) -/* B84A24 802408A4 8C460028 */ lw $a2, 0x28($v0) -/* B84A28 802408A8 0C00A720 */ jal atan2 -/* B84A2C 802408AC 8C470030 */ lw $a3, 0x30($v0) -/* B84A30 802408B0 46000506 */ mov.s $f20, $f0 -/* B84A34 802408B4 C64C000C */ lwc1 $f12, 0xc($s2) -/* B84A38 802408B8 0C00A70A */ jal get_clamped_angle_diff -/* B84A3C 802408BC 4600A386 */ mov.s $f14, $f20 -/* B84A40 802408C0 46000086 */ mov.s $f2, $f0 -/* B84A44 802408C4 8E02001C */ lw $v0, 0x1c($s0) -/* B84A48 802408C8 46001005 */ abs.s $f0, $f2 -/* B84A4C 802408CC 44822000 */ mtc1 $v0, $f4 -/* B84A50 802408D0 00000000 */ nop -/* B84A54 802408D4 46802120 */ cvt.s.w $f4, $f4 -/* B84A58 802408D8 4600203C */ c.lt.s $f4, $f0 -/* B84A5C 802408DC 00000000 */ nop -/* B84A60 802408E0 4500000D */ bc1f .L80240918 -/* B84A64 802408E4 00000000 */ nop -/* B84A68 802408E8 44800000 */ mtc1 $zero, $f0 -/* B84A6C 802408EC C654000C */ lwc1 $f20, 0xc($s2) -/* B84A70 802408F0 4600103C */ c.lt.s $f2, $f0 -/* B84A74 802408F4 00000000 */ nop -/* B84A78 802408F8 45000006 */ bc1f .L80240914 -/* B84A7C 802408FC 00021023 */ negu $v0, $v0 -/* B84A80 80240900 44820000 */ mtc1 $v0, $f0 -/* B84A84 80240904 00000000 */ nop -/* B84A88 80240908 46800020 */ cvt.s.w $f0, $f0 -/* B84A8C 8024090C 08090246 */ j .L80240918 -/* B84A90 80240910 4600A500 */ add.s $f20, $f20, $f0 -.L80240914: -/* B84A94 80240914 4604A500 */ add.s $f20, $f20, $f4 -.L80240918: -/* B84A98 80240918 0C00A6C9 */ jal clamp_angle -/* B84A9C 8024091C 4600A306 */ mov.s $f12, $f20 -/* B84AA0 80240920 2402000D */ addiu $v0, $zero, 0xd -/* B84AA4 80240924 E640000C */ swc1 $f0, 0xc($s2) -/* B84AA8 80240928 AE620070 */ sw $v0, 0x70($s3) -/* B84AAC 8024092C 8FBF0020 */ lw $ra, 0x20($sp) -/* B84AB0 80240930 8FB3001C */ lw $s3, 0x1c($sp) -/* B84AB4 80240934 8FB20018 */ lw $s2, 0x18($sp) -/* B84AB8 80240938 8FB10014 */ lw $s1, 0x14($sp) -/* B84ABC 8024093C 8FB00010 */ lw $s0, 0x10($sp) -/* B84AC0 80240940 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B84AC4 80240944 03E00008 */ jr $ra -/* B84AC8 80240948 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_8024094C_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_8024094C_B84180.s deleted file mode 100644 index 482a75e6b8..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_8024094C_B84180.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024094C_B84ACC -/* B84ACC 8024094C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B84AD0 80240950 AFB3003C */ sw $s3, 0x3c($sp) -/* B84AD4 80240954 0080982D */ daddu $s3, $a0, $zero -/* B84AD8 80240958 AFBF0040 */ sw $ra, 0x40($sp) -/* B84ADC 8024095C AFB20038 */ sw $s2, 0x38($sp) -/* B84AE0 80240960 AFB10034 */ sw $s1, 0x34($sp) -/* B84AE4 80240964 AFB00030 */ sw $s0, 0x30($sp) -/* B84AE8 80240968 8E720148 */ lw $s2, 0x148($s3) -/* B84AEC 8024096C 00A0882D */ daddu $s1, $a1, $zero -/* B84AF0 80240970 86440008 */ lh $a0, 8($s2) -/* B84AF4 80240974 0C00EABB */ jal get_npc_unsafe -/* B84AF8 80240978 00C0802D */ daddu $s0, $a2, $zero -/* B84AFC 8024097C 0200202D */ daddu $a0, $s0, $zero -/* B84B00 80240980 0240282D */ daddu $a1, $s2, $zero -/* B84B04 80240984 24030001 */ addiu $v1, $zero, 1 -/* B84B08 80240988 AFA30010 */ sw $v1, 0x10($sp) -/* B84B0C 8024098C 8E260024 */ lw $a2, 0x24($s1) -/* B84B10 80240990 8E270028 */ lw $a3, 0x28($s1) -/* B84B14 80240994 0C01242D */ jal func_800490B4 -/* B84B18 80240998 0040802D */ daddu $s0, $v0, $zero -/* B84B1C 8024099C 1440001E */ bnez $v0, .L80240A18 -/* B84B20 802409A0 0200202D */ daddu $a0, $s0, $zero -/* B84B24 802409A4 24040002 */ addiu $a0, $zero, 2 -/* B84B28 802409A8 0200282D */ daddu $a1, $s0, $zero -/* B84B2C 802409AC 0000302D */ daddu $a2, $zero, $zero -/* B84B30 802409B0 860300A8 */ lh $v1, 0xa8($s0) -/* B84B34 802409B4 3C013F80 */ lui $at, 0x3f80 -/* B84B38 802409B8 44810000 */ mtc1 $at, $f0 -/* B84B3C 802409BC 3C014000 */ lui $at, 0x4000 -/* B84B40 802409C0 44811000 */ mtc1 $at, $f2 -/* B84B44 802409C4 3C01C1A0 */ lui $at, 0xc1a0 -/* B84B48 802409C8 44812000 */ mtc1 $at, $f4 -/* B84B4C 802409CC 2402000F */ addiu $v0, $zero, 0xf -/* B84B50 802409D0 AFA2001C */ sw $v0, 0x1c($sp) -/* B84B54 802409D4 44833000 */ mtc1 $v1, $f6 -/* B84B58 802409D8 00000000 */ nop -/* B84B5C 802409DC 468031A0 */ cvt.s.w $f6, $f6 -/* B84B60 802409E0 44073000 */ mfc1 $a3, $f6 -/* B84B64 802409E4 27A20028 */ addiu $v0, $sp, 0x28 -/* B84B68 802409E8 AFA20020 */ sw $v0, 0x20($sp) -/* B84B6C 802409EC E7A00010 */ swc1 $f0, 0x10($sp) -/* B84B70 802409F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* B84B74 802409F4 0C01BFA4 */ jal fx_emote -/* B84B78 802409F8 E7A40018 */ swc1 $f4, 0x18($sp) -/* B84B7C 802409FC 8E4200CC */ lw $v0, 0xcc($s2) -/* B84B80 80240A00 8C430000 */ lw $v1, ($v0) -/* B84B84 80240A04 24020019 */ addiu $v0, $zero, 0x19 -/* B84B88 80240A08 A602008E */ sh $v0, 0x8e($s0) -/* B84B8C 80240A0C 2402000E */ addiu $v0, $zero, 0xe -/* B84B90 80240A10 08090293 */ j .L80240A4C -/* B84B94 80240A14 AE030028 */ sw $v1, 0x28($s0) -.L80240A18: -/* B84B98 80240A18 0C00F598 */ jal func_8003D660 -/* B84B9C 80240A1C 24050001 */ addiu $a1, $zero, 1 -/* B84BA0 80240A20 8E050018 */ lw $a1, 0x18($s0) -/* B84BA4 80240A24 8E06000C */ lw $a2, 0xc($s0) -/* B84BA8 80240A28 0C00EA95 */ jal npc_move_heading -/* B84BAC 80240A2C 0200202D */ daddu $a0, $s0, $zero -/* B84BB0 80240A30 8602008E */ lh $v0, 0x8e($s0) -/* B84BB4 80240A34 9603008E */ lhu $v1, 0x8e($s0) -/* B84BB8 80240A38 18400003 */ blez $v0, .L80240A48 -/* B84BBC 80240A3C 2462FFFF */ addiu $v0, $v1, -1 -/* B84BC0 80240A40 08090294 */ j .L80240A50 -/* B84BC4 80240A44 A602008E */ sh $v0, 0x8e($s0) -.L80240A48: -/* B84BC8 80240A48 2402000C */ addiu $v0, $zero, 0xc -.L80240A4C: -/* B84BCC 80240A4C AE620070 */ sw $v0, 0x70($s3) -.L80240A50: -/* B84BD0 80240A50 8FBF0040 */ lw $ra, 0x40($sp) -/* B84BD4 80240A54 8FB3003C */ lw $s3, 0x3c($sp) -/* B84BD8 80240A58 8FB20038 */ lw $s2, 0x38($sp) -/* B84BDC 80240A5C 8FB10034 */ lw $s1, 0x34($sp) -/* B84BE0 80240A60 8FB00030 */ lw $s0, 0x30($sp) -/* B84BE4 80240A64 03E00008 */ jr $ra -/* B84BE8 80240A68 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_80240A6C_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_80240A6C_B84180.s deleted file mode 100644 index 00e7ec1786..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_80240A6C_B84180.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_B84BEC -/* B84BEC 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B84BF0 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* B84BF4 80240A74 0080882D */ daddu $s1, $a0, $zero -/* B84BF8 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* B84BFC 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* B84C00 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* B84C04 80240A84 0C00EABB */ jal get_npc_unsafe -/* B84C08 80240A88 86040008 */ lh $a0, 8($s0) -/* B84C0C 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* B84C10 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* B84C14 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* B84C18 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* B84C1C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* B84C20 80240AA0 00000000 */ nop -/* B84C24 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* B84C28 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* B84C2C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* B84C30 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* B84C34 80240AB4 080902B0 */ j .L80240AC0 -/* B84C38 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* B84C3C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* B84C40 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* B84C44 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* B84C48 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* B84C4C 80240ACC 03E00008 */ jr $ra -/* B84C50 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_80240AD4_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_80240AD4_B84180.s deleted file mode 100644 index 0f7a4674b9..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_80240AD4_B84180.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD4_B84C54 -/* B84C54 80240AD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B84C58 80240AD8 AFB10014 */ sw $s1, 0x14($sp) -/* B84C5C 80240ADC 0080882D */ daddu $s1, $a0, $zero -/* B84C60 80240AE0 AFBF001C */ sw $ra, 0x1c($sp) -/* B84C64 80240AE4 AFB20018 */ sw $s2, 0x18($sp) -/* B84C68 80240AE8 AFB00010 */ sw $s0, 0x10($sp) -/* B84C6C 80240AEC 8E300148 */ lw $s0, 0x148($s1) -/* B84C70 80240AF0 86040008 */ lh $a0, 8($s0) -/* B84C74 80240AF4 0C00EABB */ jal get_npc_unsafe -/* B84C78 80240AF8 00A0902D */ daddu $s2, $a1, $zero -/* B84C7C 80240AFC 8E0300D0 */ lw $v1, 0xd0($s0) -/* B84C80 80240B00 8E240078 */ lw $a0, 0x78($s1) -/* B84C84 80240B04 8C630000 */ lw $v1, ($v1) -/* B84C88 80240B08 0083182A */ slt $v1, $a0, $v1 -/* B84C8C 80240B0C 10600013 */ beqz $v1, .L80240B5C -/* B84C90 80240B10 0040302D */ daddu $a2, $v0, $zero -/* B84C94 80240B14 00041040 */ sll $v0, $a0, 1 -/* B84C98 80240B18 00441021 */ addu $v0, $v0, $a0 -/* B84C9C 80240B1C 00022880 */ sll $a1, $v0, 2 -.L80240B20: -/* B84CA0 80240B20 8E0300D0 */ lw $v1, 0xd0($s0) -/* B84CA4 80240B24 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* B84CA8 80240B28 00A31021 */ addu $v0, $a1, $v1 -/* B84CAC 80240B2C C4400008 */ lwc1 $f0, 8($v0) -/* B84CB0 80240B30 46800020 */ cvt.s.w $f0, $f0 -/* B84CB4 80240B34 4602003E */ c.le.s $f0, $f2 -/* B84CB8 80240B38 00000000 */ nop -/* B84CBC 80240B3C 45020003 */ bc1fl .L80240B4C -/* B84CC0 80240B40 24840001 */ addiu $a0, $a0, 1 -/* B84CC4 80240B44 080902D7 */ j .L80240B5C -/* B84CC8 80240B48 AE240078 */ sw $a0, 0x78($s1) -.L80240B4C: -/* B84CCC 80240B4C 8C620000 */ lw $v0, ($v1) -/* B84CD0 80240B50 0082102A */ slt $v0, $a0, $v0 -/* B84CD4 80240B54 1440FFF2 */ bnez $v0, .L80240B20 -/* B84CD8 80240B58 24A5000C */ addiu $a1, $a1, 0xc -.L80240B5C: -/* B84CDC 80240B5C C6400000 */ lwc1 $f0, ($s2) -/* B84CE0 80240B60 E4C00018 */ swc1 $f0, 0x18($a2) -/* B84CE4 80240B64 8E0200CC */ lw $v0, 0xcc($s0) -/* B84CE8 80240B68 8C420004 */ lw $v0, 4($v0) -/* B84CEC 80240B6C ACC20028 */ sw $v0, 0x28($a2) -/* B84CF0 80240B70 24020001 */ addiu $v0, $zero, 1 -/* B84CF4 80240B74 AE200074 */ sw $zero, 0x74($s1) -/* B84CF8 80240B78 AE220070 */ sw $v0, 0x70($s1) -/* B84CFC 80240B7C 8FBF001C */ lw $ra, 0x1c($sp) -/* B84D00 80240B80 8FB20018 */ lw $s2, 0x18($sp) -/* B84D04 80240B84 8FB10014 */ lw $s1, 0x14($sp) -/* B84D08 80240B88 8FB00010 */ lw $s0, 0x10($sp) -/* B84D0C 80240B8C 03E00008 */ jr $ra -/* B84D10 80240B90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_80240B94_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_80240B94_B84180.s deleted file mode 100644 index f3cbeada1b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_80240B94_B84180.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B94_B84D14 -/* B84D14 80240B94 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B84D18 80240B98 AFB40058 */ sw $s4, 0x58($sp) -/* B84D1C 80240B9C 0080A02D */ daddu $s4, $a0, $zero -/* B84D20 80240BA0 AFBF0060 */ sw $ra, 0x60($sp) -/* B84D24 80240BA4 AFB5005C */ sw $s5, 0x5c($sp) -/* B84D28 80240BA8 AFB30054 */ sw $s3, 0x54($sp) -/* B84D2C 80240BAC AFB20050 */ sw $s2, 0x50($sp) -/* B84D30 80240BB0 AFB1004C */ sw $s1, 0x4c($sp) -/* B84D34 80240BB4 AFB00048 */ sw $s0, 0x48($sp) -/* B84D38 80240BB8 8E910148 */ lw $s1, 0x148($s4) -/* B84D3C 80240BBC 86240008 */ lh $a0, 8($s1) -/* B84D40 80240BC0 0C00EABB */ jal get_npc_unsafe -/* B84D44 80240BC4 00A0802D */ daddu $s0, $a1, $zero -/* B84D48 80240BC8 8E83000C */ lw $v1, 0xc($s4) -/* B84D4C 80240BCC 0280202D */ daddu $a0, $s4, $zero -/* B84D50 80240BD0 8C650000 */ lw $a1, ($v1) -/* B84D54 80240BD4 0C0B1EAF */ jal get_variable -/* B84D58 80240BD8 0040902D */ daddu $s2, $v0, $zero -/* B84D5C 80240BDC AFA00018 */ sw $zero, 0x18($sp) -/* B84D60 80240BE0 8E2300D0 */ lw $v1, 0xd0($s1) -/* B84D64 80240BE4 8C630094 */ lw $v1, 0x94($v1) -/* B84D68 80240BE8 AFA3001C */ sw $v1, 0x1c($sp) -/* B84D6C 80240BEC 8E2300D0 */ lw $v1, 0xd0($s1) -/* B84D70 80240BF0 8C630080 */ lw $v1, 0x80($v1) -/* B84D74 80240BF4 AFA30020 */ sw $v1, 0x20($sp) -/* B84D78 80240BF8 8E2300D0 */ lw $v1, 0xd0($s1) -/* B84D7C 80240BFC 8C630088 */ lw $v1, 0x88($v1) -/* B84D80 80240C00 AFA30024 */ sw $v1, 0x24($sp) -/* B84D84 80240C04 8E2300D0 */ lw $v1, 0xd0($s1) -/* B84D88 80240C08 8C63008C */ lw $v1, 0x8c($v1) -/* B84D8C 80240C0C 27B50018 */ addiu $s5, $sp, 0x18 -/* B84D90 80240C10 AFA30028 */ sw $v1, 0x28($sp) -/* B84D94 80240C14 8E2300D0 */ lw $v1, 0xd0($s1) -/* B84D98 80240C18 3C014282 */ lui $at, 0x4282 -/* B84D9C 80240C1C 44810000 */ mtc1 $at, $f0 -/* B84DA0 80240C20 8C630090 */ lw $v1, 0x90($v1) -/* B84DA4 80240C24 0040982D */ daddu $s3, $v0, $zero -/* B84DA8 80240C28 E7A00030 */ swc1 $f0, 0x30($sp) -/* B84DAC 80240C2C A7A00034 */ sh $zero, 0x34($sp) -/* B84DB0 80240C30 16000005 */ bnez $s0, .L80240C48 -/* B84DB4 80240C34 AFA3002C */ sw $v1, 0x2c($sp) -/* B84DB8 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) -/* B84DBC 80240C3C 30420004 */ andi $v0, $v0, 4 -/* B84DC0 80240C40 10400044 */ beqz $v0, .L80240D54 -/* B84DC4 80240C44 00000000 */ nop -.L80240C48: -/* B84DC8 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 -/* B84DCC 80240C4C AE800070 */ sw $zero, 0x70($s4) -/* B84DD0 80240C50 A640008E */ sh $zero, 0x8e($s2) -/* B84DD4 80240C54 8E2200CC */ lw $v0, 0xcc($s1) -/* B84DD8 80240C58 8E430000 */ lw $v1, ($s2) -/* B84DDC 80240C5C 8C420000 */ lw $v0, ($v0) -/* B84DE0 80240C60 00641824 */ and $v1, $v1, $a0 -/* B84DE4 80240C64 AE430000 */ sw $v1, ($s2) -/* B84DE8 80240C68 AE420028 */ sw $v0, 0x28($s2) -/* B84DEC 80240C6C 8E2200D0 */ lw $v0, 0xd0($s1) -/* B84DF0 80240C70 8C420098 */ lw $v0, 0x98($v0) -/* B84DF4 80240C74 54400005 */ bnel $v0, $zero, .L80240C8C -/* B84DF8 80240C78 2402FDFF */ addiu $v0, $zero, -0x201 -/* B84DFC 80240C7C 34620200 */ ori $v0, $v1, 0x200 -/* B84E00 80240C80 2403FFF7 */ addiu $v1, $zero, -9 -/* B84E04 80240C84 08090325 */ j .L80240C94 -/* B84E08 80240C88 00431024 */ and $v0, $v0, $v1 -.L80240C8C: -/* B84E0C 80240C8C 00621024 */ and $v0, $v1, $v0 -/* B84E10 80240C90 34420008 */ ori $v0, $v0, 8 -.L80240C94: -/* B84E14 80240C94 AE420000 */ sw $v0, ($s2) -/* B84E18 80240C98 8E2200B0 */ lw $v0, 0xb0($s1) -/* B84E1C 80240C9C 30420004 */ andi $v0, $v0, 4 -/* B84E20 80240CA0 10400008 */ beqz $v0, .L80240CC4 -/* B84E24 80240CA4 24020063 */ addiu $v0, $zero, 0x63 -/* B84E28 80240CA8 AE820070 */ sw $v0, 0x70($s4) -/* B84E2C 80240CAC AE800074 */ sw $zero, 0x74($s4) -/* B84E30 80240CB0 8E2200B0 */ lw $v0, 0xb0($s1) -/* B84E34 80240CB4 2403FFFB */ addiu $v1, $zero, -5 -/* B84E38 80240CB8 00431024 */ and $v0, $v0, $v1 -/* B84E3C 80240CBC 0809033C */ j .L80240CF0 -/* B84E40 80240CC0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240CC4: -/* B84E44 80240CC4 8E220000 */ lw $v0, ($s1) -/* B84E48 80240CC8 3C034000 */ lui $v1, 0x4000 -/* B84E4C 80240CCC 00431024 */ and $v0, $v0, $v1 -/* B84E50 80240CD0 10400007 */ beqz $v0, .L80240CF0 -/* B84E54 80240CD4 3C03BFFF */ lui $v1, 0xbfff -/* B84E58 80240CD8 2402000C */ addiu $v0, $zero, 0xc -/* B84E5C 80240CDC AE820070 */ sw $v0, 0x70($s4) -/* B84E60 80240CE0 8E220000 */ lw $v0, ($s1) -/* B84E64 80240CE4 3463FFFF */ ori $v1, $v1, 0xffff -/* B84E68 80240CE8 00431024 */ and $v0, $v0, $v1 -/* B84E6C 80240CEC AE220000 */ sw $v0, ($s1) -.L80240CF0: -/* B84E70 80240CF0 27A50038 */ addiu $a1, $sp, 0x38 -/* B84E74 80240CF4 27A6003C */ addiu $a2, $sp, 0x3c -/* B84E78 80240CF8 C6400038 */ lwc1 $f0, 0x38($s2) -/* B84E7C 80240CFC 864200A8 */ lh $v0, 0xa8($s2) -/* B84E80 80240D00 3C0142C8 */ lui $at, 0x42c8 -/* B84E84 80240D04 44812000 */ mtc1 $at, $f4 -/* B84E88 80240D08 44823000 */ mtc1 $v0, $f6 -/* B84E8C 80240D0C 00000000 */ nop -/* B84E90 80240D10 468031A0 */ cvt.s.w $f6, $f6 -/* B84E94 80240D14 27A20044 */ addiu $v0, $sp, 0x44 -/* B84E98 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) -/* B84E9C 80240D1C C640003C */ lwc1 $f0, 0x3c($s2) -/* B84EA0 80240D20 C6420040 */ lwc1 $f2, 0x40($s2) -/* B84EA4 80240D24 46060000 */ add.s $f0, $f0, $f6 -/* B84EA8 80240D28 E7A40044 */ swc1 $f4, 0x44($sp) -/* B84EAC 80240D2C E7A20040 */ swc1 $f2, 0x40($sp) -/* B84EB0 80240D30 E7A0003C */ swc1 $f0, 0x3c($sp) -/* B84EB4 80240D34 AFA20010 */ sw $v0, 0x10($sp) -/* B84EB8 80240D38 8E440080 */ lw $a0, 0x80($s2) -/* B84EBC 80240D3C 0C0372DF */ jal func_800DCB7C -/* B84EC0 80240D40 27A70040 */ addiu $a3, $sp, 0x40 -/* B84EC4 80240D44 10400003 */ beqz $v0, .L80240D54 -/* B84EC8 80240D48 00000000 */ nop -/* B84ECC 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* B84ED0 80240D50 E640003C */ swc1 $f0, 0x3c($s2) -.L80240D54: -/* B84ED4 80240D54 8E830070 */ lw $v1, 0x70($s4) -/* B84ED8 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* B84EDC 80240D5C 10400042 */ beqz $v0, .L80240E68 -/* B84EE0 80240D60 00031080 */ sll $v0, $v1, 2 -/* B84EE4 80240D64 3C018025 */ lui $at, 0x8025 -/* B84EE8 80240D68 00220821 */ addu $at, $at, $v0 -/* B84EEC 80240D6C 8C22B9B0 */ lw $v0, -0x4650($at) -/* B84EF0 80240D70 00400008 */ jr $v0 -/* B84EF4 80240D74 00000000 */ nop -/* B84EF8 80240D78 0280202D */ daddu $a0, $s4, $zero -/* B84EFC 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* B84F00 80240D80 0C090000 */ jal func_80240000 -/* B84F04 80240D84 02A0302D */ daddu $a2, $s5, $zero -/* B84F08 80240D88 0280202D */ daddu $a0, $s4, $zero -/* B84F0C 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* B84F10 80240D90 0C090056 */ jal func_80240158 -/* B84F14 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* B84F18 80240D98 0809039A */ j .L80240E68 -/* B84F1C 80240D9C 00000000 */ nop -/* B84F20 80240DA0 0280202D */ daddu $a0, $s4, $zero -/* B84F24 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* B84F28 80240DA8 0C090100 */ jal func_80240400 -/* B84F2C 80240DAC 02A0302D */ daddu $a2, $s5, $zero -/* B84F30 80240DB0 0280202D */ daddu $a0, $s4, $zero -/* B84F34 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* B84F38 80240DB8 0C090130 */ jal func_802404C0 -/* B84F3C 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* B84F40 80240DC0 0809039A */ j .L80240E68 -/* B84F44 80240DC4 00000000 */ nop -/* B84F48 80240DC8 0280202D */ daddu $a0, $s4, $zero -/* B84F4C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* B84F50 80240DD0 0C09019F */ jal func_8024067C -/* B84F54 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* B84F58 80240DD8 0809039A */ j .L80240E68 -/* B84F5C 80240DDC 00000000 */ nop -/* B84F60 80240DE0 0280202D */ daddu $a0, $s4, $zero -/* B84F64 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* B84F68 80240DE8 0C0901CC */ jal func_80240730 -/* B84F6C 80240DEC 02A0302D */ daddu $a2, $s5, $zero -/* B84F70 80240DF0 0280202D */ daddu $a0, $s4, $zero -/* B84F74 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* B84F78 80240DF8 0C0901E9 */ jal func_802407A4 -/* B84F7C 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* B84F80 80240E00 0809039A */ j .L80240E68 -/* B84F84 80240E04 00000000 */ nop -/* B84F88 80240E08 0280202D */ daddu $a0, $s4, $zero -/* B84F8C 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* B84F90 80240E10 0C090207 */ jal func_8024081C -/* B84F94 80240E14 02A0302D */ daddu $a2, $s5, $zero -/* B84F98 80240E18 0280202D */ daddu $a0, $s4, $zero -/* B84F9C 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* B84FA0 80240E20 0C090253 */ jal func_8024094C -/* B84FA4 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* B84FA8 80240E28 0809039A */ j .L80240E68 -/* B84FAC 80240E2C 00000000 */ nop -/* B84FB0 80240E30 0280202D */ daddu $a0, $s4, $zero -/* B84FB4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* B84FB8 80240E38 0C09029B */ jal func_80240A6C -/* B84FBC 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* B84FC0 80240E40 0809039A */ j .L80240E68 -/* B84FC4 80240E44 00000000 */ nop -/* B84FC8 80240E48 0280202D */ daddu $a0, $s4, $zero -/* B84FCC 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* B84FD0 80240E50 0C0902B5 */ jal func_80240AD4 -/* B84FD4 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* B84FD8 80240E58 0809039A */ j .L80240E68 -/* B84FDC 80240E5C 00000000 */ nop -/* B84FE0 80240E60 0C0129CF */ jal func_8004A73C -/* B84FE4 80240E64 0280202D */ daddu $a0, $s4, $zero -.L80240E68: -/* B84FE8 80240E68 8FBF0060 */ lw $ra, 0x60($sp) -/* B84FEC 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) -/* B84FF0 80240E70 8FB40058 */ lw $s4, 0x58($sp) -/* B84FF4 80240E74 8FB30054 */ lw $s3, 0x54($sp) -/* B84FF8 80240E78 8FB20050 */ lw $s2, 0x50($sp) -/* B84FFC 80240E7C 8FB1004C */ lw $s1, 0x4c($sp) -/* B85000 80240E80 8FB00048 */ lw $s0, 0x48($sp) -/* B85004 80240E84 0000102D */ daddu $v0, $zero, $zero -/* B85008 80240E88 03E00008 */ jr $ra -/* B8500C 80240E8C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_80240E90_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_80240E90_B84180.s deleted file mode 100644 index 7f3e998486..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_80240E90_B84180.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E90_B85010 -/* B85010 80240E90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B85014 80240E94 AFB00010 */ sw $s0, 0x10($sp) -/* B85018 80240E98 3C108024 */ lui $s0, 0x8024 -/* B8501C 80240E9C 261025BC */ addiu $s0, $s0, 0x25bc -/* B85020 80240EA0 AFBF0018 */ sw $ra, 0x18($sp) -/* B85024 80240EA4 AFB10014 */ sw $s1, 0x14($sp) -/* B85028 80240EA8 8E020000 */ lw $v0, ($s0) -/* B8502C 80240EAC 14400010 */ bnez $v0, .L80240EF0 -/* B85030 80240EB0 0080882D */ daddu $s1, $a0, $zero -/* B85034 80240EB4 0C00AB39 */ jal heap_malloc -/* B85038 80240EB8 24040040 */ addiu $a0, $zero, 0x40 -/* B8503C 80240EBC AE020000 */ sw $v0, ($s0) -/* B85040 80240EC0 0000182D */ daddu $v1, $zero, $zero -/* B85044 80240EC4 0040282D */ daddu $a1, $v0, $zero -/* B85048 80240EC8 0220202D */ daddu $a0, $s1, $zero -.L80240ECC: -/* B8504C 80240ECC 8C820084 */ lw $v0, 0x84($a0) -/* B85050 80240ED0 24840004 */ addiu $a0, $a0, 4 -/* B85054 80240ED4 24630001 */ addiu $v1, $v1, 1 -/* B85058 80240ED8 ACA20000 */ sw $v0, ($a1) -/* B8505C 80240EDC 28620010 */ slti $v0, $v1, 0x10 -/* B85060 80240EE0 1440FFFA */ bnez $v0, .L80240ECC -/* B85064 80240EE4 24A50004 */ addiu $a1, $a1, 4 -/* B85068 80240EE8 080903CB */ j .L80240F2C -/* B8506C 80240EEC 00000000 */ nop -.L80240EF0: -/* B85070 80240EF0 0000182D */ daddu $v1, $zero, $zero -/* B85074 80240EF4 0040282D */ daddu $a1, $v0, $zero -/* B85078 80240EF8 0220202D */ daddu $a0, $s1, $zero -.L80240EFC: -/* B8507C 80240EFC 8CA20000 */ lw $v0, ($a1) -/* B85080 80240F00 24A50004 */ addiu $a1, $a1, 4 -/* B85084 80240F04 24630001 */ addiu $v1, $v1, 1 -/* B85088 80240F08 AC820084 */ sw $v0, 0x84($a0) -/* B8508C 80240F0C 28620010 */ slti $v0, $v1, 0x10 -/* B85090 80240F10 1440FFFA */ bnez $v0, .L80240EFC -/* B85094 80240F14 24840004 */ addiu $a0, $a0, 4 -/* B85098 80240F18 3C108024 */ lui $s0, 0x8024 -/* B8509C 80240F1C 261025BC */ addiu $s0, $s0, 0x25bc -/* B850A0 80240F20 0C00AB4B */ jal heap_free -/* B850A4 80240F24 8E040000 */ lw $a0, ($s0) -/* B850A8 80240F28 AE000000 */ sw $zero, ($s0) -.L80240F2C: -/* B850AC 80240F2C 8FBF0018 */ lw $ra, 0x18($sp) -/* B850B0 80240F30 8FB10014 */ lw $s1, 0x14($sp) -/* B850B4 80240F34 8FB00010 */ lw $s0, 0x10($sp) -/* B850B8 80240F38 24020002 */ addiu $v0, $zero, 2 -/* B850BC 80240F3C 03E00008 */ jr $ra -/* B850C0 80240F40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_80240F44_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_80240F44_B84180.s deleted file mode 100644 index ce5ddf8897..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_80240F44_B84180.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F44_B850C4 -/* B850C4 80240F44 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B850C8 80240F48 AFB00010 */ sw $s0, 0x10($sp) -/* B850CC 80240F4C 0080802D */ daddu $s0, $a0, $zero -/* B850D0 80240F50 AFBF0018 */ sw $ra, 0x18($sp) -/* B850D4 80240F54 AFB10014 */ sw $s1, 0x14($sp) -/* B850D8 80240F58 8E02000C */ lw $v0, 0xc($s0) -/* B850DC 80240F5C 8C510000 */ lw $s1, ($v0) -/* B850E0 80240F60 0C0B1EAF */ jal get_variable -/* B850E4 80240F64 0220282D */ daddu $a1, $s1, $zero -/* B850E8 80240F68 3C03FFF0 */ lui $v1, 0xfff0 -/* B850EC 80240F6C 3463FFFF */ ori $v1, $v1, 0xffff -/* B850F0 80240F70 0200202D */ daddu $a0, $s0, $zero -/* B850F4 80240F74 00431024 */ and $v0, $v0, $v1 -/* B850F8 80240F78 00021140 */ sll $v0, $v0, 5 -/* B850FC 80240F7C 3C068008 */ lui $a2, %hi(gItemTable) -/* B85100 80240F80 00C23021 */ addu $a2, $a2, $v0 -/* B85104 80240F84 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* B85108 80240F88 0C0B2026 */ jal set_variable -/* B8510C 80240F8C 0220282D */ daddu $a1, $s1, $zero -/* B85110 80240F90 8FBF0018 */ lw $ra, 0x18($sp) -/* B85114 80240F94 8FB10014 */ lw $s1, 0x14($sp) -/* B85118 80240F98 8FB00010 */ lw $s0, 0x10($sp) -/* B8511C 80240F9C 24020002 */ addiu $v0, $zero, 2 -/* B85120 80240FA0 03E00008 */ jr $ra -/* B85124 80240FA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_80240FC4_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_80240FC4_B84180.s deleted file mode 100644 index c0ebdd95c4..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_80240FC4_B84180.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FC4_B85144 -/* B85144 80240FC4 3C03800B */ lui $v1, %hi(gCameras) -/* B85148 80240FC8 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* B8514C 80240FCC 94620000 */ lhu $v0, ($v1) -/* B85150 80240FD0 3042EFFF */ andi $v0, $v0, 0xefff -/* B85154 80240FD4 A4620000 */ sh $v0, ($v1) -/* B85158 80240FD8 03E00008 */ jr $ra -/* B8515C 80240FDC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_80240FE0_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_80240FE0_B84180.s deleted file mode 100644 index 492c50bbe3..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_80240FE0_B84180.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FE0_B85160 -/* B85160 80240FE0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B85164 80240FE4 AFBF0010 */ sw $ra, 0x10($sp) -/* B85168 80240FE8 0C03A876 */ jal set_max_SP -/* B8516C 80240FEC 24040005 */ addiu $a0, $zero, 5 -/* B85170 80240FF0 3C028011 */ lui $v0, %hi(gPlayerData) -/* B85174 80240FF4 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* B85178 80240FF8 90430003 */ lbu $v1, 3($v0) -/* B8517C 80240FFC 90440006 */ lbu $a0, 6($v0) -/* B85180 80241000 A0430002 */ sb $v1, 2($v0) -/* B85184 80241004 0C03A6DB */ jal sync_status_menu -/* B85188 80241008 A0440005 */ sb $a0, 5($v0) -/* B8518C 8024100C 8FBF0010 */ lw $ra, 0x10($sp) -/* B85190 80241010 24020002 */ addiu $v0, $zero, 2 -/* B85194 80241014 03E00008 */ jr $ra -/* B85198 80241018 27BD0018 */ addiu $sp, $sp, 0x18 -/* B8519C 8024101C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_80241020_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_80241020_B84180.s deleted file mode 100644 index 034ae67ebe..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_80241020_B84180.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241020_B851A0 -/* B851A0 80241020 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B851A4 80241024 AFB1001C */ sw $s1, 0x1c($sp) -/* B851A8 80241028 0080882D */ daddu $s1, $a0, $zero -/* B851AC 8024102C AFBF0020 */ sw $ra, 0x20($sp) -/* B851B0 80241030 AFB00018 */ sw $s0, 0x18($sp) -/* B851B4 80241034 8E30000C */ lw $s0, 0xc($s1) -/* B851B8 80241038 8E020000 */ lw $v0, ($s0) -/* B851BC 8024103C 1040001B */ beqz $v0, .L802410AC -/* B851C0 80241040 26100004 */ addiu $s0, $s0, 4 -/* B851C4 80241044 8E050000 */ lw $a1, ($s0) -/* B851C8 80241048 0C0B1EAF */ jal get_variable -/* B851CC 8024104C 26100004 */ addiu $s0, $s0, 4 -/* B851D0 80241050 AE220070 */ sw $v0, 0x70($s1) -/* B851D4 80241054 8E050000 */ lw $a1, ($s0) -/* B851D8 80241058 26100004 */ addiu $s0, $s0, 4 -/* B851DC 8024105C 0C0B1EAF */ jal get_variable -/* B851E0 80241060 0220202D */ daddu $a0, $s1, $zero -/* B851E4 80241064 AE220074 */ sw $v0, 0x74($s1) -/* B851E8 80241068 8E050000 */ lw $a1, ($s0) -/* B851EC 8024106C 0C0B1EAF */ jal get_variable -/* B851F0 80241070 0220202D */ daddu $a0, $s1, $zero -/* B851F4 80241074 24040168 */ addiu $a0, $zero, 0x168 -/* B851F8 80241078 0000282D */ daddu $a1, $zero, $zero -/* B851FC 8024107C C6200070 */ lwc1 $f0, 0x70($s1) -/* B85200 80241080 46800020 */ cvt.s.w $f0, $f0 -/* B85204 80241084 C6220074 */ lwc1 $f2, 0x74($s1) -/* B85208 80241088 468010A0 */ cvt.s.w $f2, $f2 -/* B8520C 8024108C 44060000 */ mfc1 $a2, $f0 -/* B85210 80241090 44071000 */ mfc1 $a3, $f2 -/* B85214 80241094 44820000 */ mtc1 $v0, $f0 -/* B85218 80241098 00000000 */ nop -/* B8521C 8024109C 46800020 */ cvt.s.w $f0, $f0 -/* B85220 802410A0 AE220078 */ sw $v0, 0x78($s1) -/* B85224 802410A4 0C05267B */ jal func_801499EC -/* B85228 802410A8 E7A00010 */ swc1 $f0, 0x10($sp) -.L802410AC: -/* B8522C 802410AC 8FBF0020 */ lw $ra, 0x20($sp) -/* B85230 802410B0 8FB1001C */ lw $s1, 0x1c($sp) -/* B85234 802410B4 8FB00018 */ lw $s0, 0x18($sp) -/* B85238 802410B8 24020002 */ addiu $v0, $zero, 2 -/* B8523C 802410BC 03E00008 */ jr $ra -/* B85240 802410C0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_802412E0_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_802412E0_B84180.s deleted file mode 100644 index 6e11887ece..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_802412E0_B84180.s +++ /dev/null @@ -1,67 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412E0_B85460 -/* B85460 802412E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B85464 802412E4 AFB10014 */ sw $s1, 0x14($sp) -/* B85468 802412E8 0080882D */ daddu $s1, $a0, $zero -/* B8546C 802412EC AFBF001C */ sw $ra, 0x1c($sp) -/* B85470 802412F0 AFB20018 */ sw $s2, 0x18($sp) -/* B85474 802412F4 AFB00010 */ sw $s0, 0x10($sp) -/* B85478 802412F8 8E30000C */ lw $s0, 0xc($s1) -/* B8547C 802412FC 8E050000 */ lw $a1, ($s0) -/* B85480 80241300 0C0B1EAF */ jal get_variable -/* B85484 80241304 26100004 */ addiu $s0, $s0, 4 -/* B85488 80241308 0220202D */ daddu $a0, $s1, $zero -/* B8548C 8024130C 8E050000 */ lw $a1, ($s0) -/* B85490 80241310 2450FFEF */ addiu $s0, $v0, -0x11 -/* B85494 80241314 0C0B1EAF */ jal get_variable -/* B85498 80241318 24520011 */ addiu $s2, $v0, 0x11 -/* B8549C 8024131C 2403FFFF */ addiu $v1, $zero, -1 -/* B854A0 80241320 44900000 */ mtc1 $s0, $f0 -/* B854A4 80241324 00000000 */ nop -/* B854A8 80241328 46800020 */ cvt.s.w $f0, $f0 -/* B854AC 8024132C AE2300A4 */ sw $v1, 0xa4($s1) -/* B854B0 80241330 2443FFEF */ addiu $v1, $v0, -0x11 -/* B854B4 80241334 3C018011 */ lui $at, 0x8011 -/* B854B8 80241338 C422EFF0 */ lwc1 $f2, -0x1010($at) -/* B854BC 8024133C 4600103C */ c.lt.s $f2, $f0 -/* B854C0 80241340 00000000 */ nop -/* B854C4 80241344 45010008 */ bc1t .L80241368 -/* B854C8 80241348 24420011 */ addiu $v0, $v0, 0x11 -/* B854CC 8024134C 44920000 */ mtc1 $s2, $f0 -/* B854D0 80241350 00000000 */ nop -/* B854D4 80241354 46800020 */ cvt.s.w $f0, $f0 -/* B854D8 80241358 4602003C */ c.lt.s $f0, $f2 -/* B854DC 8024135C 00000000 */ nop -/* B854E0 80241360 45000014 */ bc1f .L802413B4 -/* B854E4 80241364 00000000 */ nop -.L80241368: -/* B854E8 80241368 44830000 */ mtc1 $v1, $f0 -/* B854EC 8024136C 00000000 */ nop -/* B854F0 80241370 46800020 */ cvt.s.w $f0, $f0 -/* B854F4 80241374 4600103C */ c.lt.s $f2, $f0 -/* B854F8 80241378 00000000 */ nop -/* B854FC 8024137C 45010008 */ bc1t .L802413A0 -/* B85500 80241380 00000000 */ nop -/* B85504 80241384 44820000 */ mtc1 $v0, $f0 -/* B85508 80241388 00000000 */ nop -/* B8550C 8024138C 46800020 */ cvt.s.w $f0, $f0 -/* B85510 80241390 4602003C */ c.lt.s $f0, $f2 -/* B85514 80241394 00000000 */ nop -/* B85518 80241398 45000006 */ bc1f .L802413B4 -/* B8551C 8024139C 00000000 */ nop -.L802413A0: -/* B85520 802413A0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* B85524 802413A4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* B85528 802413A8 8C420010 */ lw $v0, 0x10($v0) -/* B8552C 802413AC 30428000 */ andi $v0, $v0, 0x8000 -/* B85530 802413B0 AE2200A4 */ sw $v0, 0xa4($s1) -.L802413B4: -/* B85534 802413B4 8FBF001C */ lw $ra, 0x1c($sp) -/* B85538 802413B8 8FB20018 */ lw $s2, 0x18($sp) -/* B8553C 802413BC 8FB10014 */ lw $s1, 0x14($sp) -/* B85540 802413C0 8FB00010 */ lw $s0, 0x10($sp) -/* B85544 802413C4 24020002 */ addiu $v0, $zero, 2 -/* B85548 802413C8 03E00008 */ jr $ra -/* B8554C 802413CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_80241440_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_80241440_B84180.s deleted file mode 100644 index eb069469b6..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_80241440_B84180.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241440_B855C0 -/* B855C0 80241440 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B855C4 80241444 AFB10054 */ sw $s1, 0x54($sp) -/* B855C8 80241448 0080882D */ daddu $s1, $a0, $zero -/* B855CC 8024144C AFBF005C */ sw $ra, 0x5c($sp) -/* B855D0 80241450 AFB20058 */ sw $s2, 0x58($sp) -/* B855D4 80241454 AFB00050 */ sw $s0, 0x50($sp) -/* B855D8 80241458 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B855DC 8024145C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B855E0 80241460 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B855E4 80241464 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B855E8 80241468 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B855EC 8024146C 8E30000C */ lw $s0, 0xc($s1) -/* B855F0 80241470 8E050000 */ lw $a1, ($s0) -/* B855F4 80241474 0C0B1EAF */ jal get_variable -/* B855F8 80241478 26100004 */ addiu $s0, $s0, 4 -/* B855FC 8024147C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B85600 80241480 0040202D */ daddu $a0, $v0, $zero -/* B85604 80241484 8E050000 */ lw $a1, ($s0) -/* B85608 80241488 26100004 */ addiu $s0, $s0, 4 -/* B8560C 8024148C 0220202D */ daddu $a0, $s1, $zero -/* B85610 80241490 0C0B210B */ jal get_float_variable -/* B85614 80241494 0040902D */ daddu $s2, $v0, $zero -/* B85618 80241498 8E050000 */ lw $a1, ($s0) -/* B8561C 8024149C 26100004 */ addiu $s0, $s0, 4 -/* B85620 802414A0 0220202D */ daddu $a0, $s1, $zero -/* B85624 802414A4 0C0B210B */ jal get_float_variable -/* B85628 802414A8 46000706 */ mov.s $f28, $f0 -/* B8562C 802414AC 8E050000 */ lw $a1, ($s0) -/* B85630 802414B0 26100004 */ addiu $s0, $s0, 4 -/* B85634 802414B4 0220202D */ daddu $a0, $s1, $zero -/* B85638 802414B8 0C0B210B */ jal get_float_variable -/* B8563C 802414BC 46000686 */ mov.s $f26, $f0 -/* B85640 802414C0 0220202D */ daddu $a0, $s1, $zero -/* B85644 802414C4 8E050000 */ lw $a1, ($s0) -/* B85648 802414C8 0C0B210B */ jal get_float_variable -/* B8564C 802414CC 46000586 */ mov.s $f22, $f0 -/* B85650 802414D0 0240202D */ daddu $a0, $s2, $zero -/* B85654 802414D4 0C046B4C */ jal get_model_from_list_index -/* B85658 802414D8 46000606 */ mov.s $f24, $f0 -/* B8565C 802414DC 0040882D */ daddu $s1, $v0, $zero -/* B85660 802414E0 96220000 */ lhu $v0, ($s1) -/* B85664 802414E4 30420400 */ andi $v0, $v0, 0x400 -/* B85668 802414E8 1440001E */ bnez $v0, .L80241564 -/* B8566C 802414EC 26300058 */ addiu $s0, $s1, 0x58 -/* B85670 802414F0 4480A000 */ mtc1 $zero, $f20 -/* B85674 802414F4 4406B000 */ mfc1 $a2, $f22 -/* B85678 802414F8 4405A000 */ mfc1 $a1, $f20 -/* B8567C 802414FC 4407A000 */ mfc1 $a3, $f20 -/* B85680 80241500 0C019E40 */ jal guTranslateF -/* B85684 80241504 0200202D */ daddu $a0, $s0, $zero -/* B85688 80241508 4405E000 */ mfc1 $a1, $f28 -/* B8568C 8024150C 4406D000 */ mfc1 $a2, $f26 -/* B85690 80241510 4407C000 */ mfc1 $a3, $f24 -/* B85694 80241514 0C0904F4 */ jal func_802413D0 -/* B85698 80241518 27A40010 */ addiu $a0, $sp, 0x10 -/* B8569C 8024151C 27A40010 */ addiu $a0, $sp, 0x10 -/* B856A0 80241520 0200282D */ daddu $a1, $s0, $zero -/* B856A4 80241524 0C019D80 */ jal guMtxCatF -/* B856A8 80241528 0200302D */ daddu $a2, $s0, $zero -/* B856AC 8024152C 27A40010 */ addiu $a0, $sp, 0x10 -/* B856B0 80241530 4600B587 */ neg.s $f22, $f22 -/* B856B4 80241534 4405A000 */ mfc1 $a1, $f20 -/* B856B8 80241538 4406B000 */ mfc1 $a2, $f22 -/* B856BC 8024153C 0C019E40 */ jal guTranslateF -/* B856C0 80241540 00A0382D */ daddu $a3, $a1, $zero -/* B856C4 80241544 27A40010 */ addiu $a0, $sp, 0x10 -/* B856C8 80241548 0200282D */ daddu $a1, $s0, $zero -/* B856CC 8024154C 0C019D80 */ jal guMtxCatF -/* B856D0 80241550 00A0302D */ daddu $a2, $a1, $zero -/* B856D4 80241554 96220000 */ lhu $v0, ($s1) -/* B856D8 80241558 34421400 */ ori $v0, $v0, 0x1400 -/* B856DC 8024155C 08090577 */ j .L802415DC -/* B856E0 80241560 A6220000 */ sh $v0, ($s1) -.L80241564: -/* B856E4 80241564 4480A000 */ mtc1 $zero, $f20 -/* B856E8 80241568 4406B000 */ mfc1 $a2, $f22 -/* B856EC 8024156C 4405A000 */ mfc1 $a1, $f20 -/* B856F0 80241570 4407A000 */ mfc1 $a3, $f20 -/* B856F4 80241574 0C019E40 */ jal guTranslateF -/* B856F8 80241578 27A40010 */ addiu $a0, $sp, 0x10 -/* B856FC 8024157C 27A40010 */ addiu $a0, $sp, 0x10 -/* B85700 80241580 26300058 */ addiu $s0, $s1, 0x58 -/* B85704 80241584 0200282D */ daddu $a1, $s0, $zero -/* B85708 80241588 0C019D80 */ jal guMtxCatF -/* B8570C 8024158C 0200302D */ daddu $a2, $s0, $zero -/* B85710 80241590 4405E000 */ mfc1 $a1, $f28 -/* B85714 80241594 4406D000 */ mfc1 $a2, $f26 -/* B85718 80241598 4407C000 */ mfc1 $a3, $f24 -/* B8571C 8024159C 0C0904F4 */ jal func_802413D0 -/* B85720 802415A0 27A40010 */ addiu $a0, $sp, 0x10 -/* B85724 802415A4 27A40010 */ addiu $a0, $sp, 0x10 -/* B85728 802415A8 0200282D */ daddu $a1, $s0, $zero -/* B8572C 802415AC 0C019D80 */ jal guMtxCatF -/* B85730 802415B0 0200302D */ daddu $a2, $s0, $zero -/* B85734 802415B4 27A40010 */ addiu $a0, $sp, 0x10 -/* B85738 802415B8 4600B587 */ neg.s $f22, $f22 -/* B8573C 802415BC 4405A000 */ mfc1 $a1, $f20 -/* B85740 802415C0 4406B000 */ mfc1 $a2, $f22 -/* B85744 802415C4 0C019E40 */ jal guTranslateF -/* B85748 802415C8 00A0382D */ daddu $a3, $a1, $zero -/* B8574C 802415CC 27A40010 */ addiu $a0, $sp, 0x10 -/* B85750 802415D0 0200282D */ daddu $a1, $s0, $zero -/* B85754 802415D4 0C019D80 */ jal guMtxCatF -/* B85758 802415D8 00A0302D */ daddu $a2, $a1, $zero -.L802415DC: -/* B8575C 802415DC 8FBF005C */ lw $ra, 0x5c($sp) -/* B85760 802415E0 8FB20058 */ lw $s2, 0x58($sp) -/* B85764 802415E4 8FB10054 */ lw $s1, 0x54($sp) -/* B85768 802415E8 8FB00050 */ lw $s0, 0x50($sp) -/* B8576C 802415EC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B85770 802415F0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B85774 802415F4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B85778 802415F8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B8577C 802415FC D7B40060 */ ldc1 $f20, 0x60($sp) -/* B85780 80241600 24020002 */ addiu $v0, $zero, 2 -/* B85784 80241604 03E00008 */ jr $ra -/* B85788 80241608 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_80241668_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_80241668_B84180.s deleted file mode 100644 index 88e5a4b7ef..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_80241668_B84180.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241668_B857E8 -/* B857E8 80241668 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B857EC 8024166C AFB10054 */ sw $s1, 0x54($sp) -/* B857F0 80241670 0080882D */ daddu $s1, $a0, $zero -/* B857F4 80241674 AFBF0058 */ sw $ra, 0x58($sp) -/* B857F8 80241678 AFB00050 */ sw $s0, 0x50($sp) -/* B857FC 8024167C F7B40060 */ sdc1 $f20, 0x60($sp) -/* B85800 80241680 8E30000C */ lw $s0, 0xc($s1) -/* B85804 80241684 8E050000 */ lw $a1, ($s0) -/* B85808 80241688 0C0B1EAF */ jal get_variable -/* B8580C 8024168C 26100004 */ addiu $s0, $s0, 4 -/* B85810 80241690 0C046C04 */ jal get_model_list_index_from_tree_index -/* B85814 80241694 0040202D */ daddu $a0, $v0, $zero -/* B85818 80241698 0220202D */ daddu $a0, $s1, $zero -/* B8581C 8024169C 8E050000 */ lw $a1, ($s0) -/* B85820 802416A0 0C0B210B */ jal get_float_variable -/* B85824 802416A4 0040802D */ daddu $s0, $v0, $zero -/* B85828 802416A8 0200202D */ daddu $a0, $s0, $zero -/* B8582C 802416AC 0C046B4C */ jal get_model_from_list_index -/* B85830 802416B0 46000506 */ mov.s $f20, $f0 -/* B85834 802416B4 0040802D */ daddu $s0, $v0, $zero -/* B85838 802416B8 96020000 */ lhu $v0, ($s0) -/* B8583C 802416BC 30420400 */ andi $v0, $v0, 0x400 -/* B85840 802416C0 14400008 */ bnez $v0, .L802416E4 -/* B85844 802416C4 00000000 */ nop -/* B85848 802416C8 4405A000 */ mfc1 $a1, $f20 -/* B8584C 802416CC 0C090583 */ jal func_8024160C -/* B85850 802416D0 26040058 */ addiu $a0, $s0, 0x58 -/* B85854 802416D4 96020000 */ lhu $v0, ($s0) -/* B85858 802416D8 34421400 */ ori $v0, $v0, 0x1400 -/* B8585C 802416DC 080905C0 */ j .L80241700 -/* B85860 802416E0 A6020000 */ sh $v0, ($s0) -.L802416E4: -/* B85864 802416E4 4405A000 */ mfc1 $a1, $f20 -/* B85868 802416E8 0C090583 */ jal func_8024160C -/* B8586C 802416EC 27A40010 */ addiu $a0, $sp, 0x10 -/* B85870 802416F0 27A40010 */ addiu $a0, $sp, 0x10 -/* B85874 802416F4 26050058 */ addiu $a1, $s0, 0x58 -/* B85878 802416F8 0C019D80 */ jal guMtxCatF -/* B8587C 802416FC 00A0302D */ daddu $a2, $a1, $zero -.L80241700: -/* B85880 80241700 8FBF0058 */ lw $ra, 0x58($sp) -/* B85884 80241704 8FB10054 */ lw $s1, 0x54($sp) -/* B85888 80241708 8FB00050 */ lw $s0, 0x50($sp) -/* B8588C 8024170C D7B40060 */ ldc1 $f20, 0x60($sp) -/* B85890 80241710 24020002 */ addiu $v0, $zero, 2 -/* B85894 80241714 03E00008 */ jr $ra -/* B85898 80241718 27BD0068 */ addiu $sp, $sp, 0x68 -/* B8589C 8024171C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_22/func_80241720_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/func_80241720_B84180.s deleted file mode 100644 index 868fafd822..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/func_80241720_B84180.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241720_B858A0 -/* B858A0 80241720 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B858A4 80241724 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B858A8 80241728 4485A000 */ mtc1 $a1, $f20 -/* B858AC 8024172C F7B60020 */ sdc1 $f22, 0x20($sp) -/* B858B0 80241730 4486B000 */ mtc1 $a2, $f22 -/* B858B4 80241734 AFB00010 */ sw $s0, 0x10($sp) -/* B858B8 80241738 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B858BC 8024173C 4487C000 */ mtc1 $a3, $f24 -/* B858C0 80241740 AFBF0014 */ sw $ra, 0x14($sp) -/* B858C4 80241744 0C019D28 */ jal guMtxIdentF -/* B858C8 80241748 0080802D */ daddu $s0, $a0, $zero -/* B858CC 8024174C 4616A582 */ mul.s $f22, $f20, $f22 -/* B858D0 80241750 00000000 */ nop -/* B858D4 80241754 4618A502 */ mul.s $f20, $f20, $f24 -/* B858D8 80241758 00000000 */ nop -/* B858DC 8024175C 3C013F80 */ lui $at, 0x3f80 -/* B858E0 80241760 44810000 */ mtc1 $at, $f0 -/* B858E4 80241764 00000000 */ nop -/* B858E8 80241768 E6000014 */ swc1 $f0, 0x14($s0) -/* B858EC 8024176C E6160010 */ swc1 $f22, 0x10($s0) -/* B858F0 80241770 E6140018 */ swc1 $f20, 0x18($s0) -/* B858F4 80241774 8FBF0014 */ lw $ra, 0x14($sp) -/* B858F8 80241778 8FB00010 */ lw $s0, 0x10($sp) -/* B858FC 8024177C D7B80028 */ ldc1 $f24, 0x28($sp) -/* B85900 80241780 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B85904 80241784 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B85908 80241788 03E00008 */ jr $ra -/* B8590C 8024178C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kgr/kgr_02/func_80240160_8AA450.s b/asm/nonmatchings/world/area_kgr/kgr_02/func_80240160_8AA450.s deleted file mode 100644 index 0c6d8965aa..0000000000 --- a/asm/nonmatchings/world/area_kgr/kgr_02/func_80240160_8AA450.s +++ /dev/null @@ -1,389 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240160_8AA5B0 -/* 8AA5B0 80240160 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8AA5B4 80240164 AFB70044 */ sw $s7, 0x44($sp) -/* 8AA5B8 80240168 0080B82D */ daddu $s7, $a0, $zero -/* 8AA5BC 8024016C 3C028024 */ lui $v0, 0x8024 -/* 8AA5C0 80240170 24420970 */ addiu $v0, $v0, 0x970 -/* 8AA5C4 80240174 AFBF004C */ sw $ra, 0x4c($sp) -/* 8AA5C8 80240178 AFBE0048 */ sw $fp, 0x48($sp) -/* 8AA5CC 8024017C AFB60040 */ sw $s6, 0x40($sp) -/* 8AA5D0 80240180 AFB5003C */ sw $s5, 0x3c($sp) -/* 8AA5D4 80240184 AFB40038 */ sw $s4, 0x38($sp) -/* 8AA5D8 80240188 AFB30034 */ sw $s3, 0x34($sp) -/* 8AA5DC 8024018C AFB20030 */ sw $s2, 0x30($sp) -/* 8AA5E0 80240190 AFB1002C */ sw $s1, 0x2c($sp) -/* 8AA5E4 80240194 AFB00028 */ sw $s0, 0x28($sp) -/* 8AA5E8 80240198 AFA50054 */ sw $a1, 0x54($sp) -/* 8AA5EC 8024019C 8C430000 */ lw $v1, ($v0) -/* 8AA5F0 802401A0 00C0B02D */ daddu $s6, $a2, $zero -/* 8AA5F4 802401A4 24630005 */ addiu $v1, $v1, 5 -/* 8AA5F8 802401A8 AC430000 */ sw $v1, ($v0) -/* 8AA5FC 802401AC 02F6102A */ slt $v0, $s7, $s6 -/* 8AA600 802401B0 10400152 */ beqz $v0, .L802406FC -/* 8AA604 802401B4 00000000 */ nop -/* 8AA608 802401B8 8FAC0054 */ lw $t4, 0x54($sp) -/* 8AA60C 802401BC 0187102A */ slt $v0, $t4, $a3 -/* 8AA610 802401C0 1040014E */ beqz $v0, .L802406FC -/* 8AA614 802401C4 00000000 */ nop -/* 8AA618 802401C8 06E20001 */ bltzl $s7, .L802401D0 -/* 8AA61C 802401CC 0000B82D */ daddu $s7, $zero, $zero -.L802401D0: -/* 8AA620 802401D0 8FAD0054 */ lw $t5, 0x54($sp) -/* 8AA624 802401D4 05A20001 */ bltzl $t5, .L802401DC -/* 8AA628 802401D8 AFA00054 */ sw $zero, 0x54($sp) -.L802401DC: -/* 8AA62C 802401DC 06C20001 */ bltzl $s6, .L802401E4 -/* 8AA630 802401E0 0000B02D */ daddu $s6, $zero, $zero -.L802401E4: -/* 8AA634 802401E4 04E20001 */ bltzl $a3, .L802401EC -/* 8AA638 802401E8 0000382D */ daddu $a3, $zero, $zero -.L802401EC: -/* 8AA63C 802401EC 2AE20140 */ slti $v0, $s7, 0x140 -/* 8AA640 802401F0 50400001 */ beql $v0, $zero, .L802401F8 -/* 8AA644 802401F4 2417013F */ addiu $s7, $zero, 0x13f -.L802401F8: -/* 8AA648 802401F8 8FAC0054 */ lw $t4, 0x54($sp) -/* 8AA64C 802401FC 298200F0 */ slti $v0, $t4, 0xf0 -/* 8AA650 80240200 14400003 */ bnez $v0, .L80240210 -/* 8AA654 80240204 2AC20140 */ slti $v0, $s6, 0x140 -/* 8AA658 80240208 240D00EF */ addiu $t5, $zero, 0xef -/* 8AA65C 8024020C AFAD0054 */ sw $t5, 0x54($sp) -.L80240210: -/* 8AA660 80240210 50400001 */ beql $v0, $zero, .L80240218 -/* 8AA664 80240214 2416013F */ addiu $s6, $zero, 0x13f -.L80240218: -/* 8AA668 80240218 28E200F0 */ slti $v0, $a3, 0xf0 -/* 8AA66C 8024021C 50400001 */ beql $v0, $zero, .L80240224 -/* 8AA670 80240220 240700EF */ addiu $a3, $zero, 0xef -.L80240224: -/* 8AA674 80240224 12F60135 */ beq $s7, $s6, .L802406FC -/* 8AA678 80240228 00000000 */ nop -/* 8AA67C 8024022C 8FAC0054 */ lw $t4, 0x54($sp) -/* 8AA680 80240230 11870132 */ beq $t4, $a3, .L802406FC -/* 8AA684 80240234 00000000 */ nop -/* 8AA688 80240238 06E10002 */ bgez $s7, .L80240244 -/* 8AA68C 8024023C 02E0102D */ daddu $v0, $s7, $zero -/* 8AA690 80240240 26E20003 */ addiu $v0, $s7, 3 -.L80240244: -/* 8AA694 80240244 00021083 */ sra $v0, $v0, 2 -/* 8AA698 80240248 0002B880 */ sll $s7, $v0, 2 -/* 8AA69C 8024024C 06C10002 */ bgez $s6, .L80240258 -/* 8AA6A0 80240250 02C0102D */ daddu $v0, $s6, $zero -/* 8AA6A4 80240254 26C20003 */ addiu $v0, $s6, 3 -.L80240258: -/* 8AA6A8 80240258 00021083 */ sra $v0, $v0, 2 -/* 8AA6AC 8024025C 00021080 */ sll $v0, $v0, 2 -/* 8AA6B0 80240260 24560004 */ addiu $s6, $v0, 4 -/* 8AA6B4 80240264 3C052AAA */ lui $a1, 0x2aaa -/* 8AA6B8 80240268 34A5AAAB */ ori $a1, $a1, 0xaaab -/* 8AA6BC 8024026C 3C06800A */ lui $a2, 0x800a -/* 8AA6C0 80240270 24C6A66C */ addiu $a2, $a2, -0x5994 -/* 8AA6C4 80240274 8CC20000 */ lw $v0, ($a2) -/* 8AA6C8 80240278 0000F02D */ daddu $fp, $zero, $zero -/* 8AA6CC 8024027C 0040202D */ daddu $a0, $v0, $zero -/* 8AA6D0 80240280 24420008 */ addiu $v0, $v0, 8 -/* 8AA6D4 80240284 ACC20000 */ sw $v0, ($a2) -/* 8AA6D8 80240288 8FAD0054 */ lw $t5, 0x54($sp) -/* 8AA6DC 8024028C 3C02FA00 */ lui $v0, 0xfa00 -/* 8AA6E0 80240290 00ED1823 */ subu $v1, $a3, $t5 -/* 8AA6E4 80240294 00650018 */ mult $v1, $a1 -/* 8AA6E8 80240298 AC820000 */ sw $v0, ($a0) -/* 8AA6EC 8024029C 2402FFFF */ addiu $v0, $zero, -1 -/* 8AA6F0 802402A0 AC820004 */ sw $v0, 4($a0) -/* 8AA6F4 802402A4 000317C3 */ sra $v0, $v1, 0x1f -/* 8AA6F8 802402A8 00006010 */ mfhi $t4 -/* 8AA6FC 802402AC 01826023 */ subu $t4, $t4, $v0 -/* 8AA700 802402B0 AFAC0014 */ sw $t4, 0x14($sp) -/* 8AA704 802402B4 0180682D */ daddu $t5, $t4, $zero -/* 8AA708 802402B8 000D1040 */ sll $v0, $t5, 1 -/* 8AA70C 802402BC 004D1021 */ addu $v0, $v0, $t5 -/* 8AA710 802402C0 00021040 */ sll $v0, $v0, 1 -/* 8AA714 802402C4 3C0C800A */ lui $t4, 0x800a -/* 8AA718 802402C8 8D8CA64C */ lw $t4, -0x59b4($t4) -/* 8AA71C 802402CC 00621823 */ subu $v1, $v1, $v0 -/* 8AA720 802402D0 AFAD0010 */ sw $t5, 0x10($sp) -/* 8AA724 802402D4 AFA30014 */ sw $v1, 0x14($sp) -/* 8AA728 802402D8 19A00099 */ blez $t5, .L80240540 -/* 8AA72C 802402DC AFAC0018 */ sw $t4, 0x18($sp) -/* 8AA730 802402E0 00C0A02D */ daddu $s4, $a2, $zero -/* 8AA734 802402E4 02D71023 */ subu $v0, $s6, $s7 -/* 8AA738 802402E8 00021040 */ sll $v0, $v0, 1 -/* 8AA73C 802402EC 24420007 */ addiu $v0, $v0, 7 -/* 8AA740 802402F0 000210C3 */ sra $v0, $v0, 3 -/* 8AA744 802402F4 304201FF */ andi $v0, $v0, 0x1ff -/* 8AA748 802402F8 00021240 */ sll $v0, $v0, 9 -/* 8AA74C 802402FC 3C03F510 */ lui $v1, 0xf510 -/* 8AA750 80240300 00431025 */ or $v0, $v0, $v1 -/* 8AA754 80240304 AFA2001C */ sw $v0, 0x1c($sp) -/* 8AA758 80240308 26E20200 */ addiu $v0, $s7, 0x200 -/* 8AA75C 8024030C 8FB50054 */ lw $s5, 0x54($sp) -/* 8AA760 80240310 00021080 */ sll $v0, $v0, 2 -/* 8AA764 80240314 AFA20020 */ sw $v0, 0x20($sp) -/* 8AA768 80240318 AFA00024 */ sw $zero, 0x24($sp) -/* 8AA76C 8024031C 3C03FD10 */ lui $v1, 0xfd10 -.L80240320: -/* 8AA770 80240320 3463013F */ ori $v1, $v1, 0x13f -/* 8AA774 80240324 8E820000 */ lw $v0, ($s4) -/* 8AA778 80240328 8FA40018 */ lw $a0, 0x18($sp) -/* 8AA77C 8024032C 0040802D */ daddu $s0, $v0, $zero -/* 8AA780 80240330 24420008 */ addiu $v0, $v0, 8 -/* 8AA784 80240334 AE820000 */ sw $v0, ($s4) -/* 8AA788 80240338 0C0187A4 */ jal osVirtualToPhysical -/* 8AA78C 8024033C AE030000 */ sw $v1, ($s0) -/* 8AA790 80240340 3C040700 */ lui $a0, 0x700 -/* 8AA794 80240344 8E830000 */ lw $v1, ($s4) -/* 8AA798 80240348 34840090 */ ori $a0, $a0, 0x90 -/* 8AA79C 8024034C AE020004 */ sw $v0, 4($s0) -/* 8AA7A0 80240350 00178080 */ sll $s0, $s7, 2 -/* 8AA7A4 80240354 32100FFF */ andi $s0, $s0, 0xfff -/* 8AA7A8 80240358 00108300 */ sll $s0, $s0, 0xc -/* 8AA7AC 8024035C 00159080 */ sll $s2, $s5, 2 -/* 8AA7B0 80240360 32530FFF */ andi $s3, $s2, 0xfff -/* 8AA7B4 80240364 26A50005 */ addiu $a1, $s5, 5 -/* 8AA7B8 80240368 00052880 */ sll $a1, $a1, 2 -/* 8AA7BC 8024036C 30A50FFF */ andi $a1, $a1, 0xfff -/* 8AA7C0 80240370 3C11F200 */ lui $s1, 0xf200 -/* 8AA7C4 80240374 0060102D */ daddu $v0, $v1, $zero -/* 8AA7C8 80240378 24630008 */ addiu $v1, $v1, 8 -/* 8AA7CC 8024037C AE830000 */ sw $v1, ($s4) -/* 8AA7D0 80240380 8FAD001C */ lw $t5, 0x1c($sp) -/* 8AA7D4 80240384 02718825 */ or $s1, $s3, $s1 -/* 8AA7D8 80240388 AC440004 */ sw $a0, 4($v0) -/* 8AA7DC 8024038C 26C4FFFF */ addiu $a0, $s6, -1 -/* 8AA7E0 80240390 00042080 */ sll $a0, $a0, 2 -/* 8AA7E4 80240394 30840FFF */ andi $a0, $a0, 0xfff -/* 8AA7E8 80240398 00042300 */ sll $a0, $a0, 0xc -/* 8AA7EC 8024039C AC4D0000 */ sw $t5, ($v0) -/* 8AA7F0 802403A0 24620008 */ addiu $v0, $v1, 8 -/* 8AA7F4 802403A4 AE820000 */ sw $v0, ($s4) -/* 8AA7F8 802403A8 3C02E600 */ lui $v0, 0xe600 -/* 8AA7FC 802403AC AC620000 */ sw $v0, ($v1) -/* 8AA800 802403B0 24620010 */ addiu $v0, $v1, 0x10 -/* 8AA804 802403B4 AC600004 */ sw $zero, 4($v1) -/* 8AA808 802403B8 AE820000 */ sw $v0, ($s4) -/* 8AA80C 802403BC 3C02F400 */ lui $v0, 0xf400 -/* 8AA810 802403C0 02621025 */ or $v0, $s3, $v0 -/* 8AA814 802403C4 02021025 */ or $v0, $s0, $v0 -/* 8AA818 802403C8 AC620008 */ sw $v0, 8($v1) -/* 8AA81C 802403CC 3C020700 */ lui $v0, 0x700 -/* 8AA820 802403D0 00A21025 */ or $v0, $a1, $v0 -/* 8AA824 802403D4 00821025 */ or $v0, $a0, $v0 -/* 8AA828 802403D8 AC62000C */ sw $v0, 0xc($v1) -/* 8AA82C 802403DC 24620018 */ addiu $v0, $v1, 0x18 -/* 8AA830 802403E0 AE820000 */ sw $v0, ($s4) -/* 8AA834 802403E4 3C02E700 */ lui $v0, 0xe700 -/* 8AA838 802403E8 AC620010 */ sw $v0, 0x10($v1) -/* 8AA83C 802403EC 24620020 */ addiu $v0, $v1, 0x20 -/* 8AA840 802403F0 AC600014 */ sw $zero, 0x14($v1) -/* 8AA844 802403F4 AE820000 */ sw $v0, ($s4) -/* 8AA848 802403F8 24020090 */ addiu $v0, $zero, 0x90 -/* 8AA84C 802403FC AC62001C */ sw $v0, 0x1c($v1) -/* 8AA850 80240400 24620028 */ addiu $v0, $v1, 0x28 -/* 8AA854 80240404 AC6D0018 */ sw $t5, 0x18($v1) -/* 8AA858 80240408 AE820000 */ sw $v0, ($s4) -/* 8AA85C 8024040C 02111025 */ or $v0, $s0, $s1 -/* 8AA860 80240410 AC620020 */ sw $v0, 0x20($v1) -/* 8AA864 80240414 3C028024 */ lui $v0, 0x8024 -/* 8AA868 80240418 8C420970 */ lw $v0, 0x970($v0) -/* 8AA86C 8024041C 00852025 */ or $a0, $a0, $a1 -/* 8AA870 80240420 AC640024 */ sw $a0, 0x24($v1) -/* 8AA874 80240424 8FAC0024 */ lw $t4, 0x24($sp) -/* 8AA878 80240428 004C1021 */ addu $v0, $v0, $t4 -/* 8AA87C 8024042C 44826000 */ mtc1 $v0, $f12 -/* 8AA880 80240430 00000000 */ nop -/* 8AA884 80240434 46806320 */ cvt.s.w $f12, $f12 -/* 8AA888 80240438 0C00A8BB */ jal sin_deg -/* 8AA88C 8024043C 26520014 */ addiu $s2, $s2, 0x14 -/* 8AA890 80240440 3C070400 */ lui $a3, 0x400 -/* 8AA894 80240444 34E70400 */ ori $a3, $a3, 0x400 -/* 8AA898 80240448 26A20006 */ addiu $v0, $s5, 6 -/* 8AA89C 8024044C 00153140 */ sll $a2, $s5, 5 -/* 8AA8A0 80240450 0040A82D */ daddu $s5, $v0, $zero -/* 8AA8A4 80240454 32520FFF */ andi $s2, $s2, 0xfff -/* 8AA8A8 80240458 02138025 */ or $s0, $s0, $s3 -/* 8AA8AC 8024045C 8FAD0024 */ lw $t5, 0x24($sp) -/* 8AA8B0 80240460 3C014080 */ lui $at, 0x4080 -/* 8AA8B4 80240464 44811000 */ mtc1 $at, $f2 -/* 8AA8B8 80240468 25AD001E */ addiu $t5, $t5, 0x1e -/* 8AA8BC 8024046C AFAD0024 */ sw $t5, 0x24($sp) -/* 8AA8C0 80240470 8E850000 */ lw $a1, ($s4) -/* 8AA8C4 80240474 46020002 */ mul.s $f0, $f0, $f2 -/* 8AA8C8 80240478 00000000 */ nop -/* 8AA8CC 8024047C 00A0202D */ daddu $a0, $a1, $zero -/* 8AA8D0 80240480 24A50008 */ addiu $a1, $a1, 8 -/* 8AA8D4 80240484 24A20008 */ addiu $v0, $a1, 8 -/* 8AA8D8 80240488 AE850000 */ sw $a1, ($s4) -/* 8AA8DC 8024048C AE820000 */ sw $v0, ($s4) -/* 8AA8E0 80240490 4600010D */ trunc.w.s $f4, $f0 -/* 8AA8E4 80240494 44022000 */ mfc1 $v0, $f4 -/* 8AA8E8 80240498 8FAC0060 */ lw $t4, 0x60($sp) -/* 8AA8EC 8024049C 30C6FFFF */ andi $a2, $a2, 0xffff -/* 8AA8F0 802404A0 01820018 */ mult $t4, $v0 -/* 8AA8F4 802404A4 24A20010 */ addiu $v0, $a1, 0x10 -/* 8AA8F8 802404A8 AE820000 */ sw $v0, ($s4) -/* 8AA8FC 802404AC 24A20018 */ addiu $v0, $a1, 0x18 -/* 8AA900 802404B0 AE820000 */ sw $v0, ($s4) -/* 8AA904 802404B4 8FAD0020 */ lw $t5, 0x20($sp) -/* 8AA908 802404B8 00006012 */ mflo $t4 -/* 8AA90C 802404BC 01AC1821 */ addu $v1, $t5, $t4 -/* 8AA910 802404C0 30620FFF */ andi $v0, $v1, 0xfff -/* 8AA914 802404C4 00021300 */ sll $v0, $v0, 0xc -/* 8AA918 802404C8 00511025 */ or $v0, $v0, $s1 -/* 8AA91C 802404CC 24630800 */ addiu $v1, $v1, 0x800 -/* 8AA920 802404D0 30630FFF */ andi $v1, $v1, 0xfff -/* 8AA924 802404D4 00031B00 */ sll $v1, $v1, 0xc -/* 8AA928 802404D8 00721825 */ or $v1, $v1, $s2 -/* 8AA92C 802404DC AC830004 */ sw $v1, 4($a0) -/* 8AA930 802404E0 00161880 */ sll $v1, $s6, 2 -/* 8AA934 802404E4 30630FFF */ andi $v1, $v1, 0xfff -/* 8AA938 802404E8 00031B00 */ sll $v1, $v1, 0xc -/* 8AA93C 802404EC AC820000 */ sw $v0, ($a0) -/* 8AA940 802404F0 00151080 */ sll $v0, $s5, 2 -/* 8AA944 802404F4 30420FFF */ andi $v0, $v0, 0xfff -/* 8AA948 802404F8 3C04E400 */ lui $a0, 0xe400 -/* 8AA94C 802404FC 00441025 */ or $v0, $v0, $a0 -/* 8AA950 80240500 00621825 */ or $v1, $v1, $v0 -/* 8AA954 80240504 3C02E100 */ lui $v0, 0xe100 -/* 8AA958 80240508 ACA20008 */ sw $v0, 8($a1) -/* 8AA95C 8024050C 00171540 */ sll $v0, $s7, 0x15 -/* 8AA960 80240510 00461025 */ or $v0, $v0, $a2 -/* 8AA964 80240514 ACA2000C */ sw $v0, 0xc($a1) -/* 8AA968 80240518 3C02F100 */ lui $v0, 0xf100 -/* 8AA96C 8024051C ACA30000 */ sw $v1, ($a1) -/* 8AA970 80240520 ACB00004 */ sw $s0, 4($a1) -/* 8AA974 80240524 ACA20010 */ sw $v0, 0x10($a1) -/* 8AA978 80240528 ACA70014 */ sw $a3, 0x14($a1) -/* 8AA97C 8024052C 8FAD0010 */ lw $t5, 0x10($sp) -/* 8AA980 80240530 27DE0001 */ addiu $fp, $fp, 1 -/* 8AA984 80240534 03CD102A */ slt $v0, $fp, $t5 -/* 8AA988 80240538 1440FF79 */ bnez $v0, .L80240320 -/* 8AA98C 8024053C 3C03FD10 */ lui $v1, 0xfd10 -.L80240540: -/* 8AA990 80240540 8FAC0014 */ lw $t4, 0x14($sp) -/* 8AA994 80240544 1180006D */ beqz $t4, .L802406FC -/* 8AA998 80240548 3C03FD10 */ lui $v1, 0xfd10 -/* 8AA99C 8024054C 3463013F */ ori $v1, $v1, 0x13f -/* 8AA9A0 80240550 3C10800A */ lui $s0, 0x800a -/* 8AA9A4 80240554 2610A66C */ addiu $s0, $s0, -0x5994 -/* 8AA9A8 80240558 8E020000 */ lw $v0, ($s0) -/* 8AA9AC 8024055C 8FA40018 */ lw $a0, 0x18($sp) -/* 8AA9B0 80240560 0040882D */ daddu $s1, $v0, $zero -/* 8AA9B4 80240564 24420008 */ addiu $v0, $v0, 8 -/* 8AA9B8 80240568 AE020000 */ sw $v0, ($s0) -/* 8AA9BC 8024056C 0C0187A4 */ jal osVirtualToPhysical -/* 8AA9C0 80240570 AE230000 */ sw $v1, ($s1) -/* 8AA9C4 80240574 3C060700 */ lui $a2, 0x700 -/* 8AA9C8 80240578 34C60090 */ ori $a2, $a2, 0x90 -/* 8AA9CC 8024057C 3C0B0400 */ lui $t3, 0x400 -/* 8AA9D0 80240580 356B0400 */ ori $t3, $t3, 0x400 -/* 8AA9D4 80240584 02D72823 */ subu $a1, $s6, $s7 -/* 8AA9D8 80240588 00052840 */ sll $a1, $a1, 1 -/* 8AA9DC 8024058C 24A50007 */ addiu $a1, $a1, 7 -/* 8AA9E0 80240590 000528C3 */ sra $a1, $a1, 3 -/* 8AA9E4 80240594 30A501FF */ andi $a1, $a1, 0x1ff -/* 8AA9E8 80240598 8E040000 */ lw $a0, ($s0) -/* 8AA9EC 8024059C 00052A40 */ sll $a1, $a1, 9 -/* 8AA9F0 802405A0 AE220004 */ sw $v0, 4($s1) -/* 8AA9F4 802405A4 3C02F510 */ lui $v0, 0xf510 -/* 8AA9F8 802405A8 00A22825 */ or $a1, $a1, $v0 -/* 8AA9FC 802405AC 00174880 */ sll $t1, $s7, 2 -/* 8AAA00 802405B0 31290FFF */ andi $t1, $t1, 0xfff -/* 8AAA04 802405B4 00094B00 */ sll $t1, $t1, 0xc -/* 8AAA08 802405B8 001E3840 */ sll $a3, $fp, 1 -/* 8AAA0C 802405BC 00FE3821 */ addu $a3, $a3, $fp -/* 8AAA10 802405C0 00073840 */ sll $a3, $a3, 1 -/* 8AAA14 802405C4 0080182D */ daddu $v1, $a0, $zero -/* 8AAA18 802405C8 24840008 */ addiu $a0, $a0, 8 -/* 8AAA1C 802405CC 24820008 */ addiu $v0, $a0, 8 -/* 8AAA20 802405D0 AE040000 */ sw $a0, ($s0) -/* 8AAA24 802405D4 AC650000 */ sw $a1, ($v1) -/* 8AAA28 802405D8 AC660004 */ sw $a2, 4($v1) -/* 8AAA2C 802405DC AE020000 */ sw $v0, ($s0) -/* 8AAA30 802405E0 3C02E600 */ lui $v0, 0xe600 -/* 8AAA34 802405E4 AC820000 */ sw $v0, ($a0) -/* 8AAA38 802405E8 24820010 */ addiu $v0, $a0, 0x10 -/* 8AAA3C 802405EC AC800004 */ sw $zero, 4($a0) -/* 8AAA40 802405F0 AE020000 */ sw $v0, ($s0) -/* 8AAA44 802405F4 3C02F400 */ lui $v0, 0xf400 -/* 8AAA48 802405F8 26C3FFFF */ addiu $v1, $s6, -1 -/* 8AAA4C 802405FC 00031880 */ sll $v1, $v1, 2 -/* 8AAA50 80240600 30630FFF */ andi $v1, $v1, 0xfff -/* 8AAA54 80240604 8FAD0054 */ lw $t5, 0x54($sp) -/* 8AAA58 80240608 00031B00 */ sll $v1, $v1, 0xc -/* 8AAA5C 8024060C 01A73821 */ addu $a3, $t5, $a3 -/* 8AAA60 80240610 00075080 */ sll $t2, $a3, 2 -/* 8AAA64 80240614 314A0FFF */ andi $t2, $t2, 0xfff -/* 8AAA68 80240618 01421025 */ or $v0, $t2, $v0 -/* 8AAA6C 8024061C 01221025 */ or $v0, $t1, $v0 -/* 8AAA70 80240620 AC820008 */ sw $v0, 8($a0) -/* 8AAA74 80240624 8FAC0014 */ lw $t4, 0x14($sp) -/* 8AAA78 80240628 3C020700 */ lui $v0, 0x700 -/* 8AAA7C 8024062C 00EC3021 */ addu $a2, $a3, $t4 -/* 8AAA80 80240630 24C8FFFF */ addiu $t0, $a2, -1 -/* 8AAA84 80240634 00084080 */ sll $t0, $t0, 2 -/* 8AAA88 80240638 31080FFF */ andi $t0, $t0, 0xfff -/* 8AAA8C 8024063C 01021025 */ or $v0, $t0, $v0 -/* 8AAA90 80240640 00621025 */ or $v0, $v1, $v0 -/* 8AAA94 80240644 AC82000C */ sw $v0, 0xc($a0) -/* 8AAA98 80240648 24820018 */ addiu $v0, $a0, 0x18 -/* 8AAA9C 8024064C AE020000 */ sw $v0, ($s0) -/* 8AAAA0 80240650 3C02E700 */ lui $v0, 0xe700 -/* 8AAAA4 80240654 AC820010 */ sw $v0, 0x10($a0) -/* 8AAAA8 80240658 24820020 */ addiu $v0, $a0, 0x20 -/* 8AAAAC 8024065C AC800014 */ sw $zero, 0x14($a0) -/* 8AAAB0 80240660 AE020000 */ sw $v0, ($s0) -/* 8AAAB4 80240664 24020090 */ addiu $v0, $zero, 0x90 -/* 8AAAB8 80240668 AC82001C */ sw $v0, 0x1c($a0) -/* 8AAABC 8024066C 24820028 */ addiu $v0, $a0, 0x28 -/* 8AAAC0 80240670 AC850018 */ sw $a1, 0x18($a0) -/* 8AAAC4 80240674 AE020000 */ sw $v0, ($s0) -/* 8AAAC8 80240678 3C02F200 */ lui $v0, 0xf200 -/* 8AAACC 8024067C 01421025 */ or $v0, $t2, $v0 -/* 8AAAD0 80240680 01221025 */ or $v0, $t1, $v0 -/* 8AAAD4 80240684 00681825 */ or $v1, $v1, $t0 -/* 8AAAD8 80240688 AC820020 */ sw $v0, 0x20($a0) -/* 8AAADC 8024068C 24820030 */ addiu $v0, $a0, 0x30 -/* 8AAAE0 80240690 AC830024 */ sw $v1, 0x24($a0) -/* 8AAAE4 80240694 AE020000 */ sw $v0, ($s0) -/* 8AAAE8 80240698 00161080 */ sll $v0, $s6, 2 -/* 8AAAEC 8024069C 30420FFF */ andi $v0, $v0, 0xfff -/* 8AAAF0 802406A0 00021300 */ sll $v0, $v0, 0xc -/* 8AAAF4 802406A4 00063080 */ sll $a2, $a2, 2 -/* 8AAAF8 802406A8 30C60FFF */ andi $a2, $a2, 0xfff -/* 8AAAFC 802406AC 3C03E400 */ lui $v1, 0xe400 -/* 8AAB00 802406B0 00C33025 */ or $a2, $a2, $v1 -/* 8AAB04 802406B4 00461025 */ or $v0, $v0, $a2 -/* 8AAB08 802406B8 012A4825 */ or $t1, $t1, $t2 -/* 8AAB0C 802406BC AC820028 */ sw $v0, 0x28($a0) -/* 8AAB10 802406C0 24820038 */ addiu $v0, $a0, 0x38 -/* 8AAB14 802406C4 AC89002C */ sw $t1, 0x2c($a0) -/* 8AAB18 802406C8 AE020000 */ sw $v0, ($s0) -/* 8AAB1C 802406CC 3C02E100 */ lui $v0, 0xe100 -/* 8AAB20 802406D0 AC820030 */ sw $v0, 0x30($a0) -/* 8AAB24 802406D4 00171540 */ sll $v0, $s7, 0x15 -/* 8AAB28 802406D8 00073940 */ sll $a3, $a3, 5 -/* 8AAB2C 802406DC 30E7FFFF */ andi $a3, $a3, 0xffff -/* 8AAB30 802406E0 00471025 */ or $v0, $v0, $a3 -/* 8AAB34 802406E4 AC820034 */ sw $v0, 0x34($a0) -/* 8AAB38 802406E8 24820040 */ addiu $v0, $a0, 0x40 -/* 8AAB3C 802406EC AE020000 */ sw $v0, ($s0) -/* 8AAB40 802406F0 3C02F100 */ lui $v0, 0xf100 -/* 8AAB44 802406F4 AC820038 */ sw $v0, 0x38($a0) -/* 8AAB48 802406F8 AC8B003C */ sw $t3, 0x3c($a0) -.L802406FC: -/* 8AAB4C 802406FC 8FBF004C */ lw $ra, 0x4c($sp) -/* 8AAB50 80240700 8FBE0048 */ lw $fp, 0x48($sp) -/* 8AAB54 80240704 8FB70044 */ lw $s7, 0x44($sp) -/* 8AAB58 80240708 8FB60040 */ lw $s6, 0x40($sp) -/* 8AAB5C 8024070C 8FB5003C */ lw $s5, 0x3c($sp) -/* 8AAB60 80240710 8FB40038 */ lw $s4, 0x38($sp) -/* 8AAB64 80240714 8FB30034 */ lw $s3, 0x34($sp) -/* 8AAB68 80240718 8FB20030 */ lw $s2, 0x30($sp) -/* 8AAB6C 8024071C 8FB1002C */ lw $s1, 0x2c($sp) -/* 8AAB70 80240720 8FB00028 */ lw $s0, 0x28($sp) -/* 8AAB74 80240724 03E00008 */ jr $ra -/* 8AAB78 80240728 27BD0050 */ addiu $sp, $sp, 0x50 -/* 8AAB7C 8024072C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kgr/kgr_02/func_80240748_8AA450.s b/asm/nonmatchings/world/area_kgr/kgr_02/func_80240748_8AA450.s deleted file mode 100644 index 067f21531f..0000000000 --- a/asm/nonmatchings/world/area_kgr/kgr_02/func_80240748_8AA450.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240748_8AAB98 -/* 8AAB98 80240748 3C028011 */ lui $v0, 0x8011 -/* 8AAB9C 8024074C 8042EBB3 */ lb $v0, -0x144d($v0) -/* 8AABA0 80240750 38420006 */ xori $v0, $v0, 6 -/* 8AABA4 80240754 0002102B */ sltu $v0, $zero, $v0 -/* 8AABA8 80240758 03E00008 */ jr $ra -/* 8AABAC 8024075C 00021040 */ sll $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_kgr/kgr_02/func_80240760_8AA450.s b/asm/nonmatchings/world/area_kgr/kgr_02/func_80240760_8AA450.s deleted file mode 100644 index 76280e9c43..0000000000 --- a/asm/nonmatchings/world/area_kgr/kgr_02/func_80240760_8AA450.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240760_8AABB0 -/* 8AABB0 80240760 3C028016 */ lui $v0, 0x8016 -/* 8AABB4 80240764 8442A568 */ lh $v0, -0x5a98($v0) -/* 8AABB8 80240768 04400002 */ bltz $v0, .L80240774 -/* 8AABBC 8024076C 24020001 */ addiu $v0, $zero, 1 -/* 8AABC0 80240770 AC820088 */ sw $v0, 0x88($a0) -.L80240774: -/* 8AABC4 80240774 03E00008 */ jr $ra -/* 8AABC8 80240778 24020002 */ addiu $v0, $zero, 2 -/* 8AABCC 8024077C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/func_80240040_ABB290.s b/asm/nonmatchings/world/area_kkj/kkj_00/func_80240040_ABB290.s deleted file mode 100644 index 25a332ddba..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/func_80240040_ABB290.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_ABB2D0 -/* ABB2D0 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ABB2D4 80240044 AFBF0014 */ sw $ra, 0x14($sp) -/* ABB2D8 80240048 AFB00010 */ sw $s0, 0x10($sp) -/* ABB2DC 8024004C 8C82000C */ lw $v0, 0xc($a0) -/* ABB2E0 80240050 8C450000 */ lw $a1, ($v0) -/* ABB2E4 80240054 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* ABB2E8 80240058 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* ABB2EC 8024005C 0C0B1EAF */ jal get_variable -/* ABB2F0 80240060 00000000 */ nop -/* ABB2F4 80240064 14400005 */ bnez $v0, .L8024007C -/* ABB2F8 80240068 00000000 */ nop -/* ABB2FC 8024006C 3C028024 */ lui $v0, 0x8024 -/* ABB300 80240070 2442160C */ addiu $v0, $v0, 0x160c -/* ABB304 80240074 08090022 */ j .L80240088 -/* ABB308 80240078 AE0200D0 */ sw $v0, 0xd0($s0) -.L8024007C: -/* ABB30C 8024007C 3C028024 */ lui $v0, 0x8024 -/* ABB310 80240080 2442162C */ addiu $v0, $v0, 0x162c -/* ABB314 80240084 AE0200D0 */ sw $v0, 0xd0($s0) -.L80240088: -/* ABB318 80240088 8E030000 */ lw $v1, ($s0) -/* ABB31C 8024008C 34630010 */ ori $v1, $v1, 0x10 -/* ABB320 80240090 AE030000 */ sw $v1, ($s0) -/* ABB324 80240094 8FBF0014 */ lw $ra, 0x14($sp) -/* ABB328 80240098 8FB00010 */ lw $s0, 0x10($sp) -/* ABB32C 8024009C 24020002 */ addiu $v0, $zero, 2 -/* ABB330 802400A0 03E00008 */ jr $ra -/* ABB334 802400A4 27BD0018 */ addiu $sp, $sp, 0x18 -/* ABB338 802400A8 00000000 */ nop -/* ABB33C 802400AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/func_802400B0_ABB290.s b/asm/nonmatchings/world/area_kkj/kkj_00/func_802400B0_ABB290.s deleted file mode 100644 index 102e9fd5b7..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/func_802400B0_ABB290.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B0_ABB340 -/* ABB340 802400B0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* ABB344 802400B4 AFB50024 */ sw $s5, 0x24($sp) -/* ABB348 802400B8 0080A82D */ daddu $s5, $a0, $zero -/* ABB34C 802400BC AFBF002C */ sw $ra, 0x2c($sp) -/* ABB350 802400C0 AFB60028 */ sw $s6, 0x28($sp) -/* ABB354 802400C4 AFB40020 */ sw $s4, 0x20($sp) -/* ABB358 802400C8 AFB3001C */ sw $s3, 0x1c($sp) -/* ABB35C 802400CC AFB20018 */ sw $s2, 0x18($sp) -/* ABB360 802400D0 AFB10014 */ sw $s1, 0x14($sp) -/* ABB364 802400D4 AFB00010 */ sw $s0, 0x10($sp) -/* ABB368 802400D8 F7B80040 */ sdc1 $f24, 0x40($sp) -/* ABB36C 802400DC F7B60038 */ sdc1 $f22, 0x38($sp) -/* ABB370 802400E0 F7B40030 */ sdc1 $f20, 0x30($sp) -/* ABB374 802400E4 8EB30148 */ lw $s3, 0x148($s5) -/* ABB378 802400E8 86640008 */ lh $a0, 8($s3) -/* ABB37C 802400EC 0C00EABB */ jal get_npc_unsafe -/* ABB380 802400F0 00A0B02D */ daddu $s6, $a1, $zero -/* ABB384 802400F4 0040A02D */ daddu $s4, $v0, $zero -/* ABB388 802400F8 AEA00074 */ sw $zero, 0x74($s5) -/* ABB38C 802400FC C6980038 */ lwc1 $f24, 0x38($s4) -/* ABB390 80240100 C6960040 */ lwc1 $f22, 0x40($s4) -/* ABB394 80240104 0000902D */ daddu $s2, $zero, $zero -/* ABB398 80240108 AEA00078 */ sw $zero, 0x78($s5) -/* ABB39C 8024010C 8E6300D0 */ lw $v1, 0xd0($s3) -/* ABB3A0 80240110 8C620000 */ lw $v0, ($v1) -/* ABB3A4 80240114 3C0146FF */ lui $at, 0x46ff -/* ABB3A8 80240118 3421FE00 */ ori $at, $at, 0xfe00 -/* ABB3AC 8024011C 4481A000 */ mtc1 $at, $f20 -/* ABB3B0 80240120 18400018 */ blez $v0, .L80240184 -/* ABB3B4 80240124 0240802D */ daddu $s0, $s2, $zero -/* ABB3B8 80240128 0240882D */ daddu $s1, $s2, $zero -.L8024012C: -/* ABB3BC 8024012C 02231021 */ addu $v0, $s1, $v1 -/* ABB3C0 80240130 4600C306 */ mov.s $f12, $f24 -/* ABB3C4 80240134 C4440004 */ lwc1 $f4, 4($v0) -/* ABB3C8 80240138 46802120 */ cvt.s.w $f4, $f4 -/* ABB3CC 8024013C 44062000 */ mfc1 $a2, $f4 -/* ABB3D0 80240140 C444000C */ lwc1 $f4, 0xc($v0) -/* ABB3D4 80240144 46802120 */ cvt.s.w $f4, $f4 -/* ABB3D8 80240148 44072000 */ mfc1 $a3, $f4 -/* ABB3DC 8024014C 0C00A7B5 */ jal dist2D -/* ABB3E0 80240150 4600B386 */ mov.s $f14, $f22 -/* ABB3E4 80240154 4614003C */ c.lt.s $f0, $f20 -/* ABB3E8 80240158 00000000 */ nop -/* ABB3EC 8024015C 45000003 */ bc1f .L8024016C -/* ABB3F0 80240160 2631000C */ addiu $s1, $s1, 0xc -/* ABB3F4 80240164 46000506 */ mov.s $f20, $f0 -/* ABB3F8 80240168 AEB20078 */ sw $s2, 0x78($s5) -.L8024016C: -/* ABB3FC 8024016C 8E6300D0 */ lw $v1, 0xd0($s3) -/* ABB400 80240170 26100001 */ addiu $s0, $s0, 1 -/* ABB404 80240174 8C620000 */ lw $v0, ($v1) -/* ABB408 80240178 0202102A */ slt $v0, $s0, $v0 -/* ABB40C 8024017C 1440FFEB */ bnez $v0, .L8024012C -/* ABB410 80240180 26520001 */ addiu $s2, $s2, 1 -.L80240184: -/* ABB414 80240184 8E6200CC */ lw $v0, 0xcc($s3) -/* ABB418 80240188 8C420004 */ lw $v0, 4($v0) -/* ABB41C 8024018C AE820028 */ sw $v0, 0x28($s4) -/* ABB420 80240190 8E6200D0 */ lw $v0, 0xd0($s3) -/* ABB424 80240194 8C42007C */ lw $v0, 0x7c($v0) -/* ABB428 80240198 04410004 */ bgez $v0, .L802401AC -/* ABB42C 8024019C 00000000 */ nop -/* ABB430 802401A0 C6C00000 */ lwc1 $f0, ($s6) -/* ABB434 802401A4 08090073 */ j .L802401CC -/* ABB438 802401A8 E6800018 */ swc1 $f0, 0x18($s4) -.L802401AC: -/* ABB43C 802401AC 3C018025 */ lui $at, 0x8025 -/* ABB440 802401B0 D4229D30 */ ldc1 $f2, -0x62d0($at) -/* ABB444 802401B4 44820000 */ mtc1 $v0, $f0 -/* ABB448 802401B8 00000000 */ nop -/* ABB44C 802401BC 46800021 */ cvt.d.w $f0, $f0 -/* ABB450 802401C0 46220003 */ div.d $f0, $f0, $f2 -/* ABB454 802401C4 46200020 */ cvt.s.d $f0, $f0 -/* ABB458 802401C8 E6800018 */ swc1 $f0, 0x18($s4) -.L802401CC: -/* ABB45C 802401CC 24020001 */ addiu $v0, $zero, 1 -/* ABB460 802401D0 AEA20070 */ sw $v0, 0x70($s5) -/* ABB464 802401D4 8FBF002C */ lw $ra, 0x2c($sp) -/* ABB468 802401D8 8FB60028 */ lw $s6, 0x28($sp) -/* ABB46C 802401DC 8FB50024 */ lw $s5, 0x24($sp) -/* ABB470 802401E0 8FB40020 */ lw $s4, 0x20($sp) -/* ABB474 802401E4 8FB3001C */ lw $s3, 0x1c($sp) -/* ABB478 802401E8 8FB20018 */ lw $s2, 0x18($sp) -/* ABB47C 802401EC 8FB10014 */ lw $s1, 0x14($sp) -/* ABB480 802401F0 8FB00010 */ lw $s0, 0x10($sp) -/* ABB484 802401F4 D7B80040 */ ldc1 $f24, 0x40($sp) -/* ABB488 802401F8 D7B60038 */ ldc1 $f22, 0x38($sp) -/* ABB48C 802401FC D7B40030 */ ldc1 $f20, 0x30($sp) -/* ABB490 80240200 03E00008 */ jr $ra -/* ABB494 80240204 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/func_80240208_ABB290.s b/asm/nonmatchings/world/area_kkj/kkj_00/func_80240208_ABB290.s deleted file mode 100644 index 98697b4a97..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/func_80240208_ABB290.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240208_ABB498 -/* ABB498 80240208 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* ABB49C 8024020C AFB20038 */ sw $s2, 0x38($sp) -/* ABB4A0 80240210 0080902D */ daddu $s2, $a0, $zero -/* ABB4A4 80240214 AFBF0044 */ sw $ra, 0x44($sp) -/* ABB4A8 80240218 AFB40040 */ sw $s4, 0x40($sp) -/* ABB4AC 8024021C AFB3003C */ sw $s3, 0x3c($sp) -/* ABB4B0 80240220 AFB10034 */ sw $s1, 0x34($sp) -/* ABB4B4 80240224 AFB00030 */ sw $s0, 0x30($sp) -/* ABB4B8 80240228 F7B60050 */ sdc1 $f22, 0x50($sp) -/* ABB4BC 8024022C F7B40048 */ sdc1 $f20, 0x48($sp) -/* ABB4C0 80240230 8E510148 */ lw $s1, 0x148($s2) -/* ABB4C4 80240234 00A0982D */ daddu $s3, $a1, $zero -/* ABB4C8 80240238 86240008 */ lh $a0, 8($s1) -/* ABB4CC 8024023C 0C00EABB */ jal get_npc_unsafe -/* ABB4D0 80240240 00C0A02D */ daddu $s4, $a2, $zero -/* ABB4D4 80240244 8E630014 */ lw $v1, 0x14($s3) -/* ABB4D8 80240248 04600030 */ bltz $v1, .L8024030C -/* ABB4DC 8024024C 0040802D */ daddu $s0, $v0, $zero -/* ABB4E0 80240250 8E420074 */ lw $v0, 0x74($s2) -/* ABB4E4 80240254 1C40002C */ bgtz $v0, .L80240308 -/* ABB4E8 80240258 2442FFFF */ addiu $v0, $v0, -1 -/* ABB4EC 8024025C 0280202D */ daddu $a0, $s4, $zero -/* ABB4F0 80240260 AE430074 */ sw $v1, 0x74($s2) -/* ABB4F4 80240264 AFA00010 */ sw $zero, 0x10($sp) -/* ABB4F8 80240268 8E66000C */ lw $a2, 0xc($s3) -/* ABB4FC 8024026C 8E670010 */ lw $a3, 0x10($s3) -/* ABB500 80240270 0C01242D */ jal func_800490B4 -/* ABB504 80240274 0220282D */ daddu $a1, $s1, $zero -/* ABB508 80240278 10400021 */ beqz $v0, .L80240300 -/* ABB50C 8024027C 0000202D */ daddu $a0, $zero, $zero -/* ABB510 80240280 0200282D */ daddu $a1, $s0, $zero -/* ABB514 80240284 0000302D */ daddu $a2, $zero, $zero -/* ABB518 80240288 860300A8 */ lh $v1, 0xa8($s0) -/* ABB51C 8024028C 3C013F80 */ lui $at, 0x3f80 -/* ABB520 80240290 44810000 */ mtc1 $at, $f0 -/* ABB524 80240294 3C014000 */ lui $at, 0x4000 -/* ABB528 80240298 44811000 */ mtc1 $at, $f2 -/* ABB52C 8024029C 3C01C1A0 */ lui $at, 0xc1a0 -/* ABB530 802402A0 44812000 */ mtc1 $at, $f4 -/* ABB534 802402A4 2402000F */ addiu $v0, $zero, 0xf -/* ABB538 802402A8 AFA2001C */ sw $v0, 0x1c($sp) -/* ABB53C 802402AC 44833000 */ mtc1 $v1, $f6 -/* ABB540 802402B0 00000000 */ nop -/* ABB544 802402B4 468031A0 */ cvt.s.w $f6, $f6 -/* ABB548 802402B8 44073000 */ mfc1 $a3, $f6 -/* ABB54C 802402BC 27A20028 */ addiu $v0, $sp, 0x28 -/* ABB550 802402C0 AFA20020 */ sw $v0, 0x20($sp) -/* ABB554 802402C4 E7A00010 */ swc1 $f0, 0x10($sp) -/* ABB558 802402C8 E7A20014 */ swc1 $f2, 0x14($sp) -/* ABB55C 802402CC 0C01BFA4 */ jal fx_emote -/* ABB560 802402D0 E7A40018 */ swc1 $f4, 0x18($sp) -/* ABB564 802402D4 0200202D */ daddu $a0, $s0, $zero -/* ABB568 802402D8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* ABB56C 802402DC 0C012530 */ jal func_800494C0 -/* ABB570 802402E0 3C060020 */ lui $a2, 0x20 -/* ABB574 802402E4 8E220018 */ lw $v0, 0x18($s1) -/* ABB578 802402E8 9442002A */ lhu $v0, 0x2a($v0) -/* ABB57C 802402EC 30420001 */ andi $v0, $v0, 1 -/* ABB580 802402F0 14400064 */ bnez $v0, .L80240484 -/* ABB584 802402F4 2402000A */ addiu $v0, $zero, 0xa -/* ABB588 802402F8 08090121 */ j .L80240484 -/* ABB58C 802402FC 2402000C */ addiu $v0, $zero, 0xc -.L80240300: -/* ABB590 80240300 8E420074 */ lw $v0, 0x74($s2) -/* ABB594 80240304 2442FFFF */ addiu $v0, $v0, -1 -.L80240308: -/* ABB598 80240308 AE420074 */ sw $v0, 0x74($s2) -.L8024030C: -/* ABB59C 8024030C 8602008C */ lh $v0, 0x8c($s0) -/* ABB5A0 80240310 1440005D */ bnez $v0, .L80240488 -/* ABB5A4 80240314 00000000 */ nop -/* ABB5A8 80240318 C6000018 */ lwc1 $f0, 0x18($s0) -/* ABB5AC 8024031C 3C014010 */ lui $at, 0x4010 -/* ABB5B0 80240320 44811800 */ mtc1 $at, $f3 -/* ABB5B4 80240324 44801000 */ mtc1 $zero, $f2 -/* ABB5B8 80240328 46000021 */ cvt.d.s $f0, $f0 -/* ABB5BC 8024032C 4622003C */ c.lt.d $f0, $f2 -/* ABB5C0 80240330 00000000 */ nop -/* ABB5C4 80240334 45000003 */ bc1f .L80240344 -/* ABB5C8 80240338 0200202D */ daddu $a0, $s0, $zero -/* ABB5CC 8024033C 080900D2 */ j .L80240348 -/* ABB5D0 80240340 0000282D */ daddu $a1, $zero, $zero -.L80240344: -/* ABB5D4 80240344 24050001 */ addiu $a1, $zero, 1 -.L80240348: -/* ABB5D8 80240348 0C00F598 */ jal func_8003D660 -/* ABB5DC 8024034C 00000000 */ nop -/* ABB5E0 80240350 C60C0038 */ lwc1 $f12, 0x38($s0) -/* ABB5E4 80240354 8E430078 */ lw $v1, 0x78($s2) -/* ABB5E8 80240358 C60E0040 */ lwc1 $f14, 0x40($s0) -/* ABB5EC 8024035C 00031040 */ sll $v0, $v1, 1 -/* ABB5F0 80240360 00431021 */ addu $v0, $v0, $v1 -/* ABB5F4 80240364 8E2300D0 */ lw $v1, 0xd0($s1) -/* ABB5F8 80240368 00021080 */ sll $v0, $v0, 2 -/* ABB5FC 8024036C 00431021 */ addu $v0, $v0, $v1 -/* ABB600 80240370 C4560004 */ lwc1 $f22, 4($v0) -/* ABB604 80240374 4680B5A0 */ cvt.s.w $f22, $f22 -/* ABB608 80240378 C454000C */ lwc1 $f20, 0xc($v0) -/* ABB60C 8024037C 4680A520 */ cvt.s.w $f20, $f20 -/* ABB610 80240380 4406B000 */ mfc1 $a2, $f22 -/* ABB614 80240384 4407A000 */ mfc1 $a3, $f20 -/* ABB618 80240388 0C00A720 */ jal atan2 -/* ABB61C 8024038C 00000000 */ nop -/* ABB620 80240390 8E050018 */ lw $a1, 0x18($s0) -/* ABB624 80240394 44060000 */ mfc1 $a2, $f0 -/* ABB628 80240398 0200202D */ daddu $a0, $s0, $zero -/* ABB62C 8024039C 0C00EA95 */ jal npc_move_heading -/* ABB630 802403A0 AE06000C */ sw $a2, 0xc($s0) -/* ABB634 802403A4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* ABB638 802403A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* ABB63C 802403AC 4406B000 */ mfc1 $a2, $f22 -/* ABB640 802403B0 4407A000 */ mfc1 $a3, $f20 -/* ABB644 802403B4 0C00A7B5 */ jal dist2D -/* ABB648 802403B8 00000000 */ nop -/* ABB64C 802403BC C6020018 */ lwc1 $f2, 0x18($s0) -/* ABB650 802403C0 4602003E */ c.le.s $f0, $f2 -/* ABB654 802403C4 00000000 */ nop -/* ABB658 802403C8 4500002F */ bc1f .L80240488 -/* ABB65C 802403CC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* ABB660 802403D0 24020002 */ addiu $v0, $zero, 2 -/* ABB664 802403D4 0C00A67F */ jal rand_int -/* ABB668 802403D8 AE420070 */ sw $v0, 0x70($s2) -/* ABB66C 802403DC 3C035555 */ lui $v1, 0x5555 -/* ABB670 802403E0 34635556 */ ori $v1, $v1, 0x5556 -/* ABB674 802403E4 00430018 */ mult $v0, $v1 -/* ABB678 802403E8 000227C3 */ sra $a0, $v0, 0x1f -/* ABB67C 802403EC 00004010 */ mfhi $t0 -/* ABB680 802403F0 01042023 */ subu $a0, $t0, $a0 -/* ABB684 802403F4 00041840 */ sll $v1, $a0, 1 -/* ABB688 802403F8 00641821 */ addu $v1, $v1, $a0 -/* ABB68C 802403FC 00431023 */ subu $v0, $v0, $v1 -/* ABB690 80240400 24430002 */ addiu $v1, $v0, 2 -/* ABB694 80240404 AE430074 */ sw $v1, 0x74($s2) -/* ABB698 80240408 8E62002C */ lw $v0, 0x2c($s3) -/* ABB69C 8024040C 18400009 */ blez $v0, .L80240434 -/* ABB6A0 80240410 24020004 */ addiu $v0, $zero, 4 -/* ABB6A4 80240414 8E620004 */ lw $v0, 4($s3) -/* ABB6A8 80240418 18400006 */ blez $v0, .L80240434 -/* ABB6AC 8024041C 24020004 */ addiu $v0, $zero, 4 -/* ABB6B0 80240420 8E620008 */ lw $v0, 8($s3) -/* ABB6B4 80240424 18400003 */ blez $v0, .L80240434 -/* ABB6B8 80240428 24020004 */ addiu $v0, $zero, 4 -/* ABB6BC 8024042C 14600002 */ bnez $v1, .L80240438 -/* ABB6C0 80240430 00000000 */ nop -.L80240434: -/* ABB6C4 80240434 AE420070 */ sw $v0, 0x70($s2) -.L80240438: -/* ABB6C8 80240438 0C00A67F */ jal rand_int -/* ABB6CC 8024043C 24042710 */ addiu $a0, $zero, 0x2710 -/* ABB6D0 80240440 3C0351EB */ lui $v1, 0x51eb -/* ABB6D4 80240444 3463851F */ ori $v1, $v1, 0x851f -/* ABB6D8 80240448 00430018 */ mult $v0, $v1 -/* ABB6DC 8024044C 00021FC3 */ sra $v1, $v0, 0x1f -/* ABB6E0 80240450 00004010 */ mfhi $t0 -/* ABB6E4 80240454 00082143 */ sra $a0, $t0, 5 -/* ABB6E8 80240458 00832023 */ subu $a0, $a0, $v1 -/* ABB6EC 8024045C 00041840 */ sll $v1, $a0, 1 -/* ABB6F0 80240460 00641821 */ addu $v1, $v1, $a0 -/* ABB6F4 80240464 000318C0 */ sll $v1, $v1, 3 -/* ABB6F8 80240468 00641821 */ addu $v1, $v1, $a0 -/* ABB6FC 8024046C 00031880 */ sll $v1, $v1, 2 -/* ABB700 80240470 8E640004 */ lw $a0, 4($s3) -/* ABB704 80240474 00431023 */ subu $v0, $v0, $v1 -/* ABB708 80240478 0044102A */ slt $v0, $v0, $a0 -/* ABB70C 8024047C 10400002 */ beqz $v0, .L80240488 -/* ABB710 80240480 24020004 */ addiu $v0, $zero, 4 -.L80240484: -/* ABB714 80240484 AE420070 */ sw $v0, 0x70($s2) -.L80240488: -/* ABB718 80240488 8FBF0044 */ lw $ra, 0x44($sp) -/* ABB71C 8024048C 8FB40040 */ lw $s4, 0x40($sp) -/* ABB720 80240490 8FB3003C */ lw $s3, 0x3c($sp) -/* ABB724 80240494 8FB20038 */ lw $s2, 0x38($sp) -/* ABB728 80240498 8FB10034 */ lw $s1, 0x34($sp) -/* ABB72C 8024049C 8FB00030 */ lw $s0, 0x30($sp) -/* ABB730 802404A0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* ABB734 802404A4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* ABB738 802404A8 03E00008 */ jr $ra -/* ABB73C 802404AC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/func_802404B0_ABB290.s b/asm/nonmatchings/world/area_kkj/kkj_00/func_802404B0_ABB290.s deleted file mode 100644 index 6e44cc3c5a..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/func_802404B0_ABB290.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404B0_ABB740 -/* ABB740 802404B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* ABB744 802404B4 AFB3001C */ sw $s3, 0x1c($sp) -/* ABB748 802404B8 0080982D */ daddu $s3, $a0, $zero -/* ABB74C 802404BC AFBF0020 */ sw $ra, 0x20($sp) -/* ABB750 802404C0 AFB20018 */ sw $s2, 0x18($sp) -/* ABB754 802404C4 AFB10014 */ sw $s1, 0x14($sp) -/* ABB758 802404C8 AFB00010 */ sw $s0, 0x10($sp) -/* ABB75C 802404CC 8E720148 */ lw $s2, 0x148($s3) -/* ABB760 802404D0 86440008 */ lh $a0, 8($s2) -/* ABB764 802404D4 0C00EABB */ jal get_npc_unsafe -/* ABB768 802404D8 00A0882D */ daddu $s1, $a1, $zero -/* ABB76C 802404DC 8E240008 */ lw $a0, 8($s1) -/* ABB770 802404E0 0040802D */ daddu $s0, $v0, $zero -/* ABB774 802404E4 00041FC2 */ srl $v1, $a0, 0x1f -/* ABB778 802404E8 00832021 */ addu $a0, $a0, $v1 -/* ABB77C 802404EC 00042043 */ sra $a0, $a0, 1 -/* ABB780 802404F0 0C00A67F */ jal rand_int -/* ABB784 802404F4 24840001 */ addiu $a0, $a0, 1 -/* ABB788 802404F8 8E230008 */ lw $v1, 8($s1) -/* ABB78C 802404FC 240400B4 */ addiu $a0, $zero, 0xb4 -/* ABB790 80240500 00032FC2 */ srl $a1, $v1, 0x1f -/* ABB794 80240504 00651821 */ addu $v1, $v1, $a1 -/* ABB798 80240508 00031843 */ sra $v1, $v1, 1 -/* ABB79C 8024050C 00621821 */ addu $v1, $v1, $v0 -/* ABB7A0 80240510 0C00A67F */ jal rand_int -/* ABB7A4 80240514 A603008E */ sh $v1, 0x8e($s0) -/* ABB7A8 80240518 C60C000C */ lwc1 $f12, 0xc($s0) -/* ABB7AC 8024051C 44820000 */ mtc1 $v0, $f0 -/* ABB7B0 80240520 00000000 */ nop -/* ABB7B4 80240524 46800020 */ cvt.s.w $f0, $f0 -/* ABB7B8 80240528 46006300 */ add.s $f12, $f12, $f0 -/* ABB7BC 8024052C 3C0142B4 */ lui $at, 0x42b4 -/* ABB7C0 80240530 44810000 */ mtc1 $at, $f0 -/* ABB7C4 80240534 0C00A6C9 */ jal clamp_angle -/* ABB7C8 80240538 46006301 */ sub.s $f12, $f12, $f0 -/* ABB7CC 8024053C E600000C */ swc1 $f0, 0xc($s0) -/* ABB7D0 80240540 8E4200CC */ lw $v0, 0xcc($s2) -/* ABB7D4 80240544 8C420000 */ lw $v0, ($v0) -/* ABB7D8 80240548 AE020028 */ sw $v0, 0x28($s0) -/* ABB7DC 8024054C 24020003 */ addiu $v0, $zero, 3 -/* ABB7E0 80240550 AE620070 */ sw $v0, 0x70($s3) -/* ABB7E4 80240554 8FBF0020 */ lw $ra, 0x20($sp) -/* ABB7E8 80240558 8FB3001C */ lw $s3, 0x1c($sp) -/* ABB7EC 8024055C 8FB20018 */ lw $s2, 0x18($sp) -/* ABB7F0 80240560 8FB10014 */ lw $s1, 0x14($sp) -/* ABB7F4 80240564 8FB00010 */ lw $s0, 0x10($sp) -/* ABB7F8 80240568 03E00008 */ jr $ra -/* ABB7FC 8024056C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/func_80240570_ABB290.s b/asm/nonmatchings/world/area_kkj/kkj_00/func_80240570_ABB290.s deleted file mode 100644 index c56142a33c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/func_80240570_ABB290.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240570_ABB800 -/* ABB800 80240570 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* ABB804 80240574 AFB40040 */ sw $s4, 0x40($sp) -/* ABB808 80240578 0080A02D */ daddu $s4, $a0, $zero -/* ABB80C 8024057C AFBF0044 */ sw $ra, 0x44($sp) -/* ABB810 80240580 AFB3003C */ sw $s3, 0x3c($sp) -/* ABB814 80240584 AFB20038 */ sw $s2, 0x38($sp) -/* ABB818 80240588 AFB10034 */ sw $s1, 0x34($sp) -/* ABB81C 8024058C AFB00030 */ sw $s0, 0x30($sp) -/* ABB820 80240590 8E910148 */ lw $s1, 0x148($s4) -/* ABB824 80240594 00A0902D */ daddu $s2, $a1, $zero -/* ABB828 80240598 86240008 */ lh $a0, 8($s1) -/* ABB82C 8024059C 0C00EABB */ jal get_npc_unsafe -/* ABB830 802405A0 00C0982D */ daddu $s3, $a2, $zero -/* ABB834 802405A4 8E430014 */ lw $v1, 0x14($s2) -/* ABB838 802405A8 04600031 */ bltz $v1, .L80240670 -/* ABB83C 802405AC 0040802D */ daddu $s0, $v0, $zero -/* ABB840 802405B0 0260202D */ daddu $a0, $s3, $zero -/* ABB844 802405B4 AFA00010 */ sw $zero, 0x10($sp) -/* ABB848 802405B8 8E460024 */ lw $a2, 0x24($s2) -/* ABB84C 802405BC 8E470028 */ lw $a3, 0x28($s2) -/* ABB850 802405C0 0C01242D */ jal func_800490B4 -/* ABB854 802405C4 0220282D */ daddu $a1, $s1, $zero -/* ABB858 802405C8 10400029 */ beqz $v0, .L80240670 -/* ABB85C 802405CC 0000202D */ daddu $a0, $zero, $zero -/* ABB860 802405D0 0200282D */ daddu $a1, $s0, $zero -/* ABB864 802405D4 0000302D */ daddu $a2, $zero, $zero -/* ABB868 802405D8 860300A8 */ lh $v1, 0xa8($s0) -/* ABB86C 802405DC 3C013F80 */ lui $at, 0x3f80 -/* ABB870 802405E0 44810000 */ mtc1 $at, $f0 -/* ABB874 802405E4 3C014000 */ lui $at, 0x4000 -/* ABB878 802405E8 44811000 */ mtc1 $at, $f2 -/* ABB87C 802405EC 3C01C1A0 */ lui $at, 0xc1a0 -/* ABB880 802405F0 44812000 */ mtc1 $at, $f4 -/* ABB884 802405F4 2402000F */ addiu $v0, $zero, 0xf -/* ABB888 802405F8 AFA2001C */ sw $v0, 0x1c($sp) -/* ABB88C 802405FC 44833000 */ mtc1 $v1, $f6 -/* ABB890 80240600 00000000 */ nop -/* ABB894 80240604 468031A0 */ cvt.s.w $f6, $f6 -/* ABB898 80240608 44073000 */ mfc1 $a3, $f6 -/* ABB89C 8024060C 27A20028 */ addiu $v0, $sp, 0x28 -/* ABB8A0 80240610 AFA20020 */ sw $v0, 0x20($sp) -/* ABB8A4 80240614 E7A00010 */ swc1 $f0, 0x10($sp) -/* ABB8A8 80240618 E7A20014 */ swc1 $f2, 0x14($sp) -/* ABB8AC 8024061C 0C01BFA4 */ jal fx_emote -/* ABB8B0 80240620 E7A40018 */ swc1 $f4, 0x18($sp) -/* ABB8B4 80240624 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* ABB8B8 80240628 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* ABB8BC 8024062C C60C0038 */ lwc1 $f12, 0x38($s0) -/* ABB8C0 80240630 C60E0040 */ lwc1 $f14, 0x40($s0) -/* ABB8C4 80240634 8C460028 */ lw $a2, 0x28($v0) -/* ABB8C8 80240638 0C00A720 */ jal atan2 -/* ABB8CC 8024063C 8C470030 */ lw $a3, 0x30($v0) -/* ABB8D0 80240640 0200202D */ daddu $a0, $s0, $zero -/* ABB8D4 80240644 240502F4 */ addiu $a1, $zero, 0x2f4 -/* ABB8D8 80240648 3C060020 */ lui $a2, 0x20 -/* ABB8DC 8024064C 0C012530 */ jal func_800494C0 -/* ABB8E0 80240650 E480000C */ swc1 $f0, 0xc($a0) -/* ABB8E4 80240654 8E220018 */ lw $v0, 0x18($s1) -/* ABB8E8 80240658 9442002A */ lhu $v0, 0x2a($v0) -/* ABB8EC 8024065C 30420001 */ andi $v0, $v0, 1 -/* ABB8F0 80240660 14400029 */ bnez $v0, .L80240708 -/* ABB8F4 80240664 2402000A */ addiu $v0, $zero, 0xa -/* ABB8F8 80240668 080901C2 */ j .L80240708 -/* ABB8FC 8024066C 2402000C */ addiu $v0, $zero, 0xc -.L80240670: -/* ABB900 80240670 8602008C */ lh $v0, 0x8c($s0) -/* ABB904 80240674 14400025 */ bnez $v0, .L8024070C -/* ABB908 80240678 00000000 */ nop -/* ABB90C 8024067C 9602008E */ lhu $v0, 0x8e($s0) -/* ABB910 80240680 2442FFFF */ addiu $v0, $v0, -1 -/* ABB914 80240684 A602008E */ sh $v0, 0x8e($s0) -/* ABB918 80240688 00021400 */ sll $v0, $v0, 0x10 -/* ABB91C 8024068C 1440001F */ bnez $v0, .L8024070C -/* ABB920 80240690 00000000 */ nop -/* ABB924 80240694 8E820074 */ lw $v0, 0x74($s4) -/* ABB928 80240698 2442FFFF */ addiu $v0, $v0, -1 -/* ABB92C 8024069C 10400019 */ beqz $v0, .L80240704 -/* ABB930 802406A0 AE820074 */ sw $v0, 0x74($s4) -/* ABB934 802406A4 8E220018 */ lw $v0, 0x18($s1) -/* ABB938 802406A8 9442002A */ lhu $v0, 0x2a($v0) -/* ABB93C 802406AC 30420010 */ andi $v0, $v0, 0x10 -/* ABB940 802406B0 14400007 */ bnez $v0, .L802406D0 -/* ABB944 802406B4 00000000 */ nop -/* ABB948 802406B8 C600000C */ lwc1 $f0, 0xc($s0) -/* ABB94C 802406BC 3C014334 */ lui $at, 0x4334 -/* ABB950 802406C0 44816000 */ mtc1 $at, $f12 -/* ABB954 802406C4 0C00A6C9 */ jal clamp_angle -/* ABB958 802406C8 460C0300 */ add.s $f12, $f0, $f12 -/* ABB95C 802406CC E600000C */ swc1 $f0, 0xc($s0) -.L802406D0: -/* ABB960 802406D0 8E440008 */ lw $a0, 8($s2) -/* ABB964 802406D4 000417C2 */ srl $v0, $a0, 0x1f -/* ABB968 802406D8 00822021 */ addu $a0, $a0, $v0 -/* ABB96C 802406DC 00042043 */ sra $a0, $a0, 1 -/* ABB970 802406E0 0C00A67F */ jal rand_int -/* ABB974 802406E4 24840001 */ addiu $a0, $a0, 1 -/* ABB978 802406E8 8E430008 */ lw $v1, 8($s2) -/* ABB97C 802406EC 000327C2 */ srl $a0, $v1, 0x1f -/* ABB980 802406F0 00641821 */ addu $v1, $v1, $a0 -/* ABB984 802406F4 00031843 */ sra $v1, $v1, 1 -/* ABB988 802406F8 00621821 */ addu $v1, $v1, $v0 -/* ABB98C 802406FC 080901C3 */ j .L8024070C -/* ABB990 80240700 A603008E */ sh $v1, 0x8e($s0) -.L80240704: -/* ABB994 80240704 24020004 */ addiu $v0, $zero, 4 -.L80240708: -/* ABB998 80240708 AE820070 */ sw $v0, 0x70($s4) -.L8024070C: -/* ABB99C 8024070C 8FBF0044 */ lw $ra, 0x44($sp) -/* ABB9A0 80240710 8FB40040 */ lw $s4, 0x40($sp) -/* ABB9A4 80240714 8FB3003C */ lw $s3, 0x3c($sp) -/* ABB9A8 80240718 8FB20038 */ lw $s2, 0x38($sp) -/* ABB9AC 8024071C 8FB10034 */ lw $s1, 0x34($sp) -/* ABB9B0 80240720 8FB00030 */ lw $s0, 0x30($sp) -/* ABB9B4 80240724 03E00008 */ jr $ra -/* ABB9B8 80240728 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/func_8024072C_ABB290.s b/asm/nonmatchings/world/area_kkj/kkj_00/func_8024072C_ABB290.s deleted file mode 100644 index 36bb5839c1..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/func_8024072C_ABB290.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024072C_ABB9BC -/* ABB9BC 8024072C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* ABB9C0 80240730 AFB10014 */ sw $s1, 0x14($sp) -/* ABB9C4 80240734 0080882D */ daddu $s1, $a0, $zero -/* ABB9C8 80240738 AFBF001C */ sw $ra, 0x1c($sp) -/* ABB9CC 8024073C AFB20018 */ sw $s2, 0x18($sp) -/* ABB9D0 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* ABB9D4 80240744 8E300148 */ lw $s0, 0x148($s1) -/* ABB9D8 80240748 86040008 */ lh $a0, 8($s0) -/* ABB9DC 8024074C 0C00EABB */ jal get_npc_unsafe -/* ABB9E0 80240750 00A0902D */ daddu $s2, $a1, $zero -/* ABB9E4 80240754 8E230078 */ lw $v1, 0x78($s1) -/* ABB9E8 80240758 24630001 */ addiu $v1, $v1, 1 -/* ABB9EC 8024075C AE230078 */ sw $v1, 0x78($s1) -/* ABB9F0 80240760 8E0400D0 */ lw $a0, 0xd0($s0) -/* ABB9F4 80240764 8C840000 */ lw $a0, ($a0) -/* ABB9F8 80240768 0064182A */ slt $v1, $v1, $a0 -/* ABB9FC 8024076C 14600002 */ bnez $v1, .L80240778 -/* ABBA00 80240770 0040282D */ daddu $a1, $v0, $zero -/* ABBA04 80240774 AE200078 */ sw $zero, 0x78($s1) -.L80240778: -/* ABBA08 80240778 8E0200CC */ lw $v0, 0xcc($s0) -/* ABBA0C 8024077C 8C420004 */ lw $v0, 4($v0) -/* ABBA10 80240780 ACA20028 */ sw $v0, 0x28($a1) -/* ABBA14 80240784 8E0200D0 */ lw $v0, 0xd0($s0) -/* ABBA18 80240788 8C42007C */ lw $v0, 0x7c($v0) -/* ABBA1C 8024078C 04410004 */ bgez $v0, .L802407A0 -/* ABBA20 80240790 00000000 */ nop -/* ABBA24 80240794 C6400000 */ lwc1 $f0, ($s2) -/* ABBA28 80240798 080901F0 */ j .L802407C0 -/* ABBA2C 8024079C E4A00018 */ swc1 $f0, 0x18($a1) -.L802407A0: -/* ABBA30 802407A0 3C018025 */ lui $at, 0x8025 -/* ABBA34 802407A4 D4229D38 */ ldc1 $f2, -0x62c8($at) -/* ABBA38 802407A8 44820000 */ mtc1 $v0, $f0 -/* ABBA3C 802407AC 00000000 */ nop -/* ABBA40 802407B0 46800021 */ cvt.d.w $f0, $f0 -/* ABBA44 802407B4 46220003 */ div.d $f0, $f0, $f2 -/* ABBA48 802407B8 46200020 */ cvt.s.d $f0, $f0 -/* ABBA4C 802407BC E4A00018 */ swc1 $f0, 0x18($a1) -.L802407C0: -/* ABBA50 802407C0 24020001 */ addiu $v0, $zero, 1 -/* ABBA54 802407C4 AE220070 */ sw $v0, 0x70($s1) -/* ABBA58 802407C8 8FBF001C */ lw $ra, 0x1c($sp) -/* ABBA5C 802407CC 8FB20018 */ lw $s2, 0x18($sp) -/* ABBA60 802407D0 8FB10014 */ lw $s1, 0x14($sp) -/* ABBA64 802407D4 8FB00010 */ lw $s0, 0x10($sp) -/* ABBA68 802407D8 03E00008 */ jr $ra -/* ABBA6C 802407DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/func_80240854_ABB290.s b/asm/nonmatchings/world/area_kkj/kkj_00/func_80240854_ABB290.s deleted file mode 100644 index e1c0edee8f..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/func_80240854_ABB290.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240854_ABBAE4 -/* ABBAE4 80240854 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ABBAE8 80240858 AFB00010 */ sw $s0, 0x10($sp) -/* ABBAEC 8024085C 0080802D */ daddu $s0, $a0, $zero -/* ABBAF0 80240860 AFBF0014 */ sw $ra, 0x14($sp) -/* ABBAF4 80240864 8E020148 */ lw $v0, 0x148($s0) -/* ABBAF8 80240868 0C00EABB */ jal get_npc_unsafe -/* ABBAFC 8024086C 84440008 */ lh $a0, 8($v0) -/* ABBB00 80240870 0040202D */ daddu $a0, $v0, $zero -/* ABBB04 80240874 C482003C */ lwc1 $f2, 0x3c($a0) -/* ABBB08 80240878 C480001C */ lwc1 $f0, 0x1c($a0) -/* ABBB0C 8024087C 46001080 */ add.s $f2, $f2, $f0 -/* ABBB10 80240880 C4840014 */ lwc1 $f4, 0x14($a0) -/* ABBB14 80240884 46040001 */ sub.s $f0, $f0, $f4 -/* ABBB18 80240888 C4840064 */ lwc1 $f4, 0x64($a0) -/* ABBB1C 8024088C 4602203C */ c.lt.s $f4, $f2 -/* ABBB20 80240890 E482003C */ swc1 $f2, 0x3c($a0) -/* ABBB24 80240894 45010009 */ bc1t .L802408BC -/* ABBB28 80240898 E480001C */ swc1 $f0, 0x1c($a0) -/* ABBB2C 8024089C 8C820000 */ lw $v0, ($a0) -/* ABBB30 802408A0 2403F7FF */ addiu $v1, $zero, -0x801 -/* ABBB34 802408A4 E484003C */ swc1 $f4, 0x3c($a0) -/* ABBB38 802408A8 AC80001C */ sw $zero, 0x1c($a0) -/* ABBB3C 802408AC 00431024 */ and $v0, $v0, $v1 -/* ABBB40 802408B0 AC820000 */ sw $v0, ($a0) -/* ABBB44 802408B4 2402000C */ addiu $v0, $zero, 0xc -/* ABBB48 802408B8 AE020070 */ sw $v0, 0x70($s0) -.L802408BC: -/* ABBB4C 802408BC 8FBF0014 */ lw $ra, 0x14($sp) -/* ABBB50 802408C0 8FB00010 */ lw $s0, 0x10($sp) -/* ABBB54 802408C4 03E00008 */ jr $ra -/* ABBB58 802408C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/func_802409FC_ABB290.s b/asm/nonmatchings/world/area_kkj/kkj_00/func_802409FC_ABB290.s deleted file mode 100644 index ed2c009a04..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/func_802409FC_ABB290.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409FC_ABBC8C -/* ABBC8C 802409FC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* ABBC90 80240A00 AFB3003C */ sw $s3, 0x3c($sp) -/* ABBC94 80240A04 0080982D */ daddu $s3, $a0, $zero -/* ABBC98 80240A08 AFBF0040 */ sw $ra, 0x40($sp) -/* ABBC9C 80240A0C AFB20038 */ sw $s2, 0x38($sp) -/* ABBCA0 80240A10 AFB10034 */ sw $s1, 0x34($sp) -/* ABBCA4 80240A14 AFB00030 */ sw $s0, 0x30($sp) -/* ABBCA8 80240A18 8E720148 */ lw $s2, 0x148($s3) -/* ABBCAC 80240A1C 00A0882D */ daddu $s1, $a1, $zero -/* ABBCB0 80240A20 86440008 */ lh $a0, 8($s2) -/* ABBCB4 80240A24 0C00EABB */ jal get_npc_unsafe -/* ABBCB8 80240A28 00C0802D */ daddu $s0, $a2, $zero -/* ABBCBC 80240A2C 0200202D */ daddu $a0, $s0, $zero -/* ABBCC0 80240A30 0240282D */ daddu $a1, $s2, $zero -/* ABBCC4 80240A34 24030001 */ addiu $v1, $zero, 1 -/* ABBCC8 80240A38 AFA30010 */ sw $v1, 0x10($sp) -/* ABBCCC 80240A3C 8E260024 */ lw $a2, 0x24($s1) -/* ABBCD0 80240A40 8E270028 */ lw $a3, 0x28($s1) -/* ABBCD4 80240A44 0C01242D */ jal func_800490B4 -/* ABBCD8 80240A48 0040802D */ daddu $s0, $v0, $zero -/* ABBCDC 80240A4C 1440001E */ bnez $v0, .L80240AC8 -/* ABBCE0 80240A50 0200202D */ daddu $a0, $s0, $zero -/* ABBCE4 80240A54 24040002 */ addiu $a0, $zero, 2 -/* ABBCE8 80240A58 0200282D */ daddu $a1, $s0, $zero -/* ABBCEC 80240A5C 0000302D */ daddu $a2, $zero, $zero -/* ABBCF0 80240A60 860300A8 */ lh $v1, 0xa8($s0) -/* ABBCF4 80240A64 3C013F80 */ lui $at, 0x3f80 -/* ABBCF8 80240A68 44810000 */ mtc1 $at, $f0 -/* ABBCFC 80240A6C 3C014000 */ lui $at, 0x4000 -/* ABBD00 80240A70 44811000 */ mtc1 $at, $f2 -/* ABBD04 80240A74 3C01C1A0 */ lui $at, 0xc1a0 -/* ABBD08 80240A78 44812000 */ mtc1 $at, $f4 -/* ABBD0C 80240A7C 2402000F */ addiu $v0, $zero, 0xf -/* ABBD10 80240A80 AFA2001C */ sw $v0, 0x1c($sp) -/* ABBD14 80240A84 44833000 */ mtc1 $v1, $f6 -/* ABBD18 80240A88 00000000 */ nop -/* ABBD1C 80240A8C 468031A0 */ cvt.s.w $f6, $f6 -/* ABBD20 80240A90 44073000 */ mfc1 $a3, $f6 -/* ABBD24 80240A94 27A20028 */ addiu $v0, $sp, 0x28 -/* ABBD28 80240A98 AFA20020 */ sw $v0, 0x20($sp) -/* ABBD2C 80240A9C E7A00010 */ swc1 $f0, 0x10($sp) -/* ABBD30 80240AA0 E7A20014 */ swc1 $f2, 0x14($sp) -/* ABBD34 80240AA4 0C01BFA4 */ jal fx_emote -/* ABBD38 80240AA8 E7A40018 */ swc1 $f4, 0x18($sp) -/* ABBD3C 80240AAC 8E4200CC */ lw $v0, 0xcc($s2) -/* ABBD40 80240AB0 8C430000 */ lw $v1, ($v0) -/* ABBD44 80240AB4 24020019 */ addiu $v0, $zero, 0x19 -/* ABBD48 80240AB8 A602008E */ sh $v0, 0x8e($s0) -/* ABBD4C 80240ABC 2402000E */ addiu $v0, $zero, 0xe -/* ABBD50 80240AC0 080902BF */ j .L80240AFC -/* ABBD54 80240AC4 AE030028 */ sw $v1, 0x28($s0) -.L80240AC8: -/* ABBD58 80240AC8 0C00F598 */ jal func_8003D660 -/* ABBD5C 80240ACC 24050001 */ addiu $a1, $zero, 1 -/* ABBD60 80240AD0 8E050018 */ lw $a1, 0x18($s0) -/* ABBD64 80240AD4 8E06000C */ lw $a2, 0xc($s0) -/* ABBD68 80240AD8 0C00EA95 */ jal npc_move_heading -/* ABBD6C 80240ADC 0200202D */ daddu $a0, $s0, $zero -/* ABBD70 80240AE0 8602008E */ lh $v0, 0x8e($s0) -/* ABBD74 80240AE4 9603008E */ lhu $v1, 0x8e($s0) -/* ABBD78 80240AE8 18400003 */ blez $v0, .L80240AF8 -/* ABBD7C 80240AEC 2462FFFF */ addiu $v0, $v1, -1 -/* ABBD80 80240AF0 080902C0 */ j .L80240B00 -/* ABBD84 80240AF4 A602008E */ sh $v0, 0x8e($s0) -.L80240AF8: -/* ABBD88 80240AF8 2402000C */ addiu $v0, $zero, 0xc -.L80240AFC: -/* ABBD8C 80240AFC AE620070 */ sw $v0, 0x70($s3) -.L80240B00: -/* ABBD90 80240B00 8FBF0040 */ lw $ra, 0x40($sp) -/* ABBD94 80240B04 8FB3003C */ lw $s3, 0x3c($sp) -/* ABBD98 80240B08 8FB20038 */ lw $s2, 0x38($sp) -/* ABBD9C 80240B0C 8FB10034 */ lw $s1, 0x34($sp) -/* ABBDA0 80240B10 8FB00030 */ lw $s0, 0x30($sp) -/* ABBDA4 80240B14 03E00008 */ jr $ra -/* ABBDA8 80240B18 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/func_80240F40_ABB290.s b/asm/nonmatchings/world/area_kkj/kkj_00/func_80240F40_ABB290.s deleted file mode 100644 index b9452ce05e..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/func_80240F40_ABB290.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F40_ABC1D0 -/* ABC1D0 80240F40 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ABC1D4 80240F44 AFB00010 */ sw $s0, 0x10($sp) -/* ABC1D8 80240F48 0080802D */ daddu $s0, $a0, $zero -/* ABC1DC 80240F4C 10A00002 */ beqz $a1, .L80240F58 -/* ABC1E0 80240F50 AFBF0014 */ sw $ra, 0x14($sp) -/* ABC1E4 80240F54 AE000074 */ sw $zero, 0x74($s0) -.L80240F58: -/* ABC1E8 80240F58 0000202D */ daddu $a0, $zero, $zero -/* ABC1EC 80240F5C 240500D0 */ addiu $a1, $zero, 0xd0 -/* ABC1F0 80240F60 00A0302D */ daddu $a2, $a1, $zero -/* ABC1F4 80240F64 0C04DF84 */ jal func_80137E10 -/* ABC1F8 80240F68 00A0382D */ daddu $a3, $a1, $zero -/* ABC1FC 80240F6C C6000074 */ lwc1 $f0, 0x74($s0) -/* ABC200 80240F70 46800020 */ cvt.s.w $f0, $f0 -/* ABC204 80240F74 44050000 */ mfc1 $a1, $f0 -/* ABC208 80240F78 0C04DF62 */ jal func_80137D88 -/* ABC20C 80240F7C 24040001 */ addiu $a0, $zero, 1 -/* ABC210 80240F80 8E020074 */ lw $v0, 0x74($s0) -/* ABC214 80240F84 240300FF */ addiu $v1, $zero, 0xff -/* ABC218 80240F88 14430003 */ bne $v0, $v1, .L80240F98 -/* ABC21C 80240F8C 24420007 */ addiu $v0, $v0, 7 -/* ABC220 80240F90 080903EB */ j .L80240FAC -/* ABC224 80240F94 24020002 */ addiu $v0, $zero, 2 -.L80240F98: -/* ABC228 80240F98 AE020074 */ sw $v0, 0x74($s0) -/* ABC22C 80240F9C 28420100 */ slti $v0, $v0, 0x100 -/* ABC230 80240FA0 50400001 */ beql $v0, $zero, .L80240FA8 -/* ABC234 80240FA4 AE030074 */ sw $v1, 0x74($s0) -.L80240FA8: -/* ABC238 80240FA8 0000102D */ daddu $v0, $zero, $zero -.L80240FAC: -/* ABC23C 80240FAC 8FBF0014 */ lw $ra, 0x14($sp) -/* ABC240 80240FB0 8FB00010 */ lw $s0, 0x10($sp) -/* ABC244 80240FB4 03E00008 */ jr $ra -/* ABC248 80240FB8 27BD0018 */ addiu $sp, $sp, 0x18 -/* ABC24C 80240FBC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/func_80240158_AC5170.s b/asm/nonmatchings/world/area_kkj/kkj_01/func_80240158_AC5170.s deleted file mode 100644 index 5d2326addc..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_01/func_80240158_AC5170.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_AC52C8 -/* AC52C8 80240158 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* AC52CC 8024015C AFB20038 */ sw $s2, 0x38($sp) -/* AC52D0 80240160 0080902D */ daddu $s2, $a0, $zero -/* AC52D4 80240164 AFBF0044 */ sw $ra, 0x44($sp) -/* AC52D8 80240168 AFB40040 */ sw $s4, 0x40($sp) -/* AC52DC 8024016C AFB3003C */ sw $s3, 0x3c($sp) -/* AC52E0 80240170 AFB10034 */ sw $s1, 0x34($sp) -/* AC52E4 80240174 AFB00030 */ sw $s0, 0x30($sp) -/* AC52E8 80240178 F7B60050 */ sdc1 $f22, 0x50($sp) -/* AC52EC 8024017C F7B40048 */ sdc1 $f20, 0x48($sp) -/* AC52F0 80240180 8E510148 */ lw $s1, 0x148($s2) -/* AC52F4 80240184 00A0982D */ daddu $s3, $a1, $zero -/* AC52F8 80240188 86240008 */ lh $a0, 8($s1) -/* AC52FC 8024018C 0C00EABB */ jal get_npc_unsafe -/* AC5300 80240190 00C0A02D */ daddu $s4, $a2, $zero -/* AC5304 80240194 8E630014 */ lw $v1, 0x14($s3) -/* AC5308 80240198 04600030 */ bltz $v1, .L8024025C -/* AC530C 8024019C 0040802D */ daddu $s0, $v0, $zero -/* AC5310 802401A0 8E420074 */ lw $v0, 0x74($s2) -/* AC5314 802401A4 1C40002C */ bgtz $v0, .L80240258 -/* AC5318 802401A8 2442FFFF */ addiu $v0, $v0, -1 -/* AC531C 802401AC 0280202D */ daddu $a0, $s4, $zero -/* AC5320 802401B0 AE430074 */ sw $v1, 0x74($s2) -/* AC5324 802401B4 AFA00010 */ sw $zero, 0x10($sp) -/* AC5328 802401B8 8E66000C */ lw $a2, 0xc($s3) -/* AC532C 802401BC 8E670010 */ lw $a3, 0x10($s3) -/* AC5330 802401C0 0C01242D */ jal func_800490B4 -/* AC5334 802401C4 0220282D */ daddu $a1, $s1, $zero -/* AC5338 802401C8 10400021 */ beqz $v0, .L80240250 -/* AC533C 802401CC 0000202D */ daddu $a0, $zero, $zero -/* AC5340 802401D0 0200282D */ daddu $a1, $s0, $zero -/* AC5344 802401D4 0000302D */ daddu $a2, $zero, $zero -/* AC5348 802401D8 860300A8 */ lh $v1, 0xa8($s0) -/* AC534C 802401DC 3C013F80 */ lui $at, 0x3f80 -/* AC5350 802401E0 44810000 */ mtc1 $at, $f0 -/* AC5354 802401E4 3C014000 */ lui $at, 0x4000 -/* AC5358 802401E8 44811000 */ mtc1 $at, $f2 -/* AC535C 802401EC 3C01C1A0 */ lui $at, 0xc1a0 -/* AC5360 802401F0 44812000 */ mtc1 $at, $f4 -/* AC5364 802401F4 2402000F */ addiu $v0, $zero, 0xf -/* AC5368 802401F8 AFA2001C */ sw $v0, 0x1c($sp) -/* AC536C 802401FC 44833000 */ mtc1 $v1, $f6 -/* AC5370 80240200 00000000 */ nop -/* AC5374 80240204 468031A0 */ cvt.s.w $f6, $f6 -/* AC5378 80240208 44073000 */ mfc1 $a3, $f6 -/* AC537C 8024020C 27A20028 */ addiu $v0, $sp, 0x28 -/* AC5380 80240210 AFA20020 */ sw $v0, 0x20($sp) -/* AC5384 80240214 E7A00010 */ swc1 $f0, 0x10($sp) -/* AC5388 80240218 E7A20014 */ swc1 $f2, 0x14($sp) -/* AC538C 8024021C 0C01BFA4 */ jal fx_emote -/* AC5390 80240220 E7A40018 */ swc1 $f4, 0x18($sp) -/* AC5394 80240224 0200202D */ daddu $a0, $s0, $zero -/* AC5398 80240228 240502F4 */ addiu $a1, $zero, 0x2f4 -/* AC539C 8024022C 0C012530 */ jal func_800494C0 -/* AC53A0 80240230 3C060020 */ lui $a2, 0x20 -/* AC53A4 80240234 8E220018 */ lw $v0, 0x18($s1) -/* AC53A8 80240238 9442002A */ lhu $v0, 0x2a($v0) -/* AC53AC 8024023C 30420001 */ andi $v0, $v0, 1 -/* AC53B0 80240240 14400064 */ bnez $v0, .L802403D4 -/* AC53B4 80240244 2402000A */ addiu $v0, $zero, 0xa -/* AC53B8 80240248 080900F5 */ j .L802403D4 -/* AC53BC 8024024C 2402000C */ addiu $v0, $zero, 0xc -.L80240250: -/* AC53C0 80240250 8E420074 */ lw $v0, 0x74($s2) -/* AC53C4 80240254 2442FFFF */ addiu $v0, $v0, -1 -.L80240258: -/* AC53C8 80240258 AE420074 */ sw $v0, 0x74($s2) -.L8024025C: -/* AC53CC 8024025C 8602008C */ lh $v0, 0x8c($s0) -/* AC53D0 80240260 1440005D */ bnez $v0, .L802403D8 -/* AC53D4 80240264 00000000 */ nop -/* AC53D8 80240268 C6000018 */ lwc1 $f0, 0x18($s0) -/* AC53DC 8024026C 3C014010 */ lui $at, 0x4010 -/* AC53E0 80240270 44811800 */ mtc1 $at, $f3 -/* AC53E4 80240274 44801000 */ mtc1 $zero, $f2 -/* AC53E8 80240278 46000021 */ cvt.d.s $f0, $f0 -/* AC53EC 8024027C 4622003C */ c.lt.d $f0, $f2 -/* AC53F0 80240280 00000000 */ nop -/* AC53F4 80240284 45000003 */ bc1f .L80240294 -/* AC53F8 80240288 0200202D */ daddu $a0, $s0, $zero -/* AC53FC 8024028C 080900A6 */ j .L80240298 -/* AC5400 80240290 0000282D */ daddu $a1, $zero, $zero -.L80240294: -/* AC5404 80240294 24050001 */ addiu $a1, $zero, 1 -.L80240298: -/* AC5408 80240298 0C00F598 */ jal func_8003D660 -/* AC540C 8024029C 00000000 */ nop -/* AC5410 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* AC5414 802402A4 8E430078 */ lw $v1, 0x78($s2) -/* AC5418 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* AC541C 802402AC 00031040 */ sll $v0, $v1, 1 -/* AC5420 802402B0 00431021 */ addu $v0, $v0, $v1 -/* AC5424 802402B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* AC5428 802402B8 00021080 */ sll $v0, $v0, 2 -/* AC542C 802402BC 00431021 */ addu $v0, $v0, $v1 -/* AC5430 802402C0 C4560004 */ lwc1 $f22, 4($v0) -/* AC5434 802402C4 4680B5A0 */ cvt.s.w $f22, $f22 -/* AC5438 802402C8 C454000C */ lwc1 $f20, 0xc($v0) -/* AC543C 802402CC 4680A520 */ cvt.s.w $f20, $f20 -/* AC5440 802402D0 4406B000 */ mfc1 $a2, $f22 -/* AC5444 802402D4 4407A000 */ mfc1 $a3, $f20 -/* AC5448 802402D8 0C00A720 */ jal atan2 -/* AC544C 802402DC 00000000 */ nop -/* AC5450 802402E0 8E050018 */ lw $a1, 0x18($s0) -/* AC5454 802402E4 44060000 */ mfc1 $a2, $f0 -/* AC5458 802402E8 0200202D */ daddu $a0, $s0, $zero -/* AC545C 802402EC 0C00EA95 */ jal npc_move_heading -/* AC5460 802402F0 AE06000C */ sw $a2, 0xc($s0) -/* AC5464 802402F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* AC5468 802402F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* AC546C 802402FC 4406B000 */ mfc1 $a2, $f22 -/* AC5470 80240300 4407A000 */ mfc1 $a3, $f20 -/* AC5474 80240304 0C00A7B5 */ jal dist2D -/* AC5478 80240308 00000000 */ nop -/* AC547C 8024030C C6020018 */ lwc1 $f2, 0x18($s0) -/* AC5480 80240310 4602003E */ c.le.s $f0, $f2 -/* AC5484 80240314 00000000 */ nop -/* AC5488 80240318 4500002F */ bc1f .L802403D8 -/* AC548C 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* AC5490 80240320 24020002 */ addiu $v0, $zero, 2 -/* AC5494 80240324 0C00A67F */ jal rand_int -/* AC5498 80240328 AE420070 */ sw $v0, 0x70($s2) -/* AC549C 8024032C 3C035555 */ lui $v1, 0x5555 -/* AC54A0 80240330 34635556 */ ori $v1, $v1, 0x5556 -/* AC54A4 80240334 00430018 */ mult $v0, $v1 -/* AC54A8 80240338 000227C3 */ sra $a0, $v0, 0x1f -/* AC54AC 8024033C 00004010 */ mfhi $t0 -/* AC54B0 80240340 01042023 */ subu $a0, $t0, $a0 -/* AC54B4 80240344 00041840 */ sll $v1, $a0, 1 -/* AC54B8 80240348 00641821 */ addu $v1, $v1, $a0 -/* AC54BC 8024034C 00431023 */ subu $v0, $v0, $v1 -/* AC54C0 80240350 24430002 */ addiu $v1, $v0, 2 -/* AC54C4 80240354 AE430074 */ sw $v1, 0x74($s2) -/* AC54C8 80240358 8E62002C */ lw $v0, 0x2c($s3) -/* AC54CC 8024035C 18400009 */ blez $v0, .L80240384 -/* AC54D0 80240360 24020004 */ addiu $v0, $zero, 4 -/* AC54D4 80240364 8E620004 */ lw $v0, 4($s3) -/* AC54D8 80240368 18400006 */ blez $v0, .L80240384 -/* AC54DC 8024036C 24020004 */ addiu $v0, $zero, 4 -/* AC54E0 80240370 8E620008 */ lw $v0, 8($s3) -/* AC54E4 80240374 18400003 */ blez $v0, .L80240384 -/* AC54E8 80240378 24020004 */ addiu $v0, $zero, 4 -/* AC54EC 8024037C 14600002 */ bnez $v1, .L80240388 -/* AC54F0 80240380 00000000 */ nop -.L80240384: -/* AC54F4 80240384 AE420070 */ sw $v0, 0x70($s2) -.L80240388: -/* AC54F8 80240388 0C00A67F */ jal rand_int -/* AC54FC 8024038C 24042710 */ addiu $a0, $zero, 0x2710 -/* AC5500 80240390 3C0351EB */ lui $v1, 0x51eb -/* AC5504 80240394 3463851F */ ori $v1, $v1, 0x851f -/* AC5508 80240398 00430018 */ mult $v0, $v1 -/* AC550C 8024039C 00021FC3 */ sra $v1, $v0, 0x1f -/* AC5510 802403A0 00004010 */ mfhi $t0 -/* AC5514 802403A4 00082143 */ sra $a0, $t0, 5 -/* AC5518 802403A8 00832023 */ subu $a0, $a0, $v1 -/* AC551C 802403AC 00041840 */ sll $v1, $a0, 1 -/* AC5520 802403B0 00641821 */ addu $v1, $v1, $a0 -/* AC5524 802403B4 000318C0 */ sll $v1, $v1, 3 -/* AC5528 802403B8 00641821 */ addu $v1, $v1, $a0 -/* AC552C 802403BC 00031880 */ sll $v1, $v1, 2 -/* AC5530 802403C0 8E640004 */ lw $a0, 4($s3) -/* AC5534 802403C4 00431023 */ subu $v0, $v0, $v1 -/* AC5538 802403C8 0044102A */ slt $v0, $v0, $a0 -/* AC553C 802403CC 10400002 */ beqz $v0, .L802403D8 -/* AC5540 802403D0 24020004 */ addiu $v0, $zero, 4 -.L802403D4: -/* AC5544 802403D4 AE420070 */ sw $v0, 0x70($s2) -.L802403D8: -/* AC5548 802403D8 8FBF0044 */ lw $ra, 0x44($sp) -/* AC554C 802403DC 8FB40040 */ lw $s4, 0x40($sp) -/* AC5550 802403E0 8FB3003C */ lw $s3, 0x3c($sp) -/* AC5554 802403E4 8FB20038 */ lw $s2, 0x38($sp) -/* AC5558 802403E8 8FB10034 */ lw $s1, 0x34($sp) -/* AC555C 802403EC 8FB00030 */ lw $s0, 0x30($sp) -/* AC5560 802403F0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* AC5564 802403F4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* AC5568 802403F8 03E00008 */ jr $ra -/* AC556C 802403FC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/func_80240400_AC5170.s b/asm/nonmatchings/world/area_kkj/kkj_01/func_80240400_AC5170.s deleted file mode 100644 index a844cf06c8..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_01/func_80240400_AC5170.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_AC5570 -/* AC5570 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AC5574 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* AC5578 80240408 0080982D */ daddu $s3, $a0, $zero -/* AC557C 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* AC5580 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* AC5584 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* AC5588 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* AC558C 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* AC5590 80240420 86440008 */ lh $a0, 8($s2) -/* AC5594 80240424 0C00EABB */ jal get_npc_unsafe -/* AC5598 80240428 00A0882D */ daddu $s1, $a1, $zero -/* AC559C 8024042C 8E240008 */ lw $a0, 8($s1) -/* AC55A0 80240430 0040802D */ daddu $s0, $v0, $zero -/* AC55A4 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* AC55A8 80240438 00832021 */ addu $a0, $a0, $v1 -/* AC55AC 8024043C 00042043 */ sra $a0, $a0, 1 -/* AC55B0 80240440 0C00A67F */ jal rand_int -/* AC55B4 80240444 24840001 */ addiu $a0, $a0, 1 -/* AC55B8 80240448 8E230008 */ lw $v1, 8($s1) -/* AC55BC 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* AC55C0 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* AC55C4 80240454 00651821 */ addu $v1, $v1, $a1 -/* AC55C8 80240458 00031843 */ sra $v1, $v1, 1 -/* AC55CC 8024045C 00621821 */ addu $v1, $v1, $v0 -/* AC55D0 80240460 0C00A67F */ jal rand_int -/* AC55D4 80240464 A603008E */ sh $v1, 0x8e($s0) -/* AC55D8 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* AC55DC 8024046C 44820000 */ mtc1 $v0, $f0 -/* AC55E0 80240470 00000000 */ nop -/* AC55E4 80240474 46800020 */ cvt.s.w $f0, $f0 -/* AC55E8 80240478 46006300 */ add.s $f12, $f12, $f0 -/* AC55EC 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* AC55F0 80240480 44810000 */ mtc1 $at, $f0 -/* AC55F4 80240484 0C00A6C9 */ jal clamp_angle -/* AC55F8 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* AC55FC 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* AC5600 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* AC5604 80240494 8C420000 */ lw $v0, ($v0) -/* AC5608 80240498 AE020028 */ sw $v0, 0x28($s0) -/* AC560C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* AC5610 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* AC5614 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* AC5618 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* AC561C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* AC5620 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* AC5624 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* AC5628 802404B8 03E00008 */ jr $ra -/* AC562C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/func_802404C0_AC5170.s b/asm/nonmatchings/world/area_kkj/kkj_01/func_802404C0_AC5170.s deleted file mode 100644 index 17de51e274..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_01/func_802404C0_AC5170.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_AC5630 -/* AC5630 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AC5634 802404C4 AFB40040 */ sw $s4, 0x40($sp) -/* AC5638 802404C8 0080A02D */ daddu $s4, $a0, $zero -/* AC563C 802404CC AFBF0044 */ sw $ra, 0x44($sp) -/* AC5640 802404D0 AFB3003C */ sw $s3, 0x3c($sp) -/* AC5644 802404D4 AFB20038 */ sw $s2, 0x38($sp) -/* AC5648 802404D8 AFB10034 */ sw $s1, 0x34($sp) -/* AC564C 802404DC AFB00030 */ sw $s0, 0x30($sp) -/* AC5650 802404E0 8E910148 */ lw $s1, 0x148($s4) -/* AC5654 802404E4 00A0902D */ daddu $s2, $a1, $zero -/* AC5658 802404E8 86240008 */ lh $a0, 8($s1) -/* AC565C 802404EC 0C00EABB */ jal get_npc_unsafe -/* AC5660 802404F0 00C0982D */ daddu $s3, $a2, $zero -/* AC5664 802404F4 8E430014 */ lw $v1, 0x14($s2) -/* AC5668 802404F8 04600031 */ bltz $v1, .L802405C0 -/* AC566C 802404FC 0040802D */ daddu $s0, $v0, $zero -/* AC5670 80240500 0260202D */ daddu $a0, $s3, $zero -/* AC5674 80240504 AFA00010 */ sw $zero, 0x10($sp) -/* AC5678 80240508 8E460024 */ lw $a2, 0x24($s2) -/* AC567C 8024050C 8E470028 */ lw $a3, 0x28($s2) -/* AC5680 80240510 0C01242D */ jal func_800490B4 -/* AC5684 80240514 0220282D */ daddu $a1, $s1, $zero -/* AC5688 80240518 10400029 */ beqz $v0, .L802405C0 -/* AC568C 8024051C 0000202D */ daddu $a0, $zero, $zero -/* AC5690 80240520 0200282D */ daddu $a1, $s0, $zero -/* AC5694 80240524 0000302D */ daddu $a2, $zero, $zero -/* AC5698 80240528 860300A8 */ lh $v1, 0xa8($s0) -/* AC569C 8024052C 3C013F80 */ lui $at, 0x3f80 -/* AC56A0 80240530 44810000 */ mtc1 $at, $f0 -/* AC56A4 80240534 3C014000 */ lui $at, 0x4000 -/* AC56A8 80240538 44811000 */ mtc1 $at, $f2 -/* AC56AC 8024053C 3C01C1A0 */ lui $at, 0xc1a0 -/* AC56B0 80240540 44812000 */ mtc1 $at, $f4 -/* AC56B4 80240544 2402000F */ addiu $v0, $zero, 0xf -/* AC56B8 80240548 AFA2001C */ sw $v0, 0x1c($sp) -/* AC56BC 8024054C 44833000 */ mtc1 $v1, $f6 -/* AC56C0 80240550 00000000 */ nop -/* AC56C4 80240554 468031A0 */ cvt.s.w $f6, $f6 -/* AC56C8 80240558 44073000 */ mfc1 $a3, $f6 -/* AC56CC 8024055C 27A20028 */ addiu $v0, $sp, 0x28 -/* AC56D0 80240560 AFA20020 */ sw $v0, 0x20($sp) -/* AC56D4 80240564 E7A00010 */ swc1 $f0, 0x10($sp) -/* AC56D8 80240568 E7A20014 */ swc1 $f2, 0x14($sp) -/* AC56DC 8024056C 0C01BFA4 */ jal fx_emote -/* AC56E0 80240570 E7A40018 */ swc1 $f4, 0x18($sp) -/* AC56E4 80240574 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* AC56E8 80240578 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* AC56EC 8024057C C60C0038 */ lwc1 $f12, 0x38($s0) -/* AC56F0 80240580 C60E0040 */ lwc1 $f14, 0x40($s0) -/* AC56F4 80240584 8C460028 */ lw $a2, 0x28($v0) -/* AC56F8 80240588 0C00A720 */ jal atan2 -/* AC56FC 8024058C 8C470030 */ lw $a3, 0x30($v0) -/* AC5700 80240590 0200202D */ daddu $a0, $s0, $zero -/* AC5704 80240594 240502F4 */ addiu $a1, $zero, 0x2f4 -/* AC5708 80240598 3C060020 */ lui $a2, 0x20 -/* AC570C 8024059C 0C012530 */ jal func_800494C0 -/* AC5710 802405A0 E480000C */ swc1 $f0, 0xc($a0) -/* AC5714 802405A4 8E220018 */ lw $v0, 0x18($s1) -/* AC5718 802405A8 9442002A */ lhu $v0, 0x2a($v0) -/* AC571C 802405AC 30420001 */ andi $v0, $v0, 1 -/* AC5720 802405B0 14400029 */ bnez $v0, .L80240658 -/* AC5724 802405B4 2402000A */ addiu $v0, $zero, 0xa -/* AC5728 802405B8 08090196 */ j .L80240658 -/* AC572C 802405BC 2402000C */ addiu $v0, $zero, 0xc -.L802405C0: -/* AC5730 802405C0 8602008C */ lh $v0, 0x8c($s0) -/* AC5734 802405C4 14400025 */ bnez $v0, .L8024065C -/* AC5738 802405C8 00000000 */ nop -/* AC573C 802405CC 9602008E */ lhu $v0, 0x8e($s0) -/* AC5740 802405D0 2442FFFF */ addiu $v0, $v0, -1 -/* AC5744 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* AC5748 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* AC574C 802405DC 1440001F */ bnez $v0, .L8024065C -/* AC5750 802405E0 00000000 */ nop -/* AC5754 802405E4 8E820074 */ lw $v0, 0x74($s4) -/* AC5758 802405E8 2442FFFF */ addiu $v0, $v0, -1 -/* AC575C 802405EC 10400019 */ beqz $v0, .L80240654 -/* AC5760 802405F0 AE820074 */ sw $v0, 0x74($s4) -/* AC5764 802405F4 8E220018 */ lw $v0, 0x18($s1) -/* AC5768 802405F8 9442002A */ lhu $v0, 0x2a($v0) -/* AC576C 802405FC 30420010 */ andi $v0, $v0, 0x10 -/* AC5770 80240600 14400007 */ bnez $v0, .L80240620 -/* AC5774 80240604 00000000 */ nop -/* AC5778 80240608 C600000C */ lwc1 $f0, 0xc($s0) -/* AC577C 8024060C 3C014334 */ lui $at, 0x4334 -/* AC5780 80240610 44816000 */ mtc1 $at, $f12 -/* AC5784 80240614 0C00A6C9 */ jal clamp_angle -/* AC5788 80240618 460C0300 */ add.s $f12, $f0, $f12 -/* AC578C 8024061C E600000C */ swc1 $f0, 0xc($s0) -.L80240620: -/* AC5790 80240620 8E440008 */ lw $a0, 8($s2) -/* AC5794 80240624 000417C2 */ srl $v0, $a0, 0x1f -/* AC5798 80240628 00822021 */ addu $a0, $a0, $v0 -/* AC579C 8024062C 00042043 */ sra $a0, $a0, 1 -/* AC57A0 80240630 0C00A67F */ jal rand_int -/* AC57A4 80240634 24840001 */ addiu $a0, $a0, 1 -/* AC57A8 80240638 8E430008 */ lw $v1, 8($s2) -/* AC57AC 8024063C 000327C2 */ srl $a0, $v1, 0x1f -/* AC57B0 80240640 00641821 */ addu $v1, $v1, $a0 -/* AC57B4 80240644 00031843 */ sra $v1, $v1, 1 -/* AC57B8 80240648 00621821 */ addu $v1, $v1, $v0 -/* AC57BC 8024064C 08090197 */ j .L8024065C -/* AC57C0 80240650 A603008E */ sh $v1, 0x8e($s0) -.L80240654: -/* AC57C4 80240654 24020004 */ addiu $v0, $zero, 4 -.L80240658: -/* AC57C8 80240658 AE820070 */ sw $v0, 0x70($s4) -.L8024065C: -/* AC57CC 8024065C 8FBF0044 */ lw $ra, 0x44($sp) -/* AC57D0 80240660 8FB40040 */ lw $s4, 0x40($sp) -/* AC57D4 80240664 8FB3003C */ lw $s3, 0x3c($sp) -/* AC57D8 80240668 8FB20038 */ lw $s2, 0x38($sp) -/* AC57DC 8024066C 8FB10034 */ lw $s1, 0x34($sp) -/* AC57E0 80240670 8FB00030 */ lw $s0, 0x30($sp) -/* AC57E4 80240674 03E00008 */ jr $ra -/* AC57E8 80240678 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/func_8024067C_AC5170.s b/asm/nonmatchings/world/area_kkj/kkj_01/func_8024067C_AC5170.s deleted file mode 100644 index d26990c1a2..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_01/func_8024067C_AC5170.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024067C_AC57EC -/* AC57EC 8024067C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AC57F0 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* AC57F4 80240684 0080882D */ daddu $s1, $a0, $zero -/* AC57F8 80240688 AFBF001C */ sw $ra, 0x1c($sp) -/* AC57FC 8024068C AFB20018 */ sw $s2, 0x18($sp) -/* AC5800 80240690 AFB00010 */ sw $s0, 0x10($sp) -/* AC5804 80240694 8E300148 */ lw $s0, 0x148($s1) -/* AC5808 80240698 86040008 */ lh $a0, 8($s0) -/* AC580C 8024069C 0C00EABB */ jal get_npc_unsafe -/* AC5810 802406A0 00A0902D */ daddu $s2, $a1, $zero -/* AC5814 802406A4 8E230078 */ lw $v1, 0x78($s1) -/* AC5818 802406A8 24630001 */ addiu $v1, $v1, 1 -/* AC581C 802406AC AE230078 */ sw $v1, 0x78($s1) -/* AC5820 802406B0 8E0400D0 */ lw $a0, 0xd0($s0) -/* AC5824 802406B4 8C840000 */ lw $a0, ($a0) -/* AC5828 802406B8 0064182A */ slt $v1, $v1, $a0 -/* AC582C 802406BC 14600002 */ bnez $v1, .L802406C8 -/* AC5830 802406C0 0040282D */ daddu $a1, $v0, $zero -/* AC5834 802406C4 AE200078 */ sw $zero, 0x78($s1) -.L802406C8: -/* AC5838 802406C8 8E0200CC */ lw $v0, 0xcc($s0) -/* AC583C 802406CC 8C420004 */ lw $v0, 4($v0) -/* AC5840 802406D0 ACA20028 */ sw $v0, 0x28($a1) -/* AC5844 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* AC5848 802406D8 8C42007C */ lw $v0, 0x7c($v0) -/* AC584C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* AC5850 802406E0 00000000 */ nop -/* AC5854 802406E4 C6400000 */ lwc1 $f0, ($s2) -/* AC5858 802406E8 080901C4 */ j .L80240710 -/* AC585C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) -.L802406F0: -/* AC5860 802406F0 3C018024 */ lui $at, 0x8024 -/* AC5864 802406F4 D4223A18 */ ldc1 $f2, 0x3a18($at) -/* AC5868 802406F8 44820000 */ mtc1 $v0, $f0 -/* AC586C 802406FC 00000000 */ nop -/* AC5870 80240700 46800021 */ cvt.d.w $f0, $f0 -/* AC5874 80240704 46220003 */ div.d $f0, $f0, $f2 -/* AC5878 80240708 46200020 */ cvt.s.d $f0, $f0 -/* AC587C 8024070C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240710: -/* AC5880 80240710 24020001 */ addiu $v0, $zero, 1 -/* AC5884 80240714 AE220070 */ sw $v0, 0x70($s1) -/* AC5888 80240718 8FBF001C */ lw $ra, 0x1c($sp) -/* AC588C 8024071C 8FB20018 */ lw $s2, 0x18($sp) -/* AC5890 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* AC5894 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* AC5898 80240728 03E00008 */ jr $ra -/* AC589C 8024072C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/func_80240730_AC5170.s b/asm/nonmatchings/world/area_kkj/kkj_01/func_80240730_AC5170.s deleted file mode 100644 index 1dc7f17fb8..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_01/func_80240730_AC5170.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_AC58A0 -/* AC58A0 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AC58A4 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* AC58A8 80240738 0080882D */ daddu $s1, $a0, $zero -/* AC58AC 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* AC58B0 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* AC58B4 80240744 8E300148 */ lw $s0, 0x148($s1) -/* AC58B8 80240748 0C00EABB */ jal get_npc_unsafe -/* AC58BC 8024074C 86040008 */ lh $a0, 8($s0) -/* AC58C0 80240750 8E0300CC */ lw $v1, 0xcc($s0) -/* AC58C4 80240754 3C014120 */ lui $at, 0x4120 -/* AC58C8 80240758 44812000 */ mtc1 $at, $f4 -/* AC58CC 8024075C 3C014000 */ lui $at, 0x4000 -/* AC58D0 80240760 44810000 */ mtc1 $at, $f0 -/* AC58D4 80240764 C442003C */ lwc1 $f2, 0x3c($v0) -/* AC58D8 80240768 8C640010 */ lw $a0, 0x10($v1) -/* AC58DC 8024076C 8C430000 */ lw $v1, ($v0) -/* AC58E0 80240770 E444001C */ swc1 $f4, 0x1c($v0) -/* AC58E4 80240774 E4400014 */ swc1 $f0, 0x14($v0) -/* AC58E8 80240778 E4420064 */ swc1 $f2, 0x64($v0) -/* AC58EC 8024077C 34630800 */ ori $v1, $v1, 0x800 -/* AC58F0 80240780 AC430000 */ sw $v1, ($v0) -/* AC58F4 80240784 AC440028 */ sw $a0, 0x28($v0) -/* AC58F8 80240788 2402000B */ addiu $v0, $zero, 0xb -/* AC58FC 8024078C AE220070 */ sw $v0, 0x70($s1) -/* AC5900 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* AC5904 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* AC5908 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* AC590C 8024079C 03E00008 */ jr $ra -/* AC5910 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/func_802407A4_AC5170.s b/asm/nonmatchings/world/area_kkj/kkj_01/func_802407A4_AC5170.s deleted file mode 100644 index f423faed44..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_01/func_802407A4_AC5170.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4_AC5914 -/* AC5914 802407A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AC5918 802407A8 AFB00010 */ sw $s0, 0x10($sp) -/* AC591C 802407AC 0080802D */ daddu $s0, $a0, $zero -/* AC5920 802407B0 AFBF0014 */ sw $ra, 0x14($sp) -/* AC5924 802407B4 8E020148 */ lw $v0, 0x148($s0) -/* AC5928 802407B8 0C00EABB */ jal get_npc_unsafe -/* AC592C 802407BC 84440008 */ lh $a0, 8($v0) -/* AC5930 802407C0 0040202D */ daddu $a0, $v0, $zero -/* AC5934 802407C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* AC5938 802407C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* AC593C 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* AC5940 802407D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* AC5944 802407D4 46040001 */ sub.s $f0, $f0, $f4 -/* AC5948 802407D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* AC594C 802407DC 4602203C */ c.lt.s $f4, $f2 -/* AC5950 802407E0 E482003C */ swc1 $f2, 0x3c($a0) -/* AC5954 802407E4 45010009 */ bc1t .L8024080C -/* AC5958 802407E8 E480001C */ swc1 $f0, 0x1c($a0) -/* AC595C 802407EC 8C820000 */ lw $v0, ($a0) -/* AC5960 802407F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* AC5964 802407F4 E484003C */ swc1 $f4, 0x3c($a0) -/* AC5968 802407F8 AC80001C */ sw $zero, 0x1c($a0) -/* AC596C 802407FC 00431024 */ and $v0, $v0, $v1 -/* AC5970 80240800 AC820000 */ sw $v0, ($a0) -/* AC5974 80240804 2402000C */ addiu $v0, $zero, 0xc -/* AC5978 80240808 AE020070 */ sw $v0, 0x70($s0) -.L8024080C: -/* AC597C 8024080C 8FBF0014 */ lw $ra, 0x14($sp) -/* AC5980 80240810 8FB00010 */ lw $s0, 0x10($sp) -/* AC5984 80240814 03E00008 */ jr $ra -/* AC5988 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/func_8024081C_AC5170.s b/asm/nonmatchings/world/area_kkj/kkj_01/func_8024081C_AC5170.s deleted file mode 100644 index b01ac1c7ce..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_01/func_8024081C_AC5170.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024081C_AC598C -/* AC598C 8024081C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AC5990 80240820 AFB3001C */ sw $s3, 0x1c($sp) -/* AC5994 80240824 0080982D */ daddu $s3, $a0, $zero -/* AC5998 80240828 AFBF0020 */ sw $ra, 0x20($sp) -/* AC599C 8024082C AFB20018 */ sw $s2, 0x18($sp) -/* AC59A0 80240830 AFB10014 */ sw $s1, 0x14($sp) -/* AC59A4 80240834 AFB00010 */ sw $s0, 0x10($sp) -/* AC59A8 80240838 F7B40028 */ sdc1 $f20, 0x28($sp) -/* AC59AC 8024083C 8E710148 */ lw $s1, 0x148($s3) -/* AC59B0 80240840 86240008 */ lh $a0, 8($s1) -/* AC59B4 80240844 0C00EABB */ jal get_npc_unsafe -/* AC59B8 80240848 00A0802D */ daddu $s0, $a1, $zero -/* AC59BC 8024084C 8E040020 */ lw $a0, 0x20($s0) -/* AC59C0 80240850 0040902D */ daddu $s2, $v0, $zero -/* AC59C4 80240854 00041FC2 */ srl $v1, $a0, 0x1f -/* AC59C8 80240858 00832021 */ addu $a0, $a0, $v1 -/* AC59CC 8024085C 00042043 */ sra $a0, $a0, 1 -/* AC59D0 80240860 0C00A67F */ jal rand_int -/* AC59D4 80240864 24840001 */ addiu $a0, $a0, 1 -/* AC59D8 80240868 8E030020 */ lw $v1, 0x20($s0) -/* AC59DC 8024086C C64C0038 */ lwc1 $f12, 0x38($s2) -/* AC59E0 80240870 000327C2 */ srl $a0, $v1, 0x1f -/* AC59E4 80240874 00641821 */ addu $v1, $v1, $a0 -/* AC59E8 80240878 00031843 */ sra $v1, $v1, 1 -/* AC59EC 8024087C 00621821 */ addu $v1, $v1, $v0 -/* AC59F0 80240880 A643008E */ sh $v1, 0x8e($s2) -/* AC59F4 80240884 8E2200CC */ lw $v0, 0xcc($s1) -/* AC59F8 80240888 C64E0040 */ lwc1 $f14, 0x40($s2) -/* AC59FC 8024088C 8C42000C */ lw $v0, 0xc($v0) -/* AC5A00 80240890 AE420028 */ sw $v0, 0x28($s2) -/* AC5A04 80240894 C6000018 */ lwc1 $f0, 0x18($s0) -/* AC5A08 80240898 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* AC5A0C 8024089C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* AC5A10 802408A0 E6400018 */ swc1 $f0, 0x18($s2) -/* AC5A14 802408A4 8C460028 */ lw $a2, 0x28($v0) -/* AC5A18 802408A8 0C00A720 */ jal atan2 -/* AC5A1C 802408AC 8C470030 */ lw $a3, 0x30($v0) -/* AC5A20 802408B0 46000506 */ mov.s $f20, $f0 -/* AC5A24 802408B4 C64C000C */ lwc1 $f12, 0xc($s2) -/* AC5A28 802408B8 0C00A70A */ jal get_clamped_angle_diff -/* AC5A2C 802408BC 4600A386 */ mov.s $f14, $f20 -/* AC5A30 802408C0 46000086 */ mov.s $f2, $f0 -/* AC5A34 802408C4 8E02001C */ lw $v0, 0x1c($s0) -/* AC5A38 802408C8 46001005 */ abs.s $f0, $f2 -/* AC5A3C 802408CC 44822000 */ mtc1 $v0, $f4 -/* AC5A40 802408D0 00000000 */ nop -/* AC5A44 802408D4 46802120 */ cvt.s.w $f4, $f4 -/* AC5A48 802408D8 4600203C */ c.lt.s $f4, $f0 -/* AC5A4C 802408DC 00000000 */ nop -/* AC5A50 802408E0 4500000D */ bc1f .L80240918 -/* AC5A54 802408E4 00000000 */ nop -/* AC5A58 802408E8 44800000 */ mtc1 $zero, $f0 -/* AC5A5C 802408EC C654000C */ lwc1 $f20, 0xc($s2) -/* AC5A60 802408F0 4600103C */ c.lt.s $f2, $f0 -/* AC5A64 802408F4 00000000 */ nop -/* AC5A68 802408F8 45000006 */ bc1f .L80240914 -/* AC5A6C 802408FC 00021023 */ negu $v0, $v0 -/* AC5A70 80240900 44820000 */ mtc1 $v0, $f0 -/* AC5A74 80240904 00000000 */ nop -/* AC5A78 80240908 46800020 */ cvt.s.w $f0, $f0 -/* AC5A7C 8024090C 08090246 */ j .L80240918 -/* AC5A80 80240910 4600A500 */ add.s $f20, $f20, $f0 -.L80240914: -/* AC5A84 80240914 4604A500 */ add.s $f20, $f20, $f4 -.L80240918: -/* AC5A88 80240918 0C00A6C9 */ jal clamp_angle -/* AC5A8C 8024091C 4600A306 */ mov.s $f12, $f20 -/* AC5A90 80240920 2402000D */ addiu $v0, $zero, 0xd -/* AC5A94 80240924 E640000C */ swc1 $f0, 0xc($s2) -/* AC5A98 80240928 AE620070 */ sw $v0, 0x70($s3) -/* AC5A9C 8024092C 8FBF0020 */ lw $ra, 0x20($sp) -/* AC5AA0 80240930 8FB3001C */ lw $s3, 0x1c($sp) -/* AC5AA4 80240934 8FB20018 */ lw $s2, 0x18($sp) -/* AC5AA8 80240938 8FB10014 */ lw $s1, 0x14($sp) -/* AC5AAC 8024093C 8FB00010 */ lw $s0, 0x10($sp) -/* AC5AB0 80240940 D7B40028 */ ldc1 $f20, 0x28($sp) -/* AC5AB4 80240944 03E00008 */ jr $ra -/* AC5AB8 80240948 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/func_8024094C_AC5170.s b/asm/nonmatchings/world/area_kkj/kkj_01/func_8024094C_AC5170.s deleted file mode 100644 index 33ca2cd7a7..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_01/func_8024094C_AC5170.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024094C_AC5ABC -/* AC5ABC 8024094C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AC5AC0 80240950 AFB3003C */ sw $s3, 0x3c($sp) -/* AC5AC4 80240954 0080982D */ daddu $s3, $a0, $zero -/* AC5AC8 80240958 AFBF0040 */ sw $ra, 0x40($sp) -/* AC5ACC 8024095C AFB20038 */ sw $s2, 0x38($sp) -/* AC5AD0 80240960 AFB10034 */ sw $s1, 0x34($sp) -/* AC5AD4 80240964 AFB00030 */ sw $s0, 0x30($sp) -/* AC5AD8 80240968 8E720148 */ lw $s2, 0x148($s3) -/* AC5ADC 8024096C 00A0882D */ daddu $s1, $a1, $zero -/* AC5AE0 80240970 86440008 */ lh $a0, 8($s2) -/* AC5AE4 80240974 0C00EABB */ jal get_npc_unsafe -/* AC5AE8 80240978 00C0802D */ daddu $s0, $a2, $zero -/* AC5AEC 8024097C 0200202D */ daddu $a0, $s0, $zero -/* AC5AF0 80240980 0240282D */ daddu $a1, $s2, $zero -/* AC5AF4 80240984 24030001 */ addiu $v1, $zero, 1 -/* AC5AF8 80240988 AFA30010 */ sw $v1, 0x10($sp) -/* AC5AFC 8024098C 8E260024 */ lw $a2, 0x24($s1) -/* AC5B00 80240990 8E270028 */ lw $a3, 0x28($s1) -/* AC5B04 80240994 0C01242D */ jal func_800490B4 -/* AC5B08 80240998 0040802D */ daddu $s0, $v0, $zero -/* AC5B0C 8024099C 1440001E */ bnez $v0, .L80240A18 -/* AC5B10 802409A0 0200202D */ daddu $a0, $s0, $zero -/* AC5B14 802409A4 24040002 */ addiu $a0, $zero, 2 -/* AC5B18 802409A8 0200282D */ daddu $a1, $s0, $zero -/* AC5B1C 802409AC 0000302D */ daddu $a2, $zero, $zero -/* AC5B20 802409B0 860300A8 */ lh $v1, 0xa8($s0) -/* AC5B24 802409B4 3C013F80 */ lui $at, 0x3f80 -/* AC5B28 802409B8 44810000 */ mtc1 $at, $f0 -/* AC5B2C 802409BC 3C014000 */ lui $at, 0x4000 -/* AC5B30 802409C0 44811000 */ mtc1 $at, $f2 -/* AC5B34 802409C4 3C01C1A0 */ lui $at, 0xc1a0 -/* AC5B38 802409C8 44812000 */ mtc1 $at, $f4 -/* AC5B3C 802409CC 2402000F */ addiu $v0, $zero, 0xf -/* AC5B40 802409D0 AFA2001C */ sw $v0, 0x1c($sp) -/* AC5B44 802409D4 44833000 */ mtc1 $v1, $f6 -/* AC5B48 802409D8 00000000 */ nop -/* AC5B4C 802409DC 468031A0 */ cvt.s.w $f6, $f6 -/* AC5B50 802409E0 44073000 */ mfc1 $a3, $f6 -/* AC5B54 802409E4 27A20028 */ addiu $v0, $sp, 0x28 -/* AC5B58 802409E8 AFA20020 */ sw $v0, 0x20($sp) -/* AC5B5C 802409EC E7A00010 */ swc1 $f0, 0x10($sp) -/* AC5B60 802409F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* AC5B64 802409F4 0C01BFA4 */ jal fx_emote -/* AC5B68 802409F8 E7A40018 */ swc1 $f4, 0x18($sp) -/* AC5B6C 802409FC 8E4200CC */ lw $v0, 0xcc($s2) -/* AC5B70 80240A00 8C430000 */ lw $v1, ($v0) -/* AC5B74 80240A04 24020019 */ addiu $v0, $zero, 0x19 -/* AC5B78 80240A08 A602008E */ sh $v0, 0x8e($s0) -/* AC5B7C 80240A0C 2402000E */ addiu $v0, $zero, 0xe -/* AC5B80 80240A10 08090293 */ j .L80240A4C -/* AC5B84 80240A14 AE030028 */ sw $v1, 0x28($s0) -.L80240A18: -/* AC5B88 80240A18 0C00F598 */ jal func_8003D660 -/* AC5B8C 80240A1C 24050001 */ addiu $a1, $zero, 1 -/* AC5B90 80240A20 8E050018 */ lw $a1, 0x18($s0) -/* AC5B94 80240A24 8E06000C */ lw $a2, 0xc($s0) -/* AC5B98 80240A28 0C00EA95 */ jal npc_move_heading -/* AC5B9C 80240A2C 0200202D */ daddu $a0, $s0, $zero -/* AC5BA0 80240A30 8602008E */ lh $v0, 0x8e($s0) -/* AC5BA4 80240A34 9603008E */ lhu $v1, 0x8e($s0) -/* AC5BA8 80240A38 18400003 */ blez $v0, .L80240A48 -/* AC5BAC 80240A3C 2462FFFF */ addiu $v0, $v1, -1 -/* AC5BB0 80240A40 08090294 */ j .L80240A50 -/* AC5BB4 80240A44 A602008E */ sh $v0, 0x8e($s0) -.L80240A48: -/* AC5BB8 80240A48 2402000C */ addiu $v0, $zero, 0xc -.L80240A4C: -/* AC5BBC 80240A4C AE620070 */ sw $v0, 0x70($s3) -.L80240A50: -/* AC5BC0 80240A50 8FBF0040 */ lw $ra, 0x40($sp) -/* AC5BC4 80240A54 8FB3003C */ lw $s3, 0x3c($sp) -/* AC5BC8 80240A58 8FB20038 */ lw $s2, 0x38($sp) -/* AC5BCC 80240A5C 8FB10034 */ lw $s1, 0x34($sp) -/* AC5BD0 80240A60 8FB00030 */ lw $s0, 0x30($sp) -/* AC5BD4 80240A64 03E00008 */ jr $ra -/* AC5BD8 80240A68 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/func_80240A6C_AC5170.s b/asm/nonmatchings/world/area_kkj/kkj_01/func_80240A6C_AC5170.s deleted file mode 100644 index c7af9efa79..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_01/func_80240A6C_AC5170.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_AC5BDC -/* AC5BDC 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AC5BE0 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* AC5BE4 80240A74 0080882D */ daddu $s1, $a0, $zero -/* AC5BE8 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* AC5BEC 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* AC5BF0 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* AC5BF4 80240A84 0C00EABB */ jal get_npc_unsafe -/* AC5BF8 80240A88 86040008 */ lh $a0, 8($s0) -/* AC5BFC 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* AC5C00 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* AC5C04 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* AC5C08 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* AC5C0C 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* AC5C10 80240AA0 00000000 */ nop -/* AC5C14 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* AC5C18 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* AC5C1C 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* AC5C20 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* AC5C24 80240AB4 080902B0 */ j .L80240AC0 -/* AC5C28 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* AC5C2C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* AC5C30 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* AC5C34 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* AC5C38 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* AC5C3C 80240ACC 03E00008 */ jr $ra -/* AC5C40 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/func_80240AD4_AC5170.s b/asm/nonmatchings/world/area_kkj/kkj_01/func_80240AD4_AC5170.s deleted file mode 100644 index 2baf0cc329..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_01/func_80240AD4_AC5170.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD4_AC5C44 -/* AC5C44 80240AD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AC5C48 80240AD8 AFB10014 */ sw $s1, 0x14($sp) -/* AC5C4C 80240ADC 0080882D */ daddu $s1, $a0, $zero -/* AC5C50 80240AE0 AFBF001C */ sw $ra, 0x1c($sp) -/* AC5C54 80240AE4 AFB20018 */ sw $s2, 0x18($sp) -/* AC5C58 80240AE8 AFB00010 */ sw $s0, 0x10($sp) -/* AC5C5C 80240AEC 8E300148 */ lw $s0, 0x148($s1) -/* AC5C60 80240AF0 86040008 */ lh $a0, 8($s0) -/* AC5C64 80240AF4 0C00EABB */ jal get_npc_unsafe -/* AC5C68 80240AF8 00A0902D */ daddu $s2, $a1, $zero -/* AC5C6C 80240AFC 8E0300D0 */ lw $v1, 0xd0($s0) -/* AC5C70 80240B00 8E240078 */ lw $a0, 0x78($s1) -/* AC5C74 80240B04 8C630000 */ lw $v1, ($v1) -/* AC5C78 80240B08 0083182A */ slt $v1, $a0, $v1 -/* AC5C7C 80240B0C 10600013 */ beqz $v1, .L80240B5C -/* AC5C80 80240B10 0040302D */ daddu $a2, $v0, $zero -/* AC5C84 80240B14 00041040 */ sll $v0, $a0, 1 -/* AC5C88 80240B18 00441021 */ addu $v0, $v0, $a0 -/* AC5C8C 80240B1C 00022880 */ sll $a1, $v0, 2 -.L80240B20: -/* AC5C90 80240B20 8E0300D0 */ lw $v1, 0xd0($s0) -/* AC5C94 80240B24 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* AC5C98 80240B28 00A31021 */ addu $v0, $a1, $v1 -/* AC5C9C 80240B2C C4400008 */ lwc1 $f0, 8($v0) -/* AC5CA0 80240B30 46800020 */ cvt.s.w $f0, $f0 -/* AC5CA4 80240B34 4602003E */ c.le.s $f0, $f2 -/* AC5CA8 80240B38 00000000 */ nop -/* AC5CAC 80240B3C 45020003 */ bc1fl .L80240B4C -/* AC5CB0 80240B40 24840001 */ addiu $a0, $a0, 1 -/* AC5CB4 80240B44 080902D7 */ j .L80240B5C -/* AC5CB8 80240B48 AE240078 */ sw $a0, 0x78($s1) -.L80240B4C: -/* AC5CBC 80240B4C 8C620000 */ lw $v0, ($v1) -/* AC5CC0 80240B50 0082102A */ slt $v0, $a0, $v0 -/* AC5CC4 80240B54 1440FFF2 */ bnez $v0, .L80240B20 -/* AC5CC8 80240B58 24A5000C */ addiu $a1, $a1, 0xc -.L80240B5C: -/* AC5CCC 80240B5C C6400000 */ lwc1 $f0, ($s2) -/* AC5CD0 80240B60 E4C00018 */ swc1 $f0, 0x18($a2) -/* AC5CD4 80240B64 8E0200CC */ lw $v0, 0xcc($s0) -/* AC5CD8 80240B68 8C420004 */ lw $v0, 4($v0) -/* AC5CDC 80240B6C ACC20028 */ sw $v0, 0x28($a2) -/* AC5CE0 80240B70 24020001 */ addiu $v0, $zero, 1 -/* AC5CE4 80240B74 AE200074 */ sw $zero, 0x74($s1) -/* AC5CE8 80240B78 AE220070 */ sw $v0, 0x70($s1) -/* AC5CEC 80240B7C 8FBF001C */ lw $ra, 0x1c($sp) -/* AC5CF0 80240B80 8FB20018 */ lw $s2, 0x18($sp) -/* AC5CF4 80240B84 8FB10014 */ lw $s1, 0x14($sp) -/* AC5CF8 80240B88 8FB00010 */ lw $s0, 0x10($sp) -/* AC5CFC 80240B8C 03E00008 */ jr $ra -/* AC5D00 80240B90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/func_80240B94_AC5170.s b/asm/nonmatchings/world/area_kkj/kkj_01/func_80240B94_AC5170.s deleted file mode 100644 index 6af2c285b2..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_01/func_80240B94_AC5170.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B94_AC5D04 -/* AC5D04 80240B94 27BDFF98 */ addiu $sp, $sp, -0x68 -/* AC5D08 80240B98 AFB40058 */ sw $s4, 0x58($sp) -/* AC5D0C 80240B9C 0080A02D */ daddu $s4, $a0, $zero -/* AC5D10 80240BA0 AFBF0060 */ sw $ra, 0x60($sp) -/* AC5D14 80240BA4 AFB5005C */ sw $s5, 0x5c($sp) -/* AC5D18 80240BA8 AFB30054 */ sw $s3, 0x54($sp) -/* AC5D1C 80240BAC AFB20050 */ sw $s2, 0x50($sp) -/* AC5D20 80240BB0 AFB1004C */ sw $s1, 0x4c($sp) -/* AC5D24 80240BB4 AFB00048 */ sw $s0, 0x48($sp) -/* AC5D28 80240BB8 8E910148 */ lw $s1, 0x148($s4) -/* AC5D2C 80240BBC 86240008 */ lh $a0, 8($s1) -/* AC5D30 80240BC0 0C00EABB */ jal get_npc_unsafe -/* AC5D34 80240BC4 00A0802D */ daddu $s0, $a1, $zero -/* AC5D38 80240BC8 8E83000C */ lw $v1, 0xc($s4) -/* AC5D3C 80240BCC 0280202D */ daddu $a0, $s4, $zero -/* AC5D40 80240BD0 8C650000 */ lw $a1, ($v1) -/* AC5D44 80240BD4 0C0B1EAF */ jal get_variable -/* AC5D48 80240BD8 0040902D */ daddu $s2, $v0, $zero -/* AC5D4C 80240BDC AFA00018 */ sw $zero, 0x18($sp) -/* AC5D50 80240BE0 8E2300D0 */ lw $v1, 0xd0($s1) -/* AC5D54 80240BE4 8C630094 */ lw $v1, 0x94($v1) -/* AC5D58 80240BE8 AFA3001C */ sw $v1, 0x1c($sp) -/* AC5D5C 80240BEC 8E2300D0 */ lw $v1, 0xd0($s1) -/* AC5D60 80240BF0 8C630080 */ lw $v1, 0x80($v1) -/* AC5D64 80240BF4 AFA30020 */ sw $v1, 0x20($sp) -/* AC5D68 80240BF8 8E2300D0 */ lw $v1, 0xd0($s1) -/* AC5D6C 80240BFC 8C630088 */ lw $v1, 0x88($v1) -/* AC5D70 80240C00 AFA30024 */ sw $v1, 0x24($sp) -/* AC5D74 80240C04 8E2300D0 */ lw $v1, 0xd0($s1) -/* AC5D78 80240C08 8C63008C */ lw $v1, 0x8c($v1) -/* AC5D7C 80240C0C 27B50018 */ addiu $s5, $sp, 0x18 -/* AC5D80 80240C10 AFA30028 */ sw $v1, 0x28($sp) -/* AC5D84 80240C14 8E2300D0 */ lw $v1, 0xd0($s1) -/* AC5D88 80240C18 3C014282 */ lui $at, 0x4282 -/* AC5D8C 80240C1C 44810000 */ mtc1 $at, $f0 -/* AC5D90 80240C20 8C630090 */ lw $v1, 0x90($v1) -/* AC5D94 80240C24 0040982D */ daddu $s3, $v0, $zero -/* AC5D98 80240C28 E7A00030 */ swc1 $f0, 0x30($sp) -/* AC5D9C 80240C2C A7A00034 */ sh $zero, 0x34($sp) -/* AC5DA0 80240C30 16000005 */ bnez $s0, .L80240C48 -/* AC5DA4 80240C34 AFA3002C */ sw $v1, 0x2c($sp) -/* AC5DA8 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) -/* AC5DAC 80240C3C 30420004 */ andi $v0, $v0, 4 -/* AC5DB0 80240C40 10400044 */ beqz $v0, .L80240D54 -/* AC5DB4 80240C44 00000000 */ nop -.L80240C48: -/* AC5DB8 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 -/* AC5DBC 80240C4C AE800070 */ sw $zero, 0x70($s4) -/* AC5DC0 80240C50 A640008E */ sh $zero, 0x8e($s2) -/* AC5DC4 80240C54 8E2200CC */ lw $v0, 0xcc($s1) -/* AC5DC8 80240C58 8E430000 */ lw $v1, ($s2) -/* AC5DCC 80240C5C 8C420000 */ lw $v0, ($v0) -/* AC5DD0 80240C60 00641824 */ and $v1, $v1, $a0 -/* AC5DD4 80240C64 AE430000 */ sw $v1, ($s2) -/* AC5DD8 80240C68 AE420028 */ sw $v0, 0x28($s2) -/* AC5DDC 80240C6C 8E2200D0 */ lw $v0, 0xd0($s1) -/* AC5DE0 80240C70 8C420098 */ lw $v0, 0x98($v0) -/* AC5DE4 80240C74 54400005 */ bnel $v0, $zero, .L80240C8C -/* AC5DE8 80240C78 2402FDFF */ addiu $v0, $zero, -0x201 -/* AC5DEC 80240C7C 34620200 */ ori $v0, $v1, 0x200 -/* AC5DF0 80240C80 2403FFF7 */ addiu $v1, $zero, -9 -/* AC5DF4 80240C84 08090325 */ j .L80240C94 -/* AC5DF8 80240C88 00431024 */ and $v0, $v0, $v1 -.L80240C8C: -/* AC5DFC 80240C8C 00621024 */ and $v0, $v1, $v0 -/* AC5E00 80240C90 34420008 */ ori $v0, $v0, 8 -.L80240C94: -/* AC5E04 80240C94 AE420000 */ sw $v0, ($s2) -/* AC5E08 80240C98 8E2200B0 */ lw $v0, 0xb0($s1) -/* AC5E0C 80240C9C 30420004 */ andi $v0, $v0, 4 -/* AC5E10 80240CA0 10400008 */ beqz $v0, .L80240CC4 -/* AC5E14 80240CA4 24020063 */ addiu $v0, $zero, 0x63 -/* AC5E18 80240CA8 AE820070 */ sw $v0, 0x70($s4) -/* AC5E1C 80240CAC AE800074 */ sw $zero, 0x74($s4) -/* AC5E20 80240CB0 8E2200B0 */ lw $v0, 0xb0($s1) -/* AC5E24 80240CB4 2403FFFB */ addiu $v1, $zero, -5 -/* AC5E28 80240CB8 00431024 */ and $v0, $v0, $v1 -/* AC5E2C 80240CBC 0809033C */ j .L80240CF0 -/* AC5E30 80240CC0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240CC4: -/* AC5E34 80240CC4 8E220000 */ lw $v0, ($s1) -/* AC5E38 80240CC8 3C034000 */ lui $v1, 0x4000 -/* AC5E3C 80240CCC 00431024 */ and $v0, $v0, $v1 -/* AC5E40 80240CD0 10400007 */ beqz $v0, .L80240CF0 -/* AC5E44 80240CD4 3C03BFFF */ lui $v1, 0xbfff -/* AC5E48 80240CD8 2402000C */ addiu $v0, $zero, 0xc -/* AC5E4C 80240CDC AE820070 */ sw $v0, 0x70($s4) -/* AC5E50 80240CE0 8E220000 */ lw $v0, ($s1) -/* AC5E54 80240CE4 3463FFFF */ ori $v1, $v1, 0xffff -/* AC5E58 80240CE8 00431024 */ and $v0, $v0, $v1 -/* AC5E5C 80240CEC AE220000 */ sw $v0, ($s1) -.L80240CF0: -/* AC5E60 80240CF0 27A50038 */ addiu $a1, $sp, 0x38 -/* AC5E64 80240CF4 27A6003C */ addiu $a2, $sp, 0x3c -/* AC5E68 80240CF8 C6400038 */ lwc1 $f0, 0x38($s2) -/* AC5E6C 80240CFC 864200A8 */ lh $v0, 0xa8($s2) -/* AC5E70 80240D00 3C0142C8 */ lui $at, 0x42c8 -/* AC5E74 80240D04 44812000 */ mtc1 $at, $f4 -/* AC5E78 80240D08 44823000 */ mtc1 $v0, $f6 -/* AC5E7C 80240D0C 00000000 */ nop -/* AC5E80 80240D10 468031A0 */ cvt.s.w $f6, $f6 -/* AC5E84 80240D14 27A20044 */ addiu $v0, $sp, 0x44 -/* AC5E88 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) -/* AC5E8C 80240D1C C640003C */ lwc1 $f0, 0x3c($s2) -/* AC5E90 80240D20 C6420040 */ lwc1 $f2, 0x40($s2) -/* AC5E94 80240D24 46060000 */ add.s $f0, $f0, $f6 -/* AC5E98 80240D28 E7A40044 */ swc1 $f4, 0x44($sp) -/* AC5E9C 80240D2C E7A20040 */ swc1 $f2, 0x40($sp) -/* AC5EA0 80240D30 E7A0003C */ swc1 $f0, 0x3c($sp) -/* AC5EA4 80240D34 AFA20010 */ sw $v0, 0x10($sp) -/* AC5EA8 80240D38 8E440080 */ lw $a0, 0x80($s2) -/* AC5EAC 80240D3C 0C0372DF */ jal func_800DCB7C -/* AC5EB0 80240D40 27A70040 */ addiu $a3, $sp, 0x40 -/* AC5EB4 80240D44 10400003 */ beqz $v0, .L80240D54 -/* AC5EB8 80240D48 00000000 */ nop -/* AC5EBC 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* AC5EC0 80240D50 E640003C */ swc1 $f0, 0x3c($s2) -.L80240D54: -/* AC5EC4 80240D54 8E830070 */ lw $v1, 0x70($s4) -/* AC5EC8 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* AC5ECC 80240D5C 10400042 */ beqz $v0, .L80240E68 -/* AC5ED0 80240D60 00031080 */ sll $v0, $v1, 2 -/* AC5ED4 80240D64 3C018024 */ lui $at, 0x8024 -/* AC5ED8 80240D68 00220821 */ addu $at, $at, $v0 -/* AC5EDC 80240D6C 8C223A20 */ lw $v0, 0x3a20($at) -/* AC5EE0 80240D70 00400008 */ jr $v0 -/* AC5EE4 80240D74 00000000 */ nop -/* AC5EE8 80240D78 0280202D */ daddu $a0, $s4, $zero -/* AC5EEC 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* AC5EF0 80240D80 0C090000 */ jal func_80240000 -/* AC5EF4 80240D84 02A0302D */ daddu $a2, $s5, $zero -/* AC5EF8 80240D88 0280202D */ daddu $a0, $s4, $zero -/* AC5EFC 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* AC5F00 80240D90 0C090056 */ jal func_80240158 -/* AC5F04 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* AC5F08 80240D98 0809039A */ j .L80240E68 -/* AC5F0C 80240D9C 00000000 */ nop -/* AC5F10 80240DA0 0280202D */ daddu $a0, $s4, $zero -/* AC5F14 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* AC5F18 80240DA8 0C090100 */ jal func_80240400 -/* AC5F1C 80240DAC 02A0302D */ daddu $a2, $s5, $zero -/* AC5F20 80240DB0 0280202D */ daddu $a0, $s4, $zero -/* AC5F24 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* AC5F28 80240DB8 0C090130 */ jal func_802404C0 -/* AC5F2C 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* AC5F30 80240DC0 0809039A */ j .L80240E68 -/* AC5F34 80240DC4 00000000 */ nop -/* AC5F38 80240DC8 0280202D */ daddu $a0, $s4, $zero -/* AC5F3C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* AC5F40 80240DD0 0C09019F */ jal func_8024067C -/* AC5F44 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* AC5F48 80240DD8 0809039A */ j .L80240E68 -/* AC5F4C 80240DDC 00000000 */ nop -/* AC5F50 80240DE0 0280202D */ daddu $a0, $s4, $zero -/* AC5F54 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* AC5F58 80240DE8 0C0901CC */ jal func_80240730 -/* AC5F5C 80240DEC 02A0302D */ daddu $a2, $s5, $zero -/* AC5F60 80240DF0 0280202D */ daddu $a0, $s4, $zero -/* AC5F64 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* AC5F68 80240DF8 0C0901E9 */ jal func_802407A4 -/* AC5F6C 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* AC5F70 80240E00 0809039A */ j .L80240E68 -/* AC5F74 80240E04 00000000 */ nop -/* AC5F78 80240E08 0280202D */ daddu $a0, $s4, $zero -/* AC5F7C 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* AC5F80 80240E10 0C090207 */ jal func_8024081C -/* AC5F84 80240E14 02A0302D */ daddu $a2, $s5, $zero -/* AC5F88 80240E18 0280202D */ daddu $a0, $s4, $zero -/* AC5F8C 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* AC5F90 80240E20 0C090253 */ jal func_8024094C -/* AC5F94 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* AC5F98 80240E28 0809039A */ j .L80240E68 -/* AC5F9C 80240E2C 00000000 */ nop -/* AC5FA0 80240E30 0280202D */ daddu $a0, $s4, $zero -/* AC5FA4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* AC5FA8 80240E38 0C09029B */ jal func_80240A6C -/* AC5FAC 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* AC5FB0 80240E40 0809039A */ j .L80240E68 -/* AC5FB4 80240E44 00000000 */ nop -/* AC5FB8 80240E48 0280202D */ daddu $a0, $s4, $zero -/* AC5FBC 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* AC5FC0 80240E50 0C0902B5 */ jal func_80240AD4 -/* AC5FC4 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* AC5FC8 80240E58 0809039A */ j .L80240E68 -/* AC5FCC 80240E5C 00000000 */ nop -/* AC5FD0 80240E60 0C0129CF */ jal func_8004A73C -/* AC5FD4 80240E64 0280202D */ daddu $a0, $s4, $zero -.L80240E68: -/* AC5FD8 80240E68 8FBF0060 */ lw $ra, 0x60($sp) -/* AC5FDC 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) -/* AC5FE0 80240E70 8FB40058 */ lw $s4, 0x58($sp) -/* AC5FE4 80240E74 8FB30054 */ lw $s3, 0x54($sp) -/* AC5FE8 80240E78 8FB20050 */ lw $s2, 0x50($sp) -/* AC5FEC 80240E7C 8FB1004C */ lw $s1, 0x4c($sp) -/* AC5FF0 80240E80 8FB00048 */ lw $s0, 0x48($sp) -/* AC5FF4 80240E84 0000102D */ daddu $v0, $zero, $zero -/* AC5FF8 80240E88 03E00008 */ jr $ra -/* AC5FFC 80240E8C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_kkj/kkj_03/func_80240020_AC9710.s b/asm/nonmatchings/world/area_kkj/kkj_03/func_80240020_AC9710.s deleted file mode 100644 index 57373ce2c8..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_03/func_80240020_AC9710.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_AC9730 -/* AC9730 80240020 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AC9734 80240024 AFB00010 */ sw $s0, 0x10($sp) -/* AC9738 80240028 0080802D */ daddu $s0, $a0, $zero -/* AC973C 8024002C AFBF0014 */ sw $ra, 0x14($sp) -/* AC9740 80240030 8E0300A8 */ lw $v1, 0xa8($s0) -/* AC9744 80240034 8E020088 */ lw $v0, 0x88($s0) -/* AC9748 80240038 00621821 */ addu $v1, $v1, $v0 -/* AC974C 8024003C 04610004 */ bgez $v1, .L80240050 -/* AC9750 80240040 AE0300A8 */ sw $v1, 0xa8($s0) -/* AC9754 80240044 3C020002 */ lui $v0, 2 -/* AC9758 80240048 08090018 */ j .L80240060 -/* AC975C 8024004C 00621021 */ addu $v0, $v1, $v0 -.L80240050: -/* AC9760 80240050 3C040002 */ lui $a0, 2 -/* AC9764 80240054 0083102A */ slt $v0, $a0, $v1 -/* AC9768 80240058 10400002 */ beqz $v0, .L80240064 -/* AC976C 8024005C 00641023 */ subu $v0, $v1, $a0 -.L80240060: -/* AC9770 80240060 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240064: -/* AC9774 80240064 8E0300AC */ lw $v1, 0xac($s0) -/* AC9778 80240068 8E02008C */ lw $v0, 0x8c($s0) -/* AC977C 8024006C 00621821 */ addu $v1, $v1, $v0 -/* AC9780 80240070 04610004 */ bgez $v1, .L80240084 -/* AC9784 80240074 AE0300AC */ sw $v1, 0xac($s0) -/* AC9788 80240078 3C020002 */ lui $v0, 2 -/* AC978C 8024007C 08090025 */ j .L80240094 -/* AC9790 80240080 00621021 */ addu $v0, $v1, $v0 -.L80240084: -/* AC9794 80240084 3C040002 */ lui $a0, 2 -/* AC9798 80240088 0083102A */ slt $v0, $a0, $v1 -/* AC979C 8024008C 10400002 */ beqz $v0, .L80240098 -/* AC97A0 80240090 00641023 */ subu $v0, $v1, $a0 -.L80240094: -/* AC97A4 80240094 AE0200AC */ sw $v0, 0xac($s0) -.L80240098: -/* AC97A8 80240098 8E0300B0 */ lw $v1, 0xb0($s0) -/* AC97AC 8024009C 8E020090 */ lw $v0, 0x90($s0) -/* AC97B0 802400A0 00621821 */ addu $v1, $v1, $v0 -/* AC97B4 802400A4 04610004 */ bgez $v1, .L802400B8 -/* AC97B8 802400A8 AE0300B0 */ sw $v1, 0xb0($s0) -/* AC97BC 802400AC 3C020002 */ lui $v0, 2 -/* AC97C0 802400B0 08090032 */ j .L802400C8 -/* AC97C4 802400B4 00621021 */ addu $v0, $v1, $v0 -.L802400B8: -/* AC97C8 802400B8 3C040002 */ lui $a0, 2 -/* AC97CC 802400BC 0083102A */ slt $v0, $a0, $v1 -/* AC97D0 802400C0 10400002 */ beqz $v0, .L802400CC -/* AC97D4 802400C4 00641023 */ subu $v0, $v1, $a0 -.L802400C8: -/* AC97D8 802400C8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400CC: -/* AC97DC 802400CC 8E0300B4 */ lw $v1, 0xb4($s0) -/* AC97E0 802400D0 8E020094 */ lw $v0, 0x94($s0) -/* AC97E4 802400D4 00621821 */ addu $v1, $v1, $v0 -/* AC97E8 802400D8 04610004 */ bgez $v1, .L802400EC -/* AC97EC 802400DC AE0300B4 */ sw $v1, 0xb4($s0) -/* AC97F0 802400E0 3C020002 */ lui $v0, 2 -/* AC97F4 802400E4 0809003F */ j .L802400FC -/* AC97F8 802400E8 00621021 */ addu $v0, $v1, $v0 -.L802400EC: -/* AC97FC 802400EC 3C040002 */ lui $a0, 2 -/* AC9800 802400F0 0083102A */ slt $v0, $a0, $v1 -/* AC9804 802400F4 10400002 */ beqz $v0, .L80240100 -/* AC9808 802400F8 00641023 */ subu $v0, $v1, $a0 -.L802400FC: -/* AC980C 802400FC AE0200B4 */ sw $v0, 0xb4($s0) -.L80240100: -/* AC9810 80240100 8E040084 */ lw $a0, 0x84($s0) -/* AC9814 80240104 0C046F07 */ jal set_main_pan_u -/* AC9818 80240108 8E0500A8 */ lw $a1, 0xa8($s0) -/* AC981C 8024010C 8E040084 */ lw $a0, 0x84($s0) -/* AC9820 80240110 0C046F0D */ jal set_main_pan_v -/* AC9824 80240114 8E0500AC */ lw $a1, 0xac($s0) -/* AC9828 80240118 8E040084 */ lw $a0, 0x84($s0) -/* AC982C 8024011C 0C046F13 */ jal set_aux_pan_u -/* AC9830 80240120 8E0500B0 */ lw $a1, 0xb0($s0) -/* AC9834 80240124 8E040084 */ lw $a0, 0x84($s0) -/* AC9838 80240128 0C046F19 */ jal set_aux_pan_v -/* AC983C 8024012C 8E0500B4 */ lw $a1, 0xb4($s0) -/* AC9840 80240130 8FBF0014 */ lw $ra, 0x14($sp) -/* AC9844 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* AC9848 80240138 0000102D */ daddu $v0, $zero, $zero -/* AC984C 8024013C 03E00008 */ jr $ra -/* AC9850 80240140 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_03/func_80240144_AC9710.s b/asm/nonmatchings/world/area_kkj/kkj_03/func_80240144_AC9710.s deleted file mode 100644 index 57cc89bfa9..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_03/func_80240144_AC9710.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240144_AC9854 -/* AC9854 80240144 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AC9858 80240148 AFB00010 */ sw $s0, 0x10($sp) -/* AC985C 8024014C 0080802D */ daddu $s0, $a0, $zero -/* AC9860 80240150 10A00005 */ beqz $a1, .L80240168 -/* AC9864 80240154 AFBF0014 */ sw $ra, 0x14($sp) -/* AC9868 80240158 AE000070 */ sw $zero, 0x70($s0) -/* AC986C 8024015C AE000074 */ sw $zero, 0x74($s0) -/* AC9870 80240160 AE000078 */ sw $zero, 0x78($s0) -/* AC9874 80240164 AE00007C */ sw $zero, 0x7c($s0) -.L80240168: -/* AC9878 80240168 8E020070 */ lw $v0, 0x70($s0) -/* AC987C 8024016C 1440000E */ bnez $v0, .L802401A8 -/* AC9880 80240170 00000000 */ nop -/* AC9884 80240174 8E0300A8 */ lw $v1, 0xa8($s0) -/* AC9888 80240178 8E020088 */ lw $v0, 0x88($s0) -/* AC988C 8024017C 00621821 */ addu $v1, $v1, $v0 -/* AC9890 80240180 04610004 */ bgez $v1, .L80240194 -/* AC9894 80240184 AE0300A8 */ sw $v1, 0xa8($s0) -/* AC9898 80240188 3C020002 */ lui $v0, 2 -/* AC989C 8024018C 08090069 */ j .L802401A4 -/* AC98A0 80240190 00621021 */ addu $v0, $v1, $v0 -.L80240194: -/* AC98A4 80240194 3C040002 */ lui $a0, 2 -/* AC98A8 80240198 0083102A */ slt $v0, $a0, $v1 -/* AC98AC 8024019C 10400002 */ beqz $v0, .L802401A8 -/* AC98B0 802401A0 00641023 */ subu $v0, $v1, $a0 -.L802401A4: -/* AC98B4 802401A4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401A8: -/* AC98B8 802401A8 8E020074 */ lw $v0, 0x74($s0) -/* AC98BC 802401AC 1440000E */ bnez $v0, .L802401E8 -/* AC98C0 802401B0 00000000 */ nop -/* AC98C4 802401B4 8E0300AC */ lw $v1, 0xac($s0) -/* AC98C8 802401B8 8E02008C */ lw $v0, 0x8c($s0) -/* AC98CC 802401BC 00621821 */ addu $v1, $v1, $v0 -/* AC98D0 802401C0 04610004 */ bgez $v1, .L802401D4 -/* AC98D4 802401C4 AE0300AC */ sw $v1, 0xac($s0) -/* AC98D8 802401C8 3C020002 */ lui $v0, 2 -/* AC98DC 802401CC 08090079 */ j .L802401E4 -/* AC98E0 802401D0 00621021 */ addu $v0, $v1, $v0 -.L802401D4: -/* AC98E4 802401D4 3C040002 */ lui $a0, 2 -/* AC98E8 802401D8 0083102A */ slt $v0, $a0, $v1 -/* AC98EC 802401DC 10400002 */ beqz $v0, .L802401E8 -/* AC98F0 802401E0 00641023 */ subu $v0, $v1, $a0 -.L802401E4: -/* AC98F4 802401E4 AE0200AC */ sw $v0, 0xac($s0) -.L802401E8: -/* AC98F8 802401E8 8E020078 */ lw $v0, 0x78($s0) -/* AC98FC 802401EC 1440000E */ bnez $v0, .L80240228 -/* AC9900 802401F0 00000000 */ nop -/* AC9904 802401F4 8E0300B0 */ lw $v1, 0xb0($s0) -/* AC9908 802401F8 8E020090 */ lw $v0, 0x90($s0) -/* AC990C 802401FC 00621821 */ addu $v1, $v1, $v0 -/* AC9910 80240200 04610004 */ bgez $v1, .L80240214 -/* AC9914 80240204 AE0300B0 */ sw $v1, 0xb0($s0) -/* AC9918 80240208 3C020002 */ lui $v0, 2 -/* AC991C 8024020C 08090089 */ j .L80240224 -/* AC9920 80240210 00621021 */ addu $v0, $v1, $v0 -.L80240214: -/* AC9924 80240214 3C040002 */ lui $a0, 2 -/* AC9928 80240218 0083102A */ slt $v0, $a0, $v1 -/* AC992C 8024021C 10400002 */ beqz $v0, .L80240228 -/* AC9930 80240220 00641023 */ subu $v0, $v1, $a0 -.L80240224: -/* AC9934 80240224 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240228: -/* AC9938 80240228 8E02007C */ lw $v0, 0x7c($s0) -/* AC993C 8024022C 1440000E */ bnez $v0, .L80240268 -/* AC9940 80240230 00000000 */ nop -/* AC9944 80240234 8E0300B4 */ lw $v1, 0xb4($s0) -/* AC9948 80240238 8E020094 */ lw $v0, 0x94($s0) -/* AC994C 8024023C 00621821 */ addu $v1, $v1, $v0 -/* AC9950 80240240 04610004 */ bgez $v1, .L80240254 -/* AC9954 80240244 AE0300B4 */ sw $v1, 0xb4($s0) -/* AC9958 80240248 3C020002 */ lui $v0, 2 -/* AC995C 8024024C 08090099 */ j .L80240264 -/* AC9960 80240250 00621021 */ addu $v0, $v1, $v0 -.L80240254: -/* AC9964 80240254 3C040002 */ lui $a0, 2 -/* AC9968 80240258 0083102A */ slt $v0, $a0, $v1 -/* AC996C 8024025C 10400002 */ beqz $v0, .L80240268 -/* AC9970 80240260 00641023 */ subu $v0, $v1, $a0 -.L80240264: -/* AC9974 80240264 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240268: -/* AC9978 80240268 8E040084 */ lw $a0, 0x84($s0) -/* AC997C 8024026C 0C046F07 */ jal set_main_pan_u -/* AC9980 80240270 8E0500A8 */ lw $a1, 0xa8($s0) -/* AC9984 80240274 8E040084 */ lw $a0, 0x84($s0) -/* AC9988 80240278 0C046F0D */ jal set_main_pan_v -/* AC998C 8024027C 8E0500AC */ lw $a1, 0xac($s0) -/* AC9990 80240280 8E040084 */ lw $a0, 0x84($s0) -/* AC9994 80240284 0C046F13 */ jal set_aux_pan_u -/* AC9998 80240288 8E0500B0 */ lw $a1, 0xb0($s0) -/* AC999C 8024028C 8E040084 */ lw $a0, 0x84($s0) -/* AC99A0 80240290 0C046F19 */ jal set_aux_pan_v -/* AC99A4 80240294 8E0500B4 */ lw $a1, 0xb4($s0) -/* AC99A8 80240298 8E020070 */ lw $v0, 0x70($s0) -/* AC99AC 8024029C 8E030078 */ lw $v1, 0x78($s0) -/* AC99B0 802402A0 8E040098 */ lw $a0, 0x98($s0) -/* AC99B4 802402A4 24420001 */ addiu $v0, $v0, 1 -/* AC99B8 802402A8 AE020070 */ sw $v0, 0x70($s0) -/* AC99BC 802402AC 8E020074 */ lw $v0, 0x74($s0) -/* AC99C0 802402B0 24630001 */ addiu $v1, $v1, 1 -/* AC99C4 802402B4 AE030078 */ sw $v1, 0x78($s0) -/* AC99C8 802402B8 8E030070 */ lw $v1, 0x70($s0) -/* AC99CC 802402BC 24420001 */ addiu $v0, $v0, 1 -/* AC99D0 802402C0 AE020074 */ sw $v0, 0x74($s0) -/* AC99D4 802402C4 8E02007C */ lw $v0, 0x7c($s0) -/* AC99D8 802402C8 0064182A */ slt $v1, $v1, $a0 -/* AC99DC 802402CC 24420001 */ addiu $v0, $v0, 1 -/* AC99E0 802402D0 14600002 */ bnez $v1, .L802402DC -/* AC99E4 802402D4 AE02007C */ sw $v0, 0x7c($s0) -/* AC99E8 802402D8 AE000070 */ sw $zero, 0x70($s0) -.L802402DC: -/* AC99EC 802402DC 8E020074 */ lw $v0, 0x74($s0) -/* AC99F0 802402E0 8E03009C */ lw $v1, 0x9c($s0) -/* AC99F4 802402E4 0043102A */ slt $v0, $v0, $v1 -/* AC99F8 802402E8 50400001 */ beql $v0, $zero, .L802402F0 -/* AC99FC 802402EC AE000074 */ sw $zero, 0x74($s0) -.L802402F0: -/* AC9A00 802402F0 8E020078 */ lw $v0, 0x78($s0) -/* AC9A04 802402F4 8E0300A0 */ lw $v1, 0xa0($s0) -/* AC9A08 802402F8 0043102A */ slt $v0, $v0, $v1 -/* AC9A0C 802402FC 50400001 */ beql $v0, $zero, .L80240304 -/* AC9A10 80240300 AE000078 */ sw $zero, 0x78($s0) -.L80240304: -/* AC9A14 80240304 8E02007C */ lw $v0, 0x7c($s0) -/* AC9A18 80240308 8E0300A4 */ lw $v1, 0xa4($s0) -/* AC9A1C 8024030C 0043102A */ slt $v0, $v0, $v1 -/* AC9A20 80240310 50400001 */ beql $v0, $zero, .L80240318 -/* AC9A24 80240314 AE00007C */ sw $zero, 0x7c($s0) -.L80240318: -/* AC9A28 80240318 8FBF0014 */ lw $ra, 0x14($sp) -/* AC9A2C 8024031C 8FB00010 */ lw $s0, 0x10($sp) -/* AC9A30 80240320 0000102D */ daddu $v0, $zero, $zero -/* AC9A34 80240324 03E00008 */ jr $ra -/* AC9A38 80240328 27BD0018 */ addiu $sp, $sp, 0x18 -/* AC9A3C 8024032C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/func_80240034_ACAB20.s b/asm/nonmatchings/world/area_kkj/kkj_10/func_80240034_ACAB20.s deleted file mode 100644 index 3a055bd399..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_10/func_80240034_ACAB20.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_ACAB54 -/* ACAB54 80240034 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ACAB58 80240038 AFBF0010 */ sw $ra, 0x10($sp) -/* ACAB5C 8024003C 8C82000C */ lw $v0, 0xc($a0) -/* ACAB60 80240040 0C0B210B */ jal get_float_variable -/* ACAB64 80240044 8C450000 */ lw $a1, ($v0) -/* ACAB68 80240048 8FBF0010 */ lw $ra, 0x10($sp) -/* ACAB6C 8024004C 4600008D */ trunc.w.s $f2, $f0 -/* ACAB70 80240050 44021000 */ mfc1 $v0, $f2 -/* ACAB74 80240054 00000000 */ nop -/* ACAB78 80240058 3C018011 */ lui $at, 0x8011 -/* ACAB7C 8024005C A022EFD5 */ sb $v0, -0x102b($at) -/* ACAB80 80240060 24020002 */ addiu $v0, $zero, 2 -/* ACAB84 80240064 03E00008 */ jr $ra -/* ACAB88 80240068 27BD0018 */ addiu $sp, $sp, 0x18 -/* ACAB8C 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/func_80240070_ACAB20.s b/asm/nonmatchings/world/area_kkj/kkj_10/func_80240070_ACAB20.s deleted file mode 100644 index 002f1b5cf8..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_10/func_80240070_ACAB20.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_ACAB90 -/* ACAB90 80240070 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ACAB94 80240074 AFBF0010 */ sw $ra, 0x10($sp) -/* ACAB98 80240078 0C04417A */ jal get_entity_by_index -/* ACAB9C 8024007C 8C840084 */ lw $a0, 0x84($a0) -/* ACABA0 80240080 0040182D */ daddu $v1, $v0, $zero -/* ACABA4 80240084 8C640000 */ lw $a0, ($v1) -/* ACABA8 80240088 3C050010 */ lui $a1, 0x10 -/* ACABAC 8024008C 00852025 */ or $a0, $a0, $a1 -/* ACABB0 80240090 AC640000 */ sw $a0, ($v1) -/* ACABB4 80240094 8FBF0010 */ lw $ra, 0x10($sp) -/* ACABB8 80240098 24020002 */ addiu $v0, $zero, 2 -/* ACABBC 8024009C 03E00008 */ jr $ra -/* ACABC0 802400A0 27BD0018 */ addiu $sp, $sp, 0x18 -/* ACABC4 802400A4 00000000 */ nop -/* ACABC8 802400A8 00000000 */ nop -/* ACABCC 802400AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/func_802400B0_ACAB20.s b/asm/nonmatchings/world/area_kkj/kkj_10/func_802400B0_ACAB20.s deleted file mode 100644 index 88220ba5d0..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_10/func_802400B0_ACAB20.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B0_ACABD0 -/* ACABD0 802400B0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* ACABD4 802400B4 AFB3003C */ sw $s3, 0x3c($sp) -/* ACABD8 802400B8 0080982D */ daddu $s3, $a0, $zero -/* ACABDC 802400BC AFBF0044 */ sw $ra, 0x44($sp) -/* ACABE0 802400C0 AFB40040 */ sw $s4, 0x40($sp) -/* ACABE4 802400C4 AFB20038 */ sw $s2, 0x38($sp) -/* ACABE8 802400C8 AFB10034 */ sw $s1, 0x34($sp) -/* ACABEC 802400CC AFB00030 */ sw $s0, 0x30($sp) -/* ACABF0 802400D0 F7B80058 */ sdc1 $f24, 0x58($sp) -/* ACABF4 802400D4 F7B60050 */ sdc1 $f22, 0x50($sp) -/* ACABF8 802400D8 F7B40048 */ sdc1 $f20, 0x48($sp) -/* ACABFC 802400DC 8E620148 */ lw $v0, 0x148($s3) -/* ACAC00 802400E0 0C00EABB */ jal get_npc_unsafe -/* ACAC04 802400E4 84440008 */ lh $a0, 8($v0) -/* ACAC08 802400E8 27A40020 */ addiu $a0, $sp, 0x20 -/* ACAC0C 802400EC 27A50024 */ addiu $a1, $sp, 0x24 -/* ACAC10 802400F0 0040802D */ daddu $s0, $v0, $zero -/* ACAC14 802400F4 8E63000C */ lw $v1, 0xc($s3) -/* ACAC18 802400F8 8E07000C */ lw $a3, 0xc($s0) -/* ACAC1C 802400FC C6000038 */ lwc1 $f0, 0x38($s0) -/* ACAC20 80240100 C6020040 */ lwc1 $f2, 0x40($s0) -/* ACAC24 80240104 8C740000 */ lw $s4, ($v1) -/* ACAC28 80240108 24630004 */ addiu $v1, $v1, 4 -/* ACAC2C 8024010C C4780000 */ lwc1 $f24, ($v1) -/* ACAC30 80240110 4680C620 */ cvt.s.w $f24, $f24 -/* ACAC34 80240114 24630004 */ addiu $v1, $v1, 4 -/* ACAC38 80240118 C4740000 */ lwc1 $f20, ($v1) -/* ACAC3C 8024011C 4680A520 */ cvt.s.w $f20, $f20 -/* ACAC40 80240120 4406A000 */ mfc1 $a2, $f20 -/* ACAC44 80240124 C4760004 */ lwc1 $f22, 4($v1) -/* ACAC48 80240128 4680B5A0 */ cvt.s.w $f22, $f22 -/* ACAC4C 8024012C E7A00020 */ swc1 $f0, 0x20($sp) -/* ACAC50 80240130 0C00A7E7 */ jal add_vec2D_polar -/* ACAC54 80240134 E7A20024 */ swc1 $f2, 0x24($sp) -/* ACAC58 80240138 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* ACAC5C 8024013C 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* ACAC60 80240140 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* ACAC64 80240144 4480A000 */ mtc1 $zero, $f20 -/* ACAC68 80240148 8E460028 */ lw $a2, 0x28($s2) -/* ACAC6C 8024014C 4407A000 */ mfc1 $a3, $f20 -/* ACAC70 80240150 0C00A7B5 */ jal dist2D -/* ACAC74 80240154 4600A386 */ mov.s $f14, $f20 -/* ACAC78 80240158 4600A306 */ mov.s $f12, $f20 -/* ACAC7C 8024015C C7AE0024 */ lwc1 $f14, 0x24($sp) -/* ACAC80 80240160 44066000 */ mfc1 $a2, $f12 -/* ACAC84 80240164 8E470030 */ lw $a3, 0x30($s2) -/* ACAC88 80240168 0C00A7B5 */ jal dist2D -/* ACAC8C 8024016C 46000506 */ mov.s $f20, $f0 -/* ACAC90 80240170 C604000C */ lwc1 $f4, 0xc($s0) -/* ACAC94 80240174 3C018024 */ lui $at, 0x8024 -/* ACAC98 80240178 D42235E0 */ ldc1 $f2, 0x35e0($at) -/* ACAC9C 8024017C 46002121 */ cvt.d.s $f4, $f4 -/* ACACA0 80240180 46222032 */ c.eq.d $f4, $f2 -/* ACACA4 80240184 00000000 */ nop -/* ACACA8 80240188 45010007 */ bc1t .L802401A8 -/* ACACAC 8024018C 46000086 */ mov.s $f2, $f0 -/* ACACB0 80240190 3C018024 */ lui $at, 0x8024 -/* ACACB4 80240194 D42035E8 */ ldc1 $f0, 0x35e8($at) -/* ACACB8 80240198 46202032 */ c.eq.d $f4, $f0 -/* ACACBC 8024019C 00000000 */ nop -/* ACACC0 802401A0 45000008 */ bc1f .L802401C4 -/* ACACC4 802401A4 00000000 */ nop -.L802401A8: -/* ACACC8 802401A8 4618A03E */ c.le.s $f20, $f24 -/* ACACCC 802401AC 00000000 */ nop -/* ACACD0 802401B0 4500000C */ bc1f .L802401E4 -/* ACACD4 802401B4 0000882D */ daddu $s1, $zero, $zero -/* ACACD8 802401B8 4616103E */ c.le.s $f2, $f22 -/* ACACDC 802401BC 08090077 */ j .L802401DC -/* ACACE0 802401C0 00000000 */ nop -.L802401C4: -/* ACACE4 802401C4 4618103E */ c.le.s $f2, $f24 -/* ACACE8 802401C8 00000000 */ nop -/* ACACEC 802401CC 45000005 */ bc1f .L802401E4 -/* ACACF0 802401D0 0000882D */ daddu $s1, $zero, $zero -/* ACACF4 802401D4 4616A03E */ c.le.s $f20, $f22 -/* ACACF8 802401D8 00000000 */ nop -.L802401DC: -/* ACACFC 802401DC 45030001 */ bc1tl .L802401E4 -/* ACAD00 802401E0 24110001 */ addiu $s1, $zero, 1 -.L802401E4: -/* ACAD04 802401E4 12200027 */ beqz $s1, .L80240284 -/* ACAD08 802401E8 0260202D */ daddu $a0, $s3, $zero -/* ACAD0C 802401EC C60C0038 */ lwc1 $f12, 0x38($s0) -/* ACAD10 802401F0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* ACAD14 802401F4 8E460028 */ lw $a2, 0x28($s2) -/* ACAD18 802401F8 8E470030 */ lw $a3, 0x30($s2) -/* ACAD1C 802401FC C602003C */ lwc1 $f2, 0x3c($s0) -/* ACAD20 80240200 46006006 */ mov.s $f0, $f12 -/* ACAD24 80240204 46007106 */ mov.s $f4, $f14 -/* ACAD28 80240208 E7A00020 */ swc1 $f0, 0x20($sp) -/* ACAD2C 8024020C E7A20028 */ swc1 $f2, 0x28($sp) -/* ACAD30 80240210 0C00A7B5 */ jal dist2D -/* ACAD34 80240214 E7A40024 */ swc1 $f4, 0x24($sp) -/* ACAD38 80240218 C60C0038 */ lwc1 $f12, 0x38($s0) -/* ACAD3C 8024021C C60E0040 */ lwc1 $f14, 0x40($s0) -/* ACAD40 80240220 8E460028 */ lw $a2, 0x28($s2) -/* ACAD44 80240224 8E470030 */ lw $a3, 0x30($s2) -/* ACAD48 80240228 0C00A720 */ jal atan2 -/* ACAD4C 8024022C 46000506 */ mov.s $f20, $f0 -/* ACAD50 80240230 3C040007 */ lui $a0, 7 -/* ACAD54 80240234 34848000 */ ori $a0, $a0, 0x8000 -/* ACAD58 80240238 27A50020 */ addiu $a1, $sp, 0x20 -/* ACAD5C 8024023C E7B40010 */ swc1 $f20, 0x10($sp) -/* ACAD60 80240240 E7A00014 */ swc1 $f0, 0x14($sp) -/* ACAD64 80240244 860200A6 */ lh $v0, 0xa6($s0) -/* ACAD68 80240248 27A60028 */ addiu $a2, $sp, 0x28 -/* ACAD6C 8024024C 44820000 */ mtc1 $v0, $f0 -/* ACAD70 80240250 00000000 */ nop -/* ACAD74 80240254 46800020 */ cvt.s.w $f0, $f0 -/* ACAD78 80240258 E7A00018 */ swc1 $f0, 0x18($sp) -/* ACAD7C 8024025C 860200A8 */ lh $v0, 0xa8($s0) -/* ACAD80 80240260 27A70024 */ addiu $a3, $sp, 0x24 -/* ACAD84 80240264 44820000 */ mtc1 $v0, $f0 -/* ACAD88 80240268 00000000 */ nop -/* ACAD8C 8024026C 46800020 */ cvt.s.w $f0, $f0 -/* ACAD90 80240270 0C0376B9 */ jal func_800DDAE4 -/* ACAD94 80240274 E7A0001C */ swc1 $f0, 0x1c($sp) -/* ACAD98 80240278 54400001 */ bnel $v0, $zero, .L80240280 -/* ACAD9C 8024027C 0000882D */ daddu $s1, $zero, $zero -.L80240280: -/* ACADA0 80240280 0260202D */ daddu $a0, $s3, $zero -.L80240284: -/* ACADA4 80240284 0280282D */ daddu $a1, $s4, $zero -/* ACADA8 80240288 0C0B2026 */ jal set_variable -/* ACADAC 8024028C 0220302D */ daddu $a2, $s1, $zero -/* ACADB0 80240290 8FBF0044 */ lw $ra, 0x44($sp) -/* ACADB4 80240294 8FB40040 */ lw $s4, 0x40($sp) -/* ACADB8 80240298 8FB3003C */ lw $s3, 0x3c($sp) -/* ACADBC 8024029C 8FB20038 */ lw $s2, 0x38($sp) -/* ACADC0 802402A0 8FB10034 */ lw $s1, 0x34($sp) -/* ACADC4 802402A4 8FB00030 */ lw $s0, 0x30($sp) -/* ACADC8 802402A8 D7B80058 */ ldc1 $f24, 0x58($sp) -/* ACADCC 802402AC D7B60050 */ ldc1 $f22, 0x50($sp) -/* ACADD0 802402B0 D7B40048 */ ldc1 $f20, 0x48($sp) -/* ACADD4 802402B4 24020002 */ addiu $v0, $zero, 2 -/* ACADD8 802402B8 03E00008 */ jr $ra -/* ACADDC 802402BC 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/func_8024036C_ACAB20.s b/asm/nonmatchings/world/area_kkj/kkj_10/func_8024036C_ACAB20.s deleted file mode 100644 index d1897c23a8..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_10/func_8024036C_ACAB20.s +++ /dev/null @@ -1,190 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024036C_ACAE8C -/* ACAE8C 8024036C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* ACAE90 80240370 AFB7004C */ sw $s7, 0x4c($sp) -/* ACAE94 80240374 0080B82D */ daddu $s7, $a0, $zero -/* ACAE98 80240378 AFBF0054 */ sw $ra, 0x54($sp) -/* ACAE9C 8024037C AFBE0050 */ sw $fp, 0x50($sp) -/* ACAEA0 80240380 AFB60048 */ sw $s6, 0x48($sp) -/* ACAEA4 80240384 AFB50044 */ sw $s5, 0x44($sp) -/* ACAEA8 80240388 AFB40040 */ sw $s4, 0x40($sp) -/* ACAEAC 8024038C AFB3003C */ sw $s3, 0x3c($sp) -/* ACAEB0 80240390 AFB20038 */ sw $s2, 0x38($sp) -/* ACAEB4 80240394 AFB10034 */ sw $s1, 0x34($sp) -/* ACAEB8 80240398 AFB00030 */ sw $s0, 0x30($sp) -/* ACAEBC 8024039C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* ACAEC0 802403A0 F7B80068 */ sdc1 $f24, 0x68($sp) -/* ACAEC4 802403A4 F7B60060 */ sdc1 $f22, 0x60($sp) -/* ACAEC8 802403A8 F7B40058 */ sdc1 $f20, 0x58($sp) -/* ACAECC 802403AC 8EE20148 */ lw $v0, 0x148($s7) -/* ACAED0 802403B0 0C00EABB */ jal get_npc_unsafe -/* ACAED4 802403B4 84440008 */ lh $a0, 8($v0) -/* ACAED8 802403B8 27B50020 */ addiu $s5, $sp, 0x20 -/* ACAEDC 802403BC 02A0202D */ daddu $a0, $s5, $zero -/* ACAEE0 802403C0 0040882D */ daddu $s1, $v0, $zero -/* ACAEE4 802403C4 27B40024 */ addiu $s4, $sp, 0x24 -/* ACAEE8 802403C8 8EE3000C */ lw $v1, 0xc($s7) -/* ACAEEC 802403CC 3C0641F0 */ lui $a2, 0x41f0 -/* ACAEF0 802403D0 8E27000C */ lw $a3, 0xc($s1) -/* ACAEF4 802403D4 C6200038 */ lwc1 $f0, 0x38($s1) -/* ACAEF8 802403D8 C6220040 */ lwc1 $f2, 0x40($s1) -/* ACAEFC 802403DC 8C7E0000 */ lw $fp, ($v1) -/* ACAF00 802403E0 24630004 */ addiu $v1, $v1, 4 -/* ACAF04 802403E4 C4740000 */ lwc1 $f20, ($v1) -/* ACAF08 802403E8 4680A520 */ cvt.s.w $f20, $f20 -/* ACAF0C 802403EC 24630004 */ addiu $v1, $v1, 4 -/* ACAF10 802403F0 C4760000 */ lwc1 $f22, ($v1) -/* ACAF14 802403F4 4680B5A0 */ cvt.s.w $f22, $f22 -/* ACAF18 802403F8 24630004 */ addiu $v1, $v1, 4 -/* ACAF1C 802403FC C4780000 */ lwc1 $f24, ($v1) -/* ACAF20 80240400 4680C620 */ cvt.s.w $f24, $f24 -/* ACAF24 80240404 24630004 */ addiu $v1, $v1, 4 -/* ACAF28 80240408 C47A0000 */ lwc1 $f26, ($v1) -/* ACAF2C 8024040C 4680D6A0 */ cvt.s.w $f26, $f26 -/* ACAF30 80240410 24630004 */ addiu $v1, $v1, 4 -/* ACAF34 80240414 8C760000 */ lw $s6, ($v1) -/* ACAF38 80240418 8C700004 */ lw $s0, 4($v1) -/* ACAF3C 8024041C 0280282D */ daddu $a1, $s4, $zero -/* ACAF40 80240420 E7A00020 */ swc1 $f0, 0x20($sp) -/* ACAF44 80240424 0C00A7E7 */ jal add_vec2D_polar -/* ACAF48 80240428 E7A20024 */ swc1 $f2, 0x24($sp) -/* ACAF4C 8024042C 3C038015 */ lui $v1, %hi(D_80151328) -/* ACAF50 80240430 8C631328 */ lw $v1, %lo(D_80151328)($v1) -/* ACAF54 80240434 C7A00020 */ lwc1 $f0, 0x20($sp) -/* ACAF58 80240438 3C0141A0 */ lui $at, 0x41a0 -/* ACAF5C 8024043C 44811000 */ mtc1 $at, $f2 -/* ACAF60 80240440 00101040 */ sll $v0, $s0, 1 -/* ACAF64 80240444 00501021 */ addu $v0, $v0, $s0 -/* ACAF68 80240448 000210C0 */ sll $v0, $v0, 3 -/* ACAF6C 8024044C 24420004 */ addiu $v0, $v0, 4 -/* ACAF70 80240450 00621821 */ addu $v1, $v1, $v0 -/* ACAF74 80240454 E4600004 */ swc1 $f0, 4($v1) -/* ACAF78 80240458 C620003C */ lwc1 $f0, 0x3c($s1) -/* ACAF7C 8024045C 4406A000 */ mfc1 $a2, $f20 -/* ACAF80 80240460 46020000 */ add.s $f0, $f0, $f2 -/* ACAF84 80240464 C7A20024 */ lwc1 $f2, 0x24($sp) -/* ACAF88 80240468 02A0202D */ daddu $a0, $s5, $zero -/* ACAF8C 8024046C E462000C */ swc1 $f2, 0xc($v1) -/* ACAF90 80240470 E4600008 */ swc1 $f0, 8($v1) -/* ACAF94 80240474 8E27000C */ lw $a3, 0xc($s1) -/* ACAF98 80240478 C6200038 */ lwc1 $f0, 0x38($s1) -/* ACAF9C 8024047C C6220040 */ lwc1 $f2, 0x40($s1) -/* ACAFA0 80240480 0280282D */ daddu $a1, $s4, $zero -/* ACAFA4 80240484 E7A00020 */ swc1 $f0, 0x20($sp) -/* ACAFA8 80240488 0C00A7E7 */ jal add_vec2D_polar -/* ACAFAC 8024048C E7A20024 */ swc1 $f2, 0x24($sp) -/* ACAFB0 80240490 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* ACAFB4 80240494 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* ACAFB8 80240498 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* ACAFBC 8024049C C7AE0024 */ lwc1 $f14, 0x24($sp) -/* ACAFC0 802404A0 8E460028 */ lw $a2, 0x28($s2) -/* ACAFC4 802404A4 8E470030 */ lw $a3, 0x30($s2) -/* ACAFC8 802404A8 0C00A7B5 */ jal dist2D -/* ACAFCC 802404AC 0000802D */ daddu $s0, $zero, $zero -/* ACAFD0 802404B0 4616003E */ c.le.s $f0, $f22 -/* ACAFD4 802404B4 00000000 */ nop -/* ACAFD8 802404B8 45000002 */ bc1f .L802404C4 -/* ACAFDC 802404BC 0240982D */ daddu $s3, $s2, $zero -/* ACAFE0 802404C0 24100001 */ addiu $s0, $zero, 1 -.L802404C4: -/* ACAFE4 802404C4 4600B021 */ cvt.d.s $f0, $f22 -/* ACAFE8 802404C8 46200000 */ add.d $f0, $f0, $f0 -/* ACAFEC 802404CC 3C014059 */ lui $at, 0x4059 -/* ACAFF0 802404D0 44811800 */ mtc1 $at, $f3 -/* ACAFF4 802404D4 44801000 */ mtc1 $zero, $f2 -/* ACAFF8 802404D8 3C018024 */ lui $at, 0x8024 -/* ACAFFC 802404DC D42435F0 */ ldc1 $f4, 0x35f0($at) -/* ACB000 802404E0 46220003 */ div.d $f0, $f0, $f2 -/* ACB004 802404E4 46240000 */ add.d $f0, $f0, $f4 -/* ACB008 802404E8 C7A20020 */ lwc1 $f2, 0x20($sp) -/* ACB00C 802404EC C7A40024 */ lwc1 $f4, 0x24($sp) -/* ACB010 802404F0 44051000 */ mfc1 $a1, $f2 -/* ACB014 802404F4 44072000 */ mfc1 $a3, $f4 -/* ACB018 802404F8 46200020 */ cvt.s.d $f0, $f0 -/* ACB01C 802404FC E7A00010 */ swc1 $f0, 0x10($sp) -/* ACB020 80240500 8E26003C */ lw $a2, 0x3c($s1) -/* ACB024 80240504 0C0900B0 */ jal func_802402C0 -/* ACB028 80240508 02C0202D */ daddu $a0, $s6, $zero -/* ACB02C 8024050C 02A0202D */ daddu $a0, $s5, $zero -/* ACB030 80240510 4406C000 */ mfc1 $a2, $f24 -/* ACB034 80240514 8E27000C */ lw $a3, 0xc($s1) -/* ACB038 80240518 C6200038 */ lwc1 $f0, 0x38($s1) -/* ACB03C 8024051C C6220040 */ lwc1 $f2, 0x40($s1) -/* ACB040 80240520 0280282D */ daddu $a1, $s4, $zero -/* ACB044 80240524 E7A00020 */ swc1 $f0, 0x20($sp) -/* ACB048 80240528 0C00A7E7 */ jal add_vec2D_polar -/* ACB04C 8024052C E7A20024 */ swc1 $f2, 0x24($sp) -/* ACB050 80240530 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* ACB054 80240534 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* ACB058 80240538 8E460028 */ lw $a2, 0x28($s2) -/* ACB05C 8024053C 0C00A7B5 */ jal dist2D -/* ACB060 80240540 8E470030 */ lw $a3, 0x30($s2) -/* ACB064 80240544 461A003E */ c.le.s $f0, $f26 -/* ACB068 80240548 00000000 */ nop -/* ACB06C 8024054C 45030001 */ bc1tl .L80240554 -/* ACB070 80240550 36100010 */ ori $s0, $s0, 0x10 -.L80240554: -/* ACB074 80240554 32020001 */ andi $v0, $s0, 1 -/* ACB078 80240558 10400026 */ beqz $v0, .L802405F4 -/* ACB07C 8024055C 02E0202D */ daddu $a0, $s7, $zero -/* ACB080 80240560 C62C0038 */ lwc1 $f12, 0x38($s1) -/* ACB084 80240564 C62E0040 */ lwc1 $f14, 0x40($s1) -/* ACB088 80240568 8E660028 */ lw $a2, 0x28($s3) -/* ACB08C 8024056C 8E670030 */ lw $a3, 0x30($s3) -/* ACB090 80240570 C622003C */ lwc1 $f2, 0x3c($s1) -/* ACB094 80240574 46006006 */ mov.s $f0, $f12 -/* ACB098 80240578 46007106 */ mov.s $f4, $f14 -/* ACB09C 8024057C E7A00020 */ swc1 $f0, 0x20($sp) -/* ACB0A0 80240580 E7A20028 */ swc1 $f2, 0x28($sp) -/* ACB0A4 80240584 0C00A7B5 */ jal dist2D -/* ACB0A8 80240588 E7A40024 */ swc1 $f4, 0x24($sp) -/* ACB0AC 8024058C C62C0038 */ lwc1 $f12, 0x38($s1) -/* ACB0B0 80240590 C62E0040 */ lwc1 $f14, 0x40($s1) -/* ACB0B4 80240594 8E660028 */ lw $a2, 0x28($s3) -/* ACB0B8 80240598 8E670030 */ lw $a3, 0x30($s3) -/* ACB0BC 8024059C 0C00A720 */ jal atan2 -/* ACB0C0 802405A0 46000506 */ mov.s $f20, $f0 -/* ACB0C4 802405A4 0000202D */ daddu $a0, $zero, $zero -/* ACB0C8 802405A8 02A0282D */ daddu $a1, $s5, $zero -/* ACB0CC 802405AC E7B40010 */ swc1 $f20, 0x10($sp) -/* ACB0D0 802405B0 E7A00014 */ swc1 $f0, 0x14($sp) -/* ACB0D4 802405B4 862200A6 */ lh $v0, 0xa6($s1) -/* ACB0D8 802405B8 27A60028 */ addiu $a2, $sp, 0x28 -/* ACB0DC 802405BC 44820000 */ mtc1 $v0, $f0 -/* ACB0E0 802405C0 00000000 */ nop -/* ACB0E4 802405C4 46800020 */ cvt.s.w $f0, $f0 -/* ACB0E8 802405C8 E7A00018 */ swc1 $f0, 0x18($sp) -/* ACB0EC 802405CC 862200A8 */ lh $v0, 0xa8($s1) -/* ACB0F0 802405D0 0280382D */ daddu $a3, $s4, $zero -/* ACB0F4 802405D4 44820000 */ mtc1 $v0, $f0 -/* ACB0F8 802405D8 00000000 */ nop -/* ACB0FC 802405DC 46800020 */ cvt.s.w $f0, $f0 -/* ACB100 802405E0 0C0376B9 */ jal func_800DDAE4 -/* ACB104 802405E4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* ACB108 802405E8 54400001 */ bnel $v0, $zero, .L802405F0 -/* ACB10C 802405EC 0000802D */ daddu $s0, $zero, $zero -.L802405F0: -/* ACB110 802405F0 02E0202D */ daddu $a0, $s7, $zero -.L802405F4: -/* ACB114 802405F4 03C0282D */ daddu $a1, $fp, $zero -/* ACB118 802405F8 0C0B2026 */ jal set_variable -/* ACB11C 802405FC 0200302D */ daddu $a2, $s0, $zero -/* ACB120 80240600 8FBF0054 */ lw $ra, 0x54($sp) -/* ACB124 80240604 8FBE0050 */ lw $fp, 0x50($sp) -/* ACB128 80240608 8FB7004C */ lw $s7, 0x4c($sp) -/* ACB12C 8024060C 8FB60048 */ lw $s6, 0x48($sp) -/* ACB130 80240610 8FB50044 */ lw $s5, 0x44($sp) -/* ACB134 80240614 8FB40040 */ lw $s4, 0x40($sp) -/* ACB138 80240618 8FB3003C */ lw $s3, 0x3c($sp) -/* ACB13C 8024061C 8FB20038 */ lw $s2, 0x38($sp) -/* ACB140 80240620 8FB10034 */ lw $s1, 0x34($sp) -/* ACB144 80240624 8FB00030 */ lw $s0, 0x30($sp) -/* ACB148 80240628 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* ACB14C 8024062C D7B80068 */ ldc1 $f24, 0x68($sp) -/* ACB150 80240630 D7B60060 */ ldc1 $f22, 0x60($sp) -/* ACB154 80240634 D7B40058 */ ldc1 $f20, 0x58($sp) -/* ACB158 80240638 24020002 */ addiu $v0, $zero, 2 -/* ACB15C 8024063C 03E00008 */ jr $ra -/* ACB160 80240640 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/func_80240644_ACAB20.s b/asm/nonmatchings/world/area_kkj/kkj_10/func_80240644_ACAB20.s deleted file mode 100644 index 23d5dcd03d..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_10/func_80240644_ACAB20.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240644_ACB164 -/* ACB164 80240644 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* ACB168 80240648 AFB10014 */ sw $s1, 0x14($sp) -/* ACB16C 8024064C 0080882D */ daddu $s1, $a0, $zero -/* ACB170 80240650 AFBF0024 */ sw $ra, 0x24($sp) -/* ACB174 80240654 AFB40020 */ sw $s4, 0x20($sp) -/* ACB178 80240658 AFB3001C */ sw $s3, 0x1c($sp) -/* ACB17C 8024065C AFB20018 */ sw $s2, 0x18($sp) -/* ACB180 80240660 AFB00010 */ sw $s0, 0x10($sp) -/* ACB184 80240664 8E30000C */ lw $s0, 0xc($s1) -/* ACB188 80240668 8E140000 */ lw $s4, ($s0) -/* ACB18C 8024066C 26100004 */ addiu $s0, $s0, 4 -/* ACB190 80240670 8E050000 */ lw $a1, ($s0) -/* ACB194 80240674 0C0B1EAF */ jal get_variable -/* ACB198 80240678 26100004 */ addiu $s0, $s0, 4 -/* ACB19C 8024067C 8E050000 */ lw $a1, ($s0) -/* ACB1A0 80240680 26100004 */ addiu $s0, $s0, 4 -/* ACB1A4 80240684 0220202D */ daddu $a0, $s1, $zero -/* ACB1A8 80240688 0C0B1EAF */ jal get_variable -/* ACB1AC 8024068C 0040982D */ daddu $s3, $v0, $zero -/* ACB1B0 80240690 8E050000 */ lw $a1, ($s0) -/* ACB1B4 80240694 26100004 */ addiu $s0, $s0, 4 -/* ACB1B8 80240698 0220202D */ daddu $a0, $s1, $zero -/* ACB1BC 8024069C 0C0B1EAF */ jal get_variable -/* ACB1C0 802406A0 0040902D */ daddu $s2, $v0, $zero -/* ACB1C4 802406A4 0220202D */ daddu $a0, $s1, $zero -/* ACB1C8 802406A8 8E050000 */ lw $a1, ($s0) -/* ACB1CC 802406AC 0C0B1EAF */ jal get_variable -/* ACB1D0 802406B0 0040802D */ daddu $s0, $v0, $zero -/* ACB1D4 802406B4 44901000 */ mtc1 $s0, $f2 -/* ACB1D8 802406B8 00000000 */ nop -/* ACB1DC 802406BC 468010A0 */ cvt.s.w $f2, $f2 -/* ACB1E0 802406C0 44936000 */ mtc1 $s3, $f12 -/* ACB1E4 802406C4 00000000 */ nop -/* ACB1E8 802406C8 46806320 */ cvt.s.w $f12, $f12 -/* ACB1EC 802406CC 44061000 */ mfc1 $a2, $f2 -/* ACB1F0 802406D0 44821000 */ mtc1 $v0, $f2 -/* ACB1F4 802406D4 00000000 */ nop -/* ACB1F8 802406D8 468010A0 */ cvt.s.w $f2, $f2 -/* ACB1FC 802406DC 44071000 */ mfc1 $a3, $f2 -/* ACB200 802406E0 44927000 */ mtc1 $s2, $f14 -/* ACB204 802406E4 00000000 */ nop -/* ACB208 802406E8 0C00A720 */ jal atan2 -/* ACB20C 802406EC 468073A0 */ cvt.s.w $f14, $f14 -/* ACB210 802406F0 0220202D */ daddu $a0, $s1, $zero -/* ACB214 802406F4 4600008D */ trunc.w.s $f2, $f0 -/* ACB218 802406F8 44061000 */ mfc1 $a2, $f2 -/* ACB21C 802406FC 0C0B2026 */ jal set_variable -/* ACB220 80240700 0280282D */ daddu $a1, $s4, $zero -/* ACB224 80240704 8FBF0024 */ lw $ra, 0x24($sp) -/* ACB228 80240708 8FB40020 */ lw $s4, 0x20($sp) -/* ACB22C 8024070C 8FB3001C */ lw $s3, 0x1c($sp) -/* ACB230 80240710 8FB20018 */ lw $s2, 0x18($sp) -/* ACB234 80240714 8FB10014 */ lw $s1, 0x14($sp) -/* ACB238 80240718 8FB00010 */ lw $s0, 0x10($sp) -/* ACB23C 8024071C 24020002 */ addiu $v0, $zero, 2 -/* ACB240 80240720 03E00008 */ jr $ra -/* ACB244 80240724 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/func_80240728_ACAB20.s b/asm/nonmatchings/world/area_kkj/kkj_10/func_80240728_ACAB20.s deleted file mode 100644 index 0c6b9f0106..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_10/func_80240728_ACAB20.s +++ /dev/null @@ -1,100 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240728_ACB248 -/* ACB248 80240728 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* ACB24C 8024072C AFB3001C */ sw $s3, 0x1c($sp) -/* ACB250 80240730 0080982D */ daddu $s3, $a0, $zero -/* ACB254 80240734 AFBF0030 */ sw $ra, 0x30($sp) -/* ACB258 80240738 AFB7002C */ sw $s7, 0x2c($sp) -/* ACB25C 8024073C AFB60028 */ sw $s6, 0x28($sp) -/* ACB260 80240740 AFB50024 */ sw $s5, 0x24($sp) -/* ACB264 80240744 AFB40020 */ sw $s4, 0x20($sp) -/* ACB268 80240748 AFB20018 */ sw $s2, 0x18($sp) -/* ACB26C 8024074C AFB10014 */ sw $s1, 0x14($sp) -/* ACB270 80240750 AFB00010 */ sw $s0, 0x10($sp) -/* ACB274 80240754 F7B80048 */ sdc1 $f24, 0x48($sp) -/* ACB278 80240758 F7B60040 */ sdc1 $f22, 0x40($sp) -/* ACB27C 8024075C F7B40038 */ sdc1 $f20, 0x38($sp) -/* ACB280 80240760 8E70000C */ lw $s0, 0xc($s3) -/* ACB284 80240764 8E050000 */ lw $a1, ($s0) -/* ACB288 80240768 0C0B1EAF */ jal get_variable -/* ACB28C 8024076C 26100004 */ addiu $s0, $s0, 4 -/* ACB290 80240770 8E150000 */ lw $s5, ($s0) -/* ACB294 80240774 26100004 */ addiu $s0, $s0, 4 -/* ACB298 80240778 0260202D */ daddu $a0, $s3, $zero -/* ACB29C 8024077C 8E160000 */ lw $s6, ($s0) -/* ACB2A0 80240780 8E170004 */ lw $s7, 4($s0) -/* ACB2A4 80240784 0C0B36B0 */ jal resolve_npc -/* ACB2A8 80240788 0040282D */ daddu $a1, $v0, $zero -/* ACB2AC 8024078C 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* ACB2B0 80240790 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* ACB2B4 80240794 0040802D */ daddu $s0, $v0, $zero -/* ACB2B8 80240798 1200002F */ beqz $s0, .L80240858 -/* ACB2BC 8024079C 0220902D */ daddu $s2, $s1, $zero -/* ACB2C0 802407A0 C62C0028 */ lwc1 $f12, 0x28($s1) -/* ACB2C4 802407A4 C62E0030 */ lwc1 $f14, 0x30($s1) -/* ACB2C8 802407A8 8E060038 */ lw $a2, 0x38($s0) -/* ACB2CC 802407AC 8E070040 */ lw $a3, 0x40($s0) -/* ACB2D0 802407B0 3C0142C8 */ lui $at, 0x42c8 -/* ACB2D4 802407B4 4481C000 */ mtc1 $at, $f24 -/* ACB2D8 802407B8 0C00A7B5 */ jal dist2D -/* ACB2DC 802407BC 24140001 */ addiu $s4, $zero, 1 -/* ACB2E0 802407C0 4618003C */ c.lt.s $f0, $f24 -/* ACB2E4 802407C4 00000000 */ nop -/* ACB2E8 802407C8 45030001 */ bc1tl .L802407D0 -/* ACB2EC 802407CC 0000A02D */ daddu $s4, $zero, $zero -.L802407D0: -/* ACB2F0 802407D0 C64C0028 */ lwc1 $f12, 0x28($s2) -/* ACB2F4 802407D4 C64E0030 */ lwc1 $f14, 0x30($s2) -/* ACB2F8 802407D8 8E060038 */ lw $a2, 0x38($s0) -/* ACB2FC 802407DC 0C00A720 */ jal atan2 -/* ACB300 802407E0 8E070040 */ lw $a3, 0x40($s0) -/* ACB304 802407E4 0C00A6C9 */ jal clamp_angle -/* ACB308 802407E8 46000306 */ mov.s $f12, $f0 -/* ACB30C 802407EC 46000506 */ mov.s $f20, $f0 -/* ACB310 802407F0 0C00A8BB */ jal sin_deg -/* ACB314 802407F4 4600A306 */ mov.s $f12, $f20 -/* ACB318 802407F8 46180002 */ mul.s $f0, $f0, $f24 -/* ACB31C 802407FC 00000000 */ nop -/* ACB320 80240800 C6560028 */ lwc1 $f22, 0x28($s2) -/* ACB324 80240804 4600B580 */ add.s $f22, $f22, $f0 -/* ACB328 80240808 0C00A8D4 */ jal cos_deg -/* ACB32C 8024080C 4600A306 */ mov.s $f12, $f20 -/* ACB330 80240810 46180002 */ mul.s $f0, $f0, $f24 -/* ACB334 80240814 00000000 */ nop -/* ACB338 80240818 0260202D */ daddu $a0, $s3, $zero -/* ACB33C 8024081C 02A0282D */ daddu $a1, $s5, $zero -/* ACB340 80240820 C6540030 */ lwc1 $f20, 0x30($s2) -/* ACB344 80240824 0280302D */ daddu $a2, $s4, $zero -/* ACB348 80240828 0C0B2026 */ jal set_variable -/* ACB34C 8024082C 4600A501 */ sub.s $f20, $f20, $f0 -/* ACB350 80240830 0260202D */ daddu $a0, $s3, $zero -/* ACB354 80240834 4600B08D */ trunc.w.s $f2, $f22 -/* ACB358 80240838 44061000 */ mfc1 $a2, $f2 -/* ACB35C 8024083C 0C0B2026 */ jal set_variable -/* ACB360 80240840 02C0282D */ daddu $a1, $s6, $zero -/* ACB364 80240844 0260202D */ daddu $a0, $s3, $zero -/* ACB368 80240848 4600A08D */ trunc.w.s $f2, $f20 -/* ACB36C 8024084C 44061000 */ mfc1 $a2, $f2 -/* ACB370 80240850 0C0B2026 */ jal set_variable -/* ACB374 80240854 02E0282D */ daddu $a1, $s7, $zero -.L80240858: -/* ACB378 80240858 24020002 */ addiu $v0, $zero, 2 -/* ACB37C 8024085C 8FBF0030 */ lw $ra, 0x30($sp) -/* ACB380 80240860 8FB7002C */ lw $s7, 0x2c($sp) -/* ACB384 80240864 8FB60028 */ lw $s6, 0x28($sp) -/* ACB388 80240868 8FB50024 */ lw $s5, 0x24($sp) -/* ACB38C 8024086C 8FB40020 */ lw $s4, 0x20($sp) -/* ACB390 80240870 8FB3001C */ lw $s3, 0x1c($sp) -/* ACB394 80240874 8FB20018 */ lw $s2, 0x18($sp) -/* ACB398 80240878 8FB10014 */ lw $s1, 0x14($sp) -/* ACB39C 8024087C 8FB00010 */ lw $s0, 0x10($sp) -/* ACB3A0 80240880 D7B80048 */ ldc1 $f24, 0x48($sp) -/* ACB3A4 80240884 D7B60040 */ ldc1 $f22, 0x40($sp) -/* ACB3A8 80240888 D7B40038 */ ldc1 $f20, 0x38($sp) -/* ACB3AC 8024088C 03E00008 */ jr $ra -/* ACB3B0 80240890 27BD0050 */ addiu $sp, $sp, 0x50 -/* ACB3B4 80240894 00000000 */ nop -/* ACB3B8 80240898 00000000 */ nop -/* ACB3BC 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/func_80240AB0_ACAB20.s b/asm/nonmatchings/world/area_kkj/kkj_10/func_80240AB0_ACAB20.s deleted file mode 100644 index c01f9b0edc..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_10/func_80240AB0_ACAB20.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AB0_ACB5D0 -/* ACB5D0 80240AB0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* ACB5D4 80240AB4 F7B40060 */ sdc1 $f20, 0x60($sp) -/* ACB5D8 80240AB8 4485A000 */ mtc1 $a1, $f20 -/* ACB5DC 80240ABC F7B60068 */ sdc1 $f22, 0x68($sp) -/* ACB5E0 80240AC0 4486B000 */ mtc1 $a2, $f22 -/* ACB5E4 80240AC4 F7B80070 */ sdc1 $f24, 0x70($sp) -/* ACB5E8 80240AC8 4487C000 */ mtc1 $a3, $f24 -/* ACB5EC 80240ACC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* ACB5F0 80240AD0 C7BA0090 */ lwc1 $f26, 0x90($sp) -/* ACB5F4 80240AD4 AFBF0058 */ sw $ra, 0x58($sp) -/* ACB5F8 80240AD8 AFB10054 */ sw $s1, 0x54($sp) -/* ACB5FC 80240ADC 0C046C04 */ jal get_model_list_index_from_tree_index -/* ACB600 80240AE0 AFB00050 */ sw $s0, 0x50($sp) -/* ACB604 80240AE4 0C046B4C */ jal get_model_from_list_index -/* ACB608 80240AE8 0040202D */ daddu $a0, $v0, $zero -/* ACB60C 80240AEC 0040802D */ daddu $s0, $v0, $zero -/* ACB610 80240AF0 26110058 */ addiu $s1, $s0, 0x58 -/* ACB614 80240AF4 4405A000 */ mfc1 $a1, $f20 -/* ACB618 80240AF8 4406B000 */ mfc1 $a2, $f22 -/* ACB61C 80240AFC 4407C000 */ mfc1 $a3, $f24 -/* ACB620 80240B00 0C019E40 */ jal guTranslateF -/* ACB624 80240B04 0220202D */ daddu $a0, $s1, $zero -/* ACB628 80240B08 27A40010 */ addiu $a0, $sp, 0x10 -/* ACB62C 80240B0C 4405D000 */ mfc1 $a1, $f26 -/* ACB630 80240B10 3C063F80 */ lui $a2, 0x3f80 -/* ACB634 80240B14 0C019DF0 */ jal guScaleF -/* ACB638 80240B18 00A0382D */ daddu $a3, $a1, $zero -/* ACB63C 80240B1C 27A40010 */ addiu $a0, $sp, 0x10 -/* ACB640 80240B20 0220282D */ daddu $a1, $s1, $zero -/* ACB644 80240B24 0C019D80 */ jal guMtxCatF -/* ACB648 80240B28 00A0302D */ daddu $a2, $a1, $zero -/* ACB64C 80240B2C 96020000 */ lhu $v0, ($s0) -/* ACB650 80240B30 34421400 */ ori $v0, $v0, 0x1400 -/* ACB654 80240B34 A6020000 */ sh $v0, ($s0) -/* ACB658 80240B38 8FBF0058 */ lw $ra, 0x58($sp) -/* ACB65C 80240B3C 8FB10054 */ lw $s1, 0x54($sp) -/* ACB660 80240B40 8FB00050 */ lw $s0, 0x50($sp) -/* ACB664 80240B44 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* ACB668 80240B48 D7B80070 */ ldc1 $f24, 0x70($sp) -/* ACB66C 80240B4C D7B60068 */ ldc1 $f22, 0x68($sp) -/* ACB670 80240B50 D7B40060 */ ldc1 $f20, 0x60($sp) -/* ACB674 80240B54 03E00008 */ jr $ra -/* ACB678 80240B58 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/func_80240B5C_ACAB20.s b/asm/nonmatchings/world/area_kkj/kkj_10/func_80240B5C_ACAB20.s deleted file mode 100644 index 3f189e02b8..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_10/func_80240B5C_ACAB20.s +++ /dev/null @@ -1,190 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B5C_ACB67C -/* ACB67C 80240B5C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* ACB680 80240B60 AFB7004C */ sw $s7, 0x4c($sp) -/* ACB684 80240B64 0080B82D */ daddu $s7, $a0, $zero -/* ACB688 80240B68 AFBF0054 */ sw $ra, 0x54($sp) -/* ACB68C 80240B6C AFBE0050 */ sw $fp, 0x50($sp) -/* ACB690 80240B70 AFB60048 */ sw $s6, 0x48($sp) -/* ACB694 80240B74 AFB50044 */ sw $s5, 0x44($sp) -/* ACB698 80240B78 AFB40040 */ sw $s4, 0x40($sp) -/* ACB69C 80240B7C AFB3003C */ sw $s3, 0x3c($sp) -/* ACB6A0 80240B80 AFB20038 */ sw $s2, 0x38($sp) -/* ACB6A4 80240B84 AFB10034 */ sw $s1, 0x34($sp) -/* ACB6A8 80240B88 AFB00030 */ sw $s0, 0x30($sp) -/* ACB6AC 80240B8C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* ACB6B0 80240B90 F7B80068 */ sdc1 $f24, 0x68($sp) -/* ACB6B4 80240B94 F7B60060 */ sdc1 $f22, 0x60($sp) -/* ACB6B8 80240B98 F7B40058 */ sdc1 $f20, 0x58($sp) -/* ACB6BC 80240B9C 8EE20148 */ lw $v0, 0x148($s7) -/* ACB6C0 80240BA0 0C00EABB */ jal get_npc_unsafe -/* ACB6C4 80240BA4 84440008 */ lh $a0, 8($v0) -/* ACB6C8 80240BA8 27B50020 */ addiu $s5, $sp, 0x20 -/* ACB6CC 80240BAC 02A0202D */ daddu $a0, $s5, $zero -/* ACB6D0 80240BB0 0040882D */ daddu $s1, $v0, $zero -/* ACB6D4 80240BB4 27B40024 */ addiu $s4, $sp, 0x24 -/* ACB6D8 80240BB8 8EE3000C */ lw $v1, 0xc($s7) -/* ACB6DC 80240BBC 3C0641F0 */ lui $a2, 0x41f0 -/* ACB6E0 80240BC0 8E27000C */ lw $a3, 0xc($s1) -/* ACB6E4 80240BC4 C6200038 */ lwc1 $f0, 0x38($s1) -/* ACB6E8 80240BC8 C6220040 */ lwc1 $f2, 0x40($s1) -/* ACB6EC 80240BCC 8C7E0000 */ lw $fp, ($v1) -/* ACB6F0 80240BD0 24630004 */ addiu $v1, $v1, 4 -/* ACB6F4 80240BD4 C4740000 */ lwc1 $f20, ($v1) -/* ACB6F8 80240BD8 4680A520 */ cvt.s.w $f20, $f20 -/* ACB6FC 80240BDC 24630004 */ addiu $v1, $v1, 4 -/* ACB700 80240BE0 C4760000 */ lwc1 $f22, ($v1) -/* ACB704 80240BE4 4680B5A0 */ cvt.s.w $f22, $f22 -/* ACB708 80240BE8 24630004 */ addiu $v1, $v1, 4 -/* ACB70C 80240BEC C4780000 */ lwc1 $f24, ($v1) -/* ACB710 80240BF0 4680C620 */ cvt.s.w $f24, $f24 -/* ACB714 80240BF4 24630004 */ addiu $v1, $v1, 4 -/* ACB718 80240BF8 C47A0000 */ lwc1 $f26, ($v1) -/* ACB71C 80240BFC 4680D6A0 */ cvt.s.w $f26, $f26 -/* ACB720 80240C00 24630004 */ addiu $v1, $v1, 4 -/* ACB724 80240C04 8C760000 */ lw $s6, ($v1) -/* ACB728 80240C08 8C700004 */ lw $s0, 4($v1) -/* ACB72C 80240C0C 0280282D */ daddu $a1, $s4, $zero -/* ACB730 80240C10 E7A00020 */ swc1 $f0, 0x20($sp) -/* ACB734 80240C14 0C00A7E7 */ jal add_vec2D_polar -/* ACB738 80240C18 E7A20024 */ swc1 $f2, 0x24($sp) -/* ACB73C 80240C1C 3C038015 */ lui $v1, %hi(D_80151328) -/* ACB740 80240C20 8C631328 */ lw $v1, %lo(D_80151328)($v1) -/* ACB744 80240C24 C7A00020 */ lwc1 $f0, 0x20($sp) -/* ACB748 80240C28 3C0141A0 */ lui $at, 0x41a0 -/* ACB74C 80240C2C 44811000 */ mtc1 $at, $f2 -/* ACB750 80240C30 00101040 */ sll $v0, $s0, 1 -/* ACB754 80240C34 00501021 */ addu $v0, $v0, $s0 -/* ACB758 80240C38 000210C0 */ sll $v0, $v0, 3 -/* ACB75C 80240C3C 24420004 */ addiu $v0, $v0, 4 -/* ACB760 80240C40 00621821 */ addu $v1, $v1, $v0 -/* ACB764 80240C44 E4600004 */ swc1 $f0, 4($v1) -/* ACB768 80240C48 C620003C */ lwc1 $f0, 0x3c($s1) -/* ACB76C 80240C4C 4406A000 */ mfc1 $a2, $f20 -/* ACB770 80240C50 46020000 */ add.s $f0, $f0, $f2 -/* ACB774 80240C54 C7A20024 */ lwc1 $f2, 0x24($sp) -/* ACB778 80240C58 02A0202D */ daddu $a0, $s5, $zero -/* ACB77C 80240C5C E462000C */ swc1 $f2, 0xc($v1) -/* ACB780 80240C60 E4600008 */ swc1 $f0, 8($v1) -/* ACB784 80240C64 8E27000C */ lw $a3, 0xc($s1) -/* ACB788 80240C68 C6200038 */ lwc1 $f0, 0x38($s1) -/* ACB78C 80240C6C C6220040 */ lwc1 $f2, 0x40($s1) -/* ACB790 80240C70 0280282D */ daddu $a1, $s4, $zero -/* ACB794 80240C74 E7A00020 */ swc1 $f0, 0x20($sp) -/* ACB798 80240C78 0C00A7E7 */ jal add_vec2D_polar -/* ACB79C 80240C7C E7A20024 */ swc1 $f2, 0x24($sp) -/* ACB7A0 80240C80 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* ACB7A4 80240C84 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* ACB7A8 80240C88 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* ACB7AC 80240C8C C7AE0024 */ lwc1 $f14, 0x24($sp) -/* ACB7B0 80240C90 8E460028 */ lw $a2, 0x28($s2) -/* ACB7B4 80240C94 8E470030 */ lw $a3, 0x30($s2) -/* ACB7B8 80240C98 0C00A7B5 */ jal dist2D -/* ACB7BC 80240C9C 0000802D */ daddu $s0, $zero, $zero -/* ACB7C0 80240CA0 4616003E */ c.le.s $f0, $f22 -/* ACB7C4 80240CA4 00000000 */ nop -/* ACB7C8 80240CA8 45000002 */ bc1f .L80240CB4 -/* ACB7CC 80240CAC 0240982D */ daddu $s3, $s2, $zero -/* ACB7D0 80240CB0 24100001 */ addiu $s0, $zero, 1 -.L80240CB4: -/* ACB7D4 80240CB4 4600B021 */ cvt.d.s $f0, $f22 -/* ACB7D8 80240CB8 46200000 */ add.d $f0, $f0, $f0 -/* ACB7DC 80240CBC 3C014059 */ lui $at, 0x4059 -/* ACB7E0 80240CC0 44811800 */ mtc1 $at, $f3 -/* ACB7E4 80240CC4 44801000 */ mtc1 $zero, $f2 -/* ACB7E8 80240CC8 3C018024 */ lui $at, 0x8024 -/* ACB7EC 80240CCC D4243610 */ ldc1 $f4, 0x3610($at) -/* ACB7F0 80240CD0 46220003 */ div.d $f0, $f0, $f2 -/* ACB7F4 80240CD4 46240000 */ add.d $f0, $f0, $f4 -/* ACB7F8 80240CD8 C7A20020 */ lwc1 $f2, 0x20($sp) -/* ACB7FC 80240CDC C7A40024 */ lwc1 $f4, 0x24($sp) -/* ACB800 80240CE0 44051000 */ mfc1 $a1, $f2 -/* ACB804 80240CE4 44072000 */ mfc1 $a3, $f4 -/* ACB808 80240CE8 46200020 */ cvt.s.d $f0, $f0 -/* ACB80C 80240CEC E7A00010 */ swc1 $f0, 0x10($sp) -/* ACB810 80240CF0 8E26003C */ lw $a2, 0x3c($s1) -/* ACB814 80240CF4 0C0902AC */ jal func_80240AB0 -/* ACB818 80240CF8 02C0202D */ daddu $a0, $s6, $zero -/* ACB81C 80240CFC 02A0202D */ daddu $a0, $s5, $zero -/* ACB820 80240D00 4406C000 */ mfc1 $a2, $f24 -/* ACB824 80240D04 8E27000C */ lw $a3, 0xc($s1) -/* ACB828 80240D08 C6200038 */ lwc1 $f0, 0x38($s1) -/* ACB82C 80240D0C C6220040 */ lwc1 $f2, 0x40($s1) -/* ACB830 80240D10 0280282D */ daddu $a1, $s4, $zero -/* ACB834 80240D14 E7A00020 */ swc1 $f0, 0x20($sp) -/* ACB838 80240D18 0C00A7E7 */ jal add_vec2D_polar -/* ACB83C 80240D1C E7A20024 */ swc1 $f2, 0x24($sp) -/* ACB840 80240D20 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* ACB844 80240D24 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* ACB848 80240D28 8E460028 */ lw $a2, 0x28($s2) -/* ACB84C 80240D2C 0C00A7B5 */ jal dist2D -/* ACB850 80240D30 8E470030 */ lw $a3, 0x30($s2) -/* ACB854 80240D34 461A003E */ c.le.s $f0, $f26 -/* ACB858 80240D38 00000000 */ nop -/* ACB85C 80240D3C 45030001 */ bc1tl .L80240D44 -/* ACB860 80240D40 36100010 */ ori $s0, $s0, 0x10 -.L80240D44: -/* ACB864 80240D44 32020001 */ andi $v0, $s0, 1 -/* ACB868 80240D48 10400026 */ beqz $v0, .L80240DE4 -/* ACB86C 80240D4C 02E0202D */ daddu $a0, $s7, $zero -/* ACB870 80240D50 C62C0038 */ lwc1 $f12, 0x38($s1) -/* ACB874 80240D54 C62E0040 */ lwc1 $f14, 0x40($s1) -/* ACB878 80240D58 8E660028 */ lw $a2, 0x28($s3) -/* ACB87C 80240D5C 8E670030 */ lw $a3, 0x30($s3) -/* ACB880 80240D60 C622003C */ lwc1 $f2, 0x3c($s1) -/* ACB884 80240D64 46006006 */ mov.s $f0, $f12 -/* ACB888 80240D68 46007106 */ mov.s $f4, $f14 -/* ACB88C 80240D6C E7A00020 */ swc1 $f0, 0x20($sp) -/* ACB890 80240D70 E7A20028 */ swc1 $f2, 0x28($sp) -/* ACB894 80240D74 0C00A7B5 */ jal dist2D -/* ACB898 80240D78 E7A40024 */ swc1 $f4, 0x24($sp) -/* ACB89C 80240D7C C62C0038 */ lwc1 $f12, 0x38($s1) -/* ACB8A0 80240D80 C62E0040 */ lwc1 $f14, 0x40($s1) -/* ACB8A4 80240D84 8E660028 */ lw $a2, 0x28($s3) -/* ACB8A8 80240D88 8E670030 */ lw $a3, 0x30($s3) -/* ACB8AC 80240D8C 0C00A720 */ jal atan2 -/* ACB8B0 80240D90 46000506 */ mov.s $f20, $f0 -/* ACB8B4 80240D94 0000202D */ daddu $a0, $zero, $zero -/* ACB8B8 80240D98 02A0282D */ daddu $a1, $s5, $zero -/* ACB8BC 80240D9C E7B40010 */ swc1 $f20, 0x10($sp) -/* ACB8C0 80240DA0 E7A00014 */ swc1 $f0, 0x14($sp) -/* ACB8C4 80240DA4 862200A6 */ lh $v0, 0xa6($s1) -/* ACB8C8 80240DA8 27A60028 */ addiu $a2, $sp, 0x28 -/* ACB8CC 80240DAC 44820000 */ mtc1 $v0, $f0 -/* ACB8D0 80240DB0 00000000 */ nop -/* ACB8D4 80240DB4 46800020 */ cvt.s.w $f0, $f0 -/* ACB8D8 80240DB8 E7A00018 */ swc1 $f0, 0x18($sp) -/* ACB8DC 80240DBC 862200A8 */ lh $v0, 0xa8($s1) -/* ACB8E0 80240DC0 0280382D */ daddu $a3, $s4, $zero -/* ACB8E4 80240DC4 44820000 */ mtc1 $v0, $f0 -/* ACB8E8 80240DC8 00000000 */ nop -/* ACB8EC 80240DCC 46800020 */ cvt.s.w $f0, $f0 -/* ACB8F0 80240DD0 0C0376B9 */ jal func_800DDAE4 -/* ACB8F4 80240DD4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* ACB8F8 80240DD8 54400001 */ bnel $v0, $zero, .L80240DE0 -/* ACB8FC 80240DDC 0000802D */ daddu $s0, $zero, $zero -.L80240DE0: -/* ACB900 80240DE0 02E0202D */ daddu $a0, $s7, $zero -.L80240DE4: -/* ACB904 80240DE4 03C0282D */ daddu $a1, $fp, $zero -/* ACB908 80240DE8 0C0B2026 */ jal set_variable -/* ACB90C 80240DEC 0200302D */ daddu $a2, $s0, $zero -/* ACB910 80240DF0 8FBF0054 */ lw $ra, 0x54($sp) -/* ACB914 80240DF4 8FBE0050 */ lw $fp, 0x50($sp) -/* ACB918 80240DF8 8FB7004C */ lw $s7, 0x4c($sp) -/* ACB91C 80240DFC 8FB60048 */ lw $s6, 0x48($sp) -/* ACB920 80240E00 8FB50044 */ lw $s5, 0x44($sp) -/* ACB924 80240E04 8FB40040 */ lw $s4, 0x40($sp) -/* ACB928 80240E08 8FB3003C */ lw $s3, 0x3c($sp) -/* ACB92C 80240E0C 8FB20038 */ lw $s2, 0x38($sp) -/* ACB930 80240E10 8FB10034 */ lw $s1, 0x34($sp) -/* ACB934 80240E14 8FB00030 */ lw $s0, 0x30($sp) -/* ACB938 80240E18 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* ACB93C 80240E1C D7B80068 */ ldc1 $f24, 0x68($sp) -/* ACB940 80240E20 D7B60060 */ ldc1 $f22, 0x60($sp) -/* ACB944 80240E24 D7B40058 */ ldc1 $f20, 0x58($sp) -/* ACB948 80240E28 24020002 */ addiu $v0, $zero, 2 -/* ACB94C 80240E2C 03E00008 */ jr $ra -/* ACB950 80240E30 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240034_ACE140.s b/asm/nonmatchings/world/area_kkj/kkj_11/func_80240034_ACE140.s deleted file mode 100644 index e47bcd0f46..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240034_ACE140.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_ACE174 -/* ACE174 80240034 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ACE178 80240038 AFBF0010 */ sw $ra, 0x10($sp) -/* ACE17C 8024003C 8C82000C */ lw $v0, 0xc($a0) -/* ACE180 80240040 0C0B210B */ jal get_float_variable -/* ACE184 80240044 8C450000 */ lw $a1, ($v0) -/* ACE188 80240048 8FBF0010 */ lw $ra, 0x10($sp) -/* ACE18C 8024004C 4600008D */ trunc.w.s $f2, $f0 -/* ACE190 80240050 44021000 */ mfc1 $v0, $f2 -/* ACE194 80240054 00000000 */ nop -/* ACE198 80240058 3C018011 */ lui $at, 0x8011 -/* ACE19C 8024005C A022EFD5 */ sb $v0, -0x102b($at) -/* ACE1A0 80240060 24020002 */ addiu $v0, $zero, 2 -/* ACE1A4 80240064 03E00008 */ jr $ra -/* ACE1A8 80240068 27BD0018 */ addiu $sp, $sp, 0x18 -/* ACE1AC 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240070_ACE140.s b/asm/nonmatchings/world/area_kkj/kkj_11/func_80240070_ACE140.s deleted file mode 100644 index 1cb9d23bf0..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240070_ACE140.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_ACE1B0 -/* ACE1B0 80240070 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ACE1B4 80240074 AFBF0010 */ sw $ra, 0x10($sp) -/* ACE1B8 80240078 0C04417A */ jal get_entity_by_index -/* ACE1BC 8024007C 8C840084 */ lw $a0, 0x84($a0) -/* ACE1C0 80240080 0040182D */ daddu $v1, $v0, $zero -/* ACE1C4 80240084 8C640000 */ lw $a0, ($v1) -/* ACE1C8 80240088 3C050010 */ lui $a1, 0x10 -/* ACE1CC 8024008C 00852025 */ or $a0, $a0, $a1 -/* ACE1D0 80240090 AC640000 */ sw $a0, ($v1) -/* ACE1D4 80240094 8FBF0010 */ lw $ra, 0x10($sp) -/* ACE1D8 80240098 24020002 */ addiu $v0, $zero, 2 -/* ACE1DC 8024009C 03E00008 */ jr $ra -/* ACE1E0 802400A0 27BD0018 */ addiu $sp, $sp, 0x18 -/* ACE1E4 802400A4 00000000 */ nop -/* ACE1E8 802400A8 00000000 */ nop -/* ACE1EC 802400AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/func_802400B0_ACE140.s b/asm/nonmatchings/world/area_kkj/kkj_11/func_802400B0_ACE140.s deleted file mode 100644 index ee2b9e1b99..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_11/func_802400B0_ACE140.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B0_ACE1F0 -/* ACE1F0 802400B0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* ACE1F4 802400B4 AFB3003C */ sw $s3, 0x3c($sp) -/* ACE1F8 802400B8 0080982D */ daddu $s3, $a0, $zero -/* ACE1FC 802400BC AFBF0044 */ sw $ra, 0x44($sp) -/* ACE200 802400C0 AFB40040 */ sw $s4, 0x40($sp) -/* ACE204 802400C4 AFB20038 */ sw $s2, 0x38($sp) -/* ACE208 802400C8 AFB10034 */ sw $s1, 0x34($sp) -/* ACE20C 802400CC AFB00030 */ sw $s0, 0x30($sp) -/* ACE210 802400D0 F7B80058 */ sdc1 $f24, 0x58($sp) -/* ACE214 802400D4 F7B60050 */ sdc1 $f22, 0x50($sp) -/* ACE218 802400D8 F7B40048 */ sdc1 $f20, 0x48($sp) -/* ACE21C 802400DC 8E620148 */ lw $v0, 0x148($s3) -/* ACE220 802400E0 0C00EABB */ jal get_npc_unsafe -/* ACE224 802400E4 84440008 */ lh $a0, 8($v0) -/* ACE228 802400E8 27A40020 */ addiu $a0, $sp, 0x20 -/* ACE22C 802400EC 27A50024 */ addiu $a1, $sp, 0x24 -/* ACE230 802400F0 0040802D */ daddu $s0, $v0, $zero -/* ACE234 802400F4 8E63000C */ lw $v1, 0xc($s3) -/* ACE238 802400F8 8E07000C */ lw $a3, 0xc($s0) -/* ACE23C 802400FC C6000038 */ lwc1 $f0, 0x38($s0) -/* ACE240 80240100 C6020040 */ lwc1 $f2, 0x40($s0) -/* ACE244 80240104 8C740000 */ lw $s4, ($v1) -/* ACE248 80240108 24630004 */ addiu $v1, $v1, 4 -/* ACE24C 8024010C C4780000 */ lwc1 $f24, ($v1) -/* ACE250 80240110 4680C620 */ cvt.s.w $f24, $f24 -/* ACE254 80240114 24630004 */ addiu $v1, $v1, 4 -/* ACE258 80240118 C4740000 */ lwc1 $f20, ($v1) -/* ACE25C 8024011C 4680A520 */ cvt.s.w $f20, $f20 -/* ACE260 80240120 4406A000 */ mfc1 $a2, $f20 -/* ACE264 80240124 C4760004 */ lwc1 $f22, 4($v1) -/* ACE268 80240128 4680B5A0 */ cvt.s.w $f22, $f22 -/* ACE26C 8024012C E7A00020 */ swc1 $f0, 0x20($sp) -/* ACE270 80240130 0C00A7E7 */ jal add_vec2D_polar -/* ACE274 80240134 E7A20024 */ swc1 $f2, 0x24($sp) -/* ACE278 80240138 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* ACE27C 8024013C 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* ACE280 80240140 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* ACE284 80240144 4480A000 */ mtc1 $zero, $f20 -/* ACE288 80240148 8E460028 */ lw $a2, 0x28($s2) -/* ACE28C 8024014C 4407A000 */ mfc1 $a3, $f20 -/* ACE290 80240150 0C00A7B5 */ jal dist2D -/* ACE294 80240154 4600A386 */ mov.s $f14, $f20 -/* ACE298 80240158 4600A306 */ mov.s $f12, $f20 -/* ACE29C 8024015C C7AE0024 */ lwc1 $f14, 0x24($sp) -/* ACE2A0 80240160 44066000 */ mfc1 $a2, $f12 -/* ACE2A4 80240164 8E470030 */ lw $a3, 0x30($s2) -/* ACE2A8 80240168 0C00A7B5 */ jal dist2D -/* ACE2AC 8024016C 46000506 */ mov.s $f20, $f0 -/* ACE2B0 80240170 C604000C */ lwc1 $f4, 0xc($s0) -/* ACE2B4 80240174 3C018024 */ lui $at, 0x8024 -/* ACE2B8 80240178 D4225F10 */ ldc1 $f2, 0x5f10($at) -/* ACE2BC 8024017C 46002121 */ cvt.d.s $f4, $f4 -/* ACE2C0 80240180 46222032 */ c.eq.d $f4, $f2 -/* ACE2C4 80240184 00000000 */ nop -/* ACE2C8 80240188 45010007 */ bc1t .L802401A8 -/* ACE2CC 8024018C 46000086 */ mov.s $f2, $f0 -/* ACE2D0 80240190 3C018024 */ lui $at, 0x8024 -/* ACE2D4 80240194 D4205F18 */ ldc1 $f0, 0x5f18($at) -/* ACE2D8 80240198 46202032 */ c.eq.d $f4, $f0 -/* ACE2DC 8024019C 00000000 */ nop -/* ACE2E0 802401A0 45000008 */ bc1f .L802401C4 -/* ACE2E4 802401A4 00000000 */ nop -.L802401A8: -/* ACE2E8 802401A8 4618A03E */ c.le.s $f20, $f24 -/* ACE2EC 802401AC 00000000 */ nop -/* ACE2F0 802401B0 4500000C */ bc1f .L802401E4 -/* ACE2F4 802401B4 0000882D */ daddu $s1, $zero, $zero -/* ACE2F8 802401B8 4616103E */ c.le.s $f2, $f22 -/* ACE2FC 802401BC 08090077 */ j .L802401DC -/* ACE300 802401C0 00000000 */ nop -.L802401C4: -/* ACE304 802401C4 4618103E */ c.le.s $f2, $f24 -/* ACE308 802401C8 00000000 */ nop -/* ACE30C 802401CC 45000005 */ bc1f .L802401E4 -/* ACE310 802401D0 0000882D */ daddu $s1, $zero, $zero -/* ACE314 802401D4 4616A03E */ c.le.s $f20, $f22 -/* ACE318 802401D8 00000000 */ nop -.L802401DC: -/* ACE31C 802401DC 45030001 */ bc1tl .L802401E4 -/* ACE320 802401E0 24110001 */ addiu $s1, $zero, 1 -.L802401E4: -/* ACE324 802401E4 12200027 */ beqz $s1, .L80240284 -/* ACE328 802401E8 0260202D */ daddu $a0, $s3, $zero -/* ACE32C 802401EC C60C0038 */ lwc1 $f12, 0x38($s0) -/* ACE330 802401F0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* ACE334 802401F4 8E460028 */ lw $a2, 0x28($s2) -/* ACE338 802401F8 8E470030 */ lw $a3, 0x30($s2) -/* ACE33C 802401FC C602003C */ lwc1 $f2, 0x3c($s0) -/* ACE340 80240200 46006006 */ mov.s $f0, $f12 -/* ACE344 80240204 46007106 */ mov.s $f4, $f14 -/* ACE348 80240208 E7A00020 */ swc1 $f0, 0x20($sp) -/* ACE34C 8024020C E7A20028 */ swc1 $f2, 0x28($sp) -/* ACE350 80240210 0C00A7B5 */ jal dist2D -/* ACE354 80240214 E7A40024 */ swc1 $f4, 0x24($sp) -/* ACE358 80240218 C60C0038 */ lwc1 $f12, 0x38($s0) -/* ACE35C 8024021C C60E0040 */ lwc1 $f14, 0x40($s0) -/* ACE360 80240220 8E460028 */ lw $a2, 0x28($s2) -/* ACE364 80240224 8E470030 */ lw $a3, 0x30($s2) -/* ACE368 80240228 0C00A720 */ jal atan2 -/* ACE36C 8024022C 46000506 */ mov.s $f20, $f0 -/* ACE370 80240230 3C040007 */ lui $a0, 7 -/* ACE374 80240234 34848000 */ ori $a0, $a0, 0x8000 -/* ACE378 80240238 27A50020 */ addiu $a1, $sp, 0x20 -/* ACE37C 8024023C E7B40010 */ swc1 $f20, 0x10($sp) -/* ACE380 80240240 E7A00014 */ swc1 $f0, 0x14($sp) -/* ACE384 80240244 860200A6 */ lh $v0, 0xa6($s0) -/* ACE388 80240248 27A60028 */ addiu $a2, $sp, 0x28 -/* ACE38C 8024024C 44820000 */ mtc1 $v0, $f0 -/* ACE390 80240250 00000000 */ nop -/* ACE394 80240254 46800020 */ cvt.s.w $f0, $f0 -/* ACE398 80240258 E7A00018 */ swc1 $f0, 0x18($sp) -/* ACE39C 8024025C 860200A8 */ lh $v0, 0xa8($s0) -/* ACE3A0 80240260 27A70024 */ addiu $a3, $sp, 0x24 -/* ACE3A4 80240264 44820000 */ mtc1 $v0, $f0 -/* ACE3A8 80240268 00000000 */ nop -/* ACE3AC 8024026C 46800020 */ cvt.s.w $f0, $f0 -/* ACE3B0 80240270 0C0376B9 */ jal func_800DDAE4 -/* ACE3B4 80240274 E7A0001C */ swc1 $f0, 0x1c($sp) -/* ACE3B8 80240278 54400001 */ bnel $v0, $zero, .L80240280 -/* ACE3BC 8024027C 0000882D */ daddu $s1, $zero, $zero -.L80240280: -/* ACE3C0 80240280 0260202D */ daddu $a0, $s3, $zero -.L80240284: -/* ACE3C4 80240284 0280282D */ daddu $a1, $s4, $zero -/* ACE3C8 80240288 0C0B2026 */ jal set_variable -/* ACE3CC 8024028C 0220302D */ daddu $a2, $s1, $zero -/* ACE3D0 80240290 8FBF0044 */ lw $ra, 0x44($sp) -/* ACE3D4 80240294 8FB40040 */ lw $s4, 0x40($sp) -/* ACE3D8 80240298 8FB3003C */ lw $s3, 0x3c($sp) -/* ACE3DC 8024029C 8FB20038 */ lw $s2, 0x38($sp) -/* ACE3E0 802402A0 8FB10034 */ lw $s1, 0x34($sp) -/* ACE3E4 802402A4 8FB00030 */ lw $s0, 0x30($sp) -/* ACE3E8 802402A8 D7B80058 */ ldc1 $f24, 0x58($sp) -/* ACE3EC 802402AC D7B60050 */ ldc1 $f22, 0x50($sp) -/* ACE3F0 802402B0 D7B40048 */ ldc1 $f20, 0x48($sp) -/* ACE3F4 802402B4 24020002 */ addiu $v0, $zero, 2 -/* ACE3F8 802402B8 03E00008 */ jr $ra -/* ACE3FC 802402BC 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/func_802402C0_ACE140.s b/asm/nonmatchings/world/area_kkj/kkj_11/func_802402C0_ACE140.s deleted file mode 100644 index 8fa030e2fa..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_11/func_802402C0_ACE140.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402C0_ACE400 -/* ACE400 802402C0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* ACE404 802402C4 F7B40060 */ sdc1 $f20, 0x60($sp) -/* ACE408 802402C8 4485A000 */ mtc1 $a1, $f20 -/* ACE40C 802402CC F7B60068 */ sdc1 $f22, 0x68($sp) -/* ACE410 802402D0 4486B000 */ mtc1 $a2, $f22 -/* ACE414 802402D4 F7B80070 */ sdc1 $f24, 0x70($sp) -/* ACE418 802402D8 4487C000 */ mtc1 $a3, $f24 -/* ACE41C 802402DC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* ACE420 802402E0 C7BA0090 */ lwc1 $f26, 0x90($sp) -/* ACE424 802402E4 AFBF0058 */ sw $ra, 0x58($sp) -/* ACE428 802402E8 AFB10054 */ sw $s1, 0x54($sp) -/* ACE42C 802402EC 0C046C04 */ jal get_model_list_index_from_tree_index -/* ACE430 802402F0 AFB00050 */ sw $s0, 0x50($sp) -/* ACE434 802402F4 0C046B4C */ jal get_model_from_list_index -/* ACE438 802402F8 0040202D */ daddu $a0, $v0, $zero -/* ACE43C 802402FC 0040802D */ daddu $s0, $v0, $zero -/* ACE440 80240300 26110058 */ addiu $s1, $s0, 0x58 -/* ACE444 80240304 4405A000 */ mfc1 $a1, $f20 -/* ACE448 80240308 4406B000 */ mfc1 $a2, $f22 -/* ACE44C 8024030C 4407C000 */ mfc1 $a3, $f24 -/* ACE450 80240310 0C019E40 */ jal guTranslateF -/* ACE454 80240314 0220202D */ daddu $a0, $s1, $zero -/* ACE458 80240318 27A40010 */ addiu $a0, $sp, 0x10 -/* ACE45C 8024031C 4405D000 */ mfc1 $a1, $f26 -/* ACE460 80240320 3C063F80 */ lui $a2, 0x3f80 -/* ACE464 80240324 0C019DF0 */ jal guScaleF -/* ACE468 80240328 00A0382D */ daddu $a3, $a1, $zero -/* ACE46C 8024032C 27A40010 */ addiu $a0, $sp, 0x10 -/* ACE470 80240330 0220282D */ daddu $a1, $s1, $zero -/* ACE474 80240334 0C019D80 */ jal guMtxCatF -/* ACE478 80240338 00A0302D */ daddu $a2, $a1, $zero -/* ACE47C 8024033C 96020000 */ lhu $v0, ($s0) -/* ACE480 80240340 34421400 */ ori $v0, $v0, 0x1400 -/* ACE484 80240344 A6020000 */ sh $v0, ($s0) -/* ACE488 80240348 8FBF0058 */ lw $ra, 0x58($sp) -/* ACE48C 8024034C 8FB10054 */ lw $s1, 0x54($sp) -/* ACE490 80240350 8FB00050 */ lw $s0, 0x50($sp) -/* ACE494 80240354 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* ACE498 80240358 D7B80070 */ ldc1 $f24, 0x70($sp) -/* ACE49C 8024035C D7B60068 */ ldc1 $f22, 0x68($sp) -/* ACE4A0 80240360 D7B40060 */ ldc1 $f20, 0x60($sp) -/* ACE4A4 80240364 03E00008 */ jr $ra -/* ACE4A8 80240368 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/func_8024036C_ACE140.s b/asm/nonmatchings/world/area_kkj/kkj_11/func_8024036C_ACE140.s deleted file mode 100644 index f5a6010f7e..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_11/func_8024036C_ACE140.s +++ /dev/null @@ -1,190 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024036C_ACE4AC -/* ACE4AC 8024036C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* ACE4B0 80240370 AFB7004C */ sw $s7, 0x4c($sp) -/* ACE4B4 80240374 0080B82D */ daddu $s7, $a0, $zero -/* ACE4B8 80240378 AFBF0054 */ sw $ra, 0x54($sp) -/* ACE4BC 8024037C AFBE0050 */ sw $fp, 0x50($sp) -/* ACE4C0 80240380 AFB60048 */ sw $s6, 0x48($sp) -/* ACE4C4 80240384 AFB50044 */ sw $s5, 0x44($sp) -/* ACE4C8 80240388 AFB40040 */ sw $s4, 0x40($sp) -/* ACE4CC 8024038C AFB3003C */ sw $s3, 0x3c($sp) -/* ACE4D0 80240390 AFB20038 */ sw $s2, 0x38($sp) -/* ACE4D4 80240394 AFB10034 */ sw $s1, 0x34($sp) -/* ACE4D8 80240398 AFB00030 */ sw $s0, 0x30($sp) -/* ACE4DC 8024039C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* ACE4E0 802403A0 F7B80068 */ sdc1 $f24, 0x68($sp) -/* ACE4E4 802403A4 F7B60060 */ sdc1 $f22, 0x60($sp) -/* ACE4E8 802403A8 F7B40058 */ sdc1 $f20, 0x58($sp) -/* ACE4EC 802403AC 8EE20148 */ lw $v0, 0x148($s7) -/* ACE4F0 802403B0 0C00EABB */ jal get_npc_unsafe -/* ACE4F4 802403B4 84440008 */ lh $a0, 8($v0) -/* ACE4F8 802403B8 27B50020 */ addiu $s5, $sp, 0x20 -/* ACE4FC 802403BC 02A0202D */ daddu $a0, $s5, $zero -/* ACE500 802403C0 0040882D */ daddu $s1, $v0, $zero -/* ACE504 802403C4 27B40024 */ addiu $s4, $sp, 0x24 -/* ACE508 802403C8 8EE3000C */ lw $v1, 0xc($s7) -/* ACE50C 802403CC 3C0641F0 */ lui $a2, 0x41f0 -/* ACE510 802403D0 8E27000C */ lw $a3, 0xc($s1) -/* ACE514 802403D4 C6200038 */ lwc1 $f0, 0x38($s1) -/* ACE518 802403D8 C6220040 */ lwc1 $f2, 0x40($s1) -/* ACE51C 802403DC 8C7E0000 */ lw $fp, ($v1) -/* ACE520 802403E0 24630004 */ addiu $v1, $v1, 4 -/* ACE524 802403E4 C4740000 */ lwc1 $f20, ($v1) -/* ACE528 802403E8 4680A520 */ cvt.s.w $f20, $f20 -/* ACE52C 802403EC 24630004 */ addiu $v1, $v1, 4 -/* ACE530 802403F0 C4760000 */ lwc1 $f22, ($v1) -/* ACE534 802403F4 4680B5A0 */ cvt.s.w $f22, $f22 -/* ACE538 802403F8 24630004 */ addiu $v1, $v1, 4 -/* ACE53C 802403FC C4780000 */ lwc1 $f24, ($v1) -/* ACE540 80240400 4680C620 */ cvt.s.w $f24, $f24 -/* ACE544 80240404 24630004 */ addiu $v1, $v1, 4 -/* ACE548 80240408 C47A0000 */ lwc1 $f26, ($v1) -/* ACE54C 8024040C 4680D6A0 */ cvt.s.w $f26, $f26 -/* ACE550 80240410 24630004 */ addiu $v1, $v1, 4 -/* ACE554 80240414 8C760000 */ lw $s6, ($v1) -/* ACE558 80240418 8C700004 */ lw $s0, 4($v1) -/* ACE55C 8024041C 0280282D */ daddu $a1, $s4, $zero -/* ACE560 80240420 E7A00020 */ swc1 $f0, 0x20($sp) -/* ACE564 80240424 0C00A7E7 */ jal add_vec2D_polar -/* ACE568 80240428 E7A20024 */ swc1 $f2, 0x24($sp) -/* ACE56C 8024042C 3C038015 */ lui $v1, %hi(D_80151328) -/* ACE570 80240430 8C631328 */ lw $v1, %lo(D_80151328)($v1) -/* ACE574 80240434 C7A00020 */ lwc1 $f0, 0x20($sp) -/* ACE578 80240438 3C0141A0 */ lui $at, 0x41a0 -/* ACE57C 8024043C 44811000 */ mtc1 $at, $f2 -/* ACE580 80240440 00101040 */ sll $v0, $s0, 1 -/* ACE584 80240444 00501021 */ addu $v0, $v0, $s0 -/* ACE588 80240448 000210C0 */ sll $v0, $v0, 3 -/* ACE58C 8024044C 24420004 */ addiu $v0, $v0, 4 -/* ACE590 80240450 00621821 */ addu $v1, $v1, $v0 -/* ACE594 80240454 E4600004 */ swc1 $f0, 4($v1) -/* ACE598 80240458 C620003C */ lwc1 $f0, 0x3c($s1) -/* ACE59C 8024045C 4406A000 */ mfc1 $a2, $f20 -/* ACE5A0 80240460 46020000 */ add.s $f0, $f0, $f2 -/* ACE5A4 80240464 C7A20024 */ lwc1 $f2, 0x24($sp) -/* ACE5A8 80240468 02A0202D */ daddu $a0, $s5, $zero -/* ACE5AC 8024046C E462000C */ swc1 $f2, 0xc($v1) -/* ACE5B0 80240470 E4600008 */ swc1 $f0, 8($v1) -/* ACE5B4 80240474 8E27000C */ lw $a3, 0xc($s1) -/* ACE5B8 80240478 C6200038 */ lwc1 $f0, 0x38($s1) -/* ACE5BC 8024047C C6220040 */ lwc1 $f2, 0x40($s1) -/* ACE5C0 80240480 0280282D */ daddu $a1, $s4, $zero -/* ACE5C4 80240484 E7A00020 */ swc1 $f0, 0x20($sp) -/* ACE5C8 80240488 0C00A7E7 */ jal add_vec2D_polar -/* ACE5CC 8024048C E7A20024 */ swc1 $f2, 0x24($sp) -/* ACE5D0 80240490 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* ACE5D4 80240494 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* ACE5D8 80240498 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* ACE5DC 8024049C C7AE0024 */ lwc1 $f14, 0x24($sp) -/* ACE5E0 802404A0 8E460028 */ lw $a2, 0x28($s2) -/* ACE5E4 802404A4 8E470030 */ lw $a3, 0x30($s2) -/* ACE5E8 802404A8 0C00A7B5 */ jal dist2D -/* ACE5EC 802404AC 0000802D */ daddu $s0, $zero, $zero -/* ACE5F0 802404B0 4616003E */ c.le.s $f0, $f22 -/* ACE5F4 802404B4 00000000 */ nop -/* ACE5F8 802404B8 45000002 */ bc1f .L802404C4 -/* ACE5FC 802404BC 0240982D */ daddu $s3, $s2, $zero -/* ACE600 802404C0 24100001 */ addiu $s0, $zero, 1 -.L802404C4: -/* ACE604 802404C4 4600B021 */ cvt.d.s $f0, $f22 -/* ACE608 802404C8 46200000 */ add.d $f0, $f0, $f0 -/* ACE60C 802404CC 3C014059 */ lui $at, 0x4059 -/* ACE610 802404D0 44811800 */ mtc1 $at, $f3 -/* ACE614 802404D4 44801000 */ mtc1 $zero, $f2 -/* ACE618 802404D8 3C018024 */ lui $at, 0x8024 -/* ACE61C 802404DC D4245F20 */ ldc1 $f4, 0x5f20($at) -/* ACE620 802404E0 46220003 */ div.d $f0, $f0, $f2 -/* ACE624 802404E4 46240000 */ add.d $f0, $f0, $f4 -/* ACE628 802404E8 C7A20020 */ lwc1 $f2, 0x20($sp) -/* ACE62C 802404EC C7A40024 */ lwc1 $f4, 0x24($sp) -/* ACE630 802404F0 44051000 */ mfc1 $a1, $f2 -/* ACE634 802404F4 44072000 */ mfc1 $a3, $f4 -/* ACE638 802404F8 46200020 */ cvt.s.d $f0, $f0 -/* ACE63C 802404FC E7A00010 */ swc1 $f0, 0x10($sp) -/* ACE640 80240500 8E26003C */ lw $a2, 0x3c($s1) -/* ACE644 80240504 0C0900B0 */ jal func_802402C0 -/* ACE648 80240508 02C0202D */ daddu $a0, $s6, $zero -/* ACE64C 8024050C 02A0202D */ daddu $a0, $s5, $zero -/* ACE650 80240510 4406C000 */ mfc1 $a2, $f24 -/* ACE654 80240514 8E27000C */ lw $a3, 0xc($s1) -/* ACE658 80240518 C6200038 */ lwc1 $f0, 0x38($s1) -/* ACE65C 8024051C C6220040 */ lwc1 $f2, 0x40($s1) -/* ACE660 80240520 0280282D */ daddu $a1, $s4, $zero -/* ACE664 80240524 E7A00020 */ swc1 $f0, 0x20($sp) -/* ACE668 80240528 0C00A7E7 */ jal add_vec2D_polar -/* ACE66C 8024052C E7A20024 */ swc1 $f2, 0x24($sp) -/* ACE670 80240530 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* ACE674 80240534 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* ACE678 80240538 8E460028 */ lw $a2, 0x28($s2) -/* ACE67C 8024053C 0C00A7B5 */ jal dist2D -/* ACE680 80240540 8E470030 */ lw $a3, 0x30($s2) -/* ACE684 80240544 461A003E */ c.le.s $f0, $f26 -/* ACE688 80240548 00000000 */ nop -/* ACE68C 8024054C 45030001 */ bc1tl .L80240554 -/* ACE690 80240550 36100010 */ ori $s0, $s0, 0x10 -.L80240554: -/* ACE694 80240554 32020001 */ andi $v0, $s0, 1 -/* ACE698 80240558 10400026 */ beqz $v0, .L802405F4 -/* ACE69C 8024055C 02E0202D */ daddu $a0, $s7, $zero -/* ACE6A0 80240560 C62C0038 */ lwc1 $f12, 0x38($s1) -/* ACE6A4 80240564 C62E0040 */ lwc1 $f14, 0x40($s1) -/* ACE6A8 80240568 8E660028 */ lw $a2, 0x28($s3) -/* ACE6AC 8024056C 8E670030 */ lw $a3, 0x30($s3) -/* ACE6B0 80240570 C622003C */ lwc1 $f2, 0x3c($s1) -/* ACE6B4 80240574 46006006 */ mov.s $f0, $f12 -/* ACE6B8 80240578 46007106 */ mov.s $f4, $f14 -/* ACE6BC 8024057C E7A00020 */ swc1 $f0, 0x20($sp) -/* ACE6C0 80240580 E7A20028 */ swc1 $f2, 0x28($sp) -/* ACE6C4 80240584 0C00A7B5 */ jal dist2D -/* ACE6C8 80240588 E7A40024 */ swc1 $f4, 0x24($sp) -/* ACE6CC 8024058C C62C0038 */ lwc1 $f12, 0x38($s1) -/* ACE6D0 80240590 C62E0040 */ lwc1 $f14, 0x40($s1) -/* ACE6D4 80240594 8E660028 */ lw $a2, 0x28($s3) -/* ACE6D8 80240598 8E670030 */ lw $a3, 0x30($s3) -/* ACE6DC 8024059C 0C00A720 */ jal atan2 -/* ACE6E0 802405A0 46000506 */ mov.s $f20, $f0 -/* ACE6E4 802405A4 0000202D */ daddu $a0, $zero, $zero -/* ACE6E8 802405A8 02A0282D */ daddu $a1, $s5, $zero -/* ACE6EC 802405AC E7B40010 */ swc1 $f20, 0x10($sp) -/* ACE6F0 802405B0 E7A00014 */ swc1 $f0, 0x14($sp) -/* ACE6F4 802405B4 862200A6 */ lh $v0, 0xa6($s1) -/* ACE6F8 802405B8 27A60028 */ addiu $a2, $sp, 0x28 -/* ACE6FC 802405BC 44820000 */ mtc1 $v0, $f0 -/* ACE700 802405C0 00000000 */ nop -/* ACE704 802405C4 46800020 */ cvt.s.w $f0, $f0 -/* ACE708 802405C8 E7A00018 */ swc1 $f0, 0x18($sp) -/* ACE70C 802405CC 862200A8 */ lh $v0, 0xa8($s1) -/* ACE710 802405D0 0280382D */ daddu $a3, $s4, $zero -/* ACE714 802405D4 44820000 */ mtc1 $v0, $f0 -/* ACE718 802405D8 00000000 */ nop -/* ACE71C 802405DC 46800020 */ cvt.s.w $f0, $f0 -/* ACE720 802405E0 0C0376B9 */ jal func_800DDAE4 -/* ACE724 802405E4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* ACE728 802405E8 54400001 */ bnel $v0, $zero, .L802405F0 -/* ACE72C 802405EC 0000802D */ daddu $s0, $zero, $zero -.L802405F0: -/* ACE730 802405F0 02E0202D */ daddu $a0, $s7, $zero -.L802405F4: -/* ACE734 802405F4 03C0282D */ daddu $a1, $fp, $zero -/* ACE738 802405F8 0C0B2026 */ jal set_variable -/* ACE73C 802405FC 0200302D */ daddu $a2, $s0, $zero -/* ACE740 80240600 8FBF0054 */ lw $ra, 0x54($sp) -/* ACE744 80240604 8FBE0050 */ lw $fp, 0x50($sp) -/* ACE748 80240608 8FB7004C */ lw $s7, 0x4c($sp) -/* ACE74C 8024060C 8FB60048 */ lw $s6, 0x48($sp) -/* ACE750 80240610 8FB50044 */ lw $s5, 0x44($sp) -/* ACE754 80240614 8FB40040 */ lw $s4, 0x40($sp) -/* ACE758 80240618 8FB3003C */ lw $s3, 0x3c($sp) -/* ACE75C 8024061C 8FB20038 */ lw $s2, 0x38($sp) -/* ACE760 80240620 8FB10034 */ lw $s1, 0x34($sp) -/* ACE764 80240624 8FB00030 */ lw $s0, 0x30($sp) -/* ACE768 80240628 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* ACE76C 8024062C D7B80068 */ ldc1 $f24, 0x68($sp) -/* ACE770 80240630 D7B60060 */ ldc1 $f22, 0x60($sp) -/* ACE774 80240634 D7B40058 */ ldc1 $f20, 0x58($sp) -/* ACE778 80240638 24020002 */ addiu $v0, $zero, 2 -/* ACE77C 8024063C 03E00008 */ jr $ra -/* ACE780 80240640 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240644_ACE140.s b/asm/nonmatchings/world/area_kkj/kkj_11/func_80240644_ACE140.s deleted file mode 100644 index cbc583ce69..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240644_ACE140.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240644_ACE784 -/* ACE784 80240644 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* ACE788 80240648 AFB10014 */ sw $s1, 0x14($sp) -/* ACE78C 8024064C 0080882D */ daddu $s1, $a0, $zero -/* ACE790 80240650 AFBF0024 */ sw $ra, 0x24($sp) -/* ACE794 80240654 AFB40020 */ sw $s4, 0x20($sp) -/* ACE798 80240658 AFB3001C */ sw $s3, 0x1c($sp) -/* ACE79C 8024065C AFB20018 */ sw $s2, 0x18($sp) -/* ACE7A0 80240660 AFB00010 */ sw $s0, 0x10($sp) -/* ACE7A4 80240664 8E30000C */ lw $s0, 0xc($s1) -/* ACE7A8 80240668 8E140000 */ lw $s4, ($s0) -/* ACE7AC 8024066C 26100004 */ addiu $s0, $s0, 4 -/* ACE7B0 80240670 8E050000 */ lw $a1, ($s0) -/* ACE7B4 80240674 0C0B1EAF */ jal get_variable -/* ACE7B8 80240678 26100004 */ addiu $s0, $s0, 4 -/* ACE7BC 8024067C 8E050000 */ lw $a1, ($s0) -/* ACE7C0 80240680 26100004 */ addiu $s0, $s0, 4 -/* ACE7C4 80240684 0220202D */ daddu $a0, $s1, $zero -/* ACE7C8 80240688 0C0B1EAF */ jal get_variable -/* ACE7CC 8024068C 0040982D */ daddu $s3, $v0, $zero -/* ACE7D0 80240690 8E050000 */ lw $a1, ($s0) -/* ACE7D4 80240694 26100004 */ addiu $s0, $s0, 4 -/* ACE7D8 80240698 0220202D */ daddu $a0, $s1, $zero -/* ACE7DC 8024069C 0C0B1EAF */ jal get_variable -/* ACE7E0 802406A0 0040902D */ daddu $s2, $v0, $zero -/* ACE7E4 802406A4 0220202D */ daddu $a0, $s1, $zero -/* ACE7E8 802406A8 8E050000 */ lw $a1, ($s0) -/* ACE7EC 802406AC 0C0B1EAF */ jal get_variable -/* ACE7F0 802406B0 0040802D */ daddu $s0, $v0, $zero -/* ACE7F4 802406B4 44901000 */ mtc1 $s0, $f2 -/* ACE7F8 802406B8 00000000 */ nop -/* ACE7FC 802406BC 468010A0 */ cvt.s.w $f2, $f2 -/* ACE800 802406C0 44936000 */ mtc1 $s3, $f12 -/* ACE804 802406C4 00000000 */ nop -/* ACE808 802406C8 46806320 */ cvt.s.w $f12, $f12 -/* ACE80C 802406CC 44061000 */ mfc1 $a2, $f2 -/* ACE810 802406D0 44821000 */ mtc1 $v0, $f2 -/* ACE814 802406D4 00000000 */ nop -/* ACE818 802406D8 468010A0 */ cvt.s.w $f2, $f2 -/* ACE81C 802406DC 44071000 */ mfc1 $a3, $f2 -/* ACE820 802406E0 44927000 */ mtc1 $s2, $f14 -/* ACE824 802406E4 00000000 */ nop -/* ACE828 802406E8 0C00A720 */ jal atan2 -/* ACE82C 802406EC 468073A0 */ cvt.s.w $f14, $f14 -/* ACE830 802406F0 0220202D */ daddu $a0, $s1, $zero -/* ACE834 802406F4 4600008D */ trunc.w.s $f2, $f0 -/* ACE838 802406F8 44061000 */ mfc1 $a2, $f2 -/* ACE83C 802406FC 0C0B2026 */ jal set_variable -/* ACE840 80240700 0280282D */ daddu $a1, $s4, $zero -/* ACE844 80240704 8FBF0024 */ lw $ra, 0x24($sp) -/* ACE848 80240708 8FB40020 */ lw $s4, 0x20($sp) -/* ACE84C 8024070C 8FB3001C */ lw $s3, 0x1c($sp) -/* ACE850 80240710 8FB20018 */ lw $s2, 0x18($sp) -/* ACE854 80240714 8FB10014 */ lw $s1, 0x14($sp) -/* ACE858 80240718 8FB00010 */ lw $s0, 0x10($sp) -/* ACE85C 8024071C 24020002 */ addiu $v0, $zero, 2 -/* ACE860 80240720 03E00008 */ jr $ra -/* ACE864 80240724 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240728_ACE140.s b/asm/nonmatchings/world/area_kkj/kkj_11/func_80240728_ACE140.s deleted file mode 100644 index fa0354eeb8..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240728_ACE140.s +++ /dev/null @@ -1,100 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240728_ACE868 -/* ACE868 80240728 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* ACE86C 8024072C AFB3001C */ sw $s3, 0x1c($sp) -/* ACE870 80240730 0080982D */ daddu $s3, $a0, $zero -/* ACE874 80240734 AFBF0030 */ sw $ra, 0x30($sp) -/* ACE878 80240738 AFB7002C */ sw $s7, 0x2c($sp) -/* ACE87C 8024073C AFB60028 */ sw $s6, 0x28($sp) -/* ACE880 80240740 AFB50024 */ sw $s5, 0x24($sp) -/* ACE884 80240744 AFB40020 */ sw $s4, 0x20($sp) -/* ACE888 80240748 AFB20018 */ sw $s2, 0x18($sp) -/* ACE88C 8024074C AFB10014 */ sw $s1, 0x14($sp) -/* ACE890 80240750 AFB00010 */ sw $s0, 0x10($sp) -/* ACE894 80240754 F7B80048 */ sdc1 $f24, 0x48($sp) -/* ACE898 80240758 F7B60040 */ sdc1 $f22, 0x40($sp) -/* ACE89C 8024075C F7B40038 */ sdc1 $f20, 0x38($sp) -/* ACE8A0 80240760 8E70000C */ lw $s0, 0xc($s3) -/* ACE8A4 80240764 8E050000 */ lw $a1, ($s0) -/* ACE8A8 80240768 0C0B1EAF */ jal get_variable -/* ACE8AC 8024076C 26100004 */ addiu $s0, $s0, 4 -/* ACE8B0 80240770 8E150000 */ lw $s5, ($s0) -/* ACE8B4 80240774 26100004 */ addiu $s0, $s0, 4 -/* ACE8B8 80240778 0260202D */ daddu $a0, $s3, $zero -/* ACE8BC 8024077C 8E160000 */ lw $s6, ($s0) -/* ACE8C0 80240780 8E170004 */ lw $s7, 4($s0) -/* ACE8C4 80240784 0C0B36B0 */ jal resolve_npc -/* ACE8C8 80240788 0040282D */ daddu $a1, $v0, $zero -/* ACE8CC 8024078C 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* ACE8D0 80240790 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* ACE8D4 80240794 0040802D */ daddu $s0, $v0, $zero -/* ACE8D8 80240798 1200002F */ beqz $s0, .L80240858 -/* ACE8DC 8024079C 0220902D */ daddu $s2, $s1, $zero -/* ACE8E0 802407A0 C62C0028 */ lwc1 $f12, 0x28($s1) -/* ACE8E4 802407A4 C62E0030 */ lwc1 $f14, 0x30($s1) -/* ACE8E8 802407A8 8E060038 */ lw $a2, 0x38($s0) -/* ACE8EC 802407AC 8E070040 */ lw $a3, 0x40($s0) -/* ACE8F0 802407B0 3C0142C8 */ lui $at, 0x42c8 -/* ACE8F4 802407B4 4481C000 */ mtc1 $at, $f24 -/* ACE8F8 802407B8 0C00A7B5 */ jal dist2D -/* ACE8FC 802407BC 24140001 */ addiu $s4, $zero, 1 -/* ACE900 802407C0 4618003C */ c.lt.s $f0, $f24 -/* ACE904 802407C4 00000000 */ nop -/* ACE908 802407C8 45030001 */ bc1tl .L802407D0 -/* ACE90C 802407CC 0000A02D */ daddu $s4, $zero, $zero -.L802407D0: -/* ACE910 802407D0 C64C0028 */ lwc1 $f12, 0x28($s2) -/* ACE914 802407D4 C64E0030 */ lwc1 $f14, 0x30($s2) -/* ACE918 802407D8 8E060038 */ lw $a2, 0x38($s0) -/* ACE91C 802407DC 0C00A720 */ jal atan2 -/* ACE920 802407E0 8E070040 */ lw $a3, 0x40($s0) -/* ACE924 802407E4 0C00A6C9 */ jal clamp_angle -/* ACE928 802407E8 46000306 */ mov.s $f12, $f0 -/* ACE92C 802407EC 46000506 */ mov.s $f20, $f0 -/* ACE930 802407F0 0C00A8BB */ jal sin_deg -/* ACE934 802407F4 4600A306 */ mov.s $f12, $f20 -/* ACE938 802407F8 46180002 */ mul.s $f0, $f0, $f24 -/* ACE93C 802407FC 00000000 */ nop -/* ACE940 80240800 C6560028 */ lwc1 $f22, 0x28($s2) -/* ACE944 80240804 4600B580 */ add.s $f22, $f22, $f0 -/* ACE948 80240808 0C00A8D4 */ jal cos_deg -/* ACE94C 8024080C 4600A306 */ mov.s $f12, $f20 -/* ACE950 80240810 46180002 */ mul.s $f0, $f0, $f24 -/* ACE954 80240814 00000000 */ nop -/* ACE958 80240818 0260202D */ daddu $a0, $s3, $zero -/* ACE95C 8024081C 02A0282D */ daddu $a1, $s5, $zero -/* ACE960 80240820 C6540030 */ lwc1 $f20, 0x30($s2) -/* ACE964 80240824 0280302D */ daddu $a2, $s4, $zero -/* ACE968 80240828 0C0B2026 */ jal set_variable -/* ACE96C 8024082C 4600A501 */ sub.s $f20, $f20, $f0 -/* ACE970 80240830 0260202D */ daddu $a0, $s3, $zero -/* ACE974 80240834 4600B08D */ trunc.w.s $f2, $f22 -/* ACE978 80240838 44061000 */ mfc1 $a2, $f2 -/* ACE97C 8024083C 0C0B2026 */ jal set_variable -/* ACE980 80240840 02C0282D */ daddu $a1, $s6, $zero -/* ACE984 80240844 0260202D */ daddu $a0, $s3, $zero -/* ACE988 80240848 4600A08D */ trunc.w.s $f2, $f20 -/* ACE98C 8024084C 44061000 */ mfc1 $a2, $f2 -/* ACE990 80240850 0C0B2026 */ jal set_variable -/* ACE994 80240854 02E0282D */ daddu $a1, $s7, $zero -.L80240858: -/* ACE998 80240858 24020002 */ addiu $v0, $zero, 2 -/* ACE99C 8024085C 8FBF0030 */ lw $ra, 0x30($sp) -/* ACE9A0 80240860 8FB7002C */ lw $s7, 0x2c($sp) -/* ACE9A4 80240864 8FB60028 */ lw $s6, 0x28($sp) -/* ACE9A8 80240868 8FB50024 */ lw $s5, 0x24($sp) -/* ACE9AC 8024086C 8FB40020 */ lw $s4, 0x20($sp) -/* ACE9B0 80240870 8FB3001C */ lw $s3, 0x1c($sp) -/* ACE9B4 80240874 8FB20018 */ lw $s2, 0x18($sp) -/* ACE9B8 80240878 8FB10014 */ lw $s1, 0x14($sp) -/* ACE9BC 8024087C 8FB00010 */ lw $s0, 0x10($sp) -/* ACE9C0 80240880 D7B80048 */ ldc1 $f24, 0x48($sp) -/* ACE9C4 80240884 D7B60040 */ ldc1 $f22, 0x40($sp) -/* ACE9C8 80240888 D7B40038 */ ldc1 $f20, 0x38($sp) -/* ACE9CC 8024088C 03E00008 */ jr $ra -/* ACE9D0 80240890 27BD0050 */ addiu $sp, $sp, 0x50 -/* ACE9D4 80240894 00000000 */ nop -/* ACE9D8 80240898 00000000 */ nop -/* ACE9DC 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/func_802408A0_ACE140.s b/asm/nonmatchings/world/area_kkj/kkj_11/func_802408A0_ACE140.s deleted file mode 100644 index 4076e2c13a..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_11/func_802408A0_ACE140.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A0_ACE9E0 -/* ACE9E0 802408A0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* ACE9E4 802408A4 AFB3003C */ sw $s3, 0x3c($sp) -/* ACE9E8 802408A8 0080982D */ daddu $s3, $a0, $zero -/* ACE9EC 802408AC AFBF0044 */ sw $ra, 0x44($sp) -/* ACE9F0 802408B0 AFB40040 */ sw $s4, 0x40($sp) -/* ACE9F4 802408B4 AFB20038 */ sw $s2, 0x38($sp) -/* ACE9F8 802408B8 AFB10034 */ sw $s1, 0x34($sp) -/* ACE9FC 802408BC AFB00030 */ sw $s0, 0x30($sp) -/* ACEA00 802408C0 F7B80058 */ sdc1 $f24, 0x58($sp) -/* ACEA04 802408C4 F7B60050 */ sdc1 $f22, 0x50($sp) -/* ACEA08 802408C8 F7B40048 */ sdc1 $f20, 0x48($sp) -/* ACEA0C 802408CC 8E620148 */ lw $v0, 0x148($s3) -/* ACEA10 802408D0 0C00EABB */ jal get_npc_unsafe -/* ACEA14 802408D4 84440008 */ lh $a0, 8($v0) -/* ACEA18 802408D8 27A40020 */ addiu $a0, $sp, 0x20 -/* ACEA1C 802408DC 27A50024 */ addiu $a1, $sp, 0x24 -/* ACEA20 802408E0 0040802D */ daddu $s0, $v0, $zero -/* ACEA24 802408E4 8E63000C */ lw $v1, 0xc($s3) -/* ACEA28 802408E8 8E07000C */ lw $a3, 0xc($s0) -/* ACEA2C 802408EC C6000038 */ lwc1 $f0, 0x38($s0) -/* ACEA30 802408F0 C6020040 */ lwc1 $f2, 0x40($s0) -/* ACEA34 802408F4 8C740000 */ lw $s4, ($v1) -/* ACEA38 802408F8 24630004 */ addiu $v1, $v1, 4 -/* ACEA3C 802408FC C4780000 */ lwc1 $f24, ($v1) -/* ACEA40 80240900 4680C620 */ cvt.s.w $f24, $f24 -/* ACEA44 80240904 24630004 */ addiu $v1, $v1, 4 -/* ACEA48 80240908 C4740000 */ lwc1 $f20, ($v1) -/* ACEA4C 8024090C 4680A520 */ cvt.s.w $f20, $f20 -/* ACEA50 80240910 4406A000 */ mfc1 $a2, $f20 -/* ACEA54 80240914 C4760004 */ lwc1 $f22, 4($v1) -/* ACEA58 80240918 4680B5A0 */ cvt.s.w $f22, $f22 -/* ACEA5C 8024091C E7A00020 */ swc1 $f0, 0x20($sp) -/* ACEA60 80240920 0C00A7E7 */ jal add_vec2D_polar -/* ACEA64 80240924 E7A20024 */ swc1 $f2, 0x24($sp) -/* ACEA68 80240928 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* ACEA6C 8024092C 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* ACEA70 80240930 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* ACEA74 80240934 4480A000 */ mtc1 $zero, $f20 -/* ACEA78 80240938 8E460028 */ lw $a2, 0x28($s2) -/* ACEA7C 8024093C 4407A000 */ mfc1 $a3, $f20 -/* ACEA80 80240940 0C00A7B5 */ jal dist2D -/* ACEA84 80240944 4600A386 */ mov.s $f14, $f20 -/* ACEA88 80240948 4600A306 */ mov.s $f12, $f20 -/* ACEA8C 8024094C C7AE0024 */ lwc1 $f14, 0x24($sp) -/* ACEA90 80240950 44066000 */ mfc1 $a2, $f12 -/* ACEA94 80240954 8E470030 */ lw $a3, 0x30($s2) -/* ACEA98 80240958 0C00A7B5 */ jal dist2D -/* ACEA9C 8024095C 46000506 */ mov.s $f20, $f0 -/* ACEAA0 80240960 C604000C */ lwc1 $f4, 0xc($s0) -/* ACEAA4 80240964 3C018024 */ lui $at, 0x8024 -/* ACEAA8 80240968 D4225F30 */ ldc1 $f2, 0x5f30($at) -/* ACEAAC 8024096C 46002121 */ cvt.d.s $f4, $f4 -/* ACEAB0 80240970 46222032 */ c.eq.d $f4, $f2 -/* ACEAB4 80240974 00000000 */ nop -/* ACEAB8 80240978 45010007 */ bc1t .L80240998 -/* ACEABC 8024097C 46000086 */ mov.s $f2, $f0 -/* ACEAC0 80240980 3C018024 */ lui $at, 0x8024 -/* ACEAC4 80240984 D4205F38 */ ldc1 $f0, 0x5f38($at) -/* ACEAC8 80240988 46202032 */ c.eq.d $f4, $f0 -/* ACEACC 8024098C 00000000 */ nop -/* ACEAD0 80240990 45000008 */ bc1f .L802409B4 -/* ACEAD4 80240994 00000000 */ nop -.L80240998: -/* ACEAD8 80240998 4618A03E */ c.le.s $f20, $f24 -/* ACEADC 8024099C 00000000 */ nop -/* ACEAE0 802409A0 4500000C */ bc1f .L802409D4 -/* ACEAE4 802409A4 0000882D */ daddu $s1, $zero, $zero -/* ACEAE8 802409A8 4616103E */ c.le.s $f2, $f22 -/* ACEAEC 802409AC 08090273 */ j .L802409CC -/* ACEAF0 802409B0 00000000 */ nop -.L802409B4: -/* ACEAF4 802409B4 4618103E */ c.le.s $f2, $f24 -/* ACEAF8 802409B8 00000000 */ nop -/* ACEAFC 802409BC 45000005 */ bc1f .L802409D4 -/* ACEB00 802409C0 0000882D */ daddu $s1, $zero, $zero -/* ACEB04 802409C4 4616A03E */ c.le.s $f20, $f22 -/* ACEB08 802409C8 00000000 */ nop -.L802409CC: -/* ACEB0C 802409CC 45030001 */ bc1tl .L802409D4 -/* ACEB10 802409D0 24110001 */ addiu $s1, $zero, 1 -.L802409D4: -/* ACEB14 802409D4 12200027 */ beqz $s1, .L80240A74 -/* ACEB18 802409D8 0260202D */ daddu $a0, $s3, $zero -/* ACEB1C 802409DC C60C0038 */ lwc1 $f12, 0x38($s0) -/* ACEB20 802409E0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* ACEB24 802409E4 8E460028 */ lw $a2, 0x28($s2) -/* ACEB28 802409E8 8E470030 */ lw $a3, 0x30($s2) -/* ACEB2C 802409EC C602003C */ lwc1 $f2, 0x3c($s0) -/* ACEB30 802409F0 46006006 */ mov.s $f0, $f12 -/* ACEB34 802409F4 46007106 */ mov.s $f4, $f14 -/* ACEB38 802409F8 E7A00020 */ swc1 $f0, 0x20($sp) -/* ACEB3C 802409FC E7A20028 */ swc1 $f2, 0x28($sp) -/* ACEB40 80240A00 0C00A7B5 */ jal dist2D -/* ACEB44 80240A04 E7A40024 */ swc1 $f4, 0x24($sp) -/* ACEB48 80240A08 C60C0038 */ lwc1 $f12, 0x38($s0) -/* ACEB4C 80240A0C C60E0040 */ lwc1 $f14, 0x40($s0) -/* ACEB50 80240A10 8E460028 */ lw $a2, 0x28($s2) -/* ACEB54 80240A14 8E470030 */ lw $a3, 0x30($s2) -/* ACEB58 80240A18 0C00A720 */ jal atan2 -/* ACEB5C 80240A1C 46000506 */ mov.s $f20, $f0 -/* ACEB60 80240A20 3C040007 */ lui $a0, 7 -/* ACEB64 80240A24 34848000 */ ori $a0, $a0, 0x8000 -/* ACEB68 80240A28 27A50020 */ addiu $a1, $sp, 0x20 -/* ACEB6C 80240A2C E7B40010 */ swc1 $f20, 0x10($sp) -/* ACEB70 80240A30 E7A00014 */ swc1 $f0, 0x14($sp) -/* ACEB74 80240A34 860200A6 */ lh $v0, 0xa6($s0) -/* ACEB78 80240A38 27A60028 */ addiu $a2, $sp, 0x28 -/* ACEB7C 80240A3C 44820000 */ mtc1 $v0, $f0 -/* ACEB80 80240A40 00000000 */ nop -/* ACEB84 80240A44 46800020 */ cvt.s.w $f0, $f0 -/* ACEB88 80240A48 E7A00018 */ swc1 $f0, 0x18($sp) -/* ACEB8C 80240A4C 860200A8 */ lh $v0, 0xa8($s0) -/* ACEB90 80240A50 27A70024 */ addiu $a3, $sp, 0x24 -/* ACEB94 80240A54 44820000 */ mtc1 $v0, $f0 -/* ACEB98 80240A58 00000000 */ nop -/* ACEB9C 80240A5C 46800020 */ cvt.s.w $f0, $f0 -/* ACEBA0 80240A60 0C0376B9 */ jal func_800DDAE4 -/* ACEBA4 80240A64 E7A0001C */ swc1 $f0, 0x1c($sp) -/* ACEBA8 80240A68 54400001 */ bnel $v0, $zero, .L80240A70 -/* ACEBAC 80240A6C 0000882D */ daddu $s1, $zero, $zero -.L80240A70: -/* ACEBB0 80240A70 0260202D */ daddu $a0, $s3, $zero -.L80240A74: -/* ACEBB4 80240A74 0280282D */ daddu $a1, $s4, $zero -/* ACEBB8 80240A78 0C0B2026 */ jal set_variable -/* ACEBBC 80240A7C 0220302D */ daddu $a2, $s1, $zero -/* ACEBC0 80240A80 8FBF0044 */ lw $ra, 0x44($sp) -/* ACEBC4 80240A84 8FB40040 */ lw $s4, 0x40($sp) -/* ACEBC8 80240A88 8FB3003C */ lw $s3, 0x3c($sp) -/* ACEBCC 80240A8C 8FB20038 */ lw $s2, 0x38($sp) -/* ACEBD0 80240A90 8FB10034 */ lw $s1, 0x34($sp) -/* ACEBD4 80240A94 8FB00030 */ lw $s0, 0x30($sp) -/* ACEBD8 80240A98 D7B80058 */ ldc1 $f24, 0x58($sp) -/* ACEBDC 80240A9C D7B60050 */ ldc1 $f22, 0x50($sp) -/* ACEBE0 80240AA0 D7B40048 */ ldc1 $f20, 0x48($sp) -/* ACEBE4 80240AA4 24020002 */ addiu $v0, $zero, 2 -/* ACEBE8 80240AA8 03E00008 */ jr $ra -/* ACEBEC 80240AAC 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240AB0_ACE140.s b/asm/nonmatchings/world/area_kkj/kkj_11/func_80240AB0_ACE140.s deleted file mode 100644 index 1d45a5deb0..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240AB0_ACE140.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AB0_ACEBF0 -/* ACEBF0 80240AB0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* ACEBF4 80240AB4 F7B40060 */ sdc1 $f20, 0x60($sp) -/* ACEBF8 80240AB8 4485A000 */ mtc1 $a1, $f20 -/* ACEBFC 80240ABC F7B60068 */ sdc1 $f22, 0x68($sp) -/* ACEC00 80240AC0 4486B000 */ mtc1 $a2, $f22 -/* ACEC04 80240AC4 F7B80070 */ sdc1 $f24, 0x70($sp) -/* ACEC08 80240AC8 4487C000 */ mtc1 $a3, $f24 -/* ACEC0C 80240ACC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* ACEC10 80240AD0 C7BA0090 */ lwc1 $f26, 0x90($sp) -/* ACEC14 80240AD4 AFBF0058 */ sw $ra, 0x58($sp) -/* ACEC18 80240AD8 AFB10054 */ sw $s1, 0x54($sp) -/* ACEC1C 80240ADC 0C046C04 */ jal get_model_list_index_from_tree_index -/* ACEC20 80240AE0 AFB00050 */ sw $s0, 0x50($sp) -/* ACEC24 80240AE4 0C046B4C */ jal get_model_from_list_index -/* ACEC28 80240AE8 0040202D */ daddu $a0, $v0, $zero -/* ACEC2C 80240AEC 0040802D */ daddu $s0, $v0, $zero -/* ACEC30 80240AF0 26110058 */ addiu $s1, $s0, 0x58 -/* ACEC34 80240AF4 4405A000 */ mfc1 $a1, $f20 -/* ACEC38 80240AF8 4406B000 */ mfc1 $a2, $f22 -/* ACEC3C 80240AFC 4407C000 */ mfc1 $a3, $f24 -/* ACEC40 80240B00 0C019E40 */ jal guTranslateF -/* ACEC44 80240B04 0220202D */ daddu $a0, $s1, $zero -/* ACEC48 80240B08 27A40010 */ addiu $a0, $sp, 0x10 -/* ACEC4C 80240B0C 4405D000 */ mfc1 $a1, $f26 -/* ACEC50 80240B10 3C063F80 */ lui $a2, 0x3f80 -/* ACEC54 80240B14 0C019DF0 */ jal guScaleF -/* ACEC58 80240B18 00A0382D */ daddu $a3, $a1, $zero -/* ACEC5C 80240B1C 27A40010 */ addiu $a0, $sp, 0x10 -/* ACEC60 80240B20 0220282D */ daddu $a1, $s1, $zero -/* ACEC64 80240B24 0C019D80 */ jal guMtxCatF -/* ACEC68 80240B28 00A0302D */ daddu $a2, $a1, $zero -/* ACEC6C 80240B2C 96020000 */ lhu $v0, ($s0) -/* ACEC70 80240B30 34421400 */ ori $v0, $v0, 0x1400 -/* ACEC74 80240B34 A6020000 */ sh $v0, ($s0) -/* ACEC78 80240B38 8FBF0058 */ lw $ra, 0x58($sp) -/* ACEC7C 80240B3C 8FB10054 */ lw $s1, 0x54($sp) -/* ACEC80 80240B40 8FB00050 */ lw $s0, 0x50($sp) -/* ACEC84 80240B44 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* ACEC88 80240B48 D7B80070 */ ldc1 $f24, 0x70($sp) -/* ACEC8C 80240B4C D7B60068 */ ldc1 $f22, 0x68($sp) -/* ACEC90 80240B50 D7B40060 */ ldc1 $f20, 0x60($sp) -/* ACEC94 80240B54 03E00008 */ jr $ra -/* ACEC98 80240B58 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240B5C_ACE140.s b/asm/nonmatchings/world/area_kkj/kkj_11/func_80240B5C_ACE140.s deleted file mode 100644 index 614e5747ca..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240B5C_ACE140.s +++ /dev/null @@ -1,190 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B5C_ACEC9C -/* ACEC9C 80240B5C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* ACECA0 80240B60 AFB7004C */ sw $s7, 0x4c($sp) -/* ACECA4 80240B64 0080B82D */ daddu $s7, $a0, $zero -/* ACECA8 80240B68 AFBF0054 */ sw $ra, 0x54($sp) -/* ACECAC 80240B6C AFBE0050 */ sw $fp, 0x50($sp) -/* ACECB0 80240B70 AFB60048 */ sw $s6, 0x48($sp) -/* ACECB4 80240B74 AFB50044 */ sw $s5, 0x44($sp) -/* ACECB8 80240B78 AFB40040 */ sw $s4, 0x40($sp) -/* ACECBC 80240B7C AFB3003C */ sw $s3, 0x3c($sp) -/* ACECC0 80240B80 AFB20038 */ sw $s2, 0x38($sp) -/* ACECC4 80240B84 AFB10034 */ sw $s1, 0x34($sp) -/* ACECC8 80240B88 AFB00030 */ sw $s0, 0x30($sp) -/* ACECCC 80240B8C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* ACECD0 80240B90 F7B80068 */ sdc1 $f24, 0x68($sp) -/* ACECD4 80240B94 F7B60060 */ sdc1 $f22, 0x60($sp) -/* ACECD8 80240B98 F7B40058 */ sdc1 $f20, 0x58($sp) -/* ACECDC 80240B9C 8EE20148 */ lw $v0, 0x148($s7) -/* ACECE0 80240BA0 0C00EABB */ jal get_npc_unsafe -/* ACECE4 80240BA4 84440008 */ lh $a0, 8($v0) -/* ACECE8 80240BA8 27B50020 */ addiu $s5, $sp, 0x20 -/* ACECEC 80240BAC 02A0202D */ daddu $a0, $s5, $zero -/* ACECF0 80240BB0 0040882D */ daddu $s1, $v0, $zero -/* ACECF4 80240BB4 27B40024 */ addiu $s4, $sp, 0x24 -/* ACECF8 80240BB8 8EE3000C */ lw $v1, 0xc($s7) -/* ACECFC 80240BBC 3C0641F0 */ lui $a2, 0x41f0 -/* ACED00 80240BC0 8E27000C */ lw $a3, 0xc($s1) -/* ACED04 80240BC4 C6200038 */ lwc1 $f0, 0x38($s1) -/* ACED08 80240BC8 C6220040 */ lwc1 $f2, 0x40($s1) -/* ACED0C 80240BCC 8C7E0000 */ lw $fp, ($v1) -/* ACED10 80240BD0 24630004 */ addiu $v1, $v1, 4 -/* ACED14 80240BD4 C4740000 */ lwc1 $f20, ($v1) -/* ACED18 80240BD8 4680A520 */ cvt.s.w $f20, $f20 -/* ACED1C 80240BDC 24630004 */ addiu $v1, $v1, 4 -/* ACED20 80240BE0 C4760000 */ lwc1 $f22, ($v1) -/* ACED24 80240BE4 4680B5A0 */ cvt.s.w $f22, $f22 -/* ACED28 80240BE8 24630004 */ addiu $v1, $v1, 4 -/* ACED2C 80240BEC C4780000 */ lwc1 $f24, ($v1) -/* ACED30 80240BF0 4680C620 */ cvt.s.w $f24, $f24 -/* ACED34 80240BF4 24630004 */ addiu $v1, $v1, 4 -/* ACED38 80240BF8 C47A0000 */ lwc1 $f26, ($v1) -/* ACED3C 80240BFC 4680D6A0 */ cvt.s.w $f26, $f26 -/* ACED40 80240C00 24630004 */ addiu $v1, $v1, 4 -/* ACED44 80240C04 8C760000 */ lw $s6, ($v1) -/* ACED48 80240C08 8C700004 */ lw $s0, 4($v1) -/* ACED4C 80240C0C 0280282D */ daddu $a1, $s4, $zero -/* ACED50 80240C10 E7A00020 */ swc1 $f0, 0x20($sp) -/* ACED54 80240C14 0C00A7E7 */ jal add_vec2D_polar -/* ACED58 80240C18 E7A20024 */ swc1 $f2, 0x24($sp) -/* ACED5C 80240C1C 3C038015 */ lui $v1, %hi(D_80151328) -/* ACED60 80240C20 8C631328 */ lw $v1, %lo(D_80151328)($v1) -/* ACED64 80240C24 C7A00020 */ lwc1 $f0, 0x20($sp) -/* ACED68 80240C28 3C0141A0 */ lui $at, 0x41a0 -/* ACED6C 80240C2C 44811000 */ mtc1 $at, $f2 -/* ACED70 80240C30 00101040 */ sll $v0, $s0, 1 -/* ACED74 80240C34 00501021 */ addu $v0, $v0, $s0 -/* ACED78 80240C38 000210C0 */ sll $v0, $v0, 3 -/* ACED7C 80240C3C 24420004 */ addiu $v0, $v0, 4 -/* ACED80 80240C40 00621821 */ addu $v1, $v1, $v0 -/* ACED84 80240C44 E4600004 */ swc1 $f0, 4($v1) -/* ACED88 80240C48 C620003C */ lwc1 $f0, 0x3c($s1) -/* ACED8C 80240C4C 4406A000 */ mfc1 $a2, $f20 -/* ACED90 80240C50 46020000 */ add.s $f0, $f0, $f2 -/* ACED94 80240C54 C7A20024 */ lwc1 $f2, 0x24($sp) -/* ACED98 80240C58 02A0202D */ daddu $a0, $s5, $zero -/* ACED9C 80240C5C E462000C */ swc1 $f2, 0xc($v1) -/* ACEDA0 80240C60 E4600008 */ swc1 $f0, 8($v1) -/* ACEDA4 80240C64 8E27000C */ lw $a3, 0xc($s1) -/* ACEDA8 80240C68 C6200038 */ lwc1 $f0, 0x38($s1) -/* ACEDAC 80240C6C C6220040 */ lwc1 $f2, 0x40($s1) -/* ACEDB0 80240C70 0280282D */ daddu $a1, $s4, $zero -/* ACEDB4 80240C74 E7A00020 */ swc1 $f0, 0x20($sp) -/* ACEDB8 80240C78 0C00A7E7 */ jal add_vec2D_polar -/* ACEDBC 80240C7C E7A20024 */ swc1 $f2, 0x24($sp) -/* ACEDC0 80240C80 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* ACEDC4 80240C84 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* ACEDC8 80240C88 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* ACEDCC 80240C8C C7AE0024 */ lwc1 $f14, 0x24($sp) -/* ACEDD0 80240C90 8E460028 */ lw $a2, 0x28($s2) -/* ACEDD4 80240C94 8E470030 */ lw $a3, 0x30($s2) -/* ACEDD8 80240C98 0C00A7B5 */ jal dist2D -/* ACEDDC 80240C9C 0000802D */ daddu $s0, $zero, $zero -/* ACEDE0 80240CA0 4616003E */ c.le.s $f0, $f22 -/* ACEDE4 80240CA4 00000000 */ nop -/* ACEDE8 80240CA8 45000002 */ bc1f .L80240CB4 -/* ACEDEC 80240CAC 0240982D */ daddu $s3, $s2, $zero -/* ACEDF0 80240CB0 24100001 */ addiu $s0, $zero, 1 -.L80240CB4: -/* ACEDF4 80240CB4 4600B021 */ cvt.d.s $f0, $f22 -/* ACEDF8 80240CB8 46200000 */ add.d $f0, $f0, $f0 -/* ACEDFC 80240CBC 3C014059 */ lui $at, 0x4059 -/* ACEE00 80240CC0 44811800 */ mtc1 $at, $f3 -/* ACEE04 80240CC4 44801000 */ mtc1 $zero, $f2 -/* ACEE08 80240CC8 3C018024 */ lui $at, 0x8024 -/* ACEE0C 80240CCC D4245F40 */ ldc1 $f4, 0x5f40($at) -/* ACEE10 80240CD0 46220003 */ div.d $f0, $f0, $f2 -/* ACEE14 80240CD4 46240000 */ add.d $f0, $f0, $f4 -/* ACEE18 80240CD8 C7A20020 */ lwc1 $f2, 0x20($sp) -/* ACEE1C 80240CDC C7A40024 */ lwc1 $f4, 0x24($sp) -/* ACEE20 80240CE0 44051000 */ mfc1 $a1, $f2 -/* ACEE24 80240CE4 44072000 */ mfc1 $a3, $f4 -/* ACEE28 80240CE8 46200020 */ cvt.s.d $f0, $f0 -/* ACEE2C 80240CEC E7A00010 */ swc1 $f0, 0x10($sp) -/* ACEE30 80240CF0 8E26003C */ lw $a2, 0x3c($s1) -/* ACEE34 80240CF4 0C0902AC */ jal func_80240AB0 -/* ACEE38 80240CF8 02C0202D */ daddu $a0, $s6, $zero -/* ACEE3C 80240CFC 02A0202D */ daddu $a0, $s5, $zero -/* ACEE40 80240D00 4406C000 */ mfc1 $a2, $f24 -/* ACEE44 80240D04 8E27000C */ lw $a3, 0xc($s1) -/* ACEE48 80240D08 C6200038 */ lwc1 $f0, 0x38($s1) -/* ACEE4C 80240D0C C6220040 */ lwc1 $f2, 0x40($s1) -/* ACEE50 80240D10 0280282D */ daddu $a1, $s4, $zero -/* ACEE54 80240D14 E7A00020 */ swc1 $f0, 0x20($sp) -/* ACEE58 80240D18 0C00A7E7 */ jal add_vec2D_polar -/* ACEE5C 80240D1C E7A20024 */ swc1 $f2, 0x24($sp) -/* ACEE60 80240D20 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* ACEE64 80240D24 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* ACEE68 80240D28 8E460028 */ lw $a2, 0x28($s2) -/* ACEE6C 80240D2C 0C00A7B5 */ jal dist2D -/* ACEE70 80240D30 8E470030 */ lw $a3, 0x30($s2) -/* ACEE74 80240D34 461A003E */ c.le.s $f0, $f26 -/* ACEE78 80240D38 00000000 */ nop -/* ACEE7C 80240D3C 45030001 */ bc1tl .L80240D44 -/* ACEE80 80240D40 36100010 */ ori $s0, $s0, 0x10 -.L80240D44: -/* ACEE84 80240D44 32020001 */ andi $v0, $s0, 1 -/* ACEE88 80240D48 10400026 */ beqz $v0, .L80240DE4 -/* ACEE8C 80240D4C 02E0202D */ daddu $a0, $s7, $zero -/* ACEE90 80240D50 C62C0038 */ lwc1 $f12, 0x38($s1) -/* ACEE94 80240D54 C62E0040 */ lwc1 $f14, 0x40($s1) -/* ACEE98 80240D58 8E660028 */ lw $a2, 0x28($s3) -/* ACEE9C 80240D5C 8E670030 */ lw $a3, 0x30($s3) -/* ACEEA0 80240D60 C622003C */ lwc1 $f2, 0x3c($s1) -/* ACEEA4 80240D64 46006006 */ mov.s $f0, $f12 -/* ACEEA8 80240D68 46007106 */ mov.s $f4, $f14 -/* ACEEAC 80240D6C E7A00020 */ swc1 $f0, 0x20($sp) -/* ACEEB0 80240D70 E7A20028 */ swc1 $f2, 0x28($sp) -/* ACEEB4 80240D74 0C00A7B5 */ jal dist2D -/* ACEEB8 80240D78 E7A40024 */ swc1 $f4, 0x24($sp) -/* ACEEBC 80240D7C C62C0038 */ lwc1 $f12, 0x38($s1) -/* ACEEC0 80240D80 C62E0040 */ lwc1 $f14, 0x40($s1) -/* ACEEC4 80240D84 8E660028 */ lw $a2, 0x28($s3) -/* ACEEC8 80240D88 8E670030 */ lw $a3, 0x30($s3) -/* ACEECC 80240D8C 0C00A720 */ jal atan2 -/* ACEED0 80240D90 46000506 */ mov.s $f20, $f0 -/* ACEED4 80240D94 0000202D */ daddu $a0, $zero, $zero -/* ACEED8 80240D98 02A0282D */ daddu $a1, $s5, $zero -/* ACEEDC 80240D9C E7B40010 */ swc1 $f20, 0x10($sp) -/* ACEEE0 80240DA0 E7A00014 */ swc1 $f0, 0x14($sp) -/* ACEEE4 80240DA4 862200A6 */ lh $v0, 0xa6($s1) -/* ACEEE8 80240DA8 27A60028 */ addiu $a2, $sp, 0x28 -/* ACEEEC 80240DAC 44820000 */ mtc1 $v0, $f0 -/* ACEEF0 80240DB0 00000000 */ nop -/* ACEEF4 80240DB4 46800020 */ cvt.s.w $f0, $f0 -/* ACEEF8 80240DB8 E7A00018 */ swc1 $f0, 0x18($sp) -/* ACEEFC 80240DBC 862200A8 */ lh $v0, 0xa8($s1) -/* ACEF00 80240DC0 0280382D */ daddu $a3, $s4, $zero -/* ACEF04 80240DC4 44820000 */ mtc1 $v0, $f0 -/* ACEF08 80240DC8 00000000 */ nop -/* ACEF0C 80240DCC 46800020 */ cvt.s.w $f0, $f0 -/* ACEF10 80240DD0 0C0376B9 */ jal func_800DDAE4 -/* ACEF14 80240DD4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* ACEF18 80240DD8 54400001 */ bnel $v0, $zero, .L80240DE0 -/* ACEF1C 80240DDC 0000802D */ daddu $s0, $zero, $zero -.L80240DE0: -/* ACEF20 80240DE0 02E0202D */ daddu $a0, $s7, $zero -.L80240DE4: -/* ACEF24 80240DE4 03C0282D */ daddu $a1, $fp, $zero -/* ACEF28 80240DE8 0C0B2026 */ jal set_variable -/* ACEF2C 80240DEC 0200302D */ daddu $a2, $s0, $zero -/* ACEF30 80240DF0 8FBF0054 */ lw $ra, 0x54($sp) -/* ACEF34 80240DF4 8FBE0050 */ lw $fp, 0x50($sp) -/* ACEF38 80240DF8 8FB7004C */ lw $s7, 0x4c($sp) -/* ACEF3C 80240DFC 8FB60048 */ lw $s6, 0x48($sp) -/* ACEF40 80240E00 8FB50044 */ lw $s5, 0x44($sp) -/* ACEF44 80240E04 8FB40040 */ lw $s4, 0x40($sp) -/* ACEF48 80240E08 8FB3003C */ lw $s3, 0x3c($sp) -/* ACEF4C 80240E0C 8FB20038 */ lw $s2, 0x38($sp) -/* ACEF50 80240E10 8FB10034 */ lw $s1, 0x34($sp) -/* ACEF54 80240E14 8FB00030 */ lw $s0, 0x30($sp) -/* ACEF58 80240E18 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* ACEF5C 80240E1C D7B80068 */ ldc1 $f24, 0x68($sp) -/* ACEF60 80240E20 D7B60060 */ ldc1 $f22, 0x60($sp) -/* ACEF64 80240E24 D7B40058 */ ldc1 $f20, 0x58($sp) -/* ACEF68 80240E28 24020002 */ addiu $v0, $zero, 2 -/* ACEF6C 80240E2C 03E00008 */ jr $ra -/* ACEF70 80240E30 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240E34_ACE140.s b/asm/nonmatchings/world/area_kkj/kkj_11/func_80240E34_ACE140.s deleted file mode 100644 index c5252c1b3c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240E34_ACE140.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E34_ACEF74 -/* ACEF74 80240E34 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* ACEF78 80240E38 AFB10014 */ sw $s1, 0x14($sp) -/* ACEF7C 80240E3C 0080882D */ daddu $s1, $a0, $zero -/* ACEF80 80240E40 AFBF0024 */ sw $ra, 0x24($sp) -/* ACEF84 80240E44 AFB40020 */ sw $s4, 0x20($sp) -/* ACEF88 80240E48 AFB3001C */ sw $s3, 0x1c($sp) -/* ACEF8C 80240E4C AFB20018 */ sw $s2, 0x18($sp) -/* ACEF90 80240E50 AFB00010 */ sw $s0, 0x10($sp) -/* ACEF94 80240E54 8E30000C */ lw $s0, 0xc($s1) -/* ACEF98 80240E58 8E140000 */ lw $s4, ($s0) -/* ACEF9C 80240E5C 26100004 */ addiu $s0, $s0, 4 -/* ACEFA0 80240E60 8E050000 */ lw $a1, ($s0) -/* ACEFA4 80240E64 0C0B1EAF */ jal get_variable -/* ACEFA8 80240E68 26100004 */ addiu $s0, $s0, 4 -/* ACEFAC 80240E6C 8E050000 */ lw $a1, ($s0) -/* ACEFB0 80240E70 26100004 */ addiu $s0, $s0, 4 -/* ACEFB4 80240E74 0220202D */ daddu $a0, $s1, $zero -/* ACEFB8 80240E78 0C0B1EAF */ jal get_variable -/* ACEFBC 80240E7C 0040982D */ daddu $s3, $v0, $zero -/* ACEFC0 80240E80 8E050000 */ lw $a1, ($s0) -/* ACEFC4 80240E84 26100004 */ addiu $s0, $s0, 4 -/* ACEFC8 80240E88 0220202D */ daddu $a0, $s1, $zero -/* ACEFCC 80240E8C 0C0B1EAF */ jal get_variable -/* ACEFD0 80240E90 0040902D */ daddu $s2, $v0, $zero -/* ACEFD4 80240E94 0220202D */ daddu $a0, $s1, $zero -/* ACEFD8 80240E98 8E050000 */ lw $a1, ($s0) -/* ACEFDC 80240E9C 0C0B1EAF */ jal get_variable -/* ACEFE0 80240EA0 0040802D */ daddu $s0, $v0, $zero -/* ACEFE4 80240EA4 44901000 */ mtc1 $s0, $f2 -/* ACEFE8 80240EA8 00000000 */ nop -/* ACEFEC 80240EAC 468010A0 */ cvt.s.w $f2, $f2 -/* ACEFF0 80240EB0 44936000 */ mtc1 $s3, $f12 -/* ACEFF4 80240EB4 00000000 */ nop -/* ACEFF8 80240EB8 46806320 */ cvt.s.w $f12, $f12 -/* ACEFFC 80240EBC 44061000 */ mfc1 $a2, $f2 -/* ACF000 80240EC0 44821000 */ mtc1 $v0, $f2 -/* ACF004 80240EC4 00000000 */ nop -/* ACF008 80240EC8 468010A0 */ cvt.s.w $f2, $f2 -/* ACF00C 80240ECC 44071000 */ mfc1 $a3, $f2 -/* ACF010 80240ED0 44927000 */ mtc1 $s2, $f14 -/* ACF014 80240ED4 00000000 */ nop -/* ACF018 80240ED8 0C00A720 */ jal atan2 -/* ACF01C 80240EDC 468073A0 */ cvt.s.w $f14, $f14 -/* ACF020 80240EE0 0220202D */ daddu $a0, $s1, $zero -/* ACF024 80240EE4 4600008D */ trunc.w.s $f2, $f0 -/* ACF028 80240EE8 44061000 */ mfc1 $a2, $f2 -/* ACF02C 80240EEC 0C0B2026 */ jal set_variable -/* ACF030 80240EF0 0280282D */ daddu $a1, $s4, $zero -/* ACF034 80240EF4 8FBF0024 */ lw $ra, 0x24($sp) -/* ACF038 80240EF8 8FB40020 */ lw $s4, 0x20($sp) -/* ACF03C 80240EFC 8FB3001C */ lw $s3, 0x1c($sp) -/* ACF040 80240F00 8FB20018 */ lw $s2, 0x18($sp) -/* ACF044 80240F04 8FB10014 */ lw $s1, 0x14($sp) -/* ACF048 80240F08 8FB00010 */ lw $s0, 0x10($sp) -/* ACF04C 80240F0C 24020002 */ addiu $v0, $zero, 2 -/* ACF050 80240F10 03E00008 */ jr $ra -/* ACF054 80240F14 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240F18_ACE140.s b/asm/nonmatchings/world/area_kkj/kkj_11/func_80240F18_ACE140.s deleted file mode 100644 index 175d6c8e95..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240F18_ACE140.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F18_ACF058 -/* ACF058 80240F18 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ACF05C 80240F1C AFBF0010 */ sw $ra, 0x10($sp) -/* ACF060 80240F20 8C82000C */ lw $v0, 0xc($a0) -/* ACF064 80240F24 3C068011 */ lui $a2, 0x8011 -/* ACF068 80240F28 80C6EFD4 */ lb $a2, -0x102c($a2) -/* ACF06C 80240F2C 0C0B2026 */ jal set_variable -/* ACF070 80240F30 8C450000 */ lw $a1, ($v0) -/* ACF074 80240F34 8FBF0010 */ lw $ra, 0x10($sp) -/* ACF078 80240F38 24020002 */ addiu $v0, $zero, 2 -/* ACF07C 80240F3C 03E00008 */ jr $ra -/* ACF080 80240F40 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240F44_ACE140.s b/asm/nonmatchings/world/area_kkj/kkj_11/func_80240F44_ACE140.s deleted file mode 100644 index 302ab94bc5..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240F44_ACE140.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F44_ACF084 -/* ACF084 80240F44 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* ACF088 80240F48 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* ACF08C 80240F4C 9062007E */ lbu $v0, 0x7e($v1) -/* ACF090 80240F50 34420008 */ ori $v0, $v0, 8 -/* ACF094 80240F54 A062007E */ sb $v0, 0x7e($v1) -/* ACF098 80240F58 03E00008 */ jr $ra -/* ACF09C 80240F5C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240F60_ACE140.s b/asm/nonmatchings/world/area_kkj/kkj_11/func_80240F60_ACE140.s deleted file mode 100644 index 1db34a3b1e..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_11/func_80240F60_ACE140.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F60_ACF0A0 -/* ACF0A0 80240F60 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* ACF0A4 80240F64 AFB3001C */ sw $s3, 0x1c($sp) -/* ACF0A8 80240F68 0080982D */ daddu $s3, $a0, $zero -/* ACF0AC 80240F6C AFBF0030 */ sw $ra, 0x30($sp) -/* ACF0B0 80240F70 AFB7002C */ sw $s7, 0x2c($sp) -/* ACF0B4 80240F74 AFB60028 */ sw $s6, 0x28($sp) -/* ACF0B8 80240F78 AFB50024 */ sw $s5, 0x24($sp) -/* ACF0BC 80240F7C AFB40020 */ sw $s4, 0x20($sp) -/* ACF0C0 80240F80 AFB20018 */ sw $s2, 0x18($sp) -/* ACF0C4 80240F84 AFB10014 */ sw $s1, 0x14($sp) -/* ACF0C8 80240F88 AFB00010 */ sw $s0, 0x10($sp) -/* ACF0CC 80240F8C F7B80048 */ sdc1 $f24, 0x48($sp) -/* ACF0D0 80240F90 F7B60040 */ sdc1 $f22, 0x40($sp) -/* ACF0D4 80240F94 F7B40038 */ sdc1 $f20, 0x38($sp) -/* ACF0D8 80240F98 8E70000C */ lw $s0, 0xc($s3) -/* ACF0DC 80240F9C 8E050000 */ lw $a1, ($s0) -/* ACF0E0 80240FA0 0C0B1EAF */ jal get_variable -/* ACF0E4 80240FA4 26100004 */ addiu $s0, $s0, 4 -/* ACF0E8 80240FA8 8E150000 */ lw $s5, ($s0) -/* ACF0EC 80240FAC 26100004 */ addiu $s0, $s0, 4 -/* ACF0F0 80240FB0 0260202D */ daddu $a0, $s3, $zero -/* ACF0F4 80240FB4 8E160000 */ lw $s6, ($s0) -/* ACF0F8 80240FB8 8E170004 */ lw $s7, 4($s0) -/* ACF0FC 80240FBC 0C0B36B0 */ jal resolve_npc -/* ACF100 80240FC0 0040282D */ daddu $a1, $v0, $zero -/* ACF104 80240FC4 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* ACF108 80240FC8 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* ACF10C 80240FCC 0040802D */ daddu $s0, $v0, $zero -/* ACF110 80240FD0 1200002F */ beqz $s0, .L80241090 -/* ACF114 80240FD4 0220902D */ daddu $s2, $s1, $zero -/* ACF118 80240FD8 C62C0028 */ lwc1 $f12, 0x28($s1) -/* ACF11C 80240FDC C62E0030 */ lwc1 $f14, 0x30($s1) -/* ACF120 80240FE0 8E060038 */ lw $a2, 0x38($s0) -/* ACF124 80240FE4 8E070040 */ lw $a3, 0x40($s0) -/* ACF128 80240FE8 3C0142C8 */ lui $at, 0x42c8 -/* ACF12C 80240FEC 4481C000 */ mtc1 $at, $f24 -/* ACF130 80240FF0 0C00A7B5 */ jal dist2D -/* ACF134 80240FF4 24140001 */ addiu $s4, $zero, 1 -/* ACF138 80240FF8 4618003C */ c.lt.s $f0, $f24 -/* ACF13C 80240FFC 00000000 */ nop -/* ACF140 80241000 45030001 */ bc1tl .L80241008 -/* ACF144 80241004 0000A02D */ daddu $s4, $zero, $zero -.L80241008: -/* ACF148 80241008 C64C0028 */ lwc1 $f12, 0x28($s2) -/* ACF14C 8024100C C64E0030 */ lwc1 $f14, 0x30($s2) -/* ACF150 80241010 8E060038 */ lw $a2, 0x38($s0) -/* ACF154 80241014 0C00A720 */ jal atan2 -/* ACF158 80241018 8E070040 */ lw $a3, 0x40($s0) -/* ACF15C 8024101C 0C00A6C9 */ jal clamp_angle -/* ACF160 80241020 46000306 */ mov.s $f12, $f0 -/* ACF164 80241024 46000506 */ mov.s $f20, $f0 -/* ACF168 80241028 0C00A8BB */ jal sin_deg -/* ACF16C 8024102C 4600A306 */ mov.s $f12, $f20 -/* ACF170 80241030 46180002 */ mul.s $f0, $f0, $f24 -/* ACF174 80241034 00000000 */ nop -/* ACF178 80241038 C6560028 */ lwc1 $f22, 0x28($s2) -/* ACF17C 8024103C 4600B580 */ add.s $f22, $f22, $f0 -/* ACF180 80241040 0C00A8D4 */ jal cos_deg -/* ACF184 80241044 4600A306 */ mov.s $f12, $f20 -/* ACF188 80241048 46180002 */ mul.s $f0, $f0, $f24 -/* ACF18C 8024104C 00000000 */ nop -/* ACF190 80241050 0260202D */ daddu $a0, $s3, $zero -/* ACF194 80241054 02A0282D */ daddu $a1, $s5, $zero -/* ACF198 80241058 C6540030 */ lwc1 $f20, 0x30($s2) -/* ACF19C 8024105C 0280302D */ daddu $a2, $s4, $zero -/* ACF1A0 80241060 0C0B2026 */ jal set_variable -/* ACF1A4 80241064 4600A501 */ sub.s $f20, $f20, $f0 -/* ACF1A8 80241068 0260202D */ daddu $a0, $s3, $zero -/* ACF1AC 8024106C 4600B08D */ trunc.w.s $f2, $f22 -/* ACF1B0 80241070 44061000 */ mfc1 $a2, $f2 -/* ACF1B4 80241074 0C0B2026 */ jal set_variable -/* ACF1B8 80241078 02C0282D */ daddu $a1, $s6, $zero -/* ACF1BC 8024107C 0260202D */ daddu $a0, $s3, $zero -/* ACF1C0 80241080 4600A08D */ trunc.w.s $f2, $f20 -/* ACF1C4 80241084 44061000 */ mfc1 $a2, $f2 -/* ACF1C8 80241088 0C0B2026 */ jal set_variable -/* ACF1CC 8024108C 02E0282D */ daddu $a1, $s7, $zero -.L80241090: -/* ACF1D0 80241090 24020002 */ addiu $v0, $zero, 2 -/* ACF1D4 80241094 8FBF0030 */ lw $ra, 0x30($sp) -/* ACF1D8 80241098 8FB7002C */ lw $s7, 0x2c($sp) -/* ACF1DC 8024109C 8FB60028 */ lw $s6, 0x28($sp) -/* ACF1E0 802410A0 8FB50024 */ lw $s5, 0x24($sp) -/* ACF1E4 802410A4 8FB40020 */ lw $s4, 0x20($sp) -/* ACF1E8 802410A8 8FB3001C */ lw $s3, 0x1c($sp) -/* ACF1EC 802410AC 8FB20018 */ lw $s2, 0x18($sp) -/* ACF1F0 802410B0 8FB10014 */ lw $s1, 0x14($sp) -/* ACF1F4 802410B4 8FB00010 */ lw $s0, 0x10($sp) -/* ACF1F8 802410B8 D7B80048 */ ldc1 $f24, 0x48($sp) -/* ACF1FC 802410BC D7B60040 */ ldc1 $f22, 0x40($sp) -/* ACF200 802410C0 D7B40038 */ ldc1 $f20, 0x38($sp) -/* ACF204 802410C4 03E00008 */ jr $ra -/* ACF208 802410C8 27BD0050 */ addiu $sp, $sp, 0x50 -/* ACF20C 802410CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/func_80240034_AD4090.s b/asm/nonmatchings/world/area_kkj/kkj_12/func_80240034_AD4090.s deleted file mode 100644 index 11f07f8482..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_12/func_80240034_AD4090.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_AD40C4 -/* AD40C4 80240034 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD40C8 80240038 AFBF0010 */ sw $ra, 0x10($sp) -/* AD40CC 8024003C 8C82000C */ lw $v0, 0xc($a0) -/* AD40D0 80240040 0C0B210B */ jal get_float_variable -/* AD40D4 80240044 8C450000 */ lw $a1, ($v0) -/* AD40D8 80240048 8FBF0010 */ lw $ra, 0x10($sp) -/* AD40DC 8024004C 4600008D */ trunc.w.s $f2, $f0 -/* AD40E0 80240050 44021000 */ mfc1 $v0, $f2 -/* AD40E4 80240054 00000000 */ nop -/* AD40E8 80240058 3C018011 */ lui $at, 0x8011 -/* AD40EC 8024005C A022EFD5 */ sb $v0, -0x102b($at) -/* AD40F0 80240060 24020002 */ addiu $v0, $zero, 2 -/* AD40F4 80240064 03E00008 */ jr $ra -/* AD40F8 80240068 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD40FC 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/func_80240070_AD4090.s b/asm/nonmatchings/world/area_kkj/kkj_12/func_80240070_AD4090.s deleted file mode 100644 index b19281eef7..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_12/func_80240070_AD4090.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_AD4100 -/* AD4100 80240070 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* AD4104 80240074 AFB3003C */ sw $s3, 0x3c($sp) -/* AD4108 80240078 0080982D */ daddu $s3, $a0, $zero -/* AD410C 8024007C AFBF0044 */ sw $ra, 0x44($sp) -/* AD4110 80240080 AFB40040 */ sw $s4, 0x40($sp) -/* AD4114 80240084 AFB20038 */ sw $s2, 0x38($sp) -/* AD4118 80240088 AFB10034 */ sw $s1, 0x34($sp) -/* AD411C 8024008C AFB00030 */ sw $s0, 0x30($sp) -/* AD4120 80240090 F7B80058 */ sdc1 $f24, 0x58($sp) -/* AD4124 80240094 F7B60050 */ sdc1 $f22, 0x50($sp) -/* AD4128 80240098 F7B40048 */ sdc1 $f20, 0x48($sp) -/* AD412C 8024009C 8E620148 */ lw $v0, 0x148($s3) -/* AD4130 802400A0 0C00EABB */ jal get_npc_unsafe -/* AD4134 802400A4 84440008 */ lh $a0, 8($v0) -/* AD4138 802400A8 27A40020 */ addiu $a0, $sp, 0x20 -/* AD413C 802400AC 27A50024 */ addiu $a1, $sp, 0x24 -/* AD4140 802400B0 0040802D */ daddu $s0, $v0, $zero -/* AD4144 802400B4 8E63000C */ lw $v1, 0xc($s3) -/* AD4148 802400B8 8E07000C */ lw $a3, 0xc($s0) -/* AD414C 802400BC C6000038 */ lwc1 $f0, 0x38($s0) -/* AD4150 802400C0 C6020040 */ lwc1 $f2, 0x40($s0) -/* AD4154 802400C4 8C740000 */ lw $s4, ($v1) -/* AD4158 802400C8 24630004 */ addiu $v1, $v1, 4 -/* AD415C 802400CC C4780000 */ lwc1 $f24, ($v1) -/* AD4160 802400D0 4680C620 */ cvt.s.w $f24, $f24 -/* AD4164 802400D4 24630004 */ addiu $v1, $v1, 4 -/* AD4168 802400D8 C4740000 */ lwc1 $f20, ($v1) -/* AD416C 802400DC 4680A520 */ cvt.s.w $f20, $f20 -/* AD4170 802400E0 4406A000 */ mfc1 $a2, $f20 -/* AD4174 802400E4 C4760004 */ lwc1 $f22, 4($v1) -/* AD4178 802400E8 4680B5A0 */ cvt.s.w $f22, $f22 -/* AD417C 802400EC E7A00020 */ swc1 $f0, 0x20($sp) -/* AD4180 802400F0 0C00A7E7 */ jal add_vec2D_polar -/* AD4184 802400F4 E7A20024 */ swc1 $f2, 0x24($sp) -/* AD4188 802400F8 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* AD418C 802400FC 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* AD4190 80240100 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* AD4194 80240104 4480A000 */ mtc1 $zero, $f20 -/* AD4198 80240108 8E460028 */ lw $a2, 0x28($s2) -/* AD419C 8024010C 4407A000 */ mfc1 $a3, $f20 -/* AD41A0 80240110 0C00A7B5 */ jal dist2D -/* AD41A4 80240114 4600A386 */ mov.s $f14, $f20 -/* AD41A8 80240118 4600A306 */ mov.s $f12, $f20 -/* AD41AC 8024011C C7AE0024 */ lwc1 $f14, 0x24($sp) -/* AD41B0 80240120 44066000 */ mfc1 $a2, $f12 -/* AD41B4 80240124 8E470030 */ lw $a3, 0x30($s2) -/* AD41B8 80240128 0C00A7B5 */ jal dist2D -/* AD41BC 8024012C 46000506 */ mov.s $f20, $f0 -/* AD41C0 80240130 C604000C */ lwc1 $f4, 0xc($s0) -/* AD41C4 80240134 3C018024 */ lui $at, 0x8024 -/* AD41C8 80240138 D4221E20 */ ldc1 $f2, 0x1e20($at) -/* AD41CC 8024013C 46002121 */ cvt.d.s $f4, $f4 -/* AD41D0 80240140 46222032 */ c.eq.d $f4, $f2 -/* AD41D4 80240144 00000000 */ nop -/* AD41D8 80240148 45010007 */ bc1t .L80240168 -/* AD41DC 8024014C 46000086 */ mov.s $f2, $f0 -/* AD41E0 80240150 3C018024 */ lui $at, 0x8024 -/* AD41E4 80240154 D4201E28 */ ldc1 $f0, 0x1e28($at) -/* AD41E8 80240158 46202032 */ c.eq.d $f4, $f0 -/* AD41EC 8024015C 00000000 */ nop -/* AD41F0 80240160 45000008 */ bc1f .L80240184 -/* AD41F4 80240164 00000000 */ nop -.L80240168: -/* AD41F8 80240168 4618A03E */ c.le.s $f20, $f24 -/* AD41FC 8024016C 00000000 */ nop -/* AD4200 80240170 4500000C */ bc1f .L802401A4 -/* AD4204 80240174 0000882D */ daddu $s1, $zero, $zero -/* AD4208 80240178 4616103E */ c.le.s $f2, $f22 -/* AD420C 8024017C 08090067 */ j .L8024019C -/* AD4210 80240180 00000000 */ nop -.L80240184: -/* AD4214 80240184 4618103E */ c.le.s $f2, $f24 -/* AD4218 80240188 00000000 */ nop -/* AD421C 8024018C 45000005 */ bc1f .L802401A4 -/* AD4220 80240190 0000882D */ daddu $s1, $zero, $zero -/* AD4224 80240194 4616A03E */ c.le.s $f20, $f22 -/* AD4228 80240198 00000000 */ nop -.L8024019C: -/* AD422C 8024019C 45030001 */ bc1tl .L802401A4 -/* AD4230 802401A0 24110001 */ addiu $s1, $zero, 1 -.L802401A4: -/* AD4234 802401A4 12200027 */ beqz $s1, .L80240244 -/* AD4238 802401A8 0260202D */ daddu $a0, $s3, $zero -/* AD423C 802401AC C60C0038 */ lwc1 $f12, 0x38($s0) -/* AD4240 802401B0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* AD4244 802401B4 8E460028 */ lw $a2, 0x28($s2) -/* AD4248 802401B8 8E470030 */ lw $a3, 0x30($s2) -/* AD424C 802401BC C602003C */ lwc1 $f2, 0x3c($s0) -/* AD4250 802401C0 46006006 */ mov.s $f0, $f12 -/* AD4254 802401C4 46007106 */ mov.s $f4, $f14 -/* AD4258 802401C8 E7A00020 */ swc1 $f0, 0x20($sp) -/* AD425C 802401CC E7A20028 */ swc1 $f2, 0x28($sp) -/* AD4260 802401D0 0C00A7B5 */ jal dist2D -/* AD4264 802401D4 E7A40024 */ swc1 $f4, 0x24($sp) -/* AD4268 802401D8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* AD426C 802401DC C60E0040 */ lwc1 $f14, 0x40($s0) -/* AD4270 802401E0 8E460028 */ lw $a2, 0x28($s2) -/* AD4274 802401E4 8E470030 */ lw $a3, 0x30($s2) -/* AD4278 802401E8 0C00A720 */ jal atan2 -/* AD427C 802401EC 46000506 */ mov.s $f20, $f0 -/* AD4280 802401F0 3C040007 */ lui $a0, 7 -/* AD4284 802401F4 34848000 */ ori $a0, $a0, 0x8000 -/* AD4288 802401F8 27A50020 */ addiu $a1, $sp, 0x20 -/* AD428C 802401FC E7B40010 */ swc1 $f20, 0x10($sp) -/* AD4290 80240200 E7A00014 */ swc1 $f0, 0x14($sp) -/* AD4294 80240204 860200A6 */ lh $v0, 0xa6($s0) -/* AD4298 80240208 27A60028 */ addiu $a2, $sp, 0x28 -/* AD429C 8024020C 44820000 */ mtc1 $v0, $f0 -/* AD42A0 80240210 00000000 */ nop -/* AD42A4 80240214 46800020 */ cvt.s.w $f0, $f0 -/* AD42A8 80240218 E7A00018 */ swc1 $f0, 0x18($sp) -/* AD42AC 8024021C 860200A8 */ lh $v0, 0xa8($s0) -/* AD42B0 80240220 27A70024 */ addiu $a3, $sp, 0x24 -/* AD42B4 80240224 44820000 */ mtc1 $v0, $f0 -/* AD42B8 80240228 00000000 */ nop -/* AD42BC 8024022C 46800020 */ cvt.s.w $f0, $f0 -/* AD42C0 80240230 0C0376B9 */ jal func_800DDAE4 -/* AD42C4 80240234 E7A0001C */ swc1 $f0, 0x1c($sp) -/* AD42C8 80240238 54400001 */ bnel $v0, $zero, .L80240240 -/* AD42CC 8024023C 0000882D */ daddu $s1, $zero, $zero -.L80240240: -/* AD42D0 80240240 0260202D */ daddu $a0, $s3, $zero -.L80240244: -/* AD42D4 80240244 0280282D */ daddu $a1, $s4, $zero -/* AD42D8 80240248 0C0B2026 */ jal set_variable -/* AD42DC 8024024C 0220302D */ daddu $a2, $s1, $zero -/* AD42E0 80240250 8FBF0044 */ lw $ra, 0x44($sp) -/* AD42E4 80240254 8FB40040 */ lw $s4, 0x40($sp) -/* AD42E8 80240258 8FB3003C */ lw $s3, 0x3c($sp) -/* AD42EC 8024025C 8FB20038 */ lw $s2, 0x38($sp) -/* AD42F0 80240260 8FB10034 */ lw $s1, 0x34($sp) -/* AD42F4 80240264 8FB00030 */ lw $s0, 0x30($sp) -/* AD42F8 80240268 D7B80058 */ ldc1 $f24, 0x58($sp) -/* AD42FC 8024026C D7B60050 */ ldc1 $f22, 0x50($sp) -/* AD4300 80240270 D7B40048 */ ldc1 $f20, 0x48($sp) -/* AD4304 80240274 24020002 */ addiu $v0, $zero, 2 -/* AD4308 80240278 03E00008 */ jr $ra -/* AD430C 8024027C 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/func_80240280_AD4090.s b/asm/nonmatchings/world/area_kkj/kkj_12/func_80240280_AD4090.s deleted file mode 100644 index b6886b410c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_12/func_80240280_AD4090.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240280_AD4310 -/* AD4310 80240280 27BDFF80 */ addiu $sp, $sp, -0x80 -/* AD4314 80240284 F7B40060 */ sdc1 $f20, 0x60($sp) -/* AD4318 80240288 4485A000 */ mtc1 $a1, $f20 -/* AD431C 8024028C F7B60068 */ sdc1 $f22, 0x68($sp) -/* AD4320 80240290 4486B000 */ mtc1 $a2, $f22 -/* AD4324 80240294 F7B80070 */ sdc1 $f24, 0x70($sp) -/* AD4328 80240298 4487C000 */ mtc1 $a3, $f24 -/* AD432C 8024029C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* AD4330 802402A0 C7BA0090 */ lwc1 $f26, 0x90($sp) -/* AD4334 802402A4 AFBF0058 */ sw $ra, 0x58($sp) -/* AD4338 802402A8 AFB10054 */ sw $s1, 0x54($sp) -/* AD433C 802402AC 0C046C04 */ jal get_model_list_index_from_tree_index -/* AD4340 802402B0 AFB00050 */ sw $s0, 0x50($sp) -/* AD4344 802402B4 0C046B4C */ jal get_model_from_list_index -/* AD4348 802402B8 0040202D */ daddu $a0, $v0, $zero -/* AD434C 802402BC 0040802D */ daddu $s0, $v0, $zero -/* AD4350 802402C0 26110058 */ addiu $s1, $s0, 0x58 -/* AD4354 802402C4 4405A000 */ mfc1 $a1, $f20 -/* AD4358 802402C8 4406B000 */ mfc1 $a2, $f22 -/* AD435C 802402CC 4407C000 */ mfc1 $a3, $f24 -/* AD4360 802402D0 0C019E40 */ jal guTranslateF -/* AD4364 802402D4 0220202D */ daddu $a0, $s1, $zero -/* AD4368 802402D8 27A40010 */ addiu $a0, $sp, 0x10 -/* AD436C 802402DC 4405D000 */ mfc1 $a1, $f26 -/* AD4370 802402E0 3C063F80 */ lui $a2, 0x3f80 -/* AD4374 802402E4 0C019DF0 */ jal guScaleF -/* AD4378 802402E8 00A0382D */ daddu $a3, $a1, $zero -/* AD437C 802402EC 27A40010 */ addiu $a0, $sp, 0x10 -/* AD4380 802402F0 0220282D */ daddu $a1, $s1, $zero -/* AD4384 802402F4 0C019D80 */ jal guMtxCatF -/* AD4388 802402F8 00A0302D */ daddu $a2, $a1, $zero -/* AD438C 802402FC 96020000 */ lhu $v0, ($s0) -/* AD4390 80240300 34421400 */ ori $v0, $v0, 0x1400 -/* AD4394 80240304 A6020000 */ sh $v0, ($s0) -/* AD4398 80240308 8FBF0058 */ lw $ra, 0x58($sp) -/* AD439C 8024030C 8FB10054 */ lw $s1, 0x54($sp) -/* AD43A0 80240310 8FB00050 */ lw $s0, 0x50($sp) -/* AD43A4 80240314 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* AD43A8 80240318 D7B80070 */ ldc1 $f24, 0x70($sp) -/* AD43AC 8024031C D7B60068 */ ldc1 $f22, 0x68($sp) -/* AD43B0 80240320 D7B40060 */ ldc1 $f20, 0x60($sp) -/* AD43B4 80240324 03E00008 */ jr $ra -/* AD43B8 80240328 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/func_8024032C_AD4090.s b/asm/nonmatchings/world/area_kkj/kkj_12/func_8024032C_AD4090.s deleted file mode 100644 index 3dd298650d..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_12/func_8024032C_AD4090.s +++ /dev/null @@ -1,190 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024032C_AD43BC -/* AD43BC 8024032C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* AD43C0 80240330 AFB7004C */ sw $s7, 0x4c($sp) -/* AD43C4 80240334 0080B82D */ daddu $s7, $a0, $zero -/* AD43C8 80240338 AFBF0054 */ sw $ra, 0x54($sp) -/* AD43CC 8024033C AFBE0050 */ sw $fp, 0x50($sp) -/* AD43D0 80240340 AFB60048 */ sw $s6, 0x48($sp) -/* AD43D4 80240344 AFB50044 */ sw $s5, 0x44($sp) -/* AD43D8 80240348 AFB40040 */ sw $s4, 0x40($sp) -/* AD43DC 8024034C AFB3003C */ sw $s3, 0x3c($sp) -/* AD43E0 80240350 AFB20038 */ sw $s2, 0x38($sp) -/* AD43E4 80240354 AFB10034 */ sw $s1, 0x34($sp) -/* AD43E8 80240358 AFB00030 */ sw $s0, 0x30($sp) -/* AD43EC 8024035C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* AD43F0 80240360 F7B80068 */ sdc1 $f24, 0x68($sp) -/* AD43F4 80240364 F7B60060 */ sdc1 $f22, 0x60($sp) -/* AD43F8 80240368 F7B40058 */ sdc1 $f20, 0x58($sp) -/* AD43FC 8024036C 8EE20148 */ lw $v0, 0x148($s7) -/* AD4400 80240370 0C00EABB */ jal get_npc_unsafe -/* AD4404 80240374 84440008 */ lh $a0, 8($v0) -/* AD4408 80240378 27B50020 */ addiu $s5, $sp, 0x20 -/* AD440C 8024037C 02A0202D */ daddu $a0, $s5, $zero -/* AD4410 80240380 0040882D */ daddu $s1, $v0, $zero -/* AD4414 80240384 27B40024 */ addiu $s4, $sp, 0x24 -/* AD4418 80240388 8EE3000C */ lw $v1, 0xc($s7) -/* AD441C 8024038C 3C0641F0 */ lui $a2, 0x41f0 -/* AD4420 80240390 8E27000C */ lw $a3, 0xc($s1) -/* AD4424 80240394 C6200038 */ lwc1 $f0, 0x38($s1) -/* AD4428 80240398 C6220040 */ lwc1 $f2, 0x40($s1) -/* AD442C 8024039C 8C7E0000 */ lw $fp, ($v1) -/* AD4430 802403A0 24630004 */ addiu $v1, $v1, 4 -/* AD4434 802403A4 C4740000 */ lwc1 $f20, ($v1) -/* AD4438 802403A8 4680A520 */ cvt.s.w $f20, $f20 -/* AD443C 802403AC 24630004 */ addiu $v1, $v1, 4 -/* AD4440 802403B0 C4760000 */ lwc1 $f22, ($v1) -/* AD4444 802403B4 4680B5A0 */ cvt.s.w $f22, $f22 -/* AD4448 802403B8 24630004 */ addiu $v1, $v1, 4 -/* AD444C 802403BC C4780000 */ lwc1 $f24, ($v1) -/* AD4450 802403C0 4680C620 */ cvt.s.w $f24, $f24 -/* AD4454 802403C4 24630004 */ addiu $v1, $v1, 4 -/* AD4458 802403C8 C47A0000 */ lwc1 $f26, ($v1) -/* AD445C 802403CC 4680D6A0 */ cvt.s.w $f26, $f26 -/* AD4460 802403D0 24630004 */ addiu $v1, $v1, 4 -/* AD4464 802403D4 8C760000 */ lw $s6, ($v1) -/* AD4468 802403D8 8C700004 */ lw $s0, 4($v1) -/* AD446C 802403DC 0280282D */ daddu $a1, $s4, $zero -/* AD4470 802403E0 E7A00020 */ swc1 $f0, 0x20($sp) -/* AD4474 802403E4 0C00A7E7 */ jal add_vec2D_polar -/* AD4478 802403E8 E7A20024 */ swc1 $f2, 0x24($sp) -/* AD447C 802403EC 3C038015 */ lui $v1, %hi(D_80151328) -/* AD4480 802403F0 8C631328 */ lw $v1, %lo(D_80151328)($v1) -/* AD4484 802403F4 C7A00020 */ lwc1 $f0, 0x20($sp) -/* AD4488 802403F8 3C0141A0 */ lui $at, 0x41a0 -/* AD448C 802403FC 44811000 */ mtc1 $at, $f2 -/* AD4490 80240400 00101040 */ sll $v0, $s0, 1 -/* AD4494 80240404 00501021 */ addu $v0, $v0, $s0 -/* AD4498 80240408 000210C0 */ sll $v0, $v0, 3 -/* AD449C 8024040C 24420004 */ addiu $v0, $v0, 4 -/* AD44A0 80240410 00621821 */ addu $v1, $v1, $v0 -/* AD44A4 80240414 E4600004 */ swc1 $f0, 4($v1) -/* AD44A8 80240418 C620003C */ lwc1 $f0, 0x3c($s1) -/* AD44AC 8024041C 4406A000 */ mfc1 $a2, $f20 -/* AD44B0 80240420 46020000 */ add.s $f0, $f0, $f2 -/* AD44B4 80240424 C7A20024 */ lwc1 $f2, 0x24($sp) -/* AD44B8 80240428 02A0202D */ daddu $a0, $s5, $zero -/* AD44BC 8024042C E462000C */ swc1 $f2, 0xc($v1) -/* AD44C0 80240430 E4600008 */ swc1 $f0, 8($v1) -/* AD44C4 80240434 8E27000C */ lw $a3, 0xc($s1) -/* AD44C8 80240438 C6200038 */ lwc1 $f0, 0x38($s1) -/* AD44CC 8024043C C6220040 */ lwc1 $f2, 0x40($s1) -/* AD44D0 80240440 0280282D */ daddu $a1, $s4, $zero -/* AD44D4 80240444 E7A00020 */ swc1 $f0, 0x20($sp) -/* AD44D8 80240448 0C00A7E7 */ jal add_vec2D_polar -/* AD44DC 8024044C E7A20024 */ swc1 $f2, 0x24($sp) -/* AD44E0 80240450 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* AD44E4 80240454 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* AD44E8 80240458 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* AD44EC 8024045C C7AE0024 */ lwc1 $f14, 0x24($sp) -/* AD44F0 80240460 8E460028 */ lw $a2, 0x28($s2) -/* AD44F4 80240464 8E470030 */ lw $a3, 0x30($s2) -/* AD44F8 80240468 0C00A7B5 */ jal dist2D -/* AD44FC 8024046C 0000802D */ daddu $s0, $zero, $zero -/* AD4500 80240470 4616003E */ c.le.s $f0, $f22 -/* AD4504 80240474 00000000 */ nop -/* AD4508 80240478 45000002 */ bc1f .L80240484 -/* AD450C 8024047C 0240982D */ daddu $s3, $s2, $zero -/* AD4510 80240480 24100001 */ addiu $s0, $zero, 1 -.L80240484: -/* AD4514 80240484 4600B021 */ cvt.d.s $f0, $f22 -/* AD4518 80240488 46200000 */ add.d $f0, $f0, $f0 -/* AD451C 8024048C 3C014059 */ lui $at, 0x4059 -/* AD4520 80240490 44811800 */ mtc1 $at, $f3 -/* AD4524 80240494 44801000 */ mtc1 $zero, $f2 -/* AD4528 80240498 3C018024 */ lui $at, 0x8024 -/* AD452C 8024049C D4241E30 */ ldc1 $f4, 0x1e30($at) -/* AD4530 802404A0 46220003 */ div.d $f0, $f0, $f2 -/* AD4534 802404A4 46240000 */ add.d $f0, $f0, $f4 -/* AD4538 802404A8 C7A20020 */ lwc1 $f2, 0x20($sp) -/* AD453C 802404AC C7A40024 */ lwc1 $f4, 0x24($sp) -/* AD4540 802404B0 44051000 */ mfc1 $a1, $f2 -/* AD4544 802404B4 44072000 */ mfc1 $a3, $f4 -/* AD4548 802404B8 46200020 */ cvt.s.d $f0, $f0 -/* AD454C 802404BC E7A00010 */ swc1 $f0, 0x10($sp) -/* AD4550 802404C0 8E26003C */ lw $a2, 0x3c($s1) -/* AD4554 802404C4 0C0900A0 */ jal func_80240280 -/* AD4558 802404C8 02C0202D */ daddu $a0, $s6, $zero -/* AD455C 802404CC 02A0202D */ daddu $a0, $s5, $zero -/* AD4560 802404D0 4406C000 */ mfc1 $a2, $f24 -/* AD4564 802404D4 8E27000C */ lw $a3, 0xc($s1) -/* AD4568 802404D8 C6200038 */ lwc1 $f0, 0x38($s1) -/* AD456C 802404DC C6220040 */ lwc1 $f2, 0x40($s1) -/* AD4570 802404E0 0280282D */ daddu $a1, $s4, $zero -/* AD4574 802404E4 E7A00020 */ swc1 $f0, 0x20($sp) -/* AD4578 802404E8 0C00A7E7 */ jal add_vec2D_polar -/* AD457C 802404EC E7A20024 */ swc1 $f2, 0x24($sp) -/* AD4580 802404F0 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* AD4584 802404F4 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* AD4588 802404F8 8E460028 */ lw $a2, 0x28($s2) -/* AD458C 802404FC 0C00A7B5 */ jal dist2D -/* AD4590 80240500 8E470030 */ lw $a3, 0x30($s2) -/* AD4594 80240504 461A003E */ c.le.s $f0, $f26 -/* AD4598 80240508 00000000 */ nop -/* AD459C 8024050C 45030001 */ bc1tl .L80240514 -/* AD45A0 80240510 36100010 */ ori $s0, $s0, 0x10 -.L80240514: -/* AD45A4 80240514 32020001 */ andi $v0, $s0, 1 -/* AD45A8 80240518 10400026 */ beqz $v0, .L802405B4 -/* AD45AC 8024051C 02E0202D */ daddu $a0, $s7, $zero -/* AD45B0 80240520 C62C0038 */ lwc1 $f12, 0x38($s1) -/* AD45B4 80240524 C62E0040 */ lwc1 $f14, 0x40($s1) -/* AD45B8 80240528 8E660028 */ lw $a2, 0x28($s3) -/* AD45BC 8024052C 8E670030 */ lw $a3, 0x30($s3) -/* AD45C0 80240530 C622003C */ lwc1 $f2, 0x3c($s1) -/* AD45C4 80240534 46006006 */ mov.s $f0, $f12 -/* AD45C8 80240538 46007106 */ mov.s $f4, $f14 -/* AD45CC 8024053C E7A00020 */ swc1 $f0, 0x20($sp) -/* AD45D0 80240540 E7A20028 */ swc1 $f2, 0x28($sp) -/* AD45D4 80240544 0C00A7B5 */ jal dist2D -/* AD45D8 80240548 E7A40024 */ swc1 $f4, 0x24($sp) -/* AD45DC 8024054C C62C0038 */ lwc1 $f12, 0x38($s1) -/* AD45E0 80240550 C62E0040 */ lwc1 $f14, 0x40($s1) -/* AD45E4 80240554 8E660028 */ lw $a2, 0x28($s3) -/* AD45E8 80240558 8E670030 */ lw $a3, 0x30($s3) -/* AD45EC 8024055C 0C00A720 */ jal atan2 -/* AD45F0 80240560 46000506 */ mov.s $f20, $f0 -/* AD45F4 80240564 0000202D */ daddu $a0, $zero, $zero -/* AD45F8 80240568 02A0282D */ daddu $a1, $s5, $zero -/* AD45FC 8024056C E7B40010 */ swc1 $f20, 0x10($sp) -/* AD4600 80240570 E7A00014 */ swc1 $f0, 0x14($sp) -/* AD4604 80240574 862200A6 */ lh $v0, 0xa6($s1) -/* AD4608 80240578 27A60028 */ addiu $a2, $sp, 0x28 -/* AD460C 8024057C 44820000 */ mtc1 $v0, $f0 -/* AD4610 80240580 00000000 */ nop -/* AD4614 80240584 46800020 */ cvt.s.w $f0, $f0 -/* AD4618 80240588 E7A00018 */ swc1 $f0, 0x18($sp) -/* AD461C 8024058C 862200A8 */ lh $v0, 0xa8($s1) -/* AD4620 80240590 0280382D */ daddu $a3, $s4, $zero -/* AD4624 80240594 44820000 */ mtc1 $v0, $f0 -/* AD4628 80240598 00000000 */ nop -/* AD462C 8024059C 46800020 */ cvt.s.w $f0, $f0 -/* AD4630 802405A0 0C0376B9 */ jal func_800DDAE4 -/* AD4634 802405A4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* AD4638 802405A8 54400001 */ bnel $v0, $zero, .L802405B0 -/* AD463C 802405AC 0000802D */ daddu $s0, $zero, $zero -.L802405B0: -/* AD4640 802405B0 02E0202D */ daddu $a0, $s7, $zero -.L802405B4: -/* AD4644 802405B4 03C0282D */ daddu $a1, $fp, $zero -/* AD4648 802405B8 0C0B2026 */ jal set_variable -/* AD464C 802405BC 0200302D */ daddu $a2, $s0, $zero -/* AD4650 802405C0 8FBF0054 */ lw $ra, 0x54($sp) -/* AD4654 802405C4 8FBE0050 */ lw $fp, 0x50($sp) -/* AD4658 802405C8 8FB7004C */ lw $s7, 0x4c($sp) -/* AD465C 802405CC 8FB60048 */ lw $s6, 0x48($sp) -/* AD4660 802405D0 8FB50044 */ lw $s5, 0x44($sp) -/* AD4664 802405D4 8FB40040 */ lw $s4, 0x40($sp) -/* AD4668 802405D8 8FB3003C */ lw $s3, 0x3c($sp) -/* AD466C 802405DC 8FB20038 */ lw $s2, 0x38($sp) -/* AD4670 802405E0 8FB10034 */ lw $s1, 0x34($sp) -/* AD4674 802405E4 8FB00030 */ lw $s0, 0x30($sp) -/* AD4678 802405E8 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* AD467C 802405EC D7B80068 */ ldc1 $f24, 0x68($sp) -/* AD4680 802405F0 D7B60060 */ ldc1 $f22, 0x60($sp) -/* AD4684 802405F4 D7B40058 */ ldc1 $f20, 0x58($sp) -/* AD4688 802405F8 24020002 */ addiu $v0, $zero, 2 -/* AD468C 802405FC 03E00008 */ jr $ra -/* AD4690 80240600 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/func_80240604_AD4090.s b/asm/nonmatchings/world/area_kkj/kkj_12/func_80240604_AD4090.s deleted file mode 100644 index a08b1e3a71..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_12/func_80240604_AD4090.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240604_AD4694 -/* AD4694 80240604 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD4698 80240608 AFB10014 */ sw $s1, 0x14($sp) -/* AD469C 8024060C 0080882D */ daddu $s1, $a0, $zero -/* AD46A0 80240610 AFBF0024 */ sw $ra, 0x24($sp) -/* AD46A4 80240614 AFB40020 */ sw $s4, 0x20($sp) -/* AD46A8 80240618 AFB3001C */ sw $s3, 0x1c($sp) -/* AD46AC 8024061C AFB20018 */ sw $s2, 0x18($sp) -/* AD46B0 80240620 AFB00010 */ sw $s0, 0x10($sp) -/* AD46B4 80240624 8E30000C */ lw $s0, 0xc($s1) -/* AD46B8 80240628 8E140000 */ lw $s4, ($s0) -/* AD46BC 8024062C 26100004 */ addiu $s0, $s0, 4 -/* AD46C0 80240630 8E050000 */ lw $a1, ($s0) -/* AD46C4 80240634 0C0B1EAF */ jal get_variable -/* AD46C8 80240638 26100004 */ addiu $s0, $s0, 4 -/* AD46CC 8024063C 8E050000 */ lw $a1, ($s0) -/* AD46D0 80240640 26100004 */ addiu $s0, $s0, 4 -/* AD46D4 80240644 0220202D */ daddu $a0, $s1, $zero -/* AD46D8 80240648 0C0B1EAF */ jal get_variable -/* AD46DC 8024064C 0040982D */ daddu $s3, $v0, $zero -/* AD46E0 80240650 8E050000 */ lw $a1, ($s0) -/* AD46E4 80240654 26100004 */ addiu $s0, $s0, 4 -/* AD46E8 80240658 0220202D */ daddu $a0, $s1, $zero -/* AD46EC 8024065C 0C0B1EAF */ jal get_variable -/* AD46F0 80240660 0040902D */ daddu $s2, $v0, $zero -/* AD46F4 80240664 0220202D */ daddu $a0, $s1, $zero -/* AD46F8 80240668 8E050000 */ lw $a1, ($s0) -/* AD46FC 8024066C 0C0B1EAF */ jal get_variable -/* AD4700 80240670 0040802D */ daddu $s0, $v0, $zero -/* AD4704 80240674 44901000 */ mtc1 $s0, $f2 -/* AD4708 80240678 00000000 */ nop -/* AD470C 8024067C 468010A0 */ cvt.s.w $f2, $f2 -/* AD4710 80240680 44936000 */ mtc1 $s3, $f12 -/* AD4714 80240684 00000000 */ nop -/* AD4718 80240688 46806320 */ cvt.s.w $f12, $f12 -/* AD471C 8024068C 44061000 */ mfc1 $a2, $f2 -/* AD4720 80240690 44821000 */ mtc1 $v0, $f2 -/* AD4724 80240694 00000000 */ nop -/* AD4728 80240698 468010A0 */ cvt.s.w $f2, $f2 -/* AD472C 8024069C 44071000 */ mfc1 $a3, $f2 -/* AD4730 802406A0 44927000 */ mtc1 $s2, $f14 -/* AD4734 802406A4 00000000 */ nop -/* AD4738 802406A8 0C00A720 */ jal atan2 -/* AD473C 802406AC 468073A0 */ cvt.s.w $f14, $f14 -/* AD4740 802406B0 0220202D */ daddu $a0, $s1, $zero -/* AD4744 802406B4 4600008D */ trunc.w.s $f2, $f0 -/* AD4748 802406B8 44061000 */ mfc1 $a2, $f2 -/* AD474C 802406BC 0C0B2026 */ jal set_variable -/* AD4750 802406C0 0280282D */ daddu $a1, $s4, $zero -/* AD4754 802406C4 8FBF0024 */ lw $ra, 0x24($sp) -/* AD4758 802406C8 8FB40020 */ lw $s4, 0x20($sp) -/* AD475C 802406CC 8FB3001C */ lw $s3, 0x1c($sp) -/* AD4760 802406D0 8FB20018 */ lw $s2, 0x18($sp) -/* AD4764 802406D4 8FB10014 */ lw $s1, 0x14($sp) -/* AD4768 802406D8 8FB00010 */ lw $s0, 0x10($sp) -/* AD476C 802406DC 24020002 */ addiu $v0, $zero, 2 -/* AD4770 802406E0 03E00008 */ jr $ra -/* AD4774 802406E4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/func_802406E8_AD4090.s b/asm/nonmatchings/world/area_kkj/kkj_12/func_802406E8_AD4090.s deleted file mode 100644 index cb509ba3dc..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_12/func_802406E8_AD4090.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406E8_AD4778 -/* AD4778 802406E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD477C 802406EC AFBF0010 */ sw $ra, 0x10($sp) -/* AD4780 802406F0 8C82000C */ lw $v0, 0xc($a0) -/* AD4784 802406F4 3C068011 */ lui $a2, 0x8011 -/* AD4788 802406F8 80C6EFD4 */ lb $a2, -0x102c($a2) -/* AD478C 802406FC 0C0B2026 */ jal set_variable -/* AD4790 80240700 8C450000 */ lw $a1, ($v0) -/* AD4794 80240704 8FBF0010 */ lw $ra, 0x10($sp) -/* AD4798 80240708 24020002 */ addiu $v0, $zero, 2 -/* AD479C 8024070C 03E00008 */ jr $ra -/* AD47A0 80240710 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/func_80240714_AD4090.s b/asm/nonmatchings/world/area_kkj/kkj_12/func_80240714_AD4090.s deleted file mode 100644 index 85e330ad04..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_12/func_80240714_AD4090.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240714_AD47A4 -/* AD47A4 80240714 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* AD47A8 80240718 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* AD47AC 8024071C 9062007E */ lbu $v0, 0x7e($v1) -/* AD47B0 80240720 34420008 */ ori $v0, $v0, 8 -/* AD47B4 80240724 A062007E */ sb $v0, 0x7e($v1) -/* AD47B8 80240728 03E00008 */ jr $ra -/* AD47BC 8024072C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/func_80240730_AD4090.s b/asm/nonmatchings/world/area_kkj/kkj_12/func_80240730_AD4090.s deleted file mode 100644 index 7d7e177f84..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_12/func_80240730_AD4090.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_AD47C0 -/* AD47C0 80240730 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* AD47C4 80240734 AFB3001C */ sw $s3, 0x1c($sp) -/* AD47C8 80240738 0080982D */ daddu $s3, $a0, $zero -/* AD47CC 8024073C AFBF0030 */ sw $ra, 0x30($sp) -/* AD47D0 80240740 AFB7002C */ sw $s7, 0x2c($sp) -/* AD47D4 80240744 AFB60028 */ sw $s6, 0x28($sp) -/* AD47D8 80240748 AFB50024 */ sw $s5, 0x24($sp) -/* AD47DC 8024074C AFB40020 */ sw $s4, 0x20($sp) -/* AD47E0 80240750 AFB20018 */ sw $s2, 0x18($sp) -/* AD47E4 80240754 AFB10014 */ sw $s1, 0x14($sp) -/* AD47E8 80240758 AFB00010 */ sw $s0, 0x10($sp) -/* AD47EC 8024075C F7B80048 */ sdc1 $f24, 0x48($sp) -/* AD47F0 80240760 F7B60040 */ sdc1 $f22, 0x40($sp) -/* AD47F4 80240764 F7B40038 */ sdc1 $f20, 0x38($sp) -/* AD47F8 80240768 8E70000C */ lw $s0, 0xc($s3) -/* AD47FC 8024076C 8E050000 */ lw $a1, ($s0) -/* AD4800 80240770 0C0B1EAF */ jal get_variable -/* AD4804 80240774 26100004 */ addiu $s0, $s0, 4 -/* AD4808 80240778 8E150000 */ lw $s5, ($s0) -/* AD480C 8024077C 26100004 */ addiu $s0, $s0, 4 -/* AD4810 80240780 0260202D */ daddu $a0, $s3, $zero -/* AD4814 80240784 8E160000 */ lw $s6, ($s0) -/* AD4818 80240788 8E170004 */ lw $s7, 4($s0) -/* AD481C 8024078C 0C0B36B0 */ jal resolve_npc -/* AD4820 80240790 0040282D */ daddu $a1, $v0, $zero -/* AD4824 80240794 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* AD4828 80240798 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* AD482C 8024079C 0040802D */ daddu $s0, $v0, $zero -/* AD4830 802407A0 1200002F */ beqz $s0, .L80240860 -/* AD4834 802407A4 0220902D */ daddu $s2, $s1, $zero -/* AD4838 802407A8 C62C0028 */ lwc1 $f12, 0x28($s1) -/* AD483C 802407AC C62E0030 */ lwc1 $f14, 0x30($s1) -/* AD4840 802407B0 8E060038 */ lw $a2, 0x38($s0) -/* AD4844 802407B4 8E070040 */ lw $a3, 0x40($s0) -/* AD4848 802407B8 3C0142C8 */ lui $at, 0x42c8 -/* AD484C 802407BC 4481C000 */ mtc1 $at, $f24 -/* AD4850 802407C0 0C00A7B5 */ jal dist2D -/* AD4854 802407C4 24140001 */ addiu $s4, $zero, 1 -/* AD4858 802407C8 4618003C */ c.lt.s $f0, $f24 -/* AD485C 802407CC 00000000 */ nop -/* AD4860 802407D0 45030001 */ bc1tl .L802407D8 -/* AD4864 802407D4 0000A02D */ daddu $s4, $zero, $zero -.L802407D8: -/* AD4868 802407D8 C64C0028 */ lwc1 $f12, 0x28($s2) -/* AD486C 802407DC C64E0030 */ lwc1 $f14, 0x30($s2) -/* AD4870 802407E0 8E060038 */ lw $a2, 0x38($s0) -/* AD4874 802407E4 0C00A720 */ jal atan2 -/* AD4878 802407E8 8E070040 */ lw $a3, 0x40($s0) -/* AD487C 802407EC 0C00A6C9 */ jal clamp_angle -/* AD4880 802407F0 46000306 */ mov.s $f12, $f0 -/* AD4884 802407F4 46000506 */ mov.s $f20, $f0 -/* AD4888 802407F8 0C00A8BB */ jal sin_deg -/* AD488C 802407FC 4600A306 */ mov.s $f12, $f20 -/* AD4890 80240800 46180002 */ mul.s $f0, $f0, $f24 -/* AD4894 80240804 00000000 */ nop -/* AD4898 80240808 C6560028 */ lwc1 $f22, 0x28($s2) -/* AD489C 8024080C 4600B580 */ add.s $f22, $f22, $f0 -/* AD48A0 80240810 0C00A8D4 */ jal cos_deg -/* AD48A4 80240814 4600A306 */ mov.s $f12, $f20 -/* AD48A8 80240818 46180002 */ mul.s $f0, $f0, $f24 -/* AD48AC 8024081C 00000000 */ nop -/* AD48B0 80240820 0260202D */ daddu $a0, $s3, $zero -/* AD48B4 80240824 02A0282D */ daddu $a1, $s5, $zero -/* AD48B8 80240828 C6540030 */ lwc1 $f20, 0x30($s2) -/* AD48BC 8024082C 0280302D */ daddu $a2, $s4, $zero -/* AD48C0 80240830 0C0B2026 */ jal set_variable -/* AD48C4 80240834 4600A501 */ sub.s $f20, $f20, $f0 -/* AD48C8 80240838 0260202D */ daddu $a0, $s3, $zero -/* AD48CC 8024083C 4600B08D */ trunc.w.s $f2, $f22 -/* AD48D0 80240840 44061000 */ mfc1 $a2, $f2 -/* AD48D4 80240844 0C0B2026 */ jal set_variable -/* AD48D8 80240848 02C0282D */ daddu $a1, $s6, $zero -/* AD48DC 8024084C 0260202D */ daddu $a0, $s3, $zero -/* AD48E0 80240850 4600A08D */ trunc.w.s $f2, $f20 -/* AD48E4 80240854 44061000 */ mfc1 $a2, $f2 -/* AD48E8 80240858 0C0B2026 */ jal set_variable -/* AD48EC 8024085C 02E0282D */ daddu $a1, $s7, $zero -.L80240860: -/* AD48F0 80240860 24020002 */ addiu $v0, $zero, 2 -/* AD48F4 80240864 8FBF0030 */ lw $ra, 0x30($sp) -/* AD48F8 80240868 8FB7002C */ lw $s7, 0x2c($sp) -/* AD48FC 8024086C 8FB60028 */ lw $s6, 0x28($sp) -/* AD4900 80240870 8FB50024 */ lw $s5, 0x24($sp) -/* AD4904 80240874 8FB40020 */ lw $s4, 0x20($sp) -/* AD4908 80240878 8FB3001C */ lw $s3, 0x1c($sp) -/* AD490C 8024087C 8FB20018 */ lw $s2, 0x18($sp) -/* AD4910 80240880 8FB10014 */ lw $s1, 0x14($sp) -/* AD4914 80240884 8FB00010 */ lw $s0, 0x10($sp) -/* AD4918 80240888 D7B80048 */ ldc1 $f24, 0x48($sp) -/* AD491C 8024088C D7B60040 */ ldc1 $f22, 0x40($sp) -/* AD4920 80240890 D7B40038 */ ldc1 $f20, 0x38($sp) -/* AD4924 80240894 03E00008 */ jr $ra -/* AD4928 80240898 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kkj/kkj_13/func_80240020_AD5ED0.s b/asm/nonmatchings/world/area_kkj/kkj_13/func_80240020_AD5ED0.s deleted file mode 100644 index f65a8a225b..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_13/func_80240020_AD5ED0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_AD5EF0 -/* AD5EF0 80240020 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD5EF4 80240024 AFB00010 */ sw $s0, 0x10($sp) -/* AD5EF8 80240028 0080802D */ daddu $s0, $a0, $zero -/* AD5EFC 8024002C AFBF0014 */ sw $ra, 0x14($sp) -/* AD5F00 80240030 8E0300A8 */ lw $v1, 0xa8($s0) -/* AD5F04 80240034 8E020088 */ lw $v0, 0x88($s0) -/* AD5F08 80240038 00621821 */ addu $v1, $v1, $v0 -/* AD5F0C 8024003C 04610004 */ bgez $v1, .L80240050 -/* AD5F10 80240040 AE0300A8 */ sw $v1, 0xa8($s0) -/* AD5F14 80240044 3C020002 */ lui $v0, 2 -/* AD5F18 80240048 08090018 */ j .L80240060 -/* AD5F1C 8024004C 00621021 */ addu $v0, $v1, $v0 -.L80240050: -/* AD5F20 80240050 3C040002 */ lui $a0, 2 -/* AD5F24 80240054 0083102A */ slt $v0, $a0, $v1 -/* AD5F28 80240058 10400002 */ beqz $v0, .L80240064 -/* AD5F2C 8024005C 00641023 */ subu $v0, $v1, $a0 -.L80240060: -/* AD5F30 80240060 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240064: -/* AD5F34 80240064 8E0300AC */ lw $v1, 0xac($s0) -/* AD5F38 80240068 8E02008C */ lw $v0, 0x8c($s0) -/* AD5F3C 8024006C 00621821 */ addu $v1, $v1, $v0 -/* AD5F40 80240070 04610004 */ bgez $v1, .L80240084 -/* AD5F44 80240074 AE0300AC */ sw $v1, 0xac($s0) -/* AD5F48 80240078 3C020002 */ lui $v0, 2 -/* AD5F4C 8024007C 08090025 */ j .L80240094 -/* AD5F50 80240080 00621021 */ addu $v0, $v1, $v0 -.L80240084: -/* AD5F54 80240084 3C040002 */ lui $a0, 2 -/* AD5F58 80240088 0083102A */ slt $v0, $a0, $v1 -/* AD5F5C 8024008C 10400002 */ beqz $v0, .L80240098 -/* AD5F60 80240090 00641023 */ subu $v0, $v1, $a0 -.L80240094: -/* AD5F64 80240094 AE0200AC */ sw $v0, 0xac($s0) -.L80240098: -/* AD5F68 80240098 8E0300B0 */ lw $v1, 0xb0($s0) -/* AD5F6C 8024009C 8E020090 */ lw $v0, 0x90($s0) -/* AD5F70 802400A0 00621821 */ addu $v1, $v1, $v0 -/* AD5F74 802400A4 04610004 */ bgez $v1, .L802400B8 -/* AD5F78 802400A8 AE0300B0 */ sw $v1, 0xb0($s0) -/* AD5F7C 802400AC 3C020002 */ lui $v0, 2 -/* AD5F80 802400B0 08090032 */ j .L802400C8 -/* AD5F84 802400B4 00621021 */ addu $v0, $v1, $v0 -.L802400B8: -/* AD5F88 802400B8 3C040002 */ lui $a0, 2 -/* AD5F8C 802400BC 0083102A */ slt $v0, $a0, $v1 -/* AD5F90 802400C0 10400002 */ beqz $v0, .L802400CC -/* AD5F94 802400C4 00641023 */ subu $v0, $v1, $a0 -.L802400C8: -/* AD5F98 802400C8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400CC: -/* AD5F9C 802400CC 8E0300B4 */ lw $v1, 0xb4($s0) -/* AD5FA0 802400D0 8E020094 */ lw $v0, 0x94($s0) -/* AD5FA4 802400D4 00621821 */ addu $v1, $v1, $v0 -/* AD5FA8 802400D8 04610004 */ bgez $v1, .L802400EC -/* AD5FAC 802400DC AE0300B4 */ sw $v1, 0xb4($s0) -/* AD5FB0 802400E0 3C020002 */ lui $v0, 2 -/* AD5FB4 802400E4 0809003F */ j .L802400FC -/* AD5FB8 802400E8 00621021 */ addu $v0, $v1, $v0 -.L802400EC: -/* AD5FBC 802400EC 3C040002 */ lui $a0, 2 -/* AD5FC0 802400F0 0083102A */ slt $v0, $a0, $v1 -/* AD5FC4 802400F4 10400002 */ beqz $v0, .L80240100 -/* AD5FC8 802400F8 00641023 */ subu $v0, $v1, $a0 -.L802400FC: -/* AD5FCC 802400FC AE0200B4 */ sw $v0, 0xb4($s0) -.L80240100: -/* AD5FD0 80240100 8E040084 */ lw $a0, 0x84($s0) -/* AD5FD4 80240104 0C046F07 */ jal set_main_pan_u -/* AD5FD8 80240108 8E0500A8 */ lw $a1, 0xa8($s0) -/* AD5FDC 8024010C 8E040084 */ lw $a0, 0x84($s0) -/* AD5FE0 80240110 0C046F0D */ jal set_main_pan_v -/* AD5FE4 80240114 8E0500AC */ lw $a1, 0xac($s0) -/* AD5FE8 80240118 8E040084 */ lw $a0, 0x84($s0) -/* AD5FEC 8024011C 0C046F13 */ jal set_aux_pan_u -/* AD5FF0 80240120 8E0500B0 */ lw $a1, 0xb0($s0) -/* AD5FF4 80240124 8E040084 */ lw $a0, 0x84($s0) -/* AD5FF8 80240128 0C046F19 */ jal set_aux_pan_v -/* AD5FFC 8024012C 8E0500B4 */ lw $a1, 0xb4($s0) -/* AD6000 80240130 8FBF0014 */ lw $ra, 0x14($sp) -/* AD6004 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* AD6008 80240138 0000102D */ daddu $v0, $zero, $zero -/* AD600C 8024013C 03E00008 */ jr $ra -/* AD6010 80240140 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_13/func_80240144_AD5ED0.s b/asm/nonmatchings/world/area_kkj/kkj_13/func_80240144_AD5ED0.s deleted file mode 100644 index 2035fbc8c7..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_13/func_80240144_AD5ED0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240144_AD6014 -/* AD6014 80240144 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD6018 80240148 AFB00010 */ sw $s0, 0x10($sp) -/* AD601C 8024014C 0080802D */ daddu $s0, $a0, $zero -/* AD6020 80240150 10A00005 */ beqz $a1, .L80240168 -/* AD6024 80240154 AFBF0014 */ sw $ra, 0x14($sp) -/* AD6028 80240158 AE000070 */ sw $zero, 0x70($s0) -/* AD602C 8024015C AE000074 */ sw $zero, 0x74($s0) -/* AD6030 80240160 AE000078 */ sw $zero, 0x78($s0) -/* AD6034 80240164 AE00007C */ sw $zero, 0x7c($s0) -.L80240168: -/* AD6038 80240168 8E020070 */ lw $v0, 0x70($s0) -/* AD603C 8024016C 1440000E */ bnez $v0, .L802401A8 -/* AD6040 80240170 00000000 */ nop -/* AD6044 80240174 8E0300A8 */ lw $v1, 0xa8($s0) -/* AD6048 80240178 8E020088 */ lw $v0, 0x88($s0) -/* AD604C 8024017C 00621821 */ addu $v1, $v1, $v0 -/* AD6050 80240180 04610004 */ bgez $v1, .L80240194 -/* AD6054 80240184 AE0300A8 */ sw $v1, 0xa8($s0) -/* AD6058 80240188 3C020002 */ lui $v0, 2 -/* AD605C 8024018C 08090069 */ j .L802401A4 -/* AD6060 80240190 00621021 */ addu $v0, $v1, $v0 -.L80240194: -/* AD6064 80240194 3C040002 */ lui $a0, 2 -/* AD6068 80240198 0083102A */ slt $v0, $a0, $v1 -/* AD606C 8024019C 10400002 */ beqz $v0, .L802401A8 -/* AD6070 802401A0 00641023 */ subu $v0, $v1, $a0 -.L802401A4: -/* AD6074 802401A4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401A8: -/* AD6078 802401A8 8E020074 */ lw $v0, 0x74($s0) -/* AD607C 802401AC 1440000E */ bnez $v0, .L802401E8 -/* AD6080 802401B0 00000000 */ nop -/* AD6084 802401B4 8E0300AC */ lw $v1, 0xac($s0) -/* AD6088 802401B8 8E02008C */ lw $v0, 0x8c($s0) -/* AD608C 802401BC 00621821 */ addu $v1, $v1, $v0 -/* AD6090 802401C0 04610004 */ bgez $v1, .L802401D4 -/* AD6094 802401C4 AE0300AC */ sw $v1, 0xac($s0) -/* AD6098 802401C8 3C020002 */ lui $v0, 2 -/* AD609C 802401CC 08090079 */ j .L802401E4 -/* AD60A0 802401D0 00621021 */ addu $v0, $v1, $v0 -.L802401D4: -/* AD60A4 802401D4 3C040002 */ lui $a0, 2 -/* AD60A8 802401D8 0083102A */ slt $v0, $a0, $v1 -/* AD60AC 802401DC 10400002 */ beqz $v0, .L802401E8 -/* AD60B0 802401E0 00641023 */ subu $v0, $v1, $a0 -.L802401E4: -/* AD60B4 802401E4 AE0200AC */ sw $v0, 0xac($s0) -.L802401E8: -/* AD60B8 802401E8 8E020078 */ lw $v0, 0x78($s0) -/* AD60BC 802401EC 1440000E */ bnez $v0, .L80240228 -/* AD60C0 802401F0 00000000 */ nop -/* AD60C4 802401F4 8E0300B0 */ lw $v1, 0xb0($s0) -/* AD60C8 802401F8 8E020090 */ lw $v0, 0x90($s0) -/* AD60CC 802401FC 00621821 */ addu $v1, $v1, $v0 -/* AD60D0 80240200 04610004 */ bgez $v1, .L80240214 -/* AD60D4 80240204 AE0300B0 */ sw $v1, 0xb0($s0) -/* AD60D8 80240208 3C020002 */ lui $v0, 2 -/* AD60DC 8024020C 08090089 */ j .L80240224 -/* AD60E0 80240210 00621021 */ addu $v0, $v1, $v0 -.L80240214: -/* AD60E4 80240214 3C040002 */ lui $a0, 2 -/* AD60E8 80240218 0083102A */ slt $v0, $a0, $v1 -/* AD60EC 8024021C 10400002 */ beqz $v0, .L80240228 -/* AD60F0 80240220 00641023 */ subu $v0, $v1, $a0 -.L80240224: -/* AD60F4 80240224 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240228: -/* AD60F8 80240228 8E02007C */ lw $v0, 0x7c($s0) -/* AD60FC 8024022C 1440000E */ bnez $v0, .L80240268 -/* AD6100 80240230 00000000 */ nop -/* AD6104 80240234 8E0300B4 */ lw $v1, 0xb4($s0) -/* AD6108 80240238 8E020094 */ lw $v0, 0x94($s0) -/* AD610C 8024023C 00621821 */ addu $v1, $v1, $v0 -/* AD6110 80240240 04610004 */ bgez $v1, .L80240254 -/* AD6114 80240244 AE0300B4 */ sw $v1, 0xb4($s0) -/* AD6118 80240248 3C020002 */ lui $v0, 2 -/* AD611C 8024024C 08090099 */ j .L80240264 -/* AD6120 80240250 00621021 */ addu $v0, $v1, $v0 -.L80240254: -/* AD6124 80240254 3C040002 */ lui $a0, 2 -/* AD6128 80240258 0083102A */ slt $v0, $a0, $v1 -/* AD612C 8024025C 10400002 */ beqz $v0, .L80240268 -/* AD6130 80240260 00641023 */ subu $v0, $v1, $a0 -.L80240264: -/* AD6134 80240264 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240268: -/* AD6138 80240268 8E040084 */ lw $a0, 0x84($s0) -/* AD613C 8024026C 0C046F07 */ jal set_main_pan_u -/* AD6140 80240270 8E0500A8 */ lw $a1, 0xa8($s0) -/* AD6144 80240274 8E040084 */ lw $a0, 0x84($s0) -/* AD6148 80240278 0C046F0D */ jal set_main_pan_v -/* AD614C 8024027C 8E0500AC */ lw $a1, 0xac($s0) -/* AD6150 80240280 8E040084 */ lw $a0, 0x84($s0) -/* AD6154 80240284 0C046F13 */ jal set_aux_pan_u -/* AD6158 80240288 8E0500B0 */ lw $a1, 0xb0($s0) -/* AD615C 8024028C 8E040084 */ lw $a0, 0x84($s0) -/* AD6160 80240290 0C046F19 */ jal set_aux_pan_v -/* AD6164 80240294 8E0500B4 */ lw $a1, 0xb4($s0) -/* AD6168 80240298 8E020070 */ lw $v0, 0x70($s0) -/* AD616C 8024029C 8E030078 */ lw $v1, 0x78($s0) -/* AD6170 802402A0 8E040098 */ lw $a0, 0x98($s0) -/* AD6174 802402A4 24420001 */ addiu $v0, $v0, 1 -/* AD6178 802402A8 AE020070 */ sw $v0, 0x70($s0) -/* AD617C 802402AC 8E020074 */ lw $v0, 0x74($s0) -/* AD6180 802402B0 24630001 */ addiu $v1, $v1, 1 -/* AD6184 802402B4 AE030078 */ sw $v1, 0x78($s0) -/* AD6188 802402B8 8E030070 */ lw $v1, 0x70($s0) -/* AD618C 802402BC 24420001 */ addiu $v0, $v0, 1 -/* AD6190 802402C0 AE020074 */ sw $v0, 0x74($s0) -/* AD6194 802402C4 8E02007C */ lw $v0, 0x7c($s0) -/* AD6198 802402C8 0064182A */ slt $v1, $v1, $a0 -/* AD619C 802402CC 24420001 */ addiu $v0, $v0, 1 -/* AD61A0 802402D0 14600002 */ bnez $v1, .L802402DC -/* AD61A4 802402D4 AE02007C */ sw $v0, 0x7c($s0) -/* AD61A8 802402D8 AE000070 */ sw $zero, 0x70($s0) -.L802402DC: -/* AD61AC 802402DC 8E020074 */ lw $v0, 0x74($s0) -/* AD61B0 802402E0 8E03009C */ lw $v1, 0x9c($s0) -/* AD61B4 802402E4 0043102A */ slt $v0, $v0, $v1 -/* AD61B8 802402E8 50400001 */ beql $v0, $zero, .L802402F0 -/* AD61BC 802402EC AE000074 */ sw $zero, 0x74($s0) -.L802402F0: -/* AD61C0 802402F0 8E020078 */ lw $v0, 0x78($s0) -/* AD61C4 802402F4 8E0300A0 */ lw $v1, 0xa0($s0) -/* AD61C8 802402F8 0043102A */ slt $v0, $v0, $v1 -/* AD61CC 802402FC 50400001 */ beql $v0, $zero, .L80240304 -/* AD61D0 80240300 AE000078 */ sw $zero, 0x78($s0) -.L80240304: -/* AD61D4 80240304 8E02007C */ lw $v0, 0x7c($s0) -/* AD61D8 80240308 8E0300A4 */ lw $v1, 0xa4($s0) -/* AD61DC 8024030C 0043102A */ slt $v0, $v0, $v1 -/* AD61E0 80240310 50400001 */ beql $v0, $zero, .L80240318 -/* AD61E4 80240314 AE00007C */ sw $zero, 0x7c($s0) -.L80240318: -/* AD61E8 80240318 8FBF0014 */ lw $ra, 0x14($sp) -/* AD61EC 8024031C 8FB00010 */ lw $s0, 0x10($sp) -/* AD61F0 80240320 0000102D */ daddu $v0, $zero, $zero -/* AD61F4 80240324 03E00008 */ jr $ra -/* AD61F8 80240328 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD61FC 8024032C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_13/func_80240330_AD5ED0.s b/asm/nonmatchings/world/area_kkj/kkj_13/func_80240330_AD5ED0.s deleted file mode 100644 index 9a7d7c18de..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_13/func_80240330_AD5ED0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240330_AD6200 -/* AD6200 80240330 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD6204 80240334 AFB00018 */ sw $s0, 0x18($sp) -/* AD6208 80240338 0080802D */ daddu $s0, $a0, $zero -/* AD620C 8024033C AFBF001C */ sw $ra, 0x1c($sp) -/* AD6210 80240340 F7B40020 */ sdc1 $f20, 0x20($sp) -/* AD6214 80240344 0C00EAD2 */ jal get_npc_safe -/* AD6218 80240348 24040001 */ addiu $a0, $zero, 1 -/* AD621C 8024034C 2404023D */ addiu $a0, $zero, 0x23d -/* AD6220 80240350 C4420038 */ lwc1 $f2, 0x38($v0) -/* AD6224 80240354 C454003C */ lwc1 $f20, 0x3c($v0) -/* AD6228 80240358 C4400040 */ lwc1 $f0, 0x40($v0) -/* AD622C 8024035C 44061000 */ mfc1 $a2, $f2 -/* AD6230 80240360 4407A000 */ mfc1 $a3, $f20 -/* AD6234 80240364 0000282D */ daddu $a1, $zero, $zero -/* AD6238 80240368 0C05267B */ jal func_801499EC -/* AD623C 8024036C E7A00010 */ swc1 $f0, 0x10($sp) -/* AD6240 80240370 4600A10D */ trunc.w.s $f4, $f20 -/* AD6244 80240374 E6040084 */ swc1 $f4, 0x84($s0) -/* AD6248 80240378 8FBF001C */ lw $ra, 0x1c($sp) -/* AD624C 8024037C 8FB00018 */ lw $s0, 0x18($sp) -/* AD6250 80240380 D7B40020 */ ldc1 $f20, 0x20($sp) -/* AD6254 80240384 24020002 */ addiu $v0, $zero, 2 -/* AD6258 80240388 03E00008 */ jr $ra -/* AD625C 8024038C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_13/func_80240390_AD5ED0.s b/asm/nonmatchings/world/area_kkj/kkj_13/func_80240390_AD5ED0.s deleted file mode 100644 index 15cf75d782..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_13/func_80240390_AD5ED0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240390_AD6260 -/* AD6260 80240390 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD6264 80240394 AFB00018 */ sw $s0, 0x18($sp) -/* AD6268 80240398 0080802D */ daddu $s0, $a0, $zero -/* AD626C 8024039C AFBF001C */ sw $ra, 0x1c($sp) -/* AD6270 802403A0 F7B40020 */ sdc1 $f20, 0x20($sp) -/* AD6274 802403A4 0C00EAD2 */ jal get_npc_safe -/* AD6278 802403A8 24040001 */ addiu $a0, $zero, 1 -/* AD627C 802403AC 2404023D */ addiu $a0, $zero, 0x23d -/* AD6280 802403B0 C4420038 */ lwc1 $f2, 0x38($v0) -/* AD6284 802403B4 C454003C */ lwc1 $f20, 0x3c($v0) -/* AD6288 802403B8 C4400040 */ lwc1 $f0, 0x40($v0) -/* AD628C 802403BC 44061000 */ mfc1 $a2, $f2 -/* AD6290 802403C0 4407A000 */ mfc1 $a3, $f20 -/* AD6294 802403C4 0000282D */ daddu $a1, $zero, $zero -/* AD6298 802403C8 0C05267B */ jal func_801499EC -/* AD629C 802403CC E7A00010 */ swc1 $f0, 0x10($sp) -/* AD62A0 802403D0 4600A10D */ trunc.w.s $f4, $f20 -/* AD62A4 802403D4 E6040084 */ swc1 $f4, 0x84($s0) -/* AD62A8 802403D8 8FBF001C */ lw $ra, 0x1c($sp) -/* AD62AC 802403DC 8FB00018 */ lw $s0, 0x18($sp) -/* AD62B0 802403E0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* AD62B4 802403E4 24020002 */ addiu $v0, $zero, 2 -/* AD62B8 802403E8 03E00008 */ jr $ra -/* AD62BC 802403EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_13/func_802403F0_AD5ED0.s b/asm/nonmatchings/world/area_kkj/kkj_13/func_802403F0_AD5ED0.s deleted file mode 100644 index 9902add225..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_13/func_802403F0_AD5ED0.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F0_AD62C0 -/* AD62C0 802403F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD62C4 802403F4 AFB00010 */ sw $s0, 0x10($sp) -/* AD62C8 802403F8 0080802D */ daddu $s0, $a0, $zero -/* AD62CC 802403FC 10A00002 */ beqz $a1, .L80240408 -/* AD62D0 80240400 AFBF0014 */ sw $ra, 0x14($sp) -/* AD62D4 80240404 AE000074 */ sw $zero, 0x74($s0) -.L80240408: -/* AD62D8 80240408 8E020074 */ lw $v0, 0x74($s0) -/* AD62DC 8024040C 24420040 */ addiu $v0, $v0, 0x40 -/* AD62E0 80240410 AE020074 */ sw $v0, 0x74($s0) -/* AD62E4 80240414 28420100 */ slti $v0, $v0, 0x100 -/* AD62E8 80240418 14400003 */ bnez $v0, .L80240428 -/* AD62EC 8024041C 0000202D */ daddu $a0, $zero, $zero -/* AD62F0 80240420 240200FF */ addiu $v0, $zero, 0xff -/* AD62F4 80240424 AE020074 */ sw $v0, 0x74($s0) -.L80240428: -/* AD62F8 80240428 240500A0 */ addiu $a1, $zero, 0xa0 -/* AD62FC 8024042C 00A0302D */ daddu $a2, $a1, $zero -/* AD6300 80240430 0C04DF84 */ jal func_80137E10 -/* AD6304 80240434 00A0382D */ daddu $a3, $a1, $zero -/* AD6308 80240438 C6000074 */ lwc1 $f0, 0x74($s0) -/* AD630C 8024043C 46800020 */ cvt.s.w $f0, $f0 -/* AD6310 80240440 44050000 */ mfc1 $a1, $f0 -/* AD6314 80240444 0C04DF62 */ jal func_80137D88 -/* AD6318 80240448 24040001 */ addiu $a0, $zero, 1 -/* AD631C 8024044C 8E020074 */ lw $v0, 0x74($s0) -/* AD6320 80240450 8FBF0014 */ lw $ra, 0x14($sp) -/* AD6324 80240454 8FB00010 */ lw $s0, 0x10($sp) -/* AD6328 80240458 384200FF */ xori $v0, $v0, 0xff -/* AD632C 8024045C 2C420001 */ sltiu $v0, $v0, 1 -/* AD6330 80240460 00021040 */ sll $v0, $v0, 1 -/* AD6334 80240464 03E00008 */ jr $ra -/* AD6338 80240468 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_13/func_8024046C_AD5ED0.s b/asm/nonmatchings/world/area_kkj/kkj_13/func_8024046C_AD5ED0.s deleted file mode 100644 index 8de0fd50e4..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_13/func_8024046C_AD5ED0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024046C_AD633C -/* AD633C 8024046C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD6340 80240470 AFB00010 */ sw $s0, 0x10($sp) -/* AD6344 80240474 0080802D */ daddu $s0, $a0, $zero -/* AD6348 80240478 10A00003 */ beqz $a1, .L80240488 -/* AD634C 8024047C AFBF0014 */ sw $ra, 0x14($sp) -/* AD6350 80240480 240200FF */ addiu $v0, $zero, 0xff -/* AD6354 80240484 AE020074 */ sw $v0, 0x74($s0) -.L80240488: -/* AD6358 80240488 8E020074 */ lw $v0, 0x74($s0) -/* AD635C 8024048C 2442FFC0 */ addiu $v0, $v0, -0x40 -/* AD6360 80240490 1C400002 */ bgtz $v0, .L8024049C -/* AD6364 80240494 AE020074 */ sw $v0, 0x74($s0) -/* AD6368 80240498 AE000074 */ sw $zero, 0x74($s0) -.L8024049C: -/* AD636C 8024049C 0000202D */ daddu $a0, $zero, $zero -/* AD6370 802404A0 240500A0 */ addiu $a1, $zero, 0xa0 -/* AD6374 802404A4 00A0302D */ daddu $a2, $a1, $zero -/* AD6378 802404A8 0C04DF84 */ jal func_80137E10 -/* AD637C 802404AC 00A0382D */ daddu $a3, $a1, $zero -/* AD6380 802404B0 C6000074 */ lwc1 $f0, 0x74($s0) -/* AD6384 802404B4 46800020 */ cvt.s.w $f0, $f0 -/* AD6388 802404B8 44050000 */ mfc1 $a1, $f0 -/* AD638C 802404BC 0C04DF62 */ jal func_80137D88 -/* AD6390 802404C0 24040001 */ addiu $a0, $zero, 1 -/* AD6394 802404C4 8E020074 */ lw $v0, 0x74($s0) -/* AD6398 802404C8 8FBF0014 */ lw $ra, 0x14($sp) -/* AD639C 802404CC 8FB00010 */ lw $s0, 0x10($sp) -/* AD63A0 802404D0 2C420001 */ sltiu $v0, $v0, 1 -/* AD63A4 802404D4 00021040 */ sll $v0, $v0, 1 -/* AD63A8 802404D8 03E00008 */ jr $ra -/* AD63AC 802404DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_13/func_802404E0_AD5ED0.s b/asm/nonmatchings/world/area_kkj/kkj_13/func_802404E0_AD5ED0.s deleted file mode 100644 index 3d6783fe83..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_13/func_802404E0_AD5ED0.s +++ /dev/null @@ -1,165 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404E0_AD63B0 -/* AD63B0 802404E0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* AD63B4 802404E4 F7BC0050 */ sdc1 $f28, 0x50($sp) -/* AD63B8 802404E8 3C018024 */ lui $at, 0x8024 -/* AD63BC 802404EC D43C4FA0 */ ldc1 $f28, 0x4fa0($at) -/* AD63C0 802404F0 AFB20020 */ sw $s2, 0x20($sp) -/* AD63C4 802404F4 0000902D */ daddu $s2, $zero, $zero -/* AD63C8 802404F8 AFB30024 */ sw $s3, 0x24($sp) -/* AD63CC 802404FC 0240982D */ daddu $s3, $s2, $zero -/* AD63D0 80240500 AFB1001C */ sw $s1, 0x1c($sp) -/* AD63D4 80240504 3C118024 */ lui $s1, 0x8024 -/* AD63D8 80240508 26313614 */ addiu $s1, $s1, 0x3614 -/* AD63DC 8024050C AFBF0028 */ sw $ra, 0x28($sp) -/* AD63E0 80240510 AFB00018 */ sw $s0, 0x18($sp) -/* AD63E4 80240514 F7BA0048 */ sdc1 $f26, 0x48($sp) -/* AD63E8 80240518 F7B80040 */ sdc1 $f24, 0x40($sp) -/* AD63EC 8024051C F7B60038 */ sdc1 $f22, 0x38($sp) -/* AD63F0 80240520 F7B40030 */ sdc1 $f20, 0x30($sp) -.L80240524: -/* AD63F4 80240524 86220002 */ lh $v0, 2($s1) -/* AD63F8 80240528 32500001 */ andi $s0, $s2, 1 -/* AD63FC 8024052C 44826000 */ mtc1 $v0, $f12 -/* AD6400 80240530 00000000 */ nop -/* AD6404 80240534 46806320 */ cvt.s.w $f12, $f12 -/* AD6408 80240538 86220000 */ lh $v0, ($s1) -/* AD640C 8024053C 4482A000 */ mtc1 $v0, $f20 -/* AD6410 80240540 00000000 */ nop -/* AD6414 80240544 4680A520 */ cvt.s.w $f20, $f20 -/* AD6418 80240548 0C00A8D4 */ jal cos_deg -/* AD641C 8024054C 26100002 */ addiu $s0, $s0, 2 -/* AD6420 80240550 4600A002 */ mul.s $f0, $f20, $f0 -/* AD6424 80240554 00000000 */ nop -/* AD6428 80240558 3C018024 */ lui $at, 0x8024 -/* AD642C 8024055C D4224FA8 */ ldc1 $f2, 0x4fa8($at) -/* AD6430 80240560 46000021 */ cvt.d.s $f0, $f0 -/* AD6434 80240564 46220002 */ mul.d $f0, $f0, $f2 -/* AD6438 80240568 00000000 */ nop -/* AD643C 8024056C 86220002 */ lh $v0, 2($s1) -/* AD6440 80240570 44826000 */ mtc1 $v0, $f12 -/* AD6444 80240574 00000000 */ nop -/* AD6448 80240578 46806320 */ cvt.s.w $f12, $f12 -/* AD644C 8024057C 0C00A8BB */ jal sin_deg -/* AD6450 80240580 46200620 */ cvt.s.d $f24, $f0 -/* AD6454 80240584 4600A002 */ mul.s $f0, $f20, $f0 -/* AD6458 80240588 00000000 */ nop -/* AD645C 8024058C 3C013FF8 */ lui $at, 0x3ff8 -/* AD6460 80240590 44811800 */ mtc1 $at, $f3 -/* AD6464 80240594 44801000 */ mtc1 $zero, $f2 -/* AD6468 80240598 46000021 */ cvt.d.s $f0, $f0 -/* AD646C 8024059C 46220002 */ mul.d $f0, $f0, $f2 -/* AD6470 802405A0 00000000 */ nop -/* AD6474 802405A4 4600C0A1 */ cvt.d.s $f2, $f24 -/* AD6478 802405A8 463C1082 */ mul.d $f2, $f2, $f28 -/* AD647C 802405AC 00000000 */ nop -/* AD6480 802405B0 462006A0 */ cvt.s.d $f26, $f0 -/* AD6484 802405B4 4600D021 */ cvt.d.s $f0, $f26 -/* AD6488 802405B8 463C0002 */ mul.d $f0, $f0, $f28 -/* AD648C 802405BC 00000000 */ nop -/* AD6490 802405C0 3C014170 */ lui $at, 0x4170 -/* AD6494 802405C4 44816000 */ mtc1 $at, $f12 -/* AD6498 802405C8 00000000 */ nop -/* AD649C 802405CC 460CA302 */ mul.s $f12, $f20, $f12 -/* AD64A0 802405D0 00000000 */ nop -/* AD64A4 802405D4 3C014416 */ lui $at, 0x4416 -/* AD64A8 802405D8 4481B000 */ mtc1 $at, $f22 -/* AD64AC 802405DC 00000000 */ nop -/* AD64B0 802405E0 4616C580 */ add.s $f22, $f24, $f22 -/* AD64B4 802405E4 3C0142C8 */ lui $at, 0x42c8 -/* AD64B8 802405E8 4481A000 */ mtc1 $at, $f20 -/* AD64BC 802405EC 46201620 */ cvt.s.d $f24, $f2 -/* AD64C0 802405F0 4614D500 */ add.s $f20, $f26, $f20 -/* AD64C4 802405F4 0C00A8D4 */ jal cos_deg -/* AD64C8 802405F8 462006A0 */ cvt.s.d $f26, $f0 -/* AD64CC 802405FC 32420003 */ andi $v0, $s2, 3 -/* AD64D0 80240600 3C018024 */ lui $at, 0x8024 -/* AD64D4 80240604 D4244FB0 */ ldc1 $f4, 0x4fb0($at) -/* AD64D8 80240608 44821000 */ mtc1 $v0, $f2 -/* AD64DC 8024060C 00000000 */ nop -/* AD64E0 80240610 468010A1 */ cvt.d.w $f2, $f2 -/* AD64E4 80240614 46241082 */ mul.d $f2, $f2, $f4 -/* AD64E8 80240618 00000000 */ nop -/* AD64EC 8024061C 3C0140A0 */ lui $at, 0x40a0 -/* AD64F0 80240620 44812000 */ mtc1 $at, $f4 -/* AD64F4 80240624 00000000 */ nop -/* AD64F8 80240628 46040002 */ mul.s $f0, $f0, $f4 -/* AD64FC 8024062C 00000000 */ nop -/* AD6500 80240630 0200202D */ daddu $a0, $s0, $zero -/* AD6504 80240634 00021080 */ sll $v0, $v0, 2 -/* AD6508 80240638 4405B000 */ mfc1 $a1, $f22 -/* AD650C 8024063C 4406A000 */ mfc1 $a2, $f20 -/* AD6510 80240640 4600C600 */ add.s $f24, $f24, $f0 -/* AD6514 80240644 3C013FF0 */ lui $at, 0x3ff0 -/* AD6518 80240648 44810800 */ mtc1 $at, $f1 -/* AD651C 8024064C 44800000 */ mtc1 $zero, $f0 -/* AD6520 80240650 3C07C316 */ lui $a3, 0xc316 -/* AD6524 80240654 46201080 */ add.d $f2, $f2, $f0 -/* AD6528 80240658 2442001E */ addiu $v0, $v0, 0x1e -/* AD652C 8024065C AFA20014 */ sw $v0, 0x14($sp) -/* AD6530 80240660 462010A0 */ cvt.s.d $f2, $f2 -/* AD6534 80240664 0C01C994 */ jal func_80072650 -/* AD6538 80240668 E7A20010 */ swc1 $f2, 0x10($sp) -/* AD653C 8024066C 0040802D */ daddu $s0, $v0, $zero -/* AD6540 80240670 8E02000C */ lw $v0, 0xc($s0) -/* AD6544 80240674 2404000A */ addiu $a0, $zero, 0xa -/* AD6548 80240678 0C00A67F */ jal rand_int -/* AD654C 8024067C AC400044 */ sw $zero, 0x44($v0) -/* AD6550 80240680 3C018024 */ lui $at, 0x8024 -/* AD6554 80240684 D4224FB8 */ ldc1 $f2, 0x4fb8($at) -/* AD6558 80240688 44820000 */ mtc1 $v0, $f0 -/* AD655C 8024068C 00000000 */ nop -/* AD6560 80240690 46800021 */ cvt.d.w $f0, $f0 -/* AD6564 80240694 46220002 */ mul.d $f0, $f0, $f2 -/* AD6568 80240698 00000000 */ nop -/* AD656C 8024069C 463C0000 */ add.d $f0, $f0, $f28 -/* AD6570 802406A0 2404000A */ addiu $a0, $zero, 0xa -/* AD6574 802406A4 8E02000C */ lw $v0, 0xc($s0) -/* AD6578 802406A8 46200020 */ cvt.s.d $f0, $f0 -/* AD657C 802406AC E4400048 */ swc1 $f0, 0x48($v0) -/* AD6580 802406B0 8E02000C */ lw $v0, 0xc($s0) -/* AD6584 802406B4 44930000 */ mtc1 $s3, $f0 -/* AD6588 802406B8 00000000 */ nop -/* AD658C 802406BC 46800020 */ cvt.s.w $f0, $f0 -/* AD6590 802406C0 0C00A67F */ jal rand_int -/* AD6594 802406C4 E440003C */ swc1 $f0, 0x3c($v0) -/* AD6598 802406C8 2442FFFB */ addiu $v0, $v0, -5 -/* AD659C 802406CC 8E03000C */ lw $v1, 0xc($s0) -/* AD65A0 802406D0 44820000 */ mtc1 $v0, $f0 -/* AD65A4 802406D4 00000000 */ nop -/* AD65A8 802406D8 46800020 */ cvt.s.w $f0, $f0 -/* AD65AC 802406DC E4600040 */ swc1 $f0, 0x40($v1) -/* AD65B0 802406E0 8E02000C */ lw $v0, 0xc($s0) -/* AD65B4 802406E4 3C014000 */ lui $at, 0x4000 -/* AD65B8 802406E8 44810000 */ mtc1 $at, $f0 -/* AD65BC 802406EC E458004C */ swc1 $f24, 0x4c($v0) -/* AD65C0 802406F0 8E02000C */ lw $v0, 0xc($s0) -/* AD65C4 802406F4 26310004 */ addiu $s1, $s1, 4 -/* AD65C8 802406F8 E45A0050 */ swc1 $f26, 0x50($v0) -/* AD65CC 802406FC 8E02000C */ lw $v0, 0xc($s0) -/* AD65D0 80240700 26520001 */ addiu $s2, $s2, 1 -/* AD65D4 80240704 E4400054 */ swc1 $f0, 0x54($v0) -/* AD65D8 80240708 8E02000C */ lw $v0, 0xc($s0) -/* AD65DC 8024070C 3C01BDCC */ lui $at, 0xbdcc -/* AD65E0 80240710 3421CCCD */ ori $at, $at, 0xcccd -/* AD65E4 80240714 44810000 */ mtc1 $at, $f0 -/* AD65E8 80240718 00000000 */ nop -/* AD65EC 8024071C E4400058 */ swc1 $f0, 0x58($v0) -/* AD65F0 80240720 2A42001C */ slti $v0, $s2, 0x1c -/* AD65F4 80240724 1440FF7F */ bnez $v0, .L80240524 -/* AD65F8 80240728 26730023 */ addiu $s3, $s3, 0x23 -/* AD65FC 8024072C 8FBF0028 */ lw $ra, 0x28($sp) -/* AD6600 80240730 8FB30024 */ lw $s3, 0x24($sp) -/* AD6604 80240734 8FB20020 */ lw $s2, 0x20($sp) -/* AD6608 80240738 8FB1001C */ lw $s1, 0x1c($sp) -/* AD660C 8024073C 8FB00018 */ lw $s0, 0x18($sp) -/* AD6610 80240740 D7BC0050 */ ldc1 $f28, 0x50($sp) -/* AD6614 80240744 D7BA0048 */ ldc1 $f26, 0x48($sp) -/* AD6618 80240748 D7B80040 */ ldc1 $f24, 0x40($sp) -/* AD661C 8024074C D7B60038 */ ldc1 $f22, 0x38($sp) -/* AD6620 80240750 D7B40030 */ ldc1 $f20, 0x30($sp) -/* AD6624 80240754 24020002 */ addiu $v0, $zero, 2 -/* AD6628 80240758 03E00008 */ jr $ra -/* AD662C 8024075C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/func_80240050_ADAEA0.s b/asm/nonmatchings/world/area_kkj/kkj_14/func_80240050_ADAEA0.s deleted file mode 100644 index 7fd7c36887..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_14/func_80240050_ADAEA0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_ADAEF0 -/* ADAEF0 80240050 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ADAEF4 80240054 AFB00010 */ sw $s0, 0x10($sp) -/* ADAEF8 80240058 0080802D */ daddu $s0, $a0, $zero -/* ADAEFC 8024005C AFBF0014 */ sw $ra, 0x14($sp) -/* ADAF00 80240060 8E0300A8 */ lw $v1, 0xa8($s0) -/* ADAF04 80240064 8E020088 */ lw $v0, 0x88($s0) -/* ADAF08 80240068 00621821 */ addu $v1, $v1, $v0 -/* ADAF0C 8024006C 04610004 */ bgez $v1, .L80240080 -/* ADAF10 80240070 AE0300A8 */ sw $v1, 0xa8($s0) -/* ADAF14 80240074 3C020002 */ lui $v0, 2 -/* ADAF18 80240078 08090024 */ j .L80240090 -/* ADAF1C 8024007C 00621021 */ addu $v0, $v1, $v0 -.L80240080: -/* ADAF20 80240080 3C040002 */ lui $a0, 2 -/* ADAF24 80240084 0083102A */ slt $v0, $a0, $v1 -/* ADAF28 80240088 10400002 */ beqz $v0, .L80240094 -/* ADAF2C 8024008C 00641023 */ subu $v0, $v1, $a0 -.L80240090: -/* ADAF30 80240090 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240094: -/* ADAF34 80240094 8E0300AC */ lw $v1, 0xac($s0) -/* ADAF38 80240098 8E02008C */ lw $v0, 0x8c($s0) -/* ADAF3C 8024009C 00621821 */ addu $v1, $v1, $v0 -/* ADAF40 802400A0 04610004 */ bgez $v1, .L802400B4 -/* ADAF44 802400A4 AE0300AC */ sw $v1, 0xac($s0) -/* ADAF48 802400A8 3C020002 */ lui $v0, 2 -/* ADAF4C 802400AC 08090031 */ j .L802400C4 -/* ADAF50 802400B0 00621021 */ addu $v0, $v1, $v0 -.L802400B4: -/* ADAF54 802400B4 3C040002 */ lui $a0, 2 -/* ADAF58 802400B8 0083102A */ slt $v0, $a0, $v1 -/* ADAF5C 802400BC 10400002 */ beqz $v0, .L802400C8 -/* ADAF60 802400C0 00641023 */ subu $v0, $v1, $a0 -.L802400C4: -/* ADAF64 802400C4 AE0200AC */ sw $v0, 0xac($s0) -.L802400C8: -/* ADAF68 802400C8 8E0300B0 */ lw $v1, 0xb0($s0) -/* ADAF6C 802400CC 8E020090 */ lw $v0, 0x90($s0) -/* ADAF70 802400D0 00621821 */ addu $v1, $v1, $v0 -/* ADAF74 802400D4 04610004 */ bgez $v1, .L802400E8 -/* ADAF78 802400D8 AE0300B0 */ sw $v1, 0xb0($s0) -/* ADAF7C 802400DC 3C020002 */ lui $v0, 2 -/* ADAF80 802400E0 0809003E */ j .L802400F8 -/* ADAF84 802400E4 00621021 */ addu $v0, $v1, $v0 -.L802400E8: -/* ADAF88 802400E8 3C040002 */ lui $a0, 2 -/* ADAF8C 802400EC 0083102A */ slt $v0, $a0, $v1 -/* ADAF90 802400F0 10400002 */ beqz $v0, .L802400FC -/* ADAF94 802400F4 00641023 */ subu $v0, $v1, $a0 -.L802400F8: -/* ADAF98 802400F8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400FC: -/* ADAF9C 802400FC 8E0300B4 */ lw $v1, 0xb4($s0) -/* ADAFA0 80240100 8E020094 */ lw $v0, 0x94($s0) -/* ADAFA4 80240104 00621821 */ addu $v1, $v1, $v0 -/* ADAFA8 80240108 04610004 */ bgez $v1, .L8024011C -/* ADAFAC 8024010C AE0300B4 */ sw $v1, 0xb4($s0) -/* ADAFB0 80240110 3C020002 */ lui $v0, 2 -/* ADAFB4 80240114 0809004B */ j .L8024012C -/* ADAFB8 80240118 00621021 */ addu $v0, $v1, $v0 -.L8024011C: -/* ADAFBC 8024011C 3C040002 */ lui $a0, 2 -/* ADAFC0 80240120 0083102A */ slt $v0, $a0, $v1 -/* ADAFC4 80240124 10400002 */ beqz $v0, .L80240130 -/* ADAFC8 80240128 00641023 */ subu $v0, $v1, $a0 -.L8024012C: -/* ADAFCC 8024012C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240130: -/* ADAFD0 80240130 8E040084 */ lw $a0, 0x84($s0) -/* ADAFD4 80240134 0C046F07 */ jal set_main_pan_u -/* ADAFD8 80240138 8E0500A8 */ lw $a1, 0xa8($s0) -/* ADAFDC 8024013C 8E040084 */ lw $a0, 0x84($s0) -/* ADAFE0 80240140 0C046F0D */ jal set_main_pan_v -/* ADAFE4 80240144 8E0500AC */ lw $a1, 0xac($s0) -/* ADAFE8 80240148 8E040084 */ lw $a0, 0x84($s0) -/* ADAFEC 8024014C 0C046F13 */ jal set_aux_pan_u -/* ADAFF0 80240150 8E0500B0 */ lw $a1, 0xb0($s0) -/* ADAFF4 80240154 8E040084 */ lw $a0, 0x84($s0) -/* ADAFF8 80240158 0C046F19 */ jal set_aux_pan_v -/* ADAFFC 8024015C 8E0500B4 */ lw $a1, 0xb4($s0) -/* ADB000 80240160 8FBF0014 */ lw $ra, 0x14($sp) -/* ADB004 80240164 8FB00010 */ lw $s0, 0x10($sp) -/* ADB008 80240168 0000102D */ daddu $v0, $zero, $zero -/* ADB00C 8024016C 03E00008 */ jr $ra -/* ADB010 80240170 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/func_80240174_ADAEA0.s b/asm/nonmatchings/world/area_kkj/kkj_14/func_80240174_ADAEA0.s deleted file mode 100644 index df2bd7d48c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_14/func_80240174_ADAEA0.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240174_ADB014 -/* ADB014 80240174 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ADB018 80240178 AFB00010 */ sw $s0, 0x10($sp) -/* ADB01C 8024017C 0080802D */ daddu $s0, $a0, $zero -/* ADB020 80240180 10A00005 */ beqz $a1, .L80240198 -/* ADB024 80240184 AFBF0014 */ sw $ra, 0x14($sp) -/* ADB028 80240188 AE000070 */ sw $zero, 0x70($s0) -/* ADB02C 8024018C AE000074 */ sw $zero, 0x74($s0) -/* ADB030 80240190 AE000078 */ sw $zero, 0x78($s0) -/* ADB034 80240194 AE00007C */ sw $zero, 0x7c($s0) -.L80240198: -/* ADB038 80240198 8E020070 */ lw $v0, 0x70($s0) -/* ADB03C 8024019C 1440000E */ bnez $v0, .L802401D8 -/* ADB040 802401A0 00000000 */ nop -/* ADB044 802401A4 8E0300A8 */ lw $v1, 0xa8($s0) -/* ADB048 802401A8 8E020088 */ lw $v0, 0x88($s0) -/* ADB04C 802401AC 00621821 */ addu $v1, $v1, $v0 -/* ADB050 802401B0 04610004 */ bgez $v1, .L802401C4 -/* ADB054 802401B4 AE0300A8 */ sw $v1, 0xa8($s0) -/* ADB058 802401B8 3C020002 */ lui $v0, 2 -/* ADB05C 802401BC 08090075 */ j .L802401D4 -/* ADB060 802401C0 00621021 */ addu $v0, $v1, $v0 -.L802401C4: -/* ADB064 802401C4 3C040002 */ lui $a0, 2 -/* ADB068 802401C8 0083102A */ slt $v0, $a0, $v1 -/* ADB06C 802401CC 10400002 */ beqz $v0, .L802401D8 -/* ADB070 802401D0 00641023 */ subu $v0, $v1, $a0 -.L802401D4: -/* ADB074 802401D4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401D8: -/* ADB078 802401D8 8E020074 */ lw $v0, 0x74($s0) -/* ADB07C 802401DC 1440000E */ bnez $v0, .L80240218 -/* ADB080 802401E0 00000000 */ nop -/* ADB084 802401E4 8E0300AC */ lw $v1, 0xac($s0) -/* ADB088 802401E8 8E02008C */ lw $v0, 0x8c($s0) -/* ADB08C 802401EC 00621821 */ addu $v1, $v1, $v0 -/* ADB090 802401F0 04610004 */ bgez $v1, .L80240204 -/* ADB094 802401F4 AE0300AC */ sw $v1, 0xac($s0) -/* ADB098 802401F8 3C020002 */ lui $v0, 2 -/* ADB09C 802401FC 08090085 */ j .L80240214 -/* ADB0A0 80240200 00621021 */ addu $v0, $v1, $v0 -.L80240204: -/* ADB0A4 80240204 3C040002 */ lui $a0, 2 -/* ADB0A8 80240208 0083102A */ slt $v0, $a0, $v1 -/* ADB0AC 8024020C 10400002 */ beqz $v0, .L80240218 -/* ADB0B0 80240210 00641023 */ subu $v0, $v1, $a0 -.L80240214: -/* ADB0B4 80240214 AE0200AC */ sw $v0, 0xac($s0) -.L80240218: -/* ADB0B8 80240218 8E020078 */ lw $v0, 0x78($s0) -/* ADB0BC 8024021C 1440000E */ bnez $v0, .L80240258 -/* ADB0C0 80240220 00000000 */ nop -/* ADB0C4 80240224 8E0300B0 */ lw $v1, 0xb0($s0) -/* ADB0C8 80240228 8E020090 */ lw $v0, 0x90($s0) -/* ADB0CC 8024022C 00621821 */ addu $v1, $v1, $v0 -/* ADB0D0 80240230 04610004 */ bgez $v1, .L80240244 -/* ADB0D4 80240234 AE0300B0 */ sw $v1, 0xb0($s0) -/* ADB0D8 80240238 3C020002 */ lui $v0, 2 -/* ADB0DC 8024023C 08090095 */ j .L80240254 -/* ADB0E0 80240240 00621021 */ addu $v0, $v1, $v0 -.L80240244: -/* ADB0E4 80240244 3C040002 */ lui $a0, 2 -/* ADB0E8 80240248 0083102A */ slt $v0, $a0, $v1 -/* ADB0EC 8024024C 10400002 */ beqz $v0, .L80240258 -/* ADB0F0 80240250 00641023 */ subu $v0, $v1, $a0 -.L80240254: -/* ADB0F4 80240254 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240258: -/* ADB0F8 80240258 8E02007C */ lw $v0, 0x7c($s0) -/* ADB0FC 8024025C 1440000E */ bnez $v0, .L80240298 -/* ADB100 80240260 00000000 */ nop -/* ADB104 80240264 8E0300B4 */ lw $v1, 0xb4($s0) -/* ADB108 80240268 8E020094 */ lw $v0, 0x94($s0) -/* ADB10C 8024026C 00621821 */ addu $v1, $v1, $v0 -/* ADB110 80240270 04610004 */ bgez $v1, .L80240284 -/* ADB114 80240274 AE0300B4 */ sw $v1, 0xb4($s0) -/* ADB118 80240278 3C020002 */ lui $v0, 2 -/* ADB11C 8024027C 080900A5 */ j .L80240294 -/* ADB120 80240280 00621021 */ addu $v0, $v1, $v0 -.L80240284: -/* ADB124 80240284 3C040002 */ lui $a0, 2 -/* ADB128 80240288 0083102A */ slt $v0, $a0, $v1 -/* ADB12C 8024028C 10400002 */ beqz $v0, .L80240298 -/* ADB130 80240290 00641023 */ subu $v0, $v1, $a0 -.L80240294: -/* ADB134 80240294 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240298: -/* ADB138 80240298 8E040084 */ lw $a0, 0x84($s0) -/* ADB13C 8024029C 0C046F07 */ jal set_main_pan_u -/* ADB140 802402A0 8E0500A8 */ lw $a1, 0xa8($s0) -/* ADB144 802402A4 8E040084 */ lw $a0, 0x84($s0) -/* ADB148 802402A8 0C046F0D */ jal set_main_pan_v -/* ADB14C 802402AC 8E0500AC */ lw $a1, 0xac($s0) -/* ADB150 802402B0 8E040084 */ lw $a0, 0x84($s0) -/* ADB154 802402B4 0C046F13 */ jal set_aux_pan_u -/* ADB158 802402B8 8E0500B0 */ lw $a1, 0xb0($s0) -/* ADB15C 802402BC 8E040084 */ lw $a0, 0x84($s0) -/* ADB160 802402C0 0C046F19 */ jal set_aux_pan_v -/* ADB164 802402C4 8E0500B4 */ lw $a1, 0xb4($s0) -/* ADB168 802402C8 8E020070 */ lw $v0, 0x70($s0) -/* ADB16C 802402CC 8E030078 */ lw $v1, 0x78($s0) -/* ADB170 802402D0 8E040098 */ lw $a0, 0x98($s0) -/* ADB174 802402D4 24420001 */ addiu $v0, $v0, 1 -/* ADB178 802402D8 AE020070 */ sw $v0, 0x70($s0) -/* ADB17C 802402DC 8E020074 */ lw $v0, 0x74($s0) -/* ADB180 802402E0 24630001 */ addiu $v1, $v1, 1 -/* ADB184 802402E4 AE030078 */ sw $v1, 0x78($s0) -/* ADB188 802402E8 8E030070 */ lw $v1, 0x70($s0) -/* ADB18C 802402EC 24420001 */ addiu $v0, $v0, 1 -/* ADB190 802402F0 AE020074 */ sw $v0, 0x74($s0) -/* ADB194 802402F4 8E02007C */ lw $v0, 0x7c($s0) -/* ADB198 802402F8 0064182A */ slt $v1, $v1, $a0 -/* ADB19C 802402FC 24420001 */ addiu $v0, $v0, 1 -/* ADB1A0 80240300 14600002 */ bnez $v1, .L8024030C -/* ADB1A4 80240304 AE02007C */ sw $v0, 0x7c($s0) -/* ADB1A8 80240308 AE000070 */ sw $zero, 0x70($s0) -.L8024030C: -/* ADB1AC 8024030C 8E020074 */ lw $v0, 0x74($s0) -/* ADB1B0 80240310 8E03009C */ lw $v1, 0x9c($s0) -/* ADB1B4 80240314 0043102A */ slt $v0, $v0, $v1 -/* ADB1B8 80240318 50400001 */ beql $v0, $zero, .L80240320 -/* ADB1BC 8024031C AE000074 */ sw $zero, 0x74($s0) -.L80240320: -/* ADB1C0 80240320 8E020078 */ lw $v0, 0x78($s0) -/* ADB1C4 80240324 8E0300A0 */ lw $v1, 0xa0($s0) -/* ADB1C8 80240328 0043102A */ slt $v0, $v0, $v1 -/* ADB1CC 8024032C 50400001 */ beql $v0, $zero, .L80240334 -/* ADB1D0 80240330 AE000078 */ sw $zero, 0x78($s0) -.L80240334: -/* ADB1D4 80240334 8E02007C */ lw $v0, 0x7c($s0) -/* ADB1D8 80240338 8E0300A4 */ lw $v1, 0xa4($s0) -/* ADB1DC 8024033C 0043102A */ slt $v0, $v0, $v1 -/* ADB1E0 80240340 50400001 */ beql $v0, $zero, .L80240348 -/* ADB1E4 80240344 AE00007C */ sw $zero, 0x7c($s0) -.L80240348: -/* ADB1E8 80240348 8FBF0014 */ lw $ra, 0x14($sp) -/* ADB1EC 8024034C 8FB00010 */ lw $s0, 0x10($sp) -/* ADB1F0 80240350 0000102D */ daddu $v0, $zero, $zero -/* ADB1F4 80240354 03E00008 */ jr $ra -/* ADB1F8 80240358 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/func_8024035C_ADAEA0.s b/asm/nonmatchings/world/area_kkj/kkj_14/func_8024035C_ADAEA0.s deleted file mode 100644 index bb07a690db..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_14/func_8024035C_ADAEA0.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024035C_ADB1FC -/* ADB1FC 8024035C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* ADB200 80240360 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* ADB204 80240364 9043007E */ lbu $v1, 0x7e($v0) -/* ADB208 80240368 306300FE */ andi $v1, $v1, 0xfe -/* ADB20C 8024036C A043007E */ sb $v1, 0x7e($v0) -/* ADB210 80240370 90820087 */ lbu $v0, 0x87($a0) -/* ADB214 80240374 3C018011 */ lui $at, 0x8011 -/* ADB218 80240378 A022F2A2 */ sb $v0, -0xd5e($at) -/* ADB21C 8024037C 03E00008 */ jr $ra -/* ADB220 80240380 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/func_80240384_ADAEA0.s b/asm/nonmatchings/world/area_kkj/kkj_14/func_80240384_ADAEA0.s deleted file mode 100644 index d144a0dece..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_14/func_80240384_ADAEA0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240384_ADB224 -/* ADB224 80240384 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* ADB228 80240388 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* ADB22C 8024038C 9062007E */ lbu $v0, 0x7e($v1) -/* ADB230 80240390 34420004 */ ori $v0, $v0, 4 -/* ADB234 80240394 A062007E */ sb $v0, 0x7e($v1) -/* ADB238 80240398 03E00008 */ jr $ra -/* ADB23C 8024039C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/func_802403A0_ADAEA0.s b/asm/nonmatchings/world/area_kkj/kkj_14/func_802403A0_ADAEA0.s deleted file mode 100644 index 864f81aff4..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_14/func_802403A0_ADAEA0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403A0_ADB240 -/* ADB240 802403A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ADB244 802403A4 AFBF0010 */ sw $ra, 0x10($sp) -/* ADB248 802403A8 8C82000C */ lw $v0, 0xc($a0) -/* ADB24C 802403AC 3C068011 */ lui $a2, 0x8011 -/* ADB250 802403B0 80C6EFD4 */ lb $a2, -0x102c($a2) -/* ADB254 802403B4 0C0B2026 */ jal set_variable -/* ADB258 802403B8 8C450000 */ lw $a1, ($v0) -/* ADB25C 802403BC 8FBF0010 */ lw $ra, 0x10($sp) -/* ADB260 802403C0 24020002 */ addiu $v0, $zero, 2 -/* ADB264 802403C4 03E00008 */ jr $ra -/* ADB268 802403C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/func_802403CC_ADAEA0.s b/asm/nonmatchings/world/area_kkj/kkj_14/func_802403CC_ADAEA0.s deleted file mode 100644 index 1e8d8776e2..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_14/func_802403CC_ADAEA0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403CC_ADB26C -/* ADB26C 802403CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ADB270 802403D0 AFBF0010 */ sw $ra, 0x10($sp) -/* ADB274 802403D4 8C82000C */ lw $v0, 0xc($a0) -/* ADB278 802403D8 0C0B1EAF */ jal get_variable -/* ADB27C 802403DC 8C450000 */ lw $a1, ($v0) -/* ADB280 802403E0 8FBF0010 */ lw $ra, 0x10($sp) -/* ADB284 802403E4 3C018024 */ lui $at, 0x8024 -/* ADB288 802403E8 AC221D38 */ sw $v0, 0x1d38($at) -/* ADB28C 802403EC 24020002 */ addiu $v0, $zero, 2 -/* ADB290 802403F0 03E00008 */ jr $ra -/* ADB294 802403F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/func_802403F8_ADAEA0.s b/asm/nonmatchings/world/area_kkj/kkj_14/func_802403F8_ADAEA0.s deleted file mode 100644 index bf1d93070d..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_14/func_802403F8_ADAEA0.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F8_ADB298 -/* ADB298 802403F8 3C02E300 */ lui $v0, 0xe300 -/* ADB29C 802403FC 34420A01 */ ori $v0, $v0, 0xa01 -/* ADB2A0 80240400 3C07E200 */ lui $a3, 0xe200 -/* ADB2A4 80240404 34E7001C */ ori $a3, $a3, 0x1c -/* ADB2A8 80240408 3C060C18 */ lui $a2, 0xc18 -/* ADB2AC 8024040C 34C649D8 */ ori $a2, $a2, 0x49d8 -/* ADB2B0 80240410 3C08FC11 */ lui $t0, 0xfc11 -/* ADB2B4 80240414 3C04800A */ lui $a0, 0x800a -/* ADB2B8 80240418 2484A66C */ addiu $a0, $a0, -0x5994 -/* ADB2BC 8024041C 8C830000 */ lw $v1, ($a0) -/* ADB2C0 80240420 350815FF */ ori $t0, $t0, 0x15ff -/* ADB2C4 80240424 0060282D */ daddu $a1, $v1, $zero -/* ADB2C8 80240428 24630008 */ addiu $v1, $v1, 8 -/* ADB2CC 8024042C AC830000 */ sw $v1, ($a0) -/* ADB2D0 80240430 ACA20000 */ sw $v0, ($a1) -/* ADB2D4 80240434 3C020010 */ lui $v0, 0x10 -/* ADB2D8 80240438 ACA20004 */ sw $v0, 4($a1) -/* ADB2DC 8024043C 24620008 */ addiu $v0, $v1, 8 -/* ADB2E0 80240440 AC820000 */ sw $v0, ($a0) -/* ADB2E4 80240444 24620010 */ addiu $v0, $v1, 0x10 -/* ADB2E8 80240448 AC670000 */ sw $a3, ($v1) -/* ADB2EC 8024044C AC660004 */ sw $a2, 4($v1) -/* ADB2F0 80240450 AC820000 */ sw $v0, ($a0) -/* ADB2F4 80240454 2402FE3B */ addiu $v0, $zero, -0x1c5 -/* ADB2F8 80240458 AC62000C */ sw $v0, 0xc($v1) -/* ADB2FC 8024045C 24620018 */ addiu $v0, $v1, 0x18 -/* ADB300 80240460 AC680008 */ sw $t0, 8($v1) -/* ADB304 80240464 AC820000 */ sw $v0, ($a0) -/* ADB308 80240468 3C048024 */ lui $a0, 0x8024 -/* ADB30C 8024046C 90841D3B */ lbu $a0, 0x1d3b($a0) -/* ADB310 80240470 3C02FA00 */ lui $v0, 0xfa00 -/* ADB314 80240474 AC620010 */ sw $v0, 0x10($v1) -/* ADB318 80240478 03E00008 */ jr $ra -/* ADB31C 8024047C AC640014 */ sw $a0, 0x14($v1) diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/func_80240480_ADAEA0.s b/asm/nonmatchings/world/area_kkj/kkj_14/func_80240480_ADAEA0.s deleted file mode 100644 index fe8b412753..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_14/func_80240480_ADAEA0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240480_ADB320 -/* ADB320 80240480 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* ADB324 80240484 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* ADB328 80240488 9062007E */ lbu $v0, 0x7e($v1) -/* ADB32C 8024048C 34420010 */ ori $v0, $v0, 0x10 -/* ADB330 80240490 A062007E */ sb $v0, 0x7e($v1) -/* ADB334 80240494 03E00008 */ jr $ra -/* ADB338 80240498 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/func_8024049C_ADAEA0.s b/asm/nonmatchings/world/area_kkj/kkj_14/func_8024049C_ADAEA0.s deleted file mode 100644 index b7db36a349..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_14/func_8024049C_ADAEA0.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_ADB33C -/* ADB33C 8024049C 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* ADB340 802404A0 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* ADB344 802404A4 9062007E */ lbu $v0, 0x7e($v1) -/* ADB348 802404A8 304200EF */ andi $v0, $v0, 0xef -/* ADB34C 802404AC A062007E */ sb $v0, 0x7e($v1) -/* ADB350 802404B0 03E00008 */ jr $ra -/* ADB354 802404B4 24020002 */ addiu $v0, $zero, 2 -/* ADB358 802404B8 00000000 */ nop -/* ADB35C 802404BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_15/func_80240124_AE5590.s b/asm/nonmatchings/world/area_kkj/kkj_15/func_80240124_AE5590.s deleted file mode 100644 index 24ff3caa22..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_15/func_80240124_AE5590.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_AE56B4 -/* AE56B4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AE56B8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* AE56BC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* AE56C0 80240130 10A00005 */ beqz $a1, .L80240148 -/* AE56C4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* AE56C8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* AE56CC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* AE56D0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* AE56D4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* AE56D8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* AE56DC 8024014C 1440000E */ bnez $v0, .L80240188 -/* AE56E0 80240150 00000000 */ nop -/* AE56E4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* AE56E8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* AE56EC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* AE56F0 80240160 04610004 */ bgez $v1, .L80240174 -/* AE56F4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* AE56F8 80240168 3C020002 */ lui $v0, 2 -/* AE56FC 8024016C 08090061 */ j .L80240184 -/* AE5700 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* AE5704 80240174 3C040002 */ lui $a0, 2 -/* AE5708 80240178 0083102A */ slt $v0, $a0, $v1 -/* AE570C 8024017C 10400002 */ beqz $v0, .L80240188 -/* AE5710 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* AE5714 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* AE5718 80240188 8E020074 */ lw $v0, 0x74($s0) -/* AE571C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* AE5720 80240190 00000000 */ nop -/* AE5724 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* AE5728 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* AE572C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* AE5730 802401A0 04610004 */ bgez $v1, .L802401B4 -/* AE5734 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* AE5738 802401A8 3C020002 */ lui $v0, 2 -/* AE573C 802401AC 08090071 */ j .L802401C4 -/* AE5740 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* AE5744 802401B4 3C040002 */ lui $a0, 2 -/* AE5748 802401B8 0083102A */ slt $v0, $a0, $v1 -/* AE574C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* AE5750 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* AE5754 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* AE5758 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* AE575C 802401CC 1440000E */ bnez $v0, .L80240208 -/* AE5760 802401D0 00000000 */ nop -/* AE5764 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* AE5768 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* AE576C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* AE5770 802401E0 04610004 */ bgez $v1, .L802401F4 -/* AE5774 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* AE5778 802401E8 3C020002 */ lui $v0, 2 -/* AE577C 802401EC 08090081 */ j .L80240204 -/* AE5780 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* AE5784 802401F4 3C040002 */ lui $a0, 2 -/* AE5788 802401F8 0083102A */ slt $v0, $a0, $v1 -/* AE578C 802401FC 10400002 */ beqz $v0, .L80240208 -/* AE5790 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* AE5794 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* AE5798 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* AE579C 8024020C 1440000E */ bnez $v0, .L80240248 -/* AE57A0 80240210 00000000 */ nop -/* AE57A4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* AE57A8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* AE57AC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* AE57B0 80240220 04610004 */ bgez $v1, .L80240234 -/* AE57B4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* AE57B8 80240228 3C020002 */ lui $v0, 2 -/* AE57BC 8024022C 08090091 */ j .L80240244 -/* AE57C0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* AE57C4 80240234 3C040002 */ lui $a0, 2 -/* AE57C8 80240238 0083102A */ slt $v0, $a0, $v1 -/* AE57CC 8024023C 10400002 */ beqz $v0, .L80240248 -/* AE57D0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* AE57D4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* AE57D8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* AE57DC 8024024C 0C046F07 */ jal set_main_pan_u -/* AE57E0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* AE57E4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* AE57E8 80240258 0C046F0D */ jal set_main_pan_v -/* AE57EC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* AE57F0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* AE57F4 80240264 0C046F13 */ jal set_aux_pan_u -/* AE57F8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* AE57FC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* AE5800 80240270 0C046F19 */ jal set_aux_pan_v -/* AE5804 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* AE5808 80240278 8E020070 */ lw $v0, 0x70($s0) -/* AE580C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* AE5810 80240280 8E040098 */ lw $a0, 0x98($s0) -/* AE5814 80240284 24420001 */ addiu $v0, $v0, 1 -/* AE5818 80240288 AE020070 */ sw $v0, 0x70($s0) -/* AE581C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* AE5820 80240290 24630001 */ addiu $v1, $v1, 1 -/* AE5824 80240294 AE030078 */ sw $v1, 0x78($s0) -/* AE5828 80240298 8E030070 */ lw $v1, 0x70($s0) -/* AE582C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* AE5830 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* AE5834 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* AE5838 802402A8 0064182A */ slt $v1, $v1, $a0 -/* AE583C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* AE5840 802402B0 14600002 */ bnez $v1, .L802402BC -/* AE5844 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* AE5848 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* AE584C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* AE5850 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* AE5854 802402C4 0043102A */ slt $v0, $v0, $v1 -/* AE5858 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* AE585C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* AE5860 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* AE5864 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* AE5868 802402D8 0043102A */ slt $v0, $v0, $v1 -/* AE586C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* AE5870 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* AE5874 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* AE5878 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* AE587C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* AE5880 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* AE5884 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* AE5888 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* AE588C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* AE5890 80240300 0000102D */ daddu $v0, $zero, $zero -/* AE5894 80240304 03E00008 */ jr $ra -/* AE5898 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_15/func_8024030C_AE5590.s b/asm/nonmatchings/world/area_kkj/kkj_15/func_8024030C_AE5590.s deleted file mode 100644 index 83eeebf918..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_15/func_8024030C_AE5590.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_AE589C -/* AE589C 8024030C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* AE58A0 80240310 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* AE58A4 80240314 9043007E */ lbu $v1, 0x7e($v0) -/* AE58A8 80240318 306300FE */ andi $v1, $v1, 0xfe -/* AE58AC 8024031C A043007E */ sb $v1, 0x7e($v0) -/* AE58B0 80240320 90820087 */ lbu $v0, 0x87($a0) -/* AE58B4 80240324 3C018011 */ lui $at, 0x8011 -/* AE58B8 80240328 A022F2A2 */ sb $v0, -0xd5e($at) -/* AE58BC 8024032C 03E00008 */ jr $ra -/* AE58C0 80240330 24020002 */ addiu $v0, $zero, 2 -/* AE58C4 80240334 00000000 */ nop -/* AE58C8 80240338 00000000 */ nop -/* AE58CC 8024033C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_15/func_80240340_AE5590.s b/asm/nonmatchings/world/area_kkj/kkj_15/func_80240340_AE5590.s deleted file mode 100644 index 6fd0f6575d..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_15/func_80240340_AE5590.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240340_AE58D0 -/* AE58D0 80240340 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AE58D4 80240344 AFB00010 */ sw $s0, 0x10($sp) -/* AE58D8 80240348 0080802D */ daddu $s0, $a0, $zero -/* AE58DC 8024034C AFBF001C */ sw $ra, 0x1c($sp) -/* AE58E0 80240350 AFB20018 */ sw $s2, 0x18($sp) -/* AE58E4 80240354 AFB10014 */ sw $s1, 0x14($sp) -/* AE58E8 80240358 F7BC0040 */ sdc1 $f28, 0x40($sp) -/* AE58EC 8024035C F7BA0038 */ sdc1 $f26, 0x38($sp) -/* AE58F0 80240360 F7B80030 */ sdc1 $f24, 0x30($sp) -/* AE58F4 80240364 F7B60028 */ sdc1 $f22, 0x28($sp) -/* AE58F8 80240368 F7B40020 */ sdc1 $f20, 0x20($sp) -/* AE58FC 8024036C 0C00EAD2 */ jal get_npc_safe -/* AE5900 80240370 2404FFFC */ addiu $a0, $zero, -4 -/* AE5904 80240374 3C040DB5 */ lui $a0, 0xdb5 -/* AE5908 80240378 34848580 */ ori $a0, $a0, 0x8580 -/* AE590C 8024037C C60200A0 */ lwc1 $f2, 0xa0($s0) -/* AE5910 80240380 468010A0 */ cvt.s.w $f2, $f2 -/* AE5914 80240384 44061000 */ mfc1 $a2, $f2 -/* AE5918 80240388 C60200A4 */ lwc1 $f2, 0xa4($s0) -/* AE591C 8024038C 468010A0 */ cvt.s.w $f2, $f2 -/* AE5920 80240390 0040902D */ daddu $s2, $v0, $zero -/* AE5924 80240394 8E03008C */ lw $v1, 0x8c($s0) -/* AE5928 80240398 44071000 */ mfc1 $a3, $f2 -/* AE592C 8024039C 3C014248 */ lui $at, 0x4248 -/* AE5930 802403A0 4481B000 */ mtc1 $at, $f22 -/* AE5934 802403A4 3C01C348 */ lui $at, 0xc348 -/* AE5938 802403A8 4481A000 */ mtc1 $at, $f20 -/* AE593C 802403AC 3C013A80 */ lui $at, 0x3a80 -/* AE5940 802403B0 44810000 */ mtc1 $at, $f0 -/* AE5944 802403B4 00641821 */ addu $v1, $v1, $a0 -/* AE5948 802403B8 4483C000 */ mtc1 $v1, $f24 -/* AE594C 802403BC 00000000 */ nop -/* AE5950 802403C0 4680C620 */ cvt.s.w $f24, $f24 -/* AE5954 802403C4 4600B306 */ mov.s $f12, $f22 -/* AE5958 802403C8 4600C602 */ mul.s $f24, $f24, $f0 -/* AE595C 802403CC 00000000 */ nop -/* AE5960 802403D0 0C00A7B5 */ jal dist2D -/* AE5964 802403D4 4600A386 */ mov.s $f14, $f20 -/* AE5968 802403D8 46000706 */ mov.s $f28, $f0 -/* AE596C 802403DC 4600B306 */ mov.s $f12, $f22 -/* AE5970 802403E0 C60200A0 */ lwc1 $f2, 0xa0($s0) -/* AE5974 802403E4 468010A0 */ cvt.s.w $f2, $f2 -/* AE5978 802403E8 44061000 */ mfc1 $a2, $f2 -/* AE597C 802403EC C60200A4 */ lwc1 $f2, 0xa4($s0) -/* AE5980 802403F0 468010A0 */ cvt.s.w $f2, $f2 -/* AE5984 802403F4 44071000 */ mfc1 $a3, $f2 -/* AE5988 802403F8 0C00A720 */ jal atan2 -/* AE598C 802403FC 4600A386 */ mov.s $f14, $f20 -/* AE5990 80240400 0C00A6C9 */ jal clamp_angle -/* AE5994 80240404 46180301 */ sub.s $f12, $f0, $f24 -/* AE5998 80240408 46000686 */ mov.s $f26, $f0 -/* AE599C 8024040C 0C00A8BB */ jal sin_deg -/* AE59A0 80240410 4600D306 */ mov.s $f12, $f26 -/* AE59A4 80240414 4600E002 */ mul.s $f0, $f28, $f0 -/* AE59A8 80240418 00000000 */ nop -/* AE59AC 8024041C 46160000 */ add.s $f0, $f0, $f22 -/* AE59B0 80240420 4600D306 */ mov.s $f12, $f26 -/* AE59B4 80240424 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* AE59B8 80240428 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* AE59BC 8024042C 0C00A8D4 */ jal cos_deg -/* AE59C0 80240430 E6200028 */ swc1 $f0, 0x28($s1) -/* AE59C4 80240434 4600E002 */ mul.s $f0, $f28, $f0 -/* AE59C8 80240438 00000000 */ nop -/* AE59CC 8024043C 4600A001 */ sub.s $f0, $f20, $f0 -/* AE59D0 80240440 4600B306 */ mov.s $f12, $f22 -/* AE59D4 80240444 E6200030 */ swc1 $f0, 0x30($s1) -/* AE59D8 80240448 C60200A8 */ lwc1 $f2, 0xa8($s0) -/* AE59DC 8024044C 468010A0 */ cvt.s.w $f2, $f2 -/* AE59E0 80240450 44061000 */ mfc1 $a2, $f2 -/* AE59E4 80240454 C60200AC */ lwc1 $f2, 0xac($s0) -/* AE59E8 80240458 468010A0 */ cvt.s.w $f2, $f2 -/* AE59EC 8024045C 44071000 */ mfc1 $a3, $f2 -/* AE59F0 80240460 0C00A7B5 */ jal dist2D -/* AE59F4 80240464 4600A386 */ mov.s $f14, $f20 -/* AE59F8 80240468 46000706 */ mov.s $f28, $f0 -/* AE59FC 8024046C 4600B306 */ mov.s $f12, $f22 -/* AE5A00 80240470 C60200A8 */ lwc1 $f2, 0xa8($s0) -/* AE5A04 80240474 468010A0 */ cvt.s.w $f2, $f2 -/* AE5A08 80240478 44061000 */ mfc1 $a2, $f2 -/* AE5A0C 8024047C C60200AC */ lwc1 $f2, 0xac($s0) -/* AE5A10 80240480 468010A0 */ cvt.s.w $f2, $f2 -/* AE5A14 80240484 44071000 */ mfc1 $a3, $f2 -/* AE5A18 80240488 0C00A720 */ jal atan2 -/* AE5A1C 8024048C 4600A386 */ mov.s $f14, $f20 -/* AE5A20 80240490 0C00A6C9 */ jal clamp_angle -/* AE5A24 80240494 46180301 */ sub.s $f12, $f0, $f24 -/* AE5A28 80240498 46000686 */ mov.s $f26, $f0 -/* AE5A2C 8024049C 0C00A8BB */ jal sin_deg -/* AE5A30 802404A0 4600D306 */ mov.s $f12, $f26 -/* AE5A34 802404A4 4600E002 */ mul.s $f0, $f28, $f0 -/* AE5A38 802404A8 00000000 */ nop -/* AE5A3C 802404AC 46160000 */ add.s $f0, $f0, $f22 -/* AE5A40 802404B0 4600D306 */ mov.s $f12, $f26 -/* AE5A44 802404B4 0C00A8D4 */ jal cos_deg -/* AE5A48 802404B8 E6400038 */ swc1 $f0, 0x38($s2) -/* AE5A4C 802404BC 4600E002 */ mul.s $f0, $f28, $f0 -/* AE5A50 802404C0 00000000 */ nop -/* AE5A54 802404C4 4600A501 */ sub.s $f20, $f20, $f0 -/* AE5A58 802404C8 E6540040 */ swc1 $f20, 0x40($s2) -/* AE5A5C 802404CC 8FBF001C */ lw $ra, 0x1c($sp) -/* AE5A60 802404D0 8FB20018 */ lw $s2, 0x18($sp) -/* AE5A64 802404D4 8FB10014 */ lw $s1, 0x14($sp) -/* AE5A68 802404D8 8FB00010 */ lw $s0, 0x10($sp) -/* AE5A6C 802404DC D7BC0040 */ ldc1 $f28, 0x40($sp) -/* AE5A70 802404E0 D7BA0038 */ ldc1 $f26, 0x38($sp) -/* AE5A74 802404E4 D7B80030 */ ldc1 $f24, 0x30($sp) -/* AE5A78 802404E8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* AE5A7C 802404EC D7B40020 */ ldc1 $f20, 0x20($sp) -/* AE5A80 802404F0 24020002 */ addiu $v0, $zero, 2 -/* AE5A84 802404F4 03E00008 */ jr $ra -/* AE5A88 802404F8 27BD0048 */ addiu $sp, $sp, 0x48 -/* AE5A8C 802404FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_15/func_80240500_AE5590.s b/asm/nonmatchings/world/area_kkj/kkj_15/func_80240500_AE5590.s deleted file mode 100644 index 12a497c89c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_15/func_80240500_AE5590.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_AE5A90 -/* AE5A90 80240500 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* AE5A94 80240504 AFB1002C */ sw $s1, 0x2c($sp) -/* AE5A98 80240508 0080882D */ daddu $s1, $a0, $zero -/* AE5A9C 8024050C AFBF0034 */ sw $ra, 0x34($sp) -/* AE5AA0 80240510 AFB20030 */ sw $s2, 0x30($sp) -/* AE5AA4 80240514 AFB00028 */ sw $s0, 0x28($sp) -/* AE5AA8 80240518 8E30000C */ lw $s0, 0xc($s1) -/* AE5AAC 8024051C 8E050000 */ lw $a1, ($s0) -/* AE5AB0 80240520 0C0B1EAF */ jal get_variable -/* AE5AB4 80240524 26100004 */ addiu $s0, $s0, 4 -/* AE5AB8 80240528 8E050000 */ lw $a1, ($s0) -/* AE5ABC 8024052C 26100004 */ addiu $s0, $s0, 4 -/* AE5AC0 80240530 0220202D */ daddu $a0, $s1, $zero -/* AE5AC4 80240534 0C0B1EAF */ jal get_variable -/* AE5AC8 80240538 0040902D */ daddu $s2, $v0, $zero -/* AE5ACC 8024053C 0220202D */ daddu $a0, $s1, $zero -/* AE5AD0 80240540 8E050000 */ lw $a1, ($s0) -/* AE5AD4 80240544 0C0B1EAF */ jal get_variable -/* AE5AD8 80240548 0040802D */ daddu $s0, $v0, $zero -/* AE5ADC 8024054C 0000202D */ daddu $a0, $zero, $zero -/* AE5AE0 80240550 24050005 */ addiu $a1, $zero, 5 -/* AE5AE4 80240554 44820000 */ mtc1 $v0, $f0 -/* AE5AE8 80240558 00000000 */ nop -/* AE5AEC 8024055C 46800020 */ cvt.s.w $f0, $f0 -/* AE5AF0 80240560 44921000 */ mtc1 $s2, $f2 -/* AE5AF4 80240564 00000000 */ nop -/* AE5AF8 80240568 468010A0 */ cvt.s.w $f2, $f2 -/* AE5AFC 8024056C 44061000 */ mfc1 $a2, $f2 -/* AE5B00 80240570 44901000 */ mtc1 $s0, $f2 -/* AE5B04 80240574 00000000 */ nop -/* AE5B08 80240578 468010A0 */ cvt.s.w $f2, $f2 -/* AE5B0C 8024057C E7A00010 */ swc1 $f0, 0x10($sp) -/* AE5B10 80240580 3C0138D1 */ lui $at, 0x38d1 -/* AE5B14 80240584 3421B717 */ ori $at, $at, 0xb717 -/* AE5B18 80240588 44810000 */ mtc1 $at, $f0 -/* AE5B1C 8024058C 44071000 */ mfc1 $a3, $f2 -/* AE5B20 80240590 240200FF */ addiu $v0, $zero, 0xff -/* AE5B24 80240594 AFA20014 */ sw $v0, 0x14($sp) -/* AE5B28 80240598 AFA20018 */ sw $v0, 0x18($sp) -/* AE5B2C 8024059C AFA2001C */ sw $v0, 0x1c($sp) -/* AE5B30 802405A0 AFA00024 */ sw $zero, 0x24($sp) -/* AE5B34 802405A4 0C052055 */ jal func_80148154 -/* AE5B38 802405A8 E7A00020 */ swc1 $f0, 0x20($sp) -/* AE5B3C 802405AC 8FBF0034 */ lw $ra, 0x34($sp) -/* AE5B40 802405B0 8FB20030 */ lw $s2, 0x30($sp) -/* AE5B44 802405B4 8FB1002C */ lw $s1, 0x2c($sp) -/* AE5B48 802405B8 8FB00028 */ lw $s0, 0x28($sp) -/* AE5B4C 802405BC 24020002 */ addiu $v0, $zero, 2 -/* AE5B50 802405C0 03E00008 */ jr $ra -/* AE5B54 802405C4 27BD0038 */ addiu $sp, $sp, 0x38 -/* AE5B58 802405C8 00000000 */ nop -/* AE5B5C 802405CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_15/func_802405D0_AE5590.s b/asm/nonmatchings/world/area_kkj/kkj_15/func_802405D0_AE5590.s deleted file mode 100644 index 9cd8f604e7..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_15/func_802405D0_AE5590.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405D0_AE5B60 -/* AE5B60 802405D0 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* AE5B64 802405D4 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* AE5B68 802405D8 9062007E */ lbu $v0, 0x7e($v1) -/* AE5B6C 802405DC 34420010 */ ori $v0, $v0, 0x10 -/* AE5B70 802405E0 A062007E */ sb $v0, 0x7e($v1) -/* AE5B74 802405E4 03E00008 */ jr $ra -/* AE5B78 802405E8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_15/func_802405EC_AE5590.s b/asm/nonmatchings/world/area_kkj/kkj_15/func_802405EC_AE5590.s deleted file mode 100644 index 316d3bc687..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_15/func_802405EC_AE5590.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_AE5B7C -/* AE5B7C 802405EC 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* AE5B80 802405F0 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* AE5B84 802405F4 9062007E */ lbu $v0, 0x7e($v1) -/* AE5B88 802405F8 304200EF */ andi $v0, $v0, 0xef -/* AE5B8C 802405FC A062007E */ sb $v0, 0x7e($v1) -/* AE5B90 80240600 03E00008 */ jr $ra -/* AE5B94 80240604 24020002 */ addiu $v0, $zero, 2 -/* AE5B98 80240608 00000000 */ nop -/* AE5B9C 8024060C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/func_80240060_AED410.s b/asm/nonmatchings/world/area_kkj/kkj_16/func_80240060_AED410.s deleted file mode 100644 index d69d1558bd..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_16/func_80240060_AED410.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240060_AED470 -/* AED470 80240060 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* AED474 80240064 AFB3003C */ sw $s3, 0x3c($sp) -/* AED478 80240068 0080982D */ daddu $s3, $a0, $zero -/* AED47C 8024006C AFBF0044 */ sw $ra, 0x44($sp) -/* AED480 80240070 AFB40040 */ sw $s4, 0x40($sp) -/* AED484 80240074 AFB20038 */ sw $s2, 0x38($sp) -/* AED488 80240078 AFB10034 */ sw $s1, 0x34($sp) -/* AED48C 8024007C AFB00030 */ sw $s0, 0x30($sp) -/* AED490 80240080 F7B80058 */ sdc1 $f24, 0x58($sp) -/* AED494 80240084 F7B60050 */ sdc1 $f22, 0x50($sp) -/* AED498 80240088 F7B40048 */ sdc1 $f20, 0x48($sp) -/* AED49C 8024008C 8E620148 */ lw $v0, 0x148($s3) -/* AED4A0 80240090 0C00EABB */ jal get_npc_unsafe -/* AED4A4 80240094 84440008 */ lh $a0, 8($v0) -/* AED4A8 80240098 27A40020 */ addiu $a0, $sp, 0x20 -/* AED4AC 8024009C 27A50024 */ addiu $a1, $sp, 0x24 -/* AED4B0 802400A0 0040802D */ daddu $s0, $v0, $zero -/* AED4B4 802400A4 8E63000C */ lw $v1, 0xc($s3) -/* AED4B8 802400A8 8E07000C */ lw $a3, 0xc($s0) -/* AED4BC 802400AC C6000038 */ lwc1 $f0, 0x38($s0) -/* AED4C0 802400B0 C6020040 */ lwc1 $f2, 0x40($s0) -/* AED4C4 802400B4 8C740000 */ lw $s4, ($v1) -/* AED4C8 802400B8 24630004 */ addiu $v1, $v1, 4 -/* AED4CC 802400BC C4780000 */ lwc1 $f24, ($v1) -/* AED4D0 802400C0 4680C620 */ cvt.s.w $f24, $f24 -/* AED4D4 802400C4 24630004 */ addiu $v1, $v1, 4 -/* AED4D8 802400C8 C4740000 */ lwc1 $f20, ($v1) -/* AED4DC 802400CC 4680A520 */ cvt.s.w $f20, $f20 -/* AED4E0 802400D0 4406A000 */ mfc1 $a2, $f20 -/* AED4E4 802400D4 C4760004 */ lwc1 $f22, 4($v1) -/* AED4E8 802400D8 4680B5A0 */ cvt.s.w $f22, $f22 -/* AED4EC 802400DC E7A00020 */ swc1 $f0, 0x20($sp) -/* AED4F0 802400E0 0C00A7E7 */ jal add_vec2D_polar -/* AED4F4 802400E4 E7A20024 */ swc1 $f2, 0x24($sp) -/* AED4F8 802400E8 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* AED4FC 802400EC 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* AED500 802400F0 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* AED504 802400F4 4480A000 */ mtc1 $zero, $f20 -/* AED508 802400F8 8E460028 */ lw $a2, 0x28($s2) -/* AED50C 802400FC 4407A000 */ mfc1 $a3, $f20 -/* AED510 80240100 0C00A7B5 */ jal dist2D -/* AED514 80240104 4600A386 */ mov.s $f14, $f20 -/* AED518 80240108 4600A306 */ mov.s $f12, $f20 -/* AED51C 8024010C C7AE0024 */ lwc1 $f14, 0x24($sp) -/* AED520 80240110 44066000 */ mfc1 $a2, $f12 -/* AED524 80240114 8E470030 */ lw $a3, 0x30($s2) -/* AED528 80240118 0C00A7B5 */ jal dist2D -/* AED52C 8024011C 46000506 */ mov.s $f20, $f0 -/* AED530 80240120 C604000C */ lwc1 $f4, 0xc($s0) -/* AED534 80240124 3C018024 */ lui $at, 0x8024 -/* AED538 80240128 D4224810 */ ldc1 $f2, 0x4810($at) -/* AED53C 8024012C 46002121 */ cvt.d.s $f4, $f4 -/* AED540 80240130 46222032 */ c.eq.d $f4, $f2 -/* AED544 80240134 00000000 */ nop -/* AED548 80240138 45010007 */ bc1t .L80240158 -/* AED54C 8024013C 46000086 */ mov.s $f2, $f0 -/* AED550 80240140 3C018024 */ lui $at, 0x8024 -/* AED554 80240144 D4204818 */ ldc1 $f0, 0x4818($at) -/* AED558 80240148 46202032 */ c.eq.d $f4, $f0 -/* AED55C 8024014C 00000000 */ nop -/* AED560 80240150 45000008 */ bc1f .L80240174 -/* AED564 80240154 00000000 */ nop -.L80240158: -/* AED568 80240158 4618A03E */ c.le.s $f20, $f24 -/* AED56C 8024015C 00000000 */ nop -/* AED570 80240160 4500000C */ bc1f .L80240194 -/* AED574 80240164 0000882D */ daddu $s1, $zero, $zero -/* AED578 80240168 4616103E */ c.le.s $f2, $f22 -/* AED57C 8024016C 08090063 */ j .L8024018C -/* AED580 80240170 00000000 */ nop -.L80240174: -/* AED584 80240174 4618103E */ c.le.s $f2, $f24 -/* AED588 80240178 00000000 */ nop -/* AED58C 8024017C 45000005 */ bc1f .L80240194 -/* AED590 80240180 0000882D */ daddu $s1, $zero, $zero -/* AED594 80240184 4616A03E */ c.le.s $f20, $f22 -/* AED598 80240188 00000000 */ nop -.L8024018C: -/* AED59C 8024018C 45030001 */ bc1tl .L80240194 -/* AED5A0 80240190 24110001 */ addiu $s1, $zero, 1 -.L80240194: -/* AED5A4 80240194 12200027 */ beqz $s1, .L80240234 -/* AED5A8 80240198 0260202D */ daddu $a0, $s3, $zero -/* AED5AC 8024019C C60C0038 */ lwc1 $f12, 0x38($s0) -/* AED5B0 802401A0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* AED5B4 802401A4 8E460028 */ lw $a2, 0x28($s2) -/* AED5B8 802401A8 8E470030 */ lw $a3, 0x30($s2) -/* AED5BC 802401AC C602003C */ lwc1 $f2, 0x3c($s0) -/* AED5C0 802401B0 46006006 */ mov.s $f0, $f12 -/* AED5C4 802401B4 46007106 */ mov.s $f4, $f14 -/* AED5C8 802401B8 E7A00020 */ swc1 $f0, 0x20($sp) -/* AED5CC 802401BC E7A20028 */ swc1 $f2, 0x28($sp) -/* AED5D0 802401C0 0C00A7B5 */ jal dist2D -/* AED5D4 802401C4 E7A40024 */ swc1 $f4, 0x24($sp) -/* AED5D8 802401C8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* AED5DC 802401CC C60E0040 */ lwc1 $f14, 0x40($s0) -/* AED5E0 802401D0 8E460028 */ lw $a2, 0x28($s2) -/* AED5E4 802401D4 8E470030 */ lw $a3, 0x30($s2) -/* AED5E8 802401D8 0C00A720 */ jal atan2 -/* AED5EC 802401DC 46000506 */ mov.s $f20, $f0 -/* AED5F0 802401E0 3C040007 */ lui $a0, 7 -/* AED5F4 802401E4 34848000 */ ori $a0, $a0, 0x8000 -/* AED5F8 802401E8 27A50020 */ addiu $a1, $sp, 0x20 -/* AED5FC 802401EC E7B40010 */ swc1 $f20, 0x10($sp) -/* AED600 802401F0 E7A00014 */ swc1 $f0, 0x14($sp) -/* AED604 802401F4 860200A6 */ lh $v0, 0xa6($s0) -/* AED608 802401F8 27A60028 */ addiu $a2, $sp, 0x28 -/* AED60C 802401FC 44820000 */ mtc1 $v0, $f0 -/* AED610 80240200 00000000 */ nop -/* AED614 80240204 46800020 */ cvt.s.w $f0, $f0 -/* AED618 80240208 E7A00018 */ swc1 $f0, 0x18($sp) -/* AED61C 8024020C 860200A8 */ lh $v0, 0xa8($s0) -/* AED620 80240210 27A70024 */ addiu $a3, $sp, 0x24 -/* AED624 80240214 44820000 */ mtc1 $v0, $f0 -/* AED628 80240218 00000000 */ nop -/* AED62C 8024021C 46800020 */ cvt.s.w $f0, $f0 -/* AED630 80240220 0C0376B9 */ jal func_800DDAE4 -/* AED634 80240224 E7A0001C */ swc1 $f0, 0x1c($sp) -/* AED638 80240228 54400001 */ bnel $v0, $zero, .L80240230 -/* AED63C 8024022C 0000882D */ daddu $s1, $zero, $zero -.L80240230: -/* AED640 80240230 0260202D */ daddu $a0, $s3, $zero -.L80240234: -/* AED644 80240234 0280282D */ daddu $a1, $s4, $zero -/* AED648 80240238 0C0B2026 */ jal set_variable -/* AED64C 8024023C 0220302D */ daddu $a2, $s1, $zero -/* AED650 80240240 8FBF0044 */ lw $ra, 0x44($sp) -/* AED654 80240244 8FB40040 */ lw $s4, 0x40($sp) -/* AED658 80240248 8FB3003C */ lw $s3, 0x3c($sp) -/* AED65C 8024024C 8FB20038 */ lw $s2, 0x38($sp) -/* AED660 80240250 8FB10034 */ lw $s1, 0x34($sp) -/* AED664 80240254 8FB00030 */ lw $s0, 0x30($sp) -/* AED668 80240258 D7B80058 */ ldc1 $f24, 0x58($sp) -/* AED66C 8024025C D7B60050 */ ldc1 $f22, 0x50($sp) -/* AED670 80240260 D7B40048 */ ldc1 $f20, 0x48($sp) -/* AED674 80240264 24020002 */ addiu $v0, $zero, 2 -/* AED678 80240268 03E00008 */ jr $ra -/* AED67C 8024026C 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/func_80240270_AED410.s b/asm/nonmatchings/world/area_kkj/kkj_16/func_80240270_AED410.s deleted file mode 100644 index 80f7b3e787..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_16/func_80240270_AED410.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240270_AED680 -/* AED680 80240270 27BDFF80 */ addiu $sp, $sp, -0x80 -/* AED684 80240274 F7B40060 */ sdc1 $f20, 0x60($sp) -/* AED688 80240278 4485A000 */ mtc1 $a1, $f20 -/* AED68C 8024027C F7B60068 */ sdc1 $f22, 0x68($sp) -/* AED690 80240280 4486B000 */ mtc1 $a2, $f22 -/* AED694 80240284 F7B80070 */ sdc1 $f24, 0x70($sp) -/* AED698 80240288 4487C000 */ mtc1 $a3, $f24 -/* AED69C 8024028C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* AED6A0 80240290 C7BA0090 */ lwc1 $f26, 0x90($sp) -/* AED6A4 80240294 AFBF0058 */ sw $ra, 0x58($sp) -/* AED6A8 80240298 AFB10054 */ sw $s1, 0x54($sp) -/* AED6AC 8024029C 0C046C04 */ jal get_model_list_index_from_tree_index -/* AED6B0 802402A0 AFB00050 */ sw $s0, 0x50($sp) -/* AED6B4 802402A4 0C046B4C */ jal get_model_from_list_index -/* AED6B8 802402A8 0040202D */ daddu $a0, $v0, $zero -/* AED6BC 802402AC 0040802D */ daddu $s0, $v0, $zero -/* AED6C0 802402B0 26110058 */ addiu $s1, $s0, 0x58 -/* AED6C4 802402B4 4405A000 */ mfc1 $a1, $f20 -/* AED6C8 802402B8 4406B000 */ mfc1 $a2, $f22 -/* AED6CC 802402BC 4407C000 */ mfc1 $a3, $f24 -/* AED6D0 802402C0 0C019E40 */ jal guTranslateF -/* AED6D4 802402C4 0220202D */ daddu $a0, $s1, $zero -/* AED6D8 802402C8 27A40010 */ addiu $a0, $sp, 0x10 -/* AED6DC 802402CC 4405D000 */ mfc1 $a1, $f26 -/* AED6E0 802402D0 3C063F80 */ lui $a2, 0x3f80 -/* AED6E4 802402D4 0C019DF0 */ jal guScaleF -/* AED6E8 802402D8 00A0382D */ daddu $a3, $a1, $zero -/* AED6EC 802402DC 27A40010 */ addiu $a0, $sp, 0x10 -/* AED6F0 802402E0 0220282D */ daddu $a1, $s1, $zero -/* AED6F4 802402E4 0C019D80 */ jal guMtxCatF -/* AED6F8 802402E8 00A0302D */ daddu $a2, $a1, $zero -/* AED6FC 802402EC 96020000 */ lhu $v0, ($s0) -/* AED700 802402F0 34421400 */ ori $v0, $v0, 0x1400 -/* AED704 802402F4 A6020000 */ sh $v0, ($s0) -/* AED708 802402F8 8FBF0058 */ lw $ra, 0x58($sp) -/* AED70C 802402FC 8FB10054 */ lw $s1, 0x54($sp) -/* AED710 80240300 8FB00050 */ lw $s0, 0x50($sp) -/* AED714 80240304 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* AED718 80240308 D7B80070 */ ldc1 $f24, 0x70($sp) -/* AED71C 8024030C D7B60068 */ ldc1 $f22, 0x68($sp) -/* AED720 80240310 D7B40060 */ ldc1 $f20, 0x60($sp) -/* AED724 80240314 03E00008 */ jr $ra -/* AED728 80240318 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/func_8024031C_AED410.s b/asm/nonmatchings/world/area_kkj/kkj_16/func_8024031C_AED410.s deleted file mode 100644 index 108fb45edb..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_16/func_8024031C_AED410.s +++ /dev/null @@ -1,190 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024031C_AED72C -/* AED72C 8024031C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* AED730 80240320 AFB7004C */ sw $s7, 0x4c($sp) -/* AED734 80240324 0080B82D */ daddu $s7, $a0, $zero -/* AED738 80240328 AFBF0054 */ sw $ra, 0x54($sp) -/* AED73C 8024032C AFBE0050 */ sw $fp, 0x50($sp) -/* AED740 80240330 AFB60048 */ sw $s6, 0x48($sp) -/* AED744 80240334 AFB50044 */ sw $s5, 0x44($sp) -/* AED748 80240338 AFB40040 */ sw $s4, 0x40($sp) -/* AED74C 8024033C AFB3003C */ sw $s3, 0x3c($sp) -/* AED750 80240340 AFB20038 */ sw $s2, 0x38($sp) -/* AED754 80240344 AFB10034 */ sw $s1, 0x34($sp) -/* AED758 80240348 AFB00030 */ sw $s0, 0x30($sp) -/* AED75C 8024034C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* AED760 80240350 F7B80068 */ sdc1 $f24, 0x68($sp) -/* AED764 80240354 F7B60060 */ sdc1 $f22, 0x60($sp) -/* AED768 80240358 F7B40058 */ sdc1 $f20, 0x58($sp) -/* AED76C 8024035C 8EE20148 */ lw $v0, 0x148($s7) -/* AED770 80240360 0C00EABB */ jal get_npc_unsafe -/* AED774 80240364 84440008 */ lh $a0, 8($v0) -/* AED778 80240368 27B50020 */ addiu $s5, $sp, 0x20 -/* AED77C 8024036C 02A0202D */ daddu $a0, $s5, $zero -/* AED780 80240370 0040882D */ daddu $s1, $v0, $zero -/* AED784 80240374 27B40024 */ addiu $s4, $sp, 0x24 -/* AED788 80240378 8EE3000C */ lw $v1, 0xc($s7) -/* AED78C 8024037C 3C0641F0 */ lui $a2, 0x41f0 -/* AED790 80240380 8E27000C */ lw $a3, 0xc($s1) -/* AED794 80240384 C6200038 */ lwc1 $f0, 0x38($s1) -/* AED798 80240388 C6220040 */ lwc1 $f2, 0x40($s1) -/* AED79C 8024038C 8C7E0000 */ lw $fp, ($v1) -/* AED7A0 80240390 24630004 */ addiu $v1, $v1, 4 -/* AED7A4 80240394 C4740000 */ lwc1 $f20, ($v1) -/* AED7A8 80240398 4680A520 */ cvt.s.w $f20, $f20 -/* AED7AC 8024039C 24630004 */ addiu $v1, $v1, 4 -/* AED7B0 802403A0 C4760000 */ lwc1 $f22, ($v1) -/* AED7B4 802403A4 4680B5A0 */ cvt.s.w $f22, $f22 -/* AED7B8 802403A8 24630004 */ addiu $v1, $v1, 4 -/* AED7BC 802403AC C4780000 */ lwc1 $f24, ($v1) -/* AED7C0 802403B0 4680C620 */ cvt.s.w $f24, $f24 -/* AED7C4 802403B4 24630004 */ addiu $v1, $v1, 4 -/* AED7C8 802403B8 C47A0000 */ lwc1 $f26, ($v1) -/* AED7CC 802403BC 4680D6A0 */ cvt.s.w $f26, $f26 -/* AED7D0 802403C0 24630004 */ addiu $v1, $v1, 4 -/* AED7D4 802403C4 8C760000 */ lw $s6, ($v1) -/* AED7D8 802403C8 8C700004 */ lw $s0, 4($v1) -/* AED7DC 802403CC 0280282D */ daddu $a1, $s4, $zero -/* AED7E0 802403D0 E7A00020 */ swc1 $f0, 0x20($sp) -/* AED7E4 802403D4 0C00A7E7 */ jal add_vec2D_polar -/* AED7E8 802403D8 E7A20024 */ swc1 $f2, 0x24($sp) -/* AED7EC 802403DC 3C038015 */ lui $v1, %hi(D_80151328) -/* AED7F0 802403E0 8C631328 */ lw $v1, %lo(D_80151328)($v1) -/* AED7F4 802403E4 C7A00020 */ lwc1 $f0, 0x20($sp) -/* AED7F8 802403E8 3C0141A0 */ lui $at, 0x41a0 -/* AED7FC 802403EC 44811000 */ mtc1 $at, $f2 -/* AED800 802403F0 00101040 */ sll $v0, $s0, 1 -/* AED804 802403F4 00501021 */ addu $v0, $v0, $s0 -/* AED808 802403F8 000210C0 */ sll $v0, $v0, 3 -/* AED80C 802403FC 24420004 */ addiu $v0, $v0, 4 -/* AED810 80240400 00621821 */ addu $v1, $v1, $v0 -/* AED814 80240404 E4600004 */ swc1 $f0, 4($v1) -/* AED818 80240408 C620003C */ lwc1 $f0, 0x3c($s1) -/* AED81C 8024040C 4406A000 */ mfc1 $a2, $f20 -/* AED820 80240410 46020000 */ add.s $f0, $f0, $f2 -/* AED824 80240414 C7A20024 */ lwc1 $f2, 0x24($sp) -/* AED828 80240418 02A0202D */ daddu $a0, $s5, $zero -/* AED82C 8024041C E462000C */ swc1 $f2, 0xc($v1) -/* AED830 80240420 E4600008 */ swc1 $f0, 8($v1) -/* AED834 80240424 8E27000C */ lw $a3, 0xc($s1) -/* AED838 80240428 C6200038 */ lwc1 $f0, 0x38($s1) -/* AED83C 8024042C C6220040 */ lwc1 $f2, 0x40($s1) -/* AED840 80240430 0280282D */ daddu $a1, $s4, $zero -/* AED844 80240434 E7A00020 */ swc1 $f0, 0x20($sp) -/* AED848 80240438 0C00A7E7 */ jal add_vec2D_polar -/* AED84C 8024043C E7A20024 */ swc1 $f2, 0x24($sp) -/* AED850 80240440 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* AED854 80240444 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* AED858 80240448 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* AED85C 8024044C C7AE0024 */ lwc1 $f14, 0x24($sp) -/* AED860 80240450 8E460028 */ lw $a2, 0x28($s2) -/* AED864 80240454 8E470030 */ lw $a3, 0x30($s2) -/* AED868 80240458 0C00A7B5 */ jal dist2D -/* AED86C 8024045C 0000802D */ daddu $s0, $zero, $zero -/* AED870 80240460 4616003E */ c.le.s $f0, $f22 -/* AED874 80240464 00000000 */ nop -/* AED878 80240468 45000002 */ bc1f .L80240474 -/* AED87C 8024046C 0240982D */ daddu $s3, $s2, $zero -/* AED880 80240470 24100001 */ addiu $s0, $zero, 1 -.L80240474: -/* AED884 80240474 4600B021 */ cvt.d.s $f0, $f22 -/* AED888 80240478 46200000 */ add.d $f0, $f0, $f0 -/* AED88C 8024047C 3C014059 */ lui $at, 0x4059 -/* AED890 80240480 44811800 */ mtc1 $at, $f3 -/* AED894 80240484 44801000 */ mtc1 $zero, $f2 -/* AED898 80240488 3C018024 */ lui $at, 0x8024 -/* AED89C 8024048C D4244820 */ ldc1 $f4, 0x4820($at) -/* AED8A0 80240490 46220003 */ div.d $f0, $f0, $f2 -/* AED8A4 80240494 46240000 */ add.d $f0, $f0, $f4 -/* AED8A8 80240498 C7A20020 */ lwc1 $f2, 0x20($sp) -/* AED8AC 8024049C C7A40024 */ lwc1 $f4, 0x24($sp) -/* AED8B0 802404A0 44051000 */ mfc1 $a1, $f2 -/* AED8B4 802404A4 44072000 */ mfc1 $a3, $f4 -/* AED8B8 802404A8 46200020 */ cvt.s.d $f0, $f0 -/* AED8BC 802404AC E7A00010 */ swc1 $f0, 0x10($sp) -/* AED8C0 802404B0 8E26003C */ lw $a2, 0x3c($s1) -/* AED8C4 802404B4 0C09009C */ jal func_80240270 -/* AED8C8 802404B8 02C0202D */ daddu $a0, $s6, $zero -/* AED8CC 802404BC 02A0202D */ daddu $a0, $s5, $zero -/* AED8D0 802404C0 4406C000 */ mfc1 $a2, $f24 -/* AED8D4 802404C4 8E27000C */ lw $a3, 0xc($s1) -/* AED8D8 802404C8 C6200038 */ lwc1 $f0, 0x38($s1) -/* AED8DC 802404CC C6220040 */ lwc1 $f2, 0x40($s1) -/* AED8E0 802404D0 0280282D */ daddu $a1, $s4, $zero -/* AED8E4 802404D4 E7A00020 */ swc1 $f0, 0x20($sp) -/* AED8E8 802404D8 0C00A7E7 */ jal add_vec2D_polar -/* AED8EC 802404DC E7A20024 */ swc1 $f2, 0x24($sp) -/* AED8F0 802404E0 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* AED8F4 802404E4 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* AED8F8 802404E8 8E460028 */ lw $a2, 0x28($s2) -/* AED8FC 802404EC 0C00A7B5 */ jal dist2D -/* AED900 802404F0 8E470030 */ lw $a3, 0x30($s2) -/* AED904 802404F4 461A003E */ c.le.s $f0, $f26 -/* AED908 802404F8 00000000 */ nop -/* AED90C 802404FC 45030001 */ bc1tl .L80240504 -/* AED910 80240500 36100010 */ ori $s0, $s0, 0x10 -.L80240504: -/* AED914 80240504 32020001 */ andi $v0, $s0, 1 -/* AED918 80240508 10400026 */ beqz $v0, .L802405A4 -/* AED91C 8024050C 02E0202D */ daddu $a0, $s7, $zero -/* AED920 80240510 C62C0038 */ lwc1 $f12, 0x38($s1) -/* AED924 80240514 C62E0040 */ lwc1 $f14, 0x40($s1) -/* AED928 80240518 8E660028 */ lw $a2, 0x28($s3) -/* AED92C 8024051C 8E670030 */ lw $a3, 0x30($s3) -/* AED930 80240520 C622003C */ lwc1 $f2, 0x3c($s1) -/* AED934 80240524 46006006 */ mov.s $f0, $f12 -/* AED938 80240528 46007106 */ mov.s $f4, $f14 -/* AED93C 8024052C E7A00020 */ swc1 $f0, 0x20($sp) -/* AED940 80240530 E7A20028 */ swc1 $f2, 0x28($sp) -/* AED944 80240534 0C00A7B5 */ jal dist2D -/* AED948 80240538 E7A40024 */ swc1 $f4, 0x24($sp) -/* AED94C 8024053C C62C0038 */ lwc1 $f12, 0x38($s1) -/* AED950 80240540 C62E0040 */ lwc1 $f14, 0x40($s1) -/* AED954 80240544 8E660028 */ lw $a2, 0x28($s3) -/* AED958 80240548 8E670030 */ lw $a3, 0x30($s3) -/* AED95C 8024054C 0C00A720 */ jal atan2 -/* AED960 80240550 46000506 */ mov.s $f20, $f0 -/* AED964 80240554 0000202D */ daddu $a0, $zero, $zero -/* AED968 80240558 02A0282D */ daddu $a1, $s5, $zero -/* AED96C 8024055C E7B40010 */ swc1 $f20, 0x10($sp) -/* AED970 80240560 E7A00014 */ swc1 $f0, 0x14($sp) -/* AED974 80240564 862200A6 */ lh $v0, 0xa6($s1) -/* AED978 80240568 27A60028 */ addiu $a2, $sp, 0x28 -/* AED97C 8024056C 44820000 */ mtc1 $v0, $f0 -/* AED980 80240570 00000000 */ nop -/* AED984 80240574 46800020 */ cvt.s.w $f0, $f0 -/* AED988 80240578 E7A00018 */ swc1 $f0, 0x18($sp) -/* AED98C 8024057C 862200A8 */ lh $v0, 0xa8($s1) -/* AED990 80240580 0280382D */ daddu $a3, $s4, $zero -/* AED994 80240584 44820000 */ mtc1 $v0, $f0 -/* AED998 80240588 00000000 */ nop -/* AED99C 8024058C 46800020 */ cvt.s.w $f0, $f0 -/* AED9A0 80240590 0C0376B9 */ jal func_800DDAE4 -/* AED9A4 80240594 E7A0001C */ swc1 $f0, 0x1c($sp) -/* AED9A8 80240598 54400001 */ bnel $v0, $zero, .L802405A0 -/* AED9AC 8024059C 0000802D */ daddu $s0, $zero, $zero -.L802405A0: -/* AED9B0 802405A0 02E0202D */ daddu $a0, $s7, $zero -.L802405A4: -/* AED9B4 802405A4 03C0282D */ daddu $a1, $fp, $zero -/* AED9B8 802405A8 0C0B2026 */ jal set_variable -/* AED9BC 802405AC 0200302D */ daddu $a2, $s0, $zero -/* AED9C0 802405B0 8FBF0054 */ lw $ra, 0x54($sp) -/* AED9C4 802405B4 8FBE0050 */ lw $fp, 0x50($sp) -/* AED9C8 802405B8 8FB7004C */ lw $s7, 0x4c($sp) -/* AED9CC 802405BC 8FB60048 */ lw $s6, 0x48($sp) -/* AED9D0 802405C0 8FB50044 */ lw $s5, 0x44($sp) -/* AED9D4 802405C4 8FB40040 */ lw $s4, 0x40($sp) -/* AED9D8 802405C8 8FB3003C */ lw $s3, 0x3c($sp) -/* AED9DC 802405CC 8FB20038 */ lw $s2, 0x38($sp) -/* AED9E0 802405D0 8FB10034 */ lw $s1, 0x34($sp) -/* AED9E4 802405D4 8FB00030 */ lw $s0, 0x30($sp) -/* AED9E8 802405D8 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* AED9EC 802405DC D7B80068 */ ldc1 $f24, 0x68($sp) -/* AED9F0 802405E0 D7B60060 */ ldc1 $f22, 0x60($sp) -/* AED9F4 802405E4 D7B40058 */ ldc1 $f20, 0x58($sp) -/* AED9F8 802405E8 24020002 */ addiu $v0, $zero, 2 -/* AED9FC 802405EC 03E00008 */ jr $ra -/* AEDA00 802405F0 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/func_802405F4_AED410.s b/asm/nonmatchings/world/area_kkj/kkj_16/func_802405F4_AED410.s deleted file mode 100644 index 9023286e8f..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_16/func_802405F4_AED410.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F4_AEDA04 -/* AEDA04 802405F4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AEDA08 802405F8 AFB10014 */ sw $s1, 0x14($sp) -/* AEDA0C 802405FC 0080882D */ daddu $s1, $a0, $zero -/* AEDA10 80240600 AFBF0024 */ sw $ra, 0x24($sp) -/* AEDA14 80240604 AFB40020 */ sw $s4, 0x20($sp) -/* AEDA18 80240608 AFB3001C */ sw $s3, 0x1c($sp) -/* AEDA1C 8024060C AFB20018 */ sw $s2, 0x18($sp) -/* AEDA20 80240610 AFB00010 */ sw $s0, 0x10($sp) -/* AEDA24 80240614 8E30000C */ lw $s0, 0xc($s1) -/* AEDA28 80240618 8E140000 */ lw $s4, ($s0) -/* AEDA2C 8024061C 26100004 */ addiu $s0, $s0, 4 -/* AEDA30 80240620 8E050000 */ lw $a1, ($s0) -/* AEDA34 80240624 0C0B1EAF */ jal get_variable -/* AEDA38 80240628 26100004 */ addiu $s0, $s0, 4 -/* AEDA3C 8024062C 8E050000 */ lw $a1, ($s0) -/* AEDA40 80240630 26100004 */ addiu $s0, $s0, 4 -/* AEDA44 80240634 0220202D */ daddu $a0, $s1, $zero -/* AEDA48 80240638 0C0B1EAF */ jal get_variable -/* AEDA4C 8024063C 0040982D */ daddu $s3, $v0, $zero -/* AEDA50 80240640 8E050000 */ lw $a1, ($s0) -/* AEDA54 80240644 26100004 */ addiu $s0, $s0, 4 -/* AEDA58 80240648 0220202D */ daddu $a0, $s1, $zero -/* AEDA5C 8024064C 0C0B1EAF */ jal get_variable -/* AEDA60 80240650 0040902D */ daddu $s2, $v0, $zero -/* AEDA64 80240654 0220202D */ daddu $a0, $s1, $zero -/* AEDA68 80240658 8E050000 */ lw $a1, ($s0) -/* AEDA6C 8024065C 0C0B1EAF */ jal get_variable -/* AEDA70 80240660 0040802D */ daddu $s0, $v0, $zero -/* AEDA74 80240664 44901000 */ mtc1 $s0, $f2 -/* AEDA78 80240668 00000000 */ nop -/* AEDA7C 8024066C 468010A0 */ cvt.s.w $f2, $f2 -/* AEDA80 80240670 44936000 */ mtc1 $s3, $f12 -/* AEDA84 80240674 00000000 */ nop -/* AEDA88 80240678 46806320 */ cvt.s.w $f12, $f12 -/* AEDA8C 8024067C 44061000 */ mfc1 $a2, $f2 -/* AEDA90 80240680 44821000 */ mtc1 $v0, $f2 -/* AEDA94 80240684 00000000 */ nop -/* AEDA98 80240688 468010A0 */ cvt.s.w $f2, $f2 -/* AEDA9C 8024068C 44071000 */ mfc1 $a3, $f2 -/* AEDAA0 80240690 44927000 */ mtc1 $s2, $f14 -/* AEDAA4 80240694 00000000 */ nop -/* AEDAA8 80240698 0C00A720 */ jal atan2 -/* AEDAAC 8024069C 468073A0 */ cvt.s.w $f14, $f14 -/* AEDAB0 802406A0 0220202D */ daddu $a0, $s1, $zero -/* AEDAB4 802406A4 4600008D */ trunc.w.s $f2, $f0 -/* AEDAB8 802406A8 44061000 */ mfc1 $a2, $f2 -/* AEDABC 802406AC 0C0B2026 */ jal set_variable -/* AEDAC0 802406B0 0280282D */ daddu $a1, $s4, $zero -/* AEDAC4 802406B4 8FBF0024 */ lw $ra, 0x24($sp) -/* AEDAC8 802406B8 8FB40020 */ lw $s4, 0x20($sp) -/* AEDACC 802406BC 8FB3001C */ lw $s3, 0x1c($sp) -/* AEDAD0 802406C0 8FB20018 */ lw $s2, 0x18($sp) -/* AEDAD4 802406C4 8FB10014 */ lw $s1, 0x14($sp) -/* AEDAD8 802406C8 8FB00010 */ lw $s0, 0x10($sp) -/* AEDADC 802406CC 24020002 */ addiu $v0, $zero, 2 -/* AEDAE0 802406D0 03E00008 */ jr $ra -/* AEDAE4 802406D4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/func_80240B0C_AED410.s b/asm/nonmatchings/world/area_kkj/kkj_16/func_80240B0C_AED410.s deleted file mode 100644 index e9559c8020..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_16/func_80240B0C_AED410.s +++ /dev/null @@ -1,190 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B0C_AEDF1C -/* AEDF1C 80240B0C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* AEDF20 80240B10 AFB7004C */ sw $s7, 0x4c($sp) -/* AEDF24 80240B14 0080B82D */ daddu $s7, $a0, $zero -/* AEDF28 80240B18 AFBF0054 */ sw $ra, 0x54($sp) -/* AEDF2C 80240B1C AFBE0050 */ sw $fp, 0x50($sp) -/* AEDF30 80240B20 AFB60048 */ sw $s6, 0x48($sp) -/* AEDF34 80240B24 AFB50044 */ sw $s5, 0x44($sp) -/* AEDF38 80240B28 AFB40040 */ sw $s4, 0x40($sp) -/* AEDF3C 80240B2C AFB3003C */ sw $s3, 0x3c($sp) -/* AEDF40 80240B30 AFB20038 */ sw $s2, 0x38($sp) -/* AEDF44 80240B34 AFB10034 */ sw $s1, 0x34($sp) -/* AEDF48 80240B38 AFB00030 */ sw $s0, 0x30($sp) -/* AEDF4C 80240B3C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* AEDF50 80240B40 F7B80068 */ sdc1 $f24, 0x68($sp) -/* AEDF54 80240B44 F7B60060 */ sdc1 $f22, 0x60($sp) -/* AEDF58 80240B48 F7B40058 */ sdc1 $f20, 0x58($sp) -/* AEDF5C 80240B4C 8EE20148 */ lw $v0, 0x148($s7) -/* AEDF60 80240B50 0C00EABB */ jal get_npc_unsafe -/* AEDF64 80240B54 84440008 */ lh $a0, 8($v0) -/* AEDF68 80240B58 27B50020 */ addiu $s5, $sp, 0x20 -/* AEDF6C 80240B5C 02A0202D */ daddu $a0, $s5, $zero -/* AEDF70 80240B60 0040882D */ daddu $s1, $v0, $zero -/* AEDF74 80240B64 27B40024 */ addiu $s4, $sp, 0x24 -/* AEDF78 80240B68 8EE3000C */ lw $v1, 0xc($s7) -/* AEDF7C 80240B6C 3C0641F0 */ lui $a2, 0x41f0 -/* AEDF80 80240B70 8E27000C */ lw $a3, 0xc($s1) -/* AEDF84 80240B74 C6200038 */ lwc1 $f0, 0x38($s1) -/* AEDF88 80240B78 C6220040 */ lwc1 $f2, 0x40($s1) -/* AEDF8C 80240B7C 8C7E0000 */ lw $fp, ($v1) -/* AEDF90 80240B80 24630004 */ addiu $v1, $v1, 4 -/* AEDF94 80240B84 C4740000 */ lwc1 $f20, ($v1) -/* AEDF98 80240B88 4680A520 */ cvt.s.w $f20, $f20 -/* AEDF9C 80240B8C 24630004 */ addiu $v1, $v1, 4 -/* AEDFA0 80240B90 C4760000 */ lwc1 $f22, ($v1) -/* AEDFA4 80240B94 4680B5A0 */ cvt.s.w $f22, $f22 -/* AEDFA8 80240B98 24630004 */ addiu $v1, $v1, 4 -/* AEDFAC 80240B9C C4780000 */ lwc1 $f24, ($v1) -/* AEDFB0 80240BA0 4680C620 */ cvt.s.w $f24, $f24 -/* AEDFB4 80240BA4 24630004 */ addiu $v1, $v1, 4 -/* AEDFB8 80240BA8 C47A0000 */ lwc1 $f26, ($v1) -/* AEDFBC 80240BAC 4680D6A0 */ cvt.s.w $f26, $f26 -/* AEDFC0 80240BB0 24630004 */ addiu $v1, $v1, 4 -/* AEDFC4 80240BB4 8C760000 */ lw $s6, ($v1) -/* AEDFC8 80240BB8 8C700004 */ lw $s0, 4($v1) -/* AEDFCC 80240BBC 0280282D */ daddu $a1, $s4, $zero -/* AEDFD0 80240BC0 E7A00020 */ swc1 $f0, 0x20($sp) -/* AEDFD4 80240BC4 0C00A7E7 */ jal add_vec2D_polar -/* AEDFD8 80240BC8 E7A20024 */ swc1 $f2, 0x24($sp) -/* AEDFDC 80240BCC 3C038015 */ lui $v1, %hi(D_80151328) -/* AEDFE0 80240BD0 8C631328 */ lw $v1, %lo(D_80151328)($v1) -/* AEDFE4 80240BD4 C7A00020 */ lwc1 $f0, 0x20($sp) -/* AEDFE8 80240BD8 3C0141A0 */ lui $at, 0x41a0 -/* AEDFEC 80240BDC 44811000 */ mtc1 $at, $f2 -/* AEDFF0 80240BE0 00101040 */ sll $v0, $s0, 1 -/* AEDFF4 80240BE4 00501021 */ addu $v0, $v0, $s0 -/* AEDFF8 80240BE8 000210C0 */ sll $v0, $v0, 3 -/* AEDFFC 80240BEC 24420004 */ addiu $v0, $v0, 4 -/* AEE000 80240BF0 00621821 */ addu $v1, $v1, $v0 -/* AEE004 80240BF4 E4600004 */ swc1 $f0, 4($v1) -/* AEE008 80240BF8 C620003C */ lwc1 $f0, 0x3c($s1) -/* AEE00C 80240BFC 4406A000 */ mfc1 $a2, $f20 -/* AEE010 80240C00 46020000 */ add.s $f0, $f0, $f2 -/* AEE014 80240C04 C7A20024 */ lwc1 $f2, 0x24($sp) -/* AEE018 80240C08 02A0202D */ daddu $a0, $s5, $zero -/* AEE01C 80240C0C E462000C */ swc1 $f2, 0xc($v1) -/* AEE020 80240C10 E4600008 */ swc1 $f0, 8($v1) -/* AEE024 80240C14 8E27000C */ lw $a3, 0xc($s1) -/* AEE028 80240C18 C6200038 */ lwc1 $f0, 0x38($s1) -/* AEE02C 80240C1C C6220040 */ lwc1 $f2, 0x40($s1) -/* AEE030 80240C20 0280282D */ daddu $a1, $s4, $zero -/* AEE034 80240C24 E7A00020 */ swc1 $f0, 0x20($sp) -/* AEE038 80240C28 0C00A7E7 */ jal add_vec2D_polar -/* AEE03C 80240C2C E7A20024 */ swc1 $f2, 0x24($sp) -/* AEE040 80240C30 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* AEE044 80240C34 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* AEE048 80240C38 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* AEE04C 80240C3C C7AE0024 */ lwc1 $f14, 0x24($sp) -/* AEE050 80240C40 8E460028 */ lw $a2, 0x28($s2) -/* AEE054 80240C44 8E470030 */ lw $a3, 0x30($s2) -/* AEE058 80240C48 0C00A7B5 */ jal dist2D -/* AEE05C 80240C4C 0000802D */ daddu $s0, $zero, $zero -/* AEE060 80240C50 4616003E */ c.le.s $f0, $f22 -/* AEE064 80240C54 00000000 */ nop -/* AEE068 80240C58 45000002 */ bc1f .L80240C64 -/* AEE06C 80240C5C 0240982D */ daddu $s3, $s2, $zero -/* AEE070 80240C60 24100001 */ addiu $s0, $zero, 1 -.L80240C64: -/* AEE074 80240C64 4600B021 */ cvt.d.s $f0, $f22 -/* AEE078 80240C68 46200000 */ add.d $f0, $f0, $f0 -/* AEE07C 80240C6C 3C014059 */ lui $at, 0x4059 -/* AEE080 80240C70 44811800 */ mtc1 $at, $f3 -/* AEE084 80240C74 44801000 */ mtc1 $zero, $f2 -/* AEE088 80240C78 3C018024 */ lui $at, 0x8024 -/* AEE08C 80240C7C D4244840 */ ldc1 $f4, 0x4840($at) -/* AEE090 80240C80 46220003 */ div.d $f0, $f0, $f2 -/* AEE094 80240C84 46240000 */ add.d $f0, $f0, $f4 -/* AEE098 80240C88 C7A20020 */ lwc1 $f2, 0x20($sp) -/* AEE09C 80240C8C C7A40024 */ lwc1 $f4, 0x24($sp) -/* AEE0A0 80240C90 44051000 */ mfc1 $a1, $f2 -/* AEE0A4 80240C94 44072000 */ mfc1 $a3, $f4 -/* AEE0A8 80240C98 46200020 */ cvt.s.d $f0, $f0 -/* AEE0AC 80240C9C E7A00010 */ swc1 $f0, 0x10($sp) -/* AEE0B0 80240CA0 8E26003C */ lw $a2, 0x3c($s1) -/* AEE0B4 80240CA4 0C090298 */ jal func_80240A60 -/* AEE0B8 80240CA8 02C0202D */ daddu $a0, $s6, $zero -/* AEE0BC 80240CAC 02A0202D */ daddu $a0, $s5, $zero -/* AEE0C0 80240CB0 4406C000 */ mfc1 $a2, $f24 -/* AEE0C4 80240CB4 8E27000C */ lw $a3, 0xc($s1) -/* AEE0C8 80240CB8 C6200038 */ lwc1 $f0, 0x38($s1) -/* AEE0CC 80240CBC C6220040 */ lwc1 $f2, 0x40($s1) -/* AEE0D0 80240CC0 0280282D */ daddu $a1, $s4, $zero -/* AEE0D4 80240CC4 E7A00020 */ swc1 $f0, 0x20($sp) -/* AEE0D8 80240CC8 0C00A7E7 */ jal add_vec2D_polar -/* AEE0DC 80240CCC E7A20024 */ swc1 $f2, 0x24($sp) -/* AEE0E0 80240CD0 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* AEE0E4 80240CD4 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* AEE0E8 80240CD8 8E460028 */ lw $a2, 0x28($s2) -/* AEE0EC 80240CDC 0C00A7B5 */ jal dist2D -/* AEE0F0 80240CE0 8E470030 */ lw $a3, 0x30($s2) -/* AEE0F4 80240CE4 461A003E */ c.le.s $f0, $f26 -/* AEE0F8 80240CE8 00000000 */ nop -/* AEE0FC 80240CEC 45030001 */ bc1tl .L80240CF4 -/* AEE100 80240CF0 36100010 */ ori $s0, $s0, 0x10 -.L80240CF4: -/* AEE104 80240CF4 32020001 */ andi $v0, $s0, 1 -/* AEE108 80240CF8 10400026 */ beqz $v0, .L80240D94 -/* AEE10C 80240CFC 02E0202D */ daddu $a0, $s7, $zero -/* AEE110 80240D00 C62C0038 */ lwc1 $f12, 0x38($s1) -/* AEE114 80240D04 C62E0040 */ lwc1 $f14, 0x40($s1) -/* AEE118 80240D08 8E660028 */ lw $a2, 0x28($s3) -/* AEE11C 80240D0C 8E670030 */ lw $a3, 0x30($s3) -/* AEE120 80240D10 C622003C */ lwc1 $f2, 0x3c($s1) -/* AEE124 80240D14 46006006 */ mov.s $f0, $f12 -/* AEE128 80240D18 46007106 */ mov.s $f4, $f14 -/* AEE12C 80240D1C E7A00020 */ swc1 $f0, 0x20($sp) -/* AEE130 80240D20 E7A20028 */ swc1 $f2, 0x28($sp) -/* AEE134 80240D24 0C00A7B5 */ jal dist2D -/* AEE138 80240D28 E7A40024 */ swc1 $f4, 0x24($sp) -/* AEE13C 80240D2C C62C0038 */ lwc1 $f12, 0x38($s1) -/* AEE140 80240D30 C62E0040 */ lwc1 $f14, 0x40($s1) -/* AEE144 80240D34 8E660028 */ lw $a2, 0x28($s3) -/* AEE148 80240D38 8E670030 */ lw $a3, 0x30($s3) -/* AEE14C 80240D3C 0C00A720 */ jal atan2 -/* AEE150 80240D40 46000506 */ mov.s $f20, $f0 -/* AEE154 80240D44 0000202D */ daddu $a0, $zero, $zero -/* AEE158 80240D48 02A0282D */ daddu $a1, $s5, $zero -/* AEE15C 80240D4C E7B40010 */ swc1 $f20, 0x10($sp) -/* AEE160 80240D50 E7A00014 */ swc1 $f0, 0x14($sp) -/* AEE164 80240D54 862200A6 */ lh $v0, 0xa6($s1) -/* AEE168 80240D58 27A60028 */ addiu $a2, $sp, 0x28 -/* AEE16C 80240D5C 44820000 */ mtc1 $v0, $f0 -/* AEE170 80240D60 00000000 */ nop -/* AEE174 80240D64 46800020 */ cvt.s.w $f0, $f0 -/* AEE178 80240D68 E7A00018 */ swc1 $f0, 0x18($sp) -/* AEE17C 80240D6C 862200A8 */ lh $v0, 0xa8($s1) -/* AEE180 80240D70 0280382D */ daddu $a3, $s4, $zero -/* AEE184 80240D74 44820000 */ mtc1 $v0, $f0 -/* AEE188 80240D78 00000000 */ nop -/* AEE18C 80240D7C 46800020 */ cvt.s.w $f0, $f0 -/* AEE190 80240D80 0C0376B9 */ jal func_800DDAE4 -/* AEE194 80240D84 E7A0001C */ swc1 $f0, 0x1c($sp) -/* AEE198 80240D88 54400001 */ bnel $v0, $zero, .L80240D90 -/* AEE19C 80240D8C 0000802D */ daddu $s0, $zero, $zero -.L80240D90: -/* AEE1A0 80240D90 02E0202D */ daddu $a0, $s7, $zero -.L80240D94: -/* AEE1A4 80240D94 03C0282D */ daddu $a1, $fp, $zero -/* AEE1A8 80240D98 0C0B2026 */ jal set_variable -/* AEE1AC 80240D9C 0200302D */ daddu $a2, $s0, $zero -/* AEE1B0 80240DA0 8FBF0054 */ lw $ra, 0x54($sp) -/* AEE1B4 80240DA4 8FBE0050 */ lw $fp, 0x50($sp) -/* AEE1B8 80240DA8 8FB7004C */ lw $s7, 0x4c($sp) -/* AEE1BC 80240DAC 8FB60048 */ lw $s6, 0x48($sp) -/* AEE1C0 80240DB0 8FB50044 */ lw $s5, 0x44($sp) -/* AEE1C4 80240DB4 8FB40040 */ lw $s4, 0x40($sp) -/* AEE1C8 80240DB8 8FB3003C */ lw $s3, 0x3c($sp) -/* AEE1CC 80240DBC 8FB20038 */ lw $s2, 0x38($sp) -/* AEE1D0 80240DC0 8FB10034 */ lw $s1, 0x34($sp) -/* AEE1D4 80240DC4 8FB00030 */ lw $s0, 0x30($sp) -/* AEE1D8 80240DC8 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* AEE1DC 80240DCC D7B80068 */ ldc1 $f24, 0x68($sp) -/* AEE1E0 80240DD0 D7B60060 */ ldc1 $f22, 0x60($sp) -/* AEE1E4 80240DD4 D7B40058 */ ldc1 $f20, 0x58($sp) -/* AEE1E8 80240DD8 24020002 */ addiu $v0, $zero, 2 -/* AEE1EC 80240DDC 03E00008 */ jr $ra -/* AEE1F0 80240DE0 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/func_80240EF4_AED410.s b/asm/nonmatchings/world/area_kkj/kkj_16/func_80240EF4_AED410.s deleted file mode 100644 index 14da3722ff..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_16/func_80240EF4_AED410.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EF4_AEE304 -/* AEE304 80240EF4 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* AEE308 80240EF8 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* AEE30C 80240EFC 9062007E */ lbu $v0, 0x7e($v1) -/* AEE310 80240F00 34420008 */ ori $v0, $v0, 8 -/* AEE314 80240F04 A062007E */ sb $v0, 0x7e($v1) -/* AEE318 80240F08 03E00008 */ jr $ra -/* AEE31C 80240F0C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/func_802400B4_AF1C60.s b/asm/nonmatchings/world/area_kkj/kkj_17/func_802400B4_AF1C60.s deleted file mode 100644 index 7248ebe6ce..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_17/func_802400B4_AF1C60.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_AF1D14 -/* AF1D14 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AF1D18 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* AF1D1C 802400BC 0080802D */ daddu $s0, $a0, $zero -/* AF1D20 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* AF1D24 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* AF1D28 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* AF1D2C 802400CC 8C510000 */ lw $s1, ($v0) -/* AF1D30 802400D0 0C0B1EAF */ jal get_variable -/* AF1D34 802400D4 0220282D */ daddu $a1, $s1, $zero -/* AF1D38 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* AF1D3C 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* AF1D40 802400E0 0200202D */ daddu $a0, $s0, $zero -/* AF1D44 802400E4 00431024 */ and $v0, $v0, $v1 -/* AF1D48 802400E8 00021140 */ sll $v0, $v0, 5 -/* AF1D4C 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* AF1D50 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* AF1D54 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* AF1D58 802400F8 0C0B2026 */ jal set_variable -/* AF1D5C 802400FC 0220282D */ daddu $a1, $s1, $zero -/* AF1D60 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* AF1D64 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* AF1D68 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* AF1D6C 8024010C 24020002 */ addiu $v0, $zero, 2 -/* AF1D70 80240110 03E00008 */ jr $ra -/* AF1D74 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/func_80240118_AF1C60.s b/asm/nonmatchings/world/area_kkj/kkj_17/func_80240118_AF1C60.s deleted file mode 100644 index 7fb46ed2bc..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_17/func_80240118_AF1C60.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_17/func_80240268_AF1C60.s b/asm/nonmatchings/world/area_kkj/kkj_17/func_80240268_AF1C60.s deleted file mode 100644 index 150d71f6ff..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_17/func_80240268_AF1C60.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_AF1EC8 -/* AF1EC8 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF1ECC 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* AF1ED0 80240270 0080802D */ daddu $s0, $a0, $zero -/* AF1ED4 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* AF1ED8 80240278 8E02000C */ lw $v0, 0xc($s0) -/* AF1EDC 8024027C 0C0B1EAF */ jal get_variable -/* AF1EE0 80240280 8C450000 */ lw $a1, ($v0) -/* AF1EE4 80240284 00021140 */ sll $v0, $v0, 5 -/* AF1EE8 80240288 AE000084 */ sw $zero, 0x84($s0) -/* AF1EEC 8024028C 3C018008 */ lui $at, 0x8008 -/* AF1EF0 80240290 00220821 */ addu $at, $at, $v0 -/* AF1EF4 80240294 942278F8 */ lhu $v0, 0x78f8($at) -/* AF1EF8 80240298 30420040 */ andi $v0, $v0, 0x40 -/* AF1EFC 8024029C 10400002 */ beqz $v0, .L802402A8 -/* AF1F00 802402A0 24020001 */ addiu $v0, $zero, 1 -/* AF1F04 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* AF1F08 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* AF1F0C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* AF1F10 802402B0 24020002 */ addiu $v0, $zero, 2 -/* AF1F14 802402B4 03E00008 */ jr $ra -/* AF1F18 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/func_802402BC_AF1C60.s b/asm/nonmatchings/world/area_kkj/kkj_17/func_802402BC_AF1C60.s deleted file mode 100644 index 5f7a4f4c25..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_17/func_802402BC_AF1C60.s +++ /dev/null @@ -1,162 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402BC_AF1F1C -/* AF1F1C 802402BC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* AF1F20 802402C0 AFB3001C */ sw $s3, 0x1c($sp) -/* AF1F24 802402C4 0080982D */ daddu $s3, $a0, $zero -/* AF1F28 802402C8 AFBF0034 */ sw $ra, 0x34($sp) -/* AF1F2C 802402CC AFBE0030 */ sw $fp, 0x30($sp) -/* AF1F30 802402D0 AFB7002C */ sw $s7, 0x2c($sp) -/* AF1F34 802402D4 AFB60028 */ sw $s6, 0x28($sp) -/* AF1F38 802402D8 AFB50024 */ sw $s5, 0x24($sp) -/* AF1F3C 802402DC AFB40020 */ sw $s4, 0x20($sp) -/* AF1F40 802402E0 AFB20018 */ sw $s2, 0x18($sp) -/* AF1F44 802402E4 AFB10014 */ sw $s1, 0x14($sp) -/* AF1F48 802402E8 10A0004C */ beqz $a1, .L8024041C -/* AF1F4C 802402EC AFB00010 */ sw $s0, 0x10($sp) -/* AF1F50 802402F0 0C00AB39 */ jal heap_malloc -/* AF1F54 802402F4 24040330 */ addiu $a0, $zero, 0x330 -/* AF1F58 802402F8 8E630084 */ lw $v1, 0x84($s3) -/* AF1F5C 802402FC 0040A82D */ daddu $s5, $v0, $zero -/* AF1F60 80240300 AE750078 */ sw $s5, 0x78($s3) -/* AF1F64 80240304 0060202D */ daddu $a0, $v1, $zero -/* AF1F68 80240308 14800008 */ bnez $a0, .L8024032C -/* AF1F6C 8024030C AE6300AC */ sw $v1, 0xac($s3) -/* AF1F70 80240310 3C03F840 */ lui $v1, 0xf840 -/* AF1F74 80240314 34635D64 */ ori $v1, $v1, 0x5d64 -/* AF1F78 80240318 3C02F840 */ lui $v0, 0xf840 -/* AF1F7C 8024031C 34425D69 */ ori $v0, $v0, 0x5d69 -/* AF1F80 80240320 AE62008C */ sw $v0, 0x8c($s3) -/* AF1F84 80240324 080900D1 */ j .L80240344 -/* AF1F88 80240328 2402000C */ addiu $v0, $zero, 0xc -.L8024032C: -/* AF1F8C 8024032C 3C03F840 */ lui $v1, 0xf840 -/* AF1F90 80240330 34635D69 */ ori $v1, $v1, 0x5d69 -/* AF1F94 80240334 3C02F840 */ lui $v0, 0xf840 -/* AF1F98 80240338 34425D6E */ ori $v0, $v0, 0x5d6e -/* AF1F9C 8024033C AE62008C */ sw $v0, 0x8c($s3) -/* AF1FA0 80240340 24020009 */ addiu $v0, $zero, 9 -.L80240344: -/* AF1FA4 80240344 AE630088 */ sw $v1, 0x88($s3) -/* AF1FA8 80240348 AEA20318 */ sw $v0, 0x318($s5) -/* AF1FAC 8024034C 0000B02D */ daddu $s6, $zero, $zero -/* AF1FB0 80240350 02C0902D */ daddu $s2, $s6, $zero -/* AF1FB4 80240354 3C1E8009 */ lui $fp, 0x8009 -/* AF1FB8 80240358 27DEA680 */ addiu $fp, $fp, -0x5980 -/* AF1FBC 8024035C 24170001 */ addiu $s7, $zero, 1 -/* AF1FC0 80240360 3C148024 */ lui $s4, 0x8024 -/* AF1FC4 80240364 2694092C */ addiu $s4, $s4, 0x92c -/* AF1FC8 80240368 02A0882D */ daddu $s1, $s5, $zero -.L8024036C: -/* AF1FCC 8024036C 8E650088 */ lw $a1, 0x88($s3) -/* AF1FD0 80240370 0000202D */ daddu $a0, $zero, $zero -/* AF1FD4 80240374 0C0B1EAF */ jal get_variable -/* AF1FD8 80240378 00B22821 */ addu $a1, $a1, $s2 -/* AF1FDC 8024037C 0000202D */ daddu $a0, $zero, $zero -/* AF1FE0 80240380 8E65008C */ lw $a1, 0x8c($s3) -/* AF1FE4 80240384 0040802D */ daddu $s0, $v0, $zero -/* AF1FE8 80240388 0C0B1EAF */ jal get_variable -/* AF1FEC 8024038C 00B22821 */ addu $a1, $a1, $s2 -/* AF1FF0 80240390 52000016 */ beql $s0, $zero, .L802403EC -/* AF1FF4 80240394 26520001 */ addiu $s2, $s2, 1 -/* AF1FF8 80240398 54400014 */ bnel $v0, $zero, .L802403EC -/* AF1FFC 8024039C 26520001 */ addiu $s2, $s2, 1 -/* AF2000 802403A0 8E830000 */ lw $v1, ($s4) -/* AF2004 802403A4 3C078008 */ lui $a3, %hi(gItemTable) -/* AF2008 802403A8 24E778E0 */ addiu $a3, $a3, %lo(gItemTable) -/* AF200C 802403AC 00031940 */ sll $v1, $v1, 5 -/* AF2010 802403B0 00671821 */ addu $v1, $v1, $a3 -/* AF2014 802403B4 84620004 */ lh $v0, 4($v1) -/* AF2018 802403B8 000210C0 */ sll $v0, $v0, 3 -/* AF201C 802403BC 005E1021 */ addu $v0, $v0, $fp -/* AF2020 802403C0 8C420000 */ lw $v0, ($v0) -/* AF2024 802403C4 AE320108 */ sw $s2, 0x108($s1) -/* AF2028 802403C8 AE37018C */ sw $s7, 0x18c($s1) -/* AF202C 802403CC AE220000 */ sw $v0, ($s1) -/* AF2030 802403D0 8C620000 */ lw $v0, ($v1) -/* AF2034 802403D4 AE220084 */ sw $v0, 0x84($s1) -/* AF2038 802403D8 8C620014 */ lw $v0, 0x14($v1) -/* AF203C 802403DC 26D60001 */ addiu $s6, $s6, 1 -/* AF2040 802403E0 AE220294 */ sw $v0, 0x294($s1) -/* AF2044 802403E4 26310004 */ addiu $s1, $s1, 4 -/* AF2048 802403E8 26520001 */ addiu $s2, $s2, 1 -.L802403EC: -/* AF204C 802403EC 2A420005 */ slti $v0, $s2, 5 -/* AF2050 802403F0 1440FFDE */ bnez $v0, .L8024036C -/* AF2054 802403F4 26940004 */ addiu $s4, $s4, 4 -/* AF2058 802403F8 16C00004 */ bnez $s6, .L8024040C -/* AF205C 802403FC 02A0202D */ daddu $a0, $s5, $zero -/* AF2060 80240400 AE600084 */ sw $zero, 0x84($s3) -/* AF2064 80240404 08090134 */ j .L802404D0 -/* AF2068 80240408 24020001 */ addiu $v0, $zero, 1 -.L8024040C: -/* AF206C 8024040C AC960324 */ sw $s6, 0x324($a0) -/* AF2070 80240410 0C03D390 */ jal func_800F4E40 -/* AF2074 80240414 AC800328 */ sw $zero, 0x328($a0) -/* AF2078 80240418 AE600070 */ sw $zero, 0x70($s3) -.L8024041C: -/* AF207C 8024041C 8E620070 */ lw $v0, 0x70($s3) -/* AF2080 80240420 8E750078 */ lw $s5, 0x78($s3) -/* AF2084 80240424 14400008 */ bnez $v0, .L80240448 -/* AF2088 80240428 24420001 */ addiu $v0, $v0, 1 -/* AF208C 8024042C 86A2032C */ lh $v0, 0x32c($s5) -/* AF2090 80240430 10400009 */ beqz $v0, .L80240458 -/* AF2094 80240434 AE620074 */ sw $v0, 0x74($s3) -/* AF2098 80240438 0C03C4EC */ jal func_800F13B0 -/* AF209C 8024043C 00000000 */ nop -/* AF20A0 80240440 8E620070 */ lw $v0, 0x70($s3) -/* AF20A4 80240444 24420001 */ addiu $v0, $v0, 1 -.L80240448: -/* AF20A8 80240448 AE620070 */ sw $v0, 0x70($s3) -/* AF20AC 8024044C 2842000F */ slti $v0, $v0, 0xf -/* AF20B0 80240450 10400003 */ beqz $v0, .L80240460 -/* AF20B4 80240454 00000000 */ nop -.L80240458: -/* AF20B8 80240458 08090134 */ j .L802404D0 -/* AF20BC 8024045C 0000102D */ daddu $v0, $zero, $zero -.L80240460: -/* AF20C0 80240460 0C03C54E */ jal func_800F1538 -/* AF20C4 80240464 00000000 */ nop -/* AF20C8 80240468 8E630074 */ lw $v1, 0x74($s3) -/* AF20CC 8024046C 240200FF */ addiu $v0, $zero, 0xff -/* AF20D0 80240470 14620004 */ bne $v1, $v0, .L80240484 -/* AF20D4 80240474 2462FFFF */ addiu $v0, $v1, -1 -/* AF20D8 80240478 2402FFFF */ addiu $v0, $zero, -1 -/* AF20DC 8024047C 08090133 */ j .L802404CC -/* AF20E0 80240480 AE620084 */ sw $v0, 0x84($s3) -.L80240484: -/* AF20E4 80240484 00021080 */ sll $v0, $v0, 2 -/* AF20E8 80240488 02A21021 */ addu $v0, $s5, $v0 -/* AF20EC 8024048C 8C460108 */ lw $a2, 0x108($v0) -/* AF20F0 80240490 8E6300AC */ lw $v1, 0xac($s3) -/* AF20F4 80240494 00061080 */ sll $v0, $a2, 2 -/* AF20F8 80240498 3C018024 */ lui $at, 0x8024 -/* AF20FC 8024049C 00220821 */ addu $at, $at, $v0 -/* AF2100 802404A0 8C22092C */ lw $v0, 0x92c($at) -/* AF2104 802404A4 14600006 */ bnez $v1, .L802404C0 -/* AF2108 802404A8 AE620084 */ sw $v0, 0x84($s3) -/* AF210C 802404AC 8E65008C */ lw $a1, 0x8c($s3) -/* AF2110 802404B0 0000202D */ daddu $a0, $zero, $zero -/* AF2114 802404B4 00A62821 */ addu $a1, $a1, $a2 -/* AF2118 802404B8 0C0B2026 */ jal set_variable -/* AF211C 802404BC 24060001 */ addiu $a2, $zero, 1 -.L802404C0: -/* AF2120 802404C0 8E640078 */ lw $a0, 0x78($s3) -/* AF2124 802404C4 0C00AB4B */ jal heap_free -/* AF2128 802404C8 00000000 */ nop -.L802404CC: -/* AF212C 802404CC 24020002 */ addiu $v0, $zero, 2 -.L802404D0: -/* AF2130 802404D0 8FBF0034 */ lw $ra, 0x34($sp) -/* AF2134 802404D4 8FBE0030 */ lw $fp, 0x30($sp) -/* AF2138 802404D8 8FB7002C */ lw $s7, 0x2c($sp) -/* AF213C 802404DC 8FB60028 */ lw $s6, 0x28($sp) -/* AF2140 802404E0 8FB50024 */ lw $s5, 0x24($sp) -/* AF2144 802404E4 8FB40020 */ lw $s4, 0x20($sp) -/* AF2148 802404E8 8FB3001C */ lw $s3, 0x1c($sp) -/* AF214C 802404EC 8FB20018 */ lw $s2, 0x18($sp) -/* AF2150 802404F0 8FB10014 */ lw $s1, 0x14($sp) -/* AF2154 802404F4 8FB00010 */ lw $s0, 0x10($sp) -/* AF2158 802404F8 03E00008 */ jr $ra -/* AF215C 802404FC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/func_80240500_AF1C60.s b/asm/nonmatchings/world/area_kkj/kkj_17/func_80240500_AF1C60.s deleted file mode 100644 index 9e50212de9..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_17/func_80240500_AF1C60.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_AF2160 -/* AF2160 80240500 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF2164 80240504 0000282D */ daddu $a1, $zero, $zero -/* AF2168 80240508 00A0302D */ daddu $a2, $a1, $zero -/* AF216C 8024050C 3C038024 */ lui $v1, 0x8024 -/* AF2170 80240510 2463092C */ addiu $v1, $v1, 0x92c -/* AF2174 80240514 AFBF0010 */ sw $ra, 0x10($sp) -/* AF2178 80240518 8C840084 */ lw $a0, 0x84($a0) -.L8024051C: -/* AF217C 8024051C 8C620000 */ lw $v0, ($v1) -/* AF2180 80240520 54820003 */ bnel $a0, $v0, .L80240530 -/* AF2184 80240524 24C60001 */ addiu $a2, $a2, 1 -/* AF2188 80240528 0809014F */ j .L8024053C -/* AF218C 8024052C 24050001 */ addiu $a1, $zero, 1 -.L80240530: -/* AF2190 80240530 28C20005 */ slti $v0, $a2, 5 -/* AF2194 80240534 1440FFF9 */ bnez $v0, .L8024051C -/* AF2198 80240538 24630004 */ addiu $v1, $v1, 4 -.L8024053C: -/* AF219C 8024053C 10A00006 */ beqz $a1, .L80240558 -/* AF21A0 80240540 3C05F840 */ lui $a1, 0xf840 -/* AF21A4 80240544 34A55D6E */ ori $a1, $a1, 0x5d6e -/* AF21A8 80240548 0000202D */ daddu $a0, $zero, $zero -/* AF21AC 8024054C 00C52821 */ addu $a1, $a2, $a1 -/* AF21B0 80240550 0C0B2026 */ jal set_variable -/* AF21B4 80240554 24060001 */ addiu $a2, $zero, 1 -.L80240558: -/* AF21B8 80240558 8FBF0010 */ lw $ra, 0x10($sp) -/* AF21BC 8024055C 24020002 */ addiu $v0, $zero, 2 -/* AF21C0 80240560 03E00008 */ jr $ra -/* AF21C4 80240564 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/func_80240568_AF1C60.s b/asm/nonmatchings/world/area_kkj/kkj_17/func_80240568_AF1C60.s deleted file mode 100644 index 6b3b571c5b..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_17/func_80240568_AF1C60.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_AF21C8 -/* AF21C8 80240568 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF21CC 8024056C AFB00010 */ sw $s0, 0x10($sp) -/* AF21D0 80240570 AFBF0014 */ sw $ra, 0x14($sp) -/* AF21D4 80240574 0C039D88 */ jal get_item_empty_count -/* AF21D8 80240578 0080802D */ daddu $s0, $a0, $zero -/* AF21DC 8024057C AE020088 */ sw $v0, 0x88($s0) -/* AF21E0 80240580 8FBF0014 */ lw $ra, 0x14($sp) -/* AF21E4 80240584 8FB00010 */ lw $s0, 0x10($sp) -/* AF21E8 80240588 24020002 */ addiu $v0, $zero, 2 -/* AF21EC 8024058C 03E00008 */ jr $ra -/* AF21F0 80240590 27BD0018 */ addiu $sp, $sp, 0x18 -/* AF21F4 80240594 00000000 */ nop -/* AF21F8 80240598 00000000 */ nop -/* AF21FC 8024059C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/func_80240124_AF2CA0.s b/asm/nonmatchings/world/area_kkj/kkj_18/func_80240124_AF2CA0.s deleted file mode 100644 index f20340357c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_18/func_80240124_AF2CA0.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_AF2DC4 -/* AF2DC4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF2DC8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* AF2DCC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* AF2DD0 80240130 10A00005 */ beqz $a1, .L80240148 -/* AF2DD4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* AF2DD8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* AF2DDC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* AF2DE0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* AF2DE4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* AF2DE8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* AF2DEC 8024014C 1440000E */ bnez $v0, .L80240188 -/* AF2DF0 80240150 00000000 */ nop -/* AF2DF4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* AF2DF8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* AF2DFC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* AF2E00 80240160 04610004 */ bgez $v1, .L80240174 -/* AF2E04 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* AF2E08 80240168 3C020002 */ lui $v0, 2 -/* AF2E0C 8024016C 08090061 */ j .L80240184 -/* AF2E10 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* AF2E14 80240174 3C040002 */ lui $a0, 2 -/* AF2E18 80240178 0083102A */ slt $v0, $a0, $v1 -/* AF2E1C 8024017C 10400002 */ beqz $v0, .L80240188 -/* AF2E20 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* AF2E24 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* AF2E28 80240188 8E020074 */ lw $v0, 0x74($s0) -/* AF2E2C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* AF2E30 80240190 00000000 */ nop -/* AF2E34 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* AF2E38 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* AF2E3C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* AF2E40 802401A0 04610004 */ bgez $v1, .L802401B4 -/* AF2E44 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* AF2E48 802401A8 3C020002 */ lui $v0, 2 -/* AF2E4C 802401AC 08090071 */ j .L802401C4 -/* AF2E50 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* AF2E54 802401B4 3C040002 */ lui $a0, 2 -/* AF2E58 802401B8 0083102A */ slt $v0, $a0, $v1 -/* AF2E5C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* AF2E60 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* AF2E64 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* AF2E68 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* AF2E6C 802401CC 1440000E */ bnez $v0, .L80240208 -/* AF2E70 802401D0 00000000 */ nop -/* AF2E74 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* AF2E78 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* AF2E7C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* AF2E80 802401E0 04610004 */ bgez $v1, .L802401F4 -/* AF2E84 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* AF2E88 802401E8 3C020002 */ lui $v0, 2 -/* AF2E8C 802401EC 08090081 */ j .L80240204 -/* AF2E90 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* AF2E94 802401F4 3C040002 */ lui $a0, 2 -/* AF2E98 802401F8 0083102A */ slt $v0, $a0, $v1 -/* AF2E9C 802401FC 10400002 */ beqz $v0, .L80240208 -/* AF2EA0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* AF2EA4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* AF2EA8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* AF2EAC 8024020C 1440000E */ bnez $v0, .L80240248 -/* AF2EB0 80240210 00000000 */ nop -/* AF2EB4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* AF2EB8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* AF2EBC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* AF2EC0 80240220 04610004 */ bgez $v1, .L80240234 -/* AF2EC4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* AF2EC8 80240228 3C020002 */ lui $v0, 2 -/* AF2ECC 8024022C 08090091 */ j .L80240244 -/* AF2ED0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* AF2ED4 80240234 3C040002 */ lui $a0, 2 -/* AF2ED8 80240238 0083102A */ slt $v0, $a0, $v1 -/* AF2EDC 8024023C 10400002 */ beqz $v0, .L80240248 -/* AF2EE0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* AF2EE4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* AF2EE8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* AF2EEC 8024024C 0C046F07 */ jal set_main_pan_u -/* AF2EF0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* AF2EF4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* AF2EF8 80240258 0C046F0D */ jal set_main_pan_v -/* AF2EFC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* AF2F00 80240260 8E040084 */ lw $a0, 0x84($s0) -/* AF2F04 80240264 0C046F13 */ jal set_aux_pan_u -/* AF2F08 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* AF2F0C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* AF2F10 80240270 0C046F19 */ jal set_aux_pan_v -/* AF2F14 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* AF2F18 80240278 8E020070 */ lw $v0, 0x70($s0) -/* AF2F1C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* AF2F20 80240280 8E040098 */ lw $a0, 0x98($s0) -/* AF2F24 80240284 24420001 */ addiu $v0, $v0, 1 -/* AF2F28 80240288 AE020070 */ sw $v0, 0x70($s0) -/* AF2F2C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* AF2F30 80240290 24630001 */ addiu $v1, $v1, 1 -/* AF2F34 80240294 AE030078 */ sw $v1, 0x78($s0) -/* AF2F38 80240298 8E030070 */ lw $v1, 0x70($s0) -/* AF2F3C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* AF2F40 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* AF2F44 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* AF2F48 802402A8 0064182A */ slt $v1, $v1, $a0 -/* AF2F4C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* AF2F50 802402B0 14600002 */ bnez $v1, .L802402BC -/* AF2F54 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* AF2F58 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* AF2F5C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* AF2F60 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* AF2F64 802402C4 0043102A */ slt $v0, $v0, $v1 -/* AF2F68 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* AF2F6C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* AF2F70 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* AF2F74 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* AF2F78 802402D8 0043102A */ slt $v0, $v0, $v1 -/* AF2F7C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* AF2F80 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* AF2F84 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* AF2F88 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* AF2F8C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* AF2F90 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* AF2F94 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* AF2F98 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* AF2F9C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* AF2FA0 80240300 0000102D */ daddu $v0, $zero, $zero -/* AF2FA4 80240304 03E00008 */ jr $ra -/* AF2FA8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/func_8024030C_AF2CA0.s b/asm/nonmatchings/world/area_kkj/kkj_18/func_8024030C_AF2CA0.s deleted file mode 100644 index a5f8b01d5f..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_18/func_8024030C_AF2CA0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_AF2FAC -/* AF2FAC 8024030C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* AF2FB0 80240310 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* AF2FB4 80240314 9043007E */ lbu $v1, 0x7e($v0) -/* AF2FB8 80240318 306300FE */ andi $v1, $v1, 0xfe -/* AF2FBC 8024031C A043007E */ sb $v1, 0x7e($v0) -/* AF2FC0 80240320 90820087 */ lbu $v0, 0x87($a0) -/* AF2FC4 80240324 3C018011 */ lui $at, 0x8011 -/* AF2FC8 80240328 A022F2A2 */ sb $v0, -0xd5e($at) -/* AF2FCC 8024032C 03E00008 */ jr $ra -/* AF2FD0 80240330 24020002 */ addiu $v0, $zero, 2 -/* AF2FD4 80240334 00000000 */ nop -/* AF2FD8 80240338 00000000 */ nop -/* AF2FDC 8024033C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/func_80240340_AF2CA0.s b/asm/nonmatchings/world/area_kkj/kkj_18/func_80240340_AF2CA0.s deleted file mode 100644 index e9122cea30..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_18/func_80240340_AF2CA0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240340_AF2FE0 -/* AF2FE0 80240340 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AF2FE4 80240344 AFB10014 */ sw $s1, 0x14($sp) -/* AF2FE8 80240348 0080882D */ daddu $s1, $a0, $zero -/* AF2FEC 8024034C AFBF0018 */ sw $ra, 0x18($sp) -/* AF2FF0 80240350 AFB00010 */ sw $s0, 0x10($sp) -/* AF2FF4 80240354 8E30000C */ lw $s0, 0xc($s1) -/* AF2FF8 80240358 8E050000 */ lw $a1, ($s0) -/* AF2FFC 8024035C 0C0B1EAF */ jal get_variable -/* AF3000 80240360 26100004 */ addiu $s0, $s0, 4 -/* AF3004 80240364 0C00EAD2 */ jal get_npc_safe -/* AF3008 80240368 0040202D */ daddu $a0, $v0, $zero -/* AF300C 8024036C 10400005 */ beqz $v0, .L80240384 -/* AF3010 80240370 00000000 */ nop -/* AF3014 80240374 8E050000 */ lw $a1, ($s0) -/* AF3018 80240378 844600A8 */ lh $a2, 0xa8($v0) -/* AF301C 8024037C 0C0B2026 */ jal set_variable -/* AF3020 80240380 0220202D */ daddu $a0, $s1, $zero -.L80240384: -/* AF3024 80240384 8FBF0018 */ lw $ra, 0x18($sp) -/* AF3028 80240388 8FB10014 */ lw $s1, 0x14($sp) -/* AF302C 8024038C 8FB00010 */ lw $s0, 0x10($sp) -/* AF3030 80240390 24020002 */ addiu $v0, $zero, 2 -/* AF3034 80240394 03E00008 */ jr $ra -/* AF3038 80240398 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/func_8024056C_AF2CA0.s b/asm/nonmatchings/world/area_kkj/kkj_18/func_8024056C_AF2CA0.s deleted file mode 100644 index 88b46ac5f8..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_18/func_8024056C_AF2CA0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024056C_AF320C -/* AF320C 8024056C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF3210 80240570 AFBF0010 */ sw $ra, 0x10($sp) -/* AF3214 80240574 10A00003 */ beqz $a1, .L80240584 -/* AF3218 80240578 8C86000C */ lw $a2, 0xc($a0) -/* AF321C 8024057C 3C018024 */ lui $at, 0x8024 -/* AF3220 80240580 AC201F10 */ sw $zero, 0x1f10($at) -.L80240584: -/* AF3224 80240584 3C038024 */ lui $v1, 0x8024 -/* AF3228 80240588 24631F10 */ addiu $v1, $v1, 0x1f10 -/* AF322C 8024058C 8C620000 */ lw $v0, ($v1) -/* AF3230 80240590 54400003 */ bnel $v0, $zero, .L802405A0 -/* AF3234 80240594 AC600000 */ sw $zero, ($v1) -/* AF3238 80240598 0809016D */ j .L802405B4 -/* AF323C 8024059C 0000102D */ daddu $v0, $zero, $zero -.L802405A0: -/* AF3240 802405A0 8CC50000 */ lw $a1, ($a2) -/* AF3244 802405A4 3C068024 */ lui $a2, 0x8024 -/* AF3248 802405A8 0C0B2026 */ jal set_variable -/* AF324C 802405AC 8CC61F14 */ lw $a2, 0x1f14($a2) -/* AF3250 802405B0 24020002 */ addiu $v0, $zero, 2 -.L802405B4: -/* AF3254 802405B4 8FBF0010 */ lw $ra, 0x10($sp) -/* AF3258 802405B8 03E00008 */ jr $ra -/* AF325C 802405BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/func_802405C0_AF2CA0.s b/asm/nonmatchings/world/area_kkj/kkj_18/func_802405C0_AF2CA0.s deleted file mode 100644 index aeda168184..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_18/func_802405C0_AF2CA0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405C0_AF3260 -/* AF3260 802405C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF3264 802405C4 AFBF0010 */ sw $ra, 0x10($sp) -/* AF3268 802405C8 8C82000C */ lw $v0, 0xc($a0) -/* AF326C 802405CC 0C0B1EAF */ jal get_variable -/* AF3270 802405D0 8C450000 */ lw $a1, ($v0) -/* AF3274 802405D4 3C018024 */ lui $at, 0x8024 -/* AF3278 802405D8 AC221F14 */ sw $v0, 0x1f14($at) -/* AF327C 802405DC 24020002 */ addiu $v0, $zero, 2 -/* AF3280 802405E0 8FBF0010 */ lw $ra, 0x10($sp) -/* AF3284 802405E4 24030001 */ addiu $v1, $zero, 1 -/* AF3288 802405E8 3C018024 */ lui $at, 0x8024 -/* AF328C 802405EC AC231F10 */ sw $v1, 0x1f10($at) -/* AF3290 802405F0 03E00008 */ jr $ra -/* AF3294 802405F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/func_802405F8_AF2CA0.s b/asm/nonmatchings/world/area_kkj/kkj_18/func_802405F8_AF2CA0.s deleted file mode 100644 index e016b97610..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_18/func_802405F8_AF2CA0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F8_AF3298 -/* AF3298 802405F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF329C 802405FC AFBF0010 */ sw $ra, 0x10($sp) -/* AF32A0 80240600 8C82000C */ lw $v0, 0xc($a0) -/* AF32A4 80240604 0C0B1EAF */ jal get_variable -/* AF32A8 80240608 8C450000 */ lw $a1, ($v0) -/* AF32AC 8024060C 0040182D */ daddu $v1, $v0, $zero -/* AF32B0 80240610 10600012 */ beqz $v1, .L8024065C -/* AF32B4 80240614 0000202D */ daddu $a0, $zero, $zero -/* AF32B8 80240618 8C620000 */ lw $v0, ($v1) -/* AF32BC 8024061C 5040000A */ beql $v0, $zero, .L80240648 -/* AF32C0 80240620 00041080 */ sll $v0, $a0, 2 -/* AF32C4 80240624 3C058024 */ lui $a1, 0x8024 -/* AF32C8 80240628 24A54CB0 */ addiu $a1, $a1, 0x4cb0 -.L8024062C: -/* AF32CC 8024062C 24630004 */ addiu $v1, $v1, 4 -/* AF32D0 80240630 24840001 */ addiu $a0, $a0, 1 -/* AF32D4 80240634 ACA20000 */ sw $v0, ($a1) -/* AF32D8 80240638 8C620000 */ lw $v0, ($v1) -/* AF32DC 8024063C 1440FFFB */ bnez $v0, .L8024062C -/* AF32E0 80240640 24A50004 */ addiu $a1, $a1, 4 -/* AF32E4 80240644 00041080 */ sll $v0, $a0, 2 -.L80240648: -/* AF32E8 80240648 3C018024 */ lui $at, 0x8024 -/* AF32EC 8024064C 00220821 */ addu $at, $at, $v0 -/* AF32F0 80240650 AC204CB0 */ sw $zero, 0x4cb0($at) -/* AF32F4 80240654 080901A1 */ j .L80240684 -/* AF32F8 80240658 00000000 */ nop -.L8024065C: -/* AF32FC 8024065C 3C038024 */ lui $v1, 0x8024 -/* AF3300 80240660 24634CB0 */ addiu $v1, $v1, 0x4cb0 -/* AF3304 80240664 0060282D */ daddu $a1, $v1, $zero -.L80240668: -/* AF3308 80240668 24820010 */ addiu $v0, $a0, 0x10 -/* AF330C 8024066C AC620000 */ sw $v0, ($v1) -/* AF3310 80240670 24630004 */ addiu $v1, $v1, 4 -/* AF3314 80240674 24840001 */ addiu $a0, $a0, 1 -/* AF3318 80240678 28820070 */ slti $v0, $a0, 0x70 -/* AF331C 8024067C 1440FFFA */ bnez $v0, .L80240668 -/* AF3320 80240680 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80240684: -/* AF3324 80240684 8FBF0010 */ lw $ra, 0x10($sp) -/* AF3328 80240688 24020002 */ addiu $v0, $zero, 2 -/* AF332C 8024068C 03E00008 */ jr $ra -/* AF3330 80240690 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/func_80240694_AF2CA0.s b/asm/nonmatchings/world/area_kkj/kkj_18/func_80240694_AF2CA0.s deleted file mode 100644 index 8dff8f507e..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_18/func_80240694_AF2CA0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240694_AF3334 -/* AF3334 80240694 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF3338 80240698 AFBF0010 */ sw $ra, 0x10($sp) -/* AF333C 8024069C 8C82000C */ lw $v0, 0xc($a0) -/* AF3340 802406A0 0C0B1EAF */ jal get_variable -/* AF3344 802406A4 8C450000 */ lw $a1, ($v0) -/* AF3348 802406A8 0040182D */ daddu $v1, $v0, $zero -/* AF334C 802406AC 10600012 */ beqz $v1, .L802406F8 -/* AF3350 802406B0 0000202D */ daddu $a0, $zero, $zero -/* AF3354 802406B4 8C620000 */ lw $v0, ($v1) -/* AF3358 802406B8 5040000A */ beql $v0, $zero, .L802406E4 -/* AF335C 802406BC 00041080 */ sll $v0, $a0, 2 -/* AF3360 802406C0 3C058024 */ lui $a1, 0x8024 -/* AF3364 802406C4 24A54E78 */ addiu $a1, $a1, 0x4e78 -.L802406C8: -/* AF3368 802406C8 24630004 */ addiu $v1, $v1, 4 -/* AF336C 802406CC 24840001 */ addiu $a0, $a0, 1 -/* AF3370 802406D0 ACA20000 */ sw $v0, ($a1) -/* AF3374 802406D4 8C620000 */ lw $v0, ($v1) -/* AF3378 802406D8 1440FFFB */ bnez $v0, .L802406C8 -/* AF337C 802406DC 24A50004 */ addiu $a1, $a1, 4 -/* AF3380 802406E0 00041080 */ sll $v0, $a0, 2 -.L802406E4: -/* AF3384 802406E4 3C018024 */ lui $at, 0x8024 -/* AF3388 802406E8 00220821 */ addu $at, $at, $v0 -/* AF338C 802406EC AC204E78 */ sw $zero, 0x4e78($at) -/* AF3390 802406F0 080901C8 */ j .L80240720 -/* AF3394 802406F4 00000000 */ nop -.L802406F8: -/* AF3398 802406F8 3C038024 */ lui $v1, 0x8024 -/* AF339C 802406FC 24634E78 */ addiu $v1, $v1, 0x4e78 -/* AF33A0 80240700 0060282D */ daddu $a1, $v1, $zero -.L80240704: -/* AF33A4 80240704 24820080 */ addiu $v0, $a0, 0x80 -/* AF33A8 80240708 AC620000 */ sw $v0, ($v1) -/* AF33AC 8024070C 24630004 */ addiu $v1, $v1, 4 -/* AF33B0 80240710 24840001 */ addiu $a0, $a0, 1 -/* AF33B4 80240714 2882005B */ slti $v0, $a0, 0x5b -/* AF33B8 80240718 1440FFFA */ bnez $v0, .L80240704 -/* AF33BC 8024071C ACA0016C */ sw $zero, 0x16c($a1) -.L80240720: -/* AF33C0 80240720 8FBF0010 */ lw $ra, 0x10($sp) -/* AF33C4 80240724 24020002 */ addiu $v0, $zero, 2 -/* AF33C8 80240728 03E00008 */ jr $ra -/* AF33CC 8024072C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/func_80240730_AF2CA0.s b/asm/nonmatchings/world/area_kkj/kkj_18/func_80240730_AF2CA0.s deleted file mode 100644 index 52f74b189e..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_18/func_80240730_AF2CA0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_AF33D0 -/* AF33D0 80240730 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF33D4 80240734 AFBF0010 */ sw $ra, 0x10($sp) -/* AF33D8 80240738 8C82000C */ lw $v0, 0xc($a0) -/* AF33DC 8024073C 0C0B210B */ jal get_float_variable -/* AF33E0 80240740 8C450000 */ lw $a1, ($v0) -/* AF33E4 80240744 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* AF33E8 80240748 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* AF33EC 8024074C 4600008D */ trunc.w.s $f2, $f0 -/* AF33F0 80240750 44021000 */ mfc1 $v0, $f2 -/* AF33F4 80240754 00000000 */ nop -/* AF33F8 80240758 3C018011 */ lui $at, 0x8011 -/* AF33FC 8024075C A022F08C */ sb $v0, -0xf74($at) -/* AF3400 80240760 A0620080 */ sb $v0, 0x80($v1) -/* AF3404 80240764 8FBF0010 */ lw $ra, 0x10($sp) -/* AF3408 80240768 24020002 */ addiu $v0, $zero, 2 -/* AF340C 8024076C 03E00008 */ jr $ra -/* AF3410 80240770 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/func_80240068_AF7950.s b/asm/nonmatchings/world/area_kkj/kkj_19/func_80240068_AF7950.s deleted file mode 100644 index a12fae7772..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/func_80240068_AF7950.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240068_AF79B8 -/* AF79B8 80240068 3C028024 */ lui $v0, 0x8024 -/* AF79BC 8024006C 8C420E88 */ lw $v0, 0xe88($v0) -/* AF79C0 80240070 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF79C4 80240074 AFBF0014 */ sw $ra, 0x14($sp) -/* AF79C8 80240078 10400005 */ beqz $v0, .L80240090 -/* AF79CC 8024007C AFB00010 */ sw $s0, 0x10($sp) -/* AF79D0 80240080 3C108014 */ lui $s0, %hi(D_80147474) -/* AF79D4 80240084 26107474 */ addiu $s0, $s0, %lo(D_80147474) -/* AF79D8 80240088 08090027 */ j .L8024009C -/* AF79DC 8024008C 2404000A */ addiu $a0, $zero, 0xa -.L80240090: -/* AF79E0 80240090 2404000A */ addiu $a0, $zero, 0xa -/* AF79E4 80240094 3C108014 */ lui $s0, %hi(D_80147574) -/* AF79E8 80240098 26107574 */ addiu $s0, $s0, %lo(D_80147574) -.L8024009C: -/* AF79EC 8024009C 0C051F9F */ jal func_80147E7C -/* AF79F0 802400A0 0200282D */ daddu $a1, $s0, $zero -/* AF79F4 802400A4 2404000B */ addiu $a0, $zero, 0xb -/* AF79F8 802400A8 0C051F9F */ jal func_80147E7C -/* AF79FC 802400AC 0200282D */ daddu $a1, $s0, $zero -/* AF7A00 802400B0 3C038024 */ lui $v1, 0x8024 -/* AF7A04 802400B4 24630E8C */ addiu $v1, $v1, 0xe8c -/* AF7A08 802400B8 8C620000 */ lw $v0, ($v1) -/* AF7A0C 802400BC 18400003 */ blez $v0, .L802400CC -/* AF7A10 802400C0 2442FFFF */ addiu $v0, $v0, -1 -/* AF7A14 802400C4 08090035 */ j .L802400D4 -/* AF7A18 802400C8 AC620000 */ sw $v0, ($v1) -.L802400CC: -/* AF7A1C 802400CC 3C018024 */ lui $at, 0x8024 -/* AF7A20 802400D0 AC200E88 */ sw $zero, 0xe88($at) -.L802400D4: -/* AF7A24 802400D4 8FBF0014 */ lw $ra, 0x14($sp) -/* AF7A28 802400D8 8FB00010 */ lw $s0, 0x10($sp) -/* AF7A2C 802400DC 03E00008 */ jr $ra -/* AF7A30 802400E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/func_802401FC_AF7950.s b/asm/nonmatchings/world/area_kkj/kkj_19/func_802401FC_AF7950.s deleted file mode 100644 index 4c1bfca704..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/func_802401FC_AF7950.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401FC_AF7B4C -/* AF7B4C 802401FC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AF7B50 80240200 3C048024 */ lui $a0, 0x8024 -/* AF7B54 80240204 24840068 */ addiu $a0, $a0, 0x68 -/* AF7B58 80240208 AFBF0024 */ sw $ra, 0x24($sp) -/* AF7B5C 8024020C AFB20020 */ sw $s2, 0x20($sp) -/* AF7B60 80240210 AFB1001C */ sw $s1, 0x1c($sp) -/* AF7B64 80240214 AFB00018 */ sw $s0, 0x18($sp) -/* AF7B68 80240218 3C018024 */ lui $at, 0x8024 -/* AF7B6C 8024021C AC200E88 */ sw $zero, 0xe88($at) -/* AF7B70 80240220 3C018024 */ lui $at, 0x8024 -/* AF7B74 80240224 AC200E8C */ sw $zero, 0xe8c($at) -/* AF7B78 80240228 3C018024 */ lui $at, 0x8024 -/* AF7B7C 8024022C AC200E90 */ sw $zero, 0xe90($at) -/* AF7B80 80240230 0C048C8F */ jal bind_dynamic_entity_7 -/* AF7B84 80240234 0000282D */ daddu $a1, $zero, $zero -/* AF7B88 80240238 0C048D8F */ jal get_dynamic_entity -/* AF7B8C 8024023C 0040202D */ daddu $a0, $v0, $zero -/* AF7B90 80240240 3C048024 */ lui $a0, 0x8024 -/* AF7B94 80240244 24840EF0 */ addiu $a0, $a0, 0xef0 -/* AF7B98 80240248 0C051FCC */ jal func_80147F30 -/* AF7B9C 8024024C 24050002 */ addiu $a1, $zero, 2 -/* AF7BA0 80240250 0000802D */ daddu $s0, $zero, $zero -/* AF7BA4 80240254 24120003 */ addiu $s2, $zero, 3 -/* AF7BA8 80240258 3C118024 */ lui $s1, 0x8024 -/* AF7BAC 8024025C 26310E10 */ addiu $s1, $s1, 0xe10 -.L80240260: -/* AF7BB0 80240260 3C048024 */ lui $a0, 0x8024 -/* AF7BB4 80240264 24840E94 */ addiu $a0, $a0, 0xe94 -/* AF7BB8 80240268 24050080 */ addiu $a1, $zero, 0x80 -/* AF7BBC 8024026C AFA00010 */ sw $zero, 0x10($sp) -/* AF7BC0 80240270 AFB20014 */ sw $s2, 0x14($sp) -/* AF7BC4 80240274 8E260004 */ lw $a2, 4($s1) -/* AF7BC8 80240278 2631000C */ addiu $s1, $s1, 0xc -/* AF7BCC 8024027C 0200382D */ daddu $a3, $s0, $zero -/* AF7BD0 80240280 0C0B10AA */ jal bind_trigger_1 -/* AF7BD4 80240284 26100001 */ addiu $s0, $s0, 1 -/* AF7BD8 80240288 2A02000A */ slti $v0, $s0, 0xa -/* AF7BDC 8024028C 1440FFF4 */ bnez $v0, .L80240260 -/* AF7BE0 80240290 24020002 */ addiu $v0, $zero, 2 -/* AF7BE4 80240294 8FBF0024 */ lw $ra, 0x24($sp) -/* AF7BE8 80240298 8FB20020 */ lw $s2, 0x20($sp) -/* AF7BEC 8024029C 8FB1001C */ lw $s1, 0x1c($sp) -/* AF7BF0 802402A0 8FB00018 */ lw $s0, 0x18($sp) -/* AF7BF4 802402A4 03E00008 */ jr $ra -/* AF7BF8 802402A8 27BD0028 */ addiu $sp, $sp, 0x28 -/* AF7BFC 802402AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/func_802402B0_AF7950.s b/asm/nonmatchings/world/area_kkj/kkj_19/func_802402B0_AF7950.s deleted file mode 100644 index ced3183d7c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/func_802402B0_AF7950.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402B0_AF7C00 -/* AF7C00 802402B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AF7C04 802402B4 AFB10014 */ sw $s1, 0x14($sp) -/* AF7C08 802402B8 0080882D */ daddu $s1, $a0, $zero -/* AF7C0C 802402BC AFBF0018 */ sw $ra, 0x18($sp) -/* AF7C10 802402C0 AFB00010 */ sw $s0, 0x10($sp) -/* AF7C14 802402C4 8E30000C */ lw $s0, 0xc($s1) -/* AF7C18 802402C8 8E050000 */ lw $a1, ($s0) -/* AF7C1C 802402CC 0C0B1EAF */ jal get_variable -/* AF7C20 802402D0 26100004 */ addiu $s0, $s0, 4 -/* AF7C24 802402D4 0C00EAD2 */ jal get_npc_safe -/* AF7C28 802402D8 0040202D */ daddu $a0, $v0, $zero -/* AF7C2C 802402DC 10400005 */ beqz $v0, .L802402F4 -/* AF7C30 802402E0 00000000 */ nop -/* AF7C34 802402E4 8E050000 */ lw $a1, ($s0) -/* AF7C38 802402E8 844600A8 */ lh $a2, 0xa8($v0) -/* AF7C3C 802402EC 0C0B2026 */ jal set_variable -/* AF7C40 802402F0 0220202D */ daddu $a0, $s1, $zero -.L802402F4: -/* AF7C44 802402F4 8FBF0018 */ lw $ra, 0x18($sp) -/* AF7C48 802402F8 8FB10014 */ lw $s1, 0x14($sp) -/* AF7C4C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* AF7C50 80240300 24020002 */ addiu $v0, $zero, 2 -/* AF7C54 80240304 03E00008 */ jr $ra -/* AF7C58 80240308 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/func_8024030C_AF7950.s b/asm/nonmatchings/world/area_kkj/kkj_19/func_8024030C_AF7950.s deleted file mode 100644 index 80d074bcb7..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/func_8024030C_AF7950.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_AF7C5C -/* AF7C5C 8024030C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* AF7C60 80240310 AFB10014 */ sw $s1, 0x14($sp) -/* AF7C64 80240314 0080882D */ daddu $s1, $a0, $zero -/* AF7C68 80240318 AFBF0024 */ sw $ra, 0x24($sp) -/* AF7C6C 8024031C AFB40020 */ sw $s4, 0x20($sp) -/* AF7C70 80240320 AFB3001C */ sw $s3, 0x1c($sp) -/* AF7C74 80240324 AFB20018 */ sw $s2, 0x18($sp) -/* AF7C78 80240328 AFB00010 */ sw $s0, 0x10($sp) -/* AF7C7C 8024032C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* AF7C80 80240330 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* AF7C84 80240334 F7B80038 */ sdc1 $f24, 0x38($sp) -/* AF7C88 80240338 F7B60030 */ sdc1 $f22, 0x30($sp) -/* AF7C8C 8024033C F7B40028 */ sdc1 $f20, 0x28($sp) -/* AF7C90 80240340 8E30000C */ lw $s0, 0xc($s1) -/* AF7C94 80240344 8E130000 */ lw $s3, ($s0) -/* AF7C98 80240348 26100004 */ addiu $s0, $s0, 4 -/* AF7C9C 8024034C 0C0B1EAF */ jal get_variable -/* AF7CA0 80240350 0260282D */ daddu $a1, $s3, $zero -/* AF7CA4 80240354 4482E000 */ mtc1 $v0, $f28 -/* AF7CA8 80240358 00000000 */ nop -/* AF7CAC 8024035C 4680E720 */ cvt.s.w $f28, $f28 -/* AF7CB0 80240360 8E140000 */ lw $s4, ($s0) -/* AF7CB4 80240364 26100004 */ addiu $s0, $s0, 4 -/* AF7CB8 80240368 0220202D */ daddu $a0, $s1, $zero -/* AF7CBC 8024036C 0C0B1EAF */ jal get_variable -/* AF7CC0 80240370 0280282D */ daddu $a1, $s4, $zero -/* AF7CC4 80240374 4482D000 */ mtc1 $v0, $f26 -/* AF7CC8 80240378 00000000 */ nop -/* AF7CCC 8024037C 4680D6A0 */ cvt.s.w $f26, $f26 -/* AF7CD0 80240380 8E100000 */ lw $s0, ($s0) -/* AF7CD4 80240384 0220202D */ daddu $a0, $s1, $zero -/* AF7CD8 80240388 0C0B1EAF */ jal get_variable -/* AF7CDC 8024038C 0200282D */ daddu $a1, $s0, $zero -/* AF7CE0 80240390 4482C000 */ mtc1 $v0, $f24 -/* AF7CE4 80240394 00000000 */ nop -/* AF7CE8 80240398 4680C620 */ cvt.s.w $f24, $f24 -/* AF7CEC 8024039C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* AF7CF0 802403A0 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* AF7CF4 802403A4 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* AF7CF8 802403A8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* AF7CFC 802403AC C64200A8 */ lwc1 $f2, 0xa8($s2) -/* AF7D00 802403B0 44800000 */ mtc1 $zero, $f0 -/* AF7D04 802403B4 00031080 */ sll $v0, $v1, 2 -/* AF7D08 802403B8 00431021 */ addu $v0, $v0, $v1 -/* AF7D0C 802403BC 00021080 */ sll $v0, $v0, 2 -/* AF7D10 802403C0 00431023 */ subu $v0, $v0, $v1 -/* AF7D14 802403C4 000218C0 */ sll $v1, $v0, 3 -/* AF7D18 802403C8 00431021 */ addu $v0, $v0, $v1 -/* AF7D1C 802403CC 000210C0 */ sll $v0, $v0, 3 -/* AF7D20 802403D0 46001032 */ c.eq.s $f2, $f0 -/* AF7D24 802403D4 3C01800B */ lui $at, 0x800b -/* AF7D28 802403D8 00220821 */ addu $at, $at, $v0 -/* AF7D2C 802403DC C4361DEC */ lwc1 $f22, 0x1dec($at) -/* AF7D30 802403E0 45000005 */ bc1f .L802403F8 -/* AF7D34 802403E4 00000000 */ nop -/* AF7D38 802403E8 3C0142C8 */ lui $at, 0x42c8 -/* AF7D3C 802403EC 44810000 */ mtc1 $at, $f0 -/* AF7D40 802403F0 08090102 */ j .L80240408 -/* AF7D44 802403F4 4600B581 */ sub.s $f22, $f22, $f0 -.L802403F8: -/* AF7D48 802403F8 3C0142C8 */ lui $at, 0x42c8 -/* AF7D4C 802403FC 44810000 */ mtc1 $at, $f0 -/* AF7D50 80240400 00000000 */ nop -/* AF7D54 80240404 4600B580 */ add.s $f22, $f22, $f0 -.L80240408: -/* AF7D58 80240408 0C00A6C9 */ jal clamp_angle -/* AF7D5C 8024040C 4600B306 */ mov.s $f12, $f22 -/* AF7D60 80240410 46000586 */ mov.s $f22, $f0 -/* AF7D64 80240414 3C014170 */ lui $at, 0x4170 -/* AF7D68 80240418 4481A000 */ mtc1 $at, $f20 -/* AF7D6C 8024041C 0C00A8BB */ jal sin_deg -/* AF7D70 80240420 4600B306 */ mov.s $f12, $f22 -/* AF7D74 80240424 46140002 */ mul.s $f0, $f0, $f20 -/* AF7D78 80240428 00000000 */ nop -/* AF7D7C 8024042C 864200B0 */ lh $v0, 0xb0($s2) -/* AF7D80 80240430 3C013F00 */ lui $at, 0x3f00 -/* AF7D84 80240434 44812000 */ mtc1 $at, $f4 -/* AF7D88 80240438 44821000 */ mtc1 $v0, $f2 -/* AF7D8C 8024043C 00000000 */ nop -/* AF7D90 80240440 468010A0 */ cvt.s.w $f2, $f2 -/* AF7D94 80240444 46041082 */ mul.s $f2, $f2, $f4 -/* AF7D98 80240448 00000000 */ nop -/* AF7D9C 8024044C 4600E700 */ add.s $f28, $f28, $f0 -/* AF7DA0 80240450 4602D680 */ add.s $f26, $f26, $f2 -/* AF7DA4 80240454 0C00A8D4 */ jal cos_deg -/* AF7DA8 80240458 4600B306 */ mov.s $f12, $f22 -/* AF7DAC 8024045C 46140002 */ mul.s $f0, $f0, $f20 -/* AF7DB0 80240460 00000000 */ nop -/* AF7DB4 80240464 0220202D */ daddu $a0, $s1, $zero -/* AF7DB8 80240468 0260282D */ daddu $a1, $s3, $zero -/* AF7DBC 8024046C 4600E18D */ trunc.w.s $f6, $f28 -/* AF7DC0 80240470 44063000 */ mfc1 $a2, $f6 -/* AF7DC4 80240474 0C0B2026 */ jal set_variable -/* AF7DC8 80240478 4600C601 */ sub.s $f24, $f24, $f0 -/* AF7DCC 8024047C 0220202D */ daddu $a0, $s1, $zero -/* AF7DD0 80240480 4600D18D */ trunc.w.s $f6, $f26 -/* AF7DD4 80240484 44063000 */ mfc1 $a2, $f6 -/* AF7DD8 80240488 0C0B2026 */ jal set_variable -/* AF7DDC 8024048C 0280282D */ daddu $a1, $s4, $zero -/* AF7DE0 80240490 0220202D */ daddu $a0, $s1, $zero -/* AF7DE4 80240494 4600C18D */ trunc.w.s $f6, $f24 -/* AF7DE8 80240498 44063000 */ mfc1 $a2, $f6 -/* AF7DEC 8024049C 0C0B2026 */ jal set_variable -/* AF7DF0 802404A0 0200282D */ daddu $a1, $s0, $zero -/* AF7DF4 802404A4 8FBF0024 */ lw $ra, 0x24($sp) -/* AF7DF8 802404A8 8FB40020 */ lw $s4, 0x20($sp) -/* AF7DFC 802404AC 8FB3001C */ lw $s3, 0x1c($sp) -/* AF7E00 802404B0 8FB20018 */ lw $s2, 0x18($sp) -/* AF7E04 802404B4 8FB10014 */ lw $s1, 0x14($sp) -/* AF7E08 802404B8 8FB00010 */ lw $s0, 0x10($sp) -/* AF7E0C 802404BC D7BC0048 */ ldc1 $f28, 0x48($sp) -/* AF7E10 802404C0 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* AF7E14 802404C4 D7B80038 */ ldc1 $f24, 0x38($sp) -/* AF7E18 802404C8 D7B60030 */ ldc1 $f22, 0x30($sp) -/* AF7E1C 802404CC D7B40028 */ ldc1 $f20, 0x28($sp) -/* AF7E20 802404D0 24020002 */ addiu $v0, $zero, 2 -/* AF7E24 802404D4 03E00008 */ jr $ra -/* AF7E28 802404D8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/func_802404DC_AF7950.s b/asm/nonmatchings/world/area_kkj/kkj_19/func_802404DC_AF7950.s deleted file mode 100644 index 07fc32e928..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/func_802404DC_AF7950.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404DC_AF7E2C -/* AF7E2C 802404DC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF7E30 802404E0 AFBF0010 */ sw $ra, 0x10($sp) -/* AF7E34 802404E4 10A00003 */ beqz $a1, .L802404F4 -/* AF7E38 802404E8 8C86000C */ lw $a2, 0xc($a0) -/* AF7E3C 802404EC 3C018024 */ lui $at, 0x8024 -/* AF7E40 802404F0 AC201B10 */ sw $zero, 0x1b10($at) -.L802404F4: -/* AF7E44 802404F4 3C038024 */ lui $v1, 0x8024 -/* AF7E48 802404F8 24631B10 */ addiu $v1, $v1, 0x1b10 -/* AF7E4C 802404FC 8C620000 */ lw $v0, ($v1) -/* AF7E50 80240500 54400003 */ bnel $v0, $zero, .L80240510 -/* AF7E54 80240504 AC600000 */ sw $zero, ($v1) -/* AF7E58 80240508 08090149 */ j .L80240524 -/* AF7E5C 8024050C 0000102D */ daddu $v0, $zero, $zero -.L80240510: -/* AF7E60 80240510 8CC50000 */ lw $a1, ($a2) -/* AF7E64 80240514 3C068024 */ lui $a2, 0x8024 -/* AF7E68 80240518 0C0B2026 */ jal set_variable -/* AF7E6C 8024051C 8CC61B14 */ lw $a2, 0x1b14($a2) -/* AF7E70 80240520 24020002 */ addiu $v0, $zero, 2 -.L80240524: -/* AF7E74 80240524 8FBF0010 */ lw $ra, 0x10($sp) -/* AF7E78 80240528 03E00008 */ jr $ra -/* AF7E7C 8024052C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/func_80240530_AF7950.s b/asm/nonmatchings/world/area_kkj/kkj_19/func_80240530_AF7950.s deleted file mode 100644 index d4f85a4ff5..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/func_80240530_AF7950.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240530_AF7E80 -/* AF7E80 80240530 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF7E84 80240534 AFBF0010 */ sw $ra, 0x10($sp) -/* AF7E88 80240538 8C82000C */ lw $v0, 0xc($a0) -/* AF7E8C 8024053C 0C0B1EAF */ jal get_variable -/* AF7E90 80240540 8C450000 */ lw $a1, ($v0) -/* AF7E94 80240544 3C018024 */ lui $at, 0x8024 -/* AF7E98 80240548 AC221B14 */ sw $v0, 0x1b14($at) -/* AF7E9C 8024054C 24020002 */ addiu $v0, $zero, 2 -/* AF7EA0 80240550 8FBF0010 */ lw $ra, 0x10($sp) -/* AF7EA4 80240554 24030001 */ addiu $v1, $zero, 1 -/* AF7EA8 80240558 3C018024 */ lui $at, 0x8024 -/* AF7EAC 8024055C AC231B10 */ sw $v1, 0x1b10($at) -/* AF7EB0 80240560 03E00008 */ jr $ra -/* AF7EB4 80240564 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/func_80240568_AF7950.s b/asm/nonmatchings/world/area_kkj/kkj_19/func_80240568_AF7950.s deleted file mode 100644 index 7a38562025..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/func_80240568_AF7950.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_AF7EB8 -/* AF7EB8 80240568 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF7EBC 8024056C AFBF0010 */ sw $ra, 0x10($sp) -/* AF7EC0 80240570 8C82000C */ lw $v0, 0xc($a0) -/* AF7EC4 80240574 0C0B1EAF */ jal get_variable -/* AF7EC8 80240578 8C450000 */ lw $a1, ($v0) -/* AF7ECC 8024057C 0040182D */ daddu $v1, $v0, $zero -/* AF7ED0 80240580 10600012 */ beqz $v1, .L802405CC -/* AF7ED4 80240584 0000202D */ daddu $a0, $zero, $zero -/* AF7ED8 80240588 8C620000 */ lw $v0, ($v1) -/* AF7EDC 8024058C 5040000A */ beql $v0, $zero, .L802405B8 -/* AF7EE0 80240590 00041080 */ sll $v0, $a0, 2 -/* AF7EE4 80240594 3C058024 */ lui $a1, 0x8024 -/* AF7EE8 80240598 24A561F0 */ addiu $a1, $a1, 0x61f0 -.L8024059C: -/* AF7EEC 8024059C 24630004 */ addiu $v1, $v1, 4 -/* AF7EF0 802405A0 24840001 */ addiu $a0, $a0, 1 -/* AF7EF4 802405A4 ACA20000 */ sw $v0, ($a1) -/* AF7EF8 802405A8 8C620000 */ lw $v0, ($v1) -/* AF7EFC 802405AC 1440FFFB */ bnez $v0, .L8024059C -/* AF7F00 802405B0 24A50004 */ addiu $a1, $a1, 4 -/* AF7F04 802405B4 00041080 */ sll $v0, $a0, 2 -.L802405B8: -/* AF7F08 802405B8 3C018024 */ lui $at, 0x8024 -/* AF7F0C 802405BC 00220821 */ addu $at, $at, $v0 -/* AF7F10 802405C0 AC2061F0 */ sw $zero, 0x61f0($at) -/* AF7F14 802405C4 0809017D */ j .L802405F4 -/* AF7F18 802405C8 00000000 */ nop -.L802405CC: -/* AF7F1C 802405CC 3C038024 */ lui $v1, 0x8024 -/* AF7F20 802405D0 246361F0 */ addiu $v1, $v1, 0x61f0 -/* AF7F24 802405D4 0060282D */ daddu $a1, $v1, $zero -.L802405D8: -/* AF7F28 802405D8 24820010 */ addiu $v0, $a0, 0x10 -/* AF7F2C 802405DC AC620000 */ sw $v0, ($v1) -/* AF7F30 802405E0 24630004 */ addiu $v1, $v1, 4 -/* AF7F34 802405E4 24840001 */ addiu $a0, $a0, 1 -/* AF7F38 802405E8 28820070 */ slti $v0, $a0, 0x70 -/* AF7F3C 802405EC 1440FFFA */ bnez $v0, .L802405D8 -/* AF7F40 802405F0 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802405F4: -/* AF7F44 802405F4 8FBF0010 */ lw $ra, 0x10($sp) -/* AF7F48 802405F8 24020002 */ addiu $v0, $zero, 2 -/* AF7F4C 802405FC 03E00008 */ jr $ra -/* AF7F50 80240600 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/func_80240604_AF7950.s b/asm/nonmatchings/world/area_kkj/kkj_19/func_80240604_AF7950.s deleted file mode 100644 index cfd332c8df..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/func_80240604_AF7950.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240604_AF7F54 -/* AF7F54 80240604 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF7F58 80240608 AFBF0010 */ sw $ra, 0x10($sp) -/* AF7F5C 8024060C 8C82000C */ lw $v0, 0xc($a0) -/* AF7F60 80240610 0C0B1EAF */ jal get_variable -/* AF7F64 80240614 8C450000 */ lw $a1, ($v0) -/* AF7F68 80240618 0040182D */ daddu $v1, $v0, $zero -/* AF7F6C 8024061C 10600012 */ beqz $v1, .L80240668 -/* AF7F70 80240620 0000202D */ daddu $a0, $zero, $zero -/* AF7F74 80240624 8C620000 */ lw $v0, ($v1) -/* AF7F78 80240628 5040000A */ beql $v0, $zero, .L80240654 -/* AF7F7C 8024062C 00041080 */ sll $v0, $a0, 2 -/* AF7F80 80240630 3C058024 */ lui $a1, 0x8024 -/* AF7F84 80240634 24A563B8 */ addiu $a1, $a1, 0x63b8 -.L80240638: -/* AF7F88 80240638 24630004 */ addiu $v1, $v1, 4 -/* AF7F8C 8024063C 24840001 */ addiu $a0, $a0, 1 -/* AF7F90 80240640 ACA20000 */ sw $v0, ($a1) -/* AF7F94 80240644 8C620000 */ lw $v0, ($v1) -/* AF7F98 80240648 1440FFFB */ bnez $v0, .L80240638 -/* AF7F9C 8024064C 24A50004 */ addiu $a1, $a1, 4 -/* AF7FA0 80240650 00041080 */ sll $v0, $a0, 2 -.L80240654: -/* AF7FA4 80240654 3C018024 */ lui $at, 0x8024 -/* AF7FA8 80240658 00220821 */ addu $at, $at, $v0 -/* AF7FAC 8024065C AC2063B8 */ sw $zero, 0x63b8($at) -/* AF7FB0 80240660 080901A4 */ j .L80240690 -/* AF7FB4 80240664 00000000 */ nop -.L80240668: -/* AF7FB8 80240668 3C038024 */ lui $v1, 0x8024 -/* AF7FBC 8024066C 246363B8 */ addiu $v1, $v1, 0x63b8 -/* AF7FC0 80240670 0060282D */ daddu $a1, $v1, $zero -.L80240674: -/* AF7FC4 80240674 24820080 */ addiu $v0, $a0, 0x80 -/* AF7FC8 80240678 AC620000 */ sw $v0, ($v1) -/* AF7FCC 8024067C 24630004 */ addiu $v1, $v1, 4 -/* AF7FD0 80240680 24840001 */ addiu $a0, $a0, 1 -/* AF7FD4 80240684 2882005B */ slti $v0, $a0, 0x5b -/* AF7FD8 80240688 1440FFFA */ bnez $v0, .L80240674 -/* AF7FDC 8024068C ACA0016C */ sw $zero, 0x16c($a1) -.L80240690: -/* AF7FE0 80240690 8FBF0010 */ lw $ra, 0x10($sp) -/* AF7FE4 80240694 24020002 */ addiu $v0, $zero, 2 -/* AF7FE8 80240698 03E00008 */ jr $ra -/* AF7FEC 8024069C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/func_802406C4_AF7950.s b/asm/nonmatchings/world/area_kkj/kkj_19/func_802406C4_AF7950.s deleted file mode 100644 index b6365606f2..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/func_802406C4_AF7950.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406C4_AF8014 -/* AF8014 802406C4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AF8018 802406C8 AFB50024 */ sw $s5, 0x24($sp) -/* AF801C 802406CC 0080A82D */ daddu $s5, $a0, $zero -/* AF8020 802406D0 AFBF0028 */ sw $ra, 0x28($sp) -/* AF8024 802406D4 AFB40020 */ sw $s4, 0x20($sp) -/* AF8028 802406D8 AFB3001C */ sw $s3, 0x1c($sp) -/* AF802C 802406DC AFB20018 */ sw $s2, 0x18($sp) -/* AF8030 802406E0 AFB10014 */ sw $s1, 0x14($sp) -/* AF8034 802406E4 AFB00010 */ sw $s0, 0x10($sp) -/* AF8038 802406E8 10A00003 */ beqz $a1, .L802406F8 -/* AF803C 802406EC 8EA6000C */ lw $a2, 0xc($s5) -/* AF8040 802406F0 3C018024 */ lui $at, 0x8024 -/* AF8044 802406F4 AC206558 */ sw $zero, 0x6558($at) -.L802406F8: -/* AF8048 802406F8 3C038024 */ lui $v1, 0x8024 -/* AF804C 802406FC 8C636558 */ lw $v1, 0x6558($v1) -/* AF8050 80240700 2C62000D */ sltiu $v0, $v1, 0xd -/* AF8054 80240704 104000F1 */ beqz $v0, .L80240ACC -/* AF8058 80240708 00031080 */ sll $v0, $v1, 2 -/* AF805C 8024070C 3C018024 */ lui $at, 0x8024 -/* AF8060 80240710 00220821 */ addu $at, $at, $v0 -/* AF8064 80240714 8C2261B0 */ lw $v0, 0x61b0($at) -/* AF8068 80240718 00400008 */ jr $v0 -/* AF806C 8024071C 00000000 */ nop -/* AF8070 80240720 02A0202D */ daddu $a0, $s5, $zero -/* AF8074 80240724 8CC50000 */ lw $a1, ($a2) -/* AF8078 80240728 0C0B1EAF */ jal get_variable -/* AF807C 8024072C 24140009 */ addiu $s4, $zero, 9 -/* AF8080 80240730 3C058024 */ lui $a1, 0x8024 -/* AF8084 80240734 24A506A0 */ addiu $a1, $a1, 0x6a0 -/* AF8088 80240738 3C018024 */ lui $at, 0x8024 -/* AF808C 8024073C AC226534 */ sw $v0, 0x6534($at) -/* AF8090 80240740 0C048C8F */ jal bind_dynamic_entity_7 -/* AF8094 80240744 0000202D */ daddu $a0, $zero, $zero -/* AF8098 80240748 3C038024 */ lui $v1, 0x8024 -/* AF809C 8024074C 2463659C */ addiu $v1, $v1, 0x659c -/* AF80A0 80240750 3C018024 */ lui $at, 0x8024 -/* AF80A4 80240754 AC226554 */ sw $v0, 0x6554($at) -/* AF80A8 80240758 3C018024 */ lui $at, 0x8024 -/* AF80AC 8024075C AC206528 */ sw $zero, 0x6528($at) -/* AF80B0 80240760 3C018024 */ lui $at, 0x8024 -/* AF80B4 80240764 AC206530 */ sw $zero, 0x6530($at) -.L80240768: -/* AF80B8 80240768 AC600000 */ sw $zero, ($v1) -/* AF80BC 8024076C 2694FFFF */ addiu $s4, $s4, -1 -/* AF80C0 80240770 0681FFFD */ bgez $s4, .L80240768 -/* AF80C4 80240774 2463FFFC */ addiu $v1, $v1, -4 -/* AF80C8 80240778 2414000A */ addiu $s4, $zero, 0xa -/* AF80CC 8024077C 3C048011 */ lui $a0, 0x8011 -/* AF80D0 80240780 24848B28 */ addiu $a0, $a0, -0x74d8 -/* AF80D4 80240784 3C038024 */ lui $v1, 0x8024 -/* AF80D8 80240788 24636538 */ addiu $v1, $v1, 0x6538 -/* AF80DC 8024078C 2402000C */ addiu $v0, $zero, 0xc -/* AF80E0 80240790 AC620004 */ sw $v0, 4($v1) -/* AF80E4 80240794 24020018 */ addiu $v0, $zero, 0x18 -/* AF80E8 80240798 AC620008 */ sw $v0, 8($v1) -/* AF80EC 8024079C 24020024 */ addiu $v0, $zero, 0x24 -/* AF80F0 802407A0 AC62000C */ sw $v0, 0xc($v1) -/* AF80F4 802407A4 24020030 */ addiu $v0, $zero, 0x30 -/* AF80F8 802407A8 AC620010 */ sw $v0, 0x10($v1) -/* AF80FC 802407AC 2402003C */ addiu $v0, $zero, 0x3c -/* AF8100 802407B0 AC620014 */ sw $v0, 0x14($v1) -/* AF8104 802407B4 24020005 */ addiu $v0, $zero, 5 -/* AF8108 802407B8 3C118024 */ lui $s1, 0x8024 -/* AF810C 802407BC 2631655C */ addiu $s1, $s1, 0x655c -/* AF8110 802407C0 3C018024 */ lui $at, 0x8024 -/* AF8114 802407C4 AC226550 */ sw $v0, 0x6550($at) -/* AF8118 802407C8 2402FFD0 */ addiu $v0, $zero, -0x30 -/* AF811C 802407CC 3C108024 */ lui $s0, 0x8024 -/* AF8120 802407D0 26106560 */ addiu $s0, $s0, 0x6560 -/* AF8124 802407D4 3C018024 */ lui $at, 0x8024 -/* AF8128 802407D8 AC2065A0 */ sw $zero, 0x65a0($at) -/* AF812C 802407DC AC600000 */ sw $zero, ($v1) -/* AF8130 802407E0 AE220000 */ sw $v0, ($s1) -/* AF8134 802407E4 24020040 */ addiu $v0, $zero, 0x40 -/* AF8138 802407E8 0C050529 */ jal create_icon -/* AF813C 802407EC AE020000 */ sw $v0, ($s0) -/* AF8140 802407F0 0040982D */ daddu $s3, $v0, $zero -/* AF8144 802407F4 0260202D */ daddu $a0, $s3, $zero -/* AF8148 802407F8 8E250000 */ lw $a1, ($s1) -/* AF814C 802407FC 8E060000 */ lw $a2, ($s0) -/* AF8150 80240800 3C128024 */ lui $s2, 0x8024 -/* AF8154 80240804 26526568 */ addiu $s2, $s2, 0x6568 -/* AF8158 80240808 0C051261 */ jal set_icon_render_pos -/* AF815C 8024080C AE530000 */ sw $s3, ($s2) -/* AF8160 80240810 0260202D */ daddu $a0, $s3, $zero -/* AF8164 80240814 0C051277 */ jal func_801449DC -/* AF8168 80240818 0000282D */ daddu $a1, $zero, $zero -/* AF816C 8024081C 0260202D */ daddu $a0, $s3, $zero -/* AF8170 80240820 0C051280 */ jal set_icon_flags -/* AF8174 80240824 24050082 */ addiu $a1, $zero, 0x82 -/* AF8178 80240828 3C048011 */ lui $a0, 0x8011 -/* AF817C 8024082C 24848AFC */ addiu $a0, $a0, -0x7504 -/* AF8180 80240830 0C050529 */ jal create_icon -/* AF8184 80240834 00000000 */ nop -/* AF8188 80240838 0040982D */ daddu $s3, $v0, $zero -/* AF818C 8024083C 8E250000 */ lw $a1, ($s1) -/* AF8190 80240840 8E060000 */ lw $a2, ($s0) -/* AF8194 80240844 0260202D */ daddu $a0, $s3, $zero -/* AF8198 80240848 AE530004 */ sw $s3, 4($s2) -/* AF819C 8024084C 0C051261 */ jal set_icon_render_pos -/* AF81A0 80240850 24C6001C */ addiu $a2, $a2, 0x1c -/* AF81A4 80240854 0260202D */ daddu $a0, $s3, $zero -/* AF81A8 80240858 0C051277 */ jal func_801449DC -/* AF81AC 8024085C 0000282D */ daddu $a1, $zero, $zero -/* AF81B0 80240860 0260202D */ daddu $a0, $s3, $zero -/* AF81B4 80240864 0C051280 */ jal set_icon_flags -/* AF81B8 80240868 24050082 */ addiu $a1, $zero, 0x82 -/* AF81BC 8024086C 8E530000 */ lw $s3, ($s2) -/* AF81C0 80240870 240500FF */ addiu $a1, $zero, 0xff -/* AF81C4 80240874 0C0513AC */ jal icon_set_opacity -/* AF81C8 80240878 0260202D */ daddu $a0, $s3, $zero -/* AF81CC 8024087C 0260202D */ daddu $a0, $s3, $zero -/* AF81D0 80240880 0C05128B */ jal clear_icon_flags -/* AF81D4 80240884 24050002 */ addiu $a1, $zero, 2 -/* AF81D8 80240888 8E530004 */ lw $s3, 4($s2) -/* AF81DC 8024088C 240500FF */ addiu $a1, $zero, 0xff -/* AF81E0 80240890 0C0513AC */ jal icon_set_opacity -/* AF81E4 80240894 0260202D */ daddu $a0, $s3, $zero -/* AF81E8 80240898 0260202D */ daddu $a0, $s3, $zero -/* AF81EC 8024089C 0C05128B */ jal clear_icon_flags -/* AF81F0 802408A0 24050002 */ addiu $a1, $zero, 2 -/* AF81F4 802408A4 24020001 */ addiu $v0, $zero, 1 -/* AF81F8 802408A8 3C018024 */ lui $at, 0x8024 -/* AF81FC 802408AC AC226558 */ sw $v0, 0x6558($at) -/* AF8200 802408B0 080902B3 */ j .L80240ACC -/* AF8204 802408B4 AEB40070 */ sw $s4, 0x70($s5) -/* AF8208 802408B8 3C128024 */ lui $s2, 0x8024 -/* AF820C 802408BC 2652655C */ addiu $s2, $s2, 0x655c -/* AF8210 802408C0 8E420000 */ lw $v0, ($s2) -/* AF8214 802408C4 24420014 */ addiu $v0, $v0, 0x14 -/* AF8218 802408C8 AE420000 */ sw $v0, ($s2) -/* AF821C 802408CC 28420033 */ slti $v0, $v0, 0x33 -/* AF8220 802408D0 14400002 */ bnez $v0, .L802408DC -/* AF8224 802408D4 24020032 */ addiu $v0, $zero, 0x32 -/* AF8228 802408D8 AE420000 */ sw $v0, ($s2) -.L802408DC: -/* AF822C 802408DC 3C118024 */ lui $s1, 0x8024 -/* AF8230 802408E0 26316568 */ addiu $s1, $s1, 0x6568 -/* AF8234 802408E4 3C108024 */ lui $s0, 0x8024 -/* AF8238 802408E8 26106560 */ addiu $s0, $s0, 0x6560 -/* AF823C 802408EC 8E240000 */ lw $a0, ($s1) -/* AF8240 802408F0 8E450000 */ lw $a1, ($s2) -/* AF8244 802408F4 0C051261 */ jal set_icon_render_pos -/* AF8248 802408F8 8E060000 */ lw $a2, ($s0) -/* AF824C 802408FC 8E240004 */ lw $a0, 4($s1) -/* AF8250 80240900 8E060000 */ lw $a2, ($s0) -/* AF8254 80240904 8E450000 */ lw $a1, ($s2) -/* AF8258 80240908 0C051261 */ jal set_icon_render_pos -/* AF825C 8024090C 24C6001C */ addiu $a2, $a2, 0x1c -/* AF8260 80240910 8EA20070 */ lw $v0, 0x70($s5) -/* AF8264 80240914 10400003 */ beqz $v0, .L80240924 -/* AF8268 80240918 2442FFFF */ addiu $v0, $v0, -1 -/* AF826C 8024091C 080902B3 */ j .L80240ACC -/* AF8270 80240920 AEA20070 */ sw $v0, 0x70($s5) -.L80240924: -/* AF8274 80240924 2402000A */ addiu $v0, $zero, 0xa -/* AF8278 80240928 3C018024 */ lui $at, 0x8024 -/* AF827C 8024092C AC226558 */ sw $v0, 0x6558($at) -/* AF8280 80240930 080902B3 */ j .L80240ACC -/* AF8284 80240934 00000000 */ nop -/* AF8288 80240938 3C048024 */ lui $a0, 0x8024 -/* AF828C 8024093C 8C846568 */ lw $a0, 0x6568($a0) -/* AF8290 80240940 3C058011 */ lui $a1, 0x8011 -/* AF8294 80240944 24A58B80 */ addiu $a1, $a1, -0x7480 -/* AF8298 80240948 0C0511FF */ jal set_menu_icon_script -/* AF829C 8024094C 00000000 */ nop -/* AF82A0 80240950 2402000B */ addiu $v0, $zero, 0xb -/* AF82A4 80240954 3C018024 */ lui $at, 0x8024 -/* AF82A8 80240958 AC206528 */ sw $zero, 0x6528($at) -/* AF82AC 8024095C 3C018024 */ lui $at, 0x8024 -/* AF82B0 80240960 AC20652C */ sw $zero, 0x652c($at) -/* AF82B4 80240964 3C018024 */ lui $at, 0x8024 -/* AF82B8 80240968 AC226558 */ sw $v0, 0x6558($at) -/* AF82BC 8024096C 3C038024 */ lui $v1, 0x8024 -/* AF82C0 80240970 8C636550 */ lw $v1, 0x6550($v1) -/* AF82C4 80240974 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* AF82C8 80240978 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* AF82CC 8024097C 00031880 */ sll $v1, $v1, 2 -/* AF82D0 80240980 8C420010 */ lw $v0, 0x10($v0) -/* AF82D4 80240984 3C048024 */ lui $a0, 0x8024 -/* AF82D8 80240988 00832021 */ addu $a0, $a0, $v1 -/* AF82DC 8024098C 8C846538 */ lw $a0, 0x6538($a0) -/* AF82E0 80240990 30428000 */ andi $v0, $v0, 0x8000 -/* AF82E4 80240994 10400006 */ beqz $v0, .L802409B0 -/* AF82E8 80240998 00000000 */ nop -/* AF82EC 8024099C 3C038024 */ lui $v1, 0x8024 -/* AF82F0 802409A0 24636528 */ addiu $v1, $v1, 0x6528 -/* AF82F4 802409A4 8C620000 */ lw $v0, ($v1) -/* AF82F8 802409A8 24420001 */ addiu $v0, $v0, 1 -/* AF82FC 802409AC AC620000 */ sw $v0, ($v1) -.L802409B0: -/* AF8300 802409B0 3C038024 */ lui $v1, 0x8024 -/* AF8304 802409B4 24636528 */ addiu $v1, $v1, 0x6528 -/* AF8308 802409B8 8C620000 */ lw $v0, ($v1) -/* AF830C 802409BC 0082102A */ slt $v0, $a0, $v0 -/* AF8310 802409C0 54400001 */ bnel $v0, $zero, .L802409C8 -/* AF8314 802409C4 AC640000 */ sw $a0, ($v1) -.L802409C8: -/* AF8318 802409C8 3C048024 */ lui $a0, 0x8024 -/* AF831C 802409CC 2484652C */ addiu $a0, $a0, 0x652c -/* AF8320 802409D0 8C830000 */ lw $v1, ($a0) -/* AF8324 802409D4 24020002 */ addiu $v0, $zero, 2 -/* AF8328 802409D8 14620003 */ bne $v1, $v0, .L802409E8 -/* AF832C 802409DC 0000A02D */ daddu $s4, $zero, $zero -/* AF8330 802409E0 24020003 */ addiu $v0, $zero, 3 -/* AF8334 802409E4 AC820000 */ sw $v0, ($a0) -.L802409E8: -/* AF8338 802409E8 3C038024 */ lui $v1, 0x8024 -/* AF833C 802409EC 24636578 */ addiu $v1, $v1, 0x6578 -.L802409F0: -/* AF8340 802409F0 8C620000 */ lw $v0, ($v1) -/* AF8344 802409F4 14400006 */ bnez $v0, .L80240A10 -/* AF8348 802409F8 2A82000A */ slti $v0, $s4, 0xa -/* AF834C 802409FC 26940001 */ addiu $s4, $s4, 1 -/* AF8350 80240A00 2A82000A */ slti $v0, $s4, 0xa -/* AF8354 80240A04 1440FFFA */ bnez $v0, .L802409F0 -/* AF8358 80240A08 24630004 */ addiu $v1, $v1, 4 -/* AF835C 80240A0C 2A82000A */ slti $v0, $s4, 0xa -.L80240A10: -/* AF8360 80240A10 14400006 */ bnez $v0, .L80240A2C -/* AF8364 80240A14 24020003 */ addiu $v0, $zero, 3 -/* AF8368 80240A18 24020002 */ addiu $v0, $zero, 2 -/* AF836C 80240A1C 3C018024 */ lui $at, 0x8024 -/* AF8370 80240A20 AC22652C */ sw $v0, 0x652c($at) -/* AF8374 80240A24 08090291 */ j .L80240A44 -/* AF8378 80240A28 00000000 */ nop -.L80240A2C: -/* AF837C 80240A2C 3C048024 */ lui $a0, 0x8024 -/* AF8380 80240A30 2484652C */ addiu $a0, $a0, 0x652c -/* AF8384 80240A34 8C830000 */ lw $v1, ($a0) -/* AF8388 80240A38 10620002 */ beq $v1, $v0, .L80240A44 -/* AF838C 80240A3C 24020002 */ addiu $v0, $zero, 2 -/* AF8390 80240A40 AC820000 */ sw $v0, ($a0) -.L80240A44: -/* AF8394 80240A44 3C038024 */ lui $v1, 0x8024 -/* AF8398 80240A48 24636534 */ addiu $v1, $v1, 0x6534 -/* AF839C 80240A4C 8C620000 */ lw $v0, ($v1) -/* AF83A0 80240A50 2442FFFF */ addiu $v0, $v0, -1 -/* AF83A4 80240A54 1440001D */ bnez $v0, .L80240ACC -/* AF83A8 80240A58 AC620000 */ sw $v0, ($v1) -/* AF83AC 80240A5C 24020005 */ addiu $v0, $zero, 5 -/* AF83B0 80240A60 AC620000 */ sw $v0, ($v1) -/* AF83B4 80240A64 2402000C */ addiu $v0, $zero, 0xc -/* AF83B8 80240A68 3C018024 */ lui $at, 0x8024 -/* AF83BC 80240A6C AC226558 */ sw $v0, 0x6558($at) -/* AF83C0 80240A70 080902B3 */ j .L80240ACC -/* AF83C4 80240A74 00000000 */ nop -/* AF83C8 80240A78 3C038024 */ lui $v1, 0x8024 -/* AF83CC 80240A7C 24636534 */ addiu $v1, $v1, 0x6534 -/* AF83D0 80240A80 8C620000 */ lw $v0, ($v1) -/* AF83D4 80240A84 54400010 */ bnel $v0, $zero, .L80240AC8 -/* AF83D8 80240A88 2442FFFF */ addiu $v0, $v0, -1 -/* AF83DC 80240A8C 3C028024 */ lui $v0, 0x8024 -/* AF83E0 80240A90 8C426528 */ lw $v0, 0x6528($v0) -/* AF83E4 80240A94 3C108024 */ lui $s0, 0x8024 -/* AF83E8 80240A98 26106568 */ addiu $s0, $s0, 0x6568 -/* AF83EC 80240A9C AEA20084 */ sw $v0, 0x84($s5) -/* AF83F0 80240AA0 0C05123D */ jal free_icon -/* AF83F4 80240AA4 8E040000 */ lw $a0, ($s0) -/* AF83F8 80240AA8 0C05123D */ jal free_icon -/* AF83FC 80240AAC 8E040004 */ lw $a0, 4($s0) -/* AF8400 80240AB0 3C048024 */ lui $a0, 0x8024 -/* AF8404 80240AB4 8C846554 */ lw $a0, 0x6554($a0) -/* AF8408 80240AB8 0C048D70 */ jal func_801235C0 -/* AF840C 80240ABC 00000000 */ nop -/* AF8410 80240AC0 080902CA */ j .L80240B28 -/* AF8414 80240AC4 24020002 */ addiu $v0, $zero, 2 -.L80240AC8: -/* AF8418 80240AC8 AC620000 */ sw $v0, ($v1) -.L80240ACC: -/* AF841C 80240ACC 3C058024 */ lui $a1, 0x8024 -/* AF8420 80240AD0 24A565A0 */ addiu $a1, $a1, 0x65a0 -/* AF8424 80240AD4 8CA20000 */ lw $v0, ($a1) -/* AF8428 80240AD8 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* AF842C 80240ADC 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* AF8430 80240AE0 00022080 */ sll $a0, $v0, 2 -/* AF8434 80240AE4 8C630010 */ lw $v1, 0x10($v1) -/* AF8438 80240AE8 24420001 */ addiu $v0, $v0, 1 -/* AF843C 80240AEC ACA20000 */ sw $v0, ($a1) -/* AF8440 80240AF0 2842000A */ slti $v0, $v0, 0xa -/* AF8444 80240AF4 30638000 */ andi $v1, $v1, 0x8000 -/* AF8448 80240AF8 3C018024 */ lui $at, 0x8024 -/* AF844C 80240AFC 00240821 */ addu $at, $at, $a0 -/* AF8450 80240B00 AC236578 */ sw $v1, 0x6578($at) -/* AF8454 80240B04 50400001 */ beql $v0, $zero, .L80240B0C -/* AF8458 80240B08 ACA00000 */ sw $zero, ($a1) -.L80240B0C: -/* AF845C 80240B0C 02A0202D */ daddu $a0, $s5, $zero -/* AF8460 80240B10 3C05F70F */ lui $a1, 0xf70f -/* AF8464 80240B14 3C068024 */ lui $a2, 0x8024 -/* AF8468 80240B18 8CC6652C */ lw $a2, 0x652c($a2) -/* AF846C 80240B1C 0C0B2026 */ jal set_variable -/* AF8470 80240B20 34A52E83 */ ori $a1, $a1, 0x2e83 -/* AF8474 80240B24 0000102D */ daddu $v0, $zero, $zero -.L80240B28: -/* AF8478 80240B28 8FBF0028 */ lw $ra, 0x28($sp) -/* AF847C 80240B2C 8FB50024 */ lw $s5, 0x24($sp) -/* AF8480 80240B30 8FB40020 */ lw $s4, 0x20($sp) -/* AF8484 80240B34 8FB3001C */ lw $s3, 0x1c($sp) -/* AF8488 80240B38 8FB20018 */ lw $s2, 0x18($sp) -/* AF848C 80240B3C 8FB10014 */ lw $s1, 0x14($sp) -/* AF8490 80240B40 8FB00010 */ lw $s0, 0x10($sp) -/* AF8494 80240B44 03E00008 */ jr $ra -/* AF8498 80240B48 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/func_80240B4C_AF7950.s b/asm/nonmatchings/world/area_kkj/kkj_19/func_80240B4C_AF7950.s deleted file mode 100644 index b9b760451a..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/func_80240B4C_AF7950.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B4C_AF849C -/* AF849C 80240B4C 54A00001 */ bnel $a1, $zero, .L80240B54 -/* AF84A0 80240B50 AC800074 */ sw $zero, 0x74($a0) -.L80240B54: -/* AF84A4 80240B54 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* AF84A8 80240B58 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* AF84AC 80240B5C 8C420010 */ lw $v0, 0x10($v0) -/* AF84B0 80240B60 30428000 */ andi $v0, $v0, 0x8000 -/* AF84B4 80240B64 14400006 */ bnez $v0, .L80240B80 -/* AF84B8 80240B68 24020002 */ addiu $v0, $zero, 2 -/* AF84BC 80240B6C 8C830074 */ lw $v1, 0x74($a0) -/* AF84C0 80240B70 0000102D */ daddu $v0, $zero, $zero -/* AF84C4 80240B74 24630001 */ addiu $v1, $v1, 1 -/* AF84C8 80240B78 03E00008 */ jr $ra -/* AF84CC 80240B7C AC830074 */ sw $v1, 0x74($a0) -.L80240B80: -/* AF84D0 80240B80 8C830074 */ lw $v1, 0x74($a0) -/* AF84D4 80240B84 03E00008 */ jr $ra -/* AF84D8 80240B88 AC830084 */ sw $v1, 0x84($a0) diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/func_80240BE4_AF7950.s b/asm/nonmatchings/world/area_kkj/kkj_19/func_80240BE4_AF7950.s deleted file mode 100644 index 6c8f5324ca..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/func_80240BE4_AF7950.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BE4_AF8534 -/* AF8534 80240BE4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF8538 80240BE8 AFBF0010 */ sw $ra, 0x10($sp) -/* AF853C 80240BEC 8C82000C */ lw $v0, 0xc($a0) -/* AF8540 80240BF0 3C068016 */ lui $a2, 0x8016 -/* AF8544 80240BF4 84C6A552 */ lh $a2, -0x5aae($a2) -/* AF8548 80240BF8 0C0B2026 */ jal set_variable -/* AF854C 80240BFC 8C450000 */ lw $a1, ($v0) -/* AF8550 80240C00 8FBF0010 */ lw $ra, 0x10($sp) -/* AF8554 80240C04 24020002 */ addiu $v0, $zero, 2 -/* AF8558 80240C08 03E00008 */ jr $ra -/* AF855C 80240C0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/func_80240C4C_AF7950.s b/asm/nonmatchings/world/area_kkj/kkj_19/func_80240C4C_AF7950.s deleted file mode 100644 index a883f85598..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/func_80240C4C_AF7950.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_AF859C -/* AF859C 80240C4C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF85A0 80240C50 AFB00010 */ sw $s0, 0x10($sp) -/* AF85A4 80240C54 0080802D */ daddu $s0, $a0, $zero -/* AF85A8 80240C58 10A00002 */ beqz $a1, .L80240C64 -/* AF85AC 80240C5C AFBF0014 */ sw $ra, 0x14($sp) -/* AF85B0 80240C60 AE000074 */ sw $zero, 0x74($s0) -.L80240C64: -/* AF85B4 80240C64 8E020074 */ lw $v0, 0x74($s0) -/* AF85B8 80240C68 24420010 */ addiu $v0, $v0, 0x10 -/* AF85BC 80240C6C AE020074 */ sw $v0, 0x74($s0) -/* AF85C0 80240C70 28420100 */ slti $v0, $v0, 0x100 -/* AF85C4 80240C74 14400002 */ bnez $v0, .L80240C80 -/* AF85C8 80240C78 240200FF */ addiu $v0, $zero, 0xff -/* AF85CC 80240C7C AE020074 */ sw $v0, 0x74($s0) -.L80240C80: -/* AF85D0 80240C80 C6000074 */ lwc1 $f0, 0x74($s0) -/* AF85D4 80240C84 46800020 */ cvt.s.w $f0, $f0 -/* AF85D8 80240C88 44050000 */ mfc1 $a1, $f0 -/* AF85DC 80240C8C 0C04DF62 */ jal func_80137D88 -/* AF85E0 80240C90 0000202D */ daddu $a0, $zero, $zero -/* AF85E4 80240C94 8E020074 */ lw $v0, 0x74($s0) -/* AF85E8 80240C98 8FBF0014 */ lw $ra, 0x14($sp) -/* AF85EC 80240C9C 8FB00010 */ lw $s0, 0x10($sp) -/* AF85F0 80240CA0 384200FF */ xori $v0, $v0, 0xff -/* AF85F4 80240CA4 2C420001 */ sltiu $v0, $v0, 1 -/* AF85F8 80240CA8 00021040 */ sll $v0, $v0, 1 -/* AF85FC 80240CAC 03E00008 */ jr $ra -/* AF8600 80240CB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/func_80240CB4_AF7950.s b/asm/nonmatchings/world/area_kkj/kkj_19/func_80240CB4_AF7950.s deleted file mode 100644 index 452b46d794..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/func_80240CB4_AF7950.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CB4_AF8604 -/* AF8604 80240CB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF8608 80240CB8 10A00003 */ beqz $a1, .L80240CC8 -/* AF860C 80240CBC AFBF0010 */ sw $ra, 0x10($sp) -/* AF8610 80240CC0 240200FF */ addiu $v0, $zero, 0xff -/* AF8614 80240CC4 AC820074 */ sw $v0, 0x74($a0) -.L80240CC8: -/* AF8618 80240CC8 8C820074 */ lw $v0, 0x74($a0) -/* AF861C 80240CCC 2442FFF0 */ addiu $v0, $v0, -0x10 -/* AF8620 80240CD0 18400009 */ blez $v0, .L80240CF8 -/* AF8624 80240CD4 AC820074 */ sw $v0, 0x74($a0) -/* AF8628 80240CD8 44820000 */ mtc1 $v0, $f0 -/* AF862C 80240CDC 00000000 */ nop -/* AF8630 80240CE0 46800020 */ cvt.s.w $f0, $f0 -/* AF8634 80240CE4 44050000 */ mfc1 $a1, $f0 -/* AF8638 80240CE8 0C04DF62 */ jal func_80137D88 -/* AF863C 80240CEC 0000202D */ daddu $a0, $zero, $zero -/* AF8640 80240CF0 08090340 */ j .L80240D00 -/* AF8644 80240CF4 0000102D */ daddu $v0, $zero, $zero -.L80240CF8: -/* AF8648 80240CF8 AC800074 */ sw $zero, 0x74($a0) -/* AF864C 80240CFC 24020002 */ addiu $v0, $zero, 2 -.L80240D00: -/* AF8650 80240D00 8FBF0010 */ lw $ra, 0x10($sp) -/* AF8654 80240D04 03E00008 */ jr $ra -/* AF8658 80240D08 27BD0018 */ addiu $sp, $sp, 0x18 -/* AF865C 80240D0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/func_802400B4_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/func_802400B4_AFDB40.s deleted file mode 100644 index 7f77b044b7..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/func_802400B4_AFDB40.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_AFDBF4 -/* AFDBF4 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AFDBF8 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* AFDBFC 802400BC 0080802D */ daddu $s0, $a0, $zero -/* AFDC00 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* AFDC04 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* AFDC08 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* AFDC0C 802400CC 8C510000 */ lw $s1, ($v0) -/* AFDC10 802400D0 0C0B1EAF */ jal get_variable -/* AFDC14 802400D4 0220282D */ daddu $a1, $s1, $zero -/* AFDC18 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* AFDC1C 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* AFDC20 802400E0 0200202D */ daddu $a0, $s0, $zero -/* AFDC24 802400E4 00431024 */ and $v0, $v0, $v1 -/* AFDC28 802400E8 00021140 */ sll $v0, $v0, 5 -/* AFDC2C 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* AFDC30 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* AFDC34 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* AFDC38 802400F8 0C0B2026 */ jal set_variable -/* AFDC3C 802400FC 0220282D */ daddu $a1, $s1, $zero -/* AFDC40 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* AFDC44 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* AFDC48 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* AFDC4C 8024010C 24020002 */ addiu $v0, $zero, 2 -/* AFDC50 80240110 03E00008 */ jr $ra -/* AFDC54 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240118_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/func_80240118_AFDB40.s deleted file mode 100644 index bb7b1d26e0..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240118_AFDB40.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_kkj/kkj_20/func_80240268_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/func_80240268_AFDB40.s deleted file mode 100644 index 615f7872a8..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240268_AFDB40.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_AFDDA8 -/* AFDDA8 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFDDAC 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* AFDDB0 80240270 0080802D */ daddu $s0, $a0, $zero -/* AFDDB4 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* AFDDB8 80240278 8E02000C */ lw $v0, 0xc($s0) -/* AFDDBC 8024027C 0C0B1EAF */ jal get_variable -/* AFDDC0 80240280 8C450000 */ lw $a1, ($v0) -/* AFDDC4 80240284 00021140 */ sll $v0, $v0, 5 -/* AFDDC8 80240288 AE000084 */ sw $zero, 0x84($s0) -/* AFDDCC 8024028C 3C018008 */ lui $at, 0x8008 -/* AFDDD0 80240290 00220821 */ addu $at, $at, $v0 -/* AFDDD4 80240294 942278F8 */ lhu $v0, 0x78f8($at) -/* AFDDD8 80240298 30420040 */ andi $v0, $v0, 0x40 -/* AFDDDC 8024029C 10400002 */ beqz $v0, .L802402A8 -/* AFDDE0 802402A0 24020001 */ addiu $v0, $zero, 1 -/* AFDDE4 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* AFDDE8 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* AFDDEC 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* AFDDF0 802402B0 24020002 */ addiu $v0, $zero, 2 -/* AFDDF4 802402B4 03E00008 */ jr $ra -/* AFDDF8 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* AFDDFC 802402BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/func_802402C0_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/func_802402C0_AFDB40.s deleted file mode 100644 index edab8c1754..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/func_802402C0_AFDB40.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402C0_AFDE00 -/* AFDE00 802402C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFDE04 802402C4 AFBF0010 */ sw $ra, 0x10($sp) -/* AFDE08 802402C8 0C03A625 */ jal func_800E9894 -/* AFDE0C 802402CC 00000000 */ nop -/* AFDE10 802402D0 8FBF0010 */ lw $ra, 0x10($sp) -/* AFDE14 802402D4 24020002 */ addiu $v0, $zero, 2 -/* AFDE18 802402D8 03E00008 */ jr $ra -/* AFDE1C 802402DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/func_802402E0_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/func_802402E0_AFDB40.s deleted file mode 100644 index d12c22dc00..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/func_802402E0_AFDB40.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_AFDE20 -/* AFDE20 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFDE24 802402E4 AFBF0010 */ sw $ra, 0x10($sp) -/* AFDE28 802402E8 0C03A631 */ jal func_800E98C4 -/* AFDE2C 802402EC 00000000 */ nop -/* AFDE30 802402F0 0C03A6DB */ jal sync_status_menu -/* AFDE34 802402F4 00000000 */ nop -/* AFDE38 802402F8 8FBF0010 */ lw $ra, 0x10($sp) -/* AFDE3C 802402FC 24020002 */ addiu $v0, $zero, 2 -/* AFDE40 80240300 03E00008 */ jr $ra -/* AFDE44 80240304 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240308_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/func_80240308_AFDB40.s deleted file mode 100644 index 5e42ae92da..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240308_AFDB40.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240308_AFDE48 -/* AFDE48 80240308 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AFDE4C 8024030C AFB10014 */ sw $s1, 0x14($sp) -/* AFDE50 80240310 0080882D */ daddu $s1, $a0, $zero -/* AFDE54 80240314 AFBF0018 */ sw $ra, 0x18($sp) -/* AFDE58 80240318 AFB00010 */ sw $s0, 0x10($sp) -/* AFDE5C 8024031C 8E30000C */ lw $s0, 0xc($s1) -/* AFDE60 80240320 8E050000 */ lw $a1, ($s0) -/* AFDE64 80240324 0C0B1EAF */ jal get_variable -/* AFDE68 80240328 26100004 */ addiu $s0, $s0, 4 -/* AFDE6C 8024032C 0220202D */ daddu $a0, $s1, $zero -/* AFDE70 80240330 8E050000 */ lw $a1, ($s0) -/* AFDE74 80240334 0C0B1EAF */ jal get_variable -/* AFDE78 80240338 0040882D */ daddu $s1, $v0, $zero -/* AFDE7C 8024033C 0000202D */ daddu $a0, $zero, $zero -/* AFDE80 80240340 0080282D */ daddu $a1, $a0, $zero -/* AFDE84 80240344 0040802D */ daddu $s0, $v0, $zero -/* AFDE88 80240348 240600BE */ addiu $a2, $zero, 0xbe -/* AFDE8C 8024034C 0C04DF93 */ jal func_80137E4C -/* AFDE90 80240350 24070091 */ addiu $a3, $zero, 0x91 -/* AFDE94 80240354 44900000 */ mtc1 $s0, $f0 -/* AFDE98 80240358 00000000 */ nop -/* AFDE9C 8024035C 46800020 */ cvt.s.w $f0, $f0 -/* AFDEA0 80240360 44050000 */ mfc1 $a1, $f0 -/* AFDEA4 80240364 0C04DF62 */ jal func_80137D88 -/* AFDEA8 80240368 322400FF */ andi $a0, $s1, 0xff -/* AFDEAC 8024036C 8FBF0018 */ lw $ra, 0x18($sp) -/* AFDEB0 80240370 8FB10014 */ lw $s1, 0x14($sp) -/* AFDEB4 80240374 8FB00010 */ lw $s0, 0x10($sp) -/* AFDEB8 80240378 24020002 */ addiu $v0, $zero, 2 -/* AFDEBC 8024037C 03E00008 */ jr $ra -/* AFDEC0 80240380 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240384_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/func_80240384_AFDB40.s deleted file mode 100644 index b578ccc936..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240384_AFDB40.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240384_AFDEC4 -/* AFDEC4 80240384 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AFDEC8 80240388 AFB10014 */ sw $s1, 0x14($sp) -/* AFDECC 8024038C 0080882D */ daddu $s1, $a0, $zero -/* AFDED0 80240390 AFBF0018 */ sw $ra, 0x18($sp) -/* AFDED4 80240394 AFB00010 */ sw $s0, 0x10($sp) -/* AFDED8 80240398 8E30000C */ lw $s0, 0xc($s1) -/* AFDEDC 8024039C 8E050000 */ lw $a1, ($s0) -/* AFDEE0 802403A0 0C0B1EAF */ jal get_variable -/* AFDEE4 802403A4 26100004 */ addiu $s0, $s0, 4 -/* AFDEE8 802403A8 0220202D */ daddu $a0, $s1, $zero -/* AFDEEC 802403AC 8E050000 */ lw $a1, ($s0) -/* AFDEF0 802403B0 0C0B1EAF */ jal get_variable -/* AFDEF4 802403B4 0040802D */ daddu $s0, $v0, $zero -/* AFDEF8 802403B8 44820000 */ mtc1 $v0, $f0 -/* AFDEFC 802403BC 00000000 */ nop -/* AFDF00 802403C0 46800020 */ cvt.s.w $f0, $f0 -/* AFDF04 802403C4 24020002 */ addiu $v0, $zero, 2 -/* AFDF08 802403C8 00501804 */ sllv $v1, $s0, $v0 -/* AFDF0C 802403CC 00701821 */ addu $v1, $v1, $s0 -/* AFDF10 802403D0 00431804 */ sllv $v1, $v1, $v0 -/* AFDF14 802403D4 00701823 */ subu $v1, $v1, $s0 -/* AFDF18 802403D8 000320C0 */ sll $a0, $v1, 3 -/* AFDF1C 802403DC 00641821 */ addu $v1, $v1, $a0 -/* AFDF20 802403E0 000318C0 */ sll $v1, $v1, 3 -/* AFDF24 802403E4 3C01800B */ lui $at, 0x800b -/* AFDF28 802403E8 00230821 */ addu $at, $at, $v1 -/* AFDF2C 802403EC E4201D98 */ swc1 $f0, 0x1d98($at) -/* AFDF30 802403F0 8FBF0018 */ lw $ra, 0x18($sp) -/* AFDF34 802403F4 8FB10014 */ lw $s1, 0x14($sp) -/* AFDF38 802403F8 8FB00010 */ lw $s0, 0x10($sp) -/* AFDF3C 802403FC 03E00008 */ jr $ra -/* AFDF40 80240400 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240404_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/func_80240404_AFDB40.s deleted file mode 100644 index e35648e20f..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240404_AFDB40.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_AFDF44 -/* AFDF44 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFDF48 80240408 AFBF0010 */ sw $ra, 0x10($sp) -/* AFDF4C 8024040C 8C82000C */ lw $v0, 0xc($a0) -/* AFDF50 80240410 0C0B1EAF */ jal get_variable -/* AFDF54 80240414 8C450000 */ lw $a1, ($v0) -/* AFDF58 80240418 0C0B1059 */ jal does_script_exist -/* AFDF5C 8024041C 0040202D */ daddu $a0, $v0, $zero -/* AFDF60 80240420 2C420001 */ sltiu $v0, $v0, 1 -/* AFDF64 80240424 8FBF0010 */ lw $ra, 0x10($sp) -/* AFDF68 80240428 00021040 */ sll $v0, $v0, 1 -/* AFDF6C 8024042C 03E00008 */ jr $ra -/* AFDF70 80240430 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240434_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/func_80240434_AFDB40.s deleted file mode 100644 index b4625fd8d0..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240434_AFDB40.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240434_AFDF74 -/* AFDF74 80240434 3C028011 */ lui $v0, 0x8011 -/* AFDF78 80240438 8042F2A2 */ lb $v0, -0xd5e($v0) -/* AFDF7C 8024043C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFDF80 80240440 10400003 */ beqz $v0, .L80240450 -/* AFDF84 80240444 AFBF0010 */ sw $ra, 0x10($sp) -/* AFDF88 80240448 0C03AE06 */ jal partner_suspend_ability_script -/* AFDF8C 8024044C 00000000 */ nop -.L80240450: -/* AFDF90 80240450 24020002 */ addiu $v0, $zero, 2 -/* AFDF94 80240454 8FBF0010 */ lw $ra, 0x10($sp) -/* AFDF98 80240458 03E00008 */ jr $ra -/* AFDF9C 8024045C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240460_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/func_80240460_AFDB40.s deleted file mode 100644 index c95e2d2802..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240460_AFDB40.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240460_AFDFA0 -/* AFDFA0 80240460 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFDFA4 80240464 AFBF0010 */ sw $ra, 0x10($sp) -/* AFDFA8 80240468 0C03AE18 */ jal partner_resume_ability_script -/* AFDFAC 8024046C 00000000 */ nop -/* AFDFB0 80240470 8FBF0010 */ lw $ra, 0x10($sp) -/* AFDFB4 80240474 24020002 */ addiu $v0, $zero, 2 -/* AFDFB8 80240478 03E00008 */ jr $ra -/* AFDFBC 8024047C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240480_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/func_80240480_AFDB40.s deleted file mode 100644 index e39992b256..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240480_AFDB40.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240480_AFDFC0 -/* AFDFC0 80240480 3C058011 */ lui $a1, %hi(gPlayerData) -/* AFDFC4 80240484 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* AFDFC8 80240488 AC800088 */ sw $zero, 0x88($a0) -/* AFDFCC 8024048C 80A30003 */ lb $v1, 3($a1) -/* AFDFD0 80240490 80A20002 */ lb $v0, 2($a1) -/* AFDFD4 80240494 1462000B */ bne $v1, $v0, .L802404C4 -/* AFDFD8 80240498 00A0302D */ daddu $a2, $a1, $zero -/* AFDFDC 8024049C 80A30006 */ lb $v1, 6($a1) -/* AFDFE0 802404A0 80A20005 */ lb $v0, 5($a1) -/* AFDFE4 802404A4 14620007 */ bne $v1, $v0, .L802404C4 -/* AFDFE8 802404A8 00000000 */ nop -/* AFDFEC 802404AC 80C2028E */ lb $v0, 0x28e($a2) -/* AFDFF0 802404B0 84C30290 */ lh $v1, 0x290($a2) -/* AFDFF4 802404B4 00021200 */ sll $v0, $v0, 8 -/* AFDFF8 802404B8 14620004 */ bne $v1, $v0, .L802404CC -/* AFDFFC 802404BC 24020001 */ addiu $v0, $zero, 1 -/* AFE000 802404C0 AC820088 */ sw $v0, 0x88($a0) -.L802404C4: -/* AFE004 802404C4 03E00008 */ jr $ra -/* AFE008 802404C8 24020002 */ addiu $v0, $zero, 2 -.L802404CC: -/* AFE00C 802404CC 03E00008 */ jr $ra -/* AFE010 802404D0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/func_802404D4_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/func_802404D4_AFDB40.s deleted file mode 100644 index 56f222d48f..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/func_802404D4_AFDB40.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404D4_AFE014 -/* AFE014 802404D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AFE018 802404D8 AFB10014 */ sw $s1, 0x14($sp) -/* AFE01C 802404DC 0080882D */ daddu $s1, $a0, $zero -/* AFE020 802404E0 AFBF001C */ sw $ra, 0x1c($sp) -/* AFE024 802404E4 AFB20018 */ sw $s2, 0x18($sp) -/* AFE028 802404E8 AFB00010 */ sw $s0, 0x10($sp) -/* AFE02C 802404EC 8E30000C */ lw $s0, 0xc($s1) -/* AFE030 802404F0 8E050000 */ lw $a1, ($s0) -/* AFE034 802404F4 0C0B1EAF */ jal get_variable -/* AFE038 802404F8 26100004 */ addiu $s0, $s0, 4 -/* AFE03C 802404FC 8E050000 */ lw $a1, ($s0) -/* AFE040 80240500 26100004 */ addiu $s0, $s0, 4 -/* AFE044 80240504 0220202D */ daddu $a0, $s1, $zero -/* AFE048 80240508 0C0B1EAF */ jal get_variable -/* AFE04C 8024050C 0040902D */ daddu $s2, $v0, $zero -/* AFE050 80240510 0220202D */ daddu $a0, $s1, $zero -/* AFE054 80240514 8E050000 */ lw $a1, ($s0) -/* AFE058 80240518 0C0B1EAF */ jal get_variable -/* AFE05C 8024051C 0040802D */ daddu $s0, $v0, $zero -/* AFE060 80240520 0000202D */ daddu $a0, $zero, $zero -/* AFE064 80240524 324500FF */ andi $a1, $s2, 0xff -/* AFE068 80240528 320600FF */ andi $a2, $s0, 0xff -/* AFE06C 8024052C 0C04DF84 */ jal func_80137E10 -/* AFE070 80240530 304700FF */ andi $a3, $v0, 0xff -/* AFE074 80240534 8FBF001C */ lw $ra, 0x1c($sp) -/* AFE078 80240538 8FB20018 */ lw $s2, 0x18($sp) -/* AFE07C 8024053C 8FB10014 */ lw $s1, 0x14($sp) -/* AFE080 80240540 8FB00010 */ lw $s0, 0x10($sp) -/* AFE084 80240544 24020002 */ addiu $v0, $zero, 2 -/* AFE088 80240548 03E00008 */ jr $ra -/* AFE08C 8024054C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240550_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/func_80240550_AFDB40.s deleted file mode 100644 index 7560858316..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240550_AFDB40.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240550_AFE090 -/* AFE090 80240550 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFE094 80240554 AFBF0010 */ sw $ra, 0x10($sp) -/* AFE098 80240558 8C82000C */ lw $v0, 0xc($a0) -/* AFE09C 8024055C 3C068011 */ lui $a2, 0x8011 -/* AFE0A0 80240560 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* AFE0A4 80240564 0C0B2026 */ jal set_variable -/* AFE0A8 80240568 8C450000 */ lw $a1, ($v0) -/* AFE0AC 8024056C 0C03AC5A */ jal func_800EB168 -/* AFE0B0 80240570 0000202D */ daddu $a0, $zero, $zero -/* AFE0B4 80240574 8FBF0010 */ lw $ra, 0x10($sp) -/* AFE0B8 80240578 24020002 */ addiu $v0, $zero, 2 -/* AFE0BC 8024057C 03E00008 */ jr $ra -/* AFE0C0 80240580 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240584_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/func_80240584_AFDB40.s deleted file mode 100644 index 92fdbef2d6..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/func_80240584_AFDB40.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240584_AFE0C4 -/* AFE0C4 80240584 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFE0C8 80240588 AFBF0010 */ sw $ra, 0x10($sp) -/* AFE0CC 8024058C 8C82000C */ lw $v0, 0xc($a0) -/* AFE0D0 80240590 0C0B1EAF */ jal get_variable -/* AFE0D4 80240594 8C450000 */ lw $a1, ($v0) -/* AFE0D8 80240598 00021600 */ sll $v0, $v0, 0x18 -/* AFE0DC 8024059C 0C03AC5A */ jal func_800EB168 -/* AFE0E0 802405A0 00022603 */ sra $a0, $v0, 0x18 -/* AFE0E4 802405A4 8FBF0010 */ lw $ra, 0x10($sp) -/* AFE0E8 802405A8 24020002 */ addiu $v0, $zero, 2 -/* AFE0EC 802405AC 03E00008 */ jr $ra -/* AFE0F0 802405B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/func_802405BC_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/func_802405BC_AFDB40.s deleted file mode 100644 index 139246b4ac..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/func_802405BC_AFDB40.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405BC_AFE0FC -/* AFE0FC 802405BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFE100 802405C0 AFBF0010 */ sw $ra, 0x10($sp) -/* AFE104 802405C4 8C82000C */ lw $v0, 0xc($a0) -/* AFE108 802405C8 3C068011 */ lui $a2, 0x8011 -/* AFE10C 802405CC 80C6EFD4 */ lb $a2, -0x102c($a2) -/* AFE110 802405D0 0C0B2026 */ jal set_variable -/* AFE114 802405D4 8C450000 */ lw $a1, ($v0) -/* AFE118 802405D8 8FBF0010 */ lw $ra, 0x10($sp) -/* AFE11C 802405DC 24020002 */ addiu $v0, $zero, 2 -/* AFE120 802405E0 03E00008 */ jr $ra -/* AFE124 802405E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* AFE128 802405E8 00000000 */ nop -/* AFE12C 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/func_80240020_B02880.s b/asm/nonmatchings/world/area_kkj/kkj_23/func_80240020_B02880.s deleted file mode 100644 index 37e564b43e..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_23/func_80240020_B02880.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_B028A0 -/* B028A0 80240020 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* B028A4 80240024 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* B028A8 80240028 9043007E */ lbu $v1, 0x7e($v0) -/* B028AC 8024002C 306300FE */ andi $v1, $v1, 0xfe -/* B028B0 80240030 A043007E */ sb $v1, 0x7e($v0) -/* B028B4 80240034 90820087 */ lbu $v0, 0x87($a0) -/* B028B8 80240038 3C018011 */ lui $at, 0x8011 -/* B028BC 8024003C A022F2A2 */ sb $v0, -0xd5e($at) -/* B028C0 80240040 03E00008 */ jr $ra -/* B028C4 80240044 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/func_80240048_B02880.s b/asm/nonmatchings/world/area_kkj/kkj_23/func_80240048_B02880.s deleted file mode 100644 index d6223aa13a..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_23/func_80240048_B02880.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240048_B028C8 -/* B028C8 80240048 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B028CC 8024004C AFBF0010 */ sw $ra, 0x10($sp) -/* B028D0 80240050 8C82000C */ lw $v0, 0xc($a0) -/* B028D4 80240054 0C0B210B */ jal get_float_variable -/* B028D8 80240058 8C450000 */ lw $a1, ($v0) -/* B028DC 8024005C 8FBF0010 */ lw $ra, 0x10($sp) -/* B028E0 80240060 4600008D */ trunc.w.s $f2, $f0 -/* B028E4 80240064 44021000 */ mfc1 $v0, $f2 -/* B028E8 80240068 00000000 */ nop -/* B028EC 8024006C 3C018011 */ lui $at, 0x8011 -/* B028F0 80240070 A022EFD5 */ sb $v0, -0x102b($at) -/* B028F4 80240074 24020002 */ addiu $v0, $zero, 2 -/* B028F8 80240078 03E00008 */ jr $ra -/* B028FC 8024007C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/func_80240080_B02880.s b/asm/nonmatchings/world/area_kkj/kkj_23/func_80240080_B02880.s deleted file mode 100644 index b73a51d694..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_23/func_80240080_B02880.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240080_B02900 -/* B02900 80240080 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B02904 80240084 AFB00018 */ sw $s0, 0x18($sp) -/* B02908 80240088 0080802D */ daddu $s0, $a0, $zero -/* B0290C 8024008C AFBF001C */ sw $ra, 0x1c($sp) -/* B02910 80240090 F7B40020 */ sdc1 $f20, 0x20($sp) -/* B02914 80240094 0C00EAD2 */ jal get_npc_safe -/* B02918 80240098 24040001 */ addiu $a0, $zero, 1 -/* B0291C 8024009C 2404023D */ addiu $a0, $zero, 0x23d -/* B02920 802400A0 C4420038 */ lwc1 $f2, 0x38($v0) -/* B02924 802400A4 C454003C */ lwc1 $f20, 0x3c($v0) -/* B02928 802400A8 C4400040 */ lwc1 $f0, 0x40($v0) -/* B0292C 802400AC 44061000 */ mfc1 $a2, $f2 -/* B02930 802400B0 4407A000 */ mfc1 $a3, $f20 -/* B02934 802400B4 0000282D */ daddu $a1, $zero, $zero -/* B02938 802400B8 0C05267B */ jal func_801499EC -/* B0293C 802400BC E7A00010 */ swc1 $f0, 0x10($sp) -/* B02940 802400C0 4600A10D */ trunc.w.s $f4, $f20 -/* B02944 802400C4 E6040084 */ swc1 $f4, 0x84($s0) -/* B02948 802400C8 8FBF001C */ lw $ra, 0x1c($sp) -/* B0294C 802400CC 8FB00018 */ lw $s0, 0x18($sp) -/* B02950 802400D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B02954 802400D4 24020002 */ addiu $v0, $zero, 2 -/* B02958 802400D8 03E00008 */ jr $ra -/* B0295C 802400DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/func_802400E0_B02880.s b/asm/nonmatchings/world/area_kkj/kkj_23/func_802400E0_B02880.s deleted file mode 100644 index 97092057ac..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_23/func_802400E0_B02880.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E0_B02960 -/* B02960 802400E0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* B02964 802400E4 AFB3003C */ sw $s3, 0x3c($sp) -/* B02968 802400E8 0080982D */ daddu $s3, $a0, $zero -/* B0296C 802400EC AFBF0044 */ sw $ra, 0x44($sp) -/* B02970 802400F0 AFB40040 */ sw $s4, 0x40($sp) -/* B02974 802400F4 AFB20038 */ sw $s2, 0x38($sp) -/* B02978 802400F8 AFB10034 */ sw $s1, 0x34($sp) -/* B0297C 802400FC AFB00030 */ sw $s0, 0x30($sp) -/* B02980 80240100 F7B80058 */ sdc1 $f24, 0x58($sp) -/* B02984 80240104 F7B60050 */ sdc1 $f22, 0x50($sp) -/* B02988 80240108 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B0298C 8024010C 8E620148 */ lw $v0, 0x148($s3) -/* B02990 80240110 0C00EABB */ jal get_npc_unsafe -/* B02994 80240114 84440008 */ lh $a0, 8($v0) -/* B02998 80240118 27A40020 */ addiu $a0, $sp, 0x20 -/* B0299C 8024011C 27A50024 */ addiu $a1, $sp, 0x24 -/* B029A0 80240120 0040802D */ daddu $s0, $v0, $zero -/* B029A4 80240124 8E63000C */ lw $v1, 0xc($s3) -/* B029A8 80240128 8E07000C */ lw $a3, 0xc($s0) -/* B029AC 8024012C C6000038 */ lwc1 $f0, 0x38($s0) -/* B029B0 80240130 C6020040 */ lwc1 $f2, 0x40($s0) -/* B029B4 80240134 8C740000 */ lw $s4, ($v1) -/* B029B8 80240138 24630004 */ addiu $v1, $v1, 4 -/* B029BC 8024013C C4780000 */ lwc1 $f24, ($v1) -/* B029C0 80240140 4680C620 */ cvt.s.w $f24, $f24 -/* B029C4 80240144 24630004 */ addiu $v1, $v1, 4 -/* B029C8 80240148 C4740000 */ lwc1 $f20, ($v1) -/* B029CC 8024014C 4680A520 */ cvt.s.w $f20, $f20 -/* B029D0 80240150 4406A000 */ mfc1 $a2, $f20 -/* B029D4 80240154 C4760004 */ lwc1 $f22, 4($v1) -/* B029D8 80240158 4680B5A0 */ cvt.s.w $f22, $f22 -/* B029DC 8024015C E7A00020 */ swc1 $f0, 0x20($sp) -/* B029E0 80240160 0C00A7E7 */ jal add_vec2D_polar -/* B029E4 80240164 E7A20024 */ swc1 $f2, 0x24($sp) -/* B029E8 80240168 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* B029EC 8024016C 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* B029F0 80240170 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* B029F4 80240174 4480A000 */ mtc1 $zero, $f20 -/* B029F8 80240178 8E460028 */ lw $a2, 0x28($s2) -/* B029FC 8024017C 4407A000 */ mfc1 $a3, $f20 -/* B02A00 80240180 0C00A7B5 */ jal dist2D -/* B02A04 80240184 4600A386 */ mov.s $f14, $f20 -/* B02A08 80240188 4600A306 */ mov.s $f12, $f20 -/* B02A0C 8024018C C7AE0024 */ lwc1 $f14, 0x24($sp) -/* B02A10 80240190 44066000 */ mfc1 $a2, $f12 -/* B02A14 80240194 8E470030 */ lw $a3, 0x30($s2) -/* B02A18 80240198 0C00A7B5 */ jal dist2D -/* B02A1C 8024019C 46000506 */ mov.s $f20, $f0 -/* B02A20 802401A0 C604000C */ lwc1 $f4, 0xc($s0) -/* B02A24 802401A4 3C018024 */ lui $at, 0x8024 -/* B02A28 802401A8 D4223CD0 */ ldc1 $f2, 0x3cd0($at) -/* B02A2C 802401AC 46002121 */ cvt.d.s $f4, $f4 -/* B02A30 802401B0 46222032 */ c.eq.d $f4, $f2 -/* B02A34 802401B4 00000000 */ nop -/* B02A38 802401B8 45010007 */ bc1t .L802401D8 -/* B02A3C 802401BC 46000086 */ mov.s $f2, $f0 -/* B02A40 802401C0 3C018024 */ lui $at, 0x8024 -/* B02A44 802401C4 D4203CD8 */ ldc1 $f0, 0x3cd8($at) -/* B02A48 802401C8 46202032 */ c.eq.d $f4, $f0 -/* B02A4C 802401CC 00000000 */ nop -/* B02A50 802401D0 45000008 */ bc1f .L802401F4 -/* B02A54 802401D4 00000000 */ nop -.L802401D8: -/* B02A58 802401D8 4618A03E */ c.le.s $f20, $f24 -/* B02A5C 802401DC 00000000 */ nop -/* B02A60 802401E0 4500000C */ bc1f .L80240214 -/* B02A64 802401E4 0000882D */ daddu $s1, $zero, $zero -/* B02A68 802401E8 4616103E */ c.le.s $f2, $f22 -/* B02A6C 802401EC 08090083 */ j .L8024020C -/* B02A70 802401F0 00000000 */ nop -.L802401F4: -/* B02A74 802401F4 4618103E */ c.le.s $f2, $f24 -/* B02A78 802401F8 00000000 */ nop -/* B02A7C 802401FC 45000005 */ bc1f .L80240214 -/* B02A80 80240200 0000882D */ daddu $s1, $zero, $zero -/* B02A84 80240204 4616A03E */ c.le.s $f20, $f22 -/* B02A88 80240208 00000000 */ nop -.L8024020C: -/* B02A8C 8024020C 45030001 */ bc1tl .L80240214 -/* B02A90 80240210 24110001 */ addiu $s1, $zero, 1 -.L80240214: -/* B02A94 80240214 12200027 */ beqz $s1, .L802402B4 -/* B02A98 80240218 0260202D */ daddu $a0, $s3, $zero -/* B02A9C 8024021C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B02AA0 80240220 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B02AA4 80240224 8E460028 */ lw $a2, 0x28($s2) -/* B02AA8 80240228 8E470030 */ lw $a3, 0x30($s2) -/* B02AAC 8024022C C602003C */ lwc1 $f2, 0x3c($s0) -/* B02AB0 80240230 46006006 */ mov.s $f0, $f12 -/* B02AB4 80240234 46007106 */ mov.s $f4, $f14 -/* B02AB8 80240238 E7A00020 */ swc1 $f0, 0x20($sp) -/* B02ABC 8024023C E7A20028 */ swc1 $f2, 0x28($sp) -/* B02AC0 80240240 0C00A7B5 */ jal dist2D -/* B02AC4 80240244 E7A40024 */ swc1 $f4, 0x24($sp) -/* B02AC8 80240248 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B02ACC 8024024C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B02AD0 80240250 8E460028 */ lw $a2, 0x28($s2) -/* B02AD4 80240254 8E470030 */ lw $a3, 0x30($s2) -/* B02AD8 80240258 0C00A720 */ jal atan2 -/* B02ADC 8024025C 46000506 */ mov.s $f20, $f0 -/* B02AE0 80240260 3C040007 */ lui $a0, 7 -/* B02AE4 80240264 34848000 */ ori $a0, $a0, 0x8000 -/* B02AE8 80240268 27A50020 */ addiu $a1, $sp, 0x20 -/* B02AEC 8024026C E7B40010 */ swc1 $f20, 0x10($sp) -/* B02AF0 80240270 E7A00014 */ swc1 $f0, 0x14($sp) -/* B02AF4 80240274 860200A6 */ lh $v0, 0xa6($s0) -/* B02AF8 80240278 27A60028 */ addiu $a2, $sp, 0x28 -/* B02AFC 8024027C 44820000 */ mtc1 $v0, $f0 -/* B02B00 80240280 00000000 */ nop -/* B02B04 80240284 46800020 */ cvt.s.w $f0, $f0 -/* B02B08 80240288 E7A00018 */ swc1 $f0, 0x18($sp) -/* B02B0C 8024028C 860200A8 */ lh $v0, 0xa8($s0) -/* B02B10 80240290 27A70024 */ addiu $a3, $sp, 0x24 -/* B02B14 80240294 44820000 */ mtc1 $v0, $f0 -/* B02B18 80240298 00000000 */ nop -/* B02B1C 8024029C 46800020 */ cvt.s.w $f0, $f0 -/* B02B20 802402A0 0C0376B9 */ jal func_800DDAE4 -/* B02B24 802402A4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B02B28 802402A8 54400001 */ bnel $v0, $zero, .L802402B0 -/* B02B2C 802402AC 0000882D */ daddu $s1, $zero, $zero -.L802402B0: -/* B02B30 802402B0 0260202D */ daddu $a0, $s3, $zero -.L802402B4: -/* B02B34 802402B4 0280282D */ daddu $a1, $s4, $zero -/* B02B38 802402B8 0C0B2026 */ jal set_variable -/* B02B3C 802402BC 0220302D */ daddu $a2, $s1, $zero -/* B02B40 802402C0 8FBF0044 */ lw $ra, 0x44($sp) -/* B02B44 802402C4 8FB40040 */ lw $s4, 0x40($sp) -/* B02B48 802402C8 8FB3003C */ lw $s3, 0x3c($sp) -/* B02B4C 802402CC 8FB20038 */ lw $s2, 0x38($sp) -/* B02B50 802402D0 8FB10034 */ lw $s1, 0x34($sp) -/* B02B54 802402D4 8FB00030 */ lw $s0, 0x30($sp) -/* B02B58 802402D8 D7B80058 */ ldc1 $f24, 0x58($sp) -/* B02B5C 802402DC D7B60050 */ ldc1 $f22, 0x50($sp) -/* B02B60 802402E0 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B02B64 802402E4 24020002 */ addiu $v0, $zero, 2 -/* B02B68 802402E8 03E00008 */ jr $ra -/* B02B6C 802402EC 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/func_802402F0_B02880.s b/asm/nonmatchings/world/area_kkj/kkj_23/func_802402F0_B02880.s deleted file mode 100644 index 9df02c1ede..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_23/func_802402F0_B02880.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_B02B70 -/* B02B70 802402F0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* B02B74 802402F4 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B02B78 802402F8 4485A000 */ mtc1 $a1, $f20 -/* B02B7C 802402FC F7B60068 */ sdc1 $f22, 0x68($sp) -/* B02B80 80240300 4486B000 */ mtc1 $a2, $f22 -/* B02B84 80240304 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B02B88 80240308 4487C000 */ mtc1 $a3, $f24 -/* B02B8C 8024030C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B02B90 80240310 C7BA0090 */ lwc1 $f26, 0x90($sp) -/* B02B94 80240314 AFBF0058 */ sw $ra, 0x58($sp) -/* B02B98 80240318 AFB10054 */ sw $s1, 0x54($sp) -/* B02B9C 8024031C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B02BA0 80240320 AFB00050 */ sw $s0, 0x50($sp) -/* B02BA4 80240324 0C046B4C */ jal get_model_from_list_index -/* B02BA8 80240328 0040202D */ daddu $a0, $v0, $zero -/* B02BAC 8024032C 0040802D */ daddu $s0, $v0, $zero -/* B02BB0 80240330 26110058 */ addiu $s1, $s0, 0x58 -/* B02BB4 80240334 4405A000 */ mfc1 $a1, $f20 -/* B02BB8 80240338 4406B000 */ mfc1 $a2, $f22 -/* B02BBC 8024033C 4407C000 */ mfc1 $a3, $f24 -/* B02BC0 80240340 0C019E40 */ jal guTranslateF -/* B02BC4 80240344 0220202D */ daddu $a0, $s1, $zero -/* B02BC8 80240348 27A40010 */ addiu $a0, $sp, 0x10 -/* B02BCC 8024034C 4405D000 */ mfc1 $a1, $f26 -/* B02BD0 80240350 3C063F80 */ lui $a2, 0x3f80 -/* B02BD4 80240354 0C019DF0 */ jal guScaleF -/* B02BD8 80240358 00A0382D */ daddu $a3, $a1, $zero -/* B02BDC 8024035C 27A40010 */ addiu $a0, $sp, 0x10 -/* B02BE0 80240360 0220282D */ daddu $a1, $s1, $zero -/* B02BE4 80240364 0C019D80 */ jal guMtxCatF -/* B02BE8 80240368 00A0302D */ daddu $a2, $a1, $zero -/* B02BEC 8024036C 96020000 */ lhu $v0, ($s0) -/* B02BF0 80240370 34421400 */ ori $v0, $v0, 0x1400 -/* B02BF4 80240374 A6020000 */ sh $v0, ($s0) -/* B02BF8 80240378 8FBF0058 */ lw $ra, 0x58($sp) -/* B02BFC 8024037C 8FB10054 */ lw $s1, 0x54($sp) -/* B02C00 80240380 8FB00050 */ lw $s0, 0x50($sp) -/* B02C04 80240384 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B02C08 80240388 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B02C0C 8024038C D7B60068 */ ldc1 $f22, 0x68($sp) -/* B02C10 80240390 D7B40060 */ ldc1 $f20, 0x60($sp) -/* B02C14 80240394 03E00008 */ jr $ra -/* B02C18 80240398 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/func_8024039C_B02880.s b/asm/nonmatchings/world/area_kkj/kkj_23/func_8024039C_B02880.s deleted file mode 100644 index e57aa77b55..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_23/func_8024039C_B02880.s +++ /dev/null @@ -1,190 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024039C_B02C1C -/* B02C1C 8024039C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* B02C20 802403A0 AFB7004C */ sw $s7, 0x4c($sp) -/* B02C24 802403A4 0080B82D */ daddu $s7, $a0, $zero -/* B02C28 802403A8 AFBF0054 */ sw $ra, 0x54($sp) -/* B02C2C 802403AC AFBE0050 */ sw $fp, 0x50($sp) -/* B02C30 802403B0 AFB60048 */ sw $s6, 0x48($sp) -/* B02C34 802403B4 AFB50044 */ sw $s5, 0x44($sp) -/* B02C38 802403B8 AFB40040 */ sw $s4, 0x40($sp) -/* B02C3C 802403BC AFB3003C */ sw $s3, 0x3c($sp) -/* B02C40 802403C0 AFB20038 */ sw $s2, 0x38($sp) -/* B02C44 802403C4 AFB10034 */ sw $s1, 0x34($sp) -/* B02C48 802403C8 AFB00030 */ sw $s0, 0x30($sp) -/* B02C4C 802403CC F7BA0070 */ sdc1 $f26, 0x70($sp) -/* B02C50 802403D0 F7B80068 */ sdc1 $f24, 0x68($sp) -/* B02C54 802403D4 F7B60060 */ sdc1 $f22, 0x60($sp) -/* B02C58 802403D8 F7B40058 */ sdc1 $f20, 0x58($sp) -/* B02C5C 802403DC 8EE20148 */ lw $v0, 0x148($s7) -/* B02C60 802403E0 0C00EABB */ jal get_npc_unsafe -/* B02C64 802403E4 84440008 */ lh $a0, 8($v0) -/* B02C68 802403E8 27B50020 */ addiu $s5, $sp, 0x20 -/* B02C6C 802403EC 02A0202D */ daddu $a0, $s5, $zero -/* B02C70 802403F0 0040882D */ daddu $s1, $v0, $zero -/* B02C74 802403F4 27B40024 */ addiu $s4, $sp, 0x24 -/* B02C78 802403F8 8EE3000C */ lw $v1, 0xc($s7) -/* B02C7C 802403FC 3C0641F0 */ lui $a2, 0x41f0 -/* B02C80 80240400 8E27000C */ lw $a3, 0xc($s1) -/* B02C84 80240404 C6200038 */ lwc1 $f0, 0x38($s1) -/* B02C88 80240408 C6220040 */ lwc1 $f2, 0x40($s1) -/* B02C8C 8024040C 8C7E0000 */ lw $fp, ($v1) -/* B02C90 80240410 24630004 */ addiu $v1, $v1, 4 -/* B02C94 80240414 C4740000 */ lwc1 $f20, ($v1) -/* B02C98 80240418 4680A520 */ cvt.s.w $f20, $f20 -/* B02C9C 8024041C 24630004 */ addiu $v1, $v1, 4 -/* B02CA0 80240420 C4760000 */ lwc1 $f22, ($v1) -/* B02CA4 80240424 4680B5A0 */ cvt.s.w $f22, $f22 -/* B02CA8 80240428 24630004 */ addiu $v1, $v1, 4 -/* B02CAC 8024042C C4780000 */ lwc1 $f24, ($v1) -/* B02CB0 80240430 4680C620 */ cvt.s.w $f24, $f24 -/* B02CB4 80240434 24630004 */ addiu $v1, $v1, 4 -/* B02CB8 80240438 C47A0000 */ lwc1 $f26, ($v1) -/* B02CBC 8024043C 4680D6A0 */ cvt.s.w $f26, $f26 -/* B02CC0 80240440 24630004 */ addiu $v1, $v1, 4 -/* B02CC4 80240444 8C760000 */ lw $s6, ($v1) -/* B02CC8 80240448 8C700004 */ lw $s0, 4($v1) -/* B02CCC 8024044C 0280282D */ daddu $a1, $s4, $zero -/* B02CD0 80240450 E7A00020 */ swc1 $f0, 0x20($sp) -/* B02CD4 80240454 0C00A7E7 */ jal add_vec2D_polar -/* B02CD8 80240458 E7A20024 */ swc1 $f2, 0x24($sp) -/* B02CDC 8024045C 3C038015 */ lui $v1, %hi(D_80151328) -/* B02CE0 80240460 8C631328 */ lw $v1, %lo(D_80151328)($v1) -/* B02CE4 80240464 C7A00020 */ lwc1 $f0, 0x20($sp) -/* B02CE8 80240468 3C0141A0 */ lui $at, 0x41a0 -/* B02CEC 8024046C 44811000 */ mtc1 $at, $f2 -/* B02CF0 80240470 00101040 */ sll $v0, $s0, 1 -/* B02CF4 80240474 00501021 */ addu $v0, $v0, $s0 -/* B02CF8 80240478 000210C0 */ sll $v0, $v0, 3 -/* B02CFC 8024047C 24420004 */ addiu $v0, $v0, 4 -/* B02D00 80240480 00621821 */ addu $v1, $v1, $v0 -/* B02D04 80240484 E4600004 */ swc1 $f0, 4($v1) -/* B02D08 80240488 C620003C */ lwc1 $f0, 0x3c($s1) -/* B02D0C 8024048C 4406A000 */ mfc1 $a2, $f20 -/* B02D10 80240490 46020000 */ add.s $f0, $f0, $f2 -/* B02D14 80240494 C7A20024 */ lwc1 $f2, 0x24($sp) -/* B02D18 80240498 02A0202D */ daddu $a0, $s5, $zero -/* B02D1C 8024049C E462000C */ swc1 $f2, 0xc($v1) -/* B02D20 802404A0 E4600008 */ swc1 $f0, 8($v1) -/* B02D24 802404A4 8E27000C */ lw $a3, 0xc($s1) -/* B02D28 802404A8 C6200038 */ lwc1 $f0, 0x38($s1) -/* B02D2C 802404AC C6220040 */ lwc1 $f2, 0x40($s1) -/* B02D30 802404B0 0280282D */ daddu $a1, $s4, $zero -/* B02D34 802404B4 E7A00020 */ swc1 $f0, 0x20($sp) -/* B02D38 802404B8 0C00A7E7 */ jal add_vec2D_polar -/* B02D3C 802404BC E7A20024 */ swc1 $f2, 0x24($sp) -/* B02D40 802404C0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* B02D44 802404C4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* B02D48 802404C8 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* B02D4C 802404CC C7AE0024 */ lwc1 $f14, 0x24($sp) -/* B02D50 802404D0 8E460028 */ lw $a2, 0x28($s2) -/* B02D54 802404D4 8E470030 */ lw $a3, 0x30($s2) -/* B02D58 802404D8 0C00A7B5 */ jal dist2D -/* B02D5C 802404DC 0000802D */ daddu $s0, $zero, $zero -/* B02D60 802404E0 4616003E */ c.le.s $f0, $f22 -/* B02D64 802404E4 00000000 */ nop -/* B02D68 802404E8 45000002 */ bc1f .L802404F4 -/* B02D6C 802404EC 0240982D */ daddu $s3, $s2, $zero -/* B02D70 802404F0 24100001 */ addiu $s0, $zero, 1 -.L802404F4: -/* B02D74 802404F4 4600B021 */ cvt.d.s $f0, $f22 -/* B02D78 802404F8 46200000 */ add.d $f0, $f0, $f0 -/* B02D7C 802404FC 3C014059 */ lui $at, 0x4059 -/* B02D80 80240500 44811800 */ mtc1 $at, $f3 -/* B02D84 80240504 44801000 */ mtc1 $zero, $f2 -/* B02D88 80240508 3C018024 */ lui $at, 0x8024 -/* B02D8C 8024050C D4243CE0 */ ldc1 $f4, 0x3ce0($at) -/* B02D90 80240510 46220003 */ div.d $f0, $f0, $f2 -/* B02D94 80240514 46240000 */ add.d $f0, $f0, $f4 -/* B02D98 80240518 C7A20020 */ lwc1 $f2, 0x20($sp) -/* B02D9C 8024051C C7A40024 */ lwc1 $f4, 0x24($sp) -/* B02DA0 80240520 44051000 */ mfc1 $a1, $f2 -/* B02DA4 80240524 44072000 */ mfc1 $a3, $f4 -/* B02DA8 80240528 46200020 */ cvt.s.d $f0, $f0 -/* B02DAC 8024052C E7A00010 */ swc1 $f0, 0x10($sp) -/* B02DB0 80240530 8E26003C */ lw $a2, 0x3c($s1) -/* B02DB4 80240534 0C0900BC */ jal func_802402F0 -/* B02DB8 80240538 02C0202D */ daddu $a0, $s6, $zero -/* B02DBC 8024053C 02A0202D */ daddu $a0, $s5, $zero -/* B02DC0 80240540 4406C000 */ mfc1 $a2, $f24 -/* B02DC4 80240544 8E27000C */ lw $a3, 0xc($s1) -/* B02DC8 80240548 C6200038 */ lwc1 $f0, 0x38($s1) -/* B02DCC 8024054C C6220040 */ lwc1 $f2, 0x40($s1) -/* B02DD0 80240550 0280282D */ daddu $a1, $s4, $zero -/* B02DD4 80240554 E7A00020 */ swc1 $f0, 0x20($sp) -/* B02DD8 80240558 0C00A7E7 */ jal add_vec2D_polar -/* B02DDC 8024055C E7A20024 */ swc1 $f2, 0x24($sp) -/* B02DE0 80240560 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* B02DE4 80240564 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* B02DE8 80240568 8E460028 */ lw $a2, 0x28($s2) -/* B02DEC 8024056C 0C00A7B5 */ jal dist2D -/* B02DF0 80240570 8E470030 */ lw $a3, 0x30($s2) -/* B02DF4 80240574 461A003E */ c.le.s $f0, $f26 -/* B02DF8 80240578 00000000 */ nop -/* B02DFC 8024057C 45030001 */ bc1tl .L80240584 -/* B02E00 80240580 36100010 */ ori $s0, $s0, 0x10 -.L80240584: -/* B02E04 80240584 32020001 */ andi $v0, $s0, 1 -/* B02E08 80240588 10400026 */ beqz $v0, .L80240624 -/* B02E0C 8024058C 02E0202D */ daddu $a0, $s7, $zero -/* B02E10 80240590 C62C0038 */ lwc1 $f12, 0x38($s1) -/* B02E14 80240594 C62E0040 */ lwc1 $f14, 0x40($s1) -/* B02E18 80240598 8E660028 */ lw $a2, 0x28($s3) -/* B02E1C 8024059C 8E670030 */ lw $a3, 0x30($s3) -/* B02E20 802405A0 C622003C */ lwc1 $f2, 0x3c($s1) -/* B02E24 802405A4 46006006 */ mov.s $f0, $f12 -/* B02E28 802405A8 46007106 */ mov.s $f4, $f14 -/* B02E2C 802405AC E7A00020 */ swc1 $f0, 0x20($sp) -/* B02E30 802405B0 E7A20028 */ swc1 $f2, 0x28($sp) -/* B02E34 802405B4 0C00A7B5 */ jal dist2D -/* B02E38 802405B8 E7A40024 */ swc1 $f4, 0x24($sp) -/* B02E3C 802405BC C62C0038 */ lwc1 $f12, 0x38($s1) -/* B02E40 802405C0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* B02E44 802405C4 8E660028 */ lw $a2, 0x28($s3) -/* B02E48 802405C8 8E670030 */ lw $a3, 0x30($s3) -/* B02E4C 802405CC 0C00A720 */ jal atan2 -/* B02E50 802405D0 46000506 */ mov.s $f20, $f0 -/* B02E54 802405D4 0000202D */ daddu $a0, $zero, $zero -/* B02E58 802405D8 02A0282D */ daddu $a1, $s5, $zero -/* B02E5C 802405DC E7B40010 */ swc1 $f20, 0x10($sp) -/* B02E60 802405E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* B02E64 802405E4 862200A6 */ lh $v0, 0xa6($s1) -/* B02E68 802405E8 27A60028 */ addiu $a2, $sp, 0x28 -/* B02E6C 802405EC 44820000 */ mtc1 $v0, $f0 -/* B02E70 802405F0 00000000 */ nop -/* B02E74 802405F4 46800020 */ cvt.s.w $f0, $f0 -/* B02E78 802405F8 E7A00018 */ swc1 $f0, 0x18($sp) -/* B02E7C 802405FC 862200A8 */ lh $v0, 0xa8($s1) -/* B02E80 80240600 0280382D */ daddu $a3, $s4, $zero -/* B02E84 80240604 44820000 */ mtc1 $v0, $f0 -/* B02E88 80240608 00000000 */ nop -/* B02E8C 8024060C 46800020 */ cvt.s.w $f0, $f0 -/* B02E90 80240610 0C0376B9 */ jal func_800DDAE4 -/* B02E94 80240614 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B02E98 80240618 54400001 */ bnel $v0, $zero, .L80240620 -/* B02E9C 8024061C 0000802D */ daddu $s0, $zero, $zero -.L80240620: -/* B02EA0 80240620 02E0202D */ daddu $a0, $s7, $zero -.L80240624: -/* B02EA4 80240624 03C0282D */ daddu $a1, $fp, $zero -/* B02EA8 80240628 0C0B2026 */ jal set_variable -/* B02EAC 8024062C 0200302D */ daddu $a2, $s0, $zero -/* B02EB0 80240630 8FBF0054 */ lw $ra, 0x54($sp) -/* B02EB4 80240634 8FBE0050 */ lw $fp, 0x50($sp) -/* B02EB8 80240638 8FB7004C */ lw $s7, 0x4c($sp) -/* B02EBC 8024063C 8FB60048 */ lw $s6, 0x48($sp) -/* B02EC0 80240640 8FB50044 */ lw $s5, 0x44($sp) -/* B02EC4 80240644 8FB40040 */ lw $s4, 0x40($sp) -/* B02EC8 80240648 8FB3003C */ lw $s3, 0x3c($sp) -/* B02ECC 8024064C 8FB20038 */ lw $s2, 0x38($sp) -/* B02ED0 80240650 8FB10034 */ lw $s1, 0x34($sp) -/* B02ED4 80240654 8FB00030 */ lw $s0, 0x30($sp) -/* B02ED8 80240658 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* B02EDC 8024065C D7B80068 */ ldc1 $f24, 0x68($sp) -/* B02EE0 80240660 D7B60060 */ ldc1 $f22, 0x60($sp) -/* B02EE4 80240664 D7B40058 */ ldc1 $f20, 0x58($sp) -/* B02EE8 80240668 24020002 */ addiu $v0, $zero, 2 -/* B02EEC 8024066C 03E00008 */ jr $ra -/* B02EF0 80240670 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/func_80240674_B02880.s b/asm/nonmatchings/world/area_kkj/kkj_23/func_80240674_B02880.s deleted file mode 100644 index 1b9af59db8..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_23/func_80240674_B02880.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240674_B02EF4 -/* B02EF4 80240674 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B02EF8 80240678 AFB10014 */ sw $s1, 0x14($sp) -/* B02EFC 8024067C 0080882D */ daddu $s1, $a0, $zero -/* B02F00 80240680 AFBF0024 */ sw $ra, 0x24($sp) -/* B02F04 80240684 AFB40020 */ sw $s4, 0x20($sp) -/* B02F08 80240688 AFB3001C */ sw $s3, 0x1c($sp) -/* B02F0C 8024068C AFB20018 */ sw $s2, 0x18($sp) -/* B02F10 80240690 AFB00010 */ sw $s0, 0x10($sp) -/* B02F14 80240694 8E30000C */ lw $s0, 0xc($s1) -/* B02F18 80240698 8E140000 */ lw $s4, ($s0) -/* B02F1C 8024069C 26100004 */ addiu $s0, $s0, 4 -/* B02F20 802406A0 8E050000 */ lw $a1, ($s0) -/* B02F24 802406A4 0C0B1EAF */ jal get_variable -/* B02F28 802406A8 26100004 */ addiu $s0, $s0, 4 -/* B02F2C 802406AC 8E050000 */ lw $a1, ($s0) -/* B02F30 802406B0 26100004 */ addiu $s0, $s0, 4 -/* B02F34 802406B4 0220202D */ daddu $a0, $s1, $zero -/* B02F38 802406B8 0C0B1EAF */ jal get_variable -/* B02F3C 802406BC 0040982D */ daddu $s3, $v0, $zero -/* B02F40 802406C0 8E050000 */ lw $a1, ($s0) -/* B02F44 802406C4 26100004 */ addiu $s0, $s0, 4 -/* B02F48 802406C8 0220202D */ daddu $a0, $s1, $zero -/* B02F4C 802406CC 0C0B1EAF */ jal get_variable -/* B02F50 802406D0 0040902D */ daddu $s2, $v0, $zero -/* B02F54 802406D4 0220202D */ daddu $a0, $s1, $zero -/* B02F58 802406D8 8E050000 */ lw $a1, ($s0) -/* B02F5C 802406DC 0C0B1EAF */ jal get_variable -/* B02F60 802406E0 0040802D */ daddu $s0, $v0, $zero -/* B02F64 802406E4 44901000 */ mtc1 $s0, $f2 -/* B02F68 802406E8 00000000 */ nop -/* B02F6C 802406EC 468010A0 */ cvt.s.w $f2, $f2 -/* B02F70 802406F0 44936000 */ mtc1 $s3, $f12 -/* B02F74 802406F4 00000000 */ nop -/* B02F78 802406F8 46806320 */ cvt.s.w $f12, $f12 -/* B02F7C 802406FC 44061000 */ mfc1 $a2, $f2 -/* B02F80 80240700 44821000 */ mtc1 $v0, $f2 -/* B02F84 80240704 00000000 */ nop -/* B02F88 80240708 468010A0 */ cvt.s.w $f2, $f2 -/* B02F8C 8024070C 44071000 */ mfc1 $a3, $f2 -/* B02F90 80240710 44927000 */ mtc1 $s2, $f14 -/* B02F94 80240714 00000000 */ nop -/* B02F98 80240718 0C00A720 */ jal atan2 -/* B02F9C 8024071C 468073A0 */ cvt.s.w $f14, $f14 -/* B02FA0 80240720 0220202D */ daddu $a0, $s1, $zero -/* B02FA4 80240724 4600008D */ trunc.w.s $f2, $f0 -/* B02FA8 80240728 44061000 */ mfc1 $a2, $f2 -/* B02FAC 8024072C 0C0B2026 */ jal set_variable -/* B02FB0 80240730 0280282D */ daddu $a1, $s4, $zero -/* B02FB4 80240734 8FBF0024 */ lw $ra, 0x24($sp) -/* B02FB8 80240738 8FB40020 */ lw $s4, 0x20($sp) -/* B02FBC 8024073C 8FB3001C */ lw $s3, 0x1c($sp) -/* B02FC0 80240740 8FB20018 */ lw $s2, 0x18($sp) -/* B02FC4 80240744 8FB10014 */ lw $s1, 0x14($sp) -/* B02FC8 80240748 8FB00010 */ lw $s0, 0x10($sp) -/* B02FCC 8024074C 24020002 */ addiu $v0, $zero, 2 -/* B02FD0 80240750 03E00008 */ jr $ra -/* B02FD4 80240754 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/func_80240784_B02880.s b/asm/nonmatchings/world/area_kkj/kkj_23/func_80240784_B02880.s deleted file mode 100644 index 62044209b6..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_23/func_80240784_B02880.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240784_B03004 -/* B03004 80240784 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* B03008 80240788 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* B0300C 8024078C 9062007E */ lbu $v0, 0x7e($v1) -/* B03010 80240790 34420008 */ ori $v0, $v0, 8 -/* B03014 80240794 A062007E */ sb $v0, 0x7e($v1) -/* B03018 80240798 03E00008 */ jr $ra -/* B0301C 8024079C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/func_802407A0_B02880.s b/asm/nonmatchings/world/area_kkj/kkj_23/func_802407A0_B02880.s deleted file mode 100644 index 06c873b807..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_23/func_802407A0_B02880.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A0_B03020 -/* B03020 802407A0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B03024 802407A4 AFB3001C */ sw $s3, 0x1c($sp) -/* B03028 802407A8 0080982D */ daddu $s3, $a0, $zero -/* B0302C 802407AC AFBF0030 */ sw $ra, 0x30($sp) -/* B03030 802407B0 AFB7002C */ sw $s7, 0x2c($sp) -/* B03034 802407B4 AFB60028 */ sw $s6, 0x28($sp) -/* B03038 802407B8 AFB50024 */ sw $s5, 0x24($sp) -/* B0303C 802407BC AFB40020 */ sw $s4, 0x20($sp) -/* B03040 802407C0 AFB20018 */ sw $s2, 0x18($sp) -/* B03044 802407C4 AFB10014 */ sw $s1, 0x14($sp) -/* B03048 802407C8 AFB00010 */ sw $s0, 0x10($sp) -/* B0304C 802407CC F7B80048 */ sdc1 $f24, 0x48($sp) -/* B03050 802407D0 F7B60040 */ sdc1 $f22, 0x40($sp) -/* B03054 802407D4 F7B40038 */ sdc1 $f20, 0x38($sp) -/* B03058 802407D8 8E70000C */ lw $s0, 0xc($s3) -/* B0305C 802407DC 8E050000 */ lw $a1, ($s0) -/* B03060 802407E0 0C0B1EAF */ jal get_variable -/* B03064 802407E4 26100004 */ addiu $s0, $s0, 4 -/* B03068 802407E8 8E150000 */ lw $s5, ($s0) -/* B0306C 802407EC 26100004 */ addiu $s0, $s0, 4 -/* B03070 802407F0 0260202D */ daddu $a0, $s3, $zero -/* B03074 802407F4 8E160000 */ lw $s6, ($s0) -/* B03078 802407F8 8E170004 */ lw $s7, 4($s0) -/* B0307C 802407FC 0C0B36B0 */ jal resolve_npc -/* B03080 80240800 0040282D */ daddu $a1, $v0, $zero -/* B03084 80240804 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* B03088 80240808 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* B0308C 8024080C 0040802D */ daddu $s0, $v0, $zero -/* B03090 80240810 1200002F */ beqz $s0, .L802408D0 -/* B03094 80240814 0220902D */ daddu $s2, $s1, $zero -/* B03098 80240818 C62C0028 */ lwc1 $f12, 0x28($s1) -/* B0309C 8024081C C62E0030 */ lwc1 $f14, 0x30($s1) -/* B030A0 80240820 8E060038 */ lw $a2, 0x38($s0) -/* B030A4 80240824 8E070040 */ lw $a3, 0x40($s0) -/* B030A8 80240828 3C014248 */ lui $at, 0x4248 -/* B030AC 8024082C 4481C000 */ mtc1 $at, $f24 -/* B030B0 80240830 0C00A7B5 */ jal dist2D -/* B030B4 80240834 24140001 */ addiu $s4, $zero, 1 -/* B030B8 80240838 4618003C */ c.lt.s $f0, $f24 -/* B030BC 8024083C 00000000 */ nop -/* B030C0 80240840 45030001 */ bc1tl .L80240848 -/* B030C4 80240844 0000A02D */ daddu $s4, $zero, $zero -.L80240848: -/* B030C8 80240848 C64C0028 */ lwc1 $f12, 0x28($s2) -/* B030CC 8024084C C64E0030 */ lwc1 $f14, 0x30($s2) -/* B030D0 80240850 8E060038 */ lw $a2, 0x38($s0) -/* B030D4 80240854 0C00A720 */ jal atan2 -/* B030D8 80240858 8E070040 */ lw $a3, 0x40($s0) -/* B030DC 8024085C 0C00A6C9 */ jal clamp_angle -/* B030E0 80240860 46000306 */ mov.s $f12, $f0 -/* B030E4 80240864 46000506 */ mov.s $f20, $f0 -/* B030E8 80240868 0C00A8BB */ jal sin_deg -/* B030EC 8024086C 4600A306 */ mov.s $f12, $f20 -/* B030F0 80240870 46180002 */ mul.s $f0, $f0, $f24 -/* B030F4 80240874 00000000 */ nop -/* B030F8 80240878 C6560028 */ lwc1 $f22, 0x28($s2) -/* B030FC 8024087C 4600B580 */ add.s $f22, $f22, $f0 -/* B03100 80240880 0C00A8D4 */ jal cos_deg -/* B03104 80240884 4600A306 */ mov.s $f12, $f20 -/* B03108 80240888 46180002 */ mul.s $f0, $f0, $f24 -/* B0310C 8024088C 00000000 */ nop -/* B03110 80240890 0260202D */ daddu $a0, $s3, $zero -/* B03114 80240894 02A0282D */ daddu $a1, $s5, $zero -/* B03118 80240898 C6540030 */ lwc1 $f20, 0x30($s2) -/* B0311C 8024089C 0280302D */ daddu $a2, $s4, $zero -/* B03120 802408A0 0C0B2026 */ jal set_variable -/* B03124 802408A4 4600A501 */ sub.s $f20, $f20, $f0 -/* B03128 802408A8 0260202D */ daddu $a0, $s3, $zero -/* B0312C 802408AC 4600B08D */ trunc.w.s $f2, $f22 -/* B03130 802408B0 44061000 */ mfc1 $a2, $f2 -/* B03134 802408B4 0C0B2026 */ jal set_variable -/* B03138 802408B8 02C0282D */ daddu $a1, $s6, $zero -/* B0313C 802408BC 0260202D */ daddu $a0, $s3, $zero -/* B03140 802408C0 4600A08D */ trunc.w.s $f2, $f20 -/* B03144 802408C4 44061000 */ mfc1 $a2, $f2 -/* B03148 802408C8 0C0B2026 */ jal set_variable -/* B0314C 802408CC 02E0282D */ daddu $a1, $s7, $zero -.L802408D0: -/* B03150 802408D0 24020002 */ addiu $v0, $zero, 2 -/* B03154 802408D4 8FBF0030 */ lw $ra, 0x30($sp) -/* B03158 802408D8 8FB7002C */ lw $s7, 0x2c($sp) -/* B0315C 802408DC 8FB60028 */ lw $s6, 0x28($sp) -/* B03160 802408E0 8FB50024 */ lw $s5, 0x24($sp) -/* B03164 802408E4 8FB40020 */ lw $s4, 0x20($sp) -/* B03168 802408E8 8FB3001C */ lw $s3, 0x1c($sp) -/* B0316C 802408EC 8FB20018 */ lw $s2, 0x18($sp) -/* B03170 802408F0 8FB10014 */ lw $s1, 0x14($sp) -/* B03174 802408F4 8FB00010 */ lw $s0, 0x10($sp) -/* B03178 802408F8 D7B80048 */ ldc1 $f24, 0x48($sp) -/* B0317C 802408FC D7B60040 */ ldc1 $f22, 0x40($sp) -/* B03180 80240900 D7B40038 */ ldc1 $f20, 0x38($sp) -/* B03184 80240904 03E00008 */ jr $ra -/* B03188 80240908 27BD0050 */ addiu $sp, $sp, 0x50 -/* B0318C 8024090C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240020_B06A00.s b/asm/nonmatchings/world/area_kkj/kkj_25/func_80240020_B06A00.s deleted file mode 100644 index 96bbb3b6ab..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240020_B06A00.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_B06A20 -/* B06A20 80240020 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B06A24 80240024 AFBF0010 */ sw $ra, 0x10($sp) -/* B06A28 80240028 0C03A6D5 */ jal increment_status_menu_disabled -/* B06A2C 8024002C 00000000 */ nop -/* B06A30 80240030 3C05437F */ lui $a1, 0x437f -/* B06A34 80240034 0C04DF69 */ jal func_80137DA4 -/* B06A38 80240038 0000202D */ daddu $a0, $zero, $zero -/* B06A3C 8024003C 8FBF0010 */ lw $ra, 0x10($sp) -/* B06A40 80240040 24020002 */ addiu $v0, $zero, 2 -/* B06A44 80240044 03E00008 */ jr $ra -/* B06A48 80240048 27BD0018 */ addiu $sp, $sp, 0x18 -/* B06A4C 8024004C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240050_B06A00.s b/asm/nonmatchings/world/area_kkj/kkj_25/func_80240050_B06A00.s deleted file mode 100644 index 07fa0e0388..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240050_B06A00.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_B06A50 -/* B06A50 80240050 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B06A54 80240054 AFBF0010 */ sw $ra, 0x10($sp) -/* B06A58 80240058 0C03A6D5 */ jal increment_status_menu_disabled -/* B06A5C 8024005C 00000000 */ nop -/* B06A60 80240060 3C05437F */ lui $a1, 0x437f -/* B06A64 80240064 0C04DF69 */ jal func_80137DA4 -/* B06A68 80240068 0000202D */ daddu $a0, $zero, $zero -/* B06A6C 8024006C 8FBF0010 */ lw $ra, 0x10($sp) -/* B06A70 80240070 24020002 */ addiu $v0, $zero, 2 -/* B06A74 80240074 03E00008 */ jr $ra -/* B06A78 80240078 27BD0018 */ addiu $sp, $sp, 0x18 -/* B06A7C 8024007C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240080_B06A00.s b/asm/nonmatchings/world/area_kkj/kkj_25/func_80240080_B06A00.s deleted file mode 100644 index 9921d1a608..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240080_B06A00.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240080_B06A80 -/* B06A80 80240080 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B06A84 80240084 AFBF0010 */ sw $ra, 0x10($sp) -/* B06A88 80240088 8C82000C */ lw $v0, 0xc($a0) -/* B06A8C 8024008C 3C068016 */ lui $a2, 0x8016 -/* B06A90 80240090 84C6A552 */ lh $a2, -0x5aae($a2) -/* B06A94 80240094 0C0B2026 */ jal set_variable -/* B06A98 80240098 8C450000 */ lw $a1, ($v0) -/* B06A9C 8024009C 8FBF0010 */ lw $ra, 0x10($sp) -/* B06AA0 802400A0 24020002 */ addiu $v0, $zero, 2 -/* B06AA4 802400A4 03E00008 */ jr $ra -/* B06AA8 802400A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/func_802400AC_B06A00.s b/asm/nonmatchings/world/area_kkj/kkj_25/func_802400AC_B06A00.s deleted file mode 100644 index 2954cf4701..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/func_802400AC_B06A00.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400AC_B06AAC -/* B06AAC 802400AC 8C8400C0 */ lw $a0, 0xc0($a0) -/* B06AB0 802400B0 8C83000C */ lw $v1, 0xc($a0) -/* B06AB4 802400B4 24020055 */ addiu $v0, $zero, 0x55 -/* B06AB8 802400B8 AC620030 */ sw $v0, 0x30($v1) -/* B06ABC 802400BC 8C83000C */ lw $v1, 0xc($a0) -/* B06AC0 802400C0 2402002A */ addiu $v0, $zero, 0x2a -/* B06AC4 802400C4 AC620034 */ sw $v0, 0x34($v1) -/* B06AC8 802400C8 8C82000C */ lw $v0, 0xc($a0) -/* B06ACC 802400CC 240300FF */ addiu $v1, $zero, 0xff -/* B06AD0 802400D0 AC430038 */ sw $v1, 0x38($v0) -/* B06AD4 802400D4 8C82000C */ lw $v0, 0xc($a0) -/* B06AD8 802400D8 AC430040 */ sw $v1, 0x40($v0) -/* B06ADC 802400DC 8C83000C */ lw $v1, 0xc($a0) -/* B06AE0 802400E0 240200AF */ addiu $v0, $zero, 0xaf -/* B06AE4 802400E4 AC620044 */ sw $v0, 0x44($v1) -/* B06AE8 802400E8 8C83000C */ lw $v1, 0xc($a0) -/* B06AEC 802400EC 240200EF */ addiu $v0, $zero, 0xef -/* B06AF0 802400F0 AC620048 */ sw $v0, 0x48($v1) -/* B06AF4 802400F4 03E00008 */ jr $ra -/* B06AF8 802400F8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/func_802400FC_B06A00.s b/asm/nonmatchings/world/area_kkj/kkj_25/func_802400FC_B06A00.s deleted file mode 100644 index fe6d3e5e26..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/func_802400FC_B06A00.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400FC_B06AFC -/* B06AFC 802400FC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B06B00 80240100 AFB10014 */ sw $s1, 0x14($sp) -/* B06B04 80240104 0080882D */ daddu $s1, $a0, $zero -/* B06B08 80240108 AFBF001C */ sw $ra, 0x1c($sp) -/* B06B0C 8024010C AFB20018 */ sw $s2, 0x18($sp) -/* B06B10 80240110 AFB00010 */ sw $s0, 0x10($sp) -/* B06B14 80240114 F7B80030 */ sdc1 $f24, 0x30($sp) -/* B06B18 80240118 F7B60028 */ sdc1 $f22, 0x28($sp) -/* B06B1C 8024011C F7B40020 */ sdc1 $f20, 0x20($sp) -/* B06B20 80240120 8E30000C */ lw $s0, 0xc($s1) -/* B06B24 80240124 8E050000 */ lw $a1, ($s0) -/* B06B28 80240128 0C0B1EAF */ jal get_variable -/* B06B2C 8024012C 26100004 */ addiu $s0, $s0, 4 -/* B06B30 80240130 8E050000 */ lw $a1, ($s0) -/* B06B34 80240134 26100004 */ addiu $s0, $s0, 4 -/* B06B38 80240138 0220202D */ daddu $a0, $s1, $zero -/* B06B3C 8024013C 0C0B1EAF */ jal get_variable -/* B06B40 80240140 0040902D */ daddu $s2, $v0, $zero -/* B06B44 80240144 8E050000 */ lw $a1, ($s0) -/* B06B48 80240148 26100004 */ addiu $s0, $s0, 4 -/* B06B4C 8024014C 4482C000 */ mtc1 $v0, $f24 -/* B06B50 80240150 00000000 */ nop -/* B06B54 80240154 4680C620 */ cvt.s.w $f24, $f24 -/* B06B58 80240158 0C0B1EAF */ jal get_variable -/* B06B5C 8024015C 0220202D */ daddu $a0, $s1, $zero -/* B06B60 80240160 8E050000 */ lw $a1, ($s0) -/* B06B64 80240164 4482B000 */ mtc1 $v0, $f22 -/* B06B68 80240168 00000000 */ nop -/* B06B6C 8024016C 4680B5A0 */ cvt.s.w $f22, $f22 -/* B06B70 80240170 0C0B1EAF */ jal get_variable -/* B06B74 80240174 0220202D */ daddu $a0, $s1, $zero -/* B06B78 80240178 4482A000 */ mtc1 $v0, $f20 -/* B06B7C 8024017C 00000000 */ nop -/* B06B80 80240180 4680A520 */ cvt.s.w $f20, $f20 -/* B06B84 80240184 0C04417A */ jal get_entity_by_index -/* B06B88 80240188 0240202D */ daddu $a0, $s2, $zero -/* B06B8C 8024018C 0040182D */ daddu $v1, $v0, $zero -/* B06B90 80240190 E4780048 */ swc1 $f24, 0x48($v1) -/* B06B94 80240194 E476004C */ swc1 $f22, 0x4c($v1) -/* B06B98 80240198 E4740050 */ swc1 $f20, 0x50($v1) -/* B06B9C 8024019C 8FBF001C */ lw $ra, 0x1c($sp) -/* B06BA0 802401A0 8FB20018 */ lw $s2, 0x18($sp) -/* B06BA4 802401A4 8FB10014 */ lw $s1, 0x14($sp) -/* B06BA8 802401A8 8FB00010 */ lw $s0, 0x10($sp) -/* B06BAC 802401AC D7B80030 */ ldc1 $f24, 0x30($sp) -/* B06BB0 802401B0 D7B60028 */ ldc1 $f22, 0x28($sp) -/* B06BB4 802401B4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B06BB8 802401B8 24020002 */ addiu $v0, $zero, 2 -/* B06BBC 802401BC 03E00008 */ jr $ra -/* B06BC0 802401C0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240310_B06A00.s b/asm/nonmatchings/world/area_kkj/kkj_25/func_80240310_B06A00.s deleted file mode 100644 index a3f8f72e22..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240310_B06A00.s +++ /dev/null @@ -1,251 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_B06D10 -/* B06D10 80240310 27BDFF10 */ addiu $sp, $sp, -0xf0 -/* B06D14 80240314 0000202D */ daddu $a0, $zero, $zero -/* B06D18 80240318 3C05FD05 */ lui $a1, 0xfd05 -/* B06D1C 8024031C AFBF00DC */ sw $ra, 0xdc($sp) -/* B06D20 80240320 AFB600D8 */ sw $s6, 0xd8($sp) -/* B06D24 80240324 AFB500D4 */ sw $s5, 0xd4($sp) -/* B06D28 80240328 AFB400D0 */ sw $s4, 0xd0($sp) -/* B06D2C 8024032C AFB300CC */ sw $s3, 0xcc($sp) -/* B06D30 80240330 AFB200C8 */ sw $s2, 0xc8($sp) -/* B06D34 80240334 AFB100C4 */ sw $s1, 0xc4($sp) -/* B06D38 80240338 AFB000C0 */ sw $s0, 0xc0($sp) -/* B06D3C 8024033C F7B600E8 */ sdc1 $f22, 0xe8($sp) -/* B06D40 80240340 F7B400E0 */ sdc1 $f20, 0xe0($sp) -/* B06D44 80240344 0C0B1EAF */ jal get_variable -/* B06D48 80240348 34A50F8A */ ori $a1, $a1, 0xf8a -/* B06D4C 8024034C 3C07E300 */ lui $a3, 0xe300 -/* B06D50 80240350 34E70A01 */ ori $a3, $a3, 0xa01 -/* B06D54 80240354 3C08D9C0 */ lui $t0, 0xd9c0 -/* B06D58 80240358 3508F9FB */ ori $t0, $t0, 0xf9fb -/* B06D5C 8024035C 3C0AD9FF */ lui $t2, 0xd9ff -/* B06D60 80240360 354AFFFF */ ori $t2, $t2, 0xffff -/* B06D64 80240364 3C090020 */ lui $t1, 0x20 -/* B06D68 80240368 35290005 */ ori $t1, $t1, 5 -/* B06D6C 8024036C 3C0BD700 */ lui $t3, 0xd700 -/* B06D70 80240370 356B0002 */ ori $t3, $t3, 2 -/* B06D74 80240374 3C0CE300 */ lui $t4, 0xe300 -/* B06D78 80240378 358C0F00 */ ori $t4, $t4, 0xf00 -/* B06D7C 8024037C 3C0DE300 */ lui $t5, 0xe300 -/* B06D80 80240380 35AD0C00 */ ori $t5, $t5, 0xc00 -/* B06D84 80240384 3C0EE300 */ lui $t6, 0xe300 -/* B06D88 80240388 35CE1201 */ ori $t6, $t6, 0x1201 -/* B06D8C 8024038C 3C0FE300 */ lui $t7, 0xe300 -/* B06D90 80240390 35EF1801 */ ori $t7, $t7, 0x1801 -/* B06D94 80240394 3C10E300 */ lui $s0, 0xe300 -/* B06D98 80240398 36100D01 */ ori $s0, $s0, 0xd01 -/* B06D9C 8024039C 3C12E300 */ lui $s2, 0xe300 -/* B06DA0 802403A0 36521402 */ ori $s2, $s2, 0x1402 -/* B06DA4 802403A4 3C14E300 */ lui $s4, 0xe300 -/* B06DA8 802403A8 36941700 */ ori $s4, $s4, 0x1700 -/* B06DAC 802403AC 3C15E200 */ lui $s5, 0xe200 -/* B06DB0 802403B0 36B51E01 */ ori $s5, $s5, 0x1e01 -/* B06DB4 802403B4 27B30040 */ addiu $s3, $sp, 0x40 -/* B06DB8 802403B8 0260202D */ daddu $a0, $s3, $zero -/* B06DBC 802403BC 3C160001 */ lui $s6, 1 -/* B06DC0 802403C0 3C11800A */ lui $s1, 0x800a -/* B06DC4 802403C4 2631A66C */ addiu $s1, $s1, -0x5994 -/* B06DC8 802403C8 36D61630 */ ori $s6, $s6, 0x1630 -/* B06DCC 802403CC 3C05E700 */ lui $a1, 0xe700 -/* B06DD0 802403D0 8E230000 */ lw $v1, ($s1) -/* B06DD4 802403D4 4480A000 */ mtc1 $zero, $f20 -/* B06DD8 802403D8 0060302D */ daddu $a2, $v1, $zero -/* B06DDC 802403DC 24630008 */ addiu $v1, $v1, 8 -/* B06DE0 802403E0 AE230000 */ sw $v1, ($s1) -/* B06DE4 802403E4 ACC50000 */ sw $a1, ($a2) -/* B06DE8 802403E8 24650008 */ addiu $a1, $v1, 8 -/* B06DEC 802403EC ACC00004 */ sw $zero, 4($a2) -/* B06DF0 802403F0 AE250000 */ sw $a1, ($s1) -/* B06DF4 802403F4 24650010 */ addiu $a1, $v1, 0x10 -/* B06DF8 802403F8 AC670000 */ sw $a3, ($v1) -/* B06DFC 802403FC AC600004 */ sw $zero, 4($v1) -/* B06E00 80240400 AE250000 */ sw $a1, ($s1) -/* B06E04 80240404 24650018 */ addiu $a1, $v1, 0x18 -/* B06E08 80240408 AC680008 */ sw $t0, 8($v1) -/* B06E0C 8024040C AC60000C */ sw $zero, 0xc($v1) -/* B06E10 80240410 AE250000 */ sw $a1, ($s1) -/* B06E14 80240414 24650020 */ addiu $a1, $v1, 0x20 -/* B06E18 80240418 AC6A0010 */ sw $t2, 0x10($v1) -/* B06E1C 8024041C AC690014 */ sw $t1, 0x14($v1) -/* B06E20 80240420 AE250000 */ sw $a1, ($s1) -/* B06E24 80240424 2405FFFF */ addiu $a1, $zero, -1 -/* B06E28 80240428 AC65001C */ sw $a1, 0x1c($v1) -/* B06E2C 8024042C 24650028 */ addiu $a1, $v1, 0x28 -/* B06E30 80240430 AC6B0018 */ sw $t3, 0x18($v1) -/* B06E34 80240434 AE250000 */ sw $a1, ($s1) -/* B06E38 80240438 24650030 */ addiu $a1, $v1, 0x30 -/* B06E3C 8024043C AC6C0020 */ sw $t4, 0x20($v1) -/* B06E40 80240440 AC600024 */ sw $zero, 0x24($v1) -/* B06E44 80240444 AE250000 */ sw $a1, ($s1) -/* B06E48 80240448 3C050008 */ lui $a1, 8 -/* B06E4C 8024044C AC65002C */ sw $a1, 0x2c($v1) -/* B06E50 80240450 24650038 */ addiu $a1, $v1, 0x38 -/* B06E54 80240454 AC6D0028 */ sw $t5, 0x28($v1) -/* B06E58 80240458 AE250000 */ sw $a1, ($s1) -/* B06E5C 8024045C 24052000 */ addiu $a1, $zero, 0x2000 -/* B06E60 80240460 AC650034 */ sw $a1, 0x34($v1) -/* B06E64 80240464 24650040 */ addiu $a1, $v1, 0x40 -/* B06E68 80240468 AC6E0030 */ sw $t6, 0x30($v1) -/* B06E6C 8024046C AE250000 */ sw $a1, ($s1) -/* B06E70 80240470 240500C0 */ addiu $a1, $zero, 0xc0 -/* B06E74 80240474 AC65003C */ sw $a1, 0x3c($v1) -/* B06E78 80240478 24650048 */ addiu $a1, $v1, 0x48 -/* B06E7C 8024047C AC6F0038 */ sw $t7, 0x38($v1) -/* B06E80 80240480 AE250000 */ sw $a1, ($s1) -/* B06E84 80240484 24650050 */ addiu $a1, $v1, 0x50 -/* B06E88 80240488 AC700040 */ sw $s0, 0x40($v1) -/* B06E8C 8024048C AC600044 */ sw $zero, 0x44($v1) -/* B06E90 80240490 AE250000 */ sw $a1, ($s1) -/* B06E94 80240494 24050C00 */ addiu $a1, $zero, 0xc00 -/* B06E98 80240498 AC720048 */ sw $s2, 0x48($v1) -/* B06E9C 8024049C 0040902D */ daddu $s2, $v0, $zero -/* B06EA0 802404A0 24620058 */ addiu $v0, $v1, 0x58 -/* B06EA4 802404A4 AC65004C */ sw $a1, 0x4c($v1) -/* B06EA8 802404A8 AC740050 */ sw $s4, 0x50($v1) -/* B06EAC 802404AC AC600054 */ sw $zero, 0x54($v1) -/* B06EB0 802404B0 AC750058 */ sw $s5, 0x58($v1) -/* B06EB4 802404B4 AC60005C */ sw $zero, 0x5c($v1) -/* B06EB8 802404B8 8E450010 */ lw $a1, 0x10($s2) -/* B06EBC 802404BC 8E460014 */ lw $a2, 0x14($s2) -/* B06EC0 802404C0 8E470018 */ lw $a3, 0x18($s2) -/* B06EC4 802404C4 24630060 */ addiu $v1, $v1, 0x60 -/* B06EC8 802404C8 AE220000 */ sw $v0, ($s1) -/* B06ECC 802404CC 0C019E40 */ jal guTranslateF -/* B06ED0 802404D0 AE230000 */ sw $v1, ($s1) -/* B06ED4 802404D4 27B00080 */ addiu $s0, $sp, 0x80 -/* B06ED8 802404D8 E7B40010 */ swc1 $f20, 0x10($sp) -/* B06EDC 802404DC 8E450020 */ lw $a1, 0x20($s2) -/* B06EE0 802404E0 3C013F80 */ lui $at, 0x3f80 -/* B06EE4 802404E4 4481B000 */ mtc1 $at, $f22 -/* B06EE8 802404E8 4406A000 */ mfc1 $a2, $f20 -/* B06EEC 802404EC 4407B000 */ mfc1 $a3, $f22 -/* B06EF0 802404F0 0C019EC8 */ jal guRotateF -/* B06EF4 802404F4 0200202D */ daddu $a0, $s0, $zero -/* B06EF8 802404F8 0200202D */ daddu $a0, $s0, $zero -/* B06EFC 802404FC 0260282D */ daddu $a1, $s3, $zero -/* B06F00 80240500 0C019D80 */ jal guMtxCatF -/* B06F04 80240504 0260302D */ daddu $a2, $s3, $zero -/* B06F08 80240508 E7B60010 */ swc1 $f22, 0x10($sp) -/* B06F0C 8024050C 8E450024 */ lw $a1, 0x24($s2) -/* B06F10 80240510 4406A000 */ mfc1 $a2, $f20 -/* B06F14 80240514 4407A000 */ mfc1 $a3, $f20 -/* B06F18 80240518 0C019EC8 */ jal guRotateF -/* B06F1C 8024051C 0200202D */ daddu $a0, $s0, $zero -/* B06F20 80240520 0200202D */ daddu $a0, $s0, $zero -/* B06F24 80240524 0260282D */ daddu $a1, $s3, $zero -/* B06F28 80240528 0C019D80 */ jal guMtxCatF -/* B06F2C 8024052C 0260302D */ daddu $a2, $s3, $zero -/* B06F30 80240530 E7B40010 */ swc1 $f20, 0x10($sp) -/* B06F34 80240534 8E45001C */ lw $a1, 0x1c($s2) -/* B06F38 80240538 4406B000 */ mfc1 $a2, $f22 -/* B06F3C 8024053C 4407A000 */ mfc1 $a3, $f20 -/* B06F40 80240540 0C019EC8 */ jal guRotateF -/* B06F44 80240544 0200202D */ daddu $a0, $s0, $zero -/* B06F48 80240548 0200202D */ daddu $a0, $s0, $zero -/* B06F4C 8024054C 0260282D */ daddu $a1, $s3, $zero -/* B06F50 80240550 0C019D80 */ jal guMtxCatF -/* B06F54 80240554 0260302D */ daddu $a2, $s3, $zero -/* B06F58 80240558 8E450028 */ lw $a1, 0x28($s2) -/* B06F5C 8024055C 8E46002C */ lw $a2, 0x2c($s2) -/* B06F60 80240560 8E470030 */ lw $a3, 0x30($s2) -/* B06F64 80240564 0C019DF0 */ jal guScaleF -/* B06F68 80240568 0200202D */ daddu $a0, $s0, $zero -/* B06F6C 8024056C 0200202D */ daddu $a0, $s0, $zero -/* B06F70 80240570 0260282D */ daddu $a1, $s3, $zero -/* B06F74 80240574 0C019D80 */ jal guMtxCatF -/* B06F78 80240578 0260302D */ daddu $a2, $s3, $zero -/* B06F7C 8024057C 0260202D */ daddu $a0, $s3, $zero -/* B06F80 80240580 3C108007 */ lui $s0, 0x8007 -/* B06F84 80240584 261041F0 */ addiu $s0, $s0, 0x41f0 -/* B06F88 80240588 3C14800A */ lui $s4, 0x800a -/* B06F8C 8024058C 2694A674 */ addiu $s4, $s4, -0x598c -/* B06F90 80240590 96050000 */ lhu $a1, ($s0) -/* B06F94 80240594 8E820000 */ lw $v0, ($s4) -/* B06F98 80240598 00052980 */ sll $a1, $a1, 6 -/* B06F9C 8024059C 00B62821 */ addu $a1, $a1, $s6 -/* B06FA0 802405A0 0C019D40 */ jal guMtxF2L -/* B06FA4 802405A4 00452821 */ addu $a1, $v0, $a1 -/* B06FA8 802405A8 3C02DA38 */ lui $v0, 0xda38 -/* B06FAC 802405AC 34420002 */ ori $v0, $v0, 2 -/* B06FB0 802405B0 27A40030 */ addiu $a0, $sp, 0x30 -/* B06FB4 802405B4 8E270000 */ lw $a3, ($s1) -/* B06FB8 802405B8 96080000 */ lhu $t0, ($s0) -/* B06FBC 802405BC 00E0282D */ daddu $a1, $a3, $zero -/* B06FC0 802405C0 ACA20000 */ sw $v0, ($a1) -/* B06FC4 802405C4 3102FFFF */ andi $v0, $t0, 0xffff -/* B06FC8 802405C8 00021180 */ sll $v0, $v0, 6 -/* B06FCC 802405CC 00561021 */ addu $v0, $v0, $s6 -/* B06FD0 802405D0 8E830000 */ lw $v1, ($s4) -/* B06FD4 802405D4 24E70008 */ addiu $a3, $a3, 8 -/* B06FD8 802405D8 00621821 */ addu $v1, $v1, $v0 -/* B06FDC 802405DC 3C028000 */ lui $v0, 0x8000 -/* B06FE0 802405E0 00621821 */ addu $v1, $v1, $v0 -/* B06FE4 802405E4 ACA30004 */ sw $v1, 4($a1) -/* B06FE8 802405E8 8E450008 */ lw $a1, 8($s2) -/* B06FEC 802405EC 8E46000C */ lw $a2, 0xc($s2) -/* B06FF0 802405F0 25080001 */ addiu $t0, $t0, 1 -/* B06FF4 802405F4 AE270000 */ sw $a3, ($s1) -/* B06FF8 802405F8 0C0B7811 */ jal func_802DE044 -/* B06FFC 802405FC A6080000 */ sh $t0, ($s0) -/* B07000 80240600 8FA30030 */ lw $v1, 0x30($sp) -/* B07004 80240604 8FA40034 */ lw $a0, 0x34($sp) -/* B07008 80240608 97A2003A */ lhu $v0, 0x3a($sp) -/* B0700C 8024060C 3C013F00 */ lui $at, 0x3f00 -/* B07010 80240610 44811000 */ mtc1 $at, $f2 -/* B07014 80240614 27A50018 */ addiu $a1, $sp, 0x18 -/* B07018 80240618 A7A20020 */ sh $v0, 0x20($sp) -/* B0701C 8024061C 3042FFFF */ andi $v0, $v0, 0xffff -/* B07020 80240620 44820000 */ mtc1 $v0, $f0 -/* B07024 80240624 00000000 */ nop -/* B07028 80240628 46800020 */ cvt.s.w $f0, $f0 -/* B0702C 8024062C AFA30018 */ sw $v1, 0x18($sp) -/* B07030 80240630 AFA4001C */ sw $a0, 0x1c($sp) -/* B07034 80240634 E6400034 */ swc1 $f0, 0x34($s2) -/* B07038 80240638 97A2003E */ lhu $v0, 0x3e($sp) -/* B0703C 8024063C 0000302D */ daddu $a2, $zero, $zero -/* B07040 80240640 A7A20022 */ sh $v0, 0x22($sp) -/* B07044 80240644 3042FFFF */ andi $v0, $v0, 0xffff -/* B07048 80240648 44820000 */ mtc1 $v0, $f0 -/* B0704C 8024064C 00000000 */ nop -/* B07050 80240650 46800020 */ cvt.s.w $f0, $f0 -/* B07054 80240654 E6400038 */ swc1 $f0, 0x38($s2) -/* B07058 80240658 C7A00038 */ lwc1 $f0, 0x38($sp) -/* B0705C 8024065C 46800020 */ cvt.s.w $f0, $f0 -/* B07060 80240660 46020002 */ mul.s $f0, $f0, $f2 -/* B07064 80240664 00000000 */ nop -/* B07068 80240668 97A3003E */ lhu $v1, 0x3e($sp) -/* B0706C 8024066C 240200FF */ addiu $v0, $zero, 0xff -/* B07070 80240670 A3A20028 */ sb $v0, 0x28($sp) -/* B07074 80240674 A7A30026 */ sh $v1, 0x26($sp) -/* B07078 80240678 4600010D */ trunc.w.s $f4, $f0 -/* B0707C 8024067C 44022000 */ mfc1 $v0, $f4 -/* B07080 80240680 00000000 */ nop -/* B07084 80240684 00021023 */ negu $v0, $v0 -/* B07088 80240688 A7A20024 */ sh $v0, 0x24($sp) -/* B0708C 8024068C 8E440000 */ lw $a0, ($s2) -/* B07090 80240690 0C04EBDC */ jal func_8013AF70 -/* B07094 80240694 0260382D */ daddu $a3, $s3, $zero -/* B07098 80240698 3C04D838 */ lui $a0, 0xd838 -/* B0709C 8024069C 8E220000 */ lw $v0, ($s1) -/* B070A0 802406A0 34840002 */ ori $a0, $a0, 2 -/* B070A4 802406A4 0040182D */ daddu $v1, $v0, $zero -/* B070A8 802406A8 24420008 */ addiu $v0, $v0, 8 -/* B070AC 802406AC AE220000 */ sw $v0, ($s1) -/* B070B0 802406B0 24020040 */ addiu $v0, $zero, 0x40 -/* B070B4 802406B4 AC640000 */ sw $a0, ($v1) -/* B070B8 802406B8 AC620004 */ sw $v0, 4($v1) -/* B070BC 802406BC 8FBF00DC */ lw $ra, 0xdc($sp) -/* B070C0 802406C0 8FB600D8 */ lw $s6, 0xd8($sp) -/* B070C4 802406C4 8FB500D4 */ lw $s5, 0xd4($sp) -/* B070C8 802406C8 8FB400D0 */ lw $s4, 0xd0($sp) -/* B070CC 802406CC 8FB300CC */ lw $s3, 0xcc($sp) -/* B070D0 802406D0 8FB200C8 */ lw $s2, 0xc8($sp) -/* B070D4 802406D4 8FB100C4 */ lw $s1, 0xc4($sp) -/* B070D8 802406D8 8FB000C0 */ lw $s0, 0xc0($sp) -/* B070DC 802406DC D7B600E8 */ ldc1 $f22, 0xe8($sp) -/* B070E0 802406E0 D7B400E0 */ ldc1 $f20, 0xe0($sp) -/* B070E4 802406E4 03E00008 */ jr $ra -/* B070E8 802406E8 27BD00F0 */ addiu $sp, $sp, 0xf0 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240800_B06A00.s b/asm/nonmatchings/world/area_kkj/kkj_25/func_80240800_B06A00.s deleted file mode 100644 index a70011f60f..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240800_B06A00.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240800_B07200 -/* B07200 80240800 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B07204 80240804 AFB10014 */ sw $s1, 0x14($sp) -/* B07208 80240808 0080882D */ daddu $s1, $a0, $zero -/* B0720C 8024080C 0000202D */ daddu $a0, $zero, $zero -/* B07210 80240810 3C05FD05 */ lui $a1, 0xfd05 -/* B07214 80240814 34A50F8A */ ori $a1, $a1, 0xf8a -/* B07218 80240818 AFBF0018 */ sw $ra, 0x18($sp) -/* B0721C 8024081C 0C0B1EAF */ jal get_variable -/* B07220 80240820 AFB00010 */ sw $s0, 0x10($sp) -/* B07224 80240824 0040802D */ daddu $s0, $v0, $zero -/* B07228 80240828 0C04EA15 */ jal func_8013A854 -/* B0722C 8024082C 8E040000 */ lw $a0, ($s0) -/* B07230 80240830 0C048D70 */ jal func_801235C0 -/* B07234 80240834 8E040004 */ lw $a0, 4($s0) -/* B07238 80240838 0C00AB4B */ jal heap_free -/* B0723C 8024083C 0200202D */ daddu $a0, $s0, $zero -/* B07240 80240840 0220202D */ daddu $a0, $s1, $zero -/* B07244 80240844 3C05FD05 */ lui $a1, 0xfd05 -/* B07248 80240848 34A50F8A */ ori $a1, $a1, 0xf8a -/* B0724C 8024084C 0C0B2026 */ jal set_variable -/* B07250 80240850 0000302D */ daddu $a2, $zero, $zero -/* B07254 80240854 8FBF0018 */ lw $ra, 0x18($sp) -/* B07258 80240858 8FB10014 */ lw $s1, 0x14($sp) -/* B0725C 8024085C 8FB00010 */ lw $s0, 0x10($sp) -/* B07260 80240860 24020002 */ addiu $v0, $zero, 2 -/* B07264 80240864 03E00008 */ jr $ra -/* B07268 80240868 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/func_8024086C_B06A00.s b/asm/nonmatchings/world/area_kkj/kkj_25/func_8024086C_B06A00.s deleted file mode 100644 index b76a3a4b0b..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/func_8024086C_B06A00.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024086C_B0726C -/* B0726C 8024086C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B07270 80240870 AFB10014 */ sw $s1, 0x14($sp) -/* B07274 80240874 0080882D */ daddu $s1, $a0, $zero -/* B07278 80240878 AFBF001C */ sw $ra, 0x1c($sp) -/* B0727C 8024087C AFB20018 */ sw $s2, 0x18($sp) -/* B07280 80240880 AFB00010 */ sw $s0, 0x10($sp) -/* B07284 80240884 8E30000C */ lw $s0, 0xc($s1) -/* B07288 80240888 8E050000 */ lw $a1, ($s0) -/* B0728C 8024088C 0C0B210B */ jal get_float_variable -/* B07290 80240890 26100004 */ addiu $s0, $s0, 4 -/* B07294 80240894 8E050000 */ lw $a1, ($s0) -/* B07298 80240898 26100004 */ addiu $s0, $s0, 4 -/* B0729C 8024089C 4600008D */ trunc.w.s $f2, $f0 -/* B072A0 802408A0 44121000 */ mfc1 $s2, $f2 -/* B072A4 802408A4 0C0B210B */ jal get_float_variable -/* B072A8 802408A8 0220202D */ daddu $a0, $s1, $zero -/* B072AC 802408AC 0220202D */ daddu $a0, $s1, $zero -/* B072B0 802408B0 8E050000 */ lw $a1, ($s0) -/* B072B4 802408B4 4600008D */ trunc.w.s $f2, $f0 -/* B072B8 802408B8 44111000 */ mfc1 $s1, $f2 -/* B072BC 802408BC 0C0B210B */ jal get_float_variable -/* B072C0 802408C0 00000000 */ nop -/* B072C4 802408C4 0000202D */ daddu $a0, $zero, $zero -/* B072C8 802408C8 3C05FD05 */ lui $a1, 0xfd05 -/* B072CC 802408CC 4600008D */ trunc.w.s $f2, $f0 -/* B072D0 802408D0 44101000 */ mfc1 $s0, $f2 -/* B072D4 802408D4 0C0B1EAF */ jal get_variable -/* B072D8 802408D8 34A50F8A */ ori $a1, $a1, 0xf8a -/* B072DC 802408DC 0040182D */ daddu $v1, $v0, $zero -/* B072E0 802408E0 44920000 */ mtc1 $s2, $f0 -/* B072E4 802408E4 00000000 */ nop -/* B072E8 802408E8 46800020 */ cvt.s.w $f0, $f0 -/* B072EC 802408EC E4600010 */ swc1 $f0, 0x10($v1) -/* B072F0 802408F0 44910000 */ mtc1 $s1, $f0 -/* B072F4 802408F4 00000000 */ nop -/* B072F8 802408F8 46800020 */ cvt.s.w $f0, $f0 -/* B072FC 802408FC E4600014 */ swc1 $f0, 0x14($v1) -/* B07300 80240900 44900000 */ mtc1 $s0, $f0 -/* B07304 80240904 00000000 */ nop -/* B07308 80240908 46800020 */ cvt.s.w $f0, $f0 -/* B0730C 8024090C E4600018 */ swc1 $f0, 0x18($v1) -/* B07310 80240910 8FBF001C */ lw $ra, 0x1c($sp) -/* B07314 80240914 8FB20018 */ lw $s2, 0x18($sp) -/* B07318 80240918 8FB10014 */ lw $s1, 0x14($sp) -/* B0731C 8024091C 8FB00010 */ lw $s0, 0x10($sp) -/* B07320 80240920 24020002 */ addiu $v0, $zero, 2 -/* B07324 80240924 03E00008 */ jr $ra -/* B07328 80240928 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/func_802409EC_B06A00.s b/asm/nonmatchings/world/area_kkj/kkj_25/func_802409EC_B06A00.s deleted file mode 100644 index 43e3ee944e..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/func_802409EC_B06A00.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409EC_B073EC -/* B073EC 802409EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B073F0 802409F0 AFB10014 */ sw $s1, 0x14($sp) -/* B073F4 802409F4 0080882D */ daddu $s1, $a0, $zero -/* B073F8 802409F8 AFBF001C */ sw $ra, 0x1c($sp) -/* B073FC 802409FC AFB20018 */ sw $s2, 0x18($sp) -/* B07400 80240A00 AFB00010 */ sw $s0, 0x10($sp) -/* B07404 80240A04 8E30000C */ lw $s0, 0xc($s1) -/* B07408 80240A08 8E050000 */ lw $a1, ($s0) -/* B0740C 80240A0C 0C0B210B */ jal get_float_variable -/* B07410 80240A10 26100004 */ addiu $s0, $s0, 4 -/* B07414 80240A14 8E050000 */ lw $a1, ($s0) -/* B07418 80240A18 26100004 */ addiu $s0, $s0, 4 -/* B0741C 80240A1C 4600008D */ trunc.w.s $f2, $f0 -/* B07420 80240A20 44121000 */ mfc1 $s2, $f2 -/* B07424 80240A24 0C0B210B */ jal get_float_variable -/* B07428 80240A28 0220202D */ daddu $a0, $s1, $zero -/* B0742C 80240A2C 0220202D */ daddu $a0, $s1, $zero -/* B07430 80240A30 8E050000 */ lw $a1, ($s0) -/* B07434 80240A34 4600008D */ trunc.w.s $f2, $f0 -/* B07438 80240A38 44111000 */ mfc1 $s1, $f2 -/* B0743C 80240A3C 0C0B210B */ jal get_float_variable -/* B07440 80240A40 00000000 */ nop -/* B07444 80240A44 0000202D */ daddu $a0, $zero, $zero -/* B07448 80240A48 3C05FD05 */ lui $a1, 0xfd05 -/* B0744C 80240A4C 4600008D */ trunc.w.s $f2, $f0 -/* B07450 80240A50 44101000 */ mfc1 $s0, $f2 -/* B07454 80240A54 0C0B1EAF */ jal get_variable -/* B07458 80240A58 34A50F8A */ ori $a1, $a1, 0xf8a -/* B0745C 80240A5C 0040182D */ daddu $v1, $v0, $zero -/* B07460 80240A60 44920000 */ mtc1 $s2, $f0 -/* B07464 80240A64 00000000 */ nop -/* B07468 80240A68 46800020 */ cvt.s.w $f0, $f0 -/* B0746C 80240A6C E4600028 */ swc1 $f0, 0x28($v1) -/* B07470 80240A70 44910000 */ mtc1 $s1, $f0 -/* B07474 80240A74 00000000 */ nop -/* B07478 80240A78 46800020 */ cvt.s.w $f0, $f0 -/* B0747C 80240A7C E460002C */ swc1 $f0, 0x2c($v1) -/* B07480 80240A80 44900000 */ mtc1 $s0, $f0 -/* B07484 80240A84 00000000 */ nop -/* B07488 80240A88 46800020 */ cvt.s.w $f0, $f0 -/* B0748C 80240A8C E4600030 */ swc1 $f0, 0x30($v1) -/* B07490 80240A90 8FBF001C */ lw $ra, 0x1c($sp) -/* B07494 80240A94 8FB20018 */ lw $s2, 0x18($sp) -/* B07498 80240A98 8FB10014 */ lw $s1, 0x14($sp) -/* B0749C 80240A9C 8FB00010 */ lw $s0, 0x10($sp) -/* B074A0 80240AA0 24020002 */ addiu $v0, $zero, 2 -/* B074A4 80240AA4 03E00008 */ jr $ra -/* B074A8 80240AA8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240AAC_B06A00.s b/asm/nonmatchings/world/area_kkj/kkj_25/func_80240AAC_B06A00.s deleted file mode 100644 index 61b8fae3e1..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240AAC_B06A00.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AAC_B074AC -/* B074AC 80240AAC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B074B0 80240AB0 AFB10014 */ sw $s1, 0x14($sp) -/* B074B4 80240AB4 0080882D */ daddu $s1, $a0, $zero -/* B074B8 80240AB8 AFBF0018 */ sw $ra, 0x18($sp) -/* B074BC 80240ABC AFB00010 */ sw $s0, 0x10($sp) -/* B074C0 80240AC0 8E30000C */ lw $s0, 0xc($s1) -/* B074C4 80240AC4 8E050000 */ lw $a1, ($s0) -/* B074C8 80240AC8 0C0B1EAF */ jal get_variable -/* B074CC 80240ACC 26100004 */ addiu $s0, $s0, 4 -/* B074D0 80240AD0 0220202D */ daddu $a0, $s1, $zero -/* B074D4 80240AD4 8E050000 */ lw $a1, ($s0) -/* B074D8 80240AD8 0C0B1EAF */ jal get_variable -/* B074DC 80240ADC 0040882D */ daddu $s1, $v0, $zero -/* B074E0 80240AE0 0000202D */ daddu $a0, $zero, $zero -/* B074E4 80240AE4 3C05FD05 */ lui $a1, 0xfd05 -/* B074E8 80240AE8 34A50F8A */ ori $a1, $a1, 0xf8a -/* B074EC 80240AEC 0C0B1EAF */ jal get_variable -/* B074F0 80240AF0 0040802D */ daddu $s0, $v0, $zero -/* B074F4 80240AF4 0040182D */ daddu $v1, $v0, $zero -/* B074F8 80240AF8 AC710008 */ sw $s1, 8($v1) -/* B074FC 80240AFC AC70000C */ sw $s0, 0xc($v1) -/* B07500 80240B00 8FBF0018 */ lw $ra, 0x18($sp) -/* B07504 80240B04 8FB10014 */ lw $s1, 0x14($sp) -/* B07508 80240B08 8FB00010 */ lw $s0, 0x10($sp) -/* B0750C 80240B0C 24020002 */ addiu $v0, $zero, 2 -/* B07510 80240B10 03E00008 */ jr $ra -/* B07514 80240B14 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240B8C_B06A00.s b/asm/nonmatchings/world/area_kkj/kkj_25/func_80240B8C_B06A00.s deleted file mode 100644 index bffca0aa52..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240B8C_B06A00.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B8C_B0758C -/* B0758C 80240B8C 8C820084 */ lw $v0, 0x84($a0) -/* B07590 80240B90 8C42000C */ lw $v0, 0xc($v0) -/* B07594 80240B94 AC400028 */ sw $zero, 0x28($v0) -/* B07598 80240B98 03E00008 */ jr $ra -/* B0759C 80240B9C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240D30_B06A00.s b/asm/nonmatchings/world/area_kkj/kkj_25/func_80240D30_B06A00.s deleted file mode 100644 index 8f53310d40..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240D30_B06A00.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D30_B07730 -/* B07730 80240D30 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B07734 80240D34 AFB00010 */ sw $s0, 0x10($sp) -/* B07738 80240D38 0080802D */ daddu $s0, $a0, $zero -/* B0773C 80240D3C 10A00003 */ beqz $a1, .L80240D4C -/* B07740 80240D40 AFBF0014 */ sw $ra, 0x14($sp) -/* B07744 80240D44 AE000074 */ sw $zero, 0x74($s0) -/* B07748 80240D48 AE000078 */ sw $zero, 0x78($s0) -.L80240D4C: -/* B0774C 80240D4C 8E030078 */ lw $v1, 0x78($s0) -/* B07750 80240D50 10600005 */ beqz $v1, .L80240D68 -/* B07754 80240D54 24020001 */ addiu $v0, $zero, 1 -/* B07758 80240D58 10620015 */ beq $v1, $v0, .L80240DB0 -/* B0775C 80240D5C 3C048080 */ lui $a0, 0x8080 -/* B07760 80240D60 0809038D */ j .L80240E34 -/* B07764 80240D64 00000000 */ nop -.L80240D68: -/* B07768 80240D68 0000202D */ daddu $a0, $zero, $zero -/* B0776C 80240D6C 240500D0 */ addiu $a1, $zero, 0xd0 -/* B07770 80240D70 0080302D */ daddu $a2, $a0, $zero -/* B07774 80240D74 0C04DF84 */ jal func_80137E10 -/* B07778 80240D78 0080382D */ daddu $a3, $a0, $zero -/* B0777C 80240D7C C6000074 */ lwc1 $f0, 0x74($s0) -/* B07780 80240D80 46800020 */ cvt.s.w $f0, $f0 -/* B07784 80240D84 44050000 */ mfc1 $a1, $f0 -/* B07788 80240D88 0C04DF62 */ jal func_80137D88 -/* B0778C 80240D8C 24040001 */ addiu $a0, $zero, 1 -/* B07790 80240D90 8E020074 */ lw $v0, 0x74($s0) -/* B07794 80240D94 240300FF */ addiu $v1, $zero, 0xff -/* B07798 80240D98 14430022 */ bne $v0, $v1, .L80240E24 -/* B0779C 80240D9C 24420007 */ addiu $v0, $v0, 7 -/* B077A0 80240DA0 24020001 */ addiu $v0, $zero, 1 -/* B077A4 80240DA4 AE000074 */ sw $zero, 0x74($s0) -/* B077A8 80240DA8 0809038D */ j .L80240E34 -/* B077AC 80240DAC AE020078 */ sw $v0, 0x78($s0) -.L80240DB0: -/* B077B0 80240DB0 8E030074 */ lw $v1, 0x74($s0) -/* B077B4 80240DB4 34848081 */ ori $a0, $a0, 0x8081 -/* B077B8 80240DB8 00031040 */ sll $v0, $v1, 1 -/* B077BC 80240DBC 00431021 */ addu $v0, $v0, $v1 -/* B077C0 80240DC0 00021080 */ sll $v0, $v0, 2 -/* B077C4 80240DC4 00431021 */ addu $v0, $v0, $v1 -/* B077C8 80240DC8 00021100 */ sll $v0, $v0, 4 -/* B077CC 80240DCC 00440018 */ mult $v0, $a0 -/* B077D0 80240DD0 240500D0 */ addiu $a1, $zero, 0xd0 -/* B077D4 80240DD4 0000202D */ daddu $a0, $zero, $zero -/* B077D8 80240DD8 00004010 */ mfhi $t0 -/* B077DC 80240DDC 01023021 */ addu $a2, $t0, $v0 -/* B077E0 80240DE0 000631C3 */ sra $a2, $a2, 7 -/* B077E4 80240DE4 000217C3 */ sra $v0, $v0, 0x1f -/* B077E8 80240DE8 00C23023 */ subu $a2, $a2, $v0 -/* B077EC 80240DEC 30C600FF */ andi $a2, $a2, 0xff -/* B077F0 80240DF0 0C04DF84 */ jal func_80137E10 -/* B077F4 80240DF4 00C0382D */ daddu $a3, $a2, $zero -/* B077F8 80240DF8 3C05437F */ lui $a1, 0x437f -/* B077FC 80240DFC 0C04DF62 */ jal func_80137D88 -/* B07800 80240E00 24040001 */ addiu $a0, $zero, 1 -/* B07804 80240E04 8E020074 */ lw $v0, 0x74($s0) -/* B07808 80240E08 240300FF */ addiu $v1, $zero, 0xff -/* B0780C 80240E0C 14430005 */ bne $v0, $v1, .L80240E24 -/* B07810 80240E10 2442000E */ addiu $v0, $v0, 0xe -/* B07814 80240E14 24020002 */ addiu $v0, $zero, 2 -/* B07818 80240E18 AE020078 */ sw $v0, 0x78($s0) -/* B0781C 80240E1C 8E020074 */ lw $v0, 0x74($s0) -/* B07820 80240E20 2442000E */ addiu $v0, $v0, 0xe -.L80240E24: -/* B07824 80240E24 AE020074 */ sw $v0, 0x74($s0) -/* B07828 80240E28 28420100 */ slti $v0, $v0, 0x100 -/* B0782C 80240E2C 50400001 */ beql $v0, $zero, .L80240E34 -/* B07830 80240E30 AE030074 */ sw $v1, 0x74($s0) -.L80240E34: -/* B07834 80240E34 8E020078 */ lw $v0, 0x78($s0) -/* B07838 80240E38 8FBF0014 */ lw $ra, 0x14($sp) -/* B0783C 80240E3C 8FB00010 */ lw $s0, 0x10($sp) -/* B07840 80240E40 38420002 */ xori $v0, $v0, 2 -/* B07844 80240E44 2C420001 */ sltiu $v0, $v0, 1 -/* B07848 80240E48 00021040 */ sll $v0, $v0, 1 -/* B0784C 80240E4C 03E00008 */ jr $ra -/* B07850 80240E50 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240F2C_B06A00.s b/asm/nonmatchings/world/area_kkj/kkj_25/func_80240F2C_B06A00.s deleted file mode 100644 index 0f3843d3b3..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/func_80240F2C_B06A00.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F2C_B0792C -/* B0792C 80240F2C 8C820084 */ lw $v0, 0x84($a0) -/* B07930 80240F30 8C42000C */ lw $v0, 0xc($v0) -/* B07934 80240F34 AC400028 */ sw $zero, 0x28($v0) -/* B07938 80240F38 03E00008 */ jr $ra -/* B0793C 80240F3C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_27/func_80240124_B13D70.s b/asm/nonmatchings/world/area_kkj/kkj_27/func_80240124_B13D70.s deleted file mode 100644 index 783017a61c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_27/func_80240124_B13D70.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_B13E94 -/* B13E94 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B13E98 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* B13E9C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* B13EA0 80240130 10A00005 */ beqz $a1, .L80240148 -/* B13EA4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* B13EA8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* B13EAC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* B13EB0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* B13EB4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* B13EB8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* B13EBC 8024014C 1440000E */ bnez $v0, .L80240188 -/* B13EC0 80240150 00000000 */ nop -/* B13EC4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* B13EC8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* B13ECC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* B13ED0 80240160 04610004 */ bgez $v1, .L80240174 -/* B13ED4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* B13ED8 80240168 3C020002 */ lui $v0, 2 -/* B13EDC 8024016C 08090061 */ j .L80240184 -/* B13EE0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* B13EE4 80240174 3C040002 */ lui $a0, 2 -/* B13EE8 80240178 0083102A */ slt $v0, $a0, $v1 -/* B13EEC 8024017C 10400002 */ beqz $v0, .L80240188 -/* B13EF0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* B13EF4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* B13EF8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* B13EFC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* B13F00 80240190 00000000 */ nop -/* B13F04 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* B13F08 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* B13F0C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* B13F10 802401A0 04610004 */ bgez $v1, .L802401B4 -/* B13F14 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* B13F18 802401A8 3C020002 */ lui $v0, 2 -/* B13F1C 802401AC 08090071 */ j .L802401C4 -/* B13F20 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* B13F24 802401B4 3C040002 */ lui $a0, 2 -/* B13F28 802401B8 0083102A */ slt $v0, $a0, $v1 -/* B13F2C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* B13F30 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* B13F34 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* B13F38 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* B13F3C 802401CC 1440000E */ bnez $v0, .L80240208 -/* B13F40 802401D0 00000000 */ nop -/* B13F44 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* B13F48 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* B13F4C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* B13F50 802401E0 04610004 */ bgez $v1, .L802401F4 -/* B13F54 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* B13F58 802401E8 3C020002 */ lui $v0, 2 -/* B13F5C 802401EC 08090081 */ j .L80240204 -/* B13F60 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* B13F64 802401F4 3C040002 */ lui $a0, 2 -/* B13F68 802401F8 0083102A */ slt $v0, $a0, $v1 -/* B13F6C 802401FC 10400002 */ beqz $v0, .L80240208 -/* B13F70 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* B13F74 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* B13F78 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* B13F7C 8024020C 1440000E */ bnez $v0, .L80240248 -/* B13F80 80240210 00000000 */ nop -/* B13F84 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* B13F88 80240218 8E020094 */ lw $v0, 0x94($s0) -/* B13F8C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* B13F90 80240220 04610004 */ bgez $v1, .L80240234 -/* B13F94 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* B13F98 80240228 3C020002 */ lui $v0, 2 -/* B13F9C 8024022C 08090091 */ j .L80240244 -/* B13FA0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* B13FA4 80240234 3C040002 */ lui $a0, 2 -/* B13FA8 80240238 0083102A */ slt $v0, $a0, $v1 -/* B13FAC 8024023C 10400002 */ beqz $v0, .L80240248 -/* B13FB0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* B13FB4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* B13FB8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* B13FBC 8024024C 0C046F07 */ jal set_main_pan_u -/* B13FC0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* B13FC4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* B13FC8 80240258 0C046F0D */ jal set_main_pan_v -/* B13FCC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* B13FD0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* B13FD4 80240264 0C046F13 */ jal set_aux_pan_u -/* B13FD8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* B13FDC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* B13FE0 80240270 0C046F19 */ jal set_aux_pan_v -/* B13FE4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* B13FE8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* B13FEC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* B13FF0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* B13FF4 80240284 24420001 */ addiu $v0, $v0, 1 -/* B13FF8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* B13FFC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* B14000 80240290 24630001 */ addiu $v1, $v1, 1 -/* B14004 80240294 AE030078 */ sw $v1, 0x78($s0) -/* B14008 80240298 8E030070 */ lw $v1, 0x70($s0) -/* B1400C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* B14010 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* B14014 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* B14018 802402A8 0064182A */ slt $v1, $v1, $a0 -/* B1401C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* B14020 802402B0 14600002 */ bnez $v1, .L802402BC -/* B14024 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* B14028 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* B1402C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* B14030 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* B14034 802402C4 0043102A */ slt $v0, $v0, $v1 -/* B14038 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* B1403C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* B14040 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* B14044 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* B14048 802402D8 0043102A */ slt $v0, $v0, $v1 -/* B1404C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* B14050 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* B14054 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* B14058 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* B1405C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* B14060 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* B14064 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* B14068 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B1406C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* B14070 80240300 0000102D */ daddu $v0, $zero, $zero -/* B14074 80240304 03E00008 */ jr $ra -/* B14078 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1407C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_27/func_80240310_B13D70.s b/asm/nonmatchings/world/area_kkj/kkj_27/func_80240310_B13D70.s deleted file mode 100644 index 6f15b0b3fa..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_27/func_80240310_B13D70.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_B14080 -/* B14080 80240310 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B14084 80240314 AFB00010 */ sw $s0, 0x10($sp) -/* B14088 80240318 0080802D */ daddu $s0, $a0, $zero -/* B1408C 8024031C 3C030DB5 */ lui $v1, 0xdb5 -/* B14090 80240320 34638580 */ ori $v1, $v1, 0x8580 -/* B14094 80240324 AFBF0014 */ sw $ra, 0x14($sp) -/* B14098 80240328 F7BA0030 */ sdc1 $f26, 0x30($sp) -/* B1409C 8024032C F7B80028 */ sdc1 $f24, 0x28($sp) -/* B140A0 80240330 F7B60020 */ sdc1 $f22, 0x20($sp) -/* B140A4 80240334 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B140A8 80240338 C60200A8 */ lwc1 $f2, 0xa8($s0) -/* B140AC 8024033C 468010A0 */ cvt.s.w $f2, $f2 -/* B140B0 80240340 44061000 */ mfc1 $a2, $f2 -/* B140B4 80240344 C60200AC */ lwc1 $f2, 0xac($s0) -/* B140B8 80240348 468010A0 */ cvt.s.w $f2, $f2 -/* B140BC 8024034C 8E02008C */ lw $v0, 0x8c($s0) -/* B140C0 80240350 44071000 */ mfc1 $a3, $f2 -/* B140C4 80240354 3C01C37A */ lui $at, 0xc37a -/* B140C8 80240358 4481D000 */ mtc1 $at, $f26 -/* B140CC 8024035C 4480C000 */ mtc1 $zero, $f24 -/* B140D0 80240360 3C013A80 */ lui $at, 0x3a80 -/* B140D4 80240364 44810000 */ mtc1 $at, $f0 -/* B140D8 80240368 00431021 */ addu $v0, $v0, $v1 -/* B140DC 8024036C 4482A000 */ mtc1 $v0, $f20 -/* B140E0 80240370 00000000 */ nop -/* B140E4 80240374 4680A520 */ cvt.s.w $f20, $f20 -/* B140E8 80240378 4600D306 */ mov.s $f12, $f26 -/* B140EC 8024037C 4600A502 */ mul.s $f20, $f20, $f0 -/* B140F0 80240380 00000000 */ nop -/* B140F4 80240384 0C00A7B5 */ jal dist2D -/* B140F8 80240388 4600C386 */ mov.s $f14, $f24 -/* B140FC 8024038C 4600D306 */ mov.s $f12, $f26 -/* B14100 80240390 4600C386 */ mov.s $f14, $f24 -/* B14104 80240394 C60200A8 */ lwc1 $f2, 0xa8($s0) -/* B14108 80240398 468010A0 */ cvt.s.w $f2, $f2 -/* B1410C 8024039C 44061000 */ mfc1 $a2, $f2 -/* B14110 802403A0 C60200AC */ lwc1 $f2, 0xac($s0) -/* B14114 802403A4 468010A0 */ cvt.s.w $f2, $f2 -/* B14118 802403A8 44071000 */ mfc1 $a3, $f2 -/* B1411C 802403AC 0C00A720 */ jal atan2 -/* B14120 802403B0 46000586 */ mov.s $f22, $f0 -/* B14124 802403B4 0C00A6C9 */ jal clamp_angle -/* B14128 802403B8 46140301 */ sub.s $f12, $f0, $f20 -/* B1412C 802403BC 46000506 */ mov.s $f20, $f0 -/* B14130 802403C0 0C00A8BB */ jal sin_deg -/* B14134 802403C4 4600A306 */ mov.s $f12, $f20 -/* B14138 802403C8 4600B002 */ mul.s $f0, $f22, $f0 -/* B1413C 802403CC 00000000 */ nop -/* B14140 802403D0 461A0000 */ add.s $f0, $f0, $f26 -/* B14144 802403D4 4600A306 */ mov.s $f12, $f20 -/* B14148 802403D8 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* B1414C 802403DC 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* B14150 802403E0 0C00A8D4 */ jal cos_deg -/* B14154 802403E4 E6000028 */ swc1 $f0, 0x28($s0) -/* B14158 802403E8 4600B582 */ mul.s $f22, $f22, $f0 -/* B1415C 802403EC 00000000 */ nop -/* B14160 802403F0 4616C601 */ sub.s $f24, $f24, $f22 -/* B14164 802403F4 E6180030 */ swc1 $f24, 0x30($s0) -/* B14168 802403F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B1416C 802403FC 8FB00010 */ lw $s0, 0x10($sp) -/* B14170 80240400 D7BA0030 */ ldc1 $f26, 0x30($sp) -/* B14174 80240404 D7B80028 */ ldc1 $f24, 0x28($sp) -/* B14178 80240408 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B1417C 8024040C D7B40018 */ ldc1 $f20, 0x18($sp) -/* B14180 80240410 24020002 */ addiu $v0, $zero, 2 -/* B14184 80240414 03E00008 */ jr $ra -/* B14188 80240418 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kkj/kkj_27/func_8024041C_B13D70.s b/asm/nonmatchings/world/area_kkj/kkj_27/func_8024041C_B13D70.s deleted file mode 100644 index abfd527898..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_27/func_8024041C_B13D70.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024041C_B1418C -/* B1418C 8024041C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B14190 80240420 AFBF0010 */ sw $ra, 0x10($sp) -/* B14194 80240424 8C82000C */ lw $v0, 0xc($a0) -/* B14198 80240428 0C0B1EAF */ jal get_variable -/* B1419C 8024042C 8C450000 */ lw $a1, ($v0) -/* B141A0 80240430 8FBF0010 */ lw $ra, 0x10($sp) -/* B141A4 80240434 3C018024 */ lui $at, 0x8024 -/* B141A8 80240438 AC220B00 */ sw $v0, 0xb00($at) -/* B141AC 8024043C 24020002 */ addiu $v0, $zero, 2 -/* B141B0 80240440 03E00008 */ jr $ra -/* B141B4 80240444 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_27/func_80240448_B13D70.s b/asm/nonmatchings/world/area_kkj/kkj_27/func_80240448_B13D70.s deleted file mode 100644 index 1d25b6773d..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_27/func_80240448_B13D70.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240448_B141B8 -/* B141B8 80240448 3C068024 */ lui $a2, 0x8024 -/* B141BC 8024044C 8CC60B00 */ lw $a2, 0xb00($a2) -/* B141C0 80240450 18C00011 */ blez $a2, .L80240498 -/* B141C4 80240454 3C02FC12 */ lui $v0, 0xfc12 -/* B141C8 80240458 3C04800A */ lui $a0, 0x800a -/* B141CC 8024045C 2484A66C */ addiu $a0, $a0, -0x5994 -/* B141D0 80240460 8C830000 */ lw $v1, ($a0) -/* B141D4 80240464 34427E24 */ ori $v0, $v0, 0x7e24 -/* B141D8 80240468 0060282D */ daddu $a1, $v1, $zero -/* B141DC 8024046C 24630008 */ addiu $v1, $v1, 8 -/* B141E0 80240470 AC830000 */ sw $v1, ($a0) -/* B141E4 80240474 ACA20000 */ sw $v0, ($a1) -/* B141E8 80240478 2402F7FB */ addiu $v0, $zero, -0x805 -/* B141EC 8024047C ACA20004 */ sw $v0, 4($a1) -/* B141F0 80240480 24620008 */ addiu $v0, $v1, 8 -/* B141F4 80240484 AC820000 */ sw $v0, ($a0) -/* B141F8 80240488 3C02FA00 */ lui $v0, 0xfa00 -/* B141FC 8024048C AC620000 */ sw $v0, ($v1) -/* B14200 80240490 30C200FF */ andi $v0, $a2, 0xff -/* B14204 80240494 AC620004 */ sw $v0, 4($v1) -.L80240498: -/* B14208 80240498 03E00008 */ jr $ra -/* B1420C 8024049C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_29/func_80240030_B150B0.s b/asm/nonmatchings/world/area_kkj/kkj_29/func_80240030_B150B0.s deleted file mode 100644 index 5943a30adf..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_29/func_80240030_B150B0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240030_B150E0 -/* B150E0 80240030 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* B150E4 80240034 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* B150E8 80240038 8C420010 */ lw $v0, 0x10($v0) -/* B150EC 8024003C 30428000 */ andi $v0, $v0, 0x8000 -/* B150F0 80240040 14400007 */ bnez $v0, .L80240060 -/* B150F4 80240044 24020001 */ addiu $v0, $zero, 1 -/* B150F8 80240048 8C830084 */ lw $v1, 0x84($a0) -/* B150FC 8024004C 2463FFFF */ addiu $v1, $v1, -1 -/* B15100 80240050 2C620001 */ sltiu $v0, $v1, 1 -/* B15104 80240054 00021040 */ sll $v0, $v0, 1 -/* B15108 80240058 03E00008 */ jr $ra -/* B1510C 8024005C AC830084 */ sw $v1, 0x84($a0) -.L80240060: -/* B15110 80240060 AC820084 */ sw $v0, 0x84($a0) -/* B15114 80240064 03E00008 */ jr $ra -/* B15118 80240068 24020002 */ addiu $v0, $zero, 2 -/* B1511C 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/func_802405F0_8ABF90.s b/asm/nonmatchings/world/area_kmr/kmr_00/func_802405F0_8ABF90.s deleted file mode 100644 index 87f98b76b2..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/func_802405F0_8ABF90.s +++ /dev/null @@ -1,393 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_8AC580 -/* 8AC580 802405F0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 8AC584 802405F4 AFB1001C */ sw $s1, 0x1c($sp) -/* 8AC588 802405F8 0080882D */ daddu $s1, $a0, $zero -/* 8AC58C 802405FC AFB30024 */ sw $s3, 0x24($sp) -/* 8AC590 80240600 AFBF0028 */ sw $ra, 0x28($sp) -/* 8AC594 80240604 AFB20020 */ sw $s2, 0x20($sp) -/* 8AC598 80240608 AFB00018 */ sw $s0, 0x18($sp) -/* 8AC59C 8024060C F7B60038 */ sdc1 $f22, 0x38($sp) -/* 8AC5A0 80240610 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 8AC5A4 80240614 8E30000C */ lw $s0, 0xc($s1) -/* 8AC5A8 80240618 10A00010 */ beqz $a1, .L8024065C -/* 8AC5AC 8024061C 0000982D */ daddu $s3, $zero, $zero -/* 8AC5B0 80240620 8E050000 */ lw $a1, ($s0) -/* 8AC5B4 80240624 0C0B1EAF */ jal get_variable -/* 8AC5B8 80240628 26100004 */ addiu $s0, $s0, 4 -/* 8AC5BC 8024062C AE220074 */ sw $v0, 0x74($s1) -/* 8AC5C0 80240630 8E050000 */ lw $a1, ($s0) -/* 8AC5C4 80240634 26100004 */ addiu $s0, $s0, 4 -/* 8AC5C8 80240638 0C0B1EAF */ jal get_variable -/* 8AC5CC 8024063C 0220202D */ daddu $a0, $s1, $zero -/* 8AC5D0 80240640 AE220078 */ sw $v0, 0x78($s1) -/* 8AC5D4 80240644 8E050000 */ lw $a1, ($s0) -/* 8AC5D8 80240648 0C0B1EAF */ jal get_variable -/* 8AC5DC 8024064C 0220202D */ daddu $a0, $s1, $zero -/* 8AC5E0 80240650 AE2200C0 */ sw $v0, 0xc0($s1) -/* 8AC5E4 80240654 AE200070 */ sw $zero, 0x70($s1) -/* 8AC5E8 80240658 AE20007C */ sw $zero, 0x7c($s1) -.L8024065C: -/* 8AC5EC 8024065C 8E240074 */ lw $a0, 0x74($s1) -/* 8AC5F0 80240660 0C00EABB */ jal get_npc_unsafe -/* 8AC5F4 80240664 24120001 */ addiu $s2, $zero, 1 -/* 8AC5F8 80240668 8E230070 */ lw $v1, 0x70($s1) -/* 8AC5FC 8024066C 1072005D */ beq $v1, $s2, .L802407E4 -/* 8AC600 80240670 0040802D */ daddu $s0, $v0, $zero -/* 8AC604 80240674 28620002 */ slti $v0, $v1, 2 -/* 8AC608 80240678 10400005 */ beqz $v0, .L80240690 -/* 8AC60C 8024067C 24020002 */ addiu $v0, $zero, 2 -/* 8AC610 80240680 10600009 */ beqz $v1, .L802406A8 -/* 8AC614 80240684 26040038 */ addiu $a0, $s0, 0x38 -/* 8AC618 80240688 080902E5 */ j .L80240B94 -/* 8AC61C 8024068C 00000000 */ nop -.L80240690: -/* 8AC620 80240690 1062009C */ beq $v1, $v0, .L80240904 -/* 8AC624 80240694 24020003 */ addiu $v0, $zero, 3 -/* 8AC628 80240698 106200EF */ beq $v1, $v0, .L80240A58 -/* 8AC62C 8024069C 26040038 */ addiu $a0, $s0, 0x38 -/* 8AC630 802406A0 080902E5 */ j .L80240B94 -/* 8AC634 802406A4 00000000 */ nop -.L802406A8: -/* 8AC638 802406A8 3C01C47A */ lui $at, 0xc47a -/* 8AC63C 802406AC 44810000 */ mtc1 $at, $f0 -/* 8AC640 802406B0 3C01C248 */ lui $at, 0xc248 -/* 8AC644 802406B4 4481B000 */ mtc1 $at, $f22 -/* 8AC648 802406B8 AE000038 */ sw $zero, 0x38($s0) -/* 8AC64C 802406BC E600003C */ swc1 $f0, 0x3c($s0) -/* 8AC650 802406C0 E6160040 */ swc1 $f22, 0x40($s0) -/* 8AC654 802406C4 8E23007C */ lw $v1, 0x7c($s1) -/* 8AC658 802406C8 3C014040 */ lui $at, 0x4040 -/* 8AC65C 802406CC 44810000 */ mtc1 $at, $f0 -/* 8AC660 802406D0 00031040 */ sll $v0, $v1, 1 -/* 8AC664 802406D4 00431021 */ addu $v0, $v0, $v1 -/* 8AC668 802406D8 E6000064 */ swc1 $f0, 0x64($s0) -/* 8AC66C 802406DC 44820000 */ mtc1 $v0, $f0 -/* 8AC670 802406E0 00000000 */ nop -/* 8AC674 802406E4 46800020 */ cvt.s.w $f0, $f0 -/* 8AC678 802406E8 E6000060 */ swc1 $f0, 0x60($s0) -/* 8AC67C 802406EC 8E22007C */ lw $v0, 0x7c($s1) -/* 8AC680 802406F0 8E2300C0 */ lw $v1, 0xc0($s1) -/* 8AC684 802406F4 0043102A */ slt $v0, $v0, $v1 -/* 8AC688 802406F8 14400126 */ bnez $v0, .L80240B94 -/* 8AC68C 802406FC 26050040 */ addiu $a1, $s0, 0x40 -/* 8AC690 80240700 3C0142C8 */ lui $at, 0x42c8 -/* 8AC694 80240704 44810000 */ mtc1 $at, $f0 -/* 8AC698 80240708 00000000 */ nop -/* 8AC69C 8024070C E600003C */ swc1 $f0, 0x3c($s0) -/* 8AC6A0 80240710 8E230078 */ lw $v1, 0x78($s1) -/* 8AC6A4 80240714 C6020060 */ lwc1 $f2, 0x60($s0) -/* 8AC6A8 80240718 00031040 */ sll $v0, $v1, 1 -/* 8AC6AC 8024071C 00431021 */ addu $v0, $v0, $v1 -/* 8AC6B0 80240720 00021900 */ sll $v1, $v0, 4 -/* 8AC6B4 80240724 00431021 */ addu $v0, $v0, $v1 -/* 8AC6B8 80240728 44820000 */ mtc1 $v0, $f0 -/* 8AC6BC 8024072C 00000000 */ nop -/* 8AC6C0 80240730 46800020 */ cvt.s.w $f0, $f0 -/* 8AC6C4 80240734 46001080 */ add.s $f2, $f2, $f0 -/* 8AC6C8 80240738 3C014319 */ lui $at, 0x4319 -/* 8AC6CC 8024073C 44810000 */ mtc1 $at, $f0 -/* 8AC6D0 80240740 3C01428C */ lui $at, 0x428c -/* 8AC6D4 80240744 4481A000 */ mtc1 $at, $f20 -/* 8AC6D8 80240748 46001080 */ add.s $f2, $f2, $f0 -/* 8AC6DC 8024074C 4406A000 */ mfc1 $a2, $f20 -/* 8AC6E0 80240750 44071000 */ mfc1 $a3, $f2 -/* 8AC6E4 80240754 0C00A7E7 */ jal add_vec2D_polar -/* 8AC6E8 80240758 00000000 */ nop -/* 8AC6EC 8024075C C6000040 */ lwc1 $f0, 0x40($s0) -/* 8AC6F0 80240760 46000007 */ neg.s $f0, $f0 -/* 8AC6F4 80240764 46160000 */ add.s $f0, $f0, $f22 -/* 8AC6F8 80240768 46140000 */ add.s $f0, $f0, $f20 -/* 8AC6FC 8024076C 3C013E19 */ lui $at, 0x3e19 -/* 8AC700 80240770 3421999A */ ori $at, $at, 0x999a -/* 8AC704 80240774 44811000 */ mtc1 $at, $f2 -/* 8AC708 80240778 00000000 */ nop -/* 8AC70C 8024077C 46020002 */ mul.s $f0, $f0, $f2 -/* 8AC710 80240780 00000000 */ nop -/* 8AC714 80240784 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8AC718 80240788 3C04B000 */ lui $a0, 0xb000 -/* 8AC71C 8024078C 46001080 */ add.s $f2, $f2, $f0 -/* 8AC720 80240790 C6000040 */ lwc1 $f0, 0x40($s0) -/* 8AC724 80240794 3484001E */ ori $a0, $a0, 0x1e -/* 8AC728 80240798 E602003C */ swc1 $f2, 0x3c($s0) -/* 8AC72C 8024079C E7A00010 */ swc1 $f0, 0x10($sp) -/* 8AC730 802407A0 8E060038 */ lw $a2, 0x38($s0) -/* 8AC734 802407A4 8E07003C */ lw $a3, 0x3c($s0) -/* 8AC738 802407A8 0C052757 */ jal play_sound_at_position -/* 8AC73C 802407AC 0000282D */ daddu $a1, $zero, $zero -/* 8AC740 802407B0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8AC744 802407B4 3C0141A0 */ lui $at, 0x41a0 -/* 8AC748 802407B8 44810000 */ mtc1 $at, $f0 -/* 8AC74C 802407BC 00000000 */ nop -/* 8AC750 802407C0 46001080 */ add.s $f2, $f2, $f0 -/* 8AC754 802407C4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8AC758 802407C8 8E050038 */ lw $a1, 0x38($s0) -/* 8AC75C 802407CC 8E070040 */ lw $a3, 0x40($s0) -/* 8AC760 802407D0 44061000 */ mfc1 $a2, $f2 -/* 8AC764 802407D4 0C01BFBC */ jal func_8006FEF0 -/* 8AC768 802407D8 0000202D */ daddu $a0, $zero, $zero -/* 8AC76C 802407DC 080902E5 */ j .L80240B94 -/* 8AC770 802407E0 AE320070 */ sw $s2, 0x70($s1) -.L802407E4: -/* 8AC774 802407E4 3C01C248 */ lui $at, 0xc248 -/* 8AC778 802407E8 4481B000 */ mtc1 $at, $f22 -/* 8AC77C 802407EC 3C0142C8 */ lui $at, 0x42c8 -/* 8AC780 802407F0 44810000 */ mtc1 $at, $f0 -/* 8AC784 802407F4 AE000038 */ sw $zero, 0x38($s0) -/* 8AC788 802407F8 E6160040 */ swc1 $f22, 0x40($s0) -/* 8AC78C 802407FC E600003C */ swc1 $f0, 0x3c($s0) -/* 8AC790 80240800 8E230078 */ lw $v1, 0x78($s1) -/* 8AC794 80240804 C6020060 */ lwc1 $f2, 0x60($s0) -/* 8AC798 80240808 00031040 */ sll $v0, $v1, 1 -/* 8AC79C 8024080C 00431021 */ addu $v0, $v0, $v1 -/* 8AC7A0 80240810 00021900 */ sll $v1, $v0, 4 -/* 8AC7A4 80240814 00431021 */ addu $v0, $v0, $v1 -/* 8AC7A8 80240818 44820000 */ mtc1 $v0, $f0 -/* 8AC7AC 8024081C 00000000 */ nop -/* 8AC7B0 80240820 46800020 */ cvt.s.w $f0, $f0 -/* 8AC7B4 80240824 46001080 */ add.s $f2, $f2, $f0 -/* 8AC7B8 80240828 3C014319 */ lui $at, 0x4319 -/* 8AC7BC 8024082C 44810000 */ mtc1 $at, $f0 -/* 8AC7C0 80240830 3C01428C */ lui $at, 0x428c -/* 8AC7C4 80240834 4481A000 */ mtc1 $at, $f20 -/* 8AC7C8 80240838 46001080 */ add.s $f2, $f2, $f0 -/* 8AC7CC 8024083C 26040038 */ addiu $a0, $s0, 0x38 -/* 8AC7D0 80240840 4406A000 */ mfc1 $a2, $f20 -/* 8AC7D4 80240844 44071000 */ mfc1 $a3, $f2 -/* 8AC7D8 80240848 0C00A7E7 */ jal add_vec2D_polar -/* 8AC7DC 8024084C 26050040 */ addiu $a1, $s0, 0x40 -/* 8AC7E0 80240850 C6000040 */ lwc1 $f0, 0x40($s0) -/* 8AC7E4 80240854 46000007 */ neg.s $f0, $f0 -/* 8AC7E8 80240858 46160000 */ add.s $f0, $f0, $f22 -/* 8AC7EC 8024085C 46140000 */ add.s $f0, $f0, $f20 -/* 8AC7F0 80240860 3C013E19 */ lui $at, 0x3e19 -/* 8AC7F4 80240864 3421999A */ ori $at, $at, 0x999a -/* 8AC7F8 80240868 44811000 */ mtc1 $at, $f2 -/* 8AC7FC 8024086C 00000000 */ nop -/* 8AC800 80240870 46020002 */ mul.s $f0, $f0, $f2 -/* 8AC804 80240874 00000000 */ nop -/* 8AC808 80240878 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8AC80C 8024087C 46001080 */ add.s $f2, $f2, $f0 -/* 8AC810 80240880 3C034EC4 */ lui $v1, 0x4ec4 -/* 8AC814 80240884 E602003C */ swc1 $f2, 0x3c($s0) -/* 8AC818 80240888 8E24007C */ lw $a0, 0x7c($s1) -/* 8AC81C 8024088C 8E220078 */ lw $v0, 0x78($s1) -/* 8AC820 80240890 3463EC4F */ ori $v1, $v1, 0xec4f -/* 8AC824 80240894 00822021 */ addu $a0, $a0, $v0 -/* 8AC828 80240898 00830018 */ mult $a0, $v1 -/* 8AC82C 8024089C 000417C3 */ sra $v0, $a0, 0x1f -/* 8AC830 802408A0 00004010 */ mfhi $t0 -/* 8AC834 802408A4 00081883 */ sra $v1, $t0, 2 -/* 8AC838 802408A8 00621823 */ subu $v1, $v1, $v0 -/* 8AC83C 802408AC 00031040 */ sll $v0, $v1, 1 -/* 8AC840 802408B0 00431021 */ addu $v0, $v0, $v1 -/* 8AC844 802408B4 00021080 */ sll $v0, $v0, 2 -/* 8AC848 802408B8 00431021 */ addu $v0, $v0, $v1 -/* 8AC84C 802408BC 1482000B */ bne $a0, $v0, .L802408EC -/* 8AC850 802408C0 00000000 */ nop -/* 8AC854 802408C4 3C014120 */ lui $at, 0x4120 -/* 8AC858 802408C8 44810000 */ mtc1 $at, $f0 -/* 8AC85C 802408CC 00000000 */ nop -/* 8AC860 802408D0 46001080 */ add.s $f2, $f2, $f0 -/* 8AC864 802408D4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8AC868 802408D8 8E050038 */ lw $a1, 0x38($s0) -/* 8AC86C 802408DC 8E070040 */ lw $a3, 0x40($s0) -/* 8AC870 802408E0 44061000 */ mfc1 $a2, $f2 -/* 8AC874 802408E4 0C01BFBC */ jal func_8006FEF0 -/* 8AC878 802408E8 24040003 */ addiu $a0, $zero, 3 -.L802408EC: -/* 8AC87C 802408EC 8E22007C */ lw $v0, 0x7c($s1) -/* 8AC880 802408F0 28420101 */ slti $v0, $v0, 0x101 -/* 8AC884 802408F4 144000A7 */ bnez $v0, .L80240B94 -/* 8AC888 802408F8 24020002 */ addiu $v0, $zero, 2 -/* 8AC88C 802408FC 08090294 */ j .L80240A50 -/* 8AC890 80240900 AE220070 */ sw $v0, 0x70($s1) -.L80240904: -/* 8AC894 80240904 3C01C248 */ lui $at, 0xc248 -/* 8AC898 80240908 4481B000 */ mtc1 $at, $f22 -/* 8AC89C 8024090C 3C013E99 */ lui $at, 0x3e99 -/* 8AC8A0 80240910 3421999A */ ori $at, $at, 0x999a -/* 8AC8A4 80240914 44810000 */ mtc1 $at, $f0 -/* 8AC8A8 80240918 AE000038 */ sw $zero, 0x38($s0) -/* 8AC8AC 8024091C E6160040 */ swc1 $f22, 0x40($s0) -/* 8AC8B0 80240920 C62200BC */ lwc1 $f2, 0xbc($s1) -/* 8AC8B4 80240924 468010A0 */ cvt.s.w $f2, $f2 -/* 8AC8B8 80240928 46001082 */ mul.s $f2, $f2, $f0 -/* 8AC8BC 8024092C 00000000 */ nop -/* 8AC8C0 80240930 3C0142C8 */ lui $at, 0x42c8 -/* 8AC8C4 80240934 44810000 */ mtc1 $at, $f0 -/* 8AC8C8 80240938 00000000 */ nop -/* 8AC8CC 8024093C 46020001 */ sub.s $f0, $f0, $f2 -/* 8AC8D0 80240940 E600003C */ swc1 $f0, 0x3c($s0) -/* 8AC8D4 80240944 8E230078 */ lw $v1, 0x78($s1) -/* 8AC8D8 80240948 C6020060 */ lwc1 $f2, 0x60($s0) -/* 8AC8DC 8024094C 00031040 */ sll $v0, $v1, 1 -/* 8AC8E0 80240950 00431021 */ addu $v0, $v0, $v1 -/* 8AC8E4 80240954 00021900 */ sll $v1, $v0, 4 -/* 8AC8E8 80240958 00431021 */ addu $v0, $v0, $v1 -/* 8AC8EC 8024095C 44820000 */ mtc1 $v0, $f0 -/* 8AC8F0 80240960 00000000 */ nop -/* 8AC8F4 80240964 46800020 */ cvt.s.w $f0, $f0 -/* 8AC8F8 80240968 46001080 */ add.s $f2, $f2, $f0 -/* 8AC8FC 8024096C 3C014319 */ lui $at, 0x4319 -/* 8AC900 80240970 44810000 */ mtc1 $at, $f0 -/* 8AC904 80240974 3C01428C */ lui $at, 0x428c -/* 8AC908 80240978 4481A000 */ mtc1 $at, $f20 -/* 8AC90C 8024097C 46001080 */ add.s $f2, $f2, $f0 -/* 8AC910 80240980 26040038 */ addiu $a0, $s0, 0x38 -/* 8AC914 80240984 4406A000 */ mfc1 $a2, $f20 -/* 8AC918 80240988 44071000 */ mfc1 $a3, $f2 -/* 8AC91C 8024098C 0C00A7E7 */ jal add_vec2D_polar -/* 8AC920 80240990 26050040 */ addiu $a1, $s0, 0x40 -/* 8AC924 80240994 C6000040 */ lwc1 $f0, 0x40($s0) -/* 8AC928 80240998 46000007 */ neg.s $f0, $f0 -/* 8AC92C 8024099C 46160000 */ add.s $f0, $f0, $f22 -/* 8AC930 802409A0 46140000 */ add.s $f0, $f0, $f20 -/* 8AC934 802409A4 3C013E19 */ lui $at, 0x3e19 -/* 8AC938 802409A8 3421999A */ ori $at, $at, 0x999a -/* 8AC93C 802409AC 44811000 */ mtc1 $at, $f2 -/* 8AC940 802409B0 00000000 */ nop -/* 8AC944 802409B4 46020002 */ mul.s $f0, $f0, $f2 -/* 8AC948 802409B8 00000000 */ nop -/* 8AC94C 802409BC C602003C */ lwc1 $f2, 0x3c($s0) -/* 8AC950 802409C0 46001080 */ add.s $f2, $f2, $f0 -/* 8AC954 802409C4 3C034EC4 */ lui $v1, 0x4ec4 -/* 8AC958 802409C8 E602003C */ swc1 $f2, 0x3c($s0) -/* 8AC95C 802409CC 8E24007C */ lw $a0, 0x7c($s1) -/* 8AC960 802409D0 8E220078 */ lw $v0, 0x78($s1) -/* 8AC964 802409D4 3463EC4F */ ori $v1, $v1, 0xec4f -/* 8AC968 802409D8 00822021 */ addu $a0, $a0, $v0 -/* 8AC96C 802409DC 00830018 */ mult $a0, $v1 -/* 8AC970 802409E0 000417C3 */ sra $v0, $a0, 0x1f -/* 8AC974 802409E4 00004010 */ mfhi $t0 -/* 8AC978 802409E8 00081883 */ sra $v1, $t0, 2 -/* 8AC97C 802409EC 00621823 */ subu $v1, $v1, $v0 -/* 8AC980 802409F0 00031040 */ sll $v0, $v1, 1 -/* 8AC984 802409F4 00431021 */ addu $v0, $v0, $v1 -/* 8AC988 802409F8 00021080 */ sll $v0, $v0, 2 -/* 8AC98C 802409FC 00431021 */ addu $v0, $v0, $v1 -/* 8AC990 80240A00 1482000B */ bne $a0, $v0, .L80240A30 -/* 8AC994 80240A04 00000000 */ nop -/* 8AC998 80240A08 3C014120 */ lui $at, 0x4120 -/* 8AC99C 80240A0C 44810000 */ mtc1 $at, $f0 -/* 8AC9A0 80240A10 00000000 */ nop -/* 8AC9A4 80240A14 46001080 */ add.s $f2, $f2, $f0 -/* 8AC9A8 80240A18 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8AC9AC 80240A1C 8E050038 */ lw $a1, 0x38($s0) -/* 8AC9B0 80240A20 8E070040 */ lw $a3, 0x40($s0) -/* 8AC9B4 80240A24 44061000 */ mfc1 $a2, $f2 -/* 8AC9B8 80240A28 0C01BFBC */ jal func_8006FEF0 -/* 8AC9BC 80240A2C 24040003 */ addiu $a0, $zero, 3 -.L80240A30: -/* 8AC9C0 80240A30 8E2200BC */ lw $v0, 0xbc($s1) -/* 8AC9C4 80240A34 0040182D */ daddu $v1, $v0, $zero -/* 8AC9C8 80240A38 24420001 */ addiu $v0, $v0, 1 -/* 8AC9CC 80240A3C 286300B5 */ slti $v1, $v1, 0xb5 -/* 8AC9D0 80240A40 14600054 */ bnez $v1, .L80240B94 -/* 8AC9D4 80240A44 AE2200BC */ sw $v0, 0xbc($s1) -/* 8AC9D8 80240A48 24020003 */ addiu $v0, $zero, 3 -/* 8AC9DC 80240A4C AE220070 */ sw $v0, 0x70($s1) -.L80240A50: -/* 8AC9E0 80240A50 080902E5 */ j .L80240B94 -/* 8AC9E4 80240A54 AE2000BC */ sw $zero, 0xbc($s1) -.L80240A58: -/* 8AC9E8 80240A58 C6000064 */ lwc1 $f0, 0x64($s0) -/* 8AC9EC 80240A5C 3C013CF5 */ lui $at, 0x3cf5 -/* 8AC9F0 80240A60 3421C28F */ ori $at, $at, 0xc28f -/* 8AC9F4 80240A64 44811000 */ mtc1 $at, $f2 -/* 8AC9F8 80240A68 3C01C248 */ lui $at, 0xc248 -/* 8AC9FC 80240A6C 4481B000 */ mtc1 $at, $f22 -/* 8ACA00 80240A70 3C014237 */ lui $at, 0x4237 -/* 8ACA04 80240A74 3421FFFF */ ori $at, $at, 0xffff -/* 8ACA08 80240A78 44812000 */ mtc1 $at, $f4 -/* 8ACA0C 80240A7C AE000038 */ sw $zero, 0x38($s0) -/* 8ACA10 80240A80 46020001 */ sub.s $f0, $f0, $f2 -/* 8ACA14 80240A84 E6160040 */ swc1 $f22, 0x40($s0) -/* 8ACA18 80240A88 E604003C */ swc1 $f4, 0x3c($s0) -/* 8ACA1C 80240A8C E6000064 */ swc1 $f0, 0x64($s0) -/* 8ACA20 80240A90 8E230078 */ lw $v1, 0x78($s1) -/* 8ACA24 80240A94 C6020060 */ lwc1 $f2, 0x60($s0) -/* 8ACA28 80240A98 00031040 */ sll $v0, $v1, 1 -/* 8ACA2C 80240A9C 00431021 */ addu $v0, $v0, $v1 -/* 8ACA30 80240AA0 00021900 */ sll $v1, $v0, 4 -/* 8ACA34 80240AA4 00431021 */ addu $v0, $v0, $v1 -/* 8ACA38 80240AA8 44820000 */ mtc1 $v0, $f0 -/* 8ACA3C 80240AAC 00000000 */ nop -/* 8ACA40 80240AB0 46800020 */ cvt.s.w $f0, $f0 -/* 8ACA44 80240AB4 46001080 */ add.s $f2, $f2, $f0 -/* 8ACA48 80240AB8 3C014319 */ lui $at, 0x4319 -/* 8ACA4C 80240ABC 44810000 */ mtc1 $at, $f0 -/* 8ACA50 80240AC0 3C01428C */ lui $at, 0x428c -/* 8ACA54 80240AC4 4481A000 */ mtc1 $at, $f20 -/* 8ACA58 80240AC8 46001080 */ add.s $f2, $f2, $f0 -/* 8ACA5C 80240ACC 4406A000 */ mfc1 $a2, $f20 -/* 8ACA60 80240AD0 44071000 */ mfc1 $a3, $f2 -/* 8ACA64 80240AD4 0C00A7E7 */ jal add_vec2D_polar -/* 8ACA68 80240AD8 26050040 */ addiu $a1, $s0, 0x40 -/* 8ACA6C 80240ADC C6000040 */ lwc1 $f0, 0x40($s0) -/* 8ACA70 80240AE0 46000007 */ neg.s $f0, $f0 -/* 8ACA74 80240AE4 46160000 */ add.s $f0, $f0, $f22 -/* 8ACA78 80240AE8 46140000 */ add.s $f0, $f0, $f20 -/* 8ACA7C 80240AEC 3C013E19 */ lui $at, 0x3e19 -/* 8ACA80 80240AF0 3421999A */ ori $at, $at, 0x999a -/* 8ACA84 80240AF4 44811000 */ mtc1 $at, $f2 -/* 8ACA88 80240AF8 00000000 */ nop -/* 8ACA8C 80240AFC 46020002 */ mul.s $f0, $f0, $f2 -/* 8ACA90 80240B00 00000000 */ nop -/* 8ACA94 80240B04 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8ACA98 80240B08 46001080 */ add.s $f2, $f2, $f0 -/* 8ACA9C 80240B0C 3C034EC4 */ lui $v1, 0x4ec4 -/* 8ACAA0 80240B10 E602003C */ swc1 $f2, 0x3c($s0) -/* 8ACAA4 80240B14 8E24007C */ lw $a0, 0x7c($s1) -/* 8ACAA8 80240B18 8E220078 */ lw $v0, 0x78($s1) -/* 8ACAAC 80240B1C 3463EC4F */ ori $v1, $v1, 0xec4f -/* 8ACAB0 80240B20 00822021 */ addu $a0, $a0, $v0 -/* 8ACAB4 80240B24 00830018 */ mult $a0, $v1 -/* 8ACAB8 80240B28 000417C3 */ sra $v0, $a0, 0x1f -/* 8ACABC 80240B2C 00004010 */ mfhi $t0 -/* 8ACAC0 80240B30 00081883 */ sra $v1, $t0, 2 -/* 8ACAC4 80240B34 00621823 */ subu $v1, $v1, $v0 -/* 8ACAC8 80240B38 00031040 */ sll $v0, $v1, 1 -/* 8ACACC 80240B3C 00431021 */ addu $v0, $v0, $v1 -/* 8ACAD0 80240B40 00021080 */ sll $v0, $v0, 2 -/* 8ACAD4 80240B44 00431021 */ addu $v0, $v0, $v1 -/* 8ACAD8 80240B48 1482000B */ bne $a0, $v0, .L80240B78 -/* 8ACADC 80240B4C 00000000 */ nop -/* 8ACAE0 80240B50 3C014120 */ lui $at, 0x4120 -/* 8ACAE4 80240B54 44810000 */ mtc1 $at, $f0 -/* 8ACAE8 80240B58 00000000 */ nop -/* 8ACAEC 80240B5C 46001080 */ add.s $f2, $f2, $f0 -/* 8ACAF0 80240B60 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8ACAF4 80240B64 8E050038 */ lw $a1, 0x38($s0) -/* 8ACAF8 80240B68 8E070040 */ lw $a3, 0x40($s0) -/* 8ACAFC 80240B6C 44061000 */ mfc1 $a2, $f2 -/* 8ACB00 80240B70 0C01BFBC */ jal func_8006FEF0 -/* 8ACB04 80240B74 24040003 */ addiu $a0, $zero, 3 -.L80240B78: -/* 8ACB08 80240B78 C6020064 */ lwc1 $f2, 0x64($s0) -/* 8ACB0C 80240B7C 44800000 */ mtc1 $zero, $f0 -/* 8ACB10 80240B80 00000000 */ nop -/* 8ACB14 80240B84 4600103C */ c.lt.s $f2, $f0 -/* 8ACB18 80240B88 00000000 */ nop -/* 8ACB1C 80240B8C 45030001 */ bc1tl .L80240B94 -/* 8ACB20 80240B90 24130002 */ addiu $s3, $zero, 2 -.L80240B94: -/* 8ACB24 80240B94 8E22007C */ lw $v0, 0x7c($s1) -/* 8ACB28 80240B98 24420001 */ addiu $v0, $v0, 1 -/* 8ACB2C 80240B9C AE22007C */ sw $v0, 0x7c($s1) -/* 8ACB30 80240BA0 C6000060 */ lwc1 $f0, 0x60($s0) -/* 8ACB34 80240BA4 C6020064 */ lwc1 $f2, 0x64($s0) -/* 8ACB38 80240BA8 46020000 */ add.s $f0, $f0, $f2 -/* 8ACB3C 80240BAC 0260102D */ daddu $v0, $s3, $zero -/* 8ACB40 80240BB0 E6000060 */ swc1 $f0, 0x60($s0) -/* 8ACB44 80240BB4 8FBF0028 */ lw $ra, 0x28($sp) -/* 8ACB48 80240BB8 8FB30024 */ lw $s3, 0x24($sp) -/* 8ACB4C 80240BBC 8FB20020 */ lw $s2, 0x20($sp) -/* 8ACB50 80240BC0 8FB1001C */ lw $s1, 0x1c($sp) -/* 8ACB54 80240BC4 8FB00018 */ lw $s0, 0x18($sp) -/* 8ACB58 80240BC8 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 8ACB5C 80240BCC D7B40030 */ ldc1 $f20, 0x30($sp) -/* 8ACB60 80240BD0 03E00008 */ jr $ra -/* 8ACB64 80240BD4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_80240020_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_80240020_8B0070.s deleted file mode 100644 index 4aa3faef7d..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_80240020_8B0070.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_8B0090 -/* 8B0090 80240020 3C028016 */ lui $v0, 0x8016 -/* 8B0094 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 8B0098 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 8B009C 8024002C 03E00008 */ jr $ra -/* 8B00A0 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_80240034_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_80240034_8B0070.s deleted file mode 100644 index e1e1579bd5..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_80240034_8B0070.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_8B00A4 -/* 8B00A4 80240034 3C038016 */ lui $v1, 0x8016 -/* 8B00A8 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* 8B00AC 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B00B0 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 8B00B4 80240044 0080802D */ daddu $s0, $a0, $zero -/* 8B00B8 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* 8B00BC 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8B00C0 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* 8B00C4 80240054 24020002 */ addiu $v0, $zero, 2 -/* 8B00C8 80240058 08090038 */ j .L802400E0 -/* 8B00CC 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* 8B00D0 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 8B00D4 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 8B00D8 80240068 80620040 */ lb $v0, 0x40($v1) -/* 8B00DC 8024006C 80670044 */ lb $a3, 0x44($v1) -/* 8B00E0 80240070 04420001 */ bltzl $v0, .L80240078 -/* 8B00E4 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* 8B00E8 80240078 14400003 */ bnez $v0, .L80240088 -/* 8B00EC 8024007C 00000000 */ nop -/* 8B00F0 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* 8B00F4 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* 8B00F8 80240088 44822000 */ mtc1 $v0, $f4 -/* 8B00FC 8024008C 00000000 */ nop -/* 8B0100 80240090 46802120 */ cvt.s.w $f4, $f4 -/* 8B0104 80240094 44062000 */ mfc1 $a2, $f4 -/* 8B0108 80240098 44872000 */ mtc1 $a3, $f4 -/* 8B010C 8024009C 00000000 */ nop -/* 8B0110 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* 8B0114 802400A4 44806000 */ mtc1 $zero, $f12 -/* 8B0118 802400A8 44072000 */ mfc1 $a3, $f4 -/* 8B011C 802400AC 0C00A720 */ jal atan2 -/* 8B0120 802400B0 46006386 */ mov.s $f14, $f12 -/* 8B0124 802400B4 3C014270 */ lui $at, 0x4270 -/* 8B0128 802400B8 44811000 */ mtc1 $at, $f2 -/* 8B012C 802400BC 00000000 */ nop -/* 8B0130 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 8B0134 802400C4 00000000 */ nop -/* 8B0138 802400C8 45000004 */ bc1f .L802400DC -/* 8B013C 802400CC 24020001 */ addiu $v0, $zero, 1 -/* 8B0140 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* 8B0144 802400D4 08090038 */ j .L802400E0 -/* 8B0148 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* 8B014C 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* 8B0150 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8B0154 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 8B0158 802400E8 03E00008 */ jr $ra -/* 8B015C 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_802400F0_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_802400F0_8B0070.s deleted file mode 100644 index c6ddcda55c..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_802400F0_8B0070.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8B0160 -/* 8B0160 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B0164 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8B0168 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8B016C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 8B0170 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 8B0174 80240104 0C016AFA */ jal get_current_map_header -/* 8B0178 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 8B017C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 8B0180 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 8B0184 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8B0188 80240118 0C0B1EAF */ jal get_variable -/* 8B018C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 8B0190 80240120 0220202D */ daddu $a0, $s1, $zero -/* 8B0194 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 8B0198 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 8B019C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 8B01A0 80240130 02031821 */ addu $v1, $s0, $v1 -/* 8B01A4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 8B01A8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 8B01AC 8024013C 44061000 */ mfc1 $a2, $f2 -/* 8B01B0 80240140 0C0B2026 */ jal set_variable -/* 8B01B4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8B01B8 80240148 0220202D */ daddu $a0, $s1, $zero -/* 8B01BC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 8B01C0 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 8B01C4 80240154 02021021 */ addu $v0, $s0, $v0 -/* 8B01C8 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 8B01CC 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 8B01D0 80240160 44061000 */ mfc1 $a2, $f2 -/* 8B01D4 80240164 0C0B2026 */ jal set_variable -/* 8B01D8 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8B01DC 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 8B01E0 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 8B01E4 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 8B01E8 80240178 02021021 */ addu $v0, $s0, $v0 -/* 8B01EC 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 8B01F0 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 8B01F4 80240184 44061000 */ mfc1 $a2, $f2 -/* 8B01F8 80240188 0C0B2026 */ jal set_variable -/* 8B01FC 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8B0200 80240190 0220202D */ daddu $a0, $s1, $zero -/* 8B0204 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 8B0208 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 8B020C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 8B0210 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 8B0214 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 8B0218 802401A8 44061000 */ mfc1 $a2, $f2 -/* 8B021C 802401AC 0C0B2026 */ jal set_variable -/* 8B0220 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8B0224 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B0228 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 8B022C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 8B0230 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 8B0234 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 8B0238 802401C8 03E00008 */ jr $ra -/* 8B023C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_802401D0_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_802401D0_8B0070.s deleted file mode 100644 index dc98d3d196..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_802401D0_8B0070.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_8B0240 -/* 8B0240 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8B0244 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8B0248 802401D8 3C014334 */ lui $at, 0x4334 -/* 8B024C 802401DC 44816000 */ mtc1 $at, $f12 -/* 8B0250 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B0254 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8B0258 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 8B025C 802401EC 00031080 */ sll $v0, $v1, 2 -/* 8B0260 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 8B0264 802401F4 00021080 */ sll $v0, $v0, 2 -/* 8B0268 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 8B026C 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 8B0270 80240200 00431021 */ addu $v0, $v0, $v1 -/* 8B0274 80240204 000210C0 */ sll $v0, $v0, 3 -/* 8B0278 80240208 3C01800B */ lui $at, 0x800b -/* 8B027C 8024020C 00220821 */ addu $at, $at, $v0 -/* 8B0280 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8B0284 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 8B0288 80240218 0C00A6C9 */ jal clamp_angle -/* 8B028C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 8B0290 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 8B0294 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 8B0298 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 8B029C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 8B02A0 80240230 24020002 */ addiu $v0, $zero, 2 -/* 8B02A4 80240234 03E00008 */ jr $ra -/* 8B02A8 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_8024023C_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_8024023C_8B0070.s deleted file mode 100644 index cf9f22adaf..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_8024023C_8B0070.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_8B02AC -/* 8B02AC 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8B02B0 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 8B02B4 80240244 0080802D */ daddu $s0, $a0, $zero -/* 8B02B8 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 8B02BC 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8B02C0 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 8B02C4 80240254 0C0B210B */ jal get_float_variable -/* 8B02C8 80240258 8C450000 */ lw $a1, ($v0) -/* 8B02CC 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8B02D0 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 8B02D4 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 8B02D8 80240268 44060000 */ mfc1 $a2, $f0 -/* 8B02DC 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 8B02E0 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 8B02E4 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8B02E8 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8B02EC 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 8B02F0 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 8B02F4 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 8B02F8 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 8B02FC 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 8B0300 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 8B0304 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 8B0308 80240298 0C0B2190 */ jal set_float_variable -/* 8B030C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8B0310 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 8B0314 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 8B0318 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 8B031C 802402AC 0C0B2190 */ jal set_float_variable -/* 8B0320 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8B0324 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 8B0328 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 8B032C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 8B0330 802402C0 0C0B2190 */ jal set_float_variable -/* 8B0334 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8B0338 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B033C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 8B0340 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8B0344 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 8B0348 802402D8 03E00008 */ jr $ra -/* 8B034C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_802402E0_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_802402E0_8B0070.s deleted file mode 100644 index 441c43efc6..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_802402E0_8B0070.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_8B0350 -/* 8B0350 802402E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B0354 802402E4 AFB10014 */ sw $s1, 0x14($sp) -/* 8B0358 802402E8 0080882D */ daddu $s1, $a0, $zero -/* 8B035C 802402EC AFBF0018 */ sw $ra, 0x18($sp) -/* 8B0360 802402F0 AFB00010 */ sw $s0, 0x10($sp) -/* 8B0364 802402F4 8E30000C */ lw $s0, 0xc($s1) -/* 8B0368 802402F8 8E050000 */ lw $a1, ($s0) -/* 8B036C 802402FC 0C0B1EAF */ jal get_variable -/* 8B0370 80240300 26100004 */ addiu $s0, $s0, 4 -/* 8B0374 80240304 0220202D */ daddu $a0, $s1, $zero -/* 8B0378 80240308 8E050000 */ lw $a1, ($s0) -/* 8B037C 8024030C 0C0B1EAF */ jal get_variable -/* 8B0380 80240310 0040802D */ daddu $s0, $v0, $zero -/* 8B0384 80240314 0200202D */ daddu $a0, $s0, $zero -/* 8B0388 80240318 00021080 */ sll $v0, $v0, 2 -/* 8B038C 8024031C 3C108024 */ lui $s0, 0x8024 -/* 8B0390 80240320 02028021 */ addu $s0, $s0, $v0 -/* 8B0394 80240324 0C00FB3A */ jal get_enemy -/* 8B0398 80240328 8E104B2C */ lw $s0, 0x4b2c($s0) -/* 8B039C 8024032C 0040302D */ daddu $a2, $v0, $zero -/* 8B03A0 80240330 0000282D */ daddu $a1, $zero, $zero -.L80240334: -/* 8B03A4 80240334 8E040000 */ lw $a0, ($s0) -/* 8B03A8 80240338 00051080 */ sll $v0, $a1, 2 -/* 8B03AC 8024033C 8CC300D0 */ lw $v1, 0xd0($a2) -/* 8B03B0 80240340 24A50001 */ addiu $a1, $a1, 1 -/* 8B03B4 80240344 00431021 */ addu $v0, $v0, $v1 -/* 8B03B8 80240348 AC440000 */ sw $a0, ($v0) -/* 8B03BC 8024034C 28A2000E */ slti $v0, $a1, 0xe -/* 8B03C0 80240350 1440FFF8 */ bnez $v0, .L80240334 -/* 8B03C4 80240354 26100004 */ addiu $s0, $s0, 4 -/* 8B03C8 80240358 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B03CC 8024035C 8FB10014 */ lw $s1, 0x14($sp) -/* 8B03D0 80240360 8FB00010 */ lw $s0, 0x10($sp) -/* 8B03D4 80240364 24020002 */ addiu $v0, $zero, 2 -/* 8B03D8 80240368 03E00008 */ jr $ra -/* 8B03DC 8024036C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_80240370_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_80240370_8B0070.s deleted file mode 100644 index 7a24dda208..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_80240370_8B0070.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240370_8B03E0 -/* 8B03E0 80240370 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B03E4 80240374 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B03E8 80240378 0C00D77C */ jal func_80035DF0 -/* 8B03EC 8024037C 24040001 */ addiu $a0, $zero, 1 -/* 8B03F0 80240380 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B03F4 80240384 24020002 */ addiu $v0, $zero, 2 -/* 8B03F8 80240388 03E00008 */ jr $ra -/* 8B03FC 8024038C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_8024075C_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_8024075C_8B0070.s deleted file mode 100644 index a7f47993a8..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_8024075C_8B0070.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024075C_8B07CC -/* 8B07CC 8024075C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B07D0 80240760 3C03800A */ lui $v1, 0x800a -/* 8B07D4 80240764 8463A634 */ lh $v1, -0x59cc($v1) -/* 8B07D8 80240768 3C05800B */ lui $a1, %hi(gCameras) -/* 8B07DC 8024076C 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* 8B07E0 80240770 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B07E4 80240774 00031080 */ sll $v0, $v1, 2 -/* 8B07E8 80240778 00431021 */ addu $v0, $v0, $v1 -/* 8B07EC 8024077C 00021080 */ sll $v0, $v0, 2 -/* 8B07F0 80240780 00431023 */ subu $v0, $v0, $v1 -/* 8B07F4 80240784 000218C0 */ sll $v1, $v0, 3 -/* 8B07F8 80240788 00431021 */ addu $v0, $v0, $v1 -/* 8B07FC 8024078C 8C830020 */ lw $v1, 0x20($a0) -/* 8B0800 80240790 000210C0 */ sll $v0, $v0, 3 -/* 8B0804 80240794 8C630000 */ lw $v1, ($v1) -/* 8B0808 80240798 30630001 */ andi $v1, $v1, 1 -/* 8B080C 8024079C 10600004 */ beqz $v1, .L802407B0 -/* 8B0810 802407A0 00451021 */ addu $v0, $v0, $a1 -/* 8B0814 802407A4 C44C006C */ lwc1 $f12, 0x6c($v0) -/* 8B0818 802407A8 0C00A6C9 */ jal clamp_angle -/* 8B081C 802407AC 46006307 */ neg.s $f12, $f12 -.L802407B0: -/* 8B0820 802407B0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B0824 802407B4 03E00008 */ jr $ra -/* 8B0828 802407B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_802407BC_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_802407BC_8B0070.s deleted file mode 100644 index 1fe9a90ad7..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_802407BC_8B0070.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407BC_8B082C -/* 8B082C 802407BC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8B0830 802407C0 AFB10014 */ sw $s1, 0x14($sp) -/* 8B0834 802407C4 0080882D */ daddu $s1, $a0, $zero -/* 8B0838 802407C8 AFBF0024 */ sw $ra, 0x24($sp) -/* 8B083C 802407CC AFB40020 */ sw $s4, 0x20($sp) -/* 8B0840 802407D0 AFB3001C */ sw $s3, 0x1c($sp) -/* 8B0844 802407D4 AFB20018 */ sw $s2, 0x18($sp) -/* 8B0848 802407D8 10A00033 */ beqz $a1, .L802408A8 -/* 8B084C 802407DC AFB00010 */ sw $s0, 0x10($sp) -/* 8B0850 802407E0 0C04760B */ jal func_8011D82C -/* 8B0854 802407E4 24040001 */ addiu $a0, $zero, 1 -/* 8B0858 802407E8 0000202D */ daddu $a0, $zero, $zero -/* 8B085C 802407EC 0080282D */ daddu $a1, $a0, $zero -/* 8B0860 802407F0 0080302D */ daddu $a2, $a0, $zero -/* 8B0864 802407F4 0080382D */ daddu $a3, $a0, $zero -/* 8B0868 802407F8 0080802D */ daddu $s0, $a0, $zero -/* 8B086C 802407FC 2414FFFC */ addiu $s4, $zero, -4 -/* 8B0870 80240800 24130008 */ addiu $s3, $zero, 8 -/* 8B0874 80240804 3C120080 */ lui $s2, 0x80 -/* 8B0878 80240808 3C038015 */ lui $v1, 0x8015 -/* 8B087C 8024080C 8C6312F0 */ lw $v1, 0x12f0($v1) -/* 8B0880 80240810 24020001 */ addiu $v0, $zero, 1 -/* 8B0884 80240814 0C046F97 */ jal set_background_color_blend -/* 8B0888 80240818 A0620000 */ sb $v0, ($v1) -.L8024081C: -/* 8B088C 8024081C 0C00E2B7 */ jal get_npc_by_index -/* 8B0890 80240820 0200202D */ daddu $a0, $s0, $zero -/* 8B0894 80240824 0040202D */ daddu $a0, $v0, $zero -/* 8B0898 80240828 5080000B */ beql $a0, $zero, .L80240858 -/* 8B089C 8024082C 26100001 */ addiu $s0, $s0, 1 -/* 8B08A0 80240830 8C820000 */ lw $v0, ($a0) -/* 8B08A4 80240834 50400008 */ beql $v0, $zero, .L80240858 -/* 8B08A8 80240838 26100001 */ addiu $s0, $s0, 1 -/* 8B08AC 8024083C 808300A4 */ lb $v1, 0xa4($a0) -/* 8B08B0 80240840 10740005 */ beq $v1, $s4, .L80240858 -/* 8B08B4 80240844 26100001 */ addiu $s0, $s0, 1 -/* 8B08B8 80240848 10730003 */ beq $v1, $s3, .L80240858 -/* 8B08BC 8024084C 00000000 */ nop -/* 8B08C0 80240850 00521025 */ or $v0, $v0, $s2 -/* 8B08C4 80240854 AC820000 */ sw $v0, ($a0) -.L80240858: -/* 8B08C8 80240858 2A020040 */ slti $v0, $s0, 0x40 -/* 8B08CC 8024085C 1440FFEF */ bnez $v0, .L8024081C -/* 8B08D0 80240860 00000000 */ nop -/* 8B08D4 80240864 0000802D */ daddu $s0, $zero, $zero -/* 8B08D8 80240868 3C120800 */ lui $s2, 0x800 -.L8024086C: -/* 8B08DC 8024086C 0C04C3D6 */ jal get_item_entity -/* 8B08E0 80240870 0200202D */ daddu $a0, $s0, $zero -/* 8B08E4 80240874 0040182D */ daddu $v1, $v0, $zero -/* 8B08E8 80240878 10600007 */ beqz $v1, .L80240898 -/* 8B08EC 8024087C 26100001 */ addiu $s0, $s0, 1 -/* 8B08F0 80240880 8C640000 */ lw $a0, ($v1) -/* 8B08F4 80240884 30820010 */ andi $v0, $a0, 0x10 -/* 8B08F8 80240888 10400003 */ beqz $v0, .L80240898 -/* 8B08FC 8024088C 00000000 */ nop -/* 8B0900 80240890 00921025 */ or $v0, $a0, $s2 -/* 8B0904 80240894 AC620000 */ sw $v0, ($v1) -.L80240898: -/* 8B0908 80240898 2A020100 */ slti $v0, $s0, 0x100 -/* 8B090C 8024089C 1440FFF3 */ bnez $v0, .L8024086C -/* 8B0910 802408A0 00000000 */ nop -/* 8B0914 802408A4 AE200070 */ sw $zero, 0x70($s1) -.L802408A8: -/* 8B0918 802408A8 8E220070 */ lw $v0, 0x70($s1) -/* 8B091C 802408AC 24420008 */ addiu $v0, $v0, 8 -/* 8B0920 802408B0 AE220070 */ sw $v0, 0x70($s1) -/* 8B0924 802408B4 28420100 */ slti $v0, $v0, 0x100 -/* 8B0928 802408B8 14400003 */ bnez $v0, .L802408C8 -/* 8B092C 802408BC 0000202D */ daddu $a0, $zero, $zero -/* 8B0930 802408C0 240200FF */ addiu $v0, $zero, 0xff -/* 8B0934 802408C4 AE220070 */ sw $v0, 0x70($s1) -.L802408C8: -/* 8B0938 802408C8 0080282D */ daddu $a1, $a0, $zero -/* 8B093C 802408CC 92270073 */ lbu $a3, 0x73($s1) -/* 8B0940 802408D0 0C046F97 */ jal set_background_color_blend -/* 8B0944 802408D4 0080302D */ daddu $a2, $a0, $zero -/* 8B0948 802408D8 8E220070 */ lw $v0, 0x70($s1) -/* 8B094C 802408DC 8FBF0024 */ lw $ra, 0x24($sp) -/* 8B0950 802408E0 8FB40020 */ lw $s4, 0x20($sp) -/* 8B0954 802408E4 8FB3001C */ lw $s3, 0x1c($sp) -/* 8B0958 802408E8 8FB20018 */ lw $s2, 0x18($sp) -/* 8B095C 802408EC 8FB10014 */ lw $s1, 0x14($sp) -/* 8B0960 802408F0 8FB00010 */ lw $s0, 0x10($sp) -/* 8B0964 802408F4 384200FF */ xori $v0, $v0, 0xff -/* 8B0968 802408F8 2C420001 */ sltiu $v0, $v0, 1 -/* 8B096C 802408FC 00021040 */ sll $v0, $v0, 1 -/* 8B0970 80240900 03E00008 */ jr $ra -/* 8B0974 80240904 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_80240B00_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_80240B00_8B0070.s deleted file mode 100644 index 827c561b38..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_80240B00_8B0070.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B00_8B0B70 -/* 8B0B70 80240B00 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8B0B74 80240B04 AFB1001C */ sw $s1, 0x1c($sp) -/* 8B0B78 80240B08 AFBF0020 */ sw $ra, 0x20($sp) -/* 8B0B7C 80240B0C AFB00018 */ sw $s0, 0x18($sp) -/* 8B0B80 80240B10 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8B0B84 80240B14 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8B0B88 80240B18 10A00060 */ beqz $a1, .L80240C9C -/* 8B0B8C 80240B1C 0080882D */ daddu $s1, $a0, $zero -/* 8B0B90 80240B20 3C05F4AC */ lui $a1, 0xf4ac -/* 8B0B94 80240B24 0C0B1EAF */ jal get_variable -/* 8B0B98 80240B28 34A5D481 */ ori $a1, $a1, 0xd481 -/* 8B0B9C 80240B2C 0220202D */ daddu $a0, $s1, $zero -/* 8B0BA0 80240B30 3C05F4AC */ lui $a1, 0xf4ac -/* 8B0BA4 80240B34 4482B000 */ mtc1 $v0, $f22 -/* 8B0BA8 80240B38 00000000 */ nop -/* 8B0BAC 80240B3C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8B0BB0 80240B40 0C0B1EAF */ jal get_variable -/* 8B0BB4 80240B44 34A5D482 */ ori $a1, $a1, 0xd482 -/* 8B0BB8 80240B48 0220202D */ daddu $a0, $s1, $zero -/* 8B0BBC 80240B4C 3C05F4AC */ lui $a1, 0xf4ac -/* 8B0BC0 80240B50 4482A000 */ mtc1 $v0, $f20 -/* 8B0BC4 80240B54 00000000 */ nop -/* 8B0BC8 80240B58 4680A520 */ cvt.s.w $f20, $f20 -/* 8B0BCC 80240B5C 0C0B1EAF */ jal get_variable -/* 8B0BD0 80240B60 34A5D483 */ ori $a1, $a1, 0xd483 -/* 8B0BD4 80240B64 44821000 */ mtc1 $v0, $f2 -/* 8B0BD8 80240B68 00000000 */ nop -/* 8B0BDC 80240B6C 468010A0 */ cvt.s.w $f2, $f2 -/* 8B0BE0 80240B70 4405B000 */ mfc1 $a1, $f22 -/* 8B0BE4 80240B74 4406A000 */ mfc1 $a2, $f20 -/* 8B0BE8 80240B78 44071000 */ mfc1 $a3, $f2 -/* 8B0BEC 80240B7C 0C01C574 */ jal func_800715D0 -/* 8B0BF0 80240B80 0000202D */ daddu $a0, $zero, $zero -/* 8B0BF4 80240B84 0220202D */ daddu $a0, $s1, $zero -/* 8B0BF8 80240B88 3C05F4AC */ lui $a1, 0xf4ac -/* 8B0BFC 80240B8C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 8B0C00 80240B90 3C108025 */ lui $s0, 0x8025 -/* 8B0C04 80240B94 26107F48 */ addiu $s0, $s0, 0x7f48 -/* 8B0C08 80240B98 0C0B1EAF */ jal get_variable -/* 8B0C0C 80240B9C AE020000 */ sw $v0, ($s0) -/* 8B0C10 80240BA0 0220202D */ daddu $a0, $s1, $zero -/* 8B0C14 80240BA4 3C05F4AC */ lui $a1, 0xf4ac -/* 8B0C18 80240BA8 4482B000 */ mtc1 $v0, $f22 -/* 8B0C1C 80240BAC 00000000 */ nop -/* 8B0C20 80240BB0 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8B0C24 80240BB4 0C0B1EAF */ jal get_variable -/* 8B0C28 80240BB8 34A5D482 */ ori $a1, $a1, 0xd482 -/* 8B0C2C 80240BBC 0220202D */ daddu $a0, $s1, $zero -/* 8B0C30 80240BC0 3C05F4AC */ lui $a1, 0xf4ac -/* 8B0C34 80240BC4 4482A000 */ mtc1 $v0, $f20 -/* 8B0C38 80240BC8 00000000 */ nop -/* 8B0C3C 80240BCC 4680A520 */ cvt.s.w $f20, $f20 -/* 8B0C40 80240BD0 0C0B1EAF */ jal get_variable -/* 8B0C44 80240BD4 34A5D483 */ ori $a1, $a1, 0xd483 -/* 8B0C48 80240BD8 44821000 */ mtc1 $v0, $f2 -/* 8B0C4C 80240BDC 00000000 */ nop -/* 8B0C50 80240BE0 468010A0 */ cvt.s.w $f2, $f2 -/* 8B0C54 80240BE4 4405B000 */ mfc1 $a1, $f22 -/* 8B0C58 80240BE8 4406A000 */ mfc1 $a2, $f20 -/* 8B0C5C 80240BEC 44071000 */ mfc1 $a3, $f2 -/* 8B0C60 80240BF0 0C01C604 */ jal func_80071810 -/* 8B0C64 80240BF4 0000202D */ daddu $a0, $zero, $zero -/* 8B0C68 80240BF8 0220202D */ daddu $a0, $s1, $zero -/* 8B0C6C 80240BFC 3C05F4AC */ lui $a1, 0xf4ac -/* 8B0C70 80240C00 3C018025 */ lui $at, 0x8025 -/* 8B0C74 80240C04 AC227F4C */ sw $v0, 0x7f4c($at) -/* 8B0C78 80240C08 0C0B1EAF */ jal get_variable -/* 8B0C7C 80240C0C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 8B0C80 80240C10 0220202D */ daddu $a0, $s1, $zero -/* 8B0C84 80240C14 3C05F4AC */ lui $a1, 0xf4ac -/* 8B0C88 80240C18 4482B000 */ mtc1 $v0, $f22 -/* 8B0C8C 80240C1C 00000000 */ nop -/* 8B0C90 80240C20 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8B0C94 80240C24 0C0B1EAF */ jal get_variable -/* 8B0C98 80240C28 34A5D482 */ ori $a1, $a1, 0xd482 -/* 8B0C9C 80240C2C 0220202D */ daddu $a0, $s1, $zero -/* 8B0CA0 80240C30 3C05F4AC */ lui $a1, 0xf4ac -/* 8B0CA4 80240C34 4482A000 */ mtc1 $v0, $f20 -/* 8B0CA8 80240C38 00000000 */ nop -/* 8B0CAC 80240C3C 4680A520 */ cvt.s.w $f20, $f20 -/* 8B0CB0 80240C40 0C0B1EAF */ jal get_variable -/* 8B0CB4 80240C44 34A5D483 */ ori $a1, $a1, 0xd483 -/* 8B0CB8 80240C48 44821000 */ mtc1 $v0, $f2 -/* 8B0CBC 80240C4C 00000000 */ nop -/* 8B0CC0 80240C50 468010A0 */ cvt.s.w $f2, $f2 -/* 8B0CC4 80240C54 4405B000 */ mfc1 $a1, $f22 -/* 8B0CC8 80240C58 4406A000 */ mfc1 $a2, $f20 -/* 8B0CCC 80240C5C 3C013F80 */ lui $at, 0x3f80 -/* 8B0CD0 80240C60 44810000 */ mtc1 $at, $f0 -/* 8B0CD4 80240C64 44071000 */ mfc1 $a3, $f2 -/* 8B0CD8 80240C68 0000202D */ daddu $a0, $zero, $zero -/* 8B0CDC 80240C6C AFA00014 */ sw $zero, 0x14($sp) -/* 8B0CE0 80240C70 0C01CA24 */ jal func_80072890 -/* 8B0CE4 80240C74 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8B0CE8 80240C78 8E030000 */ lw $v1, ($s0) -/* 8B0CEC 80240C7C 8C64000C */ lw $a0, 0xc($v1) -/* 8B0CF0 80240C80 3C018025 */ lui $at, 0x8025 -/* 8B0CF4 80240C84 AC227F50 */ sw $v0, 0x7f50($at) -/* 8B0CF8 80240C88 AC800018 */ sw $zero, 0x18($a0) -/* 8B0CFC 80240C8C AC800020 */ sw $zero, 0x20($a0) -/* 8B0D00 80240C90 AC800024 */ sw $zero, 0x24($a0) -/* 8B0D04 80240C94 AC800028 */ sw $zero, 0x28($a0) -/* 8B0D08 80240C98 AC80001C */ sw $zero, 0x1c($a0) -.L80240C9C: -/* 8B0D0C 80240C9C 3C028025 */ lui $v0, 0x8025 -/* 8B0D10 80240CA0 8C427F48 */ lw $v0, 0x7f48($v0) -/* 8B0D14 80240CA4 8C44000C */ lw $a0, 0xc($v0) -/* 8B0D18 80240CA8 8C820020 */ lw $v0, 0x20($a0) -/* 8B0D1C 80240CAC 8C830028 */ lw $v1, 0x28($a0) -/* 8B0D20 80240CB0 2442000A */ addiu $v0, $v0, 0xa -/* 8B0D24 80240CB4 AC820020 */ sw $v0, 0x20($a0) -/* 8B0D28 80240CB8 8C820024 */ lw $v0, 0x24($a0) -/* 8B0D2C 80240CBC 2463000A */ addiu $v1, $v1, 0xa -/* 8B0D30 80240CC0 AC830028 */ sw $v1, 0x28($a0) -/* 8B0D34 80240CC4 8C830018 */ lw $v1, 0x18($a0) -/* 8B0D38 80240CC8 2442000A */ addiu $v0, $v0, 0xa -/* 8B0D3C 80240CCC AC820024 */ sw $v0, 0x24($a0) -/* 8B0D40 80240CD0 8C82001C */ lw $v0, 0x1c($a0) -/* 8B0D44 80240CD4 2463000A */ addiu $v1, $v1, 0xa -/* 8B0D48 80240CD8 AC830018 */ sw $v1, 0x18($a0) -/* 8B0D4C 80240CDC 286300FF */ slti $v1, $v1, 0xff -/* 8B0D50 80240CE0 2442000A */ addiu $v0, $v0, 0xa -/* 8B0D54 80240CE4 AC82001C */ sw $v0, 0x1c($a0) -/* 8B0D58 80240CE8 14600004 */ bnez $v1, .L80240CFC -/* 8B0D5C 80240CEC 0000102D */ daddu $v0, $zero, $zero -/* 8B0D60 80240CF0 240200FF */ addiu $v0, $zero, 0xff -/* 8B0D64 80240CF4 AC820018 */ sw $v0, 0x18($a0) -/* 8B0D68 80240CF8 24020002 */ addiu $v0, $zero, 2 -.L80240CFC: -/* 8B0D6C 80240CFC 8FBF0020 */ lw $ra, 0x20($sp) -/* 8B0D70 80240D00 8FB1001C */ lw $s1, 0x1c($sp) -/* 8B0D74 80240D04 8FB00018 */ lw $s0, 0x18($sp) -/* 8B0D78 80240D08 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8B0D7C 80240D0C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8B0D80 80240D10 03E00008 */ jr $ra -/* 8B0D84 80240D14 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_80240E80_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_80240E80_8B0070.s deleted file mode 100644 index 9206be6fba..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_80240E80_8B0070.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E80_8B0EF0 -/* 8B0EF0 80240E80 3C028025 */ lui $v0, 0x8025 -/* 8B0EF4 80240E84 8C427F50 */ lw $v0, 0x7f50($v0) -/* 8B0EF8 80240E88 8C42000C */ lw $v0, 0xc($v0) -/* 8B0EFC 80240E8C AC40001C */ sw $zero, 0x1c($v0) -/* 8B0F00 80240E90 03E00008 */ jr $ra -/* 8B0F04 80240E94 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_80240EFC_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_80240EFC_8B0070.s deleted file mode 100644 index 136a29d051..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_80240EFC_8B0070.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EFC_8B0F6C -/* 8B0F6C 80240EFC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B0F70 80240F00 AFB10014 */ sw $s1, 0x14($sp) -/* 8B0F74 80240F04 0080882D */ daddu $s1, $a0, $zero -/* 8B0F78 80240F08 AFBF0018 */ sw $ra, 0x18($sp) -/* 8B0F7C 80240F0C AFB00010 */ sw $s0, 0x10($sp) -/* 8B0F80 80240F10 8E30000C */ lw $s0, 0xc($s1) -/* 8B0F84 80240F14 8E050000 */ lw $a1, ($s0) -/* 8B0F88 80240F18 0C0B1EAF */ jal get_variable -/* 8B0F8C 80240F1C 26100004 */ addiu $s0, $s0, 4 -/* 8B0F90 80240F20 0220202D */ daddu $a0, $s1, $zero -/* 8B0F94 80240F24 8E050000 */ lw $a1, ($s0) -/* 8B0F98 80240F28 0C0B210B */ jal get_float_variable -/* 8B0F9C 80240F2C 0040802D */ daddu $s0, $v0, $zero -/* 8B0FA0 80240F30 24020002 */ addiu $v0, $zero, 2 -/* 8B0FA4 80240F34 00501804 */ sllv $v1, $s0, $v0 -/* 8B0FA8 80240F38 00701821 */ addu $v1, $v1, $s0 -/* 8B0FAC 80240F3C 00431804 */ sllv $v1, $v1, $v0 -/* 8B0FB0 80240F40 00701823 */ subu $v1, $v1, $s0 -/* 8B0FB4 80240F44 000320C0 */ sll $a0, $v1, 3 -/* 8B0FB8 80240F48 00641821 */ addu $v1, $v1, $a0 -/* 8B0FBC 80240F4C 000318C0 */ sll $v1, $v1, 3 -/* 8B0FC0 80240F50 3C01800B */ lui $at, 0x800b -/* 8B0FC4 80240F54 00230821 */ addu $at, $at, $v1 -/* 8B0FC8 80240F58 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 8B0FCC 80240F5C 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B0FD0 80240F60 8FB10014 */ lw $s1, 0x14($sp) -/* 8B0FD4 80240F64 8FB00010 */ lw $s0, 0x10($sp) -/* 8B0FD8 80240F68 03E00008 */ jr $ra -/* 8B0FDC 80240F6C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_80241210_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_80241210_8B0070.s deleted file mode 100644 index d18cd9c7cf..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_80241210_8B0070.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241210_8B1280 -/* 8B1280 80241210 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B1284 80241214 AFB10014 */ sw $s1, 0x14($sp) -/* 8B1288 80241218 0080882D */ daddu $s1, $a0, $zero -/* 8B128C 8024121C AFB00010 */ sw $s0, 0x10($sp) -/* 8B1290 80241220 00A0802D */ daddu $s0, $a1, $zero -/* 8B1294 80241224 AFBF0018 */ sw $ra, 0x18($sp) -/* 8B1298 80241228 0C00EABB */ jal get_npc_unsafe -/* 8B129C 8024122C 2404FFFC */ addiu $a0, $zero, -4 -/* 8B12A0 80241230 12000003 */ beqz $s0, .L80241240 -/* 8B12A4 80241234 0040182D */ daddu $v1, $v0, $zero -/* 8B12A8 80241238 2402003C */ addiu $v0, $zero, 0x3c -/* 8B12AC 8024123C AE220070 */ sw $v0, 0x70($s1) -.L80241240: -/* 8B12B0 80241240 C462000C */ lwc1 $f2, 0xc($v1) -/* 8B12B4 80241244 3C0141F0 */ lui $at, 0x41f0 -/* 8B12B8 80241248 44810000 */ mtc1 $at, $f0 -/* 8B12BC 8024124C 00000000 */ nop -/* 8B12C0 80241250 46001000 */ add.s $f0, $f2, $f0 -/* 8B12C4 80241254 3C0143B4 */ lui $at, 0x43b4 -/* 8B12C8 80241258 44811000 */ mtc1 $at, $f2 -/* 8B12CC 8024125C 00000000 */ nop -/* 8B12D0 80241260 4600103E */ c.le.s $f2, $f0 -/* 8B12D4 80241264 00000000 */ nop -/* 8B12D8 80241268 45000003 */ bc1f .L80241278 -/* 8B12DC 8024126C E460000C */ swc1 $f0, 0xc($v1) -/* 8B12E0 80241270 46020001 */ sub.s $f0, $f0, $f2 -/* 8B12E4 80241274 E460000C */ swc1 $f0, 0xc($v1) -.L80241278: -/* 8B12E8 80241278 8E230070 */ lw $v1, 0x70($s1) -/* 8B12EC 8024127C 2463FFFF */ addiu $v1, $v1, -1 -/* 8B12F0 80241280 000317C3 */ sra $v0, $v1, 0x1f -/* 8B12F4 80241284 AE230070 */ sw $v1, 0x70($s1) -/* 8B12F8 80241288 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B12FC 8024128C 8FB10014 */ lw $s1, 0x14($sp) -/* 8B1300 80241290 8FB00010 */ lw $s0, 0x10($sp) -/* 8B1304 80241294 30420002 */ andi $v0, $v0, 2 -/* 8B1308 80241298 03E00008 */ jr $ra -/* 8B130C 8024129C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_80241388_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_80241388_8B0070.s deleted file mode 100644 index 9dfb43afab..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_80241388_8B0070.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241388_8B13F8 -/* 8B13F8 80241388 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B13FC 8024138C 3C058025 */ lui $a1, 0x8025 -/* 8B1400 80241390 8CA57F40 */ lw $a1, 0x7f40($a1) -/* 8B1404 80241394 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B1408 80241398 0C0B1EAF */ jal get_variable -/* 8B140C 8024139C 0000202D */ daddu $a0, $zero, $zero -/* 8B1410 802413A0 0040182D */ daddu $v1, $v0, $zero -/* 8B1414 802413A4 24020001 */ addiu $v0, $zero, 1 -/* 8B1418 802413A8 14620006 */ bne $v1, $v0, .L802413C4 -/* 8B141C 802413AC 24020002 */ addiu $v0, $zero, 2 -/* 8B1420 802413B0 44800000 */ mtc1 $zero, $f0 -/* 8B1424 802413B4 00000000 */ nop -/* 8B1428 802413B8 44050000 */ mfc1 $a1, $f0 -/* 8B142C 802413BC 080904F7 */ j .L802413DC -/* 8B1430 802413C0 0000202D */ daddu $a0, $zero, $zero -.L802413C4: -/* 8B1434 802413C4 14620008 */ bne $v1, $v0, .L802413E8 -/* 8B1438 802413C8 24040001 */ addiu $a0, $zero, 1 -/* 8B143C 802413CC 44800000 */ mtc1 $zero, $f0 -/* 8B1440 802413D0 00000000 */ nop -/* 8B1444 802413D4 44050000 */ mfc1 $a1, $f0 -/* 8B1448 802413D8 00000000 */ nop -.L802413DC: -/* 8B144C 802413DC 00A0302D */ daddu $a2, $a1, $zero -/* 8B1450 802413E0 0C01C5A4 */ jal func_80071690 -/* 8B1454 802413E4 00A0382D */ daddu $a3, $a1, $zero -.L802413E8: -/* 8B1458 802413E8 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B145C 802413EC 03E00008 */ jr $ra -/* 8B1460 802413F0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_802422C0_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_802422C0_8B0070.s deleted file mode 100644 index 37147cd1ff..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_802422C0_8B0070.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422C0_8B2330 -/* 8B2330 802422C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B2334 802422C4 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B2338 802422C8 8C82000C */ lw $v0, 0xc($a0) -/* 8B233C 802422CC 0C0B1EAF */ jal get_variable -/* 8B2340 802422D0 8C450000 */ lw $a1, ($v0) -/* 8B2344 802422D4 3C018024 */ lui $at, 0x8024 -/* 8B2348 802422D8 AC227E34 */ sw $v0, 0x7e34($at) -/* 8B234C 802422DC 24020002 */ addiu $v0, $zero, 2 -/* 8B2350 802422E0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B2354 802422E4 24030001 */ addiu $v1, $zero, 1 -/* 8B2358 802422E8 3C018024 */ lui $at, 0x8024 -/* 8B235C 802422EC AC237E30 */ sw $v1, 0x7e30($at) -/* 8B2360 802422F0 03E00008 */ jr $ra -/* 8B2364 802422F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_80242BA8_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_80242BA8_8B0070.s deleted file mode 100644 index a091951d4b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_80242BA8_8B0070.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242BA8_8B2C18 -/* 8B2C18 80242BA8 3C038015 */ lui $v1, 0x8015 -/* 8B2C1C 80242BAC 8C6312F0 */ lw $v1, 0x12f0($v1) -/* 8B2C20 80242BB0 24020001 */ addiu $v0, $zero, 1 -/* 8B2C24 80242BB4 A0620000 */ sb $v0, ($v1) -/* 8B2C28 80242BB8 03E00008 */ jr $ra -/* 8B2C2C 80242BBC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_80242F08_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_80242F08_8B0070.s deleted file mode 100644 index f8b79ec9ef..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_80242F08_8B0070.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F08_8B2F78 -/* 8B2F78 80242F08 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B2F7C 80242F0C AFBF0010 */ sw $ra, 0x10($sp) -/* 8B2F80 80242F10 0C04760B */ jal func_8011D82C -/* 8B2F84 80242F14 24040003 */ addiu $a0, $zero, 3 -/* 8B2F88 80242F18 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B2F8C 80242F1C 24020002 */ addiu $v0, $zero, 2 -/* 8B2F90 80242F20 03E00008 */ jr $ra -/* 8B2F94 80242F24 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_80243090_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_80243090_8B0070.s deleted file mode 100644 index 148f155323..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_80243090_8B0070.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243090_8B3100 -/* 8B3100 80243090 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B3104 80243094 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B3108 80243098 0C03A631 */ jal func_800E98C4 -/* 8B310C 8024309C 00000000 */ nop -/* 8B3110 802430A0 0C03A6DB */ jal sync_status_menu -/* 8B3114 802430A4 00000000 */ nop -/* 8B3118 802430A8 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B311C 802430AC 24020002 */ addiu $v0, $zero, 2 -/* 8B3120 802430B0 03E00008 */ jr $ra -/* 8B3124 802430B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/func_802437D0_8B0070.s b/asm/nonmatchings/world/area_kmr/kmr_02/func_802437D0_8B0070.s deleted file mode 100644 index 340a33f9d3..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/func_802437D0_8B0070.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802437D0_8B3840 -/* 8B3840 802437D0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 8B3844 802437D4 AFB10054 */ sw $s1, 0x54($sp) -/* 8B3848 802437D8 0080882D */ daddu $s1, $a0, $zero -/* 8B384C 802437DC AFBF005C */ sw $ra, 0x5c($sp) -/* 8B3850 802437E0 AFB20058 */ sw $s2, 0x58($sp) -/* 8B3854 802437E4 AFB00050 */ sw $s0, 0x50($sp) -/* 8B3858 802437E8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 8B385C 802437EC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8B3860 802437F0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8B3864 802437F4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8B3868 802437F8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8B386C 802437FC 8E30000C */ lw $s0, 0xc($s1) -/* 8B3870 80243800 8E050000 */ lw $a1, ($s0) -/* 8B3874 80243804 0C0B1EAF */ jal get_variable -/* 8B3878 80243808 26100004 */ addiu $s0, $s0, 4 -/* 8B387C 8024380C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8B3880 80243810 0040202D */ daddu $a0, $v0, $zero -/* 8B3884 80243814 8E050000 */ lw $a1, ($s0) -/* 8B3888 80243818 26100004 */ addiu $s0, $s0, 4 -/* 8B388C 8024381C 0220202D */ daddu $a0, $s1, $zero -/* 8B3890 80243820 0C0B210B */ jal get_float_variable -/* 8B3894 80243824 0040902D */ daddu $s2, $v0, $zero -/* 8B3898 80243828 8E050000 */ lw $a1, ($s0) -/* 8B389C 8024382C 26100004 */ addiu $s0, $s0, 4 -/* 8B38A0 80243830 0220202D */ daddu $a0, $s1, $zero -/* 8B38A4 80243834 0C0B210B */ jal get_float_variable -/* 8B38A8 80243838 46000706 */ mov.s $f28, $f0 -/* 8B38AC 8024383C 8E050000 */ lw $a1, ($s0) -/* 8B38B0 80243840 26100004 */ addiu $s0, $s0, 4 -/* 8B38B4 80243844 0220202D */ daddu $a0, $s1, $zero -/* 8B38B8 80243848 0C0B210B */ jal get_float_variable -/* 8B38BC 8024384C 46000686 */ mov.s $f26, $f0 -/* 8B38C0 80243850 0220202D */ daddu $a0, $s1, $zero -/* 8B38C4 80243854 8E050000 */ lw $a1, ($s0) -/* 8B38C8 80243858 0C0B210B */ jal get_float_variable -/* 8B38CC 8024385C 46000586 */ mov.s $f22, $f0 -/* 8B38D0 80243860 0240202D */ daddu $a0, $s2, $zero -/* 8B38D4 80243864 0C046B4C */ jal get_model_from_list_index -/* 8B38D8 80243868 46000606 */ mov.s $f24, $f0 -/* 8B38DC 8024386C 0040882D */ daddu $s1, $v0, $zero -/* 8B38E0 80243870 96220000 */ lhu $v0, ($s1) -/* 8B38E4 80243874 30420400 */ andi $v0, $v0, 0x400 -/* 8B38E8 80243878 1440001E */ bnez $v0, .L802438F4 -/* 8B38EC 8024387C 26300058 */ addiu $s0, $s1, 0x58 -/* 8B38F0 80243880 4480A000 */ mtc1 $zero, $f20 -/* 8B38F4 80243884 4406B000 */ mfc1 $a2, $f22 -/* 8B38F8 80243888 4405A000 */ mfc1 $a1, $f20 -/* 8B38FC 8024388C 4407A000 */ mfc1 $a3, $f20 -/* 8B3900 80243890 0C019E40 */ jal guTranslateF -/* 8B3904 80243894 0200202D */ daddu $a0, $s0, $zero -/* 8B3908 80243898 4405E000 */ mfc1 $a1, $f28 -/* 8B390C 8024389C 4406D000 */ mfc1 $a2, $f26 -/* 8B3910 802438A0 4407C000 */ mfc1 $a3, $f24 -/* 8B3914 802438A4 0C090DD8 */ jal func_80243760 -/* 8B3918 802438A8 27A40010 */ addiu $a0, $sp, 0x10 -/* 8B391C 802438AC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8B3920 802438B0 0200282D */ daddu $a1, $s0, $zero -/* 8B3924 802438B4 0C019D80 */ jal guMtxCatF -/* 8B3928 802438B8 0200302D */ daddu $a2, $s0, $zero -/* 8B392C 802438BC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8B3930 802438C0 4600B587 */ neg.s $f22, $f22 -/* 8B3934 802438C4 4405A000 */ mfc1 $a1, $f20 -/* 8B3938 802438C8 4406B000 */ mfc1 $a2, $f22 -/* 8B393C 802438CC 0C019E40 */ jal guTranslateF -/* 8B3940 802438D0 00A0382D */ daddu $a3, $a1, $zero -/* 8B3944 802438D4 27A40010 */ addiu $a0, $sp, 0x10 -/* 8B3948 802438D8 0200282D */ daddu $a1, $s0, $zero -/* 8B394C 802438DC 0C019D80 */ jal guMtxCatF -/* 8B3950 802438E0 00A0302D */ daddu $a2, $a1, $zero -/* 8B3954 802438E4 96220000 */ lhu $v0, ($s1) -/* 8B3958 802438E8 34421400 */ ori $v0, $v0, 0x1400 -/* 8B395C 802438EC 08090E5B */ j .L8024396C -/* 8B3960 802438F0 A6220000 */ sh $v0, ($s1) -.L802438F4: -/* 8B3964 802438F4 4480A000 */ mtc1 $zero, $f20 -/* 8B3968 802438F8 4406B000 */ mfc1 $a2, $f22 -/* 8B396C 802438FC 4405A000 */ mfc1 $a1, $f20 -/* 8B3970 80243900 4407A000 */ mfc1 $a3, $f20 -/* 8B3974 80243904 0C019E40 */ jal guTranslateF -/* 8B3978 80243908 27A40010 */ addiu $a0, $sp, 0x10 -/* 8B397C 8024390C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8B3980 80243910 26300058 */ addiu $s0, $s1, 0x58 -/* 8B3984 80243914 0200282D */ daddu $a1, $s0, $zero -/* 8B3988 80243918 0C019D80 */ jal guMtxCatF -/* 8B398C 8024391C 0200302D */ daddu $a2, $s0, $zero -/* 8B3990 80243920 4405E000 */ mfc1 $a1, $f28 -/* 8B3994 80243924 4406D000 */ mfc1 $a2, $f26 -/* 8B3998 80243928 4407C000 */ mfc1 $a3, $f24 -/* 8B399C 8024392C 0C090DD8 */ jal func_80243760 -/* 8B39A0 80243930 27A40010 */ addiu $a0, $sp, 0x10 -/* 8B39A4 80243934 27A40010 */ addiu $a0, $sp, 0x10 -/* 8B39A8 80243938 0200282D */ daddu $a1, $s0, $zero -/* 8B39AC 8024393C 0C019D80 */ jal guMtxCatF -/* 8B39B0 80243940 0200302D */ daddu $a2, $s0, $zero -/* 8B39B4 80243944 27A40010 */ addiu $a0, $sp, 0x10 -/* 8B39B8 80243948 4600B587 */ neg.s $f22, $f22 -/* 8B39BC 8024394C 4405A000 */ mfc1 $a1, $f20 -/* 8B39C0 80243950 4406B000 */ mfc1 $a2, $f22 -/* 8B39C4 80243954 0C019E40 */ jal guTranslateF -/* 8B39C8 80243958 00A0382D */ daddu $a3, $a1, $zero -/* 8B39CC 8024395C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8B39D0 80243960 0200282D */ daddu $a1, $s0, $zero -/* 8B39D4 80243964 0C019D80 */ jal guMtxCatF -/* 8B39D8 80243968 00A0302D */ daddu $a2, $a1, $zero -.L8024396C: -/* 8B39DC 8024396C 8FBF005C */ lw $ra, 0x5c($sp) -/* 8B39E0 80243970 8FB20058 */ lw $s2, 0x58($sp) -/* 8B39E4 80243974 8FB10054 */ lw $s1, 0x54($sp) -/* 8B39E8 80243978 8FB00050 */ lw $s0, 0x50($sp) -/* 8B39EC 8024397C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 8B39F0 80243980 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 8B39F4 80243984 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 8B39F8 80243988 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 8B39FC 8024398C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 8B3A00 80243990 24020002 */ addiu $v0, $zero, 2 -/* 8B3A04 80243994 03E00008 */ jr $ra -/* 8B3A08 80243998 27BD0088 */ addiu $sp, $sp, 0x88 -/* 8B3A0C 8024399C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/func_80240320_8C7F90.s b/asm/nonmatchings/world/area_kmr/kmr_03/_8C82B0/func_80240320_8C82B0.s similarity index 100% rename from asm/nonmatchings/world/area_kmr/kmr_03/func_80240320_8C7F90.s rename to asm/nonmatchings/world/area_kmr/kmr_03/_8C82B0/func_80240320_8C82B0.s diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/func_8024033C_8C7F90.s b/asm/nonmatchings/world/area_kmr/kmr_03/_8C82B0/func_8024033C_8C82CC.s similarity index 100% rename from asm/nonmatchings/world/area_kmr/kmr_03/func_8024033C_8C7F90.s rename to asm/nonmatchings/world/area_kmr/kmr_03/_8C82B0/func_8024033C_8C82CC.s diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/_8C82B0/func_80240358.s b/asm/nonmatchings/world/area_kmr/kmr_03/_8C82B0/func_80240358.s new file mode 100644 index 0000000000..df5a85621d --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_03/_8C82B0/func_80240358.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240358 +/* 8C82E8 80240358 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8C82EC 8024035C AFB00010 */ sw $s0, 0x10($sp) +/* 8C82F0 80240360 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* 8C82F4 80240364 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* 8C82F8 80240368 AFBF0018 */ sw $ra, 0x18($sp) +/* 8C82FC 8024036C AFB10014 */ sw $s1, 0x14($sp) +/* 8C8300 80240370 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 8C8304 80240374 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 8C8308 80240378 C60C0080 */ lwc1 $f12, 0x80($s0) +/* 8C830C 8024037C 0C00A8BB */ jal sin_deg +/* 8C8310 80240380 0080882D */ daddu $s1, $a0, $zero +/* 8C8314 80240384 C6140054 */ lwc1 $f20, 0x54($s0) +/* 8C8318 80240388 3C0140A0 */ lui $at, 0x40a0 +/* 8C831C 8024038C 4481B000 */ mtc1 $at, $f22 +/* 8C8320 80240390 00000000 */ nop +/* 8C8324 80240394 4616A502 */ mul.s $f20, $f20, $f22 +/* 8C8328 80240398 00000000 */ nop +/* 8C832C 8024039C C60C0080 */ lwc1 $f12, 0x80($s0) +/* 8C8330 802403A0 4600A502 */ mul.s $f20, $f20, $f0 +/* 8C8334 802403A4 0C00A8D4 */ jal cos_deg +/* 8C8338 802403A8 00000000 */ nop +/* 8C833C 802403AC C6040054 */ lwc1 $f4, 0x54($s0) +/* 8C8340 802403B0 46162102 */ mul.s $f4, $f4, $f22 +/* 8C8344 802403B4 00000000 */ nop +/* 8C8348 802403B8 C6020028 */ lwc1 $f2, 0x28($s0) +/* 8C834C 802403BC 46141080 */ add.s $f2, $f2, $f20 +/* 8C8350 802403C0 46000007 */ neg.s $f0, $f0 +/* 8C8354 802403C4 46002102 */ mul.s $f4, $f4, $f0 +/* 8C8358 802403C8 00000000 */ nop +/* 8C835C 802403CC 4600118D */ trunc.w.s $f6, $f2 +/* 8C8360 802403D0 E6260084 */ swc1 $f6, 0x84($s1) +/* 8C8364 802403D4 C6000030 */ lwc1 $f0, 0x30($s0) +/* 8C8368 802403D8 46040000 */ add.s $f0, $f0, $f4 +/* 8C836C 802403DC 4600018D */ trunc.w.s $f6, $f0 +/* 8C8370 802403E0 E6260088 */ swc1 $f6, 0x88($s1) +/* 8C8374 802403E4 8FBF0018 */ lw $ra, 0x18($sp) +/* 8C8378 802403E8 8FB10014 */ lw $s1, 0x14($sp) +/* 8C837C 802403EC 8FB00010 */ lw $s0, 0x10($sp) +/* 8C8380 802403F0 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 8C8384 802403F4 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 8C8388 802403F8 24020002 */ addiu $v0, $zero, 2 +/* 8C838C 802403FC 03E00008 */ jr $ra +/* 8C8390 80240400 27BD0030 */ addiu $sp, $sp, 0x30 +/* 8C8394 80240404 00000000 */ nop +/* 8C8398 80240408 00000000 */ nop +/* 8C839C 8024040C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/func_80240410_8C7F90.s b/asm/nonmatchings/world/area_kmr/kmr_03/_8C83A0/func_80240410_8C83A0.s similarity index 100% rename from asm/nonmatchings/world/area_kmr/kmr_03/func_80240410_8C7F90.s rename to asm/nonmatchings/world/area_kmr/kmr_03/_8C83A0/func_80240410_8C83A0.s diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/_8C83A0/func_80240480.s b/asm/nonmatchings/world/area_kmr/kmr_03/_8C83A0/func_80240480.s new file mode 100644 index 0000000000..3759dbddaa --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_03/_8C83A0/func_80240480.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240480 +/* 8C8410 80240480 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 8C8414 80240484 AFB10054 */ sw $s1, 0x54($sp) +/* 8C8418 80240488 0080882D */ daddu $s1, $a0, $zero +/* 8C841C 8024048C AFBF005C */ sw $ra, 0x5c($sp) +/* 8C8420 80240490 AFB20058 */ sw $s2, 0x58($sp) +/* 8C8424 80240494 AFB00050 */ sw $s0, 0x50($sp) +/* 8C8428 80240498 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 8C842C 8024049C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 8C8430 802404A0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 8C8434 802404A4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 8C8438 802404A8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 8C843C 802404AC 8E30000C */ lw $s0, 0xc($s1) +/* 8C8440 802404B0 8E050000 */ lw $a1, ($s0) +/* 8C8444 802404B4 0C0B1EAF */ jal get_variable +/* 8C8448 802404B8 26100004 */ addiu $s0, $s0, 4 +/* 8C844C 802404BC 0C046C04 */ jal get_model_list_index_from_tree_index +/* 8C8450 802404C0 0040202D */ daddu $a0, $v0, $zero +/* 8C8454 802404C4 8E050000 */ lw $a1, ($s0) +/* 8C8458 802404C8 26100004 */ addiu $s0, $s0, 4 +/* 8C845C 802404CC 0220202D */ daddu $a0, $s1, $zero +/* 8C8460 802404D0 0C0B210B */ jal get_float_variable +/* 8C8464 802404D4 0040902D */ daddu $s2, $v0, $zero +/* 8C8468 802404D8 8E050000 */ lw $a1, ($s0) +/* 8C846C 802404DC 26100004 */ addiu $s0, $s0, 4 +/* 8C8470 802404E0 0220202D */ daddu $a0, $s1, $zero +/* 8C8474 802404E4 0C0B210B */ jal get_float_variable +/* 8C8478 802404E8 46000706 */ mov.s $f28, $f0 +/* 8C847C 802404EC 8E050000 */ lw $a1, ($s0) +/* 8C8480 802404F0 26100004 */ addiu $s0, $s0, 4 +/* 8C8484 802404F4 0220202D */ daddu $a0, $s1, $zero +/* 8C8488 802404F8 0C0B210B */ jal get_float_variable +/* 8C848C 802404FC 46000686 */ mov.s $f26, $f0 +/* 8C8490 80240500 0220202D */ daddu $a0, $s1, $zero +/* 8C8494 80240504 8E050000 */ lw $a1, ($s0) +/* 8C8498 80240508 0C0B210B */ jal get_float_variable +/* 8C849C 8024050C 46000586 */ mov.s $f22, $f0 +/* 8C84A0 80240510 0240202D */ daddu $a0, $s2, $zero +/* 8C84A4 80240514 0C046B4C */ jal get_model_from_list_index +/* 8C84A8 80240518 46000606 */ mov.s $f24, $f0 +/* 8C84AC 8024051C 0040882D */ daddu $s1, $v0, $zero +/* 8C84B0 80240520 96220000 */ lhu $v0, ($s1) +/* 8C84B4 80240524 30420400 */ andi $v0, $v0, 0x400 +/* 8C84B8 80240528 1440001E */ bnez $v0, .L802405A4 +/* 8C84BC 8024052C 26300058 */ addiu $s0, $s1, 0x58 +/* 8C84C0 80240530 4480A000 */ mtc1 $zero, $f20 +/* 8C84C4 80240534 4406B000 */ mfc1 $a2, $f22 +/* 8C84C8 80240538 4405A000 */ mfc1 $a1, $f20 +/* 8C84CC 8024053C 4407A000 */ mfc1 $a3, $f20 +/* 8C84D0 80240540 0C019E40 */ jal guTranslateF +/* 8C84D4 80240544 0200202D */ daddu $a0, $s0, $zero +/* 8C84D8 80240548 4405E000 */ mfc1 $a1, $f28 +/* 8C84DC 8024054C 4406D000 */ mfc1 $a2, $f26 +/* 8C84E0 80240550 4407C000 */ mfc1 $a3, $f24 +/* 8C84E4 80240554 0C090104 */ jal func_80240410 +/* 8C84E8 80240558 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C84EC 8024055C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C84F0 80240560 0200282D */ daddu $a1, $s0, $zero +/* 8C84F4 80240564 0C019D80 */ jal guMtxCatF +/* 8C84F8 80240568 0200302D */ daddu $a2, $s0, $zero +/* 8C84FC 8024056C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C8500 80240570 4600B587 */ neg.s $f22, $f22 +/* 8C8504 80240574 4405A000 */ mfc1 $a1, $f20 +/* 8C8508 80240578 4406B000 */ mfc1 $a2, $f22 +/* 8C850C 8024057C 0C019E40 */ jal guTranslateF +/* 8C8510 80240580 00A0382D */ daddu $a3, $a1, $zero +/* 8C8514 80240584 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C8518 80240588 0200282D */ daddu $a1, $s0, $zero +/* 8C851C 8024058C 0C019D80 */ jal guMtxCatF +/* 8C8520 80240590 00A0302D */ daddu $a2, $a1, $zero +/* 8C8524 80240594 96220000 */ lhu $v0, ($s1) +/* 8C8528 80240598 34421400 */ ori $v0, $v0, 0x1400 +/* 8C852C 8024059C 08090187 */ j .L8024061C +/* 8C8530 802405A0 A6220000 */ sh $v0, ($s1) +.L802405A4: +/* 8C8534 802405A4 4480A000 */ mtc1 $zero, $f20 +/* 8C8538 802405A8 4406B000 */ mfc1 $a2, $f22 +/* 8C853C 802405AC 4405A000 */ mfc1 $a1, $f20 +/* 8C8540 802405B0 4407A000 */ mfc1 $a3, $f20 +/* 8C8544 802405B4 0C019E40 */ jal guTranslateF +/* 8C8548 802405B8 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C854C 802405BC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C8550 802405C0 26300058 */ addiu $s0, $s1, 0x58 +/* 8C8554 802405C4 0200282D */ daddu $a1, $s0, $zero +/* 8C8558 802405C8 0C019D80 */ jal guMtxCatF +/* 8C855C 802405CC 0200302D */ daddu $a2, $s0, $zero +/* 8C8560 802405D0 4405E000 */ mfc1 $a1, $f28 +/* 8C8564 802405D4 4406D000 */ mfc1 $a2, $f26 +/* 8C8568 802405D8 4407C000 */ mfc1 $a3, $f24 +/* 8C856C 802405DC 0C090104 */ jal func_80240410 +/* 8C8570 802405E0 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C8574 802405E4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C8578 802405E8 0200282D */ daddu $a1, $s0, $zero +/* 8C857C 802405EC 0C019D80 */ jal guMtxCatF +/* 8C8580 802405F0 0200302D */ daddu $a2, $s0, $zero +/* 8C8584 802405F4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C8588 802405F8 4600B587 */ neg.s $f22, $f22 +/* 8C858C 802405FC 4405A000 */ mfc1 $a1, $f20 +/* 8C8590 80240600 4406B000 */ mfc1 $a2, $f22 +/* 8C8594 80240604 0C019E40 */ jal guTranslateF +/* 8C8598 80240608 00A0382D */ daddu $a3, $a1, $zero +/* 8C859C 8024060C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C85A0 80240610 0200282D */ daddu $a1, $s0, $zero +/* 8C85A4 80240614 0C019D80 */ jal guMtxCatF +/* 8C85A8 80240618 00A0302D */ daddu $a2, $a1, $zero +.L8024061C: +/* 8C85AC 8024061C 8FBF005C */ lw $ra, 0x5c($sp) +/* 8C85B0 80240620 8FB20058 */ lw $s2, 0x58($sp) +/* 8C85B4 80240624 8FB10054 */ lw $s1, 0x54($sp) +/* 8C85B8 80240628 8FB00050 */ lw $s0, 0x50($sp) +/* 8C85BC 8024062C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 8C85C0 80240630 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 8C85C4 80240634 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 8C85C8 80240638 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 8C85CC 8024063C D7B40060 */ ldc1 $f20, 0x60($sp) +/* 8C85D0 80240640 24020002 */ addiu $v0, $zero, 2 +/* 8C85D4 80240644 03E00008 */ jr $ra +/* 8C85D8 80240648 27BD0088 */ addiu $sp, $sp, 0x88 +/* 8C85DC 8024064C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/func_802401B0_8C7F90.s b/asm/nonmatchings/world/area_kmr/kmr_03/func_802401B0_8C7F90.s deleted file mode 100644 index be90193e13..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_03/func_802401B0_8C7F90.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_8C8140 -/* 8C8140 802401B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8C8144 802401B4 AFB10014 */ sw $s1, 0x14($sp) -/* 8C8148 802401B8 0080882D */ daddu $s1, $a0, $zero -/* 8C814C 802401BC 0000202D */ daddu $a0, $zero, $zero -/* 8C8150 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 8C8154 802401C4 0C00EABB */ jal get_npc_unsafe -/* 8C8158 802401C8 AFB00010 */ sw $s0, 0x10($sp) -/* 8C815C 802401CC 0040802D */ daddu $s0, $v0, $zero -/* 8C8160 802401D0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8C8164 802401D4 0C038022 */ jal func_800E0088 -/* 8C8168 802401D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8C816C 802401DC C6020018 */ lwc1 $f2, 0x18($s0) -/* 8C8170 802401E0 3C013F4C */ lui $at, 0x3f4c -/* 8C8174 802401E4 3421CCCD */ ori $at, $at, 0xcccd -/* 8C8178 802401E8 44812000 */ mtc1 $at, $f4 -/* 8C817C 802401EC 46020003 */ div.s $f0, $f0, $f2 -/* 8C8180 802401F0 46040002 */ mul.s $f0, $f0, $f4 -/* 8C8184 802401F4 00000000 */ nop -/* 8C8188 802401F8 4600018D */ trunc.w.s $f6, $f0 -/* 8C818C 802401FC E6260088 */ swc1 $f6, 0x88($s1) -/* 8C8190 80240200 8FBF0018 */ lw $ra, 0x18($sp) -/* 8C8194 80240204 8FB10014 */ lw $s1, 0x14($sp) -/* 8C8198 80240208 8FB00010 */ lw $s0, 0x10($sp) -/* 8C819C 8024020C 24020002 */ addiu $v0, $zero, 2 -/* 8C81A0 80240210 03E00008 */ jr $ra -/* 8C81A4 80240214 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/func_802403E0_8CA900.s b/asm/nonmatchings/world/area_kmr/kmr_04/func_802403E0_8CA900.s deleted file mode 100644 index 3dcf2177e0..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_04/func_802403E0_8CA900.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403E0_8CACE0 -/* 8CACE0 802403E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8CACE4 802403E4 3C048024 */ lui $a0, 0x8024 -/* 8CACE8 802403E8 24843770 */ addiu $a0, $a0, 0x3770 -/* 8CACEC 802403EC 3C028024 */ lui $v0, 0x8024 -/* 8CACF0 802403F0 24421BF0 */ addiu $v0, $v0, 0x1bf0 -/* 8CACF4 802403F4 AFBF0010 */ sw $ra, 0x10($sp) -/* 8CACF8 802403F8 AC820000 */ sw $v0, ($a0) -/* 8CACFC 802403FC 3C028024 */ lui $v0, 0x8024 -/* 8CAD00 80240400 24422070 */ addiu $v0, $v0, 0x2070 -/* 8CAD04 80240404 AC820004 */ sw $v0, 4($a0) -/* 8CAD08 80240408 24020030 */ addiu $v0, $zero, 0x30 -/* 8CAD0C 8024040C A4820008 */ sh $v0, 8($a0) -/* 8CAD10 80240410 A482000A */ sh $v0, 0xa($a0) -/* 8CAD14 80240414 24020002 */ addiu $v0, $zero, 2 -/* 8CAD18 80240418 AC82000C */ sw $v0, 0xc($a0) -/* 8CAD1C 8024041C 0C0496CB */ jal set_message_images -/* 8CAD20 80240420 AC800010 */ sw $zero, 0x10($a0) -/* 8CAD24 80240424 8FBF0010 */ lw $ra, 0x10($sp) -/* 8CAD28 80240428 24020002 */ addiu $v0, $zero, 2 -/* 8CAD2C 8024042C 03E00008 */ jr $ra -/* 8CAD30 80240430 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/func_80240444_8CA900.s b/asm/nonmatchings/world/area_kmr/kmr_04/func_80240444_8CA900.s deleted file mode 100644 index 26fc9b1e21..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_04/func_80240444_8CA900.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240444_8CAD44 -/* 8CAD44 80240444 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8CAD48 80240448 AFBF0010 */ sw $ra, 0x10($sp) -/* 8CAD4C 8024044C 0C04417A */ jal get_entity_by_index -/* 8CAD50 80240450 8C840084 */ lw $a0, 0x84($a0) -/* 8CAD54 80240454 0C043F5A */ jal func_8010FD68 -/* 8CAD58 80240458 0040202D */ daddu $a0, $v0, $zero -/* 8CAD5C 8024045C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8CAD60 80240460 24020002 */ addiu $v0, $zero, 2 -/* 8CAD64 80240464 03E00008 */ jr $ra -/* 8CAD68 80240468 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8CAD6C 8024046C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/func_802401B0_8CE070.s b/asm/nonmatchings/world/area_kmr/kmr_05/func_802401B0_8CE070.s deleted file mode 100644 index 3a27dc746d..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/func_802401B0_8CE070.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_8CE220 -/* 8CE220 802401B0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 8CE224 802401B4 AFB3004C */ sw $s3, 0x4c($sp) -/* 8CE228 802401B8 0080982D */ daddu $s3, $a0, $zero -/* 8CE22C 802401BC AFBF0058 */ sw $ra, 0x58($sp) -/* 8CE230 802401C0 AFB50054 */ sw $s5, 0x54($sp) -/* 8CE234 802401C4 AFB40050 */ sw $s4, 0x50($sp) -/* 8CE238 802401C8 AFB20048 */ sw $s2, 0x48($sp) -/* 8CE23C 802401CC AFB10044 */ sw $s1, 0x44($sp) -/* 8CE240 802401D0 AFB00040 */ sw $s0, 0x40($sp) -/* 8CE244 802401D4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8CE248 802401D8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8CE24C 802401DC F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8CE250 802401E0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8CE254 802401E4 8E710148 */ lw $s1, 0x148($s3) -/* 8CE258 802401E8 00A0902D */ daddu $s2, $a1, $zero -/* 8CE25C 802401EC 86240008 */ lh $a0, 8($s1) -/* 8CE260 802401F0 0C00EABB */ jal get_npc_unsafe -/* 8CE264 802401F4 00C0A82D */ daddu $s5, $a2, $zero -/* 8CE268 802401F8 0040802D */ daddu $s0, $v0, $zero -/* 8CE26C 802401FC 0000A02D */ daddu $s4, $zero, $zero -/* 8CE270 80240200 C624007C */ lwc1 $f4, 0x7c($s1) -/* 8CE274 80240204 46802120 */ cvt.s.w $f4, $f4 -/* 8CE278 80240208 C6220088 */ lwc1 $f2, 0x88($s1) -/* 8CE27C 8024020C 468010A0 */ cvt.s.w $f2, $f2 -/* 8CE280 80240210 460010A1 */ cvt.d.s $f2, $f2 -/* 8CE284 80240214 46002121 */ cvt.d.s $f4, $f4 -/* 8CE288 80240218 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8CE28C 8024021C 3C014059 */ lui $at, 0x4059 -/* 8CE290 80240220 44813800 */ mtc1 $at, $f7 -/* 8CE294 80240224 44803000 */ mtc1 $zero, $f6 -/* 8CE298 80240228 46000021 */ cvt.d.s $f0, $f0 -/* 8CE29C 8024022C 46260002 */ mul.d $f0, $f0, $f6 -/* 8CE2A0 80240230 00000000 */ nop -/* 8CE2A4 80240234 24020001 */ addiu $v0, $zero, 1 -/* 8CE2A8 80240238 8E24006C */ lw $a0, 0x6c($s1) -/* 8CE2AC 8024023C 46261083 */ div.d $f2, $f2, $f6 -/* 8CE2B0 80240240 462010A0 */ cvt.s.d $f2, $f2 -/* 8CE2B4 80240244 46262103 */ div.d $f4, $f4, $f6 -/* 8CE2B8 80240248 46202520 */ cvt.s.d $f20, $f4 -/* 8CE2BC 8024024C 30830011 */ andi $v1, $a0, 0x11 -/* 8CE2C0 80240250 4620020D */ trunc.w.d $f8, $f0 -/* 8CE2C4 80240254 E628007C */ swc1 $f8, 0x7c($s1) -/* 8CE2C8 80240258 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8CE2CC 8024025C 46800020 */ cvt.s.w $f0, $f0 -/* 8CE2D0 80240260 46000021 */ cvt.d.s $f0, $f0 -/* 8CE2D4 80240264 46260003 */ div.d $f0, $f0, $f6 -/* 8CE2D8 80240268 462006A0 */ cvt.s.d $f26, $f0 -/* 8CE2DC 8024026C C6200070 */ lwc1 $f0, 0x70($s1) -/* 8CE2E0 80240270 46800020 */ cvt.s.w $f0, $f0 -/* 8CE2E4 80240274 46000021 */ cvt.d.s $f0, $f0 -/* 8CE2E8 80240278 46260003 */ div.d $f0, $f0, $f6 -/* 8CE2EC 8024027C 462005A0 */ cvt.s.d $f22, $f0 -/* 8CE2F0 80240280 14620025 */ bne $v1, $v0, .L80240318 -/* 8CE2F4 80240284 4602D600 */ add.s $f24, $f26, $f2 -/* 8CE2F8 80240288 8E020000 */ lw $v0, ($s0) -/* 8CE2FC 8024028C 30420008 */ andi $v0, $v0, 8 -/* 8CE300 80240290 10400009 */ beqz $v0, .L802402B8 -/* 8CE304 80240294 27A50028 */ addiu $a1, $sp, 0x28 -/* 8CE308 80240298 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8CE30C 8024029C 4600C001 */ sub.s $f0, $f24, $f0 -/* 8CE310 802402A0 4600B03C */ c.lt.s $f22, $f0 -/* 8CE314 802402A4 00000000 */ nop -/* 8CE318 802402A8 4500001B */ bc1f .L80240318 -/* 8CE31C 802402AC 34820010 */ ori $v0, $a0, 0x10 -/* 8CE320 802402B0 080900C6 */ j .L80240318 -/* 8CE324 802402B4 AE22006C */ sw $v0, 0x6c($s1) -.L802402B8: -/* 8CE328 802402B8 27A6002C */ addiu $a2, $sp, 0x2c -/* 8CE32C 802402BC C6000038 */ lwc1 $f0, 0x38($s0) -/* 8CE330 802402C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8CE334 802402C4 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8CE338 802402C8 3C01447A */ lui $at, 0x447a -/* 8CE33C 802402CC 44813000 */ mtc1 $at, $f6 -/* 8CE340 802402D0 27A20034 */ addiu $v0, $sp, 0x34 -/* 8CE344 802402D4 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8CE348 802402D8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8CE34C 802402DC E7A40030 */ swc1 $f4, 0x30($sp) -/* 8CE350 802402E0 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8CE354 802402E4 AFA20010 */ sw $v0, 0x10($sp) -/* 8CE358 802402E8 8E040080 */ lw $a0, 0x80($s0) -/* 8CE35C 802402EC 0C0372DF */ jal func_800DCB7C -/* 8CE360 802402F0 27A70030 */ addiu $a3, $sp, 0x30 -/* 8CE364 802402F4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 8CE368 802402F8 4600D001 */ sub.s $f0, $f26, $f0 -/* 8CE36C 802402FC 4600B03C */ c.lt.s $f22, $f0 -/* 8CE370 80240300 00000000 */ nop -/* 8CE374 80240304 45000004 */ bc1f .L80240318 -/* 8CE378 80240308 00000000 */ nop -/* 8CE37C 8024030C 8E22006C */ lw $v0, 0x6c($s1) -/* 8CE380 80240310 34420010 */ ori $v0, $v0, 0x10 -/* 8CE384 80240314 AE22006C */ sw $v0, 0x6c($s1) -.L80240318: -/* 8CE388 80240318 8E22006C */ lw $v0, 0x6c($s1) -/* 8CE38C 8024031C 24030011 */ addiu $v1, $zero, 0x11 -/* 8CE390 80240320 30420011 */ andi $v0, $v0, 0x11 -/* 8CE394 80240324 14430039 */ bne $v0, $v1, .L8024040C -/* 8CE398 80240328 00000000 */ nop -/* 8CE39C 8024032C 8E020000 */ lw $v0, ($s0) -/* 8CE3A0 80240330 30420008 */ andi $v0, $v0, 8 -/* 8CE3A4 80240334 1040000A */ beqz $v0, .L80240360 -/* 8CE3A8 80240338 4600C106 */ mov.s $f4, $f24 -/* 8CE3AC 8024033C 4614C081 */ sub.s $f2, $f24, $f20 -/* 8CE3B0 80240340 3C018024 */ lui $at, 0x8024 -/* 8CE3B4 80240344 D4203448 */ ldc1 $f0, 0x3448($at) -/* 8CE3B8 80240348 460010A1 */ cvt.d.s $f2, $f2 -/* 8CE3BC 8024034C 46201082 */ mul.d $f2, $f2, $f0 -/* 8CE3C0 80240350 00000000 */ nop -/* 8CE3C4 80240354 4600A021 */ cvt.d.s $f0, $f20 -/* 8CE3C8 80240358 080900F1 */ j .L802403C4 -/* 8CE3CC 8024035C 46220000 */ add.d $f0, $f0, $f2 -.L80240360: -/* 8CE3D0 80240360 27A50028 */ addiu $a1, $sp, 0x28 -/* 8CE3D4 80240364 27A6002C */ addiu $a2, $sp, 0x2c -/* 8CE3D8 80240368 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8CE3DC 8024036C C6020040 */ lwc1 $f2, 0x40($s0) -/* 8CE3E0 80240370 3C01447A */ lui $at, 0x447a -/* 8CE3E4 80240374 44812000 */ mtc1 $at, $f4 -/* 8CE3E8 80240378 27A20034 */ addiu $v0, $sp, 0x34 -/* 8CE3EC 8024037C E7B4002C */ swc1 $f20, 0x2c($sp) -/* 8CE3F0 80240380 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8CE3F4 80240384 E7A20030 */ swc1 $f2, 0x30($sp) -/* 8CE3F8 80240388 E7A40034 */ swc1 $f4, 0x34($sp) -/* 8CE3FC 8024038C AFA20010 */ sw $v0, 0x10($sp) -/* 8CE400 80240390 8E040080 */ lw $a0, 0x80($s0) -/* 8CE404 80240394 0C0372DF */ jal func_800DCB7C -/* 8CE408 80240398 27A70030 */ addiu $a3, $sp, 0x30 -/* 8CE40C 8024039C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* 8CE410 802403A0 461A2100 */ add.s $f4, $f4, $f26 -/* 8CE414 802403A4 46142081 */ sub.s $f2, $f4, $f20 -/* 8CE418 802403A8 3C018024 */ lui $at, 0x8024 -/* 8CE41C 802403AC D4203450 */ ldc1 $f0, 0x3450($at) -/* 8CE420 802403B0 460010A1 */ cvt.d.s $f2, $f2 -/* 8CE424 802403B4 46201082 */ mul.d $f2, $f2, $f0 -/* 8CE428 802403B8 00000000 */ nop -/* 8CE42C 802403BC 4600A021 */ cvt.d.s $f0, $f20 -/* 8CE430 802403C0 46220000 */ add.d $f0, $f0, $f2 -.L802403C4: -/* 8CE434 802403C4 46200020 */ cvt.s.d $f0, $f0 -/* 8CE438 802403C8 E600003C */ swc1 $f0, 0x3c($s0) -/* 8CE43C 802403CC C600003C */ lwc1 $f0, 0x3c($s0) -/* 8CE440 802403D0 46002001 */ sub.s $f0, $f4, $f0 -/* 8CE444 802403D4 3C013FF0 */ lui $at, 0x3ff0 -/* 8CE448 802403D8 44811800 */ mtc1 $at, $f3 -/* 8CE44C 802403DC 44801000 */ mtc1 $zero, $f2 -/* 8CE450 802403E0 46000005 */ abs.s $f0, $f0 -/* 8CE454 802403E4 46000021 */ cvt.d.s $f0, $f0 -/* 8CE458 802403E8 4622003C */ c.lt.d $f0, $f2 -/* 8CE45C 802403EC 00000000 */ nop -/* 8CE460 802403F0 45000036 */ bc1f .L802404CC -/* 8CE464 802403F4 2403FFEF */ addiu $v1, $zero, -0x11 -/* 8CE468 802403F8 E604003C */ swc1 $f4, 0x3c($s0) -/* 8CE46C 802403FC 8E22006C */ lw $v0, 0x6c($s1) -/* 8CE470 80240400 00431024 */ and $v0, $v0, $v1 -/* 8CE474 80240404 08090133 */ j .L802404CC -/* 8CE478 80240408 AE22006C */ sw $v0, 0x6c($s1) -.L8024040C: -/* 8CE47C 8024040C 8E220070 */ lw $v0, 0x70($s1) -/* 8CE480 80240410 1840002E */ blez $v0, .L802404CC -/* 8CE484 80240414 00000000 */ nop -/* 8CE488 80240418 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 8CE48C 8024041C 0C00A8BB */ jal sin_deg -/* 8CE490 80240420 46806320 */ cvt.s.w $f12, $f12 -/* 8CE494 80240424 8E020000 */ lw $v0, ($s0) -/* 8CE498 80240428 30420008 */ andi $v0, $v0, 8 -/* 8CE49C 8024042C 10400003 */ beqz $v0, .L8024043C -/* 8CE4A0 80240430 46000506 */ mov.s $f20, $f0 -/* 8CE4A4 80240434 0809011F */ j .L8024047C -/* 8CE4A8 80240438 0000102D */ daddu $v0, $zero, $zero -.L8024043C: -/* 8CE4AC 8024043C 27A50028 */ addiu $a1, $sp, 0x28 -/* 8CE4B0 80240440 27A6002C */ addiu $a2, $sp, 0x2c -/* 8CE4B4 80240444 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8CE4B8 80240448 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8CE4BC 8024044C C6040040 */ lwc1 $f4, 0x40($s0) -/* 8CE4C0 80240450 3C01447A */ lui $at, 0x447a -/* 8CE4C4 80240454 44813000 */ mtc1 $at, $f6 -/* 8CE4C8 80240458 27A20034 */ addiu $v0, $sp, 0x34 -/* 8CE4CC 8024045C E7A00028 */ swc1 $f0, 0x28($sp) -/* 8CE4D0 80240460 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8CE4D4 80240464 E7A40030 */ swc1 $f4, 0x30($sp) -/* 8CE4D8 80240468 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8CE4DC 8024046C AFA20010 */ sw $v0, 0x10($sp) -/* 8CE4E0 80240470 8E040080 */ lw $a0, 0x80($s0) -/* 8CE4E4 80240474 0C0372DF */ jal func_800DCB7C -/* 8CE4E8 80240478 27A70030 */ addiu $a3, $sp, 0x30 -.L8024047C: -/* 8CE4EC 8024047C 10400007 */ beqz $v0, .L8024049C -/* 8CE4F0 80240480 00000000 */ nop -/* 8CE4F4 80240484 4616A082 */ mul.s $f2, $f20, $f22 -/* 8CE4F8 80240488 00000000 */ nop -/* 8CE4FC 8024048C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 8CE500 80240490 461A0000 */ add.s $f0, $f0, $f26 -/* 8CE504 80240494 0809012A */ j .L802404A8 -/* 8CE508 80240498 46020000 */ add.s $f0, $f0, $f2 -.L8024049C: -/* 8CE50C 8024049C 4616A002 */ mul.s $f0, $f20, $f22 -/* 8CE510 802404A0 00000000 */ nop -/* 8CE514 802404A4 4600C000 */ add.s $f0, $f24, $f0 -.L802404A8: -/* 8CE518 802404A8 E600003C */ swc1 $f0, 0x3c($s0) -/* 8CE51C 802404AC 8E220074 */ lw $v0, 0x74($s1) -/* 8CE520 802404B0 2442000A */ addiu $v0, $v0, 0xa -/* 8CE524 802404B4 44826000 */ mtc1 $v0, $f12 -/* 8CE528 802404B8 00000000 */ nop -/* 8CE52C 802404BC 0C00A6C9 */ jal clamp_angle -/* 8CE530 802404C0 46806320 */ cvt.s.w $f12, $f12 -/* 8CE534 802404C4 4600020D */ trunc.w.s $f8, $f0 -/* 8CE538 802404C8 E6280074 */ swc1 $f8, 0x74($s1) -.L802404CC: -/* 8CE53C 802404CC 8E220090 */ lw $v0, 0x90($s1) -/* 8CE540 802404D0 1C40004A */ bgtz $v0, .L802405FC -/* 8CE544 802404D4 2442FFFF */ addiu $v0, $v0, -1 -/* 8CE548 802404D8 8E430014 */ lw $v1, 0x14($s2) -/* 8CE54C 802404DC 04600048 */ bltz $v1, .L80240600 -/* 8CE550 802404E0 00000000 */ nop -/* 8CE554 802404E4 8E620074 */ lw $v0, 0x74($s3) -/* 8CE558 802404E8 1C400042 */ bgtz $v0, .L802405F4 -/* 8CE55C 802404EC 2442FFFF */ addiu $v0, $v0, -1 -/* 8CE560 802404F0 AE630074 */ sw $v1, 0x74($s3) -/* 8CE564 802404F4 860200A8 */ lh $v0, 0xa8($s0) -/* 8CE568 802404F8 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8CE56C 802404FC 44820000 */ mtc1 $v0, $f0 -/* 8CE570 80240500 00000000 */ nop -/* 8CE574 80240504 46800020 */ cvt.s.w $f0, $f0 -/* 8CE578 80240508 46001080 */ add.s $f2, $f2, $f0 -/* 8CE57C 8024050C 3C014024 */ lui $at, 0x4024 -/* 8CE580 80240510 44810800 */ mtc1 $at, $f1 -/* 8CE584 80240514 44800000 */ mtc1 $zero, $f0 -/* 8CE588 80240518 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8CE58C 8024051C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8CE590 80240520 460010A1 */ cvt.d.s $f2, $f2 -/* 8CE594 80240524 46201080 */ add.d $f2, $f2, $f0 -/* 8CE598 80240528 C440002C */ lwc1 $f0, 0x2c($v0) -/* 8CE59C 8024052C 46000021 */ cvt.d.s $f0, $f0 -/* 8CE5A0 80240530 4622003C */ c.lt.d $f0, $f2 -/* 8CE5A4 80240534 00000000 */ nop -/* 8CE5A8 80240538 4500002C */ bc1f .L802405EC -/* 8CE5AC 8024053C 02A0202D */ daddu $a0, $s5, $zero -/* 8CE5B0 80240540 AFA00010 */ sw $zero, 0x10($sp) -/* 8CE5B4 80240544 8E46000C */ lw $a2, 0xc($s2) -/* 8CE5B8 80240548 8E470010 */ lw $a3, 0x10($s2) -/* 8CE5BC 8024054C 0C01242D */ jal func_800490B4 -/* 8CE5C0 80240550 0220282D */ daddu $a1, $s1, $zero -/* 8CE5C4 80240554 10400025 */ beqz $v0, .L802405EC -/* 8CE5C8 80240558 0000202D */ daddu $a0, $zero, $zero -/* 8CE5CC 8024055C 0200282D */ daddu $a1, $s0, $zero -/* 8CE5D0 80240560 0000302D */ daddu $a2, $zero, $zero -/* 8CE5D4 80240564 2412000C */ addiu $s2, $zero, 0xc -/* 8CE5D8 80240568 860300A8 */ lh $v1, 0xa8($s0) -/* 8CE5DC 8024056C 3C013F80 */ lui $at, 0x3f80 -/* 8CE5E0 80240570 44810000 */ mtc1 $at, $f0 -/* 8CE5E4 80240574 3C014000 */ lui $at, 0x4000 -/* 8CE5E8 80240578 44811000 */ mtc1 $at, $f2 -/* 8CE5EC 8024057C 3C01C1A0 */ lui $at, 0xc1a0 -/* 8CE5F0 80240580 44812000 */ mtc1 $at, $f4 -/* 8CE5F4 80240584 44834000 */ mtc1 $v1, $f8 -/* 8CE5F8 80240588 00000000 */ nop -/* 8CE5FC 8024058C 46804220 */ cvt.s.w $f8, $f8 -/* 8CE600 80240590 44074000 */ mfc1 $a3, $f8 -/* 8CE604 80240594 27A20038 */ addiu $v0, $sp, 0x38 -/* 8CE608 80240598 AFB2001C */ sw $s2, 0x1c($sp) -/* 8CE60C 8024059C AFA20020 */ sw $v0, 0x20($sp) -/* 8CE610 802405A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8CE614 802405A4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8CE618 802405A8 0C01BFA4 */ jal fx_emote -/* 8CE61C 802405AC E7A40018 */ swc1 $f4, 0x18($sp) -/* 8CE620 802405B0 0200202D */ daddu $a0, $s0, $zero -/* 8CE624 802405B4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8CE628 802405B8 C480003C */ lwc1 $f0, 0x3c($a0) -/* 8CE62C 802405BC 3C060020 */ lui $a2, 0x20 -/* 8CE630 802405C0 0C012530 */ jal func_800494C0 -/* 8CE634 802405C4 E4800064 */ swc1 $f0, 0x64($a0) -/* 8CE638 802405C8 8E220018 */ lw $v0, 0x18($s1) -/* 8CE63C 802405CC 9442002A */ lhu $v0, 0x2a($v0) -/* 8CE640 802405D0 30420001 */ andi $v0, $v0, 1 -/* 8CE644 802405D4 10400003 */ beqz $v0, .L802405E4 -/* 8CE648 802405D8 2402000A */ addiu $v0, $zero, 0xa -/* 8CE64C 802405DC 080901E9 */ j .L802407A4 -/* 8CE650 802405E0 AE620070 */ sw $v0, 0x70($s3) -.L802405E4: -/* 8CE654 802405E4 080901E9 */ j .L802407A4 -/* 8CE658 802405E8 AE720070 */ sw $s2, 0x70($s3) -.L802405EC: -/* 8CE65C 802405EC 8E620074 */ lw $v0, 0x74($s3) -/* 8CE660 802405F0 2442FFFF */ addiu $v0, $v0, -1 -.L802405F4: -/* 8CE664 802405F4 08090180 */ j .L80240600 -/* 8CE668 802405F8 AE620074 */ sw $v0, 0x74($s3) -.L802405FC: -/* 8CE66C 802405FC AE220090 */ sw $v0, 0x90($s1) -.L80240600: -/* 8CE670 80240600 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8CE674 80240604 C6000040 */ lwc1 $f0, 0x40($s0) -/* 8CE678 80240608 C4620000 */ lwc1 $f2, ($v1) -/* 8CE67C 8024060C 468010A0 */ cvt.s.w $f2, $f2 -/* 8CE680 80240610 C4640008 */ lwc1 $f4, 8($v1) -/* 8CE684 80240614 46802120 */ cvt.s.w $f4, $f4 -/* 8CE688 80240618 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8CE68C 8024061C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8CE690 80240620 44051000 */ mfc1 $a1, $f2 -/* 8CE694 80240624 C440000C */ lwc1 $f0, 0xc($v0) -/* 8CE698 80240628 46800020 */ cvt.s.w $f0, $f0 -/* 8CE69C 8024062C E7A00014 */ swc1 $f0, 0x14($sp) -/* 8CE6A0 80240630 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8CE6A4 80240634 44062000 */ mfc1 $a2, $f4 -/* 8CE6A8 80240638 C4400010 */ lwc1 $f0, 0x10($v0) -/* 8CE6AC 8024063C 46800020 */ cvt.s.w $f0, $f0 -/* 8CE6B0 80240640 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8CE6B4 80240644 8C640018 */ lw $a0, 0x18($v1) -/* 8CE6B8 80240648 0C0123F5 */ jal is_point_within_region -/* 8CE6BC 8024064C 8E070038 */ lw $a3, 0x38($s0) -/* 8CE6C0 80240650 1040001A */ beqz $v0, .L802406BC -/* 8CE6C4 80240654 00000000 */ nop -/* 8CE6C8 80240658 8E060038 */ lw $a2, 0x38($s0) -/* 8CE6CC 8024065C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8CE6D0 80240660 8E070040 */ lw $a3, 0x40($s0) -/* 8CE6D4 80240664 C44C0000 */ lwc1 $f12, ($v0) -/* 8CE6D8 80240668 46806320 */ cvt.s.w $f12, $f12 -/* 8CE6DC 8024066C C44E0008 */ lwc1 $f14, 8($v0) -/* 8CE6E0 80240670 0C00A7B5 */ jal dist2D -/* 8CE6E4 80240674 468073A0 */ cvt.s.w $f14, $f14 -/* 8CE6E8 80240678 C6020018 */ lwc1 $f2, 0x18($s0) -/* 8CE6EC 8024067C 4600103C */ c.lt.s $f2, $f0 -/* 8CE6F0 80240680 00000000 */ nop -/* 8CE6F4 80240684 4500000D */ bc1f .L802406BC -/* 8CE6F8 80240688 E7A00034 */ swc1 $f0, 0x34($sp) -/* 8CE6FC 8024068C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8CE700 80240690 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8CE704 80240694 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8CE708 80240698 C4480000 */ lwc1 $f8, ($v0) -/* 8CE70C 8024069C 46804220 */ cvt.s.w $f8, $f8 -/* 8CE710 802406A0 44064000 */ mfc1 $a2, $f8 -/* 8CE714 802406A4 C4480008 */ lwc1 $f8, 8($v0) -/* 8CE718 802406A8 46804220 */ cvt.s.w $f8, $f8 -/* 8CE71C 802406AC 44074000 */ mfc1 $a3, $f8 -/* 8CE720 802406B0 0C00A720 */ jal atan2 -/* 8CE724 802406B4 24140001 */ addiu $s4, $zero, 1 -/* 8CE728 802406B8 E600000C */ swc1 $f0, 0xc($s0) -.L802406BC: -/* 8CE72C 802406BC 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8CE730 802406C0 8C43000C */ lw $v1, 0xc($v0) -/* 8CE734 802406C4 8C420010 */ lw $v0, 0x10($v0) -/* 8CE738 802406C8 00621825 */ or $v1, $v1, $v0 -/* 8CE73C 802406CC 00741825 */ or $v1, $v1, $s4 -/* 8CE740 802406D0 10600008 */ beqz $v1, .L802406F4 -/* 8CE744 802406D4 00000000 */ nop -/* 8CE748 802406D8 8602008C */ lh $v0, 0x8c($s0) -/* 8CE74C 802406DC 14400031 */ bnez $v0, .L802407A4 -/* 8CE750 802406E0 00000000 */ nop -/* 8CE754 802406E4 8E050018 */ lw $a1, 0x18($s0) -/* 8CE758 802406E8 8E06000C */ lw $a2, 0xc($s0) -/* 8CE75C 802406EC 0C00EA95 */ jal npc_move_heading -/* 8CE760 802406F0 0200202D */ daddu $a0, $s0, $zero -.L802406F4: -/* 8CE764 802406F4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8CE768 802406F8 3C014059 */ lui $at, 0x4059 -/* 8CE76C 802406FC 44811800 */ mtc1 $at, $f3 -/* 8CE770 80240700 44801000 */ mtc1 $zero, $f2 -/* 8CE774 80240704 46000021 */ cvt.d.s $f0, $f0 -/* 8CE778 80240708 46220002 */ mul.d $f0, $f0, $f2 -/* 8CE77C 8024070C 00000000 */ nop -/* 8CE780 80240710 4620020D */ trunc.w.d $f8, $f0 -/* 8CE784 80240714 E628007C */ swc1 $f8, 0x7c($s1) -/* 8CE788 80240718 8E420004 */ lw $v0, 4($s2) -/* 8CE78C 8024071C 18400021 */ blez $v0, .L802407A4 -/* 8CE790 80240720 00000000 */ nop -/* 8CE794 80240724 8602008E */ lh $v0, 0x8e($s0) -/* 8CE798 80240728 9603008E */ lhu $v1, 0x8e($s0) -/* 8CE79C 8024072C 18400005 */ blez $v0, .L80240744 -/* 8CE7A0 80240730 2462FFFF */ addiu $v0, $v1, -1 -/* 8CE7A4 80240734 A602008E */ sh $v0, 0x8e($s0) -/* 8CE7A8 80240738 00021400 */ sll $v0, $v0, 0x10 -/* 8CE7AC 8024073C 1C400019 */ bgtz $v0, .L802407A4 -/* 8CE7B0 80240740 00000000 */ nop -.L80240744: -/* 8CE7B4 80240744 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 8CE7B8 80240748 24020002 */ addiu $v0, $zero, 2 -/* 8CE7BC 8024074C 0C00A67F */ jal rand_int -/* 8CE7C0 80240750 AE620070 */ sw $v0, 0x70($s3) -/* 8CE7C4 80240754 3C035555 */ lui $v1, 0x5555 -/* 8CE7C8 80240758 34635556 */ ori $v1, $v1, 0x5556 -/* 8CE7CC 8024075C 00430018 */ mult $v0, $v1 -/* 8CE7D0 80240760 000227C3 */ sra $a0, $v0, 0x1f -/* 8CE7D4 80240764 00004010 */ mfhi $t0 -/* 8CE7D8 80240768 01042023 */ subu $a0, $t0, $a0 -/* 8CE7DC 8024076C 00041840 */ sll $v1, $a0, 1 -/* 8CE7E0 80240770 00641821 */ addu $v1, $v1, $a0 -/* 8CE7E4 80240774 00431023 */ subu $v0, $v0, $v1 -/* 8CE7E8 80240778 24430002 */ addiu $v1, $v0, 2 -/* 8CE7EC 8024077C AE630074 */ sw $v1, 0x74($s3) -/* 8CE7F0 80240780 8E42002C */ lw $v0, 0x2c($s2) -/* 8CE7F4 80240784 58400007 */ blezl $v0, .L802407A4 -/* 8CE7F8 80240788 AE600070 */ sw $zero, 0x70($s3) -/* 8CE7FC 8024078C 8E420008 */ lw $v0, 8($s2) -/* 8CE800 80240790 18400003 */ blez $v0, .L802407A0 -/* 8CE804 80240794 28620003 */ slti $v0, $v1, 3 -/* 8CE808 80240798 10400002 */ beqz $v0, .L802407A4 -/* 8CE80C 8024079C 00000000 */ nop -.L802407A0: -/* 8CE810 802407A0 AE600070 */ sw $zero, 0x70($s3) -.L802407A4: -/* 8CE814 802407A4 8FBF0058 */ lw $ra, 0x58($sp) -/* 8CE818 802407A8 8FB50054 */ lw $s5, 0x54($sp) -/* 8CE81C 802407AC 8FB40050 */ lw $s4, 0x50($sp) -/* 8CE820 802407B0 8FB3004C */ lw $s3, 0x4c($sp) -/* 8CE824 802407B4 8FB20048 */ lw $s2, 0x48($sp) -/* 8CE828 802407B8 8FB10044 */ lw $s1, 0x44($sp) -/* 8CE82C 802407BC 8FB00040 */ lw $s0, 0x40($sp) -/* 8CE830 802407C0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 8CE834 802407C4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 8CE838 802407C8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 8CE83C 802407CC D7B40060 */ ldc1 $f20, 0x60($sp) -/* 8CE840 802407D0 03E00008 */ jr $ra -/* 8CE844 802407D4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/func_802401B0_8D1510.s b/asm/nonmatchings/world/area_kmr/kmr_06/func_802401B0_8D1510.s deleted file mode 100644 index c958659b35..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/func_802401B0_8D1510.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_8D16C0 -/* 8D16C0 802401B0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 8D16C4 802401B4 AFB3004C */ sw $s3, 0x4c($sp) -/* 8D16C8 802401B8 0080982D */ daddu $s3, $a0, $zero -/* 8D16CC 802401BC AFBF0058 */ sw $ra, 0x58($sp) -/* 8D16D0 802401C0 AFB50054 */ sw $s5, 0x54($sp) -/* 8D16D4 802401C4 AFB40050 */ sw $s4, 0x50($sp) -/* 8D16D8 802401C8 AFB20048 */ sw $s2, 0x48($sp) -/* 8D16DC 802401CC AFB10044 */ sw $s1, 0x44($sp) -/* 8D16E0 802401D0 AFB00040 */ sw $s0, 0x40($sp) -/* 8D16E4 802401D4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8D16E8 802401D8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8D16EC 802401DC F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8D16F0 802401E0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8D16F4 802401E4 8E710148 */ lw $s1, 0x148($s3) -/* 8D16F8 802401E8 00A0902D */ daddu $s2, $a1, $zero -/* 8D16FC 802401EC 86240008 */ lh $a0, 8($s1) -/* 8D1700 802401F0 0C00EABB */ jal get_npc_unsafe -/* 8D1704 802401F4 00C0A82D */ daddu $s5, $a2, $zero -/* 8D1708 802401F8 0040802D */ daddu $s0, $v0, $zero -/* 8D170C 802401FC 0000A02D */ daddu $s4, $zero, $zero -/* 8D1710 80240200 C624007C */ lwc1 $f4, 0x7c($s1) -/* 8D1714 80240204 46802120 */ cvt.s.w $f4, $f4 -/* 8D1718 80240208 C6220088 */ lwc1 $f2, 0x88($s1) -/* 8D171C 8024020C 468010A0 */ cvt.s.w $f2, $f2 -/* 8D1720 80240210 460010A1 */ cvt.d.s $f2, $f2 -/* 8D1724 80240214 46002121 */ cvt.d.s $f4, $f4 -/* 8D1728 80240218 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D172C 8024021C 3C014059 */ lui $at, 0x4059 -/* 8D1730 80240220 44813800 */ mtc1 $at, $f7 -/* 8D1734 80240224 44803000 */ mtc1 $zero, $f6 -/* 8D1738 80240228 46000021 */ cvt.d.s $f0, $f0 -/* 8D173C 8024022C 46260002 */ mul.d $f0, $f0, $f6 -/* 8D1740 80240230 00000000 */ nop -/* 8D1744 80240234 24020001 */ addiu $v0, $zero, 1 -/* 8D1748 80240238 8E24006C */ lw $a0, 0x6c($s1) -/* 8D174C 8024023C 46261083 */ div.d $f2, $f2, $f6 -/* 8D1750 80240240 462010A0 */ cvt.s.d $f2, $f2 -/* 8D1754 80240244 46262103 */ div.d $f4, $f4, $f6 -/* 8D1758 80240248 46202520 */ cvt.s.d $f20, $f4 -/* 8D175C 8024024C 30830011 */ andi $v1, $a0, 0x11 -/* 8D1760 80240250 4620020D */ trunc.w.d $f8, $f0 -/* 8D1764 80240254 E628007C */ swc1 $f8, 0x7c($s1) -/* 8D1768 80240258 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8D176C 8024025C 46800020 */ cvt.s.w $f0, $f0 -/* 8D1770 80240260 46000021 */ cvt.d.s $f0, $f0 -/* 8D1774 80240264 46260003 */ div.d $f0, $f0, $f6 -/* 8D1778 80240268 462006A0 */ cvt.s.d $f26, $f0 -/* 8D177C 8024026C C6200070 */ lwc1 $f0, 0x70($s1) -/* 8D1780 80240270 46800020 */ cvt.s.w $f0, $f0 -/* 8D1784 80240274 46000021 */ cvt.d.s $f0, $f0 -/* 8D1788 80240278 46260003 */ div.d $f0, $f0, $f6 -/* 8D178C 8024027C 462005A0 */ cvt.s.d $f22, $f0 -/* 8D1790 80240280 14620025 */ bne $v1, $v0, .L80240318 -/* 8D1794 80240284 4602D600 */ add.s $f24, $f26, $f2 -/* 8D1798 80240288 8E020000 */ lw $v0, ($s0) -/* 8D179C 8024028C 30420008 */ andi $v0, $v0, 8 -/* 8D17A0 80240290 10400009 */ beqz $v0, .L802402B8 -/* 8D17A4 80240294 27A50028 */ addiu $a1, $sp, 0x28 -/* 8D17A8 80240298 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D17AC 8024029C 4600C001 */ sub.s $f0, $f24, $f0 -/* 8D17B0 802402A0 4600B03C */ c.lt.s $f22, $f0 -/* 8D17B4 802402A4 00000000 */ nop -/* 8D17B8 802402A8 4500001B */ bc1f .L80240318 -/* 8D17BC 802402AC 34820010 */ ori $v0, $a0, 0x10 -/* 8D17C0 802402B0 080900C6 */ j .L80240318 -/* 8D17C4 802402B4 AE22006C */ sw $v0, 0x6c($s1) -.L802402B8: -/* 8D17C8 802402B8 27A6002C */ addiu $a2, $sp, 0x2c -/* 8D17CC 802402BC C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D17D0 802402C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D17D4 802402C4 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8D17D8 802402C8 3C01447A */ lui $at, 0x447a -/* 8D17DC 802402CC 44813000 */ mtc1 $at, $f6 -/* 8D17E0 802402D0 27A20034 */ addiu $v0, $sp, 0x34 -/* 8D17E4 802402D4 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D17E8 802402D8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8D17EC 802402DC E7A40030 */ swc1 $f4, 0x30($sp) -/* 8D17F0 802402E0 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8D17F4 802402E4 AFA20010 */ sw $v0, 0x10($sp) -/* 8D17F8 802402E8 8E040080 */ lw $a0, 0x80($s0) -/* 8D17FC 802402EC 0C0372DF */ jal func_800DCB7C -/* 8D1800 802402F0 27A70030 */ addiu $a3, $sp, 0x30 -/* 8D1804 802402F4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 8D1808 802402F8 4600D001 */ sub.s $f0, $f26, $f0 -/* 8D180C 802402FC 4600B03C */ c.lt.s $f22, $f0 -/* 8D1810 80240300 00000000 */ nop -/* 8D1814 80240304 45000004 */ bc1f .L80240318 -/* 8D1818 80240308 00000000 */ nop -/* 8D181C 8024030C 8E22006C */ lw $v0, 0x6c($s1) -/* 8D1820 80240310 34420010 */ ori $v0, $v0, 0x10 -/* 8D1824 80240314 AE22006C */ sw $v0, 0x6c($s1) -.L80240318: -/* 8D1828 80240318 8E22006C */ lw $v0, 0x6c($s1) -/* 8D182C 8024031C 24030011 */ addiu $v1, $zero, 0x11 -/* 8D1830 80240320 30420011 */ andi $v0, $v0, 0x11 -/* 8D1834 80240324 14430039 */ bne $v0, $v1, .L8024040C -/* 8D1838 80240328 00000000 */ nop -/* 8D183C 8024032C 8E020000 */ lw $v0, ($s0) -/* 8D1840 80240330 30420008 */ andi $v0, $v0, 8 -/* 8D1844 80240334 1040000A */ beqz $v0, .L80240360 -/* 8D1848 80240338 4600C106 */ mov.s $f4, $f24 -/* 8D184C 8024033C 4614C081 */ sub.s $f2, $f24, $f20 -/* 8D1850 80240340 3C018024 */ lui $at, 0x8024 -/* 8D1854 80240344 D4202858 */ ldc1 $f0, 0x2858($at) -/* 8D1858 80240348 460010A1 */ cvt.d.s $f2, $f2 -/* 8D185C 8024034C 46201082 */ mul.d $f2, $f2, $f0 -/* 8D1860 80240350 00000000 */ nop -/* 8D1864 80240354 4600A021 */ cvt.d.s $f0, $f20 -/* 8D1868 80240358 080900F1 */ j .L802403C4 -/* 8D186C 8024035C 46220000 */ add.d $f0, $f0, $f2 -.L80240360: -/* 8D1870 80240360 27A50028 */ addiu $a1, $sp, 0x28 -/* 8D1874 80240364 27A6002C */ addiu $a2, $sp, 0x2c -/* 8D1878 80240368 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D187C 8024036C C6020040 */ lwc1 $f2, 0x40($s0) -/* 8D1880 80240370 3C01447A */ lui $at, 0x447a -/* 8D1884 80240374 44812000 */ mtc1 $at, $f4 -/* 8D1888 80240378 27A20034 */ addiu $v0, $sp, 0x34 -/* 8D188C 8024037C E7B4002C */ swc1 $f20, 0x2c($sp) -/* 8D1890 80240380 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D1894 80240384 E7A20030 */ swc1 $f2, 0x30($sp) -/* 8D1898 80240388 E7A40034 */ swc1 $f4, 0x34($sp) -/* 8D189C 8024038C AFA20010 */ sw $v0, 0x10($sp) -/* 8D18A0 80240390 8E040080 */ lw $a0, 0x80($s0) -/* 8D18A4 80240394 0C0372DF */ jal func_800DCB7C -/* 8D18A8 80240398 27A70030 */ addiu $a3, $sp, 0x30 -/* 8D18AC 8024039C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* 8D18B0 802403A0 461A2100 */ add.s $f4, $f4, $f26 -/* 8D18B4 802403A4 46142081 */ sub.s $f2, $f4, $f20 -/* 8D18B8 802403A8 3C018024 */ lui $at, 0x8024 -/* 8D18BC 802403AC D4202860 */ ldc1 $f0, 0x2860($at) -/* 8D18C0 802403B0 460010A1 */ cvt.d.s $f2, $f2 -/* 8D18C4 802403B4 46201082 */ mul.d $f2, $f2, $f0 -/* 8D18C8 802403B8 00000000 */ nop -/* 8D18CC 802403BC 4600A021 */ cvt.d.s $f0, $f20 -/* 8D18D0 802403C0 46220000 */ add.d $f0, $f0, $f2 -.L802403C4: -/* 8D18D4 802403C4 46200020 */ cvt.s.d $f0, $f0 -/* 8D18D8 802403C8 E600003C */ swc1 $f0, 0x3c($s0) -/* 8D18DC 802403CC C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D18E0 802403D0 46002001 */ sub.s $f0, $f4, $f0 -/* 8D18E4 802403D4 3C013FF0 */ lui $at, 0x3ff0 -/* 8D18E8 802403D8 44811800 */ mtc1 $at, $f3 -/* 8D18EC 802403DC 44801000 */ mtc1 $zero, $f2 -/* 8D18F0 802403E0 46000005 */ abs.s $f0, $f0 -/* 8D18F4 802403E4 46000021 */ cvt.d.s $f0, $f0 -/* 8D18F8 802403E8 4622003C */ c.lt.d $f0, $f2 -/* 8D18FC 802403EC 00000000 */ nop -/* 8D1900 802403F0 45000036 */ bc1f .L802404CC -/* 8D1904 802403F4 2403FFEF */ addiu $v1, $zero, -0x11 -/* 8D1908 802403F8 E604003C */ swc1 $f4, 0x3c($s0) -/* 8D190C 802403FC 8E22006C */ lw $v0, 0x6c($s1) -/* 8D1910 80240400 00431024 */ and $v0, $v0, $v1 -/* 8D1914 80240404 08090133 */ j .L802404CC -/* 8D1918 80240408 AE22006C */ sw $v0, 0x6c($s1) -.L8024040C: -/* 8D191C 8024040C 8E220070 */ lw $v0, 0x70($s1) -/* 8D1920 80240410 1840002E */ blez $v0, .L802404CC -/* 8D1924 80240414 00000000 */ nop -/* 8D1928 80240418 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 8D192C 8024041C 0C00A8BB */ jal sin_deg -/* 8D1930 80240420 46806320 */ cvt.s.w $f12, $f12 -/* 8D1934 80240424 8E020000 */ lw $v0, ($s0) -/* 8D1938 80240428 30420008 */ andi $v0, $v0, 8 -/* 8D193C 8024042C 10400003 */ beqz $v0, .L8024043C -/* 8D1940 80240430 46000506 */ mov.s $f20, $f0 -/* 8D1944 80240434 0809011F */ j .L8024047C -/* 8D1948 80240438 0000102D */ daddu $v0, $zero, $zero -.L8024043C: -/* 8D194C 8024043C 27A50028 */ addiu $a1, $sp, 0x28 -/* 8D1950 80240440 27A6002C */ addiu $a2, $sp, 0x2c -/* 8D1954 80240444 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D1958 80240448 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D195C 8024044C C6040040 */ lwc1 $f4, 0x40($s0) -/* 8D1960 80240450 3C01447A */ lui $at, 0x447a -/* 8D1964 80240454 44813000 */ mtc1 $at, $f6 -/* 8D1968 80240458 27A20034 */ addiu $v0, $sp, 0x34 -/* 8D196C 8024045C E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D1970 80240460 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8D1974 80240464 E7A40030 */ swc1 $f4, 0x30($sp) -/* 8D1978 80240468 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8D197C 8024046C AFA20010 */ sw $v0, 0x10($sp) -/* 8D1980 80240470 8E040080 */ lw $a0, 0x80($s0) -/* 8D1984 80240474 0C0372DF */ jal func_800DCB7C -/* 8D1988 80240478 27A70030 */ addiu $a3, $sp, 0x30 -.L8024047C: -/* 8D198C 8024047C 10400007 */ beqz $v0, .L8024049C -/* 8D1990 80240480 00000000 */ nop -/* 8D1994 80240484 4616A082 */ mul.s $f2, $f20, $f22 -/* 8D1998 80240488 00000000 */ nop -/* 8D199C 8024048C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 8D19A0 80240490 461A0000 */ add.s $f0, $f0, $f26 -/* 8D19A4 80240494 0809012A */ j .L802404A8 -/* 8D19A8 80240498 46020000 */ add.s $f0, $f0, $f2 -.L8024049C: -/* 8D19AC 8024049C 4616A002 */ mul.s $f0, $f20, $f22 -/* 8D19B0 802404A0 00000000 */ nop -/* 8D19B4 802404A4 4600C000 */ add.s $f0, $f24, $f0 -.L802404A8: -/* 8D19B8 802404A8 E600003C */ swc1 $f0, 0x3c($s0) -/* 8D19BC 802404AC 8E220074 */ lw $v0, 0x74($s1) -/* 8D19C0 802404B0 2442000A */ addiu $v0, $v0, 0xa -/* 8D19C4 802404B4 44826000 */ mtc1 $v0, $f12 -/* 8D19C8 802404B8 00000000 */ nop -/* 8D19CC 802404BC 0C00A6C9 */ jal clamp_angle -/* 8D19D0 802404C0 46806320 */ cvt.s.w $f12, $f12 -/* 8D19D4 802404C4 4600020D */ trunc.w.s $f8, $f0 -/* 8D19D8 802404C8 E6280074 */ swc1 $f8, 0x74($s1) -.L802404CC: -/* 8D19DC 802404CC 8E220090 */ lw $v0, 0x90($s1) -/* 8D19E0 802404D0 1C40004A */ bgtz $v0, .L802405FC -/* 8D19E4 802404D4 2442FFFF */ addiu $v0, $v0, -1 -/* 8D19E8 802404D8 8E430014 */ lw $v1, 0x14($s2) -/* 8D19EC 802404DC 04600048 */ bltz $v1, .L80240600 -/* 8D19F0 802404E0 00000000 */ nop -/* 8D19F4 802404E4 8E620074 */ lw $v0, 0x74($s3) -/* 8D19F8 802404E8 1C400042 */ bgtz $v0, .L802405F4 -/* 8D19FC 802404EC 2442FFFF */ addiu $v0, $v0, -1 -/* 8D1A00 802404F0 AE630074 */ sw $v1, 0x74($s3) -/* 8D1A04 802404F4 860200A8 */ lh $v0, 0xa8($s0) -/* 8D1A08 802404F8 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D1A0C 802404FC 44820000 */ mtc1 $v0, $f0 -/* 8D1A10 80240500 00000000 */ nop -/* 8D1A14 80240504 46800020 */ cvt.s.w $f0, $f0 -/* 8D1A18 80240508 46001080 */ add.s $f2, $f2, $f0 -/* 8D1A1C 8024050C 3C014024 */ lui $at, 0x4024 -/* 8D1A20 80240510 44810800 */ mtc1 $at, $f1 -/* 8D1A24 80240514 44800000 */ mtc1 $zero, $f0 -/* 8D1A28 80240518 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D1A2C 8024051C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D1A30 80240520 460010A1 */ cvt.d.s $f2, $f2 -/* 8D1A34 80240524 46201080 */ add.d $f2, $f2, $f0 -/* 8D1A38 80240528 C440002C */ lwc1 $f0, 0x2c($v0) -/* 8D1A3C 8024052C 46000021 */ cvt.d.s $f0, $f0 -/* 8D1A40 80240530 4622003C */ c.lt.d $f0, $f2 -/* 8D1A44 80240534 00000000 */ nop -/* 8D1A48 80240538 4500002C */ bc1f .L802405EC -/* 8D1A4C 8024053C 02A0202D */ daddu $a0, $s5, $zero -/* 8D1A50 80240540 AFA00010 */ sw $zero, 0x10($sp) -/* 8D1A54 80240544 8E46000C */ lw $a2, 0xc($s2) -/* 8D1A58 80240548 8E470010 */ lw $a3, 0x10($s2) -/* 8D1A5C 8024054C 0C01242D */ jal func_800490B4 -/* 8D1A60 80240550 0220282D */ daddu $a1, $s1, $zero -/* 8D1A64 80240554 10400025 */ beqz $v0, .L802405EC -/* 8D1A68 80240558 0000202D */ daddu $a0, $zero, $zero -/* 8D1A6C 8024055C 0200282D */ daddu $a1, $s0, $zero -/* 8D1A70 80240560 0000302D */ daddu $a2, $zero, $zero -/* 8D1A74 80240564 2412000C */ addiu $s2, $zero, 0xc -/* 8D1A78 80240568 860300A8 */ lh $v1, 0xa8($s0) -/* 8D1A7C 8024056C 3C013F80 */ lui $at, 0x3f80 -/* 8D1A80 80240570 44810000 */ mtc1 $at, $f0 -/* 8D1A84 80240574 3C014000 */ lui $at, 0x4000 -/* 8D1A88 80240578 44811000 */ mtc1 $at, $f2 -/* 8D1A8C 8024057C 3C01C1A0 */ lui $at, 0xc1a0 -/* 8D1A90 80240580 44812000 */ mtc1 $at, $f4 -/* 8D1A94 80240584 44834000 */ mtc1 $v1, $f8 -/* 8D1A98 80240588 00000000 */ nop -/* 8D1A9C 8024058C 46804220 */ cvt.s.w $f8, $f8 -/* 8D1AA0 80240590 44074000 */ mfc1 $a3, $f8 -/* 8D1AA4 80240594 27A20038 */ addiu $v0, $sp, 0x38 -/* 8D1AA8 80240598 AFB2001C */ sw $s2, 0x1c($sp) -/* 8D1AAC 8024059C AFA20020 */ sw $v0, 0x20($sp) -/* 8D1AB0 802405A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D1AB4 802405A4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8D1AB8 802405A8 0C01BFA4 */ jal fx_emote -/* 8D1ABC 802405AC E7A40018 */ swc1 $f4, 0x18($sp) -/* 8D1AC0 802405B0 0200202D */ daddu $a0, $s0, $zero -/* 8D1AC4 802405B4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8D1AC8 802405B8 C480003C */ lwc1 $f0, 0x3c($a0) -/* 8D1ACC 802405BC 3C060020 */ lui $a2, 0x20 -/* 8D1AD0 802405C0 0C012530 */ jal func_800494C0 -/* 8D1AD4 802405C4 E4800064 */ swc1 $f0, 0x64($a0) -/* 8D1AD8 802405C8 8E220018 */ lw $v0, 0x18($s1) -/* 8D1ADC 802405CC 9442002A */ lhu $v0, 0x2a($v0) -/* 8D1AE0 802405D0 30420001 */ andi $v0, $v0, 1 -/* 8D1AE4 802405D4 10400003 */ beqz $v0, .L802405E4 -/* 8D1AE8 802405D8 2402000A */ addiu $v0, $zero, 0xa -/* 8D1AEC 802405DC 080901E9 */ j .L802407A4 -/* 8D1AF0 802405E0 AE620070 */ sw $v0, 0x70($s3) -.L802405E4: -/* 8D1AF4 802405E4 080901E9 */ j .L802407A4 -/* 8D1AF8 802405E8 AE720070 */ sw $s2, 0x70($s3) -.L802405EC: -/* 8D1AFC 802405EC 8E620074 */ lw $v0, 0x74($s3) -/* 8D1B00 802405F0 2442FFFF */ addiu $v0, $v0, -1 -.L802405F4: -/* 8D1B04 802405F4 08090180 */ j .L80240600 -/* 8D1B08 802405F8 AE620074 */ sw $v0, 0x74($s3) -.L802405FC: -/* 8D1B0C 802405FC AE220090 */ sw $v0, 0x90($s1) -.L80240600: -/* 8D1B10 80240600 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8D1B14 80240604 C6000040 */ lwc1 $f0, 0x40($s0) -/* 8D1B18 80240608 C4620000 */ lwc1 $f2, ($v1) -/* 8D1B1C 8024060C 468010A0 */ cvt.s.w $f2, $f2 -/* 8D1B20 80240610 C4640008 */ lwc1 $f4, 8($v1) -/* 8D1B24 80240614 46802120 */ cvt.s.w $f4, $f4 -/* 8D1B28 80240618 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D1B2C 8024061C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D1B30 80240620 44051000 */ mfc1 $a1, $f2 -/* 8D1B34 80240624 C440000C */ lwc1 $f0, 0xc($v0) -/* 8D1B38 80240628 46800020 */ cvt.s.w $f0, $f0 -/* 8D1B3C 8024062C E7A00014 */ swc1 $f0, 0x14($sp) -/* 8D1B40 80240630 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D1B44 80240634 44062000 */ mfc1 $a2, $f4 -/* 8D1B48 80240638 C4400010 */ lwc1 $f0, 0x10($v0) -/* 8D1B4C 8024063C 46800020 */ cvt.s.w $f0, $f0 -/* 8D1B50 80240640 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D1B54 80240644 8C640018 */ lw $a0, 0x18($v1) -/* 8D1B58 80240648 0C0123F5 */ jal is_point_within_region -/* 8D1B5C 8024064C 8E070038 */ lw $a3, 0x38($s0) -/* 8D1B60 80240650 1040001A */ beqz $v0, .L802406BC -/* 8D1B64 80240654 00000000 */ nop -/* 8D1B68 80240658 8E060038 */ lw $a2, 0x38($s0) -/* 8D1B6C 8024065C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D1B70 80240660 8E070040 */ lw $a3, 0x40($s0) -/* 8D1B74 80240664 C44C0000 */ lwc1 $f12, ($v0) -/* 8D1B78 80240668 46806320 */ cvt.s.w $f12, $f12 -/* 8D1B7C 8024066C C44E0008 */ lwc1 $f14, 8($v0) -/* 8D1B80 80240670 0C00A7B5 */ jal dist2D -/* 8D1B84 80240674 468073A0 */ cvt.s.w $f14, $f14 -/* 8D1B88 80240678 C6020018 */ lwc1 $f2, 0x18($s0) -/* 8D1B8C 8024067C 4600103C */ c.lt.s $f2, $f0 -/* 8D1B90 80240680 00000000 */ nop -/* 8D1B94 80240684 4500000D */ bc1f .L802406BC -/* 8D1B98 80240688 E7A00034 */ swc1 $f0, 0x34($sp) -/* 8D1B9C 8024068C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D1BA0 80240690 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D1BA4 80240694 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D1BA8 80240698 C4480000 */ lwc1 $f8, ($v0) -/* 8D1BAC 8024069C 46804220 */ cvt.s.w $f8, $f8 -/* 8D1BB0 802406A0 44064000 */ mfc1 $a2, $f8 -/* 8D1BB4 802406A4 C4480008 */ lwc1 $f8, 8($v0) -/* 8D1BB8 802406A8 46804220 */ cvt.s.w $f8, $f8 -/* 8D1BBC 802406AC 44074000 */ mfc1 $a3, $f8 -/* 8D1BC0 802406B0 0C00A720 */ jal atan2 -/* 8D1BC4 802406B4 24140001 */ addiu $s4, $zero, 1 -/* 8D1BC8 802406B8 E600000C */ swc1 $f0, 0xc($s0) -.L802406BC: -/* 8D1BCC 802406BC 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D1BD0 802406C0 8C43000C */ lw $v1, 0xc($v0) -/* 8D1BD4 802406C4 8C420010 */ lw $v0, 0x10($v0) -/* 8D1BD8 802406C8 00621825 */ or $v1, $v1, $v0 -/* 8D1BDC 802406CC 00741825 */ or $v1, $v1, $s4 -/* 8D1BE0 802406D0 10600008 */ beqz $v1, .L802406F4 -/* 8D1BE4 802406D4 00000000 */ nop -/* 8D1BE8 802406D8 8602008C */ lh $v0, 0x8c($s0) -/* 8D1BEC 802406DC 14400031 */ bnez $v0, .L802407A4 -/* 8D1BF0 802406E0 00000000 */ nop -/* 8D1BF4 802406E4 8E050018 */ lw $a1, 0x18($s0) -/* 8D1BF8 802406E8 8E06000C */ lw $a2, 0xc($s0) -/* 8D1BFC 802406EC 0C00EA95 */ jal npc_move_heading -/* 8D1C00 802406F0 0200202D */ daddu $a0, $s0, $zero -.L802406F4: -/* 8D1C04 802406F4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D1C08 802406F8 3C014059 */ lui $at, 0x4059 -/* 8D1C0C 802406FC 44811800 */ mtc1 $at, $f3 -/* 8D1C10 80240700 44801000 */ mtc1 $zero, $f2 -/* 8D1C14 80240704 46000021 */ cvt.d.s $f0, $f0 -/* 8D1C18 80240708 46220002 */ mul.d $f0, $f0, $f2 -/* 8D1C1C 8024070C 00000000 */ nop -/* 8D1C20 80240710 4620020D */ trunc.w.d $f8, $f0 -/* 8D1C24 80240714 E628007C */ swc1 $f8, 0x7c($s1) -/* 8D1C28 80240718 8E420004 */ lw $v0, 4($s2) -/* 8D1C2C 8024071C 18400021 */ blez $v0, .L802407A4 -/* 8D1C30 80240720 00000000 */ nop -/* 8D1C34 80240724 8602008E */ lh $v0, 0x8e($s0) -/* 8D1C38 80240728 9603008E */ lhu $v1, 0x8e($s0) -/* 8D1C3C 8024072C 18400005 */ blez $v0, .L80240744 -/* 8D1C40 80240730 2462FFFF */ addiu $v0, $v1, -1 -/* 8D1C44 80240734 A602008E */ sh $v0, 0x8e($s0) -/* 8D1C48 80240738 00021400 */ sll $v0, $v0, 0x10 -/* 8D1C4C 8024073C 1C400019 */ bgtz $v0, .L802407A4 -/* 8D1C50 80240740 00000000 */ nop -.L80240744: -/* 8D1C54 80240744 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 8D1C58 80240748 24020002 */ addiu $v0, $zero, 2 -/* 8D1C5C 8024074C 0C00A67F */ jal rand_int -/* 8D1C60 80240750 AE620070 */ sw $v0, 0x70($s3) -/* 8D1C64 80240754 3C035555 */ lui $v1, 0x5555 -/* 8D1C68 80240758 34635556 */ ori $v1, $v1, 0x5556 -/* 8D1C6C 8024075C 00430018 */ mult $v0, $v1 -/* 8D1C70 80240760 000227C3 */ sra $a0, $v0, 0x1f -/* 8D1C74 80240764 00004010 */ mfhi $t0 -/* 8D1C78 80240768 01042023 */ subu $a0, $t0, $a0 -/* 8D1C7C 8024076C 00041840 */ sll $v1, $a0, 1 -/* 8D1C80 80240770 00641821 */ addu $v1, $v1, $a0 -/* 8D1C84 80240774 00431023 */ subu $v0, $v0, $v1 -/* 8D1C88 80240778 24430002 */ addiu $v1, $v0, 2 -/* 8D1C8C 8024077C AE630074 */ sw $v1, 0x74($s3) -/* 8D1C90 80240780 8E42002C */ lw $v0, 0x2c($s2) -/* 8D1C94 80240784 58400007 */ blezl $v0, .L802407A4 -/* 8D1C98 80240788 AE600070 */ sw $zero, 0x70($s3) -/* 8D1C9C 8024078C 8E420008 */ lw $v0, 8($s2) -/* 8D1CA0 80240790 18400003 */ blez $v0, .L802407A0 -/* 8D1CA4 80240794 28620003 */ slti $v0, $v1, 3 -/* 8D1CA8 80240798 10400002 */ beqz $v0, .L802407A4 -/* 8D1CAC 8024079C 00000000 */ nop -.L802407A0: -/* 8D1CB0 802407A0 AE600070 */ sw $zero, 0x70($s3) -.L802407A4: -/* 8D1CB4 802407A4 8FBF0058 */ lw $ra, 0x58($sp) -/* 8D1CB8 802407A8 8FB50054 */ lw $s5, 0x54($sp) -/* 8D1CBC 802407AC 8FB40050 */ lw $s4, 0x50($sp) -/* 8D1CC0 802407B0 8FB3004C */ lw $s3, 0x4c($sp) -/* 8D1CC4 802407B4 8FB20048 */ lw $s2, 0x48($sp) -/* 8D1CC8 802407B8 8FB10044 */ lw $s1, 0x44($sp) -/* 8D1CCC 802407BC 8FB00040 */ lw $s0, 0x40($sp) -/* 8D1CD0 802407C0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 8D1CD4 802407C4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 8D1CD8 802407C8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 8D1CDC 802407CC D7B40060 */ ldc1 $f20, 0x60($sp) -/* 8D1CE0 802407D0 03E00008 */ jr $ra -/* 8D1CE4 802407D4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/func_802407D8_8D1510.s b/asm/nonmatchings/world/area_kmr/kmr_06/func_802407D8_8D1510.s deleted file mode 100644 index c65ba9dc36..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/func_802407D8_8D1510.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D8_8D1CE8 -/* 8D1CE8 802407D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8D1CEC 802407DC AFB3001C */ sw $s3, 0x1c($sp) -/* 8D1CF0 802407E0 0080982D */ daddu $s3, $a0, $zero -/* 8D1CF4 802407E4 AFBF0020 */ sw $ra, 0x20($sp) -/* 8D1CF8 802407E8 AFB20018 */ sw $s2, 0x18($sp) -/* 8D1CFC 802407EC AFB10014 */ sw $s1, 0x14($sp) -/* 8D1D00 802407F0 AFB00010 */ sw $s0, 0x10($sp) -/* 8D1D04 802407F4 8E720148 */ lw $s2, 0x148($s3) -/* 8D1D08 802407F8 86440008 */ lh $a0, 8($s2) -/* 8D1D0C 802407FC 0C00EABB */ jal get_npc_unsafe -/* 8D1D10 80240800 00A0882D */ daddu $s1, $a1, $zero -/* 8D1D14 80240804 8E240008 */ lw $a0, 8($s1) -/* 8D1D18 80240808 0040802D */ daddu $s0, $v0, $zero -/* 8D1D1C 8024080C 00041FC2 */ srl $v1, $a0, 0x1f -/* 8D1D20 80240810 00832021 */ addu $a0, $a0, $v1 -/* 8D1D24 80240814 00042043 */ sra $a0, $a0, 1 -/* 8D1D28 80240818 0C00A67F */ jal rand_int -/* 8D1D2C 8024081C 24840001 */ addiu $a0, $a0, 1 -/* 8D1D30 80240820 8E230008 */ lw $v1, 8($s1) -/* 8D1D34 80240824 240400B4 */ addiu $a0, $zero, 0xb4 -/* 8D1D38 80240828 00032FC2 */ srl $a1, $v1, 0x1f -/* 8D1D3C 8024082C 00651821 */ addu $v1, $v1, $a1 -/* 8D1D40 80240830 00031843 */ sra $v1, $v1, 1 -/* 8D1D44 80240834 00621821 */ addu $v1, $v1, $v0 -/* 8D1D48 80240838 0C00A67F */ jal rand_int -/* 8D1D4C 8024083C A603008E */ sh $v1, 0x8e($s0) -/* 8D1D50 80240840 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8D1D54 80240844 44820000 */ mtc1 $v0, $f0 -/* 8D1D58 80240848 00000000 */ nop -/* 8D1D5C 8024084C 46800020 */ cvt.s.w $f0, $f0 -/* 8D1D60 80240850 46006300 */ add.s $f12, $f12, $f0 -/* 8D1D64 80240854 3C0142B4 */ lui $at, 0x42b4 -/* 8D1D68 80240858 44810000 */ mtc1 $at, $f0 -/* 8D1D6C 8024085C 0C00A6C9 */ jal clamp_angle -/* 8D1D70 80240860 46006301 */ sub.s $f12, $f12, $f0 -/* 8D1D74 80240864 E600000C */ swc1 $f0, 0xc($s0) -/* 8D1D78 80240868 8E4200CC */ lw $v0, 0xcc($s2) -/* 8D1D7C 8024086C 8C420000 */ lw $v0, ($v0) -/* 8D1D80 80240870 AE020028 */ sw $v0, 0x28($s0) -/* 8D1D84 80240874 24020003 */ addiu $v0, $zero, 3 -/* 8D1D88 80240878 AE620070 */ sw $v0, 0x70($s3) -/* 8D1D8C 8024087C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D1D90 80240880 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D1D94 80240884 8FB20018 */ lw $s2, 0x18($sp) -/* 8D1D98 80240888 8FB10014 */ lw $s1, 0x14($sp) -/* 8D1D9C 8024088C 8FB00010 */ lw $s0, 0x10($sp) -/* 8D1DA0 80240890 03E00008 */ jr $ra -/* 8D1DA4 80240894 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/func_80240898_8D1510.s b/asm/nonmatchings/world/area_kmr/kmr_06/func_80240898_8D1510.s deleted file mode 100644 index fdae036b45..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/func_80240898_8D1510.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240898_8D1DA8 -/* 8D1DA8 80240898 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 8D1DAC 8024089C AFB3004C */ sw $s3, 0x4c($sp) -/* 8D1DB0 802408A0 0080982D */ daddu $s3, $a0, $zero -/* 8D1DB4 802408A4 AFBF0054 */ sw $ra, 0x54($sp) -/* 8D1DB8 802408A8 AFB40050 */ sw $s4, 0x50($sp) -/* 8D1DBC 802408AC AFB20048 */ sw $s2, 0x48($sp) -/* 8D1DC0 802408B0 AFB10044 */ sw $s1, 0x44($sp) -/* 8D1DC4 802408B4 AFB00040 */ sw $s0, 0x40($sp) -/* 8D1DC8 802408B8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* 8D1DCC 802408BC F7B80068 */ sdc1 $f24, 0x68($sp) -/* 8D1DD0 802408C0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* 8D1DD4 802408C4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 8D1DD8 802408C8 8E710148 */ lw $s1, 0x148($s3) -/* 8D1DDC 802408CC 00A0902D */ daddu $s2, $a1, $zero -/* 8D1DE0 802408D0 86240008 */ lh $a0, 8($s1) -/* 8D1DE4 802408D4 0C00EABB */ jal get_npc_unsafe -/* 8D1DE8 802408D8 00C0A02D */ daddu $s4, $a2, $zero -/* 8D1DEC 802408DC 0040802D */ daddu $s0, $v0, $zero -/* 8D1DF0 802408E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8D1DF4 802408E4 46800020 */ cvt.s.w $f0, $f0 -/* 8D1DF8 802408E8 46000021 */ cvt.d.s $f0, $f0 -/* 8D1DFC 802408EC 3C014059 */ lui $at, 0x4059 -/* 8D1E00 802408F0 44811800 */ mtc1 $at, $f3 -/* 8D1E04 802408F4 44801000 */ mtc1 $zero, $f2 -/* 8D1E08 802408F8 8602008E */ lh $v0, 0x8e($s0) -/* 8D1E0C 802408FC 9603008E */ lhu $v1, 0x8e($s0) -/* 8D1E10 80240900 46220003 */ div.d $f0, $f0, $f2 -/* 8D1E14 80240904 46200620 */ cvt.s.d $f24, $f0 -/* 8D1E18 80240908 C6200088 */ lwc1 $f0, 0x88($s1) -/* 8D1E1C 8024090C 46800020 */ cvt.s.w $f0, $f0 -/* 8D1E20 80240910 46000021 */ cvt.d.s $f0, $f0 -/* 8D1E24 80240914 46220003 */ div.d $f0, $f0, $f2 -/* 8D1E28 80240918 46200020 */ cvt.s.d $f0, $f0 -/* 8D1E2C 8024091C 18400003 */ blez $v0, .L8024092C -/* 8D1E30 80240920 4600C680 */ add.s $f26, $f24, $f0 -/* 8D1E34 80240924 2462FFFF */ addiu $v0, $v1, -1 -/* 8D1E38 80240928 A602008E */ sh $v0, 0x8e($s0) -.L8024092C: -/* 8D1E3C 8024092C 8E220070 */ lw $v0, 0x70($s1) -/* 8D1E40 80240930 18400034 */ blez $v0, .L80240A04 -/* 8D1E44 80240934 00000000 */ nop -/* 8D1E48 80240938 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 8D1E4C 8024093C 46806320 */ cvt.s.w $f12, $f12 -/* 8D1E50 80240940 44820000 */ mtc1 $v0, $f0 -/* 8D1E54 80240944 00000000 */ nop -/* 8D1E58 80240948 46800020 */ cvt.s.w $f0, $f0 -/* 8D1E5C 8024094C 46000021 */ cvt.d.s $f0, $f0 -/* 8D1E60 80240950 46220003 */ div.d $f0, $f0, $f2 -/* 8D1E64 80240954 0C00A8BB */ jal sin_deg -/* 8D1E68 80240958 462005A0 */ cvt.s.d $f22, $f0 -/* 8D1E6C 8024095C 8E020000 */ lw $v0, ($s0) -/* 8D1E70 80240960 30420008 */ andi $v0, $v0, 8 -/* 8D1E74 80240964 10400003 */ beqz $v0, .L80240974 -/* 8D1E78 80240968 46000506 */ mov.s $f20, $f0 -/* 8D1E7C 8024096C 0809026D */ j .L802409B4 -/* 8D1E80 80240970 0000102D */ daddu $v0, $zero, $zero -.L80240974: -/* 8D1E84 80240974 27A50028 */ addiu $a1, $sp, 0x28 -/* 8D1E88 80240978 27A6002C */ addiu $a2, $sp, 0x2c -/* 8D1E8C 8024097C C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D1E90 80240980 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D1E94 80240984 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8D1E98 80240988 3C01447A */ lui $at, 0x447a -/* 8D1E9C 8024098C 44813000 */ mtc1 $at, $f6 -/* 8D1EA0 80240990 27A20034 */ addiu $v0, $sp, 0x34 -/* 8D1EA4 80240994 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D1EA8 80240998 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8D1EAC 8024099C E7A40030 */ swc1 $f4, 0x30($sp) -/* 8D1EB0 802409A0 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8D1EB4 802409A4 AFA20010 */ sw $v0, 0x10($sp) -/* 8D1EB8 802409A8 8E040080 */ lw $a0, 0x80($s0) -/* 8D1EBC 802409AC 0C0372DF */ jal func_800DCB7C -/* 8D1EC0 802409B0 27A70030 */ addiu $a3, $sp, 0x30 -.L802409B4: -/* 8D1EC4 802409B4 10400007 */ beqz $v0, .L802409D4 -/* 8D1EC8 802409B8 00000000 */ nop -/* 8D1ECC 802409BC 4616A082 */ mul.s $f2, $f20, $f22 -/* 8D1ED0 802409C0 00000000 */ nop -/* 8D1ED4 802409C4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 8D1ED8 802409C8 46180000 */ add.s $f0, $f0, $f24 -/* 8D1EDC 802409CC 08090278 */ j .L802409E0 -/* 8D1EE0 802409D0 46020000 */ add.s $f0, $f0, $f2 -.L802409D4: -/* 8D1EE4 802409D4 4616A002 */ mul.s $f0, $f20, $f22 -/* 8D1EE8 802409D8 00000000 */ nop -/* 8D1EEC 802409DC 4600D000 */ add.s $f0, $f26, $f0 -.L802409E0: -/* 8D1EF0 802409E0 E600003C */ swc1 $f0, 0x3c($s0) -/* 8D1EF4 802409E4 8E220074 */ lw $v0, 0x74($s1) -/* 8D1EF8 802409E8 2442000A */ addiu $v0, $v0, 0xa -/* 8D1EFC 802409EC 44826000 */ mtc1 $v0, $f12 -/* 8D1F00 802409F0 00000000 */ nop -/* 8D1F04 802409F4 0C00A6C9 */ jal clamp_angle -/* 8D1F08 802409F8 46806320 */ cvt.s.w $f12, $f12 -/* 8D1F0C 802409FC 4600020D */ trunc.w.s $f8, $f0 -/* 8D1F10 80240A00 E6280074 */ swc1 $f8, 0x74($s1) -.L80240A04: -/* 8D1F14 80240A04 8E220090 */ lw $v0, 0x90($s1) -/* 8D1F18 80240A08 1C400040 */ bgtz $v0, .L80240B0C -/* 8D1F1C 80240A0C 2442FFFF */ addiu $v0, $v0, -1 -/* 8D1F20 80240A10 860200A8 */ lh $v0, 0xa8($s0) -/* 8D1F24 80240A14 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D1F28 80240A18 44821000 */ mtc1 $v0, $f2 -/* 8D1F2C 80240A1C 00000000 */ nop -/* 8D1F30 80240A20 468010A0 */ cvt.s.w $f2, $f2 -/* 8D1F34 80240A24 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D1F38 80240A28 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D1F3C 80240A2C 46020000 */ add.s $f0, $f0, $f2 -/* 8D1F40 80240A30 3C014024 */ lui $at, 0x4024 -/* 8D1F44 80240A34 44812800 */ mtc1 $at, $f5 -/* 8D1F48 80240A38 44802000 */ mtc1 $zero, $f4 -/* 8D1F4C 80240A3C C442002C */ lwc1 $f2, 0x2c($v0) -/* 8D1F50 80240A40 46000021 */ cvt.d.s $f0, $f0 -/* 8D1F54 80240A44 46240000 */ add.d $f0, $f0, $f4 -/* 8D1F58 80240A48 460010A1 */ cvt.d.s $f2, $f2 -/* 8D1F5C 80240A4C 4620103C */ c.lt.d $f2, $f0 -/* 8D1F60 80240A50 00000000 */ nop -/* 8D1F64 80240A54 4500002E */ bc1f .L80240B10 -/* 8D1F68 80240A58 0280202D */ daddu $a0, $s4, $zero -/* 8D1F6C 80240A5C 24020001 */ addiu $v0, $zero, 1 -/* 8D1F70 80240A60 AFA20010 */ sw $v0, 0x10($sp) -/* 8D1F74 80240A64 8E460024 */ lw $a2, 0x24($s2) -/* 8D1F78 80240A68 8E470028 */ lw $a3, 0x28($s2) -/* 8D1F7C 80240A6C 0C01242D */ jal func_800490B4 -/* 8D1F80 80240A70 0220282D */ daddu $a1, $s1, $zero -/* 8D1F84 80240A74 10400026 */ beqz $v0, .L80240B10 -/* 8D1F88 80240A78 0000202D */ daddu $a0, $zero, $zero -/* 8D1F8C 80240A7C 0200282D */ daddu $a1, $s0, $zero -/* 8D1F90 80240A80 0000302D */ daddu $a2, $zero, $zero -/* 8D1F94 80240A84 2412000C */ addiu $s2, $zero, 0xc -/* 8D1F98 80240A88 860300A8 */ lh $v1, 0xa8($s0) -/* 8D1F9C 80240A8C 3C013F80 */ lui $at, 0x3f80 -/* 8D1FA0 80240A90 44810000 */ mtc1 $at, $f0 -/* 8D1FA4 80240A94 3C014000 */ lui $at, 0x4000 -/* 8D1FA8 80240A98 44811000 */ mtc1 $at, $f2 -/* 8D1FAC 80240A9C 3C01C1A0 */ lui $at, 0xc1a0 -/* 8D1FB0 80240AA0 44812000 */ mtc1 $at, $f4 -/* 8D1FB4 80240AA4 44834000 */ mtc1 $v1, $f8 -/* 8D1FB8 80240AA8 00000000 */ nop -/* 8D1FBC 80240AAC 46804220 */ cvt.s.w $f8, $f8 -/* 8D1FC0 80240AB0 44074000 */ mfc1 $a3, $f8 -/* 8D1FC4 80240AB4 27A20038 */ addiu $v0, $sp, 0x38 -/* 8D1FC8 80240AB8 AFB2001C */ sw $s2, 0x1c($sp) -/* 8D1FCC 80240ABC AFA20020 */ sw $v0, 0x20($sp) -/* 8D1FD0 80240AC0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D1FD4 80240AC4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8D1FD8 80240AC8 0C01BFA4 */ jal fx_emote -/* 8D1FDC 80240ACC E7A40018 */ swc1 $f4, 0x18($sp) -/* 8D1FE0 80240AD0 0200202D */ daddu $a0, $s0, $zero -/* 8D1FE4 80240AD4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8D1FE8 80240AD8 C480003C */ lwc1 $f0, 0x3c($a0) -/* 8D1FEC 80240ADC 3C060020 */ lui $a2, 0x20 -/* 8D1FF0 80240AE0 0C012530 */ jal func_800494C0 -/* 8D1FF4 80240AE4 E4800064 */ swc1 $f0, 0x64($a0) -/* 8D1FF8 80240AE8 8E220018 */ lw $v0, 0x18($s1) -/* 8D1FFC 80240AEC 9442002A */ lhu $v0, 0x2a($v0) -/* 8D2000 80240AF0 30420001 */ andi $v0, $v0, 1 -/* 8D2004 80240AF4 10400003 */ beqz $v0, .L80240B04 -/* 8D2008 80240AF8 2402000A */ addiu $v0, $zero, 0xa -/* 8D200C 80240AFC 080902EB */ j .L80240BAC -/* 8D2010 80240B00 AE620070 */ sw $v0, 0x70($s3) -.L80240B04: -/* 8D2014 80240B04 080902EB */ j .L80240BAC -/* 8D2018 80240B08 AE720070 */ sw $s2, 0x70($s3) -.L80240B0C: -/* 8D201C 80240B0C AE220090 */ sw $v0, 0x90($s1) -.L80240B10: -/* 8D2020 80240B10 8602008C */ lh $v0, 0x8c($s0) -/* 8D2024 80240B14 14400025 */ bnez $v0, .L80240BAC -/* 8D2028 80240B18 00000000 */ nop -/* 8D202C 80240B1C 8602008E */ lh $v0, 0x8e($s0) -/* 8D2030 80240B20 1C400022 */ bgtz $v0, .L80240BAC -/* 8D2034 80240B24 00000000 */ nop -/* 8D2038 80240B28 8E620074 */ lw $v0, 0x74($s3) -/* 8D203C 80240B2C 2442FFFF */ addiu $v0, $v0, -1 -/* 8D2040 80240B30 1840001D */ blez $v0, .L80240BA8 -/* 8D2044 80240B34 AE620074 */ sw $v0, 0x74($s3) -/* 8D2048 80240B38 8E220018 */ lw $v0, 0x18($s1) -/* 8D204C 80240B3C 9442002A */ lhu $v0, 0x2a($v0) -/* 8D2050 80240B40 30420010 */ andi $v0, $v0, 0x10 -/* 8D2054 80240B44 14400007 */ bnez $v0, .L80240B64 -/* 8D2058 80240B48 00000000 */ nop -/* 8D205C 80240B4C C600000C */ lwc1 $f0, 0xc($s0) -/* 8D2060 80240B50 3C014334 */ lui $at, 0x4334 -/* 8D2064 80240B54 44816000 */ mtc1 $at, $f12 -/* 8D2068 80240B58 0C00A6C9 */ jal clamp_angle -/* 8D206C 80240B5C 460C0300 */ add.s $f12, $f0, $f12 -/* 8D2070 80240B60 E600000C */ swc1 $f0, 0xc($s0) -.L80240B64: -/* 8D2074 80240B64 0C00A67F */ jal rand_int -/* 8D2078 80240B68 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 8D207C 80240B6C 3C032E8B */ lui $v1, 0x2e8b -/* 8D2080 80240B70 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 8D2084 80240B74 00430018 */ mult $v0, $v1 -/* 8D2088 80240B78 00021FC3 */ sra $v1, $v0, 0x1f -/* 8D208C 80240B7C 00004010 */ mfhi $t0 -/* 8D2090 80240B80 00082043 */ sra $a0, $t0, 1 -/* 8D2094 80240B84 00832023 */ subu $a0, $a0, $v1 -/* 8D2098 80240B88 00041840 */ sll $v1, $a0, 1 -/* 8D209C 80240B8C 00641821 */ addu $v1, $v1, $a0 -/* 8D20A0 80240B90 00031880 */ sll $v1, $v1, 2 -/* 8D20A4 80240B94 00641823 */ subu $v1, $v1, $a0 -/* 8D20A8 80240B98 00431023 */ subu $v0, $v0, $v1 -/* 8D20AC 80240B9C 24420005 */ addiu $v0, $v0, 5 -/* 8D20B0 80240BA0 080902EB */ j .L80240BAC -/* 8D20B4 80240BA4 A602008E */ sh $v0, 0x8e($s0) -.L80240BA8: -/* 8D20B8 80240BA8 AE600070 */ sw $zero, 0x70($s3) -.L80240BAC: -/* 8D20BC 80240BAC 8FBF0054 */ lw $ra, 0x54($sp) -/* 8D20C0 80240BB0 8FB40050 */ lw $s4, 0x50($sp) -/* 8D20C4 80240BB4 8FB3004C */ lw $s3, 0x4c($sp) -/* 8D20C8 80240BB8 8FB20048 */ lw $s2, 0x48($sp) -/* 8D20CC 80240BBC 8FB10044 */ lw $s1, 0x44($sp) -/* 8D20D0 80240BC0 8FB00040 */ lw $s0, 0x40($sp) -/* 8D20D4 80240BC4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* 8D20D8 80240BC8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* 8D20DC 80240BCC D7B60060 */ ldc1 $f22, 0x60($sp) -/* 8D20E0 80240BD0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* 8D20E4 80240BD4 03E00008 */ jr $ra -/* 8D20E8 80240BD8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/func_80240BDC_8D1510.s b/asm/nonmatchings/world/area_kmr/kmr_06/func_80240BDC_8D1510.s deleted file mode 100644 index f6a7057ba1..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/func_80240BDC_8D1510.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BDC_8D20EC -/* 8D20EC 80240BDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8D20F0 80240BE0 AFB20018 */ sw $s2, 0x18($sp) -/* 8D20F4 80240BE4 0080902D */ daddu $s2, $a0, $zero -/* 8D20F8 80240BE8 AFBF001C */ sw $ra, 0x1c($sp) -/* 8D20FC 80240BEC AFB10014 */ sw $s1, 0x14($sp) -/* 8D2100 80240BF0 AFB00010 */ sw $s0, 0x10($sp) -/* 8D2104 80240BF4 8E510148 */ lw $s1, 0x148($s2) -/* 8D2108 80240BF8 0C00EABB */ jal get_npc_unsafe -/* 8D210C 80240BFC 86240008 */ lh $a0, 8($s1) -/* 8D2110 80240C00 0040802D */ daddu $s0, $v0, $zero -/* 8D2114 80240C04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D2118 80240C08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D211C 80240C0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D2120 80240C10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D2124 80240C14 A600008E */ sh $zero, 0x8e($s0) -/* 8D2128 80240C18 8C460028 */ lw $a2, 0x28($v0) -/* 8D212C 80240C1C 0C00A720 */ jal atan2 -/* 8D2130 80240C20 8C470030 */ lw $a3, 0x30($v0) -/* 8D2134 80240C24 E600000C */ swc1 $f0, 0xc($s0) -/* 8D2138 80240C28 8E2200CC */ lw $v0, 0xcc($s1) -/* 8D213C 80240C2C 8C420020 */ lw $v0, 0x20($v0) -/* 8D2140 80240C30 AE020028 */ sw $v0, 0x28($s0) -/* 8D2144 80240C34 2402000B */ addiu $v0, $zero, 0xb -/* 8D2148 80240C38 AE420070 */ sw $v0, 0x70($s2) -/* 8D214C 80240C3C 8FBF001C */ lw $ra, 0x1c($sp) -/* 8D2150 80240C40 8FB20018 */ lw $s2, 0x18($sp) -/* 8D2154 80240C44 8FB10014 */ lw $s1, 0x14($sp) -/* 8D2158 80240C48 8FB00010 */ lw $s0, 0x10($sp) -/* 8D215C 80240C4C 03E00008 */ jr $ra -/* 8D2160 80240C50 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/func_80240C54_8D1510.s b/asm/nonmatchings/world/area_kmr/kmr_06/func_80240C54_8D1510.s deleted file mode 100644 index 41cf9ff4a8..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/func_80240C54_8D1510.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C54_8D2164 -/* 8D2164 80240C54 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D2168 80240C58 AFB00010 */ sw $s0, 0x10($sp) -/* 8D216C 80240C5C 0080802D */ daddu $s0, $a0, $zero -/* 8D2170 80240C60 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D2174 80240C64 8E020148 */ lw $v0, 0x148($s0) -/* 8D2178 80240C68 0C00EABB */ jal get_npc_unsafe -/* 8D217C 80240C6C 84440008 */ lh $a0, 8($v0) -/* 8D2180 80240C70 9443008E */ lhu $v1, 0x8e($v0) -/* 8D2184 80240C74 C440003C */ lwc1 $f0, 0x3c($v0) -/* 8D2188 80240C78 24640001 */ addiu $a0, $v1, 1 -/* 8D218C 80240C7C 00031C00 */ sll $v1, $v1, 0x10 -/* 8D2190 80240C80 00031B83 */ sra $v1, $v1, 0xe -/* 8D2194 80240C84 A444008E */ sh $a0, 0x8e($v0) -/* 8D2198 80240C88 3C018024 */ lui $at, 0x8024 -/* 8D219C 80240C8C 00230821 */ addu $at, $at, $v1 -/* 8D21A0 80240C90 C42220BC */ lwc1 $f2, 0x20bc($at) -/* 8D21A4 80240C94 8443008E */ lh $v1, 0x8e($v0) -/* 8D21A8 80240C98 46020000 */ add.s $f0, $f0, $f2 -/* 8D21AC 80240C9C 28630005 */ slti $v1, $v1, 5 -/* 8D21B0 80240CA0 14600003 */ bnez $v1, .L80240CB0 -/* 8D21B4 80240CA4 E440003C */ swc1 $f0, 0x3c($v0) -/* 8D21B8 80240CA8 2402000C */ addiu $v0, $zero, 0xc -/* 8D21BC 80240CAC AE020070 */ sw $v0, 0x70($s0) -.L80240CB0: -/* 8D21C0 80240CB0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D21C4 80240CB4 8FB00010 */ lw $s0, 0x10($sp) -/* 8D21C8 80240CB8 03E00008 */ jr $ra -/* 8D21CC 80240CBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/func_80240CC0_8D1510.s b/asm/nonmatchings/world/area_kmr/kmr_06/func_80240CC0_8D1510.s deleted file mode 100644 index c9057dd5d9..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/func_80240CC0_8D1510.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_8D21D0 -/* 8D21D0 80240CC0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8D21D4 80240CC4 AFB3001C */ sw $s3, 0x1c($sp) -/* 8D21D8 80240CC8 0080982D */ daddu $s3, $a0, $zero -/* 8D21DC 80240CCC AFBF0020 */ sw $ra, 0x20($sp) -/* 8D21E0 80240CD0 AFB20018 */ sw $s2, 0x18($sp) -/* 8D21E4 80240CD4 AFB10014 */ sw $s1, 0x14($sp) -/* 8D21E8 80240CD8 AFB00010 */ sw $s0, 0x10($sp) -/* 8D21EC 80240CDC 8E720148 */ lw $s2, 0x148($s3) -/* 8D21F0 80240CE0 86440008 */ lh $a0, 8($s2) -/* 8D21F4 80240CE4 0C00EABB */ jal get_npc_unsafe -/* 8D21F8 80240CE8 00A0802D */ daddu $s0, $a1, $zero -/* 8D21FC 80240CEC 0040882D */ daddu $s1, $v0, $zero -/* 8D2200 80240CF0 C6420080 */ lwc1 $f2, 0x80($s2) -/* 8D2204 80240CF4 468010A0 */ cvt.s.w $f2, $f2 -/* 8D2208 80240CF8 460010A1 */ cvt.d.s $f2, $f2 -/* 8D220C 80240CFC C6400084 */ lwc1 $f0, 0x84($s2) -/* 8D2210 80240D00 46800020 */ cvt.s.w $f0, $f0 -/* 8D2214 80240D04 46000021 */ cvt.d.s $f0, $f0 -/* 8D2218 80240D08 3C014059 */ lui $at, 0x4059 -/* 8D221C 80240D0C 44812800 */ mtc1 $at, $f5 -/* 8D2220 80240D10 44802000 */ mtc1 $zero, $f4 -/* 8D2224 80240D14 8E4200CC */ lw $v0, 0xcc($s2) -/* 8D2228 80240D18 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 8D222C 80240D1C C62E0040 */ lwc1 $f14, 0x40($s1) -/* 8D2230 80240D20 46241083 */ div.d $f2, $f2, $f4 -/* 8D2234 80240D24 462010A0 */ cvt.s.d $f2, $f2 -/* 8D2238 80240D28 46240003 */ div.d $f0, $f0, $f4 -/* 8D223C 80240D2C 8C420020 */ lw $v0, 0x20($v0) -/* 8D2240 80240D30 46200020 */ cvt.s.d $f0, $f0 -/* 8D2244 80240D34 E622001C */ swc1 $f2, 0x1c($s1) -/* 8D2248 80240D38 E6200014 */ swc1 $f0, 0x14($s1) -/* 8D224C 80240D3C AE220028 */ sw $v0, 0x28($s1) -/* 8D2250 80240D40 C6000018 */ lwc1 $f0, 0x18($s0) -/* 8D2254 80240D44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D2258 80240D48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D225C 80240D4C E6200018 */ swc1 $f0, 0x18($s1) -/* 8D2260 80240D50 8C460028 */ lw $a2, 0x28($v0) -/* 8D2264 80240D54 0C00A720 */ jal atan2 -/* 8D2268 80240D58 8C470030 */ lw $a3, 0x30($v0) -/* 8D226C 80240D5C E620000C */ swc1 $f0, 0xc($s1) -/* 8D2270 80240D60 8E420018 */ lw $v0, 0x18($s2) -/* 8D2274 80240D64 AE400074 */ sw $zero, 0x74($s2) -/* 8D2278 80240D68 9442002A */ lhu $v0, 0x2a($v0) -/* 8D227C 80240D6C 30420002 */ andi $v0, $v0, 2 -/* 8D2280 80240D70 10400005 */ beqz $v0, .L80240D88 -/* 8D2284 80240D74 24020003 */ addiu $v0, $zero, 3 -/* 8D2288 80240D78 A622008E */ sh $v0, 0x8e($s1) -/* 8D228C 80240D7C 2402000D */ addiu $v0, $zero, 0xd -/* 8D2290 80240D80 08090376 */ j .L80240DD8 -/* 8D2294 80240D84 AE620070 */ sw $v0, 0x70($s3) -.L80240D88: -/* 8D2298 80240D88 24030001 */ addiu $v1, $zero, 1 -/* 8D229C 80240D8C 2402000E */ addiu $v0, $zero, 0xe -/* 8D22A0 80240D90 A623008E */ sh $v1, 0x8e($s1) -/* 8D22A4 80240D94 AE620070 */ sw $v0, 0x70($s3) -/* 8D22A8 80240D98 C6200038 */ lwc1 $f0, 0x38($s1) -/* 8D22AC 80240D9C 4600018D */ trunc.w.s $f6, $f0 -/* 8D22B0 80240DA0 44023000 */ mfc1 $v0, $f6 -/* 8D22B4 80240DA4 00000000 */ nop -/* 8D22B8 80240DA8 A6420010 */ sh $v0, 0x10($s2) -/* 8D22BC 80240DAC C620003C */ lwc1 $f0, 0x3c($s1) -/* 8D22C0 80240DB0 4600018D */ trunc.w.s $f6, $f0 -/* 8D22C4 80240DB4 44023000 */ mfc1 $v0, $f6 -/* 8D22C8 80240DB8 00000000 */ nop -/* 8D22CC 80240DBC A6420012 */ sh $v0, 0x12($s2) -/* 8D22D0 80240DC0 C6200040 */ lwc1 $f0, 0x40($s1) -/* 8D22D4 80240DC4 A2430007 */ sb $v1, 7($s2) -/* 8D22D8 80240DC8 4600018D */ trunc.w.s $f6, $f0 -/* 8D22DC 80240DCC 44023000 */ mfc1 $v0, $f6 -/* 8D22E0 80240DD0 00000000 */ nop -/* 8D22E4 80240DD4 A6420014 */ sh $v0, 0x14($s2) -.L80240DD8: -/* 8D22E8 80240DD8 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D22EC 80240DDC 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D22F0 80240DE0 8FB20018 */ lw $s2, 0x18($sp) -/* 8D22F4 80240DE4 8FB10014 */ lw $s1, 0x14($sp) -/* 8D22F8 80240DE8 8FB00010 */ lw $s0, 0x10($sp) -/* 8D22FC 80240DEC 03E00008 */ jr $ra -/* 8D2300 80240DF0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/func_80240DF4_8D1510.s b/asm/nonmatchings/world/area_kmr/kmr_06/func_80240DF4_8D1510.s deleted file mode 100644 index cd01107e4a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/func_80240DF4_8D1510.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF4_8D2304 -/* 8D2304 80240DF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D2308 80240DF8 AFB00010 */ sw $s0, 0x10($sp) -/* 8D230C 80240DFC 0080802D */ daddu $s0, $a0, $zero -/* 8D2310 80240E00 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D2314 80240E04 8E020148 */ lw $v0, 0x148($s0) -/* 8D2318 80240E08 0C00EABB */ jal get_npc_unsafe -/* 8D231C 80240E0C 84440008 */ lh $a0, 8($v0) -/* 8D2320 80240E10 0040202D */ daddu $a0, $v0, $zero -/* 8D2324 80240E14 8482008E */ lh $v0, 0x8e($a0) -/* 8D2328 80240E18 9483008E */ lhu $v1, 0x8e($a0) -/* 8D232C 80240E1C 18400005 */ blez $v0, .L80240E34 -/* 8D2330 80240E20 2462FFFF */ addiu $v0, $v1, -1 -/* 8D2334 80240E24 A482008E */ sh $v0, 0x8e($a0) -/* 8D2338 80240E28 00021400 */ sll $v0, $v0, 0x10 -/* 8D233C 80240E2C 1C400006 */ bgtz $v0, .L80240E48 -/* 8D2340 80240E30 00000000 */ nop -.L80240E34: -/* 8D2344 80240E34 8482008C */ lh $v0, 0x8c($a0) -/* 8D2348 80240E38 14400003 */ bnez $v0, .L80240E48 -/* 8D234C 80240E3C 2402000E */ addiu $v0, $zero, 0xe -/* 8D2350 80240E40 A480008E */ sh $zero, 0x8e($a0) -/* 8D2354 80240E44 AE020070 */ sw $v0, 0x70($s0) -.L80240E48: -/* 8D2358 80240E48 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D235C 80240E4C 8FB00010 */ lw $s0, 0x10($sp) -/* 8D2360 80240E50 03E00008 */ jr $ra -/* 8D2364 80240E54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/func_80240E58_8D1510.s b/asm/nonmatchings/world/area_kmr/kmr_06/func_80240E58_8D1510.s deleted file mode 100644 index 73efab6336..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/func_80240E58_8D1510.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E58_8D2368 -/* 8D2368 80240E58 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8D236C 80240E5C AFB20030 */ sw $s2, 0x30($sp) -/* 8D2370 80240E60 0080902D */ daddu $s2, $a0, $zero -/* 8D2374 80240E64 AFBF0038 */ sw $ra, 0x38($sp) -/* 8D2378 80240E68 AFB30034 */ sw $s3, 0x34($sp) -/* 8D237C 80240E6C AFB1002C */ sw $s1, 0x2c($sp) -/* 8D2380 80240E70 AFB00028 */ sw $s0, 0x28($sp) -/* 8D2384 80240E74 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 8D2388 80240E78 F7B40040 */ sdc1 $f20, 0x40($sp) -/* 8D238C 80240E7C 8E510148 */ lw $s1, 0x148($s2) -/* 8D2390 80240E80 86240008 */ lh $a0, 8($s1) -/* 8D2394 80240E84 0C00EABB */ jal get_npc_unsafe -/* 8D2398 80240E88 00A0982D */ daddu $s3, $a1, $zero -/* 8D239C 80240E8C 0040802D */ daddu $s0, $v0, $zero -/* 8D23A0 80240E90 0200202D */ daddu $a0, $s0, $zero -/* 8D23A4 80240E94 C6220088 */ lwc1 $f2, 0x88($s1) -/* 8D23A8 80240E98 468010A0 */ cvt.s.w $f2, $f2 -/* 8D23AC 80240E9C 460010A1 */ cvt.d.s $f2, $f2 -/* 8D23B0 80240EA0 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8D23B4 80240EA4 C6000014 */ lwc1 $f0, 0x14($s0) -/* 8D23B8 80240EA8 8E050018 */ lw $a1, 0x18($s0) -/* 8D23BC 80240EAC 46002100 */ add.s $f4, $f4, $f0 -/* 8D23C0 80240EB0 8E06000C */ lw $a2, 0xc($s0) -/* 8D23C4 80240EB4 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8D23C8 80240EB8 46800020 */ cvt.s.w $f0, $f0 -/* 8D23CC 80240EBC E604001C */ swc1 $f4, 0x1c($s0) -/* 8D23D0 80240EC0 3C014059 */ lui $at, 0x4059 -/* 8D23D4 80240EC4 44812800 */ mtc1 $at, $f5 -/* 8D23D8 80240EC8 44802000 */ mtc1 $zero, $f4 -/* 8D23DC 80240ECC 46000021 */ cvt.d.s $f0, $f0 -/* 8D23E0 80240ED0 46240003 */ div.d $f0, $f0, $f4 -/* 8D23E4 80240ED4 46200520 */ cvt.s.d $f20, $f0 -/* 8D23E8 80240ED8 46241083 */ div.d $f2, $f2, $f4 -/* 8D23EC 80240EDC 0C00EA95 */ jal npc_move_heading -/* 8D23F0 80240EE0 462015A0 */ cvt.s.d $f22, $f2 -/* 8D23F4 80240EE4 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8D23F8 80240EE8 44801000 */ mtc1 $zero, $f2 -/* 8D23FC 80240EEC 44801800 */ mtc1 $zero, $f3 -/* 8D2400 80240EF0 46002021 */ cvt.d.s $f0, $f4 -/* 8D2404 80240EF4 4620103E */ c.le.d $f2, $f0 -/* 8D2408 80240EF8 00000000 */ nop -/* 8D240C 80240EFC 45000030 */ bc1f .L80240FC0 -/* 8D2410 80240F00 00000000 */ nop -/* 8D2414 80240F04 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D2418 80240F08 46040000 */ add.s $f0, $f0, $f4 -/* 8D241C 80240F0C E600003C */ swc1 $f0, 0x3c($s0) -/* 8D2420 80240F10 8E2200CC */ lw $v0, 0xcc($s1) -/* 8D2424 80240F14 8C420024 */ lw $v0, 0x24($v0) -/* 8D2428 80240F18 AE020028 */ sw $v0, 0x28($s0) -/* 8D242C 80240F1C A2200007 */ sb $zero, 7($s1) -/* 8D2430 80240F20 8E020000 */ lw $v0, ($s0) -/* 8D2434 80240F24 30420008 */ andi $v0, $v0, 8 -/* 8D2438 80240F28 14400011 */ bnez $v0, .L80240F70 -/* 8D243C 80240F2C 0000102D */ daddu $v0, $zero, $zero -/* 8D2440 80240F30 27A50018 */ addiu $a1, $sp, 0x18 -/* 8D2444 80240F34 27A6001C */ addiu $a2, $sp, 0x1c -/* 8D2448 80240F38 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D244C 80240F3C C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D2450 80240F40 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8D2454 80240F44 3C01447A */ lui $at, 0x447a -/* 8D2458 80240F48 44813000 */ mtc1 $at, $f6 -/* 8D245C 80240F4C 27A20024 */ addiu $v0, $sp, 0x24 -/* 8D2460 80240F50 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D2464 80240F54 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 8D2468 80240F58 E7A40020 */ swc1 $f4, 0x20($sp) -/* 8D246C 80240F5C E7A60024 */ swc1 $f6, 0x24($sp) -/* 8D2470 80240F60 AFA20010 */ sw $v0, 0x10($sp) -/* 8D2474 80240F64 8E040080 */ lw $a0, 0x80($s0) -/* 8D2478 80240F68 0C0372DF */ jal func_800DCB7C -/* 8D247C 80240F6C 27A70020 */ addiu $a3, $sp, 0x20 -.L80240F70: -/* 8D2480 80240F70 1040000B */ beqz $v0, .L80240FA0 -/* 8D2484 80240F74 00000000 */ nop -/* 8D2488 80240F78 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8D248C 80240F7C 46140080 */ add.s $f2, $f0, $f20 -/* 8D2490 80240F80 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D2494 80240F84 4600103E */ c.le.s $f2, $f0 -/* 8D2498 80240F88 00000000 */ nop -/* 8D249C 80240F8C 4500008D */ bc1f .L802411C4 -/* 8D24A0 80240F90 00000000 */ nop -/* 8D24A4 80240F94 E602003C */ swc1 $f2, 0x3c($s0) -/* 8D24A8 80240F98 08090471 */ j .L802411C4 -/* 8D24AC 80240F9C AE400070 */ sw $zero, 0x70($s2) -.L80240FA0: -/* 8D24B0 80240FA0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D24B4 80240FA4 C6000064 */ lwc1 $f0, 0x64($s0) -/* 8D24B8 80240FA8 4602003E */ c.le.s $f0, $f2 -/* 8D24BC 80240FAC 00000000 */ nop -/* 8D24C0 80240FB0 45030084 */ bc1tl .L802411C4 -/* 8D24C4 80240FB4 AE400070 */ sw $zero, 0x70($s2) -/* 8D24C8 80240FB8 08090471 */ j .L802411C4 -/* 8D24CC 80240FBC 00000000 */ nop -.L80240FC0: -/* 8D24D0 80240FC0 4622003C */ c.lt.d $f0, $f2 -/* 8D24D4 80240FC4 00000000 */ nop -/* 8D24D8 80240FC8 4500007E */ bc1f .L802411C4 -/* 8D24DC 80240FCC 00000000 */ nop -/* 8D24E0 80240FD0 9602008E */ lhu $v0, 0x8e($s0) -/* 8D24E4 80240FD4 24420001 */ addiu $v0, $v0, 1 -/* 8D24E8 80240FD8 A602008E */ sh $v0, 0x8e($s0) -/* 8D24EC 80240FDC 00021400 */ sll $v0, $v0, 0x10 -/* 8D24F0 80240FE0 8E630020 */ lw $v1, 0x20($s3) -/* 8D24F4 80240FE4 00021403 */ sra $v0, $v0, 0x10 -/* 8D24F8 80240FE8 0043102A */ slt $v0, $v0, $v1 -/* 8D24FC 80240FEC 14400026 */ bnez $v0, .L80241088 -/* 8D2500 80240FF0 00000000 */ nop -/* 8D2504 80240FF4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D2508 80240FF8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D250C 80240FFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D2510 80241000 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D2514 80241004 A600008E */ sh $zero, 0x8e($s0) -/* 8D2518 80241008 8C460028 */ lw $a2, 0x28($v0) -/* 8D251C 8024100C 0C00A720 */ jal atan2 -/* 8D2520 80241010 8C470030 */ lw $a3, 0x30($v0) -/* 8D2524 80241014 46000506 */ mov.s $f20, $f0 -/* 8D2528 80241018 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8D252C 8024101C 0C00A70A */ jal get_clamped_angle_diff -/* 8D2530 80241020 4600A386 */ mov.s $f14, $f20 -/* 8D2534 80241024 46000086 */ mov.s $f2, $f0 -/* 8D2538 80241028 8E62001C */ lw $v0, 0x1c($s3) -/* 8D253C 8024102C 46001005 */ abs.s $f0, $f2 -/* 8D2540 80241030 44822000 */ mtc1 $v0, $f4 -/* 8D2544 80241034 00000000 */ nop -/* 8D2548 80241038 46802120 */ cvt.s.w $f4, $f4 -/* 8D254C 8024103C 4600203C */ c.lt.s $f4, $f0 -/* 8D2550 80241040 00000000 */ nop -/* 8D2554 80241044 4500000D */ bc1f .L8024107C -/* 8D2558 80241048 00000000 */ nop -/* 8D255C 8024104C 44800000 */ mtc1 $zero, $f0 -/* 8D2560 80241050 C614000C */ lwc1 $f20, 0xc($s0) -/* 8D2564 80241054 4600103C */ c.lt.s $f2, $f0 -/* 8D2568 80241058 00000000 */ nop -/* 8D256C 8024105C 45000006 */ bc1f .L80241078 -/* 8D2570 80241060 00021023 */ negu $v0, $v0 -/* 8D2574 80241064 44820000 */ mtc1 $v0, $f0 -/* 8D2578 80241068 00000000 */ nop -/* 8D257C 8024106C 46800020 */ cvt.s.w $f0, $f0 -/* 8D2580 80241070 0809041F */ j .L8024107C -/* 8D2584 80241074 4600A500 */ add.s $f20, $f20, $f0 -.L80241078: -/* 8D2588 80241078 4604A500 */ add.s $f20, $f20, $f4 -.L8024107C: -/* 8D258C 8024107C 0C00A6C9 */ jal clamp_angle -/* 8D2590 80241080 4600A306 */ mov.s $f12, $f20 -/* 8D2594 80241084 E600000C */ swc1 $f0, 0xc($s0) -.L80241088: -/* 8D2598 80241088 8E020000 */ lw $v0, ($s0) -/* 8D259C 8024108C 30420008 */ andi $v0, $v0, 8 -/* 8D25A0 80241090 1040000A */ beqz $v0, .L802410BC -/* 8D25A4 80241094 27A50018 */ addiu $a1, $sp, 0x18 -/* 8D25A8 80241098 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D25AC 8024109C C600001C */ lwc1 $f0, 0x1c($s0) -/* 8D25B0 802410A0 46001080 */ add.s $f2, $f2, $f0 -/* 8D25B4 802410A4 4616103C */ c.lt.s $f2, $f22 -/* 8D25B8 802410A8 00000000 */ nop -/* 8D25BC 802410AC 45020045 */ bc1fl .L802411C4 -/* 8D25C0 802410B0 E602003C */ swc1 $f2, 0x3c($s0) -/* 8D25C4 802410B4 08090470 */ j .L802411C0 -/* 8D25C8 802410B8 E616003C */ swc1 $f22, 0x3c($s0) -.L802410BC: -/* 8D25CC 802410BC C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D25D0 802410C0 27A6001C */ addiu $a2, $sp, 0x1c -/* 8D25D4 802410C4 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D25D8 802410C8 860200A8 */ lh $v0, 0xa8($s0) -/* 8D25DC 802410CC C600001C */ lwc1 $f0, 0x1c($s0) -/* 8D25E0 802410D0 C604003C */ lwc1 $f4, 0x3c($s0) -/* 8D25E4 802410D4 44821000 */ mtc1 $v0, $f2 -/* 8D25E8 802410D8 00000000 */ nop -/* 8D25EC 802410DC 468010A0 */ cvt.s.w $f2, $f2 -/* 8D25F0 802410E0 46000005 */ abs.s $f0, $f0 -/* 8D25F4 802410E4 46020000 */ add.s $f0, $f0, $f2 -/* 8D25F8 802410E8 C6060040 */ lwc1 $f6, 0x40($s0) -/* 8D25FC 802410EC 27A20024 */ addiu $v0, $sp, 0x24 -/* 8D2600 802410F0 46022100 */ add.s $f4, $f4, $f2 -/* 8D2604 802410F4 3C014024 */ lui $at, 0x4024 -/* 8D2608 802410F8 44811800 */ mtc1 $at, $f3 -/* 8D260C 802410FC 44801000 */ mtc1 $zero, $f2 -/* 8D2610 80241100 46000021 */ cvt.d.s $f0, $f0 -/* 8D2614 80241104 46220000 */ add.d $f0, $f0, $f2 -/* 8D2618 80241108 E7A60020 */ swc1 $f6, 0x20($sp) -/* 8D261C 8024110C E7A4001C */ swc1 $f4, 0x1c($sp) -/* 8D2620 80241110 46200020 */ cvt.s.d $f0, $f0 -/* 8D2624 80241114 E7A00024 */ swc1 $f0, 0x24($sp) -/* 8D2628 80241118 AFA20010 */ sw $v0, 0x10($sp) -/* 8D262C 8024111C 8E040080 */ lw $a0, 0x80($s0) -/* 8D2630 80241120 0C0372DF */ jal func_800DCB7C -/* 8D2634 80241124 27A70020 */ addiu $a3, $sp, 0x20 -/* 8D2638 80241128 10400015 */ beqz $v0, .L80241180 -/* 8D263C 8024112C 00000000 */ nop -/* 8D2640 80241130 860200A8 */ lh $v0, 0xa8($s0) -/* 8D2644 80241134 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8D2648 80241138 44820000 */ mtc1 $v0, $f0 -/* 8D264C 8024113C 00000000 */ nop -/* 8D2650 80241140 46800020 */ cvt.s.w $f0, $f0 -/* 8D2654 80241144 46002085 */ abs.s $f2, $f4 -/* 8D2658 80241148 46020000 */ add.s $f0, $f0, $f2 -/* 8D265C 8024114C C7A20024 */ lwc1 $f2, 0x24($sp) -/* 8D2660 80241150 4600103E */ c.le.s $f2, $f0 -/* 8D2664 80241154 00000000 */ nop -/* 8D2668 80241158 45000005 */ bc1f .L80241170 -/* 8D266C 8024115C 00000000 */ nop -/* 8D2670 80241160 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8D2674 80241164 AE00001C */ sw $zero, 0x1c($s0) -/* 8D2678 80241168 08090471 */ j .L802411C4 -/* 8D267C 8024116C E600003C */ swc1 $f0, 0x3c($s0) -.L80241170: -/* 8D2680 80241170 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D2684 80241174 46040000 */ add.s $f0, $f0, $f4 -/* 8D2688 80241178 08090471 */ j .L802411C4 -/* 8D268C 8024117C E600003C */ swc1 $f0, 0x3c($s0) -.L80241180: -/* 8D2690 80241180 C606003C */ lwc1 $f6, 0x3c($s0) -/* 8D2694 80241184 860200A8 */ lh $v0, 0xa8($s0) -/* 8D2698 80241188 46163081 */ sub.s $f2, $f6, $f22 -/* 8D269C 8024118C 44820000 */ mtc1 $v0, $f0 -/* 8D26A0 80241190 00000000 */ nop -/* 8D26A4 80241194 46800020 */ cvt.s.w $f0, $f0 -/* 8D26A8 80241198 46001080 */ add.s $f2, $f2, $f0 -/* 8D26AC 8024119C C604001C */ lwc1 $f4, 0x1c($s0) -/* 8D26B0 802411A0 46002005 */ abs.s $f0, $f4 -/* 8D26B4 802411A4 4602003C */ c.lt.s $f0, $f2 -/* 8D26B8 802411A8 00000000 */ nop -/* 8D26BC 802411AC 45020005 */ bc1fl .L802411C4 -/* 8D26C0 802411B0 AE00001C */ sw $zero, 0x1c($s0) -/* 8D26C4 802411B4 46043000 */ add.s $f0, $f6, $f4 -/* 8D26C8 802411B8 08090471 */ j .L802411C4 -/* 8D26CC 802411BC E600003C */ swc1 $f0, 0x3c($s0) -.L802411C0: -/* 8D26D0 802411C0 AE00001C */ sw $zero, 0x1c($s0) -.L802411C4: -/* 8D26D4 802411C4 8FBF0038 */ lw $ra, 0x38($sp) -/* 8D26D8 802411C8 8FB30034 */ lw $s3, 0x34($sp) -/* 8D26DC 802411CC 8FB20030 */ lw $s2, 0x30($sp) -/* 8D26E0 802411D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 8D26E4 802411D4 8FB00028 */ lw $s0, 0x28($sp) -/* 8D26E8 802411D8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* 8D26EC 802411DC D7B40040 */ ldc1 $f20, 0x40($sp) -/* 8D26F0 802411E0 03E00008 */ jr $ra -/* 8D26F4 802411E4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/func_802411E8_8D1510.s b/asm/nonmatchings/world/area_kmr/kmr_06/func_802411E8_8D1510.s deleted file mode 100644 index 2360f184ae..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/func_802411E8_8D1510.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411E8_8D26F8 -/* 8D26F8 802411E8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8D26FC 802411EC AFB00028 */ sw $s0, 0x28($sp) -/* 8D2700 802411F0 00A0802D */ daddu $s0, $a1, $zero -/* 8D2704 802411F4 AFB1002C */ sw $s1, 0x2c($sp) -/* 8D2708 802411F8 00C0882D */ daddu $s1, $a2, $zero -/* 8D270C 802411FC AFBF0034 */ sw $ra, 0x34($sp) -/* 8D2710 80241200 AFB20030 */ sw $s2, 0x30($sp) -/* 8D2714 80241204 AE200070 */ sw $zero, 0x70($s1) -/* 8D2718 80241208 8C830000 */ lw $v1, ($a0) -/* 8D271C 8024120C 2402FDFF */ addiu $v0, $zero, -0x201 -/* 8D2720 80241210 A480008E */ sh $zero, 0x8e($a0) -/* 8D2724 80241214 00621824 */ and $v1, $v1, $v0 -/* 8D2728 80241218 34650800 */ ori $a1, $v1, 0x800 -/* 8D272C 8024121C AC850000 */ sw $a1, ($a0) -/* 8D2730 80241220 8E0200D0 */ lw $v0, 0xd0($s0) -/* 8D2734 80241224 8C420034 */ lw $v0, 0x34($v0) -/* 8D2738 80241228 10400003 */ beqz $v0, .L80241238 -/* 8D273C 8024122C 00E0902D */ daddu $s2, $a3, $zero -/* 8D2740 80241230 08090490 */ j .L80241240 -/* 8D2744 80241234 34620808 */ ori $v0, $v1, 0x808 -.L80241238: -/* 8D2748 80241238 2402FFF7 */ addiu $v0, $zero, -9 -/* 8D274C 8024123C 00A21024 */ and $v0, $a1, $v0 -.L80241240: -/* 8D2750 80241240 AC820000 */ sw $v0, ($a0) -/* 8D2754 80241244 27A20024 */ addiu $v0, $sp, 0x24 -/* 8D2758 80241248 27A50018 */ addiu $a1, $sp, 0x18 -/* 8D275C 8024124C C4800038 */ lwc1 $f0, 0x38($a0) -/* 8D2760 80241250 C482003C */ lwc1 $f2, 0x3c($a0) -/* 8D2764 80241254 C4840040 */ lwc1 $f4, 0x40($a0) -/* 8D2768 80241258 3C01447A */ lui $at, 0x447a -/* 8D276C 8024125C 44813000 */ mtc1 $at, $f6 -/* 8D2770 80241260 27A6001C */ addiu $a2, $sp, 0x1c -/* 8D2774 80241264 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D2778 80241268 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 8D277C 8024126C E7A40020 */ swc1 $f4, 0x20($sp) -/* 8D2780 80241270 E7A60024 */ swc1 $f6, 0x24($sp) -/* 8D2784 80241274 AFA20010 */ sw $v0, 0x10($sp) -/* 8D2788 80241278 8C840080 */ lw $a0, 0x80($a0) -/* 8D278C 8024127C 0C0372DF */ jal func_800DCB7C -/* 8D2790 80241280 27A70020 */ addiu $a3, $sp, 0x20 -/* 8D2794 80241284 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 8D2798 80241288 3C014059 */ lui $at, 0x4059 -/* 8D279C 8024128C 44812800 */ mtc1 $at, $f5 -/* 8D27A0 80241290 44802000 */ mtc1 $zero, $f4 -/* 8D27A4 80241294 460010A1 */ cvt.d.s $f2, $f2 -/* 8D27A8 80241298 46241082 */ mul.d $f2, $f2, $f4 -/* 8D27AC 8024129C 00000000 */ nop -/* 8D27B0 802412A0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8D27B4 802412A4 46000021 */ cvt.d.s $f0, $f0 -/* 8D27B8 802412A8 46240002 */ mul.d $f0, $f0, $f4 -/* 8D27BC 802412AC 00000000 */ nop -/* 8D27C0 802412B0 3C013FE0 */ lui $at, 0x3fe0 -/* 8D27C4 802412B4 44812800 */ mtc1 $at, $f5 -/* 8D27C8 802412B8 44802000 */ mtc1 $zero, $f4 -/* 8D27CC 802412BC 00000000 */ nop -/* 8D27D0 802412C0 46241080 */ add.d $f2, $f2, $f4 -/* 8D27D4 802412C4 AE000074 */ sw $zero, 0x74($s0) -/* 8D27D8 802412C8 46240000 */ add.d $f0, $f0, $f4 -/* 8D27DC 802412CC AE000090 */ sw $zero, 0x90($s0) -/* 8D27E0 802412D0 4620120D */ trunc.w.d $f8, $f2 -/* 8D27E4 802412D4 E6080078 */ swc1 $f8, 0x78($s0) -/* 8D27E8 802412D8 4620020D */ trunc.w.d $f8, $f0 -/* 8D27EC 802412DC E6080088 */ swc1 $f8, 0x88($s0) -/* 8D27F0 802412E0 8E420014 */ lw $v0, 0x14($s2) -/* 8D27F4 802412E4 AE220074 */ sw $v0, 0x74($s1) -/* 8D27F8 802412E8 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8D27FC 802412EC 34420010 */ ori $v0, $v0, 0x10 -/* 8D2800 802412F0 AE0200B0 */ sw $v0, 0xb0($s0) -/* 8D2804 802412F4 8FBF0034 */ lw $ra, 0x34($sp) -/* 8D2808 802412F8 8FB20030 */ lw $s2, 0x30($sp) -/* 8D280C 802412FC 8FB1002C */ lw $s1, 0x2c($sp) -/* 8D2810 80241300 8FB00028 */ lw $s0, 0x28($sp) -/* 8D2814 80241304 03E00008 */ jr $ra -/* 8D2818 80241308 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/func_8024130C_8D1510.s b/asm/nonmatchings/world/area_kmr/kmr_06/func_8024130C_8D1510.s deleted file mode 100644 index c456880737..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/func_8024130C_8D1510.s +++ /dev/null @@ -1,133 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024130C_8D281C -/* 8D281C 8024130C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8D2820 80241310 AFB40040 */ sw $s4, 0x40($sp) -/* 8D2824 80241314 0080A02D */ daddu $s4, $a0, $zero -/* 8D2828 80241318 AFBF0048 */ sw $ra, 0x48($sp) -/* 8D282C 8024131C AFB50044 */ sw $s5, 0x44($sp) -/* 8D2830 80241320 AFB3003C */ sw $s3, 0x3c($sp) -/* 8D2834 80241324 AFB20038 */ sw $s2, 0x38($sp) -/* 8D2838 80241328 AFB10034 */ sw $s1, 0x34($sp) -/* 8D283C 8024132C AFB00030 */ sw $s0, 0x30($sp) -/* 8D2840 80241330 8E920148 */ lw $s2, 0x148($s4) -/* 8D2844 80241334 86440008 */ lh $a0, 8($s2) -/* 8D2848 80241338 8E90000C */ lw $s0, 0xc($s4) -/* 8D284C 8024133C 0C00EABB */ jal get_npc_unsafe -/* 8D2850 80241340 00A0882D */ daddu $s1, $a1, $zero -/* 8D2854 80241344 0280202D */ daddu $a0, $s4, $zero -/* 8D2858 80241348 8E050000 */ lw $a1, ($s0) -/* 8D285C 8024134C 0C0B1EAF */ jal get_variable -/* 8D2860 80241350 0040A82D */ daddu $s5, $v0, $zero -/* 8D2864 80241354 AFA00010 */ sw $zero, 0x10($sp) -/* 8D2868 80241358 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D286C 8024135C 8C630030 */ lw $v1, 0x30($v1) -/* 8D2870 80241360 AFA30014 */ sw $v1, 0x14($sp) -/* 8D2874 80241364 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D2878 80241368 8C63001C */ lw $v1, 0x1c($v1) -/* 8D287C 8024136C AFA30018 */ sw $v1, 0x18($sp) -/* 8D2880 80241370 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D2884 80241374 8C630024 */ lw $v1, 0x24($v1) -/* 8D2888 80241378 AFA3001C */ sw $v1, 0x1c($sp) -/* 8D288C 8024137C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D2890 80241380 8C630028 */ lw $v1, 0x28($v1) -/* 8D2894 80241384 27B30010 */ addiu $s3, $sp, 0x10 -/* 8D2898 80241388 AFA30020 */ sw $v1, 0x20($sp) -/* 8D289C 8024138C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D28A0 80241390 3C0142F0 */ lui $at, 0x42f0 -/* 8D28A4 80241394 44810000 */ mtc1 $at, $f0 -/* 8D28A8 80241398 8C63002C */ lw $v1, 0x2c($v1) -/* 8D28AC 8024139C 0040802D */ daddu $s0, $v0, $zero -/* 8D28B0 802413A0 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D28B4 802413A4 A7A0002C */ sh $zero, 0x2c($sp) -/* 8D28B8 802413A8 12200006 */ beqz $s1, .L802413C4 -/* 8D28BC 802413AC AFA30024 */ sw $v1, 0x24($sp) -/* 8D28C0 802413B0 02A0202D */ daddu $a0, $s5, $zero -/* 8D28C4 802413B4 0240282D */ daddu $a1, $s2, $zero -/* 8D28C8 802413B8 0280302D */ daddu $a2, $s4, $zero -/* 8D28CC 802413BC 0C09047A */ jal func_802411E8 -/* 8D28D0 802413C0 0200382D */ daddu $a3, $s0, $zero -.L802413C4: -/* 8D28D4 802413C4 2402FFFE */ addiu $v0, $zero, -2 -/* 8D28D8 802413C8 A2A200AB */ sb $v0, 0xab($s5) -/* 8D28DC 802413CC 8E4300B0 */ lw $v1, 0xb0($s2) -/* 8D28E0 802413D0 30620004 */ andi $v0, $v1, 4 -/* 8D28E4 802413D4 10400007 */ beqz $v0, .L802413F4 -/* 8D28E8 802413D8 00000000 */ nop -/* 8D28EC 802413DC 824200B4 */ lb $v0, 0xb4($s2) -/* 8D28F0 802413E0 1440003C */ bnez $v0, .L802414D4 -/* 8D28F4 802413E4 0000102D */ daddu $v0, $zero, $zero -/* 8D28F8 802413E8 2402FFFB */ addiu $v0, $zero, -5 -/* 8D28FC 802413EC 00621024 */ and $v0, $v1, $v0 -/* 8D2900 802413F0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802413F4: -/* 8D2904 802413F4 8E830070 */ lw $v1, 0x70($s4) -/* 8D2908 802413F8 2C62000F */ sltiu $v0, $v1, 0xf -/* 8D290C 802413FC 10400034 */ beqz $v0, .L802414D0 -/* 8D2910 80241400 00031080 */ sll $v0, $v1, 2 -/* 8D2914 80241404 3C018024 */ lui $at, 0x8024 -/* 8D2918 80241408 00220821 */ addu $at, $at, $v0 -/* 8D291C 8024140C 8C222868 */ lw $v0, 0x2868($at) -/* 8D2920 80241410 00400008 */ jr $v0 -/* 8D2924 80241414 00000000 */ nop -/* 8D2928 80241418 0280202D */ daddu $a0, $s4, $zero -/* 8D292C 8024141C 0200282D */ daddu $a1, $s0, $zero -/* 8D2930 80241420 0C090000 */ jal func_80240000 -/* 8D2934 80241424 0260302D */ daddu $a2, $s3, $zero -/* 8D2938 80241428 0280202D */ daddu $a0, $s4, $zero -/* 8D293C 8024142C 0200282D */ daddu $a1, $s0, $zero -/* 8D2940 80241430 0C09006C */ jal func_802401B0 -/* 8D2944 80241434 0260302D */ daddu $a2, $s3, $zero -/* 8D2948 80241438 08090535 */ j .L802414D4 -/* 8D294C 8024143C 0000102D */ daddu $v0, $zero, $zero -/* 8D2950 80241440 0280202D */ daddu $a0, $s4, $zero -/* 8D2954 80241444 0200282D */ daddu $a1, $s0, $zero -/* 8D2958 80241448 0C0901F6 */ jal func_802407D8 -/* 8D295C 8024144C 0260302D */ daddu $a2, $s3, $zero -/* 8D2960 80241450 0280202D */ daddu $a0, $s4, $zero -/* 8D2964 80241454 0200282D */ daddu $a1, $s0, $zero -/* 8D2968 80241458 0C090226 */ jal func_80240898 -/* 8D296C 8024145C 0260302D */ daddu $a2, $s3, $zero -/* 8D2970 80241460 08090535 */ j .L802414D4 -/* 8D2974 80241464 0000102D */ daddu $v0, $zero, $zero -/* 8D2978 80241468 0280202D */ daddu $a0, $s4, $zero -/* 8D297C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* 8D2980 80241470 0C0902F7 */ jal func_80240BDC -/* 8D2984 80241474 0260302D */ daddu $a2, $s3, $zero -/* 8D2988 80241478 0280202D */ daddu $a0, $s4, $zero -/* 8D298C 8024147C 0200282D */ daddu $a1, $s0, $zero -/* 8D2990 80241480 0C090315 */ jal func_80240C54 -/* 8D2994 80241484 0260302D */ daddu $a2, $s3, $zero -/* 8D2998 80241488 08090535 */ j .L802414D4 -/* 8D299C 8024148C 0000102D */ daddu $v0, $zero, $zero -/* 8D29A0 80241490 0280202D */ daddu $a0, $s4, $zero -/* 8D29A4 80241494 0200282D */ daddu $a1, $s0, $zero -/* 8D29A8 80241498 0C090330 */ jal func_80240CC0 -/* 8D29AC 8024149C 0260302D */ daddu $a2, $s3, $zero -/* 8D29B0 802414A0 08090535 */ j .L802414D4 -/* 8D29B4 802414A4 0000102D */ daddu $v0, $zero, $zero -/* 8D29B8 802414A8 0280202D */ daddu $a0, $s4, $zero -/* 8D29BC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8D29C0 802414B0 0C09037D */ jal func_80240DF4 -/* 8D29C4 802414B4 0260302D */ daddu $a2, $s3, $zero -/* 8D29C8 802414B8 08090535 */ j .L802414D4 -/* 8D29CC 802414BC 0000102D */ daddu $v0, $zero, $zero -/* 8D29D0 802414C0 0280202D */ daddu $a0, $s4, $zero -/* 8D29D4 802414C4 0200282D */ daddu $a1, $s0, $zero -/* 8D29D8 802414C8 0C090396 */ jal func_80240E58 -/* 8D29DC 802414CC 0260302D */ daddu $a2, $s3, $zero -.L802414D0: -/* 8D29E0 802414D0 0000102D */ daddu $v0, $zero, $zero -.L802414D4: -/* 8D29E4 802414D4 8FBF0048 */ lw $ra, 0x48($sp) -/* 8D29E8 802414D8 8FB50044 */ lw $s5, 0x44($sp) -/* 8D29EC 802414DC 8FB40040 */ lw $s4, 0x40($sp) -/* 8D29F0 802414E0 8FB3003C */ lw $s3, 0x3c($sp) -/* 8D29F4 802414E4 8FB20038 */ lw $s2, 0x38($sp) -/* 8D29F8 802414E8 8FB10034 */ lw $s1, 0x34($sp) -/* 8D29FC 802414EC 8FB00030 */ lw $s0, 0x30($sp) -/* 8D2A00 802414F0 03E00008 */ jr $ra -/* 8D2A04 802414F4 27BD0050 */ addiu $sp, $sp, 0x50 -/* 8D2A08 802414F8 00000000 */ nop -/* 8D2A0C 802414FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/func_80241500_8D1510.s b/asm/nonmatchings/world/area_kmr/kmr_06/func_80241500_8D1510.s deleted file mode 100644 index 054e7b4e73..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/func_80241500_8D1510.s +++ /dev/null @@ -1,176 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241500_8D2A10 -/* 8D2A10 80241500 27BDFF10 */ addiu $sp, $sp, -0xf0 -/* 8D2A14 80241504 0000202D */ daddu $a0, $zero, $zero -/* 8D2A18 80241508 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2A1C 8024150C AFBF00D8 */ sw $ra, 0xd8($sp) -/* 8D2A20 80241510 AFB700D4 */ sw $s7, 0xd4($sp) -/* 8D2A24 80241514 AFB600D0 */ sw $s6, 0xd0($sp) -/* 8D2A28 80241518 AFB500CC */ sw $s5, 0xcc($sp) -/* 8D2A2C 8024151C AFB400C8 */ sw $s4, 0xc8($sp) -/* 8D2A30 80241520 AFB300C4 */ sw $s3, 0xc4($sp) -/* 8D2A34 80241524 AFB200C0 */ sw $s2, 0xc0($sp) -/* 8D2A38 80241528 AFB100BC */ sw $s1, 0xbc($sp) -/* 8D2A3C 8024152C AFB000B8 */ sw $s0, 0xb8($sp) -/* 8D2A40 80241530 F7B600E8 */ sdc1 $f22, 0xe8($sp) -/* 8D2A44 80241534 F7B400E0 */ sdc1 $f20, 0xe0($sp) -/* 8D2A48 80241538 0C0B1EAF */ jal get_variable -/* 8D2A4C 8024153C 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8D2A50 80241540 0000202D */ daddu $a0, $zero, $zero -/* 8D2A54 80241544 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2A58 80241548 34A50F8B */ ori $a1, $a1, 0xf8b -/* 8D2A5C 8024154C 0C0B1EAF */ jal get_variable -/* 8D2A60 80241550 0040B02D */ daddu $s6, $v0, $zero -/* 8D2A64 80241554 0000202D */ daddu $a0, $zero, $zero -/* 8D2A68 80241558 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2A6C 8024155C 34A50F8C */ ori $a1, $a1, 0xf8c -/* 8D2A70 80241560 0C0B1EAF */ jal get_variable -/* 8D2A74 80241564 0040A82D */ daddu $s5, $v0, $zero -/* 8D2A78 80241568 24170400 */ addiu $s7, $zero, 0x400 -/* 8D2A7C 8024156C 27B10038 */ addiu $s1, $sp, 0x38 -/* 8D2A80 80241570 0220202D */ daddu $a0, $s1, $zero -/* 8D2A84 80241574 3C130001 */ lui $s3, 1 -/* 8D2A88 80241578 3C12800A */ lui $s2, 0x800a -/* 8D2A8C 8024157C 2652A66C */ addiu $s2, $s2, -0x5994 -/* 8D2A90 80241580 36731630 */ ori $s3, $s3, 0x1630 -/* 8D2A94 80241584 3C03E700 */ lui $v1, 0xe700 -/* 8D2A98 80241588 0040A02D */ daddu $s4, $v0, $zero -/* 8D2A9C 8024158C 8E480000 */ lw $t0, ($s2) -/* 8D2AA0 80241590 4480A000 */ mtc1 $zero, $f20 -/* 8D2AA4 80241594 0100282D */ daddu $a1, $t0, $zero -/* 8D2AA8 80241598 ACA30000 */ sw $v1, ($a1) -/* 8D2AAC 8024159C ACA00004 */ sw $zero, 4($a1) -/* 8D2AB0 802415A0 8EC50008 */ lw $a1, 8($s6) -/* 8D2AB4 802415A4 8EC6000C */ lw $a2, 0xc($s6) -/* 8D2AB8 802415A8 8EC70010 */ lw $a3, 0x10($s6) -/* 8D2ABC 802415AC 25080008 */ addiu $t0, $t0, 8 -/* 8D2AC0 802415B0 0C019E40 */ jal guTranslateF -/* 8D2AC4 802415B4 AE480000 */ sw $t0, ($s2) -/* 8D2AC8 802415B8 27B00078 */ addiu $s0, $sp, 0x78 -/* 8D2ACC 802415BC E7B40010 */ swc1 $f20, 0x10($sp) -/* 8D2AD0 802415C0 8EC50018 */ lw $a1, 0x18($s6) -/* 8D2AD4 802415C4 3C013F80 */ lui $at, 0x3f80 -/* 8D2AD8 802415C8 4481B000 */ mtc1 $at, $f22 -/* 8D2ADC 802415CC 4406A000 */ mfc1 $a2, $f20 -/* 8D2AE0 802415D0 4407B000 */ mfc1 $a3, $f22 -/* 8D2AE4 802415D4 0C019EC8 */ jal guRotateF -/* 8D2AE8 802415D8 0200202D */ daddu $a0, $s0, $zero -/* 8D2AEC 802415DC 0200202D */ daddu $a0, $s0, $zero -/* 8D2AF0 802415E0 0220282D */ daddu $a1, $s1, $zero -/* 8D2AF4 802415E4 0C019D80 */ jal guMtxCatF -/* 8D2AF8 802415E8 0220302D */ daddu $a2, $s1, $zero -/* 8D2AFC 802415EC E7B40010 */ swc1 $f20, 0x10($sp) -/* 8D2B00 802415F0 8EC50014 */ lw $a1, 0x14($s6) -/* 8D2B04 802415F4 4406B000 */ mfc1 $a2, $f22 -/* 8D2B08 802415F8 4407A000 */ mfc1 $a3, $f20 -/* 8D2B0C 802415FC 0C019EC8 */ jal guRotateF -/* 8D2B10 80241600 0200202D */ daddu $a0, $s0, $zero -/* 8D2B14 80241604 0200202D */ daddu $a0, $s0, $zero -/* 8D2B18 80241608 0220282D */ daddu $a1, $s1, $zero -/* 8D2B1C 8024160C 0C019D80 */ jal guMtxCatF -/* 8D2B20 80241610 0220302D */ daddu $a2, $s1, $zero -/* 8D2B24 80241614 8EC5001C */ lw $a1, 0x1c($s6) -/* 8D2B28 80241618 8EC60020 */ lw $a2, 0x20($s6) -/* 8D2B2C 8024161C 8EC70024 */ lw $a3, 0x24($s6) -/* 8D2B30 80241620 0C019DF0 */ jal guScaleF -/* 8D2B34 80241624 0200202D */ daddu $a0, $s0, $zero -/* 8D2B38 80241628 0200202D */ daddu $a0, $s0, $zero -/* 8D2B3C 8024162C 0220282D */ daddu $a1, $s1, $zero -/* 8D2B40 80241630 0C019D80 */ jal guMtxCatF -/* 8D2B44 80241634 0220302D */ daddu $a2, $s1, $zero -/* 8D2B48 80241638 0220202D */ daddu $a0, $s1, $zero -/* 8D2B4C 8024163C 3C108007 */ lui $s0, 0x8007 -/* 8D2B50 80241640 261041F0 */ addiu $s0, $s0, 0x41f0 -/* 8D2B54 80241644 3C11800A */ lui $s1, 0x800a -/* 8D2B58 80241648 2631A674 */ addiu $s1, $s1, -0x598c -/* 8D2B5C 8024164C 96050000 */ lhu $a1, ($s0) -/* 8D2B60 80241650 8E220000 */ lw $v0, ($s1) -/* 8D2B64 80241654 00052980 */ sll $a1, $a1, 6 -/* 8D2B68 80241658 00B32821 */ addu $a1, $a1, $s3 -/* 8D2B6C 8024165C 0C019D40 */ jal guMtxF2L -/* 8D2B70 80241660 00452821 */ addu $a1, $v0, $a1 -/* 8D2B74 80241664 3C04DA38 */ lui $a0, 0xda38 -/* 8D2B78 80241668 34840002 */ ori $a0, $a0, 2 -/* 8D2B7C 8024166C 8E430000 */ lw $v1, ($s2) -/* 8D2B80 80241670 96020000 */ lhu $v0, ($s0) -/* 8D2B84 80241674 0060282D */ daddu $a1, $v1, $zero -/* 8D2B88 80241678 24630008 */ addiu $v1, $v1, 8 -/* 8D2B8C 8024167C AE430000 */ sw $v1, ($s2) -/* 8D2B90 80241680 24430001 */ addiu $v1, $v0, 1 -/* 8D2B94 80241684 3042FFFF */ andi $v0, $v0, 0xffff -/* 8D2B98 80241688 00021180 */ sll $v0, $v0, 6 -/* 8D2B9C 8024168C ACA40000 */ sw $a0, ($a1) -/* 8D2BA0 80241690 A6030000 */ sh $v1, ($s0) -/* 8D2BA4 80241694 8E230000 */ lw $v1, ($s1) -/* 8D2BA8 80241698 00531021 */ addu $v0, $v0, $s3 -/* 8D2BAC 8024169C 00621821 */ addu $v1, $v1, $v0 -/* 8D2BB0 802416A0 3C028000 */ lui $v0, 0x8000 -/* 8D2BB4 802416A4 00621821 */ addu $v1, $v1, $v0 -/* 8D2BB8 802416A8 24020020 */ addiu $v0, $zero, 0x20 -/* 8D2BBC 802416AC ACA30004 */ sw $v1, 4($a1) -/* 8D2BC0 802416B0 A7A20028 */ sh $v0, 0x28($sp) -/* 8D2BC4 802416B4 A7A2002A */ sh $v0, 0x2a($sp) -/* 8D2BC8 802416B8 2402FFF0 */ addiu $v0, $zero, -0x10 -/* 8D2BCC 802416BC A7A2002C */ sh $v0, 0x2c($sp) -/* 8D2BD0 802416C0 24020010 */ addiu $v0, $zero, 0x10 -/* 8D2BD4 802416C4 A7A2002E */ sh $v0, 0x2e($sp) -/* 8D2BD8 802416C8 240200FF */ addiu $v0, $zero, 0xff -/* 8D2BDC 802416CC AFB50020 */ sw $s5, 0x20($sp) -/* 8D2BE0 802416D0 AFB40024 */ sw $s4, 0x24($sp) -/* 8D2BE4 802416D4 A3A20030 */ sb $v0, 0x30($sp) -/* 8D2BE8 802416D8 C6C00018 */ lwc1 $f0, 0x18($s6) -/* 8D2BEC 802416DC 44801000 */ mtc1 $zero, $f2 -/* 8D2BF0 802416E0 44801800 */ mtc1 $zero, $f3 -/* 8D2BF4 802416E4 46000021 */ cvt.d.s $f0, $f0 -/* 8D2BF8 802416E8 46220032 */ c.eq.d $f0, $f2 -/* 8D2BFC 802416EC 00000000 */ nop -/* 8D2C00 802416F0 45020008 */ bc1fl .L80241714 -/* 8D2C04 802416F4 24172400 */ addiu $s7, $zero, 0x2400 -/* 8D2C08 802416F8 C6C00014 */ lwc1 $f0, 0x14($s6) -/* 8D2C0C 802416FC 46000021 */ cvt.d.s $f0, $f0 -/* 8D2C10 80241700 46220032 */ c.eq.d $f0, $f2 -/* 8D2C14 80241704 00000000 */ nop -/* 8D2C18 80241708 45010003 */ bc1t .L80241718 -/* 8D2C1C 8024170C 0000202D */ daddu $a0, $zero, $zero -/* 8D2C20 80241710 24172400 */ addiu $s7, $zero, 0x2400 -.L80241714: -/* 8D2C24 80241714 0000202D */ daddu $a0, $zero, $zero -.L80241718: -/* 8D2C28 80241718 0080282D */ daddu $a1, $a0, $zero -/* 8D2C2C 8024171C 0080302D */ daddu $a2, $a0, $zero -/* 8D2C30 80241720 0080382D */ daddu $a3, $a0, $zero -/* 8D2C34 80241724 AFA00010 */ sw $zero, 0x10($sp) -/* 8D2C38 80241728 AFA00014 */ sw $zero, 0x14($sp) -/* 8D2C3C 8024172C 0C04EAA7 */ jal func_8013AA9C -/* 8D2C40 80241730 AFA00018 */ sw $zero, 0x18($sp) -/* 8D2C44 80241734 0000202D */ daddu $a0, $zero, $zero -/* 8D2C48 80241738 27A50020 */ addiu $a1, $sp, 0x20 -/* 8D2C4C 8024173C 02E0302D */ daddu $a2, $s7, $zero -/* 8D2C50 80241740 0C04EBDC */ jal func_8013AF70 -/* 8D2C54 80241744 27A70038 */ addiu $a3, $sp, 0x38 -/* 8D2C58 80241748 3C05D838 */ lui $a1, 0xd838 -/* 8D2C5C 8024174C 3C03800A */ lui $v1, 0x800a -/* 8D2C60 80241750 2463A66C */ addiu $v1, $v1, -0x5994 -/* 8D2C64 80241754 8C620000 */ lw $v0, ($v1) -/* 8D2C68 80241758 34A50002 */ ori $a1, $a1, 2 -/* 8D2C6C 8024175C 0040202D */ daddu $a0, $v0, $zero -/* 8D2C70 80241760 24420008 */ addiu $v0, $v0, 8 -/* 8D2C74 80241764 AC620000 */ sw $v0, ($v1) -/* 8D2C78 80241768 24020040 */ addiu $v0, $zero, 0x40 -/* 8D2C7C 8024176C AC850000 */ sw $a1, ($a0) -/* 8D2C80 80241770 AC820004 */ sw $v0, 4($a0) -/* 8D2C84 80241774 8FBF00D8 */ lw $ra, 0xd8($sp) -/* 8D2C88 80241778 8FB700D4 */ lw $s7, 0xd4($sp) -/* 8D2C8C 8024177C 8FB600D0 */ lw $s6, 0xd0($sp) -/* 8D2C90 80241780 8FB500CC */ lw $s5, 0xcc($sp) -/* 8D2C94 80241784 8FB400C8 */ lw $s4, 0xc8($sp) -/* 8D2C98 80241788 8FB300C4 */ lw $s3, 0xc4($sp) -/* 8D2C9C 8024178C 8FB200C0 */ lw $s2, 0xc0($sp) -/* 8D2CA0 80241790 8FB100BC */ lw $s1, 0xbc($sp) -/* 8D2CA4 80241794 8FB000B8 */ lw $s0, 0xb8($sp) -/* 8D2CA8 80241798 D7B600E8 */ ldc1 $f22, 0xe8($sp) -/* 8D2CAC 8024179C D7B400E0 */ ldc1 $f20, 0xe0($sp) -/* 8D2CB0 802417A0 03E00008 */ jr $ra -/* 8D2CB4 802417A4 27BD00F0 */ addiu $sp, $sp, 0xf0 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/func_80240540_8D3DC0.s b/asm/nonmatchings/world/area_kmr/kmr_07/func_80240540_8D3DC0.s deleted file mode 100644 index 2544caa9df..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_07/func_80240540_8D3DC0.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240540_8D4300 -/* 8D4300 80240540 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8D4304 80240544 AFB10014 */ sw $s1, 0x14($sp) -/* 8D4308 80240548 0080882D */ daddu $s1, $a0, $zero -/* 8D430C 8024054C AFBF001C */ sw $ra, 0x1c($sp) -/* 8D4310 80240550 AFB20018 */ sw $s2, 0x18($sp) -/* 8D4314 80240554 AFB00010 */ sw $s0, 0x10($sp) -/* 8D4318 80240558 8E300148 */ lw $s0, 0x148($s1) -/* 8D431C 8024055C 86040008 */ lh $a0, 8($s0) -/* 8D4320 80240560 0C00EABB */ jal get_npc_unsafe -/* 8D4324 80240564 00A0902D */ daddu $s2, $a1, $zero -/* 8D4328 80240568 8E0300CC */ lw $v1, 0xcc($s0) -/* 8D432C 8024056C 8C630004 */ lw $v1, 4($v1) -/* 8D4330 80240570 0040202D */ daddu $a0, $v0, $zero -/* 8D4334 80240574 AC830028 */ sw $v1, 0x28($a0) -/* 8D4338 80240578 8E0200D0 */ lw $v0, 0xd0($s0) -/* 8D433C 8024057C 8C420014 */ lw $v0, 0x14($v0) -/* 8D4340 80240580 04410009 */ bgez $v0, .L802405A8 -/* 8D4344 80240584 00000000 */ nop -/* 8D4348 80240588 C640000C */ lwc1 $f0, 0xc($s2) -/* 8D434C 8024058C 3C018024 */ lui $at, 0x8024 -/* 8D4350 80240590 D4221E98 */ ldc1 $f2, 0x1e98($at) -/* 8D4354 80240594 46000021 */ cvt.d.s $f0, $f0 -/* 8D4358 80240598 46220002 */ mul.d $f0, $f0, $f2 -/* 8D435C 8024059C 00000000 */ nop -/* 8D4360 802405A0 08090171 */ j .L802405C4 -/* 8D4364 802405A4 46200020 */ cvt.s.d $f0, $f0 -.L802405A8: -/* 8D4368 802405A8 3C018024 */ lui $at, 0x8024 -/* 8D436C 802405AC D4221EA0 */ ldc1 $f2, 0x1ea0($at) -/* 8D4370 802405B0 44820000 */ mtc1 $v0, $f0 -/* 8D4374 802405B4 00000000 */ nop -/* 8D4378 802405B8 46800021 */ cvt.d.w $f0, $f0 -/* 8D437C 802405BC 46220003 */ div.d $f0, $f0, $f2 -/* 8D4380 802405C0 46200020 */ cvt.s.d $f0, $f0 -.L802405C4: -/* 8D4384 802405C4 E4800018 */ swc1 $f0, 0x18($a0) -/* 8D4388 802405C8 24020010 */ addiu $v0, $zero, 0x10 -/* 8D438C 802405CC AE200074 */ sw $zero, 0x74($s1) -/* 8D4390 802405D0 AE220070 */ sw $v0, 0x70($s1) -/* 8D4394 802405D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 8D4398 802405D8 8FB20018 */ lw $s2, 0x18($sp) -/* 8D439C 802405DC 8FB10014 */ lw $s1, 0x14($sp) -/* 8D43A0 802405E0 8FB00010 */ lw $s0, 0x10($sp) -/* 8D43A4 802405E4 03E00008 */ jr $ra -/* 8D43A8 802405E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/func_802405EC_8D3DC0.s b/asm/nonmatchings/world/area_kmr/kmr_07/func_802405EC_8D3DC0.s deleted file mode 100644 index 7a05f2a431..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_07/func_802405EC_8D3DC0.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_8D43AC -/* 8D43AC 802405EC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8D43B0 802405F0 AFB3003C */ sw $s3, 0x3c($sp) -/* 8D43B4 802405F4 0080982D */ daddu $s3, $a0, $zero -/* 8D43B8 802405F8 AFBF0044 */ sw $ra, 0x44($sp) -/* 8D43BC 802405FC AFB40040 */ sw $s4, 0x40($sp) -/* 8D43C0 80240600 AFB20038 */ sw $s2, 0x38($sp) -/* 8D43C4 80240604 AFB10034 */ sw $s1, 0x34($sp) -/* 8D43C8 80240608 AFB00030 */ sw $s0, 0x30($sp) -/* 8D43CC 8024060C 8E710148 */ lw $s1, 0x148($s3) -/* 8D43D0 80240610 00A0902D */ daddu $s2, $a1, $zero -/* 8D43D4 80240614 86240008 */ lh $a0, 8($s1) -/* 8D43D8 80240618 0C00EABB */ jal get_npc_unsafe -/* 8D43DC 8024061C 00C0A02D */ daddu $s4, $a2, $zero -/* 8D43E0 80240620 8E430008 */ lw $v1, 8($s2) -/* 8D43E4 80240624 0460003B */ bltz $v1, .L80240714 -/* 8D43E8 80240628 0040802D */ daddu $s0, $v0, $zero -/* 8D43EC 8024062C 8E620074 */ lw $v0, 0x74($s3) -/* 8D43F0 80240630 1C400037 */ bgtz $v0, .L80240710 -/* 8D43F4 80240634 2442FFFF */ addiu $v0, $v0, -1 -/* 8D43F8 80240638 0280202D */ daddu $a0, $s4, $zero -/* 8D43FC 8024063C AE630074 */ sw $v1, 0x74($s3) -/* 8D4400 80240640 AFA00010 */ sw $zero, 0x10($sp) -/* 8D4404 80240644 8E460018 */ lw $a2, 0x18($s2) -/* 8D4408 80240648 8E47001C */ lw $a3, 0x1c($s2) -/* 8D440C 8024064C 0C01242D */ jal func_800490B4 -/* 8D4410 80240650 0220282D */ daddu $a1, $s1, $zero -/* 8D4414 80240654 1040002C */ beqz $v0, .L80240708 -/* 8D4418 80240658 0000202D */ daddu $a0, $zero, $zero -/* 8D441C 8024065C 0200282D */ daddu $a1, $s0, $zero -/* 8D4420 80240660 0000302D */ daddu $a2, $zero, $zero -/* 8D4424 80240664 860300A8 */ lh $v1, 0xa8($s0) -/* 8D4428 80240668 3C013F80 */ lui $at, 0x3f80 -/* 8D442C 8024066C 44810000 */ mtc1 $at, $f0 -/* 8D4430 80240670 3C014000 */ lui $at, 0x4000 -/* 8D4434 80240674 44811000 */ mtc1 $at, $f2 -/* 8D4438 80240678 3C01C1A0 */ lui $at, 0xc1a0 -/* 8D443C 8024067C 44812000 */ mtc1 $at, $f4 -/* 8D4440 80240680 2402000F */ addiu $v0, $zero, 0xf -/* 8D4444 80240684 AFA2001C */ sw $v0, 0x1c($sp) -/* 8D4448 80240688 44833000 */ mtc1 $v1, $f6 -/* 8D444C 8024068C 00000000 */ nop -/* 8D4450 80240690 468031A0 */ cvt.s.w $f6, $f6 -/* 8D4454 80240694 44073000 */ mfc1 $a3, $f6 -/* 8D4458 80240698 27A20028 */ addiu $v0, $sp, 0x28 -/* 8D445C 8024069C AFA20020 */ sw $v0, 0x20($sp) -/* 8D4460 802406A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D4464 802406A4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8D4468 802406A8 0C01BFA4 */ jal fx_emote -/* 8D446C 802406AC E7A40018 */ swc1 $f4, 0x18($sp) -/* 8D4470 802406B0 0200202D */ daddu $a0, $s0, $zero -/* 8D4474 802406B4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8D4478 802406B8 0C012530 */ jal func_800494C0 -/* 8D447C 802406BC 3C060020 */ lui $a2, 0x20 -/* 8D4480 802406C0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D4484 802406C4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D4488 802406C8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D448C 802406CC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D4490 802406D0 8C460028 */ lw $a2, 0x28($v0) -/* 8D4494 802406D4 0C00A720 */ jal atan2 -/* 8D4498 802406D8 8C470030 */ lw $a3, 0x30($v0) -/* 8D449C 802406DC E600000C */ swc1 $f0, 0xc($s0) -/* 8D44A0 802406E0 8E220018 */ lw $v0, 0x18($s1) -/* 8D44A4 802406E4 9442002A */ lhu $v0, 0x2a($v0) -/* 8D44A8 802406E8 30420001 */ andi $v0, $v0, 1 -/* 8D44AC 802406EC 10400003 */ beqz $v0, .L802406FC -/* 8D44B0 802406F0 2402000A */ addiu $v0, $zero, 0xa -/* 8D44B4 802406F4 080901F5 */ j .L802407D4 -/* 8D44B8 802406F8 AE620070 */ sw $v0, 0x70($s3) -.L802406FC: -/* 8D44BC 802406FC 2402000C */ addiu $v0, $zero, 0xc -/* 8D44C0 80240700 080901F5 */ j .L802407D4 -/* 8D44C4 80240704 AE620070 */ sw $v0, 0x70($s3) -.L80240708: -/* 8D44C8 80240708 8E620074 */ lw $v0, 0x74($s3) -/* 8D44CC 8024070C 2442FFFF */ addiu $v0, $v0, -1 -.L80240710: -/* 8D44D0 80240710 AE620074 */ sw $v0, 0x74($s3) -.L80240714: -/* 8D44D4 80240714 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D44D8 80240718 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D44DC 8024071C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D44E0 80240720 C4460000 */ lwc1 $f6, ($v0) -/* 8D44E4 80240724 468031A0 */ cvt.s.w $f6, $f6 -/* 8D44E8 80240728 44063000 */ mfc1 $a2, $f6 -/* 8D44EC 8024072C C4460008 */ lwc1 $f6, 8($v0) -/* 8D44F0 80240730 468031A0 */ cvt.s.w $f6, $f6 -/* 8D44F4 80240734 44073000 */ mfc1 $a3, $f6 -/* 8D44F8 80240738 0C00A7B5 */ jal dist2D -/* 8D44FC 8024073C 00000000 */ nop -/* 8D4500 80240740 C6020018 */ lwc1 $f2, 0x18($s0) -/* 8D4504 80240744 4602003C */ c.lt.s $f0, $f2 -/* 8D4508 80240748 00000000 */ nop -/* 8D450C 8024074C 4500000E */ bc1f .L80240788 -/* 8D4510 80240750 00000000 */ nop -/* 8D4514 80240754 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D4518 80240758 C4400000 */ lwc1 $f0, ($v0) -/* 8D451C 8024075C 46800020 */ cvt.s.w $f0, $f0 -/* 8D4520 80240760 E6000038 */ swc1 $f0, 0x38($s0) -/* 8D4524 80240764 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D4528 80240768 C4400008 */ lwc1 $f0, 8($v0) -/* 8D452C 8024076C 46800020 */ cvt.s.w $f0, $f0 -/* 8D4530 80240770 E6000040 */ swc1 $f0, 0x40($s0) -/* 8D4534 80240774 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D4538 80240778 C440000C */ lwc1 $f0, 0xc($v0) -/* 8D453C 8024077C 46800020 */ cvt.s.w $f0, $f0 -/* 8D4540 80240780 E600000C */ swc1 $f0, 0xc($s0) -/* 8D4544 80240784 AE600070 */ sw $zero, 0x70($s3) -.L80240788: -/* 8D4548 80240788 8602008C */ lh $v0, 0x8c($s0) -/* 8D454C 8024078C 14400011 */ bnez $v0, .L802407D4 -/* 8D4550 80240790 00000000 */ nop -/* 8D4554 80240794 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D4558 80240798 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D455C 8024079C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D4560 802407A0 C4460000 */ lwc1 $f6, ($v0) -/* 8D4564 802407A4 468031A0 */ cvt.s.w $f6, $f6 -/* 8D4568 802407A8 44063000 */ mfc1 $a2, $f6 -/* 8D456C 802407AC C4460008 */ lwc1 $f6, 8($v0) -/* 8D4570 802407B0 468031A0 */ cvt.s.w $f6, $f6 -/* 8D4574 802407B4 44073000 */ mfc1 $a3, $f6 -/* 8D4578 802407B8 0C00A720 */ jal atan2 -/* 8D457C 802407BC 00000000 */ nop -/* 8D4580 802407C0 8E050018 */ lw $a1, 0x18($s0) -/* 8D4584 802407C4 44060000 */ mfc1 $a2, $f0 -/* 8D4588 802407C8 0200202D */ daddu $a0, $s0, $zero -/* 8D458C 802407CC 0C00EA95 */ jal npc_move_heading -/* 8D4590 802407D0 AC86000C */ sw $a2, 0xc($a0) -.L802407D4: -/* 8D4594 802407D4 8FBF0044 */ lw $ra, 0x44($sp) -/* 8D4598 802407D8 8FB40040 */ lw $s4, 0x40($sp) -/* 8D459C 802407DC 8FB3003C */ lw $s3, 0x3c($sp) -/* 8D45A0 802407E0 8FB20038 */ lw $s2, 0x38($sp) -/* 8D45A4 802407E4 8FB10034 */ lw $s1, 0x34($sp) -/* 8D45A8 802407E8 8FB00030 */ lw $s0, 0x30($sp) -/* 8D45AC 802407EC 03E00008 */ jr $ra -/* 8D45B0 802407F0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/func_802401B0_8D5E00.s b/asm/nonmatchings/world/area_kmr/kmr_09/func_802401B0_8D5E00.s deleted file mode 100644 index 5ce6864503..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/func_802401B0_8D5E00.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_8D5FB0 -/* 8D5FB0 802401B0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 8D5FB4 802401B4 AFB3004C */ sw $s3, 0x4c($sp) -/* 8D5FB8 802401B8 0080982D */ daddu $s3, $a0, $zero -/* 8D5FBC 802401BC AFBF0058 */ sw $ra, 0x58($sp) -/* 8D5FC0 802401C0 AFB50054 */ sw $s5, 0x54($sp) -/* 8D5FC4 802401C4 AFB40050 */ sw $s4, 0x50($sp) -/* 8D5FC8 802401C8 AFB20048 */ sw $s2, 0x48($sp) -/* 8D5FCC 802401CC AFB10044 */ sw $s1, 0x44($sp) -/* 8D5FD0 802401D0 AFB00040 */ sw $s0, 0x40($sp) -/* 8D5FD4 802401D4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8D5FD8 802401D8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8D5FDC 802401DC F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8D5FE0 802401E0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8D5FE4 802401E4 8E710148 */ lw $s1, 0x148($s3) -/* 8D5FE8 802401E8 00A0902D */ daddu $s2, $a1, $zero -/* 8D5FEC 802401EC 86240008 */ lh $a0, 8($s1) -/* 8D5FF0 802401F0 0C00EABB */ jal get_npc_unsafe -/* 8D5FF4 802401F4 00C0A82D */ daddu $s5, $a2, $zero -/* 8D5FF8 802401F8 0040802D */ daddu $s0, $v0, $zero -/* 8D5FFC 802401FC 0000A02D */ daddu $s4, $zero, $zero -/* 8D6000 80240200 C624007C */ lwc1 $f4, 0x7c($s1) -/* 8D6004 80240204 46802120 */ cvt.s.w $f4, $f4 -/* 8D6008 80240208 C6220088 */ lwc1 $f2, 0x88($s1) -/* 8D600C 8024020C 468010A0 */ cvt.s.w $f2, $f2 -/* 8D6010 80240210 460010A1 */ cvt.d.s $f2, $f2 -/* 8D6014 80240214 46002121 */ cvt.d.s $f4, $f4 -/* 8D6018 80240218 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D601C 8024021C 3C014059 */ lui $at, 0x4059 -/* 8D6020 80240220 44813800 */ mtc1 $at, $f7 -/* 8D6024 80240224 44803000 */ mtc1 $zero, $f6 -/* 8D6028 80240228 46000021 */ cvt.d.s $f0, $f0 -/* 8D602C 8024022C 46260002 */ mul.d $f0, $f0, $f6 -/* 8D6030 80240230 00000000 */ nop -/* 8D6034 80240234 24020001 */ addiu $v0, $zero, 1 -/* 8D6038 80240238 8E24006C */ lw $a0, 0x6c($s1) -/* 8D603C 8024023C 46261083 */ div.d $f2, $f2, $f6 -/* 8D6040 80240240 462010A0 */ cvt.s.d $f2, $f2 -/* 8D6044 80240244 46262103 */ div.d $f4, $f4, $f6 -/* 8D6048 80240248 46202520 */ cvt.s.d $f20, $f4 -/* 8D604C 8024024C 30830011 */ andi $v1, $a0, 0x11 -/* 8D6050 80240250 4620020D */ trunc.w.d $f8, $f0 -/* 8D6054 80240254 E628007C */ swc1 $f8, 0x7c($s1) -/* 8D6058 80240258 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8D605C 8024025C 46800020 */ cvt.s.w $f0, $f0 -/* 8D6060 80240260 46000021 */ cvt.d.s $f0, $f0 -/* 8D6064 80240264 46260003 */ div.d $f0, $f0, $f6 -/* 8D6068 80240268 462006A0 */ cvt.s.d $f26, $f0 -/* 8D606C 8024026C C6200070 */ lwc1 $f0, 0x70($s1) -/* 8D6070 80240270 46800020 */ cvt.s.w $f0, $f0 -/* 8D6074 80240274 46000021 */ cvt.d.s $f0, $f0 -/* 8D6078 80240278 46260003 */ div.d $f0, $f0, $f6 -/* 8D607C 8024027C 462005A0 */ cvt.s.d $f22, $f0 -/* 8D6080 80240280 14620025 */ bne $v1, $v0, .L80240318 -/* 8D6084 80240284 4602D600 */ add.s $f24, $f26, $f2 -/* 8D6088 80240288 8E020000 */ lw $v0, ($s0) -/* 8D608C 8024028C 30420008 */ andi $v0, $v0, 8 -/* 8D6090 80240290 10400009 */ beqz $v0, .L802402B8 -/* 8D6094 80240294 27A50028 */ addiu $a1, $sp, 0x28 -/* 8D6098 80240298 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D609C 8024029C 4600C001 */ sub.s $f0, $f24, $f0 -/* 8D60A0 802402A0 4600B03C */ c.lt.s $f22, $f0 -/* 8D60A4 802402A4 00000000 */ nop -/* 8D60A8 802402A8 4500001B */ bc1f .L80240318 -/* 8D60AC 802402AC 34820010 */ ori $v0, $a0, 0x10 -/* 8D60B0 802402B0 080900C6 */ j .L80240318 -/* 8D60B4 802402B4 AE22006C */ sw $v0, 0x6c($s1) -.L802402B8: -/* 8D60B8 802402B8 27A6002C */ addiu $a2, $sp, 0x2c -/* 8D60BC 802402BC C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D60C0 802402C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D60C4 802402C4 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8D60C8 802402C8 3C01447A */ lui $at, 0x447a -/* 8D60CC 802402CC 44813000 */ mtc1 $at, $f6 -/* 8D60D0 802402D0 27A20034 */ addiu $v0, $sp, 0x34 -/* 8D60D4 802402D4 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D60D8 802402D8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8D60DC 802402DC E7A40030 */ swc1 $f4, 0x30($sp) -/* 8D60E0 802402E0 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8D60E4 802402E4 AFA20010 */ sw $v0, 0x10($sp) -/* 8D60E8 802402E8 8E040080 */ lw $a0, 0x80($s0) -/* 8D60EC 802402EC 0C0372DF */ jal func_800DCB7C -/* 8D60F0 802402F0 27A70030 */ addiu $a3, $sp, 0x30 -/* 8D60F4 802402F4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 8D60F8 802402F8 4600D001 */ sub.s $f0, $f26, $f0 -/* 8D60FC 802402FC 4600B03C */ c.lt.s $f22, $f0 -/* 8D6100 80240300 00000000 */ nop -/* 8D6104 80240304 45000004 */ bc1f .L80240318 -/* 8D6108 80240308 00000000 */ nop -/* 8D610C 8024030C 8E22006C */ lw $v0, 0x6c($s1) -/* 8D6110 80240310 34420010 */ ori $v0, $v0, 0x10 -/* 8D6114 80240314 AE22006C */ sw $v0, 0x6c($s1) -.L80240318: -/* 8D6118 80240318 8E22006C */ lw $v0, 0x6c($s1) -/* 8D611C 8024031C 24030011 */ addiu $v1, $zero, 0x11 -/* 8D6120 80240320 30420011 */ andi $v0, $v0, 0x11 -/* 8D6124 80240324 14430039 */ bne $v0, $v1, .L8024040C -/* 8D6128 80240328 00000000 */ nop -/* 8D612C 8024032C 8E020000 */ lw $v0, ($s0) -/* 8D6130 80240330 30420008 */ andi $v0, $v0, 8 -/* 8D6134 80240334 1040000A */ beqz $v0, .L80240360 -/* 8D6138 80240338 4600C106 */ mov.s $f4, $f24 -/* 8D613C 8024033C 4614C081 */ sub.s $f2, $f24, $f20 -/* 8D6140 80240340 3C018024 */ lui $at, 0x8024 -/* 8D6144 80240344 D4202678 */ ldc1 $f0, 0x2678($at) -/* 8D6148 80240348 460010A1 */ cvt.d.s $f2, $f2 -/* 8D614C 8024034C 46201082 */ mul.d $f2, $f2, $f0 -/* 8D6150 80240350 00000000 */ nop -/* 8D6154 80240354 4600A021 */ cvt.d.s $f0, $f20 -/* 8D6158 80240358 080900F1 */ j .L802403C4 -/* 8D615C 8024035C 46220000 */ add.d $f0, $f0, $f2 -.L80240360: -/* 8D6160 80240360 27A50028 */ addiu $a1, $sp, 0x28 -/* 8D6164 80240364 27A6002C */ addiu $a2, $sp, 0x2c -/* 8D6168 80240368 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D616C 8024036C C6020040 */ lwc1 $f2, 0x40($s0) -/* 8D6170 80240370 3C01447A */ lui $at, 0x447a -/* 8D6174 80240374 44812000 */ mtc1 $at, $f4 -/* 8D6178 80240378 27A20034 */ addiu $v0, $sp, 0x34 -/* 8D617C 8024037C E7B4002C */ swc1 $f20, 0x2c($sp) -/* 8D6180 80240380 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D6184 80240384 E7A20030 */ swc1 $f2, 0x30($sp) -/* 8D6188 80240388 E7A40034 */ swc1 $f4, 0x34($sp) -/* 8D618C 8024038C AFA20010 */ sw $v0, 0x10($sp) -/* 8D6190 80240390 8E040080 */ lw $a0, 0x80($s0) -/* 8D6194 80240394 0C0372DF */ jal func_800DCB7C -/* 8D6198 80240398 27A70030 */ addiu $a3, $sp, 0x30 -/* 8D619C 8024039C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* 8D61A0 802403A0 461A2100 */ add.s $f4, $f4, $f26 -/* 8D61A4 802403A4 46142081 */ sub.s $f2, $f4, $f20 -/* 8D61A8 802403A8 3C018024 */ lui $at, 0x8024 -/* 8D61AC 802403AC D4202680 */ ldc1 $f0, 0x2680($at) -/* 8D61B0 802403B0 460010A1 */ cvt.d.s $f2, $f2 -/* 8D61B4 802403B4 46201082 */ mul.d $f2, $f2, $f0 -/* 8D61B8 802403B8 00000000 */ nop -/* 8D61BC 802403BC 4600A021 */ cvt.d.s $f0, $f20 -/* 8D61C0 802403C0 46220000 */ add.d $f0, $f0, $f2 -.L802403C4: -/* 8D61C4 802403C4 46200020 */ cvt.s.d $f0, $f0 -/* 8D61C8 802403C8 E600003C */ swc1 $f0, 0x3c($s0) -/* 8D61CC 802403CC C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D61D0 802403D0 46002001 */ sub.s $f0, $f4, $f0 -/* 8D61D4 802403D4 3C013FF0 */ lui $at, 0x3ff0 -/* 8D61D8 802403D8 44811800 */ mtc1 $at, $f3 -/* 8D61DC 802403DC 44801000 */ mtc1 $zero, $f2 -/* 8D61E0 802403E0 46000005 */ abs.s $f0, $f0 -/* 8D61E4 802403E4 46000021 */ cvt.d.s $f0, $f0 -/* 8D61E8 802403E8 4622003C */ c.lt.d $f0, $f2 -/* 8D61EC 802403EC 00000000 */ nop -/* 8D61F0 802403F0 45000036 */ bc1f .L802404CC -/* 8D61F4 802403F4 2403FFEF */ addiu $v1, $zero, -0x11 -/* 8D61F8 802403F8 E604003C */ swc1 $f4, 0x3c($s0) -/* 8D61FC 802403FC 8E22006C */ lw $v0, 0x6c($s1) -/* 8D6200 80240400 00431024 */ and $v0, $v0, $v1 -/* 8D6204 80240404 08090133 */ j .L802404CC -/* 8D6208 80240408 AE22006C */ sw $v0, 0x6c($s1) -.L8024040C: -/* 8D620C 8024040C 8E220070 */ lw $v0, 0x70($s1) -/* 8D6210 80240410 1840002E */ blez $v0, .L802404CC -/* 8D6214 80240414 00000000 */ nop -/* 8D6218 80240418 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 8D621C 8024041C 0C00A8BB */ jal sin_deg -/* 8D6220 80240420 46806320 */ cvt.s.w $f12, $f12 -/* 8D6224 80240424 8E020000 */ lw $v0, ($s0) -/* 8D6228 80240428 30420008 */ andi $v0, $v0, 8 -/* 8D622C 8024042C 10400003 */ beqz $v0, .L8024043C -/* 8D6230 80240430 46000506 */ mov.s $f20, $f0 -/* 8D6234 80240434 0809011F */ j .L8024047C -/* 8D6238 80240438 0000102D */ daddu $v0, $zero, $zero -.L8024043C: -/* 8D623C 8024043C 27A50028 */ addiu $a1, $sp, 0x28 -/* 8D6240 80240440 27A6002C */ addiu $a2, $sp, 0x2c -/* 8D6244 80240444 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D6248 80240448 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D624C 8024044C C6040040 */ lwc1 $f4, 0x40($s0) -/* 8D6250 80240450 3C01447A */ lui $at, 0x447a -/* 8D6254 80240454 44813000 */ mtc1 $at, $f6 -/* 8D6258 80240458 27A20034 */ addiu $v0, $sp, 0x34 -/* 8D625C 8024045C E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D6260 80240460 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8D6264 80240464 E7A40030 */ swc1 $f4, 0x30($sp) -/* 8D6268 80240468 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8D626C 8024046C AFA20010 */ sw $v0, 0x10($sp) -/* 8D6270 80240470 8E040080 */ lw $a0, 0x80($s0) -/* 8D6274 80240474 0C0372DF */ jal func_800DCB7C -/* 8D6278 80240478 27A70030 */ addiu $a3, $sp, 0x30 -.L8024047C: -/* 8D627C 8024047C 10400007 */ beqz $v0, .L8024049C -/* 8D6280 80240480 00000000 */ nop -/* 8D6284 80240484 4616A082 */ mul.s $f2, $f20, $f22 -/* 8D6288 80240488 00000000 */ nop -/* 8D628C 8024048C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 8D6290 80240490 461A0000 */ add.s $f0, $f0, $f26 -/* 8D6294 80240494 0809012A */ j .L802404A8 -/* 8D6298 80240498 46020000 */ add.s $f0, $f0, $f2 -.L8024049C: -/* 8D629C 8024049C 4616A002 */ mul.s $f0, $f20, $f22 -/* 8D62A0 802404A0 00000000 */ nop -/* 8D62A4 802404A4 4600C000 */ add.s $f0, $f24, $f0 -.L802404A8: -/* 8D62A8 802404A8 E600003C */ swc1 $f0, 0x3c($s0) -/* 8D62AC 802404AC 8E220074 */ lw $v0, 0x74($s1) -/* 8D62B0 802404B0 2442000A */ addiu $v0, $v0, 0xa -/* 8D62B4 802404B4 44826000 */ mtc1 $v0, $f12 -/* 8D62B8 802404B8 00000000 */ nop -/* 8D62BC 802404BC 0C00A6C9 */ jal clamp_angle -/* 8D62C0 802404C0 46806320 */ cvt.s.w $f12, $f12 -/* 8D62C4 802404C4 4600020D */ trunc.w.s $f8, $f0 -/* 8D62C8 802404C8 E6280074 */ swc1 $f8, 0x74($s1) -.L802404CC: -/* 8D62CC 802404CC 8E220090 */ lw $v0, 0x90($s1) -/* 8D62D0 802404D0 1C40004A */ bgtz $v0, .L802405FC -/* 8D62D4 802404D4 2442FFFF */ addiu $v0, $v0, -1 -/* 8D62D8 802404D8 8E430014 */ lw $v1, 0x14($s2) -/* 8D62DC 802404DC 04600048 */ bltz $v1, .L80240600 -/* 8D62E0 802404E0 00000000 */ nop -/* 8D62E4 802404E4 8E620074 */ lw $v0, 0x74($s3) -/* 8D62E8 802404E8 1C400042 */ bgtz $v0, .L802405F4 -/* 8D62EC 802404EC 2442FFFF */ addiu $v0, $v0, -1 -/* 8D62F0 802404F0 AE630074 */ sw $v1, 0x74($s3) -/* 8D62F4 802404F4 860200A8 */ lh $v0, 0xa8($s0) -/* 8D62F8 802404F8 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D62FC 802404FC 44820000 */ mtc1 $v0, $f0 -/* 8D6300 80240500 00000000 */ nop -/* 8D6304 80240504 46800020 */ cvt.s.w $f0, $f0 -/* 8D6308 80240508 46001080 */ add.s $f2, $f2, $f0 -/* 8D630C 8024050C 3C014024 */ lui $at, 0x4024 -/* 8D6310 80240510 44810800 */ mtc1 $at, $f1 -/* 8D6314 80240514 44800000 */ mtc1 $zero, $f0 -/* 8D6318 80240518 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D631C 8024051C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D6320 80240520 460010A1 */ cvt.d.s $f2, $f2 -/* 8D6324 80240524 46201080 */ add.d $f2, $f2, $f0 -/* 8D6328 80240528 C440002C */ lwc1 $f0, 0x2c($v0) -/* 8D632C 8024052C 46000021 */ cvt.d.s $f0, $f0 -/* 8D6330 80240530 4622003C */ c.lt.d $f0, $f2 -/* 8D6334 80240534 00000000 */ nop -/* 8D6338 80240538 4500002C */ bc1f .L802405EC -/* 8D633C 8024053C 02A0202D */ daddu $a0, $s5, $zero -/* 8D6340 80240540 AFA00010 */ sw $zero, 0x10($sp) -/* 8D6344 80240544 8E46000C */ lw $a2, 0xc($s2) -/* 8D6348 80240548 8E470010 */ lw $a3, 0x10($s2) -/* 8D634C 8024054C 0C01242D */ jal func_800490B4 -/* 8D6350 80240550 0220282D */ daddu $a1, $s1, $zero -/* 8D6354 80240554 10400025 */ beqz $v0, .L802405EC -/* 8D6358 80240558 0000202D */ daddu $a0, $zero, $zero -/* 8D635C 8024055C 0200282D */ daddu $a1, $s0, $zero -/* 8D6360 80240560 0000302D */ daddu $a2, $zero, $zero -/* 8D6364 80240564 2412000C */ addiu $s2, $zero, 0xc -/* 8D6368 80240568 860300A8 */ lh $v1, 0xa8($s0) -/* 8D636C 8024056C 3C013F80 */ lui $at, 0x3f80 -/* 8D6370 80240570 44810000 */ mtc1 $at, $f0 -/* 8D6374 80240574 3C014000 */ lui $at, 0x4000 -/* 8D6378 80240578 44811000 */ mtc1 $at, $f2 -/* 8D637C 8024057C 3C01C1A0 */ lui $at, 0xc1a0 -/* 8D6380 80240580 44812000 */ mtc1 $at, $f4 -/* 8D6384 80240584 44834000 */ mtc1 $v1, $f8 -/* 8D6388 80240588 00000000 */ nop -/* 8D638C 8024058C 46804220 */ cvt.s.w $f8, $f8 -/* 8D6390 80240590 44074000 */ mfc1 $a3, $f8 -/* 8D6394 80240594 27A20038 */ addiu $v0, $sp, 0x38 -/* 8D6398 80240598 AFB2001C */ sw $s2, 0x1c($sp) -/* 8D639C 8024059C AFA20020 */ sw $v0, 0x20($sp) -/* 8D63A0 802405A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D63A4 802405A4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8D63A8 802405A8 0C01BFA4 */ jal fx_emote -/* 8D63AC 802405AC E7A40018 */ swc1 $f4, 0x18($sp) -/* 8D63B0 802405B0 0200202D */ daddu $a0, $s0, $zero -/* 8D63B4 802405B4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8D63B8 802405B8 C480003C */ lwc1 $f0, 0x3c($a0) -/* 8D63BC 802405BC 3C060020 */ lui $a2, 0x20 -/* 8D63C0 802405C0 0C012530 */ jal func_800494C0 -/* 8D63C4 802405C4 E4800064 */ swc1 $f0, 0x64($a0) -/* 8D63C8 802405C8 8E220018 */ lw $v0, 0x18($s1) -/* 8D63CC 802405CC 9442002A */ lhu $v0, 0x2a($v0) -/* 8D63D0 802405D0 30420001 */ andi $v0, $v0, 1 -/* 8D63D4 802405D4 10400003 */ beqz $v0, .L802405E4 -/* 8D63D8 802405D8 2402000A */ addiu $v0, $zero, 0xa -/* 8D63DC 802405DC 080901E9 */ j .L802407A4 -/* 8D63E0 802405E0 AE620070 */ sw $v0, 0x70($s3) -.L802405E4: -/* 8D63E4 802405E4 080901E9 */ j .L802407A4 -/* 8D63E8 802405E8 AE720070 */ sw $s2, 0x70($s3) -.L802405EC: -/* 8D63EC 802405EC 8E620074 */ lw $v0, 0x74($s3) -/* 8D63F0 802405F0 2442FFFF */ addiu $v0, $v0, -1 -.L802405F4: -/* 8D63F4 802405F4 08090180 */ j .L80240600 -/* 8D63F8 802405F8 AE620074 */ sw $v0, 0x74($s3) -.L802405FC: -/* 8D63FC 802405FC AE220090 */ sw $v0, 0x90($s1) -.L80240600: -/* 8D6400 80240600 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8D6404 80240604 C6000040 */ lwc1 $f0, 0x40($s0) -/* 8D6408 80240608 C4620000 */ lwc1 $f2, ($v1) -/* 8D640C 8024060C 468010A0 */ cvt.s.w $f2, $f2 -/* 8D6410 80240610 C4640008 */ lwc1 $f4, 8($v1) -/* 8D6414 80240614 46802120 */ cvt.s.w $f4, $f4 -/* 8D6418 80240618 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D641C 8024061C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D6420 80240620 44051000 */ mfc1 $a1, $f2 -/* 8D6424 80240624 C440000C */ lwc1 $f0, 0xc($v0) -/* 8D6428 80240628 46800020 */ cvt.s.w $f0, $f0 -/* 8D642C 8024062C E7A00014 */ swc1 $f0, 0x14($sp) -/* 8D6430 80240630 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D6434 80240634 44062000 */ mfc1 $a2, $f4 -/* 8D6438 80240638 C4400010 */ lwc1 $f0, 0x10($v0) -/* 8D643C 8024063C 46800020 */ cvt.s.w $f0, $f0 -/* 8D6440 80240640 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D6444 80240644 8C640018 */ lw $a0, 0x18($v1) -/* 8D6448 80240648 0C0123F5 */ jal is_point_within_region -/* 8D644C 8024064C 8E070038 */ lw $a3, 0x38($s0) -/* 8D6450 80240650 1040001A */ beqz $v0, .L802406BC -/* 8D6454 80240654 00000000 */ nop -/* 8D6458 80240658 8E060038 */ lw $a2, 0x38($s0) -/* 8D645C 8024065C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D6460 80240660 8E070040 */ lw $a3, 0x40($s0) -/* 8D6464 80240664 C44C0000 */ lwc1 $f12, ($v0) -/* 8D6468 80240668 46806320 */ cvt.s.w $f12, $f12 -/* 8D646C 8024066C C44E0008 */ lwc1 $f14, 8($v0) -/* 8D6470 80240670 0C00A7B5 */ jal dist2D -/* 8D6474 80240674 468073A0 */ cvt.s.w $f14, $f14 -/* 8D6478 80240678 C6020018 */ lwc1 $f2, 0x18($s0) -/* 8D647C 8024067C 4600103C */ c.lt.s $f2, $f0 -/* 8D6480 80240680 00000000 */ nop -/* 8D6484 80240684 4500000D */ bc1f .L802406BC -/* 8D6488 80240688 E7A00034 */ swc1 $f0, 0x34($sp) -/* 8D648C 8024068C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D6490 80240690 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D6494 80240694 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D6498 80240698 C4480000 */ lwc1 $f8, ($v0) -/* 8D649C 8024069C 46804220 */ cvt.s.w $f8, $f8 -/* 8D64A0 802406A0 44064000 */ mfc1 $a2, $f8 -/* 8D64A4 802406A4 C4480008 */ lwc1 $f8, 8($v0) -/* 8D64A8 802406A8 46804220 */ cvt.s.w $f8, $f8 -/* 8D64AC 802406AC 44074000 */ mfc1 $a3, $f8 -/* 8D64B0 802406B0 0C00A720 */ jal atan2 -/* 8D64B4 802406B4 24140001 */ addiu $s4, $zero, 1 -/* 8D64B8 802406B8 E600000C */ swc1 $f0, 0xc($s0) -.L802406BC: -/* 8D64BC 802406BC 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D64C0 802406C0 8C43000C */ lw $v1, 0xc($v0) -/* 8D64C4 802406C4 8C420010 */ lw $v0, 0x10($v0) -/* 8D64C8 802406C8 00621825 */ or $v1, $v1, $v0 -/* 8D64CC 802406CC 00741825 */ or $v1, $v1, $s4 -/* 8D64D0 802406D0 10600008 */ beqz $v1, .L802406F4 -/* 8D64D4 802406D4 00000000 */ nop -/* 8D64D8 802406D8 8602008C */ lh $v0, 0x8c($s0) -/* 8D64DC 802406DC 14400031 */ bnez $v0, .L802407A4 -/* 8D64E0 802406E0 00000000 */ nop -/* 8D64E4 802406E4 8E050018 */ lw $a1, 0x18($s0) -/* 8D64E8 802406E8 8E06000C */ lw $a2, 0xc($s0) -/* 8D64EC 802406EC 0C00EA95 */ jal npc_move_heading -/* 8D64F0 802406F0 0200202D */ daddu $a0, $s0, $zero -.L802406F4: -/* 8D64F4 802406F4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D64F8 802406F8 3C014059 */ lui $at, 0x4059 -/* 8D64FC 802406FC 44811800 */ mtc1 $at, $f3 -/* 8D6500 80240700 44801000 */ mtc1 $zero, $f2 -/* 8D6504 80240704 46000021 */ cvt.d.s $f0, $f0 -/* 8D6508 80240708 46220002 */ mul.d $f0, $f0, $f2 -/* 8D650C 8024070C 00000000 */ nop -/* 8D6510 80240710 4620020D */ trunc.w.d $f8, $f0 -/* 8D6514 80240714 E628007C */ swc1 $f8, 0x7c($s1) -/* 8D6518 80240718 8E420004 */ lw $v0, 4($s2) -/* 8D651C 8024071C 18400021 */ blez $v0, .L802407A4 -/* 8D6520 80240720 00000000 */ nop -/* 8D6524 80240724 8602008E */ lh $v0, 0x8e($s0) -/* 8D6528 80240728 9603008E */ lhu $v1, 0x8e($s0) -/* 8D652C 8024072C 18400005 */ blez $v0, .L80240744 -/* 8D6530 80240730 2462FFFF */ addiu $v0, $v1, -1 -/* 8D6534 80240734 A602008E */ sh $v0, 0x8e($s0) -/* 8D6538 80240738 00021400 */ sll $v0, $v0, 0x10 -/* 8D653C 8024073C 1C400019 */ bgtz $v0, .L802407A4 -/* 8D6540 80240740 00000000 */ nop -.L80240744: -/* 8D6544 80240744 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 8D6548 80240748 24020002 */ addiu $v0, $zero, 2 -/* 8D654C 8024074C 0C00A67F */ jal rand_int -/* 8D6550 80240750 AE620070 */ sw $v0, 0x70($s3) -/* 8D6554 80240754 3C035555 */ lui $v1, 0x5555 -/* 8D6558 80240758 34635556 */ ori $v1, $v1, 0x5556 -/* 8D655C 8024075C 00430018 */ mult $v0, $v1 -/* 8D6560 80240760 000227C3 */ sra $a0, $v0, 0x1f -/* 8D6564 80240764 00004010 */ mfhi $t0 -/* 8D6568 80240768 01042023 */ subu $a0, $t0, $a0 -/* 8D656C 8024076C 00041840 */ sll $v1, $a0, 1 -/* 8D6570 80240770 00641821 */ addu $v1, $v1, $a0 -/* 8D6574 80240774 00431023 */ subu $v0, $v0, $v1 -/* 8D6578 80240778 24430002 */ addiu $v1, $v0, 2 -/* 8D657C 8024077C AE630074 */ sw $v1, 0x74($s3) -/* 8D6580 80240780 8E42002C */ lw $v0, 0x2c($s2) -/* 8D6584 80240784 58400007 */ blezl $v0, .L802407A4 -/* 8D6588 80240788 AE600070 */ sw $zero, 0x70($s3) -/* 8D658C 8024078C 8E420008 */ lw $v0, 8($s2) -/* 8D6590 80240790 18400003 */ blez $v0, .L802407A0 -/* 8D6594 80240794 28620003 */ slti $v0, $v1, 3 -/* 8D6598 80240798 10400002 */ beqz $v0, .L802407A4 -/* 8D659C 8024079C 00000000 */ nop -.L802407A0: -/* 8D65A0 802407A0 AE600070 */ sw $zero, 0x70($s3) -.L802407A4: -/* 8D65A4 802407A4 8FBF0058 */ lw $ra, 0x58($sp) -/* 8D65A8 802407A8 8FB50054 */ lw $s5, 0x54($sp) -/* 8D65AC 802407AC 8FB40050 */ lw $s4, 0x50($sp) -/* 8D65B0 802407B0 8FB3004C */ lw $s3, 0x4c($sp) -/* 8D65B4 802407B4 8FB20048 */ lw $s2, 0x48($sp) -/* 8D65B8 802407B8 8FB10044 */ lw $s1, 0x44($sp) -/* 8D65BC 802407BC 8FB00040 */ lw $s0, 0x40($sp) -/* 8D65C0 802407C0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 8D65C4 802407C4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 8D65C8 802407C8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 8D65CC 802407CC D7B40060 */ ldc1 $f20, 0x60($sp) -/* 8D65D0 802407D0 03E00008 */ jr $ra -/* 8D65D4 802407D4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/func_802407D8_8D5E00.s b/asm/nonmatchings/world/area_kmr/kmr_09/func_802407D8_8D5E00.s deleted file mode 100644 index 1caf4f429d..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/func_802407D8_8D5E00.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D8_8D65D8 -/* 8D65D8 802407D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8D65DC 802407DC AFB3001C */ sw $s3, 0x1c($sp) -/* 8D65E0 802407E0 0080982D */ daddu $s3, $a0, $zero -/* 8D65E4 802407E4 AFBF0020 */ sw $ra, 0x20($sp) -/* 8D65E8 802407E8 AFB20018 */ sw $s2, 0x18($sp) -/* 8D65EC 802407EC AFB10014 */ sw $s1, 0x14($sp) -/* 8D65F0 802407F0 AFB00010 */ sw $s0, 0x10($sp) -/* 8D65F4 802407F4 8E720148 */ lw $s2, 0x148($s3) -/* 8D65F8 802407F8 86440008 */ lh $a0, 8($s2) -/* 8D65FC 802407FC 0C00EABB */ jal get_npc_unsafe -/* 8D6600 80240800 00A0882D */ daddu $s1, $a1, $zero -/* 8D6604 80240804 8E240008 */ lw $a0, 8($s1) -/* 8D6608 80240808 0040802D */ daddu $s0, $v0, $zero -/* 8D660C 8024080C 00041FC2 */ srl $v1, $a0, 0x1f -/* 8D6610 80240810 00832021 */ addu $a0, $a0, $v1 -/* 8D6614 80240814 00042043 */ sra $a0, $a0, 1 -/* 8D6618 80240818 0C00A67F */ jal rand_int -/* 8D661C 8024081C 24840001 */ addiu $a0, $a0, 1 -/* 8D6620 80240820 8E230008 */ lw $v1, 8($s1) -/* 8D6624 80240824 240400B4 */ addiu $a0, $zero, 0xb4 -/* 8D6628 80240828 00032FC2 */ srl $a1, $v1, 0x1f -/* 8D662C 8024082C 00651821 */ addu $v1, $v1, $a1 -/* 8D6630 80240830 00031843 */ sra $v1, $v1, 1 -/* 8D6634 80240834 00621821 */ addu $v1, $v1, $v0 -/* 8D6638 80240838 0C00A67F */ jal rand_int -/* 8D663C 8024083C A603008E */ sh $v1, 0x8e($s0) -/* 8D6640 80240840 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8D6644 80240844 44820000 */ mtc1 $v0, $f0 -/* 8D6648 80240848 00000000 */ nop -/* 8D664C 8024084C 46800020 */ cvt.s.w $f0, $f0 -/* 8D6650 80240850 46006300 */ add.s $f12, $f12, $f0 -/* 8D6654 80240854 3C0142B4 */ lui $at, 0x42b4 -/* 8D6658 80240858 44810000 */ mtc1 $at, $f0 -/* 8D665C 8024085C 0C00A6C9 */ jal clamp_angle -/* 8D6660 80240860 46006301 */ sub.s $f12, $f12, $f0 -/* 8D6664 80240864 E600000C */ swc1 $f0, 0xc($s0) -/* 8D6668 80240868 8E4200CC */ lw $v0, 0xcc($s2) -/* 8D666C 8024086C 8C420000 */ lw $v0, ($v0) -/* 8D6670 80240870 AE020028 */ sw $v0, 0x28($s0) -/* 8D6674 80240874 24020003 */ addiu $v0, $zero, 3 -/* 8D6678 80240878 AE620070 */ sw $v0, 0x70($s3) -/* 8D667C 8024087C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D6680 80240880 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D6684 80240884 8FB20018 */ lw $s2, 0x18($sp) -/* 8D6688 80240888 8FB10014 */ lw $s1, 0x14($sp) -/* 8D668C 8024088C 8FB00010 */ lw $s0, 0x10($sp) -/* 8D6690 80240890 03E00008 */ jr $ra -/* 8D6694 80240894 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/func_80240898_8D5E00.s b/asm/nonmatchings/world/area_kmr/kmr_09/func_80240898_8D5E00.s deleted file mode 100644 index c98f9fd9bb..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/func_80240898_8D5E00.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240898_8D6698 -/* 8D6698 80240898 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 8D669C 8024089C AFB3004C */ sw $s3, 0x4c($sp) -/* 8D66A0 802408A0 0080982D */ daddu $s3, $a0, $zero -/* 8D66A4 802408A4 AFBF0054 */ sw $ra, 0x54($sp) -/* 8D66A8 802408A8 AFB40050 */ sw $s4, 0x50($sp) -/* 8D66AC 802408AC AFB20048 */ sw $s2, 0x48($sp) -/* 8D66B0 802408B0 AFB10044 */ sw $s1, 0x44($sp) -/* 8D66B4 802408B4 AFB00040 */ sw $s0, 0x40($sp) -/* 8D66B8 802408B8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* 8D66BC 802408BC F7B80068 */ sdc1 $f24, 0x68($sp) -/* 8D66C0 802408C0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* 8D66C4 802408C4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 8D66C8 802408C8 8E710148 */ lw $s1, 0x148($s3) -/* 8D66CC 802408CC 00A0902D */ daddu $s2, $a1, $zero -/* 8D66D0 802408D0 86240008 */ lh $a0, 8($s1) -/* 8D66D4 802408D4 0C00EABB */ jal get_npc_unsafe -/* 8D66D8 802408D8 00C0A02D */ daddu $s4, $a2, $zero -/* 8D66DC 802408DC 0040802D */ daddu $s0, $v0, $zero -/* 8D66E0 802408E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8D66E4 802408E4 46800020 */ cvt.s.w $f0, $f0 -/* 8D66E8 802408E8 46000021 */ cvt.d.s $f0, $f0 -/* 8D66EC 802408EC 3C014059 */ lui $at, 0x4059 -/* 8D66F0 802408F0 44811800 */ mtc1 $at, $f3 -/* 8D66F4 802408F4 44801000 */ mtc1 $zero, $f2 -/* 8D66F8 802408F8 8602008E */ lh $v0, 0x8e($s0) -/* 8D66FC 802408FC 9603008E */ lhu $v1, 0x8e($s0) -/* 8D6700 80240900 46220003 */ div.d $f0, $f0, $f2 -/* 8D6704 80240904 46200620 */ cvt.s.d $f24, $f0 -/* 8D6708 80240908 C6200088 */ lwc1 $f0, 0x88($s1) -/* 8D670C 8024090C 46800020 */ cvt.s.w $f0, $f0 -/* 8D6710 80240910 46000021 */ cvt.d.s $f0, $f0 -/* 8D6714 80240914 46220003 */ div.d $f0, $f0, $f2 -/* 8D6718 80240918 46200020 */ cvt.s.d $f0, $f0 -/* 8D671C 8024091C 18400003 */ blez $v0, .L8024092C -/* 8D6720 80240920 4600C680 */ add.s $f26, $f24, $f0 -/* 8D6724 80240924 2462FFFF */ addiu $v0, $v1, -1 -/* 8D6728 80240928 A602008E */ sh $v0, 0x8e($s0) -.L8024092C: -/* 8D672C 8024092C 8E220070 */ lw $v0, 0x70($s1) -/* 8D6730 80240930 18400034 */ blez $v0, .L80240A04 -/* 8D6734 80240934 00000000 */ nop -/* 8D6738 80240938 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 8D673C 8024093C 46806320 */ cvt.s.w $f12, $f12 -/* 8D6740 80240940 44820000 */ mtc1 $v0, $f0 -/* 8D6744 80240944 00000000 */ nop -/* 8D6748 80240948 46800020 */ cvt.s.w $f0, $f0 -/* 8D674C 8024094C 46000021 */ cvt.d.s $f0, $f0 -/* 8D6750 80240950 46220003 */ div.d $f0, $f0, $f2 -/* 8D6754 80240954 0C00A8BB */ jal sin_deg -/* 8D6758 80240958 462005A0 */ cvt.s.d $f22, $f0 -/* 8D675C 8024095C 8E020000 */ lw $v0, ($s0) -/* 8D6760 80240960 30420008 */ andi $v0, $v0, 8 -/* 8D6764 80240964 10400003 */ beqz $v0, .L80240974 -/* 8D6768 80240968 46000506 */ mov.s $f20, $f0 -/* 8D676C 8024096C 0809026D */ j .L802409B4 -/* 8D6770 80240970 0000102D */ daddu $v0, $zero, $zero -.L80240974: -/* 8D6774 80240974 27A50028 */ addiu $a1, $sp, 0x28 -/* 8D6778 80240978 27A6002C */ addiu $a2, $sp, 0x2c -/* 8D677C 8024097C C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D6780 80240980 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D6784 80240984 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8D6788 80240988 3C01447A */ lui $at, 0x447a -/* 8D678C 8024098C 44813000 */ mtc1 $at, $f6 -/* 8D6790 80240990 27A20034 */ addiu $v0, $sp, 0x34 -/* 8D6794 80240994 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D6798 80240998 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8D679C 8024099C E7A40030 */ swc1 $f4, 0x30($sp) -/* 8D67A0 802409A0 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8D67A4 802409A4 AFA20010 */ sw $v0, 0x10($sp) -/* 8D67A8 802409A8 8E040080 */ lw $a0, 0x80($s0) -/* 8D67AC 802409AC 0C0372DF */ jal func_800DCB7C -/* 8D67B0 802409B0 27A70030 */ addiu $a3, $sp, 0x30 -.L802409B4: -/* 8D67B4 802409B4 10400007 */ beqz $v0, .L802409D4 -/* 8D67B8 802409B8 00000000 */ nop -/* 8D67BC 802409BC 4616A082 */ mul.s $f2, $f20, $f22 -/* 8D67C0 802409C0 00000000 */ nop -/* 8D67C4 802409C4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 8D67C8 802409C8 46180000 */ add.s $f0, $f0, $f24 -/* 8D67CC 802409CC 08090278 */ j .L802409E0 -/* 8D67D0 802409D0 46020000 */ add.s $f0, $f0, $f2 -.L802409D4: -/* 8D67D4 802409D4 4616A002 */ mul.s $f0, $f20, $f22 -/* 8D67D8 802409D8 00000000 */ nop -/* 8D67DC 802409DC 4600D000 */ add.s $f0, $f26, $f0 -.L802409E0: -/* 8D67E0 802409E0 E600003C */ swc1 $f0, 0x3c($s0) -/* 8D67E4 802409E4 8E220074 */ lw $v0, 0x74($s1) -/* 8D67E8 802409E8 2442000A */ addiu $v0, $v0, 0xa -/* 8D67EC 802409EC 44826000 */ mtc1 $v0, $f12 -/* 8D67F0 802409F0 00000000 */ nop -/* 8D67F4 802409F4 0C00A6C9 */ jal clamp_angle -/* 8D67F8 802409F8 46806320 */ cvt.s.w $f12, $f12 -/* 8D67FC 802409FC 4600020D */ trunc.w.s $f8, $f0 -/* 8D6800 80240A00 E6280074 */ swc1 $f8, 0x74($s1) -.L80240A04: -/* 8D6804 80240A04 8E220090 */ lw $v0, 0x90($s1) -/* 8D6808 80240A08 1C400040 */ bgtz $v0, .L80240B0C -/* 8D680C 80240A0C 2442FFFF */ addiu $v0, $v0, -1 -/* 8D6810 80240A10 860200A8 */ lh $v0, 0xa8($s0) -/* 8D6814 80240A14 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D6818 80240A18 44821000 */ mtc1 $v0, $f2 -/* 8D681C 80240A1C 00000000 */ nop -/* 8D6820 80240A20 468010A0 */ cvt.s.w $f2, $f2 -/* 8D6824 80240A24 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D6828 80240A28 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D682C 80240A2C 46020000 */ add.s $f0, $f0, $f2 -/* 8D6830 80240A30 3C014024 */ lui $at, 0x4024 -/* 8D6834 80240A34 44812800 */ mtc1 $at, $f5 -/* 8D6838 80240A38 44802000 */ mtc1 $zero, $f4 -/* 8D683C 80240A3C C442002C */ lwc1 $f2, 0x2c($v0) -/* 8D6840 80240A40 46000021 */ cvt.d.s $f0, $f0 -/* 8D6844 80240A44 46240000 */ add.d $f0, $f0, $f4 -/* 8D6848 80240A48 460010A1 */ cvt.d.s $f2, $f2 -/* 8D684C 80240A4C 4620103C */ c.lt.d $f2, $f0 -/* 8D6850 80240A50 00000000 */ nop -/* 8D6854 80240A54 4500002E */ bc1f .L80240B10 -/* 8D6858 80240A58 0280202D */ daddu $a0, $s4, $zero -/* 8D685C 80240A5C 24020001 */ addiu $v0, $zero, 1 -/* 8D6860 80240A60 AFA20010 */ sw $v0, 0x10($sp) -/* 8D6864 80240A64 8E460024 */ lw $a2, 0x24($s2) -/* 8D6868 80240A68 8E470028 */ lw $a3, 0x28($s2) -/* 8D686C 80240A6C 0C01242D */ jal func_800490B4 -/* 8D6870 80240A70 0220282D */ daddu $a1, $s1, $zero -/* 8D6874 80240A74 10400026 */ beqz $v0, .L80240B10 -/* 8D6878 80240A78 0000202D */ daddu $a0, $zero, $zero -/* 8D687C 80240A7C 0200282D */ daddu $a1, $s0, $zero -/* 8D6880 80240A80 0000302D */ daddu $a2, $zero, $zero -/* 8D6884 80240A84 2412000C */ addiu $s2, $zero, 0xc -/* 8D6888 80240A88 860300A8 */ lh $v1, 0xa8($s0) -/* 8D688C 80240A8C 3C013F80 */ lui $at, 0x3f80 -/* 8D6890 80240A90 44810000 */ mtc1 $at, $f0 -/* 8D6894 80240A94 3C014000 */ lui $at, 0x4000 -/* 8D6898 80240A98 44811000 */ mtc1 $at, $f2 -/* 8D689C 80240A9C 3C01C1A0 */ lui $at, 0xc1a0 -/* 8D68A0 80240AA0 44812000 */ mtc1 $at, $f4 -/* 8D68A4 80240AA4 44834000 */ mtc1 $v1, $f8 -/* 8D68A8 80240AA8 00000000 */ nop -/* 8D68AC 80240AAC 46804220 */ cvt.s.w $f8, $f8 -/* 8D68B0 80240AB0 44074000 */ mfc1 $a3, $f8 -/* 8D68B4 80240AB4 27A20038 */ addiu $v0, $sp, 0x38 -/* 8D68B8 80240AB8 AFB2001C */ sw $s2, 0x1c($sp) -/* 8D68BC 80240ABC AFA20020 */ sw $v0, 0x20($sp) -/* 8D68C0 80240AC0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D68C4 80240AC4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8D68C8 80240AC8 0C01BFA4 */ jal fx_emote -/* 8D68CC 80240ACC E7A40018 */ swc1 $f4, 0x18($sp) -/* 8D68D0 80240AD0 0200202D */ daddu $a0, $s0, $zero -/* 8D68D4 80240AD4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8D68D8 80240AD8 C480003C */ lwc1 $f0, 0x3c($a0) -/* 8D68DC 80240ADC 3C060020 */ lui $a2, 0x20 -/* 8D68E0 80240AE0 0C012530 */ jal func_800494C0 -/* 8D68E4 80240AE4 E4800064 */ swc1 $f0, 0x64($a0) -/* 8D68E8 80240AE8 8E220018 */ lw $v0, 0x18($s1) -/* 8D68EC 80240AEC 9442002A */ lhu $v0, 0x2a($v0) -/* 8D68F0 80240AF0 30420001 */ andi $v0, $v0, 1 -/* 8D68F4 80240AF4 10400003 */ beqz $v0, .L80240B04 -/* 8D68F8 80240AF8 2402000A */ addiu $v0, $zero, 0xa -/* 8D68FC 80240AFC 080902EB */ j .L80240BAC -/* 8D6900 80240B00 AE620070 */ sw $v0, 0x70($s3) -.L80240B04: -/* 8D6904 80240B04 080902EB */ j .L80240BAC -/* 8D6908 80240B08 AE720070 */ sw $s2, 0x70($s3) -.L80240B0C: -/* 8D690C 80240B0C AE220090 */ sw $v0, 0x90($s1) -.L80240B10: -/* 8D6910 80240B10 8602008C */ lh $v0, 0x8c($s0) -/* 8D6914 80240B14 14400025 */ bnez $v0, .L80240BAC -/* 8D6918 80240B18 00000000 */ nop -/* 8D691C 80240B1C 8602008E */ lh $v0, 0x8e($s0) -/* 8D6920 80240B20 1C400022 */ bgtz $v0, .L80240BAC -/* 8D6924 80240B24 00000000 */ nop -/* 8D6928 80240B28 8E620074 */ lw $v0, 0x74($s3) -/* 8D692C 80240B2C 2442FFFF */ addiu $v0, $v0, -1 -/* 8D6930 80240B30 1840001D */ blez $v0, .L80240BA8 -/* 8D6934 80240B34 AE620074 */ sw $v0, 0x74($s3) -/* 8D6938 80240B38 8E220018 */ lw $v0, 0x18($s1) -/* 8D693C 80240B3C 9442002A */ lhu $v0, 0x2a($v0) -/* 8D6940 80240B40 30420010 */ andi $v0, $v0, 0x10 -/* 8D6944 80240B44 14400007 */ bnez $v0, .L80240B64 -/* 8D6948 80240B48 00000000 */ nop -/* 8D694C 80240B4C C600000C */ lwc1 $f0, 0xc($s0) -/* 8D6950 80240B50 3C014334 */ lui $at, 0x4334 -/* 8D6954 80240B54 44816000 */ mtc1 $at, $f12 -/* 8D6958 80240B58 0C00A6C9 */ jal clamp_angle -/* 8D695C 80240B5C 460C0300 */ add.s $f12, $f0, $f12 -/* 8D6960 80240B60 E600000C */ swc1 $f0, 0xc($s0) -.L80240B64: -/* 8D6964 80240B64 0C00A67F */ jal rand_int -/* 8D6968 80240B68 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 8D696C 80240B6C 3C032E8B */ lui $v1, 0x2e8b -/* 8D6970 80240B70 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 8D6974 80240B74 00430018 */ mult $v0, $v1 -/* 8D6978 80240B78 00021FC3 */ sra $v1, $v0, 0x1f -/* 8D697C 80240B7C 00004010 */ mfhi $t0 -/* 8D6980 80240B80 00082043 */ sra $a0, $t0, 1 -/* 8D6984 80240B84 00832023 */ subu $a0, $a0, $v1 -/* 8D6988 80240B88 00041840 */ sll $v1, $a0, 1 -/* 8D698C 80240B8C 00641821 */ addu $v1, $v1, $a0 -/* 8D6990 80240B90 00031880 */ sll $v1, $v1, 2 -/* 8D6994 80240B94 00641823 */ subu $v1, $v1, $a0 -/* 8D6998 80240B98 00431023 */ subu $v0, $v0, $v1 -/* 8D699C 80240B9C 24420005 */ addiu $v0, $v0, 5 -/* 8D69A0 80240BA0 080902EB */ j .L80240BAC -/* 8D69A4 80240BA4 A602008E */ sh $v0, 0x8e($s0) -.L80240BA8: -/* 8D69A8 80240BA8 AE600070 */ sw $zero, 0x70($s3) -.L80240BAC: -/* 8D69AC 80240BAC 8FBF0054 */ lw $ra, 0x54($sp) -/* 8D69B0 80240BB0 8FB40050 */ lw $s4, 0x50($sp) -/* 8D69B4 80240BB4 8FB3004C */ lw $s3, 0x4c($sp) -/* 8D69B8 80240BB8 8FB20048 */ lw $s2, 0x48($sp) -/* 8D69BC 80240BBC 8FB10044 */ lw $s1, 0x44($sp) -/* 8D69C0 80240BC0 8FB00040 */ lw $s0, 0x40($sp) -/* 8D69C4 80240BC4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* 8D69C8 80240BC8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* 8D69CC 80240BCC D7B60060 */ ldc1 $f22, 0x60($sp) -/* 8D69D0 80240BD0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* 8D69D4 80240BD4 03E00008 */ jr $ra -/* 8D69D8 80240BD8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/func_80240BDC_8D5E00.s b/asm/nonmatchings/world/area_kmr/kmr_09/func_80240BDC_8D5E00.s deleted file mode 100644 index 00d7a5ceae..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/func_80240BDC_8D5E00.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BDC_8D69DC -/* 8D69DC 80240BDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8D69E0 80240BE0 AFB20018 */ sw $s2, 0x18($sp) -/* 8D69E4 80240BE4 0080902D */ daddu $s2, $a0, $zero -/* 8D69E8 80240BE8 AFBF001C */ sw $ra, 0x1c($sp) -/* 8D69EC 80240BEC AFB10014 */ sw $s1, 0x14($sp) -/* 8D69F0 80240BF0 AFB00010 */ sw $s0, 0x10($sp) -/* 8D69F4 80240BF4 8E510148 */ lw $s1, 0x148($s2) -/* 8D69F8 80240BF8 0C00EABB */ jal get_npc_unsafe -/* 8D69FC 80240BFC 86240008 */ lh $a0, 8($s1) -/* 8D6A00 80240C00 0040802D */ daddu $s0, $v0, $zero -/* 8D6A04 80240C04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D6A08 80240C08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D6A0C 80240C0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D6A10 80240C10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D6A14 80240C14 A600008E */ sh $zero, 0x8e($s0) -/* 8D6A18 80240C18 8C460028 */ lw $a2, 0x28($v0) -/* 8D6A1C 80240C1C 0C00A720 */ jal atan2 -/* 8D6A20 80240C20 8C470030 */ lw $a3, 0x30($v0) -/* 8D6A24 80240C24 E600000C */ swc1 $f0, 0xc($s0) -/* 8D6A28 80240C28 8E2200CC */ lw $v0, 0xcc($s1) -/* 8D6A2C 80240C2C 8C420020 */ lw $v0, 0x20($v0) -/* 8D6A30 80240C30 AE020028 */ sw $v0, 0x28($s0) -/* 8D6A34 80240C34 2402000B */ addiu $v0, $zero, 0xb -/* 8D6A38 80240C38 AE420070 */ sw $v0, 0x70($s2) -/* 8D6A3C 80240C3C 8FBF001C */ lw $ra, 0x1c($sp) -/* 8D6A40 80240C40 8FB20018 */ lw $s2, 0x18($sp) -/* 8D6A44 80240C44 8FB10014 */ lw $s1, 0x14($sp) -/* 8D6A48 80240C48 8FB00010 */ lw $s0, 0x10($sp) -/* 8D6A4C 80240C4C 03E00008 */ jr $ra -/* 8D6A50 80240C50 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/func_80240C54_8D5E00.s b/asm/nonmatchings/world/area_kmr/kmr_09/func_80240C54_8D5E00.s deleted file mode 100644 index 9a03bbc738..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/func_80240C54_8D5E00.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C54_8D6A54 -/* 8D6A54 80240C54 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D6A58 80240C58 AFB00010 */ sw $s0, 0x10($sp) -/* 8D6A5C 80240C5C 0080802D */ daddu $s0, $a0, $zero -/* 8D6A60 80240C60 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D6A64 80240C64 8E020148 */ lw $v0, 0x148($s0) -/* 8D6A68 80240C68 0C00EABB */ jal get_npc_unsafe -/* 8D6A6C 80240C6C 84440008 */ lh $a0, 8($v0) -/* 8D6A70 80240C70 9443008E */ lhu $v1, 0x8e($v0) -/* 8D6A74 80240C74 C440003C */ lwc1 $f0, 0x3c($v0) -/* 8D6A78 80240C78 24640001 */ addiu $a0, $v1, 1 -/* 8D6A7C 80240C7C 00031C00 */ sll $v1, $v1, 0x10 -/* 8D6A80 80240C80 00031B83 */ sra $v1, $v1, 0xe -/* 8D6A84 80240C84 A444008E */ sh $a0, 0x8e($v0) -/* 8D6A88 80240C88 3C018024 */ lui $at, 0x8024 -/* 8D6A8C 80240C8C 00230821 */ addu $at, $at, $v1 -/* 8D6A90 80240C90 C422186C */ lwc1 $f2, 0x186c($at) -/* 8D6A94 80240C94 8443008E */ lh $v1, 0x8e($v0) -/* 8D6A98 80240C98 46020000 */ add.s $f0, $f0, $f2 -/* 8D6A9C 80240C9C 28630005 */ slti $v1, $v1, 5 -/* 8D6AA0 80240CA0 14600003 */ bnez $v1, .L80240CB0 -/* 8D6AA4 80240CA4 E440003C */ swc1 $f0, 0x3c($v0) -/* 8D6AA8 80240CA8 2402000C */ addiu $v0, $zero, 0xc -/* 8D6AAC 80240CAC AE020070 */ sw $v0, 0x70($s0) -.L80240CB0: -/* 8D6AB0 80240CB0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D6AB4 80240CB4 8FB00010 */ lw $s0, 0x10($sp) -/* 8D6AB8 80240CB8 03E00008 */ jr $ra -/* 8D6ABC 80240CBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/func_80240CC0_8D5E00.s b/asm/nonmatchings/world/area_kmr/kmr_09/func_80240CC0_8D5E00.s deleted file mode 100644 index 9bce370949..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/func_80240CC0_8D5E00.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_8D6AC0 -/* 8D6AC0 80240CC0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8D6AC4 80240CC4 AFB3001C */ sw $s3, 0x1c($sp) -/* 8D6AC8 80240CC8 0080982D */ daddu $s3, $a0, $zero -/* 8D6ACC 80240CCC AFBF0020 */ sw $ra, 0x20($sp) -/* 8D6AD0 80240CD0 AFB20018 */ sw $s2, 0x18($sp) -/* 8D6AD4 80240CD4 AFB10014 */ sw $s1, 0x14($sp) -/* 8D6AD8 80240CD8 AFB00010 */ sw $s0, 0x10($sp) -/* 8D6ADC 80240CDC 8E720148 */ lw $s2, 0x148($s3) -/* 8D6AE0 80240CE0 86440008 */ lh $a0, 8($s2) -/* 8D6AE4 80240CE4 0C00EABB */ jal get_npc_unsafe -/* 8D6AE8 80240CE8 00A0802D */ daddu $s0, $a1, $zero -/* 8D6AEC 80240CEC 0040882D */ daddu $s1, $v0, $zero -/* 8D6AF0 80240CF0 C6420080 */ lwc1 $f2, 0x80($s2) -/* 8D6AF4 80240CF4 468010A0 */ cvt.s.w $f2, $f2 -/* 8D6AF8 80240CF8 460010A1 */ cvt.d.s $f2, $f2 -/* 8D6AFC 80240CFC C6400084 */ lwc1 $f0, 0x84($s2) -/* 8D6B00 80240D00 46800020 */ cvt.s.w $f0, $f0 -/* 8D6B04 80240D04 46000021 */ cvt.d.s $f0, $f0 -/* 8D6B08 80240D08 3C014059 */ lui $at, 0x4059 -/* 8D6B0C 80240D0C 44812800 */ mtc1 $at, $f5 -/* 8D6B10 80240D10 44802000 */ mtc1 $zero, $f4 -/* 8D6B14 80240D14 8E4200CC */ lw $v0, 0xcc($s2) -/* 8D6B18 80240D18 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 8D6B1C 80240D1C C62E0040 */ lwc1 $f14, 0x40($s1) -/* 8D6B20 80240D20 46241083 */ div.d $f2, $f2, $f4 -/* 8D6B24 80240D24 462010A0 */ cvt.s.d $f2, $f2 -/* 8D6B28 80240D28 46240003 */ div.d $f0, $f0, $f4 -/* 8D6B2C 80240D2C 8C420020 */ lw $v0, 0x20($v0) -/* 8D6B30 80240D30 46200020 */ cvt.s.d $f0, $f0 -/* 8D6B34 80240D34 E622001C */ swc1 $f2, 0x1c($s1) -/* 8D6B38 80240D38 E6200014 */ swc1 $f0, 0x14($s1) -/* 8D6B3C 80240D3C AE220028 */ sw $v0, 0x28($s1) -/* 8D6B40 80240D40 C6000018 */ lwc1 $f0, 0x18($s0) -/* 8D6B44 80240D44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D6B48 80240D48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D6B4C 80240D4C E6200018 */ swc1 $f0, 0x18($s1) -/* 8D6B50 80240D50 8C460028 */ lw $a2, 0x28($v0) -/* 8D6B54 80240D54 0C00A720 */ jal atan2 -/* 8D6B58 80240D58 8C470030 */ lw $a3, 0x30($v0) -/* 8D6B5C 80240D5C E620000C */ swc1 $f0, 0xc($s1) -/* 8D6B60 80240D60 8E420018 */ lw $v0, 0x18($s2) -/* 8D6B64 80240D64 AE400074 */ sw $zero, 0x74($s2) -/* 8D6B68 80240D68 9442002A */ lhu $v0, 0x2a($v0) -/* 8D6B6C 80240D6C 30420002 */ andi $v0, $v0, 2 -/* 8D6B70 80240D70 10400005 */ beqz $v0, .L80240D88 -/* 8D6B74 80240D74 24020003 */ addiu $v0, $zero, 3 -/* 8D6B78 80240D78 A622008E */ sh $v0, 0x8e($s1) -/* 8D6B7C 80240D7C 2402000D */ addiu $v0, $zero, 0xd -/* 8D6B80 80240D80 08090376 */ j .L80240DD8 -/* 8D6B84 80240D84 AE620070 */ sw $v0, 0x70($s3) -.L80240D88: -/* 8D6B88 80240D88 24030001 */ addiu $v1, $zero, 1 -/* 8D6B8C 80240D8C 2402000E */ addiu $v0, $zero, 0xe -/* 8D6B90 80240D90 A623008E */ sh $v1, 0x8e($s1) -/* 8D6B94 80240D94 AE620070 */ sw $v0, 0x70($s3) -/* 8D6B98 80240D98 C6200038 */ lwc1 $f0, 0x38($s1) -/* 8D6B9C 80240D9C 4600018D */ trunc.w.s $f6, $f0 -/* 8D6BA0 80240DA0 44023000 */ mfc1 $v0, $f6 -/* 8D6BA4 80240DA4 00000000 */ nop -/* 8D6BA8 80240DA8 A6420010 */ sh $v0, 0x10($s2) -/* 8D6BAC 80240DAC C620003C */ lwc1 $f0, 0x3c($s1) -/* 8D6BB0 80240DB0 4600018D */ trunc.w.s $f6, $f0 -/* 8D6BB4 80240DB4 44023000 */ mfc1 $v0, $f6 -/* 8D6BB8 80240DB8 00000000 */ nop -/* 8D6BBC 80240DBC A6420012 */ sh $v0, 0x12($s2) -/* 8D6BC0 80240DC0 C6200040 */ lwc1 $f0, 0x40($s1) -/* 8D6BC4 80240DC4 A2430007 */ sb $v1, 7($s2) -/* 8D6BC8 80240DC8 4600018D */ trunc.w.s $f6, $f0 -/* 8D6BCC 80240DCC 44023000 */ mfc1 $v0, $f6 -/* 8D6BD0 80240DD0 00000000 */ nop -/* 8D6BD4 80240DD4 A6420014 */ sh $v0, 0x14($s2) -.L80240DD8: -/* 8D6BD8 80240DD8 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D6BDC 80240DDC 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D6BE0 80240DE0 8FB20018 */ lw $s2, 0x18($sp) -/* 8D6BE4 80240DE4 8FB10014 */ lw $s1, 0x14($sp) -/* 8D6BE8 80240DE8 8FB00010 */ lw $s0, 0x10($sp) -/* 8D6BEC 80240DEC 03E00008 */ jr $ra -/* 8D6BF0 80240DF0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/func_80240DF4_8D5E00.s b/asm/nonmatchings/world/area_kmr/kmr_09/func_80240DF4_8D5E00.s deleted file mode 100644 index 1c8a174279..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/func_80240DF4_8D5E00.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF4_8D6BF4 -/* 8D6BF4 80240DF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D6BF8 80240DF8 AFB00010 */ sw $s0, 0x10($sp) -/* 8D6BFC 80240DFC 0080802D */ daddu $s0, $a0, $zero -/* 8D6C00 80240E00 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D6C04 80240E04 8E020148 */ lw $v0, 0x148($s0) -/* 8D6C08 80240E08 0C00EABB */ jal get_npc_unsafe -/* 8D6C0C 80240E0C 84440008 */ lh $a0, 8($v0) -/* 8D6C10 80240E10 0040202D */ daddu $a0, $v0, $zero -/* 8D6C14 80240E14 8482008E */ lh $v0, 0x8e($a0) -/* 8D6C18 80240E18 9483008E */ lhu $v1, 0x8e($a0) -/* 8D6C1C 80240E1C 18400005 */ blez $v0, .L80240E34 -/* 8D6C20 80240E20 2462FFFF */ addiu $v0, $v1, -1 -/* 8D6C24 80240E24 A482008E */ sh $v0, 0x8e($a0) -/* 8D6C28 80240E28 00021400 */ sll $v0, $v0, 0x10 -/* 8D6C2C 80240E2C 1C400006 */ bgtz $v0, .L80240E48 -/* 8D6C30 80240E30 00000000 */ nop -.L80240E34: -/* 8D6C34 80240E34 8482008C */ lh $v0, 0x8c($a0) -/* 8D6C38 80240E38 14400003 */ bnez $v0, .L80240E48 -/* 8D6C3C 80240E3C 2402000E */ addiu $v0, $zero, 0xe -/* 8D6C40 80240E40 A480008E */ sh $zero, 0x8e($a0) -/* 8D6C44 80240E44 AE020070 */ sw $v0, 0x70($s0) -.L80240E48: -/* 8D6C48 80240E48 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D6C4C 80240E4C 8FB00010 */ lw $s0, 0x10($sp) -/* 8D6C50 80240E50 03E00008 */ jr $ra -/* 8D6C54 80240E54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/func_80240E58_8D5E00.s b/asm/nonmatchings/world/area_kmr/kmr_09/func_80240E58_8D5E00.s deleted file mode 100644 index 76dfcc1c08..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/func_80240E58_8D5E00.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E58_8D6C58 -/* 8D6C58 80240E58 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8D6C5C 80240E5C AFB20030 */ sw $s2, 0x30($sp) -/* 8D6C60 80240E60 0080902D */ daddu $s2, $a0, $zero -/* 8D6C64 80240E64 AFBF0038 */ sw $ra, 0x38($sp) -/* 8D6C68 80240E68 AFB30034 */ sw $s3, 0x34($sp) -/* 8D6C6C 80240E6C AFB1002C */ sw $s1, 0x2c($sp) -/* 8D6C70 80240E70 AFB00028 */ sw $s0, 0x28($sp) -/* 8D6C74 80240E74 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 8D6C78 80240E78 F7B40040 */ sdc1 $f20, 0x40($sp) -/* 8D6C7C 80240E7C 8E510148 */ lw $s1, 0x148($s2) -/* 8D6C80 80240E80 86240008 */ lh $a0, 8($s1) -/* 8D6C84 80240E84 0C00EABB */ jal get_npc_unsafe -/* 8D6C88 80240E88 00A0982D */ daddu $s3, $a1, $zero -/* 8D6C8C 80240E8C 0040802D */ daddu $s0, $v0, $zero -/* 8D6C90 80240E90 0200202D */ daddu $a0, $s0, $zero -/* 8D6C94 80240E94 C6220088 */ lwc1 $f2, 0x88($s1) -/* 8D6C98 80240E98 468010A0 */ cvt.s.w $f2, $f2 -/* 8D6C9C 80240E9C 460010A1 */ cvt.d.s $f2, $f2 -/* 8D6CA0 80240EA0 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8D6CA4 80240EA4 C6000014 */ lwc1 $f0, 0x14($s0) -/* 8D6CA8 80240EA8 8E050018 */ lw $a1, 0x18($s0) -/* 8D6CAC 80240EAC 46002100 */ add.s $f4, $f4, $f0 -/* 8D6CB0 80240EB0 8E06000C */ lw $a2, 0xc($s0) -/* 8D6CB4 80240EB4 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8D6CB8 80240EB8 46800020 */ cvt.s.w $f0, $f0 -/* 8D6CBC 80240EBC E604001C */ swc1 $f4, 0x1c($s0) -/* 8D6CC0 80240EC0 3C014059 */ lui $at, 0x4059 -/* 8D6CC4 80240EC4 44812800 */ mtc1 $at, $f5 -/* 8D6CC8 80240EC8 44802000 */ mtc1 $zero, $f4 -/* 8D6CCC 80240ECC 46000021 */ cvt.d.s $f0, $f0 -/* 8D6CD0 80240ED0 46240003 */ div.d $f0, $f0, $f4 -/* 8D6CD4 80240ED4 46200520 */ cvt.s.d $f20, $f0 -/* 8D6CD8 80240ED8 46241083 */ div.d $f2, $f2, $f4 -/* 8D6CDC 80240EDC 0C00EA95 */ jal npc_move_heading -/* 8D6CE0 80240EE0 462015A0 */ cvt.s.d $f22, $f2 -/* 8D6CE4 80240EE4 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8D6CE8 80240EE8 44801000 */ mtc1 $zero, $f2 -/* 8D6CEC 80240EEC 44801800 */ mtc1 $zero, $f3 -/* 8D6CF0 80240EF0 46002021 */ cvt.d.s $f0, $f4 -/* 8D6CF4 80240EF4 4620103E */ c.le.d $f2, $f0 -/* 8D6CF8 80240EF8 00000000 */ nop -/* 8D6CFC 80240EFC 45000030 */ bc1f .L80240FC0 -/* 8D6D00 80240F00 00000000 */ nop -/* 8D6D04 80240F04 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D6D08 80240F08 46040000 */ add.s $f0, $f0, $f4 -/* 8D6D0C 80240F0C E600003C */ swc1 $f0, 0x3c($s0) -/* 8D6D10 80240F10 8E2200CC */ lw $v0, 0xcc($s1) -/* 8D6D14 80240F14 8C420024 */ lw $v0, 0x24($v0) -/* 8D6D18 80240F18 AE020028 */ sw $v0, 0x28($s0) -/* 8D6D1C 80240F1C A2200007 */ sb $zero, 7($s1) -/* 8D6D20 80240F20 8E020000 */ lw $v0, ($s0) -/* 8D6D24 80240F24 30420008 */ andi $v0, $v0, 8 -/* 8D6D28 80240F28 14400011 */ bnez $v0, .L80240F70 -/* 8D6D2C 80240F2C 0000102D */ daddu $v0, $zero, $zero -/* 8D6D30 80240F30 27A50018 */ addiu $a1, $sp, 0x18 -/* 8D6D34 80240F34 27A6001C */ addiu $a2, $sp, 0x1c -/* 8D6D38 80240F38 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D6D3C 80240F3C C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D6D40 80240F40 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8D6D44 80240F44 3C01447A */ lui $at, 0x447a -/* 8D6D48 80240F48 44813000 */ mtc1 $at, $f6 -/* 8D6D4C 80240F4C 27A20024 */ addiu $v0, $sp, 0x24 -/* 8D6D50 80240F50 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D6D54 80240F54 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 8D6D58 80240F58 E7A40020 */ swc1 $f4, 0x20($sp) -/* 8D6D5C 80240F5C E7A60024 */ swc1 $f6, 0x24($sp) -/* 8D6D60 80240F60 AFA20010 */ sw $v0, 0x10($sp) -/* 8D6D64 80240F64 8E040080 */ lw $a0, 0x80($s0) -/* 8D6D68 80240F68 0C0372DF */ jal func_800DCB7C -/* 8D6D6C 80240F6C 27A70020 */ addiu $a3, $sp, 0x20 -.L80240F70: -/* 8D6D70 80240F70 1040000B */ beqz $v0, .L80240FA0 -/* 8D6D74 80240F74 00000000 */ nop -/* 8D6D78 80240F78 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8D6D7C 80240F7C 46140080 */ add.s $f2, $f0, $f20 -/* 8D6D80 80240F80 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D6D84 80240F84 4600103E */ c.le.s $f2, $f0 -/* 8D6D88 80240F88 00000000 */ nop -/* 8D6D8C 80240F8C 4500008D */ bc1f .L802411C4 -/* 8D6D90 80240F90 00000000 */ nop -/* 8D6D94 80240F94 E602003C */ swc1 $f2, 0x3c($s0) -/* 8D6D98 80240F98 08090471 */ j .L802411C4 -/* 8D6D9C 80240F9C AE400070 */ sw $zero, 0x70($s2) -.L80240FA0: -/* 8D6DA0 80240FA0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D6DA4 80240FA4 C6000064 */ lwc1 $f0, 0x64($s0) -/* 8D6DA8 80240FA8 4602003E */ c.le.s $f0, $f2 -/* 8D6DAC 80240FAC 00000000 */ nop -/* 8D6DB0 80240FB0 45030084 */ bc1tl .L802411C4 -/* 8D6DB4 80240FB4 AE400070 */ sw $zero, 0x70($s2) -/* 8D6DB8 80240FB8 08090471 */ j .L802411C4 -/* 8D6DBC 80240FBC 00000000 */ nop -.L80240FC0: -/* 8D6DC0 80240FC0 4622003C */ c.lt.d $f0, $f2 -/* 8D6DC4 80240FC4 00000000 */ nop -/* 8D6DC8 80240FC8 4500007E */ bc1f .L802411C4 -/* 8D6DCC 80240FCC 00000000 */ nop -/* 8D6DD0 80240FD0 9602008E */ lhu $v0, 0x8e($s0) -/* 8D6DD4 80240FD4 24420001 */ addiu $v0, $v0, 1 -/* 8D6DD8 80240FD8 A602008E */ sh $v0, 0x8e($s0) -/* 8D6DDC 80240FDC 00021400 */ sll $v0, $v0, 0x10 -/* 8D6DE0 80240FE0 8E630020 */ lw $v1, 0x20($s3) -/* 8D6DE4 80240FE4 00021403 */ sra $v0, $v0, 0x10 -/* 8D6DE8 80240FE8 0043102A */ slt $v0, $v0, $v1 -/* 8D6DEC 80240FEC 14400026 */ bnez $v0, .L80241088 -/* 8D6DF0 80240FF0 00000000 */ nop -/* 8D6DF4 80240FF4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D6DF8 80240FF8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D6DFC 80240FFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D6E00 80241000 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D6E04 80241004 A600008E */ sh $zero, 0x8e($s0) -/* 8D6E08 80241008 8C460028 */ lw $a2, 0x28($v0) -/* 8D6E0C 8024100C 0C00A720 */ jal atan2 -/* 8D6E10 80241010 8C470030 */ lw $a3, 0x30($v0) -/* 8D6E14 80241014 46000506 */ mov.s $f20, $f0 -/* 8D6E18 80241018 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8D6E1C 8024101C 0C00A70A */ jal get_clamped_angle_diff -/* 8D6E20 80241020 4600A386 */ mov.s $f14, $f20 -/* 8D6E24 80241024 46000086 */ mov.s $f2, $f0 -/* 8D6E28 80241028 8E62001C */ lw $v0, 0x1c($s3) -/* 8D6E2C 8024102C 46001005 */ abs.s $f0, $f2 -/* 8D6E30 80241030 44822000 */ mtc1 $v0, $f4 -/* 8D6E34 80241034 00000000 */ nop -/* 8D6E38 80241038 46802120 */ cvt.s.w $f4, $f4 -/* 8D6E3C 8024103C 4600203C */ c.lt.s $f4, $f0 -/* 8D6E40 80241040 00000000 */ nop -/* 8D6E44 80241044 4500000D */ bc1f .L8024107C -/* 8D6E48 80241048 00000000 */ nop -/* 8D6E4C 8024104C 44800000 */ mtc1 $zero, $f0 -/* 8D6E50 80241050 C614000C */ lwc1 $f20, 0xc($s0) -/* 8D6E54 80241054 4600103C */ c.lt.s $f2, $f0 -/* 8D6E58 80241058 00000000 */ nop -/* 8D6E5C 8024105C 45000006 */ bc1f .L80241078 -/* 8D6E60 80241060 00021023 */ negu $v0, $v0 -/* 8D6E64 80241064 44820000 */ mtc1 $v0, $f0 -/* 8D6E68 80241068 00000000 */ nop -/* 8D6E6C 8024106C 46800020 */ cvt.s.w $f0, $f0 -/* 8D6E70 80241070 0809041F */ j .L8024107C -/* 8D6E74 80241074 4600A500 */ add.s $f20, $f20, $f0 -.L80241078: -/* 8D6E78 80241078 4604A500 */ add.s $f20, $f20, $f4 -.L8024107C: -/* 8D6E7C 8024107C 0C00A6C9 */ jal clamp_angle -/* 8D6E80 80241080 4600A306 */ mov.s $f12, $f20 -/* 8D6E84 80241084 E600000C */ swc1 $f0, 0xc($s0) -.L80241088: -/* 8D6E88 80241088 8E020000 */ lw $v0, ($s0) -/* 8D6E8C 8024108C 30420008 */ andi $v0, $v0, 8 -/* 8D6E90 80241090 1040000A */ beqz $v0, .L802410BC -/* 8D6E94 80241094 27A50018 */ addiu $a1, $sp, 0x18 -/* 8D6E98 80241098 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D6E9C 8024109C C600001C */ lwc1 $f0, 0x1c($s0) -/* 8D6EA0 802410A0 46001080 */ add.s $f2, $f2, $f0 -/* 8D6EA4 802410A4 4616103C */ c.lt.s $f2, $f22 -/* 8D6EA8 802410A8 00000000 */ nop -/* 8D6EAC 802410AC 45020045 */ bc1fl .L802411C4 -/* 8D6EB0 802410B0 E602003C */ swc1 $f2, 0x3c($s0) -/* 8D6EB4 802410B4 08090470 */ j .L802411C0 -/* 8D6EB8 802410B8 E616003C */ swc1 $f22, 0x3c($s0) -.L802410BC: -/* 8D6EBC 802410BC C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D6EC0 802410C0 27A6001C */ addiu $a2, $sp, 0x1c -/* 8D6EC4 802410C4 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D6EC8 802410C8 860200A8 */ lh $v0, 0xa8($s0) -/* 8D6ECC 802410CC C600001C */ lwc1 $f0, 0x1c($s0) -/* 8D6ED0 802410D0 C604003C */ lwc1 $f4, 0x3c($s0) -/* 8D6ED4 802410D4 44821000 */ mtc1 $v0, $f2 -/* 8D6ED8 802410D8 00000000 */ nop -/* 8D6EDC 802410DC 468010A0 */ cvt.s.w $f2, $f2 -/* 8D6EE0 802410E0 46000005 */ abs.s $f0, $f0 -/* 8D6EE4 802410E4 46020000 */ add.s $f0, $f0, $f2 -/* 8D6EE8 802410E8 C6060040 */ lwc1 $f6, 0x40($s0) -/* 8D6EEC 802410EC 27A20024 */ addiu $v0, $sp, 0x24 -/* 8D6EF0 802410F0 46022100 */ add.s $f4, $f4, $f2 -/* 8D6EF4 802410F4 3C014024 */ lui $at, 0x4024 -/* 8D6EF8 802410F8 44811800 */ mtc1 $at, $f3 -/* 8D6EFC 802410FC 44801000 */ mtc1 $zero, $f2 -/* 8D6F00 80241100 46000021 */ cvt.d.s $f0, $f0 -/* 8D6F04 80241104 46220000 */ add.d $f0, $f0, $f2 -/* 8D6F08 80241108 E7A60020 */ swc1 $f6, 0x20($sp) -/* 8D6F0C 8024110C E7A4001C */ swc1 $f4, 0x1c($sp) -/* 8D6F10 80241110 46200020 */ cvt.s.d $f0, $f0 -/* 8D6F14 80241114 E7A00024 */ swc1 $f0, 0x24($sp) -/* 8D6F18 80241118 AFA20010 */ sw $v0, 0x10($sp) -/* 8D6F1C 8024111C 8E040080 */ lw $a0, 0x80($s0) -/* 8D6F20 80241120 0C0372DF */ jal func_800DCB7C -/* 8D6F24 80241124 27A70020 */ addiu $a3, $sp, 0x20 -/* 8D6F28 80241128 10400015 */ beqz $v0, .L80241180 -/* 8D6F2C 8024112C 00000000 */ nop -/* 8D6F30 80241130 860200A8 */ lh $v0, 0xa8($s0) -/* 8D6F34 80241134 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8D6F38 80241138 44820000 */ mtc1 $v0, $f0 -/* 8D6F3C 8024113C 00000000 */ nop -/* 8D6F40 80241140 46800020 */ cvt.s.w $f0, $f0 -/* 8D6F44 80241144 46002085 */ abs.s $f2, $f4 -/* 8D6F48 80241148 46020000 */ add.s $f0, $f0, $f2 -/* 8D6F4C 8024114C C7A20024 */ lwc1 $f2, 0x24($sp) -/* 8D6F50 80241150 4600103E */ c.le.s $f2, $f0 -/* 8D6F54 80241154 00000000 */ nop -/* 8D6F58 80241158 45000005 */ bc1f .L80241170 -/* 8D6F5C 8024115C 00000000 */ nop -/* 8D6F60 80241160 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8D6F64 80241164 AE00001C */ sw $zero, 0x1c($s0) -/* 8D6F68 80241168 08090471 */ j .L802411C4 -/* 8D6F6C 8024116C E600003C */ swc1 $f0, 0x3c($s0) -.L80241170: -/* 8D6F70 80241170 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D6F74 80241174 46040000 */ add.s $f0, $f0, $f4 -/* 8D6F78 80241178 08090471 */ j .L802411C4 -/* 8D6F7C 8024117C E600003C */ swc1 $f0, 0x3c($s0) -.L80241180: -/* 8D6F80 80241180 C606003C */ lwc1 $f6, 0x3c($s0) -/* 8D6F84 80241184 860200A8 */ lh $v0, 0xa8($s0) -/* 8D6F88 80241188 46163081 */ sub.s $f2, $f6, $f22 -/* 8D6F8C 8024118C 44820000 */ mtc1 $v0, $f0 -/* 8D6F90 80241190 00000000 */ nop -/* 8D6F94 80241194 46800020 */ cvt.s.w $f0, $f0 -/* 8D6F98 80241198 46001080 */ add.s $f2, $f2, $f0 -/* 8D6F9C 8024119C C604001C */ lwc1 $f4, 0x1c($s0) -/* 8D6FA0 802411A0 46002005 */ abs.s $f0, $f4 -/* 8D6FA4 802411A4 4602003C */ c.lt.s $f0, $f2 -/* 8D6FA8 802411A8 00000000 */ nop -/* 8D6FAC 802411AC 45020005 */ bc1fl .L802411C4 -/* 8D6FB0 802411B0 AE00001C */ sw $zero, 0x1c($s0) -/* 8D6FB4 802411B4 46043000 */ add.s $f0, $f6, $f4 -/* 8D6FB8 802411B8 08090471 */ j .L802411C4 -/* 8D6FBC 802411BC E600003C */ swc1 $f0, 0x3c($s0) -.L802411C0: -/* 8D6FC0 802411C0 AE00001C */ sw $zero, 0x1c($s0) -.L802411C4: -/* 8D6FC4 802411C4 8FBF0038 */ lw $ra, 0x38($sp) -/* 8D6FC8 802411C8 8FB30034 */ lw $s3, 0x34($sp) -/* 8D6FCC 802411CC 8FB20030 */ lw $s2, 0x30($sp) -/* 8D6FD0 802411D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 8D6FD4 802411D4 8FB00028 */ lw $s0, 0x28($sp) -/* 8D6FD8 802411D8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* 8D6FDC 802411DC D7B40040 */ ldc1 $f20, 0x40($sp) -/* 8D6FE0 802411E0 03E00008 */ jr $ra -/* 8D6FE4 802411E4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/func_802411E8_8D5E00.s b/asm/nonmatchings/world/area_kmr/kmr_09/func_802411E8_8D5E00.s deleted file mode 100644 index d4e91d6eef..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/func_802411E8_8D5E00.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411E8_8D6FE8 -/* 8D6FE8 802411E8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8D6FEC 802411EC AFB00028 */ sw $s0, 0x28($sp) -/* 8D6FF0 802411F0 00A0802D */ daddu $s0, $a1, $zero -/* 8D6FF4 802411F4 AFB1002C */ sw $s1, 0x2c($sp) -/* 8D6FF8 802411F8 00C0882D */ daddu $s1, $a2, $zero -/* 8D6FFC 802411FC AFBF0034 */ sw $ra, 0x34($sp) -/* 8D7000 80241200 AFB20030 */ sw $s2, 0x30($sp) -/* 8D7004 80241204 AE200070 */ sw $zero, 0x70($s1) -/* 8D7008 80241208 8C830000 */ lw $v1, ($a0) -/* 8D700C 8024120C 2402FDFF */ addiu $v0, $zero, -0x201 -/* 8D7010 80241210 A480008E */ sh $zero, 0x8e($a0) -/* 8D7014 80241214 00621824 */ and $v1, $v1, $v0 -/* 8D7018 80241218 34650800 */ ori $a1, $v1, 0x800 -/* 8D701C 8024121C AC850000 */ sw $a1, ($a0) -/* 8D7020 80241220 8E0200D0 */ lw $v0, 0xd0($s0) -/* 8D7024 80241224 8C420034 */ lw $v0, 0x34($v0) -/* 8D7028 80241228 10400003 */ beqz $v0, .L80241238 -/* 8D702C 8024122C 00E0902D */ daddu $s2, $a3, $zero -/* 8D7030 80241230 08090490 */ j .L80241240 -/* 8D7034 80241234 34620808 */ ori $v0, $v1, 0x808 -.L80241238: -/* 8D7038 80241238 2402FFF7 */ addiu $v0, $zero, -9 -/* 8D703C 8024123C 00A21024 */ and $v0, $a1, $v0 -.L80241240: -/* 8D7040 80241240 AC820000 */ sw $v0, ($a0) -/* 8D7044 80241244 27A20024 */ addiu $v0, $sp, 0x24 -/* 8D7048 80241248 27A50018 */ addiu $a1, $sp, 0x18 -/* 8D704C 8024124C C4800038 */ lwc1 $f0, 0x38($a0) -/* 8D7050 80241250 C482003C */ lwc1 $f2, 0x3c($a0) -/* 8D7054 80241254 C4840040 */ lwc1 $f4, 0x40($a0) -/* 8D7058 80241258 3C01447A */ lui $at, 0x447a -/* 8D705C 8024125C 44813000 */ mtc1 $at, $f6 -/* 8D7060 80241260 27A6001C */ addiu $a2, $sp, 0x1c -/* 8D7064 80241264 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D7068 80241268 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 8D706C 8024126C E7A40020 */ swc1 $f4, 0x20($sp) -/* 8D7070 80241270 E7A60024 */ swc1 $f6, 0x24($sp) -/* 8D7074 80241274 AFA20010 */ sw $v0, 0x10($sp) -/* 8D7078 80241278 8C840080 */ lw $a0, 0x80($a0) -/* 8D707C 8024127C 0C0372DF */ jal func_800DCB7C -/* 8D7080 80241280 27A70020 */ addiu $a3, $sp, 0x20 -/* 8D7084 80241284 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 8D7088 80241288 3C014059 */ lui $at, 0x4059 -/* 8D708C 8024128C 44812800 */ mtc1 $at, $f5 -/* 8D7090 80241290 44802000 */ mtc1 $zero, $f4 -/* 8D7094 80241294 460010A1 */ cvt.d.s $f2, $f2 -/* 8D7098 80241298 46241082 */ mul.d $f2, $f2, $f4 -/* 8D709C 8024129C 00000000 */ nop -/* 8D70A0 802412A0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8D70A4 802412A4 46000021 */ cvt.d.s $f0, $f0 -/* 8D70A8 802412A8 46240002 */ mul.d $f0, $f0, $f4 -/* 8D70AC 802412AC 00000000 */ nop -/* 8D70B0 802412B0 3C013FE0 */ lui $at, 0x3fe0 -/* 8D70B4 802412B4 44812800 */ mtc1 $at, $f5 -/* 8D70B8 802412B8 44802000 */ mtc1 $zero, $f4 -/* 8D70BC 802412BC 00000000 */ nop -/* 8D70C0 802412C0 46241080 */ add.d $f2, $f2, $f4 -/* 8D70C4 802412C4 AE000074 */ sw $zero, 0x74($s0) -/* 8D70C8 802412C8 46240000 */ add.d $f0, $f0, $f4 -/* 8D70CC 802412CC AE000090 */ sw $zero, 0x90($s0) -/* 8D70D0 802412D0 4620120D */ trunc.w.d $f8, $f2 -/* 8D70D4 802412D4 E6080078 */ swc1 $f8, 0x78($s0) -/* 8D70D8 802412D8 4620020D */ trunc.w.d $f8, $f0 -/* 8D70DC 802412DC E6080088 */ swc1 $f8, 0x88($s0) -/* 8D70E0 802412E0 8E420014 */ lw $v0, 0x14($s2) -/* 8D70E4 802412E4 AE220074 */ sw $v0, 0x74($s1) -/* 8D70E8 802412E8 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8D70EC 802412EC 34420010 */ ori $v0, $v0, 0x10 -/* 8D70F0 802412F0 AE0200B0 */ sw $v0, 0xb0($s0) -/* 8D70F4 802412F4 8FBF0034 */ lw $ra, 0x34($sp) -/* 8D70F8 802412F8 8FB20030 */ lw $s2, 0x30($sp) -/* 8D70FC 802412FC 8FB1002C */ lw $s1, 0x2c($sp) -/* 8D7100 80241300 8FB00028 */ lw $s0, 0x28($sp) -/* 8D7104 80241304 03E00008 */ jr $ra -/* 8D7108 80241308 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/func_8024130C_8D5E00.s b/asm/nonmatchings/world/area_kmr/kmr_09/func_8024130C_8D5E00.s deleted file mode 100644 index 81206eb756..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/func_8024130C_8D5E00.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024130C_8D710C -/* 8D710C 8024130C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8D7110 80241310 AFB40040 */ sw $s4, 0x40($sp) -/* 8D7114 80241314 0080A02D */ daddu $s4, $a0, $zero -/* 8D7118 80241318 AFBF0048 */ sw $ra, 0x48($sp) -/* 8D711C 8024131C AFB50044 */ sw $s5, 0x44($sp) -/* 8D7120 80241320 AFB3003C */ sw $s3, 0x3c($sp) -/* 8D7124 80241324 AFB20038 */ sw $s2, 0x38($sp) -/* 8D7128 80241328 AFB10034 */ sw $s1, 0x34($sp) -/* 8D712C 8024132C AFB00030 */ sw $s0, 0x30($sp) -/* 8D7130 80241330 8E920148 */ lw $s2, 0x148($s4) -/* 8D7134 80241334 86440008 */ lh $a0, 8($s2) -/* 8D7138 80241338 8E90000C */ lw $s0, 0xc($s4) -/* 8D713C 8024133C 0C00EABB */ jal get_npc_unsafe -/* 8D7140 80241340 00A0882D */ daddu $s1, $a1, $zero -/* 8D7144 80241344 0280202D */ daddu $a0, $s4, $zero -/* 8D7148 80241348 8E050000 */ lw $a1, ($s0) -/* 8D714C 8024134C 0C0B1EAF */ jal get_variable -/* 8D7150 80241350 0040A82D */ daddu $s5, $v0, $zero -/* 8D7154 80241354 AFA00010 */ sw $zero, 0x10($sp) -/* 8D7158 80241358 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D715C 8024135C 8C630030 */ lw $v1, 0x30($v1) -/* 8D7160 80241360 AFA30014 */ sw $v1, 0x14($sp) -/* 8D7164 80241364 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D7168 80241368 8C63001C */ lw $v1, 0x1c($v1) -/* 8D716C 8024136C AFA30018 */ sw $v1, 0x18($sp) -/* 8D7170 80241370 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D7174 80241374 8C630024 */ lw $v1, 0x24($v1) -/* 8D7178 80241378 AFA3001C */ sw $v1, 0x1c($sp) -/* 8D717C 8024137C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D7180 80241380 8C630028 */ lw $v1, 0x28($v1) -/* 8D7184 80241384 27B30010 */ addiu $s3, $sp, 0x10 -/* 8D7188 80241388 AFA30020 */ sw $v1, 0x20($sp) -/* 8D718C 8024138C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D7190 80241390 3C0142F0 */ lui $at, 0x42f0 -/* 8D7194 80241394 44810000 */ mtc1 $at, $f0 -/* 8D7198 80241398 8C63002C */ lw $v1, 0x2c($v1) -/* 8D719C 8024139C 0040802D */ daddu $s0, $v0, $zero -/* 8D71A0 802413A0 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D71A4 802413A4 A7A0002C */ sh $zero, 0x2c($sp) -/* 8D71A8 802413A8 12200006 */ beqz $s1, .L802413C4 -/* 8D71AC 802413AC AFA30024 */ sw $v1, 0x24($sp) -/* 8D71B0 802413B0 02A0202D */ daddu $a0, $s5, $zero -/* 8D71B4 802413B4 0240282D */ daddu $a1, $s2, $zero -/* 8D71B8 802413B8 0280302D */ daddu $a2, $s4, $zero -/* 8D71BC 802413BC 0C09047A */ jal func_802411E8 -/* 8D71C0 802413C0 0200382D */ daddu $a3, $s0, $zero -.L802413C4: -/* 8D71C4 802413C4 2402FFFE */ addiu $v0, $zero, -2 -/* 8D71C8 802413C8 A2A200AB */ sb $v0, 0xab($s5) -/* 8D71CC 802413CC 8E4300B0 */ lw $v1, 0xb0($s2) -/* 8D71D0 802413D0 30620004 */ andi $v0, $v1, 4 -/* 8D71D4 802413D4 10400007 */ beqz $v0, .L802413F4 -/* 8D71D8 802413D8 00000000 */ nop -/* 8D71DC 802413DC 824200B4 */ lb $v0, 0xb4($s2) -/* 8D71E0 802413E0 1440003C */ bnez $v0, .L802414D4 -/* 8D71E4 802413E4 0000102D */ daddu $v0, $zero, $zero -/* 8D71E8 802413E8 2402FFFB */ addiu $v0, $zero, -5 -/* 8D71EC 802413EC 00621024 */ and $v0, $v1, $v0 -/* 8D71F0 802413F0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802413F4: -/* 8D71F4 802413F4 8E830070 */ lw $v1, 0x70($s4) -/* 8D71F8 802413F8 2C62000F */ sltiu $v0, $v1, 0xf -/* 8D71FC 802413FC 10400034 */ beqz $v0, .L802414D0 -/* 8D7200 80241400 00031080 */ sll $v0, $v1, 2 -/* 8D7204 80241404 3C018024 */ lui $at, 0x8024 -/* 8D7208 80241408 00220821 */ addu $at, $at, $v0 -/* 8D720C 8024140C 8C222688 */ lw $v0, 0x2688($at) -/* 8D7210 80241410 00400008 */ jr $v0 -/* 8D7214 80241414 00000000 */ nop -/* 8D7218 80241418 0280202D */ daddu $a0, $s4, $zero -/* 8D721C 8024141C 0200282D */ daddu $a1, $s0, $zero -/* 8D7220 80241420 0C090000 */ jal func_80240000 -/* 8D7224 80241424 0260302D */ daddu $a2, $s3, $zero -/* 8D7228 80241428 0280202D */ daddu $a0, $s4, $zero -/* 8D722C 8024142C 0200282D */ daddu $a1, $s0, $zero -/* 8D7230 80241430 0C09006C */ jal func_802401B0 -/* 8D7234 80241434 0260302D */ daddu $a2, $s3, $zero -/* 8D7238 80241438 08090535 */ j .L802414D4 -/* 8D723C 8024143C 0000102D */ daddu $v0, $zero, $zero -/* 8D7240 80241440 0280202D */ daddu $a0, $s4, $zero -/* 8D7244 80241444 0200282D */ daddu $a1, $s0, $zero -/* 8D7248 80241448 0C0901F6 */ jal func_802407D8 -/* 8D724C 8024144C 0260302D */ daddu $a2, $s3, $zero -/* 8D7250 80241450 0280202D */ daddu $a0, $s4, $zero -/* 8D7254 80241454 0200282D */ daddu $a1, $s0, $zero -/* 8D7258 80241458 0C090226 */ jal func_80240898 -/* 8D725C 8024145C 0260302D */ daddu $a2, $s3, $zero -/* 8D7260 80241460 08090535 */ j .L802414D4 -/* 8D7264 80241464 0000102D */ daddu $v0, $zero, $zero -/* 8D7268 80241468 0280202D */ daddu $a0, $s4, $zero -/* 8D726C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* 8D7270 80241470 0C0902F7 */ jal func_80240BDC -/* 8D7274 80241474 0260302D */ daddu $a2, $s3, $zero -/* 8D7278 80241478 0280202D */ daddu $a0, $s4, $zero -/* 8D727C 8024147C 0200282D */ daddu $a1, $s0, $zero -/* 8D7280 80241480 0C090315 */ jal func_80240C54 -/* 8D7284 80241484 0260302D */ daddu $a2, $s3, $zero -/* 8D7288 80241488 08090535 */ j .L802414D4 -/* 8D728C 8024148C 0000102D */ daddu $v0, $zero, $zero -/* 8D7290 80241490 0280202D */ daddu $a0, $s4, $zero -/* 8D7294 80241494 0200282D */ daddu $a1, $s0, $zero -/* 8D7298 80241498 0C090330 */ jal func_80240CC0 -/* 8D729C 8024149C 0260302D */ daddu $a2, $s3, $zero -/* 8D72A0 802414A0 08090535 */ j .L802414D4 -/* 8D72A4 802414A4 0000102D */ daddu $v0, $zero, $zero -/* 8D72A8 802414A8 0280202D */ daddu $a0, $s4, $zero -/* 8D72AC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8D72B0 802414B0 0C09037D */ jal func_80240DF4 -/* 8D72B4 802414B4 0260302D */ daddu $a2, $s3, $zero -/* 8D72B8 802414B8 08090535 */ j .L802414D4 -/* 8D72BC 802414BC 0000102D */ daddu $v0, $zero, $zero -/* 8D72C0 802414C0 0280202D */ daddu $a0, $s4, $zero -/* 8D72C4 802414C4 0200282D */ daddu $a1, $s0, $zero -/* 8D72C8 802414C8 0C090396 */ jal func_80240E58 -/* 8D72CC 802414CC 0260302D */ daddu $a2, $s3, $zero -.L802414D0: -/* 8D72D0 802414D0 0000102D */ daddu $v0, $zero, $zero -.L802414D4: -/* 8D72D4 802414D4 8FBF0048 */ lw $ra, 0x48($sp) -/* 8D72D8 802414D8 8FB50044 */ lw $s5, 0x44($sp) -/* 8D72DC 802414DC 8FB40040 */ lw $s4, 0x40($sp) -/* 8D72E0 802414E0 8FB3003C */ lw $s3, 0x3c($sp) -/* 8D72E4 802414E4 8FB20038 */ lw $s2, 0x38($sp) -/* 8D72E8 802414E8 8FB10034 */ lw $s1, 0x34($sp) -/* 8D72EC 802414EC 8FB00030 */ lw $s0, 0x30($sp) -/* 8D72F0 802414F0 03E00008 */ jr $ra -/* 8D72F4 802414F4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/func_802400B4_8D84D0.s b/asm/nonmatchings/world/area_kmr/kmr_10/func_802400B4_8D84D0.s deleted file mode 100644 index 8d867a8335..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_10/func_802400B4_8D84D0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_8D8584 -/* 8D8584 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8D8588 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* 8D858C 802400BC 0080802D */ daddu $s0, $a0, $zero -/* 8D8590 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 8D8594 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* 8D8598 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* 8D859C 802400CC 8C510000 */ lw $s1, ($v0) -/* 8D85A0 802400D0 0C0B1EAF */ jal get_variable -/* 8D85A4 802400D4 0220282D */ daddu $a1, $s1, $zero -/* 8D85A8 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* 8D85AC 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* 8D85B0 802400E0 0200202D */ daddu $a0, $s0, $zero -/* 8D85B4 802400E4 00431024 */ and $v0, $v0, $v1 -/* 8D85B8 802400E8 00021140 */ sll $v0, $v0, 5 -/* 8D85BC 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* 8D85C0 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* 8D85C4 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 8D85C8 802400F8 0C0B2026 */ jal set_variable -/* 8D85CC 802400FC 0220282D */ daddu $a1, $s1, $zero -/* 8D85D0 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* 8D85D4 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* 8D85D8 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* 8D85DC 8024010C 24020002 */ addiu $v0, $zero, 2 -/* 8D85E0 80240110 03E00008 */ jr $ra -/* 8D85E4 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/func_8024023C_8DA100.s b/asm/nonmatchings/world/area_kmr/kmr_11/func_8024023C_8DA100.s deleted file mode 100644 index 00ee3cbf09..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/func_8024023C_8DA100.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_8DA33C -/* 8DA33C 8024023C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8DA340 80240240 240403D4 */ addiu $a0, $zero, 0x3d4 -/* 8DA344 80240244 AFBF0010 */ sw $ra, 0x10($sp) -/* 8DA348 80240248 0C046EDD */ jal set_world_fog_dist -/* 8DA34C 8024024C 240503E8 */ addiu $a1, $zero, 0x3e8 -/* 8DA350 80240250 2404000F */ addiu $a0, $zero, 0xf -/* 8DA354 80240254 24050005 */ addiu $a1, $zero, 5 -/* 8DA358 80240258 24060037 */ addiu $a2, $zero, 0x37 -/* 8DA35C 8024025C 0C046EE2 */ jal set_world_fog_color -/* 8DA360 80240260 240700FF */ addiu $a3, $zero, 0xff -/* 8DA364 80240264 0C046ED4 */ jal enable_world_fog -/* 8DA368 80240268 00000000 */ nop -/* 8DA36C 8024026C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8DA370 80240270 24020002 */ addiu $v0, $zero, 2 -/* 8DA374 80240274 03E00008 */ jr $ra -/* 8DA378 80240278 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/func_80240344_8DA100.s b/asm/nonmatchings/world/area_kmr/kmr_11/func_80240344_8DA100.s deleted file mode 100644 index 9f8bddb626..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/func_80240344_8DA100.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240344_8DA444 -/* 8DA444 80240344 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8DA448 80240348 AFBF0010 */ sw $ra, 0x10($sp) -/* 8DA44C 8024034C 8C82000C */ lw $v0, 0xc($a0) -/* 8DA450 80240350 0C0B210B */ jal get_float_variable -/* 8DA454 80240354 8C450000 */ lw $a1, ($v0) -/* 8DA458 80240358 8FBF0010 */ lw $ra, 0x10($sp) -/* 8DA45C 8024035C 24020002 */ addiu $v0, $zero, 2 -/* 8DA460 80240360 3C01800B */ lui $at, 0x800b -/* 8DA464 80240364 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 8DA468 80240368 03E00008 */ jr $ra -/* 8DA46C 8024036C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/func_80240370_8DA100.s b/asm/nonmatchings/world/area_kmr/kmr_11/func_80240370_8DA100.s deleted file mode 100644 index ce1d0d7c2e..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/func_80240370_8DA100.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240370_8DA470 -/* 8DA470 80240370 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8DA474 80240374 AFB00010 */ sw $s0, 0x10($sp) -/* 8DA478 80240378 0080802D */ daddu $s0, $a0, $zero -/* 8DA47C 8024037C AFBF001C */ sw $ra, 0x1c($sp) -/* 8DA480 80240380 AFB20018 */ sw $s2, 0x18($sp) -/* 8DA484 80240384 AFB10014 */ sw $s1, 0x14($sp) -/* 8DA488 80240388 8E110148 */ lw $s1, 0x148($s0) -/* 8DA48C 8024038C 86240008 */ lh $a0, 8($s1) -/* 8DA490 80240390 0C00EABB */ jal get_npc_unsafe -/* 8DA494 80240394 00A0902D */ daddu $s2, $a1, $zero -/* 8DA498 80240398 8E2300CC */ lw $v1, 0xcc($s1) -/* 8DA49C 8024039C 0040202D */ daddu $a0, $v0, $zero -/* 8DA4A0 802403A0 8C630000 */ lw $v1, ($v1) -/* 8DA4A4 802403A4 24020001 */ addiu $v0, $zero, 1 -/* 8DA4A8 802403A8 AC830028 */ sw $v1, 0x28($a0) -/* 8DA4AC 802403AC AE020070 */ sw $v0, 0x70($s0) -/* 8DA4B0 802403B0 8E220000 */ lw $v0, ($s1) -/* 8DA4B4 802403B4 3C030010 */ lui $v1, 0x10 -/* 8DA4B8 802403B8 00431024 */ and $v0, $v0, $v1 -/* 8DA4BC 802403BC 10400004 */ beqz $v0, .L802403D0 -/* 8DA4C0 802403C0 00000000 */ nop -/* 8DA4C4 802403C4 C620006C */ lwc1 $f0, 0x6c($s1) -/* 8DA4C8 802403C8 46800020 */ cvt.s.w $f0, $f0 -/* 8DA4CC 802403CC E480000C */ swc1 $f0, 0xc($a0) -.L802403D0: -/* 8DA4D0 802403D0 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8DA4D4 802403D4 8C420014 */ lw $v0, 0x14($v0) -/* 8DA4D8 802403D8 1C400004 */ bgtz $v0, .L802403EC -/* 8DA4DC 802403DC 00000000 */ nop -/* 8DA4E0 802403E0 C640000C */ lwc1 $f0, 0xc($s2) -/* 8DA4E4 802403E4 08090103 */ j .L8024040C -/* 8DA4E8 802403E8 E4800018 */ swc1 $f0, 0x18($a0) -.L802403EC: -/* 8DA4EC 802403EC 3C018025 */ lui $at, 0x8025 -/* 8DA4F0 802403F0 D42210B0 */ ldc1 $f2, 0x10b0($at) -/* 8DA4F4 802403F4 44820000 */ mtc1 $v0, $f0 -/* 8DA4F8 802403F8 00000000 */ nop -/* 8DA4FC 802403FC 46800021 */ cvt.d.w $f0, $f0 -/* 8DA500 80240400 46220003 */ div.d $f0, $f0, $f2 -/* 8DA504 80240404 46200020 */ cvt.s.d $f0, $f0 -/* 8DA508 80240408 E4800018 */ swc1 $f0, 0x18($a0) -.L8024040C: -/* 8DA50C 8024040C 8FBF001C */ lw $ra, 0x1c($sp) -/* 8DA510 80240410 8FB20018 */ lw $s2, 0x18($sp) -/* 8DA514 80240414 8FB10014 */ lw $s1, 0x14($sp) -/* 8DA518 80240418 8FB00010 */ lw $s0, 0x10($sp) -/* 8DA51C 8024041C 03E00008 */ jr $ra -/* 8DA520 80240420 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/func_8024061C_8DA100.s b/asm/nonmatchings/world/area_kmr/kmr_11/func_8024061C_8DA100.s deleted file mode 100644 index 0443a6c882..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/func_8024061C_8DA100.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_8DA71C -/* 8DA71C 8024061C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8DA720 80240620 AFB3001C */ sw $s3, 0x1c($sp) -/* 8DA724 80240624 0080982D */ daddu $s3, $a0, $zero -/* 8DA728 80240628 AFBF0020 */ sw $ra, 0x20($sp) -/* 8DA72C 8024062C AFB20018 */ sw $s2, 0x18($sp) -/* 8DA730 80240630 AFB10014 */ sw $s1, 0x14($sp) -/* 8DA734 80240634 AFB00010 */ sw $s0, 0x10($sp) -/* 8DA738 80240638 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8DA73C 8024063C 8E710148 */ lw $s1, 0x148($s3) -/* 8DA740 80240640 86240008 */ lh $a0, 8($s1) -/* 8DA744 80240644 0C00EABB */ jal get_npc_unsafe -/* 8DA748 80240648 00A0802D */ daddu $s0, $a1, $zero -/* 8DA74C 8024064C 8E040014 */ lw $a0, 0x14($s0) -/* 8DA750 80240650 0040902D */ daddu $s2, $v0, $zero -/* 8DA754 80240654 00041FC2 */ srl $v1, $a0, 0x1f -/* 8DA758 80240658 00832021 */ addu $a0, $a0, $v1 -/* 8DA75C 8024065C 00042043 */ sra $a0, $a0, 1 -/* 8DA760 80240660 0C00A67F */ jal rand_int -/* 8DA764 80240664 24840001 */ addiu $a0, $a0, 1 -/* 8DA768 80240668 8E030014 */ lw $v1, 0x14($s0) -/* 8DA76C 8024066C C64C0038 */ lwc1 $f12, 0x38($s2) -/* 8DA770 80240670 000327C2 */ srl $a0, $v1, 0x1f -/* 8DA774 80240674 00641821 */ addu $v1, $v1, $a0 -/* 8DA778 80240678 00031843 */ sra $v1, $v1, 1 -/* 8DA77C 8024067C 00621821 */ addu $v1, $v1, $v0 -/* 8DA780 80240680 A643008E */ sh $v1, 0x8e($s2) -/* 8DA784 80240684 8E2200CC */ lw $v0, 0xcc($s1) -/* 8DA788 80240688 C64E0040 */ lwc1 $f14, 0x40($s2) -/* 8DA78C 8024068C 8C42000C */ lw $v0, 0xc($v0) -/* 8DA790 80240690 AE420028 */ sw $v0, 0x28($s2) -/* 8DA794 80240694 C600000C */ lwc1 $f0, 0xc($s0) -/* 8DA798 80240698 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8DA79C 8024069C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8DA7A0 802406A0 E6400018 */ swc1 $f0, 0x18($s2) -/* 8DA7A4 802406A4 8C460028 */ lw $a2, 0x28($v0) -/* 8DA7A8 802406A8 0C00A720 */ jal atan2 -/* 8DA7AC 802406AC 8C470030 */ lw $a3, 0x30($v0) -/* 8DA7B0 802406B0 46000506 */ mov.s $f20, $f0 -/* 8DA7B4 802406B4 C64C000C */ lwc1 $f12, 0xc($s2) -/* 8DA7B8 802406B8 0C00A70A */ jal get_clamped_angle_diff -/* 8DA7BC 802406BC 4600A386 */ mov.s $f14, $f20 -/* 8DA7C0 802406C0 46000086 */ mov.s $f2, $f0 -/* 8DA7C4 802406C4 8E020010 */ lw $v0, 0x10($s0) -/* 8DA7C8 802406C8 46001005 */ abs.s $f0, $f2 -/* 8DA7CC 802406CC 44822000 */ mtc1 $v0, $f4 -/* 8DA7D0 802406D0 00000000 */ nop -/* 8DA7D4 802406D4 46802120 */ cvt.s.w $f4, $f4 -/* 8DA7D8 802406D8 4600203C */ c.lt.s $f4, $f0 -/* 8DA7DC 802406DC 00000000 */ nop -/* 8DA7E0 802406E0 4500000D */ bc1f .L80240718 -/* 8DA7E4 802406E4 00000000 */ nop -/* 8DA7E8 802406E8 44800000 */ mtc1 $zero, $f0 -/* 8DA7EC 802406EC C654000C */ lwc1 $f20, 0xc($s2) -/* 8DA7F0 802406F0 4600103C */ c.lt.s $f2, $f0 -/* 8DA7F4 802406F4 00000000 */ nop -/* 8DA7F8 802406F8 45000006 */ bc1f .L80240714 -/* 8DA7FC 802406FC 00021023 */ negu $v0, $v0 -/* 8DA800 80240700 44820000 */ mtc1 $v0, $f0 -/* 8DA804 80240704 00000000 */ nop -/* 8DA808 80240708 46800020 */ cvt.s.w $f0, $f0 -/* 8DA80C 8024070C 080901C6 */ j .L80240718 -/* 8DA810 80240710 4600A500 */ add.s $f20, $f20, $f0 -.L80240714: -/* 8DA814 80240714 4604A500 */ add.s $f20, $f20, $f4 -.L80240718: -/* 8DA818 80240718 0C00A6C9 */ jal clamp_angle -/* 8DA81C 8024071C 4600A306 */ mov.s $f12, $f20 -/* 8DA820 80240720 2402000D */ addiu $v0, $zero, 0xd -/* 8DA824 80240724 E640000C */ swc1 $f0, 0xc($s2) -/* 8DA828 80240728 AE620070 */ sw $v0, 0x70($s3) -/* 8DA82C 8024072C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8DA830 80240730 8FB3001C */ lw $s3, 0x1c($sp) -/* 8DA834 80240734 8FB20018 */ lw $s2, 0x18($sp) -/* 8DA838 80240738 8FB10014 */ lw $s1, 0x14($sp) -/* 8DA83C 8024073C 8FB00010 */ lw $s0, 0x10($sp) -/* 8DA840 80240740 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8DA844 80240744 03E00008 */ jr $ra -/* 8DA848 80240748 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/func_8024074C_8DA100.s b/asm/nonmatchings/world/area_kmr/kmr_11/func_8024074C_8DA100.s deleted file mode 100644 index 6d12212740..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/func_8024074C_8DA100.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024074C_8DA84C -/* 8DA84C 8024074C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8DA850 80240750 AFB3003C */ sw $s3, 0x3c($sp) -/* 8DA854 80240754 0080982D */ daddu $s3, $a0, $zero -/* 8DA858 80240758 AFBF0040 */ sw $ra, 0x40($sp) -/* 8DA85C 8024075C AFB20038 */ sw $s2, 0x38($sp) -/* 8DA860 80240760 AFB10034 */ sw $s1, 0x34($sp) -/* 8DA864 80240764 AFB00030 */ sw $s0, 0x30($sp) -/* 8DA868 80240768 8E720148 */ lw $s2, 0x148($s3) -/* 8DA86C 8024076C 00A0882D */ daddu $s1, $a1, $zero -/* 8DA870 80240770 86440008 */ lh $a0, 8($s2) -/* 8DA874 80240774 0C00EABB */ jal get_npc_unsafe -/* 8DA878 80240778 00C0802D */ daddu $s0, $a2, $zero -/* 8DA87C 8024077C 0200202D */ daddu $a0, $s0, $zero -/* 8DA880 80240780 0240282D */ daddu $a1, $s2, $zero -/* 8DA884 80240784 24030001 */ addiu $v1, $zero, 1 -/* 8DA888 80240788 AFA30010 */ sw $v1, 0x10($sp) -/* 8DA88C 8024078C 8E260018 */ lw $a2, 0x18($s1) -/* 8DA890 80240790 8E27001C */ lw $a3, 0x1c($s1) -/* 8DA894 80240794 0C01242D */ jal func_800490B4 -/* 8DA898 80240798 0040802D */ daddu $s0, $v0, $zero -/* 8DA89C 8024079C 1440001D */ bnez $v0, .L80240814 -/* 8DA8A0 802407A0 24040002 */ addiu $a0, $zero, 2 -/* 8DA8A4 802407A4 0200282D */ daddu $a1, $s0, $zero -/* 8DA8A8 802407A8 0000302D */ daddu $a2, $zero, $zero -/* 8DA8AC 802407AC 860300A8 */ lh $v1, 0xa8($s0) -/* 8DA8B0 802407B0 3C013F80 */ lui $at, 0x3f80 -/* 8DA8B4 802407B4 44810000 */ mtc1 $at, $f0 -/* 8DA8B8 802407B8 3C014000 */ lui $at, 0x4000 -/* 8DA8BC 802407BC 44811000 */ mtc1 $at, $f2 -/* 8DA8C0 802407C0 3C01C1A0 */ lui $at, 0xc1a0 -/* 8DA8C4 802407C4 44812000 */ mtc1 $at, $f4 -/* 8DA8C8 802407C8 2402000F */ addiu $v0, $zero, 0xf -/* 8DA8CC 802407CC AFA2001C */ sw $v0, 0x1c($sp) -/* 8DA8D0 802407D0 44833000 */ mtc1 $v1, $f6 -/* 8DA8D4 802407D4 00000000 */ nop -/* 8DA8D8 802407D8 468031A0 */ cvt.s.w $f6, $f6 -/* 8DA8DC 802407DC 44073000 */ mfc1 $a3, $f6 -/* 8DA8E0 802407E0 27A20028 */ addiu $v0, $sp, 0x28 -/* 8DA8E4 802407E4 AFA20020 */ sw $v0, 0x20($sp) -/* 8DA8E8 802407E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8DA8EC 802407EC E7A20014 */ swc1 $f2, 0x14($sp) -/* 8DA8F0 802407F0 0C01BFA4 */ jal fx_emote -/* 8DA8F4 802407F4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8DA8F8 802407F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 8DA8FC 802407FC 8C430000 */ lw $v1, ($v0) -/* 8DA900 80240800 24020019 */ addiu $v0, $zero, 0x19 -/* 8DA904 80240804 A602008E */ sh $v0, 0x8e($s0) -/* 8DA908 80240808 2402000E */ addiu $v0, $zero, 0xe -/* 8DA90C 8024080C 08090212 */ j .L80240848 -/* 8DA910 80240810 AE030028 */ sw $v1, 0x28($s0) -.L80240814: -/* 8DA914 80240814 8E050018 */ lw $a1, 0x18($s0) -/* 8DA918 80240818 8E06000C */ lw $a2, 0xc($s0) -/* 8DA91C 8024081C 0C00EA95 */ jal npc_move_heading -/* 8DA920 80240820 0200202D */ daddu $a0, $s0, $zero -/* 8DA924 80240824 0200202D */ daddu $a0, $s0, $zero -/* 8DA928 80240828 0C00F598 */ jal func_8003D660 -/* 8DA92C 8024082C 24050001 */ addiu $a1, $zero, 1 -/* 8DA930 80240830 9602008E */ lhu $v0, 0x8e($s0) -/* 8DA934 80240834 2442FFFF */ addiu $v0, $v0, -1 -/* 8DA938 80240838 A602008E */ sh $v0, 0x8e($s0) -/* 8DA93C 8024083C 00021400 */ sll $v0, $v0, 0x10 -/* 8DA940 80240840 14400002 */ bnez $v0, .L8024084C -/* 8DA944 80240844 2402000C */ addiu $v0, $zero, 0xc -.L80240848: -/* 8DA948 80240848 AE620070 */ sw $v0, 0x70($s3) -.L8024084C: -/* 8DA94C 8024084C 8FBF0040 */ lw $ra, 0x40($sp) -/* 8DA950 80240850 8FB3003C */ lw $s3, 0x3c($sp) -/* 8DA954 80240854 8FB20038 */ lw $s2, 0x38($sp) -/* 8DA958 80240858 8FB10034 */ lw $s1, 0x34($sp) -/* 8DA95C 8024085C 8FB00030 */ lw $s0, 0x30($sp) -/* 8DA960 80240860 03E00008 */ jr $ra -/* 8DA964 80240864 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/func_80240DDC_8DA100.s b/asm/nonmatchings/world/area_kmr/kmr_11/func_80240DDC_8DA100.s deleted file mode 100644 index b11ff38391..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/func_80240DDC_8DA100.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DDC_8DAEDC -/* 8DAEDC 80240DDC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8DAEE0 80240DE0 AFB10014 */ sw $s1, 0x14($sp) -/* 8DAEE4 80240DE4 0080882D */ daddu $s1, $a0, $zero -/* 8DAEE8 80240DE8 AFBF001C */ sw $ra, 0x1c($sp) -/* 8DAEEC 80240DEC AFB20018 */ sw $s2, 0x18($sp) -/* 8DAEF0 80240DF0 AFB00010 */ sw $s0, 0x10($sp) -/* 8DAEF4 80240DF4 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 8DAEF8 80240DF8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8DAEFC 80240DFC 0C00EABB */ jal get_npc_unsafe -/* 8DAF00 80240E00 24040004 */ addiu $a0, $zero, 4 -/* 8DAF04 80240E04 0040802D */ daddu $s0, $v0, $zero -/* 8DAF08 80240E08 3C12800B */ lui $s2, %hi(gCameras) -/* 8DAF0C 80240E0C 26521D80 */ addiu $s2, $s2, %lo(gCameras) -/* 8DAF10 80240E10 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8DAF14 80240E14 C640006C */ lwc1 $f0, 0x6c($s2) -/* 8DAF18 80240E18 46006300 */ add.s $f12, $f12, $f0 -/* 8DAF1C 80240E1C 3C014334 */ lui $at, 0x4334 -/* 8DAF20 80240E20 4481A000 */ mtc1 $at, $f20 -/* 8DAF24 80240E24 3C014220 */ lui $at, 0x4220 -/* 8DAF28 80240E28 4481B000 */ mtc1 $at, $f22 -/* 8DAF2C 80240E2C 0C00A8BB */ jal sin_deg -/* 8DAF30 80240E30 46146300 */ add.s $f12, $f12, $f20 -/* 8DAF34 80240E34 46160002 */ mul.s $f0, $f0, $f22 -/* 8DAF38 80240E38 00000000 */ nop -/* 8DAF3C 80240E3C C6020038 */ lwc1 $f2, 0x38($s0) -/* 8DAF40 80240E40 46001080 */ add.s $f2, $f2, $f0 -/* 8DAF44 80240E44 4600110D */ trunc.w.s $f4, $f2 -/* 8DAF48 80240E48 E6240084 */ swc1 $f4, 0x84($s1) -/* 8DAF4C 80240E4C C600003C */ lwc1 $f0, 0x3c($s0) -/* 8DAF50 80240E50 3C014100 */ lui $at, 0x4100 -/* 8DAF54 80240E54 44811000 */ mtc1 $at, $f2 -/* 8DAF58 80240E58 00000000 */ nop -/* 8DAF5C 80240E5C 46020000 */ add.s $f0, $f0, $f2 -/* 8DAF60 80240E60 4600010D */ trunc.w.s $f4, $f0 -/* 8DAF64 80240E64 E6240088 */ swc1 $f4, 0x88($s1) -/* 8DAF68 80240E68 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8DAF6C 80240E6C C640006C */ lwc1 $f0, 0x6c($s2) -/* 8DAF70 80240E70 46006300 */ add.s $f12, $f12, $f0 -/* 8DAF74 80240E74 0C00A8D4 */ jal cos_deg -/* 8DAF78 80240E78 46146300 */ add.s $f12, $f12, $f20 -/* 8DAF7C 80240E7C 46160002 */ mul.s $f0, $f0, $f22 -/* 8DAF80 80240E80 00000000 */ nop -/* 8DAF84 80240E84 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8DAF88 80240E88 46001081 */ sub.s $f2, $f2, $f0 -/* 8DAF8C 80240E8C 4600110D */ trunc.w.s $f4, $f2 -/* 8DAF90 80240E90 E624008C */ swc1 $f4, 0x8c($s1) -/* 8DAF94 80240E94 8FBF001C */ lw $ra, 0x1c($sp) -/* 8DAF98 80240E98 8FB20018 */ lw $s2, 0x18($sp) -/* 8DAF9C 80240E9C 8FB10014 */ lw $s1, 0x14($sp) -/* 8DAFA0 80240EA0 8FB00010 */ lw $s0, 0x10($sp) -/* 8DAFA4 80240EA4 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8DAFA8 80240EA8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8DAFAC 80240EAC 24020002 */ addiu $v0, $zero, 2 -/* 8DAFB0 80240EB0 03E00008 */ jr $ra -/* 8DAFB4 80240EB4 27BD0030 */ addiu $sp, $sp, 0x30 -/* 8DAFB8 80240EB8 00000000 */ nop -/* 8DAFBC 80240EBC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/func_80240F20_8DA100.s b/asm/nonmatchings/world/area_kmr/kmr_11/func_80240F20_8DA100.s deleted file mode 100644 index 4c28a46ee3..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/func_80240F20_8DA100.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_8DB020 -/* 8DB020 80240F20 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8DB024 80240F24 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 8DB028 80240F28 4485A000 */ mtc1 $a1, $f20 -/* 8DB02C 80240F2C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 8DB030 80240F30 4486B000 */ mtc1 $a2, $f22 -/* 8DB034 80240F34 AFB00010 */ sw $s0, 0x10($sp) -/* 8DB038 80240F38 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 8DB03C 80240F3C 4487C000 */ mtc1 $a3, $f24 -/* 8DB040 80240F40 AFBF0014 */ sw $ra, 0x14($sp) -/* 8DB044 80240F44 0C019D28 */ jal guMtxIdentF -/* 8DB048 80240F48 0080802D */ daddu $s0, $a0, $zero -/* 8DB04C 80240F4C 4616A582 */ mul.s $f22, $f20, $f22 -/* 8DB050 80240F50 00000000 */ nop -/* 8DB054 80240F54 4618A502 */ mul.s $f20, $f20, $f24 -/* 8DB058 80240F58 00000000 */ nop -/* 8DB05C 80240F5C 3C013F80 */ lui $at, 0x3f80 -/* 8DB060 80240F60 44810000 */ mtc1 $at, $f0 -/* 8DB064 80240F64 00000000 */ nop -/* 8DB068 80240F68 E6000014 */ swc1 $f0, 0x14($s0) -/* 8DB06C 80240F6C E6160010 */ swc1 $f22, 0x10($s0) -/* 8DB070 80240F70 E6140018 */ swc1 $f20, 0x18($s0) -/* 8DB074 80240F74 8FBF0014 */ lw $ra, 0x14($sp) -/* 8DB078 80240F78 8FB00010 */ lw $s0, 0x10($sp) -/* 8DB07C 80240F7C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 8DB080 80240F80 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 8DB084 80240F84 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 8DB088 80240F88 03E00008 */ jr $ra -/* 8DB08C 80240F8C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_12/_8EB360/func_80240000_8EB360.s b/asm/nonmatchings/world/area_kmr/kmr_12/_8EB360/func_80240000_8EB360.s deleted file mode 100644 index c7cc344169..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_12/_8EB360/func_80240000_8EB360.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_8EB360 -/* 8EB360 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EB364 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 8EB368 80240008 0080802D */ daddu $s0, $a0, $zero -/* 8EB36C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* 8EB370 80240010 0C00FB5A */ jal get_enemy_safe -/* 8EB374 80240014 0000202D */ daddu $a0, $zero, $zero -/* 8EB378 80240018 AE020084 */ sw $v0, 0x84($s0) -/* 8EB37C 8024001C 8FBF0014 */ lw $ra, 0x14($sp) -/* 8EB380 80240020 8FB00010 */ lw $s0, 0x10($sp) -/* 8EB384 80240024 24020002 */ addiu $v0, $zero, 2 -/* 8EB388 80240028 03E00008 */ jr $ra -/* 8EB38C 8024002C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/func_80240030_8EBE20.s b/asm/nonmatchings/world/area_kmr/kmr_20/func_80240030_8EBE20.s deleted file mode 100644 index 073446cad6..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/func_80240030_8EBE20.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240030_8EBE50 -/* 8EBE50 80240030 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8EBE54 80240034 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8EBE58 80240038 8C430004 */ lw $v1, 4($v0) -/* 8EBE5C 8024003C 3C040010 */ lui $a0, 0x10 -/* 8EBE60 80240040 00641825 */ or $v1, $v1, $a0 -/* 8EBE64 80240044 AC430004 */ sw $v1, 4($v0) -/* 8EBE68 80240048 03E00008 */ jr $ra -/* 8EBE6C 8024004C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/func_80240050_8EBE20.s b/asm/nonmatchings/world/area_kmr/kmr_20/func_80240050_8EBE20.s deleted file mode 100644 index 5940d192c0..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/func_80240050_8EBE20.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_8EBE70 -/* 8EBE70 80240050 3C028016 */ lui $v0, 0x8016 -/* 8EBE74 80240054 8442A552 */ lh $v0, -0x5aae($v0) -/* 8EBE78 80240058 AC820084 */ sw $v0, 0x84($a0) -/* 8EBE7C 8024005C 03E00008 */ jr $ra -/* 8EBE80 80240060 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/func_80240310_8EBE20.s b/asm/nonmatchings/world/area_kmr/kmr_20/func_80240310_8EBE20.s deleted file mode 100644 index 8fc01d24ae..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/func_80240310_8EBE20.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_8EC130 -/* 8EC130 80240310 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EC134 80240314 AFBF0010 */ sw $ra, 0x10($sp) -/* 8EC138 80240318 0C04E0A8 */ jal set_map_transition_effect -/* 8EC13C 8024031C 24040004 */ addiu $a0, $zero, 4 -/* 8EC140 80240320 8FBF0010 */ lw $ra, 0x10($sp) -/* 8EC144 80240324 24020002 */ addiu $v0, $zero, 2 -/* 8EC148 80240328 03E00008 */ jr $ra -/* 8EC14C 8024032C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/func_80240358_8EBE20.s b/asm/nonmatchings/world/area_kmr/kmr_20/func_80240358_8EBE20.s deleted file mode 100644 index 40da48579b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/func_80240358_8EBE20.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240358_8EC178 -/* 8EC178 80240358 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EC17C 8024035C 0000202D */ daddu $a0, $zero, $zero -/* 8EC180 80240360 240503E8 */ addiu $a1, $zero, 0x3e8 -/* 8EC184 80240364 AFBF0010 */ sw $ra, 0x10($sp) -/* 8EC188 80240368 0C01559B */ jal func_8005566C -/* 8EC18C 8024036C 2406007F */ addiu $a2, $zero, 0x7f -/* 8EC190 80240370 8FBF0010 */ lw $ra, 0x10($sp) -/* 8EC194 80240374 24020002 */ addiu $v0, $zero, 2 -/* 8EC198 80240378 03E00008 */ jr $ra -/* 8EC19C 8024037C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/func_802406BC_8EBE20.s b/asm/nonmatchings/world/area_kmr/kmr_20/func_802406BC_8EBE20.s deleted file mode 100644 index 9be1273077..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/func_802406BC_8EBE20.s +++ /dev/null @@ -1,7 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406BC_8EC4DC -/* 8EC4DC 802406BC AC80007C */ sw $zero, 0x7c($a0) -/* 8EC4E0 802406C0 03E00008 */ jr $ra -/* 8EC4E4 802406C4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/func_80240DA4_8EBE20.s b/asm/nonmatchings/world/area_kmr/kmr_20/func_80240DA4_8EBE20.s deleted file mode 100644 index de11e47680..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/func_80240DA4_8EBE20.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DA4_8ECBC4 -/* 8ECBC4 80240DA4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ECBC8 80240DA8 0000202D */ daddu $a0, $zero, $zero -/* 8ECBCC 80240DAC 240503E8 */ addiu $a1, $zero, 0x3e8 -/* 8ECBD0 80240DB0 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ECBD4 80240DB4 0C01559B */ jal func_8005566C -/* 8ECBD8 80240DB8 24060001 */ addiu $a2, $zero, 1 -/* 8ECBDC 80240DBC 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ECBE0 80240DC0 24020002 */ addiu $v0, $zero, 2 -/* 8ECBE4 80240DC4 03E00008 */ jr $ra -/* 8ECBE8 80240DC8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8ECBEC 80240DCC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/func_80241060_8EBE20.s b/asm/nonmatchings/world/area_kmr/kmr_20/func_80241060_8EBE20.s deleted file mode 100644 index 8e9f8c1c3a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/func_80241060_8EBE20.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241060_8ECE80 -/* 8ECE80 80241060 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8ECE84 80241064 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 8ECE88 80241068 4485A000 */ mtc1 $a1, $f20 -/* 8ECE8C 8024106C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 8ECE90 80241070 4486B000 */ mtc1 $a2, $f22 -/* 8ECE94 80241074 AFB00010 */ sw $s0, 0x10($sp) -/* 8ECE98 80241078 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 8ECE9C 8024107C 4487C000 */ mtc1 $a3, $f24 -/* 8ECEA0 80241080 AFBF0014 */ sw $ra, 0x14($sp) -/* 8ECEA4 80241084 0C019D28 */ jal guMtxIdentF -/* 8ECEA8 80241088 0080802D */ daddu $s0, $a0, $zero -/* 8ECEAC 8024108C 4616A582 */ mul.s $f22, $f20, $f22 -/* 8ECEB0 80241090 00000000 */ nop -/* 8ECEB4 80241094 4618A502 */ mul.s $f20, $f20, $f24 -/* 8ECEB8 80241098 00000000 */ nop -/* 8ECEBC 8024109C 3C013F80 */ lui $at, 0x3f80 -/* 8ECEC0 802410A0 44810000 */ mtc1 $at, $f0 -/* 8ECEC4 802410A4 00000000 */ nop -/* 8ECEC8 802410A8 E6000014 */ swc1 $f0, 0x14($s0) -/* 8ECECC 802410AC E6160010 */ swc1 $f22, 0x10($s0) -/* 8ECED0 802410B0 E6140018 */ swc1 $f20, 0x18($s0) -/* 8ECED4 802410B4 8FBF0014 */ lw $ra, 0x14($sp) -/* 8ECED8 802410B8 8FB00010 */ lw $s0, 0x10($sp) -/* 8ECEDC 802410BC D7B80028 */ ldc1 $f24, 0x28($sp) -/* 8ECEE0 802410C0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 8ECEE4 802410C4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 8ECEE8 802410C8 03E00008 */ jr $ra -/* 8ECEEC 802410CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/func_802412A0_8EBE20.s b/asm/nonmatchings/world/area_kmr/kmr_20/func_802412A0_8EBE20.s deleted file mode 100644 index 59c2adb5fb..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/func_802412A0_8EBE20.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412A0_8ED0C0 -/* 8ED0C0 802412A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED0C4 802412A4 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED0C8 802412A8 0C03A625 */ jal func_800E9894 -/* 8ED0CC 802412AC 00000000 */ nop -/* 8ED0D0 802412B0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED0D4 802412B4 24020002 */ addiu $v0, $zero, 2 -/* 8ED0D8 802412B8 03E00008 */ jr $ra -/* 8ED0DC 802412BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/func_80241950_8EBE20.s b/asm/nonmatchings/world/area_kmr/kmr_20/func_80241950_8EBE20.s deleted file mode 100644 index 794cb7ffad..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/func_80241950_8EBE20.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241950_8ED770 -/* 8ED770 80241950 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8ED774 80241954 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8ED778 80241958 3C014334 */ lui $at, 0x4334 -/* 8ED77C 8024195C 44816000 */ mtc1 $at, $f12 -/* 8ED780 80241960 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED784 80241964 AFBF0014 */ sw $ra, 0x14($sp) -/* 8ED788 80241968 AFB00010 */ sw $s0, 0x10($sp) -/* 8ED78C 8024196C 00031080 */ sll $v0, $v1, 2 -/* 8ED790 80241970 00431021 */ addu $v0, $v0, $v1 -/* 8ED794 80241974 00021080 */ sll $v0, $v0, 2 -/* 8ED798 80241978 00431023 */ subu $v0, $v0, $v1 -/* 8ED79C 8024197C 000218C0 */ sll $v1, $v0, 3 -/* 8ED7A0 80241980 00431021 */ addu $v0, $v0, $v1 -/* 8ED7A4 80241984 000210C0 */ sll $v0, $v0, 3 -/* 8ED7A8 80241988 3C01800B */ lui $at, 0x800b -/* 8ED7AC 8024198C 00220821 */ addu $at, $at, $v0 -/* 8ED7B0 80241990 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8ED7B4 80241994 460C0300 */ add.s $f12, $f0, $f12 -/* 8ED7B8 80241998 0C00A6C9 */ jal clamp_angle -/* 8ED7BC 8024199C 0080802D */ daddu $s0, $a0, $zero -/* 8ED7C0 802419A0 4600008D */ trunc.w.s $f2, $f0 -/* 8ED7C4 802419A4 E6020084 */ swc1 $f2, 0x84($s0) -/* 8ED7C8 802419A8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8ED7CC 802419AC 8FB00010 */ lw $s0, 0x10($sp) -/* 8ED7D0 802419B0 24020002 */ addiu $v0, $zero, 2 -/* 8ED7D4 802419B4 03E00008 */ jr $ra -/* 8ED7D8 802419B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/func_80241D70_8EBE20.s b/asm/nonmatchings/world/area_kmr/kmr_20/func_80241D70_8EBE20.s deleted file mode 100644 index 223192c9bd..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/func_80241D70_8EBE20.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D70_8EDB90 -/* 8EDB90 80241D70 3C028016 */ lui $v0, 0x8016 -/* 8EDB94 80241D74 8442A552 */ lh $v0, -0x5aae($v0) -/* 8EDB98 80241D78 AC820084 */ sw $v0, 0x84($a0) -/* 8EDB9C 80241D7C 03E00008 */ jr $ra -/* 8EDBA0 80241D80 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/func_802421A0_8EBE20.s b/asm/nonmatchings/world/area_kmr/kmr_20/func_802421A0_8EBE20.s deleted file mode 100644 index 62ba9cb125..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/func_802421A0_8EBE20.s +++ /dev/null @@ -1,452 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421A0_8EDFC0 -/* 8EDFC0 802421A0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8EDFC4 802421A4 AFB60040 */ sw $s6, 0x40($sp) -/* 8EDFC8 802421A8 0080B02D */ daddu $s6, $a0, $zero -/* 8EDFCC 802421AC AFB00028 */ sw $s0, 0x28($sp) -/* 8EDFD0 802421B0 00A0802D */ daddu $s0, $a1, $zero -/* 8EDFD4 802421B4 AFBF0044 */ sw $ra, 0x44($sp) -/* 8EDFD8 802421B8 AFB5003C */ sw $s5, 0x3c($sp) -/* 8EDFDC 802421BC AFB40038 */ sw $s4, 0x38($sp) -/* 8EDFE0 802421C0 AFB30034 */ sw $s3, 0x34($sp) -/* 8EDFE4 802421C4 AFB20030 */ sw $s2, 0x30($sp) -/* 8EDFE8 802421C8 1A00019F */ blez $s0, .L80242848 -/* 8EDFEC 802421CC AFB1002C */ sw $s1, 0x2c($sp) -/* 8EDFF0 802421D0 3C04800A */ lui $a0, 0x800a -/* 8EDFF4 802421D4 2484A66C */ addiu $a0, $a0, -0x5994 -/* 8EDFF8 802421D8 3C02DE00 */ lui $v0, 0xde00 -/* 8EDFFC 802421DC 44900000 */ mtc1 $s0, $f0 -/* 8EE000 802421E0 00000000 */ nop -/* 8EE004 802421E4 46800021 */ cvt.d.w $f0, $f0 -/* 8EE008 802421E8 8C830000 */ lw $v1, ($a0) -/* 8EE00C 802421EC 3C018025 */ lui $at, 0x8025 -/* 8EE010 802421F0 D4223030 */ ldc1 $f2, 0x3030($at) -/* 8EE014 802421F4 0060282D */ daddu $a1, $v1, $zero -/* 8EE018 802421F8 24630008 */ addiu $v1, $v1, 8 -/* 8EE01C 802421FC AC830000 */ sw $v1, ($a0) -/* 8EE020 80242200 ACA20000 */ sw $v0, ($a1) -/* 8EE024 80242204 3C028025 */ lui $v0, 0x8025 -/* 8EE028 80242208 24422D50 */ addiu $v0, $v0, 0x2d50 -/* 8EE02C 8024220C ACA20004 */ sw $v0, 4($a1) -/* 8EE030 80242210 24620008 */ addiu $v0, $v1, 8 -/* 8EE034 80242214 AC820000 */ sw $v0, ($a0) -/* 8EE038 80242218 3C02E700 */ lui $v0, 0xe700 -/* 8EE03C 8024221C 46220002 */ mul.d $f0, $f0, $f2 -/* 8EE040 80242220 00000000 */ nop -/* 8EE044 80242224 AC620000 */ sw $v0, ($v1) -/* 8EE048 80242228 24620010 */ addiu $v0, $v1, 0x10 -/* 8EE04C 8024222C AC600004 */ sw $zero, 4($v1) -/* 8EE050 80242230 AC820000 */ sw $v0, ($a0) -/* 8EE054 80242234 3C02FA00 */ lui $v0, 0xfa00 -/* 8EE058 80242238 3C0141E0 */ lui $at, 0x41e0 -/* 8EE05C 8024223C 44811800 */ mtc1 $at, $f3 -/* 8EE060 80242240 44801000 */ mtc1 $zero, $f2 -/* 8EE064 80242244 246D000C */ addiu $t5, $v1, 0xc -/* 8EE068 80242248 4620103E */ c.le.d $f2, $f0 -/* 8EE06C 8024224C 00000000 */ nop -/* 8EE070 80242250 45010005 */ bc1t .L80242268 -/* 8EE074 80242254 AC620008 */ sw $v0, 8($v1) -/* 8EE078 80242258 4620010D */ trunc.w.d $f4, $f0 -/* 8EE07C 8024225C 440C2000 */ mfc1 $t4, $f4 -/* 8EE080 80242260 080908A1 */ j .L80242284 -/* 8EE084 80242264 3C091078 */ lui $t1, 0x1078 -.L80242268: -/* 8EE088 80242268 46220001 */ sub.d $f0, $f0, $f2 -/* 8EE08C 8024226C 3C028000 */ lui $v0, 0x8000 -/* 8EE090 80242270 4620010D */ trunc.w.d $f4, $f0 -/* 8EE094 80242274 440C2000 */ mfc1 $t4, $f4 -/* 8EE098 80242278 00000000 */ nop -/* 8EE09C 8024227C 01826025 */ or $t4, $t4, $v0 -/* 8EE0A0 80242280 3C091078 */ lui $t1, 0x1078 -.L80242284: -/* 8EE0A4 80242284 35291800 */ ori $t1, $t1, 0x1800 -/* 8EE0A8 80242288 3C0BF647 */ lui $t3, 0xf647 -/* 8EE0AC 8024228C 356BC300 */ ori $t3, $t3, 0xc300 -/* 8EE0B0 80242290 3C0A0008 */ lui $t2, 8 -/* 8EE0B4 80242294 354A40AC */ ori $t2, $t2, 0x40ac -/* 8EE0B8 80242298 2404001E */ addiu $a0, $zero, 0x1e -/* 8EE0BC 8024229C 24050028 */ addiu $a1, $zero, 0x28 -/* 8EE0C0 802422A0 24060104 */ addiu $a2, $zero, 0x104 -/* 8EE0C4 802422A4 3C08800A */ lui $t0, 0x800a -/* 8EE0C8 802422A8 2508A66C */ addiu $t0, $t0, -0x5994 -/* 8EE0CC 802422AC 318200FF */ andi $v0, $t4, 0xff -/* 8EE0D0 802422B0 00491025 */ or $v0, $v0, $t1 -/* 8EE0D4 802422B4 44901000 */ mtc1 $s0, $f2 -/* 8EE0D8 802422B8 00000000 */ nop -/* 8EE0DC 802422BC 468010A1 */ cvt.d.w $f2, $f2 -/* 8EE0E0 802422C0 8D030000 */ lw $v1, ($t0) -/* 8EE0E4 802422C4 3C018025 */ lui $at, 0x8025 -/* 8EE0E8 802422C8 D4203038 */ ldc1 $f0, 0x3038($at) -/* 8EE0EC 802422CC 24110001 */ addiu $s1, $zero, 1 -/* 8EE0F0 802422D0 ADA20000 */ sw $v0, ($t5) -/* 8EE0F4 802422D4 0060102D */ daddu $v0, $v1, $zero -/* 8EE0F8 802422D8 24630008 */ addiu $v1, $v1, 8 -/* 8EE0FC 802422DC AD030000 */ sw $v1, ($t0) -/* 8EE100 802422E0 AC4B0000 */ sw $t3, ($v0) -/* 8EE104 802422E4 AC4A0004 */ sw $t2, 4($v0) -/* 8EE108 802422E8 24620008 */ addiu $v0, $v1, 8 -/* 8EE10C 802422EC AD020000 */ sw $v0, ($t0) -/* 8EE110 802422F0 3C02E700 */ lui $v0, 0xe700 -/* 8EE114 802422F4 46201082 */ mul.d $f2, $f2, $f0 -/* 8EE118 802422F8 00000000 */ nop -/* 8EE11C 802422FC AC620000 */ sw $v0, ($v1) -/* 8EE120 80242300 24020006 */ addiu $v0, $zero, 6 -/* 8EE124 80242304 AC600004 */ sw $zero, 4($v1) -/* 8EE128 80242308 AFA20010 */ sw $v0, 0x10($sp) -/* 8EE12C 8024230C AFA00014 */ sw $zero, 0x14($sp) -/* 8EE130 80242310 AFB10018 */ sw $s1, 0x18($sp) -/* 8EE134 80242314 AFB00020 */ sw $s0, 0x20($sp) -/* 8EE138 80242318 4620110D */ trunc.w.d $f4, $f2 -/* 8EE13C 8024231C E7A4001C */ swc1 $f4, 0x1c($sp) -/* 8EE140 80242320 0C04B6D6 */ jal func_8012DB58 -/* 8EE144 80242324 2407009B */ addiu $a3, $zero, 0x9b -/* 8EE148 80242328 3C04000B */ lui $a0, 0xb -/* 8EE14C 8024232C 348400FC */ ori $a0, $a0, 0xfc -/* 8EE150 80242330 0C04991D */ jal get_string_width -/* 8EE154 80242334 0000282D */ daddu $a1, $zero, $zero -/* 8EE158 80242338 3C04000B */ lui $a0, 0xb -/* 8EE15C 8024233C 348400FC */ ori $a0, $a0, 0xfc -/* 8EE160 80242340 241300CE */ addiu $s3, $zero, 0xce -/* 8EE164 80242344 02622823 */ subu $a1, $s3, $v0 -/* 8EE168 80242348 24060032 */ addiu $a2, $zero, 0x32 -/* 8EE16C 8024234C 0200382D */ daddu $a3, $s0, $zero -/* 8EE170 80242350 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE174 80242354 0C04993B */ jal draw_string -/* 8EE178 80242358 AFB10014 */ sw $s1, 0x14($sp) -/* 8EE17C 8024235C 240500D8 */ addiu $a1, $zero, 0xd8 -/* 8EE180 80242360 24060033 */ addiu $a2, $zero, 0x33 -/* 8EE184 80242364 3C128011 */ lui $s2, %hi(gPlayerData) -/* 8EE188 80242368 2652F290 */ addiu $s2, $s2, %lo(gPlayerData) -/* 8EE18C 8024236C 0220382D */ daddu $a3, $s1, $zero -/* 8EE190 80242370 8E4402B4 */ lw $a0, 0x2b4($s2) -/* 8EE194 80242374 24140002 */ addiu $s4, $zero, 2 -/* 8EE198 80242378 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE19C 8024237C AFB00014 */ sw $s0, 0x14($sp) -/* 8EE1A0 80242380 0C049DA7 */ jal draw_number -/* 8EE1A4 80242384 AFB40018 */ sw $s4, 0x18($sp) -/* 8EE1A8 80242388 3C04000B */ lui $a0, 0xb -/* 8EE1AC 8024238C 348400FD */ ori $a0, $a0, 0xfd -/* 8EE1B0 80242390 0C04991D */ jal get_string_width -/* 8EE1B4 80242394 0000282D */ daddu $a1, $zero, $zero -/* 8EE1B8 80242398 3C04000B */ lui $a0, 0xb -/* 8EE1BC 8024239C 348400FD */ ori $a0, $a0, 0xfd -/* 8EE1C0 802423A0 02622823 */ subu $a1, $s3, $v0 -/* 8EE1C4 802423A4 24060041 */ addiu $a2, $zero, 0x41 -/* 8EE1C8 802423A8 0200382D */ daddu $a3, $s0, $zero -/* 8EE1CC 802423AC AFA00010 */ sw $zero, 0x10($sp) -/* 8EE1D0 802423B0 0C04993B */ jal draw_string -/* 8EE1D4 802423B4 AFB10014 */ sw $s1, 0x14($sp) -/* 8EE1D8 802423B8 240500E7 */ addiu $a1, $zero, 0xe7 -/* 8EE1DC 802423BC 24060042 */ addiu $a2, $zero, 0x42 -/* 8EE1E0 802423C0 0220382D */ daddu $a3, $s1, $zero -/* 8EE1E4 802423C4 96C40024 */ lhu $a0, 0x24($s6) -/* 8EE1E8 802423C8 24150003 */ addiu $s5, $zero, 3 -/* 8EE1EC 802423CC AFA00010 */ sw $zero, 0x10($sp) -/* 8EE1F0 802423D0 AFB00014 */ sw $s0, 0x14($sp) -/* 8EE1F4 802423D4 0C049DA7 */ jal draw_number -/* 8EE1F8 802423D8 AFB50018 */ sw $s5, 0x18($sp) -/* 8EE1FC 802423DC 3C04001F */ lui $a0, 0x1f -/* 8EE200 802423E0 34840034 */ ori $a0, $a0, 0x34 -/* 8EE204 802423E4 240500E8 */ addiu $a1, $zero, 0xe8 -/* 8EE208 802423E8 2406003F */ addiu $a2, $zero, 0x3f -/* 8EE20C 802423EC 0200382D */ daddu $a3, $s0, $zero -/* 8EE210 802423F0 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE214 802423F4 0C04993B */ jal draw_string -/* 8EE218 802423F8 AFA00014 */ sw $zero, 0x14($sp) -/* 8EE21C 802423FC 24040050 */ addiu $a0, $zero, 0x50 -/* 8EE220 80242400 240500F4 */ addiu $a1, $zero, 0xf4 -/* 8EE224 80242404 24060042 */ addiu $a2, $zero, 0x42 -/* 8EE228 80242408 0220382D */ daddu $a3, $s1, $zero -/* 8EE22C 8024240C AFA00010 */ sw $zero, 0x10($sp) -/* 8EE230 80242410 AFB00014 */ sw $s0, 0x14($sp) -/* 8EE234 80242414 0C049DA7 */ jal draw_number -/* 8EE238 80242418 AFB40018 */ sw $s4, 0x18($sp) -/* 8EE23C 8024241C 9642032C */ lhu $v0, 0x32c($s2) -/* 8EE240 80242420 1440000A */ bnez $v0, .L8024244C -/* 8EE244 80242424 3C04000B */ lui $a0, 0xb -/* 8EE248 80242428 348400FA */ ori $a0, $a0, 0xfa -/* 8EE24C 8024242C 2405006D */ addiu $a1, $zero, 0x6d -/* 8EE250 80242430 24060050 */ addiu $a2, $zero, 0x50 -/* 8EE254 80242434 0200382D */ daddu $a3, $s0, $zero -/* 8EE258 80242438 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE25C 8024243C 0C04993B */ jal draw_string -/* 8EE260 80242440 AFB10014 */ sw $s1, 0x14($sp) -/* 8EE264 80242444 08090937 */ j .L802424DC -/* 8EE268 80242448 3C04000B */ lui $a0, 0xb -.L8024244C: -/* 8EE26C 8024244C 348400FB */ ori $a0, $a0, 0xfb -/* 8EE270 80242450 0C04991D */ jal get_string_width -/* 8EE274 80242454 0000282D */ daddu $a1, $zero, $zero -/* 8EE278 80242458 3C04000B */ lui $a0, 0xb -/* 8EE27C 8024245C 348400FB */ ori $a0, $a0, 0xfb -/* 8EE280 80242460 02622823 */ subu $a1, $s3, $v0 -/* 8EE284 80242464 24060050 */ addiu $a2, $zero, 0x50 -/* 8EE288 80242468 0200382D */ daddu $a3, $s0, $zero -/* 8EE28C 8024246C AFA00010 */ sw $zero, 0x10($sp) -/* 8EE290 80242470 0C04993B */ jal draw_string -/* 8EE294 80242474 AFB10014 */ sw $s1, 0x14($sp) -/* 8EE298 80242478 240500E7 */ addiu $a1, $zero, 0xe7 -/* 8EE29C 8024247C 24060051 */ addiu $a2, $zero, 0x51 -/* 8EE2A0 80242480 9644032C */ lhu $a0, 0x32c($s2) -/* 8EE2A4 80242484 24070001 */ addiu $a3, $zero, 1 -/* 8EE2A8 80242488 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE2AC 8024248C AFB00014 */ sw $s0, 0x14($sp) -/* 8EE2B0 80242490 0C049DA7 */ jal draw_number -/* 8EE2B4 80242494 AFB50018 */ sw $s5, 0x18($sp) -/* 8EE2B8 80242498 3C04001F */ lui $a0, 0x1f -/* 8EE2BC 8024249C 34840034 */ ori $a0, $a0, 0x34 -/* 8EE2C0 802424A0 240500E8 */ addiu $a1, $zero, 0xe8 -/* 8EE2C4 802424A4 2406004E */ addiu $a2, $zero, 0x4e -/* 8EE2C8 802424A8 0200382D */ daddu $a3, $s0, $zero -/* 8EE2CC 802424AC AFA00010 */ sw $zero, 0x10($sp) -/* 8EE2D0 802424B0 0C04993B */ jal draw_string -/* 8EE2D4 802424B4 AFA00014 */ sw $zero, 0x14($sp) -/* 8EE2D8 802424B8 240400A0 */ addiu $a0, $zero, 0xa0 -/* 8EE2DC 802424BC 240500F4 */ addiu $a1, $zero, 0xf4 -/* 8EE2E0 802424C0 24060050 */ addiu $a2, $zero, 0x50 -/* 8EE2E4 802424C4 24070001 */ addiu $a3, $zero, 1 -/* 8EE2E8 802424C8 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE2EC 802424CC AFB00014 */ sw $s0, 0x14($sp) -/* 8EE2F0 802424D0 0C049DA7 */ jal draw_number -/* 8EE2F4 802424D4 AFB40018 */ sw $s4, 0x18($sp) -/* 8EE2F8 802424D8 3C04000B */ lui $a0, 0xb -.L802424DC: -/* 8EE2FC 802424DC 348400FE */ ori $a0, $a0, 0xfe -/* 8EE300 802424E0 0C04991D */ jal get_string_width -/* 8EE304 802424E4 0000282D */ daddu $a1, $zero, $zero -/* 8EE308 802424E8 86C40026 */ lh $a0, 0x26($s6) -/* 8EE30C 802424EC 1480000C */ bnez $a0, .L80242520 -/* 8EE310 802424F0 0040182D */ daddu $v1, $v0, $zero -/* 8EE314 802424F4 3C04000B */ lui $a0, 0xb -/* 8EE318 802424F8 348400FA */ ori $a0, $a0, 0xfa -/* 8EE31C 802424FC 2405006E */ addiu $a1, $zero, 0x6e -/* 8EE320 80242500 2406005F */ addiu $a2, $zero, 0x5f -/* 8EE324 80242504 0200382D */ daddu $a3, $s0, $zero -/* 8EE328 80242508 24020001 */ addiu $v0, $zero, 1 -/* 8EE32C 8024250C AFA00010 */ sw $zero, 0x10($sp) -/* 8EE330 80242510 0C04993B */ jal draw_string -/* 8EE334 80242514 AFA20014 */ sw $v0, 0x14($sp) -/* 8EE338 80242518 0809097C */ j .L802425F0 -/* 8EE33C 8024251C 00000000 */ nop -.L80242520: -/* 8EE340 80242520 2402FFFF */ addiu $v0, $zero, -1 -/* 8EE344 80242524 1482000F */ bne $a0, $v0, .L80242564 -/* 8EE348 80242528 3C04000B */ lui $a0, 0xb -/* 8EE34C 8024252C 348400FE */ ori $a0, $a0, 0xfe -/* 8EE350 80242530 240500CE */ addiu $a1, $zero, 0xce -/* 8EE354 80242534 00A32823 */ subu $a1, $a1, $v1 -/* 8EE358 80242538 2406005F */ addiu $a2, $zero, 0x5f -/* 8EE35C 8024253C 0200382D */ daddu $a3, $s0, $zero -/* 8EE360 80242540 24020001 */ addiu $v0, $zero, 1 -/* 8EE364 80242544 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE368 80242548 0C04993B */ jal draw_string -/* 8EE36C 8024254C AFA20014 */ sw $v0, 0x14($sp) -/* 8EE370 80242550 0000202D */ daddu $a0, $zero, $zero -/* 8EE374 80242554 240500E7 */ addiu $a1, $zero, 0xe7 -/* 8EE378 80242558 24060060 */ addiu $a2, $zero, 0x60 -/* 8EE37C 8024255C 08090966 */ j .L80242598 -/* 8EE380 80242560 24070001 */ addiu $a3, $zero, 1 -.L80242564: -/* 8EE384 80242564 348400FE */ ori $a0, $a0, 0xfe -/* 8EE388 80242568 240500CE */ addiu $a1, $zero, 0xce -/* 8EE38C 8024256C 00A32823 */ subu $a1, $a1, $v1 -/* 8EE390 80242570 2406005F */ addiu $a2, $zero, 0x5f -/* 8EE394 80242574 0200382D */ daddu $a3, $s0, $zero -/* 8EE398 80242578 24020001 */ addiu $v0, $zero, 1 -/* 8EE39C 8024257C AFA00010 */ sw $zero, 0x10($sp) -/* 8EE3A0 80242580 0C04993B */ jal draw_string -/* 8EE3A4 80242584 AFA20014 */ sw $v0, 0x14($sp) -/* 8EE3A8 80242588 240500E7 */ addiu $a1, $zero, 0xe7 -/* 8EE3AC 8024258C 24060060 */ addiu $a2, $zero, 0x60 -/* 8EE3B0 80242590 24070001 */ addiu $a3, $zero, 1 -/* 8EE3B4 80242594 86C40026 */ lh $a0, 0x26($s6) -.L80242598: -/* 8EE3B8 80242598 24020003 */ addiu $v0, $zero, 3 -/* 8EE3BC 8024259C AFA00010 */ sw $zero, 0x10($sp) -/* 8EE3C0 802425A0 AFB00014 */ sw $s0, 0x14($sp) -/* 8EE3C4 802425A4 0C049DA7 */ jal draw_number -/* 8EE3C8 802425A8 AFA20018 */ sw $v0, 0x18($sp) -/* 8EE3CC 802425AC 3C04001F */ lui $a0, 0x1f -/* 8EE3D0 802425B0 34840034 */ ori $a0, $a0, 0x34 -/* 8EE3D4 802425B4 240500E8 */ addiu $a1, $zero, 0xe8 -/* 8EE3D8 802425B8 2406005D */ addiu $a2, $zero, 0x5d -/* 8EE3DC 802425BC 0200382D */ daddu $a3, $s0, $zero -/* 8EE3E0 802425C0 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE3E4 802425C4 0C04993B */ jal draw_string -/* 8EE3E8 802425C8 AFA00014 */ sw $zero, 0x14($sp) -/* 8EE3EC 802425CC 240500F4 */ addiu $a1, $zero, 0xf4 -/* 8EE3F0 802425D0 2406005F */ addiu $a2, $zero, 0x5f -/* 8EE3F4 802425D4 24070001 */ addiu $a3, $zero, 1 -/* 8EE3F8 802425D8 86C40028 */ lh $a0, 0x28($s6) -/* 8EE3FC 802425DC 24020002 */ addiu $v0, $zero, 2 -/* 8EE400 802425E0 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE404 802425E4 AFB00014 */ sw $s0, 0x14($sp) -/* 8EE408 802425E8 0C049DA7 */ jal draw_number -/* 8EE40C 802425EC AFA20018 */ sw $v0, 0x18($sp) -.L802425F0: -/* 8EE410 802425F0 3C118011 */ lui $s1, %hi(gPlayerData) -/* 8EE414 802425F4 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) -/* 8EE418 802425F8 962202C0 */ lhu $v0, 0x2c0($s1) -/* 8EE41C 802425FC 1440000B */ bnez $v0, .L8024262C -/* 8EE420 80242600 3C04000B */ lui $a0, 0xb -/* 8EE424 80242604 348400FA */ ori $a0, $a0, 0xfa -/* 8EE428 80242608 2405006D */ addiu $a1, $zero, 0x6d -/* 8EE42C 8024260C 2406006E */ addiu $a2, $zero, 0x6e -/* 8EE430 80242610 0200382D */ daddu $a3, $s0, $zero -/* 8EE434 80242614 24020001 */ addiu $v0, $zero, 1 -/* 8EE438 80242618 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE43C 8024261C 0C04993B */ jal draw_string -/* 8EE440 80242620 AFA20014 */ sw $v0, 0x14($sp) -/* 8EE444 80242624 080909B3 */ j .L802426CC -/* 8EE448 80242628 3C04000B */ lui $a0, 0xb -.L8024262C: -/* 8EE44C 8024262C 348400FF */ ori $a0, $a0, 0xff -/* 8EE450 80242630 0C04991D */ jal get_string_width -/* 8EE454 80242634 0000282D */ daddu $a1, $zero, $zero -/* 8EE458 80242638 3C04000B */ lui $a0, 0xb -/* 8EE45C 8024263C 348400FF */ ori $a0, $a0, 0xff -/* 8EE460 80242640 240500CE */ addiu $a1, $zero, 0xce -/* 8EE464 80242644 00A22823 */ subu $a1, $a1, $v0 -/* 8EE468 80242648 2406006E */ addiu $a2, $zero, 0x6e -/* 8EE46C 8024264C 0200382D */ daddu $a3, $s0, $zero -/* 8EE470 80242650 24020001 */ addiu $v0, $zero, 1 -/* 8EE474 80242654 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE478 80242658 0C04993B */ jal draw_string -/* 8EE47C 8024265C AFA20014 */ sw $v0, 0x14($sp) -/* 8EE480 80242660 240500E7 */ addiu $a1, $zero, 0xe7 -/* 8EE484 80242664 2406006F */ addiu $a2, $zero, 0x6f -/* 8EE488 80242668 24070001 */ addiu $a3, $zero, 1 -/* 8EE48C 8024266C AFA00010 */ sw $zero, 0x10($sp) -/* 8EE490 80242670 AFB00014 */ sw $s0, 0x14($sp) -/* 8EE494 80242674 962402C2 */ lhu $a0, 0x2c2($s1) -/* 8EE498 80242678 24020003 */ addiu $v0, $zero, 3 -/* 8EE49C 8024267C 0C049DA7 */ jal draw_number -/* 8EE4A0 80242680 AFA20018 */ sw $v0, 0x18($sp) -/* 8EE4A4 80242684 3C04001F */ lui $a0, 0x1f -/* 8EE4A8 80242688 34840034 */ ori $a0, $a0, 0x34 -/* 8EE4AC 8024268C 240500E8 */ addiu $a1, $zero, 0xe8 -/* 8EE4B0 80242690 2406006C */ addiu $a2, $zero, 0x6c -/* 8EE4B4 80242694 0200382D */ daddu $a3, $s0, $zero -/* 8EE4B8 80242698 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE4BC 8024269C 0C04993B */ jal draw_string -/* 8EE4C0 802426A0 AFA00014 */ sw $zero, 0x14($sp) -/* 8EE4C4 802426A4 240500F4 */ addiu $a1, $zero, 0xf4 -/* 8EE4C8 802426A8 2406006F */ addiu $a2, $zero, 0x6f -/* 8EE4CC 802426AC 24070001 */ addiu $a3, $zero, 1 -/* 8EE4D0 802426B0 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE4D4 802426B4 AFB00014 */ sw $s0, 0x14($sp) -/* 8EE4D8 802426B8 962402C0 */ lhu $a0, 0x2c0($s1) -/* 8EE4DC 802426BC 24020002 */ addiu $v0, $zero, 2 -/* 8EE4E0 802426C0 0C049DA7 */ jal draw_number -/* 8EE4E4 802426C4 AFA20018 */ sw $v0, 0x18($sp) -/* 8EE4E8 802426C8 3C04000B */ lui $a0, 0xb -.L802426CC: -/* 8EE4EC 802426CC 348400F4 */ ori $a0, $a0, 0xf4 -/* 8EE4F0 802426D0 0C04991D */ jal get_string_width -/* 8EE4F4 802426D4 0000282D */ daddu $a1, $zero, $zero -/* 8EE4F8 802426D8 3C04000B */ lui $a0, 0xb -/* 8EE4FC 802426DC 348400F4 */ ori $a0, $a0, 0xf4 -/* 8EE500 802426E0 241400CE */ addiu $s4, $zero, 0xce -/* 8EE504 802426E4 02822823 */ subu $a1, $s4, $v0 -/* 8EE508 802426E8 2406007D */ addiu $a2, $zero, 0x7d -/* 8EE50C 802426EC 0200382D */ daddu $a3, $s0, $zero -/* 8EE510 802426F0 24120001 */ addiu $s2, $zero, 1 -/* 8EE514 802426F4 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE518 802426F8 0C04993B */ jal draw_string -/* 8EE51C 802426FC AFB20014 */ sw $s2, 0x14($sp) -/* 8EE520 80242700 240500D8 */ addiu $a1, $zero, 0xd8 -/* 8EE524 80242704 2406007E */ addiu $a2, $zero, 0x7e -/* 8EE528 80242708 0240382D */ daddu $a3, $s2, $zero -/* 8EE52C 8024270C 3C118011 */ lui $s1, %hi(gPlayerData) -/* 8EE530 80242710 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) -/* 8EE534 80242714 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE538 80242718 AFB00014 */ sw $s0, 0x14($sp) -/* 8EE53C 8024271C 962402A2 */ lhu $a0, 0x2a2($s1) -/* 8EE540 80242720 24130002 */ addiu $s3, $zero, 2 -/* 8EE544 80242724 0C049DA7 */ jal draw_number -/* 8EE548 80242728 AFB30018 */ sw $s3, 0x18($sp) -/* 8EE54C 8024272C 3C04000B */ lui $a0, 0xb -/* 8EE550 80242730 348400F7 */ ori $a0, $a0, 0xf7 -/* 8EE554 80242734 0C04991D */ jal get_string_width -/* 8EE558 80242738 0000282D */ daddu $a1, $zero, $zero -/* 8EE55C 8024273C 3C04000B */ lui $a0, 0xb -/* 8EE560 80242740 348400F7 */ ori $a0, $a0, 0xf7 -/* 8EE564 80242744 02822823 */ subu $a1, $s4, $v0 -/* 8EE568 80242748 2406008C */ addiu $a2, $zero, 0x8c -/* 8EE56C 8024274C 0200382D */ daddu $a3, $s0, $zero -/* 8EE570 80242750 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE574 80242754 0C04993B */ jal draw_string -/* 8EE578 80242758 AFB20014 */ sw $s2, 0x14($sp) -/* 8EE57C 8024275C 240500D8 */ addiu $a1, $zero, 0xd8 -/* 8EE580 80242760 2406008D */ addiu $a2, $zero, 0x8d -/* 8EE584 80242764 9624029C */ lhu $a0, 0x29c($s1) -/* 8EE588 80242768 0240382D */ daddu $a3, $s2, $zero -/* 8EE58C 8024276C AFA00010 */ sw $zero, 0x10($sp) -/* 8EE590 80242770 AFB00014 */ sw $s0, 0x14($sp) -/* 8EE594 80242774 0C049DA7 */ jal draw_number -/* 8EE598 80242778 AFB30018 */ sw $s3, 0x18($sp) -/* 8EE59C 8024277C 3C04000B */ lui $a0, 0xb -/* 8EE5A0 80242780 348400F8 */ ori $a0, $a0, 0xf8 -/* 8EE5A4 80242784 0C04991D */ jal get_string_width -/* 8EE5A8 80242788 0000282D */ daddu $a1, $zero, $zero -/* 8EE5AC 8024278C 3C04000B */ lui $a0, 0xb -/* 8EE5B0 80242790 348400F8 */ ori $a0, $a0, 0xf8 -/* 8EE5B4 80242794 02822823 */ subu $a1, $s4, $v0 -/* 8EE5B8 80242798 2406009B */ addiu $a2, $zero, 0x9b -/* 8EE5BC 8024279C 0200382D */ daddu $a3, $s0, $zero -/* 8EE5C0 802427A0 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE5C4 802427A4 0C04993B */ jal draw_string -/* 8EE5C8 802427A8 AFB20014 */ sw $s2, 0x14($sp) -/* 8EE5CC 802427AC 240500D8 */ addiu $a1, $zero, 0xd8 -/* 8EE5D0 802427B0 2406009C */ addiu $a2, $zero, 0x9c -/* 8EE5D4 802427B4 9624029E */ lhu $a0, 0x29e($s1) -/* 8EE5D8 802427B8 0240382D */ daddu $a3, $s2, $zero -/* 8EE5DC 802427BC AFA00010 */ sw $zero, 0x10($sp) -/* 8EE5E0 802427C0 AFB00014 */ sw $s0, 0x14($sp) -/* 8EE5E4 802427C4 0C049DA7 */ jal draw_number -/* 8EE5E8 802427C8 AFB30018 */ sw $s3, 0x18($sp) -/* 8EE5EC 802427CC 962202A0 */ lhu $v0, 0x2a0($s1) -/* 8EE5F0 802427D0 1440000A */ bnez $v0, .L802427FC -/* 8EE5F4 802427D4 3C04000B */ lui $a0, 0xb -/* 8EE5F8 802427D8 348400FA */ ori $a0, $a0, 0xfa -/* 8EE5FC 802427DC 2405006D */ addiu $a1, $zero, 0x6d -/* 8EE600 802427E0 240600AA */ addiu $a2, $zero, 0xaa -/* 8EE604 802427E4 0200382D */ daddu $a3, $s0, $zero -/* 8EE608 802427E8 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE60C 802427EC 0C04993B */ jal draw_string -/* 8EE610 802427F0 AFB20014 */ sw $s2, 0x14($sp) -/* 8EE614 802427F4 08090A12 */ j .L80242848 -/* 8EE618 802427F8 00000000 */ nop -.L802427FC: -/* 8EE61C 802427FC 348400F9 */ ori $a0, $a0, 0xf9 -/* 8EE620 80242800 0C04991D */ jal get_string_width -/* 8EE624 80242804 0000282D */ daddu $a1, $zero, $zero -/* 8EE628 80242808 3C04000B */ lui $a0, 0xb -/* 8EE62C 8024280C 348400F9 */ ori $a0, $a0, 0xf9 -/* 8EE630 80242810 02822823 */ subu $a1, $s4, $v0 -/* 8EE634 80242814 240600AA */ addiu $a2, $zero, 0xaa -/* 8EE638 80242818 0200382D */ daddu $a3, $s0, $zero -/* 8EE63C 8024281C AFA00010 */ sw $zero, 0x10($sp) -/* 8EE640 80242820 0C04993B */ jal draw_string -/* 8EE644 80242824 AFB20014 */ sw $s2, 0x14($sp) -/* 8EE648 80242828 240500D8 */ addiu $a1, $zero, 0xd8 -/* 8EE64C 8024282C 240600AB */ addiu $a2, $zero, 0xab -/* 8EE650 80242830 962402A0 */ lhu $a0, 0x2a0($s1) -/* 8EE654 80242834 24070001 */ addiu $a3, $zero, 1 -/* 8EE658 80242838 AFA00010 */ sw $zero, 0x10($sp) -/* 8EE65C 8024283C AFB00014 */ sw $s0, 0x14($sp) -/* 8EE660 80242840 0C049DA7 */ jal draw_number -/* 8EE664 80242844 AFB30018 */ sw $s3, 0x18($sp) -.L80242848: -/* 8EE668 80242848 8FBF0044 */ lw $ra, 0x44($sp) -/* 8EE66C 8024284C 8FB60040 */ lw $s6, 0x40($sp) -/* 8EE670 80242850 8FB5003C */ lw $s5, 0x3c($sp) -/* 8EE674 80242854 8FB40038 */ lw $s4, 0x38($sp) -/* 8EE678 80242858 8FB30034 */ lw $s3, 0x34($sp) -/* 8EE67C 8024285C 8FB20030 */ lw $s2, 0x30($sp) -/* 8EE680 80242860 8FB1002C */ lw $s1, 0x2c($sp) -/* 8EE684 80242864 8FB00028 */ lw $s0, 0x28($sp) -/* 8EE688 80242868 03E00008 */ jr $ra -/* 8EE68C 8024286C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/func_802402C8_8FEE80.s b/asm/nonmatchings/world/area_kmr/kmr_21/func_802402C8_8FEE80.s deleted file mode 100644 index d68dc0133e..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_21/func_802402C8_8FEE80.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402C8_8FF148 -/* 8FF148 802402C8 8C820084 */ lw $v0, 0x84($a0) -/* 8FF14C 802402CC 3C018024 */ lui $at, 0x8024 -/* 8FF150 802402D0 AC220334 */ sw $v0, 0x334($at) -/* 8FF154 802402D4 03E00008 */ jr $ra -/* 8FF158 802402D8 24020002 */ addiu $v0, $zero, 2 -/* 8FF15C 802402DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/func_80240010_8FF670.s b/asm/nonmatchings/world/area_kmr/kmr_22/func_80240010_8FF670.s deleted file mode 100644 index a84ec57135..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_22/func_80240010_8FF670.s +++ /dev/null @@ -1,128 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240010_8FF680 -/* 8FF680 80240010 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8FF684 80240014 AFBF0020 */ sw $ra, 0x20($sp) -/* 8FF688 80240018 AFB1001C */ sw $s1, 0x1c($sp) -/* 8FF68C 8024001C AFB00018 */ sw $s0, 0x18($sp) -/* 8FF690 80240020 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8FF694 80240024 8C900084 */ lw $s0, 0x84($a0) -/* 8FF698 80240028 16000003 */ bnez $s0, .L80240038 -/* 8FF69C 8024002C 0000882D */ daddu $s1, $zero, $zero -/* 8FF6A0 80240030 24100009 */ addiu $s0, $zero, 9 -/* 8FF6A4 80240034 24110026 */ addiu $s1, $zero, 0x26 -.L80240038: -/* 8FF6A8 80240038 10A00012 */ beqz $a1, .L80240084 -/* 8FF6AC 8024003C 00000000 */ nop -/* 8FF6B0 80240040 3C013F80 */ lui $at, 0x3f80 -/* 8FF6B4 80240044 4481A000 */ mtc1 $at, $f20 -/* 8FF6B8 80240048 0C00AFB7 */ jal set_curtain_scale_goal -/* 8FF6BC 8024004C 4600A306 */ mov.s $f12, $f20 -/* 8FF6C0 80240050 3C0142C8 */ lui $at, 0x42c8 -/* 8FF6C4 80240054 44810000 */ mtc1 $at, $f0 -/* 8FF6C8 80240058 0200202D */ daddu $a0, $s0, $zero -/* 8FF6CC 8024005C 44050000 */ mfc1 $a1, $f0 -/* 8FF6D0 80240060 0000382D */ daddu $a3, $zero, $zero -/* 8FF6D4 80240064 E7B40010 */ swc1 $f20, 0x10($sp) -/* 8FF6D8 80240068 AFA00014 */ sw $zero, 0x14($sp) -/* 8FF6DC 8024006C 0C01C97C */ jal func_800725F0 -/* 8FF6E0 80240070 00A0302D */ daddu $a2, $a1, $zero -/* 8FF6E4 80240074 3C018025 */ lui $at, 0x8025 -/* 8FF6E8 80240078 AC2283C0 */ sw $v0, -0x7c40($at) -/* 8FF6EC 8024007C 3C018025 */ lui $at, 0x8025 -/* 8FF6F0 80240080 AC2083C4 */ sw $zero, -0x7c3c($at) -.L80240084: -/* 8FF6F4 80240084 3C038025 */ lui $v1, 0x8025 -/* 8FF6F8 80240088 8C6383C4 */ lw $v1, -0x7c3c($v1) -/* 8FF6FC 8024008C 04600009 */ bltz $v1, .L802400B4 -/* 8FF700 80240090 26240075 */ addiu $a0, $s1, 0x75 -/* 8FF704 80240094 28620014 */ slti $v0, $v1, 0x14 -/* 8FF708 80240098 10400007 */ beqz $v0, .L802400B8 -/* 8FF70C 8024009C 00031040 */ sll $v0, $v1, 1 -/* 8FF710 802400A0 3C018024 */ lui $at, 0x8024 -/* 8FF714 802400A4 00220821 */ addu $at, $at, $v0 -/* 8FF718 802400A8 84220DE0 */ lh $v0, 0xde0($at) -/* 8FF71C 802400AC 0809002E */ j .L802400B8 -/* 8FF720 802400B0 00822023 */ subu $a0, $a0, $v0 -.L802400B4: -/* 8FF724 802400B4 2624FF3F */ addiu $a0, $s1, -0xc1 -.L802400B8: -/* 8FF728 802400B8 2406003A */ addiu $a2, $zero, 0x3a -/* 8FF72C 802400BC 3C038025 */ lui $v1, 0x8025 -/* 8FF730 802400C0 8C6383C0 */ lw $v1, -0x7c40($v1) -/* 8FF734 802400C4 44840000 */ mtc1 $a0, $f0 -/* 8FF738 802400C8 00000000 */ nop -/* 8FF73C 802400CC 46800020 */ cvt.s.w $f0, $f0 -/* 8FF740 802400D0 8C62000C */ lw $v0, 0xc($v1) -/* 8FF744 802400D4 E4400004 */ swc1 $f0, 4($v0) -/* 8FF748 802400D8 8C62000C */ lw $v0, 0xc($v1) -/* 8FF74C 802400DC 3C038025 */ lui $v1, 0x8025 -/* 8FF750 802400E0 8C6383C4 */ lw $v1, -0x7c3c($v1) -/* 8FF754 802400E4 44860000 */ mtc1 $a2, $f0 -/* 8FF758 802400E8 00000000 */ nop -/* 8FF75C 802400EC 46800020 */ cvt.s.w $f0, $f0 -/* 8FF760 802400F0 E4400008 */ swc1 $f0, 8($v0) -/* 8FF764 802400F4 2862000A */ slti $v0, $v1, 0xa -/* 8FF768 802400F8 1440000A */ bnez $v0, .L80240124 -/* 8FF76C 802400FC 26240075 */ addiu $a0, $s1, 0x75 -/* 8FF770 80240100 2862001E */ slti $v0, $v1, 0x1e -/* 8FF774 80240104 10400008 */ beqz $v0, .L80240128 -/* 8FF778 80240108 2462FFF6 */ addiu $v0, $v1, -0xa -/* 8FF77C 8024010C 00021040 */ sll $v0, $v0, 1 -/* 8FF780 80240110 3C018024 */ lui $at, 0x8024 -/* 8FF784 80240114 00220821 */ addu $at, $at, $v0 -/* 8FF788 80240118 84220DE0 */ lh $v0, 0xde0($at) -/* 8FF78C 8024011C 0809004A */ j .L80240128 -/* 8FF790 80240120 00C23023 */ subu $a2, $a2, $v0 -.L80240124: -/* 8FF794 80240124 2406FF04 */ addiu $a2, $zero, -0xfc -.L80240128: -/* 8FF798 80240128 3C038025 */ lui $v1, 0x8025 -/* 8FF79C 8024012C 8C6383C0 */ lw $v1, -0x7c40($v1) -/* 8FF7A0 80240130 44840000 */ mtc1 $a0, $f0 -/* 8FF7A4 80240134 00000000 */ nop -/* 8FF7A8 80240138 46800020 */ cvt.s.w $f0, $f0 -/* 8FF7AC 8024013C 8C62000C */ lw $v0, 0xc($v1) -/* 8FF7B0 80240140 E4400010 */ swc1 $f0, 0x10($v0) -/* 8FF7B4 80240144 8C62000C */ lw $v0, 0xc($v1) -/* 8FF7B8 80240148 3C038025 */ lui $v1, 0x8025 -/* 8FF7BC 8024014C 8C6383C4 */ lw $v1, -0x7c3c($v1) -/* 8FF7C0 80240150 44860000 */ mtc1 $a2, $f0 -/* 8FF7C4 80240154 00000000 */ nop -/* 8FF7C8 80240158 46800020 */ cvt.s.w $f0, $f0 -/* 8FF7CC 8024015C E4400014 */ swc1 $f0, 0x14($v0) -/* 8FF7D0 80240160 28620014 */ slti $v0, $v1, 0x14 -/* 8FF7D4 80240164 1440000A */ bnez $v0, .L80240190 -/* 8FF7D8 80240168 24040118 */ addiu $a0, $zero, 0x118 -/* 8FF7DC 8024016C 28620028 */ slti $v0, $v1, 0x28 -/* 8FF7E0 80240170 10400008 */ beqz $v0, .L80240194 -/* 8FF7E4 80240174 2462FFEC */ addiu $v0, $v1, -0x14 -/* 8FF7E8 80240178 00021040 */ sll $v0, $v0, 1 -/* 8FF7EC 8024017C 3C018024 */ lui $at, 0x8024 -/* 8FF7F0 80240180 00220821 */ addu $at, $at, $v0 -/* 8FF7F4 80240184 84220DE0 */ lh $v0, 0xde0($at) -/* 8FF7F8 80240188 08090065 */ j .L80240194 -/* 8FF7FC 8024018C 00442021 */ addu $a0, $v0, $a0 -.L80240190: -/* 8FF800 80240190 2404024E */ addiu $a0, $zero, 0x24e -.L80240194: -/* 8FF804 80240194 3C058025 */ lui $a1, 0x8025 -/* 8FF808 80240198 8CA583C0 */ lw $a1, -0x7c40($a1) -/* 8FF80C 8024019C 8CA3000C */ lw $v1, 0xc($a1) -/* 8FF810 802401A0 2406005A */ addiu $a2, $zero, 0x5a -/* 8FF814 802401A4 AC640040 */ sw $a0, 0x40($v1) -/* 8FF818 802401A8 3C048025 */ lui $a0, 0x8025 -/* 8FF81C 802401AC 248483C4 */ addiu $a0, $a0, -0x7c3c -/* 8FF820 802401B0 8C830000 */ lw $v1, ($a0) -/* 8FF824 802401B4 8CA5000C */ lw $a1, 0xc($a1) -/* 8FF828 802401B8 24630001 */ addiu $v1, $v1, 1 -/* 8FF82C 802401BC AC830000 */ sw $v1, ($a0) -/* 8FF830 802401C0 ACA60044 */ sw $a2, 0x44($a1) -/* 8FF834 802401C4 8FBF0020 */ lw $ra, 0x20($sp) -/* 8FF838 802401C8 8FB1001C */ lw $s1, 0x1c($sp) -/* 8FF83C 802401CC 8FB00018 */ lw $s0, 0x18($sp) -/* 8FF840 802401D0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8FF844 802401D4 0000102D */ daddu $v0, $zero, $zero -/* 8FF848 802401D8 03E00008 */ jr $ra -/* 8FF84C 802401DC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/func_80240B00_8FF670.s b/asm/nonmatchings/world/area_kmr/kmr_22/func_80240B00_8FF670.s deleted file mode 100644 index 5dc29783e0..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_22/func_80240B00_8FF670.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B00_900170 -/* 900170 80240B00 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 900174 80240B04 3C028024 */ lui $v0, 0x8024 -/* 900178 80240B08 2442056C */ addiu $v0, $v0, 0x56c -/* 90017C 80240B0C AFA2001C */ sw $v0, 0x1c($sp) -/* 900180 80240B10 2402000A */ addiu $v0, $zero, 0xa -/* 900184 80240B14 AFA20014 */ sw $v0, 0x14($sp) -/* 900188 80240B18 24020001 */ addiu $v0, $zero, 1 -/* 90018C 80240B1C 27A40010 */ addiu $a0, $sp, 0x10 -/* 900190 80240B20 AFBF0020 */ sw $ra, 0x20($sp) -/* 900194 80240B24 AFA00018 */ sw $zero, 0x18($sp) -/* 900198 80240B28 0C047644 */ jal queue_render_task -/* 90019C 80240B2C AFA20010 */ sw $v0, 0x10($sp) -/* 9001A0 80240B30 8FBF0020 */ lw $ra, 0x20($sp) -/* 9001A4 80240B34 03E00008 */ jr $ra -/* 9001A8 80240B38 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/func_80240B4C_8FF670.s b/asm/nonmatchings/world/area_kmr/kmr_22/func_80240B4C_8FF670.s deleted file mode 100644 index 42bdeb3094..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_22/func_80240B4C_8FF670.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B4C_9001BC -/* 9001BC 80240B4C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9001C0 80240B50 AFB00010 */ sw $s0, 0x10($sp) -/* 9001C4 80240B54 0080802D */ daddu $s0, $a0, $zero -/* 9001C8 80240B58 AFBF0014 */ sw $ra, 0x14($sp) -/* 9001CC 80240B5C 0C00AB39 */ jal heap_malloc -/* 9001D0 80240B60 24040780 */ addiu $a0, $zero, 0x780 -/* 9001D4 80240B64 0200202D */ daddu $a0, $s0, $zero -/* 9001D8 80240B68 3C05FD05 */ lui $a1, 0xfd05 -/* 9001DC 80240B6C 34A50F80 */ ori $a1, $a1, 0xf80 -/* 9001E0 80240B70 0C0B2026 */ jal set_variable -/* 9001E4 80240B74 0040302D */ daddu $a2, $v0, $zero -/* 9001E8 80240B78 2402FFFF */ addiu $v0, $zero, -1 -/* 9001EC 80240B7C 3C058024 */ lui $a1, 0x8024 -/* 9001F0 80240B80 24A50B00 */ addiu $a1, $a1, 0xb00 -/* 9001F4 80240B84 3C018025 */ lui $at, 0x8025 -/* 9001F8 80240B88 AC2283D0 */ sw $v0, -0x7c30($at) -/* 9001FC 80240B8C 0C048C56 */ jal bind_dynamic_entity_3 -/* 900200 80240B90 0000202D */ daddu $a0, $zero, $zero -/* 900204 80240B94 8FBF0014 */ lw $ra, 0x14($sp) -/* 900208 80240B98 8FB00010 */ lw $s0, 0x10($sp) -/* 90020C 80240B9C 24020002 */ addiu $v0, $zero, 2 -/* 900210 80240BA0 03E00008 */ jr $ra -/* 900214 80240BA4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/func_80240BA8_8FF670.s b/asm/nonmatchings/world/area_kmr/kmr_22/func_80240BA8_8FF670.s deleted file mode 100644 index 0679a2a1b3..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_22/func_80240BA8_8FF670.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BA8_900218 -/* 900218 80240BA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 90021C 80240BAC AFB10014 */ sw $s1, 0x14($sp) -/* 900220 80240BB0 0080882D */ daddu $s1, $a0, $zero -/* 900224 80240BB4 AFBF0018 */ sw $ra, 0x18($sp) -/* 900228 80240BB8 AFB00010 */ sw $s0, 0x10($sp) -/* 90022C 80240BBC 8E30000C */ lw $s0, 0xc($s1) -/* 900230 80240BC0 8E050000 */ lw $a1, ($s0) -/* 900234 80240BC4 0C0B1EAF */ jal get_variable -/* 900238 80240BC8 26100004 */ addiu $s0, $s0, 4 -/* 90023C 80240BCC 0220202D */ daddu $a0, $s1, $zero -/* 900240 80240BD0 8E050000 */ lw $a1, ($s0) -/* 900244 80240BD4 0C0B1EAF */ jal get_variable -/* 900248 80240BD8 0040802D */ daddu $s0, $v0, $zero -/* 90024C 80240BDC 0040202D */ daddu $a0, $v0, $zero -/* 900250 80240BE0 24020001 */ addiu $v0, $zero, 1 -/* 900254 80240BE4 12020019 */ beq $s0, $v0, .L80240C4C -/* 900258 80240BE8 2A020002 */ slti $v0, $s0, 2 -/* 90025C 80240BEC 10400005 */ beqz $v0, .L80240C04 -/* 900260 80240BF0 24020002 */ addiu $v0, $zero, 2 -/* 900264 80240BF4 12000009 */ beqz $s0, .L80240C1C -/* 900268 80240BF8 00041840 */ sll $v1, $a0, 1 -/* 90026C 80240BFC 0809033D */ j .L80240CF4 -/* 900270 80240C00 00000000 */ nop -.L80240C04: -/* 900274 80240C04 1202001F */ beq $s0, $v0, .L80240C84 -/* 900278 80240C08 24020003 */ addiu $v0, $zero, 3 -/* 90027C 80240C0C 1202002B */ beq $s0, $v0, .L80240CBC -/* 900280 80240C10 3C068020 */ lui $a2, 0x8020 -/* 900284 80240C14 0809033D */ j .L80240CF4 -/* 900288 80240C18 00000000 */ nop -.L80240C1C: -/* 90028C 80240C1C 3C028024 */ lui $v0, 0x8024 -/* 900290 80240C20 24421FE0 */ addiu $v0, $v0, 0x1fe0 -/* 900294 80240C24 00641821 */ addu $v1, $v1, $a0 -/* 900298 80240C28 00032080 */ sll $a0, $v1, 2 -/* 90029C 80240C2C 00822021 */ addu $a0, $a0, $v0 -/* 9002A0 80240C30 24630001 */ addiu $v1, $v1, 1 -/* 9002A4 80240C34 00031880 */ sll $v1, $v1, 2 -/* 9002A8 80240C38 00621821 */ addu $v1, $v1, $v0 -/* 9002AC 80240C3C 8C840000 */ lw $a0, ($a0) -/* 9002B0 80240C40 8C650000 */ lw $a1, ($v1) -/* 9002B4 80240C44 0809033B */ j .L80240CEC -/* 9002B8 80240C48 3C068020 */ lui $a2, 0x8020 -.L80240C4C: -/* 9002BC 80240C4C 3C068020 */ lui $a2, 0x8020 -/* 9002C0 80240C50 3C028024 */ lui $v0, 0x8024 -/* 9002C4 80240C54 24421FE0 */ addiu $v0, $v0, 0x1fe0 -/* 9002C8 80240C58 00041840 */ sll $v1, $a0, 1 -/* 9002CC 80240C5C 00641821 */ addu $v1, $v1, $a0 -/* 9002D0 80240C60 00032080 */ sll $a0, $v1, 2 -/* 9002D4 80240C64 00822021 */ addu $a0, $a0, $v0 -/* 9002D8 80240C68 24630001 */ addiu $v1, $v1, 1 -/* 9002DC 80240C6C 00031880 */ sll $v1, $v1, 2 -/* 9002E0 80240C70 00621821 */ addu $v1, $v1, $v0 -/* 9002E4 80240C74 8C840000 */ lw $a0, ($a0) -/* 9002E8 80240C78 8C650000 */ lw $a1, ($v1) -/* 9002EC 80240C7C 0809033B */ j .L80240CEC -/* 9002F0 80240C80 34C64000 */ ori $a2, $a2, 0x4000 -.L80240C84: -/* 9002F4 80240C84 3C068020 */ lui $a2, 0x8020 -/* 9002F8 80240C88 3C028024 */ lui $v0, 0x8024 -/* 9002FC 80240C8C 24421FE0 */ addiu $v0, $v0, 0x1fe0 -/* 900300 80240C90 00041840 */ sll $v1, $a0, 1 -/* 900304 80240C94 00641821 */ addu $v1, $v1, $a0 -/* 900308 80240C98 00032080 */ sll $a0, $v1, 2 -/* 90030C 80240C9C 00822021 */ addu $a0, $a0, $v0 -/* 900310 80240CA0 24630001 */ addiu $v1, $v1, 1 -/* 900314 80240CA4 00031880 */ sll $v1, $v1, 2 -/* 900318 80240CA8 00621821 */ addu $v1, $v1, $v0 -/* 90031C 80240CAC 8C840000 */ lw $a0, ($a0) -/* 900320 80240CB0 8C650000 */ lw $a1, ($v1) -/* 900324 80240CB4 0809033B */ j .L80240CEC -/* 900328 80240CB8 34C67000 */ ori $a2, $a2, 0x7000 -.L80240CBC: -/* 90032C 80240CBC 3C028024 */ lui $v0, 0x8024 -/* 900330 80240CC0 24421FE0 */ addiu $v0, $v0, 0x1fe0 -/* 900334 80240CC4 00041840 */ sll $v1, $a0, 1 -/* 900338 80240CC8 00641821 */ addu $v1, $v1, $a0 -/* 90033C 80240CCC 00032080 */ sll $a0, $v1, 2 -/* 900340 80240CD0 00822021 */ addu $a0, $a0, $v0 -/* 900344 80240CD4 24630001 */ addiu $v1, $v1, 1 -/* 900348 80240CD8 00031880 */ sll $v1, $v1, 2 -/* 90034C 80240CDC 00621821 */ addu $v1, $v1, $v0 -/* 900350 80240CE0 8C840000 */ lw $a0, ($a0) -/* 900354 80240CE4 8C650000 */ lw $a1, ($v1) -/* 900358 80240CE8 34C6A000 */ ori $a2, $a2, 0xa000 -.L80240CEC: -/* 90035C 80240CEC 0C00A5CF */ jal dma_copy -/* 900360 80240CF0 00000000 */ nop -.L80240CF4: -/* 900364 80240CF4 8FBF0018 */ lw $ra, 0x18($sp) -/* 900368 80240CF8 8FB10014 */ lw $s1, 0x14($sp) -/* 90036C 80240CFC 8FB00010 */ lw $s0, 0x10($sp) -/* 900370 80240D00 24020002 */ addiu $v0, $zero, 2 -/* 900374 80240D04 03E00008 */ jr $ra -/* 900378 80240D08 27BD0020 */ addiu $sp, $sp, 0x20 -/* 90037C 80240D0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/func_80240010_907A30.s b/asm/nonmatchings/world/area_kmr/kmr_23/func_80240010_907A30.s deleted file mode 100644 index 1a27325c88..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_23/func_80240010_907A30.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240010_907A40 -/* 907A40 80240010 3C014000 */ lui $at, 0x4000 -/* 907A44 80240014 44816000 */ mtc1 $at, $f12 -/* 907A48 80240018 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 907A4C 8024001C AFBF0010 */ sw $ra, 0x10($sp) -/* 907A50 80240020 0C00AFB7 */ jal set_curtain_scale_goal -/* 907A54 80240024 00000000 */ nop -/* 907A58 80240028 0C00AFC1 */ jal set_curtain_draw_callback -/* 907A5C 8024002C 0000202D */ daddu $a0, $zero, $zero -/* 907A60 80240030 8FBF0010 */ lw $ra, 0x10($sp) -/* 907A64 80240034 24020002 */ addiu $v0, $zero, 2 -/* 907A68 80240038 03E00008 */ jr $ra -/* 907A6C 8024003C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/func_80240040_907A30.s b/asm/nonmatchings/world/area_kmr/kmr_23/func_80240040_907A30.s deleted file mode 100644 index 6c5267dff4..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_23/func_80240040_907A30.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_907A70 -/* 907A70 80240040 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 907A74 80240044 AFB30024 */ sw $s3, 0x24($sp) -/* 907A78 80240048 0080982D */ daddu $s3, $a0, $zero -/* 907A7C 8024004C AFB00018 */ sw $s0, 0x18($sp) -/* 907A80 80240050 00A0802D */ daddu $s0, $a1, $zero -/* 907A84 80240054 AFBF0028 */ sw $ra, 0x28($sp) -/* 907A88 80240058 AFB20020 */ sw $s2, 0x20($sp) -/* 907A8C 8024005C AFB1001C */ sw $s1, 0x1c($sp) -/* 907A90 80240060 8E71000C */ lw $s1, 0xc($s3) -/* 907A94 80240064 0C00EAD2 */ jal get_npc_safe -/* 907A98 80240068 0000202D */ daddu $a0, $zero, $zero -/* 907A9C 8024006C 12000037 */ beqz $s0, .L8024014C -/* 907AA0 80240070 0040902D */ daddu $s2, $v0, $zero -/* 907AA4 80240074 0C00AB39 */ jal heap_malloc -/* 907AA8 80240078 24040030 */ addiu $a0, $zero, 0x30 -/* 907AAC 8024007C 0040802D */ daddu $s0, $v0, $zero -/* 907AB0 80240080 0260202D */ daddu $a0, $s3, $zero -/* 907AB4 80240084 3C05FD05 */ lui $a1, 0xfd05 -/* 907AB8 80240088 34A50F80 */ ori $a1, $a1, 0xf80 -/* 907ABC 8024008C 0200302D */ daddu $a2, $s0, $zero -/* 907AC0 80240090 0C0B2026 */ jal set_variable -/* 907AC4 80240094 AE700060 */ sw $s0, 0x60($s3) -/* 907AC8 80240098 8E250000 */ lw $a1, ($s1) -/* 907ACC 8024009C 26310004 */ addiu $s1, $s1, 4 -/* 907AD0 802400A0 0C0B1EAF */ jal get_variable -/* 907AD4 802400A4 0260202D */ daddu $a0, $s3, $zero -/* 907AD8 802400A8 A6020022 */ sh $v0, 0x22($s0) -/* 907ADC 802400AC 8E250000 */ lw $a1, ($s1) -/* 907AE0 802400B0 26310004 */ addiu $s1, $s1, 4 -/* 907AE4 802400B4 0C0B210B */ jal get_float_variable -/* 907AE8 802400B8 0260202D */ daddu $a0, $s3, $zero -/* 907AEC 802400BC E6000000 */ swc1 $f0, ($s0) -/* 907AF0 802400C0 8E250000 */ lw $a1, ($s1) -/* 907AF4 802400C4 26310004 */ addiu $s1, $s1, 4 -/* 907AF8 802400C8 0C0B210B */ jal get_float_variable -/* 907AFC 802400CC 0260202D */ daddu $a0, $s3, $zero -/* 907B00 802400D0 E6000004 */ swc1 $f0, 4($s0) -/* 907B04 802400D4 8E250000 */ lw $a1, ($s1) -/* 907B08 802400D8 0C0B210B */ jal get_float_variable -/* 907B0C 802400DC 0260202D */ daddu $a0, $s3, $zero -/* 907B10 802400E0 E6000008 */ swc1 $f0, 8($s0) -/* 907B14 802400E4 3C013F80 */ lui $at, 0x3f80 -/* 907B18 802400E8 44810000 */ mtc1 $at, $f0 -/* 907B1C 802400EC 24020016 */ addiu $v0, $zero, 0x16 -/* 907B20 802400F0 AE000010 */ sw $zero, 0x10($s0) -/* 907B24 802400F4 A600001C */ sh $zero, 0x1c($s0) -/* 907B28 802400F8 A6000024 */ sh $zero, 0x24($s0) -/* 907B2C 802400FC A600001E */ sh $zero, 0x1e($s0) -/* 907B30 80240100 A24000AC */ sb $zero, 0xac($s2) -/* 907B34 80240104 A24200AA */ sb $v0, 0xaa($s2) -/* 907B38 80240108 AFA00014 */ sw $zero, 0x14($sp) -/* 907B3C 8024010C E7A00010 */ swc1 $f0, 0x10($sp) -/* 907B40 80240110 8E050000 */ lw $a1, ($s0) -/* 907B44 80240114 8E060004 */ lw $a2, 4($s0) -/* 907B48 80240118 8E070008 */ lw $a3, 8($s0) -/* 907B4C 8024011C 0C01C9AC */ jal func_800726B0 -/* 907B50 80240120 24040001 */ addiu $a0, $zero, 1 -/* 907B54 80240124 AE020028 */ sw $v0, 0x28($s0) -/* 907B58 80240128 8C43000C */ lw $v1, 0xc($v0) -/* 907B5C 8024012C 92020023 */ lbu $v0, 0x23($s0) -/* 907B60 80240130 A0620034 */ sb $v0, 0x34($v1) -/* 907B64 80240134 8E020028 */ lw $v0, 0x28($s0) -/* 907B68 80240138 8C42000C */ lw $v0, 0xc($v0) -/* 907B6C 8024013C 3C048024 */ lui $a0, 0x8024 -/* 907B70 80240140 24840DA4 */ addiu $a0, $a0, 0xda4 -/* 907B74 80240144 0C00AFC1 */ jal set_curtain_draw_callback -/* 907B78 80240148 AC400020 */ sw $zero, 0x20($v0) -.L8024014C: -/* 907B7C 8024014C 8E700060 */ lw $s0, 0x60($s3) -/* 907B80 80240150 3C014120 */ lui $at, 0x4120 -/* 907B84 80240154 44811000 */ mtc1 $at, $f2 -/* 907B88 80240158 C6000000 */ lwc1 $f0, ($s0) -/* 907B8C 8024015C E6400038 */ swc1 $f0, 0x38($s2) -/* 907B90 80240160 C6000004 */ lwc1 $f0, 4($s0) -/* 907B94 80240164 E640003C */ swc1 $f0, 0x3c($s2) -/* 907B98 80240168 C6000008 */ lwc1 $f0, 8($s0) -/* 907B9C 8024016C 0000882D */ daddu $s1, $zero, $zero -/* 907BA0 80240170 46020000 */ add.s $f0, $f0, $f2 -/* 907BA4 80240174 0260202D */ daddu $a0, $s3, $zero -/* 907BA8 80240178 3C05FAA2 */ lui $a1, 0xfaa2 -/* 907BAC 8024017C E6400040 */ swc1 $f0, 0x40($s2) -/* 907BB0 80240180 C6000010 */ lwc1 $f0, 0x10($s0) -/* 907BB4 80240184 34A5B58B */ ori $a1, $a1, 0xb58b -/* 907BB8 80240188 0C0B1EAF */ jal get_variable -/* 907BBC 8024018C E6400048 */ swc1 $f0, 0x48($s2) -/* 907BC0 80240190 14400018 */ bnez $v0, .L802401F4 -/* 907BC4 80240194 00000000 */ nop -/* 907BC8 80240198 C6020010 */ lwc1 $f2, 0x10($s0) -/* 907BCC 8024019C 3C0142B4 */ lui $at, 0x42b4 -/* 907BD0 802401A0 44810000 */ mtc1 $at, $f0 -/* 907BD4 802401A4 00000000 */ nop -/* 907BD8 802401A8 4602003C */ c.lt.s $f0, $f2 -/* 907BDC 802401AC 00000000 */ nop -/* 907BE0 802401B0 45000008 */ bc1f .L802401D4 -/* 907BE4 802401B4 00000000 */ nop -/* 907BE8 802401B8 3C014387 */ lui $at, 0x4387 -/* 907BEC 802401BC 44810000 */ mtc1 $at, $f0 -/* 907BF0 802401C0 00000000 */ nop -/* 907BF4 802401C4 4600103C */ c.lt.s $f2, $f0 -/* 907BF8 802401C8 00000000 */ nop -/* 907BFC 802401CC 45030001 */ bc1tl .L802401D4 -/* 907C00 802401D0 24110001 */ addiu $s1, $zero, 1 -.L802401D4: -/* 907C04 802401D4 86020022 */ lh $v0, 0x22($s0) -/* 907C08 802401D8 00111880 */ sll $v1, $s1, 2 -/* 907C0C 802401DC 000210C0 */ sll $v0, $v0, 3 -/* 907C10 802401E0 00621821 */ addu $v1, $v1, $v0 -/* 907C14 802401E4 3C028024 */ lui $v0, 0x8024 -/* 907C18 802401E8 00431021 */ addu $v0, $v0, $v1 -/* 907C1C 802401EC 8C42168C */ lw $v0, 0x168c($v0) -/* 907C20 802401F0 AE420028 */ sw $v0, 0x28($s2) -.L802401F4: -/* 907C24 802401F4 8E020028 */ lw $v0, 0x28($s0) -/* 907C28 802401F8 10400016 */ beqz $v0, .L80240254 -/* 907C2C 802401FC 00000000 */ nop -/* 907C30 80240200 8C42000C */ lw $v0, 0xc($v0) -/* 907C34 80240204 C6000010 */ lwc1 $f0, 0x10($s0) -/* 907C38 80240208 3C014000 */ lui $at, 0x4000 -/* 907C3C 8024020C 44811000 */ mtc1 $at, $f2 -/* 907C40 80240210 E4400024 */ swc1 $f0, 0x24($v0) -/* 907C44 80240214 C6000000 */ lwc1 $f0, ($s0) -/* 907C48 80240218 8E020028 */ lw $v0, 0x28($s0) -/* 907C4C 8024021C 46020001 */ sub.s $f0, $f0, $f2 -/* 907C50 80240220 8C42000C */ lw $v0, 0xc($v0) -/* 907C54 80240224 3C014170 */ lui $at, 0x4170 -/* 907C58 80240228 44811000 */ mtc1 $at, $f2 -/* 907C5C 8024022C E4400004 */ swc1 $f0, 4($v0) -/* 907C60 80240230 C6000004 */ lwc1 $f0, 4($s0) -/* 907C64 80240234 8E020028 */ lw $v0, 0x28($s0) -/* 907C68 80240238 46020000 */ add.s $f0, $f0, $f2 -/* 907C6C 8024023C 8C42000C */ lw $v0, 0xc($v0) -/* 907C70 80240240 E4400008 */ swc1 $f0, 8($v0) -/* 907C74 80240244 8E020028 */ lw $v0, 0x28($s0) -/* 907C78 80240248 C6000008 */ lwc1 $f0, 8($s0) -/* 907C7C 8024024C 8C42000C */ lw $v0, 0xc($v0) -/* 907C80 80240250 E440000C */ swc1 $f0, 0xc($v0) -.L80240254: -/* 907C84 80240254 8FBF0028 */ lw $ra, 0x28($sp) -/* 907C88 80240258 8FB30024 */ lw $s3, 0x24($sp) -/* 907C8C 8024025C 8FB20020 */ lw $s2, 0x20($sp) -/* 907C90 80240260 8FB1001C */ lw $s1, 0x1c($sp) -/* 907C94 80240264 8FB00018 */ lw $s0, 0x18($sp) -/* 907C98 80240268 0000102D */ daddu $v0, $zero, $zero -/* 907C9C 8024026C 03E00008 */ jr $ra -/* 907CA0 80240270 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/func_8024061C_907A30.s b/asm/nonmatchings/world/area_kmr/kmr_23/func_8024061C_907A30.s deleted file mode 100644 index 2cedab00f8..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_23/func_8024061C_907A30.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_90804C -/* 90804C 8024061C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 908050 80240620 AFB20018 */ sw $s2, 0x18($sp) -/* 908054 80240624 0080902D */ daddu $s2, $a0, $zero -/* 908058 80240628 AFB00010 */ sw $s0, 0x10($sp) -/* 90805C 8024062C 00A0802D */ daddu $s0, $a1, $zero -/* 908060 80240630 3C05FD05 */ lui $a1, 0xfd05 -/* 908064 80240634 34A50F80 */ ori $a1, $a1, 0xf80 -/* 908068 80240638 AFBF001C */ sw $ra, 0x1c($sp) -/* 90806C 8024063C 0C0B1EAF */ jal get_variable -/* 908070 80240640 AFB10014 */ sw $s1, 0x14($sp) -/* 908074 80240644 12000002 */ beqz $s0, .L80240650 -/* 908078 80240648 0040882D */ daddu $s1, $v0, $zero -/* 90807C 8024064C AE400070 */ sw $zero, 0x70($s2) -.L80240650: -/* 908080 80240650 8E430070 */ lw $v1, 0x70($s2) -/* 908084 80240654 24100001 */ addiu $s0, $zero, 1 -/* 908088 80240658 10700033 */ beq $v1, $s0, .L80240728 -/* 90808C 8024065C 28620002 */ slti $v0, $v1, 2 -/* 908090 80240660 10400005 */ beqz $v0, .L80240678 -/* 908094 80240664 24020002 */ addiu $v0, $zero, 2 -/* 908098 80240668 10600007 */ beqz $v1, .L80240688 -/* 90809C 8024066C 0000102D */ daddu $v0, $zero, $zero -/* 9080A0 80240670 080901E8 */ j .L802407A0 -/* 9080A4 80240674 00000000 */ nop -.L80240678: -/* 9080A8 80240678 10620033 */ beq $v1, $v0, .L80240748 -/* 9080AC 8024067C 0000102D */ daddu $v0, $zero, $zero -/* 9080B0 80240680 080901E8 */ j .L802407A0 -/* 9080B4 80240684 00000000 */ nop -.L80240688: -/* 9080B8 80240688 0000202D */ daddu $a0, $zero, $zero -/* 9080BC 8024068C 240500D0 */ addiu $a1, $zero, 0xd0 -/* 9080C0 80240690 00A0302D */ daddu $a2, $a1, $zero -/* 9080C4 80240694 0C04DF84 */ jal func_80137E10 -/* 9080C8 80240698 00A0382D */ daddu $a3, $a1, $zero -/* 9080CC 8024069C 86220024 */ lh $v0, 0x24($s1) -/* 9080D0 802406A0 44820000 */ mtc1 $v0, $f0 -/* 9080D4 802406A4 00000000 */ nop -/* 9080D8 802406A8 46800020 */ cvt.s.w $f0, $f0 -/* 9080DC 802406AC 44050000 */ mfc1 $a1, $f0 -/* 9080E0 802406B0 0C04DF62 */ jal func_80137D88 -/* 9080E4 802406B4 24040001 */ addiu $a0, $zero, 1 -/* 9080E8 802406B8 240400FF */ addiu $a0, $zero, 0xff -/* 9080EC 802406BC 86220024 */ lh $v0, 0x24($s1) -/* 9080F0 802406C0 96230024 */ lhu $v1, 0x24($s1) -/* 9080F4 802406C4 14440010 */ bne $v0, $a0, .L80240708 -/* 9080F8 802406C8 24620032 */ addiu $v0, $v1, 0x32 -/* 9080FC 802406CC 8E230028 */ lw $v1, 0x28($s1) -/* 908100 802406D0 8C620000 */ lw $v0, ($v1) -/* 908104 802406D4 34420010 */ ori $v0, $v0, 0x10 -/* 908108 802406D8 AC620000 */ sw $v0, ($v1) -/* 90810C 802406DC 3C03800B */ lui $v1, %hi(gCameras) -/* 908110 802406E0 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 908114 802406E4 240200D0 */ addiu $v0, $zero, 0xd0 -/* 908118 802406E8 AE200028 */ sw $zero, 0x28($s1) -/* 90811C 802406EC A462002C */ sh $v0, 0x2c($v1) -/* 908120 802406F0 A462002E */ sh $v0, 0x2e($v1) -/* 908124 802406F4 A4620030 */ sh $v0, 0x30($v1) -/* 908128 802406F8 2402000F */ addiu $v0, $zero, 0xf -/* 90812C 802406FC AE500070 */ sw $s0, 0x70($s2) -/* 908130 80240700 080901E7 */ j .L8024079C -/* 908134 80240704 AE420074 */ sw $v0, 0x74($s2) -.L80240708: -/* 908138 80240708 A6220024 */ sh $v0, 0x24($s1) -/* 90813C 8024070C 00021400 */ sll $v0, $v0, 0x10 -/* 908140 80240710 00021403 */ sra $v0, $v0, 0x10 -/* 908144 80240714 28420100 */ slti $v0, $v0, 0x100 -/* 908148 80240718 50400020 */ beql $v0, $zero, .L8024079C -/* 90814C 8024071C A6240024 */ sh $a0, 0x24($s1) -/* 908150 80240720 080901E8 */ j .L802407A0 -/* 908154 80240724 0000102D */ daddu $v0, $zero, $zero -.L80240728: -/* 908158 80240728 8E420074 */ lw $v0, 0x74($s2) -/* 90815C 8024072C 2403FFFF */ addiu $v1, $zero, -1 -/* 908160 80240730 2442FFFF */ addiu $v0, $v0, -1 -/* 908164 80240734 14430019 */ bne $v0, $v1, .L8024079C -/* 908168 80240738 AE420074 */ sw $v0, 0x74($s2) -/* 90816C 8024073C 24020002 */ addiu $v0, $zero, 2 -/* 908170 80240740 080901E7 */ j .L8024079C -/* 908174 80240744 AE420070 */ sw $v0, 0x70($s2) -.L80240748: -/* 908178 80240748 86220024 */ lh $v0, 0x24($s1) -/* 90817C 8024074C 44820000 */ mtc1 $v0, $f0 -/* 908180 80240750 00000000 */ nop -/* 908184 80240754 46800020 */ cvt.s.w $f0, $f0 -/* 908188 80240758 44050000 */ mfc1 $a1, $f0 -/* 90818C 8024075C 0C04DF62 */ jal func_80137D88 -/* 908190 80240760 24040001 */ addiu $a0, $zero, 1 -/* 908194 80240764 86220024 */ lh $v0, 0x24($s1) -/* 908198 80240768 96230024 */ lhu $v1, 0x24($s1) -/* 90819C 8024076C 14400007 */ bnez $v0, .L8024078C -/* 9081A0 80240770 2462FFEC */ addiu $v0, $v1, -0x14 -/* 9081A4 80240774 3C013F80 */ lui $at, 0x3f80 -/* 9081A8 80240778 44816000 */ mtc1 $at, $f12 -/* 9081AC 8024077C 0C00AFB7 */ jal set_curtain_scale_goal -/* 9081B0 80240780 00000000 */ nop -/* 9081B4 80240784 080901E8 */ j .L802407A0 -/* 9081B8 80240788 24020001 */ addiu $v0, $zero, 1 -.L8024078C: -/* 9081BC 8024078C A6220024 */ sh $v0, 0x24($s1) -/* 9081C0 80240790 00021400 */ sll $v0, $v0, 0x10 -/* 9081C4 80240794 04420001 */ bltzl $v0, .L8024079C -/* 9081C8 80240798 A6200024 */ sh $zero, 0x24($s1) -.L8024079C: -/* 9081CC 8024079C 0000102D */ daddu $v0, $zero, $zero -.L802407A0: -/* 9081D0 802407A0 8FBF001C */ lw $ra, 0x1c($sp) -/* 9081D4 802407A4 8FB20018 */ lw $s2, 0x18($sp) -/* 9081D8 802407A8 8FB10014 */ lw $s1, 0x14($sp) -/* 9081DC 802407AC 8FB00010 */ lw $s0, 0x10($sp) -/* 9081E0 802407B0 03E00008 */ jr $ra -/* 9081E4 802407B4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/func_8024088C_907A30.s b/asm/nonmatchings/world/area_kmr/kmr_23/func_8024088C_907A30.s deleted file mode 100644 index 22efd931e1..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_23/func_8024088C_907A30.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024088C_9082BC -/* 9082BC 8024088C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9082C0 80240890 AFB20020 */ sw $s2, 0x20($sp) -/* 9082C4 80240894 0080902D */ daddu $s2, $a0, $zero -/* 9082C8 80240898 AFB00018 */ sw $s0, 0x18($sp) -/* 9082CC 8024089C 00A0802D */ daddu $s0, $a1, $zero -/* 9082D0 802408A0 3C05FD05 */ lui $a1, 0xfd05 -/* 9082D4 802408A4 AFBF0028 */ sw $ra, 0x28($sp) -/* 9082D8 802408A8 AFB30024 */ sw $s3, 0x24($sp) -/* 9082DC 802408AC AFB1001C */ sw $s1, 0x1c($sp) -/* 9082E0 802408B0 8E51000C */ lw $s1, 0xc($s2) -/* 9082E4 802408B4 0C0B1EAF */ jal get_variable -/* 9082E8 802408B8 34A50F80 */ ori $a1, $a1, 0xf80 -/* 9082EC 802408BC 12000023 */ beqz $s0, .L8024094C -/* 9082F0 802408C0 0040982D */ daddu $s3, $v0, $zero -/* 9082F4 802408C4 44800000 */ mtc1 $zero, $f0 -/* 9082F8 802408C8 3C054220 */ lui $a1, 0x4220 -/* 9082FC 802408CC 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 908300 802408D0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 908304 802408D4 44060000 */ mfc1 $a2, $f0 -/* 908308 802408D8 3C013F80 */ lui $at, 0x3f80 -/* 90830C 802408DC 44810000 */ mtc1 $at, $f0 -/* 908310 802408E0 8444008E */ lh $a0, 0x8e($v0) -/* 908314 802408E4 AFA00014 */ sw $zero, 0x14($sp) -/* 908318 802408E8 00C0382D */ daddu $a3, $a2, $zero -/* 90831C 802408EC 2484000A */ addiu $a0, $a0, 0xa -/* 908320 802408F0 0C01C97C */ jal func_800725F0 -/* 908324 802408F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 908328 802408F8 AE62002C */ sw $v0, 0x2c($s3) -/* 90832C 802408FC AE400070 */ sw $zero, 0x70($s2) -/* 908330 80240900 8E250000 */ lw $a1, ($s1) -/* 908334 80240904 26310004 */ addiu $s1, $s1, 4 -/* 908338 80240908 0C0B1EAF */ jal get_variable -/* 90833C 8024090C 0240202D */ daddu $a0, $s2, $zero -/* 908340 80240910 AE420084 */ sw $v0, 0x84($s2) -/* 908344 80240914 8E250000 */ lw $a1, ($s1) -/* 908348 80240918 26310004 */ addiu $s1, $s1, 4 -/* 90834C 8024091C 0C0B1EAF */ jal get_variable -/* 908350 80240920 0240202D */ daddu $a0, $s2, $zero -/* 908354 80240924 AE420074 */ sw $v0, 0x74($s2) -/* 908358 80240928 8E250000 */ lw $a1, ($s1) -/* 90835C 8024092C 26310004 */ addiu $s1, $s1, 4 -/* 908360 80240930 0C0B1EAF */ jal get_variable -/* 908364 80240934 0240202D */ daddu $a0, $s2, $zero -/* 908368 80240938 AE420078 */ sw $v0, 0x78($s2) -/* 90836C 8024093C 8E250000 */ lw $a1, ($s1) -/* 908370 80240940 0C0B1EAF */ jal get_variable -/* 908374 80240944 0240202D */ daddu $a0, $s2, $zero -/* 908378 80240948 AE42007C */ sw $v0, 0x7c($s2) -.L8024094C: -/* 90837C 8024094C C6400074 */ lwc1 $f0, 0x74($s2) -/* 908380 80240950 46800020 */ cvt.s.w $f0, $f0 -/* 908384 80240954 44050000 */ mfc1 $a1, $f0 -/* 908388 80240958 C6400078 */ lwc1 $f0, 0x78($s2) -/* 90838C 8024095C 46800020 */ cvt.s.w $f0, $f0 -/* 908390 80240960 8E42007C */ lw $v0, 0x7c($s2) -/* 908394 80240964 44060000 */ mfc1 $a2, $f0 -/* 908398 80240968 AFA20010 */ sw $v0, 0x10($sp) -/* 90839C 8024096C 8E470070 */ lw $a3, 0x70($s2) -/* 9083A0 80240970 0C00A8ED */ jal update_lerp -/* 9083A4 80240974 24040009 */ addiu $a0, $zero, 9 -/* 9083A8 80240978 8E62002C */ lw $v0, 0x2c($s3) -/* 9083AC 8024097C 8C42000C */ lw $v0, 0xc($v0) -/* 9083B0 80240980 C6420084 */ lwc1 $f2, 0x84($s2) -/* 9083B4 80240984 468010A0 */ cvt.s.w $f2, $f2 -/* 9083B8 80240988 E4420004 */ swc1 $f2, 4($v0) -/* 9083BC 8024098C 8E62002C */ lw $v0, 0x2c($s3) -/* 9083C0 80240990 4600010D */ trunc.w.s $f4, $f0 -/* 9083C4 80240994 44032000 */ mfc1 $v1, $f4 -/* 9083C8 80240998 8C42000C */ lw $v0, 0xc($v0) -/* 9083CC 8024099C 44831000 */ mtc1 $v1, $f2 -/* 9083D0 802409A0 00000000 */ nop -/* 9083D4 802409A4 468010A0 */ cvt.s.w $f2, $f2 -/* 9083D8 802409A8 E4420008 */ swc1 $f2, 8($v0) -/* 9083DC 802409AC 8E62002C */ lw $v0, 0x2c($s3) -/* 9083E0 802409B0 8C42000C */ lw $v0, 0xc($v0) -/* 9083E4 802409B4 C6400084 */ lwc1 $f0, 0x84($s2) -/* 9083E8 802409B8 46800020 */ cvt.s.w $f0, $f0 -/* 9083EC 802409BC E4400010 */ swc1 $f0, 0x10($v0) -/* 9083F0 802409C0 8E62002C */ lw $v0, 0x2c($s3) -/* 9083F4 802409C4 8C42000C */ lw $v0, 0xc($v0) -/* 9083F8 802409C8 E4420014 */ swc1 $f2, 0x14($v0) -/* 9083FC 802409CC 8E430070 */ lw $v1, 0x70($s2) -/* 908400 802409D0 8E42007C */ lw $v0, 0x7c($s2) -/* 908404 802409D4 24630001 */ addiu $v1, $v1, 1 -/* 908408 802409D8 0062102A */ slt $v0, $v1, $v0 -/* 90840C 802409DC AE430070 */ sw $v1, 0x70($s2) -/* 908410 802409E0 8FBF0028 */ lw $ra, 0x28($sp) -/* 908414 802409E4 8FB30024 */ lw $s3, 0x24($sp) -/* 908418 802409E8 8FB20020 */ lw $s2, 0x20($sp) -/* 90841C 802409EC 8FB1001C */ lw $s1, 0x1c($sp) -/* 908420 802409F0 8FB00018 */ lw $s0, 0x18($sp) -/* 908424 802409F4 38420001 */ xori $v0, $v0, 1 -/* 908428 802409F8 03E00008 */ jr $ra -/* 90842C 802409FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/func_80240A00_907A30.s b/asm/nonmatchings/world/area_kmr/kmr_23/func_80240A00_907A30.s deleted file mode 100644 index 8e5abc6484..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_23/func_80240A00_907A30.s +++ /dev/null @@ -1,114 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A00_908430 -/* 908430 80240A00 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 908434 80240A04 AFB20020 */ sw $s2, 0x20($sp) -/* 908438 80240A08 0080902D */ daddu $s2, $a0, $zero -/* 90843C 80240A0C AFB00018 */ sw $s0, 0x18($sp) -/* 908440 80240A10 00A0802D */ daddu $s0, $a1, $zero -/* 908444 80240A14 3C05FD05 */ lui $a1, 0xfd05 -/* 908448 80240A18 AFBF0028 */ sw $ra, 0x28($sp) -/* 90844C 80240A1C AFB30024 */ sw $s3, 0x24($sp) -/* 908450 80240A20 AFB1001C */ sw $s1, 0x1c($sp) -/* 908454 80240A24 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 908458 80240A28 8E51000C */ lw $s1, 0xc($s2) -/* 90845C 80240A2C 0C0B1EAF */ jal get_variable -/* 908460 80240A30 34A50F80 */ ori $a1, $a1, 0xf80 -/* 908464 80240A34 12000015 */ beqz $s0, .L80240A8C -/* 908468 80240A38 0040982D */ daddu $s3, $v0, $zero -/* 90846C 80240A3C AE400070 */ sw $zero, 0x70($s2) -/* 908470 80240A40 8E250000 */ lw $a1, ($s1) -/* 908474 80240A44 26310004 */ addiu $s1, $s1, 4 -/* 908478 80240A48 0C0B1EAF */ jal get_variable -/* 90847C 80240A4C 0240202D */ daddu $a0, $s2, $zero -/* 908480 80240A50 AE420084 */ sw $v0, 0x84($s2) -/* 908484 80240A54 8E250000 */ lw $a1, ($s1) -/* 908488 80240A58 26310004 */ addiu $s1, $s1, 4 -/* 90848C 80240A5C 0C0B1EAF */ jal get_variable -/* 908490 80240A60 0240202D */ daddu $a0, $s2, $zero -/* 908494 80240A64 AE420074 */ sw $v0, 0x74($s2) -/* 908498 80240A68 8E250000 */ lw $a1, ($s1) -/* 90849C 80240A6C 26310004 */ addiu $s1, $s1, 4 -/* 9084A0 80240A70 0C0B1EAF */ jal get_variable -/* 9084A4 80240A74 0240202D */ daddu $a0, $s2, $zero -/* 9084A8 80240A78 AE420078 */ sw $v0, 0x78($s2) -/* 9084AC 80240A7C 8E250000 */ lw $a1, ($s1) -/* 9084B0 80240A80 0C0B1EAF */ jal get_variable -/* 9084B4 80240A84 0240202D */ daddu $a0, $s2, $zero -/* 9084B8 80240A88 AE42007C */ sw $v0, 0x7c($s2) -.L80240A8C: -/* 9084BC 80240A8C 8E43007C */ lw $v1, 0x7c($s2) -/* 9084C0 80240A90 4480A000 */ mtc1 $zero, $f20 -/* 9084C4 80240A94 8E420078 */ lw $v0, 0x78($s2) -/* 9084C8 80240A98 AFA30010 */ sw $v1, 0x10($sp) -/* 9084CC 80240A9C 00021FC2 */ srl $v1, $v0, 0x1f -/* 9084D0 80240AA0 00431021 */ addu $v0, $v0, $v1 -/* 9084D4 80240AA4 00021043 */ sra $v0, $v0, 1 -/* 9084D8 80240AA8 24420008 */ addiu $v0, $v0, 8 -/* 9084DC 80240AAC 44822000 */ mtc1 $v0, $f4 -/* 9084E0 80240AB0 00000000 */ nop -/* 9084E4 80240AB4 46802120 */ cvt.s.w $f4, $f4 -/* 9084E8 80240AB8 4405A000 */ mfc1 $a1, $f20 -/* 9084EC 80240ABC 8E470070 */ lw $a3, 0x70($s2) -/* 9084F0 80240AC0 44062000 */ mfc1 $a2, $f4 -/* 9084F4 80240AC4 0C00A8ED */ jal update_lerp -/* 9084F8 80240AC8 0000202D */ daddu $a0, $zero, $zero -/* 9084FC 80240ACC 8E420078 */ lw $v0, 0x78($s2) -/* 908500 80240AD0 4405A000 */ mfc1 $a1, $f20 -/* 908504 80240AD4 00021FC2 */ srl $v1, $v0, 0x1f -/* 908508 80240AD8 00431021 */ addu $v0, $v0, $v1 -/* 90850C 80240ADC 00021043 */ sra $v0, $v0, 1 -/* 908510 80240AE0 44822000 */ mtc1 $v0, $f4 -/* 908514 80240AE4 00000000 */ nop -/* 908518 80240AE8 46802120 */ cvt.s.w $f4, $f4 -/* 90851C 80240AEC 8E43007C */ lw $v1, 0x7c($s2) -/* 908520 80240AF0 44062000 */ mfc1 $a2, $f4 -/* 908524 80240AF4 AFA30010 */ sw $v1, 0x10($sp) -/* 908528 80240AF8 8E470070 */ lw $a3, 0x70($s2) -/* 90852C 80240AFC 4600010D */ trunc.w.s $f4, $f0 -/* 908530 80240B00 44102000 */ mfc1 $s0, $f4 -/* 908534 80240B04 0C00A8ED */ jal update_lerp -/* 908538 80240B08 0000202D */ daddu $a0, $zero, $zero -/* 90853C 80240B0C 8E420084 */ lw $v0, 0x84($s2) -/* 908540 80240B10 8E63002C */ lw $v1, 0x2c($s3) -/* 908544 80240B14 00501023 */ subu $v0, $v0, $s0 -/* 908548 80240B18 8C63000C */ lw $v1, 0xc($v1) -/* 90854C 80240B1C 44821000 */ mtc1 $v0, $f2 -/* 908550 80240B20 00000000 */ nop -/* 908554 80240B24 468010A0 */ cvt.s.w $f2, $f2 -/* 908558 80240B28 E4620004 */ swc1 $f2, 4($v1) -/* 90855C 80240B2C 8E62002C */ lw $v0, 0x2c($s3) -/* 908560 80240B30 4600010D */ trunc.w.s $f4, $f0 -/* 908564 80240B34 44042000 */ mfc1 $a0, $f4 -/* 908568 80240B38 8C42000C */ lw $v0, 0xc($v0) -/* 90856C 80240B3C C6420074 */ lwc1 $f2, 0x74($s2) -/* 908570 80240B40 468010A0 */ cvt.s.w $f2, $f2 -/* 908574 80240B44 E4420008 */ swc1 $f2, 8($v0) -/* 908578 80240B48 8E420084 */ lw $v0, 0x84($s2) -/* 90857C 80240B4C 8E63002C */ lw $v1, 0x2c($s3) -/* 908580 80240B50 00441021 */ addu $v0, $v0, $a0 -/* 908584 80240B54 8C63000C */ lw $v1, 0xc($v1) -/* 908588 80240B58 44820000 */ mtc1 $v0, $f0 -/* 90858C 80240B5C 00000000 */ nop -/* 908590 80240B60 46800020 */ cvt.s.w $f0, $f0 -/* 908594 80240B64 E4600010 */ swc1 $f0, 0x10($v1) -/* 908598 80240B68 8E62002C */ lw $v0, 0x2c($s3) -/* 90859C 80240B6C 8C42000C */ lw $v0, 0xc($v0) -/* 9085A0 80240B70 C6400074 */ lwc1 $f0, 0x74($s2) -/* 9085A4 80240B74 46800020 */ cvt.s.w $f0, $f0 -/* 9085A8 80240B78 E4400014 */ swc1 $f0, 0x14($v0) -/* 9085AC 80240B7C 8E430070 */ lw $v1, 0x70($s2) -/* 9085B0 80240B80 8E42007C */ lw $v0, 0x7c($s2) -/* 9085B4 80240B84 24630001 */ addiu $v1, $v1, 1 -/* 9085B8 80240B88 0062102A */ slt $v0, $v1, $v0 -/* 9085BC 80240B8C AE430070 */ sw $v1, 0x70($s2) -/* 9085C0 80240B90 8FBF0028 */ lw $ra, 0x28($sp) -/* 9085C4 80240B94 8FB30024 */ lw $s3, 0x24($sp) -/* 9085C8 80240B98 8FB20020 */ lw $s2, 0x20($sp) -/* 9085CC 80240B9C 8FB1001C */ lw $s1, 0x1c($sp) -/* 9085D0 80240BA0 8FB00018 */ lw $s0, 0x18($sp) -/* 9085D4 80240BA4 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9085D8 80240BA8 38420001 */ xori $v0, $v0, 1 -/* 9085DC 80240BAC 03E00008 */ jr $ra -/* 9085E0 80240BB0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/func_80240CA8_907A30.s b/asm/nonmatchings/world/area_kmr/kmr_23/func_80240CA8_907A30.s deleted file mode 100644 index 6f2285ad31..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_23/func_80240CA8_907A30.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CA8_9086D8 -/* 9086D8 80240CA8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9086DC 80240CAC 3C05FD05 */ lui $a1, 0xfd05 -/* 9086E0 80240CB0 AFBF0028 */ sw $ra, 0x28($sp) -/* 9086E4 80240CB4 0C0B1EAF */ jal get_variable -/* 9086E8 80240CB8 34A50F80 */ ori $a1, $a1, 0xf80 -/* 9086EC 80240CBC 3C01428C */ lui $at, 0x428c -/* 9086F0 80240CC0 44810000 */ mtc1 $at, $f0 -/* 9086F4 80240CC4 3C0141A0 */ lui $at, 0x41a0 -/* 9086F8 80240CC8 44811000 */ mtc1 $at, $f2 -/* 9086FC 80240CCC 3C013FC0 */ lui $at, 0x3fc0 -/* 908700 80240CD0 44812000 */ mtc1 $at, $f4 -/* 908704 80240CD4 24030014 */ addiu $v1, $zero, 0x14 -/* 908708 80240CD8 AFA3001C */ sw $v1, 0x1c($sp) -/* 90870C 80240CDC 2403000F */ addiu $v1, $zero, 0xf -/* 908710 80240CE0 AFA30020 */ sw $v1, 0x20($sp) -/* 908714 80240CE4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 908718 80240CE8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 90871C 80240CEC E7A40018 */ swc1 $f4, 0x18($sp) -/* 908720 80240CF0 8C450000 */ lw $a1, ($v0) -/* 908724 80240CF4 8C460004 */ lw $a2, 4($v0) -/* 908728 80240CF8 8C470008 */ lw $a3, 8($v0) -/* 90872C 80240CFC 0C01C8D4 */ jal func_80072350 -/* 908730 80240D00 24040002 */ addiu $a0, $zero, 2 -/* 908734 80240D04 8FBF0028 */ lw $ra, 0x28($sp) -/* 908738 80240D08 24020002 */ addiu $v0, $zero, 2 -/* 90873C 80240D0C 03E00008 */ jr $ra -/* 908740 80240D10 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/func_80240DA4_907A30.s b/asm/nonmatchings/world/area_kmr/kmr_23/func_80240DA4_907A30.s deleted file mode 100644 index 270fcf33bd..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_23/func_80240DA4_907A30.s +++ /dev/null @@ -1,215 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DA4_9087D4 -/* 9087D4 80240DA4 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 9087D8 80240DA8 0000202D */ daddu $a0, $zero, $zero -/* 9087DC 80240DAC 3C05FD05 */ lui $a1, 0xfd05 -/* 9087E0 80240DB0 34A50F80 */ ori $a1, $a1, 0xf80 -/* 9087E4 80240DB4 AFBF0058 */ sw $ra, 0x58($sp) -/* 9087E8 80240DB8 AFB10054 */ sw $s1, 0x54($sp) -/* 9087EC 80240DBC 0C0B1EAF */ jal get_variable -/* 9087F0 80240DC0 AFB00050 */ sw $s0, 0x50($sp) -/* 9087F4 80240DC4 241000E2 */ addiu $s0, $zero, 0xe2 -/* 9087F8 80240DC8 3C038024 */ lui $v1, 0x8024 -/* 9087FC 80240DCC 8C6317C8 */ lw $v1, 0x17c8($v1) -/* 908800 80240DD0 0040202D */ daddu $a0, $v0, $zero -/* 908804 80240DD4 2C620005 */ sltiu $v0, $v1, 5 -/* 908808 80240DD8 1040003F */ beqz $v0, .L80240ED8 -/* 90880C 80240DDC 24110046 */ addiu $s1, $zero, 0x46 -/* 908810 80240DE0 00031080 */ sll $v0, $v1, 2 -/* 908814 80240DE4 3C018024 */ lui $at, 0x8024 -/* 908818 80240DE8 00220821 */ addu $at, $at, $v0 -/* 90881C 80240DEC 8C2237F0 */ lw $v0, 0x37f0($at) -/* 908820 80240DF0 00400008 */ jr $v0 -/* 908824 80240DF4 00000000 */ nop -/* 908828 80240DF8 8482001E */ lh $v0, 0x1e($a0) -/* 90882C 80240DFC 10400036 */ beqz $v0, .L80240ED8 -/* 908830 80240E00 24020001 */ addiu $v0, $zero, 1 -/* 908834 80240E04 080903B4 */ j .L80240ED0 -/* 908838 80240E08 00000000 */ nop -/* 90883C 80240E0C 3C048024 */ lui $a0, 0x8024 -/* 908840 80240E10 248417CC */ addiu $a0, $a0, 0x17cc -/* 908844 80240E14 3C058024 */ lui $a1, 0x8024 -/* 908848 80240E18 24A517D0 */ addiu $a1, $a1, 0x17d0 -/* 90884C 80240E1C 8C820000 */ lw $v0, ($a0) -/* 908850 80240E20 8CA30000 */ lw $v1, ($a1) -/* 908854 80240E24 24420014 */ addiu $v0, $v0, 0x14 -/* 908858 80240E28 24630005 */ addiu $v1, $v1, 5 -/* 90885C 80240E2C AC820000 */ sw $v0, ($a0) -/* 908860 80240E30 0050102A */ slt $v0, $v0, $s0 -/* 908864 80240E34 14400002 */ bnez $v0, .L80240E40 -/* 908868 80240E38 ACA30000 */ sw $v1, ($a1) -/* 90886C 80240E3C AC900000 */ sw $s0, ($a0) -.L80240E40: -/* 908870 80240E40 0071102A */ slt $v0, $v1, $s1 -/* 908874 80240E44 50400001 */ beql $v0, $zero, .L80240E4C -/* 908878 80240E48 ACB10000 */ sw $s1, ($a1) -.L80240E4C: -/* 90887C 80240E4C 8C820000 */ lw $v0, ($a0) -/* 908880 80240E50 14500021 */ bne $v0, $s0, .L80240ED8 -/* 908884 80240E54 00000000 */ nop -/* 908888 80240E58 8CA20000 */ lw $v0, ($a1) -/* 90888C 80240E5C 1451001E */ bne $v0, $s1, .L80240ED8 -/* 908890 80240E60 24020002 */ addiu $v0, $zero, 2 -/* 908894 80240E64 080903B4 */ j .L80240ED0 -/* 908898 80240E68 00000000 */ nop -/* 90889C 80240E6C 8482001E */ lh $v0, 0x1e($a0) -/* 9088A0 80240E70 14400019 */ bnez $v0, .L80240ED8 -/* 9088A4 80240E74 24020003 */ addiu $v0, $zero, 3 -/* 9088A8 80240E78 080903B4 */ j .L80240ED0 -/* 9088AC 80240E7C 00000000 */ nop -/* 9088B0 80240E80 3C048024 */ lui $a0, 0x8024 -/* 9088B4 80240E84 248417CC */ addiu $a0, $a0, 0x17cc -/* 9088B8 80240E88 3C058024 */ lui $a1, 0x8024 -/* 9088BC 80240E8C 24A517D0 */ addiu $a1, $a1, 0x17d0 -/* 9088C0 80240E90 8C820000 */ lw $v0, ($a0) -/* 9088C4 80240E94 8CA30000 */ lw $v1, ($a1) -/* 9088C8 80240E98 2442FFEC */ addiu $v0, $v0, -0x14 -/* 9088CC 80240E9C 2463FFFB */ addiu $v1, $v1, -5 -/* 9088D0 80240EA0 AC820000 */ sw $v0, ($a0) -/* 9088D4 80240EA4 04410002 */ bgez $v0, .L80240EB0 -/* 9088D8 80240EA8 ACA30000 */ sw $v1, ($a1) -/* 9088DC 80240EAC AC800000 */ sw $zero, ($a0) -.L80240EB0: -/* 9088E0 80240EB0 04620001 */ bltzl $v1, .L80240EB8 -/* 9088E4 80240EB4 ACA00000 */ sw $zero, ($a1) -.L80240EB8: -/* 9088E8 80240EB8 8C820000 */ lw $v0, ($a0) -/* 9088EC 80240EBC 1440000A */ bnez $v0, .L80240EE8 -/* 9088F0 80240EC0 00000000 */ nop -/* 9088F4 80240EC4 8CA20000 */ lw $v0, ($a1) -/* 9088F8 80240EC8 14400003 */ bnez $v0, .L80240ED8 -/* 9088FC 80240ECC 24020004 */ addiu $v0, $zero, 4 -.L80240ED0: -/* 908900 80240ED0 3C018024 */ lui $at, 0x8024 -/* 908904 80240ED4 AC2217C8 */ sw $v0, 0x17c8($at) -.L80240ED8: -/* 908908 80240ED8 3C028024 */ lui $v0, 0x8024 -/* 90890C 80240EDC 8C4217CC */ lw $v0, 0x17cc($v0) -/* 908910 80240EE0 10400074 */ beqz $v0, .L802410B4 -/* 908914 80240EE4 00000000 */ nop -.L80240EE8: -/* 908918 80240EE8 3C098024 */ lui $t1, 0x8024 -/* 90891C 80240EEC 8D2917D0 */ lw $t1, 0x17d0($t1) -/* 908920 80240EF0 11200070 */ beqz $t1, .L802410B4 -/* 908924 80240EF4 2402002F */ addiu $v0, $zero, 0x2f -/* 908928 80240EF8 3C013FE0 */ lui $at, 0x3fe0 -/* 90892C 80240EFC 44810800 */ mtc1 $at, $f1 -/* 908930 80240F00 44800000 */ mtc1 $zero, $f0 -/* 908934 80240F04 44902000 */ mtc1 $s0, $f4 -/* 908938 80240F08 00000000 */ nop -/* 90893C 80240F0C 46802121 */ cvt.d.w $f4, $f4 -/* 908940 80240F10 46202102 */ mul.d $f4, $f4, $f0 -/* 908944 80240F14 00000000 */ nop -/* 908948 80240F18 3C088024 */ lui $t0, 0x8024 -/* 90894C 80240F1C 8D0817CC */ lw $t0, 0x17cc($t0) -/* 908950 80240F20 44884000 */ mtc1 $t0, $f8 -/* 908954 80240F24 00000000 */ nop -/* 908958 80240F28 46804221 */ cvt.d.w $f8, $f8 -/* 90895C 80240F2C 46204202 */ mul.d $f8, $f8, $f0 -/* 908960 80240F30 00000000 */ nop -/* 908964 80240F34 44913000 */ mtc1 $s1, $f6 -/* 908968 80240F38 00000000 */ nop -/* 90896C 80240F3C 468031A1 */ cvt.d.w $f6, $f6 -/* 908970 80240F40 46203182 */ mul.d $f6, $f6, $f0 -/* 908974 80240F44 00000000 */ nop -/* 908978 80240F48 44895000 */ mtc1 $t1, $f10 -/* 90897C 80240F4C 00000000 */ nop -/* 908980 80240F50 468052A1 */ cvt.d.w $f10, $f10 -/* 908984 80240F54 46205282 */ mul.d $f10, $f10, $f0 -/* 908988 80240F58 00000000 */ nop -/* 90898C 80240F5C 44821000 */ mtc1 $v0, $f2 -/* 908990 80240F60 00000000 */ nop -/* 908994 80240F64 468010A1 */ cvt.d.w $f2, $f2 -/* 908998 80240F68 46241080 */ add.d $f2, $f2, $f4 -/* 90899C 80240F6C 46281401 */ sub.d $f16, $f2, $f8 -/* 9089A0 80240F70 3C014080 */ lui $at, 0x4080 -/* 9089A4 80240F74 44817000 */ mtc1 $at, $f14 -/* 9089A8 80240F78 46208320 */ cvt.s.d $f12, $f16 -/* 9089AC 80240F7C 460E6302 */ mul.s $f12, $f12, $f14 -/* 9089B0 80240F80 00000000 */ nop -/* 9089B4 80240F84 24020064 */ addiu $v0, $zero, 0x64 -/* 9089B8 80240F88 44820000 */ mtc1 $v0, $f0 -/* 9089BC 80240F8C 00000000 */ nop -/* 9089C0 80240F90 46800021 */ cvt.d.w $f0, $f0 -/* 9089C4 80240F94 46260000 */ add.d $f0, $f0, $f6 -/* 9089C8 80240F98 462A0181 */ sub.d $f6, $f0, $f10 -/* 9089CC 80240F9C 46203120 */ cvt.s.d $f4, $f6 -/* 9089D0 80240FA0 460E2102 */ mul.s $f4, $f4, $f14 -/* 9089D4 80240FA4 00000000 */ nop -/* 9089D8 80240FA8 46281080 */ add.d $f2, $f2, $f8 -/* 9089DC 80240FAC 24040004 */ addiu $a0, $zero, 4 -/* 9089E0 80240FB0 3C03800A */ lui $v1, 0x800a -/* 9089E4 80240FB4 2463A66C */ addiu $v1, $v1, -0x5994 -/* 9089E8 80240FB8 462010A0 */ cvt.s.d $f2, $f2 -/* 9089EC 80240FBC 460E1082 */ mul.s $f2, $f2, $f14 -/* 9089F0 80240FC0 00000000 */ nop -/* 9089F4 80240FC4 3C058024 */ lui $a1, 0x8024 -/* 9089F8 80240FC8 24A517D8 */ addiu $a1, $a1, 0x17d8 -/* 9089FC 80240FCC 8C620000 */ lw $v0, ($v1) -/* 908A00 80240FD0 3C06ED00 */ lui $a2, 0xed00 -/* 908A04 80240FD4 0040382D */ daddu $a3, $v0, $zero -/* 908A08 80240FD8 462A0000 */ add.d $f0, $f0, $f10 -/* 908A0C 80240FDC 24420008 */ addiu $v0, $v0, 8 -/* 908A10 80240FE0 AC620000 */ sw $v0, ($v1) -/* 908A14 80240FE4 46200020 */ cvt.s.d $f0, $f0 -/* 908A18 80240FE8 460E0002 */ mul.s $f0, $f0, $f14 -/* 908A1C 80240FEC 00000000 */ nop -/* 908A20 80240FF0 4600648D */ trunc.w.s $f18, $f12 -/* 908A24 80240FF4 44039000 */ mfc1 $v1, $f18 -/* 908A28 80240FF8 00000000 */ nop -/* 908A2C 80240FFC 30630FFF */ andi $v1, $v1, 0xfff -/* 908A30 80241000 00031B00 */ sll $v1, $v1, 0xc -/* 908A34 80241004 4600248D */ trunc.w.s $f18, $f4 -/* 908A38 80241008 44029000 */ mfc1 $v0, $f18 -/* 908A3C 8024100C 00000000 */ nop -/* 908A40 80241010 30420FFF */ andi $v0, $v0, 0xfff -/* 908A44 80241014 00461025 */ or $v0, $v0, $a2 -/* 908A48 80241018 00621825 */ or $v1, $v1, $v0 -/* 908A4C 8024101C 4600148D */ trunc.w.s $f18, $f2 -/* 908A50 80241020 44029000 */ mfc1 $v0, $f18 -/* 908A54 80241024 00000000 */ nop -/* 908A58 80241028 30420FFF */ andi $v0, $v0, 0xfff -/* 908A5C 8024102C 00021300 */ sll $v0, $v0, 0xc -/* 908A60 80241030 ACE30000 */ sw $v1, ($a3) -/* 908A64 80241034 4600048D */ trunc.w.s $f18, $f0 -/* 908A68 80241038 44039000 */ mfc1 $v1, $f18 -/* 908A6C 8024103C 00000000 */ nop -/* 908A70 80241040 30630FFF */ andi $v1, $v1, 0xfff -/* 908A74 80241044 00431025 */ or $v0, $v0, $v1 -/* 908A78 80241048 ACE20004 */ sw $v0, 4($a3) -/* 908A7C 8024104C 240200B4 */ addiu $v0, $zero, 0xb4 -/* 908A80 80241050 AFA2001C */ sw $v0, 0x1c($sp) -/* 908A84 80241054 24020140 */ addiu $v0, $zero, 0x140 -/* 908A88 80241058 AFA20044 */ sw $v0, 0x44($sp) -/* 908A8C 8024105C 240200F0 */ addiu $v0, $zero, 0xf0 -/* 908A90 80241060 4620848D */ trunc.w.d $f18, $f16 -/* 908A94 80241064 44069000 */ mfc1 $a2, $f18 -/* 908A98 80241068 3C013F80 */ lui $at, 0x3f80 -/* 908A9C 8024106C 44810000 */ mtc1 $at, $f0 -/* 908AA0 80241070 4620348D */ trunc.w.d $f18, $f6 -/* 908AA4 80241074 44079000 */ mfc1 $a3, $f18 -/* 908AA8 80241078 AFA00010 */ sw $zero, 0x10($sp) -/* 908AAC 8024107C AFA80014 */ sw $t0, 0x14($sp) -/* 908AB0 80241080 AFA90018 */ sw $t1, 0x18($sp) -/* 908AB4 80241084 AFA00020 */ sw $zero, 0x20($sp) -/* 908AB8 80241088 AFA0002C */ sw $zero, 0x2c($sp) -/* 908ABC 8024108C AFA00030 */ sw $zero, 0x30($sp) -/* 908AC0 80241090 AFA00034 */ sw $zero, 0x34($sp) -/* 908AC4 80241094 AFA00038 */ sw $zero, 0x38($sp) -/* 908AC8 80241098 AFA0003C */ sw $zero, 0x3c($sp) -/* 908ACC 8024109C AFA00040 */ sw $zero, 0x40($sp) -/* 908AD0 802410A0 AFA20048 */ sw $v0, 0x48($sp) -/* 908AD4 802410A4 AFA0004C */ sw $zero, 0x4c($sp) -/* 908AD8 802410A8 E7A00024 */ swc1 $f0, 0x24($sp) -/* 908ADC 802410AC 0C03D4B8 */ jal draw_box -/* 908AE0 802410B0 E7A00028 */ swc1 $f0, 0x28($sp) -.L802410B4: -/* 908AE4 802410B4 8FBF0058 */ lw $ra, 0x58($sp) -/* 908AE8 802410B8 8FB10054 */ lw $s1, 0x54($sp) -/* 908AEC 802410BC 8FB00050 */ lw $s0, 0x50($sp) -/* 908AF0 802410C0 03E00008 */ jr $ra -/* 908AF4 802410C4 27BD0060 */ addiu $sp, $sp, 0x60 -/* 908AF8 802410C8 00000000 */ nop -/* 908AFC 802410CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_24/func_80240010_90B240.s b/asm/nonmatchings/world/area_kmr/kmr_24/func_80240010_90B240.s deleted file mode 100644 index b442ac0692..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_24/func_80240010_90B240.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240010_90B250 -/* 90B250 80240010 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 90B254 80240014 AFB00018 */ sw $s0, 0x18($sp) -/* 90B258 80240018 0080802D */ daddu $s0, $a0, $zero -/* 90B25C 8024001C 10A00004 */ beqz $a1, .L80240030 -/* 90B260 80240020 AFBF001C */ sw $ra, 0x1c($sp) -/* 90B264 80240024 0C04E0A8 */ jal set_map_transition_effect -/* 90B268 80240028 24040004 */ addiu $a0, $zero, 4 -/* 90B26C 8024002C AE000074 */ sw $zero, 0x74($s0) -.L80240030: -/* 90B270 80240030 96020076 */ lhu $v0, 0x76($s0) -/* 90B274 80240034 27A40010 */ addiu $a0, $sp, 0x10 -/* 90B278 80240038 0C04E0AB */ jal func_801382AC -/* 90B27C 8024003C A7A20010 */ sh $v0, 0x10($sp) -/* 90B280 80240040 00021400 */ sll $v0, $v0, 0x10 -/* 90B284 80240044 10400005 */ beqz $v0, .L8024005C -/* 90B288 80240048 0000102D */ daddu $v0, $zero, $zero -/* 90B28C 8024004C 0C00CD3C */ jal set_game_mode -/* 90B290 80240050 0000202D */ daddu $a0, $zero, $zero -/* 90B294 80240054 08090019 */ j .L80240064 -/* 90B298 80240058 24020002 */ addiu $v0, $zero, 2 -.L8024005C: -/* 90B29C 8024005C 87A30010 */ lh $v1, 0x10($sp) -/* 90B2A0 80240060 AE030074 */ sw $v1, 0x74($s0) -.L80240064: -/* 90B2A4 80240064 8FBF001C */ lw $ra, 0x1c($sp) -/* 90B2A8 80240068 8FB00018 */ lw $s0, 0x18($sp) -/* 90B2AC 8024006C 03E00008 */ jr $ra -/* 90B2B0 80240070 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_30/func_80240124_90B6D0.s b/asm/nonmatchings/world/area_kmr/kmr_30/func_80240124_90B6D0.s deleted file mode 100644 index be2b0a8b3e..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_30/func_80240124_90B6D0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_90B7F4 -/* 90B7F4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 90B7F8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 90B7FC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 90B800 80240130 10A00005 */ beqz $a1, .L80240148 -/* 90B804 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 90B808 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 90B80C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 90B810 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 90B814 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 90B818 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 90B81C 8024014C 1440000E */ bnez $v0, .L80240188 -/* 90B820 80240150 00000000 */ nop -/* 90B824 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 90B828 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 90B82C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 90B830 80240160 04610004 */ bgez $v1, .L80240174 -/* 90B834 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 90B838 80240168 3C020002 */ lui $v0, 2 -/* 90B83C 8024016C 08090061 */ j .L80240184 -/* 90B840 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 90B844 80240174 3C040002 */ lui $a0, 2 -/* 90B848 80240178 0083102A */ slt $v0, $a0, $v1 -/* 90B84C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 90B850 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 90B854 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 90B858 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 90B85C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 90B860 80240190 00000000 */ nop -/* 90B864 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 90B868 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 90B86C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 90B870 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 90B874 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 90B878 802401A8 3C020002 */ lui $v0, 2 -/* 90B87C 802401AC 08090071 */ j .L802401C4 -/* 90B880 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 90B884 802401B4 3C040002 */ lui $a0, 2 -/* 90B888 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 90B88C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 90B890 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 90B894 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 90B898 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 90B89C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 90B8A0 802401D0 00000000 */ nop -/* 90B8A4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 90B8A8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 90B8AC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 90B8B0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 90B8B4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 90B8B8 802401E8 3C020002 */ lui $v0, 2 -/* 90B8BC 802401EC 08090081 */ j .L80240204 -/* 90B8C0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 90B8C4 802401F4 3C040002 */ lui $a0, 2 -/* 90B8C8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 90B8CC 802401FC 10400002 */ beqz $v0, .L80240208 -/* 90B8D0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 90B8D4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 90B8D8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 90B8DC 8024020C 1440000E */ bnez $v0, .L80240248 -/* 90B8E0 80240210 00000000 */ nop -/* 90B8E4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 90B8E8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 90B8EC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 90B8F0 80240220 04610004 */ bgez $v1, .L80240234 -/* 90B8F4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 90B8F8 80240228 3C020002 */ lui $v0, 2 -/* 90B8FC 8024022C 08090091 */ j .L80240244 -/* 90B900 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 90B904 80240234 3C040002 */ lui $a0, 2 -/* 90B908 80240238 0083102A */ slt $v0, $a0, $v1 -/* 90B90C 8024023C 10400002 */ beqz $v0, .L80240248 -/* 90B910 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 90B914 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 90B918 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 90B91C 8024024C 0C046F07 */ jal set_main_pan_u -/* 90B920 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 90B924 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 90B928 80240258 0C046F0D */ jal set_main_pan_v -/* 90B92C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 90B930 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 90B934 80240264 0C046F13 */ jal set_aux_pan_u -/* 90B938 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 90B93C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 90B940 80240270 0C046F19 */ jal set_aux_pan_v -/* 90B944 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 90B948 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 90B94C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 90B950 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 90B954 80240284 24420001 */ addiu $v0, $v0, 1 -/* 90B958 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 90B95C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 90B960 80240290 24630001 */ addiu $v1, $v1, 1 -/* 90B964 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 90B968 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 90B96C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 90B970 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 90B974 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 90B978 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 90B97C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 90B980 802402B0 14600002 */ bnez $v1, .L802402BC -/* 90B984 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 90B988 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 90B98C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 90B990 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 90B994 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 90B998 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 90B99C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 90B9A0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 90B9A4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 90B9A8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 90B9AC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 90B9B0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 90B9B4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 90B9B8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 90B9BC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 90B9C0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 90B9C4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 90B9C8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 90B9CC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 90B9D0 80240300 0000102D */ daddu $v0, $zero, $zero -/* 90B9D4 80240304 03E00008 */ jr $ra -/* 90B9D8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 90B9DC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_30/func_80240310_90B6D0.s b/asm/nonmatchings/world/area_kmr/kmr_30/func_80240310_90B6D0.s deleted file mode 100644 index 0393bb3f4c..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_30/func_80240310_90B6D0.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_90B9E0 -/* 90B9E0 80240310 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 90B9E4 80240314 AFBF002C */ sw $ra, 0x2c($sp) -/* 90B9E8 80240318 AFB60028 */ sw $s6, 0x28($sp) -/* 90B9EC 8024031C AFB50024 */ sw $s5, 0x24($sp) -/* 90B9F0 80240320 AFB40020 */ sw $s4, 0x20($sp) -/* 90B9F4 80240324 AFB3001C */ sw $s3, 0x1c($sp) -/* 90B9F8 80240328 AFB20018 */ sw $s2, 0x18($sp) -/* 90B9FC 8024032C AFB10014 */ sw $s1, 0x14($sp) -/* 90BA00 80240330 AFB00010 */ sw $s0, 0x10($sp) -/* 90BA04 80240334 8C82000C */ lw $v0, 0xc($a0) -/* 90BA08 80240338 8C450000 */ lw $a1, ($v0) -/* 90BA0C 8024033C 0C0B1EAF */ jal get_variable -/* 90BA10 80240340 241000FF */ addiu $s0, $zero, 0xff -/* 90BA14 80240344 240400FF */ addiu $a0, $zero, 0xff -/* 90BA18 80240348 0C00A67F */ jal rand_int -/* 90BA1C 8024034C 0040982D */ daddu $s3, $v0, $zero -/* 90BA20 80240350 0040882D */ daddu $s1, $v0, $zero -/* 90BA24 80240354 0C00A67F */ jal rand_int -/* 90BA28 80240358 02112023 */ subu $a0, $s0, $s1 -/* 90BA2C 8024035C 0040902D */ daddu $s2, $v0, $zero -/* 90BA30 80240360 02128023 */ subu $s0, $s0, $s2 -/* 90BA34 80240364 0C00A67F */ jal rand_int -/* 90BA38 80240368 02112023 */ subu $a0, $s0, $s1 -/* 90BA3C 8024036C 0040802D */ daddu $s0, $v0, $zero -/* 90BA40 80240370 0C00A67F */ jal rand_int -/* 90BA44 80240374 24040080 */ addiu $a0, $zero, 0x80 -/* 90BA48 80240378 0222B021 */ addu $s6, $s1, $v0 -/* 90BA4C 8024037C 0C00A67F */ jal rand_int -/* 90BA50 80240380 24040080 */ addiu $a0, $zero, 0x80 -/* 90BA54 80240384 0242A821 */ addu $s5, $s2, $v0 -/* 90BA58 80240388 0C00A67F */ jal rand_int -/* 90BA5C 8024038C 24040080 */ addiu $a0, $zero, 0x80 -/* 90BA60 80240390 0202A021 */ addu $s4, $s0, $v0 -/* 90BA64 80240394 2AC20100 */ slti $v0, $s6, 0x100 -/* 90BA68 80240398 50400001 */ beql $v0, $zero, .L802403A0 -/* 90BA6C 8024039C 241600FF */ addiu $s6, $zero, 0xff -.L802403A0: -/* 90BA70 802403A0 2AA20100 */ slti $v0, $s5, 0x100 -/* 90BA74 802403A4 50400001 */ beql $v0, $zero, .L802403AC -/* 90BA78 802403A8 241500FF */ addiu $s5, $zero, 0xff -.L802403AC: -/* 90BA7C 802403AC 2A820100 */ slti $v0, $s4, 0x100 -/* 90BA80 802403B0 50400001 */ beql $v0, $zero, .L802403B8 -/* 90BA84 802403B4 241400FF */ addiu $s4, $zero, 0xff -.L802403B8: -/* 90BA88 802403B8 0C00A67F */ jal rand_int -/* 90BA8C 802403BC 24040080 */ addiu $a0, $zero, 0x80 -/* 90BA90 802403C0 02228821 */ addu $s1, $s1, $v0 -/* 90BA94 802403C4 0C00A67F */ jal rand_int -/* 90BA98 802403C8 24040080 */ addiu $a0, $zero, 0x80 -/* 90BA9C 802403CC 02429021 */ addu $s2, $s2, $v0 -/* 90BAA0 802403D0 0C00A67F */ jal rand_int -/* 90BAA4 802403D4 24040080 */ addiu $a0, $zero, 0x80 -/* 90BAA8 802403D8 02028021 */ addu $s0, $s0, $v0 -/* 90BAAC 802403DC 2A220100 */ slti $v0, $s1, 0x100 -/* 90BAB0 802403E0 50400001 */ beql $v0, $zero, .L802403E8 -/* 90BAB4 802403E4 241100FF */ addiu $s1, $zero, 0xff -.L802403E8: -/* 90BAB8 802403E8 2A420100 */ slti $v0, $s2, 0x100 -/* 90BABC 802403EC 50400001 */ beql $v0, $zero, .L802403F4 -/* 90BAC0 802403F0 241200FF */ addiu $s2, $zero, 0xff -.L802403F4: -/* 90BAC4 802403F4 2A020100 */ slti $v0, $s0, 0x100 -/* 90BAC8 802403F8 50400001 */ beql $v0, $zero, .L80240400 -/* 90BACC 802403FC 241000FF */ addiu $s0, $zero, 0xff -.L80240400: -/* 90BAD0 80240400 8E62000C */ lw $v0, 0xc($s3) -/* 90BAD4 80240404 AC560024 */ sw $s6, 0x24($v0) -/* 90BAD8 80240408 8E62000C */ lw $v0, 0xc($s3) -/* 90BADC 8024040C AC550028 */ sw $s5, 0x28($v0) -/* 90BAE0 80240410 8E62000C */ lw $v0, 0xc($s3) -/* 90BAE4 80240414 AC54002C */ sw $s4, 0x2c($v0) -/* 90BAE8 80240418 8E62000C */ lw $v0, 0xc($s3) -/* 90BAEC 8024041C AC510034 */ sw $s1, 0x34($v0) -/* 90BAF0 80240420 8E62000C */ lw $v0, 0xc($s3) -/* 90BAF4 80240424 AC520038 */ sw $s2, 0x38($v0) -/* 90BAF8 80240428 8E63000C */ lw $v1, 0xc($s3) -/* 90BAFC 8024042C AC70003C */ sw $s0, 0x3c($v1) -/* 90BB00 80240430 8FBF002C */ lw $ra, 0x2c($sp) -/* 90BB04 80240434 8FB60028 */ lw $s6, 0x28($sp) -/* 90BB08 80240438 8FB50024 */ lw $s5, 0x24($sp) -/* 90BB0C 8024043C 8FB40020 */ lw $s4, 0x20($sp) -/* 90BB10 80240440 8FB3001C */ lw $s3, 0x1c($sp) -/* 90BB14 80240444 8FB20018 */ lw $s2, 0x18($sp) -/* 90BB18 80240448 8FB10014 */ lw $s1, 0x14($sp) -/* 90BB1C 8024044C 8FB00010 */ lw $s0, 0x10($sp) -/* 90BB20 80240450 24020002 */ addiu $v0, $zero, 2 -/* 90BB24 80240454 03E00008 */ jr $ra -/* 90BB28 80240458 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_30/func_8024045C_90B6D0.s b/asm/nonmatchings/world/area_kmr/kmr_30/func_8024045C_90B6D0.s deleted file mode 100644 index 6d92920311..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_30/func_8024045C_90B6D0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024045C_90BB2C -/* 90BB2C 8024045C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 90BB30 80240460 AFBF0010 */ sw $ra, 0x10($sp) -/* 90BB34 80240464 8C82000C */ lw $v0, 0xc($a0) -/* 90BB38 80240468 0C0B1EAF */ jal get_variable -/* 90BB3C 8024046C 8C450000 */ lw $a1, ($v0) -/* 90BB40 80240470 8FBF0010 */ lw $ra, 0x10($sp) -/* 90BB44 80240474 3C018024 */ lui $at, 0x8024 -/* 90BB48 80240478 AC220C0C */ sw $v0, 0xc0c($at) -/* 90BB4C 8024047C 24020002 */ addiu $v0, $zero, 2 -/* 90BB50 80240480 03E00008 */ jr $ra -/* 90BB54 80240484 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/func_80240160_A46F60.s b/asm/nonmatchings/world/area_kpa/kpa_01/func_80240160_A46F60.s deleted file mode 100644 index eb0e32be75..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_01/func_80240160_A46F60.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240160_A470C0 -/* A470C0 80240160 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A470C4 80240164 AFB20018 */ sw $s2, 0x18($sp) -/* A470C8 80240168 0080902D */ daddu $s2, $a0, $zero -/* A470CC 8024016C AFBF001C */ sw $ra, 0x1c($sp) -/* A470D0 80240170 AFB10014 */ sw $s1, 0x14($sp) -/* A470D4 80240174 AFB00010 */ sw $s0, 0x10($sp) -/* A470D8 80240178 8E510148 */ lw $s1, 0x148($s2) -/* A470DC 8024017C 0C00EABB */ jal get_npc_unsafe -/* A470E0 80240180 86240008 */ lh $a0, 8($s1) -/* A470E4 80240184 0040802D */ daddu $s0, $v0, $zero -/* A470E8 80240188 8E2300CC */ lw $v1, 0xcc($s1) -/* A470EC 8024018C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A470F0 80240190 8C630020 */ lw $v1, 0x20($v1) -/* A470F4 80240194 AE030028 */ sw $v1, 0x28($s0) -/* A470F8 80240198 96220076 */ lhu $v0, 0x76($s1) -/* A470FC 8024019C A602008E */ sh $v0, 0x8e($s0) -/* A47100 802401A0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A47104 802401A4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A47108 802401A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A4710C 802401AC 8C460028 */ lw $a2, 0x28($v0) -/* A47110 802401B0 0C00A720 */ jal atan2 -/* A47114 802401B4 8C470030 */ lw $a3, 0x30($v0) -/* A47118 802401B8 2402000D */ addiu $v0, $zero, 0xd -/* A4711C 802401BC E600000C */ swc1 $f0, 0xc($s0) -/* A47120 802401C0 AE420070 */ sw $v0, 0x70($s2) -/* A47124 802401C4 8FBF001C */ lw $ra, 0x1c($sp) -/* A47128 802401C8 8FB20018 */ lw $s2, 0x18($sp) -/* A4712C 802401CC 8FB10014 */ lw $s1, 0x14($sp) -/* A47130 802401D0 8FB00010 */ lw $s0, 0x10($sp) -/* A47134 802401D4 03E00008 */ jr $ra -/* A47138 802401D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/func_80240310_A46F60.s b/asm/nonmatchings/world/area_kpa/kpa_01/func_80240310_A46F60.s deleted file mode 100644 index 794f55038a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_01/func_80240310_A46F60.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_A47270 -/* A47270 80240310 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A47274 80240314 AFB3003C */ sw $s3, 0x3c($sp) -/* A47278 80240318 0080982D */ daddu $s3, $a0, $zero -/* A4727C 8024031C AFBF0040 */ sw $ra, 0x40($sp) -/* A47280 80240320 AFB20038 */ sw $s2, 0x38($sp) -/* A47284 80240324 AFB10034 */ sw $s1, 0x34($sp) -/* A47288 80240328 AFB00030 */ sw $s0, 0x30($sp) -/* A4728C 8024032C 8E710148 */ lw $s1, 0x148($s3) -/* A47290 80240330 0C00EABB */ jal get_npc_unsafe -/* A47294 80240334 86240008 */ lh $a0, 8($s1) -/* A47298 80240338 0040802D */ daddu $s0, $v0, $zero -/* A4729C 8024033C 8E22007C */ lw $v0, 0x7c($s1) -/* A472A0 80240340 8603008E */ lh $v1, 0x8e($s0) -/* A472A4 80240344 2442FFFF */ addiu $v0, $v0, -1 -/* A472A8 80240348 14620012 */ bne $v1, $v0, .L80240394 -/* A472AC 8024034C 00000000 */ nop -/* A472B0 80240350 C6000038 */ lwc1 $f0, 0x38($s0) -/* A472B4 80240354 4600020D */ trunc.w.s $f8, $f0 -/* A472B8 80240358 44024000 */ mfc1 $v0, $f8 -/* A472BC 8024035C 00000000 */ nop -/* A472C0 80240360 A6220010 */ sh $v0, 0x10($s1) -/* A472C4 80240364 C600003C */ lwc1 $f0, 0x3c($s0) -/* A472C8 80240368 4600020D */ trunc.w.s $f8, $f0 -/* A472CC 8024036C 44024000 */ mfc1 $v0, $f8 -/* A472D0 80240370 00000000 */ nop -/* A472D4 80240374 A6220012 */ sh $v0, 0x12($s1) -/* A472D8 80240378 C6000040 */ lwc1 $f0, 0x40($s0) -/* A472DC 8024037C 24020001 */ addiu $v0, $zero, 1 -/* A472E0 80240380 A2220007 */ sb $v0, 7($s1) -/* A472E4 80240384 4600020D */ trunc.w.s $f8, $f0 -/* A472E8 80240388 44024000 */ mfc1 $v0, $f8 -/* A472EC 8024038C 00000000 */ nop -/* A472F0 80240390 A6220014 */ sh $v0, 0x14($s1) -.L80240394: -/* A472F4 80240394 C6000038 */ lwc1 $f0, 0x38($s0) -/* A472F8 80240398 C602003C */ lwc1 $f2, 0x3c($s0) -/* A472FC 8024039C C6040040 */ lwc1 $f4, 0x40($s0) -/* A47300 802403A0 C6060018 */ lwc1 $f6, 0x18($s0) -/* A47304 802403A4 E7A00020 */ swc1 $f0, 0x20($sp) -/* A47308 802403A8 E7A20024 */ swc1 $f2, 0x24($sp) -/* A4730C 802403AC E7A40028 */ swc1 $f4, 0x28($sp) -/* A47310 802403B0 E7A60010 */ swc1 $f6, 0x10($sp) -/* A47314 802403B4 C600000C */ lwc1 $f0, 0xc($s0) -/* A47318 802403B8 E7A00014 */ swc1 $f0, 0x14($sp) -/* A4731C 802403BC 860200A8 */ lh $v0, 0xa8($s0) -/* A47320 802403C0 27A50020 */ addiu $a1, $sp, 0x20 -/* A47324 802403C4 44820000 */ mtc1 $v0, $f0 -/* A47328 802403C8 00000000 */ nop -/* A4732C 802403CC 46800020 */ cvt.s.w $f0, $f0 -/* A47330 802403D0 E7A00018 */ swc1 $f0, 0x18($sp) -/* A47334 802403D4 860200A6 */ lh $v0, 0xa6($s0) -/* A47338 802403D8 27A60024 */ addiu $a2, $sp, 0x24 -/* A4733C 802403DC 44820000 */ mtc1 $v0, $f0 -/* A47340 802403E0 00000000 */ nop -/* A47344 802403E4 46800020 */ cvt.s.w $f0, $f0 -/* A47348 802403E8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A4734C 802403EC 8E040080 */ lw $a0, 0x80($s0) -/* A47350 802403F0 0C037711 */ jal func_800DDC44 -/* A47354 802403F4 27A70028 */ addiu $a3, $sp, 0x28 -/* A47358 802403F8 0040902D */ daddu $s2, $v0, $zero -/* A4735C 802403FC 16400005 */ bnez $s2, .L80240414 -/* A47360 80240400 00000000 */ nop -/* A47364 80240404 8E050018 */ lw $a1, 0x18($s0) -/* A47368 80240408 8E06000C */ lw $a2, 0xc($s0) -/* A4736C 8024040C 0C00EA95 */ jal npc_move_heading -/* A47370 80240410 0200202D */ daddu $a0, $s0, $zero -.L80240414: -/* A47374 80240414 8602008E */ lh $v0, 0x8e($s0) -/* A47378 80240418 9603008E */ lhu $v1, 0x8e($s0) -/* A4737C 8024041C 18400007 */ blez $v0, .L8024043C -/* A47380 80240420 2462FFFF */ addiu $v0, $v1, -1 -/* A47384 80240424 A602008E */ sh $v0, 0x8e($s0) -/* A47388 80240428 00021400 */ sll $v0, $v0, 0x10 -/* A4738C 8024042C 18400003 */ blez $v0, .L8024043C -/* A47390 80240430 00000000 */ nop -/* A47394 80240434 12400008 */ beqz $s2, .L80240458 -/* A47398 80240438 00000000 */ nop -.L8024043C: -/* A4739C 8024043C 8E2200CC */ lw $v0, 0xcc($s1) -/* A473A0 80240440 A2200007 */ sb $zero, 7($s1) -/* A473A4 80240444 8C420028 */ lw $v0, 0x28($v0) -/* A473A8 80240448 A600008E */ sh $zero, 0x8e($s0) -/* A473AC 8024044C AE020028 */ sw $v0, 0x28($s0) -/* A473B0 80240450 2402000F */ addiu $v0, $zero, 0xf -/* A473B4 80240454 AE620070 */ sw $v0, 0x70($s3) -.L80240458: -/* A473B8 80240458 8FBF0040 */ lw $ra, 0x40($sp) -/* A473BC 8024045C 8FB3003C */ lw $s3, 0x3c($sp) -/* A473C0 80240460 8FB20038 */ lw $s2, 0x38($sp) -/* A473C4 80240464 8FB10034 */ lw $s1, 0x34($sp) -/* A473C8 80240468 8FB00030 */ lw $s0, 0x30($sp) -/* A473CC 8024046C 03E00008 */ jr $ra -/* A473D0 80240470 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/func_80240474_A46F60.s b/asm/nonmatchings/world/area_kpa/kpa_01/func_80240474_A46F60.s deleted file mode 100644 index 2e1d8b8d4b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_01/func_80240474_A46F60.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240474_A473D4 -/* A473D4 80240474 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A473D8 80240478 AFB10014 */ sw $s1, 0x14($sp) -/* A473DC 8024047C 0080882D */ daddu $s1, $a0, $zero -/* A473E0 80240480 AFBF0018 */ sw $ra, 0x18($sp) -/* A473E4 80240484 AFB00010 */ sw $s0, 0x10($sp) -/* A473E8 80240488 8E300148 */ lw $s0, 0x148($s1) -/* A473EC 8024048C 0C00EABB */ jal get_npc_unsafe -/* A473F0 80240490 86040008 */ lh $a0, 8($s0) -/* A473F4 80240494 0040202D */ daddu $a0, $v0, $zero -/* A473F8 80240498 9482008E */ lhu $v0, 0x8e($a0) -/* A473FC 8024049C 24030003 */ addiu $v1, $zero, 3 -/* A47400 802404A0 24420001 */ addiu $v0, $v0, 1 -/* A47404 802404A4 A482008E */ sh $v0, 0x8e($a0) -/* A47408 802404A8 00021400 */ sll $v0, $v0, 0x10 -/* A4740C 802404AC 00021403 */ sra $v0, $v0, 0x10 -/* A47410 802404B0 14430003 */ bne $v0, $v1, .L802404C0 -/* A47414 802404B4 00000000 */ nop -/* A47418 802404B8 96020086 */ lhu $v0, 0x86($s0) -/* A4741C 802404BC A48200A8 */ sh $v0, 0xa8($a0) -.L802404C0: -/* A47420 802404C0 8482008E */ lh $v0, 0x8e($a0) -/* A47424 802404C4 8E030080 */ lw $v1, 0x80($s0) -/* A47428 802404C8 0043102A */ slt $v0, $v0, $v1 -/* A4742C 802404CC 14400004 */ bnez $v0, .L802404E0 -/* A47430 802404D0 00000000 */ nop -/* A47434 802404D4 96020086 */ lhu $v0, 0x86($s0) -/* A47438 802404D8 A48200A8 */ sh $v0, 0xa8($a0) -/* A4743C 802404DC AE200070 */ sw $zero, 0x70($s1) -.L802404E0: -/* A47440 802404E0 8FBF0018 */ lw $ra, 0x18($sp) -/* A47444 802404E4 8FB10014 */ lw $s1, 0x14($sp) -/* A47448 802404E8 8FB00010 */ lw $s0, 0x10($sp) -/* A4744C 802404EC 03E00008 */ jr $ra -/* A47450 802404F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/func_802409D4_A46F60.s b/asm/nonmatchings/world/area_kpa/kpa_01/func_802409D4_A46F60.s deleted file mode 100644 index 6cc8cc7362..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_01/func_802409D4_A46F60.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409D4_A47934 -/* A47934 802409D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A47938 802409D8 0080102D */ daddu $v0, $a0, $zero -/* A4793C 802409DC AFB00010 */ sw $s0, 0x10($sp) -/* A47940 802409E0 AFBF0018 */ sw $ra, 0x18($sp) -/* A47944 802409E4 AFB10014 */ sw $s1, 0x14($sp) -/* A47948 802409E8 8C44014C */ lw $a0, 0x14c($v0) -/* A4794C 802409EC 8C510148 */ lw $s1, 0x148($v0) -/* A47950 802409F0 0C00EAD2 */ jal get_npc_safe -/* A47954 802409F4 00A0802D */ daddu $s0, $a1, $zero -/* A47958 802409F8 56000001 */ bnel $s0, $zero, .L80240A00 -/* A4795C 802409FC A04000AB */ sb $zero, 0xab($v0) -.L80240A00: -/* A47960 80240A00 8C420000 */ lw $v0, ($v0) -/* A47964 80240A04 30421000 */ andi $v0, $v0, 0x1000 -/* A47968 80240A08 1040000A */ beqz $v0, .L80240A34 -/* A4796C 80240A0C 0000102D */ daddu $v0, $zero, $zero -/* A47970 80240A10 82220004 */ lb $v0, 4($s1) -/* A47974 80240A14 3C03800B */ lui $v1, %hi(gCurrentEncounter) -/* A47978 80240A18 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) -/* A4797C 80240A1C 00021080 */ sll $v0, $v0, 2 -/* A47980 80240A20 00431021 */ addu $v0, $v0, $v1 -/* A47984 80240A24 8C440028 */ lw $a0, 0x28($v0) -/* A47988 80240A28 9623006E */ lhu $v1, 0x6e($s1) -/* A4798C 80240A2C 24020002 */ addiu $v0, $zero, 2 -/* A47990 80240A30 A4830044 */ sh $v1, 0x44($a0) -.L80240A34: -/* A47994 80240A34 8FBF0018 */ lw $ra, 0x18($sp) -/* A47998 80240A38 8FB10014 */ lw $s1, 0x14($sp) -/* A4799C 80240A3C 8FB00010 */ lw $s0, 0x10($sp) -/* A479A0 80240A40 03E00008 */ jr $ra -/* A479A4 80240A44 27BD0020 */ addiu $sp, $sp, 0x20 -/* A479A8 80240A48 00000000 */ nop -/* A479AC 80240A4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/func_80240160_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/func_80240160_A485C0.s deleted file mode 100644 index 0942f221f3..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/func_80240160_A485C0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240160_A48720 -/* A48720 80240160 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A48724 80240164 AFB20018 */ sw $s2, 0x18($sp) -/* A48728 80240168 0080902D */ daddu $s2, $a0, $zero -/* A4872C 8024016C AFBF001C */ sw $ra, 0x1c($sp) -/* A48730 80240170 AFB10014 */ sw $s1, 0x14($sp) -/* A48734 80240174 AFB00010 */ sw $s0, 0x10($sp) -/* A48738 80240178 8E510148 */ lw $s1, 0x148($s2) -/* A4873C 8024017C 0C00EABB */ jal get_npc_unsafe -/* A48740 80240180 86240008 */ lh $a0, 8($s1) -/* A48744 80240184 0040802D */ daddu $s0, $v0, $zero -/* A48748 80240188 8E2300CC */ lw $v1, 0xcc($s1) -/* A4874C 8024018C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A48750 80240190 8C630020 */ lw $v1, 0x20($v1) -/* A48754 80240194 AE030028 */ sw $v1, 0x28($s0) -/* A48758 80240198 96220076 */ lhu $v0, 0x76($s1) -/* A4875C 8024019C A602008E */ sh $v0, 0x8e($s0) -/* A48760 802401A0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A48764 802401A4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A48768 802401A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A4876C 802401AC 8C460028 */ lw $a2, 0x28($v0) -/* A48770 802401B0 0C00A720 */ jal atan2 -/* A48774 802401B4 8C470030 */ lw $a3, 0x30($v0) -/* A48778 802401B8 2402000D */ addiu $v0, $zero, 0xd -/* A4877C 802401BC E600000C */ swc1 $f0, 0xc($s0) -/* A48780 802401C0 AE420070 */ sw $v0, 0x70($s2) -/* A48784 802401C4 8FBF001C */ lw $ra, 0x1c($sp) -/* A48788 802401C8 8FB20018 */ lw $s2, 0x18($sp) -/* A4878C 802401CC 8FB10014 */ lw $s1, 0x14($sp) -/* A48790 802401D0 8FB00010 */ lw $s0, 0x10($sp) -/* A48794 802401D4 03E00008 */ jr $ra -/* A48798 802401D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/func_802401DC_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/func_802401DC_A485C0.s deleted file mode 100644 index 2e700dd16a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/func_802401DC_A485C0.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401DC_A4879C -/* A4879C 802401DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A487A0 802401E0 AFB3001C */ sw $s3, 0x1c($sp) -/* A487A4 802401E4 0080982D */ daddu $s3, $a0, $zero -/* A487A8 802401E8 AFBF0020 */ sw $ra, 0x20($sp) -/* A487AC 802401EC AFB20018 */ sw $s2, 0x18($sp) -/* A487B0 802401F0 AFB10014 */ sw $s1, 0x14($sp) -/* A487B4 802401F4 AFB00010 */ sw $s0, 0x10($sp) -/* A487B8 802401F8 8E710148 */ lw $s1, 0x148($s3) -/* A487BC 802401FC 86240008 */ lh $a0, 8($s1) -/* A487C0 80240200 0C00EABB */ jal get_npc_unsafe -/* A487C4 80240204 00A0902D */ daddu $s2, $a1, $zero -/* A487C8 80240208 0040802D */ daddu $s0, $v0, $zero -/* A487CC 8024020C 8602008E */ lh $v0, 0x8e($s0) -/* A487D0 80240210 9603008E */ lhu $v1, 0x8e($s0) -/* A487D4 80240214 18400005 */ blez $v0, .L8024022C -/* A487D8 80240218 2462FFFF */ addiu $v0, $v1, -1 -/* A487DC 8024021C A602008E */ sh $v0, 0x8e($s0) -/* A487E0 80240220 00021400 */ sll $v0, $v0, 0x10 -/* A487E4 80240224 1C400033 */ bgtz $v0, .L802402F4 -/* A487E8 80240228 00000000 */ nop -.L8024022C: -/* A487EC 8024022C 8602008C */ lh $v0, 0x8c($s0) -/* A487F0 80240230 14400030 */ bnez $v0, .L802402F4 -/* A487F4 80240234 00000000 */ nop -/* A487F8 80240238 8E2200CC */ lw $v0, 0xcc($s1) -/* A487FC 8024023C 8C420024 */ lw $v0, 0x24($v0) -/* A48800 80240240 AE020028 */ sw $v0, 0x28($s0) -/* A48804 80240244 C6400018 */ lwc1 $f0, 0x18($s2) -/* A48808 80240248 E6000018 */ swc1 $f0, 0x18($s0) -/* A4880C 8024024C 8E230088 */ lw $v1, 0x88($s1) -/* A48810 80240250 24020005 */ addiu $v0, $zero, 5 -/* A48814 80240254 10620005 */ beq $v1, $v0, .L8024026C -/* A48818 80240258 00000000 */ nop -/* A4881C 8024025C 10600003 */ beqz $v1, .L8024026C -/* A48820 80240260 24020001 */ addiu $v0, $zero, 1 -/* A48824 80240264 14620006 */ bne $v1, $v0, .L80240280 -/* A48828 80240268 00000000 */ nop -.L8024026C: -/* A4882C 8024026C 8E220084 */ lw $v0, 0x84($s1) -/* A48830 80240270 00021FC2 */ srl $v1, $v0, 0x1f -/* A48834 80240274 00431021 */ addu $v0, $v0, $v1 -/* A48838 80240278 00021043 */ sra $v0, $v0, 1 -/* A4883C 8024027C A60200A8 */ sh $v0, 0xa8($s0) -.L80240280: -/* A48840 80240280 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A48844 80240284 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A48848 80240288 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A4884C 8024028C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A48850 80240290 8C460028 */ lw $a2, 0x28($v0) -/* A48854 80240294 0C00A7B5 */ jal dist2D -/* A48858 80240298 8C470030 */ lw $a3, 0x30($v0) -/* A4885C 8024029C C6020018 */ lwc1 $f2, 0x18($s0) -/* A48860 802402A0 46020003 */ div.s $f0, $f0, $f2 -/* A48864 802402A4 3C018024 */ lui $at, 0x8024 -/* A48868 802402A8 D4223880 */ ldc1 $f2, 0x3880($at) -/* A4886C 802402AC 46000021 */ cvt.d.s $f0, $f0 -/* A48870 802402B0 46220000 */ add.d $f0, $f0, $f2 -/* A48874 802402B4 4620010D */ trunc.w.d $f4, $f0 -/* A48878 802402B8 44022000 */ mfc1 $v0, $f4 -/* A4887C 802402BC 00000000 */ nop -/* A48880 802402C0 A602008E */ sh $v0, 0x8e($s0) -/* A48884 802402C4 00021400 */ sll $v0, $v0, 0x10 -/* A48888 802402C8 8E230078 */ lw $v1, 0x78($s1) -/* A4888C 802402CC 00021403 */ sra $v0, $v0, 0x10 -/* A48890 802402D0 0043102A */ slt $v0, $v0, $v1 -/* A48894 802402D4 10400003 */ beqz $v0, .L802402E4 -/* A48898 802402D8 00000000 */ nop -/* A4889C 802402DC 9622007A */ lhu $v0, 0x7a($s1) -/* A488A0 802402E0 A602008E */ sh $v0, 0x8e($s0) -.L802402E4: -/* A488A4 802402E4 8602008E */ lh $v0, 0x8e($s0) -/* A488A8 802402E8 AE22007C */ sw $v0, 0x7c($s1) -/* A488AC 802402EC 2402000E */ addiu $v0, $zero, 0xe -/* A488B0 802402F0 AE620070 */ sw $v0, 0x70($s3) -.L802402F4: -/* A488B4 802402F4 8FBF0020 */ lw $ra, 0x20($sp) -/* A488B8 802402F8 8FB3001C */ lw $s3, 0x1c($sp) -/* A488BC 802402FC 8FB20018 */ lw $s2, 0x18($sp) -/* A488C0 80240300 8FB10014 */ lw $s1, 0x14($sp) -/* A488C4 80240304 8FB00010 */ lw $s0, 0x10($sp) -/* A488C8 80240308 03E00008 */ jr $ra -/* A488CC 8024030C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/func_80240310_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/func_80240310_A485C0.s deleted file mode 100644 index 9a9664ca15..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/func_80240310_A485C0.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_A488D0 -/* A488D0 80240310 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A488D4 80240314 AFB3003C */ sw $s3, 0x3c($sp) -/* A488D8 80240318 0080982D */ daddu $s3, $a0, $zero -/* A488DC 8024031C AFBF0040 */ sw $ra, 0x40($sp) -/* A488E0 80240320 AFB20038 */ sw $s2, 0x38($sp) -/* A488E4 80240324 AFB10034 */ sw $s1, 0x34($sp) -/* A488E8 80240328 AFB00030 */ sw $s0, 0x30($sp) -/* A488EC 8024032C 8E710148 */ lw $s1, 0x148($s3) -/* A488F0 80240330 0C00EABB */ jal get_npc_unsafe -/* A488F4 80240334 86240008 */ lh $a0, 8($s1) -/* A488F8 80240338 0040802D */ daddu $s0, $v0, $zero -/* A488FC 8024033C 8E22007C */ lw $v0, 0x7c($s1) -/* A48900 80240340 8603008E */ lh $v1, 0x8e($s0) -/* A48904 80240344 2442FFFF */ addiu $v0, $v0, -1 -/* A48908 80240348 14620012 */ bne $v1, $v0, .L80240394 -/* A4890C 8024034C 00000000 */ nop -/* A48910 80240350 C6000038 */ lwc1 $f0, 0x38($s0) -/* A48914 80240354 4600020D */ trunc.w.s $f8, $f0 -/* A48918 80240358 44024000 */ mfc1 $v0, $f8 -/* A4891C 8024035C 00000000 */ nop -/* A48920 80240360 A6220010 */ sh $v0, 0x10($s1) -/* A48924 80240364 C600003C */ lwc1 $f0, 0x3c($s0) -/* A48928 80240368 4600020D */ trunc.w.s $f8, $f0 -/* A4892C 8024036C 44024000 */ mfc1 $v0, $f8 -/* A48930 80240370 00000000 */ nop -/* A48934 80240374 A6220012 */ sh $v0, 0x12($s1) -/* A48938 80240378 C6000040 */ lwc1 $f0, 0x40($s0) -/* A4893C 8024037C 24020001 */ addiu $v0, $zero, 1 -/* A48940 80240380 A2220007 */ sb $v0, 7($s1) -/* A48944 80240384 4600020D */ trunc.w.s $f8, $f0 -/* A48948 80240388 44024000 */ mfc1 $v0, $f8 -/* A4894C 8024038C 00000000 */ nop -/* A48950 80240390 A6220014 */ sh $v0, 0x14($s1) -.L80240394: -/* A48954 80240394 C6000038 */ lwc1 $f0, 0x38($s0) -/* A48958 80240398 C602003C */ lwc1 $f2, 0x3c($s0) -/* A4895C 8024039C C6040040 */ lwc1 $f4, 0x40($s0) -/* A48960 802403A0 C6060018 */ lwc1 $f6, 0x18($s0) -/* A48964 802403A4 E7A00020 */ swc1 $f0, 0x20($sp) -/* A48968 802403A8 E7A20024 */ swc1 $f2, 0x24($sp) -/* A4896C 802403AC E7A40028 */ swc1 $f4, 0x28($sp) -/* A48970 802403B0 E7A60010 */ swc1 $f6, 0x10($sp) -/* A48974 802403B4 C600000C */ lwc1 $f0, 0xc($s0) -/* A48978 802403B8 E7A00014 */ swc1 $f0, 0x14($sp) -/* A4897C 802403BC 860200A8 */ lh $v0, 0xa8($s0) -/* A48980 802403C0 27A50020 */ addiu $a1, $sp, 0x20 -/* A48984 802403C4 44820000 */ mtc1 $v0, $f0 -/* A48988 802403C8 00000000 */ nop -/* A4898C 802403CC 46800020 */ cvt.s.w $f0, $f0 -/* A48990 802403D0 E7A00018 */ swc1 $f0, 0x18($sp) -/* A48994 802403D4 860200A6 */ lh $v0, 0xa6($s0) -/* A48998 802403D8 27A60024 */ addiu $a2, $sp, 0x24 -/* A4899C 802403DC 44820000 */ mtc1 $v0, $f0 -/* A489A0 802403E0 00000000 */ nop -/* A489A4 802403E4 46800020 */ cvt.s.w $f0, $f0 -/* A489A8 802403E8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A489AC 802403EC 8E040080 */ lw $a0, 0x80($s0) -/* A489B0 802403F0 0C037711 */ jal func_800DDC44 -/* A489B4 802403F4 27A70028 */ addiu $a3, $sp, 0x28 -/* A489B8 802403F8 0040902D */ daddu $s2, $v0, $zero -/* A489BC 802403FC 16400005 */ bnez $s2, .L80240414 -/* A489C0 80240400 00000000 */ nop -/* A489C4 80240404 8E050018 */ lw $a1, 0x18($s0) -/* A489C8 80240408 8E06000C */ lw $a2, 0xc($s0) -/* A489CC 8024040C 0C00EA95 */ jal npc_move_heading -/* A489D0 80240410 0200202D */ daddu $a0, $s0, $zero -.L80240414: -/* A489D4 80240414 8602008E */ lh $v0, 0x8e($s0) -/* A489D8 80240418 9603008E */ lhu $v1, 0x8e($s0) -/* A489DC 8024041C 18400007 */ blez $v0, .L8024043C -/* A489E0 80240420 2462FFFF */ addiu $v0, $v1, -1 -/* A489E4 80240424 A602008E */ sh $v0, 0x8e($s0) -/* A489E8 80240428 00021400 */ sll $v0, $v0, 0x10 -/* A489EC 8024042C 18400003 */ blez $v0, .L8024043C -/* A489F0 80240430 00000000 */ nop -/* A489F4 80240434 12400008 */ beqz $s2, .L80240458 -/* A489F8 80240438 00000000 */ nop -.L8024043C: -/* A489FC 8024043C 8E2200CC */ lw $v0, 0xcc($s1) -/* A48A00 80240440 A2200007 */ sb $zero, 7($s1) -/* A48A04 80240444 8C420028 */ lw $v0, 0x28($v0) -/* A48A08 80240448 A600008E */ sh $zero, 0x8e($s0) -/* A48A0C 8024044C AE020028 */ sw $v0, 0x28($s0) -/* A48A10 80240450 2402000F */ addiu $v0, $zero, 0xf -/* A48A14 80240454 AE620070 */ sw $v0, 0x70($s3) -.L80240458: -/* A48A18 80240458 8FBF0040 */ lw $ra, 0x40($sp) -/* A48A1C 8024045C 8FB3003C */ lw $s3, 0x3c($sp) -/* A48A20 80240460 8FB20038 */ lw $s2, 0x38($sp) -/* A48A24 80240464 8FB10034 */ lw $s1, 0x34($sp) -/* A48A28 80240468 8FB00030 */ lw $s0, 0x30($sp) -/* A48A2C 8024046C 03E00008 */ jr $ra -/* A48A30 80240470 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/func_80240474_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/func_80240474_A485C0.s deleted file mode 100644 index f71d6c43b9..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/func_80240474_A485C0.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240474_A48A34 -/* A48A34 80240474 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A48A38 80240478 AFB10014 */ sw $s1, 0x14($sp) -/* A48A3C 8024047C 0080882D */ daddu $s1, $a0, $zero -/* A48A40 80240480 AFBF0018 */ sw $ra, 0x18($sp) -/* A48A44 80240484 AFB00010 */ sw $s0, 0x10($sp) -/* A48A48 80240488 8E300148 */ lw $s0, 0x148($s1) -/* A48A4C 8024048C 0C00EABB */ jal get_npc_unsafe -/* A48A50 80240490 86040008 */ lh $a0, 8($s0) -/* A48A54 80240494 0040202D */ daddu $a0, $v0, $zero -/* A48A58 80240498 9482008E */ lhu $v0, 0x8e($a0) -/* A48A5C 8024049C 24030003 */ addiu $v1, $zero, 3 -/* A48A60 802404A0 24420001 */ addiu $v0, $v0, 1 -/* A48A64 802404A4 A482008E */ sh $v0, 0x8e($a0) -/* A48A68 802404A8 00021400 */ sll $v0, $v0, 0x10 -/* A48A6C 802404AC 00021403 */ sra $v0, $v0, 0x10 -/* A48A70 802404B0 14430003 */ bne $v0, $v1, .L802404C0 -/* A48A74 802404B4 00000000 */ nop -/* A48A78 802404B8 96020086 */ lhu $v0, 0x86($s0) -/* A48A7C 802404BC A48200A8 */ sh $v0, 0xa8($a0) -.L802404C0: -/* A48A80 802404C0 8482008E */ lh $v0, 0x8e($a0) -/* A48A84 802404C4 8E030080 */ lw $v1, 0x80($s0) -/* A48A88 802404C8 0043102A */ slt $v0, $v0, $v1 -/* A48A8C 802404CC 14400004 */ bnez $v0, .L802404E0 -/* A48A90 802404D0 00000000 */ nop -/* A48A94 802404D4 96020086 */ lhu $v0, 0x86($s0) -/* A48A98 802404D8 A48200A8 */ sh $v0, 0xa8($a0) -/* A48A9C 802404DC AE200070 */ sw $zero, 0x70($s1) -.L802404E0: -/* A48AA0 802404E0 8FBF0018 */ lw $ra, 0x18($sp) -/* A48AA4 802404E4 8FB10014 */ lw $s1, 0x14($sp) -/* A48AA8 802404E8 8FB00010 */ lw $s0, 0x10($sp) -/* A48AAC 802404EC 03E00008 */ jr $ra -/* A48AB0 802404F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/func_802404F4_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/func_802404F4_A485C0.s deleted file mode 100644 index 01761f7a17..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/func_802404F4_A485C0.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404F4_A48AB4 -/* A48AB4 802404F4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A48AB8 802404F8 AFB3005C */ sw $s3, 0x5c($sp) -/* A48ABC 802404FC 0080982D */ daddu $s3, $a0, $zero -/* A48AC0 80240500 AFBF0068 */ sw $ra, 0x68($sp) -/* A48AC4 80240504 AFB50064 */ sw $s5, 0x64($sp) -/* A48AC8 80240508 AFB40060 */ sw $s4, 0x60($sp) -/* A48ACC 8024050C AFB20058 */ sw $s2, 0x58($sp) -/* A48AD0 80240510 AFB10054 */ sw $s1, 0x54($sp) -/* A48AD4 80240514 AFB00050 */ sw $s0, 0x50($sp) -/* A48AD8 80240518 8E710148 */ lw $s1, 0x148($s3) -/* A48ADC 8024051C 86240008 */ lh $a0, 8($s1) -/* A48AE0 80240520 0C00EABB */ jal get_npc_unsafe -/* A48AE4 80240524 00A0802D */ daddu $s0, $a1, $zero -/* A48AE8 80240528 8E63000C */ lw $v1, 0xc($s3) -/* A48AEC 8024052C 0260202D */ daddu $a0, $s3, $zero -/* A48AF0 80240530 8C650000 */ lw $a1, ($v1) -/* A48AF4 80240534 0C0B1EAF */ jal get_variable -/* A48AF8 80240538 0040902D */ daddu $s2, $v0, $zero -/* A48AFC 8024053C AFA00028 */ sw $zero, 0x28($sp) -/* A48B00 80240540 8E2300D0 */ lw $v1, 0xd0($s1) -/* A48B04 80240544 8C630030 */ lw $v1, 0x30($v1) -/* A48B08 80240548 AFA3002C */ sw $v1, 0x2c($sp) -/* A48B0C 8024054C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A48B10 80240550 8C63001C */ lw $v1, 0x1c($v1) -/* A48B14 80240554 AFA30030 */ sw $v1, 0x30($sp) -/* A48B18 80240558 8E2300D0 */ lw $v1, 0xd0($s1) -/* A48B1C 8024055C 8C630024 */ lw $v1, 0x24($v1) -/* A48B20 80240560 AFA30034 */ sw $v1, 0x34($sp) -/* A48B24 80240564 8E2300D0 */ lw $v1, 0xd0($s1) -/* A48B28 80240568 8C630028 */ lw $v1, 0x28($v1) -/* A48B2C 8024056C 27B50028 */ addiu $s5, $sp, 0x28 -/* A48B30 80240570 AFA30038 */ sw $v1, 0x38($sp) -/* A48B34 80240574 8E2300D0 */ lw $v1, 0xd0($s1) -/* A48B38 80240578 3C0142C8 */ lui $at, 0x42c8 -/* A48B3C 8024057C 44810000 */ mtc1 $at, $f0 -/* A48B40 80240580 8C63002C */ lw $v1, 0x2c($v1) -/* A48B44 80240584 0040A02D */ daddu $s4, $v0, $zero -/* A48B48 80240588 E7A00040 */ swc1 $f0, 0x40($sp) -/* A48B4C 8024058C A7A00044 */ sh $zero, 0x44($sp) -/* A48B50 80240590 12000009 */ beqz $s0, .L802405B8 -/* A48B54 80240594 AFA3003C */ sw $v1, 0x3c($sp) -/* A48B58 80240598 864300A8 */ lh $v1, 0xa8($s2) -/* A48B5C 8024059C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A48B60 802405A0 AE20008C */ sw $zero, 0x8c($s1) -/* A48B64 802405A4 A22000B5 */ sb $zero, 0xb5($s1) -/* A48B68 802405A8 34420008 */ ori $v0, $v0, 8 -/* A48B6C 802405AC AE230084 */ sw $v1, 0x84($s1) -/* A48B70 802405B0 08090172 */ j .L802405C8 -/* A48B74 802405B4 AE2200B0 */ sw $v0, 0xb0($s1) -.L802405B8: -/* A48B78 802405B8 8E2200B0 */ lw $v0, 0xb0($s1) -/* A48B7C 802405BC 30420004 */ andi $v0, $v0, 4 -/* A48B80 802405C0 10400047 */ beqz $v0, .L802406E0 -/* A48B84 802405C4 00000000 */ nop -.L802405C8: -/* A48B88 802405C8 AE600070 */ sw $zero, 0x70($s3) -/* A48B8C 802405CC A640008E */ sh $zero, 0x8e($s2) -/* A48B90 802405D0 8E2300CC */ lw $v1, 0xcc($s1) -/* A48B94 802405D4 2404F7FF */ addiu $a0, $zero, -0x801 -/* A48B98 802405D8 A2200007 */ sb $zero, 7($s1) -/* A48B9C 802405DC 8E420000 */ lw $v0, ($s2) -/* A48BA0 802405E0 8C630000 */ lw $v1, ($v1) -/* A48BA4 802405E4 00441024 */ and $v0, $v0, $a0 -/* A48BA8 802405E8 AE420000 */ sw $v0, ($s2) -/* A48BAC 802405EC AE430028 */ sw $v1, 0x28($s2) -/* A48BB0 802405F0 96220086 */ lhu $v0, 0x86($s1) -/* A48BB4 802405F4 A64200A8 */ sh $v0, 0xa8($s2) -/* A48BB8 802405F8 8E2200D0 */ lw $v0, 0xd0($s1) -/* A48BBC 802405FC AE200090 */ sw $zero, 0x90($s1) -/* A48BC0 80240600 8C420034 */ lw $v0, 0x34($v0) -/* A48BC4 80240604 14400006 */ bnez $v0, .L80240620 -/* A48BC8 80240608 2403FDFF */ addiu $v1, $zero, -0x201 -/* A48BCC 8024060C 8E420000 */ lw $v0, ($s2) -/* A48BD0 80240610 2403FFF7 */ addiu $v1, $zero, -9 -/* A48BD4 80240614 34420200 */ ori $v0, $v0, 0x200 -/* A48BD8 80240618 0809018B */ j .L8024062C -/* A48BDC 8024061C 00431024 */ and $v0, $v0, $v1 -.L80240620: -/* A48BE0 80240620 8E420000 */ lw $v0, ($s2) -/* A48BE4 80240624 00431024 */ and $v0, $v0, $v1 -/* A48BE8 80240628 34420008 */ ori $v0, $v0, 8 -.L8024062C: -/* A48BEC 8024062C AE420000 */ sw $v0, ($s2) -/* A48BF0 80240630 8E2200B0 */ lw $v0, 0xb0($s1) -/* A48BF4 80240634 30420004 */ andi $v0, $v0, 4 -/* A48BF8 80240638 1040001E */ beqz $v0, .L802406B4 -/* A48BFC 8024063C 24040002 */ addiu $a0, $zero, 2 -/* A48C00 80240640 0240282D */ daddu $a1, $s2, $zero -/* A48C04 80240644 0000302D */ daddu $a2, $zero, $zero -/* A48C08 80240648 24020063 */ addiu $v0, $zero, 0x63 -/* A48C0C 8024064C AE620070 */ sw $v0, 0x70($s3) -/* A48C10 80240650 AE600074 */ sw $zero, 0x74($s3) -/* A48C14 80240654 864300A8 */ lh $v1, 0xa8($s2) -/* A48C18 80240658 3C013F80 */ lui $at, 0x3f80 -/* A48C1C 8024065C 44810000 */ mtc1 $at, $f0 -/* A48C20 80240660 3C014000 */ lui $at, 0x4000 -/* A48C24 80240664 44811000 */ mtc1 $at, $f2 -/* A48C28 80240668 3C01C1A0 */ lui $at, 0xc1a0 -/* A48C2C 8024066C 44812000 */ mtc1 $at, $f4 -/* A48C30 80240670 24020028 */ addiu $v0, $zero, 0x28 -/* A48C34 80240674 AFA2001C */ sw $v0, 0x1c($sp) -/* A48C38 80240678 44833000 */ mtc1 $v1, $f6 -/* A48C3C 8024067C 00000000 */ nop -/* A48C40 80240680 468031A0 */ cvt.s.w $f6, $f6 -/* A48C44 80240684 44073000 */ mfc1 $a3, $f6 -/* A48C48 80240688 27A20048 */ addiu $v0, $sp, 0x48 -/* A48C4C 8024068C AFA20020 */ sw $v0, 0x20($sp) -/* A48C50 80240690 E7A00010 */ swc1 $f0, 0x10($sp) -/* A48C54 80240694 E7A20014 */ swc1 $f2, 0x14($sp) -/* A48C58 80240698 0C01BFA4 */ jal fx_emote -/* A48C5C 8024069C E7A40018 */ swc1 $f4, 0x18($sp) -/* A48C60 802406A0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A48C64 802406A4 2403FFFB */ addiu $v1, $zero, -5 -/* A48C68 802406A8 00431024 */ and $v0, $v0, $v1 -/* A48C6C 802406AC 080901B8 */ j .L802406E0 -/* A48C70 802406B0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802406B4: -/* A48C74 802406B4 8E220000 */ lw $v0, ($s1) -/* A48C78 802406B8 3C034000 */ lui $v1, 0x4000 -/* A48C7C 802406BC 00431024 */ and $v0, $v0, $v1 -/* A48C80 802406C0 10400007 */ beqz $v0, .L802406E0 -/* A48C84 802406C4 3C03BFFF */ lui $v1, 0xbfff -/* A48C88 802406C8 2402000C */ addiu $v0, $zero, 0xc -/* A48C8C 802406CC AE620070 */ sw $v0, 0x70($s3) -/* A48C90 802406D0 8E220000 */ lw $v0, ($s1) -/* A48C94 802406D4 3463FFFF */ ori $v1, $v1, 0xffff -/* A48C98 802406D8 00431024 */ and $v0, $v0, $v1 -/* A48C9C 802406DC AE220000 */ sw $v0, ($s1) -.L802406E0: -/* A48CA0 802406E0 8E220090 */ lw $v0, 0x90($s1) -/* A48CA4 802406E4 1840000C */ blez $v0, .L80240718 -/* A48CA8 802406E8 2442FFFF */ addiu $v0, $v0, -1 -/* A48CAC 802406EC 14400087 */ bnez $v0, .L8024090C -/* A48CB0 802406F0 AE220090 */ sw $v0, 0x90($s1) -/* A48CB4 802406F4 3C03FFAA */ lui $v1, 0xffaa -/* A48CB8 802406F8 8E420028 */ lw $v0, 0x28($s2) -/* A48CBC 802406FC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A48CC0 80240700 00431021 */ addu $v0, $v0, $v1 -/* A48CC4 80240704 2C420002 */ sltiu $v0, $v0, 2 -/* A48CC8 80240708 10400003 */ beqz $v0, .L80240718 -/* A48CCC 8024070C 3C020055 */ lui $v0, 0x55 -/* A48CD0 80240710 3442000C */ ori $v0, $v0, 0xc -/* A48CD4 80240714 AE420028 */ sw $v0, 0x28($s2) -.L80240718: -/* A48CD8 80240718 8E630070 */ lw $v1, 0x70($s3) -/* A48CDC 8024071C 2402000C */ addiu $v0, $zero, 0xc -/* A48CE0 80240720 10620048 */ beq $v1, $v0, .L80240844 -/* A48CE4 80240724 2862000D */ slti $v0, $v1, 0xd -/* A48CE8 80240728 1040000F */ beqz $v0, .L80240768 -/* A48CEC 8024072C 24100001 */ addiu $s0, $zero, 1 -/* A48CF0 80240730 1070001E */ beq $v1, $s0, .L802407AC -/* A48CF4 80240734 28620002 */ slti $v0, $v1, 2 -/* A48CF8 80240738 10400005 */ beqz $v0, .L80240750 -/* A48CFC 8024073C 24020002 */ addiu $v0, $zero, 2 -/* A48D00 80240740 10600015 */ beqz $v1, .L80240798 -/* A48D04 80240744 0260202D */ daddu $a0, $s3, $zero -/* A48D08 80240748 08090228 */ j .L802408A0 -/* A48D0C 8024074C 00000000 */ nop -.L80240750: -/* A48D10 80240750 1062001C */ beq $v1, $v0, .L802407C4 -/* A48D14 80240754 24020003 */ addiu $v0, $zero, 3 -/* A48D18 80240758 10620035 */ beq $v1, $v0, .L80240830 -/* A48D1C 8024075C 0260202D */ daddu $a0, $s3, $zero -/* A48D20 80240760 08090228 */ j .L802408A0 -/* A48D24 80240764 00000000 */ nop -.L80240768: -/* A48D28 80240768 2402000E */ addiu $v0, $zero, 0xe -/* A48D2C 8024076C 1062003F */ beq $v1, $v0, .L8024086C -/* A48D30 80240770 0062102A */ slt $v0, $v1, $v0 -/* A48D34 80240774 14400038 */ bnez $v0, .L80240858 -/* A48D38 80240778 0260202D */ daddu $a0, $s3, $zero -/* A48D3C 8024077C 2402000F */ addiu $v0, $zero, 0xf -/* A48D40 80240780 10620040 */ beq $v1, $v0, .L80240884 -/* A48D44 80240784 24020063 */ addiu $v0, $zero, 0x63 -/* A48D48 80240788 10620043 */ beq $v1, $v0, .L80240898 -/* A48D4C 8024078C 00000000 */ nop -/* A48D50 80240790 08090228 */ j .L802408A0 -/* A48D54 80240794 00000000 */ nop -.L80240798: -/* A48D58 80240798 0280282D */ daddu $a1, $s4, $zero -/* A48D5C 8024079C 0C012568 */ jal func_800495A0 -/* A48D60 802407A0 02A0302D */ daddu $a2, $s5, $zero -/* A48D64 802407A4 96220086 */ lhu $v0, 0x86($s1) -/* A48D68 802407A8 A64200A8 */ sh $v0, 0xa8($s2) -.L802407AC: -/* A48D6C 802407AC 0260202D */ daddu $a0, $s3, $zero -/* A48D70 802407B0 0280282D */ daddu $a1, $s4, $zero -/* A48D74 802407B4 0C0125AE */ jal func_800496B8 -/* A48D78 802407B8 02A0302D */ daddu $a2, $s5, $zero -/* A48D7C 802407BC 08090228 */ j .L802408A0 -/* A48D80 802407C0 00000000 */ nop -.L802407C4: -/* A48D84 802407C4 0260202D */ daddu $a0, $s3, $zero -/* A48D88 802407C8 0280282D */ daddu $a1, $s4, $zero -/* A48D8C 802407CC 0C0126D1 */ jal func_80049B44 -/* A48D90 802407D0 02A0302D */ daddu $a2, $s5, $zero -/* A48D94 802407D4 8E230088 */ lw $v1, 0x88($s1) -/* A48D98 802407D8 24020006 */ addiu $v0, $zero, 6 -/* A48D9C 802407DC 14620014 */ bne $v1, $v0, .L80240830 -/* A48DA0 802407E0 0260202D */ daddu $a0, $s3, $zero -/* A48DA4 802407E4 0C00A67F */ jal rand_int -/* A48DA8 802407E8 24040064 */ addiu $a0, $zero, 0x64 -/* A48DAC 802407EC 28420021 */ slti $v0, $v0, 0x21 -/* A48DB0 802407F0 5040000F */ beql $v0, $zero, .L80240830 -/* A48DB4 802407F4 0260202D */ daddu $a0, $s3, $zero -/* A48DB8 802407F8 8E22008C */ lw $v0, 0x8c($s1) -/* A48DBC 802407FC 10400005 */ beqz $v0, .L80240814 -/* A48DC0 80240800 3C020055 */ lui $v0, 0x55 -/* A48DC4 80240804 3442002F */ ori $v0, $v0, 0x2f -/* A48DC8 80240808 AE20008C */ sw $zero, 0x8c($s1) -/* A48DCC 8024080C 08090208 */ j .L80240820 -/* A48DD0 80240810 A22000B5 */ sb $zero, 0xb5($s1) -.L80240814: -/* A48DD4 80240814 3442002E */ ori $v0, $v0, 0x2e -/* A48DD8 80240818 AE30008C */ sw $s0, 0x8c($s1) -/* A48DDC 8024081C A23000B5 */ sb $s0, 0xb5($s1) -.L80240820: -/* A48DE0 80240820 AE420028 */ sw $v0, 0x28($s2) -/* A48DE4 80240824 24020007 */ addiu $v0, $zero, 7 -/* A48DE8 80240828 08090243 */ j .L8024090C -/* A48DEC 8024082C AE220090 */ sw $v0, 0x90($s1) -.L80240830: -/* A48DF0 80240830 0280282D */ daddu $a1, $s4, $zero -/* A48DF4 80240834 0C012701 */ jal func_80049C04 -/* A48DF8 80240838 02A0302D */ daddu $a2, $s5, $zero -/* A48DFC 8024083C 08090228 */ j .L802408A0 -/* A48E00 80240840 00000000 */ nop -.L80240844: -/* A48E04 80240844 0260202D */ daddu $a0, $s3, $zero -/* A48E08 80240848 0280282D */ daddu $a1, $s4, $zero -/* A48E0C 8024084C 0C090058 */ jal func_80240160 -/* A48E10 80240850 02A0302D */ daddu $a2, $s5, $zero -/* A48E14 80240854 0260202D */ daddu $a0, $s3, $zero -.L80240858: -/* A48E18 80240858 0280282D */ daddu $a1, $s4, $zero -/* A48E1C 8024085C 0C090077 */ jal func_802401DC -/* A48E20 80240860 02A0302D */ daddu $a2, $s5, $zero -/* A48E24 80240864 08090228 */ j .L802408A0 -/* A48E28 80240868 00000000 */ nop -.L8024086C: -/* A48E2C 8024086C 0260202D */ daddu $a0, $s3, $zero -/* A48E30 80240870 0280282D */ daddu $a1, $s4, $zero -/* A48E34 80240874 0C0900C4 */ jal func_80240310 -/* A48E38 80240878 02A0302D */ daddu $a2, $s5, $zero -/* A48E3C 8024087C 08090228 */ j .L802408A0 -/* A48E40 80240880 00000000 */ nop -.L80240884: -/* A48E44 80240884 0280282D */ daddu $a1, $s4, $zero -/* A48E48 80240888 0C09011D */ jal func_80240474 -/* A48E4C 8024088C 02A0302D */ daddu $a2, $s5, $zero -/* A48E50 80240890 08090228 */ j .L802408A0 -/* A48E54 80240894 00000000 */ nop -.L80240898: -/* A48E58 80240898 0C0129CF */ jal func_8004A73C -/* A48E5C 8024089C 0260202D */ daddu $a0, $s3, $zero -.L802408A0: -/* A48E60 802408A0 8E230088 */ lw $v1, 0x88($s1) -/* A48E64 802408A4 24020006 */ addiu $v0, $zero, 6 -/* A48E68 802408A8 14620019 */ bne $v1, $v0, .L80240910 -/* A48E6C 802408AC 0000102D */ daddu $v0, $zero, $zero -/* A48E70 802408B0 8E22008C */ lw $v0, 0x8c($s1) -/* A48E74 802408B4 10400003 */ beqz $v0, .L802408C4 -/* A48E78 802408B8 24020001 */ addiu $v0, $zero, 1 -/* A48E7C 802408BC 08090232 */ j .L802408C8 -/* A48E80 802408C0 A22200B5 */ sb $v0, 0xb5($s1) -.L802408C4: -/* A48E84 802408C4 A22000B5 */ sb $zero, 0xb5($s1) -.L802408C8: -/* A48E88 802408C8 8E22008C */ lw $v0, 0x8c($s1) -/* A48E8C 802408CC 1040000F */ beqz $v0, .L8024090C -/* A48E90 802408D0 3C03FFAA */ lui $v1, 0xffaa -/* A48E94 802408D4 8E420028 */ lw $v0, 0x28($s2) -/* A48E98 802408D8 3463FFFC */ ori $v1, $v1, 0xfffc -/* A48E9C 802408DC 00431821 */ addu $v1, $v0, $v1 -/* A48EA0 802408E0 2C620015 */ sltiu $v0, $v1, 0x15 -/* A48EA4 802408E4 10400009 */ beqz $v0, .L8024090C -/* A48EA8 802408E8 00031080 */ sll $v0, $v1, 2 -/* A48EAC 802408EC 3C018024 */ lui $at, 0x8024 -/* A48EB0 802408F0 00220821 */ addu $at, $at, $v0 -/* A48EB4 802408F4 8C223888 */ lw $v0, 0x3888($at) -/* A48EB8 802408F8 00400008 */ jr $v0 -/* A48EBC 802408FC 00000000 */ nop -/* A48EC0 80240900 8E420028 */ lw $v0, 0x28($s2) -/* A48EC4 80240904 24420001 */ addiu $v0, $v0, 1 -/* A48EC8 80240908 AE420028 */ sw $v0, 0x28($s2) -.L8024090C: -/* A48ECC 8024090C 0000102D */ daddu $v0, $zero, $zero -.L80240910: -/* A48ED0 80240910 8FBF0068 */ lw $ra, 0x68($sp) -/* A48ED4 80240914 8FB50064 */ lw $s5, 0x64($sp) -/* A48ED8 80240918 8FB40060 */ lw $s4, 0x60($sp) -/* A48EDC 8024091C 8FB3005C */ lw $s3, 0x5c($sp) -/* A48EE0 80240920 8FB20058 */ lw $s2, 0x58($sp) -/* A48EE4 80240924 8FB10054 */ lw $s1, 0x54($sp) -/* A48EE8 80240928 8FB00050 */ lw $s0, 0x50($sp) -/* A48EEC 8024092C 03E00008 */ jr $ra -/* A48EF0 80240930 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/func_80240934_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/func_80240934_A485C0.s deleted file mode 100644 index 171918683a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/func_80240934_A485C0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240934_A48EF4 -/* A48EF4 80240934 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A48EF8 80240938 AFBF0010 */ sw $ra, 0x10($sp) -/* A48EFC 8024093C 0C00EAD2 */ jal get_npc_safe -/* A48F00 80240940 8C84014C */ lw $a0, 0x14c($a0) -/* A48F04 80240944 0040182D */ daddu $v1, $v0, $zero -/* A48F08 80240948 846200A8 */ lh $v0, 0xa8($v1) -/* A48F0C 8024094C C462003C */ lwc1 $f2, 0x3c($v1) -/* A48F10 80240950 906400A9 */ lbu $a0, 0xa9($v1) -/* A48F14 80240954 44820000 */ mtc1 $v0, $f0 -/* A48F18 80240958 00000000 */ nop -/* A48F1C 8024095C 46800020 */ cvt.s.w $f0, $f0 -/* A48F20 80240960 46001081 */ sub.s $f2, $f2, $f0 -/* A48F24 80240964 A06400AB */ sb $a0, 0xab($v1) -/* A48F28 80240968 E462003C */ swc1 $f2, 0x3c($v1) -/* A48F2C 8024096C 8FBF0010 */ lw $ra, 0x10($sp) -/* A48F30 80240970 24020002 */ addiu $v0, $zero, 2 -/* A48F34 80240974 03E00008 */ jr $ra -/* A48F38 80240978 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/func_8024097C_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/func_8024097C_A485C0.s deleted file mode 100644 index 6cda5ce74f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/func_8024097C_A485C0.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024097C_A48F3C -/* A48F3C 8024097C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A48F40 80240980 AFBF0010 */ sw $ra, 0x10($sp) -/* A48F44 80240984 0C00EAD2 */ jal get_npc_safe -/* A48F48 80240988 8C84014C */ lw $a0, 0x14c($a0) -/* A48F4C 8024098C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* A48F50 80240990 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* A48F54 80240994 C44C0038 */ lwc1 $f12, 0x38($v0) -/* A48F58 80240998 C44E0040 */ lwc1 $f14, 0x40($v0) -/* A48F5C 8024099C 8C660028 */ lw $a2, 0x28($v1) -/* A48F60 802409A0 0C00A7B5 */ jal dist2D -/* A48F64 802409A4 8C670030 */ lw $a3, 0x30($v1) -/* A48F68 802409A8 3C014248 */ lui $at, 0x4248 -/* A48F6C 802409AC 44811000 */ mtc1 $at, $f2 -/* A48F70 802409B0 00000000 */ nop -/* A48F74 802409B4 4602003C */ c.lt.s $f0, $f2 -/* A48F78 802409B8 00000000 */ nop -/* A48F7C 802409BC 45010002 */ bc1t .L802409C8 -/* A48F80 802409C0 24020002 */ addiu $v0, $zero, 2 -/* A48F84 802409C4 0000102D */ daddu $v0, $zero, $zero -.L802409C8: -/* A48F88 802409C8 8FBF0010 */ lw $ra, 0x10($sp) -/* A48F8C 802409CC 03E00008 */ jr $ra -/* A48F90 802409D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/func_802409D4_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/func_802409D4_A485C0.s deleted file mode 100644 index 10fd46eed5..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/func_802409D4_A485C0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409D4_A48F94 -/* A48F94 802409D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A48F98 802409D8 0080102D */ daddu $v0, $a0, $zero -/* A48F9C 802409DC AFB00010 */ sw $s0, 0x10($sp) -/* A48FA0 802409E0 AFBF0018 */ sw $ra, 0x18($sp) -/* A48FA4 802409E4 AFB10014 */ sw $s1, 0x14($sp) -/* A48FA8 802409E8 8C44014C */ lw $a0, 0x14c($v0) -/* A48FAC 802409EC 8C510148 */ lw $s1, 0x148($v0) -/* A48FB0 802409F0 0C00EAD2 */ jal get_npc_safe -/* A48FB4 802409F4 00A0802D */ daddu $s0, $a1, $zero -/* A48FB8 802409F8 56000001 */ bnel $s0, $zero, .L80240A00 -/* A48FBC 802409FC A04000AB */ sb $zero, 0xab($v0) -.L80240A00: -/* A48FC0 80240A00 8C420000 */ lw $v0, ($v0) -/* A48FC4 80240A04 30421000 */ andi $v0, $v0, 0x1000 -/* A48FC8 80240A08 1040000A */ beqz $v0, .L80240A34 -/* A48FCC 80240A0C 0000102D */ daddu $v0, $zero, $zero -/* A48FD0 80240A10 82220004 */ lb $v0, 4($s1) -/* A48FD4 80240A14 3C03800B */ lui $v1, %hi(gCurrentEncounter) -/* A48FD8 80240A18 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) -/* A48FDC 80240A1C 00021080 */ sll $v0, $v0, 2 -/* A48FE0 80240A20 00431021 */ addu $v0, $v0, $v1 -/* A48FE4 80240A24 8C440028 */ lw $a0, 0x28($v0) -/* A48FE8 80240A28 9623006E */ lhu $v1, 0x6e($s1) -/* A48FEC 80240A2C 24020002 */ addiu $v0, $zero, 2 -/* A48FF0 80240A30 A4830044 */ sh $v1, 0x44($a0) -.L80240A34: -/* A48FF4 80240A34 8FBF0018 */ lw $ra, 0x18($sp) -/* A48FF8 80240A38 8FB10014 */ lw $s1, 0x14($sp) -/* A48FFC 80240A3C 8FB00010 */ lw $s0, 0x10($sp) -/* A49000 80240A40 03E00008 */ jr $ra -/* A49004 80240A44 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/func_80241128_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/func_80241128_A485C0.s deleted file mode 100644 index 06a8a90cd1..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/func_80241128_A485C0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241128_A496E8 -/* A496E8 80241128 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A496EC 8024112C AFB10014 */ sw $s1, 0x14($sp) -/* A496F0 80241130 0080882D */ daddu $s1, $a0, $zero -/* A496F4 80241134 AFBF0018 */ sw $ra, 0x18($sp) -/* A496F8 80241138 AFB00010 */ sw $s0, 0x10($sp) -/* A496FC 8024113C 8E300148 */ lw $s0, 0x148($s1) -/* A49700 80241140 0C00EABB */ jal get_npc_unsafe -/* A49704 80241144 86040008 */ lh $a0, 8($s0) -/* A49708 80241148 0040282D */ daddu $a1, $v0, $zero -/* A4970C 8024114C 94A2008E */ lhu $v0, 0x8e($a1) -/* A49710 80241150 2442FFFF */ addiu $v0, $v0, -1 -/* A49714 80241154 A4A2008E */ sh $v0, 0x8e($a1) -/* A49718 80241158 00021400 */ sll $v0, $v0, 0x10 -/* A4971C 8024115C 1C40000A */ bgtz $v0, .L80241188 -/* A49720 80241160 2404FFFD */ addiu $a0, $zero, -3 -/* A49724 80241164 8E0300CC */ lw $v1, 0xcc($s0) -/* A49728 80241168 8CA20000 */ lw $v0, ($a1) -/* A4972C 8024116C 8C630000 */ lw $v1, ($v1) -/* A49730 80241170 00441024 */ and $v0, $v0, $a0 -/* A49734 80241174 ACA20000 */ sw $v0, ($a1) -/* A49738 80241178 24020001 */ addiu $v0, $zero, 1 -/* A4973C 8024117C A4A0008E */ sh $zero, 0x8e($a1) -/* A49740 80241180 ACA30028 */ sw $v1, 0x28($a1) -/* A49744 80241184 AE220070 */ sw $v0, 0x70($s1) -.L80241188: -/* A49748 80241188 8FBF0018 */ lw $ra, 0x18($sp) -/* A4974C 8024118C 8FB10014 */ lw $s1, 0x14($sp) -/* A49750 80241190 8FB00010 */ lw $s0, 0x10($sp) -/* A49754 80241194 03E00008 */ jr $ra -/* A49758 80241198 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/func_8024119C_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/func_8024119C_A485C0.s deleted file mode 100644 index 1d0940049f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/func_8024119C_A485C0.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024119C_A4975C -/* A4975C 8024119C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A49760 802411A0 AFB3001C */ sw $s3, 0x1c($sp) -/* A49764 802411A4 0080982D */ daddu $s3, $a0, $zero -/* A49768 802411A8 AFBF0020 */ sw $ra, 0x20($sp) -/* A4976C 802411AC AFB20018 */ sw $s2, 0x18($sp) -/* A49770 802411B0 AFB10014 */ sw $s1, 0x14($sp) -/* A49774 802411B4 AFB00010 */ sw $s0, 0x10($sp) -/* A49778 802411B8 8E720148 */ lw $s2, 0x148($s3) -/* A4977C 802411BC 0C00EABB */ jal get_npc_unsafe -/* A49780 802411C0 86440008 */ lh $a0, 8($s2) -/* A49784 802411C4 0040802D */ daddu $s0, $v0, $zero -/* A49788 802411C8 8603008E */ lh $v1, 0x8e($s0) -/* A4978C 802411CC 3C118024 */ lui $s1, 0x8024 -/* A49790 802411D0 263125E0 */ addiu $s1, $s1, 0x25e0 -/* A49794 802411D4 00031040 */ sll $v0, $v1, 1 -/* A49798 802411D8 00431021 */ addu $v0, $v0, $v1 -/* A4979C 802411DC 00021080 */ sll $v0, $v0, 2 -/* A497A0 802411E0 3C018024 */ lui $at, 0x8024 -/* A497A4 802411E4 00220821 */ addu $at, $at, $v0 -/* A497A8 802411E8 C42025E0 */ lwc1 $f0, 0x25e0($at) -/* A497AC 802411EC 00031040 */ sll $v0, $v1, 1 -/* A497B0 802411F0 00431021 */ addu $v0, $v0, $v1 -/* A497B4 802411F4 00021080 */ sll $v0, $v0, 2 -/* A497B8 802411F8 E6000054 */ swc1 $f0, 0x54($s0) -/* A497BC 802411FC 3C018024 */ lui $at, 0x8024 -/* A497C0 80241200 00220821 */ addu $at, $at, $v0 -/* A497C4 80241204 C42025E4 */ lwc1 $f0, 0x25e4($at) -/* A497C8 80241208 00031040 */ sll $v0, $v1, 1 -/* A497CC 8024120C 00431021 */ addu $v0, $v0, $v1 -/* A497D0 80241210 9603008E */ lhu $v1, 0x8e($s0) -/* A497D4 80241214 00021080 */ sll $v0, $v0, 2 -/* A497D8 80241218 E6000058 */ swc1 $f0, 0x58($s0) -/* A497DC 8024121C 3C018024 */ lui $at, 0x8024 -/* A497E0 80241220 00220821 */ addu $at, $at, $v0 -/* A497E4 80241224 902225E8 */ lbu $v0, 0x25e8($at) -/* A497E8 80241228 24630001 */ addiu $v1, $v1, 1 -/* A497EC 8024122C A603008E */ sh $v1, 0x8e($s0) -/* A497F0 80241230 00031C00 */ sll $v1, $v1, 0x10 -/* A497F4 80241234 00031C03 */ sra $v1, $v1, 0x10 -/* A497F8 80241238 A20200AC */ sb $v0, 0xac($s0) -/* A497FC 8024123C 24020004 */ addiu $v0, $zero, 4 -/* A49800 80241240 14620007 */ bne $v1, $v0, .L80241260 -/* A49804 80241244 00000000 */ nop -/* A49808 80241248 0C00EAFF */ jal disable_npc_shadow -/* A4980C 8024124C 0200202D */ daddu $a0, $s0, $zero -/* A49810 80241250 8E420000 */ lw $v0, ($s2) -/* A49814 80241254 3C031F10 */ lui $v1, 0x1f10 -/* A49818 80241258 00431025 */ or $v0, $v0, $v1 -/* A4981C 8024125C AE420000 */ sw $v0, ($s2) -.L80241260: -/* A49820 80241260 8602008E */ lh $v0, 0x8e($s0) -/* A49824 80241264 00021840 */ sll $v1, $v0, 1 -/* A49828 80241268 00621821 */ addu $v1, $v1, $v0 -/* A4982C 8024126C 00031880 */ sll $v1, $v1, 2 -/* A49830 80241270 00711821 */ addu $v1, $v1, $s1 -/* A49834 80241274 90620008 */ lbu $v0, 8($v1) -/* A49838 80241278 1440000C */ bnez $v0, .L802412AC -/* A4983C 8024127C 240200FF */ addiu $v0, $zero, 0xff -/* A49840 80241280 A20200AC */ sb $v0, 0xac($s0) -/* A49844 80241284 24020005 */ addiu $v0, $zero, 5 -/* A49848 80241288 8E030000 */ lw $v1, ($s0) -/* A4984C 8024128C 3C013F80 */ lui $at, 0x3f80 -/* A49850 80241290 44810000 */ mtc1 $at, $f0 -/* A49854 80241294 34630002 */ ori $v1, $v1, 2 -/* A49858 80241298 E6000054 */ swc1 $f0, 0x54($s0) -/* A4985C 8024129C E6000058 */ swc1 $f0, 0x58($s0) -/* A49860 802412A0 E600005C */ swc1 $f0, 0x5c($s0) -/* A49864 802412A4 AE030000 */ sw $v1, ($s0) -/* A49868 802412A8 AE620070 */ sw $v0, 0x70($s3) -.L802412AC: -/* A4986C 802412AC 8FBF0020 */ lw $ra, 0x20($sp) -/* A49870 802412B0 8FB3001C */ lw $s3, 0x1c($sp) -/* A49874 802412B4 8FB20018 */ lw $s2, 0x18($sp) -/* A49878 802412B8 8FB10014 */ lw $s1, 0x14($sp) -/* A4987C 802412BC 8FB00010 */ lw $s0, 0x10($sp) -/* A49880 802412C0 03E00008 */ jr $ra -/* A49884 802412C4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/func_802413CC_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/func_802413CC_A485C0.s deleted file mode 100644 index 050d61c7ba..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/func_802413CC_A485C0.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413CC_A4998C -/* A4998C 802413CC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A49990 802413D0 AFB30034 */ sw $s3, 0x34($sp) -/* A49994 802413D4 0080982D */ daddu $s3, $a0, $zero -/* A49998 802413D8 AFBF0038 */ sw $ra, 0x38($sp) -/* A4999C 802413DC AFB20030 */ sw $s2, 0x30($sp) -/* A499A0 802413E0 AFB1002C */ sw $s1, 0x2c($sp) -/* A499A4 802413E4 AFB00028 */ sw $s0, 0x28($sp) -/* A499A8 802413E8 8E700148 */ lw $s0, 0x148($s3) -/* A499AC 802413EC 0C00EABB */ jal get_npc_unsafe -/* A499B0 802413F0 86040008 */ lh $a0, 8($s0) -/* A499B4 802413F4 0040902D */ daddu $s2, $v0, $zero -/* A499B8 802413F8 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* A499BC 802413FC 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* A499C0 80241400 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A499C4 80241404 8E220000 */ lw $v0, ($s1) -/* A499C8 80241408 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A499CC 8024140C 8C460028 */ lw $a2, 0x28($v0) -/* A499D0 80241410 0C00A7B5 */ jal dist2D -/* A499D4 80241414 8C470030 */ lw $a3, 0x30($v0) -/* A499D8 80241418 24020001 */ addiu $v0, $zero, 1 -/* A499DC 8024141C AE02006C */ sw $v0, 0x6c($s0) -/* A499E0 80241420 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A499E4 80241424 8E0200CC */ lw $v0, 0xcc($s0) -/* A499E8 80241428 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A499EC 8024142C 8E230000 */ lw $v1, ($s1) -/* A499F0 80241430 8C420020 */ lw $v0, 0x20($v0) -/* A499F4 80241434 AE420028 */ sw $v0, 0x28($s2) -/* A499F8 80241438 8C660028 */ lw $a2, 0x28($v1) -/* A499FC 8024143C 8C670030 */ lw $a3, 0x30($v1) -/* A49A00 80241440 0C00A720 */ jal atan2 -/* A49A04 80241444 E7A00024 */ swc1 $f0, 0x24($sp) -/* A49A08 80241448 8E420000 */ lw $v0, ($s2) -/* A49A0C 8024144C 3C013DCC */ lui $at, 0x3dcc -/* A49A10 80241450 3421CCCD */ ori $at, $at, 0xcccd -/* A49A14 80241454 44811000 */ mtc1 $at, $f2 -/* A49A18 80241458 2403FFFD */ addiu $v1, $zero, -3 -/* A49A1C 8024145C E640000C */ swc1 $f0, 0xc($s2) -/* A49A20 80241460 00431024 */ and $v0, $v0, $v1 -/* A49A24 80241464 AE420000 */ sw $v0, ($s2) -/* A49A28 80241468 30420008 */ andi $v0, $v0, 8 -/* A49A2C 8024146C E6420054 */ swc1 $f2, 0x54($s2) -/* A49A30 80241470 E6420058 */ swc1 $f2, 0x58($s2) -/* A49A34 80241474 1440001B */ bnez $v0, .L802414E4 -/* A49A38 80241478 E642005C */ swc1 $f2, 0x5c($s2) -/* A49A3C 8024147C 27A6001C */ addiu $a2, $sp, 0x1c -/* A49A40 80241480 27A70020 */ addiu $a3, $sp, 0x20 -/* A49A44 80241484 27A20024 */ addiu $v0, $sp, 0x24 -/* A49A48 80241488 C6420038 */ lwc1 $f2, 0x38($s2) -/* A49A4C 8024148C C640003C */ lwc1 $f0, 0x3c($s2) -/* A49A50 80241490 3C014348 */ lui $at, 0x4348 -/* A49A54 80241494 44813000 */ mtc1 $at, $f6 -/* A49A58 80241498 46000021 */ cvt.d.s $f0, $f0 -/* A49A5C 8024149C E7A20018 */ swc1 $f2, 0x18($sp) -/* A49A60 802414A0 3C014059 */ lui $at, 0x4059 -/* A49A64 802414A4 44811800 */ mtc1 $at, $f3 -/* A49A68 802414A8 44801000 */ mtc1 $zero, $f2 -/* A49A6C 802414AC C6440040 */ lwc1 $f4, 0x40($s2) -/* A49A70 802414B0 46220000 */ add.d $f0, $f0, $f2 -/* A49A74 802414B4 E7A60024 */ swc1 $f6, 0x24($sp) -/* A49A78 802414B8 E7A40020 */ swc1 $f4, 0x20($sp) -/* A49A7C 802414BC 46200020 */ cvt.s.d $f0, $f0 -/* A49A80 802414C0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A49A84 802414C4 AFA20010 */ sw $v0, 0x10($sp) -/* A49A88 802414C8 8E440080 */ lw $a0, 0x80($s2) -/* A49A8C 802414CC 0C0372DF */ jal func_800DCB7C -/* A49A90 802414D0 27A50018 */ addiu $a1, $sp, 0x18 -/* A49A94 802414D4 10400004 */ beqz $v0, .L802414E8 -/* A49A98 802414D8 2402000B */ addiu $v0, $zero, 0xb -/* A49A9C 802414DC C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A49AA0 802414E0 E640003C */ swc1 $f0, 0x3c($s2) -.L802414E4: -/* A49AA4 802414E4 2402000B */ addiu $v0, $zero, 0xb -.L802414E8: -/* A49AA8 802414E8 A640008E */ sh $zero, 0x8e($s2) -/* A49AAC 802414EC AE620070 */ sw $v0, 0x70($s3) -/* A49AB0 802414F0 8FBF0038 */ lw $ra, 0x38($sp) -/* A49AB4 802414F4 8FB30034 */ lw $s3, 0x34($sp) -/* A49AB8 802414F8 8FB20030 */ lw $s2, 0x30($sp) -/* A49ABC 802414FC 8FB1002C */ lw $s1, 0x2c($sp) -/* A49AC0 80241500 8FB00028 */ lw $s0, 0x28($sp) -/* A49AC4 80241504 03E00008 */ jr $ra -/* A49AC8 80241508 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/func_802416EC_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/func_802416EC_A485C0.s deleted file mode 100644 index d3f219c96f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/func_802416EC_A485C0.s +++ /dev/null @@ -1,118 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416EC_A49CAC -/* A49CAC 802416EC 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A49CB0 802416F0 AFB40048 */ sw $s4, 0x48($sp) -/* A49CB4 802416F4 0080A02D */ daddu $s4, $a0, $zero -/* A49CB8 802416F8 AFBF004C */ sw $ra, 0x4c($sp) -/* A49CBC 802416FC AFB30044 */ sw $s3, 0x44($sp) -/* A49CC0 80241700 AFB20040 */ sw $s2, 0x40($sp) -/* A49CC4 80241704 AFB1003C */ sw $s1, 0x3c($sp) -/* A49CC8 80241708 AFB00038 */ sw $s0, 0x38($sp) -/* A49CCC 8024170C F7B40050 */ sdc1 $f20, 0x50($sp) -/* A49CD0 80241710 8E910148 */ lw $s1, 0x148($s4) -/* A49CD4 80241714 00A0902D */ daddu $s2, $a1, $zero -/* A49CD8 80241718 86240008 */ lh $a0, 8($s1) -/* A49CDC 8024171C 0C00EABB */ jal get_npc_unsafe -/* A49CE0 80241720 00C0982D */ daddu $s3, $a2, $zero -/* A49CE4 80241724 0040802D */ daddu $s0, $v0, $zero -/* A49CE8 80241728 9602008E */ lhu $v0, 0x8e($s0) -/* A49CEC 8024172C 2442FFFF */ addiu $v0, $v0, -1 -/* A49CF0 80241730 A602008E */ sh $v0, 0x8e($s0) -/* A49CF4 80241734 00021400 */ sll $v0, $v0, 0x10 -/* A49CF8 80241738 14400021 */ bnez $v0, .L802417C0 -/* A49CFC 8024173C 0280202D */ daddu $a0, $s4, $zero -/* A49D00 80241740 24040002 */ addiu $a0, $zero, 2 -/* A49D04 80241744 0200282D */ daddu $a1, $s0, $zero -/* A49D08 80241748 0000302D */ daddu $a2, $zero, $zero -/* A49D0C 8024174C 8E2200CC */ lw $v0, 0xcc($s1) -/* A49D10 80241750 3C013F80 */ lui $at, 0x3f80 -/* A49D14 80241754 44810000 */ mtc1 $at, $f0 -/* A49D18 80241758 3C014000 */ lui $at, 0x4000 -/* A49D1C 8024175C 44811000 */ mtc1 $at, $f2 -/* A49D20 80241760 8C430000 */ lw $v1, ($v0) -/* A49D24 80241764 860200A8 */ lh $v0, 0xa8($s0) -/* A49D28 80241768 3C01C1A0 */ lui $at, 0xc1a0 -/* A49D2C 8024176C 44812000 */ mtc1 $at, $f4 -/* A49D30 80241770 44824000 */ mtc1 $v0, $f8 -/* A49D34 80241774 00000000 */ nop -/* A49D38 80241778 46804220 */ cvt.s.w $f8, $f8 -/* A49D3C 8024177C 44074000 */ mfc1 $a3, $f8 -/* A49D40 80241780 2402000C */ addiu $v0, $zero, 0xc -/* A49D44 80241784 AE030028 */ sw $v1, 0x28($s0) -/* A49D48 80241788 AFA2001C */ sw $v0, 0x1c($sp) -/* A49D4C 8024178C 27A20028 */ addiu $v0, $sp, 0x28 -/* A49D50 80241790 E7A00010 */ swc1 $f0, 0x10($sp) -/* A49D54 80241794 E7A20014 */ swc1 $f2, 0x14($sp) -/* A49D58 80241798 E7A40018 */ swc1 $f4, 0x18($sp) -/* A49D5C 8024179C 0C01BFA4 */ jal fx_emote -/* A49D60 802417A0 AFA20020 */ sw $v0, 0x20($sp) -/* A49D64 802417A4 8E2200CC */ lw $v0, 0xcc($s1) -/* A49D68 802417A8 8C430000 */ lw $v1, ($v0) -/* A49D6C 802417AC 2402000F */ addiu $v0, $zero, 0xf -/* A49D70 802417B0 A602008E */ sh $v0, 0x8e($s0) -/* A49D74 802417B4 AE030028 */ sw $v1, 0x28($s0) -/* A49D78 802417B8 08090622 */ j .L80241888 -/* A49D7C 802417BC AE800070 */ sw $zero, 0x70($s4) -.L802417C0: -/* A49D80 802417C0 8E450024 */ lw $a1, 0x24($s2) -/* A49D84 802417C4 8E460028 */ lw $a2, 0x28($s2) -/* A49D88 802417C8 0C090292 */ jal func_80240A48 -/* A49D8C 802417CC 0260382D */ daddu $a3, $s3, $zero -/* A49D90 802417D0 24030001 */ addiu $v1, $zero, 1 -/* A49D94 802417D4 1443002C */ bne $v0, $v1, .L80241888 -/* A49D98 802417D8 0200202D */ daddu $a0, $s0, $zero -/* A49D9C 802417DC 240520D4 */ addiu $a1, $zero, 0x20d4 -/* A49DA0 802417E0 0C012530 */ jal func_800494C0 -/* A49DA4 802417E4 0000302D */ daddu $a2, $zero, $zero -/* A49DA8 802417E8 27A4002C */ addiu $a0, $sp, 0x2c -/* A49DAC 802417EC 27A50030 */ addiu $a1, $sp, 0x30 -/* A49DB0 802417F0 3C064188 */ lui $a2, 0x4188 -/* A49DB4 802417F4 C6020034 */ lwc1 $f2, 0x34($s0) -/* A49DB8 802417F8 3C014387 */ lui $at, 0x4387 -/* A49DBC 802417FC 44810000 */ mtc1 $at, $f0 -/* A49DC0 80241800 8E2200CC */ lw $v0, 0xcc($s1) -/* A49DC4 80241804 C614003C */ lwc1 $f20, 0x3c($s0) -/* A49DC8 80241808 46020001 */ sub.s $f0, $f0, $f2 -/* A49DCC 8024180C 3C014200 */ lui $at, 0x4200 -/* A49DD0 80241810 44812000 */ mtc1 $at, $f4 -/* A49DD4 80241814 C6060038 */ lwc1 $f6, 0x38($s0) -/* A49DD8 80241818 4604A500 */ add.s $f20, $f20, $f4 -/* A49DDC 8024181C 3C013F80 */ lui $at, 0x3f80 -/* A49DE0 80241820 44811000 */ mtc1 $at, $f2 -/* A49DE4 80241824 44070000 */ mfc1 $a3, $f0 -/* A49DE8 80241828 C6000040 */ lwc1 $f0, 0x40($s0) -/* A49DEC 8024182C 8C420020 */ lw $v0, 0x20($v0) -/* A49DF0 80241830 46020000 */ add.s $f0, $f0, $f2 -/* A49DF4 80241834 E7A6002C */ swc1 $f6, 0x2c($sp) -/* A49DF8 80241838 AE020028 */ sw $v0, 0x28($s0) -/* A49DFC 8024183C 0C00A7E7 */ jal add_vec2D_polar -/* A49E00 80241840 E7A00030 */ swc1 $f0, 0x30($sp) -/* A49E04 80241844 0000202D */ daddu $a0, $zero, $zero -/* A49E08 80241848 4406A000 */ mfc1 $a2, $f20 -/* A49E0C 8024184C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A49E10 80241850 C7A20030 */ lwc1 $f2, 0x30($sp) -/* A49E14 80241854 44050000 */ mfc1 $a1, $f0 -/* A49E18 80241858 44071000 */ mfc1 $a3, $f2 -/* A49E1C 8024185C 3C013DCC */ lui $at, 0x3dcc -/* A49E20 80241860 3421CCCD */ ori $at, $at, 0xcccd -/* A49E24 80241864 44810000 */ mtc1 $at, $f0 -/* A49E28 80241868 2402000D */ addiu $v0, $zero, 0xd -/* A49E2C 8024186C AFA20014 */ sw $v0, 0x14($sp) -/* A49E30 80241870 0C01BFEC */ jal func_8006FFB0 -/* A49E34 80241874 E7A00010 */ swc1 $f0, 0x10($sp) -/* A49E38 80241878 2402000F */ addiu $v0, $zero, 0xf -/* A49E3C 8024187C A602008E */ sh $v0, 0x8e($s0) -/* A49E40 80241880 24020016 */ addiu $v0, $zero, 0x16 -/* A49E44 80241884 AE820070 */ sw $v0, 0x70($s4) -.L80241888: -/* A49E48 80241888 8FBF004C */ lw $ra, 0x4c($sp) -/* A49E4C 8024188C 8FB40048 */ lw $s4, 0x48($sp) -/* A49E50 80241890 8FB30044 */ lw $s3, 0x44($sp) -/* A49E54 80241894 8FB20040 */ lw $s2, 0x40($sp) -/* A49E58 80241898 8FB1003C */ lw $s1, 0x3c($sp) -/* A49E5C 8024189C 8FB00038 */ lw $s0, 0x38($sp) -/* A49E60 802418A0 D7B40050 */ ldc1 $f20, 0x50($sp) -/* A49E64 802418A4 03E00008 */ jr $ra -/* A49E68 802418A8 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/func_802418AC_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/func_802418AC_A485C0.s deleted file mode 100644 index d792de5412..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/func_802418AC_A485C0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418AC_A49E6C -/* A49E6C 802418AC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A49E70 802418B0 AFB10014 */ sw $s1, 0x14($sp) -/* A49E74 802418B4 0080882D */ daddu $s1, $a0, $zero -/* A49E78 802418B8 AFBF0018 */ sw $ra, 0x18($sp) -/* A49E7C 802418BC AFB00010 */ sw $s0, 0x10($sp) -/* A49E80 802418C0 8E300148 */ lw $s0, 0x148($s1) -/* A49E84 802418C4 0C00EABB */ jal get_npc_unsafe -/* A49E88 802418C8 86040008 */ lh $a0, 8($s0) -/* A49E8C 802418CC 0040202D */ daddu $a0, $v0, $zero -/* A49E90 802418D0 9482008E */ lhu $v0, 0x8e($a0) -/* A49E94 802418D4 2442FFFF */ addiu $v0, $v0, -1 -/* A49E98 802418D8 A482008E */ sh $v0, 0x8e($a0) -/* A49E9C 802418DC 00021400 */ sll $v0, $v0, 0x10 -/* A49EA0 802418E0 1C400008 */ bgtz $v0, .L80241904 -/* A49EA4 802418E4 00000000 */ nop -/* A49EA8 802418E8 8E0200CC */ lw $v0, 0xcc($s0) -/* A49EAC 802418EC 8C430024 */ lw $v1, 0x24($v0) -/* A49EB0 802418F0 24020009 */ addiu $v0, $zero, 9 -/* A49EB4 802418F4 A482008E */ sh $v0, 0x8e($a0) -/* A49EB8 802418F8 24020017 */ addiu $v0, $zero, 0x17 -/* A49EBC 802418FC AC830028 */ sw $v1, 0x28($a0) -/* A49EC0 80241900 AE220070 */ sw $v0, 0x70($s1) -.L80241904: -/* A49EC4 80241904 8FBF0018 */ lw $ra, 0x18($sp) -/* A49EC8 80241908 8FB10014 */ lw $s1, 0x14($sp) -/* A49ECC 8024190C 8FB00010 */ lw $s0, 0x10($sp) -/* A49ED0 80241910 03E00008 */ jr $ra -/* A49ED4 80241914 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/func_80241A4C_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/func_80241A4C_A485C0.s deleted file mode 100644 index 409592ef0a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/func_80241A4C_A485C0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A4C_A4A00C -/* A4A00C 80241A4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4A010 80241A50 AFB10014 */ sw $s1, 0x14($sp) -/* A4A014 80241A54 0080882D */ daddu $s1, $a0, $zero -/* A4A018 80241A58 AFBF0018 */ sw $ra, 0x18($sp) -/* A4A01C 80241A5C AFB00010 */ sw $s0, 0x10($sp) -/* A4A020 80241A60 8E300148 */ lw $s0, 0x148($s1) -/* A4A024 80241A64 0C00EABB */ jal get_npc_unsafe -/* A4A028 80241A68 86040008 */ lh $a0, 8($s0) -/* A4A02C 80241A6C 0040202D */ daddu $a0, $v0, $zero -/* A4A030 80241A70 9482008E */ lhu $v0, 0x8e($a0) -/* A4A034 80241A74 2442FFFF */ addiu $v0, $v0, -1 -/* A4A038 80241A78 A482008E */ sh $v0, 0x8e($a0) -/* A4A03C 80241A7C 00021400 */ sll $v0, $v0, 0x10 -/* A4A040 80241A80 1C400007 */ bgtz $v0, .L80241AA0 -/* A4A044 80241A84 00000000 */ nop -/* A4A048 80241A88 8E0200CC */ lw $v0, 0xcc($s0) -/* A4A04C 80241A8C 8C430000 */ lw $v1, ($v0) -/* A4A050 80241A90 24020003 */ addiu $v0, $zero, 3 -/* A4A054 80241A94 A482008E */ sh $v0, 0x8e($a0) -/* A4A058 80241A98 AC830028 */ sw $v1, 0x28($a0) -/* A4A05C 80241A9C AE200070 */ sw $zero, 0x70($s1) -.L80241AA0: -/* A4A060 80241AA0 8FBF0018 */ lw $ra, 0x18($sp) -/* A4A064 80241AA4 8FB10014 */ lw $s1, 0x14($sp) -/* A4A068 80241AA8 8FB00010 */ lw $s0, 0x10($sp) -/* A4A06C 80241AAC 03E00008 */ jr $ra -/* A4A070 80241AB0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/func_80241AB4_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/func_80241AB4_A485C0.s deleted file mode 100644 index be5ba1de73..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/func_80241AB4_A485C0.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AB4_A4A074 -/* A4A074 80241AB4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A4A078 80241AB8 AFB50044 */ sw $s5, 0x44($sp) -/* A4A07C 80241ABC 0080A82D */ daddu $s5, $a0, $zero -/* A4A080 80241AC0 AFBF0048 */ sw $ra, 0x48($sp) -/* A4A084 80241AC4 AFB40040 */ sw $s4, 0x40($sp) -/* A4A088 80241AC8 AFB3003C */ sw $s3, 0x3c($sp) -/* A4A08C 80241ACC AFB20038 */ sw $s2, 0x38($sp) -/* A4A090 80241AD0 AFB10034 */ sw $s1, 0x34($sp) -/* A4A094 80241AD4 AFB00030 */ sw $s0, 0x30($sp) -/* A4A098 80241AD8 8EB10148 */ lw $s1, 0x148($s5) -/* A4A09C 80241ADC 86240008 */ lh $a0, 8($s1) -/* A4A0A0 80241AE0 0C00EABB */ jal get_npc_unsafe -/* A4A0A4 80241AE4 00A0802D */ daddu $s0, $a1, $zero -/* A4A0A8 80241AE8 8EA3000C */ lw $v1, 0xc($s5) -/* A4A0AC 80241AEC 02A0202D */ daddu $a0, $s5, $zero -/* A4A0B0 80241AF0 8C650000 */ lw $a1, ($v1) -/* A4A0B4 80241AF4 0C0B1EAF */ jal get_variable -/* A4A0B8 80241AF8 0040902D */ daddu $s2, $v0, $zero -/* A4A0BC 80241AFC AFA00010 */ sw $zero, 0x10($sp) -/* A4A0C0 80241B00 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4A0C4 80241B04 8C630030 */ lw $v1, 0x30($v1) -/* A4A0C8 80241B08 AFA30014 */ sw $v1, 0x14($sp) -/* A4A0CC 80241B0C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4A0D0 80241B10 8C63001C */ lw $v1, 0x1c($v1) -/* A4A0D4 80241B14 AFA30018 */ sw $v1, 0x18($sp) -/* A4A0D8 80241B18 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4A0DC 80241B1C 8C630024 */ lw $v1, 0x24($v1) -/* A4A0E0 80241B20 AFA3001C */ sw $v1, 0x1c($sp) -/* A4A0E4 80241B24 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4A0E8 80241B28 8C630028 */ lw $v1, 0x28($v1) -/* A4A0EC 80241B2C 27B40010 */ addiu $s4, $sp, 0x10 -/* A4A0F0 80241B30 AFA30020 */ sw $v1, 0x20($sp) -/* A4A0F4 80241B34 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4A0F8 80241B38 3C0142C8 */ lui $at, 0x42c8 -/* A4A0FC 80241B3C 44810000 */ mtc1 $at, $f0 -/* A4A100 80241B40 8C63002C */ lw $v1, 0x2c($v1) -/* A4A104 80241B44 0040982D */ daddu $s3, $v0, $zero -/* A4A108 80241B48 E7A00028 */ swc1 $f0, 0x28($sp) -/* A4A10C 80241B4C A7A0002C */ sh $zero, 0x2c($sp) -/* A4A110 80241B50 16000005 */ bnez $s0, .L80241B68 -/* A4A114 80241B54 AFA30024 */ sw $v1, 0x24($sp) -/* A4A118 80241B58 8E2200B0 */ lw $v0, 0xb0($s1) -/* A4A11C 80241B5C 30420004 */ andi $v0, $v0, 4 -/* A4A120 80241B60 1040001E */ beqz $v0, .L80241BDC -/* A4A124 80241B64 00000000 */ nop -.L80241B68: -/* A4A128 80241B68 8E430000 */ lw $v1, ($s2) -/* A4A12C 80241B6C 2402F7FF */ addiu $v0, $zero, -0x801 -/* A4A130 80241B70 00621824 */ and $v1, $v1, $v0 -/* A4A134 80241B74 8E2200CC */ lw $v0, 0xcc($s1) -/* A4A138 80241B78 3C040020 */ lui $a0, 0x20 -/* A4A13C 80241B7C 8C420000 */ lw $v0, ($v0) -/* A4A140 80241B80 00641825 */ or $v1, $v1, $a0 -/* A4A144 80241B84 AE430000 */ sw $v1, ($s2) -/* A4A148 80241B88 AE420028 */ sw $v0, 0x28($s2) -/* A4A14C 80241B8C 8E220000 */ lw $v0, ($s1) -/* A4A150 80241B90 00441025 */ or $v0, $v0, $a0 -/* A4A154 80241B94 AE220000 */ sw $v0, ($s1) -/* A4A158 80241B98 A640008E */ sh $zero, 0x8e($s2) -/* A4A15C 80241B9C 8E2300B0 */ lw $v1, 0xb0($s1) -/* A4A160 80241BA0 30620004 */ andi $v0, $v1, 4 -/* A4A164 80241BA4 1040000C */ beqz $v0, .L80241BD8 -/* A4A168 80241BA8 2402FFFB */ addiu $v0, $zero, -5 -/* A4A16C 80241BAC 3C013F80 */ lui $at, 0x3f80 -/* A4A170 80241BB0 44810000 */ mtc1 $at, $f0 -/* A4A174 80241BB4 00621024 */ and $v0, $v1, $v0 -/* A4A178 80241BB8 AE2200B0 */ sw $v0, 0xb0($s1) -/* A4A17C 80241BBC 240200FF */ addiu $v0, $zero, 0xff -/* A4A180 80241BC0 A24200AC */ sb $v0, 0xac($s2) -/* A4A184 80241BC4 24020014 */ addiu $v0, $zero, 0x14 -/* A4A188 80241BC8 A642008E */ sh $v0, 0x8e($s2) -/* A4A18C 80241BCC E6400054 */ swc1 $f0, 0x54($s2) -/* A4A190 80241BD0 E6400058 */ swc1 $f0, 0x58($s2) -/* A4A194 80241BD4 E640005C */ swc1 $f0, 0x5c($s2) -.L80241BD8: -/* A4A198 80241BD8 AEA00070 */ sw $zero, 0x70($s5) -.L80241BDC: -/* A4A19C 80241BDC 8EA30070 */ lw $v1, 0x70($s5) -/* A4A1A0 80241BE0 2C620019 */ sltiu $v0, $v1, 0x19 -/* A4A1A4 80241BE4 10400044 */ beqz $v0, .L80241CF8 -/* A4A1A8 80241BE8 00031080 */ sll $v0, $v1, 2 -/* A4A1AC 80241BEC 3C018024 */ lui $at, 0x8024 -/* A4A1B0 80241BF0 00220821 */ addu $at, $at, $v0 -/* A4A1B4 80241BF4 8C223930 */ lw $v0, 0x3930($at) -/* A4A1B8 80241BF8 00400008 */ jr $v0 -/* A4A1BC 80241BFC 00000000 */ nop -/* A4A1C0 80241C00 02A0202D */ daddu $a0, $s5, $zero -/* A4A1C4 80241C04 0260282D */ daddu $a1, $s3, $zero -/* A4A1C8 80241C08 0C09044A */ jal func_80241128 -/* A4A1CC 80241C0C 0280302D */ daddu $a2, $s4, $zero -/* A4A1D0 80241C10 8EA30070 */ lw $v1, 0x70($s5) -/* A4A1D4 80241C14 24020001 */ addiu $v0, $zero, 1 -/* A4A1D8 80241C18 14620037 */ bne $v1, $v0, .L80241CF8 -/* A4A1DC 80241C1C 00000000 */ nop -/* A4A1E0 80241C20 02A0202D */ daddu $a0, $s5, $zero -/* A4A1E4 80241C24 0260282D */ daddu $a1, $s3, $zero -/* A4A1E8 80241C28 0C090467 */ jal func_8024119C -/* A4A1EC 80241C2C 0280302D */ daddu $a2, $s4, $zero -/* A4A1F0 80241C30 0809073E */ j .L80241CF8 -/* A4A1F4 80241C34 00000000 */ nop -/* A4A1F8 80241C38 02A0202D */ daddu $a0, $s5, $zero -/* A4A1FC 80241C3C 0260282D */ daddu $a1, $s3, $zero -/* A4A200 80241C40 0C0904B2 */ jal func_802412C8 -/* A4A204 80241C44 0280302D */ daddu $a2, $s4, $zero -/* A4A208 80241C48 02A0202D */ daddu $a0, $s5, $zero -/* A4A20C 80241C4C 0260282D */ daddu $a1, $s3, $zero -/* A4A210 80241C50 0C0904DA */ jal func_80241368 -/* A4A214 80241C54 0280302D */ daddu $a2, $s4, $zero -/* A4A218 80241C58 0809073E */ j .L80241CF8 -/* A4A21C 80241C5C 00000000 */ nop -/* A4A220 80241C60 02A0202D */ daddu $a0, $s5, $zero -/* A4A224 80241C64 0260282D */ daddu $a1, $s3, $zero -/* A4A228 80241C68 0C0904F3 */ jal func_802413CC -/* A4A22C 80241C6C 0280302D */ daddu $a2, $s4, $zero -/* A4A230 80241C70 02A0202D */ daddu $a0, $s5, $zero -/* A4A234 80241C74 0260282D */ daddu $a1, $s3, $zero -/* A4A238 80241C78 0C090543 */ jal func_8024150C -/* A4A23C 80241C7C 0280302D */ daddu $a2, $s4, $zero -/* A4A240 80241C80 0809073E */ j .L80241CF8 -/* A4A244 80241C84 00000000 */ nop -/* A4A248 80241C88 02A0202D */ daddu $a0, $s5, $zero -/* A4A24C 80241C8C 0260282D */ daddu $a1, $s3, $zero -/* A4A250 80241C90 0C0905AC */ jal func_802416B0 -/* A4A254 80241C94 0280302D */ daddu $a2, $s4, $zero -/* A4A258 80241C98 0809073E */ j .L80241CF8 -/* A4A25C 80241C9C 00000000 */ nop -/* A4A260 80241CA0 02A0202D */ daddu $a0, $s5, $zero -/* A4A264 80241CA4 0260282D */ daddu $a1, $s3, $zero -/* A4A268 80241CA8 0C0905BB */ jal func_802416EC -/* A4A26C 80241CAC 0280302D */ daddu $a2, $s4, $zero -/* A4A270 80241CB0 0809073E */ j .L80241CF8 -/* A4A274 80241CB4 00000000 */ nop -/* A4A278 80241CB8 02A0202D */ daddu $a0, $s5, $zero -/* A4A27C 80241CBC 0260282D */ daddu $a1, $s3, $zero -/* A4A280 80241CC0 0C09062B */ jal func_802418AC -/* A4A284 80241CC4 0280302D */ daddu $a2, $s4, $zero -/* A4A288 80241CC8 0809073E */ j .L80241CF8 -/* A4A28C 80241CCC 00000000 */ nop -/* A4A290 80241CD0 02A0202D */ daddu $a0, $s5, $zero -/* A4A294 80241CD4 0260282D */ daddu $a1, $s3, $zero -/* A4A298 80241CD8 0C090646 */ jal func_80241918 -/* A4A29C 80241CDC 0280302D */ daddu $a2, $s4, $zero -/* A4A2A0 80241CE0 0809073E */ j .L80241CF8 -/* A4A2A4 80241CE4 00000000 */ nop -/* A4A2A8 80241CE8 02A0202D */ daddu $a0, $s5, $zero -/* A4A2AC 80241CEC 0260282D */ daddu $a1, $s3, $zero -/* A4A2B0 80241CF0 0C090693 */ jal func_80241A4C -/* A4A2B4 80241CF4 0280302D */ daddu $a2, $s4, $zero -.L80241CF8: -/* A4A2B8 80241CF8 8FBF0048 */ lw $ra, 0x48($sp) -/* A4A2BC 80241CFC 8FB50044 */ lw $s5, 0x44($sp) -/* A4A2C0 80241D00 8FB40040 */ lw $s4, 0x40($sp) -/* A4A2C4 80241D04 8FB3003C */ lw $s3, 0x3c($sp) -/* A4A2C8 80241D08 8FB20038 */ lw $s2, 0x38($sp) -/* A4A2CC 80241D0C 8FB10034 */ lw $s1, 0x34($sp) -/* A4A2D0 80241D10 8FB00030 */ lw $s0, 0x30($sp) -/* A4A2D4 80241D14 0000102D */ daddu $v0, $zero, $zero -/* A4A2D8 80241D18 03E00008 */ jr $ra -/* A4A2DC 80241D1C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/func_80241DFC_A485C0.s b/asm/nonmatchings/world/area_kpa/kpa_03/func_80241DFC_A485C0.s deleted file mode 100644 index 6faaedf653..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/func_80241DFC_A485C0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DFC_A4A3BC -/* A4A3BC 80241DFC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A4A3C0 80241E00 AFBF0014 */ sw $ra, 0x14($sp) -/* A4A3C4 80241E04 AFB00010 */ sw $s0, 0x10($sp) -/* A4A3C8 80241E08 8C900148 */ lw $s0, 0x148($a0) -/* A4A3CC 80241E0C 0C00EABB */ jal get_npc_unsafe -/* A4A3D0 80241E10 86040008 */ lh $a0, 8($s0) -/* A4A3D4 80241E14 0040202D */ daddu $a0, $v0, $zero -/* A4A3D8 80241E18 8E03006C */ lw $v1, 0x6c($s0) -/* A4A3DC 80241E1C 24020002 */ addiu $v0, $zero, 2 -/* A4A3E0 80241E20 14620003 */ bne $v1, $v0, .L80241E30 -/* A4A3E4 80241E24 00000000 */ nop -/* A4A3E8 80241E28 AC80001C */ sw $zero, 0x1c($a0) -/* A4A3EC 80241E2C AC800018 */ sw $zero, 0x18($a0) -.L80241E30: -/* A4A3F0 80241E30 8FBF0014 */ lw $ra, 0x14($sp) -/* A4A3F4 80241E34 8FB00010 */ lw $s0, 0x10($sp) -/* A4A3F8 80241E38 24020002 */ addiu $v0, $zero, 2 -/* A4A3FC 80241E3C 03E00008 */ jr $ra -/* A4A400 80241E40 27BD0018 */ addiu $sp, $sp, 0x18 -/* A4A404 80241E44 00000000 */ nop -/* A4A408 80241E48 00000000 */ nop -/* A4A40C 80241E4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_04/func_802400BC_A4BF60.s b/asm/nonmatchings/world/area_kpa/kpa_04/func_802400BC_A4BF60.s deleted file mode 100644 index c9f159fbdc..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_04/func_802400BC_A4BF60.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400BC_A4C01C -/* A4C01C 802400BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A4C020 802400C0 AFBF002C */ sw $ra, 0x2c($sp) -/* A4C024 802400C4 AFB00028 */ sw $s0, 0x28($sp) -/* A4C028 802400C8 8C820098 */ lw $v0, 0x98($a0) -/* A4C02C 802400CC 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A4C030 802400D0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A4C034 802400D4 14400005 */ bnez $v0, .L802400EC -/* A4C038 802400D8 00000000 */ nop -/* A4C03C 802400DC C4800084 */ lwc1 $f0, 0x84($a0) -/* A4C040 802400E0 46800020 */ cvt.s.w $f0, $f0 -/* A4C044 802400E4 0809003E */ j .L802400F8 -/* A4C048 802400E8 E6000028 */ swc1 $f0, 0x28($s0) -.L802400EC: -/* A4C04C 802400EC C4800084 */ lwc1 $f0, 0x84($a0) -/* A4C050 802400F0 46800020 */ cvt.s.w $f0, $f0 -/* A4C054 802400F4 E6000030 */ swc1 $f0, 0x30($s0) -.L802400F8: -/* A4C058 802400F8 27A20024 */ addiu $v0, $sp, 0x24 -/* A4C05C 802400FC 0000202D */ daddu $a0, $zero, $zero -/* A4C060 80240100 27A50018 */ addiu $a1, $sp, 0x18 -/* A4C064 80240104 27A6001C */ addiu $a2, $sp, 0x1c -/* A4C068 80240108 C6000028 */ lwc1 $f0, 0x28($s0) -/* A4C06C 8024010C 3C014120 */ lui $at, 0x4120 -/* A4C070 80240110 44811000 */ mtc1 $at, $f2 -/* A4C074 80240114 3C014220 */ lui $at, 0x4220 -/* A4C078 80240118 44813000 */ mtc1 $at, $f6 -/* A4C07C 8024011C 27A70020 */ addiu $a3, $sp, 0x20 -/* A4C080 80240120 E7A00018 */ swc1 $f0, 0x18($sp) -/* A4C084 80240124 C600002C */ lwc1 $f0, 0x2c($s0) -/* A4C088 80240128 C6040030 */ lwc1 $f4, 0x30($s0) -/* A4C08C 8024012C 46020000 */ add.s $f0, $f0, $f2 -/* A4C090 80240130 E7A60024 */ swc1 $f6, 0x24($sp) -/* A4C094 80240134 E7A40020 */ swc1 $f4, 0x20($sp) -/* A4C098 80240138 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A4C09C 8024013C 0C0372DF */ jal func_800DCB7C -/* A4C0A0 80240140 AFA20010 */ sw $v0, 0x10($sp) -/* A4C0A4 80240144 C7A00018 */ lwc1 $f0, 0x18($sp) -/* A4C0A8 80240148 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* A4C0AC 8024014C C7A40020 */ lwc1 $f4, 0x20($sp) -/* A4C0B0 80240150 E6000028 */ swc1 $f0, 0x28($s0) -/* A4C0B4 80240154 E602002C */ swc1 $f2, 0x2c($s0) -/* A4C0B8 80240158 E6040030 */ swc1 $f4, 0x30($s0) -/* A4C0BC 8024015C 8FBF002C */ lw $ra, 0x2c($sp) -/* A4C0C0 80240160 8FB00028 */ lw $s0, 0x28($sp) -/* A4C0C4 80240164 24020002 */ addiu $v0, $zero, 2 -/* A4C0C8 80240168 03E00008 */ jr $ra -/* A4C0CC 8024016C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/func_8024001C_A4CA20.s b/asm/nonmatchings/world/area_kpa/kpa_08/func_8024001C_A4CA20.s deleted file mode 100644 index 9ffac8e41c..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/func_8024001C_A4CA20.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_A4CA3C -/* A4CA3C 8024001C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4CA40 80240020 AFB10014 */ sw $s1, 0x14($sp) -/* A4CA44 80240024 0080882D */ daddu $s1, $a0, $zero -/* A4CA48 80240028 AFBF0018 */ sw $ra, 0x18($sp) -/* A4CA4C 8024002C AFB00010 */ sw $s0, 0x10($sp) -/* A4CA50 80240030 8E30000C */ lw $s0, 0xc($s1) -/* A4CA54 80240034 8E050000 */ lw $a1, ($s0) -/* A4CA58 80240038 0C0B1EAF */ jal get_variable -/* A4CA5C 8024003C 26100004 */ addiu $s0, $s0, 4 -/* A4CA60 80240040 0220202D */ daddu $a0, $s1, $zero -/* A4CA64 80240044 8E050000 */ lw $a1, ($s0) -/* A4CA68 80240048 0C0B1EAF */ jal get_variable -/* A4CA6C 8024004C 0040802D */ daddu $s0, $v0, $zero -/* A4CA70 80240050 0040182D */ daddu $v1, $v0, $zero -/* A4CA74 80240054 3C028016 */ lui $v0, 0x8016 -/* A4CA78 80240058 8442A552 */ lh $v0, -0x5aae($v0) -/* A4CA7C 8024005C 16020009 */ bne $s0, $v0, .L80240084 -/* A4CA80 80240060 00000000 */ nop -/* A4CA84 80240064 8E220084 */ lw $v0, 0x84($s1) -/* A4CA88 80240068 00431021 */ addu $v0, $v0, $v1 -/* A4CA8C 8024006C 44820000 */ mtc1 $v0, $f0 -/* A4CA90 80240070 00000000 */ nop -/* A4CA94 80240074 46800020 */ cvt.s.w $f0, $f0 -/* A4CA98 80240078 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* A4CA9C 8024007C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* A4CAA0 80240080 E440002C */ swc1 $f0, 0x2c($v0) -.L80240084: -/* A4CAA4 80240084 8FBF0018 */ lw $ra, 0x18($sp) -/* A4CAA8 80240088 8FB10014 */ lw $s1, 0x14($sp) -/* A4CAAC 8024008C 8FB00010 */ lw $s0, 0x10($sp) -/* A4CAB0 80240090 24020002 */ addiu $v0, $zero, 2 -/* A4CAB4 80240094 03E00008 */ jr $ra -/* A4CAB8 80240098 27BD0020 */ addiu $sp, $sp, 0x20 -/* A4CABC 8024009C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/func_802400A0_A4CA20.s b/asm/nonmatchings/world/area_kpa/kpa_08/func_802400A0_A4CA20.s deleted file mode 100644 index e616dda1b1..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/func_802400A0_A4CA20.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400A0_A4CAC0 -/* A4CAC0 802400A0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A4CAC4 802400A4 AFB00018 */ sw $s0, 0x18($sp) -/* A4CAC8 802400A8 AFBF0024 */ sw $ra, 0x24($sp) -/* A4CACC 802400AC AFB20020 */ sw $s2, 0x20($sp) -/* A4CAD0 802400B0 AFB1001C */ sw $s1, 0x1c($sp) -/* A4CAD4 802400B4 F7B60030 */ sdc1 $f22, 0x30($sp) -/* A4CAD8 802400B8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A4CADC 802400BC 8C920148 */ lw $s2, 0x148($a0) -/* A4CAE0 802400C0 4485A000 */ mtc1 $a1, $f20 -/* A4CAE4 802400C4 86440008 */ lh $a0, 8($s2) -/* A4CAE8 802400C8 4486B000 */ mtc1 $a2, $f22 -/* A4CAEC 802400CC 0C00EABB */ jal get_npc_unsafe -/* A4CAF0 802400D0 00E0802D */ daddu $s0, $a3, $zero -/* A4CAF4 802400D4 0200202D */ daddu $a0, $s0, $zero -/* A4CAF8 802400D8 0040882D */ daddu $s1, $v0, $zero -/* A4CAFC 802400DC 4406A000 */ mfc1 $a2, $f20 -/* A4CB00 802400E0 4407B000 */ mfc1 $a3, $f22 -/* A4CB04 802400E4 3C03800A */ lui $v1, 0x800a -/* A4CB08 802400E8 8463A634 */ lh $v1, -0x59cc($v1) -/* A4CB0C 802400EC 3C05800B */ lui $a1, %hi(gCameras) -/* A4CB10 802400F0 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A4CB14 802400F4 AFA00010 */ sw $zero, 0x10($sp) -/* A4CB18 802400F8 00031080 */ sll $v0, $v1, 2 -/* A4CB1C 802400FC 00431021 */ addu $v0, $v0, $v1 -/* A4CB20 80240100 00021080 */ sll $v0, $v0, 2 -/* A4CB24 80240104 00431023 */ subu $v0, $v0, $v1 -/* A4CB28 80240108 000218C0 */ sll $v1, $v0, 3 -/* A4CB2C 8024010C 00431021 */ addu $v0, $v0, $v1 -/* A4CB30 80240110 000210C0 */ sll $v0, $v0, 3 -/* A4CB34 80240114 00458021 */ addu $s0, $v0, $a1 -/* A4CB38 80240118 0C01242D */ jal func_800490B4 -/* A4CB3C 8024011C 0240282D */ daddu $a1, $s2, $zero -/* A4CB40 80240120 1040004B */ beqz $v0, .L80240250 -/* A4CB44 80240124 2402FFFF */ addiu $v0, $zero, -1 -/* A4CB48 80240128 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A4CB4C 8024012C C62E000C */ lwc1 $f14, 0xc($s1) -/* A4CB50 80240130 3C014387 */ lui $at, 0x4387 -/* A4CB54 80240134 4481A000 */ mtc1 $at, $f20 -/* A4CB58 80240138 0C00A70A */ jal get_clamped_angle_diff -/* A4CB5C 8024013C 00000000 */ nop -/* A4CB60 80240140 0C00A6C9 */ jal clamp_angle -/* A4CB64 80240144 46000306 */ mov.s $f12, $f0 -/* A4CB68 80240148 3C018024 */ lui $at, 0x8024 -/* A4CB6C 8024014C D4222520 */ ldc1 $f2, 0x2520($at) -/* A4CB70 80240150 46000021 */ cvt.d.s $f0, $f0 -/* A4CB74 80240154 4622003C */ c.lt.d $f0, $f2 -/* A4CB78 80240158 00000000 */ nop -/* A4CB7C 8024015C 45000003 */ bc1f .L8024016C -/* A4CB80 80240160 00000000 */ nop -/* A4CB84 80240164 3C0142B4 */ lui $at, 0x42b4 -/* A4CB88 80240168 4481A000 */ mtc1 $at, $f20 -.L8024016C: -/* A4CB8C 8024016C 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* A4CB90 80240170 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* A4CB94 80240174 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A4CB98 80240178 8E020000 */ lw $v0, ($s0) -/* A4CB9C 8024017C C62E0040 */ lwc1 $f14, 0x40($s1) -/* A4CBA0 80240180 8C460028 */ lw $a2, 0x28($v0) -/* A4CBA4 80240184 0C00A720 */ jal atan2 -/* A4CBA8 80240188 8C470030 */ lw $a3, 0x30($v0) -/* A4CBAC 8024018C 4600A306 */ mov.s $f12, $f20 -/* A4CBB0 80240190 0C00A70A */ jal get_clamped_angle_diff -/* A4CBB4 80240194 46000386 */ mov.s $f14, $f0 -/* A4CBB8 80240198 46000005 */ abs.s $f0, $f0 -/* A4CBBC 8024019C 3C018024 */ lui $at, 0x8024 -/* A4CBC0 802401A0 D4222528 */ ldc1 $f2, 0x2528($at) -/* A4CBC4 802401A4 46000021 */ cvt.d.s $f0, $f0 -/* A4CBC8 802401A8 4620103C */ c.lt.d $f2, $f0 -/* A4CBCC 802401AC 00000000 */ nop -/* A4CBD0 802401B0 45010027 */ bc1t .L80240250 -/* A4CBD4 802401B4 2402FFFF */ addiu $v0, $zero, -1 -/* A4CBD8 802401B8 8E020000 */ lw $v0, ($s0) -/* A4CBDC 802401BC C6200038 */ lwc1 $f0, 0x38($s1) -/* A4CBE0 802401C0 C4420028 */ lwc1 $f2, 0x28($v0) -/* A4CBE4 802401C4 44806000 */ mtc1 $zero, $f12 -/* A4CBE8 802401C8 46020001 */ sub.s $f0, $f0, $f2 -/* A4CBEC 802401CC C62E003C */ lwc1 $f14, 0x3c($s1) -/* A4CBF0 802401D0 8C47002C */ lw $a3, 0x2c($v0) -/* A4CBF4 802401D4 46000005 */ abs.s $f0, $f0 -/* A4CBF8 802401D8 44060000 */ mfc1 $a2, $f0 -/* A4CBFC 802401DC 0C00A720 */ jal atan2 -/* A4CC00 802401E0 00000000 */ nop -/* A4CC04 802401E4 3C018024 */ lui $at, 0x8024 -/* A4CC08 802401E8 D4222530 */ ldc1 $f2, 0x2530($at) -/* A4CC0C 802401EC 46000021 */ cvt.d.s $f0, $f0 -/* A4CC10 802401F0 46220001 */ sub.d $f0, $f0, $f2 -/* A4CC14 802401F4 3C018024 */ lui $at, 0x8024 -/* A4CC18 802401F8 D4222538 */ ldc1 $f2, 0x2538($at) -/* A4CC1C 802401FC 46200020 */ cvt.s.d $f0, $f0 -/* A4CC20 80240200 46000005 */ abs.s $f0, $f0 -/* A4CC24 80240204 46000021 */ cvt.d.s $f0, $f0 -/* A4CC28 80240208 4620103C */ c.lt.d $f2, $f0 -/* A4CC2C 8024020C 00000000 */ nop -/* A4CC30 80240210 4501000F */ bc1t .L80240250 -/* A4CC34 80240214 2402FFFF */ addiu $v0, $zero, -1 -/* A4CC38 80240218 3C038011 */ lui $v1, 0x8011 -/* A4CC3C 8024021C 8063EBB3 */ lb $v1, -0x144d($v1) -/* A4CC40 80240220 24020009 */ addiu $v0, $zero, 9 -/* A4CC44 80240224 10620009 */ beq $v1, $v0, .L8024024C -/* A4CC48 80240228 24020007 */ addiu $v0, $zero, 7 -/* A4CC4C 8024022C 50620008 */ beql $v1, $v0, .L80240250 -/* A4CC50 80240230 2402FFFF */ addiu $v0, $zero, -1 -/* A4CC54 80240234 86440008 */ lh $a0, 8($s2) -/* A4CC58 80240238 0C00FB3A */ jal get_enemy -/* A4CC5C 8024023C 24840001 */ addiu $a0, $a0, 1 -/* A4CC60 80240240 8C43006C */ lw $v1, 0x6c($v0) -/* A4CC64 80240244 10600002 */ beqz $v1, .L80240250 -/* A4CC68 80240248 24020001 */ addiu $v0, $zero, 1 -.L8024024C: -/* A4CC6C 8024024C 2402FFFF */ addiu $v0, $zero, -1 -.L80240250: -/* A4CC70 80240250 8FBF0024 */ lw $ra, 0x24($sp) -/* A4CC74 80240254 8FB20020 */ lw $s2, 0x20($sp) -/* A4CC78 80240258 8FB1001C */ lw $s1, 0x1c($sp) -/* A4CC7C 8024025C 8FB00018 */ lw $s0, 0x18($sp) -/* A4CC80 80240260 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A4CC84 80240264 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A4CC88 80240268 03E00008 */ jr $ra -/* A4CC8C 8024026C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/func_802407F4_A4CA20.s b/asm/nonmatchings/world/area_kpa/kpa_08/func_802407F4_A4CA20.s deleted file mode 100644 index 54d6713917..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/func_802407F4_A4CA20.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407F4_A4D214 -/* A4D214 802407F4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A4D218 802407F8 AFB3001C */ sw $s3, 0x1c($sp) -/* A4D21C 802407FC 0080982D */ daddu $s3, $a0, $zero -/* A4D220 80240800 AFBF0020 */ sw $ra, 0x20($sp) -/* A4D224 80240804 AFB20018 */ sw $s2, 0x18($sp) -/* A4D228 80240808 AFB10014 */ sw $s1, 0x14($sp) -/* A4D22C 8024080C AFB00010 */ sw $s0, 0x10($sp) -/* A4D230 80240810 8E720148 */ lw $s2, 0x148($s3) -/* A4D234 80240814 0C00EABB */ jal get_npc_unsafe -/* A4D238 80240818 86440008 */ lh $a0, 8($s2) -/* A4D23C 8024081C 0040802D */ daddu $s0, $v0, $zero -/* A4D240 80240820 8603008E */ lh $v1, 0x8e($s0) -/* A4D244 80240824 3C118024 */ lui $s1, 0x8024 -/* A4D248 80240828 26311CF0 */ addiu $s1, $s1, 0x1cf0 -/* A4D24C 8024082C 00031040 */ sll $v0, $v1, 1 -/* A4D250 80240830 00431021 */ addu $v0, $v0, $v1 -/* A4D254 80240834 00021080 */ sll $v0, $v0, 2 -/* A4D258 80240838 3C018024 */ lui $at, 0x8024 -/* A4D25C 8024083C 00220821 */ addu $at, $at, $v0 -/* A4D260 80240840 C4201CF0 */ lwc1 $f0, 0x1cf0($at) -/* A4D264 80240844 00031040 */ sll $v0, $v1, 1 -/* A4D268 80240848 00431021 */ addu $v0, $v0, $v1 -/* A4D26C 8024084C 00021080 */ sll $v0, $v0, 2 -/* A4D270 80240850 E6000054 */ swc1 $f0, 0x54($s0) -/* A4D274 80240854 3C018024 */ lui $at, 0x8024 -/* A4D278 80240858 00220821 */ addu $at, $at, $v0 -/* A4D27C 8024085C C4201CF4 */ lwc1 $f0, 0x1cf4($at) -/* A4D280 80240860 00031040 */ sll $v0, $v1, 1 -/* A4D284 80240864 00431021 */ addu $v0, $v0, $v1 -/* A4D288 80240868 9603008E */ lhu $v1, 0x8e($s0) -/* A4D28C 8024086C 00021080 */ sll $v0, $v0, 2 -/* A4D290 80240870 E6000058 */ swc1 $f0, 0x58($s0) -/* A4D294 80240874 3C018024 */ lui $at, 0x8024 -/* A4D298 80240878 00220821 */ addu $at, $at, $v0 -/* A4D29C 8024087C 90221CF8 */ lbu $v0, 0x1cf8($at) -/* A4D2A0 80240880 24630001 */ addiu $v1, $v1, 1 -/* A4D2A4 80240884 A603008E */ sh $v1, 0x8e($s0) -/* A4D2A8 80240888 00031C00 */ sll $v1, $v1, 0x10 -/* A4D2AC 8024088C 00031C03 */ sra $v1, $v1, 0x10 -/* A4D2B0 80240890 A20200AC */ sb $v0, 0xac($s0) -/* A4D2B4 80240894 24020004 */ addiu $v0, $zero, 4 -/* A4D2B8 80240898 14620007 */ bne $v1, $v0, .L802408B8 -/* A4D2BC 8024089C 00000000 */ nop -/* A4D2C0 802408A0 0C00EAFF */ jal disable_npc_shadow -/* A4D2C4 802408A4 0200202D */ daddu $a0, $s0, $zero -/* A4D2C8 802408A8 8E420000 */ lw $v0, ($s2) -/* A4D2CC 802408AC 3C031F10 */ lui $v1, 0x1f10 -/* A4D2D0 802408B0 00431025 */ or $v0, $v0, $v1 -/* A4D2D4 802408B4 AE420000 */ sw $v0, ($s2) -.L802408B8: -/* A4D2D8 802408B8 8602008E */ lh $v0, 0x8e($s0) -/* A4D2DC 802408BC 00021840 */ sll $v1, $v0, 1 -/* A4D2E0 802408C0 00621821 */ addu $v1, $v1, $v0 -/* A4D2E4 802408C4 00031880 */ sll $v1, $v1, 2 -/* A4D2E8 802408C8 00711821 */ addu $v1, $v1, $s1 -/* A4D2EC 802408CC 90620008 */ lbu $v0, 8($v1) -/* A4D2F0 802408D0 1440000C */ bnez $v0, .L80240904 -/* A4D2F4 802408D4 240200FF */ addiu $v0, $zero, 0xff -/* A4D2F8 802408D8 A20200AC */ sb $v0, 0xac($s0) -/* A4D2FC 802408DC 24020005 */ addiu $v0, $zero, 5 -/* A4D300 802408E0 8E030000 */ lw $v1, ($s0) -/* A4D304 802408E4 3C013F80 */ lui $at, 0x3f80 -/* A4D308 802408E8 44810000 */ mtc1 $at, $f0 -/* A4D30C 802408EC 34630002 */ ori $v1, $v1, 2 -/* A4D310 802408F0 E6000054 */ swc1 $f0, 0x54($s0) -/* A4D314 802408F4 E6000058 */ swc1 $f0, 0x58($s0) -/* A4D318 802408F8 E600005C */ swc1 $f0, 0x5c($s0) -/* A4D31C 802408FC AE030000 */ sw $v1, ($s0) -/* A4D320 80240900 AE620070 */ sw $v0, 0x70($s3) -.L80240904: -/* A4D324 80240904 8FBF0020 */ lw $ra, 0x20($sp) -/* A4D328 80240908 8FB3001C */ lw $s3, 0x1c($sp) -/* A4D32C 8024090C 8FB20018 */ lw $s2, 0x18($sp) -/* A4D330 80240910 8FB10014 */ lw $s1, 0x14($sp) -/* A4D334 80240914 8FB00010 */ lw $s0, 0x10($sp) -/* A4D338 80240918 03E00008 */ jr $ra -/* A4D33C 8024091C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/func_802409C0_A4CA20.s b/asm/nonmatchings/world/area_kpa/kpa_08/func_802409C0_A4CA20.s deleted file mode 100644 index b7f6c205a3..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/func_802409C0_A4CA20.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409C0_A4D3E0 -/* A4D3E0 802409C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4D3E4 802409C4 AFB10014 */ sw $s1, 0x14($sp) -/* A4D3E8 802409C8 0080882D */ daddu $s1, $a0, $zero -/* A4D3EC 802409CC AFBF0018 */ sw $ra, 0x18($sp) -/* A4D3F0 802409D0 AFB00010 */ sw $s0, 0x10($sp) -/* A4D3F4 802409D4 8E220148 */ lw $v0, 0x148($s1) -/* A4D3F8 802409D8 0C00EABB */ jal get_npc_unsafe -/* A4D3FC 802409DC 84440008 */ lh $a0, 8($v0) -/* A4D400 802409E0 0040802D */ daddu $s0, $v0, $zero -/* A4D404 802409E4 8E050018 */ lw $a1, 0x18($s0) -/* A4D408 802409E8 8E06000C */ lw $a2, 0xc($s0) -/* A4D40C 802409EC 0C00EA95 */ jal npc_move_heading -/* A4D410 802409F0 0200202D */ daddu $a0, $s0, $zero -/* A4D414 802409F4 9602008E */ lhu $v0, 0x8e($s0) -/* A4D418 802409F8 2442FFFF */ addiu $v0, $v0, -1 -/* A4D41C 802409FC A602008E */ sh $v0, 0x8e($s0) -/* A4D420 80240A00 00021400 */ sll $v0, $v0, 0x10 -/* A4D424 80240A04 1C400002 */ bgtz $v0, .L80240A10 -/* A4D428 80240A08 2402000A */ addiu $v0, $zero, 0xa -/* A4D42C 80240A0C AE220070 */ sw $v0, 0x70($s1) -.L80240A10: -/* A4D430 80240A10 8FBF0018 */ lw $ra, 0x18($sp) -/* A4D434 80240A14 8FB10014 */ lw $s1, 0x14($sp) -/* A4D438 80240A18 8FB00010 */ lw $s0, 0x10($sp) -/* A4D43C 80240A1C 03E00008 */ jr $ra -/* A4D440 80240A20 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/func_80240B64_A4CA20.s b/asm/nonmatchings/world/area_kpa/kpa_08/func_80240B64_A4CA20.s deleted file mode 100644 index c6b2d8648e..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/func_80240B64_A4CA20.s +++ /dev/null @@ -1,117 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B64_A4D584 -/* A4D584 80240B64 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A4D588 80240B68 AFB20028 */ sw $s2, 0x28($sp) -/* A4D58C 80240B6C 0080902D */ daddu $s2, $a0, $zero -/* A4D590 80240B70 AFBF002C */ sw $ra, 0x2c($sp) -/* A4D594 80240B74 AFB10024 */ sw $s1, 0x24($sp) -/* A4D598 80240B78 AFB00020 */ sw $s0, 0x20($sp) -/* A4D59C 80240B7C 8E510148 */ lw $s1, 0x148($s2) -/* A4D5A0 80240B80 0C00EABB */ jal get_npc_unsafe -/* A4D5A4 80240B84 86240008 */ lh $a0, 8($s1) -/* A4D5A8 80240B88 8E23006C */ lw $v1, 0x6c($s1) -/* A4D5AC 80240B8C 14600006 */ bnez $v1, .L80240BA8 -/* A4D5B0 80240B90 0040802D */ daddu $s0, $v0, $zero -/* A4D5B4 80240B94 8603008E */ lh $v1, 0x8e($s0) -/* A4D5B8 80240B98 00031100 */ sll $v0, $v1, 4 -/* A4D5BC 80240B9C 00431023 */ subu $v0, $v0, $v1 -/* A4D5C0 80240BA0 080902EE */ j .L80240BB8 -/* A4D5C4 80240BA4 24430082 */ addiu $v1, $v0, 0x82 -.L80240BA8: -/* A4D5C8 80240BA8 8603008E */ lh $v1, 0x8e($s0) -/* A4D5CC 80240BAC 00031100 */ sll $v0, $v1, 4 -/* A4D5D0 80240BB0 00431023 */ subu $v0, $v0, $v1 -/* A4D5D4 80240BB4 2443001E */ addiu $v1, $v0, 0x1e -.L80240BB8: -/* A4D5D8 80240BB8 00031400 */ sll $v0, $v1, 0x10 -/* A4D5DC 80240BBC 00021403 */ sra $v0, $v0, 0x10 -/* A4D5E0 80240BC0 28420100 */ slti $v0, $v0, 0x100 -/* A4D5E4 80240BC4 50400001 */ beql $v0, $zero, .L80240BCC -/* A4D5E8 80240BC8 240300FF */ addiu $v1, $zero, 0xff -.L80240BCC: -/* A4D5EC 80240BCC 8602008E */ lh $v0, 0x8e($s0) -/* A4D5F0 80240BD0 3C018024 */ lui $at, 0x8024 -/* A4D5F4 80240BD4 D4222560 */ ldc1 $f2, 0x2560($at) -/* A4D5F8 80240BD8 44820000 */ mtc1 $v0, $f0 -/* A4D5FC 80240BDC 00000000 */ nop -/* A4D600 80240BE0 46800020 */ cvt.s.w $f0, $f0 -/* A4D604 80240BE4 46000021 */ cvt.d.s $f0, $f0 -/* A4D608 80240BE8 46220002 */ mul.d $f0, $f0, $f2 -/* A4D60C 80240BEC 00000000 */ nop -/* A4D610 80240BF0 3C018024 */ lui $at, 0x8024 -/* A4D614 80240BF4 D4222568 */ ldc1 $f2, 0x2568($at) -/* A4D618 80240BF8 46220000 */ add.d $f0, $f0, $f2 -/* A4D61C 80240BFC A20300AC */ sb $v1, 0xac($s0) -/* A4D620 80240C00 3C013FF0 */ lui $at, 0x3ff0 -/* A4D624 80240C04 44811800 */ mtc1 $at, $f3 -/* A4D628 80240C08 44801000 */ mtc1 $zero, $f2 -/* A4D62C 80240C0C 46200020 */ cvt.s.d $f0, $f0 -/* A4D630 80240C10 E6000054 */ swc1 $f0, 0x54($s0) -/* A4D634 80240C14 46000021 */ cvt.d.s $f0, $f0 -/* A4D638 80240C18 4620103C */ c.lt.d $f2, $f0 -/* A4D63C 80240C1C 00000000 */ nop -/* A4D640 80240C20 45000005 */ bc1f .L80240C38 -/* A4D644 80240C24 24030005 */ addiu $v1, $zero, 5 -/* A4D648 80240C28 3C013F80 */ lui $at, 0x3f80 -/* A4D64C 80240C2C 44810000 */ mtc1 $at, $f0 -/* A4D650 80240C30 00000000 */ nop -/* A4D654 80240C34 E6000054 */ swc1 $f0, 0x54($s0) -.L80240C38: -/* A4D658 80240C38 C6000054 */ lwc1 $f0, 0x54($s0) -/* A4D65C 80240C3C 9602008E */ lhu $v0, 0x8e($s0) -/* A4D660 80240C40 46000086 */ mov.s $f2, $f0 -/* A4D664 80240C44 24420001 */ addiu $v0, $v0, 1 -/* A4D668 80240C48 A602008E */ sh $v0, 0x8e($s0) -/* A4D66C 80240C4C 00021400 */ sll $v0, $v0, 0x10 -/* A4D670 80240C50 00021403 */ sra $v0, $v0, 0x10 -/* A4D674 80240C54 E6000058 */ swc1 $f0, 0x58($s0) -/* A4D678 80240C58 14430008 */ bne $v0, $v1, .L80240C7C -/* A4D67C 80240C5C E602005C */ swc1 $f2, 0x5c($s0) -/* A4D680 80240C60 0C00EAE8 */ jal enable_npc_shadow -/* A4D684 80240C64 0200202D */ daddu $a0, $s0, $zero -/* A4D688 80240C68 3C03E0EF */ lui $v1, 0xe0ef -/* A4D68C 80240C6C 8E220000 */ lw $v0, ($s1) -/* A4D690 80240C70 3463FFFF */ ori $v1, $v1, 0xffff -/* A4D694 80240C74 00431024 */ and $v0, $v0, $v1 -/* A4D698 80240C78 AE220000 */ sw $v0, ($s1) -.L80240C7C: -/* A4D69C 80240C7C 8E22006C */ lw $v0, 0x6c($s1) -/* A4D6A0 80240C80 1440000E */ bnez $v0, .L80240CBC -/* A4D6A4 80240C84 00000000 */ nop -/* A4D6A8 80240C88 8602008E */ lh $v0, 0x8e($s0) -/* A4D6AC 80240C8C 28420014 */ slti $v0, $v0, 0x14 -/* A4D6B0 80240C90 14400017 */ bnez $v0, .L80240CF0 -/* A4D6B4 80240C94 0000282D */ daddu $a1, $zero, $zero -/* A4D6B8 80240C98 00A0302D */ daddu $a2, $a1, $zero -/* A4D6BC 80240C9C AFA00010 */ sw $zero, 0x10($sp) -/* A4D6C0 80240CA0 AFA00014 */ sw $zero, 0x14($sp) -/* A4D6C4 80240CA4 AFA00018 */ sw $zero, 0x18($sp) -/* A4D6C8 80240CA8 8E040024 */ lw $a0, 0x24($s0) -/* A4D6CC 80240CAC 0C0B7A25 */ jal func_802DE894 -/* A4D6D0 80240CB0 00A0382D */ daddu $a3, $a1, $zero -/* A4D6D4 80240CB4 08090333 */ j .L80240CCC -/* A4D6D8 80240CB8 00000000 */ nop -.L80240CBC: -/* A4D6DC 80240CBC 8602008E */ lh $v0, 0x8e($s0) -/* A4D6E0 80240CC0 2842000A */ slti $v0, $v0, 0xa -/* A4D6E4 80240CC4 1440000A */ bnez $v0, .L80240CF0 -/* A4D6E8 80240CC8 00000000 */ nop -.L80240CCC: -/* A4D6EC 80240CCC 3C013F80 */ lui $at, 0x3f80 -/* A4D6F0 80240CD0 44810000 */ mtc1 $at, $f0 -/* A4D6F4 80240CD4 240200FF */ addiu $v0, $zero, 0xff -/* A4D6F8 80240CD8 A20200AC */ sb $v0, 0xac($s0) -/* A4D6FC 80240CDC 24020014 */ addiu $v0, $zero, 0x14 -/* A4D700 80240CE0 E6000054 */ swc1 $f0, 0x54($s0) -/* A4D704 80240CE4 E6000058 */ swc1 $f0, 0x58($s0) -/* A4D708 80240CE8 E600005C */ swc1 $f0, 0x5c($s0) -/* A4D70C 80240CEC AE420070 */ sw $v0, 0x70($s2) -.L80240CF0: -/* A4D710 80240CF0 8FBF002C */ lw $ra, 0x2c($sp) -/* A4D714 80240CF4 8FB20028 */ lw $s2, 0x28($sp) -/* A4D718 80240CF8 8FB10024 */ lw $s1, 0x24($sp) -/* A4D71C 80240CFC 8FB00020 */ lw $s0, 0x20($sp) -/* A4D720 80240D00 03E00008 */ jr $ra -/* A4D724 80240D04 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/func_80240D08_A4CA20.s b/asm/nonmatchings/world/area_kpa/kpa_08/func_80240D08_A4CA20.s deleted file mode 100644 index bc43655130..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/func_80240D08_A4CA20.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D08_A4D728 -/* A4D728 80240D08 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A4D72C 80240D0C AFB00010 */ sw $s0, 0x10($sp) -/* A4D730 80240D10 0080802D */ daddu $s0, $a0, $zero -/* A4D734 80240D14 AFBF0014 */ sw $ra, 0x14($sp) -/* A4D738 80240D18 8E020148 */ lw $v0, 0x148($s0) -/* A4D73C 80240D1C 0C00EABB */ jal get_npc_unsafe -/* A4D740 80240D20 84440008 */ lh $a0, 8($v0) -/* A4D744 80240D24 24030028 */ addiu $v1, $zero, 0x28 -/* A4D748 80240D28 A443008E */ sh $v1, 0x8e($v0) -/* A4D74C 80240D2C 24020015 */ addiu $v0, $zero, 0x15 -/* A4D750 80240D30 AE020070 */ sw $v0, 0x70($s0) -/* A4D754 80240D34 8FBF0014 */ lw $ra, 0x14($sp) -/* A4D758 80240D38 8FB00010 */ lw $s0, 0x10($sp) -/* A4D75C 80240D3C 03E00008 */ jr $ra -/* A4D760 80240D40 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/func_80240D44_A4CA20.s b/asm/nonmatchings/world/area_kpa/kpa_08/func_80240D44_A4CA20.s deleted file mode 100644 index 40092e1750..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/func_80240D44_A4CA20.s +++ /dev/null @@ -1,118 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D44_A4D764 -/* A4D764 80240D44 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A4D768 80240D48 AFB40048 */ sw $s4, 0x48($sp) -/* A4D76C 80240D4C 0080A02D */ daddu $s4, $a0, $zero -/* A4D770 80240D50 AFBF004C */ sw $ra, 0x4c($sp) -/* A4D774 80240D54 AFB30044 */ sw $s3, 0x44($sp) -/* A4D778 80240D58 AFB20040 */ sw $s2, 0x40($sp) -/* A4D77C 80240D5C AFB1003C */ sw $s1, 0x3c($sp) -/* A4D780 80240D60 AFB00038 */ sw $s0, 0x38($sp) -/* A4D784 80240D64 F7B40050 */ sdc1 $f20, 0x50($sp) -/* A4D788 80240D68 8E910148 */ lw $s1, 0x148($s4) -/* A4D78C 80240D6C 00A0902D */ daddu $s2, $a1, $zero -/* A4D790 80240D70 86240008 */ lh $a0, 8($s1) -/* A4D794 80240D74 0C00EABB */ jal get_npc_unsafe -/* A4D798 80240D78 00C0982D */ daddu $s3, $a2, $zero -/* A4D79C 80240D7C 0040802D */ daddu $s0, $v0, $zero -/* A4D7A0 80240D80 9602008E */ lhu $v0, 0x8e($s0) -/* A4D7A4 80240D84 2442FFFF */ addiu $v0, $v0, -1 -/* A4D7A8 80240D88 A602008E */ sh $v0, 0x8e($s0) -/* A4D7AC 80240D8C 00021400 */ sll $v0, $v0, 0x10 -/* A4D7B0 80240D90 14400021 */ bnez $v0, .L80240E18 -/* A4D7B4 80240D94 0280202D */ daddu $a0, $s4, $zero -/* A4D7B8 80240D98 24040002 */ addiu $a0, $zero, 2 -/* A4D7BC 80240D9C 0200282D */ daddu $a1, $s0, $zero -/* A4D7C0 80240DA0 0000302D */ daddu $a2, $zero, $zero -/* A4D7C4 80240DA4 8E2200CC */ lw $v0, 0xcc($s1) -/* A4D7C8 80240DA8 3C013F80 */ lui $at, 0x3f80 -/* A4D7CC 80240DAC 44810000 */ mtc1 $at, $f0 -/* A4D7D0 80240DB0 3C014000 */ lui $at, 0x4000 -/* A4D7D4 80240DB4 44811000 */ mtc1 $at, $f2 -/* A4D7D8 80240DB8 8C430000 */ lw $v1, ($v0) -/* A4D7DC 80240DBC 860200A8 */ lh $v0, 0xa8($s0) -/* A4D7E0 80240DC0 3C01C1A0 */ lui $at, 0xc1a0 -/* A4D7E4 80240DC4 44812000 */ mtc1 $at, $f4 -/* A4D7E8 80240DC8 44824000 */ mtc1 $v0, $f8 -/* A4D7EC 80240DCC 00000000 */ nop -/* A4D7F0 80240DD0 46804220 */ cvt.s.w $f8, $f8 -/* A4D7F4 80240DD4 44074000 */ mfc1 $a3, $f8 -/* A4D7F8 80240DD8 2402000C */ addiu $v0, $zero, 0xc -/* A4D7FC 80240DDC AE030028 */ sw $v1, 0x28($s0) -/* A4D800 80240DE0 AFA2001C */ sw $v0, 0x1c($sp) -/* A4D804 80240DE4 27A20028 */ addiu $v0, $sp, 0x28 -/* A4D808 80240DE8 E7A00010 */ swc1 $f0, 0x10($sp) -/* A4D80C 80240DEC E7A20014 */ swc1 $f2, 0x14($sp) -/* A4D810 80240DF0 E7A40018 */ swc1 $f4, 0x18($sp) -/* A4D814 80240DF4 0C01BFA4 */ jal fx_emote -/* A4D818 80240DF8 AFA20020 */ sw $v0, 0x20($sp) -/* A4D81C 80240DFC 8E2200CC */ lw $v0, 0xcc($s1) -/* A4D820 80240E00 8C430000 */ lw $v1, ($v0) -/* A4D824 80240E04 2402000F */ addiu $v0, $zero, 0xf -/* A4D828 80240E08 A602008E */ sh $v0, 0x8e($s0) -/* A4D82C 80240E0C AE030028 */ sw $v1, 0x28($s0) -/* A4D830 80240E10 080903B8 */ j .L80240EE0 -/* A4D834 80240E14 AE800070 */ sw $zero, 0x70($s4) -.L80240E18: -/* A4D838 80240E18 8E450024 */ lw $a1, 0x24($s2) -/* A4D83C 80240E1C 8E460028 */ lw $a2, 0x28($s2) -/* A4D840 80240E20 0C090028 */ jal func_802400A0 -/* A4D844 80240E24 0260382D */ daddu $a3, $s3, $zero -/* A4D848 80240E28 24030001 */ addiu $v1, $zero, 1 -/* A4D84C 80240E2C 1443002C */ bne $v0, $v1, .L80240EE0 -/* A4D850 80240E30 0200202D */ daddu $a0, $s0, $zero -/* A4D854 80240E34 240520D4 */ addiu $a1, $zero, 0x20d4 -/* A4D858 80240E38 0C012530 */ jal func_800494C0 -/* A4D85C 80240E3C 0000302D */ daddu $a2, $zero, $zero -/* A4D860 80240E40 27A4002C */ addiu $a0, $sp, 0x2c -/* A4D864 80240E44 27A50030 */ addiu $a1, $sp, 0x30 -/* A4D868 80240E48 3C064188 */ lui $a2, 0x4188 -/* A4D86C 80240E4C C6020034 */ lwc1 $f2, 0x34($s0) -/* A4D870 80240E50 3C014387 */ lui $at, 0x4387 -/* A4D874 80240E54 44810000 */ mtc1 $at, $f0 -/* A4D878 80240E58 8E2200CC */ lw $v0, 0xcc($s1) -/* A4D87C 80240E5C C614003C */ lwc1 $f20, 0x3c($s0) -/* A4D880 80240E60 46020001 */ sub.s $f0, $f0, $f2 -/* A4D884 80240E64 3C014200 */ lui $at, 0x4200 -/* A4D888 80240E68 44812000 */ mtc1 $at, $f4 -/* A4D88C 80240E6C C6060038 */ lwc1 $f6, 0x38($s0) -/* A4D890 80240E70 4604A500 */ add.s $f20, $f20, $f4 -/* A4D894 80240E74 3C013F80 */ lui $at, 0x3f80 -/* A4D898 80240E78 44811000 */ mtc1 $at, $f2 -/* A4D89C 80240E7C 44070000 */ mfc1 $a3, $f0 -/* A4D8A0 80240E80 C6000040 */ lwc1 $f0, 0x40($s0) -/* A4D8A4 80240E84 8C420020 */ lw $v0, 0x20($v0) -/* A4D8A8 80240E88 46020000 */ add.s $f0, $f0, $f2 -/* A4D8AC 80240E8C E7A6002C */ swc1 $f6, 0x2c($sp) -/* A4D8B0 80240E90 AE020028 */ sw $v0, 0x28($s0) -/* A4D8B4 80240E94 0C00A7E7 */ jal add_vec2D_polar -/* A4D8B8 80240E98 E7A00030 */ swc1 $f0, 0x30($sp) -/* A4D8BC 80240E9C 0000202D */ daddu $a0, $zero, $zero -/* A4D8C0 80240EA0 4406A000 */ mfc1 $a2, $f20 -/* A4D8C4 80240EA4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A4D8C8 80240EA8 C7A20030 */ lwc1 $f2, 0x30($sp) -/* A4D8CC 80240EAC 44050000 */ mfc1 $a1, $f0 -/* A4D8D0 80240EB0 44071000 */ mfc1 $a3, $f2 -/* A4D8D4 80240EB4 3C013DCC */ lui $at, 0x3dcc -/* A4D8D8 80240EB8 3421CCCD */ ori $at, $at, 0xcccd -/* A4D8DC 80240EBC 44810000 */ mtc1 $at, $f0 -/* A4D8E0 80240EC0 2402000D */ addiu $v0, $zero, 0xd -/* A4D8E4 80240EC4 AFA20014 */ sw $v0, 0x14($sp) -/* A4D8E8 80240EC8 0C01BFEC */ jal func_8006FFB0 -/* A4D8EC 80240ECC E7A00010 */ swc1 $f0, 0x10($sp) -/* A4D8F0 80240ED0 2402000F */ addiu $v0, $zero, 0xf -/* A4D8F4 80240ED4 A602008E */ sh $v0, 0x8e($s0) -/* A4D8F8 80240ED8 24020016 */ addiu $v0, $zero, 0x16 -/* A4D8FC 80240EDC AE820070 */ sw $v0, 0x70($s4) -.L80240EE0: -/* A4D900 80240EE0 8FBF004C */ lw $ra, 0x4c($sp) -/* A4D904 80240EE4 8FB40048 */ lw $s4, 0x48($sp) -/* A4D908 80240EE8 8FB30044 */ lw $s3, 0x44($sp) -/* A4D90C 80240EEC 8FB20040 */ lw $s2, 0x40($sp) -/* A4D910 80240EF0 8FB1003C */ lw $s1, 0x3c($sp) -/* A4D914 80240EF4 8FB00038 */ lw $s0, 0x38($sp) -/* A4D918 80240EF8 D7B40050 */ ldc1 $f20, 0x50($sp) -/* A4D91C 80240EFC 03E00008 */ jr $ra -/* A4D920 80240F00 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/func_80240F70_A4CA20.s b/asm/nonmatchings/world/area_kpa/kpa_08/func_80240F70_A4CA20.s deleted file mode 100644 index ed80ec3e3a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/func_80240F70_A4CA20.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F70_A4D990 -/* A4D990 80240F70 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A4D994 80240F74 AFB3003C */ sw $s3, 0x3c($sp) -/* A4D998 80240F78 0080982D */ daddu $s3, $a0, $zero -/* A4D99C 80240F7C AFBF0044 */ sw $ra, 0x44($sp) -/* A4D9A0 80240F80 AFB40040 */ sw $s4, 0x40($sp) -/* A4D9A4 80240F84 AFB20038 */ sw $s2, 0x38($sp) -/* A4D9A8 80240F88 AFB10034 */ sw $s1, 0x34($sp) -/* A4D9AC 80240F8C AFB00030 */ sw $s0, 0x30($sp) -/* A4D9B0 80240F90 8E720148 */ lw $s2, 0x148($s3) -/* A4D9B4 80240F94 00A0882D */ daddu $s1, $a1, $zero -/* A4D9B8 80240F98 86440008 */ lh $a0, 8($s2) -/* A4D9BC 80240F9C 0C00EABB */ jal get_npc_unsafe -/* A4D9C0 80240FA0 00C0A02D */ daddu $s4, $a2, $zero -/* A4D9C4 80240FA4 0040802D */ daddu $s0, $v0, $zero -/* A4D9C8 80240FA8 9602008E */ lhu $v0, 0x8e($s0) -/* A4D9CC 80240FAC 2442FFFF */ addiu $v0, $v0, -1 -/* A4D9D0 80240FB0 A602008E */ sh $v0, 0x8e($s0) -/* A4D9D4 80240FB4 00021400 */ sll $v0, $v0, 0x10 -/* A4D9D8 80240FB8 1C400032 */ bgtz $v0, .L80241084 -/* A4D9DC 80240FBC 00000000 */ nop -/* A4D9E0 80240FC0 0260202D */ daddu $a0, $s3, $zero -/* A4D9E4 80240FC4 8E250024 */ lw $a1, 0x24($s1) -/* A4D9E8 80240FC8 8E260028 */ lw $a2, 0x28($s1) -/* A4D9EC 80240FCC 0C090028 */ jal func_802400A0 -/* A4D9F0 80240FD0 0280382D */ daddu $a3, $s4, $zero -/* A4D9F4 80240FD4 0040882D */ daddu $s1, $v0, $zero -/* A4D9F8 80240FD8 24020001 */ addiu $v0, $zero, 1 -/* A4D9FC 80240FDC 1222001D */ beq $s1, $v0, .L80241054 -/* A4DA00 80240FE0 0200282D */ daddu $a1, $s0, $zero -/* A4DA04 80240FE4 24040002 */ addiu $a0, $zero, 2 -/* A4DA08 80240FE8 0000302D */ daddu $a2, $zero, $zero -/* A4DA0C 80240FEC 860300A8 */ lh $v1, 0xa8($s0) -/* A4DA10 80240FF0 3C013F80 */ lui $at, 0x3f80 -/* A4DA14 80240FF4 44810000 */ mtc1 $at, $f0 -/* A4DA18 80240FF8 3C014000 */ lui $at, 0x4000 -/* A4DA1C 80240FFC 44811000 */ mtc1 $at, $f2 -/* A4DA20 80241000 3C01C1A0 */ lui $at, 0xc1a0 -/* A4DA24 80241004 44812000 */ mtc1 $at, $f4 -/* A4DA28 80241008 2402000C */ addiu $v0, $zero, 0xc -/* A4DA2C 8024100C AFA2001C */ sw $v0, 0x1c($sp) -/* A4DA30 80241010 44833000 */ mtc1 $v1, $f6 -/* A4DA34 80241014 00000000 */ nop -/* A4DA38 80241018 468031A0 */ cvt.s.w $f6, $f6 -/* A4DA3C 8024101C 44073000 */ mfc1 $a3, $f6 -/* A4DA40 80241020 27A20028 */ addiu $v0, $sp, 0x28 -/* A4DA44 80241024 AFA20020 */ sw $v0, 0x20($sp) -/* A4DA48 80241028 E7A00010 */ swc1 $f0, 0x10($sp) -/* A4DA4C 8024102C E7A20014 */ swc1 $f2, 0x14($sp) -/* A4DA50 80241030 0C01BFA4 */ jal fx_emote -/* A4DA54 80241034 E7A40018 */ swc1 $f4, 0x18($sp) -/* A4DA58 80241038 8E4200CC */ lw $v0, 0xcc($s2) -/* A4DA5C 8024103C 8C430000 */ lw $v1, ($v0) -/* A4DA60 80241040 2402000F */ addiu $v0, $zero, 0xf -/* A4DA64 80241044 A602008E */ sh $v0, 0x8e($s0) -/* A4DA68 80241048 AE030028 */ sw $v1, 0x28($s0) -/* A4DA6C 8024104C 08090421 */ j .L80241084 -/* A4DA70 80241050 AE600070 */ sw $zero, 0x70($s3) -.L80241054: -/* A4DA74 80241054 0200202D */ daddu $a0, $s0, $zero -/* A4DA78 80241058 240520D5 */ addiu $a1, $zero, 0x20d5 -/* A4DA7C 8024105C 0C012530 */ jal func_800494C0 -/* A4DA80 80241060 0000302D */ daddu $a2, $zero, $zero -/* A4DA84 80241064 86440008 */ lh $a0, 8($s2) -/* A4DA88 80241068 0C00FB3A */ jal get_enemy -/* A4DA8C 8024106C 24840001 */ addiu $a0, $a0, 1 -/* A4DA90 80241070 AC51006C */ sw $s1, 0x6c($v0) -/* A4DA94 80241074 24020014 */ addiu $v0, $zero, 0x14 -/* A4DA98 80241078 A602008E */ sh $v0, 0x8e($s0) -/* A4DA9C 8024107C 24020018 */ addiu $v0, $zero, 0x18 -/* A4DAA0 80241080 AE620070 */ sw $v0, 0x70($s3) -.L80241084: -/* A4DAA4 80241084 8FBF0044 */ lw $ra, 0x44($sp) -/* A4DAA8 80241088 8FB40040 */ lw $s4, 0x40($sp) -/* A4DAAC 8024108C 8FB3003C */ lw $s3, 0x3c($sp) -/* A4DAB0 80241090 8FB20038 */ lw $s2, 0x38($sp) -/* A4DAB4 80241094 8FB10034 */ lw $s1, 0x34($sp) -/* A4DAB8 80241098 8FB00030 */ lw $s0, 0x30($sp) -/* A4DABC 8024109C 03E00008 */ jr $ra -/* A4DAC0 802410A0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/func_802410A4_A4CA20.s b/asm/nonmatchings/world/area_kpa/kpa_08/func_802410A4_A4CA20.s deleted file mode 100644 index f4b08fe0df..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/func_802410A4_A4CA20.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410A4_A4DAC4 -/* A4DAC4 802410A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4DAC8 802410A8 AFB10014 */ sw $s1, 0x14($sp) -/* A4DACC 802410AC 0080882D */ daddu $s1, $a0, $zero -/* A4DAD0 802410B0 AFBF0018 */ sw $ra, 0x18($sp) -/* A4DAD4 802410B4 AFB00010 */ sw $s0, 0x10($sp) -/* A4DAD8 802410B8 8E300148 */ lw $s0, 0x148($s1) -/* A4DADC 802410BC 0C00EABB */ jal get_npc_unsafe -/* A4DAE0 802410C0 86040008 */ lh $a0, 8($s0) -/* A4DAE4 802410C4 0040202D */ daddu $a0, $v0, $zero -/* A4DAE8 802410C8 9482008E */ lhu $v0, 0x8e($a0) -/* A4DAEC 802410CC 2442FFFF */ addiu $v0, $v0, -1 -/* A4DAF0 802410D0 A482008E */ sh $v0, 0x8e($a0) -/* A4DAF4 802410D4 00021400 */ sll $v0, $v0, 0x10 -/* A4DAF8 802410D8 1C400007 */ bgtz $v0, .L802410F8 -/* A4DAFC 802410DC 00000000 */ nop -/* A4DB00 802410E0 8E0200CC */ lw $v0, 0xcc($s0) -/* A4DB04 802410E4 8C430000 */ lw $v1, ($v0) -/* A4DB08 802410E8 24020003 */ addiu $v0, $zero, 3 -/* A4DB0C 802410EC A482008E */ sh $v0, 0x8e($a0) -/* A4DB10 802410F0 AC830028 */ sw $v1, 0x28($a0) -/* A4DB14 802410F4 AE200070 */ sw $zero, 0x70($s1) -.L802410F8: -/* A4DB18 802410F8 8FBF0018 */ lw $ra, 0x18($sp) -/* A4DB1C 802410FC 8FB10014 */ lw $s1, 0x14($sp) -/* A4DB20 80241100 8FB00010 */ lw $s0, 0x10($sp) -/* A4DB24 80241104 03E00008 */ jr $ra -/* A4DB28 80241108 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/func_80241454_A4CA20.s b/asm/nonmatchings/world/area_kpa/kpa_08/func_80241454_A4CA20.s deleted file mode 100644 index 17f25ae5fc..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/func_80241454_A4CA20.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241454_A4DE74 -/* A4DE74 80241454 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A4DE78 80241458 AFBF0014 */ sw $ra, 0x14($sp) -/* A4DE7C 8024145C AFB00010 */ sw $s0, 0x10($sp) -/* A4DE80 80241460 8C900148 */ lw $s0, 0x148($a0) -/* A4DE84 80241464 0C00EABB */ jal get_npc_unsafe -/* A4DE88 80241468 86040008 */ lh $a0, 8($s0) -/* A4DE8C 8024146C 0040202D */ daddu $a0, $v0, $zero -/* A4DE90 80241470 8E03006C */ lw $v1, 0x6c($s0) -/* A4DE94 80241474 24020002 */ addiu $v0, $zero, 2 -/* A4DE98 80241478 14620003 */ bne $v1, $v0, .L80241488 -/* A4DE9C 8024147C 00000000 */ nop -/* A4DEA0 80241480 AC80001C */ sw $zero, 0x1c($a0) -/* A4DEA4 80241484 AC800018 */ sw $zero, 0x18($a0) -.L80241488: -/* A4DEA8 80241488 8FBF0014 */ lw $ra, 0x14($sp) -/* A4DEAC 8024148C 8FB00010 */ lw $s0, 0x10($sp) -/* A4DEB0 80241490 24020002 */ addiu $v0, $zero, 2 -/* A4DEB4 80241494 03E00008 */ jr $ra -/* A4DEB8 80241498 27BD0018 */ addiu $sp, $sp, 0x18 -/* A4DEBC 8024149C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/func_8024001C_A4F000.s b/asm/nonmatchings/world/area_kpa/kpa_09/func_8024001C_A4F000.s deleted file mode 100644 index e88681baa6..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/func_8024001C_A4F000.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_A4F01C -/* A4F01C 8024001C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4F020 80240020 AFB10014 */ sw $s1, 0x14($sp) -/* A4F024 80240024 0080882D */ daddu $s1, $a0, $zero -/* A4F028 80240028 AFBF0018 */ sw $ra, 0x18($sp) -/* A4F02C 8024002C AFB00010 */ sw $s0, 0x10($sp) -/* A4F030 80240030 8E30000C */ lw $s0, 0xc($s1) -/* A4F034 80240034 8E050000 */ lw $a1, ($s0) -/* A4F038 80240038 0C0B1EAF */ jal get_variable -/* A4F03C 8024003C 26100004 */ addiu $s0, $s0, 4 -/* A4F040 80240040 0220202D */ daddu $a0, $s1, $zero -/* A4F044 80240044 8E050000 */ lw $a1, ($s0) -/* A4F048 80240048 0C0B1EAF */ jal get_variable -/* A4F04C 8024004C 0040802D */ daddu $s0, $v0, $zero -/* A4F050 80240050 0040182D */ daddu $v1, $v0, $zero -/* A4F054 80240054 3C028016 */ lui $v0, 0x8016 -/* A4F058 80240058 8442A552 */ lh $v0, -0x5aae($v0) -/* A4F05C 8024005C 16020009 */ bne $s0, $v0, .L80240084 -/* A4F060 80240060 00000000 */ nop -/* A4F064 80240064 8E220084 */ lw $v0, 0x84($s1) -/* A4F068 80240068 00431021 */ addu $v0, $v0, $v1 -/* A4F06C 8024006C 44820000 */ mtc1 $v0, $f0 -/* A4F070 80240070 00000000 */ nop -/* A4F074 80240074 46800020 */ cvt.s.w $f0, $f0 -/* A4F078 80240078 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* A4F07C 8024007C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* A4F080 80240080 E440002C */ swc1 $f0, 0x2c($v0) -.L80240084: -/* A4F084 80240084 8FBF0018 */ lw $ra, 0x18($sp) -/* A4F088 80240088 8FB10014 */ lw $s1, 0x14($sp) -/* A4F08C 8024008C 8FB00010 */ lw $s0, 0x10($sp) -/* A4F090 80240090 24020002 */ addiu $v0, $zero, 2 -/* A4F094 80240094 03E00008 */ jr $ra -/* A4F098 80240098 27BD0020 */ addiu $sp, $sp, 0x20 -/* A4F09C 8024009C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/func_802400A0_A4F000.s b/asm/nonmatchings/world/area_kpa/kpa_09/func_802400A0_A4F000.s deleted file mode 100644 index 54b7613332..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/func_802400A0_A4F000.s +++ /dev/null @@ -1,134 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400A0_A4F0A0 -/* A4F0A0 802400A0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A4F0A4 802400A4 AFB10014 */ sw $s1, 0x14($sp) -/* A4F0A8 802400A8 0080882D */ daddu $s1, $a0, $zero -/* A4F0AC 802400AC 3C05800B */ lui $a1, %hi(gCameras) -/* A4F0B0 802400B0 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A4F0B4 802400B4 AFBF0020 */ sw $ra, 0x20($sp) -/* A4F0B8 802400B8 AFB3001C */ sw $s3, 0x1c($sp) -/* A4F0BC 802400BC AFB20018 */ sw $s2, 0x18($sp) -/* A4F0C0 802400C0 AFB00010 */ sw $s0, 0x10($sp) -/* A4F0C4 802400C4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A4F0C8 802400C8 8E330148 */ lw $s3, 0x148($s1) -/* A4F0CC 802400CC 3C03800A */ lui $v1, 0x800a -/* A4F0D0 802400D0 8463A634 */ lh $v1, -0x59cc($v1) -/* A4F0D4 802400D4 8E30000C */ lw $s0, 0xc($s1) -/* A4F0D8 802400D8 00031080 */ sll $v0, $v1, 2 -/* A4F0DC 802400DC 00431021 */ addu $v0, $v0, $v1 -/* A4F0E0 802400E0 00021080 */ sll $v0, $v0, 2 -/* A4F0E4 802400E4 00431023 */ subu $v0, $v0, $v1 -/* A4F0E8 802400E8 000218C0 */ sll $v1, $v0, 3 -/* A4F0EC 802400EC 00431021 */ addu $v0, $v0, $v1 -/* A4F0F0 802400F0 000210C0 */ sll $v0, $v0, 3 -/* A4F0F4 802400F4 86640008 */ lh $a0, 8($s3) -/* A4F0F8 802400F8 0C00EABB */ jal get_npc_unsafe -/* A4F0FC 802400FC 00459021 */ addu $s2, $v0, $a1 -/* A4F100 80240100 0220202D */ daddu $a0, $s1, $zero -/* A4F104 80240104 8E050000 */ lw $a1, ($s0) -/* A4F108 80240108 0C0B1EAF */ jal get_variable -/* A4F10C 8024010C 0040802D */ daddu $s0, $v0, $zero -/* A4F110 80240110 0260202D */ daddu $a0, $s3, $zero -/* A4F114 80240114 8C460024 */ lw $a2, 0x24($v0) -/* A4F118 80240118 8C470028 */ lw $a3, 0x28($v0) -/* A4F11C 8024011C 0C0124FB */ jal func_800493EC -/* A4F120 80240120 0000282D */ daddu $a1, $zero, $zero -/* A4F124 80240124 10400052 */ beqz $v0, .L80240270 -/* A4F128 80240128 2402FFFF */ addiu $v0, $zero, -1 -/* A4F12C 8024012C C64C006C */ lwc1 $f12, 0x6c($s2) -/* A4F130 80240130 C60E000C */ lwc1 $f14, 0xc($s0) -/* A4F134 80240134 3C014387 */ lui $at, 0x4387 -/* A4F138 80240138 4481A000 */ mtc1 $at, $f20 -/* A4F13C 8024013C 0C00A70A */ jal get_clamped_angle_diff -/* A4F140 80240140 00000000 */ nop -/* A4F144 80240144 0C00A6C9 */ jal clamp_angle -/* A4F148 80240148 46000306 */ mov.s $f12, $f0 -/* A4F14C 8024014C 3C018024 */ lui $at, 0x8024 -/* A4F150 80240150 D42227C0 */ ldc1 $f2, 0x27c0($at) -/* A4F154 80240154 46000021 */ cvt.d.s $f0, $f0 -/* A4F158 80240158 4622003C */ c.lt.d $f0, $f2 -/* A4F15C 8024015C 00000000 */ nop -/* A4F160 80240160 45000003 */ bc1f .L80240170 -/* A4F164 80240164 00000000 */ nop -/* A4F168 80240168 3C0142B4 */ lui $at, 0x42b4 -/* A4F16C 8024016C 4481A000 */ mtc1 $at, $f20 -.L80240170: -/* A4F170 80240170 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* A4F174 80240174 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* A4F178 80240178 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A4F17C 8024017C 8E220000 */ lw $v0, ($s1) -/* A4F180 80240180 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A4F184 80240184 8C460028 */ lw $a2, 0x28($v0) -/* A4F188 80240188 0C00A720 */ jal atan2 -/* A4F18C 8024018C 8C470030 */ lw $a3, 0x30($v0) -/* A4F190 80240190 4600A306 */ mov.s $f12, $f20 -/* A4F194 80240194 0C00A70A */ jal get_clamped_angle_diff -/* A4F198 80240198 46000386 */ mov.s $f14, $f0 -/* A4F19C 8024019C 46000005 */ abs.s $f0, $f0 -/* A4F1A0 802401A0 3C018024 */ lui $at, 0x8024 -/* A4F1A4 802401A4 D42227C8 */ ldc1 $f2, 0x27c8($at) -/* A4F1A8 802401A8 46000021 */ cvt.d.s $f0, $f0 -/* A4F1AC 802401AC 4620103C */ c.lt.d $f2, $f0 -/* A4F1B0 802401B0 00000000 */ nop -/* A4F1B4 802401B4 4501002E */ bc1t .L80240270 -/* A4F1B8 802401B8 2402FFFF */ addiu $v0, $zero, -1 -/* A4F1BC 802401BC 8E220000 */ lw $v0, ($s1) -/* A4F1C0 802401C0 C600003C */ lwc1 $f0, 0x3c($s0) -/* A4F1C4 802401C4 C442002C */ lwc1 $f2, 0x2c($v0) -/* A4F1C8 802401C8 860200A8 */ lh $v0, 0xa8($s0) -/* A4F1CC 802401CC 46020001 */ sub.s $f0, $f0, $f2 -/* A4F1D0 802401D0 44821000 */ mtc1 $v0, $f2 -/* A4F1D4 802401D4 00000000 */ nop -/* A4F1D8 802401D8 468010A1 */ cvt.d.w $f2, $f2 -/* A4F1DC 802401DC 46221080 */ add.d $f2, $f2, $f2 -/* A4F1E0 802401E0 46000005 */ abs.s $f0, $f0 -/* A4F1E4 802401E4 46000021 */ cvt.d.s $f0, $f0 -/* A4F1E8 802401E8 4620103E */ c.le.d $f2, $f0 -/* A4F1EC 802401EC 00000000 */ nop -/* A4F1F0 802401F0 4501001F */ bc1t .L80240270 -/* A4F1F4 802401F4 2402FFFF */ addiu $v0, $zero, -1 -/* A4F1F8 802401F8 3C038011 */ lui $v1, 0x8011 -/* A4F1FC 802401FC 8063EBB3 */ lb $v1, -0x144d($v1) -/* A4F200 80240200 24020009 */ addiu $v0, $zero, 9 -/* A4F204 80240204 10620019 */ beq $v1, $v0, .L8024026C -/* A4F208 80240208 24020007 */ addiu $v0, $zero, 7 -/* A4F20C 8024020C 14620005 */ bne $v1, $v0, .L80240224 -/* A4F210 80240210 2402FFFF */ addiu $v0, $zero, -1 -/* A4F214 80240214 0809009C */ j .L80240270 -/* A4F218 80240218 00000000 */ nop -.L8024021C: -/* A4F21C 8024021C 0809009C */ j .L80240270 -/* A4F220 80240220 0240102D */ daddu $v0, $s2, $zero -.L80240224: -/* A4F224 80240224 8E620078 */ lw $v0, 0x78($s3) -/* A4F228 80240228 18400010 */ blez $v0, .L8024026C -/* A4F22C 8024022C 0000882D */ daddu $s1, $zero, $zero -.L80240230: -/* A4F230 80240230 86620008 */ lh $v0, 8($s3) -/* A4F234 80240234 00511021 */ addu $v0, $v0, $s1 -/* A4F238 80240238 24520001 */ addiu $s2, $v0, 1 -/* A4F23C 8024023C 0C00FB3A */ jal get_enemy -/* A4F240 80240240 0240202D */ daddu $a0, $s2, $zero -/* A4F244 80240244 0240202D */ daddu $a0, $s2, $zero -/* A4F248 80240248 0C00EABB */ jal get_npc_unsafe -/* A4F24C 8024024C 0040802D */ daddu $s0, $v0, $zero -/* A4F250 80240250 8E02006C */ lw $v0, 0x6c($s0) -/* A4F254 80240254 1040FFF1 */ beqz $v0, .L8024021C -/* A4F258 80240258 26310001 */ addiu $s1, $s1, 1 -/* A4F25C 8024025C 8E620078 */ lw $v0, 0x78($s3) -/* A4F260 80240260 0222102A */ slt $v0, $s1, $v0 -/* A4F264 80240264 1440FFF2 */ bnez $v0, .L80240230 -/* A4F268 80240268 00000000 */ nop -.L8024026C: -/* A4F26C 8024026C 2402FFFF */ addiu $v0, $zero, -1 -.L80240270: -/* A4F270 80240270 8FBF0020 */ lw $ra, 0x20($sp) -/* A4F274 80240274 8FB3001C */ lw $s3, 0x1c($sp) -/* A4F278 80240278 8FB20018 */ lw $s2, 0x18($sp) -/* A4F27C 8024027C 8FB10014 */ lw $s1, 0x14($sp) -/* A4F280 80240280 8FB00010 */ lw $s0, 0x10($sp) -/* A4F284 80240284 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A4F288 80240288 03E00008 */ jr $ra -/* A4F28C 8024028C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/func_80240290_A4F000.s b/asm/nonmatchings/world/area_kpa/kpa_09/func_80240290_A4F000.s deleted file mode 100644 index 7c47dc2e85..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/func_80240290_A4F000.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240290_A4F290 -/* A4F290 80240290 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A4F294 80240294 AFB20038 */ sw $s2, 0x38($sp) -/* A4F298 80240298 0080902D */ daddu $s2, $a0, $zero -/* A4F29C 8024029C AFB00030 */ sw $s0, 0x30($sp) -/* A4F2A0 802402A0 AFBF003C */ sw $ra, 0x3c($sp) -/* A4F2A4 802402A4 AFB10034 */ sw $s1, 0x34($sp) -/* A4F2A8 802402A8 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A4F2AC 802402AC F7B40040 */ sdc1 $f20, 0x40($sp) -/* A4F2B0 802402B0 8E510148 */ lw $s1, 0x148($s2) -/* A4F2B4 802402B4 4485A000 */ mtc1 $a1, $f20 -/* A4F2B8 802402B8 86240008 */ lh $a0, 8($s1) -/* A4F2BC 802402BC 4486B000 */ mtc1 $a2, $f22 -/* A4F2C0 802402C0 0C00EABB */ jal get_npc_unsafe -/* A4F2C4 802402C4 00E0802D */ daddu $s0, $a3, $zero -/* A4F2C8 802402C8 0200202D */ daddu $a0, $s0, $zero -/* A4F2CC 802402CC 0220282D */ daddu $a1, $s1, $zero -/* A4F2D0 802402D0 24030001 */ addiu $v1, $zero, 1 -/* A4F2D4 802402D4 4406A000 */ mfc1 $a2, $f20 -/* A4F2D8 802402D8 4407B000 */ mfc1 $a3, $f22 -/* A4F2DC 802402DC 0040802D */ daddu $s0, $v0, $zero -/* A4F2E0 802402E0 0C01242D */ jal func_800490B4 -/* A4F2E4 802402E4 AFA30010 */ sw $v1, 0x10($sp) -/* A4F2E8 802402E8 1440001D */ bnez $v0, .L80240360 -/* A4F2EC 802402EC 24040002 */ addiu $a0, $zero, 2 -/* A4F2F0 802402F0 0200282D */ daddu $a1, $s0, $zero -/* A4F2F4 802402F4 0000302D */ daddu $a2, $zero, $zero -/* A4F2F8 802402F8 860300A8 */ lh $v1, 0xa8($s0) -/* A4F2FC 802402FC 3C013F80 */ lui $at, 0x3f80 -/* A4F300 80240300 44810000 */ mtc1 $at, $f0 -/* A4F304 80240304 3C014000 */ lui $at, 0x4000 -/* A4F308 80240308 44811000 */ mtc1 $at, $f2 -/* A4F30C 8024030C 3C01C1A0 */ lui $at, 0xc1a0 -/* A4F310 80240310 44812000 */ mtc1 $at, $f4 -/* A4F314 80240314 2402000F */ addiu $v0, $zero, 0xf -/* A4F318 80240318 AFA2001C */ sw $v0, 0x1c($sp) -/* A4F31C 8024031C 44833000 */ mtc1 $v1, $f6 -/* A4F320 80240320 00000000 */ nop -/* A4F324 80240324 468031A0 */ cvt.s.w $f6, $f6 -/* A4F328 80240328 44073000 */ mfc1 $a3, $f6 -/* A4F32C 8024032C 27A20028 */ addiu $v0, $sp, 0x28 -/* A4F330 80240330 AFA20020 */ sw $v0, 0x20($sp) -/* A4F334 80240334 E7A00010 */ swc1 $f0, 0x10($sp) -/* A4F338 80240338 E7A20014 */ swc1 $f2, 0x14($sp) -/* A4F33C 8024033C 0C01BFA4 */ jal fx_emote -/* A4F340 80240340 E7A40018 */ swc1 $f4, 0x18($sp) -/* A4F344 80240344 8E2200CC */ lw $v0, 0xcc($s1) -/* A4F348 80240348 8C430000 */ lw $v1, ($v0) -/* A4F34C 8024034C 24020014 */ addiu $v0, $zero, 0x14 -/* A4F350 80240350 A602008E */ sh $v0, 0x8e($s0) -/* A4F354 80240354 24020021 */ addiu $v0, $zero, 0x21 -/* A4F358 80240358 080900EC */ j .L802403B0 -/* A4F35C 8024035C AE030028 */ sw $v1, 0x28($s0) -.L80240360: -/* A4F360 80240360 0C090028 */ jal func_802400A0 -/* A4F364 80240364 0240202D */ daddu $a0, $s2, $zero -/* A4F368 80240368 0040202D */ daddu $a0, $v0, $zero -/* A4F36C 8024036C 2402FFFF */ addiu $v0, $zero, -1 -/* A4F370 80240370 10820010 */ beq $a0, $v0, .L802403B4 -/* A4F374 80240374 00000000 */ nop -/* A4F378 80240378 0C00FB3A */ jal get_enemy -/* A4F37C 8024037C 00000000 */ nop -/* A4F380 80240380 8C42006C */ lw $v0, 0x6c($v0) -/* A4F384 80240384 1440000B */ bnez $v0, .L802403B4 -/* A4F388 80240388 00000000 */ nop -/* A4F38C 8024038C 8602008C */ lh $v0, 0x8c($s0) -/* A4F390 80240390 14400008 */ bnez $v0, .L802403B4 -/* A4F394 80240394 00000000 */ nop -/* A4F398 80240398 8E2200CC */ lw $v0, 0xcc($s1) -/* A4F39C 8024039C 8C420020 */ lw $v0, 0x20($v0) -/* A4F3A0 802403A0 AE020028 */ sw $v0, 0x28($s0) -/* A4F3A4 802403A4 96220072 */ lhu $v0, 0x72($s1) -/* A4F3A8 802403A8 A602008E */ sh $v0, 0x8e($s0) -/* A4F3AC 802403AC 2402001E */ addiu $v0, $zero, 0x1e -.L802403B0: -/* A4F3B0 802403B0 AE420070 */ sw $v0, 0x70($s2) -.L802403B4: -/* A4F3B4 802403B4 8FBF003C */ lw $ra, 0x3c($sp) -/* A4F3B8 802403B8 8FB20038 */ lw $s2, 0x38($sp) -/* A4F3BC 802403BC 8FB10034 */ lw $s1, 0x34($sp) -/* A4F3C0 802403C0 8FB00030 */ lw $s0, 0x30($sp) -/* A4F3C4 802403C4 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A4F3C8 802403C8 D7B40040 */ ldc1 $f20, 0x40($sp) -/* A4F3CC 802403CC 03E00008 */ jr $ra -/* A4F3D0 802403D0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/func_802403D4_A4F000.s b/asm/nonmatchings/world/area_kpa/kpa_09/func_802403D4_A4F000.s deleted file mode 100644 index 8c8a76d085..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/func_802403D4_A4F000.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403D4_A4F3D4 -/* A4F3D4 802403D4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A4F3D8 802403D8 AFB20038 */ sw $s2, 0x38($sp) -/* A4F3DC 802403DC 0080902D */ daddu $s2, $a0, $zero -/* A4F3E0 802403E0 AFBF003C */ sw $ra, 0x3c($sp) -/* A4F3E4 802403E4 AFB10034 */ sw $s1, 0x34($sp) -/* A4F3E8 802403E8 AFB00030 */ sw $s0, 0x30($sp) -/* A4F3EC 802403EC 8E510148 */ lw $s1, 0x148($s2) -/* A4F3F0 802403F0 0C00EABB */ jal get_npc_unsafe -/* A4F3F4 802403F4 86240008 */ lh $a0, 8($s1) -/* A4F3F8 802403F8 0040802D */ daddu $s0, $v0, $zero -/* A4F3FC 802403FC 9602008E */ lhu $v0, 0x8e($s0) -/* A4F400 80240400 2442FFFF */ addiu $v0, $v0, -1 -/* A4F404 80240404 A602008E */ sh $v0, 0x8e($s0) -/* A4F408 80240408 00021400 */ sll $v0, $v0, 0x10 -/* A4F40C 8024040C 1C40002B */ bgtz $v0, .L802404BC -/* A4F410 80240410 00000000 */ nop -/* A4F414 80240414 0C090028 */ jal func_802400A0 -/* A4F418 80240418 0240202D */ daddu $a0, $s2, $zero -/* A4F41C 8024041C 0040202D */ daddu $a0, $v0, $zero -/* A4F420 80240420 0481001A */ bgez $a0, .L8024048C -/* A4F424 80240424 2402000F */ addiu $v0, $zero, 0xf -/* A4F428 80240428 24040002 */ addiu $a0, $zero, 2 -/* A4F42C 8024042C 860300A8 */ lh $v1, 0xa8($s0) -/* A4F430 80240430 AFA2001C */ sw $v0, 0x1c($sp) -/* A4F434 80240434 27A20028 */ addiu $v0, $sp, 0x28 -/* A4F438 80240438 0200282D */ daddu $a1, $s0, $zero -/* A4F43C 8024043C 3C013F80 */ lui $at, 0x3f80 -/* A4F440 80240440 44810000 */ mtc1 $at, $f0 -/* A4F444 80240444 3C014000 */ lui $at, 0x4000 -/* A4F448 80240448 44811000 */ mtc1 $at, $f2 -/* A4F44C 8024044C 3C01C1A0 */ lui $at, 0xc1a0 -/* A4F450 80240450 44812000 */ mtc1 $at, $f4 -/* A4F454 80240454 44833000 */ mtc1 $v1, $f6 -/* A4F458 80240458 00000000 */ nop -/* A4F45C 8024045C 468031A0 */ cvt.s.w $f6, $f6 -/* A4F460 80240460 44073000 */ mfc1 $a3, $f6 -/* A4F464 80240464 0000302D */ daddu $a2, $zero, $zero -/* A4F468 80240468 AFA20020 */ sw $v0, 0x20($sp) -/* A4F46C 8024046C E7A00010 */ swc1 $f0, 0x10($sp) -/* A4F470 80240470 E7A20014 */ swc1 $f2, 0x14($sp) -/* A4F474 80240474 0C01BFA4 */ jal fx_emote -/* A4F478 80240478 E7A40018 */ swc1 $f4, 0x18($sp) -/* A4F47C 8024047C 8E2200CC */ lw $v0, 0xcc($s1) -/* A4F480 80240480 8C420000 */ lw $v0, ($v0) -/* A4F484 80240484 0809012B */ j .L802404AC -/* A4F488 80240488 AE020028 */ sw $v0, 0x28($s0) -.L8024048C: -/* A4F48C 8024048C 8E2200CC */ lw $v0, 0xcc($s1) -/* A4F490 80240490 8C420024 */ lw $v0, 0x24($v0) -/* A4F494 80240494 0C00FB3A */ jal get_enemy -/* A4F498 80240498 AE020028 */ sw $v0, 0x28($s0) -/* A4F49C 8024049C 86240008 */ lh $a0, 8($s1) -/* A4F4A0 802404A0 24030001 */ addiu $v1, $zero, 1 -/* A4F4A4 802404A4 AC43006C */ sw $v1, 0x6c($v0) -/* A4F4A8 802404A8 AC44007C */ sw $a0, 0x7c($v0) -.L802404AC: -/* A4F4AC 802404AC 96220076 */ lhu $v0, 0x76($s1) -/* A4F4B0 802404B0 A602008E */ sh $v0, 0x8e($s0) -/* A4F4B4 802404B4 24020021 */ addiu $v0, $zero, 0x21 -/* A4F4B8 802404B8 AE420070 */ sw $v0, 0x70($s2) -.L802404BC: -/* A4F4BC 802404BC 8FBF003C */ lw $ra, 0x3c($sp) -/* A4F4C0 802404C0 8FB20038 */ lw $s2, 0x38($sp) -/* A4F4C4 802404C4 8FB10034 */ lw $s1, 0x34($sp) -/* A4F4C8 802404C8 8FB00030 */ lw $s0, 0x30($sp) -/* A4F4CC 802404CC 03E00008 */ jr $ra -/* A4F4D0 802404D0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/func_802404D4_A4F000.s b/asm/nonmatchings/world/area_kpa/kpa_09/func_802404D4_A4F000.s deleted file mode 100644 index f7fa132325..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/func_802404D4_A4F000.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404D4_A4F4D4 -/* A4F4D4 802404D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4F4D8 802404D8 AFB10014 */ sw $s1, 0x14($sp) -/* A4F4DC 802404DC 0080882D */ daddu $s1, $a0, $zero -/* A4F4E0 802404E0 AFBF0018 */ sw $ra, 0x18($sp) -/* A4F4E4 802404E4 AFB00010 */ sw $s0, 0x10($sp) -/* A4F4E8 802404E8 8E300148 */ lw $s0, 0x148($s1) -/* A4F4EC 802404EC 0C00EABB */ jal get_npc_unsafe -/* A4F4F0 802404F0 86040008 */ lh $a0, 8($s0) -/* A4F4F4 802404F4 96030076 */ lhu $v1, 0x76($s0) -/* A4F4F8 802404F8 A443008E */ sh $v1, 0x8e($v0) -/* A4F4FC 802404FC 24020021 */ addiu $v0, $zero, 0x21 -/* A4F500 80240500 AE220070 */ sw $v0, 0x70($s1) -/* A4F504 80240504 8FBF0018 */ lw $ra, 0x18($sp) -/* A4F508 80240508 8FB10014 */ lw $s1, 0x14($sp) -/* A4F50C 8024050C 8FB00010 */ lw $s0, 0x10($sp) -/* A4F510 80240510 03E00008 */ jr $ra -/* A4F514 80240514 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/func_802405FC_A4F000.s b/asm/nonmatchings/world/area_kpa/kpa_09/func_802405FC_A4F000.s deleted file mode 100644 index 28a383930b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/func_802405FC_A4F000.s +++ /dev/null @@ -1,354 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405FC_A4F5FC -/* A4F5FC 802405FC 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A4F600 80240600 AFB7004C */ sw $s7, 0x4c($sp) -/* A4F604 80240604 0080B82D */ daddu $s7, $a0, $zero -/* A4F608 80240608 AFB10034 */ sw $s1, 0x34($sp) -/* A4F60C 8024060C 00A0882D */ daddu $s1, $a1, $zero -/* A4F610 80240610 AFBF0050 */ sw $ra, 0x50($sp) -/* A4F614 80240614 AFB60048 */ sw $s6, 0x48($sp) -/* A4F618 80240618 AFB50044 */ sw $s5, 0x44($sp) -/* A4F61C 8024061C AFB40040 */ sw $s4, 0x40($sp) -/* A4F620 80240620 AFB3003C */ sw $s3, 0x3c($sp) -/* A4F624 80240624 AFB20038 */ sw $s2, 0x38($sp) -/* A4F628 80240628 AFB00030 */ sw $s0, 0x30($sp) -/* A4F62C 8024062C 8EF30148 */ lw $s3, 0x148($s7) -/* A4F630 80240630 86640008 */ lh $a0, 8($s3) -/* A4F634 80240634 8EF0000C */ lw $s0, 0xc($s7) -/* A4F638 80240638 0C00FB5A */ jal get_enemy_safe -/* A4F63C 8024063C 0000B02D */ daddu $s6, $zero, $zero -/* A4F640 80240640 10400131 */ beqz $v0, .L80240B08 -/* A4F644 80240644 24020005 */ addiu $v0, $zero, 5 -/* A4F648 80240648 8E63006C */ lw $v1, 0x6c($s3) -/* A4F64C 8024064C 1062012F */ beq $v1, $v0, .L80240B0C -/* A4F650 80240650 0000102D */ daddu $v0, $zero, $zero -/* A4F654 80240654 8E050000 */ lw $a1, ($s0) -/* A4F658 80240658 0C0B1EAF */ jal get_variable -/* A4F65C 8024065C 02E0202D */ daddu $a0, $s7, $zero -/* A4F660 80240660 86640008 */ lh $a0, 8($s3) -/* A4F664 80240664 0C00EABB */ jal get_npc_unsafe -/* A4F668 80240668 0040A82D */ daddu $s5, $v0, $zero -/* A4F66C 8024066C 8E630070 */ lw $v1, 0x70($s3) -/* A4F670 80240670 30630002 */ andi $v1, $v1, 2 -/* A4F674 80240674 10600008 */ beqz $v1, .L80240698 -/* A4F678 80240678 0040902D */ daddu $s2, $v0, $zero -/* A4F67C 8024067C 964200A8 */ lhu $v0, 0xa8($s2) -/* A4F680 80240680 00021400 */ sll $v0, $v0, 0x10 -/* A4F684 80240684 00021C03 */ sra $v1, $v0, 0x10 -/* A4F688 80240688 000217C2 */ srl $v0, $v0, 0x1f -/* A4F68C 8024068C 00621821 */ addu $v1, $v1, $v0 -/* A4F690 80240690 00031843 */ sra $v1, $v1, 1 -/* A4F694 80240694 A24300AB */ sb $v1, 0xab($s2) -.L80240698: -/* A4F698 80240698 16200005 */ bnez $s1, .L802406B0 -/* A4F69C 8024069C 3C030004 */ lui $v1, 4 -/* A4F6A0 802406A0 8E6200B0 */ lw $v0, 0xb0($s3) -/* A4F6A4 802406A4 30420004 */ andi $v0, $v0, 4 -/* A4F6A8 802406A8 10400019 */ beqz $v0, .L80240710 -/* A4F6AC 802406AC 00000000 */ nop -.L802406B0: -/* A4F6B0 802406B0 34630102 */ ori $v1, $v1, 0x102 -/* A4F6B4 802406B4 AEE00070 */ sw $zero, 0x70($s7) -/* A4F6B8 802406B8 8E420000 */ lw $v0, ($s2) -/* A4F6BC 802406BC 0240202D */ daddu $a0, $s2, $zero -/* A4F6C0 802406C0 A640008E */ sh $zero, 0x8e($s2) -/* A4F6C4 802406C4 00431025 */ or $v0, $v0, $v1 -/* A4F6C8 802406C8 0C00EAFF */ jal disable_npc_shadow -/* A4F6CC 802406CC AE420000 */ sw $v0, ($s2) -/* A4F6D0 802406D0 3C041F30 */ lui $a0, 0x1f30 -/* A4F6D4 802406D4 8E420000 */ lw $v0, ($s2) -/* A4F6D8 802406D8 2403F7FF */ addiu $v1, $zero, -0x801 -/* A4F6DC 802406DC 00431024 */ and $v0, $v0, $v1 -/* A4F6E0 802406E0 AE420000 */ sw $v0, ($s2) -/* A4F6E4 802406E4 8E620000 */ lw $v0, ($s3) -/* A4F6E8 802406E8 8E6300B0 */ lw $v1, 0xb0($s3) -/* A4F6EC 802406EC 34840040 */ ori $a0, $a0, 0x40 -/* A4F6F0 802406F0 AE60006C */ sw $zero, 0x6c($s3) -/* A4F6F4 802406F4 00441025 */ or $v0, $v0, $a0 -/* A4F6F8 802406F8 AE620000 */ sw $v0, ($s3) -/* A4F6FC 802406FC 30620004 */ andi $v0, $v1, 4 -/* A4F700 80240700 10400003 */ beqz $v0, .L80240710 -/* A4F704 80240704 2402FFFB */ addiu $v0, $zero, -5 -/* A4F708 80240708 00621024 */ and $v0, $v1, $v0 -/* A4F70C 8024070C AE6200B0 */ sw $v0, 0xb0($s3) -.L80240710: -/* A4F710 80240710 8EE30070 */ lw $v1, 0x70($s7) -/* A4F714 80240714 24100001 */ addiu $s0, $zero, 1 -/* A4F718 80240718 10700012 */ beq $v1, $s0, .L80240764 -/* A4F71C 8024071C 28620002 */ slti $v0, $v1, 2 -/* A4F720 80240720 10400005 */ beqz $v0, .L80240738 -/* A4F724 80240724 24020002 */ addiu $v0, $zero, 2 -/* A4F728 80240728 10600007 */ beqz $v1, .L80240748 -/* A4F72C 8024072C 0000102D */ daddu $v0, $zero, $zero -/* A4F730 80240730 080902C3 */ j .L80240B0C -/* A4F734 80240734 00000000 */ nop -.L80240738: -/* A4F738 80240738 1062005B */ beq $v1, $v0, .L802408A8 -/* A4F73C 8024073C 0000102D */ daddu $v0, $zero, $zero -/* A4F740 80240740 080902C3 */ j .L80240B0C -/* A4F744 80240744 00000000 */ nop -.L80240748: -/* A4F748 80240748 8E420000 */ lw $v0, ($s2) -/* A4F74C 8024074C 0240202D */ daddu $a0, $s2, $zero -/* A4F750 80240750 34420002 */ ori $v0, $v0, 2 -/* A4F754 80240754 0C00EAFF */ jal disable_npc_shadow -/* A4F758 80240758 AE420000 */ sw $v0, ($s2) -/* A4F75C 8024075C AE60006C */ sw $zero, 0x6c($s3) -/* A4F760 80240760 AEF00070 */ sw $s0, 0x70($s7) -.L80240764: -/* A4F764 80240764 8E74006C */ lw $s4, 0x6c($s3) -/* A4F768 80240768 24020001 */ addiu $v0, $zero, 1 -/* A4F76C 8024076C 168200E7 */ bne $s4, $v0, .L80240B0C -/* A4F770 80240770 0000102D */ daddu $v0, $zero, $zero -/* A4F774 80240774 8E64007C */ lw $a0, 0x7c($s3) -/* A4F778 80240778 24110002 */ addiu $s1, $zero, 2 -/* A4F77C 8024077C 0C00EABB */ jal get_npc_unsafe -/* A4F780 80240780 AE71006C */ sw $s1, 0x6c($s3) -/* A4F784 80240784 0040802D */ daddu $s0, $v0, $zero -/* A4F788 80240788 C6000038 */ lwc1 $f0, 0x38($s0) -/* A4F78C 8024078C E6400038 */ swc1 $f0, 0x38($s2) -/* A4F790 80240790 C6000040 */ lwc1 $f0, 0x40($s0) -/* A4F794 80240794 E6400040 */ swc1 $f0, 0x40($s2) -/* A4F798 80240798 C6020034 */ lwc1 $f2, 0x34($s0) -/* A4F79C 8024079C 3C014387 */ lui $at, 0x4387 -/* A4F7A0 802407A0 44810000 */ mtc1 $at, $f0 -/* A4F7A4 802407A4 26440038 */ addiu $a0, $s2, 0x38 -/* A4F7A8 802407A8 46020001 */ sub.s $f0, $f0, $f2 -/* A4F7AC 802407AC C6680078 */ lwc1 $f8, 0x78($s3) -/* A4F7B0 802407B0 46804220 */ cvt.s.w $f8, $f8 -/* A4F7B4 802407B4 44064000 */ mfc1 $a2, $f8 -/* A4F7B8 802407B8 44070000 */ mfc1 $a3, $f0 -/* A4F7BC 802407BC 0C00A7E7 */ jal add_vec2D_polar -/* A4F7C0 802407C0 26450040 */ addiu $a1, $s2, 0x40 -/* A4F7C4 802407C4 C600003C */ lwc1 $f0, 0x3c($s0) -/* A4F7C8 802407C8 C6620074 */ lwc1 $f2, 0x74($s3) -/* A4F7CC 802407CC 468010A0 */ cvt.s.w $f2, $f2 -/* A4F7D0 802407D0 46020000 */ add.s $f0, $f0, $f2 -/* A4F7D4 802407D4 E640003C */ swc1 $f0, 0x3c($s2) -/* A4F7D8 802407D8 A2740007 */ sb $s4, 7($s3) -/* A4F7DC 802407DC C6400038 */ lwc1 $f0, 0x38($s2) -/* A4F7E0 802407E0 4600020D */ trunc.w.s $f8, $f0 -/* A4F7E4 802407E4 44024000 */ mfc1 $v0, $f8 -/* A4F7E8 802407E8 00000000 */ nop -/* A4F7EC 802407EC A6620010 */ sh $v0, 0x10($s3) -/* A4F7F0 802407F0 C640003C */ lwc1 $f0, 0x3c($s2) -/* A4F7F4 802407F4 4600020D */ trunc.w.s $f8, $f0 -/* A4F7F8 802407F8 44024000 */ mfc1 $v0, $f8 -/* A4F7FC 802407FC 00000000 */ nop -/* A4F800 80240800 A6620012 */ sh $v0, 0x12($s3) -/* A4F804 80240804 C6400040 */ lwc1 $f0, 0x40($s2) -/* A4F808 80240808 4600020D */ trunc.w.s $f8, $f0 -/* A4F80C 8024080C 44024000 */ mfc1 $v0, $f8 -/* A4F810 80240810 00000000 */ nop -/* A4F814 80240814 A6620014 */ sh $v0, 0x14($s3) -/* A4F818 80240818 AE400044 */ sw $zero, 0x44($s2) -/* A4F81C 8024081C AE400048 */ sw $zero, 0x48($s2) -/* A4F820 80240820 AE40004C */ sw $zero, 0x4c($s2) -/* A4F824 80240824 C6A00000 */ lwc1 $f0, ($s5) -/* A4F828 80240828 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A4F82C 8024082C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A4F830 80240830 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A4F834 80240834 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A4F838 80240838 E6400018 */ swc1 $f0, 0x18($s2) -/* A4F83C 8024083C 8C460028 */ lw $a2, 0x28($v0) -/* A4F840 80240840 0C00A720 */ jal atan2 -/* A4F844 80240844 8C470030 */ lw $a3, 0x30($v0) -/* A4F848 80240848 E640000C */ swc1 $f0, 0xc($s2) -/* A4F84C 8024084C C6A0000C */ lwc1 $f0, 0xc($s5) -/* A4F850 80240850 8E420000 */ lw $v0, ($s2) -/* A4F854 80240854 0240202D */ daddu $a0, $s2, $zero -/* A4F858 80240858 E640001C */ swc1 $f0, 0x1c($s2) -/* A4F85C 8024085C C6A00010 */ lwc1 $f0, 0x10($s5) -/* A4F860 80240860 2403FFFD */ addiu $v1, $zero, -3 -/* A4F864 80240864 E6400014 */ swc1 $f0, 0x14($s2) -/* A4F868 80240868 C600003C */ lwc1 $f0, 0x3c($s0) -/* A4F86C 8024086C 00431024 */ and $v0, $v0, $v1 -/* A4F870 80240870 AE420000 */ sw $v0, ($s2) -/* A4F874 80240874 0C00EAE8 */ jal enable_npc_shadow -/* A4F878 80240878 E6400064 */ swc1 $f0, 0x64($s2) -/* A4F87C 8024087C 8E420000 */ lw $v0, ($s2) -/* A4F880 80240880 3C03E0FF */ lui $v1, 0xe0ff -/* A4F884 80240884 34420800 */ ori $v0, $v0, 0x800 -/* A4F888 80240888 AE420000 */ sw $v0, ($s2) -/* A4F88C 8024088C 8E620000 */ lw $v0, ($s3) -/* A4F890 80240890 3463FFFF */ ori $v1, $v1, 0xffff -/* A4F894 80240894 00431024 */ and $v0, $v0, $v1 -/* A4F898 80240898 AE620000 */ sw $v0, ($s3) -/* A4F89C 8024089C 2402005A */ addiu $v0, $zero, 0x5a -/* A4F8A0 802408A0 A642008E */ sh $v0, 0x8e($s2) -/* A4F8A4 802408A4 AEF10070 */ sw $s1, 0x70($s7) -.L802408A8: -/* A4F8A8 802408A8 0000202D */ daddu $a0, $zero, $zero -/* A4F8AC 802408AC 27B00020 */ addiu $s0, $sp, 0x20 -/* A4F8B0 802408B0 864200A8 */ lh $v0, 0xa8($s2) -/* A4F8B4 802408B4 3C013FE0 */ lui $at, 0x3fe0 -/* A4F8B8 802408B8 44810800 */ mtc1 $at, $f1 -/* A4F8BC 802408BC 44800000 */ mtc1 $zero, $f0 -/* A4F8C0 802408C0 44821000 */ mtc1 $v0, $f2 -/* A4F8C4 802408C4 00000000 */ nop -/* A4F8C8 802408C8 468010A1 */ cvt.d.w $f2, $f2 -/* A4F8CC 802408CC 46201082 */ mul.d $f2, $f2, $f0 -/* A4F8D0 802408D0 00000000 */ nop -/* A4F8D4 802408D4 0200282D */ daddu $a1, $s0, $zero -/* A4F8D8 802408D8 C6440038 */ lwc1 $f4, 0x38($s2) -/* A4F8DC 802408DC C640003C */ lwc1 $f0, 0x3c($s2) -/* A4F8E0 802408E0 27B10024 */ addiu $s1, $sp, 0x24 -/* A4F8E4 802408E4 E7A40020 */ swc1 $f4, 0x20($sp) -/* A4F8E8 802408E8 C6440040 */ lwc1 $f4, 0x40($s2) -/* A4F8EC 802408EC 46000021 */ cvt.d.s $f0, $f0 -/* A4F8F0 802408F0 46220000 */ add.d $f0, $f0, $f2 -/* A4F8F4 802408F4 E7A40028 */ swc1 $f4, 0x28($sp) -/* A4F8F8 802408F8 C6420018 */ lwc1 $f2, 0x18($s2) -/* A4F8FC 802408FC 46200020 */ cvt.s.d $f0, $f0 -/* A4F900 80240900 E7A00024 */ swc1 $f0, 0x24($sp) -/* A4F904 80240904 E7A20010 */ swc1 $f2, 0x10($sp) -/* A4F908 80240908 C640000C */ lwc1 $f0, 0xc($s2) -/* A4F90C 8024090C 0220302D */ daddu $a2, $s1, $zero -/* A4F910 80240910 E7A00014 */ swc1 $f0, 0x14($sp) -/* A4F914 80240914 864200A6 */ lh $v0, 0xa6($s2) -/* A4F918 80240918 27B40028 */ addiu $s4, $sp, 0x28 -/* A4F91C 8024091C 44820000 */ mtc1 $v0, $f0 -/* A4F920 80240920 00000000 */ nop -/* A4F924 80240924 46800020 */ cvt.s.w $f0, $f0 -/* A4F928 80240928 E7A00018 */ swc1 $f0, 0x18($sp) -/* A4F92C 8024092C 864200A8 */ lh $v0, 0xa8($s2) -/* A4F930 80240930 0280382D */ daddu $a3, $s4, $zero -/* A4F934 80240934 44820000 */ mtc1 $v0, $f0 -/* A4F938 80240938 00000000 */ nop -/* A4F93C 8024093C 46800020 */ cvt.s.w $f0, $f0 -/* A4F940 80240940 0C0376B9 */ jal func_800DDAE4 -/* A4F944 80240944 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A4F948 80240948 54400001 */ bnel $v0, $zero, .L80240950 -/* A4F94C 8024094C 24160001 */ addiu $s6, $zero, 1 -.L80240950: -/* A4F950 80240950 0200282D */ daddu $a1, $s0, $zero -/* A4F954 80240954 0220302D */ daddu $a2, $s1, $zero -/* A4F958 80240958 C6400038 */ lwc1 $f0, 0x38($s2) -/* A4F95C 8024095C C642003C */ lwc1 $f2, 0x3c($s2) -/* A4F960 80240960 C6440040 */ lwc1 $f4, 0x40($s2) -/* A4F964 80240964 3C01447A */ lui $at, 0x447a -/* A4F968 80240968 44813000 */ mtc1 $at, $f6 -/* A4F96C 8024096C 27A2002C */ addiu $v0, $sp, 0x2c -/* A4F970 80240970 E7A00020 */ swc1 $f0, 0x20($sp) -/* A4F974 80240974 E7A20024 */ swc1 $f2, 0x24($sp) -/* A4F978 80240978 E7A40028 */ swc1 $f4, 0x28($sp) -/* A4F97C 8024097C E7A6002C */ swc1 $f6, 0x2c($sp) -/* A4F980 80240980 AFA20010 */ sw $v0, 0x10($sp) -/* A4F984 80240984 8E440080 */ lw $a0, 0x80($s2) -/* A4F988 80240988 0C0372DF */ jal func_800DCB7C -/* A4F98C 8024098C 0280382D */ daddu $a3, $s4, $zero -/* A4F990 80240990 10400019 */ beqz $v0, .L802409F8 -/* A4F994 80240994 00000000 */ nop -/* A4F998 80240998 C640001C */ lwc1 $f0, 0x1c($s2) -/* A4F99C 8024099C C7A2002C */ lwc1 $f2, 0x2c($sp) -/* A4F9A0 802409A0 46000005 */ abs.s $f0, $f0 -/* A4F9A4 802409A4 4600103C */ c.lt.s $f2, $f0 -/* A4F9A8 802409A8 00000000 */ nop -/* A4F9AC 802409AC 45000012 */ bc1f .L802409F8 -/* A4F9B0 802409B0 00000000 */ nop -/* A4F9B4 802409B4 C7A40024 */ lwc1 $f4, 0x24($sp) -/* A4F9B8 802409B8 C6400064 */ lwc1 $f0, 0x64($s2) -/* A4F9BC 802409BC 46002001 */ sub.s $f0, $f4, $f0 -/* A4F9C0 802409C0 3C014034 */ lui $at, 0x4034 -/* A4F9C4 802409C4 44811800 */ mtc1 $at, $f3 -/* A4F9C8 802409C8 44801000 */ mtc1 $zero, $f2 -/* A4F9CC 802409CC 46000005 */ abs.s $f0, $f0 -/* A4F9D0 802409D0 46000021 */ cvt.d.s $f0, $f0 -/* A4F9D4 802409D4 4622003C */ c.lt.d $f0, $f2 -/* A4F9D8 802409D8 00000000 */ nop -/* A4F9DC 802409DC 45000006 */ bc1f .L802409F8 -/* A4F9E0 802409E0 0240202D */ daddu $a0, $s2, $zero -/* A4F9E4 802409E4 8E450018 */ lw $a1, 0x18($s2) -/* A4F9E8 802409E8 8E46000C */ lw $a2, 0xc($s2) -/* A4F9EC 802409EC 2416000A */ addiu $s6, $zero, 0xa -/* A4F9F0 802409F0 0C00EA95 */ jal npc_move_heading -/* A4F9F4 802409F4 E644003C */ swc1 $f4, 0x3c($s2) -.L802409F8: -/* A4F9F8 802409F8 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A4F9FC 802409FC 3C013FF0 */ lui $at, 0x3ff0 -/* A4FA00 80240A00 44811800 */ mtc1 $at, $f3 -/* A4FA04 80240A04 44801000 */ mtc1 $zero, $f2 -/* A4FA08 80240A08 46000021 */ cvt.d.s $f0, $f0 -/* A4FA0C 80240A0C 4622003C */ c.lt.d $f0, $f2 -/* A4FA10 80240A10 00000000 */ nop -/* A4FA14 80240A14 45030001 */ bc1tl .L80240A1C -/* A4FA18 80240A18 2416000B */ addiu $s6, $zero, 0xb -.L80240A1C: -/* A4FA1C 80240A1C 9642008E */ lhu $v0, 0x8e($s2) -/* A4FA20 80240A20 2442FFFF */ addiu $v0, $v0, -1 -/* A4FA24 80240A24 A642008E */ sh $v0, 0x8e($s2) -/* A4FA28 80240A28 00021400 */ sll $v0, $v0, 0x10 -/* A4FA2C 80240A2C 58400001 */ blezl $v0, .L80240A34 -/* A4FA30 80240A30 24160014 */ addiu $s6, $zero, 0x14 -.L80240A34: -/* A4FA34 80240A34 56C00019 */ bnel $s6, $zero, .L80240A9C -/* A4FA38 80240A38 AFA00010 */ sw $zero, 0x10($sp) -/* A4FA3C 80240A3C 8E620070 */ lw $v0, 0x70($s3) -/* A4FA40 80240A40 30420001 */ andi $v0, $v0, 1 -/* A4FA44 80240A44 10400009 */ beqz $v0, .L80240A6C -/* A4FA48 80240A48 00000000 */ nop -/* A4FA4C 80240A4C C640004C */ lwc1 $f0, 0x4c($s2) -/* A4FA50 80240A50 3C014044 */ lui $at, 0x4044 -/* A4FA54 80240A54 44811800 */ mtc1 $at, $f3 -/* A4FA58 80240A58 44801000 */ mtc1 $zero, $f2 -/* A4FA5C 80240A5C 46000021 */ cvt.d.s $f0, $f0 -/* A4FA60 80240A60 46220000 */ add.d $f0, $f0, $f2 -/* A4FA64 80240A64 46200020 */ cvt.s.d $f0, $f0 -/* A4FA68 80240A68 E640004C */ swc1 $f0, 0x4c($s2) -.L80240A6C: -/* A4FA6C 80240A6C 8E450018 */ lw $a1, 0x18($s2) -/* A4FA70 80240A70 8E46000C */ lw $a2, 0xc($s2) -/* A4FA74 80240A74 0C00EA95 */ jal npc_move_heading -/* A4FA78 80240A78 0240202D */ daddu $a0, $s2, $zero -/* A4FA7C 80240A7C C644003C */ lwc1 $f4, 0x3c($s2) -/* A4FA80 80240A80 C640001C */ lwc1 $f0, 0x1c($s2) -/* A4FA84 80240A84 46002100 */ add.s $f4, $f4, $f0 -/* A4FA88 80240A88 C6420014 */ lwc1 $f2, 0x14($s2) -/* A4FA8C 80240A8C 46020001 */ sub.s $f0, $f0, $f2 -/* A4FA90 80240A90 E644003C */ swc1 $f4, 0x3c($s2) -/* A4FA94 80240A94 080902C2 */ j .L80240B08 -/* A4FA98 80240A98 E640001C */ swc1 $f0, 0x1c($s2) -.L80240A9C: -/* A4FA9C 80240A9C AFA00014 */ sw $zero, 0x14($sp) -/* A4FAA0 80240AA0 8E450038 */ lw $a1, 0x38($s2) -/* A4FAA4 80240AA4 8E46003C */ lw $a2, 0x3c($s2) -/* A4FAA8 80240AA8 8E470040 */ lw $a3, 0x40($s2) -/* A4FAAC 80240AAC 0C01BECC */ jal fx_walk_normal -/* A4FAB0 80240AB0 24040002 */ addiu $a0, $zero, 2 -/* A4FAB4 80240AB4 3C01C47A */ lui $at, 0xc47a -/* A4FAB8 80240AB8 44810000 */ mtc1 $at, $f0 -/* A4FABC 80240ABC AE60006C */ sw $zero, 0x6c($s3) -/* A4FAC0 80240AC0 8E420000 */ lw $v0, ($s2) -/* A4FAC4 80240AC4 0240202D */ daddu $a0, $s2, $zero -/* A4FAC8 80240AC8 AE400038 */ sw $zero, 0x38($s2) -/* A4FACC 80240ACC AE400040 */ sw $zero, 0x40($s2) -/* A4FAD0 80240AD0 AE40001C */ sw $zero, 0x1c($s2) -/* A4FAD4 80240AD4 34420002 */ ori $v0, $v0, 2 -/* A4FAD8 80240AD8 E640003C */ swc1 $f0, 0x3c($s2) -/* A4FADC 80240ADC 0C00EAFF */ jal disable_npc_shadow -/* A4FAE0 80240AE0 AE420000 */ sw $v0, ($s2) -/* A4FAE4 80240AE4 8E420000 */ lw $v0, ($s2) -/* A4FAE8 80240AE8 2403F7FF */ addiu $v1, $zero, -0x801 -/* A4FAEC 80240AEC 00431024 */ and $v0, $v0, $v1 -/* A4FAF0 80240AF0 AE420000 */ sw $v0, ($s2) -/* A4FAF4 80240AF4 8E620000 */ lw $v0, ($s3) -/* A4FAF8 80240AF8 3C031F00 */ lui $v1, 0x1f00 -/* A4FAFC 80240AFC 00431025 */ or $v0, $v0, $v1 -/* A4FB00 80240B00 AE620000 */ sw $v0, ($s3) -/* A4FB04 80240B04 AEE00070 */ sw $zero, 0x70($s7) -.L80240B08: -/* A4FB08 80240B08 0000102D */ daddu $v0, $zero, $zero -.L80240B0C: -/* A4FB0C 80240B0C 8FBF0050 */ lw $ra, 0x50($sp) -/* A4FB10 80240B10 8FB7004C */ lw $s7, 0x4c($sp) -/* A4FB14 80240B14 8FB60048 */ lw $s6, 0x48($sp) -/* A4FB18 80240B18 8FB50044 */ lw $s5, 0x44($sp) -/* A4FB1C 80240B1C 8FB40040 */ lw $s4, 0x40($sp) -/* A4FB20 80240B20 8FB3003C */ lw $s3, 0x3c($sp) -/* A4FB24 80240B24 8FB20038 */ lw $s2, 0x38($sp) -/* A4FB28 80240B28 8FB10034 */ lw $s1, 0x34($sp) -/* A4FB2C 80240B2C 8FB00030 */ lw $s0, 0x30($sp) -/* A4FB30 80240B30 03E00008 */ jr $ra -/* A4FB34 80240B34 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/func_80240B38_A4F000.s b/asm/nonmatchings/world/area_kpa/kpa_09/func_80240B38_A4F000.s deleted file mode 100644 index b088341961..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/func_80240B38_A4F000.s +++ /dev/null @@ -1,298 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B38_A4FB38 -/* A4FB38 80240B38 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* A4FB3C 80240B3C AFB3003C */ sw $s3, 0x3c($sp) -/* A4FB40 80240B40 0080982D */ daddu $s3, $a0, $zero -/* A4FB44 80240B44 AFB40040 */ sw $s4, 0x40($sp) -/* A4FB48 80240B48 0000A02D */ daddu $s4, $zero, $zero -/* A4FB4C 80240B4C 3C03800A */ lui $v1, 0x800a -/* A4FB50 80240B50 8463A634 */ lh $v1, -0x59cc($v1) -/* A4FB54 80240B54 3C04800B */ lui $a0, %hi(gCameras) -/* A4FB58 80240B58 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A4FB5C 80240B5C AFBF0044 */ sw $ra, 0x44($sp) -/* A4FB60 80240B60 AFB20038 */ sw $s2, 0x38($sp) -/* A4FB64 80240B64 AFB10034 */ sw $s1, 0x34($sp) -/* A4FB68 80240B68 AFB00030 */ sw $s0, 0x30($sp) -/* A4FB6C 80240B6C F7B80058 */ sdc1 $f24, 0x58($sp) -/* A4FB70 80240B70 F7B60050 */ sdc1 $f22, 0x50($sp) -/* A4FB74 80240B74 F7B40048 */ sdc1 $f20, 0x48($sp) -/* A4FB78 80240B78 8E710148 */ lw $s1, 0x148($s3) -/* A4FB7C 80240B7C 00031080 */ sll $v0, $v1, 2 -/* A4FB80 80240B80 00431021 */ addu $v0, $v0, $v1 -/* A4FB84 80240B84 00021080 */ sll $v0, $v0, 2 -/* A4FB88 80240B88 00431023 */ subu $v0, $v0, $v1 -/* A4FB8C 80240B8C 000218C0 */ sll $v1, $v0, 3 -/* A4FB90 80240B90 00431021 */ addu $v0, $v0, $v1 -/* A4FB94 80240B94 000210C0 */ sll $v0, $v0, 3 -/* A4FB98 80240B98 10A00002 */ beqz $a1, .L80240BA4 -/* A4FB9C 80240B9C 00449021 */ addu $s2, $v0, $a0 -/* A4FBA0 80240BA0 AE600070 */ sw $zero, 0x70($s3) -.L80240BA4: -/* A4FBA4 80240BA4 0C00FB5A */ jal get_enemy_safe -/* A4FBA8 80240BA8 86240008 */ lh $a0, 8($s1) -/* A4FBAC 80240BAC 14400006 */ bnez $v0, .L80240BC8 -/* A4FBB0 80240BB0 24020005 */ addiu $v0, $zero, 5 -/* A4FBB4 80240BB4 0260202D */ daddu $a0, $s3, $zero -/* A4FBB8 80240BB8 3C05FE36 */ lui $a1, 0xfe36 -/* A4FBBC 80240BBC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A4FBC0 80240BC0 080903CA */ j .L80240F28 -/* A4FBC4 80240BC4 0000302D */ daddu $a2, $zero, $zero -.L80240BC8: -/* A4FBC8 80240BC8 8E23006C */ lw $v1, 0x6c($s1) -/* A4FBCC 80240BCC 14620005 */ bne $v1, $v0, .L80240BE4 -/* A4FBD0 80240BD0 0260202D */ daddu $a0, $s3, $zero -/* A4FBD4 80240BD4 3C05FE36 */ lui $a1, 0xfe36 -/* A4FBD8 80240BD8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A4FBDC 80240BDC 080903CA */ j .L80240F28 -/* A4FBE0 80240BE0 0000302D */ daddu $a2, $zero, $zero -.L80240BE4: -/* A4FBE4 80240BE4 86240008 */ lh $a0, 8($s1) -/* A4FBE8 80240BE8 0C00FB5A */ jal get_enemy_safe -/* A4FBEC 80240BEC 00000000 */ nop -/* A4FBF0 80240BF0 14400005 */ bnez $v0, .L80240C08 -/* A4FBF4 80240BF4 0260202D */ daddu $a0, $s3, $zero -/* A4FBF8 80240BF8 3C05FE36 */ lui $a1, 0xfe36 -/* A4FBFC 80240BFC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A4FC00 80240C00 080903CA */ j .L80240F28 -/* A4FC04 80240C04 0000302D */ daddu $a2, $zero, $zero -.L80240C08: -/* A4FC08 80240C08 86240008 */ lh $a0, 8($s1) -/* A4FC0C 80240C0C 0C00EABB */ jal get_npc_unsafe -/* A4FC10 80240C10 00000000 */ nop -/* A4FC14 80240C14 8E630070 */ lw $v1, 0x70($s3) -/* A4FC18 80240C18 10600006 */ beqz $v1, .L80240C34 -/* A4FC1C 80240C1C 0040802D */ daddu $s0, $v0, $zero -/* A4FC20 80240C20 24020001 */ addiu $v0, $zero, 1 -/* A4FC24 80240C24 1062003F */ beq $v1, $v0, .L80240D24 -/* A4FC28 80240C28 0000102D */ daddu $v0, $zero, $zero -/* A4FC2C 80240C2C 080903DA */ j .L80240F68 -/* A4FC30 80240C30 00000000 */ nop -.L80240C34: -/* A4FC34 80240C34 AFA00010 */ sw $zero, 0x10($sp) -/* A4FC38 80240C38 AFA00014 */ sw $zero, 0x14($sp) -/* A4FC3C 80240C3C 8E050038 */ lw $a1, 0x38($s0) -/* A4FC40 80240C40 8E06003C */ lw $a2, 0x3c($s0) -/* A4FC44 80240C44 8E070040 */ lw $a3, 0x40($s0) -/* A4FC48 80240C48 0C01BECC */ jal fx_walk_normal -/* A4FC4C 80240C4C 24040002 */ addiu $a0, $zero, 2 -/* A4FC50 80240C50 C64C006C */ lwc1 $f12, 0x6c($s2) -/* A4FC54 80240C54 0C00A6C9 */ jal clamp_angle -/* A4FC58 80240C58 00000000 */ nop -/* A4FC5C 80240C5C 3C018024 */ lui $at, 0x8024 -/* A4FC60 80240C60 D43827D0 */ ldc1 $f24, 0x27d0($at) -/* A4FC64 80240C64 46000521 */ cvt.d.s $f20, $f0 -/* A4FC68 80240C68 4638A300 */ add.d $f12, $f20, $f24 -/* A4FC6C 80240C6C 3C018024 */ lui $at, 0x8024 -/* A4FC70 80240C70 D43627D8 */ ldc1 $f22, 0x27d8($at) -/* A4FC74 80240C74 0C00A6C9 */ jal clamp_angle -/* A4FC78 80240C78 46206320 */ cvt.s.d $f12, $f12 -/* A4FC7C 80240C7C 4636A500 */ add.d $f20, $f20, $f22 -/* A4FC80 80240C80 4620A320 */ cvt.s.d $f12, $f20 -/* A4FC84 80240C84 0C00A6C9 */ jal clamp_angle -/* A4FC88 80240C88 46000506 */ mov.s $f20, $f0 -/* A4FC8C 80240C8C 4600A521 */ cvt.d.s $f20, $f20 -/* A4FC90 80240C90 4636A500 */ add.d $f20, $f20, $f22 -/* A4FC94 80240C94 46000586 */ mov.s $f22, $f0 -/* A4FC98 80240C98 0C00A6C9 */ jal clamp_angle -/* A4FC9C 80240C9C 4620A320 */ cvt.s.d $f12, $f20 -/* A4FCA0 80240CA0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A4FCA4 80240CA4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A4FCA8 80240CA8 C64C006C */ lwc1 $f12, 0x6c($s2) -/* A4FCAC 80240CAC C44E0084 */ lwc1 $f14, 0x84($v0) -/* A4FCB0 80240CB0 0C00A70A */ jal get_clamped_angle_diff -/* A4FCB4 80240CB4 46000506 */ mov.s $f20, $f0 -/* A4FCB8 80240CB8 0C00A6C9 */ jal clamp_angle -/* A4FCBC 80240CBC 46000306 */ mov.s $f12, $f0 -/* A4FCC0 80240CC0 46000021 */ cvt.d.s $f0, $f0 -/* A4FCC4 80240CC4 4638003C */ c.lt.d $f0, $f24 -/* A4FCC8 80240CC8 00000000 */ nop -/* A4FCCC 80240CCC 45020002 */ bc1fl .L80240CD8 -/* A4FCD0 80240CD0 E614000C */ swc1 $f20, 0xc($s0) -/* A4FCD4 80240CD4 E616000C */ swc1 $f22, 0xc($s0) -.L80240CD8: -/* A4FCD8 80240CD8 C6000018 */ lwc1 $f0, 0x18($s0) -/* A4FCDC 80240CDC 3C018024 */ lui $at, 0x8024 -/* A4FCE0 80240CE0 D42227E0 */ ldc1 $f2, 0x27e0($at) -/* A4FCE4 80240CE4 46000021 */ cvt.d.s $f0, $f0 -/* A4FCE8 80240CE8 46220002 */ mul.d $f0, $f0, $f2 -/* A4FCEC 80240CEC 00000000 */ nop -/* A4FCF0 80240CF0 3C013F66 */ lui $at, 0x3f66 -/* A4FCF4 80240CF4 34216666 */ ori $at, $at, 0x6666 -/* A4FCF8 80240CF8 44812000 */ mtc1 $at, $f4 -/* A4FCFC 80240CFC 2402001E */ addiu $v0, $zero, 0x1e -/* A4FD00 80240D00 A602008E */ sh $v0, 0x8e($s0) -/* A4FD04 80240D04 3C014120 */ lui $at, 0x4120 -/* A4FD08 80240D08 44811000 */ mtc1 $at, $f2 -/* A4FD0C 80240D0C 24020001 */ addiu $v0, $zero, 1 -/* A4FD10 80240D10 E6040014 */ swc1 $f4, 0x14($s0) -/* A4FD14 80240D14 E602001C */ swc1 $f2, 0x1c($s0) -/* A4FD18 80240D18 46200020 */ cvt.s.d $f0, $f0 -/* A4FD1C 80240D1C E6000018 */ swc1 $f0, 0x18($s0) -/* A4FD20 80240D20 AE620070 */ sw $v0, 0x70($s3) -.L80240D24: -/* A4FD24 80240D24 C6000038 */ lwc1 $f0, 0x38($s0) -/* A4FD28 80240D28 C602003C */ lwc1 $f2, 0x3c($s0) -/* A4FD2C 80240D2C C6040040 */ lwc1 $f4, 0x40($s0) -/* A4FD30 80240D30 C6060018 */ lwc1 $f6, 0x18($s0) -/* A4FD34 80240D34 0000202D */ daddu $a0, $zero, $zero -/* A4FD38 80240D38 E7A00020 */ swc1 $f0, 0x20($sp) -/* A4FD3C 80240D3C E7A20024 */ swc1 $f2, 0x24($sp) -/* A4FD40 80240D40 E7A40028 */ swc1 $f4, 0x28($sp) -/* A4FD44 80240D44 E7A60010 */ swc1 $f6, 0x10($sp) -/* A4FD48 80240D48 C600000C */ lwc1 $f0, 0xc($s0) -/* A4FD4C 80240D4C 27A50020 */ addiu $a1, $sp, 0x20 -/* A4FD50 80240D50 E7A00014 */ swc1 $f0, 0x14($sp) -/* A4FD54 80240D54 860200A6 */ lh $v0, 0xa6($s0) -/* A4FD58 80240D58 27A60024 */ addiu $a2, $sp, 0x24 -/* A4FD5C 80240D5C 44820000 */ mtc1 $v0, $f0 -/* A4FD60 80240D60 00000000 */ nop -/* A4FD64 80240D64 46800020 */ cvt.s.w $f0, $f0 -/* A4FD68 80240D68 E7A00018 */ swc1 $f0, 0x18($sp) -/* A4FD6C 80240D6C 860200A8 */ lh $v0, 0xa8($s0) -/* A4FD70 80240D70 27A70028 */ addiu $a3, $sp, 0x28 -/* A4FD74 80240D74 44820000 */ mtc1 $v0, $f0 -/* A4FD78 80240D78 00000000 */ nop -/* A4FD7C 80240D7C 46800020 */ cvt.s.w $f0, $f0 -/* A4FD80 80240D80 0C037711 */ jal func_800DDC44 -/* A4FD84 80240D84 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A4FD88 80240D88 54400007 */ bnel $v0, $zero, .L80240DA8 -/* A4FD8C 80240D8C 24140001 */ addiu $s4, $zero, 1 -/* A4FD90 80240D90 8E050018 */ lw $a1, 0x18($s0) -/* A4FD94 80240D94 8E06000C */ lw $a2, 0xc($s0) -/* A4FD98 80240D98 0C00EA95 */ jal npc_move_heading -/* A4FD9C 80240D9C 0200202D */ daddu $a0, $s0, $zero -/* A4FDA0 80240DA0 0809036B */ j .L80240DAC -/* A4FDA4 80240DA4 0000902D */ daddu $s2, $zero, $zero -.L80240DA8: -/* A4FDA8 80240DA8 0000902D */ daddu $s2, $zero, $zero -.L80240DAC: -/* A4FDAC 80240DAC C600001C */ lwc1 $f0, 0x1c($s0) -/* A4FDB0 80240DB0 44801000 */ mtc1 $zero, $f2 -/* A4FDB4 80240DB4 44801800 */ mtc1 $zero, $f3 -/* A4FDB8 80240DB8 46000021 */ cvt.d.s $f0, $f0 -/* A4FDBC 80240DBC 4622003C */ c.lt.d $f0, $f2 -/* A4FDC0 80240DC0 00000000 */ nop -/* A4FDC4 80240DC4 45000028 */ bc1f .L80240E68 -/* A4FDC8 80240DC8 27A50020 */ addiu $a1, $sp, 0x20 -/* A4FDCC 80240DCC 27A60024 */ addiu $a2, $sp, 0x24 -/* A4FDD0 80240DD0 27A2002C */ addiu $v0, $sp, 0x2c -/* A4FDD4 80240DD4 C602003C */ lwc1 $f2, 0x3c($s0) -/* A4FDD8 80240DD8 C6060038 */ lwc1 $f6, 0x38($s0) -/* A4FDDC 80240DDC 3C01402A */ lui $at, 0x402a -/* A4FDE0 80240DE0 4481A800 */ mtc1 $at, $f21 -/* A4FDE4 80240DE4 4480A000 */ mtc1 $zero, $f20 -/* A4FDE8 80240DE8 460010A1 */ cvt.d.s $f2, $f2 -/* A4FDEC 80240DEC 46341080 */ add.d $f2, $f2, $f20 -/* A4FDF0 80240DF0 C600001C */ lwc1 $f0, 0x1c($s0) -/* A4FDF4 80240DF4 C6040040 */ lwc1 $f4, 0x40($s0) -/* A4FDF8 80240DF8 46000005 */ abs.s $f0, $f0 -/* A4FDFC 80240DFC E7A40028 */ swc1 $f4, 0x28($sp) -/* A4FE00 80240E00 3C014030 */ lui $at, 0x4030 -/* A4FE04 80240E04 44812800 */ mtc1 $at, $f5 -/* A4FE08 80240E08 44802000 */ mtc1 $zero, $f4 -/* A4FE0C 80240E0C 46000021 */ cvt.d.s $f0, $f0 -/* A4FE10 80240E10 E7A60020 */ swc1 $f6, 0x20($sp) -/* A4FE14 80240E14 46240000 */ add.d $f0, $f0, $f4 -/* A4FE18 80240E18 462010A0 */ cvt.s.d $f2, $f2 -/* A4FE1C 80240E1C E7A20024 */ swc1 $f2, 0x24($sp) -/* A4FE20 80240E20 46200020 */ cvt.s.d $f0, $f0 -/* A4FE24 80240E24 E7A0002C */ swc1 $f0, 0x2c($sp) -/* A4FE28 80240E28 AFA20010 */ sw $v0, 0x10($sp) -/* A4FE2C 80240E2C 8E040080 */ lw $a0, 0x80($s0) -/* A4FE30 80240E30 0C0372DF */ jal func_800DCB7C -/* A4FE34 80240E34 27A70028 */ addiu $a3, $sp, 0x28 -/* A4FE38 80240E38 1040000B */ beqz $v0, .L80240E68 -/* A4FE3C 80240E3C 00000000 */ nop -/* A4FE40 80240E40 C600001C */ lwc1 $f0, 0x1c($s0) -/* A4FE44 80240E44 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* A4FE48 80240E48 46000005 */ abs.s $f0, $f0 -/* A4FE4C 80240E4C 46000021 */ cvt.d.s $f0, $f0 -/* A4FE50 80240E50 46340000 */ add.d $f0, $f0, $f20 -/* A4FE54 80240E54 460010A1 */ cvt.d.s $f2, $f2 -/* A4FE58 80240E58 4620103E */ c.le.d $f2, $f0 -/* A4FE5C 80240E5C 00000000 */ nop -/* A4FE60 80240E60 45030001 */ bc1tl .L80240E68 -/* A4FE64 80240E64 24120001 */ addiu $s2, $zero, 1 -.L80240E68: -/* A4FE68 80240E68 56400008 */ bnel $s2, $zero, .L80240E8C -/* A4FE6C 80240E6C 2414000A */ addiu $s4, $zero, 0xa -/* A4FE70 80240E70 C604003C */ lwc1 $f4, 0x3c($s0) -/* A4FE74 80240E74 C600001C */ lwc1 $f0, 0x1c($s0) -/* A4FE78 80240E78 46002100 */ add.s $f4, $f4, $f0 -/* A4FE7C 80240E7C C6020014 */ lwc1 $f2, 0x14($s0) -/* A4FE80 80240E80 46020001 */ sub.s $f0, $f0, $f2 -/* A4FE84 80240E84 E604003C */ swc1 $f4, 0x3c($s0) -/* A4FE88 80240E88 E600001C */ swc1 $f0, 0x1c($s0) -.L80240E8C: -/* A4FE8C 80240E8C 9602008E */ lhu $v0, 0x8e($s0) -/* A4FE90 80240E90 2442FFFF */ addiu $v0, $v0, -1 -/* A4FE94 80240E94 A602008E */ sh $v0, 0x8e($s0) -/* A4FE98 80240E98 00021400 */ sll $v0, $v0, 0x10 -/* A4FE9C 80240E9C 58400001 */ blezl $v0, .L80240EA4 -/* A4FEA0 80240EA0 2414000B */ addiu $s4, $zero, 0xb -.L80240EA4: -/* A4FEA4 80240EA4 12800024 */ beqz $s4, .L80240F38 -/* A4FEA8 80240EA8 00000000 */ nop -/* A4FEAC 80240EAC AFA00010 */ sw $zero, 0x10($sp) -/* A4FEB0 80240EB0 AFA00014 */ sw $zero, 0x14($sp) -/* A4FEB4 80240EB4 8E050038 */ lw $a1, 0x38($s0) -/* A4FEB8 80240EB8 8E06003C */ lw $a2, 0x3c($s0) -/* A4FEBC 80240EBC 8E070040 */ lw $a3, 0x40($s0) -/* A4FEC0 80240EC0 0C01BECC */ jal fx_walk_normal -/* A4FEC4 80240EC4 24040002 */ addiu $a0, $zero, 2 -/* A4FEC8 80240EC8 3C01C47A */ lui $at, 0xc47a -/* A4FECC 80240ECC 44810000 */ mtc1 $at, $f0 -/* A4FED0 80240ED0 AE20006C */ sw $zero, 0x6c($s1) -/* A4FED4 80240ED4 8E020000 */ lw $v0, ($s0) -/* A4FED8 80240ED8 0200202D */ daddu $a0, $s0, $zero -/* A4FEDC 80240EDC AE000038 */ sw $zero, 0x38($s0) -/* A4FEE0 80240EE0 AE000040 */ sw $zero, 0x40($s0) -/* A4FEE4 80240EE4 34420002 */ ori $v0, $v0, 2 -/* A4FEE8 80240EE8 E600003C */ swc1 $f0, 0x3c($s0) -/* A4FEEC 80240EEC 0C00EAFF */ jal disable_npc_shadow -/* A4FEF0 80240EF0 AE020000 */ sw $v0, ($s0) -/* A4FEF4 80240EF4 0260202D */ daddu $a0, $s3, $zero -/* A4FEF8 80240EF8 3C05FE36 */ lui $a1, 0xfe36 -/* A4FEFC 80240EFC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A4FF00 80240F00 24060001 */ addiu $a2, $zero, 1 -/* A4FF04 80240F04 8E020000 */ lw $v0, ($s0) -/* A4FF08 80240F08 2403F7FF */ addiu $v1, $zero, -0x801 -/* A4FF0C 80240F0C 00431024 */ and $v0, $v0, $v1 -/* A4FF10 80240F10 AE020000 */ sw $v0, ($s0) -/* A4FF14 80240F14 8E220000 */ lw $v0, ($s1) -/* A4FF18 80240F18 3C031F00 */ lui $v1, 0x1f00 -/* A4FF1C 80240F1C 00431025 */ or $v0, $v0, $v1 -/* A4FF20 80240F20 AE220000 */ sw $v0, ($s1) -/* A4FF24 80240F24 AC800070 */ sw $zero, 0x70($a0) -.L80240F28: -/* A4FF28 80240F28 0C0B2026 */ jal set_variable -/* A4FF2C 80240F2C 00000000 */ nop -/* A4FF30 80240F30 080903DA */ j .L80240F68 -/* A4FF34 80240F34 24020002 */ addiu $v0, $zero, 2 -.L80240F38: -/* A4FF38 80240F38 8E220070 */ lw $v0, 0x70($s1) -/* A4FF3C 80240F3C 30420001 */ andi $v0, $v0, 1 -/* A4FF40 80240F40 10400009 */ beqz $v0, .L80240F68 -/* A4FF44 80240F44 0000102D */ daddu $v0, $zero, $zero -/* A4FF48 80240F48 C600004C */ lwc1 $f0, 0x4c($s0) -/* A4FF4C 80240F4C 3C01404E */ lui $at, 0x404e -/* A4FF50 80240F50 44811800 */ mtc1 $at, $f3 -/* A4FF54 80240F54 44801000 */ mtc1 $zero, $f2 -/* A4FF58 80240F58 46000021 */ cvt.d.s $f0, $f0 -/* A4FF5C 80240F5C 46220000 */ add.d $f0, $f0, $f2 -/* A4FF60 80240F60 46200020 */ cvt.s.d $f0, $f0 -/* A4FF64 80240F64 E600004C */ swc1 $f0, 0x4c($s0) -.L80240F68: -/* A4FF68 80240F68 8FBF0044 */ lw $ra, 0x44($sp) -/* A4FF6C 80240F6C 8FB40040 */ lw $s4, 0x40($sp) -/* A4FF70 80240F70 8FB3003C */ lw $s3, 0x3c($sp) -/* A4FF74 80240F74 8FB20038 */ lw $s2, 0x38($sp) -/* A4FF78 80240F78 8FB10034 */ lw $s1, 0x34($sp) -/* A4FF7C 80240F7C 8FB00030 */ lw $s0, 0x30($sp) -/* A4FF80 80240F80 D7B80058 */ ldc1 $f24, 0x58($sp) -/* A4FF84 80240F84 D7B60050 */ ldc1 $f22, 0x50($sp) -/* A4FF88 80240F88 D7B40048 */ ldc1 $f20, 0x48($sp) -/* A4FF8C 80240F8C 03E00008 */ jr $ra -/* A4FF90 80240F90 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kpa/kpa_10/func_80240124_A51980.s b/asm/nonmatchings/world/area_kpa/kpa_10/func_80240124_A51980.s deleted file mode 100644 index 06c02d2453..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_10/func_80240124_A51980.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A51AA4 -/* A51AA4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A51AA8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A51AAC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A51AB0 80240130 10A00005 */ beqz $a1, .L80240148 -/* A51AB4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A51AB8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A51ABC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A51AC0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A51AC4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A51AC8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A51ACC 8024014C 1440000E */ bnez $v0, .L80240188 -/* A51AD0 80240150 00000000 */ nop -/* A51AD4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A51AD8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A51ADC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A51AE0 80240160 04610004 */ bgez $v1, .L80240174 -/* A51AE4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A51AE8 80240168 3C020002 */ lui $v0, 2 -/* A51AEC 8024016C 08090061 */ j .L80240184 -/* A51AF0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A51AF4 80240174 3C040002 */ lui $a0, 2 -/* A51AF8 80240178 0083102A */ slt $v0, $a0, $v1 -/* A51AFC 8024017C 10400002 */ beqz $v0, .L80240188 -/* A51B00 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A51B04 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A51B08 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A51B0C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A51B10 80240190 00000000 */ nop -/* A51B14 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A51B18 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A51B1C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A51B20 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A51B24 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A51B28 802401A8 3C020002 */ lui $v0, 2 -/* A51B2C 802401AC 08090071 */ j .L802401C4 -/* A51B30 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A51B34 802401B4 3C040002 */ lui $a0, 2 -/* A51B38 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A51B3C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A51B40 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A51B44 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A51B48 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A51B4C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A51B50 802401D0 00000000 */ nop -/* A51B54 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A51B58 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A51B5C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A51B60 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A51B64 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A51B68 802401E8 3C020002 */ lui $v0, 2 -/* A51B6C 802401EC 08090081 */ j .L80240204 -/* A51B70 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A51B74 802401F4 3C040002 */ lui $a0, 2 -/* A51B78 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A51B7C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A51B80 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A51B84 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A51B88 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A51B8C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A51B90 80240210 00000000 */ nop -/* A51B94 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A51B98 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A51B9C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A51BA0 80240220 04610004 */ bgez $v1, .L80240234 -/* A51BA4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A51BA8 80240228 3C020002 */ lui $v0, 2 -/* A51BAC 8024022C 08090091 */ j .L80240244 -/* A51BB0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A51BB4 80240234 3C040002 */ lui $a0, 2 -/* A51BB8 80240238 0083102A */ slt $v0, $a0, $v1 -/* A51BBC 8024023C 10400002 */ beqz $v0, .L80240248 -/* A51BC0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A51BC4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A51BC8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A51BCC 8024024C 0C046F07 */ jal set_main_pan_u -/* A51BD0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A51BD4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A51BD8 80240258 0C046F0D */ jal set_main_pan_v -/* A51BDC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A51BE0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A51BE4 80240264 0C046F13 */ jal set_aux_pan_u -/* A51BE8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A51BEC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A51BF0 80240270 0C046F19 */ jal set_aux_pan_v -/* A51BF4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A51BF8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A51BFC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A51C00 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A51C04 80240284 24420001 */ addiu $v0, $v0, 1 -/* A51C08 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A51C0C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A51C10 80240290 24630001 */ addiu $v1, $v1, 1 -/* A51C14 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A51C18 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A51C1C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A51C20 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A51C24 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A51C28 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A51C2C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A51C30 802402B0 14600002 */ bnez $v1, .L802402BC -/* A51C34 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A51C38 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A51C3C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A51C40 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A51C44 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A51C48 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A51C4C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A51C50 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A51C54 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A51C58 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A51C5C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A51C60 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A51C64 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A51C68 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A51C6C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A51C70 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A51C74 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A51C78 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A51C7C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A51C80 80240300 0000102D */ daddu $v0, $zero, $zero -/* A51C84 80240304 03E00008 */ jr $ra -/* A51C88 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A51C8C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/func_80240124_A93740.s b/asm/nonmatchings/world/area_kpa/kpa_102/func_80240124_A93740.s deleted file mode 100644 index 355c91f725..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/func_80240124_A93740.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A93864 -/* A93864 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A93868 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A9386C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A93870 80240130 10A00005 */ beqz $a1, .L80240148 -/* A93874 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A93878 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A9387C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A93880 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A93884 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A93888 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A9388C 8024014C 1440000E */ bnez $v0, .L80240188 -/* A93890 80240150 00000000 */ nop -/* A93894 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A93898 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A9389C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A938A0 80240160 04610004 */ bgez $v1, .L80240174 -/* A938A4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A938A8 80240168 3C020002 */ lui $v0, 2 -/* A938AC 8024016C 08090061 */ j .L80240184 -/* A938B0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A938B4 80240174 3C040002 */ lui $a0, 2 -/* A938B8 80240178 0083102A */ slt $v0, $a0, $v1 -/* A938BC 8024017C 10400002 */ beqz $v0, .L80240188 -/* A938C0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A938C4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A938C8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A938CC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A938D0 80240190 00000000 */ nop -/* A938D4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A938D8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A938DC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A938E0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A938E4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A938E8 802401A8 3C020002 */ lui $v0, 2 -/* A938EC 802401AC 08090071 */ j .L802401C4 -/* A938F0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A938F4 802401B4 3C040002 */ lui $a0, 2 -/* A938F8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A938FC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A93900 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A93904 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A93908 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A9390C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A93910 802401D0 00000000 */ nop -/* A93914 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A93918 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A9391C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A93920 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A93924 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A93928 802401E8 3C020002 */ lui $v0, 2 -/* A9392C 802401EC 08090081 */ j .L80240204 -/* A93930 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A93934 802401F4 3C040002 */ lui $a0, 2 -/* A93938 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A9393C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A93940 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A93944 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A93948 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A9394C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A93950 80240210 00000000 */ nop -/* A93954 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A93958 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A9395C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A93960 80240220 04610004 */ bgez $v1, .L80240234 -/* A93964 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A93968 80240228 3C020002 */ lui $v0, 2 -/* A9396C 8024022C 08090091 */ j .L80240244 -/* A93970 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A93974 80240234 3C040002 */ lui $a0, 2 -/* A93978 80240238 0083102A */ slt $v0, $a0, $v1 -/* A9397C 8024023C 10400002 */ beqz $v0, .L80240248 -/* A93980 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A93984 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A93988 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A9398C 8024024C 0C046F07 */ jal set_main_pan_u -/* A93990 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A93994 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A93998 80240258 0C046F0D */ jal set_main_pan_v -/* A9399C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A939A0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A939A4 80240264 0C046F13 */ jal set_aux_pan_u -/* A939A8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A939AC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A939B0 80240270 0C046F19 */ jal set_aux_pan_v -/* A939B4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A939B8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A939BC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A939C0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A939C4 80240284 24420001 */ addiu $v0, $v0, 1 -/* A939C8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A939CC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A939D0 80240290 24630001 */ addiu $v1, $v1, 1 -/* A939D4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A939D8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A939DC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A939E0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A939E4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A939E8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A939EC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A939F0 802402B0 14600002 */ bnez $v1, .L802402BC -/* A939F4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A939F8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A939FC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A93A00 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A93A04 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A93A08 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A93A0C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A93A10 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A93A14 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A93A18 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A93A1C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A93A20 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A93A24 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A93A28 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A93A2C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A93A30 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A93A34 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A93A38 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A93A3C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A93A40 80240300 0000102D */ daddu $v0, $zero, $zero -/* A93A44 80240304 03E00008 */ jr $ra -/* A93A48 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A93A4C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/func_80240310_A93740.s b/asm/nonmatchings/world/area_kpa/kpa_102/func_80240310_A93740.s deleted file mode 100644 index b41088cae9..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/func_80240310_A93740.s +++ /dev/null @@ -1,134 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_A93A50 -/* A93A50 80240310 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A93A54 80240314 AFB10014 */ sw $s1, 0x14($sp) -/* A93A58 80240318 0080882D */ daddu $s1, $a0, $zero -/* A93A5C 8024031C 3C05800B */ lui $a1, %hi(gCameras) -/* A93A60 80240320 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A93A64 80240324 AFBF0020 */ sw $ra, 0x20($sp) -/* A93A68 80240328 AFB3001C */ sw $s3, 0x1c($sp) -/* A93A6C 8024032C AFB20018 */ sw $s2, 0x18($sp) -/* A93A70 80240330 AFB00010 */ sw $s0, 0x10($sp) -/* A93A74 80240334 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A93A78 80240338 8E330148 */ lw $s3, 0x148($s1) -/* A93A7C 8024033C 3C03800A */ lui $v1, 0x800a -/* A93A80 80240340 8463A634 */ lh $v1, -0x59cc($v1) -/* A93A84 80240344 8E30000C */ lw $s0, 0xc($s1) -/* A93A88 80240348 00031080 */ sll $v0, $v1, 2 -/* A93A8C 8024034C 00431021 */ addu $v0, $v0, $v1 -/* A93A90 80240350 00021080 */ sll $v0, $v0, 2 -/* A93A94 80240354 00431023 */ subu $v0, $v0, $v1 -/* A93A98 80240358 000218C0 */ sll $v1, $v0, 3 -/* A93A9C 8024035C 00431021 */ addu $v0, $v0, $v1 -/* A93AA0 80240360 000210C0 */ sll $v0, $v0, 3 -/* A93AA4 80240364 86640008 */ lh $a0, 8($s3) -/* A93AA8 80240368 0C00EABB */ jal get_npc_unsafe -/* A93AAC 8024036C 00459021 */ addu $s2, $v0, $a1 -/* A93AB0 80240370 0220202D */ daddu $a0, $s1, $zero -/* A93AB4 80240374 8E050000 */ lw $a1, ($s0) -/* A93AB8 80240378 0C0B1EAF */ jal get_variable -/* A93ABC 8024037C 0040802D */ daddu $s0, $v0, $zero -/* A93AC0 80240380 0260202D */ daddu $a0, $s3, $zero -/* A93AC4 80240384 8C460024 */ lw $a2, 0x24($v0) -/* A93AC8 80240388 8C470028 */ lw $a3, 0x28($v0) -/* A93ACC 8024038C 0C0124FB */ jal func_800493EC -/* A93AD0 80240390 0000282D */ daddu $a1, $zero, $zero -/* A93AD4 80240394 10400052 */ beqz $v0, .L802404E0 -/* A93AD8 80240398 2402FFFF */ addiu $v0, $zero, -1 -/* A93ADC 8024039C C64C006C */ lwc1 $f12, 0x6c($s2) -/* A93AE0 802403A0 C60E000C */ lwc1 $f14, 0xc($s0) -/* A93AE4 802403A4 3C014387 */ lui $at, 0x4387 -/* A93AE8 802403A8 4481A000 */ mtc1 $at, $f20 -/* A93AEC 802403AC 0C00A70A */ jal get_clamped_angle_diff -/* A93AF0 802403B0 00000000 */ nop -/* A93AF4 802403B4 0C00A6C9 */ jal clamp_angle -/* A93AF8 802403B8 46000306 */ mov.s $f12, $f0 -/* A93AFC 802403BC 3C018024 */ lui $at, 0x8024 -/* A93B00 802403C0 D4225B20 */ ldc1 $f2, 0x5b20($at) -/* A93B04 802403C4 46000021 */ cvt.d.s $f0, $f0 -/* A93B08 802403C8 4622003C */ c.lt.d $f0, $f2 -/* A93B0C 802403CC 00000000 */ nop -/* A93B10 802403D0 45000003 */ bc1f .L802403E0 -/* A93B14 802403D4 00000000 */ nop -/* A93B18 802403D8 3C0142B4 */ lui $at, 0x42b4 -/* A93B1C 802403DC 4481A000 */ mtc1 $at, $f20 -.L802403E0: -/* A93B20 802403E0 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* A93B24 802403E4 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* A93B28 802403E8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A93B2C 802403EC 8E220000 */ lw $v0, ($s1) -/* A93B30 802403F0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A93B34 802403F4 8C460028 */ lw $a2, 0x28($v0) -/* A93B38 802403F8 0C00A720 */ jal atan2 -/* A93B3C 802403FC 8C470030 */ lw $a3, 0x30($v0) -/* A93B40 80240400 4600A306 */ mov.s $f12, $f20 -/* A93B44 80240404 0C00A70A */ jal get_clamped_angle_diff -/* A93B48 80240408 46000386 */ mov.s $f14, $f0 -/* A93B4C 8024040C 46000005 */ abs.s $f0, $f0 -/* A93B50 80240410 3C018024 */ lui $at, 0x8024 -/* A93B54 80240414 D4225B28 */ ldc1 $f2, 0x5b28($at) -/* A93B58 80240418 46000021 */ cvt.d.s $f0, $f0 -/* A93B5C 8024041C 4620103C */ c.lt.d $f2, $f0 -/* A93B60 80240420 00000000 */ nop -/* A93B64 80240424 4501002E */ bc1t .L802404E0 -/* A93B68 80240428 2402FFFF */ addiu $v0, $zero, -1 -/* A93B6C 8024042C 8E220000 */ lw $v0, ($s1) -/* A93B70 80240430 C600003C */ lwc1 $f0, 0x3c($s0) -/* A93B74 80240434 C442002C */ lwc1 $f2, 0x2c($v0) -/* A93B78 80240438 860200A8 */ lh $v0, 0xa8($s0) -/* A93B7C 8024043C 46020001 */ sub.s $f0, $f0, $f2 -/* A93B80 80240440 44821000 */ mtc1 $v0, $f2 -/* A93B84 80240444 00000000 */ nop -/* A93B88 80240448 468010A1 */ cvt.d.w $f2, $f2 -/* A93B8C 8024044C 46221080 */ add.d $f2, $f2, $f2 -/* A93B90 80240450 46000005 */ abs.s $f0, $f0 -/* A93B94 80240454 46000021 */ cvt.d.s $f0, $f0 -/* A93B98 80240458 4620103E */ c.le.d $f2, $f0 -/* A93B9C 8024045C 00000000 */ nop -/* A93BA0 80240460 4501001F */ bc1t .L802404E0 -/* A93BA4 80240464 2402FFFF */ addiu $v0, $zero, -1 -/* A93BA8 80240468 3C038011 */ lui $v1, 0x8011 -/* A93BAC 8024046C 8063EBB3 */ lb $v1, -0x144d($v1) -/* A93BB0 80240470 24020009 */ addiu $v0, $zero, 9 -/* A93BB4 80240474 10620019 */ beq $v1, $v0, .L802404DC -/* A93BB8 80240478 24020007 */ addiu $v0, $zero, 7 -/* A93BBC 8024047C 14620005 */ bne $v1, $v0, .L80240494 -/* A93BC0 80240480 2402FFFF */ addiu $v0, $zero, -1 -/* A93BC4 80240484 08090138 */ j .L802404E0 -/* A93BC8 80240488 00000000 */ nop -.L8024048C: -/* A93BCC 8024048C 08090138 */ j .L802404E0 -/* A93BD0 80240490 0240102D */ daddu $v0, $s2, $zero -.L80240494: -/* A93BD4 80240494 8E620078 */ lw $v0, 0x78($s3) -/* A93BD8 80240498 18400010 */ blez $v0, .L802404DC -/* A93BDC 8024049C 0000882D */ daddu $s1, $zero, $zero -.L802404A0: -/* A93BE0 802404A0 86620008 */ lh $v0, 8($s3) -/* A93BE4 802404A4 00511021 */ addu $v0, $v0, $s1 -/* A93BE8 802404A8 24520001 */ addiu $s2, $v0, 1 -/* A93BEC 802404AC 0C00FB3A */ jal get_enemy -/* A93BF0 802404B0 0240202D */ daddu $a0, $s2, $zero -/* A93BF4 802404B4 0240202D */ daddu $a0, $s2, $zero -/* A93BF8 802404B8 0C00EABB */ jal get_npc_unsafe -/* A93BFC 802404BC 0040802D */ daddu $s0, $v0, $zero -/* A93C00 802404C0 8E02006C */ lw $v0, 0x6c($s0) -/* A93C04 802404C4 1040FFF1 */ beqz $v0, .L8024048C -/* A93C08 802404C8 26310001 */ addiu $s1, $s1, 1 -/* A93C0C 802404CC 8E620078 */ lw $v0, 0x78($s3) -/* A93C10 802404D0 0222102A */ slt $v0, $s1, $v0 -/* A93C14 802404D4 1440FFF2 */ bnez $v0, .L802404A0 -/* A93C18 802404D8 00000000 */ nop -.L802404DC: -/* A93C1C 802404DC 2402FFFF */ addiu $v0, $zero, -1 -.L802404E0: -/* A93C20 802404E0 8FBF0020 */ lw $ra, 0x20($sp) -/* A93C24 802404E4 8FB3001C */ lw $s3, 0x1c($sp) -/* A93C28 802404E8 8FB20018 */ lw $s2, 0x18($sp) -/* A93C2C 802404EC 8FB10014 */ lw $s1, 0x14($sp) -/* A93C30 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* A93C34 802404F4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A93C38 802404F8 03E00008 */ jr $ra -/* A93C3C 802404FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/func_80240500_A93740.s b/asm/nonmatchings/world/area_kpa/kpa_102/func_80240500_A93740.s deleted file mode 100644 index 5c0f1cd894..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/func_80240500_A93740.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_A93C40 -/* A93C40 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A93C44 80240504 AFB20038 */ sw $s2, 0x38($sp) -/* A93C48 80240508 0080902D */ daddu $s2, $a0, $zero -/* A93C4C 8024050C AFB00030 */ sw $s0, 0x30($sp) -/* A93C50 80240510 AFBF003C */ sw $ra, 0x3c($sp) -/* A93C54 80240514 AFB10034 */ sw $s1, 0x34($sp) -/* A93C58 80240518 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A93C5C 8024051C F7B40040 */ sdc1 $f20, 0x40($sp) -/* A93C60 80240520 8E510148 */ lw $s1, 0x148($s2) -/* A93C64 80240524 4485A000 */ mtc1 $a1, $f20 -/* A93C68 80240528 86240008 */ lh $a0, 8($s1) -/* A93C6C 8024052C 4486B000 */ mtc1 $a2, $f22 -/* A93C70 80240530 0C00EABB */ jal get_npc_unsafe -/* A93C74 80240534 00E0802D */ daddu $s0, $a3, $zero -/* A93C78 80240538 0200202D */ daddu $a0, $s0, $zero -/* A93C7C 8024053C 0220282D */ daddu $a1, $s1, $zero -/* A93C80 80240540 24030001 */ addiu $v1, $zero, 1 -/* A93C84 80240544 4406A000 */ mfc1 $a2, $f20 -/* A93C88 80240548 4407B000 */ mfc1 $a3, $f22 -/* A93C8C 8024054C 0040802D */ daddu $s0, $v0, $zero -/* A93C90 80240550 0C01242D */ jal func_800490B4 -/* A93C94 80240554 AFA30010 */ sw $v1, 0x10($sp) -/* A93C98 80240558 1440001D */ bnez $v0, .L802405D0 -/* A93C9C 8024055C 24040002 */ addiu $a0, $zero, 2 -/* A93CA0 80240560 0200282D */ daddu $a1, $s0, $zero -/* A93CA4 80240564 0000302D */ daddu $a2, $zero, $zero -/* A93CA8 80240568 860300A8 */ lh $v1, 0xa8($s0) -/* A93CAC 8024056C 3C013F80 */ lui $at, 0x3f80 -/* A93CB0 80240570 44810000 */ mtc1 $at, $f0 -/* A93CB4 80240574 3C014000 */ lui $at, 0x4000 -/* A93CB8 80240578 44811000 */ mtc1 $at, $f2 -/* A93CBC 8024057C 3C01C1A0 */ lui $at, 0xc1a0 -/* A93CC0 80240580 44812000 */ mtc1 $at, $f4 -/* A93CC4 80240584 2402000F */ addiu $v0, $zero, 0xf -/* A93CC8 80240588 AFA2001C */ sw $v0, 0x1c($sp) -/* A93CCC 8024058C 44833000 */ mtc1 $v1, $f6 -/* A93CD0 80240590 00000000 */ nop -/* A93CD4 80240594 468031A0 */ cvt.s.w $f6, $f6 -/* A93CD8 80240598 44073000 */ mfc1 $a3, $f6 -/* A93CDC 8024059C 27A20028 */ addiu $v0, $sp, 0x28 -/* A93CE0 802405A0 AFA20020 */ sw $v0, 0x20($sp) -/* A93CE4 802405A4 E7A00010 */ swc1 $f0, 0x10($sp) -/* A93CE8 802405A8 E7A20014 */ swc1 $f2, 0x14($sp) -/* A93CEC 802405AC 0C01BFA4 */ jal fx_emote -/* A93CF0 802405B0 E7A40018 */ swc1 $f4, 0x18($sp) -/* A93CF4 802405B4 8E2200CC */ lw $v0, 0xcc($s1) -/* A93CF8 802405B8 8C430000 */ lw $v1, ($v0) -/* A93CFC 802405BC 24020014 */ addiu $v0, $zero, 0x14 -/* A93D00 802405C0 A602008E */ sh $v0, 0x8e($s0) -/* A93D04 802405C4 24020021 */ addiu $v0, $zero, 0x21 -/* A93D08 802405C8 08090188 */ j .L80240620 -/* A93D0C 802405CC AE030028 */ sw $v1, 0x28($s0) -.L802405D0: -/* A93D10 802405D0 0C0900C4 */ jal func_80240310 -/* A93D14 802405D4 0240202D */ daddu $a0, $s2, $zero -/* A93D18 802405D8 0040202D */ daddu $a0, $v0, $zero -/* A93D1C 802405DC 2402FFFF */ addiu $v0, $zero, -1 -/* A93D20 802405E0 10820010 */ beq $a0, $v0, .L80240624 -/* A93D24 802405E4 00000000 */ nop -/* A93D28 802405E8 0C00FB3A */ jal get_enemy -/* A93D2C 802405EC 00000000 */ nop -/* A93D30 802405F0 8C42006C */ lw $v0, 0x6c($v0) -/* A93D34 802405F4 1440000B */ bnez $v0, .L80240624 -/* A93D38 802405F8 00000000 */ nop -/* A93D3C 802405FC 8602008C */ lh $v0, 0x8c($s0) -/* A93D40 80240600 14400008 */ bnez $v0, .L80240624 -/* A93D44 80240604 00000000 */ nop -/* A93D48 80240608 8E2200CC */ lw $v0, 0xcc($s1) -/* A93D4C 8024060C 8C420020 */ lw $v0, 0x20($v0) -/* A93D50 80240610 AE020028 */ sw $v0, 0x28($s0) -/* A93D54 80240614 96220072 */ lhu $v0, 0x72($s1) -/* A93D58 80240618 A602008E */ sh $v0, 0x8e($s0) -/* A93D5C 8024061C 2402001E */ addiu $v0, $zero, 0x1e -.L80240620: -/* A93D60 80240620 AE420070 */ sw $v0, 0x70($s2) -.L80240624: -/* A93D64 80240624 8FBF003C */ lw $ra, 0x3c($sp) -/* A93D68 80240628 8FB20038 */ lw $s2, 0x38($sp) -/* A93D6C 8024062C 8FB10034 */ lw $s1, 0x34($sp) -/* A93D70 80240630 8FB00030 */ lw $s0, 0x30($sp) -/* A93D74 80240634 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A93D78 80240638 D7B40040 */ ldc1 $f20, 0x40($sp) -/* A93D7C 8024063C 03E00008 */ jr $ra -/* A93D80 80240640 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/func_80240644_A93740.s b/asm/nonmatchings/world/area_kpa/kpa_102/func_80240644_A93740.s deleted file mode 100644 index 2d68b39c8b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/func_80240644_A93740.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240644_A93D84 -/* A93D84 80240644 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A93D88 80240648 AFB20038 */ sw $s2, 0x38($sp) -/* A93D8C 8024064C 0080902D */ daddu $s2, $a0, $zero -/* A93D90 80240650 AFBF003C */ sw $ra, 0x3c($sp) -/* A93D94 80240654 AFB10034 */ sw $s1, 0x34($sp) -/* A93D98 80240658 AFB00030 */ sw $s0, 0x30($sp) -/* A93D9C 8024065C 8E510148 */ lw $s1, 0x148($s2) -/* A93DA0 80240660 0C00EABB */ jal get_npc_unsafe -/* A93DA4 80240664 86240008 */ lh $a0, 8($s1) -/* A93DA8 80240668 0040802D */ daddu $s0, $v0, $zero -/* A93DAC 8024066C 9602008E */ lhu $v0, 0x8e($s0) -/* A93DB0 80240670 2442FFFF */ addiu $v0, $v0, -1 -/* A93DB4 80240674 A602008E */ sh $v0, 0x8e($s0) -/* A93DB8 80240678 00021400 */ sll $v0, $v0, 0x10 -/* A93DBC 8024067C 1C40002B */ bgtz $v0, .L8024072C -/* A93DC0 80240680 00000000 */ nop -/* A93DC4 80240684 0C0900C4 */ jal func_80240310 -/* A93DC8 80240688 0240202D */ daddu $a0, $s2, $zero -/* A93DCC 8024068C 0040202D */ daddu $a0, $v0, $zero -/* A93DD0 80240690 0481001A */ bgez $a0, .L802406FC -/* A93DD4 80240694 2402000F */ addiu $v0, $zero, 0xf -/* A93DD8 80240698 24040002 */ addiu $a0, $zero, 2 -/* A93DDC 8024069C 860300A8 */ lh $v1, 0xa8($s0) -/* A93DE0 802406A0 AFA2001C */ sw $v0, 0x1c($sp) -/* A93DE4 802406A4 27A20028 */ addiu $v0, $sp, 0x28 -/* A93DE8 802406A8 0200282D */ daddu $a1, $s0, $zero -/* A93DEC 802406AC 3C013F80 */ lui $at, 0x3f80 -/* A93DF0 802406B0 44810000 */ mtc1 $at, $f0 -/* A93DF4 802406B4 3C014000 */ lui $at, 0x4000 -/* A93DF8 802406B8 44811000 */ mtc1 $at, $f2 -/* A93DFC 802406BC 3C01C1A0 */ lui $at, 0xc1a0 -/* A93E00 802406C0 44812000 */ mtc1 $at, $f4 -/* A93E04 802406C4 44833000 */ mtc1 $v1, $f6 -/* A93E08 802406C8 00000000 */ nop -/* A93E0C 802406CC 468031A0 */ cvt.s.w $f6, $f6 -/* A93E10 802406D0 44073000 */ mfc1 $a3, $f6 -/* A93E14 802406D4 0000302D */ daddu $a2, $zero, $zero -/* A93E18 802406D8 AFA20020 */ sw $v0, 0x20($sp) -/* A93E1C 802406DC E7A00010 */ swc1 $f0, 0x10($sp) -/* A93E20 802406E0 E7A20014 */ swc1 $f2, 0x14($sp) -/* A93E24 802406E4 0C01BFA4 */ jal fx_emote -/* A93E28 802406E8 E7A40018 */ swc1 $f4, 0x18($sp) -/* A93E2C 802406EC 8E2200CC */ lw $v0, 0xcc($s1) -/* A93E30 802406F0 8C420000 */ lw $v0, ($v0) -/* A93E34 802406F4 080901C7 */ j .L8024071C -/* A93E38 802406F8 AE020028 */ sw $v0, 0x28($s0) -.L802406FC: -/* A93E3C 802406FC 8E2200CC */ lw $v0, 0xcc($s1) -/* A93E40 80240700 8C420024 */ lw $v0, 0x24($v0) -/* A93E44 80240704 0C00FB3A */ jal get_enemy -/* A93E48 80240708 AE020028 */ sw $v0, 0x28($s0) -/* A93E4C 8024070C 86240008 */ lh $a0, 8($s1) -/* A93E50 80240710 24030001 */ addiu $v1, $zero, 1 -/* A93E54 80240714 AC43006C */ sw $v1, 0x6c($v0) -/* A93E58 80240718 AC44007C */ sw $a0, 0x7c($v0) -.L8024071C: -/* A93E5C 8024071C 96220076 */ lhu $v0, 0x76($s1) -/* A93E60 80240720 A602008E */ sh $v0, 0x8e($s0) -/* A93E64 80240724 24020021 */ addiu $v0, $zero, 0x21 -/* A93E68 80240728 AE420070 */ sw $v0, 0x70($s2) -.L8024072C: -/* A93E6C 8024072C 8FBF003C */ lw $ra, 0x3c($sp) -/* A93E70 80240730 8FB20038 */ lw $s2, 0x38($sp) -/* A93E74 80240734 8FB10034 */ lw $s1, 0x34($sp) -/* A93E78 80240738 8FB00030 */ lw $s0, 0x30($sp) -/* A93E7C 8024073C 03E00008 */ jr $ra -/* A93E80 80240740 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/func_8024086C_A93740.s b/asm/nonmatchings/world/area_kpa/kpa_102/func_8024086C_A93740.s deleted file mode 100644 index a355f9eb00..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/func_8024086C_A93740.s +++ /dev/null @@ -1,354 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024086C_A93FAC -/* A93FAC 8024086C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A93FB0 80240870 AFB7004C */ sw $s7, 0x4c($sp) -/* A93FB4 80240874 0080B82D */ daddu $s7, $a0, $zero -/* A93FB8 80240878 AFB10034 */ sw $s1, 0x34($sp) -/* A93FBC 8024087C 00A0882D */ daddu $s1, $a1, $zero -/* A93FC0 80240880 AFBF0050 */ sw $ra, 0x50($sp) -/* A93FC4 80240884 AFB60048 */ sw $s6, 0x48($sp) -/* A93FC8 80240888 AFB50044 */ sw $s5, 0x44($sp) -/* A93FCC 8024088C AFB40040 */ sw $s4, 0x40($sp) -/* A93FD0 80240890 AFB3003C */ sw $s3, 0x3c($sp) -/* A93FD4 80240894 AFB20038 */ sw $s2, 0x38($sp) -/* A93FD8 80240898 AFB00030 */ sw $s0, 0x30($sp) -/* A93FDC 8024089C 8EF30148 */ lw $s3, 0x148($s7) -/* A93FE0 802408A0 86640008 */ lh $a0, 8($s3) -/* A93FE4 802408A4 8EF0000C */ lw $s0, 0xc($s7) -/* A93FE8 802408A8 0C00FB5A */ jal get_enemy_safe -/* A93FEC 802408AC 0000B02D */ daddu $s6, $zero, $zero -/* A93FF0 802408B0 10400131 */ beqz $v0, .L80240D78 -/* A93FF4 802408B4 24020005 */ addiu $v0, $zero, 5 -/* A93FF8 802408B8 8E63006C */ lw $v1, 0x6c($s3) -/* A93FFC 802408BC 1062012F */ beq $v1, $v0, .L80240D7C -/* A94000 802408C0 0000102D */ daddu $v0, $zero, $zero -/* A94004 802408C4 8E050000 */ lw $a1, ($s0) -/* A94008 802408C8 0C0B1EAF */ jal get_variable -/* A9400C 802408CC 02E0202D */ daddu $a0, $s7, $zero -/* A94010 802408D0 86640008 */ lh $a0, 8($s3) -/* A94014 802408D4 0C00EABB */ jal get_npc_unsafe -/* A94018 802408D8 0040A82D */ daddu $s5, $v0, $zero -/* A9401C 802408DC 8E630070 */ lw $v1, 0x70($s3) -/* A94020 802408E0 30630002 */ andi $v1, $v1, 2 -/* A94024 802408E4 10600008 */ beqz $v1, .L80240908 -/* A94028 802408E8 0040902D */ daddu $s2, $v0, $zero -/* A9402C 802408EC 964200A8 */ lhu $v0, 0xa8($s2) -/* A94030 802408F0 00021400 */ sll $v0, $v0, 0x10 -/* A94034 802408F4 00021C03 */ sra $v1, $v0, 0x10 -/* A94038 802408F8 000217C2 */ srl $v0, $v0, 0x1f -/* A9403C 802408FC 00621821 */ addu $v1, $v1, $v0 -/* A94040 80240900 00031843 */ sra $v1, $v1, 1 -/* A94044 80240904 A24300AB */ sb $v1, 0xab($s2) -.L80240908: -/* A94048 80240908 16200005 */ bnez $s1, .L80240920 -/* A9404C 8024090C 3C030004 */ lui $v1, 4 -/* A94050 80240910 8E6200B0 */ lw $v0, 0xb0($s3) -/* A94054 80240914 30420004 */ andi $v0, $v0, 4 -/* A94058 80240918 10400019 */ beqz $v0, .L80240980 -/* A9405C 8024091C 00000000 */ nop -.L80240920: -/* A94060 80240920 34630102 */ ori $v1, $v1, 0x102 -/* A94064 80240924 AEE00070 */ sw $zero, 0x70($s7) -/* A94068 80240928 8E420000 */ lw $v0, ($s2) -/* A9406C 8024092C 0240202D */ daddu $a0, $s2, $zero -/* A94070 80240930 A640008E */ sh $zero, 0x8e($s2) -/* A94074 80240934 00431025 */ or $v0, $v0, $v1 -/* A94078 80240938 0C00EAFF */ jal disable_npc_shadow -/* A9407C 8024093C AE420000 */ sw $v0, ($s2) -/* A94080 80240940 3C041F30 */ lui $a0, 0x1f30 -/* A94084 80240944 8E420000 */ lw $v0, ($s2) -/* A94088 80240948 2403F7FF */ addiu $v1, $zero, -0x801 -/* A9408C 8024094C 00431024 */ and $v0, $v0, $v1 -/* A94090 80240950 AE420000 */ sw $v0, ($s2) -/* A94094 80240954 8E620000 */ lw $v0, ($s3) -/* A94098 80240958 8E6300B0 */ lw $v1, 0xb0($s3) -/* A9409C 8024095C 34840040 */ ori $a0, $a0, 0x40 -/* A940A0 80240960 AE60006C */ sw $zero, 0x6c($s3) -/* A940A4 80240964 00441025 */ or $v0, $v0, $a0 -/* A940A8 80240968 AE620000 */ sw $v0, ($s3) -/* A940AC 8024096C 30620004 */ andi $v0, $v1, 4 -/* A940B0 80240970 10400003 */ beqz $v0, .L80240980 -/* A940B4 80240974 2402FFFB */ addiu $v0, $zero, -5 -/* A940B8 80240978 00621024 */ and $v0, $v1, $v0 -/* A940BC 8024097C AE6200B0 */ sw $v0, 0xb0($s3) -.L80240980: -/* A940C0 80240980 8EE30070 */ lw $v1, 0x70($s7) -/* A940C4 80240984 24100001 */ addiu $s0, $zero, 1 -/* A940C8 80240988 10700012 */ beq $v1, $s0, .L802409D4 -/* A940CC 8024098C 28620002 */ slti $v0, $v1, 2 -/* A940D0 80240990 10400005 */ beqz $v0, .L802409A8 -/* A940D4 80240994 24020002 */ addiu $v0, $zero, 2 -/* A940D8 80240998 10600007 */ beqz $v1, .L802409B8 -/* A940DC 8024099C 0000102D */ daddu $v0, $zero, $zero -/* A940E0 802409A0 0809035F */ j .L80240D7C -/* A940E4 802409A4 00000000 */ nop -.L802409A8: -/* A940E8 802409A8 1062005B */ beq $v1, $v0, .L80240B18 -/* A940EC 802409AC 0000102D */ daddu $v0, $zero, $zero -/* A940F0 802409B0 0809035F */ j .L80240D7C -/* A940F4 802409B4 00000000 */ nop -.L802409B8: -/* A940F8 802409B8 8E420000 */ lw $v0, ($s2) -/* A940FC 802409BC 0240202D */ daddu $a0, $s2, $zero -/* A94100 802409C0 34420002 */ ori $v0, $v0, 2 -/* A94104 802409C4 0C00EAFF */ jal disable_npc_shadow -/* A94108 802409C8 AE420000 */ sw $v0, ($s2) -/* A9410C 802409CC AE60006C */ sw $zero, 0x6c($s3) -/* A94110 802409D0 AEF00070 */ sw $s0, 0x70($s7) -.L802409D4: -/* A94114 802409D4 8E74006C */ lw $s4, 0x6c($s3) -/* A94118 802409D8 24020001 */ addiu $v0, $zero, 1 -/* A9411C 802409DC 168200E7 */ bne $s4, $v0, .L80240D7C -/* A94120 802409E0 0000102D */ daddu $v0, $zero, $zero -/* A94124 802409E4 8E64007C */ lw $a0, 0x7c($s3) -/* A94128 802409E8 24110002 */ addiu $s1, $zero, 2 -/* A9412C 802409EC 0C00EABB */ jal get_npc_unsafe -/* A94130 802409F0 AE71006C */ sw $s1, 0x6c($s3) -/* A94134 802409F4 0040802D */ daddu $s0, $v0, $zero -/* A94138 802409F8 C6000038 */ lwc1 $f0, 0x38($s0) -/* A9413C 802409FC E6400038 */ swc1 $f0, 0x38($s2) -/* A94140 80240A00 C6000040 */ lwc1 $f0, 0x40($s0) -/* A94144 80240A04 E6400040 */ swc1 $f0, 0x40($s2) -/* A94148 80240A08 C6020034 */ lwc1 $f2, 0x34($s0) -/* A9414C 80240A0C 3C014387 */ lui $at, 0x4387 -/* A94150 80240A10 44810000 */ mtc1 $at, $f0 -/* A94154 80240A14 26440038 */ addiu $a0, $s2, 0x38 -/* A94158 80240A18 46020001 */ sub.s $f0, $f0, $f2 -/* A9415C 80240A1C C6680078 */ lwc1 $f8, 0x78($s3) -/* A94160 80240A20 46804220 */ cvt.s.w $f8, $f8 -/* A94164 80240A24 44064000 */ mfc1 $a2, $f8 -/* A94168 80240A28 44070000 */ mfc1 $a3, $f0 -/* A9416C 80240A2C 0C00A7E7 */ jal add_vec2D_polar -/* A94170 80240A30 26450040 */ addiu $a1, $s2, 0x40 -/* A94174 80240A34 C600003C */ lwc1 $f0, 0x3c($s0) -/* A94178 80240A38 C6620074 */ lwc1 $f2, 0x74($s3) -/* A9417C 80240A3C 468010A0 */ cvt.s.w $f2, $f2 -/* A94180 80240A40 46020000 */ add.s $f0, $f0, $f2 -/* A94184 80240A44 E640003C */ swc1 $f0, 0x3c($s2) -/* A94188 80240A48 A2740007 */ sb $s4, 7($s3) -/* A9418C 80240A4C C6400038 */ lwc1 $f0, 0x38($s2) -/* A94190 80240A50 4600020D */ trunc.w.s $f8, $f0 -/* A94194 80240A54 44024000 */ mfc1 $v0, $f8 -/* A94198 80240A58 00000000 */ nop -/* A9419C 80240A5C A6620010 */ sh $v0, 0x10($s3) -/* A941A0 80240A60 C640003C */ lwc1 $f0, 0x3c($s2) -/* A941A4 80240A64 4600020D */ trunc.w.s $f8, $f0 -/* A941A8 80240A68 44024000 */ mfc1 $v0, $f8 -/* A941AC 80240A6C 00000000 */ nop -/* A941B0 80240A70 A6620012 */ sh $v0, 0x12($s3) -/* A941B4 80240A74 C6400040 */ lwc1 $f0, 0x40($s2) -/* A941B8 80240A78 4600020D */ trunc.w.s $f8, $f0 -/* A941BC 80240A7C 44024000 */ mfc1 $v0, $f8 -/* A941C0 80240A80 00000000 */ nop -/* A941C4 80240A84 A6620014 */ sh $v0, 0x14($s3) -/* A941C8 80240A88 AE400044 */ sw $zero, 0x44($s2) -/* A941CC 80240A8C AE400048 */ sw $zero, 0x48($s2) -/* A941D0 80240A90 AE40004C */ sw $zero, 0x4c($s2) -/* A941D4 80240A94 C6A00000 */ lwc1 $f0, ($s5) -/* A941D8 80240A98 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A941DC 80240A9C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A941E0 80240AA0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A941E4 80240AA4 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A941E8 80240AA8 E6400018 */ swc1 $f0, 0x18($s2) -/* A941EC 80240AAC 8C460028 */ lw $a2, 0x28($v0) -/* A941F0 80240AB0 0C00A720 */ jal atan2 -/* A941F4 80240AB4 8C470030 */ lw $a3, 0x30($v0) -/* A941F8 80240AB8 E640000C */ swc1 $f0, 0xc($s2) -/* A941FC 80240ABC C6A0000C */ lwc1 $f0, 0xc($s5) -/* A94200 80240AC0 8E420000 */ lw $v0, ($s2) -/* A94204 80240AC4 0240202D */ daddu $a0, $s2, $zero -/* A94208 80240AC8 E640001C */ swc1 $f0, 0x1c($s2) -/* A9420C 80240ACC C6A00010 */ lwc1 $f0, 0x10($s5) -/* A94210 80240AD0 2403FFFD */ addiu $v1, $zero, -3 -/* A94214 80240AD4 E6400014 */ swc1 $f0, 0x14($s2) -/* A94218 80240AD8 C600003C */ lwc1 $f0, 0x3c($s0) -/* A9421C 80240ADC 00431024 */ and $v0, $v0, $v1 -/* A94220 80240AE0 AE420000 */ sw $v0, ($s2) -/* A94224 80240AE4 0C00EAE8 */ jal enable_npc_shadow -/* A94228 80240AE8 E6400064 */ swc1 $f0, 0x64($s2) -/* A9422C 80240AEC 8E420000 */ lw $v0, ($s2) -/* A94230 80240AF0 3C03E0FF */ lui $v1, 0xe0ff -/* A94234 80240AF4 34420800 */ ori $v0, $v0, 0x800 -/* A94238 80240AF8 AE420000 */ sw $v0, ($s2) -/* A9423C 80240AFC 8E620000 */ lw $v0, ($s3) -/* A94240 80240B00 3463FFFF */ ori $v1, $v1, 0xffff -/* A94244 80240B04 00431024 */ and $v0, $v0, $v1 -/* A94248 80240B08 AE620000 */ sw $v0, ($s3) -/* A9424C 80240B0C 2402005A */ addiu $v0, $zero, 0x5a -/* A94250 80240B10 A642008E */ sh $v0, 0x8e($s2) -/* A94254 80240B14 AEF10070 */ sw $s1, 0x70($s7) -.L80240B18: -/* A94258 80240B18 0000202D */ daddu $a0, $zero, $zero -/* A9425C 80240B1C 27B00020 */ addiu $s0, $sp, 0x20 -/* A94260 80240B20 864200A8 */ lh $v0, 0xa8($s2) -/* A94264 80240B24 3C013FE0 */ lui $at, 0x3fe0 -/* A94268 80240B28 44810800 */ mtc1 $at, $f1 -/* A9426C 80240B2C 44800000 */ mtc1 $zero, $f0 -/* A94270 80240B30 44821000 */ mtc1 $v0, $f2 -/* A94274 80240B34 00000000 */ nop -/* A94278 80240B38 468010A1 */ cvt.d.w $f2, $f2 -/* A9427C 80240B3C 46201082 */ mul.d $f2, $f2, $f0 -/* A94280 80240B40 00000000 */ nop -/* A94284 80240B44 0200282D */ daddu $a1, $s0, $zero -/* A94288 80240B48 C6440038 */ lwc1 $f4, 0x38($s2) -/* A9428C 80240B4C C640003C */ lwc1 $f0, 0x3c($s2) -/* A94290 80240B50 27B10024 */ addiu $s1, $sp, 0x24 -/* A94294 80240B54 E7A40020 */ swc1 $f4, 0x20($sp) -/* A94298 80240B58 C6440040 */ lwc1 $f4, 0x40($s2) -/* A9429C 80240B5C 46000021 */ cvt.d.s $f0, $f0 -/* A942A0 80240B60 46220000 */ add.d $f0, $f0, $f2 -/* A942A4 80240B64 E7A40028 */ swc1 $f4, 0x28($sp) -/* A942A8 80240B68 C6420018 */ lwc1 $f2, 0x18($s2) -/* A942AC 80240B6C 46200020 */ cvt.s.d $f0, $f0 -/* A942B0 80240B70 E7A00024 */ swc1 $f0, 0x24($sp) -/* A942B4 80240B74 E7A20010 */ swc1 $f2, 0x10($sp) -/* A942B8 80240B78 C640000C */ lwc1 $f0, 0xc($s2) -/* A942BC 80240B7C 0220302D */ daddu $a2, $s1, $zero -/* A942C0 80240B80 E7A00014 */ swc1 $f0, 0x14($sp) -/* A942C4 80240B84 864200A6 */ lh $v0, 0xa6($s2) -/* A942C8 80240B88 27B40028 */ addiu $s4, $sp, 0x28 -/* A942CC 80240B8C 44820000 */ mtc1 $v0, $f0 -/* A942D0 80240B90 00000000 */ nop -/* A942D4 80240B94 46800020 */ cvt.s.w $f0, $f0 -/* A942D8 80240B98 E7A00018 */ swc1 $f0, 0x18($sp) -/* A942DC 80240B9C 864200A8 */ lh $v0, 0xa8($s2) -/* A942E0 80240BA0 0280382D */ daddu $a3, $s4, $zero -/* A942E4 80240BA4 44820000 */ mtc1 $v0, $f0 -/* A942E8 80240BA8 00000000 */ nop -/* A942EC 80240BAC 46800020 */ cvt.s.w $f0, $f0 -/* A942F0 80240BB0 0C0376B9 */ jal func_800DDAE4 -/* A942F4 80240BB4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A942F8 80240BB8 54400001 */ bnel $v0, $zero, .L80240BC0 -/* A942FC 80240BBC 24160001 */ addiu $s6, $zero, 1 -.L80240BC0: -/* A94300 80240BC0 0200282D */ daddu $a1, $s0, $zero -/* A94304 80240BC4 0220302D */ daddu $a2, $s1, $zero -/* A94308 80240BC8 C6400038 */ lwc1 $f0, 0x38($s2) -/* A9430C 80240BCC C642003C */ lwc1 $f2, 0x3c($s2) -/* A94310 80240BD0 C6440040 */ lwc1 $f4, 0x40($s2) -/* A94314 80240BD4 3C01447A */ lui $at, 0x447a -/* A94318 80240BD8 44813000 */ mtc1 $at, $f6 -/* A9431C 80240BDC 27A2002C */ addiu $v0, $sp, 0x2c -/* A94320 80240BE0 E7A00020 */ swc1 $f0, 0x20($sp) -/* A94324 80240BE4 E7A20024 */ swc1 $f2, 0x24($sp) -/* A94328 80240BE8 E7A40028 */ swc1 $f4, 0x28($sp) -/* A9432C 80240BEC E7A6002C */ swc1 $f6, 0x2c($sp) -/* A94330 80240BF0 AFA20010 */ sw $v0, 0x10($sp) -/* A94334 80240BF4 8E440080 */ lw $a0, 0x80($s2) -/* A94338 80240BF8 0C0372DF */ jal func_800DCB7C -/* A9433C 80240BFC 0280382D */ daddu $a3, $s4, $zero -/* A94340 80240C00 10400019 */ beqz $v0, .L80240C68 -/* A94344 80240C04 00000000 */ nop -/* A94348 80240C08 C640001C */ lwc1 $f0, 0x1c($s2) -/* A9434C 80240C0C C7A2002C */ lwc1 $f2, 0x2c($sp) -/* A94350 80240C10 46000005 */ abs.s $f0, $f0 -/* A94354 80240C14 4600103C */ c.lt.s $f2, $f0 -/* A94358 80240C18 00000000 */ nop -/* A9435C 80240C1C 45000012 */ bc1f .L80240C68 -/* A94360 80240C20 00000000 */ nop -/* A94364 80240C24 C7A40024 */ lwc1 $f4, 0x24($sp) -/* A94368 80240C28 C6400064 */ lwc1 $f0, 0x64($s2) -/* A9436C 80240C2C 46002001 */ sub.s $f0, $f4, $f0 -/* A94370 80240C30 3C014034 */ lui $at, 0x4034 -/* A94374 80240C34 44811800 */ mtc1 $at, $f3 -/* A94378 80240C38 44801000 */ mtc1 $zero, $f2 -/* A9437C 80240C3C 46000005 */ abs.s $f0, $f0 -/* A94380 80240C40 46000021 */ cvt.d.s $f0, $f0 -/* A94384 80240C44 4622003C */ c.lt.d $f0, $f2 -/* A94388 80240C48 00000000 */ nop -/* A9438C 80240C4C 45000006 */ bc1f .L80240C68 -/* A94390 80240C50 0240202D */ daddu $a0, $s2, $zero -/* A94394 80240C54 8E450018 */ lw $a1, 0x18($s2) -/* A94398 80240C58 8E46000C */ lw $a2, 0xc($s2) -/* A9439C 80240C5C 2416000A */ addiu $s6, $zero, 0xa -/* A943A0 80240C60 0C00EA95 */ jal npc_move_heading -/* A943A4 80240C64 E644003C */ swc1 $f4, 0x3c($s2) -.L80240C68: -/* A943A8 80240C68 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A943AC 80240C6C 3C013FF0 */ lui $at, 0x3ff0 -/* A943B0 80240C70 44811800 */ mtc1 $at, $f3 -/* A943B4 80240C74 44801000 */ mtc1 $zero, $f2 -/* A943B8 80240C78 46000021 */ cvt.d.s $f0, $f0 -/* A943BC 80240C7C 4622003C */ c.lt.d $f0, $f2 -/* A943C0 80240C80 00000000 */ nop -/* A943C4 80240C84 45030001 */ bc1tl .L80240C8C -/* A943C8 80240C88 2416000B */ addiu $s6, $zero, 0xb -.L80240C8C: -/* A943CC 80240C8C 9642008E */ lhu $v0, 0x8e($s2) -/* A943D0 80240C90 2442FFFF */ addiu $v0, $v0, -1 -/* A943D4 80240C94 A642008E */ sh $v0, 0x8e($s2) -/* A943D8 80240C98 00021400 */ sll $v0, $v0, 0x10 -/* A943DC 80240C9C 58400001 */ blezl $v0, .L80240CA4 -/* A943E0 80240CA0 24160014 */ addiu $s6, $zero, 0x14 -.L80240CA4: -/* A943E4 80240CA4 56C00019 */ bnel $s6, $zero, .L80240D0C -/* A943E8 80240CA8 AFA00010 */ sw $zero, 0x10($sp) -/* A943EC 80240CAC 8E620070 */ lw $v0, 0x70($s3) -/* A943F0 80240CB0 30420001 */ andi $v0, $v0, 1 -/* A943F4 80240CB4 10400009 */ beqz $v0, .L80240CDC -/* A943F8 80240CB8 00000000 */ nop -/* A943FC 80240CBC C640004C */ lwc1 $f0, 0x4c($s2) -/* A94400 80240CC0 3C014044 */ lui $at, 0x4044 -/* A94404 80240CC4 44811800 */ mtc1 $at, $f3 -/* A94408 80240CC8 44801000 */ mtc1 $zero, $f2 -/* A9440C 80240CCC 46000021 */ cvt.d.s $f0, $f0 -/* A94410 80240CD0 46220000 */ add.d $f0, $f0, $f2 -/* A94414 80240CD4 46200020 */ cvt.s.d $f0, $f0 -/* A94418 80240CD8 E640004C */ swc1 $f0, 0x4c($s2) -.L80240CDC: -/* A9441C 80240CDC 8E450018 */ lw $a1, 0x18($s2) -/* A94420 80240CE0 8E46000C */ lw $a2, 0xc($s2) -/* A94424 80240CE4 0C00EA95 */ jal npc_move_heading -/* A94428 80240CE8 0240202D */ daddu $a0, $s2, $zero -/* A9442C 80240CEC C644003C */ lwc1 $f4, 0x3c($s2) -/* A94430 80240CF0 C640001C */ lwc1 $f0, 0x1c($s2) -/* A94434 80240CF4 46002100 */ add.s $f4, $f4, $f0 -/* A94438 80240CF8 C6420014 */ lwc1 $f2, 0x14($s2) -/* A9443C 80240CFC 46020001 */ sub.s $f0, $f0, $f2 -/* A94440 80240D00 E644003C */ swc1 $f4, 0x3c($s2) -/* A94444 80240D04 0809035E */ j .L80240D78 -/* A94448 80240D08 E640001C */ swc1 $f0, 0x1c($s2) -.L80240D0C: -/* A9444C 80240D0C AFA00014 */ sw $zero, 0x14($sp) -/* A94450 80240D10 8E450038 */ lw $a1, 0x38($s2) -/* A94454 80240D14 8E46003C */ lw $a2, 0x3c($s2) -/* A94458 80240D18 8E470040 */ lw $a3, 0x40($s2) -/* A9445C 80240D1C 0C01BECC */ jal fx_walk_normal -/* A94460 80240D20 24040002 */ addiu $a0, $zero, 2 -/* A94464 80240D24 3C01C47A */ lui $at, 0xc47a -/* A94468 80240D28 44810000 */ mtc1 $at, $f0 -/* A9446C 80240D2C AE60006C */ sw $zero, 0x6c($s3) -/* A94470 80240D30 8E420000 */ lw $v0, ($s2) -/* A94474 80240D34 0240202D */ daddu $a0, $s2, $zero -/* A94478 80240D38 AE400038 */ sw $zero, 0x38($s2) -/* A9447C 80240D3C AE400040 */ sw $zero, 0x40($s2) -/* A94480 80240D40 AE40001C */ sw $zero, 0x1c($s2) -/* A94484 80240D44 34420002 */ ori $v0, $v0, 2 -/* A94488 80240D48 E640003C */ swc1 $f0, 0x3c($s2) -/* A9448C 80240D4C 0C00EAFF */ jal disable_npc_shadow -/* A94490 80240D50 AE420000 */ sw $v0, ($s2) -/* A94494 80240D54 8E420000 */ lw $v0, ($s2) -/* A94498 80240D58 2403F7FF */ addiu $v1, $zero, -0x801 -/* A9449C 80240D5C 00431024 */ and $v0, $v0, $v1 -/* A944A0 80240D60 AE420000 */ sw $v0, ($s2) -/* A944A4 80240D64 8E620000 */ lw $v0, ($s3) -/* A944A8 80240D68 3C031F00 */ lui $v1, 0x1f00 -/* A944AC 80240D6C 00431025 */ or $v0, $v0, $v1 -/* A944B0 80240D70 AE620000 */ sw $v0, ($s3) -/* A944B4 80240D74 AEE00070 */ sw $zero, 0x70($s7) -.L80240D78: -/* A944B8 80240D78 0000102D */ daddu $v0, $zero, $zero -.L80240D7C: -/* A944BC 80240D7C 8FBF0050 */ lw $ra, 0x50($sp) -/* A944C0 80240D80 8FB7004C */ lw $s7, 0x4c($sp) -/* A944C4 80240D84 8FB60048 */ lw $s6, 0x48($sp) -/* A944C8 80240D88 8FB50044 */ lw $s5, 0x44($sp) -/* A944CC 80240D8C 8FB40040 */ lw $s4, 0x40($sp) -/* A944D0 80240D90 8FB3003C */ lw $s3, 0x3c($sp) -/* A944D4 80240D94 8FB20038 */ lw $s2, 0x38($sp) -/* A944D8 80240D98 8FB10034 */ lw $s1, 0x34($sp) -/* A944DC 80240D9C 8FB00030 */ lw $s0, 0x30($sp) -/* A944E0 80240DA0 03E00008 */ jr $ra -/* A944E4 80240DA4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/func_80241204_A93740.s b/asm/nonmatchings/world/area_kpa/kpa_102/func_80241204_A93740.s deleted file mode 100644 index 3d96863515..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/func_80241204_A93740.s +++ /dev/null @@ -1,213 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241204_A94944 -/* A94944 80241204 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A94948 80241208 AFB3003C */ sw $s3, 0x3c($sp) -/* A9494C 8024120C 0080982D */ daddu $s3, $a0, $zero -/* A94950 80241210 AFBF0048 */ sw $ra, 0x48($sp) -/* A94954 80241214 AFB50044 */ sw $s5, 0x44($sp) -/* A94958 80241218 AFB40040 */ sw $s4, 0x40($sp) -/* A9495C 8024121C AFB20038 */ sw $s2, 0x38($sp) -/* A94960 80241220 AFB10034 */ sw $s1, 0x34($sp) -/* A94964 80241224 AFB00030 */ sw $s0, 0x30($sp) -/* A94968 80241228 8E720148 */ lw $s2, 0x148($s3) -/* A9496C 8024122C 86440008 */ lh $a0, 8($s2) -/* A94970 80241230 8E70000C */ lw $s0, 0xc($s3) -/* A94974 80241234 0C00EABB */ jal get_npc_unsafe -/* A94978 80241238 00A0882D */ daddu $s1, $a1, $zero -/* A9497C 8024123C 0260202D */ daddu $a0, $s3, $zero -/* A94980 80241240 8E050000 */ lw $a1, ($s0) -/* A94984 80241244 0C0B1EAF */ jal get_variable -/* A94988 80241248 0040A02D */ daddu $s4, $v0, $zero -/* A9498C 8024124C AFA00010 */ sw $zero, 0x10($sp) -/* A94990 80241250 8E4300D0 */ lw $v1, 0xd0($s2) -/* A94994 80241254 8C630030 */ lw $v1, 0x30($v1) -/* A94998 80241258 AFA30014 */ sw $v1, 0x14($sp) -/* A9499C 8024125C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A949A0 80241260 8C63001C */ lw $v1, 0x1c($v1) -/* A949A4 80241264 AFA30018 */ sw $v1, 0x18($sp) -/* A949A8 80241268 8E4300D0 */ lw $v1, 0xd0($s2) -/* A949AC 8024126C 8C630024 */ lw $v1, 0x24($v1) -/* A949B0 80241270 AFA3001C */ sw $v1, 0x1c($sp) -/* A949B4 80241274 8E4300D0 */ lw $v1, 0xd0($s2) -/* A949B8 80241278 8C630028 */ lw $v1, 0x28($v1) -/* A949BC 8024127C 27B50010 */ addiu $s5, $sp, 0x10 -/* A949C0 80241280 AFA30020 */ sw $v1, 0x20($sp) -/* A949C4 80241284 8E4300D0 */ lw $v1, 0xd0($s2) -/* A949C8 80241288 3C014220 */ lui $at, 0x4220 -/* A949CC 8024128C 44810000 */ mtc1 $at, $f0 -/* A949D0 80241290 8C63002C */ lw $v1, 0x2c($v1) -/* A949D4 80241294 0040802D */ daddu $s0, $v0, $zero -/* A949D8 80241298 E7A00028 */ swc1 $f0, 0x28($sp) -/* A949DC 8024129C A7A0002C */ sh $zero, 0x2c($sp) -/* A949E0 802412A0 16200005 */ bnez $s1, .L802412B8 -/* A949E4 802412A4 AFA30024 */ sw $v1, 0x24($sp) -/* A949E8 802412A8 8E4200B0 */ lw $v0, 0xb0($s2) -/* A949EC 802412AC 30420004 */ andi $v0, $v0, 4 -/* A949F0 802412B0 1040002F */ beqz $v0, .L80241370 -/* A949F4 802412B4 00000000 */ nop -.L802412B8: -/* A949F8 802412B8 2404F7FF */ addiu $a0, $zero, -0x801 -/* A949FC 802412BC AE600070 */ sw $zero, 0x70($s3) -/* A94A00 802412C0 A680008E */ sh $zero, 0x8e($s4) -/* A94A04 802412C4 8E4200CC */ lw $v0, 0xcc($s2) -/* A94A08 802412C8 8E830000 */ lw $v1, ($s4) -/* A94A0C 802412CC 8C420000 */ lw $v0, ($v0) -/* A94A10 802412D0 00641824 */ and $v1, $v1, $a0 -/* A94A14 802412D4 AE830000 */ sw $v1, ($s4) -/* A94A18 802412D8 AE820028 */ sw $v0, 0x28($s4) -/* A94A1C 802412DC 8E4200D0 */ lw $v0, 0xd0($s2) -/* A94A20 802412E0 8C420034 */ lw $v0, 0x34($v0) -/* A94A24 802412E4 54400005 */ bnel $v0, $zero, .L802412FC -/* A94A28 802412E8 2402FDFF */ addiu $v0, $zero, -0x201 -/* A94A2C 802412EC 34620200 */ ori $v0, $v1, 0x200 -/* A94A30 802412F0 2403FFF7 */ addiu $v1, $zero, -9 -/* A94A34 802412F4 080904C1 */ j .L80241304 -/* A94A38 802412F8 00431024 */ and $v0, $v0, $v1 -.L802412FC: -/* A94A3C 802412FC 00621024 */ and $v0, $v1, $v0 -/* A94A40 80241300 34420008 */ ori $v0, $v0, 8 -.L80241304: -/* A94A44 80241304 AE820000 */ sw $v0, ($s4) -/* A94A48 80241308 8E4200B0 */ lw $v0, 0xb0($s2) -/* A94A4C 8024130C 30420004 */ andi $v0, $v0, 4 -/* A94A50 80241310 10400008 */ beqz $v0, .L80241334 -/* A94A54 80241314 24020063 */ addiu $v0, $zero, 0x63 -/* A94A58 80241318 AE620070 */ sw $v0, 0x70($s3) -/* A94A5C 8024131C AE600074 */ sw $zero, 0x74($s3) -/* A94A60 80241320 8E4200B0 */ lw $v0, 0xb0($s2) -/* A94A64 80241324 2403FFFB */ addiu $v1, $zero, -5 -/* A94A68 80241328 00431024 */ and $v0, $v0, $v1 -/* A94A6C 8024132C 080904D3 */ j .L8024134C -/* A94A70 80241330 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241334: -/* A94A74 80241334 8E420000 */ lw $v0, ($s2) -/* A94A78 80241338 3C034000 */ lui $v1, 0x4000 -/* A94A7C 8024133C 00431024 */ and $v0, $v0, $v1 -/* A94A80 80241340 10400002 */ beqz $v0, .L8024134C -/* A94A84 80241344 2402000C */ addiu $v0, $zero, 0xc -/* A94A88 80241348 AE620070 */ sw $v0, 0x70($s3) -.L8024134C: -/* A94A8C 8024134C 3C05BFFF */ lui $a1, 0xbfff -/* A94A90 80241350 34A5FFFF */ ori $a1, $a1, 0xffff -/* A94A94 80241354 2404FFFB */ addiu $a0, $zero, -5 -/* A94A98 80241358 8E4200B0 */ lw $v0, 0xb0($s2) -/* A94A9C 8024135C 8E430000 */ lw $v1, ($s2) -/* A94AA0 80241360 00441024 */ and $v0, $v0, $a0 -/* A94AA4 80241364 00651824 */ and $v1, $v1, $a1 -/* A94AA8 80241368 AE4200B0 */ sw $v0, 0xb0($s2) -/* A94AAC 8024136C AE430000 */ sw $v1, ($s2) -.L80241370: -/* A94AB0 80241370 8E630070 */ lw $v1, 0x70($s3) -/* A94AB4 80241374 2C620064 */ sltiu $v0, $v1, 0x64 -/* A94AB8 80241378 10400060 */ beqz $v0, .L802414FC -/* A94ABC 8024137C 00031080 */ sll $v0, $v1, 2 -/* A94AC0 80241380 3C018024 */ lui $at, 0x8024 -/* A94AC4 80241384 00220821 */ addu $at, $at, $v0 -/* A94AC8 80241388 8C225B48 */ lw $v0, 0x5b48($at) -/* A94ACC 8024138C 00400008 */ jr $v0 -/* A94AD0 80241390 00000000 */ nop -/* A94AD4 80241394 0260202D */ daddu $a0, $s3, $zero -/* A94AD8 80241398 0200282D */ daddu $a1, $s0, $zero -/* A94ADC 8024139C 0C012568 */ jal func_800495A0 -/* A94AE0 802413A0 02A0302D */ daddu $a2, $s5, $zero -/* A94AE4 802413A4 0260202D */ daddu $a0, $s3, $zero -/* A94AE8 802413A8 0200282D */ daddu $a1, $s0, $zero -/* A94AEC 802413AC 0C0125AE */ jal func_800496B8 -/* A94AF0 802413B0 02A0302D */ daddu $a2, $s5, $zero -/* A94AF4 802413B4 0809053F */ j .L802414FC -/* A94AF8 802413B8 00000000 */ nop -/* A94AFC 802413BC 0260202D */ daddu $a0, $s3, $zero -/* A94B00 802413C0 0200282D */ daddu $a1, $s0, $zero -/* A94B04 802413C4 0C0126D1 */ jal func_80049B44 -/* A94B08 802413C8 02A0302D */ daddu $a2, $s5, $zero -/* A94B0C 802413CC 0260202D */ daddu $a0, $s3, $zero -/* A94B10 802413D0 0200282D */ daddu $a1, $s0, $zero -/* A94B14 802413D4 0C012701 */ jal func_80049C04 -/* A94B18 802413D8 02A0302D */ daddu $a2, $s5, $zero -/* A94B1C 802413DC 0809053F */ j .L802414FC -/* A94B20 802413E0 00000000 */ nop -/* A94B24 802413E4 0260202D */ daddu $a0, $s3, $zero -/* A94B28 802413E8 0200282D */ daddu $a1, $s0, $zero -/* A94B2C 802413EC 0C01278F */ jal func_80049E3C -/* A94B30 802413F0 02A0302D */ daddu $a2, $s5, $zero -/* A94B34 802413F4 0260202D */ daddu $a0, $s3, $zero -/* A94B38 802413F8 0200282D */ daddu $a1, $s0, $zero -/* A94B3C 802413FC 0C0127B3 */ jal func_80049ECC -/* A94B40 80241400 02A0302D */ daddu $a2, $s5, $zero -/* A94B44 80241404 0809053F */ j .L802414FC -/* A94B48 80241408 00000000 */ nop -/* A94B4C 8024140C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A94B50 80241410 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A94B54 80241414 C68C0038 */ lwc1 $f12, 0x38($s4) -/* A94B58 80241418 C68E0040 */ lwc1 $f14, 0x40($s4) -/* A94B5C 8024141C 8C460028 */ lw $a2, 0x28($v0) -/* A94B60 80241420 0C00A7B5 */ jal dist2D -/* A94B64 80241424 8C470030 */ lw $a3, 0x30($v0) -/* A94B68 80241428 8E42006C */ lw $v0, 0x6c($s2) -/* A94B6C 8024142C 10400008 */ beqz $v0, .L80241450 -/* A94B70 80241430 46000086 */ mov.s $f2, $f0 -/* A94B74 80241434 44820000 */ mtc1 $v0, $f0 -/* A94B78 80241438 00000000 */ nop -/* A94B7C 8024143C 46800020 */ cvt.s.w $f0, $f0 -/* A94B80 80241440 4602003C */ c.lt.s $f0, $f2 -/* A94B84 80241444 00000000 */ nop -/* A94B88 80241448 4500000B */ bc1f .L80241478 -/* A94B8C 8024144C 0260202D */ daddu $a0, $s3, $zero -.L80241450: -/* A94B90 80241450 0260202D */ daddu $a0, $s3, $zero -/* A94B94 80241454 8E050024 */ lw $a1, 0x24($s0) -/* A94B98 80241458 8E060028 */ lw $a2, 0x28($s0) -/* A94B9C 8024145C 0C090140 */ jal func_80240500 -/* A94BA0 80241460 02A0382D */ daddu $a3, $s5, $zero -/* A94BA4 80241464 8E630070 */ lw $v1, 0x70($s3) -/* A94BA8 80241468 2402000C */ addiu $v0, $zero, 0xc -/* A94BAC 8024146C 14620023 */ bne $v1, $v0, .L802414FC -/* A94BB0 80241470 00000000 */ nop -/* A94BB4 80241474 0260202D */ daddu $a0, $s3, $zero -.L80241478: -/* A94BB8 80241478 0200282D */ daddu $a1, $s0, $zero -/* A94BBC 8024147C 0C0127DF */ jal func_80049F7C -/* A94BC0 80241480 02A0302D */ daddu $a2, $s5, $zero -/* A94BC4 80241484 0260202D */ daddu $a0, $s3, $zero -/* A94BC8 80241488 0200282D */ daddu $a1, $s0, $zero -/* A94BCC 8024148C 0C012849 */ jal func_8004A124 -/* A94BD0 80241490 02A0302D */ daddu $a2, $s5, $zero -/* A94BD4 80241494 0809053F */ j .L802414FC -/* A94BD8 80241498 00000000 */ nop -/* A94BDC 8024149C 0260202D */ daddu $a0, $s3, $zero -/* A94BE0 802414A0 0200282D */ daddu $a1, $s0, $zero -/* A94BE4 802414A4 0C0128FA */ jal func_8004A3E8 -/* A94BE8 802414A8 02A0302D */ daddu $a2, $s5, $zero -/* A94BEC 802414AC 0809053F */ j .L802414FC -/* A94BF0 802414B0 00000000 */ nop -/* A94BF4 802414B4 0C090191 */ jal func_80240644 -/* A94BF8 802414B8 0260202D */ daddu $a0, $s3, $zero -/* A94BFC 802414BC 0809053F */ j .L802414FC -/* A94C00 802414C0 00000000 */ nop -/* A94C04 802414C4 0C0901D1 */ jal func_80240744 -/* A94C08 802414C8 0260202D */ daddu $a0, $s3, $zero -/* A94C0C 802414CC 0809053F */ j .L802414FC -/* A94C10 802414D0 00000000 */ nop -/* A94C14 802414D4 0C0901E2 */ jal func_80240788 -/* A94C18 802414D8 0260202D */ daddu $a0, $s3, $zero -/* A94C1C 802414DC 0809053F */ j .L802414FC -/* A94C20 802414E0 00000000 */ nop -/* A94C24 802414E4 0C09020A */ jal func_80240828 -/* A94C28 802414E8 0260202D */ daddu $a0, $s3, $zero -/* A94C2C 802414EC 0809053F */ j .L802414FC -/* A94C30 802414F0 00000000 */ nop -/* A94C34 802414F4 0C0129CF */ jal func_8004A73C -/* A94C38 802414F8 0260202D */ daddu $a0, $s3, $zero -.L802414FC: -/* A94C3C 802414FC 8FBF0048 */ lw $ra, 0x48($sp) -/* A94C40 80241500 8FB50044 */ lw $s5, 0x44($sp) -/* A94C44 80241504 8FB40040 */ lw $s4, 0x40($sp) -/* A94C48 80241508 8FB3003C */ lw $s3, 0x3c($sp) -/* A94C4C 8024150C 8FB20038 */ lw $s2, 0x38($sp) -/* A94C50 80241510 8FB10034 */ lw $s1, 0x34($sp) -/* A94C54 80241514 8FB00030 */ lw $s0, 0x30($sp) -/* A94C58 80241518 0000102D */ daddu $v0, $zero, $zero -/* A94C5C 8024151C 03E00008 */ jr $ra -/* A94C60 80241520 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/func_80241524_A93740.s b/asm/nonmatchings/world/area_kpa/kpa_102/func_80241524_A93740.s deleted file mode 100644 index d207d590a6..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/func_80241524_A93740.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241524_A94C64 -/* A94C64 80241524 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A94C68 80241528 3C05FE36 */ lui $a1, 0xfe36 -/* A94C6C 8024152C AFBF0010 */ sw $ra, 0x10($sp) -/* A94C70 80241530 8C820148 */ lw $v0, 0x148($a0) -/* A94C74 80241534 3C06800B */ lui $a2, 0x800b -/* A94C78 80241538 8CC60F9C */ lw $a2, 0xf9c($a2) -/* A94C7C 8024153C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A94C80 80241540 00C23026 */ xor $a2, $a2, $v0 -/* A94C84 80241544 0C0B2026 */ jal set_variable -/* A94C88 80241548 2CC60001 */ sltiu $a2, $a2, 1 -/* A94C8C 8024154C 8FBF0010 */ lw $ra, 0x10($sp) -/* A94C90 80241550 24020002 */ addiu $v0, $zero, 2 -/* A94C94 80241554 03E00008 */ jr $ra -/* A94C98 80241558 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/func_80241870_A93740.s b/asm/nonmatchings/world/area_kpa/kpa_102/func_80241870_A93740.s deleted file mode 100644 index 8dc5421054..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/func_80241870_A93740.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241870_A94FB0 -/* A94FB0 80241870 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A94FB4 80241874 AFB10014 */ sw $s1, 0x14($sp) -/* A94FB8 80241878 0080882D */ daddu $s1, $a0, $zero -/* A94FBC 8024187C AFBF0018 */ sw $ra, 0x18($sp) -/* A94FC0 80241880 AFB00010 */ sw $s0, 0x10($sp) -/* A94FC4 80241884 8E300148 */ lw $s0, 0x148($s1) -/* A94FC8 80241888 0C00EABB */ jal get_npc_unsafe -/* A94FCC 8024188C 86040008 */ lh $a0, 8($s0) -/* A94FD0 80241890 0040202D */ daddu $a0, $v0, $zero -/* A94FD4 80241894 9482008E */ lhu $v0, 0x8e($a0) -/* A94FD8 80241898 24030003 */ addiu $v1, $zero, 3 -/* A94FDC 8024189C 24420001 */ addiu $v0, $v0, 1 -/* A94FE0 802418A0 A482008E */ sh $v0, 0x8e($a0) -/* A94FE4 802418A4 00021400 */ sll $v0, $v0, 0x10 -/* A94FE8 802418A8 00021403 */ sra $v0, $v0, 0x10 -/* A94FEC 802418AC 14430003 */ bne $v0, $v1, .L802418BC -/* A94FF0 802418B0 00000000 */ nop -/* A94FF4 802418B4 96020086 */ lhu $v0, 0x86($s0) -/* A94FF8 802418B8 A48200A8 */ sh $v0, 0xa8($a0) -.L802418BC: -/* A94FFC 802418BC 8482008E */ lh $v0, 0x8e($a0) -/* A95000 802418C0 8E030080 */ lw $v1, 0x80($s0) -/* A95004 802418C4 0043102A */ slt $v0, $v0, $v1 -/* A95008 802418C8 14400004 */ bnez $v0, .L802418DC -/* A9500C 802418CC 00000000 */ nop -/* A95010 802418D0 96020086 */ lhu $v0, 0x86($s0) -/* A95014 802418D4 A48200A8 */ sh $v0, 0xa8($a0) -/* A95018 802418D8 AE200070 */ sw $zero, 0x70($s1) -.L802418DC: -/* A9501C 802418DC 8FBF0018 */ lw $ra, 0x18($sp) -/* A95020 802418E0 8FB10014 */ lw $s1, 0x14($sp) -/* A95024 802418E4 8FB00010 */ lw $s0, 0x10($sp) -/* A95028 802418E8 03E00008 */ jr $ra -/* A9502C 802418EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/func_802418F0_A93740.s b/asm/nonmatchings/world/area_kpa/kpa_102/func_802418F0_A93740.s deleted file mode 100644 index 0c7d736c67..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/func_802418F0_A93740.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418F0_A95030 -/* A95030 802418F0 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A95034 802418F4 AFB3005C */ sw $s3, 0x5c($sp) -/* A95038 802418F8 0080982D */ daddu $s3, $a0, $zero -/* A9503C 802418FC AFBF0068 */ sw $ra, 0x68($sp) -/* A95040 80241900 AFB50064 */ sw $s5, 0x64($sp) -/* A95044 80241904 AFB40060 */ sw $s4, 0x60($sp) -/* A95048 80241908 AFB20058 */ sw $s2, 0x58($sp) -/* A9504C 8024190C AFB10054 */ sw $s1, 0x54($sp) -/* A95050 80241910 AFB00050 */ sw $s0, 0x50($sp) -/* A95054 80241914 8E710148 */ lw $s1, 0x148($s3) -/* A95058 80241918 86240008 */ lh $a0, 8($s1) -/* A9505C 8024191C 0C00EABB */ jal get_npc_unsafe -/* A95060 80241920 00A0802D */ daddu $s0, $a1, $zero -/* A95064 80241924 8E63000C */ lw $v1, 0xc($s3) -/* A95068 80241928 0260202D */ daddu $a0, $s3, $zero -/* A9506C 8024192C 8C650000 */ lw $a1, ($v1) -/* A95070 80241930 0C0B1EAF */ jal get_variable -/* A95074 80241934 0040902D */ daddu $s2, $v0, $zero -/* A95078 80241938 AFA00028 */ sw $zero, 0x28($sp) -/* A9507C 8024193C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A95080 80241940 8C630030 */ lw $v1, 0x30($v1) -/* A95084 80241944 AFA3002C */ sw $v1, 0x2c($sp) -/* A95088 80241948 8E2300D0 */ lw $v1, 0xd0($s1) -/* A9508C 8024194C 8C63001C */ lw $v1, 0x1c($v1) -/* A95090 80241950 AFA30030 */ sw $v1, 0x30($sp) -/* A95094 80241954 8E2300D0 */ lw $v1, 0xd0($s1) -/* A95098 80241958 8C630024 */ lw $v1, 0x24($v1) -/* A9509C 8024195C AFA30034 */ sw $v1, 0x34($sp) -/* A950A0 80241960 8E2300D0 */ lw $v1, 0xd0($s1) -/* A950A4 80241964 8C630028 */ lw $v1, 0x28($v1) -/* A950A8 80241968 27B50028 */ addiu $s5, $sp, 0x28 -/* A950AC 8024196C AFA30038 */ sw $v1, 0x38($sp) -/* A950B0 80241970 8E2300D0 */ lw $v1, 0xd0($s1) -/* A950B4 80241974 3C0142C8 */ lui $at, 0x42c8 -/* A950B8 80241978 44810000 */ mtc1 $at, $f0 -/* A950BC 8024197C 8C63002C */ lw $v1, 0x2c($v1) -/* A950C0 80241980 0040A02D */ daddu $s4, $v0, $zero -/* A950C4 80241984 E7A00040 */ swc1 $f0, 0x40($sp) -/* A950C8 80241988 A7A00044 */ sh $zero, 0x44($sp) -/* A950CC 8024198C 12000009 */ beqz $s0, .L802419B4 -/* A950D0 80241990 AFA3003C */ sw $v1, 0x3c($sp) -/* A950D4 80241994 864300A8 */ lh $v1, 0xa8($s2) -/* A950D8 80241998 8E2200B0 */ lw $v0, 0xb0($s1) -/* A950DC 8024199C AE20008C */ sw $zero, 0x8c($s1) -/* A950E0 802419A0 A22000B5 */ sb $zero, 0xb5($s1) -/* A950E4 802419A4 34420008 */ ori $v0, $v0, 8 -/* A950E8 802419A8 AE230084 */ sw $v1, 0x84($s1) -/* A950EC 802419AC 08090671 */ j .L802419C4 -/* A950F0 802419B0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802419B4: -/* A950F4 802419B4 8E2200B0 */ lw $v0, 0xb0($s1) -/* A950F8 802419B8 30420004 */ andi $v0, $v0, 4 -/* A950FC 802419BC 10400047 */ beqz $v0, .L80241ADC -/* A95100 802419C0 00000000 */ nop -.L802419C4: -/* A95104 802419C4 AE600070 */ sw $zero, 0x70($s3) -/* A95108 802419C8 A640008E */ sh $zero, 0x8e($s2) -/* A9510C 802419CC 8E2300CC */ lw $v1, 0xcc($s1) -/* A95110 802419D0 2404F7FF */ addiu $a0, $zero, -0x801 -/* A95114 802419D4 A2200007 */ sb $zero, 7($s1) -/* A95118 802419D8 8E420000 */ lw $v0, ($s2) -/* A9511C 802419DC 8C630000 */ lw $v1, ($v1) -/* A95120 802419E0 00441024 */ and $v0, $v0, $a0 -/* A95124 802419E4 AE420000 */ sw $v0, ($s2) -/* A95128 802419E8 AE430028 */ sw $v1, 0x28($s2) -/* A9512C 802419EC 96220086 */ lhu $v0, 0x86($s1) -/* A95130 802419F0 A64200A8 */ sh $v0, 0xa8($s2) -/* A95134 802419F4 8E2200D0 */ lw $v0, 0xd0($s1) -/* A95138 802419F8 AE200090 */ sw $zero, 0x90($s1) -/* A9513C 802419FC 8C420034 */ lw $v0, 0x34($v0) -/* A95140 80241A00 14400006 */ bnez $v0, .L80241A1C -/* A95144 80241A04 2403FDFF */ addiu $v1, $zero, -0x201 -/* A95148 80241A08 8E420000 */ lw $v0, ($s2) -/* A9514C 80241A0C 2403FFF7 */ addiu $v1, $zero, -9 -/* A95150 80241A10 34420200 */ ori $v0, $v0, 0x200 -/* A95154 80241A14 0809068A */ j .L80241A28 -/* A95158 80241A18 00431024 */ and $v0, $v0, $v1 -.L80241A1C: -/* A9515C 80241A1C 8E420000 */ lw $v0, ($s2) -/* A95160 80241A20 00431024 */ and $v0, $v0, $v1 -/* A95164 80241A24 34420008 */ ori $v0, $v0, 8 -.L80241A28: -/* A95168 80241A28 AE420000 */ sw $v0, ($s2) -/* A9516C 80241A2C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A95170 80241A30 30420004 */ andi $v0, $v0, 4 -/* A95174 80241A34 1040001E */ beqz $v0, .L80241AB0 -/* A95178 80241A38 24040002 */ addiu $a0, $zero, 2 -/* A9517C 80241A3C 0240282D */ daddu $a1, $s2, $zero -/* A95180 80241A40 0000302D */ daddu $a2, $zero, $zero -/* A95184 80241A44 24020063 */ addiu $v0, $zero, 0x63 -/* A95188 80241A48 AE620070 */ sw $v0, 0x70($s3) -/* A9518C 80241A4C AE600074 */ sw $zero, 0x74($s3) -/* A95190 80241A50 864300A8 */ lh $v1, 0xa8($s2) -/* A95194 80241A54 3C013F80 */ lui $at, 0x3f80 -/* A95198 80241A58 44810000 */ mtc1 $at, $f0 -/* A9519C 80241A5C 3C014000 */ lui $at, 0x4000 -/* A951A0 80241A60 44811000 */ mtc1 $at, $f2 -/* A951A4 80241A64 3C01C1A0 */ lui $at, 0xc1a0 -/* A951A8 80241A68 44812000 */ mtc1 $at, $f4 -/* A951AC 80241A6C 24020028 */ addiu $v0, $zero, 0x28 -/* A951B0 80241A70 AFA2001C */ sw $v0, 0x1c($sp) -/* A951B4 80241A74 44833000 */ mtc1 $v1, $f6 -/* A951B8 80241A78 00000000 */ nop -/* A951BC 80241A7C 468031A0 */ cvt.s.w $f6, $f6 -/* A951C0 80241A80 44073000 */ mfc1 $a3, $f6 -/* A951C4 80241A84 27A20048 */ addiu $v0, $sp, 0x48 -/* A951C8 80241A88 AFA20020 */ sw $v0, 0x20($sp) -/* A951CC 80241A8C E7A00010 */ swc1 $f0, 0x10($sp) -/* A951D0 80241A90 E7A20014 */ swc1 $f2, 0x14($sp) -/* A951D4 80241A94 0C01BFA4 */ jal fx_emote -/* A951D8 80241A98 E7A40018 */ swc1 $f4, 0x18($sp) -/* A951DC 80241A9C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A951E0 80241AA0 2403FFFB */ addiu $v1, $zero, -5 -/* A951E4 80241AA4 00431024 */ and $v0, $v0, $v1 -/* A951E8 80241AA8 080906B7 */ j .L80241ADC -/* A951EC 80241AAC AE2200B0 */ sw $v0, 0xb0($s1) -.L80241AB0: -/* A951F0 80241AB0 8E220000 */ lw $v0, ($s1) -/* A951F4 80241AB4 3C034000 */ lui $v1, 0x4000 -/* A951F8 80241AB8 00431024 */ and $v0, $v0, $v1 -/* A951FC 80241ABC 10400007 */ beqz $v0, .L80241ADC -/* A95200 80241AC0 3C03BFFF */ lui $v1, 0xbfff -/* A95204 80241AC4 2402000C */ addiu $v0, $zero, 0xc -/* A95208 80241AC8 AE620070 */ sw $v0, 0x70($s3) -/* A9520C 80241ACC 8E220000 */ lw $v0, ($s1) -/* A95210 80241AD0 3463FFFF */ ori $v1, $v1, 0xffff -/* A95214 80241AD4 00431024 */ and $v0, $v0, $v1 -/* A95218 80241AD8 AE220000 */ sw $v0, ($s1) -.L80241ADC: -/* A9521C 80241ADC 8E220090 */ lw $v0, 0x90($s1) -/* A95220 80241AE0 1840000C */ blez $v0, .L80241B14 -/* A95224 80241AE4 2442FFFF */ addiu $v0, $v0, -1 -/* A95228 80241AE8 14400087 */ bnez $v0, .L80241D08 -/* A9522C 80241AEC AE220090 */ sw $v0, 0x90($s1) -/* A95230 80241AF0 3C03FFAA */ lui $v1, 0xffaa -/* A95234 80241AF4 8E420028 */ lw $v0, 0x28($s2) -/* A95238 80241AF8 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A9523C 80241AFC 00431021 */ addu $v0, $v0, $v1 -/* A95240 80241B00 2C420002 */ sltiu $v0, $v0, 2 -/* A95244 80241B04 10400003 */ beqz $v0, .L80241B14 -/* A95248 80241B08 3C020055 */ lui $v0, 0x55 -/* A9524C 80241B0C 3442000C */ ori $v0, $v0, 0xc -/* A95250 80241B10 AE420028 */ sw $v0, 0x28($s2) -.L80241B14: -/* A95254 80241B14 8E630070 */ lw $v1, 0x70($s3) -/* A95258 80241B18 2402000C */ addiu $v0, $zero, 0xc -/* A9525C 80241B1C 10620048 */ beq $v1, $v0, .L80241C40 -/* A95260 80241B20 2862000D */ slti $v0, $v1, 0xd -/* A95264 80241B24 1040000F */ beqz $v0, .L80241B64 -/* A95268 80241B28 24100001 */ addiu $s0, $zero, 1 -/* A9526C 80241B2C 1070001E */ beq $v1, $s0, .L80241BA8 -/* A95270 80241B30 28620002 */ slti $v0, $v1, 2 -/* A95274 80241B34 10400005 */ beqz $v0, .L80241B4C -/* A95278 80241B38 24020002 */ addiu $v0, $zero, 2 -/* A9527C 80241B3C 10600015 */ beqz $v1, .L80241B94 -/* A95280 80241B40 0260202D */ daddu $a0, $s3, $zero -/* A95284 80241B44 08090727 */ j .L80241C9C -/* A95288 80241B48 00000000 */ nop -.L80241B4C: -/* A9528C 80241B4C 1062001C */ beq $v1, $v0, .L80241BC0 -/* A95290 80241B50 24020003 */ addiu $v0, $zero, 3 -/* A95294 80241B54 10620035 */ beq $v1, $v0, .L80241C2C -/* A95298 80241B58 0260202D */ daddu $a0, $s3, $zero -/* A9529C 80241B5C 08090727 */ j .L80241C9C -/* A952A0 80241B60 00000000 */ nop -.L80241B64: -/* A952A4 80241B64 2402000E */ addiu $v0, $zero, 0xe -/* A952A8 80241B68 1062003F */ beq $v1, $v0, .L80241C68 -/* A952AC 80241B6C 0062102A */ slt $v0, $v1, $v0 -/* A952B0 80241B70 14400038 */ bnez $v0, .L80241C54 -/* A952B4 80241B74 0260202D */ daddu $a0, $s3, $zero -/* A952B8 80241B78 2402000F */ addiu $v0, $zero, 0xf -/* A952BC 80241B7C 10620040 */ beq $v1, $v0, .L80241C80 -/* A952C0 80241B80 24020063 */ addiu $v0, $zero, 0x63 -/* A952C4 80241B84 10620043 */ beq $v1, $v0, .L80241C94 -/* A952C8 80241B88 00000000 */ nop -/* A952CC 80241B8C 08090727 */ j .L80241C9C -/* A952D0 80241B90 00000000 */ nop -.L80241B94: -/* A952D4 80241B94 0280282D */ daddu $a1, $s4, $zero -/* A952D8 80241B98 0C012568 */ jal func_800495A0 -/* A952DC 80241B9C 02A0302D */ daddu $a2, $s5, $zero -/* A952E0 80241BA0 96220086 */ lhu $v0, 0x86($s1) -/* A952E4 80241BA4 A64200A8 */ sh $v0, 0xa8($s2) -.L80241BA8: -/* A952E8 80241BA8 0260202D */ daddu $a0, $s3, $zero -/* A952EC 80241BAC 0280282D */ daddu $a1, $s4, $zero -/* A952F0 80241BB0 0C0125AE */ jal func_800496B8 -/* A952F4 80241BB4 02A0302D */ daddu $a2, $s5, $zero -/* A952F8 80241BB8 08090727 */ j .L80241C9C -/* A952FC 80241BBC 00000000 */ nop -.L80241BC0: -/* A95300 80241BC0 0260202D */ daddu $a0, $s3, $zero -/* A95304 80241BC4 0280282D */ daddu $a1, $s4, $zero -/* A95308 80241BC8 0C0126D1 */ jal func_80049B44 -/* A9530C 80241BCC 02A0302D */ daddu $a2, $s5, $zero -/* A95310 80241BD0 8E230088 */ lw $v1, 0x88($s1) -/* A95314 80241BD4 24020006 */ addiu $v0, $zero, 6 -/* A95318 80241BD8 14620014 */ bne $v1, $v0, .L80241C2C -/* A9531C 80241BDC 0260202D */ daddu $a0, $s3, $zero -/* A95320 80241BE0 0C00A67F */ jal rand_int -/* A95324 80241BE4 24040064 */ addiu $a0, $zero, 0x64 -/* A95328 80241BE8 28420021 */ slti $v0, $v0, 0x21 -/* A9532C 80241BEC 5040000F */ beql $v0, $zero, .L80241C2C -/* A95330 80241BF0 0260202D */ daddu $a0, $s3, $zero -/* A95334 80241BF4 8E22008C */ lw $v0, 0x8c($s1) -/* A95338 80241BF8 10400005 */ beqz $v0, .L80241C10 -/* A9533C 80241BFC 3C020055 */ lui $v0, 0x55 -/* A95340 80241C00 3442002F */ ori $v0, $v0, 0x2f -/* A95344 80241C04 AE20008C */ sw $zero, 0x8c($s1) -/* A95348 80241C08 08090707 */ j .L80241C1C -/* A9534C 80241C0C A22000B5 */ sb $zero, 0xb5($s1) -.L80241C10: -/* A95350 80241C10 3442002E */ ori $v0, $v0, 0x2e -/* A95354 80241C14 AE30008C */ sw $s0, 0x8c($s1) -/* A95358 80241C18 A23000B5 */ sb $s0, 0xb5($s1) -.L80241C1C: -/* A9535C 80241C1C AE420028 */ sw $v0, 0x28($s2) -/* A95360 80241C20 24020007 */ addiu $v0, $zero, 7 -/* A95364 80241C24 08090742 */ j .L80241D08 -/* A95368 80241C28 AE220090 */ sw $v0, 0x90($s1) -.L80241C2C: -/* A9536C 80241C2C 0280282D */ daddu $a1, $s4, $zero -/* A95370 80241C30 0C012701 */ jal func_80049C04 -/* A95374 80241C34 02A0302D */ daddu $a2, $s5, $zero -/* A95378 80241C38 08090727 */ j .L80241C9C -/* A9537C 80241C3C 00000000 */ nop -.L80241C40: -/* A95380 80241C40 0260202D */ daddu $a0, $s3, $zero -/* A95384 80241C44 0280282D */ daddu $a1, $s4, $zero -/* A95388 80241C48 0C090557 */ jal func_8024155C -/* A9538C 80241C4C 02A0302D */ daddu $a2, $s5, $zero -/* A95390 80241C50 0260202D */ daddu $a0, $s3, $zero -.L80241C54: -/* A95394 80241C54 0280282D */ daddu $a1, $s4, $zero -/* A95398 80241C58 0C090576 */ jal func_802415D8 -/* A9539C 80241C5C 02A0302D */ daddu $a2, $s5, $zero -/* A953A0 80241C60 08090727 */ j .L80241C9C -/* A953A4 80241C64 00000000 */ nop -.L80241C68: -/* A953A8 80241C68 0260202D */ daddu $a0, $s3, $zero -/* A953AC 80241C6C 0280282D */ daddu $a1, $s4, $zero -/* A953B0 80241C70 0C0905C3 */ jal func_8024170C -/* A953B4 80241C74 02A0302D */ daddu $a2, $s5, $zero -/* A953B8 80241C78 08090727 */ j .L80241C9C -/* A953BC 80241C7C 00000000 */ nop -.L80241C80: -/* A953C0 80241C80 0280282D */ daddu $a1, $s4, $zero -/* A953C4 80241C84 0C09061C */ jal func_80241870 -/* A953C8 80241C88 02A0302D */ daddu $a2, $s5, $zero -/* A953CC 80241C8C 08090727 */ j .L80241C9C -/* A953D0 80241C90 00000000 */ nop -.L80241C94: -/* A953D4 80241C94 0C0129CF */ jal func_8004A73C -/* A953D8 80241C98 0260202D */ daddu $a0, $s3, $zero -.L80241C9C: -/* A953DC 80241C9C 8E230088 */ lw $v1, 0x88($s1) -/* A953E0 80241CA0 24020006 */ addiu $v0, $zero, 6 -/* A953E4 80241CA4 14620019 */ bne $v1, $v0, .L80241D0C -/* A953E8 80241CA8 0000102D */ daddu $v0, $zero, $zero -/* A953EC 80241CAC 8E22008C */ lw $v0, 0x8c($s1) -/* A953F0 80241CB0 10400003 */ beqz $v0, .L80241CC0 -/* A953F4 80241CB4 24020001 */ addiu $v0, $zero, 1 -/* A953F8 80241CB8 08090731 */ j .L80241CC4 -/* A953FC 80241CBC A22200B5 */ sb $v0, 0xb5($s1) -.L80241CC0: -/* A95400 80241CC0 A22000B5 */ sb $zero, 0xb5($s1) -.L80241CC4: -/* A95404 80241CC4 8E22008C */ lw $v0, 0x8c($s1) -/* A95408 80241CC8 1040000F */ beqz $v0, .L80241D08 -/* A9540C 80241CCC 3C03FFAA */ lui $v1, 0xffaa -/* A95410 80241CD0 8E420028 */ lw $v0, 0x28($s2) -/* A95414 80241CD4 3463FFFC */ ori $v1, $v1, 0xfffc -/* A95418 80241CD8 00431821 */ addu $v1, $v0, $v1 -/* A9541C 80241CDC 2C620015 */ sltiu $v0, $v1, 0x15 -/* A95420 80241CE0 10400009 */ beqz $v0, .L80241D08 -/* A95424 80241CE4 00031080 */ sll $v0, $v1, 2 -/* A95428 80241CE8 3C018024 */ lui $at, 0x8024 -/* A9542C 80241CEC 00220821 */ addu $at, $at, $v0 -/* A95430 80241CF0 8C225CE0 */ lw $v0, 0x5ce0($at) -/* A95434 80241CF4 00400008 */ jr $v0 -/* A95438 80241CF8 00000000 */ nop -/* A9543C 80241CFC 8E420028 */ lw $v0, 0x28($s2) -/* A95440 80241D00 24420001 */ addiu $v0, $v0, 1 -/* A95444 80241D04 AE420028 */ sw $v0, 0x28($s2) -.L80241D08: -/* A95448 80241D08 0000102D */ daddu $v0, $zero, $zero -.L80241D0C: -/* A9544C 80241D0C 8FBF0068 */ lw $ra, 0x68($sp) -/* A95450 80241D10 8FB50064 */ lw $s5, 0x64($sp) -/* A95454 80241D14 8FB40060 */ lw $s4, 0x60($sp) -/* A95458 80241D18 8FB3005C */ lw $s3, 0x5c($sp) -/* A9545C 80241D1C 8FB20058 */ lw $s2, 0x58($sp) -/* A95460 80241D20 8FB10054 */ lw $s1, 0x54($sp) -/* A95464 80241D24 8FB00050 */ lw $s0, 0x50($sp) -/* A95468 80241D28 03E00008 */ jr $ra -/* A9546C 80241D2C 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/func_80241D30_A93740.s b/asm/nonmatchings/world/area_kpa/kpa_102/func_80241D30_A93740.s deleted file mode 100644 index 304dfc04a1..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/func_80241D30_A93740.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D30_A95470 -/* A95470 80241D30 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A95474 80241D34 AFB00018 */ sw $s0, 0x18($sp) -/* A95478 80241D38 AFBF0024 */ sw $ra, 0x24($sp) -/* A9547C 80241D3C AFB20020 */ sw $s2, 0x20($sp) -/* A95480 80241D40 AFB1001C */ sw $s1, 0x1c($sp) -/* A95484 80241D44 F7B60030 */ sdc1 $f22, 0x30($sp) -/* A95488 80241D48 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A9548C 80241D4C 8C920148 */ lw $s2, 0x148($a0) -/* A95490 80241D50 4485A000 */ mtc1 $a1, $f20 -/* A95494 80241D54 86440008 */ lh $a0, 8($s2) -/* A95498 80241D58 4486B000 */ mtc1 $a2, $f22 -/* A9549C 80241D5C 0C00EABB */ jal get_npc_unsafe -/* A954A0 80241D60 00E0802D */ daddu $s0, $a3, $zero -/* A954A4 80241D64 0200202D */ daddu $a0, $s0, $zero -/* A954A8 80241D68 0040882D */ daddu $s1, $v0, $zero -/* A954AC 80241D6C 4406A000 */ mfc1 $a2, $f20 -/* A954B0 80241D70 4407B000 */ mfc1 $a3, $f22 -/* A954B4 80241D74 3C03800A */ lui $v1, 0x800a -/* A954B8 80241D78 8463A634 */ lh $v1, -0x59cc($v1) -/* A954BC 80241D7C 3C05800B */ lui $a1, %hi(gCameras) -/* A954C0 80241D80 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A954C4 80241D84 AFA00010 */ sw $zero, 0x10($sp) -/* A954C8 80241D88 00031080 */ sll $v0, $v1, 2 -/* A954CC 80241D8C 00431021 */ addu $v0, $v0, $v1 -/* A954D0 80241D90 00021080 */ sll $v0, $v0, 2 -/* A954D4 80241D94 00431023 */ subu $v0, $v0, $v1 -/* A954D8 80241D98 000218C0 */ sll $v1, $v0, 3 -/* A954DC 80241D9C 00431021 */ addu $v0, $v0, $v1 -/* A954E0 80241DA0 000210C0 */ sll $v0, $v0, 3 -/* A954E4 80241DA4 00458021 */ addu $s0, $v0, $a1 -/* A954E8 80241DA8 0C01242D */ jal func_800490B4 -/* A954EC 80241DAC 0240282D */ daddu $a1, $s2, $zero -/* A954F0 80241DB0 1040004B */ beqz $v0, .L80241EE0 -/* A954F4 80241DB4 2402FFFF */ addiu $v0, $zero, -1 -/* A954F8 80241DB8 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A954FC 80241DBC C62E000C */ lwc1 $f14, 0xc($s1) -/* A95500 80241DC0 3C014387 */ lui $at, 0x4387 -/* A95504 80241DC4 4481A000 */ mtc1 $at, $f20 -/* A95508 80241DC8 0C00A70A */ jal get_clamped_angle_diff -/* A9550C 80241DCC 00000000 */ nop -/* A95510 80241DD0 0C00A6C9 */ jal clamp_angle -/* A95514 80241DD4 46000306 */ mov.s $f12, $f0 -/* A95518 80241DD8 3C018024 */ lui $at, 0x8024 -/* A9551C 80241DDC D4225D38 */ ldc1 $f2, 0x5d38($at) -/* A95520 80241DE0 46000021 */ cvt.d.s $f0, $f0 -/* A95524 80241DE4 4622003C */ c.lt.d $f0, $f2 -/* A95528 80241DE8 00000000 */ nop -/* A9552C 80241DEC 45000003 */ bc1f .L80241DFC -/* A95530 80241DF0 00000000 */ nop -/* A95534 80241DF4 3C0142B4 */ lui $at, 0x42b4 -/* A95538 80241DF8 4481A000 */ mtc1 $at, $f20 -.L80241DFC: -/* A9553C 80241DFC 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* A95540 80241E00 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* A95544 80241E04 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A95548 80241E08 8E020000 */ lw $v0, ($s0) -/* A9554C 80241E0C C62E0040 */ lwc1 $f14, 0x40($s1) -/* A95550 80241E10 8C460028 */ lw $a2, 0x28($v0) -/* A95554 80241E14 0C00A720 */ jal atan2 -/* A95558 80241E18 8C470030 */ lw $a3, 0x30($v0) -/* A9555C 80241E1C 4600A306 */ mov.s $f12, $f20 -/* A95560 80241E20 0C00A70A */ jal get_clamped_angle_diff -/* A95564 80241E24 46000386 */ mov.s $f14, $f0 -/* A95568 80241E28 46000005 */ abs.s $f0, $f0 -/* A9556C 80241E2C 3C018024 */ lui $at, 0x8024 -/* A95570 80241E30 D4225D40 */ ldc1 $f2, 0x5d40($at) -/* A95574 80241E34 46000021 */ cvt.d.s $f0, $f0 -/* A95578 80241E38 4620103C */ c.lt.d $f2, $f0 -/* A9557C 80241E3C 00000000 */ nop -/* A95580 80241E40 45010027 */ bc1t .L80241EE0 -/* A95584 80241E44 2402FFFF */ addiu $v0, $zero, -1 -/* A95588 80241E48 8E020000 */ lw $v0, ($s0) -/* A9558C 80241E4C C6200038 */ lwc1 $f0, 0x38($s1) -/* A95590 80241E50 C4420028 */ lwc1 $f2, 0x28($v0) -/* A95594 80241E54 44806000 */ mtc1 $zero, $f12 -/* A95598 80241E58 46020001 */ sub.s $f0, $f0, $f2 -/* A9559C 80241E5C C62E003C */ lwc1 $f14, 0x3c($s1) -/* A955A0 80241E60 8C47002C */ lw $a3, 0x2c($v0) -/* A955A4 80241E64 46000005 */ abs.s $f0, $f0 -/* A955A8 80241E68 44060000 */ mfc1 $a2, $f0 -/* A955AC 80241E6C 0C00A720 */ jal atan2 -/* A955B0 80241E70 00000000 */ nop -/* A955B4 80241E74 3C018024 */ lui $at, 0x8024 -/* A955B8 80241E78 D4225D48 */ ldc1 $f2, 0x5d48($at) -/* A955BC 80241E7C 46000021 */ cvt.d.s $f0, $f0 -/* A955C0 80241E80 46220001 */ sub.d $f0, $f0, $f2 -/* A955C4 80241E84 3C018024 */ lui $at, 0x8024 -/* A955C8 80241E88 D4225D50 */ ldc1 $f2, 0x5d50($at) -/* A955CC 80241E8C 46200020 */ cvt.s.d $f0, $f0 -/* A955D0 80241E90 46000005 */ abs.s $f0, $f0 -/* A955D4 80241E94 46000021 */ cvt.d.s $f0, $f0 -/* A955D8 80241E98 4620103C */ c.lt.d $f2, $f0 -/* A955DC 80241E9C 00000000 */ nop -/* A955E0 80241EA0 4501000F */ bc1t .L80241EE0 -/* A955E4 80241EA4 2402FFFF */ addiu $v0, $zero, -1 -/* A955E8 80241EA8 3C038011 */ lui $v1, 0x8011 -/* A955EC 80241EAC 8063EBB3 */ lb $v1, -0x144d($v1) -/* A955F0 80241EB0 24020009 */ addiu $v0, $zero, 9 -/* A955F4 80241EB4 10620009 */ beq $v1, $v0, .L80241EDC -/* A955F8 80241EB8 24020007 */ addiu $v0, $zero, 7 -/* A955FC 80241EBC 50620008 */ beql $v1, $v0, .L80241EE0 -/* A95600 80241EC0 2402FFFF */ addiu $v0, $zero, -1 -/* A95604 80241EC4 86440008 */ lh $a0, 8($s2) -/* A95608 80241EC8 0C00FB3A */ jal get_enemy -/* A9560C 80241ECC 24840001 */ addiu $a0, $a0, 1 -/* A95610 80241ED0 8C43006C */ lw $v1, 0x6c($v0) -/* A95614 80241ED4 10600002 */ beqz $v1, .L80241EE0 -/* A95618 80241ED8 24020001 */ addiu $v0, $zero, 1 -.L80241EDC: -/* A9561C 80241EDC 2402FFFF */ addiu $v0, $zero, -1 -.L80241EE0: -/* A95620 80241EE0 8FBF0024 */ lw $ra, 0x24($sp) -/* A95624 80241EE4 8FB20020 */ lw $s2, 0x20($sp) -/* A95628 80241EE8 8FB1001C */ lw $s1, 0x1c($sp) -/* A9562C 80241EEC 8FB00018 */ lw $s0, 0x18($sp) -/* A95630 80241EF0 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A95634 80241EF4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A95638 80241EF8 03E00008 */ jr $ra -/* A9563C 80241EFC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/func_80241F00_A93740.s b/asm/nonmatchings/world/area_kpa/kpa_102/func_80241F00_A93740.s deleted file mode 100644 index 8c24464546..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/func_80241F00_A93740.s +++ /dev/null @@ -1,336 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F00_A95640 -/* A95640 80241F00 27BDFC78 */ addiu $sp, $sp, -0x388 -/* A95644 80241F04 AFB60378 */ sw $s6, 0x378($sp) -/* A95648 80241F08 0080B02D */ daddu $s6, $a0, $zero -/* A9564C 80241F0C AFBF037C */ sw $ra, 0x37c($sp) -/* A95650 80241F10 AFB50374 */ sw $s5, 0x374($sp) -/* A95654 80241F14 AFB40370 */ sw $s4, 0x370($sp) -/* A95658 80241F18 AFB3036C */ sw $s3, 0x36c($sp) -/* A9565C 80241F1C AFB20368 */ sw $s2, 0x368($sp) -/* A95660 80241F20 AFB10364 */ sw $s1, 0x364($sp) -/* A95664 80241F24 AFB00360 */ sw $s0, 0x360($sp) -/* A95668 80241F28 F7B40380 */ sdc1 $f20, 0x380($sp) -/* A9566C 80241F2C 8ED20148 */ lw $s2, 0x148($s6) -/* A95670 80241F30 86440008 */ lh $a0, 8($s2) -/* A95674 80241F34 0C00EABB */ jal get_npc_unsafe -/* A95678 80241F38 00A0802D */ daddu $s0, $a1, $zero -/* A9567C 80241F3C 86440008 */ lh $a0, 8($s2) -/* A95680 80241F40 0040882D */ daddu $s1, $v0, $zero -/* A95684 80241F44 0C00FB3A */ jal get_enemy -/* A95688 80241F48 2484FFFF */ addiu $a0, $a0, -1 -/* A9568C 80241F4C 84440008 */ lh $a0, 8($v0) -/* A95690 80241F50 0C00EABB */ jal get_npc_unsafe -/* A95694 80241F54 0000A82D */ daddu $s5, $zero, $zero -/* A95698 80241F58 27B30020 */ addiu $s3, $sp, 0x20 -/* A9569C 80241F5C 16000005 */ bnez $s0, .L80241F74 -/* A956A0 80241F60 0040A02D */ daddu $s4, $v0, $zero -/* A956A4 80241F64 8E4200B0 */ lw $v0, 0xb0($s2) -/* A956A8 80241F68 30420004 */ andi $v0, $v0, 4 -/* A956AC 80241F6C 10400018 */ beqz $v0, .L80241FD0 -/* A956B0 80241F70 00000000 */ nop -.L80241F74: -/* A956B4 80241F74 3C030024 */ lui $v1, 0x24 -/* A956B8 80241F78 34630102 */ ori $v1, $v1, 0x102 -/* A956BC 80241F7C 3C041620 */ lui $a0, 0x1620 -/* A956C0 80241F80 AEC00070 */ sw $zero, 0x70($s6) -/* A956C4 80241F84 8E220000 */ lw $v0, ($s1) -/* A956C8 80241F88 34840040 */ ori $a0, $a0, 0x40 -/* A956CC 80241F8C A620008E */ sh $zero, 0x8e($s1) -/* A956D0 80241F90 00431025 */ or $v0, $v0, $v1 -/* A956D4 80241F94 AE220000 */ sw $v0, ($s1) -/* A956D8 80241F98 8E420000 */ lw $v0, ($s2) -/* A956DC 80241F9C 3C013ECC */ lui $at, 0x3ecc -/* A956E0 80241FA0 3421CCCD */ ori $at, $at, 0xcccd -/* A956E4 80241FA4 44810000 */ mtc1 $at, $f0 -/* A956E8 80241FA8 00441025 */ or $v0, $v0, $a0 -/* A956EC 80241FAC AE420000 */ sw $v0, ($s2) -/* A956F0 80241FB0 E6200054 */ swc1 $f0, 0x54($s1) -/* A956F4 80241FB4 E6200058 */ swc1 $f0, 0x58($s1) -/* A956F8 80241FB8 8E4300B0 */ lw $v1, 0xb0($s2) -/* A956FC 80241FBC 30620004 */ andi $v0, $v1, 4 -/* A95700 80241FC0 10400003 */ beqz $v0, .L80241FD0 -/* A95704 80241FC4 2402FFFB */ addiu $v0, $zero, -5 -/* A95708 80241FC8 00621024 */ and $v0, $v1, $v0 -/* A9570C 80241FCC AE4200B0 */ sw $v0, 0xb0($s2) -.L80241FD0: -/* A95710 80241FD0 8EC30070 */ lw $v1, 0x70($s6) -/* A95714 80241FD4 2C620005 */ sltiu $v0, $v1, 5 -/* A95718 80241FD8 10400101 */ beqz $v0, .L802423E0 -/* A9571C 80241FDC 00031080 */ sll $v0, $v1, 2 -/* A95720 80241FE0 3C018024 */ lui $at, 0x8024 -/* A95724 80241FE4 00220821 */ addu $at, $at, $v0 -/* A95728 80241FE8 8C225D58 */ lw $v0, 0x5d58($at) -/* A9572C 80241FEC 00400008 */ jr $v0 -/* A95730 80241FF0 00000000 */ nop -/* A95734 80241FF4 3C01C47A */ lui $at, 0xc47a -/* A95738 80241FF8 44810000 */ mtc1 $at, $f0 -/* A9573C 80241FFC 24020014 */ addiu $v0, $zero, 0x14 -/* A95740 80242000 AE400078 */ sw $zero, 0x78($s2) -/* A95744 80242004 A62200A6 */ sh $v0, 0xa6($s1) -/* A95748 80242008 A62200A8 */ sh $v0, 0xa8($s1) -/* A9574C 8024200C 24020001 */ addiu $v0, $zero, 1 -/* A95750 80242010 AE200038 */ sw $zero, 0x38($s1) -/* A95754 80242014 AE200040 */ sw $zero, 0x40($s1) -/* A95758 80242018 E620003C */ swc1 $f0, 0x3c($s1) -/* A9575C 8024201C AE40006C */ sw $zero, 0x6c($s2) -/* A95760 80242020 AEC20070 */ sw $v0, 0x70($s6) -/* A95764 80242024 8E50006C */ lw $s0, 0x6c($s2) -/* A95768 80242028 24020001 */ addiu $v0, $zero, 1 -/* A9576C 8024202C 160200EC */ bne $s0, $v0, .L802423E0 -/* A95770 80242030 24150002 */ addiu $s5, $zero, 2 -/* A95774 80242034 AE55006C */ sw $s5, 0x6c($s2) -/* A95778 80242038 C6800038 */ lwc1 $f0, 0x38($s4) -/* A9577C 8024203C E6600038 */ swc1 $f0, 0x38($s3) -/* A95780 80242040 C680003C */ lwc1 $f0, 0x3c($s4) -/* A95784 80242044 E660003C */ swc1 $f0, 0x3c($s3) -/* A95788 80242048 C6800040 */ lwc1 $f0, 0x40($s4) -/* A9578C 8024204C E6600040 */ swc1 $f0, 0x40($s3) -/* A95790 80242050 C6820034 */ lwc1 $f2, 0x34($s4) -/* A95794 80242054 3C014387 */ lui $at, 0x4387 -/* A95798 80242058 44810000 */ mtc1 $at, $f0 -/* A9579C 8024205C 00000000 */ nop -/* A957A0 80242060 46020001 */ sub.s $f0, $f0, $f2 -/* A957A4 80242064 C6480074 */ lwc1 $f8, 0x74($s2) -/* A957A8 80242068 46804220 */ cvt.s.w $f8, $f8 -/* A957AC 8024206C 44054000 */ mfc1 $a1, $f8 -/* A957B0 80242070 44060000 */ mfc1 $a2, $f0 -/* A957B4 80242074 0C00EA95 */ jal npc_move_heading -/* A957B8 80242078 0260202D */ daddu $a0, $s3, $zero -/* A957BC 8024207C C6600038 */ lwc1 $f0, 0x38($s3) -/* A957C0 80242080 E6200038 */ swc1 $f0, 0x38($s1) -/* A957C4 80242084 C680003C */ lwc1 $f0, 0x3c($s4) -/* A957C8 80242088 C6420070 */ lwc1 $f2, 0x70($s2) -/* A957CC 8024208C 468010A0 */ cvt.s.w $f2, $f2 -/* A957D0 80242090 46020000 */ add.s $f0, $f0, $f2 -/* A957D4 80242094 3C014024 */ lui $at, 0x4024 -/* A957D8 80242098 4481A800 */ mtc1 $at, $f21 -/* A957DC 8024209C 4480A000 */ mtc1 $zero, $f20 -/* A957E0 802420A0 E620003C */ swc1 $f0, 0x3c($s1) -/* A957E4 802420A4 C6600040 */ lwc1 $f0, 0x40($s3) -/* A957E8 802420A8 E6200040 */ swc1 $f0, 0x40($s1) -/* A957EC 802420AC A2500007 */ sb $s0, 7($s2) -/* A957F0 802420B0 C6200038 */ lwc1 $f0, 0x38($s1) -/* A957F4 802420B4 3C014066 */ lui $at, 0x4066 -/* A957F8 802420B8 34216666 */ ori $at, $at, 0x6666 -/* A957FC 802420BC 44811000 */ mtc1 $at, $f2 -/* A95800 802420C0 4600020D */ trunc.w.s $f8, $f0 -/* A95804 802420C4 44024000 */ mfc1 $v0, $f8 -/* A95808 802420C8 00000000 */ nop -/* A9580C 802420CC A6420010 */ sh $v0, 0x10($s2) -/* A95810 802420D0 C620003C */ lwc1 $f0, 0x3c($s1) -/* A95814 802420D4 3C13800F */ lui $s3, %hi(gPlayerStatusPtr) -/* A95818 802420D8 26737B30 */ addiu $s3, $s3, %lo(gPlayerStatusPtr) -/* A9581C 802420DC 4600020D */ trunc.w.s $f8, $f0 -/* A95820 802420E0 44024000 */ mfc1 $v0, $f8 -/* A95824 802420E4 00000000 */ nop -/* A95828 802420E8 A6420012 */ sh $v0, 0x12($s2) -/* A9582C 802420EC C6200040 */ lwc1 $f0, 0x40($s1) -/* A95830 802420F0 8E630000 */ lw $v1, ($s3) -/* A95834 802420F4 4600020D */ trunc.w.s $f8, $f0 -/* A95838 802420F8 44024000 */ mfc1 $v0, $f8 -/* A9583C 802420FC 00000000 */ nop -/* A95840 80242100 A6420014 */ sh $v0, 0x14($s2) -/* A95844 80242104 E6220018 */ swc1 $f2, 0x18($s1) -/* A95848 80242108 C460002C */ lwc1 $f0, 0x2c($v1) -/* A9584C 8024210C C6220038 */ lwc1 $f2, 0x38($s1) -/* A95850 80242110 46000021 */ cvt.d.s $f0, $f0 -/* A95854 80242114 46340000 */ add.d $f0, $f0, $f20 -/* A95858 80242118 C4640028 */ lwc1 $f4, 0x28($v1) -/* A9585C 8024211C 44806000 */ mtc1 $zero, $f12 -/* A95860 80242120 46041081 */ sub.s $f2, $f2, $f4 -/* A95864 80242124 C62E003C */ lwc1 $f14, 0x3c($s1) -/* A95868 80242128 46200020 */ cvt.s.d $f0, $f0 -/* A9586C 8024212C 46001085 */ abs.s $f2, $f2 -/* A95870 80242130 44070000 */ mfc1 $a3, $f0 -/* A95874 80242134 44061000 */ mfc1 $a2, $f2 -/* A95878 80242138 0C00A720 */ jal atan2 -/* A9587C 8024213C 00000000 */ nop -/* A95880 80242140 3C018024 */ lui $at, 0x8024 -/* A95884 80242144 D4225D70 */ ldc1 $f2, 0x5d70($at) -/* A95888 80242148 46000021 */ cvt.d.s $f0, $f0 -/* A9588C 8024214C 46220001 */ sub.d $f0, $f0, $f2 -/* A95890 80242150 46200020 */ cvt.s.d $f0, $f0 -/* A95894 80242154 4600020D */ trunc.w.s $f8, $f0 -/* A95898 80242158 44044000 */ mfc1 $a0, $f8 -/* A9589C 8024215C 00000000 */ nop -/* A958A0 80242160 00042400 */ sll $a0, $a0, 0x10 -/* A958A4 80242164 0C00A4F5 */ jal cosine -/* A958A8 80242168 00042403 */ sra $a0, $a0, 0x10 -/* A958AC 8024216C C6220018 */ lwc1 $f2, 0x18($s1) -/* A958B0 80242170 46020002 */ mul.s $f0, $f0, $f2 -/* A958B4 80242174 00000000 */ nop -/* A958B8 80242178 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A958BC 8024217C C62E0040 */ lwc1 $f14, 0x40($s1) -/* A958C0 80242180 8E620000 */ lw $v0, ($s3) -/* A958C4 80242184 E620001C */ swc1 $f0, 0x1c($s1) -/* A958C8 80242188 8C460028 */ lw $a2, 0x28($v0) -/* A958CC 8024218C 0C00A720 */ jal atan2 -/* A958D0 80242190 8C470030 */ lw $a3, 0x30($v0) -/* A958D4 80242194 8E620000 */ lw $v0, ($s3) -/* A958D8 80242198 E620000C */ swc1 $f0, 0xc($s1) -/* A958DC 8024219C C440002C */ lwc1 $f0, 0x2c($v0) -/* A958E0 802421A0 46000021 */ cvt.d.s $f0, $f0 -/* A958E4 802421A4 46340000 */ add.d $f0, $f0, $f20 -/* A958E8 802421A8 46200020 */ cvt.s.d $f0, $f0 -/* A958EC 802421AC E7A00010 */ swc1 $f0, 0x10($sp) -/* A958F0 802421B0 C4400030 */ lwc1 $f0, 0x30($v0) -/* A958F4 802421B4 E7A00014 */ swc1 $f0, 0x14($sp) -/* A958F8 802421B8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A958FC 802421BC C62E003C */ lwc1 $f14, 0x3c($s1) -/* A95900 802421C0 8E260040 */ lw $a2, 0x40($s1) -/* A95904 802421C4 0C00A7CB */ jal dist3D -/* A95908 802421C8 8C470028 */ lw $a3, 0x28($v0) -/* A9590C 802421CC C6220018 */ lwc1 $f2, 0x18($s1) -/* A95910 802421D0 46020003 */ div.s $f0, $f0, $f2 -/* A95914 802421D4 4600020D */ trunc.w.s $f8, $f0 -/* A95918 802421D8 44104000 */ mfc1 $s0, $f8 -/* A9591C 802421DC 00000000 */ nop -/* A95920 802421E0 5A000001 */ blezl $s0, .L802421E8 -/* A95924 802421E4 24100001 */ addiu $s0, $zero, 1 -.L802421E8: -/* A95928 802421E8 8E620000 */ lw $v0, ($s3) -/* A9592C 802421EC C624003C */ lwc1 $f4, 0x3c($s1) -/* A95930 802421F0 3C014120 */ lui $at, 0x4120 -/* A95934 802421F4 44811000 */ mtc1 $at, $f2 -/* A95938 802421F8 C4400028 */ lwc1 $f0, 0x28($v0) -/* A9593C 802421FC E7A00010 */ swc1 $f0, 0x10($sp) -/* A95940 80242200 C440002C */ lwc1 $f0, 0x2c($v0) -/* A95944 80242204 46020000 */ add.s $f0, $f0, $f2 -/* A95948 80242208 3C014160 */ lui $at, 0x4160 -/* A9594C 8024220C 44811000 */ mtc1 $at, $f2 -/* A95950 80242210 00000000 */ nop -/* A95954 80242214 46022100 */ add.s $f4, $f4, $f2 -/* A95958 80242218 46020000 */ add.s $f0, $f0, $f2 -/* A9595C 8024221C 44062000 */ mfc1 $a2, $f4 -/* A95960 80242220 E7A00014 */ swc1 $f0, 0x14($sp) -/* A95964 80242224 C4400030 */ lwc1 $f0, 0x30($v0) -/* A95968 80242228 AFB0001C */ sw $s0, 0x1c($sp) -/* A9596C 8024222C E7A00018 */ swc1 $f0, 0x18($sp) -/* A95970 80242230 8E250038 */ lw $a1, 0x38($s1) -/* A95974 80242234 8E270040 */ lw $a3, 0x40($s1) -/* A95978 80242238 0C01BFD4 */ jal func_8006FF50 -/* A9597C 8024223C 0000202D */ daddu $a0, $zero, $zero -/* A95980 80242240 AE420078 */ sw $v0, 0x78($s2) -/* A95984 80242244 A630008E */ sh $s0, 0x8e($s1) -/* A95988 80242248 080908F8 */ j .L802423E0 -/* A9598C 8024224C AED50070 */ sw $s5, 0x70($s6) -/* A95990 80242250 9622008E */ lhu $v0, 0x8e($s1) -/* A95994 80242254 2442FFFF */ addiu $v0, $v0, -1 -/* A95998 80242258 A622008E */ sh $v0, 0x8e($s1) -/* A9599C 8024225C 00021400 */ sll $v0, $v0, 0x10 -/* A959A0 80242260 58400001 */ blezl $v0, .L80242268 -/* A959A4 80242264 24150014 */ addiu $s5, $zero, 0x14 -.L80242268: -/* A959A8 80242268 16A0000A */ bnez $s5, .L80242294 -/* A959AC 8024226C 00000000 */ nop -/* A959B0 80242270 8E250018 */ lw $a1, 0x18($s1) -/* A959B4 80242274 8E26000C */ lw $a2, 0xc($s1) -/* A959B8 80242278 0C00EA95 */ jal npc_move_heading -/* A959BC 8024227C 0220202D */ daddu $a0, $s1, $zero -/* A959C0 80242280 C620003C */ lwc1 $f0, 0x3c($s1) -/* A959C4 80242284 C622001C */ lwc1 $f2, 0x1c($s1) -/* A959C8 80242288 46020000 */ add.s $f0, $f0, $f2 -/* A959CC 8024228C 080908F8 */ j .L802423E0 -/* A959D0 80242290 E620003C */ swc1 $f0, 0x3c($s1) -.L80242294: -/* A959D4 80242294 862200A8 */ lh $v0, 0xa8($s1) -/* A959D8 80242298 3C013FE0 */ lui $at, 0x3fe0 -/* A959DC 8024229C 44810800 */ mtc1 $at, $f1 -/* A959E0 802422A0 44800000 */ mtc1 $zero, $f0 -/* A959E4 802422A4 44821000 */ mtc1 $v0, $f2 -/* A959E8 802422A8 00000000 */ nop -/* A959EC 802422AC 468010A1 */ cvt.d.w $f2, $f2 -/* A959F0 802422B0 46201082 */ mul.d $f2, $f2, $f0 -/* A959F4 802422B4 00000000 */ nop -/* A959F8 802422B8 C620003C */ lwc1 $f0, 0x3c($s1) -/* A959FC 802422BC AE20001C */ sw $zero, 0x1c($s1) -/* A95A00 802422C0 46000021 */ cvt.d.s $f0, $f0 -/* A95A04 802422C4 46220001 */ sub.d $f0, $f0, $f2 -/* A95A08 802422C8 AE200018 */ sw $zero, 0x18($s1) -/* A95A0C 802422CC 24020003 */ addiu $v0, $zero, 3 -/* A95A10 802422D0 46200020 */ cvt.s.d $f0, $f0 -/* A95A14 802422D4 E620003C */ swc1 $f0, 0x3c($s1) -/* A95A18 802422D8 AE42006C */ sw $v0, 0x6c($s2) -/* A95A1C 802422DC 24020004 */ addiu $v0, $zero, 4 -/* A95A20 802422E0 A620008E */ sh $zero, 0x8e($s1) -/* A95A24 802422E4 080908F8 */ j .L802423E0 -/* A95A28 802422E8 AEC20070 */ sw $v0, 0x70($s6) -/* A95A2C 802422EC 9622008E */ lhu $v0, 0x8e($s1) -/* A95A30 802422F0 24420001 */ addiu $v0, $v0, 1 -/* A95A34 802422F4 A622008E */ sh $v0, 0x8e($s1) -/* A95A38 802422F8 00021400 */ sll $v0, $v0, 0x10 -/* A95A3C 802422FC 00021C03 */ sra $v1, $v0, 0x10 -/* A95A40 80242300 28620007 */ slti $v0, $v1, 7 -/* A95A44 80242304 10400027 */ beqz $v0, .L802423A4 -/* A95A48 80242308 24020007 */ addiu $v0, $zero, 7 -/* A95A4C 8024230C 8622008E */ lh $v0, 0x8e($s1) -/* A95A50 80242310 3C01401C */ lui $at, 0x401c -/* A95A54 80242314 44810800 */ mtc1 $at, $f1 -/* A95A58 80242318 44800000 */ mtc1 $zero, $f0 -/* A95A5C 8024231C 44822000 */ mtc1 $v0, $f4 -/* A95A60 80242320 00000000 */ nop -/* A95A64 80242324 46802120 */ cvt.s.w $f4, $f4 -/* A95A68 80242328 46002121 */ cvt.d.s $f4, $f4 -/* A95A6C 8024232C 46202102 */ mul.d $f4, $f4, $f0 -/* A95A70 80242330 00000000 */ nop -/* A95A74 80242334 44821000 */ mtc1 $v0, $f2 -/* A95A78 80242338 00000000 */ nop -/* A95A7C 8024233C 468010A0 */ cvt.s.w $f2, $f2 -/* A95A80 80242340 460010A1 */ cvt.d.s $f2, $f2 -/* A95A84 80242344 46201082 */ mul.d $f2, $f2, $f0 -/* A95A88 80242348 00000000 */ nop -/* A95A8C 8024234C C620003C */ lwc1 $f0, 0x3c($s1) -/* A95A90 80242350 3C01400C */ lui $at, 0x400c -/* A95A94 80242354 44813800 */ mtc1 $at, $f7 -/* A95A98 80242358 44803000 */ mtc1 $zero, $f6 -/* A95A9C 8024235C 46000021 */ cvt.d.s $f0, $f0 -/* A95AA0 80242360 46260001 */ sub.d $f0, $f0, $f6 -/* A95AA4 80242364 3C014034 */ lui $at, 0x4034 -/* A95AA8 80242368 44813800 */ mtc1 $at, $f7 -/* A95AAC 8024236C 44803000 */ mtc1 $zero, $f6 -/* A95AB0 80242370 00000000 */ nop -/* A95AB4 80242374 46262100 */ add.d $f4, $f4, $f6 -/* A95AB8 80242378 46200020 */ cvt.s.d $f0, $f0 -/* A95ABC 8024237C E620003C */ swc1 $f0, 0x3c($s1) -/* A95AC0 80242380 46261080 */ add.d $f2, $f2, $f6 -/* A95AC4 80242384 4620220D */ trunc.w.d $f8, $f4 -/* A95AC8 80242388 44024000 */ mfc1 $v0, $f8 -/* A95ACC 8024238C 00000000 */ nop -/* A95AD0 80242390 A62200A6 */ sh $v0, 0xa6($s1) -/* A95AD4 80242394 4620120D */ trunc.w.d $f8, $f2 -/* A95AD8 80242398 44024000 */ mfc1 $v0, $f8 -/* A95ADC 8024239C 080908F8 */ j .L802423E0 -/* A95AE0 802423A0 A62200A8 */ sh $v0, 0xa8($s1) -.L802423A4: -/* A95AE4 802423A4 1462000A */ bne $v1, $v0, .L802423D0 -/* A95AE8 802423A8 28620010 */ slti $v0, $v1, 0x10 -/* A95AEC 802423AC 3C01C47A */ lui $at, 0xc47a -/* A95AF0 802423B0 44810000 */ mtc1 $at, $f0 -/* A95AF4 802423B4 24020014 */ addiu $v0, $zero, 0x14 -/* A95AF8 802423B8 AE200038 */ sw $zero, 0x38($s1) -/* A95AFC 802423BC AE200040 */ sw $zero, 0x40($s1) -/* A95B00 802423C0 A62200A6 */ sh $v0, 0xa6($s1) -/* A95B04 802423C4 A62200A8 */ sh $v0, 0xa8($s1) -/* A95B08 802423C8 080908F8 */ j .L802423E0 -/* A95B0C 802423CC E620003C */ swc1 $f0, 0x3c($s1) -.L802423D0: -/* A95B10 802423D0 14400003 */ bnez $v0, .L802423E0 -/* A95B14 802423D4 00000000 */ nop -/* A95B18 802423D8 AE40006C */ sw $zero, 0x6c($s2) -/* A95B1C 802423DC AEC00070 */ sw $zero, 0x70($s6) -.L802423E0: -/* A95B20 802423E0 8FBF037C */ lw $ra, 0x37c($sp) -/* A95B24 802423E4 8FB60378 */ lw $s6, 0x378($sp) -/* A95B28 802423E8 8FB50374 */ lw $s5, 0x374($sp) -/* A95B2C 802423EC 8FB40370 */ lw $s4, 0x370($sp) -/* A95B30 802423F0 8FB3036C */ lw $s3, 0x36c($sp) -/* A95B34 802423F4 8FB20368 */ lw $s2, 0x368($sp) -/* A95B38 802423F8 8FB10364 */ lw $s1, 0x364($sp) -/* A95B3C 802423FC 8FB00360 */ lw $s0, 0x360($sp) -/* A95B40 80242400 D7B40380 */ ldc1 $f20, 0x380($sp) -/* A95B44 80242404 0000102D */ daddu $v0, $zero, $zero -/* A95B48 80242408 03E00008 */ jr $ra -/* A95B4C 8024240C 27BD0388 */ addiu $sp, $sp, 0x388 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/func_80242410_A93740.s b/asm/nonmatchings/world/area_kpa/kpa_102/func_80242410_A93740.s deleted file mode 100644 index 88c27fcbf7..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/func_80242410_A93740.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242410_A95B50 -/* A95B50 80242410 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A95B54 80242414 AFB00010 */ sw $s0, 0x10($sp) -/* A95B58 80242418 0080802D */ daddu $s0, $a0, $zero -/* A95B5C 8024241C AFBF0014 */ sw $ra, 0x14($sp) -/* A95B60 80242420 8E020148 */ lw $v0, 0x148($s0) -/* A95B64 80242424 0C00EABB */ jal get_npc_unsafe -/* A95B68 80242428 84440008 */ lh $a0, 8($v0) -/* A95B6C 8024242C 2403001E */ addiu $v1, $zero, 0x1e -/* A95B70 80242430 A443008E */ sh $v1, 0x8e($v0) -/* A95B74 80242434 2402000B */ addiu $v0, $zero, 0xb -/* A95B78 80242438 AE020070 */ sw $v0, 0x70($s0) -/* A95B7C 8024243C 8FBF0014 */ lw $ra, 0x14($sp) -/* A95B80 80242440 8FB00010 */ lw $s0, 0x10($sp) -/* A95B84 80242444 03E00008 */ jr $ra -/* A95B88 80242448 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/func_8024244C_A93740.s b/asm/nonmatchings/world/area_kpa/kpa_102/func_8024244C_A93740.s deleted file mode 100644 index 792d0bcd4c..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/func_8024244C_A93740.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024244C_A95B8C -/* A95B8C 8024244C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A95B90 80242450 AFB40040 */ sw $s4, 0x40($sp) -/* A95B94 80242454 0080A02D */ daddu $s4, $a0, $zero -/* A95B98 80242458 AFBF0044 */ sw $ra, 0x44($sp) -/* A95B9C 8024245C AFB3003C */ sw $s3, 0x3c($sp) -/* A95BA0 80242460 AFB20038 */ sw $s2, 0x38($sp) -/* A95BA4 80242464 AFB10034 */ sw $s1, 0x34($sp) -/* A95BA8 80242468 AFB00030 */ sw $s0, 0x30($sp) -/* A95BAC 8024246C F7B40048 */ sdc1 $f20, 0x48($sp) -/* A95BB0 80242470 8E900148 */ lw $s0, 0x148($s4) -/* A95BB4 80242474 00A0882D */ daddu $s1, $a1, $zero -/* A95BB8 80242478 86040008 */ lh $a0, 8($s0) -/* A95BBC 8024247C 0C00EABB */ jal get_npc_unsafe -/* A95BC0 80242480 00C0902D */ daddu $s2, $a2, $zero -/* A95BC4 80242484 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A95BC8 80242488 46806320 */ cvt.s.w $f12, $f12 -/* A95BCC 8024248C 0040982D */ daddu $s3, $v0, $zero -/* A95BD0 80242490 C6140070 */ lwc1 $f20, 0x70($s0) -/* A95BD4 80242494 4680A520 */ cvt.s.w $f20, $f20 -/* A95BD8 80242498 3C014059 */ lui $at, 0x4059 -/* A95BDC 8024249C 44810800 */ mtc1 $at, $f1 -/* A95BE0 802424A0 44800000 */ mtc1 $zero, $f0 -/* A95BE4 802424A4 4600A521 */ cvt.d.s $f20, $f20 -/* A95BE8 802424A8 4620A503 */ div.d $f20, $f20, $f0 -/* A95BEC 802424AC 0C00A8BB */ jal sin_deg -/* A95BF0 802424B0 4620A520 */ cvt.s.d $f20, $f20 -/* A95BF4 802424B4 3C014018 */ lui $at, 0x4018 -/* A95BF8 802424B8 44811800 */ mtc1 $at, $f3 -/* A95BFC 802424BC 44801000 */ mtc1 $zero, $f2 -/* A95C00 802424C0 46000021 */ cvt.d.s $f0, $f0 -/* A95C04 802424C4 46220002 */ mul.d $f0, $f0, $f2 -/* A95C08 802424C8 00000000 */ nop -/* A95C0C 802424CC 4600A0A1 */ cvt.d.s $f2, $f20 -/* A95C10 802424D0 46201080 */ add.d $f2, $f2, $f0 -/* A95C14 802424D4 462010A0 */ cvt.s.d $f2, $f2 -/* A95C18 802424D8 E662003C */ swc1 $f2, 0x3c($s3) -/* A95C1C 802424DC 8E02006C */ lw $v0, 0x6c($s0) -/* A95C20 802424E0 2442000A */ addiu $v0, $v0, 0xa -/* A95C24 802424E4 44826000 */ mtc1 $v0, $f12 -/* A95C28 802424E8 00000000 */ nop -/* A95C2C 802424EC 0C00A6C9 */ jal clamp_angle -/* A95C30 802424F0 46806320 */ cvt.s.w $f12, $f12 -/* A95C34 802424F4 4600018D */ trunc.w.s $f6, $f0 -/* A95C38 802424F8 E606006C */ swc1 $f6, 0x6c($s0) -/* A95C3C 802424FC 0280202D */ daddu $a0, $s4, $zero -/* A95C40 80242500 8E250024 */ lw $a1, 0x24($s1) -/* A95C44 80242504 8E260028 */ lw $a2, 0x28($s1) -/* A95C48 80242508 0C09074C */ jal func_80241D30 -/* A95C4C 8024250C 0240382D */ daddu $a3, $s2, $zero -/* A95C50 80242510 24030001 */ addiu $v1, $zero, 1 -/* A95C54 80242514 1443001E */ bne $v0, $v1, .L80242590 -/* A95C58 80242518 0000202D */ daddu $a0, $zero, $zero -/* A95C5C 8024251C 0260282D */ daddu $a1, $s3, $zero -/* A95C60 80242520 0000302D */ daddu $a2, $zero, $zero -/* A95C64 80242524 866300A8 */ lh $v1, 0xa8($s3) -/* A95C68 80242528 3C013F80 */ lui $at, 0x3f80 -/* A95C6C 8024252C 44810000 */ mtc1 $at, $f0 -/* A95C70 80242530 3C014000 */ lui $at, 0x4000 -/* A95C74 80242534 44811000 */ mtc1 $at, $f2 -/* A95C78 80242538 3C01C1A0 */ lui $at, 0xc1a0 -/* A95C7C 8024253C 44812000 */ mtc1 $at, $f4 -/* A95C80 80242540 2402000F */ addiu $v0, $zero, 0xf -/* A95C84 80242544 AFA2001C */ sw $v0, 0x1c($sp) -/* A95C88 80242548 44833000 */ mtc1 $v1, $f6 -/* A95C8C 8024254C 00000000 */ nop -/* A95C90 80242550 468031A0 */ cvt.s.w $f6, $f6 -/* A95C94 80242554 44073000 */ mfc1 $a3, $f6 -/* A95C98 80242558 27A20028 */ addiu $v0, $sp, 0x28 -/* A95C9C 8024255C AFA20020 */ sw $v0, 0x20($sp) -/* A95CA0 80242560 E7A00010 */ swc1 $f0, 0x10($sp) -/* A95CA4 80242564 E7A20014 */ swc1 $f2, 0x14($sp) -/* A95CA8 80242568 0C01BFA4 */ jal fx_emote -/* A95CAC 8024256C E7A40018 */ swc1 $f4, 0x18($sp) -/* A95CB0 80242570 0260202D */ daddu $a0, $s3, $zero -/* A95CB4 80242574 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A95CB8 80242578 0C012530 */ jal func_800494C0 -/* A95CBC 8024257C 3C060020 */ lui $a2, 0x20 -/* A95CC0 80242580 24020032 */ addiu $v0, $zero, 0x32 -/* A95CC4 80242584 A662008E */ sh $v0, 0x8e($s3) -/* A95CC8 80242588 0809096C */ j .L802425B0 -/* A95CCC 8024258C 24020014 */ addiu $v0, $zero, 0x14 -.L80242590: -/* A95CD0 80242590 9662008E */ lhu $v0, 0x8e($s3) -/* A95CD4 80242594 2442FFFF */ addiu $v0, $v0, -1 -/* A95CD8 80242598 A662008E */ sh $v0, 0x8e($s3) -/* A95CDC 8024259C 00021400 */ sll $v0, $v0, 0x10 -/* A95CE0 802425A0 1C400004 */ bgtz $v0, .L802425B4 -/* A95CE4 802425A4 24020005 */ addiu $v0, $zero, 5 -/* A95CE8 802425A8 A662008E */ sh $v0, 0x8e($s3) -/* A95CEC 802425AC 2402000F */ addiu $v0, $zero, 0xf -.L802425B0: -/* A95CF0 802425B0 AE820070 */ sw $v0, 0x70($s4) -.L802425B4: -/* A95CF4 802425B4 8FBF0044 */ lw $ra, 0x44($sp) -/* A95CF8 802425B8 8FB40040 */ lw $s4, 0x40($sp) -/* A95CFC 802425BC 8FB3003C */ lw $s3, 0x3c($sp) -/* A95D00 802425C0 8FB20038 */ lw $s2, 0x38($sp) -/* A95D04 802425C4 8FB10034 */ lw $s1, 0x34($sp) -/* A95D08 802425C8 8FB00030 */ lw $s0, 0x30($sp) -/* A95D0C 802425CC D7B40048 */ ldc1 $f20, 0x48($sp) -/* A95D10 802425D0 03E00008 */ jr $ra -/* A95D14 802425D4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/func_802425D8_A93740.s b/asm/nonmatchings/world/area_kpa/kpa_102/func_802425D8_A93740.s deleted file mode 100644 index 6f9015bb78..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/func_802425D8_A93740.s +++ /dev/null @@ -1,269 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425D8_A95D18 -/* A95D18 802425D8 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* A95D1C 802425DC AFB60048 */ sw $s6, 0x48($sp) -/* A95D20 802425E0 0080B02D */ daddu $s6, $a0, $zero -/* A95D24 802425E4 AFBF004C */ sw $ra, 0x4c($sp) -/* A95D28 802425E8 AFB50044 */ sw $s5, 0x44($sp) -/* A95D2C 802425EC AFB40040 */ sw $s4, 0x40($sp) -/* A95D30 802425F0 AFB3003C */ sw $s3, 0x3c($sp) -/* A95D34 802425F4 AFB20038 */ sw $s2, 0x38($sp) -/* A95D38 802425F8 AFB10034 */ sw $s1, 0x34($sp) -/* A95D3C 802425FC AFB00030 */ sw $s0, 0x30($sp) -/* A95D40 80242600 F7B60058 */ sdc1 $f22, 0x58($sp) -/* A95D44 80242604 F7B40050 */ sdc1 $f20, 0x50($sp) -/* A95D48 80242608 8ED50148 */ lw $s5, 0x148($s6) -/* A95D4C 8024260C 86A40008 */ lh $a0, 8($s5) -/* A95D50 80242610 0C00EABB */ jal get_npc_unsafe -/* A95D54 80242614 0000982D */ daddu $s3, $zero, $zero -/* A95D58 80242618 0040802D */ daddu $s0, $v0, $zero -/* A95D5C 8024261C 9602008E */ lhu $v0, 0x8e($s0) -/* A95D60 80242620 2442FFFF */ addiu $v0, $v0, -1 -/* A95D64 80242624 A602008E */ sh $v0, 0x8e($s0) -/* A95D68 80242628 00021400 */ sll $v0, $v0, 0x10 -/* A95D6C 8024262C 1C4000DA */ bgtz $v0, .L80242998 -/* A95D70 80242630 0260A02D */ daddu $s4, $s3, $zero -/* A95D74 80242634 0C00A67F */ jal rand_int -/* A95D78 80242638 2404001E */ addiu $a0, $zero, 0x1e -/* A95D7C 8024263C 0260902D */ daddu $s2, $s3, $zero -/* A95D80 80242640 8EA400D0 */ lw $a0, 0xd0($s5) -/* A95D84 80242644 C6000040 */ lwc1 $f0, 0x40($s0) -/* A95D88 80242648 3C018024 */ lui $at, 0x8024 -/* A95D8C 8024264C D4365D78 */ ldc1 $f22, 0x5d78($at) -/* A95D90 80242650 C4820000 */ lwc1 $f2, ($a0) -/* A95D94 80242654 468010A0 */ cvt.s.w $f2, $f2 -/* A95D98 80242658 C4840008 */ lwc1 $f4, 8($a0) -/* A95D9C 8024265C 46802120 */ cvt.s.w $f4, $f4 -/* A95DA0 80242660 E7A00010 */ swc1 $f0, 0x10($sp) -/* A95DA4 80242664 8EA300D0 */ lw $v1, 0xd0($s5) -/* A95DA8 80242668 44051000 */ mfc1 $a1, $f2 -/* A95DAC 8024266C C460000C */ lwc1 $f0, 0xc($v1) -/* A95DB0 80242670 46800020 */ cvt.s.w $f0, $f0 -/* A95DB4 80242674 E7A00014 */ swc1 $f0, 0x14($sp) -/* A95DB8 80242678 8EA300D0 */ lw $v1, 0xd0($s5) -/* A95DBC 8024267C 44062000 */ mfc1 $a2, $f4 -/* A95DC0 80242680 C4600010 */ lwc1 $f0, 0x10($v1) -/* A95DC4 80242684 46800020 */ cvt.s.w $f0, $f0 -/* A95DC8 80242688 E7A00018 */ swc1 $f0, 0x18($sp) -/* A95DCC 8024268C 44820000 */ mtc1 $v0, $f0 -/* A95DD0 80242690 00000000 */ nop -/* A95DD4 80242694 46800021 */ cvt.d.w $f0, $f0 -/* A95DD8 80242698 46360000 */ add.d $f0, $f0, $f22 -/* A95DDC 8024269C 8C840018 */ lw $a0, 0x18($a0) -/* A95DE0 802426A0 8E070038 */ lw $a3, 0x38($s0) -/* A95DE4 802426A4 0C0123F5 */ jal is_point_within_region -/* A95DE8 802426A8 46200520 */ cvt.s.d $f20, $f0 -/* A95DEC 802426AC 10400023 */ beqz $v0, .L8024273C -/* A95DF0 802426B0 00000000 */ nop -/* A95DF4 802426B4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A95DF8 802426B8 8EA200D0 */ lw $v0, 0xd0($s5) -/* A95DFC 802426BC C60E0040 */ lwc1 $f14, 0x40($s0) -/* A95E00 802426C0 C44A0000 */ lwc1 $f10, ($v0) -/* A95E04 802426C4 468052A0 */ cvt.s.w $f10, $f10 -/* A95E08 802426C8 44065000 */ mfc1 $a2, $f10 -/* A95E0C 802426CC C44A0008 */ lwc1 $f10, 8($v0) -/* A95E10 802426D0 468052A0 */ cvt.s.w $f10, $f10 -/* A95E14 802426D4 44075000 */ mfc1 $a3, $f10 -/* A95E18 802426D8 0C00A720 */ jal atan2 -/* A95E1C 802426DC 00000000 */ nop -/* A95E20 802426E0 44931000 */ mtc1 $s3, $f2 -/* A95E24 802426E4 00000000 */ nop -/* A95E28 802426E8 468010A0 */ cvt.s.w $f2, $f2 -/* A95E2C 802426EC 46020001 */ sub.s $f0, $f0, $f2 -/* A95E30 802426F0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A95E34 802426F4 E600000C */ swc1 $f0, 0xc($s0) -/* A95E38 802426F8 8EA200D0 */ lw $v0, 0xd0($s5) -/* A95E3C 802426FC C60E0040 */ lwc1 $f14, 0x40($s0) -/* A95E40 80242700 C44A0000 */ lwc1 $f10, ($v0) -/* A95E44 80242704 468052A0 */ cvt.s.w $f10, $f10 -/* A95E48 80242708 44065000 */ mfc1 $a2, $f10 -/* A95E4C 8024270C C44A0008 */ lwc1 $f10, 8($v0) -/* A95E50 80242710 468052A0 */ cvt.s.w $f10, $f10 -/* A95E54 80242714 44075000 */ mfc1 $a3, $f10 -/* A95E58 80242718 0C00A7B5 */ jal dist2D -/* A95E5C 8024271C 00000000 */ nop -/* A95E60 80242720 46000106 */ mov.s $f4, $f0 -/* A95E64 80242724 4614003C */ c.lt.s $f0, $f20 -/* A95E68 80242728 00000000 */ nop -/* A95E6C 8024272C 4503006A */ bc1tl .L802428D8 -/* A95E70 80242730 46002506 */ mov.s $f20, $f4 -/* A95E74 80242734 08090A37 */ j .L802428DC -/* A95E78 80242738 27A40020 */ addiu $a0, $sp, 0x20 -.L8024273C: -/* A95E7C 8024273C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A95E80 80242740 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A95E84 80242744 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A95E88 80242748 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A95E8C 8024274C 8C460028 */ lw $a2, 0x28($v0) -/* A95E90 80242750 0C00A720 */ jal atan2 -/* A95E94 80242754 8C470030 */ lw $a3, 0x30($v0) -/* A95E98 80242758 460000A1 */ cvt.d.s $f2, $f0 -/* A95E9C 8024275C 4636103C */ c.lt.d $f2, $f22 -/* A95EA0 80242760 00000000 */ nop -/* A95EA4 80242764 45000006 */ bc1f .L80242780 -/* A95EA8 80242768 E600000C */ swc1 $f0, 0xc($s0) -/* A95EAC 8024276C 0C00A67F */ jal rand_int -/* A95EB0 80242770 2404000A */ addiu $a0, $zero, 0xa -/* A95EB4 80242774 3C018024 */ lui $at, 0x8024 -/* A95EB8 80242778 080909E4 */ j .L80242790 -/* A95EBC 8024277C D4205D80 */ ldc1 $f0, 0x5d80($at) -.L80242780: -/* A95EC0 80242780 0C00A67F */ jal rand_int -/* A95EC4 80242784 2404000A */ addiu $a0, $zero, 0xa -/* A95EC8 80242788 3C018024 */ lui $at, 0x8024 -/* A95ECC 8024278C D4205D88 */ ldc1 $f0, 0x5d88($at) -.L80242790: -/* A95ED0 80242790 44821000 */ mtc1 $v0, $f2 -/* A95ED4 80242794 00000000 */ nop -/* A95ED8 80242798 468010A1 */ cvt.d.w $f2, $f2 -/* A95EDC 8024279C 46201080 */ add.d $f2, $f2, $f0 -/* A95EE0 802427A0 3C014014 */ lui $at, 0x4014 -/* A95EE4 802427A4 44810800 */ mtc1 $at, $f1 -/* A95EE8 802427A8 44800000 */ mtc1 $zero, $f0 -/* A95EEC 802427AC 00000000 */ nop -/* A95EF0 802427B0 46201081 */ sub.d $f2, $f2, $f0 -/* A95EF4 802427B4 462015A0 */ cvt.s.d $f22, $f2 -/* A95EF8 802427B8 00141080 */ sll $v0, $s4, 2 -/* A95EFC 802427BC 00548821 */ addu $s1, $v0, $s4 -.L802427C0: -/* A95F00 802427C0 12400006 */ beqz $s2, .L802427DC -/* A95F04 802427C4 00000000 */ nop -/* A95F08 802427C8 44910000 */ mtc1 $s1, $f0 -/* A95F0C 802427CC 00000000 */ nop -/* A95F10 802427D0 46800020 */ cvt.s.w $f0, $f0 -/* A95F14 802427D4 080909FB */ j .L802427EC -/* A95F18 802427D8 4600B000 */ add.s $f0, $f22, $f0 -.L802427DC: -/* A95F1C 802427DC 44910000 */ mtc1 $s1, $f0 -/* A95F20 802427E0 00000000 */ nop -/* A95F24 802427E4 46800020 */ cvt.s.w $f0, $f0 -/* A95F28 802427E8 4600B001 */ sub.s $f0, $f22, $f0 -.L802427EC: -/* A95F2C 802427EC E600000C */ swc1 $f0, 0xc($s0) -/* A95F30 802427F0 C6000038 */ lwc1 $f0, 0x38($s0) -/* A95F34 802427F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* A95F38 802427F8 C6040040 */ lwc1 $f4, 0x40($s0) -/* A95F3C 802427FC 0000202D */ daddu $a0, $zero, $zero -/* A95F40 80242800 E7A00020 */ swc1 $f0, 0x20($sp) -/* A95F44 80242804 E7A20024 */ swc1 $f2, 0x24($sp) -/* A95F48 80242808 E7A40028 */ swc1 $f4, 0x28($sp) -/* A95F4C 8024280C E7B40010 */ swc1 $f20, 0x10($sp) -/* A95F50 80242810 C600000C */ lwc1 $f0, 0xc($s0) -/* A95F54 80242814 27A50020 */ addiu $a1, $sp, 0x20 -/* A95F58 80242818 E7A00014 */ swc1 $f0, 0x14($sp) -/* A95F5C 8024281C 860200A8 */ lh $v0, 0xa8($s0) -/* A95F60 80242820 27A60024 */ addiu $a2, $sp, 0x24 -/* A95F64 80242824 44820000 */ mtc1 $v0, $f0 -/* A95F68 80242828 00000000 */ nop -/* A95F6C 8024282C 46800020 */ cvt.s.w $f0, $f0 -/* A95F70 80242830 E7A00018 */ swc1 $f0, 0x18($sp) -/* A95F74 80242834 860200A6 */ lh $v0, 0xa6($s0) -/* A95F78 80242838 27A70028 */ addiu $a3, $sp, 0x28 -/* A95F7C 8024283C 44820000 */ mtc1 $v0, $f0 -/* A95F80 80242840 00000000 */ nop -/* A95F84 80242844 46800020 */ cvt.s.w $f0, $f0 -/* A95F88 80242848 0C0376B9 */ jal func_800DDAE4 -/* A95F8C 8024284C E7A0001C */ swc1 $f0, 0x1c($sp) -/* A95F90 80242850 50400014 */ beql $v0, $zero, .L802428A4 -/* A95F94 80242854 24130002 */ addiu $s3, $zero, 2 -/* A95F98 80242858 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A95F9C 8024285C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A95FA0 80242860 8FA60020 */ lw $a2, 0x20($sp) -/* A95FA4 80242864 0C00A7B5 */ jal dist2D -/* A95FA8 80242868 8FA70028 */ lw $a3, 0x28($sp) -/* A95FAC 8024286C 46000106 */ mov.s $f4, $f0 -/* A95FB0 80242870 3C014064 */ lui $at, 0x4064 -/* A95FB4 80242874 44811800 */ mtc1 $at, $f3 -/* A95FB8 80242878 44801000 */ mtc1 $zero, $f2 -/* A95FBC 8024287C 46002021 */ cvt.d.s $f0, $f4 -/* A95FC0 80242880 4620103C */ c.lt.d $f2, $f0 -/* A95FC4 80242884 00000000 */ nop -/* A95FC8 80242888 45000006 */ bc1f .L802428A4 -/* A95FCC 8024288C 00000000 */ nop -/* A95FD0 80242890 4614203C */ c.lt.s $f4, $f20 -/* A95FD4 80242894 00000000 */ nop -/* A95FD8 80242898 45030001 */ bc1tl .L802428A0 -/* A95FDC 8024289C 46002506 */ mov.s $f20, $f4 -.L802428A0: -/* A95FE0 802428A0 24130001 */ addiu $s3, $zero, 1 -.L802428A4: -/* A95FE4 802428A4 1660000D */ bnez $s3, .L802428DC -/* A95FE8 802428A8 27A40020 */ addiu $a0, $sp, 0x20 -/* A95FEC 802428AC 56400003 */ bnel $s2, $zero, .L802428BC -/* A95FF0 802428B0 26310005 */ addiu $s1, $s1, 5 -/* A95FF4 802428B4 08090A31 */ j .L802428C4 -/* A95FF8 802428B8 24120001 */ addiu $s2, $zero, 1 -.L802428BC: -/* A95FFC 802428BC 26940001 */ addiu $s4, $s4, 1 -/* A96000 802428C0 0000902D */ daddu $s2, $zero, $zero -.L802428C4: -/* A96004 802428C4 2A820007 */ slti $v0, $s4, 7 -/* A96008 802428C8 5040FFBD */ beql $v0, $zero, .L802427C0 -/* A9600C 802428CC 24130003 */ addiu $s3, $zero, 3 -/* A96010 802428D0 080909F0 */ j .L802427C0 -/* A96014 802428D4 00000000 */ nop -.L802428D8: -/* A96018 802428D8 27A40020 */ addiu $a0, $sp, 0x20 -.L802428DC: -/* A9601C 802428DC 4406A000 */ mfc1 $a2, $f20 -/* A96020 802428E0 8E07000C */ lw $a3, 0xc($s0) -/* A96024 802428E4 C6000038 */ lwc1 $f0, 0x38($s0) -/* A96028 802428E8 C6020040 */ lwc1 $f2, 0x40($s0) -/* A9602C 802428EC 27A50028 */ addiu $a1, $sp, 0x28 -/* A96030 802428F0 E7A00020 */ swc1 $f0, 0x20($sp) -/* A96034 802428F4 0C00A7E7 */ jal add_vec2D_polar -/* A96038 802428F8 E7A20028 */ swc1 $f2, 0x28($sp) -/* A9603C 802428FC C6000038 */ lwc1 $f0, 0x38($s0) -/* A96040 80242900 3C014059 */ lui $at, 0x4059 -/* A96044 80242904 44814800 */ mtc1 $at, $f9 -/* A96048 80242908 44804000 */ mtc1 $zero, $f8 -/* A9604C 8024290C 46000021 */ cvt.d.s $f0, $f0 -/* A96050 80242910 46280002 */ mul.d $f0, $f0, $f8 -/* A96054 80242914 00000000 */ nop -/* A96058 80242918 C7A20020 */ lwc1 $f2, 0x20($sp) -/* A9605C 8024291C C604003C */ lwc1 $f4, 0x3c($s0) -/* A96060 80242920 C7A60028 */ lwc1 $f6, 0x28($sp) -/* A96064 80242924 E6020060 */ swc1 $f2, 0x60($s0) -/* A96068 80242928 E6040064 */ swc1 $f4, 0x64($s0) -/* A9606C 8024292C E6060068 */ swc1 $f6, 0x68($s0) -/* A96070 80242930 4620028D */ trunc.w.d $f10, $f0 -/* A96074 80242934 E6AA007C */ swc1 $f10, 0x7c($s5) -/* A96078 80242938 C6000040 */ lwc1 $f0, 0x40($s0) -/* A9607C 8024293C 46000021 */ cvt.d.s $f0, $f0 -/* A96080 80242940 46280002 */ mul.d $f0, $f0, $f8 -/* A96084 80242944 00000000 */ nop -/* A96088 80242948 4620028D */ trunc.w.d $f10, $f0 -/* A9608C 8024294C E6AA0084 */ swc1 $f10, 0x84($s5) -/* A96090 80242950 0C00A67F */ jal rand_int -/* A96094 80242954 2404000A */ addiu $a0, $zero, 0xa -/* A96098 80242958 3C014040 */ lui $at, 0x4040 -/* A9609C 8024295C 44810000 */ mtc1 $at, $f0 -/* A960A0 80242960 3C013FB3 */ lui $at, 0x3fb3 -/* A960A4 80242964 34213333 */ ori $at, $at, 0x3333 -/* A960A8 80242968 44811000 */ mtc1 $at, $f2 -/* A960AC 8024296C 3C013E4C */ lui $at, 0x3e4c -/* A960B0 80242970 3421CCCD */ ori $at, $at, 0xcccd -/* A960B4 80242974 44812000 */ mtc1 $at, $f4 -/* A960B8 80242978 24420023 */ addiu $v0, $v0, 0x23 -/* A960BC 8024297C AEA20078 */ sw $v0, 0x78($s5) -/* A960C0 80242980 24020010 */ addiu $v0, $zero, 0x10 -/* A960C4 80242984 A600008E */ sh $zero, 0x8e($s0) -/* A960C8 80242988 E6000018 */ swc1 $f0, 0x18($s0) -/* A960CC 8024298C E602001C */ swc1 $f2, 0x1c($s0) -/* A960D0 80242990 E6040014 */ swc1 $f4, 0x14($s0) -/* A960D4 80242994 AEC20070 */ sw $v0, 0x70($s6) -.L80242998: -/* A960D8 80242998 8FBF004C */ lw $ra, 0x4c($sp) -/* A960DC 8024299C 8FB60048 */ lw $s6, 0x48($sp) -/* A960E0 802429A0 8FB50044 */ lw $s5, 0x44($sp) -/* A960E4 802429A4 8FB40040 */ lw $s4, 0x40($sp) -/* A960E8 802429A8 8FB3003C */ lw $s3, 0x3c($sp) -/* A960EC 802429AC 8FB20038 */ lw $s2, 0x38($sp) -/* A960F0 802429B0 8FB10034 */ lw $s1, 0x34($sp) -/* A960F4 802429B4 8FB00030 */ lw $s0, 0x30($sp) -/* A960F8 802429B8 D7B60058 */ ldc1 $f22, 0x58($sp) -/* A960FC 802429BC D7B40050 */ ldc1 $f20, 0x50($sp) -/* A96100 802429C0 03E00008 */ jr $ra -/* A96104 802429C4 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/func_80242F08_A93740.s b/asm/nonmatchings/world/area_kpa/kpa_102/func_80242F08_A93740.s deleted file mode 100644 index 858a68d325..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/func_80242F08_A93740.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F08_A96648 -/* A96648 80242F08 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A9664C 80242F0C AFB10014 */ sw $s1, 0x14($sp) -/* A96650 80242F10 0080882D */ daddu $s1, $a0, $zero -/* A96654 80242F14 AFBF0018 */ sw $ra, 0x18($sp) -/* A96658 80242F18 AFB00010 */ sw $s0, 0x10($sp) -/* A9665C 80242F1C 8E300148 */ lw $s0, 0x148($s1) -/* A96660 80242F20 0C00EABB */ jal get_npc_unsafe -/* A96664 80242F24 86040008 */ lh $a0, 8($s0) -/* A96668 80242F28 0040202D */ daddu $a0, $v0, $zero -/* A9666C 80242F2C 9482008E */ lhu $v0, 0x8e($a0) -/* A96670 80242F30 2442FFFF */ addiu $v0, $v0, -1 -/* A96674 80242F34 A482008E */ sh $v0, 0x8e($a0) -/* A96678 80242F38 00021400 */ sll $v0, $v0, 0x10 -/* A9667C 80242F3C 1C400008 */ bgtz $v0, .L80242F60 -/* A96680 80242F40 00000000 */ nop -/* A96684 80242F44 8E0200CC */ lw $v0, 0xcc($s0) -/* A96688 80242F48 8C430024 */ lw $v1, 0x24($v0) -/* A9668C 80242F4C 24020007 */ addiu $v0, $zero, 7 -/* A96690 80242F50 A482008E */ sh $v0, 0x8e($a0) -/* A96694 80242F54 24020017 */ addiu $v0, $zero, 0x17 -/* A96698 80242F58 AC830028 */ sw $v1, 0x28($a0) -/* A9669C 80242F5C AE220070 */ sw $v0, 0x70($s1) -.L80242F60: -/* A966A0 80242F60 8FBF0018 */ lw $ra, 0x18($sp) -/* A966A4 80242F64 8FB10014 */ lw $s1, 0x14($sp) -/* A966A8 80242F68 8FB00010 */ lw $s0, 0x10($sp) -/* A966AC 80242F6C 03E00008 */ jr $ra -/* A966B0 80242F70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/func_80242F74_A93740.s b/asm/nonmatchings/world/area_kpa/kpa_102/func_80242F74_A93740.s deleted file mode 100644 index e62b306192..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/func_80242F74_A93740.s +++ /dev/null @@ -1,84 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F74_A966B4 -/* A966B4 80242F74 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A966B8 80242F78 AFB3003C */ sw $s3, 0x3c($sp) -/* A966BC 80242F7C 0080982D */ daddu $s3, $a0, $zero -/* A966C0 80242F80 AFBF0044 */ sw $ra, 0x44($sp) -/* A966C4 80242F84 AFB40040 */ sw $s4, 0x40($sp) -/* A966C8 80242F88 AFB20038 */ sw $s2, 0x38($sp) -/* A966CC 80242F8C AFB10034 */ sw $s1, 0x34($sp) -/* A966D0 80242F90 AFB00030 */ sw $s0, 0x30($sp) -/* A966D4 80242F94 8E720148 */ lw $s2, 0x148($s3) -/* A966D8 80242F98 00A0882D */ daddu $s1, $a1, $zero -/* A966DC 80242F9C 86440008 */ lh $a0, 8($s2) -/* A966E0 80242FA0 0C00EABB */ jal get_npc_unsafe -/* A966E4 80242FA4 00C0A02D */ daddu $s4, $a2, $zero -/* A966E8 80242FA8 0040802D */ daddu $s0, $v0, $zero -/* A966EC 80242FAC 9602008E */ lhu $v0, 0x8e($s0) -/* A966F0 80242FB0 2442FFFF */ addiu $v0, $v0, -1 -/* A966F4 80242FB4 A602008E */ sh $v0, 0x8e($s0) -/* A966F8 80242FB8 00021400 */ sll $v0, $v0, 0x10 -/* A966FC 80242FBC 1C400032 */ bgtz $v0, .L80243088 -/* A96700 80242FC0 00000000 */ nop -/* A96704 80242FC4 0260202D */ daddu $a0, $s3, $zero -/* A96708 80242FC8 8E250024 */ lw $a1, 0x24($s1) -/* A9670C 80242FCC 8E260028 */ lw $a2, 0x28($s1) -/* A96710 80242FD0 0C09074C */ jal func_80241D30 -/* A96714 80242FD4 0280382D */ daddu $a3, $s4, $zero -/* A96718 80242FD8 0040882D */ daddu $s1, $v0, $zero -/* A9671C 80242FDC 24020001 */ addiu $v0, $zero, 1 -/* A96720 80242FE0 1222001D */ beq $s1, $v0, .L80243058 -/* A96724 80242FE4 0200282D */ daddu $a1, $s0, $zero -/* A96728 80242FE8 24040002 */ addiu $a0, $zero, 2 -/* A9672C 80242FEC 0000302D */ daddu $a2, $zero, $zero -/* A96730 80242FF0 860300A8 */ lh $v1, 0xa8($s0) -/* A96734 80242FF4 3C013F80 */ lui $at, 0x3f80 -/* A96738 80242FF8 44810000 */ mtc1 $at, $f0 -/* A9673C 80242FFC 3C014000 */ lui $at, 0x4000 -/* A96740 80243000 44811000 */ mtc1 $at, $f2 -/* A96744 80243004 3C01C1A0 */ lui $at, 0xc1a0 -/* A96748 80243008 44812000 */ mtc1 $at, $f4 -/* A9674C 8024300C 2402000C */ addiu $v0, $zero, 0xc -/* A96750 80243010 AFA2001C */ sw $v0, 0x1c($sp) -/* A96754 80243014 44833000 */ mtc1 $v1, $f6 -/* A96758 80243018 00000000 */ nop -/* A9675C 8024301C 468031A0 */ cvt.s.w $f6, $f6 -/* A96760 80243020 44073000 */ mfc1 $a3, $f6 -/* A96764 80243024 27A20028 */ addiu $v0, $sp, 0x28 -/* A96768 80243028 AFA20020 */ sw $v0, 0x20($sp) -/* A9676C 8024302C E7A00010 */ swc1 $f0, 0x10($sp) -/* A96770 80243030 E7A20014 */ swc1 $f2, 0x14($sp) -/* A96774 80243034 0C01BFA4 */ jal fx_emote -/* A96778 80243038 E7A40018 */ swc1 $f4, 0x18($sp) -/* A9677C 8024303C 8E4200CC */ lw $v0, 0xcc($s2) -/* A96780 80243040 8C430000 */ lw $v1, ($v0) -/* A96784 80243044 2402000F */ addiu $v0, $zero, 0xf -/* A96788 80243048 A602008E */ sh $v0, 0x8e($s0) -/* A9678C 8024304C 24020032 */ addiu $v0, $zero, 0x32 -/* A96790 80243050 08090C21 */ j .L80243084 -/* A96794 80243054 AE030028 */ sw $v1, 0x28($s0) -.L80243058: -/* A96798 80243058 0200202D */ daddu $a0, $s0, $zero -/* A9679C 8024305C 240520D5 */ addiu $a1, $zero, 0x20d5 -/* A967A0 80243060 0C012530 */ jal func_800494C0 -/* A967A4 80243064 0000302D */ daddu $a2, $zero, $zero -/* A967A8 80243068 86440008 */ lh $a0, 8($s2) -/* A967AC 8024306C 0C00FB3A */ jal get_enemy -/* A967B0 80243070 24840001 */ addiu $a0, $a0, 1 -/* A967B4 80243074 AC51006C */ sw $s1, 0x6c($v0) -/* A967B8 80243078 24020014 */ addiu $v0, $zero, 0x14 -/* A967BC 8024307C A602008E */ sh $v0, 0x8e($s0) -/* A967C0 80243080 24020018 */ addiu $v0, $zero, 0x18 -.L80243084: -/* A967C4 80243084 AE620070 */ sw $v0, 0x70($s3) -.L80243088: -/* A967C8 80243088 8FBF0044 */ lw $ra, 0x44($sp) -/* A967CC 8024308C 8FB40040 */ lw $s4, 0x40($sp) -/* A967D0 80243090 8FB3003C */ lw $s3, 0x3c($sp) -/* A967D4 80243094 8FB20038 */ lw $s2, 0x38($sp) -/* A967D8 80243098 8FB10034 */ lw $s1, 0x34($sp) -/* A967DC 8024309C 8FB00030 */ lw $s0, 0x30($sp) -/* A967E0 802430A0 03E00008 */ jr $ra -/* A967E4 802430A4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/func_80240124_A528C0.s b/asm/nonmatchings/world/area_kpa/kpa_11/func_80240124_A528C0.s deleted file mode 100644 index 0e0edcf6cc..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_11/func_80240124_A528C0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A529E4 -/* A529E4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A529E8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A529EC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A529F0 80240130 10A00005 */ beqz $a1, .L80240148 -/* A529F4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A529F8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A529FC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A52A00 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A52A04 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A52A08 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A52A0C 8024014C 1440000E */ bnez $v0, .L80240188 -/* A52A10 80240150 00000000 */ nop -/* A52A14 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A52A18 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A52A1C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A52A20 80240160 04610004 */ bgez $v1, .L80240174 -/* A52A24 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A52A28 80240168 3C020002 */ lui $v0, 2 -/* A52A2C 8024016C 08090061 */ j .L80240184 -/* A52A30 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A52A34 80240174 3C040002 */ lui $a0, 2 -/* A52A38 80240178 0083102A */ slt $v0, $a0, $v1 -/* A52A3C 8024017C 10400002 */ beqz $v0, .L80240188 -/* A52A40 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A52A44 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A52A48 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A52A4C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A52A50 80240190 00000000 */ nop -/* A52A54 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A52A58 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A52A5C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A52A60 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A52A64 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A52A68 802401A8 3C020002 */ lui $v0, 2 -/* A52A6C 802401AC 08090071 */ j .L802401C4 -/* A52A70 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A52A74 802401B4 3C040002 */ lui $a0, 2 -/* A52A78 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A52A7C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A52A80 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A52A84 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A52A88 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A52A8C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A52A90 802401D0 00000000 */ nop -/* A52A94 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A52A98 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A52A9C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A52AA0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A52AA4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A52AA8 802401E8 3C020002 */ lui $v0, 2 -/* A52AAC 802401EC 08090081 */ j .L80240204 -/* A52AB0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A52AB4 802401F4 3C040002 */ lui $a0, 2 -/* A52AB8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A52ABC 802401FC 10400002 */ beqz $v0, .L80240208 -/* A52AC0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A52AC4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A52AC8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A52ACC 8024020C 1440000E */ bnez $v0, .L80240248 -/* A52AD0 80240210 00000000 */ nop -/* A52AD4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A52AD8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A52ADC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A52AE0 80240220 04610004 */ bgez $v1, .L80240234 -/* A52AE4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A52AE8 80240228 3C020002 */ lui $v0, 2 -/* A52AEC 8024022C 08090091 */ j .L80240244 -/* A52AF0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A52AF4 80240234 3C040002 */ lui $a0, 2 -/* A52AF8 80240238 0083102A */ slt $v0, $a0, $v1 -/* A52AFC 8024023C 10400002 */ beqz $v0, .L80240248 -/* A52B00 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A52B04 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A52B08 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A52B0C 8024024C 0C046F07 */ jal set_main_pan_u -/* A52B10 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A52B14 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A52B18 80240258 0C046F0D */ jal set_main_pan_v -/* A52B1C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A52B20 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A52B24 80240264 0C046F13 */ jal set_aux_pan_u -/* A52B28 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A52B2C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A52B30 80240270 0C046F19 */ jal set_aux_pan_v -/* A52B34 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A52B38 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A52B3C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A52B40 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A52B44 80240284 24420001 */ addiu $v0, $v0, 1 -/* A52B48 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A52B4C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A52B50 80240290 24630001 */ addiu $v1, $v1, 1 -/* A52B54 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A52B58 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A52B5C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A52B60 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A52B64 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A52B68 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A52B6C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A52B70 802402B0 14600002 */ bnez $v1, .L802402BC -/* A52B74 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A52B78 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A52B7C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A52B80 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A52B84 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A52B88 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A52B8C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A52B90 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A52B94 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A52B98 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A52B9C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A52BA0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A52BA4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A52BA8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A52BAC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A52BB0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A52BB4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A52BB8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A52BBC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A52BC0 80240300 0000102D */ daddu $v0, $zero, $zero -/* A52BC4 80240304 03E00008 */ jr $ra -/* A52BC8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A52BCC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/func_80240310_A528C0.s b/asm/nonmatchings/world/area_kpa/kpa_11/func_80240310_A528C0.s deleted file mode 100644 index 637c506931..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_11/func_80240310_A528C0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_A52BD0 -/* A52BD0 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A52BD4 80240314 AFB20018 */ sw $s2, 0x18($sp) -/* A52BD8 80240318 0080902D */ daddu $s2, $a0, $zero -/* A52BDC 8024031C AFBF001C */ sw $ra, 0x1c($sp) -/* A52BE0 80240320 AFB10014 */ sw $s1, 0x14($sp) -/* A52BE4 80240324 AFB00010 */ sw $s0, 0x10($sp) -/* A52BE8 80240328 8E510148 */ lw $s1, 0x148($s2) -/* A52BEC 8024032C 0C00EABB */ jal get_npc_unsafe -/* A52BF0 80240330 86240008 */ lh $a0, 8($s1) -/* A52BF4 80240334 0040802D */ daddu $s0, $v0, $zero -/* A52BF8 80240338 8E2300CC */ lw $v1, 0xcc($s1) -/* A52BFC 8024033C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A52C00 80240340 8C630020 */ lw $v1, 0x20($v1) -/* A52C04 80240344 AE030028 */ sw $v1, 0x28($s0) -/* A52C08 80240348 96220076 */ lhu $v0, 0x76($s1) -/* A52C0C 8024034C A602008E */ sh $v0, 0x8e($s0) -/* A52C10 80240350 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A52C14 80240354 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A52C18 80240358 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A52C1C 8024035C 8C460028 */ lw $a2, 0x28($v0) -/* A52C20 80240360 0C00A720 */ jal atan2 -/* A52C24 80240364 8C470030 */ lw $a3, 0x30($v0) -/* A52C28 80240368 2402000D */ addiu $v0, $zero, 0xd -/* A52C2C 8024036C E600000C */ swc1 $f0, 0xc($s0) -/* A52C30 80240370 AE420070 */ sw $v0, 0x70($s2) -/* A52C34 80240374 8FBF001C */ lw $ra, 0x1c($sp) -/* A52C38 80240378 8FB20018 */ lw $s2, 0x18($sp) -/* A52C3C 8024037C 8FB10014 */ lw $s1, 0x14($sp) -/* A52C40 80240380 8FB00010 */ lw $s0, 0x10($sp) -/* A52C44 80240384 03E00008 */ jr $ra -/* A52C48 80240388 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/func_8024038C_A528C0.s b/asm/nonmatchings/world/area_kpa/kpa_11/func_8024038C_A528C0.s deleted file mode 100644 index e11076b3c5..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_11/func_8024038C_A528C0.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024038C_A52C4C -/* A52C4C 8024038C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A52C50 80240390 AFB3001C */ sw $s3, 0x1c($sp) -/* A52C54 80240394 0080982D */ daddu $s3, $a0, $zero -/* A52C58 80240398 AFBF0020 */ sw $ra, 0x20($sp) -/* A52C5C 8024039C AFB20018 */ sw $s2, 0x18($sp) -/* A52C60 802403A0 AFB10014 */ sw $s1, 0x14($sp) -/* A52C64 802403A4 AFB00010 */ sw $s0, 0x10($sp) -/* A52C68 802403A8 8E710148 */ lw $s1, 0x148($s3) -/* A52C6C 802403AC 86240008 */ lh $a0, 8($s1) -/* A52C70 802403B0 0C00EABB */ jal get_npc_unsafe -/* A52C74 802403B4 00A0902D */ daddu $s2, $a1, $zero -/* A52C78 802403B8 0040802D */ daddu $s0, $v0, $zero -/* A52C7C 802403BC 8602008E */ lh $v0, 0x8e($s0) -/* A52C80 802403C0 9603008E */ lhu $v1, 0x8e($s0) -/* A52C84 802403C4 18400005 */ blez $v0, .L802403DC -/* A52C88 802403C8 2462FFFF */ addiu $v0, $v1, -1 -/* A52C8C 802403CC A602008E */ sh $v0, 0x8e($s0) -/* A52C90 802403D0 00021400 */ sll $v0, $v0, 0x10 -/* A52C94 802403D4 1C400033 */ bgtz $v0, .L802404A4 -/* A52C98 802403D8 00000000 */ nop -.L802403DC: -/* A52C9C 802403DC 8602008C */ lh $v0, 0x8c($s0) -/* A52CA0 802403E0 14400030 */ bnez $v0, .L802404A4 -/* A52CA4 802403E4 00000000 */ nop -/* A52CA8 802403E8 8E2200CC */ lw $v0, 0xcc($s1) -/* A52CAC 802403EC 8C420024 */ lw $v0, 0x24($v0) -/* A52CB0 802403F0 AE020028 */ sw $v0, 0x28($s0) -/* A52CB4 802403F4 C6400018 */ lwc1 $f0, 0x18($s2) -/* A52CB8 802403F8 E6000018 */ swc1 $f0, 0x18($s0) -/* A52CBC 802403FC 8E230088 */ lw $v1, 0x88($s1) -/* A52CC0 80240400 24020005 */ addiu $v0, $zero, 5 -/* A52CC4 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* A52CC8 80240408 00000000 */ nop -/* A52CCC 8024040C 10600003 */ beqz $v1, .L8024041C -/* A52CD0 80240410 24020001 */ addiu $v0, $zero, 1 -/* A52CD4 80240414 14620006 */ bne $v1, $v0, .L80240430 -/* A52CD8 80240418 00000000 */ nop -.L8024041C: -/* A52CDC 8024041C 8E220084 */ lw $v0, 0x84($s1) -/* A52CE0 80240420 00021FC2 */ srl $v1, $v0, 0x1f -/* A52CE4 80240424 00431021 */ addu $v0, $v0, $v1 -/* A52CE8 80240428 00021043 */ sra $v0, $v0, 1 -/* A52CEC 8024042C A60200A8 */ sh $v0, 0xa8($s0) -.L80240430: -/* A52CF0 80240430 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A52CF4 80240434 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A52CF8 80240438 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A52CFC 8024043C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A52D00 80240440 8C460028 */ lw $a2, 0x28($v0) -/* A52D04 80240444 0C00A7B5 */ jal dist2D -/* A52D08 80240448 8C470030 */ lw $a3, 0x30($v0) -/* A52D0C 8024044C C6020018 */ lwc1 $f2, 0x18($s0) -/* A52D10 80240450 46020003 */ div.s $f0, $f0, $f2 -/* A52D14 80240454 3C018024 */ lui $at, 0x8024 -/* A52D18 80240458 D4222030 */ ldc1 $f2, 0x2030($at) -/* A52D1C 8024045C 46000021 */ cvt.d.s $f0, $f0 -/* A52D20 80240460 46220000 */ add.d $f0, $f0, $f2 -/* A52D24 80240464 4620010D */ trunc.w.d $f4, $f0 -/* A52D28 80240468 44022000 */ mfc1 $v0, $f4 -/* A52D2C 8024046C 00000000 */ nop -/* A52D30 80240470 A602008E */ sh $v0, 0x8e($s0) -/* A52D34 80240474 00021400 */ sll $v0, $v0, 0x10 -/* A52D38 80240478 8E230078 */ lw $v1, 0x78($s1) -/* A52D3C 8024047C 00021403 */ sra $v0, $v0, 0x10 -/* A52D40 80240480 0043102A */ slt $v0, $v0, $v1 -/* A52D44 80240484 10400003 */ beqz $v0, .L80240494 -/* A52D48 80240488 00000000 */ nop -/* A52D4C 8024048C 9622007A */ lhu $v0, 0x7a($s1) -/* A52D50 80240490 A602008E */ sh $v0, 0x8e($s0) -.L80240494: -/* A52D54 80240494 8602008E */ lh $v0, 0x8e($s0) -/* A52D58 80240498 AE22007C */ sw $v0, 0x7c($s1) -/* A52D5C 8024049C 2402000E */ addiu $v0, $zero, 0xe -/* A52D60 802404A0 AE620070 */ sw $v0, 0x70($s3) -.L802404A4: -/* A52D64 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* A52D68 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* A52D6C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* A52D70 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* A52D74 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* A52D78 802404B8 03E00008 */ jr $ra -/* A52D7C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/func_802404C0_A528C0.s b/asm/nonmatchings/world/area_kpa/kpa_11/func_802404C0_A528C0.s deleted file mode 100644 index 0870a9d8f1..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_11/func_802404C0_A528C0.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_A52D80 -/* A52D80 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A52D84 802404C4 AFB3003C */ sw $s3, 0x3c($sp) -/* A52D88 802404C8 0080982D */ daddu $s3, $a0, $zero -/* A52D8C 802404CC AFBF0040 */ sw $ra, 0x40($sp) -/* A52D90 802404D0 AFB20038 */ sw $s2, 0x38($sp) -/* A52D94 802404D4 AFB10034 */ sw $s1, 0x34($sp) -/* A52D98 802404D8 AFB00030 */ sw $s0, 0x30($sp) -/* A52D9C 802404DC 8E710148 */ lw $s1, 0x148($s3) -/* A52DA0 802404E0 0C00EABB */ jal get_npc_unsafe -/* A52DA4 802404E4 86240008 */ lh $a0, 8($s1) -/* A52DA8 802404E8 0040802D */ daddu $s0, $v0, $zero -/* A52DAC 802404EC 8E22007C */ lw $v0, 0x7c($s1) -/* A52DB0 802404F0 8603008E */ lh $v1, 0x8e($s0) -/* A52DB4 802404F4 2442FFFF */ addiu $v0, $v0, -1 -/* A52DB8 802404F8 14620012 */ bne $v1, $v0, .L80240544 -/* A52DBC 802404FC 00000000 */ nop -/* A52DC0 80240500 C6000038 */ lwc1 $f0, 0x38($s0) -/* A52DC4 80240504 4600020D */ trunc.w.s $f8, $f0 -/* A52DC8 80240508 44024000 */ mfc1 $v0, $f8 -/* A52DCC 8024050C 00000000 */ nop -/* A52DD0 80240510 A6220010 */ sh $v0, 0x10($s1) -/* A52DD4 80240514 C600003C */ lwc1 $f0, 0x3c($s0) -/* A52DD8 80240518 4600020D */ trunc.w.s $f8, $f0 -/* A52DDC 8024051C 44024000 */ mfc1 $v0, $f8 -/* A52DE0 80240520 00000000 */ nop -/* A52DE4 80240524 A6220012 */ sh $v0, 0x12($s1) -/* A52DE8 80240528 C6000040 */ lwc1 $f0, 0x40($s0) -/* A52DEC 8024052C 24020001 */ addiu $v0, $zero, 1 -/* A52DF0 80240530 A2220007 */ sb $v0, 7($s1) -/* A52DF4 80240534 4600020D */ trunc.w.s $f8, $f0 -/* A52DF8 80240538 44024000 */ mfc1 $v0, $f8 -/* A52DFC 8024053C 00000000 */ nop -/* A52E00 80240540 A6220014 */ sh $v0, 0x14($s1) -.L80240544: -/* A52E04 80240544 C6000038 */ lwc1 $f0, 0x38($s0) -/* A52E08 80240548 C602003C */ lwc1 $f2, 0x3c($s0) -/* A52E0C 8024054C C6040040 */ lwc1 $f4, 0x40($s0) -/* A52E10 80240550 C6060018 */ lwc1 $f6, 0x18($s0) -/* A52E14 80240554 E7A00020 */ swc1 $f0, 0x20($sp) -/* A52E18 80240558 E7A20024 */ swc1 $f2, 0x24($sp) -/* A52E1C 8024055C E7A40028 */ swc1 $f4, 0x28($sp) -/* A52E20 80240560 E7A60010 */ swc1 $f6, 0x10($sp) -/* A52E24 80240564 C600000C */ lwc1 $f0, 0xc($s0) -/* A52E28 80240568 E7A00014 */ swc1 $f0, 0x14($sp) -/* A52E2C 8024056C 860200A8 */ lh $v0, 0xa8($s0) -/* A52E30 80240570 27A50020 */ addiu $a1, $sp, 0x20 -/* A52E34 80240574 44820000 */ mtc1 $v0, $f0 -/* A52E38 80240578 00000000 */ nop -/* A52E3C 8024057C 46800020 */ cvt.s.w $f0, $f0 -/* A52E40 80240580 E7A00018 */ swc1 $f0, 0x18($sp) -/* A52E44 80240584 860200A6 */ lh $v0, 0xa6($s0) -/* A52E48 80240588 27A60024 */ addiu $a2, $sp, 0x24 -/* A52E4C 8024058C 44820000 */ mtc1 $v0, $f0 -/* A52E50 80240590 00000000 */ nop -/* A52E54 80240594 46800020 */ cvt.s.w $f0, $f0 -/* A52E58 80240598 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A52E5C 8024059C 8E040080 */ lw $a0, 0x80($s0) -/* A52E60 802405A0 0C037711 */ jal func_800DDC44 -/* A52E64 802405A4 27A70028 */ addiu $a3, $sp, 0x28 -/* A52E68 802405A8 0040902D */ daddu $s2, $v0, $zero -/* A52E6C 802405AC 16400005 */ bnez $s2, .L802405C4 -/* A52E70 802405B0 00000000 */ nop -/* A52E74 802405B4 8E050018 */ lw $a1, 0x18($s0) -/* A52E78 802405B8 8E06000C */ lw $a2, 0xc($s0) -/* A52E7C 802405BC 0C00EA95 */ jal npc_move_heading -/* A52E80 802405C0 0200202D */ daddu $a0, $s0, $zero -.L802405C4: -/* A52E84 802405C4 8602008E */ lh $v0, 0x8e($s0) -/* A52E88 802405C8 9603008E */ lhu $v1, 0x8e($s0) -/* A52E8C 802405CC 18400007 */ blez $v0, .L802405EC -/* A52E90 802405D0 2462FFFF */ addiu $v0, $v1, -1 -/* A52E94 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* A52E98 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* A52E9C 802405DC 18400003 */ blez $v0, .L802405EC -/* A52EA0 802405E0 00000000 */ nop -/* A52EA4 802405E4 12400008 */ beqz $s2, .L80240608 -/* A52EA8 802405E8 00000000 */ nop -.L802405EC: -/* A52EAC 802405EC 8E2200CC */ lw $v0, 0xcc($s1) -/* A52EB0 802405F0 A2200007 */ sb $zero, 7($s1) -/* A52EB4 802405F4 8C420028 */ lw $v0, 0x28($v0) -/* A52EB8 802405F8 A600008E */ sh $zero, 0x8e($s0) -/* A52EBC 802405FC AE020028 */ sw $v0, 0x28($s0) -/* A52EC0 80240600 2402000F */ addiu $v0, $zero, 0xf -/* A52EC4 80240604 AE620070 */ sw $v0, 0x70($s3) -.L80240608: -/* A52EC8 80240608 8FBF0040 */ lw $ra, 0x40($sp) -/* A52ECC 8024060C 8FB3003C */ lw $s3, 0x3c($sp) -/* A52ED0 80240610 8FB20038 */ lw $s2, 0x38($sp) -/* A52ED4 80240614 8FB10034 */ lw $s1, 0x34($sp) -/* A52ED8 80240618 8FB00030 */ lw $s0, 0x30($sp) -/* A52EDC 8024061C 03E00008 */ jr $ra -/* A52EE0 80240620 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/func_80240624_A528C0.s b/asm/nonmatchings/world/area_kpa/kpa_11/func_80240624_A528C0.s deleted file mode 100644 index f4a42b662a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_11/func_80240624_A528C0.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240624_A52EE4 -/* A52EE4 80240624 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A52EE8 80240628 AFB10014 */ sw $s1, 0x14($sp) -/* A52EEC 8024062C 0080882D */ daddu $s1, $a0, $zero -/* A52EF0 80240630 AFBF0018 */ sw $ra, 0x18($sp) -/* A52EF4 80240634 AFB00010 */ sw $s0, 0x10($sp) -/* A52EF8 80240638 8E300148 */ lw $s0, 0x148($s1) -/* A52EFC 8024063C 0C00EABB */ jal get_npc_unsafe -/* A52F00 80240640 86040008 */ lh $a0, 8($s0) -/* A52F04 80240644 0040202D */ daddu $a0, $v0, $zero -/* A52F08 80240648 9482008E */ lhu $v0, 0x8e($a0) -/* A52F0C 8024064C 24030003 */ addiu $v1, $zero, 3 -/* A52F10 80240650 24420001 */ addiu $v0, $v0, 1 -/* A52F14 80240654 A482008E */ sh $v0, 0x8e($a0) -/* A52F18 80240658 00021400 */ sll $v0, $v0, 0x10 -/* A52F1C 8024065C 00021403 */ sra $v0, $v0, 0x10 -/* A52F20 80240660 14430003 */ bne $v0, $v1, .L80240670 -/* A52F24 80240664 00000000 */ nop -/* A52F28 80240668 96020086 */ lhu $v0, 0x86($s0) -/* A52F2C 8024066C A48200A8 */ sh $v0, 0xa8($a0) -.L80240670: -/* A52F30 80240670 8482008E */ lh $v0, 0x8e($a0) -/* A52F34 80240674 8E030080 */ lw $v1, 0x80($s0) -/* A52F38 80240678 0043102A */ slt $v0, $v0, $v1 -/* A52F3C 8024067C 14400004 */ bnez $v0, .L80240690 -/* A52F40 80240680 00000000 */ nop -/* A52F44 80240684 96020086 */ lhu $v0, 0x86($s0) -/* A52F48 80240688 A48200A8 */ sh $v0, 0xa8($a0) -/* A52F4C 8024068C AE200070 */ sw $zero, 0x70($s1) -.L80240690: -/* A52F50 80240690 8FBF0018 */ lw $ra, 0x18($sp) -/* A52F54 80240694 8FB10014 */ lw $s1, 0x14($sp) -/* A52F58 80240698 8FB00010 */ lw $s0, 0x10($sp) -/* A52F5C 8024069C 03E00008 */ jr $ra -/* A52F60 802406A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/func_802406A4_A528C0.s b/asm/nonmatchings/world/area_kpa/kpa_11/func_802406A4_A528C0.s deleted file mode 100644 index b37545c0f5..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_11/func_802406A4_A528C0.s +++ /dev/null @@ -1,304 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A4_A52F64 -/* A52F64 802406A4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A52F68 802406A8 AFB3005C */ sw $s3, 0x5c($sp) -/* A52F6C 802406AC 0080982D */ daddu $s3, $a0, $zero -/* A52F70 802406B0 AFBF0068 */ sw $ra, 0x68($sp) -/* A52F74 802406B4 AFB50064 */ sw $s5, 0x64($sp) -/* A52F78 802406B8 AFB40060 */ sw $s4, 0x60($sp) -/* A52F7C 802406BC AFB20058 */ sw $s2, 0x58($sp) -/* A52F80 802406C0 AFB10054 */ sw $s1, 0x54($sp) -/* A52F84 802406C4 AFB00050 */ sw $s0, 0x50($sp) -/* A52F88 802406C8 8E710148 */ lw $s1, 0x148($s3) -/* A52F8C 802406CC 86240008 */ lh $a0, 8($s1) -/* A52F90 802406D0 0C00EABB */ jal get_npc_unsafe -/* A52F94 802406D4 00A0802D */ daddu $s0, $a1, $zero -/* A52F98 802406D8 8E63000C */ lw $v1, 0xc($s3) -/* A52F9C 802406DC 0260202D */ daddu $a0, $s3, $zero -/* A52FA0 802406E0 8C650000 */ lw $a1, ($v1) -/* A52FA4 802406E4 0C0B1EAF */ jal get_variable -/* A52FA8 802406E8 0040902D */ daddu $s2, $v0, $zero -/* A52FAC 802406EC AFA00028 */ sw $zero, 0x28($sp) -/* A52FB0 802406F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* A52FB4 802406F4 8C630030 */ lw $v1, 0x30($v1) -/* A52FB8 802406F8 AFA3002C */ sw $v1, 0x2c($sp) -/* A52FBC 802406FC 8E2300D0 */ lw $v1, 0xd0($s1) -/* A52FC0 80240700 8C63001C */ lw $v1, 0x1c($v1) -/* A52FC4 80240704 AFA30030 */ sw $v1, 0x30($sp) -/* A52FC8 80240708 8E2300D0 */ lw $v1, 0xd0($s1) -/* A52FCC 8024070C 8C630024 */ lw $v1, 0x24($v1) -/* A52FD0 80240710 AFA30034 */ sw $v1, 0x34($sp) -/* A52FD4 80240714 8E2300D0 */ lw $v1, 0xd0($s1) -/* A52FD8 80240718 8C630028 */ lw $v1, 0x28($v1) -/* A52FDC 8024071C 27B50028 */ addiu $s5, $sp, 0x28 -/* A52FE0 80240720 AFA30038 */ sw $v1, 0x38($sp) -/* A52FE4 80240724 8E2300D0 */ lw $v1, 0xd0($s1) -/* A52FE8 80240728 3C0142C8 */ lui $at, 0x42c8 -/* A52FEC 8024072C 44810000 */ mtc1 $at, $f0 -/* A52FF0 80240730 8C63002C */ lw $v1, 0x2c($v1) -/* A52FF4 80240734 0040A02D */ daddu $s4, $v0, $zero -/* A52FF8 80240738 E7A00040 */ swc1 $f0, 0x40($sp) -/* A52FFC 8024073C A7A00044 */ sh $zero, 0x44($sp) -/* A53000 80240740 12000009 */ beqz $s0, .L80240768 -/* A53004 80240744 AFA3003C */ sw $v1, 0x3c($sp) -/* A53008 80240748 864300A8 */ lh $v1, 0xa8($s2) -/* A5300C 8024074C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A53010 80240750 AE20008C */ sw $zero, 0x8c($s1) -/* A53014 80240754 A22000B5 */ sb $zero, 0xb5($s1) -/* A53018 80240758 34420008 */ ori $v0, $v0, 8 -/* A5301C 8024075C AE230084 */ sw $v1, 0x84($s1) -/* A53020 80240760 080901DE */ j .L80240778 -/* A53024 80240764 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240768: -/* A53028 80240768 8E2200B0 */ lw $v0, 0xb0($s1) -/* A5302C 8024076C 30420004 */ andi $v0, $v0, 4 -/* A53030 80240770 10400047 */ beqz $v0, .L80240890 -/* A53034 80240774 00000000 */ nop -.L80240778: -/* A53038 80240778 AE600070 */ sw $zero, 0x70($s3) -/* A5303C 8024077C A640008E */ sh $zero, 0x8e($s2) -/* A53040 80240780 8E2300CC */ lw $v1, 0xcc($s1) -/* A53044 80240784 2404F7FF */ addiu $a0, $zero, -0x801 -/* A53048 80240788 A2200007 */ sb $zero, 7($s1) -/* A5304C 8024078C 8E420000 */ lw $v0, ($s2) -/* A53050 80240790 8C630000 */ lw $v1, ($v1) -/* A53054 80240794 00441024 */ and $v0, $v0, $a0 -/* A53058 80240798 AE420000 */ sw $v0, ($s2) -/* A5305C 8024079C AE430028 */ sw $v1, 0x28($s2) -/* A53060 802407A0 96220086 */ lhu $v0, 0x86($s1) -/* A53064 802407A4 A64200A8 */ sh $v0, 0xa8($s2) -/* A53068 802407A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* A5306C 802407AC AE200090 */ sw $zero, 0x90($s1) -/* A53070 802407B0 8C420034 */ lw $v0, 0x34($v0) -/* A53074 802407B4 14400006 */ bnez $v0, .L802407D0 -/* A53078 802407B8 2403FDFF */ addiu $v1, $zero, -0x201 -/* A5307C 802407BC 8E420000 */ lw $v0, ($s2) -/* A53080 802407C0 2403FFF7 */ addiu $v1, $zero, -9 -/* A53084 802407C4 34420200 */ ori $v0, $v0, 0x200 -/* A53088 802407C8 080901F7 */ j .L802407DC -/* A5308C 802407CC 00431024 */ and $v0, $v0, $v1 -.L802407D0: -/* A53090 802407D0 8E420000 */ lw $v0, ($s2) -/* A53094 802407D4 00431024 */ and $v0, $v0, $v1 -/* A53098 802407D8 34420008 */ ori $v0, $v0, 8 -.L802407DC: -/* A5309C 802407DC AE420000 */ sw $v0, ($s2) -/* A530A0 802407E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A530A4 802407E4 30420004 */ andi $v0, $v0, 4 -/* A530A8 802407E8 1040001E */ beqz $v0, .L80240864 -/* A530AC 802407EC 24040002 */ addiu $a0, $zero, 2 -/* A530B0 802407F0 0240282D */ daddu $a1, $s2, $zero -/* A530B4 802407F4 0000302D */ daddu $a2, $zero, $zero -/* A530B8 802407F8 24020063 */ addiu $v0, $zero, 0x63 -/* A530BC 802407FC AE620070 */ sw $v0, 0x70($s3) -/* A530C0 80240800 AE600074 */ sw $zero, 0x74($s3) -/* A530C4 80240804 864300A8 */ lh $v1, 0xa8($s2) -/* A530C8 80240808 3C013F80 */ lui $at, 0x3f80 -/* A530CC 8024080C 44810000 */ mtc1 $at, $f0 -/* A530D0 80240810 3C014000 */ lui $at, 0x4000 -/* A530D4 80240814 44811000 */ mtc1 $at, $f2 -/* A530D8 80240818 3C01C1A0 */ lui $at, 0xc1a0 -/* A530DC 8024081C 44812000 */ mtc1 $at, $f4 -/* A530E0 80240820 24020028 */ addiu $v0, $zero, 0x28 -/* A530E4 80240824 AFA2001C */ sw $v0, 0x1c($sp) -/* A530E8 80240828 44833000 */ mtc1 $v1, $f6 -/* A530EC 8024082C 00000000 */ nop -/* A530F0 80240830 468031A0 */ cvt.s.w $f6, $f6 -/* A530F4 80240834 44073000 */ mfc1 $a3, $f6 -/* A530F8 80240838 27A20048 */ addiu $v0, $sp, 0x48 -/* A530FC 8024083C AFA20020 */ sw $v0, 0x20($sp) -/* A53100 80240840 E7A00010 */ swc1 $f0, 0x10($sp) -/* A53104 80240844 E7A20014 */ swc1 $f2, 0x14($sp) -/* A53108 80240848 0C01BFA4 */ jal fx_emote -/* A5310C 8024084C E7A40018 */ swc1 $f4, 0x18($sp) -/* A53110 80240850 8E2200B0 */ lw $v0, 0xb0($s1) -/* A53114 80240854 2403FFFB */ addiu $v1, $zero, -5 -/* A53118 80240858 00431024 */ and $v0, $v0, $v1 -/* A5311C 8024085C 08090224 */ j .L80240890 -/* A53120 80240860 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240864: -/* A53124 80240864 8E220000 */ lw $v0, ($s1) -/* A53128 80240868 3C034000 */ lui $v1, 0x4000 -/* A5312C 8024086C 00431024 */ and $v0, $v0, $v1 -/* A53130 80240870 10400007 */ beqz $v0, .L80240890 -/* A53134 80240874 3C03BFFF */ lui $v1, 0xbfff -/* A53138 80240878 2402000C */ addiu $v0, $zero, 0xc -/* A5313C 8024087C AE620070 */ sw $v0, 0x70($s3) -/* A53140 80240880 8E220000 */ lw $v0, ($s1) -/* A53144 80240884 3463FFFF */ ori $v1, $v1, 0xffff -/* A53148 80240888 00431024 */ and $v0, $v0, $v1 -/* A5314C 8024088C AE220000 */ sw $v0, ($s1) -.L80240890: -/* A53150 80240890 8E220090 */ lw $v0, 0x90($s1) -/* A53154 80240894 1840000C */ blez $v0, .L802408C8 -/* A53158 80240898 2442FFFF */ addiu $v0, $v0, -1 -/* A5315C 8024089C 14400087 */ bnez $v0, .L80240ABC -/* A53160 802408A0 AE220090 */ sw $v0, 0x90($s1) -/* A53164 802408A4 3C03FFAA */ lui $v1, 0xffaa -/* A53168 802408A8 8E420028 */ lw $v0, 0x28($s2) -/* A5316C 802408AC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A53170 802408B0 00431021 */ addu $v0, $v0, $v1 -/* A53174 802408B4 2C420002 */ sltiu $v0, $v0, 2 -/* A53178 802408B8 10400003 */ beqz $v0, .L802408C8 -/* A5317C 802408BC 3C020055 */ lui $v0, 0x55 -/* A53180 802408C0 3442000C */ ori $v0, $v0, 0xc -/* A53184 802408C4 AE420028 */ sw $v0, 0x28($s2) -.L802408C8: -/* A53188 802408C8 8E630070 */ lw $v1, 0x70($s3) -/* A5318C 802408CC 2402000C */ addiu $v0, $zero, 0xc -/* A53190 802408D0 10620048 */ beq $v1, $v0, .L802409F4 -/* A53194 802408D4 2862000D */ slti $v0, $v1, 0xd -/* A53198 802408D8 1040000F */ beqz $v0, .L80240918 -/* A5319C 802408DC 24100001 */ addiu $s0, $zero, 1 -/* A531A0 802408E0 1070001E */ beq $v1, $s0, .L8024095C -/* A531A4 802408E4 28620002 */ slti $v0, $v1, 2 -/* A531A8 802408E8 10400005 */ beqz $v0, .L80240900 -/* A531AC 802408EC 24020002 */ addiu $v0, $zero, 2 -/* A531B0 802408F0 10600015 */ beqz $v1, .L80240948 -/* A531B4 802408F4 0260202D */ daddu $a0, $s3, $zero -/* A531B8 802408F8 08090294 */ j .L80240A50 -/* A531BC 802408FC 00000000 */ nop -.L80240900: -/* A531C0 80240900 1062001C */ beq $v1, $v0, .L80240974 -/* A531C4 80240904 24020003 */ addiu $v0, $zero, 3 -/* A531C8 80240908 10620035 */ beq $v1, $v0, .L802409E0 -/* A531CC 8024090C 0260202D */ daddu $a0, $s3, $zero -/* A531D0 80240910 08090294 */ j .L80240A50 -/* A531D4 80240914 00000000 */ nop -.L80240918: -/* A531D8 80240918 2402000E */ addiu $v0, $zero, 0xe -/* A531DC 8024091C 1062003F */ beq $v1, $v0, .L80240A1C -/* A531E0 80240920 0062102A */ slt $v0, $v1, $v0 -/* A531E4 80240924 14400038 */ bnez $v0, .L80240A08 -/* A531E8 80240928 0260202D */ daddu $a0, $s3, $zero -/* A531EC 8024092C 2402000F */ addiu $v0, $zero, 0xf -/* A531F0 80240930 10620040 */ beq $v1, $v0, .L80240A34 -/* A531F4 80240934 24020063 */ addiu $v0, $zero, 0x63 -/* A531F8 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* A531FC 8024093C 00000000 */ nop -/* A53200 80240940 08090294 */ j .L80240A50 -/* A53204 80240944 00000000 */ nop -.L80240948: -/* A53208 80240948 0280282D */ daddu $a1, $s4, $zero -/* A5320C 8024094C 0C012568 */ jal func_800495A0 -/* A53210 80240950 02A0302D */ daddu $a2, $s5, $zero -/* A53214 80240954 96220086 */ lhu $v0, 0x86($s1) -/* A53218 80240958 A64200A8 */ sh $v0, 0xa8($s2) -.L8024095C: -/* A5321C 8024095C 0260202D */ daddu $a0, $s3, $zero -/* A53220 80240960 0280282D */ daddu $a1, $s4, $zero -/* A53224 80240964 0C0125AE */ jal func_800496B8 -/* A53228 80240968 02A0302D */ daddu $a2, $s5, $zero -/* A5322C 8024096C 08090294 */ j .L80240A50 -/* A53230 80240970 00000000 */ nop -.L80240974: -/* A53234 80240974 0260202D */ daddu $a0, $s3, $zero -/* A53238 80240978 0280282D */ daddu $a1, $s4, $zero -/* A5323C 8024097C 0C0126D1 */ jal func_80049B44 -/* A53240 80240980 02A0302D */ daddu $a2, $s5, $zero -/* A53244 80240984 8E230088 */ lw $v1, 0x88($s1) -/* A53248 80240988 24020006 */ addiu $v0, $zero, 6 -/* A5324C 8024098C 14620014 */ bne $v1, $v0, .L802409E0 -/* A53250 80240990 0260202D */ daddu $a0, $s3, $zero -/* A53254 80240994 0C00A67F */ jal rand_int -/* A53258 80240998 24040064 */ addiu $a0, $zero, 0x64 -/* A5325C 8024099C 28420021 */ slti $v0, $v0, 0x21 -/* A53260 802409A0 5040000F */ beql $v0, $zero, .L802409E0 -/* A53264 802409A4 0260202D */ daddu $a0, $s3, $zero -/* A53268 802409A8 8E22008C */ lw $v0, 0x8c($s1) -/* A5326C 802409AC 10400005 */ beqz $v0, .L802409C4 -/* A53270 802409B0 3C020055 */ lui $v0, 0x55 -/* A53274 802409B4 3442002F */ ori $v0, $v0, 0x2f -/* A53278 802409B8 AE20008C */ sw $zero, 0x8c($s1) -/* A5327C 802409BC 08090274 */ j .L802409D0 -/* A53280 802409C0 A22000B5 */ sb $zero, 0xb5($s1) -.L802409C4: -/* A53284 802409C4 3442002E */ ori $v0, $v0, 0x2e -/* A53288 802409C8 AE30008C */ sw $s0, 0x8c($s1) -/* A5328C 802409CC A23000B5 */ sb $s0, 0xb5($s1) -.L802409D0: -/* A53290 802409D0 AE420028 */ sw $v0, 0x28($s2) -/* A53294 802409D4 24020007 */ addiu $v0, $zero, 7 -/* A53298 802409D8 080902AF */ j .L80240ABC -/* A5329C 802409DC AE220090 */ sw $v0, 0x90($s1) -.L802409E0: -/* A532A0 802409E0 0280282D */ daddu $a1, $s4, $zero -/* A532A4 802409E4 0C012701 */ jal func_80049C04 -/* A532A8 802409E8 02A0302D */ daddu $a2, $s5, $zero -/* A532AC 802409EC 08090294 */ j .L80240A50 -/* A532B0 802409F0 00000000 */ nop -.L802409F4: -/* A532B4 802409F4 0260202D */ daddu $a0, $s3, $zero -/* A532B8 802409F8 0280282D */ daddu $a1, $s4, $zero -/* A532BC 802409FC 0C0900C4 */ jal func_80240310 -/* A532C0 80240A00 02A0302D */ daddu $a2, $s5, $zero -/* A532C4 80240A04 0260202D */ daddu $a0, $s3, $zero -.L80240A08: -/* A532C8 80240A08 0280282D */ daddu $a1, $s4, $zero -/* A532CC 80240A0C 0C0900E3 */ jal func_8024038C -/* A532D0 80240A10 02A0302D */ daddu $a2, $s5, $zero -/* A532D4 80240A14 08090294 */ j .L80240A50 -/* A532D8 80240A18 00000000 */ nop -.L80240A1C: -/* A532DC 80240A1C 0260202D */ daddu $a0, $s3, $zero -/* A532E0 80240A20 0280282D */ daddu $a1, $s4, $zero -/* A532E4 80240A24 0C090130 */ jal func_802404C0 -/* A532E8 80240A28 02A0302D */ daddu $a2, $s5, $zero -/* A532EC 80240A2C 08090294 */ j .L80240A50 -/* A532F0 80240A30 00000000 */ nop -.L80240A34: -/* A532F4 80240A34 0280282D */ daddu $a1, $s4, $zero -/* A532F8 80240A38 0C090189 */ jal func_80240624 -/* A532FC 80240A3C 02A0302D */ daddu $a2, $s5, $zero -/* A53300 80240A40 08090294 */ j .L80240A50 -/* A53304 80240A44 00000000 */ nop -.L80240A48: -/* A53308 80240A48 0C0129CF */ jal func_8004A73C -/* A5330C 80240A4C 0260202D */ daddu $a0, $s3, $zero -.L80240A50: -/* A53310 80240A50 8E230088 */ lw $v1, 0x88($s1) -/* A53314 80240A54 24020006 */ addiu $v0, $zero, 6 -/* A53318 80240A58 14620019 */ bne $v1, $v0, .L80240AC0 -/* A5331C 80240A5C 0000102D */ daddu $v0, $zero, $zero -/* A53320 80240A60 8E22008C */ lw $v0, 0x8c($s1) -/* A53324 80240A64 10400003 */ beqz $v0, .L80240A74 -/* A53328 80240A68 24020001 */ addiu $v0, $zero, 1 -/* A5332C 80240A6C 0809029E */ j .L80240A78 -/* A53330 80240A70 A22200B5 */ sb $v0, 0xb5($s1) -.L80240A74: -/* A53334 80240A74 A22000B5 */ sb $zero, 0xb5($s1) -.L80240A78: -/* A53338 80240A78 8E22008C */ lw $v0, 0x8c($s1) -/* A5333C 80240A7C 1040000F */ beqz $v0, .L80240ABC -/* A53340 80240A80 3C03FFAA */ lui $v1, 0xffaa -/* A53344 80240A84 8E420028 */ lw $v0, 0x28($s2) -/* A53348 80240A88 3463FFFC */ ori $v1, $v1, 0xfffc -/* A5334C 80240A8C 00431821 */ addu $v1, $v0, $v1 -/* A53350 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 -/* A53354 80240A94 10400009 */ beqz $v0, .L80240ABC -/* A53358 80240A98 00031080 */ sll $v0, $v1, 2 -/* A5335C 80240A9C 3C018024 */ lui $at, 0x8024 -/* A53360 80240AA0 00220821 */ addu $at, $at, $v0 -/* A53364 80240AA4 8C222038 */ lw $v0, 0x2038($at) -/* A53368 80240AA8 00400008 */ jr $v0 -/* A5336C 80240AAC 00000000 */ nop -/* A53370 80240AB0 8E420028 */ lw $v0, 0x28($s2) -/* A53374 80240AB4 24420001 */ addiu $v0, $v0, 1 -/* A53378 80240AB8 AE420028 */ sw $v0, 0x28($s2) -.L80240ABC: -/* A5337C 80240ABC 0000102D */ daddu $v0, $zero, $zero -.L80240AC0: -/* A53380 80240AC0 8FBF0068 */ lw $ra, 0x68($sp) -/* A53384 80240AC4 8FB50064 */ lw $s5, 0x64($sp) -/* A53388 80240AC8 8FB40060 */ lw $s4, 0x60($sp) -/* A5338C 80240ACC 8FB3005C */ lw $s3, 0x5c($sp) -/* A53390 80240AD0 8FB20058 */ lw $s2, 0x58($sp) -/* A53394 80240AD4 8FB10054 */ lw $s1, 0x54($sp) -/* A53398 80240AD8 8FB00050 */ lw $s0, 0x50($sp) -/* A5339C 80240ADC 03E00008 */ jr $ra -/* A533A0 80240AE0 27BD0070 */ addiu $sp, $sp, 0x70 -/* A533A4 80240AE4 00000000 */ nop -/* A533A8 80240AE8 00000000 */ nop -/* A533AC 80240AEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/func_802400BC_A99590.s b/asm/nonmatchings/world/area_kpa/kpa_111/func_802400BC_A99590.s deleted file mode 100644 index 8a22f788e6..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/func_802400BC_A99590.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400BC_A9964C -/* A9964C 802400BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A99650 802400C0 AFBF002C */ sw $ra, 0x2c($sp) -/* A99654 802400C4 AFB00028 */ sw $s0, 0x28($sp) -/* A99658 802400C8 8C820098 */ lw $v0, 0x98($a0) -/* A9965C 802400CC 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A99660 802400D0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A99664 802400D4 14400005 */ bnez $v0, .L802400EC -/* A99668 802400D8 00000000 */ nop -/* A9966C 802400DC C4800084 */ lwc1 $f0, 0x84($a0) -/* A99670 802400E0 46800020 */ cvt.s.w $f0, $f0 -/* A99674 802400E4 0809003E */ j .L802400F8 -/* A99678 802400E8 E6000028 */ swc1 $f0, 0x28($s0) -.L802400EC: -/* A9967C 802400EC C4800084 */ lwc1 $f0, 0x84($a0) -/* A99680 802400F0 46800020 */ cvt.s.w $f0, $f0 -/* A99684 802400F4 E6000030 */ swc1 $f0, 0x30($s0) -.L802400F8: -/* A99688 802400F8 27A20024 */ addiu $v0, $sp, 0x24 -/* A9968C 802400FC 0000202D */ daddu $a0, $zero, $zero -/* A99690 80240100 27A50018 */ addiu $a1, $sp, 0x18 -/* A99694 80240104 27A6001C */ addiu $a2, $sp, 0x1c -/* A99698 80240108 C6000028 */ lwc1 $f0, 0x28($s0) -/* A9969C 8024010C 3C014120 */ lui $at, 0x4120 -/* A996A0 80240110 44811000 */ mtc1 $at, $f2 -/* A996A4 80240114 3C014220 */ lui $at, 0x4220 -/* A996A8 80240118 44813000 */ mtc1 $at, $f6 -/* A996AC 8024011C 27A70020 */ addiu $a3, $sp, 0x20 -/* A996B0 80240120 E7A00018 */ swc1 $f0, 0x18($sp) -/* A996B4 80240124 C600002C */ lwc1 $f0, 0x2c($s0) -/* A996B8 80240128 C6040030 */ lwc1 $f4, 0x30($s0) -/* A996BC 8024012C 46020000 */ add.s $f0, $f0, $f2 -/* A996C0 80240130 E7A60024 */ swc1 $f6, 0x24($sp) -/* A996C4 80240134 E7A40020 */ swc1 $f4, 0x20($sp) -/* A996C8 80240138 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A996CC 8024013C 0C0372DF */ jal func_800DCB7C -/* A996D0 80240140 AFA20010 */ sw $v0, 0x10($sp) -/* A996D4 80240144 C7A00018 */ lwc1 $f0, 0x18($sp) -/* A996D8 80240148 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* A996DC 8024014C C7A40020 */ lwc1 $f4, 0x20($sp) -/* A996E0 80240150 E6000028 */ swc1 $f0, 0x28($s0) -/* A996E4 80240154 E602002C */ swc1 $f2, 0x2c($s0) -/* A996E8 80240158 E6040030 */ swc1 $f4, 0x30($s0) -/* A996EC 8024015C 8FBF002C */ lw $ra, 0x2c($sp) -/* A996F0 80240160 8FB00028 */ lw $s0, 0x28($sp) -/* A996F4 80240164 24020002 */ addiu $v0, $zero, 2 -/* A996F8 80240168 03E00008 */ jr $ra -/* A996FC 8024016C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/func_80240170_A99590.s b/asm/nonmatchings/world/area_kpa/kpa_111/func_80240170_A99590.s deleted file mode 100644 index b449ea1694..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/func_80240170_A99590.s +++ /dev/null @@ -1,134 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240170_A99700 -/* A99700 80240170 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A99704 80240174 AFB10014 */ sw $s1, 0x14($sp) -/* A99708 80240178 0080882D */ daddu $s1, $a0, $zero -/* A9970C 8024017C 3C05800B */ lui $a1, %hi(gCameras) -/* A99710 80240180 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A99714 80240184 AFBF0020 */ sw $ra, 0x20($sp) -/* A99718 80240188 AFB3001C */ sw $s3, 0x1c($sp) -/* A9971C 8024018C AFB20018 */ sw $s2, 0x18($sp) -/* A99720 80240190 AFB00010 */ sw $s0, 0x10($sp) -/* A99724 80240194 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A99728 80240198 8E330148 */ lw $s3, 0x148($s1) -/* A9972C 8024019C 3C03800A */ lui $v1, 0x800a -/* A99730 802401A0 8463A634 */ lh $v1, -0x59cc($v1) -/* A99734 802401A4 8E30000C */ lw $s0, 0xc($s1) -/* A99738 802401A8 00031080 */ sll $v0, $v1, 2 -/* A9973C 802401AC 00431021 */ addu $v0, $v0, $v1 -/* A99740 802401B0 00021080 */ sll $v0, $v0, 2 -/* A99744 802401B4 00431023 */ subu $v0, $v0, $v1 -/* A99748 802401B8 000218C0 */ sll $v1, $v0, 3 -/* A9974C 802401BC 00431021 */ addu $v0, $v0, $v1 -/* A99750 802401C0 000210C0 */ sll $v0, $v0, 3 -/* A99754 802401C4 86640008 */ lh $a0, 8($s3) -/* A99758 802401C8 0C00EABB */ jal get_npc_unsafe -/* A9975C 802401CC 00459021 */ addu $s2, $v0, $a1 -/* A99760 802401D0 0220202D */ daddu $a0, $s1, $zero -/* A99764 802401D4 8E050000 */ lw $a1, ($s0) -/* A99768 802401D8 0C0B1EAF */ jal get_variable -/* A9976C 802401DC 0040802D */ daddu $s0, $v0, $zero -/* A99770 802401E0 0260202D */ daddu $a0, $s3, $zero -/* A99774 802401E4 8C460024 */ lw $a2, 0x24($v0) -/* A99778 802401E8 8C470028 */ lw $a3, 0x28($v0) -/* A9977C 802401EC 0C0124FB */ jal func_800493EC -/* A99780 802401F0 0000282D */ daddu $a1, $zero, $zero -/* A99784 802401F4 10400052 */ beqz $v0, .L80240340 -/* A99788 802401F8 2402FFFF */ addiu $v0, $zero, -1 -/* A9978C 802401FC C64C006C */ lwc1 $f12, 0x6c($s2) -/* A99790 80240200 C60E000C */ lwc1 $f14, 0xc($s0) -/* A99794 80240204 3C014387 */ lui $at, 0x4387 -/* A99798 80240208 4481A000 */ mtc1 $at, $f20 -/* A9979C 8024020C 0C00A70A */ jal get_clamped_angle_diff -/* A997A0 80240210 00000000 */ nop -/* A997A4 80240214 0C00A6C9 */ jal clamp_angle -/* A997A8 80240218 46000306 */ mov.s $f12, $f0 -/* A997AC 8024021C 3C018024 */ lui $at, 0x8024 -/* A997B0 80240220 D4223240 */ ldc1 $f2, 0x3240($at) -/* A997B4 80240224 46000021 */ cvt.d.s $f0, $f0 -/* A997B8 80240228 4622003C */ c.lt.d $f0, $f2 -/* A997BC 8024022C 00000000 */ nop -/* A997C0 80240230 45000003 */ bc1f .L80240240 -/* A997C4 80240234 00000000 */ nop -/* A997C8 80240238 3C0142B4 */ lui $at, 0x42b4 -/* A997CC 8024023C 4481A000 */ mtc1 $at, $f20 -.L80240240: -/* A997D0 80240240 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* A997D4 80240244 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* A997D8 80240248 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A997DC 8024024C 8E220000 */ lw $v0, ($s1) -/* A997E0 80240250 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A997E4 80240254 8C460028 */ lw $a2, 0x28($v0) -/* A997E8 80240258 0C00A720 */ jal atan2 -/* A997EC 8024025C 8C470030 */ lw $a3, 0x30($v0) -/* A997F0 80240260 4600A306 */ mov.s $f12, $f20 -/* A997F4 80240264 0C00A70A */ jal get_clamped_angle_diff -/* A997F8 80240268 46000386 */ mov.s $f14, $f0 -/* A997FC 8024026C 46000005 */ abs.s $f0, $f0 -/* A99800 80240270 3C018024 */ lui $at, 0x8024 -/* A99804 80240274 D4223248 */ ldc1 $f2, 0x3248($at) -/* A99808 80240278 46000021 */ cvt.d.s $f0, $f0 -/* A9980C 8024027C 4620103C */ c.lt.d $f2, $f0 -/* A99810 80240280 00000000 */ nop -/* A99814 80240284 4501002E */ bc1t .L80240340 -/* A99818 80240288 2402FFFF */ addiu $v0, $zero, -1 -/* A9981C 8024028C 8E220000 */ lw $v0, ($s1) -/* A99820 80240290 C600003C */ lwc1 $f0, 0x3c($s0) -/* A99824 80240294 C442002C */ lwc1 $f2, 0x2c($v0) -/* A99828 80240298 860200A8 */ lh $v0, 0xa8($s0) -/* A9982C 8024029C 46020001 */ sub.s $f0, $f0, $f2 -/* A99830 802402A0 44821000 */ mtc1 $v0, $f2 -/* A99834 802402A4 00000000 */ nop -/* A99838 802402A8 468010A1 */ cvt.d.w $f2, $f2 -/* A9983C 802402AC 46221080 */ add.d $f2, $f2, $f2 -/* A99840 802402B0 46000005 */ abs.s $f0, $f0 -/* A99844 802402B4 46000021 */ cvt.d.s $f0, $f0 -/* A99848 802402B8 4620103E */ c.le.d $f2, $f0 -/* A9984C 802402BC 00000000 */ nop -/* A99850 802402C0 4501001F */ bc1t .L80240340 -/* A99854 802402C4 2402FFFF */ addiu $v0, $zero, -1 -/* A99858 802402C8 3C038011 */ lui $v1, 0x8011 -/* A9985C 802402CC 8063EBB3 */ lb $v1, -0x144d($v1) -/* A99860 802402D0 24020009 */ addiu $v0, $zero, 9 -/* A99864 802402D4 10620019 */ beq $v1, $v0, .L8024033C -/* A99868 802402D8 24020007 */ addiu $v0, $zero, 7 -/* A9986C 802402DC 14620005 */ bne $v1, $v0, .L802402F4 -/* A99870 802402E0 2402FFFF */ addiu $v0, $zero, -1 -/* A99874 802402E4 080900D0 */ j .L80240340 -/* A99878 802402E8 00000000 */ nop -.L802402EC: -/* A9987C 802402EC 080900D0 */ j .L80240340 -/* A99880 802402F0 0240102D */ daddu $v0, $s2, $zero -.L802402F4: -/* A99884 802402F4 8E620078 */ lw $v0, 0x78($s3) -/* A99888 802402F8 18400010 */ blez $v0, .L8024033C -/* A9988C 802402FC 0000882D */ daddu $s1, $zero, $zero -.L80240300: -/* A99890 80240300 86620008 */ lh $v0, 8($s3) -/* A99894 80240304 00511021 */ addu $v0, $v0, $s1 -/* A99898 80240308 24520001 */ addiu $s2, $v0, 1 -/* A9989C 8024030C 0C00FB3A */ jal get_enemy -/* A998A0 80240310 0240202D */ daddu $a0, $s2, $zero -/* A998A4 80240314 0240202D */ daddu $a0, $s2, $zero -/* A998A8 80240318 0C00EABB */ jal get_npc_unsafe -/* A998AC 8024031C 0040802D */ daddu $s0, $v0, $zero -/* A998B0 80240320 8E02006C */ lw $v0, 0x6c($s0) -/* A998B4 80240324 1040FFF1 */ beqz $v0, .L802402EC -/* A998B8 80240328 26310001 */ addiu $s1, $s1, 1 -/* A998BC 8024032C 8E620078 */ lw $v0, 0x78($s3) -/* A998C0 80240330 0222102A */ slt $v0, $s1, $v0 -/* A998C4 80240334 1440FFF2 */ bnez $v0, .L80240300 -/* A998C8 80240338 00000000 */ nop -.L8024033C: -/* A998CC 8024033C 2402FFFF */ addiu $v0, $zero, -1 -.L80240340: -/* A998D0 80240340 8FBF0020 */ lw $ra, 0x20($sp) -/* A998D4 80240344 8FB3001C */ lw $s3, 0x1c($sp) -/* A998D8 80240348 8FB20018 */ lw $s2, 0x18($sp) -/* A998DC 8024034C 8FB10014 */ lw $s1, 0x14($sp) -/* A998E0 80240350 8FB00010 */ lw $s0, 0x10($sp) -/* A998E4 80240354 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A998E8 80240358 03E00008 */ jr $ra -/* A998EC 8024035C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/func_80240360_A99590.s b/asm/nonmatchings/world/area_kpa/kpa_111/func_80240360_A99590.s deleted file mode 100644 index 406bac4286..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/func_80240360_A99590.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240360_A998F0 -/* A998F0 80240360 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A998F4 80240364 AFB20038 */ sw $s2, 0x38($sp) -/* A998F8 80240368 0080902D */ daddu $s2, $a0, $zero -/* A998FC 8024036C AFB00030 */ sw $s0, 0x30($sp) -/* A99900 80240370 AFBF003C */ sw $ra, 0x3c($sp) -/* A99904 80240374 AFB10034 */ sw $s1, 0x34($sp) -/* A99908 80240378 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A9990C 8024037C F7B40040 */ sdc1 $f20, 0x40($sp) -/* A99910 80240380 8E510148 */ lw $s1, 0x148($s2) -/* A99914 80240384 4485A000 */ mtc1 $a1, $f20 -/* A99918 80240388 86240008 */ lh $a0, 8($s1) -/* A9991C 8024038C 4486B000 */ mtc1 $a2, $f22 -/* A99920 80240390 0C00EABB */ jal get_npc_unsafe -/* A99924 80240394 00E0802D */ daddu $s0, $a3, $zero -/* A99928 80240398 0200202D */ daddu $a0, $s0, $zero -/* A9992C 8024039C 0220282D */ daddu $a1, $s1, $zero -/* A99930 802403A0 24030001 */ addiu $v1, $zero, 1 -/* A99934 802403A4 4406A000 */ mfc1 $a2, $f20 -/* A99938 802403A8 4407B000 */ mfc1 $a3, $f22 -/* A9993C 802403AC 0040802D */ daddu $s0, $v0, $zero -/* A99940 802403B0 0C01242D */ jal func_800490B4 -/* A99944 802403B4 AFA30010 */ sw $v1, 0x10($sp) -/* A99948 802403B8 1440001D */ bnez $v0, .L80240430 -/* A9994C 802403BC 24040002 */ addiu $a0, $zero, 2 -/* A99950 802403C0 0200282D */ daddu $a1, $s0, $zero -/* A99954 802403C4 0000302D */ daddu $a2, $zero, $zero -/* A99958 802403C8 860300A8 */ lh $v1, 0xa8($s0) -/* A9995C 802403CC 3C013F80 */ lui $at, 0x3f80 -/* A99960 802403D0 44810000 */ mtc1 $at, $f0 -/* A99964 802403D4 3C014000 */ lui $at, 0x4000 -/* A99968 802403D8 44811000 */ mtc1 $at, $f2 -/* A9996C 802403DC 3C01C1A0 */ lui $at, 0xc1a0 -/* A99970 802403E0 44812000 */ mtc1 $at, $f4 -/* A99974 802403E4 2402000F */ addiu $v0, $zero, 0xf -/* A99978 802403E8 AFA2001C */ sw $v0, 0x1c($sp) -/* A9997C 802403EC 44833000 */ mtc1 $v1, $f6 -/* A99980 802403F0 00000000 */ nop -/* A99984 802403F4 468031A0 */ cvt.s.w $f6, $f6 -/* A99988 802403F8 44073000 */ mfc1 $a3, $f6 -/* A9998C 802403FC 27A20028 */ addiu $v0, $sp, 0x28 -/* A99990 80240400 AFA20020 */ sw $v0, 0x20($sp) -/* A99994 80240404 E7A00010 */ swc1 $f0, 0x10($sp) -/* A99998 80240408 E7A20014 */ swc1 $f2, 0x14($sp) -/* A9999C 8024040C 0C01BFA4 */ jal fx_emote -/* A999A0 80240410 E7A40018 */ swc1 $f4, 0x18($sp) -/* A999A4 80240414 8E2200CC */ lw $v0, 0xcc($s1) -/* A999A8 80240418 8C430000 */ lw $v1, ($v0) -/* A999AC 8024041C 24020014 */ addiu $v0, $zero, 0x14 -/* A999B0 80240420 A602008E */ sh $v0, 0x8e($s0) -/* A999B4 80240424 24020021 */ addiu $v0, $zero, 0x21 -/* A999B8 80240428 08090120 */ j .L80240480 -/* A999BC 8024042C AE030028 */ sw $v1, 0x28($s0) -.L80240430: -/* A999C0 80240430 0C09005C */ jal func_80240170 -/* A999C4 80240434 0240202D */ daddu $a0, $s2, $zero -/* A999C8 80240438 0040202D */ daddu $a0, $v0, $zero -/* A999CC 8024043C 2402FFFF */ addiu $v0, $zero, -1 -/* A999D0 80240440 10820010 */ beq $a0, $v0, .L80240484 -/* A999D4 80240444 00000000 */ nop -/* A999D8 80240448 0C00FB3A */ jal get_enemy -/* A999DC 8024044C 00000000 */ nop -/* A999E0 80240450 8C42006C */ lw $v0, 0x6c($v0) -/* A999E4 80240454 1440000B */ bnez $v0, .L80240484 -/* A999E8 80240458 00000000 */ nop -/* A999EC 8024045C 8602008C */ lh $v0, 0x8c($s0) -/* A999F0 80240460 14400008 */ bnez $v0, .L80240484 -/* A999F4 80240464 00000000 */ nop -/* A999F8 80240468 8E2200CC */ lw $v0, 0xcc($s1) -/* A999FC 8024046C 8C420020 */ lw $v0, 0x20($v0) -/* A99A00 80240470 AE020028 */ sw $v0, 0x28($s0) -/* A99A04 80240474 96220072 */ lhu $v0, 0x72($s1) -/* A99A08 80240478 A602008E */ sh $v0, 0x8e($s0) -/* A99A0C 8024047C 2402001E */ addiu $v0, $zero, 0x1e -.L80240480: -/* A99A10 80240480 AE420070 */ sw $v0, 0x70($s2) -.L80240484: -/* A99A14 80240484 8FBF003C */ lw $ra, 0x3c($sp) -/* A99A18 80240488 8FB20038 */ lw $s2, 0x38($sp) -/* A99A1C 8024048C 8FB10034 */ lw $s1, 0x34($sp) -/* A99A20 80240490 8FB00030 */ lw $s0, 0x30($sp) -/* A99A24 80240494 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A99A28 80240498 D7B40040 */ ldc1 $f20, 0x40($sp) -/* A99A2C 8024049C 03E00008 */ jr $ra -/* A99A30 802404A0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/func_802405A4_A99590.s b/asm/nonmatchings/world/area_kpa/kpa_111/func_802405A4_A99590.s deleted file mode 100644 index b433994234..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/func_802405A4_A99590.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A4_A99B34 -/* A99B34 802405A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A99B38 802405A8 AFB10014 */ sw $s1, 0x14($sp) -/* A99B3C 802405AC 0080882D */ daddu $s1, $a0, $zero -/* A99B40 802405B0 AFBF0018 */ sw $ra, 0x18($sp) -/* A99B44 802405B4 AFB00010 */ sw $s0, 0x10($sp) -/* A99B48 802405B8 8E300148 */ lw $s0, 0x148($s1) -/* A99B4C 802405BC 0C00EABB */ jal get_npc_unsafe -/* A99B50 802405C0 86040008 */ lh $a0, 8($s0) -/* A99B54 802405C4 96030076 */ lhu $v1, 0x76($s0) -/* A99B58 802405C8 A443008E */ sh $v1, 0x8e($v0) -/* A99B5C 802405CC 24020021 */ addiu $v0, $zero, 0x21 -/* A99B60 802405D0 AE220070 */ sw $v0, 0x70($s1) -/* A99B64 802405D4 8FBF0018 */ lw $ra, 0x18($sp) -/* A99B68 802405D8 8FB10014 */ lw $s1, 0x14($sp) -/* A99B6C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* A99B70 802405E0 03E00008 */ jr $ra -/* A99B74 802405E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/func_802405E8_A99590.s b/asm/nonmatchings/world/area_kpa/kpa_111/func_802405E8_A99590.s deleted file mode 100644 index 4e26375ba2..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/func_802405E8_A99590.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405E8_A99B78 -/* A99B78 802405E8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A99B7C 802405EC AFB3001C */ sw $s3, 0x1c($sp) -/* A99B80 802405F0 0080982D */ daddu $s3, $a0, $zero -/* A99B84 802405F4 AFBF0020 */ sw $ra, 0x20($sp) -/* A99B88 802405F8 AFB20018 */ sw $s2, 0x18($sp) -/* A99B8C 802405FC AFB10014 */ sw $s1, 0x14($sp) -/* A99B90 80240600 AFB00010 */ sw $s0, 0x10($sp) -/* A99B94 80240604 8E720148 */ lw $s2, 0x148($s3) -/* A99B98 80240608 0C00EABB */ jal get_npc_unsafe -/* A99B9C 8024060C 86440008 */ lh $a0, 8($s2) -/* A99BA0 80240610 86440008 */ lh $a0, 8($s2) -/* A99BA4 80240614 0040882D */ daddu $s1, $v0, $zero -/* A99BA8 80240618 0C00FB3A */ jal get_enemy -/* A99BAC 8024061C 24840001 */ addiu $a0, $a0, 1 -/* A99BB0 80240620 0040802D */ daddu $s0, $v0, $zero -/* A99BB4 80240624 0C00EABB */ jal get_npc_unsafe -/* A99BB8 80240628 86040008 */ lh $a0, 8($s0) -/* A99BBC 8024062C C62C0038 */ lwc1 $f12, 0x38($s1) -/* A99BC0 80240630 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A99BC4 80240634 8C460038 */ lw $a2, 0x38($v0) -/* A99BC8 80240638 0C00A720 */ jal atan2 -/* A99BCC 8024063C 8C470040 */ lw $a3, 0x40($v0) -/* A99BD0 80240640 E620000C */ swc1 $f0, 0xc($s1) -/* A99BD4 80240644 8E02006C */ lw $v0, 0x6c($s0) -/* A99BD8 80240648 14400008 */ bnez $v0, .L8024066C -/* A99BDC 8024064C 00000000 */ nop -/* A99BE0 80240650 8E4200CC */ lw $v0, 0xcc($s2) -/* A99BE4 80240654 8C420000 */ lw $v0, ($v0) -/* A99BE8 80240658 AE220028 */ sw $v0, 0x28($s1) -/* A99BEC 8024065C 96420076 */ lhu $v0, 0x76($s2) -/* A99BF0 80240660 A622008E */ sh $v0, 0x8e($s1) -/* A99BF4 80240664 24020021 */ addiu $v0, $zero, 0x21 -/* A99BF8 80240668 AE620070 */ sw $v0, 0x70($s3) -.L8024066C: -/* A99BFC 8024066C 8FBF0020 */ lw $ra, 0x20($sp) -/* A99C00 80240670 8FB3001C */ lw $s3, 0x1c($sp) -/* A99C04 80240674 8FB20018 */ lw $s2, 0x18($sp) -/* A99C08 80240678 8FB10014 */ lw $s1, 0x14($sp) -/* A99C0C 8024067C 8FB00010 */ lw $s0, 0x10($sp) -/* A99C10 80240680 03E00008 */ jr $ra -/* A99C14 80240684 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/func_802406CC_A99590.s b/asm/nonmatchings/world/area_kpa/kpa_111/func_802406CC_A99590.s deleted file mode 100644 index 958c1c4ac4..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/func_802406CC_A99590.s +++ /dev/null @@ -1,354 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406CC_A99C5C -/* A99C5C 802406CC 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A99C60 802406D0 AFB7004C */ sw $s7, 0x4c($sp) -/* A99C64 802406D4 0080B82D */ daddu $s7, $a0, $zero -/* A99C68 802406D8 AFB10034 */ sw $s1, 0x34($sp) -/* A99C6C 802406DC 00A0882D */ daddu $s1, $a1, $zero -/* A99C70 802406E0 AFBF0050 */ sw $ra, 0x50($sp) -/* A99C74 802406E4 AFB60048 */ sw $s6, 0x48($sp) -/* A99C78 802406E8 AFB50044 */ sw $s5, 0x44($sp) -/* A99C7C 802406EC AFB40040 */ sw $s4, 0x40($sp) -/* A99C80 802406F0 AFB3003C */ sw $s3, 0x3c($sp) -/* A99C84 802406F4 AFB20038 */ sw $s2, 0x38($sp) -/* A99C88 802406F8 AFB00030 */ sw $s0, 0x30($sp) -/* A99C8C 802406FC 8EF30148 */ lw $s3, 0x148($s7) -/* A99C90 80240700 86640008 */ lh $a0, 8($s3) -/* A99C94 80240704 8EF0000C */ lw $s0, 0xc($s7) -/* A99C98 80240708 0C00FB5A */ jal get_enemy_safe -/* A99C9C 8024070C 0000B02D */ daddu $s6, $zero, $zero -/* A99CA0 80240710 10400131 */ beqz $v0, .L80240BD8 -/* A99CA4 80240714 24020005 */ addiu $v0, $zero, 5 -/* A99CA8 80240718 8E63006C */ lw $v1, 0x6c($s3) -/* A99CAC 8024071C 1062012F */ beq $v1, $v0, .L80240BDC -/* A99CB0 80240720 0000102D */ daddu $v0, $zero, $zero -/* A99CB4 80240724 8E050000 */ lw $a1, ($s0) -/* A99CB8 80240728 0C0B1EAF */ jal get_variable -/* A99CBC 8024072C 02E0202D */ daddu $a0, $s7, $zero -/* A99CC0 80240730 86640008 */ lh $a0, 8($s3) -/* A99CC4 80240734 0C00EABB */ jal get_npc_unsafe -/* A99CC8 80240738 0040A82D */ daddu $s5, $v0, $zero -/* A99CCC 8024073C 8E630070 */ lw $v1, 0x70($s3) -/* A99CD0 80240740 30630002 */ andi $v1, $v1, 2 -/* A99CD4 80240744 10600008 */ beqz $v1, .L80240768 -/* A99CD8 80240748 0040902D */ daddu $s2, $v0, $zero -/* A99CDC 8024074C 964200A8 */ lhu $v0, 0xa8($s2) -/* A99CE0 80240750 00021400 */ sll $v0, $v0, 0x10 -/* A99CE4 80240754 00021C03 */ sra $v1, $v0, 0x10 -/* A99CE8 80240758 000217C2 */ srl $v0, $v0, 0x1f -/* A99CEC 8024075C 00621821 */ addu $v1, $v1, $v0 -/* A99CF0 80240760 00031843 */ sra $v1, $v1, 1 -/* A99CF4 80240764 A24300AB */ sb $v1, 0xab($s2) -.L80240768: -/* A99CF8 80240768 16200005 */ bnez $s1, .L80240780 -/* A99CFC 8024076C 3C030004 */ lui $v1, 4 -/* A99D00 80240770 8E6200B0 */ lw $v0, 0xb0($s3) -/* A99D04 80240774 30420004 */ andi $v0, $v0, 4 -/* A99D08 80240778 10400019 */ beqz $v0, .L802407E0 -/* A99D0C 8024077C 00000000 */ nop -.L80240780: -/* A99D10 80240780 34630102 */ ori $v1, $v1, 0x102 -/* A99D14 80240784 AEE00070 */ sw $zero, 0x70($s7) -/* A99D18 80240788 8E420000 */ lw $v0, ($s2) -/* A99D1C 8024078C 0240202D */ daddu $a0, $s2, $zero -/* A99D20 80240790 A640008E */ sh $zero, 0x8e($s2) -/* A99D24 80240794 00431025 */ or $v0, $v0, $v1 -/* A99D28 80240798 0C00EAFF */ jal disable_npc_shadow -/* A99D2C 8024079C AE420000 */ sw $v0, ($s2) -/* A99D30 802407A0 3C041F30 */ lui $a0, 0x1f30 -/* A99D34 802407A4 8E420000 */ lw $v0, ($s2) -/* A99D38 802407A8 2403F7FF */ addiu $v1, $zero, -0x801 -/* A99D3C 802407AC 00431024 */ and $v0, $v0, $v1 -/* A99D40 802407B0 AE420000 */ sw $v0, ($s2) -/* A99D44 802407B4 8E620000 */ lw $v0, ($s3) -/* A99D48 802407B8 8E6300B0 */ lw $v1, 0xb0($s3) -/* A99D4C 802407BC 34840040 */ ori $a0, $a0, 0x40 -/* A99D50 802407C0 AE60006C */ sw $zero, 0x6c($s3) -/* A99D54 802407C4 00441025 */ or $v0, $v0, $a0 -/* A99D58 802407C8 AE620000 */ sw $v0, ($s3) -/* A99D5C 802407CC 30620004 */ andi $v0, $v1, 4 -/* A99D60 802407D0 10400003 */ beqz $v0, .L802407E0 -/* A99D64 802407D4 2402FFFB */ addiu $v0, $zero, -5 -/* A99D68 802407D8 00621024 */ and $v0, $v1, $v0 -/* A99D6C 802407DC AE6200B0 */ sw $v0, 0xb0($s3) -.L802407E0: -/* A99D70 802407E0 8EE30070 */ lw $v1, 0x70($s7) -/* A99D74 802407E4 24100001 */ addiu $s0, $zero, 1 -/* A99D78 802407E8 10700012 */ beq $v1, $s0, .L80240834 -/* A99D7C 802407EC 28620002 */ slti $v0, $v1, 2 -/* A99D80 802407F0 10400005 */ beqz $v0, .L80240808 -/* A99D84 802407F4 24020002 */ addiu $v0, $zero, 2 -/* A99D88 802407F8 10600007 */ beqz $v1, .L80240818 -/* A99D8C 802407FC 0000102D */ daddu $v0, $zero, $zero -/* A99D90 80240800 080902F7 */ j .L80240BDC -/* A99D94 80240804 00000000 */ nop -.L80240808: -/* A99D98 80240808 1062005B */ beq $v1, $v0, .L80240978 -/* A99D9C 8024080C 0000102D */ daddu $v0, $zero, $zero -/* A99DA0 80240810 080902F7 */ j .L80240BDC -/* A99DA4 80240814 00000000 */ nop -.L80240818: -/* A99DA8 80240818 8E420000 */ lw $v0, ($s2) -/* A99DAC 8024081C 0240202D */ daddu $a0, $s2, $zero -/* A99DB0 80240820 34420002 */ ori $v0, $v0, 2 -/* A99DB4 80240824 0C00EAFF */ jal disable_npc_shadow -/* A99DB8 80240828 AE420000 */ sw $v0, ($s2) -/* A99DBC 8024082C AE60006C */ sw $zero, 0x6c($s3) -/* A99DC0 80240830 AEF00070 */ sw $s0, 0x70($s7) -.L80240834: -/* A99DC4 80240834 8E74006C */ lw $s4, 0x6c($s3) -/* A99DC8 80240838 24020001 */ addiu $v0, $zero, 1 -/* A99DCC 8024083C 168200E7 */ bne $s4, $v0, .L80240BDC -/* A99DD0 80240840 0000102D */ daddu $v0, $zero, $zero -/* A99DD4 80240844 8E64007C */ lw $a0, 0x7c($s3) -/* A99DD8 80240848 24110002 */ addiu $s1, $zero, 2 -/* A99DDC 8024084C 0C00EABB */ jal get_npc_unsafe -/* A99DE0 80240850 AE71006C */ sw $s1, 0x6c($s3) -/* A99DE4 80240854 0040802D */ daddu $s0, $v0, $zero -/* A99DE8 80240858 C6000038 */ lwc1 $f0, 0x38($s0) -/* A99DEC 8024085C E6400038 */ swc1 $f0, 0x38($s2) -/* A99DF0 80240860 C6000040 */ lwc1 $f0, 0x40($s0) -/* A99DF4 80240864 E6400040 */ swc1 $f0, 0x40($s2) -/* A99DF8 80240868 C6020034 */ lwc1 $f2, 0x34($s0) -/* A99DFC 8024086C 3C014387 */ lui $at, 0x4387 -/* A99E00 80240870 44810000 */ mtc1 $at, $f0 -/* A99E04 80240874 26440038 */ addiu $a0, $s2, 0x38 -/* A99E08 80240878 46020001 */ sub.s $f0, $f0, $f2 -/* A99E0C 8024087C C6680078 */ lwc1 $f8, 0x78($s3) -/* A99E10 80240880 46804220 */ cvt.s.w $f8, $f8 -/* A99E14 80240884 44064000 */ mfc1 $a2, $f8 -/* A99E18 80240888 44070000 */ mfc1 $a3, $f0 -/* A99E1C 8024088C 0C00A7E7 */ jal add_vec2D_polar -/* A99E20 80240890 26450040 */ addiu $a1, $s2, 0x40 -/* A99E24 80240894 C600003C */ lwc1 $f0, 0x3c($s0) -/* A99E28 80240898 C6620074 */ lwc1 $f2, 0x74($s3) -/* A99E2C 8024089C 468010A0 */ cvt.s.w $f2, $f2 -/* A99E30 802408A0 46020000 */ add.s $f0, $f0, $f2 -/* A99E34 802408A4 E640003C */ swc1 $f0, 0x3c($s2) -/* A99E38 802408A8 A2740007 */ sb $s4, 7($s3) -/* A99E3C 802408AC C6400038 */ lwc1 $f0, 0x38($s2) -/* A99E40 802408B0 4600020D */ trunc.w.s $f8, $f0 -/* A99E44 802408B4 44024000 */ mfc1 $v0, $f8 -/* A99E48 802408B8 00000000 */ nop -/* A99E4C 802408BC A6620010 */ sh $v0, 0x10($s3) -/* A99E50 802408C0 C640003C */ lwc1 $f0, 0x3c($s2) -/* A99E54 802408C4 4600020D */ trunc.w.s $f8, $f0 -/* A99E58 802408C8 44024000 */ mfc1 $v0, $f8 -/* A99E5C 802408CC 00000000 */ nop -/* A99E60 802408D0 A6620012 */ sh $v0, 0x12($s3) -/* A99E64 802408D4 C6400040 */ lwc1 $f0, 0x40($s2) -/* A99E68 802408D8 4600020D */ trunc.w.s $f8, $f0 -/* A99E6C 802408DC 44024000 */ mfc1 $v0, $f8 -/* A99E70 802408E0 00000000 */ nop -/* A99E74 802408E4 A6620014 */ sh $v0, 0x14($s3) -/* A99E78 802408E8 AE400044 */ sw $zero, 0x44($s2) -/* A99E7C 802408EC AE400048 */ sw $zero, 0x48($s2) -/* A99E80 802408F0 AE40004C */ sw $zero, 0x4c($s2) -/* A99E84 802408F4 C6A00000 */ lwc1 $f0, ($s5) -/* A99E88 802408F8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A99E8C 802408FC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A99E90 80240900 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A99E94 80240904 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A99E98 80240908 E6400018 */ swc1 $f0, 0x18($s2) -/* A99E9C 8024090C 8C460028 */ lw $a2, 0x28($v0) -/* A99EA0 80240910 0C00A720 */ jal atan2 -/* A99EA4 80240914 8C470030 */ lw $a3, 0x30($v0) -/* A99EA8 80240918 E640000C */ swc1 $f0, 0xc($s2) -/* A99EAC 8024091C C6A0000C */ lwc1 $f0, 0xc($s5) -/* A99EB0 80240920 8E420000 */ lw $v0, ($s2) -/* A99EB4 80240924 0240202D */ daddu $a0, $s2, $zero -/* A99EB8 80240928 E640001C */ swc1 $f0, 0x1c($s2) -/* A99EBC 8024092C C6A00010 */ lwc1 $f0, 0x10($s5) -/* A99EC0 80240930 2403FFFD */ addiu $v1, $zero, -3 -/* A99EC4 80240934 E6400014 */ swc1 $f0, 0x14($s2) -/* A99EC8 80240938 C600003C */ lwc1 $f0, 0x3c($s0) -/* A99ECC 8024093C 00431024 */ and $v0, $v0, $v1 -/* A99ED0 80240940 AE420000 */ sw $v0, ($s2) -/* A99ED4 80240944 0C00EAE8 */ jal enable_npc_shadow -/* A99ED8 80240948 E6400064 */ swc1 $f0, 0x64($s2) -/* A99EDC 8024094C 8E420000 */ lw $v0, ($s2) -/* A99EE0 80240950 3C03E0FF */ lui $v1, 0xe0ff -/* A99EE4 80240954 34420800 */ ori $v0, $v0, 0x800 -/* A99EE8 80240958 AE420000 */ sw $v0, ($s2) -/* A99EEC 8024095C 8E620000 */ lw $v0, ($s3) -/* A99EF0 80240960 3463FFFF */ ori $v1, $v1, 0xffff -/* A99EF4 80240964 00431024 */ and $v0, $v0, $v1 -/* A99EF8 80240968 AE620000 */ sw $v0, ($s3) -/* A99EFC 8024096C 2402005A */ addiu $v0, $zero, 0x5a -/* A99F00 80240970 A642008E */ sh $v0, 0x8e($s2) -/* A99F04 80240974 AEF10070 */ sw $s1, 0x70($s7) -.L80240978: -/* A99F08 80240978 0000202D */ daddu $a0, $zero, $zero -/* A99F0C 8024097C 27B00020 */ addiu $s0, $sp, 0x20 -/* A99F10 80240980 864200A8 */ lh $v0, 0xa8($s2) -/* A99F14 80240984 3C013FE0 */ lui $at, 0x3fe0 -/* A99F18 80240988 44810800 */ mtc1 $at, $f1 -/* A99F1C 8024098C 44800000 */ mtc1 $zero, $f0 -/* A99F20 80240990 44821000 */ mtc1 $v0, $f2 -/* A99F24 80240994 00000000 */ nop -/* A99F28 80240998 468010A1 */ cvt.d.w $f2, $f2 -/* A99F2C 8024099C 46201082 */ mul.d $f2, $f2, $f0 -/* A99F30 802409A0 00000000 */ nop -/* A99F34 802409A4 0200282D */ daddu $a1, $s0, $zero -/* A99F38 802409A8 C6440038 */ lwc1 $f4, 0x38($s2) -/* A99F3C 802409AC C640003C */ lwc1 $f0, 0x3c($s2) -/* A99F40 802409B0 27B10024 */ addiu $s1, $sp, 0x24 -/* A99F44 802409B4 E7A40020 */ swc1 $f4, 0x20($sp) -/* A99F48 802409B8 C6440040 */ lwc1 $f4, 0x40($s2) -/* A99F4C 802409BC 46000021 */ cvt.d.s $f0, $f0 -/* A99F50 802409C0 46220000 */ add.d $f0, $f0, $f2 -/* A99F54 802409C4 E7A40028 */ swc1 $f4, 0x28($sp) -/* A99F58 802409C8 C6420018 */ lwc1 $f2, 0x18($s2) -/* A99F5C 802409CC 46200020 */ cvt.s.d $f0, $f0 -/* A99F60 802409D0 E7A00024 */ swc1 $f0, 0x24($sp) -/* A99F64 802409D4 E7A20010 */ swc1 $f2, 0x10($sp) -/* A99F68 802409D8 C640000C */ lwc1 $f0, 0xc($s2) -/* A99F6C 802409DC 0220302D */ daddu $a2, $s1, $zero -/* A99F70 802409E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* A99F74 802409E4 864200A6 */ lh $v0, 0xa6($s2) -/* A99F78 802409E8 27B40028 */ addiu $s4, $sp, 0x28 -/* A99F7C 802409EC 44820000 */ mtc1 $v0, $f0 -/* A99F80 802409F0 00000000 */ nop -/* A99F84 802409F4 46800020 */ cvt.s.w $f0, $f0 -/* A99F88 802409F8 E7A00018 */ swc1 $f0, 0x18($sp) -/* A99F8C 802409FC 864200A8 */ lh $v0, 0xa8($s2) -/* A99F90 80240A00 0280382D */ daddu $a3, $s4, $zero -/* A99F94 80240A04 44820000 */ mtc1 $v0, $f0 -/* A99F98 80240A08 00000000 */ nop -/* A99F9C 80240A0C 46800020 */ cvt.s.w $f0, $f0 -/* A99FA0 80240A10 0C0376B9 */ jal func_800DDAE4 -/* A99FA4 80240A14 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A99FA8 80240A18 54400001 */ bnel $v0, $zero, .L80240A20 -/* A99FAC 80240A1C 24160001 */ addiu $s6, $zero, 1 -.L80240A20: -/* A99FB0 80240A20 0200282D */ daddu $a1, $s0, $zero -/* A99FB4 80240A24 0220302D */ daddu $a2, $s1, $zero -/* A99FB8 80240A28 C6400038 */ lwc1 $f0, 0x38($s2) -/* A99FBC 80240A2C C642003C */ lwc1 $f2, 0x3c($s2) -/* A99FC0 80240A30 C6440040 */ lwc1 $f4, 0x40($s2) -/* A99FC4 80240A34 3C01447A */ lui $at, 0x447a -/* A99FC8 80240A38 44813000 */ mtc1 $at, $f6 -/* A99FCC 80240A3C 27A2002C */ addiu $v0, $sp, 0x2c -/* A99FD0 80240A40 E7A00020 */ swc1 $f0, 0x20($sp) -/* A99FD4 80240A44 E7A20024 */ swc1 $f2, 0x24($sp) -/* A99FD8 80240A48 E7A40028 */ swc1 $f4, 0x28($sp) -/* A99FDC 80240A4C E7A6002C */ swc1 $f6, 0x2c($sp) -/* A99FE0 80240A50 AFA20010 */ sw $v0, 0x10($sp) -/* A99FE4 80240A54 8E440080 */ lw $a0, 0x80($s2) -/* A99FE8 80240A58 0C0372DF */ jal func_800DCB7C -/* A99FEC 80240A5C 0280382D */ daddu $a3, $s4, $zero -/* A99FF0 80240A60 10400019 */ beqz $v0, .L80240AC8 -/* A99FF4 80240A64 00000000 */ nop -/* A99FF8 80240A68 C640001C */ lwc1 $f0, 0x1c($s2) -/* A99FFC 80240A6C C7A2002C */ lwc1 $f2, 0x2c($sp) -/* A9A000 80240A70 46000005 */ abs.s $f0, $f0 -/* A9A004 80240A74 4600103C */ c.lt.s $f2, $f0 -/* A9A008 80240A78 00000000 */ nop -/* A9A00C 80240A7C 45000012 */ bc1f .L80240AC8 -/* A9A010 80240A80 00000000 */ nop -/* A9A014 80240A84 C7A40024 */ lwc1 $f4, 0x24($sp) -/* A9A018 80240A88 C6400064 */ lwc1 $f0, 0x64($s2) -/* A9A01C 80240A8C 46002001 */ sub.s $f0, $f4, $f0 -/* A9A020 80240A90 3C014034 */ lui $at, 0x4034 -/* A9A024 80240A94 44811800 */ mtc1 $at, $f3 -/* A9A028 80240A98 44801000 */ mtc1 $zero, $f2 -/* A9A02C 80240A9C 46000005 */ abs.s $f0, $f0 -/* A9A030 80240AA0 46000021 */ cvt.d.s $f0, $f0 -/* A9A034 80240AA4 4622003C */ c.lt.d $f0, $f2 -/* A9A038 80240AA8 00000000 */ nop -/* A9A03C 80240AAC 45000006 */ bc1f .L80240AC8 -/* A9A040 80240AB0 0240202D */ daddu $a0, $s2, $zero -/* A9A044 80240AB4 8E450018 */ lw $a1, 0x18($s2) -/* A9A048 80240AB8 8E46000C */ lw $a2, 0xc($s2) -/* A9A04C 80240ABC 2416000A */ addiu $s6, $zero, 0xa -/* A9A050 80240AC0 0C00EA95 */ jal npc_move_heading -/* A9A054 80240AC4 E644003C */ swc1 $f4, 0x3c($s2) -.L80240AC8: -/* A9A058 80240AC8 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A9A05C 80240ACC 3C013FF0 */ lui $at, 0x3ff0 -/* A9A060 80240AD0 44811800 */ mtc1 $at, $f3 -/* A9A064 80240AD4 44801000 */ mtc1 $zero, $f2 -/* A9A068 80240AD8 46000021 */ cvt.d.s $f0, $f0 -/* A9A06C 80240ADC 4622003C */ c.lt.d $f0, $f2 -/* A9A070 80240AE0 00000000 */ nop -/* A9A074 80240AE4 45030001 */ bc1tl .L80240AEC -/* A9A078 80240AE8 2416000B */ addiu $s6, $zero, 0xb -.L80240AEC: -/* A9A07C 80240AEC 9642008E */ lhu $v0, 0x8e($s2) -/* A9A080 80240AF0 2442FFFF */ addiu $v0, $v0, -1 -/* A9A084 80240AF4 A642008E */ sh $v0, 0x8e($s2) -/* A9A088 80240AF8 00021400 */ sll $v0, $v0, 0x10 -/* A9A08C 80240AFC 58400001 */ blezl $v0, .L80240B04 -/* A9A090 80240B00 24160014 */ addiu $s6, $zero, 0x14 -.L80240B04: -/* A9A094 80240B04 56C00019 */ bnel $s6, $zero, .L80240B6C -/* A9A098 80240B08 AFA00010 */ sw $zero, 0x10($sp) -/* A9A09C 80240B0C 8E620070 */ lw $v0, 0x70($s3) -/* A9A0A0 80240B10 30420001 */ andi $v0, $v0, 1 -/* A9A0A4 80240B14 10400009 */ beqz $v0, .L80240B3C -/* A9A0A8 80240B18 00000000 */ nop -/* A9A0AC 80240B1C C640004C */ lwc1 $f0, 0x4c($s2) -/* A9A0B0 80240B20 3C014044 */ lui $at, 0x4044 -/* A9A0B4 80240B24 44811800 */ mtc1 $at, $f3 -/* A9A0B8 80240B28 44801000 */ mtc1 $zero, $f2 -/* A9A0BC 80240B2C 46000021 */ cvt.d.s $f0, $f0 -/* A9A0C0 80240B30 46220000 */ add.d $f0, $f0, $f2 -/* A9A0C4 80240B34 46200020 */ cvt.s.d $f0, $f0 -/* A9A0C8 80240B38 E640004C */ swc1 $f0, 0x4c($s2) -.L80240B3C: -/* A9A0CC 80240B3C 8E450018 */ lw $a1, 0x18($s2) -/* A9A0D0 80240B40 8E46000C */ lw $a2, 0xc($s2) -/* A9A0D4 80240B44 0C00EA95 */ jal npc_move_heading -/* A9A0D8 80240B48 0240202D */ daddu $a0, $s2, $zero -/* A9A0DC 80240B4C C644003C */ lwc1 $f4, 0x3c($s2) -/* A9A0E0 80240B50 C640001C */ lwc1 $f0, 0x1c($s2) -/* A9A0E4 80240B54 46002100 */ add.s $f4, $f4, $f0 -/* A9A0E8 80240B58 C6420014 */ lwc1 $f2, 0x14($s2) -/* A9A0EC 80240B5C 46020001 */ sub.s $f0, $f0, $f2 -/* A9A0F0 80240B60 E644003C */ swc1 $f4, 0x3c($s2) -/* A9A0F4 80240B64 080902F6 */ j .L80240BD8 -/* A9A0F8 80240B68 E640001C */ swc1 $f0, 0x1c($s2) -.L80240B6C: -/* A9A0FC 80240B6C AFA00014 */ sw $zero, 0x14($sp) -/* A9A100 80240B70 8E450038 */ lw $a1, 0x38($s2) -/* A9A104 80240B74 8E46003C */ lw $a2, 0x3c($s2) -/* A9A108 80240B78 8E470040 */ lw $a3, 0x40($s2) -/* A9A10C 80240B7C 0C01BECC */ jal fx_walk_normal -/* A9A110 80240B80 24040002 */ addiu $a0, $zero, 2 -/* A9A114 80240B84 3C01C47A */ lui $at, 0xc47a -/* A9A118 80240B88 44810000 */ mtc1 $at, $f0 -/* A9A11C 80240B8C AE60006C */ sw $zero, 0x6c($s3) -/* A9A120 80240B90 8E420000 */ lw $v0, ($s2) -/* A9A124 80240B94 0240202D */ daddu $a0, $s2, $zero -/* A9A128 80240B98 AE400038 */ sw $zero, 0x38($s2) -/* A9A12C 80240B9C AE400040 */ sw $zero, 0x40($s2) -/* A9A130 80240BA0 AE40001C */ sw $zero, 0x1c($s2) -/* A9A134 80240BA4 34420002 */ ori $v0, $v0, 2 -/* A9A138 80240BA8 E640003C */ swc1 $f0, 0x3c($s2) -/* A9A13C 80240BAC 0C00EAFF */ jal disable_npc_shadow -/* A9A140 80240BB0 AE420000 */ sw $v0, ($s2) -/* A9A144 80240BB4 8E420000 */ lw $v0, ($s2) -/* A9A148 80240BB8 2403F7FF */ addiu $v1, $zero, -0x801 -/* A9A14C 80240BBC 00431024 */ and $v0, $v0, $v1 -/* A9A150 80240BC0 AE420000 */ sw $v0, ($s2) -/* A9A154 80240BC4 8E620000 */ lw $v0, ($s3) -/* A9A158 80240BC8 3C031F00 */ lui $v1, 0x1f00 -/* A9A15C 80240BCC 00431025 */ or $v0, $v0, $v1 -/* A9A160 80240BD0 AE620000 */ sw $v0, ($s3) -/* A9A164 80240BD4 AEE00070 */ sw $zero, 0x70($s7) -.L80240BD8: -/* A9A168 80240BD8 0000102D */ daddu $v0, $zero, $zero -.L80240BDC: -/* A9A16C 80240BDC 8FBF0050 */ lw $ra, 0x50($sp) -/* A9A170 80240BE0 8FB7004C */ lw $s7, 0x4c($sp) -/* A9A174 80240BE4 8FB60048 */ lw $s6, 0x48($sp) -/* A9A178 80240BE8 8FB50044 */ lw $s5, 0x44($sp) -/* A9A17C 80240BEC 8FB40040 */ lw $s4, 0x40($sp) -/* A9A180 80240BF0 8FB3003C */ lw $s3, 0x3c($sp) -/* A9A184 80240BF4 8FB20038 */ lw $s2, 0x38($sp) -/* A9A188 80240BF8 8FB10034 */ lw $s1, 0x34($sp) -/* A9A18C 80240BFC 8FB00030 */ lw $s0, 0x30($sp) -/* A9A190 80240C00 03E00008 */ jr $ra -/* A9A194 80240C04 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/func_80240C08_A99590.s b/asm/nonmatchings/world/area_kpa/kpa_111/func_80240C08_A99590.s deleted file mode 100644 index c372efd1c9..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/func_80240C08_A99590.s +++ /dev/null @@ -1,298 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C08_A9A198 -/* A9A198 80240C08 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* A9A19C 80240C0C AFB3003C */ sw $s3, 0x3c($sp) -/* A9A1A0 80240C10 0080982D */ daddu $s3, $a0, $zero -/* A9A1A4 80240C14 AFB40040 */ sw $s4, 0x40($sp) -/* A9A1A8 80240C18 0000A02D */ daddu $s4, $zero, $zero -/* A9A1AC 80240C1C 3C03800A */ lui $v1, 0x800a -/* A9A1B0 80240C20 8463A634 */ lh $v1, -0x59cc($v1) -/* A9A1B4 80240C24 3C04800B */ lui $a0, %hi(gCameras) -/* A9A1B8 80240C28 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A9A1BC 80240C2C AFBF0044 */ sw $ra, 0x44($sp) -/* A9A1C0 80240C30 AFB20038 */ sw $s2, 0x38($sp) -/* A9A1C4 80240C34 AFB10034 */ sw $s1, 0x34($sp) -/* A9A1C8 80240C38 AFB00030 */ sw $s0, 0x30($sp) -/* A9A1CC 80240C3C F7B80058 */ sdc1 $f24, 0x58($sp) -/* A9A1D0 80240C40 F7B60050 */ sdc1 $f22, 0x50($sp) -/* A9A1D4 80240C44 F7B40048 */ sdc1 $f20, 0x48($sp) -/* A9A1D8 80240C48 8E710148 */ lw $s1, 0x148($s3) -/* A9A1DC 80240C4C 00031080 */ sll $v0, $v1, 2 -/* A9A1E0 80240C50 00431021 */ addu $v0, $v0, $v1 -/* A9A1E4 80240C54 00021080 */ sll $v0, $v0, 2 -/* A9A1E8 80240C58 00431023 */ subu $v0, $v0, $v1 -/* A9A1EC 80240C5C 000218C0 */ sll $v1, $v0, 3 -/* A9A1F0 80240C60 00431021 */ addu $v0, $v0, $v1 -/* A9A1F4 80240C64 000210C0 */ sll $v0, $v0, 3 -/* A9A1F8 80240C68 10A00002 */ beqz $a1, .L80240C74 -/* A9A1FC 80240C6C 00449021 */ addu $s2, $v0, $a0 -/* A9A200 80240C70 AE600070 */ sw $zero, 0x70($s3) -.L80240C74: -/* A9A204 80240C74 0C00FB5A */ jal get_enemy_safe -/* A9A208 80240C78 86240008 */ lh $a0, 8($s1) -/* A9A20C 80240C7C 14400006 */ bnez $v0, .L80240C98 -/* A9A210 80240C80 24020005 */ addiu $v0, $zero, 5 -/* A9A214 80240C84 0260202D */ daddu $a0, $s3, $zero -/* A9A218 80240C88 3C05FE36 */ lui $a1, 0xfe36 -/* A9A21C 80240C8C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A9A220 80240C90 080903FE */ j .L80240FF8 -/* A9A224 80240C94 0000302D */ daddu $a2, $zero, $zero -.L80240C98: -/* A9A228 80240C98 8E23006C */ lw $v1, 0x6c($s1) -/* A9A22C 80240C9C 14620005 */ bne $v1, $v0, .L80240CB4 -/* A9A230 80240CA0 0260202D */ daddu $a0, $s3, $zero -/* A9A234 80240CA4 3C05FE36 */ lui $a1, 0xfe36 -/* A9A238 80240CA8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A9A23C 80240CAC 080903FE */ j .L80240FF8 -/* A9A240 80240CB0 0000302D */ daddu $a2, $zero, $zero -.L80240CB4: -/* A9A244 80240CB4 86240008 */ lh $a0, 8($s1) -/* A9A248 80240CB8 0C00FB5A */ jal get_enemy_safe -/* A9A24C 80240CBC 00000000 */ nop -/* A9A250 80240CC0 14400005 */ bnez $v0, .L80240CD8 -/* A9A254 80240CC4 0260202D */ daddu $a0, $s3, $zero -/* A9A258 80240CC8 3C05FE36 */ lui $a1, 0xfe36 -/* A9A25C 80240CCC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A9A260 80240CD0 080903FE */ j .L80240FF8 -/* A9A264 80240CD4 0000302D */ daddu $a2, $zero, $zero -.L80240CD8: -/* A9A268 80240CD8 86240008 */ lh $a0, 8($s1) -/* A9A26C 80240CDC 0C00EABB */ jal get_npc_unsafe -/* A9A270 80240CE0 00000000 */ nop -/* A9A274 80240CE4 8E630070 */ lw $v1, 0x70($s3) -/* A9A278 80240CE8 10600006 */ beqz $v1, .L80240D04 -/* A9A27C 80240CEC 0040802D */ daddu $s0, $v0, $zero -/* A9A280 80240CF0 24020001 */ addiu $v0, $zero, 1 -/* A9A284 80240CF4 1062003F */ beq $v1, $v0, .L80240DF4 -/* A9A288 80240CF8 0000102D */ daddu $v0, $zero, $zero -/* A9A28C 80240CFC 0809040E */ j .L80241038 -/* A9A290 80240D00 00000000 */ nop -.L80240D04: -/* A9A294 80240D04 AFA00010 */ sw $zero, 0x10($sp) -/* A9A298 80240D08 AFA00014 */ sw $zero, 0x14($sp) -/* A9A29C 80240D0C 8E050038 */ lw $a1, 0x38($s0) -/* A9A2A0 80240D10 8E06003C */ lw $a2, 0x3c($s0) -/* A9A2A4 80240D14 8E070040 */ lw $a3, 0x40($s0) -/* A9A2A8 80240D18 0C01BECC */ jal fx_walk_normal -/* A9A2AC 80240D1C 24040002 */ addiu $a0, $zero, 2 -/* A9A2B0 80240D20 C64C006C */ lwc1 $f12, 0x6c($s2) -/* A9A2B4 80240D24 0C00A6C9 */ jal clamp_angle -/* A9A2B8 80240D28 00000000 */ nop -/* A9A2BC 80240D2C 3C018024 */ lui $at, 0x8024 -/* A9A2C0 80240D30 D4383250 */ ldc1 $f24, 0x3250($at) -/* A9A2C4 80240D34 46000521 */ cvt.d.s $f20, $f0 -/* A9A2C8 80240D38 4638A300 */ add.d $f12, $f20, $f24 -/* A9A2CC 80240D3C 3C018024 */ lui $at, 0x8024 -/* A9A2D0 80240D40 D4363258 */ ldc1 $f22, 0x3258($at) -/* A9A2D4 80240D44 0C00A6C9 */ jal clamp_angle -/* A9A2D8 80240D48 46206320 */ cvt.s.d $f12, $f12 -/* A9A2DC 80240D4C 4636A500 */ add.d $f20, $f20, $f22 -/* A9A2E0 80240D50 4620A320 */ cvt.s.d $f12, $f20 -/* A9A2E4 80240D54 0C00A6C9 */ jal clamp_angle -/* A9A2E8 80240D58 46000506 */ mov.s $f20, $f0 -/* A9A2EC 80240D5C 4600A521 */ cvt.d.s $f20, $f20 -/* A9A2F0 80240D60 4636A500 */ add.d $f20, $f20, $f22 -/* A9A2F4 80240D64 46000586 */ mov.s $f22, $f0 -/* A9A2F8 80240D68 0C00A6C9 */ jal clamp_angle -/* A9A2FC 80240D6C 4620A320 */ cvt.s.d $f12, $f20 -/* A9A300 80240D70 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A9A304 80240D74 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A9A308 80240D78 C64C006C */ lwc1 $f12, 0x6c($s2) -/* A9A30C 80240D7C C44E0084 */ lwc1 $f14, 0x84($v0) -/* A9A310 80240D80 0C00A70A */ jal get_clamped_angle_diff -/* A9A314 80240D84 46000506 */ mov.s $f20, $f0 -/* A9A318 80240D88 0C00A6C9 */ jal clamp_angle -/* A9A31C 80240D8C 46000306 */ mov.s $f12, $f0 -/* A9A320 80240D90 46000021 */ cvt.d.s $f0, $f0 -/* A9A324 80240D94 4638003C */ c.lt.d $f0, $f24 -/* A9A328 80240D98 00000000 */ nop -/* A9A32C 80240D9C 45020002 */ bc1fl .L80240DA8 -/* A9A330 80240DA0 E614000C */ swc1 $f20, 0xc($s0) -/* A9A334 80240DA4 E616000C */ swc1 $f22, 0xc($s0) -.L80240DA8: -/* A9A338 80240DA8 C6000018 */ lwc1 $f0, 0x18($s0) -/* A9A33C 80240DAC 3C018024 */ lui $at, 0x8024 -/* A9A340 80240DB0 D4223260 */ ldc1 $f2, 0x3260($at) -/* A9A344 80240DB4 46000021 */ cvt.d.s $f0, $f0 -/* A9A348 80240DB8 46220002 */ mul.d $f0, $f0, $f2 -/* A9A34C 80240DBC 00000000 */ nop -/* A9A350 80240DC0 3C013F66 */ lui $at, 0x3f66 -/* A9A354 80240DC4 34216666 */ ori $at, $at, 0x6666 -/* A9A358 80240DC8 44812000 */ mtc1 $at, $f4 -/* A9A35C 80240DCC 2402001E */ addiu $v0, $zero, 0x1e -/* A9A360 80240DD0 A602008E */ sh $v0, 0x8e($s0) -/* A9A364 80240DD4 3C014120 */ lui $at, 0x4120 -/* A9A368 80240DD8 44811000 */ mtc1 $at, $f2 -/* A9A36C 80240DDC 24020001 */ addiu $v0, $zero, 1 -/* A9A370 80240DE0 E6040014 */ swc1 $f4, 0x14($s0) -/* A9A374 80240DE4 E602001C */ swc1 $f2, 0x1c($s0) -/* A9A378 80240DE8 46200020 */ cvt.s.d $f0, $f0 -/* A9A37C 80240DEC E6000018 */ swc1 $f0, 0x18($s0) -/* A9A380 80240DF0 AE620070 */ sw $v0, 0x70($s3) -.L80240DF4: -/* A9A384 80240DF4 C6000038 */ lwc1 $f0, 0x38($s0) -/* A9A388 80240DF8 C602003C */ lwc1 $f2, 0x3c($s0) -/* A9A38C 80240DFC C6040040 */ lwc1 $f4, 0x40($s0) -/* A9A390 80240E00 C6060018 */ lwc1 $f6, 0x18($s0) -/* A9A394 80240E04 0000202D */ daddu $a0, $zero, $zero -/* A9A398 80240E08 E7A00020 */ swc1 $f0, 0x20($sp) -/* A9A39C 80240E0C E7A20024 */ swc1 $f2, 0x24($sp) -/* A9A3A0 80240E10 E7A40028 */ swc1 $f4, 0x28($sp) -/* A9A3A4 80240E14 E7A60010 */ swc1 $f6, 0x10($sp) -/* A9A3A8 80240E18 C600000C */ lwc1 $f0, 0xc($s0) -/* A9A3AC 80240E1C 27A50020 */ addiu $a1, $sp, 0x20 -/* A9A3B0 80240E20 E7A00014 */ swc1 $f0, 0x14($sp) -/* A9A3B4 80240E24 860200A6 */ lh $v0, 0xa6($s0) -/* A9A3B8 80240E28 27A60024 */ addiu $a2, $sp, 0x24 -/* A9A3BC 80240E2C 44820000 */ mtc1 $v0, $f0 -/* A9A3C0 80240E30 00000000 */ nop -/* A9A3C4 80240E34 46800020 */ cvt.s.w $f0, $f0 -/* A9A3C8 80240E38 E7A00018 */ swc1 $f0, 0x18($sp) -/* A9A3CC 80240E3C 860200A8 */ lh $v0, 0xa8($s0) -/* A9A3D0 80240E40 27A70028 */ addiu $a3, $sp, 0x28 -/* A9A3D4 80240E44 44820000 */ mtc1 $v0, $f0 -/* A9A3D8 80240E48 00000000 */ nop -/* A9A3DC 80240E4C 46800020 */ cvt.s.w $f0, $f0 -/* A9A3E0 80240E50 0C037711 */ jal func_800DDC44 -/* A9A3E4 80240E54 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A9A3E8 80240E58 54400007 */ bnel $v0, $zero, .L80240E78 -/* A9A3EC 80240E5C 24140001 */ addiu $s4, $zero, 1 -/* A9A3F0 80240E60 8E050018 */ lw $a1, 0x18($s0) -/* A9A3F4 80240E64 8E06000C */ lw $a2, 0xc($s0) -/* A9A3F8 80240E68 0C00EA95 */ jal npc_move_heading -/* A9A3FC 80240E6C 0200202D */ daddu $a0, $s0, $zero -/* A9A400 80240E70 0809039F */ j .L80240E7C -/* A9A404 80240E74 0000902D */ daddu $s2, $zero, $zero -.L80240E78: -/* A9A408 80240E78 0000902D */ daddu $s2, $zero, $zero -.L80240E7C: -/* A9A40C 80240E7C C600001C */ lwc1 $f0, 0x1c($s0) -/* A9A410 80240E80 44801000 */ mtc1 $zero, $f2 -/* A9A414 80240E84 44801800 */ mtc1 $zero, $f3 -/* A9A418 80240E88 46000021 */ cvt.d.s $f0, $f0 -/* A9A41C 80240E8C 4622003C */ c.lt.d $f0, $f2 -/* A9A420 80240E90 00000000 */ nop -/* A9A424 80240E94 45000028 */ bc1f .L80240F38 -/* A9A428 80240E98 27A50020 */ addiu $a1, $sp, 0x20 -/* A9A42C 80240E9C 27A60024 */ addiu $a2, $sp, 0x24 -/* A9A430 80240EA0 27A2002C */ addiu $v0, $sp, 0x2c -/* A9A434 80240EA4 C602003C */ lwc1 $f2, 0x3c($s0) -/* A9A438 80240EA8 C6060038 */ lwc1 $f6, 0x38($s0) -/* A9A43C 80240EAC 3C01402A */ lui $at, 0x402a -/* A9A440 80240EB0 4481A800 */ mtc1 $at, $f21 -/* A9A444 80240EB4 4480A000 */ mtc1 $zero, $f20 -/* A9A448 80240EB8 460010A1 */ cvt.d.s $f2, $f2 -/* A9A44C 80240EBC 46341080 */ add.d $f2, $f2, $f20 -/* A9A450 80240EC0 C600001C */ lwc1 $f0, 0x1c($s0) -/* A9A454 80240EC4 C6040040 */ lwc1 $f4, 0x40($s0) -/* A9A458 80240EC8 46000005 */ abs.s $f0, $f0 -/* A9A45C 80240ECC E7A40028 */ swc1 $f4, 0x28($sp) -/* A9A460 80240ED0 3C014030 */ lui $at, 0x4030 -/* A9A464 80240ED4 44812800 */ mtc1 $at, $f5 -/* A9A468 80240ED8 44802000 */ mtc1 $zero, $f4 -/* A9A46C 80240EDC 46000021 */ cvt.d.s $f0, $f0 -/* A9A470 80240EE0 E7A60020 */ swc1 $f6, 0x20($sp) -/* A9A474 80240EE4 46240000 */ add.d $f0, $f0, $f4 -/* A9A478 80240EE8 462010A0 */ cvt.s.d $f2, $f2 -/* A9A47C 80240EEC E7A20024 */ swc1 $f2, 0x24($sp) -/* A9A480 80240EF0 46200020 */ cvt.s.d $f0, $f0 -/* A9A484 80240EF4 E7A0002C */ swc1 $f0, 0x2c($sp) -/* A9A488 80240EF8 AFA20010 */ sw $v0, 0x10($sp) -/* A9A48C 80240EFC 8E040080 */ lw $a0, 0x80($s0) -/* A9A490 80240F00 0C0372DF */ jal func_800DCB7C -/* A9A494 80240F04 27A70028 */ addiu $a3, $sp, 0x28 -/* A9A498 80240F08 1040000B */ beqz $v0, .L80240F38 -/* A9A49C 80240F0C 00000000 */ nop -/* A9A4A0 80240F10 C600001C */ lwc1 $f0, 0x1c($s0) -/* A9A4A4 80240F14 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* A9A4A8 80240F18 46000005 */ abs.s $f0, $f0 -/* A9A4AC 80240F1C 46000021 */ cvt.d.s $f0, $f0 -/* A9A4B0 80240F20 46340000 */ add.d $f0, $f0, $f20 -/* A9A4B4 80240F24 460010A1 */ cvt.d.s $f2, $f2 -/* A9A4B8 80240F28 4620103E */ c.le.d $f2, $f0 -/* A9A4BC 80240F2C 00000000 */ nop -/* A9A4C0 80240F30 45030001 */ bc1tl .L80240F38 -/* A9A4C4 80240F34 24120001 */ addiu $s2, $zero, 1 -.L80240F38: -/* A9A4C8 80240F38 56400008 */ bnel $s2, $zero, .L80240F5C -/* A9A4CC 80240F3C 2414000A */ addiu $s4, $zero, 0xa -/* A9A4D0 80240F40 C604003C */ lwc1 $f4, 0x3c($s0) -/* A9A4D4 80240F44 C600001C */ lwc1 $f0, 0x1c($s0) -/* A9A4D8 80240F48 46002100 */ add.s $f4, $f4, $f0 -/* A9A4DC 80240F4C C6020014 */ lwc1 $f2, 0x14($s0) -/* A9A4E0 80240F50 46020001 */ sub.s $f0, $f0, $f2 -/* A9A4E4 80240F54 E604003C */ swc1 $f4, 0x3c($s0) -/* A9A4E8 80240F58 E600001C */ swc1 $f0, 0x1c($s0) -.L80240F5C: -/* A9A4EC 80240F5C 9602008E */ lhu $v0, 0x8e($s0) -/* A9A4F0 80240F60 2442FFFF */ addiu $v0, $v0, -1 -/* A9A4F4 80240F64 A602008E */ sh $v0, 0x8e($s0) -/* A9A4F8 80240F68 00021400 */ sll $v0, $v0, 0x10 -/* A9A4FC 80240F6C 58400001 */ blezl $v0, .L80240F74 -/* A9A500 80240F70 2414000B */ addiu $s4, $zero, 0xb -.L80240F74: -/* A9A504 80240F74 12800024 */ beqz $s4, .L80241008 -/* A9A508 80240F78 00000000 */ nop -/* A9A50C 80240F7C AFA00010 */ sw $zero, 0x10($sp) -/* A9A510 80240F80 AFA00014 */ sw $zero, 0x14($sp) -/* A9A514 80240F84 8E050038 */ lw $a1, 0x38($s0) -/* A9A518 80240F88 8E06003C */ lw $a2, 0x3c($s0) -/* A9A51C 80240F8C 8E070040 */ lw $a3, 0x40($s0) -/* A9A520 80240F90 0C01BECC */ jal fx_walk_normal -/* A9A524 80240F94 24040002 */ addiu $a0, $zero, 2 -/* A9A528 80240F98 3C01C47A */ lui $at, 0xc47a -/* A9A52C 80240F9C 44810000 */ mtc1 $at, $f0 -/* A9A530 80240FA0 AE20006C */ sw $zero, 0x6c($s1) -/* A9A534 80240FA4 8E020000 */ lw $v0, ($s0) -/* A9A538 80240FA8 0200202D */ daddu $a0, $s0, $zero -/* A9A53C 80240FAC AE000038 */ sw $zero, 0x38($s0) -/* A9A540 80240FB0 AE000040 */ sw $zero, 0x40($s0) -/* A9A544 80240FB4 34420002 */ ori $v0, $v0, 2 -/* A9A548 80240FB8 E600003C */ swc1 $f0, 0x3c($s0) -/* A9A54C 80240FBC 0C00EAFF */ jal disable_npc_shadow -/* A9A550 80240FC0 AE020000 */ sw $v0, ($s0) -/* A9A554 80240FC4 0260202D */ daddu $a0, $s3, $zero -/* A9A558 80240FC8 3C05FE36 */ lui $a1, 0xfe36 -/* A9A55C 80240FCC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A9A560 80240FD0 24060001 */ addiu $a2, $zero, 1 -/* A9A564 80240FD4 8E020000 */ lw $v0, ($s0) -/* A9A568 80240FD8 2403F7FF */ addiu $v1, $zero, -0x801 -/* A9A56C 80240FDC 00431024 */ and $v0, $v0, $v1 -/* A9A570 80240FE0 AE020000 */ sw $v0, ($s0) -/* A9A574 80240FE4 8E220000 */ lw $v0, ($s1) -/* A9A578 80240FE8 3C031F00 */ lui $v1, 0x1f00 -/* A9A57C 80240FEC 00431025 */ or $v0, $v0, $v1 -/* A9A580 80240FF0 AE220000 */ sw $v0, ($s1) -/* A9A584 80240FF4 AC800070 */ sw $zero, 0x70($a0) -.L80240FF8: -/* A9A588 80240FF8 0C0B2026 */ jal set_variable -/* A9A58C 80240FFC 00000000 */ nop -/* A9A590 80241000 0809040E */ j .L80241038 -/* A9A594 80241004 24020002 */ addiu $v0, $zero, 2 -.L80241008: -/* A9A598 80241008 8E220070 */ lw $v0, 0x70($s1) -/* A9A59C 8024100C 30420001 */ andi $v0, $v0, 1 -/* A9A5A0 80241010 10400009 */ beqz $v0, .L80241038 -/* A9A5A4 80241014 0000102D */ daddu $v0, $zero, $zero -/* A9A5A8 80241018 C600004C */ lwc1 $f0, 0x4c($s0) -/* A9A5AC 8024101C 3C01404E */ lui $at, 0x404e -/* A9A5B0 80241020 44811800 */ mtc1 $at, $f3 -/* A9A5B4 80241024 44801000 */ mtc1 $zero, $f2 -/* A9A5B8 80241028 46000021 */ cvt.d.s $f0, $f0 -/* A9A5BC 8024102C 46220000 */ add.d $f0, $f0, $f2 -/* A9A5C0 80241030 46200020 */ cvt.s.d $f0, $f0 -/* A9A5C4 80241034 E600004C */ swc1 $f0, 0x4c($s0) -.L80241038: -/* A9A5C8 80241038 8FBF0044 */ lw $ra, 0x44($sp) -/* A9A5CC 8024103C 8FB40040 */ lw $s4, 0x40($sp) -/* A9A5D0 80241040 8FB3003C */ lw $s3, 0x3c($sp) -/* A9A5D4 80241044 8FB20038 */ lw $s2, 0x38($sp) -/* A9A5D8 80241048 8FB10034 */ lw $s1, 0x34($sp) -/* A9A5DC 8024104C 8FB00030 */ lw $s0, 0x30($sp) -/* A9A5E0 80241050 D7B80058 */ ldc1 $f24, 0x58($sp) -/* A9A5E4 80241054 D7B60050 */ ldc1 $f22, 0x50($sp) -/* A9A5E8 80241058 D7B40048 */ ldc1 $f20, 0x48($sp) -/* A9A5EC 8024105C 03E00008 */ jr $ra -/* A9A5F0 80241060 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/func_80241064_A99590.s b/asm/nonmatchings/world/area_kpa/kpa_111/func_80241064_A99590.s deleted file mode 100644 index 93cc15dd5b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/func_80241064_A99590.s +++ /dev/null @@ -1,213 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241064_A9A5F4 -/* A9A5F4 80241064 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A9A5F8 80241068 AFB3003C */ sw $s3, 0x3c($sp) -/* A9A5FC 8024106C 0080982D */ daddu $s3, $a0, $zero -/* A9A600 80241070 AFBF0048 */ sw $ra, 0x48($sp) -/* A9A604 80241074 AFB50044 */ sw $s5, 0x44($sp) -/* A9A608 80241078 AFB40040 */ sw $s4, 0x40($sp) -/* A9A60C 8024107C AFB20038 */ sw $s2, 0x38($sp) -/* A9A610 80241080 AFB10034 */ sw $s1, 0x34($sp) -/* A9A614 80241084 AFB00030 */ sw $s0, 0x30($sp) -/* A9A618 80241088 8E720148 */ lw $s2, 0x148($s3) -/* A9A61C 8024108C 86440008 */ lh $a0, 8($s2) -/* A9A620 80241090 8E70000C */ lw $s0, 0xc($s3) -/* A9A624 80241094 0C00EABB */ jal get_npc_unsafe -/* A9A628 80241098 00A0882D */ daddu $s1, $a1, $zero -/* A9A62C 8024109C 0260202D */ daddu $a0, $s3, $zero -/* A9A630 802410A0 8E050000 */ lw $a1, ($s0) -/* A9A634 802410A4 0C0B1EAF */ jal get_variable -/* A9A638 802410A8 0040A02D */ daddu $s4, $v0, $zero -/* A9A63C 802410AC AFA00010 */ sw $zero, 0x10($sp) -/* A9A640 802410B0 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9A644 802410B4 8C630030 */ lw $v1, 0x30($v1) -/* A9A648 802410B8 AFA30014 */ sw $v1, 0x14($sp) -/* A9A64C 802410BC 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9A650 802410C0 8C63001C */ lw $v1, 0x1c($v1) -/* A9A654 802410C4 AFA30018 */ sw $v1, 0x18($sp) -/* A9A658 802410C8 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9A65C 802410CC 8C630024 */ lw $v1, 0x24($v1) -/* A9A660 802410D0 AFA3001C */ sw $v1, 0x1c($sp) -/* A9A664 802410D4 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9A668 802410D8 8C630028 */ lw $v1, 0x28($v1) -/* A9A66C 802410DC 27B50010 */ addiu $s5, $sp, 0x10 -/* A9A670 802410E0 AFA30020 */ sw $v1, 0x20($sp) -/* A9A674 802410E4 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9A678 802410E8 3C014220 */ lui $at, 0x4220 -/* A9A67C 802410EC 44810000 */ mtc1 $at, $f0 -/* A9A680 802410F0 8C63002C */ lw $v1, 0x2c($v1) -/* A9A684 802410F4 0040802D */ daddu $s0, $v0, $zero -/* A9A688 802410F8 E7A00028 */ swc1 $f0, 0x28($sp) -/* A9A68C 802410FC A7A0002C */ sh $zero, 0x2c($sp) -/* A9A690 80241100 16200005 */ bnez $s1, .L80241118 -/* A9A694 80241104 AFA30024 */ sw $v1, 0x24($sp) -/* A9A698 80241108 8E4200B0 */ lw $v0, 0xb0($s2) -/* A9A69C 8024110C 30420004 */ andi $v0, $v0, 4 -/* A9A6A0 80241110 1040002F */ beqz $v0, .L802411D0 -/* A9A6A4 80241114 00000000 */ nop -.L80241118: -/* A9A6A8 80241118 2404F7FF */ addiu $a0, $zero, -0x801 -/* A9A6AC 8024111C AE600070 */ sw $zero, 0x70($s3) -/* A9A6B0 80241120 A680008E */ sh $zero, 0x8e($s4) -/* A9A6B4 80241124 8E4200CC */ lw $v0, 0xcc($s2) -/* A9A6B8 80241128 8E830000 */ lw $v1, ($s4) -/* A9A6BC 8024112C 8C420000 */ lw $v0, ($v0) -/* A9A6C0 80241130 00641824 */ and $v1, $v1, $a0 -/* A9A6C4 80241134 AE830000 */ sw $v1, ($s4) -/* A9A6C8 80241138 AE820028 */ sw $v0, 0x28($s4) -/* A9A6CC 8024113C 8E4200D0 */ lw $v0, 0xd0($s2) -/* A9A6D0 80241140 8C420034 */ lw $v0, 0x34($v0) -/* A9A6D4 80241144 54400005 */ bnel $v0, $zero, .L8024115C -/* A9A6D8 80241148 2402FDFF */ addiu $v0, $zero, -0x201 -/* A9A6DC 8024114C 34620200 */ ori $v0, $v1, 0x200 -/* A9A6E0 80241150 2403FFF7 */ addiu $v1, $zero, -9 -/* A9A6E4 80241154 08090459 */ j .L80241164 -/* A9A6E8 80241158 00431024 */ and $v0, $v0, $v1 -.L8024115C: -/* A9A6EC 8024115C 00621024 */ and $v0, $v1, $v0 -/* A9A6F0 80241160 34420008 */ ori $v0, $v0, 8 -.L80241164: -/* A9A6F4 80241164 AE820000 */ sw $v0, ($s4) -/* A9A6F8 80241168 8E4200B0 */ lw $v0, 0xb0($s2) -/* A9A6FC 8024116C 30420004 */ andi $v0, $v0, 4 -/* A9A700 80241170 10400008 */ beqz $v0, .L80241194 -/* A9A704 80241174 24020063 */ addiu $v0, $zero, 0x63 -/* A9A708 80241178 AE620070 */ sw $v0, 0x70($s3) -/* A9A70C 8024117C AE600074 */ sw $zero, 0x74($s3) -/* A9A710 80241180 8E4200B0 */ lw $v0, 0xb0($s2) -/* A9A714 80241184 2403FFFB */ addiu $v1, $zero, -5 -/* A9A718 80241188 00431024 */ and $v0, $v0, $v1 -/* A9A71C 8024118C 0809046B */ j .L802411AC -/* A9A720 80241190 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241194: -/* A9A724 80241194 8E420000 */ lw $v0, ($s2) -/* A9A728 80241198 3C034000 */ lui $v1, 0x4000 -/* A9A72C 8024119C 00431024 */ and $v0, $v0, $v1 -/* A9A730 802411A0 10400002 */ beqz $v0, .L802411AC -/* A9A734 802411A4 2402000C */ addiu $v0, $zero, 0xc -/* A9A738 802411A8 AE620070 */ sw $v0, 0x70($s3) -.L802411AC: -/* A9A73C 802411AC 3C05BFFF */ lui $a1, 0xbfff -/* A9A740 802411B0 34A5FFFF */ ori $a1, $a1, 0xffff -/* A9A744 802411B4 2404FFFB */ addiu $a0, $zero, -5 -/* A9A748 802411B8 8E4200B0 */ lw $v0, 0xb0($s2) -/* A9A74C 802411BC 8E430000 */ lw $v1, ($s2) -/* A9A750 802411C0 00441024 */ and $v0, $v0, $a0 -/* A9A754 802411C4 00651824 */ and $v1, $v1, $a1 -/* A9A758 802411C8 AE4200B0 */ sw $v0, 0xb0($s2) -/* A9A75C 802411CC AE430000 */ sw $v1, ($s2) -.L802411D0: -/* A9A760 802411D0 8E630070 */ lw $v1, 0x70($s3) -/* A9A764 802411D4 2C620064 */ sltiu $v0, $v1, 0x64 -/* A9A768 802411D8 10400060 */ beqz $v0, .L8024135C -/* A9A76C 802411DC 00031080 */ sll $v0, $v1, 2 -/* A9A770 802411E0 3C018024 */ lui $at, 0x8024 -/* A9A774 802411E4 00220821 */ addu $at, $at, $v0 -/* A9A778 802411E8 8C223268 */ lw $v0, 0x3268($at) -/* A9A77C 802411EC 00400008 */ jr $v0 -/* A9A780 802411F0 00000000 */ nop -/* A9A784 802411F4 0260202D */ daddu $a0, $s3, $zero -/* A9A788 802411F8 0200282D */ daddu $a1, $s0, $zero -/* A9A78C 802411FC 0C012568 */ jal func_800495A0 -/* A9A790 80241200 02A0302D */ daddu $a2, $s5, $zero -/* A9A794 80241204 0260202D */ daddu $a0, $s3, $zero -/* A9A798 80241208 0200282D */ daddu $a1, $s0, $zero -/* A9A79C 8024120C 0C0125AE */ jal func_800496B8 -/* A9A7A0 80241210 02A0302D */ daddu $a2, $s5, $zero -/* A9A7A4 80241214 080904D7 */ j .L8024135C -/* A9A7A8 80241218 00000000 */ nop -/* A9A7AC 8024121C 0260202D */ daddu $a0, $s3, $zero -/* A9A7B0 80241220 0200282D */ daddu $a1, $s0, $zero -/* A9A7B4 80241224 0C0126D1 */ jal func_80049B44 -/* A9A7B8 80241228 02A0302D */ daddu $a2, $s5, $zero -/* A9A7BC 8024122C 0260202D */ daddu $a0, $s3, $zero -/* A9A7C0 80241230 0200282D */ daddu $a1, $s0, $zero -/* A9A7C4 80241234 0C012701 */ jal func_80049C04 -/* A9A7C8 80241238 02A0302D */ daddu $a2, $s5, $zero -/* A9A7CC 8024123C 080904D7 */ j .L8024135C -/* A9A7D0 80241240 00000000 */ nop -/* A9A7D4 80241244 0260202D */ daddu $a0, $s3, $zero -/* A9A7D8 80241248 0200282D */ daddu $a1, $s0, $zero -/* A9A7DC 8024124C 0C01278F */ jal func_80049E3C -/* A9A7E0 80241250 02A0302D */ daddu $a2, $s5, $zero -/* A9A7E4 80241254 0260202D */ daddu $a0, $s3, $zero -/* A9A7E8 80241258 0200282D */ daddu $a1, $s0, $zero -/* A9A7EC 8024125C 0C0127B3 */ jal func_80049ECC -/* A9A7F0 80241260 02A0302D */ daddu $a2, $s5, $zero -/* A9A7F4 80241264 080904D7 */ j .L8024135C -/* A9A7F8 80241268 00000000 */ nop -/* A9A7FC 8024126C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A9A800 80241270 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A9A804 80241274 C68C0038 */ lwc1 $f12, 0x38($s4) -/* A9A808 80241278 C68E0040 */ lwc1 $f14, 0x40($s4) -/* A9A80C 8024127C 8C460028 */ lw $a2, 0x28($v0) -/* A9A810 80241280 0C00A7B5 */ jal dist2D -/* A9A814 80241284 8C470030 */ lw $a3, 0x30($v0) -/* A9A818 80241288 8E42006C */ lw $v0, 0x6c($s2) -/* A9A81C 8024128C 10400008 */ beqz $v0, .L802412B0 -/* A9A820 80241290 46000086 */ mov.s $f2, $f0 -/* A9A824 80241294 44820000 */ mtc1 $v0, $f0 -/* A9A828 80241298 00000000 */ nop -/* A9A82C 8024129C 46800020 */ cvt.s.w $f0, $f0 -/* A9A830 802412A0 4602003C */ c.lt.s $f0, $f2 -/* A9A834 802412A4 00000000 */ nop -/* A9A838 802412A8 4500000B */ bc1f .L802412D8 -/* A9A83C 802412AC 0260202D */ daddu $a0, $s3, $zero -.L802412B0: -/* A9A840 802412B0 0260202D */ daddu $a0, $s3, $zero -/* A9A844 802412B4 8E050024 */ lw $a1, 0x24($s0) -/* A9A848 802412B8 8E060028 */ lw $a2, 0x28($s0) -/* A9A84C 802412BC 0C0900D8 */ jal func_80240360 -/* A9A850 802412C0 02A0382D */ daddu $a3, $s5, $zero -/* A9A854 802412C4 8E630070 */ lw $v1, 0x70($s3) -/* A9A858 802412C8 2402000C */ addiu $v0, $zero, 0xc -/* A9A85C 802412CC 14620023 */ bne $v1, $v0, .L8024135C -/* A9A860 802412D0 00000000 */ nop -/* A9A864 802412D4 0260202D */ daddu $a0, $s3, $zero -.L802412D8: -/* A9A868 802412D8 0200282D */ daddu $a1, $s0, $zero -/* A9A86C 802412DC 0C0127DF */ jal func_80049F7C -/* A9A870 802412E0 02A0302D */ daddu $a2, $s5, $zero -/* A9A874 802412E4 0260202D */ daddu $a0, $s3, $zero -/* A9A878 802412E8 0200282D */ daddu $a1, $s0, $zero -/* A9A87C 802412EC 0C012849 */ jal func_8004A124 -/* A9A880 802412F0 02A0302D */ daddu $a2, $s5, $zero -/* A9A884 802412F4 080904D7 */ j .L8024135C -/* A9A888 802412F8 00000000 */ nop -/* A9A88C 802412FC 0260202D */ daddu $a0, $s3, $zero -/* A9A890 80241300 0200282D */ daddu $a1, $s0, $zero -/* A9A894 80241304 0C0128FA */ jal func_8004A3E8 -/* A9A898 80241308 02A0302D */ daddu $a2, $s5, $zero -/* A9A89C 8024130C 080904D7 */ j .L8024135C -/* A9A8A0 80241310 00000000 */ nop -/* A9A8A4 80241314 0C090129 */ jal func_802404A4 -/* A9A8A8 80241318 0260202D */ daddu $a0, $s3, $zero -/* A9A8AC 8024131C 080904D7 */ j .L8024135C -/* A9A8B0 80241320 00000000 */ nop -/* A9A8B4 80241324 0C090169 */ jal func_802405A4 -/* A9A8B8 80241328 0260202D */ daddu $a0, $s3, $zero -/* A9A8BC 8024132C 080904D7 */ j .L8024135C -/* A9A8C0 80241330 00000000 */ nop -/* A9A8C4 80241334 0C09017A */ jal func_802405E8 -/* A9A8C8 80241338 0260202D */ daddu $a0, $s3, $zero -/* A9A8CC 8024133C 080904D7 */ j .L8024135C -/* A9A8D0 80241340 00000000 */ nop -/* A9A8D4 80241344 0C0901A2 */ jal func_80240688 -/* A9A8D8 80241348 0260202D */ daddu $a0, $s3, $zero -/* A9A8DC 8024134C 080904D7 */ j .L8024135C -/* A9A8E0 80241350 00000000 */ nop -/* A9A8E4 80241354 0C0129CF */ jal func_8004A73C -/* A9A8E8 80241358 0260202D */ daddu $a0, $s3, $zero -.L8024135C: -/* A9A8EC 8024135C 8FBF0048 */ lw $ra, 0x48($sp) -/* A9A8F0 80241360 8FB50044 */ lw $s5, 0x44($sp) -/* A9A8F4 80241364 8FB40040 */ lw $s4, 0x40($sp) -/* A9A8F8 80241368 8FB3003C */ lw $s3, 0x3c($sp) -/* A9A8FC 8024136C 8FB20038 */ lw $s2, 0x38($sp) -/* A9A900 80241370 8FB10034 */ lw $s1, 0x34($sp) -/* A9A904 80241374 8FB00030 */ lw $s0, 0x30($sp) -/* A9A908 80241378 0000102D */ daddu $v0, $zero, $zero -/* A9A90C 8024137C 03E00008 */ jr $ra -/* A9A910 80241380 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/func_80240040_A9CC30.s b/asm/nonmatchings/world/area_kpa/kpa_113/func_80240040_A9CC30.s deleted file mode 100644 index da511dff13..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_113/func_80240040_A9CC30.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_A9CC70 -/* A9CC70 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A9CC74 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* A9CC78 80240048 0080802D */ daddu $s0, $a0, $zero -/* A9CC7C 8024004C AFBF0014 */ sw $ra, 0x14($sp) -/* A9CC80 80240050 8E02000C */ lw $v0, 0xc($s0) -/* A9CC84 80240054 0C0B1EAF */ jal get_variable -/* A9CC88 80240058 8C450000 */ lw $a1, ($v0) -/* A9CC8C 8024005C 0040302D */ daddu $a2, $v0, $zero -/* A9CC90 80240060 3C058016 */ lui $a1, 0x8016 -/* A9CC94 80240064 84A5A550 */ lh $a1, -0x5ab0($a1) -/* A9CC98 80240068 3C048011 */ lui $a0, %hi(gPlayerStatus) -/* A9CC9C 8024006C 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) -/* A9CCA0 80240070 10A60004 */ beq $a1, $a2, .L80240084 -/* A9CCA4 80240074 24020014 */ addiu $v0, $zero, 0x14 -/* A9CCA8 80240078 808300B4 */ lb $v1, 0xb4($a0) -/* A9CCAC 8024007C 10620006 */ beq $v1, $v0, .L80240098 -/* A9CCB0 80240080 00000000 */ nop -.L80240084: -/* A9CCB4 80240084 8C820014 */ lw $v0, 0x14($a0) -/* A9CCB8 80240088 3C03FFFF */ lui $v1, 0xffff -/* A9CCBC 8024008C 00431024 */ and $v0, $v0, $v1 -/* A9CCC0 80240090 10400005 */ beqz $v0, .L802400A8 -/* A9CCC4 80240094 00000000 */ nop -.L80240098: -/* A9CCC8 80240098 0C039769 */ jal set_action_state -/* A9CCCC 8024009C 0000202D */ daddu $a0, $zero, $zero -/* A9CCD0 802400A0 0809003A */ j .L802400E8 -/* A9CCD4 802400A4 AE000084 */ sw $zero, 0x84($s0) -.L802400A8: -/* A9CCD8 802400A8 54A6000F */ bnel $a1, $a2, .L802400E8 -/* A9CCDC 802400AC AE000084 */ sw $zero, 0x84($s0) -/* A9CCE0 802400B0 808300B4 */ lb $v1, 0xb4($a0) -/* A9CCE4 802400B4 24020014 */ addiu $v0, $zero, 0x14 -/* A9CCE8 802400B8 10620005 */ beq $v1, $v0, .L802400D0 -/* A9CCEC 802400BC 24020001 */ addiu $v0, $zero, 1 -/* A9CCF0 802400C0 10620003 */ beq $v1, $v0, .L802400D0 -/* A9CCF4 802400C4 24020002 */ addiu $v0, $zero, 2 -/* A9CCF8 802400C8 54620008 */ bnel $v1, $v0, .L802400EC -/* A9CCFC 802400CC AE000084 */ sw $zero, 0x84($s0) -.L802400D0: -/* A9CD00 802400D0 8C820004 */ lw $v0, 4($a0) -/* A9CD04 802400D4 30420001 */ andi $v0, $v0, 1 -/* A9CD08 802400D8 54400003 */ bnel $v0, $zero, .L802400E8 -/* A9CD0C 802400DC AE000084 */ sw $zero, 0x84($s0) -/* A9CD10 802400E0 24020001 */ addiu $v0, $zero, 1 -/* A9CD14 802400E4 AE020084 */ sw $v0, 0x84($s0) -.L802400E8: -/* A9CD18 802400E8 24020002 */ addiu $v0, $zero, 2 -.L802400EC: -/* A9CD1C 802400EC 8FBF0014 */ lw $ra, 0x14($sp) -/* A9CD20 802400F0 8FB00010 */ lw $s0, 0x10($sp) -/* A9CD24 802400F4 03E00008 */ jr $ra -/* A9CD28 802400F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/func_802401B0_A9CC30.s b/asm/nonmatchings/world/area_kpa/kpa_113/func_802401B0_A9CC30.s deleted file mode 100644 index 3c05bb704a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_113/func_802401B0_A9CC30.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_A9CDE0 -/* A9CDE0 802401B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A9CDE4 802401B4 AFB20018 */ sw $s2, 0x18($sp) -/* A9CDE8 802401B8 0080902D */ daddu $s2, $a0, $zero -/* A9CDEC 802401BC AFBF001C */ sw $ra, 0x1c($sp) -/* A9CDF0 802401C0 AFB10014 */ sw $s1, 0x14($sp) -/* A9CDF4 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* A9CDF8 802401C8 8E510148 */ lw $s1, 0x148($s2) -/* A9CDFC 802401CC 0C00EABB */ jal get_npc_unsafe -/* A9CE00 802401D0 86240008 */ lh $a0, 8($s1) -/* A9CE04 802401D4 0040802D */ daddu $s0, $v0, $zero -/* A9CE08 802401D8 8E2300CC */ lw $v1, 0xcc($s1) -/* A9CE0C 802401DC C60C0038 */ lwc1 $f12, 0x38($s0) -/* A9CE10 802401E0 8C630020 */ lw $v1, 0x20($v1) -/* A9CE14 802401E4 AE030028 */ sw $v1, 0x28($s0) -/* A9CE18 802401E8 96220076 */ lhu $v0, 0x76($s1) -/* A9CE1C 802401EC A602008E */ sh $v0, 0x8e($s0) -/* A9CE20 802401F0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A9CE24 802401F4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A9CE28 802401F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A9CE2C 802401FC 8C460028 */ lw $a2, 0x28($v0) -/* A9CE30 80240200 0C00A720 */ jal atan2 -/* A9CE34 80240204 8C470030 */ lw $a3, 0x30($v0) -/* A9CE38 80240208 2402000D */ addiu $v0, $zero, 0xd -/* A9CE3C 8024020C E600000C */ swc1 $f0, 0xc($s0) -/* A9CE40 80240210 AE420070 */ sw $v0, 0x70($s2) -/* A9CE44 80240214 8FBF001C */ lw $ra, 0x1c($sp) -/* A9CE48 80240218 8FB20018 */ lw $s2, 0x18($sp) -/* A9CE4C 8024021C 8FB10014 */ lw $s1, 0x14($sp) -/* A9CE50 80240220 8FB00010 */ lw $s0, 0x10($sp) -/* A9CE54 80240224 03E00008 */ jr $ra -/* A9CE58 80240228 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/func_80240360_A9CC30.s b/asm/nonmatchings/world/area_kpa/kpa_113/func_80240360_A9CC30.s deleted file mode 100644 index 3710cb8e90..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_113/func_80240360_A9CC30.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240360_A9CF90 -/* A9CF90 80240360 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A9CF94 80240364 AFB3003C */ sw $s3, 0x3c($sp) -/* A9CF98 80240368 0080982D */ daddu $s3, $a0, $zero -/* A9CF9C 8024036C AFBF0040 */ sw $ra, 0x40($sp) -/* A9CFA0 80240370 AFB20038 */ sw $s2, 0x38($sp) -/* A9CFA4 80240374 AFB10034 */ sw $s1, 0x34($sp) -/* A9CFA8 80240378 AFB00030 */ sw $s0, 0x30($sp) -/* A9CFAC 8024037C 8E710148 */ lw $s1, 0x148($s3) -/* A9CFB0 80240380 0C00EABB */ jal get_npc_unsafe -/* A9CFB4 80240384 86240008 */ lh $a0, 8($s1) -/* A9CFB8 80240388 0040802D */ daddu $s0, $v0, $zero -/* A9CFBC 8024038C 8E22007C */ lw $v0, 0x7c($s1) -/* A9CFC0 80240390 8603008E */ lh $v1, 0x8e($s0) -/* A9CFC4 80240394 2442FFFF */ addiu $v0, $v0, -1 -/* A9CFC8 80240398 14620012 */ bne $v1, $v0, .L802403E4 -/* A9CFCC 8024039C 00000000 */ nop -/* A9CFD0 802403A0 C6000038 */ lwc1 $f0, 0x38($s0) -/* A9CFD4 802403A4 4600020D */ trunc.w.s $f8, $f0 -/* A9CFD8 802403A8 44024000 */ mfc1 $v0, $f8 -/* A9CFDC 802403AC 00000000 */ nop -/* A9CFE0 802403B0 A6220010 */ sh $v0, 0x10($s1) -/* A9CFE4 802403B4 C600003C */ lwc1 $f0, 0x3c($s0) -/* A9CFE8 802403B8 4600020D */ trunc.w.s $f8, $f0 -/* A9CFEC 802403BC 44024000 */ mfc1 $v0, $f8 -/* A9CFF0 802403C0 00000000 */ nop -/* A9CFF4 802403C4 A6220012 */ sh $v0, 0x12($s1) -/* A9CFF8 802403C8 C6000040 */ lwc1 $f0, 0x40($s0) -/* A9CFFC 802403CC 24020001 */ addiu $v0, $zero, 1 -/* A9D000 802403D0 A2220007 */ sb $v0, 7($s1) -/* A9D004 802403D4 4600020D */ trunc.w.s $f8, $f0 -/* A9D008 802403D8 44024000 */ mfc1 $v0, $f8 -/* A9D00C 802403DC 00000000 */ nop -/* A9D010 802403E0 A6220014 */ sh $v0, 0x14($s1) -.L802403E4: -/* A9D014 802403E4 C6000038 */ lwc1 $f0, 0x38($s0) -/* A9D018 802403E8 C602003C */ lwc1 $f2, 0x3c($s0) -/* A9D01C 802403EC C6040040 */ lwc1 $f4, 0x40($s0) -/* A9D020 802403F0 C6060018 */ lwc1 $f6, 0x18($s0) -/* A9D024 802403F4 E7A00020 */ swc1 $f0, 0x20($sp) -/* A9D028 802403F8 E7A20024 */ swc1 $f2, 0x24($sp) -/* A9D02C 802403FC E7A40028 */ swc1 $f4, 0x28($sp) -/* A9D030 80240400 E7A60010 */ swc1 $f6, 0x10($sp) -/* A9D034 80240404 C600000C */ lwc1 $f0, 0xc($s0) -/* A9D038 80240408 E7A00014 */ swc1 $f0, 0x14($sp) -/* A9D03C 8024040C 860200A8 */ lh $v0, 0xa8($s0) -/* A9D040 80240410 27A50020 */ addiu $a1, $sp, 0x20 -/* A9D044 80240414 44820000 */ mtc1 $v0, $f0 -/* A9D048 80240418 00000000 */ nop -/* A9D04C 8024041C 46800020 */ cvt.s.w $f0, $f0 -/* A9D050 80240420 E7A00018 */ swc1 $f0, 0x18($sp) -/* A9D054 80240424 860200A6 */ lh $v0, 0xa6($s0) -/* A9D058 80240428 27A60024 */ addiu $a2, $sp, 0x24 -/* A9D05C 8024042C 44820000 */ mtc1 $v0, $f0 -/* A9D060 80240430 00000000 */ nop -/* A9D064 80240434 46800020 */ cvt.s.w $f0, $f0 -/* A9D068 80240438 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A9D06C 8024043C 8E040080 */ lw $a0, 0x80($s0) -/* A9D070 80240440 0C037711 */ jal func_800DDC44 -/* A9D074 80240444 27A70028 */ addiu $a3, $sp, 0x28 -/* A9D078 80240448 0040902D */ daddu $s2, $v0, $zero -/* A9D07C 8024044C 16400005 */ bnez $s2, .L80240464 -/* A9D080 80240450 00000000 */ nop -/* A9D084 80240454 8E050018 */ lw $a1, 0x18($s0) -/* A9D088 80240458 8E06000C */ lw $a2, 0xc($s0) -/* A9D08C 8024045C 0C00EA95 */ jal npc_move_heading -/* A9D090 80240460 0200202D */ daddu $a0, $s0, $zero -.L80240464: -/* A9D094 80240464 8602008E */ lh $v0, 0x8e($s0) -/* A9D098 80240468 9603008E */ lhu $v1, 0x8e($s0) -/* A9D09C 8024046C 18400007 */ blez $v0, .L8024048C -/* A9D0A0 80240470 2462FFFF */ addiu $v0, $v1, -1 -/* A9D0A4 80240474 A602008E */ sh $v0, 0x8e($s0) -/* A9D0A8 80240478 00021400 */ sll $v0, $v0, 0x10 -/* A9D0AC 8024047C 18400003 */ blez $v0, .L8024048C -/* A9D0B0 80240480 00000000 */ nop -/* A9D0B4 80240484 12400008 */ beqz $s2, .L802404A8 -/* A9D0B8 80240488 00000000 */ nop -.L8024048C: -/* A9D0BC 8024048C 8E2200CC */ lw $v0, 0xcc($s1) -/* A9D0C0 80240490 A2200007 */ sb $zero, 7($s1) -/* A9D0C4 80240494 8C420028 */ lw $v0, 0x28($v0) -/* A9D0C8 80240498 A600008E */ sh $zero, 0x8e($s0) -/* A9D0CC 8024049C AE020028 */ sw $v0, 0x28($s0) -/* A9D0D0 802404A0 2402000F */ addiu $v0, $zero, 0xf -/* A9D0D4 802404A4 AE620070 */ sw $v0, 0x70($s3) -.L802404A8: -/* A9D0D8 802404A8 8FBF0040 */ lw $ra, 0x40($sp) -/* A9D0DC 802404AC 8FB3003C */ lw $s3, 0x3c($sp) -/* A9D0E0 802404B0 8FB20038 */ lw $s2, 0x38($sp) -/* A9D0E4 802404B4 8FB10034 */ lw $s1, 0x34($sp) -/* A9D0E8 802404B8 8FB00030 */ lw $s0, 0x30($sp) -/* A9D0EC 802404BC 03E00008 */ jr $ra -/* A9D0F0 802404C0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/func_80240544_A9CC30.s b/asm/nonmatchings/world/area_kpa/kpa_113/func_80240544_A9CC30.s deleted file mode 100644 index d86405ac9c..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_113/func_80240544_A9CC30.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240544_A9D174 -/* A9D174 80240544 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A9D178 80240548 AFB3005C */ sw $s3, 0x5c($sp) -/* A9D17C 8024054C 0080982D */ daddu $s3, $a0, $zero -/* A9D180 80240550 AFBF0068 */ sw $ra, 0x68($sp) -/* A9D184 80240554 AFB50064 */ sw $s5, 0x64($sp) -/* A9D188 80240558 AFB40060 */ sw $s4, 0x60($sp) -/* A9D18C 8024055C AFB20058 */ sw $s2, 0x58($sp) -/* A9D190 80240560 AFB10054 */ sw $s1, 0x54($sp) -/* A9D194 80240564 AFB00050 */ sw $s0, 0x50($sp) -/* A9D198 80240568 8E710148 */ lw $s1, 0x148($s3) -/* A9D19C 8024056C 86240008 */ lh $a0, 8($s1) -/* A9D1A0 80240570 0C00EABB */ jal get_npc_unsafe -/* A9D1A4 80240574 00A0802D */ daddu $s0, $a1, $zero -/* A9D1A8 80240578 8E63000C */ lw $v1, 0xc($s3) -/* A9D1AC 8024057C 0260202D */ daddu $a0, $s3, $zero -/* A9D1B0 80240580 8C650000 */ lw $a1, ($v1) -/* A9D1B4 80240584 0C0B1EAF */ jal get_variable -/* A9D1B8 80240588 0040902D */ daddu $s2, $v0, $zero -/* A9D1BC 8024058C AFA00028 */ sw $zero, 0x28($sp) -/* A9D1C0 80240590 8E2300D0 */ lw $v1, 0xd0($s1) -/* A9D1C4 80240594 8C630030 */ lw $v1, 0x30($v1) -/* A9D1C8 80240598 AFA3002C */ sw $v1, 0x2c($sp) -/* A9D1CC 8024059C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A9D1D0 802405A0 8C63001C */ lw $v1, 0x1c($v1) -/* A9D1D4 802405A4 AFA30030 */ sw $v1, 0x30($sp) -/* A9D1D8 802405A8 8E2300D0 */ lw $v1, 0xd0($s1) -/* A9D1DC 802405AC 8C630024 */ lw $v1, 0x24($v1) -/* A9D1E0 802405B0 AFA30034 */ sw $v1, 0x34($sp) -/* A9D1E4 802405B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A9D1E8 802405B8 8C630028 */ lw $v1, 0x28($v1) -/* A9D1EC 802405BC 27B50028 */ addiu $s5, $sp, 0x28 -/* A9D1F0 802405C0 AFA30038 */ sw $v1, 0x38($sp) -/* A9D1F4 802405C4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A9D1F8 802405C8 3C0142C8 */ lui $at, 0x42c8 -/* A9D1FC 802405CC 44810000 */ mtc1 $at, $f0 -/* A9D200 802405D0 8C63002C */ lw $v1, 0x2c($v1) -/* A9D204 802405D4 0040A02D */ daddu $s4, $v0, $zero -/* A9D208 802405D8 E7A00040 */ swc1 $f0, 0x40($sp) -/* A9D20C 802405DC A7A00044 */ sh $zero, 0x44($sp) -/* A9D210 802405E0 12000009 */ beqz $s0, .L80240608 -/* A9D214 802405E4 AFA3003C */ sw $v1, 0x3c($sp) -/* A9D218 802405E8 864300A8 */ lh $v1, 0xa8($s2) -/* A9D21C 802405EC 8E2200B0 */ lw $v0, 0xb0($s1) -/* A9D220 802405F0 AE20008C */ sw $zero, 0x8c($s1) -/* A9D224 802405F4 A22000B5 */ sb $zero, 0xb5($s1) -/* A9D228 802405F8 34420008 */ ori $v0, $v0, 8 -/* A9D22C 802405FC AE230084 */ sw $v1, 0x84($s1) -/* A9D230 80240600 08090186 */ j .L80240618 -/* A9D234 80240604 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240608: -/* A9D238 80240608 8E2200B0 */ lw $v0, 0xb0($s1) -/* A9D23C 8024060C 30420004 */ andi $v0, $v0, 4 -/* A9D240 80240610 10400047 */ beqz $v0, .L80240730 -/* A9D244 80240614 00000000 */ nop -.L80240618: -/* A9D248 80240618 AE600070 */ sw $zero, 0x70($s3) -/* A9D24C 8024061C A640008E */ sh $zero, 0x8e($s2) -/* A9D250 80240620 8E2300CC */ lw $v1, 0xcc($s1) -/* A9D254 80240624 2404F7FF */ addiu $a0, $zero, -0x801 -/* A9D258 80240628 A2200007 */ sb $zero, 7($s1) -/* A9D25C 8024062C 8E420000 */ lw $v0, ($s2) -/* A9D260 80240630 8C630000 */ lw $v1, ($v1) -/* A9D264 80240634 00441024 */ and $v0, $v0, $a0 -/* A9D268 80240638 AE420000 */ sw $v0, ($s2) -/* A9D26C 8024063C AE430028 */ sw $v1, 0x28($s2) -/* A9D270 80240640 96220086 */ lhu $v0, 0x86($s1) -/* A9D274 80240644 A64200A8 */ sh $v0, 0xa8($s2) -/* A9D278 80240648 8E2200D0 */ lw $v0, 0xd0($s1) -/* A9D27C 8024064C AE200090 */ sw $zero, 0x90($s1) -/* A9D280 80240650 8C420034 */ lw $v0, 0x34($v0) -/* A9D284 80240654 14400006 */ bnez $v0, .L80240670 -/* A9D288 80240658 2403FDFF */ addiu $v1, $zero, -0x201 -/* A9D28C 8024065C 8E420000 */ lw $v0, ($s2) -/* A9D290 80240660 2403FFF7 */ addiu $v1, $zero, -9 -/* A9D294 80240664 34420200 */ ori $v0, $v0, 0x200 -/* A9D298 80240668 0809019F */ j .L8024067C -/* A9D29C 8024066C 00431024 */ and $v0, $v0, $v1 -.L80240670: -/* A9D2A0 80240670 8E420000 */ lw $v0, ($s2) -/* A9D2A4 80240674 00431024 */ and $v0, $v0, $v1 -/* A9D2A8 80240678 34420008 */ ori $v0, $v0, 8 -.L8024067C: -/* A9D2AC 8024067C AE420000 */ sw $v0, ($s2) -/* A9D2B0 80240680 8E2200B0 */ lw $v0, 0xb0($s1) -/* A9D2B4 80240684 30420004 */ andi $v0, $v0, 4 -/* A9D2B8 80240688 1040001E */ beqz $v0, .L80240704 -/* A9D2BC 8024068C 24040002 */ addiu $a0, $zero, 2 -/* A9D2C0 80240690 0240282D */ daddu $a1, $s2, $zero -/* A9D2C4 80240694 0000302D */ daddu $a2, $zero, $zero -/* A9D2C8 80240698 24020063 */ addiu $v0, $zero, 0x63 -/* A9D2CC 8024069C AE620070 */ sw $v0, 0x70($s3) -/* A9D2D0 802406A0 AE600074 */ sw $zero, 0x74($s3) -/* A9D2D4 802406A4 864300A8 */ lh $v1, 0xa8($s2) -/* A9D2D8 802406A8 3C013F80 */ lui $at, 0x3f80 -/* A9D2DC 802406AC 44810000 */ mtc1 $at, $f0 -/* A9D2E0 802406B0 3C014000 */ lui $at, 0x4000 -/* A9D2E4 802406B4 44811000 */ mtc1 $at, $f2 -/* A9D2E8 802406B8 3C01C1A0 */ lui $at, 0xc1a0 -/* A9D2EC 802406BC 44812000 */ mtc1 $at, $f4 -/* A9D2F0 802406C0 24020028 */ addiu $v0, $zero, 0x28 -/* A9D2F4 802406C4 AFA2001C */ sw $v0, 0x1c($sp) -/* A9D2F8 802406C8 44833000 */ mtc1 $v1, $f6 -/* A9D2FC 802406CC 00000000 */ nop -/* A9D300 802406D0 468031A0 */ cvt.s.w $f6, $f6 -/* A9D304 802406D4 44073000 */ mfc1 $a3, $f6 -/* A9D308 802406D8 27A20048 */ addiu $v0, $sp, 0x48 -/* A9D30C 802406DC AFA20020 */ sw $v0, 0x20($sp) -/* A9D310 802406E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* A9D314 802406E4 E7A20014 */ swc1 $f2, 0x14($sp) -/* A9D318 802406E8 0C01BFA4 */ jal fx_emote -/* A9D31C 802406EC E7A40018 */ swc1 $f4, 0x18($sp) -/* A9D320 802406F0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A9D324 802406F4 2403FFFB */ addiu $v1, $zero, -5 -/* A9D328 802406F8 00431024 */ and $v0, $v0, $v1 -/* A9D32C 802406FC 080901CC */ j .L80240730 -/* A9D330 80240700 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240704: -/* A9D334 80240704 8E220000 */ lw $v0, ($s1) -/* A9D338 80240708 3C034000 */ lui $v1, 0x4000 -/* A9D33C 8024070C 00431024 */ and $v0, $v0, $v1 -/* A9D340 80240710 10400007 */ beqz $v0, .L80240730 -/* A9D344 80240714 3C03BFFF */ lui $v1, 0xbfff -/* A9D348 80240718 2402000C */ addiu $v0, $zero, 0xc -/* A9D34C 8024071C AE620070 */ sw $v0, 0x70($s3) -/* A9D350 80240720 8E220000 */ lw $v0, ($s1) -/* A9D354 80240724 3463FFFF */ ori $v1, $v1, 0xffff -/* A9D358 80240728 00431024 */ and $v0, $v0, $v1 -/* A9D35C 8024072C AE220000 */ sw $v0, ($s1) -.L80240730: -/* A9D360 80240730 8E220090 */ lw $v0, 0x90($s1) -/* A9D364 80240734 1840000C */ blez $v0, .L80240768 -/* A9D368 80240738 2442FFFF */ addiu $v0, $v0, -1 -/* A9D36C 8024073C 14400087 */ bnez $v0, .L8024095C -/* A9D370 80240740 AE220090 */ sw $v0, 0x90($s1) -/* A9D374 80240744 3C03FFAA */ lui $v1, 0xffaa -/* A9D378 80240748 8E420028 */ lw $v0, 0x28($s2) -/* A9D37C 8024074C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A9D380 80240750 00431021 */ addu $v0, $v0, $v1 -/* A9D384 80240754 2C420002 */ sltiu $v0, $v0, 2 -/* A9D388 80240758 10400003 */ beqz $v0, .L80240768 -/* A9D38C 8024075C 3C020055 */ lui $v0, 0x55 -/* A9D390 80240760 3442000C */ ori $v0, $v0, 0xc -/* A9D394 80240764 AE420028 */ sw $v0, 0x28($s2) -.L80240768: -/* A9D398 80240768 8E630070 */ lw $v1, 0x70($s3) -/* A9D39C 8024076C 2402000C */ addiu $v0, $zero, 0xc -/* A9D3A0 80240770 10620048 */ beq $v1, $v0, .L80240894 -/* A9D3A4 80240774 2862000D */ slti $v0, $v1, 0xd -/* A9D3A8 80240778 1040000F */ beqz $v0, .L802407B8 -/* A9D3AC 8024077C 24100001 */ addiu $s0, $zero, 1 -/* A9D3B0 80240780 1070001E */ beq $v1, $s0, .L802407FC -/* A9D3B4 80240784 28620002 */ slti $v0, $v1, 2 -/* A9D3B8 80240788 10400005 */ beqz $v0, .L802407A0 -/* A9D3BC 8024078C 24020002 */ addiu $v0, $zero, 2 -/* A9D3C0 80240790 10600015 */ beqz $v1, .L802407E8 -/* A9D3C4 80240794 0260202D */ daddu $a0, $s3, $zero -/* A9D3C8 80240798 0809023C */ j .L802408F0 -/* A9D3CC 8024079C 00000000 */ nop -.L802407A0: -/* A9D3D0 802407A0 1062001C */ beq $v1, $v0, .L80240814 -/* A9D3D4 802407A4 24020003 */ addiu $v0, $zero, 3 -/* A9D3D8 802407A8 10620035 */ beq $v1, $v0, .L80240880 -/* A9D3DC 802407AC 0260202D */ daddu $a0, $s3, $zero -/* A9D3E0 802407B0 0809023C */ j .L802408F0 -/* A9D3E4 802407B4 00000000 */ nop -.L802407B8: -/* A9D3E8 802407B8 2402000E */ addiu $v0, $zero, 0xe -/* A9D3EC 802407BC 1062003F */ beq $v1, $v0, .L802408BC -/* A9D3F0 802407C0 0062102A */ slt $v0, $v1, $v0 -/* A9D3F4 802407C4 14400038 */ bnez $v0, .L802408A8 -/* A9D3F8 802407C8 0260202D */ daddu $a0, $s3, $zero -/* A9D3FC 802407CC 2402000F */ addiu $v0, $zero, 0xf -/* A9D400 802407D0 10620040 */ beq $v1, $v0, .L802408D4 -/* A9D404 802407D4 24020063 */ addiu $v0, $zero, 0x63 -/* A9D408 802407D8 10620043 */ beq $v1, $v0, .L802408E8 -/* A9D40C 802407DC 00000000 */ nop -/* A9D410 802407E0 0809023C */ j .L802408F0 -/* A9D414 802407E4 00000000 */ nop -.L802407E8: -/* A9D418 802407E8 0280282D */ daddu $a1, $s4, $zero -/* A9D41C 802407EC 0C012568 */ jal func_800495A0 -/* A9D420 802407F0 02A0302D */ daddu $a2, $s5, $zero -/* A9D424 802407F4 96220086 */ lhu $v0, 0x86($s1) -/* A9D428 802407F8 A64200A8 */ sh $v0, 0xa8($s2) -.L802407FC: -/* A9D42C 802407FC 0260202D */ daddu $a0, $s3, $zero -/* A9D430 80240800 0280282D */ daddu $a1, $s4, $zero -/* A9D434 80240804 0C0125AE */ jal func_800496B8 -/* A9D438 80240808 02A0302D */ daddu $a2, $s5, $zero -/* A9D43C 8024080C 0809023C */ j .L802408F0 -/* A9D440 80240810 00000000 */ nop -.L80240814: -/* A9D444 80240814 0260202D */ daddu $a0, $s3, $zero -/* A9D448 80240818 0280282D */ daddu $a1, $s4, $zero -/* A9D44C 8024081C 0C0126D1 */ jal func_80049B44 -/* A9D450 80240820 02A0302D */ daddu $a2, $s5, $zero -/* A9D454 80240824 8E230088 */ lw $v1, 0x88($s1) -/* A9D458 80240828 24020006 */ addiu $v0, $zero, 6 -/* A9D45C 8024082C 14620014 */ bne $v1, $v0, .L80240880 -/* A9D460 80240830 0260202D */ daddu $a0, $s3, $zero -/* A9D464 80240834 0C00A67F */ jal rand_int -/* A9D468 80240838 24040064 */ addiu $a0, $zero, 0x64 -/* A9D46C 8024083C 28420021 */ slti $v0, $v0, 0x21 -/* A9D470 80240840 5040000F */ beql $v0, $zero, .L80240880 -/* A9D474 80240844 0260202D */ daddu $a0, $s3, $zero -/* A9D478 80240848 8E22008C */ lw $v0, 0x8c($s1) -/* A9D47C 8024084C 10400005 */ beqz $v0, .L80240864 -/* A9D480 80240850 3C020055 */ lui $v0, 0x55 -/* A9D484 80240854 3442002F */ ori $v0, $v0, 0x2f -/* A9D488 80240858 AE20008C */ sw $zero, 0x8c($s1) -/* A9D48C 8024085C 0809021C */ j .L80240870 -/* A9D490 80240860 A22000B5 */ sb $zero, 0xb5($s1) -.L80240864: -/* A9D494 80240864 3442002E */ ori $v0, $v0, 0x2e -/* A9D498 80240868 AE30008C */ sw $s0, 0x8c($s1) -/* A9D49C 8024086C A23000B5 */ sb $s0, 0xb5($s1) -.L80240870: -/* A9D4A0 80240870 AE420028 */ sw $v0, 0x28($s2) -/* A9D4A4 80240874 24020007 */ addiu $v0, $zero, 7 -/* A9D4A8 80240878 08090257 */ j .L8024095C -/* A9D4AC 8024087C AE220090 */ sw $v0, 0x90($s1) -.L80240880: -/* A9D4B0 80240880 0280282D */ daddu $a1, $s4, $zero -/* A9D4B4 80240884 0C012701 */ jal func_80049C04 -/* A9D4B8 80240888 02A0302D */ daddu $a2, $s5, $zero -/* A9D4BC 8024088C 0809023C */ j .L802408F0 -/* A9D4C0 80240890 00000000 */ nop -.L80240894: -/* A9D4C4 80240894 0260202D */ daddu $a0, $s3, $zero -/* A9D4C8 80240898 0280282D */ daddu $a1, $s4, $zero -/* A9D4CC 8024089C 0C09006C */ jal func_802401B0 -/* A9D4D0 802408A0 02A0302D */ daddu $a2, $s5, $zero -/* A9D4D4 802408A4 0260202D */ daddu $a0, $s3, $zero -.L802408A8: -/* A9D4D8 802408A8 0280282D */ daddu $a1, $s4, $zero -/* A9D4DC 802408AC 0C09008B */ jal func_8024022C -/* A9D4E0 802408B0 02A0302D */ daddu $a2, $s5, $zero -/* A9D4E4 802408B4 0809023C */ j .L802408F0 -/* A9D4E8 802408B8 00000000 */ nop -.L802408BC: -/* A9D4EC 802408BC 0260202D */ daddu $a0, $s3, $zero -/* A9D4F0 802408C0 0280282D */ daddu $a1, $s4, $zero -/* A9D4F4 802408C4 0C0900D8 */ jal func_80240360 -/* A9D4F8 802408C8 02A0302D */ daddu $a2, $s5, $zero -/* A9D4FC 802408CC 0809023C */ j .L802408F0 -/* A9D500 802408D0 00000000 */ nop -.L802408D4: -/* A9D504 802408D4 0280282D */ daddu $a1, $s4, $zero -/* A9D508 802408D8 0C090131 */ jal func_802404C4 -/* A9D50C 802408DC 02A0302D */ daddu $a2, $s5, $zero -/* A9D510 802408E0 0809023C */ j .L802408F0 -/* A9D514 802408E4 00000000 */ nop -.L802408E8: -/* A9D518 802408E8 0C0129CF */ jal func_8004A73C -/* A9D51C 802408EC 0260202D */ daddu $a0, $s3, $zero -.L802408F0: -/* A9D520 802408F0 8E230088 */ lw $v1, 0x88($s1) -/* A9D524 802408F4 24020006 */ addiu $v0, $zero, 6 -/* A9D528 802408F8 14620019 */ bne $v1, $v0, .L80240960 -/* A9D52C 802408FC 0000102D */ daddu $v0, $zero, $zero -/* A9D530 80240900 8E22008C */ lw $v0, 0x8c($s1) -/* A9D534 80240904 10400003 */ beqz $v0, .L80240914 -/* A9D538 80240908 24020001 */ addiu $v0, $zero, 1 -/* A9D53C 8024090C 08090246 */ j .L80240918 -/* A9D540 80240910 A22200B5 */ sb $v0, 0xb5($s1) -.L80240914: -/* A9D544 80240914 A22000B5 */ sb $zero, 0xb5($s1) -.L80240918: -/* A9D548 80240918 8E22008C */ lw $v0, 0x8c($s1) -/* A9D54C 8024091C 1040000F */ beqz $v0, .L8024095C -/* A9D550 80240920 3C03FFAA */ lui $v1, 0xffaa -/* A9D554 80240924 8E420028 */ lw $v0, 0x28($s2) -/* A9D558 80240928 3463FFFC */ ori $v1, $v1, 0xfffc -/* A9D55C 8024092C 00431821 */ addu $v1, $v0, $v1 -/* A9D560 80240930 2C620015 */ sltiu $v0, $v1, 0x15 -/* A9D564 80240934 10400009 */ beqz $v0, .L8024095C -/* A9D568 80240938 00031080 */ sll $v0, $v1, 2 -/* A9D56C 8024093C 3C018024 */ lui $at, 0x8024 -/* A9D570 80240940 00220821 */ addu $at, $at, $v0 -/* A9D574 80240944 8C221CF8 */ lw $v0, 0x1cf8($at) -/* A9D578 80240948 00400008 */ jr $v0 -/* A9D57C 8024094C 00000000 */ nop -/* A9D580 80240950 8E420028 */ lw $v0, 0x28($s2) -/* A9D584 80240954 24420001 */ addiu $v0, $v0, 1 -/* A9D588 80240958 AE420028 */ sw $v0, 0x28($s2) -.L8024095C: -/* A9D58C 8024095C 0000102D */ daddu $v0, $zero, $zero -.L80240960: -/* A9D590 80240960 8FBF0068 */ lw $ra, 0x68($sp) -/* A9D594 80240964 8FB50064 */ lw $s5, 0x64($sp) -/* A9D598 80240968 8FB40060 */ lw $s4, 0x60($sp) -/* A9D59C 8024096C 8FB3005C */ lw $s3, 0x5c($sp) -/* A9D5A0 80240970 8FB20058 */ lw $s2, 0x58($sp) -/* A9D5A4 80240974 8FB10054 */ lw $s1, 0x54($sp) -/* A9D5A8 80240978 8FB00050 */ lw $s0, 0x50($sp) -/* A9D5AC 8024097C 03E00008 */ jr $ra -/* A9D5B0 80240980 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/func_80240984_A9CC30.s b/asm/nonmatchings/world/area_kpa/kpa_113/func_80240984_A9CC30.s deleted file mode 100644 index a34ab8813b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_113/func_80240984_A9CC30.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240984_A9D5B4 -/* A9D5B4 80240984 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A9D5B8 80240988 AFBF0010 */ sw $ra, 0x10($sp) -/* A9D5BC 8024098C 0C00EAD2 */ jal get_npc_safe -/* A9D5C0 80240990 8C84014C */ lw $a0, 0x14c($a0) -/* A9D5C4 80240994 0040182D */ daddu $v1, $v0, $zero -/* A9D5C8 80240998 846200A8 */ lh $v0, 0xa8($v1) -/* A9D5CC 8024099C C462003C */ lwc1 $f2, 0x3c($v1) -/* A9D5D0 802409A0 906400A9 */ lbu $a0, 0xa9($v1) -/* A9D5D4 802409A4 44820000 */ mtc1 $v0, $f0 -/* A9D5D8 802409A8 00000000 */ nop -/* A9D5DC 802409AC 46800020 */ cvt.s.w $f0, $f0 -/* A9D5E0 802409B0 46001081 */ sub.s $f2, $f2, $f0 -/* A9D5E4 802409B4 A06400AB */ sb $a0, 0xab($v1) -/* A9D5E8 802409B8 E462003C */ swc1 $f2, 0x3c($v1) -/* A9D5EC 802409BC 8FBF0010 */ lw $ra, 0x10($sp) -/* A9D5F0 802409C0 24020002 */ addiu $v0, $zero, 2 -/* A9D5F4 802409C4 03E00008 */ jr $ra -/* A9D5F8 802409C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/func_80240A24_A9CC30.s b/asm/nonmatchings/world/area_kpa/kpa_113/func_80240A24_A9CC30.s deleted file mode 100644 index 64045de3e7..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_113/func_80240A24_A9CC30.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A24_A9D654 -/* A9D654 80240A24 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A9D658 80240A28 0080102D */ daddu $v0, $a0, $zero -/* A9D65C 80240A2C AFB00010 */ sw $s0, 0x10($sp) -/* A9D660 80240A30 AFBF0018 */ sw $ra, 0x18($sp) -/* A9D664 80240A34 AFB10014 */ sw $s1, 0x14($sp) -/* A9D668 80240A38 8C44014C */ lw $a0, 0x14c($v0) -/* A9D66C 80240A3C 8C510148 */ lw $s1, 0x148($v0) -/* A9D670 80240A40 0C00EAD2 */ jal get_npc_safe -/* A9D674 80240A44 00A0802D */ daddu $s0, $a1, $zero -/* A9D678 80240A48 56000001 */ bnel $s0, $zero, .L80240A50 -/* A9D67C 80240A4C A04000AB */ sb $zero, 0xab($v0) -.L80240A50: -/* A9D680 80240A50 8C420000 */ lw $v0, ($v0) -/* A9D684 80240A54 30421000 */ andi $v0, $v0, 0x1000 -/* A9D688 80240A58 1040000A */ beqz $v0, .L80240A84 -/* A9D68C 80240A5C 0000102D */ daddu $v0, $zero, $zero -/* A9D690 80240A60 82220004 */ lb $v0, 4($s1) -/* A9D694 80240A64 3C03800B */ lui $v1, %hi(gCurrentEncounter) -/* A9D698 80240A68 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) -/* A9D69C 80240A6C 00021080 */ sll $v0, $v0, 2 -/* A9D6A0 80240A70 00431021 */ addu $v0, $v0, $v1 -/* A9D6A4 80240A74 8C440028 */ lw $a0, 0x28($v0) -/* A9D6A8 80240A78 9623006E */ lhu $v1, 0x6e($s1) -/* A9D6AC 80240A7C 24020002 */ addiu $v0, $zero, 2 -/* A9D6B0 80240A80 A4830044 */ sh $v1, 0x44($a0) -.L80240A84: -/* A9D6B4 80240A84 8FBF0018 */ lw $ra, 0x18($sp) -/* A9D6B8 80240A88 8FB10014 */ lw $s1, 0x14($sp) -/* A9D6BC 80240A8C 8FB00010 */ lw $s0, 0x10($sp) -/* A9D6C0 80240A90 03E00008 */ jr $ra -/* A9D6C4 80240A94 27BD0020 */ addiu $sp, $sp, 0x20 -/* A9D6C8 80240A98 00000000 */ nop -/* A9D6CC 80240A9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/func_802400BC_A9ED40.s b/asm/nonmatchings/world/area_kpa/kpa_115/func_802400BC_A9ED40.s deleted file mode 100644 index a984b207f9..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/func_802400BC_A9ED40.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400BC_A9EDFC -/* A9EDFC 802400BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A9EE00 802400C0 AFBF002C */ sw $ra, 0x2c($sp) -/* A9EE04 802400C4 AFB00028 */ sw $s0, 0x28($sp) -/* A9EE08 802400C8 8C820098 */ lw $v0, 0x98($a0) -/* A9EE0C 802400CC 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A9EE10 802400D0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A9EE14 802400D4 14400005 */ bnez $v0, .L802400EC -/* A9EE18 802400D8 00000000 */ nop -/* A9EE1C 802400DC C4800084 */ lwc1 $f0, 0x84($a0) -/* A9EE20 802400E0 46800020 */ cvt.s.w $f0, $f0 -/* A9EE24 802400E4 0809003E */ j .L802400F8 -/* A9EE28 802400E8 E6000028 */ swc1 $f0, 0x28($s0) -.L802400EC: -/* A9EE2C 802400EC C4800084 */ lwc1 $f0, 0x84($a0) -/* A9EE30 802400F0 46800020 */ cvt.s.w $f0, $f0 -/* A9EE34 802400F4 E6000030 */ swc1 $f0, 0x30($s0) -.L802400F8: -/* A9EE38 802400F8 27A20024 */ addiu $v0, $sp, 0x24 -/* A9EE3C 802400FC 0000202D */ daddu $a0, $zero, $zero -/* A9EE40 80240100 27A50018 */ addiu $a1, $sp, 0x18 -/* A9EE44 80240104 27A6001C */ addiu $a2, $sp, 0x1c -/* A9EE48 80240108 C6000028 */ lwc1 $f0, 0x28($s0) -/* A9EE4C 8024010C 3C014120 */ lui $at, 0x4120 -/* A9EE50 80240110 44811000 */ mtc1 $at, $f2 -/* A9EE54 80240114 3C014220 */ lui $at, 0x4220 -/* A9EE58 80240118 44813000 */ mtc1 $at, $f6 -/* A9EE5C 8024011C 27A70020 */ addiu $a3, $sp, 0x20 -/* A9EE60 80240120 E7A00018 */ swc1 $f0, 0x18($sp) -/* A9EE64 80240124 C600002C */ lwc1 $f0, 0x2c($s0) -/* A9EE68 80240128 C6040030 */ lwc1 $f4, 0x30($s0) -/* A9EE6C 8024012C 46020000 */ add.s $f0, $f0, $f2 -/* A9EE70 80240130 E7A60024 */ swc1 $f6, 0x24($sp) -/* A9EE74 80240134 E7A40020 */ swc1 $f4, 0x20($sp) -/* A9EE78 80240138 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A9EE7C 8024013C 0C0372DF */ jal func_800DCB7C -/* A9EE80 80240140 AFA20010 */ sw $v0, 0x10($sp) -/* A9EE84 80240144 C7A00018 */ lwc1 $f0, 0x18($sp) -/* A9EE88 80240148 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* A9EE8C 8024014C C7A40020 */ lwc1 $f4, 0x20($sp) -/* A9EE90 80240150 E6000028 */ swc1 $f0, 0x28($s0) -/* A9EE94 80240154 E602002C */ swc1 $f2, 0x2c($s0) -/* A9EE98 80240158 E6040030 */ swc1 $f4, 0x30($s0) -/* A9EE9C 8024015C 8FBF002C */ lw $ra, 0x2c($sp) -/* A9EEA0 80240160 8FB00028 */ lw $s0, 0x28($sp) -/* A9EEA4 80240164 24020002 */ addiu $v0, $zero, 2 -/* A9EEA8 80240168 03E00008 */ jr $ra -/* A9EEAC 8024016C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/func_80240170_A9ED40.s b/asm/nonmatchings/world/area_kpa/kpa_115/func_80240170_A9ED40.s deleted file mode 100644 index 1565a907e6..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/func_80240170_A9ED40.s +++ /dev/null @@ -1,134 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240170_A9EEB0 -/* A9EEB0 80240170 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A9EEB4 80240174 AFB10014 */ sw $s1, 0x14($sp) -/* A9EEB8 80240178 0080882D */ daddu $s1, $a0, $zero -/* A9EEBC 8024017C 3C05800B */ lui $a1, %hi(gCameras) -/* A9EEC0 80240180 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A9EEC4 80240184 AFBF0020 */ sw $ra, 0x20($sp) -/* A9EEC8 80240188 AFB3001C */ sw $s3, 0x1c($sp) -/* A9EECC 8024018C AFB20018 */ sw $s2, 0x18($sp) -/* A9EED0 80240190 AFB00010 */ sw $s0, 0x10($sp) -/* A9EED4 80240194 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A9EED8 80240198 8E330148 */ lw $s3, 0x148($s1) -/* A9EEDC 8024019C 3C03800A */ lui $v1, 0x800a -/* A9EEE0 802401A0 8463A634 */ lh $v1, -0x59cc($v1) -/* A9EEE4 802401A4 8E30000C */ lw $s0, 0xc($s1) -/* A9EEE8 802401A8 00031080 */ sll $v0, $v1, 2 -/* A9EEEC 802401AC 00431021 */ addu $v0, $v0, $v1 -/* A9EEF0 802401B0 00021080 */ sll $v0, $v0, 2 -/* A9EEF4 802401B4 00431023 */ subu $v0, $v0, $v1 -/* A9EEF8 802401B8 000218C0 */ sll $v1, $v0, 3 -/* A9EEFC 802401BC 00431021 */ addu $v0, $v0, $v1 -/* A9EF00 802401C0 000210C0 */ sll $v0, $v0, 3 -/* A9EF04 802401C4 86640008 */ lh $a0, 8($s3) -/* A9EF08 802401C8 0C00EABB */ jal get_npc_unsafe -/* A9EF0C 802401CC 00459021 */ addu $s2, $v0, $a1 -/* A9EF10 802401D0 0220202D */ daddu $a0, $s1, $zero -/* A9EF14 802401D4 8E050000 */ lw $a1, ($s0) -/* A9EF18 802401D8 0C0B1EAF */ jal get_variable -/* A9EF1C 802401DC 0040802D */ daddu $s0, $v0, $zero -/* A9EF20 802401E0 0260202D */ daddu $a0, $s3, $zero -/* A9EF24 802401E4 8C460024 */ lw $a2, 0x24($v0) -/* A9EF28 802401E8 8C470028 */ lw $a3, 0x28($v0) -/* A9EF2C 802401EC 0C0124FB */ jal func_800493EC -/* A9EF30 802401F0 0000282D */ daddu $a1, $zero, $zero -/* A9EF34 802401F4 10400052 */ beqz $v0, .L80240340 -/* A9EF38 802401F8 2402FFFF */ addiu $v0, $zero, -1 -/* A9EF3C 802401FC C64C006C */ lwc1 $f12, 0x6c($s2) -/* A9EF40 80240200 C60E000C */ lwc1 $f14, 0xc($s0) -/* A9EF44 80240204 3C014387 */ lui $at, 0x4387 -/* A9EF48 80240208 4481A000 */ mtc1 $at, $f20 -/* A9EF4C 8024020C 0C00A70A */ jal get_clamped_angle_diff -/* A9EF50 80240210 00000000 */ nop -/* A9EF54 80240214 0C00A6C9 */ jal clamp_angle -/* A9EF58 80240218 46000306 */ mov.s $f12, $f0 -/* A9EF5C 8024021C 3C018024 */ lui $at, 0x8024 -/* A9EF60 80240220 D4222FE0 */ ldc1 $f2, 0x2fe0($at) -/* A9EF64 80240224 46000021 */ cvt.d.s $f0, $f0 -/* A9EF68 80240228 4622003C */ c.lt.d $f0, $f2 -/* A9EF6C 8024022C 00000000 */ nop -/* A9EF70 80240230 45000003 */ bc1f .L80240240 -/* A9EF74 80240234 00000000 */ nop -/* A9EF78 80240238 3C0142B4 */ lui $at, 0x42b4 -/* A9EF7C 8024023C 4481A000 */ mtc1 $at, $f20 -.L80240240: -/* A9EF80 80240240 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* A9EF84 80240244 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* A9EF88 80240248 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A9EF8C 8024024C 8E220000 */ lw $v0, ($s1) -/* A9EF90 80240250 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A9EF94 80240254 8C460028 */ lw $a2, 0x28($v0) -/* A9EF98 80240258 0C00A720 */ jal atan2 -/* A9EF9C 8024025C 8C470030 */ lw $a3, 0x30($v0) -/* A9EFA0 80240260 4600A306 */ mov.s $f12, $f20 -/* A9EFA4 80240264 0C00A70A */ jal get_clamped_angle_diff -/* A9EFA8 80240268 46000386 */ mov.s $f14, $f0 -/* A9EFAC 8024026C 46000005 */ abs.s $f0, $f0 -/* A9EFB0 80240270 3C018024 */ lui $at, 0x8024 -/* A9EFB4 80240274 D4222FE8 */ ldc1 $f2, 0x2fe8($at) -/* A9EFB8 80240278 46000021 */ cvt.d.s $f0, $f0 -/* A9EFBC 8024027C 4620103C */ c.lt.d $f2, $f0 -/* A9EFC0 80240280 00000000 */ nop -/* A9EFC4 80240284 4501002E */ bc1t .L80240340 -/* A9EFC8 80240288 2402FFFF */ addiu $v0, $zero, -1 -/* A9EFCC 8024028C 8E220000 */ lw $v0, ($s1) -/* A9EFD0 80240290 C600003C */ lwc1 $f0, 0x3c($s0) -/* A9EFD4 80240294 C442002C */ lwc1 $f2, 0x2c($v0) -/* A9EFD8 80240298 860200A8 */ lh $v0, 0xa8($s0) -/* A9EFDC 8024029C 46020001 */ sub.s $f0, $f0, $f2 -/* A9EFE0 802402A0 44821000 */ mtc1 $v0, $f2 -/* A9EFE4 802402A4 00000000 */ nop -/* A9EFE8 802402A8 468010A1 */ cvt.d.w $f2, $f2 -/* A9EFEC 802402AC 46221080 */ add.d $f2, $f2, $f2 -/* A9EFF0 802402B0 46000005 */ abs.s $f0, $f0 -/* A9EFF4 802402B4 46000021 */ cvt.d.s $f0, $f0 -/* A9EFF8 802402B8 4620103E */ c.le.d $f2, $f0 -/* A9EFFC 802402BC 00000000 */ nop -/* A9F000 802402C0 4501001F */ bc1t .L80240340 -/* A9F004 802402C4 2402FFFF */ addiu $v0, $zero, -1 -/* A9F008 802402C8 3C038011 */ lui $v1, 0x8011 -/* A9F00C 802402CC 8063EBB3 */ lb $v1, -0x144d($v1) -/* A9F010 802402D0 24020009 */ addiu $v0, $zero, 9 -/* A9F014 802402D4 10620019 */ beq $v1, $v0, .L8024033C -/* A9F018 802402D8 24020007 */ addiu $v0, $zero, 7 -/* A9F01C 802402DC 14620005 */ bne $v1, $v0, .L802402F4 -/* A9F020 802402E0 2402FFFF */ addiu $v0, $zero, -1 -/* A9F024 802402E4 080900D0 */ j .L80240340 -/* A9F028 802402E8 00000000 */ nop -.L802402EC: -/* A9F02C 802402EC 080900D0 */ j .L80240340 -/* A9F030 802402F0 0240102D */ daddu $v0, $s2, $zero -.L802402F4: -/* A9F034 802402F4 8E620078 */ lw $v0, 0x78($s3) -/* A9F038 802402F8 18400010 */ blez $v0, .L8024033C -/* A9F03C 802402FC 0000882D */ daddu $s1, $zero, $zero -.L80240300: -/* A9F040 80240300 86620008 */ lh $v0, 8($s3) -/* A9F044 80240304 00511021 */ addu $v0, $v0, $s1 -/* A9F048 80240308 24520001 */ addiu $s2, $v0, 1 -/* A9F04C 8024030C 0C00FB3A */ jal get_enemy -/* A9F050 80240310 0240202D */ daddu $a0, $s2, $zero -/* A9F054 80240314 0240202D */ daddu $a0, $s2, $zero -/* A9F058 80240318 0C00EABB */ jal get_npc_unsafe -/* A9F05C 8024031C 0040802D */ daddu $s0, $v0, $zero -/* A9F060 80240320 8E02006C */ lw $v0, 0x6c($s0) -/* A9F064 80240324 1040FFF1 */ beqz $v0, .L802402EC -/* A9F068 80240328 26310001 */ addiu $s1, $s1, 1 -/* A9F06C 8024032C 8E620078 */ lw $v0, 0x78($s3) -/* A9F070 80240330 0222102A */ slt $v0, $s1, $v0 -/* A9F074 80240334 1440FFF2 */ bnez $v0, .L80240300 -/* A9F078 80240338 00000000 */ nop -.L8024033C: -/* A9F07C 8024033C 2402FFFF */ addiu $v0, $zero, -1 -.L80240340: -/* A9F080 80240340 8FBF0020 */ lw $ra, 0x20($sp) -/* A9F084 80240344 8FB3001C */ lw $s3, 0x1c($sp) -/* A9F088 80240348 8FB20018 */ lw $s2, 0x18($sp) -/* A9F08C 8024034C 8FB10014 */ lw $s1, 0x14($sp) -/* A9F090 80240350 8FB00010 */ lw $s0, 0x10($sp) -/* A9F094 80240354 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A9F098 80240358 03E00008 */ jr $ra -/* A9F09C 8024035C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/func_80240360_A9ED40.s b/asm/nonmatchings/world/area_kpa/kpa_115/func_80240360_A9ED40.s deleted file mode 100644 index 5f7ae41fd4..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/func_80240360_A9ED40.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240360_A9F0A0 -/* A9F0A0 80240360 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A9F0A4 80240364 AFB20038 */ sw $s2, 0x38($sp) -/* A9F0A8 80240368 0080902D */ daddu $s2, $a0, $zero -/* A9F0AC 8024036C AFB00030 */ sw $s0, 0x30($sp) -/* A9F0B0 80240370 AFBF003C */ sw $ra, 0x3c($sp) -/* A9F0B4 80240374 AFB10034 */ sw $s1, 0x34($sp) -/* A9F0B8 80240378 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A9F0BC 8024037C F7B40040 */ sdc1 $f20, 0x40($sp) -/* A9F0C0 80240380 8E510148 */ lw $s1, 0x148($s2) -/* A9F0C4 80240384 4485A000 */ mtc1 $a1, $f20 -/* A9F0C8 80240388 86240008 */ lh $a0, 8($s1) -/* A9F0CC 8024038C 4486B000 */ mtc1 $a2, $f22 -/* A9F0D0 80240390 0C00EABB */ jal get_npc_unsafe -/* A9F0D4 80240394 00E0802D */ daddu $s0, $a3, $zero -/* A9F0D8 80240398 0200202D */ daddu $a0, $s0, $zero -/* A9F0DC 8024039C 0220282D */ daddu $a1, $s1, $zero -/* A9F0E0 802403A0 24030001 */ addiu $v1, $zero, 1 -/* A9F0E4 802403A4 4406A000 */ mfc1 $a2, $f20 -/* A9F0E8 802403A8 4407B000 */ mfc1 $a3, $f22 -/* A9F0EC 802403AC 0040802D */ daddu $s0, $v0, $zero -/* A9F0F0 802403B0 0C01242D */ jal func_800490B4 -/* A9F0F4 802403B4 AFA30010 */ sw $v1, 0x10($sp) -/* A9F0F8 802403B8 1440001D */ bnez $v0, .L80240430 -/* A9F0FC 802403BC 24040002 */ addiu $a0, $zero, 2 -/* A9F100 802403C0 0200282D */ daddu $a1, $s0, $zero -/* A9F104 802403C4 0000302D */ daddu $a2, $zero, $zero -/* A9F108 802403C8 860300A8 */ lh $v1, 0xa8($s0) -/* A9F10C 802403CC 3C013F80 */ lui $at, 0x3f80 -/* A9F110 802403D0 44810000 */ mtc1 $at, $f0 -/* A9F114 802403D4 3C014000 */ lui $at, 0x4000 -/* A9F118 802403D8 44811000 */ mtc1 $at, $f2 -/* A9F11C 802403DC 3C01C1A0 */ lui $at, 0xc1a0 -/* A9F120 802403E0 44812000 */ mtc1 $at, $f4 -/* A9F124 802403E4 2402000F */ addiu $v0, $zero, 0xf -/* A9F128 802403E8 AFA2001C */ sw $v0, 0x1c($sp) -/* A9F12C 802403EC 44833000 */ mtc1 $v1, $f6 -/* A9F130 802403F0 00000000 */ nop -/* A9F134 802403F4 468031A0 */ cvt.s.w $f6, $f6 -/* A9F138 802403F8 44073000 */ mfc1 $a3, $f6 -/* A9F13C 802403FC 27A20028 */ addiu $v0, $sp, 0x28 -/* A9F140 80240400 AFA20020 */ sw $v0, 0x20($sp) -/* A9F144 80240404 E7A00010 */ swc1 $f0, 0x10($sp) -/* A9F148 80240408 E7A20014 */ swc1 $f2, 0x14($sp) -/* A9F14C 8024040C 0C01BFA4 */ jal fx_emote -/* A9F150 80240410 E7A40018 */ swc1 $f4, 0x18($sp) -/* A9F154 80240414 8E2200CC */ lw $v0, 0xcc($s1) -/* A9F158 80240418 8C430000 */ lw $v1, ($v0) -/* A9F15C 8024041C 24020014 */ addiu $v0, $zero, 0x14 -/* A9F160 80240420 A602008E */ sh $v0, 0x8e($s0) -/* A9F164 80240424 24020021 */ addiu $v0, $zero, 0x21 -/* A9F168 80240428 08090120 */ j .L80240480 -/* A9F16C 8024042C AE030028 */ sw $v1, 0x28($s0) -.L80240430: -/* A9F170 80240430 0C09005C */ jal func_80240170 -/* A9F174 80240434 0240202D */ daddu $a0, $s2, $zero -/* A9F178 80240438 0040202D */ daddu $a0, $v0, $zero -/* A9F17C 8024043C 2402FFFF */ addiu $v0, $zero, -1 -/* A9F180 80240440 10820010 */ beq $a0, $v0, .L80240484 -/* A9F184 80240444 00000000 */ nop -/* A9F188 80240448 0C00FB3A */ jal get_enemy -/* A9F18C 8024044C 00000000 */ nop -/* A9F190 80240450 8C42006C */ lw $v0, 0x6c($v0) -/* A9F194 80240454 1440000B */ bnez $v0, .L80240484 -/* A9F198 80240458 00000000 */ nop -/* A9F19C 8024045C 8602008C */ lh $v0, 0x8c($s0) -/* A9F1A0 80240460 14400008 */ bnez $v0, .L80240484 -/* A9F1A4 80240464 00000000 */ nop -/* A9F1A8 80240468 8E2200CC */ lw $v0, 0xcc($s1) -/* A9F1AC 8024046C 8C420020 */ lw $v0, 0x20($v0) -/* A9F1B0 80240470 AE020028 */ sw $v0, 0x28($s0) -/* A9F1B4 80240474 96220072 */ lhu $v0, 0x72($s1) -/* A9F1B8 80240478 A602008E */ sh $v0, 0x8e($s0) -/* A9F1BC 8024047C 2402001E */ addiu $v0, $zero, 0x1e -.L80240480: -/* A9F1C0 80240480 AE420070 */ sw $v0, 0x70($s2) -.L80240484: -/* A9F1C4 80240484 8FBF003C */ lw $ra, 0x3c($sp) -/* A9F1C8 80240488 8FB20038 */ lw $s2, 0x38($sp) -/* A9F1CC 8024048C 8FB10034 */ lw $s1, 0x34($sp) -/* A9F1D0 80240490 8FB00030 */ lw $s0, 0x30($sp) -/* A9F1D4 80240494 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A9F1D8 80240498 D7B40040 */ ldc1 $f20, 0x40($sp) -/* A9F1DC 8024049C 03E00008 */ jr $ra -/* A9F1E0 802404A0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/func_802404A4_A9ED40.s b/asm/nonmatchings/world/area_kpa/kpa_115/func_802404A4_A9ED40.s deleted file mode 100644 index f85730e8ce..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/func_802404A4_A9ED40.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404A4_A9F1E4 -/* A9F1E4 802404A4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A9F1E8 802404A8 AFB20038 */ sw $s2, 0x38($sp) -/* A9F1EC 802404AC 0080902D */ daddu $s2, $a0, $zero -/* A9F1F0 802404B0 AFBF003C */ sw $ra, 0x3c($sp) -/* A9F1F4 802404B4 AFB10034 */ sw $s1, 0x34($sp) -/* A9F1F8 802404B8 AFB00030 */ sw $s0, 0x30($sp) -/* A9F1FC 802404BC 8E510148 */ lw $s1, 0x148($s2) -/* A9F200 802404C0 0C00EABB */ jal get_npc_unsafe -/* A9F204 802404C4 86240008 */ lh $a0, 8($s1) -/* A9F208 802404C8 0040802D */ daddu $s0, $v0, $zero -/* A9F20C 802404CC 9602008E */ lhu $v0, 0x8e($s0) -/* A9F210 802404D0 2442FFFF */ addiu $v0, $v0, -1 -/* A9F214 802404D4 A602008E */ sh $v0, 0x8e($s0) -/* A9F218 802404D8 00021400 */ sll $v0, $v0, 0x10 -/* A9F21C 802404DC 1C40002B */ bgtz $v0, .L8024058C -/* A9F220 802404E0 00000000 */ nop -/* A9F224 802404E4 0C09005C */ jal func_80240170 -/* A9F228 802404E8 0240202D */ daddu $a0, $s2, $zero -/* A9F22C 802404EC 0040202D */ daddu $a0, $v0, $zero -/* A9F230 802404F0 0481001A */ bgez $a0, .L8024055C -/* A9F234 802404F4 2402000F */ addiu $v0, $zero, 0xf -/* A9F238 802404F8 24040002 */ addiu $a0, $zero, 2 -/* A9F23C 802404FC 860300A8 */ lh $v1, 0xa8($s0) -/* A9F240 80240500 AFA2001C */ sw $v0, 0x1c($sp) -/* A9F244 80240504 27A20028 */ addiu $v0, $sp, 0x28 -/* A9F248 80240508 0200282D */ daddu $a1, $s0, $zero -/* A9F24C 8024050C 3C013F80 */ lui $at, 0x3f80 -/* A9F250 80240510 44810000 */ mtc1 $at, $f0 -/* A9F254 80240514 3C014000 */ lui $at, 0x4000 -/* A9F258 80240518 44811000 */ mtc1 $at, $f2 -/* A9F25C 8024051C 3C01C1A0 */ lui $at, 0xc1a0 -/* A9F260 80240520 44812000 */ mtc1 $at, $f4 -/* A9F264 80240524 44833000 */ mtc1 $v1, $f6 -/* A9F268 80240528 00000000 */ nop -/* A9F26C 8024052C 468031A0 */ cvt.s.w $f6, $f6 -/* A9F270 80240530 44073000 */ mfc1 $a3, $f6 -/* A9F274 80240534 0000302D */ daddu $a2, $zero, $zero -/* A9F278 80240538 AFA20020 */ sw $v0, 0x20($sp) -/* A9F27C 8024053C E7A00010 */ swc1 $f0, 0x10($sp) -/* A9F280 80240540 E7A20014 */ swc1 $f2, 0x14($sp) -/* A9F284 80240544 0C01BFA4 */ jal fx_emote -/* A9F288 80240548 E7A40018 */ swc1 $f4, 0x18($sp) -/* A9F28C 8024054C 8E2200CC */ lw $v0, 0xcc($s1) -/* A9F290 80240550 8C420000 */ lw $v0, ($v0) -/* A9F294 80240554 0809015F */ j .L8024057C -/* A9F298 80240558 AE020028 */ sw $v0, 0x28($s0) -.L8024055C: -/* A9F29C 8024055C 8E2200CC */ lw $v0, 0xcc($s1) -/* A9F2A0 80240560 8C420024 */ lw $v0, 0x24($v0) -/* A9F2A4 80240564 0C00FB3A */ jal get_enemy -/* A9F2A8 80240568 AE020028 */ sw $v0, 0x28($s0) -/* A9F2AC 8024056C 86240008 */ lh $a0, 8($s1) -/* A9F2B0 80240570 24030001 */ addiu $v1, $zero, 1 -/* A9F2B4 80240574 AC43006C */ sw $v1, 0x6c($v0) -/* A9F2B8 80240578 AC44007C */ sw $a0, 0x7c($v0) -.L8024057C: -/* A9F2BC 8024057C 96220076 */ lhu $v0, 0x76($s1) -/* A9F2C0 80240580 A602008E */ sh $v0, 0x8e($s0) -/* A9F2C4 80240584 24020021 */ addiu $v0, $zero, 0x21 -/* A9F2C8 80240588 AE420070 */ sw $v0, 0x70($s2) -.L8024058C: -/* A9F2CC 8024058C 8FBF003C */ lw $ra, 0x3c($sp) -/* A9F2D0 80240590 8FB20038 */ lw $s2, 0x38($sp) -/* A9F2D4 80240594 8FB10034 */ lw $s1, 0x34($sp) -/* A9F2D8 80240598 8FB00030 */ lw $s0, 0x30($sp) -/* A9F2DC 8024059C 03E00008 */ jr $ra -/* A9F2E0 802405A0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/func_802405A4_A9ED40.s b/asm/nonmatchings/world/area_kpa/kpa_115/func_802405A4_A9ED40.s deleted file mode 100644 index 051c7d201b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/func_802405A4_A9ED40.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A4_A9F2E4 -/* A9F2E4 802405A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A9F2E8 802405A8 AFB10014 */ sw $s1, 0x14($sp) -/* A9F2EC 802405AC 0080882D */ daddu $s1, $a0, $zero -/* A9F2F0 802405B0 AFBF0018 */ sw $ra, 0x18($sp) -/* A9F2F4 802405B4 AFB00010 */ sw $s0, 0x10($sp) -/* A9F2F8 802405B8 8E300148 */ lw $s0, 0x148($s1) -/* A9F2FC 802405BC 0C00EABB */ jal get_npc_unsafe -/* A9F300 802405C0 86040008 */ lh $a0, 8($s0) -/* A9F304 802405C4 96030076 */ lhu $v1, 0x76($s0) -/* A9F308 802405C8 A443008E */ sh $v1, 0x8e($v0) -/* A9F30C 802405CC 24020021 */ addiu $v0, $zero, 0x21 -/* A9F310 802405D0 AE220070 */ sw $v0, 0x70($s1) -/* A9F314 802405D4 8FBF0018 */ lw $ra, 0x18($sp) -/* A9F318 802405D8 8FB10014 */ lw $s1, 0x14($sp) -/* A9F31C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* A9F320 802405E0 03E00008 */ jr $ra -/* A9F324 802405E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/func_802405E8_A9ED40.s b/asm/nonmatchings/world/area_kpa/kpa_115/func_802405E8_A9ED40.s deleted file mode 100644 index 3634476b45..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/func_802405E8_A9ED40.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405E8_A9F328 -/* A9F328 802405E8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A9F32C 802405EC AFB3001C */ sw $s3, 0x1c($sp) -/* A9F330 802405F0 0080982D */ daddu $s3, $a0, $zero -/* A9F334 802405F4 AFBF0020 */ sw $ra, 0x20($sp) -/* A9F338 802405F8 AFB20018 */ sw $s2, 0x18($sp) -/* A9F33C 802405FC AFB10014 */ sw $s1, 0x14($sp) -/* A9F340 80240600 AFB00010 */ sw $s0, 0x10($sp) -/* A9F344 80240604 8E720148 */ lw $s2, 0x148($s3) -/* A9F348 80240608 0C00EABB */ jal get_npc_unsafe -/* A9F34C 8024060C 86440008 */ lh $a0, 8($s2) -/* A9F350 80240610 86440008 */ lh $a0, 8($s2) -/* A9F354 80240614 0040882D */ daddu $s1, $v0, $zero -/* A9F358 80240618 0C00FB3A */ jal get_enemy -/* A9F35C 8024061C 24840001 */ addiu $a0, $a0, 1 -/* A9F360 80240620 0040802D */ daddu $s0, $v0, $zero -/* A9F364 80240624 0C00EABB */ jal get_npc_unsafe -/* A9F368 80240628 86040008 */ lh $a0, 8($s0) -/* A9F36C 8024062C C62C0038 */ lwc1 $f12, 0x38($s1) -/* A9F370 80240630 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A9F374 80240634 8C460038 */ lw $a2, 0x38($v0) -/* A9F378 80240638 0C00A720 */ jal atan2 -/* A9F37C 8024063C 8C470040 */ lw $a3, 0x40($v0) -/* A9F380 80240640 E620000C */ swc1 $f0, 0xc($s1) -/* A9F384 80240644 8E02006C */ lw $v0, 0x6c($s0) -/* A9F388 80240648 14400008 */ bnez $v0, .L8024066C -/* A9F38C 8024064C 00000000 */ nop -/* A9F390 80240650 8E4200CC */ lw $v0, 0xcc($s2) -/* A9F394 80240654 8C420000 */ lw $v0, ($v0) -/* A9F398 80240658 AE220028 */ sw $v0, 0x28($s1) -/* A9F39C 8024065C 96420076 */ lhu $v0, 0x76($s2) -/* A9F3A0 80240660 A622008E */ sh $v0, 0x8e($s1) -/* A9F3A4 80240664 24020021 */ addiu $v0, $zero, 0x21 -/* A9F3A8 80240668 AE620070 */ sw $v0, 0x70($s3) -.L8024066C: -/* A9F3AC 8024066C 8FBF0020 */ lw $ra, 0x20($sp) -/* A9F3B0 80240670 8FB3001C */ lw $s3, 0x1c($sp) -/* A9F3B4 80240674 8FB20018 */ lw $s2, 0x18($sp) -/* A9F3B8 80240678 8FB10014 */ lw $s1, 0x14($sp) -/* A9F3BC 8024067C 8FB00010 */ lw $s0, 0x10($sp) -/* A9F3C0 80240680 03E00008 */ jr $ra -/* A9F3C4 80240684 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/func_80240688_A9ED40.s b/asm/nonmatchings/world/area_kpa/kpa_115/func_80240688_A9ED40.s deleted file mode 100644 index 92004e4bce..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/func_80240688_A9ED40.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240688_A9F3C8 -/* A9F3C8 80240688 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A9F3CC 8024068C AFB00010 */ sw $s0, 0x10($sp) -/* A9F3D0 80240690 0080802D */ daddu $s0, $a0, $zero -/* A9F3D4 80240694 AFBF0014 */ sw $ra, 0x14($sp) -/* A9F3D8 80240698 8E020148 */ lw $v0, 0x148($s0) -/* A9F3DC 8024069C 0C00EABB */ jal get_npc_unsafe -/* A9F3E0 802406A0 84440008 */ lh $a0, 8($v0) -/* A9F3E4 802406A4 9443008E */ lhu $v1, 0x8e($v0) -/* A9F3E8 802406A8 2463FFFF */ addiu $v1, $v1, -1 -/* A9F3EC 802406AC A443008E */ sh $v1, 0x8e($v0) -/* A9F3F0 802406B0 00031C00 */ sll $v1, $v1, 0x10 -/* A9F3F4 802406B4 58600001 */ blezl $v1, .L802406BC -/* A9F3F8 802406B8 AE000070 */ sw $zero, 0x70($s0) -.L802406BC: -/* A9F3FC 802406BC 8FBF0014 */ lw $ra, 0x14($sp) -/* A9F400 802406C0 8FB00010 */ lw $s0, 0x10($sp) -/* A9F404 802406C4 03E00008 */ jr $ra -/* A9F408 802406C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/func_802406CC_A9ED40.s b/asm/nonmatchings/world/area_kpa/kpa_115/func_802406CC_A9ED40.s deleted file mode 100644 index 19c1fc2f26..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/func_802406CC_A9ED40.s +++ /dev/null @@ -1,354 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406CC_A9F40C -/* A9F40C 802406CC 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A9F410 802406D0 AFB7004C */ sw $s7, 0x4c($sp) -/* A9F414 802406D4 0080B82D */ daddu $s7, $a0, $zero -/* A9F418 802406D8 AFB10034 */ sw $s1, 0x34($sp) -/* A9F41C 802406DC 00A0882D */ daddu $s1, $a1, $zero -/* A9F420 802406E0 AFBF0050 */ sw $ra, 0x50($sp) -/* A9F424 802406E4 AFB60048 */ sw $s6, 0x48($sp) -/* A9F428 802406E8 AFB50044 */ sw $s5, 0x44($sp) -/* A9F42C 802406EC AFB40040 */ sw $s4, 0x40($sp) -/* A9F430 802406F0 AFB3003C */ sw $s3, 0x3c($sp) -/* A9F434 802406F4 AFB20038 */ sw $s2, 0x38($sp) -/* A9F438 802406F8 AFB00030 */ sw $s0, 0x30($sp) -/* A9F43C 802406FC 8EF30148 */ lw $s3, 0x148($s7) -/* A9F440 80240700 86640008 */ lh $a0, 8($s3) -/* A9F444 80240704 8EF0000C */ lw $s0, 0xc($s7) -/* A9F448 80240708 0C00FB5A */ jal get_enemy_safe -/* A9F44C 8024070C 0000B02D */ daddu $s6, $zero, $zero -/* A9F450 80240710 10400131 */ beqz $v0, .L80240BD8 -/* A9F454 80240714 24020005 */ addiu $v0, $zero, 5 -/* A9F458 80240718 8E63006C */ lw $v1, 0x6c($s3) -/* A9F45C 8024071C 1062012F */ beq $v1, $v0, .L80240BDC -/* A9F460 80240720 0000102D */ daddu $v0, $zero, $zero -/* A9F464 80240724 8E050000 */ lw $a1, ($s0) -/* A9F468 80240728 0C0B1EAF */ jal get_variable -/* A9F46C 8024072C 02E0202D */ daddu $a0, $s7, $zero -/* A9F470 80240730 86640008 */ lh $a0, 8($s3) -/* A9F474 80240734 0C00EABB */ jal get_npc_unsafe -/* A9F478 80240738 0040A82D */ daddu $s5, $v0, $zero -/* A9F47C 8024073C 8E630070 */ lw $v1, 0x70($s3) -/* A9F480 80240740 30630002 */ andi $v1, $v1, 2 -/* A9F484 80240744 10600008 */ beqz $v1, .L80240768 -/* A9F488 80240748 0040902D */ daddu $s2, $v0, $zero -/* A9F48C 8024074C 964200A8 */ lhu $v0, 0xa8($s2) -/* A9F490 80240750 00021400 */ sll $v0, $v0, 0x10 -/* A9F494 80240754 00021C03 */ sra $v1, $v0, 0x10 -/* A9F498 80240758 000217C2 */ srl $v0, $v0, 0x1f -/* A9F49C 8024075C 00621821 */ addu $v1, $v1, $v0 -/* A9F4A0 80240760 00031843 */ sra $v1, $v1, 1 -/* A9F4A4 80240764 A24300AB */ sb $v1, 0xab($s2) -.L80240768: -/* A9F4A8 80240768 16200005 */ bnez $s1, .L80240780 -/* A9F4AC 8024076C 3C030004 */ lui $v1, 4 -/* A9F4B0 80240770 8E6200B0 */ lw $v0, 0xb0($s3) -/* A9F4B4 80240774 30420004 */ andi $v0, $v0, 4 -/* A9F4B8 80240778 10400019 */ beqz $v0, .L802407E0 -/* A9F4BC 8024077C 00000000 */ nop -.L80240780: -/* A9F4C0 80240780 34630102 */ ori $v1, $v1, 0x102 -/* A9F4C4 80240784 AEE00070 */ sw $zero, 0x70($s7) -/* A9F4C8 80240788 8E420000 */ lw $v0, ($s2) -/* A9F4CC 8024078C 0240202D */ daddu $a0, $s2, $zero -/* A9F4D0 80240790 A640008E */ sh $zero, 0x8e($s2) -/* A9F4D4 80240794 00431025 */ or $v0, $v0, $v1 -/* A9F4D8 80240798 0C00EAFF */ jal disable_npc_shadow -/* A9F4DC 8024079C AE420000 */ sw $v0, ($s2) -/* A9F4E0 802407A0 3C041F30 */ lui $a0, 0x1f30 -/* A9F4E4 802407A4 8E420000 */ lw $v0, ($s2) -/* A9F4E8 802407A8 2403F7FF */ addiu $v1, $zero, -0x801 -/* A9F4EC 802407AC 00431024 */ and $v0, $v0, $v1 -/* A9F4F0 802407B0 AE420000 */ sw $v0, ($s2) -/* A9F4F4 802407B4 8E620000 */ lw $v0, ($s3) -/* A9F4F8 802407B8 8E6300B0 */ lw $v1, 0xb0($s3) -/* A9F4FC 802407BC 34840040 */ ori $a0, $a0, 0x40 -/* A9F500 802407C0 AE60006C */ sw $zero, 0x6c($s3) -/* A9F504 802407C4 00441025 */ or $v0, $v0, $a0 -/* A9F508 802407C8 AE620000 */ sw $v0, ($s3) -/* A9F50C 802407CC 30620004 */ andi $v0, $v1, 4 -/* A9F510 802407D0 10400003 */ beqz $v0, .L802407E0 -/* A9F514 802407D4 2402FFFB */ addiu $v0, $zero, -5 -/* A9F518 802407D8 00621024 */ and $v0, $v1, $v0 -/* A9F51C 802407DC AE6200B0 */ sw $v0, 0xb0($s3) -.L802407E0: -/* A9F520 802407E0 8EE30070 */ lw $v1, 0x70($s7) -/* A9F524 802407E4 24100001 */ addiu $s0, $zero, 1 -/* A9F528 802407E8 10700012 */ beq $v1, $s0, .L80240834 -/* A9F52C 802407EC 28620002 */ slti $v0, $v1, 2 -/* A9F530 802407F0 10400005 */ beqz $v0, .L80240808 -/* A9F534 802407F4 24020002 */ addiu $v0, $zero, 2 -/* A9F538 802407F8 10600007 */ beqz $v1, .L80240818 -/* A9F53C 802407FC 0000102D */ daddu $v0, $zero, $zero -/* A9F540 80240800 080902F7 */ j .L80240BDC -/* A9F544 80240804 00000000 */ nop -.L80240808: -/* A9F548 80240808 1062005B */ beq $v1, $v0, .L80240978 -/* A9F54C 8024080C 0000102D */ daddu $v0, $zero, $zero -/* A9F550 80240810 080902F7 */ j .L80240BDC -/* A9F554 80240814 00000000 */ nop -.L80240818: -/* A9F558 80240818 8E420000 */ lw $v0, ($s2) -/* A9F55C 8024081C 0240202D */ daddu $a0, $s2, $zero -/* A9F560 80240820 34420002 */ ori $v0, $v0, 2 -/* A9F564 80240824 0C00EAFF */ jal disable_npc_shadow -/* A9F568 80240828 AE420000 */ sw $v0, ($s2) -/* A9F56C 8024082C AE60006C */ sw $zero, 0x6c($s3) -/* A9F570 80240830 AEF00070 */ sw $s0, 0x70($s7) -.L80240834: -/* A9F574 80240834 8E74006C */ lw $s4, 0x6c($s3) -/* A9F578 80240838 24020001 */ addiu $v0, $zero, 1 -/* A9F57C 8024083C 168200E7 */ bne $s4, $v0, .L80240BDC -/* A9F580 80240840 0000102D */ daddu $v0, $zero, $zero -/* A9F584 80240844 8E64007C */ lw $a0, 0x7c($s3) -/* A9F588 80240848 24110002 */ addiu $s1, $zero, 2 -/* A9F58C 8024084C 0C00EABB */ jal get_npc_unsafe -/* A9F590 80240850 AE71006C */ sw $s1, 0x6c($s3) -/* A9F594 80240854 0040802D */ daddu $s0, $v0, $zero -/* A9F598 80240858 C6000038 */ lwc1 $f0, 0x38($s0) -/* A9F59C 8024085C E6400038 */ swc1 $f0, 0x38($s2) -/* A9F5A0 80240860 C6000040 */ lwc1 $f0, 0x40($s0) -/* A9F5A4 80240864 E6400040 */ swc1 $f0, 0x40($s2) -/* A9F5A8 80240868 C6020034 */ lwc1 $f2, 0x34($s0) -/* A9F5AC 8024086C 3C014387 */ lui $at, 0x4387 -/* A9F5B0 80240870 44810000 */ mtc1 $at, $f0 -/* A9F5B4 80240874 26440038 */ addiu $a0, $s2, 0x38 -/* A9F5B8 80240878 46020001 */ sub.s $f0, $f0, $f2 -/* A9F5BC 8024087C C6680078 */ lwc1 $f8, 0x78($s3) -/* A9F5C0 80240880 46804220 */ cvt.s.w $f8, $f8 -/* A9F5C4 80240884 44064000 */ mfc1 $a2, $f8 -/* A9F5C8 80240888 44070000 */ mfc1 $a3, $f0 -/* A9F5CC 8024088C 0C00A7E7 */ jal add_vec2D_polar -/* A9F5D0 80240890 26450040 */ addiu $a1, $s2, 0x40 -/* A9F5D4 80240894 C600003C */ lwc1 $f0, 0x3c($s0) -/* A9F5D8 80240898 C6620074 */ lwc1 $f2, 0x74($s3) -/* A9F5DC 8024089C 468010A0 */ cvt.s.w $f2, $f2 -/* A9F5E0 802408A0 46020000 */ add.s $f0, $f0, $f2 -/* A9F5E4 802408A4 E640003C */ swc1 $f0, 0x3c($s2) -/* A9F5E8 802408A8 A2740007 */ sb $s4, 7($s3) -/* A9F5EC 802408AC C6400038 */ lwc1 $f0, 0x38($s2) -/* A9F5F0 802408B0 4600020D */ trunc.w.s $f8, $f0 -/* A9F5F4 802408B4 44024000 */ mfc1 $v0, $f8 -/* A9F5F8 802408B8 00000000 */ nop -/* A9F5FC 802408BC A6620010 */ sh $v0, 0x10($s3) -/* A9F600 802408C0 C640003C */ lwc1 $f0, 0x3c($s2) -/* A9F604 802408C4 4600020D */ trunc.w.s $f8, $f0 -/* A9F608 802408C8 44024000 */ mfc1 $v0, $f8 -/* A9F60C 802408CC 00000000 */ nop -/* A9F610 802408D0 A6620012 */ sh $v0, 0x12($s3) -/* A9F614 802408D4 C6400040 */ lwc1 $f0, 0x40($s2) -/* A9F618 802408D8 4600020D */ trunc.w.s $f8, $f0 -/* A9F61C 802408DC 44024000 */ mfc1 $v0, $f8 -/* A9F620 802408E0 00000000 */ nop -/* A9F624 802408E4 A6620014 */ sh $v0, 0x14($s3) -/* A9F628 802408E8 AE400044 */ sw $zero, 0x44($s2) -/* A9F62C 802408EC AE400048 */ sw $zero, 0x48($s2) -/* A9F630 802408F0 AE40004C */ sw $zero, 0x4c($s2) -/* A9F634 802408F4 C6A00000 */ lwc1 $f0, ($s5) -/* A9F638 802408F8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A9F63C 802408FC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A9F640 80240900 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A9F644 80240904 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A9F648 80240908 E6400018 */ swc1 $f0, 0x18($s2) -/* A9F64C 8024090C 8C460028 */ lw $a2, 0x28($v0) -/* A9F650 80240910 0C00A720 */ jal atan2 -/* A9F654 80240914 8C470030 */ lw $a3, 0x30($v0) -/* A9F658 80240918 E640000C */ swc1 $f0, 0xc($s2) -/* A9F65C 8024091C C6A0000C */ lwc1 $f0, 0xc($s5) -/* A9F660 80240920 8E420000 */ lw $v0, ($s2) -/* A9F664 80240924 0240202D */ daddu $a0, $s2, $zero -/* A9F668 80240928 E640001C */ swc1 $f0, 0x1c($s2) -/* A9F66C 8024092C C6A00010 */ lwc1 $f0, 0x10($s5) -/* A9F670 80240930 2403FFFD */ addiu $v1, $zero, -3 -/* A9F674 80240934 E6400014 */ swc1 $f0, 0x14($s2) -/* A9F678 80240938 C600003C */ lwc1 $f0, 0x3c($s0) -/* A9F67C 8024093C 00431024 */ and $v0, $v0, $v1 -/* A9F680 80240940 AE420000 */ sw $v0, ($s2) -/* A9F684 80240944 0C00EAE8 */ jal enable_npc_shadow -/* A9F688 80240948 E6400064 */ swc1 $f0, 0x64($s2) -/* A9F68C 8024094C 8E420000 */ lw $v0, ($s2) -/* A9F690 80240950 3C03E0FF */ lui $v1, 0xe0ff -/* A9F694 80240954 34420800 */ ori $v0, $v0, 0x800 -/* A9F698 80240958 AE420000 */ sw $v0, ($s2) -/* A9F69C 8024095C 8E620000 */ lw $v0, ($s3) -/* A9F6A0 80240960 3463FFFF */ ori $v1, $v1, 0xffff -/* A9F6A4 80240964 00431024 */ and $v0, $v0, $v1 -/* A9F6A8 80240968 AE620000 */ sw $v0, ($s3) -/* A9F6AC 8024096C 2402005A */ addiu $v0, $zero, 0x5a -/* A9F6B0 80240970 A642008E */ sh $v0, 0x8e($s2) -/* A9F6B4 80240974 AEF10070 */ sw $s1, 0x70($s7) -.L80240978: -/* A9F6B8 80240978 0000202D */ daddu $a0, $zero, $zero -/* A9F6BC 8024097C 27B00020 */ addiu $s0, $sp, 0x20 -/* A9F6C0 80240980 864200A8 */ lh $v0, 0xa8($s2) -/* A9F6C4 80240984 3C013FE0 */ lui $at, 0x3fe0 -/* A9F6C8 80240988 44810800 */ mtc1 $at, $f1 -/* A9F6CC 8024098C 44800000 */ mtc1 $zero, $f0 -/* A9F6D0 80240990 44821000 */ mtc1 $v0, $f2 -/* A9F6D4 80240994 00000000 */ nop -/* A9F6D8 80240998 468010A1 */ cvt.d.w $f2, $f2 -/* A9F6DC 8024099C 46201082 */ mul.d $f2, $f2, $f0 -/* A9F6E0 802409A0 00000000 */ nop -/* A9F6E4 802409A4 0200282D */ daddu $a1, $s0, $zero -/* A9F6E8 802409A8 C6440038 */ lwc1 $f4, 0x38($s2) -/* A9F6EC 802409AC C640003C */ lwc1 $f0, 0x3c($s2) -/* A9F6F0 802409B0 27B10024 */ addiu $s1, $sp, 0x24 -/* A9F6F4 802409B4 E7A40020 */ swc1 $f4, 0x20($sp) -/* A9F6F8 802409B8 C6440040 */ lwc1 $f4, 0x40($s2) -/* A9F6FC 802409BC 46000021 */ cvt.d.s $f0, $f0 -/* A9F700 802409C0 46220000 */ add.d $f0, $f0, $f2 -/* A9F704 802409C4 E7A40028 */ swc1 $f4, 0x28($sp) -/* A9F708 802409C8 C6420018 */ lwc1 $f2, 0x18($s2) -/* A9F70C 802409CC 46200020 */ cvt.s.d $f0, $f0 -/* A9F710 802409D0 E7A00024 */ swc1 $f0, 0x24($sp) -/* A9F714 802409D4 E7A20010 */ swc1 $f2, 0x10($sp) -/* A9F718 802409D8 C640000C */ lwc1 $f0, 0xc($s2) -/* A9F71C 802409DC 0220302D */ daddu $a2, $s1, $zero -/* A9F720 802409E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* A9F724 802409E4 864200A6 */ lh $v0, 0xa6($s2) -/* A9F728 802409E8 27B40028 */ addiu $s4, $sp, 0x28 -/* A9F72C 802409EC 44820000 */ mtc1 $v0, $f0 -/* A9F730 802409F0 00000000 */ nop -/* A9F734 802409F4 46800020 */ cvt.s.w $f0, $f0 -/* A9F738 802409F8 E7A00018 */ swc1 $f0, 0x18($sp) -/* A9F73C 802409FC 864200A8 */ lh $v0, 0xa8($s2) -/* A9F740 80240A00 0280382D */ daddu $a3, $s4, $zero -/* A9F744 80240A04 44820000 */ mtc1 $v0, $f0 -/* A9F748 80240A08 00000000 */ nop -/* A9F74C 80240A0C 46800020 */ cvt.s.w $f0, $f0 -/* A9F750 80240A10 0C0376B9 */ jal func_800DDAE4 -/* A9F754 80240A14 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A9F758 80240A18 54400001 */ bnel $v0, $zero, .L80240A20 -/* A9F75C 80240A1C 24160001 */ addiu $s6, $zero, 1 -.L80240A20: -/* A9F760 80240A20 0200282D */ daddu $a1, $s0, $zero -/* A9F764 80240A24 0220302D */ daddu $a2, $s1, $zero -/* A9F768 80240A28 C6400038 */ lwc1 $f0, 0x38($s2) -/* A9F76C 80240A2C C642003C */ lwc1 $f2, 0x3c($s2) -/* A9F770 80240A30 C6440040 */ lwc1 $f4, 0x40($s2) -/* A9F774 80240A34 3C01447A */ lui $at, 0x447a -/* A9F778 80240A38 44813000 */ mtc1 $at, $f6 -/* A9F77C 80240A3C 27A2002C */ addiu $v0, $sp, 0x2c -/* A9F780 80240A40 E7A00020 */ swc1 $f0, 0x20($sp) -/* A9F784 80240A44 E7A20024 */ swc1 $f2, 0x24($sp) -/* A9F788 80240A48 E7A40028 */ swc1 $f4, 0x28($sp) -/* A9F78C 80240A4C E7A6002C */ swc1 $f6, 0x2c($sp) -/* A9F790 80240A50 AFA20010 */ sw $v0, 0x10($sp) -/* A9F794 80240A54 8E440080 */ lw $a0, 0x80($s2) -/* A9F798 80240A58 0C0372DF */ jal func_800DCB7C -/* A9F79C 80240A5C 0280382D */ daddu $a3, $s4, $zero -/* A9F7A0 80240A60 10400019 */ beqz $v0, .L80240AC8 -/* A9F7A4 80240A64 00000000 */ nop -/* A9F7A8 80240A68 C640001C */ lwc1 $f0, 0x1c($s2) -/* A9F7AC 80240A6C C7A2002C */ lwc1 $f2, 0x2c($sp) -/* A9F7B0 80240A70 46000005 */ abs.s $f0, $f0 -/* A9F7B4 80240A74 4600103C */ c.lt.s $f2, $f0 -/* A9F7B8 80240A78 00000000 */ nop -/* A9F7BC 80240A7C 45000012 */ bc1f .L80240AC8 -/* A9F7C0 80240A80 00000000 */ nop -/* A9F7C4 80240A84 C7A40024 */ lwc1 $f4, 0x24($sp) -/* A9F7C8 80240A88 C6400064 */ lwc1 $f0, 0x64($s2) -/* A9F7CC 80240A8C 46002001 */ sub.s $f0, $f4, $f0 -/* A9F7D0 80240A90 3C014034 */ lui $at, 0x4034 -/* A9F7D4 80240A94 44811800 */ mtc1 $at, $f3 -/* A9F7D8 80240A98 44801000 */ mtc1 $zero, $f2 -/* A9F7DC 80240A9C 46000005 */ abs.s $f0, $f0 -/* A9F7E0 80240AA0 46000021 */ cvt.d.s $f0, $f0 -/* A9F7E4 80240AA4 4622003C */ c.lt.d $f0, $f2 -/* A9F7E8 80240AA8 00000000 */ nop -/* A9F7EC 80240AAC 45000006 */ bc1f .L80240AC8 -/* A9F7F0 80240AB0 0240202D */ daddu $a0, $s2, $zero -/* A9F7F4 80240AB4 8E450018 */ lw $a1, 0x18($s2) -/* A9F7F8 80240AB8 8E46000C */ lw $a2, 0xc($s2) -/* A9F7FC 80240ABC 2416000A */ addiu $s6, $zero, 0xa -/* A9F800 80240AC0 0C00EA95 */ jal npc_move_heading -/* A9F804 80240AC4 E644003C */ swc1 $f4, 0x3c($s2) -.L80240AC8: -/* A9F808 80240AC8 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A9F80C 80240ACC 3C013FF0 */ lui $at, 0x3ff0 -/* A9F810 80240AD0 44811800 */ mtc1 $at, $f3 -/* A9F814 80240AD4 44801000 */ mtc1 $zero, $f2 -/* A9F818 80240AD8 46000021 */ cvt.d.s $f0, $f0 -/* A9F81C 80240ADC 4622003C */ c.lt.d $f0, $f2 -/* A9F820 80240AE0 00000000 */ nop -/* A9F824 80240AE4 45030001 */ bc1tl .L80240AEC -/* A9F828 80240AE8 2416000B */ addiu $s6, $zero, 0xb -.L80240AEC: -/* A9F82C 80240AEC 9642008E */ lhu $v0, 0x8e($s2) -/* A9F830 80240AF0 2442FFFF */ addiu $v0, $v0, -1 -/* A9F834 80240AF4 A642008E */ sh $v0, 0x8e($s2) -/* A9F838 80240AF8 00021400 */ sll $v0, $v0, 0x10 -/* A9F83C 80240AFC 58400001 */ blezl $v0, .L80240B04 -/* A9F840 80240B00 24160014 */ addiu $s6, $zero, 0x14 -.L80240B04: -/* A9F844 80240B04 56C00019 */ bnel $s6, $zero, .L80240B6C -/* A9F848 80240B08 AFA00010 */ sw $zero, 0x10($sp) -/* A9F84C 80240B0C 8E620070 */ lw $v0, 0x70($s3) -/* A9F850 80240B10 30420001 */ andi $v0, $v0, 1 -/* A9F854 80240B14 10400009 */ beqz $v0, .L80240B3C -/* A9F858 80240B18 00000000 */ nop -/* A9F85C 80240B1C C640004C */ lwc1 $f0, 0x4c($s2) -/* A9F860 80240B20 3C014044 */ lui $at, 0x4044 -/* A9F864 80240B24 44811800 */ mtc1 $at, $f3 -/* A9F868 80240B28 44801000 */ mtc1 $zero, $f2 -/* A9F86C 80240B2C 46000021 */ cvt.d.s $f0, $f0 -/* A9F870 80240B30 46220000 */ add.d $f0, $f0, $f2 -/* A9F874 80240B34 46200020 */ cvt.s.d $f0, $f0 -/* A9F878 80240B38 E640004C */ swc1 $f0, 0x4c($s2) -.L80240B3C: -/* A9F87C 80240B3C 8E450018 */ lw $a1, 0x18($s2) -/* A9F880 80240B40 8E46000C */ lw $a2, 0xc($s2) -/* A9F884 80240B44 0C00EA95 */ jal npc_move_heading -/* A9F888 80240B48 0240202D */ daddu $a0, $s2, $zero -/* A9F88C 80240B4C C644003C */ lwc1 $f4, 0x3c($s2) -/* A9F890 80240B50 C640001C */ lwc1 $f0, 0x1c($s2) -/* A9F894 80240B54 46002100 */ add.s $f4, $f4, $f0 -/* A9F898 80240B58 C6420014 */ lwc1 $f2, 0x14($s2) -/* A9F89C 80240B5C 46020001 */ sub.s $f0, $f0, $f2 -/* A9F8A0 80240B60 E644003C */ swc1 $f4, 0x3c($s2) -/* A9F8A4 80240B64 080902F6 */ j .L80240BD8 -/* A9F8A8 80240B68 E640001C */ swc1 $f0, 0x1c($s2) -.L80240B6C: -/* A9F8AC 80240B6C AFA00014 */ sw $zero, 0x14($sp) -/* A9F8B0 80240B70 8E450038 */ lw $a1, 0x38($s2) -/* A9F8B4 80240B74 8E46003C */ lw $a2, 0x3c($s2) -/* A9F8B8 80240B78 8E470040 */ lw $a3, 0x40($s2) -/* A9F8BC 80240B7C 0C01BECC */ jal fx_walk_normal -/* A9F8C0 80240B80 24040002 */ addiu $a0, $zero, 2 -/* A9F8C4 80240B84 3C01C47A */ lui $at, 0xc47a -/* A9F8C8 80240B88 44810000 */ mtc1 $at, $f0 -/* A9F8CC 80240B8C AE60006C */ sw $zero, 0x6c($s3) -/* A9F8D0 80240B90 8E420000 */ lw $v0, ($s2) -/* A9F8D4 80240B94 0240202D */ daddu $a0, $s2, $zero -/* A9F8D8 80240B98 AE400038 */ sw $zero, 0x38($s2) -/* A9F8DC 80240B9C AE400040 */ sw $zero, 0x40($s2) -/* A9F8E0 80240BA0 AE40001C */ sw $zero, 0x1c($s2) -/* A9F8E4 80240BA4 34420002 */ ori $v0, $v0, 2 -/* A9F8E8 80240BA8 E640003C */ swc1 $f0, 0x3c($s2) -/* A9F8EC 80240BAC 0C00EAFF */ jal disable_npc_shadow -/* A9F8F0 80240BB0 AE420000 */ sw $v0, ($s2) -/* A9F8F4 80240BB4 8E420000 */ lw $v0, ($s2) -/* A9F8F8 80240BB8 2403F7FF */ addiu $v1, $zero, -0x801 -/* A9F8FC 80240BBC 00431024 */ and $v0, $v0, $v1 -/* A9F900 80240BC0 AE420000 */ sw $v0, ($s2) -/* A9F904 80240BC4 8E620000 */ lw $v0, ($s3) -/* A9F908 80240BC8 3C031F00 */ lui $v1, 0x1f00 -/* A9F90C 80240BCC 00431025 */ or $v0, $v0, $v1 -/* A9F910 80240BD0 AE620000 */ sw $v0, ($s3) -/* A9F914 80240BD4 AEE00070 */ sw $zero, 0x70($s7) -.L80240BD8: -/* A9F918 80240BD8 0000102D */ daddu $v0, $zero, $zero -.L80240BDC: -/* A9F91C 80240BDC 8FBF0050 */ lw $ra, 0x50($sp) -/* A9F920 80240BE0 8FB7004C */ lw $s7, 0x4c($sp) -/* A9F924 80240BE4 8FB60048 */ lw $s6, 0x48($sp) -/* A9F928 80240BE8 8FB50044 */ lw $s5, 0x44($sp) -/* A9F92C 80240BEC 8FB40040 */ lw $s4, 0x40($sp) -/* A9F930 80240BF0 8FB3003C */ lw $s3, 0x3c($sp) -/* A9F934 80240BF4 8FB20038 */ lw $s2, 0x38($sp) -/* A9F938 80240BF8 8FB10034 */ lw $s1, 0x34($sp) -/* A9F93C 80240BFC 8FB00030 */ lw $s0, 0x30($sp) -/* A9F940 80240C00 03E00008 */ jr $ra -/* A9F944 80240C04 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/func_80240C08_A9ED40.s b/asm/nonmatchings/world/area_kpa/kpa_115/func_80240C08_A9ED40.s deleted file mode 100644 index 6d302f3a19..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/func_80240C08_A9ED40.s +++ /dev/null @@ -1,298 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C08_A9F948 -/* A9F948 80240C08 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* A9F94C 80240C0C AFB3003C */ sw $s3, 0x3c($sp) -/* A9F950 80240C10 0080982D */ daddu $s3, $a0, $zero -/* A9F954 80240C14 AFB40040 */ sw $s4, 0x40($sp) -/* A9F958 80240C18 0000A02D */ daddu $s4, $zero, $zero -/* A9F95C 80240C1C 3C03800A */ lui $v1, 0x800a -/* A9F960 80240C20 8463A634 */ lh $v1, -0x59cc($v1) -/* A9F964 80240C24 3C04800B */ lui $a0, %hi(gCameras) -/* A9F968 80240C28 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A9F96C 80240C2C AFBF0044 */ sw $ra, 0x44($sp) -/* A9F970 80240C30 AFB20038 */ sw $s2, 0x38($sp) -/* A9F974 80240C34 AFB10034 */ sw $s1, 0x34($sp) -/* A9F978 80240C38 AFB00030 */ sw $s0, 0x30($sp) -/* A9F97C 80240C3C F7B80058 */ sdc1 $f24, 0x58($sp) -/* A9F980 80240C40 F7B60050 */ sdc1 $f22, 0x50($sp) -/* A9F984 80240C44 F7B40048 */ sdc1 $f20, 0x48($sp) -/* A9F988 80240C48 8E710148 */ lw $s1, 0x148($s3) -/* A9F98C 80240C4C 00031080 */ sll $v0, $v1, 2 -/* A9F990 80240C50 00431021 */ addu $v0, $v0, $v1 -/* A9F994 80240C54 00021080 */ sll $v0, $v0, 2 -/* A9F998 80240C58 00431023 */ subu $v0, $v0, $v1 -/* A9F99C 80240C5C 000218C0 */ sll $v1, $v0, 3 -/* A9F9A0 80240C60 00431021 */ addu $v0, $v0, $v1 -/* A9F9A4 80240C64 000210C0 */ sll $v0, $v0, 3 -/* A9F9A8 80240C68 10A00002 */ beqz $a1, .L80240C74 -/* A9F9AC 80240C6C 00449021 */ addu $s2, $v0, $a0 -/* A9F9B0 80240C70 AE600070 */ sw $zero, 0x70($s3) -.L80240C74: -/* A9F9B4 80240C74 0C00FB5A */ jal get_enemy_safe -/* A9F9B8 80240C78 86240008 */ lh $a0, 8($s1) -/* A9F9BC 80240C7C 14400006 */ bnez $v0, .L80240C98 -/* A9F9C0 80240C80 24020005 */ addiu $v0, $zero, 5 -/* A9F9C4 80240C84 0260202D */ daddu $a0, $s3, $zero -/* A9F9C8 80240C88 3C05FE36 */ lui $a1, 0xfe36 -/* A9F9CC 80240C8C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A9F9D0 80240C90 080903FE */ j .L80240FF8 -/* A9F9D4 80240C94 0000302D */ daddu $a2, $zero, $zero -.L80240C98: -/* A9F9D8 80240C98 8E23006C */ lw $v1, 0x6c($s1) -/* A9F9DC 80240C9C 14620005 */ bne $v1, $v0, .L80240CB4 -/* A9F9E0 80240CA0 0260202D */ daddu $a0, $s3, $zero -/* A9F9E4 80240CA4 3C05FE36 */ lui $a1, 0xfe36 -/* A9F9E8 80240CA8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A9F9EC 80240CAC 080903FE */ j .L80240FF8 -/* A9F9F0 80240CB0 0000302D */ daddu $a2, $zero, $zero -.L80240CB4: -/* A9F9F4 80240CB4 86240008 */ lh $a0, 8($s1) -/* A9F9F8 80240CB8 0C00FB5A */ jal get_enemy_safe -/* A9F9FC 80240CBC 00000000 */ nop -/* A9FA00 80240CC0 14400005 */ bnez $v0, .L80240CD8 -/* A9FA04 80240CC4 0260202D */ daddu $a0, $s3, $zero -/* A9FA08 80240CC8 3C05FE36 */ lui $a1, 0xfe36 -/* A9FA0C 80240CCC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A9FA10 80240CD0 080903FE */ j .L80240FF8 -/* A9FA14 80240CD4 0000302D */ daddu $a2, $zero, $zero -.L80240CD8: -/* A9FA18 80240CD8 86240008 */ lh $a0, 8($s1) -/* A9FA1C 80240CDC 0C00EABB */ jal get_npc_unsafe -/* A9FA20 80240CE0 00000000 */ nop -/* A9FA24 80240CE4 8E630070 */ lw $v1, 0x70($s3) -/* A9FA28 80240CE8 10600006 */ beqz $v1, .L80240D04 -/* A9FA2C 80240CEC 0040802D */ daddu $s0, $v0, $zero -/* A9FA30 80240CF0 24020001 */ addiu $v0, $zero, 1 -/* A9FA34 80240CF4 1062003F */ beq $v1, $v0, .L80240DF4 -/* A9FA38 80240CF8 0000102D */ daddu $v0, $zero, $zero -/* A9FA3C 80240CFC 0809040E */ j .L80241038 -/* A9FA40 80240D00 00000000 */ nop -.L80240D04: -/* A9FA44 80240D04 AFA00010 */ sw $zero, 0x10($sp) -/* A9FA48 80240D08 AFA00014 */ sw $zero, 0x14($sp) -/* A9FA4C 80240D0C 8E050038 */ lw $a1, 0x38($s0) -/* A9FA50 80240D10 8E06003C */ lw $a2, 0x3c($s0) -/* A9FA54 80240D14 8E070040 */ lw $a3, 0x40($s0) -/* A9FA58 80240D18 0C01BECC */ jal fx_walk_normal -/* A9FA5C 80240D1C 24040002 */ addiu $a0, $zero, 2 -/* A9FA60 80240D20 C64C006C */ lwc1 $f12, 0x6c($s2) -/* A9FA64 80240D24 0C00A6C9 */ jal clamp_angle -/* A9FA68 80240D28 00000000 */ nop -/* A9FA6C 80240D2C 3C018024 */ lui $at, 0x8024 -/* A9FA70 80240D30 D4382FF0 */ ldc1 $f24, 0x2ff0($at) -/* A9FA74 80240D34 46000521 */ cvt.d.s $f20, $f0 -/* A9FA78 80240D38 4638A300 */ add.d $f12, $f20, $f24 -/* A9FA7C 80240D3C 3C018024 */ lui $at, 0x8024 -/* A9FA80 80240D40 D4362FF8 */ ldc1 $f22, 0x2ff8($at) -/* A9FA84 80240D44 0C00A6C9 */ jal clamp_angle -/* A9FA88 80240D48 46206320 */ cvt.s.d $f12, $f12 -/* A9FA8C 80240D4C 4636A500 */ add.d $f20, $f20, $f22 -/* A9FA90 80240D50 4620A320 */ cvt.s.d $f12, $f20 -/* A9FA94 80240D54 0C00A6C9 */ jal clamp_angle -/* A9FA98 80240D58 46000506 */ mov.s $f20, $f0 -/* A9FA9C 80240D5C 4600A521 */ cvt.d.s $f20, $f20 -/* A9FAA0 80240D60 4636A500 */ add.d $f20, $f20, $f22 -/* A9FAA4 80240D64 46000586 */ mov.s $f22, $f0 -/* A9FAA8 80240D68 0C00A6C9 */ jal clamp_angle -/* A9FAAC 80240D6C 4620A320 */ cvt.s.d $f12, $f20 -/* A9FAB0 80240D70 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A9FAB4 80240D74 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A9FAB8 80240D78 C64C006C */ lwc1 $f12, 0x6c($s2) -/* A9FABC 80240D7C C44E0084 */ lwc1 $f14, 0x84($v0) -/* A9FAC0 80240D80 0C00A70A */ jal get_clamped_angle_diff -/* A9FAC4 80240D84 46000506 */ mov.s $f20, $f0 -/* A9FAC8 80240D88 0C00A6C9 */ jal clamp_angle -/* A9FACC 80240D8C 46000306 */ mov.s $f12, $f0 -/* A9FAD0 80240D90 46000021 */ cvt.d.s $f0, $f0 -/* A9FAD4 80240D94 4638003C */ c.lt.d $f0, $f24 -/* A9FAD8 80240D98 00000000 */ nop -/* A9FADC 80240D9C 45020002 */ bc1fl .L80240DA8 -/* A9FAE0 80240DA0 E614000C */ swc1 $f20, 0xc($s0) -/* A9FAE4 80240DA4 E616000C */ swc1 $f22, 0xc($s0) -.L80240DA8: -/* A9FAE8 80240DA8 C6000018 */ lwc1 $f0, 0x18($s0) -/* A9FAEC 80240DAC 3C018024 */ lui $at, 0x8024 -/* A9FAF0 80240DB0 D4223000 */ ldc1 $f2, 0x3000($at) -/* A9FAF4 80240DB4 46000021 */ cvt.d.s $f0, $f0 -/* A9FAF8 80240DB8 46220002 */ mul.d $f0, $f0, $f2 -/* A9FAFC 80240DBC 00000000 */ nop -/* A9FB00 80240DC0 3C013F66 */ lui $at, 0x3f66 -/* A9FB04 80240DC4 34216666 */ ori $at, $at, 0x6666 -/* A9FB08 80240DC8 44812000 */ mtc1 $at, $f4 -/* A9FB0C 80240DCC 2402001E */ addiu $v0, $zero, 0x1e -/* A9FB10 80240DD0 A602008E */ sh $v0, 0x8e($s0) -/* A9FB14 80240DD4 3C014120 */ lui $at, 0x4120 -/* A9FB18 80240DD8 44811000 */ mtc1 $at, $f2 -/* A9FB1C 80240DDC 24020001 */ addiu $v0, $zero, 1 -/* A9FB20 80240DE0 E6040014 */ swc1 $f4, 0x14($s0) -/* A9FB24 80240DE4 E602001C */ swc1 $f2, 0x1c($s0) -/* A9FB28 80240DE8 46200020 */ cvt.s.d $f0, $f0 -/* A9FB2C 80240DEC E6000018 */ swc1 $f0, 0x18($s0) -/* A9FB30 80240DF0 AE620070 */ sw $v0, 0x70($s3) -.L80240DF4: -/* A9FB34 80240DF4 C6000038 */ lwc1 $f0, 0x38($s0) -/* A9FB38 80240DF8 C602003C */ lwc1 $f2, 0x3c($s0) -/* A9FB3C 80240DFC C6040040 */ lwc1 $f4, 0x40($s0) -/* A9FB40 80240E00 C6060018 */ lwc1 $f6, 0x18($s0) -/* A9FB44 80240E04 0000202D */ daddu $a0, $zero, $zero -/* A9FB48 80240E08 E7A00020 */ swc1 $f0, 0x20($sp) -/* A9FB4C 80240E0C E7A20024 */ swc1 $f2, 0x24($sp) -/* A9FB50 80240E10 E7A40028 */ swc1 $f4, 0x28($sp) -/* A9FB54 80240E14 E7A60010 */ swc1 $f6, 0x10($sp) -/* A9FB58 80240E18 C600000C */ lwc1 $f0, 0xc($s0) -/* A9FB5C 80240E1C 27A50020 */ addiu $a1, $sp, 0x20 -/* A9FB60 80240E20 E7A00014 */ swc1 $f0, 0x14($sp) -/* A9FB64 80240E24 860200A6 */ lh $v0, 0xa6($s0) -/* A9FB68 80240E28 27A60024 */ addiu $a2, $sp, 0x24 -/* A9FB6C 80240E2C 44820000 */ mtc1 $v0, $f0 -/* A9FB70 80240E30 00000000 */ nop -/* A9FB74 80240E34 46800020 */ cvt.s.w $f0, $f0 -/* A9FB78 80240E38 E7A00018 */ swc1 $f0, 0x18($sp) -/* A9FB7C 80240E3C 860200A8 */ lh $v0, 0xa8($s0) -/* A9FB80 80240E40 27A70028 */ addiu $a3, $sp, 0x28 -/* A9FB84 80240E44 44820000 */ mtc1 $v0, $f0 -/* A9FB88 80240E48 00000000 */ nop -/* A9FB8C 80240E4C 46800020 */ cvt.s.w $f0, $f0 -/* A9FB90 80240E50 0C037711 */ jal func_800DDC44 -/* A9FB94 80240E54 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A9FB98 80240E58 54400007 */ bnel $v0, $zero, .L80240E78 -/* A9FB9C 80240E5C 24140001 */ addiu $s4, $zero, 1 -/* A9FBA0 80240E60 8E050018 */ lw $a1, 0x18($s0) -/* A9FBA4 80240E64 8E06000C */ lw $a2, 0xc($s0) -/* A9FBA8 80240E68 0C00EA95 */ jal npc_move_heading -/* A9FBAC 80240E6C 0200202D */ daddu $a0, $s0, $zero -/* A9FBB0 80240E70 0809039F */ j .L80240E7C -/* A9FBB4 80240E74 0000902D */ daddu $s2, $zero, $zero -.L80240E78: -/* A9FBB8 80240E78 0000902D */ daddu $s2, $zero, $zero -.L80240E7C: -/* A9FBBC 80240E7C C600001C */ lwc1 $f0, 0x1c($s0) -/* A9FBC0 80240E80 44801000 */ mtc1 $zero, $f2 -/* A9FBC4 80240E84 44801800 */ mtc1 $zero, $f3 -/* A9FBC8 80240E88 46000021 */ cvt.d.s $f0, $f0 -/* A9FBCC 80240E8C 4622003C */ c.lt.d $f0, $f2 -/* A9FBD0 80240E90 00000000 */ nop -/* A9FBD4 80240E94 45000028 */ bc1f .L80240F38 -/* A9FBD8 80240E98 27A50020 */ addiu $a1, $sp, 0x20 -/* A9FBDC 80240E9C 27A60024 */ addiu $a2, $sp, 0x24 -/* A9FBE0 80240EA0 27A2002C */ addiu $v0, $sp, 0x2c -/* A9FBE4 80240EA4 C602003C */ lwc1 $f2, 0x3c($s0) -/* A9FBE8 80240EA8 C6060038 */ lwc1 $f6, 0x38($s0) -/* A9FBEC 80240EAC 3C01402A */ lui $at, 0x402a -/* A9FBF0 80240EB0 4481A800 */ mtc1 $at, $f21 -/* A9FBF4 80240EB4 4480A000 */ mtc1 $zero, $f20 -/* A9FBF8 80240EB8 460010A1 */ cvt.d.s $f2, $f2 -/* A9FBFC 80240EBC 46341080 */ add.d $f2, $f2, $f20 -/* A9FC00 80240EC0 C600001C */ lwc1 $f0, 0x1c($s0) -/* A9FC04 80240EC4 C6040040 */ lwc1 $f4, 0x40($s0) -/* A9FC08 80240EC8 46000005 */ abs.s $f0, $f0 -/* A9FC0C 80240ECC E7A40028 */ swc1 $f4, 0x28($sp) -/* A9FC10 80240ED0 3C014030 */ lui $at, 0x4030 -/* A9FC14 80240ED4 44812800 */ mtc1 $at, $f5 -/* A9FC18 80240ED8 44802000 */ mtc1 $zero, $f4 -/* A9FC1C 80240EDC 46000021 */ cvt.d.s $f0, $f0 -/* A9FC20 80240EE0 E7A60020 */ swc1 $f6, 0x20($sp) -/* A9FC24 80240EE4 46240000 */ add.d $f0, $f0, $f4 -/* A9FC28 80240EE8 462010A0 */ cvt.s.d $f2, $f2 -/* A9FC2C 80240EEC E7A20024 */ swc1 $f2, 0x24($sp) -/* A9FC30 80240EF0 46200020 */ cvt.s.d $f0, $f0 -/* A9FC34 80240EF4 E7A0002C */ swc1 $f0, 0x2c($sp) -/* A9FC38 80240EF8 AFA20010 */ sw $v0, 0x10($sp) -/* A9FC3C 80240EFC 8E040080 */ lw $a0, 0x80($s0) -/* A9FC40 80240F00 0C0372DF */ jal func_800DCB7C -/* A9FC44 80240F04 27A70028 */ addiu $a3, $sp, 0x28 -/* A9FC48 80240F08 1040000B */ beqz $v0, .L80240F38 -/* A9FC4C 80240F0C 00000000 */ nop -/* A9FC50 80240F10 C600001C */ lwc1 $f0, 0x1c($s0) -/* A9FC54 80240F14 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* A9FC58 80240F18 46000005 */ abs.s $f0, $f0 -/* A9FC5C 80240F1C 46000021 */ cvt.d.s $f0, $f0 -/* A9FC60 80240F20 46340000 */ add.d $f0, $f0, $f20 -/* A9FC64 80240F24 460010A1 */ cvt.d.s $f2, $f2 -/* A9FC68 80240F28 4620103E */ c.le.d $f2, $f0 -/* A9FC6C 80240F2C 00000000 */ nop -/* A9FC70 80240F30 45030001 */ bc1tl .L80240F38 -/* A9FC74 80240F34 24120001 */ addiu $s2, $zero, 1 -.L80240F38: -/* A9FC78 80240F38 56400008 */ bnel $s2, $zero, .L80240F5C -/* A9FC7C 80240F3C 2414000A */ addiu $s4, $zero, 0xa -/* A9FC80 80240F40 C604003C */ lwc1 $f4, 0x3c($s0) -/* A9FC84 80240F44 C600001C */ lwc1 $f0, 0x1c($s0) -/* A9FC88 80240F48 46002100 */ add.s $f4, $f4, $f0 -/* A9FC8C 80240F4C C6020014 */ lwc1 $f2, 0x14($s0) -/* A9FC90 80240F50 46020001 */ sub.s $f0, $f0, $f2 -/* A9FC94 80240F54 E604003C */ swc1 $f4, 0x3c($s0) -/* A9FC98 80240F58 E600001C */ swc1 $f0, 0x1c($s0) -.L80240F5C: -/* A9FC9C 80240F5C 9602008E */ lhu $v0, 0x8e($s0) -/* A9FCA0 80240F60 2442FFFF */ addiu $v0, $v0, -1 -/* A9FCA4 80240F64 A602008E */ sh $v0, 0x8e($s0) -/* A9FCA8 80240F68 00021400 */ sll $v0, $v0, 0x10 -/* A9FCAC 80240F6C 58400001 */ blezl $v0, .L80240F74 -/* A9FCB0 80240F70 2414000B */ addiu $s4, $zero, 0xb -.L80240F74: -/* A9FCB4 80240F74 12800024 */ beqz $s4, .L80241008 -/* A9FCB8 80240F78 00000000 */ nop -/* A9FCBC 80240F7C AFA00010 */ sw $zero, 0x10($sp) -/* A9FCC0 80240F80 AFA00014 */ sw $zero, 0x14($sp) -/* A9FCC4 80240F84 8E050038 */ lw $a1, 0x38($s0) -/* A9FCC8 80240F88 8E06003C */ lw $a2, 0x3c($s0) -/* A9FCCC 80240F8C 8E070040 */ lw $a3, 0x40($s0) -/* A9FCD0 80240F90 0C01BECC */ jal fx_walk_normal -/* A9FCD4 80240F94 24040002 */ addiu $a0, $zero, 2 -/* A9FCD8 80240F98 3C01C47A */ lui $at, 0xc47a -/* A9FCDC 80240F9C 44810000 */ mtc1 $at, $f0 -/* A9FCE0 80240FA0 AE20006C */ sw $zero, 0x6c($s1) -/* A9FCE4 80240FA4 8E020000 */ lw $v0, ($s0) -/* A9FCE8 80240FA8 0200202D */ daddu $a0, $s0, $zero -/* A9FCEC 80240FAC AE000038 */ sw $zero, 0x38($s0) -/* A9FCF0 80240FB0 AE000040 */ sw $zero, 0x40($s0) -/* A9FCF4 80240FB4 34420002 */ ori $v0, $v0, 2 -/* A9FCF8 80240FB8 E600003C */ swc1 $f0, 0x3c($s0) -/* A9FCFC 80240FBC 0C00EAFF */ jal disable_npc_shadow -/* A9FD00 80240FC0 AE020000 */ sw $v0, ($s0) -/* A9FD04 80240FC4 0260202D */ daddu $a0, $s3, $zero -/* A9FD08 80240FC8 3C05FE36 */ lui $a1, 0xfe36 -/* A9FD0C 80240FCC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A9FD10 80240FD0 24060001 */ addiu $a2, $zero, 1 -/* A9FD14 80240FD4 8E020000 */ lw $v0, ($s0) -/* A9FD18 80240FD8 2403F7FF */ addiu $v1, $zero, -0x801 -/* A9FD1C 80240FDC 00431024 */ and $v0, $v0, $v1 -/* A9FD20 80240FE0 AE020000 */ sw $v0, ($s0) -/* A9FD24 80240FE4 8E220000 */ lw $v0, ($s1) -/* A9FD28 80240FE8 3C031F00 */ lui $v1, 0x1f00 -/* A9FD2C 80240FEC 00431025 */ or $v0, $v0, $v1 -/* A9FD30 80240FF0 AE220000 */ sw $v0, ($s1) -/* A9FD34 80240FF4 AC800070 */ sw $zero, 0x70($a0) -.L80240FF8: -/* A9FD38 80240FF8 0C0B2026 */ jal set_variable -/* A9FD3C 80240FFC 00000000 */ nop -/* A9FD40 80241000 0809040E */ j .L80241038 -/* A9FD44 80241004 24020002 */ addiu $v0, $zero, 2 -.L80241008: -/* A9FD48 80241008 8E220070 */ lw $v0, 0x70($s1) -/* A9FD4C 8024100C 30420001 */ andi $v0, $v0, 1 -/* A9FD50 80241010 10400009 */ beqz $v0, .L80241038 -/* A9FD54 80241014 0000102D */ daddu $v0, $zero, $zero -/* A9FD58 80241018 C600004C */ lwc1 $f0, 0x4c($s0) -/* A9FD5C 8024101C 3C01404E */ lui $at, 0x404e -/* A9FD60 80241020 44811800 */ mtc1 $at, $f3 -/* A9FD64 80241024 44801000 */ mtc1 $zero, $f2 -/* A9FD68 80241028 46000021 */ cvt.d.s $f0, $f0 -/* A9FD6C 8024102C 46220000 */ add.d $f0, $f0, $f2 -/* A9FD70 80241030 46200020 */ cvt.s.d $f0, $f0 -/* A9FD74 80241034 E600004C */ swc1 $f0, 0x4c($s0) -.L80241038: -/* A9FD78 80241038 8FBF0044 */ lw $ra, 0x44($sp) -/* A9FD7C 8024103C 8FB40040 */ lw $s4, 0x40($sp) -/* A9FD80 80241040 8FB3003C */ lw $s3, 0x3c($sp) -/* A9FD84 80241044 8FB20038 */ lw $s2, 0x38($sp) -/* A9FD88 80241048 8FB10034 */ lw $s1, 0x34($sp) -/* A9FD8C 8024104C 8FB00030 */ lw $s0, 0x30($sp) -/* A9FD90 80241050 D7B80058 */ ldc1 $f24, 0x58($sp) -/* A9FD94 80241054 D7B60050 */ ldc1 $f22, 0x50($sp) -/* A9FD98 80241058 D7B40048 */ ldc1 $f20, 0x48($sp) -/* A9FD9C 8024105C 03E00008 */ jr $ra -/* A9FDA0 80241060 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/func_80241064_A9ED40.s b/asm/nonmatchings/world/area_kpa/kpa_115/func_80241064_A9ED40.s deleted file mode 100644 index 28db87cfd0..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/func_80241064_A9ED40.s +++ /dev/null @@ -1,213 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241064_A9FDA4 -/* A9FDA4 80241064 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A9FDA8 80241068 AFB3003C */ sw $s3, 0x3c($sp) -/* A9FDAC 8024106C 0080982D */ daddu $s3, $a0, $zero -/* A9FDB0 80241070 AFBF0048 */ sw $ra, 0x48($sp) -/* A9FDB4 80241074 AFB50044 */ sw $s5, 0x44($sp) -/* A9FDB8 80241078 AFB40040 */ sw $s4, 0x40($sp) -/* A9FDBC 8024107C AFB20038 */ sw $s2, 0x38($sp) -/* A9FDC0 80241080 AFB10034 */ sw $s1, 0x34($sp) -/* A9FDC4 80241084 AFB00030 */ sw $s0, 0x30($sp) -/* A9FDC8 80241088 8E720148 */ lw $s2, 0x148($s3) -/* A9FDCC 8024108C 86440008 */ lh $a0, 8($s2) -/* A9FDD0 80241090 8E70000C */ lw $s0, 0xc($s3) -/* A9FDD4 80241094 0C00EABB */ jal get_npc_unsafe -/* A9FDD8 80241098 00A0882D */ daddu $s1, $a1, $zero -/* A9FDDC 8024109C 0260202D */ daddu $a0, $s3, $zero -/* A9FDE0 802410A0 8E050000 */ lw $a1, ($s0) -/* A9FDE4 802410A4 0C0B1EAF */ jal get_variable -/* A9FDE8 802410A8 0040A02D */ daddu $s4, $v0, $zero -/* A9FDEC 802410AC AFA00010 */ sw $zero, 0x10($sp) -/* A9FDF0 802410B0 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9FDF4 802410B4 8C630030 */ lw $v1, 0x30($v1) -/* A9FDF8 802410B8 AFA30014 */ sw $v1, 0x14($sp) -/* A9FDFC 802410BC 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9FE00 802410C0 8C63001C */ lw $v1, 0x1c($v1) -/* A9FE04 802410C4 AFA30018 */ sw $v1, 0x18($sp) -/* A9FE08 802410C8 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9FE0C 802410CC 8C630024 */ lw $v1, 0x24($v1) -/* A9FE10 802410D0 AFA3001C */ sw $v1, 0x1c($sp) -/* A9FE14 802410D4 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9FE18 802410D8 8C630028 */ lw $v1, 0x28($v1) -/* A9FE1C 802410DC 27B50010 */ addiu $s5, $sp, 0x10 -/* A9FE20 802410E0 AFA30020 */ sw $v1, 0x20($sp) -/* A9FE24 802410E4 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9FE28 802410E8 3C014220 */ lui $at, 0x4220 -/* A9FE2C 802410EC 44810000 */ mtc1 $at, $f0 -/* A9FE30 802410F0 8C63002C */ lw $v1, 0x2c($v1) -/* A9FE34 802410F4 0040802D */ daddu $s0, $v0, $zero -/* A9FE38 802410F8 E7A00028 */ swc1 $f0, 0x28($sp) -/* A9FE3C 802410FC A7A0002C */ sh $zero, 0x2c($sp) -/* A9FE40 80241100 16200005 */ bnez $s1, .L80241118 -/* A9FE44 80241104 AFA30024 */ sw $v1, 0x24($sp) -/* A9FE48 80241108 8E4200B0 */ lw $v0, 0xb0($s2) -/* A9FE4C 8024110C 30420004 */ andi $v0, $v0, 4 -/* A9FE50 80241110 1040002F */ beqz $v0, .L802411D0 -/* A9FE54 80241114 00000000 */ nop -.L80241118: -/* A9FE58 80241118 2404F7FF */ addiu $a0, $zero, -0x801 -/* A9FE5C 8024111C AE600070 */ sw $zero, 0x70($s3) -/* A9FE60 80241120 A680008E */ sh $zero, 0x8e($s4) -/* A9FE64 80241124 8E4200CC */ lw $v0, 0xcc($s2) -/* A9FE68 80241128 8E830000 */ lw $v1, ($s4) -/* A9FE6C 8024112C 8C420000 */ lw $v0, ($v0) -/* A9FE70 80241130 00641824 */ and $v1, $v1, $a0 -/* A9FE74 80241134 AE830000 */ sw $v1, ($s4) -/* A9FE78 80241138 AE820028 */ sw $v0, 0x28($s4) -/* A9FE7C 8024113C 8E4200D0 */ lw $v0, 0xd0($s2) -/* A9FE80 80241140 8C420034 */ lw $v0, 0x34($v0) -/* A9FE84 80241144 54400005 */ bnel $v0, $zero, .L8024115C -/* A9FE88 80241148 2402FDFF */ addiu $v0, $zero, -0x201 -/* A9FE8C 8024114C 34620200 */ ori $v0, $v1, 0x200 -/* A9FE90 80241150 2403FFF7 */ addiu $v1, $zero, -9 -/* A9FE94 80241154 08090459 */ j .L80241164 -/* A9FE98 80241158 00431024 */ and $v0, $v0, $v1 -.L8024115C: -/* A9FE9C 8024115C 00621024 */ and $v0, $v1, $v0 -/* A9FEA0 80241160 34420008 */ ori $v0, $v0, 8 -.L80241164: -/* A9FEA4 80241164 AE820000 */ sw $v0, ($s4) -/* A9FEA8 80241168 8E4200B0 */ lw $v0, 0xb0($s2) -/* A9FEAC 8024116C 30420004 */ andi $v0, $v0, 4 -/* A9FEB0 80241170 10400008 */ beqz $v0, .L80241194 -/* A9FEB4 80241174 24020063 */ addiu $v0, $zero, 0x63 -/* A9FEB8 80241178 AE620070 */ sw $v0, 0x70($s3) -/* A9FEBC 8024117C AE600074 */ sw $zero, 0x74($s3) -/* A9FEC0 80241180 8E4200B0 */ lw $v0, 0xb0($s2) -/* A9FEC4 80241184 2403FFFB */ addiu $v1, $zero, -5 -/* A9FEC8 80241188 00431024 */ and $v0, $v0, $v1 -/* A9FECC 8024118C 0809046B */ j .L802411AC -/* A9FED0 80241190 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241194: -/* A9FED4 80241194 8E420000 */ lw $v0, ($s2) -/* A9FED8 80241198 3C034000 */ lui $v1, 0x4000 -/* A9FEDC 8024119C 00431024 */ and $v0, $v0, $v1 -/* A9FEE0 802411A0 10400002 */ beqz $v0, .L802411AC -/* A9FEE4 802411A4 2402000C */ addiu $v0, $zero, 0xc -/* A9FEE8 802411A8 AE620070 */ sw $v0, 0x70($s3) -.L802411AC: -/* A9FEEC 802411AC 3C05BFFF */ lui $a1, 0xbfff -/* A9FEF0 802411B0 34A5FFFF */ ori $a1, $a1, 0xffff -/* A9FEF4 802411B4 2404FFFB */ addiu $a0, $zero, -5 -/* A9FEF8 802411B8 8E4200B0 */ lw $v0, 0xb0($s2) -/* A9FEFC 802411BC 8E430000 */ lw $v1, ($s2) -/* A9FF00 802411C0 00441024 */ and $v0, $v0, $a0 -/* A9FF04 802411C4 00651824 */ and $v1, $v1, $a1 -/* A9FF08 802411C8 AE4200B0 */ sw $v0, 0xb0($s2) -/* A9FF0C 802411CC AE430000 */ sw $v1, ($s2) -.L802411D0: -/* A9FF10 802411D0 8E630070 */ lw $v1, 0x70($s3) -/* A9FF14 802411D4 2C620064 */ sltiu $v0, $v1, 0x64 -/* A9FF18 802411D8 10400060 */ beqz $v0, .L8024135C -/* A9FF1C 802411DC 00031080 */ sll $v0, $v1, 2 -/* A9FF20 802411E0 3C018024 */ lui $at, 0x8024 -/* A9FF24 802411E4 00220821 */ addu $at, $at, $v0 -/* A9FF28 802411E8 8C223008 */ lw $v0, 0x3008($at) -/* A9FF2C 802411EC 00400008 */ jr $v0 -/* A9FF30 802411F0 00000000 */ nop -/* A9FF34 802411F4 0260202D */ daddu $a0, $s3, $zero -/* A9FF38 802411F8 0200282D */ daddu $a1, $s0, $zero -/* A9FF3C 802411FC 0C012568 */ jal func_800495A0 -/* A9FF40 80241200 02A0302D */ daddu $a2, $s5, $zero -/* A9FF44 80241204 0260202D */ daddu $a0, $s3, $zero -/* A9FF48 80241208 0200282D */ daddu $a1, $s0, $zero -/* A9FF4C 8024120C 0C0125AE */ jal func_800496B8 -/* A9FF50 80241210 02A0302D */ daddu $a2, $s5, $zero -/* A9FF54 80241214 080904D7 */ j .L8024135C -/* A9FF58 80241218 00000000 */ nop -/* A9FF5C 8024121C 0260202D */ daddu $a0, $s3, $zero -/* A9FF60 80241220 0200282D */ daddu $a1, $s0, $zero -/* A9FF64 80241224 0C0126D1 */ jal func_80049B44 -/* A9FF68 80241228 02A0302D */ daddu $a2, $s5, $zero -/* A9FF6C 8024122C 0260202D */ daddu $a0, $s3, $zero -/* A9FF70 80241230 0200282D */ daddu $a1, $s0, $zero -/* A9FF74 80241234 0C012701 */ jal func_80049C04 -/* A9FF78 80241238 02A0302D */ daddu $a2, $s5, $zero -/* A9FF7C 8024123C 080904D7 */ j .L8024135C -/* A9FF80 80241240 00000000 */ nop -/* A9FF84 80241244 0260202D */ daddu $a0, $s3, $zero -/* A9FF88 80241248 0200282D */ daddu $a1, $s0, $zero -/* A9FF8C 8024124C 0C01278F */ jal func_80049E3C -/* A9FF90 80241250 02A0302D */ daddu $a2, $s5, $zero -/* A9FF94 80241254 0260202D */ daddu $a0, $s3, $zero -/* A9FF98 80241258 0200282D */ daddu $a1, $s0, $zero -/* A9FF9C 8024125C 0C0127B3 */ jal func_80049ECC -/* A9FFA0 80241260 02A0302D */ daddu $a2, $s5, $zero -/* A9FFA4 80241264 080904D7 */ j .L8024135C -/* A9FFA8 80241268 00000000 */ nop -/* A9FFAC 8024126C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A9FFB0 80241270 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A9FFB4 80241274 C68C0038 */ lwc1 $f12, 0x38($s4) -/* A9FFB8 80241278 C68E0040 */ lwc1 $f14, 0x40($s4) -/* A9FFBC 8024127C 8C460028 */ lw $a2, 0x28($v0) -/* A9FFC0 80241280 0C00A7B5 */ jal dist2D -/* A9FFC4 80241284 8C470030 */ lw $a3, 0x30($v0) -/* A9FFC8 80241288 8E42006C */ lw $v0, 0x6c($s2) -/* A9FFCC 8024128C 10400008 */ beqz $v0, .L802412B0 -/* A9FFD0 80241290 46000086 */ mov.s $f2, $f0 -/* A9FFD4 80241294 44820000 */ mtc1 $v0, $f0 -/* A9FFD8 80241298 00000000 */ nop -/* A9FFDC 8024129C 46800020 */ cvt.s.w $f0, $f0 -/* A9FFE0 802412A0 4602003C */ c.lt.s $f0, $f2 -/* A9FFE4 802412A4 00000000 */ nop -/* A9FFE8 802412A8 4500000B */ bc1f .L802412D8 -/* A9FFEC 802412AC 0260202D */ daddu $a0, $s3, $zero -.L802412B0: -/* A9FFF0 802412B0 0260202D */ daddu $a0, $s3, $zero -/* A9FFF4 802412B4 8E050024 */ lw $a1, 0x24($s0) -/* A9FFF8 802412B8 8E060028 */ lw $a2, 0x28($s0) -/* A9FFFC 802412BC 0C0900D8 */ jal func_80240360 -/* AA0000 802412C0 02A0382D */ daddu $a3, $s5, $zero -/* AA0004 802412C4 8E630070 */ lw $v1, 0x70($s3) -/* AA0008 802412C8 2402000C */ addiu $v0, $zero, 0xc -/* AA000C 802412CC 14620023 */ bne $v1, $v0, .L8024135C -/* AA0010 802412D0 00000000 */ nop -/* AA0014 802412D4 0260202D */ daddu $a0, $s3, $zero -.L802412D8: -/* AA0018 802412D8 0200282D */ daddu $a1, $s0, $zero -/* AA001C 802412DC 0C0127DF */ jal func_80049F7C -/* AA0020 802412E0 02A0302D */ daddu $a2, $s5, $zero -/* AA0024 802412E4 0260202D */ daddu $a0, $s3, $zero -/* AA0028 802412E8 0200282D */ daddu $a1, $s0, $zero -/* AA002C 802412EC 0C012849 */ jal func_8004A124 -/* AA0030 802412F0 02A0302D */ daddu $a2, $s5, $zero -/* AA0034 802412F4 080904D7 */ j .L8024135C -/* AA0038 802412F8 00000000 */ nop -/* AA003C 802412FC 0260202D */ daddu $a0, $s3, $zero -/* AA0040 80241300 0200282D */ daddu $a1, $s0, $zero -/* AA0044 80241304 0C0128FA */ jal func_8004A3E8 -/* AA0048 80241308 02A0302D */ daddu $a2, $s5, $zero -/* AA004C 8024130C 080904D7 */ j .L8024135C -/* AA0050 80241310 00000000 */ nop -/* AA0054 80241314 0C090129 */ jal func_802404A4 -/* AA0058 80241318 0260202D */ daddu $a0, $s3, $zero -/* AA005C 8024131C 080904D7 */ j .L8024135C -/* AA0060 80241320 00000000 */ nop -/* AA0064 80241324 0C090169 */ jal func_802405A4 -/* AA0068 80241328 0260202D */ daddu $a0, $s3, $zero -/* AA006C 8024132C 080904D7 */ j .L8024135C -/* AA0070 80241330 00000000 */ nop -/* AA0074 80241334 0C09017A */ jal func_802405E8 -/* AA0078 80241338 0260202D */ daddu $a0, $s3, $zero -/* AA007C 8024133C 080904D7 */ j .L8024135C -/* AA0080 80241340 00000000 */ nop -/* AA0084 80241344 0C0901A2 */ jal func_80240688 -/* AA0088 80241348 0260202D */ daddu $a0, $s3, $zero -/* AA008C 8024134C 080904D7 */ j .L8024135C -/* AA0090 80241350 00000000 */ nop -/* AA0094 80241354 0C0129CF */ jal func_8004A73C -/* AA0098 80241358 0260202D */ daddu $a0, $s3, $zero -.L8024135C: -/* AA009C 8024135C 8FBF0048 */ lw $ra, 0x48($sp) -/* AA00A0 80241360 8FB50044 */ lw $s5, 0x44($sp) -/* AA00A4 80241364 8FB40040 */ lw $s4, 0x40($sp) -/* AA00A8 80241368 8FB3003C */ lw $s3, 0x3c($sp) -/* AA00AC 8024136C 8FB20038 */ lw $s2, 0x38($sp) -/* AA00B0 80241370 8FB10034 */ lw $s1, 0x34($sp) -/* AA00B4 80241374 8FB00030 */ lw $s0, 0x30($sp) -/* AA00B8 80241378 0000102D */ daddu $v0, $zero, $zero -/* AA00BC 8024137C 03E00008 */ jr $ra -/* AA00C0 80241380 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/func_80241384_A9ED40.s b/asm/nonmatchings/world/area_kpa/kpa_115/func_80241384_A9ED40.s deleted file mode 100644 index e4c0d0d364..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/func_80241384_A9ED40.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241384_AA00C4 -/* AA00C4 80241384 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA00C8 80241388 3C05FE36 */ lui $a1, 0xfe36 -/* AA00CC 8024138C AFBF0010 */ sw $ra, 0x10($sp) -/* AA00D0 80241390 8C820148 */ lw $v0, 0x148($a0) -/* AA00D4 80241394 3C06800B */ lui $a2, 0x800b -/* AA00D8 80241398 8CC60F9C */ lw $a2, 0xf9c($a2) -/* AA00DC 8024139C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* AA00E0 802413A0 00C23026 */ xor $a2, $a2, $v0 -/* AA00E4 802413A4 0C0B2026 */ jal set_variable -/* AA00E8 802413A8 2CC60001 */ sltiu $a2, $a2, 1 -/* AA00EC 802413AC 8FBF0010 */ lw $ra, 0x10($sp) -/* AA00F0 802413B0 24020002 */ addiu $v0, $zero, 2 -/* AA00F4 802413B4 03E00008 */ jr $ra -/* AA00F8 802413B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* AA00FC 802413BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_12/func_80240040_A54950.s b/asm/nonmatchings/world/area_kpa/kpa_12/func_80240040_A54950.s deleted file mode 100644 index e1181d672a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_12/func_80240040_A54950.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_A54990 -/* A54990 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A54994 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* A54998 80240048 0080802D */ daddu $s0, $a0, $zero -/* A5499C 8024004C AFBF0014 */ sw $ra, 0x14($sp) -/* A549A0 80240050 8E0300A8 */ lw $v1, 0xa8($s0) -/* A549A4 80240054 8E020088 */ lw $v0, 0x88($s0) -/* A549A8 80240058 00621821 */ addu $v1, $v1, $v0 -/* A549AC 8024005C 04610004 */ bgez $v1, .L80240070 -/* A549B0 80240060 AE0300A8 */ sw $v1, 0xa8($s0) -/* A549B4 80240064 3C020002 */ lui $v0, 2 -/* A549B8 80240068 08090020 */ j .L80240080 -/* A549BC 8024006C 00621021 */ addu $v0, $v1, $v0 -.L80240070: -/* A549C0 80240070 3C040002 */ lui $a0, 2 -/* A549C4 80240074 0083102A */ slt $v0, $a0, $v1 -/* A549C8 80240078 10400002 */ beqz $v0, .L80240084 -/* A549CC 8024007C 00641023 */ subu $v0, $v1, $a0 -.L80240080: -/* A549D0 80240080 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240084: -/* A549D4 80240084 8E0300AC */ lw $v1, 0xac($s0) -/* A549D8 80240088 8E02008C */ lw $v0, 0x8c($s0) -/* A549DC 8024008C 00621821 */ addu $v1, $v1, $v0 -/* A549E0 80240090 04610004 */ bgez $v1, .L802400A4 -/* A549E4 80240094 AE0300AC */ sw $v1, 0xac($s0) -/* A549E8 80240098 3C020002 */ lui $v0, 2 -/* A549EC 8024009C 0809002D */ j .L802400B4 -/* A549F0 802400A0 00621021 */ addu $v0, $v1, $v0 -.L802400A4: -/* A549F4 802400A4 3C040002 */ lui $a0, 2 -/* A549F8 802400A8 0083102A */ slt $v0, $a0, $v1 -/* A549FC 802400AC 10400002 */ beqz $v0, .L802400B8 -/* A54A00 802400B0 00641023 */ subu $v0, $v1, $a0 -.L802400B4: -/* A54A04 802400B4 AE0200AC */ sw $v0, 0xac($s0) -.L802400B8: -/* A54A08 802400B8 8E0300B0 */ lw $v1, 0xb0($s0) -/* A54A0C 802400BC 8E020090 */ lw $v0, 0x90($s0) -/* A54A10 802400C0 00621821 */ addu $v1, $v1, $v0 -/* A54A14 802400C4 04610004 */ bgez $v1, .L802400D8 -/* A54A18 802400C8 AE0300B0 */ sw $v1, 0xb0($s0) -/* A54A1C 802400CC 3C020002 */ lui $v0, 2 -/* A54A20 802400D0 0809003A */ j .L802400E8 -/* A54A24 802400D4 00621021 */ addu $v0, $v1, $v0 -.L802400D8: -/* A54A28 802400D8 3C040002 */ lui $a0, 2 -/* A54A2C 802400DC 0083102A */ slt $v0, $a0, $v1 -/* A54A30 802400E0 10400002 */ beqz $v0, .L802400EC -/* A54A34 802400E4 00641023 */ subu $v0, $v1, $a0 -.L802400E8: -/* A54A38 802400E8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400EC: -/* A54A3C 802400EC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A54A40 802400F0 8E020094 */ lw $v0, 0x94($s0) -/* A54A44 802400F4 00621821 */ addu $v1, $v1, $v0 -/* A54A48 802400F8 04610004 */ bgez $v1, .L8024010C -/* A54A4C 802400FC AE0300B4 */ sw $v1, 0xb4($s0) -/* A54A50 80240100 3C020002 */ lui $v0, 2 -/* A54A54 80240104 08090047 */ j .L8024011C -/* A54A58 80240108 00621021 */ addu $v0, $v1, $v0 -.L8024010C: -/* A54A5C 8024010C 3C040002 */ lui $a0, 2 -/* A54A60 80240110 0083102A */ slt $v0, $a0, $v1 -/* A54A64 80240114 10400002 */ beqz $v0, .L80240120 -/* A54A68 80240118 00641023 */ subu $v0, $v1, $a0 -.L8024011C: -/* A54A6C 8024011C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240120: -/* A54A70 80240120 8E040084 */ lw $a0, 0x84($s0) -/* A54A74 80240124 0C046F07 */ jal set_main_pan_u -/* A54A78 80240128 8E0500A8 */ lw $a1, 0xa8($s0) -/* A54A7C 8024012C 8E040084 */ lw $a0, 0x84($s0) -/* A54A80 80240130 0C046F0D */ jal set_main_pan_v -/* A54A84 80240134 8E0500AC */ lw $a1, 0xac($s0) -/* A54A88 80240138 8E040084 */ lw $a0, 0x84($s0) -/* A54A8C 8024013C 0C046F13 */ jal set_aux_pan_u -/* A54A90 80240140 8E0500B0 */ lw $a1, 0xb0($s0) -/* A54A94 80240144 8E040084 */ lw $a0, 0x84($s0) -/* A54A98 80240148 0C046F19 */ jal set_aux_pan_v -/* A54A9C 8024014C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A54AA0 80240150 8FBF0014 */ lw $ra, 0x14($sp) -/* A54AA4 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* A54AA8 80240158 0000102D */ daddu $v0, $zero, $zero -/* A54AAC 8024015C 03E00008 */ jr $ra -/* A54AB0 80240160 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_12/func_80240164_A54950.s b/asm/nonmatchings/world/area_kpa/kpa_12/func_80240164_A54950.s deleted file mode 100644 index 81840103b5..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_12/func_80240164_A54950.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240164_A54AB4 -/* A54AB4 80240164 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A54AB8 80240168 AFB00010 */ sw $s0, 0x10($sp) -/* A54ABC 8024016C 0080802D */ daddu $s0, $a0, $zero -/* A54AC0 80240170 10A00005 */ beqz $a1, .L80240188 -/* A54AC4 80240174 AFBF0014 */ sw $ra, 0x14($sp) -/* A54AC8 80240178 AE000070 */ sw $zero, 0x70($s0) -/* A54ACC 8024017C AE000074 */ sw $zero, 0x74($s0) -/* A54AD0 80240180 AE000078 */ sw $zero, 0x78($s0) -/* A54AD4 80240184 AE00007C */ sw $zero, 0x7c($s0) -.L80240188: -/* A54AD8 80240188 8E020070 */ lw $v0, 0x70($s0) -/* A54ADC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A54AE0 80240190 00000000 */ nop -/* A54AE4 80240194 8E0300A8 */ lw $v1, 0xa8($s0) -/* A54AE8 80240198 8E020088 */ lw $v0, 0x88($s0) -/* A54AEC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A54AF0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A54AF4 802401A4 AE0300A8 */ sw $v1, 0xa8($s0) -/* A54AF8 802401A8 3C020002 */ lui $v0, 2 -/* A54AFC 802401AC 08090071 */ j .L802401C4 -/* A54B00 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A54B04 802401B4 3C040002 */ lui $a0, 2 -/* A54B08 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A54B0C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A54B10 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A54B14 802401C4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401C8: -/* A54B18 802401C8 8E020074 */ lw $v0, 0x74($s0) -/* A54B1C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A54B20 802401D0 00000000 */ nop -/* A54B24 802401D4 8E0300AC */ lw $v1, 0xac($s0) -/* A54B28 802401D8 8E02008C */ lw $v0, 0x8c($s0) -/* A54B2C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A54B30 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A54B34 802401E4 AE0300AC */ sw $v1, 0xac($s0) -/* A54B38 802401E8 3C020002 */ lui $v0, 2 -/* A54B3C 802401EC 08090081 */ j .L80240204 -/* A54B40 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A54B44 802401F4 3C040002 */ lui $a0, 2 -/* A54B48 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A54B4C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A54B50 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A54B54 80240204 AE0200AC */ sw $v0, 0xac($s0) -.L80240208: -/* A54B58 80240208 8E020078 */ lw $v0, 0x78($s0) -/* A54B5C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A54B60 80240210 00000000 */ nop -/* A54B64 80240214 8E0300B0 */ lw $v1, 0xb0($s0) -/* A54B68 80240218 8E020090 */ lw $v0, 0x90($s0) -/* A54B6C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A54B70 80240220 04610004 */ bgez $v1, .L80240234 -/* A54B74 80240224 AE0300B0 */ sw $v1, 0xb0($s0) -/* A54B78 80240228 3C020002 */ lui $v0, 2 -/* A54B7C 8024022C 08090091 */ j .L80240244 -/* A54B80 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A54B84 80240234 3C040002 */ lui $a0, 2 -/* A54B88 80240238 0083102A */ slt $v0, $a0, $v1 -/* A54B8C 8024023C 10400002 */ beqz $v0, .L80240248 -/* A54B90 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A54B94 80240244 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240248: -/* A54B98 80240248 8E02007C */ lw $v0, 0x7c($s0) -/* A54B9C 8024024C 1440000E */ bnez $v0, .L80240288 -/* A54BA0 80240250 00000000 */ nop -/* A54BA4 80240254 8E0300B4 */ lw $v1, 0xb4($s0) -/* A54BA8 80240258 8E020094 */ lw $v0, 0x94($s0) -/* A54BAC 8024025C 00621821 */ addu $v1, $v1, $v0 -/* A54BB0 80240260 04610004 */ bgez $v1, .L80240274 -/* A54BB4 80240264 AE0300B4 */ sw $v1, 0xb4($s0) -/* A54BB8 80240268 3C020002 */ lui $v0, 2 -/* A54BBC 8024026C 080900A1 */ j .L80240284 -/* A54BC0 80240270 00621021 */ addu $v0, $v1, $v0 -.L80240274: -/* A54BC4 80240274 3C040002 */ lui $a0, 2 -/* A54BC8 80240278 0083102A */ slt $v0, $a0, $v1 -/* A54BCC 8024027C 10400002 */ beqz $v0, .L80240288 -/* A54BD0 80240280 00641023 */ subu $v0, $v1, $a0 -.L80240284: -/* A54BD4 80240284 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240288: -/* A54BD8 80240288 8E040084 */ lw $a0, 0x84($s0) -/* A54BDC 8024028C 0C046F07 */ jal set_main_pan_u -/* A54BE0 80240290 8E0500A8 */ lw $a1, 0xa8($s0) -/* A54BE4 80240294 8E040084 */ lw $a0, 0x84($s0) -/* A54BE8 80240298 0C046F0D */ jal set_main_pan_v -/* A54BEC 8024029C 8E0500AC */ lw $a1, 0xac($s0) -/* A54BF0 802402A0 8E040084 */ lw $a0, 0x84($s0) -/* A54BF4 802402A4 0C046F13 */ jal set_aux_pan_u -/* A54BF8 802402A8 8E0500B0 */ lw $a1, 0xb0($s0) -/* A54BFC 802402AC 8E040084 */ lw $a0, 0x84($s0) -/* A54C00 802402B0 0C046F19 */ jal set_aux_pan_v -/* A54C04 802402B4 8E0500B4 */ lw $a1, 0xb4($s0) -/* A54C08 802402B8 8E020070 */ lw $v0, 0x70($s0) -/* A54C0C 802402BC 8E030078 */ lw $v1, 0x78($s0) -/* A54C10 802402C0 8E040098 */ lw $a0, 0x98($s0) -/* A54C14 802402C4 24420001 */ addiu $v0, $v0, 1 -/* A54C18 802402C8 AE020070 */ sw $v0, 0x70($s0) -/* A54C1C 802402CC 8E020074 */ lw $v0, 0x74($s0) -/* A54C20 802402D0 24630001 */ addiu $v1, $v1, 1 -/* A54C24 802402D4 AE030078 */ sw $v1, 0x78($s0) -/* A54C28 802402D8 8E030070 */ lw $v1, 0x70($s0) -/* A54C2C 802402DC 24420001 */ addiu $v0, $v0, 1 -/* A54C30 802402E0 AE020074 */ sw $v0, 0x74($s0) -/* A54C34 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A54C38 802402E8 0064182A */ slt $v1, $v1, $a0 -/* A54C3C 802402EC 24420001 */ addiu $v0, $v0, 1 -/* A54C40 802402F0 14600002 */ bnez $v1, .L802402FC -/* A54C44 802402F4 AE02007C */ sw $v0, 0x7c($s0) -/* A54C48 802402F8 AE000070 */ sw $zero, 0x70($s0) -.L802402FC: -/* A54C4C 802402FC 8E020074 */ lw $v0, 0x74($s0) -/* A54C50 80240300 8E03009C */ lw $v1, 0x9c($s0) -/* A54C54 80240304 0043102A */ slt $v0, $v0, $v1 -/* A54C58 80240308 50400001 */ beql $v0, $zero, .L80240310 -/* A54C5C 8024030C AE000074 */ sw $zero, 0x74($s0) -.L80240310: -/* A54C60 80240310 8E020078 */ lw $v0, 0x78($s0) -/* A54C64 80240314 8E0300A0 */ lw $v1, 0xa0($s0) -/* A54C68 80240318 0043102A */ slt $v0, $v0, $v1 -/* A54C6C 8024031C 50400001 */ beql $v0, $zero, .L80240324 -/* A54C70 80240320 AE000078 */ sw $zero, 0x78($s0) -.L80240324: -/* A54C74 80240324 8E02007C */ lw $v0, 0x7c($s0) -/* A54C78 80240328 8E0300A4 */ lw $v1, 0xa4($s0) -/* A54C7C 8024032C 0043102A */ slt $v0, $v0, $v1 -/* A54C80 80240330 50400001 */ beql $v0, $zero, .L80240338 -/* A54C84 80240334 AE00007C */ sw $zero, 0x7c($s0) -.L80240338: -/* A54C88 80240338 8FBF0014 */ lw $ra, 0x14($sp) -/* A54C8C 8024033C 8FB00010 */ lw $s0, 0x10($sp) -/* A54C90 80240340 0000102D */ daddu $v0, $zero, $zero -/* A54C94 80240344 03E00008 */ jr $ra -/* A54C98 80240348 27BD0018 */ addiu $sp, $sp, 0x18 -/* A54C9C 8024034C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_12/func_8024037C_A54950.s b/asm/nonmatchings/world/area_kpa/kpa_12/func_8024037C_A54950.s deleted file mode 100644 index 21ac85499f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_12/func_8024037C_A54950.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024037C_A54CCC -/* A54CCC 8024037C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A54CD0 80240380 AFB10014 */ sw $s1, 0x14($sp) -/* A54CD4 80240384 0080882D */ daddu $s1, $a0, $zero -/* A54CD8 80240388 AFBF0018 */ sw $ra, 0x18($sp) -/* A54CDC 8024038C AFB00010 */ sw $s0, 0x10($sp) -/* A54CE0 80240390 8E30000C */ lw $s0, 0xc($s1) -/* A54CE4 80240394 8E050000 */ lw $a1, ($s0) -/* A54CE8 80240398 0C0B1EAF */ jal get_variable -/* A54CEC 8024039C 26100004 */ addiu $s0, $s0, 4 -/* A54CF0 802403A0 0220202D */ daddu $a0, $s1, $zero -/* A54CF4 802403A4 8E050000 */ lw $a1, ($s0) -/* A54CF8 802403A8 0C0B1EAF */ jal get_variable -/* A54CFC 802403AC 0040882D */ daddu $s1, $v0, $zero -/* A54D00 802403B0 0040802D */ daddu $s0, $v0, $zero -/* A54D04 802403B4 3C038016 */ lui $v1, 0x8016 -/* A54D08 802403B8 2463A550 */ addiu $v1, $v1, -0x5ab0 -/* A54D0C 802403BC 84620002 */ lh $v0, 2($v1) -/* A54D10 802403C0 10500004 */ beq $v0, $s0, .L802403D4 -/* A54D14 802403C4 00000000 */ nop -/* A54D18 802403C8 84620004 */ lh $v0, 4($v1) -/* A54D1C 802403CC 14500007 */ bne $v0, $s0, .L802403EC -/* A54D20 802403D0 00000000 */ nop -.L802403D4: -/* A54D24 802403D4 44910000 */ mtc1 $s1, $f0 -/* A54D28 802403D8 00000000 */ nop -/* A54D2C 802403DC 46800020 */ cvt.s.w $f0, $f0 -/* A54D30 802403E0 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* A54D34 802403E4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* A54D38 802403E8 E440001C */ swc1 $f0, 0x1c($v0) -.L802403EC: -/* A54D3C 802403EC 3C028011 */ lui $v0, 0x8011 -/* A54D40 802403F0 8042F2A2 */ lb $v0, -0xd5e($v0) -/* A54D44 802403F4 1040000D */ beqz $v0, .L8024042C -/* A54D48 802403F8 00000000 */ nop -/* A54D4C 802403FC 0C00EABB */ jal get_npc_unsafe -/* A54D50 80240400 2404FFFC */ addiu $a0, $zero, -4 -/* A54D54 80240404 0040182D */ daddu $v1, $v0, $zero -/* A54D58 80240408 84620084 */ lh $v0, 0x84($v1) -/* A54D5C 8024040C 14500007 */ bne $v0, $s0, .L8024042C -/* A54D60 80240410 00000000 */ nop -/* A54D64 80240414 C4600038 */ lwc1 $f0, 0x38($v1) -/* A54D68 80240418 44911000 */ mtc1 $s1, $f2 -/* A54D6C 8024041C 00000000 */ nop -/* A54D70 80240420 468010A0 */ cvt.s.w $f2, $f2 -/* A54D74 80240424 46020000 */ add.s $f0, $f0, $f2 -/* A54D78 80240428 E4600038 */ swc1 $f0, 0x38($v1) -.L8024042C: -/* A54D7C 8024042C 8FBF0018 */ lw $ra, 0x18($sp) -/* A54D80 80240430 8FB10014 */ lw $s1, 0x14($sp) -/* A54D84 80240434 8FB00010 */ lw $s0, 0x10($sp) -/* A54D88 80240438 24020002 */ addiu $v0, $zero, 2 -/* A54D8C 8024043C 03E00008 */ jr $ra -/* A54D90 80240440 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_12/func_80240444_A54950.s b/asm/nonmatchings/world/area_kpa/kpa_12/func_80240444_A54950.s deleted file mode 100644 index 2bdaa349cf..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_12/func_80240444_A54950.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240444_A54D94 -/* A54D94 80240444 3C038011 */ lui $v1, 0x8011 -/* A54D98 80240448 8063EBB3 */ lb $v1, -0x144d($v1) -/* A54D9C 8024044C 24020008 */ addiu $v0, $zero, 8 -/* A54DA0 80240450 54620003 */ bnel $v1, $v0, .L80240460 -/* A54DA4 80240454 AC8000A8 */ sw $zero, 0xa8($a0) -/* A54DA8 80240458 24020001 */ addiu $v0, $zero, 1 -/* A54DAC 8024045C AC8200A8 */ sw $v0, 0xa8($a0) -.L80240460: -/* A54DB0 80240460 03E00008 */ jr $ra -/* A54DB4 80240464 24020002 */ addiu $v0, $zero, 2 -/* A54DB8 80240468 00000000 */ nop -/* A54DBC 8024046C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_13/func_80240040_A55F20.s b/asm/nonmatchings/world/area_kpa/kpa_13/func_80240040_A55F20.s deleted file mode 100644 index 86faf2a81a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_13/func_80240040_A55F20.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_A55F60 -/* A55F60 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A55F64 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* A55F68 80240048 0080802D */ daddu $s0, $a0, $zero -/* A55F6C 8024004C AFBF0014 */ sw $ra, 0x14($sp) -/* A55F70 80240050 8E0300A8 */ lw $v1, 0xa8($s0) -/* A55F74 80240054 8E020088 */ lw $v0, 0x88($s0) -/* A55F78 80240058 00621821 */ addu $v1, $v1, $v0 -/* A55F7C 8024005C 04610004 */ bgez $v1, .L80240070 -/* A55F80 80240060 AE0300A8 */ sw $v1, 0xa8($s0) -/* A55F84 80240064 3C020002 */ lui $v0, 2 -/* A55F88 80240068 08090020 */ j .L80240080 -/* A55F8C 8024006C 00621021 */ addu $v0, $v1, $v0 -.L80240070: -/* A55F90 80240070 3C040002 */ lui $a0, 2 -/* A55F94 80240074 0083102A */ slt $v0, $a0, $v1 -/* A55F98 80240078 10400002 */ beqz $v0, .L80240084 -/* A55F9C 8024007C 00641023 */ subu $v0, $v1, $a0 -.L80240080: -/* A55FA0 80240080 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240084: -/* A55FA4 80240084 8E0300AC */ lw $v1, 0xac($s0) -/* A55FA8 80240088 8E02008C */ lw $v0, 0x8c($s0) -/* A55FAC 8024008C 00621821 */ addu $v1, $v1, $v0 -/* A55FB0 80240090 04610004 */ bgez $v1, .L802400A4 -/* A55FB4 80240094 AE0300AC */ sw $v1, 0xac($s0) -/* A55FB8 80240098 3C020002 */ lui $v0, 2 -/* A55FBC 8024009C 0809002D */ j .L802400B4 -/* A55FC0 802400A0 00621021 */ addu $v0, $v1, $v0 -.L802400A4: -/* A55FC4 802400A4 3C040002 */ lui $a0, 2 -/* A55FC8 802400A8 0083102A */ slt $v0, $a0, $v1 -/* A55FCC 802400AC 10400002 */ beqz $v0, .L802400B8 -/* A55FD0 802400B0 00641023 */ subu $v0, $v1, $a0 -.L802400B4: -/* A55FD4 802400B4 AE0200AC */ sw $v0, 0xac($s0) -.L802400B8: -/* A55FD8 802400B8 8E0300B0 */ lw $v1, 0xb0($s0) -/* A55FDC 802400BC 8E020090 */ lw $v0, 0x90($s0) -/* A55FE0 802400C0 00621821 */ addu $v1, $v1, $v0 -/* A55FE4 802400C4 04610004 */ bgez $v1, .L802400D8 -/* A55FE8 802400C8 AE0300B0 */ sw $v1, 0xb0($s0) -/* A55FEC 802400CC 3C020002 */ lui $v0, 2 -/* A55FF0 802400D0 0809003A */ j .L802400E8 -/* A55FF4 802400D4 00621021 */ addu $v0, $v1, $v0 -.L802400D8: -/* A55FF8 802400D8 3C040002 */ lui $a0, 2 -/* A55FFC 802400DC 0083102A */ slt $v0, $a0, $v1 -/* A56000 802400E0 10400002 */ beqz $v0, .L802400EC -/* A56004 802400E4 00641023 */ subu $v0, $v1, $a0 -.L802400E8: -/* A56008 802400E8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400EC: -/* A5600C 802400EC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A56010 802400F0 8E020094 */ lw $v0, 0x94($s0) -/* A56014 802400F4 00621821 */ addu $v1, $v1, $v0 -/* A56018 802400F8 04610004 */ bgez $v1, .L8024010C -/* A5601C 802400FC AE0300B4 */ sw $v1, 0xb4($s0) -/* A56020 80240100 3C020002 */ lui $v0, 2 -/* A56024 80240104 08090047 */ j .L8024011C -/* A56028 80240108 00621021 */ addu $v0, $v1, $v0 -.L8024010C: -/* A5602C 8024010C 3C040002 */ lui $a0, 2 -/* A56030 80240110 0083102A */ slt $v0, $a0, $v1 -/* A56034 80240114 10400002 */ beqz $v0, .L80240120 -/* A56038 80240118 00641023 */ subu $v0, $v1, $a0 -.L8024011C: -/* A5603C 8024011C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240120: -/* A56040 80240120 8E040084 */ lw $a0, 0x84($s0) -/* A56044 80240124 0C046F07 */ jal set_main_pan_u -/* A56048 80240128 8E0500A8 */ lw $a1, 0xa8($s0) -/* A5604C 8024012C 8E040084 */ lw $a0, 0x84($s0) -/* A56050 80240130 0C046F0D */ jal set_main_pan_v -/* A56054 80240134 8E0500AC */ lw $a1, 0xac($s0) -/* A56058 80240138 8E040084 */ lw $a0, 0x84($s0) -/* A5605C 8024013C 0C046F13 */ jal set_aux_pan_u -/* A56060 80240140 8E0500B0 */ lw $a1, 0xb0($s0) -/* A56064 80240144 8E040084 */ lw $a0, 0x84($s0) -/* A56068 80240148 0C046F19 */ jal set_aux_pan_v -/* A5606C 8024014C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A56070 80240150 8FBF0014 */ lw $ra, 0x14($sp) -/* A56074 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* A56078 80240158 0000102D */ daddu $v0, $zero, $zero -/* A5607C 8024015C 03E00008 */ jr $ra -/* A56080 80240160 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_13/func_80240164_A55F20.s b/asm/nonmatchings/world/area_kpa/kpa_13/func_80240164_A55F20.s deleted file mode 100644 index 089b27e2cd..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_13/func_80240164_A55F20.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240164_A56084 -/* A56084 80240164 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A56088 80240168 AFB00010 */ sw $s0, 0x10($sp) -/* A5608C 8024016C 0080802D */ daddu $s0, $a0, $zero -/* A56090 80240170 10A00005 */ beqz $a1, .L80240188 -/* A56094 80240174 AFBF0014 */ sw $ra, 0x14($sp) -/* A56098 80240178 AE000070 */ sw $zero, 0x70($s0) -/* A5609C 8024017C AE000074 */ sw $zero, 0x74($s0) -/* A560A0 80240180 AE000078 */ sw $zero, 0x78($s0) -/* A560A4 80240184 AE00007C */ sw $zero, 0x7c($s0) -.L80240188: -/* A560A8 80240188 8E020070 */ lw $v0, 0x70($s0) -/* A560AC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A560B0 80240190 00000000 */ nop -/* A560B4 80240194 8E0300A8 */ lw $v1, 0xa8($s0) -/* A560B8 80240198 8E020088 */ lw $v0, 0x88($s0) -/* A560BC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A560C0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A560C4 802401A4 AE0300A8 */ sw $v1, 0xa8($s0) -/* A560C8 802401A8 3C020002 */ lui $v0, 2 -/* A560CC 802401AC 08090071 */ j .L802401C4 -/* A560D0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A560D4 802401B4 3C040002 */ lui $a0, 2 -/* A560D8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A560DC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A560E0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A560E4 802401C4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401C8: -/* A560E8 802401C8 8E020074 */ lw $v0, 0x74($s0) -/* A560EC 802401CC 1440000E */ bnez $v0, .L80240208 -/* A560F0 802401D0 00000000 */ nop -/* A560F4 802401D4 8E0300AC */ lw $v1, 0xac($s0) -/* A560F8 802401D8 8E02008C */ lw $v0, 0x8c($s0) -/* A560FC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A56100 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A56104 802401E4 AE0300AC */ sw $v1, 0xac($s0) -/* A56108 802401E8 3C020002 */ lui $v0, 2 -/* A5610C 802401EC 08090081 */ j .L80240204 -/* A56110 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A56114 802401F4 3C040002 */ lui $a0, 2 -/* A56118 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A5611C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A56120 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A56124 80240204 AE0200AC */ sw $v0, 0xac($s0) -.L80240208: -/* A56128 80240208 8E020078 */ lw $v0, 0x78($s0) -/* A5612C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A56130 80240210 00000000 */ nop -/* A56134 80240214 8E0300B0 */ lw $v1, 0xb0($s0) -/* A56138 80240218 8E020090 */ lw $v0, 0x90($s0) -/* A5613C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A56140 80240220 04610004 */ bgez $v1, .L80240234 -/* A56144 80240224 AE0300B0 */ sw $v1, 0xb0($s0) -/* A56148 80240228 3C020002 */ lui $v0, 2 -/* A5614C 8024022C 08090091 */ j .L80240244 -/* A56150 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A56154 80240234 3C040002 */ lui $a0, 2 -/* A56158 80240238 0083102A */ slt $v0, $a0, $v1 -/* A5615C 8024023C 10400002 */ beqz $v0, .L80240248 -/* A56160 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A56164 80240244 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240248: -/* A56168 80240248 8E02007C */ lw $v0, 0x7c($s0) -/* A5616C 8024024C 1440000E */ bnez $v0, .L80240288 -/* A56170 80240250 00000000 */ nop -/* A56174 80240254 8E0300B4 */ lw $v1, 0xb4($s0) -/* A56178 80240258 8E020094 */ lw $v0, 0x94($s0) -/* A5617C 8024025C 00621821 */ addu $v1, $v1, $v0 -/* A56180 80240260 04610004 */ bgez $v1, .L80240274 -/* A56184 80240264 AE0300B4 */ sw $v1, 0xb4($s0) -/* A56188 80240268 3C020002 */ lui $v0, 2 -/* A5618C 8024026C 080900A1 */ j .L80240284 -/* A56190 80240270 00621021 */ addu $v0, $v1, $v0 -.L80240274: -/* A56194 80240274 3C040002 */ lui $a0, 2 -/* A56198 80240278 0083102A */ slt $v0, $a0, $v1 -/* A5619C 8024027C 10400002 */ beqz $v0, .L80240288 -/* A561A0 80240280 00641023 */ subu $v0, $v1, $a0 -.L80240284: -/* A561A4 80240284 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240288: -/* A561A8 80240288 8E040084 */ lw $a0, 0x84($s0) -/* A561AC 8024028C 0C046F07 */ jal set_main_pan_u -/* A561B0 80240290 8E0500A8 */ lw $a1, 0xa8($s0) -/* A561B4 80240294 8E040084 */ lw $a0, 0x84($s0) -/* A561B8 80240298 0C046F0D */ jal set_main_pan_v -/* A561BC 8024029C 8E0500AC */ lw $a1, 0xac($s0) -/* A561C0 802402A0 8E040084 */ lw $a0, 0x84($s0) -/* A561C4 802402A4 0C046F13 */ jal set_aux_pan_u -/* A561C8 802402A8 8E0500B0 */ lw $a1, 0xb0($s0) -/* A561CC 802402AC 8E040084 */ lw $a0, 0x84($s0) -/* A561D0 802402B0 0C046F19 */ jal set_aux_pan_v -/* A561D4 802402B4 8E0500B4 */ lw $a1, 0xb4($s0) -/* A561D8 802402B8 8E020070 */ lw $v0, 0x70($s0) -/* A561DC 802402BC 8E030078 */ lw $v1, 0x78($s0) -/* A561E0 802402C0 8E040098 */ lw $a0, 0x98($s0) -/* A561E4 802402C4 24420001 */ addiu $v0, $v0, 1 -/* A561E8 802402C8 AE020070 */ sw $v0, 0x70($s0) -/* A561EC 802402CC 8E020074 */ lw $v0, 0x74($s0) -/* A561F0 802402D0 24630001 */ addiu $v1, $v1, 1 -/* A561F4 802402D4 AE030078 */ sw $v1, 0x78($s0) -/* A561F8 802402D8 8E030070 */ lw $v1, 0x70($s0) -/* A561FC 802402DC 24420001 */ addiu $v0, $v0, 1 -/* A56200 802402E0 AE020074 */ sw $v0, 0x74($s0) -/* A56204 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A56208 802402E8 0064182A */ slt $v1, $v1, $a0 -/* A5620C 802402EC 24420001 */ addiu $v0, $v0, 1 -/* A56210 802402F0 14600002 */ bnez $v1, .L802402FC -/* A56214 802402F4 AE02007C */ sw $v0, 0x7c($s0) -/* A56218 802402F8 AE000070 */ sw $zero, 0x70($s0) -.L802402FC: -/* A5621C 802402FC 8E020074 */ lw $v0, 0x74($s0) -/* A56220 80240300 8E03009C */ lw $v1, 0x9c($s0) -/* A56224 80240304 0043102A */ slt $v0, $v0, $v1 -/* A56228 80240308 50400001 */ beql $v0, $zero, .L80240310 -/* A5622C 8024030C AE000074 */ sw $zero, 0x74($s0) -.L80240310: -/* A56230 80240310 8E020078 */ lw $v0, 0x78($s0) -/* A56234 80240314 8E0300A0 */ lw $v1, 0xa0($s0) -/* A56238 80240318 0043102A */ slt $v0, $v0, $v1 -/* A5623C 8024031C 50400001 */ beql $v0, $zero, .L80240324 -/* A56240 80240320 AE000078 */ sw $zero, 0x78($s0) -.L80240324: -/* A56244 80240324 8E02007C */ lw $v0, 0x7c($s0) -/* A56248 80240328 8E0300A4 */ lw $v1, 0xa4($s0) -/* A5624C 8024032C 0043102A */ slt $v0, $v0, $v1 -/* A56250 80240330 50400001 */ beql $v0, $zero, .L80240338 -/* A56254 80240334 AE00007C */ sw $zero, 0x7c($s0) -.L80240338: -/* A56258 80240338 8FBF0014 */ lw $ra, 0x14($sp) -/* A5625C 8024033C 8FB00010 */ lw $s0, 0x10($sp) -/* A56260 80240340 0000102D */ daddu $v0, $zero, $zero -/* A56264 80240344 03E00008 */ jr $ra -/* A56268 80240348 27BD0018 */ addiu $sp, $sp, 0x18 -/* A5626C 8024034C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_13/func_80240350_A55F20.s b/asm/nonmatchings/world/area_kpa/kpa_13/func_80240350_A55F20.s deleted file mode 100644 index 7b9f88e93e..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_13/func_80240350_A55F20.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240350_A56270 -/* A56270 80240350 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A56274 80240354 AFBF0010 */ sw $ra, 0x10($sp) -/* A56278 80240358 8C82000C */ lw $v0, 0xc($a0) -/* A5627C 8024035C 3C068016 */ lui $a2, 0x8016 -/* A56280 80240360 84C6A556 */ lh $a2, -0x5aaa($a2) -/* A56284 80240364 0C0B2026 */ jal set_variable -/* A56288 80240368 8C450000 */ lw $a1, ($v0) -/* A5628C 8024036C 8FBF0010 */ lw $ra, 0x10($sp) -/* A56290 80240370 24020002 */ addiu $v0, $zero, 2 -/* A56294 80240374 03E00008 */ jr $ra -/* A56298 80240378 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_13/func_8024037C_A55F20.s b/asm/nonmatchings/world/area_kpa/kpa_13/func_8024037C_A55F20.s deleted file mode 100644 index 50ec5cea98..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_13/func_8024037C_A55F20.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024037C_A5629C -/* A5629C 8024037C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A562A0 80240380 AFB10014 */ sw $s1, 0x14($sp) -/* A562A4 80240384 0080882D */ daddu $s1, $a0, $zero -/* A562A8 80240388 AFBF0018 */ sw $ra, 0x18($sp) -/* A562AC 8024038C AFB00010 */ sw $s0, 0x10($sp) -/* A562B0 80240390 8E30000C */ lw $s0, 0xc($s1) -/* A562B4 80240394 8E050000 */ lw $a1, ($s0) -/* A562B8 80240398 0C0B1EAF */ jal get_variable -/* A562BC 8024039C 26100004 */ addiu $s0, $s0, 4 -/* A562C0 802403A0 0220202D */ daddu $a0, $s1, $zero -/* A562C4 802403A4 8E050000 */ lw $a1, ($s0) -/* A562C8 802403A8 0C0B1EAF */ jal get_variable -/* A562CC 802403AC 0040882D */ daddu $s1, $v0, $zero -/* A562D0 802403B0 0040802D */ daddu $s0, $v0, $zero -/* A562D4 802403B4 3C038016 */ lui $v1, 0x8016 -/* A562D8 802403B8 2463A550 */ addiu $v1, $v1, -0x5ab0 -/* A562DC 802403BC 84620002 */ lh $v0, 2($v1) -/* A562E0 802403C0 10500004 */ beq $v0, $s0, .L802403D4 -/* A562E4 802403C4 00000000 */ nop -/* A562E8 802403C8 84620004 */ lh $v0, 4($v1) -/* A562EC 802403CC 14500007 */ bne $v0, $s0, .L802403EC -/* A562F0 802403D0 00000000 */ nop -.L802403D4: -/* A562F4 802403D4 44910000 */ mtc1 $s1, $f0 -/* A562F8 802403D8 00000000 */ nop -/* A562FC 802403DC 46800020 */ cvt.s.w $f0, $f0 -/* A56300 802403E0 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* A56304 802403E4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* A56308 802403E8 E440001C */ swc1 $f0, 0x1c($v0) -.L802403EC: -/* A5630C 802403EC 3C028011 */ lui $v0, 0x8011 -/* A56310 802403F0 8042F2A2 */ lb $v0, -0xd5e($v0) -/* A56314 802403F4 1040000D */ beqz $v0, .L8024042C -/* A56318 802403F8 00000000 */ nop -/* A5631C 802403FC 0C00EABB */ jal get_npc_unsafe -/* A56320 80240400 2404FFFC */ addiu $a0, $zero, -4 -/* A56324 80240404 0040182D */ daddu $v1, $v0, $zero -/* A56328 80240408 84620084 */ lh $v0, 0x84($v1) -/* A5632C 8024040C 14500007 */ bne $v0, $s0, .L8024042C -/* A56330 80240410 00000000 */ nop -/* A56334 80240414 C4600038 */ lwc1 $f0, 0x38($v1) -/* A56338 80240418 44911000 */ mtc1 $s1, $f2 -/* A5633C 8024041C 00000000 */ nop -/* A56340 80240420 468010A0 */ cvt.s.w $f2, $f2 -/* A56344 80240424 46020000 */ add.s $f0, $f0, $f2 -/* A56348 80240428 E4600038 */ swc1 $f0, 0x38($v1) -.L8024042C: -/* A5634C 8024042C 8FBF0018 */ lw $ra, 0x18($sp) -/* A56350 80240430 8FB10014 */ lw $s1, 0x14($sp) -/* A56354 80240434 8FB00010 */ lw $s0, 0x10($sp) -/* A56358 80240438 24020002 */ addiu $v0, $zero, 2 -/* A5635C 8024043C 03E00008 */ jr $ra -/* A56360 80240440 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_13/func_80240444_A55F20.s b/asm/nonmatchings/world/area_kpa/kpa_13/func_80240444_A55F20.s deleted file mode 100644 index 67d1c72200..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_13/func_80240444_A55F20.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240444_A56364 -/* A56364 80240444 3C038011 */ lui $v1, 0x8011 -/* A56368 80240448 8063EBB3 */ lb $v1, -0x144d($v1) -/* A5636C 8024044C 24020008 */ addiu $v0, $zero, 8 -/* A56370 80240450 54620003 */ bnel $v1, $v0, .L80240460 -/* A56374 80240454 AC8000A8 */ sw $zero, 0xa8($a0) -/* A56378 80240458 24020001 */ addiu $v0, $zero, 1 -/* A5637C 8024045C AC8200A8 */ sw $v0, 0xa8($a0) -.L80240460: -/* A56380 80240460 03E00008 */ jr $ra -/* A56384 80240464 24020002 */ addiu $v0, $zero, 2 -/* A56388 80240468 00000000 */ nop -/* A5638C 8024046C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_130/func_80240048_AA2D20.s b/asm/nonmatchings/world/area_kpa/kpa_130/func_80240048_AA2D20.s deleted file mode 100644 index 41807de99e..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_130/func_80240048_AA2D20.s +++ /dev/null @@ -1,302 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240048_AA2D68 -/* AA2D68 80240048 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AA2D6C 8024004C AFB3002C */ sw $s3, 0x2c($sp) -/* AA2D70 80240050 0080982D */ daddu $s3, $a0, $zero -/* AA2D74 80240054 AFB00020 */ sw $s0, 0x20($sp) -/* AA2D78 80240058 00A0802D */ daddu $s0, $a1, $zero -/* AA2D7C 8024005C AFBF003C */ sw $ra, 0x3c($sp) -/* AA2D80 80240060 AFB60038 */ sw $s6, 0x38($sp) -/* AA2D84 80240064 AFB50034 */ sw $s5, 0x34($sp) -/* AA2D88 80240068 AFB40030 */ sw $s4, 0x30($sp) -/* AA2D8C 8024006C AFB20028 */ sw $s2, 0x28($sp) -/* AA2D90 80240070 AFB10024 */ sw $s1, 0x24($sp) -/* AA2D94 80240074 F7B40040 */ sdc1 $f20, 0x40($sp) -/* AA2D98 80240078 8E720148 */ lw $s2, 0x148($s3) -/* AA2D9C 8024007C 0000A02D */ daddu $s4, $zero, $zero -/* AA2DA0 80240080 86440008 */ lh $a0, 8($s2) -/* AA2DA4 80240084 0C00EABB */ jal get_npc_unsafe -/* AA2DA8 80240088 0280A82D */ daddu $s5, $s4, $zero -/* AA2DAC 8024008C 8E63000C */ lw $v1, 0xc($s3) -/* AA2DB0 80240090 0260202D */ daddu $a0, $s3, $zero -/* AA2DB4 80240094 8C650000 */ lw $a1, ($v1) -/* AA2DB8 80240098 0C0B1EAF */ jal get_variable -/* AA2DBC 8024009C 0040882D */ daddu $s1, $v0, $zero -/* AA2DC0 802400A0 16000005 */ bnez $s0, .L802400B8 -/* AA2DC4 802400A4 0040B02D */ daddu $s6, $v0, $zero -/* AA2DC8 802400A8 8E43006C */ lw $v1, 0x6c($s2) -/* AA2DCC 802400AC 24020064 */ addiu $v0, $zero, 0x64 -/* AA2DD0 802400B0 14620011 */ bne $v1, $v0, .L802400F8 -/* AA2DD4 802400B4 00000000 */ nop -.L802400B8: -/* AA2DD8 802400B8 AE600070 */ sw $zero, 0x70($s3) -/* AA2DDC 802400BC A620008E */ sh $zero, 0x8e($s1) -/* AA2DE0 802400C0 8E4200B0 */ lw $v0, 0xb0($s2) -/* AA2DE4 802400C4 34420008 */ ori $v0, $v0, 8 -/* AA2DE8 802400C8 AE4200B0 */ sw $v0, 0xb0($s2) -/* AA2DEC 802400CC 8E420000 */ lw $v0, ($s2) -/* AA2DF0 802400D0 3C030020 */ lui $v1, 0x20 -/* AA2DF4 802400D4 00431025 */ or $v0, $v0, $v1 -/* AA2DF8 802400D8 AE420000 */ sw $v0, ($s2) -/* AA2DFC 802400DC 8E220000 */ lw $v0, ($s1) -/* AA2E00 802400E0 3C030004 */ lui $v1, 4 -/* AA2E04 802400E4 00431025 */ or $v0, $v0, $v1 -/* AA2E08 802400E8 AE220000 */ sw $v0, ($s1) -/* AA2E0C 802400EC 2402FFFF */ addiu $v0, $zero, -1 -/* AA2E10 802400F0 AE40006C */ sw $zero, 0x6c($s2) -/* AA2E14 802400F4 AE420070 */ sw $v0, 0x70($s2) -.L802400F8: -/* AA2E18 802400F8 8E4300B0 */ lw $v1, 0xb0($s2) -/* AA2E1C 802400FC 30620004 */ andi $v0, $v1, 4 -/* AA2E20 80240100 10400007 */ beqz $v0, .L80240120 -/* AA2E24 80240104 00000000 */ nop -/* AA2E28 80240108 824200B4 */ lb $v0, 0xb4($s2) -/* AA2E2C 8024010C 144000DC */ bnez $v0, .L80240480 -/* AA2E30 80240110 0000102D */ daddu $v0, $zero, $zero -/* AA2E34 80240114 2402FFFB */ addiu $v0, $zero, -5 -/* AA2E38 80240118 00621024 */ and $v0, $v1, $v0 -/* AA2E3C 8024011C AE4200B0 */ sw $v0, 0xb0($s2) -.L80240120: -/* AA2E40 80240120 8E630070 */ lw $v1, 0x70($s3) -/* AA2E44 80240124 24100001 */ addiu $s0, $zero, 1 -/* AA2E48 80240128 1070001C */ beq $v1, $s0, .L8024019C -/* AA2E4C 8024012C 28620002 */ slti $v0, $v1, 2 -/* AA2E50 80240130 50400005 */ beql $v0, $zero, .L80240148 -/* AA2E54 80240134 24020002 */ addiu $v0, $zero, 2 -/* AA2E58 80240138 10600009 */ beqz $v1, .L80240160 -/* AA2E5C 8024013C 0220202D */ daddu $a0, $s1, $zero -/* AA2E60 80240140 0809011C */ j .L80240470 -/* AA2E64 80240144 00000000 */ nop -.L80240148: -/* AA2E68 80240148 10620057 */ beq $v1, $v0, .L802402A8 -/* AA2E6C 8024014C 24020003 */ addiu $v0, $zero, 3 -/* AA2E70 80240150 106200C1 */ beq $v1, $v0, .L80240458 -/* AA2E74 80240154 00000000 */ nop -/* AA2E78 80240158 0809011C */ j .L80240470 -/* AA2E7C 8024015C 00000000 */ nop -.L80240160: -/* AA2E80 80240160 3C01C47A */ lui $at, 0xc47a -/* AA2E84 80240164 44810000 */ mtc1 $at, $f0 -/* AA2E88 80240168 8E230000 */ lw $v1, ($s1) -/* AA2E8C 8024016C 2402FBFF */ addiu $v0, $zero, -0x401 -/* AA2E90 80240170 AE200038 */ sw $zero, 0x38($s1) -/* AA2E94 80240174 AE200040 */ sw $zero, 0x40($s1) -/* AA2E98 80240178 AE200048 */ sw $zero, 0x48($s1) -/* AA2E9C 8024017C A620008E */ sh $zero, 0x8e($s1) -/* AA2EA0 80240180 34630002 */ ori $v1, $v1, 2 -/* AA2EA4 80240184 00621824 */ and $v1, $v1, $v0 -/* AA2EA8 80240188 E620003C */ swc1 $f0, 0x3c($s1) -/* AA2EAC 8024018C 0C00EAFF */ jal disable_npc_shadow -/* AA2EB0 80240190 AE230000 */ sw $v1, ($s1) -/* AA2EB4 80240194 AE40006C */ sw $zero, 0x6c($s2) -/* AA2EB8 80240198 AE700070 */ sw $s0, 0x70($s3) -.L8024019C: -/* AA2EBC 8024019C 8E43006C */ lw $v1, 0x6c($s2) -/* AA2EC0 802401A0 24020002 */ addiu $v0, $zero, 2 -/* AA2EC4 802401A4 146200B2 */ bne $v1, $v0, .L80240470 -/* AA2EC8 802401A8 24020003 */ addiu $v0, $zero, 3 -/* AA2ECC 802401AC 8E440070 */ lw $a0, 0x70($s2) -/* AA2ED0 802401B0 0C00FB3A */ jal get_enemy -/* AA2ED4 802401B4 AE42006C */ sw $v0, 0x6c($s2) -/* AA2ED8 802401B8 84440008 */ lh $a0, 8($v0) -/* AA2EDC 802401BC 0C00EABB */ jal get_npc_unsafe -/* AA2EE0 802401C0 00000000 */ nop -/* AA2EE4 802401C4 8E230000 */ lw $v1, ($s1) -/* AA2EE8 802401C8 2404FFFD */ addiu $a0, $zero, -3 -/* AA2EEC 802401CC 00641824 */ and $v1, $v1, $a0 -/* AA2EF0 802401D0 AE230000 */ sw $v1, ($s1) -/* AA2EF4 802401D4 C4400038 */ lwc1 $f0, 0x38($v0) -/* AA2EF8 802401D8 E6200038 */ swc1 $f0, 0x38($s1) -/* AA2EFC 802401DC C440003C */ lwc1 $f0, 0x3c($v0) -/* AA2F00 802401E0 3C014026 */ lui $at, 0x4026 -/* AA2F04 802401E4 44811800 */ mtc1 $at, $f3 -/* AA2F08 802401E8 44801000 */ mtc1 $zero, $f2 -/* AA2F0C 802401EC 46000021 */ cvt.d.s $f0, $f0 -/* AA2F10 802401F0 46220000 */ add.d $f0, $f0, $f2 -/* AA2F14 802401F4 46200020 */ cvt.s.d $f0, $f0 -/* AA2F18 802401F8 E620003C */ swc1 $f0, 0x3c($s1) -/* AA2F1C 802401FC C4400040 */ lwc1 $f0, 0x40($v0) -/* AA2F20 80240200 3C013FF0 */ lui $at, 0x3ff0 -/* AA2F24 80240204 44811800 */ mtc1 $at, $f3 -/* AA2F28 80240208 44801000 */ mtc1 $zero, $f2 -/* AA2F2C 8024020C 46000021 */ cvt.d.s $f0, $f0 -/* AA2F30 80240210 46220000 */ add.d $f0, $f0, $f2 -/* AA2F34 80240214 3C0641C8 */ lui $a2, 0x41c8 -/* AA2F38 80240218 46200020 */ cvt.s.d $f0, $f0 -/* AA2F3C 8024021C E6200040 */ swc1 $f0, 0x40($s1) -/* AA2F40 80240220 C440000C */ lwc1 $f0, 0xc($v0) -/* AA2F44 80240224 E620000C */ swc1 $f0, 0xc($s1) -/* AA2F48 80240228 C6C00018 */ lwc1 $f0, 0x18($s6) -/* AA2F4C 8024022C 26250040 */ addiu $a1, $s1, 0x40 -/* AA2F50 80240230 E6200018 */ swc1 $f0, 0x18($s1) -/* AA2F54 80240234 8E4200CC */ lw $v0, 0xcc($s2) -/* AA2F58 80240238 8E27000C */ lw $a3, 0xc($s1) -/* AA2F5C 8024023C 8C420008 */ lw $v0, 8($v0) -/* AA2F60 80240240 26240038 */ addiu $a0, $s1, 0x38 -/* AA2F64 80240244 0C00A7E7 */ jal add_vec2D_polar -/* AA2F68 80240248 AE220028 */ sw $v0, 0x28($s1) -/* AA2F6C 8024024C C620000C */ lwc1 $f0, 0xc($s1) -/* AA2F70 80240250 3C014334 */ lui $at, 0x4334 -/* AA2F74 80240254 44811000 */ mtc1 $at, $f2 -/* AA2F78 80240258 00000000 */ nop -/* AA2F7C 8024025C 4602003C */ c.lt.s $f0, $f2 -/* AA2F80 80240260 00000000 */ nop -/* AA2F84 80240264 45020002 */ bc1fl .L80240270 -/* AA2F88 80240268 AE200034 */ sw $zero, 0x34($s1) -/* AA2F8C 8024026C E6220034 */ swc1 $f2, 0x34($s1) -.L80240270: -/* AA2F90 80240270 3C060001 */ lui $a2, 1 -/* AA2F94 80240274 34C60400 */ ori $a2, $a2, 0x400 -/* AA2F98 80240278 8E4200CC */ lw $v0, 0xcc($s2) -/* AA2F9C 8024027C 0220202D */ daddu $a0, $s1, $zero -/* AA2FA0 80240280 8C45000C */ lw $a1, 0xc($v0) -/* AA2FA4 80240284 8E220000 */ lw $v0, ($s1) -/* AA2FA8 80240288 2403012C */ addiu $v1, $zero, 0x12c -/* AA2FAC 8024028C A623008E */ sh $v1, 0x8e($s1) -/* AA2FB0 80240290 00461025 */ or $v0, $v0, $a2 -/* AA2FB4 80240294 AE220000 */ sw $v0, ($s1) -/* AA2FB8 80240298 0C00EAE8 */ jal enable_npc_shadow -/* AA2FBC 8024029C AE250028 */ sw $a1, 0x28($s1) -/* AA2FC0 802402A0 24020002 */ addiu $v0, $zero, 2 -/* AA2FC4 802402A4 AE620070 */ sw $v0, 0x70($s3) -.L802402A8: -/* AA2FC8 802402A8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* AA2FCC 802402AC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* AA2FD0 802402B0 C620003C */ lwc1 $f0, 0x3c($s1) -/* AA2FD4 802402B4 C442002C */ lwc1 $f2, 0x2c($v0) -/* AA2FD8 802402B8 46020001 */ sub.s $f0, $f0, $f2 -/* AA2FDC 802402BC 3C018024 */ lui $at, 0x8024 -/* AA2FE0 802402C0 D4224750 */ ldc1 $f2, 0x4750($at) -/* AA2FE4 802402C4 46000121 */ cvt.d.s $f4, $f0 -/* AA2FE8 802402C8 4624103C */ c.lt.d $f2, $f4 -/* AA2FEC 802402CC 00000000 */ nop -/* AA2FF0 802402D0 45030067 */ bc1tl .L80240470 -/* AA2FF4 802402D4 24150001 */ addiu $s5, $zero, 1 -/* AA2FF8 802402D8 3C01C05E */ lui $at, 0xc05e -/* AA2FFC 802402DC 44810800 */ mtc1 $at, $f1 -/* AA3000 802402E0 44800000 */ mtc1 $zero, $f0 -/* AA3004 802402E4 00000000 */ nop -/* AA3008 802402E8 4620203C */ c.lt.d $f4, $f0 -/* AA300C 802402EC 00000000 */ nop -/* AA3010 802402F0 4503005F */ bc1tl .L80240470 -/* AA3014 802402F4 24150001 */ addiu $s5, $zero, 1 -/* AA3018 802402F8 27A40018 */ addiu $a0, $sp, 0x18 -/* AA301C 802402FC 8E260018 */ lw $a2, 0x18($s1) -/* AA3020 80240300 8E27000C */ lw $a3, 0xc($s1) -/* AA3024 80240304 C6200038 */ lwc1 $f0, 0x38($s1) -/* AA3028 80240308 C6220040 */ lwc1 $f2, 0x40($s1) -/* AA302C 8024030C 27A5001C */ addiu $a1, $sp, 0x1c -/* AA3030 80240310 E7A00018 */ swc1 $f0, 0x18($sp) -/* AA3034 80240314 0C00A7E7 */ jal add_vec2D_polar -/* AA3038 80240318 E7A2001C */ swc1 $f2, 0x1c($sp) -/* AA303C 8024031C C622000C */ lwc1 $f2, 0xc($s1) -/* AA3040 80240320 3C014334 */ lui $at, 0x4334 -/* AA3044 80240324 44810000 */ mtc1 $at, $f0 -/* AA3048 80240328 00000000 */ nop -/* AA304C 8024032C 4600103C */ c.lt.s $f2, $f0 -/* AA3050 80240330 00000000 */ nop -/* AA3054 80240334 45000007 */ bc1f .L80240354 -/* AA3058 80240338 00000000 */ nop -/* AA305C 8024033C C7A20018 */ lwc1 $f2, 0x18($sp) -/* AA3060 80240340 C6400074 */ lwc1 $f0, 0x74($s2) -/* AA3064 80240344 46800020 */ cvt.s.w $f0, $f0 -/* AA3068 80240348 4602003E */ c.le.s $f0, $f2 -/* AA306C 8024034C 080900DA */ j .L80240368 -/* AA3070 80240350 00000000 */ nop -.L80240354: -/* AA3074 80240354 C7A20018 */ lwc1 $f2, 0x18($sp) -/* AA3078 80240358 C6400074 */ lwc1 $f0, 0x74($s2) -/* AA307C 8024035C 46800020 */ cvt.s.w $f0, $f0 -/* AA3080 80240360 4600103E */ c.le.s $f2, $f0 -/* AA3084 80240364 00000000 */ nop -.L80240368: -/* AA3088 80240368 45030001 */ bc1tl .L80240370 -/* AA308C 8024036C 24140001 */ addiu $s4, $zero, 1 -.L80240370: -/* AA3090 80240370 12800031 */ beqz $s4, .L80240438 -/* AA3094 80240374 0220202D */ daddu $a0, $s1, $zero -/* AA3098 80240378 3C05B000 */ lui $a1, 0xb000 -/* AA309C 8024037C 8E4200CC */ lw $v0, 0xcc($s2) -/* AA30A0 80240380 34A50018 */ ori $a1, $a1, 0x18 -/* AA30A4 80240384 8C42001C */ lw $v0, 0x1c($v0) -/* AA30A8 80240388 0000302D */ daddu $a2, $zero, $zero -/* AA30AC 8024038C 0C012530 */ jal func_800494C0 -/* AA30B0 80240390 AE220028 */ sw $v0, 0x28($s1) -/* AA30B4 80240394 C620003C */ lwc1 $f0, 0x3c($s1) -/* AA30B8 80240398 3C0140A0 */ lui $at, 0x40a0 -/* AA30BC 8024039C 4481A000 */ mtc1 $at, $f20 -/* AA30C0 802403A0 00000000 */ nop -/* AA30C4 802403A4 46140000 */ add.s $f0, $f0, $f20 -/* AA30C8 802403A8 C6240040 */ lwc1 $f4, 0x40($s1) -/* AA30CC 802403AC 3C013D4C */ lui $at, 0x3d4c -/* AA30D0 802403B0 3421CCCD */ ori $at, $at, 0xcccd -/* AA30D4 802403B4 44811000 */ mtc1 $at, $f2 -/* AA30D8 802403B8 44060000 */ mfc1 $a2, $f0 -/* AA30DC 802403BC 3C013F80 */ lui $at, 0x3f80 -/* AA30E0 802403C0 44810000 */ mtc1 $at, $f0 -/* AA30E4 802403C4 24020014 */ addiu $v0, $zero, 0x14 -/* AA30E8 802403C8 AFA20014 */ sw $v0, 0x14($sp) -/* AA30EC 802403CC 46002100 */ add.s $f4, $f4, $f0 -/* AA30F0 802403D0 E7A20010 */ swc1 $f2, 0x10($sp) -/* AA30F4 802403D4 8E250038 */ lw $a1, 0x38($s1) -/* AA30F8 802403D8 44072000 */ mfc1 $a3, $f4 -/* AA30FC 802403DC 0C01C184 */ jal func_80070610 -/* AA3100 802403E0 0000202D */ daddu $a0, $zero, $zero -/* AA3104 802403E4 C620003C */ lwc1 $f0, 0x3c($s1) -/* AA3108 802403E8 46140000 */ add.s $f0, $f0, $f20 -/* AA310C 802403EC C6240040 */ lwc1 $f4, 0x40($s1) -/* AA3110 802403F0 3C013F99 */ lui $at, 0x3f99 -/* AA3114 802403F4 3421999A */ ori $at, $at, 0x999a -/* AA3118 802403F8 44811000 */ mtc1 $at, $f2 -/* AA311C 802403FC 44060000 */ mfc1 $a2, $f0 -/* AA3120 80240400 44800000 */ mtc1 $zero, $f0 -/* AA3124 80240404 24020019 */ addiu $v0, $zero, 0x19 -/* AA3128 80240408 AFA20014 */ sw $v0, 0x14($sp) -/* AA312C 8024040C 46002100 */ add.s $f4, $f4, $f0 -/* AA3130 80240410 E7A20010 */ swc1 $f2, 0x10($sp) -/* AA3134 80240414 8E250038 */ lw $a1, 0x38($s1) -/* AA3138 80240418 44072000 */ mfc1 $a3, $f4 -/* AA313C 8024041C 0C01C1CC */ jal func_80070730 -/* AA3140 80240420 0000202D */ daddu $a0, $zero, $zero -/* AA3144 80240424 24020001 */ addiu $v0, $zero, 1 -/* AA3148 80240428 A622008E */ sh $v0, 0x8e($s1) -/* AA314C 8024042C 24020003 */ addiu $v0, $zero, 3 -/* AA3150 80240430 08090112 */ j .L80240448 -/* AA3154 80240434 AE620070 */ sw $v0, 0x70($s3) -.L80240438: -/* AA3158 80240438 8E250018 */ lw $a1, 0x18($s1) -/* AA315C 8024043C 8E26000C */ lw $a2, 0xc($s1) -/* AA3160 80240440 0C00EA95 */ jal npc_move_heading -/* AA3164 80240444 0220202D */ daddu $a0, $s1, $zero -.L80240448: -/* AA3168 80240448 8E630070 */ lw $v1, 0x70($s3) -/* AA316C 8024044C 24020003 */ addiu $v0, $zero, 3 -/* AA3170 80240450 14620007 */ bne $v1, $v0, .L80240470 -/* AA3174 80240454 00000000 */ nop -.L80240458: -/* AA3178 80240458 9622008E */ lhu $v0, 0x8e($s1) -/* AA317C 8024045C 2442FFFF */ addiu $v0, $v0, -1 -/* AA3180 80240460 A622008E */ sh $v0, 0x8e($s1) -/* AA3184 80240464 00021400 */ sll $v0, $v0, 0x10 -/* AA3188 80240468 58400001 */ blezl $v0, .L80240470 -/* AA318C 8024046C 24150001 */ addiu $s5, $zero, 1 -.L80240470: -/* AA3190 80240470 12A00002 */ beqz $s5, .L8024047C -/* AA3194 80240474 24020064 */ addiu $v0, $zero, 0x64 -/* AA3198 80240478 AE42006C */ sw $v0, 0x6c($s2) -.L8024047C: -/* AA319C 8024047C 0000102D */ daddu $v0, $zero, $zero -.L80240480: -/* AA31A0 80240480 8FBF003C */ lw $ra, 0x3c($sp) -/* AA31A4 80240484 8FB60038 */ lw $s6, 0x38($sp) -/* AA31A8 80240488 8FB50034 */ lw $s5, 0x34($sp) -/* AA31AC 8024048C 8FB40030 */ lw $s4, 0x30($sp) -/* AA31B0 80240490 8FB3002C */ lw $s3, 0x2c($sp) -/* AA31B4 80240494 8FB20028 */ lw $s2, 0x28($sp) -/* AA31B8 80240498 8FB10024 */ lw $s1, 0x24($sp) -/* AA31BC 8024049C 8FB00020 */ lw $s0, 0x20($sp) -/* AA31C0 802404A0 D7B40040 */ ldc1 $f20, 0x40($sp) -/* AA31C4 802404A4 03E00008 */ jr $ra -/* AA31C8 802404A8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_130/func_802404AC_AA2D20.s b/asm/nonmatchings/world/area_kpa/kpa_130/func_802404AC_AA2D20.s deleted file mode 100644 index 312f8622e9..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_130/func_802404AC_AA2D20.s +++ /dev/null @@ -1,178 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404AC_AA31CC -/* AA31CC 802404AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AA31D0 802404B0 AFB40020 */ sw $s4, 0x20($sp) -/* AA31D4 802404B4 0080A02D */ daddu $s4, $a0, $zero -/* AA31D8 802404B8 AFBF0024 */ sw $ra, 0x24($sp) -/* AA31DC 802404BC AFB3001C */ sw $s3, 0x1c($sp) -/* AA31E0 802404C0 AFB20018 */ sw $s2, 0x18($sp) -/* AA31E4 802404C4 AFB10014 */ sw $s1, 0x14($sp) -/* AA31E8 802404C8 AFB00010 */ sw $s0, 0x10($sp) -/* AA31EC 802404CC 8E920148 */ lw $s2, 0x148($s4) -/* AA31F0 802404D0 86440008 */ lh $a0, 8($s2) -/* AA31F4 802404D4 8E90000C */ lw $s0, 0xc($s4) -/* AA31F8 802404D8 0C00EABB */ jal get_npc_unsafe -/* AA31FC 802404DC 00A0882D */ daddu $s1, $a1, $zero -/* AA3200 802404E0 0280202D */ daddu $a0, $s4, $zero -/* AA3204 802404E4 8E050000 */ lw $a1, ($s0) -/* AA3208 802404E8 0C0B1EAF */ jal get_variable -/* AA320C 802404EC 0040982D */ daddu $s3, $v0, $zero -/* AA3210 802404F0 1220000C */ beqz $s1, .L80240524 -/* AA3214 802404F4 2402001E */ addiu $v0, $zero, 0x1e -/* AA3218 802404F8 AE800070 */ sw $zero, 0x70($s4) -/* AA321C 802404FC A662008E */ sh $v0, 0x8e($s3) -/* AA3220 80240500 8E4200CC */ lw $v0, 0xcc($s2) -/* AA3224 80240504 8C420000 */ lw $v0, ($v0) -/* AA3228 80240508 0260202D */ daddu $a0, $s3, $zero -/* AA322C 8024050C AE620028 */ sw $v0, 0x28($s3) -/* AA3230 80240510 8E420000 */ lw $v0, ($s2) -/* AA3234 80240514 3C030020 */ lui $v1, 0x20 -/* AA3238 80240518 00431025 */ or $v0, $v0, $v1 -/* AA323C 8024051C 0C00EAFF */ jal disable_npc_shadow -/* AA3240 80240520 AE420000 */ sw $v0, ($s2) -.L80240524: -/* AA3244 80240524 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* AA3248 80240528 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* AA324C 8024052C C660003C */ lwc1 $f0, 0x3c($s3) -/* AA3250 80240530 C442002C */ lwc1 $f2, 0x2c($v0) -/* AA3254 80240534 46020001 */ sub.s $f0, $f0, $f2 -/* AA3258 80240538 3C018024 */ lui $at, 0x8024 -/* AA325C 8024053C D4224758 */ ldc1 $f2, 0x4758($at) -/* AA3260 80240540 46000121 */ cvt.d.s $f4, $f0 -/* AA3264 80240544 4624103C */ c.lt.d $f2, $f4 -/* AA3268 80240548 00000000 */ nop -/* AA326C 8024054C 45010071 */ bc1t .L80240714 -/* AA3270 80240550 0000102D */ daddu $v0, $zero, $zero -/* AA3274 80240554 3C01C054 */ lui $at, 0xc054 -/* AA3278 80240558 44810800 */ mtc1 $at, $f1 -/* AA327C 8024055C 44800000 */ mtc1 $zero, $f0 -/* AA3280 80240560 00000000 */ nop -/* AA3284 80240564 4620203C */ c.lt.d $f4, $f0 -/* AA3288 80240568 00000000 */ nop -/* AA328C 8024056C 45010069 */ bc1t .L80240714 -/* AA3290 80240570 00000000 */ nop -/* AA3294 80240574 8E4200B0 */ lw $v0, 0xb0($s2) -/* AA3298 80240578 30420004 */ andi $v0, $v0, 4 -/* AA329C 8024057C 1040000B */ beqz $v0, .L802405AC -/* AA32A0 80240580 00000000 */ nop -/* AA32A4 80240584 8E4200CC */ lw $v0, 0xcc($s2) -/* AA32A8 80240588 8C420000 */ lw $v0, ($v0) -/* AA32AC 8024058C AE620028 */ sw $v0, 0x28($s3) -/* AA32B0 80240590 824200B4 */ lb $v0, 0xb4($s2) -/* AA32B4 80240594 1440005F */ bnez $v0, .L80240714 -/* AA32B8 80240598 0000102D */ daddu $v0, $zero, $zero -/* AA32BC 8024059C 8E4200B0 */ lw $v0, 0xb0($s2) -/* AA32C0 802405A0 2403FFFB */ addiu $v1, $zero, -5 -/* AA32C4 802405A4 00431024 */ and $v0, $v0, $v1 -/* AA32C8 802405A8 AE4200B0 */ sw $v0, 0xb0($s2) -.L802405AC: -/* AA32CC 802405AC 8E900070 */ lw $s0, 0x70($s4) -/* AA32D0 802405B0 1200000E */ beqz $s0, .L802405EC -/* AA32D4 802405B4 00000000 */ nop -/* AA32D8 802405B8 06000055 */ bltz $s0, .L80240710 -/* AA32DC 802405BC 2402000A */ addiu $v0, $zero, 0xa -/* AA32E0 802405C0 12020013 */ beq $s0, $v0, .L80240610 -/* AA32E4 802405C4 0202102A */ slt $v0, $s0, $v0 -/* AA32E8 802405C8 14400052 */ bnez $v0, .L80240714 -/* AA32EC 802405CC 0000102D */ daddu $v0, $zero, $zero -/* AA32F0 802405D0 2402000B */ addiu $v0, $zero, 0xb -/* AA32F4 802405D4 12020022 */ beq $s0, $v0, .L80240660 -/* AA32F8 802405D8 2402000C */ addiu $v0, $zero, 0xc -/* AA32FC 802405DC 12020035 */ beq $s0, $v0, .L802406B4 -/* AA3300 802405E0 0000102D */ daddu $v0, $zero, $zero -/* AA3304 802405E4 080901C5 */ j .L80240714 -/* AA3308 802405E8 00000000 */ nop -.L802405EC: -/* AA330C 802405EC 9662008E */ lhu $v0, 0x8e($s3) -/* AA3310 802405F0 2442FFFF */ addiu $v0, $v0, -1 -/* AA3314 802405F4 A662008E */ sh $v0, 0x8e($s3) -/* AA3318 802405F8 00021400 */ sll $v0, $v0, 0x10 -/* AA331C 802405FC 1C400045 */ bgtz $v0, .L80240714 -/* AA3320 80240600 0000102D */ daddu $v0, $zero, $zero -/* AA3324 80240604 2402000A */ addiu $v0, $zero, 0xa -/* AA3328 80240608 080901C4 */ j .L80240710 -/* AA332C 8024060C AE820070 */ sw $v0, 0x70($s4) -.L80240610: -/* AA3330 80240610 0C090000 */ jal func_80240000 -/* AA3334 80240614 00000000 */ nop -/* AA3338 80240618 1840002C */ blez $v0, .L802406CC -/* AA333C 8024061C AE42006C */ sw $v0, 0x6c($s2) -/* AA3340 80240620 0C00FB3A */ jal get_enemy -/* AA3344 80240624 0040202D */ daddu $a0, $v0, $zero -/* AA3348 80240628 0040182D */ daddu $v1, $v0, $zero -/* AA334C 8024062C 24020001 */ addiu $v0, $zero, 1 -/* AA3350 80240630 AC62006C */ sw $v0, 0x6c($v1) -/* AA3354 80240634 86420008 */ lh $v0, 8($s2) -/* AA3358 80240638 AC620070 */ sw $v0, 0x70($v1) -/* AA335C 8024063C 8E420070 */ lw $v0, 0x70($s2) -/* AA3360 80240640 AC620074 */ sw $v0, 0x74($v1) -/* AA3364 80240644 8E4200CC */ lw $v0, 0xcc($s2) -/* AA3368 80240648 8C420020 */ lw $v0, 0x20($v0) -/* AA336C 8024064C A670008E */ sh $s0, 0x8e($s3) -/* AA3370 80240650 AE620028 */ sw $v0, 0x28($s3) -/* AA3374 80240654 2402000B */ addiu $v0, $zero, 0xb -/* AA3378 80240658 080901C4 */ j .L80240710 -/* AA337C 8024065C AE820070 */ sw $v0, 0x70($s4) -.L80240660: -/* AA3380 80240660 9662008E */ lhu $v0, 0x8e($s3) -/* AA3384 80240664 2442FFFF */ addiu $v0, $v0, -1 -/* AA3388 80240668 A662008E */ sh $v0, 0x8e($s3) -/* AA338C 8024066C 00021400 */ sll $v0, $v0, 0x10 -/* AA3390 80240670 1C400028 */ bgtz $v0, .L80240714 -/* AA3394 80240674 0000102D */ daddu $v0, $zero, $zero -/* AA3398 80240678 8E4200CC */ lw $v0, 0xcc($s2) -/* AA339C 8024067C 8C420000 */ lw $v0, ($v0) -/* AA33A0 80240680 AE620028 */ sw $v0, 0x28($s3) -/* AA33A4 80240684 0C00FB3A */ jal get_enemy -/* AA33A8 80240688 8E44006C */ lw $a0, 0x6c($s2) -/* AA33AC 8024068C 0260202D */ daddu $a0, $s3, $zero -/* AA33B0 80240690 24050328 */ addiu $a1, $zero, 0x328 -/* AA33B4 80240694 24030002 */ addiu $v1, $zero, 2 -/* AA33B8 80240698 3C060020 */ lui $a2, 0x20 -/* AA33BC 8024069C 0C012530 */ jal func_800494C0 -/* AA33C0 802406A0 AC43006C */ sw $v1, 0x6c($v0) -/* AA33C4 802406A4 24020005 */ addiu $v0, $zero, 5 -/* AA33C8 802406A8 A662008E */ sh $v0, 0x8e($s3) -/* AA33CC 802406AC 2402000C */ addiu $v0, $zero, 0xc -/* AA33D0 802406B0 AE820070 */ sw $v0, 0x70($s4) -.L802406B4: -/* AA33D4 802406B4 9662008E */ lhu $v0, 0x8e($s3) -/* AA33D8 802406B8 2442FFFF */ addiu $v0, $v0, -1 -/* AA33DC 802406BC A662008E */ sh $v0, 0x8e($s3) -/* AA33E0 802406C0 00021400 */ sll $v0, $v0, 0x10 -/* AA33E4 802406C4 1C400013 */ bgtz $v0, .L80240714 -/* AA33E8 802406C8 0000102D */ daddu $v0, $zero, $zero -.L802406CC: -/* AA33EC 802406CC 0C00A67F */ jal rand_int -/* AA33F0 802406D0 240403E8 */ addiu $a0, $zero, 0x3e8 -/* AA33F4 802406D4 3C038888 */ lui $v1, 0x8888 -/* AA33F8 802406D8 34638889 */ ori $v1, $v1, 0x8889 -/* AA33FC 802406DC 00430018 */ mult $v0, $v1 -/* AA3400 802406E0 00021FC3 */ sra $v1, $v0, 0x1f -/* AA3404 802406E4 00003810 */ mfhi $a3 -/* AA3408 802406E8 00E22021 */ addu $a0, $a3, $v0 -/* AA340C 802406EC 00042143 */ sra $a0, $a0, 5 -/* AA3410 802406F0 00832023 */ subu $a0, $a0, $v1 -/* AA3414 802406F4 00041900 */ sll $v1, $a0, 4 -/* AA3418 802406F8 00641823 */ subu $v1, $v1, $a0 -/* AA341C 802406FC 00031880 */ sll $v1, $v1, 2 -/* AA3420 80240700 00431023 */ subu $v0, $v0, $v1 -/* AA3424 80240704 24420028 */ addiu $v0, $v0, 0x28 -/* AA3428 80240708 A662008E */ sh $v0, 0x8e($s3) -/* AA342C 8024070C AE800070 */ sw $zero, 0x70($s4) -.L80240710: -/* AA3430 80240710 0000102D */ daddu $v0, $zero, $zero -.L80240714: -/* AA3434 80240714 8FBF0024 */ lw $ra, 0x24($sp) -/* AA3438 80240718 8FB40020 */ lw $s4, 0x20($sp) -/* AA343C 8024071C 8FB3001C */ lw $s3, 0x1c($sp) -/* AA3440 80240720 8FB20018 */ lw $s2, 0x18($sp) -/* AA3444 80240724 8FB10014 */ lw $s1, 0x14($sp) -/* AA3448 80240728 8FB00010 */ lw $s0, 0x10($sp) -/* AA344C 8024072C 03E00008 */ jr $ra -/* AA3450 80240730 27BD0028 */ addiu $sp, $sp, 0x28 -/* AA3454 80240734 00000000 */ nop -/* AA3458 80240738 00000000 */ nop -/* AA345C 8024073C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_133/func_80240124_AA7480.s b/asm/nonmatchings/world/area_kpa/kpa_133/func_80240124_AA7480.s deleted file mode 100644 index f554ca40c5..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_133/func_80240124_AA7480.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_AA75A4 -/* AA75A4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA75A8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* AA75AC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* AA75B0 80240130 10A00005 */ beqz $a1, .L80240148 -/* AA75B4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* AA75B8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* AA75BC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* AA75C0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* AA75C4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* AA75C8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* AA75CC 8024014C 1440000E */ bnez $v0, .L80240188 -/* AA75D0 80240150 00000000 */ nop -/* AA75D4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* AA75D8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* AA75DC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* AA75E0 80240160 04610004 */ bgez $v1, .L80240174 -/* AA75E4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* AA75E8 80240168 3C020002 */ lui $v0, 2 -/* AA75EC 8024016C 08090061 */ j .L80240184 -/* AA75F0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* AA75F4 80240174 3C040002 */ lui $a0, 2 -/* AA75F8 80240178 0083102A */ slt $v0, $a0, $v1 -/* AA75FC 8024017C 10400002 */ beqz $v0, .L80240188 -/* AA7600 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* AA7604 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* AA7608 80240188 8E020074 */ lw $v0, 0x74($s0) -/* AA760C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* AA7610 80240190 00000000 */ nop -/* AA7614 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* AA7618 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* AA761C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* AA7620 802401A0 04610004 */ bgez $v1, .L802401B4 -/* AA7624 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* AA7628 802401A8 3C020002 */ lui $v0, 2 -/* AA762C 802401AC 08090071 */ j .L802401C4 -/* AA7630 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* AA7634 802401B4 3C040002 */ lui $a0, 2 -/* AA7638 802401B8 0083102A */ slt $v0, $a0, $v1 -/* AA763C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* AA7640 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* AA7644 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* AA7648 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* AA764C 802401CC 1440000E */ bnez $v0, .L80240208 -/* AA7650 802401D0 00000000 */ nop -/* AA7654 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* AA7658 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* AA765C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* AA7660 802401E0 04610004 */ bgez $v1, .L802401F4 -/* AA7664 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* AA7668 802401E8 3C020002 */ lui $v0, 2 -/* AA766C 802401EC 08090081 */ j .L80240204 -/* AA7670 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* AA7674 802401F4 3C040002 */ lui $a0, 2 -/* AA7678 802401F8 0083102A */ slt $v0, $a0, $v1 -/* AA767C 802401FC 10400002 */ beqz $v0, .L80240208 -/* AA7680 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* AA7684 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* AA7688 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* AA768C 8024020C 1440000E */ bnez $v0, .L80240248 -/* AA7690 80240210 00000000 */ nop -/* AA7694 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* AA7698 80240218 8E020094 */ lw $v0, 0x94($s0) -/* AA769C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* AA76A0 80240220 04610004 */ bgez $v1, .L80240234 -/* AA76A4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* AA76A8 80240228 3C020002 */ lui $v0, 2 -/* AA76AC 8024022C 08090091 */ j .L80240244 -/* AA76B0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* AA76B4 80240234 3C040002 */ lui $a0, 2 -/* AA76B8 80240238 0083102A */ slt $v0, $a0, $v1 -/* AA76BC 8024023C 10400002 */ beqz $v0, .L80240248 -/* AA76C0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* AA76C4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* AA76C8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* AA76CC 8024024C 0C046F07 */ jal set_main_pan_u -/* AA76D0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* AA76D4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* AA76D8 80240258 0C046F0D */ jal set_main_pan_v -/* AA76DC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* AA76E0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* AA76E4 80240264 0C046F13 */ jal set_aux_pan_u -/* AA76E8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* AA76EC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* AA76F0 80240270 0C046F19 */ jal set_aux_pan_v -/* AA76F4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* AA76F8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* AA76FC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* AA7700 80240280 8E040098 */ lw $a0, 0x98($s0) -/* AA7704 80240284 24420001 */ addiu $v0, $v0, 1 -/* AA7708 80240288 AE020070 */ sw $v0, 0x70($s0) -/* AA770C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* AA7710 80240290 24630001 */ addiu $v1, $v1, 1 -/* AA7714 80240294 AE030078 */ sw $v1, 0x78($s0) -/* AA7718 80240298 8E030070 */ lw $v1, 0x70($s0) -/* AA771C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* AA7720 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* AA7724 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* AA7728 802402A8 0064182A */ slt $v1, $v1, $a0 -/* AA772C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* AA7730 802402B0 14600002 */ bnez $v1, .L802402BC -/* AA7734 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* AA7738 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* AA773C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* AA7740 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* AA7744 802402C4 0043102A */ slt $v0, $v0, $v1 -/* AA7748 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* AA774C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* AA7750 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* AA7754 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* AA7758 802402D8 0043102A */ slt $v0, $v0, $v1 -/* AA775C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* AA7760 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* AA7764 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* AA7768 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* AA776C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* AA7770 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* AA7774 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* AA7778 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* AA777C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* AA7780 80240300 0000102D */ daddu $v0, $zero, $zero -/* AA7784 80240304 03E00008 */ jr $ra -/* AA7788 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* AA778C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_133/func_80240310_AA7480.s b/asm/nonmatchings/world/area_kpa/kpa_133/func_80240310_AA7480.s deleted file mode 100644 index 3e3fe37cd4..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_133/func_80240310_AA7480.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_AA7790 -/* AA7790 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AA7794 80240314 AFB20018 */ sw $s2, 0x18($sp) -/* AA7798 80240318 0080902D */ daddu $s2, $a0, $zero -/* AA779C 8024031C 0000202D */ daddu $a0, $zero, $zero -/* AA77A0 80240320 3C05FD05 */ lui $a1, 0xfd05 -/* AA77A4 80240324 AFBF001C */ sw $ra, 0x1c($sp) -/* AA77A8 80240328 AFB10014 */ sw $s1, 0x14($sp) -/* AA77AC 8024032C AFB00010 */ sw $s0, 0x10($sp) -/* AA77B0 80240330 8E50000C */ lw $s0, 0xc($s2) -/* AA77B4 80240334 0C0B1EAF */ jal get_variable -/* AA77B8 80240338 34A50F80 */ ori $a1, $a1, 0xf80 -/* AA77BC 8024033C 0C04417A */ jal get_entity_by_index -/* AA77C0 80240340 0040202D */ daddu $a0, $v0, $zero -/* AA77C4 80240344 0240202D */ daddu $a0, $s2, $zero -/* AA77C8 80240348 0040882D */ daddu $s1, $v0, $zero -/* AA77CC 8024034C 8E050000 */ lw $a1, ($s0) -/* AA77D0 80240350 0C0B1EAF */ jal get_variable -/* AA77D4 80240354 26100004 */ addiu $s0, $s0, 4 -/* AA77D8 80240358 44820000 */ mtc1 $v0, $f0 -/* AA77DC 8024035C 00000000 */ nop -/* AA77E0 80240360 46800020 */ cvt.s.w $f0, $f0 -/* AA77E4 80240364 E6200060 */ swc1 $f0, 0x60($s1) -/* AA77E8 80240368 8E050000 */ lw $a1, ($s0) -/* AA77EC 8024036C 26100004 */ addiu $s0, $s0, 4 -/* AA77F0 80240370 0C0B1EAF */ jal get_variable -/* AA77F4 80240374 0240202D */ daddu $a0, $s2, $zero -/* AA77F8 80240378 44820000 */ mtc1 $v0, $f0 -/* AA77FC 8024037C 00000000 */ nop -/* AA7800 80240380 46800020 */ cvt.s.w $f0, $f0 -/* AA7804 80240384 E6200064 */ swc1 $f0, 0x64($s1) -/* AA7808 80240388 8E050000 */ lw $a1, ($s0) -/* AA780C 8024038C 0C0B1EAF */ jal get_variable -/* AA7810 80240390 0240202D */ daddu $a0, $s2, $zero -/* AA7814 80240394 44820000 */ mtc1 $v0, $f0 -/* AA7818 80240398 00000000 */ nop -/* AA781C 8024039C 46800020 */ cvt.s.w $f0, $f0 -/* AA7820 802403A0 E6200068 */ swc1 $f0, 0x68($s1) -/* AA7824 802403A4 8FBF001C */ lw $ra, 0x1c($sp) -/* AA7828 802403A8 8FB20018 */ lw $s2, 0x18($sp) -/* AA782C 802403AC 8FB10014 */ lw $s1, 0x14($sp) -/* AA7830 802403B0 8FB00010 */ lw $s0, 0x10($sp) -/* AA7834 802403B4 24020002 */ addiu $v0, $zero, 2 -/* AA7838 802403B8 03E00008 */ jr $ra -/* AA783C 802403BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_133/func_802403C0_AA7480.s b/asm/nonmatchings/world/area_kpa/kpa_133/func_802403C0_AA7480.s deleted file mode 100644 index 97567e5780..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_133/func_802403C0_AA7480.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C0_AA7840 -/* AA7840 802403C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AA7844 802403C4 AFB20018 */ sw $s2, 0x18($sp) -/* AA7848 802403C8 0080902D */ daddu $s2, $a0, $zero -/* AA784C 802403CC 0000202D */ daddu $a0, $zero, $zero -/* AA7850 802403D0 3C05FD05 */ lui $a1, 0xfd05 -/* AA7854 802403D4 AFBF001C */ sw $ra, 0x1c($sp) -/* AA7858 802403D8 AFB10014 */ sw $s1, 0x14($sp) -/* AA785C 802403DC AFB00010 */ sw $s0, 0x10($sp) -/* AA7860 802403E0 8E50000C */ lw $s0, 0xc($s2) -/* AA7864 802403E4 0C0B1EAF */ jal get_variable -/* AA7868 802403E8 34A50F80 */ ori $a1, $a1, 0xf80 -/* AA786C 802403EC 0C04417A */ jal get_entity_by_index -/* AA7870 802403F0 0040202D */ daddu $a0, $v0, $zero -/* AA7874 802403F4 0240202D */ daddu $a0, $s2, $zero -/* AA7878 802403F8 0040882D */ daddu $s1, $v0, $zero -/* AA787C 802403FC 8E050000 */ lw $a1, ($s0) -/* AA7880 80240400 0C0B1EAF */ jal get_variable -/* AA7884 80240404 26100004 */ addiu $s0, $s0, 4 -/* AA7888 80240408 44820000 */ mtc1 $v0, $f0 -/* AA788C 8024040C 00000000 */ nop -/* AA7890 80240410 46800020 */ cvt.s.w $f0, $f0 -/* AA7894 80240414 E6200048 */ swc1 $f0, 0x48($s1) -/* AA7898 80240418 8E050000 */ lw $a1, ($s0) -/* AA789C 8024041C 26100004 */ addiu $s0, $s0, 4 -/* AA78A0 80240420 0C0B1EAF */ jal get_variable -/* AA78A4 80240424 0240202D */ daddu $a0, $s2, $zero -/* AA78A8 80240428 44820000 */ mtc1 $v0, $f0 -/* AA78AC 8024042C 00000000 */ nop -/* AA78B0 80240430 46800020 */ cvt.s.w $f0, $f0 -/* AA78B4 80240434 E620004C */ swc1 $f0, 0x4c($s1) -/* AA78B8 80240438 8E050000 */ lw $a1, ($s0) -/* AA78BC 8024043C 0C0B1EAF */ jal get_variable -/* AA78C0 80240440 0240202D */ daddu $a0, $s2, $zero -/* AA78C4 80240444 44820000 */ mtc1 $v0, $f0 -/* AA78C8 80240448 00000000 */ nop -/* AA78CC 8024044C 46800020 */ cvt.s.w $f0, $f0 -/* AA78D0 80240450 E6200050 */ swc1 $f0, 0x50($s1) -/* AA78D4 80240454 8FBF001C */ lw $ra, 0x1c($sp) -/* AA78D8 80240458 8FB20018 */ lw $s2, 0x18($sp) -/* AA78DC 8024045C 8FB10014 */ lw $s1, 0x14($sp) -/* AA78E0 80240460 8FB00010 */ lw $s0, 0x10($sp) -/* AA78E4 80240464 24020002 */ addiu $v0, $zero, 2 -/* AA78E8 80240468 03E00008 */ jr $ra -/* AA78EC 8024046C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/func_80240124_AA8FA0.s b/asm/nonmatchings/world/area_kpa/kpa_134/func_80240124_AA8FA0.s deleted file mode 100644 index 22e1991202..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_134/func_80240124_AA8FA0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_AA90C4 -/* AA90C4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA90C8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* AA90CC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* AA90D0 80240130 10A00005 */ beqz $a1, .L80240148 -/* AA90D4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* AA90D8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* AA90DC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* AA90E0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* AA90E4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* AA90E8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* AA90EC 8024014C 1440000E */ bnez $v0, .L80240188 -/* AA90F0 80240150 00000000 */ nop -/* AA90F4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* AA90F8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* AA90FC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* AA9100 80240160 04610004 */ bgez $v1, .L80240174 -/* AA9104 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* AA9108 80240168 3C020002 */ lui $v0, 2 -/* AA910C 8024016C 08090061 */ j .L80240184 -/* AA9110 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* AA9114 80240174 3C040002 */ lui $a0, 2 -/* AA9118 80240178 0083102A */ slt $v0, $a0, $v1 -/* AA911C 8024017C 10400002 */ beqz $v0, .L80240188 -/* AA9120 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* AA9124 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* AA9128 80240188 8E020074 */ lw $v0, 0x74($s0) -/* AA912C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* AA9130 80240190 00000000 */ nop -/* AA9134 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* AA9138 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* AA913C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* AA9140 802401A0 04610004 */ bgez $v1, .L802401B4 -/* AA9144 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* AA9148 802401A8 3C020002 */ lui $v0, 2 -/* AA914C 802401AC 08090071 */ j .L802401C4 -/* AA9150 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* AA9154 802401B4 3C040002 */ lui $a0, 2 -/* AA9158 802401B8 0083102A */ slt $v0, $a0, $v1 -/* AA915C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* AA9160 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* AA9164 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* AA9168 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* AA916C 802401CC 1440000E */ bnez $v0, .L80240208 -/* AA9170 802401D0 00000000 */ nop -/* AA9174 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* AA9178 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* AA917C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* AA9180 802401E0 04610004 */ bgez $v1, .L802401F4 -/* AA9184 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* AA9188 802401E8 3C020002 */ lui $v0, 2 -/* AA918C 802401EC 08090081 */ j .L80240204 -/* AA9190 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* AA9194 802401F4 3C040002 */ lui $a0, 2 -/* AA9198 802401F8 0083102A */ slt $v0, $a0, $v1 -/* AA919C 802401FC 10400002 */ beqz $v0, .L80240208 -/* AA91A0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* AA91A4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* AA91A8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* AA91AC 8024020C 1440000E */ bnez $v0, .L80240248 -/* AA91B0 80240210 00000000 */ nop -/* AA91B4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* AA91B8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* AA91BC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* AA91C0 80240220 04610004 */ bgez $v1, .L80240234 -/* AA91C4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* AA91C8 80240228 3C020002 */ lui $v0, 2 -/* AA91CC 8024022C 08090091 */ j .L80240244 -/* AA91D0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* AA91D4 80240234 3C040002 */ lui $a0, 2 -/* AA91D8 80240238 0083102A */ slt $v0, $a0, $v1 -/* AA91DC 8024023C 10400002 */ beqz $v0, .L80240248 -/* AA91E0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* AA91E4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* AA91E8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* AA91EC 8024024C 0C046F07 */ jal set_main_pan_u -/* AA91F0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* AA91F4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* AA91F8 80240258 0C046F0D */ jal set_main_pan_v -/* AA91FC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* AA9200 80240260 8E040084 */ lw $a0, 0x84($s0) -/* AA9204 80240264 0C046F13 */ jal set_aux_pan_u -/* AA9208 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* AA920C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* AA9210 80240270 0C046F19 */ jal set_aux_pan_v -/* AA9214 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* AA9218 80240278 8E020070 */ lw $v0, 0x70($s0) -/* AA921C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* AA9220 80240280 8E040098 */ lw $a0, 0x98($s0) -/* AA9224 80240284 24420001 */ addiu $v0, $v0, 1 -/* AA9228 80240288 AE020070 */ sw $v0, 0x70($s0) -/* AA922C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* AA9230 80240290 24630001 */ addiu $v1, $v1, 1 -/* AA9234 80240294 AE030078 */ sw $v1, 0x78($s0) -/* AA9238 80240298 8E030070 */ lw $v1, 0x70($s0) -/* AA923C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* AA9240 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* AA9244 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* AA9248 802402A8 0064182A */ slt $v1, $v1, $a0 -/* AA924C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* AA9250 802402B0 14600002 */ bnez $v1, .L802402BC -/* AA9254 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* AA9258 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* AA925C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* AA9260 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* AA9264 802402C4 0043102A */ slt $v0, $v0, $v1 -/* AA9268 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* AA926C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* AA9270 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* AA9274 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* AA9278 802402D8 0043102A */ slt $v0, $v0, $v1 -/* AA927C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* AA9280 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* AA9284 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* AA9288 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* AA928C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* AA9290 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* AA9294 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* AA9298 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* AA929C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* AA92A0 80240300 0000102D */ daddu $v0, $zero, $zero -/* AA92A4 80240304 03E00008 */ jr $ra -/* AA92A8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* AA92AC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/func_80240310_AA8FA0.s b/asm/nonmatchings/world/area_kpa/kpa_134/func_80240310_AA8FA0.s deleted file mode 100644 index 0851daccd5..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_134/func_80240310_AA8FA0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_AA92B0 -/* AA92B0 80240310 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA92B4 80240314 3C054248 */ lui $a1, 0x4248 -/* AA92B8 80240318 3C0642E6 */ lui $a2, 0x42e6 -/* AA92BC 8024031C 3C07C208 */ lui $a3, 0xc208 -/* AA92C0 80240320 AFBF0010 */ sw $ra, 0x10($sp) -/* AA92C4 80240324 0C044898 */ jal create_shadow_type -/* AA92C8 80240328 0000202D */ daddu $a0, $zero, $zero -/* AA92CC 8024032C 8FBF0010 */ lw $ra, 0x10($sp) -/* AA92D0 80240330 24020002 */ addiu $v0, $zero, 2 -/* AA92D4 80240334 03E00008 */ jr $ra -/* AA92D8 80240338 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/func_8024033C_AA8FA0.s b/asm/nonmatchings/world/area_kpa/kpa_134/func_8024033C_AA8FA0.s deleted file mode 100644 index 624e776e3f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_134/func_8024033C_AA8FA0.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024033C_AA92DC -/* AA92DC 8024033C 3C048011 */ lui $a0, %hi(gPlayerStatus) -/* AA92E0 80240340 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) -/* AA92E4 80240344 808300B4 */ lb $v1, 0xb4($a0) -/* AA92E8 80240348 24020008 */ addiu $v0, $zero, 8 -/* AA92EC 8024034C 10620003 */ beq $v1, $v0, .L8024035C -/* AA92F0 80240350 0080282D */ daddu $a1, $a0, $zero -.L80240354: -/* AA92F4 80240354 03E00008 */ jr $ra -/* AA92F8 80240358 0000102D */ daddu $v0, $zero, $zero -.L8024035C: -/* AA92FC 8024035C C4800028 */ lwc1 $f0, 0x28($a0) -/* AA9300 80240360 3C014248 */ lui $at, 0x4248 -/* AA9304 80240364 44814000 */ mtc1 $at, $f8 -/* AA9308 80240368 00000000 */ nop -/* AA930C 8024036C 46080001 */ sub.s $f0, $f0, $f8 -/* AA9310 80240370 3C01402C */ lui $at, 0x402c -/* AA9314 80240374 44811800 */ mtc1 $at, $f3 -/* AA9318 80240378 44801000 */ mtc1 $zero, $f2 -/* AA931C 8024037C 46000021 */ cvt.d.s $f0, $f0 -/* AA9320 80240380 46200005 */ abs.d $f0, $f0 -/* AA9324 80240384 4620103C */ c.lt.d $f2, $f0 -/* AA9328 80240388 00000000 */ nop -/* AA932C 8024038C 4501FFF1 */ bc1t .L80240354 -/* AA9330 80240390 00000000 */ nop -/* AA9334 80240394 C480002C */ lwc1 $f0, 0x2c($a0) -/* AA9338 80240398 3C014316 */ lui $at, 0x4316 -/* AA933C 8024039C 44813000 */ mtc1 $at, $f6 -/* AA9340 802403A0 00000000 */ nop -/* AA9344 802403A4 46060001 */ sub.s $f0, $f0, $f6 -/* AA9348 802403A8 46000021 */ cvt.d.s $f0, $f0 -/* AA934C 802403AC 46200005 */ abs.d $f0, $f0 -/* AA9350 802403B0 4620103C */ c.lt.d $f2, $f0 -/* AA9354 802403B4 00000000 */ nop -/* AA9358 802403B8 4501FFE6 */ bc1t .L80240354 -/* AA935C 802403BC 00000000 */ nop -/* AA9360 802403C0 C4A00030 */ lwc1 $f0, 0x30($a1) -/* AA9364 802403C4 3C01C208 */ lui $at, 0xc208 -/* AA9368 802403C8 44812000 */ mtc1 $at, $f4 -/* AA936C 802403CC 00000000 */ nop -/* AA9370 802403D0 46040001 */ sub.s $f0, $f0, $f4 -/* AA9374 802403D4 46000021 */ cvt.d.s $f0, $f0 -/* AA9378 802403D8 46200005 */ abs.d $f0, $f0 -/* AA937C 802403DC 4620103C */ c.lt.d $f2, $f0 -/* AA9380 802403E0 00000000 */ nop -/* AA9384 802403E4 45010006 */ bc1t .L80240400 -/* AA9388 802403E8 24020002 */ addiu $v0, $zero, 2 -/* AA938C 802403EC E4A80028 */ swc1 $f8, 0x28($a1) -/* AA9390 802403F0 E4A6002C */ swc1 $f6, 0x2c($a1) -/* AA9394 802403F4 E4A40030 */ swc1 $f4, 0x30($a1) -/* AA9398 802403F8 03E00008 */ jr $ra -/* AA939C 802403FC ACA00054 */ sw $zero, 0x54($a1) -.L80240400: -/* AA93A0 80240400 03E00008 */ jr $ra -/* AA93A4 80240404 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/func_80240408_AA8FA0.s b/asm/nonmatchings/world/area_kpa/kpa_134/func_80240408_AA8FA0.s deleted file mode 100644 index 0243c4bda7..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_134/func_80240408_AA8FA0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240408_AA93A8 -/* AA93A8 80240408 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA93AC 8024040C 3C05442A */ lui $a1, 0x442a -/* AA93B0 80240410 3C064370 */ lui $a2, 0x4370 -/* AA93B4 80240414 3C07C20C */ lui $a3, 0xc20c -/* AA93B8 80240418 AFBF0010 */ sw $ra, 0x10($sp) -/* AA93BC 8024041C 0C044898 */ jal create_shadow_type -/* AA93C0 80240420 0000202D */ daddu $a0, $zero, $zero -/* AA93C4 80240424 8FBF0010 */ lw $ra, 0x10($sp) -/* AA93C8 80240428 24020002 */ addiu $v0, $zero, 2 -/* AA93CC 8024042C 03E00008 */ jr $ra -/* AA93D0 80240430 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/func_80240434_AA8FA0.s b/asm/nonmatchings/world/area_kpa/kpa_134/func_80240434_AA8FA0.s deleted file mode 100644 index 9cdb8a24d6..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_134/func_80240434_AA8FA0.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240434_AA93D4 -/* AA93D4 80240434 3C048011 */ lui $a0, %hi(gPlayerStatus) -/* AA93D8 80240438 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) -/* AA93DC 8024043C 808300B4 */ lb $v1, 0xb4($a0) -/* AA93E0 80240440 24020008 */ addiu $v0, $zero, 8 -/* AA93E4 80240444 10620003 */ beq $v1, $v0, .L80240454 -/* AA93E8 80240448 0080282D */ daddu $a1, $a0, $zero -.L8024044C: -/* AA93EC 8024044C 03E00008 */ jr $ra -/* AA93F0 80240450 0000102D */ daddu $v0, $zero, $zero -.L80240454: -/* AA93F4 80240454 C4800028 */ lwc1 $f0, 0x28($a0) -/* AA93F8 80240458 3C01442A */ lui $at, 0x442a -/* AA93FC 8024045C 44814000 */ mtc1 $at, $f8 -/* AA9400 80240460 00000000 */ nop -/* AA9404 80240464 46080001 */ sub.s $f0, $f0, $f8 -/* AA9408 80240468 3C01402C */ lui $at, 0x402c -/* AA940C 8024046C 44811800 */ mtc1 $at, $f3 -/* AA9410 80240470 44801000 */ mtc1 $zero, $f2 -/* AA9414 80240474 46000021 */ cvt.d.s $f0, $f0 -/* AA9418 80240478 46200005 */ abs.d $f0, $f0 -/* AA941C 8024047C 4620103C */ c.lt.d $f2, $f0 -/* AA9420 80240480 00000000 */ nop -/* AA9424 80240484 4501FFF1 */ bc1t .L8024044C -/* AA9428 80240488 00000000 */ nop -/* AA942C 8024048C C480002C */ lwc1 $f0, 0x2c($a0) -/* AA9430 80240490 3C014389 */ lui $at, 0x4389 -/* AA9434 80240494 34218000 */ ori $at, $at, 0x8000 -/* AA9438 80240498 44813000 */ mtc1 $at, $f6 -/* AA943C 8024049C 00000000 */ nop -/* AA9440 802404A0 46060001 */ sub.s $f0, $f0, $f6 -/* AA9444 802404A4 46000021 */ cvt.d.s $f0, $f0 -/* AA9448 802404A8 46200005 */ abs.d $f0, $f0 -/* AA944C 802404AC 4620103C */ c.lt.d $f2, $f0 -/* AA9450 802404B0 00000000 */ nop -/* AA9454 802404B4 4501FFE5 */ bc1t .L8024044C -/* AA9458 802404B8 00000000 */ nop -/* AA945C 802404BC C4A00030 */ lwc1 $f0, 0x30($a1) -/* AA9460 802404C0 3C01C20C */ lui $at, 0xc20c -/* AA9464 802404C4 44812000 */ mtc1 $at, $f4 -/* AA9468 802404C8 00000000 */ nop -/* AA946C 802404CC 46040001 */ sub.s $f0, $f0, $f4 -/* AA9470 802404D0 46000021 */ cvt.d.s $f0, $f0 -/* AA9474 802404D4 46200005 */ abs.d $f0, $f0 -/* AA9478 802404D8 4620103C */ c.lt.d $f2, $f0 -/* AA947C 802404DC 00000000 */ nop -/* AA9480 802404E0 45010006 */ bc1t .L802404FC -/* AA9484 802404E4 24020002 */ addiu $v0, $zero, 2 -/* AA9488 802404E8 E4A80028 */ swc1 $f8, 0x28($a1) -/* AA948C 802404EC E4A6002C */ swc1 $f6, 0x2c($a1) -/* AA9490 802404F0 E4A40030 */ swc1 $f4, 0x30($a1) -/* AA9494 802404F4 03E00008 */ jr $ra -/* AA9498 802404F8 ACA00054 */ sw $zero, 0x54($a1) -.L802404FC: -/* AA949C 802404FC 03E00008 */ jr $ra -/* AA94A0 80240500 0000102D */ daddu $v0, $zero, $zero -/* AA94A4 80240504 00000000 */ nop -/* AA94A8 80240508 00000000 */ nop -/* AA94AC 8024050C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/func_80240510_AA8FA0.s b/asm/nonmatchings/world/area_kpa/kpa_134/func_80240510_AA8FA0.s deleted file mode 100644 index 7e2ce03965..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_134/func_80240510_AA8FA0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240510_AA94B0 -/* AA94B0 80240510 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA94B4 80240514 AFB00010 */ sw $s0, 0x10($sp) -/* AA94B8 80240518 0080802D */ daddu $s0, $a0, $zero -/* AA94BC 8024051C AFBF0014 */ sw $ra, 0x14($sp) -/* AA94C0 80240520 0C04417A */ jal get_entity_by_index -/* AA94C4 80240524 8E0400AC */ lw $a0, 0xac($s0) -/* AA94C8 80240528 0040182D */ daddu $v1, $v0, $zero -/* AA94CC 8024052C C6000084 */ lwc1 $f0, 0x84($s0) -/* AA94D0 80240530 46800020 */ cvt.s.w $f0, $f0 -/* AA94D4 80240534 E4600048 */ swc1 $f0, 0x48($v1) -/* AA94D8 80240538 C6000088 */ lwc1 $f0, 0x88($s0) -/* AA94DC 8024053C 46800020 */ cvt.s.w $f0, $f0 -/* AA94E0 80240540 E460004C */ swc1 $f0, 0x4c($v1) -/* AA94E4 80240544 C600008C */ lwc1 $f0, 0x8c($s0) -/* AA94E8 80240548 46800020 */ cvt.s.w $f0, $f0 -/* AA94EC 8024054C E4600050 */ swc1 $f0, 0x50($v1) -/* AA94F0 80240550 8FBF0014 */ lw $ra, 0x14($sp) -/* AA94F4 80240554 8FB00010 */ lw $s0, 0x10($sp) -/* AA94F8 80240558 24020002 */ addiu $v0, $zero, 2 -/* AA94FC 8024055C 03E00008 */ jr $ra -/* AA9500 80240560 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/func_80240564_AA8FA0.s b/asm/nonmatchings/world/area_kpa/kpa_134/func_80240564_AA8FA0.s deleted file mode 100644 index 2ec447abf1..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_134/func_80240564_AA8FA0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240564_AA9504 -/* AA9504 80240564 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AA9508 80240568 AFB10014 */ sw $s1, 0x14($sp) -/* AA950C 8024056C 0080882D */ daddu $s1, $a0, $zero -/* AA9510 80240570 AFBF0020 */ sw $ra, 0x20($sp) -/* AA9514 80240574 AFB3001C */ sw $s3, 0x1c($sp) -/* AA9518 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* AA951C 8024057C AFB00010 */ sw $s0, 0x10($sp) -/* AA9520 80240580 8E30000C */ lw $s0, 0xc($s1) -/* AA9524 80240584 8E050000 */ lw $a1, ($s0) -/* AA9528 80240588 0C0B1EAF */ jal get_variable -/* AA952C 8024058C 26100004 */ addiu $s0, $s0, 4 -/* AA9530 80240590 8E050000 */ lw $a1, ($s0) -/* AA9534 80240594 26100004 */ addiu $s0, $s0, 4 -/* AA9538 80240598 0220202D */ daddu $a0, $s1, $zero -/* AA953C 8024059C 0C0B1EAF */ jal get_variable -/* AA9540 802405A0 0040982D */ daddu $s3, $v0, $zero -/* AA9544 802405A4 8E050000 */ lw $a1, ($s0) -/* AA9548 802405A8 26100004 */ addiu $s0, $s0, 4 -/* AA954C 802405AC 0220202D */ daddu $a0, $s1, $zero -/* AA9550 802405B0 0C0B1EAF */ jal get_variable -/* AA9554 802405B4 0040902D */ daddu $s2, $v0, $zero -/* AA9558 802405B8 0220202D */ daddu $a0, $s1, $zero -/* AA955C 802405BC 8E050000 */ lw $a1, ($s0) -/* AA9560 802405C0 0C0B1EAF */ jal get_variable -/* AA9564 802405C4 0040882D */ daddu $s1, $v0, $zero -/* AA9568 802405C8 0260202D */ daddu $a0, $s3, $zero -/* AA956C 802405CC 0C04417A */ jal get_entity_by_index -/* AA9570 802405D0 0040802D */ daddu $s0, $v0, $zero -/* AA9574 802405D4 0040182D */ daddu $v1, $v0, $zero -/* AA9578 802405D8 44920000 */ mtc1 $s2, $f0 -/* AA957C 802405DC 00000000 */ nop -/* AA9580 802405E0 46800020 */ cvt.s.w $f0, $f0 -/* AA9584 802405E4 E4600048 */ swc1 $f0, 0x48($v1) -/* AA9588 802405E8 44910000 */ mtc1 $s1, $f0 -/* AA958C 802405EC 00000000 */ nop -/* AA9590 802405F0 46800020 */ cvt.s.w $f0, $f0 -/* AA9594 802405F4 E460004C */ swc1 $f0, 0x4c($v1) -/* AA9598 802405F8 44900000 */ mtc1 $s0, $f0 -/* AA959C 802405FC 00000000 */ nop -/* AA95A0 80240600 46800020 */ cvt.s.w $f0, $f0 -/* AA95A4 80240604 E4600050 */ swc1 $f0, 0x50($v1) -/* AA95A8 80240608 8FBF0020 */ lw $ra, 0x20($sp) -/* AA95AC 8024060C 8FB3001C */ lw $s3, 0x1c($sp) -/* AA95B0 80240610 8FB20018 */ lw $s2, 0x18($sp) -/* AA95B4 80240614 8FB10014 */ lw $s1, 0x14($sp) -/* AA95B8 80240618 8FB00010 */ lw $s0, 0x10($sp) -/* AA95BC 8024061C 24020002 */ addiu $v0, $zero, 2 -/* AA95C0 80240620 03E00008 */ jr $ra -/* AA95C4 80240624 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/func_80240628_AA8FA0.s b/asm/nonmatchings/world/area_kpa/kpa_134/func_80240628_AA8FA0.s deleted file mode 100644 index 9683029dd9..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_134/func_80240628_AA8FA0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240628_AA95C8 -/* AA95C8 80240628 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA95CC 8024062C AFBF0010 */ sw $ra, 0x10($sp) -/* AA95D0 80240630 0C04417A */ jal get_entity_by_index -/* AA95D4 80240634 8C840084 */ lw $a0, 0x84($a0) -/* AA95D8 80240638 0040182D */ daddu $v1, $v0, $zero -/* AA95DC 8024063C 8C640000 */ lw $a0, ($v1) -/* AA95E0 80240640 3C050010 */ lui $a1, 0x10 -/* AA95E4 80240644 00852025 */ or $a0, $a0, $a1 -/* AA95E8 80240648 AC640000 */ sw $a0, ($v1) -/* AA95EC 8024064C 8FBF0010 */ lw $ra, 0x10($sp) -/* AA95F0 80240650 24020002 */ addiu $v0, $zero, 2 -/* AA95F4 80240654 03E00008 */ jr $ra -/* AA95F8 80240658 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/func_80240040_A574B0.s b/asm/nonmatchings/world/area_kpa/kpa_14/func_80240040_A574B0.s deleted file mode 100644 index aaf3d2eafe..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/func_80240040_A574B0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_A574F0 -/* A574F0 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A574F4 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* A574F8 80240048 0080802D */ daddu $s0, $a0, $zero -/* A574FC 8024004C AFBF0014 */ sw $ra, 0x14($sp) -/* A57500 80240050 8E0300A8 */ lw $v1, 0xa8($s0) -/* A57504 80240054 8E020088 */ lw $v0, 0x88($s0) -/* A57508 80240058 00621821 */ addu $v1, $v1, $v0 -/* A5750C 8024005C 04610004 */ bgez $v1, .L80240070 -/* A57510 80240060 AE0300A8 */ sw $v1, 0xa8($s0) -/* A57514 80240064 3C020002 */ lui $v0, 2 -/* A57518 80240068 08090020 */ j .L80240080 -/* A5751C 8024006C 00621021 */ addu $v0, $v1, $v0 -.L80240070: -/* A57520 80240070 3C040002 */ lui $a0, 2 -/* A57524 80240074 0083102A */ slt $v0, $a0, $v1 -/* A57528 80240078 10400002 */ beqz $v0, .L80240084 -/* A5752C 8024007C 00641023 */ subu $v0, $v1, $a0 -.L80240080: -/* A57530 80240080 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240084: -/* A57534 80240084 8E0300AC */ lw $v1, 0xac($s0) -/* A57538 80240088 8E02008C */ lw $v0, 0x8c($s0) -/* A5753C 8024008C 00621821 */ addu $v1, $v1, $v0 -/* A57540 80240090 04610004 */ bgez $v1, .L802400A4 -/* A57544 80240094 AE0300AC */ sw $v1, 0xac($s0) -/* A57548 80240098 3C020002 */ lui $v0, 2 -/* A5754C 8024009C 0809002D */ j .L802400B4 -/* A57550 802400A0 00621021 */ addu $v0, $v1, $v0 -.L802400A4: -/* A57554 802400A4 3C040002 */ lui $a0, 2 -/* A57558 802400A8 0083102A */ slt $v0, $a0, $v1 -/* A5755C 802400AC 10400002 */ beqz $v0, .L802400B8 -/* A57560 802400B0 00641023 */ subu $v0, $v1, $a0 -.L802400B4: -/* A57564 802400B4 AE0200AC */ sw $v0, 0xac($s0) -.L802400B8: -/* A57568 802400B8 8E0300B0 */ lw $v1, 0xb0($s0) -/* A5756C 802400BC 8E020090 */ lw $v0, 0x90($s0) -/* A57570 802400C0 00621821 */ addu $v1, $v1, $v0 -/* A57574 802400C4 04610004 */ bgez $v1, .L802400D8 -/* A57578 802400C8 AE0300B0 */ sw $v1, 0xb0($s0) -/* A5757C 802400CC 3C020002 */ lui $v0, 2 -/* A57580 802400D0 0809003A */ j .L802400E8 -/* A57584 802400D4 00621021 */ addu $v0, $v1, $v0 -.L802400D8: -/* A57588 802400D8 3C040002 */ lui $a0, 2 -/* A5758C 802400DC 0083102A */ slt $v0, $a0, $v1 -/* A57590 802400E0 10400002 */ beqz $v0, .L802400EC -/* A57594 802400E4 00641023 */ subu $v0, $v1, $a0 -.L802400E8: -/* A57598 802400E8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400EC: -/* A5759C 802400EC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A575A0 802400F0 8E020094 */ lw $v0, 0x94($s0) -/* A575A4 802400F4 00621821 */ addu $v1, $v1, $v0 -/* A575A8 802400F8 04610004 */ bgez $v1, .L8024010C -/* A575AC 802400FC AE0300B4 */ sw $v1, 0xb4($s0) -/* A575B0 80240100 3C020002 */ lui $v0, 2 -/* A575B4 80240104 08090047 */ j .L8024011C -/* A575B8 80240108 00621021 */ addu $v0, $v1, $v0 -.L8024010C: -/* A575BC 8024010C 3C040002 */ lui $a0, 2 -/* A575C0 80240110 0083102A */ slt $v0, $a0, $v1 -/* A575C4 80240114 10400002 */ beqz $v0, .L80240120 -/* A575C8 80240118 00641023 */ subu $v0, $v1, $a0 -.L8024011C: -/* A575CC 8024011C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240120: -/* A575D0 80240120 8E040084 */ lw $a0, 0x84($s0) -/* A575D4 80240124 0C046F07 */ jal set_main_pan_u -/* A575D8 80240128 8E0500A8 */ lw $a1, 0xa8($s0) -/* A575DC 8024012C 8E040084 */ lw $a0, 0x84($s0) -/* A575E0 80240130 0C046F0D */ jal set_main_pan_v -/* A575E4 80240134 8E0500AC */ lw $a1, 0xac($s0) -/* A575E8 80240138 8E040084 */ lw $a0, 0x84($s0) -/* A575EC 8024013C 0C046F13 */ jal set_aux_pan_u -/* A575F0 80240140 8E0500B0 */ lw $a1, 0xb0($s0) -/* A575F4 80240144 8E040084 */ lw $a0, 0x84($s0) -/* A575F8 80240148 0C046F19 */ jal set_aux_pan_v -/* A575FC 8024014C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A57600 80240150 8FBF0014 */ lw $ra, 0x14($sp) -/* A57604 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* A57608 80240158 0000102D */ daddu $v0, $zero, $zero -/* A5760C 8024015C 03E00008 */ jr $ra -/* A57610 80240160 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/func_80240164_A574B0.s b/asm/nonmatchings/world/area_kpa/kpa_14/func_80240164_A574B0.s deleted file mode 100644 index 9613bbbbae..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/func_80240164_A574B0.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240164_A57614 -/* A57614 80240164 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A57618 80240168 AFB00010 */ sw $s0, 0x10($sp) -/* A5761C 8024016C 0080802D */ daddu $s0, $a0, $zero -/* A57620 80240170 10A00005 */ beqz $a1, .L80240188 -/* A57624 80240174 AFBF0014 */ sw $ra, 0x14($sp) -/* A57628 80240178 AE000070 */ sw $zero, 0x70($s0) -/* A5762C 8024017C AE000074 */ sw $zero, 0x74($s0) -/* A57630 80240180 AE000078 */ sw $zero, 0x78($s0) -/* A57634 80240184 AE00007C */ sw $zero, 0x7c($s0) -.L80240188: -/* A57638 80240188 8E020070 */ lw $v0, 0x70($s0) -/* A5763C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A57640 80240190 00000000 */ nop -/* A57644 80240194 8E0300A8 */ lw $v1, 0xa8($s0) -/* A57648 80240198 8E020088 */ lw $v0, 0x88($s0) -/* A5764C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A57650 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A57654 802401A4 AE0300A8 */ sw $v1, 0xa8($s0) -/* A57658 802401A8 3C020002 */ lui $v0, 2 -/* A5765C 802401AC 08090071 */ j .L802401C4 -/* A57660 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A57664 802401B4 3C040002 */ lui $a0, 2 -/* A57668 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A5766C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A57670 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A57674 802401C4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401C8: -/* A57678 802401C8 8E020074 */ lw $v0, 0x74($s0) -/* A5767C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A57680 802401D0 00000000 */ nop -/* A57684 802401D4 8E0300AC */ lw $v1, 0xac($s0) -/* A57688 802401D8 8E02008C */ lw $v0, 0x8c($s0) -/* A5768C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A57690 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A57694 802401E4 AE0300AC */ sw $v1, 0xac($s0) -/* A57698 802401E8 3C020002 */ lui $v0, 2 -/* A5769C 802401EC 08090081 */ j .L80240204 -/* A576A0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A576A4 802401F4 3C040002 */ lui $a0, 2 -/* A576A8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A576AC 802401FC 10400002 */ beqz $v0, .L80240208 -/* A576B0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A576B4 80240204 AE0200AC */ sw $v0, 0xac($s0) -.L80240208: -/* A576B8 80240208 8E020078 */ lw $v0, 0x78($s0) -/* A576BC 8024020C 1440000E */ bnez $v0, .L80240248 -/* A576C0 80240210 00000000 */ nop -/* A576C4 80240214 8E0300B0 */ lw $v1, 0xb0($s0) -/* A576C8 80240218 8E020090 */ lw $v0, 0x90($s0) -/* A576CC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A576D0 80240220 04610004 */ bgez $v1, .L80240234 -/* A576D4 80240224 AE0300B0 */ sw $v1, 0xb0($s0) -/* A576D8 80240228 3C020002 */ lui $v0, 2 -/* A576DC 8024022C 08090091 */ j .L80240244 -/* A576E0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A576E4 80240234 3C040002 */ lui $a0, 2 -/* A576E8 80240238 0083102A */ slt $v0, $a0, $v1 -/* A576EC 8024023C 10400002 */ beqz $v0, .L80240248 -/* A576F0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A576F4 80240244 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240248: -/* A576F8 80240248 8E02007C */ lw $v0, 0x7c($s0) -/* A576FC 8024024C 1440000E */ bnez $v0, .L80240288 -/* A57700 80240250 00000000 */ nop -/* A57704 80240254 8E0300B4 */ lw $v1, 0xb4($s0) -/* A57708 80240258 8E020094 */ lw $v0, 0x94($s0) -/* A5770C 8024025C 00621821 */ addu $v1, $v1, $v0 -/* A57710 80240260 04610004 */ bgez $v1, .L80240274 -/* A57714 80240264 AE0300B4 */ sw $v1, 0xb4($s0) -/* A57718 80240268 3C020002 */ lui $v0, 2 -/* A5771C 8024026C 080900A1 */ j .L80240284 -/* A57720 80240270 00621021 */ addu $v0, $v1, $v0 -.L80240274: -/* A57724 80240274 3C040002 */ lui $a0, 2 -/* A57728 80240278 0083102A */ slt $v0, $a0, $v1 -/* A5772C 8024027C 10400002 */ beqz $v0, .L80240288 -/* A57730 80240280 00641023 */ subu $v0, $v1, $a0 -.L80240284: -/* A57734 80240284 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240288: -/* A57738 80240288 8E040084 */ lw $a0, 0x84($s0) -/* A5773C 8024028C 0C046F07 */ jal set_main_pan_u -/* A57740 80240290 8E0500A8 */ lw $a1, 0xa8($s0) -/* A57744 80240294 8E040084 */ lw $a0, 0x84($s0) -/* A57748 80240298 0C046F0D */ jal set_main_pan_v -/* A5774C 8024029C 8E0500AC */ lw $a1, 0xac($s0) -/* A57750 802402A0 8E040084 */ lw $a0, 0x84($s0) -/* A57754 802402A4 0C046F13 */ jal set_aux_pan_u -/* A57758 802402A8 8E0500B0 */ lw $a1, 0xb0($s0) -/* A5775C 802402AC 8E040084 */ lw $a0, 0x84($s0) -/* A57760 802402B0 0C046F19 */ jal set_aux_pan_v -/* A57764 802402B4 8E0500B4 */ lw $a1, 0xb4($s0) -/* A57768 802402B8 8E020070 */ lw $v0, 0x70($s0) -/* A5776C 802402BC 8E030078 */ lw $v1, 0x78($s0) -/* A57770 802402C0 8E040098 */ lw $a0, 0x98($s0) -/* A57774 802402C4 24420001 */ addiu $v0, $v0, 1 -/* A57778 802402C8 AE020070 */ sw $v0, 0x70($s0) -/* A5777C 802402CC 8E020074 */ lw $v0, 0x74($s0) -/* A57780 802402D0 24630001 */ addiu $v1, $v1, 1 -/* A57784 802402D4 AE030078 */ sw $v1, 0x78($s0) -/* A57788 802402D8 8E030070 */ lw $v1, 0x70($s0) -/* A5778C 802402DC 24420001 */ addiu $v0, $v0, 1 -/* A57790 802402E0 AE020074 */ sw $v0, 0x74($s0) -/* A57794 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A57798 802402E8 0064182A */ slt $v1, $v1, $a0 -/* A5779C 802402EC 24420001 */ addiu $v0, $v0, 1 -/* A577A0 802402F0 14600002 */ bnez $v1, .L802402FC -/* A577A4 802402F4 AE02007C */ sw $v0, 0x7c($s0) -/* A577A8 802402F8 AE000070 */ sw $zero, 0x70($s0) -.L802402FC: -/* A577AC 802402FC 8E020074 */ lw $v0, 0x74($s0) -/* A577B0 80240300 8E03009C */ lw $v1, 0x9c($s0) -/* A577B4 80240304 0043102A */ slt $v0, $v0, $v1 -/* A577B8 80240308 50400001 */ beql $v0, $zero, .L80240310 -/* A577BC 8024030C AE000074 */ sw $zero, 0x74($s0) -.L80240310: -/* A577C0 80240310 8E020078 */ lw $v0, 0x78($s0) -/* A577C4 80240314 8E0300A0 */ lw $v1, 0xa0($s0) -/* A577C8 80240318 0043102A */ slt $v0, $v0, $v1 -/* A577CC 8024031C 50400001 */ beql $v0, $zero, .L80240324 -/* A577D0 80240320 AE000078 */ sw $zero, 0x78($s0) -.L80240324: -/* A577D4 80240324 8E02007C */ lw $v0, 0x7c($s0) -/* A577D8 80240328 8E0300A4 */ lw $v1, 0xa4($s0) -/* A577DC 8024032C 0043102A */ slt $v0, $v0, $v1 -/* A577E0 80240330 50400001 */ beql $v0, $zero, .L80240338 -/* A577E4 80240334 AE00007C */ sw $zero, 0x7c($s0) -.L80240338: -/* A577E8 80240338 8FBF0014 */ lw $ra, 0x14($sp) -/* A577EC 8024033C 8FB00010 */ lw $s0, 0x10($sp) -/* A577F0 80240340 0000102D */ daddu $v0, $zero, $zero -/* A577F4 80240344 03E00008 */ jr $ra -/* A577F8 80240348 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/func_80240380_A574B0.s b/asm/nonmatchings/world/area_kpa/kpa_14/func_80240380_A574B0.s deleted file mode 100644 index 38b334add3..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/func_80240380_A574B0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240380_A57830 -/* A57830 80240380 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A57834 80240384 AFB00010 */ sw $s0, 0x10($sp) -/* A57838 80240388 3C108024 */ lui $s0, 0x8024 -/* A5783C 8024038C 26101900 */ addiu $s0, $s0, 0x1900 -/* A57840 80240390 AFBF0018 */ sw $ra, 0x18($sp) -/* A57844 80240394 AFB10014 */ sw $s1, 0x14($sp) -/* A57848 80240398 8E020000 */ lw $v0, ($s0) -/* A5784C 8024039C 14400010 */ bnez $v0, .L802403E0 -/* A57850 802403A0 0080882D */ daddu $s1, $a0, $zero -/* A57854 802403A4 0C00AB39 */ jal heap_malloc -/* A57858 802403A8 24040040 */ addiu $a0, $zero, 0x40 -/* A5785C 802403AC AE020000 */ sw $v0, ($s0) -/* A57860 802403B0 0000182D */ daddu $v1, $zero, $zero -/* A57864 802403B4 0040282D */ daddu $a1, $v0, $zero -/* A57868 802403B8 0220202D */ daddu $a0, $s1, $zero -.L802403BC: -/* A5786C 802403BC 8C820084 */ lw $v0, 0x84($a0) -/* A57870 802403C0 24840004 */ addiu $a0, $a0, 4 -/* A57874 802403C4 24630001 */ addiu $v1, $v1, 1 -/* A57878 802403C8 ACA20000 */ sw $v0, ($a1) -/* A5787C 802403CC 28620010 */ slti $v0, $v1, 0x10 -/* A57880 802403D0 1440FFFA */ bnez $v0, .L802403BC -/* A57884 802403D4 24A50004 */ addiu $a1, $a1, 4 -/* A57888 802403D8 08090107 */ j .L8024041C -/* A5788C 802403DC 00000000 */ nop -.L802403E0: -/* A57890 802403E0 0000182D */ daddu $v1, $zero, $zero -/* A57894 802403E4 0040282D */ daddu $a1, $v0, $zero -/* A57898 802403E8 0220202D */ daddu $a0, $s1, $zero -.L802403EC: -/* A5789C 802403EC 8CA20000 */ lw $v0, ($a1) -/* A578A0 802403F0 24A50004 */ addiu $a1, $a1, 4 -/* A578A4 802403F4 24630001 */ addiu $v1, $v1, 1 -/* A578A8 802403F8 AC820084 */ sw $v0, 0x84($a0) -/* A578AC 802403FC 28620010 */ slti $v0, $v1, 0x10 -/* A578B0 80240400 1440FFFA */ bnez $v0, .L802403EC -/* A578B4 80240404 24840004 */ addiu $a0, $a0, 4 -/* A578B8 80240408 3C108024 */ lui $s0, 0x8024 -/* A578BC 8024040C 26101900 */ addiu $s0, $s0, 0x1900 -/* A578C0 80240410 0C00AB4B */ jal heap_free -/* A578C4 80240414 8E040000 */ lw $a0, ($s0) -/* A578C8 80240418 AE000000 */ sw $zero, ($s0) -.L8024041C: -/* A578CC 8024041C 8FBF0018 */ lw $ra, 0x18($sp) -/* A578D0 80240420 8FB10014 */ lw $s1, 0x14($sp) -/* A578D4 80240424 8FB00010 */ lw $s0, 0x10($sp) -/* A578D8 80240428 24020002 */ addiu $v0, $zero, 2 -/* A578DC 8024042C 03E00008 */ jr $ra -/* A578E0 80240430 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/func_80240434_A574B0.s b/asm/nonmatchings/world/area_kpa/kpa_14/func_80240434_A574B0.s deleted file mode 100644 index c77d44ff35..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/func_80240434_A574B0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240434_A578E4 -/* A578E4 80240434 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A578E8 80240438 AFB00010 */ sw $s0, 0x10($sp) -/* A578EC 8024043C 0080802D */ daddu $s0, $a0, $zero -/* A578F0 80240440 AFBF0018 */ sw $ra, 0x18($sp) -/* A578F4 80240444 AFB10014 */ sw $s1, 0x14($sp) -/* A578F8 80240448 8E02000C */ lw $v0, 0xc($s0) -/* A578FC 8024044C 8C510000 */ lw $s1, ($v0) -/* A57900 80240450 0C0B1EAF */ jal get_variable -/* A57904 80240454 0220282D */ daddu $a1, $s1, $zero -/* A57908 80240458 3C03FFF0 */ lui $v1, 0xfff0 -/* A5790C 8024045C 3463FFFF */ ori $v1, $v1, 0xffff -/* A57910 80240460 0200202D */ daddu $a0, $s0, $zero -/* A57914 80240464 00431024 */ and $v0, $v0, $v1 -/* A57918 80240468 00021140 */ sll $v0, $v0, 5 -/* A5791C 8024046C 3C068008 */ lui $a2, %hi(gItemTable) -/* A57920 80240470 00C23021 */ addu $a2, $a2, $v0 -/* A57924 80240474 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* A57928 80240478 0C0B2026 */ jal set_variable -/* A5792C 8024047C 0220282D */ daddu $a1, $s1, $zero -/* A57930 80240480 8FBF0018 */ lw $ra, 0x18($sp) -/* A57934 80240484 8FB10014 */ lw $s1, 0x14($sp) -/* A57938 80240488 8FB00010 */ lw $s0, 0x10($sp) -/* A5793C 8024048C 24020002 */ addiu $v0, $zero, 2 -/* A57940 80240490 03E00008 */ jr $ra -/* A57944 80240494 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/func_802405E8_A574B0.s b/asm/nonmatchings/world/area_kpa/kpa_14/func_802405E8_A574B0.s deleted file mode 100644 index d5a3627e3e..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/func_802405E8_A574B0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405E8_A57A98 -/* A57A98 802405E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A57A9C 802405EC AFB00010 */ sw $s0, 0x10($sp) -/* A57AA0 802405F0 0080802D */ daddu $s0, $a0, $zero -/* A57AA4 802405F4 AFBF0014 */ sw $ra, 0x14($sp) -/* A57AA8 802405F8 8E02000C */ lw $v0, 0xc($s0) -/* A57AAC 802405FC 0C0B1EAF */ jal get_variable -/* A57AB0 80240600 8C450000 */ lw $a1, ($v0) -/* A57AB4 80240604 00021140 */ sll $v0, $v0, 5 -/* A57AB8 80240608 AE000084 */ sw $zero, 0x84($s0) -/* A57ABC 8024060C 3C018008 */ lui $at, 0x8008 -/* A57AC0 80240610 00220821 */ addu $at, $at, $v0 -/* A57AC4 80240614 942278F8 */ lhu $v0, 0x78f8($at) -/* A57AC8 80240618 30420040 */ andi $v0, $v0, 0x40 -/* A57ACC 8024061C 10400002 */ beqz $v0, .L80240628 -/* A57AD0 80240620 24020001 */ addiu $v0, $zero, 1 -/* A57AD4 80240624 AE020084 */ sw $v0, 0x84($s0) -.L80240628: -/* A57AD8 80240628 8FBF0014 */ lw $ra, 0x14($sp) -/* A57ADC 8024062C 8FB00010 */ lw $s0, 0x10($sp) -/* A57AE0 80240630 24020002 */ addiu $v0, $zero, 2 -/* A57AE4 80240634 03E00008 */ jr $ra -/* A57AE8 80240638 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/func_80240710_A574B0.s b/asm/nonmatchings/world/area_kpa/kpa_14/func_80240710_A574B0.s deleted file mode 100644 index 70bef50744..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/func_80240710_A574B0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240710_A57BC0 -/* A57BC0 80240710 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A57BC4 80240714 AFBF0010 */ sw $ra, 0x10($sp) -/* A57BC8 80240718 8C82000C */ lw $v0, 0xc($a0) -/* A57BCC 8024071C 3C068016 */ lui $a2, 0x8016 -/* A57BD0 80240720 84C6A556 */ lh $a2, -0x5aaa($a2) -/* A57BD4 80240724 0C0B2026 */ jal set_variable -/* A57BD8 80240728 8C450000 */ lw $a1, ($v0) -/* A57BDC 8024072C 8FBF0010 */ lw $ra, 0x10($sp) -/* A57BE0 80240730 24020002 */ addiu $v0, $zero, 2 -/* A57BE4 80240734 03E00008 */ jr $ra -/* A57BE8 80240738 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/func_8024073C_A574B0.s b/asm/nonmatchings/world/area_kpa/kpa_14/func_8024073C_A574B0.s deleted file mode 100644 index 146abb0384..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/func_8024073C_A574B0.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024073C_A57BEC -/* A57BEC 8024073C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A57BF0 80240740 AFB10014 */ sw $s1, 0x14($sp) -/* A57BF4 80240744 0080882D */ daddu $s1, $a0, $zero -/* A57BF8 80240748 AFBF001C */ sw $ra, 0x1c($sp) -/* A57BFC 8024074C AFB20018 */ sw $s2, 0x18($sp) -/* A57C00 80240750 AFB00010 */ sw $s0, 0x10($sp) -/* A57C04 80240754 8E30000C */ lw $s0, 0xc($s1) -/* A57C08 80240758 8E050000 */ lw $a1, ($s0) -/* A57C0C 8024075C 0C0B1EAF */ jal get_variable -/* A57C10 80240760 26100004 */ addiu $s0, $s0, 4 -/* A57C14 80240764 8E050000 */ lw $a1, ($s0) -/* A57C18 80240768 26100004 */ addiu $s0, $s0, 4 -/* A57C1C 8024076C 0220202D */ daddu $a0, $s1, $zero -/* A57C20 80240770 0C0B1EAF */ jal get_variable -/* A57C24 80240774 0040902D */ daddu $s2, $v0, $zero -/* A57C28 80240778 0220202D */ daddu $a0, $s1, $zero -/* A57C2C 8024077C 8E050000 */ lw $a1, ($s0) -/* A57C30 80240780 0C0B1EAF */ jal get_variable -/* A57C34 80240784 0040802D */ daddu $s0, $v0, $zero -/* A57C38 80240788 0040202D */ daddu $a0, $v0, $zero -/* A57C3C 8024078C 3C038016 */ lui $v1, 0x8016 -/* A57C40 80240790 2463A550 */ addiu $v1, $v1, -0x5ab0 -/* A57C44 80240794 84620002 */ lh $v0, 2($v1) -/* A57C48 80240798 3C058011 */ lui $a1, %hi(gPlayerStatus) -/* A57C4C 8024079C 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) -/* A57C50 802407A0 10500004 */ beq $v0, $s0, .L802407B4 -/* A57C54 802407A4 00000000 */ nop -/* A57C58 802407A8 84620004 */ lh $v0, 4($v1) -/* A57C5C 802407AC 1450000D */ bne $v0, $s0, .L802407E4 -/* A57C60 802407B0 00000000 */ nop -.L802407B4: -/* A57C64 802407B4 80A300B4 */ lb $v1, 0xb4($a1) -/* A57C68 802407B8 2402000F */ addiu $v0, $zero, 0xf -/* A57C6C 802407BC 10620009 */ beq $v1, $v0, .L802407E4 -/* A57C70 802407C0 2402000D */ addiu $v0, $zero, 0xd -/* A57C74 802407C4 10620007 */ beq $v1, $v0, .L802407E4 -/* A57C78 802407C8 00000000 */ nop -/* A57C7C 802407CC 14800005 */ bnez $a0, .L802407E4 -/* A57C80 802407D0 00000000 */ nop -/* A57C84 802407D4 44920000 */ mtc1 $s2, $f0 -/* A57C88 802407D8 00000000 */ nop -/* A57C8C 802407DC 46800020 */ cvt.s.w $f0, $f0 -/* A57C90 802407E0 E4A0001C */ swc1 $f0, 0x1c($a1) -.L802407E4: -/* A57C94 802407E4 3C028011 */ lui $v0, 0x8011 -/* A57C98 802407E8 8042F2A2 */ lb $v0, -0xd5e($v0) -/* A57C9C 802407EC 1040000D */ beqz $v0, .L80240824 -/* A57CA0 802407F0 00000000 */ nop -/* A57CA4 802407F4 0C00EABB */ jal get_npc_unsafe -/* A57CA8 802407F8 2404FFFC */ addiu $a0, $zero, -4 -/* A57CAC 802407FC 0040182D */ daddu $v1, $v0, $zero -/* A57CB0 80240800 84620084 */ lh $v0, 0x84($v1) -/* A57CB4 80240804 14500007 */ bne $v0, $s0, .L80240824 -/* A57CB8 80240808 00000000 */ nop -/* A57CBC 8024080C C4600038 */ lwc1 $f0, 0x38($v1) -/* A57CC0 80240810 44921000 */ mtc1 $s2, $f2 -/* A57CC4 80240814 00000000 */ nop -/* A57CC8 80240818 468010A0 */ cvt.s.w $f2, $f2 -/* A57CCC 8024081C 46020000 */ add.s $f0, $f0, $f2 -/* A57CD0 80240820 E4600038 */ swc1 $f0, 0x38($v1) -.L80240824: -/* A57CD4 80240824 8FBF001C */ lw $ra, 0x1c($sp) -/* A57CD8 80240828 8FB20018 */ lw $s2, 0x18($sp) -/* A57CDC 8024082C 8FB10014 */ lw $s1, 0x14($sp) -/* A57CE0 80240830 8FB00010 */ lw $s0, 0x10($sp) -/* A57CE4 80240834 24020002 */ addiu $v0, $zero, 2 -/* A57CE8 80240838 03E00008 */ jr $ra -/* A57CEC 8024083C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_15/func_80240124_A59390.s b/asm/nonmatchings/world/area_kpa/kpa_15/func_80240124_A59390.s deleted file mode 100644 index 7412ebf983..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_15/func_80240124_A59390.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A594B4 -/* A594B4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A594B8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A594BC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A594C0 80240130 10A00005 */ beqz $a1, .L80240148 -/* A594C4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A594C8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A594CC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A594D0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A594D4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A594D8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A594DC 8024014C 1440000E */ bnez $v0, .L80240188 -/* A594E0 80240150 00000000 */ nop -/* A594E4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A594E8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A594EC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A594F0 80240160 04610004 */ bgez $v1, .L80240174 -/* A594F4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A594F8 80240168 3C020002 */ lui $v0, 2 -/* A594FC 8024016C 08090061 */ j .L80240184 -/* A59500 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A59504 80240174 3C040002 */ lui $a0, 2 -/* A59508 80240178 0083102A */ slt $v0, $a0, $v1 -/* A5950C 8024017C 10400002 */ beqz $v0, .L80240188 -/* A59510 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A59514 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A59518 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A5951C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A59520 80240190 00000000 */ nop -/* A59524 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A59528 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A5952C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A59530 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A59534 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A59538 802401A8 3C020002 */ lui $v0, 2 -/* A5953C 802401AC 08090071 */ j .L802401C4 -/* A59540 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A59544 802401B4 3C040002 */ lui $a0, 2 -/* A59548 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A5954C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A59550 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A59554 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A59558 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A5955C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A59560 802401D0 00000000 */ nop -/* A59564 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A59568 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A5956C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A59570 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A59574 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A59578 802401E8 3C020002 */ lui $v0, 2 -/* A5957C 802401EC 08090081 */ j .L80240204 -/* A59580 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A59584 802401F4 3C040002 */ lui $a0, 2 -/* A59588 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A5958C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A59590 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A59594 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A59598 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A5959C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A595A0 80240210 00000000 */ nop -/* A595A4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A595A8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A595AC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A595B0 80240220 04610004 */ bgez $v1, .L80240234 -/* A595B4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A595B8 80240228 3C020002 */ lui $v0, 2 -/* A595BC 8024022C 08090091 */ j .L80240244 -/* A595C0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A595C4 80240234 3C040002 */ lui $a0, 2 -/* A595C8 80240238 0083102A */ slt $v0, $a0, $v1 -/* A595CC 8024023C 10400002 */ beqz $v0, .L80240248 -/* A595D0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A595D4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A595D8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A595DC 8024024C 0C046F07 */ jal set_main_pan_u -/* A595E0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A595E4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A595E8 80240258 0C046F0D */ jal set_main_pan_v -/* A595EC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A595F0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A595F4 80240264 0C046F13 */ jal set_aux_pan_u -/* A595F8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A595FC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A59600 80240270 0C046F19 */ jal set_aux_pan_v -/* A59604 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A59608 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A5960C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A59610 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A59614 80240284 24420001 */ addiu $v0, $v0, 1 -/* A59618 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A5961C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A59620 80240290 24630001 */ addiu $v1, $v1, 1 -/* A59624 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A59628 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A5962C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A59630 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A59634 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A59638 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A5963C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A59640 802402B0 14600002 */ bnez $v1, .L802402BC -/* A59644 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A59648 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A5964C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A59650 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A59654 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A59658 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A5965C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A59660 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A59664 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A59668 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A5966C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A59670 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A59674 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A59678 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A5967C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A59680 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A59684 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A59688 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A5968C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A59690 80240300 0000102D */ daddu $v0, $zero, $zero -/* A59694 80240304 03E00008 */ jr $ra -/* A59698 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A5969C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_15/func_80240310_A59390.s b/asm/nonmatchings/world/area_kpa/kpa_15/func_80240310_A59390.s deleted file mode 100644 index d839af1a59..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_15/func_80240310_A59390.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_A596A0 -/* A596A0 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A596A4 80240314 AFB00010 */ sw $s0, 0x10($sp) -/* A596A8 80240318 3C108024 */ lui $s0, 0x8024 -/* A596AC 8024031C 26100AA0 */ addiu $s0, $s0, 0xaa0 -/* A596B0 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* A596B4 80240324 AFB10014 */ sw $s1, 0x14($sp) -/* A596B8 80240328 8E020000 */ lw $v0, ($s0) -/* A596BC 8024032C 14400010 */ bnez $v0, .L80240370 -/* A596C0 80240330 0080882D */ daddu $s1, $a0, $zero -/* A596C4 80240334 0C00AB39 */ jal heap_malloc -/* A596C8 80240338 24040040 */ addiu $a0, $zero, 0x40 -/* A596CC 8024033C AE020000 */ sw $v0, ($s0) -/* A596D0 80240340 0000182D */ daddu $v1, $zero, $zero -/* A596D4 80240344 0040282D */ daddu $a1, $v0, $zero -/* A596D8 80240348 0220202D */ daddu $a0, $s1, $zero -.L8024034C: -/* A596DC 8024034C 8C820084 */ lw $v0, 0x84($a0) -/* A596E0 80240350 24840004 */ addiu $a0, $a0, 4 -/* A596E4 80240354 24630001 */ addiu $v1, $v1, 1 -/* A596E8 80240358 ACA20000 */ sw $v0, ($a1) -/* A596EC 8024035C 28620010 */ slti $v0, $v1, 0x10 -/* A596F0 80240360 1440FFFA */ bnez $v0, .L8024034C -/* A596F4 80240364 24A50004 */ addiu $a1, $a1, 4 -/* A596F8 80240368 080900EB */ j .L802403AC -/* A596FC 8024036C 00000000 */ nop -.L80240370: -/* A59700 80240370 0000182D */ daddu $v1, $zero, $zero -/* A59704 80240374 0040282D */ daddu $a1, $v0, $zero -/* A59708 80240378 0220202D */ daddu $a0, $s1, $zero -.L8024037C: -/* A5970C 8024037C 8CA20000 */ lw $v0, ($a1) -/* A59710 80240380 24A50004 */ addiu $a1, $a1, 4 -/* A59714 80240384 24630001 */ addiu $v1, $v1, 1 -/* A59718 80240388 AC820084 */ sw $v0, 0x84($a0) -/* A5971C 8024038C 28620010 */ slti $v0, $v1, 0x10 -/* A59720 80240390 1440FFFA */ bnez $v0, .L8024037C -/* A59724 80240394 24840004 */ addiu $a0, $a0, 4 -/* A59728 80240398 3C108024 */ lui $s0, 0x8024 -/* A5972C 8024039C 26100AA0 */ addiu $s0, $s0, 0xaa0 -/* A59730 802403A0 0C00AB4B */ jal heap_free -/* A59734 802403A4 8E040000 */ lw $a0, ($s0) -/* A59738 802403A8 AE000000 */ sw $zero, ($s0) -.L802403AC: -/* A5973C 802403AC 8FBF0018 */ lw $ra, 0x18($sp) -/* A59740 802403B0 8FB10014 */ lw $s1, 0x14($sp) -/* A59744 802403B4 8FB00010 */ lw $s0, 0x10($sp) -/* A59748 802403B8 24020002 */ addiu $v0, $zero, 2 -/* A5974C 802403BC 03E00008 */ jr $ra -/* A59750 802403C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_15/func_802403C4_A59390.s b/asm/nonmatchings/world/area_kpa/kpa_15/func_802403C4_A59390.s deleted file mode 100644 index 341e076842..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_15/func_802403C4_A59390.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C4_A59754 -/* A59754 802403C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A59758 802403C8 AFB00010 */ sw $s0, 0x10($sp) -/* A5975C 802403CC 0080802D */ daddu $s0, $a0, $zero -/* A59760 802403D0 AFBF0018 */ sw $ra, 0x18($sp) -/* A59764 802403D4 AFB10014 */ sw $s1, 0x14($sp) -/* A59768 802403D8 8E02000C */ lw $v0, 0xc($s0) -/* A5976C 802403DC 8C510000 */ lw $s1, ($v0) -/* A59770 802403E0 0C0B1EAF */ jal get_variable -/* A59774 802403E4 0220282D */ daddu $a1, $s1, $zero -/* A59778 802403E8 3C03FFF0 */ lui $v1, 0xfff0 -/* A5977C 802403EC 3463FFFF */ ori $v1, $v1, 0xffff -/* A59780 802403F0 0200202D */ daddu $a0, $s0, $zero -/* A59784 802403F4 00431024 */ and $v0, $v0, $v1 -/* A59788 802403F8 00021140 */ sll $v0, $v0, 5 -/* A5978C 802403FC 3C068008 */ lui $a2, %hi(gItemTable) -/* A59790 80240400 00C23021 */ addu $a2, $a2, $v0 -/* A59794 80240404 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* A59798 80240408 0C0B2026 */ jal set_variable -/* A5979C 8024040C 0220282D */ daddu $a1, $s1, $zero -/* A597A0 80240410 8FBF0018 */ lw $ra, 0x18($sp) -/* A597A4 80240414 8FB10014 */ lw $s1, 0x14($sp) -/* A597A8 80240418 8FB00010 */ lw $s0, 0x10($sp) -/* A597AC 8024041C 24020002 */ addiu $v0, $zero, 2 -/* A597B0 80240420 03E00008 */ jr $ra -/* A597B4 80240424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_15/func_80240428_A59390.s b/asm/nonmatchings/world/area_kpa/kpa_15/func_80240428_A59390.s deleted file mode 100644 index 096399d671..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_15/func_80240428_A59390.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_kpa/kpa_15/func_80240578_A59390.s b/asm/nonmatchings/world/area_kpa/kpa_15/func_80240578_A59390.s deleted file mode 100644 index 8a45449717..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_15/func_80240578_A59390.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240578_A59908 -/* A59908 80240578 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A5990C 8024057C AFB00010 */ sw $s0, 0x10($sp) -/* A59910 80240580 0080802D */ daddu $s0, $a0, $zero -/* A59914 80240584 AFBF0014 */ sw $ra, 0x14($sp) -/* A59918 80240588 8E02000C */ lw $v0, 0xc($s0) -/* A5991C 8024058C 0C0B1EAF */ jal get_variable -/* A59920 80240590 8C450000 */ lw $a1, ($v0) -/* A59924 80240594 00021140 */ sll $v0, $v0, 5 -/* A59928 80240598 AE000084 */ sw $zero, 0x84($s0) -/* A5992C 8024059C 3C018008 */ lui $at, 0x8008 -/* A59930 802405A0 00220821 */ addu $at, $at, $v0 -/* A59934 802405A4 942278F8 */ lhu $v0, 0x78f8($at) -/* A59938 802405A8 30420040 */ andi $v0, $v0, 0x40 -/* A5993C 802405AC 10400002 */ beqz $v0, .L802405B8 -/* A59940 802405B0 24020001 */ addiu $v0, $zero, 1 -/* A59944 802405B4 AE020084 */ sw $v0, 0x84($s0) -.L802405B8: -/* A59948 802405B8 8FBF0014 */ lw $ra, 0x14($sp) -/* A5994C 802405BC 8FB00010 */ lw $s0, 0x10($sp) -/* A59950 802405C0 24020002 */ addiu $v0, $zero, 2 -/* A59954 802405C4 03E00008 */ jr $ra -/* A59958 802405C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A5995C 802405CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_16/func_80240124_A5A030.s b/asm/nonmatchings/world/area_kpa/kpa_16/func_80240124_A5A030.s deleted file mode 100644 index b8bcd549b3..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_16/func_80240124_A5A030.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A5A154 -/* A5A154 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A5A158 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A5A15C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A5A160 80240130 10A00005 */ beqz $a1, .L80240148 -/* A5A164 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A5A168 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A5A16C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A5A170 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A5A174 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A5A178 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A5A17C 8024014C 1440000E */ bnez $v0, .L80240188 -/* A5A180 80240150 00000000 */ nop -/* A5A184 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A5A188 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A5A18C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A5A190 80240160 04610004 */ bgez $v1, .L80240174 -/* A5A194 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A5A198 80240168 3C020002 */ lui $v0, 2 -/* A5A19C 8024016C 08090061 */ j .L80240184 -/* A5A1A0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A5A1A4 80240174 3C040002 */ lui $a0, 2 -/* A5A1A8 80240178 0083102A */ slt $v0, $a0, $v1 -/* A5A1AC 8024017C 10400002 */ beqz $v0, .L80240188 -/* A5A1B0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A5A1B4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A5A1B8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A5A1BC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A5A1C0 80240190 00000000 */ nop -/* A5A1C4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A5A1C8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A5A1CC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A5A1D0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A5A1D4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A5A1D8 802401A8 3C020002 */ lui $v0, 2 -/* A5A1DC 802401AC 08090071 */ j .L802401C4 -/* A5A1E0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A5A1E4 802401B4 3C040002 */ lui $a0, 2 -/* A5A1E8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A5A1EC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A5A1F0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A5A1F4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A5A1F8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A5A1FC 802401CC 1440000E */ bnez $v0, .L80240208 -/* A5A200 802401D0 00000000 */ nop -/* A5A204 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A5A208 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A5A20C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A5A210 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A5A214 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A5A218 802401E8 3C020002 */ lui $v0, 2 -/* A5A21C 802401EC 08090081 */ j .L80240204 -/* A5A220 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A5A224 802401F4 3C040002 */ lui $a0, 2 -/* A5A228 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A5A22C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A5A230 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A5A234 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A5A238 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A5A23C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A5A240 80240210 00000000 */ nop -/* A5A244 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A5A248 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A5A24C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A5A250 80240220 04610004 */ bgez $v1, .L80240234 -/* A5A254 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A5A258 80240228 3C020002 */ lui $v0, 2 -/* A5A25C 8024022C 08090091 */ j .L80240244 -/* A5A260 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A5A264 80240234 3C040002 */ lui $a0, 2 -/* A5A268 80240238 0083102A */ slt $v0, $a0, $v1 -/* A5A26C 8024023C 10400002 */ beqz $v0, .L80240248 -/* A5A270 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A5A274 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A5A278 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A5A27C 8024024C 0C046F07 */ jal set_main_pan_u -/* A5A280 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A5A284 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A5A288 80240258 0C046F0D */ jal set_main_pan_v -/* A5A28C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A5A290 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A5A294 80240264 0C046F13 */ jal set_aux_pan_u -/* A5A298 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A5A29C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A5A2A0 80240270 0C046F19 */ jal set_aux_pan_v -/* A5A2A4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A5A2A8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A5A2AC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A5A2B0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A5A2B4 80240284 24420001 */ addiu $v0, $v0, 1 -/* A5A2B8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A5A2BC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A5A2C0 80240290 24630001 */ addiu $v1, $v1, 1 -/* A5A2C4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A5A2C8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A5A2CC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A5A2D0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A5A2D4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A5A2D8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A5A2DC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A5A2E0 802402B0 14600002 */ bnez $v1, .L802402BC -/* A5A2E4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A5A2E8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A5A2EC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A5A2F0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A5A2F4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A5A2F8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A5A2FC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A5A300 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A5A304 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A5A308 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A5A30C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A5A310 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A5A314 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A5A318 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A5A31C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A5A320 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A5A324 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A5A328 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A5A32C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A5A330 80240300 0000102D */ daddu $v0, $zero, $zero -/* A5A334 80240304 03E00008 */ jr $ra -/* A5A338 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A5A33C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_16/func_80240310_A5A030.s b/asm/nonmatchings/world/area_kpa/kpa_16/func_80240310_A5A030.s deleted file mode 100644 index ce22406ecd..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_16/func_80240310_A5A030.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_A5A340 -/* A5A340 80240310 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A5A344 80240314 AFBF0010 */ sw $ra, 0x10($sp) -/* A5A348 80240318 8C82000C */ lw $v0, 0xc($a0) -/* A5A34C 8024031C 0C0B1EAF */ jal get_variable -/* A5A350 80240320 8C450000 */ lw $a1, ($v0) -/* A5A354 80240324 44820000 */ mtc1 $v0, $f0 -/* A5A358 80240328 00000000 */ nop -/* A5A35C 8024032C 46800020 */ cvt.s.w $f0, $f0 -/* A5A360 80240330 44050000 */ mfc1 $a1, $f0 -/* A5A364 80240334 0C04DF62 */ jal func_80137D88 -/* A5A368 80240338 0000202D */ daddu $a0, $zero, $zero -/* A5A36C 8024033C 8FBF0010 */ lw $ra, 0x10($sp) -/* A5A370 80240340 24020002 */ addiu $v0, $zero, 2 -/* A5A374 80240344 03E00008 */ jr $ra -/* A5A378 80240348 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_16/func_8024034C_A5A030.s b/asm/nonmatchings/world/area_kpa/kpa_16/func_8024034C_A5A030.s deleted file mode 100644 index 8ba7b03034..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_16/func_8024034C_A5A030.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024034C_A5A37C -/* A5A37C 8024034C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A5A380 80240350 0000202D */ daddu $a0, $zero, $zero -/* A5A384 80240354 AFBF0010 */ sw $ra, 0x10($sp) -/* A5A388 80240358 0C015586 */ jal func_80055618 -/* A5A38C 8024035C 24050001 */ addiu $a1, $zero, 1 -/* A5A390 80240360 8FBF0010 */ lw $ra, 0x10($sp) -/* A5A394 80240364 24020002 */ addiu $v0, $zero, 2 -/* A5A398 80240368 03E00008 */ jr $ra -/* A5A39C 8024036C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_16/func_80240370_A5A030.s b/asm/nonmatchings/world/area_kpa/kpa_16/func_80240370_A5A030.s deleted file mode 100644 index 83a1cc6e24..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_16/func_80240370_A5A030.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240370_A5A3A0 -/* A5A3A0 80240370 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A5A3A4 80240374 AFBF0010 */ sw $ra, 0x10($sp) -/* A5A3A8 80240378 8C82000C */ lw $v0, 0xc($a0) -/* A5A3AC 8024037C 3C068016 */ lui $a2, 0x8016 -/* A5A3B0 80240380 84C6A552 */ lh $a2, -0x5aae($a2) -/* A5A3B4 80240384 0C0B2026 */ jal set_variable -/* A5A3B8 80240388 8C450000 */ lw $a1, ($v0) -/* A5A3BC 8024038C 8FBF0010 */ lw $ra, 0x10($sp) -/* A5A3C0 80240390 24020002 */ addiu $v0, $zero, 2 -/* A5A3C4 80240394 03E00008 */ jr $ra -/* A5A3C8 80240398 27BD0018 */ addiu $sp, $sp, 0x18 -/* A5A3CC 8024039C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_32/func_80240124_A5E0C0.s b/asm/nonmatchings/world/area_kpa/kpa_32/func_80240124_A5E0C0.s deleted file mode 100644 index abf05bfe5b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_32/func_80240124_A5E0C0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A5E1E4 -/* A5E1E4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A5E1E8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A5E1EC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A5E1F0 80240130 10A00005 */ beqz $a1, .L80240148 -/* A5E1F4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A5E1F8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A5E1FC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A5E200 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A5E204 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A5E208 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A5E20C 8024014C 1440000E */ bnez $v0, .L80240188 -/* A5E210 80240150 00000000 */ nop -/* A5E214 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A5E218 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A5E21C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A5E220 80240160 04610004 */ bgez $v1, .L80240174 -/* A5E224 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A5E228 80240168 3C020002 */ lui $v0, 2 -/* A5E22C 8024016C 08090061 */ j .L80240184 -/* A5E230 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A5E234 80240174 3C040002 */ lui $a0, 2 -/* A5E238 80240178 0083102A */ slt $v0, $a0, $v1 -/* A5E23C 8024017C 10400002 */ beqz $v0, .L80240188 -/* A5E240 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A5E244 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A5E248 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A5E24C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A5E250 80240190 00000000 */ nop -/* A5E254 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A5E258 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A5E25C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A5E260 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A5E264 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A5E268 802401A8 3C020002 */ lui $v0, 2 -/* A5E26C 802401AC 08090071 */ j .L802401C4 -/* A5E270 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A5E274 802401B4 3C040002 */ lui $a0, 2 -/* A5E278 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A5E27C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A5E280 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A5E284 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A5E288 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A5E28C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A5E290 802401D0 00000000 */ nop -/* A5E294 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A5E298 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A5E29C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A5E2A0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A5E2A4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A5E2A8 802401E8 3C020002 */ lui $v0, 2 -/* A5E2AC 802401EC 08090081 */ j .L80240204 -/* A5E2B0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A5E2B4 802401F4 3C040002 */ lui $a0, 2 -/* A5E2B8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A5E2BC 802401FC 10400002 */ beqz $v0, .L80240208 -/* A5E2C0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A5E2C4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A5E2C8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A5E2CC 8024020C 1440000E */ bnez $v0, .L80240248 -/* A5E2D0 80240210 00000000 */ nop -/* A5E2D4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A5E2D8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A5E2DC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A5E2E0 80240220 04610004 */ bgez $v1, .L80240234 -/* A5E2E4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A5E2E8 80240228 3C020002 */ lui $v0, 2 -/* A5E2EC 8024022C 08090091 */ j .L80240244 -/* A5E2F0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A5E2F4 80240234 3C040002 */ lui $a0, 2 -/* A5E2F8 80240238 0083102A */ slt $v0, $a0, $v1 -/* A5E2FC 8024023C 10400002 */ beqz $v0, .L80240248 -/* A5E300 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A5E304 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A5E308 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A5E30C 8024024C 0C046F07 */ jal set_main_pan_u -/* A5E310 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A5E314 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A5E318 80240258 0C046F0D */ jal set_main_pan_v -/* A5E31C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A5E320 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A5E324 80240264 0C046F13 */ jal set_aux_pan_u -/* A5E328 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A5E32C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A5E330 80240270 0C046F19 */ jal set_aux_pan_v -/* A5E334 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A5E338 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A5E33C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A5E340 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A5E344 80240284 24420001 */ addiu $v0, $v0, 1 -/* A5E348 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A5E34C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A5E350 80240290 24630001 */ addiu $v1, $v1, 1 -/* A5E354 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A5E358 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A5E35C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A5E360 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A5E364 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A5E368 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A5E36C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A5E370 802402B0 14600002 */ bnez $v1, .L802402BC -/* A5E374 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A5E378 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A5E37C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A5E380 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A5E384 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A5E388 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A5E38C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A5E390 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A5E394 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A5E398 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A5E39C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A5E3A0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A5E3A4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A5E3A8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A5E3AC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A5E3B0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A5E3B4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A5E3B8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A5E3BC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A5E3C0 80240300 0000102D */ daddu $v0, $zero, $zero -/* A5E3C4 80240304 03E00008 */ jr $ra -/* A5E3C8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A5E3CC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_33/func_80240124_A5F080.s b/asm/nonmatchings/world/area_kpa/kpa_33/func_80240124_A5F080.s deleted file mode 100644 index 3f5492124f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_33/func_80240124_A5F080.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A5F1A4 -/* A5F1A4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A5F1A8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A5F1AC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A5F1B0 80240130 10A00005 */ beqz $a1, .L80240148 -/* A5F1B4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A5F1B8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A5F1BC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A5F1C0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A5F1C4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A5F1C8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A5F1CC 8024014C 1440000E */ bnez $v0, .L80240188 -/* A5F1D0 80240150 00000000 */ nop -/* A5F1D4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A5F1D8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A5F1DC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A5F1E0 80240160 04610004 */ bgez $v1, .L80240174 -/* A5F1E4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A5F1E8 80240168 3C020002 */ lui $v0, 2 -/* A5F1EC 8024016C 08090061 */ j .L80240184 -/* A5F1F0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A5F1F4 80240174 3C040002 */ lui $a0, 2 -/* A5F1F8 80240178 0083102A */ slt $v0, $a0, $v1 -/* A5F1FC 8024017C 10400002 */ beqz $v0, .L80240188 -/* A5F200 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A5F204 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A5F208 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A5F20C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A5F210 80240190 00000000 */ nop -/* A5F214 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A5F218 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A5F21C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A5F220 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A5F224 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A5F228 802401A8 3C020002 */ lui $v0, 2 -/* A5F22C 802401AC 08090071 */ j .L802401C4 -/* A5F230 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A5F234 802401B4 3C040002 */ lui $a0, 2 -/* A5F238 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A5F23C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A5F240 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A5F244 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A5F248 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A5F24C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A5F250 802401D0 00000000 */ nop -/* A5F254 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A5F258 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A5F25C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A5F260 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A5F264 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A5F268 802401E8 3C020002 */ lui $v0, 2 -/* A5F26C 802401EC 08090081 */ j .L80240204 -/* A5F270 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A5F274 802401F4 3C040002 */ lui $a0, 2 -/* A5F278 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A5F27C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A5F280 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A5F284 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A5F288 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A5F28C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A5F290 80240210 00000000 */ nop -/* A5F294 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A5F298 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A5F29C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A5F2A0 80240220 04610004 */ bgez $v1, .L80240234 -/* A5F2A4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A5F2A8 80240228 3C020002 */ lui $v0, 2 -/* A5F2AC 8024022C 08090091 */ j .L80240244 -/* A5F2B0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A5F2B4 80240234 3C040002 */ lui $a0, 2 -/* A5F2B8 80240238 0083102A */ slt $v0, $a0, $v1 -/* A5F2BC 8024023C 10400002 */ beqz $v0, .L80240248 -/* A5F2C0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A5F2C4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A5F2C8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A5F2CC 8024024C 0C046F07 */ jal set_main_pan_u -/* A5F2D0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A5F2D4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A5F2D8 80240258 0C046F0D */ jal set_main_pan_v -/* A5F2DC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A5F2E0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A5F2E4 80240264 0C046F13 */ jal set_aux_pan_u -/* A5F2E8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A5F2EC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A5F2F0 80240270 0C046F19 */ jal set_aux_pan_v -/* A5F2F4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A5F2F8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A5F2FC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A5F300 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A5F304 80240284 24420001 */ addiu $v0, $v0, 1 -/* A5F308 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A5F30C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A5F310 80240290 24630001 */ addiu $v1, $v1, 1 -/* A5F314 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A5F318 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A5F31C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A5F320 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A5F324 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A5F328 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A5F32C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A5F330 802402B0 14600002 */ bnez $v1, .L802402BC -/* A5F334 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A5F338 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A5F33C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A5F340 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A5F344 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A5F348 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A5F34C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A5F350 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A5F354 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A5F358 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A5F35C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A5F360 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A5F364 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A5F368 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A5F36C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A5F370 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A5F374 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A5F378 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A5F37C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A5F380 80240300 0000102D */ daddu $v0, $zero, $zero -/* A5F384 80240304 03E00008 */ jr $ra -/* A5F388 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A5F38C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/func_802401F0_A609D0.s b/asm/nonmatchings/world/area_kpa/kpa_50/func_802401F0_A609D0.s deleted file mode 100644 index 9e901faef9..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/func_802401F0_A609D0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401F0_A60BC0 -/* A60BC0 802401F0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A60BC4 802401F4 AFB20038 */ sw $s2, 0x38($sp) -/* A60BC8 802401F8 0080902D */ daddu $s2, $a0, $zero -/* A60BCC 802401FC AFB00030 */ sw $s0, 0x30($sp) -/* A60BD0 80240200 AFBF003C */ sw $ra, 0x3c($sp) -/* A60BD4 80240204 AFB10034 */ sw $s1, 0x34($sp) -/* A60BD8 80240208 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A60BDC 8024020C F7B40040 */ sdc1 $f20, 0x40($sp) -/* A60BE0 80240210 8E510148 */ lw $s1, 0x148($s2) -/* A60BE4 80240214 4485A000 */ mtc1 $a1, $f20 -/* A60BE8 80240218 86240008 */ lh $a0, 8($s1) -/* A60BEC 8024021C 4486B000 */ mtc1 $a2, $f22 -/* A60BF0 80240220 0C00EABB */ jal get_npc_unsafe -/* A60BF4 80240224 00E0802D */ daddu $s0, $a3, $zero -/* A60BF8 80240228 0200202D */ daddu $a0, $s0, $zero -/* A60BFC 8024022C 0220282D */ daddu $a1, $s1, $zero -/* A60C00 80240230 24030001 */ addiu $v1, $zero, 1 -/* A60C04 80240234 4406A000 */ mfc1 $a2, $f20 -/* A60C08 80240238 4407B000 */ mfc1 $a3, $f22 -/* A60C0C 8024023C 0040802D */ daddu $s0, $v0, $zero -/* A60C10 80240240 0C01242D */ jal func_800490B4 -/* A60C14 80240244 AFA30010 */ sw $v1, 0x10($sp) -/* A60C18 80240248 1440001D */ bnez $v0, .L802402C0 -/* A60C1C 8024024C 24040002 */ addiu $a0, $zero, 2 -/* A60C20 80240250 0200282D */ daddu $a1, $s0, $zero -/* A60C24 80240254 0000302D */ daddu $a2, $zero, $zero -/* A60C28 80240258 860300A8 */ lh $v1, 0xa8($s0) -/* A60C2C 8024025C 3C013F80 */ lui $at, 0x3f80 -/* A60C30 80240260 44810000 */ mtc1 $at, $f0 -/* A60C34 80240264 3C014000 */ lui $at, 0x4000 -/* A60C38 80240268 44811000 */ mtc1 $at, $f2 -/* A60C3C 8024026C 3C01C1A0 */ lui $at, 0xc1a0 -/* A60C40 80240270 44812000 */ mtc1 $at, $f4 -/* A60C44 80240274 2402000F */ addiu $v0, $zero, 0xf -/* A60C48 80240278 AFA2001C */ sw $v0, 0x1c($sp) -/* A60C4C 8024027C 44833000 */ mtc1 $v1, $f6 -/* A60C50 80240280 00000000 */ nop -/* A60C54 80240284 468031A0 */ cvt.s.w $f6, $f6 -/* A60C58 80240288 44073000 */ mfc1 $a3, $f6 -/* A60C5C 8024028C 27A20028 */ addiu $v0, $sp, 0x28 -/* A60C60 80240290 AFA20020 */ sw $v0, 0x20($sp) -/* A60C64 80240294 E7A00010 */ swc1 $f0, 0x10($sp) -/* A60C68 80240298 E7A20014 */ swc1 $f2, 0x14($sp) -/* A60C6C 8024029C 0C01BFA4 */ jal fx_emote -/* A60C70 802402A0 E7A40018 */ swc1 $f4, 0x18($sp) -/* A60C74 802402A4 8E2200CC */ lw $v0, 0xcc($s1) -/* A60C78 802402A8 8C430000 */ lw $v1, ($v0) -/* A60C7C 802402AC 24020014 */ addiu $v0, $zero, 0x14 -/* A60C80 802402B0 A602008E */ sh $v0, 0x8e($s0) -/* A60C84 802402B4 24020021 */ addiu $v0, $zero, 0x21 -/* A60C88 802402B8 080900C4 */ j .L80240310 -/* A60C8C 802402BC AE030028 */ sw $v1, 0x28($s0) -.L802402C0: -/* A60C90 802402C0 0C090000 */ jal func_80240000 -/* A60C94 802402C4 0240202D */ daddu $a0, $s2, $zero -/* A60C98 802402C8 0040202D */ daddu $a0, $v0, $zero -/* A60C9C 802402CC 2402FFFF */ addiu $v0, $zero, -1 -/* A60CA0 802402D0 10820010 */ beq $a0, $v0, .L80240314 -/* A60CA4 802402D4 00000000 */ nop -/* A60CA8 802402D8 0C00FB3A */ jal get_enemy -/* A60CAC 802402DC 00000000 */ nop -/* A60CB0 802402E0 8C42006C */ lw $v0, 0x6c($v0) -/* A60CB4 802402E4 1440000B */ bnez $v0, .L80240314 -/* A60CB8 802402E8 00000000 */ nop -/* A60CBC 802402EC 8602008C */ lh $v0, 0x8c($s0) -/* A60CC0 802402F0 14400008 */ bnez $v0, .L80240314 -/* A60CC4 802402F4 00000000 */ nop -/* A60CC8 802402F8 8E2200CC */ lw $v0, 0xcc($s1) -/* A60CCC 802402FC 8C420020 */ lw $v0, 0x20($v0) -/* A60CD0 80240300 AE020028 */ sw $v0, 0x28($s0) -/* A60CD4 80240304 96220072 */ lhu $v0, 0x72($s1) -/* A60CD8 80240308 A602008E */ sh $v0, 0x8e($s0) -/* A60CDC 8024030C 2402001E */ addiu $v0, $zero, 0x1e -.L80240310: -/* A60CE0 80240310 AE420070 */ sw $v0, 0x70($s2) -.L80240314: -/* A60CE4 80240314 8FBF003C */ lw $ra, 0x3c($sp) -/* A60CE8 80240318 8FB20038 */ lw $s2, 0x38($sp) -/* A60CEC 8024031C 8FB10034 */ lw $s1, 0x34($sp) -/* A60CF0 80240320 8FB00030 */ lw $s0, 0x30($sp) -/* A60CF4 80240324 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A60CF8 80240328 D7B40040 */ ldc1 $f20, 0x40($sp) -/* A60CFC 8024032C 03E00008 */ jr $ra -/* A60D00 80240330 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/func_80240434_A609D0.s b/asm/nonmatchings/world/area_kpa/kpa_50/func_80240434_A609D0.s deleted file mode 100644 index 62108dbe19..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/func_80240434_A609D0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240434_A60E04 -/* A60E04 80240434 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A60E08 80240438 AFB10014 */ sw $s1, 0x14($sp) -/* A60E0C 8024043C 0080882D */ daddu $s1, $a0, $zero -/* A60E10 80240440 AFBF0018 */ sw $ra, 0x18($sp) -/* A60E14 80240444 AFB00010 */ sw $s0, 0x10($sp) -/* A60E18 80240448 8E300148 */ lw $s0, 0x148($s1) -/* A60E1C 8024044C 0C00EABB */ jal get_npc_unsafe -/* A60E20 80240450 86040008 */ lh $a0, 8($s0) -/* A60E24 80240454 96030076 */ lhu $v1, 0x76($s0) -/* A60E28 80240458 A443008E */ sh $v1, 0x8e($v0) -/* A60E2C 8024045C 24020021 */ addiu $v0, $zero, 0x21 -/* A60E30 80240460 AE220070 */ sw $v0, 0x70($s1) -/* A60E34 80240464 8FBF0018 */ lw $ra, 0x18($sp) -/* A60E38 80240468 8FB10014 */ lw $s1, 0x14($sp) -/* A60E3C 8024046C 8FB00010 */ lw $s0, 0x10($sp) -/* A60E40 80240470 03E00008 */ jr $ra -/* A60E44 80240474 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/func_80240478_A609D0.s b/asm/nonmatchings/world/area_kpa/kpa_50/func_80240478_A609D0.s deleted file mode 100644 index ad429a18a3..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/func_80240478_A609D0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240478_A60E48 -/* A60E48 80240478 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A60E4C 8024047C AFB3001C */ sw $s3, 0x1c($sp) -/* A60E50 80240480 0080982D */ daddu $s3, $a0, $zero -/* A60E54 80240484 AFBF0020 */ sw $ra, 0x20($sp) -/* A60E58 80240488 AFB20018 */ sw $s2, 0x18($sp) -/* A60E5C 8024048C AFB10014 */ sw $s1, 0x14($sp) -/* A60E60 80240490 AFB00010 */ sw $s0, 0x10($sp) -/* A60E64 80240494 8E720148 */ lw $s2, 0x148($s3) -/* A60E68 80240498 0C00EABB */ jal get_npc_unsafe -/* A60E6C 8024049C 86440008 */ lh $a0, 8($s2) -/* A60E70 802404A0 86440008 */ lh $a0, 8($s2) -/* A60E74 802404A4 0040882D */ daddu $s1, $v0, $zero -/* A60E78 802404A8 0C00FB3A */ jal get_enemy -/* A60E7C 802404AC 24840001 */ addiu $a0, $a0, 1 -/* A60E80 802404B0 0040802D */ daddu $s0, $v0, $zero -/* A60E84 802404B4 0C00EABB */ jal get_npc_unsafe -/* A60E88 802404B8 86040008 */ lh $a0, 8($s0) -/* A60E8C 802404BC C62C0038 */ lwc1 $f12, 0x38($s1) -/* A60E90 802404C0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A60E94 802404C4 8C460038 */ lw $a2, 0x38($v0) -/* A60E98 802404C8 0C00A720 */ jal atan2 -/* A60E9C 802404CC 8C470040 */ lw $a3, 0x40($v0) -/* A60EA0 802404D0 E620000C */ swc1 $f0, 0xc($s1) -/* A60EA4 802404D4 8E02006C */ lw $v0, 0x6c($s0) -/* A60EA8 802404D8 14400008 */ bnez $v0, .L802404FC -/* A60EAC 802404DC 00000000 */ nop -/* A60EB0 802404E0 8E4200CC */ lw $v0, 0xcc($s2) -/* A60EB4 802404E4 8C420000 */ lw $v0, ($v0) -/* A60EB8 802404E8 AE220028 */ sw $v0, 0x28($s1) -/* A60EBC 802404EC 96420076 */ lhu $v0, 0x76($s2) -/* A60EC0 802404F0 A622008E */ sh $v0, 0x8e($s1) -/* A60EC4 802404F4 24020021 */ addiu $v0, $zero, 0x21 -/* A60EC8 802404F8 AE620070 */ sw $v0, 0x70($s3) -.L802404FC: -/* A60ECC 802404FC 8FBF0020 */ lw $ra, 0x20($sp) -/* A60ED0 80240500 8FB3001C */ lw $s3, 0x1c($sp) -/* A60ED4 80240504 8FB20018 */ lw $s2, 0x18($sp) -/* A60ED8 80240508 8FB10014 */ lw $s1, 0x14($sp) -/* A60EDC 8024050C 8FB00010 */ lw $s0, 0x10($sp) -/* A60EE0 80240510 03E00008 */ jr $ra -/* A60EE4 80240514 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/func_80240518_A609D0.s b/asm/nonmatchings/world/area_kpa/kpa_50/func_80240518_A609D0.s deleted file mode 100644 index 52d2dd2f11..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/func_80240518_A609D0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240518_A60EE8 -/* A60EE8 80240518 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A60EEC 8024051C AFB00010 */ sw $s0, 0x10($sp) -/* A60EF0 80240520 0080802D */ daddu $s0, $a0, $zero -/* A60EF4 80240524 AFBF0014 */ sw $ra, 0x14($sp) -/* A60EF8 80240528 8E020148 */ lw $v0, 0x148($s0) -/* A60EFC 8024052C 0C00EABB */ jal get_npc_unsafe -/* A60F00 80240530 84440008 */ lh $a0, 8($v0) -/* A60F04 80240534 9443008E */ lhu $v1, 0x8e($v0) -/* A60F08 80240538 2463FFFF */ addiu $v1, $v1, -1 -/* A60F0C 8024053C A443008E */ sh $v1, 0x8e($v0) -/* A60F10 80240540 00031C00 */ sll $v1, $v1, 0x10 -/* A60F14 80240544 58600001 */ blezl $v1, .L8024054C -/* A60F18 80240548 AE000070 */ sw $zero, 0x70($s0) -.L8024054C: -/* A60F1C 8024054C 8FBF0014 */ lw $ra, 0x14($sp) -/* A60F20 80240550 8FB00010 */ lw $s0, 0x10($sp) -/* A60F24 80240554 03E00008 */ jr $ra -/* A60F28 80240558 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/func_80240EF4_A609D0.s b/asm/nonmatchings/world/area_kpa/kpa_50/func_80240EF4_A609D0.s deleted file mode 100644 index 2b25b43c50..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/func_80240EF4_A609D0.s +++ /dev/null @@ -1,213 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EF4_A618C4 -/* A618C4 80240EF4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A618C8 80240EF8 AFB3003C */ sw $s3, 0x3c($sp) -/* A618CC 80240EFC 0080982D */ daddu $s3, $a0, $zero -/* A618D0 80240F00 AFBF0048 */ sw $ra, 0x48($sp) -/* A618D4 80240F04 AFB50044 */ sw $s5, 0x44($sp) -/* A618D8 80240F08 AFB40040 */ sw $s4, 0x40($sp) -/* A618DC 80240F0C AFB20038 */ sw $s2, 0x38($sp) -/* A618E0 80240F10 AFB10034 */ sw $s1, 0x34($sp) -/* A618E4 80240F14 AFB00030 */ sw $s0, 0x30($sp) -/* A618E8 80240F18 8E720148 */ lw $s2, 0x148($s3) -/* A618EC 80240F1C 86440008 */ lh $a0, 8($s2) -/* A618F0 80240F20 8E70000C */ lw $s0, 0xc($s3) -/* A618F4 80240F24 0C00EABB */ jal get_npc_unsafe -/* A618F8 80240F28 00A0882D */ daddu $s1, $a1, $zero -/* A618FC 80240F2C 0260202D */ daddu $a0, $s3, $zero -/* A61900 80240F30 8E050000 */ lw $a1, ($s0) -/* A61904 80240F34 0C0B1EAF */ jal get_variable -/* A61908 80240F38 0040A02D */ daddu $s4, $v0, $zero -/* A6190C 80240F3C AFA00010 */ sw $zero, 0x10($sp) -/* A61910 80240F40 8E4300D0 */ lw $v1, 0xd0($s2) -/* A61914 80240F44 8C630030 */ lw $v1, 0x30($v1) -/* A61918 80240F48 AFA30014 */ sw $v1, 0x14($sp) -/* A6191C 80240F4C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A61920 80240F50 8C63001C */ lw $v1, 0x1c($v1) -/* A61924 80240F54 AFA30018 */ sw $v1, 0x18($sp) -/* A61928 80240F58 8E4300D0 */ lw $v1, 0xd0($s2) -/* A6192C 80240F5C 8C630024 */ lw $v1, 0x24($v1) -/* A61930 80240F60 AFA3001C */ sw $v1, 0x1c($sp) -/* A61934 80240F64 8E4300D0 */ lw $v1, 0xd0($s2) -/* A61938 80240F68 8C630028 */ lw $v1, 0x28($v1) -/* A6193C 80240F6C 27B50010 */ addiu $s5, $sp, 0x10 -/* A61940 80240F70 AFA30020 */ sw $v1, 0x20($sp) -/* A61944 80240F74 8E4300D0 */ lw $v1, 0xd0($s2) -/* A61948 80240F78 3C014220 */ lui $at, 0x4220 -/* A6194C 80240F7C 44810000 */ mtc1 $at, $f0 -/* A61950 80240F80 8C63002C */ lw $v1, 0x2c($v1) -/* A61954 80240F84 0040802D */ daddu $s0, $v0, $zero -/* A61958 80240F88 E7A00028 */ swc1 $f0, 0x28($sp) -/* A6195C 80240F8C A7A0002C */ sh $zero, 0x2c($sp) -/* A61960 80240F90 16200005 */ bnez $s1, .L80240FA8 -/* A61964 80240F94 AFA30024 */ sw $v1, 0x24($sp) -/* A61968 80240F98 8E4200B0 */ lw $v0, 0xb0($s2) -/* A6196C 80240F9C 30420004 */ andi $v0, $v0, 4 -/* A61970 80240FA0 1040002F */ beqz $v0, .L80241060 -/* A61974 80240FA4 00000000 */ nop -.L80240FA8: -/* A61978 80240FA8 2404F7FF */ addiu $a0, $zero, -0x801 -/* A6197C 80240FAC AE600070 */ sw $zero, 0x70($s3) -/* A61980 80240FB0 A680008E */ sh $zero, 0x8e($s4) -/* A61984 80240FB4 8E4200CC */ lw $v0, 0xcc($s2) -/* A61988 80240FB8 8E830000 */ lw $v1, ($s4) -/* A6198C 80240FBC 8C420000 */ lw $v0, ($v0) -/* A61990 80240FC0 00641824 */ and $v1, $v1, $a0 -/* A61994 80240FC4 AE830000 */ sw $v1, ($s4) -/* A61998 80240FC8 AE820028 */ sw $v0, 0x28($s4) -/* A6199C 80240FCC 8E4200D0 */ lw $v0, 0xd0($s2) -/* A619A0 80240FD0 8C420034 */ lw $v0, 0x34($v0) -/* A619A4 80240FD4 54400005 */ bnel $v0, $zero, .L80240FEC -/* A619A8 80240FD8 2402FDFF */ addiu $v0, $zero, -0x201 -/* A619AC 80240FDC 34620200 */ ori $v0, $v1, 0x200 -/* A619B0 80240FE0 2403FFF7 */ addiu $v1, $zero, -9 -/* A619B4 80240FE4 080903FD */ j .L80240FF4 -/* A619B8 80240FE8 00431024 */ and $v0, $v0, $v1 -.L80240FEC: -/* A619BC 80240FEC 00621024 */ and $v0, $v1, $v0 -/* A619C0 80240FF0 34420008 */ ori $v0, $v0, 8 -.L80240FF4: -/* A619C4 80240FF4 AE820000 */ sw $v0, ($s4) -/* A619C8 80240FF8 8E4200B0 */ lw $v0, 0xb0($s2) -/* A619CC 80240FFC 30420004 */ andi $v0, $v0, 4 -/* A619D0 80241000 10400008 */ beqz $v0, .L80241024 -/* A619D4 80241004 24020063 */ addiu $v0, $zero, 0x63 -/* A619D8 80241008 AE620070 */ sw $v0, 0x70($s3) -/* A619DC 8024100C AE600074 */ sw $zero, 0x74($s3) -/* A619E0 80241010 8E4200B0 */ lw $v0, 0xb0($s2) -/* A619E4 80241014 2403FFFB */ addiu $v1, $zero, -5 -/* A619E8 80241018 00431024 */ and $v0, $v0, $v1 -/* A619EC 8024101C 0809040F */ j .L8024103C -/* A619F0 80241020 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241024: -/* A619F4 80241024 8E420000 */ lw $v0, ($s2) -/* A619F8 80241028 3C034000 */ lui $v1, 0x4000 -/* A619FC 8024102C 00431024 */ and $v0, $v0, $v1 -/* A61A00 80241030 10400002 */ beqz $v0, .L8024103C -/* A61A04 80241034 2402000C */ addiu $v0, $zero, 0xc -/* A61A08 80241038 AE620070 */ sw $v0, 0x70($s3) -.L8024103C: -/* A61A0C 8024103C 3C05BFFF */ lui $a1, 0xbfff -/* A61A10 80241040 34A5FFFF */ ori $a1, $a1, 0xffff -/* A61A14 80241044 2404FFFB */ addiu $a0, $zero, -5 -/* A61A18 80241048 8E4200B0 */ lw $v0, 0xb0($s2) -/* A61A1C 8024104C 8E430000 */ lw $v1, ($s2) -/* A61A20 80241050 00441024 */ and $v0, $v0, $a0 -/* A61A24 80241054 00651824 */ and $v1, $v1, $a1 -/* A61A28 80241058 AE4200B0 */ sw $v0, 0xb0($s2) -/* A61A2C 8024105C AE430000 */ sw $v1, ($s2) -.L80241060: -/* A61A30 80241060 8E630070 */ lw $v1, 0x70($s3) -/* A61A34 80241064 2C620064 */ sltiu $v0, $v1, 0x64 -/* A61A38 80241068 10400060 */ beqz $v0, .L802411EC -/* A61A3C 8024106C 00031080 */ sll $v0, $v1, 2 -/* A61A40 80241070 3C018024 */ lui $at, 0x8024 -/* A61A44 80241074 00220821 */ addu $at, $at, $v0 -/* A61A48 80241078 8C2234C8 */ lw $v0, 0x34c8($at) -/* A61A4C 8024107C 00400008 */ jr $v0 -/* A61A50 80241080 00000000 */ nop -/* A61A54 80241084 0260202D */ daddu $a0, $s3, $zero -/* A61A58 80241088 0200282D */ daddu $a1, $s0, $zero -/* A61A5C 8024108C 0C012568 */ jal func_800495A0 -/* A61A60 80241090 02A0302D */ daddu $a2, $s5, $zero -/* A61A64 80241094 0260202D */ daddu $a0, $s3, $zero -/* A61A68 80241098 0200282D */ daddu $a1, $s0, $zero -/* A61A6C 8024109C 0C0125AE */ jal func_800496B8 -/* A61A70 802410A0 02A0302D */ daddu $a2, $s5, $zero -/* A61A74 802410A4 0809047B */ j .L802411EC -/* A61A78 802410A8 00000000 */ nop -/* A61A7C 802410AC 0260202D */ daddu $a0, $s3, $zero -/* A61A80 802410B0 0200282D */ daddu $a1, $s0, $zero -/* A61A84 802410B4 0C0126D1 */ jal func_80049B44 -/* A61A88 802410B8 02A0302D */ daddu $a2, $s5, $zero -/* A61A8C 802410BC 0260202D */ daddu $a0, $s3, $zero -/* A61A90 802410C0 0200282D */ daddu $a1, $s0, $zero -/* A61A94 802410C4 0C012701 */ jal func_80049C04 -/* A61A98 802410C8 02A0302D */ daddu $a2, $s5, $zero -/* A61A9C 802410CC 0809047B */ j .L802411EC -/* A61AA0 802410D0 00000000 */ nop -/* A61AA4 802410D4 0260202D */ daddu $a0, $s3, $zero -/* A61AA8 802410D8 0200282D */ daddu $a1, $s0, $zero -/* A61AAC 802410DC 0C01278F */ jal func_80049E3C -/* A61AB0 802410E0 02A0302D */ daddu $a2, $s5, $zero -/* A61AB4 802410E4 0260202D */ daddu $a0, $s3, $zero -/* A61AB8 802410E8 0200282D */ daddu $a1, $s0, $zero -/* A61ABC 802410EC 0C0127B3 */ jal func_80049ECC -/* A61AC0 802410F0 02A0302D */ daddu $a2, $s5, $zero -/* A61AC4 802410F4 0809047B */ j .L802411EC -/* A61AC8 802410F8 00000000 */ nop -/* A61ACC 802410FC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A61AD0 80241100 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A61AD4 80241104 C68C0038 */ lwc1 $f12, 0x38($s4) -/* A61AD8 80241108 C68E0040 */ lwc1 $f14, 0x40($s4) -/* A61ADC 8024110C 8C460028 */ lw $a2, 0x28($v0) -/* A61AE0 80241110 0C00A7B5 */ jal dist2D -/* A61AE4 80241114 8C470030 */ lw $a3, 0x30($v0) -/* A61AE8 80241118 8E42006C */ lw $v0, 0x6c($s2) -/* A61AEC 8024111C 10400008 */ beqz $v0, .L80241140 -/* A61AF0 80241120 46000086 */ mov.s $f2, $f0 -/* A61AF4 80241124 44820000 */ mtc1 $v0, $f0 -/* A61AF8 80241128 00000000 */ nop -/* A61AFC 8024112C 46800020 */ cvt.s.w $f0, $f0 -/* A61B00 80241130 4602003C */ c.lt.s $f0, $f2 -/* A61B04 80241134 00000000 */ nop -/* A61B08 80241138 4500000B */ bc1f .L80241168 -/* A61B0C 8024113C 0260202D */ daddu $a0, $s3, $zero -.L80241140: -/* A61B10 80241140 0260202D */ daddu $a0, $s3, $zero -/* A61B14 80241144 8E050024 */ lw $a1, 0x24($s0) -/* A61B18 80241148 8E060028 */ lw $a2, 0x28($s0) -/* A61B1C 8024114C 0C09007C */ jal func_802401F0 -/* A61B20 80241150 02A0382D */ daddu $a3, $s5, $zero -/* A61B24 80241154 8E630070 */ lw $v1, 0x70($s3) -/* A61B28 80241158 2402000C */ addiu $v0, $zero, 0xc -/* A61B2C 8024115C 14620023 */ bne $v1, $v0, .L802411EC -/* A61B30 80241160 00000000 */ nop -/* A61B34 80241164 0260202D */ daddu $a0, $s3, $zero -.L80241168: -/* A61B38 80241168 0200282D */ daddu $a1, $s0, $zero -/* A61B3C 8024116C 0C0127DF */ jal func_80049F7C -/* A61B40 80241170 02A0302D */ daddu $a2, $s5, $zero -/* A61B44 80241174 0260202D */ daddu $a0, $s3, $zero -/* A61B48 80241178 0200282D */ daddu $a1, $s0, $zero -/* A61B4C 8024117C 0C012849 */ jal func_8004A124 -/* A61B50 80241180 02A0302D */ daddu $a2, $s5, $zero -/* A61B54 80241184 0809047B */ j .L802411EC -/* A61B58 80241188 00000000 */ nop -/* A61B5C 8024118C 0260202D */ daddu $a0, $s3, $zero -/* A61B60 80241190 0200282D */ daddu $a1, $s0, $zero -/* A61B64 80241194 0C0128FA */ jal func_8004A3E8 -/* A61B68 80241198 02A0302D */ daddu $a2, $s5, $zero -/* A61B6C 8024119C 0809047B */ j .L802411EC -/* A61B70 802411A0 00000000 */ nop -/* A61B74 802411A4 0C0900CD */ jal func_80240334 -/* A61B78 802411A8 0260202D */ daddu $a0, $s3, $zero -/* A61B7C 802411AC 0809047B */ j .L802411EC -/* A61B80 802411B0 00000000 */ nop -/* A61B84 802411B4 0C09010D */ jal func_80240434 -/* A61B88 802411B8 0260202D */ daddu $a0, $s3, $zero -/* A61B8C 802411BC 0809047B */ j .L802411EC -/* A61B90 802411C0 00000000 */ nop -/* A61B94 802411C4 0C09011E */ jal func_80240478 -/* A61B98 802411C8 0260202D */ daddu $a0, $s3, $zero -/* A61B9C 802411CC 0809047B */ j .L802411EC -/* A61BA0 802411D0 00000000 */ nop -/* A61BA4 802411D4 0C090146 */ jal func_80240518 -/* A61BA8 802411D8 0260202D */ daddu $a0, $s3, $zero -/* A61BAC 802411DC 0809047B */ j .L802411EC -/* A61BB0 802411E0 00000000 */ nop -/* A61BB4 802411E4 0C0129CF */ jal func_8004A73C -/* A61BB8 802411E8 0260202D */ daddu $a0, $s3, $zero -.L802411EC: -/* A61BBC 802411EC 8FBF0048 */ lw $ra, 0x48($sp) -/* A61BC0 802411F0 8FB50044 */ lw $s5, 0x44($sp) -/* A61BC4 802411F4 8FB40040 */ lw $s4, 0x40($sp) -/* A61BC8 802411F8 8FB3003C */ lw $s3, 0x3c($sp) -/* A61BCC 802411FC 8FB20038 */ lw $s2, 0x38($sp) -/* A61BD0 80241200 8FB10034 */ lw $s1, 0x34($sp) -/* A61BD4 80241204 8FB00030 */ lw $s0, 0x30($sp) -/* A61BD8 80241208 0000102D */ daddu $v0, $zero, $zero -/* A61BDC 8024120C 03E00008 */ jr $ra -/* A61BE0 80241210 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/func_802412C8_A609D0.s b/asm/nonmatchings/world/area_kpa/kpa_50/func_802412C8_A609D0.s deleted file mode 100644 index 673eeb8fcf..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/func_802412C8_A609D0.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412C8_A61C98 -/* A61C98 802412C8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A61C9C 802412CC AFB3001C */ sw $s3, 0x1c($sp) -/* A61CA0 802412D0 0080982D */ daddu $s3, $a0, $zero -/* A61CA4 802412D4 AFBF0020 */ sw $ra, 0x20($sp) -/* A61CA8 802412D8 AFB20018 */ sw $s2, 0x18($sp) -/* A61CAC 802412DC AFB10014 */ sw $s1, 0x14($sp) -/* A61CB0 802412E0 AFB00010 */ sw $s0, 0x10($sp) -/* A61CB4 802412E4 8E710148 */ lw $s1, 0x148($s3) -/* A61CB8 802412E8 86240008 */ lh $a0, 8($s1) -/* A61CBC 802412EC 0C00EABB */ jal get_npc_unsafe -/* A61CC0 802412F0 00A0902D */ daddu $s2, $a1, $zero -/* A61CC4 802412F4 0040802D */ daddu $s0, $v0, $zero -/* A61CC8 802412F8 8602008E */ lh $v0, 0x8e($s0) -/* A61CCC 802412FC 9603008E */ lhu $v1, 0x8e($s0) -/* A61CD0 80241300 18400005 */ blez $v0, .L80241318 -/* A61CD4 80241304 2462FFFF */ addiu $v0, $v1, -1 -/* A61CD8 80241308 A602008E */ sh $v0, 0x8e($s0) -/* A61CDC 8024130C 00021400 */ sll $v0, $v0, 0x10 -/* A61CE0 80241310 1C400033 */ bgtz $v0, .L802413E0 -/* A61CE4 80241314 00000000 */ nop -.L80241318: -/* A61CE8 80241318 8602008C */ lh $v0, 0x8c($s0) -/* A61CEC 8024131C 14400030 */ bnez $v0, .L802413E0 -/* A61CF0 80241320 00000000 */ nop -/* A61CF4 80241324 8E2200CC */ lw $v0, 0xcc($s1) -/* A61CF8 80241328 8C420024 */ lw $v0, 0x24($v0) -/* A61CFC 8024132C AE020028 */ sw $v0, 0x28($s0) -/* A61D00 80241330 C6400018 */ lwc1 $f0, 0x18($s2) -/* A61D04 80241334 E6000018 */ swc1 $f0, 0x18($s0) -/* A61D08 80241338 8E230088 */ lw $v1, 0x88($s1) -/* A61D0C 8024133C 24020005 */ addiu $v0, $zero, 5 -/* A61D10 80241340 10620005 */ beq $v1, $v0, .L80241358 -/* A61D14 80241344 00000000 */ nop -/* A61D18 80241348 10600003 */ beqz $v1, .L80241358 -/* A61D1C 8024134C 24020001 */ addiu $v0, $zero, 1 -/* A61D20 80241350 14620006 */ bne $v1, $v0, .L8024136C -/* A61D24 80241354 00000000 */ nop -.L80241358: -/* A61D28 80241358 8E220084 */ lw $v0, 0x84($s1) -/* A61D2C 8024135C 00021FC2 */ srl $v1, $v0, 0x1f -/* A61D30 80241360 00431021 */ addu $v0, $v0, $v1 -/* A61D34 80241364 00021043 */ sra $v0, $v0, 1 -/* A61D38 80241368 A60200A8 */ sh $v0, 0xa8($s0) -.L8024136C: -/* A61D3C 8024136C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A61D40 80241370 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A61D44 80241374 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A61D48 80241378 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A61D4C 8024137C 8C460028 */ lw $a2, 0x28($v0) -/* A61D50 80241380 0C00A7B5 */ jal dist2D -/* A61D54 80241384 8C470030 */ lw $a3, 0x30($v0) -/* A61D58 80241388 C6020018 */ lwc1 $f2, 0x18($s0) -/* A61D5C 8024138C 46020003 */ div.s $f0, $f0, $f2 -/* A61D60 80241390 3C018024 */ lui $at, 0x8024 -/* A61D64 80241394 D4223658 */ ldc1 $f2, 0x3658($at) -/* A61D68 80241398 46000021 */ cvt.d.s $f0, $f0 -/* A61D6C 8024139C 46220000 */ add.d $f0, $f0, $f2 -/* A61D70 802413A0 4620010D */ trunc.w.d $f4, $f0 -/* A61D74 802413A4 44022000 */ mfc1 $v0, $f4 -/* A61D78 802413A8 00000000 */ nop -/* A61D7C 802413AC A602008E */ sh $v0, 0x8e($s0) -/* A61D80 802413B0 00021400 */ sll $v0, $v0, 0x10 -/* A61D84 802413B4 8E230078 */ lw $v1, 0x78($s1) -/* A61D88 802413B8 00021403 */ sra $v0, $v0, 0x10 -/* A61D8C 802413BC 0043102A */ slt $v0, $v0, $v1 -/* A61D90 802413C0 10400003 */ beqz $v0, .L802413D0 -/* A61D94 802413C4 00000000 */ nop -/* A61D98 802413C8 9622007A */ lhu $v0, 0x7a($s1) -/* A61D9C 802413CC A602008E */ sh $v0, 0x8e($s0) -.L802413D0: -/* A61DA0 802413D0 8602008E */ lh $v0, 0x8e($s0) -/* A61DA4 802413D4 AE22007C */ sw $v0, 0x7c($s1) -/* A61DA8 802413D8 2402000E */ addiu $v0, $zero, 0xe -/* A61DAC 802413DC AE620070 */ sw $v0, 0x70($s3) -.L802413E0: -/* A61DB0 802413E0 8FBF0020 */ lw $ra, 0x20($sp) -/* A61DB4 802413E4 8FB3001C */ lw $s3, 0x1c($sp) -/* A61DB8 802413E8 8FB20018 */ lw $s2, 0x18($sp) -/* A61DBC 802413EC 8FB10014 */ lw $s1, 0x14($sp) -/* A61DC0 802413F0 8FB00010 */ lw $s0, 0x10($sp) -/* A61DC4 802413F4 03E00008 */ jr $ra -/* A61DC8 802413F8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/func_80241560_A609D0.s b/asm/nonmatchings/world/area_kpa/kpa_50/func_80241560_A609D0.s deleted file mode 100644 index 21dd7f2a04..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/func_80241560_A609D0.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241560_A61F30 -/* A61F30 80241560 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A61F34 80241564 AFB10014 */ sw $s1, 0x14($sp) -/* A61F38 80241568 0080882D */ daddu $s1, $a0, $zero -/* A61F3C 8024156C AFBF0018 */ sw $ra, 0x18($sp) -/* A61F40 80241570 AFB00010 */ sw $s0, 0x10($sp) -/* A61F44 80241574 8E300148 */ lw $s0, 0x148($s1) -/* A61F48 80241578 0C00EABB */ jal get_npc_unsafe -/* A61F4C 8024157C 86040008 */ lh $a0, 8($s0) -/* A61F50 80241580 0040202D */ daddu $a0, $v0, $zero -/* A61F54 80241584 9482008E */ lhu $v0, 0x8e($a0) -/* A61F58 80241588 24030003 */ addiu $v1, $zero, 3 -/* A61F5C 8024158C 24420001 */ addiu $v0, $v0, 1 -/* A61F60 80241590 A482008E */ sh $v0, 0x8e($a0) -/* A61F64 80241594 00021400 */ sll $v0, $v0, 0x10 -/* A61F68 80241598 00021403 */ sra $v0, $v0, 0x10 -/* A61F6C 8024159C 14430003 */ bne $v0, $v1, .L802415AC -/* A61F70 802415A0 00000000 */ nop -/* A61F74 802415A4 96020086 */ lhu $v0, 0x86($s0) -/* A61F78 802415A8 A48200A8 */ sh $v0, 0xa8($a0) -.L802415AC: -/* A61F7C 802415AC 8482008E */ lh $v0, 0x8e($a0) -/* A61F80 802415B0 8E030080 */ lw $v1, 0x80($s0) -/* A61F84 802415B4 0043102A */ slt $v0, $v0, $v1 -/* A61F88 802415B8 14400004 */ bnez $v0, .L802415CC -/* A61F8C 802415BC 00000000 */ nop -/* A61F90 802415C0 96020086 */ lhu $v0, 0x86($s0) -/* A61F94 802415C4 A48200A8 */ sh $v0, 0xa8($a0) -/* A61F98 802415C8 AE200070 */ sw $zero, 0x70($s1) -.L802415CC: -/* A61F9C 802415CC 8FBF0018 */ lw $ra, 0x18($sp) -/* A61FA0 802415D0 8FB10014 */ lw $s1, 0x14($sp) -/* A61FA4 802415D4 8FB00010 */ lw $s0, 0x10($sp) -/* A61FA8 802415D8 03E00008 */ jr $ra -/* A61FAC 802415DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/func_802415E0_A609D0.s b/asm/nonmatchings/world/area_kpa/kpa_50/func_802415E0_A609D0.s deleted file mode 100644 index c1e0dbe326..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/func_802415E0_A609D0.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415E0_A61FB0 -/* A61FB0 802415E0 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A61FB4 802415E4 AFB3005C */ sw $s3, 0x5c($sp) -/* A61FB8 802415E8 0080982D */ daddu $s3, $a0, $zero -/* A61FBC 802415EC AFBF0068 */ sw $ra, 0x68($sp) -/* A61FC0 802415F0 AFB50064 */ sw $s5, 0x64($sp) -/* A61FC4 802415F4 AFB40060 */ sw $s4, 0x60($sp) -/* A61FC8 802415F8 AFB20058 */ sw $s2, 0x58($sp) -/* A61FCC 802415FC AFB10054 */ sw $s1, 0x54($sp) -/* A61FD0 80241600 AFB00050 */ sw $s0, 0x50($sp) -/* A61FD4 80241604 8E710148 */ lw $s1, 0x148($s3) -/* A61FD8 80241608 86240008 */ lh $a0, 8($s1) -/* A61FDC 8024160C 0C00EABB */ jal get_npc_unsafe -/* A61FE0 80241610 00A0802D */ daddu $s0, $a1, $zero -/* A61FE4 80241614 8E63000C */ lw $v1, 0xc($s3) -/* A61FE8 80241618 0260202D */ daddu $a0, $s3, $zero -/* A61FEC 8024161C 8C650000 */ lw $a1, ($v1) -/* A61FF0 80241620 0C0B1EAF */ jal get_variable -/* A61FF4 80241624 0040902D */ daddu $s2, $v0, $zero -/* A61FF8 80241628 AFA00028 */ sw $zero, 0x28($sp) -/* A61FFC 8024162C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A62000 80241630 8C630030 */ lw $v1, 0x30($v1) -/* A62004 80241634 AFA3002C */ sw $v1, 0x2c($sp) -/* A62008 80241638 8E2300D0 */ lw $v1, 0xd0($s1) -/* A6200C 8024163C 8C63001C */ lw $v1, 0x1c($v1) -/* A62010 80241640 AFA30030 */ sw $v1, 0x30($sp) -/* A62014 80241644 8E2300D0 */ lw $v1, 0xd0($s1) -/* A62018 80241648 8C630024 */ lw $v1, 0x24($v1) -/* A6201C 8024164C AFA30034 */ sw $v1, 0x34($sp) -/* A62020 80241650 8E2300D0 */ lw $v1, 0xd0($s1) -/* A62024 80241654 8C630028 */ lw $v1, 0x28($v1) -/* A62028 80241658 27B50028 */ addiu $s5, $sp, 0x28 -/* A6202C 8024165C AFA30038 */ sw $v1, 0x38($sp) -/* A62030 80241660 8E2300D0 */ lw $v1, 0xd0($s1) -/* A62034 80241664 3C0142C8 */ lui $at, 0x42c8 -/* A62038 80241668 44810000 */ mtc1 $at, $f0 -/* A6203C 8024166C 8C63002C */ lw $v1, 0x2c($v1) -/* A62040 80241670 0040A02D */ daddu $s4, $v0, $zero -/* A62044 80241674 E7A00040 */ swc1 $f0, 0x40($sp) -/* A62048 80241678 A7A00044 */ sh $zero, 0x44($sp) -/* A6204C 8024167C 12000009 */ beqz $s0, .L802416A4 -/* A62050 80241680 AFA3003C */ sw $v1, 0x3c($sp) -/* A62054 80241684 864300A8 */ lh $v1, 0xa8($s2) -/* A62058 80241688 8E2200B0 */ lw $v0, 0xb0($s1) -/* A6205C 8024168C AE20008C */ sw $zero, 0x8c($s1) -/* A62060 80241690 A22000B5 */ sb $zero, 0xb5($s1) -/* A62064 80241694 34420008 */ ori $v0, $v0, 8 -/* A62068 80241698 AE230084 */ sw $v1, 0x84($s1) -/* A6206C 8024169C 080905AD */ j .L802416B4 -/* A62070 802416A0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802416A4: -/* A62074 802416A4 8E2200B0 */ lw $v0, 0xb0($s1) -/* A62078 802416A8 30420004 */ andi $v0, $v0, 4 -/* A6207C 802416AC 10400047 */ beqz $v0, .L802417CC -/* A62080 802416B0 00000000 */ nop -.L802416B4: -/* A62084 802416B4 AE600070 */ sw $zero, 0x70($s3) -/* A62088 802416B8 A640008E */ sh $zero, 0x8e($s2) -/* A6208C 802416BC 8E2300CC */ lw $v1, 0xcc($s1) -/* A62090 802416C0 2404F7FF */ addiu $a0, $zero, -0x801 -/* A62094 802416C4 A2200007 */ sb $zero, 7($s1) -/* A62098 802416C8 8E420000 */ lw $v0, ($s2) -/* A6209C 802416CC 8C630000 */ lw $v1, ($v1) -/* A620A0 802416D0 00441024 */ and $v0, $v0, $a0 -/* A620A4 802416D4 AE420000 */ sw $v0, ($s2) -/* A620A8 802416D8 AE430028 */ sw $v1, 0x28($s2) -/* A620AC 802416DC 96220086 */ lhu $v0, 0x86($s1) -/* A620B0 802416E0 A64200A8 */ sh $v0, 0xa8($s2) -/* A620B4 802416E4 8E2200D0 */ lw $v0, 0xd0($s1) -/* A620B8 802416E8 AE200090 */ sw $zero, 0x90($s1) -/* A620BC 802416EC 8C420034 */ lw $v0, 0x34($v0) -/* A620C0 802416F0 14400006 */ bnez $v0, .L8024170C -/* A620C4 802416F4 2403FDFF */ addiu $v1, $zero, -0x201 -/* A620C8 802416F8 8E420000 */ lw $v0, ($s2) -/* A620CC 802416FC 2403FFF7 */ addiu $v1, $zero, -9 -/* A620D0 80241700 34420200 */ ori $v0, $v0, 0x200 -/* A620D4 80241704 080905C6 */ j .L80241718 -/* A620D8 80241708 00431024 */ and $v0, $v0, $v1 -.L8024170C: -/* A620DC 8024170C 8E420000 */ lw $v0, ($s2) -/* A620E0 80241710 00431024 */ and $v0, $v0, $v1 -/* A620E4 80241714 34420008 */ ori $v0, $v0, 8 -.L80241718: -/* A620E8 80241718 AE420000 */ sw $v0, ($s2) -/* A620EC 8024171C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A620F0 80241720 30420004 */ andi $v0, $v0, 4 -/* A620F4 80241724 1040001E */ beqz $v0, .L802417A0 -/* A620F8 80241728 24040002 */ addiu $a0, $zero, 2 -/* A620FC 8024172C 0240282D */ daddu $a1, $s2, $zero -/* A62100 80241730 0000302D */ daddu $a2, $zero, $zero -/* A62104 80241734 24020063 */ addiu $v0, $zero, 0x63 -/* A62108 80241738 AE620070 */ sw $v0, 0x70($s3) -/* A6210C 8024173C AE600074 */ sw $zero, 0x74($s3) -/* A62110 80241740 864300A8 */ lh $v1, 0xa8($s2) -/* A62114 80241744 3C013F80 */ lui $at, 0x3f80 -/* A62118 80241748 44810000 */ mtc1 $at, $f0 -/* A6211C 8024174C 3C014000 */ lui $at, 0x4000 -/* A62120 80241750 44811000 */ mtc1 $at, $f2 -/* A62124 80241754 3C01C1A0 */ lui $at, 0xc1a0 -/* A62128 80241758 44812000 */ mtc1 $at, $f4 -/* A6212C 8024175C 24020028 */ addiu $v0, $zero, 0x28 -/* A62130 80241760 AFA2001C */ sw $v0, 0x1c($sp) -/* A62134 80241764 44833000 */ mtc1 $v1, $f6 -/* A62138 80241768 00000000 */ nop -/* A6213C 8024176C 468031A0 */ cvt.s.w $f6, $f6 -/* A62140 80241770 44073000 */ mfc1 $a3, $f6 -/* A62144 80241774 27A20048 */ addiu $v0, $sp, 0x48 -/* A62148 80241778 AFA20020 */ sw $v0, 0x20($sp) -/* A6214C 8024177C E7A00010 */ swc1 $f0, 0x10($sp) -/* A62150 80241780 E7A20014 */ swc1 $f2, 0x14($sp) -/* A62154 80241784 0C01BFA4 */ jal fx_emote -/* A62158 80241788 E7A40018 */ swc1 $f4, 0x18($sp) -/* A6215C 8024178C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A62160 80241790 2403FFFB */ addiu $v1, $zero, -5 -/* A62164 80241794 00431024 */ and $v0, $v0, $v1 -/* A62168 80241798 080905F3 */ j .L802417CC -/* A6216C 8024179C AE2200B0 */ sw $v0, 0xb0($s1) -.L802417A0: -/* A62170 802417A0 8E220000 */ lw $v0, ($s1) -/* A62174 802417A4 3C034000 */ lui $v1, 0x4000 -/* A62178 802417A8 00431024 */ and $v0, $v0, $v1 -/* A6217C 802417AC 10400007 */ beqz $v0, .L802417CC -/* A62180 802417B0 3C03BFFF */ lui $v1, 0xbfff -/* A62184 802417B4 2402000C */ addiu $v0, $zero, 0xc -/* A62188 802417B8 AE620070 */ sw $v0, 0x70($s3) -/* A6218C 802417BC 8E220000 */ lw $v0, ($s1) -/* A62190 802417C0 3463FFFF */ ori $v1, $v1, 0xffff -/* A62194 802417C4 00431024 */ and $v0, $v0, $v1 -/* A62198 802417C8 AE220000 */ sw $v0, ($s1) -.L802417CC: -/* A6219C 802417CC 8E220090 */ lw $v0, 0x90($s1) -/* A621A0 802417D0 1840000C */ blez $v0, .L80241804 -/* A621A4 802417D4 2442FFFF */ addiu $v0, $v0, -1 -/* A621A8 802417D8 14400087 */ bnez $v0, .L802419F8 -/* A621AC 802417DC AE220090 */ sw $v0, 0x90($s1) -/* A621B0 802417E0 3C03FFAA */ lui $v1, 0xffaa -/* A621B4 802417E4 8E420028 */ lw $v0, 0x28($s2) -/* A621B8 802417E8 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A621BC 802417EC 00431021 */ addu $v0, $v0, $v1 -/* A621C0 802417F0 2C420002 */ sltiu $v0, $v0, 2 -/* A621C4 802417F4 10400003 */ beqz $v0, .L80241804 -/* A621C8 802417F8 3C020055 */ lui $v0, 0x55 -/* A621CC 802417FC 3442000C */ ori $v0, $v0, 0xc -/* A621D0 80241800 AE420028 */ sw $v0, 0x28($s2) -.L80241804: -/* A621D4 80241804 8E630070 */ lw $v1, 0x70($s3) -/* A621D8 80241808 2402000C */ addiu $v0, $zero, 0xc -/* A621DC 8024180C 10620048 */ beq $v1, $v0, .L80241930 -/* A621E0 80241810 2862000D */ slti $v0, $v1, 0xd -/* A621E4 80241814 1040000F */ beqz $v0, .L80241854 -/* A621E8 80241818 24100001 */ addiu $s0, $zero, 1 -/* A621EC 8024181C 1070001E */ beq $v1, $s0, .L80241898 -/* A621F0 80241820 28620002 */ slti $v0, $v1, 2 -/* A621F4 80241824 10400005 */ beqz $v0, .L8024183C -/* A621F8 80241828 24020002 */ addiu $v0, $zero, 2 -/* A621FC 8024182C 10600015 */ beqz $v1, .L80241884 -/* A62200 80241830 0260202D */ daddu $a0, $s3, $zero -/* A62204 80241834 08090663 */ j .L8024198C -/* A62208 80241838 00000000 */ nop -.L8024183C: -/* A6220C 8024183C 1062001C */ beq $v1, $v0, .L802418B0 -/* A62210 80241840 24020003 */ addiu $v0, $zero, 3 -/* A62214 80241844 10620035 */ beq $v1, $v0, .L8024191C -/* A62218 80241848 0260202D */ daddu $a0, $s3, $zero -/* A6221C 8024184C 08090663 */ j .L8024198C -/* A62220 80241850 00000000 */ nop -.L80241854: -/* A62224 80241854 2402000E */ addiu $v0, $zero, 0xe -/* A62228 80241858 1062003F */ beq $v1, $v0, .L80241958 -/* A6222C 8024185C 0062102A */ slt $v0, $v1, $v0 -/* A62230 80241860 14400038 */ bnez $v0, .L80241944 -/* A62234 80241864 0260202D */ daddu $a0, $s3, $zero -/* A62238 80241868 2402000F */ addiu $v0, $zero, 0xf -/* A6223C 8024186C 10620040 */ beq $v1, $v0, .L80241970 -/* A62240 80241870 24020063 */ addiu $v0, $zero, 0x63 -/* A62244 80241874 10620043 */ beq $v1, $v0, .L80241984 -/* A62248 80241878 00000000 */ nop -/* A6224C 8024187C 08090663 */ j .L8024198C -/* A62250 80241880 00000000 */ nop -.L80241884: -/* A62254 80241884 0280282D */ daddu $a1, $s4, $zero -/* A62258 80241888 0C012568 */ jal func_800495A0 -/* A6225C 8024188C 02A0302D */ daddu $a2, $s5, $zero -/* A62260 80241890 96220086 */ lhu $v0, 0x86($s1) -/* A62264 80241894 A64200A8 */ sh $v0, 0xa8($s2) -.L80241898: -/* A62268 80241898 0260202D */ daddu $a0, $s3, $zero -/* A6226C 8024189C 0280282D */ daddu $a1, $s4, $zero -/* A62270 802418A0 0C0125AE */ jal func_800496B8 -/* A62274 802418A4 02A0302D */ daddu $a2, $s5, $zero -/* A62278 802418A8 08090663 */ j .L8024198C -/* A6227C 802418AC 00000000 */ nop -.L802418B0: -/* A62280 802418B0 0260202D */ daddu $a0, $s3, $zero -/* A62284 802418B4 0280282D */ daddu $a1, $s4, $zero -/* A62288 802418B8 0C0126D1 */ jal func_80049B44 -/* A6228C 802418BC 02A0302D */ daddu $a2, $s5, $zero -/* A62290 802418C0 8E230088 */ lw $v1, 0x88($s1) -/* A62294 802418C4 24020006 */ addiu $v0, $zero, 6 -/* A62298 802418C8 14620014 */ bne $v1, $v0, .L8024191C -/* A6229C 802418CC 0260202D */ daddu $a0, $s3, $zero -/* A622A0 802418D0 0C00A67F */ jal rand_int -/* A622A4 802418D4 24040064 */ addiu $a0, $zero, 0x64 -/* A622A8 802418D8 28420021 */ slti $v0, $v0, 0x21 -/* A622AC 802418DC 5040000F */ beql $v0, $zero, .L8024191C -/* A622B0 802418E0 0260202D */ daddu $a0, $s3, $zero -/* A622B4 802418E4 8E22008C */ lw $v0, 0x8c($s1) -/* A622B8 802418E8 10400005 */ beqz $v0, .L80241900 -/* A622BC 802418EC 3C020055 */ lui $v0, 0x55 -/* A622C0 802418F0 3442002F */ ori $v0, $v0, 0x2f -/* A622C4 802418F4 AE20008C */ sw $zero, 0x8c($s1) -/* A622C8 802418F8 08090643 */ j .L8024190C -/* A622CC 802418FC A22000B5 */ sb $zero, 0xb5($s1) -.L80241900: -/* A622D0 80241900 3442002E */ ori $v0, $v0, 0x2e -/* A622D4 80241904 AE30008C */ sw $s0, 0x8c($s1) -/* A622D8 80241908 A23000B5 */ sb $s0, 0xb5($s1) -.L8024190C: -/* A622DC 8024190C AE420028 */ sw $v0, 0x28($s2) -/* A622E0 80241910 24020007 */ addiu $v0, $zero, 7 -/* A622E4 80241914 0809067E */ j .L802419F8 -/* A622E8 80241918 AE220090 */ sw $v0, 0x90($s1) -.L8024191C: -/* A622EC 8024191C 0280282D */ daddu $a1, $s4, $zero -/* A622F0 80241920 0C012701 */ jal func_80049C04 -/* A622F4 80241924 02A0302D */ daddu $a2, $s5, $zero -/* A622F8 80241928 08090663 */ j .L8024198C -/* A622FC 8024192C 00000000 */ nop -.L80241930: -/* A62300 80241930 0260202D */ daddu $a0, $s3, $zero -/* A62304 80241934 0280282D */ daddu $a1, $s4, $zero -/* A62308 80241938 0C090493 */ jal func_8024124C -/* A6230C 8024193C 02A0302D */ daddu $a2, $s5, $zero -/* A62310 80241940 0260202D */ daddu $a0, $s3, $zero -.L80241944: -/* A62314 80241944 0280282D */ daddu $a1, $s4, $zero -/* A62318 80241948 0C0904B2 */ jal func_802412C8 -/* A6231C 8024194C 02A0302D */ daddu $a2, $s5, $zero -/* A62320 80241950 08090663 */ j .L8024198C -/* A62324 80241954 00000000 */ nop -.L80241958: -/* A62328 80241958 0260202D */ daddu $a0, $s3, $zero -/* A6232C 8024195C 0280282D */ daddu $a1, $s4, $zero -/* A62330 80241960 0C0904FF */ jal func_802413FC -/* A62334 80241964 02A0302D */ daddu $a2, $s5, $zero -/* A62338 80241968 08090663 */ j .L8024198C -/* A6233C 8024196C 00000000 */ nop -.L80241970: -/* A62340 80241970 0280282D */ daddu $a1, $s4, $zero -/* A62344 80241974 0C090558 */ jal func_80241560 -/* A62348 80241978 02A0302D */ daddu $a2, $s5, $zero -/* A6234C 8024197C 08090663 */ j .L8024198C -/* A62350 80241980 00000000 */ nop -.L80241984: -/* A62354 80241984 0C0129CF */ jal func_8004A73C -/* A62358 80241988 0260202D */ daddu $a0, $s3, $zero -.L8024198C: -/* A6235C 8024198C 8E230088 */ lw $v1, 0x88($s1) -/* A62360 80241990 24020006 */ addiu $v0, $zero, 6 -/* A62364 80241994 14620019 */ bne $v1, $v0, .L802419FC -/* A62368 80241998 0000102D */ daddu $v0, $zero, $zero -/* A6236C 8024199C 8E22008C */ lw $v0, 0x8c($s1) -/* A62370 802419A0 10400003 */ beqz $v0, .L802419B0 -/* A62374 802419A4 24020001 */ addiu $v0, $zero, 1 -/* A62378 802419A8 0809066D */ j .L802419B4 -/* A6237C 802419AC A22200B5 */ sb $v0, 0xb5($s1) -.L802419B0: -/* A62380 802419B0 A22000B5 */ sb $zero, 0xb5($s1) -.L802419B4: -/* A62384 802419B4 8E22008C */ lw $v0, 0x8c($s1) -/* A62388 802419B8 1040000F */ beqz $v0, .L802419F8 -/* A6238C 802419BC 3C03FFAA */ lui $v1, 0xffaa -/* A62390 802419C0 8E420028 */ lw $v0, 0x28($s2) -/* A62394 802419C4 3463FFFC */ ori $v1, $v1, 0xfffc -/* A62398 802419C8 00431821 */ addu $v1, $v0, $v1 -/* A6239C 802419CC 2C620015 */ sltiu $v0, $v1, 0x15 -/* A623A0 802419D0 10400009 */ beqz $v0, .L802419F8 -/* A623A4 802419D4 00031080 */ sll $v0, $v1, 2 -/* A623A8 802419D8 3C018024 */ lui $at, 0x8024 -/* A623AC 802419DC 00220821 */ addu $at, $at, $v0 -/* A623B0 802419E0 8C223660 */ lw $v0, 0x3660($at) -/* A623B4 802419E4 00400008 */ jr $v0 -/* A623B8 802419E8 00000000 */ nop -/* A623BC 802419EC 8E420028 */ lw $v0, 0x28($s2) -/* A623C0 802419F0 24420001 */ addiu $v0, $v0, 1 -/* A623C4 802419F4 AE420028 */ sw $v0, 0x28($s2) -.L802419F8: -/* A623C8 802419F8 0000102D */ daddu $v0, $zero, $zero -.L802419FC: -/* A623CC 802419FC 8FBF0068 */ lw $ra, 0x68($sp) -/* A623D0 80241A00 8FB50064 */ lw $s5, 0x64($sp) -/* A623D4 80241A04 8FB40060 */ lw $s4, 0x60($sp) -/* A623D8 80241A08 8FB3005C */ lw $s3, 0x5c($sp) -/* A623DC 80241A0C 8FB20058 */ lw $s2, 0x58($sp) -/* A623E0 80241A10 8FB10054 */ lw $s1, 0x54($sp) -/* A623E4 80241A14 8FB00050 */ lw $s0, 0x50($sp) -/* A623E8 80241A18 03E00008 */ jr $ra -/* A623EC 80241A1C 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/func_80240050_A64090.s b/asm/nonmatchings/world/area_kpa/kpa_51/func_80240050_A64090.s deleted file mode 100644 index 93dfbb9790..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/func_80240050_A64090.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_A640E0 -/* A640E0 80240050 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A640E4 80240054 AFB00018 */ sw $s0, 0x18($sp) -/* A640E8 80240058 AFBF0024 */ sw $ra, 0x24($sp) -/* A640EC 8024005C AFB20020 */ sw $s2, 0x20($sp) -/* A640F0 80240060 AFB1001C */ sw $s1, 0x1c($sp) -/* A640F4 80240064 F7B60030 */ sdc1 $f22, 0x30($sp) -/* A640F8 80240068 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A640FC 8024006C 8C920148 */ lw $s2, 0x148($a0) -/* A64100 80240070 4485A000 */ mtc1 $a1, $f20 -/* A64104 80240074 86440008 */ lh $a0, 8($s2) -/* A64108 80240078 4486B000 */ mtc1 $a2, $f22 -/* A6410C 8024007C 0C00EABB */ jal get_npc_unsafe -/* A64110 80240080 00E0802D */ daddu $s0, $a3, $zero -/* A64114 80240084 0200202D */ daddu $a0, $s0, $zero -/* A64118 80240088 0040882D */ daddu $s1, $v0, $zero -/* A6411C 8024008C 4406A000 */ mfc1 $a2, $f20 -/* A64120 80240090 4407B000 */ mfc1 $a3, $f22 -/* A64124 80240094 3C03800A */ lui $v1, 0x800a -/* A64128 80240098 8463A634 */ lh $v1, -0x59cc($v1) -/* A6412C 8024009C 3C05800B */ lui $a1, %hi(gCameras) -/* A64130 802400A0 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A64134 802400A4 AFA00010 */ sw $zero, 0x10($sp) -/* A64138 802400A8 00031080 */ sll $v0, $v1, 2 -/* A6413C 802400AC 00431021 */ addu $v0, $v0, $v1 -/* A64140 802400B0 00021080 */ sll $v0, $v0, 2 -/* A64144 802400B4 00431023 */ subu $v0, $v0, $v1 -/* A64148 802400B8 000218C0 */ sll $v1, $v0, 3 -/* A6414C 802400BC 00431021 */ addu $v0, $v0, $v1 -/* A64150 802400C0 000210C0 */ sll $v0, $v0, 3 -/* A64154 802400C4 00458021 */ addu $s0, $v0, $a1 -/* A64158 802400C8 0C01242D */ jal func_800490B4 -/* A6415C 802400CC 0240282D */ daddu $a1, $s2, $zero -/* A64160 802400D0 1040004B */ beqz $v0, .L80240200 -/* A64164 802400D4 2402FFFF */ addiu $v0, $zero, -1 -/* A64168 802400D8 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A6416C 802400DC C62E000C */ lwc1 $f14, 0xc($s1) -/* A64170 802400E0 3C014387 */ lui $at, 0x4387 -/* A64174 802400E4 4481A000 */ mtc1 $at, $f20 -/* A64178 802400E8 0C00A70A */ jal get_clamped_angle_diff -/* A6417C 802400EC 00000000 */ nop -/* A64180 802400F0 0C00A6C9 */ jal clamp_angle -/* A64184 802400F4 46000306 */ mov.s $f12, $f0 -/* A64188 802400F8 3C018024 */ lui $at, 0x8024 -/* A6418C 802400FC D4222F50 */ ldc1 $f2, 0x2f50($at) -/* A64190 80240100 46000021 */ cvt.d.s $f0, $f0 -/* A64194 80240104 4622003C */ c.lt.d $f0, $f2 -/* A64198 80240108 00000000 */ nop -/* A6419C 8024010C 45000003 */ bc1f .L8024011C -/* A641A0 80240110 00000000 */ nop -/* A641A4 80240114 3C0142B4 */ lui $at, 0x42b4 -/* A641A8 80240118 4481A000 */ mtc1 $at, $f20 -.L8024011C: -/* A641AC 8024011C 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* A641B0 80240120 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* A641B4 80240124 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A641B8 80240128 8E020000 */ lw $v0, ($s0) -/* A641BC 8024012C C62E0040 */ lwc1 $f14, 0x40($s1) -/* A641C0 80240130 8C460028 */ lw $a2, 0x28($v0) -/* A641C4 80240134 0C00A720 */ jal atan2 -/* A641C8 80240138 8C470030 */ lw $a3, 0x30($v0) -/* A641CC 8024013C 4600A306 */ mov.s $f12, $f20 -/* A641D0 80240140 0C00A70A */ jal get_clamped_angle_diff -/* A641D4 80240144 46000386 */ mov.s $f14, $f0 -/* A641D8 80240148 46000005 */ abs.s $f0, $f0 -/* A641DC 8024014C 3C018024 */ lui $at, 0x8024 -/* A641E0 80240150 D4222F58 */ ldc1 $f2, 0x2f58($at) -/* A641E4 80240154 46000021 */ cvt.d.s $f0, $f0 -/* A641E8 80240158 4620103C */ c.lt.d $f2, $f0 -/* A641EC 8024015C 00000000 */ nop -/* A641F0 80240160 45010027 */ bc1t .L80240200 -/* A641F4 80240164 2402FFFF */ addiu $v0, $zero, -1 -/* A641F8 80240168 8E020000 */ lw $v0, ($s0) -/* A641FC 8024016C C6200038 */ lwc1 $f0, 0x38($s1) -/* A64200 80240170 C4420028 */ lwc1 $f2, 0x28($v0) -/* A64204 80240174 44806000 */ mtc1 $zero, $f12 -/* A64208 80240178 46020001 */ sub.s $f0, $f0, $f2 -/* A6420C 8024017C C62E003C */ lwc1 $f14, 0x3c($s1) -/* A64210 80240180 8C47002C */ lw $a3, 0x2c($v0) -/* A64214 80240184 46000005 */ abs.s $f0, $f0 -/* A64218 80240188 44060000 */ mfc1 $a2, $f0 -/* A6421C 8024018C 0C00A720 */ jal atan2 -/* A64220 80240190 00000000 */ nop -/* A64224 80240194 3C018024 */ lui $at, 0x8024 -/* A64228 80240198 D4222F60 */ ldc1 $f2, 0x2f60($at) -/* A6422C 8024019C 46000021 */ cvt.d.s $f0, $f0 -/* A64230 802401A0 46220001 */ sub.d $f0, $f0, $f2 -/* A64234 802401A4 3C018024 */ lui $at, 0x8024 -/* A64238 802401A8 D4222F68 */ ldc1 $f2, 0x2f68($at) -/* A6423C 802401AC 46200020 */ cvt.s.d $f0, $f0 -/* A64240 802401B0 46000005 */ abs.s $f0, $f0 -/* A64244 802401B4 46000021 */ cvt.d.s $f0, $f0 -/* A64248 802401B8 4620103C */ c.lt.d $f2, $f0 -/* A6424C 802401BC 00000000 */ nop -/* A64250 802401C0 4501000F */ bc1t .L80240200 -/* A64254 802401C4 2402FFFF */ addiu $v0, $zero, -1 -/* A64258 802401C8 3C038011 */ lui $v1, 0x8011 -/* A6425C 802401CC 8063EBB3 */ lb $v1, -0x144d($v1) -/* A64260 802401D0 24020009 */ addiu $v0, $zero, 9 -/* A64264 802401D4 10620009 */ beq $v1, $v0, .L802401FC -/* A64268 802401D8 24020007 */ addiu $v0, $zero, 7 -/* A6426C 802401DC 50620008 */ beql $v1, $v0, .L80240200 -/* A64270 802401E0 2402FFFF */ addiu $v0, $zero, -1 -/* A64274 802401E4 86440008 */ lh $a0, 8($s2) -/* A64278 802401E8 0C00FB3A */ jal get_enemy -/* A6427C 802401EC 24840001 */ addiu $a0, $a0, 1 -/* A64280 802401F0 8C43006C */ lw $v1, 0x6c($v0) -/* A64284 802401F4 10600002 */ beqz $v1, .L80240200 -/* A64288 802401F8 24020001 */ addiu $v0, $zero, 1 -.L802401FC: -/* A6428C 802401FC 2402FFFF */ addiu $v0, $zero, -1 -.L80240200: -/* A64290 80240200 8FBF0024 */ lw $ra, 0x24($sp) -/* A64294 80240204 8FB20020 */ lw $s2, 0x20($sp) -/* A64298 80240208 8FB1001C */ lw $s1, 0x1c($sp) -/* A6429C 8024020C 8FB00018 */ lw $s0, 0x18($sp) -/* A642A0 80240210 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A642A4 80240214 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A642A8 80240218 03E00008 */ jr $ra -/* A642AC 8024021C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/func_80240220_A64090.s b/asm/nonmatchings/world/area_kpa/kpa_51/func_80240220_A64090.s deleted file mode 100644 index b430944b18..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/func_80240220_A64090.s +++ /dev/null @@ -1,336 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240220_A642B0 -/* A642B0 80240220 27BDFC78 */ addiu $sp, $sp, -0x388 -/* A642B4 80240224 AFB60378 */ sw $s6, 0x378($sp) -/* A642B8 80240228 0080B02D */ daddu $s6, $a0, $zero -/* A642BC 8024022C AFBF037C */ sw $ra, 0x37c($sp) -/* A642C0 80240230 AFB50374 */ sw $s5, 0x374($sp) -/* A642C4 80240234 AFB40370 */ sw $s4, 0x370($sp) -/* A642C8 80240238 AFB3036C */ sw $s3, 0x36c($sp) -/* A642CC 8024023C AFB20368 */ sw $s2, 0x368($sp) -/* A642D0 80240240 AFB10364 */ sw $s1, 0x364($sp) -/* A642D4 80240244 AFB00360 */ sw $s0, 0x360($sp) -/* A642D8 80240248 F7B40380 */ sdc1 $f20, 0x380($sp) -/* A642DC 8024024C 8ED20148 */ lw $s2, 0x148($s6) -/* A642E0 80240250 86440008 */ lh $a0, 8($s2) -/* A642E4 80240254 0C00EABB */ jal get_npc_unsafe -/* A642E8 80240258 00A0802D */ daddu $s0, $a1, $zero -/* A642EC 8024025C 86440008 */ lh $a0, 8($s2) -/* A642F0 80240260 0040882D */ daddu $s1, $v0, $zero -/* A642F4 80240264 0C00FB3A */ jal get_enemy -/* A642F8 80240268 2484FFFF */ addiu $a0, $a0, -1 -/* A642FC 8024026C 84440008 */ lh $a0, 8($v0) -/* A64300 80240270 0C00EABB */ jal get_npc_unsafe -/* A64304 80240274 0000A82D */ daddu $s5, $zero, $zero -/* A64308 80240278 27B30020 */ addiu $s3, $sp, 0x20 -/* A6430C 8024027C 16000005 */ bnez $s0, .L80240294 -/* A64310 80240280 0040A02D */ daddu $s4, $v0, $zero -/* A64314 80240284 8E4200B0 */ lw $v0, 0xb0($s2) -/* A64318 80240288 30420004 */ andi $v0, $v0, 4 -/* A6431C 8024028C 10400018 */ beqz $v0, .L802402F0 -/* A64320 80240290 00000000 */ nop -.L80240294: -/* A64324 80240294 3C030024 */ lui $v1, 0x24 -/* A64328 80240298 34630102 */ ori $v1, $v1, 0x102 -/* A6432C 8024029C 3C041620 */ lui $a0, 0x1620 -/* A64330 802402A0 AEC00070 */ sw $zero, 0x70($s6) -/* A64334 802402A4 8E220000 */ lw $v0, ($s1) -/* A64338 802402A8 34840040 */ ori $a0, $a0, 0x40 -/* A6433C 802402AC A620008E */ sh $zero, 0x8e($s1) -/* A64340 802402B0 00431025 */ or $v0, $v0, $v1 -/* A64344 802402B4 AE220000 */ sw $v0, ($s1) -/* A64348 802402B8 8E420000 */ lw $v0, ($s2) -/* A6434C 802402BC 3C013ECC */ lui $at, 0x3ecc -/* A64350 802402C0 3421CCCD */ ori $at, $at, 0xcccd -/* A64354 802402C4 44810000 */ mtc1 $at, $f0 -/* A64358 802402C8 00441025 */ or $v0, $v0, $a0 -/* A6435C 802402CC AE420000 */ sw $v0, ($s2) -/* A64360 802402D0 E6200054 */ swc1 $f0, 0x54($s1) -/* A64364 802402D4 E6200058 */ swc1 $f0, 0x58($s1) -/* A64368 802402D8 8E4300B0 */ lw $v1, 0xb0($s2) -/* A6436C 802402DC 30620004 */ andi $v0, $v1, 4 -/* A64370 802402E0 10400003 */ beqz $v0, .L802402F0 -/* A64374 802402E4 2402FFFB */ addiu $v0, $zero, -5 -/* A64378 802402E8 00621024 */ and $v0, $v1, $v0 -/* A6437C 802402EC AE4200B0 */ sw $v0, 0xb0($s2) -.L802402F0: -/* A64380 802402F0 8EC30070 */ lw $v1, 0x70($s6) -/* A64384 802402F4 2C620005 */ sltiu $v0, $v1, 5 -/* A64388 802402F8 10400101 */ beqz $v0, .L80240700 -/* A6438C 802402FC 00031080 */ sll $v0, $v1, 2 -/* A64390 80240300 3C018024 */ lui $at, 0x8024 -/* A64394 80240304 00220821 */ addu $at, $at, $v0 -/* A64398 80240308 8C222F70 */ lw $v0, 0x2f70($at) -/* A6439C 8024030C 00400008 */ jr $v0 -/* A643A0 80240310 00000000 */ nop -/* A643A4 80240314 3C01C47A */ lui $at, 0xc47a -/* A643A8 80240318 44810000 */ mtc1 $at, $f0 -/* A643AC 8024031C 24020014 */ addiu $v0, $zero, 0x14 -/* A643B0 80240320 AE400078 */ sw $zero, 0x78($s2) -/* A643B4 80240324 A62200A6 */ sh $v0, 0xa6($s1) -/* A643B8 80240328 A62200A8 */ sh $v0, 0xa8($s1) -/* A643BC 8024032C 24020001 */ addiu $v0, $zero, 1 -/* A643C0 80240330 AE200038 */ sw $zero, 0x38($s1) -/* A643C4 80240334 AE200040 */ sw $zero, 0x40($s1) -/* A643C8 80240338 E620003C */ swc1 $f0, 0x3c($s1) -/* A643CC 8024033C AE40006C */ sw $zero, 0x6c($s2) -/* A643D0 80240340 AEC20070 */ sw $v0, 0x70($s6) -/* A643D4 80240344 8E50006C */ lw $s0, 0x6c($s2) -/* A643D8 80240348 24020001 */ addiu $v0, $zero, 1 -/* A643DC 8024034C 160200EC */ bne $s0, $v0, .L80240700 -/* A643E0 80240350 24150002 */ addiu $s5, $zero, 2 -/* A643E4 80240354 AE55006C */ sw $s5, 0x6c($s2) -/* A643E8 80240358 C6800038 */ lwc1 $f0, 0x38($s4) -/* A643EC 8024035C E6600038 */ swc1 $f0, 0x38($s3) -/* A643F0 80240360 C680003C */ lwc1 $f0, 0x3c($s4) -/* A643F4 80240364 E660003C */ swc1 $f0, 0x3c($s3) -/* A643F8 80240368 C6800040 */ lwc1 $f0, 0x40($s4) -/* A643FC 8024036C E6600040 */ swc1 $f0, 0x40($s3) -/* A64400 80240370 C6820034 */ lwc1 $f2, 0x34($s4) -/* A64404 80240374 3C014387 */ lui $at, 0x4387 -/* A64408 80240378 44810000 */ mtc1 $at, $f0 -/* A6440C 8024037C 00000000 */ nop -/* A64410 80240380 46020001 */ sub.s $f0, $f0, $f2 -/* A64414 80240384 C6480074 */ lwc1 $f8, 0x74($s2) -/* A64418 80240388 46804220 */ cvt.s.w $f8, $f8 -/* A6441C 8024038C 44054000 */ mfc1 $a1, $f8 -/* A64420 80240390 44060000 */ mfc1 $a2, $f0 -/* A64424 80240394 0C00EA95 */ jal npc_move_heading -/* A64428 80240398 0260202D */ daddu $a0, $s3, $zero -/* A6442C 8024039C C6600038 */ lwc1 $f0, 0x38($s3) -/* A64430 802403A0 E6200038 */ swc1 $f0, 0x38($s1) -/* A64434 802403A4 C680003C */ lwc1 $f0, 0x3c($s4) -/* A64438 802403A8 C6420070 */ lwc1 $f2, 0x70($s2) -/* A6443C 802403AC 468010A0 */ cvt.s.w $f2, $f2 -/* A64440 802403B0 46020000 */ add.s $f0, $f0, $f2 -/* A64444 802403B4 3C014024 */ lui $at, 0x4024 -/* A64448 802403B8 4481A800 */ mtc1 $at, $f21 -/* A6444C 802403BC 4480A000 */ mtc1 $zero, $f20 -/* A64450 802403C0 E620003C */ swc1 $f0, 0x3c($s1) -/* A64454 802403C4 C6600040 */ lwc1 $f0, 0x40($s3) -/* A64458 802403C8 E6200040 */ swc1 $f0, 0x40($s1) -/* A6445C 802403CC A2500007 */ sb $s0, 7($s2) -/* A64460 802403D0 C6200038 */ lwc1 $f0, 0x38($s1) -/* A64464 802403D4 3C014066 */ lui $at, 0x4066 -/* A64468 802403D8 34216666 */ ori $at, $at, 0x6666 -/* A6446C 802403DC 44811000 */ mtc1 $at, $f2 -/* A64470 802403E0 4600020D */ trunc.w.s $f8, $f0 -/* A64474 802403E4 44024000 */ mfc1 $v0, $f8 -/* A64478 802403E8 00000000 */ nop -/* A6447C 802403EC A6420010 */ sh $v0, 0x10($s2) -/* A64480 802403F0 C620003C */ lwc1 $f0, 0x3c($s1) -/* A64484 802403F4 3C13800F */ lui $s3, %hi(gPlayerStatusPtr) -/* A64488 802403F8 26737B30 */ addiu $s3, $s3, %lo(gPlayerStatusPtr) -/* A6448C 802403FC 4600020D */ trunc.w.s $f8, $f0 -/* A64490 80240400 44024000 */ mfc1 $v0, $f8 -/* A64494 80240404 00000000 */ nop -/* A64498 80240408 A6420012 */ sh $v0, 0x12($s2) -/* A6449C 8024040C C6200040 */ lwc1 $f0, 0x40($s1) -/* A644A0 80240410 8E630000 */ lw $v1, ($s3) -/* A644A4 80240414 4600020D */ trunc.w.s $f8, $f0 -/* A644A8 80240418 44024000 */ mfc1 $v0, $f8 -/* A644AC 8024041C 00000000 */ nop -/* A644B0 80240420 A6420014 */ sh $v0, 0x14($s2) -/* A644B4 80240424 E6220018 */ swc1 $f2, 0x18($s1) -/* A644B8 80240428 C460002C */ lwc1 $f0, 0x2c($v1) -/* A644BC 8024042C C6220038 */ lwc1 $f2, 0x38($s1) -/* A644C0 80240430 46000021 */ cvt.d.s $f0, $f0 -/* A644C4 80240434 46340000 */ add.d $f0, $f0, $f20 -/* A644C8 80240438 C4640028 */ lwc1 $f4, 0x28($v1) -/* A644CC 8024043C 44806000 */ mtc1 $zero, $f12 -/* A644D0 80240440 46041081 */ sub.s $f2, $f2, $f4 -/* A644D4 80240444 C62E003C */ lwc1 $f14, 0x3c($s1) -/* A644D8 80240448 46200020 */ cvt.s.d $f0, $f0 -/* A644DC 8024044C 46001085 */ abs.s $f2, $f2 -/* A644E0 80240450 44070000 */ mfc1 $a3, $f0 -/* A644E4 80240454 44061000 */ mfc1 $a2, $f2 -/* A644E8 80240458 0C00A720 */ jal atan2 -/* A644EC 8024045C 00000000 */ nop -/* A644F0 80240460 3C018024 */ lui $at, 0x8024 -/* A644F4 80240464 D4222F88 */ ldc1 $f2, 0x2f88($at) -/* A644F8 80240468 46000021 */ cvt.d.s $f0, $f0 -/* A644FC 8024046C 46220001 */ sub.d $f0, $f0, $f2 -/* A64500 80240470 46200020 */ cvt.s.d $f0, $f0 -/* A64504 80240474 4600020D */ trunc.w.s $f8, $f0 -/* A64508 80240478 44044000 */ mfc1 $a0, $f8 -/* A6450C 8024047C 00000000 */ nop -/* A64510 80240480 00042400 */ sll $a0, $a0, 0x10 -/* A64514 80240484 0C00A4F5 */ jal cosine -/* A64518 80240488 00042403 */ sra $a0, $a0, 0x10 -/* A6451C 8024048C C6220018 */ lwc1 $f2, 0x18($s1) -/* A64520 80240490 46020002 */ mul.s $f0, $f0, $f2 -/* A64524 80240494 00000000 */ nop -/* A64528 80240498 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A6452C 8024049C C62E0040 */ lwc1 $f14, 0x40($s1) -/* A64530 802404A0 8E620000 */ lw $v0, ($s3) -/* A64534 802404A4 E620001C */ swc1 $f0, 0x1c($s1) -/* A64538 802404A8 8C460028 */ lw $a2, 0x28($v0) -/* A6453C 802404AC 0C00A720 */ jal atan2 -/* A64540 802404B0 8C470030 */ lw $a3, 0x30($v0) -/* A64544 802404B4 8E620000 */ lw $v0, ($s3) -/* A64548 802404B8 E620000C */ swc1 $f0, 0xc($s1) -/* A6454C 802404BC C440002C */ lwc1 $f0, 0x2c($v0) -/* A64550 802404C0 46000021 */ cvt.d.s $f0, $f0 -/* A64554 802404C4 46340000 */ add.d $f0, $f0, $f20 -/* A64558 802404C8 46200020 */ cvt.s.d $f0, $f0 -/* A6455C 802404CC E7A00010 */ swc1 $f0, 0x10($sp) -/* A64560 802404D0 C4400030 */ lwc1 $f0, 0x30($v0) -/* A64564 802404D4 E7A00014 */ swc1 $f0, 0x14($sp) -/* A64568 802404D8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A6456C 802404DC C62E003C */ lwc1 $f14, 0x3c($s1) -/* A64570 802404E0 8E260040 */ lw $a2, 0x40($s1) -/* A64574 802404E4 0C00A7CB */ jal dist3D -/* A64578 802404E8 8C470028 */ lw $a3, 0x28($v0) -/* A6457C 802404EC C6220018 */ lwc1 $f2, 0x18($s1) -/* A64580 802404F0 46020003 */ div.s $f0, $f0, $f2 -/* A64584 802404F4 4600020D */ trunc.w.s $f8, $f0 -/* A64588 802404F8 44104000 */ mfc1 $s0, $f8 -/* A6458C 802404FC 00000000 */ nop -/* A64590 80240500 5A000001 */ blezl $s0, .L80240508 -/* A64594 80240504 24100001 */ addiu $s0, $zero, 1 -.L80240508: -/* A64598 80240508 8E620000 */ lw $v0, ($s3) -/* A6459C 8024050C C624003C */ lwc1 $f4, 0x3c($s1) -/* A645A0 80240510 3C014120 */ lui $at, 0x4120 -/* A645A4 80240514 44811000 */ mtc1 $at, $f2 -/* A645A8 80240518 C4400028 */ lwc1 $f0, 0x28($v0) -/* A645AC 8024051C E7A00010 */ swc1 $f0, 0x10($sp) -/* A645B0 80240520 C440002C */ lwc1 $f0, 0x2c($v0) -/* A645B4 80240524 46020000 */ add.s $f0, $f0, $f2 -/* A645B8 80240528 3C014160 */ lui $at, 0x4160 -/* A645BC 8024052C 44811000 */ mtc1 $at, $f2 -/* A645C0 80240530 00000000 */ nop -/* A645C4 80240534 46022100 */ add.s $f4, $f4, $f2 -/* A645C8 80240538 46020000 */ add.s $f0, $f0, $f2 -/* A645CC 8024053C 44062000 */ mfc1 $a2, $f4 -/* A645D0 80240540 E7A00014 */ swc1 $f0, 0x14($sp) -/* A645D4 80240544 C4400030 */ lwc1 $f0, 0x30($v0) -/* A645D8 80240548 AFB0001C */ sw $s0, 0x1c($sp) -/* A645DC 8024054C E7A00018 */ swc1 $f0, 0x18($sp) -/* A645E0 80240550 8E250038 */ lw $a1, 0x38($s1) -/* A645E4 80240554 8E270040 */ lw $a3, 0x40($s1) -/* A645E8 80240558 0C01BFD4 */ jal func_8006FF50 -/* A645EC 8024055C 0000202D */ daddu $a0, $zero, $zero -/* A645F0 80240560 AE420078 */ sw $v0, 0x78($s2) -/* A645F4 80240564 A630008E */ sh $s0, 0x8e($s1) -/* A645F8 80240568 080901C0 */ j .L80240700 -/* A645FC 8024056C AED50070 */ sw $s5, 0x70($s6) -/* A64600 80240570 9622008E */ lhu $v0, 0x8e($s1) -/* A64604 80240574 2442FFFF */ addiu $v0, $v0, -1 -/* A64608 80240578 A622008E */ sh $v0, 0x8e($s1) -/* A6460C 8024057C 00021400 */ sll $v0, $v0, 0x10 -/* A64610 80240580 58400001 */ blezl $v0, .L80240588 -/* A64614 80240584 24150014 */ addiu $s5, $zero, 0x14 -.L80240588: -/* A64618 80240588 16A0000A */ bnez $s5, .L802405B4 -/* A6461C 8024058C 00000000 */ nop -/* A64620 80240590 8E250018 */ lw $a1, 0x18($s1) -/* A64624 80240594 8E26000C */ lw $a2, 0xc($s1) -/* A64628 80240598 0C00EA95 */ jal npc_move_heading -/* A6462C 8024059C 0220202D */ daddu $a0, $s1, $zero -/* A64630 802405A0 C620003C */ lwc1 $f0, 0x3c($s1) -/* A64634 802405A4 C622001C */ lwc1 $f2, 0x1c($s1) -/* A64638 802405A8 46020000 */ add.s $f0, $f0, $f2 -/* A6463C 802405AC 080901C0 */ j .L80240700 -/* A64640 802405B0 E620003C */ swc1 $f0, 0x3c($s1) -.L802405B4: -/* A64644 802405B4 862200A8 */ lh $v0, 0xa8($s1) -/* A64648 802405B8 3C013FE0 */ lui $at, 0x3fe0 -/* A6464C 802405BC 44810800 */ mtc1 $at, $f1 -/* A64650 802405C0 44800000 */ mtc1 $zero, $f0 -/* A64654 802405C4 44821000 */ mtc1 $v0, $f2 -/* A64658 802405C8 00000000 */ nop -/* A6465C 802405CC 468010A1 */ cvt.d.w $f2, $f2 -/* A64660 802405D0 46201082 */ mul.d $f2, $f2, $f0 -/* A64664 802405D4 00000000 */ nop -/* A64668 802405D8 C620003C */ lwc1 $f0, 0x3c($s1) -/* A6466C 802405DC AE20001C */ sw $zero, 0x1c($s1) -/* A64670 802405E0 46000021 */ cvt.d.s $f0, $f0 -/* A64674 802405E4 46220001 */ sub.d $f0, $f0, $f2 -/* A64678 802405E8 AE200018 */ sw $zero, 0x18($s1) -/* A6467C 802405EC 24020003 */ addiu $v0, $zero, 3 -/* A64680 802405F0 46200020 */ cvt.s.d $f0, $f0 -/* A64684 802405F4 E620003C */ swc1 $f0, 0x3c($s1) -/* A64688 802405F8 AE42006C */ sw $v0, 0x6c($s2) -/* A6468C 802405FC 24020004 */ addiu $v0, $zero, 4 -/* A64690 80240600 A620008E */ sh $zero, 0x8e($s1) -/* A64694 80240604 080901C0 */ j .L80240700 -/* A64698 80240608 AEC20070 */ sw $v0, 0x70($s6) -/* A6469C 8024060C 9622008E */ lhu $v0, 0x8e($s1) -/* A646A0 80240610 24420001 */ addiu $v0, $v0, 1 -/* A646A4 80240614 A622008E */ sh $v0, 0x8e($s1) -/* A646A8 80240618 00021400 */ sll $v0, $v0, 0x10 -/* A646AC 8024061C 00021C03 */ sra $v1, $v0, 0x10 -/* A646B0 80240620 28620007 */ slti $v0, $v1, 7 -/* A646B4 80240624 10400027 */ beqz $v0, .L802406C4 -/* A646B8 80240628 24020007 */ addiu $v0, $zero, 7 -/* A646BC 8024062C 8622008E */ lh $v0, 0x8e($s1) -/* A646C0 80240630 3C01401C */ lui $at, 0x401c -/* A646C4 80240634 44810800 */ mtc1 $at, $f1 -/* A646C8 80240638 44800000 */ mtc1 $zero, $f0 -/* A646CC 8024063C 44822000 */ mtc1 $v0, $f4 -/* A646D0 80240640 00000000 */ nop -/* A646D4 80240644 46802120 */ cvt.s.w $f4, $f4 -/* A646D8 80240648 46002121 */ cvt.d.s $f4, $f4 -/* A646DC 8024064C 46202102 */ mul.d $f4, $f4, $f0 -/* A646E0 80240650 00000000 */ nop -/* A646E4 80240654 44821000 */ mtc1 $v0, $f2 -/* A646E8 80240658 00000000 */ nop -/* A646EC 8024065C 468010A0 */ cvt.s.w $f2, $f2 -/* A646F0 80240660 460010A1 */ cvt.d.s $f2, $f2 -/* A646F4 80240664 46201082 */ mul.d $f2, $f2, $f0 -/* A646F8 80240668 00000000 */ nop -/* A646FC 8024066C C620003C */ lwc1 $f0, 0x3c($s1) -/* A64700 80240670 3C01400C */ lui $at, 0x400c -/* A64704 80240674 44813800 */ mtc1 $at, $f7 -/* A64708 80240678 44803000 */ mtc1 $zero, $f6 -/* A6470C 8024067C 46000021 */ cvt.d.s $f0, $f0 -/* A64710 80240680 46260001 */ sub.d $f0, $f0, $f6 -/* A64714 80240684 3C014034 */ lui $at, 0x4034 -/* A64718 80240688 44813800 */ mtc1 $at, $f7 -/* A6471C 8024068C 44803000 */ mtc1 $zero, $f6 -/* A64720 80240690 00000000 */ nop -/* A64724 80240694 46262100 */ add.d $f4, $f4, $f6 -/* A64728 80240698 46200020 */ cvt.s.d $f0, $f0 -/* A6472C 8024069C E620003C */ swc1 $f0, 0x3c($s1) -/* A64730 802406A0 46261080 */ add.d $f2, $f2, $f6 -/* A64734 802406A4 4620220D */ trunc.w.d $f8, $f4 -/* A64738 802406A8 44024000 */ mfc1 $v0, $f8 -/* A6473C 802406AC 00000000 */ nop -/* A64740 802406B0 A62200A6 */ sh $v0, 0xa6($s1) -/* A64744 802406B4 4620120D */ trunc.w.d $f8, $f2 -/* A64748 802406B8 44024000 */ mfc1 $v0, $f8 -/* A6474C 802406BC 080901C0 */ j .L80240700 -/* A64750 802406C0 A62200A8 */ sh $v0, 0xa8($s1) -.L802406C4: -/* A64754 802406C4 1462000A */ bne $v1, $v0, .L802406F0 -/* A64758 802406C8 28620010 */ slti $v0, $v1, 0x10 -/* A6475C 802406CC 3C01C47A */ lui $at, 0xc47a -/* A64760 802406D0 44810000 */ mtc1 $at, $f0 -/* A64764 802406D4 24020014 */ addiu $v0, $zero, 0x14 -/* A64768 802406D8 AE200038 */ sw $zero, 0x38($s1) -/* A6476C 802406DC AE200040 */ sw $zero, 0x40($s1) -/* A64770 802406E0 A62200A6 */ sh $v0, 0xa6($s1) -/* A64774 802406E4 A62200A8 */ sh $v0, 0xa8($s1) -/* A64778 802406E8 080901C0 */ j .L80240700 -/* A6477C 802406EC E620003C */ swc1 $f0, 0x3c($s1) -.L802406F0: -/* A64780 802406F0 14400003 */ bnez $v0, .L80240700 -/* A64784 802406F4 00000000 */ nop -/* A64788 802406F8 AE40006C */ sw $zero, 0x6c($s2) -/* A6478C 802406FC AEC00070 */ sw $zero, 0x70($s6) -.L80240700: -/* A64790 80240700 8FBF037C */ lw $ra, 0x37c($sp) -/* A64794 80240704 8FB60378 */ lw $s6, 0x378($sp) -/* A64798 80240708 8FB50374 */ lw $s5, 0x374($sp) -/* A6479C 8024070C 8FB40370 */ lw $s4, 0x370($sp) -/* A647A0 80240710 8FB3036C */ lw $s3, 0x36c($sp) -/* A647A4 80240714 8FB20368 */ lw $s2, 0x368($sp) -/* A647A8 80240718 8FB10364 */ lw $s1, 0x364($sp) -/* A647AC 8024071C 8FB00360 */ lw $s0, 0x360($sp) -/* A647B0 80240720 D7B40380 */ ldc1 $f20, 0x380($sp) -/* A647B4 80240724 0000102D */ daddu $v0, $zero, $zero -/* A647B8 80240728 03E00008 */ jr $ra -/* A647BC 8024072C 27BD0388 */ addiu $sp, $sp, 0x388 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/func_80240730_A64090.s b/asm/nonmatchings/world/area_kpa/kpa_51/func_80240730_A64090.s deleted file mode 100644 index 4fdc08270f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/func_80240730_A64090.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_A647C0 -/* A647C0 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A647C4 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* A647C8 80240738 0080882D */ daddu $s1, $a0, $zero -/* A647CC 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* A647D0 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* A647D4 80240744 8E300148 */ lw $s0, 0x148($s1) -/* A647D8 80240748 0C00EABB */ jal get_npc_unsafe -/* A647DC 8024074C 86040008 */ lh $a0, 8($s0) -/* A647E0 80240750 0040282D */ daddu $a1, $v0, $zero -/* A647E4 80240754 94A2008E */ lhu $v0, 0x8e($a1) -/* A647E8 80240758 2442FFFF */ addiu $v0, $v0, -1 -/* A647EC 8024075C A4A2008E */ sh $v0, 0x8e($a1) -/* A647F0 80240760 00021400 */ sll $v0, $v0, 0x10 -/* A647F4 80240764 1C40000A */ bgtz $v0, .L80240790 -/* A647F8 80240768 2404FFFD */ addiu $a0, $zero, -3 -/* A647FC 8024076C 8E0300CC */ lw $v1, 0xcc($s0) -/* A64800 80240770 8CA20000 */ lw $v0, ($a1) -/* A64804 80240774 8C630000 */ lw $v1, ($v1) -/* A64808 80240778 00441024 */ and $v0, $v0, $a0 -/* A6480C 8024077C ACA20000 */ sw $v0, ($a1) -/* A64810 80240780 24020001 */ addiu $v0, $zero, 1 -/* A64814 80240784 A4A0008E */ sh $zero, 0x8e($a1) -/* A64818 80240788 ACA30028 */ sw $v1, 0x28($a1) -/* A6481C 8024078C AE220070 */ sw $v0, 0x70($s1) -.L80240790: -/* A64820 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* A64824 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* A64828 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* A6482C 8024079C 03E00008 */ jr $ra -/* A64830 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/func_802408D0_A64090.s b/asm/nonmatchings/world/area_kpa/kpa_51/func_802408D0_A64090.s deleted file mode 100644 index b24fc0615c..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/func_802408D0_A64090.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408D0_A64960 -/* A64960 802408D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A64964 802408D4 AFB10014 */ sw $s1, 0x14($sp) -/* A64968 802408D8 0080882D */ daddu $s1, $a0, $zero -/* A6496C 802408DC AFBF0018 */ sw $ra, 0x18($sp) -/* A64970 802408E0 AFB00010 */ sw $s0, 0x10($sp) -/* A64974 802408E4 8E220148 */ lw $v0, 0x148($s1) -/* A64978 802408E8 0C00EABB */ jal get_npc_unsafe -/* A6497C 802408EC 84440008 */ lh $a0, 8($v0) -/* A64980 802408F0 24040064 */ addiu $a0, $zero, 0x64 -/* A64984 802408F4 0C00A67F */ jal rand_int -/* A64988 802408F8 0040802D */ daddu $s0, $v0, $zero -/* A6498C 802408FC 00021FC2 */ srl $v1, $v0, 0x1f -/* A64990 80240900 00431821 */ addu $v1, $v0, $v1 -/* A64994 80240904 00031843 */ sra $v1, $v1, 1 -/* A64998 80240908 00031840 */ sll $v1, $v1, 1 -/* A6499C 8024090C 00431023 */ subu $v0, $v0, $v1 -/* A649A0 80240910 3C014334 */ lui $at, 0x4334 -/* A649A4 80240914 44811000 */ mtc1 $at, $f2 -/* A649A8 80240918 44820000 */ mtc1 $v0, $f0 -/* A649AC 8024091C 00000000 */ nop -/* A649B0 80240920 46800020 */ cvt.s.w $f0, $f0 -/* A649B4 80240924 46020002 */ mul.s $f0, $f0, $f2 -/* A649B8 80240928 00000000 */ nop -/* A649BC 8024092C 3C013F4C */ lui $at, 0x3f4c -/* A649C0 80240930 3421CCCD */ ori $at, $at, 0xcccd -/* A649C4 80240934 44812000 */ mtc1 $at, $f4 -/* A649C8 80240938 3C0142B4 */ lui $at, 0x42b4 -/* A649CC 8024093C 44811000 */ mtc1 $at, $f2 -/* A649D0 80240940 2402000F */ addiu $v0, $zero, 0xf -/* A649D4 80240944 A602008E */ sh $v0, 0x8e($s0) -/* A649D8 80240948 46020000 */ add.s $f0, $f0, $f2 -/* A649DC 8024094C 24020006 */ addiu $v0, $zero, 6 -/* A649E0 80240950 E6040018 */ swc1 $f4, 0x18($s0) -/* A649E4 80240954 E600000C */ swc1 $f0, 0xc($s0) -/* A649E8 80240958 AE220070 */ sw $v0, 0x70($s1) -/* A649EC 8024095C 8FBF0018 */ lw $ra, 0x18($sp) -/* A649F0 80240960 8FB10014 */ lw $s1, 0x14($sp) -/* A649F4 80240964 8FB00010 */ lw $s0, 0x10($sp) -/* A649F8 80240968 03E00008 */ jr $ra -/* A649FC 8024096C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/func_80240970_A64090.s b/asm/nonmatchings/world/area_kpa/kpa_51/func_80240970_A64090.s deleted file mode 100644 index 60923b808d..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/func_80240970_A64090.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240970_A64A00 -/* A64A00 80240970 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A64A04 80240974 AFB10014 */ sw $s1, 0x14($sp) -/* A64A08 80240978 0080882D */ daddu $s1, $a0, $zero -/* A64A0C 8024097C AFBF0018 */ sw $ra, 0x18($sp) -/* A64A10 80240980 AFB00010 */ sw $s0, 0x10($sp) -/* A64A14 80240984 8E220148 */ lw $v0, 0x148($s1) -/* A64A18 80240988 0C00EABB */ jal get_npc_unsafe -/* A64A1C 8024098C 84440008 */ lh $a0, 8($v0) -/* A64A20 80240990 0040802D */ daddu $s0, $v0, $zero -/* A64A24 80240994 8E050018 */ lw $a1, 0x18($s0) -/* A64A28 80240998 8E06000C */ lw $a2, 0xc($s0) -/* A64A2C 8024099C 0C00EA95 */ jal npc_move_heading -/* A64A30 802409A0 0200202D */ daddu $a0, $s0, $zero -/* A64A34 802409A4 9602008E */ lhu $v0, 0x8e($s0) -/* A64A38 802409A8 2442FFFF */ addiu $v0, $v0, -1 -/* A64A3C 802409AC A602008E */ sh $v0, 0x8e($s0) -/* A64A40 802409B0 00021400 */ sll $v0, $v0, 0x10 -/* A64A44 802409B4 1C400002 */ bgtz $v0, .L802409C0 -/* A64A48 802409B8 2402000A */ addiu $v0, $zero, 0xa -/* A64A4C 802409BC AE220070 */ sw $v0, 0x70($s1) -.L802409C0: -/* A64A50 802409C0 8FBF0018 */ lw $ra, 0x18($sp) -/* A64A54 802409C4 8FB10014 */ lw $s1, 0x14($sp) -/* A64A58 802409C8 8FB00010 */ lw $s0, 0x10($sp) -/* A64A5C 802409CC 03E00008 */ jr $ra -/* A64A60 802409D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/func_802409D4_A64090.s b/asm/nonmatchings/world/area_kpa/kpa_51/func_802409D4_A64090.s deleted file mode 100644 index 7d8f9402c4..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/func_802409D4_A64090.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409D4_A64A64 -/* A64A64 802409D4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A64A68 802409D8 AFB30034 */ sw $s3, 0x34($sp) -/* A64A6C 802409DC 0080982D */ daddu $s3, $a0, $zero -/* A64A70 802409E0 AFBF0038 */ sw $ra, 0x38($sp) -/* A64A74 802409E4 AFB20030 */ sw $s2, 0x30($sp) -/* A64A78 802409E8 AFB1002C */ sw $s1, 0x2c($sp) -/* A64A7C 802409EC AFB00028 */ sw $s0, 0x28($sp) -/* A64A80 802409F0 8E700148 */ lw $s0, 0x148($s3) -/* A64A84 802409F4 0C00EABB */ jal get_npc_unsafe -/* A64A88 802409F8 86040008 */ lh $a0, 8($s0) -/* A64A8C 802409FC 0040902D */ daddu $s2, $v0, $zero -/* A64A90 80240A00 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* A64A94 80240A04 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* A64A98 80240A08 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A64A9C 80240A0C 8E220000 */ lw $v0, ($s1) -/* A64AA0 80240A10 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A64AA4 80240A14 8C460028 */ lw $a2, 0x28($v0) -/* A64AA8 80240A18 0C00A7B5 */ jal dist2D -/* A64AAC 80240A1C 8C470030 */ lw $a3, 0x30($v0) -/* A64AB0 80240A20 24020001 */ addiu $v0, $zero, 1 -/* A64AB4 80240A24 AE02006C */ sw $v0, 0x6c($s0) -/* A64AB8 80240A28 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A64ABC 80240A2C 8E0200CC */ lw $v0, 0xcc($s0) -/* A64AC0 80240A30 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A64AC4 80240A34 8E230000 */ lw $v1, ($s1) -/* A64AC8 80240A38 8C420020 */ lw $v0, 0x20($v0) -/* A64ACC 80240A3C AE420028 */ sw $v0, 0x28($s2) -/* A64AD0 80240A40 8C660028 */ lw $a2, 0x28($v1) -/* A64AD4 80240A44 8C670030 */ lw $a3, 0x30($v1) -/* A64AD8 80240A48 0C00A720 */ jal atan2 -/* A64ADC 80240A4C E7A00024 */ swc1 $f0, 0x24($sp) -/* A64AE0 80240A50 8E420000 */ lw $v0, ($s2) -/* A64AE4 80240A54 3C013DCC */ lui $at, 0x3dcc -/* A64AE8 80240A58 3421CCCD */ ori $at, $at, 0xcccd -/* A64AEC 80240A5C 44811000 */ mtc1 $at, $f2 -/* A64AF0 80240A60 2403FFFD */ addiu $v1, $zero, -3 -/* A64AF4 80240A64 E640000C */ swc1 $f0, 0xc($s2) -/* A64AF8 80240A68 00431024 */ and $v0, $v0, $v1 -/* A64AFC 80240A6C AE420000 */ sw $v0, ($s2) -/* A64B00 80240A70 30420008 */ andi $v0, $v0, 8 -/* A64B04 80240A74 E6420054 */ swc1 $f2, 0x54($s2) -/* A64B08 80240A78 E6420058 */ swc1 $f2, 0x58($s2) -/* A64B0C 80240A7C 1440001B */ bnez $v0, .L80240AEC -/* A64B10 80240A80 E642005C */ swc1 $f2, 0x5c($s2) -/* A64B14 80240A84 27A6001C */ addiu $a2, $sp, 0x1c -/* A64B18 80240A88 27A70020 */ addiu $a3, $sp, 0x20 -/* A64B1C 80240A8C 27A20024 */ addiu $v0, $sp, 0x24 -/* A64B20 80240A90 C6420038 */ lwc1 $f2, 0x38($s2) -/* A64B24 80240A94 C640003C */ lwc1 $f0, 0x3c($s2) -/* A64B28 80240A98 3C014348 */ lui $at, 0x4348 -/* A64B2C 80240A9C 44813000 */ mtc1 $at, $f6 -/* A64B30 80240AA0 46000021 */ cvt.d.s $f0, $f0 -/* A64B34 80240AA4 E7A20018 */ swc1 $f2, 0x18($sp) -/* A64B38 80240AA8 3C014059 */ lui $at, 0x4059 -/* A64B3C 80240AAC 44811800 */ mtc1 $at, $f3 -/* A64B40 80240AB0 44801000 */ mtc1 $zero, $f2 -/* A64B44 80240AB4 C6440040 */ lwc1 $f4, 0x40($s2) -/* A64B48 80240AB8 46220000 */ add.d $f0, $f0, $f2 -/* A64B4C 80240ABC E7A60024 */ swc1 $f6, 0x24($sp) -/* A64B50 80240AC0 E7A40020 */ swc1 $f4, 0x20($sp) -/* A64B54 80240AC4 46200020 */ cvt.s.d $f0, $f0 -/* A64B58 80240AC8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A64B5C 80240ACC AFA20010 */ sw $v0, 0x10($sp) -/* A64B60 80240AD0 8E440080 */ lw $a0, 0x80($s2) -/* A64B64 80240AD4 0C0372DF */ jal func_800DCB7C -/* A64B68 80240AD8 27A50018 */ addiu $a1, $sp, 0x18 -/* A64B6C 80240ADC 10400004 */ beqz $v0, .L80240AF0 -/* A64B70 80240AE0 2402000B */ addiu $v0, $zero, 0xb -/* A64B74 80240AE4 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A64B78 80240AE8 E640003C */ swc1 $f0, 0x3c($s2) -.L80240AEC: -/* A64B7C 80240AEC 2402000B */ addiu $v0, $zero, 0xb -.L80240AF0: -/* A64B80 80240AF0 A640008E */ sh $zero, 0x8e($s2) -/* A64B84 80240AF4 AE620070 */ sw $v0, 0x70($s3) -/* A64B88 80240AF8 8FBF0038 */ lw $ra, 0x38($sp) -/* A64B8C 80240AFC 8FB30034 */ lw $s3, 0x34($sp) -/* A64B90 80240B00 8FB20030 */ lw $s2, 0x30($sp) -/* A64B94 80240B04 8FB1002C */ lw $s1, 0x2c($sp) -/* A64B98 80240B08 8FB00028 */ lw $s0, 0x28($sp) -/* A64B9C 80240B0C 03E00008 */ jr $ra -/* A64BA0 80240B10 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/func_80240CF4_A64090.s b/asm/nonmatchings/world/area_kpa/kpa_51/func_80240CF4_A64090.s deleted file mode 100644 index d3c7c4f450..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/func_80240CF4_A64090.s +++ /dev/null @@ -1,118 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CF4_A64D84 -/* A64D84 80240CF4 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A64D88 80240CF8 AFB40048 */ sw $s4, 0x48($sp) -/* A64D8C 80240CFC 0080A02D */ daddu $s4, $a0, $zero -/* A64D90 80240D00 AFBF004C */ sw $ra, 0x4c($sp) -/* A64D94 80240D04 AFB30044 */ sw $s3, 0x44($sp) -/* A64D98 80240D08 AFB20040 */ sw $s2, 0x40($sp) -/* A64D9C 80240D0C AFB1003C */ sw $s1, 0x3c($sp) -/* A64DA0 80240D10 AFB00038 */ sw $s0, 0x38($sp) -/* A64DA4 80240D14 F7B40050 */ sdc1 $f20, 0x50($sp) -/* A64DA8 80240D18 8E910148 */ lw $s1, 0x148($s4) -/* A64DAC 80240D1C 00A0902D */ daddu $s2, $a1, $zero -/* A64DB0 80240D20 86240008 */ lh $a0, 8($s1) -/* A64DB4 80240D24 0C00EABB */ jal get_npc_unsafe -/* A64DB8 80240D28 00C0982D */ daddu $s3, $a2, $zero -/* A64DBC 80240D2C 0040802D */ daddu $s0, $v0, $zero -/* A64DC0 80240D30 9602008E */ lhu $v0, 0x8e($s0) -/* A64DC4 80240D34 2442FFFF */ addiu $v0, $v0, -1 -/* A64DC8 80240D38 A602008E */ sh $v0, 0x8e($s0) -/* A64DCC 80240D3C 00021400 */ sll $v0, $v0, 0x10 -/* A64DD0 80240D40 14400021 */ bnez $v0, .L80240DC8 -/* A64DD4 80240D44 0280202D */ daddu $a0, $s4, $zero -/* A64DD8 80240D48 24040002 */ addiu $a0, $zero, 2 -/* A64DDC 80240D4C 0200282D */ daddu $a1, $s0, $zero -/* A64DE0 80240D50 0000302D */ daddu $a2, $zero, $zero -/* A64DE4 80240D54 8E2200CC */ lw $v0, 0xcc($s1) -/* A64DE8 80240D58 3C013F80 */ lui $at, 0x3f80 -/* A64DEC 80240D5C 44810000 */ mtc1 $at, $f0 -/* A64DF0 80240D60 3C014000 */ lui $at, 0x4000 -/* A64DF4 80240D64 44811000 */ mtc1 $at, $f2 -/* A64DF8 80240D68 8C430000 */ lw $v1, ($v0) -/* A64DFC 80240D6C 860200A8 */ lh $v0, 0xa8($s0) -/* A64E00 80240D70 3C01C1A0 */ lui $at, 0xc1a0 -/* A64E04 80240D74 44812000 */ mtc1 $at, $f4 -/* A64E08 80240D78 44824000 */ mtc1 $v0, $f8 -/* A64E0C 80240D7C 00000000 */ nop -/* A64E10 80240D80 46804220 */ cvt.s.w $f8, $f8 -/* A64E14 80240D84 44074000 */ mfc1 $a3, $f8 -/* A64E18 80240D88 2402000C */ addiu $v0, $zero, 0xc -/* A64E1C 80240D8C AE030028 */ sw $v1, 0x28($s0) -/* A64E20 80240D90 AFA2001C */ sw $v0, 0x1c($sp) -/* A64E24 80240D94 27A20028 */ addiu $v0, $sp, 0x28 -/* A64E28 80240D98 E7A00010 */ swc1 $f0, 0x10($sp) -/* A64E2C 80240D9C E7A20014 */ swc1 $f2, 0x14($sp) -/* A64E30 80240DA0 E7A40018 */ swc1 $f4, 0x18($sp) -/* A64E34 80240DA4 0C01BFA4 */ jal fx_emote -/* A64E38 80240DA8 AFA20020 */ sw $v0, 0x20($sp) -/* A64E3C 80240DAC 8E2200CC */ lw $v0, 0xcc($s1) -/* A64E40 80240DB0 8C430000 */ lw $v1, ($v0) -/* A64E44 80240DB4 2402000F */ addiu $v0, $zero, 0xf -/* A64E48 80240DB8 A602008E */ sh $v0, 0x8e($s0) -/* A64E4C 80240DBC AE030028 */ sw $v1, 0x28($s0) -/* A64E50 80240DC0 080903A4 */ j .L80240E90 -/* A64E54 80240DC4 AE800070 */ sw $zero, 0x70($s4) -.L80240DC8: -/* A64E58 80240DC8 8E450024 */ lw $a1, 0x24($s2) -/* A64E5C 80240DCC 8E460028 */ lw $a2, 0x28($s2) -/* A64E60 80240DD0 0C090014 */ jal func_80240050 -/* A64E64 80240DD4 0260382D */ daddu $a3, $s3, $zero -/* A64E68 80240DD8 24030001 */ addiu $v1, $zero, 1 -/* A64E6C 80240DDC 1443002C */ bne $v0, $v1, .L80240E90 -/* A64E70 80240DE0 0200202D */ daddu $a0, $s0, $zero -/* A64E74 80240DE4 240520D4 */ addiu $a1, $zero, 0x20d4 -/* A64E78 80240DE8 0C012530 */ jal func_800494C0 -/* A64E7C 80240DEC 0000302D */ daddu $a2, $zero, $zero -/* A64E80 80240DF0 27A4002C */ addiu $a0, $sp, 0x2c -/* A64E84 80240DF4 27A50030 */ addiu $a1, $sp, 0x30 -/* A64E88 80240DF8 3C064188 */ lui $a2, 0x4188 -/* A64E8C 80240DFC C6020034 */ lwc1 $f2, 0x34($s0) -/* A64E90 80240E00 3C014387 */ lui $at, 0x4387 -/* A64E94 80240E04 44810000 */ mtc1 $at, $f0 -/* A64E98 80240E08 8E2200CC */ lw $v0, 0xcc($s1) -/* A64E9C 80240E0C C614003C */ lwc1 $f20, 0x3c($s0) -/* A64EA0 80240E10 46020001 */ sub.s $f0, $f0, $f2 -/* A64EA4 80240E14 3C014200 */ lui $at, 0x4200 -/* A64EA8 80240E18 44812000 */ mtc1 $at, $f4 -/* A64EAC 80240E1C C6060038 */ lwc1 $f6, 0x38($s0) -/* A64EB0 80240E20 4604A500 */ add.s $f20, $f20, $f4 -/* A64EB4 80240E24 3C013F80 */ lui $at, 0x3f80 -/* A64EB8 80240E28 44811000 */ mtc1 $at, $f2 -/* A64EBC 80240E2C 44070000 */ mfc1 $a3, $f0 -/* A64EC0 80240E30 C6000040 */ lwc1 $f0, 0x40($s0) -/* A64EC4 80240E34 8C420020 */ lw $v0, 0x20($v0) -/* A64EC8 80240E38 46020000 */ add.s $f0, $f0, $f2 -/* A64ECC 80240E3C E7A6002C */ swc1 $f6, 0x2c($sp) -/* A64ED0 80240E40 AE020028 */ sw $v0, 0x28($s0) -/* A64ED4 80240E44 0C00A7E7 */ jal add_vec2D_polar -/* A64ED8 80240E48 E7A00030 */ swc1 $f0, 0x30($sp) -/* A64EDC 80240E4C 0000202D */ daddu $a0, $zero, $zero -/* A64EE0 80240E50 4406A000 */ mfc1 $a2, $f20 -/* A64EE4 80240E54 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A64EE8 80240E58 C7A20030 */ lwc1 $f2, 0x30($sp) -/* A64EEC 80240E5C 44050000 */ mfc1 $a1, $f0 -/* A64EF0 80240E60 44071000 */ mfc1 $a3, $f2 -/* A64EF4 80240E64 3C013DCC */ lui $at, 0x3dcc -/* A64EF8 80240E68 3421CCCD */ ori $at, $at, 0xcccd -/* A64EFC 80240E6C 44810000 */ mtc1 $at, $f0 -/* A64F00 80240E70 2402000D */ addiu $v0, $zero, 0xd -/* A64F04 80240E74 AFA20014 */ sw $v0, 0x14($sp) -/* A64F08 80240E78 0C01BFEC */ jal func_8006FFB0 -/* A64F0C 80240E7C E7A00010 */ swc1 $f0, 0x10($sp) -/* A64F10 80240E80 2402000F */ addiu $v0, $zero, 0xf -/* A64F14 80240E84 A602008E */ sh $v0, 0x8e($s0) -/* A64F18 80240E88 24020016 */ addiu $v0, $zero, 0x16 -/* A64F1C 80240E8C AE820070 */ sw $v0, 0x70($s4) -.L80240E90: -/* A64F20 80240E90 8FBF004C */ lw $ra, 0x4c($sp) -/* A64F24 80240E94 8FB40048 */ lw $s4, 0x48($sp) -/* A64F28 80240E98 8FB30044 */ lw $s3, 0x44($sp) -/* A64F2C 80240E9C 8FB20040 */ lw $s2, 0x40($sp) -/* A64F30 80240EA0 8FB1003C */ lw $s1, 0x3c($sp) -/* A64F34 80240EA4 8FB00038 */ lw $s0, 0x38($sp) -/* A64F38 80240EA8 D7B40050 */ ldc1 $f20, 0x50($sp) -/* A64F3C 80240EAC 03E00008 */ jr $ra -/* A64F40 80240EB0 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/func_80240EB4_A64090.s b/asm/nonmatchings/world/area_kpa/kpa_51/func_80240EB4_A64090.s deleted file mode 100644 index b008a1173b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/func_80240EB4_A64090.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_A64F44 -/* A64F44 80240EB4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A64F48 80240EB8 AFB10014 */ sw $s1, 0x14($sp) -/* A64F4C 80240EBC 0080882D */ daddu $s1, $a0, $zero -/* A64F50 80240EC0 AFBF0018 */ sw $ra, 0x18($sp) -/* A64F54 80240EC4 AFB00010 */ sw $s0, 0x10($sp) -/* A64F58 80240EC8 8E300148 */ lw $s0, 0x148($s1) -/* A64F5C 80240ECC 0C00EABB */ jal get_npc_unsafe -/* A64F60 80240ED0 86040008 */ lh $a0, 8($s0) -/* A64F64 80240ED4 0040202D */ daddu $a0, $v0, $zero -/* A64F68 80240ED8 9482008E */ lhu $v0, 0x8e($a0) -/* A64F6C 80240EDC 2442FFFF */ addiu $v0, $v0, -1 -/* A64F70 80240EE0 A482008E */ sh $v0, 0x8e($a0) -/* A64F74 80240EE4 00021400 */ sll $v0, $v0, 0x10 -/* A64F78 80240EE8 1C400008 */ bgtz $v0, .L80240F0C -/* A64F7C 80240EEC 00000000 */ nop -/* A64F80 80240EF0 8E0200CC */ lw $v0, 0xcc($s0) -/* A64F84 80240EF4 8C430024 */ lw $v1, 0x24($v0) -/* A64F88 80240EF8 24020009 */ addiu $v0, $zero, 9 -/* A64F8C 80240EFC A482008E */ sh $v0, 0x8e($a0) -/* A64F90 80240F00 24020017 */ addiu $v0, $zero, 0x17 -/* A64F94 80240F04 AC830028 */ sw $v1, 0x28($a0) -/* A64F98 80240F08 AE220070 */ sw $v0, 0x70($s1) -.L80240F0C: -/* A64F9C 80240F0C 8FBF0018 */ lw $ra, 0x18($sp) -/* A64FA0 80240F10 8FB10014 */ lw $s1, 0x14($sp) -/* A64FA4 80240F14 8FB00010 */ lw $s0, 0x10($sp) -/* A64FA8 80240F18 03E00008 */ jr $ra -/* A64FAC 80240F1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/func_80240F20_A64090.s b/asm/nonmatchings/world/area_kpa/kpa_51/func_80240F20_A64090.s deleted file mode 100644 index 89210b3532..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/func_80240F20_A64090.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_A64FB0 -/* A64FB0 80240F20 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A64FB4 80240F24 AFB3003C */ sw $s3, 0x3c($sp) -/* A64FB8 80240F28 0080982D */ daddu $s3, $a0, $zero -/* A64FBC 80240F2C AFBF0044 */ sw $ra, 0x44($sp) -/* A64FC0 80240F30 AFB40040 */ sw $s4, 0x40($sp) -/* A64FC4 80240F34 AFB20038 */ sw $s2, 0x38($sp) -/* A64FC8 80240F38 AFB10034 */ sw $s1, 0x34($sp) -/* A64FCC 80240F3C AFB00030 */ sw $s0, 0x30($sp) -/* A64FD0 80240F40 8E720148 */ lw $s2, 0x148($s3) -/* A64FD4 80240F44 00A0882D */ daddu $s1, $a1, $zero -/* A64FD8 80240F48 86440008 */ lh $a0, 8($s2) -/* A64FDC 80240F4C 0C00EABB */ jal get_npc_unsafe -/* A64FE0 80240F50 00C0A02D */ daddu $s4, $a2, $zero -/* A64FE4 80240F54 0040802D */ daddu $s0, $v0, $zero -/* A64FE8 80240F58 9602008E */ lhu $v0, 0x8e($s0) -/* A64FEC 80240F5C 2442FFFF */ addiu $v0, $v0, -1 -/* A64FF0 80240F60 A602008E */ sh $v0, 0x8e($s0) -/* A64FF4 80240F64 00021400 */ sll $v0, $v0, 0x10 -/* A64FF8 80240F68 1C400032 */ bgtz $v0, .L80241034 -/* A64FFC 80240F6C 00000000 */ nop -/* A65000 80240F70 0260202D */ daddu $a0, $s3, $zero -/* A65004 80240F74 8E250024 */ lw $a1, 0x24($s1) -/* A65008 80240F78 8E260028 */ lw $a2, 0x28($s1) -/* A6500C 80240F7C 0C090014 */ jal func_80240050 -/* A65010 80240F80 0280382D */ daddu $a3, $s4, $zero -/* A65014 80240F84 0040882D */ daddu $s1, $v0, $zero -/* A65018 80240F88 24020001 */ addiu $v0, $zero, 1 -/* A6501C 80240F8C 1222001D */ beq $s1, $v0, .L80241004 -/* A65020 80240F90 0200282D */ daddu $a1, $s0, $zero -/* A65024 80240F94 24040002 */ addiu $a0, $zero, 2 -/* A65028 80240F98 0000302D */ daddu $a2, $zero, $zero -/* A6502C 80240F9C 860300A8 */ lh $v1, 0xa8($s0) -/* A65030 80240FA0 3C013F80 */ lui $at, 0x3f80 -/* A65034 80240FA4 44810000 */ mtc1 $at, $f0 -/* A65038 80240FA8 3C014000 */ lui $at, 0x4000 -/* A6503C 80240FAC 44811000 */ mtc1 $at, $f2 -/* A65040 80240FB0 3C01C1A0 */ lui $at, 0xc1a0 -/* A65044 80240FB4 44812000 */ mtc1 $at, $f4 -/* A65048 80240FB8 2402000C */ addiu $v0, $zero, 0xc -/* A6504C 80240FBC AFA2001C */ sw $v0, 0x1c($sp) -/* A65050 80240FC0 44833000 */ mtc1 $v1, $f6 -/* A65054 80240FC4 00000000 */ nop -/* A65058 80240FC8 468031A0 */ cvt.s.w $f6, $f6 -/* A6505C 80240FCC 44073000 */ mfc1 $a3, $f6 -/* A65060 80240FD0 27A20028 */ addiu $v0, $sp, 0x28 -/* A65064 80240FD4 AFA20020 */ sw $v0, 0x20($sp) -/* A65068 80240FD8 E7A00010 */ swc1 $f0, 0x10($sp) -/* A6506C 80240FDC E7A20014 */ swc1 $f2, 0x14($sp) -/* A65070 80240FE0 0C01BFA4 */ jal fx_emote -/* A65074 80240FE4 E7A40018 */ swc1 $f4, 0x18($sp) -/* A65078 80240FE8 8E4200CC */ lw $v0, 0xcc($s2) -/* A6507C 80240FEC 8C430000 */ lw $v1, ($v0) -/* A65080 80240FF0 2402000F */ addiu $v0, $zero, 0xf -/* A65084 80240FF4 A602008E */ sh $v0, 0x8e($s0) -/* A65088 80240FF8 AE030028 */ sw $v1, 0x28($s0) -/* A6508C 80240FFC 0809040D */ j .L80241034 -/* A65090 80241000 AE600070 */ sw $zero, 0x70($s3) -.L80241004: -/* A65094 80241004 0200202D */ daddu $a0, $s0, $zero -/* A65098 80241008 240520D5 */ addiu $a1, $zero, 0x20d5 -/* A6509C 8024100C 0C012530 */ jal func_800494C0 -/* A650A0 80241010 0000302D */ daddu $a2, $zero, $zero -/* A650A4 80241014 86440008 */ lh $a0, 8($s2) -/* A650A8 80241018 0C00FB3A */ jal get_enemy -/* A650AC 8024101C 24840001 */ addiu $a0, $a0, 1 -/* A650B0 80241020 AC51006C */ sw $s1, 0x6c($v0) -/* A650B4 80241024 24020014 */ addiu $v0, $zero, 0x14 -/* A650B8 80241028 A602008E */ sh $v0, 0x8e($s0) -/* A650BC 8024102C 24020018 */ addiu $v0, $zero, 0x18 -/* A650C0 80241030 AE620070 */ sw $v0, 0x70($s3) -.L80241034: -/* A650C4 80241034 8FBF0044 */ lw $ra, 0x44($sp) -/* A650C8 80241038 8FB40040 */ lw $s4, 0x40($sp) -/* A650CC 8024103C 8FB3003C */ lw $s3, 0x3c($sp) -/* A650D0 80241040 8FB20038 */ lw $s2, 0x38($sp) -/* A650D4 80241044 8FB10034 */ lw $s1, 0x34($sp) -/* A650D8 80241048 8FB00030 */ lw $s0, 0x30($sp) -/* A650DC 8024104C 03E00008 */ jr $ra -/* A650E0 80241050 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/func_802410BC_A64090.s b/asm/nonmatchings/world/area_kpa/kpa_51/func_802410BC_A64090.s deleted file mode 100644 index 72de5c88e8..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/func_802410BC_A64090.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410BC_A6514C -/* A6514C 802410BC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A65150 802410C0 AFB50044 */ sw $s5, 0x44($sp) -/* A65154 802410C4 0080A82D */ daddu $s5, $a0, $zero -/* A65158 802410C8 AFBF0048 */ sw $ra, 0x48($sp) -/* A6515C 802410CC AFB40040 */ sw $s4, 0x40($sp) -/* A65160 802410D0 AFB3003C */ sw $s3, 0x3c($sp) -/* A65164 802410D4 AFB20038 */ sw $s2, 0x38($sp) -/* A65168 802410D8 AFB10034 */ sw $s1, 0x34($sp) -/* A6516C 802410DC AFB00030 */ sw $s0, 0x30($sp) -/* A65170 802410E0 8EB10148 */ lw $s1, 0x148($s5) -/* A65174 802410E4 86240008 */ lh $a0, 8($s1) -/* A65178 802410E8 0C00EABB */ jal get_npc_unsafe -/* A6517C 802410EC 00A0802D */ daddu $s0, $a1, $zero -/* A65180 802410F0 8EA3000C */ lw $v1, 0xc($s5) -/* A65184 802410F4 02A0202D */ daddu $a0, $s5, $zero -/* A65188 802410F8 8C650000 */ lw $a1, ($v1) -/* A6518C 802410FC 0C0B1EAF */ jal get_variable -/* A65190 80241100 0040902D */ daddu $s2, $v0, $zero -/* A65194 80241104 AFA00010 */ sw $zero, 0x10($sp) -/* A65198 80241108 8E2300D0 */ lw $v1, 0xd0($s1) -/* A6519C 8024110C 8C630030 */ lw $v1, 0x30($v1) -/* A651A0 80241110 AFA30014 */ sw $v1, 0x14($sp) -/* A651A4 80241114 8E2300D0 */ lw $v1, 0xd0($s1) -/* A651A8 80241118 8C63001C */ lw $v1, 0x1c($v1) -/* A651AC 8024111C AFA30018 */ sw $v1, 0x18($sp) -/* A651B0 80241120 8E2300D0 */ lw $v1, 0xd0($s1) -/* A651B4 80241124 8C630024 */ lw $v1, 0x24($v1) -/* A651B8 80241128 AFA3001C */ sw $v1, 0x1c($sp) -/* A651BC 8024112C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A651C0 80241130 8C630028 */ lw $v1, 0x28($v1) -/* A651C4 80241134 27B40010 */ addiu $s4, $sp, 0x10 -/* A651C8 80241138 AFA30020 */ sw $v1, 0x20($sp) -/* A651CC 8024113C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A651D0 80241140 3C0142C8 */ lui $at, 0x42c8 -/* A651D4 80241144 44810000 */ mtc1 $at, $f0 -/* A651D8 80241148 8C63002C */ lw $v1, 0x2c($v1) -/* A651DC 8024114C 0040982D */ daddu $s3, $v0, $zero -/* A651E0 80241150 E7A00028 */ swc1 $f0, 0x28($sp) -/* A651E4 80241154 A7A0002C */ sh $zero, 0x2c($sp) -/* A651E8 80241158 16000005 */ bnez $s0, .L80241170 -/* A651EC 8024115C AFA30024 */ sw $v1, 0x24($sp) -/* A651F0 80241160 8E2200B0 */ lw $v0, 0xb0($s1) -/* A651F4 80241164 30420004 */ andi $v0, $v0, 4 -/* A651F8 80241168 1040001E */ beqz $v0, .L802411E4 -/* A651FC 8024116C 00000000 */ nop -.L80241170: -/* A65200 80241170 8E430000 */ lw $v1, ($s2) -/* A65204 80241174 2402F7FF */ addiu $v0, $zero, -0x801 -/* A65208 80241178 00621824 */ and $v1, $v1, $v0 -/* A6520C 8024117C 8E2200CC */ lw $v0, 0xcc($s1) -/* A65210 80241180 3C040020 */ lui $a0, 0x20 -/* A65214 80241184 8C420000 */ lw $v0, ($v0) -/* A65218 80241188 00641825 */ or $v1, $v1, $a0 -/* A6521C 8024118C AE430000 */ sw $v1, ($s2) -/* A65220 80241190 AE420028 */ sw $v0, 0x28($s2) -/* A65224 80241194 8E220000 */ lw $v0, ($s1) -/* A65228 80241198 00441025 */ or $v0, $v0, $a0 -/* A6522C 8024119C AE220000 */ sw $v0, ($s1) -/* A65230 802411A0 A640008E */ sh $zero, 0x8e($s2) -/* A65234 802411A4 8E2300B0 */ lw $v1, 0xb0($s1) -/* A65238 802411A8 30620004 */ andi $v0, $v1, 4 -/* A6523C 802411AC 1040000C */ beqz $v0, .L802411E0 -/* A65240 802411B0 2402FFFB */ addiu $v0, $zero, -5 -/* A65244 802411B4 3C013F80 */ lui $at, 0x3f80 -/* A65248 802411B8 44810000 */ mtc1 $at, $f0 -/* A6524C 802411BC 00621024 */ and $v0, $v1, $v0 -/* A65250 802411C0 AE2200B0 */ sw $v0, 0xb0($s1) -/* A65254 802411C4 240200FF */ addiu $v0, $zero, 0xff -/* A65258 802411C8 A24200AC */ sb $v0, 0xac($s2) -/* A6525C 802411CC 24020014 */ addiu $v0, $zero, 0x14 -/* A65260 802411D0 A642008E */ sh $v0, 0x8e($s2) -/* A65264 802411D4 E6400054 */ swc1 $f0, 0x54($s2) -/* A65268 802411D8 E6400058 */ swc1 $f0, 0x58($s2) -/* A6526C 802411DC E640005C */ swc1 $f0, 0x5c($s2) -.L802411E0: -/* A65270 802411E0 AEA00070 */ sw $zero, 0x70($s5) -.L802411E4: -/* A65274 802411E4 8EA30070 */ lw $v1, 0x70($s5) -/* A65278 802411E8 2C620019 */ sltiu $v0, $v1, 0x19 -/* A6527C 802411EC 10400044 */ beqz $v0, .L80241300 -/* A65280 802411F0 00031080 */ sll $v0, $v1, 2 -/* A65284 802411F4 3C018024 */ lui $at, 0x8024 -/* A65288 802411F8 00220821 */ addu $at, $at, $v0 -/* A6528C 802411FC 8C222FA0 */ lw $v0, 0x2fa0($at) -/* A65290 80241200 00400008 */ jr $v0 -/* A65294 80241204 00000000 */ nop -/* A65298 80241208 02A0202D */ daddu $a0, $s5, $zero -/* A6529C 8024120C 0260282D */ daddu $a1, $s3, $zero -/* A652A0 80241210 0C0901CC */ jal func_80240730 -/* A652A4 80241214 0280302D */ daddu $a2, $s4, $zero -/* A652A8 80241218 8EA30070 */ lw $v1, 0x70($s5) -/* A652AC 8024121C 24020001 */ addiu $v0, $zero, 1 -/* A652B0 80241220 14620037 */ bne $v1, $v0, .L80241300 -/* A652B4 80241224 00000000 */ nop -/* A652B8 80241228 02A0202D */ daddu $a0, $s5, $zero -/* A652BC 8024122C 0260282D */ daddu $a1, $s3, $zero -/* A652C0 80241230 0C0901E9 */ jal func_802407A4 -/* A652C4 80241234 0280302D */ daddu $a2, $s4, $zero -/* A652C8 80241238 080904C0 */ j .L80241300 -/* A652CC 8024123C 00000000 */ nop -/* A652D0 80241240 02A0202D */ daddu $a0, $s5, $zero -/* A652D4 80241244 0260282D */ daddu $a1, $s3, $zero -/* A652D8 80241248 0C090234 */ jal func_802408D0 -/* A652DC 8024124C 0280302D */ daddu $a2, $s4, $zero -/* A652E0 80241250 02A0202D */ daddu $a0, $s5, $zero -/* A652E4 80241254 0260282D */ daddu $a1, $s3, $zero -/* A652E8 80241258 0C09025C */ jal func_80240970 -/* A652EC 8024125C 0280302D */ daddu $a2, $s4, $zero -/* A652F0 80241260 080904C0 */ j .L80241300 -/* A652F4 80241264 00000000 */ nop -/* A652F8 80241268 02A0202D */ daddu $a0, $s5, $zero -/* A652FC 8024126C 0260282D */ daddu $a1, $s3, $zero -/* A65300 80241270 0C090275 */ jal func_802409D4 -/* A65304 80241274 0280302D */ daddu $a2, $s4, $zero -/* A65308 80241278 02A0202D */ daddu $a0, $s5, $zero -/* A6530C 8024127C 0260282D */ daddu $a1, $s3, $zero -/* A65310 80241280 0C0902C5 */ jal func_80240B14 -/* A65314 80241284 0280302D */ daddu $a2, $s4, $zero -/* A65318 80241288 080904C0 */ j .L80241300 -/* A6531C 8024128C 00000000 */ nop -/* A65320 80241290 02A0202D */ daddu $a0, $s5, $zero -/* A65324 80241294 0260282D */ daddu $a1, $s3, $zero -/* A65328 80241298 0C09032E */ jal func_80240CB8 -/* A6532C 8024129C 0280302D */ daddu $a2, $s4, $zero -/* A65330 802412A0 080904C0 */ j .L80241300 -/* A65334 802412A4 00000000 */ nop -/* A65338 802412A8 02A0202D */ daddu $a0, $s5, $zero -/* A6533C 802412AC 0260282D */ daddu $a1, $s3, $zero -/* A65340 802412B0 0C09033D */ jal func_80240CF4 -/* A65344 802412B4 0280302D */ daddu $a2, $s4, $zero -/* A65348 802412B8 080904C0 */ j .L80241300 -/* A6534C 802412BC 00000000 */ nop -/* A65350 802412C0 02A0202D */ daddu $a0, $s5, $zero -/* A65354 802412C4 0260282D */ daddu $a1, $s3, $zero -/* A65358 802412C8 0C0903AD */ jal func_80240EB4 -/* A6535C 802412CC 0280302D */ daddu $a2, $s4, $zero -/* A65360 802412D0 080904C0 */ j .L80241300 -/* A65364 802412D4 00000000 */ nop -/* A65368 802412D8 02A0202D */ daddu $a0, $s5, $zero -/* A6536C 802412DC 0260282D */ daddu $a1, $s3, $zero -/* A65370 802412E0 0C0903C8 */ jal func_80240F20 -/* A65374 802412E4 0280302D */ daddu $a2, $s4, $zero -/* A65378 802412E8 080904C0 */ j .L80241300 -/* A6537C 802412EC 00000000 */ nop -/* A65380 802412F0 02A0202D */ daddu $a0, $s5, $zero -/* A65384 802412F4 0260282D */ daddu $a1, $s3, $zero -/* A65388 802412F8 0C090415 */ jal func_80241054 -/* A6538C 802412FC 0280302D */ daddu $a2, $s4, $zero -.L80241300: -/* A65390 80241300 8FBF0048 */ lw $ra, 0x48($sp) -/* A65394 80241304 8FB50044 */ lw $s5, 0x44($sp) -/* A65398 80241308 8FB40040 */ lw $s4, 0x40($sp) -/* A6539C 8024130C 8FB3003C */ lw $s3, 0x3c($sp) -/* A653A0 80241310 8FB20038 */ lw $s2, 0x38($sp) -/* A653A4 80241314 8FB10034 */ lw $s1, 0x34($sp) -/* A653A8 80241318 8FB00030 */ lw $s0, 0x30($sp) -/* A653AC 8024131C 0000102D */ daddu $v0, $zero, $zero -/* A653B0 80241320 03E00008 */ jr $ra -/* A653B4 80241324 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/func_802413CC_A64090.s b/asm/nonmatchings/world/area_kpa/kpa_51/func_802413CC_A64090.s deleted file mode 100644 index 7d73155db4..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/func_802413CC_A64090.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413CC_A6545C -/* A6545C 802413CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A65460 802413D0 3C05FE36 */ lui $a1, 0xfe36 -/* A65464 802413D4 AFBF0010 */ sw $ra, 0x10($sp) -/* A65468 802413D8 8C820148 */ lw $v0, 0x148($a0) -/* A6546C 802413DC 3C06800B */ lui $a2, 0x800b -/* A65470 802413E0 8CC60F9C */ lw $a2, 0xf9c($a2) -/* A65474 802413E4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A65478 802413E8 00C23026 */ xor $a2, $a2, $v0 -/* A6547C 802413EC 0C0B2026 */ jal set_variable -/* A65480 802413F0 2CC60001 */ sltiu $a2, $a2, 1 -/* A65484 802413F4 8FBF0010 */ lw $ra, 0x10($sp) -/* A65488 802413F8 24020002 */ addiu $v0, $zero, 2 -/* A6548C 802413FC 03E00008 */ jr $ra -/* A65490 80241400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/func_80241404_A64090.s b/asm/nonmatchings/world/area_kpa/kpa_51/func_80241404_A64090.s deleted file mode 100644 index 26f9e4c7c6..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/func_80241404_A64090.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241404_A65494 -/* A65494 80241404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A65498 80241408 AFBF0014 */ sw $ra, 0x14($sp) -/* A6549C 8024140C AFB00010 */ sw $s0, 0x10($sp) -/* A654A0 80241410 8C900148 */ lw $s0, 0x148($a0) -/* A654A4 80241414 0C00EABB */ jal get_npc_unsafe -/* A654A8 80241418 86040008 */ lh $a0, 8($s0) -/* A654AC 8024141C 0040202D */ daddu $a0, $v0, $zero -/* A654B0 80241420 8E03006C */ lw $v1, 0x6c($s0) -/* A654B4 80241424 24020002 */ addiu $v0, $zero, 2 -/* A654B8 80241428 14620003 */ bne $v1, $v0, .L80241438 -/* A654BC 8024142C 00000000 */ nop -/* A654C0 80241430 AC80001C */ sw $zero, 0x1c($a0) -/* A654C4 80241434 AC800018 */ sw $zero, 0x18($a0) -.L80241438: -/* A654C8 80241438 8FBF0014 */ lw $ra, 0x14($sp) -/* A654CC 8024143C 8FB00010 */ lw $s0, 0x10($sp) -/* A654D0 80241440 24020002 */ addiu $v0, $zero, 2 -/* A654D4 80241444 03E00008 */ jr $ra -/* A654D8 80241448 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/func_8024144C_A64090.s b/asm/nonmatchings/world/area_kpa/kpa_51/func_8024144C_A64090.s deleted file mode 100644 index 95d5cd9acd..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/func_8024144C_A64090.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024144C_A654DC -/* A654DC 8024144C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A654E0 80241450 AFB20018 */ sw $s2, 0x18($sp) -/* A654E4 80241454 0080902D */ daddu $s2, $a0, $zero -/* A654E8 80241458 AFBF001C */ sw $ra, 0x1c($sp) -/* A654EC 8024145C AFB10014 */ sw $s1, 0x14($sp) -/* A654F0 80241460 AFB00010 */ sw $s0, 0x10($sp) -/* A654F4 80241464 8E510148 */ lw $s1, 0x148($s2) -/* A654F8 80241468 0C00EABB */ jal get_npc_unsafe -/* A654FC 8024146C 86240008 */ lh $a0, 8($s1) -/* A65500 80241470 0040802D */ daddu $s0, $v0, $zero -/* A65504 80241474 8E2300CC */ lw $v1, 0xcc($s1) -/* A65508 80241478 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A6550C 8024147C 8C630020 */ lw $v1, 0x20($v1) -/* A65510 80241480 AE030028 */ sw $v1, 0x28($s0) -/* A65514 80241484 96220076 */ lhu $v0, 0x76($s1) -/* A65518 80241488 A602008E */ sh $v0, 0x8e($s0) -/* A6551C 8024148C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A65520 80241490 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A65524 80241494 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A65528 80241498 8C460028 */ lw $a2, 0x28($v0) -/* A6552C 8024149C 0C00A720 */ jal atan2 -/* A65530 802414A0 8C470030 */ lw $a3, 0x30($v0) -/* A65534 802414A4 2402000D */ addiu $v0, $zero, 0xd -/* A65538 802414A8 E600000C */ swc1 $f0, 0xc($s0) -/* A6553C 802414AC AE420070 */ sw $v0, 0x70($s2) -/* A65540 802414B0 8FBF001C */ lw $ra, 0x1c($sp) -/* A65544 802414B4 8FB20018 */ lw $s2, 0x18($sp) -/* A65548 802414B8 8FB10014 */ lw $s1, 0x14($sp) -/* A6554C 802414BC 8FB00010 */ lw $s0, 0x10($sp) -/* A65550 802414C0 03E00008 */ jr $ra -/* A65554 802414C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/func_802415FC_A64090.s b/asm/nonmatchings/world/area_kpa/kpa_51/func_802415FC_A64090.s deleted file mode 100644 index 29415e7ffb..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/func_802415FC_A64090.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415FC_A6568C -/* A6568C 802415FC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A65690 80241600 AFB3003C */ sw $s3, 0x3c($sp) -/* A65694 80241604 0080982D */ daddu $s3, $a0, $zero -/* A65698 80241608 AFBF0040 */ sw $ra, 0x40($sp) -/* A6569C 8024160C AFB20038 */ sw $s2, 0x38($sp) -/* A656A0 80241610 AFB10034 */ sw $s1, 0x34($sp) -/* A656A4 80241614 AFB00030 */ sw $s0, 0x30($sp) -/* A656A8 80241618 8E710148 */ lw $s1, 0x148($s3) -/* A656AC 8024161C 0C00EABB */ jal get_npc_unsafe -/* A656B0 80241620 86240008 */ lh $a0, 8($s1) -/* A656B4 80241624 0040802D */ daddu $s0, $v0, $zero -/* A656B8 80241628 8E22007C */ lw $v0, 0x7c($s1) -/* A656BC 8024162C 8603008E */ lh $v1, 0x8e($s0) -/* A656C0 80241630 2442FFFF */ addiu $v0, $v0, -1 -/* A656C4 80241634 14620012 */ bne $v1, $v0, .L80241680 -/* A656C8 80241638 00000000 */ nop -/* A656CC 8024163C C6000038 */ lwc1 $f0, 0x38($s0) -/* A656D0 80241640 4600020D */ trunc.w.s $f8, $f0 -/* A656D4 80241644 44024000 */ mfc1 $v0, $f8 -/* A656D8 80241648 00000000 */ nop -/* A656DC 8024164C A6220010 */ sh $v0, 0x10($s1) -/* A656E0 80241650 C600003C */ lwc1 $f0, 0x3c($s0) -/* A656E4 80241654 4600020D */ trunc.w.s $f8, $f0 -/* A656E8 80241658 44024000 */ mfc1 $v0, $f8 -/* A656EC 8024165C 00000000 */ nop -/* A656F0 80241660 A6220012 */ sh $v0, 0x12($s1) -/* A656F4 80241664 C6000040 */ lwc1 $f0, 0x40($s0) -/* A656F8 80241668 24020001 */ addiu $v0, $zero, 1 -/* A656FC 8024166C A2220007 */ sb $v0, 7($s1) -/* A65700 80241670 4600020D */ trunc.w.s $f8, $f0 -/* A65704 80241674 44024000 */ mfc1 $v0, $f8 -/* A65708 80241678 00000000 */ nop -/* A6570C 8024167C A6220014 */ sh $v0, 0x14($s1) -.L80241680: -/* A65710 80241680 C6000038 */ lwc1 $f0, 0x38($s0) -/* A65714 80241684 C602003C */ lwc1 $f2, 0x3c($s0) -/* A65718 80241688 C6040040 */ lwc1 $f4, 0x40($s0) -/* A6571C 8024168C C6060018 */ lwc1 $f6, 0x18($s0) -/* A65720 80241690 E7A00020 */ swc1 $f0, 0x20($sp) -/* A65724 80241694 E7A20024 */ swc1 $f2, 0x24($sp) -/* A65728 80241698 E7A40028 */ swc1 $f4, 0x28($sp) -/* A6572C 8024169C E7A60010 */ swc1 $f6, 0x10($sp) -/* A65730 802416A0 C600000C */ lwc1 $f0, 0xc($s0) -/* A65734 802416A4 E7A00014 */ swc1 $f0, 0x14($sp) -/* A65738 802416A8 860200A8 */ lh $v0, 0xa8($s0) -/* A6573C 802416AC 27A50020 */ addiu $a1, $sp, 0x20 -/* A65740 802416B0 44820000 */ mtc1 $v0, $f0 -/* A65744 802416B4 00000000 */ nop -/* A65748 802416B8 46800020 */ cvt.s.w $f0, $f0 -/* A6574C 802416BC E7A00018 */ swc1 $f0, 0x18($sp) -/* A65750 802416C0 860200A6 */ lh $v0, 0xa6($s0) -/* A65754 802416C4 27A60024 */ addiu $a2, $sp, 0x24 -/* A65758 802416C8 44820000 */ mtc1 $v0, $f0 -/* A6575C 802416CC 00000000 */ nop -/* A65760 802416D0 46800020 */ cvt.s.w $f0, $f0 -/* A65764 802416D4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A65768 802416D8 8E040080 */ lw $a0, 0x80($s0) -/* A6576C 802416DC 0C037711 */ jal func_800DDC44 -/* A65770 802416E0 27A70028 */ addiu $a3, $sp, 0x28 -/* A65774 802416E4 0040902D */ daddu $s2, $v0, $zero -/* A65778 802416E8 16400005 */ bnez $s2, .L80241700 -/* A6577C 802416EC 00000000 */ nop -/* A65780 802416F0 8E050018 */ lw $a1, 0x18($s0) -/* A65784 802416F4 8E06000C */ lw $a2, 0xc($s0) -/* A65788 802416F8 0C00EA95 */ jal npc_move_heading -/* A6578C 802416FC 0200202D */ daddu $a0, $s0, $zero -.L80241700: -/* A65790 80241700 8602008E */ lh $v0, 0x8e($s0) -/* A65794 80241704 9603008E */ lhu $v1, 0x8e($s0) -/* A65798 80241708 18400007 */ blez $v0, .L80241728 -/* A6579C 8024170C 2462FFFF */ addiu $v0, $v1, -1 -/* A657A0 80241710 A602008E */ sh $v0, 0x8e($s0) -/* A657A4 80241714 00021400 */ sll $v0, $v0, 0x10 -/* A657A8 80241718 18400003 */ blez $v0, .L80241728 -/* A657AC 8024171C 00000000 */ nop -/* A657B0 80241720 12400008 */ beqz $s2, .L80241744 -/* A657B4 80241724 00000000 */ nop -.L80241728: -/* A657B8 80241728 8E2200CC */ lw $v0, 0xcc($s1) -/* A657BC 8024172C A2200007 */ sb $zero, 7($s1) -/* A657C0 80241730 8C420028 */ lw $v0, 0x28($v0) -/* A657C4 80241734 A600008E */ sh $zero, 0x8e($s0) -/* A657C8 80241738 AE020028 */ sw $v0, 0x28($s0) -/* A657CC 8024173C 2402000F */ addiu $v0, $zero, 0xf -/* A657D0 80241740 AE620070 */ sw $v0, 0x70($s3) -.L80241744: -/* A657D4 80241744 8FBF0040 */ lw $ra, 0x40($sp) -/* A657D8 80241748 8FB3003C */ lw $s3, 0x3c($sp) -/* A657DC 8024174C 8FB20038 */ lw $s2, 0x38($sp) -/* A657E0 80241750 8FB10034 */ lw $s1, 0x34($sp) -/* A657E4 80241754 8FB00030 */ lw $s0, 0x30($sp) -/* A657E8 80241758 03E00008 */ jr $ra -/* A657EC 8024175C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/func_802417E0_A64090.s b/asm/nonmatchings/world/area_kpa/kpa_51/func_802417E0_A64090.s deleted file mode 100644 index d93ed30d1d..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/func_802417E0_A64090.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417E0_A65870 -/* A65870 802417E0 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A65874 802417E4 AFB3005C */ sw $s3, 0x5c($sp) -/* A65878 802417E8 0080982D */ daddu $s3, $a0, $zero -/* A6587C 802417EC AFBF0068 */ sw $ra, 0x68($sp) -/* A65880 802417F0 AFB50064 */ sw $s5, 0x64($sp) -/* A65884 802417F4 AFB40060 */ sw $s4, 0x60($sp) -/* A65888 802417F8 AFB20058 */ sw $s2, 0x58($sp) -/* A6588C 802417FC AFB10054 */ sw $s1, 0x54($sp) -/* A65890 80241800 AFB00050 */ sw $s0, 0x50($sp) -/* A65894 80241804 8E710148 */ lw $s1, 0x148($s3) -/* A65898 80241808 86240008 */ lh $a0, 8($s1) -/* A6589C 8024180C 0C00EABB */ jal get_npc_unsafe -/* A658A0 80241810 00A0802D */ daddu $s0, $a1, $zero -/* A658A4 80241814 8E63000C */ lw $v1, 0xc($s3) -/* A658A8 80241818 0260202D */ daddu $a0, $s3, $zero -/* A658AC 8024181C 8C650000 */ lw $a1, ($v1) -/* A658B0 80241820 0C0B1EAF */ jal get_variable -/* A658B4 80241824 0040902D */ daddu $s2, $v0, $zero -/* A658B8 80241828 AFA00028 */ sw $zero, 0x28($sp) -/* A658BC 8024182C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A658C0 80241830 8C630030 */ lw $v1, 0x30($v1) -/* A658C4 80241834 AFA3002C */ sw $v1, 0x2c($sp) -/* A658C8 80241838 8E2300D0 */ lw $v1, 0xd0($s1) -/* A658CC 8024183C 8C63001C */ lw $v1, 0x1c($v1) -/* A658D0 80241840 AFA30030 */ sw $v1, 0x30($sp) -/* A658D4 80241844 8E2300D0 */ lw $v1, 0xd0($s1) -/* A658D8 80241848 8C630024 */ lw $v1, 0x24($v1) -/* A658DC 8024184C AFA30034 */ sw $v1, 0x34($sp) -/* A658E0 80241850 8E2300D0 */ lw $v1, 0xd0($s1) -/* A658E4 80241854 8C630028 */ lw $v1, 0x28($v1) -/* A658E8 80241858 27B50028 */ addiu $s5, $sp, 0x28 -/* A658EC 8024185C AFA30038 */ sw $v1, 0x38($sp) -/* A658F0 80241860 8E2300D0 */ lw $v1, 0xd0($s1) -/* A658F4 80241864 3C0142C8 */ lui $at, 0x42c8 -/* A658F8 80241868 44810000 */ mtc1 $at, $f0 -/* A658FC 8024186C 8C63002C */ lw $v1, 0x2c($v1) -/* A65900 80241870 0040A02D */ daddu $s4, $v0, $zero -/* A65904 80241874 E7A00040 */ swc1 $f0, 0x40($sp) -/* A65908 80241878 A7A00044 */ sh $zero, 0x44($sp) -/* A6590C 8024187C 12000009 */ beqz $s0, .L802418A4 -/* A65910 80241880 AFA3003C */ sw $v1, 0x3c($sp) -/* A65914 80241884 864300A8 */ lh $v1, 0xa8($s2) -/* A65918 80241888 8E2200B0 */ lw $v0, 0xb0($s1) -/* A6591C 8024188C AE20008C */ sw $zero, 0x8c($s1) -/* A65920 80241890 A22000B5 */ sb $zero, 0xb5($s1) -/* A65924 80241894 34420008 */ ori $v0, $v0, 8 -/* A65928 80241898 AE230084 */ sw $v1, 0x84($s1) -/* A6592C 8024189C 0809062D */ j .L802418B4 -/* A65930 802418A0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802418A4: -/* A65934 802418A4 8E2200B0 */ lw $v0, 0xb0($s1) -/* A65938 802418A8 30420004 */ andi $v0, $v0, 4 -/* A6593C 802418AC 10400047 */ beqz $v0, .L802419CC -/* A65940 802418B0 00000000 */ nop -.L802418B4: -/* A65944 802418B4 AE600070 */ sw $zero, 0x70($s3) -/* A65948 802418B8 A640008E */ sh $zero, 0x8e($s2) -/* A6594C 802418BC 8E2300CC */ lw $v1, 0xcc($s1) -/* A65950 802418C0 2404F7FF */ addiu $a0, $zero, -0x801 -/* A65954 802418C4 A2200007 */ sb $zero, 7($s1) -/* A65958 802418C8 8E420000 */ lw $v0, ($s2) -/* A6595C 802418CC 8C630000 */ lw $v1, ($v1) -/* A65960 802418D0 00441024 */ and $v0, $v0, $a0 -/* A65964 802418D4 AE420000 */ sw $v0, ($s2) -/* A65968 802418D8 AE430028 */ sw $v1, 0x28($s2) -/* A6596C 802418DC 96220086 */ lhu $v0, 0x86($s1) -/* A65970 802418E0 A64200A8 */ sh $v0, 0xa8($s2) -/* A65974 802418E4 8E2200D0 */ lw $v0, 0xd0($s1) -/* A65978 802418E8 AE200090 */ sw $zero, 0x90($s1) -/* A6597C 802418EC 8C420034 */ lw $v0, 0x34($v0) -/* A65980 802418F0 14400006 */ bnez $v0, .L8024190C -/* A65984 802418F4 2403FDFF */ addiu $v1, $zero, -0x201 -/* A65988 802418F8 8E420000 */ lw $v0, ($s2) -/* A6598C 802418FC 2403FFF7 */ addiu $v1, $zero, -9 -/* A65990 80241900 34420200 */ ori $v0, $v0, 0x200 -/* A65994 80241904 08090646 */ j .L80241918 -/* A65998 80241908 00431024 */ and $v0, $v0, $v1 -.L8024190C: -/* A6599C 8024190C 8E420000 */ lw $v0, ($s2) -/* A659A0 80241910 00431024 */ and $v0, $v0, $v1 -/* A659A4 80241914 34420008 */ ori $v0, $v0, 8 -.L80241918: -/* A659A8 80241918 AE420000 */ sw $v0, ($s2) -/* A659AC 8024191C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A659B0 80241920 30420004 */ andi $v0, $v0, 4 -/* A659B4 80241924 1040001E */ beqz $v0, .L802419A0 -/* A659B8 80241928 24040002 */ addiu $a0, $zero, 2 -/* A659BC 8024192C 0240282D */ daddu $a1, $s2, $zero -/* A659C0 80241930 0000302D */ daddu $a2, $zero, $zero -/* A659C4 80241934 24020063 */ addiu $v0, $zero, 0x63 -/* A659C8 80241938 AE620070 */ sw $v0, 0x70($s3) -/* A659CC 8024193C AE600074 */ sw $zero, 0x74($s3) -/* A659D0 80241940 864300A8 */ lh $v1, 0xa8($s2) -/* A659D4 80241944 3C013F80 */ lui $at, 0x3f80 -/* A659D8 80241948 44810000 */ mtc1 $at, $f0 -/* A659DC 8024194C 3C014000 */ lui $at, 0x4000 -/* A659E0 80241950 44811000 */ mtc1 $at, $f2 -/* A659E4 80241954 3C01C1A0 */ lui $at, 0xc1a0 -/* A659E8 80241958 44812000 */ mtc1 $at, $f4 -/* A659EC 8024195C 24020028 */ addiu $v0, $zero, 0x28 -/* A659F0 80241960 AFA2001C */ sw $v0, 0x1c($sp) -/* A659F4 80241964 44833000 */ mtc1 $v1, $f6 -/* A659F8 80241968 00000000 */ nop -/* A659FC 8024196C 468031A0 */ cvt.s.w $f6, $f6 -/* A65A00 80241970 44073000 */ mfc1 $a3, $f6 -/* A65A04 80241974 27A20048 */ addiu $v0, $sp, 0x48 -/* A65A08 80241978 AFA20020 */ sw $v0, 0x20($sp) -/* A65A0C 8024197C E7A00010 */ swc1 $f0, 0x10($sp) -/* A65A10 80241980 E7A20014 */ swc1 $f2, 0x14($sp) -/* A65A14 80241984 0C01BFA4 */ jal fx_emote -/* A65A18 80241988 E7A40018 */ swc1 $f4, 0x18($sp) -/* A65A1C 8024198C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A65A20 80241990 2403FFFB */ addiu $v1, $zero, -5 -/* A65A24 80241994 00431024 */ and $v0, $v0, $v1 -/* A65A28 80241998 08090673 */ j .L802419CC -/* A65A2C 8024199C AE2200B0 */ sw $v0, 0xb0($s1) -.L802419A0: -/* A65A30 802419A0 8E220000 */ lw $v0, ($s1) -/* A65A34 802419A4 3C034000 */ lui $v1, 0x4000 -/* A65A38 802419A8 00431024 */ and $v0, $v0, $v1 -/* A65A3C 802419AC 10400007 */ beqz $v0, .L802419CC -/* A65A40 802419B0 3C03BFFF */ lui $v1, 0xbfff -/* A65A44 802419B4 2402000C */ addiu $v0, $zero, 0xc -/* A65A48 802419B8 AE620070 */ sw $v0, 0x70($s3) -/* A65A4C 802419BC 8E220000 */ lw $v0, ($s1) -/* A65A50 802419C0 3463FFFF */ ori $v1, $v1, 0xffff -/* A65A54 802419C4 00431024 */ and $v0, $v0, $v1 -/* A65A58 802419C8 AE220000 */ sw $v0, ($s1) -.L802419CC: -/* A65A5C 802419CC 8E220090 */ lw $v0, 0x90($s1) -/* A65A60 802419D0 1840000C */ blez $v0, .L80241A04 -/* A65A64 802419D4 2442FFFF */ addiu $v0, $v0, -1 -/* A65A68 802419D8 14400087 */ bnez $v0, .L80241BF8 -/* A65A6C 802419DC AE220090 */ sw $v0, 0x90($s1) -/* A65A70 802419E0 3C03FFAA */ lui $v1, 0xffaa -/* A65A74 802419E4 8E420028 */ lw $v0, 0x28($s2) -/* A65A78 802419E8 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A65A7C 802419EC 00431021 */ addu $v0, $v0, $v1 -/* A65A80 802419F0 2C420002 */ sltiu $v0, $v0, 2 -/* A65A84 802419F4 10400003 */ beqz $v0, .L80241A04 -/* A65A88 802419F8 3C020055 */ lui $v0, 0x55 -/* A65A8C 802419FC 3442000C */ ori $v0, $v0, 0xc -/* A65A90 80241A00 AE420028 */ sw $v0, 0x28($s2) -.L80241A04: -/* A65A94 80241A04 8E630070 */ lw $v1, 0x70($s3) -/* A65A98 80241A08 2402000C */ addiu $v0, $zero, 0xc -/* A65A9C 80241A0C 10620048 */ beq $v1, $v0, .L80241B30 -/* A65AA0 80241A10 2862000D */ slti $v0, $v1, 0xd -/* A65AA4 80241A14 1040000F */ beqz $v0, .L80241A54 -/* A65AA8 80241A18 24100001 */ addiu $s0, $zero, 1 -/* A65AAC 80241A1C 1070001E */ beq $v1, $s0, .L80241A98 -/* A65AB0 80241A20 28620002 */ slti $v0, $v1, 2 -/* A65AB4 80241A24 10400005 */ beqz $v0, .L80241A3C -/* A65AB8 80241A28 24020002 */ addiu $v0, $zero, 2 -/* A65ABC 80241A2C 10600015 */ beqz $v1, .L80241A84 -/* A65AC0 80241A30 0260202D */ daddu $a0, $s3, $zero -/* A65AC4 80241A34 080906E3 */ j .L80241B8C -/* A65AC8 80241A38 00000000 */ nop -.L80241A3C: -/* A65ACC 80241A3C 1062001C */ beq $v1, $v0, .L80241AB0 -/* A65AD0 80241A40 24020003 */ addiu $v0, $zero, 3 -/* A65AD4 80241A44 10620035 */ beq $v1, $v0, .L80241B1C -/* A65AD8 80241A48 0260202D */ daddu $a0, $s3, $zero -/* A65ADC 80241A4C 080906E3 */ j .L80241B8C -/* A65AE0 80241A50 00000000 */ nop -.L80241A54: -/* A65AE4 80241A54 2402000E */ addiu $v0, $zero, 0xe -/* A65AE8 80241A58 1062003F */ beq $v1, $v0, .L80241B58 -/* A65AEC 80241A5C 0062102A */ slt $v0, $v1, $v0 -/* A65AF0 80241A60 14400038 */ bnez $v0, .L80241B44 -/* A65AF4 80241A64 0260202D */ daddu $a0, $s3, $zero -/* A65AF8 80241A68 2402000F */ addiu $v0, $zero, 0xf -/* A65AFC 80241A6C 10620040 */ beq $v1, $v0, .L80241B70 -/* A65B00 80241A70 24020063 */ addiu $v0, $zero, 0x63 -/* A65B04 80241A74 10620043 */ beq $v1, $v0, .L80241B84 -/* A65B08 80241A78 00000000 */ nop -/* A65B0C 80241A7C 080906E3 */ j .L80241B8C -/* A65B10 80241A80 00000000 */ nop -.L80241A84: -/* A65B14 80241A84 0280282D */ daddu $a1, $s4, $zero -/* A65B18 80241A88 0C012568 */ jal func_800495A0 -/* A65B1C 80241A8C 02A0302D */ daddu $a2, $s5, $zero -/* A65B20 80241A90 96220086 */ lhu $v0, 0x86($s1) -/* A65B24 80241A94 A64200A8 */ sh $v0, 0xa8($s2) -.L80241A98: -/* A65B28 80241A98 0260202D */ daddu $a0, $s3, $zero -/* A65B2C 80241A9C 0280282D */ daddu $a1, $s4, $zero -/* A65B30 80241AA0 0C0125AE */ jal func_800496B8 -/* A65B34 80241AA4 02A0302D */ daddu $a2, $s5, $zero -/* A65B38 80241AA8 080906E3 */ j .L80241B8C -/* A65B3C 80241AAC 00000000 */ nop -.L80241AB0: -/* A65B40 80241AB0 0260202D */ daddu $a0, $s3, $zero -/* A65B44 80241AB4 0280282D */ daddu $a1, $s4, $zero -/* A65B48 80241AB8 0C0126D1 */ jal func_80049B44 -/* A65B4C 80241ABC 02A0302D */ daddu $a2, $s5, $zero -/* A65B50 80241AC0 8E230088 */ lw $v1, 0x88($s1) -/* A65B54 80241AC4 24020006 */ addiu $v0, $zero, 6 -/* A65B58 80241AC8 14620014 */ bne $v1, $v0, .L80241B1C -/* A65B5C 80241ACC 0260202D */ daddu $a0, $s3, $zero -/* A65B60 80241AD0 0C00A67F */ jal rand_int -/* A65B64 80241AD4 24040064 */ addiu $a0, $zero, 0x64 -/* A65B68 80241AD8 28420021 */ slti $v0, $v0, 0x21 -/* A65B6C 80241ADC 5040000F */ beql $v0, $zero, .L80241B1C -/* A65B70 80241AE0 0260202D */ daddu $a0, $s3, $zero -/* A65B74 80241AE4 8E22008C */ lw $v0, 0x8c($s1) -/* A65B78 80241AE8 10400005 */ beqz $v0, .L80241B00 -/* A65B7C 80241AEC 3C020055 */ lui $v0, 0x55 -/* A65B80 80241AF0 3442002F */ ori $v0, $v0, 0x2f -/* A65B84 80241AF4 AE20008C */ sw $zero, 0x8c($s1) -/* A65B88 80241AF8 080906C3 */ j .L80241B0C -/* A65B8C 80241AFC A22000B5 */ sb $zero, 0xb5($s1) -.L80241B00: -/* A65B90 80241B00 3442002E */ ori $v0, $v0, 0x2e -/* A65B94 80241B04 AE30008C */ sw $s0, 0x8c($s1) -/* A65B98 80241B08 A23000B5 */ sb $s0, 0xb5($s1) -.L80241B0C: -/* A65B9C 80241B0C AE420028 */ sw $v0, 0x28($s2) -/* A65BA0 80241B10 24020007 */ addiu $v0, $zero, 7 -/* A65BA4 80241B14 080906FE */ j .L80241BF8 -/* A65BA8 80241B18 AE220090 */ sw $v0, 0x90($s1) -.L80241B1C: -/* A65BAC 80241B1C 0280282D */ daddu $a1, $s4, $zero -/* A65BB0 80241B20 0C012701 */ jal func_80049C04 -/* A65BB4 80241B24 02A0302D */ daddu $a2, $s5, $zero -/* A65BB8 80241B28 080906E3 */ j .L80241B8C -/* A65BBC 80241B2C 00000000 */ nop -.L80241B30: -/* A65BC0 80241B30 0260202D */ daddu $a0, $s3, $zero -/* A65BC4 80241B34 0280282D */ daddu $a1, $s4, $zero -/* A65BC8 80241B38 0C090513 */ jal func_8024144C -/* A65BCC 80241B3C 02A0302D */ daddu $a2, $s5, $zero -/* A65BD0 80241B40 0260202D */ daddu $a0, $s3, $zero -.L80241B44: -/* A65BD4 80241B44 0280282D */ daddu $a1, $s4, $zero -/* A65BD8 80241B48 0C090532 */ jal func_802414C8 -/* A65BDC 80241B4C 02A0302D */ daddu $a2, $s5, $zero -/* A65BE0 80241B50 080906E3 */ j .L80241B8C -/* A65BE4 80241B54 00000000 */ nop -.L80241B58: -/* A65BE8 80241B58 0260202D */ daddu $a0, $s3, $zero -/* A65BEC 80241B5C 0280282D */ daddu $a1, $s4, $zero -/* A65BF0 80241B60 0C09057F */ jal func_802415FC -/* A65BF4 80241B64 02A0302D */ daddu $a2, $s5, $zero -/* A65BF8 80241B68 080906E3 */ j .L80241B8C -/* A65BFC 80241B6C 00000000 */ nop -.L80241B70: -/* A65C00 80241B70 0280282D */ daddu $a1, $s4, $zero -/* A65C04 80241B74 0C0905D8 */ jal func_80241760 -/* A65C08 80241B78 02A0302D */ daddu $a2, $s5, $zero -/* A65C0C 80241B7C 080906E3 */ j .L80241B8C -/* A65C10 80241B80 00000000 */ nop -.L80241B84: -/* A65C14 80241B84 0C0129CF */ jal func_8004A73C -/* A65C18 80241B88 0260202D */ daddu $a0, $s3, $zero -.L80241B8C: -/* A65C1C 80241B8C 8E230088 */ lw $v1, 0x88($s1) -/* A65C20 80241B90 24020006 */ addiu $v0, $zero, 6 -/* A65C24 80241B94 14620019 */ bne $v1, $v0, .L80241BFC -/* A65C28 80241B98 0000102D */ daddu $v0, $zero, $zero -/* A65C2C 80241B9C 8E22008C */ lw $v0, 0x8c($s1) -/* A65C30 80241BA0 10400003 */ beqz $v0, .L80241BB0 -/* A65C34 80241BA4 24020001 */ addiu $v0, $zero, 1 -/* A65C38 80241BA8 080906ED */ j .L80241BB4 -/* A65C3C 80241BAC A22200B5 */ sb $v0, 0xb5($s1) -.L80241BB0: -/* A65C40 80241BB0 A22000B5 */ sb $zero, 0xb5($s1) -.L80241BB4: -/* A65C44 80241BB4 8E22008C */ lw $v0, 0x8c($s1) -/* A65C48 80241BB8 1040000F */ beqz $v0, .L80241BF8 -/* A65C4C 80241BBC 3C03FFAA */ lui $v1, 0xffaa -/* A65C50 80241BC0 8E420028 */ lw $v0, 0x28($s2) -/* A65C54 80241BC4 3463FFFC */ ori $v1, $v1, 0xfffc -/* A65C58 80241BC8 00431821 */ addu $v1, $v0, $v1 -/* A65C5C 80241BCC 2C620015 */ sltiu $v0, $v1, 0x15 -/* A65C60 80241BD0 10400009 */ beqz $v0, .L80241BF8 -/* A65C64 80241BD4 00031080 */ sll $v0, $v1, 2 -/* A65C68 80241BD8 3C018024 */ lui $at, 0x8024 -/* A65C6C 80241BDC 00220821 */ addu $at, $at, $v0 -/* A65C70 80241BE0 8C223010 */ lw $v0, 0x3010($at) -/* A65C74 80241BE4 00400008 */ jr $v0 -/* A65C78 80241BE8 00000000 */ nop -/* A65C7C 80241BEC 8E420028 */ lw $v0, 0x28($s2) -/* A65C80 80241BF0 24420001 */ addiu $v0, $v0, 1 -/* A65C84 80241BF4 AE420028 */ sw $v0, 0x28($s2) -.L80241BF8: -/* A65C88 80241BF8 0000102D */ daddu $v0, $zero, $zero -.L80241BFC: -/* A65C8C 80241BFC 8FBF0068 */ lw $ra, 0x68($sp) -/* A65C90 80241C00 8FB50064 */ lw $s5, 0x64($sp) -/* A65C94 80241C04 8FB40060 */ lw $s4, 0x60($sp) -/* A65C98 80241C08 8FB3005C */ lw $s3, 0x5c($sp) -/* A65C9C 80241C0C 8FB20058 */ lw $s2, 0x58($sp) -/* A65CA0 80241C10 8FB10054 */ lw $s1, 0x54($sp) -/* A65CA4 80241C14 8FB00050 */ lw $s0, 0x50($sp) -/* A65CA8 80241C18 03E00008 */ jr $ra -/* A65CAC 80241C1C 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/func_80240034_A67100.s b/asm/nonmatchings/world/area_kpa/kpa_52/func_80240034_A67100.s deleted file mode 100644 index f1a75442ec..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/func_80240034_A67100.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_A67134 -/* A67134 80240034 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A67138 80240038 AFB20018 */ sw $s2, 0x18($sp) -/* A6713C 8024003C 0080902D */ daddu $s2, $a0, $zero -/* A67140 80240040 AFBF001C */ sw $ra, 0x1c($sp) -/* A67144 80240044 AFB10014 */ sw $s1, 0x14($sp) -/* A67148 80240048 AFB00010 */ sw $s0, 0x10($sp) -/* A6714C 8024004C 8E50000C */ lw $s0, 0xc($s2) -/* A67150 80240050 8E050000 */ lw $a1, ($s0) -/* A67154 80240054 0C0B1EAF */ jal get_variable -/* A67158 80240058 26100004 */ addiu $s0, $s0, 4 -/* A6715C 8024005C 0C04417A */ jal get_entity_by_index -/* A67160 80240060 0040202D */ daddu $a0, $v0, $zero -/* A67164 80240064 8E050000 */ lw $a1, ($s0) -/* A67168 80240068 26100004 */ addiu $s0, $s0, 4 -/* A6716C 8024006C 0040882D */ daddu $s1, $v0, $zero -/* A67170 80240070 C6200048 */ lwc1 $f0, 0x48($s1) -/* A67174 80240074 4600008D */ trunc.w.s $f2, $f0 -/* A67178 80240078 44061000 */ mfc1 $a2, $f2 -/* A6717C 8024007C 0C0B2026 */ jal set_variable -/* A67180 80240080 0240202D */ daddu $a0, $s2, $zero -/* A67184 80240084 8E050000 */ lw $a1, ($s0) -/* A67188 80240088 26100004 */ addiu $s0, $s0, 4 -/* A6718C 8024008C C620004C */ lwc1 $f0, 0x4c($s1) -/* A67190 80240090 4600008D */ trunc.w.s $f2, $f0 -/* A67194 80240094 44061000 */ mfc1 $a2, $f2 -/* A67198 80240098 0C0B2026 */ jal set_variable -/* A6719C 8024009C 0240202D */ daddu $a0, $s2, $zero -/* A671A0 802400A0 C6200050 */ lwc1 $f0, 0x50($s1) -/* A671A4 802400A4 8E050000 */ lw $a1, ($s0) -/* A671A8 802400A8 4600008D */ trunc.w.s $f2, $f0 -/* A671AC 802400AC 44061000 */ mfc1 $a2, $f2 -/* A671B0 802400B0 0C0B2026 */ jal set_variable -/* A671B4 802400B4 0240202D */ daddu $a0, $s2, $zero -/* A671B8 802400B8 8FBF001C */ lw $ra, 0x1c($sp) -/* A671BC 802400BC 8FB20018 */ lw $s2, 0x18($sp) -/* A671C0 802400C0 8FB10014 */ lw $s1, 0x14($sp) -/* A671C4 802400C4 8FB00010 */ lw $s0, 0x10($sp) -/* A671C8 802400C8 24020002 */ addiu $v0, $zero, 2 -/* A671CC 802400CC 03E00008 */ jr $ra -/* A671D0 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 -/* A671D4 802400D4 00000000 */ nop -/* A671D8 802400D8 00000000 */ nop -/* A671DC 802400DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/func_802400E0_A67100.s b/asm/nonmatchings/world/area_kpa/kpa_52/func_802400E0_A67100.s deleted file mode 100644 index 5e02bfca2c..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/func_802400E0_A67100.s +++ /dev/null @@ -1,134 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E0_A671E0 -/* A671E0 802400E0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A671E4 802400E4 AFB10014 */ sw $s1, 0x14($sp) -/* A671E8 802400E8 0080882D */ daddu $s1, $a0, $zero -/* A671EC 802400EC 3C05800B */ lui $a1, %hi(gCameras) -/* A671F0 802400F0 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A671F4 802400F4 AFBF0020 */ sw $ra, 0x20($sp) -/* A671F8 802400F8 AFB3001C */ sw $s3, 0x1c($sp) -/* A671FC 802400FC AFB20018 */ sw $s2, 0x18($sp) -/* A67200 80240100 AFB00010 */ sw $s0, 0x10($sp) -/* A67204 80240104 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A67208 80240108 8E330148 */ lw $s3, 0x148($s1) -/* A6720C 8024010C 3C03800A */ lui $v1, 0x800a -/* A67210 80240110 8463A634 */ lh $v1, -0x59cc($v1) -/* A67214 80240114 8E30000C */ lw $s0, 0xc($s1) -/* A67218 80240118 00031080 */ sll $v0, $v1, 2 -/* A6721C 8024011C 00431021 */ addu $v0, $v0, $v1 -/* A67220 80240120 00021080 */ sll $v0, $v0, 2 -/* A67224 80240124 00431023 */ subu $v0, $v0, $v1 -/* A67228 80240128 000218C0 */ sll $v1, $v0, 3 -/* A6722C 8024012C 00431021 */ addu $v0, $v0, $v1 -/* A67230 80240130 000210C0 */ sll $v0, $v0, 3 -/* A67234 80240134 86640008 */ lh $a0, 8($s3) -/* A67238 80240138 0C00EABB */ jal get_npc_unsafe -/* A6723C 8024013C 00459021 */ addu $s2, $v0, $a1 -/* A67240 80240140 0220202D */ daddu $a0, $s1, $zero -/* A67244 80240144 8E050000 */ lw $a1, ($s0) -/* A67248 80240148 0C0B1EAF */ jal get_variable -/* A6724C 8024014C 0040802D */ daddu $s0, $v0, $zero -/* A67250 80240150 0260202D */ daddu $a0, $s3, $zero -/* A67254 80240154 8C460024 */ lw $a2, 0x24($v0) -/* A67258 80240158 8C470028 */ lw $a3, 0x28($v0) -/* A6725C 8024015C 0C0124FB */ jal func_800493EC -/* A67260 80240160 0000282D */ daddu $a1, $zero, $zero -/* A67264 80240164 10400052 */ beqz $v0, .L802402B0 -/* A67268 80240168 2402FFFF */ addiu $v0, $zero, -1 -/* A6726C 8024016C C64C006C */ lwc1 $f12, 0x6c($s2) -/* A67270 80240170 C60E000C */ lwc1 $f14, 0xc($s0) -/* A67274 80240174 3C014387 */ lui $at, 0x4387 -/* A67278 80240178 4481A000 */ mtc1 $at, $f20 -/* A6727C 8024017C 0C00A70A */ jal get_clamped_angle_diff -/* A67280 80240180 00000000 */ nop -/* A67284 80240184 0C00A6C9 */ jal clamp_angle -/* A67288 80240188 46000306 */ mov.s $f12, $f0 -/* A6728C 8024018C 3C018024 */ lui $at, 0x8024 -/* A67290 80240190 D42239E0 */ ldc1 $f2, 0x39e0($at) -/* A67294 80240194 46000021 */ cvt.d.s $f0, $f0 -/* A67298 80240198 4622003C */ c.lt.d $f0, $f2 -/* A6729C 8024019C 00000000 */ nop -/* A672A0 802401A0 45000003 */ bc1f .L802401B0 -/* A672A4 802401A4 00000000 */ nop -/* A672A8 802401A8 3C0142B4 */ lui $at, 0x42b4 -/* A672AC 802401AC 4481A000 */ mtc1 $at, $f20 -.L802401B0: -/* A672B0 802401B0 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* A672B4 802401B4 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* A672B8 802401B8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A672BC 802401BC 8E220000 */ lw $v0, ($s1) -/* A672C0 802401C0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A672C4 802401C4 8C460028 */ lw $a2, 0x28($v0) -/* A672C8 802401C8 0C00A720 */ jal atan2 -/* A672CC 802401CC 8C470030 */ lw $a3, 0x30($v0) -/* A672D0 802401D0 4600A306 */ mov.s $f12, $f20 -/* A672D4 802401D4 0C00A70A */ jal get_clamped_angle_diff -/* A672D8 802401D8 46000386 */ mov.s $f14, $f0 -/* A672DC 802401DC 46000005 */ abs.s $f0, $f0 -/* A672E0 802401E0 3C018024 */ lui $at, 0x8024 -/* A672E4 802401E4 D42239E8 */ ldc1 $f2, 0x39e8($at) -/* A672E8 802401E8 46000021 */ cvt.d.s $f0, $f0 -/* A672EC 802401EC 4620103C */ c.lt.d $f2, $f0 -/* A672F0 802401F0 00000000 */ nop -/* A672F4 802401F4 4501002E */ bc1t .L802402B0 -/* A672F8 802401F8 2402FFFF */ addiu $v0, $zero, -1 -/* A672FC 802401FC 8E220000 */ lw $v0, ($s1) -/* A67300 80240200 C600003C */ lwc1 $f0, 0x3c($s0) -/* A67304 80240204 C442002C */ lwc1 $f2, 0x2c($v0) -/* A67308 80240208 860200A8 */ lh $v0, 0xa8($s0) -/* A6730C 8024020C 46020001 */ sub.s $f0, $f0, $f2 -/* A67310 80240210 44821000 */ mtc1 $v0, $f2 -/* A67314 80240214 00000000 */ nop -/* A67318 80240218 468010A1 */ cvt.d.w $f2, $f2 -/* A6731C 8024021C 46221080 */ add.d $f2, $f2, $f2 -/* A67320 80240220 46000005 */ abs.s $f0, $f0 -/* A67324 80240224 46000021 */ cvt.d.s $f0, $f0 -/* A67328 80240228 4620103E */ c.le.d $f2, $f0 -/* A6732C 8024022C 00000000 */ nop -/* A67330 80240230 4501001F */ bc1t .L802402B0 -/* A67334 80240234 2402FFFF */ addiu $v0, $zero, -1 -/* A67338 80240238 3C038011 */ lui $v1, 0x8011 -/* A6733C 8024023C 8063EBB3 */ lb $v1, -0x144d($v1) -/* A67340 80240240 24020009 */ addiu $v0, $zero, 9 -/* A67344 80240244 10620019 */ beq $v1, $v0, .L802402AC -/* A67348 80240248 24020007 */ addiu $v0, $zero, 7 -/* A6734C 8024024C 14620005 */ bne $v1, $v0, .L80240264 -/* A67350 80240250 2402FFFF */ addiu $v0, $zero, -1 -/* A67354 80240254 080900AC */ j .L802402B0 -/* A67358 80240258 00000000 */ nop -.L8024025C: -/* A6735C 8024025C 080900AC */ j .L802402B0 -/* A67360 80240260 0240102D */ daddu $v0, $s2, $zero -.L80240264: -/* A67364 80240264 8E620078 */ lw $v0, 0x78($s3) -/* A67368 80240268 18400010 */ blez $v0, .L802402AC -/* A6736C 8024026C 0000882D */ daddu $s1, $zero, $zero -.L80240270: -/* A67370 80240270 86620008 */ lh $v0, 8($s3) -/* A67374 80240274 00511021 */ addu $v0, $v0, $s1 -/* A67378 80240278 24520001 */ addiu $s2, $v0, 1 -/* A6737C 8024027C 0C00FB3A */ jal get_enemy -/* A67380 80240280 0240202D */ daddu $a0, $s2, $zero -/* A67384 80240284 0240202D */ daddu $a0, $s2, $zero -/* A67388 80240288 0C00EABB */ jal get_npc_unsafe -/* A6738C 8024028C 0040802D */ daddu $s0, $v0, $zero -/* A67390 80240290 8E02006C */ lw $v0, 0x6c($s0) -/* A67394 80240294 1040FFF1 */ beqz $v0, .L8024025C -/* A67398 80240298 26310001 */ addiu $s1, $s1, 1 -/* A6739C 8024029C 8E620078 */ lw $v0, 0x78($s3) -/* A673A0 802402A0 0222102A */ slt $v0, $s1, $v0 -/* A673A4 802402A4 1440FFF2 */ bnez $v0, .L80240270 -/* A673A8 802402A8 00000000 */ nop -.L802402AC: -/* A673AC 802402AC 2402FFFF */ addiu $v0, $zero, -1 -.L802402B0: -/* A673B0 802402B0 8FBF0020 */ lw $ra, 0x20($sp) -/* A673B4 802402B4 8FB3001C */ lw $s3, 0x1c($sp) -/* A673B8 802402B8 8FB20018 */ lw $s2, 0x18($sp) -/* A673BC 802402BC 8FB10014 */ lw $s1, 0x14($sp) -/* A673C0 802402C0 8FB00010 */ lw $s0, 0x10($sp) -/* A673C4 802402C4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A673C8 802402C8 03E00008 */ jr $ra -/* A673CC 802402CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/func_80240514_A67100.s b/asm/nonmatchings/world/area_kpa/kpa_52/func_80240514_A67100.s deleted file mode 100644 index 90046ce125..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/func_80240514_A67100.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240514_A67614 -/* A67614 80240514 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A67618 80240518 AFB10014 */ sw $s1, 0x14($sp) -/* A6761C 8024051C 0080882D */ daddu $s1, $a0, $zero -/* A67620 80240520 AFBF0018 */ sw $ra, 0x18($sp) -/* A67624 80240524 AFB00010 */ sw $s0, 0x10($sp) -/* A67628 80240528 8E300148 */ lw $s0, 0x148($s1) -/* A6762C 8024052C 0C00EABB */ jal get_npc_unsafe -/* A67630 80240530 86040008 */ lh $a0, 8($s0) -/* A67634 80240534 96030076 */ lhu $v1, 0x76($s0) -/* A67638 80240538 A443008E */ sh $v1, 0x8e($v0) -/* A6763C 8024053C 24020021 */ addiu $v0, $zero, 0x21 -/* A67640 80240540 AE220070 */ sw $v0, 0x70($s1) -/* A67644 80240544 8FBF0018 */ lw $ra, 0x18($sp) -/* A67648 80240548 8FB10014 */ lw $s1, 0x14($sp) -/* A6764C 8024054C 8FB00010 */ lw $s0, 0x10($sp) -/* A67650 80240550 03E00008 */ jr $ra -/* A67654 80240554 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/func_8024063C_A67100.s b/asm/nonmatchings/world/area_kpa/kpa_52/func_8024063C_A67100.s deleted file mode 100644 index ef55705f30..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/func_8024063C_A67100.s +++ /dev/null @@ -1,354 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024063C_A6773C -/* A6773C 8024063C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A67740 80240640 AFB7004C */ sw $s7, 0x4c($sp) -/* A67744 80240644 0080B82D */ daddu $s7, $a0, $zero -/* A67748 80240648 AFB10034 */ sw $s1, 0x34($sp) -/* A6774C 8024064C 00A0882D */ daddu $s1, $a1, $zero -/* A67750 80240650 AFBF0050 */ sw $ra, 0x50($sp) -/* A67754 80240654 AFB60048 */ sw $s6, 0x48($sp) -/* A67758 80240658 AFB50044 */ sw $s5, 0x44($sp) -/* A6775C 8024065C AFB40040 */ sw $s4, 0x40($sp) -/* A67760 80240660 AFB3003C */ sw $s3, 0x3c($sp) -/* A67764 80240664 AFB20038 */ sw $s2, 0x38($sp) -/* A67768 80240668 AFB00030 */ sw $s0, 0x30($sp) -/* A6776C 8024066C 8EF30148 */ lw $s3, 0x148($s7) -/* A67770 80240670 86640008 */ lh $a0, 8($s3) -/* A67774 80240674 8EF0000C */ lw $s0, 0xc($s7) -/* A67778 80240678 0C00FB5A */ jal get_enemy_safe -/* A6777C 8024067C 0000B02D */ daddu $s6, $zero, $zero -/* A67780 80240680 10400131 */ beqz $v0, .L80240B48 -/* A67784 80240684 24020005 */ addiu $v0, $zero, 5 -/* A67788 80240688 8E63006C */ lw $v1, 0x6c($s3) -/* A6778C 8024068C 1062012F */ beq $v1, $v0, .L80240B4C -/* A67790 80240690 0000102D */ daddu $v0, $zero, $zero -/* A67794 80240694 8E050000 */ lw $a1, ($s0) -/* A67798 80240698 0C0B1EAF */ jal get_variable -/* A6779C 8024069C 02E0202D */ daddu $a0, $s7, $zero -/* A677A0 802406A0 86640008 */ lh $a0, 8($s3) -/* A677A4 802406A4 0C00EABB */ jal get_npc_unsafe -/* A677A8 802406A8 0040A82D */ daddu $s5, $v0, $zero -/* A677AC 802406AC 8E630070 */ lw $v1, 0x70($s3) -/* A677B0 802406B0 30630002 */ andi $v1, $v1, 2 -/* A677B4 802406B4 10600008 */ beqz $v1, .L802406D8 -/* A677B8 802406B8 0040902D */ daddu $s2, $v0, $zero -/* A677BC 802406BC 964200A8 */ lhu $v0, 0xa8($s2) -/* A677C0 802406C0 00021400 */ sll $v0, $v0, 0x10 -/* A677C4 802406C4 00021C03 */ sra $v1, $v0, 0x10 -/* A677C8 802406C8 000217C2 */ srl $v0, $v0, 0x1f -/* A677CC 802406CC 00621821 */ addu $v1, $v1, $v0 -/* A677D0 802406D0 00031843 */ sra $v1, $v1, 1 -/* A677D4 802406D4 A24300AB */ sb $v1, 0xab($s2) -.L802406D8: -/* A677D8 802406D8 16200005 */ bnez $s1, .L802406F0 -/* A677DC 802406DC 3C030004 */ lui $v1, 4 -/* A677E0 802406E0 8E6200B0 */ lw $v0, 0xb0($s3) -/* A677E4 802406E4 30420004 */ andi $v0, $v0, 4 -/* A677E8 802406E8 10400019 */ beqz $v0, .L80240750 -/* A677EC 802406EC 00000000 */ nop -.L802406F0: -/* A677F0 802406F0 34630102 */ ori $v1, $v1, 0x102 -/* A677F4 802406F4 AEE00070 */ sw $zero, 0x70($s7) -/* A677F8 802406F8 8E420000 */ lw $v0, ($s2) -/* A677FC 802406FC 0240202D */ daddu $a0, $s2, $zero -/* A67800 80240700 A640008E */ sh $zero, 0x8e($s2) -/* A67804 80240704 00431025 */ or $v0, $v0, $v1 -/* A67808 80240708 0C00EAFF */ jal disable_npc_shadow -/* A6780C 8024070C AE420000 */ sw $v0, ($s2) -/* A67810 80240710 3C041F30 */ lui $a0, 0x1f30 -/* A67814 80240714 8E420000 */ lw $v0, ($s2) -/* A67818 80240718 2403F7FF */ addiu $v1, $zero, -0x801 -/* A6781C 8024071C 00431024 */ and $v0, $v0, $v1 -/* A67820 80240720 AE420000 */ sw $v0, ($s2) -/* A67824 80240724 8E620000 */ lw $v0, ($s3) -/* A67828 80240728 8E6300B0 */ lw $v1, 0xb0($s3) -/* A6782C 8024072C 34840040 */ ori $a0, $a0, 0x40 -/* A67830 80240730 AE60006C */ sw $zero, 0x6c($s3) -/* A67834 80240734 00441025 */ or $v0, $v0, $a0 -/* A67838 80240738 AE620000 */ sw $v0, ($s3) -/* A6783C 8024073C 30620004 */ andi $v0, $v1, 4 -/* A67840 80240740 10400003 */ beqz $v0, .L80240750 -/* A67844 80240744 2402FFFB */ addiu $v0, $zero, -5 -/* A67848 80240748 00621024 */ and $v0, $v1, $v0 -/* A6784C 8024074C AE6200B0 */ sw $v0, 0xb0($s3) -.L80240750: -/* A67850 80240750 8EE30070 */ lw $v1, 0x70($s7) -/* A67854 80240754 24100001 */ addiu $s0, $zero, 1 -/* A67858 80240758 10700012 */ beq $v1, $s0, .L802407A4 -/* A6785C 8024075C 28620002 */ slti $v0, $v1, 2 -/* A67860 80240760 10400005 */ beqz $v0, .L80240778 -/* A67864 80240764 24020002 */ addiu $v0, $zero, 2 -/* A67868 80240768 10600007 */ beqz $v1, .L80240788 -/* A6786C 8024076C 0000102D */ daddu $v0, $zero, $zero -/* A67870 80240770 080902D3 */ j .L80240B4C -/* A67874 80240774 00000000 */ nop -.L80240778: -/* A67878 80240778 1062005B */ beq $v1, $v0, .L802408E8 -/* A6787C 8024077C 0000102D */ daddu $v0, $zero, $zero -/* A67880 80240780 080902D3 */ j .L80240B4C -/* A67884 80240784 00000000 */ nop -.L80240788: -/* A67888 80240788 8E420000 */ lw $v0, ($s2) -/* A6788C 8024078C 0240202D */ daddu $a0, $s2, $zero -/* A67890 80240790 34420002 */ ori $v0, $v0, 2 -/* A67894 80240794 0C00EAFF */ jal disable_npc_shadow -/* A67898 80240798 AE420000 */ sw $v0, ($s2) -/* A6789C 8024079C AE60006C */ sw $zero, 0x6c($s3) -/* A678A0 802407A0 AEF00070 */ sw $s0, 0x70($s7) -.L802407A4: -/* A678A4 802407A4 8E74006C */ lw $s4, 0x6c($s3) -/* A678A8 802407A8 24020001 */ addiu $v0, $zero, 1 -/* A678AC 802407AC 168200E7 */ bne $s4, $v0, .L80240B4C -/* A678B0 802407B0 0000102D */ daddu $v0, $zero, $zero -/* A678B4 802407B4 8E64007C */ lw $a0, 0x7c($s3) -/* A678B8 802407B8 24110002 */ addiu $s1, $zero, 2 -/* A678BC 802407BC 0C00EABB */ jal get_npc_unsafe -/* A678C0 802407C0 AE71006C */ sw $s1, 0x6c($s3) -/* A678C4 802407C4 0040802D */ daddu $s0, $v0, $zero -/* A678C8 802407C8 C6000038 */ lwc1 $f0, 0x38($s0) -/* A678CC 802407CC E6400038 */ swc1 $f0, 0x38($s2) -/* A678D0 802407D0 C6000040 */ lwc1 $f0, 0x40($s0) -/* A678D4 802407D4 E6400040 */ swc1 $f0, 0x40($s2) -/* A678D8 802407D8 C6020034 */ lwc1 $f2, 0x34($s0) -/* A678DC 802407DC 3C014387 */ lui $at, 0x4387 -/* A678E0 802407E0 44810000 */ mtc1 $at, $f0 -/* A678E4 802407E4 26440038 */ addiu $a0, $s2, 0x38 -/* A678E8 802407E8 46020001 */ sub.s $f0, $f0, $f2 -/* A678EC 802407EC C6680078 */ lwc1 $f8, 0x78($s3) -/* A678F0 802407F0 46804220 */ cvt.s.w $f8, $f8 -/* A678F4 802407F4 44064000 */ mfc1 $a2, $f8 -/* A678F8 802407F8 44070000 */ mfc1 $a3, $f0 -/* A678FC 802407FC 0C00A7E7 */ jal add_vec2D_polar -/* A67900 80240800 26450040 */ addiu $a1, $s2, 0x40 -/* A67904 80240804 C600003C */ lwc1 $f0, 0x3c($s0) -/* A67908 80240808 C6620074 */ lwc1 $f2, 0x74($s3) -/* A6790C 8024080C 468010A0 */ cvt.s.w $f2, $f2 -/* A67910 80240810 46020000 */ add.s $f0, $f0, $f2 -/* A67914 80240814 E640003C */ swc1 $f0, 0x3c($s2) -/* A67918 80240818 A2740007 */ sb $s4, 7($s3) -/* A6791C 8024081C C6400038 */ lwc1 $f0, 0x38($s2) -/* A67920 80240820 4600020D */ trunc.w.s $f8, $f0 -/* A67924 80240824 44024000 */ mfc1 $v0, $f8 -/* A67928 80240828 00000000 */ nop -/* A6792C 8024082C A6620010 */ sh $v0, 0x10($s3) -/* A67930 80240830 C640003C */ lwc1 $f0, 0x3c($s2) -/* A67934 80240834 4600020D */ trunc.w.s $f8, $f0 -/* A67938 80240838 44024000 */ mfc1 $v0, $f8 -/* A6793C 8024083C 00000000 */ nop -/* A67940 80240840 A6620012 */ sh $v0, 0x12($s3) -/* A67944 80240844 C6400040 */ lwc1 $f0, 0x40($s2) -/* A67948 80240848 4600020D */ trunc.w.s $f8, $f0 -/* A6794C 8024084C 44024000 */ mfc1 $v0, $f8 -/* A67950 80240850 00000000 */ nop -/* A67954 80240854 A6620014 */ sh $v0, 0x14($s3) -/* A67958 80240858 AE400044 */ sw $zero, 0x44($s2) -/* A6795C 8024085C AE400048 */ sw $zero, 0x48($s2) -/* A67960 80240860 AE40004C */ sw $zero, 0x4c($s2) -/* A67964 80240864 C6A00000 */ lwc1 $f0, ($s5) -/* A67968 80240868 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A6796C 8024086C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A67970 80240870 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A67974 80240874 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A67978 80240878 E6400018 */ swc1 $f0, 0x18($s2) -/* A6797C 8024087C 8C460028 */ lw $a2, 0x28($v0) -/* A67980 80240880 0C00A720 */ jal atan2 -/* A67984 80240884 8C470030 */ lw $a3, 0x30($v0) -/* A67988 80240888 E640000C */ swc1 $f0, 0xc($s2) -/* A6798C 8024088C C6A0000C */ lwc1 $f0, 0xc($s5) -/* A67990 80240890 8E420000 */ lw $v0, ($s2) -/* A67994 80240894 0240202D */ daddu $a0, $s2, $zero -/* A67998 80240898 E640001C */ swc1 $f0, 0x1c($s2) -/* A6799C 8024089C C6A00010 */ lwc1 $f0, 0x10($s5) -/* A679A0 802408A0 2403FFFD */ addiu $v1, $zero, -3 -/* A679A4 802408A4 E6400014 */ swc1 $f0, 0x14($s2) -/* A679A8 802408A8 C600003C */ lwc1 $f0, 0x3c($s0) -/* A679AC 802408AC 00431024 */ and $v0, $v0, $v1 -/* A679B0 802408B0 AE420000 */ sw $v0, ($s2) -/* A679B4 802408B4 0C00EAE8 */ jal enable_npc_shadow -/* A679B8 802408B8 E6400064 */ swc1 $f0, 0x64($s2) -/* A679BC 802408BC 8E420000 */ lw $v0, ($s2) -/* A679C0 802408C0 3C03E0FF */ lui $v1, 0xe0ff -/* A679C4 802408C4 34420800 */ ori $v0, $v0, 0x800 -/* A679C8 802408C8 AE420000 */ sw $v0, ($s2) -/* A679CC 802408CC 8E620000 */ lw $v0, ($s3) -/* A679D0 802408D0 3463FFFF */ ori $v1, $v1, 0xffff -/* A679D4 802408D4 00431024 */ and $v0, $v0, $v1 -/* A679D8 802408D8 AE620000 */ sw $v0, ($s3) -/* A679DC 802408DC 2402005A */ addiu $v0, $zero, 0x5a -/* A679E0 802408E0 A642008E */ sh $v0, 0x8e($s2) -/* A679E4 802408E4 AEF10070 */ sw $s1, 0x70($s7) -.L802408E8: -/* A679E8 802408E8 0000202D */ daddu $a0, $zero, $zero -/* A679EC 802408EC 27B00020 */ addiu $s0, $sp, 0x20 -/* A679F0 802408F0 864200A8 */ lh $v0, 0xa8($s2) -/* A679F4 802408F4 3C013FE0 */ lui $at, 0x3fe0 -/* A679F8 802408F8 44810800 */ mtc1 $at, $f1 -/* A679FC 802408FC 44800000 */ mtc1 $zero, $f0 -/* A67A00 80240900 44821000 */ mtc1 $v0, $f2 -/* A67A04 80240904 00000000 */ nop -/* A67A08 80240908 468010A1 */ cvt.d.w $f2, $f2 -/* A67A0C 8024090C 46201082 */ mul.d $f2, $f2, $f0 -/* A67A10 80240910 00000000 */ nop -/* A67A14 80240914 0200282D */ daddu $a1, $s0, $zero -/* A67A18 80240918 C6440038 */ lwc1 $f4, 0x38($s2) -/* A67A1C 8024091C C640003C */ lwc1 $f0, 0x3c($s2) -/* A67A20 80240920 27B10024 */ addiu $s1, $sp, 0x24 -/* A67A24 80240924 E7A40020 */ swc1 $f4, 0x20($sp) -/* A67A28 80240928 C6440040 */ lwc1 $f4, 0x40($s2) -/* A67A2C 8024092C 46000021 */ cvt.d.s $f0, $f0 -/* A67A30 80240930 46220000 */ add.d $f0, $f0, $f2 -/* A67A34 80240934 E7A40028 */ swc1 $f4, 0x28($sp) -/* A67A38 80240938 C6420018 */ lwc1 $f2, 0x18($s2) -/* A67A3C 8024093C 46200020 */ cvt.s.d $f0, $f0 -/* A67A40 80240940 E7A00024 */ swc1 $f0, 0x24($sp) -/* A67A44 80240944 E7A20010 */ swc1 $f2, 0x10($sp) -/* A67A48 80240948 C640000C */ lwc1 $f0, 0xc($s2) -/* A67A4C 8024094C 0220302D */ daddu $a2, $s1, $zero -/* A67A50 80240950 E7A00014 */ swc1 $f0, 0x14($sp) -/* A67A54 80240954 864200A6 */ lh $v0, 0xa6($s2) -/* A67A58 80240958 27B40028 */ addiu $s4, $sp, 0x28 -/* A67A5C 8024095C 44820000 */ mtc1 $v0, $f0 -/* A67A60 80240960 00000000 */ nop -/* A67A64 80240964 46800020 */ cvt.s.w $f0, $f0 -/* A67A68 80240968 E7A00018 */ swc1 $f0, 0x18($sp) -/* A67A6C 8024096C 864200A8 */ lh $v0, 0xa8($s2) -/* A67A70 80240970 0280382D */ daddu $a3, $s4, $zero -/* A67A74 80240974 44820000 */ mtc1 $v0, $f0 -/* A67A78 80240978 00000000 */ nop -/* A67A7C 8024097C 46800020 */ cvt.s.w $f0, $f0 -/* A67A80 80240980 0C0376B9 */ jal func_800DDAE4 -/* A67A84 80240984 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A67A88 80240988 54400001 */ bnel $v0, $zero, .L80240990 -/* A67A8C 8024098C 24160001 */ addiu $s6, $zero, 1 -.L80240990: -/* A67A90 80240990 0200282D */ daddu $a1, $s0, $zero -/* A67A94 80240994 0220302D */ daddu $a2, $s1, $zero -/* A67A98 80240998 C6400038 */ lwc1 $f0, 0x38($s2) -/* A67A9C 8024099C C642003C */ lwc1 $f2, 0x3c($s2) -/* A67AA0 802409A0 C6440040 */ lwc1 $f4, 0x40($s2) -/* A67AA4 802409A4 3C01447A */ lui $at, 0x447a -/* A67AA8 802409A8 44813000 */ mtc1 $at, $f6 -/* A67AAC 802409AC 27A2002C */ addiu $v0, $sp, 0x2c -/* A67AB0 802409B0 E7A00020 */ swc1 $f0, 0x20($sp) -/* A67AB4 802409B4 E7A20024 */ swc1 $f2, 0x24($sp) -/* A67AB8 802409B8 E7A40028 */ swc1 $f4, 0x28($sp) -/* A67ABC 802409BC E7A6002C */ swc1 $f6, 0x2c($sp) -/* A67AC0 802409C0 AFA20010 */ sw $v0, 0x10($sp) -/* A67AC4 802409C4 8E440080 */ lw $a0, 0x80($s2) -/* A67AC8 802409C8 0C0372DF */ jal func_800DCB7C -/* A67ACC 802409CC 0280382D */ daddu $a3, $s4, $zero -/* A67AD0 802409D0 10400019 */ beqz $v0, .L80240A38 -/* A67AD4 802409D4 00000000 */ nop -/* A67AD8 802409D8 C640001C */ lwc1 $f0, 0x1c($s2) -/* A67ADC 802409DC C7A2002C */ lwc1 $f2, 0x2c($sp) -/* A67AE0 802409E0 46000005 */ abs.s $f0, $f0 -/* A67AE4 802409E4 4600103C */ c.lt.s $f2, $f0 -/* A67AE8 802409E8 00000000 */ nop -/* A67AEC 802409EC 45000012 */ bc1f .L80240A38 -/* A67AF0 802409F0 00000000 */ nop -/* A67AF4 802409F4 C7A40024 */ lwc1 $f4, 0x24($sp) -/* A67AF8 802409F8 C6400064 */ lwc1 $f0, 0x64($s2) -/* A67AFC 802409FC 46002001 */ sub.s $f0, $f4, $f0 -/* A67B00 80240A00 3C014034 */ lui $at, 0x4034 -/* A67B04 80240A04 44811800 */ mtc1 $at, $f3 -/* A67B08 80240A08 44801000 */ mtc1 $zero, $f2 -/* A67B0C 80240A0C 46000005 */ abs.s $f0, $f0 -/* A67B10 80240A10 46000021 */ cvt.d.s $f0, $f0 -/* A67B14 80240A14 4622003C */ c.lt.d $f0, $f2 -/* A67B18 80240A18 00000000 */ nop -/* A67B1C 80240A1C 45000006 */ bc1f .L80240A38 -/* A67B20 80240A20 0240202D */ daddu $a0, $s2, $zero -/* A67B24 80240A24 8E450018 */ lw $a1, 0x18($s2) -/* A67B28 80240A28 8E46000C */ lw $a2, 0xc($s2) -/* A67B2C 80240A2C 2416000A */ addiu $s6, $zero, 0xa -/* A67B30 80240A30 0C00EA95 */ jal npc_move_heading -/* A67B34 80240A34 E644003C */ swc1 $f4, 0x3c($s2) -.L80240A38: -/* A67B38 80240A38 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A67B3C 80240A3C 3C013FF0 */ lui $at, 0x3ff0 -/* A67B40 80240A40 44811800 */ mtc1 $at, $f3 -/* A67B44 80240A44 44801000 */ mtc1 $zero, $f2 -/* A67B48 80240A48 46000021 */ cvt.d.s $f0, $f0 -/* A67B4C 80240A4C 4622003C */ c.lt.d $f0, $f2 -/* A67B50 80240A50 00000000 */ nop -/* A67B54 80240A54 45030001 */ bc1tl .L80240A5C -/* A67B58 80240A58 2416000B */ addiu $s6, $zero, 0xb -.L80240A5C: -/* A67B5C 80240A5C 9642008E */ lhu $v0, 0x8e($s2) -/* A67B60 80240A60 2442FFFF */ addiu $v0, $v0, -1 -/* A67B64 80240A64 A642008E */ sh $v0, 0x8e($s2) -/* A67B68 80240A68 00021400 */ sll $v0, $v0, 0x10 -/* A67B6C 80240A6C 58400001 */ blezl $v0, .L80240A74 -/* A67B70 80240A70 24160014 */ addiu $s6, $zero, 0x14 -.L80240A74: -/* A67B74 80240A74 56C00019 */ bnel $s6, $zero, .L80240ADC -/* A67B78 80240A78 AFA00010 */ sw $zero, 0x10($sp) -/* A67B7C 80240A7C 8E620070 */ lw $v0, 0x70($s3) -/* A67B80 80240A80 30420001 */ andi $v0, $v0, 1 -/* A67B84 80240A84 10400009 */ beqz $v0, .L80240AAC -/* A67B88 80240A88 00000000 */ nop -/* A67B8C 80240A8C C640004C */ lwc1 $f0, 0x4c($s2) -/* A67B90 80240A90 3C014044 */ lui $at, 0x4044 -/* A67B94 80240A94 44811800 */ mtc1 $at, $f3 -/* A67B98 80240A98 44801000 */ mtc1 $zero, $f2 -/* A67B9C 80240A9C 46000021 */ cvt.d.s $f0, $f0 -/* A67BA0 80240AA0 46220000 */ add.d $f0, $f0, $f2 -/* A67BA4 80240AA4 46200020 */ cvt.s.d $f0, $f0 -/* A67BA8 80240AA8 E640004C */ swc1 $f0, 0x4c($s2) -.L80240AAC: -/* A67BAC 80240AAC 8E450018 */ lw $a1, 0x18($s2) -/* A67BB0 80240AB0 8E46000C */ lw $a2, 0xc($s2) -/* A67BB4 80240AB4 0C00EA95 */ jal npc_move_heading -/* A67BB8 80240AB8 0240202D */ daddu $a0, $s2, $zero -/* A67BBC 80240ABC C644003C */ lwc1 $f4, 0x3c($s2) -/* A67BC0 80240AC0 C640001C */ lwc1 $f0, 0x1c($s2) -/* A67BC4 80240AC4 46002100 */ add.s $f4, $f4, $f0 -/* A67BC8 80240AC8 C6420014 */ lwc1 $f2, 0x14($s2) -/* A67BCC 80240ACC 46020001 */ sub.s $f0, $f0, $f2 -/* A67BD0 80240AD0 E644003C */ swc1 $f4, 0x3c($s2) -/* A67BD4 80240AD4 080902D2 */ j .L80240B48 -/* A67BD8 80240AD8 E640001C */ swc1 $f0, 0x1c($s2) -.L80240ADC: -/* A67BDC 80240ADC AFA00014 */ sw $zero, 0x14($sp) -/* A67BE0 80240AE0 8E450038 */ lw $a1, 0x38($s2) -/* A67BE4 80240AE4 8E46003C */ lw $a2, 0x3c($s2) -/* A67BE8 80240AE8 8E470040 */ lw $a3, 0x40($s2) -/* A67BEC 80240AEC 0C01BECC */ jal fx_walk_normal -/* A67BF0 80240AF0 24040002 */ addiu $a0, $zero, 2 -/* A67BF4 80240AF4 3C01C47A */ lui $at, 0xc47a -/* A67BF8 80240AF8 44810000 */ mtc1 $at, $f0 -/* A67BFC 80240AFC AE60006C */ sw $zero, 0x6c($s3) -/* A67C00 80240B00 8E420000 */ lw $v0, ($s2) -/* A67C04 80240B04 0240202D */ daddu $a0, $s2, $zero -/* A67C08 80240B08 AE400038 */ sw $zero, 0x38($s2) -/* A67C0C 80240B0C AE400040 */ sw $zero, 0x40($s2) -/* A67C10 80240B10 AE40001C */ sw $zero, 0x1c($s2) -/* A67C14 80240B14 34420002 */ ori $v0, $v0, 2 -/* A67C18 80240B18 E640003C */ swc1 $f0, 0x3c($s2) -/* A67C1C 80240B1C 0C00EAFF */ jal disable_npc_shadow -/* A67C20 80240B20 AE420000 */ sw $v0, ($s2) -/* A67C24 80240B24 8E420000 */ lw $v0, ($s2) -/* A67C28 80240B28 2403F7FF */ addiu $v1, $zero, -0x801 -/* A67C2C 80240B2C 00431024 */ and $v0, $v0, $v1 -/* A67C30 80240B30 AE420000 */ sw $v0, ($s2) -/* A67C34 80240B34 8E620000 */ lw $v0, ($s3) -/* A67C38 80240B38 3C031F00 */ lui $v1, 0x1f00 -/* A67C3C 80240B3C 00431025 */ or $v0, $v0, $v1 -/* A67C40 80240B40 AE620000 */ sw $v0, ($s3) -/* A67C44 80240B44 AEE00070 */ sw $zero, 0x70($s7) -.L80240B48: -/* A67C48 80240B48 0000102D */ daddu $v0, $zero, $zero -.L80240B4C: -/* A67C4C 80240B4C 8FBF0050 */ lw $ra, 0x50($sp) -/* A67C50 80240B50 8FB7004C */ lw $s7, 0x4c($sp) -/* A67C54 80240B54 8FB60048 */ lw $s6, 0x48($sp) -/* A67C58 80240B58 8FB50044 */ lw $s5, 0x44($sp) -/* A67C5C 80240B5C 8FB40040 */ lw $s4, 0x40($sp) -/* A67C60 80240B60 8FB3003C */ lw $s3, 0x3c($sp) -/* A67C64 80240B64 8FB20038 */ lw $s2, 0x38($sp) -/* A67C68 80240B68 8FB10034 */ lw $s1, 0x34($sp) -/* A67C6C 80240B6C 8FB00030 */ lw $s0, 0x30($sp) -/* A67C70 80240B70 03E00008 */ jr $ra -/* A67C74 80240B74 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/func_80240FD4_A67100.s b/asm/nonmatchings/world/area_kpa/kpa_52/func_80240FD4_A67100.s deleted file mode 100644 index edb6cb3a51..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/func_80240FD4_A67100.s +++ /dev/null @@ -1,213 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD4_A680D4 -/* A680D4 80240FD4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A680D8 80240FD8 AFB3003C */ sw $s3, 0x3c($sp) -/* A680DC 80240FDC 0080982D */ daddu $s3, $a0, $zero -/* A680E0 80240FE0 AFBF0048 */ sw $ra, 0x48($sp) -/* A680E4 80240FE4 AFB50044 */ sw $s5, 0x44($sp) -/* A680E8 80240FE8 AFB40040 */ sw $s4, 0x40($sp) -/* A680EC 80240FEC AFB20038 */ sw $s2, 0x38($sp) -/* A680F0 80240FF0 AFB10034 */ sw $s1, 0x34($sp) -/* A680F4 80240FF4 AFB00030 */ sw $s0, 0x30($sp) -/* A680F8 80240FF8 8E720148 */ lw $s2, 0x148($s3) -/* A680FC 80240FFC 86440008 */ lh $a0, 8($s2) -/* A68100 80241000 8E70000C */ lw $s0, 0xc($s3) -/* A68104 80241004 0C00EABB */ jal get_npc_unsafe -/* A68108 80241008 00A0882D */ daddu $s1, $a1, $zero -/* A6810C 8024100C 0260202D */ daddu $a0, $s3, $zero -/* A68110 80241010 8E050000 */ lw $a1, ($s0) -/* A68114 80241014 0C0B1EAF */ jal get_variable -/* A68118 80241018 0040A02D */ daddu $s4, $v0, $zero -/* A6811C 8024101C AFA00010 */ sw $zero, 0x10($sp) -/* A68120 80241020 8E4300D0 */ lw $v1, 0xd0($s2) -/* A68124 80241024 8C630030 */ lw $v1, 0x30($v1) -/* A68128 80241028 AFA30014 */ sw $v1, 0x14($sp) -/* A6812C 8024102C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A68130 80241030 8C63001C */ lw $v1, 0x1c($v1) -/* A68134 80241034 AFA30018 */ sw $v1, 0x18($sp) -/* A68138 80241038 8E4300D0 */ lw $v1, 0xd0($s2) -/* A6813C 8024103C 8C630024 */ lw $v1, 0x24($v1) -/* A68140 80241040 AFA3001C */ sw $v1, 0x1c($sp) -/* A68144 80241044 8E4300D0 */ lw $v1, 0xd0($s2) -/* A68148 80241048 8C630028 */ lw $v1, 0x28($v1) -/* A6814C 8024104C 27B50010 */ addiu $s5, $sp, 0x10 -/* A68150 80241050 AFA30020 */ sw $v1, 0x20($sp) -/* A68154 80241054 8E4300D0 */ lw $v1, 0xd0($s2) -/* A68158 80241058 3C014220 */ lui $at, 0x4220 -/* A6815C 8024105C 44810000 */ mtc1 $at, $f0 -/* A68160 80241060 8C63002C */ lw $v1, 0x2c($v1) -/* A68164 80241064 0040802D */ daddu $s0, $v0, $zero -/* A68168 80241068 E7A00028 */ swc1 $f0, 0x28($sp) -/* A6816C 8024106C A7A0002C */ sh $zero, 0x2c($sp) -/* A68170 80241070 16200005 */ bnez $s1, .L80241088 -/* A68174 80241074 AFA30024 */ sw $v1, 0x24($sp) -/* A68178 80241078 8E4200B0 */ lw $v0, 0xb0($s2) -/* A6817C 8024107C 30420004 */ andi $v0, $v0, 4 -/* A68180 80241080 1040002F */ beqz $v0, .L80241140 -/* A68184 80241084 00000000 */ nop -.L80241088: -/* A68188 80241088 2404F7FF */ addiu $a0, $zero, -0x801 -/* A6818C 8024108C AE600070 */ sw $zero, 0x70($s3) -/* A68190 80241090 A680008E */ sh $zero, 0x8e($s4) -/* A68194 80241094 8E4200CC */ lw $v0, 0xcc($s2) -/* A68198 80241098 8E830000 */ lw $v1, ($s4) -/* A6819C 8024109C 8C420000 */ lw $v0, ($v0) -/* A681A0 802410A0 00641824 */ and $v1, $v1, $a0 -/* A681A4 802410A4 AE830000 */ sw $v1, ($s4) -/* A681A8 802410A8 AE820028 */ sw $v0, 0x28($s4) -/* A681AC 802410AC 8E4200D0 */ lw $v0, 0xd0($s2) -/* A681B0 802410B0 8C420034 */ lw $v0, 0x34($v0) -/* A681B4 802410B4 54400005 */ bnel $v0, $zero, .L802410CC -/* A681B8 802410B8 2402FDFF */ addiu $v0, $zero, -0x201 -/* A681BC 802410BC 34620200 */ ori $v0, $v1, 0x200 -/* A681C0 802410C0 2403FFF7 */ addiu $v1, $zero, -9 -/* A681C4 802410C4 08090435 */ j .L802410D4 -/* A681C8 802410C8 00431024 */ and $v0, $v0, $v1 -.L802410CC: -/* A681CC 802410CC 00621024 */ and $v0, $v1, $v0 -/* A681D0 802410D0 34420008 */ ori $v0, $v0, 8 -.L802410D4: -/* A681D4 802410D4 AE820000 */ sw $v0, ($s4) -/* A681D8 802410D8 8E4200B0 */ lw $v0, 0xb0($s2) -/* A681DC 802410DC 30420004 */ andi $v0, $v0, 4 -/* A681E0 802410E0 10400008 */ beqz $v0, .L80241104 -/* A681E4 802410E4 24020063 */ addiu $v0, $zero, 0x63 -/* A681E8 802410E8 AE620070 */ sw $v0, 0x70($s3) -/* A681EC 802410EC AE600074 */ sw $zero, 0x74($s3) -/* A681F0 802410F0 8E4200B0 */ lw $v0, 0xb0($s2) -/* A681F4 802410F4 2403FFFB */ addiu $v1, $zero, -5 -/* A681F8 802410F8 00431024 */ and $v0, $v0, $v1 -/* A681FC 802410FC 08090447 */ j .L8024111C -/* A68200 80241100 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241104: -/* A68204 80241104 8E420000 */ lw $v0, ($s2) -/* A68208 80241108 3C034000 */ lui $v1, 0x4000 -/* A6820C 8024110C 00431024 */ and $v0, $v0, $v1 -/* A68210 80241110 10400002 */ beqz $v0, .L8024111C -/* A68214 80241114 2402000C */ addiu $v0, $zero, 0xc -/* A68218 80241118 AE620070 */ sw $v0, 0x70($s3) -.L8024111C: -/* A6821C 8024111C 3C05BFFF */ lui $a1, 0xbfff -/* A68220 80241120 34A5FFFF */ ori $a1, $a1, 0xffff -/* A68224 80241124 2404FFFB */ addiu $a0, $zero, -5 -/* A68228 80241128 8E4200B0 */ lw $v0, 0xb0($s2) -/* A6822C 8024112C 8E430000 */ lw $v1, ($s2) -/* A68230 80241130 00441024 */ and $v0, $v0, $a0 -/* A68234 80241134 00651824 */ and $v1, $v1, $a1 -/* A68238 80241138 AE4200B0 */ sw $v0, 0xb0($s2) -/* A6823C 8024113C AE430000 */ sw $v1, ($s2) -.L80241140: -/* A68240 80241140 8E630070 */ lw $v1, 0x70($s3) -/* A68244 80241144 2C620064 */ sltiu $v0, $v1, 0x64 -/* A68248 80241148 10400060 */ beqz $v0, .L802412CC -/* A6824C 8024114C 00031080 */ sll $v0, $v1, 2 -/* A68250 80241150 3C018024 */ lui $at, 0x8024 -/* A68254 80241154 00220821 */ addu $at, $at, $v0 -/* A68258 80241158 8C223A08 */ lw $v0, 0x3a08($at) -/* A6825C 8024115C 00400008 */ jr $v0 -/* A68260 80241160 00000000 */ nop -/* A68264 80241164 0260202D */ daddu $a0, $s3, $zero -/* A68268 80241168 0200282D */ daddu $a1, $s0, $zero -/* A6826C 8024116C 0C012568 */ jal func_800495A0 -/* A68270 80241170 02A0302D */ daddu $a2, $s5, $zero -/* A68274 80241174 0260202D */ daddu $a0, $s3, $zero -/* A68278 80241178 0200282D */ daddu $a1, $s0, $zero -/* A6827C 8024117C 0C0125AE */ jal func_800496B8 -/* A68280 80241180 02A0302D */ daddu $a2, $s5, $zero -/* A68284 80241184 080904B3 */ j .L802412CC -/* A68288 80241188 00000000 */ nop -/* A6828C 8024118C 0260202D */ daddu $a0, $s3, $zero -/* A68290 80241190 0200282D */ daddu $a1, $s0, $zero -/* A68294 80241194 0C0126D1 */ jal func_80049B44 -/* A68298 80241198 02A0302D */ daddu $a2, $s5, $zero -/* A6829C 8024119C 0260202D */ daddu $a0, $s3, $zero -/* A682A0 802411A0 0200282D */ daddu $a1, $s0, $zero -/* A682A4 802411A4 0C012701 */ jal func_80049C04 -/* A682A8 802411A8 02A0302D */ daddu $a2, $s5, $zero -/* A682AC 802411AC 080904B3 */ j .L802412CC -/* A682B0 802411B0 00000000 */ nop -/* A682B4 802411B4 0260202D */ daddu $a0, $s3, $zero -/* A682B8 802411B8 0200282D */ daddu $a1, $s0, $zero -/* A682BC 802411BC 0C01278F */ jal func_80049E3C -/* A682C0 802411C0 02A0302D */ daddu $a2, $s5, $zero -/* A682C4 802411C4 0260202D */ daddu $a0, $s3, $zero -/* A682C8 802411C8 0200282D */ daddu $a1, $s0, $zero -/* A682CC 802411CC 0C0127B3 */ jal func_80049ECC -/* A682D0 802411D0 02A0302D */ daddu $a2, $s5, $zero -/* A682D4 802411D4 080904B3 */ j .L802412CC -/* A682D8 802411D8 00000000 */ nop -/* A682DC 802411DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A682E0 802411E0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A682E4 802411E4 C68C0038 */ lwc1 $f12, 0x38($s4) -/* A682E8 802411E8 C68E0040 */ lwc1 $f14, 0x40($s4) -/* A682EC 802411EC 8C460028 */ lw $a2, 0x28($v0) -/* A682F0 802411F0 0C00A7B5 */ jal dist2D -/* A682F4 802411F4 8C470030 */ lw $a3, 0x30($v0) -/* A682F8 802411F8 8E42006C */ lw $v0, 0x6c($s2) -/* A682FC 802411FC 10400008 */ beqz $v0, .L80241220 -/* A68300 80241200 46000086 */ mov.s $f2, $f0 -/* A68304 80241204 44820000 */ mtc1 $v0, $f0 -/* A68308 80241208 00000000 */ nop -/* A6830C 8024120C 46800020 */ cvt.s.w $f0, $f0 -/* A68310 80241210 4602003C */ c.lt.s $f0, $f2 -/* A68314 80241214 00000000 */ nop -/* A68318 80241218 4500000B */ bc1f .L80241248 -/* A6831C 8024121C 0260202D */ daddu $a0, $s3, $zero -.L80241220: -/* A68320 80241220 0260202D */ daddu $a0, $s3, $zero -/* A68324 80241224 8E050024 */ lw $a1, 0x24($s0) -/* A68328 80241228 8E060028 */ lw $a2, 0x28($s0) -/* A6832C 8024122C 0C0900B4 */ jal func_802402D0 -/* A68330 80241230 02A0382D */ daddu $a3, $s5, $zero -/* A68334 80241234 8E630070 */ lw $v1, 0x70($s3) -/* A68338 80241238 2402000C */ addiu $v0, $zero, 0xc -/* A6833C 8024123C 14620023 */ bne $v1, $v0, .L802412CC -/* A68340 80241240 00000000 */ nop -/* A68344 80241244 0260202D */ daddu $a0, $s3, $zero -.L80241248: -/* A68348 80241248 0200282D */ daddu $a1, $s0, $zero -/* A6834C 8024124C 0C0127DF */ jal func_80049F7C -/* A68350 80241250 02A0302D */ daddu $a2, $s5, $zero -/* A68354 80241254 0260202D */ daddu $a0, $s3, $zero -/* A68358 80241258 0200282D */ daddu $a1, $s0, $zero -/* A6835C 8024125C 0C012849 */ jal func_8004A124 -/* A68360 80241260 02A0302D */ daddu $a2, $s5, $zero -/* A68364 80241264 080904B3 */ j .L802412CC -/* A68368 80241268 00000000 */ nop -/* A6836C 8024126C 0260202D */ daddu $a0, $s3, $zero -/* A68370 80241270 0200282D */ daddu $a1, $s0, $zero -/* A68374 80241274 0C0128FA */ jal func_8004A3E8 -/* A68378 80241278 02A0302D */ daddu $a2, $s5, $zero -/* A6837C 8024127C 080904B3 */ j .L802412CC -/* A68380 80241280 00000000 */ nop -/* A68384 80241284 0C090105 */ jal func_80240414 -/* A68388 80241288 0260202D */ daddu $a0, $s3, $zero -/* A6838C 8024128C 080904B3 */ j .L802412CC -/* A68390 80241290 00000000 */ nop -/* A68394 80241294 0C090145 */ jal func_80240514 -/* A68398 80241298 0260202D */ daddu $a0, $s3, $zero -/* A6839C 8024129C 080904B3 */ j .L802412CC -/* A683A0 802412A0 00000000 */ nop -/* A683A4 802412A4 0C090156 */ jal func_80240558 -/* A683A8 802412A8 0260202D */ daddu $a0, $s3, $zero -/* A683AC 802412AC 080904B3 */ j .L802412CC -/* A683B0 802412B0 00000000 */ nop -/* A683B4 802412B4 0C09017E */ jal func_802405F8 -/* A683B8 802412B8 0260202D */ daddu $a0, $s3, $zero -/* A683BC 802412BC 080904B3 */ j .L802412CC -/* A683C0 802412C0 00000000 */ nop -/* A683C4 802412C4 0C0129CF */ jal func_8004A73C -/* A683C8 802412C8 0260202D */ daddu $a0, $s3, $zero -.L802412CC: -/* A683CC 802412CC 8FBF0048 */ lw $ra, 0x48($sp) -/* A683D0 802412D0 8FB50044 */ lw $s5, 0x44($sp) -/* A683D4 802412D4 8FB40040 */ lw $s4, 0x40($sp) -/* A683D8 802412D8 8FB3003C */ lw $s3, 0x3c($sp) -/* A683DC 802412DC 8FB20038 */ lw $s2, 0x38($sp) -/* A683E0 802412E0 8FB10034 */ lw $s1, 0x34($sp) -/* A683E4 802412E4 8FB00030 */ lw $s0, 0x30($sp) -/* A683E8 802412E8 0000102D */ daddu $v0, $zero, $zero -/* A683EC 802412EC 03E00008 */ jr $ra -/* A683F0 802412F0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_53/func_80240050_A6ACA0.s b/asm/nonmatchings/world/area_kpa/kpa_53/func_80240050_A6ACA0.s deleted file mode 100644 index d365f6bdc3..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_53/func_80240050_A6ACA0.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_A6ACF0 -/* A6ACF0 80240050 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A6ACF4 80240054 AFB10014 */ sw $s1, 0x14($sp) -/* A6ACF8 80240058 0080882D */ daddu $s1, $a0, $zero -/* A6ACFC 8024005C AFBF001C */ sw $ra, 0x1c($sp) -/* A6AD00 80240060 AFB20018 */ sw $s2, 0x18($sp) -/* A6AD04 80240064 AFB00010 */ sw $s0, 0x10($sp) -/* A6AD08 80240068 8E30000C */ lw $s0, 0xc($s1) -/* A6AD0C 8024006C 8E050000 */ lw $a1, ($s0) -/* A6AD10 80240070 0C0B1EAF */ jal get_variable -/* A6AD14 80240074 26100004 */ addiu $s0, $s0, 4 -/* A6AD18 80240078 0220202D */ daddu $a0, $s1, $zero -/* A6AD1C 8024007C 8E120000 */ lw $s2, ($s0) -/* A6AD20 80240080 0C0B36B0 */ jal resolve_npc -/* A6AD24 80240084 0040282D */ daddu $a1, $v0, $zero -/* A6AD28 80240088 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A6AD2C 8024008C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A6AD30 80240090 0040182D */ daddu $v1, $v0, $zero -/* A6AD34 80240094 1060002F */ beqz $v1, .L80240154 -/* A6AD38 80240098 24020002 */ addiu $v0, $zero, 2 -/* A6AD3C 8024009C C6000028 */ lwc1 $f0, 0x28($s0) -/* A6AD40 802400A0 3C018024 */ lui $at, 0x8024 -/* A6AD44 802400A4 D4221E50 */ ldc1 $f2, 0x1e50($at) -/* A6AD48 802400A8 4600010D */ trunc.w.s $f4, $f0 -/* A6AD4C 802400AC 44022000 */ mfc1 $v0, $f4 -/* A6AD50 802400B0 00000000 */ nop -/* A6AD54 802400B4 2442FD44 */ addiu $v0, $v0, -0x2bc -/* A6AD58 802400B8 44820000 */ mtc1 $v0, $f0 -/* A6AD5C 802400BC 00000000 */ nop -/* A6AD60 802400C0 46800021 */ cvt.d.w $f0, $f0 -/* A6AD64 802400C4 46220002 */ mul.d $f0, $f0, $f2 -/* A6AD68 802400C8 00000000 */ nop -/* A6AD6C 802400CC 4620010D */ trunc.w.d $f4, $f0 -/* A6AD70 802400D0 44022000 */ mfc1 $v0, $f4 -/* A6AD74 802400D4 00000000 */ nop -/* A6AD78 802400D8 244202FD */ addiu $v0, $v0, 0x2fd -/* A6AD7C 802400DC 44820000 */ mtc1 $v0, $f0 -/* A6AD80 802400E0 00000000 */ nop -/* A6AD84 802400E4 46800020 */ cvt.s.w $f0, $f0 -/* A6AD88 802400E8 E4600038 */ swc1 $f0, 0x38($v1) -/* A6AD8C 802400EC C6020054 */ lwc1 $f2, 0x54($s0) -/* A6AD90 802400F0 44800000 */ mtc1 $zero, $f0 -/* A6AD94 802400F4 00000000 */ nop -/* A6AD98 802400F8 46001032 */ c.eq.s $f2, $f0 -/* A6AD9C 802400FC 00000000 */ nop -/* A6ADA0 80240100 45000003 */ bc1f .L80240110 -/* A6ADA4 80240104 3C02000A */ lui $v0, 0xa -/* A6ADA8 80240108 0809004D */ j .L80240134 -/* A6ADAC 8024010C 34420001 */ ori $v0, $v0, 1 -.L80240110: -/* A6ADB0 80240110 3C014000 */ lui $at, 0x4000 -/* A6ADB4 80240114 44810000 */ mtc1 $at, $f0 -/* A6ADB8 80240118 00000000 */ nop -/* A6ADBC 8024011C 4600103C */ c.lt.s $f2, $f0 -/* A6ADC0 80240120 00000000 */ nop -/* A6ADC4 80240124 45000003 */ bc1f .L80240134 -/* A6ADC8 80240128 34420003 */ ori $v0, $v0, 3 -/* A6ADCC 8024012C 3C02000A */ lui $v0, 0xa -/* A6ADD0 80240130 34420002 */ ori $v0, $v0, 2 -.L80240134: -/* A6ADD4 80240134 0220202D */ daddu $a0, $s1, $zero -/* A6ADD8 80240138 AC620028 */ sw $v0, 0x28($v1) -/* A6ADDC 8024013C C6000080 */ lwc1 $f0, 0x80($s0) -/* A6ADE0 80240140 4600010D */ trunc.w.s $f4, $f0 -/* A6ADE4 80240144 44062000 */ mfc1 $a2, $f4 -/* A6ADE8 80240148 0C0B2026 */ jal set_variable -/* A6ADEC 8024014C 0240282D */ daddu $a1, $s2, $zero -/* A6ADF0 80240150 24020002 */ addiu $v0, $zero, 2 -.L80240154: -/* A6ADF4 80240154 8FBF001C */ lw $ra, 0x1c($sp) -/* A6ADF8 80240158 8FB20018 */ lw $s2, 0x18($sp) -/* A6ADFC 8024015C 8FB10014 */ lw $s1, 0x14($sp) -/* A6AE00 80240160 8FB00010 */ lw $s0, 0x10($sp) -/* A6AE04 80240164 03E00008 */ jr $ra -/* A6AE08 80240168 27BD0020 */ addiu $sp, $sp, 0x20 -/* A6AE0C 8024016C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_60/func_80240034_A6CB00.s b/asm/nonmatchings/world/area_kpa/kpa_60/func_80240034_A6CB00.s deleted file mode 100644 index 910a6a3be6..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_60/func_80240034_A6CB00.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_A6CB34 -/* A6CB34 80240034 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A6CB38 80240038 AFB20018 */ sw $s2, 0x18($sp) -/* A6CB3C 8024003C 0080902D */ daddu $s2, $a0, $zero -/* A6CB40 80240040 AFBF001C */ sw $ra, 0x1c($sp) -/* A6CB44 80240044 AFB10014 */ sw $s1, 0x14($sp) -/* A6CB48 80240048 AFB00010 */ sw $s0, 0x10($sp) -/* A6CB4C 8024004C 8E50000C */ lw $s0, 0xc($s2) -/* A6CB50 80240050 8E050000 */ lw $a1, ($s0) -/* A6CB54 80240054 0C0B1EAF */ jal get_variable -/* A6CB58 80240058 26100004 */ addiu $s0, $s0, 4 -/* A6CB5C 8024005C 0C04417A */ jal get_entity_by_index -/* A6CB60 80240060 0040202D */ daddu $a0, $v0, $zero -/* A6CB64 80240064 8E050000 */ lw $a1, ($s0) -/* A6CB68 80240068 26100004 */ addiu $s0, $s0, 4 -/* A6CB6C 8024006C 0040882D */ daddu $s1, $v0, $zero -/* A6CB70 80240070 C6200048 */ lwc1 $f0, 0x48($s1) -/* A6CB74 80240074 4600008D */ trunc.w.s $f2, $f0 -/* A6CB78 80240078 44061000 */ mfc1 $a2, $f2 -/* A6CB7C 8024007C 0C0B2026 */ jal set_variable -/* A6CB80 80240080 0240202D */ daddu $a0, $s2, $zero -/* A6CB84 80240084 8E050000 */ lw $a1, ($s0) -/* A6CB88 80240088 26100004 */ addiu $s0, $s0, 4 -/* A6CB8C 8024008C C620004C */ lwc1 $f0, 0x4c($s1) -/* A6CB90 80240090 4600008D */ trunc.w.s $f2, $f0 -/* A6CB94 80240094 44061000 */ mfc1 $a2, $f2 -/* A6CB98 80240098 0C0B2026 */ jal set_variable -/* A6CB9C 8024009C 0240202D */ daddu $a0, $s2, $zero -/* A6CBA0 802400A0 C6200050 */ lwc1 $f0, 0x50($s1) -/* A6CBA4 802400A4 8E050000 */ lw $a1, ($s0) -/* A6CBA8 802400A8 4600008D */ trunc.w.s $f2, $f0 -/* A6CBAC 802400AC 44061000 */ mfc1 $a2, $f2 -/* A6CBB0 802400B0 0C0B2026 */ jal set_variable -/* A6CBB4 802400B4 0240202D */ daddu $a0, $s2, $zero -/* A6CBB8 802400B8 8FBF001C */ lw $ra, 0x1c($sp) -/* A6CBBC 802400BC 8FB20018 */ lw $s2, 0x18($sp) -/* A6CBC0 802400C0 8FB10014 */ lw $s1, 0x14($sp) -/* A6CBC4 802400C4 8FB00010 */ lw $s0, 0x10($sp) -/* A6CBC8 802400C8 24020002 */ addiu $v0, $zero, 2 -/* A6CBCC 802400CC 03E00008 */ jr $ra -/* A6CBD0 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 -/* A6CBD4 802400D4 00000000 */ nop -/* A6CBD8 802400D8 00000000 */ nop -/* A6CBDC 802400DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_60/func_802400E0_A6CB00.s b/asm/nonmatchings/world/area_kpa/kpa_60/func_802400E0_A6CB00.s deleted file mode 100644 index 5396b8e921..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_60/func_802400E0_A6CB00.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E0_A6CBE0 -/* A6CBE0 802400E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A6CBE4 802400E4 AFB00010 */ sw $s0, 0x10($sp) -/* A6CBE8 802400E8 0080802D */ daddu $s0, $a0, $zero -/* A6CBEC 802400EC AFBF0014 */ sw $ra, 0x14($sp) -/* A6CBF0 802400F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* A6CBF4 802400F4 8E020088 */ lw $v0, 0x88($s0) -/* A6CBF8 802400F8 00621821 */ addu $v1, $v1, $v0 -/* A6CBFC 802400FC 04610004 */ bgez $v1, .L80240110 -/* A6CC00 80240100 AE0300A8 */ sw $v1, 0xa8($s0) -/* A6CC04 80240104 3C020002 */ lui $v0, 2 -/* A6CC08 80240108 08090048 */ j .L80240120 -/* A6CC0C 8024010C 00621021 */ addu $v0, $v1, $v0 -.L80240110: -/* A6CC10 80240110 3C040002 */ lui $a0, 2 -/* A6CC14 80240114 0083102A */ slt $v0, $a0, $v1 -/* A6CC18 80240118 10400002 */ beqz $v0, .L80240124 -/* A6CC1C 8024011C 00641023 */ subu $v0, $v1, $a0 -.L80240120: -/* A6CC20 80240120 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240124: -/* A6CC24 80240124 8E0300AC */ lw $v1, 0xac($s0) -/* A6CC28 80240128 8E02008C */ lw $v0, 0x8c($s0) -/* A6CC2C 8024012C 00621821 */ addu $v1, $v1, $v0 -/* A6CC30 80240130 04610004 */ bgez $v1, .L80240144 -/* A6CC34 80240134 AE0300AC */ sw $v1, 0xac($s0) -/* A6CC38 80240138 3C020002 */ lui $v0, 2 -/* A6CC3C 8024013C 08090055 */ j .L80240154 -/* A6CC40 80240140 00621021 */ addu $v0, $v1, $v0 -.L80240144: -/* A6CC44 80240144 3C040002 */ lui $a0, 2 -/* A6CC48 80240148 0083102A */ slt $v0, $a0, $v1 -/* A6CC4C 8024014C 10400002 */ beqz $v0, .L80240158 -/* A6CC50 80240150 00641023 */ subu $v0, $v1, $a0 -.L80240154: -/* A6CC54 80240154 AE0200AC */ sw $v0, 0xac($s0) -.L80240158: -/* A6CC58 80240158 8E0300B0 */ lw $v1, 0xb0($s0) -/* A6CC5C 8024015C 8E020090 */ lw $v0, 0x90($s0) -/* A6CC60 80240160 00621821 */ addu $v1, $v1, $v0 -/* A6CC64 80240164 04610004 */ bgez $v1, .L80240178 -/* A6CC68 80240168 AE0300B0 */ sw $v1, 0xb0($s0) -/* A6CC6C 8024016C 3C020002 */ lui $v0, 2 -/* A6CC70 80240170 08090062 */ j .L80240188 -/* A6CC74 80240174 00621021 */ addu $v0, $v1, $v0 -.L80240178: -/* A6CC78 80240178 3C040002 */ lui $a0, 2 -/* A6CC7C 8024017C 0083102A */ slt $v0, $a0, $v1 -/* A6CC80 80240180 10400002 */ beqz $v0, .L8024018C -/* A6CC84 80240184 00641023 */ subu $v0, $v1, $a0 -.L80240188: -/* A6CC88 80240188 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024018C: -/* A6CC8C 8024018C 8E0300B4 */ lw $v1, 0xb4($s0) -/* A6CC90 80240190 8E020094 */ lw $v0, 0x94($s0) -/* A6CC94 80240194 00621821 */ addu $v1, $v1, $v0 -/* A6CC98 80240198 04610004 */ bgez $v1, .L802401AC -/* A6CC9C 8024019C AE0300B4 */ sw $v1, 0xb4($s0) -/* A6CCA0 802401A0 3C020002 */ lui $v0, 2 -/* A6CCA4 802401A4 0809006F */ j .L802401BC -/* A6CCA8 802401A8 00621021 */ addu $v0, $v1, $v0 -.L802401AC: -/* A6CCAC 802401AC 3C040002 */ lui $a0, 2 -/* A6CCB0 802401B0 0083102A */ slt $v0, $a0, $v1 -/* A6CCB4 802401B4 10400002 */ beqz $v0, .L802401C0 -/* A6CCB8 802401B8 00641023 */ subu $v0, $v1, $a0 -.L802401BC: -/* A6CCBC 802401BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802401C0: -/* A6CCC0 802401C0 8E040084 */ lw $a0, 0x84($s0) -/* A6CCC4 802401C4 0C046F07 */ jal set_main_pan_u -/* A6CCC8 802401C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A6CCCC 802401CC 8E040084 */ lw $a0, 0x84($s0) -/* A6CCD0 802401D0 0C046F0D */ jal set_main_pan_v -/* A6CCD4 802401D4 8E0500AC */ lw $a1, 0xac($s0) -/* A6CCD8 802401D8 8E040084 */ lw $a0, 0x84($s0) -/* A6CCDC 802401DC 0C046F13 */ jal set_aux_pan_u -/* A6CCE0 802401E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* A6CCE4 802401E4 8E040084 */ lw $a0, 0x84($s0) -/* A6CCE8 802401E8 0C046F19 */ jal set_aux_pan_v -/* A6CCEC 802401EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* A6CCF0 802401F0 8FBF0014 */ lw $ra, 0x14($sp) -/* A6CCF4 802401F4 8FB00010 */ lw $s0, 0x10($sp) -/* A6CCF8 802401F8 0000102D */ daddu $v0, $zero, $zero -/* A6CCFC 802401FC 03E00008 */ jr $ra -/* A6CD00 80240200 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/func_80240124_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/func_80240124_A6E3E0.s deleted file mode 100644 index 217f30491b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/func_80240124_A6E3E0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A6E504 -/* A6E504 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A6E508 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A6E50C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A6E510 80240130 10A00005 */ beqz $a1, .L80240148 -/* A6E514 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A6E518 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A6E51C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A6E520 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A6E524 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A6E528 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A6E52C 8024014C 1440000E */ bnez $v0, .L80240188 -/* A6E530 80240150 00000000 */ nop -/* A6E534 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A6E538 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A6E53C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A6E540 80240160 04610004 */ bgez $v1, .L80240174 -/* A6E544 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A6E548 80240168 3C020002 */ lui $v0, 2 -/* A6E54C 8024016C 08090061 */ j .L80240184 -/* A6E550 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A6E554 80240174 3C040002 */ lui $a0, 2 -/* A6E558 80240178 0083102A */ slt $v0, $a0, $v1 -/* A6E55C 8024017C 10400002 */ beqz $v0, .L80240188 -/* A6E560 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A6E564 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A6E568 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A6E56C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A6E570 80240190 00000000 */ nop -/* A6E574 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A6E578 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A6E57C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A6E580 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A6E584 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A6E588 802401A8 3C020002 */ lui $v0, 2 -/* A6E58C 802401AC 08090071 */ j .L802401C4 -/* A6E590 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A6E594 802401B4 3C040002 */ lui $a0, 2 -/* A6E598 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A6E59C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A6E5A0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A6E5A4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A6E5A8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A6E5AC 802401CC 1440000E */ bnez $v0, .L80240208 -/* A6E5B0 802401D0 00000000 */ nop -/* A6E5B4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A6E5B8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A6E5BC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A6E5C0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A6E5C4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A6E5C8 802401E8 3C020002 */ lui $v0, 2 -/* A6E5CC 802401EC 08090081 */ j .L80240204 -/* A6E5D0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A6E5D4 802401F4 3C040002 */ lui $a0, 2 -/* A6E5D8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A6E5DC 802401FC 10400002 */ beqz $v0, .L80240208 -/* A6E5E0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A6E5E4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A6E5E8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A6E5EC 8024020C 1440000E */ bnez $v0, .L80240248 -/* A6E5F0 80240210 00000000 */ nop -/* A6E5F4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A6E5F8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A6E5FC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A6E600 80240220 04610004 */ bgez $v1, .L80240234 -/* A6E604 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A6E608 80240228 3C020002 */ lui $v0, 2 -/* A6E60C 8024022C 08090091 */ j .L80240244 -/* A6E610 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A6E614 80240234 3C040002 */ lui $a0, 2 -/* A6E618 80240238 0083102A */ slt $v0, $a0, $v1 -/* A6E61C 8024023C 10400002 */ beqz $v0, .L80240248 -/* A6E620 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A6E624 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A6E628 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A6E62C 8024024C 0C046F07 */ jal set_main_pan_u -/* A6E630 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A6E634 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A6E638 80240258 0C046F0D */ jal set_main_pan_v -/* A6E63C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A6E640 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A6E644 80240264 0C046F13 */ jal set_aux_pan_u -/* A6E648 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A6E64C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A6E650 80240270 0C046F19 */ jal set_aux_pan_v -/* A6E654 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A6E658 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A6E65C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A6E660 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A6E664 80240284 24420001 */ addiu $v0, $v0, 1 -/* A6E668 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A6E66C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A6E670 80240290 24630001 */ addiu $v1, $v1, 1 -/* A6E674 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A6E678 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A6E67C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A6E680 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A6E684 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A6E688 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A6E68C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A6E690 802402B0 14600002 */ bnez $v1, .L802402BC -/* A6E694 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A6E698 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A6E69C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A6E6A0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A6E6A4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A6E6A8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A6E6AC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A6E6B0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A6E6B4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A6E6B8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A6E6BC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A6E6C0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A6E6C4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A6E6C8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A6E6CC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A6E6D0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A6E6D4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A6E6D8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A6E6DC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A6E6E0 80240300 0000102D */ daddu $v0, $zero, $zero -/* A6E6E4 80240304 03E00008 */ jr $ra -/* A6E6E8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A6E6EC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/func_80240310_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/func_80240310_A6E3E0.s deleted file mode 100644 index 9118b47531..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/func_80240310_A6E3E0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_A6E6F0 -/* A6E6F0 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A6E6F4 80240314 AFB20018 */ sw $s2, 0x18($sp) -/* A6E6F8 80240318 0080902D */ daddu $s2, $a0, $zero -/* A6E6FC 8024031C AFBF001C */ sw $ra, 0x1c($sp) -/* A6E700 80240320 AFB10014 */ sw $s1, 0x14($sp) -/* A6E704 80240324 AFB00010 */ sw $s0, 0x10($sp) -/* A6E708 80240328 8E510148 */ lw $s1, 0x148($s2) -/* A6E70C 8024032C 0C00EABB */ jal get_npc_unsafe -/* A6E710 80240330 86240008 */ lh $a0, 8($s1) -/* A6E714 80240334 0040802D */ daddu $s0, $v0, $zero -/* A6E718 80240338 8E2300CC */ lw $v1, 0xcc($s1) -/* A6E71C 8024033C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A6E720 80240340 8C630020 */ lw $v1, 0x20($v1) -/* A6E724 80240344 AE030028 */ sw $v1, 0x28($s0) -/* A6E728 80240348 96220076 */ lhu $v0, 0x76($s1) -/* A6E72C 8024034C A602008E */ sh $v0, 0x8e($s0) -/* A6E730 80240350 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A6E734 80240354 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A6E738 80240358 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A6E73C 8024035C 8C460028 */ lw $a2, 0x28($v0) -/* A6E740 80240360 0C00A720 */ jal atan2 -/* A6E744 80240364 8C470030 */ lw $a3, 0x30($v0) -/* A6E748 80240368 2402000D */ addiu $v0, $zero, 0xd -/* A6E74C 8024036C E600000C */ swc1 $f0, 0xc($s0) -/* A6E750 80240370 AE420070 */ sw $v0, 0x70($s2) -/* A6E754 80240374 8FBF001C */ lw $ra, 0x1c($sp) -/* A6E758 80240378 8FB20018 */ lw $s2, 0x18($sp) -/* A6E75C 8024037C 8FB10014 */ lw $s1, 0x14($sp) -/* A6E760 80240380 8FB00010 */ lw $s0, 0x10($sp) -/* A6E764 80240384 03E00008 */ jr $ra -/* A6E768 80240388 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/func_8024038C_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/func_8024038C_A6E3E0.s deleted file mode 100644 index 737e181d46..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/func_8024038C_A6E3E0.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024038C_A6E76C -/* A6E76C 8024038C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A6E770 80240390 AFB3001C */ sw $s3, 0x1c($sp) -/* A6E774 80240394 0080982D */ daddu $s3, $a0, $zero -/* A6E778 80240398 AFBF0020 */ sw $ra, 0x20($sp) -/* A6E77C 8024039C AFB20018 */ sw $s2, 0x18($sp) -/* A6E780 802403A0 AFB10014 */ sw $s1, 0x14($sp) -/* A6E784 802403A4 AFB00010 */ sw $s0, 0x10($sp) -/* A6E788 802403A8 8E710148 */ lw $s1, 0x148($s3) -/* A6E78C 802403AC 86240008 */ lh $a0, 8($s1) -/* A6E790 802403B0 0C00EABB */ jal get_npc_unsafe -/* A6E794 802403B4 00A0902D */ daddu $s2, $a1, $zero -/* A6E798 802403B8 0040802D */ daddu $s0, $v0, $zero -/* A6E79C 802403BC 8602008E */ lh $v0, 0x8e($s0) -/* A6E7A0 802403C0 9603008E */ lhu $v1, 0x8e($s0) -/* A6E7A4 802403C4 18400005 */ blez $v0, .L802403DC -/* A6E7A8 802403C8 2462FFFF */ addiu $v0, $v1, -1 -/* A6E7AC 802403CC A602008E */ sh $v0, 0x8e($s0) -/* A6E7B0 802403D0 00021400 */ sll $v0, $v0, 0x10 -/* A6E7B4 802403D4 1C400033 */ bgtz $v0, .L802404A4 -/* A6E7B8 802403D8 00000000 */ nop -.L802403DC: -/* A6E7BC 802403DC 8602008C */ lh $v0, 0x8c($s0) -/* A6E7C0 802403E0 14400030 */ bnez $v0, .L802404A4 -/* A6E7C4 802403E4 00000000 */ nop -/* A6E7C8 802403E8 8E2200CC */ lw $v0, 0xcc($s1) -/* A6E7CC 802403EC 8C420024 */ lw $v0, 0x24($v0) -/* A6E7D0 802403F0 AE020028 */ sw $v0, 0x28($s0) -/* A6E7D4 802403F4 C6400018 */ lwc1 $f0, 0x18($s2) -/* A6E7D8 802403F8 E6000018 */ swc1 $f0, 0x18($s0) -/* A6E7DC 802403FC 8E230088 */ lw $v1, 0x88($s1) -/* A6E7E0 80240400 24020005 */ addiu $v0, $zero, 5 -/* A6E7E4 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* A6E7E8 80240408 00000000 */ nop -/* A6E7EC 8024040C 10600003 */ beqz $v1, .L8024041C -/* A6E7F0 80240410 24020001 */ addiu $v0, $zero, 1 -/* A6E7F4 80240414 14620006 */ bne $v1, $v0, .L80240430 -/* A6E7F8 80240418 00000000 */ nop -.L8024041C: -/* A6E7FC 8024041C 8E220084 */ lw $v0, 0x84($s1) -/* A6E800 80240420 00021FC2 */ srl $v1, $v0, 0x1f -/* A6E804 80240424 00431021 */ addu $v0, $v0, $v1 -/* A6E808 80240428 00021043 */ sra $v0, $v0, 1 -/* A6E80C 8024042C A60200A8 */ sh $v0, 0xa8($s0) -.L80240430: -/* A6E810 80240430 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A6E814 80240434 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A6E818 80240438 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A6E81C 8024043C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A6E820 80240440 8C460028 */ lw $a2, 0x28($v0) -/* A6E824 80240444 0C00A7B5 */ jal dist2D -/* A6E828 80240448 8C470030 */ lw $a3, 0x30($v0) -/* A6E82C 8024044C C6020018 */ lwc1 $f2, 0x18($s0) -/* A6E830 80240450 46020003 */ div.s $f0, $f0, $f2 -/* A6E834 80240454 3C018024 */ lui $at, 0x8024 -/* A6E838 80240458 D4223CD0 */ ldc1 $f2, 0x3cd0($at) -/* A6E83C 8024045C 46000021 */ cvt.d.s $f0, $f0 -/* A6E840 80240460 46220000 */ add.d $f0, $f0, $f2 -/* A6E844 80240464 4620010D */ trunc.w.d $f4, $f0 -/* A6E848 80240468 44022000 */ mfc1 $v0, $f4 -/* A6E84C 8024046C 00000000 */ nop -/* A6E850 80240470 A602008E */ sh $v0, 0x8e($s0) -/* A6E854 80240474 00021400 */ sll $v0, $v0, 0x10 -/* A6E858 80240478 8E230078 */ lw $v1, 0x78($s1) -/* A6E85C 8024047C 00021403 */ sra $v0, $v0, 0x10 -/* A6E860 80240480 0043102A */ slt $v0, $v0, $v1 -/* A6E864 80240484 10400003 */ beqz $v0, .L80240494 -/* A6E868 80240488 00000000 */ nop -/* A6E86C 8024048C 9622007A */ lhu $v0, 0x7a($s1) -/* A6E870 80240490 A602008E */ sh $v0, 0x8e($s0) -.L80240494: -/* A6E874 80240494 8602008E */ lh $v0, 0x8e($s0) -/* A6E878 80240498 AE22007C */ sw $v0, 0x7c($s1) -/* A6E87C 8024049C 2402000E */ addiu $v0, $zero, 0xe -/* A6E880 802404A0 AE620070 */ sw $v0, 0x70($s3) -.L802404A4: -/* A6E884 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* A6E888 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* A6E88C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* A6E890 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* A6E894 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* A6E898 802404B8 03E00008 */ jr $ra -/* A6E89C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/func_802404C0_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/func_802404C0_A6E3E0.s deleted file mode 100644 index 9f849090bd..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/func_802404C0_A6E3E0.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_A6E8A0 -/* A6E8A0 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A6E8A4 802404C4 AFB3003C */ sw $s3, 0x3c($sp) -/* A6E8A8 802404C8 0080982D */ daddu $s3, $a0, $zero -/* A6E8AC 802404CC AFBF0040 */ sw $ra, 0x40($sp) -/* A6E8B0 802404D0 AFB20038 */ sw $s2, 0x38($sp) -/* A6E8B4 802404D4 AFB10034 */ sw $s1, 0x34($sp) -/* A6E8B8 802404D8 AFB00030 */ sw $s0, 0x30($sp) -/* A6E8BC 802404DC 8E710148 */ lw $s1, 0x148($s3) -/* A6E8C0 802404E0 0C00EABB */ jal get_npc_unsafe -/* A6E8C4 802404E4 86240008 */ lh $a0, 8($s1) -/* A6E8C8 802404E8 0040802D */ daddu $s0, $v0, $zero -/* A6E8CC 802404EC 8E22007C */ lw $v0, 0x7c($s1) -/* A6E8D0 802404F0 8603008E */ lh $v1, 0x8e($s0) -/* A6E8D4 802404F4 2442FFFF */ addiu $v0, $v0, -1 -/* A6E8D8 802404F8 14620012 */ bne $v1, $v0, .L80240544 -/* A6E8DC 802404FC 00000000 */ nop -/* A6E8E0 80240500 C6000038 */ lwc1 $f0, 0x38($s0) -/* A6E8E4 80240504 4600020D */ trunc.w.s $f8, $f0 -/* A6E8E8 80240508 44024000 */ mfc1 $v0, $f8 -/* A6E8EC 8024050C 00000000 */ nop -/* A6E8F0 80240510 A6220010 */ sh $v0, 0x10($s1) -/* A6E8F4 80240514 C600003C */ lwc1 $f0, 0x3c($s0) -/* A6E8F8 80240518 4600020D */ trunc.w.s $f8, $f0 -/* A6E8FC 8024051C 44024000 */ mfc1 $v0, $f8 -/* A6E900 80240520 00000000 */ nop -/* A6E904 80240524 A6220012 */ sh $v0, 0x12($s1) -/* A6E908 80240528 C6000040 */ lwc1 $f0, 0x40($s0) -/* A6E90C 8024052C 24020001 */ addiu $v0, $zero, 1 -/* A6E910 80240530 A2220007 */ sb $v0, 7($s1) -/* A6E914 80240534 4600020D */ trunc.w.s $f8, $f0 -/* A6E918 80240538 44024000 */ mfc1 $v0, $f8 -/* A6E91C 8024053C 00000000 */ nop -/* A6E920 80240540 A6220014 */ sh $v0, 0x14($s1) -.L80240544: -/* A6E924 80240544 C6000038 */ lwc1 $f0, 0x38($s0) -/* A6E928 80240548 C602003C */ lwc1 $f2, 0x3c($s0) -/* A6E92C 8024054C C6040040 */ lwc1 $f4, 0x40($s0) -/* A6E930 80240550 C6060018 */ lwc1 $f6, 0x18($s0) -/* A6E934 80240554 E7A00020 */ swc1 $f0, 0x20($sp) -/* A6E938 80240558 E7A20024 */ swc1 $f2, 0x24($sp) -/* A6E93C 8024055C E7A40028 */ swc1 $f4, 0x28($sp) -/* A6E940 80240560 E7A60010 */ swc1 $f6, 0x10($sp) -/* A6E944 80240564 C600000C */ lwc1 $f0, 0xc($s0) -/* A6E948 80240568 E7A00014 */ swc1 $f0, 0x14($sp) -/* A6E94C 8024056C 860200A8 */ lh $v0, 0xa8($s0) -/* A6E950 80240570 27A50020 */ addiu $a1, $sp, 0x20 -/* A6E954 80240574 44820000 */ mtc1 $v0, $f0 -/* A6E958 80240578 00000000 */ nop -/* A6E95C 8024057C 46800020 */ cvt.s.w $f0, $f0 -/* A6E960 80240580 E7A00018 */ swc1 $f0, 0x18($sp) -/* A6E964 80240584 860200A6 */ lh $v0, 0xa6($s0) -/* A6E968 80240588 27A60024 */ addiu $a2, $sp, 0x24 -/* A6E96C 8024058C 44820000 */ mtc1 $v0, $f0 -/* A6E970 80240590 00000000 */ nop -/* A6E974 80240594 46800020 */ cvt.s.w $f0, $f0 -/* A6E978 80240598 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A6E97C 8024059C 8E040080 */ lw $a0, 0x80($s0) -/* A6E980 802405A0 0C037711 */ jal func_800DDC44 -/* A6E984 802405A4 27A70028 */ addiu $a3, $sp, 0x28 -/* A6E988 802405A8 0040902D */ daddu $s2, $v0, $zero -/* A6E98C 802405AC 16400005 */ bnez $s2, .L802405C4 -/* A6E990 802405B0 00000000 */ nop -/* A6E994 802405B4 8E050018 */ lw $a1, 0x18($s0) -/* A6E998 802405B8 8E06000C */ lw $a2, 0xc($s0) -/* A6E99C 802405BC 0C00EA95 */ jal npc_move_heading -/* A6E9A0 802405C0 0200202D */ daddu $a0, $s0, $zero -.L802405C4: -/* A6E9A4 802405C4 8602008E */ lh $v0, 0x8e($s0) -/* A6E9A8 802405C8 9603008E */ lhu $v1, 0x8e($s0) -/* A6E9AC 802405CC 18400007 */ blez $v0, .L802405EC -/* A6E9B0 802405D0 2462FFFF */ addiu $v0, $v1, -1 -/* A6E9B4 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* A6E9B8 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* A6E9BC 802405DC 18400003 */ blez $v0, .L802405EC -/* A6E9C0 802405E0 00000000 */ nop -/* A6E9C4 802405E4 12400008 */ beqz $s2, .L80240608 -/* A6E9C8 802405E8 00000000 */ nop -.L802405EC: -/* A6E9CC 802405EC 8E2200CC */ lw $v0, 0xcc($s1) -/* A6E9D0 802405F0 A2200007 */ sb $zero, 7($s1) -/* A6E9D4 802405F4 8C420028 */ lw $v0, 0x28($v0) -/* A6E9D8 802405F8 A600008E */ sh $zero, 0x8e($s0) -/* A6E9DC 802405FC AE020028 */ sw $v0, 0x28($s0) -/* A6E9E0 80240600 2402000F */ addiu $v0, $zero, 0xf -/* A6E9E4 80240604 AE620070 */ sw $v0, 0x70($s3) -.L80240608: -/* A6E9E8 80240608 8FBF0040 */ lw $ra, 0x40($sp) -/* A6E9EC 8024060C 8FB3003C */ lw $s3, 0x3c($sp) -/* A6E9F0 80240610 8FB20038 */ lw $s2, 0x38($sp) -/* A6E9F4 80240614 8FB10034 */ lw $s1, 0x34($sp) -/* A6E9F8 80240618 8FB00030 */ lw $s0, 0x30($sp) -/* A6E9FC 8024061C 03E00008 */ jr $ra -/* A6EA00 80240620 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/func_80240624_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/func_80240624_A6E3E0.s deleted file mode 100644 index 261c717f7d..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/func_80240624_A6E3E0.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240624_A6EA04 -/* A6EA04 80240624 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A6EA08 80240628 AFB10014 */ sw $s1, 0x14($sp) -/* A6EA0C 8024062C 0080882D */ daddu $s1, $a0, $zero -/* A6EA10 80240630 AFBF0018 */ sw $ra, 0x18($sp) -/* A6EA14 80240634 AFB00010 */ sw $s0, 0x10($sp) -/* A6EA18 80240638 8E300148 */ lw $s0, 0x148($s1) -/* A6EA1C 8024063C 0C00EABB */ jal get_npc_unsafe -/* A6EA20 80240640 86040008 */ lh $a0, 8($s0) -/* A6EA24 80240644 0040202D */ daddu $a0, $v0, $zero -/* A6EA28 80240648 9482008E */ lhu $v0, 0x8e($a0) -/* A6EA2C 8024064C 24030003 */ addiu $v1, $zero, 3 -/* A6EA30 80240650 24420001 */ addiu $v0, $v0, 1 -/* A6EA34 80240654 A482008E */ sh $v0, 0x8e($a0) -/* A6EA38 80240658 00021400 */ sll $v0, $v0, 0x10 -/* A6EA3C 8024065C 00021403 */ sra $v0, $v0, 0x10 -/* A6EA40 80240660 14430003 */ bne $v0, $v1, .L80240670 -/* A6EA44 80240664 00000000 */ nop -/* A6EA48 80240668 96020086 */ lhu $v0, 0x86($s0) -/* A6EA4C 8024066C A48200A8 */ sh $v0, 0xa8($a0) -.L80240670: -/* A6EA50 80240670 8482008E */ lh $v0, 0x8e($a0) -/* A6EA54 80240674 8E030080 */ lw $v1, 0x80($s0) -/* A6EA58 80240678 0043102A */ slt $v0, $v0, $v1 -/* A6EA5C 8024067C 14400004 */ bnez $v0, .L80240690 -/* A6EA60 80240680 00000000 */ nop -/* A6EA64 80240684 96020086 */ lhu $v0, 0x86($s0) -/* A6EA68 80240688 A48200A8 */ sh $v0, 0xa8($a0) -/* A6EA6C 8024068C AE200070 */ sw $zero, 0x70($s1) -.L80240690: -/* A6EA70 80240690 8FBF0018 */ lw $ra, 0x18($sp) -/* A6EA74 80240694 8FB10014 */ lw $s1, 0x14($sp) -/* A6EA78 80240698 8FB00010 */ lw $s0, 0x10($sp) -/* A6EA7C 8024069C 03E00008 */ jr $ra -/* A6EA80 802406A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/func_802406A4_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/func_802406A4_A6E3E0.s deleted file mode 100644 index c6b2a00be6..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/func_802406A4_A6E3E0.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A4_A6EA84 -/* A6EA84 802406A4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A6EA88 802406A8 AFB3005C */ sw $s3, 0x5c($sp) -/* A6EA8C 802406AC 0080982D */ daddu $s3, $a0, $zero -/* A6EA90 802406B0 AFBF0068 */ sw $ra, 0x68($sp) -/* A6EA94 802406B4 AFB50064 */ sw $s5, 0x64($sp) -/* A6EA98 802406B8 AFB40060 */ sw $s4, 0x60($sp) -/* A6EA9C 802406BC AFB20058 */ sw $s2, 0x58($sp) -/* A6EAA0 802406C0 AFB10054 */ sw $s1, 0x54($sp) -/* A6EAA4 802406C4 AFB00050 */ sw $s0, 0x50($sp) -/* A6EAA8 802406C8 8E710148 */ lw $s1, 0x148($s3) -/* A6EAAC 802406CC 86240008 */ lh $a0, 8($s1) -/* A6EAB0 802406D0 0C00EABB */ jal get_npc_unsafe -/* A6EAB4 802406D4 00A0802D */ daddu $s0, $a1, $zero -/* A6EAB8 802406D8 8E63000C */ lw $v1, 0xc($s3) -/* A6EABC 802406DC 0260202D */ daddu $a0, $s3, $zero -/* A6EAC0 802406E0 8C650000 */ lw $a1, ($v1) -/* A6EAC4 802406E4 0C0B1EAF */ jal get_variable -/* A6EAC8 802406E8 0040902D */ daddu $s2, $v0, $zero -/* A6EACC 802406EC AFA00028 */ sw $zero, 0x28($sp) -/* A6EAD0 802406F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* A6EAD4 802406F4 8C630030 */ lw $v1, 0x30($v1) -/* A6EAD8 802406F8 AFA3002C */ sw $v1, 0x2c($sp) -/* A6EADC 802406FC 8E2300D0 */ lw $v1, 0xd0($s1) -/* A6EAE0 80240700 8C63001C */ lw $v1, 0x1c($v1) -/* A6EAE4 80240704 AFA30030 */ sw $v1, 0x30($sp) -/* A6EAE8 80240708 8E2300D0 */ lw $v1, 0xd0($s1) -/* A6EAEC 8024070C 8C630024 */ lw $v1, 0x24($v1) -/* A6EAF0 80240710 AFA30034 */ sw $v1, 0x34($sp) -/* A6EAF4 80240714 8E2300D0 */ lw $v1, 0xd0($s1) -/* A6EAF8 80240718 8C630028 */ lw $v1, 0x28($v1) -/* A6EAFC 8024071C 27B50028 */ addiu $s5, $sp, 0x28 -/* A6EB00 80240720 AFA30038 */ sw $v1, 0x38($sp) -/* A6EB04 80240724 8E2300D0 */ lw $v1, 0xd0($s1) -/* A6EB08 80240728 3C0142C8 */ lui $at, 0x42c8 -/* A6EB0C 8024072C 44810000 */ mtc1 $at, $f0 -/* A6EB10 80240730 8C63002C */ lw $v1, 0x2c($v1) -/* A6EB14 80240734 0040A02D */ daddu $s4, $v0, $zero -/* A6EB18 80240738 E7A00040 */ swc1 $f0, 0x40($sp) -/* A6EB1C 8024073C A7A00044 */ sh $zero, 0x44($sp) -/* A6EB20 80240740 12000009 */ beqz $s0, .L80240768 -/* A6EB24 80240744 AFA3003C */ sw $v1, 0x3c($sp) -/* A6EB28 80240748 864300A8 */ lh $v1, 0xa8($s2) -/* A6EB2C 8024074C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A6EB30 80240750 AE20008C */ sw $zero, 0x8c($s1) -/* A6EB34 80240754 A22000B5 */ sb $zero, 0xb5($s1) -/* A6EB38 80240758 34420008 */ ori $v0, $v0, 8 -/* A6EB3C 8024075C AE230084 */ sw $v1, 0x84($s1) -/* A6EB40 80240760 080901DE */ j .L80240778 -/* A6EB44 80240764 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240768: -/* A6EB48 80240768 8E2200B0 */ lw $v0, 0xb0($s1) -/* A6EB4C 8024076C 30420004 */ andi $v0, $v0, 4 -/* A6EB50 80240770 10400047 */ beqz $v0, .L80240890 -/* A6EB54 80240774 00000000 */ nop -.L80240778: -/* A6EB58 80240778 AE600070 */ sw $zero, 0x70($s3) -/* A6EB5C 8024077C A640008E */ sh $zero, 0x8e($s2) -/* A6EB60 80240780 8E2300CC */ lw $v1, 0xcc($s1) -/* A6EB64 80240784 2404F7FF */ addiu $a0, $zero, -0x801 -/* A6EB68 80240788 A2200007 */ sb $zero, 7($s1) -/* A6EB6C 8024078C 8E420000 */ lw $v0, ($s2) -/* A6EB70 80240790 8C630000 */ lw $v1, ($v1) -/* A6EB74 80240794 00441024 */ and $v0, $v0, $a0 -/* A6EB78 80240798 AE420000 */ sw $v0, ($s2) -/* A6EB7C 8024079C AE430028 */ sw $v1, 0x28($s2) -/* A6EB80 802407A0 96220086 */ lhu $v0, 0x86($s1) -/* A6EB84 802407A4 A64200A8 */ sh $v0, 0xa8($s2) -/* A6EB88 802407A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* A6EB8C 802407AC AE200090 */ sw $zero, 0x90($s1) -/* A6EB90 802407B0 8C420034 */ lw $v0, 0x34($v0) -/* A6EB94 802407B4 14400006 */ bnez $v0, .L802407D0 -/* A6EB98 802407B8 2403FDFF */ addiu $v1, $zero, -0x201 -/* A6EB9C 802407BC 8E420000 */ lw $v0, ($s2) -/* A6EBA0 802407C0 2403FFF7 */ addiu $v1, $zero, -9 -/* A6EBA4 802407C4 34420200 */ ori $v0, $v0, 0x200 -/* A6EBA8 802407C8 080901F7 */ j .L802407DC -/* A6EBAC 802407CC 00431024 */ and $v0, $v0, $v1 -.L802407D0: -/* A6EBB0 802407D0 8E420000 */ lw $v0, ($s2) -/* A6EBB4 802407D4 00431024 */ and $v0, $v0, $v1 -/* A6EBB8 802407D8 34420008 */ ori $v0, $v0, 8 -.L802407DC: -/* A6EBBC 802407DC AE420000 */ sw $v0, ($s2) -/* A6EBC0 802407E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A6EBC4 802407E4 30420004 */ andi $v0, $v0, 4 -/* A6EBC8 802407E8 1040001E */ beqz $v0, .L80240864 -/* A6EBCC 802407EC 24040002 */ addiu $a0, $zero, 2 -/* A6EBD0 802407F0 0240282D */ daddu $a1, $s2, $zero -/* A6EBD4 802407F4 0000302D */ daddu $a2, $zero, $zero -/* A6EBD8 802407F8 24020063 */ addiu $v0, $zero, 0x63 -/* A6EBDC 802407FC AE620070 */ sw $v0, 0x70($s3) -/* A6EBE0 80240800 AE600074 */ sw $zero, 0x74($s3) -/* A6EBE4 80240804 864300A8 */ lh $v1, 0xa8($s2) -/* A6EBE8 80240808 3C013F80 */ lui $at, 0x3f80 -/* A6EBEC 8024080C 44810000 */ mtc1 $at, $f0 -/* A6EBF0 80240810 3C014000 */ lui $at, 0x4000 -/* A6EBF4 80240814 44811000 */ mtc1 $at, $f2 -/* A6EBF8 80240818 3C01C1A0 */ lui $at, 0xc1a0 -/* A6EBFC 8024081C 44812000 */ mtc1 $at, $f4 -/* A6EC00 80240820 24020028 */ addiu $v0, $zero, 0x28 -/* A6EC04 80240824 AFA2001C */ sw $v0, 0x1c($sp) -/* A6EC08 80240828 44833000 */ mtc1 $v1, $f6 -/* A6EC0C 8024082C 00000000 */ nop -/* A6EC10 80240830 468031A0 */ cvt.s.w $f6, $f6 -/* A6EC14 80240834 44073000 */ mfc1 $a3, $f6 -/* A6EC18 80240838 27A20048 */ addiu $v0, $sp, 0x48 -/* A6EC1C 8024083C AFA20020 */ sw $v0, 0x20($sp) -/* A6EC20 80240840 E7A00010 */ swc1 $f0, 0x10($sp) -/* A6EC24 80240844 E7A20014 */ swc1 $f2, 0x14($sp) -/* A6EC28 80240848 0C01BFA4 */ jal fx_emote -/* A6EC2C 8024084C E7A40018 */ swc1 $f4, 0x18($sp) -/* A6EC30 80240850 8E2200B0 */ lw $v0, 0xb0($s1) -/* A6EC34 80240854 2403FFFB */ addiu $v1, $zero, -5 -/* A6EC38 80240858 00431024 */ and $v0, $v0, $v1 -/* A6EC3C 8024085C 08090224 */ j .L80240890 -/* A6EC40 80240860 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240864: -/* A6EC44 80240864 8E220000 */ lw $v0, ($s1) -/* A6EC48 80240868 3C034000 */ lui $v1, 0x4000 -/* A6EC4C 8024086C 00431024 */ and $v0, $v0, $v1 -/* A6EC50 80240870 10400007 */ beqz $v0, .L80240890 -/* A6EC54 80240874 3C03BFFF */ lui $v1, 0xbfff -/* A6EC58 80240878 2402000C */ addiu $v0, $zero, 0xc -/* A6EC5C 8024087C AE620070 */ sw $v0, 0x70($s3) -/* A6EC60 80240880 8E220000 */ lw $v0, ($s1) -/* A6EC64 80240884 3463FFFF */ ori $v1, $v1, 0xffff -/* A6EC68 80240888 00431024 */ and $v0, $v0, $v1 -/* A6EC6C 8024088C AE220000 */ sw $v0, ($s1) -.L80240890: -/* A6EC70 80240890 8E220090 */ lw $v0, 0x90($s1) -/* A6EC74 80240894 1840000C */ blez $v0, .L802408C8 -/* A6EC78 80240898 2442FFFF */ addiu $v0, $v0, -1 -/* A6EC7C 8024089C 14400087 */ bnez $v0, .L80240ABC -/* A6EC80 802408A0 AE220090 */ sw $v0, 0x90($s1) -/* A6EC84 802408A4 3C03FFAA */ lui $v1, 0xffaa -/* A6EC88 802408A8 8E420028 */ lw $v0, 0x28($s2) -/* A6EC8C 802408AC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A6EC90 802408B0 00431021 */ addu $v0, $v0, $v1 -/* A6EC94 802408B4 2C420002 */ sltiu $v0, $v0, 2 -/* A6EC98 802408B8 10400003 */ beqz $v0, .L802408C8 -/* A6EC9C 802408BC 3C020055 */ lui $v0, 0x55 -/* A6ECA0 802408C0 3442000C */ ori $v0, $v0, 0xc -/* A6ECA4 802408C4 AE420028 */ sw $v0, 0x28($s2) -.L802408C8: -/* A6ECA8 802408C8 8E630070 */ lw $v1, 0x70($s3) -/* A6ECAC 802408CC 2402000C */ addiu $v0, $zero, 0xc -/* A6ECB0 802408D0 10620048 */ beq $v1, $v0, .L802409F4 -/* A6ECB4 802408D4 2862000D */ slti $v0, $v1, 0xd -/* A6ECB8 802408D8 1040000F */ beqz $v0, .L80240918 -/* A6ECBC 802408DC 24100001 */ addiu $s0, $zero, 1 -/* A6ECC0 802408E0 1070001E */ beq $v1, $s0, .L8024095C -/* A6ECC4 802408E4 28620002 */ slti $v0, $v1, 2 -/* A6ECC8 802408E8 10400005 */ beqz $v0, .L80240900 -/* A6ECCC 802408EC 24020002 */ addiu $v0, $zero, 2 -/* A6ECD0 802408F0 10600015 */ beqz $v1, .L80240948 -/* A6ECD4 802408F4 0260202D */ daddu $a0, $s3, $zero -/* A6ECD8 802408F8 08090294 */ j .L80240A50 -/* A6ECDC 802408FC 00000000 */ nop -.L80240900: -/* A6ECE0 80240900 1062001C */ beq $v1, $v0, .L80240974 -/* A6ECE4 80240904 24020003 */ addiu $v0, $zero, 3 -/* A6ECE8 80240908 10620035 */ beq $v1, $v0, .L802409E0 -/* A6ECEC 8024090C 0260202D */ daddu $a0, $s3, $zero -/* A6ECF0 80240910 08090294 */ j .L80240A50 -/* A6ECF4 80240914 00000000 */ nop -.L80240918: -/* A6ECF8 80240918 2402000E */ addiu $v0, $zero, 0xe -/* A6ECFC 8024091C 1062003F */ beq $v1, $v0, .L80240A1C -/* A6ED00 80240920 0062102A */ slt $v0, $v1, $v0 -/* A6ED04 80240924 14400038 */ bnez $v0, .L80240A08 -/* A6ED08 80240928 0260202D */ daddu $a0, $s3, $zero -/* A6ED0C 8024092C 2402000F */ addiu $v0, $zero, 0xf -/* A6ED10 80240930 10620040 */ beq $v1, $v0, .L80240A34 -/* A6ED14 80240934 24020063 */ addiu $v0, $zero, 0x63 -/* A6ED18 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* A6ED1C 8024093C 00000000 */ nop -/* A6ED20 80240940 08090294 */ j .L80240A50 -/* A6ED24 80240944 00000000 */ nop -.L80240948: -/* A6ED28 80240948 0280282D */ daddu $a1, $s4, $zero -/* A6ED2C 8024094C 0C012568 */ jal func_800495A0 -/* A6ED30 80240950 02A0302D */ daddu $a2, $s5, $zero -/* A6ED34 80240954 96220086 */ lhu $v0, 0x86($s1) -/* A6ED38 80240958 A64200A8 */ sh $v0, 0xa8($s2) -.L8024095C: -/* A6ED3C 8024095C 0260202D */ daddu $a0, $s3, $zero -/* A6ED40 80240960 0280282D */ daddu $a1, $s4, $zero -/* A6ED44 80240964 0C0125AE */ jal func_800496B8 -/* A6ED48 80240968 02A0302D */ daddu $a2, $s5, $zero -/* A6ED4C 8024096C 08090294 */ j .L80240A50 -/* A6ED50 80240970 00000000 */ nop -.L80240974: -/* A6ED54 80240974 0260202D */ daddu $a0, $s3, $zero -/* A6ED58 80240978 0280282D */ daddu $a1, $s4, $zero -/* A6ED5C 8024097C 0C0126D1 */ jal func_80049B44 -/* A6ED60 80240980 02A0302D */ daddu $a2, $s5, $zero -/* A6ED64 80240984 8E230088 */ lw $v1, 0x88($s1) -/* A6ED68 80240988 24020006 */ addiu $v0, $zero, 6 -/* A6ED6C 8024098C 14620014 */ bne $v1, $v0, .L802409E0 -/* A6ED70 80240990 0260202D */ daddu $a0, $s3, $zero -/* A6ED74 80240994 0C00A67F */ jal rand_int -/* A6ED78 80240998 24040064 */ addiu $a0, $zero, 0x64 -/* A6ED7C 8024099C 28420021 */ slti $v0, $v0, 0x21 -/* A6ED80 802409A0 5040000F */ beql $v0, $zero, .L802409E0 -/* A6ED84 802409A4 0260202D */ daddu $a0, $s3, $zero -/* A6ED88 802409A8 8E22008C */ lw $v0, 0x8c($s1) -/* A6ED8C 802409AC 10400005 */ beqz $v0, .L802409C4 -/* A6ED90 802409B0 3C020055 */ lui $v0, 0x55 -/* A6ED94 802409B4 3442002F */ ori $v0, $v0, 0x2f -/* A6ED98 802409B8 AE20008C */ sw $zero, 0x8c($s1) -/* A6ED9C 802409BC 08090274 */ j .L802409D0 -/* A6EDA0 802409C0 A22000B5 */ sb $zero, 0xb5($s1) -.L802409C4: -/* A6EDA4 802409C4 3442002E */ ori $v0, $v0, 0x2e -/* A6EDA8 802409C8 AE30008C */ sw $s0, 0x8c($s1) -/* A6EDAC 802409CC A23000B5 */ sb $s0, 0xb5($s1) -.L802409D0: -/* A6EDB0 802409D0 AE420028 */ sw $v0, 0x28($s2) -/* A6EDB4 802409D4 24020007 */ addiu $v0, $zero, 7 -/* A6EDB8 802409D8 080902AF */ j .L80240ABC -/* A6EDBC 802409DC AE220090 */ sw $v0, 0x90($s1) -.L802409E0: -/* A6EDC0 802409E0 0280282D */ daddu $a1, $s4, $zero -/* A6EDC4 802409E4 0C012701 */ jal func_80049C04 -/* A6EDC8 802409E8 02A0302D */ daddu $a2, $s5, $zero -/* A6EDCC 802409EC 08090294 */ j .L80240A50 -/* A6EDD0 802409F0 00000000 */ nop -.L802409F4: -/* A6EDD4 802409F4 0260202D */ daddu $a0, $s3, $zero -/* A6EDD8 802409F8 0280282D */ daddu $a1, $s4, $zero -/* A6EDDC 802409FC 0C0900C4 */ jal func_80240310 -/* A6EDE0 80240A00 02A0302D */ daddu $a2, $s5, $zero -/* A6EDE4 80240A04 0260202D */ daddu $a0, $s3, $zero -.L80240A08: -/* A6EDE8 80240A08 0280282D */ daddu $a1, $s4, $zero -/* A6EDEC 80240A0C 0C0900E3 */ jal func_8024038C -/* A6EDF0 80240A10 02A0302D */ daddu $a2, $s5, $zero -/* A6EDF4 80240A14 08090294 */ j .L80240A50 -/* A6EDF8 80240A18 00000000 */ nop -.L80240A1C: -/* A6EDFC 80240A1C 0260202D */ daddu $a0, $s3, $zero -/* A6EE00 80240A20 0280282D */ daddu $a1, $s4, $zero -/* A6EE04 80240A24 0C090130 */ jal func_802404C0 -/* A6EE08 80240A28 02A0302D */ daddu $a2, $s5, $zero -/* A6EE0C 80240A2C 08090294 */ j .L80240A50 -/* A6EE10 80240A30 00000000 */ nop -.L80240A34: -/* A6EE14 80240A34 0280282D */ daddu $a1, $s4, $zero -/* A6EE18 80240A38 0C090189 */ jal func_80240624 -/* A6EE1C 80240A3C 02A0302D */ daddu $a2, $s5, $zero -/* A6EE20 80240A40 08090294 */ j .L80240A50 -/* A6EE24 80240A44 00000000 */ nop -.L80240A48: -/* A6EE28 80240A48 0C0129CF */ jal func_8004A73C -/* A6EE2C 80240A4C 0260202D */ daddu $a0, $s3, $zero -.L80240A50: -/* A6EE30 80240A50 8E230088 */ lw $v1, 0x88($s1) -/* A6EE34 80240A54 24020006 */ addiu $v0, $zero, 6 -/* A6EE38 80240A58 14620019 */ bne $v1, $v0, .L80240AC0 -/* A6EE3C 80240A5C 0000102D */ daddu $v0, $zero, $zero -/* A6EE40 80240A60 8E22008C */ lw $v0, 0x8c($s1) -/* A6EE44 80240A64 10400003 */ beqz $v0, .L80240A74 -/* A6EE48 80240A68 24020001 */ addiu $v0, $zero, 1 -/* A6EE4C 80240A6C 0809029E */ j .L80240A78 -/* A6EE50 80240A70 A22200B5 */ sb $v0, 0xb5($s1) -.L80240A74: -/* A6EE54 80240A74 A22000B5 */ sb $zero, 0xb5($s1) -.L80240A78: -/* A6EE58 80240A78 8E22008C */ lw $v0, 0x8c($s1) -/* A6EE5C 80240A7C 1040000F */ beqz $v0, .L80240ABC -/* A6EE60 80240A80 3C03FFAA */ lui $v1, 0xffaa -/* A6EE64 80240A84 8E420028 */ lw $v0, 0x28($s2) -/* A6EE68 80240A88 3463FFFC */ ori $v1, $v1, 0xfffc -/* A6EE6C 80240A8C 00431821 */ addu $v1, $v0, $v1 -/* A6EE70 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 -/* A6EE74 80240A94 10400009 */ beqz $v0, .L80240ABC -/* A6EE78 80240A98 00031080 */ sll $v0, $v1, 2 -/* A6EE7C 80240A9C 3C018024 */ lui $at, 0x8024 -/* A6EE80 80240AA0 00220821 */ addu $at, $at, $v0 -/* A6EE84 80240AA4 8C223CD8 */ lw $v0, 0x3cd8($at) -/* A6EE88 80240AA8 00400008 */ jr $v0 -/* A6EE8C 80240AAC 00000000 */ nop -/* A6EE90 80240AB0 8E420028 */ lw $v0, 0x28($s2) -/* A6EE94 80240AB4 24420001 */ addiu $v0, $v0, 1 -/* A6EE98 80240AB8 AE420028 */ sw $v0, 0x28($s2) -.L80240ABC: -/* A6EE9C 80240ABC 0000102D */ daddu $v0, $zero, $zero -.L80240AC0: -/* A6EEA0 80240AC0 8FBF0068 */ lw $ra, 0x68($sp) -/* A6EEA4 80240AC4 8FB50064 */ lw $s5, 0x64($sp) -/* A6EEA8 80240AC8 8FB40060 */ lw $s4, 0x60($sp) -/* A6EEAC 80240ACC 8FB3005C */ lw $s3, 0x5c($sp) -/* A6EEB0 80240AD0 8FB20058 */ lw $s2, 0x58($sp) -/* A6EEB4 80240AD4 8FB10054 */ lw $s1, 0x54($sp) -/* A6EEB8 80240AD8 8FB00050 */ lw $s0, 0x50($sp) -/* A6EEBC 80240ADC 03E00008 */ jr $ra -/* A6EEC0 80240AE0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/func_80240AE4_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/func_80240AE4_A6E3E0.s deleted file mode 100644 index 43a152002c..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/func_80240AE4_A6E3E0.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AE4_A6EEC4 -/* A6EEC4 80240AE4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A6EEC8 80240AE8 AFB00018 */ sw $s0, 0x18($sp) -/* A6EECC 80240AEC AFBF0024 */ sw $ra, 0x24($sp) -/* A6EED0 80240AF0 AFB20020 */ sw $s2, 0x20($sp) -/* A6EED4 80240AF4 AFB1001C */ sw $s1, 0x1c($sp) -/* A6EED8 80240AF8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* A6EEDC 80240AFC F7B40028 */ sdc1 $f20, 0x28($sp) -/* A6EEE0 80240B00 8C920148 */ lw $s2, 0x148($a0) -/* A6EEE4 80240B04 4485A000 */ mtc1 $a1, $f20 -/* A6EEE8 80240B08 86440008 */ lh $a0, 8($s2) -/* A6EEEC 80240B0C 4486B000 */ mtc1 $a2, $f22 -/* A6EEF0 80240B10 0C00EABB */ jal get_npc_unsafe -/* A6EEF4 80240B14 00E0802D */ daddu $s0, $a3, $zero -/* A6EEF8 80240B18 0200202D */ daddu $a0, $s0, $zero -/* A6EEFC 80240B1C 0040882D */ daddu $s1, $v0, $zero -/* A6EF00 80240B20 4406A000 */ mfc1 $a2, $f20 -/* A6EF04 80240B24 4407B000 */ mfc1 $a3, $f22 -/* A6EF08 80240B28 3C03800A */ lui $v1, 0x800a -/* A6EF0C 80240B2C 8463A634 */ lh $v1, -0x59cc($v1) -/* A6EF10 80240B30 3C05800B */ lui $a1, %hi(gCameras) -/* A6EF14 80240B34 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A6EF18 80240B38 AFA00010 */ sw $zero, 0x10($sp) -/* A6EF1C 80240B3C 00031080 */ sll $v0, $v1, 2 -/* A6EF20 80240B40 00431021 */ addu $v0, $v0, $v1 -/* A6EF24 80240B44 00021080 */ sll $v0, $v0, 2 -/* A6EF28 80240B48 00431023 */ subu $v0, $v0, $v1 -/* A6EF2C 80240B4C 000218C0 */ sll $v1, $v0, 3 -/* A6EF30 80240B50 00431021 */ addu $v0, $v0, $v1 -/* A6EF34 80240B54 000210C0 */ sll $v0, $v0, 3 -/* A6EF38 80240B58 00458021 */ addu $s0, $v0, $a1 -/* A6EF3C 80240B5C 0C01242D */ jal func_800490B4 -/* A6EF40 80240B60 0240282D */ daddu $a1, $s2, $zero -/* A6EF44 80240B64 1040004B */ beqz $v0, .L80240C94 -/* A6EF48 80240B68 2402FFFF */ addiu $v0, $zero, -1 -/* A6EF4C 80240B6C C60C006C */ lwc1 $f12, 0x6c($s0) -/* A6EF50 80240B70 C62E000C */ lwc1 $f14, 0xc($s1) -/* A6EF54 80240B74 3C014387 */ lui $at, 0x4387 -/* A6EF58 80240B78 4481A000 */ mtc1 $at, $f20 -/* A6EF5C 80240B7C 0C00A70A */ jal get_clamped_angle_diff -/* A6EF60 80240B80 00000000 */ nop -/* A6EF64 80240B84 0C00A6C9 */ jal clamp_angle -/* A6EF68 80240B88 46000306 */ mov.s $f12, $f0 -/* A6EF6C 80240B8C 3C018024 */ lui $at, 0x8024 -/* A6EF70 80240B90 D4223D30 */ ldc1 $f2, 0x3d30($at) -/* A6EF74 80240B94 46000021 */ cvt.d.s $f0, $f0 -/* A6EF78 80240B98 4622003C */ c.lt.d $f0, $f2 -/* A6EF7C 80240B9C 00000000 */ nop -/* A6EF80 80240BA0 45000003 */ bc1f .L80240BB0 -/* A6EF84 80240BA4 00000000 */ nop -/* A6EF88 80240BA8 3C0142B4 */ lui $at, 0x42b4 -/* A6EF8C 80240BAC 4481A000 */ mtc1 $at, $f20 -.L80240BB0: -/* A6EF90 80240BB0 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* A6EF94 80240BB4 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* A6EF98 80240BB8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A6EF9C 80240BBC 8E020000 */ lw $v0, ($s0) -/* A6EFA0 80240BC0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A6EFA4 80240BC4 8C460028 */ lw $a2, 0x28($v0) -/* A6EFA8 80240BC8 0C00A720 */ jal atan2 -/* A6EFAC 80240BCC 8C470030 */ lw $a3, 0x30($v0) -/* A6EFB0 80240BD0 4600A306 */ mov.s $f12, $f20 -/* A6EFB4 80240BD4 0C00A70A */ jal get_clamped_angle_diff -/* A6EFB8 80240BD8 46000386 */ mov.s $f14, $f0 -/* A6EFBC 80240BDC 46000005 */ abs.s $f0, $f0 -/* A6EFC0 80240BE0 3C018024 */ lui $at, 0x8024 -/* A6EFC4 80240BE4 D4223D38 */ ldc1 $f2, 0x3d38($at) -/* A6EFC8 80240BE8 46000021 */ cvt.d.s $f0, $f0 -/* A6EFCC 80240BEC 4620103C */ c.lt.d $f2, $f0 -/* A6EFD0 80240BF0 00000000 */ nop -/* A6EFD4 80240BF4 45010027 */ bc1t .L80240C94 -/* A6EFD8 80240BF8 2402FFFF */ addiu $v0, $zero, -1 -/* A6EFDC 80240BFC 8E020000 */ lw $v0, ($s0) -/* A6EFE0 80240C00 C6200038 */ lwc1 $f0, 0x38($s1) -/* A6EFE4 80240C04 C4420028 */ lwc1 $f2, 0x28($v0) -/* A6EFE8 80240C08 44806000 */ mtc1 $zero, $f12 -/* A6EFEC 80240C0C 46020001 */ sub.s $f0, $f0, $f2 -/* A6EFF0 80240C10 C62E003C */ lwc1 $f14, 0x3c($s1) -/* A6EFF4 80240C14 8C47002C */ lw $a3, 0x2c($v0) -/* A6EFF8 80240C18 46000005 */ abs.s $f0, $f0 -/* A6EFFC 80240C1C 44060000 */ mfc1 $a2, $f0 -/* A6F000 80240C20 0C00A720 */ jal atan2 -/* A6F004 80240C24 00000000 */ nop -/* A6F008 80240C28 3C018024 */ lui $at, 0x8024 -/* A6F00C 80240C2C D4223D40 */ ldc1 $f2, 0x3d40($at) -/* A6F010 80240C30 46000021 */ cvt.d.s $f0, $f0 -/* A6F014 80240C34 46220001 */ sub.d $f0, $f0, $f2 -/* A6F018 80240C38 3C018024 */ lui $at, 0x8024 -/* A6F01C 80240C3C D4223D48 */ ldc1 $f2, 0x3d48($at) -/* A6F020 80240C40 46200020 */ cvt.s.d $f0, $f0 -/* A6F024 80240C44 46000005 */ abs.s $f0, $f0 -/* A6F028 80240C48 46000021 */ cvt.d.s $f0, $f0 -/* A6F02C 80240C4C 4620103C */ c.lt.d $f2, $f0 -/* A6F030 80240C50 00000000 */ nop -/* A6F034 80240C54 4501000F */ bc1t .L80240C94 -/* A6F038 80240C58 2402FFFF */ addiu $v0, $zero, -1 -/* A6F03C 80240C5C 3C038011 */ lui $v1, 0x8011 -/* A6F040 80240C60 8063EBB3 */ lb $v1, -0x144d($v1) -/* A6F044 80240C64 24020009 */ addiu $v0, $zero, 9 -/* A6F048 80240C68 10620009 */ beq $v1, $v0, .L80240C90 -/* A6F04C 80240C6C 24020007 */ addiu $v0, $zero, 7 -/* A6F050 80240C70 50620008 */ beql $v1, $v0, .L80240C94 -/* A6F054 80240C74 2402FFFF */ addiu $v0, $zero, -1 -/* A6F058 80240C78 86440008 */ lh $a0, 8($s2) -/* A6F05C 80240C7C 0C00FB3A */ jal get_enemy -/* A6F060 80240C80 24840001 */ addiu $a0, $a0, 1 -/* A6F064 80240C84 8C43006C */ lw $v1, 0x6c($v0) -/* A6F068 80240C88 10600002 */ beqz $v1, .L80240C94 -/* A6F06C 80240C8C 24020001 */ addiu $v0, $zero, 1 -.L80240C90: -/* A6F070 80240C90 2402FFFF */ addiu $v0, $zero, -1 -.L80240C94: -/* A6F074 80240C94 8FBF0024 */ lw $ra, 0x24($sp) -/* A6F078 80240C98 8FB20020 */ lw $s2, 0x20($sp) -/* A6F07C 80240C9C 8FB1001C */ lw $s1, 0x1c($sp) -/* A6F080 80240CA0 8FB00018 */ lw $s0, 0x18($sp) -/* A6F084 80240CA4 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A6F088 80240CA8 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A6F08C 80240CAC 03E00008 */ jr $ra -/* A6F090 80240CB0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/func_80240CB4_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/func_80240CB4_A6E3E0.s deleted file mode 100644 index 1282e34bcb..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/func_80240CB4_A6E3E0.s +++ /dev/null @@ -1,336 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CB4_A6F094 -/* A6F094 80240CB4 27BDFC78 */ addiu $sp, $sp, -0x388 -/* A6F098 80240CB8 AFB60378 */ sw $s6, 0x378($sp) -/* A6F09C 80240CBC 0080B02D */ daddu $s6, $a0, $zero -/* A6F0A0 80240CC0 AFBF037C */ sw $ra, 0x37c($sp) -/* A6F0A4 80240CC4 AFB50374 */ sw $s5, 0x374($sp) -/* A6F0A8 80240CC8 AFB40370 */ sw $s4, 0x370($sp) -/* A6F0AC 80240CCC AFB3036C */ sw $s3, 0x36c($sp) -/* A6F0B0 80240CD0 AFB20368 */ sw $s2, 0x368($sp) -/* A6F0B4 80240CD4 AFB10364 */ sw $s1, 0x364($sp) -/* A6F0B8 80240CD8 AFB00360 */ sw $s0, 0x360($sp) -/* A6F0BC 80240CDC F7B40380 */ sdc1 $f20, 0x380($sp) -/* A6F0C0 80240CE0 8ED20148 */ lw $s2, 0x148($s6) -/* A6F0C4 80240CE4 86440008 */ lh $a0, 8($s2) -/* A6F0C8 80240CE8 0C00EABB */ jal get_npc_unsafe -/* A6F0CC 80240CEC 00A0802D */ daddu $s0, $a1, $zero -/* A6F0D0 80240CF0 86440008 */ lh $a0, 8($s2) -/* A6F0D4 80240CF4 0040882D */ daddu $s1, $v0, $zero -/* A6F0D8 80240CF8 0C00FB3A */ jal get_enemy -/* A6F0DC 80240CFC 2484FFFF */ addiu $a0, $a0, -1 -/* A6F0E0 80240D00 84440008 */ lh $a0, 8($v0) -/* A6F0E4 80240D04 0C00EABB */ jal get_npc_unsafe -/* A6F0E8 80240D08 0000A82D */ daddu $s5, $zero, $zero -/* A6F0EC 80240D0C 27B30020 */ addiu $s3, $sp, 0x20 -/* A6F0F0 80240D10 16000005 */ bnez $s0, .L80240D28 -/* A6F0F4 80240D14 0040A02D */ daddu $s4, $v0, $zero -/* A6F0F8 80240D18 8E4200B0 */ lw $v0, 0xb0($s2) -/* A6F0FC 80240D1C 30420004 */ andi $v0, $v0, 4 -/* A6F100 80240D20 10400018 */ beqz $v0, .L80240D84 -/* A6F104 80240D24 00000000 */ nop -.L80240D28: -/* A6F108 80240D28 3C030024 */ lui $v1, 0x24 -/* A6F10C 80240D2C 34630102 */ ori $v1, $v1, 0x102 -/* A6F110 80240D30 3C041620 */ lui $a0, 0x1620 -/* A6F114 80240D34 AEC00070 */ sw $zero, 0x70($s6) -/* A6F118 80240D38 8E220000 */ lw $v0, ($s1) -/* A6F11C 80240D3C 34840040 */ ori $a0, $a0, 0x40 -/* A6F120 80240D40 A620008E */ sh $zero, 0x8e($s1) -/* A6F124 80240D44 00431025 */ or $v0, $v0, $v1 -/* A6F128 80240D48 AE220000 */ sw $v0, ($s1) -/* A6F12C 80240D4C 8E420000 */ lw $v0, ($s2) -/* A6F130 80240D50 3C013ECC */ lui $at, 0x3ecc -/* A6F134 80240D54 3421CCCD */ ori $at, $at, 0xcccd -/* A6F138 80240D58 44810000 */ mtc1 $at, $f0 -/* A6F13C 80240D5C 00441025 */ or $v0, $v0, $a0 -/* A6F140 80240D60 AE420000 */ sw $v0, ($s2) -/* A6F144 80240D64 E6200054 */ swc1 $f0, 0x54($s1) -/* A6F148 80240D68 E6200058 */ swc1 $f0, 0x58($s1) -/* A6F14C 80240D6C 8E4300B0 */ lw $v1, 0xb0($s2) -/* A6F150 80240D70 30620004 */ andi $v0, $v1, 4 -/* A6F154 80240D74 10400003 */ beqz $v0, .L80240D84 -/* A6F158 80240D78 2402FFFB */ addiu $v0, $zero, -5 -/* A6F15C 80240D7C 00621024 */ and $v0, $v1, $v0 -/* A6F160 80240D80 AE4200B0 */ sw $v0, 0xb0($s2) -.L80240D84: -/* A6F164 80240D84 8EC30070 */ lw $v1, 0x70($s6) -/* A6F168 80240D88 2C620005 */ sltiu $v0, $v1, 5 -/* A6F16C 80240D8C 10400101 */ beqz $v0, .L80241194 -/* A6F170 80240D90 00031080 */ sll $v0, $v1, 2 -/* A6F174 80240D94 3C018024 */ lui $at, 0x8024 -/* A6F178 80240D98 00220821 */ addu $at, $at, $v0 -/* A6F17C 80240D9C 8C223D50 */ lw $v0, 0x3d50($at) -/* A6F180 80240DA0 00400008 */ jr $v0 -/* A6F184 80240DA4 00000000 */ nop -/* A6F188 80240DA8 3C01C47A */ lui $at, 0xc47a -/* A6F18C 80240DAC 44810000 */ mtc1 $at, $f0 -/* A6F190 80240DB0 24020014 */ addiu $v0, $zero, 0x14 -/* A6F194 80240DB4 AE400078 */ sw $zero, 0x78($s2) -/* A6F198 80240DB8 A62200A6 */ sh $v0, 0xa6($s1) -/* A6F19C 80240DBC A62200A8 */ sh $v0, 0xa8($s1) -/* A6F1A0 80240DC0 24020001 */ addiu $v0, $zero, 1 -/* A6F1A4 80240DC4 AE200038 */ sw $zero, 0x38($s1) -/* A6F1A8 80240DC8 AE200040 */ sw $zero, 0x40($s1) -/* A6F1AC 80240DCC E620003C */ swc1 $f0, 0x3c($s1) -/* A6F1B0 80240DD0 AE40006C */ sw $zero, 0x6c($s2) -/* A6F1B4 80240DD4 AEC20070 */ sw $v0, 0x70($s6) -/* A6F1B8 80240DD8 8E50006C */ lw $s0, 0x6c($s2) -/* A6F1BC 80240DDC 24020001 */ addiu $v0, $zero, 1 -/* A6F1C0 80240DE0 160200EC */ bne $s0, $v0, .L80241194 -/* A6F1C4 80240DE4 24150002 */ addiu $s5, $zero, 2 -/* A6F1C8 80240DE8 AE55006C */ sw $s5, 0x6c($s2) -/* A6F1CC 80240DEC C6800038 */ lwc1 $f0, 0x38($s4) -/* A6F1D0 80240DF0 E6600038 */ swc1 $f0, 0x38($s3) -/* A6F1D4 80240DF4 C680003C */ lwc1 $f0, 0x3c($s4) -/* A6F1D8 80240DF8 E660003C */ swc1 $f0, 0x3c($s3) -/* A6F1DC 80240DFC C6800040 */ lwc1 $f0, 0x40($s4) -/* A6F1E0 80240E00 E6600040 */ swc1 $f0, 0x40($s3) -/* A6F1E4 80240E04 C6820034 */ lwc1 $f2, 0x34($s4) -/* A6F1E8 80240E08 3C014387 */ lui $at, 0x4387 -/* A6F1EC 80240E0C 44810000 */ mtc1 $at, $f0 -/* A6F1F0 80240E10 00000000 */ nop -/* A6F1F4 80240E14 46020001 */ sub.s $f0, $f0, $f2 -/* A6F1F8 80240E18 C6480074 */ lwc1 $f8, 0x74($s2) -/* A6F1FC 80240E1C 46804220 */ cvt.s.w $f8, $f8 -/* A6F200 80240E20 44054000 */ mfc1 $a1, $f8 -/* A6F204 80240E24 44060000 */ mfc1 $a2, $f0 -/* A6F208 80240E28 0C00EA95 */ jal npc_move_heading -/* A6F20C 80240E2C 0260202D */ daddu $a0, $s3, $zero -/* A6F210 80240E30 C6600038 */ lwc1 $f0, 0x38($s3) -/* A6F214 80240E34 E6200038 */ swc1 $f0, 0x38($s1) -/* A6F218 80240E38 C680003C */ lwc1 $f0, 0x3c($s4) -/* A6F21C 80240E3C C6420070 */ lwc1 $f2, 0x70($s2) -/* A6F220 80240E40 468010A0 */ cvt.s.w $f2, $f2 -/* A6F224 80240E44 46020000 */ add.s $f0, $f0, $f2 -/* A6F228 80240E48 3C014024 */ lui $at, 0x4024 -/* A6F22C 80240E4C 4481A800 */ mtc1 $at, $f21 -/* A6F230 80240E50 4480A000 */ mtc1 $zero, $f20 -/* A6F234 80240E54 E620003C */ swc1 $f0, 0x3c($s1) -/* A6F238 80240E58 C6600040 */ lwc1 $f0, 0x40($s3) -/* A6F23C 80240E5C E6200040 */ swc1 $f0, 0x40($s1) -/* A6F240 80240E60 A2500007 */ sb $s0, 7($s2) -/* A6F244 80240E64 C6200038 */ lwc1 $f0, 0x38($s1) -/* A6F248 80240E68 3C014066 */ lui $at, 0x4066 -/* A6F24C 80240E6C 34216666 */ ori $at, $at, 0x6666 -/* A6F250 80240E70 44811000 */ mtc1 $at, $f2 -/* A6F254 80240E74 4600020D */ trunc.w.s $f8, $f0 -/* A6F258 80240E78 44024000 */ mfc1 $v0, $f8 -/* A6F25C 80240E7C 00000000 */ nop -/* A6F260 80240E80 A6420010 */ sh $v0, 0x10($s2) -/* A6F264 80240E84 C620003C */ lwc1 $f0, 0x3c($s1) -/* A6F268 80240E88 3C13800F */ lui $s3, %hi(gPlayerStatusPtr) -/* A6F26C 80240E8C 26737B30 */ addiu $s3, $s3, %lo(gPlayerStatusPtr) -/* A6F270 80240E90 4600020D */ trunc.w.s $f8, $f0 -/* A6F274 80240E94 44024000 */ mfc1 $v0, $f8 -/* A6F278 80240E98 00000000 */ nop -/* A6F27C 80240E9C A6420012 */ sh $v0, 0x12($s2) -/* A6F280 80240EA0 C6200040 */ lwc1 $f0, 0x40($s1) -/* A6F284 80240EA4 8E630000 */ lw $v1, ($s3) -/* A6F288 80240EA8 4600020D */ trunc.w.s $f8, $f0 -/* A6F28C 80240EAC 44024000 */ mfc1 $v0, $f8 -/* A6F290 80240EB0 00000000 */ nop -/* A6F294 80240EB4 A6420014 */ sh $v0, 0x14($s2) -/* A6F298 80240EB8 E6220018 */ swc1 $f2, 0x18($s1) -/* A6F29C 80240EBC C460002C */ lwc1 $f0, 0x2c($v1) -/* A6F2A0 80240EC0 C6220038 */ lwc1 $f2, 0x38($s1) -/* A6F2A4 80240EC4 46000021 */ cvt.d.s $f0, $f0 -/* A6F2A8 80240EC8 46340000 */ add.d $f0, $f0, $f20 -/* A6F2AC 80240ECC C4640028 */ lwc1 $f4, 0x28($v1) -/* A6F2B0 80240ED0 44806000 */ mtc1 $zero, $f12 -/* A6F2B4 80240ED4 46041081 */ sub.s $f2, $f2, $f4 -/* A6F2B8 80240ED8 C62E003C */ lwc1 $f14, 0x3c($s1) -/* A6F2BC 80240EDC 46200020 */ cvt.s.d $f0, $f0 -/* A6F2C0 80240EE0 46001085 */ abs.s $f2, $f2 -/* A6F2C4 80240EE4 44070000 */ mfc1 $a3, $f0 -/* A6F2C8 80240EE8 44061000 */ mfc1 $a2, $f2 -/* A6F2CC 80240EEC 0C00A720 */ jal atan2 -/* A6F2D0 80240EF0 00000000 */ nop -/* A6F2D4 80240EF4 3C018024 */ lui $at, 0x8024 -/* A6F2D8 80240EF8 D4223D68 */ ldc1 $f2, 0x3d68($at) -/* A6F2DC 80240EFC 46000021 */ cvt.d.s $f0, $f0 -/* A6F2E0 80240F00 46220001 */ sub.d $f0, $f0, $f2 -/* A6F2E4 80240F04 46200020 */ cvt.s.d $f0, $f0 -/* A6F2E8 80240F08 4600020D */ trunc.w.s $f8, $f0 -/* A6F2EC 80240F0C 44044000 */ mfc1 $a0, $f8 -/* A6F2F0 80240F10 00000000 */ nop -/* A6F2F4 80240F14 00042400 */ sll $a0, $a0, 0x10 -/* A6F2F8 80240F18 0C00A4F5 */ jal cosine -/* A6F2FC 80240F1C 00042403 */ sra $a0, $a0, 0x10 -/* A6F300 80240F20 C6220018 */ lwc1 $f2, 0x18($s1) -/* A6F304 80240F24 46020002 */ mul.s $f0, $f0, $f2 -/* A6F308 80240F28 00000000 */ nop -/* A6F30C 80240F2C C62C0038 */ lwc1 $f12, 0x38($s1) -/* A6F310 80240F30 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A6F314 80240F34 8E620000 */ lw $v0, ($s3) -/* A6F318 80240F38 E620001C */ swc1 $f0, 0x1c($s1) -/* A6F31C 80240F3C 8C460028 */ lw $a2, 0x28($v0) -/* A6F320 80240F40 0C00A720 */ jal atan2 -/* A6F324 80240F44 8C470030 */ lw $a3, 0x30($v0) -/* A6F328 80240F48 8E620000 */ lw $v0, ($s3) -/* A6F32C 80240F4C E620000C */ swc1 $f0, 0xc($s1) -/* A6F330 80240F50 C440002C */ lwc1 $f0, 0x2c($v0) -/* A6F334 80240F54 46000021 */ cvt.d.s $f0, $f0 -/* A6F338 80240F58 46340000 */ add.d $f0, $f0, $f20 -/* A6F33C 80240F5C 46200020 */ cvt.s.d $f0, $f0 -/* A6F340 80240F60 E7A00010 */ swc1 $f0, 0x10($sp) -/* A6F344 80240F64 C4400030 */ lwc1 $f0, 0x30($v0) -/* A6F348 80240F68 E7A00014 */ swc1 $f0, 0x14($sp) -/* A6F34C 80240F6C C62C0038 */ lwc1 $f12, 0x38($s1) -/* A6F350 80240F70 C62E003C */ lwc1 $f14, 0x3c($s1) -/* A6F354 80240F74 8E260040 */ lw $a2, 0x40($s1) -/* A6F358 80240F78 0C00A7CB */ jal dist3D -/* A6F35C 80240F7C 8C470028 */ lw $a3, 0x28($v0) -/* A6F360 80240F80 C6220018 */ lwc1 $f2, 0x18($s1) -/* A6F364 80240F84 46020003 */ div.s $f0, $f0, $f2 -/* A6F368 80240F88 4600020D */ trunc.w.s $f8, $f0 -/* A6F36C 80240F8C 44104000 */ mfc1 $s0, $f8 -/* A6F370 80240F90 00000000 */ nop -/* A6F374 80240F94 5A000001 */ blezl $s0, .L80240F9C -/* A6F378 80240F98 24100001 */ addiu $s0, $zero, 1 -.L80240F9C: -/* A6F37C 80240F9C 8E620000 */ lw $v0, ($s3) -/* A6F380 80240FA0 C624003C */ lwc1 $f4, 0x3c($s1) -/* A6F384 80240FA4 3C014120 */ lui $at, 0x4120 -/* A6F388 80240FA8 44811000 */ mtc1 $at, $f2 -/* A6F38C 80240FAC C4400028 */ lwc1 $f0, 0x28($v0) -/* A6F390 80240FB0 E7A00010 */ swc1 $f0, 0x10($sp) -/* A6F394 80240FB4 C440002C */ lwc1 $f0, 0x2c($v0) -/* A6F398 80240FB8 46020000 */ add.s $f0, $f0, $f2 -/* A6F39C 80240FBC 3C014160 */ lui $at, 0x4160 -/* A6F3A0 80240FC0 44811000 */ mtc1 $at, $f2 -/* A6F3A4 80240FC4 00000000 */ nop -/* A6F3A8 80240FC8 46022100 */ add.s $f4, $f4, $f2 -/* A6F3AC 80240FCC 46020000 */ add.s $f0, $f0, $f2 -/* A6F3B0 80240FD0 44062000 */ mfc1 $a2, $f4 -/* A6F3B4 80240FD4 E7A00014 */ swc1 $f0, 0x14($sp) -/* A6F3B8 80240FD8 C4400030 */ lwc1 $f0, 0x30($v0) -/* A6F3BC 80240FDC AFB0001C */ sw $s0, 0x1c($sp) -/* A6F3C0 80240FE0 E7A00018 */ swc1 $f0, 0x18($sp) -/* A6F3C4 80240FE4 8E250038 */ lw $a1, 0x38($s1) -/* A6F3C8 80240FE8 8E270040 */ lw $a3, 0x40($s1) -/* A6F3CC 80240FEC 0C01BFD4 */ jal func_8006FF50 -/* A6F3D0 80240FF0 0000202D */ daddu $a0, $zero, $zero -/* A6F3D4 80240FF4 AE420078 */ sw $v0, 0x78($s2) -/* A6F3D8 80240FF8 A630008E */ sh $s0, 0x8e($s1) -/* A6F3DC 80240FFC 08090465 */ j .L80241194 -/* A6F3E0 80241000 AED50070 */ sw $s5, 0x70($s6) -/* A6F3E4 80241004 9622008E */ lhu $v0, 0x8e($s1) -/* A6F3E8 80241008 2442FFFF */ addiu $v0, $v0, -1 -/* A6F3EC 8024100C A622008E */ sh $v0, 0x8e($s1) -/* A6F3F0 80241010 00021400 */ sll $v0, $v0, 0x10 -/* A6F3F4 80241014 58400001 */ blezl $v0, .L8024101C -/* A6F3F8 80241018 24150014 */ addiu $s5, $zero, 0x14 -.L8024101C: -/* A6F3FC 8024101C 16A0000A */ bnez $s5, .L80241048 -/* A6F400 80241020 00000000 */ nop -/* A6F404 80241024 8E250018 */ lw $a1, 0x18($s1) -/* A6F408 80241028 8E26000C */ lw $a2, 0xc($s1) -/* A6F40C 8024102C 0C00EA95 */ jal npc_move_heading -/* A6F410 80241030 0220202D */ daddu $a0, $s1, $zero -/* A6F414 80241034 C620003C */ lwc1 $f0, 0x3c($s1) -/* A6F418 80241038 C622001C */ lwc1 $f2, 0x1c($s1) -/* A6F41C 8024103C 46020000 */ add.s $f0, $f0, $f2 -/* A6F420 80241040 08090465 */ j .L80241194 -/* A6F424 80241044 E620003C */ swc1 $f0, 0x3c($s1) -.L80241048: -/* A6F428 80241048 862200A8 */ lh $v0, 0xa8($s1) -/* A6F42C 8024104C 3C013FE0 */ lui $at, 0x3fe0 -/* A6F430 80241050 44810800 */ mtc1 $at, $f1 -/* A6F434 80241054 44800000 */ mtc1 $zero, $f0 -/* A6F438 80241058 44821000 */ mtc1 $v0, $f2 -/* A6F43C 8024105C 00000000 */ nop -/* A6F440 80241060 468010A1 */ cvt.d.w $f2, $f2 -/* A6F444 80241064 46201082 */ mul.d $f2, $f2, $f0 -/* A6F448 80241068 00000000 */ nop -/* A6F44C 8024106C C620003C */ lwc1 $f0, 0x3c($s1) -/* A6F450 80241070 AE20001C */ sw $zero, 0x1c($s1) -/* A6F454 80241074 46000021 */ cvt.d.s $f0, $f0 -/* A6F458 80241078 46220001 */ sub.d $f0, $f0, $f2 -/* A6F45C 8024107C AE200018 */ sw $zero, 0x18($s1) -/* A6F460 80241080 24020003 */ addiu $v0, $zero, 3 -/* A6F464 80241084 46200020 */ cvt.s.d $f0, $f0 -/* A6F468 80241088 E620003C */ swc1 $f0, 0x3c($s1) -/* A6F46C 8024108C AE42006C */ sw $v0, 0x6c($s2) -/* A6F470 80241090 24020004 */ addiu $v0, $zero, 4 -/* A6F474 80241094 A620008E */ sh $zero, 0x8e($s1) -/* A6F478 80241098 08090465 */ j .L80241194 -/* A6F47C 8024109C AEC20070 */ sw $v0, 0x70($s6) -/* A6F480 802410A0 9622008E */ lhu $v0, 0x8e($s1) -/* A6F484 802410A4 24420001 */ addiu $v0, $v0, 1 -/* A6F488 802410A8 A622008E */ sh $v0, 0x8e($s1) -/* A6F48C 802410AC 00021400 */ sll $v0, $v0, 0x10 -/* A6F490 802410B0 00021C03 */ sra $v1, $v0, 0x10 -/* A6F494 802410B4 28620007 */ slti $v0, $v1, 7 -/* A6F498 802410B8 10400027 */ beqz $v0, .L80241158 -/* A6F49C 802410BC 24020007 */ addiu $v0, $zero, 7 -/* A6F4A0 802410C0 8622008E */ lh $v0, 0x8e($s1) -/* A6F4A4 802410C4 3C01401C */ lui $at, 0x401c -/* A6F4A8 802410C8 44810800 */ mtc1 $at, $f1 -/* A6F4AC 802410CC 44800000 */ mtc1 $zero, $f0 -/* A6F4B0 802410D0 44822000 */ mtc1 $v0, $f4 -/* A6F4B4 802410D4 00000000 */ nop -/* A6F4B8 802410D8 46802120 */ cvt.s.w $f4, $f4 -/* A6F4BC 802410DC 46002121 */ cvt.d.s $f4, $f4 -/* A6F4C0 802410E0 46202102 */ mul.d $f4, $f4, $f0 -/* A6F4C4 802410E4 00000000 */ nop -/* A6F4C8 802410E8 44821000 */ mtc1 $v0, $f2 -/* A6F4CC 802410EC 00000000 */ nop -/* A6F4D0 802410F0 468010A0 */ cvt.s.w $f2, $f2 -/* A6F4D4 802410F4 460010A1 */ cvt.d.s $f2, $f2 -/* A6F4D8 802410F8 46201082 */ mul.d $f2, $f2, $f0 -/* A6F4DC 802410FC 00000000 */ nop -/* A6F4E0 80241100 C620003C */ lwc1 $f0, 0x3c($s1) -/* A6F4E4 80241104 3C01400C */ lui $at, 0x400c -/* A6F4E8 80241108 44813800 */ mtc1 $at, $f7 -/* A6F4EC 8024110C 44803000 */ mtc1 $zero, $f6 -/* A6F4F0 80241110 46000021 */ cvt.d.s $f0, $f0 -/* A6F4F4 80241114 46260001 */ sub.d $f0, $f0, $f6 -/* A6F4F8 80241118 3C014034 */ lui $at, 0x4034 -/* A6F4FC 8024111C 44813800 */ mtc1 $at, $f7 -/* A6F500 80241120 44803000 */ mtc1 $zero, $f6 -/* A6F504 80241124 00000000 */ nop -/* A6F508 80241128 46262100 */ add.d $f4, $f4, $f6 -/* A6F50C 8024112C 46200020 */ cvt.s.d $f0, $f0 -/* A6F510 80241130 E620003C */ swc1 $f0, 0x3c($s1) -/* A6F514 80241134 46261080 */ add.d $f2, $f2, $f6 -/* A6F518 80241138 4620220D */ trunc.w.d $f8, $f4 -/* A6F51C 8024113C 44024000 */ mfc1 $v0, $f8 -/* A6F520 80241140 00000000 */ nop -/* A6F524 80241144 A62200A6 */ sh $v0, 0xa6($s1) -/* A6F528 80241148 4620120D */ trunc.w.d $f8, $f2 -/* A6F52C 8024114C 44024000 */ mfc1 $v0, $f8 -/* A6F530 80241150 08090465 */ j .L80241194 -/* A6F534 80241154 A62200A8 */ sh $v0, 0xa8($s1) -.L80241158: -/* A6F538 80241158 1462000A */ bne $v1, $v0, .L80241184 -/* A6F53C 8024115C 28620010 */ slti $v0, $v1, 0x10 -/* A6F540 80241160 3C01C47A */ lui $at, 0xc47a -/* A6F544 80241164 44810000 */ mtc1 $at, $f0 -/* A6F548 80241168 24020014 */ addiu $v0, $zero, 0x14 -/* A6F54C 8024116C AE200038 */ sw $zero, 0x38($s1) -/* A6F550 80241170 AE200040 */ sw $zero, 0x40($s1) -/* A6F554 80241174 A62200A6 */ sh $v0, 0xa6($s1) -/* A6F558 80241178 A62200A8 */ sh $v0, 0xa8($s1) -/* A6F55C 8024117C 08090465 */ j .L80241194 -/* A6F560 80241180 E620003C */ swc1 $f0, 0x3c($s1) -.L80241184: -/* A6F564 80241184 14400003 */ bnez $v0, .L80241194 -/* A6F568 80241188 00000000 */ nop -/* A6F56C 8024118C AE40006C */ sw $zero, 0x6c($s2) -/* A6F570 80241190 AEC00070 */ sw $zero, 0x70($s6) -.L80241194: -/* A6F574 80241194 8FBF037C */ lw $ra, 0x37c($sp) -/* A6F578 80241198 8FB60378 */ lw $s6, 0x378($sp) -/* A6F57C 8024119C 8FB50374 */ lw $s5, 0x374($sp) -/* A6F580 802411A0 8FB40370 */ lw $s4, 0x370($sp) -/* A6F584 802411A4 8FB3036C */ lw $s3, 0x36c($sp) -/* A6F588 802411A8 8FB20368 */ lw $s2, 0x368($sp) -/* A6F58C 802411AC 8FB10364 */ lw $s1, 0x364($sp) -/* A6F590 802411B0 8FB00360 */ lw $s0, 0x360($sp) -/* A6F594 802411B4 D7B40380 */ ldc1 $f20, 0x380($sp) -/* A6F598 802411B8 0000102D */ daddu $v0, $zero, $zero -/* A6F59C 802411BC 03E00008 */ jr $ra -/* A6F5A0 802411C0 27BD0388 */ addiu $sp, $sp, 0x388 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/func_802411C4_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/func_802411C4_A6E3E0.s deleted file mode 100644 index 662cc6f4d6..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/func_802411C4_A6E3E0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411C4_A6F5A4 -/* A6F5A4 802411C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A6F5A8 802411C8 AFB00010 */ sw $s0, 0x10($sp) -/* A6F5AC 802411CC 0080802D */ daddu $s0, $a0, $zero -/* A6F5B0 802411D0 AFBF0014 */ sw $ra, 0x14($sp) -/* A6F5B4 802411D4 8E020148 */ lw $v0, 0x148($s0) -/* A6F5B8 802411D8 0C00EABB */ jal get_npc_unsafe -/* A6F5BC 802411DC 84440008 */ lh $a0, 8($v0) -/* A6F5C0 802411E0 2403001E */ addiu $v1, $zero, 0x1e -/* A6F5C4 802411E4 A443008E */ sh $v1, 0x8e($v0) -/* A6F5C8 802411E8 2402000B */ addiu $v0, $zero, 0xb -/* A6F5CC 802411EC AE020070 */ sw $v0, 0x70($s0) -/* A6F5D0 802411F0 8FBF0014 */ lw $ra, 0x14($sp) -/* A6F5D4 802411F4 8FB00010 */ lw $s0, 0x10($sp) -/* A6F5D8 802411F8 03E00008 */ jr $ra -/* A6F5DC 802411FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/func_80241200_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/func_80241200_A6E3E0.s deleted file mode 100644 index b61daa5072..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/func_80241200_A6E3E0.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241200_A6F5E0 -/* A6F5E0 80241200 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A6F5E4 80241204 AFB40040 */ sw $s4, 0x40($sp) -/* A6F5E8 80241208 0080A02D */ daddu $s4, $a0, $zero -/* A6F5EC 8024120C AFBF0044 */ sw $ra, 0x44($sp) -/* A6F5F0 80241210 AFB3003C */ sw $s3, 0x3c($sp) -/* A6F5F4 80241214 AFB20038 */ sw $s2, 0x38($sp) -/* A6F5F8 80241218 AFB10034 */ sw $s1, 0x34($sp) -/* A6F5FC 8024121C AFB00030 */ sw $s0, 0x30($sp) -/* A6F600 80241220 F7B40048 */ sdc1 $f20, 0x48($sp) -/* A6F604 80241224 8E900148 */ lw $s0, 0x148($s4) -/* A6F608 80241228 00A0882D */ daddu $s1, $a1, $zero -/* A6F60C 8024122C 86040008 */ lh $a0, 8($s0) -/* A6F610 80241230 0C00EABB */ jal get_npc_unsafe -/* A6F614 80241234 00C0902D */ daddu $s2, $a2, $zero -/* A6F618 80241238 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A6F61C 8024123C 46806320 */ cvt.s.w $f12, $f12 -/* A6F620 80241240 0040982D */ daddu $s3, $v0, $zero -/* A6F624 80241244 C6140070 */ lwc1 $f20, 0x70($s0) -/* A6F628 80241248 4680A520 */ cvt.s.w $f20, $f20 -/* A6F62C 8024124C 3C014059 */ lui $at, 0x4059 -/* A6F630 80241250 44810800 */ mtc1 $at, $f1 -/* A6F634 80241254 44800000 */ mtc1 $zero, $f0 -/* A6F638 80241258 4600A521 */ cvt.d.s $f20, $f20 -/* A6F63C 8024125C 4620A503 */ div.d $f20, $f20, $f0 -/* A6F640 80241260 0C00A8BB */ jal sin_deg -/* A6F644 80241264 4620A520 */ cvt.s.d $f20, $f20 -/* A6F648 80241268 3C014018 */ lui $at, 0x4018 -/* A6F64C 8024126C 44811800 */ mtc1 $at, $f3 -/* A6F650 80241270 44801000 */ mtc1 $zero, $f2 -/* A6F654 80241274 46000021 */ cvt.d.s $f0, $f0 -/* A6F658 80241278 46220002 */ mul.d $f0, $f0, $f2 -/* A6F65C 8024127C 00000000 */ nop -/* A6F660 80241280 4600A0A1 */ cvt.d.s $f2, $f20 -/* A6F664 80241284 46201080 */ add.d $f2, $f2, $f0 -/* A6F668 80241288 462010A0 */ cvt.s.d $f2, $f2 -/* A6F66C 8024128C E662003C */ swc1 $f2, 0x3c($s3) -/* A6F670 80241290 8E02006C */ lw $v0, 0x6c($s0) -/* A6F674 80241294 2442000A */ addiu $v0, $v0, 0xa -/* A6F678 80241298 44826000 */ mtc1 $v0, $f12 -/* A6F67C 8024129C 00000000 */ nop -/* A6F680 802412A0 0C00A6C9 */ jal clamp_angle -/* A6F684 802412A4 46806320 */ cvt.s.w $f12, $f12 -/* A6F688 802412A8 4600018D */ trunc.w.s $f6, $f0 -/* A6F68C 802412AC E606006C */ swc1 $f6, 0x6c($s0) -/* A6F690 802412B0 0280202D */ daddu $a0, $s4, $zero -/* A6F694 802412B4 8E250024 */ lw $a1, 0x24($s1) -/* A6F698 802412B8 8E260028 */ lw $a2, 0x28($s1) -/* A6F69C 802412BC 0C0902B9 */ jal func_80240AE4 -/* A6F6A0 802412C0 0240382D */ daddu $a3, $s2, $zero -/* A6F6A4 802412C4 24030001 */ addiu $v1, $zero, 1 -/* A6F6A8 802412C8 1443001E */ bne $v0, $v1, .L80241344 -/* A6F6AC 802412CC 0000202D */ daddu $a0, $zero, $zero -/* A6F6B0 802412D0 0260282D */ daddu $a1, $s3, $zero -/* A6F6B4 802412D4 0000302D */ daddu $a2, $zero, $zero -/* A6F6B8 802412D8 866300A8 */ lh $v1, 0xa8($s3) -/* A6F6BC 802412DC 3C013F80 */ lui $at, 0x3f80 -/* A6F6C0 802412E0 44810000 */ mtc1 $at, $f0 -/* A6F6C4 802412E4 3C014000 */ lui $at, 0x4000 -/* A6F6C8 802412E8 44811000 */ mtc1 $at, $f2 -/* A6F6CC 802412EC 3C01C1A0 */ lui $at, 0xc1a0 -/* A6F6D0 802412F0 44812000 */ mtc1 $at, $f4 -/* A6F6D4 802412F4 2402000F */ addiu $v0, $zero, 0xf -/* A6F6D8 802412F8 AFA2001C */ sw $v0, 0x1c($sp) -/* A6F6DC 802412FC 44833000 */ mtc1 $v1, $f6 -/* A6F6E0 80241300 00000000 */ nop -/* A6F6E4 80241304 468031A0 */ cvt.s.w $f6, $f6 -/* A6F6E8 80241308 44073000 */ mfc1 $a3, $f6 -/* A6F6EC 8024130C 27A20028 */ addiu $v0, $sp, 0x28 -/* A6F6F0 80241310 AFA20020 */ sw $v0, 0x20($sp) -/* A6F6F4 80241314 E7A00010 */ swc1 $f0, 0x10($sp) -/* A6F6F8 80241318 E7A20014 */ swc1 $f2, 0x14($sp) -/* A6F6FC 8024131C 0C01BFA4 */ jal fx_emote -/* A6F700 80241320 E7A40018 */ swc1 $f4, 0x18($sp) -/* A6F704 80241324 0260202D */ daddu $a0, $s3, $zero -/* A6F708 80241328 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A6F70C 8024132C 0C012530 */ jal func_800494C0 -/* A6F710 80241330 3C060020 */ lui $a2, 0x20 -/* A6F714 80241334 24020032 */ addiu $v0, $zero, 0x32 -/* A6F718 80241338 A662008E */ sh $v0, 0x8e($s3) -/* A6F71C 8024133C 080904D9 */ j .L80241364 -/* A6F720 80241340 24020014 */ addiu $v0, $zero, 0x14 -.L80241344: -/* A6F724 80241344 9662008E */ lhu $v0, 0x8e($s3) -/* A6F728 80241348 2442FFFF */ addiu $v0, $v0, -1 -/* A6F72C 8024134C A662008E */ sh $v0, 0x8e($s3) -/* A6F730 80241350 00021400 */ sll $v0, $v0, 0x10 -/* A6F734 80241354 1C400004 */ bgtz $v0, .L80241368 -/* A6F738 80241358 24020005 */ addiu $v0, $zero, 5 -/* A6F73C 8024135C A662008E */ sh $v0, 0x8e($s3) -/* A6F740 80241360 2402000F */ addiu $v0, $zero, 0xf -.L80241364: -/* A6F744 80241364 AE820070 */ sw $v0, 0x70($s4) -.L80241368: -/* A6F748 80241368 8FBF0044 */ lw $ra, 0x44($sp) -/* A6F74C 8024136C 8FB40040 */ lw $s4, 0x40($sp) -/* A6F750 80241370 8FB3003C */ lw $s3, 0x3c($sp) -/* A6F754 80241374 8FB20038 */ lw $s2, 0x38($sp) -/* A6F758 80241378 8FB10034 */ lw $s1, 0x34($sp) -/* A6F75C 8024137C 8FB00030 */ lw $s0, 0x30($sp) -/* A6F760 80241380 D7B40048 */ ldc1 $f20, 0x48($sp) -/* A6F764 80241384 03E00008 */ jr $ra -/* A6F768 80241388 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/func_80241870_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/func_80241870_A6E3E0.s deleted file mode 100644 index ccbdfd5c8b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/func_80241870_A6E3E0.s +++ /dev/null @@ -1,154 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241870_A6FC50 -/* A6FC50 80241870 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A6FC54 80241874 AFB20020 */ sw $s2, 0x20($sp) -/* A6FC58 80241878 0080902D */ daddu $s2, $a0, $zero -/* A6FC5C 8024187C AFBF0024 */ sw $ra, 0x24($sp) -/* A6FC60 80241880 AFB1001C */ sw $s1, 0x1c($sp) -/* A6FC64 80241884 AFB00018 */ sw $s0, 0x18($sp) -/* A6FC68 80241888 F7B80038 */ sdc1 $f24, 0x38($sp) -/* A6FC6C 8024188C F7B60030 */ sdc1 $f22, 0x30($sp) -/* A6FC70 80241890 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A6FC74 80241894 8E510148 */ lw $s1, 0x148($s2) -/* A6FC78 80241898 0C00EABB */ jal get_npc_unsafe -/* A6FC7C 8024189C 86240008 */ lh $a0, 8($s1) -/* A6FC80 802418A0 2404000B */ addiu $a0, $zero, 0xb -/* A6FC84 802418A4 0040802D */ daddu $s0, $v0, $zero -/* A6FC88 802418A8 C620007C */ lwc1 $f0, 0x7c($s1) -/* A6FC8C 802418AC 46800020 */ cvt.s.w $f0, $f0 -/* A6FC90 802418B0 46000021 */ cvt.d.s $f0, $f0 -/* A6FC94 802418B4 C6360080 */ lwc1 $f22, 0x80($s1) -/* A6FC98 802418B8 4680B5A0 */ cvt.s.w $f22, $f22 -/* A6FC9C 802418BC C6340084 */ lwc1 $f20, 0x84($s1) -/* A6FCA0 802418C0 4680A520 */ cvt.s.w $f20, $f20 -/* A6FCA4 802418C4 4600B5A1 */ cvt.d.s $f22, $f22 -/* A6FCA8 802418C8 4600A521 */ cvt.d.s $f20, $f20 -/* A6FCAC 802418CC 3C014059 */ lui $at, 0x4059 -/* A6FCB0 802418D0 44811800 */ mtc1 $at, $f3 -/* A6FCB4 802418D4 44801000 */ mtc1 $zero, $f2 -/* A6FCB8 802418D8 8607008E */ lh $a3, 0x8e($s0) -/* A6FCBC 802418DC 8E220078 */ lw $v0, 0x78($s1) -/* A6FCC0 802418E0 46220003 */ div.d $f0, $f0, $f2 -/* A6FCC4 802418E4 46200020 */ cvt.s.d $f0, $f0 -/* A6FCC8 802418E8 44050000 */ mfc1 $a1, $f0 -/* A6FCCC 802418EC C6200070 */ lwc1 $f0, 0x70($s1) -/* A6FCD0 802418F0 46800020 */ cvt.s.w $f0, $f0 -/* A6FCD4 802418F4 46000021 */ cvt.d.s $f0, $f0 -/* A6FCD8 802418F8 46220003 */ div.d $f0, $f0, $f2 -/* A6FCDC 802418FC 46200620 */ cvt.s.d $f24, $f0 -/* A6FCE0 80241900 4622B583 */ div.d $f22, $f22, $f2 -/* A6FCE4 80241904 4620B5A0 */ cvt.s.d $f22, $f22 -/* A6FCE8 80241908 4622A503 */ div.d $f20, $f20, $f2 -/* A6FCEC 8024190C AFA20010 */ sw $v0, 0x10($sp) -/* A6FCF0 80241910 8E060060 */ lw $a2, 0x60($s0) -/* A6FCF4 80241914 0C00A8ED */ jal update_lerp -/* A6FCF8 80241918 4620A520 */ cvt.s.d $f20, $f20 -/* A6FCFC 8024191C 4405A000 */ mfc1 $a1, $f20 -/* A6FD00 80241920 8607008E */ lh $a3, 0x8e($s0) -/* A6FD04 80241924 8E220078 */ lw $v0, 0x78($s1) -/* A6FD08 80241928 2404000B */ addiu $a0, $zero, 0xb -/* A6FD0C 8024192C AFA20010 */ sw $v0, 0x10($sp) -/* A6FD10 80241930 8E060068 */ lw $a2, 0x68($s0) -/* A6FD14 80241934 0C00A8ED */ jal update_lerp -/* A6FD18 80241938 46000506 */ mov.s $f20, $f0 -/* A6FD1C 8024193C E6140038 */ swc1 $f20, 0x38($s0) -/* A6FD20 80241940 E6000040 */ swc1 $f0, 0x40($s0) -/* A6FD24 80241944 C6200078 */ lwc1 $f0, 0x78($s1) -/* A6FD28 80241948 46800020 */ cvt.s.w $f0, $f0 -/* A6FD2C 8024194C 46000021 */ cvt.d.s $f0, $f0 -/* A6FD30 80241950 8602008E */ lh $v0, 0x8e($s0) -/* A6FD34 80241954 3C018024 */ lui $at, 0x8024 -/* A6FD38 80241958 D4343D88 */ ldc1 $f20, 0x3d88($at) -/* A6FD3C 8024195C 44821000 */ mtc1 $v0, $f2 -/* A6FD40 80241960 00000000 */ nop -/* A6FD44 80241964 468010A1 */ cvt.d.w $f2, $f2 -/* A6FD48 80241968 4620A003 */ div.d $f0, $f20, $f0 -/* A6FD4C 8024196C 46201082 */ mul.d $f2, $f2, $f0 -/* A6FD50 80241970 00000000 */ nop -/* A6FD54 80241974 4620110D */ trunc.w.d $f4, $f2 -/* A6FD58 80241978 44022000 */ mfc1 $v0, $f4 -/* A6FD5C 8024197C 00000000 */ nop -/* A6FD60 80241980 244200B4 */ addiu $v0, $v0, 0xb4 -/* A6FD64 80241984 44826000 */ mtc1 $v0, $f12 -/* A6FD68 80241988 00000000 */ nop -/* A6FD6C 8024198C 0C00A8BB */ jal sin_deg -/* A6FD70 80241990 46806320 */ cvt.s.w $f12, $f12 -/* A6FD74 80241994 3C014039 */ lui $at, 0x4039 -/* A6FD78 80241998 44811800 */ mtc1 $at, $f3 -/* A6FD7C 8024199C 44801000 */ mtc1 $zero, $f2 -/* A6FD80 802419A0 46000021 */ cvt.d.s $f0, $f0 -/* A6FD84 802419A4 46220002 */ mul.d $f0, $f0, $f2 -/* A6FD88 802419A8 00000000 */ nop -/* A6FD8C 802419AC 9602008E */ lhu $v0, 0x8e($s0) -/* A6FD90 802419B0 4600B0A1 */ cvt.d.s $f2, $f22 -/* A6FD94 802419B4 24420001 */ addiu $v0, $v0, 1 -/* A6FD98 802419B8 46201080 */ add.d $f2, $f2, $f0 -/* A6FD9C 802419BC A602008E */ sh $v0, 0x8e($s0) -/* A6FDA0 802419C0 00021400 */ sll $v0, $v0, 0x10 -/* A6FDA4 802419C4 462010A0 */ cvt.s.d $f2, $f2 -/* A6FDA8 802419C8 E602003C */ swc1 $f2, 0x3c($s0) -/* A6FDAC 802419CC 8E230078 */ lw $v1, 0x78($s1) -/* A6FDB0 802419D0 00021403 */ sra $v0, $v0, 0x10 -/* A6FDB4 802419D4 2463FFF8 */ addiu $v1, $v1, -8 -/* A6FDB8 802419D8 14430009 */ bne $v0, $v1, .L80241A00 -/* A6FDBC 802419DC 00000000 */ nop -/* A6FDC0 802419E0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A6FDC4 802419E4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A6FDC8 802419E8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A6FDCC 802419EC C60E0040 */ lwc1 $f14, 0x40($s0) -/* A6FDD0 802419F0 8C460028 */ lw $a2, 0x28($v0) -/* A6FDD4 802419F4 0C00A720 */ jal atan2 -/* A6FDD8 802419F8 8C470030 */ lw $a3, 0x30($v0) -/* A6FDDC 802419FC E600000C */ swc1 $f0, 0xc($s0) -.L80241A00: -/* A6FDE0 80241A00 C600003C */ lwc1 $f0, 0x3c($s0) -/* A6FDE4 80241A04 4600C03E */ c.le.s $f24, $f0 -/* A6FDE8 80241A08 00000000 */ nop -/* A6FDEC 80241A0C 45000004 */ bc1f .L80241A20 -/* A6FDF0 80241A10 2402000A */ addiu $v0, $zero, 0xa -/* A6FDF4 80241A14 E618003C */ swc1 $f24, 0x3c($s0) -/* A6FDF8 80241A18 080906A3 */ j .L80241A8C -/* A6FDFC 80241A1C AE20006C */ sw $zero, 0x6c($s1) -.L80241A20: -/* A6FE00 80241A20 8602008E */ lh $v0, 0x8e($s0) -/* A6FE04 80241A24 8E230078 */ lw $v1, 0x78($s1) -/* A6FE08 80241A28 0043102A */ slt $v0, $v0, $v1 -/* A6FE0C 80241A2C 14400018 */ bnez $v0, .L80241A90 -/* A6FE10 80241A30 00000000 */ nop -/* A6FE14 80241A34 8E23006C */ lw $v1, 0x6c($s1) -/* A6FE18 80241A38 44831000 */ mtc1 $v1, $f2 -/* A6FE1C 80241A3C 00000000 */ nop -/* A6FE20 80241A40 468010A1 */ cvt.d.w $f2, $f2 -/* A6FE24 80241A44 4622A03E */ c.le.d $f20, $f2 -/* A6FE28 80241A48 00000000 */ nop -/* A6FE2C 80241A4C 4500000F */ bc1f .L80241A8C -/* A6FE30 80241A50 2402000A */ addiu $v0, $zero, 0xa -/* A6FE34 80241A54 3C018024 */ lui $at, 0x8024 -/* A6FE38 80241A58 D4203D90 */ ldc1 $f0, 0x3d90($at) -/* A6FE3C 80241A5C 4620103C */ c.lt.d $f2, $f0 -/* A6FE40 80241A60 00000000 */ nop -/* A6FE44 80241A64 45000008 */ bc1f .L80241A88 -/* A6FE48 80241A68 2402021C */ addiu $v0, $zero, 0x21c -/* A6FE4C 80241A6C 00431023 */ subu $v0, $v0, $v1 -/* A6FE50 80241A70 44826000 */ mtc1 $v0, $f12 -/* A6FE54 80241A74 00000000 */ nop -/* A6FE58 80241A78 0C00A6C9 */ jal clamp_angle -/* A6FE5C 80241A7C 46806320 */ cvt.s.w $f12, $f12 -/* A6FE60 80241A80 4600010D */ trunc.w.s $f4, $f0 -/* A6FE64 80241A84 E624006C */ swc1 $f4, 0x6c($s1) -.L80241A88: -/* A6FE68 80241A88 2402000A */ addiu $v0, $zero, 0xa -.L80241A8C: -/* A6FE6C 80241A8C AE420070 */ sw $v0, 0x70($s2) -.L80241A90: -/* A6FE70 80241A90 8FBF0024 */ lw $ra, 0x24($sp) -/* A6FE74 80241A94 8FB20020 */ lw $s2, 0x20($sp) -/* A6FE78 80241A98 8FB1001C */ lw $s1, 0x1c($sp) -/* A6FE7C 80241A9C 8FB00018 */ lw $s0, 0x18($sp) -/* A6FE80 80241AA0 D7B80038 */ ldc1 $f24, 0x38($sp) -/* A6FE84 80241AA4 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A6FE88 80241AA8 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A6FE8C 80241AAC 03E00008 */ jr $ra -/* A6FE90 80241AB0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/func_80241AB4_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/func_80241AB4_A6E3E0.s deleted file mode 100644 index 6a18e901f8..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/func_80241AB4_A6E3E0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AB4_A6FE94 -/* A6FE94 80241AB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A6FE98 80241AB8 AFB00010 */ sw $s0, 0x10($sp) -/* A6FE9C 80241ABC 0080802D */ daddu $s0, $a0, $zero -/* A6FEA0 80241AC0 AFBF0014 */ sw $ra, 0x14($sp) -/* A6FEA4 80241AC4 8E020148 */ lw $v0, 0x148($s0) -/* A6FEA8 80241AC8 0C00EABB */ jal get_npc_unsafe -/* A6FEAC 80241ACC 84440008 */ lh $a0, 8($v0) -/* A6FEB0 80241AD0 24030028 */ addiu $v1, $zero, 0x28 -/* A6FEB4 80241AD4 A443008E */ sh $v1, 0x8e($v0) -/* A6FEB8 80241AD8 24020015 */ addiu $v0, $zero, 0x15 -/* A6FEBC 80241ADC AE020070 */ sw $v0, 0x70($s0) -/* A6FEC0 80241AE0 8FBF0014 */ lw $ra, 0x14($sp) -/* A6FEC4 80241AE4 8FB00010 */ lw $s0, 0x10($sp) -/* A6FEC8 80241AE8 03E00008 */ jr $ra -/* A6FECC 80241AEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/func_80241AF0_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/func_80241AF0_A6E3E0.s deleted file mode 100644 index dcbbf28d21..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/func_80241AF0_A6E3E0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AF0_A6FED0 -/* A6FED0 80241AF0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A6FED4 80241AF4 AFB40048 */ sw $s4, 0x48($sp) -/* A6FED8 80241AF8 0080A02D */ daddu $s4, $a0, $zero -/* A6FEDC 80241AFC AFBF004C */ sw $ra, 0x4c($sp) -/* A6FEE0 80241B00 AFB30044 */ sw $s3, 0x44($sp) -/* A6FEE4 80241B04 AFB20040 */ sw $s2, 0x40($sp) -/* A6FEE8 80241B08 AFB1003C */ sw $s1, 0x3c($sp) -/* A6FEEC 80241B0C AFB00038 */ sw $s0, 0x38($sp) -/* A6FEF0 80241B10 F7B40050 */ sdc1 $f20, 0x50($sp) -/* A6FEF4 80241B14 8E910148 */ lw $s1, 0x148($s4) -/* A6FEF8 80241B18 00A0902D */ daddu $s2, $a1, $zero -/* A6FEFC 80241B1C 86240008 */ lh $a0, 8($s1) -/* A6FF00 80241B20 0C00EABB */ jal get_npc_unsafe -/* A6FF04 80241B24 00C0982D */ daddu $s3, $a2, $zero -/* A6FF08 80241B28 0040802D */ daddu $s0, $v0, $zero -/* A6FF0C 80241B2C 9602008E */ lhu $v0, 0x8e($s0) -/* A6FF10 80241B30 2442FFFF */ addiu $v0, $v0, -1 -/* A6FF14 80241B34 A602008E */ sh $v0, 0x8e($s0) -/* A6FF18 80241B38 00021400 */ sll $v0, $v0, 0x10 -/* A6FF1C 80241B3C 14400021 */ bnez $v0, .L80241BC4 -/* A6FF20 80241B40 0280202D */ daddu $a0, $s4, $zero -/* A6FF24 80241B44 24040002 */ addiu $a0, $zero, 2 -/* A6FF28 80241B48 0200282D */ daddu $a1, $s0, $zero -/* A6FF2C 80241B4C 0000302D */ daddu $a2, $zero, $zero -/* A6FF30 80241B50 8E2200CC */ lw $v0, 0xcc($s1) -/* A6FF34 80241B54 3C013F80 */ lui $at, 0x3f80 -/* A6FF38 80241B58 44810000 */ mtc1 $at, $f0 -/* A6FF3C 80241B5C 3C014000 */ lui $at, 0x4000 -/* A6FF40 80241B60 44811000 */ mtc1 $at, $f2 -/* A6FF44 80241B64 8C430000 */ lw $v1, ($v0) -/* A6FF48 80241B68 860200A8 */ lh $v0, 0xa8($s0) -/* A6FF4C 80241B6C 3C01C1A0 */ lui $at, 0xc1a0 -/* A6FF50 80241B70 44812000 */ mtc1 $at, $f4 -/* A6FF54 80241B74 44824000 */ mtc1 $v0, $f8 -/* A6FF58 80241B78 00000000 */ nop -/* A6FF5C 80241B7C 46804220 */ cvt.s.w $f8, $f8 -/* A6FF60 80241B80 44074000 */ mfc1 $a3, $f8 -/* A6FF64 80241B84 2402000C */ addiu $v0, $zero, 0xc -/* A6FF68 80241B88 AE030028 */ sw $v1, 0x28($s0) -/* A6FF6C 80241B8C AFA2001C */ sw $v0, 0x1c($sp) -/* A6FF70 80241B90 27A20028 */ addiu $v0, $sp, 0x28 -/* A6FF74 80241B94 E7A00010 */ swc1 $f0, 0x10($sp) -/* A6FF78 80241B98 E7A20014 */ swc1 $f2, 0x14($sp) -/* A6FF7C 80241B9C E7A40018 */ swc1 $f4, 0x18($sp) -/* A6FF80 80241BA0 0C01BFA4 */ jal fx_emote -/* A6FF84 80241BA4 AFA20020 */ sw $v0, 0x20($sp) -/* A6FF88 80241BA8 8E2200CC */ lw $v0, 0xcc($s1) -/* A6FF8C 80241BAC 8C430000 */ lw $v1, ($v0) -/* A6FF90 80241BB0 2402000F */ addiu $v0, $zero, 0xf -/* A6FF94 80241BB4 A602008E */ sh $v0, 0x8e($s0) -/* A6FF98 80241BB8 24020032 */ addiu $v0, $zero, 0x32 -/* A6FF9C 80241BBC 08090725 */ j .L80241C94 -/* A6FFA0 80241BC0 AE030028 */ sw $v1, 0x28($s0) -.L80241BC4: -/* A6FFA4 80241BC4 8E450024 */ lw $a1, 0x24($s2) -/* A6FFA8 80241BC8 8E460028 */ lw $a2, 0x28($s2) -/* A6FFAC 80241BCC 0C0902B9 */ jal func_80240AE4 -/* A6FFB0 80241BD0 0260382D */ daddu $a3, $s3, $zero -/* A6FFB4 80241BD4 24030001 */ addiu $v1, $zero, 1 -/* A6FFB8 80241BD8 1443002F */ bne $v0, $v1, .L80241C98 -/* A6FFBC 80241BDC 00000000 */ nop -/* A6FFC0 80241BE0 8602008C */ lh $v0, 0x8c($s0) -/* A6FFC4 80241BE4 1440002C */ bnez $v0, .L80241C98 -/* A6FFC8 80241BE8 0200202D */ daddu $a0, $s0, $zero -/* A6FFCC 80241BEC 240520D4 */ addiu $a1, $zero, 0x20d4 -/* A6FFD0 80241BF0 0C012530 */ jal func_800494C0 -/* A6FFD4 80241BF4 0000302D */ daddu $a2, $zero, $zero -/* A6FFD8 80241BF8 27A4002C */ addiu $a0, $sp, 0x2c -/* A6FFDC 80241BFC 27A50030 */ addiu $a1, $sp, 0x30 -/* A6FFE0 80241C00 3C0641F0 */ lui $a2, 0x41f0 -/* A6FFE4 80241C04 C6020034 */ lwc1 $f2, 0x34($s0) -/* A6FFE8 80241C08 3C014387 */ lui $at, 0x4387 -/* A6FFEC 80241C0C 44810000 */ mtc1 $at, $f0 -/* A6FFF0 80241C10 8E2200CC */ lw $v0, 0xcc($s1) -/* A6FFF4 80241C14 C614003C */ lwc1 $f20, 0x3c($s0) -/* A6FFF8 80241C18 46020001 */ sub.s $f0, $f0, $f2 -/* A6FFFC 80241C1C 3C0141E8 */ lui $at, 0x41e8 -/* A70000 80241C20 44812000 */ mtc1 $at, $f4 -/* A70004 80241C24 C6060038 */ lwc1 $f6, 0x38($s0) -/* A70008 80241C28 4604A500 */ add.s $f20, $f20, $f4 -/* A7000C 80241C2C 3C013F80 */ lui $at, 0x3f80 -/* A70010 80241C30 44811000 */ mtc1 $at, $f2 -/* A70014 80241C34 44070000 */ mfc1 $a3, $f0 -/* A70018 80241C38 C6000040 */ lwc1 $f0, 0x40($s0) -/* A7001C 80241C3C 8C420020 */ lw $v0, 0x20($v0) -/* A70020 80241C40 46020000 */ add.s $f0, $f0, $f2 -/* A70024 80241C44 E7A6002C */ swc1 $f6, 0x2c($sp) -/* A70028 80241C48 AE020028 */ sw $v0, 0x28($s0) -/* A7002C 80241C4C 0C00A7E7 */ jal add_vec2D_polar -/* A70030 80241C50 E7A00030 */ swc1 $f0, 0x30($sp) -/* A70034 80241C54 0000202D */ daddu $a0, $zero, $zero -/* A70038 80241C58 4406A000 */ mfc1 $a2, $f20 -/* A7003C 80241C5C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A70040 80241C60 C7A20030 */ lwc1 $f2, 0x30($sp) -/* A70044 80241C64 44050000 */ mfc1 $a1, $f0 -/* A70048 80241C68 44071000 */ mfc1 $a3, $f2 -/* A7004C 80241C6C 3C013DCC */ lui $at, 0x3dcc -/* A70050 80241C70 3421CCCD */ ori $at, $at, 0xcccd -/* A70054 80241C74 44810000 */ mtc1 $at, $f0 -/* A70058 80241C78 2402000D */ addiu $v0, $zero, 0xd -/* A7005C 80241C7C AFA20014 */ sw $v0, 0x14($sp) -/* A70060 80241C80 0C01BFEC */ jal func_8006FFB0 -/* A70064 80241C84 E7A00010 */ swc1 $f0, 0x10($sp) -/* A70068 80241C88 2402000F */ addiu $v0, $zero, 0xf -/* A7006C 80241C8C A602008E */ sh $v0, 0x8e($s0) -/* A70070 80241C90 24020016 */ addiu $v0, $zero, 0x16 -.L80241C94: -/* A70074 80241C94 AE820070 */ sw $v0, 0x70($s4) -.L80241C98: -/* A70078 80241C98 8FBF004C */ lw $ra, 0x4c($sp) -/* A7007C 80241C9C 8FB40048 */ lw $s4, 0x48($sp) -/* A70080 80241CA0 8FB30044 */ lw $s3, 0x44($sp) -/* A70084 80241CA4 8FB20040 */ lw $s2, 0x40($sp) -/* A70088 80241CA8 8FB1003C */ lw $s1, 0x3c($sp) -/* A7008C 80241CAC 8FB00038 */ lw $s0, 0x38($sp) -/* A70090 80241CB0 D7B40050 */ ldc1 $f20, 0x50($sp) -/* A70094 80241CB4 03E00008 */ jr $ra -/* A70098 80241CB8 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/func_80241CBC_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/func_80241CBC_A6E3E0.s deleted file mode 100644 index d156b7c39d..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/func_80241CBC_A6E3E0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CBC_A7009C -/* A7009C 80241CBC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A700A0 80241CC0 AFB10014 */ sw $s1, 0x14($sp) -/* A700A4 80241CC4 0080882D */ daddu $s1, $a0, $zero -/* A700A8 80241CC8 AFBF0018 */ sw $ra, 0x18($sp) -/* A700AC 80241CCC AFB00010 */ sw $s0, 0x10($sp) -/* A700B0 80241CD0 8E300148 */ lw $s0, 0x148($s1) -/* A700B4 80241CD4 0C00EABB */ jal get_npc_unsafe -/* A700B8 80241CD8 86040008 */ lh $a0, 8($s0) -/* A700BC 80241CDC 0040202D */ daddu $a0, $v0, $zero -/* A700C0 80241CE0 9482008E */ lhu $v0, 0x8e($a0) -/* A700C4 80241CE4 2442FFFF */ addiu $v0, $v0, -1 -/* A700C8 80241CE8 A482008E */ sh $v0, 0x8e($a0) -/* A700CC 80241CEC 00021400 */ sll $v0, $v0, 0x10 -/* A700D0 80241CF0 1C400008 */ bgtz $v0, .L80241D14 -/* A700D4 80241CF4 00000000 */ nop -/* A700D8 80241CF8 8E0200CC */ lw $v0, 0xcc($s0) -/* A700DC 80241CFC 8C430024 */ lw $v1, 0x24($v0) -/* A700E0 80241D00 24020007 */ addiu $v0, $zero, 7 -/* A700E4 80241D04 A482008E */ sh $v0, 0x8e($a0) -/* A700E8 80241D08 24020017 */ addiu $v0, $zero, 0x17 -/* A700EC 80241D0C AC830028 */ sw $v1, 0x28($a0) -/* A700F0 80241D10 AE220070 */ sw $v0, 0x70($s1) -.L80241D14: -/* A700F4 80241D14 8FBF0018 */ lw $ra, 0x18($sp) -/* A700F8 80241D18 8FB10014 */ lw $s1, 0x14($sp) -/* A700FC 80241D1C 8FB00010 */ lw $s0, 0x10($sp) -/* A70100 80241D20 03E00008 */ jr $ra -/* A70104 80241D24 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/func_80241E5C_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/func_80241E5C_A6E3E0.s deleted file mode 100644 index c694f0ef3d..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/func_80241E5C_A6E3E0.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E5C_A7023C -/* A7023C 80241E5C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A70240 80241E60 AFB20018 */ sw $s2, 0x18($sp) -/* A70244 80241E64 0080902D */ daddu $s2, $a0, $zero -/* A70248 80241E68 AFBF001C */ sw $ra, 0x1c($sp) -/* A7024C 80241E6C AFB10014 */ sw $s1, 0x14($sp) -/* A70250 80241E70 AFB00010 */ sw $s0, 0x10($sp) -/* A70254 80241E74 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A70258 80241E78 8E500148 */ lw $s0, 0x148($s2) -/* A7025C 80241E7C 0C00EABB */ jal get_npc_unsafe -/* A70260 80241E80 86040008 */ lh $a0, 8($s0) -/* A70264 80241E84 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A70268 80241E88 46806320 */ cvt.s.w $f12, $f12 -/* A7026C 80241E8C 0040882D */ daddu $s1, $v0, $zero -/* A70270 80241E90 C6140070 */ lwc1 $f20, 0x70($s0) -/* A70274 80241E94 4680A520 */ cvt.s.w $f20, $f20 -/* A70278 80241E98 3C014059 */ lui $at, 0x4059 -/* A7027C 80241E9C 44810800 */ mtc1 $at, $f1 -/* A70280 80241EA0 44800000 */ mtc1 $zero, $f0 -/* A70284 80241EA4 4600A521 */ cvt.d.s $f20, $f20 -/* A70288 80241EA8 4620A503 */ div.d $f20, $f20, $f0 -/* A7028C 80241EAC 0C00A8BB */ jal sin_deg -/* A70290 80241EB0 4620A520 */ cvt.s.d $f20, $f20 -/* A70294 80241EB4 3C014018 */ lui $at, 0x4018 -/* A70298 80241EB8 44811800 */ mtc1 $at, $f3 -/* A7029C 80241EBC 44801000 */ mtc1 $zero, $f2 -/* A702A0 80241EC0 46000021 */ cvt.d.s $f0, $f0 -/* A702A4 80241EC4 46220002 */ mul.d $f0, $f0, $f2 -/* A702A8 80241EC8 00000000 */ nop -/* A702AC 80241ECC 4600A0A1 */ cvt.d.s $f2, $f20 -/* A702B0 80241ED0 46201080 */ add.d $f2, $f2, $f0 -/* A702B4 80241ED4 462010A0 */ cvt.s.d $f2, $f2 -/* A702B8 80241ED8 E622003C */ swc1 $f2, 0x3c($s1) -/* A702BC 80241EDC 8E02006C */ lw $v0, 0x6c($s0) -/* A702C0 80241EE0 2442000A */ addiu $v0, $v0, 0xa -/* A702C4 80241EE4 44826000 */ mtc1 $v0, $f12 -/* A702C8 80241EE8 00000000 */ nop -/* A702CC 80241EEC 0C00A6C9 */ jal clamp_angle -/* A702D0 80241EF0 46806320 */ cvt.s.w $f12, $f12 -/* A702D4 80241EF4 4600010D */ trunc.w.s $f4, $f0 -/* A702D8 80241EF8 E604006C */ swc1 $f4, 0x6c($s0) -/* A702DC 80241EFC 9622008E */ lhu $v0, 0x8e($s1) -/* A702E0 80241F00 2442FFFF */ addiu $v0, $v0, -1 -/* A702E4 80241F04 A622008E */ sh $v0, 0x8e($s1) -/* A702E8 80241F08 00021400 */ sll $v0, $v0, 0x10 -/* A702EC 80241F0C 1C400008 */ bgtz $v0, .L80241F30 -/* A702F0 80241F10 00000000 */ nop -/* A702F4 80241F14 8E0200CC */ lw $v0, 0xcc($s0) -/* A702F8 80241F18 8C430000 */ lw $v1, ($v0) -/* A702FC 80241F1C 24020003 */ addiu $v0, $zero, 3 -/* A70300 80241F20 A622008E */ sh $v0, 0x8e($s1) -/* A70304 80241F24 24020032 */ addiu $v0, $zero, 0x32 -/* A70308 80241F28 AE230028 */ sw $v1, 0x28($s1) -/* A7030C 80241F2C AE420070 */ sw $v0, 0x70($s2) -.L80241F30: -/* A70310 80241F30 8FBF001C */ lw $ra, 0x1c($sp) -/* A70314 80241F34 8FB20018 */ lw $s2, 0x18($sp) -/* A70318 80241F38 8FB10014 */ lw $s1, 0x14($sp) -/* A7031C 80241F3C 8FB00010 */ lw $s0, 0x10($sp) -/* A70320 80241F40 D7B40020 */ ldc1 $f20, 0x20($sp) -/* A70324 80241F44 03E00008 */ jr $ra -/* A70328 80241F48 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/func_802422F0_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/func_802422F0_A6E3E0.s deleted file mode 100644 index cb376faa52..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/func_802422F0_A6E3E0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422F0_A706D0 -/* A706D0 802422F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A706D4 802422F4 AFBF0014 */ sw $ra, 0x14($sp) -/* A706D8 802422F8 AFB00010 */ sw $s0, 0x10($sp) -/* A706DC 802422FC 8C900148 */ lw $s0, 0x148($a0) -/* A706E0 80242300 0C00EABB */ jal get_npc_unsafe -/* A706E4 80242304 86040008 */ lh $a0, 8($s0) -/* A706E8 80242308 0040202D */ daddu $a0, $v0, $zero -/* A706EC 8024230C 8E03006C */ lw $v1, 0x6c($s0) -/* A706F0 80242310 24020002 */ addiu $v0, $zero, 2 -/* A706F4 80242314 14620003 */ bne $v1, $v0, .L80242324 -/* A706F8 80242318 00000000 */ nop -/* A706FC 8024231C AC80001C */ sw $zero, 0x1c($a0) -/* A70700 80242320 AC800018 */ sw $zero, 0x18($a0) -.L80242324: -/* A70704 80242324 8FBF0014 */ lw $ra, 0x14($sp) -/* A70708 80242328 8FB00010 */ lw $s0, 0x10($sp) -/* A7070C 8024232C 24020002 */ addiu $v0, $zero, 2 -/* A70710 80242330 03E00008 */ jr $ra -/* A70714 80242334 27BD0018 */ addiu $sp, $sp, 0x18 -/* A70718 80242338 00000000 */ nop -/* A7071C 8024233C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/update_heroes_start_turn_A6E3E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/update_heroes_start_turn_A6E3E0.s deleted file mode 100644 index 08cfcafd14..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/update_heroes_start_turn_A6E3E0.s +++ /dev/null @@ -1,173 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_heroes_start_turn_A70404 -/* A70404 80242024 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A70408 80242028 AFB40040 */ sw $s4, 0x40($sp) -/* A7040C 8024202C 0080A02D */ daddu $s4, $a0, $zero -/* A70410 80242030 AFBF0048 */ sw $ra, 0x48($sp) -/* A70414 80242034 AFB50044 */ sw $s5, 0x44($sp) -/* A70418 80242038 AFB3003C */ sw $s3, 0x3c($sp) -/* A7041C 8024203C AFB20038 */ sw $s2, 0x38($sp) -/* A70420 80242040 AFB10034 */ sw $s1, 0x34($sp) -/* A70424 80242044 AFB00030 */ sw $s0, 0x30($sp) -/* A70428 80242048 8E920148 */ lw $s2, 0x148($s4) -/* A7042C 8024204C 86440008 */ lh $a0, 8($s2) -/* A70430 80242050 8E90000C */ lw $s0, 0xc($s4) -/* A70434 80242054 0C00EABB */ jal get_npc_unsafe -/* A70438 80242058 00A0882D */ daddu $s1, $a1, $zero -/* A7043C 8024205C 0280202D */ daddu $a0, $s4, $zero -/* A70440 80242060 8E050000 */ lw $a1, ($s0) -/* A70444 80242064 0C0B1EAF */ jal get_variable -/* A70448 80242068 0040A82D */ daddu $s5, $v0, $zero -/* A7044C 8024206C AFA00010 */ sw $zero, 0x10($sp) -/* A70450 80242070 8E4300D0 */ lw $v1, 0xd0($s2) -/* A70454 80242074 8C630030 */ lw $v1, 0x30($v1) -/* A70458 80242078 AFA30014 */ sw $v1, 0x14($sp) -/* A7045C 8024207C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A70460 80242080 8C63001C */ lw $v1, 0x1c($v1) -/* A70464 80242084 AFA30018 */ sw $v1, 0x18($sp) -/* A70468 80242088 8E4300D0 */ lw $v1, 0xd0($s2) -/* A7046C 8024208C 8C630024 */ lw $v1, 0x24($v1) -/* A70470 80242090 AFA3001C */ sw $v1, 0x1c($sp) -/* A70474 80242094 8E4300D0 */ lw $v1, 0xd0($s2) -/* A70478 80242098 8C630028 */ lw $v1, 0x28($v1) -/* A7047C 8024209C 27B30010 */ addiu $s3, $sp, 0x10 -/* A70480 802420A0 AFA30020 */ sw $v1, 0x20($sp) -/* A70484 802420A4 8E4300D0 */ lw $v1, 0xd0($s2) -/* A70488 802420A8 3C0142F0 */ lui $at, 0x42f0 -/* A7048C 802420AC 44810000 */ mtc1 $at, $f0 -/* A70490 802420B0 8C63002C */ lw $v1, 0x2c($v1) -/* A70494 802420B4 0040802D */ daddu $s0, $v0, $zero -/* A70498 802420B8 E7A00028 */ swc1 $f0, 0x28($sp) -/* A7049C 802420BC A7A0002C */ sh $zero, 0x2c($sp) -/* A704A0 802420C0 12200019 */ beqz $s1, .L80242128 -/* A704A4 802420C4 AFA30024 */ sw $v1, 0x24($sp) -/* A704A8 802420C8 8EA20000 */ lw $v0, ($s5) -/* A704AC 802420CC 2403FDFF */ addiu $v1, $zero, -0x201 -/* A704B0 802420D0 00431024 */ and $v0, $v0, $v1 -/* A704B4 802420D4 34420008 */ ori $v0, $v0, 8 -/* A704B8 802420D8 3C030020 */ lui $v1, 0x20 -/* A704BC 802420DC 00431025 */ or $v0, $v0, $v1 -/* A704C0 802420E0 AEA20000 */ sw $v0, ($s5) -/* A704C4 802420E4 8E420000 */ lw $v0, ($s2) -/* A704C8 802420E8 00431025 */ or $v0, $v0, $v1 -/* A704CC 802420EC AE420000 */ sw $v0, ($s2) -/* A704D0 802420F0 C6A0003C */ lwc1 $f0, 0x3c($s5) -/* A704D4 802420F4 3C014059 */ lui $at, 0x4059 -/* A704D8 802420F8 44811800 */ mtc1 $at, $f3 -/* A704DC 802420FC 44801000 */ mtc1 $zero, $f2 -/* A704E0 80242100 46000021 */ cvt.d.s $f0, $f0 -/* A704E4 80242104 46220002 */ mul.d $f0, $f0, $f2 -/* A704E8 80242108 00000000 */ nop -/* A704EC 8024210C 2402000A */ addiu $v0, $zero, 0xa -/* A704F0 80242110 AE40006C */ sw $zero, 0x6c($s2) -/* A704F4 80242114 AE400074 */ sw $zero, 0x74($s2) -/* A704F8 80242118 4620010D */ trunc.w.d $f4, $f0 -/* A704FC 8024211C E6440070 */ swc1 $f4, 0x70($s2) -/* A70500 80242120 A6A0008E */ sh $zero, 0x8e($s5) -/* A70504 80242124 AE820070 */ sw $v0, 0x70($s4) -.L80242128: -/* A70508 80242128 2402FFFB */ addiu $v0, $zero, -5 -/* A7050C 8024212C A2A200AB */ sb $v0, 0xab($s5) -/* A70510 80242130 8E4300B0 */ lw $v1, 0xb0($s2) -/* A70514 80242134 30620004 */ andi $v0, $v1, 4 -/* A70518 80242138 10400007 */ beqz $v0, .L80242158 -/* A7051C 8024213C 00000000 */ nop -/* A70520 80242140 824200B4 */ lb $v0, 0xb4($s2) -/* A70524 80242144 14400053 */ bnez $v0, .L80242294 -/* A70528 80242148 0000102D */ daddu $v0, $zero, $zero -/* A7052C 8024214C 2402FFFB */ addiu $v0, $zero, -5 -/* A70530 80242150 00621024 */ and $v0, $v1, $v0 -/* A70534 80242154 AE4200B0 */ sw $v0, 0xb0($s2) -.L80242158: -/* A70538 80242158 8E820070 */ lw $v0, 0x70($s4) -/* A7053C 8024215C 2443FFF6 */ addiu $v1, $v0, -0xa -/* A70540 80242160 2C620029 */ sltiu $v0, $v1, 0x29 -/* A70544 80242164 1040004A */ beqz $v0, .L80242290 -/* A70548 80242168 00031080 */ sll $v0, $v1, 2 -/* A7054C 8024216C 3C018024 */ lui $at, 0x8024 -/* A70550 80242170 00220821 */ addu $at, $at, $v0 -/* A70554 80242174 8C223D98 */ lw $v0, 0x3d98($at) -/* A70558 80242178 00400008 */ jr $v0 -/* A7055C 8024217C 00000000 */ nop -/* A70560 80242180 0280202D */ daddu $a0, $s4, $zero -/* A70564 80242184 0200282D */ daddu $a1, $s0, $zero -/* A70568 80242188 0C090471 */ jal func_802411C4 -/* A7056C 8024218C 0260302D */ daddu $a2, $s3, $zero -/* A70570 80242190 0280202D */ daddu $a0, $s4, $zero -/* A70574 80242194 0200282D */ daddu $a1, $s0, $zero -/* A70578 80242198 0C090480 */ jal func_80241200 -/* A7057C 8024219C 0260302D */ daddu $a2, $s3, $zero -/* A70580 802421A0 080908A5 */ j .L80242294 -/* A70584 802421A4 0000102D */ daddu $v0, $zero, $zero -/* A70588 802421A8 0280202D */ daddu $a0, $s4, $zero -/* A7058C 802421AC 0200282D */ daddu $a1, $s0, $zero -/* A70590 802421B0 0C0904E3 */ jal func_8024138C -/* A70594 802421B4 0260302D */ daddu $a2, $s3, $zero -/* A70598 802421B8 8E830070 */ lw $v1, 0x70($s4) -/* A7059C 802421BC 24020010 */ addiu $v0, $zero, 0x10 -/* A705A0 802421C0 14620034 */ bne $v1, $v0, .L80242294 -/* A705A4 802421C4 0000102D */ daddu $v0, $zero, $zero -/* A705A8 802421C8 0280202D */ daddu $a0, $s4, $zero -/* A705AC 802421CC 0200282D */ daddu $a1, $s0, $zero -/* A705B0 802421D0 0C0905DF */ jal func_8024177C -/* A705B4 802421D4 0260302D */ daddu $a2, $s3, $zero -/* A705B8 802421D8 8E830070 */ lw $v1, 0x70($s4) -/* A705BC 802421DC 24020011 */ addiu $v0, $zero, 0x11 -/* A705C0 802421E0 1462002C */ bne $v1, $v0, .L80242294 -/* A705C4 802421E4 0000102D */ daddu $v0, $zero, $zero -/* A705C8 802421E8 0280202D */ daddu $a0, $s4, $zero -/* A705CC 802421EC 0200282D */ daddu $a1, $s0, $zero -/* A705D0 802421F0 0C09061C */ jal func_80241870 -/* A705D4 802421F4 0260302D */ daddu $a2, $s3, $zero -/* A705D8 802421F8 080908A5 */ j .L80242294 -/* A705DC 802421FC 0000102D */ daddu $v0, $zero, $zero -/* A705E0 80242200 0280202D */ daddu $a0, $s4, $zero -/* A705E4 80242204 0200282D */ daddu $a1, $s0, $zero -/* A705E8 80242208 0C0906AD */ jal func_80241AB4 -/* A705EC 8024220C 0260302D */ daddu $a2, $s3, $zero -/* A705F0 80242210 080908A5 */ j .L80242294 -/* A705F4 80242214 0000102D */ daddu $v0, $zero, $zero -/* A705F8 80242218 0280202D */ daddu $a0, $s4, $zero -/* A705FC 8024221C 0200282D */ daddu $a1, $s0, $zero -/* A70600 80242220 0C0906BC */ jal func_80241AF0 -/* A70604 80242224 0260302D */ daddu $a2, $s3, $zero -/* A70608 80242228 080908A5 */ j .L80242294 -/* A7060C 8024222C 0000102D */ daddu $v0, $zero, $zero -/* A70610 80242230 0280202D */ daddu $a0, $s4, $zero -/* A70614 80242234 0200282D */ daddu $a1, $s0, $zero -/* A70618 80242238 0C09072F */ jal func_80241CBC -/* A7061C 8024223C 0260302D */ daddu $a2, $s3, $zero -/* A70620 80242240 080908A5 */ j .L80242294 -/* A70624 80242244 0000102D */ daddu $v0, $zero, $zero -/* A70628 80242248 0280202D */ daddu $a0, $s4, $zero -/* A7062C 8024224C 0200282D */ daddu $a1, $s0, $zero -/* A70630 80242250 0C09074A */ jal func_80241D28 -/* A70634 80242254 0260302D */ daddu $a2, $s3, $zero -/* A70638 80242258 8E830070 */ lw $v1, 0x70($s4) -/* A7063C 8024225C 24020018 */ addiu $v0, $zero, 0x18 -/* A70640 80242260 1462000C */ bne $v1, $v0, .L80242294 -/* A70644 80242264 0000102D */ daddu $v0, $zero, $zero -/* A70648 80242268 0280202D */ daddu $a0, $s4, $zero -/* A7064C 8024226C 0200282D */ daddu $a1, $s0, $zero -/* A70650 80242270 0C090797 */ jal func_80241E5C -/* A70654 80242274 0260302D */ daddu $a2, $s3, $zero -/* A70658 80242278 080908A5 */ j .L80242294 -/* A7065C 8024227C 0000102D */ daddu $v0, $zero, $zero -/* A70660 80242280 0280202D */ daddu $a0, $s4, $zero -/* A70664 80242284 0200282D */ daddu $a1, $s0, $zero -/* A70668 80242288 0C0907D3 */ jal func_80241F4C -/* A7066C 8024228C 0260302D */ daddu $a2, $s3, $zero -.L80242290: -/* A70670 80242290 0000102D */ daddu $v0, $zero, $zero -.L80242294: -/* A70674 80242294 8FBF0048 */ lw $ra, 0x48($sp) -/* A70678 80242298 8FB50044 */ lw $s5, 0x44($sp) -/* A7067C 8024229C 8FB40040 */ lw $s4, 0x40($sp) -/* A70680 802422A0 8FB3003C */ lw $s3, 0x3c($sp) -/* A70684 802422A4 8FB20038 */ lw $s2, 0x38($sp) -/* A70688 802422A8 8FB10034 */ lw $s1, 0x34($sp) -/* A7068C 802422AC 8FB00030 */ lw $s0, 0x30($sp) -/* A70690 802422B0 03E00008 */ jr $ra -/* A70694 802422B4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_62/func_80240034_A72220.s b/asm/nonmatchings/world/area_kpa/kpa_62/func_80240034_A72220.s deleted file mode 100644 index 7e45ec3c9e..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_62/func_80240034_A72220.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_A72254 -/* A72254 80240034 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A72258 80240038 AFB20018 */ sw $s2, 0x18($sp) -/* A7225C 8024003C 0080902D */ daddu $s2, $a0, $zero -/* A72260 80240040 AFBF001C */ sw $ra, 0x1c($sp) -/* A72264 80240044 AFB10014 */ sw $s1, 0x14($sp) -/* A72268 80240048 AFB00010 */ sw $s0, 0x10($sp) -/* A7226C 8024004C 8E50000C */ lw $s0, 0xc($s2) -/* A72270 80240050 8E050000 */ lw $a1, ($s0) -/* A72274 80240054 0C0B1EAF */ jal get_variable -/* A72278 80240058 26100004 */ addiu $s0, $s0, 4 -/* A7227C 8024005C 0C04417A */ jal get_entity_by_index -/* A72280 80240060 0040202D */ daddu $a0, $v0, $zero -/* A72284 80240064 8E050000 */ lw $a1, ($s0) -/* A72288 80240068 26100004 */ addiu $s0, $s0, 4 -/* A7228C 8024006C 0040882D */ daddu $s1, $v0, $zero -/* A72290 80240070 C6200048 */ lwc1 $f0, 0x48($s1) -/* A72294 80240074 4600008D */ trunc.w.s $f2, $f0 -/* A72298 80240078 44061000 */ mfc1 $a2, $f2 -/* A7229C 8024007C 0C0B2026 */ jal set_variable -/* A722A0 80240080 0240202D */ daddu $a0, $s2, $zero -/* A722A4 80240084 8E050000 */ lw $a1, ($s0) -/* A722A8 80240088 26100004 */ addiu $s0, $s0, 4 -/* A722AC 8024008C C620004C */ lwc1 $f0, 0x4c($s1) -/* A722B0 80240090 4600008D */ trunc.w.s $f2, $f0 -/* A722B4 80240094 44061000 */ mfc1 $a2, $f2 -/* A722B8 80240098 0C0B2026 */ jal set_variable -/* A722BC 8024009C 0240202D */ daddu $a0, $s2, $zero -/* A722C0 802400A0 C6200050 */ lwc1 $f0, 0x50($s1) -/* A722C4 802400A4 8E050000 */ lw $a1, ($s0) -/* A722C8 802400A8 4600008D */ trunc.w.s $f2, $f0 -/* A722CC 802400AC 44061000 */ mfc1 $a2, $f2 -/* A722D0 802400B0 0C0B2026 */ jal set_variable -/* A722D4 802400B4 0240202D */ daddu $a0, $s2, $zero -/* A722D8 802400B8 8FBF001C */ lw $ra, 0x1c($sp) -/* A722DC 802400BC 8FB20018 */ lw $s2, 0x18($sp) -/* A722E0 802400C0 8FB10014 */ lw $s1, 0x14($sp) -/* A722E4 802400C4 8FB00010 */ lw $s0, 0x10($sp) -/* A722E8 802400C8 24020002 */ addiu $v0, $zero, 2 -/* A722EC 802400CC 03E00008 */ jr $ra -/* A722F0 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 -/* A722F4 802400D4 00000000 */ nop -/* A722F8 802400D8 00000000 */ nop -/* A722FC 802400DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_62/func_802400E0_A72220.s b/asm/nonmatchings/world/area_kpa/kpa_62/func_802400E0_A72220.s deleted file mode 100644 index 38d9b4d599..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_62/func_802400E0_A72220.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E0_A72300 -/* A72300 802400E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A72304 802400E4 AFB00010 */ sw $s0, 0x10($sp) -/* A72308 802400E8 0080802D */ daddu $s0, $a0, $zero -/* A7230C 802400EC AFBF0014 */ sw $ra, 0x14($sp) -/* A72310 802400F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* A72314 802400F4 8E020088 */ lw $v0, 0x88($s0) -/* A72318 802400F8 00621821 */ addu $v1, $v1, $v0 -/* A7231C 802400FC 04610004 */ bgez $v1, .L80240110 -/* A72320 80240100 AE0300A8 */ sw $v1, 0xa8($s0) -/* A72324 80240104 3C020002 */ lui $v0, 2 -/* A72328 80240108 08090048 */ j .L80240120 -/* A7232C 8024010C 00621021 */ addu $v0, $v1, $v0 -.L80240110: -/* A72330 80240110 3C040002 */ lui $a0, 2 -/* A72334 80240114 0083102A */ slt $v0, $a0, $v1 -/* A72338 80240118 10400002 */ beqz $v0, .L80240124 -/* A7233C 8024011C 00641023 */ subu $v0, $v1, $a0 -.L80240120: -/* A72340 80240120 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240124: -/* A72344 80240124 8E0300AC */ lw $v1, 0xac($s0) -/* A72348 80240128 8E02008C */ lw $v0, 0x8c($s0) -/* A7234C 8024012C 00621821 */ addu $v1, $v1, $v0 -/* A72350 80240130 04610004 */ bgez $v1, .L80240144 -/* A72354 80240134 AE0300AC */ sw $v1, 0xac($s0) -/* A72358 80240138 3C020002 */ lui $v0, 2 -/* A7235C 8024013C 08090055 */ j .L80240154 -/* A72360 80240140 00621021 */ addu $v0, $v1, $v0 -.L80240144: -/* A72364 80240144 3C040002 */ lui $a0, 2 -/* A72368 80240148 0083102A */ slt $v0, $a0, $v1 -/* A7236C 8024014C 10400002 */ beqz $v0, .L80240158 -/* A72370 80240150 00641023 */ subu $v0, $v1, $a0 -.L80240154: -/* A72374 80240154 AE0200AC */ sw $v0, 0xac($s0) -.L80240158: -/* A72378 80240158 8E0300B0 */ lw $v1, 0xb0($s0) -/* A7237C 8024015C 8E020090 */ lw $v0, 0x90($s0) -/* A72380 80240160 00621821 */ addu $v1, $v1, $v0 -/* A72384 80240164 04610004 */ bgez $v1, .L80240178 -/* A72388 80240168 AE0300B0 */ sw $v1, 0xb0($s0) -/* A7238C 8024016C 3C020002 */ lui $v0, 2 -/* A72390 80240170 08090062 */ j .L80240188 -/* A72394 80240174 00621021 */ addu $v0, $v1, $v0 -.L80240178: -/* A72398 80240178 3C040002 */ lui $a0, 2 -/* A7239C 8024017C 0083102A */ slt $v0, $a0, $v1 -/* A723A0 80240180 10400002 */ beqz $v0, .L8024018C -/* A723A4 80240184 00641023 */ subu $v0, $v1, $a0 -.L80240188: -/* A723A8 80240188 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024018C: -/* A723AC 8024018C 8E0300B4 */ lw $v1, 0xb4($s0) -/* A723B0 80240190 8E020094 */ lw $v0, 0x94($s0) -/* A723B4 80240194 00621821 */ addu $v1, $v1, $v0 -/* A723B8 80240198 04610004 */ bgez $v1, .L802401AC -/* A723BC 8024019C AE0300B4 */ sw $v1, 0xb4($s0) -/* A723C0 802401A0 3C020002 */ lui $v0, 2 -/* A723C4 802401A4 0809006F */ j .L802401BC -/* A723C8 802401A8 00621021 */ addu $v0, $v1, $v0 -.L802401AC: -/* A723CC 802401AC 3C040002 */ lui $a0, 2 -/* A723D0 802401B0 0083102A */ slt $v0, $a0, $v1 -/* A723D4 802401B4 10400002 */ beqz $v0, .L802401C0 -/* A723D8 802401B8 00641023 */ subu $v0, $v1, $a0 -.L802401BC: -/* A723DC 802401BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802401C0: -/* A723E0 802401C0 8E040084 */ lw $a0, 0x84($s0) -/* A723E4 802401C4 0C046F07 */ jal set_main_pan_u -/* A723E8 802401C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A723EC 802401CC 8E040084 */ lw $a0, 0x84($s0) -/* A723F0 802401D0 0C046F0D */ jal set_main_pan_v -/* A723F4 802401D4 8E0500AC */ lw $a1, 0xac($s0) -/* A723F8 802401D8 8E040084 */ lw $a0, 0x84($s0) -/* A723FC 802401DC 0C046F13 */ jal set_aux_pan_u -/* A72400 802401E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* A72404 802401E4 8E040084 */ lw $a0, 0x84($s0) -/* A72408 802401E8 0C046F19 */ jal set_aux_pan_v -/* A7240C 802401EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* A72410 802401F0 8FBF0014 */ lw $ra, 0x14($sp) -/* A72414 802401F4 8FB00010 */ lw $s0, 0x10($sp) -/* A72418 802401F8 0000102D */ daddu $v0, $zero, $zero -/* A7241C 802401FC 03E00008 */ jr $ra -/* A72420 80240200 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_62/func_80240204_A72220.s b/asm/nonmatchings/world/area_kpa/kpa_62/func_80240204_A72220.s deleted file mode 100644 index 515d246124..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_62/func_80240204_A72220.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240204_A72424 -/* A72424 80240204 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A72428 80240208 AFB00010 */ sw $s0, 0x10($sp) -/* A7242C 8024020C 0080802D */ daddu $s0, $a0, $zero -/* A72430 80240210 10A00005 */ beqz $a1, .L80240228 -/* A72434 80240214 AFBF0014 */ sw $ra, 0x14($sp) -/* A72438 80240218 AE000070 */ sw $zero, 0x70($s0) -/* A7243C 8024021C AE000074 */ sw $zero, 0x74($s0) -/* A72440 80240220 AE000078 */ sw $zero, 0x78($s0) -/* A72444 80240224 AE00007C */ sw $zero, 0x7c($s0) -.L80240228: -/* A72448 80240228 8E020070 */ lw $v0, 0x70($s0) -/* A7244C 8024022C 1440000E */ bnez $v0, .L80240268 -/* A72450 80240230 00000000 */ nop -/* A72454 80240234 8E0300A8 */ lw $v1, 0xa8($s0) -/* A72458 80240238 8E020088 */ lw $v0, 0x88($s0) -/* A7245C 8024023C 00621821 */ addu $v1, $v1, $v0 -/* A72460 80240240 04610004 */ bgez $v1, .L80240254 -/* A72464 80240244 AE0300A8 */ sw $v1, 0xa8($s0) -/* A72468 80240248 3C020002 */ lui $v0, 2 -/* A7246C 8024024C 08090099 */ j .L80240264 -/* A72470 80240250 00621021 */ addu $v0, $v1, $v0 -.L80240254: -/* A72474 80240254 3C040002 */ lui $a0, 2 -/* A72478 80240258 0083102A */ slt $v0, $a0, $v1 -/* A7247C 8024025C 10400002 */ beqz $v0, .L80240268 -/* A72480 80240260 00641023 */ subu $v0, $v1, $a0 -.L80240264: -/* A72484 80240264 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240268: -/* A72488 80240268 8E020074 */ lw $v0, 0x74($s0) -/* A7248C 8024026C 1440000E */ bnez $v0, .L802402A8 -/* A72490 80240270 00000000 */ nop -/* A72494 80240274 8E0300AC */ lw $v1, 0xac($s0) -/* A72498 80240278 8E02008C */ lw $v0, 0x8c($s0) -/* A7249C 8024027C 00621821 */ addu $v1, $v1, $v0 -/* A724A0 80240280 04610004 */ bgez $v1, .L80240294 -/* A724A4 80240284 AE0300AC */ sw $v1, 0xac($s0) -/* A724A8 80240288 3C020002 */ lui $v0, 2 -/* A724AC 8024028C 080900A9 */ j .L802402A4 -/* A724B0 80240290 00621021 */ addu $v0, $v1, $v0 -.L80240294: -/* A724B4 80240294 3C040002 */ lui $a0, 2 -/* A724B8 80240298 0083102A */ slt $v0, $a0, $v1 -/* A724BC 8024029C 10400002 */ beqz $v0, .L802402A8 -/* A724C0 802402A0 00641023 */ subu $v0, $v1, $a0 -.L802402A4: -/* A724C4 802402A4 AE0200AC */ sw $v0, 0xac($s0) -.L802402A8: -/* A724C8 802402A8 8E020078 */ lw $v0, 0x78($s0) -/* A724CC 802402AC 1440000E */ bnez $v0, .L802402E8 -/* A724D0 802402B0 00000000 */ nop -/* A724D4 802402B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A724D8 802402B8 8E020090 */ lw $v0, 0x90($s0) -/* A724DC 802402BC 00621821 */ addu $v1, $v1, $v0 -/* A724E0 802402C0 04610004 */ bgez $v1, .L802402D4 -/* A724E4 802402C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A724E8 802402C8 3C020002 */ lui $v0, 2 -/* A724EC 802402CC 080900B9 */ j .L802402E4 -/* A724F0 802402D0 00621021 */ addu $v0, $v1, $v0 -.L802402D4: -/* A724F4 802402D4 3C040002 */ lui $a0, 2 -/* A724F8 802402D8 0083102A */ slt $v0, $a0, $v1 -/* A724FC 802402DC 10400002 */ beqz $v0, .L802402E8 -/* A72500 802402E0 00641023 */ subu $v0, $v1, $a0 -.L802402E4: -/* A72504 802402E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802402E8: -/* A72508 802402E8 8E02007C */ lw $v0, 0x7c($s0) -/* A7250C 802402EC 1440000E */ bnez $v0, .L80240328 -/* A72510 802402F0 00000000 */ nop -/* A72514 802402F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* A72518 802402F8 8E020094 */ lw $v0, 0x94($s0) -/* A7251C 802402FC 00621821 */ addu $v1, $v1, $v0 -/* A72520 80240300 04610004 */ bgez $v1, .L80240314 -/* A72524 80240304 AE0300B4 */ sw $v1, 0xb4($s0) -/* A72528 80240308 3C020002 */ lui $v0, 2 -/* A7252C 8024030C 080900C9 */ j .L80240324 -/* A72530 80240310 00621021 */ addu $v0, $v1, $v0 -.L80240314: -/* A72534 80240314 3C040002 */ lui $a0, 2 -/* A72538 80240318 0083102A */ slt $v0, $a0, $v1 -/* A7253C 8024031C 10400002 */ beqz $v0, .L80240328 -/* A72540 80240320 00641023 */ subu $v0, $v1, $a0 -.L80240324: -/* A72544 80240324 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240328: -/* A72548 80240328 8E040084 */ lw $a0, 0x84($s0) -/* A7254C 8024032C 0C046F07 */ jal set_main_pan_u -/* A72550 80240330 8E0500A8 */ lw $a1, 0xa8($s0) -/* A72554 80240334 8E040084 */ lw $a0, 0x84($s0) -/* A72558 80240338 0C046F0D */ jal set_main_pan_v -/* A7255C 8024033C 8E0500AC */ lw $a1, 0xac($s0) -/* A72560 80240340 8E040084 */ lw $a0, 0x84($s0) -/* A72564 80240344 0C046F13 */ jal set_aux_pan_u -/* A72568 80240348 8E0500B0 */ lw $a1, 0xb0($s0) -/* A7256C 8024034C 8E040084 */ lw $a0, 0x84($s0) -/* A72570 80240350 0C046F19 */ jal set_aux_pan_v -/* A72574 80240354 8E0500B4 */ lw $a1, 0xb4($s0) -/* A72578 80240358 8E020070 */ lw $v0, 0x70($s0) -/* A7257C 8024035C 8E030078 */ lw $v1, 0x78($s0) -/* A72580 80240360 8E040098 */ lw $a0, 0x98($s0) -/* A72584 80240364 24420001 */ addiu $v0, $v0, 1 -/* A72588 80240368 AE020070 */ sw $v0, 0x70($s0) -/* A7258C 8024036C 8E020074 */ lw $v0, 0x74($s0) -/* A72590 80240370 24630001 */ addiu $v1, $v1, 1 -/* A72594 80240374 AE030078 */ sw $v1, 0x78($s0) -/* A72598 80240378 8E030070 */ lw $v1, 0x70($s0) -/* A7259C 8024037C 24420001 */ addiu $v0, $v0, 1 -/* A725A0 80240380 AE020074 */ sw $v0, 0x74($s0) -/* A725A4 80240384 8E02007C */ lw $v0, 0x7c($s0) -/* A725A8 80240388 0064182A */ slt $v1, $v1, $a0 -/* A725AC 8024038C 24420001 */ addiu $v0, $v0, 1 -/* A725B0 80240390 14600002 */ bnez $v1, .L8024039C -/* A725B4 80240394 AE02007C */ sw $v0, 0x7c($s0) -/* A725B8 80240398 AE000070 */ sw $zero, 0x70($s0) -.L8024039C: -/* A725BC 8024039C 8E020074 */ lw $v0, 0x74($s0) -/* A725C0 802403A0 8E03009C */ lw $v1, 0x9c($s0) -/* A725C4 802403A4 0043102A */ slt $v0, $v0, $v1 -/* A725C8 802403A8 50400001 */ beql $v0, $zero, .L802403B0 -/* A725CC 802403AC AE000074 */ sw $zero, 0x74($s0) -.L802403B0: -/* A725D0 802403B0 8E020078 */ lw $v0, 0x78($s0) -/* A725D4 802403B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A725D8 802403B8 0043102A */ slt $v0, $v0, $v1 -/* A725DC 802403BC 50400001 */ beql $v0, $zero, .L802403C4 -/* A725E0 802403C0 AE000078 */ sw $zero, 0x78($s0) -.L802403C4: -/* A725E4 802403C4 8E02007C */ lw $v0, 0x7c($s0) -/* A725E8 802403C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A725EC 802403CC 0043102A */ slt $v0, $v0, $v1 -/* A725F0 802403D0 50400001 */ beql $v0, $zero, .L802403D8 -/* A725F4 802403D4 AE00007C */ sw $zero, 0x7c($s0) -.L802403D8: -/* A725F8 802403D8 8FBF0014 */ lw $ra, 0x14($sp) -/* A725FC 802403DC 8FB00010 */ lw $s0, 0x10($sp) -/* A72600 802403E0 0000102D */ daddu $v0, $zero, $zero -/* A72604 802403E4 03E00008 */ jr $ra -/* A72608 802403E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A7260C 802403EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_70/func_80240124_A74870.s b/asm/nonmatchings/world/area_kpa/kpa_70/func_80240124_A74870.s deleted file mode 100644 index de43b41325..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_70/func_80240124_A74870.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_A74994 -/* A74994 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A74998 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* A7499C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* A749A0 80240130 10A00005 */ beqz $a1, .L80240148 -/* A749A4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* A749A8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* A749AC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* A749B0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* A749B4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* A749B8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* A749BC 8024014C 1440000E */ bnez $v0, .L80240188 -/* A749C0 80240150 00000000 */ nop -/* A749C4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* A749C8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* A749CC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* A749D0 80240160 04610004 */ bgez $v1, .L80240174 -/* A749D4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* A749D8 80240168 3C020002 */ lui $v0, 2 -/* A749DC 8024016C 08090061 */ j .L80240184 -/* A749E0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* A749E4 80240174 3C040002 */ lui $a0, 2 -/* A749E8 80240178 0083102A */ slt $v0, $a0, $v1 -/* A749EC 8024017C 10400002 */ beqz $v0, .L80240188 -/* A749F0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* A749F4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* A749F8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* A749FC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* A74A00 80240190 00000000 */ nop -/* A74A04 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* A74A08 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* A74A0C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* A74A10 802401A0 04610004 */ bgez $v1, .L802401B4 -/* A74A14 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* A74A18 802401A8 3C020002 */ lui $v0, 2 -/* A74A1C 802401AC 08090071 */ j .L802401C4 -/* A74A20 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* A74A24 802401B4 3C040002 */ lui $a0, 2 -/* A74A28 802401B8 0083102A */ slt $v0, $a0, $v1 -/* A74A2C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* A74A30 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* A74A34 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* A74A38 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* A74A3C 802401CC 1440000E */ bnez $v0, .L80240208 -/* A74A40 802401D0 00000000 */ nop -/* A74A44 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A74A48 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* A74A4C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* A74A50 802401E0 04610004 */ bgez $v1, .L802401F4 -/* A74A54 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A74A58 802401E8 3C020002 */ lui $v0, 2 -/* A74A5C 802401EC 08090081 */ j .L80240204 -/* A74A60 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* A74A64 802401F4 3C040002 */ lui $a0, 2 -/* A74A68 802401F8 0083102A */ slt $v0, $a0, $v1 -/* A74A6C 802401FC 10400002 */ beqz $v0, .L80240208 -/* A74A70 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* A74A74 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* A74A78 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* A74A7C 8024020C 1440000E */ bnez $v0, .L80240248 -/* A74A80 80240210 00000000 */ nop -/* A74A84 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* A74A88 80240218 8E020094 */ lw $v0, 0x94($s0) -/* A74A8C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* A74A90 80240220 04610004 */ bgez $v1, .L80240234 -/* A74A94 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* A74A98 80240228 3C020002 */ lui $v0, 2 -/* A74A9C 8024022C 08090091 */ j .L80240244 -/* A74AA0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* A74AA4 80240234 3C040002 */ lui $a0, 2 -/* A74AA8 80240238 0083102A */ slt $v0, $a0, $v1 -/* A74AAC 8024023C 10400002 */ beqz $v0, .L80240248 -/* A74AB0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* A74AB4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* A74AB8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* A74ABC 8024024C 0C046F07 */ jal set_main_pan_u -/* A74AC0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* A74AC4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* A74AC8 80240258 0C046F0D */ jal set_main_pan_v -/* A74ACC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* A74AD0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* A74AD4 80240264 0C046F13 */ jal set_aux_pan_u -/* A74AD8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* A74ADC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* A74AE0 80240270 0C046F19 */ jal set_aux_pan_v -/* A74AE4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* A74AE8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* A74AEC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* A74AF0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* A74AF4 80240284 24420001 */ addiu $v0, $v0, 1 -/* A74AF8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* A74AFC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* A74B00 80240290 24630001 */ addiu $v1, $v1, 1 -/* A74B04 80240294 AE030078 */ sw $v1, 0x78($s0) -/* A74B08 80240298 8E030070 */ lw $v1, 0x70($s0) -/* A74B0C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* A74B10 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* A74B14 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* A74B18 802402A8 0064182A */ slt $v1, $v1, $a0 -/* A74B1C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* A74B20 802402B0 14600002 */ bnez $v1, .L802402BC -/* A74B24 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* A74B28 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* A74B2C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* A74B30 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* A74B34 802402C4 0043102A */ slt $v0, $v0, $v1 -/* A74B38 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* A74B3C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* A74B40 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* A74B44 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A74B48 802402D8 0043102A */ slt $v0, $v0, $v1 -/* A74B4C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* A74B50 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* A74B54 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* A74B58 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A74B5C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* A74B60 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* A74B64 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* A74B68 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A74B6C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* A74B70 80240300 0000102D */ daddu $v0, $zero, $zero -/* A74B74 80240304 03E00008 */ jr $ra -/* A74B78 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* A74B7C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_70/func_80240310_A74870.s b/asm/nonmatchings/world/area_kpa/kpa_70/func_80240310_A74870.s deleted file mode 100644 index 758a9b6564..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_70/func_80240310_A74870.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_A74B80 -/* A74B80 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A74B84 80240314 AFB20018 */ sw $s2, 0x18($sp) -/* A74B88 80240318 0080902D */ daddu $s2, $a0, $zero -/* A74B8C 8024031C AFBF001C */ sw $ra, 0x1c($sp) -/* A74B90 80240320 AFB10014 */ sw $s1, 0x14($sp) -/* A74B94 80240324 AFB00010 */ sw $s0, 0x10($sp) -/* A74B98 80240328 8E510148 */ lw $s1, 0x148($s2) -/* A74B9C 8024032C 0C00EABB */ jal get_npc_unsafe -/* A74BA0 80240330 86240008 */ lh $a0, 8($s1) -/* A74BA4 80240334 0040802D */ daddu $s0, $v0, $zero -/* A74BA8 80240338 8E2300CC */ lw $v1, 0xcc($s1) -/* A74BAC 8024033C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A74BB0 80240340 8C630020 */ lw $v1, 0x20($v1) -/* A74BB4 80240344 AE030028 */ sw $v1, 0x28($s0) -/* A74BB8 80240348 96220076 */ lhu $v0, 0x76($s1) -/* A74BBC 8024034C A602008E */ sh $v0, 0x8e($s0) -/* A74BC0 80240350 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A74BC4 80240354 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A74BC8 80240358 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A74BCC 8024035C 8C460028 */ lw $a2, 0x28($v0) -/* A74BD0 80240360 0C00A720 */ jal atan2 -/* A74BD4 80240364 8C470030 */ lw $a3, 0x30($v0) -/* A74BD8 80240368 2402000D */ addiu $v0, $zero, 0xd -/* A74BDC 8024036C E600000C */ swc1 $f0, 0xc($s0) -/* A74BE0 80240370 AE420070 */ sw $v0, 0x70($s2) -/* A74BE4 80240374 8FBF001C */ lw $ra, 0x1c($sp) -/* A74BE8 80240378 8FB20018 */ lw $s2, 0x18($sp) -/* A74BEC 8024037C 8FB10014 */ lw $s1, 0x14($sp) -/* A74BF0 80240380 8FB00010 */ lw $s0, 0x10($sp) -/* A74BF4 80240384 03E00008 */ jr $ra -/* A74BF8 80240388 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_70/func_8024038C_A74870.s b/asm/nonmatchings/world/area_kpa/kpa_70/func_8024038C_A74870.s deleted file mode 100644 index 588e1d3fad..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_70/func_8024038C_A74870.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024038C_A74BFC -/* A74BFC 8024038C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A74C00 80240390 AFB3001C */ sw $s3, 0x1c($sp) -/* A74C04 80240394 0080982D */ daddu $s3, $a0, $zero -/* A74C08 80240398 AFBF0020 */ sw $ra, 0x20($sp) -/* A74C0C 8024039C AFB20018 */ sw $s2, 0x18($sp) -/* A74C10 802403A0 AFB10014 */ sw $s1, 0x14($sp) -/* A74C14 802403A4 AFB00010 */ sw $s0, 0x10($sp) -/* A74C18 802403A8 8E710148 */ lw $s1, 0x148($s3) -/* A74C1C 802403AC 86240008 */ lh $a0, 8($s1) -/* A74C20 802403B0 0C00EABB */ jal get_npc_unsafe -/* A74C24 802403B4 00A0902D */ daddu $s2, $a1, $zero -/* A74C28 802403B8 0040802D */ daddu $s0, $v0, $zero -/* A74C2C 802403BC 8602008E */ lh $v0, 0x8e($s0) -/* A74C30 802403C0 9603008E */ lhu $v1, 0x8e($s0) -/* A74C34 802403C4 18400005 */ blez $v0, .L802403DC -/* A74C38 802403C8 2462FFFF */ addiu $v0, $v1, -1 -/* A74C3C 802403CC A602008E */ sh $v0, 0x8e($s0) -/* A74C40 802403D0 00021400 */ sll $v0, $v0, 0x10 -/* A74C44 802403D4 1C400033 */ bgtz $v0, .L802404A4 -/* A74C48 802403D8 00000000 */ nop -.L802403DC: -/* A74C4C 802403DC 8602008C */ lh $v0, 0x8c($s0) -/* A74C50 802403E0 14400030 */ bnez $v0, .L802404A4 -/* A74C54 802403E4 00000000 */ nop -/* A74C58 802403E8 8E2200CC */ lw $v0, 0xcc($s1) -/* A74C5C 802403EC 8C420024 */ lw $v0, 0x24($v0) -/* A74C60 802403F0 AE020028 */ sw $v0, 0x28($s0) -/* A74C64 802403F4 C6400018 */ lwc1 $f0, 0x18($s2) -/* A74C68 802403F8 E6000018 */ swc1 $f0, 0x18($s0) -/* A74C6C 802403FC 8E230088 */ lw $v1, 0x88($s1) -/* A74C70 80240400 24020005 */ addiu $v0, $zero, 5 -/* A74C74 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* A74C78 80240408 00000000 */ nop -/* A74C7C 8024040C 10600003 */ beqz $v1, .L8024041C -/* A74C80 80240410 24020001 */ addiu $v0, $zero, 1 -/* A74C84 80240414 14620006 */ bne $v1, $v0, .L80240430 -/* A74C88 80240418 00000000 */ nop -.L8024041C: -/* A74C8C 8024041C 8E220084 */ lw $v0, 0x84($s1) -/* A74C90 80240420 00021FC2 */ srl $v1, $v0, 0x1f -/* A74C94 80240424 00431021 */ addu $v0, $v0, $v1 -/* A74C98 80240428 00021043 */ sra $v0, $v0, 1 -/* A74C9C 8024042C A60200A8 */ sh $v0, 0xa8($s0) -.L80240430: -/* A74CA0 80240430 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A74CA4 80240434 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A74CA8 80240438 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A74CAC 8024043C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A74CB0 80240440 8C460028 */ lw $a2, 0x28($v0) -/* A74CB4 80240444 0C00A7B5 */ jal dist2D -/* A74CB8 80240448 8C470030 */ lw $a3, 0x30($v0) -/* A74CBC 8024044C C6020018 */ lwc1 $f2, 0x18($s0) -/* A74CC0 80240450 46020003 */ div.s $f0, $f0, $f2 -/* A74CC4 80240454 3C018024 */ lui $at, 0x8024 -/* A74CC8 80240458 D4223BF0 */ ldc1 $f2, 0x3bf0($at) -/* A74CCC 8024045C 46000021 */ cvt.d.s $f0, $f0 -/* A74CD0 80240460 46220000 */ add.d $f0, $f0, $f2 -/* A74CD4 80240464 4620010D */ trunc.w.d $f4, $f0 -/* A74CD8 80240468 44022000 */ mfc1 $v0, $f4 -/* A74CDC 8024046C 00000000 */ nop -/* A74CE0 80240470 A602008E */ sh $v0, 0x8e($s0) -/* A74CE4 80240474 00021400 */ sll $v0, $v0, 0x10 -/* A74CE8 80240478 8E230078 */ lw $v1, 0x78($s1) -/* A74CEC 8024047C 00021403 */ sra $v0, $v0, 0x10 -/* A74CF0 80240480 0043102A */ slt $v0, $v0, $v1 -/* A74CF4 80240484 10400003 */ beqz $v0, .L80240494 -/* A74CF8 80240488 00000000 */ nop -/* A74CFC 8024048C 9622007A */ lhu $v0, 0x7a($s1) -/* A74D00 80240490 A602008E */ sh $v0, 0x8e($s0) -.L80240494: -/* A74D04 80240494 8602008E */ lh $v0, 0x8e($s0) -/* A74D08 80240498 AE22007C */ sw $v0, 0x7c($s1) -/* A74D0C 8024049C 2402000E */ addiu $v0, $zero, 0xe -/* A74D10 802404A0 AE620070 */ sw $v0, 0x70($s3) -.L802404A4: -/* A74D14 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* A74D18 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* A74D1C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* A74D20 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* A74D24 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* A74D28 802404B8 03E00008 */ jr $ra -/* A74D2C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_70/func_802404C0_A74870.s b/asm/nonmatchings/world/area_kpa/kpa_70/func_802404C0_A74870.s deleted file mode 100644 index 72f671a663..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_70/func_802404C0_A74870.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_A74D30 -/* A74D30 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A74D34 802404C4 AFB3003C */ sw $s3, 0x3c($sp) -/* A74D38 802404C8 0080982D */ daddu $s3, $a0, $zero -/* A74D3C 802404CC AFBF0040 */ sw $ra, 0x40($sp) -/* A74D40 802404D0 AFB20038 */ sw $s2, 0x38($sp) -/* A74D44 802404D4 AFB10034 */ sw $s1, 0x34($sp) -/* A74D48 802404D8 AFB00030 */ sw $s0, 0x30($sp) -/* A74D4C 802404DC 8E710148 */ lw $s1, 0x148($s3) -/* A74D50 802404E0 0C00EABB */ jal get_npc_unsafe -/* A74D54 802404E4 86240008 */ lh $a0, 8($s1) -/* A74D58 802404E8 0040802D */ daddu $s0, $v0, $zero -/* A74D5C 802404EC 8E22007C */ lw $v0, 0x7c($s1) -/* A74D60 802404F0 8603008E */ lh $v1, 0x8e($s0) -/* A74D64 802404F4 2442FFFF */ addiu $v0, $v0, -1 -/* A74D68 802404F8 14620012 */ bne $v1, $v0, .L80240544 -/* A74D6C 802404FC 00000000 */ nop -/* A74D70 80240500 C6000038 */ lwc1 $f0, 0x38($s0) -/* A74D74 80240504 4600020D */ trunc.w.s $f8, $f0 -/* A74D78 80240508 44024000 */ mfc1 $v0, $f8 -/* A74D7C 8024050C 00000000 */ nop -/* A74D80 80240510 A6220010 */ sh $v0, 0x10($s1) -/* A74D84 80240514 C600003C */ lwc1 $f0, 0x3c($s0) -/* A74D88 80240518 4600020D */ trunc.w.s $f8, $f0 -/* A74D8C 8024051C 44024000 */ mfc1 $v0, $f8 -/* A74D90 80240520 00000000 */ nop -/* A74D94 80240524 A6220012 */ sh $v0, 0x12($s1) -/* A74D98 80240528 C6000040 */ lwc1 $f0, 0x40($s0) -/* A74D9C 8024052C 24020001 */ addiu $v0, $zero, 1 -/* A74DA0 80240530 A2220007 */ sb $v0, 7($s1) -/* A74DA4 80240534 4600020D */ trunc.w.s $f8, $f0 -/* A74DA8 80240538 44024000 */ mfc1 $v0, $f8 -/* A74DAC 8024053C 00000000 */ nop -/* A74DB0 80240540 A6220014 */ sh $v0, 0x14($s1) -.L80240544: -/* A74DB4 80240544 C6000038 */ lwc1 $f0, 0x38($s0) -/* A74DB8 80240548 C602003C */ lwc1 $f2, 0x3c($s0) -/* A74DBC 8024054C C6040040 */ lwc1 $f4, 0x40($s0) -/* A74DC0 80240550 C6060018 */ lwc1 $f6, 0x18($s0) -/* A74DC4 80240554 E7A00020 */ swc1 $f0, 0x20($sp) -/* A74DC8 80240558 E7A20024 */ swc1 $f2, 0x24($sp) -/* A74DCC 8024055C E7A40028 */ swc1 $f4, 0x28($sp) -/* A74DD0 80240560 E7A60010 */ swc1 $f6, 0x10($sp) -/* A74DD4 80240564 C600000C */ lwc1 $f0, 0xc($s0) -/* A74DD8 80240568 E7A00014 */ swc1 $f0, 0x14($sp) -/* A74DDC 8024056C 860200A8 */ lh $v0, 0xa8($s0) -/* A74DE0 80240570 27A50020 */ addiu $a1, $sp, 0x20 -/* A74DE4 80240574 44820000 */ mtc1 $v0, $f0 -/* A74DE8 80240578 00000000 */ nop -/* A74DEC 8024057C 46800020 */ cvt.s.w $f0, $f0 -/* A74DF0 80240580 E7A00018 */ swc1 $f0, 0x18($sp) -/* A74DF4 80240584 860200A6 */ lh $v0, 0xa6($s0) -/* A74DF8 80240588 27A60024 */ addiu $a2, $sp, 0x24 -/* A74DFC 8024058C 44820000 */ mtc1 $v0, $f0 -/* A74E00 80240590 00000000 */ nop -/* A74E04 80240594 46800020 */ cvt.s.w $f0, $f0 -/* A74E08 80240598 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A74E0C 8024059C 8E040080 */ lw $a0, 0x80($s0) -/* A74E10 802405A0 0C037711 */ jal func_800DDC44 -/* A74E14 802405A4 27A70028 */ addiu $a3, $sp, 0x28 -/* A74E18 802405A8 0040902D */ daddu $s2, $v0, $zero -/* A74E1C 802405AC 16400005 */ bnez $s2, .L802405C4 -/* A74E20 802405B0 00000000 */ nop -/* A74E24 802405B4 8E050018 */ lw $a1, 0x18($s0) -/* A74E28 802405B8 8E06000C */ lw $a2, 0xc($s0) -/* A74E2C 802405BC 0C00EA95 */ jal npc_move_heading -/* A74E30 802405C0 0200202D */ daddu $a0, $s0, $zero -.L802405C4: -/* A74E34 802405C4 8602008E */ lh $v0, 0x8e($s0) -/* A74E38 802405C8 9603008E */ lhu $v1, 0x8e($s0) -/* A74E3C 802405CC 18400007 */ blez $v0, .L802405EC -/* A74E40 802405D0 2462FFFF */ addiu $v0, $v1, -1 -/* A74E44 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* A74E48 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* A74E4C 802405DC 18400003 */ blez $v0, .L802405EC -/* A74E50 802405E0 00000000 */ nop -/* A74E54 802405E4 12400008 */ beqz $s2, .L80240608 -/* A74E58 802405E8 00000000 */ nop -.L802405EC: -/* A74E5C 802405EC 8E2200CC */ lw $v0, 0xcc($s1) -/* A74E60 802405F0 A2200007 */ sb $zero, 7($s1) -/* A74E64 802405F4 8C420028 */ lw $v0, 0x28($v0) -/* A74E68 802405F8 A600008E */ sh $zero, 0x8e($s0) -/* A74E6C 802405FC AE020028 */ sw $v0, 0x28($s0) -/* A74E70 80240600 2402000F */ addiu $v0, $zero, 0xf -/* A74E74 80240604 AE620070 */ sw $v0, 0x70($s3) -.L80240608: -/* A74E78 80240608 8FBF0040 */ lw $ra, 0x40($sp) -/* A74E7C 8024060C 8FB3003C */ lw $s3, 0x3c($sp) -/* A74E80 80240610 8FB20038 */ lw $s2, 0x38($sp) -/* A74E84 80240614 8FB10034 */ lw $s1, 0x34($sp) -/* A74E88 80240618 8FB00030 */ lw $s0, 0x30($sp) -/* A74E8C 8024061C 03E00008 */ jr $ra -/* A74E90 80240620 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_70/func_80240624_A74870.s b/asm/nonmatchings/world/area_kpa/kpa_70/func_80240624_A74870.s deleted file mode 100644 index 430caa6f7a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_70/func_80240624_A74870.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240624_A74E94 -/* A74E94 80240624 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A74E98 80240628 AFB10014 */ sw $s1, 0x14($sp) -/* A74E9C 8024062C 0080882D */ daddu $s1, $a0, $zero -/* A74EA0 80240630 AFBF0018 */ sw $ra, 0x18($sp) -/* A74EA4 80240634 AFB00010 */ sw $s0, 0x10($sp) -/* A74EA8 80240638 8E300148 */ lw $s0, 0x148($s1) -/* A74EAC 8024063C 0C00EABB */ jal get_npc_unsafe -/* A74EB0 80240640 86040008 */ lh $a0, 8($s0) -/* A74EB4 80240644 0040202D */ daddu $a0, $v0, $zero -/* A74EB8 80240648 9482008E */ lhu $v0, 0x8e($a0) -/* A74EBC 8024064C 24030003 */ addiu $v1, $zero, 3 -/* A74EC0 80240650 24420001 */ addiu $v0, $v0, 1 -/* A74EC4 80240654 A482008E */ sh $v0, 0x8e($a0) -/* A74EC8 80240658 00021400 */ sll $v0, $v0, 0x10 -/* A74ECC 8024065C 00021403 */ sra $v0, $v0, 0x10 -/* A74ED0 80240660 14430003 */ bne $v0, $v1, .L80240670 -/* A74ED4 80240664 00000000 */ nop -/* A74ED8 80240668 96020086 */ lhu $v0, 0x86($s0) -/* A74EDC 8024066C A48200A8 */ sh $v0, 0xa8($a0) -.L80240670: -/* A74EE0 80240670 8482008E */ lh $v0, 0x8e($a0) -/* A74EE4 80240674 8E030080 */ lw $v1, 0x80($s0) -/* A74EE8 80240678 0043102A */ slt $v0, $v0, $v1 -/* A74EEC 8024067C 14400004 */ bnez $v0, .L80240690 -/* A74EF0 80240680 00000000 */ nop -/* A74EF4 80240684 96020086 */ lhu $v0, 0x86($s0) -/* A74EF8 80240688 A48200A8 */ sh $v0, 0xa8($a0) -/* A74EFC 8024068C AE200070 */ sw $zero, 0x70($s1) -.L80240690: -/* A74F00 80240690 8FBF0018 */ lw $ra, 0x18($sp) -/* A74F04 80240694 8FB10014 */ lw $s1, 0x14($sp) -/* A74F08 80240698 8FB00010 */ lw $s0, 0x10($sp) -/* A74F0C 8024069C 03E00008 */ jr $ra -/* A74F10 802406A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_70/func_802406A4_A74870.s b/asm/nonmatchings/world/area_kpa/kpa_70/func_802406A4_A74870.s deleted file mode 100644 index 3d84874398..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_70/func_802406A4_A74870.s +++ /dev/null @@ -1,304 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A4_A74F14 -/* A74F14 802406A4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A74F18 802406A8 AFB3005C */ sw $s3, 0x5c($sp) -/* A74F1C 802406AC 0080982D */ daddu $s3, $a0, $zero -/* A74F20 802406B0 AFBF0068 */ sw $ra, 0x68($sp) -/* A74F24 802406B4 AFB50064 */ sw $s5, 0x64($sp) -/* A74F28 802406B8 AFB40060 */ sw $s4, 0x60($sp) -/* A74F2C 802406BC AFB20058 */ sw $s2, 0x58($sp) -/* A74F30 802406C0 AFB10054 */ sw $s1, 0x54($sp) -/* A74F34 802406C4 AFB00050 */ sw $s0, 0x50($sp) -/* A74F38 802406C8 8E710148 */ lw $s1, 0x148($s3) -/* A74F3C 802406CC 86240008 */ lh $a0, 8($s1) -/* A74F40 802406D0 0C00EABB */ jal get_npc_unsafe -/* A74F44 802406D4 00A0802D */ daddu $s0, $a1, $zero -/* A74F48 802406D8 8E63000C */ lw $v1, 0xc($s3) -/* A74F4C 802406DC 0260202D */ daddu $a0, $s3, $zero -/* A74F50 802406E0 8C650000 */ lw $a1, ($v1) -/* A74F54 802406E4 0C0B1EAF */ jal get_variable -/* A74F58 802406E8 0040902D */ daddu $s2, $v0, $zero -/* A74F5C 802406EC AFA00028 */ sw $zero, 0x28($sp) -/* A74F60 802406F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* A74F64 802406F4 8C630030 */ lw $v1, 0x30($v1) -/* A74F68 802406F8 AFA3002C */ sw $v1, 0x2c($sp) -/* A74F6C 802406FC 8E2300D0 */ lw $v1, 0xd0($s1) -/* A74F70 80240700 8C63001C */ lw $v1, 0x1c($v1) -/* A74F74 80240704 AFA30030 */ sw $v1, 0x30($sp) -/* A74F78 80240708 8E2300D0 */ lw $v1, 0xd0($s1) -/* A74F7C 8024070C 8C630024 */ lw $v1, 0x24($v1) -/* A74F80 80240710 AFA30034 */ sw $v1, 0x34($sp) -/* A74F84 80240714 8E2300D0 */ lw $v1, 0xd0($s1) -/* A74F88 80240718 8C630028 */ lw $v1, 0x28($v1) -/* A74F8C 8024071C 27B50028 */ addiu $s5, $sp, 0x28 -/* A74F90 80240720 AFA30038 */ sw $v1, 0x38($sp) -/* A74F94 80240724 8E2300D0 */ lw $v1, 0xd0($s1) -/* A74F98 80240728 3C0142C8 */ lui $at, 0x42c8 -/* A74F9C 8024072C 44810000 */ mtc1 $at, $f0 -/* A74FA0 80240730 8C63002C */ lw $v1, 0x2c($v1) -/* A74FA4 80240734 0040A02D */ daddu $s4, $v0, $zero -/* A74FA8 80240738 E7A00040 */ swc1 $f0, 0x40($sp) -/* A74FAC 8024073C A7A00044 */ sh $zero, 0x44($sp) -/* A74FB0 80240740 12000009 */ beqz $s0, .L80240768 -/* A74FB4 80240744 AFA3003C */ sw $v1, 0x3c($sp) -/* A74FB8 80240748 864300A8 */ lh $v1, 0xa8($s2) -/* A74FBC 8024074C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A74FC0 80240750 AE20008C */ sw $zero, 0x8c($s1) -/* A74FC4 80240754 A22000B5 */ sb $zero, 0xb5($s1) -/* A74FC8 80240758 34420008 */ ori $v0, $v0, 8 -/* A74FCC 8024075C AE230084 */ sw $v1, 0x84($s1) -/* A74FD0 80240760 080901DE */ j .L80240778 -/* A74FD4 80240764 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240768: -/* A74FD8 80240768 8E2200B0 */ lw $v0, 0xb0($s1) -/* A74FDC 8024076C 30420004 */ andi $v0, $v0, 4 -/* A74FE0 80240770 10400047 */ beqz $v0, .L80240890 -/* A74FE4 80240774 00000000 */ nop -.L80240778: -/* A74FE8 80240778 AE600070 */ sw $zero, 0x70($s3) -/* A74FEC 8024077C A640008E */ sh $zero, 0x8e($s2) -/* A74FF0 80240780 8E2300CC */ lw $v1, 0xcc($s1) -/* A74FF4 80240784 2404F7FF */ addiu $a0, $zero, -0x801 -/* A74FF8 80240788 A2200007 */ sb $zero, 7($s1) -/* A74FFC 8024078C 8E420000 */ lw $v0, ($s2) -/* A75000 80240790 8C630000 */ lw $v1, ($v1) -/* A75004 80240794 00441024 */ and $v0, $v0, $a0 -/* A75008 80240798 AE420000 */ sw $v0, ($s2) -/* A7500C 8024079C AE430028 */ sw $v1, 0x28($s2) -/* A75010 802407A0 96220086 */ lhu $v0, 0x86($s1) -/* A75014 802407A4 A64200A8 */ sh $v0, 0xa8($s2) -/* A75018 802407A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* A7501C 802407AC AE200090 */ sw $zero, 0x90($s1) -/* A75020 802407B0 8C420034 */ lw $v0, 0x34($v0) -/* A75024 802407B4 14400006 */ bnez $v0, .L802407D0 -/* A75028 802407B8 2403FDFF */ addiu $v1, $zero, -0x201 -/* A7502C 802407BC 8E420000 */ lw $v0, ($s2) -/* A75030 802407C0 2403FFF7 */ addiu $v1, $zero, -9 -/* A75034 802407C4 34420200 */ ori $v0, $v0, 0x200 -/* A75038 802407C8 080901F7 */ j .L802407DC -/* A7503C 802407CC 00431024 */ and $v0, $v0, $v1 -.L802407D0: -/* A75040 802407D0 8E420000 */ lw $v0, ($s2) -/* A75044 802407D4 00431024 */ and $v0, $v0, $v1 -/* A75048 802407D8 34420008 */ ori $v0, $v0, 8 -.L802407DC: -/* A7504C 802407DC AE420000 */ sw $v0, ($s2) -/* A75050 802407E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A75054 802407E4 30420004 */ andi $v0, $v0, 4 -/* A75058 802407E8 1040001E */ beqz $v0, .L80240864 -/* A7505C 802407EC 24040002 */ addiu $a0, $zero, 2 -/* A75060 802407F0 0240282D */ daddu $a1, $s2, $zero -/* A75064 802407F4 0000302D */ daddu $a2, $zero, $zero -/* A75068 802407F8 24020063 */ addiu $v0, $zero, 0x63 -/* A7506C 802407FC AE620070 */ sw $v0, 0x70($s3) -/* A75070 80240800 AE600074 */ sw $zero, 0x74($s3) -/* A75074 80240804 864300A8 */ lh $v1, 0xa8($s2) -/* A75078 80240808 3C013F80 */ lui $at, 0x3f80 -/* A7507C 8024080C 44810000 */ mtc1 $at, $f0 -/* A75080 80240810 3C014000 */ lui $at, 0x4000 -/* A75084 80240814 44811000 */ mtc1 $at, $f2 -/* A75088 80240818 3C01C1A0 */ lui $at, 0xc1a0 -/* A7508C 8024081C 44812000 */ mtc1 $at, $f4 -/* A75090 80240820 24020028 */ addiu $v0, $zero, 0x28 -/* A75094 80240824 AFA2001C */ sw $v0, 0x1c($sp) -/* A75098 80240828 44833000 */ mtc1 $v1, $f6 -/* A7509C 8024082C 00000000 */ nop -/* A750A0 80240830 468031A0 */ cvt.s.w $f6, $f6 -/* A750A4 80240834 44073000 */ mfc1 $a3, $f6 -/* A750A8 80240838 27A20048 */ addiu $v0, $sp, 0x48 -/* A750AC 8024083C AFA20020 */ sw $v0, 0x20($sp) -/* A750B0 80240840 E7A00010 */ swc1 $f0, 0x10($sp) -/* A750B4 80240844 E7A20014 */ swc1 $f2, 0x14($sp) -/* A750B8 80240848 0C01BFA4 */ jal fx_emote -/* A750BC 8024084C E7A40018 */ swc1 $f4, 0x18($sp) -/* A750C0 80240850 8E2200B0 */ lw $v0, 0xb0($s1) -/* A750C4 80240854 2403FFFB */ addiu $v1, $zero, -5 -/* A750C8 80240858 00431024 */ and $v0, $v0, $v1 -/* A750CC 8024085C 08090224 */ j .L80240890 -/* A750D0 80240860 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240864: -/* A750D4 80240864 8E220000 */ lw $v0, ($s1) -/* A750D8 80240868 3C034000 */ lui $v1, 0x4000 -/* A750DC 8024086C 00431024 */ and $v0, $v0, $v1 -/* A750E0 80240870 10400007 */ beqz $v0, .L80240890 -/* A750E4 80240874 3C03BFFF */ lui $v1, 0xbfff -/* A750E8 80240878 2402000C */ addiu $v0, $zero, 0xc -/* A750EC 8024087C AE620070 */ sw $v0, 0x70($s3) -/* A750F0 80240880 8E220000 */ lw $v0, ($s1) -/* A750F4 80240884 3463FFFF */ ori $v1, $v1, 0xffff -/* A750F8 80240888 00431024 */ and $v0, $v0, $v1 -/* A750FC 8024088C AE220000 */ sw $v0, ($s1) -.L80240890: -/* A75100 80240890 8E220090 */ lw $v0, 0x90($s1) -/* A75104 80240894 1840000C */ blez $v0, .L802408C8 -/* A75108 80240898 2442FFFF */ addiu $v0, $v0, -1 -/* A7510C 8024089C 14400087 */ bnez $v0, .L80240ABC -/* A75110 802408A0 AE220090 */ sw $v0, 0x90($s1) -/* A75114 802408A4 3C03FFAA */ lui $v1, 0xffaa -/* A75118 802408A8 8E420028 */ lw $v0, 0x28($s2) -/* A7511C 802408AC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A75120 802408B0 00431021 */ addu $v0, $v0, $v1 -/* A75124 802408B4 2C420002 */ sltiu $v0, $v0, 2 -/* A75128 802408B8 10400003 */ beqz $v0, .L802408C8 -/* A7512C 802408BC 3C020055 */ lui $v0, 0x55 -/* A75130 802408C0 3442000C */ ori $v0, $v0, 0xc -/* A75134 802408C4 AE420028 */ sw $v0, 0x28($s2) -.L802408C8: -/* A75138 802408C8 8E630070 */ lw $v1, 0x70($s3) -/* A7513C 802408CC 2402000C */ addiu $v0, $zero, 0xc -/* A75140 802408D0 10620048 */ beq $v1, $v0, .L802409F4 -/* A75144 802408D4 2862000D */ slti $v0, $v1, 0xd -/* A75148 802408D8 1040000F */ beqz $v0, .L80240918 -/* A7514C 802408DC 24100001 */ addiu $s0, $zero, 1 -/* A75150 802408E0 1070001E */ beq $v1, $s0, .L8024095C -/* A75154 802408E4 28620002 */ slti $v0, $v1, 2 -/* A75158 802408E8 10400005 */ beqz $v0, .L80240900 -/* A7515C 802408EC 24020002 */ addiu $v0, $zero, 2 -/* A75160 802408F0 10600015 */ beqz $v1, .L80240948 -/* A75164 802408F4 0260202D */ daddu $a0, $s3, $zero -/* A75168 802408F8 08090294 */ j .L80240A50 -/* A7516C 802408FC 00000000 */ nop -.L80240900: -/* A75170 80240900 1062001C */ beq $v1, $v0, .L80240974 -/* A75174 80240904 24020003 */ addiu $v0, $zero, 3 -/* A75178 80240908 10620035 */ beq $v1, $v0, .L802409E0 -/* A7517C 8024090C 0260202D */ daddu $a0, $s3, $zero -/* A75180 80240910 08090294 */ j .L80240A50 -/* A75184 80240914 00000000 */ nop -.L80240918: -/* A75188 80240918 2402000E */ addiu $v0, $zero, 0xe -/* A7518C 8024091C 1062003F */ beq $v1, $v0, .L80240A1C -/* A75190 80240920 0062102A */ slt $v0, $v1, $v0 -/* A75194 80240924 14400038 */ bnez $v0, .L80240A08 -/* A75198 80240928 0260202D */ daddu $a0, $s3, $zero -/* A7519C 8024092C 2402000F */ addiu $v0, $zero, 0xf -/* A751A0 80240930 10620040 */ beq $v1, $v0, .L80240A34 -/* A751A4 80240934 24020063 */ addiu $v0, $zero, 0x63 -/* A751A8 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* A751AC 8024093C 00000000 */ nop -/* A751B0 80240940 08090294 */ j .L80240A50 -/* A751B4 80240944 00000000 */ nop -.L80240948: -/* A751B8 80240948 0280282D */ daddu $a1, $s4, $zero -/* A751BC 8024094C 0C012568 */ jal func_800495A0 -/* A751C0 80240950 02A0302D */ daddu $a2, $s5, $zero -/* A751C4 80240954 96220086 */ lhu $v0, 0x86($s1) -/* A751C8 80240958 A64200A8 */ sh $v0, 0xa8($s2) -.L8024095C: -/* A751CC 8024095C 0260202D */ daddu $a0, $s3, $zero -/* A751D0 80240960 0280282D */ daddu $a1, $s4, $zero -/* A751D4 80240964 0C0125AE */ jal func_800496B8 -/* A751D8 80240968 02A0302D */ daddu $a2, $s5, $zero -/* A751DC 8024096C 08090294 */ j .L80240A50 -/* A751E0 80240970 00000000 */ nop -.L80240974: -/* A751E4 80240974 0260202D */ daddu $a0, $s3, $zero -/* A751E8 80240978 0280282D */ daddu $a1, $s4, $zero -/* A751EC 8024097C 0C0126D1 */ jal func_80049B44 -/* A751F0 80240980 02A0302D */ daddu $a2, $s5, $zero -/* A751F4 80240984 8E230088 */ lw $v1, 0x88($s1) -/* A751F8 80240988 24020006 */ addiu $v0, $zero, 6 -/* A751FC 8024098C 14620014 */ bne $v1, $v0, .L802409E0 -/* A75200 80240990 0260202D */ daddu $a0, $s3, $zero -/* A75204 80240994 0C00A67F */ jal rand_int -/* A75208 80240998 24040064 */ addiu $a0, $zero, 0x64 -/* A7520C 8024099C 28420021 */ slti $v0, $v0, 0x21 -/* A75210 802409A0 5040000F */ beql $v0, $zero, .L802409E0 -/* A75214 802409A4 0260202D */ daddu $a0, $s3, $zero -/* A75218 802409A8 8E22008C */ lw $v0, 0x8c($s1) -/* A7521C 802409AC 10400005 */ beqz $v0, .L802409C4 -/* A75220 802409B0 3C020055 */ lui $v0, 0x55 -/* A75224 802409B4 3442002F */ ori $v0, $v0, 0x2f -/* A75228 802409B8 AE20008C */ sw $zero, 0x8c($s1) -/* A7522C 802409BC 08090274 */ j .L802409D0 -/* A75230 802409C0 A22000B5 */ sb $zero, 0xb5($s1) -.L802409C4: -/* A75234 802409C4 3442002E */ ori $v0, $v0, 0x2e -/* A75238 802409C8 AE30008C */ sw $s0, 0x8c($s1) -/* A7523C 802409CC A23000B5 */ sb $s0, 0xb5($s1) -.L802409D0: -/* A75240 802409D0 AE420028 */ sw $v0, 0x28($s2) -/* A75244 802409D4 24020007 */ addiu $v0, $zero, 7 -/* A75248 802409D8 080902AF */ j .L80240ABC -/* A7524C 802409DC AE220090 */ sw $v0, 0x90($s1) -.L802409E0: -/* A75250 802409E0 0280282D */ daddu $a1, $s4, $zero -/* A75254 802409E4 0C012701 */ jal func_80049C04 -/* A75258 802409E8 02A0302D */ daddu $a2, $s5, $zero -/* A7525C 802409EC 08090294 */ j .L80240A50 -/* A75260 802409F0 00000000 */ nop -.L802409F4: -/* A75264 802409F4 0260202D */ daddu $a0, $s3, $zero -/* A75268 802409F8 0280282D */ daddu $a1, $s4, $zero -/* A7526C 802409FC 0C0900C4 */ jal func_80240310 -/* A75270 80240A00 02A0302D */ daddu $a2, $s5, $zero -/* A75274 80240A04 0260202D */ daddu $a0, $s3, $zero -.L80240A08: -/* A75278 80240A08 0280282D */ daddu $a1, $s4, $zero -/* A7527C 80240A0C 0C0900E3 */ jal func_8024038C -/* A75280 80240A10 02A0302D */ daddu $a2, $s5, $zero -/* A75284 80240A14 08090294 */ j .L80240A50 -/* A75288 80240A18 00000000 */ nop -.L80240A1C: -/* A7528C 80240A1C 0260202D */ daddu $a0, $s3, $zero -/* A75290 80240A20 0280282D */ daddu $a1, $s4, $zero -/* A75294 80240A24 0C090130 */ jal func_802404C0 -/* A75298 80240A28 02A0302D */ daddu $a2, $s5, $zero -/* A7529C 80240A2C 08090294 */ j .L80240A50 -/* A752A0 80240A30 00000000 */ nop -.L80240A34: -/* A752A4 80240A34 0280282D */ daddu $a1, $s4, $zero -/* A752A8 80240A38 0C090189 */ jal func_80240624 -/* A752AC 80240A3C 02A0302D */ daddu $a2, $s5, $zero -/* A752B0 80240A40 08090294 */ j .L80240A50 -/* A752B4 80240A44 00000000 */ nop -.L80240A48: -/* A752B8 80240A48 0C0129CF */ jal func_8004A73C -/* A752BC 80240A4C 0260202D */ daddu $a0, $s3, $zero -.L80240A50: -/* A752C0 80240A50 8E230088 */ lw $v1, 0x88($s1) -/* A752C4 80240A54 24020006 */ addiu $v0, $zero, 6 -/* A752C8 80240A58 14620019 */ bne $v1, $v0, .L80240AC0 -/* A752CC 80240A5C 0000102D */ daddu $v0, $zero, $zero -/* A752D0 80240A60 8E22008C */ lw $v0, 0x8c($s1) -/* A752D4 80240A64 10400003 */ beqz $v0, .L80240A74 -/* A752D8 80240A68 24020001 */ addiu $v0, $zero, 1 -/* A752DC 80240A6C 0809029E */ j .L80240A78 -/* A752E0 80240A70 A22200B5 */ sb $v0, 0xb5($s1) -.L80240A74: -/* A752E4 80240A74 A22000B5 */ sb $zero, 0xb5($s1) -.L80240A78: -/* A752E8 80240A78 8E22008C */ lw $v0, 0x8c($s1) -/* A752EC 80240A7C 1040000F */ beqz $v0, .L80240ABC -/* A752F0 80240A80 3C03FFAA */ lui $v1, 0xffaa -/* A752F4 80240A84 8E420028 */ lw $v0, 0x28($s2) -/* A752F8 80240A88 3463FFFC */ ori $v1, $v1, 0xfffc -/* A752FC 80240A8C 00431821 */ addu $v1, $v0, $v1 -/* A75300 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 -/* A75304 80240A94 10400009 */ beqz $v0, .L80240ABC -/* A75308 80240A98 00031080 */ sll $v0, $v1, 2 -/* A7530C 80240A9C 3C018024 */ lui $at, 0x8024 -/* A75310 80240AA0 00220821 */ addu $at, $at, $v0 -/* A75314 80240AA4 8C223BF8 */ lw $v0, 0x3bf8($at) -/* A75318 80240AA8 00400008 */ jr $v0 -/* A7531C 80240AAC 00000000 */ nop -/* A75320 80240AB0 8E420028 */ lw $v0, 0x28($s2) -/* A75324 80240AB4 24420001 */ addiu $v0, $v0, 1 -/* A75328 80240AB8 AE420028 */ sw $v0, 0x28($s2) -.L80240ABC: -/* A7532C 80240ABC 0000102D */ daddu $v0, $zero, $zero -.L80240AC0: -/* A75330 80240AC0 8FBF0068 */ lw $ra, 0x68($sp) -/* A75334 80240AC4 8FB50064 */ lw $s5, 0x64($sp) -/* A75338 80240AC8 8FB40060 */ lw $s4, 0x60($sp) -/* A7533C 80240ACC 8FB3005C */ lw $s3, 0x5c($sp) -/* A75340 80240AD0 8FB20058 */ lw $s2, 0x58($sp) -/* A75344 80240AD4 8FB10054 */ lw $s1, 0x54($sp) -/* A75348 80240AD8 8FB00050 */ lw $s0, 0x50($sp) -/* A7534C 80240ADC 03E00008 */ jr $ra -/* A75350 80240AE0 27BD0070 */ addiu $sp, $sp, 0x70 -/* A75354 80240AE4 00000000 */ nop -/* A75358 80240AE8 00000000 */ nop -/* A7535C 80240AEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/func_80240050_A784C0.s b/asm/nonmatchings/world/area_kpa/kpa_81/func_80240050_A784C0.s deleted file mode 100644 index 2e6b369f97..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_81/func_80240050_A784C0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_A78510 -/* A78510 80240050 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A78514 80240054 AFB10014 */ sw $s1, 0x14($sp) -/* A78518 80240058 0080882D */ daddu $s1, $a0, $zero -/* A7851C 8024005C AFBF0018 */ sw $ra, 0x18($sp) -/* A78520 80240060 AFB00010 */ sw $s0, 0x10($sp) -/* A78524 80240064 8E30000C */ lw $s0, 0xc($s1) -/* A78528 80240068 8E050000 */ lw $a1, ($s0) -/* A7852C 8024006C 0C0B1EAF */ jal get_variable -/* A78530 80240070 26100004 */ addiu $s0, $s0, 4 -/* A78534 80240074 0C00EAD2 */ jal get_npc_safe -/* A78538 80240078 0040202D */ daddu $a0, $v0, $zero -/* A7853C 8024007C 10400005 */ beqz $v0, .L80240094 -/* A78540 80240080 00000000 */ nop -/* A78544 80240084 8E050000 */ lw $a1, ($s0) -/* A78548 80240088 844600A8 */ lh $a2, 0xa8($v0) -/* A7854C 8024008C 0C0B2026 */ jal set_variable -/* A78550 80240090 0220202D */ daddu $a0, $s1, $zero -.L80240094: -/* A78554 80240094 8FBF0018 */ lw $ra, 0x18($sp) -/* A78558 80240098 8FB10014 */ lw $s1, 0x14($sp) -/* A7855C 8024009C 8FB00010 */ lw $s0, 0x10($sp) -/* A78560 802400A0 24020002 */ addiu $v0, $zero, 2 -/* A78564 802400A4 03E00008 */ jr $ra -/* A78568 802400A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/func_8024027C_A784C0.s b/asm/nonmatchings/world/area_kpa/kpa_81/func_8024027C_A784C0.s deleted file mode 100644 index 724049dc3b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_81/func_8024027C_A784C0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024027C_A7873C -/* A7873C 8024027C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A78740 80240280 AFBF0010 */ sw $ra, 0x10($sp) -/* A78744 80240284 10A00003 */ beqz $a1, .L80240294 -/* A78748 80240288 8C86000C */ lw $a2, 0xc($a0) -/* A7874C 8024028C 3C018024 */ lui $at, 0x8024 -/* A78750 80240290 AC200D98 */ sw $zero, 0xd98($at) -.L80240294: -/* A78754 80240294 3C038024 */ lui $v1, 0x8024 -/* A78758 80240298 24630D98 */ addiu $v1, $v1, 0xd98 -/* A7875C 8024029C 8C620000 */ lw $v0, ($v1) -/* A78760 802402A0 54400003 */ bnel $v0, $zero, .L802402B0 -/* A78764 802402A4 AC600000 */ sw $zero, ($v1) -/* A78768 802402A8 080900B1 */ j .L802402C4 -/* A7876C 802402AC 0000102D */ daddu $v0, $zero, $zero -.L802402B0: -/* A78770 802402B0 8CC50000 */ lw $a1, ($a2) -/* A78774 802402B4 3C068024 */ lui $a2, 0x8024 -/* A78778 802402B8 0C0B2026 */ jal set_variable -/* A7877C 802402BC 8CC60D9C */ lw $a2, 0xd9c($a2) -/* A78780 802402C0 24020002 */ addiu $v0, $zero, 2 -.L802402C4: -/* A78784 802402C4 8FBF0010 */ lw $ra, 0x10($sp) -/* A78788 802402C8 03E00008 */ jr $ra -/* A7878C 802402CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/func_802402D0_A784C0.s b/asm/nonmatchings/world/area_kpa/kpa_81/func_802402D0_A784C0.s deleted file mode 100644 index d446601a41..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_81/func_802402D0_A784C0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402D0_A78790 -/* A78790 802402D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A78794 802402D4 AFBF0010 */ sw $ra, 0x10($sp) -/* A78798 802402D8 8C82000C */ lw $v0, 0xc($a0) -/* A7879C 802402DC 0C0B1EAF */ jal get_variable -/* A787A0 802402E0 8C450000 */ lw $a1, ($v0) -/* A787A4 802402E4 3C018024 */ lui $at, 0x8024 -/* A787A8 802402E8 AC220D9C */ sw $v0, 0xd9c($at) -/* A787AC 802402EC 24020002 */ addiu $v0, $zero, 2 -/* A787B0 802402F0 8FBF0010 */ lw $ra, 0x10($sp) -/* A787B4 802402F4 24030001 */ addiu $v1, $zero, 1 -/* A787B8 802402F8 3C018024 */ lui $at, 0x8024 -/* A787BC 802402FC AC230D98 */ sw $v1, 0xd98($at) -/* A787C0 80240300 03E00008 */ jr $ra -/* A787C4 80240304 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/func_80240050_A7A500.s b/asm/nonmatchings/world/area_kpa/kpa_82/func_80240050_A7A500.s deleted file mode 100644 index 84958518b7..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_82/func_80240050_A7A500.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_A7A550 -/* A7A550 80240050 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A7A554 80240054 AFB10014 */ sw $s1, 0x14($sp) -/* A7A558 80240058 0080882D */ daddu $s1, $a0, $zero -/* A7A55C 8024005C AFBF0018 */ sw $ra, 0x18($sp) -/* A7A560 80240060 AFB00010 */ sw $s0, 0x10($sp) -/* A7A564 80240064 8E30000C */ lw $s0, 0xc($s1) -/* A7A568 80240068 8E050000 */ lw $a1, ($s0) -/* A7A56C 8024006C 0C0B1EAF */ jal get_variable -/* A7A570 80240070 26100004 */ addiu $s0, $s0, 4 -/* A7A574 80240074 0C00EAD2 */ jal get_npc_safe -/* A7A578 80240078 0040202D */ daddu $a0, $v0, $zero -/* A7A57C 8024007C 10400005 */ beqz $v0, .L80240094 -/* A7A580 80240080 00000000 */ nop -/* A7A584 80240084 8E050000 */ lw $a1, ($s0) -/* A7A588 80240088 844600A8 */ lh $a2, 0xa8($v0) -/* A7A58C 8024008C 0C0B2026 */ jal set_variable -/* A7A590 80240090 0220202D */ daddu $a0, $s1, $zero -.L80240094: -/* A7A594 80240094 8FBF0018 */ lw $ra, 0x18($sp) -/* A7A598 80240098 8FB10014 */ lw $s1, 0x14($sp) -/* A7A59C 8024009C 8FB00010 */ lw $s0, 0x10($sp) -/* A7A5A0 802400A0 24020002 */ addiu $v0, $zero, 2 -/* A7A5A4 802400A4 03E00008 */ jr $ra -/* A7A5A8 802400A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/func_802400AC_A7A500.s b/asm/nonmatchings/world/area_kpa/kpa_82/func_802400AC_A7A500.s deleted file mode 100644 index 7b53c9861b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_82/func_802400AC_A7A500.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400AC_A7A5AC -/* A7A5AC 802400AC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A7A5B0 802400B0 AFB10014 */ sw $s1, 0x14($sp) -/* A7A5B4 802400B4 0080882D */ daddu $s1, $a0, $zero -/* A7A5B8 802400B8 AFBF0024 */ sw $ra, 0x24($sp) -/* A7A5BC 802400BC AFB40020 */ sw $s4, 0x20($sp) -/* A7A5C0 802400C0 AFB3001C */ sw $s3, 0x1c($sp) -/* A7A5C4 802400C4 AFB20018 */ sw $s2, 0x18($sp) -/* A7A5C8 802400C8 AFB00010 */ sw $s0, 0x10($sp) -/* A7A5CC 802400CC F7BC0048 */ sdc1 $f28, 0x48($sp) -/* A7A5D0 802400D0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* A7A5D4 802400D4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* A7A5D8 802400D8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* A7A5DC 802400DC F7B40028 */ sdc1 $f20, 0x28($sp) -/* A7A5E0 802400E0 8E30000C */ lw $s0, 0xc($s1) -/* A7A5E4 802400E4 8E130000 */ lw $s3, ($s0) -/* A7A5E8 802400E8 26100004 */ addiu $s0, $s0, 4 -/* A7A5EC 802400EC 0C0B1EAF */ jal get_variable -/* A7A5F0 802400F0 0260282D */ daddu $a1, $s3, $zero -/* A7A5F4 802400F4 4482E000 */ mtc1 $v0, $f28 -/* A7A5F8 802400F8 00000000 */ nop -/* A7A5FC 802400FC 4680E720 */ cvt.s.w $f28, $f28 -/* A7A600 80240100 8E140000 */ lw $s4, ($s0) -/* A7A604 80240104 26100004 */ addiu $s0, $s0, 4 -/* A7A608 80240108 0220202D */ daddu $a0, $s1, $zero -/* A7A60C 8024010C 0C0B1EAF */ jal get_variable -/* A7A610 80240110 0280282D */ daddu $a1, $s4, $zero -/* A7A614 80240114 4482D000 */ mtc1 $v0, $f26 -/* A7A618 80240118 00000000 */ nop -/* A7A61C 8024011C 4680D6A0 */ cvt.s.w $f26, $f26 -/* A7A620 80240120 8E100000 */ lw $s0, ($s0) -/* A7A624 80240124 0220202D */ daddu $a0, $s1, $zero -/* A7A628 80240128 0C0B1EAF */ jal get_variable -/* A7A62C 8024012C 0200282D */ daddu $a1, $s0, $zero -/* A7A630 80240130 4482C000 */ mtc1 $v0, $f24 -/* A7A634 80240134 00000000 */ nop -/* A7A638 80240138 4680C620 */ cvt.s.w $f24, $f24 -/* A7A63C 8024013C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* A7A640 80240140 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* A7A644 80240144 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A7A648 80240148 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A7A64C 8024014C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* A7A650 80240150 44800000 */ mtc1 $zero, $f0 -/* A7A654 80240154 00031080 */ sll $v0, $v1, 2 -/* A7A658 80240158 00431021 */ addu $v0, $v0, $v1 -/* A7A65C 8024015C 00021080 */ sll $v0, $v0, 2 -/* A7A660 80240160 00431023 */ subu $v0, $v0, $v1 -/* A7A664 80240164 000218C0 */ sll $v1, $v0, 3 -/* A7A668 80240168 00431021 */ addu $v0, $v0, $v1 -/* A7A66C 8024016C 000210C0 */ sll $v0, $v0, 3 -/* A7A670 80240170 46001032 */ c.eq.s $f2, $f0 -/* A7A674 80240174 3C01800B */ lui $at, 0x800b -/* A7A678 80240178 00220821 */ addu $at, $at, $v0 -/* A7A67C 8024017C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* A7A680 80240180 45000005 */ bc1f .L80240198 -/* A7A684 80240184 00000000 */ nop -/* A7A688 80240188 3C0142C8 */ lui $at, 0x42c8 -/* A7A68C 8024018C 44810000 */ mtc1 $at, $f0 -/* A7A690 80240190 0809006A */ j .L802401A8 -/* A7A694 80240194 4600B581 */ sub.s $f22, $f22, $f0 -.L80240198: -/* A7A698 80240198 3C0142C8 */ lui $at, 0x42c8 -/* A7A69C 8024019C 44810000 */ mtc1 $at, $f0 -/* A7A6A0 802401A0 00000000 */ nop -/* A7A6A4 802401A4 4600B580 */ add.s $f22, $f22, $f0 -.L802401A8: -/* A7A6A8 802401A8 0C00A6C9 */ jal clamp_angle -/* A7A6AC 802401AC 4600B306 */ mov.s $f12, $f22 -/* A7A6B0 802401B0 46000586 */ mov.s $f22, $f0 -/* A7A6B4 802401B4 3C014170 */ lui $at, 0x4170 -/* A7A6B8 802401B8 4481A000 */ mtc1 $at, $f20 -/* A7A6BC 802401BC 0C00A8BB */ jal sin_deg -/* A7A6C0 802401C0 4600B306 */ mov.s $f12, $f22 -/* A7A6C4 802401C4 46140002 */ mul.s $f0, $f0, $f20 -/* A7A6C8 802401C8 00000000 */ nop -/* A7A6CC 802401CC 864200B0 */ lh $v0, 0xb0($s2) -/* A7A6D0 802401D0 3C013F00 */ lui $at, 0x3f00 -/* A7A6D4 802401D4 44812000 */ mtc1 $at, $f4 -/* A7A6D8 802401D8 44821000 */ mtc1 $v0, $f2 -/* A7A6DC 802401DC 00000000 */ nop -/* A7A6E0 802401E0 468010A0 */ cvt.s.w $f2, $f2 -/* A7A6E4 802401E4 46041082 */ mul.s $f2, $f2, $f4 -/* A7A6E8 802401E8 00000000 */ nop -/* A7A6EC 802401EC 4600E700 */ add.s $f28, $f28, $f0 -/* A7A6F0 802401F0 4602D680 */ add.s $f26, $f26, $f2 -/* A7A6F4 802401F4 0C00A8D4 */ jal cos_deg -/* A7A6F8 802401F8 4600B306 */ mov.s $f12, $f22 -/* A7A6FC 802401FC 46140002 */ mul.s $f0, $f0, $f20 -/* A7A700 80240200 00000000 */ nop -/* A7A704 80240204 0220202D */ daddu $a0, $s1, $zero -/* A7A708 80240208 0260282D */ daddu $a1, $s3, $zero -/* A7A70C 8024020C 4600E18D */ trunc.w.s $f6, $f28 -/* A7A710 80240210 44063000 */ mfc1 $a2, $f6 -/* A7A714 80240214 0C0B2026 */ jal set_variable -/* A7A718 80240218 4600C601 */ sub.s $f24, $f24, $f0 -/* A7A71C 8024021C 0220202D */ daddu $a0, $s1, $zero -/* A7A720 80240220 4600D18D */ trunc.w.s $f6, $f26 -/* A7A724 80240224 44063000 */ mfc1 $a2, $f6 -/* A7A728 80240228 0C0B2026 */ jal set_variable -/* A7A72C 8024022C 0280282D */ daddu $a1, $s4, $zero -/* A7A730 80240230 0220202D */ daddu $a0, $s1, $zero -/* A7A734 80240234 4600C18D */ trunc.w.s $f6, $f24 -/* A7A738 80240238 44063000 */ mfc1 $a2, $f6 -/* A7A73C 8024023C 0C0B2026 */ jal set_variable -/* A7A740 80240240 0200282D */ daddu $a1, $s0, $zero -/* A7A744 80240244 8FBF0024 */ lw $ra, 0x24($sp) -/* A7A748 80240248 8FB40020 */ lw $s4, 0x20($sp) -/* A7A74C 8024024C 8FB3001C */ lw $s3, 0x1c($sp) -/* A7A750 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* A7A754 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* A7A758 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* A7A75C 8024025C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* A7A760 80240260 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* A7A764 80240264 D7B80038 */ ldc1 $f24, 0x38($sp) -/* A7A768 80240268 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A7A76C 8024026C D7B40028 */ ldc1 $f20, 0x28($sp) -/* A7A770 80240270 24020002 */ addiu $v0, $zero, 2 -/* A7A774 80240274 03E00008 */ jr $ra -/* A7A778 80240278 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/func_8024027C_A7A500.s b/asm/nonmatchings/world/area_kpa/kpa_82/func_8024027C_A7A500.s deleted file mode 100644 index 551925ee11..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_82/func_8024027C_A7A500.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024027C_A7A77C -/* A7A77C 8024027C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A7A780 80240280 AFBF0010 */ sw $ra, 0x10($sp) -/* A7A784 80240284 10A00003 */ beqz $a1, .L80240294 -/* A7A788 80240288 8C86000C */ lw $a2, 0xc($a0) -/* A7A78C 8024028C 3C018024 */ lui $at, 0x8024 -/* A7A790 80240290 AC200C20 */ sw $zero, 0xc20($at) -.L80240294: -/* A7A794 80240294 3C038024 */ lui $v1, 0x8024 -/* A7A798 80240298 24630C20 */ addiu $v1, $v1, 0xc20 -/* A7A79C 8024029C 8C620000 */ lw $v0, ($v1) -/* A7A7A0 802402A0 54400003 */ bnel $v0, $zero, .L802402B0 -/* A7A7A4 802402A4 AC600000 */ sw $zero, ($v1) -/* A7A7A8 802402A8 080900B1 */ j .L802402C4 -/* A7A7AC 802402AC 0000102D */ daddu $v0, $zero, $zero -.L802402B0: -/* A7A7B0 802402B0 8CC50000 */ lw $a1, ($a2) -/* A7A7B4 802402B4 3C068024 */ lui $a2, 0x8024 -/* A7A7B8 802402B8 0C0B2026 */ jal set_variable -/* A7A7BC 802402BC 8CC60C24 */ lw $a2, 0xc24($a2) -/* A7A7C0 802402C0 24020002 */ addiu $v0, $zero, 2 -.L802402C4: -/* A7A7C4 802402C4 8FBF0010 */ lw $ra, 0x10($sp) -/* A7A7C8 802402C8 03E00008 */ jr $ra -/* A7A7CC 802402CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/func_802402D0_A7A500.s b/asm/nonmatchings/world/area_kpa/kpa_82/func_802402D0_A7A500.s deleted file mode 100644 index 42279383f0..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_82/func_802402D0_A7A500.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402D0_A7A7D0 -/* A7A7D0 802402D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A7A7D4 802402D4 AFBF0010 */ sw $ra, 0x10($sp) -/* A7A7D8 802402D8 8C82000C */ lw $v0, 0xc($a0) -/* A7A7DC 802402DC 0C0B1EAF */ jal get_variable -/* A7A7E0 802402E0 8C450000 */ lw $a1, ($v0) -/* A7A7E4 802402E4 3C018024 */ lui $at, 0x8024 -/* A7A7E8 802402E8 AC220C24 */ sw $v0, 0xc24($at) -/* A7A7EC 802402EC 24020002 */ addiu $v0, $zero, 2 -/* A7A7F0 802402F0 8FBF0010 */ lw $ra, 0x10($sp) -/* A7A7F4 802402F4 24030001 */ addiu $v1, $zero, 1 -/* A7A7F8 802402F8 3C018024 */ lui $at, 0x8024 -/* A7A7FC 802402FC AC230C20 */ sw $v1, 0xc20($at) -/* A7A800 80240300 03E00008 */ jr $ra -/* A7A804 80240304 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/func_80240308_A7A500.s b/asm/nonmatchings/world/area_kpa/kpa_82/func_80240308_A7A500.s deleted file mode 100644 index d18a37d9fb..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_82/func_80240308_A7A500.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240308_A7A808 -/* A7A808 80240308 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A7A80C 8024030C AFBF0010 */ sw $ra, 0x10($sp) -/* A7A810 80240310 8C82000C */ lw $v0, 0xc($a0) -/* A7A814 80240314 0C0B1EAF */ jal get_variable -/* A7A818 80240318 8C450000 */ lw $a1, ($v0) -/* A7A81C 8024031C 0040182D */ daddu $v1, $v0, $zero -/* A7A820 80240320 10600012 */ beqz $v1, .L8024036C -/* A7A824 80240324 0000202D */ daddu $a0, $zero, $zero -/* A7A828 80240328 8C620000 */ lw $v0, ($v1) -/* A7A82C 8024032C 5040000A */ beql $v0, $zero, .L80240358 -/* A7A830 80240330 00041080 */ sll $v0, $a0, 2 -/* A7A834 80240334 3C058025 */ lui $a1, 0x8025 -/* A7A838 80240338 24A58F90 */ addiu $a1, $a1, -0x7070 -.L8024033C: -/* A7A83C 8024033C 24630004 */ addiu $v1, $v1, 4 -/* A7A840 80240340 24840001 */ addiu $a0, $a0, 1 -/* A7A844 80240344 ACA20000 */ sw $v0, ($a1) -/* A7A848 80240348 8C620000 */ lw $v0, ($v1) -/* A7A84C 8024034C 1440FFFB */ bnez $v0, .L8024033C -/* A7A850 80240350 24A50004 */ addiu $a1, $a1, 4 -/* A7A854 80240354 00041080 */ sll $v0, $a0, 2 -.L80240358: -/* A7A858 80240358 3C018025 */ lui $at, 0x8025 -/* A7A85C 8024035C 00220821 */ addu $at, $at, $v0 -/* A7A860 80240360 AC208F90 */ sw $zero, -0x7070($at) -/* A7A864 80240364 080900E5 */ j .L80240394 -/* A7A868 80240368 00000000 */ nop -.L8024036C: -/* A7A86C 8024036C 3C038025 */ lui $v1, 0x8025 -/* A7A870 80240370 24638F90 */ addiu $v1, $v1, -0x7070 -/* A7A874 80240374 0060282D */ daddu $a1, $v1, $zero -.L80240378: -/* A7A878 80240378 24820010 */ addiu $v0, $a0, 0x10 -/* A7A87C 8024037C AC620000 */ sw $v0, ($v1) -/* A7A880 80240380 24630004 */ addiu $v1, $v1, 4 -/* A7A884 80240384 24840001 */ addiu $a0, $a0, 1 -/* A7A888 80240388 28820070 */ slti $v0, $a0, 0x70 -/* A7A88C 8024038C 1440FFFA */ bnez $v0, .L80240378 -/* A7A890 80240390 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80240394: -/* A7A894 80240394 8FBF0010 */ lw $ra, 0x10($sp) -/* A7A898 80240398 24020002 */ addiu $v0, $zero, 2 -/* A7A89C 8024039C 03E00008 */ jr $ra -/* A7A8A0 802403A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/func_802403A4_A7A500.s b/asm/nonmatchings/world/area_kpa/kpa_82/func_802403A4_A7A500.s deleted file mode 100644 index 96bf6b5484..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_82/func_802403A4_A7A500.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403A4_A7A8A4 -/* A7A8A4 802403A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A7A8A8 802403A8 AFBF0010 */ sw $ra, 0x10($sp) -/* A7A8AC 802403AC 8C82000C */ lw $v0, 0xc($a0) -/* A7A8B0 802403B0 0C0B1EAF */ jal get_variable -/* A7A8B4 802403B4 8C450000 */ lw $a1, ($v0) -/* A7A8B8 802403B8 0040182D */ daddu $v1, $v0, $zero -/* A7A8BC 802403BC 10600012 */ beqz $v1, .L80240408 -/* A7A8C0 802403C0 0000202D */ daddu $a0, $zero, $zero -/* A7A8C4 802403C4 8C620000 */ lw $v0, ($v1) -/* A7A8C8 802403C8 5040000A */ beql $v0, $zero, .L802403F4 -/* A7A8CC 802403CC 00041080 */ sll $v0, $a0, 2 -/* A7A8D0 802403D0 3C058025 */ lui $a1, 0x8025 -/* A7A8D4 802403D4 24A59158 */ addiu $a1, $a1, -0x6ea8 -.L802403D8: -/* A7A8D8 802403D8 24630004 */ addiu $v1, $v1, 4 -/* A7A8DC 802403DC 24840001 */ addiu $a0, $a0, 1 -/* A7A8E0 802403E0 ACA20000 */ sw $v0, ($a1) -/* A7A8E4 802403E4 8C620000 */ lw $v0, ($v1) -/* A7A8E8 802403E8 1440FFFB */ bnez $v0, .L802403D8 -/* A7A8EC 802403EC 24A50004 */ addiu $a1, $a1, 4 -/* A7A8F0 802403F0 00041080 */ sll $v0, $a0, 2 -.L802403F4: -/* A7A8F4 802403F4 3C018025 */ lui $at, 0x8025 -/* A7A8F8 802403F8 00220821 */ addu $at, $at, $v0 -/* A7A8FC 802403FC AC209158 */ sw $zero, -0x6ea8($at) -/* A7A900 80240400 0809010C */ j .L80240430 -/* A7A904 80240404 00000000 */ nop -.L80240408: -/* A7A908 80240408 3C038025 */ lui $v1, 0x8025 -/* A7A90C 8024040C 24639158 */ addiu $v1, $v1, -0x6ea8 -/* A7A910 80240410 0060282D */ daddu $a1, $v1, $zero -.L80240414: -/* A7A914 80240414 24820080 */ addiu $v0, $a0, 0x80 -/* A7A918 80240418 AC620000 */ sw $v0, ($v1) -/* A7A91C 8024041C 24630004 */ addiu $v1, $v1, 4 -/* A7A920 80240420 24840001 */ addiu $a0, $a0, 1 -/* A7A924 80240424 2882005B */ slti $v0, $a0, 0x5b -/* A7A928 80240428 1440FFFA */ bnez $v0, .L80240414 -/* A7A92C 8024042C ACA0016C */ sw $zero, 0x16c($a1) -.L80240430: -/* A7A930 80240430 8FBF0010 */ lw $ra, 0x10($sp) -/* A7A934 80240434 24020002 */ addiu $v0, $zero, 2 -/* A7A938 80240438 03E00008 */ jr $ra -/* A7A93C 8024043C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_83/func_80240050_A83490.s b/asm/nonmatchings/world/area_kpa/kpa_83/func_80240050_A83490.s deleted file mode 100644 index 3f6c2d0a21..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_83/func_80240050_A83490.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_A834E0 -/* A834E0 80240050 C4800084 */ lwc1 $f0, 0x84($a0) -/* A834E4 80240054 46800020 */ cvt.s.w $f0, $f0 -/* A834E8 80240058 3C018011 */ lui $at, 0x8011 -/* A834EC 8024005C E420F070 */ swc1 $f0, -0xf90($at) -/* A834F0 80240060 03E00008 */ jr $ra -/* A834F4 80240064 24020002 */ addiu $v0, $zero, 2 -/* A834F8 80240068 00000000 */ nop -/* A834FC 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/_A88280/func_80241830.s b/asm/nonmatchings/world/area_kpa/kpa_91/_A88280/func_80241830.s new file mode 100644 index 0000000000..1749a65640 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_91/_A88280/func_80241830.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241830 +/* A88280 80241830 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A88284 80241834 AFBF0010 */ sw $ra, 0x10($sp) +/* A88288 80241838 0C04417A */ jal get_entity_by_index +/* A8828C 8024183C 8C840084 */ lw $a0, 0x84($a0) +/* A88290 80241840 0040182D */ daddu $v1, $v0, $zero +/* A88294 80241844 8C640000 */ lw $a0, ($v1) +/* A88298 80241848 3C050010 */ lui $a1, 0x10 +/* A8829C 8024184C 00852025 */ or $a0, $a0, $a1 +/* A882A0 80241850 AC640000 */ sw $a0, ($v1) +/* A882A4 80241854 8FBF0010 */ lw $ra, 0x10($sp) +/* A882A8 80241858 24020002 */ addiu $v0, $zero, 2 +/* A882AC 8024185C 03E00008 */ jr $ra +/* A882B0 80241860 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/_A88280/func_80241864.s b/asm/nonmatchings/world/area_kpa/kpa_91/_A88280/func_80241864.s new file mode 100644 index 0000000000..d02cbf10de --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_91/_A88280/func_80241864.s @@ -0,0 +1,47 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241864 +/* A882B4 80241864 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A882B8 80241868 AFB20018 */ sw $s2, 0x18($sp) +/* A882BC 8024186C 0080902D */ daddu $s2, $a0, $zero +/* A882C0 80241870 AFBF001C */ sw $ra, 0x1c($sp) +/* A882C4 80241874 AFB10014 */ sw $s1, 0x14($sp) +/* A882C8 80241878 AFB00010 */ sw $s0, 0x10($sp) +/* A882CC 8024187C 8E50000C */ lw $s0, 0xc($s2) +/* A882D0 80241880 8E050000 */ lw $a1, ($s0) +/* A882D4 80241884 0C0B1EAF */ jal get_variable +/* A882D8 80241888 26100004 */ addiu $s0, $s0, 4 +/* A882DC 8024188C 0C04417A */ jal get_entity_by_index +/* A882E0 80241890 0040202D */ daddu $a0, $v0, $zero +/* A882E4 80241894 8E050000 */ lw $a1, ($s0) +/* A882E8 80241898 26100004 */ addiu $s0, $s0, 4 +/* A882EC 8024189C 0040882D */ daddu $s1, $v0, $zero +/* A882F0 802418A0 C6200048 */ lwc1 $f0, 0x48($s1) +/* A882F4 802418A4 4600008D */ trunc.w.s $f2, $f0 +/* A882F8 802418A8 44061000 */ mfc1 $a2, $f2 +/* A882FC 802418AC 0C0B2026 */ jal set_variable +/* A88300 802418B0 0240202D */ daddu $a0, $s2, $zero +/* A88304 802418B4 8E050000 */ lw $a1, ($s0) +/* A88308 802418B8 26100004 */ addiu $s0, $s0, 4 +/* A8830C 802418BC C620004C */ lwc1 $f0, 0x4c($s1) +/* A88310 802418C0 4600008D */ trunc.w.s $f2, $f0 +/* A88314 802418C4 44061000 */ mfc1 $a2, $f2 +/* A88318 802418C8 0C0B2026 */ jal set_variable +/* A8831C 802418CC 0240202D */ daddu $a0, $s2, $zero +/* A88320 802418D0 C6200050 */ lwc1 $f0, 0x50($s1) +/* A88324 802418D4 8E050000 */ lw $a1, ($s0) +/* A88328 802418D8 4600008D */ trunc.w.s $f2, $f0 +/* A8832C 802418DC 44061000 */ mfc1 $a2, $f2 +/* A88330 802418E0 0C0B2026 */ jal set_variable +/* A88334 802418E4 0240202D */ daddu $a0, $s2, $zero +/* A88338 802418E8 8FBF001C */ lw $ra, 0x1c($sp) +/* A8833C 802418EC 8FB20018 */ lw $s2, 0x18($sp) +/* A88340 802418F0 8FB10014 */ lw $s1, 0x14($sp) +/* A88344 802418F4 8FB00010 */ lw $s0, 0x10($sp) +/* A88348 802418F8 24020002 */ addiu $v0, $zero, 2 +/* A8834C 802418FC 03E00008 */ jr $ra +/* A88350 80241900 27BD0020 */ addiu $sp, $sp, 0x20 +/* A88354 80241904 00000000 */ nop +/* A88358 80241908 00000000 */ nop +/* A8835C 8024190C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/func_80240158_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/func_80240158_A86A50.s deleted file mode 100644 index 171d20e62d..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/func_80240158_A86A50.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_A86BA8 -/* A86BA8 80240158 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A86BAC 8024015C AFB20038 */ sw $s2, 0x38($sp) -/* A86BB0 80240160 0080902D */ daddu $s2, $a0, $zero -/* A86BB4 80240164 AFBF0044 */ sw $ra, 0x44($sp) -/* A86BB8 80240168 AFB40040 */ sw $s4, 0x40($sp) -/* A86BBC 8024016C AFB3003C */ sw $s3, 0x3c($sp) -/* A86BC0 80240170 AFB10034 */ sw $s1, 0x34($sp) -/* A86BC4 80240174 AFB00030 */ sw $s0, 0x30($sp) -/* A86BC8 80240178 F7B60050 */ sdc1 $f22, 0x50($sp) -/* A86BCC 8024017C F7B40048 */ sdc1 $f20, 0x48($sp) -/* A86BD0 80240180 8E510148 */ lw $s1, 0x148($s2) -/* A86BD4 80240184 00A0982D */ daddu $s3, $a1, $zero -/* A86BD8 80240188 86240008 */ lh $a0, 8($s1) -/* A86BDC 8024018C 0C00EABB */ jal get_npc_unsafe -/* A86BE0 80240190 00C0A02D */ daddu $s4, $a2, $zero -/* A86BE4 80240194 8E630014 */ lw $v1, 0x14($s3) -/* A86BE8 80240198 04600030 */ bltz $v1, .L8024025C -/* A86BEC 8024019C 0040802D */ daddu $s0, $v0, $zero -/* A86BF0 802401A0 8E420074 */ lw $v0, 0x74($s2) -/* A86BF4 802401A4 1C40002C */ bgtz $v0, .L80240258 -/* A86BF8 802401A8 2442FFFF */ addiu $v0, $v0, -1 -/* A86BFC 802401AC 0280202D */ daddu $a0, $s4, $zero -/* A86C00 802401B0 AE430074 */ sw $v1, 0x74($s2) -/* A86C04 802401B4 AFA00010 */ sw $zero, 0x10($sp) -/* A86C08 802401B8 8E66000C */ lw $a2, 0xc($s3) -/* A86C0C 802401BC 8E670010 */ lw $a3, 0x10($s3) -/* A86C10 802401C0 0C01242D */ jal func_800490B4 -/* A86C14 802401C4 0220282D */ daddu $a1, $s1, $zero -/* A86C18 802401C8 10400021 */ beqz $v0, .L80240250 -/* A86C1C 802401CC 0000202D */ daddu $a0, $zero, $zero -/* A86C20 802401D0 0200282D */ daddu $a1, $s0, $zero -/* A86C24 802401D4 0000302D */ daddu $a2, $zero, $zero -/* A86C28 802401D8 860300A8 */ lh $v1, 0xa8($s0) -/* A86C2C 802401DC 3C013F80 */ lui $at, 0x3f80 -/* A86C30 802401E0 44810000 */ mtc1 $at, $f0 -/* A86C34 802401E4 3C014000 */ lui $at, 0x4000 -/* A86C38 802401E8 44811000 */ mtc1 $at, $f2 -/* A86C3C 802401EC 3C01C1A0 */ lui $at, 0xc1a0 -/* A86C40 802401F0 44812000 */ mtc1 $at, $f4 -/* A86C44 802401F4 2402000F */ addiu $v0, $zero, 0xf -/* A86C48 802401F8 AFA2001C */ sw $v0, 0x1c($sp) -/* A86C4C 802401FC 44833000 */ mtc1 $v1, $f6 -/* A86C50 80240200 00000000 */ nop -/* A86C54 80240204 468031A0 */ cvt.s.w $f6, $f6 -/* A86C58 80240208 44073000 */ mfc1 $a3, $f6 -/* A86C5C 8024020C 27A20028 */ addiu $v0, $sp, 0x28 -/* A86C60 80240210 AFA20020 */ sw $v0, 0x20($sp) -/* A86C64 80240214 E7A00010 */ swc1 $f0, 0x10($sp) -/* A86C68 80240218 E7A20014 */ swc1 $f2, 0x14($sp) -/* A86C6C 8024021C 0C01BFA4 */ jal fx_emote -/* A86C70 80240220 E7A40018 */ swc1 $f4, 0x18($sp) -/* A86C74 80240224 0200202D */ daddu $a0, $s0, $zero -/* A86C78 80240228 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A86C7C 8024022C 0C012530 */ jal func_800494C0 -/* A86C80 80240230 3C060020 */ lui $a2, 0x20 -/* A86C84 80240234 8E220018 */ lw $v0, 0x18($s1) -/* A86C88 80240238 9442002A */ lhu $v0, 0x2a($v0) -/* A86C8C 8024023C 30420001 */ andi $v0, $v0, 1 -/* A86C90 80240240 14400064 */ bnez $v0, .L802403D4 -/* A86C94 80240244 2402000A */ addiu $v0, $zero, 0xa -/* A86C98 80240248 080900F5 */ j .L802403D4 -/* A86C9C 8024024C 2402000C */ addiu $v0, $zero, 0xc -.L80240250: -/* A86CA0 80240250 8E420074 */ lw $v0, 0x74($s2) -/* A86CA4 80240254 2442FFFF */ addiu $v0, $v0, -1 -.L80240258: -/* A86CA8 80240258 AE420074 */ sw $v0, 0x74($s2) -.L8024025C: -/* A86CAC 8024025C 8602008C */ lh $v0, 0x8c($s0) -/* A86CB0 80240260 1440005D */ bnez $v0, .L802403D8 -/* A86CB4 80240264 00000000 */ nop -/* A86CB8 80240268 C6000018 */ lwc1 $f0, 0x18($s0) -/* A86CBC 8024026C 3C014010 */ lui $at, 0x4010 -/* A86CC0 80240270 44811800 */ mtc1 $at, $f3 -/* A86CC4 80240274 44801000 */ mtc1 $zero, $f2 -/* A86CC8 80240278 46000021 */ cvt.d.s $f0, $f0 -/* A86CCC 8024027C 4622003C */ c.lt.d $f0, $f2 -/* A86CD0 80240280 00000000 */ nop -/* A86CD4 80240284 45000003 */ bc1f .L80240294 -/* A86CD8 80240288 0200202D */ daddu $a0, $s0, $zero -/* A86CDC 8024028C 080900A6 */ j .L80240298 -/* A86CE0 80240290 0000282D */ daddu $a1, $zero, $zero -.L80240294: -/* A86CE4 80240294 24050001 */ addiu $a1, $zero, 1 -.L80240298: -/* A86CE8 80240298 0C00F598 */ jal func_8003D660 -/* A86CEC 8024029C 00000000 */ nop -/* A86CF0 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A86CF4 802402A4 8E430078 */ lw $v1, 0x78($s2) -/* A86CF8 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A86CFC 802402AC 00031040 */ sll $v0, $v1, 1 -/* A86D00 802402B0 00431021 */ addu $v0, $v0, $v1 -/* A86D04 802402B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A86D08 802402B8 00021080 */ sll $v0, $v0, 2 -/* A86D0C 802402BC 00431021 */ addu $v0, $v0, $v1 -/* A86D10 802402C0 C4560004 */ lwc1 $f22, 4($v0) -/* A86D14 802402C4 4680B5A0 */ cvt.s.w $f22, $f22 -/* A86D18 802402C8 C454000C */ lwc1 $f20, 0xc($v0) -/* A86D1C 802402CC 4680A520 */ cvt.s.w $f20, $f20 -/* A86D20 802402D0 4406B000 */ mfc1 $a2, $f22 -/* A86D24 802402D4 4407A000 */ mfc1 $a3, $f20 -/* A86D28 802402D8 0C00A720 */ jal atan2 -/* A86D2C 802402DC 00000000 */ nop -/* A86D30 802402E0 8E050018 */ lw $a1, 0x18($s0) -/* A86D34 802402E4 44060000 */ mfc1 $a2, $f0 -/* A86D38 802402E8 0200202D */ daddu $a0, $s0, $zero -/* A86D3C 802402EC 0C00EA95 */ jal npc_move_heading -/* A86D40 802402F0 AE06000C */ sw $a2, 0xc($s0) -/* A86D44 802402F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A86D48 802402F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A86D4C 802402FC 4406B000 */ mfc1 $a2, $f22 -/* A86D50 80240300 4407A000 */ mfc1 $a3, $f20 -/* A86D54 80240304 0C00A7B5 */ jal dist2D -/* A86D58 80240308 00000000 */ nop -/* A86D5C 8024030C C6020018 */ lwc1 $f2, 0x18($s0) -/* A86D60 80240310 4602003E */ c.le.s $f0, $f2 -/* A86D64 80240314 00000000 */ nop -/* A86D68 80240318 4500002F */ bc1f .L802403D8 -/* A86D6C 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A86D70 80240320 24020002 */ addiu $v0, $zero, 2 -/* A86D74 80240324 0C00A67F */ jal rand_int -/* A86D78 80240328 AE420070 */ sw $v0, 0x70($s2) -/* A86D7C 8024032C 3C035555 */ lui $v1, 0x5555 -/* A86D80 80240330 34635556 */ ori $v1, $v1, 0x5556 -/* A86D84 80240334 00430018 */ mult $v0, $v1 -/* A86D88 80240338 000227C3 */ sra $a0, $v0, 0x1f -/* A86D8C 8024033C 00004010 */ mfhi $t0 -/* A86D90 80240340 01042023 */ subu $a0, $t0, $a0 -/* A86D94 80240344 00041840 */ sll $v1, $a0, 1 -/* A86D98 80240348 00641821 */ addu $v1, $v1, $a0 -/* A86D9C 8024034C 00431023 */ subu $v0, $v0, $v1 -/* A86DA0 80240350 24430002 */ addiu $v1, $v0, 2 -/* A86DA4 80240354 AE430074 */ sw $v1, 0x74($s2) -/* A86DA8 80240358 8E62002C */ lw $v0, 0x2c($s3) -/* A86DAC 8024035C 18400009 */ blez $v0, .L80240384 -/* A86DB0 80240360 24020004 */ addiu $v0, $zero, 4 -/* A86DB4 80240364 8E620004 */ lw $v0, 4($s3) -/* A86DB8 80240368 18400006 */ blez $v0, .L80240384 -/* A86DBC 8024036C 24020004 */ addiu $v0, $zero, 4 -/* A86DC0 80240370 8E620008 */ lw $v0, 8($s3) -/* A86DC4 80240374 18400003 */ blez $v0, .L80240384 -/* A86DC8 80240378 24020004 */ addiu $v0, $zero, 4 -/* A86DCC 8024037C 14600002 */ bnez $v1, .L80240388 -/* A86DD0 80240380 00000000 */ nop -.L80240384: -/* A86DD4 80240384 AE420070 */ sw $v0, 0x70($s2) -.L80240388: -/* A86DD8 80240388 0C00A67F */ jal rand_int -/* A86DDC 8024038C 24042710 */ addiu $a0, $zero, 0x2710 -/* A86DE0 80240390 3C0351EB */ lui $v1, 0x51eb -/* A86DE4 80240394 3463851F */ ori $v1, $v1, 0x851f -/* A86DE8 80240398 00430018 */ mult $v0, $v1 -/* A86DEC 8024039C 00021FC3 */ sra $v1, $v0, 0x1f -/* A86DF0 802403A0 00004010 */ mfhi $t0 -/* A86DF4 802403A4 00082143 */ sra $a0, $t0, 5 -/* A86DF8 802403A8 00832023 */ subu $a0, $a0, $v1 -/* A86DFC 802403AC 00041840 */ sll $v1, $a0, 1 -/* A86E00 802403B0 00641821 */ addu $v1, $v1, $a0 -/* A86E04 802403B4 000318C0 */ sll $v1, $v1, 3 -/* A86E08 802403B8 00641821 */ addu $v1, $v1, $a0 -/* A86E0C 802403BC 00031880 */ sll $v1, $v1, 2 -/* A86E10 802403C0 8E640004 */ lw $a0, 4($s3) -/* A86E14 802403C4 00431023 */ subu $v0, $v0, $v1 -/* A86E18 802403C8 0044102A */ slt $v0, $v0, $a0 -/* A86E1C 802403CC 10400002 */ beqz $v0, .L802403D8 -/* A86E20 802403D0 24020004 */ addiu $v0, $zero, 4 -.L802403D4: -/* A86E24 802403D4 AE420070 */ sw $v0, 0x70($s2) -.L802403D8: -/* A86E28 802403D8 8FBF0044 */ lw $ra, 0x44($sp) -/* A86E2C 802403DC 8FB40040 */ lw $s4, 0x40($sp) -/* A86E30 802403E0 8FB3003C */ lw $s3, 0x3c($sp) -/* A86E34 802403E4 8FB20038 */ lw $s2, 0x38($sp) -/* A86E38 802403E8 8FB10034 */ lw $s1, 0x34($sp) -/* A86E3C 802403EC 8FB00030 */ lw $s0, 0x30($sp) -/* A86E40 802403F0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* A86E44 802403F4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* A86E48 802403F8 03E00008 */ jr $ra -/* A86E4C 802403FC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/func_80240400_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/func_80240400_A86A50.s deleted file mode 100644 index ff1bdad222..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/func_80240400_A86A50.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_A86E50 -/* A86E50 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A86E54 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* A86E58 80240408 0080982D */ daddu $s3, $a0, $zero -/* A86E5C 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* A86E60 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* A86E64 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* A86E68 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* A86E6C 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* A86E70 80240420 86440008 */ lh $a0, 8($s2) -/* A86E74 80240424 0C00EABB */ jal get_npc_unsafe -/* A86E78 80240428 00A0882D */ daddu $s1, $a1, $zero -/* A86E7C 8024042C 8E240008 */ lw $a0, 8($s1) -/* A86E80 80240430 0040802D */ daddu $s0, $v0, $zero -/* A86E84 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* A86E88 80240438 00832021 */ addu $a0, $a0, $v1 -/* A86E8C 8024043C 00042043 */ sra $a0, $a0, 1 -/* A86E90 80240440 0C00A67F */ jal rand_int -/* A86E94 80240444 24840001 */ addiu $a0, $a0, 1 -/* A86E98 80240448 8E230008 */ lw $v1, 8($s1) -/* A86E9C 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* A86EA0 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* A86EA4 80240454 00651821 */ addu $v1, $v1, $a1 -/* A86EA8 80240458 00031843 */ sra $v1, $v1, 1 -/* A86EAC 8024045C 00621821 */ addu $v1, $v1, $v0 -/* A86EB0 80240460 0C00A67F */ jal rand_int -/* A86EB4 80240464 A603008E */ sh $v1, 0x8e($s0) -/* A86EB8 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* A86EBC 8024046C 44820000 */ mtc1 $v0, $f0 -/* A86EC0 80240470 00000000 */ nop -/* A86EC4 80240474 46800020 */ cvt.s.w $f0, $f0 -/* A86EC8 80240478 46006300 */ add.s $f12, $f12, $f0 -/* A86ECC 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* A86ED0 80240480 44810000 */ mtc1 $at, $f0 -/* A86ED4 80240484 0C00A6C9 */ jal clamp_angle -/* A86ED8 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* A86EDC 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* A86EE0 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* A86EE4 80240494 8C420000 */ lw $v0, ($v0) -/* A86EE8 80240498 AE020028 */ sw $v0, 0x28($s0) -/* A86EEC 8024049C 24020003 */ addiu $v0, $zero, 3 -/* A86EF0 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* A86EF4 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* A86EF8 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* A86EFC 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* A86F00 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* A86F04 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* A86F08 802404B8 03E00008 */ jr $ra -/* A86F0C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/func_802404C0_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/func_802404C0_A86A50.s deleted file mode 100644 index 269378869d..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/func_802404C0_A86A50.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_A86F10 -/* A86F10 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A86F14 802404C4 AFB40040 */ sw $s4, 0x40($sp) -/* A86F18 802404C8 0080A02D */ daddu $s4, $a0, $zero -/* A86F1C 802404CC AFBF0044 */ sw $ra, 0x44($sp) -/* A86F20 802404D0 AFB3003C */ sw $s3, 0x3c($sp) -/* A86F24 802404D4 AFB20038 */ sw $s2, 0x38($sp) -/* A86F28 802404D8 AFB10034 */ sw $s1, 0x34($sp) -/* A86F2C 802404DC AFB00030 */ sw $s0, 0x30($sp) -/* A86F30 802404E0 8E910148 */ lw $s1, 0x148($s4) -/* A86F34 802404E4 00A0902D */ daddu $s2, $a1, $zero -/* A86F38 802404E8 86240008 */ lh $a0, 8($s1) -/* A86F3C 802404EC 0C00EABB */ jal get_npc_unsafe -/* A86F40 802404F0 00C0982D */ daddu $s3, $a2, $zero -/* A86F44 802404F4 8E430014 */ lw $v1, 0x14($s2) -/* A86F48 802404F8 04600031 */ bltz $v1, .L802405C0 -/* A86F4C 802404FC 0040802D */ daddu $s0, $v0, $zero -/* A86F50 80240500 0260202D */ daddu $a0, $s3, $zero -/* A86F54 80240504 AFA00010 */ sw $zero, 0x10($sp) -/* A86F58 80240508 8E460024 */ lw $a2, 0x24($s2) -/* A86F5C 8024050C 8E470028 */ lw $a3, 0x28($s2) -/* A86F60 80240510 0C01242D */ jal func_800490B4 -/* A86F64 80240514 0220282D */ daddu $a1, $s1, $zero -/* A86F68 80240518 10400029 */ beqz $v0, .L802405C0 -/* A86F6C 8024051C 0000202D */ daddu $a0, $zero, $zero -/* A86F70 80240520 0200282D */ daddu $a1, $s0, $zero -/* A86F74 80240524 0000302D */ daddu $a2, $zero, $zero -/* A86F78 80240528 860300A8 */ lh $v1, 0xa8($s0) -/* A86F7C 8024052C 3C013F80 */ lui $at, 0x3f80 -/* A86F80 80240530 44810000 */ mtc1 $at, $f0 -/* A86F84 80240534 3C014000 */ lui $at, 0x4000 -/* A86F88 80240538 44811000 */ mtc1 $at, $f2 -/* A86F8C 8024053C 3C01C1A0 */ lui $at, 0xc1a0 -/* A86F90 80240540 44812000 */ mtc1 $at, $f4 -/* A86F94 80240544 2402000F */ addiu $v0, $zero, 0xf -/* A86F98 80240548 AFA2001C */ sw $v0, 0x1c($sp) -/* A86F9C 8024054C 44833000 */ mtc1 $v1, $f6 -/* A86FA0 80240550 00000000 */ nop -/* A86FA4 80240554 468031A0 */ cvt.s.w $f6, $f6 -/* A86FA8 80240558 44073000 */ mfc1 $a3, $f6 -/* A86FAC 8024055C 27A20028 */ addiu $v0, $sp, 0x28 -/* A86FB0 80240560 AFA20020 */ sw $v0, 0x20($sp) -/* A86FB4 80240564 E7A00010 */ swc1 $f0, 0x10($sp) -/* A86FB8 80240568 E7A20014 */ swc1 $f2, 0x14($sp) -/* A86FBC 8024056C 0C01BFA4 */ jal fx_emote -/* A86FC0 80240570 E7A40018 */ swc1 $f4, 0x18($sp) -/* A86FC4 80240574 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A86FC8 80240578 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A86FCC 8024057C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A86FD0 80240580 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A86FD4 80240584 8C460028 */ lw $a2, 0x28($v0) -/* A86FD8 80240588 0C00A720 */ jal atan2 -/* A86FDC 8024058C 8C470030 */ lw $a3, 0x30($v0) -/* A86FE0 80240590 0200202D */ daddu $a0, $s0, $zero -/* A86FE4 80240594 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A86FE8 80240598 3C060020 */ lui $a2, 0x20 -/* A86FEC 8024059C 0C012530 */ jal func_800494C0 -/* A86FF0 802405A0 E480000C */ swc1 $f0, 0xc($a0) -/* A86FF4 802405A4 8E220018 */ lw $v0, 0x18($s1) -/* A86FF8 802405A8 9442002A */ lhu $v0, 0x2a($v0) -/* A86FFC 802405AC 30420001 */ andi $v0, $v0, 1 -/* A87000 802405B0 14400029 */ bnez $v0, .L80240658 -/* A87004 802405B4 2402000A */ addiu $v0, $zero, 0xa -/* A87008 802405B8 08090196 */ j .L80240658 -/* A8700C 802405BC 2402000C */ addiu $v0, $zero, 0xc -.L802405C0: -/* A87010 802405C0 8602008C */ lh $v0, 0x8c($s0) -/* A87014 802405C4 14400025 */ bnez $v0, .L8024065C -/* A87018 802405C8 00000000 */ nop -/* A8701C 802405CC 9602008E */ lhu $v0, 0x8e($s0) -/* A87020 802405D0 2442FFFF */ addiu $v0, $v0, -1 -/* A87024 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* A87028 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* A8702C 802405DC 1440001F */ bnez $v0, .L8024065C -/* A87030 802405E0 00000000 */ nop -/* A87034 802405E4 8E820074 */ lw $v0, 0x74($s4) -/* A87038 802405E8 2442FFFF */ addiu $v0, $v0, -1 -/* A8703C 802405EC 10400019 */ beqz $v0, .L80240654 -/* A87040 802405F0 AE820074 */ sw $v0, 0x74($s4) -/* A87044 802405F4 8E220018 */ lw $v0, 0x18($s1) -/* A87048 802405F8 9442002A */ lhu $v0, 0x2a($v0) -/* A8704C 802405FC 30420010 */ andi $v0, $v0, 0x10 -/* A87050 80240600 14400007 */ bnez $v0, .L80240620 -/* A87054 80240604 00000000 */ nop -/* A87058 80240608 C600000C */ lwc1 $f0, 0xc($s0) -/* A8705C 8024060C 3C014334 */ lui $at, 0x4334 -/* A87060 80240610 44816000 */ mtc1 $at, $f12 -/* A87064 80240614 0C00A6C9 */ jal clamp_angle -/* A87068 80240618 460C0300 */ add.s $f12, $f0, $f12 -/* A8706C 8024061C E600000C */ swc1 $f0, 0xc($s0) -.L80240620: -/* A87070 80240620 8E440008 */ lw $a0, 8($s2) -/* A87074 80240624 000417C2 */ srl $v0, $a0, 0x1f -/* A87078 80240628 00822021 */ addu $a0, $a0, $v0 -/* A8707C 8024062C 00042043 */ sra $a0, $a0, 1 -/* A87080 80240630 0C00A67F */ jal rand_int -/* A87084 80240634 24840001 */ addiu $a0, $a0, 1 -/* A87088 80240638 8E430008 */ lw $v1, 8($s2) -/* A8708C 8024063C 000327C2 */ srl $a0, $v1, 0x1f -/* A87090 80240640 00641821 */ addu $v1, $v1, $a0 -/* A87094 80240644 00031843 */ sra $v1, $v1, 1 -/* A87098 80240648 00621821 */ addu $v1, $v1, $v0 -/* A8709C 8024064C 08090197 */ j .L8024065C -/* A870A0 80240650 A603008E */ sh $v1, 0x8e($s0) -.L80240654: -/* A870A4 80240654 24020004 */ addiu $v0, $zero, 4 -.L80240658: -/* A870A8 80240658 AE820070 */ sw $v0, 0x70($s4) -.L8024065C: -/* A870AC 8024065C 8FBF0044 */ lw $ra, 0x44($sp) -/* A870B0 80240660 8FB40040 */ lw $s4, 0x40($sp) -/* A870B4 80240664 8FB3003C */ lw $s3, 0x3c($sp) -/* A870B8 80240668 8FB20038 */ lw $s2, 0x38($sp) -/* A870BC 8024066C 8FB10034 */ lw $s1, 0x34($sp) -/* A870C0 80240670 8FB00030 */ lw $s0, 0x30($sp) -/* A870C4 80240674 03E00008 */ jr $ra -/* A870C8 80240678 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/func_80240730_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/func_80240730_A86A50.s deleted file mode 100644 index 12d8e07ec4..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/func_80240730_A86A50.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_A87180 -/* A87180 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A87184 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* A87188 80240738 0080882D */ daddu $s1, $a0, $zero -/* A8718C 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* A87190 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* A87194 80240744 8E300148 */ lw $s0, 0x148($s1) -/* A87198 80240748 0C00EABB */ jal get_npc_unsafe -/* A8719C 8024074C 86040008 */ lh $a0, 8($s0) -/* A871A0 80240750 8E0300CC */ lw $v1, 0xcc($s0) -/* A871A4 80240754 3C014120 */ lui $at, 0x4120 -/* A871A8 80240758 44812000 */ mtc1 $at, $f4 -/* A871AC 8024075C 3C014000 */ lui $at, 0x4000 -/* A871B0 80240760 44810000 */ mtc1 $at, $f0 -/* A871B4 80240764 C442003C */ lwc1 $f2, 0x3c($v0) -/* A871B8 80240768 8C640010 */ lw $a0, 0x10($v1) -/* A871BC 8024076C 8C430000 */ lw $v1, ($v0) -/* A871C0 80240770 E444001C */ swc1 $f4, 0x1c($v0) -/* A871C4 80240774 E4400014 */ swc1 $f0, 0x14($v0) -/* A871C8 80240778 E4420064 */ swc1 $f2, 0x64($v0) -/* A871CC 8024077C 34630800 */ ori $v1, $v1, 0x800 -/* A871D0 80240780 AC430000 */ sw $v1, ($v0) -/* A871D4 80240784 AC440028 */ sw $a0, 0x28($v0) -/* A871D8 80240788 2402000B */ addiu $v0, $zero, 0xb -/* A871DC 8024078C AE220070 */ sw $v0, 0x70($s1) -/* A871E0 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* A871E4 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* A871E8 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* A871EC 8024079C 03E00008 */ jr $ra -/* A871F0 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/func_802407A4_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/func_802407A4_A86A50.s deleted file mode 100644 index f7ad3a4aca..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/func_802407A4_A86A50.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4_A871F4 -/* A871F4 802407A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A871F8 802407A8 AFB00010 */ sw $s0, 0x10($sp) -/* A871FC 802407AC 0080802D */ daddu $s0, $a0, $zero -/* A87200 802407B0 AFBF0014 */ sw $ra, 0x14($sp) -/* A87204 802407B4 8E020148 */ lw $v0, 0x148($s0) -/* A87208 802407B8 0C00EABB */ jal get_npc_unsafe -/* A8720C 802407BC 84440008 */ lh $a0, 8($v0) -/* A87210 802407C0 0040202D */ daddu $a0, $v0, $zero -/* A87214 802407C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* A87218 802407C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* A8721C 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* A87220 802407D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* A87224 802407D4 46040001 */ sub.s $f0, $f0, $f4 -/* A87228 802407D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* A8722C 802407DC 4602203C */ c.lt.s $f4, $f2 -/* A87230 802407E0 E482003C */ swc1 $f2, 0x3c($a0) -/* A87234 802407E4 45010009 */ bc1t .L8024080C -/* A87238 802407E8 E480001C */ swc1 $f0, 0x1c($a0) -/* A8723C 802407EC 8C820000 */ lw $v0, ($a0) -/* A87240 802407F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* A87244 802407F4 E484003C */ swc1 $f4, 0x3c($a0) -/* A87248 802407F8 AC80001C */ sw $zero, 0x1c($a0) -/* A8724C 802407FC 00431024 */ and $v0, $v0, $v1 -/* A87250 80240800 AC820000 */ sw $v0, ($a0) -/* A87254 80240804 2402000C */ addiu $v0, $zero, 0xc -/* A87258 80240808 AE020070 */ sw $v0, 0x70($s0) -.L8024080C: -/* A8725C 8024080C 8FBF0014 */ lw $ra, 0x14($sp) -/* A87260 80240810 8FB00010 */ lw $s0, 0x10($sp) -/* A87264 80240814 03E00008 */ jr $ra -/* A87268 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/func_8024081C_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/func_8024081C_A86A50.s deleted file mode 100644 index ebb6f31187..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/func_8024081C_A86A50.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024081C_A8726C -/* A8726C 8024081C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A87270 80240820 AFB3001C */ sw $s3, 0x1c($sp) -/* A87274 80240824 0080982D */ daddu $s3, $a0, $zero -/* A87278 80240828 AFBF0020 */ sw $ra, 0x20($sp) -/* A8727C 8024082C AFB20018 */ sw $s2, 0x18($sp) -/* A87280 80240830 AFB10014 */ sw $s1, 0x14($sp) -/* A87284 80240834 AFB00010 */ sw $s0, 0x10($sp) -/* A87288 80240838 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A8728C 8024083C 8E710148 */ lw $s1, 0x148($s3) -/* A87290 80240840 86240008 */ lh $a0, 8($s1) -/* A87294 80240844 0C00EABB */ jal get_npc_unsafe -/* A87298 80240848 00A0802D */ daddu $s0, $a1, $zero -/* A8729C 8024084C 8E040020 */ lw $a0, 0x20($s0) -/* A872A0 80240850 0040902D */ daddu $s2, $v0, $zero -/* A872A4 80240854 00041FC2 */ srl $v1, $a0, 0x1f -/* A872A8 80240858 00832021 */ addu $a0, $a0, $v1 -/* A872AC 8024085C 00042043 */ sra $a0, $a0, 1 -/* A872B0 80240860 0C00A67F */ jal rand_int -/* A872B4 80240864 24840001 */ addiu $a0, $a0, 1 -/* A872B8 80240868 8E030020 */ lw $v1, 0x20($s0) -/* A872BC 8024086C C64C0038 */ lwc1 $f12, 0x38($s2) -/* A872C0 80240870 000327C2 */ srl $a0, $v1, 0x1f -/* A872C4 80240874 00641821 */ addu $v1, $v1, $a0 -/* A872C8 80240878 00031843 */ sra $v1, $v1, 1 -/* A872CC 8024087C 00621821 */ addu $v1, $v1, $v0 -/* A872D0 80240880 A643008E */ sh $v1, 0x8e($s2) -/* A872D4 80240884 8E2200CC */ lw $v0, 0xcc($s1) -/* A872D8 80240888 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A872DC 8024088C 8C42000C */ lw $v0, 0xc($v0) -/* A872E0 80240890 AE420028 */ sw $v0, 0x28($s2) -/* A872E4 80240894 C6000018 */ lwc1 $f0, 0x18($s0) -/* A872E8 80240898 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A872EC 8024089C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A872F0 802408A0 E6400018 */ swc1 $f0, 0x18($s2) -/* A872F4 802408A4 8C460028 */ lw $a2, 0x28($v0) -/* A872F8 802408A8 0C00A720 */ jal atan2 -/* A872FC 802408AC 8C470030 */ lw $a3, 0x30($v0) -/* A87300 802408B0 46000506 */ mov.s $f20, $f0 -/* A87304 802408B4 C64C000C */ lwc1 $f12, 0xc($s2) -/* A87308 802408B8 0C00A70A */ jal get_clamped_angle_diff -/* A8730C 802408BC 4600A386 */ mov.s $f14, $f20 -/* A87310 802408C0 46000086 */ mov.s $f2, $f0 -/* A87314 802408C4 8E02001C */ lw $v0, 0x1c($s0) -/* A87318 802408C8 46001005 */ abs.s $f0, $f2 -/* A8731C 802408CC 44822000 */ mtc1 $v0, $f4 -/* A87320 802408D0 00000000 */ nop -/* A87324 802408D4 46802120 */ cvt.s.w $f4, $f4 -/* A87328 802408D8 4600203C */ c.lt.s $f4, $f0 -/* A8732C 802408DC 00000000 */ nop -/* A87330 802408E0 4500000D */ bc1f .L80240918 -/* A87334 802408E4 00000000 */ nop -/* A87338 802408E8 44800000 */ mtc1 $zero, $f0 -/* A8733C 802408EC C654000C */ lwc1 $f20, 0xc($s2) -/* A87340 802408F0 4600103C */ c.lt.s $f2, $f0 -/* A87344 802408F4 00000000 */ nop -/* A87348 802408F8 45000006 */ bc1f .L80240914 -/* A8734C 802408FC 00021023 */ negu $v0, $v0 -/* A87350 80240900 44820000 */ mtc1 $v0, $f0 -/* A87354 80240904 00000000 */ nop -/* A87358 80240908 46800020 */ cvt.s.w $f0, $f0 -/* A8735C 8024090C 08090246 */ j .L80240918 -/* A87360 80240910 4600A500 */ add.s $f20, $f20, $f0 -.L80240914: -/* A87364 80240914 4604A500 */ add.s $f20, $f20, $f4 -.L80240918: -/* A87368 80240918 0C00A6C9 */ jal clamp_angle -/* A8736C 8024091C 4600A306 */ mov.s $f12, $f20 -/* A87370 80240920 2402000D */ addiu $v0, $zero, 0xd -/* A87374 80240924 E640000C */ swc1 $f0, 0xc($s2) -/* A87378 80240928 AE620070 */ sw $v0, 0x70($s3) -/* A8737C 8024092C 8FBF0020 */ lw $ra, 0x20($sp) -/* A87380 80240930 8FB3001C */ lw $s3, 0x1c($sp) -/* A87384 80240934 8FB20018 */ lw $s2, 0x18($sp) -/* A87388 80240938 8FB10014 */ lw $s1, 0x14($sp) -/* A8738C 8024093C 8FB00010 */ lw $s0, 0x10($sp) -/* A87390 80240940 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A87394 80240944 03E00008 */ jr $ra -/* A87398 80240948 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/func_80240A6C_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/func_80240A6C_A86A50.s deleted file mode 100644 index 93d4835229..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/func_80240A6C_A86A50.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_A874BC -/* A874BC 80240A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A874C0 80240A70 AFB10014 */ sw $s1, 0x14($sp) -/* A874C4 80240A74 0080882D */ daddu $s1, $a0, $zero -/* A874C8 80240A78 AFBF0018 */ sw $ra, 0x18($sp) -/* A874CC 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* A874D0 80240A80 8E300148 */ lw $s0, 0x148($s1) -/* A874D4 80240A84 0C00EABB */ jal get_npc_unsafe -/* A874D8 80240A88 86040008 */ lh $a0, 8($s0) -/* A874DC 80240A8C 9443008E */ lhu $v1, 0x8e($v0) -/* A874E0 80240A90 2463FFFF */ addiu $v1, $v1, -1 -/* A874E4 80240A94 A443008E */ sh $v1, 0x8e($v0) -/* A874E8 80240A98 00031C00 */ sll $v1, $v1, 0x10 -/* A874EC 80240A9C 14600008 */ bnez $v1, .L80240AC0 -/* A874F0 80240AA0 00000000 */ nop -/* A874F4 80240AA4 8E0200B0 */ lw $v0, 0xb0($s0) -/* A874F8 80240AA8 30420080 */ andi $v0, $v0, 0x80 -/* A874FC 80240AAC 10400003 */ beqz $v0, .L80240ABC -/* A87500 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* A87504 80240AB4 080902B0 */ j .L80240AC0 -/* A87508 80240AB8 AE220070 */ sw $v0, 0x70($s1) -.L80240ABC: -/* A8750C 80240ABC AE200070 */ sw $zero, 0x70($s1) -.L80240AC0: -/* A87510 80240AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* A87514 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* A87518 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* A8751C 80240ACC 03E00008 */ jr $ra -/* A87520 80240AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/func_80240E90_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/func_80240E90_A86A50.s deleted file mode 100644 index 52f23f50cf..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/func_80240E90_A86A50.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E90_A878E0 -/* A878E0 80240E90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A878E4 80240E94 AFB20018 */ sw $s2, 0x18($sp) -/* A878E8 80240E98 0080902D */ daddu $s2, $a0, $zero -/* A878EC 80240E9C AFBF001C */ sw $ra, 0x1c($sp) -/* A878F0 80240EA0 AFB10014 */ sw $s1, 0x14($sp) -/* A878F4 80240EA4 AFB00010 */ sw $s0, 0x10($sp) -/* A878F8 80240EA8 8E510148 */ lw $s1, 0x148($s2) -/* A878FC 80240EAC 0C00EABB */ jal get_npc_unsafe -/* A87900 80240EB0 86240008 */ lh $a0, 8($s1) -/* A87904 80240EB4 0040802D */ daddu $s0, $v0, $zero -/* A87908 80240EB8 8E2300CC */ lw $v1, 0xcc($s1) -/* A8790C 80240EBC C60C0038 */ lwc1 $f12, 0x38($s0) -/* A87910 80240EC0 8C630020 */ lw $v1, 0x20($v1) -/* A87914 80240EC4 AE030028 */ sw $v1, 0x28($s0) -/* A87918 80240EC8 96220076 */ lhu $v0, 0x76($s1) -/* A8791C 80240ECC A602008E */ sh $v0, 0x8e($s0) -/* A87920 80240ED0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A87924 80240ED4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A87928 80240ED8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A8792C 80240EDC 8C460028 */ lw $a2, 0x28($v0) -/* A87930 80240EE0 0C00A720 */ jal atan2 -/* A87934 80240EE4 8C470030 */ lw $a3, 0x30($v0) -/* A87938 80240EE8 2402000D */ addiu $v0, $zero, 0xd -/* A8793C 80240EEC E600000C */ swc1 $f0, 0xc($s0) -/* A87940 80240EF0 AE420070 */ sw $v0, 0x70($s2) -/* A87944 80240EF4 8FBF001C */ lw $ra, 0x1c($sp) -/* A87948 80240EF8 8FB20018 */ lw $s2, 0x18($sp) -/* A8794C 80240EFC 8FB10014 */ lw $s1, 0x14($sp) -/* A87950 80240F00 8FB00010 */ lw $s0, 0x10($sp) -/* A87954 80240F04 03E00008 */ jr $ra -/* A87958 80240F08 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/func_80241040_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/func_80241040_A86A50.s deleted file mode 100644 index 707bdb8429..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/func_80241040_A86A50.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241040_A87A90 -/* A87A90 80241040 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A87A94 80241044 AFB3003C */ sw $s3, 0x3c($sp) -/* A87A98 80241048 0080982D */ daddu $s3, $a0, $zero -/* A87A9C 8024104C AFBF0040 */ sw $ra, 0x40($sp) -/* A87AA0 80241050 AFB20038 */ sw $s2, 0x38($sp) -/* A87AA4 80241054 AFB10034 */ sw $s1, 0x34($sp) -/* A87AA8 80241058 AFB00030 */ sw $s0, 0x30($sp) -/* A87AAC 8024105C 8E710148 */ lw $s1, 0x148($s3) -/* A87AB0 80241060 0C00EABB */ jal get_npc_unsafe -/* A87AB4 80241064 86240008 */ lh $a0, 8($s1) -/* A87AB8 80241068 0040802D */ daddu $s0, $v0, $zero -/* A87ABC 8024106C 8E22007C */ lw $v0, 0x7c($s1) -/* A87AC0 80241070 8603008E */ lh $v1, 0x8e($s0) -/* A87AC4 80241074 2442FFFF */ addiu $v0, $v0, -1 -/* A87AC8 80241078 14620012 */ bne $v1, $v0, .L802410C4 -/* A87ACC 8024107C 00000000 */ nop -/* A87AD0 80241080 C6000038 */ lwc1 $f0, 0x38($s0) -/* A87AD4 80241084 4600020D */ trunc.w.s $f8, $f0 -/* A87AD8 80241088 44024000 */ mfc1 $v0, $f8 -/* A87ADC 8024108C 00000000 */ nop -/* A87AE0 80241090 A6220010 */ sh $v0, 0x10($s1) -/* A87AE4 80241094 C600003C */ lwc1 $f0, 0x3c($s0) -/* A87AE8 80241098 4600020D */ trunc.w.s $f8, $f0 -/* A87AEC 8024109C 44024000 */ mfc1 $v0, $f8 -/* A87AF0 802410A0 00000000 */ nop -/* A87AF4 802410A4 A6220012 */ sh $v0, 0x12($s1) -/* A87AF8 802410A8 C6000040 */ lwc1 $f0, 0x40($s0) -/* A87AFC 802410AC 24020001 */ addiu $v0, $zero, 1 -/* A87B00 802410B0 A2220007 */ sb $v0, 7($s1) -/* A87B04 802410B4 4600020D */ trunc.w.s $f8, $f0 -/* A87B08 802410B8 44024000 */ mfc1 $v0, $f8 -/* A87B0C 802410BC 00000000 */ nop -/* A87B10 802410C0 A6220014 */ sh $v0, 0x14($s1) -.L802410C4: -/* A87B14 802410C4 C6000038 */ lwc1 $f0, 0x38($s0) -/* A87B18 802410C8 C602003C */ lwc1 $f2, 0x3c($s0) -/* A87B1C 802410CC C6040040 */ lwc1 $f4, 0x40($s0) -/* A87B20 802410D0 C6060018 */ lwc1 $f6, 0x18($s0) -/* A87B24 802410D4 E7A00020 */ swc1 $f0, 0x20($sp) -/* A87B28 802410D8 E7A20024 */ swc1 $f2, 0x24($sp) -/* A87B2C 802410DC E7A40028 */ swc1 $f4, 0x28($sp) -/* A87B30 802410E0 E7A60010 */ swc1 $f6, 0x10($sp) -/* A87B34 802410E4 C600000C */ lwc1 $f0, 0xc($s0) -/* A87B38 802410E8 E7A00014 */ swc1 $f0, 0x14($sp) -/* A87B3C 802410EC 860200A8 */ lh $v0, 0xa8($s0) -/* A87B40 802410F0 27A50020 */ addiu $a1, $sp, 0x20 -/* A87B44 802410F4 44820000 */ mtc1 $v0, $f0 -/* A87B48 802410F8 00000000 */ nop -/* A87B4C 802410FC 46800020 */ cvt.s.w $f0, $f0 -/* A87B50 80241100 E7A00018 */ swc1 $f0, 0x18($sp) -/* A87B54 80241104 860200A6 */ lh $v0, 0xa6($s0) -/* A87B58 80241108 27A60024 */ addiu $a2, $sp, 0x24 -/* A87B5C 8024110C 44820000 */ mtc1 $v0, $f0 -/* A87B60 80241110 00000000 */ nop -/* A87B64 80241114 46800020 */ cvt.s.w $f0, $f0 -/* A87B68 80241118 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A87B6C 8024111C 8E040080 */ lw $a0, 0x80($s0) -/* A87B70 80241120 0C037711 */ jal func_800DDC44 -/* A87B74 80241124 27A70028 */ addiu $a3, $sp, 0x28 -/* A87B78 80241128 0040902D */ daddu $s2, $v0, $zero -/* A87B7C 8024112C 16400005 */ bnez $s2, .L80241144 -/* A87B80 80241130 00000000 */ nop -/* A87B84 80241134 8E050018 */ lw $a1, 0x18($s0) -/* A87B88 80241138 8E06000C */ lw $a2, 0xc($s0) -/* A87B8C 8024113C 0C00EA95 */ jal npc_move_heading -/* A87B90 80241140 0200202D */ daddu $a0, $s0, $zero -.L80241144: -/* A87B94 80241144 8602008E */ lh $v0, 0x8e($s0) -/* A87B98 80241148 9603008E */ lhu $v1, 0x8e($s0) -/* A87B9C 8024114C 18400007 */ blez $v0, .L8024116C -/* A87BA0 80241150 2462FFFF */ addiu $v0, $v1, -1 -/* A87BA4 80241154 A602008E */ sh $v0, 0x8e($s0) -/* A87BA8 80241158 00021400 */ sll $v0, $v0, 0x10 -/* A87BAC 8024115C 18400003 */ blez $v0, .L8024116C -/* A87BB0 80241160 00000000 */ nop -/* A87BB4 80241164 12400008 */ beqz $s2, .L80241188 -/* A87BB8 80241168 00000000 */ nop -.L8024116C: -/* A87BBC 8024116C 8E2200CC */ lw $v0, 0xcc($s1) -/* A87BC0 80241170 A2200007 */ sb $zero, 7($s1) -/* A87BC4 80241174 8C420028 */ lw $v0, 0x28($v0) -/* A87BC8 80241178 A600008E */ sh $zero, 0x8e($s0) -/* A87BCC 8024117C AE020028 */ sw $v0, 0x28($s0) -/* A87BD0 80241180 2402000F */ addiu $v0, $zero, 0xf -/* A87BD4 80241184 AE620070 */ sw $v0, 0x70($s3) -.L80241188: -/* A87BD8 80241188 8FBF0040 */ lw $ra, 0x40($sp) -/* A87BDC 8024118C 8FB3003C */ lw $s3, 0x3c($sp) -/* A87BE0 80241190 8FB20038 */ lw $s2, 0x38($sp) -/* A87BE4 80241194 8FB10034 */ lw $s1, 0x34($sp) -/* A87BE8 80241198 8FB00030 */ lw $s0, 0x30($sp) -/* A87BEC 8024119C 03E00008 */ jr $ra -/* A87BF0 802411A0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/func_80241224_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/func_80241224_A86A50.s deleted file mode 100644 index 3ce0923572..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/func_80241224_A86A50.s +++ /dev/null @@ -1,204 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241224_A87C74 -/* A87C74 80241224 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A87C78 80241228 AFB3005C */ sw $s3, 0x5c($sp) -/* A87C7C 8024122C 0080982D */ daddu $s3, $a0, $zero -/* A87C80 80241230 AFBF0068 */ sw $ra, 0x68($sp) -/* A87C84 80241234 AFB50064 */ sw $s5, 0x64($sp) -/* A87C88 80241238 AFB40060 */ sw $s4, 0x60($sp) -/* A87C8C 8024123C AFB20058 */ sw $s2, 0x58($sp) -/* A87C90 80241240 AFB10054 */ sw $s1, 0x54($sp) -/* A87C94 80241244 AFB00050 */ sw $s0, 0x50($sp) -/* A87C98 80241248 8E710148 */ lw $s1, 0x148($s3) -/* A87C9C 8024124C 86240008 */ lh $a0, 8($s1) -/* A87CA0 80241250 0C00EABB */ jal get_npc_unsafe -/* A87CA4 80241254 00A0802D */ daddu $s0, $a1, $zero -/* A87CA8 80241258 8E63000C */ lw $v1, 0xc($s3) -/* A87CAC 8024125C 0260202D */ daddu $a0, $s3, $zero -/* A87CB0 80241260 8C650000 */ lw $a1, ($v1) -/* A87CB4 80241264 0C0B1EAF */ jal get_variable -/* A87CB8 80241268 0040902D */ daddu $s2, $v0, $zero -/* A87CBC 8024126C AFA00028 */ sw $zero, 0x28($sp) -/* A87CC0 80241270 8E2300D0 */ lw $v1, 0xd0($s1) -/* A87CC4 80241274 8C630094 */ lw $v1, 0x94($v1) -/* A87CC8 80241278 AFA3002C */ sw $v1, 0x2c($sp) -/* A87CCC 8024127C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A87CD0 80241280 8C630080 */ lw $v1, 0x80($v1) -/* A87CD4 80241284 AFA30030 */ sw $v1, 0x30($sp) -/* A87CD8 80241288 8E2300D0 */ lw $v1, 0xd0($s1) -/* A87CDC 8024128C 8C630088 */ lw $v1, 0x88($v1) -/* A87CE0 80241290 AFA30034 */ sw $v1, 0x34($sp) -/* A87CE4 80241294 8E2300D0 */ lw $v1, 0xd0($s1) -/* A87CE8 80241298 8C63008C */ lw $v1, 0x8c($v1) -/* A87CEC 8024129C 27B50028 */ addiu $s5, $sp, 0x28 -/* A87CF0 802412A0 AFA30038 */ sw $v1, 0x38($sp) -/* A87CF4 802412A4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A87CF8 802412A8 3C0142C8 */ lui $at, 0x42c8 -/* A87CFC 802412AC 44810000 */ mtc1 $at, $f0 -/* A87D00 802412B0 8C630090 */ lw $v1, 0x90($v1) -/* A87D04 802412B4 0040A02D */ daddu $s4, $v0, $zero -/* A87D08 802412B8 E7A00040 */ swc1 $f0, 0x40($sp) -/* A87D0C 802412BC A7A00044 */ sh $zero, 0x44($sp) -/* A87D10 802412C0 12000007 */ beqz $s0, .L802412E0 -/* A87D14 802412C4 AFA3003C */ sw $v1, 0x3c($sp) -/* A87D18 802412C8 8E2200B0 */ lw $v0, 0xb0($s1) -/* A87D1C 802412CC 864300A8 */ lh $v1, 0xa8($s2) -/* A87D20 802412D0 34420008 */ ori $v0, $v0, 8 -/* A87D24 802412D4 AE230084 */ sw $v1, 0x84($s1) -/* A87D28 802412D8 080904BC */ j .L802412F0 -/* A87D2C 802412DC AE2200B0 */ sw $v0, 0xb0($s1) -.L802412E0: -/* A87D30 802412E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A87D34 802412E4 30420004 */ andi $v0, $v0, 4 -/* A87D38 802412E8 10400048 */ beqz $v0, .L8024140C -/* A87D3C 802412EC 00000000 */ nop -.L802412F0: -/* A87D40 802412F0 A640008E */ sh $zero, 0x8e($s2) -/* A87D44 802412F4 AE600070 */ sw $zero, 0x70($s3) -/* A87D48 802412F8 8E2300CC */ lw $v1, 0xcc($s1) -/* A87D4C 802412FC 2404F7FF */ addiu $a0, $zero, -0x801 -/* A87D50 80241300 A2200007 */ sb $zero, 7($s1) -/* A87D54 80241304 8E420000 */ lw $v0, ($s2) -/* A87D58 80241308 8C630000 */ lw $v1, ($v1) -/* A87D5C 8024130C 00441024 */ and $v0, $v0, $a0 -/* A87D60 80241310 AE420000 */ sw $v0, ($s2) -/* A87D64 80241314 AE430028 */ sw $v1, 0x28($s2) -/* A87D68 80241318 96220086 */ lhu $v0, 0x86($s1) -/* A87D6C 8024131C A64200A8 */ sh $v0, 0xa8($s2) -/* A87D70 80241320 8E2200D0 */ lw $v0, 0xd0($s1) -/* A87D74 80241324 A22000B5 */ sb $zero, 0xb5($s1) -/* A87D78 80241328 AE20008C */ sw $zero, 0x8c($s1) -/* A87D7C 8024132C 8C420098 */ lw $v0, 0x98($v0) -/* A87D80 80241330 14400006 */ bnez $v0, .L8024134C -/* A87D84 80241334 2403FDFF */ addiu $v1, $zero, -0x201 -/* A87D88 80241338 8E420000 */ lw $v0, ($s2) -/* A87D8C 8024133C 2403FFF7 */ addiu $v1, $zero, -9 -/* A87D90 80241340 34420200 */ ori $v0, $v0, 0x200 -/* A87D94 80241344 080904D6 */ j .L80241358 -/* A87D98 80241348 00431024 */ and $v0, $v0, $v1 -.L8024134C: -/* A87D9C 8024134C 8E420000 */ lw $v0, ($s2) -/* A87DA0 80241350 00431024 */ and $v0, $v0, $v1 -/* A87DA4 80241354 34420008 */ ori $v0, $v0, 8 -.L80241358: -/* A87DA8 80241358 AE420000 */ sw $v0, ($s2) -/* A87DAC 8024135C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A87DB0 80241360 30420004 */ andi $v0, $v0, 4 -/* A87DB4 80241364 1040001E */ beqz $v0, .L802413E0 -/* A87DB8 80241368 24040002 */ addiu $a0, $zero, 2 -/* A87DBC 8024136C 0240282D */ daddu $a1, $s2, $zero -/* A87DC0 80241370 0000302D */ daddu $a2, $zero, $zero -/* A87DC4 80241374 24020063 */ addiu $v0, $zero, 0x63 -/* A87DC8 80241378 AE620070 */ sw $v0, 0x70($s3) -/* A87DCC 8024137C AE600074 */ sw $zero, 0x74($s3) -/* A87DD0 80241380 864300A8 */ lh $v1, 0xa8($s2) -/* A87DD4 80241384 3C013F80 */ lui $at, 0x3f80 -/* A87DD8 80241388 44810000 */ mtc1 $at, $f0 -/* A87DDC 8024138C 3C014000 */ lui $at, 0x4000 -/* A87DE0 80241390 44811000 */ mtc1 $at, $f2 -/* A87DE4 80241394 3C01C1A0 */ lui $at, 0xc1a0 -/* A87DE8 80241398 44812000 */ mtc1 $at, $f4 -/* A87DEC 8024139C 24020028 */ addiu $v0, $zero, 0x28 -/* A87DF0 802413A0 AFA2001C */ sw $v0, 0x1c($sp) -/* A87DF4 802413A4 44833000 */ mtc1 $v1, $f6 -/* A87DF8 802413A8 00000000 */ nop -/* A87DFC 802413AC 468031A0 */ cvt.s.w $f6, $f6 -/* A87E00 802413B0 44073000 */ mfc1 $a3, $f6 -/* A87E04 802413B4 27A20048 */ addiu $v0, $sp, 0x48 -/* A87E08 802413B8 AFA20020 */ sw $v0, 0x20($sp) -/* A87E0C 802413BC E7A00010 */ swc1 $f0, 0x10($sp) -/* A87E10 802413C0 E7A20014 */ swc1 $f2, 0x14($sp) -/* A87E14 802413C4 0C01BFA4 */ jal fx_emote -/* A87E18 802413C8 E7A40018 */ swc1 $f4, 0x18($sp) -/* A87E1C 802413CC 8E2200B0 */ lw $v0, 0xb0($s1) -/* A87E20 802413D0 2403FFFB */ addiu $v1, $zero, -5 -/* A87E24 802413D4 00431024 */ and $v0, $v0, $v1 -/* A87E28 802413D8 08090503 */ j .L8024140C -/* A87E2C 802413DC AE2200B0 */ sw $v0, 0xb0($s1) -.L802413E0: -/* A87E30 802413E0 8E220000 */ lw $v0, ($s1) -/* A87E34 802413E4 3C034000 */ lui $v1, 0x4000 -/* A87E38 802413E8 00431024 */ and $v0, $v0, $v1 -/* A87E3C 802413EC 10400007 */ beqz $v0, .L8024140C -/* A87E40 802413F0 3C03BFFF */ lui $v1, 0xbfff -/* A87E44 802413F4 2402000C */ addiu $v0, $zero, 0xc -/* A87E48 802413F8 AE620070 */ sw $v0, 0x70($s3) -/* A87E4C 802413FC 8E220000 */ lw $v0, ($s1) -/* A87E50 80241400 3463FFFF */ ori $v1, $v1, 0xffff -/* A87E54 80241404 00431024 */ and $v0, $v0, $v1 -/* A87E58 80241408 AE220000 */ sw $v0, ($s1) -.L8024140C: -/* A87E5C 8024140C 8E630070 */ lw $v1, 0x70($s3) -/* A87E60 80241410 2C620064 */ sltiu $v0, $v1, 0x64 -/* A87E64 80241414 1040003A */ beqz $v0, .L80241500 -/* A87E68 80241418 00031080 */ sll $v0, $v1, 2 -/* A87E6C 8024141C 3C018024 */ lui $at, 0x8024 -/* A87E70 80241420 00220821 */ addu $at, $at, $v0 -/* A87E74 80241424 8C225BD8 */ lw $v0, 0x5bd8($at) -/* A87E78 80241428 00400008 */ jr $v0 -/* A87E7C 8024142C 00000000 */ nop -/* A87E80 80241430 0260202D */ daddu $a0, $s3, $zero -/* A87E84 80241434 0280282D */ daddu $a1, $s4, $zero -/* A87E88 80241438 0C090000 */ jal func_80240000 -/* A87E8C 8024143C 02A0302D */ daddu $a2, $s5, $zero -/* A87E90 80241440 96220086 */ lhu $v0, 0x86($s1) -/* A87E94 80241444 A64200A8 */ sh $v0, 0xa8($s2) -/* A87E98 80241448 0260202D */ daddu $a0, $s3, $zero -/* A87E9C 8024144C 0280282D */ daddu $a1, $s4, $zero -/* A87EA0 80241450 0C090056 */ jal func_80240158 -/* A87EA4 80241454 02A0302D */ daddu $a2, $s5, $zero -/* A87EA8 80241458 08090540 */ j .L80241500 -/* A87EAC 8024145C 00000000 */ nop -/* A87EB0 80241460 0260202D */ daddu $a0, $s3, $zero -/* A87EB4 80241464 0280282D */ daddu $a1, $s4, $zero -/* A87EB8 80241468 0C090100 */ jal func_80240400 -/* A87EBC 8024146C 02A0302D */ daddu $a2, $s5, $zero -/* A87EC0 80241470 0260202D */ daddu $a0, $s3, $zero -/* A87EC4 80241474 0280282D */ daddu $a1, $s4, $zero -/* A87EC8 80241478 0C090130 */ jal func_802404C0 -/* A87ECC 8024147C 02A0302D */ daddu $a2, $s5, $zero -/* A87ED0 80241480 08090540 */ j .L80241500 -/* A87ED4 80241484 00000000 */ nop -/* A87ED8 80241488 0260202D */ daddu $a0, $s3, $zero -/* A87EDC 8024148C 0280282D */ daddu $a1, $s4, $zero -/* A87EE0 80241490 0C09019F */ jal func_8024067C -/* A87EE4 80241494 02A0302D */ daddu $a2, $s5, $zero -/* A87EE8 80241498 08090540 */ j .L80241500 -/* A87EEC 8024149C 00000000 */ nop -/* A87EF0 802414A0 0260202D */ daddu $a0, $s3, $zero -/* A87EF4 802414A4 0280282D */ daddu $a1, $s4, $zero -/* A87EF8 802414A8 0C0903A4 */ jal func_80240E90 -/* A87EFC 802414AC 02A0302D */ daddu $a2, $s5, $zero -/* A87F00 802414B0 0260202D */ daddu $a0, $s3, $zero -/* A87F04 802414B4 0280282D */ daddu $a1, $s4, $zero -/* A87F08 802414B8 0C0903C3 */ jal func_80240F0C -/* A87F0C 802414BC 02A0302D */ daddu $a2, $s5, $zero -/* A87F10 802414C0 08090540 */ j .L80241500 -/* A87F14 802414C4 00000000 */ nop -/* A87F18 802414C8 0260202D */ daddu $a0, $s3, $zero -/* A87F1C 802414CC 0280282D */ daddu $a1, $s4, $zero -/* A87F20 802414D0 0C090410 */ jal func_80241040 -/* A87F24 802414D4 02A0302D */ daddu $a2, $s5, $zero -/* A87F28 802414D8 08090540 */ j .L80241500 -/* A87F2C 802414DC 00000000 */ nop -/* A87F30 802414E0 0260202D */ daddu $a0, $s3, $zero -/* A87F34 802414E4 0280282D */ daddu $a1, $s4, $zero -/* A87F38 802414E8 0C090469 */ jal func_802411A4 -/* A87F3C 802414EC 02A0302D */ daddu $a2, $s5, $zero -/* A87F40 802414F0 08090540 */ j .L80241500 -/* A87F44 802414F4 00000000 */ nop -/* A87F48 802414F8 0C0129CF */ jal func_8004A73C -/* A87F4C 802414FC 0260202D */ daddu $a0, $s3, $zero -.L80241500: -/* A87F50 80241500 8FBF0068 */ lw $ra, 0x68($sp) -/* A87F54 80241504 8FB50064 */ lw $s5, 0x64($sp) -/* A87F58 80241508 8FB40060 */ lw $s4, 0x60($sp) -/* A87F5C 8024150C 8FB3005C */ lw $s3, 0x5c($sp) -/* A87F60 80241510 8FB20058 */ lw $s2, 0x58($sp) -/* A87F64 80241514 8FB10054 */ lw $s1, 0x54($sp) -/* A87F68 80241518 8FB00050 */ lw $s0, 0x50($sp) -/* A87F6C 8024151C 0000102D */ daddu $v0, $zero, $zero -/* A87F70 80241520 03E00008 */ jr $ra -/* A87F74 80241524 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/func_80241548_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/func_80241548_A86A50.s deleted file mode 100644 index a19bca4574..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/func_80241548_A86A50.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241548_A87F98 -/* A87F98 80241548 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A87F9C 8024154C AFBF0010 */ sw $ra, 0x10($sp) -/* A87FA0 80241550 0C03A631 */ jal func_800E98C4 -/* A87FA4 80241554 00000000 */ nop -/* A87FA8 80241558 0C03A6DB */ jal sync_status_menu -/* A87FAC 8024155C 00000000 */ nop -/* A87FB0 80241560 8FBF0010 */ lw $ra, 0x10($sp) -/* A87FB4 80241564 24020002 */ addiu $v0, $zero, 2 -/* A87FB8 80241568 03E00008 */ jr $ra -/* A87FBC 8024156C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/func_80241570_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/func_80241570_A86A50.s deleted file mode 100644 index 9ceb1c46b4..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/func_80241570_A86A50.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241570_A87FC0 -/* A87FC0 80241570 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A87FC4 80241574 AFB10014 */ sw $s1, 0x14($sp) -/* A87FC8 80241578 0080882D */ daddu $s1, $a0, $zero -/* A87FCC 8024157C AFBF0018 */ sw $ra, 0x18($sp) -/* A87FD0 80241580 AFB00010 */ sw $s0, 0x10($sp) -/* A87FD4 80241584 8E30000C */ lw $s0, 0xc($s1) -/* A87FD8 80241588 8E050000 */ lw $a1, ($s0) -/* A87FDC 8024158C 0C0B1EAF */ jal get_variable -/* A87FE0 80241590 26100004 */ addiu $s0, $s0, 4 -/* A87FE4 80241594 0220202D */ daddu $a0, $s1, $zero -/* A87FE8 80241598 8E050000 */ lw $a1, ($s0) -/* A87FEC 8024159C 0C0B1EAF */ jal get_variable -/* A87FF0 802415A0 0040882D */ daddu $s1, $v0, $zero -/* A87FF4 802415A4 0000202D */ daddu $a0, $zero, $zero -/* A87FF8 802415A8 0080282D */ daddu $a1, $a0, $zero -/* A87FFC 802415AC 0040802D */ daddu $s0, $v0, $zero -/* A88000 802415B0 240600BE */ addiu $a2, $zero, 0xbe -/* A88004 802415B4 0C04DF93 */ jal func_80137E4C -/* A88008 802415B8 24070091 */ addiu $a3, $zero, 0x91 -/* A8800C 802415BC 44900000 */ mtc1 $s0, $f0 -/* A88010 802415C0 00000000 */ nop -/* A88014 802415C4 46800020 */ cvt.s.w $f0, $f0 -/* A88018 802415C8 44050000 */ mfc1 $a1, $f0 -/* A8801C 802415CC 0C04DF62 */ jal func_80137D88 -/* A88020 802415D0 322400FF */ andi $a0, $s1, 0xff -/* A88024 802415D4 8FBF0018 */ lw $ra, 0x18($sp) -/* A88028 802415D8 8FB10014 */ lw $s1, 0x14($sp) -/* A8802C 802415DC 8FB00010 */ lw $s0, 0x10($sp) -/* A88030 802415E0 24020002 */ addiu $v0, $zero, 2 -/* A88034 802415E4 03E00008 */ jr $ra -/* A88038 802415E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/func_802415EC_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/func_802415EC_A86A50.s deleted file mode 100644 index 08042452f7..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/func_802415EC_A86A50.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415EC_A8803C -/* A8803C 802415EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A88040 802415F0 AFB10014 */ sw $s1, 0x14($sp) -/* A88044 802415F4 0080882D */ daddu $s1, $a0, $zero -/* A88048 802415F8 AFBF0018 */ sw $ra, 0x18($sp) -/* A8804C 802415FC AFB00010 */ sw $s0, 0x10($sp) -/* A88050 80241600 8E30000C */ lw $s0, 0xc($s1) -/* A88054 80241604 8E050000 */ lw $a1, ($s0) -/* A88058 80241608 0C0B1EAF */ jal get_variable -/* A8805C 8024160C 26100004 */ addiu $s0, $s0, 4 -/* A88060 80241610 0220202D */ daddu $a0, $s1, $zero -/* A88064 80241614 8E050000 */ lw $a1, ($s0) -/* A88068 80241618 0C0B1EAF */ jal get_variable -/* A8806C 8024161C 0040802D */ daddu $s0, $v0, $zero -/* A88070 80241620 44820000 */ mtc1 $v0, $f0 -/* A88074 80241624 00000000 */ nop -/* A88078 80241628 46800020 */ cvt.s.w $f0, $f0 -/* A8807C 8024162C 24020002 */ addiu $v0, $zero, 2 -/* A88080 80241630 00501804 */ sllv $v1, $s0, $v0 -/* A88084 80241634 00701821 */ addu $v1, $v1, $s0 -/* A88088 80241638 00431804 */ sllv $v1, $v1, $v0 -/* A8808C 8024163C 00701823 */ subu $v1, $v1, $s0 -/* A88090 80241640 000320C0 */ sll $a0, $v1, 3 -/* A88094 80241644 00641821 */ addu $v1, $v1, $a0 -/* A88098 80241648 000318C0 */ sll $v1, $v1, 3 -/* A8809C 8024164C 3C01800B */ lui $at, 0x800b -/* A880A0 80241650 00230821 */ addu $at, $at, $v1 -/* A880A4 80241654 E4201D98 */ swc1 $f0, 0x1d98($at) -/* A880A8 80241658 8FBF0018 */ lw $ra, 0x18($sp) -/* A880AC 8024165C 8FB10014 */ lw $s1, 0x14($sp) -/* A880B0 80241660 8FB00010 */ lw $s0, 0x10($sp) -/* A880B4 80241664 03E00008 */ jr $ra -/* A880B8 80241668 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/func_8024173C_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/func_8024173C_A86A50.s deleted file mode 100644 index abb8eeae34..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/func_8024173C_A86A50.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024173C_A8818C -/* A8818C 8024173C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A88190 80241740 AFB10014 */ sw $s1, 0x14($sp) -/* A88194 80241744 0080882D */ daddu $s1, $a0, $zero -/* A88198 80241748 AFBF001C */ sw $ra, 0x1c($sp) -/* A8819C 8024174C AFB20018 */ sw $s2, 0x18($sp) -/* A881A0 80241750 AFB00010 */ sw $s0, 0x10($sp) -/* A881A4 80241754 8E30000C */ lw $s0, 0xc($s1) -/* A881A8 80241758 8E050000 */ lw $a1, ($s0) -/* A881AC 8024175C 0C0B1EAF */ jal get_variable -/* A881B0 80241760 26100004 */ addiu $s0, $s0, 4 -/* A881B4 80241764 8E050000 */ lw $a1, ($s0) -/* A881B8 80241768 26100004 */ addiu $s0, $s0, 4 -/* A881BC 8024176C 0220202D */ daddu $a0, $s1, $zero -/* A881C0 80241770 0C0B1EAF */ jal get_variable -/* A881C4 80241774 0040902D */ daddu $s2, $v0, $zero -/* A881C8 80241778 0220202D */ daddu $a0, $s1, $zero -/* A881CC 8024177C 8E050000 */ lw $a1, ($s0) -/* A881D0 80241780 0C0B1EAF */ jal get_variable -/* A881D4 80241784 0040802D */ daddu $s0, $v0, $zero -/* A881D8 80241788 0000202D */ daddu $a0, $zero, $zero -/* A881DC 8024178C 324500FF */ andi $a1, $s2, 0xff -/* A881E0 80241790 320600FF */ andi $a2, $s0, 0xff -/* A881E4 80241794 0C04DF84 */ jal func_80137E10 -/* A881E8 80241798 304700FF */ andi $a3, $v0, 0xff -/* A881EC 8024179C 8FBF001C */ lw $ra, 0x1c($sp) -/* A881F0 802417A0 8FB20018 */ lw $s2, 0x18($sp) -/* A881F4 802417A4 8FB10014 */ lw $s1, 0x14($sp) -/* A881F8 802417A8 8FB00010 */ lw $s0, 0x10($sp) -/* A881FC 802417AC 24020002 */ addiu $v0, $zero, 2 -/* A88200 802417B0 03E00008 */ jr $ra -/* A88204 802417B4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/func_802417EC_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/func_802417EC_A86A50.s deleted file mode 100644 index fc06affc8f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/func_802417EC_A86A50.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417EC_A8823C -/* A8823C 802417EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A88240 802417F0 AFBF0010 */ sw $ra, 0x10($sp) -/* A88244 802417F4 8C82000C */ lw $v0, 0xc($a0) -/* A88248 802417F8 0C0B1EAF */ jal get_variable -/* A8824C 802417FC 8C450000 */ lw $a1, ($v0) -/* A88250 80241800 00021600 */ sll $v0, $v0, 0x18 -/* A88254 80241804 0C03AC5A */ jal func_800EB168 -/* A88258 80241808 00022603 */ sra $a0, $v0, 0x18 -/* A8825C 8024180C 8FBF0010 */ lw $ra, 0x10($sp) -/* A88260 80241810 24020002 */ addiu $v0, $zero, 2 -/* A88264 80241814 03E00008 */ jr $ra -/* A88268 80241818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/func_8024181C_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/func_8024181C_A86A50.s deleted file mode 100644 index e4bb364fb9..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/func_8024181C_A86A50.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024181C_A8826C -/* A8826C 8024181C 03E00008 */ jr $ra -/* A88270 80241820 24020002 */ addiu $v0, $zero, 2 -/* A88274 80241824 00000000 */ nop -/* A88278 80241828 00000000 */ nop -/* A8827C 8024182C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_80240034_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_80240034_A8CA80.s deleted file mode 100644 index cbc38e7d0b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_80240034_A8CA80.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_A8CAB4 -/* A8CAB4 80240034 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8CAB8 80240038 AFB20018 */ sw $s2, 0x18($sp) -/* A8CABC 8024003C 0080902D */ daddu $s2, $a0, $zero -/* A8CAC0 80240040 AFBF001C */ sw $ra, 0x1c($sp) -/* A8CAC4 80240044 AFB10014 */ sw $s1, 0x14($sp) -/* A8CAC8 80240048 AFB00010 */ sw $s0, 0x10($sp) -/* A8CACC 8024004C 8E50000C */ lw $s0, 0xc($s2) -/* A8CAD0 80240050 8E050000 */ lw $a1, ($s0) -/* A8CAD4 80240054 0C0B1EAF */ jal get_variable -/* A8CAD8 80240058 26100004 */ addiu $s0, $s0, 4 -/* A8CADC 8024005C 0C04417A */ jal get_entity_by_index -/* A8CAE0 80240060 0040202D */ daddu $a0, $v0, $zero -/* A8CAE4 80240064 8E050000 */ lw $a1, ($s0) -/* A8CAE8 80240068 26100004 */ addiu $s0, $s0, 4 -/* A8CAEC 8024006C 0040882D */ daddu $s1, $v0, $zero -/* A8CAF0 80240070 C6200048 */ lwc1 $f0, 0x48($s1) -/* A8CAF4 80240074 4600008D */ trunc.w.s $f2, $f0 -/* A8CAF8 80240078 44061000 */ mfc1 $a2, $f2 -/* A8CAFC 8024007C 0C0B2026 */ jal set_variable -/* A8CB00 80240080 0240202D */ daddu $a0, $s2, $zero -/* A8CB04 80240084 8E050000 */ lw $a1, ($s0) -/* A8CB08 80240088 26100004 */ addiu $s0, $s0, 4 -/* A8CB0C 8024008C C620004C */ lwc1 $f0, 0x4c($s1) -/* A8CB10 80240090 4600008D */ trunc.w.s $f2, $f0 -/* A8CB14 80240094 44061000 */ mfc1 $a2, $f2 -/* A8CB18 80240098 0C0B2026 */ jal set_variable -/* A8CB1C 8024009C 0240202D */ daddu $a0, $s2, $zero -/* A8CB20 802400A0 C6200050 */ lwc1 $f0, 0x50($s1) -/* A8CB24 802400A4 8E050000 */ lw $a1, ($s0) -/* A8CB28 802400A8 4600008D */ trunc.w.s $f2, $f0 -/* A8CB2C 802400AC 44061000 */ mfc1 $a2, $f2 -/* A8CB30 802400B0 0C0B2026 */ jal set_variable -/* A8CB34 802400B4 0240202D */ daddu $a0, $s2, $zero -/* A8CB38 802400B8 8FBF001C */ lw $ra, 0x1c($sp) -/* A8CB3C 802400BC 8FB20018 */ lw $s2, 0x18($sp) -/* A8CB40 802400C0 8FB10014 */ lw $s1, 0x14($sp) -/* A8CB44 802400C4 8FB00010 */ lw $s0, 0x10($sp) -/* A8CB48 802400C8 24020002 */ addiu $v0, $zero, 2 -/* A8CB4C 802400CC 03E00008 */ jr $ra -/* A8CB50 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 -/* A8CB54 802400D4 00000000 */ nop -/* A8CB58 802400D8 00000000 */ nop -/* A8CB5C 802400DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_802400E0_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_802400E0_A8CA80.s deleted file mode 100644 index 75f5ffbddd..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_802400E0_A8CA80.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E0_A8CB60 -/* A8CB60 802400E0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A8CB64 802400E4 AFB50024 */ sw $s5, 0x24($sp) -/* A8CB68 802400E8 0080A82D */ daddu $s5, $a0, $zero -/* A8CB6C 802400EC AFBF002C */ sw $ra, 0x2c($sp) -/* A8CB70 802400F0 AFB60028 */ sw $s6, 0x28($sp) -/* A8CB74 802400F4 AFB40020 */ sw $s4, 0x20($sp) -/* A8CB78 802400F8 AFB3001C */ sw $s3, 0x1c($sp) -/* A8CB7C 802400FC AFB20018 */ sw $s2, 0x18($sp) -/* A8CB80 80240100 AFB10014 */ sw $s1, 0x14($sp) -/* A8CB84 80240104 AFB00010 */ sw $s0, 0x10($sp) -/* A8CB88 80240108 F7B80040 */ sdc1 $f24, 0x40($sp) -/* A8CB8C 8024010C F7B60038 */ sdc1 $f22, 0x38($sp) -/* A8CB90 80240110 F7B40030 */ sdc1 $f20, 0x30($sp) -/* A8CB94 80240114 8EB30148 */ lw $s3, 0x148($s5) -/* A8CB98 80240118 86640008 */ lh $a0, 8($s3) -/* A8CB9C 8024011C 0C00EABB */ jal get_npc_unsafe -/* A8CBA0 80240120 00A0B02D */ daddu $s6, $a1, $zero -/* A8CBA4 80240124 0040A02D */ daddu $s4, $v0, $zero -/* A8CBA8 80240128 AEA00074 */ sw $zero, 0x74($s5) -/* A8CBAC 8024012C C6980038 */ lwc1 $f24, 0x38($s4) -/* A8CBB0 80240130 C6960040 */ lwc1 $f22, 0x40($s4) -/* A8CBB4 80240134 0000902D */ daddu $s2, $zero, $zero -/* A8CBB8 80240138 AEA00078 */ sw $zero, 0x78($s5) -/* A8CBBC 8024013C 8E6300D0 */ lw $v1, 0xd0($s3) -/* A8CBC0 80240140 8C620000 */ lw $v0, ($v1) -/* A8CBC4 80240144 3C0146FF */ lui $at, 0x46ff -/* A8CBC8 80240148 3421FE00 */ ori $at, $at, 0xfe00 -/* A8CBCC 8024014C 4481A000 */ mtc1 $at, $f20 -/* A8CBD0 80240150 18400018 */ blez $v0, .L802401B4 -/* A8CBD4 80240154 0240802D */ daddu $s0, $s2, $zero -/* A8CBD8 80240158 0240882D */ daddu $s1, $s2, $zero -.L8024015C: -/* A8CBDC 8024015C 02231021 */ addu $v0, $s1, $v1 -/* A8CBE0 80240160 4600C306 */ mov.s $f12, $f24 -/* A8CBE4 80240164 C4440004 */ lwc1 $f4, 4($v0) -/* A8CBE8 80240168 46802120 */ cvt.s.w $f4, $f4 -/* A8CBEC 8024016C 44062000 */ mfc1 $a2, $f4 -/* A8CBF0 80240170 C444000C */ lwc1 $f4, 0xc($v0) -/* A8CBF4 80240174 46802120 */ cvt.s.w $f4, $f4 -/* A8CBF8 80240178 44072000 */ mfc1 $a3, $f4 -/* A8CBFC 8024017C 0C00A7B5 */ jal dist2D -/* A8CC00 80240180 4600B386 */ mov.s $f14, $f22 -/* A8CC04 80240184 4614003C */ c.lt.s $f0, $f20 -/* A8CC08 80240188 00000000 */ nop -/* A8CC0C 8024018C 45000003 */ bc1f .L8024019C -/* A8CC10 80240190 2631000C */ addiu $s1, $s1, 0xc -/* A8CC14 80240194 46000506 */ mov.s $f20, $f0 -/* A8CC18 80240198 AEB20078 */ sw $s2, 0x78($s5) -.L8024019C: -/* A8CC1C 8024019C 8E6300D0 */ lw $v1, 0xd0($s3) -/* A8CC20 802401A0 26100001 */ addiu $s0, $s0, 1 -/* A8CC24 802401A4 8C620000 */ lw $v0, ($v1) -/* A8CC28 802401A8 0202102A */ slt $v0, $s0, $v0 -/* A8CC2C 802401AC 1440FFEB */ bnez $v0, .L8024015C -/* A8CC30 802401B0 26520001 */ addiu $s2, $s2, 1 -.L802401B4: -/* A8CC34 802401B4 8E6200CC */ lw $v0, 0xcc($s3) -/* A8CC38 802401B8 8C420004 */ lw $v0, 4($v0) -/* A8CC3C 802401BC AE820028 */ sw $v0, 0x28($s4) -/* A8CC40 802401C0 8E6200D0 */ lw $v0, 0xd0($s3) -/* A8CC44 802401C4 8C42007C */ lw $v0, 0x7c($v0) -/* A8CC48 802401C8 04410004 */ bgez $v0, .L802401DC -/* A8CC4C 802401CC 00000000 */ nop -/* A8CC50 802401D0 C6C00000 */ lwc1 $f0, ($s6) -/* A8CC54 802401D4 0809007F */ j .L802401FC -/* A8CC58 802401D8 E6800018 */ swc1 $f0, 0x18($s4) -.L802401DC: -/* A8CC5C 802401DC 3C018024 */ lui $at, 0x8024 -/* A8CC60 802401E0 D4225A00 */ ldc1 $f2, 0x5a00($at) -/* A8CC64 802401E4 44820000 */ mtc1 $v0, $f0 -/* A8CC68 802401E8 00000000 */ nop -/* A8CC6C 802401EC 46800021 */ cvt.d.w $f0, $f0 -/* A8CC70 802401F0 46220003 */ div.d $f0, $f0, $f2 -/* A8CC74 802401F4 46200020 */ cvt.s.d $f0, $f0 -/* A8CC78 802401F8 E6800018 */ swc1 $f0, 0x18($s4) -.L802401FC: -/* A8CC7C 802401FC 24020001 */ addiu $v0, $zero, 1 -/* A8CC80 80240200 AEA20070 */ sw $v0, 0x70($s5) -/* A8CC84 80240204 8FBF002C */ lw $ra, 0x2c($sp) -/* A8CC88 80240208 8FB60028 */ lw $s6, 0x28($sp) -/* A8CC8C 8024020C 8FB50024 */ lw $s5, 0x24($sp) -/* A8CC90 80240210 8FB40020 */ lw $s4, 0x20($sp) -/* A8CC94 80240214 8FB3001C */ lw $s3, 0x1c($sp) -/* A8CC98 80240218 8FB20018 */ lw $s2, 0x18($sp) -/* A8CC9C 8024021C 8FB10014 */ lw $s1, 0x14($sp) -/* A8CCA0 80240220 8FB00010 */ lw $s0, 0x10($sp) -/* A8CCA4 80240224 D7B80040 */ ldc1 $f24, 0x40($sp) -/* A8CCA8 80240228 D7B60038 */ ldc1 $f22, 0x38($sp) -/* A8CCAC 8024022C D7B40030 */ ldc1 $f20, 0x30($sp) -/* A8CCB0 80240230 03E00008 */ jr $ra -/* A8CCB4 80240234 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_802405A0_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_802405A0_A8CA80.s deleted file mode 100644 index 8c34132323..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_802405A0_A8CA80.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A0_A8D020 -/* A8D020 802405A0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A8D024 802405A4 AFB40040 */ sw $s4, 0x40($sp) -/* A8D028 802405A8 0080A02D */ daddu $s4, $a0, $zero -/* A8D02C 802405AC AFBF0044 */ sw $ra, 0x44($sp) -/* A8D030 802405B0 AFB3003C */ sw $s3, 0x3c($sp) -/* A8D034 802405B4 AFB20038 */ sw $s2, 0x38($sp) -/* A8D038 802405B8 AFB10034 */ sw $s1, 0x34($sp) -/* A8D03C 802405BC AFB00030 */ sw $s0, 0x30($sp) -/* A8D040 802405C0 8E910148 */ lw $s1, 0x148($s4) -/* A8D044 802405C4 00A0902D */ daddu $s2, $a1, $zero -/* A8D048 802405C8 86240008 */ lh $a0, 8($s1) -/* A8D04C 802405CC 0C00EABB */ jal get_npc_unsafe -/* A8D050 802405D0 00C0982D */ daddu $s3, $a2, $zero -/* A8D054 802405D4 8E430014 */ lw $v1, 0x14($s2) -/* A8D058 802405D8 04600031 */ bltz $v1, .L802406A0 -/* A8D05C 802405DC 0040802D */ daddu $s0, $v0, $zero -/* A8D060 802405E0 0260202D */ daddu $a0, $s3, $zero -/* A8D064 802405E4 AFA00010 */ sw $zero, 0x10($sp) -/* A8D068 802405E8 8E460024 */ lw $a2, 0x24($s2) -/* A8D06C 802405EC 8E470028 */ lw $a3, 0x28($s2) -/* A8D070 802405F0 0C01242D */ jal func_800490B4 -/* A8D074 802405F4 0220282D */ daddu $a1, $s1, $zero -/* A8D078 802405F8 10400029 */ beqz $v0, .L802406A0 -/* A8D07C 802405FC 0000202D */ daddu $a0, $zero, $zero -/* A8D080 80240600 0200282D */ daddu $a1, $s0, $zero -/* A8D084 80240604 0000302D */ daddu $a2, $zero, $zero -/* A8D088 80240608 860300A8 */ lh $v1, 0xa8($s0) -/* A8D08C 8024060C 3C013F80 */ lui $at, 0x3f80 -/* A8D090 80240610 44810000 */ mtc1 $at, $f0 -/* A8D094 80240614 3C014000 */ lui $at, 0x4000 -/* A8D098 80240618 44811000 */ mtc1 $at, $f2 -/* A8D09C 8024061C 3C01C1A0 */ lui $at, 0xc1a0 -/* A8D0A0 80240620 44812000 */ mtc1 $at, $f4 -/* A8D0A4 80240624 2402000F */ addiu $v0, $zero, 0xf -/* A8D0A8 80240628 AFA2001C */ sw $v0, 0x1c($sp) -/* A8D0AC 8024062C 44833000 */ mtc1 $v1, $f6 -/* A8D0B0 80240630 00000000 */ nop -/* A8D0B4 80240634 468031A0 */ cvt.s.w $f6, $f6 -/* A8D0B8 80240638 44073000 */ mfc1 $a3, $f6 -/* A8D0BC 8024063C 27A20028 */ addiu $v0, $sp, 0x28 -/* A8D0C0 80240640 AFA20020 */ sw $v0, 0x20($sp) -/* A8D0C4 80240644 E7A00010 */ swc1 $f0, 0x10($sp) -/* A8D0C8 80240648 E7A20014 */ swc1 $f2, 0x14($sp) -/* A8D0CC 8024064C 0C01BFA4 */ jal fx_emote -/* A8D0D0 80240650 E7A40018 */ swc1 $f4, 0x18($sp) -/* A8D0D4 80240654 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A8D0D8 80240658 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A8D0DC 8024065C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A8D0E0 80240660 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A8D0E4 80240664 8C460028 */ lw $a2, 0x28($v0) -/* A8D0E8 80240668 0C00A720 */ jal atan2 -/* A8D0EC 8024066C 8C470030 */ lw $a3, 0x30($v0) -/* A8D0F0 80240670 0200202D */ daddu $a0, $s0, $zero -/* A8D0F4 80240674 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A8D0F8 80240678 3C060020 */ lui $a2, 0x20 -/* A8D0FC 8024067C 0C012530 */ jal func_800494C0 -/* A8D100 80240680 E480000C */ swc1 $f0, 0xc($a0) -/* A8D104 80240684 8E220018 */ lw $v0, 0x18($s1) -/* A8D108 80240688 9442002A */ lhu $v0, 0x2a($v0) -/* A8D10C 8024068C 30420001 */ andi $v0, $v0, 1 -/* A8D110 80240690 14400029 */ bnez $v0, .L80240738 -/* A8D114 80240694 2402000A */ addiu $v0, $zero, 0xa -/* A8D118 80240698 080901CE */ j .L80240738 -/* A8D11C 8024069C 2402000C */ addiu $v0, $zero, 0xc -.L802406A0: -/* A8D120 802406A0 8602008C */ lh $v0, 0x8c($s0) -/* A8D124 802406A4 14400025 */ bnez $v0, .L8024073C -/* A8D128 802406A8 00000000 */ nop -/* A8D12C 802406AC 9602008E */ lhu $v0, 0x8e($s0) -/* A8D130 802406B0 2442FFFF */ addiu $v0, $v0, -1 -/* A8D134 802406B4 A602008E */ sh $v0, 0x8e($s0) -/* A8D138 802406B8 00021400 */ sll $v0, $v0, 0x10 -/* A8D13C 802406BC 1440001F */ bnez $v0, .L8024073C -/* A8D140 802406C0 00000000 */ nop -/* A8D144 802406C4 8E820074 */ lw $v0, 0x74($s4) -/* A8D148 802406C8 2442FFFF */ addiu $v0, $v0, -1 -/* A8D14C 802406CC 10400019 */ beqz $v0, .L80240734 -/* A8D150 802406D0 AE820074 */ sw $v0, 0x74($s4) -/* A8D154 802406D4 8E220018 */ lw $v0, 0x18($s1) -/* A8D158 802406D8 9442002A */ lhu $v0, 0x2a($v0) -/* A8D15C 802406DC 30420010 */ andi $v0, $v0, 0x10 -/* A8D160 802406E0 14400007 */ bnez $v0, .L80240700 -/* A8D164 802406E4 00000000 */ nop -/* A8D168 802406E8 C600000C */ lwc1 $f0, 0xc($s0) -/* A8D16C 802406EC 3C014334 */ lui $at, 0x4334 -/* A8D170 802406F0 44816000 */ mtc1 $at, $f12 -/* A8D174 802406F4 0C00A6C9 */ jal clamp_angle -/* A8D178 802406F8 460C0300 */ add.s $f12, $f0, $f12 -/* A8D17C 802406FC E600000C */ swc1 $f0, 0xc($s0) -.L80240700: -/* A8D180 80240700 8E440008 */ lw $a0, 8($s2) -/* A8D184 80240704 000417C2 */ srl $v0, $a0, 0x1f -/* A8D188 80240708 00822021 */ addu $a0, $a0, $v0 -/* A8D18C 8024070C 00042043 */ sra $a0, $a0, 1 -/* A8D190 80240710 0C00A67F */ jal rand_int -/* A8D194 80240714 24840001 */ addiu $a0, $a0, 1 -/* A8D198 80240718 8E430008 */ lw $v1, 8($s2) -/* A8D19C 8024071C 000327C2 */ srl $a0, $v1, 0x1f -/* A8D1A0 80240720 00641821 */ addu $v1, $v1, $a0 -/* A8D1A4 80240724 00031843 */ sra $v1, $v1, 1 -/* A8D1A8 80240728 00621821 */ addu $v1, $v1, $v0 -/* A8D1AC 8024072C 080901CF */ j .L8024073C -/* A8D1B0 80240730 A603008E */ sh $v1, 0x8e($s0) -.L80240734: -/* A8D1B4 80240734 24020004 */ addiu $v0, $zero, 4 -.L80240738: -/* A8D1B8 80240738 AE820070 */ sw $v0, 0x70($s4) -.L8024073C: -/* A8D1BC 8024073C 8FBF0044 */ lw $ra, 0x44($sp) -/* A8D1C0 80240740 8FB40040 */ lw $s4, 0x40($sp) -/* A8D1C4 80240744 8FB3003C */ lw $s3, 0x3c($sp) -/* A8D1C8 80240748 8FB20038 */ lw $s2, 0x38($sp) -/* A8D1CC 8024074C 8FB10034 */ lw $s1, 0x34($sp) -/* A8D1D0 80240750 8FB00030 */ lw $s0, 0x30($sp) -/* A8D1D4 80240754 03E00008 */ jr $ra -/* A8D1D8 80240758 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_8024075C_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_8024075C_A8CA80.s deleted file mode 100644 index b708c88021..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_8024075C_A8CA80.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024075C_A8D1DC -/* A8D1DC 8024075C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8D1E0 80240760 AFB10014 */ sw $s1, 0x14($sp) -/* A8D1E4 80240764 0080882D */ daddu $s1, $a0, $zero -/* A8D1E8 80240768 AFBF001C */ sw $ra, 0x1c($sp) -/* A8D1EC 8024076C AFB20018 */ sw $s2, 0x18($sp) -/* A8D1F0 80240770 AFB00010 */ sw $s0, 0x10($sp) -/* A8D1F4 80240774 8E300148 */ lw $s0, 0x148($s1) -/* A8D1F8 80240778 86040008 */ lh $a0, 8($s0) -/* A8D1FC 8024077C 0C00EABB */ jal get_npc_unsafe -/* A8D200 80240780 00A0902D */ daddu $s2, $a1, $zero -/* A8D204 80240784 8E230078 */ lw $v1, 0x78($s1) -/* A8D208 80240788 24630001 */ addiu $v1, $v1, 1 -/* A8D20C 8024078C AE230078 */ sw $v1, 0x78($s1) -/* A8D210 80240790 8E0400D0 */ lw $a0, 0xd0($s0) -/* A8D214 80240794 8C840000 */ lw $a0, ($a0) -/* A8D218 80240798 0064182A */ slt $v1, $v1, $a0 -/* A8D21C 8024079C 14600002 */ bnez $v1, .L802407A8 -/* A8D220 802407A0 0040282D */ daddu $a1, $v0, $zero -/* A8D224 802407A4 AE200078 */ sw $zero, 0x78($s1) -.L802407A8: -/* A8D228 802407A8 8E0200CC */ lw $v0, 0xcc($s0) -/* A8D22C 802407AC 8C420004 */ lw $v0, 4($v0) -/* A8D230 802407B0 ACA20028 */ sw $v0, 0x28($a1) -/* A8D234 802407B4 8E0200D0 */ lw $v0, 0xd0($s0) -/* A8D238 802407B8 8C42007C */ lw $v0, 0x7c($v0) -/* A8D23C 802407BC 04410004 */ bgez $v0, .L802407D0 -/* A8D240 802407C0 00000000 */ nop -/* A8D244 802407C4 C6400000 */ lwc1 $f0, ($s2) -/* A8D248 802407C8 080901FC */ j .L802407F0 -/* A8D24C 802407CC E4A00018 */ swc1 $f0, 0x18($a1) -.L802407D0: -/* A8D250 802407D0 3C018024 */ lui $at, 0x8024 -/* A8D254 802407D4 D4225A08 */ ldc1 $f2, 0x5a08($at) -/* A8D258 802407D8 44820000 */ mtc1 $v0, $f0 -/* A8D25C 802407DC 00000000 */ nop -/* A8D260 802407E0 46800021 */ cvt.d.w $f0, $f0 -/* A8D264 802407E4 46220003 */ div.d $f0, $f0, $f2 -/* A8D268 802407E8 46200020 */ cvt.s.d $f0, $f0 -/* A8D26C 802407EC E4A00018 */ swc1 $f0, 0x18($a1) -.L802407F0: -/* A8D270 802407F0 24020001 */ addiu $v0, $zero, 1 -/* A8D274 802407F4 AE220070 */ sw $v0, 0x70($s1) -/* A8D278 802407F8 8FBF001C */ lw $ra, 0x1c($sp) -/* A8D27C 802407FC 8FB20018 */ lw $s2, 0x18($sp) -/* A8D280 80240800 8FB10014 */ lw $s1, 0x14($sp) -/* A8D284 80240804 8FB00010 */ lw $s0, 0x10($sp) -/* A8D288 80240808 03E00008 */ jr $ra -/* A8D28C 8024080C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_80240810_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_80240810_A8CA80.s deleted file mode 100644 index 4ed38b4923..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_80240810_A8CA80.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240810_A8D290 -/* A8D290 80240810 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8D294 80240814 AFB10014 */ sw $s1, 0x14($sp) -/* A8D298 80240818 0080882D */ daddu $s1, $a0, $zero -/* A8D29C 8024081C AFBF0018 */ sw $ra, 0x18($sp) -/* A8D2A0 80240820 AFB00010 */ sw $s0, 0x10($sp) -/* A8D2A4 80240824 8E300148 */ lw $s0, 0x148($s1) -/* A8D2A8 80240828 0C00EABB */ jal get_npc_unsafe -/* A8D2AC 8024082C 86040008 */ lh $a0, 8($s0) -/* A8D2B0 80240830 8E0300CC */ lw $v1, 0xcc($s0) -/* A8D2B4 80240834 3C014120 */ lui $at, 0x4120 -/* A8D2B8 80240838 44812000 */ mtc1 $at, $f4 -/* A8D2BC 8024083C 3C014000 */ lui $at, 0x4000 -/* A8D2C0 80240840 44810000 */ mtc1 $at, $f0 -/* A8D2C4 80240844 C442003C */ lwc1 $f2, 0x3c($v0) -/* A8D2C8 80240848 8C640010 */ lw $a0, 0x10($v1) -/* A8D2CC 8024084C 8C430000 */ lw $v1, ($v0) -/* A8D2D0 80240850 E444001C */ swc1 $f4, 0x1c($v0) -/* A8D2D4 80240854 E4400014 */ swc1 $f0, 0x14($v0) -/* A8D2D8 80240858 E4420064 */ swc1 $f2, 0x64($v0) -/* A8D2DC 8024085C 34630800 */ ori $v1, $v1, 0x800 -/* A8D2E0 80240860 AC430000 */ sw $v1, ($v0) -/* A8D2E4 80240864 AC440028 */ sw $a0, 0x28($v0) -/* A8D2E8 80240868 2402000B */ addiu $v0, $zero, 0xb -/* A8D2EC 8024086C AE220070 */ sw $v0, 0x70($s1) -/* A8D2F0 80240870 8FBF0018 */ lw $ra, 0x18($sp) -/* A8D2F4 80240874 8FB10014 */ lw $s1, 0x14($sp) -/* A8D2F8 80240878 8FB00010 */ lw $s0, 0x10($sp) -/* A8D2FC 8024087C 03E00008 */ jr $ra -/* A8D300 80240880 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_80240884_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_80240884_A8CA80.s deleted file mode 100644 index 4861aca27e..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_80240884_A8CA80.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240884_A8D304 -/* A8D304 80240884 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8D308 80240888 AFB00010 */ sw $s0, 0x10($sp) -/* A8D30C 8024088C 0080802D */ daddu $s0, $a0, $zero -/* A8D310 80240890 AFBF0014 */ sw $ra, 0x14($sp) -/* A8D314 80240894 8E020148 */ lw $v0, 0x148($s0) -/* A8D318 80240898 0C00EABB */ jal get_npc_unsafe -/* A8D31C 8024089C 84440008 */ lh $a0, 8($v0) -/* A8D320 802408A0 0040202D */ daddu $a0, $v0, $zero -/* A8D324 802408A4 C482003C */ lwc1 $f2, 0x3c($a0) -/* A8D328 802408A8 C480001C */ lwc1 $f0, 0x1c($a0) -/* A8D32C 802408AC 46001080 */ add.s $f2, $f2, $f0 -/* A8D330 802408B0 C4840014 */ lwc1 $f4, 0x14($a0) -/* A8D334 802408B4 46040001 */ sub.s $f0, $f0, $f4 -/* A8D338 802408B8 C4840064 */ lwc1 $f4, 0x64($a0) -/* A8D33C 802408BC 4602203C */ c.lt.s $f4, $f2 -/* A8D340 802408C0 E482003C */ swc1 $f2, 0x3c($a0) -/* A8D344 802408C4 45010009 */ bc1t .L802408EC -/* A8D348 802408C8 E480001C */ swc1 $f0, 0x1c($a0) -/* A8D34C 802408CC 8C820000 */ lw $v0, ($a0) -/* A8D350 802408D0 2403F7FF */ addiu $v1, $zero, -0x801 -/* A8D354 802408D4 E484003C */ swc1 $f4, 0x3c($a0) -/* A8D358 802408D8 AC80001C */ sw $zero, 0x1c($a0) -/* A8D35C 802408DC 00431024 */ and $v0, $v0, $v1 -/* A8D360 802408E0 AC820000 */ sw $v0, ($a0) -/* A8D364 802408E4 2402000C */ addiu $v0, $zero, 0xc -/* A8D368 802408E8 AE020070 */ sw $v0, 0x70($s0) -.L802408EC: -/* A8D36C 802408EC 8FBF0014 */ lw $ra, 0x14($sp) -/* A8D370 802408F0 8FB00010 */ lw $s0, 0x10($sp) -/* A8D374 802408F4 03E00008 */ jr $ra -/* A8D378 802408F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_80240B4C_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_80240B4C_A8CA80.s deleted file mode 100644 index c074259ea3..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_80240B4C_A8CA80.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B4C_A8D5CC -/* A8D5CC 80240B4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8D5D0 80240B50 AFB10014 */ sw $s1, 0x14($sp) -/* A8D5D4 80240B54 0080882D */ daddu $s1, $a0, $zero -/* A8D5D8 80240B58 AFBF0018 */ sw $ra, 0x18($sp) -/* A8D5DC 80240B5C AFB00010 */ sw $s0, 0x10($sp) -/* A8D5E0 80240B60 8E300148 */ lw $s0, 0x148($s1) -/* A8D5E4 80240B64 0C00EABB */ jal get_npc_unsafe -/* A8D5E8 80240B68 86040008 */ lh $a0, 8($s0) -/* A8D5EC 80240B6C 9443008E */ lhu $v1, 0x8e($v0) -/* A8D5F0 80240B70 2463FFFF */ addiu $v1, $v1, -1 -/* A8D5F4 80240B74 A443008E */ sh $v1, 0x8e($v0) -/* A8D5F8 80240B78 00031C00 */ sll $v1, $v1, 0x10 -/* A8D5FC 80240B7C 14600008 */ bnez $v1, .L80240BA0 -/* A8D600 80240B80 00000000 */ nop -/* A8D604 80240B84 8E0200B0 */ lw $v0, 0xb0($s0) -/* A8D608 80240B88 30420080 */ andi $v0, $v0, 0x80 -/* A8D60C 80240B8C 10400003 */ beqz $v0, .L80240B9C -/* A8D610 80240B90 2402000F */ addiu $v0, $zero, 0xf -/* A8D614 80240B94 080902E8 */ j .L80240BA0 -/* A8D618 80240B98 AE220070 */ sw $v0, 0x70($s1) -.L80240B9C: -/* A8D61C 80240B9C AE200070 */ sw $zero, 0x70($s1) -.L80240BA0: -/* A8D620 80240BA0 8FBF0018 */ lw $ra, 0x18($sp) -/* A8D624 80240BA4 8FB10014 */ lw $s1, 0x14($sp) -/* A8D628 80240BA8 8FB00010 */ lw $s0, 0x10($sp) -/* A8D62C 80240BAC 03E00008 */ jr $ra -/* A8D630 80240BB0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_80240BB4_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_80240BB4_A8CA80.s deleted file mode 100644 index 00c2326927..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_80240BB4_A8CA80.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BB4_A8D634 -/* A8D634 80240BB4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8D638 80240BB8 AFB10014 */ sw $s1, 0x14($sp) -/* A8D63C 80240BBC 0080882D */ daddu $s1, $a0, $zero -/* A8D640 80240BC0 AFBF001C */ sw $ra, 0x1c($sp) -/* A8D644 80240BC4 AFB20018 */ sw $s2, 0x18($sp) -/* A8D648 80240BC8 AFB00010 */ sw $s0, 0x10($sp) -/* A8D64C 80240BCC 8E300148 */ lw $s0, 0x148($s1) -/* A8D650 80240BD0 86040008 */ lh $a0, 8($s0) -/* A8D654 80240BD4 0C00EABB */ jal get_npc_unsafe -/* A8D658 80240BD8 00A0902D */ daddu $s2, $a1, $zero -/* A8D65C 80240BDC 8E0300D0 */ lw $v1, 0xd0($s0) -/* A8D660 80240BE0 8E240078 */ lw $a0, 0x78($s1) -/* A8D664 80240BE4 8C630000 */ lw $v1, ($v1) -/* A8D668 80240BE8 0083182A */ slt $v1, $a0, $v1 -/* A8D66C 80240BEC 10600013 */ beqz $v1, .L80240C3C -/* A8D670 80240BF0 0040302D */ daddu $a2, $v0, $zero -/* A8D674 80240BF4 00041040 */ sll $v0, $a0, 1 -/* A8D678 80240BF8 00441021 */ addu $v0, $v0, $a0 -/* A8D67C 80240BFC 00022880 */ sll $a1, $v0, 2 -.L80240C00: -/* A8D680 80240C00 8E0300D0 */ lw $v1, 0xd0($s0) -/* A8D684 80240C04 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* A8D688 80240C08 00A31021 */ addu $v0, $a1, $v1 -/* A8D68C 80240C0C C4400008 */ lwc1 $f0, 8($v0) -/* A8D690 80240C10 46800020 */ cvt.s.w $f0, $f0 -/* A8D694 80240C14 4602003E */ c.le.s $f0, $f2 -/* A8D698 80240C18 00000000 */ nop -/* A8D69C 80240C1C 45020003 */ bc1fl .L80240C2C -/* A8D6A0 80240C20 24840001 */ addiu $a0, $a0, 1 -/* A8D6A4 80240C24 0809030F */ j .L80240C3C -/* A8D6A8 80240C28 AE240078 */ sw $a0, 0x78($s1) -.L80240C2C: -/* A8D6AC 80240C2C 8C620000 */ lw $v0, ($v1) -/* A8D6B0 80240C30 0082102A */ slt $v0, $a0, $v0 -/* A8D6B4 80240C34 1440FFF2 */ bnez $v0, .L80240C00 -/* A8D6B8 80240C38 24A5000C */ addiu $a1, $a1, 0xc -.L80240C3C: -/* A8D6BC 80240C3C C6400000 */ lwc1 $f0, ($s2) -/* A8D6C0 80240C40 E4C00018 */ swc1 $f0, 0x18($a2) -/* A8D6C4 80240C44 8E0200CC */ lw $v0, 0xcc($s0) -/* A8D6C8 80240C48 8C420004 */ lw $v0, 4($v0) -/* A8D6CC 80240C4C ACC20028 */ sw $v0, 0x28($a2) -/* A8D6D0 80240C50 24020001 */ addiu $v0, $zero, 1 -/* A8D6D4 80240C54 AE200074 */ sw $zero, 0x74($s1) -/* A8D6D8 80240C58 AE220070 */ sw $v0, 0x70($s1) -/* A8D6DC 80240C5C 8FBF001C */ lw $ra, 0x1c($sp) -/* A8D6E0 80240C60 8FB20018 */ lw $s2, 0x18($sp) -/* A8D6E4 80240C64 8FB10014 */ lw $s1, 0x14($sp) -/* A8D6E8 80240C68 8FB00010 */ lw $s0, 0x10($sp) -/* A8D6EC 80240C6C 03E00008 */ jr $ra -/* A8D6F0 80240C70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_80240C74_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_80240C74_A8CA80.s deleted file mode 100644 index b067189e0c..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_80240C74_A8CA80.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C74_A8D6F4 -/* A8D6F4 80240C74 27BDFF98 */ addiu $sp, $sp, -0x68 -/* A8D6F8 80240C78 AFB40058 */ sw $s4, 0x58($sp) -/* A8D6FC 80240C7C 0080A02D */ daddu $s4, $a0, $zero -/* A8D700 80240C80 AFBF0060 */ sw $ra, 0x60($sp) -/* A8D704 80240C84 AFB5005C */ sw $s5, 0x5c($sp) -/* A8D708 80240C88 AFB30054 */ sw $s3, 0x54($sp) -/* A8D70C 80240C8C AFB20050 */ sw $s2, 0x50($sp) -/* A8D710 80240C90 AFB1004C */ sw $s1, 0x4c($sp) -/* A8D714 80240C94 AFB00048 */ sw $s0, 0x48($sp) -/* A8D718 80240C98 8E910148 */ lw $s1, 0x148($s4) -/* A8D71C 80240C9C 86240008 */ lh $a0, 8($s1) -/* A8D720 80240CA0 0C00EABB */ jal get_npc_unsafe -/* A8D724 80240CA4 00A0802D */ daddu $s0, $a1, $zero -/* A8D728 80240CA8 8E83000C */ lw $v1, 0xc($s4) -/* A8D72C 80240CAC 0280202D */ daddu $a0, $s4, $zero -/* A8D730 80240CB0 8C650000 */ lw $a1, ($v1) -/* A8D734 80240CB4 0C0B1EAF */ jal get_variable -/* A8D738 80240CB8 0040902D */ daddu $s2, $v0, $zero -/* A8D73C 80240CBC AFA00018 */ sw $zero, 0x18($sp) -/* A8D740 80240CC0 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8D744 80240CC4 8C630094 */ lw $v1, 0x94($v1) -/* A8D748 80240CC8 AFA3001C */ sw $v1, 0x1c($sp) -/* A8D74C 80240CCC 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8D750 80240CD0 8C630080 */ lw $v1, 0x80($v1) -/* A8D754 80240CD4 AFA30020 */ sw $v1, 0x20($sp) -/* A8D758 80240CD8 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8D75C 80240CDC 8C630088 */ lw $v1, 0x88($v1) -/* A8D760 80240CE0 AFA30024 */ sw $v1, 0x24($sp) -/* A8D764 80240CE4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8D768 80240CE8 8C63008C */ lw $v1, 0x8c($v1) -/* A8D76C 80240CEC 27B50018 */ addiu $s5, $sp, 0x18 -/* A8D770 80240CF0 AFA30028 */ sw $v1, 0x28($sp) -/* A8D774 80240CF4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8D778 80240CF8 3C014282 */ lui $at, 0x4282 -/* A8D77C 80240CFC 44810000 */ mtc1 $at, $f0 -/* A8D780 80240D00 8C630090 */ lw $v1, 0x90($v1) -/* A8D784 80240D04 0040982D */ daddu $s3, $v0, $zero -/* A8D788 80240D08 E7A00030 */ swc1 $f0, 0x30($sp) -/* A8D78C 80240D0C A7A00034 */ sh $zero, 0x34($sp) -/* A8D790 80240D10 16000005 */ bnez $s0, .L80240D28 -/* A8D794 80240D14 AFA3002C */ sw $v1, 0x2c($sp) -/* A8D798 80240D18 8E2200B0 */ lw $v0, 0xb0($s1) -/* A8D79C 80240D1C 30420004 */ andi $v0, $v0, 4 -/* A8D7A0 80240D20 10400044 */ beqz $v0, .L80240E34 -/* A8D7A4 80240D24 00000000 */ nop -.L80240D28: -/* A8D7A8 80240D28 2404F7FF */ addiu $a0, $zero, -0x801 -/* A8D7AC 80240D2C AE800070 */ sw $zero, 0x70($s4) -/* A8D7B0 80240D30 A640008E */ sh $zero, 0x8e($s2) -/* A8D7B4 80240D34 8E2200CC */ lw $v0, 0xcc($s1) -/* A8D7B8 80240D38 8E430000 */ lw $v1, ($s2) -/* A8D7BC 80240D3C 8C420000 */ lw $v0, ($v0) -/* A8D7C0 80240D40 00641824 */ and $v1, $v1, $a0 -/* A8D7C4 80240D44 AE430000 */ sw $v1, ($s2) -/* A8D7C8 80240D48 AE420028 */ sw $v0, 0x28($s2) -/* A8D7CC 80240D4C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A8D7D0 80240D50 8C420098 */ lw $v0, 0x98($v0) -/* A8D7D4 80240D54 54400005 */ bnel $v0, $zero, .L80240D6C -/* A8D7D8 80240D58 2402FDFF */ addiu $v0, $zero, -0x201 -/* A8D7DC 80240D5C 34620200 */ ori $v0, $v1, 0x200 -/* A8D7E0 80240D60 2403FFF7 */ addiu $v1, $zero, -9 -/* A8D7E4 80240D64 0809035D */ j .L80240D74 -/* A8D7E8 80240D68 00431024 */ and $v0, $v0, $v1 -.L80240D6C: -/* A8D7EC 80240D6C 00621024 */ and $v0, $v1, $v0 -/* A8D7F0 80240D70 34420008 */ ori $v0, $v0, 8 -.L80240D74: -/* A8D7F4 80240D74 AE420000 */ sw $v0, ($s2) -/* A8D7F8 80240D78 8E2200B0 */ lw $v0, 0xb0($s1) -/* A8D7FC 80240D7C 30420004 */ andi $v0, $v0, 4 -/* A8D800 80240D80 10400008 */ beqz $v0, .L80240DA4 -/* A8D804 80240D84 24020063 */ addiu $v0, $zero, 0x63 -/* A8D808 80240D88 AE820070 */ sw $v0, 0x70($s4) -/* A8D80C 80240D8C AE800074 */ sw $zero, 0x74($s4) -/* A8D810 80240D90 8E2200B0 */ lw $v0, 0xb0($s1) -/* A8D814 80240D94 2403FFFB */ addiu $v1, $zero, -5 -/* A8D818 80240D98 00431024 */ and $v0, $v0, $v1 -/* A8D81C 80240D9C 08090374 */ j .L80240DD0 -/* A8D820 80240DA0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240DA4: -/* A8D824 80240DA4 8E220000 */ lw $v0, ($s1) -/* A8D828 80240DA8 3C034000 */ lui $v1, 0x4000 -/* A8D82C 80240DAC 00431024 */ and $v0, $v0, $v1 -/* A8D830 80240DB0 10400007 */ beqz $v0, .L80240DD0 -/* A8D834 80240DB4 3C03BFFF */ lui $v1, 0xbfff -/* A8D838 80240DB8 2402000C */ addiu $v0, $zero, 0xc -/* A8D83C 80240DBC AE820070 */ sw $v0, 0x70($s4) -/* A8D840 80240DC0 8E220000 */ lw $v0, ($s1) -/* A8D844 80240DC4 3463FFFF */ ori $v1, $v1, 0xffff -/* A8D848 80240DC8 00431024 */ and $v0, $v0, $v1 -/* A8D84C 80240DCC AE220000 */ sw $v0, ($s1) -.L80240DD0: -/* A8D850 80240DD0 27A50038 */ addiu $a1, $sp, 0x38 -/* A8D854 80240DD4 27A6003C */ addiu $a2, $sp, 0x3c -/* A8D858 80240DD8 C6400038 */ lwc1 $f0, 0x38($s2) -/* A8D85C 80240DDC 864200A8 */ lh $v0, 0xa8($s2) -/* A8D860 80240DE0 3C0142C8 */ lui $at, 0x42c8 -/* A8D864 80240DE4 44812000 */ mtc1 $at, $f4 -/* A8D868 80240DE8 44823000 */ mtc1 $v0, $f6 -/* A8D86C 80240DEC 00000000 */ nop -/* A8D870 80240DF0 468031A0 */ cvt.s.w $f6, $f6 -/* A8D874 80240DF4 27A20044 */ addiu $v0, $sp, 0x44 -/* A8D878 80240DF8 E7A00038 */ swc1 $f0, 0x38($sp) -/* A8D87C 80240DFC C640003C */ lwc1 $f0, 0x3c($s2) -/* A8D880 80240E00 C6420040 */ lwc1 $f2, 0x40($s2) -/* A8D884 80240E04 46060000 */ add.s $f0, $f0, $f6 -/* A8D888 80240E08 E7A40044 */ swc1 $f4, 0x44($sp) -/* A8D88C 80240E0C E7A20040 */ swc1 $f2, 0x40($sp) -/* A8D890 80240E10 E7A0003C */ swc1 $f0, 0x3c($sp) -/* A8D894 80240E14 AFA20010 */ sw $v0, 0x10($sp) -/* A8D898 80240E18 8E440080 */ lw $a0, 0x80($s2) -/* A8D89C 80240E1C 0C0372DF */ jal func_800DCB7C -/* A8D8A0 80240E20 27A70040 */ addiu $a3, $sp, 0x40 -/* A8D8A4 80240E24 10400003 */ beqz $v0, .L80240E34 -/* A8D8A8 80240E28 00000000 */ nop -/* A8D8AC 80240E2C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* A8D8B0 80240E30 E640003C */ swc1 $f0, 0x3c($s2) -.L80240E34: -/* A8D8B4 80240E34 8E830070 */ lw $v1, 0x70($s4) -/* A8D8B8 80240E38 2C620064 */ sltiu $v0, $v1, 0x64 -/* A8D8BC 80240E3C 10400042 */ beqz $v0, .L80240F48 -/* A8D8C0 80240E40 00031080 */ sll $v0, $v1, 2 -/* A8D8C4 80240E44 3C018024 */ lui $at, 0x8024 -/* A8D8C8 80240E48 00220821 */ addu $at, $at, $v0 -/* A8D8CC 80240E4C 8C225A10 */ lw $v0, 0x5a10($at) -/* A8D8D0 80240E50 00400008 */ jr $v0 -/* A8D8D4 80240E54 00000000 */ nop -/* A8D8D8 80240E58 0280202D */ daddu $a0, $s4, $zero -/* A8D8DC 80240E5C 0260282D */ daddu $a1, $s3, $zero -/* A8D8E0 80240E60 0C090038 */ jal func_802400E0 -/* A8D8E4 80240E64 02A0302D */ daddu $a2, $s5, $zero -/* A8D8E8 80240E68 0280202D */ daddu $a0, $s4, $zero -/* A8D8EC 80240E6C 0260282D */ daddu $a1, $s3, $zero -/* A8D8F0 80240E70 0C09008E */ jal func_80240238 -/* A8D8F4 80240E74 02A0302D */ daddu $a2, $s5, $zero -/* A8D8F8 80240E78 080903D2 */ j .L80240F48 -/* A8D8FC 80240E7C 00000000 */ nop -/* A8D900 80240E80 0280202D */ daddu $a0, $s4, $zero -/* A8D904 80240E84 0260282D */ daddu $a1, $s3, $zero -/* A8D908 80240E88 0C090138 */ jal func_802404E0 -/* A8D90C 80240E8C 02A0302D */ daddu $a2, $s5, $zero -/* A8D910 80240E90 0280202D */ daddu $a0, $s4, $zero -/* A8D914 80240E94 0260282D */ daddu $a1, $s3, $zero -/* A8D918 80240E98 0C090168 */ jal func_802405A0 -/* A8D91C 80240E9C 02A0302D */ daddu $a2, $s5, $zero -/* A8D920 80240EA0 080903D2 */ j .L80240F48 -/* A8D924 80240EA4 00000000 */ nop -/* A8D928 80240EA8 0280202D */ daddu $a0, $s4, $zero -/* A8D92C 80240EAC 0260282D */ daddu $a1, $s3, $zero -/* A8D930 80240EB0 0C0901D7 */ jal func_8024075C -/* A8D934 80240EB4 02A0302D */ daddu $a2, $s5, $zero -/* A8D938 80240EB8 080903D2 */ j .L80240F48 -/* A8D93C 80240EBC 00000000 */ nop -/* A8D940 80240EC0 0280202D */ daddu $a0, $s4, $zero -/* A8D944 80240EC4 0260282D */ daddu $a1, $s3, $zero -/* A8D948 80240EC8 0C090204 */ jal func_80240810 -/* A8D94C 80240ECC 02A0302D */ daddu $a2, $s5, $zero -/* A8D950 80240ED0 0280202D */ daddu $a0, $s4, $zero -/* A8D954 80240ED4 0260282D */ daddu $a1, $s3, $zero -/* A8D958 80240ED8 0C090221 */ jal func_80240884 -/* A8D95C 80240EDC 02A0302D */ daddu $a2, $s5, $zero -/* A8D960 80240EE0 080903D2 */ j .L80240F48 -/* A8D964 80240EE4 00000000 */ nop -/* A8D968 80240EE8 0280202D */ daddu $a0, $s4, $zero -/* A8D96C 80240EEC 0260282D */ daddu $a1, $s3, $zero -/* A8D970 80240EF0 0C09023F */ jal func_802408FC -/* A8D974 80240EF4 02A0302D */ daddu $a2, $s5, $zero -/* A8D978 80240EF8 0280202D */ daddu $a0, $s4, $zero -/* A8D97C 80240EFC 0260282D */ daddu $a1, $s3, $zero -/* A8D980 80240F00 0C09028B */ jal func_80240A2C -/* A8D984 80240F04 02A0302D */ daddu $a2, $s5, $zero -/* A8D988 80240F08 080903D2 */ j .L80240F48 -/* A8D98C 80240F0C 00000000 */ nop -/* A8D990 80240F10 0280202D */ daddu $a0, $s4, $zero -/* A8D994 80240F14 0260282D */ daddu $a1, $s3, $zero -/* A8D998 80240F18 0C0902D3 */ jal func_80240B4C -/* A8D99C 80240F1C 02A0302D */ daddu $a2, $s5, $zero -/* A8D9A0 80240F20 080903D2 */ j .L80240F48 -/* A8D9A4 80240F24 00000000 */ nop -/* A8D9A8 80240F28 0280202D */ daddu $a0, $s4, $zero -/* A8D9AC 80240F2C 0260282D */ daddu $a1, $s3, $zero -/* A8D9B0 80240F30 0C0902ED */ jal func_80240BB4 -/* A8D9B4 80240F34 02A0302D */ daddu $a2, $s5, $zero -/* A8D9B8 80240F38 080903D2 */ j .L80240F48 -/* A8D9BC 80240F3C 00000000 */ nop -/* A8D9C0 80240F40 0C0129CF */ jal func_8004A73C -/* A8D9C4 80240F44 0280202D */ daddu $a0, $s4, $zero -.L80240F48: -/* A8D9C8 80240F48 8FBF0060 */ lw $ra, 0x60($sp) -/* A8D9CC 80240F4C 8FB5005C */ lw $s5, 0x5c($sp) -/* A8D9D0 80240F50 8FB40058 */ lw $s4, 0x58($sp) -/* A8D9D4 80240F54 8FB30054 */ lw $s3, 0x54($sp) -/* A8D9D8 80240F58 8FB20050 */ lw $s2, 0x50($sp) -/* A8D9DC 80240F5C 8FB1004C */ lw $s1, 0x4c($sp) -/* A8D9E0 80240F60 8FB00048 */ lw $s0, 0x48($sp) -/* A8D9E4 80240F64 0000102D */ daddu $v0, $zero, $zero -/* A8D9E8 80240F68 03E00008 */ jr $ra -/* A8D9EC 80240F6C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_80240F70_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_80240F70_A8CA80.s deleted file mode 100644 index e35741ccca..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_80240F70_A8CA80.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F70_A8D9F0 -/* A8D9F0 80240F70 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8D9F4 80240F74 AFB20018 */ sw $s2, 0x18($sp) -/* A8D9F8 80240F78 0080902D */ daddu $s2, $a0, $zero -/* A8D9FC 80240F7C AFBF001C */ sw $ra, 0x1c($sp) -/* A8DA00 80240F80 AFB10014 */ sw $s1, 0x14($sp) -/* A8DA04 80240F84 AFB00010 */ sw $s0, 0x10($sp) -/* A8DA08 80240F88 8E510148 */ lw $s1, 0x148($s2) -/* A8DA0C 80240F8C 0C00EABB */ jal get_npc_unsafe -/* A8DA10 80240F90 86240008 */ lh $a0, 8($s1) -/* A8DA14 80240F94 0040802D */ daddu $s0, $v0, $zero -/* A8DA18 80240F98 8E2300CC */ lw $v1, 0xcc($s1) -/* A8DA1C 80240F9C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A8DA20 80240FA0 8C630020 */ lw $v1, 0x20($v1) -/* A8DA24 80240FA4 AE030028 */ sw $v1, 0x28($s0) -/* A8DA28 80240FA8 96220076 */ lhu $v0, 0x76($s1) -/* A8DA2C 80240FAC A602008E */ sh $v0, 0x8e($s0) -/* A8DA30 80240FB0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A8DA34 80240FB4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A8DA38 80240FB8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A8DA3C 80240FBC 8C460028 */ lw $a2, 0x28($v0) -/* A8DA40 80240FC0 0C00A720 */ jal atan2 -/* A8DA44 80240FC4 8C470030 */ lw $a3, 0x30($v0) -/* A8DA48 80240FC8 2402000D */ addiu $v0, $zero, 0xd -/* A8DA4C 80240FCC E600000C */ swc1 $f0, 0xc($s0) -/* A8DA50 80240FD0 AE420070 */ sw $v0, 0x70($s2) -/* A8DA54 80240FD4 8FBF001C */ lw $ra, 0x1c($sp) -/* A8DA58 80240FD8 8FB20018 */ lw $s2, 0x18($sp) -/* A8DA5C 80240FDC 8FB10014 */ lw $s1, 0x14($sp) -/* A8DA60 80240FE0 8FB00010 */ lw $s0, 0x10($sp) -/* A8DA64 80240FE4 03E00008 */ jr $ra -/* A8DA68 80240FE8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_80240FEC_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_80240FEC_A8CA80.s deleted file mode 100644 index a68164b026..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_80240FEC_A8CA80.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FEC_A8DA6C -/* A8DA6C 80240FEC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A8DA70 80240FF0 AFB3001C */ sw $s3, 0x1c($sp) -/* A8DA74 80240FF4 0080982D */ daddu $s3, $a0, $zero -/* A8DA78 80240FF8 AFBF0020 */ sw $ra, 0x20($sp) -/* A8DA7C 80240FFC AFB20018 */ sw $s2, 0x18($sp) -/* A8DA80 80241000 AFB10014 */ sw $s1, 0x14($sp) -/* A8DA84 80241004 AFB00010 */ sw $s0, 0x10($sp) -/* A8DA88 80241008 8E710148 */ lw $s1, 0x148($s3) -/* A8DA8C 8024100C 86240008 */ lh $a0, 8($s1) -/* A8DA90 80241010 0C00EABB */ jal get_npc_unsafe -/* A8DA94 80241014 00A0902D */ daddu $s2, $a1, $zero -/* A8DA98 80241018 0040802D */ daddu $s0, $v0, $zero -/* A8DA9C 8024101C 8602008E */ lh $v0, 0x8e($s0) -/* A8DAA0 80241020 9603008E */ lhu $v1, 0x8e($s0) -/* A8DAA4 80241024 18400005 */ blez $v0, .L8024103C -/* A8DAA8 80241028 2462FFFF */ addiu $v0, $v1, -1 -/* A8DAAC 8024102C A602008E */ sh $v0, 0x8e($s0) -/* A8DAB0 80241030 00021400 */ sll $v0, $v0, 0x10 -/* A8DAB4 80241034 1C400033 */ bgtz $v0, .L80241104 -/* A8DAB8 80241038 00000000 */ nop -.L8024103C: -/* A8DABC 8024103C 8602008C */ lh $v0, 0x8c($s0) -/* A8DAC0 80241040 14400030 */ bnez $v0, .L80241104 -/* A8DAC4 80241044 00000000 */ nop -/* A8DAC8 80241048 8E2200CC */ lw $v0, 0xcc($s1) -/* A8DACC 8024104C 8C420024 */ lw $v0, 0x24($v0) -/* A8DAD0 80241050 AE020028 */ sw $v0, 0x28($s0) -/* A8DAD4 80241054 C6400018 */ lwc1 $f0, 0x18($s2) -/* A8DAD8 80241058 E6000018 */ swc1 $f0, 0x18($s0) -/* A8DADC 8024105C 8E230088 */ lw $v1, 0x88($s1) -/* A8DAE0 80241060 24020005 */ addiu $v0, $zero, 5 -/* A8DAE4 80241064 10620005 */ beq $v1, $v0, .L8024107C -/* A8DAE8 80241068 00000000 */ nop -/* A8DAEC 8024106C 10600003 */ beqz $v1, .L8024107C -/* A8DAF0 80241070 24020001 */ addiu $v0, $zero, 1 -/* A8DAF4 80241074 14620006 */ bne $v1, $v0, .L80241090 -/* A8DAF8 80241078 00000000 */ nop -.L8024107C: -/* A8DAFC 8024107C 8E220084 */ lw $v0, 0x84($s1) -/* A8DB00 80241080 00021FC2 */ srl $v1, $v0, 0x1f -/* A8DB04 80241084 00431021 */ addu $v0, $v0, $v1 -/* A8DB08 80241088 00021043 */ sra $v0, $v0, 1 -/* A8DB0C 8024108C A60200A8 */ sh $v0, 0xa8($s0) -.L80241090: -/* A8DB10 80241090 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A8DB14 80241094 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A8DB18 80241098 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A8DB1C 8024109C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A8DB20 802410A0 8C460028 */ lw $a2, 0x28($v0) -/* A8DB24 802410A4 0C00A7B5 */ jal dist2D -/* A8DB28 802410A8 8C470030 */ lw $a3, 0x30($v0) -/* A8DB2C 802410AC C6020018 */ lwc1 $f2, 0x18($s0) -/* A8DB30 802410B0 46020003 */ div.s $f0, $f0, $f2 -/* A8DB34 802410B4 3C018024 */ lui $at, 0x8024 -/* A8DB38 802410B8 D4225BA0 */ ldc1 $f2, 0x5ba0($at) -/* A8DB3C 802410BC 46000021 */ cvt.d.s $f0, $f0 -/* A8DB40 802410C0 46220000 */ add.d $f0, $f0, $f2 -/* A8DB44 802410C4 4620010D */ trunc.w.d $f4, $f0 -/* A8DB48 802410C8 44022000 */ mfc1 $v0, $f4 -/* A8DB4C 802410CC 00000000 */ nop -/* A8DB50 802410D0 A602008E */ sh $v0, 0x8e($s0) -/* A8DB54 802410D4 00021400 */ sll $v0, $v0, 0x10 -/* A8DB58 802410D8 8E230078 */ lw $v1, 0x78($s1) -/* A8DB5C 802410DC 00021403 */ sra $v0, $v0, 0x10 -/* A8DB60 802410E0 0043102A */ slt $v0, $v0, $v1 -/* A8DB64 802410E4 10400003 */ beqz $v0, .L802410F4 -/* A8DB68 802410E8 00000000 */ nop -/* A8DB6C 802410EC 9622007A */ lhu $v0, 0x7a($s1) -/* A8DB70 802410F0 A602008E */ sh $v0, 0x8e($s0) -.L802410F4: -/* A8DB74 802410F4 8602008E */ lh $v0, 0x8e($s0) -/* A8DB78 802410F8 AE22007C */ sw $v0, 0x7c($s1) -/* A8DB7C 802410FC 2402000E */ addiu $v0, $zero, 0xe -/* A8DB80 80241100 AE620070 */ sw $v0, 0x70($s3) -.L80241104: -/* A8DB84 80241104 8FBF0020 */ lw $ra, 0x20($sp) -/* A8DB88 80241108 8FB3001C */ lw $s3, 0x1c($sp) -/* A8DB8C 8024110C 8FB20018 */ lw $s2, 0x18($sp) -/* A8DB90 80241110 8FB10014 */ lw $s1, 0x14($sp) -/* A8DB94 80241114 8FB00010 */ lw $s0, 0x10($sp) -/* A8DB98 80241118 03E00008 */ jr $ra -/* A8DB9C 8024111C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_80241120_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_80241120_A8CA80.s deleted file mode 100644 index 14583d7da6..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_80241120_A8CA80.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241120_A8DBA0 -/* A8DBA0 80241120 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A8DBA4 80241124 AFB3003C */ sw $s3, 0x3c($sp) -/* A8DBA8 80241128 0080982D */ daddu $s3, $a0, $zero -/* A8DBAC 8024112C AFBF0040 */ sw $ra, 0x40($sp) -/* A8DBB0 80241130 AFB20038 */ sw $s2, 0x38($sp) -/* A8DBB4 80241134 AFB10034 */ sw $s1, 0x34($sp) -/* A8DBB8 80241138 AFB00030 */ sw $s0, 0x30($sp) -/* A8DBBC 8024113C 8E710148 */ lw $s1, 0x148($s3) -/* A8DBC0 80241140 0C00EABB */ jal get_npc_unsafe -/* A8DBC4 80241144 86240008 */ lh $a0, 8($s1) -/* A8DBC8 80241148 0040802D */ daddu $s0, $v0, $zero -/* A8DBCC 8024114C 8E22007C */ lw $v0, 0x7c($s1) -/* A8DBD0 80241150 8603008E */ lh $v1, 0x8e($s0) -/* A8DBD4 80241154 2442FFFF */ addiu $v0, $v0, -1 -/* A8DBD8 80241158 14620012 */ bne $v1, $v0, .L802411A4 -/* A8DBDC 8024115C 00000000 */ nop -/* A8DBE0 80241160 C6000038 */ lwc1 $f0, 0x38($s0) -/* A8DBE4 80241164 4600020D */ trunc.w.s $f8, $f0 -/* A8DBE8 80241168 44024000 */ mfc1 $v0, $f8 -/* A8DBEC 8024116C 00000000 */ nop -/* A8DBF0 80241170 A6220010 */ sh $v0, 0x10($s1) -/* A8DBF4 80241174 C600003C */ lwc1 $f0, 0x3c($s0) -/* A8DBF8 80241178 4600020D */ trunc.w.s $f8, $f0 -/* A8DBFC 8024117C 44024000 */ mfc1 $v0, $f8 -/* A8DC00 80241180 00000000 */ nop -/* A8DC04 80241184 A6220012 */ sh $v0, 0x12($s1) -/* A8DC08 80241188 C6000040 */ lwc1 $f0, 0x40($s0) -/* A8DC0C 8024118C 24020001 */ addiu $v0, $zero, 1 -/* A8DC10 80241190 A2220007 */ sb $v0, 7($s1) -/* A8DC14 80241194 4600020D */ trunc.w.s $f8, $f0 -/* A8DC18 80241198 44024000 */ mfc1 $v0, $f8 -/* A8DC1C 8024119C 00000000 */ nop -/* A8DC20 802411A0 A6220014 */ sh $v0, 0x14($s1) -.L802411A4: -/* A8DC24 802411A4 C6000038 */ lwc1 $f0, 0x38($s0) -/* A8DC28 802411A8 C602003C */ lwc1 $f2, 0x3c($s0) -/* A8DC2C 802411AC C6040040 */ lwc1 $f4, 0x40($s0) -/* A8DC30 802411B0 C6060018 */ lwc1 $f6, 0x18($s0) -/* A8DC34 802411B4 E7A00020 */ swc1 $f0, 0x20($sp) -/* A8DC38 802411B8 E7A20024 */ swc1 $f2, 0x24($sp) -/* A8DC3C 802411BC E7A40028 */ swc1 $f4, 0x28($sp) -/* A8DC40 802411C0 E7A60010 */ swc1 $f6, 0x10($sp) -/* A8DC44 802411C4 C600000C */ lwc1 $f0, 0xc($s0) -/* A8DC48 802411C8 E7A00014 */ swc1 $f0, 0x14($sp) -/* A8DC4C 802411CC 860200A8 */ lh $v0, 0xa8($s0) -/* A8DC50 802411D0 27A50020 */ addiu $a1, $sp, 0x20 -/* A8DC54 802411D4 44820000 */ mtc1 $v0, $f0 -/* A8DC58 802411D8 00000000 */ nop -/* A8DC5C 802411DC 46800020 */ cvt.s.w $f0, $f0 -/* A8DC60 802411E0 E7A00018 */ swc1 $f0, 0x18($sp) -/* A8DC64 802411E4 860200A6 */ lh $v0, 0xa6($s0) -/* A8DC68 802411E8 27A60024 */ addiu $a2, $sp, 0x24 -/* A8DC6C 802411EC 44820000 */ mtc1 $v0, $f0 -/* A8DC70 802411F0 00000000 */ nop -/* A8DC74 802411F4 46800020 */ cvt.s.w $f0, $f0 -/* A8DC78 802411F8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A8DC7C 802411FC 8E040080 */ lw $a0, 0x80($s0) -/* A8DC80 80241200 0C037711 */ jal func_800DDC44 -/* A8DC84 80241204 27A70028 */ addiu $a3, $sp, 0x28 -/* A8DC88 80241208 0040902D */ daddu $s2, $v0, $zero -/* A8DC8C 8024120C 16400005 */ bnez $s2, .L80241224 -/* A8DC90 80241210 00000000 */ nop -/* A8DC94 80241214 8E050018 */ lw $a1, 0x18($s0) -/* A8DC98 80241218 8E06000C */ lw $a2, 0xc($s0) -/* A8DC9C 8024121C 0C00EA95 */ jal npc_move_heading -/* A8DCA0 80241220 0200202D */ daddu $a0, $s0, $zero -.L80241224: -/* A8DCA4 80241224 8602008E */ lh $v0, 0x8e($s0) -/* A8DCA8 80241228 9603008E */ lhu $v1, 0x8e($s0) -/* A8DCAC 8024122C 18400007 */ blez $v0, .L8024124C -/* A8DCB0 80241230 2462FFFF */ addiu $v0, $v1, -1 -/* A8DCB4 80241234 A602008E */ sh $v0, 0x8e($s0) -/* A8DCB8 80241238 00021400 */ sll $v0, $v0, 0x10 -/* A8DCBC 8024123C 18400003 */ blez $v0, .L8024124C -/* A8DCC0 80241240 00000000 */ nop -/* A8DCC4 80241244 12400008 */ beqz $s2, .L80241268 -/* A8DCC8 80241248 00000000 */ nop -.L8024124C: -/* A8DCCC 8024124C 8E2200CC */ lw $v0, 0xcc($s1) -/* A8DCD0 80241250 A2200007 */ sb $zero, 7($s1) -/* A8DCD4 80241254 8C420028 */ lw $v0, 0x28($v0) -/* A8DCD8 80241258 A600008E */ sh $zero, 0x8e($s0) -/* A8DCDC 8024125C AE020028 */ sw $v0, 0x28($s0) -/* A8DCE0 80241260 2402000F */ addiu $v0, $zero, 0xf -/* A8DCE4 80241264 AE620070 */ sw $v0, 0x70($s3) -.L80241268: -/* A8DCE8 80241268 8FBF0040 */ lw $ra, 0x40($sp) -/* A8DCEC 8024126C 8FB3003C */ lw $s3, 0x3c($sp) -/* A8DCF0 80241270 8FB20038 */ lw $s2, 0x38($sp) -/* A8DCF4 80241274 8FB10034 */ lw $s1, 0x34($sp) -/* A8DCF8 80241278 8FB00030 */ lw $s0, 0x30($sp) -/* A8DCFC 8024127C 03E00008 */ jr $ra -/* A8DD00 80241280 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_80241628_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_80241628_A8CA80.s deleted file mode 100644 index 4076386945..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_80241628_A8CA80.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241628_A8E0A8 -/* A8E0A8 80241628 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8E0AC 8024162C AFBF0010 */ sw $ra, 0x10($sp) -/* A8E0B0 80241630 0C03A631 */ jal func_800E98C4 -/* A8E0B4 80241634 00000000 */ nop -/* A8E0B8 80241638 0C03A6DB */ jal sync_status_menu -/* A8E0BC 8024163C 00000000 */ nop -/* A8E0C0 80241640 8FBF0010 */ lw $ra, 0x10($sp) -/* A8E0C4 80241644 24020002 */ addiu $v0, $zero, 2 -/* A8E0C8 80241648 03E00008 */ jr $ra -/* A8E0CC 8024164C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_802416CC_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_802416CC_A8CA80.s deleted file mode 100644 index 545ea9f8cc..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_802416CC_A8CA80.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416CC_A8E14C -/* A8E14C 802416CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8E150 802416D0 AFB10014 */ sw $s1, 0x14($sp) -/* A8E154 802416D4 0080882D */ daddu $s1, $a0, $zero -/* A8E158 802416D8 AFBF0018 */ sw $ra, 0x18($sp) -/* A8E15C 802416DC AFB00010 */ sw $s0, 0x10($sp) -/* A8E160 802416E0 8E30000C */ lw $s0, 0xc($s1) -/* A8E164 802416E4 8E050000 */ lw $a1, ($s0) -/* A8E168 802416E8 0C0B1EAF */ jal get_variable -/* A8E16C 802416EC 26100004 */ addiu $s0, $s0, 4 -/* A8E170 802416F0 0220202D */ daddu $a0, $s1, $zero -/* A8E174 802416F4 8E050000 */ lw $a1, ($s0) -/* A8E178 802416F8 0C0B1EAF */ jal get_variable -/* A8E17C 802416FC 0040802D */ daddu $s0, $v0, $zero -/* A8E180 80241700 44820000 */ mtc1 $v0, $f0 -/* A8E184 80241704 00000000 */ nop -/* A8E188 80241708 46800020 */ cvt.s.w $f0, $f0 -/* A8E18C 8024170C 24020002 */ addiu $v0, $zero, 2 -/* A8E190 80241710 00501804 */ sllv $v1, $s0, $v0 -/* A8E194 80241714 00701821 */ addu $v1, $v1, $s0 -/* A8E198 80241718 00431804 */ sllv $v1, $v1, $v0 -/* A8E19C 8024171C 00701823 */ subu $v1, $v1, $s0 -/* A8E1A0 80241720 000320C0 */ sll $a0, $v1, 3 -/* A8E1A4 80241724 00641821 */ addu $v1, $v1, $a0 -/* A8E1A8 80241728 000318C0 */ sll $v1, $v1, 3 -/* A8E1AC 8024172C 3C01800B */ lui $at, 0x800b -/* A8E1B0 80241730 00230821 */ addu $at, $at, $v1 -/* A8E1B4 80241734 E4201D98 */ swc1 $f0, 0x1d98($at) -/* A8E1B8 80241738 8FBF0018 */ lw $ra, 0x18($sp) -/* A8E1BC 8024173C 8FB10014 */ lw $s1, 0x14($sp) -/* A8E1C0 80241740 8FB00010 */ lw $s0, 0x10($sp) -/* A8E1C4 80241744 03E00008 */ jr $ra -/* A8E1C8 80241748 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_8024174C_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_8024174C_A8CA80.s deleted file mode 100644 index 2998e1e7aa..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_8024174C_A8CA80.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024174C_A8E1CC -/* A8E1CC 8024174C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8E1D0 80241750 AFBF0010 */ sw $ra, 0x10($sp) -/* A8E1D4 80241754 8C82000C */ lw $v0, 0xc($a0) -/* A8E1D8 80241758 0C0B1EAF */ jal get_variable -/* A8E1DC 8024175C 8C450000 */ lw $a1, ($v0) -/* A8E1E0 80241760 0C0B1059 */ jal does_script_exist -/* A8E1E4 80241764 0040202D */ daddu $a0, $v0, $zero -/* A8E1E8 80241768 2C420001 */ sltiu $v0, $v0, 1 -/* A8E1EC 8024176C 8FBF0010 */ lw $ra, 0x10($sp) -/* A8E1F0 80241770 00021040 */ sll $v0, $v0, 1 -/* A8E1F4 80241774 03E00008 */ jr $ra -/* A8E1F8 80241778 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_8024177C_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_8024177C_A8CA80.s deleted file mode 100644 index 6bf87bbc8f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_8024177C_A8CA80.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024177C_A8E1FC -/* A8E1FC 8024177C 3C028011 */ lui $v0, 0x8011 -/* A8E200 80241780 8042F2A2 */ lb $v0, -0xd5e($v0) -/* A8E204 80241784 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8E208 80241788 10400003 */ beqz $v0, .L80241798 -/* A8E20C 8024178C AFBF0010 */ sw $ra, 0x10($sp) -/* A8E210 80241790 0C03AE06 */ jal partner_suspend_ability_script -/* A8E214 80241794 00000000 */ nop -.L80241798: -/* A8E218 80241798 24020002 */ addiu $v0, $zero, 2 -/* A8E21C 8024179C 8FBF0010 */ lw $ra, 0x10($sp) -/* A8E220 802417A0 03E00008 */ jr $ra -/* A8E224 802417A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_802417A8_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_802417A8_A8CA80.s deleted file mode 100644 index e249e3c001..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_802417A8_A8CA80.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417A8_A8E228 -/* A8E228 802417A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8E22C 802417AC AFBF0010 */ sw $ra, 0x10($sp) -/* A8E230 802417B0 0C03AE18 */ jal partner_resume_ability_script -/* A8E234 802417B4 00000000 */ nop -/* A8E238 802417B8 8FBF0010 */ lw $ra, 0x10($sp) -/* A8E23C 802417BC 24020002 */ addiu $v0, $zero, 2 -/* A8E240 802417C0 03E00008 */ jr $ra -/* A8E244 802417C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_802417C8_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_802417C8_A8CA80.s deleted file mode 100644 index cf4cd5dfd2..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_802417C8_A8CA80.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417C8_A8E248 -/* A8E248 802417C8 3C058011 */ lui $a1, %hi(gPlayerData) -/* A8E24C 802417CC 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* A8E250 802417D0 AC800088 */ sw $zero, 0x88($a0) -/* A8E254 802417D4 80A30003 */ lb $v1, 3($a1) -/* A8E258 802417D8 80A20002 */ lb $v0, 2($a1) -/* A8E25C 802417DC 1462000B */ bne $v1, $v0, .L8024180C -/* A8E260 802417E0 00A0302D */ daddu $a2, $a1, $zero -/* A8E264 802417E4 80A30006 */ lb $v1, 6($a1) -/* A8E268 802417E8 80A20005 */ lb $v0, 5($a1) -/* A8E26C 802417EC 14620007 */ bne $v1, $v0, .L8024180C -/* A8E270 802417F0 00000000 */ nop -/* A8E274 802417F4 80C2028E */ lb $v0, 0x28e($a2) -/* A8E278 802417F8 84C30290 */ lh $v1, 0x290($a2) -/* A8E27C 802417FC 00021200 */ sll $v0, $v0, 8 -/* A8E280 80241800 14620004 */ bne $v1, $v0, .L80241814 -/* A8E284 80241804 24020001 */ addiu $v0, $zero, 1 -/* A8E288 80241808 AC820088 */ sw $v0, 0x88($a0) -.L8024180C: -/* A8E28C 8024180C 03E00008 */ jr $ra -/* A8E290 80241810 24020002 */ addiu $v0, $zero, 2 -.L80241814: -/* A8E294 80241814 03E00008 */ jr $ra -/* A8E298 80241818 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_8024181C_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_8024181C_A8CA80.s deleted file mode 100644 index 36298e94f2..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_8024181C_A8CA80.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024181C_A8E29C -/* A8E29C 8024181C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8E2A0 80241820 AFB10014 */ sw $s1, 0x14($sp) -/* A8E2A4 80241824 0080882D */ daddu $s1, $a0, $zero -/* A8E2A8 80241828 AFBF001C */ sw $ra, 0x1c($sp) -/* A8E2AC 8024182C AFB20018 */ sw $s2, 0x18($sp) -/* A8E2B0 80241830 AFB00010 */ sw $s0, 0x10($sp) -/* A8E2B4 80241834 8E30000C */ lw $s0, 0xc($s1) -/* A8E2B8 80241838 8E050000 */ lw $a1, ($s0) -/* A8E2BC 8024183C 0C0B1EAF */ jal get_variable -/* A8E2C0 80241840 26100004 */ addiu $s0, $s0, 4 -/* A8E2C4 80241844 8E050000 */ lw $a1, ($s0) -/* A8E2C8 80241848 26100004 */ addiu $s0, $s0, 4 -/* A8E2CC 8024184C 0220202D */ daddu $a0, $s1, $zero -/* A8E2D0 80241850 0C0B1EAF */ jal get_variable -/* A8E2D4 80241854 0040902D */ daddu $s2, $v0, $zero -/* A8E2D8 80241858 0220202D */ daddu $a0, $s1, $zero -/* A8E2DC 8024185C 8E050000 */ lw $a1, ($s0) -/* A8E2E0 80241860 0C0B1EAF */ jal get_variable -/* A8E2E4 80241864 0040802D */ daddu $s0, $v0, $zero -/* A8E2E8 80241868 0000202D */ daddu $a0, $zero, $zero -/* A8E2EC 8024186C 324500FF */ andi $a1, $s2, 0xff -/* A8E2F0 80241870 320600FF */ andi $a2, $s0, 0xff -/* A8E2F4 80241874 0C04DF84 */ jal func_80137E10 -/* A8E2F8 80241878 304700FF */ andi $a3, $v0, 0xff -/* A8E2FC 8024187C 8FBF001C */ lw $ra, 0x1c($sp) -/* A8E300 80241880 8FB20018 */ lw $s2, 0x18($sp) -/* A8E304 80241884 8FB10014 */ lw $s1, 0x14($sp) -/* A8E308 80241888 8FB00010 */ lw $s0, 0x10($sp) -/* A8E30C 8024188C 24020002 */ addiu $v0, $zero, 2 -/* A8E310 80241890 03E00008 */ jr $ra -/* A8E314 80241894 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_80241898_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_80241898_A8CA80.s deleted file mode 100644 index 5a7bda3260..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_80241898_A8CA80.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241898_A8E318 -/* A8E318 80241898 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8E31C 8024189C AFBF0010 */ sw $ra, 0x10($sp) -/* A8E320 802418A0 8C82000C */ lw $v0, 0xc($a0) -/* A8E324 802418A4 3C068011 */ lui $a2, 0x8011 -/* A8E328 802418A8 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* A8E32C 802418AC 0C0B2026 */ jal set_variable -/* A8E330 802418B0 8C450000 */ lw $a1, ($v0) -/* A8E334 802418B4 0C03AC5A */ jal func_800EB168 -/* A8E338 802418B8 0000202D */ daddu $a0, $zero, $zero -/* A8E33C 802418BC 8FBF0010 */ lw $ra, 0x10($sp) -/* A8E340 802418C0 24020002 */ addiu $v0, $zero, 2 -/* A8E344 802418C4 03E00008 */ jr $ra -/* A8E348 802418C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/func_802418FC_A8CA80.s b/asm/nonmatchings/world/area_kpa/kpa_95/func_802418FC_A8CA80.s deleted file mode 100644 index cfe9f8f7f8..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/func_802418FC_A8CA80.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418FC_A8E37C -/* A8E37C 802418FC 03E00008 */ jr $ra -/* A8E380 80241900 24020002 */ addiu $v0, $zero, 2 -/* A8E384 80241904 00000000 */ nop -/* A8E388 80241908 00000000 */ nop -/* A8E38C 8024190C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_01/func_80240124_C599D0.s b/asm/nonmatchings/world/area_kzn/kzn_01/func_80240124_C599D0.s deleted file mode 100644 index f69363ac1f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_01/func_80240124_C599D0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C59AF4 -/* C59AF4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C59AF8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C59AFC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C59B00 80240130 10A00005 */ beqz $a1, .L80240148 -/* C59B04 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C59B08 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C59B0C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C59B10 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C59B14 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C59B18 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C59B1C 8024014C 1440000E */ bnez $v0, .L80240188 -/* C59B20 80240150 00000000 */ nop -/* C59B24 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C59B28 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C59B2C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C59B30 80240160 04610004 */ bgez $v1, .L80240174 -/* C59B34 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C59B38 80240168 3C020002 */ lui $v0, 2 -/* C59B3C 8024016C 08090061 */ j .L80240184 -/* C59B40 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C59B44 80240174 3C040002 */ lui $a0, 2 -/* C59B48 80240178 0083102A */ slt $v0, $a0, $v1 -/* C59B4C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C59B50 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C59B54 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C59B58 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C59B5C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C59B60 80240190 00000000 */ nop -/* C59B64 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C59B68 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C59B6C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C59B70 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C59B74 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C59B78 802401A8 3C020002 */ lui $v0, 2 -/* C59B7C 802401AC 08090071 */ j .L802401C4 -/* C59B80 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C59B84 802401B4 3C040002 */ lui $a0, 2 -/* C59B88 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C59B8C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C59B90 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C59B94 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C59B98 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C59B9C 802401CC 1440000E */ bnez $v0, .L80240208 -/* C59BA0 802401D0 00000000 */ nop -/* C59BA4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C59BA8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C59BAC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C59BB0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C59BB4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C59BB8 802401E8 3C020002 */ lui $v0, 2 -/* C59BBC 802401EC 08090081 */ j .L80240204 -/* C59BC0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C59BC4 802401F4 3C040002 */ lui $a0, 2 -/* C59BC8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C59BCC 802401FC 10400002 */ beqz $v0, .L80240208 -/* C59BD0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C59BD4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C59BD8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C59BDC 8024020C 1440000E */ bnez $v0, .L80240248 -/* C59BE0 80240210 00000000 */ nop -/* C59BE4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C59BE8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C59BEC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C59BF0 80240220 04610004 */ bgez $v1, .L80240234 -/* C59BF4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C59BF8 80240228 3C020002 */ lui $v0, 2 -/* C59BFC 8024022C 08090091 */ j .L80240244 -/* C59C00 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C59C04 80240234 3C040002 */ lui $a0, 2 -/* C59C08 80240238 0083102A */ slt $v0, $a0, $v1 -/* C59C0C 8024023C 10400002 */ beqz $v0, .L80240248 -/* C59C10 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C59C14 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C59C18 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C59C1C 8024024C 0C046F07 */ jal set_main_pan_u -/* C59C20 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C59C24 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C59C28 80240258 0C046F0D */ jal set_main_pan_v -/* C59C2C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C59C30 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C59C34 80240264 0C046F13 */ jal set_aux_pan_u -/* C59C38 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C59C3C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C59C40 80240270 0C046F19 */ jal set_aux_pan_v -/* C59C44 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C59C48 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C59C4C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C59C50 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C59C54 80240284 24420001 */ addiu $v0, $v0, 1 -/* C59C58 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C59C5C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C59C60 80240290 24630001 */ addiu $v1, $v1, 1 -/* C59C64 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C59C68 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C59C6C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C59C70 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C59C74 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C59C78 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C59C7C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C59C80 802402B0 14600002 */ bnez $v1, .L802402BC -/* C59C84 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C59C88 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C59C8C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C59C90 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C59C94 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C59C98 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C59C9C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C59CA0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C59CA4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C59CA8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C59CAC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C59CB0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C59CB4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C59CB8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C59CBC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C59CC0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C59CC4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C59CC8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C59CCC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C59CD0 80240300 0000102D */ daddu $v0, $zero, $zero -/* C59CD4 80240304 03E00008 */ jr $ra -/* C59CD8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C59CDC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_80240124_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_80240124_C5A740.s deleted file mode 100644 index 336eba3391..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_80240124_C5A740.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C5A864 -/* C5A864 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5A868 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C5A86C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C5A870 80240130 10A00005 */ beqz $a1, .L80240148 -/* C5A874 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C5A878 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C5A87C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C5A880 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C5A884 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C5A888 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C5A88C 8024014C 1440000E */ bnez $v0, .L80240188 -/* C5A890 80240150 00000000 */ nop -/* C5A894 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C5A898 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C5A89C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C5A8A0 80240160 04610004 */ bgez $v1, .L80240174 -/* C5A8A4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C5A8A8 80240168 3C020002 */ lui $v0, 2 -/* C5A8AC 8024016C 08090061 */ j .L80240184 -/* C5A8B0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C5A8B4 80240174 3C040002 */ lui $a0, 2 -/* C5A8B8 80240178 0083102A */ slt $v0, $a0, $v1 -/* C5A8BC 8024017C 10400002 */ beqz $v0, .L80240188 -/* C5A8C0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C5A8C4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C5A8C8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C5A8CC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C5A8D0 80240190 00000000 */ nop -/* C5A8D4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C5A8D8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C5A8DC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C5A8E0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C5A8E4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C5A8E8 802401A8 3C020002 */ lui $v0, 2 -/* C5A8EC 802401AC 08090071 */ j .L802401C4 -/* C5A8F0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C5A8F4 802401B4 3C040002 */ lui $a0, 2 -/* C5A8F8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C5A8FC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C5A900 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C5A904 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C5A908 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C5A90C 802401CC 1440000E */ bnez $v0, .L80240208 -/* C5A910 802401D0 00000000 */ nop -/* C5A914 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C5A918 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C5A91C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C5A920 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C5A924 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C5A928 802401E8 3C020002 */ lui $v0, 2 -/* C5A92C 802401EC 08090081 */ j .L80240204 -/* C5A930 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C5A934 802401F4 3C040002 */ lui $a0, 2 -/* C5A938 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C5A93C 802401FC 10400002 */ beqz $v0, .L80240208 -/* C5A940 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C5A944 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C5A948 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C5A94C 8024020C 1440000E */ bnez $v0, .L80240248 -/* C5A950 80240210 00000000 */ nop -/* C5A954 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C5A958 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C5A95C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C5A960 80240220 04610004 */ bgez $v1, .L80240234 -/* C5A964 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C5A968 80240228 3C020002 */ lui $v0, 2 -/* C5A96C 8024022C 08090091 */ j .L80240244 -/* C5A970 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C5A974 80240234 3C040002 */ lui $a0, 2 -/* C5A978 80240238 0083102A */ slt $v0, $a0, $v1 -/* C5A97C 8024023C 10400002 */ beqz $v0, .L80240248 -/* C5A980 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C5A984 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C5A988 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C5A98C 8024024C 0C046F07 */ jal set_main_pan_u -/* C5A990 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C5A994 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C5A998 80240258 0C046F0D */ jal set_main_pan_v -/* C5A99C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C5A9A0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C5A9A4 80240264 0C046F13 */ jal set_aux_pan_u -/* C5A9A8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C5A9AC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C5A9B0 80240270 0C046F19 */ jal set_aux_pan_v -/* C5A9B4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C5A9B8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C5A9BC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C5A9C0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C5A9C4 80240284 24420001 */ addiu $v0, $v0, 1 -/* C5A9C8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C5A9CC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C5A9D0 80240290 24630001 */ addiu $v1, $v1, 1 -/* C5A9D4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C5A9D8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C5A9DC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C5A9E0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C5A9E4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C5A9E8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C5A9EC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C5A9F0 802402B0 14600002 */ bnez $v1, .L802402BC -/* C5A9F4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C5A9F8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C5A9FC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C5AA00 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C5AA04 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C5AA08 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C5AA0C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C5AA10 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C5AA14 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C5AA18 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C5AA1C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C5AA20 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C5AA24 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C5AA28 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C5AA2C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C5AA30 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C5AA34 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C5AA38 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C5AA3C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C5AA40 80240300 0000102D */ daddu $v0, $zero, $zero -/* C5AA44 80240304 03E00008 */ jr $ra -/* C5AA48 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C5AA4C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_80240310_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_80240310_C5A740.s deleted file mode 100644 index ea37230196..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_80240310_C5A740.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_C5AA50 -/* C5AA50 80240310 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C5AA54 80240314 AFB00038 */ sw $s0, 0x38($sp) -/* C5AA58 80240318 0080802D */ daddu $s0, $a0, $zero -/* C5AA5C 8024031C AFBF003C */ sw $ra, 0x3c($sp) -/* C5AA60 80240320 8E02000C */ lw $v0, 0xc($s0) -/* C5AA64 80240324 0C0B1EAF */ jal get_variable -/* C5AA68 80240328 8C450000 */ lw $a1, ($v0) -/* C5AA6C 8024032C 3044FFFF */ andi $a0, $v0, 0xffff -/* C5AA70 80240330 27A50020 */ addiu $a1, $sp, 0x20 -/* C5AA74 80240334 27A2002C */ addiu $v0, $sp, 0x2c -/* C5AA78 80240338 AFA20010 */ sw $v0, 0x10($sp) -/* C5AA7C 8024033C 27A20030 */ addiu $v0, $sp, 0x30 -/* C5AA80 80240340 AFA20014 */ sw $v0, 0x14($sp) -/* C5AA84 80240344 27A20034 */ addiu $v0, $sp, 0x34 -/* C5AA88 80240348 27A60024 */ addiu $a2, $sp, 0x24 -/* C5AA8C 8024034C 27A70028 */ addiu $a3, $sp, 0x28 -/* C5AA90 80240350 0C046C3B */ jal get_model_center_and_size -/* C5AA94 80240354 AFA20018 */ sw $v0, 0x18($sp) -/* C5AA98 80240358 C7A00020 */ lwc1 $f0, 0x20($sp) -/* C5AA9C 8024035C C7A20028 */ lwc1 $f2, 0x28($sp) -/* C5AAA0 80240360 4600010D */ trunc.w.s $f4, $f0 -/* C5AAA4 80240364 E60400A0 */ swc1 $f4, 0xa0($s0) -/* C5AAA8 80240368 4600110D */ trunc.w.s $f4, $f2 -/* C5AAAC 8024036C E60400A4 */ swc1 $f4, 0xa4($s0) -/* C5AAB0 80240370 8FBF003C */ lw $ra, 0x3c($sp) -/* C5AAB4 80240374 8FB00038 */ lw $s0, 0x38($sp) -/* C5AAB8 80240378 24020002 */ addiu $v0, $zero, 2 -/* C5AABC 8024037C 03E00008 */ jr $ra -/* C5AAC0 80240380 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_80240384_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_80240384_C5A740.s deleted file mode 100644 index bb94483f89..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_80240384_C5A740.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240384_C5AAC4 -/* C5AAC4 80240384 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5AAC8 80240388 AFBF0010 */ sw $ra, 0x10($sp) -/* C5AACC 8024038C 8C82000C */ lw $v0, 0xc($a0) -/* C5AAD0 80240390 3C068016 */ lui $a2, 0x8016 -/* C5AAD4 80240394 84C6A552 */ lh $a2, -0x5aae($a2) -/* C5AAD8 80240398 0C0B2026 */ jal set_variable -/* C5AADC 8024039C 8C450000 */ lw $a1, ($v0) -/* C5AAE0 802403A0 8FBF0010 */ lw $ra, 0x10($sp) -/* C5AAE4 802403A4 24020002 */ addiu $v0, $zero, 2 -/* C5AAE8 802403A8 03E00008 */ jr $ra -/* C5AAEC 802403AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_802403B0_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_802403B0_C5A740.s deleted file mode 100644 index 3dfd0cd25d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_802403B0_C5A740.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403B0_C5AAF0 -/* C5AAF0 802403B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5AAF4 802403B4 AFBF0010 */ sw $ra, 0x10($sp) -/* C5AAF8 802403B8 8C82000C */ lw $v0, 0xc($a0) -/* C5AAFC 802403BC 3C068011 */ lui $a2, 0x8011 -/* C5AB00 802403C0 80C6EBB3 */ lb $a2, -0x144d($a2) -/* C5AB04 802403C4 0C0B2026 */ jal set_variable -/* C5AB08 802403C8 8C450000 */ lw $a1, ($v0) -/* C5AB0C 802403CC 8FBF0010 */ lw $ra, 0x10($sp) -/* C5AB10 802403D0 24020002 */ addiu $v0, $zero, 2 -/* C5AB14 802403D4 03E00008 */ jr $ra -/* C5AB18 802403D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_802403DC_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_802403DC_C5A740.s deleted file mode 100644 index a79f734ef2..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_802403DC_C5A740.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403DC_C5AB1C -/* C5AB1C 802403DC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C5AB20 802403E0 AFB10014 */ sw $s1, 0x14($sp) -/* C5AB24 802403E4 0080882D */ daddu $s1, $a0, $zero -/* C5AB28 802403E8 AFBF001C */ sw $ra, 0x1c($sp) -/* C5AB2C 802403EC AFB20018 */ sw $s2, 0x18($sp) -/* C5AB30 802403F0 AFB00010 */ sw $s0, 0x10($sp) -/* C5AB34 802403F4 8E30000C */ lw $s0, 0xc($s1) -/* C5AB38 802403F8 8E050000 */ lw $a1, ($s0) -/* C5AB3C 802403FC 0C0B1EAF */ jal get_variable -/* C5AB40 80240400 26100004 */ addiu $s0, $s0, 4 -/* C5AB44 80240404 8E050000 */ lw $a1, ($s0) -/* C5AB48 80240408 26100004 */ addiu $s0, $s0, 4 -/* C5AB4C 8024040C 0220202D */ daddu $a0, $s1, $zero -/* C5AB50 80240410 0C0B1EAF */ jal get_variable -/* C5AB54 80240414 0040902D */ daddu $s2, $v0, $zero -/* C5AB58 80240418 0220202D */ daddu $a0, $s1, $zero -/* C5AB5C 8024041C 8E050000 */ lw $a1, ($s0) -/* C5AB60 80240420 0C0B1EAF */ jal get_variable -/* C5AB64 80240424 0040882D */ daddu $s1, $v0, $zero -/* C5AB68 80240428 0040802D */ daddu $s0, $v0, $zero -/* C5AB6C 8024042C 3C028016 */ lui $v0, 0x8016 -/* C5AB70 80240430 2442A550 */ addiu $v0, $v0, -0x5ab0 -/* C5AB74 80240434 84430002 */ lh $v1, 2($v0) -/* C5AB78 80240438 10710008 */ beq $v1, $s1, .L8024045C -/* C5AB7C 8024043C 00000000 */ nop -/* C5AB80 80240440 84420004 */ lh $v0, 4($v0) -/* C5AB84 80240444 10510005 */ beq $v0, $s1, .L8024045C -/* C5AB88 80240448 00000000 */ nop -/* C5AB8C 8024044C 10700003 */ beq $v1, $s0, .L8024045C -/* C5AB90 80240450 00000000 */ nop -/* C5AB94 80240454 14500007 */ bne $v0, $s0, .L80240474 -/* C5AB98 80240458 00000000 */ nop -.L8024045C: -/* C5AB9C 8024045C 44920000 */ mtc1 $s2, $f0 -/* C5ABA0 80240460 00000000 */ nop -/* C5ABA4 80240464 46800020 */ cvt.s.w $f0, $f0 -/* C5ABA8 80240468 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* C5ABAC 8024046C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* C5ABB0 80240470 E440001C */ swc1 $f0, 0x1c($v0) -.L80240474: -/* C5ABB4 80240474 3C028011 */ lui $v0, 0x8011 -/* C5ABB8 80240478 8042F2A2 */ lb $v0, -0xd5e($v0) -/* C5ABBC 8024047C 1040000E */ beqz $v0, .L802404B8 -/* C5ABC0 80240480 00000000 */ nop -/* C5ABC4 80240484 0C00EABB */ jal get_npc_unsafe -/* C5ABC8 80240488 2404FFFC */ addiu $a0, $zero, -4 -/* C5ABCC 8024048C 84430084 */ lh $v1, 0x84($v0) -/* C5ABD0 80240490 10710003 */ beq $v1, $s1, .L802404A0 -/* C5ABD4 80240494 00000000 */ nop -/* C5ABD8 80240498 14700007 */ bne $v1, $s0, .L802404B8 -/* C5ABDC 8024049C 00000000 */ nop -.L802404A0: -/* C5ABE0 802404A0 C4400038 */ lwc1 $f0, 0x38($v0) -/* C5ABE4 802404A4 44921000 */ mtc1 $s2, $f2 -/* C5ABE8 802404A8 00000000 */ nop -/* C5ABEC 802404AC 468010A0 */ cvt.s.w $f2, $f2 -/* C5ABF0 802404B0 46020000 */ add.s $f0, $f0, $f2 -/* C5ABF4 802404B4 E4400038 */ swc1 $f0, 0x38($v0) -.L802404B8: -/* C5ABF8 802404B8 8FBF001C */ lw $ra, 0x1c($sp) -/* C5ABFC 802404BC 8FB20018 */ lw $s2, 0x18($sp) -/* C5AC00 802404C0 8FB10014 */ lw $s1, 0x14($sp) -/* C5AC04 802404C4 8FB00010 */ lw $s0, 0x10($sp) -/* C5AC08 802404C8 24020002 */ addiu $v0, $zero, 2 -/* C5AC0C 802404CC 03E00008 */ jr $ra -/* C5AC10 802404D0 27BD0020 */ addiu $sp, $sp, 0x20 -/* C5AC14 802404D4 00000000 */ nop -/* C5AC18 802404D8 00000000 */ nop -/* C5AC1C 802404DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_802404E0_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_802404E0_C5A740.s deleted file mode 100644 index 2660b4c8ab..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_802404E0_C5A740.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404E0_C5AC20 -/* C5AC20 802404E0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C5AC24 802404E4 AFB3002C */ sw $s3, 0x2c($sp) -/* C5AC28 802404E8 0080982D */ daddu $s3, $a0, $zero -/* C5AC2C 802404EC AFBF0030 */ sw $ra, 0x30($sp) -/* C5AC30 802404F0 AFB20028 */ sw $s2, 0x28($sp) -/* C5AC34 802404F4 AFB10024 */ sw $s1, 0x24($sp) -/* C5AC38 802404F8 AFB00020 */ sw $s0, 0x20($sp) -/* C5AC3C 802404FC 8E710148 */ lw $s1, 0x148($s3) -/* C5AC40 80240500 86240008 */ lh $a0, 8($s1) -/* C5AC44 80240504 0C00EABB */ jal get_npc_unsafe -/* C5AC48 80240508 00A0902D */ daddu $s2, $a1, $zero -/* C5AC4C 8024050C 8E440004 */ lw $a0, 4($s2) -/* C5AC50 80240510 0040802D */ daddu $s0, $v0, $zero -/* C5AC54 80240514 00041FC2 */ srl $v1, $a0, 0x1f -/* C5AC58 80240518 00832021 */ addu $a0, $a0, $v1 -/* C5AC5C 8024051C 00042043 */ sra $a0, $a0, 1 -/* C5AC60 80240520 0C00A67F */ jal rand_int -/* C5AC64 80240524 24840001 */ addiu $a0, $a0, 1 -/* C5AC68 80240528 8E430004 */ lw $v1, 4($s2) -/* C5AC6C 8024052C 000327C2 */ srl $a0, $v1, 0x1f -/* C5AC70 80240530 00641821 */ addu $v1, $v1, $a0 -/* C5AC74 80240534 00031843 */ sra $v1, $v1, 1 -/* C5AC78 80240538 00621821 */ addu $v1, $v1, $v0 -/* C5AC7C 8024053C A603008E */ sh $v1, 0x8e($s0) -/* C5AC80 80240540 8E2300D0 */ lw $v1, 0xd0($s1) -/* C5AC84 80240544 C6000040 */ lwc1 $f0, 0x40($s0) -/* C5AC88 80240548 C4640000 */ lwc1 $f4, ($v1) -/* C5AC8C 8024054C 46802120 */ cvt.s.w $f4, $f4 -/* C5AC90 80240550 C4620008 */ lwc1 $f2, 8($v1) -/* C5AC94 80240554 468010A0 */ cvt.s.w $f2, $f2 -/* C5AC98 80240558 E7A00010 */ swc1 $f0, 0x10($sp) -/* C5AC9C 8024055C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5ACA0 80240560 44061000 */ mfc1 $a2, $f2 -/* C5ACA4 80240564 C440000C */ lwc1 $f0, 0xc($v0) -/* C5ACA8 80240568 46800020 */ cvt.s.w $f0, $f0 -/* C5ACAC 8024056C E7A00014 */ swc1 $f0, 0x14($sp) -/* C5ACB0 80240570 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5ACB4 80240574 44052000 */ mfc1 $a1, $f4 -/* C5ACB8 80240578 C4400010 */ lwc1 $f0, 0x10($v0) -/* C5ACBC 8024057C 46800020 */ cvt.s.w $f0, $f0 -/* C5ACC0 80240580 E7A00018 */ swc1 $f0, 0x18($sp) -/* C5ACC4 80240584 8C640018 */ lw $a0, 0x18($v1) -/* C5ACC8 80240588 0C0123F5 */ jal is_point_within_region -/* C5ACCC 8024058C 8E070038 */ lw $a3, 0x38($s0) -/* C5ACD0 80240590 1040000E */ beqz $v0, .L802405CC -/* C5ACD4 80240594 00000000 */ nop -/* C5ACD8 80240598 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5ACDC 8024059C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C5ACE0 802405A0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C5ACE4 802405A4 C4460000 */ lwc1 $f6, ($v0) -/* C5ACE8 802405A8 468031A0 */ cvt.s.w $f6, $f6 -/* C5ACEC 802405AC 44063000 */ mfc1 $a2, $f6 -/* C5ACF0 802405B0 C4460008 */ lwc1 $f6, 8($v0) -/* C5ACF4 802405B4 468031A0 */ cvt.s.w $f6, $f6 -/* C5ACF8 802405B8 44073000 */ mfc1 $a3, $f6 -/* C5ACFC 802405BC 0C00A720 */ jal atan2 -/* C5AD00 802405C0 00000000 */ nop -/* C5AD04 802405C4 0809017F */ j .L802405FC -/* C5AD08 802405C8 E600000C */ swc1 $f0, 0xc($s0) -.L802405CC: -/* C5AD0C 802405CC 0C00A67F */ jal rand_int -/* C5AD10 802405D0 2404003C */ addiu $a0, $zero, 0x3c -/* C5AD14 802405D4 C60C000C */ lwc1 $f12, 0xc($s0) -/* C5AD18 802405D8 44820000 */ mtc1 $v0, $f0 -/* C5AD1C 802405DC 00000000 */ nop -/* C5AD20 802405E0 46800020 */ cvt.s.w $f0, $f0 -/* C5AD24 802405E4 46006300 */ add.s $f12, $f12, $f0 -/* C5AD28 802405E8 3C0141F0 */ lui $at, 0x41f0 -/* C5AD2C 802405EC 44810000 */ mtc1 $at, $f0 -/* C5AD30 802405F0 0C00A6C9 */ jal clamp_angle -/* C5AD34 802405F4 46006301 */ sub.s $f12, $f12, $f0 -/* C5AD38 802405F8 E600000C */ swc1 $f0, 0xc($s0) -.L802405FC: -/* C5AD3C 802405FC 8E2200CC */ lw $v0, 0xcc($s1) -/* C5AD40 80240600 8C420004 */ lw $v0, 4($v0) -/* C5AD44 80240604 AE020028 */ sw $v0, 0x28($s0) -/* C5AD48 80240608 AE600074 */ sw $zero, 0x74($s3) -/* C5AD4C 8024060C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5AD50 80240610 8C420014 */ lw $v0, 0x14($v0) -/* C5AD54 80240614 04410004 */ bgez $v0, .L80240628 -/* C5AD58 80240618 00000000 */ nop -/* C5AD5C 8024061C C6400000 */ lwc1 $f0, ($s2) -/* C5AD60 80240620 08090192 */ j .L80240648 -/* C5AD64 80240624 E6000018 */ swc1 $f0, 0x18($s0) -.L80240628: -/* C5AD68 80240628 3C018024 */ lui $at, 0x8024 -/* C5AD6C 8024062C D4226500 */ ldc1 $f2, 0x6500($at) -/* C5AD70 80240630 44820000 */ mtc1 $v0, $f0 -/* C5AD74 80240634 00000000 */ nop -/* C5AD78 80240638 46800021 */ cvt.d.w $f0, $f0 -/* C5AD7C 8024063C 46220003 */ div.d $f0, $f0, $f2 -/* C5AD80 80240640 46200020 */ cvt.s.d $f0, $f0 -/* C5AD84 80240644 E6000018 */ swc1 $f0, 0x18($s0) -.L80240648: -/* C5AD88 80240648 C600003C */ lwc1 $f0, 0x3c($s0) -/* C5AD8C 8024064C 3C014059 */ lui $at, 0x4059 -/* C5AD90 80240650 44811800 */ mtc1 $at, $f3 -/* C5AD94 80240654 44801000 */ mtc1 $zero, $f2 -/* C5AD98 80240658 46000021 */ cvt.d.s $f0, $f0 -/* C5AD9C 8024065C 46220002 */ mul.d $f0, $f0, $f2 -/* C5ADA0 80240660 00000000 */ nop -/* C5ADA4 80240664 24020001 */ addiu $v0, $zero, 1 -/* C5ADA8 80240668 4620018D */ trunc.w.d $f6, $f0 -/* C5ADAC 8024066C E626007C */ swc1 $f6, 0x7c($s1) -/* C5ADB0 80240670 AE620070 */ sw $v0, 0x70($s3) -/* C5ADB4 80240674 8FBF0030 */ lw $ra, 0x30($sp) -/* C5ADB8 80240678 8FB3002C */ lw $s3, 0x2c($sp) -/* C5ADBC 8024067C 8FB20028 */ lw $s2, 0x28($sp) -/* C5ADC0 80240680 8FB10024 */ lw $s1, 0x24($sp) -/* C5ADC4 80240684 8FB00020 */ lw $s0, 0x20($sp) -/* C5ADC8 80240688 03E00008 */ jr $ra -/* C5ADCC 8024068C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_80240690_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_80240690_C5A740.s deleted file mode 100644 index fcc6eda0b8..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_80240690_C5A740.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240690_C5ADD0 -/* C5ADD0 80240690 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C5ADD4 80240694 AFB3004C */ sw $s3, 0x4c($sp) -/* C5ADD8 80240698 0080982D */ daddu $s3, $a0, $zero -/* C5ADDC 8024069C AFBF0058 */ sw $ra, 0x58($sp) -/* C5ADE0 802406A0 AFB50054 */ sw $s5, 0x54($sp) -/* C5ADE4 802406A4 AFB40050 */ sw $s4, 0x50($sp) -/* C5ADE8 802406A8 AFB20048 */ sw $s2, 0x48($sp) -/* C5ADEC 802406AC AFB10044 */ sw $s1, 0x44($sp) -/* C5ADF0 802406B0 AFB00040 */ sw $s0, 0x40($sp) -/* C5ADF4 802406B4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* C5ADF8 802406B8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* C5ADFC 802406BC F7B60068 */ sdc1 $f22, 0x68($sp) -/* C5AE00 802406C0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* C5AE04 802406C4 8E710148 */ lw $s1, 0x148($s3) -/* C5AE08 802406C8 00A0902D */ daddu $s2, $a1, $zero -/* C5AE0C 802406CC 86240008 */ lh $a0, 8($s1) -/* C5AE10 802406D0 0C00EABB */ jal get_npc_unsafe -/* C5AE14 802406D4 00C0A82D */ daddu $s5, $a2, $zero -/* C5AE18 802406D8 0040802D */ daddu $s0, $v0, $zero -/* C5AE1C 802406DC 0000A02D */ daddu $s4, $zero, $zero -/* C5AE20 802406E0 C624007C */ lwc1 $f4, 0x7c($s1) -/* C5AE24 802406E4 46802120 */ cvt.s.w $f4, $f4 -/* C5AE28 802406E8 C6220088 */ lwc1 $f2, 0x88($s1) -/* C5AE2C 802406EC 468010A0 */ cvt.s.w $f2, $f2 -/* C5AE30 802406F0 460010A1 */ cvt.d.s $f2, $f2 -/* C5AE34 802406F4 46002121 */ cvt.d.s $f4, $f4 -/* C5AE38 802406F8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C5AE3C 802406FC 3C014059 */ lui $at, 0x4059 -/* C5AE40 80240700 44813800 */ mtc1 $at, $f7 -/* C5AE44 80240704 44803000 */ mtc1 $zero, $f6 -/* C5AE48 80240708 46000021 */ cvt.d.s $f0, $f0 -/* C5AE4C 8024070C 46260002 */ mul.d $f0, $f0, $f6 -/* C5AE50 80240710 00000000 */ nop -/* C5AE54 80240714 24020001 */ addiu $v0, $zero, 1 -/* C5AE58 80240718 8E24006C */ lw $a0, 0x6c($s1) -/* C5AE5C 8024071C 46261083 */ div.d $f2, $f2, $f6 -/* C5AE60 80240720 462010A0 */ cvt.s.d $f2, $f2 -/* C5AE64 80240724 46262103 */ div.d $f4, $f4, $f6 -/* C5AE68 80240728 46202520 */ cvt.s.d $f20, $f4 -/* C5AE6C 8024072C 30830011 */ andi $v1, $a0, 0x11 -/* C5AE70 80240730 4620020D */ trunc.w.d $f8, $f0 -/* C5AE74 80240734 E628007C */ swc1 $f8, 0x7c($s1) -/* C5AE78 80240738 C6200078 */ lwc1 $f0, 0x78($s1) -/* C5AE7C 8024073C 46800020 */ cvt.s.w $f0, $f0 -/* C5AE80 80240740 46000021 */ cvt.d.s $f0, $f0 -/* C5AE84 80240744 46260003 */ div.d $f0, $f0, $f6 -/* C5AE88 80240748 462006A0 */ cvt.s.d $f26, $f0 -/* C5AE8C 8024074C C6200070 */ lwc1 $f0, 0x70($s1) -/* C5AE90 80240750 46800020 */ cvt.s.w $f0, $f0 -/* C5AE94 80240754 46000021 */ cvt.d.s $f0, $f0 -/* C5AE98 80240758 46260003 */ div.d $f0, $f0, $f6 -/* C5AE9C 8024075C 462005A0 */ cvt.s.d $f22, $f0 -/* C5AEA0 80240760 14620025 */ bne $v1, $v0, .L802407F8 -/* C5AEA4 80240764 4602D600 */ add.s $f24, $f26, $f2 -/* C5AEA8 80240768 8E020000 */ lw $v0, ($s0) -/* C5AEAC 8024076C 30420008 */ andi $v0, $v0, 8 -/* C5AEB0 80240770 10400009 */ beqz $v0, .L80240798 -/* C5AEB4 80240774 27A50028 */ addiu $a1, $sp, 0x28 -/* C5AEB8 80240778 C600003C */ lwc1 $f0, 0x3c($s0) -/* C5AEBC 8024077C 4600C001 */ sub.s $f0, $f24, $f0 -/* C5AEC0 80240780 4600B03C */ c.lt.s $f22, $f0 -/* C5AEC4 80240784 00000000 */ nop -/* C5AEC8 80240788 4500001B */ bc1f .L802407F8 -/* C5AECC 8024078C 34820010 */ ori $v0, $a0, 0x10 -/* C5AED0 80240790 080901FE */ j .L802407F8 -/* C5AED4 80240794 AE22006C */ sw $v0, 0x6c($s1) -.L80240798: -/* C5AED8 80240798 27A6002C */ addiu $a2, $sp, 0x2c -/* C5AEDC 8024079C C6000038 */ lwc1 $f0, 0x38($s0) -/* C5AEE0 802407A0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C5AEE4 802407A4 C6040040 */ lwc1 $f4, 0x40($s0) -/* C5AEE8 802407A8 3C01447A */ lui $at, 0x447a -/* C5AEEC 802407AC 44813000 */ mtc1 $at, $f6 -/* C5AEF0 802407B0 27A20034 */ addiu $v0, $sp, 0x34 -/* C5AEF4 802407B4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C5AEF8 802407B8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C5AEFC 802407BC E7A40030 */ swc1 $f4, 0x30($sp) -/* C5AF00 802407C0 E7A60034 */ swc1 $f6, 0x34($sp) -/* C5AF04 802407C4 AFA20010 */ sw $v0, 0x10($sp) -/* C5AF08 802407C8 8E040080 */ lw $a0, 0x80($s0) -/* C5AF0C 802407CC 0C0372DF */ jal func_800DCB7C -/* C5AF10 802407D0 27A70030 */ addiu $a3, $sp, 0x30 -/* C5AF14 802407D4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* C5AF18 802407D8 4600D001 */ sub.s $f0, $f26, $f0 -/* C5AF1C 802407DC 4600B03C */ c.lt.s $f22, $f0 -/* C5AF20 802407E0 00000000 */ nop -/* C5AF24 802407E4 45000004 */ bc1f .L802407F8 -/* C5AF28 802407E8 00000000 */ nop -/* C5AF2C 802407EC 8E22006C */ lw $v0, 0x6c($s1) -/* C5AF30 802407F0 34420010 */ ori $v0, $v0, 0x10 -/* C5AF34 802407F4 AE22006C */ sw $v0, 0x6c($s1) -.L802407F8: -/* C5AF38 802407F8 8E22006C */ lw $v0, 0x6c($s1) -/* C5AF3C 802407FC 24030011 */ addiu $v1, $zero, 0x11 -/* C5AF40 80240800 30420011 */ andi $v0, $v0, 0x11 -/* C5AF44 80240804 14430039 */ bne $v0, $v1, .L802408EC -/* C5AF48 80240808 00000000 */ nop -/* C5AF4C 8024080C 8E020000 */ lw $v0, ($s0) -/* C5AF50 80240810 30420008 */ andi $v0, $v0, 8 -/* C5AF54 80240814 1040000A */ beqz $v0, .L80240840 -/* C5AF58 80240818 4600C106 */ mov.s $f4, $f24 -/* C5AF5C 8024081C 4614C081 */ sub.s $f2, $f24, $f20 -/* C5AF60 80240820 3C018024 */ lui $at, 0x8024 -/* C5AF64 80240824 D4206508 */ ldc1 $f0, 0x6508($at) -/* C5AF68 80240828 460010A1 */ cvt.d.s $f2, $f2 -/* C5AF6C 8024082C 46201082 */ mul.d $f2, $f2, $f0 -/* C5AF70 80240830 00000000 */ nop -/* C5AF74 80240834 4600A021 */ cvt.d.s $f0, $f20 -/* C5AF78 80240838 08090229 */ j .L802408A4 -/* C5AF7C 8024083C 46220000 */ add.d $f0, $f0, $f2 -.L80240840: -/* C5AF80 80240840 27A50028 */ addiu $a1, $sp, 0x28 -/* C5AF84 80240844 27A6002C */ addiu $a2, $sp, 0x2c -/* C5AF88 80240848 C6000038 */ lwc1 $f0, 0x38($s0) -/* C5AF8C 8024084C C6020040 */ lwc1 $f2, 0x40($s0) -/* C5AF90 80240850 3C01447A */ lui $at, 0x447a -/* C5AF94 80240854 44812000 */ mtc1 $at, $f4 -/* C5AF98 80240858 27A20034 */ addiu $v0, $sp, 0x34 -/* C5AF9C 8024085C E7B4002C */ swc1 $f20, 0x2c($sp) -/* C5AFA0 80240860 E7A00028 */ swc1 $f0, 0x28($sp) -/* C5AFA4 80240864 E7A20030 */ swc1 $f2, 0x30($sp) -/* C5AFA8 80240868 E7A40034 */ swc1 $f4, 0x34($sp) -/* C5AFAC 8024086C AFA20010 */ sw $v0, 0x10($sp) -/* C5AFB0 80240870 8E040080 */ lw $a0, 0x80($s0) -/* C5AFB4 80240874 0C0372DF */ jal func_800DCB7C -/* C5AFB8 80240878 27A70030 */ addiu $a3, $sp, 0x30 -/* C5AFBC 8024087C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* C5AFC0 80240880 461A2100 */ add.s $f4, $f4, $f26 -/* C5AFC4 80240884 46142081 */ sub.s $f2, $f4, $f20 -/* C5AFC8 80240888 3C018024 */ lui $at, 0x8024 -/* C5AFCC 8024088C D4206510 */ ldc1 $f0, 0x6510($at) -/* C5AFD0 80240890 460010A1 */ cvt.d.s $f2, $f2 -/* C5AFD4 80240894 46201082 */ mul.d $f2, $f2, $f0 -/* C5AFD8 80240898 00000000 */ nop -/* C5AFDC 8024089C 4600A021 */ cvt.d.s $f0, $f20 -/* C5AFE0 802408A0 46220000 */ add.d $f0, $f0, $f2 -.L802408A4: -/* C5AFE4 802408A4 46200020 */ cvt.s.d $f0, $f0 -/* C5AFE8 802408A8 E600003C */ swc1 $f0, 0x3c($s0) -/* C5AFEC 802408AC C600003C */ lwc1 $f0, 0x3c($s0) -/* C5AFF0 802408B0 46002001 */ sub.s $f0, $f4, $f0 -/* C5AFF4 802408B4 3C013FF0 */ lui $at, 0x3ff0 -/* C5AFF8 802408B8 44811800 */ mtc1 $at, $f3 -/* C5AFFC 802408BC 44801000 */ mtc1 $zero, $f2 -/* C5B000 802408C0 46000005 */ abs.s $f0, $f0 -/* C5B004 802408C4 46000021 */ cvt.d.s $f0, $f0 -/* C5B008 802408C8 4622003C */ c.lt.d $f0, $f2 -/* C5B00C 802408CC 00000000 */ nop -/* C5B010 802408D0 45000036 */ bc1f .L802409AC -/* C5B014 802408D4 2403FFEF */ addiu $v1, $zero, -0x11 -/* C5B018 802408D8 E604003C */ swc1 $f4, 0x3c($s0) -/* C5B01C 802408DC 8E22006C */ lw $v0, 0x6c($s1) -/* C5B020 802408E0 00431024 */ and $v0, $v0, $v1 -/* C5B024 802408E4 0809026B */ j .L802409AC -/* C5B028 802408E8 AE22006C */ sw $v0, 0x6c($s1) -.L802408EC: -/* C5B02C 802408EC 8E220070 */ lw $v0, 0x70($s1) -/* C5B030 802408F0 1840002E */ blez $v0, .L802409AC -/* C5B034 802408F4 00000000 */ nop -/* C5B038 802408F8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C5B03C 802408FC 0C00A8BB */ jal sin_deg -/* C5B040 80240900 46806320 */ cvt.s.w $f12, $f12 -/* C5B044 80240904 8E020000 */ lw $v0, ($s0) -/* C5B048 80240908 30420008 */ andi $v0, $v0, 8 -/* C5B04C 8024090C 10400003 */ beqz $v0, .L8024091C -/* C5B050 80240910 46000506 */ mov.s $f20, $f0 -/* C5B054 80240914 08090257 */ j .L8024095C -/* C5B058 80240918 0000102D */ daddu $v0, $zero, $zero -.L8024091C: -/* C5B05C 8024091C 27A50028 */ addiu $a1, $sp, 0x28 -/* C5B060 80240920 27A6002C */ addiu $a2, $sp, 0x2c -/* C5B064 80240924 C6000038 */ lwc1 $f0, 0x38($s0) -/* C5B068 80240928 C602003C */ lwc1 $f2, 0x3c($s0) -/* C5B06C 8024092C C6040040 */ lwc1 $f4, 0x40($s0) -/* C5B070 80240930 3C01447A */ lui $at, 0x447a -/* C5B074 80240934 44813000 */ mtc1 $at, $f6 -/* C5B078 80240938 27A20034 */ addiu $v0, $sp, 0x34 -/* C5B07C 8024093C E7A00028 */ swc1 $f0, 0x28($sp) -/* C5B080 80240940 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C5B084 80240944 E7A40030 */ swc1 $f4, 0x30($sp) -/* C5B088 80240948 E7A60034 */ swc1 $f6, 0x34($sp) -/* C5B08C 8024094C AFA20010 */ sw $v0, 0x10($sp) -/* C5B090 80240950 8E040080 */ lw $a0, 0x80($s0) -/* C5B094 80240954 0C0372DF */ jal func_800DCB7C -/* C5B098 80240958 27A70030 */ addiu $a3, $sp, 0x30 -.L8024095C: -/* C5B09C 8024095C 10400007 */ beqz $v0, .L8024097C -/* C5B0A0 80240960 00000000 */ nop -/* C5B0A4 80240964 4616A082 */ mul.s $f2, $f20, $f22 -/* C5B0A8 80240968 00000000 */ nop -/* C5B0AC 8024096C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C5B0B0 80240970 461A0000 */ add.s $f0, $f0, $f26 -/* C5B0B4 80240974 08090262 */ j .L80240988 -/* C5B0B8 80240978 46020000 */ add.s $f0, $f0, $f2 -.L8024097C: -/* C5B0BC 8024097C 4616A002 */ mul.s $f0, $f20, $f22 -/* C5B0C0 80240980 00000000 */ nop -/* C5B0C4 80240984 4600C000 */ add.s $f0, $f24, $f0 -.L80240988: -/* C5B0C8 80240988 E600003C */ swc1 $f0, 0x3c($s0) -/* C5B0CC 8024098C 8E220074 */ lw $v0, 0x74($s1) -/* C5B0D0 80240990 2442000A */ addiu $v0, $v0, 0xa -/* C5B0D4 80240994 44826000 */ mtc1 $v0, $f12 -/* C5B0D8 80240998 00000000 */ nop -/* C5B0DC 8024099C 0C00A6C9 */ jal clamp_angle -/* C5B0E0 802409A0 46806320 */ cvt.s.w $f12, $f12 -/* C5B0E4 802409A4 4600020D */ trunc.w.s $f8, $f0 -/* C5B0E8 802409A8 E6280074 */ swc1 $f8, 0x74($s1) -.L802409AC: -/* C5B0EC 802409AC 8E220090 */ lw $v0, 0x90($s1) -/* C5B0F0 802409B0 1C40004A */ bgtz $v0, .L80240ADC -/* C5B0F4 802409B4 2442FFFF */ addiu $v0, $v0, -1 -/* C5B0F8 802409B8 8E430014 */ lw $v1, 0x14($s2) -/* C5B0FC 802409BC 04600048 */ bltz $v1, .L80240AE0 -/* C5B100 802409C0 00000000 */ nop -/* C5B104 802409C4 8E620074 */ lw $v0, 0x74($s3) -/* C5B108 802409C8 1C400042 */ bgtz $v0, .L80240AD4 -/* C5B10C 802409CC 2442FFFF */ addiu $v0, $v0, -1 -/* C5B110 802409D0 AE630074 */ sw $v1, 0x74($s3) -/* C5B114 802409D4 860200A8 */ lh $v0, 0xa8($s0) -/* C5B118 802409D8 C602003C */ lwc1 $f2, 0x3c($s0) -/* C5B11C 802409DC 44820000 */ mtc1 $v0, $f0 -/* C5B120 802409E0 00000000 */ nop -/* C5B124 802409E4 46800020 */ cvt.s.w $f0, $f0 -/* C5B128 802409E8 46001080 */ add.s $f2, $f2, $f0 -/* C5B12C 802409EC 3C014024 */ lui $at, 0x4024 -/* C5B130 802409F0 44810800 */ mtc1 $at, $f1 -/* C5B134 802409F4 44800000 */ mtc1 $zero, $f0 -/* C5B138 802409F8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C5B13C 802409FC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C5B140 80240A00 460010A1 */ cvt.d.s $f2, $f2 -/* C5B144 80240A04 46201080 */ add.d $f2, $f2, $f0 -/* C5B148 80240A08 C440002C */ lwc1 $f0, 0x2c($v0) -/* C5B14C 80240A0C 46000021 */ cvt.d.s $f0, $f0 -/* C5B150 80240A10 4622003C */ c.lt.d $f0, $f2 -/* C5B154 80240A14 00000000 */ nop -/* C5B158 80240A18 4500002C */ bc1f .L80240ACC -/* C5B15C 80240A1C 02A0202D */ daddu $a0, $s5, $zero -/* C5B160 80240A20 AFA00010 */ sw $zero, 0x10($sp) -/* C5B164 80240A24 8E46000C */ lw $a2, 0xc($s2) -/* C5B168 80240A28 8E470010 */ lw $a3, 0x10($s2) -/* C5B16C 80240A2C 0C01242D */ jal func_800490B4 -/* C5B170 80240A30 0220282D */ daddu $a1, $s1, $zero -/* C5B174 80240A34 10400025 */ beqz $v0, .L80240ACC -/* C5B178 80240A38 0000202D */ daddu $a0, $zero, $zero -/* C5B17C 80240A3C 0200282D */ daddu $a1, $s0, $zero -/* C5B180 80240A40 0000302D */ daddu $a2, $zero, $zero -/* C5B184 80240A44 2412000C */ addiu $s2, $zero, 0xc -/* C5B188 80240A48 860300A8 */ lh $v1, 0xa8($s0) -/* C5B18C 80240A4C 3C013F80 */ lui $at, 0x3f80 -/* C5B190 80240A50 44810000 */ mtc1 $at, $f0 -/* C5B194 80240A54 3C014000 */ lui $at, 0x4000 -/* C5B198 80240A58 44811000 */ mtc1 $at, $f2 -/* C5B19C 80240A5C 3C01C1A0 */ lui $at, 0xc1a0 -/* C5B1A0 80240A60 44812000 */ mtc1 $at, $f4 -/* C5B1A4 80240A64 44834000 */ mtc1 $v1, $f8 -/* C5B1A8 80240A68 00000000 */ nop -/* C5B1AC 80240A6C 46804220 */ cvt.s.w $f8, $f8 -/* C5B1B0 80240A70 44074000 */ mfc1 $a3, $f8 -/* C5B1B4 80240A74 27A20038 */ addiu $v0, $sp, 0x38 -/* C5B1B8 80240A78 AFB2001C */ sw $s2, 0x1c($sp) -/* C5B1BC 80240A7C AFA20020 */ sw $v0, 0x20($sp) -/* C5B1C0 80240A80 E7A00010 */ swc1 $f0, 0x10($sp) -/* C5B1C4 80240A84 E7A20014 */ swc1 $f2, 0x14($sp) -/* C5B1C8 80240A88 0C01BFA4 */ jal fx_emote -/* C5B1CC 80240A8C E7A40018 */ swc1 $f4, 0x18($sp) -/* C5B1D0 80240A90 0200202D */ daddu $a0, $s0, $zero -/* C5B1D4 80240A94 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C5B1D8 80240A98 C480003C */ lwc1 $f0, 0x3c($a0) -/* C5B1DC 80240A9C 3C060020 */ lui $a2, 0x20 -/* C5B1E0 80240AA0 0C012530 */ jal func_800494C0 -/* C5B1E4 80240AA4 E4800064 */ swc1 $f0, 0x64($a0) -/* C5B1E8 80240AA8 8E220018 */ lw $v0, 0x18($s1) -/* C5B1EC 80240AAC 9442002A */ lhu $v0, 0x2a($v0) -/* C5B1F0 80240AB0 30420001 */ andi $v0, $v0, 1 -/* C5B1F4 80240AB4 10400003 */ beqz $v0, .L80240AC4 -/* C5B1F8 80240AB8 2402000A */ addiu $v0, $zero, 0xa -/* C5B1FC 80240ABC 08090321 */ j .L80240C84 -/* C5B200 80240AC0 AE620070 */ sw $v0, 0x70($s3) -.L80240AC4: -/* C5B204 80240AC4 08090321 */ j .L80240C84 -/* C5B208 80240AC8 AE720070 */ sw $s2, 0x70($s3) -.L80240ACC: -/* C5B20C 80240ACC 8E620074 */ lw $v0, 0x74($s3) -/* C5B210 80240AD0 2442FFFF */ addiu $v0, $v0, -1 -.L80240AD4: -/* C5B214 80240AD4 080902B8 */ j .L80240AE0 -/* C5B218 80240AD8 AE620074 */ sw $v0, 0x74($s3) -.L80240ADC: -/* C5B21C 80240ADC AE220090 */ sw $v0, 0x90($s1) -.L80240AE0: -/* C5B220 80240AE0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C5B224 80240AE4 C6000040 */ lwc1 $f0, 0x40($s0) -/* C5B228 80240AE8 C4620000 */ lwc1 $f2, ($v1) -/* C5B22C 80240AEC 468010A0 */ cvt.s.w $f2, $f2 -/* C5B230 80240AF0 C4640008 */ lwc1 $f4, 8($v1) -/* C5B234 80240AF4 46802120 */ cvt.s.w $f4, $f4 -/* C5B238 80240AF8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C5B23C 80240AFC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5B240 80240B00 44051000 */ mfc1 $a1, $f2 -/* C5B244 80240B04 C440000C */ lwc1 $f0, 0xc($v0) -/* C5B248 80240B08 46800020 */ cvt.s.w $f0, $f0 -/* C5B24C 80240B0C E7A00014 */ swc1 $f0, 0x14($sp) -/* C5B250 80240B10 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5B254 80240B14 44062000 */ mfc1 $a2, $f4 -/* C5B258 80240B18 C4400010 */ lwc1 $f0, 0x10($v0) -/* C5B25C 80240B1C 46800020 */ cvt.s.w $f0, $f0 -/* C5B260 80240B20 E7A00018 */ swc1 $f0, 0x18($sp) -/* C5B264 80240B24 8C640018 */ lw $a0, 0x18($v1) -/* C5B268 80240B28 0C0123F5 */ jal is_point_within_region -/* C5B26C 80240B2C 8E070038 */ lw $a3, 0x38($s0) -/* C5B270 80240B30 1040001A */ beqz $v0, .L80240B9C -/* C5B274 80240B34 00000000 */ nop -/* C5B278 80240B38 8E060038 */ lw $a2, 0x38($s0) -/* C5B27C 80240B3C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5B280 80240B40 8E070040 */ lw $a3, 0x40($s0) -/* C5B284 80240B44 C44C0000 */ lwc1 $f12, ($v0) -/* C5B288 80240B48 46806320 */ cvt.s.w $f12, $f12 -/* C5B28C 80240B4C C44E0008 */ lwc1 $f14, 8($v0) -/* C5B290 80240B50 0C00A7B5 */ jal dist2D -/* C5B294 80240B54 468073A0 */ cvt.s.w $f14, $f14 -/* C5B298 80240B58 C6020018 */ lwc1 $f2, 0x18($s0) -/* C5B29C 80240B5C 4600103C */ c.lt.s $f2, $f0 -/* C5B2A0 80240B60 00000000 */ nop -/* C5B2A4 80240B64 4500000D */ bc1f .L80240B9C -/* C5B2A8 80240B68 E7A00034 */ swc1 $f0, 0x34($sp) -/* C5B2AC 80240B6C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C5B2B0 80240B70 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5B2B4 80240B74 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C5B2B8 80240B78 C4480000 */ lwc1 $f8, ($v0) -/* C5B2BC 80240B7C 46804220 */ cvt.s.w $f8, $f8 -/* C5B2C0 80240B80 44064000 */ mfc1 $a2, $f8 -/* C5B2C4 80240B84 C4480008 */ lwc1 $f8, 8($v0) -/* C5B2C8 80240B88 46804220 */ cvt.s.w $f8, $f8 -/* C5B2CC 80240B8C 44074000 */ mfc1 $a3, $f8 -/* C5B2D0 80240B90 0C00A720 */ jal atan2 -/* C5B2D4 80240B94 24140001 */ addiu $s4, $zero, 1 -/* C5B2D8 80240B98 E600000C */ swc1 $f0, 0xc($s0) -.L80240B9C: -/* C5B2DC 80240B9C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5B2E0 80240BA0 8C43000C */ lw $v1, 0xc($v0) -/* C5B2E4 80240BA4 8C420010 */ lw $v0, 0x10($v0) -/* C5B2E8 80240BA8 00621825 */ or $v1, $v1, $v0 -/* C5B2EC 80240BAC 00741825 */ or $v1, $v1, $s4 -/* C5B2F0 80240BB0 10600008 */ beqz $v1, .L80240BD4 -/* C5B2F4 80240BB4 00000000 */ nop -/* C5B2F8 80240BB8 8602008C */ lh $v0, 0x8c($s0) -/* C5B2FC 80240BBC 14400031 */ bnez $v0, .L80240C84 -/* C5B300 80240BC0 00000000 */ nop -/* C5B304 80240BC4 8E050018 */ lw $a1, 0x18($s0) -/* C5B308 80240BC8 8E06000C */ lw $a2, 0xc($s0) -/* C5B30C 80240BCC 0C00EA95 */ jal npc_move_heading -/* C5B310 80240BD0 0200202D */ daddu $a0, $s0, $zero -.L80240BD4: -/* C5B314 80240BD4 C600003C */ lwc1 $f0, 0x3c($s0) -/* C5B318 80240BD8 3C014059 */ lui $at, 0x4059 -/* C5B31C 80240BDC 44811800 */ mtc1 $at, $f3 -/* C5B320 80240BE0 44801000 */ mtc1 $zero, $f2 -/* C5B324 80240BE4 46000021 */ cvt.d.s $f0, $f0 -/* C5B328 80240BE8 46220002 */ mul.d $f0, $f0, $f2 -/* C5B32C 80240BEC 00000000 */ nop -/* C5B330 80240BF0 4620020D */ trunc.w.d $f8, $f0 -/* C5B334 80240BF4 E628007C */ swc1 $f8, 0x7c($s1) -/* C5B338 80240BF8 8E420004 */ lw $v0, 4($s2) -/* C5B33C 80240BFC 18400021 */ blez $v0, .L80240C84 -/* C5B340 80240C00 00000000 */ nop -/* C5B344 80240C04 8602008E */ lh $v0, 0x8e($s0) -/* C5B348 80240C08 9603008E */ lhu $v1, 0x8e($s0) -/* C5B34C 80240C0C 18400005 */ blez $v0, .L80240C24 -/* C5B350 80240C10 2462FFFF */ addiu $v0, $v1, -1 -/* C5B354 80240C14 A602008E */ sh $v0, 0x8e($s0) -/* C5B358 80240C18 00021400 */ sll $v0, $v0, 0x10 -/* C5B35C 80240C1C 1C400019 */ bgtz $v0, .L80240C84 -/* C5B360 80240C20 00000000 */ nop -.L80240C24: -/* C5B364 80240C24 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C5B368 80240C28 24020002 */ addiu $v0, $zero, 2 -/* C5B36C 80240C2C 0C00A67F */ jal rand_int -/* C5B370 80240C30 AE620070 */ sw $v0, 0x70($s3) -/* C5B374 80240C34 3C035555 */ lui $v1, 0x5555 -/* C5B378 80240C38 34635556 */ ori $v1, $v1, 0x5556 -/* C5B37C 80240C3C 00430018 */ mult $v0, $v1 -/* C5B380 80240C40 000227C3 */ sra $a0, $v0, 0x1f -/* C5B384 80240C44 00004010 */ mfhi $t0 -/* C5B388 80240C48 01042023 */ subu $a0, $t0, $a0 -/* C5B38C 80240C4C 00041840 */ sll $v1, $a0, 1 -/* C5B390 80240C50 00641821 */ addu $v1, $v1, $a0 -/* C5B394 80240C54 00431023 */ subu $v0, $v0, $v1 -/* C5B398 80240C58 24430002 */ addiu $v1, $v0, 2 -/* C5B39C 80240C5C AE630074 */ sw $v1, 0x74($s3) -/* C5B3A0 80240C60 8E42002C */ lw $v0, 0x2c($s2) -/* C5B3A4 80240C64 58400007 */ blezl $v0, .L80240C84 -/* C5B3A8 80240C68 AE600070 */ sw $zero, 0x70($s3) -/* C5B3AC 80240C6C 8E420008 */ lw $v0, 8($s2) -/* C5B3B0 80240C70 18400003 */ blez $v0, .L80240C80 -/* C5B3B4 80240C74 28620003 */ slti $v0, $v1, 3 -/* C5B3B8 80240C78 10400002 */ beqz $v0, .L80240C84 -/* C5B3BC 80240C7C 00000000 */ nop -.L80240C80: -/* C5B3C0 80240C80 AE600070 */ sw $zero, 0x70($s3) -.L80240C84: -/* C5B3C4 80240C84 8FBF0058 */ lw $ra, 0x58($sp) -/* C5B3C8 80240C88 8FB50054 */ lw $s5, 0x54($sp) -/* C5B3CC 80240C8C 8FB40050 */ lw $s4, 0x50($sp) -/* C5B3D0 80240C90 8FB3004C */ lw $s3, 0x4c($sp) -/* C5B3D4 80240C94 8FB20048 */ lw $s2, 0x48($sp) -/* C5B3D8 80240C98 8FB10044 */ lw $s1, 0x44($sp) -/* C5B3DC 80240C9C 8FB00040 */ lw $s0, 0x40($sp) -/* C5B3E0 80240CA0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* C5B3E4 80240CA4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* C5B3E8 80240CA8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* C5B3EC 80240CAC D7B40060 */ ldc1 $f20, 0x60($sp) -/* C5B3F0 80240CB0 03E00008 */ jr $ra -/* C5B3F4 80240CB4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_80240CB8_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_80240CB8_C5A740.s deleted file mode 100644 index bd3e848a31..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_80240CB8_C5A740.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CB8_C5B3F8 -/* C5B3F8 80240CB8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C5B3FC 80240CBC AFB3001C */ sw $s3, 0x1c($sp) -/* C5B400 80240CC0 0080982D */ daddu $s3, $a0, $zero -/* C5B404 80240CC4 AFBF0020 */ sw $ra, 0x20($sp) -/* C5B408 80240CC8 AFB20018 */ sw $s2, 0x18($sp) -/* C5B40C 80240CCC AFB10014 */ sw $s1, 0x14($sp) -/* C5B410 80240CD0 AFB00010 */ sw $s0, 0x10($sp) -/* C5B414 80240CD4 8E720148 */ lw $s2, 0x148($s3) -/* C5B418 80240CD8 86440008 */ lh $a0, 8($s2) -/* C5B41C 80240CDC 0C00EABB */ jal get_npc_unsafe -/* C5B420 80240CE0 00A0882D */ daddu $s1, $a1, $zero -/* C5B424 80240CE4 8E240008 */ lw $a0, 8($s1) -/* C5B428 80240CE8 0040802D */ daddu $s0, $v0, $zero -/* C5B42C 80240CEC 00041FC2 */ srl $v1, $a0, 0x1f -/* C5B430 80240CF0 00832021 */ addu $a0, $a0, $v1 -/* C5B434 80240CF4 00042043 */ sra $a0, $a0, 1 -/* C5B438 80240CF8 0C00A67F */ jal rand_int -/* C5B43C 80240CFC 24840001 */ addiu $a0, $a0, 1 -/* C5B440 80240D00 8E230008 */ lw $v1, 8($s1) -/* C5B444 80240D04 240400B4 */ addiu $a0, $zero, 0xb4 -/* C5B448 80240D08 00032FC2 */ srl $a1, $v1, 0x1f -/* C5B44C 80240D0C 00651821 */ addu $v1, $v1, $a1 -/* C5B450 80240D10 00031843 */ sra $v1, $v1, 1 -/* C5B454 80240D14 00621821 */ addu $v1, $v1, $v0 -/* C5B458 80240D18 0C00A67F */ jal rand_int -/* C5B45C 80240D1C A603008E */ sh $v1, 0x8e($s0) -/* C5B460 80240D20 C60C000C */ lwc1 $f12, 0xc($s0) -/* C5B464 80240D24 44820000 */ mtc1 $v0, $f0 -/* C5B468 80240D28 00000000 */ nop -/* C5B46C 80240D2C 46800020 */ cvt.s.w $f0, $f0 -/* C5B470 80240D30 46006300 */ add.s $f12, $f12, $f0 -/* C5B474 80240D34 3C0142B4 */ lui $at, 0x42b4 -/* C5B478 80240D38 44810000 */ mtc1 $at, $f0 -/* C5B47C 80240D3C 0C00A6C9 */ jal clamp_angle -/* C5B480 80240D40 46006301 */ sub.s $f12, $f12, $f0 -/* C5B484 80240D44 E600000C */ swc1 $f0, 0xc($s0) -/* C5B488 80240D48 8E4200CC */ lw $v0, 0xcc($s2) -/* C5B48C 80240D4C 8C420000 */ lw $v0, ($v0) -/* C5B490 80240D50 AE020028 */ sw $v0, 0x28($s0) -/* C5B494 80240D54 24020003 */ addiu $v0, $zero, 3 -/* C5B498 80240D58 AE620070 */ sw $v0, 0x70($s3) -/* C5B49C 80240D5C 8FBF0020 */ lw $ra, 0x20($sp) -/* C5B4A0 80240D60 8FB3001C */ lw $s3, 0x1c($sp) -/* C5B4A4 80240D64 8FB20018 */ lw $s2, 0x18($sp) -/* C5B4A8 80240D68 8FB10014 */ lw $s1, 0x14($sp) -/* C5B4AC 80240D6C 8FB00010 */ lw $s0, 0x10($sp) -/* C5B4B0 80240D70 03E00008 */ jr $ra -/* C5B4B4 80240D74 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_802410BC_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_802410BC_C5A740.s deleted file mode 100644 index bb57c9f070..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_802410BC_C5A740.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410BC_C5B7FC -/* C5B7FC 802410BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C5B800 802410C0 AFB20018 */ sw $s2, 0x18($sp) -/* C5B804 802410C4 0080902D */ daddu $s2, $a0, $zero -/* C5B808 802410C8 AFBF001C */ sw $ra, 0x1c($sp) -/* C5B80C 802410CC AFB10014 */ sw $s1, 0x14($sp) -/* C5B810 802410D0 AFB00010 */ sw $s0, 0x10($sp) -/* C5B814 802410D4 8E510148 */ lw $s1, 0x148($s2) -/* C5B818 802410D8 0C00EABB */ jal get_npc_unsafe -/* C5B81C 802410DC 86240008 */ lh $a0, 8($s1) -/* C5B820 802410E0 0040802D */ daddu $s0, $v0, $zero -/* C5B824 802410E4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C5B828 802410E8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C5B82C 802410EC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C5B830 802410F0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C5B834 802410F4 A600008E */ sh $zero, 0x8e($s0) -/* C5B838 802410F8 8C460028 */ lw $a2, 0x28($v0) -/* C5B83C 802410FC 0C00A720 */ jal atan2 -/* C5B840 80241100 8C470030 */ lw $a3, 0x30($v0) -/* C5B844 80241104 E600000C */ swc1 $f0, 0xc($s0) -/* C5B848 80241108 8E2200CC */ lw $v0, 0xcc($s1) -/* C5B84C 8024110C 8C420020 */ lw $v0, 0x20($v0) -/* C5B850 80241110 AE020028 */ sw $v0, 0x28($s0) -/* C5B854 80241114 2402000B */ addiu $v0, $zero, 0xb -/* C5B858 80241118 AE420070 */ sw $v0, 0x70($s2) -/* C5B85C 8024111C 8FBF001C */ lw $ra, 0x1c($sp) -/* C5B860 80241120 8FB20018 */ lw $s2, 0x18($sp) -/* C5B864 80241124 8FB10014 */ lw $s1, 0x14($sp) -/* C5B868 80241128 8FB00010 */ lw $s0, 0x10($sp) -/* C5B86C 8024112C 03E00008 */ jr $ra -/* C5B870 80241130 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_80241134_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_80241134_C5A740.s deleted file mode 100644 index 1809f03279..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_80241134_C5A740.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241134_C5B874 -/* C5B874 80241134 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5B878 80241138 AFB00010 */ sw $s0, 0x10($sp) -/* C5B87C 8024113C 0080802D */ daddu $s0, $a0, $zero -/* C5B880 80241140 AFBF0014 */ sw $ra, 0x14($sp) -/* C5B884 80241144 8E020148 */ lw $v0, 0x148($s0) -/* C5B888 80241148 0C00EABB */ jal get_npc_unsafe -/* C5B88C 8024114C 84440008 */ lh $a0, 8($v0) -/* C5B890 80241150 9443008E */ lhu $v1, 0x8e($v0) -/* C5B894 80241154 C440003C */ lwc1 $f0, 0x3c($v0) -/* C5B898 80241158 24640001 */ addiu $a0, $v1, 1 -/* C5B89C 8024115C 00031C00 */ sll $v1, $v1, 0x10 -/* C5B8A0 80241160 00031B83 */ sra $v1, $v1, 0xe -/* C5B8A4 80241164 A444008E */ sh $a0, 0x8e($v0) -/* C5B8A8 80241168 3C018024 */ lui $at, 0x8024 -/* C5B8AC 8024116C 00230821 */ addu $at, $at, $v1 -/* C5B8B0 80241170 C4224900 */ lwc1 $f2, 0x4900($at) -/* C5B8B4 80241174 8443008E */ lh $v1, 0x8e($v0) -/* C5B8B8 80241178 46020000 */ add.s $f0, $f0, $f2 -/* C5B8BC 8024117C 28630005 */ slti $v1, $v1, 5 -/* C5B8C0 80241180 14600003 */ bnez $v1, .L80241190 -/* C5B8C4 80241184 E440003C */ swc1 $f0, 0x3c($v0) -/* C5B8C8 80241188 2402000C */ addiu $v0, $zero, 0xc -/* C5B8CC 8024118C AE020070 */ sw $v0, 0x70($s0) -.L80241190: -/* C5B8D0 80241190 8FBF0014 */ lw $ra, 0x14($sp) -/* C5B8D4 80241194 8FB00010 */ lw $s0, 0x10($sp) -/* C5B8D8 80241198 03E00008 */ jr $ra -/* C5B8DC 8024119C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_802411A0_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_802411A0_C5A740.s deleted file mode 100644 index 37227f45e4..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_802411A0_C5A740.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411A0_C5B8E0 -/* C5B8E0 802411A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C5B8E4 802411A4 AFB3001C */ sw $s3, 0x1c($sp) -/* C5B8E8 802411A8 0080982D */ daddu $s3, $a0, $zero -/* C5B8EC 802411AC AFBF0020 */ sw $ra, 0x20($sp) -/* C5B8F0 802411B0 AFB20018 */ sw $s2, 0x18($sp) -/* C5B8F4 802411B4 AFB10014 */ sw $s1, 0x14($sp) -/* C5B8F8 802411B8 AFB00010 */ sw $s0, 0x10($sp) -/* C5B8FC 802411BC 8E720148 */ lw $s2, 0x148($s3) -/* C5B900 802411C0 86440008 */ lh $a0, 8($s2) -/* C5B904 802411C4 0C00EABB */ jal get_npc_unsafe -/* C5B908 802411C8 00A0802D */ daddu $s0, $a1, $zero -/* C5B90C 802411CC 0040882D */ daddu $s1, $v0, $zero -/* C5B910 802411D0 C6420080 */ lwc1 $f2, 0x80($s2) -/* C5B914 802411D4 468010A0 */ cvt.s.w $f2, $f2 -/* C5B918 802411D8 460010A1 */ cvt.d.s $f2, $f2 -/* C5B91C 802411DC C6400084 */ lwc1 $f0, 0x84($s2) -/* C5B920 802411E0 46800020 */ cvt.s.w $f0, $f0 -/* C5B924 802411E4 46000021 */ cvt.d.s $f0, $f0 -/* C5B928 802411E8 3C014059 */ lui $at, 0x4059 -/* C5B92C 802411EC 44812800 */ mtc1 $at, $f5 -/* C5B930 802411F0 44802000 */ mtc1 $zero, $f4 -/* C5B934 802411F4 8E4200CC */ lw $v0, 0xcc($s2) -/* C5B938 802411F8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C5B93C 802411FC C62E0040 */ lwc1 $f14, 0x40($s1) -/* C5B940 80241200 46241083 */ div.d $f2, $f2, $f4 -/* C5B944 80241204 462010A0 */ cvt.s.d $f2, $f2 -/* C5B948 80241208 46240003 */ div.d $f0, $f0, $f4 -/* C5B94C 8024120C 8C420020 */ lw $v0, 0x20($v0) -/* C5B950 80241210 46200020 */ cvt.s.d $f0, $f0 -/* C5B954 80241214 E622001C */ swc1 $f2, 0x1c($s1) -/* C5B958 80241218 E6200014 */ swc1 $f0, 0x14($s1) -/* C5B95C 8024121C AE220028 */ sw $v0, 0x28($s1) -/* C5B960 80241220 C6000018 */ lwc1 $f0, 0x18($s0) -/* C5B964 80241224 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C5B968 80241228 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C5B96C 8024122C E6200018 */ swc1 $f0, 0x18($s1) -/* C5B970 80241230 8C460028 */ lw $a2, 0x28($v0) -/* C5B974 80241234 0C00A720 */ jal atan2 -/* C5B978 80241238 8C470030 */ lw $a3, 0x30($v0) -/* C5B97C 8024123C E620000C */ swc1 $f0, 0xc($s1) -/* C5B980 80241240 8E420018 */ lw $v0, 0x18($s2) -/* C5B984 80241244 AE400074 */ sw $zero, 0x74($s2) -/* C5B988 80241248 9442002A */ lhu $v0, 0x2a($v0) -/* C5B98C 8024124C 30420002 */ andi $v0, $v0, 2 -/* C5B990 80241250 10400005 */ beqz $v0, .L80241268 -/* C5B994 80241254 24020003 */ addiu $v0, $zero, 3 -/* C5B998 80241258 A622008E */ sh $v0, 0x8e($s1) -/* C5B99C 8024125C 2402000D */ addiu $v0, $zero, 0xd -/* C5B9A0 80241260 080904AE */ j .L802412B8 -/* C5B9A4 80241264 AE620070 */ sw $v0, 0x70($s3) -.L80241268: -/* C5B9A8 80241268 24030001 */ addiu $v1, $zero, 1 -/* C5B9AC 8024126C 2402000E */ addiu $v0, $zero, 0xe -/* C5B9B0 80241270 A623008E */ sh $v1, 0x8e($s1) -/* C5B9B4 80241274 AE620070 */ sw $v0, 0x70($s3) -/* C5B9B8 80241278 C6200038 */ lwc1 $f0, 0x38($s1) -/* C5B9BC 8024127C 4600018D */ trunc.w.s $f6, $f0 -/* C5B9C0 80241280 44023000 */ mfc1 $v0, $f6 -/* C5B9C4 80241284 00000000 */ nop -/* C5B9C8 80241288 A6420010 */ sh $v0, 0x10($s2) -/* C5B9CC 8024128C C620003C */ lwc1 $f0, 0x3c($s1) -/* C5B9D0 80241290 4600018D */ trunc.w.s $f6, $f0 -/* C5B9D4 80241294 44023000 */ mfc1 $v0, $f6 -/* C5B9D8 80241298 00000000 */ nop -/* C5B9DC 8024129C A6420012 */ sh $v0, 0x12($s2) -/* C5B9E0 802412A0 C6200040 */ lwc1 $f0, 0x40($s1) -/* C5B9E4 802412A4 A2430007 */ sb $v1, 7($s2) -/* C5B9E8 802412A8 4600018D */ trunc.w.s $f6, $f0 -/* C5B9EC 802412AC 44023000 */ mfc1 $v0, $f6 -/* C5B9F0 802412B0 00000000 */ nop -/* C5B9F4 802412B4 A6420014 */ sh $v0, 0x14($s2) -.L802412B8: -/* C5B9F8 802412B8 8FBF0020 */ lw $ra, 0x20($sp) -/* C5B9FC 802412BC 8FB3001C */ lw $s3, 0x1c($sp) -/* C5BA00 802412C0 8FB20018 */ lw $s2, 0x18($sp) -/* C5BA04 802412C4 8FB10014 */ lw $s1, 0x14($sp) -/* C5BA08 802412C8 8FB00010 */ lw $s0, 0x10($sp) -/* C5BA0C 802412CC 03E00008 */ jr $ra -/* C5BA10 802412D0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_80241338_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_80241338_C5A740.s deleted file mode 100644 index e9a4a224d3..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_80241338_C5A740.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241338_C5BA78 -/* C5BA78 80241338 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C5BA7C 8024133C AFB20030 */ sw $s2, 0x30($sp) -/* C5BA80 80241340 0080902D */ daddu $s2, $a0, $zero -/* C5BA84 80241344 AFBF0038 */ sw $ra, 0x38($sp) -/* C5BA88 80241348 AFB30034 */ sw $s3, 0x34($sp) -/* C5BA8C 8024134C AFB1002C */ sw $s1, 0x2c($sp) -/* C5BA90 80241350 AFB00028 */ sw $s0, 0x28($sp) -/* C5BA94 80241354 F7B60048 */ sdc1 $f22, 0x48($sp) -/* C5BA98 80241358 F7B40040 */ sdc1 $f20, 0x40($sp) -/* C5BA9C 8024135C 8E510148 */ lw $s1, 0x148($s2) -/* C5BAA0 80241360 86240008 */ lh $a0, 8($s1) -/* C5BAA4 80241364 0C00EABB */ jal get_npc_unsafe -/* C5BAA8 80241368 00A0982D */ daddu $s3, $a1, $zero -/* C5BAAC 8024136C 0040802D */ daddu $s0, $v0, $zero -/* C5BAB0 80241370 0200202D */ daddu $a0, $s0, $zero -/* C5BAB4 80241374 C6220088 */ lwc1 $f2, 0x88($s1) -/* C5BAB8 80241378 468010A0 */ cvt.s.w $f2, $f2 -/* C5BABC 8024137C 460010A1 */ cvt.d.s $f2, $f2 -/* C5BAC0 80241380 C604001C */ lwc1 $f4, 0x1c($s0) -/* C5BAC4 80241384 C6000014 */ lwc1 $f0, 0x14($s0) -/* C5BAC8 80241388 8E050018 */ lw $a1, 0x18($s0) -/* C5BACC 8024138C 46002100 */ add.s $f4, $f4, $f0 -/* C5BAD0 80241390 8E06000C */ lw $a2, 0xc($s0) -/* C5BAD4 80241394 C6200078 */ lwc1 $f0, 0x78($s1) -/* C5BAD8 80241398 46800020 */ cvt.s.w $f0, $f0 -/* C5BADC 8024139C E604001C */ swc1 $f4, 0x1c($s0) -/* C5BAE0 802413A0 3C014059 */ lui $at, 0x4059 -/* C5BAE4 802413A4 44812800 */ mtc1 $at, $f5 -/* C5BAE8 802413A8 44802000 */ mtc1 $zero, $f4 -/* C5BAEC 802413AC 46000021 */ cvt.d.s $f0, $f0 -/* C5BAF0 802413B0 46240003 */ div.d $f0, $f0, $f4 -/* C5BAF4 802413B4 46200520 */ cvt.s.d $f20, $f0 -/* C5BAF8 802413B8 46241083 */ div.d $f2, $f2, $f4 -/* C5BAFC 802413BC 0C00EA95 */ jal npc_move_heading -/* C5BB00 802413C0 462015A0 */ cvt.s.d $f22, $f2 -/* C5BB04 802413C4 C604001C */ lwc1 $f4, 0x1c($s0) -/* C5BB08 802413C8 44801000 */ mtc1 $zero, $f2 -/* C5BB0C 802413CC 44801800 */ mtc1 $zero, $f3 -/* C5BB10 802413D0 46002021 */ cvt.d.s $f0, $f4 -/* C5BB14 802413D4 4620103E */ c.le.d $f2, $f0 -/* C5BB18 802413D8 00000000 */ nop -/* C5BB1C 802413DC 45000030 */ bc1f .L802414A0 -/* C5BB20 802413E0 00000000 */ nop -/* C5BB24 802413E4 C600003C */ lwc1 $f0, 0x3c($s0) -/* C5BB28 802413E8 46040000 */ add.s $f0, $f0, $f4 -/* C5BB2C 802413EC E600003C */ swc1 $f0, 0x3c($s0) -/* C5BB30 802413F0 8E2200CC */ lw $v0, 0xcc($s1) -/* C5BB34 802413F4 8C420024 */ lw $v0, 0x24($v0) -/* C5BB38 802413F8 AE020028 */ sw $v0, 0x28($s0) -/* C5BB3C 802413FC A2200007 */ sb $zero, 7($s1) -/* C5BB40 80241400 8E020000 */ lw $v0, ($s0) -/* C5BB44 80241404 30420008 */ andi $v0, $v0, 8 -/* C5BB48 80241408 14400011 */ bnez $v0, .L80241450 -/* C5BB4C 8024140C 0000102D */ daddu $v0, $zero, $zero -/* C5BB50 80241410 27A50018 */ addiu $a1, $sp, 0x18 -/* C5BB54 80241414 27A6001C */ addiu $a2, $sp, 0x1c -/* C5BB58 80241418 C6000038 */ lwc1 $f0, 0x38($s0) -/* C5BB5C 8024141C C602003C */ lwc1 $f2, 0x3c($s0) -/* C5BB60 80241420 C6040040 */ lwc1 $f4, 0x40($s0) -/* C5BB64 80241424 3C01447A */ lui $at, 0x447a -/* C5BB68 80241428 44813000 */ mtc1 $at, $f6 -/* C5BB6C 8024142C 27A20024 */ addiu $v0, $sp, 0x24 -/* C5BB70 80241430 E7A00018 */ swc1 $f0, 0x18($sp) -/* C5BB74 80241434 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C5BB78 80241438 E7A40020 */ swc1 $f4, 0x20($sp) -/* C5BB7C 8024143C E7A60024 */ swc1 $f6, 0x24($sp) -/* C5BB80 80241440 AFA20010 */ sw $v0, 0x10($sp) -/* C5BB84 80241444 8E040080 */ lw $a0, 0x80($s0) -/* C5BB88 80241448 0C0372DF */ jal func_800DCB7C -/* C5BB8C 8024144C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241450: -/* C5BB90 80241450 1040000B */ beqz $v0, .L80241480 -/* C5BB94 80241454 00000000 */ nop -/* C5BB98 80241458 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C5BB9C 8024145C 46140080 */ add.s $f2, $f0, $f20 -/* C5BBA0 80241460 C600003C */ lwc1 $f0, 0x3c($s0) -/* C5BBA4 80241464 4600103E */ c.le.s $f2, $f0 -/* C5BBA8 80241468 00000000 */ nop -/* C5BBAC 8024146C 4500008D */ bc1f .L802416A4 -/* C5BBB0 80241470 00000000 */ nop -/* C5BBB4 80241474 E602003C */ swc1 $f2, 0x3c($s0) -/* C5BBB8 80241478 080905A9 */ j .L802416A4 -/* C5BBBC 8024147C AE400070 */ sw $zero, 0x70($s2) -.L80241480: -/* C5BBC0 80241480 C602003C */ lwc1 $f2, 0x3c($s0) -/* C5BBC4 80241484 C6000064 */ lwc1 $f0, 0x64($s0) -/* C5BBC8 80241488 4602003E */ c.le.s $f0, $f2 -/* C5BBCC 8024148C 00000000 */ nop -/* C5BBD0 80241490 45030084 */ bc1tl .L802416A4 -/* C5BBD4 80241494 AE400070 */ sw $zero, 0x70($s2) -/* C5BBD8 80241498 080905A9 */ j .L802416A4 -/* C5BBDC 8024149C 00000000 */ nop -.L802414A0: -/* C5BBE0 802414A0 4622003C */ c.lt.d $f0, $f2 -/* C5BBE4 802414A4 00000000 */ nop -/* C5BBE8 802414A8 4500007E */ bc1f .L802416A4 -/* C5BBEC 802414AC 00000000 */ nop -/* C5BBF0 802414B0 9602008E */ lhu $v0, 0x8e($s0) -/* C5BBF4 802414B4 24420001 */ addiu $v0, $v0, 1 -/* C5BBF8 802414B8 A602008E */ sh $v0, 0x8e($s0) -/* C5BBFC 802414BC 00021400 */ sll $v0, $v0, 0x10 -/* C5BC00 802414C0 8E630020 */ lw $v1, 0x20($s3) -/* C5BC04 802414C4 00021403 */ sra $v0, $v0, 0x10 -/* C5BC08 802414C8 0043102A */ slt $v0, $v0, $v1 -/* C5BC0C 802414CC 14400026 */ bnez $v0, .L80241568 -/* C5BC10 802414D0 00000000 */ nop -/* C5BC14 802414D4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C5BC18 802414D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C5BC1C 802414DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C5BC20 802414E0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C5BC24 802414E4 A600008E */ sh $zero, 0x8e($s0) -/* C5BC28 802414E8 8C460028 */ lw $a2, 0x28($v0) -/* C5BC2C 802414EC 0C00A720 */ jal atan2 -/* C5BC30 802414F0 8C470030 */ lw $a3, 0x30($v0) -/* C5BC34 802414F4 46000506 */ mov.s $f20, $f0 -/* C5BC38 802414F8 C60C000C */ lwc1 $f12, 0xc($s0) -/* C5BC3C 802414FC 0C00A70A */ jal get_clamped_angle_diff -/* C5BC40 80241500 4600A386 */ mov.s $f14, $f20 -/* C5BC44 80241504 46000086 */ mov.s $f2, $f0 -/* C5BC48 80241508 8E62001C */ lw $v0, 0x1c($s3) -/* C5BC4C 8024150C 46001005 */ abs.s $f0, $f2 -/* C5BC50 80241510 44822000 */ mtc1 $v0, $f4 -/* C5BC54 80241514 00000000 */ nop -/* C5BC58 80241518 46802120 */ cvt.s.w $f4, $f4 -/* C5BC5C 8024151C 4600203C */ c.lt.s $f4, $f0 -/* C5BC60 80241520 00000000 */ nop -/* C5BC64 80241524 4500000D */ bc1f .L8024155C -/* C5BC68 80241528 00000000 */ nop -/* C5BC6C 8024152C 44800000 */ mtc1 $zero, $f0 -/* C5BC70 80241530 C614000C */ lwc1 $f20, 0xc($s0) -/* C5BC74 80241534 4600103C */ c.lt.s $f2, $f0 -/* C5BC78 80241538 00000000 */ nop -/* C5BC7C 8024153C 45000006 */ bc1f .L80241558 -/* C5BC80 80241540 00021023 */ negu $v0, $v0 -/* C5BC84 80241544 44820000 */ mtc1 $v0, $f0 -/* C5BC88 80241548 00000000 */ nop -/* C5BC8C 8024154C 46800020 */ cvt.s.w $f0, $f0 -/* C5BC90 80241550 08090557 */ j .L8024155C -/* C5BC94 80241554 4600A500 */ add.s $f20, $f20, $f0 -.L80241558: -/* C5BC98 80241558 4604A500 */ add.s $f20, $f20, $f4 -.L8024155C: -/* C5BC9C 8024155C 0C00A6C9 */ jal clamp_angle -/* C5BCA0 80241560 4600A306 */ mov.s $f12, $f20 -/* C5BCA4 80241564 E600000C */ swc1 $f0, 0xc($s0) -.L80241568: -/* C5BCA8 80241568 8E020000 */ lw $v0, ($s0) -/* C5BCAC 8024156C 30420008 */ andi $v0, $v0, 8 -/* C5BCB0 80241570 1040000A */ beqz $v0, .L8024159C -/* C5BCB4 80241574 27A50018 */ addiu $a1, $sp, 0x18 -/* C5BCB8 80241578 C602003C */ lwc1 $f2, 0x3c($s0) -/* C5BCBC 8024157C C600001C */ lwc1 $f0, 0x1c($s0) -/* C5BCC0 80241580 46001080 */ add.s $f2, $f2, $f0 -/* C5BCC4 80241584 4616103C */ c.lt.s $f2, $f22 -/* C5BCC8 80241588 00000000 */ nop -/* C5BCCC 8024158C 45020045 */ bc1fl .L802416A4 -/* C5BCD0 80241590 E602003C */ swc1 $f2, 0x3c($s0) -/* C5BCD4 80241594 080905A8 */ j .L802416A0 -/* C5BCD8 80241598 E616003C */ swc1 $f22, 0x3c($s0) -.L8024159C: -/* C5BCDC 8024159C C6000038 */ lwc1 $f0, 0x38($s0) -/* C5BCE0 802415A0 27A6001C */ addiu $a2, $sp, 0x1c -/* C5BCE4 802415A4 E7A00018 */ swc1 $f0, 0x18($sp) -/* C5BCE8 802415A8 860200A8 */ lh $v0, 0xa8($s0) -/* C5BCEC 802415AC C600001C */ lwc1 $f0, 0x1c($s0) -/* C5BCF0 802415B0 C604003C */ lwc1 $f4, 0x3c($s0) -/* C5BCF4 802415B4 44821000 */ mtc1 $v0, $f2 -/* C5BCF8 802415B8 00000000 */ nop -/* C5BCFC 802415BC 468010A0 */ cvt.s.w $f2, $f2 -/* C5BD00 802415C0 46000005 */ abs.s $f0, $f0 -/* C5BD04 802415C4 46020000 */ add.s $f0, $f0, $f2 -/* C5BD08 802415C8 C6060040 */ lwc1 $f6, 0x40($s0) -/* C5BD0C 802415CC 27A20024 */ addiu $v0, $sp, 0x24 -/* C5BD10 802415D0 46022100 */ add.s $f4, $f4, $f2 -/* C5BD14 802415D4 3C014024 */ lui $at, 0x4024 -/* C5BD18 802415D8 44811800 */ mtc1 $at, $f3 -/* C5BD1C 802415DC 44801000 */ mtc1 $zero, $f2 -/* C5BD20 802415E0 46000021 */ cvt.d.s $f0, $f0 -/* C5BD24 802415E4 46220000 */ add.d $f0, $f0, $f2 -/* C5BD28 802415E8 E7A60020 */ swc1 $f6, 0x20($sp) -/* C5BD2C 802415EC E7A4001C */ swc1 $f4, 0x1c($sp) -/* C5BD30 802415F0 46200020 */ cvt.s.d $f0, $f0 -/* C5BD34 802415F4 E7A00024 */ swc1 $f0, 0x24($sp) -/* C5BD38 802415F8 AFA20010 */ sw $v0, 0x10($sp) -/* C5BD3C 802415FC 8E040080 */ lw $a0, 0x80($s0) -/* C5BD40 80241600 0C0372DF */ jal func_800DCB7C -/* C5BD44 80241604 27A70020 */ addiu $a3, $sp, 0x20 -/* C5BD48 80241608 10400015 */ beqz $v0, .L80241660 -/* C5BD4C 8024160C 00000000 */ nop -/* C5BD50 80241610 860200A8 */ lh $v0, 0xa8($s0) -/* C5BD54 80241614 C604001C */ lwc1 $f4, 0x1c($s0) -/* C5BD58 80241618 44820000 */ mtc1 $v0, $f0 -/* C5BD5C 8024161C 00000000 */ nop -/* C5BD60 80241620 46800020 */ cvt.s.w $f0, $f0 -/* C5BD64 80241624 46002085 */ abs.s $f2, $f4 -/* C5BD68 80241628 46020000 */ add.s $f0, $f0, $f2 -/* C5BD6C 8024162C C7A20024 */ lwc1 $f2, 0x24($sp) -/* C5BD70 80241630 4600103E */ c.le.s $f2, $f0 -/* C5BD74 80241634 00000000 */ nop -/* C5BD78 80241638 45000005 */ bc1f .L80241650 -/* C5BD7C 8024163C 00000000 */ nop -/* C5BD80 80241640 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C5BD84 80241644 AE00001C */ sw $zero, 0x1c($s0) -/* C5BD88 80241648 080905A9 */ j .L802416A4 -/* C5BD8C 8024164C E600003C */ swc1 $f0, 0x3c($s0) -.L80241650: -/* C5BD90 80241650 C600003C */ lwc1 $f0, 0x3c($s0) -/* C5BD94 80241654 46040000 */ add.s $f0, $f0, $f4 -/* C5BD98 80241658 080905A9 */ j .L802416A4 -/* C5BD9C 8024165C E600003C */ swc1 $f0, 0x3c($s0) -.L80241660: -/* C5BDA0 80241660 C606003C */ lwc1 $f6, 0x3c($s0) -/* C5BDA4 80241664 860200A8 */ lh $v0, 0xa8($s0) -/* C5BDA8 80241668 46163081 */ sub.s $f2, $f6, $f22 -/* C5BDAC 8024166C 44820000 */ mtc1 $v0, $f0 -/* C5BDB0 80241670 00000000 */ nop -/* C5BDB4 80241674 46800020 */ cvt.s.w $f0, $f0 -/* C5BDB8 80241678 46001080 */ add.s $f2, $f2, $f0 -/* C5BDBC 8024167C C604001C */ lwc1 $f4, 0x1c($s0) -/* C5BDC0 80241680 46002005 */ abs.s $f0, $f4 -/* C5BDC4 80241684 4602003C */ c.lt.s $f0, $f2 -/* C5BDC8 80241688 00000000 */ nop -/* C5BDCC 8024168C 45020005 */ bc1fl .L802416A4 -/* C5BDD0 80241690 AE00001C */ sw $zero, 0x1c($s0) -/* C5BDD4 80241694 46043000 */ add.s $f0, $f6, $f4 -/* C5BDD8 80241698 080905A9 */ j .L802416A4 -/* C5BDDC 8024169C E600003C */ swc1 $f0, 0x3c($s0) -.L802416A0: -/* C5BDE0 802416A0 AE00001C */ sw $zero, 0x1c($s0) -.L802416A4: -/* C5BDE4 802416A4 8FBF0038 */ lw $ra, 0x38($sp) -/* C5BDE8 802416A8 8FB30034 */ lw $s3, 0x34($sp) -/* C5BDEC 802416AC 8FB20030 */ lw $s2, 0x30($sp) -/* C5BDF0 802416B0 8FB1002C */ lw $s1, 0x2c($sp) -/* C5BDF4 802416B4 8FB00028 */ lw $s0, 0x28($sp) -/* C5BDF8 802416B8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* C5BDFC 802416BC D7B40040 */ ldc1 $f20, 0x40($sp) -/* C5BE00 802416C0 03E00008 */ jr $ra -/* C5BE04 802416C4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_802416C8_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_802416C8_C5A740.s deleted file mode 100644 index 419cdb8543..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_802416C8_C5A740.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416C8_C5BE08 -/* C5BE08 802416C8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C5BE0C 802416CC AFB00028 */ sw $s0, 0x28($sp) -/* C5BE10 802416D0 00A0802D */ daddu $s0, $a1, $zero -/* C5BE14 802416D4 AFB1002C */ sw $s1, 0x2c($sp) -/* C5BE18 802416D8 00C0882D */ daddu $s1, $a2, $zero -/* C5BE1C 802416DC AFBF0034 */ sw $ra, 0x34($sp) -/* C5BE20 802416E0 AFB20030 */ sw $s2, 0x30($sp) -/* C5BE24 802416E4 AE200070 */ sw $zero, 0x70($s1) -/* C5BE28 802416E8 8C830000 */ lw $v1, ($a0) -/* C5BE2C 802416EC 2402FDFF */ addiu $v0, $zero, -0x201 -/* C5BE30 802416F0 A480008E */ sh $zero, 0x8e($a0) -/* C5BE34 802416F4 00621824 */ and $v1, $v1, $v0 -/* C5BE38 802416F8 34650800 */ ori $a1, $v1, 0x800 -/* C5BE3C 802416FC AC850000 */ sw $a1, ($a0) -/* C5BE40 80241700 8E0200D0 */ lw $v0, 0xd0($s0) -/* C5BE44 80241704 8C420034 */ lw $v0, 0x34($v0) -/* C5BE48 80241708 10400003 */ beqz $v0, .L80241718 -/* C5BE4C 8024170C 00E0902D */ daddu $s2, $a3, $zero -/* C5BE50 80241710 080905C8 */ j .L80241720 -/* C5BE54 80241714 34620808 */ ori $v0, $v1, 0x808 -.L80241718: -/* C5BE58 80241718 2402FFF7 */ addiu $v0, $zero, -9 -/* C5BE5C 8024171C 00A21024 */ and $v0, $a1, $v0 -.L80241720: -/* C5BE60 80241720 AC820000 */ sw $v0, ($a0) -/* C5BE64 80241724 27A20024 */ addiu $v0, $sp, 0x24 -/* C5BE68 80241728 27A50018 */ addiu $a1, $sp, 0x18 -/* C5BE6C 8024172C C4800038 */ lwc1 $f0, 0x38($a0) -/* C5BE70 80241730 C482003C */ lwc1 $f2, 0x3c($a0) -/* C5BE74 80241734 C4840040 */ lwc1 $f4, 0x40($a0) -/* C5BE78 80241738 3C01447A */ lui $at, 0x447a -/* C5BE7C 8024173C 44813000 */ mtc1 $at, $f6 -/* C5BE80 80241740 27A6001C */ addiu $a2, $sp, 0x1c -/* C5BE84 80241744 E7A00018 */ swc1 $f0, 0x18($sp) -/* C5BE88 80241748 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C5BE8C 8024174C E7A40020 */ swc1 $f4, 0x20($sp) -/* C5BE90 80241750 E7A60024 */ swc1 $f6, 0x24($sp) -/* C5BE94 80241754 AFA20010 */ sw $v0, 0x10($sp) -/* C5BE98 80241758 8C840080 */ lw $a0, 0x80($a0) -/* C5BE9C 8024175C 0C0372DF */ jal func_800DCB7C -/* C5BEA0 80241760 27A70020 */ addiu $a3, $sp, 0x20 -/* C5BEA4 80241764 C7A20024 */ lwc1 $f2, 0x24($sp) -/* C5BEA8 80241768 3C014059 */ lui $at, 0x4059 -/* C5BEAC 8024176C 44812800 */ mtc1 $at, $f5 -/* C5BEB0 80241770 44802000 */ mtc1 $zero, $f4 -/* C5BEB4 80241774 460010A1 */ cvt.d.s $f2, $f2 -/* C5BEB8 80241778 46241082 */ mul.d $f2, $f2, $f4 -/* C5BEBC 8024177C 00000000 */ nop -/* C5BEC0 80241780 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C5BEC4 80241784 46000021 */ cvt.d.s $f0, $f0 -/* C5BEC8 80241788 46240002 */ mul.d $f0, $f0, $f4 -/* C5BECC 8024178C 00000000 */ nop -/* C5BED0 80241790 3C013FE0 */ lui $at, 0x3fe0 -/* C5BED4 80241794 44812800 */ mtc1 $at, $f5 -/* C5BED8 80241798 44802000 */ mtc1 $zero, $f4 -/* C5BEDC 8024179C 00000000 */ nop -/* C5BEE0 802417A0 46241080 */ add.d $f2, $f2, $f4 -/* C5BEE4 802417A4 AE000074 */ sw $zero, 0x74($s0) -/* C5BEE8 802417A8 46240000 */ add.d $f0, $f0, $f4 -/* C5BEEC 802417AC AE000090 */ sw $zero, 0x90($s0) -/* C5BEF0 802417B0 4620120D */ trunc.w.d $f8, $f2 -/* C5BEF4 802417B4 E6080078 */ swc1 $f8, 0x78($s0) -/* C5BEF8 802417B8 4620020D */ trunc.w.d $f8, $f0 -/* C5BEFC 802417BC E6080088 */ swc1 $f8, 0x88($s0) -/* C5BF00 802417C0 8E420014 */ lw $v0, 0x14($s2) -/* C5BF04 802417C4 AE220074 */ sw $v0, 0x74($s1) -/* C5BF08 802417C8 8E0200B0 */ lw $v0, 0xb0($s0) -/* C5BF0C 802417CC 34420010 */ ori $v0, $v0, 0x10 -/* C5BF10 802417D0 AE0200B0 */ sw $v0, 0xb0($s0) -/* C5BF14 802417D4 8FBF0034 */ lw $ra, 0x34($sp) -/* C5BF18 802417D8 8FB20030 */ lw $s2, 0x30($sp) -/* C5BF1C 802417DC 8FB1002C */ lw $s1, 0x2c($sp) -/* C5BF20 802417E0 8FB00028 */ lw $s0, 0x28($sp) -/* C5BF24 802417E4 03E00008 */ jr $ra -/* C5BF28 802417E8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_802417EC_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_802417EC_C5A740.s deleted file mode 100644 index 900a872787..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_802417EC_C5A740.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417EC_C5BF2C -/* C5BF2C 802417EC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C5BF30 802417F0 AFB40040 */ sw $s4, 0x40($sp) -/* C5BF34 802417F4 0080A02D */ daddu $s4, $a0, $zero -/* C5BF38 802417F8 AFBF0048 */ sw $ra, 0x48($sp) -/* C5BF3C 802417FC AFB50044 */ sw $s5, 0x44($sp) -/* C5BF40 80241800 AFB3003C */ sw $s3, 0x3c($sp) -/* C5BF44 80241804 AFB20038 */ sw $s2, 0x38($sp) -/* C5BF48 80241808 AFB10034 */ sw $s1, 0x34($sp) -/* C5BF4C 8024180C AFB00030 */ sw $s0, 0x30($sp) -/* C5BF50 80241810 8E920148 */ lw $s2, 0x148($s4) -/* C5BF54 80241814 86440008 */ lh $a0, 8($s2) -/* C5BF58 80241818 8E90000C */ lw $s0, 0xc($s4) -/* C5BF5C 8024181C 0C00EABB */ jal get_npc_unsafe -/* C5BF60 80241820 00A0882D */ daddu $s1, $a1, $zero -/* C5BF64 80241824 0280202D */ daddu $a0, $s4, $zero -/* C5BF68 80241828 8E050000 */ lw $a1, ($s0) -/* C5BF6C 8024182C 0C0B1EAF */ jal get_variable -/* C5BF70 80241830 0040A82D */ daddu $s5, $v0, $zero -/* C5BF74 80241834 AFA00010 */ sw $zero, 0x10($sp) -/* C5BF78 80241838 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5BF7C 8024183C 8C630030 */ lw $v1, 0x30($v1) -/* C5BF80 80241840 AFA30014 */ sw $v1, 0x14($sp) -/* C5BF84 80241844 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5BF88 80241848 8C63001C */ lw $v1, 0x1c($v1) -/* C5BF8C 8024184C AFA30018 */ sw $v1, 0x18($sp) -/* C5BF90 80241850 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5BF94 80241854 8C630024 */ lw $v1, 0x24($v1) -/* C5BF98 80241858 AFA3001C */ sw $v1, 0x1c($sp) -/* C5BF9C 8024185C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5BFA0 80241860 8C630028 */ lw $v1, 0x28($v1) -/* C5BFA4 80241864 27B30010 */ addiu $s3, $sp, 0x10 -/* C5BFA8 80241868 AFA30020 */ sw $v1, 0x20($sp) -/* C5BFAC 8024186C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5BFB0 80241870 3C0142F0 */ lui $at, 0x42f0 -/* C5BFB4 80241874 44810000 */ mtc1 $at, $f0 -/* C5BFB8 80241878 8C63002C */ lw $v1, 0x2c($v1) -/* C5BFBC 8024187C 0040802D */ daddu $s0, $v0, $zero -/* C5BFC0 80241880 E7A00028 */ swc1 $f0, 0x28($sp) -/* C5BFC4 80241884 A7A0002C */ sh $zero, 0x2c($sp) -/* C5BFC8 80241888 12200006 */ beqz $s1, .L802418A4 -/* C5BFCC 8024188C AFA30024 */ sw $v1, 0x24($sp) -/* C5BFD0 80241890 02A0202D */ daddu $a0, $s5, $zero -/* C5BFD4 80241894 0240282D */ daddu $a1, $s2, $zero -/* C5BFD8 80241898 0280302D */ daddu $a2, $s4, $zero -/* C5BFDC 8024189C 0C0905B2 */ jal func_802416C8 -/* C5BFE0 802418A0 0200382D */ daddu $a3, $s0, $zero -.L802418A4: -/* C5BFE4 802418A4 2402FFFE */ addiu $v0, $zero, -2 -/* C5BFE8 802418A8 A2A200AB */ sb $v0, 0xab($s5) -/* C5BFEC 802418AC 8E4300B0 */ lw $v1, 0xb0($s2) -/* C5BFF0 802418B0 30620004 */ andi $v0, $v1, 4 -/* C5BFF4 802418B4 10400007 */ beqz $v0, .L802418D4 -/* C5BFF8 802418B8 00000000 */ nop -/* C5BFFC 802418BC 824200B4 */ lb $v0, 0xb4($s2) -/* C5C000 802418C0 1440003C */ bnez $v0, .L802419B4 -/* C5C004 802418C4 0000102D */ daddu $v0, $zero, $zero -/* C5C008 802418C8 2402FFFB */ addiu $v0, $zero, -5 -/* C5C00C 802418CC 00621024 */ and $v0, $v1, $v0 -/* C5C010 802418D0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802418D4: -/* C5C014 802418D4 8E830070 */ lw $v1, 0x70($s4) -/* C5C018 802418D8 2C62000F */ sltiu $v0, $v1, 0xf -/* C5C01C 802418DC 10400034 */ beqz $v0, .L802419B0 -/* C5C020 802418E0 00031080 */ sll $v0, $v1, 2 -/* C5C024 802418E4 3C018024 */ lui $at, 0x8024 -/* C5C028 802418E8 00220821 */ addu $at, $at, $v0 -/* C5C02C 802418EC 8C226518 */ lw $v0, 0x6518($at) -/* C5C030 802418F0 00400008 */ jr $v0 -/* C5C034 802418F4 00000000 */ nop -/* C5C038 802418F8 0280202D */ daddu $a0, $s4, $zero -/* C5C03C 802418FC 0200282D */ daddu $a1, $s0, $zero -/* C5C040 80241900 0C090138 */ jal func_802404E0 -/* C5C044 80241904 0260302D */ daddu $a2, $s3, $zero -/* C5C048 80241908 0280202D */ daddu $a0, $s4, $zero -/* C5C04C 8024190C 0200282D */ daddu $a1, $s0, $zero -/* C5C050 80241910 0C0901A4 */ jal func_80240690 -/* C5C054 80241914 0260302D */ daddu $a2, $s3, $zero -/* C5C058 80241918 0809066D */ j .L802419B4 -/* C5C05C 8024191C 0000102D */ daddu $v0, $zero, $zero -/* C5C060 80241920 0280202D */ daddu $a0, $s4, $zero -/* C5C064 80241924 0200282D */ daddu $a1, $s0, $zero -/* C5C068 80241928 0C09032E */ jal func_80240CB8 -/* C5C06C 8024192C 0260302D */ daddu $a2, $s3, $zero -/* C5C070 80241930 0280202D */ daddu $a0, $s4, $zero -/* C5C074 80241934 0200282D */ daddu $a1, $s0, $zero -/* C5C078 80241938 0C09035E */ jal func_80240D78 -/* C5C07C 8024193C 0260302D */ daddu $a2, $s3, $zero -/* C5C080 80241940 0809066D */ j .L802419B4 -/* C5C084 80241944 0000102D */ daddu $v0, $zero, $zero -/* C5C088 80241948 0280202D */ daddu $a0, $s4, $zero -/* C5C08C 8024194C 0200282D */ daddu $a1, $s0, $zero -/* C5C090 80241950 0C09042F */ jal func_802410BC -/* C5C094 80241954 0260302D */ daddu $a2, $s3, $zero -/* C5C098 80241958 0280202D */ daddu $a0, $s4, $zero -/* C5C09C 8024195C 0200282D */ daddu $a1, $s0, $zero -/* C5C0A0 80241960 0C09044D */ jal func_80241134 -/* C5C0A4 80241964 0260302D */ daddu $a2, $s3, $zero -/* C5C0A8 80241968 0809066D */ j .L802419B4 -/* C5C0AC 8024196C 0000102D */ daddu $v0, $zero, $zero -/* C5C0B0 80241970 0280202D */ daddu $a0, $s4, $zero -/* C5C0B4 80241974 0200282D */ daddu $a1, $s0, $zero -/* C5C0B8 80241978 0C090468 */ jal func_802411A0 -/* C5C0BC 8024197C 0260302D */ daddu $a2, $s3, $zero -/* C5C0C0 80241980 0809066D */ j .L802419B4 -/* C5C0C4 80241984 0000102D */ daddu $v0, $zero, $zero -/* C5C0C8 80241988 0280202D */ daddu $a0, $s4, $zero -/* C5C0CC 8024198C 0200282D */ daddu $a1, $s0, $zero -/* C5C0D0 80241990 0C0904B5 */ jal func_802412D4 -/* C5C0D4 80241994 0260302D */ daddu $a2, $s3, $zero -/* C5C0D8 80241998 0809066D */ j .L802419B4 -/* C5C0DC 8024199C 0000102D */ daddu $v0, $zero, $zero -/* C5C0E0 802419A0 0280202D */ daddu $a0, $s4, $zero -/* C5C0E4 802419A4 0200282D */ daddu $a1, $s0, $zero -/* C5C0E8 802419A8 0C0904CE */ jal func_80241338 -/* C5C0EC 802419AC 0260302D */ daddu $a2, $s3, $zero -.L802419B0: -/* C5C0F0 802419B0 0000102D */ daddu $v0, $zero, $zero -.L802419B4: -/* C5C0F4 802419B4 8FBF0048 */ lw $ra, 0x48($sp) -/* C5C0F8 802419B8 8FB50044 */ lw $s5, 0x44($sp) -/* C5C0FC 802419BC 8FB40040 */ lw $s4, 0x40($sp) -/* C5C100 802419C0 8FB3003C */ lw $s3, 0x3c($sp) -/* C5C104 802419C4 8FB20038 */ lw $s2, 0x38($sp) -/* C5C108 802419C8 8FB10034 */ lw $s1, 0x34($sp) -/* C5C10C 802419CC 8FB00030 */ lw $s0, 0x30($sp) -/* C5C110 802419D0 03E00008 */ jr $ra -/* C5C114 802419D4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_802419D8_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_802419D8_C5A740.s deleted file mode 100644 index 549ea3075a..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_802419D8_C5A740.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419D8_C5C118 -/* C5C118 802419D8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C5C11C 802419DC AFB3001C */ sw $s3, 0x1c($sp) -/* C5C120 802419E0 0080982D */ daddu $s3, $a0, $zero -/* C5C124 802419E4 AFBF0020 */ sw $ra, 0x20($sp) -/* C5C128 802419E8 AFB20018 */ sw $s2, 0x18($sp) -/* C5C12C 802419EC AFB10014 */ sw $s1, 0x14($sp) -/* C5C130 802419F0 AFB00010 */ sw $s0, 0x10($sp) -/* C5C134 802419F4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C5C138 802419F8 8E710148 */ lw $s1, 0x148($s3) -/* C5C13C 802419FC 86240008 */ lh $a0, 8($s1) -/* C5C140 80241A00 0C00EABB */ jal get_npc_unsafe -/* C5C144 80241A04 00A0802D */ daddu $s0, $a1, $zero -/* C5C148 80241A08 8E040020 */ lw $a0, 0x20($s0) -/* C5C14C 80241A0C 0040902D */ daddu $s2, $v0, $zero -/* C5C150 80241A10 00041FC2 */ srl $v1, $a0, 0x1f -/* C5C154 80241A14 00832021 */ addu $a0, $a0, $v1 -/* C5C158 80241A18 00042043 */ sra $a0, $a0, 1 -/* C5C15C 80241A1C 0C00A67F */ jal rand_int -/* C5C160 80241A20 24840001 */ addiu $a0, $a0, 1 -/* C5C164 80241A24 8E030020 */ lw $v1, 0x20($s0) -/* C5C168 80241A28 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C5C16C 80241A2C 000327C2 */ srl $a0, $v1, 0x1f -/* C5C170 80241A30 00641821 */ addu $v1, $v1, $a0 -/* C5C174 80241A34 00031843 */ sra $v1, $v1, 1 -/* C5C178 80241A38 00621821 */ addu $v1, $v1, $v0 -/* C5C17C 80241A3C A643008E */ sh $v1, 0x8e($s2) -/* C5C180 80241A40 8E2200CC */ lw $v0, 0xcc($s1) -/* C5C184 80241A44 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C5C188 80241A48 8C42000C */ lw $v0, 0xc($v0) -/* C5C18C 80241A4C AE420028 */ sw $v0, 0x28($s2) -/* C5C190 80241A50 C6000018 */ lwc1 $f0, 0x18($s0) -/* C5C194 80241A54 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C5C198 80241A58 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C5C19C 80241A5C E6400018 */ swc1 $f0, 0x18($s2) -/* C5C1A0 80241A60 8C460028 */ lw $a2, 0x28($v0) -/* C5C1A4 80241A64 0C00A720 */ jal atan2 -/* C5C1A8 80241A68 8C470030 */ lw $a3, 0x30($v0) -/* C5C1AC 80241A6C 46000506 */ mov.s $f20, $f0 -/* C5C1B0 80241A70 C64C000C */ lwc1 $f12, 0xc($s2) -/* C5C1B4 80241A74 0C00A70A */ jal get_clamped_angle_diff -/* C5C1B8 80241A78 4600A386 */ mov.s $f14, $f20 -/* C5C1BC 80241A7C 46000086 */ mov.s $f2, $f0 -/* C5C1C0 80241A80 8E02001C */ lw $v0, 0x1c($s0) -/* C5C1C4 80241A84 46001005 */ abs.s $f0, $f2 -/* C5C1C8 80241A88 44822000 */ mtc1 $v0, $f4 -/* C5C1CC 80241A8C 00000000 */ nop -/* C5C1D0 80241A90 46802120 */ cvt.s.w $f4, $f4 -/* C5C1D4 80241A94 4600203C */ c.lt.s $f4, $f0 -/* C5C1D8 80241A98 00000000 */ nop -/* C5C1DC 80241A9C 4500000D */ bc1f .L80241AD4 -/* C5C1E0 80241AA0 00000000 */ nop -/* C5C1E4 80241AA4 44800000 */ mtc1 $zero, $f0 -/* C5C1E8 80241AA8 C654000C */ lwc1 $f20, 0xc($s2) -/* C5C1EC 80241AAC 4600103C */ c.lt.s $f2, $f0 -/* C5C1F0 80241AB0 00000000 */ nop -/* C5C1F4 80241AB4 45000006 */ bc1f .L80241AD0 -/* C5C1F8 80241AB8 00021023 */ negu $v0, $v0 -/* C5C1FC 80241ABC 44820000 */ mtc1 $v0, $f0 -/* C5C200 80241AC0 00000000 */ nop -/* C5C204 80241AC4 46800020 */ cvt.s.w $f0, $f0 -/* C5C208 80241AC8 080906B5 */ j .L80241AD4 -/* C5C20C 80241ACC 4600A500 */ add.s $f20, $f20, $f0 -.L80241AD0: -/* C5C210 80241AD0 4604A500 */ add.s $f20, $f20, $f4 -.L80241AD4: -/* C5C214 80241AD4 0C00A6C9 */ jal clamp_angle -/* C5C218 80241AD8 4600A306 */ mov.s $f12, $f20 -/* C5C21C 80241ADC 2402000D */ addiu $v0, $zero, 0xd -/* C5C220 80241AE0 E640000C */ swc1 $f0, 0xc($s2) -/* C5C224 80241AE4 AE620070 */ sw $v0, 0x70($s3) -/* C5C228 80241AE8 8FBF0020 */ lw $ra, 0x20($sp) -/* C5C22C 80241AEC 8FB3001C */ lw $s3, 0x1c($sp) -/* C5C230 80241AF0 8FB20018 */ lw $s2, 0x18($sp) -/* C5C234 80241AF4 8FB10014 */ lw $s1, 0x14($sp) -/* C5C238 80241AF8 8FB00010 */ lw $s0, 0x10($sp) -/* C5C23C 80241AFC D7B40028 */ ldc1 $f20, 0x28($sp) -/* C5C240 80241B00 03E00008 */ jr $ra -/* C5C244 80241B04 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_80241B08_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_80241B08_C5A740.s deleted file mode 100644 index 2650827a32..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_80241B08_C5A740.s +++ /dev/null @@ -1,172 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B08_C5C248 -/* C5C248 80241B08 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C5C24C 80241B0C AFB3004C */ sw $s3, 0x4c($sp) -/* C5C250 80241B10 0080982D */ daddu $s3, $a0, $zero -/* C5C254 80241B14 AFBF0050 */ sw $ra, 0x50($sp) -/* C5C258 80241B18 AFB20048 */ sw $s2, 0x48($sp) -/* C5C25C 80241B1C AFB10044 */ sw $s1, 0x44($sp) -/* C5C260 80241B20 AFB00040 */ sw $s0, 0x40($sp) -/* C5C264 80241B24 8E720148 */ lw $s2, 0x148($s3) -/* C5C268 80241B28 00A0882D */ daddu $s1, $a1, $zero -/* C5C26C 80241B2C 86440008 */ lh $a0, 8($s2) -/* C5C270 80241B30 0C00EABB */ jal get_npc_unsafe -/* C5C274 80241B34 00C0802D */ daddu $s0, $a2, $zero -/* C5C278 80241B38 0200202D */ daddu $a0, $s0, $zero -/* C5C27C 80241B3C 0240282D */ daddu $a1, $s2, $zero -/* C5C280 80241B40 24030001 */ addiu $v1, $zero, 1 -/* C5C284 80241B44 AFA30010 */ sw $v1, 0x10($sp) -/* C5C288 80241B48 8E260024 */ lw $a2, 0x24($s1) -/* C5C28C 80241B4C 8E270028 */ lw $a3, 0x28($s1) -/* C5C290 80241B50 0C01242D */ jal func_800490B4 -/* C5C294 80241B54 0040802D */ daddu $s0, $v0, $zero -/* C5C298 80241B58 14400020 */ bnez $v0, .L80241BDC -/* C5C29C 80241B5C 24040002 */ addiu $a0, $zero, 2 -/* C5C2A0 80241B60 0200282D */ daddu $a1, $s0, $zero -/* C5C2A4 80241B64 0000302D */ daddu $a2, $zero, $zero -/* C5C2A8 80241B68 860300A8 */ lh $v1, 0xa8($s0) -/* C5C2AC 80241B6C 3C013F80 */ lui $at, 0x3f80 -/* C5C2B0 80241B70 44810000 */ mtc1 $at, $f0 -/* C5C2B4 80241B74 3C014000 */ lui $at, 0x4000 -/* C5C2B8 80241B78 44811000 */ mtc1 $at, $f2 -/* C5C2BC 80241B7C 3C01C1A0 */ lui $at, 0xc1a0 -/* C5C2C0 80241B80 44812000 */ mtc1 $at, $f4 -/* C5C2C4 80241B84 2402000F */ addiu $v0, $zero, 0xf -/* C5C2C8 80241B88 AFA2001C */ sw $v0, 0x1c($sp) -/* C5C2CC 80241B8C 44834000 */ mtc1 $v1, $f8 -/* C5C2D0 80241B90 00000000 */ nop -/* C5C2D4 80241B94 46804220 */ cvt.s.w $f8, $f8 -/* C5C2D8 80241B98 44074000 */ mfc1 $a3, $f8 -/* C5C2DC 80241B9C 27A20028 */ addiu $v0, $sp, 0x28 -/* C5C2E0 80241BA0 AFA20020 */ sw $v0, 0x20($sp) -/* C5C2E4 80241BA4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C5C2E8 80241BA8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C5C2EC 80241BAC 0C01BFA4 */ jal fx_emote -/* C5C2F0 80241BB0 E7A40018 */ swc1 $f4, 0x18($sp) -/* C5C2F4 80241BB4 8E4200CC */ lw $v0, 0xcc($s2) -/* C5C2F8 80241BB8 8C430000 */ lw $v1, ($v0) -/* C5C2FC 80241BBC 2402001E */ addiu $v0, $zero, 0x1e -/* C5C300 80241BC0 A602008E */ sh $v0, 0x8e($s0) -/* C5C304 80241BC4 24020014 */ addiu $v0, $zero, 0x14 -/* C5C308 80241BC8 AE030028 */ sw $v1, 0x28($s0) -/* C5C30C 80241BCC AE620070 */ sw $v0, 0x70($s3) -/* C5C310 80241BD0 2402001E */ addiu $v0, $zero, 0x1e -/* C5C314 80241BD4 0809075B */ j .L80241D6C -/* C5C318 80241BD8 AE420090 */ sw $v0, 0x90($s2) -.L80241BDC: -/* C5C31C 80241BDC 8E050018 */ lw $a1, 0x18($s0) -/* C5C320 80241BE0 8E06000C */ lw $a2, 0xc($s0) -/* C5C324 80241BE4 0C00EA95 */ jal npc_move_heading -/* C5C328 80241BE8 0200202D */ daddu $a0, $s0, $zero -/* C5C32C 80241BEC 8E020000 */ lw $v0, ($s0) -/* C5C330 80241BF0 30420008 */ andi $v0, $v0, 8 -/* C5C334 80241BF4 14400028 */ bnez $v0, .L80241C98 -/* C5C338 80241BF8 0000882D */ daddu $s1, $zero, $zero -/* C5C33C 80241BFC 27A5002C */ addiu $a1, $sp, 0x2c -/* C5C340 80241C00 27A60030 */ addiu $a2, $sp, 0x30 -/* C5C344 80241C04 860200A8 */ lh $v0, 0xa8($s0) -/* C5C348 80241C08 C6000038 */ lwc1 $f0, 0x38($s0) -/* C5C34C 80241C0C 44821000 */ mtc1 $v0, $f2 -/* C5C350 80241C10 00000000 */ nop -/* C5C354 80241C14 468010A0 */ cvt.s.w $f2, $f2 -/* C5C358 80241C18 E7A0002C */ swc1 $f0, 0x2c($sp) -/* C5C35C 80241C1C 860200A8 */ lh $v0, 0xa8($s0) -/* C5C360 80241C20 C604003C */ lwc1 $f4, 0x3c($s0) -/* C5C364 80241C24 C6060040 */ lwc1 $f6, 0x40($s0) -/* C5C368 80241C28 44820000 */ mtc1 $v0, $f0 -/* C5C36C 80241C2C 00000000 */ nop -/* C5C370 80241C30 46800021 */ cvt.d.w $f0, $f0 -/* C5C374 80241C34 46022100 */ add.s $f4, $f4, $f2 -/* C5C378 80241C38 3C014008 */ lui $at, 0x4008 -/* C5C37C 80241C3C 44811800 */ mtc1 $at, $f3 -/* C5C380 80241C40 44801000 */ mtc1 $zero, $f2 -/* C5C384 80241C44 27A20038 */ addiu $v0, $sp, 0x38 -/* C5C388 80241C48 46220000 */ add.d $f0, $f0, $f2 -/* C5C38C 80241C4C E7A60034 */ swc1 $f6, 0x34($sp) -/* C5C390 80241C50 E7A40030 */ swc1 $f4, 0x30($sp) -/* C5C394 80241C54 46200020 */ cvt.s.d $f0, $f0 -/* C5C398 80241C58 E7A00038 */ swc1 $f0, 0x38($sp) -/* C5C39C 80241C5C AFA20010 */ sw $v0, 0x10($sp) -/* C5C3A0 80241C60 8E040080 */ lw $a0, 0x80($s0) -/* C5C3A4 80241C64 0C0372DF */ jal func_800DCB7C -/* C5C3A8 80241C68 27A70034 */ addiu $a3, $sp, 0x34 -/* C5C3AC 80241C6C 1040000A */ beqz $v0, .L80241C98 -/* C5C3B0 80241C70 00000000 */ nop -/* C5C3B4 80241C74 860200A8 */ lh $v0, 0xa8($s0) -/* C5C3B8 80241C78 C7A20038 */ lwc1 $f2, 0x38($sp) -/* C5C3BC 80241C7C 44820000 */ mtc1 $v0, $f0 -/* C5C3C0 80241C80 00000000 */ nop -/* C5C3C4 80241C84 46800020 */ cvt.s.w $f0, $f0 -/* C5C3C8 80241C88 4600103C */ c.lt.s $f2, $f0 -/* C5C3CC 80241C8C 00000000 */ nop -/* C5C3D0 80241C90 45030001 */ bc1tl .L80241C98 -/* C5C3D4 80241C94 24110001 */ addiu $s1, $zero, 1 -.L80241C98: -/* C5C3D8 80241C98 12200008 */ beqz $s1, .L80241CBC -/* C5C3DC 80241C9C 00000000 */ nop -/* C5C3E0 80241CA0 C7A00030 */ lwc1 $f0, 0x30($sp) -/* C5C3E4 80241CA4 3C013FF0 */ lui $at, 0x3ff0 -/* C5C3E8 80241CA8 44811800 */ mtc1 $at, $f3 -/* C5C3EC 80241CAC 44801000 */ mtc1 $zero, $f2 -/* C5C3F0 80241CB0 46000021 */ cvt.d.s $f0, $f0 -/* C5C3F4 80241CB4 08090751 */ j .L80241D44 -/* C5C3F8 80241CB8 46220000 */ add.d $f0, $f0, $f2 -.L80241CBC: -/* C5C3FC 80241CBC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C5C400 80241CC0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C5C404 80241CC4 3C014018 */ lui $at, 0x4018 -/* C5C408 80241CC8 44811800 */ mtc1 $at, $f3 -/* C5C40C 80241CCC 44801000 */ mtc1 $zero, $f2 -/* C5C410 80241CD0 C440002C */ lwc1 $f0, 0x2c($v0) -/* C5C414 80241CD4 C604003C */ lwc1 $f4, 0x3c($s0) -/* C5C418 80241CD8 46000021 */ cvt.d.s $f0, $f0 -/* C5C41C 80241CDC 46220000 */ add.d $f0, $f0, $f2 -/* C5C420 80241CE0 46002121 */ cvt.d.s $f4, $f4 -/* C5C424 80241CE4 46202001 */ sub.d $f0, $f4, $f0 -/* C5C428 80241CE8 462001A0 */ cvt.s.d $f6, $f0 -/* C5C42C 80241CEC 44800000 */ mtc1 $zero, $f0 -/* C5C430 80241CF0 44800800 */ mtc1 $zero, $f1 -/* C5C434 80241CF4 460030A1 */ cvt.d.s $f2, $f6 -/* C5C438 80241CF8 4620103C */ c.lt.d $f2, $f0 -/* C5C43C 80241CFC 00000000 */ nop -/* C5C440 80241D00 45010009 */ bc1t .L80241D28 -/* C5C444 80241D04 00000000 */ nop -/* C5C448 80241D08 3C014010 */ lui $at, 0x4010 -/* C5C44C 80241D0C 44810800 */ mtc1 $at, $f1 -/* C5C450 80241D10 44800000 */ mtc1 $zero, $f0 -/* C5C454 80241D14 00000000 */ nop -/* C5C458 80241D18 4622003C */ c.lt.d $f0, $f2 -/* C5C45C 80241D1C 00000000 */ nop -/* C5C460 80241D20 4500000A */ bc1f .L80241D4C -/* C5C464 80241D24 00000000 */ nop -.L80241D28: -/* C5C468 80241D28 3C018024 */ lui $at, 0x8024 -/* C5C46C 80241D2C D4226558 */ ldc1 $f2, 0x6558($at) -/* C5C470 80241D30 46003187 */ neg.s $f6, $f6 -/* C5C474 80241D34 46003021 */ cvt.d.s $f0, $f6 -/* C5C478 80241D38 46220002 */ mul.d $f0, $f0, $f2 -/* C5C47C 80241D3C 00000000 */ nop -/* C5C480 80241D40 46202000 */ add.d $f0, $f4, $f0 -.L80241D44: -/* C5C484 80241D44 46200020 */ cvt.s.d $f0, $f0 -/* C5C488 80241D48 E600003C */ swc1 $f0, 0x3c($s0) -.L80241D4C: -/* C5C48C 80241D4C 8602008E */ lh $v0, 0x8e($s0) -/* C5C490 80241D50 9603008E */ lhu $v1, 0x8e($s0) -/* C5C494 80241D54 18400003 */ blez $v0, .L80241D64 -/* C5C498 80241D58 2462FFFF */ addiu $v0, $v1, -1 -/* C5C49C 80241D5C 0809075B */ j .L80241D6C -/* C5C4A0 80241D60 A602008E */ sh $v0, 0x8e($s0) -.L80241D64: -/* C5C4A4 80241D64 2402000C */ addiu $v0, $zero, 0xc -/* C5C4A8 80241D68 AE620070 */ sw $v0, 0x70($s3) -.L80241D6C: -/* C5C4AC 80241D6C 8FBF0050 */ lw $ra, 0x50($sp) -/* C5C4B0 80241D70 8FB3004C */ lw $s3, 0x4c($sp) -/* C5C4B4 80241D74 8FB20048 */ lw $s2, 0x48($sp) -/* C5C4B8 80241D78 8FB10044 */ lw $s1, 0x44($sp) -/* C5C4BC 80241D7C 8FB00040 */ lw $s0, 0x40($sp) -/* C5C4C0 80241D80 03E00008 */ jr $ra -/* C5C4C4 80241D84 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_80241DE4_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_80241DE4_C5A740.s deleted file mode 100644 index c5e0eeb4dd..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_80241DE4_C5A740.s +++ /dev/null @@ -1,130 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DE4_C5C524 -/* C5C524 80241DE4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C5C528 80241DE8 AFB40040 */ sw $s4, 0x40($sp) -/* C5C52C 80241DEC 0080A02D */ daddu $s4, $a0, $zero -/* C5C530 80241DF0 AFBF0048 */ sw $ra, 0x48($sp) -/* C5C534 80241DF4 AFB50044 */ sw $s5, 0x44($sp) -/* C5C538 80241DF8 AFB3003C */ sw $s3, 0x3c($sp) -/* C5C53C 80241DFC AFB20038 */ sw $s2, 0x38($sp) -/* C5C540 80241E00 AFB10034 */ sw $s1, 0x34($sp) -/* C5C544 80241E04 AFB00030 */ sw $s0, 0x30($sp) -/* C5C548 80241E08 8E920148 */ lw $s2, 0x148($s4) -/* C5C54C 80241E0C 86440008 */ lh $a0, 8($s2) -/* C5C550 80241E10 8E90000C */ lw $s0, 0xc($s4) -/* C5C554 80241E14 0C00EABB */ jal get_npc_unsafe -/* C5C558 80241E18 00A0882D */ daddu $s1, $a1, $zero -/* C5C55C 80241E1C 0280202D */ daddu $a0, $s4, $zero -/* C5C560 80241E20 8E050000 */ lw $a1, ($s0) -/* C5C564 80241E24 0C0B1EAF */ jal get_variable -/* C5C568 80241E28 0040A82D */ daddu $s5, $v0, $zero -/* C5C56C 80241E2C AFA00010 */ sw $zero, 0x10($sp) -/* C5C570 80241E30 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5C574 80241E34 8C630030 */ lw $v1, 0x30($v1) -/* C5C578 80241E38 AFA30014 */ sw $v1, 0x14($sp) -/* C5C57C 80241E3C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5C580 80241E40 8C63001C */ lw $v1, 0x1c($v1) -/* C5C584 80241E44 AFA30018 */ sw $v1, 0x18($sp) -/* C5C588 80241E48 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5C58C 80241E4C 8C630024 */ lw $v1, 0x24($v1) -/* C5C590 80241E50 AFA3001C */ sw $v1, 0x1c($sp) -/* C5C594 80241E54 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5C598 80241E58 8C630028 */ lw $v1, 0x28($v1) -/* C5C59C 80241E5C 27B30010 */ addiu $s3, $sp, 0x10 -/* C5C5A0 80241E60 AFA30020 */ sw $v1, 0x20($sp) -/* C5C5A4 80241E64 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5C5A8 80241E68 3C0142F0 */ lui $at, 0x42f0 -/* C5C5AC 80241E6C 44810000 */ mtc1 $at, $f0 -/* C5C5B0 80241E70 8C63002C */ lw $v1, 0x2c($v1) -/* C5C5B4 80241E74 0040802D */ daddu $s0, $v0, $zero -/* C5C5B8 80241E78 E7A00028 */ swc1 $f0, 0x28($sp) -/* C5C5BC 80241E7C A7A0002C */ sh $zero, 0x2c($sp) -/* C5C5C0 80241E80 12200007 */ beqz $s1, .L80241EA0 -/* C5C5C4 80241E84 AFA30024 */ sw $v1, 0x24($sp) -/* C5C5C8 80241E88 02A0202D */ daddu $a0, $s5, $zero -/* C5C5CC 80241E8C 0240282D */ daddu $a1, $s2, $zero -/* C5C5D0 80241E90 0280302D */ daddu $a2, $s4, $zero -/* C5C5D4 80241E94 0C0905B2 */ jal func_802416C8 -/* C5C5D8 80241E98 0200382D */ daddu $a3, $s0, $zero -/* C5C5DC 80241E9C AE800070 */ sw $zero, 0x70($s4) -.L80241EA0: -/* C5C5E0 80241EA0 2402FFFE */ addiu $v0, $zero, -2 -/* C5C5E4 80241EA4 A2A200AB */ sb $v0, 0xab($s5) -/* C5C5E8 80241EA8 8E4300B0 */ lw $v1, 0xb0($s2) -/* C5C5EC 80241EAC 30620004 */ andi $v0, $v1, 4 -/* C5C5F0 80241EB0 10400007 */ beqz $v0, .L80241ED0 -/* C5C5F4 80241EB4 00000000 */ nop -/* C5C5F8 80241EB8 824200B4 */ lb $v0, 0xb4($s2) -/* C5C5FC 80241EBC 1440003A */ bnez $v0, .L80241FA8 -/* C5C600 80241EC0 0000102D */ daddu $v0, $zero, $zero -/* C5C604 80241EC4 2402FFFB */ addiu $v0, $zero, -5 -/* C5C608 80241EC8 00621024 */ and $v0, $v1, $v0 -/* C5C60C 80241ECC AE4200B0 */ sw $v0, 0xb0($s2) -.L80241ED0: -/* C5C610 80241ED0 8E830070 */ lw $v1, 0x70($s4) -/* C5C614 80241ED4 2C620015 */ sltiu $v0, $v1, 0x15 -/* C5C618 80241ED8 10400032 */ beqz $v0, .L80241FA4 -/* C5C61C 80241EDC 00031080 */ sll $v0, $v1, 2 -/* C5C620 80241EE0 3C018024 */ lui $at, 0x8024 -/* C5C624 80241EE4 00220821 */ addu $at, $at, $v0 -/* C5C628 80241EE8 8C226560 */ lw $v0, 0x6560($at) -/* C5C62C 80241EEC 00400008 */ jr $v0 -/* C5C630 80241EF0 00000000 */ nop -/* C5C634 80241EF4 0280202D */ daddu $a0, $s4, $zero -/* C5C638 80241EF8 0200282D */ daddu $a1, $s0, $zero -/* C5C63C 80241EFC 0C090138 */ jal func_802404E0 -/* C5C640 80241F00 0260302D */ daddu $a2, $s3, $zero -/* C5C644 80241F04 0280202D */ daddu $a0, $s4, $zero -/* C5C648 80241F08 0200282D */ daddu $a1, $s0, $zero -/* C5C64C 80241F0C 0C0901A4 */ jal func_80240690 -/* C5C650 80241F10 0260302D */ daddu $a2, $s3, $zero -/* C5C654 80241F14 080907EA */ j .L80241FA8 -/* C5C658 80241F18 0000102D */ daddu $v0, $zero, $zero -/* C5C65C 80241F1C 0280202D */ daddu $a0, $s4, $zero -/* C5C660 80241F20 0200282D */ daddu $a1, $s0, $zero -/* C5C664 80241F24 0C09032E */ jal func_80240CB8 -/* C5C668 80241F28 0260302D */ daddu $a2, $s3, $zero -/* C5C66C 80241F2C 0280202D */ daddu $a0, $s4, $zero -/* C5C670 80241F30 0200282D */ daddu $a1, $s0, $zero -/* C5C674 80241F34 0C09035E */ jal func_80240D78 -/* C5C678 80241F38 0260302D */ daddu $a2, $s3, $zero -/* C5C67C 80241F3C 080907EA */ j .L80241FA8 -/* C5C680 80241F40 0000102D */ daddu $v0, $zero, $zero -/* C5C684 80241F44 0280202D */ daddu $a0, $s4, $zero -/* C5C688 80241F48 0200282D */ daddu $a1, $s0, $zero -/* C5C68C 80241F4C 0C09042F */ jal func_802410BC -/* C5C690 80241F50 0260302D */ daddu $a2, $s3, $zero -/* C5C694 80241F54 0280202D */ daddu $a0, $s4, $zero -/* C5C698 80241F58 0200282D */ daddu $a1, $s0, $zero -/* C5C69C 80241F5C 0C09044D */ jal func_80241134 -/* C5C6A0 80241F60 0260302D */ daddu $a2, $s3, $zero -/* C5C6A4 80241F64 080907EA */ j .L80241FA8 -/* C5C6A8 80241F68 0000102D */ daddu $v0, $zero, $zero -/* C5C6AC 80241F6C 0280202D */ daddu $a0, $s4, $zero -/* C5C6B0 80241F70 0200282D */ daddu $a1, $s0, $zero -/* C5C6B4 80241F74 0C090676 */ jal func_802419D8 -/* C5C6B8 80241F78 0260302D */ daddu $a2, $s3, $zero -/* C5C6BC 80241F7C 0280202D */ daddu $a0, $s4, $zero -/* C5C6C0 80241F80 0200282D */ daddu $a1, $s0, $zero -/* C5C6C4 80241F84 0C0906C2 */ jal func_80241B08 -/* C5C6C8 80241F88 0260302D */ daddu $a2, $s3, $zero -/* C5C6CC 80241F8C 080907EA */ j .L80241FA8 -/* C5C6D0 80241F90 0000102D */ daddu $v0, $zero, $zero -/* C5C6D4 80241F94 0280202D */ daddu $a0, $s4, $zero -/* C5C6D8 80241F98 0200282D */ daddu $a1, $s0, $zero -/* C5C6DC 80241F9C 0C090762 */ jal func_80241D88 -/* C5C6E0 80241FA0 0260302D */ daddu $a2, $s3, $zero -.L80241FA4: -/* C5C6E4 80241FA4 0000102D */ daddu $v0, $zero, $zero -.L80241FA8: -/* C5C6E8 80241FA8 8FBF0048 */ lw $ra, 0x48($sp) -/* C5C6EC 80241FAC 8FB50044 */ lw $s5, 0x44($sp) -/* C5C6F0 80241FB0 8FB40040 */ lw $s4, 0x40($sp) -/* C5C6F4 80241FB4 8FB3003C */ lw $s3, 0x3c($sp) -/* C5C6F8 80241FB8 8FB20038 */ lw $s2, 0x38($sp) -/* C5C6FC 80241FBC 8FB10034 */ lw $s1, 0x34($sp) -/* C5C700 80241FC0 8FB00030 */ lw $s0, 0x30($sp) -/* C5C704 80241FC4 03E00008 */ jr $ra -/* C5C708 80241FC8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_80241FCC_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_80241FCC_C5A740.s deleted file mode 100644 index 94c92b769e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_80241FCC_C5A740.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FCC_C5C70C -/* C5C70C 80241FCC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C5C710 80241FD0 AFB00010 */ sw $s0, 0x10($sp) -/* C5C714 80241FD4 3C108024 */ lui $s0, 0x8024 -/* C5C718 80241FD8 26104A10 */ addiu $s0, $s0, 0x4a10 -/* C5C71C 80241FDC AFBF0018 */ sw $ra, 0x18($sp) -/* C5C720 80241FE0 AFB10014 */ sw $s1, 0x14($sp) -/* C5C724 80241FE4 8E020000 */ lw $v0, ($s0) -/* C5C728 80241FE8 14400010 */ bnez $v0, .L8024202C -/* C5C72C 80241FEC 0080882D */ daddu $s1, $a0, $zero -/* C5C730 80241FF0 0C00AB39 */ jal heap_malloc -/* C5C734 80241FF4 24040040 */ addiu $a0, $zero, 0x40 -/* C5C738 80241FF8 AE020000 */ sw $v0, ($s0) -/* C5C73C 80241FFC 0000182D */ daddu $v1, $zero, $zero -/* C5C740 80242000 0040282D */ daddu $a1, $v0, $zero -/* C5C744 80242004 0220202D */ daddu $a0, $s1, $zero -.L80242008: -/* C5C748 80242008 8C820084 */ lw $v0, 0x84($a0) -/* C5C74C 8024200C 24840004 */ addiu $a0, $a0, 4 -/* C5C750 80242010 24630001 */ addiu $v1, $v1, 1 -/* C5C754 80242014 ACA20000 */ sw $v0, ($a1) -/* C5C758 80242018 28620010 */ slti $v0, $v1, 0x10 -/* C5C75C 8024201C 1440FFFA */ bnez $v0, .L80242008 -/* C5C760 80242020 24A50004 */ addiu $a1, $a1, 4 -/* C5C764 80242024 0809081A */ j .L80242068 -/* C5C768 80242028 00000000 */ nop -.L8024202C: -/* C5C76C 8024202C 0000182D */ daddu $v1, $zero, $zero -/* C5C770 80242030 0040282D */ daddu $a1, $v0, $zero -/* C5C774 80242034 0220202D */ daddu $a0, $s1, $zero -.L80242038: -/* C5C778 80242038 8CA20000 */ lw $v0, ($a1) -/* C5C77C 8024203C 24A50004 */ addiu $a1, $a1, 4 -/* C5C780 80242040 24630001 */ addiu $v1, $v1, 1 -/* C5C784 80242044 AC820084 */ sw $v0, 0x84($a0) -/* C5C788 80242048 28620010 */ slti $v0, $v1, 0x10 -/* C5C78C 8024204C 1440FFFA */ bnez $v0, .L80242038 -/* C5C790 80242050 24840004 */ addiu $a0, $a0, 4 -/* C5C794 80242054 3C108024 */ lui $s0, 0x8024 -/* C5C798 80242058 26104A10 */ addiu $s0, $s0, 0x4a10 -/* C5C79C 8024205C 0C00AB4B */ jal heap_free -/* C5C7A0 80242060 8E040000 */ lw $a0, ($s0) -/* C5C7A4 80242064 AE000000 */ sw $zero, ($s0) -.L80242068: -/* C5C7A8 80242068 8FBF0018 */ lw $ra, 0x18($sp) -/* C5C7AC 8024206C 8FB10014 */ lw $s1, 0x14($sp) -/* C5C7B0 80242070 8FB00010 */ lw $s0, 0x10($sp) -/* C5C7B4 80242074 24020002 */ addiu $v0, $zero, 2 -/* C5C7B8 80242078 03E00008 */ jr $ra -/* C5C7BC 8024207C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_80242080_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_80242080_C5A740.s deleted file mode 100644 index be74099cea..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_80242080_C5A740.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242080_C5C7C0 -/* C5C7C0 80242080 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C5C7C4 80242084 AFB00010 */ sw $s0, 0x10($sp) -/* C5C7C8 80242088 0080802D */ daddu $s0, $a0, $zero -/* C5C7CC 8024208C AFBF0018 */ sw $ra, 0x18($sp) -/* C5C7D0 80242090 AFB10014 */ sw $s1, 0x14($sp) -/* C5C7D4 80242094 8E02000C */ lw $v0, 0xc($s0) -/* C5C7D8 80242098 8C510000 */ lw $s1, ($v0) -/* C5C7DC 8024209C 0C0B1EAF */ jal get_variable -/* C5C7E0 802420A0 0220282D */ daddu $a1, $s1, $zero -/* C5C7E4 802420A4 3C03FFF0 */ lui $v1, 0xfff0 -/* C5C7E8 802420A8 3463FFFF */ ori $v1, $v1, 0xffff -/* C5C7EC 802420AC 0200202D */ daddu $a0, $s0, $zero -/* C5C7F0 802420B0 00431024 */ and $v0, $v0, $v1 -/* C5C7F4 802420B4 00021140 */ sll $v0, $v0, 5 -/* C5C7F8 802420B8 3C068008 */ lui $a2, %hi(gItemTable) -/* C5C7FC 802420BC 00C23021 */ addu $a2, $a2, $v0 -/* C5C800 802420C0 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* C5C804 802420C4 0C0B2026 */ jal set_variable -/* C5C808 802420C8 0220282D */ daddu $a1, $s1, $zero -/* C5C80C 802420CC 8FBF0018 */ lw $ra, 0x18($sp) -/* C5C810 802420D0 8FB10014 */ lw $s1, 0x14($sp) -/* C5C814 802420D4 8FB00010 */ lw $s0, 0x10($sp) -/* C5C818 802420D8 24020002 */ addiu $v0, $zero, 2 -/* C5C81C 802420DC 03E00008 */ jr $ra -/* C5C820 802420E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_802420E4_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_802420E4_C5A740.s deleted file mode 100644 index 4f2a67ce2a..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_802420E4_C5A740.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420E4_C5C824 -/* C5C824 802420E4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C5C828 802420E8 AFB10014 */ sw $s1, 0x14($sp) -/* C5C82C 802420EC 0080882D */ daddu $s1, $a0, $zero -/* C5C830 802420F0 AFBF0018 */ sw $ra, 0x18($sp) -/* C5C834 802420F4 AFB00010 */ sw $s0, 0x10($sp) -/* C5C838 802420F8 8E30000C */ lw $s0, 0xc($s1) -/* C5C83C 802420FC 8E050000 */ lw $a1, ($s0) -/* C5C840 80242100 0C0B1EAF */ jal get_variable -/* C5C844 80242104 26100004 */ addiu $s0, $s0, 4 -/* C5C848 80242108 0C00EAD2 */ jal get_npc_safe -/* C5C84C 8024210C 0040202D */ daddu $a0, $v0, $zero -/* C5C850 80242110 10400005 */ beqz $v0, .L80242128 -/* C5C854 80242114 00000000 */ nop -/* C5C858 80242118 8E050000 */ lw $a1, ($s0) -/* C5C85C 8024211C 844600A8 */ lh $a2, 0xa8($v0) -/* C5C860 80242120 0C0B2026 */ jal set_variable -/* C5C864 80242124 0220202D */ daddu $a0, $s1, $zero -.L80242128: -/* C5C868 80242128 8FBF0018 */ lw $ra, 0x18($sp) -/* C5C86C 8024212C 8FB10014 */ lw $s1, 0x14($sp) -/* C5C870 80242130 8FB00010 */ lw $s0, 0x10($sp) -/* C5C874 80242134 24020002 */ addiu $v0, $zero, 2 -/* C5C878 80242138 03E00008 */ jr $ra -/* C5C87C 8024213C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_80242438_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_80242438_C5A740.s deleted file mode 100644 index 94e730485e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_80242438_C5A740.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242438_C5CB78 -/* C5CB78 80242438 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C5CB7C 8024243C AFB10014 */ sw $s1, 0x14($sp) -/* C5CB80 80242440 0080882D */ daddu $s1, $a0, $zero -/* C5CB84 80242444 AFBF0018 */ sw $ra, 0x18($sp) -/* C5CB88 80242448 AFB00010 */ sw $s0, 0x10($sp) -/* C5CB8C 8024244C 8E30000C */ lw $s0, 0xc($s1) -/* C5CB90 80242450 8E050000 */ lw $a1, ($s0) -/* C5CB94 80242454 0C0B1EAF */ jal get_variable -/* C5CB98 80242458 26100004 */ addiu $s0, $s0, 4 -/* C5CB9C 8024245C AE22008C */ sw $v0, 0x8c($s1) -/* C5CBA0 80242460 8E050000 */ lw $a1, ($s0) -/* C5CBA4 80242464 26100004 */ addiu $s0, $s0, 4 -/* C5CBA8 80242468 0C0B1EAF */ jal get_variable -/* C5CBAC 8024246C 0220202D */ daddu $a0, $s1, $zero -/* C5CBB0 80242470 AE220090 */ sw $v0, 0x90($s1) -/* C5CBB4 80242474 8E050000 */ lw $a1, ($s0) -/* C5CBB8 80242478 26100004 */ addiu $s0, $s0, 4 -/* C5CBBC 8024247C 0C0B1EAF */ jal get_variable -/* C5CBC0 80242480 0220202D */ daddu $a0, $s1, $zero -/* C5CBC4 80242484 AE220094 */ sw $v0, 0x94($s1) -/* C5CBC8 80242488 8E050000 */ lw $a1, ($s0) -/* C5CBCC 8024248C 26100004 */ addiu $s0, $s0, 4 -/* C5CBD0 80242490 0C0B1EAF */ jal get_variable -/* C5CBD4 80242494 0220202D */ daddu $a0, $s1, $zero -/* C5CBD8 80242498 AE220098 */ sw $v0, 0x98($s1) -/* C5CBDC 8024249C 8E050000 */ lw $a1, ($s0) -/* C5CBE0 802424A0 26100004 */ addiu $s0, $s0, 4 -/* C5CBE4 802424A4 0C0B1EAF */ jal get_variable -/* C5CBE8 802424A8 0220202D */ daddu $a0, $s1, $zero -/* C5CBEC 802424AC AE22009C */ sw $v0, 0x9c($s1) -/* C5CBF0 802424B0 8E050000 */ lw $a1, ($s0) -/* C5CBF4 802424B4 26100004 */ addiu $s0, $s0, 4 -/* C5CBF8 802424B8 0C0B1EAF */ jal get_variable -/* C5CBFC 802424BC 0220202D */ daddu $a0, $s1, $zero -/* C5CC00 802424C0 AE2200A0 */ sw $v0, 0xa0($s1) -/* C5CC04 802424C4 8E050000 */ lw $a1, ($s0) -/* C5CC08 802424C8 26100004 */ addiu $s0, $s0, 4 -/* C5CC0C 802424CC 0C0B1EAF */ jal get_variable -/* C5CC10 802424D0 0220202D */ daddu $a0, $s1, $zero -/* C5CC14 802424D4 AE2200A4 */ sw $v0, 0xa4($s1) -/* C5CC18 802424D8 8E050000 */ lw $a1, ($s0) -/* C5CC1C 802424DC 26100004 */ addiu $s0, $s0, 4 -/* C5CC20 802424E0 0C0B1EAF */ jal get_variable -/* C5CC24 802424E4 0220202D */ daddu $a0, $s1, $zero -/* C5CC28 802424E8 AE2200A8 */ sw $v0, 0xa8($s1) -/* C5CC2C 802424EC 8E050000 */ lw $a1, ($s0) -/* C5CC30 802424F0 26100004 */ addiu $s0, $s0, 4 -/* C5CC34 802424F4 0C0B1EAF */ jal get_variable -/* C5CC38 802424F8 0220202D */ daddu $a0, $s1, $zero -/* C5CC3C 802424FC AE2200AC */ sw $v0, 0xac($s1) -/* C5CC40 80242500 8E050000 */ lw $a1, ($s0) -/* C5CC44 80242504 0C0B1EAF */ jal get_variable -/* C5CC48 80242508 0220202D */ daddu $a0, $s1, $zero -/* C5CC4C 8024250C AE2200B0 */ sw $v0, 0xb0($s1) -/* C5CC50 80242510 8FBF0018 */ lw $ra, 0x18($sp) -/* C5CC54 80242514 8FB10014 */ lw $s1, 0x14($sp) -/* C5CC58 80242518 8FB00010 */ lw $s0, 0x10($sp) -/* C5CC5C 8024251C 24020002 */ addiu $v0, $zero, 2 -/* C5CC60 80242520 03E00008 */ jr $ra -/* C5CC64 80242524 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/func_80242730_C5A740.s b/asm/nonmatchings/world/area_kzn/kzn_02/func_80242730_C5A740.s deleted file mode 100644 index def45d9b64..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/func_80242730_C5A740.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242730_C5CE70 -/* C5CE70 80242730 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C5CE74 80242734 3C048024 */ lui $a0, 0x8024 -/* C5CE78 80242738 248464A4 */ addiu $a0, $a0, 0x64a4 -/* C5CE7C 8024273C AFBF0018 */ sw $ra, 0x18($sp) -/* C5CE80 80242740 AFB10014 */ sw $s1, 0x14($sp) -/* C5CE84 80242744 AFB00010 */ sw $s0, 0x10($sp) -/* C5CE88 80242748 F7B40020 */ sdc1 $f20, 0x20($sp) -/* C5CE8C 8024274C 8C830000 */ lw $v1, ($a0) -/* C5CE90 80242750 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* C5CE94 80242754 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* C5CE98 80242758 28620003 */ slti $v0, $v1, 3 -/* C5CE9C 8024275C 50400007 */ beql $v0, $zero, .L8024277C -/* C5CEA0 80242760 24020003 */ addiu $v0, $zero, 3 -/* C5CEA4 80242764 1C60000C */ bgtz $v1, .L80242798 -/* C5CEA8 80242768 24620001 */ addiu $v0, $v1, 1 -/* C5CEAC 8024276C 10600007 */ beqz $v1, .L8024278C -/* C5CEB0 80242770 0000102D */ daddu $v0, $zero, $zero -/* C5CEB4 80242774 08090A02 */ j .L80242808 -/* C5CEB8 80242778 00000000 */ nop -.L8024277C: -/* C5CEBC 8024277C 10620008 */ beq $v1, $v0, .L802427A0 -/* C5CEC0 80242780 0000102D */ daddu $v0, $zero, $zero -/* C5CEC4 80242784 08090A02 */ j .L80242808 -/* C5CEC8 80242788 00000000 */ nop -.L8024278C: -/* C5CECC 8024278C 24020001 */ addiu $v0, $zero, 1 -/* C5CED0 80242790 08090A01 */ j .L80242804 -/* C5CED4 80242794 AC820000 */ sw $v0, ($a0) -.L80242798: -/* C5CED8 80242798 08090A01 */ j .L80242804 -/* C5CEDC 8024279C AC820000 */ sw $v0, ($a0) -.L802427A0: -/* C5CEE0 802427A0 3C108011 */ lui $s0, 0x8011 -/* C5CEE4 802427A4 2610C930 */ addiu $s0, $s0, -0x36d0 -/* C5CEE8 802427A8 0C03BD17 */ jal clear_partner_move_history -/* C5CEEC 802427AC 8E040000 */ lw $a0, ($s0) -/* C5CEF0 802427B0 C6200028 */ lwc1 $f0, 0x28($s1) -/* C5CEF4 802427B4 C6220030 */ lwc1 $f2, 0x30($s1) -/* C5CEF8 802427B8 4600010D */ trunc.w.s $f4, $f0 -/* C5CEFC 802427BC 44042000 */ mfc1 $a0, $f4 -/* C5CF00 802427C0 4600110D */ trunc.w.s $f4, $f2 -/* C5CF04 802427C4 44052000 */ mfc1 $a1, $f4 -/* C5CF08 802427C8 0C03BCF0 */ jal func_800EF3C0 -/* C5CF0C 802427CC 00000000 */ nop -/* C5CF10 802427D0 0C03BCF5 */ jal func_800EF3D4 -/* C5CF14 802427D4 0000202D */ daddu $a0, $zero, $zero -/* C5CF18 802427D8 3C0142B4 */ lui $at, 0x42b4 -/* C5CF1C 802427DC 4481A000 */ mtc1 $at, $f20 -/* C5CF20 802427E0 8E040000 */ lw $a0, ($s0) -/* C5CF24 802427E4 4405A000 */ mfc1 $a1, $f20 -/* C5CF28 802427E8 0C00ECD0 */ jal set_npc_yaw -/* C5CF2C 802427EC 00000000 */ nop -/* C5CF30 802427F0 24020002 */ addiu $v0, $zero, 2 -/* C5CF34 802427F4 E6340080 */ swc1 $f20, 0x80($s1) -/* C5CF38 802427F8 E6340084 */ swc1 $f20, 0x84($s1) -/* C5CF3C 802427FC 08090A02 */ j .L80242808 -/* C5CF40 80242800 AE2000A8 */ sw $zero, 0xa8($s1) -.L80242804: -/* C5CF44 80242804 0000102D */ daddu $v0, $zero, $zero -.L80242808: -/* C5CF48 80242808 8FBF0018 */ lw $ra, 0x18($sp) -/* C5CF4C 8024280C 8FB10014 */ lw $s1, 0x14($sp) -/* C5CF50 80242810 8FB00010 */ lw $s0, 0x10($sp) -/* C5CF54 80242814 D7B40020 */ ldc1 $f20, 0x20($sp) -/* C5CF58 80242818 03E00008 */ jr $ra -/* C5CF5C 8024281C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240124_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80240124_C60D10.s deleted file mode 100644 index 868f3a676e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240124_C60D10.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C60E34 -/* C60E34 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C60E38 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C60E3C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C60E40 80240130 10A00005 */ beqz $a1, .L80240148 -/* C60E44 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C60E48 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C60E4C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C60E50 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C60E54 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C60E58 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C60E5C 8024014C 1440000E */ bnez $v0, .L80240188 -/* C60E60 80240150 00000000 */ nop -/* C60E64 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C60E68 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C60E6C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C60E70 80240160 04610004 */ bgez $v1, .L80240174 -/* C60E74 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C60E78 80240168 3C020002 */ lui $v0, 2 -/* C60E7C 8024016C 08090061 */ j .L80240184 -/* C60E80 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C60E84 80240174 3C040002 */ lui $a0, 2 -/* C60E88 80240178 0083102A */ slt $v0, $a0, $v1 -/* C60E8C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C60E90 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C60E94 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C60E98 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C60E9C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C60EA0 80240190 00000000 */ nop -/* C60EA4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C60EA8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C60EAC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C60EB0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C60EB4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C60EB8 802401A8 3C020002 */ lui $v0, 2 -/* C60EBC 802401AC 08090071 */ j .L802401C4 -/* C60EC0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C60EC4 802401B4 3C040002 */ lui $a0, 2 -/* C60EC8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C60ECC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C60ED0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C60ED4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C60ED8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C60EDC 802401CC 1440000E */ bnez $v0, .L80240208 -/* C60EE0 802401D0 00000000 */ nop -/* C60EE4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C60EE8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C60EEC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C60EF0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C60EF4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C60EF8 802401E8 3C020002 */ lui $v0, 2 -/* C60EFC 802401EC 08090081 */ j .L80240204 -/* C60F00 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C60F04 802401F4 3C040002 */ lui $a0, 2 -/* C60F08 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C60F0C 802401FC 10400002 */ beqz $v0, .L80240208 -/* C60F10 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C60F14 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C60F18 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C60F1C 8024020C 1440000E */ bnez $v0, .L80240248 -/* C60F20 80240210 00000000 */ nop -/* C60F24 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C60F28 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C60F2C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C60F30 80240220 04610004 */ bgez $v1, .L80240234 -/* C60F34 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C60F38 80240228 3C020002 */ lui $v0, 2 -/* C60F3C 8024022C 08090091 */ j .L80240244 -/* C60F40 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C60F44 80240234 3C040002 */ lui $a0, 2 -/* C60F48 80240238 0083102A */ slt $v0, $a0, $v1 -/* C60F4C 8024023C 10400002 */ beqz $v0, .L80240248 -/* C60F50 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C60F54 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C60F58 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C60F5C 8024024C 0C046F07 */ jal set_main_pan_u -/* C60F60 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C60F64 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C60F68 80240258 0C046F0D */ jal set_main_pan_v -/* C60F6C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C60F70 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C60F74 80240264 0C046F13 */ jal set_aux_pan_u -/* C60F78 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C60F7C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C60F80 80240270 0C046F19 */ jal set_aux_pan_v -/* C60F84 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C60F88 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C60F8C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C60F90 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C60F94 80240284 24420001 */ addiu $v0, $v0, 1 -/* C60F98 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C60F9C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C60FA0 80240290 24630001 */ addiu $v1, $v1, 1 -/* C60FA4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C60FA8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C60FAC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C60FB0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C60FB4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C60FB8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C60FBC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C60FC0 802402B0 14600002 */ bnez $v1, .L802402BC -/* C60FC4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C60FC8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C60FCC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C60FD0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C60FD4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C60FD8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C60FDC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C60FE0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C60FE4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C60FE8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C60FEC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C60FF0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C60FF4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C60FF8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C60FFC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C61000 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C61004 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C61008 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C6100C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C61010 80240300 0000102D */ daddu $v0, $zero, $zero -/* C61014 80240304 03E00008 */ jr $ra -/* C61018 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C6101C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240310_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80240310_C60D10.s deleted file mode 100644 index 533f7dfabf..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240310_C60D10.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_C61020 -/* C61020 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C61024 80240314 AFB20018 */ sw $s2, 0x18($sp) -/* C61028 80240318 0080902D */ daddu $s2, $a0, $zero -/* C6102C 8024031C AFBF001C */ sw $ra, 0x1c($sp) -/* C61030 80240320 AFB10014 */ sw $s1, 0x14($sp) -/* C61034 80240324 AFB00010 */ sw $s0, 0x10($sp) -/* C61038 80240328 8E510148 */ lw $s1, 0x148($s2) -/* C6103C 8024032C 0C00EABB */ jal get_npc_unsafe -/* C61040 80240330 86240008 */ lh $a0, 8($s1) -/* C61044 80240334 0040802D */ daddu $s0, $v0, $zero -/* C61048 80240338 8E2300CC */ lw $v1, 0xcc($s1) -/* C6104C 8024033C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C61050 80240340 8C630020 */ lw $v1, 0x20($v1) -/* C61054 80240344 AE030028 */ sw $v1, 0x28($s0) -/* C61058 80240348 96220076 */ lhu $v0, 0x76($s1) -/* C6105C 8024034C A602008E */ sh $v0, 0x8e($s0) -/* C61060 80240350 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C61064 80240354 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C61068 80240358 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C6106C 8024035C 8C460028 */ lw $a2, 0x28($v0) -/* C61070 80240360 0C00A720 */ jal atan2 -/* C61074 80240364 8C470030 */ lw $a3, 0x30($v0) -/* C61078 80240368 2402000D */ addiu $v0, $zero, 0xd -/* C6107C 8024036C E600000C */ swc1 $f0, 0xc($s0) -/* C61080 80240370 AE420070 */ sw $v0, 0x70($s2) -/* C61084 80240374 8FBF001C */ lw $ra, 0x1c($sp) -/* C61088 80240378 8FB20018 */ lw $s2, 0x18($sp) -/* C6108C 8024037C 8FB10014 */ lw $s1, 0x14($sp) -/* C61090 80240380 8FB00010 */ lw $s0, 0x10($sp) -/* C61094 80240384 03E00008 */ jr $ra -/* C61098 80240388 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_8024038C_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_8024038C_C60D10.s deleted file mode 100644 index 0be5825a43..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_8024038C_C60D10.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024038C_C6109C -/* C6109C 8024038C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C610A0 80240390 AFB3001C */ sw $s3, 0x1c($sp) -/* C610A4 80240394 0080982D */ daddu $s3, $a0, $zero -/* C610A8 80240398 AFBF0020 */ sw $ra, 0x20($sp) -/* C610AC 8024039C AFB20018 */ sw $s2, 0x18($sp) -/* C610B0 802403A0 AFB10014 */ sw $s1, 0x14($sp) -/* C610B4 802403A4 AFB00010 */ sw $s0, 0x10($sp) -/* C610B8 802403A8 8E710148 */ lw $s1, 0x148($s3) -/* C610BC 802403AC 86240008 */ lh $a0, 8($s1) -/* C610C0 802403B0 0C00EABB */ jal get_npc_unsafe -/* C610C4 802403B4 00A0902D */ daddu $s2, $a1, $zero -/* C610C8 802403B8 0040802D */ daddu $s0, $v0, $zero -/* C610CC 802403BC 8602008E */ lh $v0, 0x8e($s0) -/* C610D0 802403C0 9603008E */ lhu $v1, 0x8e($s0) -/* C610D4 802403C4 18400005 */ blez $v0, .L802403DC -/* C610D8 802403C8 2462FFFF */ addiu $v0, $v1, -1 -/* C610DC 802403CC A602008E */ sh $v0, 0x8e($s0) -/* C610E0 802403D0 00021400 */ sll $v0, $v0, 0x10 -/* C610E4 802403D4 1C400033 */ bgtz $v0, .L802404A4 -/* C610E8 802403D8 00000000 */ nop -.L802403DC: -/* C610EC 802403DC 8602008C */ lh $v0, 0x8c($s0) -/* C610F0 802403E0 14400030 */ bnez $v0, .L802404A4 -/* C610F4 802403E4 00000000 */ nop -/* C610F8 802403E8 8E2200CC */ lw $v0, 0xcc($s1) -/* C610FC 802403EC 8C420024 */ lw $v0, 0x24($v0) -/* C61100 802403F0 AE020028 */ sw $v0, 0x28($s0) -/* C61104 802403F4 C6400018 */ lwc1 $f0, 0x18($s2) -/* C61108 802403F8 E6000018 */ swc1 $f0, 0x18($s0) -/* C6110C 802403FC 8E230088 */ lw $v1, 0x88($s1) -/* C61110 80240400 24020005 */ addiu $v0, $zero, 5 -/* C61114 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* C61118 80240408 00000000 */ nop -/* C6111C 8024040C 10600003 */ beqz $v1, .L8024041C -/* C61120 80240410 24020001 */ addiu $v0, $zero, 1 -/* C61124 80240414 14620006 */ bne $v1, $v0, .L80240430 -/* C61128 80240418 00000000 */ nop -.L8024041C: -/* C6112C 8024041C 8E220084 */ lw $v0, 0x84($s1) -/* C61130 80240420 00021FC2 */ srl $v1, $v0, 0x1f -/* C61134 80240424 00431021 */ addu $v0, $v0, $v1 -/* C61138 80240428 00021043 */ sra $v0, $v0, 1 -/* C6113C 8024042C A60200A8 */ sh $v0, 0xa8($s0) -.L80240430: -/* C61140 80240430 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C61144 80240434 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C61148 80240438 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C6114C 8024043C C60E0040 */ lwc1 $f14, 0x40($s0) -/* C61150 80240440 8C460028 */ lw $a2, 0x28($v0) -/* C61154 80240444 0C00A7B5 */ jal dist2D -/* C61158 80240448 8C470030 */ lw $a3, 0x30($v0) -/* C6115C 8024044C C6020018 */ lwc1 $f2, 0x18($s0) -/* C61160 80240450 46020003 */ div.s $f0, $f0, $f2 -/* C61164 80240454 3C018024 */ lui $at, 0x8024 -/* C61168 80240458 D42271E0 */ ldc1 $f2, 0x71e0($at) -/* C6116C 8024045C 46000021 */ cvt.d.s $f0, $f0 -/* C61170 80240460 46220000 */ add.d $f0, $f0, $f2 -/* C61174 80240464 4620010D */ trunc.w.d $f4, $f0 -/* C61178 80240468 44022000 */ mfc1 $v0, $f4 -/* C6117C 8024046C 00000000 */ nop -/* C61180 80240470 A602008E */ sh $v0, 0x8e($s0) -/* C61184 80240474 00021400 */ sll $v0, $v0, 0x10 -/* C61188 80240478 8E230078 */ lw $v1, 0x78($s1) -/* C6118C 8024047C 00021403 */ sra $v0, $v0, 0x10 -/* C61190 80240480 0043102A */ slt $v0, $v0, $v1 -/* C61194 80240484 10400003 */ beqz $v0, .L80240494 -/* C61198 80240488 00000000 */ nop -/* C6119C 8024048C 9622007A */ lhu $v0, 0x7a($s1) -/* C611A0 80240490 A602008E */ sh $v0, 0x8e($s0) -.L80240494: -/* C611A4 80240494 8602008E */ lh $v0, 0x8e($s0) -/* C611A8 80240498 AE22007C */ sw $v0, 0x7c($s1) -/* C611AC 8024049C 2402000E */ addiu $v0, $zero, 0xe -/* C611B0 802404A0 AE620070 */ sw $v0, 0x70($s3) -.L802404A4: -/* C611B4 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* C611B8 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* C611BC 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* C611C0 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* C611C4 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* C611C8 802404B8 03E00008 */ jr $ra -/* C611CC 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_802404C0_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_802404C0_C60D10.s deleted file mode 100644 index e86c7a57d6..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_802404C0_C60D10.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_C611D0 -/* C611D0 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C611D4 802404C4 AFB3003C */ sw $s3, 0x3c($sp) -/* C611D8 802404C8 0080982D */ daddu $s3, $a0, $zero -/* C611DC 802404CC AFBF0040 */ sw $ra, 0x40($sp) -/* C611E0 802404D0 AFB20038 */ sw $s2, 0x38($sp) -/* C611E4 802404D4 AFB10034 */ sw $s1, 0x34($sp) -/* C611E8 802404D8 AFB00030 */ sw $s0, 0x30($sp) -/* C611EC 802404DC 8E710148 */ lw $s1, 0x148($s3) -/* C611F0 802404E0 0C00EABB */ jal get_npc_unsafe -/* C611F4 802404E4 86240008 */ lh $a0, 8($s1) -/* C611F8 802404E8 0040802D */ daddu $s0, $v0, $zero -/* C611FC 802404EC 8E22007C */ lw $v0, 0x7c($s1) -/* C61200 802404F0 8603008E */ lh $v1, 0x8e($s0) -/* C61204 802404F4 2442FFFF */ addiu $v0, $v0, -1 -/* C61208 802404F8 14620012 */ bne $v1, $v0, .L80240544 -/* C6120C 802404FC 00000000 */ nop -/* C61210 80240500 C6000038 */ lwc1 $f0, 0x38($s0) -/* C61214 80240504 4600020D */ trunc.w.s $f8, $f0 -/* C61218 80240508 44024000 */ mfc1 $v0, $f8 -/* C6121C 8024050C 00000000 */ nop -/* C61220 80240510 A6220010 */ sh $v0, 0x10($s1) -/* C61224 80240514 C600003C */ lwc1 $f0, 0x3c($s0) -/* C61228 80240518 4600020D */ trunc.w.s $f8, $f0 -/* C6122C 8024051C 44024000 */ mfc1 $v0, $f8 -/* C61230 80240520 00000000 */ nop -/* C61234 80240524 A6220012 */ sh $v0, 0x12($s1) -/* C61238 80240528 C6000040 */ lwc1 $f0, 0x40($s0) -/* C6123C 8024052C 24020001 */ addiu $v0, $zero, 1 -/* C61240 80240530 A2220007 */ sb $v0, 7($s1) -/* C61244 80240534 4600020D */ trunc.w.s $f8, $f0 -/* C61248 80240538 44024000 */ mfc1 $v0, $f8 -/* C6124C 8024053C 00000000 */ nop -/* C61250 80240540 A6220014 */ sh $v0, 0x14($s1) -.L80240544: -/* C61254 80240544 C6000038 */ lwc1 $f0, 0x38($s0) -/* C61258 80240548 C602003C */ lwc1 $f2, 0x3c($s0) -/* C6125C 8024054C C6040040 */ lwc1 $f4, 0x40($s0) -/* C61260 80240550 C6060018 */ lwc1 $f6, 0x18($s0) -/* C61264 80240554 E7A00020 */ swc1 $f0, 0x20($sp) -/* C61268 80240558 E7A20024 */ swc1 $f2, 0x24($sp) -/* C6126C 8024055C E7A40028 */ swc1 $f4, 0x28($sp) -/* C61270 80240560 E7A60010 */ swc1 $f6, 0x10($sp) -/* C61274 80240564 C600000C */ lwc1 $f0, 0xc($s0) -/* C61278 80240568 E7A00014 */ swc1 $f0, 0x14($sp) -/* C6127C 8024056C 860200A8 */ lh $v0, 0xa8($s0) -/* C61280 80240570 27A50020 */ addiu $a1, $sp, 0x20 -/* C61284 80240574 44820000 */ mtc1 $v0, $f0 -/* C61288 80240578 00000000 */ nop -/* C6128C 8024057C 46800020 */ cvt.s.w $f0, $f0 -/* C61290 80240580 E7A00018 */ swc1 $f0, 0x18($sp) -/* C61294 80240584 860200A6 */ lh $v0, 0xa6($s0) -/* C61298 80240588 27A60024 */ addiu $a2, $sp, 0x24 -/* C6129C 8024058C 44820000 */ mtc1 $v0, $f0 -/* C612A0 80240590 00000000 */ nop -/* C612A4 80240594 46800020 */ cvt.s.w $f0, $f0 -/* C612A8 80240598 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C612AC 8024059C 8E040080 */ lw $a0, 0x80($s0) -/* C612B0 802405A0 0C037711 */ jal func_800DDC44 -/* C612B4 802405A4 27A70028 */ addiu $a3, $sp, 0x28 -/* C612B8 802405A8 0040902D */ daddu $s2, $v0, $zero -/* C612BC 802405AC 16400005 */ bnez $s2, .L802405C4 -/* C612C0 802405B0 00000000 */ nop -/* C612C4 802405B4 8E050018 */ lw $a1, 0x18($s0) -/* C612C8 802405B8 8E06000C */ lw $a2, 0xc($s0) -/* C612CC 802405BC 0C00EA95 */ jal npc_move_heading -/* C612D0 802405C0 0200202D */ daddu $a0, $s0, $zero -.L802405C4: -/* C612D4 802405C4 8602008E */ lh $v0, 0x8e($s0) -/* C612D8 802405C8 9603008E */ lhu $v1, 0x8e($s0) -/* C612DC 802405CC 18400007 */ blez $v0, .L802405EC -/* C612E0 802405D0 2462FFFF */ addiu $v0, $v1, -1 -/* C612E4 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* C612E8 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* C612EC 802405DC 18400003 */ blez $v0, .L802405EC -/* C612F0 802405E0 00000000 */ nop -/* C612F4 802405E4 12400008 */ beqz $s2, .L80240608 -/* C612F8 802405E8 00000000 */ nop -.L802405EC: -/* C612FC 802405EC 8E2200CC */ lw $v0, 0xcc($s1) -/* C61300 802405F0 A2200007 */ sb $zero, 7($s1) -/* C61304 802405F4 8C420028 */ lw $v0, 0x28($v0) -/* C61308 802405F8 A600008E */ sh $zero, 0x8e($s0) -/* C6130C 802405FC AE020028 */ sw $v0, 0x28($s0) -/* C61310 80240600 2402000F */ addiu $v0, $zero, 0xf -/* C61314 80240604 AE620070 */ sw $v0, 0x70($s3) -.L80240608: -/* C61318 80240608 8FBF0040 */ lw $ra, 0x40($sp) -/* C6131C 8024060C 8FB3003C */ lw $s3, 0x3c($sp) -/* C61320 80240610 8FB20038 */ lw $s2, 0x38($sp) -/* C61324 80240614 8FB10034 */ lw $s1, 0x34($sp) -/* C61328 80240618 8FB00030 */ lw $s0, 0x30($sp) -/* C6132C 8024061C 03E00008 */ jr $ra -/* C61330 80240620 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240624_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80240624_C60D10.s deleted file mode 100644 index 27e1fb0274..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240624_C60D10.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240624_C61334 -/* C61334 80240624 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C61338 80240628 AFB10014 */ sw $s1, 0x14($sp) -/* C6133C 8024062C 0080882D */ daddu $s1, $a0, $zero -/* C61340 80240630 AFBF0018 */ sw $ra, 0x18($sp) -/* C61344 80240634 AFB00010 */ sw $s0, 0x10($sp) -/* C61348 80240638 8E300148 */ lw $s0, 0x148($s1) -/* C6134C 8024063C 0C00EABB */ jal get_npc_unsafe -/* C61350 80240640 86040008 */ lh $a0, 8($s0) -/* C61354 80240644 0040202D */ daddu $a0, $v0, $zero -/* C61358 80240648 9482008E */ lhu $v0, 0x8e($a0) -/* C6135C 8024064C 24030003 */ addiu $v1, $zero, 3 -/* C61360 80240650 24420001 */ addiu $v0, $v0, 1 -/* C61364 80240654 A482008E */ sh $v0, 0x8e($a0) -/* C61368 80240658 00021400 */ sll $v0, $v0, 0x10 -/* C6136C 8024065C 00021403 */ sra $v0, $v0, 0x10 -/* C61370 80240660 14430003 */ bne $v0, $v1, .L80240670 -/* C61374 80240664 00000000 */ nop -/* C61378 80240668 96020086 */ lhu $v0, 0x86($s0) -/* C6137C 8024066C A48200A8 */ sh $v0, 0xa8($a0) -.L80240670: -/* C61380 80240670 8482008E */ lh $v0, 0x8e($a0) -/* C61384 80240674 8E030080 */ lw $v1, 0x80($s0) -/* C61388 80240678 0043102A */ slt $v0, $v0, $v1 -/* C6138C 8024067C 14400004 */ bnez $v0, .L80240690 -/* C61390 80240680 00000000 */ nop -/* C61394 80240684 96020086 */ lhu $v0, 0x86($s0) -/* C61398 80240688 A48200A8 */ sh $v0, 0xa8($a0) -/* C6139C 8024068C AE200070 */ sw $zero, 0x70($s1) -.L80240690: -/* C613A0 80240690 8FBF0018 */ lw $ra, 0x18($sp) -/* C613A4 80240694 8FB10014 */ lw $s1, 0x14($sp) -/* C613A8 80240698 8FB00010 */ lw $s0, 0x10($sp) -/* C613AC 8024069C 03E00008 */ jr $ra -/* C613B0 802406A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_802406A4_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_802406A4_C60D10.s deleted file mode 100644 index ecf4b0b970..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_802406A4_C60D10.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A4_C613B4 -/* C613B4 802406A4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* C613B8 802406A8 AFB3005C */ sw $s3, 0x5c($sp) -/* C613BC 802406AC 0080982D */ daddu $s3, $a0, $zero -/* C613C0 802406B0 AFBF0068 */ sw $ra, 0x68($sp) -/* C613C4 802406B4 AFB50064 */ sw $s5, 0x64($sp) -/* C613C8 802406B8 AFB40060 */ sw $s4, 0x60($sp) -/* C613CC 802406BC AFB20058 */ sw $s2, 0x58($sp) -/* C613D0 802406C0 AFB10054 */ sw $s1, 0x54($sp) -/* C613D4 802406C4 AFB00050 */ sw $s0, 0x50($sp) -/* C613D8 802406C8 8E710148 */ lw $s1, 0x148($s3) -/* C613DC 802406CC 86240008 */ lh $a0, 8($s1) -/* C613E0 802406D0 0C00EABB */ jal get_npc_unsafe -/* C613E4 802406D4 00A0802D */ daddu $s0, $a1, $zero -/* C613E8 802406D8 8E63000C */ lw $v1, 0xc($s3) -/* C613EC 802406DC 0260202D */ daddu $a0, $s3, $zero -/* C613F0 802406E0 8C650000 */ lw $a1, ($v1) -/* C613F4 802406E4 0C0B1EAF */ jal get_variable -/* C613F8 802406E8 0040902D */ daddu $s2, $v0, $zero -/* C613FC 802406EC AFA00028 */ sw $zero, 0x28($sp) -/* C61400 802406F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C61404 802406F4 8C630030 */ lw $v1, 0x30($v1) -/* C61408 802406F8 AFA3002C */ sw $v1, 0x2c($sp) -/* C6140C 802406FC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C61410 80240700 8C63001C */ lw $v1, 0x1c($v1) -/* C61414 80240704 AFA30030 */ sw $v1, 0x30($sp) -/* C61418 80240708 8E2300D0 */ lw $v1, 0xd0($s1) -/* C6141C 8024070C 8C630024 */ lw $v1, 0x24($v1) -/* C61420 80240710 AFA30034 */ sw $v1, 0x34($sp) -/* C61424 80240714 8E2300D0 */ lw $v1, 0xd0($s1) -/* C61428 80240718 8C630028 */ lw $v1, 0x28($v1) -/* C6142C 8024071C 27B50028 */ addiu $s5, $sp, 0x28 -/* C61430 80240720 AFA30038 */ sw $v1, 0x38($sp) -/* C61434 80240724 8E2300D0 */ lw $v1, 0xd0($s1) -/* C61438 80240728 3C0142C8 */ lui $at, 0x42c8 -/* C6143C 8024072C 44810000 */ mtc1 $at, $f0 -/* C61440 80240730 8C63002C */ lw $v1, 0x2c($v1) -/* C61444 80240734 0040A02D */ daddu $s4, $v0, $zero -/* C61448 80240738 E7A00040 */ swc1 $f0, 0x40($sp) -/* C6144C 8024073C A7A00044 */ sh $zero, 0x44($sp) -/* C61450 80240740 12000009 */ beqz $s0, .L80240768 -/* C61454 80240744 AFA3003C */ sw $v1, 0x3c($sp) -/* C61458 80240748 864300A8 */ lh $v1, 0xa8($s2) -/* C6145C 8024074C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C61460 80240750 AE20008C */ sw $zero, 0x8c($s1) -/* C61464 80240754 A22000B5 */ sb $zero, 0xb5($s1) -/* C61468 80240758 34420008 */ ori $v0, $v0, 8 -/* C6146C 8024075C AE230084 */ sw $v1, 0x84($s1) -/* C61470 80240760 080901DE */ j .L80240778 -/* C61474 80240764 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240768: -/* C61478 80240768 8E2200B0 */ lw $v0, 0xb0($s1) -/* C6147C 8024076C 30420004 */ andi $v0, $v0, 4 -/* C61480 80240770 10400047 */ beqz $v0, .L80240890 -/* C61484 80240774 00000000 */ nop -.L80240778: -/* C61488 80240778 AE600070 */ sw $zero, 0x70($s3) -/* C6148C 8024077C A640008E */ sh $zero, 0x8e($s2) -/* C61490 80240780 8E2300CC */ lw $v1, 0xcc($s1) -/* C61494 80240784 2404F7FF */ addiu $a0, $zero, -0x801 -/* C61498 80240788 A2200007 */ sb $zero, 7($s1) -/* C6149C 8024078C 8E420000 */ lw $v0, ($s2) -/* C614A0 80240790 8C630000 */ lw $v1, ($v1) -/* C614A4 80240794 00441024 */ and $v0, $v0, $a0 -/* C614A8 80240798 AE420000 */ sw $v0, ($s2) -/* C614AC 8024079C AE430028 */ sw $v1, 0x28($s2) -/* C614B0 802407A0 96220086 */ lhu $v0, 0x86($s1) -/* C614B4 802407A4 A64200A8 */ sh $v0, 0xa8($s2) -/* C614B8 802407A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* C614BC 802407AC AE200090 */ sw $zero, 0x90($s1) -/* C614C0 802407B0 8C420034 */ lw $v0, 0x34($v0) -/* C614C4 802407B4 14400006 */ bnez $v0, .L802407D0 -/* C614C8 802407B8 2403FDFF */ addiu $v1, $zero, -0x201 -/* C614CC 802407BC 8E420000 */ lw $v0, ($s2) -/* C614D0 802407C0 2403FFF7 */ addiu $v1, $zero, -9 -/* C614D4 802407C4 34420200 */ ori $v0, $v0, 0x200 -/* C614D8 802407C8 080901F7 */ j .L802407DC -/* C614DC 802407CC 00431024 */ and $v0, $v0, $v1 -.L802407D0: -/* C614E0 802407D0 8E420000 */ lw $v0, ($s2) -/* C614E4 802407D4 00431024 */ and $v0, $v0, $v1 -/* C614E8 802407D8 34420008 */ ori $v0, $v0, 8 -.L802407DC: -/* C614EC 802407DC AE420000 */ sw $v0, ($s2) -/* C614F0 802407E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C614F4 802407E4 30420004 */ andi $v0, $v0, 4 -/* C614F8 802407E8 1040001E */ beqz $v0, .L80240864 -/* C614FC 802407EC 24040002 */ addiu $a0, $zero, 2 -/* C61500 802407F0 0240282D */ daddu $a1, $s2, $zero -/* C61504 802407F4 0000302D */ daddu $a2, $zero, $zero -/* C61508 802407F8 24020063 */ addiu $v0, $zero, 0x63 -/* C6150C 802407FC AE620070 */ sw $v0, 0x70($s3) -/* C61510 80240800 AE600074 */ sw $zero, 0x74($s3) -/* C61514 80240804 864300A8 */ lh $v1, 0xa8($s2) -/* C61518 80240808 3C013F80 */ lui $at, 0x3f80 -/* C6151C 8024080C 44810000 */ mtc1 $at, $f0 -/* C61520 80240810 3C014000 */ lui $at, 0x4000 -/* C61524 80240814 44811000 */ mtc1 $at, $f2 -/* C61528 80240818 3C01C1A0 */ lui $at, 0xc1a0 -/* C6152C 8024081C 44812000 */ mtc1 $at, $f4 -/* C61530 80240820 24020028 */ addiu $v0, $zero, 0x28 -/* C61534 80240824 AFA2001C */ sw $v0, 0x1c($sp) -/* C61538 80240828 44833000 */ mtc1 $v1, $f6 -/* C6153C 8024082C 00000000 */ nop -/* C61540 80240830 468031A0 */ cvt.s.w $f6, $f6 -/* C61544 80240834 44073000 */ mfc1 $a3, $f6 -/* C61548 80240838 27A20048 */ addiu $v0, $sp, 0x48 -/* C6154C 8024083C AFA20020 */ sw $v0, 0x20($sp) -/* C61550 80240840 E7A00010 */ swc1 $f0, 0x10($sp) -/* C61554 80240844 E7A20014 */ swc1 $f2, 0x14($sp) -/* C61558 80240848 0C01BFA4 */ jal fx_emote -/* C6155C 8024084C E7A40018 */ swc1 $f4, 0x18($sp) -/* C61560 80240850 8E2200B0 */ lw $v0, 0xb0($s1) -/* C61564 80240854 2403FFFB */ addiu $v1, $zero, -5 -/* C61568 80240858 00431024 */ and $v0, $v0, $v1 -/* C6156C 8024085C 08090224 */ j .L80240890 -/* C61570 80240860 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240864: -/* C61574 80240864 8E220000 */ lw $v0, ($s1) -/* C61578 80240868 3C034000 */ lui $v1, 0x4000 -/* C6157C 8024086C 00431024 */ and $v0, $v0, $v1 -/* C61580 80240870 10400007 */ beqz $v0, .L80240890 -/* C61584 80240874 3C03BFFF */ lui $v1, 0xbfff -/* C61588 80240878 2402000C */ addiu $v0, $zero, 0xc -/* C6158C 8024087C AE620070 */ sw $v0, 0x70($s3) -/* C61590 80240880 8E220000 */ lw $v0, ($s1) -/* C61594 80240884 3463FFFF */ ori $v1, $v1, 0xffff -/* C61598 80240888 00431024 */ and $v0, $v0, $v1 -/* C6159C 8024088C AE220000 */ sw $v0, ($s1) -.L80240890: -/* C615A0 80240890 8E220090 */ lw $v0, 0x90($s1) -/* C615A4 80240894 1840000C */ blez $v0, .L802408C8 -/* C615A8 80240898 2442FFFF */ addiu $v0, $v0, -1 -/* C615AC 8024089C 14400087 */ bnez $v0, .L80240ABC -/* C615B0 802408A0 AE220090 */ sw $v0, 0x90($s1) -/* C615B4 802408A4 3C03FFAA */ lui $v1, 0xffaa -/* C615B8 802408A8 8E420028 */ lw $v0, 0x28($s2) -/* C615BC 802408AC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* C615C0 802408B0 00431021 */ addu $v0, $v0, $v1 -/* C615C4 802408B4 2C420002 */ sltiu $v0, $v0, 2 -/* C615C8 802408B8 10400003 */ beqz $v0, .L802408C8 -/* C615CC 802408BC 3C020055 */ lui $v0, 0x55 -/* C615D0 802408C0 3442000C */ ori $v0, $v0, 0xc -/* C615D4 802408C4 AE420028 */ sw $v0, 0x28($s2) -.L802408C8: -/* C615D8 802408C8 8E630070 */ lw $v1, 0x70($s3) -/* C615DC 802408CC 2402000C */ addiu $v0, $zero, 0xc -/* C615E0 802408D0 10620048 */ beq $v1, $v0, .L802409F4 -/* C615E4 802408D4 2862000D */ slti $v0, $v1, 0xd -/* C615E8 802408D8 1040000F */ beqz $v0, .L80240918 -/* C615EC 802408DC 24100001 */ addiu $s0, $zero, 1 -/* C615F0 802408E0 1070001E */ beq $v1, $s0, .L8024095C -/* C615F4 802408E4 28620002 */ slti $v0, $v1, 2 -/* C615F8 802408E8 10400005 */ beqz $v0, .L80240900 -/* C615FC 802408EC 24020002 */ addiu $v0, $zero, 2 -/* C61600 802408F0 10600015 */ beqz $v1, .L80240948 -/* C61604 802408F4 0260202D */ daddu $a0, $s3, $zero -/* C61608 802408F8 08090294 */ j .L80240A50 -/* C6160C 802408FC 00000000 */ nop -.L80240900: -/* C61610 80240900 1062001C */ beq $v1, $v0, .L80240974 -/* C61614 80240904 24020003 */ addiu $v0, $zero, 3 -/* C61618 80240908 10620035 */ beq $v1, $v0, .L802409E0 -/* C6161C 8024090C 0260202D */ daddu $a0, $s3, $zero -/* C61620 80240910 08090294 */ j .L80240A50 -/* C61624 80240914 00000000 */ nop -.L80240918: -/* C61628 80240918 2402000E */ addiu $v0, $zero, 0xe -/* C6162C 8024091C 1062003F */ beq $v1, $v0, .L80240A1C -/* C61630 80240920 0062102A */ slt $v0, $v1, $v0 -/* C61634 80240924 14400038 */ bnez $v0, .L80240A08 -/* C61638 80240928 0260202D */ daddu $a0, $s3, $zero -/* C6163C 8024092C 2402000F */ addiu $v0, $zero, 0xf -/* C61640 80240930 10620040 */ beq $v1, $v0, .L80240A34 -/* C61644 80240934 24020063 */ addiu $v0, $zero, 0x63 -/* C61648 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* C6164C 8024093C 00000000 */ nop -/* C61650 80240940 08090294 */ j .L80240A50 -/* C61654 80240944 00000000 */ nop -.L80240948: -/* C61658 80240948 0280282D */ daddu $a1, $s4, $zero -/* C6165C 8024094C 0C012568 */ jal func_800495A0 -/* C61660 80240950 02A0302D */ daddu $a2, $s5, $zero -/* C61664 80240954 96220086 */ lhu $v0, 0x86($s1) -/* C61668 80240958 A64200A8 */ sh $v0, 0xa8($s2) -.L8024095C: -/* C6166C 8024095C 0260202D */ daddu $a0, $s3, $zero -/* C61670 80240960 0280282D */ daddu $a1, $s4, $zero -/* C61674 80240964 0C0125AE */ jal func_800496B8 -/* C61678 80240968 02A0302D */ daddu $a2, $s5, $zero -/* C6167C 8024096C 08090294 */ j .L80240A50 -/* C61680 80240970 00000000 */ nop -.L80240974: -/* C61684 80240974 0260202D */ daddu $a0, $s3, $zero -/* C61688 80240978 0280282D */ daddu $a1, $s4, $zero -/* C6168C 8024097C 0C0126D1 */ jal func_80049B44 -/* C61690 80240980 02A0302D */ daddu $a2, $s5, $zero -/* C61694 80240984 8E230088 */ lw $v1, 0x88($s1) -/* C61698 80240988 24020006 */ addiu $v0, $zero, 6 -/* C6169C 8024098C 14620014 */ bne $v1, $v0, .L802409E0 -/* C616A0 80240990 0260202D */ daddu $a0, $s3, $zero -/* C616A4 80240994 0C00A67F */ jal rand_int -/* C616A8 80240998 24040064 */ addiu $a0, $zero, 0x64 -/* C616AC 8024099C 28420021 */ slti $v0, $v0, 0x21 -/* C616B0 802409A0 5040000F */ beql $v0, $zero, .L802409E0 -/* C616B4 802409A4 0260202D */ daddu $a0, $s3, $zero -/* C616B8 802409A8 8E22008C */ lw $v0, 0x8c($s1) -/* C616BC 802409AC 10400005 */ beqz $v0, .L802409C4 -/* C616C0 802409B0 3C020055 */ lui $v0, 0x55 -/* C616C4 802409B4 3442002F */ ori $v0, $v0, 0x2f -/* C616C8 802409B8 AE20008C */ sw $zero, 0x8c($s1) -/* C616CC 802409BC 08090274 */ j .L802409D0 -/* C616D0 802409C0 A22000B5 */ sb $zero, 0xb5($s1) -.L802409C4: -/* C616D4 802409C4 3442002E */ ori $v0, $v0, 0x2e -/* C616D8 802409C8 AE30008C */ sw $s0, 0x8c($s1) -/* C616DC 802409CC A23000B5 */ sb $s0, 0xb5($s1) -.L802409D0: -/* C616E0 802409D0 AE420028 */ sw $v0, 0x28($s2) -/* C616E4 802409D4 24020007 */ addiu $v0, $zero, 7 -/* C616E8 802409D8 080902AF */ j .L80240ABC -/* C616EC 802409DC AE220090 */ sw $v0, 0x90($s1) -.L802409E0: -/* C616F0 802409E0 0280282D */ daddu $a1, $s4, $zero -/* C616F4 802409E4 0C012701 */ jal func_80049C04 -/* C616F8 802409E8 02A0302D */ daddu $a2, $s5, $zero -/* C616FC 802409EC 08090294 */ j .L80240A50 -/* C61700 802409F0 00000000 */ nop -.L802409F4: -/* C61704 802409F4 0260202D */ daddu $a0, $s3, $zero -/* C61708 802409F8 0280282D */ daddu $a1, $s4, $zero -/* C6170C 802409FC 0C0900C4 */ jal func_80240310 -/* C61710 80240A00 02A0302D */ daddu $a2, $s5, $zero -/* C61714 80240A04 0260202D */ daddu $a0, $s3, $zero -.L80240A08: -/* C61718 80240A08 0280282D */ daddu $a1, $s4, $zero -/* C6171C 80240A0C 0C0900E3 */ jal func_8024038C -/* C61720 80240A10 02A0302D */ daddu $a2, $s5, $zero -/* C61724 80240A14 08090294 */ j .L80240A50 -/* C61728 80240A18 00000000 */ nop -.L80240A1C: -/* C6172C 80240A1C 0260202D */ daddu $a0, $s3, $zero -/* C61730 80240A20 0280282D */ daddu $a1, $s4, $zero -/* C61734 80240A24 0C090130 */ jal func_802404C0 -/* C61738 80240A28 02A0302D */ daddu $a2, $s5, $zero -/* C6173C 80240A2C 08090294 */ j .L80240A50 -/* C61740 80240A30 00000000 */ nop -.L80240A34: -/* C61744 80240A34 0280282D */ daddu $a1, $s4, $zero -/* C61748 80240A38 0C090189 */ jal func_80240624 -/* C6174C 80240A3C 02A0302D */ daddu $a2, $s5, $zero -/* C61750 80240A40 08090294 */ j .L80240A50 -/* C61754 80240A44 00000000 */ nop -.L80240A48: -/* C61758 80240A48 0C0129CF */ jal func_8004A73C -/* C6175C 80240A4C 0260202D */ daddu $a0, $s3, $zero -.L80240A50: -/* C61760 80240A50 8E230088 */ lw $v1, 0x88($s1) -/* C61764 80240A54 24020006 */ addiu $v0, $zero, 6 -/* C61768 80240A58 14620019 */ bne $v1, $v0, .L80240AC0 -/* C6176C 80240A5C 0000102D */ daddu $v0, $zero, $zero -/* C61770 80240A60 8E22008C */ lw $v0, 0x8c($s1) -/* C61774 80240A64 10400003 */ beqz $v0, .L80240A74 -/* C61778 80240A68 24020001 */ addiu $v0, $zero, 1 -/* C6177C 80240A6C 0809029E */ j .L80240A78 -/* C61780 80240A70 A22200B5 */ sb $v0, 0xb5($s1) -.L80240A74: -/* C61784 80240A74 A22000B5 */ sb $zero, 0xb5($s1) -.L80240A78: -/* C61788 80240A78 8E22008C */ lw $v0, 0x8c($s1) -/* C6178C 80240A7C 1040000F */ beqz $v0, .L80240ABC -/* C61790 80240A80 3C03FFAA */ lui $v1, 0xffaa -/* C61794 80240A84 8E420028 */ lw $v0, 0x28($s2) -/* C61798 80240A88 3463FFFC */ ori $v1, $v1, 0xfffc -/* C6179C 80240A8C 00431821 */ addu $v1, $v0, $v1 -/* C617A0 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 -/* C617A4 80240A94 10400009 */ beqz $v0, .L80240ABC -/* C617A8 80240A98 00031080 */ sll $v0, $v1, 2 -/* C617AC 80240A9C 3C018024 */ lui $at, 0x8024 -/* C617B0 80240AA0 00220821 */ addu $at, $at, $v0 -/* C617B4 80240AA4 8C2271E8 */ lw $v0, 0x71e8($at) -/* C617B8 80240AA8 00400008 */ jr $v0 -/* C617BC 80240AAC 00000000 */ nop -/* C617C0 80240AB0 8E420028 */ lw $v0, 0x28($s2) -/* C617C4 80240AB4 24420001 */ addiu $v0, $v0, 1 -/* C617C8 80240AB8 AE420028 */ sw $v0, 0x28($s2) -.L80240ABC: -/* C617CC 80240ABC 0000102D */ daddu $v0, $zero, $zero -.L80240AC0: -/* C617D0 80240AC0 8FBF0068 */ lw $ra, 0x68($sp) -/* C617D4 80240AC4 8FB50064 */ lw $s5, 0x64($sp) -/* C617D8 80240AC8 8FB40060 */ lw $s4, 0x60($sp) -/* C617DC 80240ACC 8FB3005C */ lw $s3, 0x5c($sp) -/* C617E0 80240AD0 8FB20058 */ lw $s2, 0x58($sp) -/* C617E4 80240AD4 8FB10054 */ lw $s1, 0x54($sp) -/* C617E8 80240AD8 8FB00050 */ lw $s0, 0x50($sp) -/* C617EC 80240ADC 03E00008 */ jr $ra -/* C617F0 80240AE0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240AE4_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80240AE4_C60D10.s deleted file mode 100644 index d15e86e2c8..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240AE4_C60D10.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AE4_C617F4 -/* C617F4 80240AE4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C617F8 80240AE8 AFBF0010 */ sw $ra, 0x10($sp) -/* C617FC 80240AEC 0C00EAD2 */ jal get_npc_safe -/* C61800 80240AF0 8C84014C */ lw $a0, 0x14c($a0) -/* C61804 80240AF4 0040182D */ daddu $v1, $v0, $zero -/* C61808 80240AF8 846200A8 */ lh $v0, 0xa8($v1) -/* C6180C 80240AFC C462003C */ lwc1 $f2, 0x3c($v1) -/* C61810 80240B00 906400A9 */ lbu $a0, 0xa9($v1) -/* C61814 80240B04 44820000 */ mtc1 $v0, $f0 -/* C61818 80240B08 00000000 */ nop -/* C6181C 80240B0C 46800020 */ cvt.s.w $f0, $f0 -/* C61820 80240B10 46001081 */ sub.s $f2, $f2, $f0 -/* C61824 80240B14 A06400AB */ sb $a0, 0xab($v1) -/* C61828 80240B18 E462003C */ swc1 $f2, 0x3c($v1) -/* C6182C 80240B1C 8FBF0010 */ lw $ra, 0x10($sp) -/* C61830 80240B20 24020002 */ addiu $v0, $zero, 2 -/* C61834 80240B24 03E00008 */ jr $ra -/* C61838 80240B28 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240B84_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80240B84_C60D10.s deleted file mode 100644 index 68899a70ef..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240B84_C60D10.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B84_C61894 -/* C61894 80240B84 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C61898 80240B88 0080102D */ daddu $v0, $a0, $zero -/* C6189C 80240B8C AFB00010 */ sw $s0, 0x10($sp) -/* C618A0 80240B90 AFBF0018 */ sw $ra, 0x18($sp) -/* C618A4 80240B94 AFB10014 */ sw $s1, 0x14($sp) -/* C618A8 80240B98 8C44014C */ lw $a0, 0x14c($v0) -/* C618AC 80240B9C 8C510148 */ lw $s1, 0x148($v0) -/* C618B0 80240BA0 0C00EAD2 */ jal get_npc_safe -/* C618B4 80240BA4 00A0802D */ daddu $s0, $a1, $zero -/* C618B8 80240BA8 56000001 */ bnel $s0, $zero, .L80240BB0 -/* C618BC 80240BAC A04000AB */ sb $zero, 0xab($v0) -.L80240BB0: -/* C618C0 80240BB0 8C420000 */ lw $v0, ($v0) -/* C618C4 80240BB4 30421000 */ andi $v0, $v0, 0x1000 -/* C618C8 80240BB8 1040000A */ beqz $v0, .L80240BE4 -/* C618CC 80240BBC 0000102D */ daddu $v0, $zero, $zero -/* C618D0 80240BC0 82220004 */ lb $v0, 4($s1) -/* C618D4 80240BC4 3C03800B */ lui $v1, %hi(gCurrentEncounter) -/* C618D8 80240BC8 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) -/* C618DC 80240BCC 00021080 */ sll $v0, $v0, 2 -/* C618E0 80240BD0 00431021 */ addu $v0, $v0, $v1 -/* C618E4 80240BD4 8C440028 */ lw $a0, 0x28($v0) -/* C618E8 80240BD8 9623006E */ lhu $v1, 0x6e($s1) -/* C618EC 80240BDC 24020002 */ addiu $v0, $zero, 2 -/* C618F0 80240BE0 A4830044 */ sh $v1, 0x44($a0) -.L80240BE4: -/* C618F4 80240BE4 8FBF0018 */ lw $ra, 0x18($sp) -/* C618F8 80240BE8 8FB10014 */ lw $s1, 0x14($sp) -/* C618FC 80240BEC 8FB00010 */ lw $s0, 0x10($sp) -/* C61900 80240BF0 03E00008 */ jr $ra -/* C61904 80240BF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240C64_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80240C64_C60D10.s deleted file mode 100644 index e9406010e5..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240C64_C60D10.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C64_C61974 -/* C61974 80240C64 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C61978 80240C68 AFB10014 */ sw $s1, 0x14($sp) -/* C6197C 80240C6C 0080882D */ daddu $s1, $a0, $zero -/* C61980 80240C70 AFBF0018 */ sw $ra, 0x18($sp) -/* C61984 80240C74 AFB00010 */ sw $s0, 0x10($sp) -/* C61988 80240C78 8E300148 */ lw $s0, 0x148($s1) -/* C6198C 80240C7C 0C00EABB */ jal get_npc_unsafe -/* C61990 80240C80 86040008 */ lh $a0, 8($s0) -/* C61994 80240C84 0040202D */ daddu $a0, $v0, $zero -/* C61998 80240C88 9482008E */ lhu $v0, 0x8e($a0) -/* C6199C 80240C8C 2442FFFF */ addiu $v0, $v0, -1 -/* C619A0 80240C90 A482008E */ sh $v0, 0x8e($a0) -/* C619A4 80240C94 00021400 */ sll $v0, $v0, 0x10 -/* C619A8 80240C98 1C400009 */ bgtz $v0, .L80240CC0 -/* C619AC 80240C9C 24020003 */ addiu $v0, $zero, 3 -/* C619B0 80240CA0 96030076 */ lhu $v1, 0x76($s0) -/* C619B4 80240CA4 AE02006C */ sw $v0, 0x6c($s0) -/* C619B8 80240CA8 A483008E */ sh $v1, 0x8e($a0) -/* C619BC 80240CAC 8E0200CC */ lw $v0, 0xcc($s0) -/* C619C0 80240CB0 8C420024 */ lw $v0, 0x24($v0) -/* C619C4 80240CB4 AC820028 */ sw $v0, 0x28($a0) -/* C619C8 80240CB8 24020020 */ addiu $v0, $zero, 0x20 -/* C619CC 80240CBC AE220070 */ sw $v0, 0x70($s1) -.L80240CC0: -/* C619D0 80240CC0 8FBF0018 */ lw $ra, 0x18($sp) -/* C619D4 80240CC4 8FB10014 */ lw $s1, 0x14($sp) -/* C619D8 80240CC8 8FB00010 */ lw $s0, 0x10($sp) -/* C619DC 80240CCC 03E00008 */ jr $ra -/* C619E0 80240CD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240CD4_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80240CD4_C60D10.s deleted file mode 100644 index 1a57278ffe..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240CD4_C60D10.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CD4_C619E4 -/* C619E4 80240CD4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C619E8 80240CD8 AFB10034 */ sw $s1, 0x34($sp) -/* C619EC 80240CDC 0080882D */ daddu $s1, $a0, $zero -/* C619F0 80240CE0 AFBF0038 */ sw $ra, 0x38($sp) -/* C619F4 80240CE4 AFB00030 */ sw $s0, 0x30($sp) -/* C619F8 80240CE8 8E300148 */ lw $s0, 0x148($s1) -/* C619FC 80240CEC 0C00EABB */ jal get_npc_unsafe -/* C61A00 80240CF0 86040008 */ lh $a0, 8($s0) -/* C61A04 80240CF4 0040282D */ daddu $a1, $v0, $zero -/* C61A08 80240CF8 94A2008E */ lhu $v0, 0x8e($a1) -/* C61A0C 80240CFC 2442FFFF */ addiu $v0, $v0, -1 -/* C61A10 80240D00 A4A2008E */ sh $v0, 0x8e($a1) -/* C61A14 80240D04 00021400 */ sll $v0, $v0, 0x10 -/* C61A18 80240D08 1C400023 */ bgtz $v0, .L80240D98 -/* C61A1C 80240D0C 24020004 */ addiu $v0, $zero, 4 -/* C61A20 80240D10 8E0300CC */ lw $v1, 0xcc($s0) -/* C61A24 80240D14 AE02006C */ sw $v0, 0x6c($s0) -/* C61A28 80240D18 8C620000 */ lw $v0, ($v1) -/* C61A2C 80240D1C ACA20028 */ sw $v0, 0x28($a1) -/* C61A30 80240D20 9602007A */ lhu $v0, 0x7a($s0) -/* C61A34 80240D24 A4A2008E */ sh $v0, 0x8e($a1) -/* C61A38 80240D28 8E020078 */ lw $v0, 0x78($s0) -/* C61A3C 80240D2C 28420008 */ slti $v0, $v0, 8 -/* C61A40 80240D30 14400018 */ bnez $v0, .L80240D94 -/* C61A44 80240D34 24020021 */ addiu $v0, $zero, 0x21 -/* C61A48 80240D38 24040003 */ addiu $a0, $zero, 3 -/* C61A4C 80240D3C 27A30028 */ addiu $v1, $sp, 0x28 -/* C61A50 80240D40 84A700A8 */ lh $a3, 0xa8($a1) -/* C61A54 80240D44 3C013F80 */ lui $at, 0x3f80 -/* C61A58 80240D48 44810000 */ mtc1 $at, $f0 -/* C61A5C 80240D4C 3C014000 */ lui $at, 0x4000 -/* C61A60 80240D50 44811000 */ mtc1 $at, $f2 -/* C61A64 80240D54 3C01C1A0 */ lui $at, 0xc1a0 -/* C61A68 80240D58 44812000 */ mtc1 $at, $f4 -/* C61A6C 80240D5C 44873000 */ mtc1 $a3, $f6 -/* C61A70 80240D60 00000000 */ nop -/* C61A74 80240D64 468031A0 */ cvt.s.w $f6, $f6 -/* C61A78 80240D68 E7A00010 */ swc1 $f0, 0x10($sp) -/* C61A7C 80240D6C E7A20014 */ swc1 $f2, 0x14($sp) -/* C61A80 80240D70 E7A40018 */ swc1 $f4, 0x18($sp) -/* C61A84 80240D74 8E020078 */ lw $v0, 0x78($s0) -/* C61A88 80240D78 44073000 */ mfc1 $a3, $f6 -/* C61A8C 80240D7C 0000302D */ daddu $a2, $zero, $zero -/* C61A90 80240D80 AFA30020 */ sw $v1, 0x20($sp) -/* C61A94 80240D84 2442FFFF */ addiu $v0, $v0, -1 -/* C61A98 80240D88 0C01BFA4 */ jal fx_emote -/* C61A9C 80240D8C AFA2001C */ sw $v0, 0x1c($sp) -/* C61AA0 80240D90 24020021 */ addiu $v0, $zero, 0x21 -.L80240D94: -/* C61AA4 80240D94 AE220070 */ sw $v0, 0x70($s1) -.L80240D98: -/* C61AA8 80240D98 8FBF0038 */ lw $ra, 0x38($sp) -/* C61AAC 80240D9C 8FB10034 */ lw $s1, 0x34($sp) -/* C61AB0 80240DA0 8FB00030 */ lw $s0, 0x30($sp) -/* C61AB4 80240DA4 03E00008 */ jr $ra -/* C61AB8 80240DA8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240DAC_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80240DAC_C60D10.s deleted file mode 100644 index 93149d1051..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240DAC_C60D10.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DAC_C61ABC -/* C61ABC 80240DAC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C61AC0 80240DB0 AFB10014 */ sw $s1, 0x14($sp) -/* C61AC4 80240DB4 0080882D */ daddu $s1, $a0, $zero -/* C61AC8 80240DB8 AFBF0018 */ sw $ra, 0x18($sp) -/* C61ACC 80240DBC AFB00010 */ sw $s0, 0x10($sp) -/* C61AD0 80240DC0 8E300148 */ lw $s0, 0x148($s1) -/* C61AD4 80240DC4 0C00EABB */ jal get_npc_unsafe -/* C61AD8 80240DC8 86040008 */ lh $a0, 8($s0) -/* C61ADC 80240DCC 9443008E */ lhu $v1, 0x8e($v0) -/* C61AE0 80240DD0 2463FFFF */ addiu $v1, $v1, -1 -/* C61AE4 80240DD4 A443008E */ sh $v1, 0x8e($v0) -/* C61AE8 80240DD8 00031C00 */ sll $v1, $v1, 0x10 -/* C61AEC 80240DDC 1C600003 */ bgtz $v1, .L80240DEC -/* C61AF0 80240DE0 2402000C */ addiu $v0, $zero, 0xc -/* C61AF4 80240DE4 AE00006C */ sw $zero, 0x6c($s0) -/* C61AF8 80240DE8 AE220070 */ sw $v0, 0x70($s1) -.L80240DEC: -/* C61AFC 80240DEC 8FBF0018 */ lw $ra, 0x18($sp) -/* C61B00 80240DF0 8FB10014 */ lw $s1, 0x14($sp) -/* C61B04 80240DF4 8FB00010 */ lw $s0, 0x10($sp) -/* C61B08 80240DF8 03E00008 */ jr $ra -/* C61B0C 80240DFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240E00_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80240E00_C60D10.s deleted file mode 100644 index c24514fd14..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80240E00_C60D10.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E00_C61B10 -/* C61B10 80240E00 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C61B14 80240E04 AFBF0024 */ sw $ra, 0x24($sp) -/* C61B18 80240E08 AFB40020 */ sw $s4, 0x20($sp) -/* C61B1C 80240E0C AFB3001C */ sw $s3, 0x1c($sp) -/* C61B20 80240E10 AFB20018 */ sw $s2, 0x18($sp) -/* C61B24 80240E14 AFB10014 */ sw $s1, 0x14($sp) -/* C61B28 80240E18 AFB00010 */ sw $s0, 0x10($sp) -/* C61B2C 80240E1C F7B40028 */ sdc1 $f20, 0x28($sp) -/* C61B30 80240E20 8C900148 */ lw $s0, 0x148($a0) -/* C61B34 80240E24 86040008 */ lh $a0, 8($s0) -/* C61B38 80240E28 0C00EABB */ jal get_npc_unsafe -/* C61B3C 80240E2C 24110001 */ addiu $s1, $zero, 1 -/* C61B40 80240E30 86040008 */ lh $a0, 8($s0) -/* C61B44 80240E34 0040802D */ daddu $s0, $v0, $zero -/* C61B48 80240E38 3C05800B */ lui $a1, %hi(gCameras) -/* C61B4C 80240E3C 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C61B50 80240E40 3C03800A */ lui $v1, 0x800a -/* C61B54 80240E44 8463A634 */ lh $v1, -0x59cc($v1) -/* C61B58 80240E48 00912021 */ addu $a0, $a0, $s1 -/* C61B5C 80240E4C 00031080 */ sll $v0, $v1, 2 -/* C61B60 80240E50 00431021 */ addu $v0, $v0, $v1 -/* C61B64 80240E54 00021080 */ sll $v0, $v0, 2 -/* C61B68 80240E58 00431023 */ subu $v0, $v0, $v1 -/* C61B6C 80240E5C 000218C0 */ sll $v1, $v0, 3 -/* C61B70 80240E60 00431021 */ addu $v0, $v0, $v1 -/* C61B74 80240E64 000210C0 */ sll $v0, $v0, 3 -/* C61B78 80240E68 0C00FB3A */ jal get_enemy -/* C61B7C 80240E6C 00459021 */ addu $s2, $v0, $a1 -/* C61B80 80240E70 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C61B84 80240E74 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C61B88 80240E78 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C61B8C 80240E7C 8E830000 */ lw $v1, ($s4) -/* C61B90 80240E80 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C61B94 80240E84 8C660028 */ lw $a2, 0x28($v1) -/* C61B98 80240E88 8C670030 */ lw $a3, 0x30($v1) -/* C61B9C 80240E8C 0C00A7B5 */ jal dist2D -/* C61BA0 80240E90 0040982D */ daddu $s3, $v0, $zero -/* C61BA4 80240E94 C6620074 */ lwc1 $f2, 0x74($s3) -/* C61BA8 80240E98 468010A0 */ cvt.s.w $f2, $f2 -/* C61BAC 80240E9C 4600103C */ c.lt.s $f2, $f0 -/* C61BB0 80240EA0 00000000 */ nop -/* C61BB4 80240EA4 45030001 */ bc1tl .L80240EAC -/* C61BB8 80240EA8 0000882D */ daddu $s1, $zero, $zero -.L80240EAC: -/* C61BBC 80240EAC C64C006C */ lwc1 $f12, 0x6c($s2) -/* C61BC0 80240EB0 C60E000C */ lwc1 $f14, 0xc($s0) -/* C61BC4 80240EB4 3C014387 */ lui $at, 0x4387 -/* C61BC8 80240EB8 4481A000 */ mtc1 $at, $f20 -/* C61BCC 80240EBC 0C00A70A */ jal get_clamped_angle_diff -/* C61BD0 80240EC0 00000000 */ nop -/* C61BD4 80240EC4 0C00A6C9 */ jal clamp_angle -/* C61BD8 80240EC8 46000306 */ mov.s $f12, $f0 -/* C61BDC 80240ECC 3C018024 */ lui $at, 0x8024 -/* C61BE0 80240ED0 D4227240 */ ldc1 $f2, 0x7240($at) -/* C61BE4 80240ED4 46000021 */ cvt.d.s $f0, $f0 -/* C61BE8 80240ED8 4622003C */ c.lt.d $f0, $f2 -/* C61BEC 80240EDC 00000000 */ nop -/* C61BF0 80240EE0 45000003 */ bc1f .L80240EF0 -/* C61BF4 80240EE4 00000000 */ nop -/* C61BF8 80240EE8 3C0142B4 */ lui $at, 0x42b4 -/* C61BFC 80240EEC 4481A000 */ mtc1 $at, $f20 -.L80240EF0: -/* C61C00 80240EF0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C61C04 80240EF4 8E820000 */ lw $v0, ($s4) -/* C61C08 80240EF8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C61C0C 80240EFC 8C460028 */ lw $a2, 0x28($v0) -/* C61C10 80240F00 0C00A720 */ jal atan2 -/* C61C14 80240F04 8C470030 */ lw $a3, 0x30($v0) -/* C61C18 80240F08 4600A306 */ mov.s $f12, $f20 -/* C61C1C 80240F0C 0C00A70A */ jal get_clamped_angle_diff -/* C61C20 80240F10 46000386 */ mov.s $f14, $f0 -/* C61C24 80240F14 C6620078 */ lwc1 $f2, 0x78($s3) -/* C61C28 80240F18 468010A0 */ cvt.s.w $f2, $f2 -/* C61C2C 80240F1C 46000005 */ abs.s $f0, $f0 -/* C61C30 80240F20 4600103C */ c.lt.s $f2, $f0 -/* C61C34 80240F24 00000000 */ nop -/* C61C38 80240F28 45030001 */ bc1tl .L80240F30 -/* C61C3C 80240F2C 0000882D */ daddu $s1, $zero, $zero -.L80240F30: -/* C61C40 80240F30 8E820000 */ lw $v0, ($s4) -/* C61C44 80240F34 C600003C */ lwc1 $f0, 0x3c($s0) -/* C61C48 80240F38 C442002C */ lwc1 $f2, 0x2c($v0) -/* C61C4C 80240F3C 860200A8 */ lh $v0, 0xa8($s0) -/* C61C50 80240F40 46020001 */ sub.s $f0, $f0, $f2 -/* C61C54 80240F44 44821000 */ mtc1 $v0, $f2 -/* C61C58 80240F48 00000000 */ nop -/* C61C5C 80240F4C 468010A1 */ cvt.d.w $f2, $f2 -/* C61C60 80240F50 46221080 */ add.d $f2, $f2, $f2 -/* C61C64 80240F54 46000005 */ abs.s $f0, $f0 -/* C61C68 80240F58 46000021 */ cvt.d.s $f0, $f0 -/* C61C6C 80240F5C 4620103E */ c.le.d $f2, $f0 -/* C61C70 80240F60 00000000 */ nop -/* C61C74 80240F64 45030001 */ bc1tl .L80240F6C -/* C61C78 80240F68 0000882D */ daddu $s1, $zero, $zero -.L80240F6C: -/* C61C7C 80240F6C 3C038011 */ lui $v1, 0x8011 -/* C61C80 80240F70 8063EBB3 */ lb $v1, -0x144d($v1) -/* C61C84 80240F74 24020009 */ addiu $v0, $zero, 9 -/* C61C88 80240F78 50620001 */ beql $v1, $v0, .L80240F80 -/* C61C8C 80240F7C 0000882D */ daddu $s1, $zero, $zero -.L80240F80: -/* C61C90 80240F80 24020007 */ addiu $v0, $zero, 7 -/* C61C94 80240F84 50620001 */ beql $v1, $v0, .L80240F8C -/* C61C98 80240F88 0000882D */ daddu $s1, $zero, $zero -.L80240F8C: -/* C61C9C 80240F8C 0220102D */ daddu $v0, $s1, $zero -/* C61CA0 80240F90 8FBF0024 */ lw $ra, 0x24($sp) -/* C61CA4 80240F94 8FB40020 */ lw $s4, 0x20($sp) -/* C61CA8 80240F98 8FB3001C */ lw $s3, 0x1c($sp) -/* C61CAC 80240F9C 8FB20018 */ lw $s2, 0x18($sp) -/* C61CB0 80240FA0 8FB10014 */ lw $s1, 0x14($sp) -/* C61CB4 80240FA4 8FB00010 */ lw $s0, 0x10($sp) -/* C61CB8 80240FA8 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C61CBC 80240FAC 03E00008 */ jr $ra -/* C61CC0 80240FB0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80241214_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80241214_C60D10.s deleted file mode 100644 index 5cd6df61e4..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80241214_C60D10.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241214_C61F24 -/* C61F24 80241214 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C61F28 80241218 AFB20038 */ sw $s2, 0x38($sp) -/* C61F2C 8024121C 0080902D */ daddu $s2, $a0, $zero -/* C61F30 80241220 AFBF0048 */ sw $ra, 0x48($sp) -/* C61F34 80241224 AFB50044 */ sw $s5, 0x44($sp) -/* C61F38 80241228 AFB40040 */ sw $s4, 0x40($sp) -/* C61F3C 8024122C AFB3003C */ sw $s3, 0x3c($sp) -/* C61F40 80241230 AFB10034 */ sw $s1, 0x34($sp) -/* C61F44 80241234 AFB00030 */ sw $s0, 0x30($sp) -/* C61F48 80241238 8E510148 */ lw $s1, 0x148($s2) -/* C61F4C 8024123C 86240008 */ lh $a0, 8($s1) -/* C61F50 80241240 0C00EABB */ jal get_npc_unsafe -/* C61F54 80241244 00A0802D */ daddu $s0, $a1, $zero -/* C61F58 80241248 8E43000C */ lw $v1, 0xc($s2) -/* C61F5C 8024124C 0240202D */ daddu $a0, $s2, $zero -/* C61F60 80241250 8C650000 */ lw $a1, ($v1) -/* C61F64 80241254 0C0B1EAF */ jal get_variable -/* C61F68 80241258 0040A82D */ daddu $s5, $v0, $zero -/* C61F6C 8024125C AFA00010 */ sw $zero, 0x10($sp) -/* C61F70 80241260 8E2300D0 */ lw $v1, 0xd0($s1) -/* C61F74 80241264 8C630030 */ lw $v1, 0x30($v1) -/* C61F78 80241268 AFA30014 */ sw $v1, 0x14($sp) -/* C61F7C 8024126C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C61F80 80241270 8C63001C */ lw $v1, 0x1c($v1) -/* C61F84 80241274 AFA30018 */ sw $v1, 0x18($sp) -/* C61F88 80241278 8E2300D0 */ lw $v1, 0xd0($s1) -/* C61F8C 8024127C 8C630024 */ lw $v1, 0x24($v1) -/* C61F90 80241280 AFA3001C */ sw $v1, 0x1c($sp) -/* C61F94 80241284 8E2300D0 */ lw $v1, 0xd0($s1) -/* C61F98 80241288 8C630028 */ lw $v1, 0x28($v1) -/* C61F9C 8024128C 27B40010 */ addiu $s4, $sp, 0x10 -/* C61FA0 80241290 AFA30020 */ sw $v1, 0x20($sp) -/* C61FA4 80241294 8E2300D0 */ lw $v1, 0xd0($s1) -/* C61FA8 80241298 3C014282 */ lui $at, 0x4282 -/* C61FAC 8024129C 44810000 */ mtc1 $at, $f0 -/* C61FB0 802412A0 8C63002C */ lw $v1, 0x2c($v1) -/* C61FB4 802412A4 0040982D */ daddu $s3, $v0, $zero -/* C61FB8 802412A8 E7A00028 */ swc1 $f0, 0x28($sp) -/* C61FBC 802412AC A7A0002C */ sh $zero, 0x2c($sp) -/* C61FC0 802412B0 16000005 */ bnez $s0, .L802412C8 -/* C61FC4 802412B4 AFA30024 */ sw $v1, 0x24($sp) -/* C61FC8 802412B8 8E2200B0 */ lw $v0, 0xb0($s1) -/* C61FCC 802412BC 30420004 */ andi $v0, $v0, 4 -/* C61FD0 802412C0 10400020 */ beqz $v0, .L80241344 -/* C61FD4 802412C4 00000000 */ nop -.L802412C8: -/* C61FD8 802412C8 2404F7FF */ addiu $a0, $zero, -0x801 -/* C61FDC 802412CC AE400070 */ sw $zero, 0x70($s2) -/* C61FE0 802412D0 A6A0008E */ sh $zero, 0x8e($s5) -/* C61FE4 802412D4 8E2200CC */ lw $v0, 0xcc($s1) -/* C61FE8 802412D8 8EA30000 */ lw $v1, ($s5) -/* C61FEC 802412DC 8C420000 */ lw $v0, ($v0) -/* C61FF0 802412E0 00641824 */ and $v1, $v1, $a0 -/* C61FF4 802412E4 AEA30000 */ sw $v1, ($s5) -/* C61FF8 802412E8 AEA20028 */ sw $v0, 0x28($s5) -/* C61FFC 802412EC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C62000 802412F0 8C420034 */ lw $v0, 0x34($v0) -/* C62004 802412F4 54400005 */ bnel $v0, $zero, .L8024130C -/* C62008 802412F8 2402FDFF */ addiu $v0, $zero, -0x201 -/* C6200C 802412FC 34620200 */ ori $v0, $v1, 0x200 -/* C62010 80241300 2403FFF7 */ addiu $v1, $zero, -9 -/* C62014 80241304 080904C5 */ j .L80241314 -/* C62018 80241308 00431024 */ and $v0, $v0, $v1 -.L8024130C: -/* C6201C 8024130C 00621024 */ and $v0, $v1, $v0 -/* C62020 80241310 34420008 */ ori $v0, $v0, 8 -.L80241314: -/* C62024 80241314 AEA20000 */ sw $v0, ($s5) -/* C62028 80241318 8E2200B0 */ lw $v0, 0xb0($s1) -/* C6202C 8024131C 30420004 */ andi $v0, $v0, 4 -/* C62030 80241320 10400007 */ beqz $v0, .L80241340 -/* C62034 80241324 24020063 */ addiu $v0, $zero, 0x63 -/* C62038 80241328 AE420070 */ sw $v0, 0x70($s2) -/* C6203C 8024132C AE400074 */ sw $zero, 0x74($s2) -/* C62040 80241330 8E2200B0 */ lw $v0, 0xb0($s1) -/* C62044 80241334 2403FFFB */ addiu $v1, $zero, -5 -/* C62048 80241338 00431024 */ and $v0, $v0, $v1 -/* C6204C 8024133C AE2200B0 */ sw $v0, 0xb0($s1) -.L80241340: -/* C62050 80241340 AE20006C */ sw $zero, 0x6c($s1) -.L80241344: -/* C62054 80241344 8E420070 */ lw $v0, 0x70($s2) -/* C62058 80241348 2842001E */ slti $v0, $v0, 0x1e -/* C6205C 8024134C 10400009 */ beqz $v0, .L80241374 -/* C62060 80241350 00000000 */ nop -/* C62064 80241354 8E22006C */ lw $v0, 0x6c($s1) -/* C62068 80241358 14400006 */ bnez $v0, .L80241374 -/* C6206C 8024135C 00000000 */ nop -/* C62070 80241360 0C090380 */ jal func_80240E00 -/* C62074 80241364 0240202D */ daddu $a0, $s2, $zero -/* C62078 80241368 10400002 */ beqz $v0, .L80241374 -/* C6207C 8024136C 2402001E */ addiu $v0, $zero, 0x1e -/* C62080 80241370 AE420070 */ sw $v0, 0x70($s2) -.L80241374: -/* C62084 80241374 8E430070 */ lw $v1, 0x70($s2) -/* C62088 80241378 2C620064 */ sltiu $v0, $v1, 0x64 -/* C6208C 8024137C 10400048 */ beqz $v0, .L802414A0 -/* C62090 80241380 00031080 */ sll $v0, $v1, 2 -/* C62094 80241384 3C018024 */ lui $at, 0x8024 -/* C62098 80241388 00220821 */ addu $at, $at, $v0 -/* C6209C 8024138C 8C227248 */ lw $v0, 0x7248($at) -/* C620A0 80241390 00400008 */ jr $v0 -/* C620A4 80241394 00000000 */ nop -/* C620A8 80241398 0240202D */ daddu $a0, $s2, $zero -/* C620AC 8024139C 0260282D */ daddu $a1, $s3, $zero -/* C620B0 802413A0 0C012568 */ jal func_800495A0 -/* C620B4 802413A4 0280302D */ daddu $a2, $s4, $zero -/* C620B8 802413A8 0240202D */ daddu $a0, $s2, $zero -/* C620BC 802413AC 0260282D */ daddu $a1, $s3, $zero -/* C620C0 802413B0 0C0125AE */ jal func_800496B8 -/* C620C4 802413B4 0280302D */ daddu $a2, $s4, $zero -/* C620C8 802413B8 08090528 */ j .L802414A0 -/* C620CC 802413BC 00000000 */ nop -/* C620D0 802413C0 0240202D */ daddu $a0, $s2, $zero -/* C620D4 802413C4 0260282D */ daddu $a1, $s3, $zero -/* C620D8 802413C8 0C0126D1 */ jal func_80049B44 -/* C620DC 802413CC 0280302D */ daddu $a2, $s4, $zero -/* C620E0 802413D0 0240202D */ daddu $a0, $s2, $zero -/* C620E4 802413D4 0260282D */ daddu $a1, $s3, $zero -/* C620E8 802413D8 0C012701 */ jal func_80049C04 -/* C620EC 802413DC 0280302D */ daddu $a2, $s4, $zero -/* C620F0 802413E0 08090528 */ j .L802414A0 -/* C620F4 802413E4 00000000 */ nop -/* C620F8 802413E8 0240202D */ daddu $a0, $s2, $zero -/* C620FC 802413EC 0260282D */ daddu $a1, $s3, $zero -/* C62100 802413F0 0C01278F */ jal func_80049E3C -/* C62104 802413F4 0280302D */ daddu $a2, $s4, $zero -/* C62108 802413F8 0240202D */ daddu $a0, $s2, $zero -/* C6210C 802413FC 0260282D */ daddu $a1, $s3, $zero -/* C62110 80241400 0C0127B3 */ jal func_80049ECC -/* C62114 80241404 0280302D */ daddu $a2, $s4, $zero -/* C62118 80241408 08090528 */ j .L802414A0 -/* C6211C 8024140C 00000000 */ nop -/* C62120 80241410 0240202D */ daddu $a0, $s2, $zero -/* C62124 80241414 0260282D */ daddu $a1, $s3, $zero -/* C62128 80241418 0C0127DF */ jal func_80049F7C -/* C6212C 8024141C 0280302D */ daddu $a2, $s4, $zero -/* C62130 80241420 0240202D */ daddu $a0, $s2, $zero -/* C62134 80241424 0260282D */ daddu $a1, $s3, $zero -/* C62138 80241428 0C012849 */ jal func_8004A124 -/* C6213C 8024142C 0280302D */ daddu $a2, $s4, $zero -/* C62140 80241430 08090528 */ j .L802414A0 -/* C62144 80241434 00000000 */ nop -/* C62148 80241438 0240202D */ daddu $a0, $s2, $zero -/* C6214C 8024143C 0260282D */ daddu $a1, $s3, $zero -/* C62150 80241440 0C0128FA */ jal func_8004A3E8 -/* C62154 80241444 0280302D */ daddu $a2, $s4, $zero -/* C62158 80241448 08090528 */ j .L802414A0 -/* C6215C 8024144C 00000000 */ nop -/* C62160 80241450 0C0902FE */ jal func_80240BF8 -/* C62164 80241454 0240202D */ daddu $a0, $s2, $zero -/* C62168 80241458 0C090319 */ jal func_80240C64 -/* C6216C 8024145C 0240202D */ daddu $a0, $s2, $zero -/* C62170 80241460 8E430070 */ lw $v1, 0x70($s2) -/* C62174 80241464 24020020 */ addiu $v0, $zero, 0x20 -/* C62178 80241468 1462000D */ bne $v1, $v0, .L802414A0 -/* C6217C 8024146C 00000000 */ nop -/* C62180 80241470 0C090335 */ jal func_80240CD4 -/* C62184 80241474 0240202D */ daddu $a0, $s2, $zero -/* C62188 80241478 8E430070 */ lw $v1, 0x70($s2) -/* C6218C 8024147C 24020021 */ addiu $v0, $zero, 0x21 -/* C62190 80241480 14620007 */ bne $v1, $v0, .L802414A0 -/* C62194 80241484 00000000 */ nop -/* C62198 80241488 0C09036B */ jal func_80240DAC -/* C6219C 8024148C 0240202D */ daddu $a0, $s2, $zero -/* C621A0 80241490 08090528 */ j .L802414A0 -/* C621A4 80241494 00000000 */ nop -/* C621A8 80241498 0C0129CF */ jal func_8004A73C -/* C621AC 8024149C 0240202D */ daddu $a0, $s2, $zero -.L802414A0: -/* C621B0 802414A0 8FBF0048 */ lw $ra, 0x48($sp) -/* C621B4 802414A4 8FB50044 */ lw $s5, 0x44($sp) -/* C621B8 802414A8 8FB40040 */ lw $s4, 0x40($sp) -/* C621BC 802414AC 8FB3003C */ lw $s3, 0x3c($sp) -/* C621C0 802414B0 8FB20038 */ lw $s2, 0x38($sp) -/* C621C4 802414B4 8FB10034 */ lw $s1, 0x34($sp) -/* C621C8 802414B8 8FB00030 */ lw $s0, 0x30($sp) -/* C621CC 802414BC 0000102D */ daddu $v0, $zero, $zero -/* C621D0 802414C0 03E00008 */ jr $ra -/* C621D4 802414C4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_802414C8_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_802414C8_C60D10.s deleted file mode 100644 index 90f12f8691..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_802414C8_C60D10.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414C8_C621D8 -/* C621D8 802414C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C621DC 802414CC AFB10014 */ sw $s1, 0x14($sp) -/* C621E0 802414D0 0080882D */ daddu $s1, $a0, $zero -/* C621E4 802414D4 AFBF0018 */ sw $ra, 0x18($sp) -/* C621E8 802414D8 AFB00010 */ sw $s0, 0x10($sp) -/* C621EC 802414DC 8E300148 */ lw $s0, 0x148($s1) -/* C621F0 802414E0 0C00EABB */ jal get_npc_unsafe -/* C621F4 802414E4 86040008 */ lh $a0, 8($s0) -/* C621F8 802414E8 0040202D */ daddu $a0, $v0, $zero -/* C621FC 802414EC 8482008E */ lh $v0, 0x8e($a0) -/* C62200 802414F0 9483008E */ lhu $v1, 0x8e($a0) -/* C62204 802414F4 18400003 */ blez $v0, .L80241504 -/* C62208 802414F8 2462FFFF */ addiu $v0, $v1, -1 -/* C6220C 802414FC 08090548 */ j .L80241520 -/* C62210 80241500 A482008E */ sh $v0, 0x8e($a0) -.L80241504: -/* C62214 80241504 8E0200CC */ lw $v0, 0xcc($s0) -/* C62218 80241508 AE00006C */ sw $zero, 0x6c($s0) -/* C6221C 8024150C 8C420000 */ lw $v0, ($v0) -/* C62220 80241510 AC820028 */ sw $v0, 0x28($a0) -/* C62224 80241514 24020001 */ addiu $v0, $zero, 1 -/* C62228 80241518 AE200074 */ sw $zero, 0x74($s1) -/* C6222C 8024151C AE220070 */ sw $v0, 0x70($s1) -.L80241520: -/* C62230 80241520 8FBF0018 */ lw $ra, 0x18($sp) -/* C62234 80241524 8FB10014 */ lw $s1, 0x14($sp) -/* C62238 80241528 8FB00010 */ lw $s0, 0x10($sp) -/* C6223C 8024152C 03E00008 */ jr $ra -/* C62240 80241530 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80241630_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80241630_C60D10.s deleted file mode 100644 index 2075b9b006..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80241630_C60D10.s +++ /dev/null @@ -1,688 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241630_C62340 -/* C62340 80241630 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C62344 80241634 AFBF0064 */ sw $ra, 0x64($sp) -/* C62348 80241638 AFBE0060 */ sw $fp, 0x60($sp) -/* C6234C 8024163C AFB7005C */ sw $s7, 0x5c($sp) -/* C62350 80241640 AFB60058 */ sw $s6, 0x58($sp) -/* C62354 80241644 AFB50054 */ sw $s5, 0x54($sp) -/* C62358 80241648 AFB40050 */ sw $s4, 0x50($sp) -/* C6235C 8024164C AFB3004C */ sw $s3, 0x4c($sp) -/* C62360 80241650 AFB20048 */ sw $s2, 0x48($sp) -/* C62364 80241654 AFB10044 */ sw $s1, 0x44($sp) -/* C62368 80241658 AFB00040 */ sw $s0, 0x40($sp) -/* C6236C 8024165C F7B80078 */ sdc1 $f24, 0x78($sp) -/* C62370 80241660 F7B60070 */ sdc1 $f22, 0x70($sp) -/* C62374 80241664 F7B40068 */ sdc1 $f20, 0x68($sp) -/* C62378 80241668 AFA40080 */ sw $a0, 0x80($sp) -/* C6237C 8024166C 8C960148 */ lw $s6, 0x148($a0) -/* C62380 80241670 00C0902D */ daddu $s2, $a2, $zero -/* C62384 80241674 86C40008 */ lh $a0, 8($s6) -/* C62388 80241678 0C00EABB */ jal get_npc_unsafe -/* C6238C 8024167C 0000B82D */ daddu $s7, $zero, $zero -/* C62390 80241680 0040882D */ daddu $s1, $v0, $zero -/* C62394 80241684 9622008E */ lhu $v0, 0x8e($s1) -/* C62398 80241688 2442FFFF */ addiu $v0, $v0, -1 -/* C6239C 8024168C A622008E */ sh $v0, 0x8e($s1) -/* C623A0 80241690 00021400 */ sll $v0, $v0, 0x10 -/* C623A4 80241694 8EC30090 */ lw $v1, 0x90($s6) -/* C623A8 80241698 00021403 */ sra $v0, $v0, 0x10 -/* C623AC 8024169C 0062182A */ slt $v1, $v1, $v0 -/* C623B0 802416A0 14600005 */ bnez $v1, .L802416B8 -/* C623B4 802416A4 02E0F02D */ daddu $fp, $s7, $zero -/* C623B8 802416A8 8EC20000 */ lw $v0, ($s6) -/* C623BC 802416AC 3C031F10 */ lui $v1, 0x1f10 -/* C623C0 802416B0 00431025 */ or $v0, $v0, $v1 -/* C623C4 802416B4 AEC20000 */ sw $v0, ($s6) -.L802416B8: -/* C623C8 802416B8 8622008E */ lh $v0, 0x8e($s1) -/* C623CC 802416BC 1440025D */ bnez $v0, .L80242034 -/* C623D0 802416C0 00000000 */ nop -/* C623D4 802416C4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C623D8 802416C8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C623DC 802416CC 0C00A6C9 */ jal clamp_angle -/* C623E0 802416D0 C44C00A8 */ lwc1 $f12, 0xa8($v0) -/* C623E4 802416D4 3C014334 */ lui $at, 0x4334 -/* C623E8 802416D8 44811000 */ mtc1 $at, $f2 -/* C623EC 802416DC 00000000 */ nop -/* C623F0 802416E0 4602003C */ c.lt.s $f0, $f2 -/* C623F4 802416E4 00000000 */ nop -/* C623F8 802416E8 45000011 */ bc1f .L80241730 -/* C623FC 802416EC 00000000 */ nop -/* C62400 802416F0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C62404 802416F4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C62408 802416F8 3C0142B4 */ lui $at, 0x42b4 -/* C6240C 802416FC 44816000 */ mtc1 $at, $f12 -/* C62410 80241700 00031080 */ sll $v0, $v1, 2 -/* C62414 80241704 00431021 */ addu $v0, $v0, $v1 -/* C62418 80241708 00021080 */ sll $v0, $v0, 2 -/* C6241C 8024170C 00431023 */ subu $v0, $v0, $v1 -/* C62420 80241710 000218C0 */ sll $v1, $v0, 3 -/* C62424 80241714 00431021 */ addu $v0, $v0, $v1 -/* C62428 80241718 000210C0 */ sll $v0, $v0, 3 -/* C6242C 8024171C 3C01800B */ lui $at, 0x800b -/* C62430 80241720 00220821 */ addu $at, $at, $v0 -/* C62434 80241724 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C62438 80241728 080905DB */ j .L8024176C -/* C6243C 8024172C 460C0301 */ sub.s $f12, $f0, $f12 -.L80241730: -/* C62440 80241730 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C62444 80241734 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C62448 80241738 3C0142B4 */ lui $at, 0x42b4 -/* C6244C 8024173C 44816000 */ mtc1 $at, $f12 -/* C62450 80241740 00031080 */ sll $v0, $v1, 2 -/* C62454 80241744 00431021 */ addu $v0, $v0, $v1 -/* C62458 80241748 00021080 */ sll $v0, $v0, 2 -/* C6245C 8024174C 00431023 */ subu $v0, $v0, $v1 -/* C62460 80241750 000218C0 */ sll $v1, $v0, 3 -/* C62464 80241754 00431021 */ addu $v0, $v0, $v1 -/* C62468 80241758 000210C0 */ sll $v0, $v0, 3 -/* C6246C 8024175C 3C01800B */ lui $at, 0x800b -/* C62470 80241760 00220821 */ addu $at, $at, $v0 -/* C62474 80241764 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C62478 80241768 460C0300 */ add.s $f12, $f0, $f12 -.L8024176C: -/* C6247C 8024176C 0C00A6C9 */ jal clamp_angle -/* C62480 80241770 00000000 */ nop -/* C62484 80241774 46000586 */ mov.s $f22, $f0 -/* C62488 80241778 3C014334 */ lui $at, 0x4334 -/* C6248C 8024177C 44816000 */ mtc1 $at, $f12 -/* C62490 80241780 0C00A6C9 */ jal clamp_angle -/* C62494 80241784 460CB300 */ add.s $f12, $f22, $f12 -/* C62498 80241788 8EC20088 */ lw $v0, 0x88($s6) -/* C6249C 8024178C 14400010 */ bnez $v0, .L802417D0 -/* C624A0 80241790 46000606 */ mov.s $f24, $f0 -/* C624A4 80241794 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C624A8 80241798 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C624AC 8024179C 804300B4 */ lb $v1, 0xb4($v0) -/* C624B0 802417A0 3C014200 */ lui $at, 0x4200 -/* C624B4 802417A4 4481A000 */ mtc1 $at, $f20 -/* C624B8 802417A8 10600016 */ beqz $v1, .L80241804 -/* C624BC 802417AC 24020001 */ addiu $v0, $zero, 1 -/* C624C0 802417B0 3C0142C8 */ lui $at, 0x42c8 -/* C624C4 802417B4 4481A000 */ mtc1 $at, $f20 -/* C624C8 802417B8 14620013 */ bne $v1, $v0, .L80241808 -/* C624CC 802417BC 26300038 */ addiu $s0, $s1, 0x38 -/* C624D0 802417C0 3C0142B4 */ lui $at, 0x42b4 -/* C624D4 802417C4 4481A000 */ mtc1 $at, $f20 -/* C624D8 802417C8 08090603 */ j .L8024180C -/* C624DC 802417CC 0200202D */ daddu $a0, $s0, $zero -.L802417D0: -/* C624E0 802417D0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C624E4 802417D4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C624E8 802417D8 804300B4 */ lb $v1, 0xb4($v0) -/* C624EC 802417DC 3C014218 */ lui $at, 0x4218 -/* C624F0 802417E0 4481A000 */ mtc1 $at, $f20 -/* C624F4 802417E4 10600007 */ beqz $v1, .L80241804 -/* C624F8 802417E8 24020001 */ addiu $v0, $zero, 1 -/* C624FC 802417EC 3C0142B4 */ lui $at, 0x42b4 -/* C62500 802417F0 4481A000 */ mtc1 $at, $f20 -/* C62504 802417F4 14620004 */ bne $v1, $v0, .L80241808 -/* C62508 802417F8 26300038 */ addiu $s0, $s1, 0x38 -/* C6250C 802417FC 3C014296 */ lui $at, 0x4296 -/* C62510 80241800 4481A000 */ mtc1 $at, $f20 -.L80241804: -/* C62514 80241804 26300038 */ addiu $s0, $s1, 0x38 -.L80241808: -/* C62518 80241808 0200202D */ daddu $a0, $s0, $zero -.L8024180C: -/* C6251C 8024180C 3C15800F */ lui $s5, %hi(gPlayerStatusPtr) -/* C62520 80241810 26B57B30 */ addiu $s5, $s5, %lo(gPlayerStatusPtr) -/* C62524 80241814 4407C000 */ mfc1 $a3, $f24 -/* C62528 80241818 862200A6 */ lh $v0, 0xa6($s1) -/* C6252C 8024181C 8EA30000 */ lw $v1, ($s5) -/* C62530 80241820 44824000 */ mtc1 $v0, $f8 -/* C62534 80241824 00000000 */ nop -/* C62538 80241828 46804220 */ cvt.s.w $f8, $f8 -/* C6253C 8024182C C4600028 */ lwc1 $f0, 0x28($v1) -/* C62540 80241830 44064000 */ mfc1 $a2, $f8 -/* C62544 80241834 26330040 */ addiu $s3, $s1, 0x40 -/* C62548 80241838 E6200038 */ swc1 $f0, 0x38($s1) -/* C6254C 8024183C C4600030 */ lwc1 $f0, 0x30($v1) -/* C62550 80241840 0260282D */ daddu $a1, $s3, $zero -/* C62554 80241844 0C00A7E7 */ jal add_vec2D_polar -/* C62558 80241848 E6200040 */ swc1 $f0, 0x40($s1) -/* C6255C 8024184C 862200A6 */ lh $v0, 0xa6($s1) -/* C62560 80241850 44820000 */ mtc1 $v0, $f0 -/* C62564 80241854 00000000 */ nop -/* C62568 80241858 46800020 */ cvt.s.w $f0, $f0 -/* C6256C 8024185C 4600A000 */ add.s $f0, $f20, $f0 -/* C62570 80241860 4406B000 */ mfc1 $a2, $f22 -/* C62574 80241864 44050000 */ mfc1 $a1, $f0 -/* C62578 80241868 0C00EA95 */ jal npc_move_heading -/* C6257C 8024186C 0220202D */ daddu $a0, $s1, $zero -/* C62580 80241870 8EC20088 */ lw $v0, 0x88($s6) -/* C62584 80241874 1440005D */ bnez $v0, .L802419EC -/* C62588 80241878 00000000 */ nop -/* C6258C 8024187C C6200038 */ lwc1 $f0, 0x38($s1) -/* C62590 80241880 3C018024 */ lui $at, 0x8024 -/* C62594 80241884 D42473D8 */ ldc1 $f4, 0x73d8($at) -/* C62598 80241888 46000021 */ cvt.d.s $f0, $f0 -/* C6259C 8024188C 4620203C */ c.lt.d $f4, $f0 -/* C625A0 80241890 00000000 */ nop -/* C625A4 80241894 45000005 */ bc1f .L802418AC -/* C625A8 80241898 00000000 */ nop -/* C625AC 8024189C 3C0143BE */ lui $at, 0x43be -/* C625B0 802418A0 44810000 */ mtc1 $at, $f0 -/* C625B4 802418A4 00000000 */ nop -/* C625B8 802418A8 E6200038 */ swc1 $f0, 0x38($s1) -.L802418AC: -/* C625BC 802418AC C6200038 */ lwc1 $f0, 0x38($s1) -/* C625C0 802418B0 3C018024 */ lui $at, 0x8024 -/* C625C4 802418B4 D42273E0 */ ldc1 $f2, 0x73e0($at) -/* C625C8 802418B8 46000021 */ cvt.d.s $f0, $f0 -/* C625CC 802418BC 4622003C */ c.lt.d $f0, $f2 -/* C625D0 802418C0 00000000 */ nop -/* C625D4 802418C4 45000005 */ bc1f .L802418DC -/* C625D8 802418C8 00000000 */ nop -/* C625DC 802418CC 3C01C3BE */ lui $at, 0xc3be -/* C625E0 802418D0 44810000 */ mtc1 $at, $f0 -/* C625E4 802418D4 00000000 */ nop -/* C625E8 802418D8 E6200038 */ swc1 $f0, 0x38($s1) -.L802418DC: -/* C625EC 802418DC C6200040 */ lwc1 $f0, 0x40($s1) -/* C625F0 802418E0 46000021 */ cvt.d.s $f0, $f0 -/* C625F4 802418E4 4620203C */ c.lt.d $f4, $f0 -/* C625F8 802418E8 00000000 */ nop -/* C625FC 802418EC 45000005 */ bc1f .L80241904 -/* C62600 802418F0 00000000 */ nop -/* C62604 802418F4 3C0143BE */ lui $at, 0x43be -/* C62608 802418F8 44810000 */ mtc1 $at, $f0 -/* C6260C 802418FC 00000000 */ nop -/* C62610 80241900 E6200040 */ swc1 $f0, 0x40($s1) -.L80241904: -/* C62614 80241904 C6200040 */ lwc1 $f0, 0x40($s1) -/* C62618 80241908 46000021 */ cvt.d.s $f0, $f0 -/* C6261C 8024190C 4622003C */ c.lt.d $f0, $f2 -/* C62620 80241910 00000000 */ nop -/* C62624 80241914 45000005 */ bc1f .L8024192C -/* C62628 80241918 00000000 */ nop -/* C6262C 8024191C 3C01C3BE */ lui $at, 0xc3be -/* C62630 80241920 44810000 */ mtc1 $at, $f0 -/* C62634 80241924 00000000 */ nop -/* C62638 80241928 E6200040 */ swc1 $f0, 0x40($s1) -.L8024192C: -/* C6263C 8024192C C6220038 */ lwc1 $f2, 0x38($s1) -/* C62640 80241930 46021082 */ mul.s $f2, $f2, $f2 -/* C62644 80241934 00000000 */ nop -/* C62648 80241938 C6200040 */ lwc1 $f0, 0x40($s1) -/* C6264C 8024193C 46000002 */ mul.s $f0, $f0, $f0 -/* C62650 80241940 00000000 */ nop -/* C62654 80241944 46001300 */ add.s $f12, $f2, $f0 -/* C62658 80241948 46006004 */ sqrt.s $f0, $f12 -/* C6265C 8024194C 46000032 */ c.eq.s $f0, $f0 -/* C62660 80241950 00000000 */ nop -/* C62664 80241954 45010003 */ bc1t .L80241964 -/* C62668 80241958 00000000 */ nop -/* C6266C 8024195C 0C0187BC */ jal sqrtf -/* C62670 80241960 00000000 */ nop -.L80241964: -/* C62674 80241964 8E260038 */ lw $a2, 0x38($s1) -/* C62678 80241968 8E270040 */ lw $a3, 0x40($s1) -/* C6267C 8024196C 4480A000 */ mtc1 $zero, $f20 -/* C62680 80241970 E7A00038 */ swc1 $f0, 0x38($sp) -/* C62684 80241974 4600A306 */ mov.s $f12, $f20 -/* C62688 80241978 0C00A720 */ jal atan2 -/* C6268C 8024197C 4600A386 */ mov.s $f14, $f20 -/* C62690 80241980 46000586 */ mov.s $f22, $f0 -/* C62694 80241984 C7A20038 */ lwc1 $f2, 0x38($sp) -/* C62698 80241988 3C018024 */ lui $at, 0x8024 -/* C6269C 8024198C D42073E8 */ ldc1 $f0, 0x73e8($at) -/* C626A0 80241990 460010A1 */ cvt.d.s $f2, $f2 -/* C626A4 80241994 4620103C */ c.lt.d $f2, $f0 -/* C626A8 80241998 00000000 */ nop -/* C626AC 8024199C 45000004 */ bc1f .L802419B0 -/* C626B0 802419A0 0200202D */ daddu $a0, $s0, $zero -/* C626B4 802419A4 3C064398 */ lui $a2, 0x4398 -/* C626B8 802419A8 08090674 */ j .L802419D0 -/* C626BC 802419AC 34C68000 */ ori $a2, $a2, 0x8000 -.L802419B0: -/* C626C0 802419B0 3C018024 */ lui $at, 0x8024 -/* C626C4 802419B4 D42073F0 */ ldc1 $f0, 0x73f0($at) -/* C626C8 802419B8 4622003C */ c.lt.d $f0, $f2 -/* C626CC 802419BC 00000000 */ nop -/* C626D0 802419C0 450000FA */ bc1f .L80241DAC -/* C626D4 802419C4 00000000 */ nop -/* C626D8 802419C8 3C0643BB */ lui $a2, 0x43bb -/* C626DC 802419CC 34C68000 */ ori $a2, $a2, 0x8000 -.L802419D0: -/* C626E0 802419D0 4407B000 */ mfc1 $a3, $f22 -/* C626E4 802419D4 0260282D */ daddu $a1, $s3, $zero -/* C626E8 802419D8 E6340038 */ swc1 $f20, 0x38($s1) -/* C626EC 802419DC 0C00A7E7 */ jal add_vec2D_polar -/* C626F0 802419E0 E6340040 */ swc1 $f20, 0x40($s1) -/* C626F4 802419E4 0809076B */ j .L80241DAC -/* C626F8 802419E8 00000000 */ nop -.L802419EC: -/* C626FC 802419EC 8E220000 */ lw $v0, ($s1) -/* C62700 802419F0 30420040 */ andi $v0, $v0, 0x40 -/* C62704 802419F4 144000B0 */ bnez $v0, .L80241CB8 -/* C62708 802419F8 27A50020 */ addiu $a1, $sp, 0x20 -/* C6270C 802419FC 27B40020 */ addiu $s4, $sp, 0x20 -/* C62710 80241A00 0280282D */ daddu $a1, $s4, $zero -/* C62714 80241A04 27B30024 */ addiu $s3, $sp, 0x24 -/* C62718 80241A08 8EA20000 */ lw $v0, ($s5) -/* C6271C 80241A0C 3C014032 */ lui $at, 0x4032 -/* C62720 80241A10 44811800 */ mtc1 $at, $f3 -/* C62724 80241A14 44801000 */ mtc1 $zero, $f2 -/* C62728 80241A18 C440002C */ lwc1 $f0, 0x2c($v0) -/* C6272C 80241A1C C4460028 */ lwc1 $f6, 0x28($v0) -/* C62730 80241A20 C4440030 */ lwc1 $f4, 0x30($v0) -/* C62734 80241A24 46000021 */ cvt.d.s $f0, $f0 -/* C62738 80241A28 46220000 */ add.d $f0, $f0, $f2 -/* C6273C 80241A2C E7A60020 */ swc1 $f6, 0x20($sp) -/* C62740 80241A30 E7A40028 */ swc1 $f4, 0x28($sp) -/* C62744 80241A34 46200020 */ cvt.s.d $f0, $f0 -/* C62748 80241A38 E7A00024 */ swc1 $f0, 0x24($sp) -/* C6274C 80241A3C E7B40010 */ swc1 $f20, 0x10($sp) -/* C62750 80241A40 E7B60014 */ swc1 $f22, 0x14($sp) -/* C62754 80241A44 862200A8 */ lh $v0, 0xa8($s1) -/* C62758 80241A48 0260302D */ daddu $a2, $s3, $zero -/* C6275C 80241A4C 44820000 */ mtc1 $v0, $f0 -/* C62760 80241A50 00000000 */ nop -/* C62764 80241A54 46800020 */ cvt.s.w $f0, $f0 -/* C62768 80241A58 E7A00018 */ swc1 $f0, 0x18($sp) -/* C6276C 80241A5C 862200A6 */ lh $v0, 0xa6($s1) -/* C62770 80241A60 27B00028 */ addiu $s0, $sp, 0x28 -/* C62774 80241A64 44820000 */ mtc1 $v0, $f0 -/* C62778 80241A68 00000000 */ nop -/* C6277C 80241A6C 46800020 */ cvt.s.w $f0, $f0 -/* C62780 80241A70 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C62784 80241A74 8E240080 */ lw $a0, 0x80($s1) -/* C62788 80241A78 0C037711 */ jal func_800DDC44 -/* C6278C 80241A7C 0200382D */ daddu $a3, $s0, $zero -/* C62790 80241A80 104000CA */ beqz $v0, .L80241DAC -/* C62794 80241A84 0280282D */ daddu $a1, $s4, $zero -/* C62798 80241A88 8EA20000 */ lw $v0, ($s5) -/* C6279C 80241A8C 3C018024 */ lui $at, 0x8024 -/* C627A0 80241A90 D42273F8 */ ldc1 $f2, 0x73f8($at) -/* C627A4 80241A94 C440002C */ lwc1 $f0, 0x2c($v0) -/* C627A8 80241A98 C4460028 */ lwc1 $f6, 0x28($v0) -/* C627AC 80241A9C C4440030 */ lwc1 $f4, 0x30($v0) -/* C627B0 80241AA0 46000021 */ cvt.d.s $f0, $f0 -/* C627B4 80241AA4 46220000 */ add.d $f0, $f0, $f2 -/* C627B8 80241AA8 E7A60020 */ swc1 $f6, 0x20($sp) -/* C627BC 80241AAC E7A40028 */ swc1 $f4, 0x28($sp) -/* C627C0 80241AB0 46200020 */ cvt.s.d $f0, $f0 -/* C627C4 80241AB4 E7A00024 */ swc1 $f0, 0x24($sp) -/* C627C8 80241AB8 E7B40010 */ swc1 $f20, 0x10($sp) -/* C627CC 80241ABC E7B60014 */ swc1 $f22, 0x14($sp) -/* C627D0 80241AC0 862200A8 */ lh $v0, 0xa8($s1) -/* C627D4 80241AC4 44820000 */ mtc1 $v0, $f0 -/* C627D8 80241AC8 00000000 */ nop -/* C627DC 80241ACC 46800020 */ cvt.s.w $f0, $f0 -/* C627E0 80241AD0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C627E4 80241AD4 862200A6 */ lh $v0, 0xa6($s1) -/* C627E8 80241AD8 0260302D */ daddu $a2, $s3, $zero -/* C627EC 80241ADC 44820000 */ mtc1 $v0, $f0 -/* C627F0 80241AE0 00000000 */ nop -/* C627F4 80241AE4 46800020 */ cvt.s.w $f0, $f0 -/* C627F8 80241AE8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C627FC 80241AEC 8E240080 */ lw $a0, 0x80($s1) -/* C62800 80241AF0 0C037711 */ jal func_800DDC44 -/* C62804 80241AF4 0200382D */ daddu $a3, $s0, $zero -/* C62808 80241AF8 27A5002C */ addiu $a1, $sp, 0x2c -/* C6280C 80241AFC 27A60030 */ addiu $a2, $sp, 0x30 -/* C62810 80241B00 27A70034 */ addiu $a3, $sp, 0x34 -/* C62814 80241B04 27A30038 */ addiu $v1, $sp, 0x38 -/* C62818 80241B08 C6220038 */ lwc1 $f2, 0x38($s1) -/* C6281C 80241B0C C620003C */ lwc1 $f0, 0x3c($s1) -/* C62820 80241B10 3C014348 */ lui $at, 0x4348 -/* C62824 80241B14 44813000 */ mtc1 $at, $f6 -/* C62828 80241B18 46000021 */ cvt.d.s $f0, $f0 -/* C6282C 80241B1C E7A2002C */ swc1 $f2, 0x2c($sp) -/* C62830 80241B20 3C014059 */ lui $at, 0x4059 -/* C62834 80241B24 44811800 */ mtc1 $at, $f3 -/* C62838 80241B28 44801000 */ mtc1 $zero, $f2 -/* C6283C 80241B2C C6240040 */ lwc1 $f4, 0x40($s1) -/* C62840 80241B30 46220000 */ add.d $f0, $f0, $f2 -/* C62844 80241B34 E7A60038 */ swc1 $f6, 0x38($sp) -/* C62848 80241B38 E7A40034 */ swc1 $f4, 0x34($sp) -/* C6284C 80241B3C 46200020 */ cvt.s.d $f0, $f0 -/* C62850 80241B40 E7A00030 */ swc1 $f0, 0x30($sp) -/* C62854 80241B44 AFA30010 */ sw $v1, 0x10($sp) -/* C62858 80241B48 8E240080 */ lw $a0, 0x80($s1) -/* C6285C 80241B4C 0C0372DF */ jal func_800DCB7C -/* C62860 80241B50 0040802D */ daddu $s0, $v0, $zero -/* C62864 80241B54 1600001C */ bnez $s0, .L80241BC8 -/* C62868 80241B58 00000000 */ nop -/* C6286C 80241B5C 1040001A */ beqz $v0, .L80241BC8 -/* C62870 80241B60 00000000 */ nop -/* C62874 80241B64 C7A20038 */ lwc1 $f2, 0x38($sp) -/* C62878 80241B68 3C014054 */ lui $at, 0x4054 -/* C6287C 80241B6C 44810800 */ mtc1 $at, $f1 -/* C62880 80241B70 44800000 */ mtc1 $zero, $f0 -/* C62884 80241B74 460010A1 */ cvt.d.s $f2, $f2 -/* C62888 80241B78 4622003C */ c.lt.d $f0, $f2 -/* C6288C 80241B7C 00000000 */ nop -/* C62890 80241B80 45000011 */ bc1f .L80241BC8 -/* C62894 80241B84 00000000 */ nop -/* C62898 80241B88 3C01405E */ lui $at, 0x405e -/* C6289C 80241B8C 44810800 */ mtc1 $at, $f1 -/* C628A0 80241B90 44800000 */ mtc1 $zero, $f0 -/* C628A4 80241B94 00000000 */ nop -/* C628A8 80241B98 4620103C */ c.lt.d $f2, $f0 -/* C628AC 80241B9C 00000000 */ nop -/* C628B0 80241BA0 45000009 */ bc1f .L80241BC8 -/* C628B4 80241BA4 00000000 */ nop -/* C628B8 80241BA8 C622003C */ lwc1 $f2, 0x3c($s1) -/* C628BC 80241BAC C7A00030 */ lwc1 $f0, 0x30($sp) -/* C628C0 80241BB0 46001032 */ c.eq.s $f2, $f0 -/* C628C4 80241BB4 00000000 */ nop -/* C628C8 80241BB8 45010003 */ bc1t .L80241BC8 -/* C628CC 80241BBC 00000000 */ nop -/* C628D0 80241BC0 0809076B */ j .L80241DAC -/* C628D4 80241BC4 241E0001 */ addiu $fp, $zero, 1 -.L80241BC8: -/* C628D8 80241BC8 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* C628DC 80241BCC 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* C628E0 80241BD0 8E020000 */ lw $v0, ($s0) -/* C628E4 80241BD4 3C014024 */ lui $at, 0x4024 -/* C628E8 80241BD8 44811800 */ mtc1 $at, $f3 -/* C628EC 80241BDC 44801000 */ mtc1 $zero, $f2 -/* C628F0 80241BE0 C440002C */ lwc1 $f0, 0x2c($v0) -/* C628F4 80241BE4 C4460028 */ lwc1 $f6, 0x28($v0) -/* C628F8 80241BE8 C4440030 */ lwc1 $f4, 0x30($v0) -/* C628FC 80241BEC 46000021 */ cvt.d.s $f0, $f0 -/* C62900 80241BF0 46220000 */ add.d $f0, $f0, $f2 -/* C62904 80241BF4 E7A60020 */ swc1 $f6, 0x20($sp) -/* C62908 80241BF8 E7A40028 */ swc1 $f4, 0x28($sp) -/* C6290C 80241BFC 46200020 */ cvt.s.d $f0, $f0 -/* C62910 80241C00 E7A00024 */ swc1 $f0, 0x24($sp) -/* C62914 80241C04 E7B40010 */ swc1 $f20, 0x10($sp) -/* C62918 80241C08 E7B60014 */ swc1 $f22, 0x14($sp) -/* C6291C 80241C0C 862200A8 */ lh $v0, 0xa8($s1) -/* C62920 80241C10 27A50020 */ addiu $a1, $sp, 0x20 -/* C62924 80241C14 44820000 */ mtc1 $v0, $f0 -/* C62928 80241C18 00000000 */ nop -/* C6292C 80241C1C 46800020 */ cvt.s.w $f0, $f0 -/* C62930 80241C20 E7A00018 */ swc1 $f0, 0x18($sp) -/* C62934 80241C24 862200A6 */ lh $v0, 0xa6($s1) -/* C62938 80241C28 27A60024 */ addiu $a2, $sp, 0x24 -/* C6293C 80241C2C 44820000 */ mtc1 $v0, $f0 -/* C62940 80241C30 00000000 */ nop -/* C62944 80241C34 46800020 */ cvt.s.w $f0, $f0 -/* C62948 80241C38 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C6294C 80241C3C 8E240080 */ lw $a0, 0x80($s1) -/* C62950 80241C40 0C037711 */ jal func_800DDC44 -/* C62954 80241C44 27A70028 */ addiu $a3, $sp, 0x28 -/* C62958 80241C48 8FA60020 */ lw $a2, 0x20($sp) -/* C6295C 80241C4C 8E020000 */ lw $v0, ($s0) -/* C62960 80241C50 8FA70028 */ lw $a3, 0x28($sp) -/* C62964 80241C54 C44C0028 */ lwc1 $f12, 0x28($v0) -/* C62968 80241C58 C44E0030 */ lwc1 $f14, 0x30($v0) -/* C6296C 80241C5C 0C00A7B5 */ jal dist2D -/* C62970 80241C60 24170001 */ addiu $s7, $zero, 1 -/* C62974 80241C64 46000506 */ mov.s $f20, $f0 -/* C62978 80241C68 8E030000 */ lw $v1, ($s0) -/* C6297C 80241C6C 862200A6 */ lh $v0, 0xa6($s1) -/* C62980 80241C70 4407C000 */ mfc1 $a3, $f24 -/* C62984 80241C74 44824000 */ mtc1 $v0, $f8 -/* C62988 80241C78 00000000 */ nop -/* C6298C 80241C7C 46804220 */ cvt.s.w $f8, $f8 -/* C62990 80241C80 C4600028 */ lwc1 $f0, 0x28($v1) -/* C62994 80241C84 44064000 */ mfc1 $a2, $f8 -/* C62998 80241C88 26240038 */ addiu $a0, $s1, 0x38 -/* C6299C 80241C8C E6200038 */ swc1 $f0, 0x38($s1) -/* C629A0 80241C90 C4600030 */ lwc1 $f0, 0x30($v1) -/* C629A4 80241C94 26250040 */ addiu $a1, $s1, 0x40 -/* C629A8 80241C98 0C00A7E7 */ jal add_vec2D_polar -/* C629AC 80241C9C E6200040 */ swc1 $f0, 0x40($s1) -/* C629B0 80241CA0 862200A6 */ lh $v0, 0xa6($s1) -/* C629B4 80241CA4 44820000 */ mtc1 $v0, $f0 -/* C629B8 80241CA8 00000000 */ nop -/* C629BC 80241CAC 46800020 */ cvt.s.w $f0, $f0 -/* C629C0 80241CB0 08090767 */ j .L80241D9C -/* C629C4 80241CB4 4600A500 */ add.s $f20, $f20, $f0 -.L80241CB8: -/* C629C8 80241CB8 8EA20000 */ lw $v0, ($s5) -/* C629CC 80241CBC 3C014032 */ lui $at, 0x4032 -/* C629D0 80241CC0 44811800 */ mtc1 $at, $f3 -/* C629D4 80241CC4 44801000 */ mtc1 $zero, $f2 -/* C629D8 80241CC8 C440002C */ lwc1 $f0, 0x2c($v0) -/* C629DC 80241CCC C4460028 */ lwc1 $f6, 0x28($v0) -/* C629E0 80241CD0 C4440030 */ lwc1 $f4, 0x30($v0) -/* C629E4 80241CD4 46000021 */ cvt.d.s $f0, $f0 -/* C629E8 80241CD8 46220000 */ add.d $f0, $f0, $f2 -/* C629EC 80241CDC E7A60020 */ swc1 $f6, 0x20($sp) -/* C629F0 80241CE0 E7A40028 */ swc1 $f4, 0x28($sp) -/* C629F4 80241CE4 46200020 */ cvt.s.d $f0, $f0 -/* C629F8 80241CE8 E7A00024 */ swc1 $f0, 0x24($sp) -/* C629FC 80241CEC E7B40010 */ swc1 $f20, 0x10($sp) -/* C62A00 80241CF0 E7B60014 */ swc1 $f22, 0x14($sp) -/* C62A04 80241CF4 862200A8 */ lh $v0, 0xa8($s1) -/* C62A08 80241CF8 44820000 */ mtc1 $v0, $f0 -/* C62A0C 80241CFC 00000000 */ nop -/* C62A10 80241D00 46800020 */ cvt.s.w $f0, $f0 -/* C62A14 80241D04 E7A00018 */ swc1 $f0, 0x18($sp) -/* C62A18 80241D08 862200A6 */ lh $v0, 0xa6($s1) -/* C62A1C 80241D0C 27A60024 */ addiu $a2, $sp, 0x24 -/* C62A20 80241D10 44820000 */ mtc1 $v0, $f0 -/* C62A24 80241D14 00000000 */ nop -/* C62A28 80241D18 46800020 */ cvt.s.w $f0, $f0 -/* C62A2C 80241D1C E7A0001C */ swc1 $f0, 0x1c($sp) -/* C62A30 80241D20 8E240080 */ lw $a0, 0x80($s1) -/* C62A34 80241D24 0C037711 */ jal func_800DDC44 -/* C62A38 80241D28 27A70028 */ addiu $a3, $sp, 0x28 -/* C62A3C 80241D2C 1040001F */ beqz $v0, .L80241DAC -/* C62A40 80241D30 00000000 */ nop -/* C62A44 80241D34 8FA60020 */ lw $a2, 0x20($sp) -/* C62A48 80241D38 8EA20000 */ lw $v0, ($s5) -/* C62A4C 80241D3C 8FA70028 */ lw $a3, 0x28($sp) -/* C62A50 80241D40 C44C0028 */ lwc1 $f12, 0x28($v0) -/* C62A54 80241D44 0C00A7B5 */ jal dist2D -/* C62A58 80241D48 C44E0030 */ lwc1 $f14, 0x30($v0) -/* C62A5C 80241D4C 46000506 */ mov.s $f20, $f0 -/* C62A60 80241D50 8EA30000 */ lw $v1, ($s5) -/* C62A64 80241D54 862200A6 */ lh $v0, 0xa6($s1) -/* C62A68 80241D58 4407C000 */ mfc1 $a3, $f24 -/* C62A6C 80241D5C 44824000 */ mtc1 $v0, $f8 -/* C62A70 80241D60 00000000 */ nop -/* C62A74 80241D64 46804220 */ cvt.s.w $f8, $f8 -/* C62A78 80241D68 C4600028 */ lwc1 $f0, 0x28($v1) -/* C62A7C 80241D6C 44064000 */ mfc1 $a2, $f8 -/* C62A80 80241D70 0200202D */ daddu $a0, $s0, $zero -/* C62A84 80241D74 E6200038 */ swc1 $f0, 0x38($s1) -/* C62A88 80241D78 C4600030 */ lwc1 $f0, 0x30($v1) -/* C62A8C 80241D7C 0260282D */ daddu $a1, $s3, $zero -/* C62A90 80241D80 0C00A7E7 */ jal add_vec2D_polar -/* C62A94 80241D84 E6200040 */ swc1 $f0, 0x40($s1) -/* C62A98 80241D88 862200A6 */ lh $v0, 0xa6($s1) -/* C62A9C 80241D8C 44820000 */ mtc1 $v0, $f0 -/* C62AA0 80241D90 00000000 */ nop -/* C62AA4 80241D94 46800020 */ cvt.s.w $f0, $f0 -/* C62AA8 80241D98 4600A500 */ add.s $f20, $f20, $f0 -.L80241D9C: -/* C62AAC 80241D9C 4406B000 */ mfc1 $a2, $f22 -/* C62AB0 80241DA0 4405A000 */ mfc1 $a1, $f20 -/* C62AB4 80241DA4 0C00EA95 */ jal npc_move_heading -/* C62AB8 80241DA8 0220202D */ daddu $a0, $s1, $zero -.L80241DAC: -/* C62ABC 80241DAC C6400008 */ lwc1 $f0, 8($s2) -/* C62AC0 80241DB0 46800020 */ cvt.s.w $f0, $f0 -/* C62AC4 80241DB4 44050000 */ mfc1 $a1, $f0 -/* C62AC8 80241DB8 C640000C */ lwc1 $f0, 0xc($s2) -/* C62ACC 80241DBC 46800020 */ cvt.s.w $f0, $f0 -/* C62AD0 80241DC0 44060000 */ mfc1 $a2, $f0 -/* C62AD4 80241DC4 C6200040 */ lwc1 $f0, 0x40($s1) -/* C62AD8 80241DC8 26300038 */ addiu $s0, $s1, 0x38 -/* C62ADC 80241DCC E7A00010 */ swc1 $f0, 0x10($sp) -/* C62AE0 80241DD0 C6400010 */ lwc1 $f0, 0x10($s2) -/* C62AE4 80241DD4 46800020 */ cvt.s.w $f0, $f0 -/* C62AE8 80241DD8 E7A00014 */ swc1 $f0, 0x14($sp) -/* C62AEC 80241DDC C6400014 */ lwc1 $f0, 0x14($s2) -/* C62AF0 80241DE0 46800020 */ cvt.s.w $f0, $f0 -/* C62AF4 80241DE4 E7A00018 */ swc1 $f0, 0x18($sp) -/* C62AF8 80241DE8 8E440004 */ lw $a0, 4($s2) -/* C62AFC 80241DEC 8E270038 */ lw $a3, 0x38($s1) -/* C62B00 80241DF0 0C0123F5 */ jal is_point_within_region -/* C62B04 80241DF4 26330040 */ addiu $s3, $s1, 0x40 -/* C62B08 80241DF8 1040005A */ beqz $v0, .L80241F64 -/* C62B0C 80241DFC 00000000 */ nop -/* C62B10 80241E00 8E430004 */ lw $v1, 4($s2) -/* C62B14 80241E04 10600005 */ beqz $v1, .L80241E1C -/* C62B18 80241E08 24020001 */ addiu $v0, $zero, 1 -/* C62B1C 80241E0C 10620029 */ beq $v1, $v0, .L80241EB4 -/* C62B20 80241E10 00000000 */ nop -/* C62B24 80241E14 080907D9 */ j .L80241F64 -/* C62B28 80241E18 00000000 */ nop -.L80241E1C: -/* C62B2C 80241E1C C6480008 */ lwc1 $f8, 8($s2) -/* C62B30 80241E20 46804220 */ cvt.s.w $f8, $f8 -/* C62B34 80241E24 44064000 */ mfc1 $a2, $f8 -/* C62B38 80241E28 C648000C */ lwc1 $f8, 0xc($s2) -/* C62B3C 80241E2C 46804220 */ cvt.s.w $f8, $f8 -/* C62B40 80241E30 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C62B44 80241E34 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C62B48 80241E38 44074000 */ mfc1 $a3, $f8 -/* C62B4C 80241E3C 0C00A7B5 */ jal dist2D -/* C62B50 80241E40 00000000 */ nop -/* C62B54 80241E44 C6420010 */ lwc1 $f2, 0x10($s2) -/* C62B58 80241E48 468010A0 */ cvt.s.w $f2, $f2 -/* C62B5C 80241E4C 4600103C */ c.lt.s $f2, $f0 -/* C62B60 80241E50 00000000 */ nop -/* C62B64 80241E54 45000043 */ bc1f .L80241F64 -/* C62B68 80241E58 E7A00038 */ swc1 $f0, 0x38($sp) -/* C62B6C 80241E5C C64C0008 */ lwc1 $f12, 8($s2) -/* C62B70 80241E60 46806320 */ cvt.s.w $f12, $f12 -/* C62B74 80241E64 8E260038 */ lw $a2, 0x38($s1) -/* C62B78 80241E68 8E270040 */ lw $a3, 0x40($s1) -/* C62B7C 80241E6C C64E000C */ lwc1 $f14, 0xc($s2) -/* C62B80 80241E70 0C00A720 */ jal atan2 -/* C62B84 80241E74 468073A0 */ cvt.s.w $f14, $f14 -/* C62B88 80241E78 0200202D */ daddu $a0, $s0, $zero -/* C62B8C 80241E7C 44070000 */ mfc1 $a3, $f0 -/* C62B90 80241E80 C6400008 */ lwc1 $f0, 8($s2) -/* C62B94 80241E84 46800020 */ cvt.s.w $f0, $f0 -/* C62B98 80241E88 E6200038 */ swc1 $f0, 0x38($s1) -/* C62B9C 80241E8C C640000C */ lwc1 $f0, 0xc($s2) -/* C62BA0 80241E90 46800020 */ cvt.s.w $f0, $f0 -/* C62BA4 80241E94 E6200040 */ swc1 $f0, 0x40($s1) -/* C62BA8 80241E98 C6480010 */ lwc1 $f8, 0x10($s2) -/* C62BAC 80241E9C 46804220 */ cvt.s.w $f8, $f8 -/* C62BB0 80241EA0 44064000 */ mfc1 $a2, $f8 -/* C62BB4 80241EA4 0C00A7E7 */ jal add_vec2D_polar -/* C62BB8 80241EA8 0260282D */ daddu $a1, $s3, $zero -/* C62BBC 80241EAC 080907D9 */ j .L80241F64 -/* C62BC0 80241EB0 00000000 */ nop -.L80241EB4: -/* C62BC4 80241EB4 8E420008 */ lw $v0, 8($s2) -/* C62BC8 80241EB8 8E430010 */ lw $v1, 0x10($s2) -/* C62BCC 80241EBC C6200038 */ lwc1 $f0, 0x38($s1) -/* C62BD0 80241EC0 00431021 */ addu $v0, $v0, $v1 -/* C62BD4 80241EC4 44821000 */ mtc1 $v0, $f2 -/* C62BD8 80241EC8 00000000 */ nop -/* C62BDC 80241ECC 468010A0 */ cvt.s.w $f2, $f2 -/* C62BE0 80241ED0 4600103C */ c.lt.s $f2, $f0 -/* C62BE4 80241ED4 00000000 */ nop -/* C62BE8 80241ED8 45030001 */ bc1tl .L80241EE0 -/* C62BEC 80241EDC E6220038 */ swc1 $f2, 0x38($s1) -.L80241EE0: -/* C62BF0 80241EE0 8E420008 */ lw $v0, 8($s2) -/* C62BF4 80241EE4 8E430010 */ lw $v1, 0x10($s2) -/* C62BF8 80241EE8 C6200038 */ lwc1 $f0, 0x38($s1) -/* C62BFC 80241EEC 00431023 */ subu $v0, $v0, $v1 -/* C62C00 80241EF0 44821000 */ mtc1 $v0, $f2 -/* C62C04 80241EF4 00000000 */ nop -/* C62C08 80241EF8 468010A0 */ cvt.s.w $f2, $f2 -/* C62C0C 80241EFC 4602003C */ c.lt.s $f0, $f2 -/* C62C10 80241F00 00000000 */ nop -/* C62C14 80241F04 45030001 */ bc1tl .L80241F0C -/* C62C18 80241F08 E6220038 */ swc1 $f2, 0x38($s1) -.L80241F0C: -/* C62C1C 80241F0C 8E42000C */ lw $v0, 0xc($s2) -/* C62C20 80241F10 8E430014 */ lw $v1, 0x14($s2) -/* C62C24 80241F14 C6200040 */ lwc1 $f0, 0x40($s1) -/* C62C28 80241F18 00431021 */ addu $v0, $v0, $v1 -/* C62C2C 80241F1C 44821000 */ mtc1 $v0, $f2 -/* C62C30 80241F20 00000000 */ nop -/* C62C34 80241F24 468010A0 */ cvt.s.w $f2, $f2 -/* C62C38 80241F28 4600103C */ c.lt.s $f2, $f0 -/* C62C3C 80241F2C 00000000 */ nop -/* C62C40 80241F30 45030001 */ bc1tl .L80241F38 -/* C62C44 80241F34 E6220040 */ swc1 $f2, 0x40($s1) -.L80241F38: -/* C62C48 80241F38 8E42000C */ lw $v0, 0xc($s2) -/* C62C4C 80241F3C 8E430014 */ lw $v1, 0x14($s2) -/* C62C50 80241F40 C6200040 */ lwc1 $f0, 0x40($s1) -/* C62C54 80241F44 00431023 */ subu $v0, $v0, $v1 -/* C62C58 80241F48 44821000 */ mtc1 $v0, $f2 -/* C62C5C 80241F4C 00000000 */ nop -/* C62C60 80241F50 468010A0 */ cvt.s.w $f2, $f2 -/* C62C64 80241F54 4602003C */ c.lt.s $f0, $f2 -/* C62C68 80241F58 00000000 */ nop -/* C62C6C 80241F5C 45030001 */ bc1tl .L80241F64 -/* C62C70 80241F60 E6220040 */ swc1 $f2, 0x40($s1) -.L80241F64: -/* C62C74 80241F64 16E0001F */ bnez $s7, .L80241FE4 -/* C62C78 80241F68 00000000 */ nop -/* C62C7C 80241F6C 8E220000 */ lw $v0, ($s1) -/* C62C80 80241F70 30420008 */ andi $v0, $v0, 8 -/* C62C84 80241F74 10400003 */ beqz $v0, .L80241F84 -/* C62C88 80241F78 27A50020 */ addiu $a1, $sp, 0x20 -/* C62C8C 80241F7C 13C00019 */ beqz $fp, .L80241FE4 -/* C62C90 80241F80 00000000 */ nop -.L80241F84: -/* C62C94 80241F84 27A60024 */ addiu $a2, $sp, 0x24 -/* C62C98 80241F88 27A20038 */ addiu $v0, $sp, 0x38 -/* C62C9C 80241F8C C6220038 */ lwc1 $f2, 0x38($s1) -/* C62CA0 80241F90 C620003C */ lwc1 $f0, 0x3c($s1) -/* C62CA4 80241F94 3C0143C8 */ lui $at, 0x43c8 -/* C62CA8 80241F98 44813000 */ mtc1 $at, $f6 -/* C62CAC 80241F9C 46000021 */ cvt.d.s $f0, $f0 -/* C62CB0 80241FA0 E7A20020 */ swc1 $f2, 0x20($sp) -/* C62CB4 80241FA4 3C018024 */ lui $at, 0x8024 -/* C62CB8 80241FA8 D4227400 */ ldc1 $f2, 0x7400($at) -/* C62CBC 80241FAC C6240040 */ lwc1 $f4, 0x40($s1) -/* C62CC0 80241FB0 46220000 */ add.d $f0, $f0, $f2 -/* C62CC4 80241FB4 E7A60038 */ swc1 $f6, 0x38($sp) -/* C62CC8 80241FB8 E7A40028 */ swc1 $f4, 0x28($sp) -/* C62CCC 80241FBC 46200020 */ cvt.s.d $f0, $f0 -/* C62CD0 80241FC0 E7A00024 */ swc1 $f0, 0x24($sp) -/* C62CD4 80241FC4 AFA20010 */ sw $v0, 0x10($sp) -/* C62CD8 80241FC8 8E240080 */ lw $a0, 0x80($s1) -/* C62CDC 80241FCC 0C0372DF */ jal func_800DCB7C -/* C62CE0 80241FD0 27A70028 */ addiu $a3, $sp, 0x28 -/* C62CE4 80241FD4 10400003 */ beqz $v0, .L80241FE4 -/* C62CE8 80241FD8 00000000 */ nop -/* C62CEC 80241FDC C7A00024 */ lwc1 $f0, 0x24($sp) -/* C62CF0 80241FE0 E620003C */ swc1 $f0, 0x3c($s1) -.L80241FE4: -/* C62CF4 80241FE4 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C62CF8 80241FE8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C62CFC 80241FEC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C62D00 80241FF0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C62D04 80241FF4 8C460028 */ lw $a2, 0x28($v0) -/* C62D08 80241FF8 0C00A720 */ jal atan2 -/* C62D0C 80241FFC 8C470030 */ lw $a3, 0x30($v0) -/* C62D10 80242000 0220202D */ daddu $a0, $s1, $zero -/* C62D14 80242004 24050321 */ addiu $a1, $zero, 0x321 -/* C62D18 80242008 0000302D */ daddu $a2, $zero, $zero -/* C62D1C 8024200C 0C012530 */ jal func_800494C0 -/* C62D20 80242010 E620000C */ swc1 $f0, 0xc($s1) -/* C62D24 80242014 8EC200CC */ lw $v0, 0xcc($s6) -/* C62D28 80242018 8C420024 */ lw $v0, 0x24($v0) -/* C62D2C 8024201C AE220028 */ sw $v0, 0x28($s1) -/* C62D30 80242020 96C20096 */ lhu $v0, 0x96($s6) -/* C62D34 80242024 A622008E */ sh $v0, 0x8e($s1) -/* C62D38 80242028 8FA80080 */ lw $t0, 0x80($sp) -/* C62D3C 8024202C 2402000B */ addiu $v0, $zero, 0xb -/* C62D40 80242030 AD020070 */ sw $v0, 0x70($t0) -.L80242034: -/* C62D44 80242034 8FBF0064 */ lw $ra, 0x64($sp) -/* C62D48 80242038 8FBE0060 */ lw $fp, 0x60($sp) -/* C62D4C 8024203C 8FB7005C */ lw $s7, 0x5c($sp) -/* C62D50 80242040 8FB60058 */ lw $s6, 0x58($sp) -/* C62D54 80242044 8FB50054 */ lw $s5, 0x54($sp) -/* C62D58 80242048 8FB40050 */ lw $s4, 0x50($sp) -/* C62D5C 8024204C 8FB3004C */ lw $s3, 0x4c($sp) -/* C62D60 80242050 8FB20048 */ lw $s2, 0x48($sp) -/* C62D64 80242054 8FB10044 */ lw $s1, 0x44($sp) -/* C62D68 80242058 8FB00040 */ lw $s0, 0x40($sp) -/* C62D6C 8024205C D7B80078 */ ldc1 $f24, 0x78($sp) -/* C62D70 80242060 D7B60070 */ ldc1 $f22, 0x70($sp) -/* C62D74 80242064 D7B40068 */ ldc1 $f20, 0x68($sp) -/* C62D78 80242068 03E00008 */ jr $ra -/* C62D7C 8024206C 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80242070_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80242070_C60D10.s deleted file mode 100644 index b534dad607..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80242070_C60D10.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242070_C62D80 -/* C62D80 80242070 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C62D84 80242074 AFB10014 */ sw $s1, 0x14($sp) -/* C62D88 80242078 0080882D */ daddu $s1, $a0, $zero -/* C62D8C 8024207C AFBF0018 */ sw $ra, 0x18($sp) -/* C62D90 80242080 AFB00010 */ sw $s0, 0x10($sp) -/* C62D94 80242084 8E300148 */ lw $s0, 0x148($s1) -/* C62D98 80242088 0C00EABB */ jal get_npc_unsafe -/* C62D9C 8024208C 86040008 */ lh $a0, 8($s0) -/* C62DA0 80242090 0040202D */ daddu $a0, $v0, $zero -/* C62DA4 80242094 9482008E */ lhu $v0, 0x8e($a0) -/* C62DA8 80242098 2442FFFF */ addiu $v0, $v0, -1 -/* C62DAC 8024209C A482008E */ sh $v0, 0x8e($a0) -/* C62DB0 802420A0 00021400 */ sll $v0, $v0, 0x10 -/* C62DB4 802420A4 8E030098 */ lw $v1, 0x98($s0) -/* C62DB8 802420A8 00021403 */ sra $v0, $v0, 0x10 -/* C62DBC 802420AC 0062182A */ slt $v1, $v1, $v0 -/* C62DC0 802420B0 14600005 */ bnez $v1, .L802420C8 -/* C62DC4 802420B4 3C03E0EF */ lui $v1, 0xe0ef -/* C62DC8 802420B8 8E020000 */ lw $v0, ($s0) -/* C62DCC 802420BC 3463FFFF */ ori $v1, $v1, 0xffff -/* C62DD0 802420C0 00431024 */ and $v0, $v0, $v1 -/* C62DD4 802420C4 AE020000 */ sw $v0, ($s0) -.L802420C8: -/* C62DD8 802420C8 8482008E */ lh $v0, 0x8e($a0) -/* C62DDC 802420CC 14400007 */ bnez $v0, .L802420EC -/* C62DE0 802420D0 00000000 */ nop -/* C62DE4 802420D4 8E0200CC */ lw $v0, 0xcc($s0) -/* C62DE8 802420D8 8C420028 */ lw $v0, 0x28($v0) -/* C62DEC 802420DC A480008E */ sh $zero, 0x8e($a0) -/* C62DF0 802420E0 AC820028 */ sw $v0, 0x28($a0) -/* C62DF4 802420E4 2402000C */ addiu $v0, $zero, 0xc -/* C62DF8 802420E8 AE220070 */ sw $v0, 0x70($s1) -.L802420EC: -/* C62DFC 802420EC 8FBF0018 */ lw $ra, 0x18($sp) -/* C62E00 802420F0 8FB10014 */ lw $s1, 0x14($sp) -/* C62E04 802420F4 8FB00010 */ lw $s0, 0x10($sp) -/* C62E08 802420F8 03E00008 */ jr $ra -/* C62E0C 802420FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80242200_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80242200_C60D10.s deleted file mode 100644 index 38cdfa03b4..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80242200_C60D10.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242200_C62F10 -/* C62F10 80242200 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C62F14 80242204 AFB10014 */ sw $s1, 0x14($sp) -/* C62F18 80242208 0080882D */ daddu $s1, $a0, $zero -/* C62F1C 8024220C AFBF0018 */ sw $ra, 0x18($sp) -/* C62F20 80242210 AFB00010 */ sw $s0, 0x10($sp) -/* C62F24 80242214 8E300148 */ lw $s0, 0x148($s1) -/* C62F28 80242218 0C00EABB */ jal get_npc_unsafe -/* C62F2C 8024221C 86040008 */ lh $a0, 8($s0) -/* C62F30 80242220 0040182D */ daddu $v1, $v0, $zero -/* C62F34 80242224 9462008E */ lhu $v0, 0x8e($v1) -/* C62F38 80242228 2442FFFF */ addiu $v0, $v0, -1 -/* C62F3C 8024222C A462008E */ sh $v0, 0x8e($v1) -/* C62F40 80242230 00021400 */ sll $v0, $v0, 0x10 -/* C62F44 80242234 14400005 */ bnez $v0, .L8024224C -/* C62F48 80242238 00000000 */ nop -/* C62F4C 8024223C 960200AA */ lhu $v0, 0xaa($s0) -/* C62F50 80242240 A462008E */ sh $v0, 0x8e($v1) -/* C62F54 80242244 2402000E */ addiu $v0, $zero, 0xe -/* C62F58 80242248 AE220070 */ sw $v0, 0x70($s1) -.L8024224C: -/* C62F5C 8024224C 8FBF0018 */ lw $ra, 0x18($sp) -/* C62F60 80242250 8FB10014 */ lw $s1, 0x14($sp) -/* C62F64 80242254 8FB00010 */ lw $s0, 0x10($sp) -/* C62F68 80242258 03E00008 */ jr $ra -/* C62F6C 8024225C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80242260_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80242260_C60D10.s deleted file mode 100644 index a6c585bc00..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80242260_C60D10.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242260_C62F70 -/* C62F70 80242260 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C62F74 80242264 AFB40040 */ sw $s4, 0x40($sp) -/* C62F78 80242268 0080A02D */ daddu $s4, $a0, $zero -/* C62F7C 8024226C AFBF0044 */ sw $ra, 0x44($sp) -/* C62F80 80242270 AFB3003C */ sw $s3, 0x3c($sp) -/* C62F84 80242274 AFB20038 */ sw $s2, 0x38($sp) -/* C62F88 80242278 AFB10034 */ sw $s1, 0x34($sp) -/* C62F8C 8024227C AFB00030 */ sw $s0, 0x30($sp) -/* C62F90 80242280 8E910148 */ lw $s1, 0x148($s4) -/* C62F94 80242284 00A0902D */ daddu $s2, $a1, $zero -/* C62F98 80242288 86240008 */ lh $a0, 8($s1) -/* C62F9C 8024228C 0C00EABB */ jal get_npc_unsafe -/* C62FA0 80242290 00C0982D */ daddu $s3, $a2, $zero -/* C62FA4 80242294 0040802D */ daddu $s0, $v0, $zero -/* C62FA8 80242298 9602008E */ lhu $v0, 0x8e($s0) -/* C62FAC 8024229C 2442FFFF */ addiu $v0, $v0, -1 -/* C62FB0 802422A0 A602008E */ sh $v0, 0x8e($s0) -/* C62FB4 802422A4 00021400 */ sll $v0, $v0, 0x10 -/* C62FB8 802422A8 14400020 */ bnez $v0, .L8024232C -/* C62FBC 802422AC 0260202D */ daddu $a0, $s3, $zero -/* C62FC0 802422B0 AFA00010 */ sw $zero, 0x10($sp) -/* C62FC4 802422B4 8E46000C */ lw $a2, 0xc($s2) -/* C62FC8 802422B8 8E470010 */ lw $a3, 0x10($s2) -/* C62FCC 802422BC 0C01242D */ jal func_800490B4 -/* C62FD0 802422C0 0220282D */ daddu $a1, $s1, $zero -/* C62FD4 802422C4 54400018 */ bnel $v0, $zero, .L80242328 -/* C62FD8 802422C8 A600008E */ sh $zero, 0x8e($s0) -/* C62FDC 802422CC 24040002 */ addiu $a0, $zero, 2 -/* C62FE0 802422D0 0200282D */ daddu $a1, $s0, $zero -/* C62FE4 802422D4 0000302D */ daddu $a2, $zero, $zero -/* C62FE8 802422D8 860300A8 */ lh $v1, 0xa8($s0) -/* C62FEC 802422DC 3C013F80 */ lui $at, 0x3f80 -/* C62FF0 802422E0 44810000 */ mtc1 $at, $f0 -/* C62FF4 802422E4 3C014000 */ lui $at, 0x4000 -/* C62FF8 802422E8 44811000 */ mtc1 $at, $f2 -/* C62FFC 802422EC 3C01C1A0 */ lui $at, 0xc1a0 -/* C63000 802422F0 44812000 */ mtc1 $at, $f4 -/* C63004 802422F4 2402000F */ addiu $v0, $zero, 0xf -/* C63008 802422F8 AFA2001C */ sw $v0, 0x1c($sp) -/* C6300C 802422FC 44833000 */ mtc1 $v1, $f6 -/* C63010 80242300 00000000 */ nop -/* C63014 80242304 468031A0 */ cvt.s.w $f6, $f6 -/* C63018 80242308 44073000 */ mfc1 $a3, $f6 -/* C6301C 8024230C 27A20028 */ addiu $v0, $sp, 0x28 -/* C63020 80242310 AFA20020 */ sw $v0, 0x20($sp) -/* C63024 80242314 E7A00010 */ swc1 $f0, 0x10($sp) -/* C63028 80242318 E7A20014 */ swc1 $f2, 0x14($sp) -/* C6302C 8024231C 0C01BFA4 */ jal fx_emote -/* C63030 80242320 E7A40018 */ swc1 $f4, 0x18($sp) -/* C63034 80242324 A600008E */ sh $zero, 0x8e($s0) -.L80242328: -/* C63038 80242328 AE800070 */ sw $zero, 0x70($s4) -.L8024232C: -/* C6303C 8024232C 8FBF0044 */ lw $ra, 0x44($sp) -/* C63040 80242330 8FB40040 */ lw $s4, 0x40($sp) -/* C63044 80242334 8FB3003C */ lw $s3, 0x3c($sp) -/* C63048 80242338 8FB20038 */ lw $s2, 0x38($sp) -/* C6304C 8024233C 8FB10034 */ lw $s1, 0x34($sp) -/* C63050 80242340 8FB00030 */ lw $s0, 0x30($sp) -/* C63054 80242344 03E00008 */ jr $ra -/* C63058 80242348 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_8024234C_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_8024234C_C60D10.s deleted file mode 100644 index c0ea8c2b24..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_8024234C_C60D10.s +++ /dev/null @@ -1,165 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024234C_C6305C -/* C6305C 8024234C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C63060 80242350 AFB20038 */ sw $s2, 0x38($sp) -/* C63064 80242354 0080902D */ daddu $s2, $a0, $zero -/* C63068 80242358 AFBF0048 */ sw $ra, 0x48($sp) -/* C6306C 8024235C AFB50044 */ sw $s5, 0x44($sp) -/* C63070 80242360 AFB40040 */ sw $s4, 0x40($sp) -/* C63074 80242364 AFB3003C */ sw $s3, 0x3c($sp) -/* C63078 80242368 AFB10034 */ sw $s1, 0x34($sp) -/* C6307C 8024236C AFB00030 */ sw $s0, 0x30($sp) -/* C63080 80242370 8E510148 */ lw $s1, 0x148($s2) -/* C63084 80242374 86240008 */ lh $a0, 8($s1) -/* C63088 80242378 0C00EABB */ jal get_npc_unsafe -/* C6308C 8024237C 00A0802D */ daddu $s0, $a1, $zero -/* C63090 80242380 8E43000C */ lw $v1, 0xc($s2) -/* C63094 80242384 0240202D */ daddu $a0, $s2, $zero -/* C63098 80242388 8C650000 */ lw $a1, ($v1) -/* C6309C 8024238C 0C0B1EAF */ jal get_variable -/* C630A0 80242390 0040A82D */ daddu $s5, $v0, $zero -/* C630A4 80242394 AFA00010 */ sw $zero, 0x10($sp) -/* C630A8 80242398 8E2300D0 */ lw $v1, 0xd0($s1) -/* C630AC 8024239C 8C630030 */ lw $v1, 0x30($v1) -/* C630B0 802423A0 AFA30014 */ sw $v1, 0x14($sp) -/* C630B4 802423A4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C630B8 802423A8 8C63001C */ lw $v1, 0x1c($v1) -/* C630BC 802423AC AFA30018 */ sw $v1, 0x18($sp) -/* C630C0 802423B0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C630C4 802423B4 8C630024 */ lw $v1, 0x24($v1) -/* C630C8 802423B8 AFA3001C */ sw $v1, 0x1c($sp) -/* C630CC 802423BC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C630D0 802423C0 8C630028 */ lw $v1, 0x28($v1) -/* C630D4 802423C4 27B40010 */ addiu $s4, $sp, 0x10 -/* C630D8 802423C8 AFA30020 */ sw $v1, 0x20($sp) -/* C630DC 802423CC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C630E0 802423D0 3C014348 */ lui $at, 0x4348 -/* C630E4 802423D4 44810000 */ mtc1 $at, $f0 -/* C630E8 802423D8 8C63002C */ lw $v1, 0x2c($v1) -/* C630EC 802423DC 0040982D */ daddu $s3, $v0, $zero -/* C630F0 802423E0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C630F4 802423E4 A7A0002C */ sh $zero, 0x2c($sp) -/* C630F8 802423E8 16000005 */ bnez $s0, .L80242400 -/* C630FC 802423EC AFA30024 */ sw $v1, 0x24($sp) -/* C63100 802423F0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C63104 802423F4 30420004 */ andi $v0, $v0, 4 -/* C63108 802423F8 10400011 */ beqz $v0, .L80242440 -/* C6310C 802423FC 00000000 */ nop -.L80242400: -/* C63110 80242400 AE400070 */ sw $zero, 0x70($s2) -/* C63114 80242404 A6A0008E */ sh $zero, 0x8e($s5) -/* C63118 80242408 8E2200CC */ lw $v0, 0xcc($s1) -/* C6311C 8024240C 8C420000 */ lw $v0, ($v0) -/* C63120 80242410 AEA20028 */ sw $v0, 0x28($s5) -/* C63124 80242414 8E2200B0 */ lw $v0, 0xb0($s1) -/* C63128 80242418 30420004 */ andi $v0, $v0, 4 -/* C6312C 8024241C 10400008 */ beqz $v0, .L80242440 -/* C63130 80242420 AE20006C */ sw $zero, 0x6c($s1) -/* C63134 80242424 24020063 */ addiu $v0, $zero, 0x63 -/* C63138 80242428 AE420070 */ sw $v0, 0x70($s2) -/* C6313C 8024242C AE400074 */ sw $zero, 0x74($s2) -/* C63140 80242430 8E2200B0 */ lw $v0, 0xb0($s1) -/* C63144 80242434 2403FFFB */ addiu $v1, $zero, -5 -/* C63148 80242438 00431024 */ and $v0, $v0, $v1 -/* C6314C 8024243C AE2200B0 */ sw $v0, 0xb0($s1) -.L80242440: -/* C63150 80242440 8E430070 */ lw $v1, 0x70($s2) -/* C63154 80242444 2410000B */ addiu $s0, $zero, 0xb -/* C63158 80242448 1070002A */ beq $v1, $s0, .L802424F4 -/* C6315C 8024244C 2862000C */ slti $v0, $v1, 0xc -/* C63160 80242450 1040000D */ beqz $v0, .L80242488 -/* C63164 80242454 24020001 */ addiu $v0, $zero, 1 -/* C63168 80242458 1062001A */ beq $v1, $v0, .L802424C4 -/* C6316C 8024245C 28620002 */ slti $v0, $v1, 2 -/* C63170 80242460 10400005 */ beqz $v0, .L80242478 -/* C63174 80242464 2402000A */ addiu $v0, $zero, 0xa -/* C63178 80242468 10600013 */ beqz $v1, .L802424B8 -/* C6317C 8024246C 0240202D */ daddu $a0, $s2, $zero -/* C63180 80242470 0809095D */ j .L80242574 -/* C63184 80242474 00000000 */ nop -.L80242478: -/* C63188 80242478 10620018 */ beq $v1, $v0, .L802424DC -/* C6318C 8024247C 0240202D */ daddu $a0, $s2, $zero -/* C63190 80242480 0809095D */ j .L80242574 -/* C63194 80242484 00000000 */ nop -.L80242488: -/* C63198 80242488 2402000D */ addiu $v0, $zero, 0xd -/* C6319C 8024248C 10620029 */ beq $v1, $v0, .L80242534 -/* C631A0 80242490 0062102A */ slt $v0, $v1, $v0 -/* C631A4 80242494 14400020 */ bnez $v0, .L80242518 -/* C631A8 80242498 0240202D */ daddu $a0, $s2, $zero -/* C631AC 8024249C 2402000E */ addiu $v0, $zero, 0xe -/* C631B0 802424A0 1062002D */ beq $v1, $v0, .L80242558 -/* C631B4 802424A4 24020063 */ addiu $v0, $zero, 0x63 -/* C631B8 802424A8 10620030 */ beq $v1, $v0, .L8024256C -/* C631BC 802424AC 00000000 */ nop -/* C631C0 802424B0 0809095D */ j .L80242574 -/* C631C4 802424B4 00000000 */ nop -.L802424B8: -/* C631C8 802424B8 0260282D */ daddu $a1, $s3, $zero -/* C631CC 802424BC 0C090532 */ jal func_802414C8 -/* C631D0 802424C0 0280302D */ daddu $a2, $s4, $zero -.L802424C4: -/* C631D4 802424C4 0240202D */ daddu $a0, $s2, $zero -/* C631D8 802424C8 0260282D */ daddu $a1, $s3, $zero -/* C631DC 802424CC 0C09054D */ jal func_80241534 -/* C631E0 802424D0 0280302D */ daddu $a2, $s4, $zero -/* C631E4 802424D4 0809095D */ j .L80242574 -/* C631E8 802424D8 00000000 */ nop -.L802424DC: -/* C631EC 802424DC 0260282D */ daddu $a1, $s3, $zero -/* C631F0 802424E0 0C09058C */ jal func_80241630 -/* C631F4 802424E4 0280302D */ daddu $a2, $s4, $zero -/* C631F8 802424E8 8E420070 */ lw $v0, 0x70($s2) -/* C631FC 802424EC 14500021 */ bne $v0, $s0, .L80242574 -/* C63200 802424F0 00000000 */ nop -.L802424F4: -/* C63204 802424F4 0240202D */ daddu $a0, $s2, $zero -/* C63208 802424F8 0260282D */ daddu $a1, $s3, $zero -/* C6320C 802424FC 0C09081C */ jal func_80242070 -/* C63210 80242500 0280302D */ daddu $a2, $s4, $zero -/* C63214 80242504 8E430070 */ lw $v1, 0x70($s2) -/* C63218 80242508 2402000C */ addiu $v0, $zero, 0xc -/* C6321C 8024250C 14620019 */ bne $v1, $v0, .L80242574 -/* C63220 80242510 00000000 */ nop -/* C63224 80242514 0240202D */ daddu $a0, $s2, $zero -.L80242518: -/* C63228 80242518 0260282D */ daddu $a1, $s3, $zero -/* C6322C 8024251C 0C090840 */ jal func_80242100 -/* C63230 80242520 0280302D */ daddu $a2, $s4, $zero -/* C63234 80242524 8E430070 */ lw $v1, 0x70($s2) -/* C63238 80242528 2402000D */ addiu $v0, $zero, 0xd -/* C6323C 8024252C 14620011 */ bne $v1, $v0, .L80242574 -/* C63240 80242530 00000000 */ nop -.L80242534: -/* C63244 80242534 0240202D */ daddu $a0, $s2, $zero -/* C63248 80242538 0260282D */ daddu $a1, $s3, $zero -/* C6324C 8024253C 0C090880 */ jal func_80242200 -/* C63250 80242540 0280302D */ daddu $a2, $s4, $zero -/* C63254 80242544 8E430070 */ lw $v1, 0x70($s2) -/* C63258 80242548 2402000E */ addiu $v0, $zero, 0xe -/* C6325C 8024254C 14620009 */ bne $v1, $v0, .L80242574 -/* C63260 80242550 00000000 */ nop -/* C63264 80242554 0240202D */ daddu $a0, $s2, $zero -.L80242558: -/* C63268 80242558 0260282D */ daddu $a1, $s3, $zero -/* C6326C 8024255C 0C090898 */ jal func_80242260 -/* C63270 80242560 0280302D */ daddu $a2, $s4, $zero -/* C63274 80242564 0809095D */ j .L80242574 -/* C63278 80242568 00000000 */ nop -.L8024256C: -/* C6327C 8024256C 0C0129CF */ jal func_8004A73C -/* C63280 80242570 0240202D */ daddu $a0, $s2, $zero -.L80242574: -/* C63284 80242574 8FBF0048 */ lw $ra, 0x48($sp) -/* C63288 80242578 8FB50044 */ lw $s5, 0x44($sp) -/* C6328C 8024257C 8FB40040 */ lw $s4, 0x40($sp) -/* C63290 80242580 8FB3003C */ lw $s3, 0x3c($sp) -/* C63294 80242584 8FB20038 */ lw $s2, 0x38($sp) -/* C63298 80242588 8FB10034 */ lw $s1, 0x34($sp) -/* C6329C 8024258C 8FB00030 */ lw $s0, 0x30($sp) -/* C632A0 80242590 0000102D */ daddu $v0, $zero, $zero -/* C632A4 80242594 03E00008 */ jr $ra -/* C632A8 80242598 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_8024259C_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_8024259C_C60D10.s deleted file mode 100644 index 97c8ab03a0..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_8024259C_C60D10.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024259C_C632AC -/* C632AC 8024259C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C632B0 802425A0 AFB00010 */ sw $s0, 0x10($sp) -/* C632B4 802425A4 3C108024 */ lui $s0, 0x8024 -/* C632B8 802425A8 261041A0 */ addiu $s0, $s0, 0x41a0 -/* C632BC 802425AC AFBF0018 */ sw $ra, 0x18($sp) -/* C632C0 802425B0 AFB10014 */ sw $s1, 0x14($sp) -/* C632C4 802425B4 8E020000 */ lw $v0, ($s0) -/* C632C8 802425B8 14400010 */ bnez $v0, .L802425FC -/* C632CC 802425BC 0080882D */ daddu $s1, $a0, $zero -/* C632D0 802425C0 0C00AB39 */ jal heap_malloc -/* C632D4 802425C4 24040040 */ addiu $a0, $zero, 0x40 -/* C632D8 802425C8 AE020000 */ sw $v0, ($s0) -/* C632DC 802425CC 0000182D */ daddu $v1, $zero, $zero -/* C632E0 802425D0 0040282D */ daddu $a1, $v0, $zero -/* C632E4 802425D4 0220202D */ daddu $a0, $s1, $zero -.L802425D8: -/* C632E8 802425D8 8C820084 */ lw $v0, 0x84($a0) -/* C632EC 802425DC 24840004 */ addiu $a0, $a0, 4 -/* C632F0 802425E0 24630001 */ addiu $v1, $v1, 1 -/* C632F4 802425E4 ACA20000 */ sw $v0, ($a1) -/* C632F8 802425E8 28620010 */ slti $v0, $v1, 0x10 -/* C632FC 802425EC 1440FFFA */ bnez $v0, .L802425D8 -/* C63300 802425F0 24A50004 */ addiu $a1, $a1, 4 -/* C63304 802425F4 0809098E */ j .L80242638 -/* C63308 802425F8 00000000 */ nop -.L802425FC: -/* C6330C 802425FC 0000182D */ daddu $v1, $zero, $zero -/* C63310 80242600 0040282D */ daddu $a1, $v0, $zero -/* C63314 80242604 0220202D */ daddu $a0, $s1, $zero -.L80242608: -/* C63318 80242608 8CA20000 */ lw $v0, ($a1) -/* C6331C 8024260C 24A50004 */ addiu $a1, $a1, 4 -/* C63320 80242610 24630001 */ addiu $v1, $v1, 1 -/* C63324 80242614 AC820084 */ sw $v0, 0x84($a0) -/* C63328 80242618 28620010 */ slti $v0, $v1, 0x10 -/* C6332C 8024261C 1440FFFA */ bnez $v0, .L80242608 -/* C63330 80242620 24840004 */ addiu $a0, $a0, 4 -/* C63334 80242624 3C108024 */ lui $s0, 0x8024 -/* C63338 80242628 261041A0 */ addiu $s0, $s0, 0x41a0 -/* C6333C 8024262C 0C00AB4B */ jal heap_free -/* C63340 80242630 8E040000 */ lw $a0, ($s0) -/* C63344 80242634 AE000000 */ sw $zero, ($s0) -.L80242638: -/* C63348 80242638 8FBF0018 */ lw $ra, 0x18($sp) -/* C6334C 8024263C 8FB10014 */ lw $s1, 0x14($sp) -/* C63350 80242640 8FB00010 */ lw $s0, 0x10($sp) -/* C63354 80242644 24020002 */ addiu $v0, $zero, 2 -/* C63358 80242648 03E00008 */ jr $ra -/* C6335C 8024264C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_802426B4_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_802426B4_C60D10.s deleted file mode 100644 index ad1756b3a3..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_802426B4_C60D10.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426B4_C633C4 -/* C633C4 802426B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C633C8 802426B8 AFB10014 */ sw $s1, 0x14($sp) -/* C633CC 802426BC 0080882D */ daddu $s1, $a0, $zero -/* C633D0 802426C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C633D4 802426C4 AFB00010 */ sw $s0, 0x10($sp) -/* C633D8 802426C8 8E30000C */ lw $s0, 0xc($s1) -/* C633DC 802426CC 8E050000 */ lw $a1, ($s0) -/* C633E0 802426D0 0C0B1EAF */ jal get_variable -/* C633E4 802426D4 26100004 */ addiu $s0, $s0, 4 -/* C633E8 802426D8 0C00EAD2 */ jal get_npc_safe -/* C633EC 802426DC 0040202D */ daddu $a0, $v0, $zero -/* C633F0 802426E0 10400005 */ beqz $v0, .L802426F8 -/* C633F4 802426E4 00000000 */ nop -/* C633F8 802426E8 8E050000 */ lw $a1, ($s0) -/* C633FC 802426EC 844600A8 */ lh $a2, 0xa8($v0) -/* C63400 802426F0 0C0B2026 */ jal set_variable -/* C63404 802426F4 0220202D */ daddu $a0, $s1, $zero -.L802426F8: -/* C63408 802426F8 8FBF0018 */ lw $ra, 0x18($sp) -/* C6340C 802426FC 8FB10014 */ lw $s1, 0x14($sp) -/* C63410 80242700 8FB00010 */ lw $s0, 0x10($sp) -/* C63414 80242704 24020002 */ addiu $v0, $zero, 2 -/* C63418 80242708 03E00008 */ jr $ra -/* C6341C 8024270C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80242710_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80242710_C60D10.s deleted file mode 100644 index 7f552749c5..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80242710_C60D10.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242710_C63420 -/* C63420 80242710 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C63424 80242714 AFB10014 */ sw $s1, 0x14($sp) -/* C63428 80242718 0080882D */ daddu $s1, $a0, $zero -/* C6342C 8024271C AFBF0024 */ sw $ra, 0x24($sp) -/* C63430 80242720 AFB40020 */ sw $s4, 0x20($sp) -/* C63434 80242724 AFB3001C */ sw $s3, 0x1c($sp) -/* C63438 80242728 AFB20018 */ sw $s2, 0x18($sp) -/* C6343C 8024272C AFB00010 */ sw $s0, 0x10($sp) -/* C63440 80242730 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* C63444 80242734 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* C63448 80242738 F7B80038 */ sdc1 $f24, 0x38($sp) -/* C6344C 8024273C F7B60030 */ sdc1 $f22, 0x30($sp) -/* C63450 80242740 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C63454 80242744 8E30000C */ lw $s0, 0xc($s1) -/* C63458 80242748 8E130000 */ lw $s3, ($s0) -/* C6345C 8024274C 26100004 */ addiu $s0, $s0, 4 -/* C63460 80242750 0C0B1EAF */ jal get_variable -/* C63464 80242754 0260282D */ daddu $a1, $s3, $zero -/* C63468 80242758 4482E000 */ mtc1 $v0, $f28 -/* C6346C 8024275C 00000000 */ nop -/* C63470 80242760 4680E720 */ cvt.s.w $f28, $f28 -/* C63474 80242764 8E140000 */ lw $s4, ($s0) -/* C63478 80242768 26100004 */ addiu $s0, $s0, 4 -/* C6347C 8024276C 0220202D */ daddu $a0, $s1, $zero -/* C63480 80242770 0C0B1EAF */ jal get_variable -/* C63484 80242774 0280282D */ daddu $a1, $s4, $zero -/* C63488 80242778 4482D000 */ mtc1 $v0, $f26 -/* C6348C 8024277C 00000000 */ nop -/* C63490 80242780 4680D6A0 */ cvt.s.w $f26, $f26 -/* C63494 80242784 8E100000 */ lw $s0, ($s0) -/* C63498 80242788 0220202D */ daddu $a0, $s1, $zero -/* C6349C 8024278C 0C0B1EAF */ jal get_variable -/* C634A0 80242790 0200282D */ daddu $a1, $s0, $zero -/* C634A4 80242794 4482C000 */ mtc1 $v0, $f24 -/* C634A8 80242798 00000000 */ nop -/* C634AC 8024279C 4680C620 */ cvt.s.w $f24, $f24 -/* C634B0 802427A0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* C634B4 802427A4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* C634B8 802427A8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C634BC 802427AC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C634C0 802427B0 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* C634C4 802427B4 44800000 */ mtc1 $zero, $f0 -/* C634C8 802427B8 00031080 */ sll $v0, $v1, 2 -/* C634CC 802427BC 00431021 */ addu $v0, $v0, $v1 -/* C634D0 802427C0 00021080 */ sll $v0, $v0, 2 -/* C634D4 802427C4 00431023 */ subu $v0, $v0, $v1 -/* C634D8 802427C8 000218C0 */ sll $v1, $v0, 3 -/* C634DC 802427CC 00431021 */ addu $v0, $v0, $v1 -/* C634E0 802427D0 000210C0 */ sll $v0, $v0, 3 -/* C634E4 802427D4 46001032 */ c.eq.s $f2, $f0 -/* C634E8 802427D8 3C01800B */ lui $at, 0x800b -/* C634EC 802427DC 00220821 */ addu $at, $at, $v0 -/* C634F0 802427E0 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* C634F4 802427E4 45000005 */ bc1f .L802427FC -/* C634F8 802427E8 00000000 */ nop -/* C634FC 802427EC 3C0142C8 */ lui $at, 0x42c8 -/* C63500 802427F0 44810000 */ mtc1 $at, $f0 -/* C63504 802427F4 08090A03 */ j .L8024280C -/* C63508 802427F8 4600B581 */ sub.s $f22, $f22, $f0 -.L802427FC: -/* C6350C 802427FC 3C0142C8 */ lui $at, 0x42c8 -/* C63510 80242800 44810000 */ mtc1 $at, $f0 -/* C63514 80242804 00000000 */ nop -/* C63518 80242808 4600B580 */ add.s $f22, $f22, $f0 -.L8024280C: -/* C6351C 8024280C 0C00A6C9 */ jal clamp_angle -/* C63520 80242810 4600B306 */ mov.s $f12, $f22 -/* C63524 80242814 46000586 */ mov.s $f22, $f0 -/* C63528 80242818 3C014170 */ lui $at, 0x4170 -/* C6352C 8024281C 4481A000 */ mtc1 $at, $f20 -/* C63530 80242820 0C00A8BB */ jal sin_deg -/* C63534 80242824 4600B306 */ mov.s $f12, $f22 -/* C63538 80242828 46140002 */ mul.s $f0, $f0, $f20 -/* C6353C 8024282C 00000000 */ nop -/* C63540 80242830 864200B0 */ lh $v0, 0xb0($s2) -/* C63544 80242834 3C013F00 */ lui $at, 0x3f00 -/* C63548 80242838 44812000 */ mtc1 $at, $f4 -/* C6354C 8024283C 44821000 */ mtc1 $v0, $f2 -/* C63550 80242840 00000000 */ nop -/* C63554 80242844 468010A0 */ cvt.s.w $f2, $f2 -/* C63558 80242848 46041082 */ mul.s $f2, $f2, $f4 -/* C6355C 8024284C 00000000 */ nop -/* C63560 80242850 4600E700 */ add.s $f28, $f28, $f0 -/* C63564 80242854 4602D680 */ add.s $f26, $f26, $f2 -/* C63568 80242858 0C00A8D4 */ jal cos_deg -/* C6356C 8024285C 4600B306 */ mov.s $f12, $f22 -/* C63570 80242860 46140002 */ mul.s $f0, $f0, $f20 -/* C63574 80242864 00000000 */ nop -/* C63578 80242868 0220202D */ daddu $a0, $s1, $zero -/* C6357C 8024286C 0260282D */ daddu $a1, $s3, $zero -/* C63580 80242870 4600E18D */ trunc.w.s $f6, $f28 -/* C63584 80242874 44063000 */ mfc1 $a2, $f6 -/* C63588 80242878 0C0B2026 */ jal set_variable -/* C6358C 8024287C 4600C601 */ sub.s $f24, $f24, $f0 -/* C63590 80242880 0220202D */ daddu $a0, $s1, $zero -/* C63594 80242884 4600D18D */ trunc.w.s $f6, $f26 -/* C63598 80242888 44063000 */ mfc1 $a2, $f6 -/* C6359C 8024288C 0C0B2026 */ jal set_variable -/* C635A0 80242890 0280282D */ daddu $a1, $s4, $zero -/* C635A4 80242894 0220202D */ daddu $a0, $s1, $zero -/* C635A8 80242898 4600C18D */ trunc.w.s $f6, $f24 -/* C635AC 8024289C 44063000 */ mfc1 $a2, $f6 -/* C635B0 802428A0 0C0B2026 */ jal set_variable -/* C635B4 802428A4 0200282D */ daddu $a1, $s0, $zero -/* C635B8 802428A8 8FBF0024 */ lw $ra, 0x24($sp) -/* C635BC 802428AC 8FB40020 */ lw $s4, 0x20($sp) -/* C635C0 802428B0 8FB3001C */ lw $s3, 0x1c($sp) -/* C635C4 802428B4 8FB20018 */ lw $s2, 0x18($sp) -/* C635C8 802428B8 8FB10014 */ lw $s1, 0x14($sp) -/* C635CC 802428BC 8FB00010 */ lw $s0, 0x10($sp) -/* C635D0 802428C0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* C635D4 802428C4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* C635D8 802428C8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* C635DC 802428CC D7B60030 */ ldc1 $f22, 0x30($sp) -/* C635E0 802428D0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C635E4 802428D4 24020002 */ addiu $v0, $zero, 2 -/* C635E8 802428D8 03E00008 */ jr $ra -/* C635EC 802428DC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_802428E0_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_802428E0_C60D10.s deleted file mode 100644 index 34a3a9aabc..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_802428E0_C60D10.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428E0_C635F0 -/* C635F0 802428E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C635F4 802428E4 AFBF0010 */ sw $ra, 0x10($sp) -/* C635F8 802428E8 10A00003 */ beqz $a1, .L802428F8 -/* C635FC 802428EC 8C86000C */ lw $a2, 0xc($a0) -/* C63600 802428F0 3C018024 */ lui $at, 0x8024 -/* C63604 802428F4 AC204204 */ sw $zero, 0x4204($at) -.L802428F8: -/* C63608 802428F8 3C038024 */ lui $v1, 0x8024 -/* C6360C 802428FC 24634204 */ addiu $v1, $v1, 0x4204 -/* C63610 80242900 8C620000 */ lw $v0, ($v1) -/* C63614 80242904 54400003 */ bnel $v0, $zero, .L80242914 -/* C63618 80242908 AC600000 */ sw $zero, ($v1) -/* C6361C 8024290C 08090A4A */ j .L80242928 -/* C63620 80242910 0000102D */ daddu $v0, $zero, $zero -.L80242914: -/* C63624 80242914 8CC50000 */ lw $a1, ($a2) -/* C63628 80242918 3C068024 */ lui $a2, 0x8024 -/* C6362C 8024291C 0C0B2026 */ jal set_variable -/* C63630 80242920 8CC64208 */ lw $a2, 0x4208($a2) -/* C63634 80242924 24020002 */ addiu $v0, $zero, 2 -.L80242928: -/* C63638 80242928 8FBF0010 */ lw $ra, 0x10($sp) -/* C6363C 8024292C 03E00008 */ jr $ra -/* C63640 80242930 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80242AF8_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80242AF8_C60D10.s deleted file mode 100644 index 6a24ca7607..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80242AF8_C60D10.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AF8_C63808 -/* C63808 80242AF8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C6380C 80242AFC AFB1001C */ sw $s1, 0x1c($sp) -/* C63810 80242B00 0080882D */ daddu $s1, $a0, $zero -/* C63814 80242B04 AFBF0034 */ sw $ra, 0x34($sp) -/* C63818 80242B08 AFB60030 */ sw $s6, 0x30($sp) -/* C6381C 80242B0C AFB5002C */ sw $s5, 0x2c($sp) -/* C63820 80242B10 AFB40028 */ sw $s4, 0x28($sp) -/* C63824 80242B14 AFB30024 */ sw $s3, 0x24($sp) -/* C63828 80242B18 AFB20020 */ sw $s2, 0x20($sp) -/* C6382C 80242B1C AFB00018 */ sw $s0, 0x18($sp) -/* C63830 80242B20 F7B60040 */ sdc1 $f22, 0x40($sp) -/* C63834 80242B24 F7B40038 */ sdc1 $f20, 0x38($sp) -/* C63838 80242B28 8E30000C */ lw $s0, 0xc($s1) -/* C6383C 80242B2C 8E160000 */ lw $s6, ($s0) -/* C63840 80242B30 26100004 */ addiu $s0, $s0, 4 -/* C63844 80242B34 0C0B1EAF */ jal get_variable -/* C63848 80242B38 02C0282D */ daddu $a1, $s6, $zero -/* C6384C 80242B3C 44820000 */ mtc1 $v0, $f0 -/* C63850 80242B40 00000000 */ nop -/* C63854 80242B44 46800020 */ cvt.s.w $f0, $f0 -/* C63858 80242B48 E7A00010 */ swc1 $f0, 0x10($sp) -/* C6385C 80242B4C 8E140000 */ lw $s4, ($s0) -/* C63860 80242B50 26100004 */ addiu $s0, $s0, 4 -/* C63864 80242B54 0220202D */ daddu $a0, $s1, $zero -/* C63868 80242B58 0C0B1EAF */ jal get_variable -/* C6386C 80242B5C 0280282D */ daddu $a1, $s4, $zero -/* C63870 80242B60 0220202D */ daddu $a0, $s1, $zero -/* C63874 80242B64 8E150000 */ lw $s5, ($s0) -/* C63878 80242B68 4482B000 */ mtc1 $v0, $f22 -/* C6387C 80242B6C 00000000 */ nop -/* C63880 80242B70 4680B5A0 */ cvt.s.w $f22, $f22 -/* C63884 80242B74 0C0B1EAF */ jal get_variable -/* C63888 80242B78 02A0282D */ daddu $a1, $s5, $zero -/* C6388C 80242B7C 2404FFFC */ addiu $a0, $zero, -4 -/* C63890 80242B80 44820000 */ mtc1 $v0, $f0 -/* C63894 80242B84 00000000 */ nop -/* C63898 80242B88 46800020 */ cvt.s.w $f0, $f0 -/* C6389C 80242B8C 0C00EABB */ jal get_npc_unsafe -/* C638A0 80242B90 E7A00014 */ swc1 $f0, 0x14($sp) -/* C638A4 80242B94 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C638A8 80242B98 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C638AC 80242B9C 3C014334 */ lui $at, 0x4334 -/* C638B0 80242BA0 44816000 */ mtc1 $at, $f12 -/* C638B4 80242BA4 00041880 */ sll $v1, $a0, 2 -/* C638B8 80242BA8 00641821 */ addu $v1, $v1, $a0 -/* C638BC 80242BAC 00031880 */ sll $v1, $v1, 2 -/* C638C0 80242BB0 00641823 */ subu $v1, $v1, $a0 -/* C638C4 80242BB4 000320C0 */ sll $a0, $v1, 3 -/* C638C8 80242BB8 00641821 */ addu $v1, $v1, $a0 -/* C638CC 80242BBC 000318C0 */ sll $v1, $v1, 3 -/* C638D0 80242BC0 3C01800B */ lui $at, 0x800b -/* C638D4 80242BC4 00230821 */ addu $at, $at, $v1 -/* C638D8 80242BC8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C638DC 80242BCC 460C0300 */ add.s $f12, $f0, $f12 -/* C638E0 80242BD0 0C00A6C9 */ jal clamp_angle -/* C638E4 80242BD4 0040982D */ daddu $s3, $v0, $zero -/* C638E8 80242BD8 27B00010 */ addiu $s0, $sp, 0x10 -/* C638EC 80242BDC 0200202D */ daddu $a0, $s0, $zero -/* C638F0 80242BE0 27B20014 */ addiu $s2, $sp, 0x14 -/* C638F4 80242BE4 0240282D */ daddu $a1, $s2, $zero -/* C638F8 80242BE8 3C064170 */ lui $a2, 0x4170 -/* C638FC 80242BEC 8E67000C */ lw $a3, 0xc($s3) -/* C63900 80242BF0 0C00A7E7 */ jal add_vec2D_polar -/* C63904 80242BF4 46000506 */ mov.s $f20, $f0 -/* C63908 80242BF8 0200202D */ daddu $a0, $s0, $zero -/* C6390C 80242BFC 3C064120 */ lui $a2, 0x4120 -/* C63910 80242C00 4407A000 */ mfc1 $a3, $f20 -/* C63914 80242C04 0C00A7E7 */ jal add_vec2D_polar -/* C63918 80242C08 0240282D */ daddu $a1, $s2, $zero -/* C6391C 80242C0C 0220202D */ daddu $a0, $s1, $zero -/* C63920 80242C10 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C63924 80242C14 4600008D */ trunc.w.s $f2, $f0 -/* C63928 80242C18 44061000 */ mfc1 $a2, $f2 -/* C6392C 80242C1C 0C0B2026 */ jal set_variable -/* C63930 80242C20 02C0282D */ daddu $a1, $s6, $zero -/* C63934 80242C24 0220202D */ daddu $a0, $s1, $zero -/* C63938 80242C28 4600B08D */ trunc.w.s $f2, $f22 -/* C6393C 80242C2C 44061000 */ mfc1 $a2, $f2 -/* C63940 80242C30 0C0B2026 */ jal set_variable -/* C63944 80242C34 0280282D */ daddu $a1, $s4, $zero -/* C63948 80242C38 0220202D */ daddu $a0, $s1, $zero -/* C6394C 80242C3C C7A00014 */ lwc1 $f0, 0x14($sp) -/* C63950 80242C40 4600008D */ trunc.w.s $f2, $f0 -/* C63954 80242C44 44061000 */ mfc1 $a2, $f2 -/* C63958 80242C48 0C0B2026 */ jal set_variable -/* C6395C 80242C4C 02A0282D */ daddu $a1, $s5, $zero -/* C63960 80242C50 8FBF0034 */ lw $ra, 0x34($sp) -/* C63964 80242C54 8FB60030 */ lw $s6, 0x30($sp) -/* C63968 80242C58 8FB5002C */ lw $s5, 0x2c($sp) -/* C6396C 80242C5C 8FB40028 */ lw $s4, 0x28($sp) -/* C63970 80242C60 8FB30024 */ lw $s3, 0x24($sp) -/* C63974 80242C64 8FB20020 */ lw $s2, 0x20($sp) -/* C63978 80242C68 8FB1001C */ lw $s1, 0x1c($sp) -/* C6397C 80242C6C 8FB00018 */ lw $s0, 0x18($sp) -/* C63980 80242C70 D7B60040 */ ldc1 $f22, 0x40($sp) -/* C63984 80242C74 D7B40038 */ ldc1 $f20, 0x38($sp) -/* C63988 80242C78 24020002 */ addiu $v0, $zero, 2 -/* C6398C 80242C7C 03E00008 */ jr $ra -/* C63990 80242C80 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80242D00_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80242D00_C60D10.s deleted file mode 100644 index bd9af1c337..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80242D00_C60D10.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D00_C63A10 -/* C63A10 80242D00 3C03800B */ lui $v1, %hi(gCameras) -/* C63A14 80242D04 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* C63A18 80242D08 94620002 */ lhu $v0, 2($v1) -/* C63A1C 80242D0C 3042FFFE */ andi $v0, $v0, 0xfffe -/* C63A20 80242D10 A4620002 */ sh $v0, 2($v1) -/* C63A24 80242D14 03E00008 */ jr $ra -/* C63A28 80242D18 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80242DB0_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80242DB0_C60D10.s deleted file mode 100644 index 41f01d91c8..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80242DB0_C60D10.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242DB0_C63AC0 -/* C63AC0 80242DB0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C63AC4 80242DB4 AFB1001C */ sw $s1, 0x1c($sp) -/* C63AC8 80242DB8 0080882D */ daddu $s1, $a0, $zero -/* C63ACC 80242DBC AFBF0020 */ sw $ra, 0x20($sp) -/* C63AD0 80242DC0 AFB00018 */ sw $s0, 0x18($sp) -/* C63AD4 80242DC4 8E30000C */ lw $s0, 0xc($s1) -/* C63AD8 80242DC8 8E020000 */ lw $v0, ($s0) -/* C63ADC 80242DCC 1040001B */ beqz $v0, .L80242E3C -/* C63AE0 80242DD0 26100004 */ addiu $s0, $s0, 4 -/* C63AE4 80242DD4 8E050000 */ lw $a1, ($s0) -/* C63AE8 80242DD8 0C0B1EAF */ jal get_variable -/* C63AEC 80242DDC 26100004 */ addiu $s0, $s0, 4 -/* C63AF0 80242DE0 AE220070 */ sw $v0, 0x70($s1) -/* C63AF4 80242DE4 8E050000 */ lw $a1, ($s0) -/* C63AF8 80242DE8 26100004 */ addiu $s0, $s0, 4 -/* C63AFC 80242DEC 0C0B1EAF */ jal get_variable -/* C63B00 80242DF0 0220202D */ daddu $a0, $s1, $zero -/* C63B04 80242DF4 AE220074 */ sw $v0, 0x74($s1) -/* C63B08 80242DF8 8E050000 */ lw $a1, ($s0) -/* C63B0C 80242DFC 0C0B1EAF */ jal get_variable -/* C63B10 80242E00 0220202D */ daddu $a0, $s1, $zero -/* C63B14 80242E04 24040168 */ addiu $a0, $zero, 0x168 -/* C63B18 80242E08 0000282D */ daddu $a1, $zero, $zero -/* C63B1C 80242E0C C6200070 */ lwc1 $f0, 0x70($s1) -/* C63B20 80242E10 46800020 */ cvt.s.w $f0, $f0 -/* C63B24 80242E14 C6220074 */ lwc1 $f2, 0x74($s1) -/* C63B28 80242E18 468010A0 */ cvt.s.w $f2, $f2 -/* C63B2C 80242E1C 44060000 */ mfc1 $a2, $f0 -/* C63B30 80242E20 44071000 */ mfc1 $a3, $f2 -/* C63B34 80242E24 44820000 */ mtc1 $v0, $f0 -/* C63B38 80242E28 00000000 */ nop -/* C63B3C 80242E2C 46800020 */ cvt.s.w $f0, $f0 -/* C63B40 80242E30 AE220078 */ sw $v0, 0x78($s1) -/* C63B44 80242E34 0C05267B */ jal func_801499EC -/* C63B48 80242E38 E7A00010 */ swc1 $f0, 0x10($sp) -.L80242E3C: -/* C63B4C 80242E3C 8FBF0020 */ lw $ra, 0x20($sp) -/* C63B50 80242E40 8FB1001C */ lw $s1, 0x1c($sp) -/* C63B54 80242E44 8FB00018 */ lw $s0, 0x18($sp) -/* C63B58 80242E48 24020002 */ addiu $v0, $zero, 2 -/* C63B5C 80242E4C 03E00008 */ jr $ra -/* C63B60 80242E50 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80242EF8_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80242EF8_C60D10.s deleted file mode 100644 index 8efba89304..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80242EF8_C60D10.s +++ /dev/null @@ -1,99 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242EF8_C63C08 -/* C63C08 80242EF8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C63C0C 80242EFC AFB10014 */ sw $s1, 0x14($sp) -/* C63C10 80242F00 0080882D */ daddu $s1, $a0, $zero -/* C63C14 80242F04 AFBF001C */ sw $ra, 0x1c($sp) -/* C63C18 80242F08 AFB20018 */ sw $s2, 0x18($sp) -/* C63C1C 80242F0C AFB00010 */ sw $s0, 0x10($sp) -/* C63C20 80242F10 8E22000C */ lw $v0, 0xc($s1) -/* C63C24 80242F14 0C0B1EAF */ jal get_variable -/* C63C28 80242F18 8C450000 */ lw $a1, ($v0) -/* C63C2C 80242F1C 8E23013C */ lw $v1, 0x13c($s1) -/* C63C30 80242F20 8C720000 */ lw $s2, ($v1) -/* C63C34 80242F24 C646000C */ lwc1 $f6, 0xc($s2) -/* C63C38 80242F28 C6400000 */ lwc1 $f0, ($s2) -/* C63C3C 80242F2C 46003181 */ sub.s $f6, $f6, $f0 -/* C63C40 80242F30 3C01447A */ lui $at, 0x447a -/* C63C44 80242F34 44814000 */ mtc1 $at, $f8 -/* C63C48 80242F38 C6200084 */ lwc1 $f0, 0x84($s1) -/* C63C4C 80242F3C 46800020 */ cvt.s.w $f0, $f0 -/* C63C50 80242F40 46083183 */ div.s $f6, $f6, $f8 -/* C63C54 80242F44 46003182 */ mul.s $f6, $f6, $f0 -/* C63C58 80242F48 00000000 */ nop -/* C63C5C 80242F4C C6440010 */ lwc1 $f4, 0x10($s2) -/* C63C60 80242F50 C6420004 */ lwc1 $f2, 4($s2) -/* C63C64 80242F54 46022101 */ sub.s $f4, $f4, $f2 -/* C63C68 80242F58 C6420008 */ lwc1 $f2, 8($s2) -/* C63C6C 80242F5C C6400014 */ lwc1 $f0, 0x14($s2) -/* C63C70 80242F60 46020001 */ sub.s $f0, $f0, $f2 -/* C63C74 80242F64 46082103 */ div.s $f4, $f4, $f8 -/* C63C78 80242F68 C6220084 */ lwc1 $f2, 0x84($s1) -/* C63C7C 80242F6C 468010A0 */ cvt.s.w $f2, $f2 -/* C63C80 80242F70 46022102 */ mul.s $f4, $f4, $f2 -/* C63C84 80242F74 00000000 */ nop -/* C63C88 80242F78 46080003 */ div.s $f0, $f0, $f8 -/* C63C8C 80242F7C 46020002 */ mul.s $f0, $f0, $f2 -/* C63C90 80242F80 00000000 */ nop -/* C63C94 80242F84 4600328D */ trunc.w.s $f10, $f6 -/* C63C98 80242F88 E62A0098 */ swc1 $f10, 0x98($s1) -/* C63C9C 80242F8C 4600228D */ trunc.w.s $f10, $f4 -/* C63CA0 80242F90 E62A009C */ swc1 $f10, 0x9c($s1) -/* C63CA4 80242F94 4600028D */ trunc.w.s $f10, $f0 -/* C63CA8 80242F98 1440002E */ bnez $v0, .L80243054 -/* C63CAC 80242F9C E62A00A0 */ swc1 $f10, 0xa0($s1) -/* C63CB0 80242FA0 0C00EAD2 */ jal get_npc_safe -/* C63CB4 80242FA4 2404FFFC */ addiu $a0, $zero, -4 -/* C63CB8 80242FA8 8E23008C */ lw $v1, 0x8c($s1) -/* C63CBC 80242FAC 8E240098 */ lw $a0, 0x98($s1) -/* C63CC0 80242FB0 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* C63CC4 80242FB4 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* C63CC8 80242FB8 00641821 */ addu $v1, $v1, $a0 -/* C63CCC 80242FBC 44830000 */ mtc1 $v1, $f0 -/* C63CD0 80242FC0 00000000 */ nop -/* C63CD4 80242FC4 46800020 */ cvt.s.w $f0, $f0 -/* C63CD8 80242FC8 E6000028 */ swc1 $f0, 0x28($s0) -/* C63CDC 80242FCC 8E230090 */ lw $v1, 0x90($s1) -/* C63CE0 80242FD0 8E24009C */ lw $a0, 0x9c($s1) -/* C63CE4 80242FD4 00641821 */ addu $v1, $v1, $a0 -/* C63CE8 80242FD8 44830000 */ mtc1 $v1, $f0 -/* C63CEC 80242FDC 00000000 */ nop -/* C63CF0 80242FE0 46800020 */ cvt.s.w $f0, $f0 -/* C63CF4 80242FE4 E600002C */ swc1 $f0, 0x2c($s0) -/* C63CF8 80242FE8 8E230094 */ lw $v1, 0x94($s1) -/* C63CFC 80242FEC 8E2400A0 */ lw $a0, 0xa0($s1) -/* C63D00 80242FF0 00641821 */ addu $v1, $v1, $a0 -/* C63D04 80242FF4 44830000 */ mtc1 $v1, $f0 -/* C63D08 80242FF8 00000000 */ nop -/* C63D0C 80242FFC 46800020 */ cvt.s.w $f0, $f0 -/* C63D10 80243000 E6000030 */ swc1 $f0, 0x30($s0) -/* C63D14 80243004 C64C0000 */ lwc1 $f12, ($s2) -/* C63D18 80243008 C64E0008 */ lwc1 $f14, 8($s2) -/* C63D1C 8024300C 8E46000C */ lw $a2, 0xc($s2) -/* C63D20 80243010 8E470014 */ lw $a3, 0x14($s2) -/* C63D24 80243014 0C00A720 */ jal atan2 -/* C63D28 80243018 0040882D */ daddu $s1, $v0, $zero -/* C63D2C 8024301C C6020028 */ lwc1 $f2, 0x28($s0) -/* C63D30 80243020 E6000080 */ swc1 $f0, 0x80($s0) -/* C63D34 80243024 E6220038 */ swc1 $f2, 0x38($s1) -/* C63D38 80243028 C600002C */ lwc1 $f0, 0x2c($s0) -/* C63D3C 8024302C 3C014120 */ lui $at, 0x4120 -/* C63D40 80243030 44811000 */ mtc1 $at, $f2 -/* C63D44 80243034 00000000 */ nop -/* C63D48 80243038 46020001 */ sub.s $f0, $f0, $f2 -/* C63D4C 8024303C 3C0140A0 */ lui $at, 0x40a0 -/* C63D50 80243040 44811000 */ mtc1 $at, $f2 -/* C63D54 80243044 E620003C */ swc1 $f0, 0x3c($s1) -/* C63D58 80243048 C6000030 */ lwc1 $f0, 0x30($s0) -/* C63D5C 8024304C 46020001 */ sub.s $f0, $f0, $f2 -/* C63D60 80243050 E6200040 */ swc1 $f0, 0x40($s1) -.L80243054: -/* C63D64 80243054 8FBF001C */ lw $ra, 0x1c($sp) -/* C63D68 80243058 8FB20018 */ lw $s2, 0x18($sp) -/* C63D6C 8024305C 8FB10014 */ lw $s1, 0x14($sp) -/* C63D70 80243060 8FB00010 */ lw $s0, 0x10($sp) -/* C63D74 80243064 24020002 */ addiu $v0, $zero, 2 -/* C63D78 80243068 03E00008 */ jr $ra -/* C63D7C 8024306C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/func_80243070_C60D10.s b/asm/nonmatchings/world/area_kzn/kzn_03/func_80243070_C60D10.s deleted file mode 100644 index a3d787634b..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/func_80243070_C60D10.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243070_C63D80 -/* C63D80 80243070 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* C63D84 80243074 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* C63D88 80243078 8C420010 */ lw $v0, 0x10($v0) -/* C63D8C 8024307C 30428000 */ andi $v0, $v0, 0x8000 -/* C63D90 80243080 AC8200A4 */ sw $v0, 0xa4($a0) -/* C63D94 80243084 03E00008 */ jr $ra -/* C63D98 80243088 24020002 */ addiu $v0, $zero, 2 -/* C63D9C 8024308C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240124_C68130.s b/asm/nonmatchings/world/area_kzn/kzn_04/func_80240124_C68130.s deleted file mode 100644 index 08f64346a7..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240124_C68130.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C68254 -/* C68254 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C68258 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C6825C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C68260 80240130 10A00005 */ beqz $a1, .L80240148 -/* C68264 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C68268 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C6826C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C68270 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C68274 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C68278 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C6827C 8024014C 1440000E */ bnez $v0, .L80240188 -/* C68280 80240150 00000000 */ nop -/* C68284 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C68288 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C6828C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C68290 80240160 04610004 */ bgez $v1, .L80240174 -/* C68294 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C68298 80240168 3C020002 */ lui $v0, 2 -/* C6829C 8024016C 08090061 */ j .L80240184 -/* C682A0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C682A4 80240174 3C040002 */ lui $a0, 2 -/* C682A8 80240178 0083102A */ slt $v0, $a0, $v1 -/* C682AC 8024017C 10400002 */ beqz $v0, .L80240188 -/* C682B0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C682B4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C682B8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C682BC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C682C0 80240190 00000000 */ nop -/* C682C4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C682C8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C682CC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C682D0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C682D4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C682D8 802401A8 3C020002 */ lui $v0, 2 -/* C682DC 802401AC 08090071 */ j .L802401C4 -/* C682E0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C682E4 802401B4 3C040002 */ lui $a0, 2 -/* C682E8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C682EC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C682F0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C682F4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C682F8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C682FC 802401CC 1440000E */ bnez $v0, .L80240208 -/* C68300 802401D0 00000000 */ nop -/* C68304 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C68308 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C6830C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C68310 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C68314 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C68318 802401E8 3C020002 */ lui $v0, 2 -/* C6831C 802401EC 08090081 */ j .L80240204 -/* C68320 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C68324 802401F4 3C040002 */ lui $a0, 2 -/* C68328 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C6832C 802401FC 10400002 */ beqz $v0, .L80240208 -/* C68330 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C68334 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C68338 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C6833C 8024020C 1440000E */ bnez $v0, .L80240248 -/* C68340 80240210 00000000 */ nop -/* C68344 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C68348 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C6834C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C68350 80240220 04610004 */ bgez $v1, .L80240234 -/* C68354 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C68358 80240228 3C020002 */ lui $v0, 2 -/* C6835C 8024022C 08090091 */ j .L80240244 -/* C68360 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C68364 80240234 3C040002 */ lui $a0, 2 -/* C68368 80240238 0083102A */ slt $v0, $a0, $v1 -/* C6836C 8024023C 10400002 */ beqz $v0, .L80240248 -/* C68370 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C68374 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C68378 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C6837C 8024024C 0C046F07 */ jal set_main_pan_u -/* C68380 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C68384 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C68388 80240258 0C046F0D */ jal set_main_pan_v -/* C6838C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C68390 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C68394 80240264 0C046F13 */ jal set_aux_pan_u -/* C68398 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C6839C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C683A0 80240270 0C046F19 */ jal set_aux_pan_v -/* C683A4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C683A8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C683AC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C683B0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C683B4 80240284 24420001 */ addiu $v0, $v0, 1 -/* C683B8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C683BC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C683C0 80240290 24630001 */ addiu $v1, $v1, 1 -/* C683C4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C683C8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C683CC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C683D0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C683D4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C683D8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C683DC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C683E0 802402B0 14600002 */ bnez $v1, .L802402BC -/* C683E4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C683E8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C683EC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C683F0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C683F4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C683F8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C683FC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C68400 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C68404 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C68408 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C6840C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C68410 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C68414 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C68418 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C6841C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C68420 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C68424 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C68428 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C6842C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C68430 80240300 0000102D */ daddu $v0, $zero, $zero -/* C68434 80240304 03E00008 */ jr $ra -/* C68438 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C6843C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240310_C68130.s b/asm/nonmatchings/world/area_kzn/kzn_04/func_80240310_C68130.s deleted file mode 100644 index 32a3b2ea67..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240310_C68130.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_C68440 -/* C68440 80240310 3C03800A */ lui $v1, %hi(D_8009A650) -/* C68444 80240314 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* C68448 80240318 8C620000 */ lw $v0, ($v1) -/* C6844C 8024031C 34420040 */ ori $v0, $v0, 0x40 -/* C68450 80240320 AC620000 */ sw $v0, ($v1) -/* C68454 80240324 03E00008 */ jr $ra -/* C68458 80240328 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/func_8024032C_C68130.s b/asm/nonmatchings/world/area_kzn/kzn_04/func_8024032C_C68130.s deleted file mode 100644 index fb58b06cd9..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/func_8024032C_C68130.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024032C_C6845C -/* C6845C 8024032C 3C02800A */ lui $v0, %hi(D_8009A650) -/* C68460 80240330 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* C68464 80240334 8C430000 */ lw $v1, ($v0) -/* C68468 80240338 2404FFBF */ addiu $a0, $zero, -0x41 -/* C6846C 8024033C 00641824 */ and $v1, $v1, $a0 -/* C68470 80240340 AC430000 */ sw $v1, ($v0) -/* C68474 80240344 03E00008 */ jr $ra -/* C68478 80240348 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/func_8024034C_C68130.s b/asm/nonmatchings/world/area_kzn/kzn_04/func_8024034C_C68130.s deleted file mode 100644 index 7d12bb6b7b..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/func_8024034C_C68130.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024034C_C6847C -/* C6847C 8024034C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C68480 80240350 AFBF0010 */ sw $ra, 0x10($sp) -/* C68484 80240354 8C82000C */ lw $v0, 0xc($a0) -/* C68488 80240358 0C0B1EAF */ jal get_variable -/* C6848C 8024035C 8C450000 */ lw $a1, ($v0) -/* C68490 80240360 0C0B95A4 */ jal func_802E5690 -/* C68494 80240364 0040202D */ daddu $a0, $v0, $zero -/* C68498 80240368 8FBF0010 */ lw $ra, 0x10($sp) -/* C6849C 8024036C 24020002 */ addiu $v0, $zero, 2 -/* C684A0 80240370 03E00008 */ jr $ra -/* C684A4 80240374 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240430_C68130.s b/asm/nonmatchings/world/area_kzn/kzn_04/func_80240430_C68130.s deleted file mode 100644 index 5ac283ce96..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240430_C68130.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240430_C68560 -/* C68560 80240430 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C68564 80240434 AFB3001C */ sw $s3, 0x1c($sp) -/* C68568 80240438 0080982D */ daddu $s3, $a0, $zero -/* C6856C 8024043C AFB00010 */ sw $s0, 0x10($sp) -/* C68570 80240440 24100001 */ addiu $s0, $zero, 1 -/* C68574 80240444 AFB40020 */ sw $s4, 0x20($sp) -/* C68578 80240448 2414FFFF */ addiu $s4, $zero, -1 -/* C6857C 8024044C AFB50024 */ sw $s5, 0x24($sp) -/* C68580 80240450 0200A82D */ daddu $s5, $s0, $zero -/* C68584 80240454 AFB10014 */ sw $s1, 0x14($sp) -/* C68588 80240458 3C118011 */ lui $s1, 0x8011 -/* C6858C 8024045C 2631F298 */ addiu $s1, $s1, -0xd68 -/* C68590 80240460 AFBF0028 */ sw $ra, 0x28($sp) -/* C68594 80240464 AFB20018 */ sw $s2, 0x18($sp) -/* C68598 80240468 8E6200B4 */ lw $v0, 0xb4($s3) -/* C6859C 8024046C 0280182D */ daddu $v1, $s4, $zero -/* C685A0 80240470 AE630084 */ sw $v1, 0x84($s3) -/* C685A4 80240474 00021027 */ nor $v0, $zero, $v0 -/* C685A8 80240478 000217C2 */ srl $v0, $v0, 0x1f -/* C685AC 8024047C 00029400 */ sll $s2, $v0, 0x10 -.L80240480: -/* C685B0 80240480 92220014 */ lbu $v0, 0x14($s1) -/* C685B4 80240484 50400008 */ beql $v0, $zero, .L802404A8 -/* C685B8 80240488 26100001 */ addiu $s0, $s0, 1 -/* C685BC 8024048C 0200202D */ daddu $a0, $s0, $zero -/* C685C0 80240490 0C0900F9 */ jal func_802403E4 -/* C685C4 80240494 00122C03 */ sra $a1, $s2, 0x10 -/* C685C8 80240498 10540003 */ beq $v0, $s4, .L802404A8 -/* C685CC 8024049C 26100001 */ addiu $s0, $s0, 1 -/* C685D0 802404A0 0809012D */ j .L802404B4 -/* C685D4 802404A4 AE750084 */ sw $s5, 0x84($s3) -.L802404A8: -/* C685D8 802404A8 2A02000C */ slti $v0, $s0, 0xc -/* C685DC 802404AC 1440FFF4 */ bnez $v0, .L80240480 -/* C685E0 802404B0 26310008 */ addiu $s1, $s1, 8 -.L802404B4: -/* C685E4 802404B4 8FBF0028 */ lw $ra, 0x28($sp) -/* C685E8 802404B8 8FB50024 */ lw $s5, 0x24($sp) -/* C685EC 802404BC 8FB40020 */ lw $s4, 0x20($sp) -/* C685F0 802404C0 8FB3001C */ lw $s3, 0x1c($sp) -/* C685F4 802404C4 8FB20018 */ lw $s2, 0x18($sp) -/* C685F8 802404C8 8FB10014 */ lw $s1, 0x14($sp) -/* C685FC 802404CC 8FB00010 */ lw $s0, 0x10($sp) -/* C68600 802404D0 24020002 */ addiu $v0, $zero, 2 -/* C68604 802404D4 03E00008 */ jr $ra -/* C68608 802404D8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/func_802404DC_C68130.s b/asm/nonmatchings/world/area_kzn/kzn_04/func_802404DC_C68130.s deleted file mode 100644 index 49425514be..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/func_802404DC_C68130.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404DC_C6860C -/* C6860C 802404DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C68610 802404E0 AFB5002C */ sw $s5, 0x2c($sp) -/* C68614 802404E4 0080A82D */ daddu $s5, $a0, $zero -/* C68618 802404E8 AFBE0038 */ sw $fp, 0x38($sp) -/* C6861C 802404EC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* C68620 802404F0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* C68624 802404F4 AFBF003C */ sw $ra, 0x3c($sp) -/* C68628 802404F8 AFB70034 */ sw $s7, 0x34($sp) -/* C6862C 802404FC AFB60030 */ sw $s6, 0x30($sp) -/* C68630 80240500 AFB40028 */ sw $s4, 0x28($sp) -/* C68634 80240504 AFB30024 */ sw $s3, 0x24($sp) -/* C68638 80240508 AFB20020 */ sw $s2, 0x20($sp) -/* C6863C 8024050C AFB1001C */ sw $s1, 0x1c($sp) -/* C68640 80240510 10A0004F */ beqz $a1, .L80240650 -/* C68644 80240514 AFB00018 */ sw $s0, 0x18($sp) -/* C68648 80240518 0C00AB39 */ jal heap_malloc -/* C6864C 8024051C 24040330 */ addiu $a0, $zero, 0x330 -/* C68650 80240520 0040982D */ daddu $s3, $v0, $zero -/* C68654 80240524 0000B02D */ daddu $s6, $zero, $zero -/* C68658 80240528 02C0902D */ daddu $s2, $s6, $zero -/* C6865C 8024052C 3C148024 */ lui $s4, 0x8024 -/* C68660 80240530 26941C48 */ addiu $s4, $s4, 0x1c48 -/* C68664 80240534 0260882D */ daddu $s1, $s3, $zero -/* C68668 80240538 8EA200B4 */ lw $v0, 0xb4($s5) -/* C6866C 8024053C 3C038024 */ lui $v1, 0x8024 -/* C68670 80240540 24631C40 */ addiu $v1, $v1, 0x1c40 -/* C68674 80240544 AEB30078 */ sw $s3, 0x78($s5) -/* C68678 80240548 00021027 */ nor $v0, $zero, $v0 -/* C6867C 8024054C 0002BFC2 */ srl $s7, $v0, 0x1f -/* C68680 80240550 00171080 */ sll $v0, $s7, 2 -/* C68684 80240554 00431021 */ addu $v0, $v0, $v1 -/* C68688 80240558 AFA20010 */ sw $v0, 0x10($sp) -.L8024055C: -/* C6868C 8024055C 86900000 */ lh $s0, ($s4) -/* C68690 80240560 001010C0 */ sll $v0, $s0, 3 -/* C68694 80240564 03C21021 */ addu $v0, $fp, $v0 -/* C68698 80240568 90420014 */ lbu $v0, 0x14($v0) -/* C6869C 8024056C 5040002E */ beql $v0, $zero, .L80240628 -/* C686A0 80240570 26520001 */ addiu $s2, $s2, 1 -/* C686A4 80240574 00101100 */ sll $v0, $s0, 4 -/* C686A8 80240578 3C068009 */ lui $a2, 0x8009 -/* C686AC 8024057C 24C6EF20 */ addiu $a2, $a2, -0x10e0 -/* C686B0 80240580 00461021 */ addu $v0, $v0, $a2 -/* C686B4 80240584 0200202D */ daddu $a0, $s0, $zero -/* C686B8 80240588 AE300108 */ sw $s0, 0x108($s1) -/* C686BC 8024058C 8C420000 */ lw $v0, ($v0) -/* C686C0 80240590 02E0282D */ daddu $a1, $s7, $zero -/* C686C4 80240594 0C0900F9 */ jal func_802403E4 -/* C686C8 80240598 AE220084 */ sw $v0, 0x84($s1) -/* C686CC 8024059C 0040202D */ daddu $a0, $v0, $zero -/* C686D0 802405A0 04800011 */ bltz $a0, .L802405E8 -/* C686D4 802405A4 00101080 */ sll $v0, $s0, 2 -/* C686D8 802405A8 3C06800F */ lui $a2, 0x800f -/* C686DC 802405AC 24C67F00 */ addiu $a2, $a2, 0x7f00 -/* C686E0 802405B0 00461021 */ addu $v0, $v0, $a2 -/* C686E4 802405B4 8C430000 */ lw $v1, ($v0) -/* C686E8 802405B8 24020001 */ addiu $v0, $zero, 1 -/* C686EC 802405BC AE22018C */ sw $v0, 0x18c($s1) -/* C686F0 802405C0 00041080 */ sll $v0, $a0, 2 -/* C686F4 802405C4 3C068024 */ lui $a2, 0x8024 -/* C686F8 802405C8 24C61C58 */ addiu $a2, $a2, 0x1c58 -/* C686FC 802405CC AE230000 */ sw $v1, ($s1) -/* C68700 802405D0 001218C0 */ sll $v1, $s2, 3 -/* C68704 802405D4 00431021 */ addu $v0, $v0, $v1 -/* C68708 802405D8 00461021 */ addu $v0, $v0, $a2 -/* C6870C 802405DC 8C420000 */ lw $v0, ($v0) -/* C68710 802405E0 08090183 */ j .L8024060C -/* C68714 802405E4 AE220294 */ sw $v0, 0x294($s1) -.L802405E8: -/* C68718 802405E8 3C06800F */ lui $a2, 0x800f -/* C6871C 802405EC 24C67F40 */ addiu $a2, $a2, 0x7f40 -/* C68720 802405F0 00461021 */ addu $v0, $v0, $a2 -/* C68724 802405F4 8C420000 */ lw $v0, ($v0) -/* C68728 802405F8 AE20018C */ sw $zero, 0x18c($s1) -/* C6872C 802405FC AE220000 */ sw $v0, ($s1) -/* C68730 80240600 8FA60010 */ lw $a2, 0x10($sp) -/* C68734 80240604 8CC20000 */ lw $v0, ($a2) -/* C68738 80240608 AE220294 */ sw $v0, 0x294($s1) -.L8024060C: -/* C6873C 8024060C 001010C0 */ sll $v0, $s0, 3 -/* C68740 80240610 03C21021 */ addu $v0, $fp, $v0 -/* C68744 80240614 80420015 */ lb $v0, 0x15($v0) -/* C68748 80240618 26D60001 */ addiu $s6, $s6, 1 -/* C6874C 8024061C AE220210 */ sw $v0, 0x210($s1) -/* C68750 80240620 26310004 */ addiu $s1, $s1, 4 -/* C68754 80240624 26520001 */ addiu $s2, $s2, 1 -.L80240628: -/* C68758 80240628 2A420008 */ slti $v0, $s2, 8 -/* C6875C 8024062C 1440FFCB */ bnez $v0, .L8024055C -/* C68760 80240630 26940002 */ addiu $s4, $s4, 2 -/* C68764 80240634 0260202D */ daddu $a0, $s3, $zero -/* C68768 80240638 24020004 */ addiu $v0, $zero, 4 -/* C6876C 8024063C AC820318 */ sw $v0, 0x318($a0) -/* C68770 80240640 AC960324 */ sw $s6, 0x324($a0) -/* C68774 80240644 0C03D390 */ jal func_800F4E40 -/* C68778 80240648 AC800328 */ sw $zero, 0x328($a0) -/* C6877C 8024064C AEA00070 */ sw $zero, 0x70($s5) -.L80240650: -/* C68780 80240650 8EA20070 */ lw $v0, 0x70($s5) -/* C68784 80240654 8EB30078 */ lw $s3, 0x78($s5) -/* C68788 80240658 14400008 */ bnez $v0, .L8024067C -/* C6878C 8024065C 24420001 */ addiu $v0, $v0, 1 -/* C68790 80240660 8662032C */ lh $v0, 0x32c($s3) -/* C68794 80240664 10400009 */ beqz $v0, .L8024068C -/* C68798 80240668 AEA20074 */ sw $v0, 0x74($s5) -/* C6879C 8024066C 0C03C4EC */ jal func_800F13B0 -/* C687A0 80240670 00000000 */ nop -/* C687A4 80240674 8EA20070 */ lw $v0, 0x70($s5) -/* C687A8 80240678 24420001 */ addiu $v0, $v0, 1 -.L8024067C: -/* C687AC 8024067C AEA20070 */ sw $v0, 0x70($s5) -/* C687B0 80240680 2842000F */ slti $v0, $v0, 0xf -/* C687B4 80240684 10400003 */ beqz $v0, .L80240694 -/* C687B8 80240688 00000000 */ nop -.L8024068C: -/* C687BC 8024068C 080901BF */ j .L802406FC -/* C687C0 80240690 0000102D */ daddu $v0, $zero, $zero -.L80240694: -/* C687C4 80240694 0C03C54E */ jal func_800F1538 -/* C687C8 80240698 00000000 */ nop -/* C687CC 8024069C 8EA30074 */ lw $v1, 0x74($s5) -/* C687D0 802406A0 240200FF */ addiu $v0, $zero, 0xff -/* C687D4 802406A4 10620010 */ beq $v1, $v0, .L802406E8 -/* C687D8 802406A8 2462FFFF */ addiu $v0, $v1, -1 -/* C687DC 802406AC 00021080 */ sll $v0, $v0, 2 -/* C687E0 802406B0 02621021 */ addu $v0, $s3, $v0 -/* C687E4 802406B4 8C420108 */ lw $v0, 0x108($v0) -/* C687E8 802406B8 00021100 */ sll $v0, $v0, 4 -/* C687EC 802406BC 3C038009 */ lui $v1, 0x8009 -/* C687F0 802406C0 00621821 */ addu $v1, $v1, $v0 -/* C687F4 802406C4 8C63EF20 */ lw $v1, -0x10e0($v1) -/* C687F8 802406C8 8EA20074 */ lw $v0, 0x74($s5) -/* C687FC 802406CC 2442FFFF */ addiu $v0, $v0, -1 -/* C68800 802406D0 00021080 */ sll $v0, $v0, 2 -/* C68804 802406D4 02621021 */ addu $v0, $s3, $v0 -/* C68808 802406D8 AEA30084 */ sw $v1, 0x84($s5) -/* C6880C 802406DC 8C420108 */ lw $v0, 0x108($v0) -/* C68810 802406E0 080901BC */ j .L802406F0 -/* C68814 802406E4 AEA20088 */ sw $v0, 0x88($s5) -.L802406E8: -/* C68818 802406E8 2402FFFF */ addiu $v0, $zero, -1 -/* C6881C 802406EC AEA20084 */ sw $v0, 0x84($s5) -.L802406F0: -/* C68820 802406F0 0C00AB4B */ jal heap_free -/* C68824 802406F4 8EA40078 */ lw $a0, 0x78($s5) -/* C68828 802406F8 24020002 */ addiu $v0, $zero, 2 -.L802406FC: -/* C6882C 802406FC 8FBF003C */ lw $ra, 0x3c($sp) -/* C68830 80240700 8FBE0038 */ lw $fp, 0x38($sp) -/* C68834 80240704 8FB70034 */ lw $s7, 0x34($sp) -/* C68838 80240708 8FB60030 */ lw $s6, 0x30($sp) -/* C6883C 8024070C 8FB5002C */ lw $s5, 0x2c($sp) -/* C68840 80240710 8FB40028 */ lw $s4, 0x28($sp) -/* C68844 80240714 8FB30024 */ lw $s3, 0x24($sp) -/* C68848 80240718 8FB20020 */ lw $s2, 0x20($sp) -/* C6884C 8024071C 8FB1001C */ lw $s1, 0x1c($sp) -/* C68850 80240720 8FB00018 */ lw $s0, 0x18($sp) -/* C68854 80240724 03E00008 */ jr $ra -/* C68858 80240728 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/func_8024072C_C68130.s b/asm/nonmatchings/world/area_kzn/kzn_04/func_8024072C_C68130.s deleted file mode 100644 index 8a2a43ddbb..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/func_8024072C_C68130.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024072C_C6885C -/* C6885C 8024072C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C68860 80240730 AFBF0010 */ sw $ra, 0x10($sp) -/* C68864 80240734 8C82000C */ lw $v0, 0xc($a0) -/* C68868 80240738 0C0B1EAF */ jal get_variable -/* C6886C 8024073C 8C450000 */ lw $a1, ($v0) -/* C68870 80240740 0C03AC5A */ jal func_800EB168 -/* C68874 80240744 0040202D */ daddu $a0, $v0, $zero -/* C68878 80240748 8FBF0010 */ lw $ra, 0x10($sp) -/* C6887C 8024074C 24020002 */ addiu $v0, $zero, 2 -/* C68880 80240750 03E00008 */ jr $ra -/* C68884 80240754 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240758_C68130.s b/asm/nonmatchings/world/area_kzn/kzn_04/func_80240758_C68130.s deleted file mode 100644 index 72cceee892..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240758_C68130.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240758_C68888 -/* C68888 80240758 3C028011 */ lui $v0, 0x8011 -/* C6888C 8024075C 8042F2A2 */ lb $v0, -0xd5e($v0) -/* C68890 80240760 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C68894 80240764 AFBF0010 */ sw $ra, 0x10($sp) -/* C68898 80240768 00021100 */ sll $v0, $v0, 4 -/* C6889C 8024076C 3C048009 */ lui $a0, 0x8009 -/* C688A0 80240770 00822021 */ addu $a0, $a0, $v0 -/* C688A4 80240774 8C84EF20 */ lw $a0, -0x10e0($a0) -/* C688A8 80240778 0C0496CF */ jal set_message_string -/* C688AC 8024077C 0000282D */ daddu $a1, $zero, $zero -/* C688B0 80240780 8FBF0010 */ lw $ra, 0x10($sp) -/* C688B4 80240784 24020002 */ addiu $v0, $zero, 2 -/* C688B8 80240788 03E00008 */ jr $ra -/* C688BC 8024078C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240790_C68130.s b/asm/nonmatchings/world/area_kzn/kzn_04/func_80240790_C68130.s deleted file mode 100644 index 07946a3f76..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240790_C68130.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240790_C688C0 -/* C688C0 80240790 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C688C4 80240794 AFB1001C */ sw $s1, 0x1c($sp) -/* C688C8 80240798 0080882D */ daddu $s1, $a0, $zero -/* C688CC 8024079C AFBF0020 */ sw $ra, 0x20($sp) -/* C688D0 802407A0 AFB00018 */ sw $s0, 0x18($sp) -/* C688D4 802407A4 8E30000C */ lw $s0, 0xc($s1) -/* C688D8 802407A8 8E050000 */ lw $a1, ($s0) -/* C688DC 802407AC 0C0B1EAF */ jal get_variable -/* C688E0 802407B0 26100004 */ addiu $s0, $s0, 4 -/* C688E4 802407B4 0C04417A */ jal get_entity_by_index -/* C688E8 802407B8 0040202D */ daddu $a0, $v0, $zero -/* C688EC 802407BC 8E100000 */ lw $s0, ($s0) -/* C688F0 802407C0 C444004C */ lwc1 $f4, 0x4c($v0) -/* C688F4 802407C4 3C014148 */ lui $at, 0x4148 -/* C688F8 802407C8 44810000 */ mtc1 $at, $f0 -/* C688FC 802407CC 3C013F33 */ lui $at, 0x3f33 -/* C68900 802407D0 34213333 */ ori $at, $at, 0x3333 -/* C68904 802407D4 44811000 */ mtc1 $at, $f2 -/* C68908 802407D8 AFA00014 */ sw $zero, 0x14($sp) -/* C6890C 802407DC 46002100 */ add.s $f4, $f4, $f0 -/* C68910 802407E0 E7A20010 */ swc1 $f2, 0x10($sp) -/* C68914 802407E4 8C450048 */ lw $a1, 0x48($v0) -/* C68918 802407E8 8C470050 */ lw $a3, 0x50($v0) -/* C6891C 802407EC 44062000 */ mfc1 $a2, $f4 -/* C68920 802407F0 0C01C5D4 */ jal func_80071750 -/* C68924 802407F4 0000202D */ daddu $a0, $zero, $zero -/* C68928 802407F8 0220202D */ daddu $a0, $s1, $zero -/* C6892C 802407FC 0200282D */ daddu $a1, $s0, $zero -/* C68930 80240800 0C0B2026 */ jal set_variable -/* C68934 80240804 0040302D */ daddu $a2, $v0, $zero -/* C68938 80240808 8FBF0020 */ lw $ra, 0x20($sp) -/* C6893C 8024080C 8FB1001C */ lw $s1, 0x1c($sp) -/* C68940 80240810 8FB00018 */ lw $s0, 0x18($sp) -/* C68944 80240814 24020002 */ addiu $v0, $zero, 2 -/* C68948 80240818 03E00008 */ jr $ra -/* C6894C 8024081C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240820_C68130.s b/asm/nonmatchings/world/area_kzn/kzn_04/func_80240820_C68130.s deleted file mode 100644 index 9bd6c50a0a..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240820_C68130.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240820_C68950 -/* C68950 80240820 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C68954 80240824 AFBF0010 */ sw $ra, 0x10($sp) -/* C68958 80240828 8C82000C */ lw $v0, 0xc($a0) -/* C6895C 8024082C 0C0B1EAF */ jal get_variable -/* C68960 80240830 8C450000 */ lw $a1, ($v0) -/* C68964 80240834 0040202D */ daddu $a0, $v0, $zero -/* C68968 80240838 8C830000 */ lw $v1, ($a0) -/* C6896C 8024083C 34630010 */ ori $v1, $v1, 0x10 -/* C68970 80240840 AC830000 */ sw $v1, ($a0) -/* C68974 80240844 8FBF0010 */ lw $ra, 0x10($sp) -/* C68978 80240848 24020002 */ addiu $v0, $zero, 2 -/* C6897C 8024084C 03E00008 */ jr $ra -/* C68980 80240850 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240854_C68130.s b/asm/nonmatchings/world/area_kzn/kzn_04/func_80240854_C68130.s deleted file mode 100644 index 3f04dde425..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240854_C68130.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240854_C68984 -/* C68984 80240854 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C68988 80240858 AFBF0018 */ sw $ra, 0x18($sp) -/* C6898C 8024085C 8C82000C */ lw $v0, 0xc($a0) -/* C68990 80240860 0C0B1EAF */ jal get_variable -/* C68994 80240864 8C450000 */ lw $a1, ($v0) -/* C68998 80240868 0C04417A */ jal get_entity_by_index -/* C6899C 8024086C 0040202D */ daddu $a0, $v0, $zero -/* C689A0 80240870 3C013F80 */ lui $at, 0x3f80 -/* C689A4 80240874 44810000 */ mtc1 $at, $f0 -/* C689A8 80240878 C442004C */ lwc1 $f2, 0x4c($v0) -/* C689AC 8024087C E7A00010 */ swc1 $f0, 0x10($sp) -/* C689B0 80240880 3C014148 */ lui $at, 0x4148 -/* C689B4 80240884 44810000 */ mtc1 $at, $f0 -/* C689B8 80240888 2403004B */ addiu $v1, $zero, 0x4b -/* C689BC 8024088C AFA30014 */ sw $v1, 0x14($sp) -/* C689C0 80240890 46001080 */ add.s $f2, $f2, $f0 -/* C689C4 80240894 8C450048 */ lw $a1, 0x48($v0) -/* C689C8 80240898 8C470050 */ lw $a3, 0x50($v0) -/* C689CC 8024089C 44061000 */ mfc1 $a2, $f2 -/* C689D0 802408A0 0C01C2EC */ jal func_80070BB0 -/* C689D4 802408A4 24040004 */ addiu $a0, $zero, 4 -/* C689D8 802408A8 8FBF0018 */ lw $ra, 0x18($sp) -/* C689DC 802408AC 24020002 */ addiu $v0, $zero, 2 -/* C689E0 802408B0 03E00008 */ jr $ra -/* C689E4 802408B4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240910_C68130.s b/asm/nonmatchings/world/area_kzn/kzn_04/func_80240910_C68130.s deleted file mode 100644 index 615d5ea539..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240910_C68130.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240910_C68A40 -/* C68A40 80240910 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* C68A44 80240914 AFB60040 */ sw $s6, 0x40($sp) -/* C68A48 80240918 0080B02D */ daddu $s6, $a0, $zero -/* C68A4C 8024091C AFB00028 */ sw $s0, 0x28($sp) -/* C68A50 80240920 00A0802D */ daddu $s0, $a1, $zero -/* C68A54 80240924 AFBF0044 */ sw $ra, 0x44($sp) -/* C68A58 80240928 AFB5003C */ sw $s5, 0x3c($sp) -/* C68A5C 8024092C AFB40038 */ sw $s4, 0x38($sp) -/* C68A60 80240930 AFB30034 */ sw $s3, 0x34($sp) -/* C68A64 80240934 AFB20030 */ sw $s2, 0x30($sp) -/* C68A68 80240938 AFB1002C */ sw $s1, 0x2c($sp) -/* C68A6C 8024093C F7B80058 */ sdc1 $f24, 0x58($sp) -/* C68A70 80240940 F7B60050 */ sdc1 $f22, 0x50($sp) -/* C68A74 80240944 F7B40048 */ sdc1 $f20, 0x48($sp) -/* C68A78 80240948 8ED3000C */ lw $s3, 0xc($s6) -/* C68A7C 8024094C 0C00EAD2 */ jal get_npc_safe -/* C68A80 80240950 2404FFFC */ addiu $a0, $zero, -4 -/* C68A84 80240954 27A50018 */ addiu $a1, $sp, 0x18 -/* C68A88 80240958 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C68A8C 8024095C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C68A90 80240960 27A6001C */ addiu $a2, $sp, 0x1c -/* C68A94 80240964 00041880 */ sll $v1, $a0, 2 -/* C68A98 80240968 00641821 */ addu $v1, $v1, $a0 -/* C68A9C 8024096C 00031880 */ sll $v1, $v1, 2 -/* C68AA0 80240970 00641823 */ subu $v1, $v1, $a0 -/* C68AA4 80240974 000320C0 */ sll $a0, $v1, 3 -/* C68AA8 80240978 00641821 */ addu $v1, $v1, $a0 -/* C68AAC 8024097C 000318C0 */ sll $v1, $v1, 3 -/* C68AB0 80240980 3C01800B */ lui $at, 0x800b -/* C68AB4 80240984 00230821 */ addu $at, $at, $v1 -/* C68AB8 80240988 C42C1DEC */ lwc1 $f12, 0x1dec($at) -/* C68ABC 8024098C 0C00A88D */ jal sin_cos_deg -/* C68AC0 80240990 0040A82D */ daddu $s5, $v0, $zero -/* C68AC4 80240994 1200005D */ beqz $s0, .L80240B0C -/* C68AC8 80240998 00000000 */ nop -/* C68ACC 8024099C 0C00AB0A */ jal general_heap_malloc -/* C68AD0 802409A0 24040068 */ addiu $a0, $zero, 0x68 -/* C68AD4 802409A4 0040902D */ daddu $s2, $v0, $zero -/* C68AD8 802409A8 02C0202D */ daddu $a0, $s6, $zero -/* C68ADC 802409AC 0000882D */ daddu $s1, $zero, $zero -/* C68AE0 802409B0 2414FFFF */ addiu $s4, $zero, -1 -/* C68AE4 802409B4 AED20060 */ sw $s2, 0x60($s6) -/* C68AE8 802409B8 8E650000 */ lw $a1, ($s3) -/* C68AEC 802409BC 3C014148 */ lui $at, 0x4148 -/* C68AF0 802409C0 4481C000 */ mtc1 $at, $f24 -/* C68AF4 802409C4 3C013F80 */ lui $at, 0x3f80 -/* C68AF8 802409C8 4481B000 */ mtc1 $at, $f22 -/* C68AFC 802409CC 4480A000 */ mtc1 $zero, $f20 -/* C68B00 802409D0 0C0B1EAF */ jal get_variable -/* C68B04 802409D4 0240802D */ daddu $s0, $s2, $zero -/* C68B08 802409D8 0C04417A */ jal get_entity_by_index -/* C68B0C 802409DC 0040202D */ daddu $a0, $v0, $zero -/* C68B10 802409E0 AE42005C */ sw $v0, 0x5c($s2) -.L802409E4: -/* C68B14 802409E4 8E42005C */ lw $v0, 0x5c($s2) -/* C68B18 802409E8 C440004C */ lwc1 $f0, 0x4c($v0) -/* C68B1C 802409EC 0000202D */ daddu $a0, $zero, $zero -/* C68B20 802409F0 E7B60010 */ swc1 $f22, 0x10($sp) -/* C68B24 802409F4 AFB40014 */ sw $s4, 0x14($sp) -/* C68B28 802409F8 46180000 */ add.s $f0, $f0, $f24 -/* C68B2C 802409FC 8C450048 */ lw $a1, 0x48($v0) -/* C68B30 80240A00 8C470050 */ lw $a3, 0x50($v0) -/* C68B34 80240A04 44060000 */ mfc1 $a2, $f0 -/* C68B38 80240A08 0C01C5BC */ jal func_800716F0 -/* C68B3C 80240A0C 26310001 */ addiu $s1, $s1, 1 -/* C68B40 80240A10 AE020008 */ sw $v0, 8($s0) -/* C68B44 80240A14 E614002C */ swc1 $f20, 0x2c($s0) -/* C68B48 80240A18 E6140020 */ swc1 $f20, 0x20($s0) -/* C68B4C 80240A1C E6140014 */ swc1 $f20, 0x14($s0) -/* C68B50 80240A20 E6140050 */ swc1 $f20, 0x50($s0) -/* C68B54 80240A24 E6140044 */ swc1 $f20, 0x44($s0) -/* C68B58 80240A28 E6140038 */ swc1 $f20, 0x38($s0) -/* C68B5C 80240A2C 2A220003 */ slti $v0, $s1, 3 -/* C68B60 80240A30 1440FFEC */ bnez $v0, .L802409E4 -/* C68B64 80240A34 26100004 */ addiu $s0, $s0, 4 -/* C68B68 80240A38 0000882D */ daddu $s1, $zero, $zero -/* C68B6C 80240A3C 0240802D */ daddu $s0, $s2, $zero -/* C68B70 80240A40 3C148024 */ lui $s4, 0x8024 -/* C68B74 80240A44 26941C98 */ addiu $s4, $s4, 0x1c98 -/* C68B78 80240A48 3C014248 */ lui $at, 0x4248 -/* C68B7C 80240A4C 4481A000 */ mtc1 $at, $f20 -/* C68B80 80240A50 24130044 */ addiu $s3, $zero, 0x44 -/* C68B84 80240A54 AE400000 */ sw $zero, ($s2) -/* C68B88 80240A58 AE400004 */ sw $zero, 4($s2) -/* C68B8C 80240A5C AE400060 */ sw $zero, 0x60($s2) -/* C68B90 80240A60 AE400064 */ sw $zero, 0x64($s2) -.L80240A64: -/* C68B94 80240A64 27A40020 */ addiu $a0, $sp, 0x20 -/* C68B98 80240A68 4406A000 */ mfc1 $a2, $f20 -/* C68B9C 80240A6C 8E870000 */ lw $a3, ($s4) -/* C68BA0 80240A70 02532821 */ addu $a1, $s2, $s3 -/* C68BA4 80240A74 0C00A7E7 */ jal add_vec2D_polar -/* C68BA8 80240A78 AFA00020 */ sw $zero, 0x20($sp) -/* C68BAC 80240A7C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* C68BB0 80240A80 C7A40020 */ lwc1 $f4, 0x20($sp) -/* C68BB4 80240A84 46041082 */ mul.s $f2, $f2, $f4 -/* C68BB8 80240A88 00000000 */ nop -/* C68BBC 80240A8C C7A00018 */ lwc1 $f0, 0x18($sp) -/* C68BC0 80240A90 46040002 */ mul.s $f0, $f0, $f4 -/* C68BC4 80240A94 00000000 */ nop -/* C68BC8 80240A98 E6020038 */ swc1 $f2, 0x38($s0) -/* C68BCC 80240A9C E6000050 */ swc1 $f0, 0x50($s0) -/* C68BD0 80240AA0 8E42005C */ lw $v0, 0x5c($s2) -/* C68BD4 80240AA4 C6000038 */ lwc1 $f0, 0x38($s0) -/* C68BD8 80240AA8 C4420048 */ lwc1 $f2, 0x48($v0) -/* C68BDC 80240AAC 46001080 */ add.s $f2, $f2, $f0 -/* C68BE0 80240AB0 C6A00038 */ lwc1 $f0, 0x38($s5) -/* C68BE4 80240AB4 46020001 */ sub.s $f0, $f0, $f2 -/* C68BE8 80240AB8 E6000038 */ swc1 $f0, 0x38($s0) -/* C68BEC 80240ABC 8E42005C */ lw $v0, 0x5c($s2) -/* C68BF0 80240AC0 C6000044 */ lwc1 $f0, 0x44($s0) -/* C68BF4 80240AC4 C442004C */ lwc1 $f2, 0x4c($v0) -/* C68BF8 80240AC8 46001080 */ add.s $f2, $f2, $f0 -/* C68BFC 80240ACC C6A0003C */ lwc1 $f0, 0x3c($s5) -/* C68C00 80240AD0 46020001 */ sub.s $f0, $f0, $f2 -/* C68C04 80240AD4 E6000044 */ swc1 $f0, 0x44($s0) -/* C68C08 80240AD8 8E42005C */ lw $v0, 0x5c($s2) -/* C68C0C 80240ADC C6000050 */ lwc1 $f0, 0x50($s0) -/* C68C10 80240AE0 C4420050 */ lwc1 $f2, 0x50($v0) -/* C68C14 80240AE4 26940004 */ addiu $s4, $s4, 4 -/* C68C18 80240AE8 46001080 */ add.s $f2, $f2, $f0 -/* C68C1C 80240AEC C6A00040 */ lwc1 $f0, 0x40($s5) -/* C68C20 80240AF0 26730004 */ addiu $s3, $s3, 4 -/* C68C24 80240AF4 46020001 */ sub.s $f0, $f0, $f2 -/* C68C28 80240AF8 26310001 */ addiu $s1, $s1, 1 -/* C68C2C 80240AFC 2A220003 */ slti $v0, $s1, 3 -/* C68C30 80240B00 E6000050 */ swc1 $f0, 0x50($s0) -/* C68C34 80240B04 1440FFD7 */ bnez $v0, .L80240A64 -/* C68C38 80240B08 26100004 */ addiu $s0, $s0, 4 -.L80240B0C: -/* C68C3C 80240B0C 8ED20060 */ lw $s2, 0x60($s6) -/* C68C40 80240B10 8E430000 */ lw $v1, ($s2) -/* C68C44 80240B14 24020001 */ addiu $v0, $zero, 1 -/* C68C48 80240B18 10620038 */ beq $v1, $v0, .L80240BFC -/* C68C4C 80240B1C 28620002 */ slti $v0, $v1, 2 -/* C68C50 80240B20 50400005 */ beql $v0, $zero, .L80240B38 -/* C68C54 80240B24 24020002 */ addiu $v0, $zero, 2 -/* C68C58 80240B28 10600007 */ beqz $v1, .L80240B48 -/* C68C5C 80240B2C 24040005 */ addiu $a0, $zero, 5 -/* C68C60 80240B30 08090338 */ j .L80240CE0 -/* C68C64 80240B34 00000000 */ nop -.L80240B38: -/* C68C68 80240B38 10620058 */ beq $v1, $v0, .L80240C9C -/* C68C6C 80240B3C 00000000 */ nop -/* C68C70 80240B40 08090338 */ j .L80240CE0 -/* C68C74 80240B44 00000000 */ nop -.L80240B48: -/* C68C78 80240B48 0000882D */ daddu $s1, $zero, $zero -/* C68C7C 80240B4C 3C148024 */ lui $s4, 0x8024 -/* C68C80 80240B50 26941C98 */ addiu $s4, $s4, 0x1c98 -/* C68C84 80240B54 24130020 */ addiu $s3, $zero, 0x20 -/* C68C88 80240B58 3C064248 */ lui $a2, 0x4248 -/* C68C8C 80240B5C 44800000 */ mtc1 $zero, $f0 -/* C68C90 80240B60 24020014 */ addiu $v0, $zero, 0x14 -/* C68C94 80240B64 AFA20010 */ sw $v0, 0x10($sp) -/* C68C98 80240B68 44050000 */ mfc1 $a1, $f0 -/* C68C9C 80240B6C 8E470060 */ lw $a3, 0x60($s2) -/* C68CA0 80240B70 4485B000 */ mtc1 $a1, $f22 -/* C68CA4 80240B74 0C00A8ED */ jal update_lerp -/* C68CA8 80240B78 0240802D */ daddu $s0, $s2, $zero -/* C68CAC 80240B7C 46000506 */ mov.s $f20, $f0 -.L80240B80: -/* C68CB0 80240B80 4406A000 */ mfc1 $a2, $f20 -/* C68CB4 80240B84 27A40020 */ addiu $a0, $sp, 0x20 -/* C68CB8 80240B88 E6160020 */ swc1 $f22, 0x20($s0) -/* C68CBC 80240B8C 8E870000 */ lw $a3, ($s4) -/* C68CC0 80240B90 02532821 */ addu $a1, $s2, $s3 -/* C68CC4 80240B94 0C00A7E7 */ jal add_vec2D_polar -/* C68CC8 80240B98 E7B60020 */ swc1 $f22, 0x20($sp) -/* C68CCC 80240B9C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* C68CD0 80240BA0 C7A00020 */ lwc1 $f0, 0x20($sp) -/* C68CD4 80240BA4 46002102 */ mul.s $f4, $f4, $f0 -/* C68CD8 80240BA8 00000000 */ nop -/* C68CDC 80240BAC C7A20018 */ lwc1 $f2, 0x18($sp) -/* C68CE0 80240BB0 26940004 */ addiu $s4, $s4, 4 -/* C68CE4 80240BB4 46001082 */ mul.s $f2, $f2, $f0 -/* C68CE8 80240BB8 00000000 */ nop -/* C68CEC 80240BBC 26730004 */ addiu $s3, $s3, 4 -/* C68CF0 80240BC0 26310001 */ addiu $s1, $s1, 1 -/* C68CF4 80240BC4 2A220003 */ slti $v0, $s1, 3 -/* C68CF8 80240BC8 E6040014 */ swc1 $f4, 0x14($s0) -/* C68CFC 80240BCC E602002C */ swc1 $f2, 0x2c($s0) -/* C68D00 80240BD0 1440FFEB */ bnez $v0, .L80240B80 -/* C68D04 80240BD4 26100004 */ addiu $s0, $s0, 4 -/* C68D08 80240BD8 8E420060 */ lw $v0, 0x60($s2) -/* C68D0C 80240BDC 24420001 */ addiu $v0, $v0, 1 -/* C68D10 80240BE0 AE420060 */ sw $v0, 0x60($s2) -/* C68D14 80240BE4 28420015 */ slti $v0, $v0, 0x15 -/* C68D18 80240BE8 1440003D */ bnez $v0, .L80240CE0 -/* C68D1C 80240BEC 24020001 */ addiu $v0, $zero, 1 -/* C68D20 80240BF0 AE420000 */ sw $v0, ($s2) -/* C68D24 80240BF4 08090338 */ j .L80240CE0 -/* C68D28 80240BF8 AE400060 */ sw $zero, 0x60($s2) -.L80240BFC: -/* C68D2C 80240BFC 0000882D */ daddu $s1, $zero, $zero -/* C68D30 80240C00 3C148024 */ lui $s4, 0x8024 -/* C68D34 80240C04 26941C98 */ addiu $s4, $s4, 0x1c98 -/* C68D38 80240C08 24130020 */ addiu $s3, $zero, 0x20 -/* C68D3C 80240C0C 0240802D */ daddu $s0, $s2, $zero -/* C68D40 80240C10 3C014248 */ lui $at, 0x4248 -/* C68D44 80240C14 4481A000 */ mtc1 $at, $f20 -/* C68D48 80240C18 4480B000 */ mtc1 $zero, $f22 -.L80240C1C: -/* C68D4C 80240C1C 4406A000 */ mfc1 $a2, $f20 -/* C68D50 80240C20 27A40020 */ addiu $a0, $sp, 0x20 -/* C68D54 80240C24 E6160020 */ swc1 $f22, 0x20($s0) -/* C68D58 80240C28 8E870000 */ lw $a3, ($s4) -/* C68D5C 80240C2C 02532821 */ addu $a1, $s2, $s3 -/* C68D60 80240C30 0C00A7E7 */ jal add_vec2D_polar -/* C68D64 80240C34 E7B60020 */ swc1 $f22, 0x20($sp) -/* C68D68 80240C38 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* C68D6C 80240C3C C7A00020 */ lwc1 $f0, 0x20($sp) -/* C68D70 80240C40 46002102 */ mul.s $f4, $f4, $f0 -/* C68D74 80240C44 00000000 */ nop -/* C68D78 80240C48 C7A20018 */ lwc1 $f2, 0x18($sp) -/* C68D7C 80240C4C 26940004 */ addiu $s4, $s4, 4 -/* C68D80 80240C50 46001082 */ mul.s $f2, $f2, $f0 -/* C68D84 80240C54 00000000 */ nop -/* C68D88 80240C58 26730004 */ addiu $s3, $s3, 4 -/* C68D8C 80240C5C 26310001 */ addiu $s1, $s1, 1 -/* C68D90 80240C60 2A220003 */ slti $v0, $s1, 3 -/* C68D94 80240C64 E6040014 */ swc1 $f4, 0x14($s0) -/* C68D98 80240C68 E602002C */ swc1 $f2, 0x2c($s0) -/* C68D9C 80240C6C 1440FFEB */ bnez $v0, .L80240C1C -/* C68DA0 80240C70 26100004 */ addiu $s0, $s0, 4 -/* C68DA4 80240C74 8E420060 */ lw $v0, 0x60($s2) -/* C68DA8 80240C78 24420001 */ addiu $v0, $v0, 1 -/* C68DAC 80240C7C AE420060 */ sw $v0, 0x60($s2) -/* C68DB0 80240C80 28420010 */ slti $v0, $v0, 0x10 -/* C68DB4 80240C84 14400016 */ bnez $v0, .L80240CE0 -/* C68DB8 80240C88 2402000F */ addiu $v0, $zero, 0xf -/* C68DBC 80240C8C AE420060 */ sw $v0, 0x60($s2) -/* C68DC0 80240C90 24020002 */ addiu $v0, $zero, 2 -/* C68DC4 80240C94 08090338 */ j .L80240CE0 -/* C68DC8 80240C98 AE420000 */ sw $v0, ($s2) -.L80240C9C: -/* C68DCC 80240C9C 8E420060 */ lw $v0, 0x60($s2) -/* C68DD0 80240CA0 24420001 */ addiu $v0, $v0, 1 -/* C68DD4 80240CA4 AE420060 */ sw $v0, 0x60($s2) -/* C68DD8 80240CA8 2842001F */ slti $v0, $v0, 0x1f -/* C68DDC 80240CAC 1440000C */ bnez $v0, .L80240CE0 -/* C68DE0 80240CB0 0000882D */ daddu $s1, $zero, $zero -/* C68DE4 80240CB4 0240282D */ daddu $a1, $s2, $zero -.L80240CB8: -/* C68DE8 80240CB8 8CA20008 */ lw $v0, 8($a1) -/* C68DEC 80240CBC 8C430000 */ lw $v1, ($v0) -/* C68DF0 80240CC0 26310001 */ addiu $s1, $s1, 1 -/* C68DF4 80240CC4 34630010 */ ori $v1, $v1, 0x10 -/* C68DF8 80240CC8 AC430000 */ sw $v1, ($v0) -/* C68DFC 80240CCC 2A220003 */ slti $v0, $s1, 3 -/* C68E00 80240CD0 1440FFF9 */ bnez $v0, .L80240CB8 -/* C68E04 80240CD4 24A50004 */ addiu $a1, $a1, 4 -/* C68E08 80240CD8 08090385 */ j .L80240E14 -/* C68E0C 80240CDC 24020002 */ addiu $v0, $zero, 2 -.L80240CE0: -/* C68E10 80240CE0 8E430004 */ lw $v1, 4($s2) -/* C68E14 80240CE4 10600005 */ beqz $v1, .L80240CFC -/* C68E18 80240CE8 24020001 */ addiu $v0, $zero, 1 -/* C68E1C 80240CEC 1062000B */ beq $v1, $v0, .L80240D1C -/* C68E20 80240CF0 0000882D */ daddu $s1, $zero, $zero -/* C68E24 80240CF4 08090374 */ j .L80240DD0 -/* C68E28 80240CF8 0240282D */ daddu $a1, $s2, $zero -.L80240CFC: -/* C68E2C 80240CFC 8E420064 */ lw $v0, 0x64($s2) -/* C68E30 80240D00 24420001 */ addiu $v0, $v0, 1 -/* C68E34 80240D04 AE420064 */ sw $v0, 0x64($s2) -/* C68E38 80240D08 28420010 */ slti $v0, $v0, 0x10 -/* C68E3C 80240D0C 1440002F */ bnez $v0, .L80240DCC -/* C68E40 80240D10 0000882D */ daddu $s1, $zero, $zero -/* C68E44 80240D14 08090370 */ j .L80240DC0 -/* C68E48 80240D18 24020001 */ addiu $v0, $zero, 1 -.L80240D1C: -/* C68E4C 80240D1C 4480A000 */ mtc1 $zero, $f20 -/* C68E50 80240D20 24130014 */ addiu $s3, $zero, 0x14 -/* C68E54 80240D24 0240802D */ daddu $s0, $s2, $zero -.L80240D28: -/* C68E58 80240D28 4405A000 */ mfc1 $a1, $f20 -/* C68E5C 80240D2C AFB30010 */ sw $s3, 0x10($sp) -/* C68E60 80240D30 8E060038 */ lw $a2, 0x38($s0) -/* C68E64 80240D34 8E470064 */ lw $a3, 0x64($s2) -/* C68E68 80240D38 0C00A8ED */ jal update_lerp -/* C68E6C 80240D3C 24040001 */ addiu $a0, $zero, 1 -/* C68E70 80240D40 C6020014 */ lwc1 $f2, 0x14($s0) -/* C68E74 80240D44 46001080 */ add.s $f2, $f2, $f0 -/* C68E78 80240D48 4405A000 */ mfc1 $a1, $f20 -/* C68E7C 80240D4C E6020014 */ swc1 $f2, 0x14($s0) -/* C68E80 80240D50 AFB30010 */ sw $s3, 0x10($sp) -/* C68E84 80240D54 8E060044 */ lw $a2, 0x44($s0) -/* C68E88 80240D58 8E470064 */ lw $a3, 0x64($s2) -/* C68E8C 80240D5C 0C00A8ED */ jal update_lerp -/* C68E90 80240D60 24040001 */ addiu $a0, $zero, 1 -/* C68E94 80240D64 C6020020 */ lwc1 $f2, 0x20($s0) -/* C68E98 80240D68 46001080 */ add.s $f2, $f2, $f0 -/* C68E9C 80240D6C 4405A000 */ mfc1 $a1, $f20 -/* C68EA0 80240D70 E6020020 */ swc1 $f2, 0x20($s0) -/* C68EA4 80240D74 AFB30010 */ sw $s3, 0x10($sp) -/* C68EA8 80240D78 8E060050 */ lw $a2, 0x50($s0) -/* C68EAC 80240D7C 8E470064 */ lw $a3, 0x64($s2) -/* C68EB0 80240D80 0C00A8ED */ jal update_lerp -/* C68EB4 80240D84 24040001 */ addiu $a0, $zero, 1 -/* C68EB8 80240D88 C602002C */ lwc1 $f2, 0x2c($s0) -/* C68EBC 80240D8C 46001080 */ add.s $f2, $f2, $f0 -/* C68EC0 80240D90 26310001 */ addiu $s1, $s1, 1 -/* C68EC4 80240D94 2A220003 */ slti $v0, $s1, 3 -/* C68EC8 80240D98 E602002C */ swc1 $f2, 0x2c($s0) -/* C68ECC 80240D9C 1440FFE2 */ bnez $v0, .L80240D28 -/* C68ED0 80240DA0 26100004 */ addiu $s0, $s0, 4 -/* C68ED4 80240DA4 8E420064 */ lw $v0, 0x64($s2) -/* C68ED8 80240DA8 24420001 */ addiu $v0, $v0, 1 -/* C68EDC 80240DAC AE420064 */ sw $v0, 0x64($s2) -/* C68EE0 80240DB0 28420015 */ slti $v0, $v0, 0x15 -/* C68EE4 80240DB4 14400005 */ bnez $v0, .L80240DCC -/* C68EE8 80240DB8 0000882D */ daddu $s1, $zero, $zero -/* C68EEC 80240DBC 24020002 */ addiu $v0, $zero, 2 -.L80240DC0: -/* C68EF0 80240DC0 AE420004 */ sw $v0, 4($s2) -/* C68EF4 80240DC4 AE400064 */ sw $zero, 0x64($s2) -/* C68EF8 80240DC8 0000882D */ daddu $s1, $zero, $zero -.L80240DCC: -/* C68EFC 80240DCC 0240282D */ daddu $a1, $s2, $zero -.L80240DD0: -/* C68F00 80240DD0 8CA20008 */ lw $v0, 8($a1) -/* C68F04 80240DD4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* C68F08 80240DD8 8C42000C */ lw $v0, 0xc($v0) -/* C68F0C 80240DDC E4400010 */ swc1 $f0, 0x10($v0) -/* C68F10 80240DE0 8CA20008 */ lw $v0, 8($a1) -/* C68F14 80240DE4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* C68F18 80240DE8 8C42000C */ lw $v0, 0xc($v0) -/* C68F1C 80240DEC 26310001 */ addiu $s1, $s1, 1 -/* C68F20 80240DF0 E4400014 */ swc1 $f0, 0x14($v0) -/* C68F24 80240DF4 8CA20008 */ lw $v0, 8($a1) -/* C68F28 80240DF8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* C68F2C 80240DFC 8C42000C */ lw $v0, 0xc($v0) -/* C68F30 80240E00 E4400018 */ swc1 $f0, 0x18($v0) -/* C68F34 80240E04 2A220003 */ slti $v0, $s1, 3 -/* C68F38 80240E08 1440FFF1 */ bnez $v0, .L80240DD0 -/* C68F3C 80240E0C 24A50004 */ addiu $a1, $a1, 4 -/* C68F40 80240E10 0000102D */ daddu $v0, $zero, $zero -.L80240E14: -/* C68F44 80240E14 8FBF0044 */ lw $ra, 0x44($sp) -/* C68F48 80240E18 8FB60040 */ lw $s6, 0x40($sp) -/* C68F4C 80240E1C 8FB5003C */ lw $s5, 0x3c($sp) -/* C68F50 80240E20 8FB40038 */ lw $s4, 0x38($sp) -/* C68F54 80240E24 8FB30034 */ lw $s3, 0x34($sp) -/* C68F58 80240E28 8FB20030 */ lw $s2, 0x30($sp) -/* C68F5C 80240E2C 8FB1002C */ lw $s1, 0x2c($sp) -/* C68F60 80240E30 8FB00028 */ lw $s0, 0x28($sp) -/* C68F64 80240E34 D7B80058 */ ldc1 $f24, 0x58($sp) -/* C68F68 80240E38 D7B60050 */ ldc1 $f22, 0x50($sp) -/* C68F6C 80240E3C D7B40048 */ ldc1 $f20, 0x48($sp) -/* C68F70 80240E40 03E00008 */ jr $ra -/* C68F74 80240E44 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240E48_C68130.s b/asm/nonmatchings/world/area_kzn/kzn_04/func_80240E48_C68130.s deleted file mode 100644 index 32f93b730c..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240E48_C68130.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E48_C68F78 -/* C68F78 80240E48 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C68F7C 80240E4C AFB10014 */ sw $s1, 0x14($sp) -/* C68F80 80240E50 0080882D */ daddu $s1, $a0, $zero -/* C68F84 80240E54 AFB20018 */ sw $s2, 0x18($sp) -/* C68F88 80240E58 AFBF001C */ sw $ra, 0x1c($sp) -/* C68F8C 80240E5C AFB00010 */ sw $s0, 0x10($sp) -/* C68F90 80240E60 8E30000C */ lw $s0, 0xc($s1) -/* C68F94 80240E64 10A00010 */ beqz $a1, .L80240EA8 -/* C68F98 80240E68 0000902D */ daddu $s2, $zero, $zero -/* C68F9C 80240E6C 8E050000 */ lw $a1, ($s0) -/* C68FA0 80240E70 0C0B1EAF */ jal get_variable -/* C68FA4 80240E74 26100004 */ addiu $s0, $s0, 4 -/* C68FA8 80240E78 AE220084 */ sw $v0, 0x84($s1) -/* C68FAC 80240E7C 8E050000 */ lw $a1, ($s0) -/* C68FB0 80240E80 0C0B1EAF */ jal get_variable -/* C68FB4 80240E84 0220202D */ daddu $a0, $s1, $zero -/* C68FB8 80240E88 0240202D */ daddu $a0, $s2, $zero -/* C68FBC 80240E8C 240500D0 */ addiu $a1, $zero, 0xd0 -/* C68FC0 80240E90 00A0302D */ daddu $a2, $a1, $zero -/* C68FC4 80240E94 00A0382D */ daddu $a3, $a1, $zero -/* C68FC8 80240E98 AE220088 */ sw $v0, 0x88($s1) -/* C68FCC 80240E9C AE200070 */ sw $zero, 0x70($s1) -/* C68FD0 80240EA0 0C04DF84 */ jal func_80137E10 -/* C68FD4 80240EA4 AE200074 */ sw $zero, 0x74($s1) -.L80240EA8: -/* C68FD8 80240EA8 8E230070 */ lw $v1, 0x70($s1) -/* C68FDC 80240EAC 24040001 */ addiu $a0, $zero, 1 -/* C68FE0 80240EB0 10640019 */ beq $v1, $a0, .L80240F18 -/* C68FE4 80240EB4 28620002 */ slti $v0, $v1, 2 -/* C68FE8 80240EB8 10400005 */ beqz $v0, .L80240ED0 -/* C68FEC 80240EBC 24020002 */ addiu $v0, $zero, 2 -/* C68FF0 80240EC0 10600007 */ beqz $v1, .L80240EE0 -/* C68FF4 80240EC4 240500FF */ addiu $a1, $zero, 0xff -/* C68FF8 80240EC8 080903D6 */ j .L80240F58 -/* C68FFC 80240ECC 00000000 */ nop -.L80240ED0: -/* C69000 80240ED0 10620019 */ beq $v1, $v0, .L80240F38 -/* C69004 80240ED4 00000000 */ nop -/* C69008 80240ED8 080903D6 */ j .L80240F58 -/* C6900C 80240EDC 00000000 */ nop -.L80240EE0: -/* C69010 80240EE0 8E220074 */ lw $v0, 0x74($s1) -/* C69014 80240EE4 14450004 */ bne $v0, $a1, .L80240EF8 -/* C69018 80240EE8 00000000 */ nop -/* C6901C 80240EEC AE240070 */ sw $a0, 0x70($s1) -/* C69020 80240EF0 AE200078 */ sw $zero, 0x78($s1) -/* C69024 80240EF4 8E220074 */ lw $v0, 0x74($s1) -.L80240EF8: -/* C69028 80240EF8 8E230084 */ lw $v1, 0x84($s1) -/* C6902C 80240EFC 00431021 */ addu $v0, $v0, $v1 -/* C69030 80240F00 AE220074 */ sw $v0, 0x74($s1) -/* C69034 80240F04 28420100 */ slti $v0, $v0, 0x100 -/* C69038 80240F08 50400013 */ beql $v0, $zero, .L80240F58 -/* C6903C 80240F0C AE250074 */ sw $a1, 0x74($s1) -/* C69040 80240F10 080903D6 */ j .L80240F58 -/* C69044 80240F14 00000000 */ nop -.L80240F18: -/* C69048 80240F18 8E220078 */ lw $v0, 0x78($s1) -/* C6904C 80240F1C 24420001 */ addiu $v0, $v0, 1 -/* C69050 80240F20 AE220078 */ sw $v0, 0x78($s1) -/* C69054 80240F24 28420002 */ slti $v0, $v0, 2 -/* C69058 80240F28 1440000B */ bnez $v0, .L80240F58 -/* C6905C 80240F2C 24020002 */ addiu $v0, $zero, 2 -/* C69060 80240F30 080903D6 */ j .L80240F58 -/* C69064 80240F34 AE220070 */ sw $v0, 0x70($s1) -.L80240F38: -/* C69068 80240F38 8E230074 */ lw $v1, 0x74($s1) -/* C6906C 80240F3C 50600001 */ beql $v1, $zero, .L80240F44 -/* C69070 80240F40 24120001 */ addiu $s2, $zero, 1 -.L80240F44: -/* C69074 80240F44 8E220088 */ lw $v0, 0x88($s1) -/* C69078 80240F48 00621023 */ subu $v0, $v1, $v0 -/* C6907C 80240F4C 04410002 */ bgez $v0, .L80240F58 -/* C69080 80240F50 AE220074 */ sw $v0, 0x74($s1) -/* C69084 80240F54 AE200074 */ sw $zero, 0x74($s1) -.L80240F58: -/* C69088 80240F58 C6200074 */ lwc1 $f0, 0x74($s1) -/* C6908C 80240F5C 46800020 */ cvt.s.w $f0, $f0 -/* C69090 80240F60 44050000 */ mfc1 $a1, $f0 -/* C69094 80240F64 0C04DF62 */ jal func_80137D88 -/* C69098 80240F68 24040001 */ addiu $a0, $zero, 1 -/* C6909C 80240F6C 0240102D */ daddu $v0, $s2, $zero -/* C690A0 80240F70 8FBF001C */ lw $ra, 0x1c($sp) -/* C690A4 80240F74 8FB20018 */ lw $s2, 0x18($sp) -/* C690A8 80240F78 8FB10014 */ lw $s1, 0x14($sp) -/* C690AC 80240F7C 8FB00010 */ lw $s0, 0x10($sp) -/* C690B0 80240F80 03E00008 */ jr $ra -/* C690B4 80240F84 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240F88_C68130.s b/asm/nonmatchings/world/area_kzn/kzn_04/func_80240F88_C68130.s deleted file mode 100644 index c059bab2f9..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240F88_C68130.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F88_C690B8 -/* C690B8 80240F88 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C690BC 80240F8C AFBF0018 */ sw $ra, 0x18($sp) -/* C690C0 80240F90 0C00EAD2 */ jal get_npc_safe -/* C690C4 80240F94 2404FFFC */ addiu $a0, $zero, -4 -/* C690C8 80240F98 3C0141F0 */ lui $at, 0x41f0 -/* C690CC 80240F9C 44810000 */ mtc1 $at, $f0 -/* C690D0 80240FA0 C442003C */ lwc1 $f2, 0x3c($v0) -/* C690D4 80240FA4 46001080 */ add.s $f2, $f2, $f0 -/* C690D8 80240FA8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C690DC 80240FAC 8C450038 */ lw $a1, 0x38($v0) -/* C690E0 80240FB0 8C470040 */ lw $a3, 0x40($v0) -/* C690E4 80240FB4 44061000 */ mfc1 $a2, $f2 -/* C690E8 80240FB8 0C01BFBC */ jal func_8006FEF0 -/* C690EC 80240FBC 24040002 */ addiu $a0, $zero, 2 -/* C690F0 80240FC0 8FBF0018 */ lw $ra, 0x18($sp) -/* C690F4 80240FC4 24020002 */ addiu $v0, $zero, 2 -/* C690F8 80240FC8 03E00008 */ jr $ra -/* C690FC 80240FCC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240FD0_C68130.s b/asm/nonmatchings/world/area_kzn/kzn_04/func_80240FD0_C68130.s deleted file mode 100644 index 29d9a68c1f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/func_80240FD0_C68130.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD0_C69100 -/* C69100 80240FD0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C69104 80240FD4 AFBF0018 */ sw $ra, 0x18($sp) -/* C69108 80240FD8 0C00EAD2 */ jal get_npc_safe -/* C6910C 80240FDC 2404FFFC */ addiu $a0, $zero, -4 -/* C69110 80240FE0 3C0141F0 */ lui $at, 0x41f0 -/* C69114 80240FE4 44810000 */ mtc1 $at, $f0 -/* C69118 80240FE8 C442003C */ lwc1 $f2, 0x3c($v0) -/* C6911C 80240FEC 46001080 */ add.s $f2, $f2, $f0 -/* C69120 80240FF0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C69124 80240FF4 8C450038 */ lw $a1, 0x38($v0) -/* C69128 80240FF8 8C470040 */ lw $a3, 0x40($v0) -/* C6912C 80240FFC 44061000 */ mfc1 $a2, $f2 -/* C69130 80241000 0C01BFBC */ jal func_8006FEF0 -/* C69134 80241004 24040004 */ addiu $a0, $zero, 4 -/* C69138 80241008 8FBF0018 */ lw $ra, 0x18($sp) -/* C6913C 8024100C 24020002 */ addiu $v0, $zero, 2 -/* C69140 80241010 03E00008 */ jr $ra -/* C69144 80241014 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/func_80241050_C68130.s b/asm/nonmatchings/world/area_kzn/kzn_04/func_80241050_C68130.s deleted file mode 100644 index 7c54ad6355..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/func_80241050_C68130.s +++ /dev/null @@ -1,401 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241050_C69180 -/* C69180 80241050 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C69184 80241054 AFB40028 */ sw $s4, 0x28($sp) -/* C69188 80241058 0080A02D */ daddu $s4, $a0, $zero -/* C6918C 8024105C AFBF0038 */ sw $ra, 0x38($sp) -/* C69190 80241060 AFB70034 */ sw $s7, 0x34($sp) -/* C69194 80241064 AFB60030 */ sw $s6, 0x30($sp) -/* C69198 80241068 AFB5002C */ sw $s5, 0x2c($sp) -/* C6919C 8024106C AFB30024 */ sw $s3, 0x24($sp) -/* C691A0 80241070 AFB20020 */ sw $s2, 0x20($sp) -/* C691A4 80241074 AFB1001C */ sw $s1, 0x1c($sp) -/* C691A8 80241078 AFB00018 */ sw $s0, 0x18($sp) -/* C691AC 8024107C F7B80050 */ sdc1 $f24, 0x50($sp) -/* C691B0 80241080 F7B60048 */ sdc1 $f22, 0x48($sp) -/* C691B4 80241084 F7B40040 */ sdc1 $f20, 0x40($sp) -/* C691B8 80241088 8E82000C */ lw $v0, 0xc($s4) -/* C691BC 8024108C 00A0802D */ daddu $s0, $a1, $zero -/* C691C0 80241090 8C450000 */ lw $a1, ($v0) -/* C691C4 80241094 0C0B1EAF */ jal get_variable -/* C691C8 80241098 0000A82D */ daddu $s5, $zero, $zero -/* C691CC 8024109C 8E830148 */ lw $v1, 0x148($s4) -/* C691D0 802410A0 84640008 */ lh $a0, 8($v1) -/* C691D4 802410A4 0C00EABB */ jal get_npc_unsafe -/* C691D8 802410A8 0040902D */ daddu $s2, $v0, $zero -/* C691DC 802410AC 0040882D */ daddu $s1, $v0, $zero -/* C691E0 802410B0 0C00EABB */ jal get_npc_unsafe -/* C691E4 802410B4 2404FFFC */ addiu $a0, $zero, -4 -/* C691E8 802410B8 3C138011 */ lui $s3, %hi(gPlayerStatus) -/* C691EC 802410BC 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) -/* C691F0 802410C0 3C168011 */ lui $s6, %hi(D_8010EBB0) -/* C691F4 802410C4 26D6EBB0 */ addiu $s6, $s6, %lo(D_8010EBB0) -/* C691F8 802410C8 1200001C */ beqz $s0, .L8024113C -/* C691FC 802410CC 0040B82D */ daddu $s7, $v0, $zero -/* C69200 802410D0 0C00AB39 */ jal heap_malloc -/* C69204 802410D4 24040030 */ addiu $a0, $zero, 0x30 -/* C69208 802410D8 0040802D */ daddu $s0, $v0, $zero -/* C6920C 802410DC AE900074 */ sw $s0, 0x74($s4) -/* C69210 802410E0 AE000000 */ sw $zero, ($s0) -/* C69214 802410E4 C6400000 */ lwc1 $f0, ($s2) -/* C69218 802410E8 46800020 */ cvt.s.w $f0, $f0 -/* C6921C 802410EC E6000004 */ swc1 $f0, 4($s0) -/* C69220 802410F0 C6400004 */ lwc1 $f0, 4($s2) -/* C69224 802410F4 46800020 */ cvt.s.w $f0, $f0 -/* C69228 802410F8 E6000008 */ swc1 $f0, 8($s0) -/* C6922C 802410FC C6400008 */ lwc1 $f0, 8($s2) -/* C69230 80241100 46800020 */ cvt.s.w $f0, $f0 -/* C69234 80241104 E600000C */ swc1 $f0, 0xc($s0) -/* C69238 80241108 C640000C */ lwc1 $f0, 0xc($s2) -/* C6923C 8024110C 46800020 */ cvt.s.w $f0, $f0 -/* C69240 80241110 E6000010 */ swc1 $f0, 0x10($s0) -/* C69244 80241114 8E420010 */ lw $v0, 0x10($s2) -/* C69248 80241118 AE020014 */ sw $v0, 0x14($s0) -/* C6924C 8024111C 8E420014 */ lw $v0, 0x14($s2) -/* C69250 80241120 AE020018 */ sw $v0, 0x18($s0) -/* C69254 80241124 8E420018 */ lw $v0, 0x18($s2) -/* C69258 80241128 AE000020 */ sw $zero, 0x20($s0) -/* C6925C 8024112C AE000024 */ sw $zero, 0x24($s0) -/* C69260 80241130 AE000028 */ sw $zero, 0x28($s0) -/* C69264 80241134 AE12002C */ sw $s2, 0x2c($s0) -/* C69268 80241138 AE02001C */ sw $v0, 0x1c($s0) -.L8024113C: -/* C6926C 8024113C 0C009C64 */ jal func_80027190 -/* C69270 80241140 00000000 */ nop -/* C69274 80241144 14400131 */ bnez $v0, .L8024160C -/* C69278 80241148 0000102D */ daddu $v0, $zero, $zero -/* C6927C 8024114C 8E900074 */ lw $s0, 0x74($s4) -/* C69280 80241150 8E020018 */ lw $v0, 0x18($s0) -/* C69284 80241154 02A2102A */ slt $v0, $s5, $v0 -/* C69288 80241158 10400082 */ beqz $v0, .L80241364 -/* C6928C 8024115C 0000902D */ daddu $s2, $zero, $zero -/* C69290 80241160 3C013F00 */ lui $at, 0x3f00 -/* C69294 80241164 4481C000 */ mtc1 $at, $f24 -.L80241168: -/* C69298 80241168 8E040014 */ lw $a0, 0x14($s0) -/* C6929C 8024116C 0C00EABB */ jal get_npc_unsafe -/* C692A0 80241170 00922021 */ addu $a0, $a0, $s2 -/* C692A4 80241174 8E030000 */ lw $v1, ($s0) -/* C692A8 80241178 30630001 */ andi $v1, $v1, 1 -/* C692AC 8024117C 14600020 */ bnez $v1, .L80241200 -/* C692B0 80241180 0040882D */ daddu $s1, $v0, $zero -/* C692B4 80241184 862200A6 */ lh $v0, 0xa6($s1) -/* C692B8 80241188 02420018 */ mult $s2, $v0 -/* C692BC 8024118C 00004012 */ mflo $t0 -/* C692C0 80241190 C6200054 */ lwc1 $f0, 0x54($s1) -/* C692C4 80241194 4488A000 */ mtc1 $t0, $f20 -/* C692C8 80241198 00000000 */ nop -/* C692CC 8024119C 4680A520 */ cvt.s.w $f20, $f20 -/* C692D0 802411A0 4600A502 */ mul.s $f20, $f20, $f0 -/* C692D4 802411A4 00000000 */ nop -/* C692D8 802411A8 0C00A8BB */ jal sin_deg -/* C692DC 802411AC C60C0028 */ lwc1 $f12, 0x28($s0) -/* C692E0 802411B0 C60C0028 */ lwc1 $f12, 0x28($s0) -/* C692E4 802411B4 4600A582 */ mul.s $f22, $f20, $f0 -/* C692E8 802411B8 0C00A8D4 */ jal cos_deg -/* C692EC 802411BC 00000000 */ nop -/* C692F0 802411C0 C6020004 */ lwc1 $f2, 4($s0) -/* C692F4 802411C4 46161080 */ add.s $f2, $f2, $f22 -/* C692F8 802411C8 4600A507 */ neg.s $f20, $f20 -/* C692FC 802411CC 4600A502 */ mul.s $f20, $f20, $f0 -/* C69300 802411D0 00000000 */ nop -/* C69304 802411D4 E6220038 */ swc1 $f2, 0x38($s1) -/* C69308 802411D8 C6000008 */ lwc1 $f0, 8($s0) -/* C6930C 802411DC E620003C */ swc1 $f0, 0x3c($s1) -/* C69310 802411E0 C60E000C */ lwc1 $f14, 0xc($s0) -/* C69314 802411E4 46147380 */ add.s $f14, $f14, $f20 -/* C69318 802411E8 E62E0040 */ swc1 $f14, 0x40($s1) -/* C6931C 802411EC 8E660028 */ lw $a2, 0x28($s3) -/* C69320 802411F0 8E670030 */ lw $a3, 0x30($s3) -/* C69324 802411F4 0C00A720 */ jal atan2 -/* C69328 802411F8 46001306 */ mov.s $f12, $f2 -/* C6932C 802411FC E620000C */ swc1 $f0, 0xc($s1) -.L80241200: -/* C69330 80241200 8E020000 */ lw $v0, ($s0) -/* C69334 80241204 30420002 */ andi $v0, $v0, 2 -/* C69338 80241208 14400051 */ bnez $v0, .L80241350 -/* C6933C 8024120C 00000000 */ nop -/* C69340 80241210 8E620000 */ lw $v0, ($s3) -/* C69344 80241214 30428000 */ andi $v0, $v0, 0x8000 -/* C69348 80241218 1440004D */ bnez $v0, .L80241350 -/* C6934C 8024121C 24020001 */ addiu $v0, $zero, 1 -/* C69350 80241220 C664002C */ lwc1 $f4, 0x2c($s3) -/* C69354 80241224 C622003C */ lwc1 $f2, 0x3c($s1) -/* C69358 80241228 82C30000 */ lb $v1, ($s6) -/* C6935C 8024122C 1462000F */ bne $v1, $v0, .L8024126C -/* C69360 80241230 46022181 */ sub.s $f6, $f4, $f2 -/* C69364 80241234 82C30003 */ lb $v1, 3($s6) -/* C69368 80241238 24020008 */ addiu $v0, $zero, 8 -/* C6936C 8024123C 14620004 */ bne $v1, $v0, .L80241250 -/* C69370 80241240 24020004 */ addiu $v0, $zero, 4 -/* C69374 80241244 C6E0003C */ lwc1 $f0, 0x3c($s7) -/* C69378 80241248 0809049B */ j .L8024126C -/* C6937C 8024124C 46020181 */ sub.s $f6, $f0, $f2 -.L80241250: -/* C69380 80241250 14620006 */ bne $v1, $v0, .L8024126C -/* C69384 80241254 00000000 */ nop -/* C69388 80241258 3C014120 */ lui $at, 0x4120 -/* C6938C 8024125C 44810000 */ mtc1 $at, $f0 -/* C69390 80241260 00000000 */ nop -/* C69394 80241264 46002001 */ sub.s $f0, $f4, $f0 -/* C69398 80241268 46020181 */ sub.s $f6, $f0, $f2 -.L8024126C: -/* C6939C 8024126C 862200A8 */ lh $v0, 0xa8($s1) -/* C693A0 80241270 3C013F4C */ lui $at, 0x3f4c -/* C693A4 80241274 3421CCCD */ ori $at, $at, 0xcccd -/* C693A8 80241278 44810000 */ mtc1 $at, $f0 -/* C693AC 8024127C 44822000 */ mtc1 $v0, $f4 -/* C693B0 80241280 00000000 */ nop -/* C693B4 80241284 46802120 */ cvt.s.w $f4, $f4 -/* C693B8 80241288 46002102 */ mul.s $f4, $f4, $f0 -/* C693BC 8024128C 00000000 */ nop -/* C693C0 80241290 C6620028 */ lwc1 $f2, 0x28($s3) -/* C693C4 80241294 C6200038 */ lwc1 $f0, 0x38($s1) -/* C693C8 80241298 46001581 */ sub.s $f22, $f2, $f0 -/* C693CC 8024129C C6620030 */ lwc1 $f2, 0x30($s3) -/* C693D0 802412A0 C6200040 */ lwc1 $f0, 0x40($s1) -/* C693D4 802412A4 46001501 */ sub.s $f20, $f2, $f0 -/* C693D8 802412A8 46003005 */ abs.s $f0, $f6 -/* C693DC 802412AC 4604003C */ c.lt.s $f0, $f4 -/* C693E0 802412B0 00000000 */ nop -/* C693E4 802412B4 45000026 */ bc1f .L80241350 -/* C693E8 802412B8 00000000 */ nop -/* C693EC 802412BC 4616B082 */ mul.s $f2, $f22, $f22 -/* C693F0 802412C0 00000000 */ nop -/* C693F4 802412C4 4614A002 */ mul.s $f0, $f20, $f20 -/* C693F8 802412C8 00000000 */ nop -/* C693FC 802412CC 46001300 */ add.s $f12, $f2, $f0 -/* C69400 802412D0 46006104 */ sqrt.s $f4, $f12 -/* C69404 802412D4 46042032 */ c.eq.s $f4, $f4 -/* C69408 802412D8 00000000 */ nop -/* C6940C 802412DC 45010004 */ bc1t .L802412F0 -/* C69410 802412E0 00000000 */ nop -/* C69414 802412E4 0C0187BC */ jal sqrtf -/* C69418 802412E8 00000000 */ nop -/* C6941C 802412EC 46000106 */ mov.s $f4, $f0 -.L802412F0: -/* C69420 802412F0 862200A6 */ lh $v0, 0xa6($s1) -/* C69424 802412F4 44821000 */ mtc1 $v0, $f2 -/* C69428 802412F8 00000000 */ nop -/* C6942C 802412FC 468010A0 */ cvt.s.w $f2, $f2 -/* C69430 80241300 46181082 */ mul.s $f2, $f2, $f24 -/* C69434 80241304 00000000 */ nop -/* C69438 80241308 C6200054 */ lwc1 $f0, 0x54($s1) -/* C6943C 8024130C 46001082 */ mul.s $f2, $f2, $f0 -/* C69440 80241310 00000000 */ nop -/* C69444 80241314 866200B2 */ lh $v0, 0xb2($s3) -/* C69448 80241318 44820000 */ mtc1 $v0, $f0 -/* C6944C 8024131C 00000000 */ nop -/* C69450 80241320 46800020 */ cvt.s.w $f0, $f0 -/* C69454 80241324 46180002 */ mul.s $f0, $f0, $f24 -/* C69458 80241328 00000000 */ nop -/* C6945C 8024132C 46181082 */ mul.s $f2, $f2, $f24 -/* C69460 80241330 00000000 */ nop -/* C69464 80241334 46180002 */ mul.s $f0, $f0, $f24 -/* C69468 80241338 00000000 */ nop -/* C6946C 8024133C 46001080 */ add.s $f2, $f2, $f0 -/* C69470 80241340 4602203E */ c.le.s $f4, $f2 -/* C69474 80241344 00000000 */ nop -/* C69478 80241348 45030001 */ bc1tl .L80241350 -/* C6947C 8024134C 24150001 */ addiu $s5, $zero, 1 -.L80241350: -/* C69480 80241350 8E020018 */ lw $v0, 0x18($s0) -/* C69484 80241354 26520001 */ addiu $s2, $s2, 1 -/* C69488 80241358 0242102A */ slt $v0, $s2, $v0 -/* C6948C 8024135C 1440FF82 */ bnez $v0, .L80241168 -/* C69490 80241360 00000000 */ nop -.L80241364: -/* C69494 80241364 8E620000 */ lw $v0, ($s3) -/* C69498 80241368 30428000 */ andi $v0, $v0, 0x8000 -/* C6949C 8024136C 54400001 */ bnel $v0, $zero, .L80241374 -/* C694A0 80241370 2415FFFF */ addiu $s5, $zero, -1 -.L80241374: -/* C694A4 80241374 C60C0028 */ lwc1 $f12, 0x28($s0) -/* C694A8 80241378 C6000010 */ lwc1 $f0, 0x10($s0) -/* C694AC 8024137C 46006300 */ add.s $f12, $f12, $f0 -/* C694B0 80241380 0C00A6C9 */ jal clamp_angle -/* C694B4 80241384 E60C0028 */ swc1 $f12, 0x28($s0) -/* C694B8 80241388 C6020028 */ lwc1 $f2, 0x28($s0) -/* C694BC 8024138C 46000106 */ mov.s $f4, $f0 -/* C694C0 80241390 46022032 */ c.eq.s $f4, $f2 -/* C694C4 80241394 00000000 */ nop -/* C694C8 80241398 4501000D */ bc1t .L802413D0 -/* C694CC 8024139C 00000000 */ nop -/* C694D0 802413A0 8E020020 */ lw $v0, 0x20($s0) -/* C694D4 802413A4 C600000C */ lwc1 $f0, 0xc($s0) -/* C694D8 802413A8 E6040028 */ swc1 $f4, 0x28($s0) -/* C694DC 802413AC 00021080 */ sll $v0, $v0, 2 -/* C694E0 802413B0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C694E4 802413B4 3C048024 */ lui $a0, 0x8024 -/* C694E8 802413B8 00822021 */ addu $a0, $a0, $v0 -/* C694EC 802413BC 8C8422F0 */ lw $a0, 0x22f0($a0) -/* C694F0 802413C0 8E060004 */ lw $a2, 4($s0) -/* C694F4 802413C4 8E070008 */ lw $a3, 8($s0) -/* C694F8 802413C8 0C052757 */ jal play_sound_at_position -/* C694FC 802413CC 0000282D */ daddu $a1, $zero, $zero -.L802413D0: -/* C69500 802413D0 C60C0004 */ lwc1 $f12, 4($s0) -/* C69504 802413D4 C60E000C */ lwc1 $f14, 0xc($s0) -/* C69508 802413D8 8E660028 */ lw $a2, 0x28($s3) -/* C6950C 802413DC 0C00A7B5 */ jal dist2D -/* C69510 802413E0 8E670030 */ lw $a3, 0x30($s3) -/* C69514 802413E4 C60C0004 */ lwc1 $f12, 4($s0) -/* C69518 802413E8 C60E000C */ lwc1 $f14, 0xc($s0) -/* C6951C 802413EC 8E260038 */ lw $a2, 0x38($s1) -/* C69520 802413F0 8E270040 */ lw $a3, 0x40($s1) -/* C69524 802413F4 0C00A7B5 */ jal dist2D -/* C69528 802413F8 46000586 */ mov.s $f22, $f0 -/* C6952C 802413FC 862200A6 */ lh $v0, 0xa6($s1) -/* C69530 80241400 3C013F00 */ lui $at, 0x3f00 -/* C69534 80241404 44813000 */ mtc1 $at, $f6 -/* C69538 80241408 44821000 */ mtc1 $v0, $f2 -/* C6953C 8024140C 00000000 */ nop -/* C69540 80241410 468010A0 */ cvt.s.w $f2, $f2 -/* C69544 80241414 46061082 */ mul.s $f2, $f2, $f6 -/* C69548 80241418 00000000 */ nop -/* C6954C 8024141C C6240054 */ lwc1 $f4, 0x54($s1) -/* C69550 80241420 46041082 */ mul.s $f2, $f2, $f4 -/* C69554 80241424 00000000 */ nop -/* C69558 80241428 866200B2 */ lh $v0, 0xb2($s3) -/* C6955C 8024142C 44822000 */ mtc1 $v0, $f4 -/* C69560 80241430 00000000 */ nop -/* C69564 80241434 46802120 */ cvt.s.w $f4, $f4 -/* C69568 80241438 46062102 */ mul.s $f4, $f4, $f6 -/* C6956C 8024143C 00000000 */ nop -/* C69570 80241440 46061082 */ mul.s $f2, $f2, $f6 -/* C69574 80241444 00000000 */ nop -/* C69578 80241448 46062102 */ mul.s $f4, $f4, $f6 -/* C6957C 8024144C 00000000 */ nop -/* C69580 80241450 C60C0004 */ lwc1 $f12, 4($s0) -/* C69584 80241454 C60E000C */ lwc1 $f14, 0xc($s0) -/* C69588 80241458 46020000 */ add.s $f0, $f0, $f2 -/* C6958C 8024145C 8E660028 */ lw $a2, 0x28($s3) -/* C69590 80241460 8E670030 */ lw $a3, 0x30($s3) -/* C69594 80241464 0C00A720 */ jal atan2 -/* C69598 80241468 46040600 */ add.s $f24, $f0, $f4 -/* C6959C 8024146C C60C0004 */ lwc1 $f12, 4($s0) -/* C695A0 80241470 C60E000C */ lwc1 $f14, 0xc($s0) -/* C695A4 80241474 8E260038 */ lw $a2, 0x38($s1) -/* C695A8 80241478 8E270040 */ lw $a3, 0x40($s1) -/* C695AC 8024147C 0C00A720 */ jal atan2 -/* C695B0 80241480 46000506 */ mov.s $f20, $f0 -/* C695B4 80241484 4600A306 */ mov.s $f12, $f20 -/* C695B8 80241488 0C00A70A */ jal get_clamped_angle_diff -/* C695BC 8024148C 46000386 */ mov.s $f14, $f0 -/* C695C0 80241490 1AA0002A */ blez $s5, .L8024153C -/* C695C4 80241494 46000506 */ mov.s $f20, $f0 -/* C695C8 80241498 826300B4 */ lb $v1, 0xb4($s3) -/* C695CC 8024149C 24020015 */ addiu $v0, $zero, 0x15 -/* C695D0 802414A0 10620026 */ beq $v1, $v0, .L8024153C -/* C695D4 802414A4 0040202D */ daddu $a0, $v0, $zero -/* C695D8 802414A8 24020003 */ addiu $v0, $zero, 3 -/* C695DC 802414AC 0C039769 */ jal set_action_state -/* C695E0 802414B0 A26200BF */ sb $v0, 0xbf($s3) -/* C695E4 802414B4 240400E8 */ addiu $a0, $zero, 0xe8 -/* C695E8 802414B8 8E660028 */ lw $a2, 0x28($s3) -/* C695EC 802414BC 8E67002C */ lw $a3, 0x2c($s3) -/* C695F0 802414C0 C6600030 */ lwc1 $f0, 0x30($s3) -/* C695F4 802414C4 0000282D */ daddu $a1, $zero, $zero -/* C695F8 802414C8 0C052757 */ jal play_sound_at_position -/* C695FC 802414CC E7A00010 */ swc1 $f0, 0x10($sp) -/* C69600 802414D0 2402002D */ addiu $v0, $zero, 0x2d -/* C69604 802414D4 3C01800B */ lui $at, 0x800b -/* C69608 802414D8 A0220F1A */ sb $v0, 0xf1a($at) -/* C6960C 802414DC C6600028 */ lwc1 $f0, 0x28($s3) -/* C69610 802414E0 C6620030 */ lwc1 $f2, 0x30($s3) -/* C69614 802414E4 2402002D */ addiu $v0, $zero, 0x2d -/* C69618 802414E8 A6620010 */ sh $v0, 0x10($s3) -/* C6961C 802414EC 4600020D */ trunc.w.s $f8, $f0 -/* C69620 802414F0 44024000 */ mfc1 $v0, $f8 -/* C69624 802414F4 C660002C */ lwc1 $f0, 0x2c($s3) -/* C69628 802414F8 A6620016 */ sh $v0, 0x16($s3) -/* C6962C 802414FC 4600020D */ trunc.w.s $f8, $f0 -/* C69630 80241500 44024000 */ mfc1 $v0, $f8 -/* C69634 80241504 00000000 */ nop -/* C69638 80241508 A6620018 */ sh $v0, 0x18($s3) -/* C6963C 8024150C 4600120D */ trunc.w.s $f8, $f2 -/* C69640 80241510 44024000 */ mfc1 $v0, $f8 -/* C69644 80241514 00000000 */ nop -/* C69648 80241518 A662001A */ sh $v0, 0x1a($s3) -/* C6964C 8024151C 8E02001C */ lw $v0, 0x1c($s0) -/* C69650 80241520 10400033 */ beqz $v0, .L802415F0 -/* C69654 80241524 AE000020 */ sw $zero, 0x20($s0) -/* C69658 80241528 0200202D */ daddu $a0, $s0, $zero -/* C6965C 8024152C 0040F809 */ jalr $v0 -/* C69660 80241530 24050002 */ addiu $a1, $zero, 2 -/* C69664 80241534 0809057C */ j .L802415F0 -/* C69668 80241538 00000000 */ nop -.L8024153C: -/* C6966C 8024153C 4618B03C */ c.lt.s $f22, $f24 -/* C69670 80241540 00000000 */ nop -/* C69674 80241544 4500002A */ bc1f .L802415F0 -/* C69678 80241548 00000000 */ nop -/* C6967C 8024154C 8E020000 */ lw $v0, ($s0) -/* C69680 80241550 30420002 */ andi $v0, $v0, 2 -/* C69684 80241554 14400026 */ bnez $v0, .L802415F0 -/* C69688 80241558 00000000 */ nop -/* C6968C 8024155C 16A00024 */ bnez $s5, .L802415F0 -/* C69690 80241560 24020015 */ addiu $v0, $zero, 0x15 -/* C69694 80241564 826300B4 */ lb $v1, 0xb4($s3) -/* C69698 80241568 10620021 */ beq $v1, $v0, .L802415F0 -/* C6969C 8024156C 00000000 */ nop -/* C696A0 80241570 C6000010 */ lwc1 $f0, 0x10($s0) -/* C696A4 80241574 44801000 */ mtc1 $zero, $f2 -/* C696A8 80241578 00000000 */ nop -/* C696AC 8024157C 4600103C */ c.lt.s $f2, $f0 -/* C696B0 80241580 00000000 */ nop -/* C696B4 80241584 45000009 */ bc1f .L802415AC -/* C696B8 80241588 00000000 */ nop -/* C696BC 8024158C C6000024 */ lwc1 $f0, 0x24($s0) -/* C696C0 80241590 4602003C */ c.lt.s $f0, $f2 -/* C696C4 80241594 00000000 */ nop -/* C696C8 80241598 45000015 */ bc1f .L802415F0 -/* C696CC 8024159C 00000000 */ nop -/* C696D0 802415A0 4614103C */ c.lt.s $f2, $f20 -/* C696D4 802415A4 08090572 */ j .L802415C8 -/* C696D8 802415A8 00000000 */ nop -.L802415AC: -/* C696DC 802415AC C6000024 */ lwc1 $f0, 0x24($s0) -/* C696E0 802415B0 4600103C */ c.lt.s $f2, $f0 -/* C696E4 802415B4 00000000 */ nop -/* C696E8 802415B8 4500000D */ bc1f .L802415F0 -/* C696EC 802415BC 00000000 */ nop -/* C696F0 802415C0 4602A03C */ c.lt.s $f20, $f2 -/* C696F4 802415C4 00000000 */ nop -.L802415C8: -/* C696F8 802415C8 45000009 */ bc1f .L802415F0 -/* C696FC 802415CC 00000000 */ nop -/* C69700 802415D0 8E020020 */ lw $v0, 0x20($s0) -/* C69704 802415D4 8E03001C */ lw $v1, 0x1c($s0) -/* C69708 802415D8 24420001 */ addiu $v0, $v0, 1 -/* C6970C 802415DC 10600004 */ beqz $v1, .L802415F0 -/* C69710 802415E0 AE020020 */ sw $v0, 0x20($s0) -/* C69714 802415E4 0200202D */ daddu $a0, $s0, $zero -/* C69718 802415E8 0060F809 */ jalr $v1 -/* C6971C 802415EC 24050001 */ addiu $a1, $zero, 1 -.L802415F0: -/* C69720 802415F0 8E02001C */ lw $v0, 0x1c($s0) -/* C69724 802415F4 10400004 */ beqz $v0, .L80241608 -/* C69728 802415F8 E6140024 */ swc1 $f20, 0x24($s0) -/* C6972C 802415FC 0200202D */ daddu $a0, $s0, $zero -/* C69730 80241600 0040F809 */ jalr $v0 -/* C69734 80241604 0000282D */ daddu $a1, $zero, $zero -.L80241608: -/* C69738 80241608 0000102D */ daddu $v0, $zero, $zero -.L8024160C: -/* C6973C 8024160C 8FBF0038 */ lw $ra, 0x38($sp) -/* C69740 80241610 8FB70034 */ lw $s7, 0x34($sp) -/* C69744 80241614 8FB60030 */ lw $s6, 0x30($sp) -/* C69748 80241618 8FB5002C */ lw $s5, 0x2c($sp) -/* C6974C 8024161C 8FB40028 */ lw $s4, 0x28($sp) -/* C69750 80241620 8FB30024 */ lw $s3, 0x24($sp) -/* C69754 80241624 8FB20020 */ lw $s2, 0x20($sp) -/* C69758 80241628 8FB1001C */ lw $s1, 0x1c($sp) -/* C6975C 8024162C 8FB00018 */ lw $s0, 0x18($sp) -/* C69760 80241630 D7B80050 */ ldc1 $f24, 0x50($sp) -/* C69764 80241634 D7B60048 */ ldc1 $f22, 0x48($sp) -/* C69768 80241638 D7B40040 */ ldc1 $f20, 0x40($sp) -/* C6976C 8024163C 03E00008 */ jr $ra -/* C69770 80241640 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kzn/kzn_05/func_80240124_C6C0D0.s b/asm/nonmatchings/world/area_kzn/kzn_05/func_80240124_C6C0D0.s deleted file mode 100644 index 95fdeee05d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_05/func_80240124_C6C0D0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C6C1F4 -/* C6C1F4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C6C1F8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C6C1FC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C6C200 80240130 10A00005 */ beqz $a1, .L80240148 -/* C6C204 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C6C208 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C6C20C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C6C210 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C6C214 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C6C218 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C6C21C 8024014C 1440000E */ bnez $v0, .L80240188 -/* C6C220 80240150 00000000 */ nop -/* C6C224 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C6C228 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C6C22C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C6C230 80240160 04610004 */ bgez $v1, .L80240174 -/* C6C234 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C6C238 80240168 3C020002 */ lui $v0, 2 -/* C6C23C 8024016C 08090061 */ j .L80240184 -/* C6C240 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C6C244 80240174 3C040002 */ lui $a0, 2 -/* C6C248 80240178 0083102A */ slt $v0, $a0, $v1 -/* C6C24C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C6C250 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C6C254 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C6C258 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C6C25C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C6C260 80240190 00000000 */ nop -/* C6C264 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C6C268 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C6C26C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C6C270 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C6C274 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C6C278 802401A8 3C020002 */ lui $v0, 2 -/* C6C27C 802401AC 08090071 */ j .L802401C4 -/* C6C280 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C6C284 802401B4 3C040002 */ lui $a0, 2 -/* C6C288 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C6C28C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C6C290 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C6C294 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C6C298 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C6C29C 802401CC 1440000E */ bnez $v0, .L80240208 -/* C6C2A0 802401D0 00000000 */ nop -/* C6C2A4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C6C2A8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C6C2AC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C6C2B0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C6C2B4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C6C2B8 802401E8 3C020002 */ lui $v0, 2 -/* C6C2BC 802401EC 08090081 */ j .L80240204 -/* C6C2C0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C6C2C4 802401F4 3C040002 */ lui $a0, 2 -/* C6C2C8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C6C2CC 802401FC 10400002 */ beqz $v0, .L80240208 -/* C6C2D0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C6C2D4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C6C2D8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C6C2DC 8024020C 1440000E */ bnez $v0, .L80240248 -/* C6C2E0 80240210 00000000 */ nop -/* C6C2E4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C6C2E8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C6C2EC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C6C2F0 80240220 04610004 */ bgez $v1, .L80240234 -/* C6C2F4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C6C2F8 80240228 3C020002 */ lui $v0, 2 -/* C6C2FC 8024022C 08090091 */ j .L80240244 -/* C6C300 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C6C304 80240234 3C040002 */ lui $a0, 2 -/* C6C308 80240238 0083102A */ slt $v0, $a0, $v1 -/* C6C30C 8024023C 10400002 */ beqz $v0, .L80240248 -/* C6C310 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C6C314 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C6C318 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C6C31C 8024024C 0C046F07 */ jal set_main_pan_u -/* C6C320 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C6C324 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C6C328 80240258 0C046F0D */ jal set_main_pan_v -/* C6C32C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C6C330 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C6C334 80240264 0C046F13 */ jal set_aux_pan_u -/* C6C338 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C6C33C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C6C340 80240270 0C046F19 */ jal set_aux_pan_v -/* C6C344 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C6C348 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C6C34C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C6C350 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C6C354 80240284 24420001 */ addiu $v0, $v0, 1 -/* C6C358 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C6C35C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C6C360 80240290 24630001 */ addiu $v1, $v1, 1 -/* C6C364 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C6C368 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C6C36C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C6C370 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C6C374 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C6C378 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C6C37C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C6C380 802402B0 14600002 */ bnez $v1, .L802402BC -/* C6C384 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C6C388 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C6C38C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C6C390 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C6C394 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C6C398 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C6C39C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C6C3A0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C6C3A4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C6C3A8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C6C3AC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C6C3B0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C6C3B4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C6C3B8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C6C3BC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C6C3C0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C6C3C4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C6C3C8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C6C3CC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C6C3D0 80240300 0000102D */ daddu $v0, $zero, $zero -/* C6C3D4 80240304 03E00008 */ jr $ra -/* C6C3D8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C6C3DC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/func_80240124_C6C920.s b/asm/nonmatchings/world/area_kzn/kzn_06/func_80240124_C6C920.s deleted file mode 100644 index 776361e274..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_06/func_80240124_C6C920.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C6CA44 -/* C6CA44 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C6CA48 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C6CA4C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C6CA50 80240130 10A00005 */ beqz $a1, .L80240148 -/* C6CA54 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C6CA58 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C6CA5C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C6CA60 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C6CA64 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C6CA68 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C6CA6C 8024014C 1440000E */ bnez $v0, .L80240188 -/* C6CA70 80240150 00000000 */ nop -/* C6CA74 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C6CA78 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C6CA7C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C6CA80 80240160 04610004 */ bgez $v1, .L80240174 -/* C6CA84 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C6CA88 80240168 3C020002 */ lui $v0, 2 -/* C6CA8C 8024016C 08090061 */ j .L80240184 -/* C6CA90 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C6CA94 80240174 3C040002 */ lui $a0, 2 -/* C6CA98 80240178 0083102A */ slt $v0, $a0, $v1 -/* C6CA9C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C6CAA0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C6CAA4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C6CAA8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C6CAAC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C6CAB0 80240190 00000000 */ nop -/* C6CAB4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C6CAB8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C6CABC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C6CAC0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C6CAC4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C6CAC8 802401A8 3C020002 */ lui $v0, 2 -/* C6CACC 802401AC 08090071 */ j .L802401C4 -/* C6CAD0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C6CAD4 802401B4 3C040002 */ lui $a0, 2 -/* C6CAD8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C6CADC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C6CAE0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C6CAE4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C6CAE8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C6CAEC 802401CC 1440000E */ bnez $v0, .L80240208 -/* C6CAF0 802401D0 00000000 */ nop -/* C6CAF4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C6CAF8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C6CAFC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C6CB00 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C6CB04 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C6CB08 802401E8 3C020002 */ lui $v0, 2 -/* C6CB0C 802401EC 08090081 */ j .L80240204 -/* C6CB10 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C6CB14 802401F4 3C040002 */ lui $a0, 2 -/* C6CB18 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C6CB1C 802401FC 10400002 */ beqz $v0, .L80240208 -/* C6CB20 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C6CB24 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C6CB28 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C6CB2C 8024020C 1440000E */ bnez $v0, .L80240248 -/* C6CB30 80240210 00000000 */ nop -/* C6CB34 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C6CB38 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C6CB3C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C6CB40 80240220 04610004 */ bgez $v1, .L80240234 -/* C6CB44 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C6CB48 80240228 3C020002 */ lui $v0, 2 -/* C6CB4C 8024022C 08090091 */ j .L80240244 -/* C6CB50 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C6CB54 80240234 3C040002 */ lui $a0, 2 -/* C6CB58 80240238 0083102A */ slt $v0, $a0, $v1 -/* C6CB5C 8024023C 10400002 */ beqz $v0, .L80240248 -/* C6CB60 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C6CB64 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C6CB68 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C6CB6C 8024024C 0C046F07 */ jal set_main_pan_u -/* C6CB70 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C6CB74 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C6CB78 80240258 0C046F0D */ jal set_main_pan_v -/* C6CB7C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C6CB80 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C6CB84 80240264 0C046F13 */ jal set_aux_pan_u -/* C6CB88 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C6CB8C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C6CB90 80240270 0C046F19 */ jal set_aux_pan_v -/* C6CB94 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C6CB98 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C6CB9C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C6CBA0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C6CBA4 80240284 24420001 */ addiu $v0, $v0, 1 -/* C6CBA8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C6CBAC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C6CBB0 80240290 24630001 */ addiu $v1, $v1, 1 -/* C6CBB4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C6CBB8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C6CBBC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C6CBC0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C6CBC4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C6CBC8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C6CBCC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C6CBD0 802402B0 14600002 */ bnez $v1, .L802402BC -/* C6CBD4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C6CBD8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C6CBDC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C6CBE0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C6CBE4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C6CBE8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C6CBEC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C6CBF0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C6CBF4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C6CBF8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C6CBFC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C6CC00 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C6CC04 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C6CC08 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C6CC0C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C6CC10 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C6CC14 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C6CC18 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C6CC1C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C6CC20 80240300 0000102D */ daddu $v0, $zero, $zero -/* C6CC24 80240304 03E00008 */ jr $ra -/* C6CC28 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C6CC2C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/func_80240310_C6C920.s b/asm/nonmatchings/world/area_kzn/kzn_06/func_80240310_C6C920.s deleted file mode 100644 index a6828b93e6..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_06/func_80240310_C6C920.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_C6CC30 -/* C6CC30 80240310 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C6CC34 80240314 AFB1001C */ sw $s1, 0x1c($sp) -/* C6CC38 80240318 00A0882D */ daddu $s1, $a1, $zero -/* C6CC3C 8024031C AFBF0020 */ sw $ra, 0x20($sp) -/* C6CC40 80240320 AFB00018 */ sw $s0, 0x18($sp) -/* C6CC44 80240324 8E220070 */ lw $v0, 0x70($s1) -/* C6CC48 80240328 3C0141C8 */ lui $at, 0x41c8 -/* C6CC4C 8024032C 44810000 */ mtc1 $at, $f0 -/* C6CC50 80240330 00021080 */ sll $v0, $v0, 2 -/* C6CC54 80240334 3C018024 */ lui $at, 0x8024 -/* C6CC58 80240338 00220821 */ addu $at, $at, $v0 -/* C6CC5C 8024033C C4221120 */ lwc1 $f2, 0x1120($at) -/* C6CC60 80240340 46001082 */ mul.s $f2, $f2, $f0 -/* C6CC64 80240344 00000000 */ nop -/* C6CC68 80240348 C6200084 */ lwc1 $f0, 0x84($s1) -/* C6CC6C 8024034C 46800020 */ cvt.s.w $f0, $f0 -/* C6CC70 80240350 46020001 */ sub.s $f0, $f0, $f2 -/* C6CC74 80240354 0080802D */ daddu $s0, $a0, $zero -/* C6CC78 80240358 E600004C */ swc1 $f0, 0x4c($s0) -/* C6CC7C 8024035C 8E220070 */ lw $v0, 0x70($s1) -/* C6CC80 80240360 14400007 */ bnez $v0, .L80240380 -/* C6CC84 80240364 240401DA */ addiu $a0, $zero, 0x1da -/* C6CC88 80240368 C6000050 */ lwc1 $f0, 0x50($s0) -/* C6CC8C 8024036C E7A00010 */ swc1 $f0, 0x10($sp) -/* C6CC90 80240370 8E060048 */ lw $a2, 0x48($s0) -/* C6CC94 80240374 8E07004C */ lw $a3, 0x4c($s0) -/* C6CC98 80240378 0C052757 */ jal play_sound_at_position -/* C6CC9C 8024037C 0000282D */ daddu $a1, $zero, $zero -.L80240380: -/* C6CCA0 80240380 8E230070 */ lw $v1, 0x70($s1) -/* C6CCA4 80240384 28620005 */ slti $v0, $v1, 5 -/* C6CCA8 80240388 1440000C */ bnez $v0, .L802403BC -/* C6CCAC 8024038C 30620001 */ andi $v0, $v1, 1 -/* C6CCB0 80240390 1040000A */ beqz $v0, .L802403BC -/* C6CCB4 80240394 24020014 */ addiu $v0, $zero, 0x14 -/* C6CCB8 80240398 3C013F80 */ lui $at, 0x3f80 -/* C6CCBC 8024039C 44810000 */ mtc1 $at, $f0 -/* C6CCC0 802403A0 AFA20014 */ sw $v0, 0x14($sp) -/* C6CCC4 802403A4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C6CCC8 802403A8 8E050048 */ lw $a1, 0x48($s0) -/* C6CCCC 802403AC 8E06004C */ lw $a2, 0x4c($s0) -/* C6CCD0 802403B0 8E070050 */ lw $a3, 0x50($s0) -/* C6CCD4 802403B4 0C01C1CC */ jal func_80070730 -/* C6CCD8 802403B8 24040001 */ addiu $a0, $zero, 1 -.L802403BC: -/* C6CCDC 802403BC 8E220070 */ lw $v0, 0x70($s1) -/* C6CCE0 802403C0 24420001 */ addiu $v0, $v0, 1 -/* C6CCE4 802403C4 AE220070 */ sw $v0, 0x70($s1) -/* C6CCE8 802403C8 3842001C */ xori $v0, $v0, 0x1c -/* C6CCEC 802403CC 8FBF0020 */ lw $ra, 0x20($sp) -/* C6CCF0 802403D0 8FB1001C */ lw $s1, 0x1c($sp) -/* C6CCF4 802403D4 8FB00018 */ lw $s0, 0x18($sp) -/* C6CCF8 802403D8 2C420001 */ sltiu $v0, $v0, 1 -/* C6CCFC 802403DC 03E00008 */ jr $ra -/* C6CD00 802403E0 27BD0028 */ addiu $sp, $sp, 0x28 -/* C6CD04 802403E4 00000000 */ nop -/* C6CD08 802403E8 00000000 */ nop -/* C6CD0C 802403EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/func_802403F0_C6C920.s b/asm/nonmatchings/world/area_kzn/kzn_06/func_802403F0_C6C920.s deleted file mode 100644 index dcf9ac42f2..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_06/func_802403F0_C6C920.s +++ /dev/null @@ -1,230 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F0_C6CD10 -/* C6CD10 802403F0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C6CD14 802403F4 AFB1002C */ sw $s1, 0x2c($sp) -/* C6CD18 802403F8 0080882D */ daddu $s1, $a0, $zero -/* C6CD1C 802403FC AFB20030 */ sw $s2, 0x30($sp) -/* C6CD20 80240400 00A0902D */ daddu $s2, $a1, $zero -/* C6CD24 80240404 AFBF003C */ sw $ra, 0x3c($sp) -/* C6CD28 80240408 AFB40038 */ sw $s4, 0x38($sp) -/* C6CD2C 8024040C AFB30034 */ sw $s3, 0x34($sp) -/* C6CD30 80240410 AFB00028 */ sw $s0, 0x28($sp) -/* C6CD34 80240414 F7B60048 */ sdc1 $f22, 0x48($sp) -/* C6CD38 80240418 F7B40040 */ sdc1 $f20, 0x40($sp) -/* C6CD3C 8024041C 8E30000C */ lw $s0, 0xc($s1) -/* C6CD40 80240420 8E050000 */ lw $a1, ($s0) -/* C6CD44 80240424 0C0B1EAF */ jal get_variable -/* C6CD48 80240428 26100004 */ addiu $s0, $s0, 4 -/* C6CD4C 8024042C 0220202D */ daddu $a0, $s1, $zero -/* C6CD50 80240430 8E050000 */ lw $a1, ($s0) -/* C6CD54 80240434 0C0B1EAF */ jal get_variable -/* C6CD58 80240438 0040A02D */ daddu $s4, $v0, $zero -/* C6CD5C 8024043C 12400022 */ beqz $s2, .L802404C8 -/* C6CD60 80240440 0040982D */ daddu $s3, $v0, $zero -/* C6CD64 80240444 12600013 */ beqz $s3, .L80240494 -/* C6CD68 80240448 26710002 */ addiu $s1, $s3, 2 -/* C6CD6C 8024044C 96620000 */ lhu $v0, ($s3) -/* C6CD70 80240450 1040001D */ beqz $v0, .L802404C8 -/* C6CD74 80240454 0000802D */ daddu $s0, $zero, $zero -.L80240458: -/* C6CD78 80240458 96240000 */ lhu $a0, ($s1) -/* C6CD7C 8024045C 0C046C04 */ jal get_model_list_index_from_tree_index -/* C6CD80 80240460 26100001 */ addiu $s0, $s0, 1 -/* C6CD84 80240464 0C046B4C */ jal get_model_from_list_index -/* C6CD88 80240468 0040202D */ daddu $a0, $v0, $zero -/* C6CD8C 8024046C 0040202D */ daddu $a0, $v0, $zero -/* C6CD90 80240470 2405FFFF */ addiu $a1, $zero, -1 -/* C6CD94 80240474 0C046F1F */ jal func_8011BC7C -/* C6CD98 80240478 24060002 */ addiu $a2, $zero, 2 -/* C6CD9C 8024047C 96620000 */ lhu $v0, ($s3) -/* C6CDA0 80240480 0202102A */ slt $v0, $s0, $v0 -/* C6CDA4 80240484 1440FFF4 */ bnez $v0, .L80240458 -/* C6CDA8 80240488 26310002 */ addiu $s1, $s1, 2 -/* C6CDAC 8024048C 08090132 */ j .L802404C8 -/* C6CDB0 80240490 00000000 */ nop -.L80240494: -/* C6CDB4 80240494 3C118015 */ lui $s1, %hi(gCurrentModelListPtr) -/* C6CDB8 80240498 8E3112CC */ lw $s1, %lo(gCurrentModelListPtr)($s1) -/* C6CDBC 8024049C 0000802D */ daddu $s0, $zero, $zero -.L802404A0: -/* C6CDC0 802404A0 8E240000 */ lw $a0, ($s1) -/* C6CDC4 802404A4 50800005 */ beql $a0, $zero, .L802404BC -/* C6CDC8 802404A8 26100001 */ addiu $s0, $s0, 1 -/* C6CDCC 802404AC 2405FFFF */ addiu $a1, $zero, -1 -/* C6CDD0 802404B0 0C046F1F */ jal func_8011BC7C -/* C6CDD4 802404B4 24060002 */ addiu $a2, $zero, 2 -/* C6CDD8 802404B8 26100001 */ addiu $s0, $s0, 1 -.L802404BC: -/* C6CDDC 802404BC 2A020100 */ slti $v0, $s0, 0x100 -/* C6CDE0 802404C0 1440FFF7 */ bnez $v0, .L802404A0 -/* C6CDE4 802404C4 26310004 */ addiu $s1, $s1, 4 -.L802404C8: -/* C6CDE8 802404C8 3C028024 */ lui $v0, 0x8024 -/* C6CDEC 802404CC 24421370 */ addiu $v0, $v0, 0x1370 -/* C6CDF0 802404D0 C4420000 */ lwc1 $f2, ($v0) -/* C6CDF4 802404D4 3C013F80 */ lui $at, 0x3f80 -/* C6CDF8 802404D8 44810000 */ mtc1 $at, $f0 -/* C6CDFC 802404DC 00000000 */ nop -/* C6CE00 802404E0 46001000 */ add.s $f0, $f2, $f0 -/* C6CE04 802404E4 3C0143B4 */ lui $at, 0x43b4 -/* C6CE08 802404E8 44811000 */ mtc1 $at, $f2 -/* C6CE0C 802404EC 00000000 */ nop -/* C6CE10 802404F0 4600103C */ c.lt.s $f2, $f0 -/* C6CE14 802404F4 00000000 */ nop -/* C6CE18 802404F8 45000003 */ bc1f .L80240508 -/* C6CE1C 802404FC E4400000 */ swc1 $f0, ($v0) -/* C6CE20 80240500 46020001 */ sub.s $f0, $f0, $f2 -/* C6CE24 80240504 E4400000 */ swc1 $f0, ($v0) -.L80240508: -/* C6CE28 80240508 24020002 */ addiu $v0, $zero, 2 -/* C6CE2C 8024050C 12820037 */ beq $s4, $v0, .L802405EC -/* C6CE30 80240510 2A820003 */ slti $v0, $s4, 3 -/* C6CE34 80240514 10400005 */ beqz $v0, .L8024052C -/* C6CE38 80240518 24020001 */ addiu $v0, $zero, 1 -/* C6CE3C 8024051C 12820008 */ beq $s4, $v0, .L80240540 -/* C6CE40 80240520 0000202D */ daddu $a0, $zero, $zero -/* C6CE44 80240524 08090184 */ j .L80240610 -/* C6CE48 80240528 00000000 */ nop -.L8024052C: -/* C6CE4C 8024052C 2402000A */ addiu $v0, $zero, 0xa -/* C6CE50 80240530 12820077 */ beq $s4, $v0, .L80240710 -/* C6CE54 80240534 0000102D */ daddu $v0, $zero, $zero -/* C6CE58 80240538 08090184 */ j .L80240610 -/* C6CE5C 8024053C 00000000 */ nop -.L80240540: -/* C6CE60 80240540 3C05FD05 */ lui $a1, 0xfd05 -/* C6CE64 80240544 0C0B210B */ jal get_float_variable -/* C6CE68 80240548 34A50F80 */ ori $a1, $a1, 0xf80 -/* C6CE6C 8024054C 44802000 */ mtc1 $zero, $f4 -/* C6CE70 80240550 00000000 */ nop -/* C6CE74 80240554 4604003E */ c.le.s $f0, $f4 -/* C6CE78 80240558 00000000 */ nop -/* C6CE7C 8024055C 4501006C */ bc1t .L80240710 -/* C6CE80 80240560 24020002 */ addiu $v0, $zero, 2 -/* C6CE84 80240564 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* C6CE88 80240568 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* C6CE8C 8024056C C4420028 */ lwc1 $f2, 0x28($v0) -/* C6CE90 80240570 3C01C296 */ lui $at, 0xc296 -/* C6CE94 80240574 44810000 */ mtc1 $at, $f0 -/* C6CE98 80240578 00000000 */ nop -/* C6CE9C 8024057C 46020081 */ sub.s $f2, $f0, $f2 -/* C6CEA0 80240580 4604103C */ c.lt.s $f2, $f4 -/* C6CEA4 80240584 00000000 */ nop -/* C6CEA8 80240588 45030001 */ bc1tl .L80240590 -/* C6CEAC 8024058C 46001087 */ neg.s $f2, $f2 -.L80240590: -/* C6CEB0 80240590 3C014400 */ lui $at, 0x4400 -/* C6CEB4 80240594 44810000 */ mtc1 $at, $f0 -/* C6CEB8 80240598 00000000 */ nop -/* C6CEBC 8024059C 46020581 */ sub.s $f22, $f0, $f2 -/* C6CEC0 802405A0 4604B03C */ c.lt.s $f22, $f4 -/* C6CEC4 802405A4 00000000 */ nop -/* C6CEC8 802405A8 45030001 */ bc1tl .L802405B0 -/* C6CECC 802405AC 46002586 */ mov.s $f22, $f4 -.L802405B0: -/* C6CED0 802405B0 0000202D */ daddu $a0, $zero, $zero -/* C6CED4 802405B4 3C05FD05 */ lui $a1, 0xfd05 -/* C6CED8 802405B8 0C0B210B */ jal get_float_variable -/* C6CEDC 802405BC 34A50F80 */ ori $a1, $a1, 0xf80 -/* C6CEE0 802405C0 3C018024 */ lui $at, 0x8024 -/* C6CEE4 802405C4 D4221A00 */ ldc1 $f2, 0x1a00($at) -/* C6CEE8 802405C8 46000021 */ cvt.d.s $f0, $f0 -/* C6CEEC 802405CC 46220002 */ mul.d $f0, $f0, $f2 -/* C6CEF0 802405D0 00000000 */ nop -/* C6CEF4 802405D4 4600B0A1 */ cvt.d.s $f2, $f22 -/* C6CEF8 802405D8 46201082 */ mul.d $f2, $f2, $f0 -/* C6CEFC 802405DC 00000000 */ nop -/* C6CF00 802405E0 241103CA */ addiu $s1, $zero, 0x3ca -/* C6CF04 802405E4 08090187 */ j .L8024061C -/* C6CF08 802405E8 462015A0 */ cvt.s.d $f22, $f2 -.L802405EC: -/* C6CF0C 802405EC 3C0142C8 */ lui $at, 0x42c8 -/* C6CF10 802405F0 4481B000 */ mtc1 $at, $f22 -/* C6CF14 802405F4 0000202D */ daddu $a0, $zero, $zero -/* C6CF18 802405F8 3C05FD05 */ lui $a1, 0xfd05 -/* C6CF1C 802405FC 0C0B1EAF */ jal get_variable -/* C6CF20 80240600 34A50F80 */ ori $a1, $a1, 0xf80 -/* C6CF24 80240604 240303E3 */ addiu $v1, $zero, 0x3e3 -/* C6CF28 80240608 08090187 */ j .L8024061C -/* C6CF2C 8024060C 00628823 */ subu $s1, $v1, $v0 -.L80240610: -/* C6CF30 80240610 3C0142C8 */ lui $at, 0x42c8 -/* C6CF34 80240614 4481B000 */ mtc1 $at, $f22 -/* C6CF38 80240618 241103CA */ addiu $s1, $zero, 0x3ca -.L8024061C: -/* C6CF3C 8024061C 3C108024 */ lui $s0, 0x8024 -/* C6CF40 80240620 26101370 */ addiu $s0, $s0, 0x1370 -/* C6CF44 80240624 C6000000 */ lwc1 $f0, ($s0) -/* C6CF48 80240628 3C014040 */ lui $at, 0x4040 -/* C6CF4C 8024062C 44816000 */ mtc1 $at, $f12 -/* C6CF50 80240630 00000000 */ nop -/* C6CF54 80240634 460C0302 */ mul.s $f12, $f0, $f12 -/* C6CF58 80240638 0C00A8BB */ jal sin_deg -/* C6CF5C 8024063C 00000000 */ nop -/* C6CF60 80240640 C6020000 */ lwc1 $f2, ($s0) -/* C6CF64 80240644 3C014100 */ lui $at, 0x4100 -/* C6CF68 80240648 44816000 */ mtc1 $at, $f12 -/* C6CF6C 8024064C 00000000 */ nop -/* C6CF70 80240650 460C1302 */ mul.s $f12, $f2, $f12 -/* C6CF74 80240654 00000000 */ nop -/* C6CF78 80240658 0C00A8BB */ jal sin_deg -/* C6CF7C 8024065C 46000506 */ mov.s $f20, $f0 -/* C6CF80 80240660 3C013FE0 */ lui $at, 0x3fe0 -/* C6CF84 80240664 44811800 */ mtc1 $at, $f3 -/* C6CF88 80240668 44801000 */ mtc1 $zero, $f2 -/* C6CF8C 8024066C 4600A521 */ cvt.d.s $f20, $f20 -/* C6CF90 80240670 4622A502 */ mul.d $f20, $f20, $f2 -/* C6CF94 80240674 00000000 */ nop -/* C6CF98 80240678 46000021 */ cvt.d.s $f0, $f0 -/* C6CF9C 8024067C 46220002 */ mul.d $f0, $f0, $f2 -/* C6CFA0 80240680 00000000 */ nop -/* C6CFA4 80240684 4620A500 */ add.d $f20, $f20, $f0 -/* C6CFA8 80240688 4600B021 */ cvt.d.s $f0, $f22 -/* C6CFAC 8024068C 46340502 */ mul.d $f20, $f0, $f20 -/* C6CFB0 80240690 00000000 */ nop -/* C6CFB4 80240694 46340000 */ add.d $f0, $f0, $f20 -/* C6CFB8 80240698 3C0141E0 */ lui $at, 0x41e0 -/* C6CFBC 8024069C 44811800 */ mtc1 $at, $f3 -/* C6CFC0 802406A0 44801000 */ mtc1 $zero, $f2 -/* C6CFC4 802406A4 00000000 */ nop -/* C6CFC8 802406A8 4620103E */ c.le.d $f2, $f0 -/* C6CFCC 802406AC 00000000 */ nop -/* C6CFD0 802406B0 45030005 */ bc1tl .L802406C8 -/* C6CFD4 802406B4 46220001 */ sub.d $f0, $f0, $f2 -/* C6CFD8 802406B8 4620018D */ trunc.w.d $f6, $f0 -/* C6CFDC 802406BC 44073000 */ mfc1 $a3, $f6 -/* C6CFE0 802406C0 080901B8 */ j .L802406E0 -/* C6CFE4 802406C4 2404003C */ addiu $a0, $zero, 0x3c -.L802406C8: -/* C6CFE8 802406C8 3C028000 */ lui $v0, 0x8000 -/* C6CFEC 802406CC 4620018D */ trunc.w.d $f6, $f0 -/* C6CFF0 802406D0 44073000 */ mfc1 $a3, $f6 -/* C6CFF4 802406D4 00000000 */ nop -/* C6CFF8 802406D8 00E23825 */ or $a3, $a3, $v0 -/* C6CFFC 802406DC 2404003C */ addiu $a0, $zero, 0x3c -.L802406E0: -/* C6D000 802406E0 24050032 */ addiu $a1, $zero, 0x32 -/* C6D004 802406E4 2406001E */ addiu $a2, $zero, 0x1e -/* C6D008 802406E8 24020014 */ addiu $v0, $zero, 0x14 -/* C6D00C 802406EC AFA20010 */ sw $v0, 0x10($sp) -/* C6D010 802406F0 AFA20014 */ sw $v0, 0x14($sp) -/* C6D014 802406F4 AFA20018 */ sw $v0, 0x18($sp) -/* C6D018 802406F8 240203E8 */ addiu $v0, $zero, 0x3e8 -/* C6D01C 802406FC 30E700FF */ andi $a3, $a3, 0xff -/* C6D020 80240700 AFB1001C */ sw $s1, 0x1c($sp) -/* C6D024 80240704 0C046FAD */ jal func_8011BEB4 -/* C6D028 80240708 AFA20020 */ sw $v0, 0x20($sp) -/* C6D02C 8024070C 0000102D */ daddu $v0, $zero, $zero -.L80240710: -/* C6D030 80240710 8FBF003C */ lw $ra, 0x3c($sp) -/* C6D034 80240714 8FB40038 */ lw $s4, 0x38($sp) -/* C6D038 80240718 8FB30034 */ lw $s3, 0x34($sp) -/* C6D03C 8024071C 8FB20030 */ lw $s2, 0x30($sp) -/* C6D040 80240720 8FB1002C */ lw $s1, 0x2c($sp) -/* C6D044 80240724 8FB00028 */ lw $s0, 0x28($sp) -/* C6D048 80240728 D7B60048 */ ldc1 $f22, 0x48($sp) -/* C6D04C 8024072C D7B40040 */ ldc1 $f20, 0x40($sp) -/* C6D050 80240730 03E00008 */ jr $ra -/* C6D054 80240734 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/func_80240738_C6C920.s b/asm/nonmatchings/world/area_kzn/kzn_06/func_80240738_C6C920.s deleted file mode 100644 index ce297c5a3a..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_06/func_80240738_C6C920.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240738_C6D058 -/* C6D058 80240738 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C6D05C 8024073C AFBF001C */ sw $ra, 0x1c($sp) -/* C6D060 80240740 AFB20018 */ sw $s2, 0x18($sp) -/* C6D064 80240744 AFB10014 */ sw $s1, 0x14($sp) -/* C6D068 80240748 AFB00010 */ sw $s0, 0x10($sp) -/* C6D06C 8024074C 8C82000C */ lw $v0, 0xc($a0) -/* C6D070 80240750 0C0B1EAF */ jal get_variable -/* C6D074 80240754 8C450000 */ lw $a1, ($v0) -/* C6D078 80240758 0040902D */ daddu $s2, $v0, $zero -/* C6D07C 8024075C 12400013 */ beqz $s2, .L802407AC -/* C6D080 80240760 26510002 */ addiu $s1, $s2, 2 -/* C6D084 80240764 96420000 */ lhu $v0, ($s2) -/* C6D088 80240768 1040001D */ beqz $v0, .L802407E0 -/* C6D08C 8024076C 0000802D */ daddu $s0, $zero, $zero -.L80240770: -/* C6D090 80240770 96240000 */ lhu $a0, ($s1) -/* C6D094 80240774 0C046C04 */ jal get_model_list_index_from_tree_index -/* C6D098 80240778 26100001 */ addiu $s0, $s0, 1 -/* C6D09C 8024077C 0C046B4C */ jal get_model_from_list_index -/* C6D0A0 80240780 0040202D */ daddu $a0, $v0, $zero -/* C6D0A4 80240784 0040202D */ daddu $a0, $v0, $zero -/* C6D0A8 80240788 2405FFFF */ addiu $a1, $zero, -1 -/* C6D0AC 8024078C 0C046F1F */ jal func_8011BC7C -/* C6D0B0 80240790 0000302D */ daddu $a2, $zero, $zero -/* C6D0B4 80240794 96420000 */ lhu $v0, ($s2) -/* C6D0B8 80240798 0202102A */ slt $v0, $s0, $v0 -/* C6D0BC 8024079C 1440FFF4 */ bnez $v0, .L80240770 -/* C6D0C0 802407A0 26310002 */ addiu $s1, $s1, 2 -/* C6D0C4 802407A4 080901F8 */ j .L802407E0 -/* C6D0C8 802407A8 00000000 */ nop -.L802407AC: -/* C6D0CC 802407AC 3C118015 */ lui $s1, %hi(gCurrentModelListPtr) -/* C6D0D0 802407B0 8E3112CC */ lw $s1, %lo(gCurrentModelListPtr)($s1) -/* C6D0D4 802407B4 0000802D */ daddu $s0, $zero, $zero -.L802407B8: -/* C6D0D8 802407B8 8E240000 */ lw $a0, ($s1) -/* C6D0DC 802407BC 50800005 */ beql $a0, $zero, .L802407D4 -/* C6D0E0 802407C0 26100001 */ addiu $s0, $s0, 1 -/* C6D0E4 802407C4 2405FFFF */ addiu $a1, $zero, -1 -/* C6D0E8 802407C8 0C046F1F */ jal func_8011BC7C -/* C6D0EC 802407CC 0000302D */ daddu $a2, $zero, $zero -/* C6D0F0 802407D0 26100001 */ addiu $s0, $s0, 1 -.L802407D4: -/* C6D0F4 802407D4 2A020100 */ slti $v0, $s0, 0x100 -/* C6D0F8 802407D8 1440FFF7 */ bnez $v0, .L802407B8 -/* C6D0FC 802407DC 26310004 */ addiu $s1, $s1, 4 -.L802407E0: -/* C6D100 802407E0 8FBF001C */ lw $ra, 0x1c($sp) -/* C6D104 802407E4 8FB20018 */ lw $s2, 0x18($sp) -/* C6D108 802407E8 8FB10014 */ lw $s1, 0x14($sp) -/* C6D10C 802407EC 8FB00010 */ lw $s0, 0x10($sp) -/* C6D110 802407F0 24020002 */ addiu $v0, $zero, 2 -/* C6D114 802407F4 03E00008 */ jr $ra -/* C6D118 802407F8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/func_80240A44_C6C920.s b/asm/nonmatchings/world/area_kzn/kzn_06/func_80240A44_C6C920.s deleted file mode 100644 index 14f136df83..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_06/func_80240A44_C6C920.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A44_C6D364 -/* C6D364 80240A44 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C6D368 80240A48 0000202D */ daddu $a0, $zero, $zero -/* C6D36C 80240A4C AFBF0010 */ sw $ra, 0x10($sp) -/* C6D370 80240A50 0C015586 */ jal func_80055618 -/* C6D374 80240A54 24050001 */ addiu $a1, $zero, 1 -/* C6D378 80240A58 8FBF0010 */ lw $ra, 0x10($sp) -/* C6D37C 80240A5C 24020002 */ addiu $v0, $zero, 2 -/* C6D380 80240A60 03E00008 */ jr $ra -/* C6D384 80240A64 27BD0018 */ addiu $sp, $sp, 0x18 -/* C6D388 80240A68 00000000 */ nop -/* C6D38C 80240A6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/func_80240348_C6E330.s b/asm/nonmatchings/world/area_kzn/kzn_07/func_80240348_C6E330.s deleted file mode 100644 index a55e956816..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/func_80240348_C6E330.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240348_C6E678 -/* C6E678 80240348 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C6E67C 8024034C AFBF001C */ sw $ra, 0x1c($sp) -/* C6E680 80240350 AFB20018 */ sw $s2, 0x18($sp) -/* C6E684 80240354 AFB10014 */ sw $s1, 0x14($sp) -/* C6E688 80240358 AFB00010 */ sw $s0, 0x10($sp) -/* C6E68C 8024035C 8C82000C */ lw $v0, 0xc($a0) -/* C6E690 80240360 0C0B1EAF */ jal get_variable -/* C6E694 80240364 8C450000 */ lw $a1, ($v0) -/* C6E698 80240368 0040902D */ daddu $s2, $v0, $zero -/* C6E69C 8024036C 12400013 */ beqz $s2, .L802403BC -/* C6E6A0 80240370 26510002 */ addiu $s1, $s2, 2 -/* C6E6A4 80240374 96420000 */ lhu $v0, ($s2) -/* C6E6A8 80240378 1040001D */ beqz $v0, .L802403F0 -/* C6E6AC 8024037C 0000802D */ daddu $s0, $zero, $zero -.L80240380: -/* C6E6B0 80240380 96240000 */ lhu $a0, ($s1) -/* C6E6B4 80240384 0C046C04 */ jal get_model_list_index_from_tree_index -/* C6E6B8 80240388 26100001 */ addiu $s0, $s0, 1 -/* C6E6BC 8024038C 0C046B4C */ jal get_model_from_list_index -/* C6E6C0 80240390 0040202D */ daddu $a0, $v0, $zero -/* C6E6C4 80240394 0040202D */ daddu $a0, $v0, $zero -/* C6E6C8 80240398 2405FFFF */ addiu $a1, $zero, -1 -/* C6E6CC 8024039C 0C046F1F */ jal func_8011BC7C -/* C6E6D0 802403A0 0000302D */ daddu $a2, $zero, $zero -/* C6E6D4 802403A4 96420000 */ lhu $v0, ($s2) -/* C6E6D8 802403A8 0202102A */ slt $v0, $s0, $v0 -/* C6E6DC 802403AC 1440FFF4 */ bnez $v0, .L80240380 -/* C6E6E0 802403B0 26310002 */ addiu $s1, $s1, 2 -/* C6E6E4 802403B4 080900FC */ j .L802403F0 -/* C6E6E8 802403B8 00000000 */ nop -.L802403BC: -/* C6E6EC 802403BC 3C118015 */ lui $s1, %hi(gCurrentModelListPtr) -/* C6E6F0 802403C0 8E3112CC */ lw $s1, %lo(gCurrentModelListPtr)($s1) -/* C6E6F4 802403C4 0000802D */ daddu $s0, $zero, $zero -.L802403C8: -/* C6E6F8 802403C8 8E240000 */ lw $a0, ($s1) -/* C6E6FC 802403CC 50800005 */ beql $a0, $zero, .L802403E4 -/* C6E700 802403D0 26100001 */ addiu $s0, $s0, 1 -/* C6E704 802403D4 2405FFFF */ addiu $a1, $zero, -1 -/* C6E708 802403D8 0C046F1F */ jal func_8011BC7C -/* C6E70C 802403DC 0000302D */ daddu $a2, $zero, $zero -/* C6E710 802403E0 26100001 */ addiu $s0, $s0, 1 -.L802403E4: -/* C6E714 802403E4 2A020100 */ slti $v0, $s0, 0x100 -/* C6E718 802403E8 1440FFF7 */ bnez $v0, .L802403C8 -/* C6E71C 802403EC 26310004 */ addiu $s1, $s1, 4 -.L802403F0: -/* C6E720 802403F0 8FBF001C */ lw $ra, 0x1c($sp) -/* C6E724 802403F4 8FB20018 */ lw $s2, 0x18($sp) -/* C6E728 802403F8 8FB10014 */ lw $s1, 0x14($sp) -/* C6E72C 802403FC 8FB00010 */ lw $s0, 0x10($sp) -/* C6E730 80240400 24020002 */ addiu $v0, $zero, 2 -/* C6E734 80240404 03E00008 */ jr $ra -/* C6E738 80240408 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/func_80240530_C6E330.s b/asm/nonmatchings/world/area_kzn/kzn_07/func_80240530_C6E330.s deleted file mode 100644 index b9ce16db00..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/func_80240530_C6E330.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240530_C6E860 -/* C6E860 80240530 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C6E864 80240534 AFB00010 */ sw $s0, 0x10($sp) -/* C6E868 80240538 0080802D */ daddu $s0, $a0, $zero -/* C6E86C 8024053C 10A00005 */ beqz $a1, .L80240554 -/* C6E870 80240540 AFBF0014 */ sw $ra, 0x14($sp) -/* C6E874 80240544 AE000070 */ sw $zero, 0x70($s0) -/* C6E878 80240548 AE000074 */ sw $zero, 0x74($s0) -/* C6E87C 8024054C AE000078 */ sw $zero, 0x78($s0) -/* C6E880 80240550 AE00007C */ sw $zero, 0x7c($s0) -.L80240554: -/* C6E884 80240554 8E020070 */ lw $v0, 0x70($s0) -/* C6E888 80240558 1440000E */ bnez $v0, .L80240594 -/* C6E88C 8024055C 00000000 */ nop -/* C6E890 80240560 8E0300A8 */ lw $v1, 0xa8($s0) -/* C6E894 80240564 8E020088 */ lw $v0, 0x88($s0) -/* C6E898 80240568 00621821 */ addu $v1, $v1, $v0 -/* C6E89C 8024056C 04610004 */ bgez $v1, .L80240580 -/* C6E8A0 80240570 AE0300A8 */ sw $v1, 0xa8($s0) -/* C6E8A4 80240574 3C020002 */ lui $v0, 2 -/* C6E8A8 80240578 08090164 */ j .L80240590 -/* C6E8AC 8024057C 00621021 */ addu $v0, $v1, $v0 -.L80240580: -/* C6E8B0 80240580 3C040002 */ lui $a0, 2 -/* C6E8B4 80240584 0083102A */ slt $v0, $a0, $v1 -/* C6E8B8 80240588 10400002 */ beqz $v0, .L80240594 -/* C6E8BC 8024058C 00641023 */ subu $v0, $v1, $a0 -.L80240590: -/* C6E8C0 80240590 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240594: -/* C6E8C4 80240594 8E020074 */ lw $v0, 0x74($s0) -/* C6E8C8 80240598 1440000E */ bnez $v0, .L802405D4 -/* C6E8CC 8024059C 00000000 */ nop -/* C6E8D0 802405A0 8E0300AC */ lw $v1, 0xac($s0) -/* C6E8D4 802405A4 8E02008C */ lw $v0, 0x8c($s0) -/* C6E8D8 802405A8 00621821 */ addu $v1, $v1, $v0 -/* C6E8DC 802405AC 04610004 */ bgez $v1, .L802405C0 -/* C6E8E0 802405B0 AE0300AC */ sw $v1, 0xac($s0) -/* C6E8E4 802405B4 3C020002 */ lui $v0, 2 -/* C6E8E8 802405B8 08090174 */ j .L802405D0 -/* C6E8EC 802405BC 00621021 */ addu $v0, $v1, $v0 -.L802405C0: -/* C6E8F0 802405C0 3C040002 */ lui $a0, 2 -/* C6E8F4 802405C4 0083102A */ slt $v0, $a0, $v1 -/* C6E8F8 802405C8 10400002 */ beqz $v0, .L802405D4 -/* C6E8FC 802405CC 00641023 */ subu $v0, $v1, $a0 -.L802405D0: -/* C6E900 802405D0 AE0200AC */ sw $v0, 0xac($s0) -.L802405D4: -/* C6E904 802405D4 8E020078 */ lw $v0, 0x78($s0) -/* C6E908 802405D8 1440000E */ bnez $v0, .L80240614 -/* C6E90C 802405DC 00000000 */ nop -/* C6E910 802405E0 8E0300B0 */ lw $v1, 0xb0($s0) -/* C6E914 802405E4 8E020090 */ lw $v0, 0x90($s0) -/* C6E918 802405E8 00621821 */ addu $v1, $v1, $v0 -/* C6E91C 802405EC 04610004 */ bgez $v1, .L80240600 -/* C6E920 802405F0 AE0300B0 */ sw $v1, 0xb0($s0) -/* C6E924 802405F4 3C020002 */ lui $v0, 2 -/* C6E928 802405F8 08090184 */ j .L80240610 -/* C6E92C 802405FC 00621021 */ addu $v0, $v1, $v0 -.L80240600: -/* C6E930 80240600 3C040002 */ lui $a0, 2 -/* C6E934 80240604 0083102A */ slt $v0, $a0, $v1 -/* C6E938 80240608 10400002 */ beqz $v0, .L80240614 -/* C6E93C 8024060C 00641023 */ subu $v0, $v1, $a0 -.L80240610: -/* C6E940 80240610 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240614: -/* C6E944 80240614 8E02007C */ lw $v0, 0x7c($s0) -/* C6E948 80240618 1440000E */ bnez $v0, .L80240654 -/* C6E94C 8024061C 00000000 */ nop -/* C6E950 80240620 8E0300B4 */ lw $v1, 0xb4($s0) -/* C6E954 80240624 8E020094 */ lw $v0, 0x94($s0) -/* C6E958 80240628 00621821 */ addu $v1, $v1, $v0 -/* C6E95C 8024062C 04610004 */ bgez $v1, .L80240640 -/* C6E960 80240630 AE0300B4 */ sw $v1, 0xb4($s0) -/* C6E964 80240634 3C020002 */ lui $v0, 2 -/* C6E968 80240638 08090194 */ j .L80240650 -/* C6E96C 8024063C 00621021 */ addu $v0, $v1, $v0 -.L80240640: -/* C6E970 80240640 3C040002 */ lui $a0, 2 -/* C6E974 80240644 0083102A */ slt $v0, $a0, $v1 -/* C6E978 80240648 10400002 */ beqz $v0, .L80240654 -/* C6E97C 8024064C 00641023 */ subu $v0, $v1, $a0 -.L80240650: -/* C6E980 80240650 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240654: -/* C6E984 80240654 8E040084 */ lw $a0, 0x84($s0) -/* C6E988 80240658 0C046F07 */ jal set_main_pan_u -/* C6E98C 8024065C 8E0500A8 */ lw $a1, 0xa8($s0) -/* C6E990 80240660 8E040084 */ lw $a0, 0x84($s0) -/* C6E994 80240664 0C046F0D */ jal set_main_pan_v -/* C6E998 80240668 8E0500AC */ lw $a1, 0xac($s0) -/* C6E99C 8024066C 8E040084 */ lw $a0, 0x84($s0) -/* C6E9A0 80240670 0C046F13 */ jal set_aux_pan_u -/* C6E9A4 80240674 8E0500B0 */ lw $a1, 0xb0($s0) -/* C6E9A8 80240678 8E040084 */ lw $a0, 0x84($s0) -/* C6E9AC 8024067C 0C046F19 */ jal set_aux_pan_v -/* C6E9B0 80240680 8E0500B4 */ lw $a1, 0xb4($s0) -/* C6E9B4 80240684 8E020070 */ lw $v0, 0x70($s0) -/* C6E9B8 80240688 8E030078 */ lw $v1, 0x78($s0) -/* C6E9BC 8024068C 8E040098 */ lw $a0, 0x98($s0) -/* C6E9C0 80240690 24420001 */ addiu $v0, $v0, 1 -/* C6E9C4 80240694 AE020070 */ sw $v0, 0x70($s0) -/* C6E9C8 80240698 8E020074 */ lw $v0, 0x74($s0) -/* C6E9CC 8024069C 24630001 */ addiu $v1, $v1, 1 -/* C6E9D0 802406A0 AE030078 */ sw $v1, 0x78($s0) -/* C6E9D4 802406A4 8E030070 */ lw $v1, 0x70($s0) -/* C6E9D8 802406A8 24420001 */ addiu $v0, $v0, 1 -/* C6E9DC 802406AC AE020074 */ sw $v0, 0x74($s0) -/* C6E9E0 802406B0 8E02007C */ lw $v0, 0x7c($s0) -/* C6E9E4 802406B4 0064182A */ slt $v1, $v1, $a0 -/* C6E9E8 802406B8 24420001 */ addiu $v0, $v0, 1 -/* C6E9EC 802406BC 14600002 */ bnez $v1, .L802406C8 -/* C6E9F0 802406C0 AE02007C */ sw $v0, 0x7c($s0) -/* C6E9F4 802406C4 AE000070 */ sw $zero, 0x70($s0) -.L802406C8: -/* C6E9F8 802406C8 8E020074 */ lw $v0, 0x74($s0) -/* C6E9FC 802406CC 8E03009C */ lw $v1, 0x9c($s0) -/* C6EA00 802406D0 0043102A */ slt $v0, $v0, $v1 -/* C6EA04 802406D4 50400001 */ beql $v0, $zero, .L802406DC -/* C6EA08 802406D8 AE000074 */ sw $zero, 0x74($s0) -.L802406DC: -/* C6EA0C 802406DC 8E020078 */ lw $v0, 0x78($s0) -/* C6EA10 802406E0 8E0300A0 */ lw $v1, 0xa0($s0) -/* C6EA14 802406E4 0043102A */ slt $v0, $v0, $v1 -/* C6EA18 802406E8 50400001 */ beql $v0, $zero, .L802406F0 -/* C6EA1C 802406EC AE000078 */ sw $zero, 0x78($s0) -.L802406F0: -/* C6EA20 802406F0 8E02007C */ lw $v0, 0x7c($s0) -/* C6EA24 802406F4 8E0300A4 */ lw $v1, 0xa4($s0) -/* C6EA28 802406F8 0043102A */ slt $v0, $v0, $v1 -/* C6EA2C 802406FC 50400001 */ beql $v0, $zero, .L80240704 -/* C6EA30 80240700 AE00007C */ sw $zero, 0x7c($s0) -.L80240704: -/* C6EA34 80240704 8FBF0014 */ lw $ra, 0x14($sp) -/* C6EA38 80240708 8FB00010 */ lw $s0, 0x10($sp) -/* C6EA3C 8024070C 0000102D */ daddu $v0, $zero, $zero -/* C6EA40 80240710 03E00008 */ jr $ra -/* C6EA44 80240714 27BD0018 */ addiu $sp, $sp, 0x18 -/* C6EA48 80240718 00000000 */ nop -/* C6EA4C 8024071C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/func_80240720_C6E330.s b/asm/nonmatchings/world/area_kzn/kzn_07/func_80240720_C6E330.s deleted file mode 100644 index 7b14965d30..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/func_80240720_C6E330.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240720_C6EA50 -/* C6EA50 80240720 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C6EA54 80240724 AFB1001C */ sw $s1, 0x1c($sp) -/* C6EA58 80240728 00A0882D */ daddu $s1, $a1, $zero -/* C6EA5C 8024072C AFBF0020 */ sw $ra, 0x20($sp) -/* C6EA60 80240730 AFB00018 */ sw $s0, 0x18($sp) -/* C6EA64 80240734 8E220070 */ lw $v0, 0x70($s1) -/* C6EA68 80240738 3C0141C8 */ lui $at, 0x41c8 -/* C6EA6C 8024073C 44810000 */ mtc1 $at, $f0 -/* C6EA70 80240740 00021080 */ sll $v0, $v0, 2 -/* C6EA74 80240744 3C018024 */ lui $at, 0x8024 -/* C6EA78 80240748 00220821 */ addu $at, $at, $v0 -/* C6EA7C 8024074C C4222930 */ lwc1 $f2, 0x2930($at) -/* C6EA80 80240750 46001082 */ mul.s $f2, $f2, $f0 -/* C6EA84 80240754 00000000 */ nop -/* C6EA88 80240758 C6200084 */ lwc1 $f0, 0x84($s1) -/* C6EA8C 8024075C 46800020 */ cvt.s.w $f0, $f0 -/* C6EA90 80240760 46020001 */ sub.s $f0, $f0, $f2 -/* C6EA94 80240764 0080802D */ daddu $s0, $a0, $zero -/* C6EA98 80240768 E600004C */ swc1 $f0, 0x4c($s0) -/* C6EA9C 8024076C 8E220070 */ lw $v0, 0x70($s1) -/* C6EAA0 80240770 14400007 */ bnez $v0, .L80240790 -/* C6EAA4 80240774 240401DA */ addiu $a0, $zero, 0x1da -/* C6EAA8 80240778 C6000050 */ lwc1 $f0, 0x50($s0) -/* C6EAAC 8024077C E7A00010 */ swc1 $f0, 0x10($sp) -/* C6EAB0 80240780 8E060048 */ lw $a2, 0x48($s0) -/* C6EAB4 80240784 8E07004C */ lw $a3, 0x4c($s0) -/* C6EAB8 80240788 0C052757 */ jal play_sound_at_position -/* C6EABC 8024078C 0000282D */ daddu $a1, $zero, $zero -.L80240790: -/* C6EAC0 80240790 8E230070 */ lw $v1, 0x70($s1) -/* C6EAC4 80240794 28620005 */ slti $v0, $v1, 5 -/* C6EAC8 80240798 1440000C */ bnez $v0, .L802407CC -/* C6EACC 8024079C 30620001 */ andi $v0, $v1, 1 -/* C6EAD0 802407A0 1040000A */ beqz $v0, .L802407CC -/* C6EAD4 802407A4 24020014 */ addiu $v0, $zero, 0x14 -/* C6EAD8 802407A8 3C013F80 */ lui $at, 0x3f80 -/* C6EADC 802407AC 44810000 */ mtc1 $at, $f0 -/* C6EAE0 802407B0 AFA20014 */ sw $v0, 0x14($sp) -/* C6EAE4 802407B4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C6EAE8 802407B8 8E050048 */ lw $a1, 0x48($s0) -/* C6EAEC 802407BC 8E06004C */ lw $a2, 0x4c($s0) -/* C6EAF0 802407C0 8E070050 */ lw $a3, 0x50($s0) -/* C6EAF4 802407C4 0C01C1CC */ jal func_80070730 -/* C6EAF8 802407C8 24040001 */ addiu $a0, $zero, 1 -.L802407CC: -/* C6EAFC 802407CC 8E220070 */ lw $v0, 0x70($s1) -/* C6EB00 802407D0 24420001 */ addiu $v0, $v0, 1 -/* C6EB04 802407D4 AE220070 */ sw $v0, 0x70($s1) -/* C6EB08 802407D8 3842001C */ xori $v0, $v0, 0x1c -/* C6EB0C 802407DC 8FBF0020 */ lw $ra, 0x20($sp) -/* C6EB10 802407E0 8FB1001C */ lw $s1, 0x1c($sp) -/* C6EB14 802407E4 8FB00018 */ lw $s0, 0x18($sp) -/* C6EB18 802407E8 2C420001 */ sltiu $v0, $v0, 1 -/* C6EB1C 802407EC 03E00008 */ jr $ra -/* C6EB20 802407F0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/func_802407F4_C6E330.s b/asm/nonmatchings/world/area_kzn/kzn_07/func_802407F4_C6E330.s deleted file mode 100644 index 25cc906b4b..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/func_802407F4_C6E330.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407F4_C6EB24 -/* C6EB24 802407F4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C6EB28 802407F8 AFBF0010 */ sw $ra, 0x10($sp) -/* C6EB2C 802407FC 0C04417A */ jal get_entity_by_index -/* C6EB30 80240800 8C840084 */ lw $a0, 0x84($a0) -/* C6EB34 80240804 8C440040 */ lw $a0, 0x40($v0) -/* C6EB38 80240808 24030001 */ addiu $v1, $zero, 1 -/* C6EB3C 8024080C A0830030 */ sb $v1, 0x30($a0) -/* C6EB40 80240810 8FBF0010 */ lw $ra, 0x10($sp) -/* C6EB44 80240814 24020002 */ addiu $v0, $zero, 2 -/* C6EB48 80240818 03E00008 */ jr $ra -/* C6EB4C 8024081C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/func_80240820_C6E330.s b/asm/nonmatchings/world/area_kzn/kzn_07/func_80240820_C6E330.s deleted file mode 100644 index f0958f1cb3..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/func_80240820_C6E330.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240820_C6EB50 -/* C6EB50 80240820 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C6EB54 80240824 AFB3002C */ sw $s3, 0x2c($sp) -/* C6EB58 80240828 0080982D */ daddu $s3, $a0, $zero -/* C6EB5C 8024082C AFBF0030 */ sw $ra, 0x30($sp) -/* C6EB60 80240830 AFB20028 */ sw $s2, 0x28($sp) -/* C6EB64 80240834 AFB10024 */ sw $s1, 0x24($sp) -/* C6EB68 80240838 AFB00020 */ sw $s0, 0x20($sp) -/* C6EB6C 8024083C 8E710148 */ lw $s1, 0x148($s3) -/* C6EB70 80240840 86240008 */ lh $a0, 8($s1) -/* C6EB74 80240844 0C00EABB */ jal get_npc_unsafe -/* C6EB78 80240848 00A0902D */ daddu $s2, $a1, $zero -/* C6EB7C 8024084C 8E440004 */ lw $a0, 4($s2) -/* C6EB80 80240850 0040802D */ daddu $s0, $v0, $zero -/* C6EB84 80240854 00041FC2 */ srl $v1, $a0, 0x1f -/* C6EB88 80240858 00832021 */ addu $a0, $a0, $v1 -/* C6EB8C 8024085C 00042043 */ sra $a0, $a0, 1 -/* C6EB90 80240860 0C00A67F */ jal rand_int -/* C6EB94 80240864 24840001 */ addiu $a0, $a0, 1 -/* C6EB98 80240868 8E430004 */ lw $v1, 4($s2) -/* C6EB9C 8024086C 000327C2 */ srl $a0, $v1, 0x1f -/* C6EBA0 80240870 00641821 */ addu $v1, $v1, $a0 -/* C6EBA4 80240874 00031843 */ sra $v1, $v1, 1 -/* C6EBA8 80240878 00621821 */ addu $v1, $v1, $v0 -/* C6EBAC 8024087C A603008E */ sh $v1, 0x8e($s0) -/* C6EBB0 80240880 8E2300D0 */ lw $v1, 0xd0($s1) -/* C6EBB4 80240884 C6000040 */ lwc1 $f0, 0x40($s0) -/* C6EBB8 80240888 C4640000 */ lwc1 $f4, ($v1) -/* C6EBBC 8024088C 46802120 */ cvt.s.w $f4, $f4 -/* C6EBC0 80240890 C4620008 */ lwc1 $f2, 8($v1) -/* C6EBC4 80240894 468010A0 */ cvt.s.w $f2, $f2 -/* C6EBC8 80240898 E7A00010 */ swc1 $f0, 0x10($sp) -/* C6EBCC 8024089C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6EBD0 802408A0 44061000 */ mfc1 $a2, $f2 -/* C6EBD4 802408A4 C440000C */ lwc1 $f0, 0xc($v0) -/* C6EBD8 802408A8 46800020 */ cvt.s.w $f0, $f0 -/* C6EBDC 802408AC E7A00014 */ swc1 $f0, 0x14($sp) -/* C6EBE0 802408B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6EBE4 802408B4 44052000 */ mfc1 $a1, $f4 -/* C6EBE8 802408B8 C4400010 */ lwc1 $f0, 0x10($v0) -/* C6EBEC 802408BC 46800020 */ cvt.s.w $f0, $f0 -/* C6EBF0 802408C0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C6EBF4 802408C4 8C640018 */ lw $a0, 0x18($v1) -/* C6EBF8 802408C8 0C0123F5 */ jal is_point_within_region -/* C6EBFC 802408CC 8E070038 */ lw $a3, 0x38($s0) -/* C6EC00 802408D0 1040000E */ beqz $v0, .L8024090C -/* C6EC04 802408D4 00000000 */ nop -/* C6EC08 802408D8 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6EC0C 802408DC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C6EC10 802408E0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C6EC14 802408E4 C4460000 */ lwc1 $f6, ($v0) -/* C6EC18 802408E8 468031A0 */ cvt.s.w $f6, $f6 -/* C6EC1C 802408EC 44063000 */ mfc1 $a2, $f6 -/* C6EC20 802408F0 C4460008 */ lwc1 $f6, 8($v0) -/* C6EC24 802408F4 468031A0 */ cvt.s.w $f6, $f6 -/* C6EC28 802408F8 44073000 */ mfc1 $a3, $f6 -/* C6EC2C 802408FC 0C00A720 */ jal atan2 -/* C6EC30 80240900 00000000 */ nop -/* C6EC34 80240904 0809024F */ j .L8024093C -/* C6EC38 80240908 E600000C */ swc1 $f0, 0xc($s0) -.L8024090C: -/* C6EC3C 8024090C 0C00A67F */ jal rand_int -/* C6EC40 80240910 2404003C */ addiu $a0, $zero, 0x3c -/* C6EC44 80240914 C60C000C */ lwc1 $f12, 0xc($s0) -/* C6EC48 80240918 44820000 */ mtc1 $v0, $f0 -/* C6EC4C 8024091C 00000000 */ nop -/* C6EC50 80240920 46800020 */ cvt.s.w $f0, $f0 -/* C6EC54 80240924 46006300 */ add.s $f12, $f12, $f0 -/* C6EC58 80240928 3C0141F0 */ lui $at, 0x41f0 -/* C6EC5C 8024092C 44810000 */ mtc1 $at, $f0 -/* C6EC60 80240930 0C00A6C9 */ jal clamp_angle -/* C6EC64 80240934 46006301 */ sub.s $f12, $f12, $f0 -/* C6EC68 80240938 E600000C */ swc1 $f0, 0xc($s0) -.L8024093C: -/* C6EC6C 8024093C 8E2200CC */ lw $v0, 0xcc($s1) -/* C6EC70 80240940 8C420004 */ lw $v0, 4($v0) -/* C6EC74 80240944 AE020028 */ sw $v0, 0x28($s0) -/* C6EC78 80240948 AE600074 */ sw $zero, 0x74($s3) -/* C6EC7C 8024094C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6EC80 80240950 8C420014 */ lw $v0, 0x14($v0) -/* C6EC84 80240954 04410004 */ bgez $v0, .L80240968 -/* C6EC88 80240958 00000000 */ nop -/* C6EC8C 8024095C C6400000 */ lwc1 $f0, ($s2) -/* C6EC90 80240960 08090262 */ j .L80240988 -/* C6EC94 80240964 E6000018 */ swc1 $f0, 0x18($s0) -.L80240968: -/* C6EC98 80240968 3C018024 */ lui $at, 0x8024 -/* C6EC9C 8024096C D4223090 */ ldc1 $f2, 0x3090($at) -/* C6ECA0 80240970 44820000 */ mtc1 $v0, $f0 -/* C6ECA4 80240974 00000000 */ nop -/* C6ECA8 80240978 46800021 */ cvt.d.w $f0, $f0 -/* C6ECAC 8024097C 46220003 */ div.d $f0, $f0, $f2 -/* C6ECB0 80240980 46200020 */ cvt.s.d $f0, $f0 -/* C6ECB4 80240984 E6000018 */ swc1 $f0, 0x18($s0) -.L80240988: -/* C6ECB8 80240988 C600003C */ lwc1 $f0, 0x3c($s0) -/* C6ECBC 8024098C 3C014059 */ lui $at, 0x4059 -/* C6ECC0 80240990 44811800 */ mtc1 $at, $f3 -/* C6ECC4 80240994 44801000 */ mtc1 $zero, $f2 -/* C6ECC8 80240998 46000021 */ cvt.d.s $f0, $f0 -/* C6ECCC 8024099C 46220002 */ mul.d $f0, $f0, $f2 -/* C6ECD0 802409A0 00000000 */ nop -/* C6ECD4 802409A4 24020001 */ addiu $v0, $zero, 1 -/* C6ECD8 802409A8 4620018D */ trunc.w.d $f6, $f0 -/* C6ECDC 802409AC E626007C */ swc1 $f6, 0x7c($s1) -/* C6ECE0 802409B0 AE620070 */ sw $v0, 0x70($s3) -/* C6ECE4 802409B4 8FBF0030 */ lw $ra, 0x30($sp) -/* C6ECE8 802409B8 8FB3002C */ lw $s3, 0x2c($sp) -/* C6ECEC 802409BC 8FB20028 */ lw $s2, 0x28($sp) -/* C6ECF0 802409C0 8FB10024 */ lw $s1, 0x24($sp) -/* C6ECF4 802409C4 8FB00020 */ lw $s0, 0x20($sp) -/* C6ECF8 802409C8 03E00008 */ jr $ra -/* C6ECFC 802409CC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/func_80240FF8_C6E330.s b/asm/nonmatchings/world/area_kzn/kzn_07/func_80240FF8_C6E330.s deleted file mode 100644 index 1c8a07db55..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/func_80240FF8_C6E330.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FF8_C6F328 -/* C6F328 80240FF8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C6F32C 80240FFC AFB3001C */ sw $s3, 0x1c($sp) -/* C6F330 80241000 0080982D */ daddu $s3, $a0, $zero -/* C6F334 80241004 AFBF0020 */ sw $ra, 0x20($sp) -/* C6F338 80241008 AFB20018 */ sw $s2, 0x18($sp) -/* C6F33C 8024100C AFB10014 */ sw $s1, 0x14($sp) -/* C6F340 80241010 AFB00010 */ sw $s0, 0x10($sp) -/* C6F344 80241014 8E720148 */ lw $s2, 0x148($s3) -/* C6F348 80241018 86440008 */ lh $a0, 8($s2) -/* C6F34C 8024101C 0C00EABB */ jal get_npc_unsafe -/* C6F350 80241020 00A0882D */ daddu $s1, $a1, $zero -/* C6F354 80241024 8E240008 */ lw $a0, 8($s1) -/* C6F358 80241028 0040802D */ daddu $s0, $v0, $zero -/* C6F35C 8024102C 00041FC2 */ srl $v1, $a0, 0x1f -/* C6F360 80241030 00832021 */ addu $a0, $a0, $v1 -/* C6F364 80241034 00042043 */ sra $a0, $a0, 1 -/* C6F368 80241038 0C00A67F */ jal rand_int -/* C6F36C 8024103C 24840001 */ addiu $a0, $a0, 1 -/* C6F370 80241040 8E230008 */ lw $v1, 8($s1) -/* C6F374 80241044 240400B4 */ addiu $a0, $zero, 0xb4 -/* C6F378 80241048 00032FC2 */ srl $a1, $v1, 0x1f -/* C6F37C 8024104C 00651821 */ addu $v1, $v1, $a1 -/* C6F380 80241050 00031843 */ sra $v1, $v1, 1 -/* C6F384 80241054 00621821 */ addu $v1, $v1, $v0 -/* C6F388 80241058 0C00A67F */ jal rand_int -/* C6F38C 8024105C A603008E */ sh $v1, 0x8e($s0) -/* C6F390 80241060 C60C000C */ lwc1 $f12, 0xc($s0) -/* C6F394 80241064 44820000 */ mtc1 $v0, $f0 -/* C6F398 80241068 00000000 */ nop -/* C6F39C 8024106C 46800020 */ cvt.s.w $f0, $f0 -/* C6F3A0 80241070 46006300 */ add.s $f12, $f12, $f0 -/* C6F3A4 80241074 3C0142B4 */ lui $at, 0x42b4 -/* C6F3A8 80241078 44810000 */ mtc1 $at, $f0 -/* C6F3AC 8024107C 0C00A6C9 */ jal clamp_angle -/* C6F3B0 80241080 46006301 */ sub.s $f12, $f12, $f0 -/* C6F3B4 80241084 E600000C */ swc1 $f0, 0xc($s0) -/* C6F3B8 80241088 8E4200CC */ lw $v0, 0xcc($s2) -/* C6F3BC 8024108C 8C420000 */ lw $v0, ($v0) -/* C6F3C0 80241090 AE020028 */ sw $v0, 0x28($s0) -/* C6F3C4 80241094 24020003 */ addiu $v0, $zero, 3 -/* C6F3C8 80241098 AE620070 */ sw $v0, 0x70($s3) -/* C6F3CC 8024109C 8FBF0020 */ lw $ra, 0x20($sp) -/* C6F3D0 802410A0 8FB3001C */ lw $s3, 0x1c($sp) -/* C6F3D4 802410A4 8FB20018 */ lw $s2, 0x18($sp) -/* C6F3D8 802410A8 8FB10014 */ lw $s1, 0x14($sp) -/* C6F3DC 802410AC 8FB00010 */ lw $s0, 0x10($sp) -/* C6F3E0 802410B0 03E00008 */ jr $ra -/* C6F3E4 802410B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/func_802413FC_C6E330.s b/asm/nonmatchings/world/area_kzn/kzn_07/func_802413FC_C6E330.s deleted file mode 100644 index 540a338f1b..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/func_802413FC_C6E330.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413FC_C6F72C -/* C6F72C 802413FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C6F730 80241400 AFB20018 */ sw $s2, 0x18($sp) -/* C6F734 80241404 0080902D */ daddu $s2, $a0, $zero -/* C6F738 80241408 AFBF001C */ sw $ra, 0x1c($sp) -/* C6F73C 8024140C AFB10014 */ sw $s1, 0x14($sp) -/* C6F740 80241410 AFB00010 */ sw $s0, 0x10($sp) -/* C6F744 80241414 8E510148 */ lw $s1, 0x148($s2) -/* C6F748 80241418 0C00EABB */ jal get_npc_unsafe -/* C6F74C 8024141C 86240008 */ lh $a0, 8($s1) -/* C6F750 80241420 0040802D */ daddu $s0, $v0, $zero -/* C6F754 80241424 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C6F758 80241428 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C6F75C 8024142C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C6F760 80241430 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C6F764 80241434 A600008E */ sh $zero, 0x8e($s0) -/* C6F768 80241438 8C460028 */ lw $a2, 0x28($v0) -/* C6F76C 8024143C 0C00A720 */ jal atan2 -/* C6F770 80241440 8C470030 */ lw $a3, 0x30($v0) -/* C6F774 80241444 E600000C */ swc1 $f0, 0xc($s0) -/* C6F778 80241448 8E2200CC */ lw $v0, 0xcc($s1) -/* C6F77C 8024144C 8C420020 */ lw $v0, 0x20($v0) -/* C6F780 80241450 AE020028 */ sw $v0, 0x28($s0) -/* C6F784 80241454 2402000B */ addiu $v0, $zero, 0xb -/* C6F788 80241458 AE420070 */ sw $v0, 0x70($s2) -/* C6F78C 8024145C 8FBF001C */ lw $ra, 0x1c($sp) -/* C6F790 80241460 8FB20018 */ lw $s2, 0x18($sp) -/* C6F794 80241464 8FB10014 */ lw $s1, 0x14($sp) -/* C6F798 80241468 8FB00010 */ lw $s0, 0x10($sp) -/* C6F79C 8024146C 03E00008 */ jr $ra -/* C6F7A0 80241470 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/func_80241474_C6E330.s b/asm/nonmatchings/world/area_kzn/kzn_07/func_80241474_C6E330.s deleted file mode 100644 index 2612824851..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/func_80241474_C6E330.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241474_C6F7A4 -/* C6F7A4 80241474 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C6F7A8 80241478 AFB00010 */ sw $s0, 0x10($sp) -/* C6F7AC 8024147C 0080802D */ daddu $s0, $a0, $zero -/* C6F7B0 80241480 AFBF0014 */ sw $ra, 0x14($sp) -/* C6F7B4 80241484 8E020148 */ lw $v0, 0x148($s0) -/* C6F7B8 80241488 0C00EABB */ jal get_npc_unsafe -/* C6F7BC 8024148C 84440008 */ lh $a0, 8($v0) -/* C6F7C0 80241490 9443008E */ lhu $v1, 0x8e($v0) -/* C6F7C4 80241494 C440003C */ lwc1 $f0, 0x3c($v0) -/* C6F7C8 80241498 24640001 */ addiu $a0, $v1, 1 -/* C6F7CC 8024149C 00031C00 */ sll $v1, $v1, 0x10 -/* C6F7D0 802414A0 00031B83 */ sra $v1, $v1, 0xe -/* C6F7D4 802414A4 A444008E */ sh $a0, 0x8e($v0) -/* C6F7D8 802414A8 3C018024 */ lui $at, 0x8024 -/* C6F7DC 802414AC 00230821 */ addu $at, $at, $v1 -/* C6F7E0 802414B0 C4222B90 */ lwc1 $f2, 0x2b90($at) -/* C6F7E4 802414B4 8443008E */ lh $v1, 0x8e($v0) -/* C6F7E8 802414B8 46020000 */ add.s $f0, $f0, $f2 -/* C6F7EC 802414BC 28630005 */ slti $v1, $v1, 5 -/* C6F7F0 802414C0 14600003 */ bnez $v1, .L802414D0 -/* C6F7F4 802414C4 E440003C */ swc1 $f0, 0x3c($v0) -/* C6F7F8 802414C8 2402000C */ addiu $v0, $zero, 0xc -/* C6F7FC 802414CC AE020070 */ sw $v0, 0x70($s0) -.L802414D0: -/* C6F800 802414D0 8FBF0014 */ lw $ra, 0x14($sp) -/* C6F804 802414D4 8FB00010 */ lw $s0, 0x10($sp) -/* C6F808 802414D8 03E00008 */ jr $ra -/* C6F80C 802414DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/func_80241614_C6E330.s b/asm/nonmatchings/world/area_kzn/kzn_07/func_80241614_C6E330.s deleted file mode 100644 index ec561c6ff6..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/func_80241614_C6E330.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241614_C6F944 -/* C6F944 80241614 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C6F948 80241618 AFB00010 */ sw $s0, 0x10($sp) -/* C6F94C 8024161C 0080802D */ daddu $s0, $a0, $zero -/* C6F950 80241620 AFBF0014 */ sw $ra, 0x14($sp) -/* C6F954 80241624 8E020148 */ lw $v0, 0x148($s0) -/* C6F958 80241628 0C00EABB */ jal get_npc_unsafe -/* C6F95C 8024162C 84440008 */ lh $a0, 8($v0) -/* C6F960 80241630 0040202D */ daddu $a0, $v0, $zero -/* C6F964 80241634 8482008E */ lh $v0, 0x8e($a0) -/* C6F968 80241638 9483008E */ lhu $v1, 0x8e($a0) -/* C6F96C 8024163C 18400005 */ blez $v0, .L80241654 -/* C6F970 80241640 2462FFFF */ addiu $v0, $v1, -1 -/* C6F974 80241644 A482008E */ sh $v0, 0x8e($a0) -/* C6F978 80241648 00021400 */ sll $v0, $v0, 0x10 -/* C6F97C 8024164C 1C400006 */ bgtz $v0, .L80241668 -/* C6F980 80241650 00000000 */ nop -.L80241654: -/* C6F984 80241654 8482008C */ lh $v0, 0x8c($a0) -/* C6F988 80241658 14400003 */ bnez $v0, .L80241668 -/* C6F98C 8024165C 2402000E */ addiu $v0, $zero, 0xe -/* C6F990 80241660 A480008E */ sh $zero, 0x8e($a0) -/* C6F994 80241664 AE020070 */ sw $v0, 0x70($s0) -.L80241668: -/* C6F998 80241668 8FBF0014 */ lw $ra, 0x14($sp) -/* C6F99C 8024166C 8FB00010 */ lw $s0, 0x10($sp) -/* C6F9A0 80241670 03E00008 */ jr $ra -/* C6F9A4 80241674 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/func_80241678_C6E330.s b/asm/nonmatchings/world/area_kzn/kzn_07/func_80241678_C6E330.s deleted file mode 100644 index a07423abc6..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/func_80241678_C6E330.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241678_C6F9A8 -/* C6F9A8 80241678 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C6F9AC 8024167C AFB20030 */ sw $s2, 0x30($sp) -/* C6F9B0 80241680 0080902D */ daddu $s2, $a0, $zero -/* C6F9B4 80241684 AFBF0038 */ sw $ra, 0x38($sp) -/* C6F9B8 80241688 AFB30034 */ sw $s3, 0x34($sp) -/* C6F9BC 8024168C AFB1002C */ sw $s1, 0x2c($sp) -/* C6F9C0 80241690 AFB00028 */ sw $s0, 0x28($sp) -/* C6F9C4 80241694 F7B60048 */ sdc1 $f22, 0x48($sp) -/* C6F9C8 80241698 F7B40040 */ sdc1 $f20, 0x40($sp) -/* C6F9CC 8024169C 8E510148 */ lw $s1, 0x148($s2) -/* C6F9D0 802416A0 86240008 */ lh $a0, 8($s1) -/* C6F9D4 802416A4 0C00EABB */ jal get_npc_unsafe -/* C6F9D8 802416A8 00A0982D */ daddu $s3, $a1, $zero -/* C6F9DC 802416AC 0040802D */ daddu $s0, $v0, $zero -/* C6F9E0 802416B0 0200202D */ daddu $a0, $s0, $zero -/* C6F9E4 802416B4 C6220088 */ lwc1 $f2, 0x88($s1) -/* C6F9E8 802416B8 468010A0 */ cvt.s.w $f2, $f2 -/* C6F9EC 802416BC 460010A1 */ cvt.d.s $f2, $f2 -/* C6F9F0 802416C0 C604001C */ lwc1 $f4, 0x1c($s0) -/* C6F9F4 802416C4 C6000014 */ lwc1 $f0, 0x14($s0) -/* C6F9F8 802416C8 8E050018 */ lw $a1, 0x18($s0) -/* C6F9FC 802416CC 46002100 */ add.s $f4, $f4, $f0 -/* C6FA00 802416D0 8E06000C */ lw $a2, 0xc($s0) -/* C6FA04 802416D4 C6200078 */ lwc1 $f0, 0x78($s1) -/* C6FA08 802416D8 46800020 */ cvt.s.w $f0, $f0 -/* C6FA0C 802416DC E604001C */ swc1 $f4, 0x1c($s0) -/* C6FA10 802416E0 3C014059 */ lui $at, 0x4059 -/* C6FA14 802416E4 44812800 */ mtc1 $at, $f5 -/* C6FA18 802416E8 44802000 */ mtc1 $zero, $f4 -/* C6FA1C 802416EC 46000021 */ cvt.d.s $f0, $f0 -/* C6FA20 802416F0 46240003 */ div.d $f0, $f0, $f4 -/* C6FA24 802416F4 46200520 */ cvt.s.d $f20, $f0 -/* C6FA28 802416F8 46241083 */ div.d $f2, $f2, $f4 -/* C6FA2C 802416FC 0C00EA95 */ jal npc_move_heading -/* C6FA30 80241700 462015A0 */ cvt.s.d $f22, $f2 -/* C6FA34 80241704 C604001C */ lwc1 $f4, 0x1c($s0) -/* C6FA38 80241708 44801000 */ mtc1 $zero, $f2 -/* C6FA3C 8024170C 44801800 */ mtc1 $zero, $f3 -/* C6FA40 80241710 46002021 */ cvt.d.s $f0, $f4 -/* C6FA44 80241714 4620103E */ c.le.d $f2, $f0 -/* C6FA48 80241718 00000000 */ nop -/* C6FA4C 8024171C 45000030 */ bc1f .L802417E0 -/* C6FA50 80241720 00000000 */ nop -/* C6FA54 80241724 C600003C */ lwc1 $f0, 0x3c($s0) -/* C6FA58 80241728 46040000 */ add.s $f0, $f0, $f4 -/* C6FA5C 8024172C E600003C */ swc1 $f0, 0x3c($s0) -/* C6FA60 80241730 8E2200CC */ lw $v0, 0xcc($s1) -/* C6FA64 80241734 8C420024 */ lw $v0, 0x24($v0) -/* C6FA68 80241738 AE020028 */ sw $v0, 0x28($s0) -/* C6FA6C 8024173C A2200007 */ sb $zero, 7($s1) -/* C6FA70 80241740 8E020000 */ lw $v0, ($s0) -/* C6FA74 80241744 30420008 */ andi $v0, $v0, 8 -/* C6FA78 80241748 14400011 */ bnez $v0, .L80241790 -/* C6FA7C 8024174C 0000102D */ daddu $v0, $zero, $zero -/* C6FA80 80241750 27A50018 */ addiu $a1, $sp, 0x18 -/* C6FA84 80241754 27A6001C */ addiu $a2, $sp, 0x1c -/* C6FA88 80241758 C6000038 */ lwc1 $f0, 0x38($s0) -/* C6FA8C 8024175C C602003C */ lwc1 $f2, 0x3c($s0) -/* C6FA90 80241760 C6040040 */ lwc1 $f4, 0x40($s0) -/* C6FA94 80241764 3C01447A */ lui $at, 0x447a -/* C6FA98 80241768 44813000 */ mtc1 $at, $f6 -/* C6FA9C 8024176C 27A20024 */ addiu $v0, $sp, 0x24 -/* C6FAA0 80241770 E7A00018 */ swc1 $f0, 0x18($sp) -/* C6FAA4 80241774 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C6FAA8 80241778 E7A40020 */ swc1 $f4, 0x20($sp) -/* C6FAAC 8024177C E7A60024 */ swc1 $f6, 0x24($sp) -/* C6FAB0 80241780 AFA20010 */ sw $v0, 0x10($sp) -/* C6FAB4 80241784 8E040080 */ lw $a0, 0x80($s0) -/* C6FAB8 80241788 0C0372DF */ jal func_800DCB7C -/* C6FABC 8024178C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241790: -/* C6FAC0 80241790 1040000B */ beqz $v0, .L802417C0 -/* C6FAC4 80241794 00000000 */ nop -/* C6FAC8 80241798 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C6FACC 8024179C 46140080 */ add.s $f2, $f0, $f20 -/* C6FAD0 802417A0 C600003C */ lwc1 $f0, 0x3c($s0) -/* C6FAD4 802417A4 4600103E */ c.le.s $f2, $f0 -/* C6FAD8 802417A8 00000000 */ nop -/* C6FADC 802417AC 4500008D */ bc1f .L802419E4 -/* C6FAE0 802417B0 00000000 */ nop -/* C6FAE4 802417B4 E602003C */ swc1 $f2, 0x3c($s0) -/* C6FAE8 802417B8 08090679 */ j .L802419E4 -/* C6FAEC 802417BC AE400070 */ sw $zero, 0x70($s2) -.L802417C0: -/* C6FAF0 802417C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C6FAF4 802417C4 C6000064 */ lwc1 $f0, 0x64($s0) -/* C6FAF8 802417C8 4602003E */ c.le.s $f0, $f2 -/* C6FAFC 802417CC 00000000 */ nop -/* C6FB00 802417D0 45030084 */ bc1tl .L802419E4 -/* C6FB04 802417D4 AE400070 */ sw $zero, 0x70($s2) -/* C6FB08 802417D8 08090679 */ j .L802419E4 -/* C6FB0C 802417DC 00000000 */ nop -.L802417E0: -/* C6FB10 802417E0 4622003C */ c.lt.d $f0, $f2 -/* C6FB14 802417E4 00000000 */ nop -/* C6FB18 802417E8 4500007E */ bc1f .L802419E4 -/* C6FB1C 802417EC 00000000 */ nop -/* C6FB20 802417F0 9602008E */ lhu $v0, 0x8e($s0) -/* C6FB24 802417F4 24420001 */ addiu $v0, $v0, 1 -/* C6FB28 802417F8 A602008E */ sh $v0, 0x8e($s0) -/* C6FB2C 802417FC 00021400 */ sll $v0, $v0, 0x10 -/* C6FB30 80241800 8E630020 */ lw $v1, 0x20($s3) -/* C6FB34 80241804 00021403 */ sra $v0, $v0, 0x10 -/* C6FB38 80241808 0043102A */ slt $v0, $v0, $v1 -/* C6FB3C 8024180C 14400026 */ bnez $v0, .L802418A8 -/* C6FB40 80241810 00000000 */ nop -/* C6FB44 80241814 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C6FB48 80241818 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C6FB4C 8024181C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C6FB50 80241820 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C6FB54 80241824 A600008E */ sh $zero, 0x8e($s0) -/* C6FB58 80241828 8C460028 */ lw $a2, 0x28($v0) -/* C6FB5C 8024182C 0C00A720 */ jal atan2 -/* C6FB60 80241830 8C470030 */ lw $a3, 0x30($v0) -/* C6FB64 80241834 46000506 */ mov.s $f20, $f0 -/* C6FB68 80241838 C60C000C */ lwc1 $f12, 0xc($s0) -/* C6FB6C 8024183C 0C00A70A */ jal get_clamped_angle_diff -/* C6FB70 80241840 4600A386 */ mov.s $f14, $f20 -/* C6FB74 80241844 46000086 */ mov.s $f2, $f0 -/* C6FB78 80241848 8E62001C */ lw $v0, 0x1c($s3) -/* C6FB7C 8024184C 46001005 */ abs.s $f0, $f2 -/* C6FB80 80241850 44822000 */ mtc1 $v0, $f4 -/* C6FB84 80241854 00000000 */ nop -/* C6FB88 80241858 46802120 */ cvt.s.w $f4, $f4 -/* C6FB8C 8024185C 4600203C */ c.lt.s $f4, $f0 -/* C6FB90 80241860 00000000 */ nop -/* C6FB94 80241864 4500000D */ bc1f .L8024189C -/* C6FB98 80241868 00000000 */ nop -/* C6FB9C 8024186C 44800000 */ mtc1 $zero, $f0 -/* C6FBA0 80241870 C614000C */ lwc1 $f20, 0xc($s0) -/* C6FBA4 80241874 4600103C */ c.lt.s $f2, $f0 -/* C6FBA8 80241878 00000000 */ nop -/* C6FBAC 8024187C 45000006 */ bc1f .L80241898 -/* C6FBB0 80241880 00021023 */ negu $v0, $v0 -/* C6FBB4 80241884 44820000 */ mtc1 $v0, $f0 -/* C6FBB8 80241888 00000000 */ nop -/* C6FBBC 8024188C 46800020 */ cvt.s.w $f0, $f0 -/* C6FBC0 80241890 08090627 */ j .L8024189C -/* C6FBC4 80241894 4600A500 */ add.s $f20, $f20, $f0 -.L80241898: -/* C6FBC8 80241898 4604A500 */ add.s $f20, $f20, $f4 -.L8024189C: -/* C6FBCC 8024189C 0C00A6C9 */ jal clamp_angle -/* C6FBD0 802418A0 4600A306 */ mov.s $f12, $f20 -/* C6FBD4 802418A4 E600000C */ swc1 $f0, 0xc($s0) -.L802418A8: -/* C6FBD8 802418A8 8E020000 */ lw $v0, ($s0) -/* C6FBDC 802418AC 30420008 */ andi $v0, $v0, 8 -/* C6FBE0 802418B0 1040000A */ beqz $v0, .L802418DC -/* C6FBE4 802418B4 27A50018 */ addiu $a1, $sp, 0x18 -/* C6FBE8 802418B8 C602003C */ lwc1 $f2, 0x3c($s0) -/* C6FBEC 802418BC C600001C */ lwc1 $f0, 0x1c($s0) -/* C6FBF0 802418C0 46001080 */ add.s $f2, $f2, $f0 -/* C6FBF4 802418C4 4616103C */ c.lt.s $f2, $f22 -/* C6FBF8 802418C8 00000000 */ nop -/* C6FBFC 802418CC 45020045 */ bc1fl .L802419E4 -/* C6FC00 802418D0 E602003C */ swc1 $f2, 0x3c($s0) -/* C6FC04 802418D4 08090678 */ j .L802419E0 -/* C6FC08 802418D8 E616003C */ swc1 $f22, 0x3c($s0) -.L802418DC: -/* C6FC0C 802418DC C6000038 */ lwc1 $f0, 0x38($s0) -/* C6FC10 802418E0 27A6001C */ addiu $a2, $sp, 0x1c -/* C6FC14 802418E4 E7A00018 */ swc1 $f0, 0x18($sp) -/* C6FC18 802418E8 860200A8 */ lh $v0, 0xa8($s0) -/* C6FC1C 802418EC C600001C */ lwc1 $f0, 0x1c($s0) -/* C6FC20 802418F0 C604003C */ lwc1 $f4, 0x3c($s0) -/* C6FC24 802418F4 44821000 */ mtc1 $v0, $f2 -/* C6FC28 802418F8 00000000 */ nop -/* C6FC2C 802418FC 468010A0 */ cvt.s.w $f2, $f2 -/* C6FC30 80241900 46000005 */ abs.s $f0, $f0 -/* C6FC34 80241904 46020000 */ add.s $f0, $f0, $f2 -/* C6FC38 80241908 C6060040 */ lwc1 $f6, 0x40($s0) -/* C6FC3C 8024190C 27A20024 */ addiu $v0, $sp, 0x24 -/* C6FC40 80241910 46022100 */ add.s $f4, $f4, $f2 -/* C6FC44 80241914 3C014024 */ lui $at, 0x4024 -/* C6FC48 80241918 44811800 */ mtc1 $at, $f3 -/* C6FC4C 8024191C 44801000 */ mtc1 $zero, $f2 -/* C6FC50 80241920 46000021 */ cvt.d.s $f0, $f0 -/* C6FC54 80241924 46220000 */ add.d $f0, $f0, $f2 -/* C6FC58 80241928 E7A60020 */ swc1 $f6, 0x20($sp) -/* C6FC5C 8024192C E7A4001C */ swc1 $f4, 0x1c($sp) -/* C6FC60 80241930 46200020 */ cvt.s.d $f0, $f0 -/* C6FC64 80241934 E7A00024 */ swc1 $f0, 0x24($sp) -/* C6FC68 80241938 AFA20010 */ sw $v0, 0x10($sp) -/* C6FC6C 8024193C 8E040080 */ lw $a0, 0x80($s0) -/* C6FC70 80241940 0C0372DF */ jal func_800DCB7C -/* C6FC74 80241944 27A70020 */ addiu $a3, $sp, 0x20 -/* C6FC78 80241948 10400015 */ beqz $v0, .L802419A0 -/* C6FC7C 8024194C 00000000 */ nop -/* C6FC80 80241950 860200A8 */ lh $v0, 0xa8($s0) -/* C6FC84 80241954 C604001C */ lwc1 $f4, 0x1c($s0) -/* C6FC88 80241958 44820000 */ mtc1 $v0, $f0 -/* C6FC8C 8024195C 00000000 */ nop -/* C6FC90 80241960 46800020 */ cvt.s.w $f0, $f0 -/* C6FC94 80241964 46002085 */ abs.s $f2, $f4 -/* C6FC98 80241968 46020000 */ add.s $f0, $f0, $f2 -/* C6FC9C 8024196C C7A20024 */ lwc1 $f2, 0x24($sp) -/* C6FCA0 80241970 4600103E */ c.le.s $f2, $f0 -/* C6FCA4 80241974 00000000 */ nop -/* C6FCA8 80241978 45000005 */ bc1f .L80241990 -/* C6FCAC 8024197C 00000000 */ nop -/* C6FCB0 80241980 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C6FCB4 80241984 AE00001C */ sw $zero, 0x1c($s0) -/* C6FCB8 80241988 08090679 */ j .L802419E4 -/* C6FCBC 8024198C E600003C */ swc1 $f0, 0x3c($s0) -.L80241990: -/* C6FCC0 80241990 C600003C */ lwc1 $f0, 0x3c($s0) -/* C6FCC4 80241994 46040000 */ add.s $f0, $f0, $f4 -/* C6FCC8 80241998 08090679 */ j .L802419E4 -/* C6FCCC 8024199C E600003C */ swc1 $f0, 0x3c($s0) -.L802419A0: -/* C6FCD0 802419A0 C606003C */ lwc1 $f6, 0x3c($s0) -/* C6FCD4 802419A4 860200A8 */ lh $v0, 0xa8($s0) -/* C6FCD8 802419A8 46163081 */ sub.s $f2, $f6, $f22 -/* C6FCDC 802419AC 44820000 */ mtc1 $v0, $f0 -/* C6FCE0 802419B0 00000000 */ nop -/* C6FCE4 802419B4 46800020 */ cvt.s.w $f0, $f0 -/* C6FCE8 802419B8 46001080 */ add.s $f2, $f2, $f0 -/* C6FCEC 802419BC C604001C */ lwc1 $f4, 0x1c($s0) -/* C6FCF0 802419C0 46002005 */ abs.s $f0, $f4 -/* C6FCF4 802419C4 4602003C */ c.lt.s $f0, $f2 -/* C6FCF8 802419C8 00000000 */ nop -/* C6FCFC 802419CC 45020005 */ bc1fl .L802419E4 -/* C6FD00 802419D0 AE00001C */ sw $zero, 0x1c($s0) -/* C6FD04 802419D4 46043000 */ add.s $f0, $f6, $f4 -/* C6FD08 802419D8 08090679 */ j .L802419E4 -/* C6FD0C 802419DC E600003C */ swc1 $f0, 0x3c($s0) -.L802419E0: -/* C6FD10 802419E0 AE00001C */ sw $zero, 0x1c($s0) -.L802419E4: -/* C6FD14 802419E4 8FBF0038 */ lw $ra, 0x38($sp) -/* C6FD18 802419E8 8FB30034 */ lw $s3, 0x34($sp) -/* C6FD1C 802419EC 8FB20030 */ lw $s2, 0x30($sp) -/* C6FD20 802419F0 8FB1002C */ lw $s1, 0x2c($sp) -/* C6FD24 802419F4 8FB00028 */ lw $s0, 0x28($sp) -/* C6FD28 802419F8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* C6FD2C 802419FC D7B40040 */ ldc1 $f20, 0x40($sp) -/* C6FD30 80241A00 03E00008 */ jr $ra -/* C6FD34 80241A04 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/func_80241A08_C6E330.s b/asm/nonmatchings/world/area_kzn/kzn_07/func_80241A08_C6E330.s deleted file mode 100644 index f334a27ce2..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/func_80241A08_C6E330.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A08_C6FD38 -/* C6FD38 80241A08 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C6FD3C 80241A0C AFB00028 */ sw $s0, 0x28($sp) -/* C6FD40 80241A10 00A0802D */ daddu $s0, $a1, $zero -/* C6FD44 80241A14 AFB1002C */ sw $s1, 0x2c($sp) -/* C6FD48 80241A18 00C0882D */ daddu $s1, $a2, $zero -/* C6FD4C 80241A1C AFBF0034 */ sw $ra, 0x34($sp) -/* C6FD50 80241A20 AFB20030 */ sw $s2, 0x30($sp) -/* C6FD54 80241A24 AE200070 */ sw $zero, 0x70($s1) -/* C6FD58 80241A28 8C830000 */ lw $v1, ($a0) -/* C6FD5C 80241A2C 2402FDFF */ addiu $v0, $zero, -0x201 -/* C6FD60 80241A30 A480008E */ sh $zero, 0x8e($a0) -/* C6FD64 80241A34 00621824 */ and $v1, $v1, $v0 -/* C6FD68 80241A38 34650800 */ ori $a1, $v1, 0x800 -/* C6FD6C 80241A3C AC850000 */ sw $a1, ($a0) -/* C6FD70 80241A40 8E0200D0 */ lw $v0, 0xd0($s0) -/* C6FD74 80241A44 8C420034 */ lw $v0, 0x34($v0) -/* C6FD78 80241A48 10400003 */ beqz $v0, .L80241A58 -/* C6FD7C 80241A4C 00E0902D */ daddu $s2, $a3, $zero -/* C6FD80 80241A50 08090698 */ j .L80241A60 -/* C6FD84 80241A54 34620808 */ ori $v0, $v1, 0x808 -.L80241A58: -/* C6FD88 80241A58 2402FFF7 */ addiu $v0, $zero, -9 -/* C6FD8C 80241A5C 00A21024 */ and $v0, $a1, $v0 -.L80241A60: -/* C6FD90 80241A60 AC820000 */ sw $v0, ($a0) -/* C6FD94 80241A64 27A20024 */ addiu $v0, $sp, 0x24 -/* C6FD98 80241A68 27A50018 */ addiu $a1, $sp, 0x18 -/* C6FD9C 80241A6C C4800038 */ lwc1 $f0, 0x38($a0) -/* C6FDA0 80241A70 C482003C */ lwc1 $f2, 0x3c($a0) -/* C6FDA4 80241A74 C4840040 */ lwc1 $f4, 0x40($a0) -/* C6FDA8 80241A78 3C01447A */ lui $at, 0x447a -/* C6FDAC 80241A7C 44813000 */ mtc1 $at, $f6 -/* C6FDB0 80241A80 27A6001C */ addiu $a2, $sp, 0x1c -/* C6FDB4 80241A84 E7A00018 */ swc1 $f0, 0x18($sp) -/* C6FDB8 80241A88 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C6FDBC 80241A8C E7A40020 */ swc1 $f4, 0x20($sp) -/* C6FDC0 80241A90 E7A60024 */ swc1 $f6, 0x24($sp) -/* C6FDC4 80241A94 AFA20010 */ sw $v0, 0x10($sp) -/* C6FDC8 80241A98 8C840080 */ lw $a0, 0x80($a0) -/* C6FDCC 80241A9C 0C0372DF */ jal func_800DCB7C -/* C6FDD0 80241AA0 27A70020 */ addiu $a3, $sp, 0x20 -/* C6FDD4 80241AA4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* C6FDD8 80241AA8 3C014059 */ lui $at, 0x4059 -/* C6FDDC 80241AAC 44812800 */ mtc1 $at, $f5 -/* C6FDE0 80241AB0 44802000 */ mtc1 $zero, $f4 -/* C6FDE4 80241AB4 460010A1 */ cvt.d.s $f2, $f2 -/* C6FDE8 80241AB8 46241082 */ mul.d $f2, $f2, $f4 -/* C6FDEC 80241ABC 00000000 */ nop -/* C6FDF0 80241AC0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C6FDF4 80241AC4 46000021 */ cvt.d.s $f0, $f0 -/* C6FDF8 80241AC8 46240002 */ mul.d $f0, $f0, $f4 -/* C6FDFC 80241ACC 00000000 */ nop -/* C6FE00 80241AD0 3C013FE0 */ lui $at, 0x3fe0 -/* C6FE04 80241AD4 44812800 */ mtc1 $at, $f5 -/* C6FE08 80241AD8 44802000 */ mtc1 $zero, $f4 -/* C6FE0C 80241ADC 00000000 */ nop -/* C6FE10 80241AE0 46241080 */ add.d $f2, $f2, $f4 -/* C6FE14 80241AE4 AE000074 */ sw $zero, 0x74($s0) -/* C6FE18 80241AE8 46240000 */ add.d $f0, $f0, $f4 -/* C6FE1C 80241AEC AE000090 */ sw $zero, 0x90($s0) -/* C6FE20 80241AF0 4620120D */ trunc.w.d $f8, $f2 -/* C6FE24 80241AF4 E6080078 */ swc1 $f8, 0x78($s0) -/* C6FE28 80241AF8 4620020D */ trunc.w.d $f8, $f0 -/* C6FE2C 80241AFC E6080088 */ swc1 $f8, 0x88($s0) -/* C6FE30 80241B00 8E420014 */ lw $v0, 0x14($s2) -/* C6FE34 80241B04 AE220074 */ sw $v0, 0x74($s1) -/* C6FE38 80241B08 8E0200B0 */ lw $v0, 0xb0($s0) -/* C6FE3C 80241B0C 34420010 */ ori $v0, $v0, 0x10 -/* C6FE40 80241B10 AE0200B0 */ sw $v0, 0xb0($s0) -/* C6FE44 80241B14 8FBF0034 */ lw $ra, 0x34($sp) -/* C6FE48 80241B18 8FB20030 */ lw $s2, 0x30($sp) -/* C6FE4C 80241B1C 8FB1002C */ lw $s1, 0x2c($sp) -/* C6FE50 80241B20 8FB00028 */ lw $s0, 0x28($sp) -/* C6FE54 80241B24 03E00008 */ jr $ra -/* C6FE58 80241B28 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/func_80241E48_C6E330.s b/asm/nonmatchings/world/area_kzn/kzn_07/func_80241E48_C6E330.s deleted file mode 100644 index e2877f7853..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/func_80241E48_C6E330.s +++ /dev/null @@ -1,172 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E48_C70178 -/* C70178 80241E48 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C7017C 80241E4C AFB3004C */ sw $s3, 0x4c($sp) -/* C70180 80241E50 0080982D */ daddu $s3, $a0, $zero -/* C70184 80241E54 AFBF0050 */ sw $ra, 0x50($sp) -/* C70188 80241E58 AFB20048 */ sw $s2, 0x48($sp) -/* C7018C 80241E5C AFB10044 */ sw $s1, 0x44($sp) -/* C70190 80241E60 AFB00040 */ sw $s0, 0x40($sp) -/* C70194 80241E64 8E720148 */ lw $s2, 0x148($s3) -/* C70198 80241E68 00A0882D */ daddu $s1, $a1, $zero -/* C7019C 80241E6C 86440008 */ lh $a0, 8($s2) -/* C701A0 80241E70 0C00EABB */ jal get_npc_unsafe -/* C701A4 80241E74 00C0802D */ daddu $s0, $a2, $zero -/* C701A8 80241E78 0200202D */ daddu $a0, $s0, $zero -/* C701AC 80241E7C 0240282D */ daddu $a1, $s2, $zero -/* C701B0 80241E80 24030001 */ addiu $v1, $zero, 1 -/* C701B4 80241E84 AFA30010 */ sw $v1, 0x10($sp) -/* C701B8 80241E88 8E260024 */ lw $a2, 0x24($s1) -/* C701BC 80241E8C 8E270028 */ lw $a3, 0x28($s1) -/* C701C0 80241E90 0C01242D */ jal func_800490B4 -/* C701C4 80241E94 0040802D */ daddu $s0, $v0, $zero -/* C701C8 80241E98 14400020 */ bnez $v0, .L80241F1C -/* C701CC 80241E9C 24040002 */ addiu $a0, $zero, 2 -/* C701D0 80241EA0 0200282D */ daddu $a1, $s0, $zero -/* C701D4 80241EA4 0000302D */ daddu $a2, $zero, $zero -/* C701D8 80241EA8 860300A8 */ lh $v1, 0xa8($s0) -/* C701DC 80241EAC 3C013F80 */ lui $at, 0x3f80 -/* C701E0 80241EB0 44810000 */ mtc1 $at, $f0 -/* C701E4 80241EB4 3C014000 */ lui $at, 0x4000 -/* C701E8 80241EB8 44811000 */ mtc1 $at, $f2 -/* C701EC 80241EBC 3C01C1A0 */ lui $at, 0xc1a0 -/* C701F0 80241EC0 44812000 */ mtc1 $at, $f4 -/* C701F4 80241EC4 2402000F */ addiu $v0, $zero, 0xf -/* C701F8 80241EC8 AFA2001C */ sw $v0, 0x1c($sp) -/* C701FC 80241ECC 44834000 */ mtc1 $v1, $f8 -/* C70200 80241ED0 00000000 */ nop -/* C70204 80241ED4 46804220 */ cvt.s.w $f8, $f8 -/* C70208 80241ED8 44074000 */ mfc1 $a3, $f8 -/* C7020C 80241EDC 27A20028 */ addiu $v0, $sp, 0x28 -/* C70210 80241EE0 AFA20020 */ sw $v0, 0x20($sp) -/* C70214 80241EE4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C70218 80241EE8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C7021C 80241EEC 0C01BFA4 */ jal fx_emote -/* C70220 80241EF0 E7A40018 */ swc1 $f4, 0x18($sp) -/* C70224 80241EF4 8E4200CC */ lw $v0, 0xcc($s2) -/* C70228 80241EF8 8C430000 */ lw $v1, ($v0) -/* C7022C 80241EFC 2402001E */ addiu $v0, $zero, 0x1e -/* C70230 80241F00 A602008E */ sh $v0, 0x8e($s0) -/* C70234 80241F04 24020014 */ addiu $v0, $zero, 0x14 -/* C70238 80241F08 AE030028 */ sw $v1, 0x28($s0) -/* C7023C 80241F0C AE620070 */ sw $v0, 0x70($s3) -/* C70240 80241F10 2402001E */ addiu $v0, $zero, 0x1e -/* C70244 80241F14 0809082B */ j .L802420AC -/* C70248 80241F18 AE420090 */ sw $v0, 0x90($s2) -.L80241F1C: -/* C7024C 80241F1C 8E050018 */ lw $a1, 0x18($s0) -/* C70250 80241F20 8E06000C */ lw $a2, 0xc($s0) -/* C70254 80241F24 0C00EA95 */ jal npc_move_heading -/* C70258 80241F28 0200202D */ daddu $a0, $s0, $zero -/* C7025C 80241F2C 8E020000 */ lw $v0, ($s0) -/* C70260 80241F30 30420008 */ andi $v0, $v0, 8 -/* C70264 80241F34 14400028 */ bnez $v0, .L80241FD8 -/* C70268 80241F38 0000882D */ daddu $s1, $zero, $zero -/* C7026C 80241F3C 27A5002C */ addiu $a1, $sp, 0x2c -/* C70270 80241F40 27A60030 */ addiu $a2, $sp, 0x30 -/* C70274 80241F44 860200A8 */ lh $v0, 0xa8($s0) -/* C70278 80241F48 C6000038 */ lwc1 $f0, 0x38($s0) -/* C7027C 80241F4C 44821000 */ mtc1 $v0, $f2 -/* C70280 80241F50 00000000 */ nop -/* C70284 80241F54 468010A0 */ cvt.s.w $f2, $f2 -/* C70288 80241F58 E7A0002C */ swc1 $f0, 0x2c($sp) -/* C7028C 80241F5C 860200A8 */ lh $v0, 0xa8($s0) -/* C70290 80241F60 C604003C */ lwc1 $f4, 0x3c($s0) -/* C70294 80241F64 C6060040 */ lwc1 $f6, 0x40($s0) -/* C70298 80241F68 44820000 */ mtc1 $v0, $f0 -/* C7029C 80241F6C 00000000 */ nop -/* C702A0 80241F70 46800021 */ cvt.d.w $f0, $f0 -/* C702A4 80241F74 46022100 */ add.s $f4, $f4, $f2 -/* C702A8 80241F78 3C014008 */ lui $at, 0x4008 -/* C702AC 80241F7C 44811800 */ mtc1 $at, $f3 -/* C702B0 80241F80 44801000 */ mtc1 $zero, $f2 -/* C702B4 80241F84 27A20038 */ addiu $v0, $sp, 0x38 -/* C702B8 80241F88 46220000 */ add.d $f0, $f0, $f2 -/* C702BC 80241F8C E7A60034 */ swc1 $f6, 0x34($sp) -/* C702C0 80241F90 E7A40030 */ swc1 $f4, 0x30($sp) -/* C702C4 80241F94 46200020 */ cvt.s.d $f0, $f0 -/* C702C8 80241F98 E7A00038 */ swc1 $f0, 0x38($sp) -/* C702CC 80241F9C AFA20010 */ sw $v0, 0x10($sp) -/* C702D0 80241FA0 8E040080 */ lw $a0, 0x80($s0) -/* C702D4 80241FA4 0C0372DF */ jal func_800DCB7C -/* C702D8 80241FA8 27A70034 */ addiu $a3, $sp, 0x34 -/* C702DC 80241FAC 1040000A */ beqz $v0, .L80241FD8 -/* C702E0 80241FB0 00000000 */ nop -/* C702E4 80241FB4 860200A8 */ lh $v0, 0xa8($s0) -/* C702E8 80241FB8 C7A20038 */ lwc1 $f2, 0x38($sp) -/* C702EC 80241FBC 44820000 */ mtc1 $v0, $f0 -/* C702F0 80241FC0 00000000 */ nop -/* C702F4 80241FC4 46800020 */ cvt.s.w $f0, $f0 -/* C702F8 80241FC8 4600103C */ c.lt.s $f2, $f0 -/* C702FC 80241FCC 00000000 */ nop -/* C70300 80241FD0 45030001 */ bc1tl .L80241FD8 -/* C70304 80241FD4 24110001 */ addiu $s1, $zero, 1 -.L80241FD8: -/* C70308 80241FD8 12200008 */ beqz $s1, .L80241FFC -/* C7030C 80241FDC 00000000 */ nop -/* C70310 80241FE0 C7A00030 */ lwc1 $f0, 0x30($sp) -/* C70314 80241FE4 3C013FF0 */ lui $at, 0x3ff0 -/* C70318 80241FE8 44811800 */ mtc1 $at, $f3 -/* C7031C 80241FEC 44801000 */ mtc1 $zero, $f2 -/* C70320 80241FF0 46000021 */ cvt.d.s $f0, $f0 -/* C70324 80241FF4 08090821 */ j .L80242084 -/* C70328 80241FF8 46220000 */ add.d $f0, $f0, $f2 -.L80241FFC: -/* C7032C 80241FFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C70330 80242000 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C70334 80242004 3C014018 */ lui $at, 0x4018 -/* C70338 80242008 44811800 */ mtc1 $at, $f3 -/* C7033C 8024200C 44801000 */ mtc1 $zero, $f2 -/* C70340 80242010 C440002C */ lwc1 $f0, 0x2c($v0) -/* C70344 80242014 C604003C */ lwc1 $f4, 0x3c($s0) -/* C70348 80242018 46000021 */ cvt.d.s $f0, $f0 -/* C7034C 8024201C 46220000 */ add.d $f0, $f0, $f2 -/* C70350 80242020 46002121 */ cvt.d.s $f4, $f4 -/* C70354 80242024 46202001 */ sub.d $f0, $f4, $f0 -/* C70358 80242028 462001A0 */ cvt.s.d $f6, $f0 -/* C7035C 8024202C 44800000 */ mtc1 $zero, $f0 -/* C70360 80242030 44800800 */ mtc1 $zero, $f1 -/* C70364 80242034 460030A1 */ cvt.d.s $f2, $f6 -/* C70368 80242038 4620103C */ c.lt.d $f2, $f0 -/* C7036C 8024203C 00000000 */ nop -/* C70370 80242040 45010009 */ bc1t .L80242068 -/* C70374 80242044 00000000 */ nop -/* C70378 80242048 3C014010 */ lui $at, 0x4010 -/* C7037C 8024204C 44810800 */ mtc1 $at, $f1 -/* C70380 80242050 44800000 */ mtc1 $zero, $f0 -/* C70384 80242054 00000000 */ nop -/* C70388 80242058 4622003C */ c.lt.d $f0, $f2 -/* C7038C 8024205C 00000000 */ nop -/* C70390 80242060 4500000A */ bc1f .L8024208C -/* C70394 80242064 00000000 */ nop -.L80242068: -/* C70398 80242068 3C018024 */ lui $at, 0x8024 -/* C7039C 8024206C D42230E8 */ ldc1 $f2, 0x30e8($at) -/* C703A0 80242070 46003187 */ neg.s $f6, $f6 -/* C703A4 80242074 46003021 */ cvt.d.s $f0, $f6 -/* C703A8 80242078 46220002 */ mul.d $f0, $f0, $f2 -/* C703AC 8024207C 00000000 */ nop -/* C703B0 80242080 46202000 */ add.d $f0, $f4, $f0 -.L80242084: -/* C703B4 80242084 46200020 */ cvt.s.d $f0, $f0 -/* C703B8 80242088 E600003C */ swc1 $f0, 0x3c($s0) -.L8024208C: -/* C703BC 8024208C 8602008E */ lh $v0, 0x8e($s0) -/* C703C0 80242090 9603008E */ lhu $v1, 0x8e($s0) -/* C703C4 80242094 18400003 */ blez $v0, .L802420A4 -/* C703C8 80242098 2462FFFF */ addiu $v0, $v1, -1 -/* C703CC 8024209C 0809082B */ j .L802420AC -/* C703D0 802420A0 A602008E */ sh $v0, 0x8e($s0) -.L802420A4: -/* C703D4 802420A4 2402000C */ addiu $v0, $zero, 0xc -/* C703D8 802420A8 AE620070 */ sw $v0, 0x70($s3) -.L802420AC: -/* C703DC 802420AC 8FBF0050 */ lw $ra, 0x50($sp) -/* C703E0 802420B0 8FB3004C */ lw $s3, 0x4c($sp) -/* C703E4 802420B4 8FB20048 */ lw $s2, 0x48($sp) -/* C703E8 802420B8 8FB10044 */ lw $s1, 0x44($sp) -/* C703EC 802420BC 8FB00040 */ lw $s0, 0x40($sp) -/* C703F0 802420C0 03E00008 */ jr $ra -/* C703F4 802420C4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/func_802420C8_C6E330.s b/asm/nonmatchings/world/area_kzn/kzn_07/func_802420C8_C6E330.s deleted file mode 100644 index f3c834bb19..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/func_802420C8_C6E330.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420C8_C703F8 -/* C703F8 802420C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C703FC 802420CC AFB10014 */ sw $s1, 0x14($sp) -/* C70400 802420D0 0080882D */ daddu $s1, $a0, $zero -/* C70404 802420D4 AFBF0018 */ sw $ra, 0x18($sp) -/* C70408 802420D8 AFB00010 */ sw $s0, 0x10($sp) -/* C7040C 802420DC 8E300148 */ lw $s0, 0x148($s1) -/* C70410 802420E0 0C00EABB */ jal get_npc_unsafe -/* C70414 802420E4 86040008 */ lh $a0, 8($s0) -/* C70418 802420E8 0040182D */ daddu $v1, $v0, $zero -/* C7041C 802420EC 9462008E */ lhu $v0, 0x8e($v1) -/* C70420 802420F0 2442FFFF */ addiu $v0, $v0, -1 -/* C70424 802420F4 A462008E */ sh $v0, 0x8e($v1) -/* C70428 802420F8 00021400 */ sll $v0, $v0, 0x10 -/* C7042C 802420FC 1C400004 */ bgtz $v0, .L80242110 -/* C70430 80242100 00000000 */ nop -/* C70434 80242104 AE000074 */ sw $zero, 0x74($s0) -/* C70438 80242108 A460008E */ sh $zero, 0x8e($v1) -/* C7043C 8024210C AE200070 */ sw $zero, 0x70($s1) -.L80242110: -/* C70440 80242110 8FBF0018 */ lw $ra, 0x18($sp) -/* C70444 80242114 8FB10014 */ lw $s1, 0x14($sp) -/* C70448 80242118 8FB00010 */ lw $s0, 0x10($sp) -/* C7044C 8024211C 03E00008 */ jr $ra -/* C70450 80242120 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_80240348_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_80240348_C71480.s deleted file mode 100644 index e6968986eb..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_80240348_C71480.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240348_C717C8 -/* C717C8 80240348 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C717CC 8024034C AFBF001C */ sw $ra, 0x1c($sp) -/* C717D0 80240350 AFB20018 */ sw $s2, 0x18($sp) -/* C717D4 80240354 AFB10014 */ sw $s1, 0x14($sp) -/* C717D8 80240358 AFB00010 */ sw $s0, 0x10($sp) -/* C717DC 8024035C 8C82000C */ lw $v0, 0xc($a0) -/* C717E0 80240360 0C0B1EAF */ jal get_variable -/* C717E4 80240364 8C450000 */ lw $a1, ($v0) -/* C717E8 80240368 0040902D */ daddu $s2, $v0, $zero -/* C717EC 8024036C 12400013 */ beqz $s2, .L802403BC -/* C717F0 80240370 26510002 */ addiu $s1, $s2, 2 -/* C717F4 80240374 96420000 */ lhu $v0, ($s2) -/* C717F8 80240378 1040001D */ beqz $v0, .L802403F0 -/* C717FC 8024037C 0000802D */ daddu $s0, $zero, $zero -.L80240380: -/* C71800 80240380 96240000 */ lhu $a0, ($s1) -/* C71804 80240384 0C046C04 */ jal get_model_list_index_from_tree_index -/* C71808 80240388 26100001 */ addiu $s0, $s0, 1 -/* C7180C 8024038C 0C046B4C */ jal get_model_from_list_index -/* C71810 80240390 0040202D */ daddu $a0, $v0, $zero -/* C71814 80240394 0040202D */ daddu $a0, $v0, $zero -/* C71818 80240398 2405FFFF */ addiu $a1, $zero, -1 -/* C7181C 8024039C 0C046F1F */ jal func_8011BC7C -/* C71820 802403A0 0000302D */ daddu $a2, $zero, $zero -/* C71824 802403A4 96420000 */ lhu $v0, ($s2) -/* C71828 802403A8 0202102A */ slt $v0, $s0, $v0 -/* C7182C 802403AC 1440FFF4 */ bnez $v0, .L80240380 -/* C71830 802403B0 26310002 */ addiu $s1, $s1, 2 -/* C71834 802403B4 080900FC */ j .L802403F0 -/* C71838 802403B8 00000000 */ nop -.L802403BC: -/* C7183C 802403BC 3C118015 */ lui $s1, %hi(gCurrentModelListPtr) -/* C71840 802403C0 8E3112CC */ lw $s1, %lo(gCurrentModelListPtr)($s1) -/* C71844 802403C4 0000802D */ daddu $s0, $zero, $zero -.L802403C8: -/* C71848 802403C8 8E240000 */ lw $a0, ($s1) -/* C7184C 802403CC 50800005 */ beql $a0, $zero, .L802403E4 -/* C71850 802403D0 26100001 */ addiu $s0, $s0, 1 -/* C71854 802403D4 2405FFFF */ addiu $a1, $zero, -1 -/* C71858 802403D8 0C046F1F */ jal func_8011BC7C -/* C7185C 802403DC 0000302D */ daddu $a2, $zero, $zero -/* C71860 802403E0 26100001 */ addiu $s0, $s0, 1 -.L802403E4: -/* C71864 802403E4 2A020100 */ slti $v0, $s0, 0x100 -/* C71868 802403E8 1440FFF7 */ bnez $v0, .L802403C8 -/* C7186C 802403EC 26310004 */ addiu $s1, $s1, 4 -.L802403F0: -/* C71870 802403F0 8FBF001C */ lw $ra, 0x1c($sp) -/* C71874 802403F4 8FB20018 */ lw $s2, 0x18($sp) -/* C71878 802403F8 8FB10014 */ lw $s1, 0x14($sp) -/* C7187C 802403FC 8FB00010 */ lw $s0, 0x10($sp) -/* C71880 80240400 24020002 */ addiu $v0, $zero, 2 -/* C71884 80240404 03E00008 */ jr $ra -/* C71888 80240408 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_8024040C_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_8024040C_C71480.s deleted file mode 100644 index 522db791d7..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_8024040C_C71480.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024040C_C7188C -/* C7188C 8024040C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C71890 80240410 AFB00010 */ sw $s0, 0x10($sp) -/* C71894 80240414 0080802D */ daddu $s0, $a0, $zero -/* C71898 80240418 AFBF0014 */ sw $ra, 0x14($sp) -/* C7189C 8024041C 8E0300A8 */ lw $v1, 0xa8($s0) -/* C718A0 80240420 8E020088 */ lw $v0, 0x88($s0) -/* C718A4 80240424 00621821 */ addu $v1, $v1, $v0 -/* C718A8 80240428 04610004 */ bgez $v1, .L8024043C -/* C718AC 8024042C AE0300A8 */ sw $v1, 0xa8($s0) -/* C718B0 80240430 3C020002 */ lui $v0, 2 -/* C718B4 80240434 08090113 */ j .L8024044C -/* C718B8 80240438 00621021 */ addu $v0, $v1, $v0 -.L8024043C: -/* C718BC 8024043C 3C040002 */ lui $a0, 2 -/* C718C0 80240440 0083102A */ slt $v0, $a0, $v1 -/* C718C4 80240444 10400002 */ beqz $v0, .L80240450 -/* C718C8 80240448 00641023 */ subu $v0, $v1, $a0 -.L8024044C: -/* C718CC 8024044C AE0200A8 */ sw $v0, 0xa8($s0) -.L80240450: -/* C718D0 80240450 8E0300AC */ lw $v1, 0xac($s0) -/* C718D4 80240454 8E02008C */ lw $v0, 0x8c($s0) -/* C718D8 80240458 00621821 */ addu $v1, $v1, $v0 -/* C718DC 8024045C 04610004 */ bgez $v1, .L80240470 -/* C718E0 80240460 AE0300AC */ sw $v1, 0xac($s0) -/* C718E4 80240464 3C020002 */ lui $v0, 2 -/* C718E8 80240468 08090120 */ j .L80240480 -/* C718EC 8024046C 00621021 */ addu $v0, $v1, $v0 -.L80240470: -/* C718F0 80240470 3C040002 */ lui $a0, 2 -/* C718F4 80240474 0083102A */ slt $v0, $a0, $v1 -/* C718F8 80240478 10400002 */ beqz $v0, .L80240484 -/* C718FC 8024047C 00641023 */ subu $v0, $v1, $a0 -.L80240480: -/* C71900 80240480 AE0200AC */ sw $v0, 0xac($s0) -.L80240484: -/* C71904 80240484 8E0300B0 */ lw $v1, 0xb0($s0) -/* C71908 80240488 8E020090 */ lw $v0, 0x90($s0) -/* C7190C 8024048C 00621821 */ addu $v1, $v1, $v0 -/* C71910 80240490 04610004 */ bgez $v1, .L802404A4 -/* C71914 80240494 AE0300B0 */ sw $v1, 0xb0($s0) -/* C71918 80240498 3C020002 */ lui $v0, 2 -/* C7191C 8024049C 0809012D */ j .L802404B4 -/* C71920 802404A0 00621021 */ addu $v0, $v1, $v0 -.L802404A4: -/* C71924 802404A4 3C040002 */ lui $a0, 2 -/* C71928 802404A8 0083102A */ slt $v0, $a0, $v1 -/* C7192C 802404AC 10400002 */ beqz $v0, .L802404B8 -/* C71930 802404B0 00641023 */ subu $v0, $v1, $a0 -.L802404B4: -/* C71934 802404B4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404B8: -/* C71938 802404B8 8E0300B4 */ lw $v1, 0xb4($s0) -/* C7193C 802404BC 8E020094 */ lw $v0, 0x94($s0) -/* C71940 802404C0 00621821 */ addu $v1, $v1, $v0 -/* C71944 802404C4 04610004 */ bgez $v1, .L802404D8 -/* C71948 802404C8 AE0300B4 */ sw $v1, 0xb4($s0) -/* C7194C 802404CC 3C020002 */ lui $v0, 2 -/* C71950 802404D0 0809013A */ j .L802404E8 -/* C71954 802404D4 00621021 */ addu $v0, $v1, $v0 -.L802404D8: -/* C71958 802404D8 3C040002 */ lui $a0, 2 -/* C7195C 802404DC 0083102A */ slt $v0, $a0, $v1 -/* C71960 802404E0 10400002 */ beqz $v0, .L802404EC -/* C71964 802404E4 00641023 */ subu $v0, $v1, $a0 -.L802404E8: -/* C71968 802404E8 AE0200B4 */ sw $v0, 0xb4($s0) -.L802404EC: -/* C7196C 802404EC 8E040084 */ lw $a0, 0x84($s0) -/* C71970 802404F0 0C046F07 */ jal set_main_pan_u -/* C71974 802404F4 8E0500A8 */ lw $a1, 0xa8($s0) -/* C71978 802404F8 8E040084 */ lw $a0, 0x84($s0) -/* C7197C 802404FC 0C046F0D */ jal set_main_pan_v -/* C71980 80240500 8E0500AC */ lw $a1, 0xac($s0) -/* C71984 80240504 8E040084 */ lw $a0, 0x84($s0) -/* C71988 80240508 0C046F13 */ jal set_aux_pan_u -/* C7198C 8024050C 8E0500B0 */ lw $a1, 0xb0($s0) -/* C71990 80240510 8E040084 */ lw $a0, 0x84($s0) -/* C71994 80240514 0C046F19 */ jal set_aux_pan_v -/* C71998 80240518 8E0500B4 */ lw $a1, 0xb4($s0) -/* C7199C 8024051C 8FBF0014 */ lw $ra, 0x14($sp) -/* C719A0 80240520 8FB00010 */ lw $s0, 0x10($sp) -/* C719A4 80240524 0000102D */ daddu $v0, $zero, $zero -/* C719A8 80240528 03E00008 */ jr $ra -/* C719AC 8024052C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_80240530_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_80240530_C71480.s deleted file mode 100644 index d980a36e1e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_80240530_C71480.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240530_C719B0 -/* C719B0 80240530 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C719B4 80240534 AFB00010 */ sw $s0, 0x10($sp) -/* C719B8 80240538 0080802D */ daddu $s0, $a0, $zero -/* C719BC 8024053C 10A00005 */ beqz $a1, .L80240554 -/* C719C0 80240540 AFBF0014 */ sw $ra, 0x14($sp) -/* C719C4 80240544 AE000070 */ sw $zero, 0x70($s0) -/* C719C8 80240548 AE000074 */ sw $zero, 0x74($s0) -/* C719CC 8024054C AE000078 */ sw $zero, 0x78($s0) -/* C719D0 80240550 AE00007C */ sw $zero, 0x7c($s0) -.L80240554: -/* C719D4 80240554 8E020070 */ lw $v0, 0x70($s0) -/* C719D8 80240558 1440000E */ bnez $v0, .L80240594 -/* C719DC 8024055C 00000000 */ nop -/* C719E0 80240560 8E0300A8 */ lw $v1, 0xa8($s0) -/* C719E4 80240564 8E020088 */ lw $v0, 0x88($s0) -/* C719E8 80240568 00621821 */ addu $v1, $v1, $v0 -/* C719EC 8024056C 04610004 */ bgez $v1, .L80240580 -/* C719F0 80240570 AE0300A8 */ sw $v1, 0xa8($s0) -/* C719F4 80240574 3C020002 */ lui $v0, 2 -/* C719F8 80240578 08090164 */ j .L80240590 -/* C719FC 8024057C 00621021 */ addu $v0, $v1, $v0 -.L80240580: -/* C71A00 80240580 3C040002 */ lui $a0, 2 -/* C71A04 80240584 0083102A */ slt $v0, $a0, $v1 -/* C71A08 80240588 10400002 */ beqz $v0, .L80240594 -/* C71A0C 8024058C 00641023 */ subu $v0, $v1, $a0 -.L80240590: -/* C71A10 80240590 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240594: -/* C71A14 80240594 8E020074 */ lw $v0, 0x74($s0) -/* C71A18 80240598 1440000E */ bnez $v0, .L802405D4 -/* C71A1C 8024059C 00000000 */ nop -/* C71A20 802405A0 8E0300AC */ lw $v1, 0xac($s0) -/* C71A24 802405A4 8E02008C */ lw $v0, 0x8c($s0) -/* C71A28 802405A8 00621821 */ addu $v1, $v1, $v0 -/* C71A2C 802405AC 04610004 */ bgez $v1, .L802405C0 -/* C71A30 802405B0 AE0300AC */ sw $v1, 0xac($s0) -/* C71A34 802405B4 3C020002 */ lui $v0, 2 -/* C71A38 802405B8 08090174 */ j .L802405D0 -/* C71A3C 802405BC 00621021 */ addu $v0, $v1, $v0 -.L802405C0: -/* C71A40 802405C0 3C040002 */ lui $a0, 2 -/* C71A44 802405C4 0083102A */ slt $v0, $a0, $v1 -/* C71A48 802405C8 10400002 */ beqz $v0, .L802405D4 -/* C71A4C 802405CC 00641023 */ subu $v0, $v1, $a0 -.L802405D0: -/* C71A50 802405D0 AE0200AC */ sw $v0, 0xac($s0) -.L802405D4: -/* C71A54 802405D4 8E020078 */ lw $v0, 0x78($s0) -/* C71A58 802405D8 1440000E */ bnez $v0, .L80240614 -/* C71A5C 802405DC 00000000 */ nop -/* C71A60 802405E0 8E0300B0 */ lw $v1, 0xb0($s0) -/* C71A64 802405E4 8E020090 */ lw $v0, 0x90($s0) -/* C71A68 802405E8 00621821 */ addu $v1, $v1, $v0 -/* C71A6C 802405EC 04610004 */ bgez $v1, .L80240600 -/* C71A70 802405F0 AE0300B0 */ sw $v1, 0xb0($s0) -/* C71A74 802405F4 3C020002 */ lui $v0, 2 -/* C71A78 802405F8 08090184 */ j .L80240610 -/* C71A7C 802405FC 00621021 */ addu $v0, $v1, $v0 -.L80240600: -/* C71A80 80240600 3C040002 */ lui $a0, 2 -/* C71A84 80240604 0083102A */ slt $v0, $a0, $v1 -/* C71A88 80240608 10400002 */ beqz $v0, .L80240614 -/* C71A8C 8024060C 00641023 */ subu $v0, $v1, $a0 -.L80240610: -/* C71A90 80240610 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240614: -/* C71A94 80240614 8E02007C */ lw $v0, 0x7c($s0) -/* C71A98 80240618 1440000E */ bnez $v0, .L80240654 -/* C71A9C 8024061C 00000000 */ nop -/* C71AA0 80240620 8E0300B4 */ lw $v1, 0xb4($s0) -/* C71AA4 80240624 8E020094 */ lw $v0, 0x94($s0) -/* C71AA8 80240628 00621821 */ addu $v1, $v1, $v0 -/* C71AAC 8024062C 04610004 */ bgez $v1, .L80240640 -/* C71AB0 80240630 AE0300B4 */ sw $v1, 0xb4($s0) -/* C71AB4 80240634 3C020002 */ lui $v0, 2 -/* C71AB8 80240638 08090194 */ j .L80240650 -/* C71ABC 8024063C 00621021 */ addu $v0, $v1, $v0 -.L80240640: -/* C71AC0 80240640 3C040002 */ lui $a0, 2 -/* C71AC4 80240644 0083102A */ slt $v0, $a0, $v1 -/* C71AC8 80240648 10400002 */ beqz $v0, .L80240654 -/* C71ACC 8024064C 00641023 */ subu $v0, $v1, $a0 -.L80240650: -/* C71AD0 80240650 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240654: -/* C71AD4 80240654 8E040084 */ lw $a0, 0x84($s0) -/* C71AD8 80240658 0C046F07 */ jal set_main_pan_u -/* C71ADC 8024065C 8E0500A8 */ lw $a1, 0xa8($s0) -/* C71AE0 80240660 8E040084 */ lw $a0, 0x84($s0) -/* C71AE4 80240664 0C046F0D */ jal set_main_pan_v -/* C71AE8 80240668 8E0500AC */ lw $a1, 0xac($s0) -/* C71AEC 8024066C 8E040084 */ lw $a0, 0x84($s0) -/* C71AF0 80240670 0C046F13 */ jal set_aux_pan_u -/* C71AF4 80240674 8E0500B0 */ lw $a1, 0xb0($s0) -/* C71AF8 80240678 8E040084 */ lw $a0, 0x84($s0) -/* C71AFC 8024067C 0C046F19 */ jal set_aux_pan_v -/* C71B00 80240680 8E0500B4 */ lw $a1, 0xb4($s0) -/* C71B04 80240684 8E020070 */ lw $v0, 0x70($s0) -/* C71B08 80240688 8E030078 */ lw $v1, 0x78($s0) -/* C71B0C 8024068C 8E040098 */ lw $a0, 0x98($s0) -/* C71B10 80240690 24420001 */ addiu $v0, $v0, 1 -/* C71B14 80240694 AE020070 */ sw $v0, 0x70($s0) -/* C71B18 80240698 8E020074 */ lw $v0, 0x74($s0) -/* C71B1C 8024069C 24630001 */ addiu $v1, $v1, 1 -/* C71B20 802406A0 AE030078 */ sw $v1, 0x78($s0) -/* C71B24 802406A4 8E030070 */ lw $v1, 0x70($s0) -/* C71B28 802406A8 24420001 */ addiu $v0, $v0, 1 -/* C71B2C 802406AC AE020074 */ sw $v0, 0x74($s0) -/* C71B30 802406B0 8E02007C */ lw $v0, 0x7c($s0) -/* C71B34 802406B4 0064182A */ slt $v1, $v1, $a0 -/* C71B38 802406B8 24420001 */ addiu $v0, $v0, 1 -/* C71B3C 802406BC 14600002 */ bnez $v1, .L802406C8 -/* C71B40 802406C0 AE02007C */ sw $v0, 0x7c($s0) -/* C71B44 802406C4 AE000070 */ sw $zero, 0x70($s0) -.L802406C8: -/* C71B48 802406C8 8E020074 */ lw $v0, 0x74($s0) -/* C71B4C 802406CC 8E03009C */ lw $v1, 0x9c($s0) -/* C71B50 802406D0 0043102A */ slt $v0, $v0, $v1 -/* C71B54 802406D4 50400001 */ beql $v0, $zero, .L802406DC -/* C71B58 802406D8 AE000074 */ sw $zero, 0x74($s0) -.L802406DC: -/* C71B5C 802406DC 8E020078 */ lw $v0, 0x78($s0) -/* C71B60 802406E0 8E0300A0 */ lw $v1, 0xa0($s0) -/* C71B64 802406E4 0043102A */ slt $v0, $v0, $v1 -/* C71B68 802406E8 50400001 */ beql $v0, $zero, .L802406F0 -/* C71B6C 802406EC AE000078 */ sw $zero, 0x78($s0) -.L802406F0: -/* C71B70 802406F0 8E02007C */ lw $v0, 0x7c($s0) -/* C71B74 802406F4 8E0300A4 */ lw $v1, 0xa4($s0) -/* C71B78 802406F8 0043102A */ slt $v0, $v0, $v1 -/* C71B7C 802406FC 50400001 */ beql $v0, $zero, .L80240704 -/* C71B80 80240700 AE00007C */ sw $zero, 0x7c($s0) -.L80240704: -/* C71B84 80240704 8FBF0014 */ lw $ra, 0x14($sp) -/* C71B88 80240708 8FB00010 */ lw $s0, 0x10($sp) -/* C71B8C 8024070C 0000102D */ daddu $v0, $zero, $zero -/* C71B90 80240710 03E00008 */ jr $ra -/* C71B94 80240714 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_80240790_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_80240790_C71480.s deleted file mode 100644 index ac25c7e1f5..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_80240790_C71480.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240790_C71C10 -/* C71C10 80240790 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C71C14 80240794 AFB00010 */ sw $s0, 0x10($sp) -/* C71C18 80240798 3C108024 */ lui $s0, 0x8024 -/* C71C1C 8024079C 26104BB0 */ addiu $s0, $s0, 0x4bb0 -/* C71C20 802407A0 AFBF0018 */ sw $ra, 0x18($sp) -/* C71C24 802407A4 AFB10014 */ sw $s1, 0x14($sp) -/* C71C28 802407A8 8E020000 */ lw $v0, ($s0) -/* C71C2C 802407AC 14400010 */ bnez $v0, .L802407F0 -/* C71C30 802407B0 0080882D */ daddu $s1, $a0, $zero -/* C71C34 802407B4 0C00AB39 */ jal heap_malloc -/* C71C38 802407B8 24040040 */ addiu $a0, $zero, 0x40 -/* C71C3C 802407BC AE020000 */ sw $v0, ($s0) -/* C71C40 802407C0 0000182D */ daddu $v1, $zero, $zero -/* C71C44 802407C4 0040282D */ daddu $a1, $v0, $zero -/* C71C48 802407C8 0220202D */ daddu $a0, $s1, $zero -.L802407CC: -/* C71C4C 802407CC 8C820084 */ lw $v0, 0x84($a0) -/* C71C50 802407D0 24840004 */ addiu $a0, $a0, 4 -/* C71C54 802407D4 24630001 */ addiu $v1, $v1, 1 -/* C71C58 802407D8 ACA20000 */ sw $v0, ($a1) -/* C71C5C 802407DC 28620010 */ slti $v0, $v1, 0x10 -/* C71C60 802407E0 1440FFFA */ bnez $v0, .L802407CC -/* C71C64 802407E4 24A50004 */ addiu $a1, $a1, 4 -/* C71C68 802407E8 0809020B */ j .L8024082C -/* C71C6C 802407EC 00000000 */ nop -.L802407F0: -/* C71C70 802407F0 0000182D */ daddu $v1, $zero, $zero -/* C71C74 802407F4 0040282D */ daddu $a1, $v0, $zero -/* C71C78 802407F8 0220202D */ daddu $a0, $s1, $zero -.L802407FC: -/* C71C7C 802407FC 8CA20000 */ lw $v0, ($a1) -/* C71C80 80240800 24A50004 */ addiu $a1, $a1, 4 -/* C71C84 80240804 24630001 */ addiu $v1, $v1, 1 -/* C71C88 80240808 AC820084 */ sw $v0, 0x84($a0) -/* C71C8C 8024080C 28620010 */ slti $v0, $v1, 0x10 -/* C71C90 80240810 1440FFFA */ bnez $v0, .L802407FC -/* C71C94 80240814 24840004 */ addiu $a0, $a0, 4 -/* C71C98 80240818 3C108024 */ lui $s0, 0x8024 -/* C71C9C 8024081C 26104BB0 */ addiu $s0, $s0, 0x4bb0 -/* C71CA0 80240820 0C00AB4B */ jal heap_free -/* C71CA4 80240824 8E040000 */ lw $a0, ($s0) -/* C71CA8 80240828 AE000000 */ sw $zero, ($s0) -.L8024082C: -/* C71CAC 8024082C 8FBF0018 */ lw $ra, 0x18($sp) -/* C71CB0 80240830 8FB10014 */ lw $s1, 0x14($sp) -/* C71CB4 80240834 8FB00010 */ lw $s0, 0x10($sp) -/* C71CB8 80240838 24020002 */ addiu $v0, $zero, 2 -/* C71CBC 8024083C 03E00008 */ jr $ra -/* C71CC0 80240840 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_80240844_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_80240844_C71480.s deleted file mode 100644 index 46a06d2c4e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_80240844_C71480.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240844_C71CC4 -/* C71CC4 80240844 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C71CC8 80240848 AFB00010 */ sw $s0, 0x10($sp) -/* C71CCC 8024084C 0080802D */ daddu $s0, $a0, $zero -/* C71CD0 80240850 AFBF0018 */ sw $ra, 0x18($sp) -/* C71CD4 80240854 AFB10014 */ sw $s1, 0x14($sp) -/* C71CD8 80240858 8E02000C */ lw $v0, 0xc($s0) -/* C71CDC 8024085C 8C510000 */ lw $s1, ($v0) -/* C71CE0 80240860 0C0B1EAF */ jal get_variable -/* C71CE4 80240864 0220282D */ daddu $a1, $s1, $zero -/* C71CE8 80240868 3C03FFF0 */ lui $v1, 0xfff0 -/* C71CEC 8024086C 3463FFFF */ ori $v1, $v1, 0xffff -/* C71CF0 80240870 0200202D */ daddu $a0, $s0, $zero -/* C71CF4 80240874 00431024 */ and $v0, $v0, $v1 -/* C71CF8 80240878 00021140 */ sll $v0, $v0, 5 -/* C71CFC 8024087C 3C068008 */ lui $a2, %hi(gItemTable) -/* C71D00 80240880 00C23021 */ addu $a2, $a2, $v0 -/* C71D04 80240884 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* C71D08 80240888 0C0B2026 */ jal set_variable -/* C71D0C 8024088C 0220282D */ daddu $a1, $s1, $zero -/* C71D10 80240890 8FBF0018 */ lw $ra, 0x18($sp) -/* C71D14 80240894 8FB10014 */ lw $s1, 0x14($sp) -/* C71D18 80240898 8FB00010 */ lw $s0, 0x10($sp) -/* C71D1C 8024089C 24020002 */ addiu $v0, $zero, 2 -/* C71D20 802408A0 03E00008 */ jr $ra -/* C71D24 802408A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_802408A8_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_802408A8_C71480.s deleted file mode 100644 index 3c3f384527..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_802408A8_C71480.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_kzn/kzn_08/func_802409F8_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_802409F8_C71480.s deleted file mode 100644 index 992f37f603..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_802409F8_C71480.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409F8_C71E78 -/* C71E78 802409F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C71E7C 802409FC AFB00010 */ sw $s0, 0x10($sp) -/* C71E80 80240A00 0080802D */ daddu $s0, $a0, $zero -/* C71E84 80240A04 AFBF0014 */ sw $ra, 0x14($sp) -/* C71E88 80240A08 8E02000C */ lw $v0, 0xc($s0) -/* C71E8C 80240A0C 0C0B1EAF */ jal get_variable -/* C71E90 80240A10 8C450000 */ lw $a1, ($v0) -/* C71E94 80240A14 00021140 */ sll $v0, $v0, 5 -/* C71E98 80240A18 AE000084 */ sw $zero, 0x84($s0) -/* C71E9C 80240A1C 3C018008 */ lui $at, 0x8008 -/* C71EA0 80240A20 00220821 */ addu $at, $at, $v0 -/* C71EA4 80240A24 942278F8 */ lhu $v0, 0x78f8($at) -/* C71EA8 80240A28 30420040 */ andi $v0, $v0, 0x40 -/* C71EAC 80240A2C 10400002 */ beqz $v0, .L80240A38 -/* C71EB0 80240A30 24020001 */ addiu $v0, $zero, 1 -/* C71EB4 80240A34 AE020084 */ sw $v0, 0x84($s0) -.L80240A38: -/* C71EB8 80240A38 8FBF0014 */ lw $ra, 0x14($sp) -/* C71EBC 80240A3C 8FB00010 */ lw $s0, 0x10($sp) -/* C71EC0 80240A40 24020002 */ addiu $v0, $zero, 2 -/* C71EC4 80240A44 03E00008 */ jr $ra -/* C71EC8 80240A48 27BD0018 */ addiu $sp, $sp, 0x18 -/* C71ECC 80240A4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_80240A50_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_80240A50_C71480.s deleted file mode 100644 index 7a17d0a799..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_80240A50_C71480.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A50_C71ED0 -/* C71ED0 80240A50 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C71ED4 80240A54 AFB3002C */ sw $s3, 0x2c($sp) -/* C71ED8 80240A58 0080982D */ daddu $s3, $a0, $zero -/* C71EDC 80240A5C AFBF0030 */ sw $ra, 0x30($sp) -/* C71EE0 80240A60 AFB20028 */ sw $s2, 0x28($sp) -/* C71EE4 80240A64 AFB10024 */ sw $s1, 0x24($sp) -/* C71EE8 80240A68 AFB00020 */ sw $s0, 0x20($sp) -/* C71EEC 80240A6C 8E710148 */ lw $s1, 0x148($s3) -/* C71EF0 80240A70 86240008 */ lh $a0, 8($s1) -/* C71EF4 80240A74 0C00EABB */ jal get_npc_unsafe -/* C71EF8 80240A78 00A0902D */ daddu $s2, $a1, $zero -/* C71EFC 80240A7C 8E440004 */ lw $a0, 4($s2) -/* C71F00 80240A80 0040802D */ daddu $s0, $v0, $zero -/* C71F04 80240A84 00041FC2 */ srl $v1, $a0, 0x1f -/* C71F08 80240A88 00832021 */ addu $a0, $a0, $v1 -/* C71F0C 80240A8C 00042043 */ sra $a0, $a0, 1 -/* C71F10 80240A90 0C00A67F */ jal rand_int -/* C71F14 80240A94 24840001 */ addiu $a0, $a0, 1 -/* C71F18 80240A98 8E430004 */ lw $v1, 4($s2) -/* C71F1C 80240A9C 000327C2 */ srl $a0, $v1, 0x1f -/* C71F20 80240AA0 00641821 */ addu $v1, $v1, $a0 -/* C71F24 80240AA4 00031843 */ sra $v1, $v1, 1 -/* C71F28 80240AA8 00621821 */ addu $v1, $v1, $v0 -/* C71F2C 80240AAC A603008E */ sh $v1, 0x8e($s0) -/* C71F30 80240AB0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C71F34 80240AB4 C6000040 */ lwc1 $f0, 0x40($s0) -/* C71F38 80240AB8 C4640000 */ lwc1 $f4, ($v1) -/* C71F3C 80240ABC 46802120 */ cvt.s.w $f4, $f4 -/* C71F40 80240AC0 C4620008 */ lwc1 $f2, 8($v1) -/* C71F44 80240AC4 468010A0 */ cvt.s.w $f2, $f2 -/* C71F48 80240AC8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C71F4C 80240ACC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C71F50 80240AD0 44061000 */ mfc1 $a2, $f2 -/* C71F54 80240AD4 C440000C */ lwc1 $f0, 0xc($v0) -/* C71F58 80240AD8 46800020 */ cvt.s.w $f0, $f0 -/* C71F5C 80240ADC E7A00014 */ swc1 $f0, 0x14($sp) -/* C71F60 80240AE0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C71F64 80240AE4 44052000 */ mfc1 $a1, $f4 -/* C71F68 80240AE8 C4400010 */ lwc1 $f0, 0x10($v0) -/* C71F6C 80240AEC 46800020 */ cvt.s.w $f0, $f0 -/* C71F70 80240AF0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C71F74 80240AF4 8C640018 */ lw $a0, 0x18($v1) -/* C71F78 80240AF8 0C0123F5 */ jal is_point_within_region -/* C71F7C 80240AFC 8E070038 */ lw $a3, 0x38($s0) -/* C71F80 80240B00 1040000E */ beqz $v0, .L80240B3C -/* C71F84 80240B04 00000000 */ nop -/* C71F88 80240B08 8E2200D0 */ lw $v0, 0xd0($s1) -/* C71F8C 80240B0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C71F90 80240B10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C71F94 80240B14 C4460000 */ lwc1 $f6, ($v0) -/* C71F98 80240B18 468031A0 */ cvt.s.w $f6, $f6 -/* C71F9C 80240B1C 44063000 */ mfc1 $a2, $f6 -/* C71FA0 80240B20 C4460008 */ lwc1 $f6, 8($v0) -/* C71FA4 80240B24 468031A0 */ cvt.s.w $f6, $f6 -/* C71FA8 80240B28 44073000 */ mfc1 $a3, $f6 -/* C71FAC 80240B2C 0C00A720 */ jal atan2 -/* C71FB0 80240B30 00000000 */ nop -/* C71FB4 80240B34 080902DB */ j .L80240B6C -/* C71FB8 80240B38 E600000C */ swc1 $f0, 0xc($s0) -.L80240B3C: -/* C71FBC 80240B3C 0C00A67F */ jal rand_int -/* C71FC0 80240B40 2404003C */ addiu $a0, $zero, 0x3c -/* C71FC4 80240B44 C60C000C */ lwc1 $f12, 0xc($s0) -/* C71FC8 80240B48 44820000 */ mtc1 $v0, $f0 -/* C71FCC 80240B4C 00000000 */ nop -/* C71FD0 80240B50 46800020 */ cvt.s.w $f0, $f0 -/* C71FD4 80240B54 46006300 */ add.s $f12, $f12, $f0 -/* C71FD8 80240B58 3C0141F0 */ lui $at, 0x41f0 -/* C71FDC 80240B5C 44810000 */ mtc1 $at, $f0 -/* C71FE0 80240B60 0C00A6C9 */ jal clamp_angle -/* C71FE4 80240B64 46006301 */ sub.s $f12, $f12, $f0 -/* C71FE8 80240B68 E600000C */ swc1 $f0, 0xc($s0) -.L80240B6C: -/* C71FEC 80240B6C 8E2200CC */ lw $v0, 0xcc($s1) -/* C71FF0 80240B70 8C420004 */ lw $v0, 4($v0) -/* C71FF4 80240B74 AE020028 */ sw $v0, 0x28($s0) -/* C71FF8 80240B78 AE600074 */ sw $zero, 0x74($s3) -/* C71FFC 80240B7C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C72000 80240B80 8C420014 */ lw $v0, 0x14($v0) -/* C72004 80240B84 04410004 */ bgez $v0, .L80240B98 -/* C72008 80240B88 00000000 */ nop -/* C7200C 80240B8C C6400000 */ lwc1 $f0, ($s2) -/* C72010 80240B90 080902EE */ j .L80240BB8 -/* C72014 80240B94 E6000018 */ swc1 $f0, 0x18($s0) -.L80240B98: -/* C72018 80240B98 3C018024 */ lui $at, 0x8024 -/* C7201C 80240B9C D42255E0 */ ldc1 $f2, 0x55e0($at) -/* C72020 80240BA0 44820000 */ mtc1 $v0, $f0 -/* C72024 80240BA4 00000000 */ nop -/* C72028 80240BA8 46800021 */ cvt.d.w $f0, $f0 -/* C7202C 80240BAC 46220003 */ div.d $f0, $f0, $f2 -/* C72030 80240BB0 46200020 */ cvt.s.d $f0, $f0 -/* C72034 80240BB4 E6000018 */ swc1 $f0, 0x18($s0) -.L80240BB8: -/* C72038 80240BB8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C7203C 80240BBC 3C014059 */ lui $at, 0x4059 -/* C72040 80240BC0 44811800 */ mtc1 $at, $f3 -/* C72044 80240BC4 44801000 */ mtc1 $zero, $f2 -/* C72048 80240BC8 46000021 */ cvt.d.s $f0, $f0 -/* C7204C 80240BCC 46220002 */ mul.d $f0, $f0, $f2 -/* C72050 80240BD0 00000000 */ nop -/* C72054 80240BD4 24020001 */ addiu $v0, $zero, 1 -/* C72058 80240BD8 4620018D */ trunc.w.d $f6, $f0 -/* C7205C 80240BDC E626007C */ swc1 $f6, 0x7c($s1) -/* C72060 80240BE0 AE620070 */ sw $v0, 0x70($s3) -/* C72064 80240BE4 8FBF0030 */ lw $ra, 0x30($sp) -/* C72068 80240BE8 8FB3002C */ lw $s3, 0x2c($sp) -/* C7206C 80240BEC 8FB20028 */ lw $s2, 0x28($sp) -/* C72070 80240BF0 8FB10024 */ lw $s1, 0x24($sp) -/* C72074 80240BF4 8FB00020 */ lw $s0, 0x20($sp) -/* C72078 80240BF8 03E00008 */ jr $ra -/* C7207C 80240BFC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_80240C00_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_80240C00_C71480.s deleted file mode 100644 index 2e92dfa671..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_80240C00_C71480.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C00_C72080 -/* C72080 80240C00 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C72084 80240C04 AFB3004C */ sw $s3, 0x4c($sp) -/* C72088 80240C08 0080982D */ daddu $s3, $a0, $zero -/* C7208C 80240C0C AFBF0058 */ sw $ra, 0x58($sp) -/* C72090 80240C10 AFB50054 */ sw $s5, 0x54($sp) -/* C72094 80240C14 AFB40050 */ sw $s4, 0x50($sp) -/* C72098 80240C18 AFB20048 */ sw $s2, 0x48($sp) -/* C7209C 80240C1C AFB10044 */ sw $s1, 0x44($sp) -/* C720A0 80240C20 AFB00040 */ sw $s0, 0x40($sp) -/* C720A4 80240C24 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* C720A8 80240C28 F7B80070 */ sdc1 $f24, 0x70($sp) -/* C720AC 80240C2C F7B60068 */ sdc1 $f22, 0x68($sp) -/* C720B0 80240C30 F7B40060 */ sdc1 $f20, 0x60($sp) -/* C720B4 80240C34 8E710148 */ lw $s1, 0x148($s3) -/* C720B8 80240C38 00A0902D */ daddu $s2, $a1, $zero -/* C720BC 80240C3C 86240008 */ lh $a0, 8($s1) -/* C720C0 80240C40 0C00EABB */ jal get_npc_unsafe -/* C720C4 80240C44 00C0A82D */ daddu $s5, $a2, $zero -/* C720C8 80240C48 0040802D */ daddu $s0, $v0, $zero -/* C720CC 80240C4C 0000A02D */ daddu $s4, $zero, $zero -/* C720D0 80240C50 C624007C */ lwc1 $f4, 0x7c($s1) -/* C720D4 80240C54 46802120 */ cvt.s.w $f4, $f4 -/* C720D8 80240C58 C6220088 */ lwc1 $f2, 0x88($s1) -/* C720DC 80240C5C 468010A0 */ cvt.s.w $f2, $f2 -/* C720E0 80240C60 460010A1 */ cvt.d.s $f2, $f2 -/* C720E4 80240C64 46002121 */ cvt.d.s $f4, $f4 -/* C720E8 80240C68 C600003C */ lwc1 $f0, 0x3c($s0) -/* C720EC 80240C6C 3C014059 */ lui $at, 0x4059 -/* C720F0 80240C70 44813800 */ mtc1 $at, $f7 -/* C720F4 80240C74 44803000 */ mtc1 $zero, $f6 -/* C720F8 80240C78 46000021 */ cvt.d.s $f0, $f0 -/* C720FC 80240C7C 46260002 */ mul.d $f0, $f0, $f6 -/* C72100 80240C80 00000000 */ nop -/* C72104 80240C84 24020001 */ addiu $v0, $zero, 1 -/* C72108 80240C88 8E24006C */ lw $a0, 0x6c($s1) -/* C7210C 80240C8C 46261083 */ div.d $f2, $f2, $f6 -/* C72110 80240C90 462010A0 */ cvt.s.d $f2, $f2 -/* C72114 80240C94 46262103 */ div.d $f4, $f4, $f6 -/* C72118 80240C98 46202520 */ cvt.s.d $f20, $f4 -/* C7211C 80240C9C 30830011 */ andi $v1, $a0, 0x11 -/* C72120 80240CA0 4620020D */ trunc.w.d $f8, $f0 -/* C72124 80240CA4 E628007C */ swc1 $f8, 0x7c($s1) -/* C72128 80240CA8 C6200078 */ lwc1 $f0, 0x78($s1) -/* C7212C 80240CAC 46800020 */ cvt.s.w $f0, $f0 -/* C72130 80240CB0 46000021 */ cvt.d.s $f0, $f0 -/* C72134 80240CB4 46260003 */ div.d $f0, $f0, $f6 -/* C72138 80240CB8 462006A0 */ cvt.s.d $f26, $f0 -/* C7213C 80240CBC C6200070 */ lwc1 $f0, 0x70($s1) -/* C72140 80240CC0 46800020 */ cvt.s.w $f0, $f0 -/* C72144 80240CC4 46000021 */ cvt.d.s $f0, $f0 -/* C72148 80240CC8 46260003 */ div.d $f0, $f0, $f6 -/* C7214C 80240CCC 462005A0 */ cvt.s.d $f22, $f0 -/* C72150 80240CD0 14620025 */ bne $v1, $v0, .L80240D68 -/* C72154 80240CD4 4602D600 */ add.s $f24, $f26, $f2 -/* C72158 80240CD8 8E020000 */ lw $v0, ($s0) -/* C7215C 80240CDC 30420008 */ andi $v0, $v0, 8 -/* C72160 80240CE0 10400009 */ beqz $v0, .L80240D08 -/* C72164 80240CE4 27A50028 */ addiu $a1, $sp, 0x28 -/* C72168 80240CE8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C7216C 80240CEC 4600C001 */ sub.s $f0, $f24, $f0 -/* C72170 80240CF0 4600B03C */ c.lt.s $f22, $f0 -/* C72174 80240CF4 00000000 */ nop -/* C72178 80240CF8 4500001B */ bc1f .L80240D68 -/* C7217C 80240CFC 34820010 */ ori $v0, $a0, 0x10 -/* C72180 80240D00 0809035A */ j .L80240D68 -/* C72184 80240D04 AE22006C */ sw $v0, 0x6c($s1) -.L80240D08: -/* C72188 80240D08 27A6002C */ addiu $a2, $sp, 0x2c -/* C7218C 80240D0C C6000038 */ lwc1 $f0, 0x38($s0) -/* C72190 80240D10 C602003C */ lwc1 $f2, 0x3c($s0) -/* C72194 80240D14 C6040040 */ lwc1 $f4, 0x40($s0) -/* C72198 80240D18 3C01447A */ lui $at, 0x447a -/* C7219C 80240D1C 44813000 */ mtc1 $at, $f6 -/* C721A0 80240D20 27A20034 */ addiu $v0, $sp, 0x34 -/* C721A4 80240D24 E7A00028 */ swc1 $f0, 0x28($sp) -/* C721A8 80240D28 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C721AC 80240D2C E7A40030 */ swc1 $f4, 0x30($sp) -/* C721B0 80240D30 E7A60034 */ swc1 $f6, 0x34($sp) -/* C721B4 80240D34 AFA20010 */ sw $v0, 0x10($sp) -/* C721B8 80240D38 8E040080 */ lw $a0, 0x80($s0) -/* C721BC 80240D3C 0C0372DF */ jal func_800DCB7C -/* C721C0 80240D40 27A70030 */ addiu $a3, $sp, 0x30 -/* C721C4 80240D44 C7A00034 */ lwc1 $f0, 0x34($sp) -/* C721C8 80240D48 4600D001 */ sub.s $f0, $f26, $f0 -/* C721CC 80240D4C 4600B03C */ c.lt.s $f22, $f0 -/* C721D0 80240D50 00000000 */ nop -/* C721D4 80240D54 45000004 */ bc1f .L80240D68 -/* C721D8 80240D58 00000000 */ nop -/* C721DC 80240D5C 8E22006C */ lw $v0, 0x6c($s1) -/* C721E0 80240D60 34420010 */ ori $v0, $v0, 0x10 -/* C721E4 80240D64 AE22006C */ sw $v0, 0x6c($s1) -.L80240D68: -/* C721E8 80240D68 8E22006C */ lw $v0, 0x6c($s1) -/* C721EC 80240D6C 24030011 */ addiu $v1, $zero, 0x11 -/* C721F0 80240D70 30420011 */ andi $v0, $v0, 0x11 -/* C721F4 80240D74 14430039 */ bne $v0, $v1, .L80240E5C -/* C721F8 80240D78 00000000 */ nop -/* C721FC 80240D7C 8E020000 */ lw $v0, ($s0) -/* C72200 80240D80 30420008 */ andi $v0, $v0, 8 -/* C72204 80240D84 1040000A */ beqz $v0, .L80240DB0 -/* C72208 80240D88 4600C106 */ mov.s $f4, $f24 -/* C7220C 80240D8C 4614C081 */ sub.s $f2, $f24, $f20 -/* C72210 80240D90 3C018024 */ lui $at, 0x8024 -/* C72214 80240D94 D42055E8 */ ldc1 $f0, 0x55e8($at) -/* C72218 80240D98 460010A1 */ cvt.d.s $f2, $f2 -/* C7221C 80240D9C 46201082 */ mul.d $f2, $f2, $f0 -/* C72220 80240DA0 00000000 */ nop -/* C72224 80240DA4 4600A021 */ cvt.d.s $f0, $f20 -/* C72228 80240DA8 08090385 */ j .L80240E14 -/* C7222C 80240DAC 46220000 */ add.d $f0, $f0, $f2 -.L80240DB0: -/* C72230 80240DB0 27A50028 */ addiu $a1, $sp, 0x28 -/* C72234 80240DB4 27A6002C */ addiu $a2, $sp, 0x2c -/* C72238 80240DB8 C6000038 */ lwc1 $f0, 0x38($s0) -/* C7223C 80240DBC C6020040 */ lwc1 $f2, 0x40($s0) -/* C72240 80240DC0 3C01447A */ lui $at, 0x447a -/* C72244 80240DC4 44812000 */ mtc1 $at, $f4 -/* C72248 80240DC8 27A20034 */ addiu $v0, $sp, 0x34 -/* C7224C 80240DCC E7B4002C */ swc1 $f20, 0x2c($sp) -/* C72250 80240DD0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C72254 80240DD4 E7A20030 */ swc1 $f2, 0x30($sp) -/* C72258 80240DD8 E7A40034 */ swc1 $f4, 0x34($sp) -/* C7225C 80240DDC AFA20010 */ sw $v0, 0x10($sp) -/* C72260 80240DE0 8E040080 */ lw $a0, 0x80($s0) -/* C72264 80240DE4 0C0372DF */ jal func_800DCB7C -/* C72268 80240DE8 27A70030 */ addiu $a3, $sp, 0x30 -/* C7226C 80240DEC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* C72270 80240DF0 461A2100 */ add.s $f4, $f4, $f26 -/* C72274 80240DF4 46142081 */ sub.s $f2, $f4, $f20 -/* C72278 80240DF8 3C018024 */ lui $at, 0x8024 -/* C7227C 80240DFC D42055F0 */ ldc1 $f0, 0x55f0($at) -/* C72280 80240E00 460010A1 */ cvt.d.s $f2, $f2 -/* C72284 80240E04 46201082 */ mul.d $f2, $f2, $f0 -/* C72288 80240E08 00000000 */ nop -/* C7228C 80240E0C 4600A021 */ cvt.d.s $f0, $f20 -/* C72290 80240E10 46220000 */ add.d $f0, $f0, $f2 -.L80240E14: -/* C72294 80240E14 46200020 */ cvt.s.d $f0, $f0 -/* C72298 80240E18 E600003C */ swc1 $f0, 0x3c($s0) -/* C7229C 80240E1C C600003C */ lwc1 $f0, 0x3c($s0) -/* C722A0 80240E20 46002001 */ sub.s $f0, $f4, $f0 -/* C722A4 80240E24 3C013FF0 */ lui $at, 0x3ff0 -/* C722A8 80240E28 44811800 */ mtc1 $at, $f3 -/* C722AC 80240E2C 44801000 */ mtc1 $zero, $f2 -/* C722B0 80240E30 46000005 */ abs.s $f0, $f0 -/* C722B4 80240E34 46000021 */ cvt.d.s $f0, $f0 -/* C722B8 80240E38 4622003C */ c.lt.d $f0, $f2 -/* C722BC 80240E3C 00000000 */ nop -/* C722C0 80240E40 45000036 */ bc1f .L80240F1C -/* C722C4 80240E44 2403FFEF */ addiu $v1, $zero, -0x11 -/* C722C8 80240E48 E604003C */ swc1 $f4, 0x3c($s0) -/* C722CC 80240E4C 8E22006C */ lw $v0, 0x6c($s1) -/* C722D0 80240E50 00431024 */ and $v0, $v0, $v1 -/* C722D4 80240E54 080903C7 */ j .L80240F1C -/* C722D8 80240E58 AE22006C */ sw $v0, 0x6c($s1) -.L80240E5C: -/* C722DC 80240E5C 8E220070 */ lw $v0, 0x70($s1) -/* C722E0 80240E60 1840002E */ blez $v0, .L80240F1C -/* C722E4 80240E64 00000000 */ nop -/* C722E8 80240E68 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C722EC 80240E6C 0C00A8BB */ jal sin_deg -/* C722F0 80240E70 46806320 */ cvt.s.w $f12, $f12 -/* C722F4 80240E74 8E020000 */ lw $v0, ($s0) -/* C722F8 80240E78 30420008 */ andi $v0, $v0, 8 -/* C722FC 80240E7C 10400003 */ beqz $v0, .L80240E8C -/* C72300 80240E80 46000506 */ mov.s $f20, $f0 -/* C72304 80240E84 080903B3 */ j .L80240ECC -/* C72308 80240E88 0000102D */ daddu $v0, $zero, $zero -.L80240E8C: -/* C7230C 80240E8C 27A50028 */ addiu $a1, $sp, 0x28 -/* C72310 80240E90 27A6002C */ addiu $a2, $sp, 0x2c -/* C72314 80240E94 C6000038 */ lwc1 $f0, 0x38($s0) -/* C72318 80240E98 C602003C */ lwc1 $f2, 0x3c($s0) -/* C7231C 80240E9C C6040040 */ lwc1 $f4, 0x40($s0) -/* C72320 80240EA0 3C01447A */ lui $at, 0x447a -/* C72324 80240EA4 44813000 */ mtc1 $at, $f6 -/* C72328 80240EA8 27A20034 */ addiu $v0, $sp, 0x34 -/* C7232C 80240EAC E7A00028 */ swc1 $f0, 0x28($sp) -/* C72330 80240EB0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C72334 80240EB4 E7A40030 */ swc1 $f4, 0x30($sp) -/* C72338 80240EB8 E7A60034 */ swc1 $f6, 0x34($sp) -/* C7233C 80240EBC AFA20010 */ sw $v0, 0x10($sp) -/* C72340 80240EC0 8E040080 */ lw $a0, 0x80($s0) -/* C72344 80240EC4 0C0372DF */ jal func_800DCB7C -/* C72348 80240EC8 27A70030 */ addiu $a3, $sp, 0x30 -.L80240ECC: -/* C7234C 80240ECC 10400007 */ beqz $v0, .L80240EEC -/* C72350 80240ED0 00000000 */ nop -/* C72354 80240ED4 4616A082 */ mul.s $f2, $f20, $f22 -/* C72358 80240ED8 00000000 */ nop -/* C7235C 80240EDC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C72360 80240EE0 461A0000 */ add.s $f0, $f0, $f26 -/* C72364 80240EE4 080903BE */ j .L80240EF8 -/* C72368 80240EE8 46020000 */ add.s $f0, $f0, $f2 -.L80240EEC: -/* C7236C 80240EEC 4616A002 */ mul.s $f0, $f20, $f22 -/* C72370 80240EF0 00000000 */ nop -/* C72374 80240EF4 4600C000 */ add.s $f0, $f24, $f0 -.L80240EF8: -/* C72378 80240EF8 E600003C */ swc1 $f0, 0x3c($s0) -/* C7237C 80240EFC 8E220074 */ lw $v0, 0x74($s1) -/* C72380 80240F00 2442000A */ addiu $v0, $v0, 0xa -/* C72384 80240F04 44826000 */ mtc1 $v0, $f12 -/* C72388 80240F08 00000000 */ nop -/* C7238C 80240F0C 0C00A6C9 */ jal clamp_angle -/* C72390 80240F10 46806320 */ cvt.s.w $f12, $f12 -/* C72394 80240F14 4600020D */ trunc.w.s $f8, $f0 -/* C72398 80240F18 E6280074 */ swc1 $f8, 0x74($s1) -.L80240F1C: -/* C7239C 80240F1C 8E220090 */ lw $v0, 0x90($s1) -/* C723A0 80240F20 1C40004A */ bgtz $v0, .L8024104C -/* C723A4 80240F24 2442FFFF */ addiu $v0, $v0, -1 -/* C723A8 80240F28 8E430014 */ lw $v1, 0x14($s2) -/* C723AC 80240F2C 04600048 */ bltz $v1, .L80241050 -/* C723B0 80240F30 00000000 */ nop -/* C723B4 80240F34 8E620074 */ lw $v0, 0x74($s3) -/* C723B8 80240F38 1C400042 */ bgtz $v0, .L80241044 -/* C723BC 80240F3C 2442FFFF */ addiu $v0, $v0, -1 -/* C723C0 80240F40 AE630074 */ sw $v1, 0x74($s3) -/* C723C4 80240F44 860200A8 */ lh $v0, 0xa8($s0) -/* C723C8 80240F48 C602003C */ lwc1 $f2, 0x3c($s0) -/* C723CC 80240F4C 44820000 */ mtc1 $v0, $f0 -/* C723D0 80240F50 00000000 */ nop -/* C723D4 80240F54 46800020 */ cvt.s.w $f0, $f0 -/* C723D8 80240F58 46001080 */ add.s $f2, $f2, $f0 -/* C723DC 80240F5C 3C014024 */ lui $at, 0x4024 -/* C723E0 80240F60 44810800 */ mtc1 $at, $f1 -/* C723E4 80240F64 44800000 */ mtc1 $zero, $f0 -/* C723E8 80240F68 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C723EC 80240F6C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C723F0 80240F70 460010A1 */ cvt.d.s $f2, $f2 -/* C723F4 80240F74 46201080 */ add.d $f2, $f2, $f0 -/* C723F8 80240F78 C440002C */ lwc1 $f0, 0x2c($v0) -/* C723FC 80240F7C 46000021 */ cvt.d.s $f0, $f0 -/* C72400 80240F80 4622003C */ c.lt.d $f0, $f2 -/* C72404 80240F84 00000000 */ nop -/* C72408 80240F88 4500002C */ bc1f .L8024103C -/* C7240C 80240F8C 02A0202D */ daddu $a0, $s5, $zero -/* C72410 80240F90 AFA00010 */ sw $zero, 0x10($sp) -/* C72414 80240F94 8E46000C */ lw $a2, 0xc($s2) -/* C72418 80240F98 8E470010 */ lw $a3, 0x10($s2) -/* C7241C 80240F9C 0C01242D */ jal func_800490B4 -/* C72420 80240FA0 0220282D */ daddu $a1, $s1, $zero -/* C72424 80240FA4 10400025 */ beqz $v0, .L8024103C -/* C72428 80240FA8 0000202D */ daddu $a0, $zero, $zero -/* C7242C 80240FAC 0200282D */ daddu $a1, $s0, $zero -/* C72430 80240FB0 0000302D */ daddu $a2, $zero, $zero -/* C72434 80240FB4 2412000C */ addiu $s2, $zero, 0xc -/* C72438 80240FB8 860300A8 */ lh $v1, 0xa8($s0) -/* C7243C 80240FBC 3C013F80 */ lui $at, 0x3f80 -/* C72440 80240FC0 44810000 */ mtc1 $at, $f0 -/* C72444 80240FC4 3C014000 */ lui $at, 0x4000 -/* C72448 80240FC8 44811000 */ mtc1 $at, $f2 -/* C7244C 80240FCC 3C01C1A0 */ lui $at, 0xc1a0 -/* C72450 80240FD0 44812000 */ mtc1 $at, $f4 -/* C72454 80240FD4 44834000 */ mtc1 $v1, $f8 -/* C72458 80240FD8 00000000 */ nop -/* C7245C 80240FDC 46804220 */ cvt.s.w $f8, $f8 -/* C72460 80240FE0 44074000 */ mfc1 $a3, $f8 -/* C72464 80240FE4 27A20038 */ addiu $v0, $sp, 0x38 -/* C72468 80240FE8 AFB2001C */ sw $s2, 0x1c($sp) -/* C7246C 80240FEC AFA20020 */ sw $v0, 0x20($sp) -/* C72470 80240FF0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C72474 80240FF4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C72478 80240FF8 0C01BFA4 */ jal fx_emote -/* C7247C 80240FFC E7A40018 */ swc1 $f4, 0x18($sp) -/* C72480 80241000 0200202D */ daddu $a0, $s0, $zero -/* C72484 80241004 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C72488 80241008 C480003C */ lwc1 $f0, 0x3c($a0) -/* C7248C 8024100C 3C060020 */ lui $a2, 0x20 -/* C72490 80241010 0C012530 */ jal func_800494C0 -/* C72494 80241014 E4800064 */ swc1 $f0, 0x64($a0) -/* C72498 80241018 8E220018 */ lw $v0, 0x18($s1) -/* C7249C 8024101C 9442002A */ lhu $v0, 0x2a($v0) -/* C724A0 80241020 30420001 */ andi $v0, $v0, 1 -/* C724A4 80241024 10400003 */ beqz $v0, .L80241034 -/* C724A8 80241028 2402000A */ addiu $v0, $zero, 0xa -/* C724AC 8024102C 0809047D */ j .L802411F4 -/* C724B0 80241030 AE620070 */ sw $v0, 0x70($s3) -.L80241034: -/* C724B4 80241034 0809047D */ j .L802411F4 -/* C724B8 80241038 AE720070 */ sw $s2, 0x70($s3) -.L8024103C: -/* C724BC 8024103C 8E620074 */ lw $v0, 0x74($s3) -/* C724C0 80241040 2442FFFF */ addiu $v0, $v0, -1 -.L80241044: -/* C724C4 80241044 08090414 */ j .L80241050 -/* C724C8 80241048 AE620074 */ sw $v0, 0x74($s3) -.L8024104C: -/* C724CC 8024104C AE220090 */ sw $v0, 0x90($s1) -.L80241050: -/* C724D0 80241050 8E2300D0 */ lw $v1, 0xd0($s1) -/* C724D4 80241054 C6000040 */ lwc1 $f0, 0x40($s0) -/* C724D8 80241058 C4620000 */ lwc1 $f2, ($v1) -/* C724DC 8024105C 468010A0 */ cvt.s.w $f2, $f2 -/* C724E0 80241060 C4640008 */ lwc1 $f4, 8($v1) -/* C724E4 80241064 46802120 */ cvt.s.w $f4, $f4 -/* C724E8 80241068 E7A00010 */ swc1 $f0, 0x10($sp) -/* C724EC 8024106C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C724F0 80241070 44051000 */ mfc1 $a1, $f2 -/* C724F4 80241074 C440000C */ lwc1 $f0, 0xc($v0) -/* C724F8 80241078 46800020 */ cvt.s.w $f0, $f0 -/* C724FC 8024107C E7A00014 */ swc1 $f0, 0x14($sp) -/* C72500 80241080 8E2200D0 */ lw $v0, 0xd0($s1) -/* C72504 80241084 44062000 */ mfc1 $a2, $f4 -/* C72508 80241088 C4400010 */ lwc1 $f0, 0x10($v0) -/* C7250C 8024108C 46800020 */ cvt.s.w $f0, $f0 -/* C72510 80241090 E7A00018 */ swc1 $f0, 0x18($sp) -/* C72514 80241094 8C640018 */ lw $a0, 0x18($v1) -/* C72518 80241098 0C0123F5 */ jal is_point_within_region -/* C7251C 8024109C 8E070038 */ lw $a3, 0x38($s0) -/* C72520 802410A0 1040001A */ beqz $v0, .L8024110C -/* C72524 802410A4 00000000 */ nop -/* C72528 802410A8 8E060038 */ lw $a2, 0x38($s0) -/* C7252C 802410AC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C72530 802410B0 8E070040 */ lw $a3, 0x40($s0) -/* C72534 802410B4 C44C0000 */ lwc1 $f12, ($v0) -/* C72538 802410B8 46806320 */ cvt.s.w $f12, $f12 -/* C7253C 802410BC C44E0008 */ lwc1 $f14, 8($v0) -/* C72540 802410C0 0C00A7B5 */ jal dist2D -/* C72544 802410C4 468073A0 */ cvt.s.w $f14, $f14 -/* C72548 802410C8 C6020018 */ lwc1 $f2, 0x18($s0) -/* C7254C 802410CC 4600103C */ c.lt.s $f2, $f0 -/* C72550 802410D0 00000000 */ nop -/* C72554 802410D4 4500000D */ bc1f .L8024110C -/* C72558 802410D8 E7A00034 */ swc1 $f0, 0x34($sp) -/* C7255C 802410DC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C72560 802410E0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C72564 802410E4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C72568 802410E8 C4480000 */ lwc1 $f8, ($v0) -/* C7256C 802410EC 46804220 */ cvt.s.w $f8, $f8 -/* C72570 802410F0 44064000 */ mfc1 $a2, $f8 -/* C72574 802410F4 C4480008 */ lwc1 $f8, 8($v0) -/* C72578 802410F8 46804220 */ cvt.s.w $f8, $f8 -/* C7257C 802410FC 44074000 */ mfc1 $a3, $f8 -/* C72580 80241100 0C00A720 */ jal atan2 -/* C72584 80241104 24140001 */ addiu $s4, $zero, 1 -/* C72588 80241108 E600000C */ swc1 $f0, 0xc($s0) -.L8024110C: -/* C7258C 8024110C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C72590 80241110 8C43000C */ lw $v1, 0xc($v0) -/* C72594 80241114 8C420010 */ lw $v0, 0x10($v0) -/* C72598 80241118 00621825 */ or $v1, $v1, $v0 -/* C7259C 8024111C 00741825 */ or $v1, $v1, $s4 -/* C725A0 80241120 10600008 */ beqz $v1, .L80241144 -/* C725A4 80241124 00000000 */ nop -/* C725A8 80241128 8602008C */ lh $v0, 0x8c($s0) -/* C725AC 8024112C 14400031 */ bnez $v0, .L802411F4 -/* C725B0 80241130 00000000 */ nop -/* C725B4 80241134 8E050018 */ lw $a1, 0x18($s0) -/* C725B8 80241138 8E06000C */ lw $a2, 0xc($s0) -/* C725BC 8024113C 0C00EA95 */ jal npc_move_heading -/* C725C0 80241140 0200202D */ daddu $a0, $s0, $zero -.L80241144: -/* C725C4 80241144 C600003C */ lwc1 $f0, 0x3c($s0) -/* C725C8 80241148 3C014059 */ lui $at, 0x4059 -/* C725CC 8024114C 44811800 */ mtc1 $at, $f3 -/* C725D0 80241150 44801000 */ mtc1 $zero, $f2 -/* C725D4 80241154 46000021 */ cvt.d.s $f0, $f0 -/* C725D8 80241158 46220002 */ mul.d $f0, $f0, $f2 -/* C725DC 8024115C 00000000 */ nop -/* C725E0 80241160 4620020D */ trunc.w.d $f8, $f0 -/* C725E4 80241164 E628007C */ swc1 $f8, 0x7c($s1) -/* C725E8 80241168 8E420004 */ lw $v0, 4($s2) -/* C725EC 8024116C 18400021 */ blez $v0, .L802411F4 -/* C725F0 80241170 00000000 */ nop -/* C725F4 80241174 8602008E */ lh $v0, 0x8e($s0) -/* C725F8 80241178 9603008E */ lhu $v1, 0x8e($s0) -/* C725FC 8024117C 18400005 */ blez $v0, .L80241194 -/* C72600 80241180 2462FFFF */ addiu $v0, $v1, -1 -/* C72604 80241184 A602008E */ sh $v0, 0x8e($s0) -/* C72608 80241188 00021400 */ sll $v0, $v0, 0x10 -/* C7260C 8024118C 1C400019 */ bgtz $v0, .L802411F4 -/* C72610 80241190 00000000 */ nop -.L80241194: -/* C72614 80241194 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C72618 80241198 24020002 */ addiu $v0, $zero, 2 -/* C7261C 8024119C 0C00A67F */ jal rand_int -/* C72620 802411A0 AE620070 */ sw $v0, 0x70($s3) -/* C72624 802411A4 3C035555 */ lui $v1, 0x5555 -/* C72628 802411A8 34635556 */ ori $v1, $v1, 0x5556 -/* C7262C 802411AC 00430018 */ mult $v0, $v1 -/* C72630 802411B0 000227C3 */ sra $a0, $v0, 0x1f -/* C72634 802411B4 00004010 */ mfhi $t0 -/* C72638 802411B8 01042023 */ subu $a0, $t0, $a0 -/* C7263C 802411BC 00041840 */ sll $v1, $a0, 1 -/* C72640 802411C0 00641821 */ addu $v1, $v1, $a0 -/* C72644 802411C4 00431023 */ subu $v0, $v0, $v1 -/* C72648 802411C8 24430002 */ addiu $v1, $v0, 2 -/* C7264C 802411CC AE630074 */ sw $v1, 0x74($s3) -/* C72650 802411D0 8E42002C */ lw $v0, 0x2c($s2) -/* C72654 802411D4 58400007 */ blezl $v0, .L802411F4 -/* C72658 802411D8 AE600070 */ sw $zero, 0x70($s3) -/* C7265C 802411DC 8E420008 */ lw $v0, 8($s2) -/* C72660 802411E0 18400003 */ blez $v0, .L802411F0 -/* C72664 802411E4 28620003 */ slti $v0, $v1, 3 -/* C72668 802411E8 10400002 */ beqz $v0, .L802411F4 -/* C7266C 802411EC 00000000 */ nop -.L802411F0: -/* C72670 802411F0 AE600070 */ sw $zero, 0x70($s3) -.L802411F4: -/* C72674 802411F4 8FBF0058 */ lw $ra, 0x58($sp) -/* C72678 802411F8 8FB50054 */ lw $s5, 0x54($sp) -/* C7267C 802411FC 8FB40050 */ lw $s4, 0x50($sp) -/* C72680 80241200 8FB3004C */ lw $s3, 0x4c($sp) -/* C72684 80241204 8FB20048 */ lw $s2, 0x48($sp) -/* C72688 80241208 8FB10044 */ lw $s1, 0x44($sp) -/* C7268C 8024120C 8FB00040 */ lw $s0, 0x40($sp) -/* C72690 80241210 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* C72694 80241214 D7B80070 */ ldc1 $f24, 0x70($sp) -/* C72698 80241218 D7B60068 */ ldc1 $f22, 0x68($sp) -/* C7269C 8024121C D7B40060 */ ldc1 $f20, 0x60($sp) -/* C726A0 80241220 03E00008 */ jr $ra -/* C726A4 80241224 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_802412E8_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_802412E8_C71480.s deleted file mode 100644 index 9a84799a88..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_802412E8_C71480.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412E8_C72768 -/* C72768 802412E8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C7276C 802412EC AFB3004C */ sw $s3, 0x4c($sp) -/* C72770 802412F0 0080982D */ daddu $s3, $a0, $zero -/* C72774 802412F4 AFBF0054 */ sw $ra, 0x54($sp) -/* C72778 802412F8 AFB40050 */ sw $s4, 0x50($sp) -/* C7277C 802412FC AFB20048 */ sw $s2, 0x48($sp) -/* C72780 80241300 AFB10044 */ sw $s1, 0x44($sp) -/* C72784 80241304 AFB00040 */ sw $s0, 0x40($sp) -/* C72788 80241308 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C7278C 8024130C F7B80068 */ sdc1 $f24, 0x68($sp) -/* C72790 80241310 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C72794 80241314 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C72798 80241318 8E710148 */ lw $s1, 0x148($s3) -/* C7279C 8024131C 00A0902D */ daddu $s2, $a1, $zero -/* C727A0 80241320 86240008 */ lh $a0, 8($s1) -/* C727A4 80241324 0C00EABB */ jal get_npc_unsafe -/* C727A8 80241328 00C0A02D */ daddu $s4, $a2, $zero -/* C727AC 8024132C 0040802D */ daddu $s0, $v0, $zero -/* C727B0 80241330 C6200078 */ lwc1 $f0, 0x78($s1) -/* C727B4 80241334 46800020 */ cvt.s.w $f0, $f0 -/* C727B8 80241338 46000021 */ cvt.d.s $f0, $f0 -/* C727BC 8024133C 3C014059 */ lui $at, 0x4059 -/* C727C0 80241340 44811800 */ mtc1 $at, $f3 -/* C727C4 80241344 44801000 */ mtc1 $zero, $f2 -/* C727C8 80241348 8602008E */ lh $v0, 0x8e($s0) -/* C727CC 8024134C 9603008E */ lhu $v1, 0x8e($s0) -/* C727D0 80241350 46220003 */ div.d $f0, $f0, $f2 -/* C727D4 80241354 46200620 */ cvt.s.d $f24, $f0 -/* C727D8 80241358 C6200088 */ lwc1 $f0, 0x88($s1) -/* C727DC 8024135C 46800020 */ cvt.s.w $f0, $f0 -/* C727E0 80241360 46000021 */ cvt.d.s $f0, $f0 -/* C727E4 80241364 46220003 */ div.d $f0, $f0, $f2 -/* C727E8 80241368 46200020 */ cvt.s.d $f0, $f0 -/* C727EC 8024136C 18400003 */ blez $v0, .L8024137C -/* C727F0 80241370 4600C680 */ add.s $f26, $f24, $f0 -/* C727F4 80241374 2462FFFF */ addiu $v0, $v1, -1 -/* C727F8 80241378 A602008E */ sh $v0, 0x8e($s0) -.L8024137C: -/* C727FC 8024137C 8E220070 */ lw $v0, 0x70($s1) -/* C72800 80241380 18400034 */ blez $v0, .L80241454 -/* C72804 80241384 00000000 */ nop -/* C72808 80241388 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C7280C 8024138C 46806320 */ cvt.s.w $f12, $f12 -/* C72810 80241390 44820000 */ mtc1 $v0, $f0 -/* C72814 80241394 00000000 */ nop -/* C72818 80241398 46800020 */ cvt.s.w $f0, $f0 -/* C7281C 8024139C 46000021 */ cvt.d.s $f0, $f0 -/* C72820 802413A0 46220003 */ div.d $f0, $f0, $f2 -/* C72824 802413A4 0C00A8BB */ jal sin_deg -/* C72828 802413A8 462005A0 */ cvt.s.d $f22, $f0 -/* C7282C 802413AC 8E020000 */ lw $v0, ($s0) -/* C72830 802413B0 30420008 */ andi $v0, $v0, 8 -/* C72834 802413B4 10400003 */ beqz $v0, .L802413C4 -/* C72838 802413B8 46000506 */ mov.s $f20, $f0 -/* C7283C 802413BC 08090501 */ j .L80241404 -/* C72840 802413C0 0000102D */ daddu $v0, $zero, $zero -.L802413C4: -/* C72844 802413C4 27A50028 */ addiu $a1, $sp, 0x28 -/* C72848 802413C8 27A6002C */ addiu $a2, $sp, 0x2c -/* C7284C 802413CC C6000038 */ lwc1 $f0, 0x38($s0) -/* C72850 802413D0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C72854 802413D4 C6040040 */ lwc1 $f4, 0x40($s0) -/* C72858 802413D8 3C01447A */ lui $at, 0x447a -/* C7285C 802413DC 44813000 */ mtc1 $at, $f6 -/* C72860 802413E0 27A20034 */ addiu $v0, $sp, 0x34 -/* C72864 802413E4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C72868 802413E8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C7286C 802413EC E7A40030 */ swc1 $f4, 0x30($sp) -/* C72870 802413F0 E7A60034 */ swc1 $f6, 0x34($sp) -/* C72874 802413F4 AFA20010 */ sw $v0, 0x10($sp) -/* C72878 802413F8 8E040080 */ lw $a0, 0x80($s0) -/* C7287C 802413FC 0C0372DF */ jal func_800DCB7C -/* C72880 80241400 27A70030 */ addiu $a3, $sp, 0x30 -.L80241404: -/* C72884 80241404 10400007 */ beqz $v0, .L80241424 -/* C72888 80241408 00000000 */ nop -/* C7288C 8024140C 4616A082 */ mul.s $f2, $f20, $f22 -/* C72890 80241410 00000000 */ nop -/* C72894 80241414 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C72898 80241418 46180000 */ add.s $f0, $f0, $f24 -/* C7289C 8024141C 0809050C */ j .L80241430 -/* C728A0 80241420 46020000 */ add.s $f0, $f0, $f2 -.L80241424: -/* C728A4 80241424 4616A002 */ mul.s $f0, $f20, $f22 -/* C728A8 80241428 00000000 */ nop -/* C728AC 8024142C 4600D000 */ add.s $f0, $f26, $f0 -.L80241430: -/* C728B0 80241430 E600003C */ swc1 $f0, 0x3c($s0) -/* C728B4 80241434 8E220074 */ lw $v0, 0x74($s1) -/* C728B8 80241438 2442000A */ addiu $v0, $v0, 0xa -/* C728BC 8024143C 44826000 */ mtc1 $v0, $f12 -/* C728C0 80241440 00000000 */ nop -/* C728C4 80241444 0C00A6C9 */ jal clamp_angle -/* C728C8 80241448 46806320 */ cvt.s.w $f12, $f12 -/* C728CC 8024144C 4600020D */ trunc.w.s $f8, $f0 -/* C728D0 80241450 E6280074 */ swc1 $f8, 0x74($s1) -.L80241454: -/* C728D4 80241454 8E220090 */ lw $v0, 0x90($s1) -/* C728D8 80241458 1C400040 */ bgtz $v0, .L8024155C -/* C728DC 8024145C 2442FFFF */ addiu $v0, $v0, -1 -/* C728E0 80241460 860200A8 */ lh $v0, 0xa8($s0) -/* C728E4 80241464 C600003C */ lwc1 $f0, 0x3c($s0) -/* C728E8 80241468 44821000 */ mtc1 $v0, $f2 -/* C728EC 8024146C 00000000 */ nop -/* C728F0 80241470 468010A0 */ cvt.s.w $f2, $f2 -/* C728F4 80241474 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C728F8 80241478 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C728FC 8024147C 46020000 */ add.s $f0, $f0, $f2 -/* C72900 80241480 3C014024 */ lui $at, 0x4024 -/* C72904 80241484 44812800 */ mtc1 $at, $f5 -/* C72908 80241488 44802000 */ mtc1 $zero, $f4 -/* C7290C 8024148C C442002C */ lwc1 $f2, 0x2c($v0) -/* C72910 80241490 46000021 */ cvt.d.s $f0, $f0 -/* C72914 80241494 46240000 */ add.d $f0, $f0, $f4 -/* C72918 80241498 460010A1 */ cvt.d.s $f2, $f2 -/* C7291C 8024149C 4620103C */ c.lt.d $f2, $f0 -/* C72920 802414A0 00000000 */ nop -/* C72924 802414A4 4500002E */ bc1f .L80241560 -/* C72928 802414A8 0280202D */ daddu $a0, $s4, $zero -/* C7292C 802414AC 24020001 */ addiu $v0, $zero, 1 -/* C72930 802414B0 AFA20010 */ sw $v0, 0x10($sp) -/* C72934 802414B4 8E460024 */ lw $a2, 0x24($s2) -/* C72938 802414B8 8E470028 */ lw $a3, 0x28($s2) -/* C7293C 802414BC 0C01242D */ jal func_800490B4 -/* C72940 802414C0 0220282D */ daddu $a1, $s1, $zero -/* C72944 802414C4 10400026 */ beqz $v0, .L80241560 -/* C72948 802414C8 0000202D */ daddu $a0, $zero, $zero -/* C7294C 802414CC 0200282D */ daddu $a1, $s0, $zero -/* C72950 802414D0 0000302D */ daddu $a2, $zero, $zero -/* C72954 802414D4 2412000C */ addiu $s2, $zero, 0xc -/* C72958 802414D8 860300A8 */ lh $v1, 0xa8($s0) -/* C7295C 802414DC 3C013F80 */ lui $at, 0x3f80 -/* C72960 802414E0 44810000 */ mtc1 $at, $f0 -/* C72964 802414E4 3C014000 */ lui $at, 0x4000 -/* C72968 802414E8 44811000 */ mtc1 $at, $f2 -/* C7296C 802414EC 3C01C1A0 */ lui $at, 0xc1a0 -/* C72970 802414F0 44812000 */ mtc1 $at, $f4 -/* C72974 802414F4 44834000 */ mtc1 $v1, $f8 -/* C72978 802414F8 00000000 */ nop -/* C7297C 802414FC 46804220 */ cvt.s.w $f8, $f8 -/* C72980 80241500 44074000 */ mfc1 $a3, $f8 -/* C72984 80241504 27A20038 */ addiu $v0, $sp, 0x38 -/* C72988 80241508 AFB2001C */ sw $s2, 0x1c($sp) -/* C7298C 8024150C AFA20020 */ sw $v0, 0x20($sp) -/* C72990 80241510 E7A00010 */ swc1 $f0, 0x10($sp) -/* C72994 80241514 E7A20014 */ swc1 $f2, 0x14($sp) -/* C72998 80241518 0C01BFA4 */ jal fx_emote -/* C7299C 8024151C E7A40018 */ swc1 $f4, 0x18($sp) -/* C729A0 80241520 0200202D */ daddu $a0, $s0, $zero -/* C729A4 80241524 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C729A8 80241528 C480003C */ lwc1 $f0, 0x3c($a0) -/* C729AC 8024152C 3C060020 */ lui $a2, 0x20 -/* C729B0 80241530 0C012530 */ jal func_800494C0 -/* C729B4 80241534 E4800064 */ swc1 $f0, 0x64($a0) -/* C729B8 80241538 8E220018 */ lw $v0, 0x18($s1) -/* C729BC 8024153C 9442002A */ lhu $v0, 0x2a($v0) -/* C729C0 80241540 30420001 */ andi $v0, $v0, 1 -/* C729C4 80241544 10400003 */ beqz $v0, .L80241554 -/* C729C8 80241548 2402000A */ addiu $v0, $zero, 0xa -/* C729CC 8024154C 0809057F */ j .L802415FC -/* C729D0 80241550 AE620070 */ sw $v0, 0x70($s3) -.L80241554: -/* C729D4 80241554 0809057F */ j .L802415FC -/* C729D8 80241558 AE720070 */ sw $s2, 0x70($s3) -.L8024155C: -/* C729DC 8024155C AE220090 */ sw $v0, 0x90($s1) -.L80241560: -/* C729E0 80241560 8602008C */ lh $v0, 0x8c($s0) -/* C729E4 80241564 14400025 */ bnez $v0, .L802415FC -/* C729E8 80241568 00000000 */ nop -/* C729EC 8024156C 8602008E */ lh $v0, 0x8e($s0) -/* C729F0 80241570 1C400022 */ bgtz $v0, .L802415FC -/* C729F4 80241574 00000000 */ nop -/* C729F8 80241578 8E620074 */ lw $v0, 0x74($s3) -/* C729FC 8024157C 2442FFFF */ addiu $v0, $v0, -1 -/* C72A00 80241580 1840001D */ blez $v0, .L802415F8 -/* C72A04 80241584 AE620074 */ sw $v0, 0x74($s3) -/* C72A08 80241588 8E220018 */ lw $v0, 0x18($s1) -/* C72A0C 8024158C 9442002A */ lhu $v0, 0x2a($v0) -/* C72A10 80241590 30420010 */ andi $v0, $v0, 0x10 -/* C72A14 80241594 14400007 */ bnez $v0, .L802415B4 -/* C72A18 80241598 00000000 */ nop -/* C72A1C 8024159C C600000C */ lwc1 $f0, 0xc($s0) -/* C72A20 802415A0 3C014334 */ lui $at, 0x4334 -/* C72A24 802415A4 44816000 */ mtc1 $at, $f12 -/* C72A28 802415A8 0C00A6C9 */ jal clamp_angle -/* C72A2C 802415AC 460C0300 */ add.s $f12, $f0, $f12 -/* C72A30 802415B0 E600000C */ swc1 $f0, 0xc($s0) -.L802415B4: -/* C72A34 802415B4 0C00A67F */ jal rand_int -/* C72A38 802415B8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C72A3C 802415BC 3C032E8B */ lui $v1, 0x2e8b -/* C72A40 802415C0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* C72A44 802415C4 00430018 */ mult $v0, $v1 -/* C72A48 802415C8 00021FC3 */ sra $v1, $v0, 0x1f -/* C72A4C 802415CC 00004010 */ mfhi $t0 -/* C72A50 802415D0 00082043 */ sra $a0, $t0, 1 -/* C72A54 802415D4 00832023 */ subu $a0, $a0, $v1 -/* C72A58 802415D8 00041840 */ sll $v1, $a0, 1 -/* C72A5C 802415DC 00641821 */ addu $v1, $v1, $a0 -/* C72A60 802415E0 00031880 */ sll $v1, $v1, 2 -/* C72A64 802415E4 00641823 */ subu $v1, $v1, $a0 -/* C72A68 802415E8 00431023 */ subu $v0, $v0, $v1 -/* C72A6C 802415EC 24420005 */ addiu $v0, $v0, 5 -/* C72A70 802415F0 0809057F */ j .L802415FC -/* C72A74 802415F4 A602008E */ sh $v0, 0x8e($s0) -.L802415F8: -/* C72A78 802415F8 AE600070 */ sw $zero, 0x70($s3) -.L802415FC: -/* C72A7C 802415FC 8FBF0054 */ lw $ra, 0x54($sp) -/* C72A80 80241600 8FB40050 */ lw $s4, 0x50($sp) -/* C72A84 80241604 8FB3004C */ lw $s3, 0x4c($sp) -/* C72A88 80241608 8FB20048 */ lw $s2, 0x48($sp) -/* C72A8C 8024160C 8FB10044 */ lw $s1, 0x44($sp) -/* C72A90 80241610 8FB00040 */ lw $s0, 0x40($sp) -/* C72A94 80241614 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C72A98 80241618 D7B80068 */ ldc1 $f24, 0x68($sp) -/* C72A9C 8024161C D7B60060 */ ldc1 $f22, 0x60($sp) -/* C72AA0 80241620 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C72AA4 80241624 03E00008 */ jr $ra -/* C72AA8 80241628 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_8024162C_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_8024162C_C71480.s deleted file mode 100644 index 04dce5e146..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_8024162C_C71480.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024162C_C72AAC -/* C72AAC 8024162C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C72AB0 80241630 AFB20018 */ sw $s2, 0x18($sp) -/* C72AB4 80241634 0080902D */ daddu $s2, $a0, $zero -/* C72AB8 80241638 AFBF001C */ sw $ra, 0x1c($sp) -/* C72ABC 8024163C AFB10014 */ sw $s1, 0x14($sp) -/* C72AC0 80241640 AFB00010 */ sw $s0, 0x10($sp) -/* C72AC4 80241644 8E510148 */ lw $s1, 0x148($s2) -/* C72AC8 80241648 0C00EABB */ jal get_npc_unsafe -/* C72ACC 8024164C 86240008 */ lh $a0, 8($s1) -/* C72AD0 80241650 0040802D */ daddu $s0, $v0, $zero -/* C72AD4 80241654 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C72AD8 80241658 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C72ADC 8024165C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C72AE0 80241660 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C72AE4 80241664 A600008E */ sh $zero, 0x8e($s0) -/* C72AE8 80241668 8C460028 */ lw $a2, 0x28($v0) -/* C72AEC 8024166C 0C00A720 */ jal atan2 -/* C72AF0 80241670 8C470030 */ lw $a3, 0x30($v0) -/* C72AF4 80241674 E600000C */ swc1 $f0, 0xc($s0) -/* C72AF8 80241678 8E2200CC */ lw $v0, 0xcc($s1) -/* C72AFC 8024167C 8C420020 */ lw $v0, 0x20($v0) -/* C72B00 80241680 AE020028 */ sw $v0, 0x28($s0) -/* C72B04 80241684 2402000B */ addiu $v0, $zero, 0xb -/* C72B08 80241688 AE420070 */ sw $v0, 0x70($s2) -/* C72B0C 8024168C 8FBF001C */ lw $ra, 0x1c($sp) -/* C72B10 80241690 8FB20018 */ lw $s2, 0x18($sp) -/* C72B14 80241694 8FB10014 */ lw $s1, 0x14($sp) -/* C72B18 80241698 8FB00010 */ lw $s0, 0x10($sp) -/* C72B1C 8024169C 03E00008 */ jr $ra -/* C72B20 802416A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_802418A8_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_802418A8_C71480.s deleted file mode 100644 index c810e22290..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_802418A8_C71480.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418A8_C72D28 -/* C72D28 802418A8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C72D2C 802418AC AFB20030 */ sw $s2, 0x30($sp) -/* C72D30 802418B0 0080902D */ daddu $s2, $a0, $zero -/* C72D34 802418B4 AFBF0038 */ sw $ra, 0x38($sp) -/* C72D38 802418B8 AFB30034 */ sw $s3, 0x34($sp) -/* C72D3C 802418BC AFB1002C */ sw $s1, 0x2c($sp) -/* C72D40 802418C0 AFB00028 */ sw $s0, 0x28($sp) -/* C72D44 802418C4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* C72D48 802418C8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* C72D4C 802418CC 8E510148 */ lw $s1, 0x148($s2) -/* C72D50 802418D0 86240008 */ lh $a0, 8($s1) -/* C72D54 802418D4 0C00EABB */ jal get_npc_unsafe -/* C72D58 802418D8 00A0982D */ daddu $s3, $a1, $zero -/* C72D5C 802418DC 0040802D */ daddu $s0, $v0, $zero -/* C72D60 802418E0 0200202D */ daddu $a0, $s0, $zero -/* C72D64 802418E4 C6220088 */ lwc1 $f2, 0x88($s1) -/* C72D68 802418E8 468010A0 */ cvt.s.w $f2, $f2 -/* C72D6C 802418EC 460010A1 */ cvt.d.s $f2, $f2 -/* C72D70 802418F0 C604001C */ lwc1 $f4, 0x1c($s0) -/* C72D74 802418F4 C6000014 */ lwc1 $f0, 0x14($s0) -/* C72D78 802418F8 8E050018 */ lw $a1, 0x18($s0) -/* C72D7C 802418FC 46002100 */ add.s $f4, $f4, $f0 -/* C72D80 80241900 8E06000C */ lw $a2, 0xc($s0) -/* C72D84 80241904 C6200078 */ lwc1 $f0, 0x78($s1) -/* C72D88 80241908 46800020 */ cvt.s.w $f0, $f0 -/* C72D8C 8024190C E604001C */ swc1 $f4, 0x1c($s0) -/* C72D90 80241910 3C014059 */ lui $at, 0x4059 -/* C72D94 80241914 44812800 */ mtc1 $at, $f5 -/* C72D98 80241918 44802000 */ mtc1 $zero, $f4 -/* C72D9C 8024191C 46000021 */ cvt.d.s $f0, $f0 -/* C72DA0 80241920 46240003 */ div.d $f0, $f0, $f4 -/* C72DA4 80241924 46200520 */ cvt.s.d $f20, $f0 -/* C72DA8 80241928 46241083 */ div.d $f2, $f2, $f4 -/* C72DAC 8024192C 0C00EA95 */ jal npc_move_heading -/* C72DB0 80241930 462015A0 */ cvt.s.d $f22, $f2 -/* C72DB4 80241934 C604001C */ lwc1 $f4, 0x1c($s0) -/* C72DB8 80241938 44801000 */ mtc1 $zero, $f2 -/* C72DBC 8024193C 44801800 */ mtc1 $zero, $f3 -/* C72DC0 80241940 46002021 */ cvt.d.s $f0, $f4 -/* C72DC4 80241944 4620103E */ c.le.d $f2, $f0 -/* C72DC8 80241948 00000000 */ nop -/* C72DCC 8024194C 45000030 */ bc1f .L80241A10 -/* C72DD0 80241950 00000000 */ nop -/* C72DD4 80241954 C600003C */ lwc1 $f0, 0x3c($s0) -/* C72DD8 80241958 46040000 */ add.s $f0, $f0, $f4 -/* C72DDC 8024195C E600003C */ swc1 $f0, 0x3c($s0) -/* C72DE0 80241960 8E2200CC */ lw $v0, 0xcc($s1) -/* C72DE4 80241964 8C420024 */ lw $v0, 0x24($v0) -/* C72DE8 80241968 AE020028 */ sw $v0, 0x28($s0) -/* C72DEC 8024196C A2200007 */ sb $zero, 7($s1) -/* C72DF0 80241970 8E020000 */ lw $v0, ($s0) -/* C72DF4 80241974 30420008 */ andi $v0, $v0, 8 -/* C72DF8 80241978 14400011 */ bnez $v0, .L802419C0 -/* C72DFC 8024197C 0000102D */ daddu $v0, $zero, $zero -/* C72E00 80241980 27A50018 */ addiu $a1, $sp, 0x18 -/* C72E04 80241984 27A6001C */ addiu $a2, $sp, 0x1c -/* C72E08 80241988 C6000038 */ lwc1 $f0, 0x38($s0) -/* C72E0C 8024198C C602003C */ lwc1 $f2, 0x3c($s0) -/* C72E10 80241990 C6040040 */ lwc1 $f4, 0x40($s0) -/* C72E14 80241994 3C01447A */ lui $at, 0x447a -/* C72E18 80241998 44813000 */ mtc1 $at, $f6 -/* C72E1C 8024199C 27A20024 */ addiu $v0, $sp, 0x24 -/* C72E20 802419A0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C72E24 802419A4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C72E28 802419A8 E7A40020 */ swc1 $f4, 0x20($sp) -/* C72E2C 802419AC E7A60024 */ swc1 $f6, 0x24($sp) -/* C72E30 802419B0 AFA20010 */ sw $v0, 0x10($sp) -/* C72E34 802419B4 8E040080 */ lw $a0, 0x80($s0) -/* C72E38 802419B8 0C0372DF */ jal func_800DCB7C -/* C72E3C 802419BC 27A70020 */ addiu $a3, $sp, 0x20 -.L802419C0: -/* C72E40 802419C0 1040000B */ beqz $v0, .L802419F0 -/* C72E44 802419C4 00000000 */ nop -/* C72E48 802419C8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C72E4C 802419CC 46140080 */ add.s $f2, $f0, $f20 -/* C72E50 802419D0 C600003C */ lwc1 $f0, 0x3c($s0) -/* C72E54 802419D4 4600103E */ c.le.s $f2, $f0 -/* C72E58 802419D8 00000000 */ nop -/* C72E5C 802419DC 4500008D */ bc1f .L80241C14 -/* C72E60 802419E0 00000000 */ nop -/* C72E64 802419E4 E602003C */ swc1 $f2, 0x3c($s0) -/* C72E68 802419E8 08090705 */ j .L80241C14 -/* C72E6C 802419EC AE400070 */ sw $zero, 0x70($s2) -.L802419F0: -/* C72E70 802419F0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C72E74 802419F4 C6000064 */ lwc1 $f0, 0x64($s0) -/* C72E78 802419F8 4602003E */ c.le.s $f0, $f2 -/* C72E7C 802419FC 00000000 */ nop -/* C72E80 80241A00 45030084 */ bc1tl .L80241C14 -/* C72E84 80241A04 AE400070 */ sw $zero, 0x70($s2) -/* C72E88 80241A08 08090705 */ j .L80241C14 -/* C72E8C 80241A0C 00000000 */ nop -.L80241A10: -/* C72E90 80241A10 4622003C */ c.lt.d $f0, $f2 -/* C72E94 80241A14 00000000 */ nop -/* C72E98 80241A18 4500007E */ bc1f .L80241C14 -/* C72E9C 80241A1C 00000000 */ nop -/* C72EA0 80241A20 9602008E */ lhu $v0, 0x8e($s0) -/* C72EA4 80241A24 24420001 */ addiu $v0, $v0, 1 -/* C72EA8 80241A28 A602008E */ sh $v0, 0x8e($s0) -/* C72EAC 80241A2C 00021400 */ sll $v0, $v0, 0x10 -/* C72EB0 80241A30 8E630020 */ lw $v1, 0x20($s3) -/* C72EB4 80241A34 00021403 */ sra $v0, $v0, 0x10 -/* C72EB8 80241A38 0043102A */ slt $v0, $v0, $v1 -/* C72EBC 80241A3C 14400026 */ bnez $v0, .L80241AD8 -/* C72EC0 80241A40 00000000 */ nop -/* C72EC4 80241A44 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C72EC8 80241A48 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C72ECC 80241A4C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C72ED0 80241A50 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C72ED4 80241A54 A600008E */ sh $zero, 0x8e($s0) -/* C72ED8 80241A58 8C460028 */ lw $a2, 0x28($v0) -/* C72EDC 80241A5C 0C00A720 */ jal atan2 -/* C72EE0 80241A60 8C470030 */ lw $a3, 0x30($v0) -/* C72EE4 80241A64 46000506 */ mov.s $f20, $f0 -/* C72EE8 80241A68 C60C000C */ lwc1 $f12, 0xc($s0) -/* C72EEC 80241A6C 0C00A70A */ jal get_clamped_angle_diff -/* C72EF0 80241A70 4600A386 */ mov.s $f14, $f20 -/* C72EF4 80241A74 46000086 */ mov.s $f2, $f0 -/* C72EF8 80241A78 8E62001C */ lw $v0, 0x1c($s3) -/* C72EFC 80241A7C 46001005 */ abs.s $f0, $f2 -/* C72F00 80241A80 44822000 */ mtc1 $v0, $f4 -/* C72F04 80241A84 00000000 */ nop -/* C72F08 80241A88 46802120 */ cvt.s.w $f4, $f4 -/* C72F0C 80241A8C 4600203C */ c.lt.s $f4, $f0 -/* C72F10 80241A90 00000000 */ nop -/* C72F14 80241A94 4500000D */ bc1f .L80241ACC -/* C72F18 80241A98 00000000 */ nop -/* C72F1C 80241A9C 44800000 */ mtc1 $zero, $f0 -/* C72F20 80241AA0 C614000C */ lwc1 $f20, 0xc($s0) -/* C72F24 80241AA4 4600103C */ c.lt.s $f2, $f0 -/* C72F28 80241AA8 00000000 */ nop -/* C72F2C 80241AAC 45000006 */ bc1f .L80241AC8 -/* C72F30 80241AB0 00021023 */ negu $v0, $v0 -/* C72F34 80241AB4 44820000 */ mtc1 $v0, $f0 -/* C72F38 80241AB8 00000000 */ nop -/* C72F3C 80241ABC 46800020 */ cvt.s.w $f0, $f0 -/* C72F40 80241AC0 080906B3 */ j .L80241ACC -/* C72F44 80241AC4 4600A500 */ add.s $f20, $f20, $f0 -.L80241AC8: -/* C72F48 80241AC8 4604A500 */ add.s $f20, $f20, $f4 -.L80241ACC: -/* C72F4C 80241ACC 0C00A6C9 */ jal clamp_angle -/* C72F50 80241AD0 4600A306 */ mov.s $f12, $f20 -/* C72F54 80241AD4 E600000C */ swc1 $f0, 0xc($s0) -.L80241AD8: -/* C72F58 80241AD8 8E020000 */ lw $v0, ($s0) -/* C72F5C 80241ADC 30420008 */ andi $v0, $v0, 8 -/* C72F60 80241AE0 1040000A */ beqz $v0, .L80241B0C -/* C72F64 80241AE4 27A50018 */ addiu $a1, $sp, 0x18 -/* C72F68 80241AE8 C602003C */ lwc1 $f2, 0x3c($s0) -/* C72F6C 80241AEC C600001C */ lwc1 $f0, 0x1c($s0) -/* C72F70 80241AF0 46001080 */ add.s $f2, $f2, $f0 -/* C72F74 80241AF4 4616103C */ c.lt.s $f2, $f22 -/* C72F78 80241AF8 00000000 */ nop -/* C72F7C 80241AFC 45020045 */ bc1fl .L80241C14 -/* C72F80 80241B00 E602003C */ swc1 $f2, 0x3c($s0) -/* C72F84 80241B04 08090704 */ j .L80241C10 -/* C72F88 80241B08 E616003C */ swc1 $f22, 0x3c($s0) -.L80241B0C: -/* C72F8C 80241B0C C6000038 */ lwc1 $f0, 0x38($s0) -/* C72F90 80241B10 27A6001C */ addiu $a2, $sp, 0x1c -/* C72F94 80241B14 E7A00018 */ swc1 $f0, 0x18($sp) -/* C72F98 80241B18 860200A8 */ lh $v0, 0xa8($s0) -/* C72F9C 80241B1C C600001C */ lwc1 $f0, 0x1c($s0) -/* C72FA0 80241B20 C604003C */ lwc1 $f4, 0x3c($s0) -/* C72FA4 80241B24 44821000 */ mtc1 $v0, $f2 -/* C72FA8 80241B28 00000000 */ nop -/* C72FAC 80241B2C 468010A0 */ cvt.s.w $f2, $f2 -/* C72FB0 80241B30 46000005 */ abs.s $f0, $f0 -/* C72FB4 80241B34 46020000 */ add.s $f0, $f0, $f2 -/* C72FB8 80241B38 C6060040 */ lwc1 $f6, 0x40($s0) -/* C72FBC 80241B3C 27A20024 */ addiu $v0, $sp, 0x24 -/* C72FC0 80241B40 46022100 */ add.s $f4, $f4, $f2 -/* C72FC4 80241B44 3C014024 */ lui $at, 0x4024 -/* C72FC8 80241B48 44811800 */ mtc1 $at, $f3 -/* C72FCC 80241B4C 44801000 */ mtc1 $zero, $f2 -/* C72FD0 80241B50 46000021 */ cvt.d.s $f0, $f0 -/* C72FD4 80241B54 46220000 */ add.d $f0, $f0, $f2 -/* C72FD8 80241B58 E7A60020 */ swc1 $f6, 0x20($sp) -/* C72FDC 80241B5C E7A4001C */ swc1 $f4, 0x1c($sp) -/* C72FE0 80241B60 46200020 */ cvt.s.d $f0, $f0 -/* C72FE4 80241B64 E7A00024 */ swc1 $f0, 0x24($sp) -/* C72FE8 80241B68 AFA20010 */ sw $v0, 0x10($sp) -/* C72FEC 80241B6C 8E040080 */ lw $a0, 0x80($s0) -/* C72FF0 80241B70 0C0372DF */ jal func_800DCB7C -/* C72FF4 80241B74 27A70020 */ addiu $a3, $sp, 0x20 -/* C72FF8 80241B78 10400015 */ beqz $v0, .L80241BD0 -/* C72FFC 80241B7C 00000000 */ nop -/* C73000 80241B80 860200A8 */ lh $v0, 0xa8($s0) -/* C73004 80241B84 C604001C */ lwc1 $f4, 0x1c($s0) -/* C73008 80241B88 44820000 */ mtc1 $v0, $f0 -/* C7300C 80241B8C 00000000 */ nop -/* C73010 80241B90 46800020 */ cvt.s.w $f0, $f0 -/* C73014 80241B94 46002085 */ abs.s $f2, $f4 -/* C73018 80241B98 46020000 */ add.s $f0, $f0, $f2 -/* C7301C 80241B9C C7A20024 */ lwc1 $f2, 0x24($sp) -/* C73020 80241BA0 4600103E */ c.le.s $f2, $f0 -/* C73024 80241BA4 00000000 */ nop -/* C73028 80241BA8 45000005 */ bc1f .L80241BC0 -/* C7302C 80241BAC 00000000 */ nop -/* C73030 80241BB0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C73034 80241BB4 AE00001C */ sw $zero, 0x1c($s0) -/* C73038 80241BB8 08090705 */ j .L80241C14 -/* C7303C 80241BBC E600003C */ swc1 $f0, 0x3c($s0) -.L80241BC0: -/* C73040 80241BC0 C600003C */ lwc1 $f0, 0x3c($s0) -/* C73044 80241BC4 46040000 */ add.s $f0, $f0, $f4 -/* C73048 80241BC8 08090705 */ j .L80241C14 -/* C7304C 80241BCC E600003C */ swc1 $f0, 0x3c($s0) -.L80241BD0: -/* C73050 80241BD0 C606003C */ lwc1 $f6, 0x3c($s0) -/* C73054 80241BD4 860200A8 */ lh $v0, 0xa8($s0) -/* C73058 80241BD8 46163081 */ sub.s $f2, $f6, $f22 -/* C7305C 80241BDC 44820000 */ mtc1 $v0, $f0 -/* C73060 80241BE0 00000000 */ nop -/* C73064 80241BE4 46800020 */ cvt.s.w $f0, $f0 -/* C73068 80241BE8 46001080 */ add.s $f2, $f2, $f0 -/* C7306C 80241BEC C604001C */ lwc1 $f4, 0x1c($s0) -/* C73070 80241BF0 46002005 */ abs.s $f0, $f4 -/* C73074 80241BF4 4602003C */ c.lt.s $f0, $f2 -/* C73078 80241BF8 00000000 */ nop -/* C7307C 80241BFC 45020005 */ bc1fl .L80241C14 -/* C73080 80241C00 AE00001C */ sw $zero, 0x1c($s0) -/* C73084 80241C04 46043000 */ add.s $f0, $f6, $f4 -/* C73088 80241C08 08090705 */ j .L80241C14 -/* C7308C 80241C0C E600003C */ swc1 $f0, 0x3c($s0) -.L80241C10: -/* C73090 80241C10 AE00001C */ sw $zero, 0x1c($s0) -.L80241C14: -/* C73094 80241C14 8FBF0038 */ lw $ra, 0x38($sp) -/* C73098 80241C18 8FB30034 */ lw $s3, 0x34($sp) -/* C7309C 80241C1C 8FB20030 */ lw $s2, 0x30($sp) -/* C730A0 80241C20 8FB1002C */ lw $s1, 0x2c($sp) -/* C730A4 80241C24 8FB00028 */ lw $s0, 0x28($sp) -/* C730A8 80241C28 D7B60048 */ ldc1 $f22, 0x48($sp) -/* C730AC 80241C2C D7B40040 */ ldc1 $f20, 0x40($sp) -/* C730B0 80241C30 03E00008 */ jr $ra -/* C730B4 80241C34 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_80241D5C_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_80241D5C_C71480.s deleted file mode 100644 index 996a93c76f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_80241D5C_C71480.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D5C_C731DC -/* C731DC 80241D5C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C731E0 80241D60 AFB40040 */ sw $s4, 0x40($sp) -/* C731E4 80241D64 0080A02D */ daddu $s4, $a0, $zero -/* C731E8 80241D68 AFBF0048 */ sw $ra, 0x48($sp) -/* C731EC 80241D6C AFB50044 */ sw $s5, 0x44($sp) -/* C731F0 80241D70 AFB3003C */ sw $s3, 0x3c($sp) -/* C731F4 80241D74 AFB20038 */ sw $s2, 0x38($sp) -/* C731F8 80241D78 AFB10034 */ sw $s1, 0x34($sp) -/* C731FC 80241D7C AFB00030 */ sw $s0, 0x30($sp) -/* C73200 80241D80 8E920148 */ lw $s2, 0x148($s4) -/* C73204 80241D84 86440008 */ lh $a0, 8($s2) -/* C73208 80241D88 8E90000C */ lw $s0, 0xc($s4) -/* C7320C 80241D8C 0C00EABB */ jal get_npc_unsafe -/* C73210 80241D90 00A0882D */ daddu $s1, $a1, $zero -/* C73214 80241D94 0280202D */ daddu $a0, $s4, $zero -/* C73218 80241D98 8E050000 */ lw $a1, ($s0) -/* C7321C 80241D9C 0C0B1EAF */ jal get_variable -/* C73220 80241DA0 0040A82D */ daddu $s5, $v0, $zero -/* C73224 80241DA4 AFA00010 */ sw $zero, 0x10($sp) -/* C73228 80241DA8 8E4300D0 */ lw $v1, 0xd0($s2) -/* C7322C 80241DAC 8C630030 */ lw $v1, 0x30($v1) -/* C73230 80241DB0 AFA30014 */ sw $v1, 0x14($sp) -/* C73234 80241DB4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C73238 80241DB8 8C63001C */ lw $v1, 0x1c($v1) -/* C7323C 80241DBC AFA30018 */ sw $v1, 0x18($sp) -/* C73240 80241DC0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C73244 80241DC4 8C630024 */ lw $v1, 0x24($v1) -/* C73248 80241DC8 AFA3001C */ sw $v1, 0x1c($sp) -/* C7324C 80241DCC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C73250 80241DD0 8C630028 */ lw $v1, 0x28($v1) -/* C73254 80241DD4 27B30010 */ addiu $s3, $sp, 0x10 -/* C73258 80241DD8 AFA30020 */ sw $v1, 0x20($sp) -/* C7325C 80241DDC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C73260 80241DE0 3C0142F0 */ lui $at, 0x42f0 -/* C73264 80241DE4 44810000 */ mtc1 $at, $f0 -/* C73268 80241DE8 8C63002C */ lw $v1, 0x2c($v1) -/* C7326C 80241DEC 0040802D */ daddu $s0, $v0, $zero -/* C73270 80241DF0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C73274 80241DF4 A7A0002C */ sh $zero, 0x2c($sp) -/* C73278 80241DF8 12200006 */ beqz $s1, .L80241E14 -/* C7327C 80241DFC AFA30024 */ sw $v1, 0x24($sp) -/* C73280 80241E00 02A0202D */ daddu $a0, $s5, $zero -/* C73284 80241E04 0240282D */ daddu $a1, $s2, $zero -/* C73288 80241E08 0280302D */ daddu $a2, $s4, $zero -/* C7328C 80241E0C 0C09070E */ jal func_80241C38 -/* C73290 80241E10 0200382D */ daddu $a3, $s0, $zero -.L80241E14: -/* C73294 80241E14 2402FFFE */ addiu $v0, $zero, -2 -/* C73298 80241E18 A2A200AB */ sb $v0, 0xab($s5) -/* C7329C 80241E1C 8E4300B0 */ lw $v1, 0xb0($s2) -/* C732A0 80241E20 30620004 */ andi $v0, $v1, 4 -/* C732A4 80241E24 10400007 */ beqz $v0, .L80241E44 -/* C732A8 80241E28 00000000 */ nop -/* C732AC 80241E2C 824200B4 */ lb $v0, 0xb4($s2) -/* C732B0 80241E30 1440003C */ bnez $v0, .L80241F24 -/* C732B4 80241E34 0000102D */ daddu $v0, $zero, $zero -/* C732B8 80241E38 2402FFFB */ addiu $v0, $zero, -5 -/* C732BC 80241E3C 00621024 */ and $v0, $v1, $v0 -/* C732C0 80241E40 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241E44: -/* C732C4 80241E44 8E830070 */ lw $v1, 0x70($s4) -/* C732C8 80241E48 2C62000F */ sltiu $v0, $v1, 0xf -/* C732CC 80241E4C 10400034 */ beqz $v0, .L80241F20 -/* C732D0 80241E50 00031080 */ sll $v0, $v1, 2 -/* C732D4 80241E54 3C018024 */ lui $at, 0x8024 -/* C732D8 80241E58 00220821 */ addu $at, $at, $v0 -/* C732DC 80241E5C 8C2255F8 */ lw $v0, 0x55f8($at) -/* C732E0 80241E60 00400008 */ jr $v0 -/* C732E4 80241E64 00000000 */ nop -/* C732E8 80241E68 0280202D */ daddu $a0, $s4, $zero -/* C732EC 80241E6C 0200282D */ daddu $a1, $s0, $zero -/* C732F0 80241E70 0C090294 */ jal func_80240A50 -/* C732F4 80241E74 0260302D */ daddu $a2, $s3, $zero -/* C732F8 80241E78 0280202D */ daddu $a0, $s4, $zero -/* C732FC 80241E7C 0200282D */ daddu $a1, $s0, $zero -/* C73300 80241E80 0C090300 */ jal func_80240C00 -/* C73304 80241E84 0260302D */ daddu $a2, $s3, $zero -/* C73308 80241E88 080907C9 */ j .L80241F24 -/* C7330C 80241E8C 0000102D */ daddu $v0, $zero, $zero -/* C73310 80241E90 0280202D */ daddu $a0, $s4, $zero -/* C73314 80241E94 0200282D */ daddu $a1, $s0, $zero -/* C73318 80241E98 0C09048A */ jal func_80241228 -/* C7331C 80241E9C 0260302D */ daddu $a2, $s3, $zero -/* C73320 80241EA0 0280202D */ daddu $a0, $s4, $zero -/* C73324 80241EA4 0200282D */ daddu $a1, $s0, $zero -/* C73328 80241EA8 0C0904BA */ jal func_802412E8 -/* C7332C 80241EAC 0260302D */ daddu $a2, $s3, $zero -/* C73330 80241EB0 080907C9 */ j .L80241F24 -/* C73334 80241EB4 0000102D */ daddu $v0, $zero, $zero -/* C73338 80241EB8 0280202D */ daddu $a0, $s4, $zero -/* C7333C 80241EBC 0200282D */ daddu $a1, $s0, $zero -/* C73340 80241EC0 0C09058B */ jal func_8024162C -/* C73344 80241EC4 0260302D */ daddu $a2, $s3, $zero -/* C73348 80241EC8 0280202D */ daddu $a0, $s4, $zero -/* C7334C 80241ECC 0200282D */ daddu $a1, $s0, $zero -/* C73350 80241ED0 0C0905A9 */ jal func_802416A4 -/* C73354 80241ED4 0260302D */ daddu $a2, $s3, $zero -/* C73358 80241ED8 080907C9 */ j .L80241F24 -/* C7335C 80241EDC 0000102D */ daddu $v0, $zero, $zero -/* C73360 80241EE0 0280202D */ daddu $a0, $s4, $zero -/* C73364 80241EE4 0200282D */ daddu $a1, $s0, $zero -/* C73368 80241EE8 0C0905C4 */ jal func_80241710 -/* C7336C 80241EEC 0260302D */ daddu $a2, $s3, $zero -/* C73370 80241EF0 080907C9 */ j .L80241F24 -/* C73374 80241EF4 0000102D */ daddu $v0, $zero, $zero -/* C73378 80241EF8 0280202D */ daddu $a0, $s4, $zero -/* C7337C 80241EFC 0200282D */ daddu $a1, $s0, $zero -/* C73380 80241F00 0C090611 */ jal func_80241844 -/* C73384 80241F04 0260302D */ daddu $a2, $s3, $zero -/* C73388 80241F08 080907C9 */ j .L80241F24 -/* C7338C 80241F0C 0000102D */ daddu $v0, $zero, $zero -/* C73390 80241F10 0280202D */ daddu $a0, $s4, $zero -/* C73394 80241F14 0200282D */ daddu $a1, $s0, $zero -/* C73398 80241F18 0C09062A */ jal func_802418A8 -/* C7339C 80241F1C 0260302D */ daddu $a2, $s3, $zero -.L80241F20: -/* C733A0 80241F20 0000102D */ daddu $v0, $zero, $zero -.L80241F24: -/* C733A4 80241F24 8FBF0048 */ lw $ra, 0x48($sp) -/* C733A8 80241F28 8FB50044 */ lw $s5, 0x44($sp) -/* C733AC 80241F2C 8FB40040 */ lw $s4, 0x40($sp) -/* C733B0 80241F30 8FB3003C */ lw $s3, 0x3c($sp) -/* C733B4 80241F34 8FB20038 */ lw $s2, 0x38($sp) -/* C733B8 80241F38 8FB10034 */ lw $s1, 0x34($sp) -/* C733BC 80241F3C 8FB00030 */ lw $s0, 0x30($sp) -/* C733C0 80241F40 03E00008 */ jr $ra -/* C733C4 80241F44 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_80241F48_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_80241F48_C71480.s deleted file mode 100644 index 9e641c5a1b..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_80241F48_C71480.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F48_C733C8 -/* C733C8 80241F48 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C733CC 80241F4C AFB3001C */ sw $s3, 0x1c($sp) -/* C733D0 80241F50 0080982D */ daddu $s3, $a0, $zero -/* C733D4 80241F54 AFBF0020 */ sw $ra, 0x20($sp) -/* C733D8 80241F58 AFB20018 */ sw $s2, 0x18($sp) -/* C733DC 80241F5C AFB10014 */ sw $s1, 0x14($sp) -/* C733E0 80241F60 AFB00010 */ sw $s0, 0x10($sp) -/* C733E4 80241F64 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C733E8 80241F68 8E710148 */ lw $s1, 0x148($s3) -/* C733EC 80241F6C 86240008 */ lh $a0, 8($s1) -/* C733F0 80241F70 0C00EABB */ jal get_npc_unsafe -/* C733F4 80241F74 00A0802D */ daddu $s0, $a1, $zero -/* C733F8 80241F78 8E040020 */ lw $a0, 0x20($s0) -/* C733FC 80241F7C 0040902D */ daddu $s2, $v0, $zero -/* C73400 80241F80 00041FC2 */ srl $v1, $a0, 0x1f -/* C73404 80241F84 00832021 */ addu $a0, $a0, $v1 -/* C73408 80241F88 00042043 */ sra $a0, $a0, 1 -/* C7340C 80241F8C 0C00A67F */ jal rand_int -/* C73410 80241F90 24840001 */ addiu $a0, $a0, 1 -/* C73414 80241F94 8E030020 */ lw $v1, 0x20($s0) -/* C73418 80241F98 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C7341C 80241F9C 000327C2 */ srl $a0, $v1, 0x1f -/* C73420 80241FA0 00641821 */ addu $v1, $v1, $a0 -/* C73424 80241FA4 00031843 */ sra $v1, $v1, 1 -/* C73428 80241FA8 00621821 */ addu $v1, $v1, $v0 -/* C7342C 80241FAC A643008E */ sh $v1, 0x8e($s2) -/* C73430 80241FB0 8E2200CC */ lw $v0, 0xcc($s1) -/* C73434 80241FB4 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C73438 80241FB8 8C42000C */ lw $v0, 0xc($v0) -/* C7343C 80241FBC AE420028 */ sw $v0, 0x28($s2) -/* C73440 80241FC0 C6000018 */ lwc1 $f0, 0x18($s0) -/* C73444 80241FC4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C73448 80241FC8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C7344C 80241FCC E6400018 */ swc1 $f0, 0x18($s2) -/* C73450 80241FD0 8C460028 */ lw $a2, 0x28($v0) -/* C73454 80241FD4 0C00A720 */ jal atan2 -/* C73458 80241FD8 8C470030 */ lw $a3, 0x30($v0) -/* C7345C 80241FDC 46000506 */ mov.s $f20, $f0 -/* C73460 80241FE0 C64C000C */ lwc1 $f12, 0xc($s2) -/* C73464 80241FE4 0C00A70A */ jal get_clamped_angle_diff -/* C73468 80241FE8 4600A386 */ mov.s $f14, $f20 -/* C7346C 80241FEC 46000086 */ mov.s $f2, $f0 -/* C73470 80241FF0 8E02001C */ lw $v0, 0x1c($s0) -/* C73474 80241FF4 46001005 */ abs.s $f0, $f2 -/* C73478 80241FF8 44822000 */ mtc1 $v0, $f4 -/* C7347C 80241FFC 00000000 */ nop -/* C73480 80242000 46802120 */ cvt.s.w $f4, $f4 -/* C73484 80242004 4600203C */ c.lt.s $f4, $f0 -/* C73488 80242008 00000000 */ nop -/* C7348C 8024200C 4500000D */ bc1f .L80242044 -/* C73490 80242010 00000000 */ nop -/* C73494 80242014 44800000 */ mtc1 $zero, $f0 -/* C73498 80242018 C654000C */ lwc1 $f20, 0xc($s2) -/* C7349C 8024201C 4600103C */ c.lt.s $f2, $f0 -/* C734A0 80242020 00000000 */ nop -/* C734A4 80242024 45000006 */ bc1f .L80242040 -/* C734A8 80242028 00021023 */ negu $v0, $v0 -/* C734AC 8024202C 44820000 */ mtc1 $v0, $f0 -/* C734B0 80242030 00000000 */ nop -/* C734B4 80242034 46800020 */ cvt.s.w $f0, $f0 -/* C734B8 80242038 08090811 */ j .L80242044 -/* C734BC 8024203C 4600A500 */ add.s $f20, $f20, $f0 -.L80242040: -/* C734C0 80242040 4604A500 */ add.s $f20, $f20, $f4 -.L80242044: -/* C734C4 80242044 0C00A6C9 */ jal clamp_angle -/* C734C8 80242048 4600A306 */ mov.s $f12, $f20 -/* C734CC 8024204C 2402000D */ addiu $v0, $zero, 0xd -/* C734D0 80242050 E640000C */ swc1 $f0, 0xc($s2) -/* C734D4 80242054 AE620070 */ sw $v0, 0x70($s3) -/* C734D8 80242058 8FBF0020 */ lw $ra, 0x20($sp) -/* C734DC 8024205C 8FB3001C */ lw $s3, 0x1c($sp) -/* C734E0 80242060 8FB20018 */ lw $s2, 0x18($sp) -/* C734E4 80242064 8FB10014 */ lw $s1, 0x14($sp) -/* C734E8 80242068 8FB00010 */ lw $s0, 0x10($sp) -/* C734EC 8024206C D7B40028 */ ldc1 $f20, 0x28($sp) -/* C734F0 80242070 03E00008 */ jr $ra -/* C734F4 80242074 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_80242078_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_80242078_C71480.s deleted file mode 100644 index ea2bd96e46..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_80242078_C71480.s +++ /dev/null @@ -1,172 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242078_C734F8 -/* C734F8 80242078 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C734FC 8024207C AFB3004C */ sw $s3, 0x4c($sp) -/* C73500 80242080 0080982D */ daddu $s3, $a0, $zero -/* C73504 80242084 AFBF0050 */ sw $ra, 0x50($sp) -/* C73508 80242088 AFB20048 */ sw $s2, 0x48($sp) -/* C7350C 8024208C AFB10044 */ sw $s1, 0x44($sp) -/* C73510 80242090 AFB00040 */ sw $s0, 0x40($sp) -/* C73514 80242094 8E720148 */ lw $s2, 0x148($s3) -/* C73518 80242098 00A0882D */ daddu $s1, $a1, $zero -/* C7351C 8024209C 86440008 */ lh $a0, 8($s2) -/* C73520 802420A0 0C00EABB */ jal get_npc_unsafe -/* C73524 802420A4 00C0802D */ daddu $s0, $a2, $zero -/* C73528 802420A8 0200202D */ daddu $a0, $s0, $zero -/* C7352C 802420AC 0240282D */ daddu $a1, $s2, $zero -/* C73530 802420B0 24030001 */ addiu $v1, $zero, 1 -/* C73534 802420B4 AFA30010 */ sw $v1, 0x10($sp) -/* C73538 802420B8 8E260024 */ lw $a2, 0x24($s1) -/* C7353C 802420BC 8E270028 */ lw $a3, 0x28($s1) -/* C73540 802420C0 0C01242D */ jal func_800490B4 -/* C73544 802420C4 0040802D */ daddu $s0, $v0, $zero -/* C73548 802420C8 14400020 */ bnez $v0, .L8024214C -/* C7354C 802420CC 24040002 */ addiu $a0, $zero, 2 -/* C73550 802420D0 0200282D */ daddu $a1, $s0, $zero -/* C73554 802420D4 0000302D */ daddu $a2, $zero, $zero -/* C73558 802420D8 860300A8 */ lh $v1, 0xa8($s0) -/* C7355C 802420DC 3C013F80 */ lui $at, 0x3f80 -/* C73560 802420E0 44810000 */ mtc1 $at, $f0 -/* C73564 802420E4 3C014000 */ lui $at, 0x4000 -/* C73568 802420E8 44811000 */ mtc1 $at, $f2 -/* C7356C 802420EC 3C01C1A0 */ lui $at, 0xc1a0 -/* C73570 802420F0 44812000 */ mtc1 $at, $f4 -/* C73574 802420F4 2402000F */ addiu $v0, $zero, 0xf -/* C73578 802420F8 AFA2001C */ sw $v0, 0x1c($sp) -/* C7357C 802420FC 44834000 */ mtc1 $v1, $f8 -/* C73580 80242100 00000000 */ nop -/* C73584 80242104 46804220 */ cvt.s.w $f8, $f8 -/* C73588 80242108 44074000 */ mfc1 $a3, $f8 -/* C7358C 8024210C 27A20028 */ addiu $v0, $sp, 0x28 -/* C73590 80242110 AFA20020 */ sw $v0, 0x20($sp) -/* C73594 80242114 E7A00010 */ swc1 $f0, 0x10($sp) -/* C73598 80242118 E7A20014 */ swc1 $f2, 0x14($sp) -/* C7359C 8024211C 0C01BFA4 */ jal fx_emote -/* C735A0 80242120 E7A40018 */ swc1 $f4, 0x18($sp) -/* C735A4 80242124 8E4200CC */ lw $v0, 0xcc($s2) -/* C735A8 80242128 8C430000 */ lw $v1, ($v0) -/* C735AC 8024212C 2402001E */ addiu $v0, $zero, 0x1e -/* C735B0 80242130 A602008E */ sh $v0, 0x8e($s0) -/* C735B4 80242134 24020014 */ addiu $v0, $zero, 0x14 -/* C735B8 80242138 AE030028 */ sw $v1, 0x28($s0) -/* C735BC 8024213C AE620070 */ sw $v0, 0x70($s3) -/* C735C0 80242140 2402001E */ addiu $v0, $zero, 0x1e -/* C735C4 80242144 080908B7 */ j .L802422DC -/* C735C8 80242148 AE420090 */ sw $v0, 0x90($s2) -.L8024214C: -/* C735CC 8024214C 8E050018 */ lw $a1, 0x18($s0) -/* C735D0 80242150 8E06000C */ lw $a2, 0xc($s0) -/* C735D4 80242154 0C00EA95 */ jal npc_move_heading -/* C735D8 80242158 0200202D */ daddu $a0, $s0, $zero -/* C735DC 8024215C 8E020000 */ lw $v0, ($s0) -/* C735E0 80242160 30420008 */ andi $v0, $v0, 8 -/* C735E4 80242164 14400028 */ bnez $v0, .L80242208 -/* C735E8 80242168 0000882D */ daddu $s1, $zero, $zero -/* C735EC 8024216C 27A5002C */ addiu $a1, $sp, 0x2c -/* C735F0 80242170 27A60030 */ addiu $a2, $sp, 0x30 -/* C735F4 80242174 860200A8 */ lh $v0, 0xa8($s0) -/* C735F8 80242178 C6000038 */ lwc1 $f0, 0x38($s0) -/* C735FC 8024217C 44821000 */ mtc1 $v0, $f2 -/* C73600 80242180 00000000 */ nop -/* C73604 80242184 468010A0 */ cvt.s.w $f2, $f2 -/* C73608 80242188 E7A0002C */ swc1 $f0, 0x2c($sp) -/* C7360C 8024218C 860200A8 */ lh $v0, 0xa8($s0) -/* C73610 80242190 C604003C */ lwc1 $f4, 0x3c($s0) -/* C73614 80242194 C6060040 */ lwc1 $f6, 0x40($s0) -/* C73618 80242198 44820000 */ mtc1 $v0, $f0 -/* C7361C 8024219C 00000000 */ nop -/* C73620 802421A0 46800021 */ cvt.d.w $f0, $f0 -/* C73624 802421A4 46022100 */ add.s $f4, $f4, $f2 -/* C73628 802421A8 3C014008 */ lui $at, 0x4008 -/* C7362C 802421AC 44811800 */ mtc1 $at, $f3 -/* C73630 802421B0 44801000 */ mtc1 $zero, $f2 -/* C73634 802421B4 27A20038 */ addiu $v0, $sp, 0x38 -/* C73638 802421B8 46220000 */ add.d $f0, $f0, $f2 -/* C7363C 802421BC E7A60034 */ swc1 $f6, 0x34($sp) -/* C73640 802421C0 E7A40030 */ swc1 $f4, 0x30($sp) -/* C73644 802421C4 46200020 */ cvt.s.d $f0, $f0 -/* C73648 802421C8 E7A00038 */ swc1 $f0, 0x38($sp) -/* C7364C 802421CC AFA20010 */ sw $v0, 0x10($sp) -/* C73650 802421D0 8E040080 */ lw $a0, 0x80($s0) -/* C73654 802421D4 0C0372DF */ jal func_800DCB7C -/* C73658 802421D8 27A70034 */ addiu $a3, $sp, 0x34 -/* C7365C 802421DC 1040000A */ beqz $v0, .L80242208 -/* C73660 802421E0 00000000 */ nop -/* C73664 802421E4 860200A8 */ lh $v0, 0xa8($s0) -/* C73668 802421E8 C7A20038 */ lwc1 $f2, 0x38($sp) -/* C7366C 802421EC 44820000 */ mtc1 $v0, $f0 -/* C73670 802421F0 00000000 */ nop -/* C73674 802421F4 46800020 */ cvt.s.w $f0, $f0 -/* C73678 802421F8 4600103C */ c.lt.s $f2, $f0 -/* C7367C 802421FC 00000000 */ nop -/* C73680 80242200 45030001 */ bc1tl .L80242208 -/* C73684 80242204 24110001 */ addiu $s1, $zero, 1 -.L80242208: -/* C73688 80242208 12200008 */ beqz $s1, .L8024222C -/* C7368C 8024220C 00000000 */ nop -/* C73690 80242210 C7A00030 */ lwc1 $f0, 0x30($sp) -/* C73694 80242214 3C013FF0 */ lui $at, 0x3ff0 -/* C73698 80242218 44811800 */ mtc1 $at, $f3 -/* C7369C 8024221C 44801000 */ mtc1 $zero, $f2 -/* C736A0 80242220 46000021 */ cvt.d.s $f0, $f0 -/* C736A4 80242224 080908AD */ j .L802422B4 -/* C736A8 80242228 46220000 */ add.d $f0, $f0, $f2 -.L8024222C: -/* C736AC 8024222C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C736B0 80242230 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C736B4 80242234 3C014018 */ lui $at, 0x4018 -/* C736B8 80242238 44811800 */ mtc1 $at, $f3 -/* C736BC 8024223C 44801000 */ mtc1 $zero, $f2 -/* C736C0 80242240 C440002C */ lwc1 $f0, 0x2c($v0) -/* C736C4 80242244 C604003C */ lwc1 $f4, 0x3c($s0) -/* C736C8 80242248 46000021 */ cvt.d.s $f0, $f0 -/* C736CC 8024224C 46220000 */ add.d $f0, $f0, $f2 -/* C736D0 80242250 46002121 */ cvt.d.s $f4, $f4 -/* C736D4 80242254 46202001 */ sub.d $f0, $f4, $f0 -/* C736D8 80242258 462001A0 */ cvt.s.d $f6, $f0 -/* C736DC 8024225C 44800000 */ mtc1 $zero, $f0 -/* C736E0 80242260 44800800 */ mtc1 $zero, $f1 -/* C736E4 80242264 460030A1 */ cvt.d.s $f2, $f6 -/* C736E8 80242268 4620103C */ c.lt.d $f2, $f0 -/* C736EC 8024226C 00000000 */ nop -/* C736F0 80242270 45010009 */ bc1t .L80242298 -/* C736F4 80242274 00000000 */ nop -/* C736F8 80242278 3C014010 */ lui $at, 0x4010 -/* C736FC 8024227C 44810800 */ mtc1 $at, $f1 -/* C73700 80242280 44800000 */ mtc1 $zero, $f0 -/* C73704 80242284 00000000 */ nop -/* C73708 80242288 4622003C */ c.lt.d $f0, $f2 -/* C7370C 8024228C 00000000 */ nop -/* C73710 80242290 4500000A */ bc1f .L802422BC -/* C73714 80242294 00000000 */ nop -.L80242298: -/* C73718 80242298 3C018024 */ lui $at, 0x8024 -/* C7371C 8024229C D4225638 */ ldc1 $f2, 0x5638($at) -/* C73720 802422A0 46003187 */ neg.s $f6, $f6 -/* C73724 802422A4 46003021 */ cvt.d.s $f0, $f6 -/* C73728 802422A8 46220002 */ mul.d $f0, $f0, $f2 -/* C7372C 802422AC 00000000 */ nop -/* C73730 802422B0 46202000 */ add.d $f0, $f4, $f0 -.L802422B4: -/* C73734 802422B4 46200020 */ cvt.s.d $f0, $f0 -/* C73738 802422B8 E600003C */ swc1 $f0, 0x3c($s0) -.L802422BC: -/* C7373C 802422BC 8602008E */ lh $v0, 0x8e($s0) -/* C73740 802422C0 9603008E */ lhu $v1, 0x8e($s0) -/* C73744 802422C4 18400003 */ blez $v0, .L802422D4 -/* C73748 802422C8 2462FFFF */ addiu $v0, $v1, -1 -/* C7374C 802422CC 080908B7 */ j .L802422DC -/* C73750 802422D0 A602008E */ sh $v0, 0x8e($s0) -.L802422D4: -/* C73754 802422D4 2402000C */ addiu $v0, $zero, 0xc -/* C73758 802422D8 AE620070 */ sw $v0, 0x70($s3) -.L802422DC: -/* C7375C 802422DC 8FBF0050 */ lw $ra, 0x50($sp) -/* C73760 802422E0 8FB3004C */ lw $s3, 0x4c($sp) -/* C73764 802422E4 8FB20048 */ lw $s2, 0x48($sp) -/* C73768 802422E8 8FB10044 */ lw $s1, 0x44($sp) -/* C7376C 802422EC 8FB00040 */ lw $s0, 0x40($sp) -/* C73770 802422F0 03E00008 */ jr $ra -/* C73774 802422F4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_802422F8_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_802422F8_C71480.s deleted file mode 100644 index 3956df9a6c..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_802422F8_C71480.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422F8_C73778 -/* C73778 802422F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7377C 802422FC AFB10014 */ sw $s1, 0x14($sp) -/* C73780 80242300 0080882D */ daddu $s1, $a0, $zero -/* C73784 80242304 AFBF0018 */ sw $ra, 0x18($sp) -/* C73788 80242308 AFB00010 */ sw $s0, 0x10($sp) -/* C7378C 8024230C 8E300148 */ lw $s0, 0x148($s1) -/* C73790 80242310 0C00EABB */ jal get_npc_unsafe -/* C73794 80242314 86040008 */ lh $a0, 8($s0) -/* C73798 80242318 0040182D */ daddu $v1, $v0, $zero -/* C7379C 8024231C 9462008E */ lhu $v0, 0x8e($v1) -/* C737A0 80242320 2442FFFF */ addiu $v0, $v0, -1 -/* C737A4 80242324 A462008E */ sh $v0, 0x8e($v1) -/* C737A8 80242328 00021400 */ sll $v0, $v0, 0x10 -/* C737AC 8024232C 1C400004 */ bgtz $v0, .L80242340 -/* C737B0 80242330 00000000 */ nop -/* C737B4 80242334 AE000074 */ sw $zero, 0x74($s0) -/* C737B8 80242338 A460008E */ sh $zero, 0x8e($v1) -/* C737BC 8024233C AE200070 */ sw $zero, 0x70($s1) -.L80242340: -/* C737C0 80242340 8FBF0018 */ lw $ra, 0x18($sp) -/* C737C4 80242344 8FB10014 */ lw $s1, 0x14($sp) -/* C737C8 80242348 8FB00010 */ lw $s0, 0x10($sp) -/* C737CC 8024234C 03E00008 */ jr $ra -/* C737D0 80242350 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_8024253C_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_8024253C_C71480.s deleted file mode 100644 index 7bf22e87d7..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_8024253C_C71480.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024253C_C739BC -/* C739BC 8024253C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C739C0 80242540 AFB10014 */ sw $s1, 0x14($sp) -/* C739C4 80242544 0080882D */ daddu $s1, $a0, $zero -/* C739C8 80242548 AFBF0018 */ sw $ra, 0x18($sp) -/* C739CC 8024254C AFB00010 */ sw $s0, 0x10($sp) -/* C739D0 80242550 8E300148 */ lw $s0, 0x148($s1) -/* C739D4 80242554 0C00EABB */ jal get_npc_unsafe -/* C739D8 80242558 86040008 */ lh $a0, 8($s0) -/* C739DC 8024255C 24030001 */ addiu $v1, $zero, 1 -/* C739E0 80242560 0040202D */ daddu $a0, $v0, $zero -/* C739E4 80242564 AE03006C */ sw $v1, 0x6c($s0) -/* C739E8 80242568 8482008C */ lh $v0, 0x8c($a0) -/* C739EC 8024256C 14400009 */ bnez $v0, .L80242594 -/* C739F0 80242570 24020002 */ addiu $v0, $zero, 2 -/* C739F4 80242574 96030072 */ lhu $v1, 0x72($s0) -/* C739F8 80242578 AE02006C */ sw $v0, 0x6c($s0) -/* C739FC 8024257C A483008E */ sh $v1, 0x8e($a0) -/* C73A00 80242580 8E0200CC */ lw $v0, 0xcc($s0) -/* C73A04 80242584 8C420020 */ lw $v0, 0x20($v0) -/* C73A08 80242588 AC820028 */ sw $v0, 0x28($a0) -/* C73A0C 8024258C 2402001F */ addiu $v0, $zero, 0x1f -/* C73A10 80242590 AE220070 */ sw $v0, 0x70($s1) -.L80242594: -/* C73A14 80242594 8FBF0018 */ lw $ra, 0x18($sp) -/* C73A18 80242598 8FB10014 */ lw $s1, 0x14($sp) -/* C73A1C 8024259C 8FB00010 */ lw $s0, 0x10($sp) -/* C73A20 802425A0 03E00008 */ jr $ra -/* C73A24 802425A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_802425A8_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_802425A8_C71480.s deleted file mode 100644 index 5dd365e38d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_802425A8_C71480.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425A8_C73A28 -/* C73A28 802425A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C73A2C 802425AC AFB10014 */ sw $s1, 0x14($sp) -/* C73A30 802425B0 0080882D */ daddu $s1, $a0, $zero -/* C73A34 802425B4 AFBF0018 */ sw $ra, 0x18($sp) -/* C73A38 802425B8 AFB00010 */ sw $s0, 0x10($sp) -/* C73A3C 802425BC 8E300148 */ lw $s0, 0x148($s1) -/* C73A40 802425C0 0C00EABB */ jal get_npc_unsafe -/* C73A44 802425C4 86040008 */ lh $a0, 8($s0) -/* C73A48 802425C8 0040202D */ daddu $a0, $v0, $zero -/* C73A4C 802425CC 9482008E */ lhu $v0, 0x8e($a0) -/* C73A50 802425D0 2442FFFF */ addiu $v0, $v0, -1 -/* C73A54 802425D4 A482008E */ sh $v0, 0x8e($a0) -/* C73A58 802425D8 00021400 */ sll $v0, $v0, 0x10 -/* C73A5C 802425DC 1C400009 */ bgtz $v0, .L80242604 -/* C73A60 802425E0 24020003 */ addiu $v0, $zero, 3 -/* C73A64 802425E4 96030076 */ lhu $v1, 0x76($s0) -/* C73A68 802425E8 AE02006C */ sw $v0, 0x6c($s0) -/* C73A6C 802425EC A483008E */ sh $v1, 0x8e($a0) -/* C73A70 802425F0 8E0200CC */ lw $v0, 0xcc($s0) -/* C73A74 802425F4 8C420024 */ lw $v0, 0x24($v0) -/* C73A78 802425F8 AC820028 */ sw $v0, 0x28($a0) -/* C73A7C 802425FC 24020020 */ addiu $v0, $zero, 0x20 -/* C73A80 80242600 AE220070 */ sw $v0, 0x70($s1) -.L80242604: -/* C73A84 80242604 8FBF0018 */ lw $ra, 0x18($sp) -/* C73A88 80242608 8FB10014 */ lw $s1, 0x14($sp) -/* C73A8C 8024260C 8FB00010 */ lw $s0, 0x10($sp) -/* C73A90 80242610 03E00008 */ jr $ra -/* C73A94 80242614 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_80242618_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_80242618_C71480.s deleted file mode 100644 index 9369525250..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_80242618_C71480.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242618_C73A98 -/* C73A98 80242618 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C73A9C 8024261C AFB10034 */ sw $s1, 0x34($sp) -/* C73AA0 80242620 0080882D */ daddu $s1, $a0, $zero -/* C73AA4 80242624 AFBF0038 */ sw $ra, 0x38($sp) -/* C73AA8 80242628 AFB00030 */ sw $s0, 0x30($sp) -/* C73AAC 8024262C 8E300148 */ lw $s0, 0x148($s1) -/* C73AB0 80242630 0C00EABB */ jal get_npc_unsafe -/* C73AB4 80242634 86040008 */ lh $a0, 8($s0) -/* C73AB8 80242638 0040282D */ daddu $a1, $v0, $zero -/* C73ABC 8024263C 94A2008E */ lhu $v0, 0x8e($a1) -/* C73AC0 80242640 2442FFFF */ addiu $v0, $v0, -1 -/* C73AC4 80242644 A4A2008E */ sh $v0, 0x8e($a1) -/* C73AC8 80242648 00021400 */ sll $v0, $v0, 0x10 -/* C73ACC 8024264C 1C400023 */ bgtz $v0, .L802426DC -/* C73AD0 80242650 24020004 */ addiu $v0, $zero, 4 -/* C73AD4 80242654 8E0300CC */ lw $v1, 0xcc($s0) -/* C73AD8 80242658 AE02006C */ sw $v0, 0x6c($s0) -/* C73ADC 8024265C 8C620000 */ lw $v0, ($v1) -/* C73AE0 80242660 ACA20028 */ sw $v0, 0x28($a1) -/* C73AE4 80242664 9602007A */ lhu $v0, 0x7a($s0) -/* C73AE8 80242668 A4A2008E */ sh $v0, 0x8e($a1) -/* C73AEC 8024266C 8E020078 */ lw $v0, 0x78($s0) -/* C73AF0 80242670 28420008 */ slti $v0, $v0, 8 -/* C73AF4 80242674 14400018 */ bnez $v0, .L802426D8 -/* C73AF8 80242678 24020021 */ addiu $v0, $zero, 0x21 -/* C73AFC 8024267C 24040003 */ addiu $a0, $zero, 3 -/* C73B00 80242680 27A30028 */ addiu $v1, $sp, 0x28 -/* C73B04 80242684 84A700A8 */ lh $a3, 0xa8($a1) -/* C73B08 80242688 3C013F80 */ lui $at, 0x3f80 -/* C73B0C 8024268C 44810000 */ mtc1 $at, $f0 -/* C73B10 80242690 3C014000 */ lui $at, 0x4000 -/* C73B14 80242694 44811000 */ mtc1 $at, $f2 -/* C73B18 80242698 3C01C1A0 */ lui $at, 0xc1a0 -/* C73B1C 8024269C 44812000 */ mtc1 $at, $f4 -/* C73B20 802426A0 44873000 */ mtc1 $a3, $f6 -/* C73B24 802426A4 00000000 */ nop -/* C73B28 802426A8 468031A0 */ cvt.s.w $f6, $f6 -/* C73B2C 802426AC E7A00010 */ swc1 $f0, 0x10($sp) -/* C73B30 802426B0 E7A20014 */ swc1 $f2, 0x14($sp) -/* C73B34 802426B4 E7A40018 */ swc1 $f4, 0x18($sp) -/* C73B38 802426B8 8E020078 */ lw $v0, 0x78($s0) -/* C73B3C 802426BC 44073000 */ mfc1 $a3, $f6 -/* C73B40 802426C0 0000302D */ daddu $a2, $zero, $zero -/* C73B44 802426C4 AFA30020 */ sw $v1, 0x20($sp) -/* C73B48 802426C8 2442FFFF */ addiu $v0, $v0, -1 -/* C73B4C 802426CC 0C01BFA4 */ jal fx_emote -/* C73B50 802426D0 AFA2001C */ sw $v0, 0x1c($sp) -/* C73B54 802426D4 24020021 */ addiu $v0, $zero, 0x21 -.L802426D8: -/* C73B58 802426D8 AE220070 */ sw $v0, 0x70($s1) -.L802426DC: -/* C73B5C 802426DC 8FBF0038 */ lw $ra, 0x38($sp) -/* C73B60 802426E0 8FB10034 */ lw $s1, 0x34($sp) -/* C73B64 802426E4 8FB00030 */ lw $s0, 0x30($sp) -/* C73B68 802426E8 03E00008 */ jr $ra -/* C73B6C 802426EC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_80242E78_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_80242E78_C71480.s deleted file mode 100644 index 5abbd7af75..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_80242E78_C71480.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E78_C742F8 -/* C742F8 80242E78 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C742FC 80242E7C AFB3003C */ sw $s3, 0x3c($sp) -/* C74300 80242E80 0080982D */ daddu $s3, $a0, $zero -/* C74304 80242E84 AFBF0040 */ sw $ra, 0x40($sp) -/* C74308 80242E88 AFB20038 */ sw $s2, 0x38($sp) -/* C7430C 80242E8C AFB10034 */ sw $s1, 0x34($sp) -/* C74310 80242E90 AFB00030 */ sw $s0, 0x30($sp) -/* C74314 80242E94 8E720148 */ lw $s2, 0x148($s3) -/* C74318 80242E98 00A0882D */ daddu $s1, $a1, $zero -/* C7431C 80242E9C 86440008 */ lh $a0, 8($s2) -/* C74320 80242EA0 0C00EABB */ jal get_npc_unsafe -/* C74324 80242EA4 00C0802D */ daddu $s0, $a2, $zero -/* C74328 80242EA8 0200202D */ daddu $a0, $s0, $zero -/* C7432C 80242EAC 0240282D */ daddu $a1, $s2, $zero -/* C74330 80242EB0 AFA00010 */ sw $zero, 0x10($sp) -/* C74334 80242EB4 8E26000C */ lw $a2, 0xc($s1) -/* C74338 80242EB8 8E270010 */ lw $a3, 0x10($s1) -/* C7433C 80242EBC 0C01242D */ jal func_800490B4 -/* C74340 80242EC0 0040882D */ daddu $s1, $v0, $zero -/* C74344 80242EC4 10400024 */ beqz $v0, .L80242F58 -/* C74348 80242EC8 0220202D */ daddu $a0, $s1, $zero -/* C7434C 80242ECC 24050322 */ addiu $a1, $zero, 0x322 -/* C74350 80242ED0 0C012530 */ jal func_800494C0 -/* C74354 80242ED4 0000302D */ daddu $a2, $zero, $zero -/* C74358 80242ED8 0000202D */ daddu $a0, $zero, $zero -/* C7435C 80242EDC 0220282D */ daddu $a1, $s1, $zero -/* C74360 80242EE0 0000302D */ daddu $a2, $zero, $zero -/* C74364 80242EE4 2410000A */ addiu $s0, $zero, 0xa -/* C74368 80242EE8 862300A8 */ lh $v1, 0xa8($s1) -/* C7436C 80242EEC 3C013F80 */ lui $at, 0x3f80 -/* C74370 80242EF0 44810000 */ mtc1 $at, $f0 -/* C74374 80242EF4 3C014000 */ lui $at, 0x4000 -/* C74378 80242EF8 44811000 */ mtc1 $at, $f2 -/* C7437C 80242EFC 3C01C1A0 */ lui $at, 0xc1a0 -/* C74380 80242F00 44812000 */ mtc1 $at, $f4 -/* C74384 80242F04 44833000 */ mtc1 $v1, $f6 -/* C74388 80242F08 00000000 */ nop -/* C7438C 80242F0C 468031A0 */ cvt.s.w $f6, $f6 -/* C74390 80242F10 44073000 */ mfc1 $a3, $f6 -/* C74394 80242F14 27A20028 */ addiu $v0, $sp, 0x28 -/* C74398 80242F18 AFB0001C */ sw $s0, 0x1c($sp) -/* C7439C 80242F1C AFA20020 */ sw $v0, 0x20($sp) -/* C743A0 80242F20 E7A00010 */ swc1 $f0, 0x10($sp) -/* C743A4 80242F24 E7A20014 */ swc1 $f2, 0x14($sp) -/* C743A8 80242F28 0C01BFA4 */ jal fx_emote -/* C743AC 80242F2C E7A40018 */ swc1 $f4, 0x18($sp) -/* C743B0 80242F30 0220202D */ daddu $a0, $s1, $zero -/* C743B4 80242F34 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C743B8 80242F38 0C012530 */ jal func_800494C0 -/* C743BC 80242F3C 3C060020 */ lui $a2, 0x20 -/* C743C0 80242F40 8E4200CC */ lw $v0, 0xcc($s2) -/* C743C4 80242F44 8C420020 */ lw $v0, 0x20($v0) -/* C743C8 80242F48 AE220028 */ sw $v0, 0x28($s1) -/* C743CC 80242F4C 9642008E */ lhu $v0, 0x8e($s2) -/* C743D0 80242F50 A622008E */ sh $v0, 0x8e($s1) -/* C743D4 80242F54 AE700070 */ sw $s0, 0x70($s3) -.L80242F58: -/* C743D8 80242F58 8FBF0040 */ lw $ra, 0x40($sp) -/* C743DC 80242F5C 8FB3003C */ lw $s3, 0x3c($sp) -/* C743E0 80242F60 8FB20038 */ lw $s2, 0x38($sp) -/* C743E4 80242F64 8FB10034 */ lw $s1, 0x34($sp) -/* C743E8 80242F68 8FB00030 */ lw $s0, 0x30($sp) -/* C743EC 80242F6C 03E00008 */ jr $ra -/* C743F0 80242F70 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_80242F74_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_80242F74_C71480.s deleted file mode 100644 index ae5c5f71eb..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_80242F74_C71480.s +++ /dev/null @@ -1,688 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F74_C743F4 -/* C743F4 80242F74 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C743F8 80242F78 AFBF0064 */ sw $ra, 0x64($sp) -/* C743FC 80242F7C AFBE0060 */ sw $fp, 0x60($sp) -/* C74400 80242F80 AFB7005C */ sw $s7, 0x5c($sp) -/* C74404 80242F84 AFB60058 */ sw $s6, 0x58($sp) -/* C74408 80242F88 AFB50054 */ sw $s5, 0x54($sp) -/* C7440C 80242F8C AFB40050 */ sw $s4, 0x50($sp) -/* C74410 80242F90 AFB3004C */ sw $s3, 0x4c($sp) -/* C74414 80242F94 AFB20048 */ sw $s2, 0x48($sp) -/* C74418 80242F98 AFB10044 */ sw $s1, 0x44($sp) -/* C7441C 80242F9C AFB00040 */ sw $s0, 0x40($sp) -/* C74420 80242FA0 F7B80078 */ sdc1 $f24, 0x78($sp) -/* C74424 80242FA4 F7B60070 */ sdc1 $f22, 0x70($sp) -/* C74428 80242FA8 F7B40068 */ sdc1 $f20, 0x68($sp) -/* C7442C 80242FAC AFA40080 */ sw $a0, 0x80($sp) -/* C74430 80242FB0 8C960148 */ lw $s6, 0x148($a0) -/* C74434 80242FB4 00C0902D */ daddu $s2, $a2, $zero -/* C74438 80242FB8 86C40008 */ lh $a0, 8($s6) -/* C7443C 80242FBC 0C00EABB */ jal get_npc_unsafe -/* C74440 80242FC0 0000B82D */ daddu $s7, $zero, $zero -/* C74444 80242FC4 0040882D */ daddu $s1, $v0, $zero -/* C74448 80242FC8 9622008E */ lhu $v0, 0x8e($s1) -/* C7444C 80242FCC 2442FFFF */ addiu $v0, $v0, -1 -/* C74450 80242FD0 A622008E */ sh $v0, 0x8e($s1) -/* C74454 80242FD4 00021400 */ sll $v0, $v0, 0x10 -/* C74458 80242FD8 8EC30090 */ lw $v1, 0x90($s6) -/* C7445C 80242FDC 00021403 */ sra $v0, $v0, 0x10 -/* C74460 80242FE0 0062182A */ slt $v1, $v1, $v0 -/* C74464 80242FE4 14600005 */ bnez $v1, .L80242FFC -/* C74468 80242FE8 02E0F02D */ daddu $fp, $s7, $zero -/* C7446C 80242FEC 8EC20000 */ lw $v0, ($s6) -/* C74470 80242FF0 3C031F10 */ lui $v1, 0x1f10 -/* C74474 80242FF4 00431025 */ or $v0, $v0, $v1 -/* C74478 80242FF8 AEC20000 */ sw $v0, ($s6) -.L80242FFC: -/* C7447C 80242FFC 8622008E */ lh $v0, 0x8e($s1) -/* C74480 80243000 1440025D */ bnez $v0, .L80243978 -/* C74484 80243004 00000000 */ nop -/* C74488 80243008 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C7448C 8024300C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C74490 80243010 0C00A6C9 */ jal clamp_angle -/* C74494 80243014 C44C00A8 */ lwc1 $f12, 0xa8($v0) -/* C74498 80243018 3C014334 */ lui $at, 0x4334 -/* C7449C 8024301C 44811000 */ mtc1 $at, $f2 -/* C744A0 80243020 00000000 */ nop -/* C744A4 80243024 4602003C */ c.lt.s $f0, $f2 -/* C744A8 80243028 00000000 */ nop -/* C744AC 8024302C 45000011 */ bc1f .L80243074 -/* C744B0 80243030 00000000 */ nop -/* C744B4 80243034 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C744B8 80243038 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C744BC 8024303C 3C0142B4 */ lui $at, 0x42b4 -/* C744C0 80243040 44816000 */ mtc1 $at, $f12 -/* C744C4 80243044 00031080 */ sll $v0, $v1, 2 -/* C744C8 80243048 00431021 */ addu $v0, $v0, $v1 -/* C744CC 8024304C 00021080 */ sll $v0, $v0, 2 -/* C744D0 80243050 00431023 */ subu $v0, $v0, $v1 -/* C744D4 80243054 000218C0 */ sll $v1, $v0, 3 -/* C744D8 80243058 00431021 */ addu $v0, $v0, $v1 -/* C744DC 8024305C 000210C0 */ sll $v0, $v0, 3 -/* C744E0 80243060 3C01800B */ lui $at, 0x800b -/* C744E4 80243064 00220821 */ addu $at, $at, $v0 -/* C744E8 80243068 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C744EC 8024306C 08090C2C */ j .L802430B0 -/* C744F0 80243070 460C0301 */ sub.s $f12, $f0, $f12 -.L80243074: -/* C744F4 80243074 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C744F8 80243078 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C744FC 8024307C 3C0142B4 */ lui $at, 0x42b4 -/* C74500 80243080 44816000 */ mtc1 $at, $f12 -/* C74504 80243084 00031080 */ sll $v0, $v1, 2 -/* C74508 80243088 00431021 */ addu $v0, $v0, $v1 -/* C7450C 8024308C 00021080 */ sll $v0, $v0, 2 -/* C74510 80243090 00431023 */ subu $v0, $v0, $v1 -/* C74514 80243094 000218C0 */ sll $v1, $v0, 3 -/* C74518 80243098 00431021 */ addu $v0, $v0, $v1 -/* C7451C 8024309C 000210C0 */ sll $v0, $v0, 3 -/* C74520 802430A0 3C01800B */ lui $at, 0x800b -/* C74524 802430A4 00220821 */ addu $at, $at, $v0 -/* C74528 802430A8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C7452C 802430AC 460C0300 */ add.s $f12, $f0, $f12 -.L802430B0: -/* C74530 802430B0 0C00A6C9 */ jal clamp_angle -/* C74534 802430B4 00000000 */ nop -/* C74538 802430B8 46000586 */ mov.s $f22, $f0 -/* C7453C 802430BC 3C014334 */ lui $at, 0x4334 -/* C74540 802430C0 44816000 */ mtc1 $at, $f12 -/* C74544 802430C4 0C00A6C9 */ jal clamp_angle -/* C74548 802430C8 460CB300 */ add.s $f12, $f22, $f12 -/* C7454C 802430CC 8EC20088 */ lw $v0, 0x88($s6) -/* C74550 802430D0 14400010 */ bnez $v0, .L80243114 -/* C74554 802430D4 46000606 */ mov.s $f24, $f0 -/* C74558 802430D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C7455C 802430DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C74560 802430E0 804300B4 */ lb $v1, 0xb4($v0) -/* C74564 802430E4 3C014200 */ lui $at, 0x4200 -/* C74568 802430E8 4481A000 */ mtc1 $at, $f20 -/* C7456C 802430EC 10600016 */ beqz $v1, .L80243148 -/* C74570 802430F0 24020001 */ addiu $v0, $zero, 1 -/* C74574 802430F4 3C0142C8 */ lui $at, 0x42c8 -/* C74578 802430F8 4481A000 */ mtc1 $at, $f20 -/* C7457C 802430FC 14620013 */ bne $v1, $v0, .L8024314C -/* C74580 80243100 26300038 */ addiu $s0, $s1, 0x38 -/* C74584 80243104 3C0142B4 */ lui $at, 0x42b4 -/* C74588 80243108 4481A000 */ mtc1 $at, $f20 -/* C7458C 8024310C 08090C54 */ j .L80243150 -/* C74590 80243110 0200202D */ daddu $a0, $s0, $zero -.L80243114: -/* C74594 80243114 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C74598 80243118 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C7459C 8024311C 804300B4 */ lb $v1, 0xb4($v0) -/* C745A0 80243120 3C014218 */ lui $at, 0x4218 -/* C745A4 80243124 4481A000 */ mtc1 $at, $f20 -/* C745A8 80243128 10600007 */ beqz $v1, .L80243148 -/* C745AC 8024312C 24020001 */ addiu $v0, $zero, 1 -/* C745B0 80243130 3C0142B4 */ lui $at, 0x42b4 -/* C745B4 80243134 4481A000 */ mtc1 $at, $f20 -/* C745B8 80243138 14620004 */ bne $v1, $v0, .L8024314C -/* C745BC 8024313C 26300038 */ addiu $s0, $s1, 0x38 -/* C745C0 80243140 3C014296 */ lui $at, 0x4296 -/* C745C4 80243144 4481A000 */ mtc1 $at, $f20 -.L80243148: -/* C745C8 80243148 26300038 */ addiu $s0, $s1, 0x38 -.L8024314C: -/* C745CC 8024314C 0200202D */ daddu $a0, $s0, $zero -.L80243150: -/* C745D0 80243150 3C15800F */ lui $s5, %hi(gPlayerStatusPtr) -/* C745D4 80243154 26B57B30 */ addiu $s5, $s5, %lo(gPlayerStatusPtr) -/* C745D8 80243158 4407C000 */ mfc1 $a3, $f24 -/* C745DC 8024315C 862200A6 */ lh $v0, 0xa6($s1) -/* C745E0 80243160 8EA30000 */ lw $v1, ($s5) -/* C745E4 80243164 44824000 */ mtc1 $v0, $f8 -/* C745E8 80243168 00000000 */ nop -/* C745EC 8024316C 46804220 */ cvt.s.w $f8, $f8 -/* C745F0 80243170 C4600028 */ lwc1 $f0, 0x28($v1) -/* C745F4 80243174 44064000 */ mfc1 $a2, $f8 -/* C745F8 80243178 26330040 */ addiu $s3, $s1, 0x40 -/* C745FC 8024317C E6200038 */ swc1 $f0, 0x38($s1) -/* C74600 80243180 C4600030 */ lwc1 $f0, 0x30($v1) -/* C74604 80243184 0260282D */ daddu $a1, $s3, $zero -/* C74608 80243188 0C00A7E7 */ jal add_vec2D_polar -/* C7460C 8024318C E6200040 */ swc1 $f0, 0x40($s1) -/* C74610 80243190 862200A6 */ lh $v0, 0xa6($s1) -/* C74614 80243194 44820000 */ mtc1 $v0, $f0 -/* C74618 80243198 00000000 */ nop -/* C7461C 8024319C 46800020 */ cvt.s.w $f0, $f0 -/* C74620 802431A0 4600A000 */ add.s $f0, $f20, $f0 -/* C74624 802431A4 4406B000 */ mfc1 $a2, $f22 -/* C74628 802431A8 44050000 */ mfc1 $a1, $f0 -/* C7462C 802431AC 0C00EA95 */ jal npc_move_heading -/* C74630 802431B0 0220202D */ daddu $a0, $s1, $zero -/* C74634 802431B4 8EC20088 */ lw $v0, 0x88($s6) -/* C74638 802431B8 1440005D */ bnez $v0, .L80243330 -/* C7463C 802431BC 00000000 */ nop -/* C74640 802431C0 C6200038 */ lwc1 $f0, 0x38($s1) -/* C74644 802431C4 3C018024 */ lui $at, 0x8024 -/* C74648 802431C8 D4245830 */ ldc1 $f4, 0x5830($at) -/* C7464C 802431CC 46000021 */ cvt.d.s $f0, $f0 -/* C74650 802431D0 4620203C */ c.lt.d $f4, $f0 -/* C74654 802431D4 00000000 */ nop -/* C74658 802431D8 45000005 */ bc1f .L802431F0 -/* C7465C 802431DC 00000000 */ nop -/* C74660 802431E0 3C0143BE */ lui $at, 0x43be -/* C74664 802431E4 44810000 */ mtc1 $at, $f0 -/* C74668 802431E8 00000000 */ nop -/* C7466C 802431EC E6200038 */ swc1 $f0, 0x38($s1) -.L802431F0: -/* C74670 802431F0 C6200038 */ lwc1 $f0, 0x38($s1) -/* C74674 802431F4 3C018024 */ lui $at, 0x8024 -/* C74678 802431F8 D4225838 */ ldc1 $f2, 0x5838($at) -/* C7467C 802431FC 46000021 */ cvt.d.s $f0, $f0 -/* C74680 80243200 4622003C */ c.lt.d $f0, $f2 -/* C74684 80243204 00000000 */ nop -/* C74688 80243208 45000005 */ bc1f .L80243220 -/* C7468C 8024320C 00000000 */ nop -/* C74690 80243210 3C01C3BE */ lui $at, 0xc3be -/* C74694 80243214 44810000 */ mtc1 $at, $f0 -/* C74698 80243218 00000000 */ nop -/* C7469C 8024321C E6200038 */ swc1 $f0, 0x38($s1) -.L80243220: -/* C746A0 80243220 C6200040 */ lwc1 $f0, 0x40($s1) -/* C746A4 80243224 46000021 */ cvt.d.s $f0, $f0 -/* C746A8 80243228 4620203C */ c.lt.d $f4, $f0 -/* C746AC 8024322C 00000000 */ nop -/* C746B0 80243230 45000005 */ bc1f .L80243248 -/* C746B4 80243234 00000000 */ nop -/* C746B8 80243238 3C0143BE */ lui $at, 0x43be -/* C746BC 8024323C 44810000 */ mtc1 $at, $f0 -/* C746C0 80243240 00000000 */ nop -/* C746C4 80243244 E6200040 */ swc1 $f0, 0x40($s1) -.L80243248: -/* C746C8 80243248 C6200040 */ lwc1 $f0, 0x40($s1) -/* C746CC 8024324C 46000021 */ cvt.d.s $f0, $f0 -/* C746D0 80243250 4622003C */ c.lt.d $f0, $f2 -/* C746D4 80243254 00000000 */ nop -/* C746D8 80243258 45000005 */ bc1f .L80243270 -/* C746DC 8024325C 00000000 */ nop -/* C746E0 80243260 3C01C3BE */ lui $at, 0xc3be -/* C746E4 80243264 44810000 */ mtc1 $at, $f0 -/* C746E8 80243268 00000000 */ nop -/* C746EC 8024326C E6200040 */ swc1 $f0, 0x40($s1) -.L80243270: -/* C746F0 80243270 C6220038 */ lwc1 $f2, 0x38($s1) -/* C746F4 80243274 46021082 */ mul.s $f2, $f2, $f2 -/* C746F8 80243278 00000000 */ nop -/* C746FC 8024327C C6200040 */ lwc1 $f0, 0x40($s1) -/* C74700 80243280 46000002 */ mul.s $f0, $f0, $f0 -/* C74704 80243284 00000000 */ nop -/* C74708 80243288 46001300 */ add.s $f12, $f2, $f0 -/* C7470C 8024328C 46006004 */ sqrt.s $f0, $f12 -/* C74710 80243290 46000032 */ c.eq.s $f0, $f0 -/* C74714 80243294 00000000 */ nop -/* C74718 80243298 45010003 */ bc1t .L802432A8 -/* C7471C 8024329C 00000000 */ nop -/* C74720 802432A0 0C0187BC */ jal sqrtf -/* C74724 802432A4 00000000 */ nop -.L802432A8: -/* C74728 802432A8 8E260038 */ lw $a2, 0x38($s1) -/* C7472C 802432AC 8E270040 */ lw $a3, 0x40($s1) -/* C74730 802432B0 4480A000 */ mtc1 $zero, $f20 -/* C74734 802432B4 E7A00038 */ swc1 $f0, 0x38($sp) -/* C74738 802432B8 4600A306 */ mov.s $f12, $f20 -/* C7473C 802432BC 0C00A720 */ jal atan2 -/* C74740 802432C0 4600A386 */ mov.s $f14, $f20 -/* C74744 802432C4 46000586 */ mov.s $f22, $f0 -/* C74748 802432C8 C7A20038 */ lwc1 $f2, 0x38($sp) -/* C7474C 802432CC 3C018024 */ lui $at, 0x8024 -/* C74750 802432D0 D4205840 */ ldc1 $f0, 0x5840($at) -/* C74754 802432D4 460010A1 */ cvt.d.s $f2, $f2 -/* C74758 802432D8 4620103C */ c.lt.d $f2, $f0 -/* C7475C 802432DC 00000000 */ nop -/* C74760 802432E0 45000004 */ bc1f .L802432F4 -/* C74764 802432E4 0200202D */ daddu $a0, $s0, $zero -/* C74768 802432E8 3C064398 */ lui $a2, 0x4398 -/* C7476C 802432EC 08090CC5 */ j .L80243314 -/* C74770 802432F0 34C68000 */ ori $a2, $a2, 0x8000 -.L802432F4: -/* C74774 802432F4 3C018024 */ lui $at, 0x8024 -/* C74778 802432F8 D4205848 */ ldc1 $f0, 0x5848($at) -/* C7477C 802432FC 4622003C */ c.lt.d $f0, $f2 -/* C74780 80243300 00000000 */ nop -/* C74784 80243304 450000FA */ bc1f .L802436F0 -/* C74788 80243308 00000000 */ nop -/* C7478C 8024330C 3C0643BB */ lui $a2, 0x43bb -/* C74790 80243310 34C68000 */ ori $a2, $a2, 0x8000 -.L80243314: -/* C74794 80243314 4407B000 */ mfc1 $a3, $f22 -/* C74798 80243318 0260282D */ daddu $a1, $s3, $zero -/* C7479C 8024331C E6340038 */ swc1 $f20, 0x38($s1) -/* C747A0 80243320 0C00A7E7 */ jal add_vec2D_polar -/* C747A4 80243324 E6340040 */ swc1 $f20, 0x40($s1) -/* C747A8 80243328 08090DBC */ j .L802436F0 -/* C747AC 8024332C 00000000 */ nop -.L80243330: -/* C747B0 80243330 8E220000 */ lw $v0, ($s1) -/* C747B4 80243334 30420040 */ andi $v0, $v0, 0x40 -/* C747B8 80243338 144000B0 */ bnez $v0, .L802435FC -/* C747BC 8024333C 27A50020 */ addiu $a1, $sp, 0x20 -/* C747C0 80243340 27B40020 */ addiu $s4, $sp, 0x20 -/* C747C4 80243344 0280282D */ daddu $a1, $s4, $zero -/* C747C8 80243348 27B30024 */ addiu $s3, $sp, 0x24 -/* C747CC 8024334C 8EA20000 */ lw $v0, ($s5) -/* C747D0 80243350 3C014032 */ lui $at, 0x4032 -/* C747D4 80243354 44811800 */ mtc1 $at, $f3 -/* C747D8 80243358 44801000 */ mtc1 $zero, $f2 -/* C747DC 8024335C C440002C */ lwc1 $f0, 0x2c($v0) -/* C747E0 80243360 C4460028 */ lwc1 $f6, 0x28($v0) -/* C747E4 80243364 C4440030 */ lwc1 $f4, 0x30($v0) -/* C747E8 80243368 46000021 */ cvt.d.s $f0, $f0 -/* C747EC 8024336C 46220000 */ add.d $f0, $f0, $f2 -/* C747F0 80243370 E7A60020 */ swc1 $f6, 0x20($sp) -/* C747F4 80243374 E7A40028 */ swc1 $f4, 0x28($sp) -/* C747F8 80243378 46200020 */ cvt.s.d $f0, $f0 -/* C747FC 8024337C E7A00024 */ swc1 $f0, 0x24($sp) -/* C74800 80243380 E7B40010 */ swc1 $f20, 0x10($sp) -/* C74804 80243384 E7B60014 */ swc1 $f22, 0x14($sp) -/* C74808 80243388 862200A8 */ lh $v0, 0xa8($s1) -/* C7480C 8024338C 0260302D */ daddu $a2, $s3, $zero -/* C74810 80243390 44820000 */ mtc1 $v0, $f0 -/* C74814 80243394 00000000 */ nop -/* C74818 80243398 46800020 */ cvt.s.w $f0, $f0 -/* C7481C 8024339C E7A00018 */ swc1 $f0, 0x18($sp) -/* C74820 802433A0 862200A6 */ lh $v0, 0xa6($s1) -/* C74824 802433A4 27B00028 */ addiu $s0, $sp, 0x28 -/* C74828 802433A8 44820000 */ mtc1 $v0, $f0 -/* C7482C 802433AC 00000000 */ nop -/* C74830 802433B0 46800020 */ cvt.s.w $f0, $f0 -/* C74834 802433B4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C74838 802433B8 8E240080 */ lw $a0, 0x80($s1) -/* C7483C 802433BC 0C037711 */ jal func_800DDC44 -/* C74840 802433C0 0200382D */ daddu $a3, $s0, $zero -/* C74844 802433C4 104000CA */ beqz $v0, .L802436F0 -/* C74848 802433C8 0280282D */ daddu $a1, $s4, $zero -/* C7484C 802433CC 8EA20000 */ lw $v0, ($s5) -/* C74850 802433D0 3C018024 */ lui $at, 0x8024 -/* C74854 802433D4 D4225850 */ ldc1 $f2, 0x5850($at) -/* C74858 802433D8 C440002C */ lwc1 $f0, 0x2c($v0) -/* C7485C 802433DC C4460028 */ lwc1 $f6, 0x28($v0) -/* C74860 802433E0 C4440030 */ lwc1 $f4, 0x30($v0) -/* C74864 802433E4 46000021 */ cvt.d.s $f0, $f0 -/* C74868 802433E8 46220000 */ add.d $f0, $f0, $f2 -/* C7486C 802433EC E7A60020 */ swc1 $f6, 0x20($sp) -/* C74870 802433F0 E7A40028 */ swc1 $f4, 0x28($sp) -/* C74874 802433F4 46200020 */ cvt.s.d $f0, $f0 -/* C74878 802433F8 E7A00024 */ swc1 $f0, 0x24($sp) -/* C7487C 802433FC E7B40010 */ swc1 $f20, 0x10($sp) -/* C74880 80243400 E7B60014 */ swc1 $f22, 0x14($sp) -/* C74884 80243404 862200A8 */ lh $v0, 0xa8($s1) -/* C74888 80243408 44820000 */ mtc1 $v0, $f0 -/* C7488C 8024340C 00000000 */ nop -/* C74890 80243410 46800020 */ cvt.s.w $f0, $f0 -/* C74894 80243414 E7A00018 */ swc1 $f0, 0x18($sp) -/* C74898 80243418 862200A6 */ lh $v0, 0xa6($s1) -/* C7489C 8024341C 0260302D */ daddu $a2, $s3, $zero -/* C748A0 80243420 44820000 */ mtc1 $v0, $f0 -/* C748A4 80243424 00000000 */ nop -/* C748A8 80243428 46800020 */ cvt.s.w $f0, $f0 -/* C748AC 8024342C E7A0001C */ swc1 $f0, 0x1c($sp) -/* C748B0 80243430 8E240080 */ lw $a0, 0x80($s1) -/* C748B4 80243434 0C037711 */ jal func_800DDC44 -/* C748B8 80243438 0200382D */ daddu $a3, $s0, $zero -/* C748BC 8024343C 27A5002C */ addiu $a1, $sp, 0x2c -/* C748C0 80243440 27A60030 */ addiu $a2, $sp, 0x30 -/* C748C4 80243444 27A70034 */ addiu $a3, $sp, 0x34 -/* C748C8 80243448 27A30038 */ addiu $v1, $sp, 0x38 -/* C748CC 8024344C C6220038 */ lwc1 $f2, 0x38($s1) -/* C748D0 80243450 C620003C */ lwc1 $f0, 0x3c($s1) -/* C748D4 80243454 3C014348 */ lui $at, 0x4348 -/* C748D8 80243458 44813000 */ mtc1 $at, $f6 -/* C748DC 8024345C 46000021 */ cvt.d.s $f0, $f0 -/* C748E0 80243460 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C748E4 80243464 3C014059 */ lui $at, 0x4059 -/* C748E8 80243468 44811800 */ mtc1 $at, $f3 -/* C748EC 8024346C 44801000 */ mtc1 $zero, $f2 -/* C748F0 80243470 C6240040 */ lwc1 $f4, 0x40($s1) -/* C748F4 80243474 46220000 */ add.d $f0, $f0, $f2 -/* C748F8 80243478 E7A60038 */ swc1 $f6, 0x38($sp) -/* C748FC 8024347C E7A40034 */ swc1 $f4, 0x34($sp) -/* C74900 80243480 46200020 */ cvt.s.d $f0, $f0 -/* C74904 80243484 E7A00030 */ swc1 $f0, 0x30($sp) -/* C74908 80243488 AFA30010 */ sw $v1, 0x10($sp) -/* C7490C 8024348C 8E240080 */ lw $a0, 0x80($s1) -/* C74910 80243490 0C0372DF */ jal func_800DCB7C -/* C74914 80243494 0040802D */ daddu $s0, $v0, $zero -/* C74918 80243498 1600001C */ bnez $s0, .L8024350C -/* C7491C 8024349C 00000000 */ nop -/* C74920 802434A0 1040001A */ beqz $v0, .L8024350C -/* C74924 802434A4 00000000 */ nop -/* C74928 802434A8 C7A20038 */ lwc1 $f2, 0x38($sp) -/* C7492C 802434AC 3C014054 */ lui $at, 0x4054 -/* C74930 802434B0 44810800 */ mtc1 $at, $f1 -/* C74934 802434B4 44800000 */ mtc1 $zero, $f0 -/* C74938 802434B8 460010A1 */ cvt.d.s $f2, $f2 -/* C7493C 802434BC 4622003C */ c.lt.d $f0, $f2 -/* C74940 802434C0 00000000 */ nop -/* C74944 802434C4 45000011 */ bc1f .L8024350C -/* C74948 802434C8 00000000 */ nop -/* C7494C 802434CC 3C01405E */ lui $at, 0x405e -/* C74950 802434D0 44810800 */ mtc1 $at, $f1 -/* C74954 802434D4 44800000 */ mtc1 $zero, $f0 -/* C74958 802434D8 00000000 */ nop -/* C7495C 802434DC 4620103C */ c.lt.d $f2, $f0 -/* C74960 802434E0 00000000 */ nop -/* C74964 802434E4 45000009 */ bc1f .L8024350C -/* C74968 802434E8 00000000 */ nop -/* C7496C 802434EC C622003C */ lwc1 $f2, 0x3c($s1) -/* C74970 802434F0 C7A00030 */ lwc1 $f0, 0x30($sp) -/* C74974 802434F4 46001032 */ c.eq.s $f2, $f0 -/* C74978 802434F8 00000000 */ nop -/* C7497C 802434FC 45010003 */ bc1t .L8024350C -/* C74980 80243500 00000000 */ nop -/* C74984 80243504 08090DBC */ j .L802436F0 -/* C74988 80243508 241E0001 */ addiu $fp, $zero, 1 -.L8024350C: -/* C7498C 8024350C 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* C74990 80243510 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* C74994 80243514 8E020000 */ lw $v0, ($s0) -/* C74998 80243518 3C014024 */ lui $at, 0x4024 -/* C7499C 8024351C 44811800 */ mtc1 $at, $f3 -/* C749A0 80243520 44801000 */ mtc1 $zero, $f2 -/* C749A4 80243524 C440002C */ lwc1 $f0, 0x2c($v0) -/* C749A8 80243528 C4460028 */ lwc1 $f6, 0x28($v0) -/* C749AC 8024352C C4440030 */ lwc1 $f4, 0x30($v0) -/* C749B0 80243530 46000021 */ cvt.d.s $f0, $f0 -/* C749B4 80243534 46220000 */ add.d $f0, $f0, $f2 -/* C749B8 80243538 E7A60020 */ swc1 $f6, 0x20($sp) -/* C749BC 8024353C E7A40028 */ swc1 $f4, 0x28($sp) -/* C749C0 80243540 46200020 */ cvt.s.d $f0, $f0 -/* C749C4 80243544 E7A00024 */ swc1 $f0, 0x24($sp) -/* C749C8 80243548 E7B40010 */ swc1 $f20, 0x10($sp) -/* C749CC 8024354C E7B60014 */ swc1 $f22, 0x14($sp) -/* C749D0 80243550 862200A8 */ lh $v0, 0xa8($s1) -/* C749D4 80243554 27A50020 */ addiu $a1, $sp, 0x20 -/* C749D8 80243558 44820000 */ mtc1 $v0, $f0 -/* C749DC 8024355C 00000000 */ nop -/* C749E0 80243560 46800020 */ cvt.s.w $f0, $f0 -/* C749E4 80243564 E7A00018 */ swc1 $f0, 0x18($sp) -/* C749E8 80243568 862200A6 */ lh $v0, 0xa6($s1) -/* C749EC 8024356C 27A60024 */ addiu $a2, $sp, 0x24 -/* C749F0 80243570 44820000 */ mtc1 $v0, $f0 -/* C749F4 80243574 00000000 */ nop -/* C749F8 80243578 46800020 */ cvt.s.w $f0, $f0 -/* C749FC 8024357C E7A0001C */ swc1 $f0, 0x1c($sp) -/* C74A00 80243580 8E240080 */ lw $a0, 0x80($s1) -/* C74A04 80243584 0C037711 */ jal func_800DDC44 -/* C74A08 80243588 27A70028 */ addiu $a3, $sp, 0x28 -/* C74A0C 8024358C 8FA60020 */ lw $a2, 0x20($sp) -/* C74A10 80243590 8E020000 */ lw $v0, ($s0) -/* C74A14 80243594 8FA70028 */ lw $a3, 0x28($sp) -/* C74A18 80243598 C44C0028 */ lwc1 $f12, 0x28($v0) -/* C74A1C 8024359C C44E0030 */ lwc1 $f14, 0x30($v0) -/* C74A20 802435A0 0C00A7B5 */ jal dist2D -/* C74A24 802435A4 24170001 */ addiu $s7, $zero, 1 -/* C74A28 802435A8 46000506 */ mov.s $f20, $f0 -/* C74A2C 802435AC 8E030000 */ lw $v1, ($s0) -/* C74A30 802435B0 862200A6 */ lh $v0, 0xa6($s1) -/* C74A34 802435B4 4407C000 */ mfc1 $a3, $f24 -/* C74A38 802435B8 44824000 */ mtc1 $v0, $f8 -/* C74A3C 802435BC 00000000 */ nop -/* C74A40 802435C0 46804220 */ cvt.s.w $f8, $f8 -/* C74A44 802435C4 C4600028 */ lwc1 $f0, 0x28($v1) -/* C74A48 802435C8 44064000 */ mfc1 $a2, $f8 -/* C74A4C 802435CC 26240038 */ addiu $a0, $s1, 0x38 -/* C74A50 802435D0 E6200038 */ swc1 $f0, 0x38($s1) -/* C74A54 802435D4 C4600030 */ lwc1 $f0, 0x30($v1) -/* C74A58 802435D8 26250040 */ addiu $a1, $s1, 0x40 -/* C74A5C 802435DC 0C00A7E7 */ jal add_vec2D_polar -/* C74A60 802435E0 E6200040 */ swc1 $f0, 0x40($s1) -/* C74A64 802435E4 862200A6 */ lh $v0, 0xa6($s1) -/* C74A68 802435E8 44820000 */ mtc1 $v0, $f0 -/* C74A6C 802435EC 00000000 */ nop -/* C74A70 802435F0 46800020 */ cvt.s.w $f0, $f0 -/* C74A74 802435F4 08090DB8 */ j .L802436E0 -/* C74A78 802435F8 4600A500 */ add.s $f20, $f20, $f0 -.L802435FC: -/* C74A7C 802435FC 8EA20000 */ lw $v0, ($s5) -/* C74A80 80243600 3C014032 */ lui $at, 0x4032 -/* C74A84 80243604 44811800 */ mtc1 $at, $f3 -/* C74A88 80243608 44801000 */ mtc1 $zero, $f2 -/* C74A8C 8024360C C440002C */ lwc1 $f0, 0x2c($v0) -/* C74A90 80243610 C4460028 */ lwc1 $f6, 0x28($v0) -/* C74A94 80243614 C4440030 */ lwc1 $f4, 0x30($v0) -/* C74A98 80243618 46000021 */ cvt.d.s $f0, $f0 -/* C74A9C 8024361C 46220000 */ add.d $f0, $f0, $f2 -/* C74AA0 80243620 E7A60020 */ swc1 $f6, 0x20($sp) -/* C74AA4 80243624 E7A40028 */ swc1 $f4, 0x28($sp) -/* C74AA8 80243628 46200020 */ cvt.s.d $f0, $f0 -/* C74AAC 8024362C E7A00024 */ swc1 $f0, 0x24($sp) -/* C74AB0 80243630 E7B40010 */ swc1 $f20, 0x10($sp) -/* C74AB4 80243634 E7B60014 */ swc1 $f22, 0x14($sp) -/* C74AB8 80243638 862200A8 */ lh $v0, 0xa8($s1) -/* C74ABC 8024363C 44820000 */ mtc1 $v0, $f0 -/* C74AC0 80243640 00000000 */ nop -/* C74AC4 80243644 46800020 */ cvt.s.w $f0, $f0 -/* C74AC8 80243648 E7A00018 */ swc1 $f0, 0x18($sp) -/* C74ACC 8024364C 862200A6 */ lh $v0, 0xa6($s1) -/* C74AD0 80243650 27A60024 */ addiu $a2, $sp, 0x24 -/* C74AD4 80243654 44820000 */ mtc1 $v0, $f0 -/* C74AD8 80243658 00000000 */ nop -/* C74ADC 8024365C 46800020 */ cvt.s.w $f0, $f0 -/* C74AE0 80243660 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C74AE4 80243664 8E240080 */ lw $a0, 0x80($s1) -/* C74AE8 80243668 0C037711 */ jal func_800DDC44 -/* C74AEC 8024366C 27A70028 */ addiu $a3, $sp, 0x28 -/* C74AF0 80243670 1040001F */ beqz $v0, .L802436F0 -/* C74AF4 80243674 00000000 */ nop -/* C74AF8 80243678 8FA60020 */ lw $a2, 0x20($sp) -/* C74AFC 8024367C 8EA20000 */ lw $v0, ($s5) -/* C74B00 80243680 8FA70028 */ lw $a3, 0x28($sp) -/* C74B04 80243684 C44C0028 */ lwc1 $f12, 0x28($v0) -/* C74B08 80243688 0C00A7B5 */ jal dist2D -/* C74B0C 8024368C C44E0030 */ lwc1 $f14, 0x30($v0) -/* C74B10 80243690 46000506 */ mov.s $f20, $f0 -/* C74B14 80243694 8EA30000 */ lw $v1, ($s5) -/* C74B18 80243698 862200A6 */ lh $v0, 0xa6($s1) -/* C74B1C 8024369C 4407C000 */ mfc1 $a3, $f24 -/* C74B20 802436A0 44824000 */ mtc1 $v0, $f8 -/* C74B24 802436A4 00000000 */ nop -/* C74B28 802436A8 46804220 */ cvt.s.w $f8, $f8 -/* C74B2C 802436AC C4600028 */ lwc1 $f0, 0x28($v1) -/* C74B30 802436B0 44064000 */ mfc1 $a2, $f8 -/* C74B34 802436B4 0200202D */ daddu $a0, $s0, $zero -/* C74B38 802436B8 E6200038 */ swc1 $f0, 0x38($s1) -/* C74B3C 802436BC C4600030 */ lwc1 $f0, 0x30($v1) -/* C74B40 802436C0 0260282D */ daddu $a1, $s3, $zero -/* C74B44 802436C4 0C00A7E7 */ jal add_vec2D_polar -/* C74B48 802436C8 E6200040 */ swc1 $f0, 0x40($s1) -/* C74B4C 802436CC 862200A6 */ lh $v0, 0xa6($s1) -/* C74B50 802436D0 44820000 */ mtc1 $v0, $f0 -/* C74B54 802436D4 00000000 */ nop -/* C74B58 802436D8 46800020 */ cvt.s.w $f0, $f0 -/* C74B5C 802436DC 4600A500 */ add.s $f20, $f20, $f0 -.L802436E0: -/* C74B60 802436E0 4406B000 */ mfc1 $a2, $f22 -/* C74B64 802436E4 4405A000 */ mfc1 $a1, $f20 -/* C74B68 802436E8 0C00EA95 */ jal npc_move_heading -/* C74B6C 802436EC 0220202D */ daddu $a0, $s1, $zero -.L802436F0: -/* C74B70 802436F0 C6400008 */ lwc1 $f0, 8($s2) -/* C74B74 802436F4 46800020 */ cvt.s.w $f0, $f0 -/* C74B78 802436F8 44050000 */ mfc1 $a1, $f0 -/* C74B7C 802436FC C640000C */ lwc1 $f0, 0xc($s2) -/* C74B80 80243700 46800020 */ cvt.s.w $f0, $f0 -/* C74B84 80243704 44060000 */ mfc1 $a2, $f0 -/* C74B88 80243708 C6200040 */ lwc1 $f0, 0x40($s1) -/* C74B8C 8024370C 26300038 */ addiu $s0, $s1, 0x38 -/* C74B90 80243710 E7A00010 */ swc1 $f0, 0x10($sp) -/* C74B94 80243714 C6400010 */ lwc1 $f0, 0x10($s2) -/* C74B98 80243718 46800020 */ cvt.s.w $f0, $f0 -/* C74B9C 8024371C E7A00014 */ swc1 $f0, 0x14($sp) -/* C74BA0 80243720 C6400014 */ lwc1 $f0, 0x14($s2) -/* C74BA4 80243724 46800020 */ cvt.s.w $f0, $f0 -/* C74BA8 80243728 E7A00018 */ swc1 $f0, 0x18($sp) -/* C74BAC 8024372C 8E440004 */ lw $a0, 4($s2) -/* C74BB0 80243730 8E270038 */ lw $a3, 0x38($s1) -/* C74BB4 80243734 0C0123F5 */ jal is_point_within_region -/* C74BB8 80243738 26330040 */ addiu $s3, $s1, 0x40 -/* C74BBC 8024373C 1040005A */ beqz $v0, .L802438A8 -/* C74BC0 80243740 00000000 */ nop -/* C74BC4 80243744 8E430004 */ lw $v1, 4($s2) -/* C74BC8 80243748 10600005 */ beqz $v1, .L80243760 -/* C74BCC 8024374C 24020001 */ addiu $v0, $zero, 1 -/* C74BD0 80243750 10620029 */ beq $v1, $v0, .L802437F8 -/* C74BD4 80243754 00000000 */ nop -/* C74BD8 80243758 08090E2A */ j .L802438A8 -/* C74BDC 8024375C 00000000 */ nop -.L80243760: -/* C74BE0 80243760 C6480008 */ lwc1 $f8, 8($s2) -/* C74BE4 80243764 46804220 */ cvt.s.w $f8, $f8 -/* C74BE8 80243768 44064000 */ mfc1 $a2, $f8 -/* C74BEC 8024376C C648000C */ lwc1 $f8, 0xc($s2) -/* C74BF0 80243770 46804220 */ cvt.s.w $f8, $f8 -/* C74BF4 80243774 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C74BF8 80243778 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C74BFC 8024377C 44074000 */ mfc1 $a3, $f8 -/* C74C00 80243780 0C00A7B5 */ jal dist2D -/* C74C04 80243784 00000000 */ nop -/* C74C08 80243788 C6420010 */ lwc1 $f2, 0x10($s2) -/* C74C0C 8024378C 468010A0 */ cvt.s.w $f2, $f2 -/* C74C10 80243790 4600103C */ c.lt.s $f2, $f0 -/* C74C14 80243794 00000000 */ nop -/* C74C18 80243798 45000043 */ bc1f .L802438A8 -/* C74C1C 8024379C E7A00038 */ swc1 $f0, 0x38($sp) -/* C74C20 802437A0 C64C0008 */ lwc1 $f12, 8($s2) -/* C74C24 802437A4 46806320 */ cvt.s.w $f12, $f12 -/* C74C28 802437A8 8E260038 */ lw $a2, 0x38($s1) -/* C74C2C 802437AC 8E270040 */ lw $a3, 0x40($s1) -/* C74C30 802437B0 C64E000C */ lwc1 $f14, 0xc($s2) -/* C74C34 802437B4 0C00A720 */ jal atan2 -/* C74C38 802437B8 468073A0 */ cvt.s.w $f14, $f14 -/* C74C3C 802437BC 0200202D */ daddu $a0, $s0, $zero -/* C74C40 802437C0 44070000 */ mfc1 $a3, $f0 -/* C74C44 802437C4 C6400008 */ lwc1 $f0, 8($s2) -/* C74C48 802437C8 46800020 */ cvt.s.w $f0, $f0 -/* C74C4C 802437CC E6200038 */ swc1 $f0, 0x38($s1) -/* C74C50 802437D0 C640000C */ lwc1 $f0, 0xc($s2) -/* C74C54 802437D4 46800020 */ cvt.s.w $f0, $f0 -/* C74C58 802437D8 E6200040 */ swc1 $f0, 0x40($s1) -/* C74C5C 802437DC C6480010 */ lwc1 $f8, 0x10($s2) -/* C74C60 802437E0 46804220 */ cvt.s.w $f8, $f8 -/* C74C64 802437E4 44064000 */ mfc1 $a2, $f8 -/* C74C68 802437E8 0C00A7E7 */ jal add_vec2D_polar -/* C74C6C 802437EC 0260282D */ daddu $a1, $s3, $zero -/* C74C70 802437F0 08090E2A */ j .L802438A8 -/* C74C74 802437F4 00000000 */ nop -.L802437F8: -/* C74C78 802437F8 8E420008 */ lw $v0, 8($s2) -/* C74C7C 802437FC 8E430010 */ lw $v1, 0x10($s2) -/* C74C80 80243800 C6200038 */ lwc1 $f0, 0x38($s1) -/* C74C84 80243804 00431021 */ addu $v0, $v0, $v1 -/* C74C88 80243808 44821000 */ mtc1 $v0, $f2 -/* C74C8C 8024380C 00000000 */ nop -/* C74C90 80243810 468010A0 */ cvt.s.w $f2, $f2 -/* C74C94 80243814 4600103C */ c.lt.s $f2, $f0 -/* C74C98 80243818 00000000 */ nop -/* C74C9C 8024381C 45030001 */ bc1tl .L80243824 -/* C74CA0 80243820 E6220038 */ swc1 $f2, 0x38($s1) -.L80243824: -/* C74CA4 80243824 8E420008 */ lw $v0, 8($s2) -/* C74CA8 80243828 8E430010 */ lw $v1, 0x10($s2) -/* C74CAC 8024382C C6200038 */ lwc1 $f0, 0x38($s1) -/* C74CB0 80243830 00431023 */ subu $v0, $v0, $v1 -/* C74CB4 80243834 44821000 */ mtc1 $v0, $f2 -/* C74CB8 80243838 00000000 */ nop -/* C74CBC 8024383C 468010A0 */ cvt.s.w $f2, $f2 -/* C74CC0 80243840 4602003C */ c.lt.s $f0, $f2 -/* C74CC4 80243844 00000000 */ nop -/* C74CC8 80243848 45030001 */ bc1tl .L80243850 -/* C74CCC 8024384C E6220038 */ swc1 $f2, 0x38($s1) -.L80243850: -/* C74CD0 80243850 8E42000C */ lw $v0, 0xc($s2) -/* C74CD4 80243854 8E430014 */ lw $v1, 0x14($s2) -/* C74CD8 80243858 C6200040 */ lwc1 $f0, 0x40($s1) -/* C74CDC 8024385C 00431021 */ addu $v0, $v0, $v1 -/* C74CE0 80243860 44821000 */ mtc1 $v0, $f2 -/* C74CE4 80243864 00000000 */ nop -/* C74CE8 80243868 468010A0 */ cvt.s.w $f2, $f2 -/* C74CEC 8024386C 4600103C */ c.lt.s $f2, $f0 -/* C74CF0 80243870 00000000 */ nop -/* C74CF4 80243874 45030001 */ bc1tl .L8024387C -/* C74CF8 80243878 E6220040 */ swc1 $f2, 0x40($s1) -.L8024387C: -/* C74CFC 8024387C 8E42000C */ lw $v0, 0xc($s2) -/* C74D00 80243880 8E430014 */ lw $v1, 0x14($s2) -/* C74D04 80243884 C6200040 */ lwc1 $f0, 0x40($s1) -/* C74D08 80243888 00431023 */ subu $v0, $v0, $v1 -/* C74D0C 8024388C 44821000 */ mtc1 $v0, $f2 -/* C74D10 80243890 00000000 */ nop -/* C74D14 80243894 468010A0 */ cvt.s.w $f2, $f2 -/* C74D18 80243898 4602003C */ c.lt.s $f0, $f2 -/* C74D1C 8024389C 00000000 */ nop -/* C74D20 802438A0 45030001 */ bc1tl .L802438A8 -/* C74D24 802438A4 E6220040 */ swc1 $f2, 0x40($s1) -.L802438A8: -/* C74D28 802438A8 16E0001F */ bnez $s7, .L80243928 -/* C74D2C 802438AC 00000000 */ nop -/* C74D30 802438B0 8E220000 */ lw $v0, ($s1) -/* C74D34 802438B4 30420008 */ andi $v0, $v0, 8 -/* C74D38 802438B8 10400003 */ beqz $v0, .L802438C8 -/* C74D3C 802438BC 27A50020 */ addiu $a1, $sp, 0x20 -/* C74D40 802438C0 13C00019 */ beqz $fp, .L80243928 -/* C74D44 802438C4 00000000 */ nop -.L802438C8: -/* C74D48 802438C8 27A60024 */ addiu $a2, $sp, 0x24 -/* C74D4C 802438CC 27A20038 */ addiu $v0, $sp, 0x38 -/* C74D50 802438D0 C6220038 */ lwc1 $f2, 0x38($s1) -/* C74D54 802438D4 C620003C */ lwc1 $f0, 0x3c($s1) -/* C74D58 802438D8 3C0143C8 */ lui $at, 0x43c8 -/* C74D5C 802438DC 44813000 */ mtc1 $at, $f6 -/* C74D60 802438E0 46000021 */ cvt.d.s $f0, $f0 -/* C74D64 802438E4 E7A20020 */ swc1 $f2, 0x20($sp) -/* C74D68 802438E8 3C018024 */ lui $at, 0x8024 -/* C74D6C 802438EC D4225858 */ ldc1 $f2, 0x5858($at) -/* C74D70 802438F0 C6240040 */ lwc1 $f4, 0x40($s1) -/* C74D74 802438F4 46220000 */ add.d $f0, $f0, $f2 -/* C74D78 802438F8 E7A60038 */ swc1 $f6, 0x38($sp) -/* C74D7C 802438FC E7A40028 */ swc1 $f4, 0x28($sp) -/* C74D80 80243900 46200020 */ cvt.s.d $f0, $f0 -/* C74D84 80243904 E7A00024 */ swc1 $f0, 0x24($sp) -/* C74D88 80243908 AFA20010 */ sw $v0, 0x10($sp) -/* C74D8C 8024390C 8E240080 */ lw $a0, 0x80($s1) -/* C74D90 80243910 0C0372DF */ jal func_800DCB7C -/* C74D94 80243914 27A70028 */ addiu $a3, $sp, 0x28 -/* C74D98 80243918 10400003 */ beqz $v0, .L80243928 -/* C74D9C 8024391C 00000000 */ nop -/* C74DA0 80243920 C7A00024 */ lwc1 $f0, 0x24($sp) -/* C74DA4 80243924 E620003C */ swc1 $f0, 0x3c($s1) -.L80243928: -/* C74DA8 80243928 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C74DAC 8024392C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C74DB0 80243930 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C74DB4 80243934 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C74DB8 80243938 8C460028 */ lw $a2, 0x28($v0) -/* C74DBC 8024393C 0C00A720 */ jal atan2 -/* C74DC0 80243940 8C470030 */ lw $a3, 0x30($v0) -/* C74DC4 80243944 0220202D */ daddu $a0, $s1, $zero -/* C74DC8 80243948 24050321 */ addiu $a1, $zero, 0x321 -/* C74DCC 8024394C 0000302D */ daddu $a2, $zero, $zero -/* C74DD0 80243950 0C012530 */ jal func_800494C0 -/* C74DD4 80243954 E620000C */ swc1 $f0, 0xc($s1) -/* C74DD8 80243958 8EC200CC */ lw $v0, 0xcc($s6) -/* C74DDC 8024395C 8C420024 */ lw $v0, 0x24($v0) -/* C74DE0 80243960 AE220028 */ sw $v0, 0x28($s1) -/* C74DE4 80243964 96C20096 */ lhu $v0, 0x96($s6) -/* C74DE8 80243968 A622008E */ sh $v0, 0x8e($s1) -/* C74DEC 8024396C 8FA80080 */ lw $t0, 0x80($sp) -/* C74DF0 80243970 2402000B */ addiu $v0, $zero, 0xb -/* C74DF4 80243974 AD020070 */ sw $v0, 0x70($t0) -.L80243978: -/* C74DF8 80243978 8FBF0064 */ lw $ra, 0x64($sp) -/* C74DFC 8024397C 8FBE0060 */ lw $fp, 0x60($sp) -/* C74E00 80243980 8FB7005C */ lw $s7, 0x5c($sp) -/* C74E04 80243984 8FB60058 */ lw $s6, 0x58($sp) -/* C74E08 80243988 8FB50054 */ lw $s5, 0x54($sp) -/* C74E0C 8024398C 8FB40050 */ lw $s4, 0x50($sp) -/* C74E10 80243990 8FB3004C */ lw $s3, 0x4c($sp) -/* C74E14 80243994 8FB20048 */ lw $s2, 0x48($sp) -/* C74E18 80243998 8FB10044 */ lw $s1, 0x44($sp) -/* C74E1C 8024399C 8FB00040 */ lw $s0, 0x40($sp) -/* C74E20 802439A0 D7B80078 */ ldc1 $f24, 0x78($sp) -/* C74E24 802439A4 D7B60070 */ ldc1 $f22, 0x70($sp) -/* C74E28 802439A8 D7B40068 */ ldc1 $f20, 0x68($sp) -/* C74E2C 802439AC 03E00008 */ jr $ra -/* C74E30 802439B0 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/func_80243BA4_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/func_80243BA4_C71480.s deleted file mode 100644 index 0d3c01bb01..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/func_80243BA4_C71480.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243BA4_C75024 -/* C75024 80243BA4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C75028 80243BA8 AFB40040 */ sw $s4, 0x40($sp) -/* C7502C 80243BAC 0080A02D */ daddu $s4, $a0, $zero -/* C75030 80243BB0 AFBF0044 */ sw $ra, 0x44($sp) -/* C75034 80243BB4 AFB3003C */ sw $s3, 0x3c($sp) -/* C75038 80243BB8 AFB20038 */ sw $s2, 0x38($sp) -/* C7503C 80243BBC AFB10034 */ sw $s1, 0x34($sp) -/* C75040 80243BC0 AFB00030 */ sw $s0, 0x30($sp) -/* C75044 80243BC4 8E910148 */ lw $s1, 0x148($s4) -/* C75048 80243BC8 00A0902D */ daddu $s2, $a1, $zero -/* C7504C 80243BCC 86240008 */ lh $a0, 8($s1) -/* C75050 80243BD0 0C00EABB */ jal get_npc_unsafe -/* C75054 80243BD4 00C0982D */ daddu $s3, $a2, $zero -/* C75058 80243BD8 0040802D */ daddu $s0, $v0, $zero -/* C7505C 80243BDC 9602008E */ lhu $v0, 0x8e($s0) -/* C75060 80243BE0 2442FFFF */ addiu $v0, $v0, -1 -/* C75064 80243BE4 A602008E */ sh $v0, 0x8e($s0) -/* C75068 80243BE8 00021400 */ sll $v0, $v0, 0x10 -/* C7506C 80243BEC 14400020 */ bnez $v0, .L80243C70 -/* C75070 80243BF0 0260202D */ daddu $a0, $s3, $zero -/* C75074 80243BF4 AFA00010 */ sw $zero, 0x10($sp) -/* C75078 80243BF8 8E46000C */ lw $a2, 0xc($s2) -/* C7507C 80243BFC 8E470010 */ lw $a3, 0x10($s2) -/* C75080 80243C00 0C01242D */ jal func_800490B4 -/* C75084 80243C04 0220282D */ daddu $a1, $s1, $zero -/* C75088 80243C08 54400018 */ bnel $v0, $zero, .L80243C6C -/* C7508C 80243C0C A600008E */ sh $zero, 0x8e($s0) -/* C75090 80243C10 24040002 */ addiu $a0, $zero, 2 -/* C75094 80243C14 0200282D */ daddu $a1, $s0, $zero -/* C75098 80243C18 0000302D */ daddu $a2, $zero, $zero -/* C7509C 80243C1C 860300A8 */ lh $v1, 0xa8($s0) -/* C750A0 80243C20 3C013F80 */ lui $at, 0x3f80 -/* C750A4 80243C24 44810000 */ mtc1 $at, $f0 -/* C750A8 80243C28 3C014000 */ lui $at, 0x4000 -/* C750AC 80243C2C 44811000 */ mtc1 $at, $f2 -/* C750B0 80243C30 3C01C1A0 */ lui $at, 0xc1a0 -/* C750B4 80243C34 44812000 */ mtc1 $at, $f4 -/* C750B8 80243C38 2402000F */ addiu $v0, $zero, 0xf -/* C750BC 80243C3C AFA2001C */ sw $v0, 0x1c($sp) -/* C750C0 80243C40 44833000 */ mtc1 $v1, $f6 -/* C750C4 80243C44 00000000 */ nop -/* C750C8 80243C48 468031A0 */ cvt.s.w $f6, $f6 -/* C750CC 80243C4C 44073000 */ mfc1 $a3, $f6 -/* C750D0 80243C50 27A20028 */ addiu $v0, $sp, 0x28 -/* C750D4 80243C54 AFA20020 */ sw $v0, 0x20($sp) -/* C750D8 80243C58 E7A00010 */ swc1 $f0, 0x10($sp) -/* C750DC 80243C5C E7A20014 */ swc1 $f2, 0x14($sp) -/* C750E0 80243C60 0C01BFA4 */ jal fx_emote -/* C750E4 80243C64 E7A40018 */ swc1 $f4, 0x18($sp) -/* C750E8 80243C68 A600008E */ sh $zero, 0x8e($s0) -.L80243C6C: -/* C750EC 80243C6C AE800070 */ sw $zero, 0x70($s4) -.L80243C70: -/* C750F0 80243C70 8FBF0044 */ lw $ra, 0x44($sp) -/* C750F4 80243C74 8FB40040 */ lw $s4, 0x40($sp) -/* C750F8 80243C78 8FB3003C */ lw $s3, 0x3c($sp) -/* C750FC 80243C7C 8FB20038 */ lw $s2, 0x38($sp) -/* C75100 80243C80 8FB10034 */ lw $s1, 0x34($sp) -/* C75104 80243C84 8FB00030 */ lw $s0, 0x30($sp) -/* C75108 80243C88 03E00008 */ jr $ra -/* C7510C 80243C8C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_8024001C_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_8024001C_C76CE0.s deleted file mode 100644 index 5002a43893..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_8024001C_C76CE0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_C76CFC -/* C76CFC 8024001C 3C02800A */ lui $v0, %hi(D_8009A650) -/* C76D00 80240020 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* C76D04 80240024 8C430000 */ lw $v1, ($v0) -/* C76D08 80240028 2404FFBF */ addiu $a0, $zero, -0x41 -/* C76D0C 8024002C 00641824 */ and $v1, $v1, $a0 -/* C76D10 80240030 AC430000 */ sw $v1, ($v0) -/* C76D14 80240034 03E00008 */ jr $ra -/* C76D18 80240038 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_8024003C_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_8024003C_C76CE0.s deleted file mode 100644 index 4115243d14..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_8024003C_C76CE0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024003C_C76D1C -/* C76D1C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C76D20 80240040 AFBF0010 */ sw $ra, 0x10($sp) -/* C76D24 80240044 8C82000C */ lw $v0, 0xc($a0) -/* C76D28 80240048 0C0B1EAF */ jal get_variable -/* C76D2C 8024004C 8C450000 */ lw $a1, ($v0) -/* C76D30 80240050 0C0B95A4 */ jal func_802E5690 -/* C76D34 80240054 0040202D */ daddu $a0, $v0, $zero -/* C76D38 80240058 8FBF0010 */ lw $ra, 0x10($sp) -/* C76D3C 8024005C 24020002 */ addiu $v0, $zero, 2 -/* C76D40 80240060 03E00008 */ jr $ra -/* C76D44 80240064 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240068_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80240068_C76CE0.s deleted file mode 100644 index 6f3a968b30..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240068_C76CE0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240068_C76D48 -/* C76D48 80240068 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C76D4C 8024006C AFB00010 */ sw $s0, 0x10($sp) -/* C76D50 80240070 0080802D */ daddu $s0, $a0, $zero -/* C76D54 80240074 AFBF0018 */ sw $ra, 0x18($sp) -/* C76D58 80240078 AFB10014 */ sw $s1, 0x14($sp) -/* C76D5C 8024007C 8E11000C */ lw $s1, 0xc($s0) -/* C76D60 80240080 8E250000 */ lw $a1, ($s1) -/* C76D64 80240084 0C0B1EAF */ jal get_variable -/* C76D68 80240088 26310004 */ addiu $s1, $s1, 4 -/* C76D6C 8024008C 0200202D */ daddu $a0, $s0, $zero -/* C76D70 80240090 3C038011 */ lui $v1, %hi(gPlayerData) -/* C76D74 80240094 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* C76D78 80240098 000210C0 */ sll $v0, $v0, 3 -/* C76D7C 8024009C 00431021 */ addu $v0, $v0, $v1 -/* C76D80 802400A0 90460015 */ lbu $a2, 0x15($v0) -/* C76D84 802400A4 8E250000 */ lw $a1, ($s1) -/* C76D88 802400A8 24C60001 */ addiu $a2, $a2, 1 -/* C76D8C 802400AC A0460015 */ sb $a2, 0x15($v0) -/* C76D90 802400B0 00063600 */ sll $a2, $a2, 0x18 -/* C76D94 802400B4 0C0B2026 */ jal set_variable -/* C76D98 802400B8 00063603 */ sra $a2, $a2, 0x18 -/* C76D9C 802400BC 8FBF0018 */ lw $ra, 0x18($sp) -/* C76DA0 802400C0 8FB10014 */ lw $s1, 0x14($sp) -/* C76DA4 802400C4 8FB00010 */ lw $s0, 0x10($sp) -/* C76DA8 802400C8 24020002 */ addiu $v0, $zero, 2 -/* C76DAC 802400CC 03E00008 */ jr $ra -/* C76DB0 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_802400D4_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_802400D4_C76CE0.s deleted file mode 100644 index cef1925356..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_802400D4_C76CE0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400D4_C76DB4 -/* C76DB4 802400D4 3C028011 */ lui $v0, %hi(gPlayerData) -/* C76DB8 802400D8 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* C76DBC 802400DC 000420C0 */ sll $a0, $a0, 3 -/* C76DC0 802400E0 00822021 */ addu $a0, $a0, $v0 -/* C76DC4 802400E4 90820014 */ lbu $v0, 0x14($a0) -/* C76DC8 802400E8 10400009 */ beqz $v0, .L80240110 -/* C76DCC 802400EC 00000000 */ nop -/* C76DD0 802400F0 90820015 */ lbu $v0, 0x15($a0) -/* C76DD4 802400F4 00022600 */ sll $a0, $v0, 0x18 -/* C76DD8 802400F8 00041E03 */ sra $v1, $a0, 0x18 -/* C76DDC 802400FC 00051400 */ sll $v0, $a1, 0x10 -/* C76DE0 80240100 00021403 */ sra $v0, $v0, 0x10 -/* C76DE4 80240104 0043102A */ slt $v0, $v0, $v1 -/* C76DE8 80240108 10400003 */ beqz $v0, .L80240118 -/* C76DEC 8024010C 00000000 */ nop -.L80240110: -/* C76DF0 80240110 03E00008 */ jr $ra -/* C76DF4 80240114 2402FFFF */ addiu $v0, $zero, -1 -.L80240118: -/* C76DF8 80240118 03E00008 */ jr $ra -/* C76DFC 8024011C 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240120_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80240120_C76CE0.s deleted file mode 100644 index 5ce44e9a5f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240120_C76CE0.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240120_C76E00 -/* C76E00 80240120 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C76E04 80240124 AFB3001C */ sw $s3, 0x1c($sp) -/* C76E08 80240128 0080982D */ daddu $s3, $a0, $zero -/* C76E0C 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* C76E10 80240130 24100001 */ addiu $s0, $zero, 1 -/* C76E14 80240134 AFB40020 */ sw $s4, 0x20($sp) -/* C76E18 80240138 2414FFFF */ addiu $s4, $zero, -1 -/* C76E1C 8024013C AFB50024 */ sw $s5, 0x24($sp) -/* C76E20 80240140 0200A82D */ daddu $s5, $s0, $zero -/* C76E24 80240144 AFB10014 */ sw $s1, 0x14($sp) -/* C76E28 80240148 3C118011 */ lui $s1, 0x8011 -/* C76E2C 8024014C 2631F298 */ addiu $s1, $s1, -0xd68 -/* C76E30 80240150 AFBF0028 */ sw $ra, 0x28($sp) -/* C76E34 80240154 AFB20018 */ sw $s2, 0x18($sp) -/* C76E38 80240158 8E6200B4 */ lw $v0, 0xb4($s3) -/* C76E3C 8024015C 0280182D */ daddu $v1, $s4, $zero -/* C76E40 80240160 AE630084 */ sw $v1, 0x84($s3) -/* C76E44 80240164 00021027 */ nor $v0, $zero, $v0 -/* C76E48 80240168 000217C2 */ srl $v0, $v0, 0x1f -/* C76E4C 8024016C 00029400 */ sll $s2, $v0, 0x10 -.L80240170: -/* C76E50 80240170 92220014 */ lbu $v0, 0x14($s1) -/* C76E54 80240174 50400008 */ beql $v0, $zero, .L80240198 -/* C76E58 80240178 26100001 */ addiu $s0, $s0, 1 -/* C76E5C 8024017C 0200202D */ daddu $a0, $s0, $zero -/* C76E60 80240180 0C090035 */ jal func_802400D4 -/* C76E64 80240184 00122C03 */ sra $a1, $s2, 0x10 -/* C76E68 80240188 10540003 */ beq $v0, $s4, .L80240198 -/* C76E6C 8024018C 26100001 */ addiu $s0, $s0, 1 -/* C76E70 80240190 08090069 */ j .L802401A4 -/* C76E74 80240194 AE750084 */ sw $s5, 0x84($s3) -.L80240198: -/* C76E78 80240198 2A02000C */ slti $v0, $s0, 0xc -/* C76E7C 8024019C 1440FFF4 */ bnez $v0, .L80240170 -/* C76E80 802401A0 26310008 */ addiu $s1, $s1, 8 -.L802401A4: -/* C76E84 802401A4 8FBF0028 */ lw $ra, 0x28($sp) -/* C76E88 802401A8 8FB50024 */ lw $s5, 0x24($sp) -/* C76E8C 802401AC 8FB40020 */ lw $s4, 0x20($sp) -/* C76E90 802401B0 8FB3001C */ lw $s3, 0x1c($sp) -/* C76E94 802401B4 8FB20018 */ lw $s2, 0x18($sp) -/* C76E98 802401B8 8FB10014 */ lw $s1, 0x14($sp) -/* C76E9C 802401BC 8FB00010 */ lw $s0, 0x10($sp) -/* C76EA0 802401C0 24020002 */ addiu $v0, $zero, 2 -/* C76EA4 802401C4 03E00008 */ jr $ra -/* C76EA8 802401C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_802401CC_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_802401CC_C76CE0.s deleted file mode 100644 index a430692d79..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_802401CC_C76CE0.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401CC_C76EAC -/* C76EAC 802401CC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C76EB0 802401D0 AFB5002C */ sw $s5, 0x2c($sp) -/* C76EB4 802401D4 0080A82D */ daddu $s5, $a0, $zero -/* C76EB8 802401D8 AFBE0038 */ sw $fp, 0x38($sp) -/* C76EBC 802401DC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* C76EC0 802401E0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* C76EC4 802401E4 AFBF003C */ sw $ra, 0x3c($sp) -/* C76EC8 802401E8 AFB70034 */ sw $s7, 0x34($sp) -/* C76ECC 802401EC AFB60030 */ sw $s6, 0x30($sp) -/* C76ED0 802401F0 AFB40028 */ sw $s4, 0x28($sp) -/* C76ED4 802401F4 AFB30024 */ sw $s3, 0x24($sp) -/* C76ED8 802401F8 AFB20020 */ sw $s2, 0x20($sp) -/* C76EDC 802401FC AFB1001C */ sw $s1, 0x1c($sp) -/* C76EE0 80240200 10A0004F */ beqz $a1, .L80240340 -/* C76EE4 80240204 AFB00018 */ sw $s0, 0x18($sp) -/* C76EE8 80240208 0C00AB39 */ jal heap_malloc -/* C76EEC 8024020C 24040330 */ addiu $a0, $zero, 0x330 -/* C76EF0 80240210 0040982D */ daddu $s3, $v0, $zero -/* C76EF4 80240214 0000B02D */ daddu $s6, $zero, $zero -/* C76EF8 80240218 02C0902D */ daddu $s2, $s6, $zero -/* C76EFC 8024021C 3C148024 */ lui $s4, 0x8024 -/* C76F00 80240220 26943D08 */ addiu $s4, $s4, 0x3d08 -/* C76F04 80240224 0260882D */ daddu $s1, $s3, $zero -/* C76F08 80240228 8EA200B4 */ lw $v0, 0xb4($s5) -/* C76F0C 8024022C 3C038024 */ lui $v1, 0x8024 -/* C76F10 80240230 24633D00 */ addiu $v1, $v1, 0x3d00 -/* C76F14 80240234 AEB30078 */ sw $s3, 0x78($s5) -/* C76F18 80240238 00021027 */ nor $v0, $zero, $v0 -/* C76F1C 8024023C 0002BFC2 */ srl $s7, $v0, 0x1f -/* C76F20 80240240 00171080 */ sll $v0, $s7, 2 -/* C76F24 80240244 00431021 */ addu $v0, $v0, $v1 -/* C76F28 80240248 AFA20010 */ sw $v0, 0x10($sp) -.L8024024C: -/* C76F2C 8024024C 86900000 */ lh $s0, ($s4) -/* C76F30 80240250 001010C0 */ sll $v0, $s0, 3 -/* C76F34 80240254 03C21021 */ addu $v0, $fp, $v0 -/* C76F38 80240258 90420014 */ lbu $v0, 0x14($v0) -/* C76F3C 8024025C 5040002E */ beql $v0, $zero, .L80240318 -/* C76F40 80240260 26520001 */ addiu $s2, $s2, 1 -/* C76F44 80240264 00101100 */ sll $v0, $s0, 4 -/* C76F48 80240268 3C068009 */ lui $a2, 0x8009 -/* C76F4C 8024026C 24C6EF20 */ addiu $a2, $a2, -0x10e0 -/* C76F50 80240270 00461021 */ addu $v0, $v0, $a2 -/* C76F54 80240274 0200202D */ daddu $a0, $s0, $zero -/* C76F58 80240278 AE300108 */ sw $s0, 0x108($s1) -/* C76F5C 8024027C 8C420000 */ lw $v0, ($v0) -/* C76F60 80240280 02E0282D */ daddu $a1, $s7, $zero -/* C76F64 80240284 0C090035 */ jal func_802400D4 -/* C76F68 80240288 AE220084 */ sw $v0, 0x84($s1) -/* C76F6C 8024028C 0040202D */ daddu $a0, $v0, $zero -/* C76F70 80240290 04800011 */ bltz $a0, .L802402D8 -/* C76F74 80240294 00101080 */ sll $v0, $s0, 2 -/* C76F78 80240298 3C06800F */ lui $a2, 0x800f -/* C76F7C 8024029C 24C67F00 */ addiu $a2, $a2, 0x7f00 -/* C76F80 802402A0 00461021 */ addu $v0, $v0, $a2 -/* C76F84 802402A4 8C430000 */ lw $v1, ($v0) -/* C76F88 802402A8 24020001 */ addiu $v0, $zero, 1 -/* C76F8C 802402AC AE22018C */ sw $v0, 0x18c($s1) -/* C76F90 802402B0 00041080 */ sll $v0, $a0, 2 -/* C76F94 802402B4 3C068024 */ lui $a2, 0x8024 -/* C76F98 802402B8 24C63D18 */ addiu $a2, $a2, 0x3d18 -/* C76F9C 802402BC AE230000 */ sw $v1, ($s1) -/* C76FA0 802402C0 001218C0 */ sll $v1, $s2, 3 -/* C76FA4 802402C4 00431021 */ addu $v0, $v0, $v1 -/* C76FA8 802402C8 00461021 */ addu $v0, $v0, $a2 -/* C76FAC 802402CC 8C420000 */ lw $v0, ($v0) -/* C76FB0 802402D0 080900BF */ j .L802402FC -/* C76FB4 802402D4 AE220294 */ sw $v0, 0x294($s1) -.L802402D8: -/* C76FB8 802402D8 3C06800F */ lui $a2, 0x800f -/* C76FBC 802402DC 24C67F40 */ addiu $a2, $a2, 0x7f40 -/* C76FC0 802402E0 00461021 */ addu $v0, $v0, $a2 -/* C76FC4 802402E4 8C420000 */ lw $v0, ($v0) -/* C76FC8 802402E8 AE20018C */ sw $zero, 0x18c($s1) -/* C76FCC 802402EC AE220000 */ sw $v0, ($s1) -/* C76FD0 802402F0 8FA60010 */ lw $a2, 0x10($sp) -/* C76FD4 802402F4 8CC20000 */ lw $v0, ($a2) -/* C76FD8 802402F8 AE220294 */ sw $v0, 0x294($s1) -.L802402FC: -/* C76FDC 802402FC 001010C0 */ sll $v0, $s0, 3 -/* C76FE0 80240300 03C21021 */ addu $v0, $fp, $v0 -/* C76FE4 80240304 80420015 */ lb $v0, 0x15($v0) -/* C76FE8 80240308 26D60001 */ addiu $s6, $s6, 1 -/* C76FEC 8024030C AE220210 */ sw $v0, 0x210($s1) -/* C76FF0 80240310 26310004 */ addiu $s1, $s1, 4 -/* C76FF4 80240314 26520001 */ addiu $s2, $s2, 1 -.L80240318: -/* C76FF8 80240318 2A420008 */ slti $v0, $s2, 8 -/* C76FFC 8024031C 1440FFCB */ bnez $v0, .L8024024C -/* C77000 80240320 26940002 */ addiu $s4, $s4, 2 -/* C77004 80240324 0260202D */ daddu $a0, $s3, $zero -/* C77008 80240328 24020004 */ addiu $v0, $zero, 4 -/* C7700C 8024032C AC820318 */ sw $v0, 0x318($a0) -/* C77010 80240330 AC960324 */ sw $s6, 0x324($a0) -/* C77014 80240334 0C03D390 */ jal func_800F4E40 -/* C77018 80240338 AC800328 */ sw $zero, 0x328($a0) -/* C7701C 8024033C AEA00070 */ sw $zero, 0x70($s5) -.L80240340: -/* C77020 80240340 8EA20070 */ lw $v0, 0x70($s5) -/* C77024 80240344 8EB30078 */ lw $s3, 0x78($s5) -/* C77028 80240348 14400008 */ bnez $v0, .L8024036C -/* C7702C 8024034C 24420001 */ addiu $v0, $v0, 1 -/* C77030 80240350 8662032C */ lh $v0, 0x32c($s3) -/* C77034 80240354 10400009 */ beqz $v0, .L8024037C -/* C77038 80240358 AEA20074 */ sw $v0, 0x74($s5) -/* C7703C 8024035C 0C03C4EC */ jal func_800F13B0 -/* C77040 80240360 00000000 */ nop -/* C77044 80240364 8EA20070 */ lw $v0, 0x70($s5) -/* C77048 80240368 24420001 */ addiu $v0, $v0, 1 -.L8024036C: -/* C7704C 8024036C AEA20070 */ sw $v0, 0x70($s5) -/* C77050 80240370 2842000F */ slti $v0, $v0, 0xf -/* C77054 80240374 10400003 */ beqz $v0, .L80240384 -/* C77058 80240378 00000000 */ nop -.L8024037C: -/* C7705C 8024037C 080900FB */ j .L802403EC -/* C77060 80240380 0000102D */ daddu $v0, $zero, $zero -.L80240384: -/* C77064 80240384 0C03C54E */ jal func_800F1538 -/* C77068 80240388 00000000 */ nop -/* C7706C 8024038C 8EA30074 */ lw $v1, 0x74($s5) -/* C77070 80240390 240200FF */ addiu $v0, $zero, 0xff -/* C77074 80240394 10620010 */ beq $v1, $v0, .L802403D8 -/* C77078 80240398 2462FFFF */ addiu $v0, $v1, -1 -/* C7707C 8024039C 00021080 */ sll $v0, $v0, 2 -/* C77080 802403A0 02621021 */ addu $v0, $s3, $v0 -/* C77084 802403A4 8C420108 */ lw $v0, 0x108($v0) -/* C77088 802403A8 00021100 */ sll $v0, $v0, 4 -/* C7708C 802403AC 3C038009 */ lui $v1, 0x8009 -/* C77090 802403B0 00621821 */ addu $v1, $v1, $v0 -/* C77094 802403B4 8C63EF20 */ lw $v1, -0x10e0($v1) -/* C77098 802403B8 8EA20074 */ lw $v0, 0x74($s5) -/* C7709C 802403BC 2442FFFF */ addiu $v0, $v0, -1 -/* C770A0 802403C0 00021080 */ sll $v0, $v0, 2 -/* C770A4 802403C4 02621021 */ addu $v0, $s3, $v0 -/* C770A8 802403C8 AEA30084 */ sw $v1, 0x84($s5) -/* C770AC 802403CC 8C420108 */ lw $v0, 0x108($v0) -/* C770B0 802403D0 080900F8 */ j .L802403E0 -/* C770B4 802403D4 AEA20088 */ sw $v0, 0x88($s5) -.L802403D8: -/* C770B8 802403D8 2402FFFF */ addiu $v0, $zero, -1 -/* C770BC 802403DC AEA20084 */ sw $v0, 0x84($s5) -.L802403E0: -/* C770C0 802403E0 0C00AB4B */ jal heap_free -/* C770C4 802403E4 8EA40078 */ lw $a0, 0x78($s5) -/* C770C8 802403E8 24020002 */ addiu $v0, $zero, 2 -.L802403EC: -/* C770CC 802403EC 8FBF003C */ lw $ra, 0x3c($sp) -/* C770D0 802403F0 8FBE0038 */ lw $fp, 0x38($sp) -/* C770D4 802403F4 8FB70034 */ lw $s7, 0x34($sp) -/* C770D8 802403F8 8FB60030 */ lw $s6, 0x30($sp) -/* C770DC 802403FC 8FB5002C */ lw $s5, 0x2c($sp) -/* C770E0 80240400 8FB40028 */ lw $s4, 0x28($sp) -/* C770E4 80240404 8FB30024 */ lw $s3, 0x24($sp) -/* C770E8 80240408 8FB20020 */ lw $s2, 0x20($sp) -/* C770EC 8024040C 8FB1001C */ lw $s1, 0x1c($sp) -/* C770F0 80240410 8FB00018 */ lw $s0, 0x18($sp) -/* C770F4 80240414 03E00008 */ jr $ra -/* C770F8 80240418 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_8024041C_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_8024041C_C76CE0.s deleted file mode 100644 index af9597c5a4..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_8024041C_C76CE0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024041C_C770FC -/* C770FC 8024041C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C77100 80240420 AFBF0010 */ sw $ra, 0x10($sp) -/* C77104 80240424 8C82000C */ lw $v0, 0xc($a0) -/* C77108 80240428 0C0B1EAF */ jal get_variable -/* C7710C 8024042C 8C450000 */ lw $a1, ($v0) -/* C77110 80240430 0C03AC5A */ jal func_800EB168 -/* C77114 80240434 0040202D */ daddu $a0, $v0, $zero -/* C77118 80240438 8FBF0010 */ lw $ra, 0x10($sp) -/* C7711C 8024043C 24020002 */ addiu $v0, $zero, 2 -/* C77120 80240440 03E00008 */ jr $ra -/* C77124 80240444 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240448_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80240448_C76CE0.s deleted file mode 100644 index 0508dc7eed..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240448_C76CE0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240448_C77128 -/* C77128 80240448 3C028011 */ lui $v0, 0x8011 -/* C7712C 8024044C 8042F2A2 */ lb $v0, -0xd5e($v0) -/* C77130 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C77134 80240454 AFBF0010 */ sw $ra, 0x10($sp) -/* C77138 80240458 00021100 */ sll $v0, $v0, 4 -/* C7713C 8024045C 3C048009 */ lui $a0, 0x8009 -/* C77140 80240460 00822021 */ addu $a0, $a0, $v0 -/* C77144 80240464 8C84EF20 */ lw $a0, -0x10e0($a0) -/* C77148 80240468 0C0496CF */ jal set_message_string -/* C7714C 8024046C 0000282D */ daddu $a1, $zero, $zero -/* C77150 80240470 8FBF0010 */ lw $ra, 0x10($sp) -/* C77154 80240474 24020002 */ addiu $v0, $zero, 2 -/* C77158 80240478 03E00008 */ jr $ra -/* C7715C 8024047C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240480_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80240480_C76CE0.s deleted file mode 100644 index 0a98b6bcd5..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240480_C76CE0.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240480_C77160 -/* C77160 80240480 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C77164 80240484 AFB1001C */ sw $s1, 0x1c($sp) -/* C77168 80240488 0080882D */ daddu $s1, $a0, $zero -/* C7716C 8024048C AFBF0020 */ sw $ra, 0x20($sp) -/* C77170 80240490 AFB00018 */ sw $s0, 0x18($sp) -/* C77174 80240494 8E30000C */ lw $s0, 0xc($s1) -/* C77178 80240498 8E050000 */ lw $a1, ($s0) -/* C7717C 8024049C 0C0B1EAF */ jal get_variable -/* C77180 802404A0 26100004 */ addiu $s0, $s0, 4 -/* C77184 802404A4 0C04417A */ jal get_entity_by_index -/* C77188 802404A8 0040202D */ daddu $a0, $v0, $zero -/* C7718C 802404AC 8E100000 */ lw $s0, ($s0) -/* C77190 802404B0 C444004C */ lwc1 $f4, 0x4c($v0) -/* C77194 802404B4 3C014148 */ lui $at, 0x4148 -/* C77198 802404B8 44810000 */ mtc1 $at, $f0 -/* C7719C 802404BC 3C013F33 */ lui $at, 0x3f33 -/* C771A0 802404C0 34213333 */ ori $at, $at, 0x3333 -/* C771A4 802404C4 44811000 */ mtc1 $at, $f2 -/* C771A8 802404C8 AFA00014 */ sw $zero, 0x14($sp) -/* C771AC 802404CC 46002100 */ add.s $f4, $f4, $f0 -/* C771B0 802404D0 E7A20010 */ swc1 $f2, 0x10($sp) -/* C771B4 802404D4 8C450048 */ lw $a1, 0x48($v0) -/* C771B8 802404D8 8C470050 */ lw $a3, 0x50($v0) -/* C771BC 802404DC 44062000 */ mfc1 $a2, $f4 -/* C771C0 802404E0 0C01C5D4 */ jal func_80071750 -/* C771C4 802404E4 0000202D */ daddu $a0, $zero, $zero -/* C771C8 802404E8 0220202D */ daddu $a0, $s1, $zero -/* C771CC 802404EC 0200282D */ daddu $a1, $s0, $zero -/* C771D0 802404F0 0C0B2026 */ jal set_variable -/* C771D4 802404F4 0040302D */ daddu $a2, $v0, $zero -/* C771D8 802404F8 8FBF0020 */ lw $ra, 0x20($sp) -/* C771DC 802404FC 8FB1001C */ lw $s1, 0x1c($sp) -/* C771E0 80240500 8FB00018 */ lw $s0, 0x18($sp) -/* C771E4 80240504 24020002 */ addiu $v0, $zero, 2 -/* C771E8 80240508 03E00008 */ jr $ra -/* C771EC 8024050C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240510_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80240510_C76CE0.s deleted file mode 100644 index 335f058451..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240510_C76CE0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240510_C771F0 -/* C771F0 80240510 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C771F4 80240514 AFBF0010 */ sw $ra, 0x10($sp) -/* C771F8 80240518 8C82000C */ lw $v0, 0xc($a0) -/* C771FC 8024051C 0C0B1EAF */ jal get_variable -/* C77200 80240520 8C450000 */ lw $a1, ($v0) -/* C77204 80240524 0040202D */ daddu $a0, $v0, $zero -/* C77208 80240528 8C830000 */ lw $v1, ($a0) -/* C7720C 8024052C 34630010 */ ori $v1, $v1, 0x10 -/* C77210 80240530 AC830000 */ sw $v1, ($a0) -/* C77214 80240534 8FBF0010 */ lw $ra, 0x10($sp) -/* C77218 80240538 24020002 */ addiu $v0, $zero, 2 -/* C7721C 8024053C 03E00008 */ jr $ra -/* C77220 80240540 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240544_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80240544_C76CE0.s deleted file mode 100644 index c509f5c05f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240544_C76CE0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240544_C77224 -/* C77224 80240544 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C77228 80240548 AFBF0018 */ sw $ra, 0x18($sp) -/* C7722C 8024054C 8C82000C */ lw $v0, 0xc($a0) -/* C77230 80240550 0C0B1EAF */ jal get_variable -/* C77234 80240554 8C450000 */ lw $a1, ($v0) -/* C77238 80240558 0C04417A */ jal get_entity_by_index -/* C7723C 8024055C 0040202D */ daddu $a0, $v0, $zero -/* C77240 80240560 3C013F80 */ lui $at, 0x3f80 -/* C77244 80240564 44810000 */ mtc1 $at, $f0 -/* C77248 80240568 C442004C */ lwc1 $f2, 0x4c($v0) -/* C7724C 8024056C E7A00010 */ swc1 $f0, 0x10($sp) -/* C77250 80240570 3C014148 */ lui $at, 0x4148 -/* C77254 80240574 44810000 */ mtc1 $at, $f0 -/* C77258 80240578 2403004B */ addiu $v1, $zero, 0x4b -/* C7725C 8024057C AFA30014 */ sw $v1, 0x14($sp) -/* C77260 80240580 46001080 */ add.s $f2, $f2, $f0 -/* C77264 80240584 8C450048 */ lw $a1, 0x48($v0) -/* C77268 80240588 8C470050 */ lw $a3, 0x50($v0) -/* C7726C 8024058C 44061000 */ mfc1 $a2, $f2 -/* C77270 80240590 0C01C2EC */ jal func_80070BB0 -/* C77274 80240594 24040004 */ addiu $a0, $zero, 4 -/* C77278 80240598 8FBF0018 */ lw $ra, 0x18($sp) -/* C7727C 8024059C 24020002 */ addiu $v0, $zero, 2 -/* C77280 802405A0 03E00008 */ jr $ra -/* C77284 802405A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_802405A8_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_802405A8_C76CE0.s deleted file mode 100644 index a02c191e5d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_802405A8_C76CE0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A8_C77288 -/* C77288 802405A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7728C 802405AC AFBF0018 */ sw $ra, 0x18($sp) -/* C77290 802405B0 0C00EAD2 */ jal get_npc_safe -/* C77294 802405B4 2404FFFC */ addiu $a0, $zero, -4 -/* C77298 802405B8 C444003C */ lwc1 $f4, 0x3c($v0) -/* C7729C 802405BC 3C014148 */ lui $at, 0x4148 -/* C772A0 802405C0 44811000 */ mtc1 $at, $f2 -/* C772A4 802405C4 3C013F80 */ lui $at, 0x3f80 -/* C772A8 802405C8 44810000 */ mtc1 $at, $f0 -/* C772AC 802405CC 2403001E */ addiu $v1, $zero, 0x1e -/* C772B0 802405D0 AFA30014 */ sw $v1, 0x14($sp) -/* C772B4 802405D4 46022100 */ add.s $f4, $f4, $f2 -/* C772B8 802405D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C772BC 802405DC 8C450038 */ lw $a1, 0x38($v0) -/* C772C0 802405E0 8C470040 */ lw $a3, 0x40($v0) -/* C772C4 802405E4 44062000 */ mfc1 $a2, $f4 -/* C772C8 802405E8 0C01C2EC */ jal func_80070BB0 -/* C772CC 802405EC 24040009 */ addiu $a0, $zero, 9 -/* C772D0 802405F0 8FBF0018 */ lw $ra, 0x18($sp) -/* C772D4 802405F4 24020002 */ addiu $v0, $zero, 2 -/* C772D8 802405F8 03E00008 */ jr $ra -/* C772DC 802405FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240600_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80240600_C76CE0.s deleted file mode 100644 index 9947f93d3a..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240600_C76CE0.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240600_C772E0 -/* C772E0 80240600 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* C772E4 80240604 AFB60040 */ sw $s6, 0x40($sp) -/* C772E8 80240608 0080B02D */ daddu $s6, $a0, $zero -/* C772EC 8024060C AFB00028 */ sw $s0, 0x28($sp) -/* C772F0 80240610 00A0802D */ daddu $s0, $a1, $zero -/* C772F4 80240614 AFBF0044 */ sw $ra, 0x44($sp) -/* C772F8 80240618 AFB5003C */ sw $s5, 0x3c($sp) -/* C772FC 8024061C AFB40038 */ sw $s4, 0x38($sp) -/* C77300 80240620 AFB30034 */ sw $s3, 0x34($sp) -/* C77304 80240624 AFB20030 */ sw $s2, 0x30($sp) -/* C77308 80240628 AFB1002C */ sw $s1, 0x2c($sp) -/* C7730C 8024062C F7B80058 */ sdc1 $f24, 0x58($sp) -/* C77310 80240630 F7B60050 */ sdc1 $f22, 0x50($sp) -/* C77314 80240634 F7B40048 */ sdc1 $f20, 0x48($sp) -/* C77318 80240638 8ED3000C */ lw $s3, 0xc($s6) -/* C7731C 8024063C 0C00EAD2 */ jal get_npc_safe -/* C77320 80240640 2404FFFC */ addiu $a0, $zero, -4 -/* C77324 80240644 27A50018 */ addiu $a1, $sp, 0x18 -/* C77328 80240648 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C7732C 8024064C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C77330 80240650 27A6001C */ addiu $a2, $sp, 0x1c -/* C77334 80240654 00041880 */ sll $v1, $a0, 2 -/* C77338 80240658 00641821 */ addu $v1, $v1, $a0 -/* C7733C 8024065C 00031880 */ sll $v1, $v1, 2 -/* C77340 80240660 00641823 */ subu $v1, $v1, $a0 -/* C77344 80240664 000320C0 */ sll $a0, $v1, 3 -/* C77348 80240668 00641821 */ addu $v1, $v1, $a0 -/* C7734C 8024066C 000318C0 */ sll $v1, $v1, 3 -/* C77350 80240670 3C01800B */ lui $at, 0x800b -/* C77354 80240674 00230821 */ addu $at, $at, $v1 -/* C77358 80240678 C42C1DEC */ lwc1 $f12, 0x1dec($at) -/* C7735C 8024067C 0C00A88D */ jal sin_cos_deg -/* C77360 80240680 0040A82D */ daddu $s5, $v0, $zero -/* C77364 80240684 1200005D */ beqz $s0, .L802407FC -/* C77368 80240688 00000000 */ nop -/* C7736C 8024068C 0C00AB0A */ jal general_heap_malloc -/* C77370 80240690 24040068 */ addiu $a0, $zero, 0x68 -/* C77374 80240694 0040902D */ daddu $s2, $v0, $zero -/* C77378 80240698 02C0202D */ daddu $a0, $s6, $zero -/* C7737C 8024069C 0000882D */ daddu $s1, $zero, $zero -/* C77380 802406A0 2414FFFF */ addiu $s4, $zero, -1 -/* C77384 802406A4 AED20060 */ sw $s2, 0x60($s6) -/* C77388 802406A8 8E650000 */ lw $a1, ($s3) -/* C7738C 802406AC 3C014148 */ lui $at, 0x4148 -/* C77390 802406B0 4481C000 */ mtc1 $at, $f24 -/* C77394 802406B4 3C013F80 */ lui $at, 0x3f80 -/* C77398 802406B8 4481B000 */ mtc1 $at, $f22 -/* C7739C 802406BC 4480A000 */ mtc1 $zero, $f20 -/* C773A0 802406C0 0C0B1EAF */ jal get_variable -/* C773A4 802406C4 0240802D */ daddu $s0, $s2, $zero -/* C773A8 802406C8 0C04417A */ jal get_entity_by_index -/* C773AC 802406CC 0040202D */ daddu $a0, $v0, $zero -/* C773B0 802406D0 AE42005C */ sw $v0, 0x5c($s2) -.L802406D4: -/* C773B4 802406D4 8E42005C */ lw $v0, 0x5c($s2) -/* C773B8 802406D8 C440004C */ lwc1 $f0, 0x4c($v0) -/* C773BC 802406DC 0000202D */ daddu $a0, $zero, $zero -/* C773C0 802406E0 E7B60010 */ swc1 $f22, 0x10($sp) -/* C773C4 802406E4 AFB40014 */ sw $s4, 0x14($sp) -/* C773C8 802406E8 46180000 */ add.s $f0, $f0, $f24 -/* C773CC 802406EC 8C450048 */ lw $a1, 0x48($v0) -/* C773D0 802406F0 8C470050 */ lw $a3, 0x50($v0) -/* C773D4 802406F4 44060000 */ mfc1 $a2, $f0 -/* C773D8 802406F8 0C01C5BC */ jal func_800716F0 -/* C773DC 802406FC 26310001 */ addiu $s1, $s1, 1 -/* C773E0 80240700 AE020008 */ sw $v0, 8($s0) -/* C773E4 80240704 E614002C */ swc1 $f20, 0x2c($s0) -/* C773E8 80240708 E6140020 */ swc1 $f20, 0x20($s0) -/* C773EC 8024070C E6140014 */ swc1 $f20, 0x14($s0) -/* C773F0 80240710 E6140050 */ swc1 $f20, 0x50($s0) -/* C773F4 80240714 E6140044 */ swc1 $f20, 0x44($s0) -/* C773F8 80240718 E6140038 */ swc1 $f20, 0x38($s0) -/* C773FC 8024071C 2A220003 */ slti $v0, $s1, 3 -/* C77400 80240720 1440FFEC */ bnez $v0, .L802406D4 -/* C77404 80240724 26100004 */ addiu $s0, $s0, 4 -/* C77408 80240728 0000882D */ daddu $s1, $zero, $zero -/* C7740C 8024072C 0240802D */ daddu $s0, $s2, $zero -/* C77410 80240730 3C148024 */ lui $s4, 0x8024 -/* C77414 80240734 26943D58 */ addiu $s4, $s4, 0x3d58 -/* C77418 80240738 3C014248 */ lui $at, 0x4248 -/* C7741C 8024073C 4481A000 */ mtc1 $at, $f20 -/* C77420 80240740 24130044 */ addiu $s3, $zero, 0x44 -/* C77424 80240744 AE400000 */ sw $zero, ($s2) -/* C77428 80240748 AE400004 */ sw $zero, 4($s2) -/* C7742C 8024074C AE400060 */ sw $zero, 0x60($s2) -/* C77430 80240750 AE400064 */ sw $zero, 0x64($s2) -.L80240754: -/* C77434 80240754 27A40020 */ addiu $a0, $sp, 0x20 -/* C77438 80240758 4406A000 */ mfc1 $a2, $f20 -/* C7743C 8024075C 8E870000 */ lw $a3, ($s4) -/* C77440 80240760 02532821 */ addu $a1, $s2, $s3 -/* C77444 80240764 0C00A7E7 */ jal add_vec2D_polar -/* C77448 80240768 AFA00020 */ sw $zero, 0x20($sp) -/* C7744C 8024076C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* C77450 80240770 C7A40020 */ lwc1 $f4, 0x20($sp) -/* C77454 80240774 46041082 */ mul.s $f2, $f2, $f4 -/* C77458 80240778 00000000 */ nop -/* C7745C 8024077C C7A00018 */ lwc1 $f0, 0x18($sp) -/* C77460 80240780 46040002 */ mul.s $f0, $f0, $f4 -/* C77464 80240784 00000000 */ nop -/* C77468 80240788 E6020038 */ swc1 $f2, 0x38($s0) -/* C7746C 8024078C E6000050 */ swc1 $f0, 0x50($s0) -/* C77470 80240790 8E42005C */ lw $v0, 0x5c($s2) -/* C77474 80240794 C6000038 */ lwc1 $f0, 0x38($s0) -/* C77478 80240798 C4420048 */ lwc1 $f2, 0x48($v0) -/* C7747C 8024079C 46001080 */ add.s $f2, $f2, $f0 -/* C77480 802407A0 C6A00038 */ lwc1 $f0, 0x38($s5) -/* C77484 802407A4 46020001 */ sub.s $f0, $f0, $f2 -/* C77488 802407A8 E6000038 */ swc1 $f0, 0x38($s0) -/* C7748C 802407AC 8E42005C */ lw $v0, 0x5c($s2) -/* C77490 802407B0 C6000044 */ lwc1 $f0, 0x44($s0) -/* C77494 802407B4 C442004C */ lwc1 $f2, 0x4c($v0) -/* C77498 802407B8 46001080 */ add.s $f2, $f2, $f0 -/* C7749C 802407BC C6A0003C */ lwc1 $f0, 0x3c($s5) -/* C774A0 802407C0 46020001 */ sub.s $f0, $f0, $f2 -/* C774A4 802407C4 E6000044 */ swc1 $f0, 0x44($s0) -/* C774A8 802407C8 8E42005C */ lw $v0, 0x5c($s2) -/* C774AC 802407CC C6000050 */ lwc1 $f0, 0x50($s0) -/* C774B0 802407D0 C4420050 */ lwc1 $f2, 0x50($v0) -/* C774B4 802407D4 26940004 */ addiu $s4, $s4, 4 -/* C774B8 802407D8 46001080 */ add.s $f2, $f2, $f0 -/* C774BC 802407DC C6A00040 */ lwc1 $f0, 0x40($s5) -/* C774C0 802407E0 26730004 */ addiu $s3, $s3, 4 -/* C774C4 802407E4 46020001 */ sub.s $f0, $f0, $f2 -/* C774C8 802407E8 26310001 */ addiu $s1, $s1, 1 -/* C774CC 802407EC 2A220003 */ slti $v0, $s1, 3 -/* C774D0 802407F0 E6000050 */ swc1 $f0, 0x50($s0) -/* C774D4 802407F4 1440FFD7 */ bnez $v0, .L80240754 -/* C774D8 802407F8 26100004 */ addiu $s0, $s0, 4 -.L802407FC: -/* C774DC 802407FC 8ED20060 */ lw $s2, 0x60($s6) -/* C774E0 80240800 8E430000 */ lw $v1, ($s2) -/* C774E4 80240804 24020001 */ addiu $v0, $zero, 1 -/* C774E8 80240808 10620038 */ beq $v1, $v0, .L802408EC -/* C774EC 8024080C 28620002 */ slti $v0, $v1, 2 -/* C774F0 80240810 50400005 */ beql $v0, $zero, .L80240828 -/* C774F4 80240814 24020002 */ addiu $v0, $zero, 2 -/* C774F8 80240818 10600007 */ beqz $v1, .L80240838 -/* C774FC 8024081C 24040005 */ addiu $a0, $zero, 5 -/* C77500 80240820 08090274 */ j .L802409D0 -/* C77504 80240824 00000000 */ nop -.L80240828: -/* C77508 80240828 10620058 */ beq $v1, $v0, .L8024098C -/* C7750C 8024082C 00000000 */ nop -/* C77510 80240830 08090274 */ j .L802409D0 -/* C77514 80240834 00000000 */ nop -.L80240838: -/* C77518 80240838 0000882D */ daddu $s1, $zero, $zero -/* C7751C 8024083C 3C148024 */ lui $s4, 0x8024 -/* C77520 80240840 26943D58 */ addiu $s4, $s4, 0x3d58 -/* C77524 80240844 24130020 */ addiu $s3, $zero, 0x20 -/* C77528 80240848 3C064248 */ lui $a2, 0x4248 -/* C7752C 8024084C 44800000 */ mtc1 $zero, $f0 -/* C77530 80240850 24020014 */ addiu $v0, $zero, 0x14 -/* C77534 80240854 AFA20010 */ sw $v0, 0x10($sp) -/* C77538 80240858 44050000 */ mfc1 $a1, $f0 -/* C7753C 8024085C 8E470060 */ lw $a3, 0x60($s2) -/* C77540 80240860 4485B000 */ mtc1 $a1, $f22 -/* C77544 80240864 0C00A8ED */ jal update_lerp -/* C77548 80240868 0240802D */ daddu $s0, $s2, $zero -/* C7754C 8024086C 46000506 */ mov.s $f20, $f0 -.L80240870: -/* C77550 80240870 4406A000 */ mfc1 $a2, $f20 -/* C77554 80240874 27A40020 */ addiu $a0, $sp, 0x20 -/* C77558 80240878 E6160020 */ swc1 $f22, 0x20($s0) -/* C7755C 8024087C 8E870000 */ lw $a3, ($s4) -/* C77560 80240880 02532821 */ addu $a1, $s2, $s3 -/* C77564 80240884 0C00A7E7 */ jal add_vec2D_polar -/* C77568 80240888 E7B60020 */ swc1 $f22, 0x20($sp) -/* C7756C 8024088C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* C77570 80240890 C7A00020 */ lwc1 $f0, 0x20($sp) -/* C77574 80240894 46002102 */ mul.s $f4, $f4, $f0 -/* C77578 80240898 00000000 */ nop -/* C7757C 8024089C C7A20018 */ lwc1 $f2, 0x18($sp) -/* C77580 802408A0 26940004 */ addiu $s4, $s4, 4 -/* C77584 802408A4 46001082 */ mul.s $f2, $f2, $f0 -/* C77588 802408A8 00000000 */ nop -/* C7758C 802408AC 26730004 */ addiu $s3, $s3, 4 -/* C77590 802408B0 26310001 */ addiu $s1, $s1, 1 -/* C77594 802408B4 2A220003 */ slti $v0, $s1, 3 -/* C77598 802408B8 E6040014 */ swc1 $f4, 0x14($s0) -/* C7759C 802408BC E602002C */ swc1 $f2, 0x2c($s0) -/* C775A0 802408C0 1440FFEB */ bnez $v0, .L80240870 -/* C775A4 802408C4 26100004 */ addiu $s0, $s0, 4 -/* C775A8 802408C8 8E420060 */ lw $v0, 0x60($s2) -/* C775AC 802408CC 24420001 */ addiu $v0, $v0, 1 -/* C775B0 802408D0 AE420060 */ sw $v0, 0x60($s2) -/* C775B4 802408D4 28420015 */ slti $v0, $v0, 0x15 -/* C775B8 802408D8 1440003D */ bnez $v0, .L802409D0 -/* C775BC 802408DC 24020001 */ addiu $v0, $zero, 1 -/* C775C0 802408E0 AE420000 */ sw $v0, ($s2) -/* C775C4 802408E4 08090274 */ j .L802409D0 -/* C775C8 802408E8 AE400060 */ sw $zero, 0x60($s2) -.L802408EC: -/* C775CC 802408EC 0000882D */ daddu $s1, $zero, $zero -/* C775D0 802408F0 3C148024 */ lui $s4, 0x8024 -/* C775D4 802408F4 26943D58 */ addiu $s4, $s4, 0x3d58 -/* C775D8 802408F8 24130020 */ addiu $s3, $zero, 0x20 -/* C775DC 802408FC 0240802D */ daddu $s0, $s2, $zero -/* C775E0 80240900 3C014248 */ lui $at, 0x4248 -/* C775E4 80240904 4481A000 */ mtc1 $at, $f20 -/* C775E8 80240908 4480B000 */ mtc1 $zero, $f22 -.L8024090C: -/* C775EC 8024090C 4406A000 */ mfc1 $a2, $f20 -/* C775F0 80240910 27A40020 */ addiu $a0, $sp, 0x20 -/* C775F4 80240914 E6160020 */ swc1 $f22, 0x20($s0) -/* C775F8 80240918 8E870000 */ lw $a3, ($s4) -/* C775FC 8024091C 02532821 */ addu $a1, $s2, $s3 -/* C77600 80240920 0C00A7E7 */ jal add_vec2D_polar -/* C77604 80240924 E7B60020 */ swc1 $f22, 0x20($sp) -/* C77608 80240928 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* C7760C 8024092C C7A00020 */ lwc1 $f0, 0x20($sp) -/* C77610 80240930 46002102 */ mul.s $f4, $f4, $f0 -/* C77614 80240934 00000000 */ nop -/* C77618 80240938 C7A20018 */ lwc1 $f2, 0x18($sp) -/* C7761C 8024093C 26940004 */ addiu $s4, $s4, 4 -/* C77620 80240940 46001082 */ mul.s $f2, $f2, $f0 -/* C77624 80240944 00000000 */ nop -/* C77628 80240948 26730004 */ addiu $s3, $s3, 4 -/* C7762C 8024094C 26310001 */ addiu $s1, $s1, 1 -/* C77630 80240950 2A220003 */ slti $v0, $s1, 3 -/* C77634 80240954 E6040014 */ swc1 $f4, 0x14($s0) -/* C77638 80240958 E602002C */ swc1 $f2, 0x2c($s0) -/* C7763C 8024095C 1440FFEB */ bnez $v0, .L8024090C -/* C77640 80240960 26100004 */ addiu $s0, $s0, 4 -/* C77644 80240964 8E420060 */ lw $v0, 0x60($s2) -/* C77648 80240968 24420001 */ addiu $v0, $v0, 1 -/* C7764C 8024096C AE420060 */ sw $v0, 0x60($s2) -/* C77650 80240970 28420010 */ slti $v0, $v0, 0x10 -/* C77654 80240974 14400016 */ bnez $v0, .L802409D0 -/* C77658 80240978 2402000F */ addiu $v0, $zero, 0xf -/* C7765C 8024097C AE420060 */ sw $v0, 0x60($s2) -/* C77660 80240980 24020002 */ addiu $v0, $zero, 2 -/* C77664 80240984 08090274 */ j .L802409D0 -/* C77668 80240988 AE420000 */ sw $v0, ($s2) -.L8024098C: -/* C7766C 8024098C 8E420060 */ lw $v0, 0x60($s2) -/* C77670 80240990 24420001 */ addiu $v0, $v0, 1 -/* C77674 80240994 AE420060 */ sw $v0, 0x60($s2) -/* C77678 80240998 2842001F */ slti $v0, $v0, 0x1f -/* C7767C 8024099C 1440000C */ bnez $v0, .L802409D0 -/* C77680 802409A0 0000882D */ daddu $s1, $zero, $zero -/* C77684 802409A4 0240282D */ daddu $a1, $s2, $zero -.L802409A8: -/* C77688 802409A8 8CA20008 */ lw $v0, 8($a1) -/* C7768C 802409AC 8C430000 */ lw $v1, ($v0) -/* C77690 802409B0 26310001 */ addiu $s1, $s1, 1 -/* C77694 802409B4 34630010 */ ori $v1, $v1, 0x10 -/* C77698 802409B8 AC430000 */ sw $v1, ($v0) -/* C7769C 802409BC 2A220003 */ slti $v0, $s1, 3 -/* C776A0 802409C0 1440FFF9 */ bnez $v0, .L802409A8 -/* C776A4 802409C4 24A50004 */ addiu $a1, $a1, 4 -/* C776A8 802409C8 080902C1 */ j .L80240B04 -/* C776AC 802409CC 24020002 */ addiu $v0, $zero, 2 -.L802409D0: -/* C776B0 802409D0 8E430004 */ lw $v1, 4($s2) -/* C776B4 802409D4 10600005 */ beqz $v1, .L802409EC -/* C776B8 802409D8 24020001 */ addiu $v0, $zero, 1 -/* C776BC 802409DC 1062000B */ beq $v1, $v0, .L80240A0C -/* C776C0 802409E0 0000882D */ daddu $s1, $zero, $zero -/* C776C4 802409E4 080902B0 */ j .L80240AC0 -/* C776C8 802409E8 0240282D */ daddu $a1, $s2, $zero -.L802409EC: -/* C776CC 802409EC 8E420064 */ lw $v0, 0x64($s2) -/* C776D0 802409F0 24420001 */ addiu $v0, $v0, 1 -/* C776D4 802409F4 AE420064 */ sw $v0, 0x64($s2) -/* C776D8 802409F8 28420010 */ slti $v0, $v0, 0x10 -/* C776DC 802409FC 1440002F */ bnez $v0, .L80240ABC -/* C776E0 80240A00 0000882D */ daddu $s1, $zero, $zero -/* C776E4 80240A04 080902AC */ j .L80240AB0 -/* C776E8 80240A08 24020001 */ addiu $v0, $zero, 1 -.L80240A0C: -/* C776EC 80240A0C 4480A000 */ mtc1 $zero, $f20 -/* C776F0 80240A10 24130014 */ addiu $s3, $zero, 0x14 -/* C776F4 80240A14 0240802D */ daddu $s0, $s2, $zero -.L80240A18: -/* C776F8 80240A18 4405A000 */ mfc1 $a1, $f20 -/* C776FC 80240A1C AFB30010 */ sw $s3, 0x10($sp) -/* C77700 80240A20 8E060038 */ lw $a2, 0x38($s0) -/* C77704 80240A24 8E470064 */ lw $a3, 0x64($s2) -/* C77708 80240A28 0C00A8ED */ jal update_lerp -/* C7770C 80240A2C 24040001 */ addiu $a0, $zero, 1 -/* C77710 80240A30 C6020014 */ lwc1 $f2, 0x14($s0) -/* C77714 80240A34 46001080 */ add.s $f2, $f2, $f0 -/* C77718 80240A38 4405A000 */ mfc1 $a1, $f20 -/* C7771C 80240A3C E6020014 */ swc1 $f2, 0x14($s0) -/* C77720 80240A40 AFB30010 */ sw $s3, 0x10($sp) -/* C77724 80240A44 8E060044 */ lw $a2, 0x44($s0) -/* C77728 80240A48 8E470064 */ lw $a3, 0x64($s2) -/* C7772C 80240A4C 0C00A8ED */ jal update_lerp -/* C77730 80240A50 24040001 */ addiu $a0, $zero, 1 -/* C77734 80240A54 C6020020 */ lwc1 $f2, 0x20($s0) -/* C77738 80240A58 46001080 */ add.s $f2, $f2, $f0 -/* C7773C 80240A5C 4405A000 */ mfc1 $a1, $f20 -/* C77740 80240A60 E6020020 */ swc1 $f2, 0x20($s0) -/* C77744 80240A64 AFB30010 */ sw $s3, 0x10($sp) -/* C77748 80240A68 8E060050 */ lw $a2, 0x50($s0) -/* C7774C 80240A6C 8E470064 */ lw $a3, 0x64($s2) -/* C77750 80240A70 0C00A8ED */ jal update_lerp -/* C77754 80240A74 24040001 */ addiu $a0, $zero, 1 -/* C77758 80240A78 C602002C */ lwc1 $f2, 0x2c($s0) -/* C7775C 80240A7C 46001080 */ add.s $f2, $f2, $f0 -/* C77760 80240A80 26310001 */ addiu $s1, $s1, 1 -/* C77764 80240A84 2A220003 */ slti $v0, $s1, 3 -/* C77768 80240A88 E602002C */ swc1 $f2, 0x2c($s0) -/* C7776C 80240A8C 1440FFE2 */ bnez $v0, .L80240A18 -/* C77770 80240A90 26100004 */ addiu $s0, $s0, 4 -/* C77774 80240A94 8E420064 */ lw $v0, 0x64($s2) -/* C77778 80240A98 24420001 */ addiu $v0, $v0, 1 -/* C7777C 80240A9C AE420064 */ sw $v0, 0x64($s2) -/* C77780 80240AA0 28420015 */ slti $v0, $v0, 0x15 -/* C77784 80240AA4 14400005 */ bnez $v0, .L80240ABC -/* C77788 80240AA8 0000882D */ daddu $s1, $zero, $zero -/* C7778C 80240AAC 24020002 */ addiu $v0, $zero, 2 -.L80240AB0: -/* C77790 80240AB0 AE420004 */ sw $v0, 4($s2) -/* C77794 80240AB4 AE400064 */ sw $zero, 0x64($s2) -/* C77798 80240AB8 0000882D */ daddu $s1, $zero, $zero -.L80240ABC: -/* C7779C 80240ABC 0240282D */ daddu $a1, $s2, $zero -.L80240AC0: -/* C777A0 80240AC0 8CA20008 */ lw $v0, 8($a1) -/* C777A4 80240AC4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* C777A8 80240AC8 8C42000C */ lw $v0, 0xc($v0) -/* C777AC 80240ACC E4400010 */ swc1 $f0, 0x10($v0) -/* C777B0 80240AD0 8CA20008 */ lw $v0, 8($a1) -/* C777B4 80240AD4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* C777B8 80240AD8 8C42000C */ lw $v0, 0xc($v0) -/* C777BC 80240ADC 26310001 */ addiu $s1, $s1, 1 -/* C777C0 80240AE0 E4400014 */ swc1 $f0, 0x14($v0) -/* C777C4 80240AE4 8CA20008 */ lw $v0, 8($a1) -/* C777C8 80240AE8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* C777CC 80240AEC 8C42000C */ lw $v0, 0xc($v0) -/* C777D0 80240AF0 E4400018 */ swc1 $f0, 0x18($v0) -/* C777D4 80240AF4 2A220003 */ slti $v0, $s1, 3 -/* C777D8 80240AF8 1440FFF1 */ bnez $v0, .L80240AC0 -/* C777DC 80240AFC 24A50004 */ addiu $a1, $a1, 4 -/* C777E0 80240B00 0000102D */ daddu $v0, $zero, $zero -.L80240B04: -/* C777E4 80240B04 8FBF0044 */ lw $ra, 0x44($sp) -/* C777E8 80240B08 8FB60040 */ lw $s6, 0x40($sp) -/* C777EC 80240B0C 8FB5003C */ lw $s5, 0x3c($sp) -/* C777F0 80240B10 8FB40038 */ lw $s4, 0x38($sp) -/* C777F4 80240B14 8FB30034 */ lw $s3, 0x34($sp) -/* C777F8 80240B18 8FB20030 */ lw $s2, 0x30($sp) -/* C777FC 80240B1C 8FB1002C */ lw $s1, 0x2c($sp) -/* C77800 80240B20 8FB00028 */ lw $s0, 0x28($sp) -/* C77804 80240B24 D7B80058 */ ldc1 $f24, 0x58($sp) -/* C77808 80240B28 D7B60050 */ ldc1 $f22, 0x50($sp) -/* C7780C 80240B2C D7B40048 */ ldc1 $f20, 0x48($sp) -/* C77810 80240B30 03E00008 */ jr $ra -/* C77814 80240B34 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240B38_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80240B38_C76CE0.s deleted file mode 100644 index 23f2305850..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240B38_C76CE0.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B38_C77818 -/* C77818 80240B38 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7781C 80240B3C AFB10014 */ sw $s1, 0x14($sp) -/* C77820 80240B40 0080882D */ daddu $s1, $a0, $zero -/* C77824 80240B44 AFB20018 */ sw $s2, 0x18($sp) -/* C77828 80240B48 AFBF001C */ sw $ra, 0x1c($sp) -/* C7782C 80240B4C AFB00010 */ sw $s0, 0x10($sp) -/* C77830 80240B50 8E30000C */ lw $s0, 0xc($s1) -/* C77834 80240B54 10A00010 */ beqz $a1, .L80240B98 -/* C77838 80240B58 0000902D */ daddu $s2, $zero, $zero -/* C7783C 80240B5C 8E050000 */ lw $a1, ($s0) -/* C77840 80240B60 0C0B1EAF */ jal get_variable -/* C77844 80240B64 26100004 */ addiu $s0, $s0, 4 -/* C77848 80240B68 AE220084 */ sw $v0, 0x84($s1) -/* C7784C 80240B6C 8E050000 */ lw $a1, ($s0) -/* C77850 80240B70 0C0B1EAF */ jal get_variable -/* C77854 80240B74 0220202D */ daddu $a0, $s1, $zero -/* C77858 80240B78 0240202D */ daddu $a0, $s2, $zero -/* C7785C 80240B7C 240500D0 */ addiu $a1, $zero, 0xd0 -/* C77860 80240B80 00A0302D */ daddu $a2, $a1, $zero -/* C77864 80240B84 00A0382D */ daddu $a3, $a1, $zero -/* C77868 80240B88 AE220088 */ sw $v0, 0x88($s1) -/* C7786C 80240B8C AE200070 */ sw $zero, 0x70($s1) -/* C77870 80240B90 0C04DF84 */ jal func_80137E10 -/* C77874 80240B94 AE200074 */ sw $zero, 0x74($s1) -.L80240B98: -/* C77878 80240B98 8E230070 */ lw $v1, 0x70($s1) -/* C7787C 80240B9C 24040001 */ addiu $a0, $zero, 1 -/* C77880 80240BA0 10640019 */ beq $v1, $a0, .L80240C08 -/* C77884 80240BA4 28620002 */ slti $v0, $v1, 2 -/* C77888 80240BA8 10400005 */ beqz $v0, .L80240BC0 -/* C7788C 80240BAC 24020002 */ addiu $v0, $zero, 2 -/* C77890 80240BB0 10600007 */ beqz $v1, .L80240BD0 -/* C77894 80240BB4 240500FF */ addiu $a1, $zero, 0xff -/* C77898 80240BB8 08090312 */ j .L80240C48 -/* C7789C 80240BBC 00000000 */ nop -.L80240BC0: -/* C778A0 80240BC0 10620019 */ beq $v1, $v0, .L80240C28 -/* C778A4 80240BC4 00000000 */ nop -/* C778A8 80240BC8 08090312 */ j .L80240C48 -/* C778AC 80240BCC 00000000 */ nop -.L80240BD0: -/* C778B0 80240BD0 8E220074 */ lw $v0, 0x74($s1) -/* C778B4 80240BD4 14450004 */ bne $v0, $a1, .L80240BE8 -/* C778B8 80240BD8 00000000 */ nop -/* C778BC 80240BDC AE240070 */ sw $a0, 0x70($s1) -/* C778C0 80240BE0 AE200078 */ sw $zero, 0x78($s1) -/* C778C4 80240BE4 8E220074 */ lw $v0, 0x74($s1) -.L80240BE8: -/* C778C8 80240BE8 8E230084 */ lw $v1, 0x84($s1) -/* C778CC 80240BEC 00431021 */ addu $v0, $v0, $v1 -/* C778D0 80240BF0 AE220074 */ sw $v0, 0x74($s1) -/* C778D4 80240BF4 28420100 */ slti $v0, $v0, 0x100 -/* C778D8 80240BF8 50400013 */ beql $v0, $zero, .L80240C48 -/* C778DC 80240BFC AE250074 */ sw $a1, 0x74($s1) -/* C778E0 80240C00 08090312 */ j .L80240C48 -/* C778E4 80240C04 00000000 */ nop -.L80240C08: -/* C778E8 80240C08 8E220078 */ lw $v0, 0x78($s1) -/* C778EC 80240C0C 24420001 */ addiu $v0, $v0, 1 -/* C778F0 80240C10 AE220078 */ sw $v0, 0x78($s1) -/* C778F4 80240C14 28420002 */ slti $v0, $v0, 2 -/* C778F8 80240C18 1440000B */ bnez $v0, .L80240C48 -/* C778FC 80240C1C 24020002 */ addiu $v0, $zero, 2 -/* C77900 80240C20 08090312 */ j .L80240C48 -/* C77904 80240C24 AE220070 */ sw $v0, 0x70($s1) -.L80240C28: -/* C77908 80240C28 8E230074 */ lw $v1, 0x74($s1) -/* C7790C 80240C2C 50600001 */ beql $v1, $zero, .L80240C34 -/* C77910 80240C30 24120001 */ addiu $s2, $zero, 1 -.L80240C34: -/* C77914 80240C34 8E220088 */ lw $v0, 0x88($s1) -/* C77918 80240C38 00621023 */ subu $v0, $v1, $v0 -/* C7791C 80240C3C 04410002 */ bgez $v0, .L80240C48 -/* C77920 80240C40 AE220074 */ sw $v0, 0x74($s1) -/* C77924 80240C44 AE200074 */ sw $zero, 0x74($s1) -.L80240C48: -/* C77928 80240C48 C6200074 */ lwc1 $f0, 0x74($s1) -/* C7792C 80240C4C 46800020 */ cvt.s.w $f0, $f0 -/* C77930 80240C50 44050000 */ mfc1 $a1, $f0 -/* C77934 80240C54 0C04DF62 */ jal func_80137D88 -/* C77938 80240C58 24040001 */ addiu $a0, $zero, 1 -/* C7793C 80240C5C 0240102D */ daddu $v0, $s2, $zero -/* C77940 80240C60 8FBF001C */ lw $ra, 0x1c($sp) -/* C77944 80240C64 8FB20018 */ lw $s2, 0x18($sp) -/* C77948 80240C68 8FB10014 */ lw $s1, 0x14($sp) -/* C7794C 80240C6C 8FB00010 */ lw $s0, 0x10($sp) -/* C77950 80240C70 03E00008 */ jr $ra -/* C77954 80240C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240C78_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80240C78_C76CE0.s deleted file mode 100644 index 2df8dfc57d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240C78_C76CE0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C78_C77958 -/* C77958 80240C78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7795C 80240C7C AFBF0018 */ sw $ra, 0x18($sp) -/* C77960 80240C80 0C00EAD2 */ jal get_npc_safe -/* C77964 80240C84 2404FFFC */ addiu $a0, $zero, -4 -/* C77968 80240C88 3C0141F0 */ lui $at, 0x41f0 -/* C7796C 80240C8C 44810000 */ mtc1 $at, $f0 -/* C77970 80240C90 C442003C */ lwc1 $f2, 0x3c($v0) -/* C77974 80240C94 46001080 */ add.s $f2, $f2, $f0 -/* C77978 80240C98 E7A00010 */ swc1 $f0, 0x10($sp) -/* C7797C 80240C9C 8C450038 */ lw $a1, 0x38($v0) -/* C77980 80240CA0 8C470040 */ lw $a3, 0x40($v0) -/* C77984 80240CA4 44061000 */ mfc1 $a2, $f2 -/* C77988 80240CA8 0C01BFBC */ jal func_8006FEF0 -/* C7798C 80240CAC 24040002 */ addiu $a0, $zero, 2 -/* C77990 80240CB0 8FBF0018 */ lw $ra, 0x18($sp) -/* C77994 80240CB4 24020002 */ addiu $v0, $zero, 2 -/* C77998 80240CB8 03E00008 */ jr $ra -/* C7799C 80240CBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240CC0_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80240CC0_C76CE0.s deleted file mode 100644 index edc402908f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240CC0_C76CE0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_C779A0 -/* C779A0 80240CC0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C779A4 80240CC4 AFBF0018 */ sw $ra, 0x18($sp) -/* C779A8 80240CC8 0C00EAD2 */ jal get_npc_safe -/* C779AC 80240CCC 2404FFFC */ addiu $a0, $zero, -4 -/* C779B0 80240CD0 3C0141F0 */ lui $at, 0x41f0 -/* C779B4 80240CD4 44810000 */ mtc1 $at, $f0 -/* C779B8 80240CD8 C442003C */ lwc1 $f2, 0x3c($v0) -/* C779BC 80240CDC 46001080 */ add.s $f2, $f2, $f0 -/* C779C0 80240CE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C779C4 80240CE4 8C450038 */ lw $a1, 0x38($v0) -/* C779C8 80240CE8 8C470040 */ lw $a3, 0x40($v0) -/* C779CC 80240CEC 44061000 */ mfc1 $a2, $f2 -/* C779D0 80240CF0 0C01BFBC */ jal func_8006FEF0 -/* C779D4 80240CF4 24040004 */ addiu $a0, $zero, 4 -/* C779D8 80240CF8 8FBF0018 */ lw $ra, 0x18($sp) -/* C779DC 80240CFC 24020002 */ addiu $v0, $zero, 2 -/* C779E0 80240D00 03E00008 */ jr $ra -/* C779E4 80240D04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240D08_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80240D08_C76CE0.s deleted file mode 100644 index 7b4a44fbc1..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240D08_C76CE0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D08_C779E8 -/* C779E8 80240D08 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C779EC 80240D0C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* C779F0 80240D10 AC800084 */ sw $zero, 0x84($a0) -/* C779F4 80240D14 80620000 */ lb $v0, ($v1) -/* C779F8 80240D18 10400005 */ beqz $v0, .L80240D30 -/* C779FC 80240D1C 24020003 */ addiu $v0, $zero, 3 -/* C77A00 80240D20 80630003 */ lb $v1, 3($v1) -/* C77A04 80240D24 14620002 */ bne $v1, $v0, .L80240D30 -/* C77A08 80240D28 24020001 */ addiu $v0, $zero, 1 -/* C77A0C 80240D2C AC820084 */ sw $v0, 0x84($a0) -.L80240D30: -/* C77A10 80240D30 03E00008 */ jr $ra -/* C77A14 80240D34 24020002 */ addiu $v0, $zero, 2 -/* C77A18 80240D38 00000000 */ nop -/* C77A1C 80240D3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240D40_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80240D40_C76CE0.s deleted file mode 100644 index 7056b6b4bd..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240D40_C76CE0.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D40_C77A20 -/* C77A20 80240D40 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C77A24 80240D44 AFB1001C */ sw $s1, 0x1c($sp) -/* C77A28 80240D48 0080882D */ daddu $s1, $a0, $zero -/* C77A2C 80240D4C AFBF0020 */ sw $ra, 0x20($sp) -/* C77A30 80240D50 AFB00018 */ sw $s0, 0x18($sp) -/* C77A34 80240D54 8E30000C */ lw $s0, 0xc($s1) -/* C77A38 80240D58 8E020000 */ lw $v0, ($s0) -/* C77A3C 80240D5C 1040001B */ beqz $v0, .L80240DCC -/* C77A40 80240D60 26100004 */ addiu $s0, $s0, 4 -/* C77A44 80240D64 8E050000 */ lw $a1, ($s0) -/* C77A48 80240D68 0C0B1EAF */ jal get_variable -/* C77A4C 80240D6C 26100004 */ addiu $s0, $s0, 4 -/* C77A50 80240D70 AE220070 */ sw $v0, 0x70($s1) -/* C77A54 80240D74 8E050000 */ lw $a1, ($s0) -/* C77A58 80240D78 26100004 */ addiu $s0, $s0, 4 -/* C77A5C 80240D7C 0C0B1EAF */ jal get_variable -/* C77A60 80240D80 0220202D */ daddu $a0, $s1, $zero -/* C77A64 80240D84 AE220074 */ sw $v0, 0x74($s1) -/* C77A68 80240D88 8E050000 */ lw $a1, ($s0) -/* C77A6C 80240D8C 0C0B1EAF */ jal get_variable -/* C77A70 80240D90 0220202D */ daddu $a0, $s1, $zero -/* C77A74 80240D94 24040168 */ addiu $a0, $zero, 0x168 -/* C77A78 80240D98 0000282D */ daddu $a1, $zero, $zero -/* C77A7C 80240D9C C6200070 */ lwc1 $f0, 0x70($s1) -/* C77A80 80240DA0 46800020 */ cvt.s.w $f0, $f0 -/* C77A84 80240DA4 C6220074 */ lwc1 $f2, 0x74($s1) -/* C77A88 80240DA8 468010A0 */ cvt.s.w $f2, $f2 -/* C77A8C 80240DAC 44060000 */ mfc1 $a2, $f0 -/* C77A90 80240DB0 44071000 */ mfc1 $a3, $f2 -/* C77A94 80240DB4 44820000 */ mtc1 $v0, $f0 -/* C77A98 80240DB8 00000000 */ nop -/* C77A9C 80240DBC 46800020 */ cvt.s.w $f0, $f0 -/* C77AA0 80240DC0 AE220078 */ sw $v0, 0x78($s1) -/* C77AA4 80240DC4 0C05267B */ jal func_801499EC -/* C77AA8 80240DC8 E7A00010 */ swc1 $f0, 0x10($sp) -.L80240DCC: -/* C77AAC 80240DCC 8FBF0020 */ lw $ra, 0x20($sp) -/* C77AB0 80240DD0 8FB1001C */ lw $s1, 0x1c($sp) -/* C77AB4 80240DD4 8FB00018 */ lw $s0, 0x18($sp) -/* C77AB8 80240DD8 24020002 */ addiu $v0, $zero, 2 -/* C77ABC 80240DDC 03E00008 */ jr $ra -/* C77AC0 80240DE0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240DE4_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80240DE4_C76CE0.s deleted file mode 100644 index 38d799d0d8..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80240DE4_C76CE0.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DE4_C77AC4 -/* C77AC4 80240DE4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C77AC8 80240DE8 AFB1001C */ sw $s1, 0x1c($sp) -/* C77ACC 80240DEC 0080882D */ daddu $s1, $a0, $zero -/* C77AD0 80240DF0 AFBF0020 */ sw $ra, 0x20($sp) -/* C77AD4 80240DF4 AFB00018 */ sw $s0, 0x18($sp) -/* C77AD8 80240DF8 8E30000C */ lw $s0, 0xc($s1) -/* C77ADC 80240DFC 8E020000 */ lw $v0, ($s0) -/* C77AE0 80240E00 1040001B */ beqz $v0, .L80240E70 -/* C77AE4 80240E04 26100004 */ addiu $s0, $s0, 4 -/* C77AE8 80240E08 8E050000 */ lw $a1, ($s0) -/* C77AEC 80240E0C 0C0B1EAF */ jal get_variable -/* C77AF0 80240E10 26100004 */ addiu $s0, $s0, 4 -/* C77AF4 80240E14 AE220070 */ sw $v0, 0x70($s1) -/* C77AF8 80240E18 8E050000 */ lw $a1, ($s0) -/* C77AFC 80240E1C 26100004 */ addiu $s0, $s0, 4 -/* C77B00 80240E20 0C0B1EAF */ jal get_variable -/* C77B04 80240E24 0220202D */ daddu $a0, $s1, $zero -/* C77B08 80240E28 AE220074 */ sw $v0, 0x74($s1) -/* C77B0C 80240E2C 8E050000 */ lw $a1, ($s0) -/* C77B10 80240E30 0C0B1EAF */ jal get_variable -/* C77B14 80240E34 0220202D */ daddu $a0, $s1, $zero -/* C77B18 80240E38 24040185 */ addiu $a0, $zero, 0x185 -/* C77B1C 80240E3C 0000282D */ daddu $a1, $zero, $zero -/* C77B20 80240E40 C6200070 */ lwc1 $f0, 0x70($s1) -/* C77B24 80240E44 46800020 */ cvt.s.w $f0, $f0 -/* C77B28 80240E48 C6220074 */ lwc1 $f2, 0x74($s1) -/* C77B2C 80240E4C 468010A0 */ cvt.s.w $f2, $f2 -/* C77B30 80240E50 44060000 */ mfc1 $a2, $f0 -/* C77B34 80240E54 44071000 */ mfc1 $a3, $f2 -/* C77B38 80240E58 44820000 */ mtc1 $v0, $f0 -/* C77B3C 80240E5C 00000000 */ nop -/* C77B40 80240E60 46800020 */ cvt.s.w $f0, $f0 -/* C77B44 80240E64 AE220078 */ sw $v0, 0x78($s1) -/* C77B48 80240E68 0C05267B */ jal func_801499EC -/* C77B4C 80240E6C E7A00010 */ swc1 $f0, 0x10($sp) -.L80240E70: -/* C77B50 80240E70 8FBF0020 */ lw $ra, 0x20($sp) -/* C77B54 80240E74 8FB1001C */ lw $s1, 0x1c($sp) -/* C77B58 80240E78 8FB00018 */ lw $s0, 0x18($sp) -/* C77B5C 80240E7C 24020002 */ addiu $v0, $zero, 2 -/* C77B60 80240E80 03E00008 */ jr $ra -/* C77B64 80240E84 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80241000_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80241000_C76CE0.s deleted file mode 100644 index fee8db6afe..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80241000_C76CE0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241000_C77CE0 -/* C77CE0 80241000 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* C77CE4 80241004 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* C77CE8 80241008 8C420010 */ lw $v0, 0x10($v0) -/* C77CEC 8024100C 30428000 */ andi $v0, $v0, 0x8000 -/* C77CF0 80241010 AC8200A4 */ sw $v0, 0xa4($a0) -/* C77CF4 80241014 03E00008 */ jr $ra -/* C77CF8 80241018 24020002 */ addiu $v0, $zero, 2 -/* C77CFC 8024101C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80241020_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80241020_C76CE0.s deleted file mode 100644 index ce8d64e920..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80241020_C76CE0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241020_C77D00 -/* C77D00 80241020 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C77D04 80241024 AFB10014 */ sw $s1, 0x14($sp) -/* C77D08 80241028 0080882D */ daddu $s1, $a0, $zero -/* C77D0C 8024102C AFBF0018 */ sw $ra, 0x18($sp) -/* C77D10 80241030 AFB00010 */ sw $s0, 0x10($sp) -/* C77D14 80241034 8E300148 */ lw $s0, 0x148($s1) -/* C77D18 80241038 0C00EABB */ jal get_npc_unsafe -/* C77D1C 8024103C 86040008 */ lh $a0, 8($s0) -/* C77D20 80241040 24030001 */ addiu $v1, $zero, 1 -/* C77D24 80241044 0040202D */ daddu $a0, $v0, $zero -/* C77D28 80241048 AE03006C */ sw $v1, 0x6c($s0) -/* C77D2C 8024104C 8482008C */ lh $v0, 0x8c($a0) -/* C77D30 80241050 14400009 */ bnez $v0, .L80241078 -/* C77D34 80241054 24020002 */ addiu $v0, $zero, 2 -/* C77D38 80241058 96030072 */ lhu $v1, 0x72($s0) -/* C77D3C 8024105C AE02006C */ sw $v0, 0x6c($s0) -/* C77D40 80241060 A483008E */ sh $v1, 0x8e($a0) -/* C77D44 80241064 8E0200CC */ lw $v0, 0xcc($s0) -/* C77D48 80241068 8C420020 */ lw $v0, 0x20($v0) -/* C77D4C 8024106C AC820028 */ sw $v0, 0x28($a0) -/* C77D50 80241070 2402001F */ addiu $v0, $zero, 0x1f -/* C77D54 80241074 AE220070 */ sw $v0, 0x70($s1) -.L80241078: -/* C77D58 80241078 8FBF0018 */ lw $ra, 0x18($sp) -/* C77D5C 8024107C 8FB10014 */ lw $s1, 0x14($sp) -/* C77D60 80241080 8FB00010 */ lw $s0, 0x10($sp) -/* C77D64 80241084 03E00008 */ jr $ra -/* C77D68 80241088 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_8024108C_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_8024108C_C76CE0.s deleted file mode 100644 index 62a8f3ea01..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_8024108C_C76CE0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024108C_C77D6C -/* C77D6C 8024108C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C77D70 80241090 AFB10014 */ sw $s1, 0x14($sp) -/* C77D74 80241094 0080882D */ daddu $s1, $a0, $zero -/* C77D78 80241098 AFBF0018 */ sw $ra, 0x18($sp) -/* C77D7C 8024109C AFB00010 */ sw $s0, 0x10($sp) -/* C77D80 802410A0 8E300148 */ lw $s0, 0x148($s1) -/* C77D84 802410A4 0C00EABB */ jal get_npc_unsafe -/* C77D88 802410A8 86040008 */ lh $a0, 8($s0) -/* C77D8C 802410AC 0040202D */ daddu $a0, $v0, $zero -/* C77D90 802410B0 9482008E */ lhu $v0, 0x8e($a0) -/* C77D94 802410B4 2442FFFF */ addiu $v0, $v0, -1 -/* C77D98 802410B8 A482008E */ sh $v0, 0x8e($a0) -/* C77D9C 802410BC 00021400 */ sll $v0, $v0, 0x10 -/* C77DA0 802410C0 1C400009 */ bgtz $v0, .L802410E8 -/* C77DA4 802410C4 24020003 */ addiu $v0, $zero, 3 -/* C77DA8 802410C8 96030076 */ lhu $v1, 0x76($s0) -/* C77DAC 802410CC AE02006C */ sw $v0, 0x6c($s0) -/* C77DB0 802410D0 A483008E */ sh $v1, 0x8e($a0) -/* C77DB4 802410D4 8E0200CC */ lw $v0, 0xcc($s0) -/* C77DB8 802410D8 8C420024 */ lw $v0, 0x24($v0) -/* C77DBC 802410DC AC820028 */ sw $v0, 0x28($a0) -/* C77DC0 802410E0 24020020 */ addiu $v0, $zero, 0x20 -/* C77DC4 802410E4 AE220070 */ sw $v0, 0x70($s1) -.L802410E8: -/* C77DC8 802410E8 8FBF0018 */ lw $ra, 0x18($sp) -/* C77DCC 802410EC 8FB10014 */ lw $s1, 0x14($sp) -/* C77DD0 802410F0 8FB00010 */ lw $s0, 0x10($sp) -/* C77DD4 802410F4 03E00008 */ jr $ra -/* C77DD8 802410F8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_802410FC_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_802410FC_C76CE0.s deleted file mode 100644 index 8be24ee035..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_802410FC_C76CE0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410FC_C77DDC -/* C77DDC 802410FC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C77DE0 80241100 AFB10034 */ sw $s1, 0x34($sp) -/* C77DE4 80241104 0080882D */ daddu $s1, $a0, $zero -/* C77DE8 80241108 AFBF0038 */ sw $ra, 0x38($sp) -/* C77DEC 8024110C AFB00030 */ sw $s0, 0x30($sp) -/* C77DF0 80241110 8E300148 */ lw $s0, 0x148($s1) -/* C77DF4 80241114 0C00EABB */ jal get_npc_unsafe -/* C77DF8 80241118 86040008 */ lh $a0, 8($s0) -/* C77DFC 8024111C 0040282D */ daddu $a1, $v0, $zero -/* C77E00 80241120 94A2008E */ lhu $v0, 0x8e($a1) -/* C77E04 80241124 2442FFFF */ addiu $v0, $v0, -1 -/* C77E08 80241128 A4A2008E */ sh $v0, 0x8e($a1) -/* C77E0C 8024112C 00021400 */ sll $v0, $v0, 0x10 -/* C77E10 80241130 1C400023 */ bgtz $v0, .L802411C0 -/* C77E14 80241134 24020004 */ addiu $v0, $zero, 4 -/* C77E18 80241138 8E0300CC */ lw $v1, 0xcc($s0) -/* C77E1C 8024113C AE02006C */ sw $v0, 0x6c($s0) -/* C77E20 80241140 8C620000 */ lw $v0, ($v1) -/* C77E24 80241144 ACA20028 */ sw $v0, 0x28($a1) -/* C77E28 80241148 9602007A */ lhu $v0, 0x7a($s0) -/* C77E2C 8024114C A4A2008E */ sh $v0, 0x8e($a1) -/* C77E30 80241150 8E020078 */ lw $v0, 0x78($s0) -/* C77E34 80241154 28420008 */ slti $v0, $v0, 8 -/* C77E38 80241158 14400018 */ bnez $v0, .L802411BC -/* C77E3C 8024115C 24020021 */ addiu $v0, $zero, 0x21 -/* C77E40 80241160 24040003 */ addiu $a0, $zero, 3 -/* C77E44 80241164 27A30028 */ addiu $v1, $sp, 0x28 -/* C77E48 80241168 84A700A8 */ lh $a3, 0xa8($a1) -/* C77E4C 8024116C 3C013F80 */ lui $at, 0x3f80 -/* C77E50 80241170 44810000 */ mtc1 $at, $f0 -/* C77E54 80241174 3C014000 */ lui $at, 0x4000 -/* C77E58 80241178 44811000 */ mtc1 $at, $f2 -/* C77E5C 8024117C 3C01C1A0 */ lui $at, 0xc1a0 -/* C77E60 80241180 44812000 */ mtc1 $at, $f4 -/* C77E64 80241184 44873000 */ mtc1 $a3, $f6 -/* C77E68 80241188 00000000 */ nop -/* C77E6C 8024118C 468031A0 */ cvt.s.w $f6, $f6 -/* C77E70 80241190 E7A00010 */ swc1 $f0, 0x10($sp) -/* C77E74 80241194 E7A20014 */ swc1 $f2, 0x14($sp) -/* C77E78 80241198 E7A40018 */ swc1 $f4, 0x18($sp) -/* C77E7C 8024119C 8E020078 */ lw $v0, 0x78($s0) -/* C77E80 802411A0 44073000 */ mfc1 $a3, $f6 -/* C77E84 802411A4 0000302D */ daddu $a2, $zero, $zero -/* C77E88 802411A8 AFA30020 */ sw $v1, 0x20($sp) -/* C77E8C 802411AC 2442FFFF */ addiu $v0, $v0, -1 -/* C77E90 802411B0 0C01BFA4 */ jal fx_emote -/* C77E94 802411B4 AFA2001C */ sw $v0, 0x1c($sp) -/* C77E98 802411B8 24020021 */ addiu $v0, $zero, 0x21 -.L802411BC: -/* C77E9C 802411BC AE220070 */ sw $v0, 0x70($s1) -.L802411C0: -/* C77EA0 802411C0 8FBF0038 */ lw $ra, 0x38($sp) -/* C77EA4 802411C4 8FB10034 */ lw $s1, 0x34($sp) -/* C77EA8 802411C8 8FB00030 */ lw $s0, 0x30($sp) -/* C77EAC 802411CC 03E00008 */ jr $ra -/* C77EB0 802411D0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80241228_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80241228_C76CE0.s deleted file mode 100644 index 3f21a55c9f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80241228_C76CE0.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241228_C77F08 -/* C77F08 80241228 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C77F0C 8024122C AFBF0024 */ sw $ra, 0x24($sp) -/* C77F10 80241230 AFB40020 */ sw $s4, 0x20($sp) -/* C77F14 80241234 AFB3001C */ sw $s3, 0x1c($sp) -/* C77F18 80241238 AFB20018 */ sw $s2, 0x18($sp) -/* C77F1C 8024123C AFB10014 */ sw $s1, 0x14($sp) -/* C77F20 80241240 AFB00010 */ sw $s0, 0x10($sp) -/* C77F24 80241244 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C77F28 80241248 8C900148 */ lw $s0, 0x148($a0) -/* C77F2C 8024124C 86040008 */ lh $a0, 8($s0) -/* C77F30 80241250 0C00EABB */ jal get_npc_unsafe -/* C77F34 80241254 24110001 */ addiu $s1, $zero, 1 -/* C77F38 80241258 86040008 */ lh $a0, 8($s0) -/* C77F3C 8024125C 0040802D */ daddu $s0, $v0, $zero -/* C77F40 80241260 3C05800B */ lui $a1, %hi(gCameras) -/* C77F44 80241264 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C77F48 80241268 3C03800A */ lui $v1, 0x800a -/* C77F4C 8024126C 8463A634 */ lh $v1, -0x59cc($v1) -/* C77F50 80241270 00912021 */ addu $a0, $a0, $s1 -/* C77F54 80241274 00031080 */ sll $v0, $v1, 2 -/* C77F58 80241278 00431021 */ addu $v0, $v0, $v1 -/* C77F5C 8024127C 00021080 */ sll $v0, $v0, 2 -/* C77F60 80241280 00431023 */ subu $v0, $v0, $v1 -/* C77F64 80241284 000218C0 */ sll $v1, $v0, 3 -/* C77F68 80241288 00431021 */ addu $v0, $v0, $v1 -/* C77F6C 8024128C 000210C0 */ sll $v0, $v0, 3 -/* C77F70 80241290 0C00FB3A */ jal get_enemy -/* C77F74 80241294 00459021 */ addu $s2, $v0, $a1 -/* C77F78 80241298 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C77F7C 8024129C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C77F80 802412A0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C77F84 802412A4 8E830000 */ lw $v1, ($s4) -/* C77F88 802412A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C77F8C 802412AC 8C660028 */ lw $a2, 0x28($v1) -/* C77F90 802412B0 8C670030 */ lw $a3, 0x30($v1) -/* C77F94 802412B4 0C00A7B5 */ jal dist2D -/* C77F98 802412B8 0040982D */ daddu $s3, $v0, $zero -/* C77F9C 802412BC C6620074 */ lwc1 $f2, 0x74($s3) -/* C77FA0 802412C0 468010A0 */ cvt.s.w $f2, $f2 -/* C77FA4 802412C4 4600103C */ c.lt.s $f2, $f0 -/* C77FA8 802412C8 00000000 */ nop -/* C77FAC 802412CC 45030001 */ bc1tl .L802412D4 -/* C77FB0 802412D0 0000882D */ daddu $s1, $zero, $zero -.L802412D4: -/* C77FB4 802412D4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C77FB8 802412D8 C60E000C */ lwc1 $f14, 0xc($s0) -/* C77FBC 802412DC 3C014387 */ lui $at, 0x4387 -/* C77FC0 802412E0 4481A000 */ mtc1 $at, $f20 -/* C77FC4 802412E4 0C00A70A */ jal get_clamped_angle_diff -/* C77FC8 802412E8 00000000 */ nop -/* C77FCC 802412EC 0C00A6C9 */ jal clamp_angle -/* C77FD0 802412F0 46000306 */ mov.s $f12, $f0 -/* C77FD4 802412F4 3C018024 */ lui $at, 0x8024 -/* C77FD8 802412F8 D4227270 */ ldc1 $f2, 0x7270($at) -/* C77FDC 802412FC 46000021 */ cvt.d.s $f0, $f0 -/* C77FE0 80241300 4622003C */ c.lt.d $f0, $f2 -/* C77FE4 80241304 00000000 */ nop -/* C77FE8 80241308 45000003 */ bc1f .L80241318 -/* C77FEC 8024130C 00000000 */ nop -/* C77FF0 80241310 3C0142B4 */ lui $at, 0x42b4 -/* C77FF4 80241314 4481A000 */ mtc1 $at, $f20 -.L80241318: -/* C77FF8 80241318 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C77FFC 8024131C 8E820000 */ lw $v0, ($s4) -/* C78000 80241320 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C78004 80241324 8C460028 */ lw $a2, 0x28($v0) -/* C78008 80241328 0C00A720 */ jal atan2 -/* C7800C 8024132C 8C470030 */ lw $a3, 0x30($v0) -/* C78010 80241330 4600A306 */ mov.s $f12, $f20 -/* C78014 80241334 0C00A70A */ jal get_clamped_angle_diff -/* C78018 80241338 46000386 */ mov.s $f14, $f0 -/* C7801C 8024133C C6620078 */ lwc1 $f2, 0x78($s3) -/* C78020 80241340 468010A0 */ cvt.s.w $f2, $f2 -/* C78024 80241344 46000005 */ abs.s $f0, $f0 -/* C78028 80241348 4600103C */ c.lt.s $f2, $f0 -/* C7802C 8024134C 00000000 */ nop -/* C78030 80241350 45030001 */ bc1tl .L80241358 -/* C78034 80241354 0000882D */ daddu $s1, $zero, $zero -.L80241358: -/* C78038 80241358 8E820000 */ lw $v0, ($s4) -/* C7803C 8024135C C600003C */ lwc1 $f0, 0x3c($s0) -/* C78040 80241360 C442002C */ lwc1 $f2, 0x2c($v0) -/* C78044 80241364 860200A8 */ lh $v0, 0xa8($s0) -/* C78048 80241368 46020001 */ sub.s $f0, $f0, $f2 -/* C7804C 8024136C 44821000 */ mtc1 $v0, $f2 -/* C78050 80241370 00000000 */ nop -/* C78054 80241374 468010A1 */ cvt.d.w $f2, $f2 -/* C78058 80241378 46221080 */ add.d $f2, $f2, $f2 -/* C7805C 8024137C 46000005 */ abs.s $f0, $f0 -/* C78060 80241380 46000021 */ cvt.d.s $f0, $f0 -/* C78064 80241384 4620103E */ c.le.d $f2, $f0 -/* C78068 80241388 00000000 */ nop -/* C7806C 8024138C 45030001 */ bc1tl .L80241394 -/* C78070 80241390 0000882D */ daddu $s1, $zero, $zero -.L80241394: -/* C78074 80241394 3C038011 */ lui $v1, 0x8011 -/* C78078 80241398 8063EBB3 */ lb $v1, -0x144d($v1) -/* C7807C 8024139C 24020009 */ addiu $v0, $zero, 9 -/* C78080 802413A0 50620001 */ beql $v1, $v0, .L802413A8 -/* C78084 802413A4 0000882D */ daddu $s1, $zero, $zero -.L802413A8: -/* C78088 802413A8 24020007 */ addiu $v0, $zero, 7 -/* C7808C 802413AC 50620001 */ beql $v1, $v0, .L802413B4 -/* C78090 802413B0 0000882D */ daddu $s1, $zero, $zero -.L802413B4: -/* C78094 802413B4 0220102D */ daddu $v0, $s1, $zero -/* C78098 802413B8 8FBF0024 */ lw $ra, 0x24($sp) -/* C7809C 802413BC 8FB40020 */ lw $s4, 0x20($sp) -/* C780A0 802413C0 8FB3001C */ lw $s3, 0x1c($sp) -/* C780A4 802413C4 8FB20018 */ lw $s2, 0x18($sp) -/* C780A8 802413C8 8FB10014 */ lw $s1, 0x14($sp) -/* C780AC 802413CC 8FB00010 */ lw $s0, 0x10($sp) -/* C780B0 802413D0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C780B4 802413D4 03E00008 */ jr $ra -/* C780B8 802413D8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_802418F0_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_802418F0_C76CE0.s deleted file mode 100644 index d36b0144ef..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_802418F0_C76CE0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418F0_C785D0 -/* C785D0 802418F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C785D4 802418F4 AFB10014 */ sw $s1, 0x14($sp) -/* C785D8 802418F8 0080882D */ daddu $s1, $a0, $zero -/* C785DC 802418FC AFBF0018 */ sw $ra, 0x18($sp) -/* C785E0 80241900 AFB00010 */ sw $s0, 0x10($sp) -/* C785E4 80241904 8E300148 */ lw $s0, 0x148($s1) -/* C785E8 80241908 0C00EABB */ jal get_npc_unsafe -/* C785EC 8024190C 86040008 */ lh $a0, 8($s0) -/* C785F0 80241910 0040202D */ daddu $a0, $v0, $zero -/* C785F4 80241914 8482008E */ lh $v0, 0x8e($a0) -/* C785F8 80241918 9483008E */ lhu $v1, 0x8e($a0) -/* C785FC 8024191C 18400003 */ blez $v0, .L8024192C -/* C78600 80241920 2462FFFF */ addiu $v0, $v1, -1 -/* C78604 80241924 08090652 */ j .L80241948 -/* C78608 80241928 A482008E */ sh $v0, 0x8e($a0) -.L8024192C: -/* C7860C 8024192C 8E0200CC */ lw $v0, 0xcc($s0) -/* C78610 80241930 AE00006C */ sw $zero, 0x6c($s0) -/* C78614 80241934 8C420000 */ lw $v0, ($v0) -/* C78618 80241938 AC820028 */ sw $v0, 0x28($a0) -/* C7861C 8024193C 24020001 */ addiu $v0, $zero, 1 -/* C78620 80241940 AE200074 */ sw $zero, 0x74($s1) -/* C78624 80241944 AE220070 */ sw $v0, 0x70($s1) -.L80241948: -/* C78628 80241948 8FBF0018 */ lw $ra, 0x18($sp) -/* C7862C 8024194C 8FB10014 */ lw $s1, 0x14($sp) -/* C78630 80241950 8FB00010 */ lw $s0, 0x10($sp) -/* C78634 80241954 03E00008 */ jr $ra -/* C78638 80241958 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80241A58_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80241A58_C76CE0.s deleted file mode 100644 index fd871418f6..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80241A58_C76CE0.s +++ /dev/null @@ -1,688 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A58_C78738 -/* C78738 80241A58 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C7873C 80241A5C AFBF0064 */ sw $ra, 0x64($sp) -/* C78740 80241A60 AFBE0060 */ sw $fp, 0x60($sp) -/* C78744 80241A64 AFB7005C */ sw $s7, 0x5c($sp) -/* C78748 80241A68 AFB60058 */ sw $s6, 0x58($sp) -/* C7874C 80241A6C AFB50054 */ sw $s5, 0x54($sp) -/* C78750 80241A70 AFB40050 */ sw $s4, 0x50($sp) -/* C78754 80241A74 AFB3004C */ sw $s3, 0x4c($sp) -/* C78758 80241A78 AFB20048 */ sw $s2, 0x48($sp) -/* C7875C 80241A7C AFB10044 */ sw $s1, 0x44($sp) -/* C78760 80241A80 AFB00040 */ sw $s0, 0x40($sp) -/* C78764 80241A84 F7B80078 */ sdc1 $f24, 0x78($sp) -/* C78768 80241A88 F7B60070 */ sdc1 $f22, 0x70($sp) -/* C7876C 80241A8C F7B40068 */ sdc1 $f20, 0x68($sp) -/* C78770 80241A90 AFA40080 */ sw $a0, 0x80($sp) -/* C78774 80241A94 8C960148 */ lw $s6, 0x148($a0) -/* C78778 80241A98 00C0902D */ daddu $s2, $a2, $zero -/* C7877C 80241A9C 86C40008 */ lh $a0, 8($s6) -/* C78780 80241AA0 0C00EABB */ jal get_npc_unsafe -/* C78784 80241AA4 0000B82D */ daddu $s7, $zero, $zero -/* C78788 80241AA8 0040882D */ daddu $s1, $v0, $zero -/* C7878C 80241AAC 9622008E */ lhu $v0, 0x8e($s1) -/* C78790 80241AB0 2442FFFF */ addiu $v0, $v0, -1 -/* C78794 80241AB4 A622008E */ sh $v0, 0x8e($s1) -/* C78798 80241AB8 00021400 */ sll $v0, $v0, 0x10 -/* C7879C 80241ABC 8EC30090 */ lw $v1, 0x90($s6) -/* C787A0 80241AC0 00021403 */ sra $v0, $v0, 0x10 -/* C787A4 80241AC4 0062182A */ slt $v1, $v1, $v0 -/* C787A8 80241AC8 14600005 */ bnez $v1, .L80241AE0 -/* C787AC 80241ACC 02E0F02D */ daddu $fp, $s7, $zero -/* C787B0 80241AD0 8EC20000 */ lw $v0, ($s6) -/* C787B4 80241AD4 3C031F10 */ lui $v1, 0x1f10 -/* C787B8 80241AD8 00431025 */ or $v0, $v0, $v1 -/* C787BC 80241ADC AEC20000 */ sw $v0, ($s6) -.L80241AE0: -/* C787C0 80241AE0 8622008E */ lh $v0, 0x8e($s1) -/* C787C4 80241AE4 1440025D */ bnez $v0, .L8024245C -/* C787C8 80241AE8 00000000 */ nop -/* C787CC 80241AEC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C787D0 80241AF0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C787D4 80241AF4 0C00A6C9 */ jal clamp_angle -/* C787D8 80241AF8 C44C00A8 */ lwc1 $f12, 0xa8($v0) -/* C787DC 80241AFC 3C014334 */ lui $at, 0x4334 -/* C787E0 80241B00 44811000 */ mtc1 $at, $f2 -/* C787E4 80241B04 00000000 */ nop -/* C787E8 80241B08 4602003C */ c.lt.s $f0, $f2 -/* C787EC 80241B0C 00000000 */ nop -/* C787F0 80241B10 45000011 */ bc1f .L80241B58 -/* C787F4 80241B14 00000000 */ nop -/* C787F8 80241B18 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C787FC 80241B1C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C78800 80241B20 3C0142B4 */ lui $at, 0x42b4 -/* C78804 80241B24 44816000 */ mtc1 $at, $f12 -/* C78808 80241B28 00031080 */ sll $v0, $v1, 2 -/* C7880C 80241B2C 00431021 */ addu $v0, $v0, $v1 -/* C78810 80241B30 00021080 */ sll $v0, $v0, 2 -/* C78814 80241B34 00431023 */ subu $v0, $v0, $v1 -/* C78818 80241B38 000218C0 */ sll $v1, $v0, 3 -/* C7881C 80241B3C 00431021 */ addu $v0, $v0, $v1 -/* C78820 80241B40 000210C0 */ sll $v0, $v0, 3 -/* C78824 80241B44 3C01800B */ lui $at, 0x800b -/* C78828 80241B48 00220821 */ addu $at, $at, $v0 -/* C7882C 80241B4C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C78830 80241B50 080906E5 */ j .L80241B94 -/* C78834 80241B54 460C0301 */ sub.s $f12, $f0, $f12 -.L80241B58: -/* C78838 80241B58 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C7883C 80241B5C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C78840 80241B60 3C0142B4 */ lui $at, 0x42b4 -/* C78844 80241B64 44816000 */ mtc1 $at, $f12 -/* C78848 80241B68 00031080 */ sll $v0, $v1, 2 -/* C7884C 80241B6C 00431021 */ addu $v0, $v0, $v1 -/* C78850 80241B70 00021080 */ sll $v0, $v0, 2 -/* C78854 80241B74 00431023 */ subu $v0, $v0, $v1 -/* C78858 80241B78 000218C0 */ sll $v1, $v0, 3 -/* C7885C 80241B7C 00431021 */ addu $v0, $v0, $v1 -/* C78860 80241B80 000210C0 */ sll $v0, $v0, 3 -/* C78864 80241B84 3C01800B */ lui $at, 0x800b -/* C78868 80241B88 00220821 */ addu $at, $at, $v0 -/* C7886C 80241B8C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C78870 80241B90 460C0300 */ add.s $f12, $f0, $f12 -.L80241B94: -/* C78874 80241B94 0C00A6C9 */ jal clamp_angle -/* C78878 80241B98 00000000 */ nop -/* C7887C 80241B9C 46000586 */ mov.s $f22, $f0 -/* C78880 80241BA0 3C014334 */ lui $at, 0x4334 -/* C78884 80241BA4 44816000 */ mtc1 $at, $f12 -/* C78888 80241BA8 0C00A6C9 */ jal clamp_angle -/* C7888C 80241BAC 460CB300 */ add.s $f12, $f22, $f12 -/* C78890 80241BB0 8EC20088 */ lw $v0, 0x88($s6) -/* C78894 80241BB4 14400010 */ bnez $v0, .L80241BF8 -/* C78898 80241BB8 46000606 */ mov.s $f24, $f0 -/* C7889C 80241BBC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C788A0 80241BC0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C788A4 80241BC4 804300B4 */ lb $v1, 0xb4($v0) -/* C788A8 80241BC8 3C014200 */ lui $at, 0x4200 -/* C788AC 80241BCC 4481A000 */ mtc1 $at, $f20 -/* C788B0 80241BD0 10600016 */ beqz $v1, .L80241C2C -/* C788B4 80241BD4 24020001 */ addiu $v0, $zero, 1 -/* C788B8 80241BD8 3C0142C8 */ lui $at, 0x42c8 -/* C788BC 80241BDC 4481A000 */ mtc1 $at, $f20 -/* C788C0 80241BE0 14620013 */ bne $v1, $v0, .L80241C30 -/* C788C4 80241BE4 26300038 */ addiu $s0, $s1, 0x38 -/* C788C8 80241BE8 3C0142B4 */ lui $at, 0x42b4 -/* C788CC 80241BEC 4481A000 */ mtc1 $at, $f20 -/* C788D0 80241BF0 0809070D */ j .L80241C34 -/* C788D4 80241BF4 0200202D */ daddu $a0, $s0, $zero -.L80241BF8: -/* C788D8 80241BF8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C788DC 80241BFC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C788E0 80241C00 804300B4 */ lb $v1, 0xb4($v0) -/* C788E4 80241C04 3C014218 */ lui $at, 0x4218 -/* C788E8 80241C08 4481A000 */ mtc1 $at, $f20 -/* C788EC 80241C0C 10600007 */ beqz $v1, .L80241C2C -/* C788F0 80241C10 24020001 */ addiu $v0, $zero, 1 -/* C788F4 80241C14 3C0142B4 */ lui $at, 0x42b4 -/* C788F8 80241C18 4481A000 */ mtc1 $at, $f20 -/* C788FC 80241C1C 14620004 */ bne $v1, $v0, .L80241C30 -/* C78900 80241C20 26300038 */ addiu $s0, $s1, 0x38 -/* C78904 80241C24 3C014296 */ lui $at, 0x4296 -/* C78908 80241C28 4481A000 */ mtc1 $at, $f20 -.L80241C2C: -/* C7890C 80241C2C 26300038 */ addiu $s0, $s1, 0x38 -.L80241C30: -/* C78910 80241C30 0200202D */ daddu $a0, $s0, $zero -.L80241C34: -/* C78914 80241C34 3C15800F */ lui $s5, %hi(gPlayerStatusPtr) -/* C78918 80241C38 26B57B30 */ addiu $s5, $s5, %lo(gPlayerStatusPtr) -/* C7891C 80241C3C 4407C000 */ mfc1 $a3, $f24 -/* C78920 80241C40 862200A6 */ lh $v0, 0xa6($s1) -/* C78924 80241C44 8EA30000 */ lw $v1, ($s5) -/* C78928 80241C48 44824000 */ mtc1 $v0, $f8 -/* C7892C 80241C4C 00000000 */ nop -/* C78930 80241C50 46804220 */ cvt.s.w $f8, $f8 -/* C78934 80241C54 C4600028 */ lwc1 $f0, 0x28($v1) -/* C78938 80241C58 44064000 */ mfc1 $a2, $f8 -/* C7893C 80241C5C 26330040 */ addiu $s3, $s1, 0x40 -/* C78940 80241C60 E6200038 */ swc1 $f0, 0x38($s1) -/* C78944 80241C64 C4600030 */ lwc1 $f0, 0x30($v1) -/* C78948 80241C68 0260282D */ daddu $a1, $s3, $zero -/* C7894C 80241C6C 0C00A7E7 */ jal add_vec2D_polar -/* C78950 80241C70 E6200040 */ swc1 $f0, 0x40($s1) -/* C78954 80241C74 862200A6 */ lh $v0, 0xa6($s1) -/* C78958 80241C78 44820000 */ mtc1 $v0, $f0 -/* C7895C 80241C7C 00000000 */ nop -/* C78960 80241C80 46800020 */ cvt.s.w $f0, $f0 -/* C78964 80241C84 4600A000 */ add.s $f0, $f20, $f0 -/* C78968 80241C88 4406B000 */ mfc1 $a2, $f22 -/* C7896C 80241C8C 44050000 */ mfc1 $a1, $f0 -/* C78970 80241C90 0C00EA95 */ jal npc_move_heading -/* C78974 80241C94 0220202D */ daddu $a0, $s1, $zero -/* C78978 80241C98 8EC20088 */ lw $v0, 0x88($s6) -/* C7897C 80241C9C 1440005D */ bnez $v0, .L80241E14 -/* C78980 80241CA0 00000000 */ nop -/* C78984 80241CA4 C6200038 */ lwc1 $f0, 0x38($s1) -/* C78988 80241CA8 3C018024 */ lui $at, 0x8024 -/* C7898C 80241CAC D4247408 */ ldc1 $f4, 0x7408($at) -/* C78990 80241CB0 46000021 */ cvt.d.s $f0, $f0 -/* C78994 80241CB4 4620203C */ c.lt.d $f4, $f0 -/* C78998 80241CB8 00000000 */ nop -/* C7899C 80241CBC 45000005 */ bc1f .L80241CD4 -/* C789A0 80241CC0 00000000 */ nop -/* C789A4 80241CC4 3C0143BE */ lui $at, 0x43be -/* C789A8 80241CC8 44810000 */ mtc1 $at, $f0 -/* C789AC 80241CCC 00000000 */ nop -/* C789B0 80241CD0 E6200038 */ swc1 $f0, 0x38($s1) -.L80241CD4: -/* C789B4 80241CD4 C6200038 */ lwc1 $f0, 0x38($s1) -/* C789B8 80241CD8 3C018024 */ lui $at, 0x8024 -/* C789BC 80241CDC D4227410 */ ldc1 $f2, 0x7410($at) -/* C789C0 80241CE0 46000021 */ cvt.d.s $f0, $f0 -/* C789C4 80241CE4 4622003C */ c.lt.d $f0, $f2 -/* C789C8 80241CE8 00000000 */ nop -/* C789CC 80241CEC 45000005 */ bc1f .L80241D04 -/* C789D0 80241CF0 00000000 */ nop -/* C789D4 80241CF4 3C01C3BE */ lui $at, 0xc3be -/* C789D8 80241CF8 44810000 */ mtc1 $at, $f0 -/* C789DC 80241CFC 00000000 */ nop -/* C789E0 80241D00 E6200038 */ swc1 $f0, 0x38($s1) -.L80241D04: -/* C789E4 80241D04 C6200040 */ lwc1 $f0, 0x40($s1) -/* C789E8 80241D08 46000021 */ cvt.d.s $f0, $f0 -/* C789EC 80241D0C 4620203C */ c.lt.d $f4, $f0 -/* C789F0 80241D10 00000000 */ nop -/* C789F4 80241D14 45000005 */ bc1f .L80241D2C -/* C789F8 80241D18 00000000 */ nop -/* C789FC 80241D1C 3C0143BE */ lui $at, 0x43be -/* C78A00 80241D20 44810000 */ mtc1 $at, $f0 -/* C78A04 80241D24 00000000 */ nop -/* C78A08 80241D28 E6200040 */ swc1 $f0, 0x40($s1) -.L80241D2C: -/* C78A0C 80241D2C C6200040 */ lwc1 $f0, 0x40($s1) -/* C78A10 80241D30 46000021 */ cvt.d.s $f0, $f0 -/* C78A14 80241D34 4622003C */ c.lt.d $f0, $f2 -/* C78A18 80241D38 00000000 */ nop -/* C78A1C 80241D3C 45000005 */ bc1f .L80241D54 -/* C78A20 80241D40 00000000 */ nop -/* C78A24 80241D44 3C01C3BE */ lui $at, 0xc3be -/* C78A28 80241D48 44810000 */ mtc1 $at, $f0 -/* C78A2C 80241D4C 00000000 */ nop -/* C78A30 80241D50 E6200040 */ swc1 $f0, 0x40($s1) -.L80241D54: -/* C78A34 80241D54 C6220038 */ lwc1 $f2, 0x38($s1) -/* C78A38 80241D58 46021082 */ mul.s $f2, $f2, $f2 -/* C78A3C 80241D5C 00000000 */ nop -/* C78A40 80241D60 C6200040 */ lwc1 $f0, 0x40($s1) -/* C78A44 80241D64 46000002 */ mul.s $f0, $f0, $f0 -/* C78A48 80241D68 00000000 */ nop -/* C78A4C 80241D6C 46001300 */ add.s $f12, $f2, $f0 -/* C78A50 80241D70 46006004 */ sqrt.s $f0, $f12 -/* C78A54 80241D74 46000032 */ c.eq.s $f0, $f0 -/* C78A58 80241D78 00000000 */ nop -/* C78A5C 80241D7C 45010003 */ bc1t .L80241D8C -/* C78A60 80241D80 00000000 */ nop -/* C78A64 80241D84 0C0187BC */ jal sqrtf -/* C78A68 80241D88 00000000 */ nop -.L80241D8C: -/* C78A6C 80241D8C 8E260038 */ lw $a2, 0x38($s1) -/* C78A70 80241D90 8E270040 */ lw $a3, 0x40($s1) -/* C78A74 80241D94 4480A000 */ mtc1 $zero, $f20 -/* C78A78 80241D98 E7A00038 */ swc1 $f0, 0x38($sp) -/* C78A7C 80241D9C 4600A306 */ mov.s $f12, $f20 -/* C78A80 80241DA0 0C00A720 */ jal atan2 -/* C78A84 80241DA4 4600A386 */ mov.s $f14, $f20 -/* C78A88 80241DA8 46000586 */ mov.s $f22, $f0 -/* C78A8C 80241DAC C7A20038 */ lwc1 $f2, 0x38($sp) -/* C78A90 80241DB0 3C018024 */ lui $at, 0x8024 -/* C78A94 80241DB4 D4207418 */ ldc1 $f0, 0x7418($at) -/* C78A98 80241DB8 460010A1 */ cvt.d.s $f2, $f2 -/* C78A9C 80241DBC 4620103C */ c.lt.d $f2, $f0 -/* C78AA0 80241DC0 00000000 */ nop -/* C78AA4 80241DC4 45000004 */ bc1f .L80241DD8 -/* C78AA8 80241DC8 0200202D */ daddu $a0, $s0, $zero -/* C78AAC 80241DCC 3C064398 */ lui $a2, 0x4398 -/* C78AB0 80241DD0 0809077E */ j .L80241DF8 -/* C78AB4 80241DD4 34C68000 */ ori $a2, $a2, 0x8000 -.L80241DD8: -/* C78AB8 80241DD8 3C018024 */ lui $at, 0x8024 -/* C78ABC 80241DDC D4207420 */ ldc1 $f0, 0x7420($at) -/* C78AC0 80241DE0 4622003C */ c.lt.d $f0, $f2 -/* C78AC4 80241DE4 00000000 */ nop -/* C78AC8 80241DE8 450000FA */ bc1f .L802421D4 -/* C78ACC 80241DEC 00000000 */ nop -/* C78AD0 80241DF0 3C0643BB */ lui $a2, 0x43bb -/* C78AD4 80241DF4 34C68000 */ ori $a2, $a2, 0x8000 -.L80241DF8: -/* C78AD8 80241DF8 4407B000 */ mfc1 $a3, $f22 -/* C78ADC 80241DFC 0260282D */ daddu $a1, $s3, $zero -/* C78AE0 80241E00 E6340038 */ swc1 $f20, 0x38($s1) -/* C78AE4 80241E04 0C00A7E7 */ jal add_vec2D_polar -/* C78AE8 80241E08 E6340040 */ swc1 $f20, 0x40($s1) -/* C78AEC 80241E0C 08090875 */ j .L802421D4 -/* C78AF0 80241E10 00000000 */ nop -.L80241E14: -/* C78AF4 80241E14 8E220000 */ lw $v0, ($s1) -/* C78AF8 80241E18 30420040 */ andi $v0, $v0, 0x40 -/* C78AFC 80241E1C 144000B0 */ bnez $v0, .L802420E0 -/* C78B00 80241E20 27A50020 */ addiu $a1, $sp, 0x20 -/* C78B04 80241E24 27B40020 */ addiu $s4, $sp, 0x20 -/* C78B08 80241E28 0280282D */ daddu $a1, $s4, $zero -/* C78B0C 80241E2C 27B30024 */ addiu $s3, $sp, 0x24 -/* C78B10 80241E30 8EA20000 */ lw $v0, ($s5) -/* C78B14 80241E34 3C014032 */ lui $at, 0x4032 -/* C78B18 80241E38 44811800 */ mtc1 $at, $f3 -/* C78B1C 80241E3C 44801000 */ mtc1 $zero, $f2 -/* C78B20 80241E40 C440002C */ lwc1 $f0, 0x2c($v0) -/* C78B24 80241E44 C4460028 */ lwc1 $f6, 0x28($v0) -/* C78B28 80241E48 C4440030 */ lwc1 $f4, 0x30($v0) -/* C78B2C 80241E4C 46000021 */ cvt.d.s $f0, $f0 -/* C78B30 80241E50 46220000 */ add.d $f0, $f0, $f2 -/* C78B34 80241E54 E7A60020 */ swc1 $f6, 0x20($sp) -/* C78B38 80241E58 E7A40028 */ swc1 $f4, 0x28($sp) -/* C78B3C 80241E5C 46200020 */ cvt.s.d $f0, $f0 -/* C78B40 80241E60 E7A00024 */ swc1 $f0, 0x24($sp) -/* C78B44 80241E64 E7B40010 */ swc1 $f20, 0x10($sp) -/* C78B48 80241E68 E7B60014 */ swc1 $f22, 0x14($sp) -/* C78B4C 80241E6C 862200A8 */ lh $v0, 0xa8($s1) -/* C78B50 80241E70 0260302D */ daddu $a2, $s3, $zero -/* C78B54 80241E74 44820000 */ mtc1 $v0, $f0 -/* C78B58 80241E78 00000000 */ nop -/* C78B5C 80241E7C 46800020 */ cvt.s.w $f0, $f0 -/* C78B60 80241E80 E7A00018 */ swc1 $f0, 0x18($sp) -/* C78B64 80241E84 862200A6 */ lh $v0, 0xa6($s1) -/* C78B68 80241E88 27B00028 */ addiu $s0, $sp, 0x28 -/* C78B6C 80241E8C 44820000 */ mtc1 $v0, $f0 -/* C78B70 80241E90 00000000 */ nop -/* C78B74 80241E94 46800020 */ cvt.s.w $f0, $f0 -/* C78B78 80241E98 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C78B7C 80241E9C 8E240080 */ lw $a0, 0x80($s1) -/* C78B80 80241EA0 0C037711 */ jal func_800DDC44 -/* C78B84 80241EA4 0200382D */ daddu $a3, $s0, $zero -/* C78B88 80241EA8 104000CA */ beqz $v0, .L802421D4 -/* C78B8C 80241EAC 0280282D */ daddu $a1, $s4, $zero -/* C78B90 80241EB0 8EA20000 */ lw $v0, ($s5) -/* C78B94 80241EB4 3C018024 */ lui $at, 0x8024 -/* C78B98 80241EB8 D4227428 */ ldc1 $f2, 0x7428($at) -/* C78B9C 80241EBC C440002C */ lwc1 $f0, 0x2c($v0) -/* C78BA0 80241EC0 C4460028 */ lwc1 $f6, 0x28($v0) -/* C78BA4 80241EC4 C4440030 */ lwc1 $f4, 0x30($v0) -/* C78BA8 80241EC8 46000021 */ cvt.d.s $f0, $f0 -/* C78BAC 80241ECC 46220000 */ add.d $f0, $f0, $f2 -/* C78BB0 80241ED0 E7A60020 */ swc1 $f6, 0x20($sp) -/* C78BB4 80241ED4 E7A40028 */ swc1 $f4, 0x28($sp) -/* C78BB8 80241ED8 46200020 */ cvt.s.d $f0, $f0 -/* C78BBC 80241EDC E7A00024 */ swc1 $f0, 0x24($sp) -/* C78BC0 80241EE0 E7B40010 */ swc1 $f20, 0x10($sp) -/* C78BC4 80241EE4 E7B60014 */ swc1 $f22, 0x14($sp) -/* C78BC8 80241EE8 862200A8 */ lh $v0, 0xa8($s1) -/* C78BCC 80241EEC 44820000 */ mtc1 $v0, $f0 -/* C78BD0 80241EF0 00000000 */ nop -/* C78BD4 80241EF4 46800020 */ cvt.s.w $f0, $f0 -/* C78BD8 80241EF8 E7A00018 */ swc1 $f0, 0x18($sp) -/* C78BDC 80241EFC 862200A6 */ lh $v0, 0xa6($s1) -/* C78BE0 80241F00 0260302D */ daddu $a2, $s3, $zero -/* C78BE4 80241F04 44820000 */ mtc1 $v0, $f0 -/* C78BE8 80241F08 00000000 */ nop -/* C78BEC 80241F0C 46800020 */ cvt.s.w $f0, $f0 -/* C78BF0 80241F10 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C78BF4 80241F14 8E240080 */ lw $a0, 0x80($s1) -/* C78BF8 80241F18 0C037711 */ jal func_800DDC44 -/* C78BFC 80241F1C 0200382D */ daddu $a3, $s0, $zero -/* C78C00 80241F20 27A5002C */ addiu $a1, $sp, 0x2c -/* C78C04 80241F24 27A60030 */ addiu $a2, $sp, 0x30 -/* C78C08 80241F28 27A70034 */ addiu $a3, $sp, 0x34 -/* C78C0C 80241F2C 27A30038 */ addiu $v1, $sp, 0x38 -/* C78C10 80241F30 C6220038 */ lwc1 $f2, 0x38($s1) -/* C78C14 80241F34 C620003C */ lwc1 $f0, 0x3c($s1) -/* C78C18 80241F38 3C014348 */ lui $at, 0x4348 -/* C78C1C 80241F3C 44813000 */ mtc1 $at, $f6 -/* C78C20 80241F40 46000021 */ cvt.d.s $f0, $f0 -/* C78C24 80241F44 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C78C28 80241F48 3C014059 */ lui $at, 0x4059 -/* C78C2C 80241F4C 44811800 */ mtc1 $at, $f3 -/* C78C30 80241F50 44801000 */ mtc1 $zero, $f2 -/* C78C34 80241F54 C6240040 */ lwc1 $f4, 0x40($s1) -/* C78C38 80241F58 46220000 */ add.d $f0, $f0, $f2 -/* C78C3C 80241F5C E7A60038 */ swc1 $f6, 0x38($sp) -/* C78C40 80241F60 E7A40034 */ swc1 $f4, 0x34($sp) -/* C78C44 80241F64 46200020 */ cvt.s.d $f0, $f0 -/* C78C48 80241F68 E7A00030 */ swc1 $f0, 0x30($sp) -/* C78C4C 80241F6C AFA30010 */ sw $v1, 0x10($sp) -/* C78C50 80241F70 8E240080 */ lw $a0, 0x80($s1) -/* C78C54 80241F74 0C0372DF */ jal func_800DCB7C -/* C78C58 80241F78 0040802D */ daddu $s0, $v0, $zero -/* C78C5C 80241F7C 1600001C */ bnez $s0, .L80241FF0 -/* C78C60 80241F80 00000000 */ nop -/* C78C64 80241F84 1040001A */ beqz $v0, .L80241FF0 -/* C78C68 80241F88 00000000 */ nop -/* C78C6C 80241F8C C7A20038 */ lwc1 $f2, 0x38($sp) -/* C78C70 80241F90 3C014054 */ lui $at, 0x4054 -/* C78C74 80241F94 44810800 */ mtc1 $at, $f1 -/* C78C78 80241F98 44800000 */ mtc1 $zero, $f0 -/* C78C7C 80241F9C 460010A1 */ cvt.d.s $f2, $f2 -/* C78C80 80241FA0 4622003C */ c.lt.d $f0, $f2 -/* C78C84 80241FA4 00000000 */ nop -/* C78C88 80241FA8 45000011 */ bc1f .L80241FF0 -/* C78C8C 80241FAC 00000000 */ nop -/* C78C90 80241FB0 3C01405E */ lui $at, 0x405e -/* C78C94 80241FB4 44810800 */ mtc1 $at, $f1 -/* C78C98 80241FB8 44800000 */ mtc1 $zero, $f0 -/* C78C9C 80241FBC 00000000 */ nop -/* C78CA0 80241FC0 4620103C */ c.lt.d $f2, $f0 -/* C78CA4 80241FC4 00000000 */ nop -/* C78CA8 80241FC8 45000009 */ bc1f .L80241FF0 -/* C78CAC 80241FCC 00000000 */ nop -/* C78CB0 80241FD0 C622003C */ lwc1 $f2, 0x3c($s1) -/* C78CB4 80241FD4 C7A00030 */ lwc1 $f0, 0x30($sp) -/* C78CB8 80241FD8 46001032 */ c.eq.s $f2, $f0 -/* C78CBC 80241FDC 00000000 */ nop -/* C78CC0 80241FE0 45010003 */ bc1t .L80241FF0 -/* C78CC4 80241FE4 00000000 */ nop -/* C78CC8 80241FE8 08090875 */ j .L802421D4 -/* C78CCC 80241FEC 241E0001 */ addiu $fp, $zero, 1 -.L80241FF0: -/* C78CD0 80241FF0 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* C78CD4 80241FF4 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* C78CD8 80241FF8 8E020000 */ lw $v0, ($s0) -/* C78CDC 80241FFC 3C014024 */ lui $at, 0x4024 -/* C78CE0 80242000 44811800 */ mtc1 $at, $f3 -/* C78CE4 80242004 44801000 */ mtc1 $zero, $f2 -/* C78CE8 80242008 C440002C */ lwc1 $f0, 0x2c($v0) -/* C78CEC 8024200C C4460028 */ lwc1 $f6, 0x28($v0) -/* C78CF0 80242010 C4440030 */ lwc1 $f4, 0x30($v0) -/* C78CF4 80242014 46000021 */ cvt.d.s $f0, $f0 -/* C78CF8 80242018 46220000 */ add.d $f0, $f0, $f2 -/* C78CFC 8024201C E7A60020 */ swc1 $f6, 0x20($sp) -/* C78D00 80242020 E7A40028 */ swc1 $f4, 0x28($sp) -/* C78D04 80242024 46200020 */ cvt.s.d $f0, $f0 -/* C78D08 80242028 E7A00024 */ swc1 $f0, 0x24($sp) -/* C78D0C 8024202C E7B40010 */ swc1 $f20, 0x10($sp) -/* C78D10 80242030 E7B60014 */ swc1 $f22, 0x14($sp) -/* C78D14 80242034 862200A8 */ lh $v0, 0xa8($s1) -/* C78D18 80242038 27A50020 */ addiu $a1, $sp, 0x20 -/* C78D1C 8024203C 44820000 */ mtc1 $v0, $f0 -/* C78D20 80242040 00000000 */ nop -/* C78D24 80242044 46800020 */ cvt.s.w $f0, $f0 -/* C78D28 80242048 E7A00018 */ swc1 $f0, 0x18($sp) -/* C78D2C 8024204C 862200A6 */ lh $v0, 0xa6($s1) -/* C78D30 80242050 27A60024 */ addiu $a2, $sp, 0x24 -/* C78D34 80242054 44820000 */ mtc1 $v0, $f0 -/* C78D38 80242058 00000000 */ nop -/* C78D3C 8024205C 46800020 */ cvt.s.w $f0, $f0 -/* C78D40 80242060 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C78D44 80242064 8E240080 */ lw $a0, 0x80($s1) -/* C78D48 80242068 0C037711 */ jal func_800DDC44 -/* C78D4C 8024206C 27A70028 */ addiu $a3, $sp, 0x28 -/* C78D50 80242070 8FA60020 */ lw $a2, 0x20($sp) -/* C78D54 80242074 8E020000 */ lw $v0, ($s0) -/* C78D58 80242078 8FA70028 */ lw $a3, 0x28($sp) -/* C78D5C 8024207C C44C0028 */ lwc1 $f12, 0x28($v0) -/* C78D60 80242080 C44E0030 */ lwc1 $f14, 0x30($v0) -/* C78D64 80242084 0C00A7B5 */ jal dist2D -/* C78D68 80242088 24170001 */ addiu $s7, $zero, 1 -/* C78D6C 8024208C 46000506 */ mov.s $f20, $f0 -/* C78D70 80242090 8E030000 */ lw $v1, ($s0) -/* C78D74 80242094 862200A6 */ lh $v0, 0xa6($s1) -/* C78D78 80242098 4407C000 */ mfc1 $a3, $f24 -/* C78D7C 8024209C 44824000 */ mtc1 $v0, $f8 -/* C78D80 802420A0 00000000 */ nop -/* C78D84 802420A4 46804220 */ cvt.s.w $f8, $f8 -/* C78D88 802420A8 C4600028 */ lwc1 $f0, 0x28($v1) -/* C78D8C 802420AC 44064000 */ mfc1 $a2, $f8 -/* C78D90 802420B0 26240038 */ addiu $a0, $s1, 0x38 -/* C78D94 802420B4 E6200038 */ swc1 $f0, 0x38($s1) -/* C78D98 802420B8 C4600030 */ lwc1 $f0, 0x30($v1) -/* C78D9C 802420BC 26250040 */ addiu $a1, $s1, 0x40 -/* C78DA0 802420C0 0C00A7E7 */ jal add_vec2D_polar -/* C78DA4 802420C4 E6200040 */ swc1 $f0, 0x40($s1) -/* C78DA8 802420C8 862200A6 */ lh $v0, 0xa6($s1) -/* C78DAC 802420CC 44820000 */ mtc1 $v0, $f0 -/* C78DB0 802420D0 00000000 */ nop -/* C78DB4 802420D4 46800020 */ cvt.s.w $f0, $f0 -/* C78DB8 802420D8 08090871 */ j .L802421C4 -/* C78DBC 802420DC 4600A500 */ add.s $f20, $f20, $f0 -.L802420E0: -/* C78DC0 802420E0 8EA20000 */ lw $v0, ($s5) -/* C78DC4 802420E4 3C014032 */ lui $at, 0x4032 -/* C78DC8 802420E8 44811800 */ mtc1 $at, $f3 -/* C78DCC 802420EC 44801000 */ mtc1 $zero, $f2 -/* C78DD0 802420F0 C440002C */ lwc1 $f0, 0x2c($v0) -/* C78DD4 802420F4 C4460028 */ lwc1 $f6, 0x28($v0) -/* C78DD8 802420F8 C4440030 */ lwc1 $f4, 0x30($v0) -/* C78DDC 802420FC 46000021 */ cvt.d.s $f0, $f0 -/* C78DE0 80242100 46220000 */ add.d $f0, $f0, $f2 -/* C78DE4 80242104 E7A60020 */ swc1 $f6, 0x20($sp) -/* C78DE8 80242108 E7A40028 */ swc1 $f4, 0x28($sp) -/* C78DEC 8024210C 46200020 */ cvt.s.d $f0, $f0 -/* C78DF0 80242110 E7A00024 */ swc1 $f0, 0x24($sp) -/* C78DF4 80242114 E7B40010 */ swc1 $f20, 0x10($sp) -/* C78DF8 80242118 E7B60014 */ swc1 $f22, 0x14($sp) -/* C78DFC 8024211C 862200A8 */ lh $v0, 0xa8($s1) -/* C78E00 80242120 44820000 */ mtc1 $v0, $f0 -/* C78E04 80242124 00000000 */ nop -/* C78E08 80242128 46800020 */ cvt.s.w $f0, $f0 -/* C78E0C 8024212C E7A00018 */ swc1 $f0, 0x18($sp) -/* C78E10 80242130 862200A6 */ lh $v0, 0xa6($s1) -/* C78E14 80242134 27A60024 */ addiu $a2, $sp, 0x24 -/* C78E18 80242138 44820000 */ mtc1 $v0, $f0 -/* C78E1C 8024213C 00000000 */ nop -/* C78E20 80242140 46800020 */ cvt.s.w $f0, $f0 -/* C78E24 80242144 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C78E28 80242148 8E240080 */ lw $a0, 0x80($s1) -/* C78E2C 8024214C 0C037711 */ jal func_800DDC44 -/* C78E30 80242150 27A70028 */ addiu $a3, $sp, 0x28 -/* C78E34 80242154 1040001F */ beqz $v0, .L802421D4 -/* C78E38 80242158 00000000 */ nop -/* C78E3C 8024215C 8FA60020 */ lw $a2, 0x20($sp) -/* C78E40 80242160 8EA20000 */ lw $v0, ($s5) -/* C78E44 80242164 8FA70028 */ lw $a3, 0x28($sp) -/* C78E48 80242168 C44C0028 */ lwc1 $f12, 0x28($v0) -/* C78E4C 8024216C 0C00A7B5 */ jal dist2D -/* C78E50 80242170 C44E0030 */ lwc1 $f14, 0x30($v0) -/* C78E54 80242174 46000506 */ mov.s $f20, $f0 -/* C78E58 80242178 8EA30000 */ lw $v1, ($s5) -/* C78E5C 8024217C 862200A6 */ lh $v0, 0xa6($s1) -/* C78E60 80242180 4407C000 */ mfc1 $a3, $f24 -/* C78E64 80242184 44824000 */ mtc1 $v0, $f8 -/* C78E68 80242188 00000000 */ nop -/* C78E6C 8024218C 46804220 */ cvt.s.w $f8, $f8 -/* C78E70 80242190 C4600028 */ lwc1 $f0, 0x28($v1) -/* C78E74 80242194 44064000 */ mfc1 $a2, $f8 -/* C78E78 80242198 0200202D */ daddu $a0, $s0, $zero -/* C78E7C 8024219C E6200038 */ swc1 $f0, 0x38($s1) -/* C78E80 802421A0 C4600030 */ lwc1 $f0, 0x30($v1) -/* C78E84 802421A4 0260282D */ daddu $a1, $s3, $zero -/* C78E88 802421A8 0C00A7E7 */ jal add_vec2D_polar -/* C78E8C 802421AC E6200040 */ swc1 $f0, 0x40($s1) -/* C78E90 802421B0 862200A6 */ lh $v0, 0xa6($s1) -/* C78E94 802421B4 44820000 */ mtc1 $v0, $f0 -/* C78E98 802421B8 00000000 */ nop -/* C78E9C 802421BC 46800020 */ cvt.s.w $f0, $f0 -/* C78EA0 802421C0 4600A500 */ add.s $f20, $f20, $f0 -.L802421C4: -/* C78EA4 802421C4 4406B000 */ mfc1 $a2, $f22 -/* C78EA8 802421C8 4405A000 */ mfc1 $a1, $f20 -/* C78EAC 802421CC 0C00EA95 */ jal npc_move_heading -/* C78EB0 802421D0 0220202D */ daddu $a0, $s1, $zero -.L802421D4: -/* C78EB4 802421D4 C6400008 */ lwc1 $f0, 8($s2) -/* C78EB8 802421D8 46800020 */ cvt.s.w $f0, $f0 -/* C78EBC 802421DC 44050000 */ mfc1 $a1, $f0 -/* C78EC0 802421E0 C640000C */ lwc1 $f0, 0xc($s2) -/* C78EC4 802421E4 46800020 */ cvt.s.w $f0, $f0 -/* C78EC8 802421E8 44060000 */ mfc1 $a2, $f0 -/* C78ECC 802421EC C6200040 */ lwc1 $f0, 0x40($s1) -/* C78ED0 802421F0 26300038 */ addiu $s0, $s1, 0x38 -/* C78ED4 802421F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C78ED8 802421F8 C6400010 */ lwc1 $f0, 0x10($s2) -/* C78EDC 802421FC 46800020 */ cvt.s.w $f0, $f0 -/* C78EE0 80242200 E7A00014 */ swc1 $f0, 0x14($sp) -/* C78EE4 80242204 C6400014 */ lwc1 $f0, 0x14($s2) -/* C78EE8 80242208 46800020 */ cvt.s.w $f0, $f0 -/* C78EEC 8024220C E7A00018 */ swc1 $f0, 0x18($sp) -/* C78EF0 80242210 8E440004 */ lw $a0, 4($s2) -/* C78EF4 80242214 8E270038 */ lw $a3, 0x38($s1) -/* C78EF8 80242218 0C0123F5 */ jal is_point_within_region -/* C78EFC 8024221C 26330040 */ addiu $s3, $s1, 0x40 -/* C78F00 80242220 1040005A */ beqz $v0, .L8024238C -/* C78F04 80242224 00000000 */ nop -/* C78F08 80242228 8E430004 */ lw $v1, 4($s2) -/* C78F0C 8024222C 10600005 */ beqz $v1, .L80242244 -/* C78F10 80242230 24020001 */ addiu $v0, $zero, 1 -/* C78F14 80242234 10620029 */ beq $v1, $v0, .L802422DC -/* C78F18 80242238 00000000 */ nop -/* C78F1C 8024223C 080908E3 */ j .L8024238C -/* C78F20 80242240 00000000 */ nop -.L80242244: -/* C78F24 80242244 C6480008 */ lwc1 $f8, 8($s2) -/* C78F28 80242248 46804220 */ cvt.s.w $f8, $f8 -/* C78F2C 8024224C 44064000 */ mfc1 $a2, $f8 -/* C78F30 80242250 C648000C */ lwc1 $f8, 0xc($s2) -/* C78F34 80242254 46804220 */ cvt.s.w $f8, $f8 -/* C78F38 80242258 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C78F3C 8024225C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C78F40 80242260 44074000 */ mfc1 $a3, $f8 -/* C78F44 80242264 0C00A7B5 */ jal dist2D -/* C78F48 80242268 00000000 */ nop -/* C78F4C 8024226C C6420010 */ lwc1 $f2, 0x10($s2) -/* C78F50 80242270 468010A0 */ cvt.s.w $f2, $f2 -/* C78F54 80242274 4600103C */ c.lt.s $f2, $f0 -/* C78F58 80242278 00000000 */ nop -/* C78F5C 8024227C 45000043 */ bc1f .L8024238C -/* C78F60 80242280 E7A00038 */ swc1 $f0, 0x38($sp) -/* C78F64 80242284 C64C0008 */ lwc1 $f12, 8($s2) -/* C78F68 80242288 46806320 */ cvt.s.w $f12, $f12 -/* C78F6C 8024228C 8E260038 */ lw $a2, 0x38($s1) -/* C78F70 80242290 8E270040 */ lw $a3, 0x40($s1) -/* C78F74 80242294 C64E000C */ lwc1 $f14, 0xc($s2) -/* C78F78 80242298 0C00A720 */ jal atan2 -/* C78F7C 8024229C 468073A0 */ cvt.s.w $f14, $f14 -/* C78F80 802422A0 0200202D */ daddu $a0, $s0, $zero -/* C78F84 802422A4 44070000 */ mfc1 $a3, $f0 -/* C78F88 802422A8 C6400008 */ lwc1 $f0, 8($s2) -/* C78F8C 802422AC 46800020 */ cvt.s.w $f0, $f0 -/* C78F90 802422B0 E6200038 */ swc1 $f0, 0x38($s1) -/* C78F94 802422B4 C640000C */ lwc1 $f0, 0xc($s2) -/* C78F98 802422B8 46800020 */ cvt.s.w $f0, $f0 -/* C78F9C 802422BC E6200040 */ swc1 $f0, 0x40($s1) -/* C78FA0 802422C0 C6480010 */ lwc1 $f8, 0x10($s2) -/* C78FA4 802422C4 46804220 */ cvt.s.w $f8, $f8 -/* C78FA8 802422C8 44064000 */ mfc1 $a2, $f8 -/* C78FAC 802422CC 0C00A7E7 */ jal add_vec2D_polar -/* C78FB0 802422D0 0260282D */ daddu $a1, $s3, $zero -/* C78FB4 802422D4 080908E3 */ j .L8024238C -/* C78FB8 802422D8 00000000 */ nop -.L802422DC: -/* C78FBC 802422DC 8E420008 */ lw $v0, 8($s2) -/* C78FC0 802422E0 8E430010 */ lw $v1, 0x10($s2) -/* C78FC4 802422E4 C6200038 */ lwc1 $f0, 0x38($s1) -/* C78FC8 802422E8 00431021 */ addu $v0, $v0, $v1 -/* C78FCC 802422EC 44821000 */ mtc1 $v0, $f2 -/* C78FD0 802422F0 00000000 */ nop -/* C78FD4 802422F4 468010A0 */ cvt.s.w $f2, $f2 -/* C78FD8 802422F8 4600103C */ c.lt.s $f2, $f0 -/* C78FDC 802422FC 00000000 */ nop -/* C78FE0 80242300 45030001 */ bc1tl .L80242308 -/* C78FE4 80242304 E6220038 */ swc1 $f2, 0x38($s1) -.L80242308: -/* C78FE8 80242308 8E420008 */ lw $v0, 8($s2) -/* C78FEC 8024230C 8E430010 */ lw $v1, 0x10($s2) -/* C78FF0 80242310 C6200038 */ lwc1 $f0, 0x38($s1) -/* C78FF4 80242314 00431023 */ subu $v0, $v0, $v1 -/* C78FF8 80242318 44821000 */ mtc1 $v0, $f2 -/* C78FFC 8024231C 00000000 */ nop -/* C79000 80242320 468010A0 */ cvt.s.w $f2, $f2 -/* C79004 80242324 4602003C */ c.lt.s $f0, $f2 -/* C79008 80242328 00000000 */ nop -/* C7900C 8024232C 45030001 */ bc1tl .L80242334 -/* C79010 80242330 E6220038 */ swc1 $f2, 0x38($s1) -.L80242334: -/* C79014 80242334 8E42000C */ lw $v0, 0xc($s2) -/* C79018 80242338 8E430014 */ lw $v1, 0x14($s2) -/* C7901C 8024233C C6200040 */ lwc1 $f0, 0x40($s1) -/* C79020 80242340 00431021 */ addu $v0, $v0, $v1 -/* C79024 80242344 44821000 */ mtc1 $v0, $f2 -/* C79028 80242348 00000000 */ nop -/* C7902C 8024234C 468010A0 */ cvt.s.w $f2, $f2 -/* C79030 80242350 4600103C */ c.lt.s $f2, $f0 -/* C79034 80242354 00000000 */ nop -/* C79038 80242358 45030001 */ bc1tl .L80242360 -/* C7903C 8024235C E6220040 */ swc1 $f2, 0x40($s1) -.L80242360: -/* C79040 80242360 8E42000C */ lw $v0, 0xc($s2) -/* C79044 80242364 8E430014 */ lw $v1, 0x14($s2) -/* C79048 80242368 C6200040 */ lwc1 $f0, 0x40($s1) -/* C7904C 8024236C 00431023 */ subu $v0, $v0, $v1 -/* C79050 80242370 44821000 */ mtc1 $v0, $f2 -/* C79054 80242374 00000000 */ nop -/* C79058 80242378 468010A0 */ cvt.s.w $f2, $f2 -/* C7905C 8024237C 4602003C */ c.lt.s $f0, $f2 -/* C79060 80242380 00000000 */ nop -/* C79064 80242384 45030001 */ bc1tl .L8024238C -/* C79068 80242388 E6220040 */ swc1 $f2, 0x40($s1) -.L8024238C: -/* C7906C 8024238C 16E0001F */ bnez $s7, .L8024240C -/* C79070 80242390 00000000 */ nop -/* C79074 80242394 8E220000 */ lw $v0, ($s1) -/* C79078 80242398 30420008 */ andi $v0, $v0, 8 -/* C7907C 8024239C 10400003 */ beqz $v0, .L802423AC -/* C79080 802423A0 27A50020 */ addiu $a1, $sp, 0x20 -/* C79084 802423A4 13C00019 */ beqz $fp, .L8024240C -/* C79088 802423A8 00000000 */ nop -.L802423AC: -/* C7908C 802423AC 27A60024 */ addiu $a2, $sp, 0x24 -/* C79090 802423B0 27A20038 */ addiu $v0, $sp, 0x38 -/* C79094 802423B4 C6220038 */ lwc1 $f2, 0x38($s1) -/* C79098 802423B8 C620003C */ lwc1 $f0, 0x3c($s1) -/* C7909C 802423BC 3C0143C8 */ lui $at, 0x43c8 -/* C790A0 802423C0 44813000 */ mtc1 $at, $f6 -/* C790A4 802423C4 46000021 */ cvt.d.s $f0, $f0 -/* C790A8 802423C8 E7A20020 */ swc1 $f2, 0x20($sp) -/* C790AC 802423CC 3C018024 */ lui $at, 0x8024 -/* C790B0 802423D0 D4227430 */ ldc1 $f2, 0x7430($at) -/* C790B4 802423D4 C6240040 */ lwc1 $f4, 0x40($s1) -/* C790B8 802423D8 46220000 */ add.d $f0, $f0, $f2 -/* C790BC 802423DC E7A60038 */ swc1 $f6, 0x38($sp) -/* C790C0 802423E0 E7A40028 */ swc1 $f4, 0x28($sp) -/* C790C4 802423E4 46200020 */ cvt.s.d $f0, $f0 -/* C790C8 802423E8 E7A00024 */ swc1 $f0, 0x24($sp) -/* C790CC 802423EC AFA20010 */ sw $v0, 0x10($sp) -/* C790D0 802423F0 8E240080 */ lw $a0, 0x80($s1) -/* C790D4 802423F4 0C0372DF */ jal func_800DCB7C -/* C790D8 802423F8 27A70028 */ addiu $a3, $sp, 0x28 -/* C790DC 802423FC 10400003 */ beqz $v0, .L8024240C -/* C790E0 80242400 00000000 */ nop -/* C790E4 80242404 C7A00024 */ lwc1 $f0, 0x24($sp) -/* C790E8 80242408 E620003C */ swc1 $f0, 0x3c($s1) -.L8024240C: -/* C790EC 8024240C C62C0038 */ lwc1 $f12, 0x38($s1) -/* C790F0 80242410 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C790F4 80242414 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C790F8 80242418 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C790FC 8024241C 8C460028 */ lw $a2, 0x28($v0) -/* C79100 80242420 0C00A720 */ jal atan2 -/* C79104 80242424 8C470030 */ lw $a3, 0x30($v0) -/* C79108 80242428 0220202D */ daddu $a0, $s1, $zero -/* C7910C 8024242C 24050321 */ addiu $a1, $zero, 0x321 -/* C79110 80242430 0000302D */ daddu $a2, $zero, $zero -/* C79114 80242434 0C012530 */ jal func_800494C0 -/* C79118 80242438 E620000C */ swc1 $f0, 0xc($s1) -/* C7911C 8024243C 8EC200CC */ lw $v0, 0xcc($s6) -/* C79120 80242440 8C420024 */ lw $v0, 0x24($v0) -/* C79124 80242444 AE220028 */ sw $v0, 0x28($s1) -/* C79128 80242448 96C20096 */ lhu $v0, 0x96($s6) -/* C7912C 8024244C A622008E */ sh $v0, 0x8e($s1) -/* C79130 80242450 8FA80080 */ lw $t0, 0x80($sp) -/* C79134 80242454 2402000B */ addiu $v0, $zero, 0xb -/* C79138 80242458 AD020070 */ sw $v0, 0x70($t0) -.L8024245C: -/* C7913C 8024245C 8FBF0064 */ lw $ra, 0x64($sp) -/* C79140 80242460 8FBE0060 */ lw $fp, 0x60($sp) -/* C79144 80242464 8FB7005C */ lw $s7, 0x5c($sp) -/* C79148 80242468 8FB60058 */ lw $s6, 0x58($sp) -/* C7914C 8024246C 8FB50054 */ lw $s5, 0x54($sp) -/* C79150 80242470 8FB40050 */ lw $s4, 0x50($sp) -/* C79154 80242474 8FB3004C */ lw $s3, 0x4c($sp) -/* C79158 80242478 8FB20048 */ lw $s2, 0x48($sp) -/* C7915C 8024247C 8FB10044 */ lw $s1, 0x44($sp) -/* C79160 80242480 8FB00040 */ lw $s0, 0x40($sp) -/* C79164 80242484 D7B80078 */ ldc1 $f24, 0x78($sp) -/* C79168 80242488 D7B60070 */ ldc1 $f22, 0x70($sp) -/* C7916C 8024248C D7B40068 */ ldc1 $f20, 0x68($sp) -/* C79170 80242490 03E00008 */ jr $ra -/* C79174 80242494 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80242498_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80242498_C76CE0.s deleted file mode 100644 index 6ae01c2c8c..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80242498_C76CE0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242498_C79178 -/* C79178 80242498 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7917C 8024249C AFB10014 */ sw $s1, 0x14($sp) -/* C79180 802424A0 0080882D */ daddu $s1, $a0, $zero -/* C79184 802424A4 AFBF0018 */ sw $ra, 0x18($sp) -/* C79188 802424A8 AFB00010 */ sw $s0, 0x10($sp) -/* C7918C 802424AC 8E300148 */ lw $s0, 0x148($s1) -/* C79190 802424B0 0C00EABB */ jal get_npc_unsafe -/* C79194 802424B4 86040008 */ lh $a0, 8($s0) -/* C79198 802424B8 0040202D */ daddu $a0, $v0, $zero -/* C7919C 802424BC 9482008E */ lhu $v0, 0x8e($a0) -/* C791A0 802424C0 2442FFFF */ addiu $v0, $v0, -1 -/* C791A4 802424C4 A482008E */ sh $v0, 0x8e($a0) -/* C791A8 802424C8 00021400 */ sll $v0, $v0, 0x10 -/* C791AC 802424CC 8E030098 */ lw $v1, 0x98($s0) -/* C791B0 802424D0 00021403 */ sra $v0, $v0, 0x10 -/* C791B4 802424D4 0062182A */ slt $v1, $v1, $v0 -/* C791B8 802424D8 14600005 */ bnez $v1, .L802424F0 -/* C791BC 802424DC 3C03E0EF */ lui $v1, 0xe0ef -/* C791C0 802424E0 8E020000 */ lw $v0, ($s0) -/* C791C4 802424E4 3463FFFF */ ori $v1, $v1, 0xffff -/* C791C8 802424E8 00431024 */ and $v0, $v0, $v1 -/* C791CC 802424EC AE020000 */ sw $v0, ($s0) -.L802424F0: -/* C791D0 802424F0 8482008E */ lh $v0, 0x8e($a0) -/* C791D4 802424F4 14400007 */ bnez $v0, .L80242514 -/* C791D8 802424F8 00000000 */ nop -/* C791DC 802424FC 8E0200CC */ lw $v0, 0xcc($s0) -/* C791E0 80242500 8C420028 */ lw $v0, 0x28($v0) -/* C791E4 80242504 A480008E */ sh $zero, 0x8e($a0) -/* C791E8 80242508 AC820028 */ sw $v0, 0x28($a0) -/* C791EC 8024250C 2402000C */ addiu $v0, $zero, 0xc -/* C791F0 80242510 AE220070 */ sw $v0, 0x70($s1) -.L80242514: -/* C791F4 80242514 8FBF0018 */ lw $ra, 0x18($sp) -/* C791F8 80242518 8FB10014 */ lw $s1, 0x14($sp) -/* C791FC 8024251C 8FB00010 */ lw $s0, 0x10($sp) -/* C79200 80242520 03E00008 */ jr $ra -/* C79204 80242524 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80242528_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80242528_C76CE0.s deleted file mode 100644 index edfe000fe6..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80242528_C76CE0.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242528_C79208 -/* C79208 80242528 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C7920C 8024252C AFB10034 */ sw $s1, 0x34($sp) -/* C79210 80242530 0080882D */ daddu $s1, $a0, $zero -/* C79214 80242534 AFBF0038 */ sw $ra, 0x38($sp) -/* C79218 80242538 AFB00030 */ sw $s0, 0x30($sp) -/* C7921C 8024253C 8E300148 */ lw $s0, 0x148($s1) -/* C79220 80242540 0C00EABB */ jal get_npc_unsafe -/* C79224 80242544 86040008 */ lh $a0, 8($s0) -/* C79228 80242548 0040282D */ daddu $a1, $v0, $zero -/* C7922C 8024254C 94A2008E */ lhu $v0, 0x8e($a1) -/* C79230 80242550 24420001 */ addiu $v0, $v0, 1 -/* C79234 80242554 A4A2008E */ sh $v0, 0x8e($a1) -/* C79238 80242558 00021400 */ sll $v0, $v0, 0x10 -/* C7923C 8024255C 8E0300A0 */ lw $v1, 0xa0($s0) -/* C79240 80242560 00021403 */ sra $v0, $v0, 0x10 -/* C79244 80242564 14430004 */ bne $v0, $v1, .L80242578 -/* C79248 80242568 00000000 */ nop -/* C7924C 8024256C 8E0200CC */ lw $v0, 0xcc($s0) -/* C79250 80242570 8C42002C */ lw $v0, 0x2c($v0) -/* C79254 80242574 ACA20028 */ sw $v0, 0x28($a1) -.L80242578: -/* C79258 80242578 84A3008E */ lh $v1, 0x8e($a1) -/* C7925C 8024257C 8E0200A4 */ lw $v0, 0xa4($s0) -/* C79260 80242580 14620002 */ bne $v1, $v0, .L8024258C -/* C79264 80242584 24020003 */ addiu $v0, $zero, 3 -/* C79268 80242588 AE02006C */ sw $v0, 0x6c($s0) -.L8024258C: -/* C7926C 8024258C 84A2008E */ lh $v0, 0x8e($a1) -/* C79270 80242590 8E03009C */ lw $v1, 0x9c($s0) -/* C79274 80242594 0043102A */ slt $v0, $v0, $v1 -/* C79278 80242598 1440001E */ bnez $v0, .L80242614 -/* C7927C 8024259C 24020004 */ addiu $v0, $zero, 4 -/* C79280 802425A0 AE02006C */ sw $v0, 0x6c($s0) -/* C79284 802425A4 24020008 */ addiu $v0, $zero, 8 -/* C79288 802425A8 24040003 */ addiu $a0, $zero, 3 -/* C7928C 802425AC A4A2008E */ sh $v0, 0x8e($a1) -/* C79290 802425B0 8E0200CC */ lw $v0, 0xcc($s0) -/* C79294 802425B4 84A300A8 */ lh $v1, 0xa8($a1) -/* C79298 802425B8 3C013F80 */ lui $at, 0x3f80 -/* C7929C 802425BC 44810000 */ mtc1 $at, $f0 -/* C792A0 802425C0 3C014000 */ lui $at, 0x4000 -/* C792A4 802425C4 44811000 */ mtc1 $at, $f2 -/* C792A8 802425C8 3C01C1A0 */ lui $at, 0xc1a0 -/* C792AC 802425CC 44812000 */ mtc1 $at, $f4 -/* C792B0 802425D0 44833000 */ mtc1 $v1, $f6 -/* C792B4 802425D4 00000000 */ nop -/* C792B8 802425D8 468031A0 */ cvt.s.w $f6, $f6 -/* C792BC 802425DC 8C420000 */ lw $v0, ($v0) -/* C792C0 802425E0 44073000 */ mfc1 $a3, $f6 -/* C792C4 802425E4 0000302D */ daddu $a2, $zero, $zero -/* C792C8 802425E8 ACA20028 */ sw $v0, 0x28($a1) -/* C792CC 802425EC 2402000A */ addiu $v0, $zero, 0xa -/* C792D0 802425F0 AFA2001C */ sw $v0, 0x1c($sp) -/* C792D4 802425F4 27A20028 */ addiu $v0, $sp, 0x28 -/* C792D8 802425F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C792DC 802425FC E7A20014 */ swc1 $f2, 0x14($sp) -/* C792E0 80242600 E7A40018 */ swc1 $f4, 0x18($sp) -/* C792E4 80242604 0C01BFA4 */ jal fx_emote -/* C792E8 80242608 AFA20020 */ sw $v0, 0x20($sp) -/* C792EC 8024260C 2402000D */ addiu $v0, $zero, 0xd -/* C792F0 80242610 AE220070 */ sw $v0, 0x70($s1) -.L80242614: -/* C792F4 80242614 8FBF0038 */ lw $ra, 0x38($sp) -/* C792F8 80242618 8FB10034 */ lw $s1, 0x34($sp) -/* C792FC 8024261C 8FB00030 */ lw $s0, 0x30($sp) -/* C79300 80242620 03E00008 */ jr $ra -/* C79304 80242624 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80243198_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80243198_C76CE0.s deleted file mode 100644 index 069fb5dc2c..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80243198_C76CE0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243198_C79E78 -/* C79E78 80243198 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C79E7C 8024319C AFBF0010 */ sw $ra, 0x10($sp) -/* C79E80 802431A0 0C00EAD2 */ jal get_npc_safe -/* C79E84 802431A4 8C84014C */ lw $a0, 0x14c($a0) -/* C79E88 802431A8 0040182D */ daddu $v1, $v0, $zero -/* C79E8C 802431AC 846200A8 */ lh $v0, 0xa8($v1) -/* C79E90 802431B0 C462003C */ lwc1 $f2, 0x3c($v1) -/* C79E94 802431B4 906400A9 */ lbu $a0, 0xa9($v1) -/* C79E98 802431B8 44820000 */ mtc1 $v0, $f0 -/* C79E9C 802431BC 00000000 */ nop -/* C79EA0 802431C0 46800020 */ cvt.s.w $f0, $f0 -/* C79EA4 802431C4 46001081 */ sub.s $f2, $f2, $f0 -/* C79EA8 802431C8 A06400AB */ sb $a0, 0xab($v1) -/* C79EAC 802431CC E462003C */ swc1 $f2, 0x3c($v1) -/* C79EB0 802431D0 8FBF0010 */ lw $ra, 0x10($sp) -/* C79EB4 802431D4 24020002 */ addiu $v0, $zero, 2 -/* C79EB8 802431D8 03E00008 */ jr $ra -/* C79EBC 802431DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80243238_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80243238_C76CE0.s deleted file mode 100644 index 958e75b4ea..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80243238_C76CE0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243238_C79F18 -/* C79F18 80243238 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C79F1C 8024323C 0080102D */ daddu $v0, $a0, $zero -/* C79F20 80243240 AFB00010 */ sw $s0, 0x10($sp) -/* C79F24 80243244 AFBF0018 */ sw $ra, 0x18($sp) -/* C79F28 80243248 AFB10014 */ sw $s1, 0x14($sp) -/* C79F2C 8024324C 8C44014C */ lw $a0, 0x14c($v0) -/* C79F30 80243250 8C510148 */ lw $s1, 0x148($v0) -/* C79F34 80243254 0C00EAD2 */ jal get_npc_safe -/* C79F38 80243258 00A0802D */ daddu $s0, $a1, $zero -/* C79F3C 8024325C 56000001 */ bnel $s0, $zero, .L80243264 -/* C79F40 80243260 A04000AB */ sb $zero, 0xab($v0) -.L80243264: -/* C79F44 80243264 8C420000 */ lw $v0, ($v0) -/* C79F48 80243268 30421000 */ andi $v0, $v0, 0x1000 -/* C79F4C 8024326C 1040000A */ beqz $v0, .L80243298 -/* C79F50 80243270 0000102D */ daddu $v0, $zero, $zero -/* C79F54 80243274 82220004 */ lb $v0, 4($s1) -/* C79F58 80243278 3C03800B */ lui $v1, %hi(gCurrentEncounter) -/* C79F5C 8024327C 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) -/* C79F60 80243280 00021080 */ sll $v0, $v0, 2 -/* C79F64 80243284 00431021 */ addu $v0, $v0, $v1 -/* C79F68 80243288 8C440028 */ lw $a0, 0x28($v0) -/* C79F6C 8024328C 9623006E */ lhu $v1, 0x6e($s1) -/* C79F70 80243290 24020002 */ addiu $v0, $zero, 2 -/* C79F74 80243294 A4830044 */ sh $v1, 0x44($a0) -.L80243298: -/* C79F78 80243298 8FBF0018 */ lw $ra, 0x18($sp) -/* C79F7C 8024329C 8FB10014 */ lw $s1, 0x14($sp) -/* C79F80 802432A0 8FB00010 */ lw $s0, 0x10($sp) -/* C79F84 802432A4 03E00008 */ jr $ra -/* C79F88 802432A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_802433C4_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_802433C4_C76CE0.s deleted file mode 100644 index 5df59d251f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_802433C4_C76CE0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802433C4_C7A0A4 -/* C7A0A4 802433C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7A0A8 802433C8 AFB10014 */ sw $s1, 0x14($sp) -/* C7A0AC 802433CC 0080882D */ daddu $s1, $a0, $zero -/* C7A0B0 802433D0 AFBF0018 */ sw $ra, 0x18($sp) -/* C7A0B4 802433D4 AFB00010 */ sw $s0, 0x10($sp) -/* C7A0B8 802433D8 8E30000C */ lw $s0, 0xc($s1) -/* C7A0BC 802433DC 8E050000 */ lw $a1, ($s0) -/* C7A0C0 802433E0 0C0B1EAF */ jal get_variable -/* C7A0C4 802433E4 26100004 */ addiu $s0, $s0, 4 -/* C7A0C8 802433E8 0C00EAD2 */ jal get_npc_safe -/* C7A0CC 802433EC 0040202D */ daddu $a0, $v0, $zero -/* C7A0D0 802433F0 10400005 */ beqz $v0, .L80243408 -/* C7A0D4 802433F4 00000000 */ nop -/* C7A0D8 802433F8 8E050000 */ lw $a1, ($s0) -/* C7A0DC 802433FC 844600A8 */ lh $a2, 0xa8($v0) -/* C7A0E0 80243400 0C0B2026 */ jal set_variable -/* C7A0E4 80243404 0220202D */ daddu $a0, $s1, $zero -.L80243408: -/* C7A0E8 80243408 8FBF0018 */ lw $ra, 0x18($sp) -/* C7A0EC 8024340C 8FB10014 */ lw $s1, 0x14($sp) -/* C7A0F0 80243410 8FB00010 */ lw $s0, 0x10($sp) -/* C7A0F4 80243414 24020002 */ addiu $v0, $zero, 2 -/* C7A0F8 80243418 03E00008 */ jr $ra -/* C7A0FC 8024341C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_80243644_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_80243644_C76CE0.s deleted file mode 100644 index 2afad8b097..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_80243644_C76CE0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243644_C7A324 -/* C7A324 80243644 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7A328 80243648 AFBF0010 */ sw $ra, 0x10($sp) -/* C7A32C 8024364C 8C82000C */ lw $v0, 0xc($a0) -/* C7A330 80243650 0C0B1EAF */ jal get_variable -/* C7A334 80243654 8C450000 */ lw $a1, ($v0) -/* C7A338 80243658 3C018024 */ lui $at, 0x8024 -/* C7A33C 8024365C AC2252B8 */ sw $v0, 0x52b8($at) -/* C7A340 80243660 24020002 */ addiu $v0, $zero, 2 -/* C7A344 80243664 8FBF0010 */ lw $ra, 0x10($sp) -/* C7A348 80243668 24030001 */ addiu $v1, $zero, 1 -/* C7A34C 8024366C 3C018024 */ lui $at, 0x8024 -/* C7A350 80243670 AC2352B4 */ sw $v1, 0x52b4($at) -/* C7A354 80243674 03E00008 */ jr $ra -/* C7A358 80243678 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/func_802439D8_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/func_802439D8_C76CE0.s deleted file mode 100644 index 07cdd2edf4..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/func_802439D8_C76CE0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802439D8_C7A6B8 -/* C7A6B8 802439D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7A6BC 802439DC AFBF0010 */ sw $ra, 0x10($sp) -/* C7A6C0 802439E0 0C00EABB */ jal get_npc_unsafe -/* C7A6C4 802439E4 8C84008C */ lw $a0, 0x8c($a0) -/* C7A6C8 802439E8 3C038024 */ lui $v1, 0x8024 -/* C7A6CC 802439EC 8C637664 */ lw $v1, 0x7664($v1) -/* C7A6D0 802439F0 AC430028 */ sw $v1, 0x28($v0) -/* C7A6D4 802439F4 8FBF0010 */ lw $ra, 0x10($sp) -/* C7A6D8 802439F8 24020002 */ addiu $v0, $zero, 2 -/* C7A6DC 802439FC 03E00008 */ jr $ra -/* C7A6E0 80243A00 27BD0018 */ addiu $sp, $sp, 0x18 -/* C7A6E4 80243A04 00000000 */ nop -/* C7A6E8 80243A08 00000000 */ nop -/* C7A6EC 80243A0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/func_80240124_C7E180.s b/asm/nonmatchings/world/area_kzn/kzn_10/func_80240124_C7E180.s deleted file mode 100644 index c2ce55896e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_10/func_80240124_C7E180.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C7E2A4 -/* C7E2A4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7E2A8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C7E2AC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C7E2B0 80240130 10A00005 */ beqz $a1, .L80240148 -/* C7E2B4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C7E2B8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C7E2BC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C7E2C0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C7E2C4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C7E2C8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C7E2CC 8024014C 1440000E */ bnez $v0, .L80240188 -/* C7E2D0 80240150 00000000 */ nop -/* C7E2D4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C7E2D8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C7E2DC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C7E2E0 80240160 04610004 */ bgez $v1, .L80240174 -/* C7E2E4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C7E2E8 80240168 3C020002 */ lui $v0, 2 -/* C7E2EC 8024016C 08090061 */ j .L80240184 -/* C7E2F0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C7E2F4 80240174 3C040002 */ lui $a0, 2 -/* C7E2F8 80240178 0083102A */ slt $v0, $a0, $v1 -/* C7E2FC 8024017C 10400002 */ beqz $v0, .L80240188 -/* C7E300 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C7E304 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C7E308 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C7E30C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C7E310 80240190 00000000 */ nop -/* C7E314 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C7E318 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C7E31C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C7E320 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C7E324 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C7E328 802401A8 3C020002 */ lui $v0, 2 -/* C7E32C 802401AC 08090071 */ j .L802401C4 -/* C7E330 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C7E334 802401B4 3C040002 */ lui $a0, 2 -/* C7E338 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C7E33C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C7E340 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C7E344 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C7E348 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C7E34C 802401CC 1440000E */ bnez $v0, .L80240208 -/* C7E350 802401D0 00000000 */ nop -/* C7E354 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C7E358 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C7E35C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C7E360 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C7E364 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C7E368 802401E8 3C020002 */ lui $v0, 2 -/* C7E36C 802401EC 08090081 */ j .L80240204 -/* C7E370 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C7E374 802401F4 3C040002 */ lui $a0, 2 -/* C7E378 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C7E37C 802401FC 10400002 */ beqz $v0, .L80240208 -/* C7E380 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C7E384 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C7E388 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C7E38C 8024020C 1440000E */ bnez $v0, .L80240248 -/* C7E390 80240210 00000000 */ nop -/* C7E394 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C7E398 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C7E39C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C7E3A0 80240220 04610004 */ bgez $v1, .L80240234 -/* C7E3A4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C7E3A8 80240228 3C020002 */ lui $v0, 2 -/* C7E3AC 8024022C 08090091 */ j .L80240244 -/* C7E3B0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C7E3B4 80240234 3C040002 */ lui $a0, 2 -/* C7E3B8 80240238 0083102A */ slt $v0, $a0, $v1 -/* C7E3BC 8024023C 10400002 */ beqz $v0, .L80240248 -/* C7E3C0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C7E3C4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C7E3C8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C7E3CC 8024024C 0C046F07 */ jal set_main_pan_u -/* C7E3D0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C7E3D4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C7E3D8 80240258 0C046F0D */ jal set_main_pan_v -/* C7E3DC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C7E3E0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C7E3E4 80240264 0C046F13 */ jal set_aux_pan_u -/* C7E3E8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C7E3EC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C7E3F0 80240270 0C046F19 */ jal set_aux_pan_v -/* C7E3F4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C7E3F8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C7E3FC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C7E400 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C7E404 80240284 24420001 */ addiu $v0, $v0, 1 -/* C7E408 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C7E40C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C7E410 80240290 24630001 */ addiu $v1, $v1, 1 -/* C7E414 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C7E418 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C7E41C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C7E420 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C7E424 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C7E428 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C7E42C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C7E430 802402B0 14600002 */ bnez $v1, .L802402BC -/* C7E434 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C7E438 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C7E43C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C7E440 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C7E444 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C7E448 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C7E44C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C7E450 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C7E454 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C7E458 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C7E45C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C7E460 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C7E464 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C7E468 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C7E46C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C7E470 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C7E474 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C7E478 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C7E47C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C7E480 80240300 0000102D */ daddu $v0, $zero, $zero -/* C7E484 80240304 03E00008 */ jr $ra -/* C7E488 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/func_8024030C_C7E180.s b/asm/nonmatchings/world/area_kzn/kzn_10/func_8024030C_C7E180.s deleted file mode 100644 index 622a90ec75..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_10/func_8024030C_C7E180.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_C7E48C -/* C7E48C 8024030C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* C7E490 80240310 8C42EFC8 */ lw $v0, %lo(gPlayerStatus)($v0) -/* C7E494 80240314 3C030400 */ lui $v1, 0x400 -/* C7E498 80240318 00431024 */ and $v0, $v0, $v1 -/* C7E49C 8024031C 2C420001 */ sltiu $v0, $v0, 1 -/* C7E4A0 80240320 03E00008 */ jr $ra -/* C7E4A4 80240324 00021040 */ sll $v0, $v0, 1 -/* C7E4A8 80240328 00000000 */ nop -/* C7E4AC 8024032C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/func_80240330_C7E180.s b/asm/nonmatchings/world/area_kzn/kzn_10/func_80240330_C7E180.s deleted file mode 100644 index 0011ce531f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_10/func_80240330_C7E180.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240330_C7E4B0 -/* C7E4B0 80240330 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7E4B4 80240334 AFBF0010 */ sw $ra, 0x10($sp) -/* C7E4B8 80240338 0C03A8CD */ jal subtract_hp -/* C7E4BC 8024033C 24040001 */ addiu $a0, $zero, 1 -/* C7E4C0 80240340 8FBF0010 */ lw $ra, 0x10($sp) -/* C7E4C4 80240344 24020002 */ addiu $v0, $zero, 2 -/* C7E4C8 80240348 03E00008 */ jr $ra -/* C7E4CC 8024034C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/func_80240350_C7E180.s b/asm/nonmatchings/world/area_kzn/kzn_10/func_80240350_C7E180.s deleted file mode 100644 index 0a6b929bc6..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_10/func_80240350_C7E180.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240350_C7E4D0 -/* C7E4D0 80240350 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C7E4D4 80240354 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* C7E4D8 80240358 80620000 */ lb $v0, ($v1) -/* C7E4DC 8024035C 10400004 */ beqz $v0, .L80240370 -/* C7E4E0 80240360 2402FFFF */ addiu $v0, $zero, -1 -/* C7E4E4 80240364 80620003 */ lb $v0, 3($v1) -/* C7E4E8 80240368 080900DD */ j .L80240374 -/* C7E4EC 8024036C AC820084 */ sw $v0, 0x84($a0) -.L80240370: -/* C7E4F0 80240370 AC820084 */ sw $v0, 0x84($a0) -.L80240374: -/* C7E4F4 80240374 03E00008 */ jr $ra -/* C7E4F8 80240378 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/func_8024037C_C7E180.s b/asm/nonmatchings/world/area_kzn/kzn_10/func_8024037C_C7E180.s deleted file mode 100644 index 72cbfa03c8..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_10/func_8024037C_C7E180.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024037C_C7E4FC -/* C7E4FC 8024037C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C7E500 80240380 AFB00028 */ sw $s0, 0x28($sp) -/* C7E504 80240384 0080802D */ daddu $s0, $a0, $zero -/* C7E508 80240388 AFBF002C */ sw $ra, 0x2c($sp) -/* C7E50C 8024038C C6000084 */ lwc1 $f0, 0x84($s0) -/* C7E510 80240390 46800020 */ cvt.s.w $f0, $f0 -/* C7E514 80240394 E7A00018 */ swc1 $f0, 0x18($sp) -/* C7E518 80240398 C600008C */ lwc1 $f0, 0x8c($s0) -/* C7E51C 8024039C 46800020 */ cvt.s.w $f0, $f0 -/* C7E520 802403A0 27A20024 */ addiu $v0, $sp, 0x24 -/* C7E524 802403A4 3C040001 */ lui $a0, 1 -/* C7E528 802403A8 27A50018 */ addiu $a1, $sp, 0x18 -/* C7E52C 802403AC 27A6001C */ addiu $a2, $sp, 0x1c -/* C7E530 802403B0 3C0144FA */ lui $at, 0x44fa -/* C7E534 802403B4 44811000 */ mtc1 $at, $f2 -/* C7E538 802403B8 27A70020 */ addiu $a3, $sp, 0x20 -/* C7E53C 802403BC E7A0001C */ swc1 $f0, 0x1c($sp) -/* C7E540 802403C0 AFA00020 */ sw $zero, 0x20($sp) -/* C7E544 802403C4 E7A20024 */ swc1 $f2, 0x24($sp) -/* C7E548 802403C8 0C0372DF */ jal func_800DCB7C -/* C7E54C 802403CC AFA20010 */ sw $v0, 0x10($sp) -/* C7E550 802403D0 1040000B */ beqz $v0, .L80240400 -/* C7E554 802403D4 00000000 */ nop -/* C7E558 802403D8 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* C7E55C 802403DC 3C01425C */ lui $at, 0x425c -/* C7E560 802403E0 44810000 */ mtc1 $at, $f0 -/* C7E564 802403E4 00000000 */ nop -/* C7E568 802403E8 46001080 */ add.s $f2, $f2, $f0 -/* C7E56C 802403EC C7A00018 */ lwc1 $f0, 0x18($sp) -/* C7E570 802403F0 4600010D */ trunc.w.s $f4, $f0 -/* C7E574 802403F4 E6040084 */ swc1 $f4, 0x84($s0) -/* C7E578 802403F8 4600110D */ trunc.w.s $f4, $f2 -/* C7E57C 802403FC E604008C */ swc1 $f4, 0x8c($s0) -.L80240400: -/* C7E580 80240400 8FBF002C */ lw $ra, 0x2c($sp) -/* C7E584 80240404 8FB00028 */ lw $s0, 0x28($sp) -/* C7E588 80240408 24020002 */ addiu $v0, $zero, 2 -/* C7E58C 8024040C 03E00008 */ jr $ra -/* C7E590 80240410 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/func_80240414_C7E180.s b/asm/nonmatchings/world/area_kzn/kzn_10/func_80240414_C7E180.s deleted file mode 100644 index bd4fd184f9..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_10/func_80240414_C7E180.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240414_C7E594 -/* C7E594 80240414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7E598 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* C7E59C 8024041C 0080802D */ daddu $s0, $a0, $zero -/* C7E5A0 80240420 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* C7E5A4 80240424 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* C7E5A8 80240428 AFBF0014 */ sw $ra, 0x14($sp) -/* C7E5AC 8024042C C4400028 */ lwc1 $f0, 0x28($v0) -/* C7E5B0 80240430 C6020084 */ lwc1 $f2, 0x84($s0) -/* C7E5B4 80240434 468010A0 */ cvt.s.w $f2, $f2 -/* C7E5B8 80240438 46001081 */ sub.s $f2, $f2, $f0 -/* C7E5BC 8024043C 46021082 */ mul.s $f2, $f2, $f2 -/* C7E5C0 80240440 00000000 */ nop -/* C7E5C4 80240444 C440002C */ lwc1 $f0, 0x2c($v0) -/* C7E5C8 80240448 C604008C */ lwc1 $f4, 0x8c($s0) -/* C7E5CC 8024044C 46802120 */ cvt.s.w $f4, $f4 -/* C7E5D0 80240450 46002101 */ sub.s $f4, $f4, $f0 -/* C7E5D4 80240454 46042102 */ mul.s $f4, $f4, $f4 -/* C7E5D8 80240458 00000000 */ nop -/* C7E5DC 8024045C C4460030 */ lwc1 $f6, 0x30($v0) -/* C7E5E0 80240460 44800000 */ mtc1 $zero, $f0 -/* C7E5E4 80240464 00000000 */ nop -/* C7E5E8 80240468 46060001 */ sub.s $f0, $f0, $f6 -/* C7E5EC 8024046C 46000002 */ mul.s $f0, $f0, $f0 -/* C7E5F0 80240470 00000000 */ nop -/* C7E5F4 80240474 46041080 */ add.s $f2, $f2, $f4 -/* C7E5F8 80240478 46001300 */ add.s $f12, $f2, $f0 -/* C7E5FC 8024047C 46006004 */ sqrt.s $f0, $f12 -/* C7E600 80240480 46000032 */ c.eq.s $f0, $f0 -/* C7E604 80240484 00000000 */ nop -/* C7E608 80240488 45010003 */ bc1t .L80240498 -/* C7E60C 8024048C 00000000 */ nop -/* C7E610 80240490 0C0187BC */ jal sqrtf -/* C7E614 80240494 00000000 */ nop -.L80240498: -/* C7E618 80240498 4600020D */ trunc.w.s $f8, $f0 -/* C7E61C 8024049C E6080094 */ swc1 $f8, 0x94($s0) -/* C7E620 802404A0 8FBF0014 */ lw $ra, 0x14($sp) -/* C7E624 802404A4 8FB00010 */ lw $s0, 0x10($sp) -/* C7E628 802404A8 24020002 */ addiu $v0, $zero, 2 -/* C7E62C 802404AC 03E00008 */ jr $ra -/* C7E630 802404B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/func_802404B4_C7E180.s b/asm/nonmatchings/world/area_kzn/kzn_10/func_802404B4_C7E180.s deleted file mode 100644 index 30d95df5cc..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_10/func_802404B4_C7E180.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404B4_C7E634 -/* C7E634 802404B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7E638 802404B8 AFBF0010 */ sw $ra, 0x10($sp) -/* C7E63C 802404BC 8C82000C */ lw $v0, 0xc($a0) -/* C7E640 802404C0 0C0B1EAF */ jal get_variable -/* C7E644 802404C4 8C450000 */ lw $a1, ($v0) -/* C7E648 802404C8 44820000 */ mtc1 $v0, $f0 -/* C7E64C 802404CC 00000000 */ nop -/* C7E650 802404D0 46800020 */ cvt.s.w $f0, $f0 -/* C7E654 802404D4 8FBF0010 */ lw $ra, 0x10($sp) -/* C7E658 802404D8 24020002 */ addiu $v0, $zero, 2 -/* C7E65C 802404DC 3C018011 */ lui $at, 0x8011 -/* C7E660 802404E0 E420F054 */ swc1 $f0, -0xfac($at) -/* C7E664 802404E4 03E00008 */ jr $ra -/* C7E668 802404E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/func_802405A4_C7E180.s b/asm/nonmatchings/world/area_kzn/kzn_10/func_802405A4_C7E180.s deleted file mode 100644 index f24df325c2..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_10/func_802405A4_C7E180.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A4_C7E724 -/* C7E724 802405A4 3C018024 */ lui $at, 0x8024 -/* C7E728 802405A8 D4222010 */ ldc1 $f2, 0x2010($at) -/* C7E72C 802405AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7E730 802405B0 AFB00010 */ sw $s0, 0x10($sp) -/* C7E734 802405B4 0080802D */ daddu $s0, $a0, $zero -/* C7E738 802405B8 AFBF0014 */ sw $ra, 0x14($sp) -/* C7E73C 802405BC C6000084 */ lwc1 $f0, 0x84($s0) -/* C7E740 802405C0 46800021 */ cvt.d.w $f0, $f0 -/* C7E744 802405C4 46201081 */ sub.d $f2, $f2, $f0 -/* C7E748 802405C8 462010A0 */ cvt.s.d $f2, $f2 -/* C7E74C 802405CC 46021082 */ mul.s $f2, $f2, $f2 -/* C7E750 802405D0 00000000 */ nop -/* C7E754 802405D4 3C014047 */ lui $at, 0x4047 -/* C7E758 802405D8 44810800 */ mtc1 $at, $f1 -/* C7E75C 802405DC 44800000 */ mtc1 $zero, $f0 -/* C7E760 802405E0 C604008C */ lwc1 $f4, 0x8c($s0) -/* C7E764 802405E4 46802121 */ cvt.d.w $f4, $f4 -/* C7E768 802405E8 46240001 */ sub.d $f0, $f0, $f4 -/* C7E76C 802405EC 46200020 */ cvt.s.d $f0, $f0 -/* C7E770 802405F0 46000002 */ mul.s $f0, $f0, $f0 -/* C7E774 802405F4 00000000 */ nop -/* C7E778 802405F8 46001300 */ add.s $f12, $f2, $f0 -/* C7E77C 802405FC 46006004 */ sqrt.s $f0, $f12 -/* C7E780 80240600 46000032 */ c.eq.s $f0, $f0 -/* C7E784 80240604 00000000 */ nop -/* C7E788 80240608 45030004 */ bc1tl .L8024061C -/* C7E78C 8024060C 46000007 */ neg.s $f0, $f0 -/* C7E790 80240610 0C0187BC */ jal sqrtf -/* C7E794 80240614 00000000 */ nop -/* C7E798 80240618 46000007 */ neg.s $f0, $f0 -.L8024061C: -/* C7E79C 8024061C 4600018D */ trunc.w.s $f6, $f0 -/* C7E7A0 80240620 E6060090 */ swc1 $f6, 0x90($s0) -/* C7E7A4 80240624 8FBF0014 */ lw $ra, 0x14($sp) -/* C7E7A8 80240628 8FB00010 */ lw $s0, 0x10($sp) -/* C7E7AC 8024062C 24020002 */ addiu $v0, $zero, 2 -/* C7E7B0 80240630 03E00008 */ jr $ra -/* C7E7B4 80240634 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/func_80240124_C801A0.s b/asm/nonmatchings/world/area_kzn/kzn_11/func_80240124_C801A0.s deleted file mode 100644 index bbbc3c21b7..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/func_80240124_C801A0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C802C4 -/* C802C4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C802C8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C802CC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C802D0 80240130 10A00005 */ beqz $a1, .L80240148 -/* C802D4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C802D8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C802DC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C802E0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C802E4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C802E8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C802EC 8024014C 1440000E */ bnez $v0, .L80240188 -/* C802F0 80240150 00000000 */ nop -/* C802F4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C802F8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C802FC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C80300 80240160 04610004 */ bgez $v1, .L80240174 -/* C80304 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C80308 80240168 3C020002 */ lui $v0, 2 -/* C8030C 8024016C 08090061 */ j .L80240184 -/* C80310 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C80314 80240174 3C040002 */ lui $a0, 2 -/* C80318 80240178 0083102A */ slt $v0, $a0, $v1 -/* C8031C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C80320 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C80324 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C80328 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C8032C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C80330 80240190 00000000 */ nop -/* C80334 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C80338 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C8033C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C80340 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C80344 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C80348 802401A8 3C020002 */ lui $v0, 2 -/* C8034C 802401AC 08090071 */ j .L802401C4 -/* C80350 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C80354 802401B4 3C040002 */ lui $a0, 2 -/* C80358 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C8035C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C80360 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C80364 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C80368 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C8036C 802401CC 1440000E */ bnez $v0, .L80240208 -/* C80370 802401D0 00000000 */ nop -/* C80374 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C80378 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C8037C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C80380 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C80384 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C80388 802401E8 3C020002 */ lui $v0, 2 -/* C8038C 802401EC 08090081 */ j .L80240204 -/* C80390 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C80394 802401F4 3C040002 */ lui $a0, 2 -/* C80398 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C8039C 802401FC 10400002 */ beqz $v0, .L80240208 -/* C803A0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C803A4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C803A8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C803AC 8024020C 1440000E */ bnez $v0, .L80240248 -/* C803B0 80240210 00000000 */ nop -/* C803B4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C803B8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C803BC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C803C0 80240220 04610004 */ bgez $v1, .L80240234 -/* C803C4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C803C8 80240228 3C020002 */ lui $v0, 2 -/* C803CC 8024022C 08090091 */ j .L80240244 -/* C803D0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C803D4 80240234 3C040002 */ lui $a0, 2 -/* C803D8 80240238 0083102A */ slt $v0, $a0, $v1 -/* C803DC 8024023C 10400002 */ beqz $v0, .L80240248 -/* C803E0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C803E4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C803E8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C803EC 8024024C 0C046F07 */ jal set_main_pan_u -/* C803F0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C803F4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C803F8 80240258 0C046F0D */ jal set_main_pan_v -/* C803FC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C80400 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C80404 80240264 0C046F13 */ jal set_aux_pan_u -/* C80408 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C8040C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C80410 80240270 0C046F19 */ jal set_aux_pan_v -/* C80414 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C80418 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C8041C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C80420 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C80424 80240284 24420001 */ addiu $v0, $v0, 1 -/* C80428 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C8042C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C80430 80240290 24630001 */ addiu $v1, $v1, 1 -/* C80434 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C80438 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C8043C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C80440 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C80444 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C80448 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C8044C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C80450 802402B0 14600002 */ bnez $v1, .L802402BC -/* C80454 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C80458 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C8045C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C80460 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C80464 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C80468 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C8046C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C80470 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C80474 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C80478 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C8047C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C80480 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C80484 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C80488 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C8048C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C80490 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C80494 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C80498 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C8049C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C804A0 80240300 0000102D */ daddu $v0, $zero, $zero -/* C804A4 80240304 03E00008 */ jr $ra -/* C804A8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C804AC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/func_80240310_C801A0.s b/asm/nonmatchings/world/area_kzn/kzn_11/func_80240310_C801A0.s deleted file mode 100644 index d86f659df5..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/func_80240310_C801A0.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_C804B0 -/* C804B0 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C804B4 80240314 AFB10014 */ sw $s1, 0x14($sp) -/* C804B8 80240318 0080882D */ daddu $s1, $a0, $zero -/* C804BC 8024031C AFBF001C */ sw $ra, 0x1c($sp) -/* C804C0 80240320 AFB20018 */ sw $s2, 0x18($sp) -/* C804C4 80240324 AFB00010 */ sw $s0, 0x10($sp) -/* C804C8 80240328 8E30000C */ lw $s0, 0xc($s1) -/* C804CC 8024032C 8E050000 */ lw $a1, ($s0) -/* C804D0 80240330 0C0B1EAF */ jal get_variable -/* C804D4 80240334 26100004 */ addiu $s0, $s0, 4 -/* C804D8 80240338 8E050000 */ lw $a1, ($s0) -/* C804DC 8024033C 26100004 */ addiu $s0, $s0, 4 -/* C804E0 80240340 0220202D */ daddu $a0, $s1, $zero -/* C804E4 80240344 0C0B1EAF */ jal get_variable -/* C804E8 80240348 0040902D */ daddu $s2, $v0, $zero -/* C804EC 8024034C 0220202D */ daddu $a0, $s1, $zero -/* C804F0 80240350 8E050000 */ lw $a1, ($s0) -/* C804F4 80240354 0C0B1EAF */ jal get_variable -/* C804F8 80240358 0040882D */ daddu $s1, $v0, $zero -/* C804FC 8024035C 0040802D */ daddu $s0, $v0, $zero -/* C80500 80240360 3C028016 */ lui $v0, 0x8016 -/* C80504 80240364 2442A550 */ addiu $v0, $v0, -0x5ab0 -/* C80508 80240368 84430002 */ lh $v1, 2($v0) -/* C8050C 8024036C 10710008 */ beq $v1, $s1, .L80240390 -/* C80510 80240370 00000000 */ nop -/* C80514 80240374 84420004 */ lh $v0, 4($v0) -/* C80518 80240378 10510005 */ beq $v0, $s1, .L80240390 -/* C8051C 8024037C 00000000 */ nop -/* C80520 80240380 10700003 */ beq $v1, $s0, .L80240390 -/* C80524 80240384 00000000 */ nop -/* C80528 80240388 14500007 */ bne $v0, $s0, .L802403A8 -/* C8052C 8024038C 00000000 */ nop -.L80240390: -/* C80530 80240390 44920000 */ mtc1 $s2, $f0 -/* C80534 80240394 00000000 */ nop -/* C80538 80240398 46800020 */ cvt.s.w $f0, $f0 -/* C8053C 8024039C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* C80540 802403A0 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* C80544 802403A4 E440001C */ swc1 $f0, 0x1c($v0) -.L802403A8: -/* C80548 802403A8 3C028011 */ lui $v0, 0x8011 -/* C8054C 802403AC 8042F2A2 */ lb $v0, -0xd5e($v0) -/* C80550 802403B0 1040000E */ beqz $v0, .L802403EC -/* C80554 802403B4 00000000 */ nop -/* C80558 802403B8 0C00EABB */ jal get_npc_unsafe -/* C8055C 802403BC 2404FFFC */ addiu $a0, $zero, -4 -/* C80560 802403C0 84430084 */ lh $v1, 0x84($v0) -/* C80564 802403C4 10710003 */ beq $v1, $s1, .L802403D4 -/* C80568 802403C8 00000000 */ nop -/* C8056C 802403CC 14700007 */ bne $v1, $s0, .L802403EC -/* C80570 802403D0 00000000 */ nop -.L802403D4: -/* C80574 802403D4 C4400038 */ lwc1 $f0, 0x38($v0) -/* C80578 802403D8 44921000 */ mtc1 $s2, $f2 -/* C8057C 802403DC 00000000 */ nop -/* C80580 802403E0 468010A0 */ cvt.s.w $f2, $f2 -/* C80584 802403E4 46020000 */ add.s $f0, $f0, $f2 -/* C80588 802403E8 E4400038 */ swc1 $f0, 0x38($v0) -.L802403EC: -/* C8058C 802403EC 8FBF001C */ lw $ra, 0x1c($sp) -/* C80590 802403F0 8FB20018 */ lw $s2, 0x18($sp) -/* C80594 802403F4 8FB10014 */ lw $s1, 0x14($sp) -/* C80598 802403F8 8FB00010 */ lw $s0, 0x10($sp) -/* C8059C 802403FC 24020002 */ addiu $v0, $zero, 2 -/* C805A0 80240400 03E00008 */ jr $ra -/* C805A4 80240404 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/func_80240408_C801A0.s b/asm/nonmatchings/world/area_kzn/kzn_11/func_80240408_C801A0.s deleted file mode 100644 index f241f65f40..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/func_80240408_C801A0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240408_C805A8 -/* C805A8 80240408 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C805AC 8024040C AFBF0010 */ sw $ra, 0x10($sp) -/* C805B0 80240410 8C82000C */ lw $v0, 0xc($a0) -/* C805B4 80240414 3C068016 */ lui $a2, 0x8016 -/* C805B8 80240418 84C6A552 */ lh $a2, -0x5aae($a2) -/* C805BC 8024041C 0C0B2026 */ jal set_variable -/* C805C0 80240420 8C450000 */ lw $a1, ($v0) -/* C805C4 80240424 8FBF0010 */ lw $ra, 0x10($sp) -/* C805C8 80240428 24020002 */ addiu $v0, $zero, 2 -/* C805CC 8024042C 03E00008 */ jr $ra -/* C805D0 80240430 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/func_80240434_C801A0.s b/asm/nonmatchings/world/area_kzn/kzn_11/func_80240434_C801A0.s deleted file mode 100644 index 326fddf09b..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/func_80240434_C801A0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240434_C805D4 -/* C805D4 80240434 3C038011 */ lui $v1, 0x8011 -/* C805D8 80240438 8063EBB3 */ lb $v1, -0x144d($v1) -/* C805DC 8024043C 24020008 */ addiu $v0, $zero, 8 -/* C805E0 80240440 54620003 */ bnel $v1, $v0, .L80240450 -/* C805E4 80240444 AC8000A8 */ sw $zero, 0xa8($a0) -/* C805E8 80240448 24020001 */ addiu $v0, $zero, 1 -/* C805EC 8024044C AC8200A8 */ sw $v0, 0xa8($a0) -.L80240450: -/* C805F0 80240450 03E00008 */ jr $ra -/* C805F4 80240454 24020002 */ addiu $v0, $zero, 2 -/* C805F8 80240458 00000000 */ nop -/* C805FC 8024045C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/func_80240460_C801A0.s b/asm/nonmatchings/world/area_kzn/kzn_11/func_80240460_C801A0.s deleted file mode 100644 index d858ba65fa..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/func_80240460_C801A0.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240460_C80600 -/* C80600 80240460 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C80604 80240464 AFB3002C */ sw $s3, 0x2c($sp) -/* C80608 80240468 0080982D */ daddu $s3, $a0, $zero -/* C8060C 8024046C AFBF0030 */ sw $ra, 0x30($sp) -/* C80610 80240470 AFB20028 */ sw $s2, 0x28($sp) -/* C80614 80240474 AFB10024 */ sw $s1, 0x24($sp) -/* C80618 80240478 AFB00020 */ sw $s0, 0x20($sp) -/* C8061C 8024047C 8E710148 */ lw $s1, 0x148($s3) -/* C80620 80240480 86240008 */ lh $a0, 8($s1) -/* C80624 80240484 0C00EABB */ jal get_npc_unsafe -/* C80628 80240488 00A0902D */ daddu $s2, $a1, $zero -/* C8062C 8024048C 8E440004 */ lw $a0, 4($s2) -/* C80630 80240490 0040802D */ daddu $s0, $v0, $zero -/* C80634 80240494 00041FC2 */ srl $v1, $a0, 0x1f -/* C80638 80240498 00832021 */ addu $a0, $a0, $v1 -/* C8063C 8024049C 00042043 */ sra $a0, $a0, 1 -/* C80640 802404A0 0C00A67F */ jal rand_int -/* C80644 802404A4 24840001 */ addiu $a0, $a0, 1 -/* C80648 802404A8 8E430004 */ lw $v1, 4($s2) -/* C8064C 802404AC 000327C2 */ srl $a0, $v1, 0x1f -/* C80650 802404B0 00641821 */ addu $v1, $v1, $a0 -/* C80654 802404B4 00031843 */ sra $v1, $v1, 1 -/* C80658 802404B8 00621821 */ addu $v1, $v1, $v0 -/* C8065C 802404BC A603008E */ sh $v1, 0x8e($s0) -/* C80660 802404C0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C80664 802404C4 C6000040 */ lwc1 $f0, 0x40($s0) -/* C80668 802404C8 C4640000 */ lwc1 $f4, ($v1) -/* C8066C 802404CC 46802120 */ cvt.s.w $f4, $f4 -/* C80670 802404D0 C4620008 */ lwc1 $f2, 8($v1) -/* C80674 802404D4 468010A0 */ cvt.s.w $f2, $f2 -/* C80678 802404D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C8067C 802404DC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C80680 802404E0 44061000 */ mfc1 $a2, $f2 -/* C80684 802404E4 C440000C */ lwc1 $f0, 0xc($v0) -/* C80688 802404E8 46800020 */ cvt.s.w $f0, $f0 -/* C8068C 802404EC E7A00014 */ swc1 $f0, 0x14($sp) -/* C80690 802404F0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C80694 802404F4 44052000 */ mfc1 $a1, $f4 -/* C80698 802404F8 C4400010 */ lwc1 $f0, 0x10($v0) -/* C8069C 802404FC 46800020 */ cvt.s.w $f0, $f0 -/* C806A0 80240500 E7A00018 */ swc1 $f0, 0x18($sp) -/* C806A4 80240504 8C640018 */ lw $a0, 0x18($v1) -/* C806A8 80240508 0C0123F5 */ jal is_point_within_region -/* C806AC 8024050C 8E070038 */ lw $a3, 0x38($s0) -/* C806B0 80240510 1040000E */ beqz $v0, .L8024054C -/* C806B4 80240514 00000000 */ nop -/* C806B8 80240518 8E2200D0 */ lw $v0, 0xd0($s1) -/* C806BC 8024051C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C806C0 80240520 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C806C4 80240524 C4460000 */ lwc1 $f6, ($v0) -/* C806C8 80240528 468031A0 */ cvt.s.w $f6, $f6 -/* C806CC 8024052C 44063000 */ mfc1 $a2, $f6 -/* C806D0 80240530 C4460008 */ lwc1 $f6, 8($v0) -/* C806D4 80240534 468031A0 */ cvt.s.w $f6, $f6 -/* C806D8 80240538 44073000 */ mfc1 $a3, $f6 -/* C806DC 8024053C 0C00A720 */ jal atan2 -/* C806E0 80240540 00000000 */ nop -/* C806E4 80240544 0809015F */ j .L8024057C -/* C806E8 80240548 E600000C */ swc1 $f0, 0xc($s0) -.L8024054C: -/* C806EC 8024054C 0C00A67F */ jal rand_int -/* C806F0 80240550 2404003C */ addiu $a0, $zero, 0x3c -/* C806F4 80240554 C60C000C */ lwc1 $f12, 0xc($s0) -/* C806F8 80240558 44820000 */ mtc1 $v0, $f0 -/* C806FC 8024055C 00000000 */ nop -/* C80700 80240560 46800020 */ cvt.s.w $f0, $f0 -/* C80704 80240564 46006300 */ add.s $f12, $f12, $f0 -/* C80708 80240568 3C0141F0 */ lui $at, 0x41f0 -/* C8070C 8024056C 44810000 */ mtc1 $at, $f0 -/* C80710 80240570 0C00A6C9 */ jal clamp_angle -/* C80714 80240574 46006301 */ sub.s $f12, $f12, $f0 -/* C80718 80240578 E600000C */ swc1 $f0, 0xc($s0) -.L8024057C: -/* C8071C 8024057C 8E2200CC */ lw $v0, 0xcc($s1) -/* C80720 80240580 8C420004 */ lw $v0, 4($v0) -/* C80724 80240584 AE020028 */ sw $v0, 0x28($s0) -/* C80728 80240588 AE600074 */ sw $zero, 0x74($s3) -/* C8072C 8024058C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C80730 80240590 8C420014 */ lw $v0, 0x14($v0) -/* C80734 80240594 04410004 */ bgez $v0, .L802405A8 -/* C80738 80240598 00000000 */ nop -/* C8073C 8024059C C6400000 */ lwc1 $f0, ($s2) -/* C80740 802405A0 08090172 */ j .L802405C8 -/* C80744 802405A4 E6000018 */ swc1 $f0, 0x18($s0) -.L802405A8: -/* C80748 802405A8 3C018024 */ lui $at, 0x8024 -/* C8074C 802405AC D4225850 */ ldc1 $f2, 0x5850($at) -/* C80750 802405B0 44820000 */ mtc1 $v0, $f0 -/* C80754 802405B4 00000000 */ nop -/* C80758 802405B8 46800021 */ cvt.d.w $f0, $f0 -/* C8075C 802405BC 46220003 */ div.d $f0, $f0, $f2 -/* C80760 802405C0 46200020 */ cvt.s.d $f0, $f0 -/* C80764 802405C4 E6000018 */ swc1 $f0, 0x18($s0) -.L802405C8: -/* C80768 802405C8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C8076C 802405CC 3C014059 */ lui $at, 0x4059 -/* C80770 802405D0 44811800 */ mtc1 $at, $f3 -/* C80774 802405D4 44801000 */ mtc1 $zero, $f2 -/* C80778 802405D8 46000021 */ cvt.d.s $f0, $f0 -/* C8077C 802405DC 46220002 */ mul.d $f0, $f0, $f2 -/* C80780 802405E0 00000000 */ nop -/* C80784 802405E4 24020001 */ addiu $v0, $zero, 1 -/* C80788 802405E8 4620018D */ trunc.w.d $f6, $f0 -/* C8078C 802405EC E626007C */ swc1 $f6, 0x7c($s1) -/* C80790 802405F0 AE620070 */ sw $v0, 0x70($s3) -/* C80794 802405F4 8FBF0030 */ lw $ra, 0x30($sp) -/* C80798 802405F8 8FB3002C */ lw $s3, 0x2c($sp) -/* C8079C 802405FC 8FB20028 */ lw $s2, 0x28($sp) -/* C807A0 80240600 8FB10024 */ lw $s1, 0x24($sp) -/* C807A4 80240604 8FB00020 */ lw $s0, 0x20($sp) -/* C807A8 80240608 03E00008 */ jr $ra -/* C807AC 8024060C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/func_80240610_C801A0.s b/asm/nonmatchings/world/area_kzn/kzn_11/func_80240610_C801A0.s deleted file mode 100644 index 1d686f0729..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/func_80240610_C801A0.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240610_C807B0 -/* C807B0 80240610 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C807B4 80240614 AFB3004C */ sw $s3, 0x4c($sp) -/* C807B8 80240618 0080982D */ daddu $s3, $a0, $zero -/* C807BC 8024061C AFBF0058 */ sw $ra, 0x58($sp) -/* C807C0 80240620 AFB50054 */ sw $s5, 0x54($sp) -/* C807C4 80240624 AFB40050 */ sw $s4, 0x50($sp) -/* C807C8 80240628 AFB20048 */ sw $s2, 0x48($sp) -/* C807CC 8024062C AFB10044 */ sw $s1, 0x44($sp) -/* C807D0 80240630 AFB00040 */ sw $s0, 0x40($sp) -/* C807D4 80240634 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* C807D8 80240638 F7B80070 */ sdc1 $f24, 0x70($sp) -/* C807DC 8024063C F7B60068 */ sdc1 $f22, 0x68($sp) -/* C807E0 80240640 F7B40060 */ sdc1 $f20, 0x60($sp) -/* C807E4 80240644 8E710148 */ lw $s1, 0x148($s3) -/* C807E8 80240648 00A0902D */ daddu $s2, $a1, $zero -/* C807EC 8024064C 86240008 */ lh $a0, 8($s1) -/* C807F0 80240650 0C00EABB */ jal get_npc_unsafe -/* C807F4 80240654 00C0A82D */ daddu $s5, $a2, $zero -/* C807F8 80240658 0040802D */ daddu $s0, $v0, $zero -/* C807FC 8024065C 0000A02D */ daddu $s4, $zero, $zero -/* C80800 80240660 C624007C */ lwc1 $f4, 0x7c($s1) -/* C80804 80240664 46802120 */ cvt.s.w $f4, $f4 -/* C80808 80240668 C6220088 */ lwc1 $f2, 0x88($s1) -/* C8080C 8024066C 468010A0 */ cvt.s.w $f2, $f2 -/* C80810 80240670 460010A1 */ cvt.d.s $f2, $f2 -/* C80814 80240674 46002121 */ cvt.d.s $f4, $f4 -/* C80818 80240678 C600003C */ lwc1 $f0, 0x3c($s0) -/* C8081C 8024067C 3C014059 */ lui $at, 0x4059 -/* C80820 80240680 44813800 */ mtc1 $at, $f7 -/* C80824 80240684 44803000 */ mtc1 $zero, $f6 -/* C80828 80240688 46000021 */ cvt.d.s $f0, $f0 -/* C8082C 8024068C 46260002 */ mul.d $f0, $f0, $f6 -/* C80830 80240690 00000000 */ nop -/* C80834 80240694 24020001 */ addiu $v0, $zero, 1 -/* C80838 80240698 8E24006C */ lw $a0, 0x6c($s1) -/* C8083C 8024069C 46261083 */ div.d $f2, $f2, $f6 -/* C80840 802406A0 462010A0 */ cvt.s.d $f2, $f2 -/* C80844 802406A4 46262103 */ div.d $f4, $f4, $f6 -/* C80848 802406A8 46202520 */ cvt.s.d $f20, $f4 -/* C8084C 802406AC 30830011 */ andi $v1, $a0, 0x11 -/* C80850 802406B0 4620020D */ trunc.w.d $f8, $f0 -/* C80854 802406B4 E628007C */ swc1 $f8, 0x7c($s1) -/* C80858 802406B8 C6200078 */ lwc1 $f0, 0x78($s1) -/* C8085C 802406BC 46800020 */ cvt.s.w $f0, $f0 -/* C80860 802406C0 46000021 */ cvt.d.s $f0, $f0 -/* C80864 802406C4 46260003 */ div.d $f0, $f0, $f6 -/* C80868 802406C8 462006A0 */ cvt.s.d $f26, $f0 -/* C8086C 802406CC C6200070 */ lwc1 $f0, 0x70($s1) -/* C80870 802406D0 46800020 */ cvt.s.w $f0, $f0 -/* C80874 802406D4 46000021 */ cvt.d.s $f0, $f0 -/* C80878 802406D8 46260003 */ div.d $f0, $f0, $f6 -/* C8087C 802406DC 462005A0 */ cvt.s.d $f22, $f0 -/* C80880 802406E0 14620025 */ bne $v1, $v0, .L80240778 -/* C80884 802406E4 4602D600 */ add.s $f24, $f26, $f2 -/* C80888 802406E8 8E020000 */ lw $v0, ($s0) -/* C8088C 802406EC 30420008 */ andi $v0, $v0, 8 -/* C80890 802406F0 10400009 */ beqz $v0, .L80240718 -/* C80894 802406F4 27A50028 */ addiu $a1, $sp, 0x28 -/* C80898 802406F8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C8089C 802406FC 4600C001 */ sub.s $f0, $f24, $f0 -/* C808A0 80240700 4600B03C */ c.lt.s $f22, $f0 -/* C808A4 80240704 00000000 */ nop -/* C808A8 80240708 4500001B */ bc1f .L80240778 -/* C808AC 8024070C 34820010 */ ori $v0, $a0, 0x10 -/* C808B0 80240710 080901DE */ j .L80240778 -/* C808B4 80240714 AE22006C */ sw $v0, 0x6c($s1) -.L80240718: -/* C808B8 80240718 27A6002C */ addiu $a2, $sp, 0x2c -/* C808BC 8024071C C6000038 */ lwc1 $f0, 0x38($s0) -/* C808C0 80240720 C602003C */ lwc1 $f2, 0x3c($s0) -/* C808C4 80240724 C6040040 */ lwc1 $f4, 0x40($s0) -/* C808C8 80240728 3C01447A */ lui $at, 0x447a -/* C808CC 8024072C 44813000 */ mtc1 $at, $f6 -/* C808D0 80240730 27A20034 */ addiu $v0, $sp, 0x34 -/* C808D4 80240734 E7A00028 */ swc1 $f0, 0x28($sp) -/* C808D8 80240738 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C808DC 8024073C E7A40030 */ swc1 $f4, 0x30($sp) -/* C808E0 80240740 E7A60034 */ swc1 $f6, 0x34($sp) -/* C808E4 80240744 AFA20010 */ sw $v0, 0x10($sp) -/* C808E8 80240748 8E040080 */ lw $a0, 0x80($s0) -/* C808EC 8024074C 0C0372DF */ jal func_800DCB7C -/* C808F0 80240750 27A70030 */ addiu $a3, $sp, 0x30 -/* C808F4 80240754 C7A00034 */ lwc1 $f0, 0x34($sp) -/* C808F8 80240758 4600D001 */ sub.s $f0, $f26, $f0 -/* C808FC 8024075C 4600B03C */ c.lt.s $f22, $f0 -/* C80900 80240760 00000000 */ nop -/* C80904 80240764 45000004 */ bc1f .L80240778 -/* C80908 80240768 00000000 */ nop -/* C8090C 8024076C 8E22006C */ lw $v0, 0x6c($s1) -/* C80910 80240770 34420010 */ ori $v0, $v0, 0x10 -/* C80914 80240774 AE22006C */ sw $v0, 0x6c($s1) -.L80240778: -/* C80918 80240778 8E22006C */ lw $v0, 0x6c($s1) -/* C8091C 8024077C 24030011 */ addiu $v1, $zero, 0x11 -/* C80920 80240780 30420011 */ andi $v0, $v0, 0x11 -/* C80924 80240784 14430039 */ bne $v0, $v1, .L8024086C -/* C80928 80240788 00000000 */ nop -/* C8092C 8024078C 8E020000 */ lw $v0, ($s0) -/* C80930 80240790 30420008 */ andi $v0, $v0, 8 -/* C80934 80240794 1040000A */ beqz $v0, .L802407C0 -/* C80938 80240798 4600C106 */ mov.s $f4, $f24 -/* C8093C 8024079C 4614C081 */ sub.s $f2, $f24, $f20 -/* C80940 802407A0 3C018024 */ lui $at, 0x8024 -/* C80944 802407A4 D4205858 */ ldc1 $f0, 0x5858($at) -/* C80948 802407A8 460010A1 */ cvt.d.s $f2, $f2 -/* C8094C 802407AC 46201082 */ mul.d $f2, $f2, $f0 -/* C80950 802407B0 00000000 */ nop -/* C80954 802407B4 4600A021 */ cvt.d.s $f0, $f20 -/* C80958 802407B8 08090209 */ j .L80240824 -/* C8095C 802407BC 46220000 */ add.d $f0, $f0, $f2 -.L802407C0: -/* C80960 802407C0 27A50028 */ addiu $a1, $sp, 0x28 -/* C80964 802407C4 27A6002C */ addiu $a2, $sp, 0x2c -/* C80968 802407C8 C6000038 */ lwc1 $f0, 0x38($s0) -/* C8096C 802407CC C6020040 */ lwc1 $f2, 0x40($s0) -/* C80970 802407D0 3C01447A */ lui $at, 0x447a -/* C80974 802407D4 44812000 */ mtc1 $at, $f4 -/* C80978 802407D8 27A20034 */ addiu $v0, $sp, 0x34 -/* C8097C 802407DC E7B4002C */ swc1 $f20, 0x2c($sp) -/* C80980 802407E0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C80984 802407E4 E7A20030 */ swc1 $f2, 0x30($sp) -/* C80988 802407E8 E7A40034 */ swc1 $f4, 0x34($sp) -/* C8098C 802407EC AFA20010 */ sw $v0, 0x10($sp) -/* C80990 802407F0 8E040080 */ lw $a0, 0x80($s0) -/* C80994 802407F4 0C0372DF */ jal func_800DCB7C -/* C80998 802407F8 27A70030 */ addiu $a3, $sp, 0x30 -/* C8099C 802407FC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* C809A0 80240800 461A2100 */ add.s $f4, $f4, $f26 -/* C809A4 80240804 46142081 */ sub.s $f2, $f4, $f20 -/* C809A8 80240808 3C018024 */ lui $at, 0x8024 -/* C809AC 8024080C D4205860 */ ldc1 $f0, 0x5860($at) -/* C809B0 80240810 460010A1 */ cvt.d.s $f2, $f2 -/* C809B4 80240814 46201082 */ mul.d $f2, $f2, $f0 -/* C809B8 80240818 00000000 */ nop -/* C809BC 8024081C 4600A021 */ cvt.d.s $f0, $f20 -/* C809C0 80240820 46220000 */ add.d $f0, $f0, $f2 -.L80240824: -/* C809C4 80240824 46200020 */ cvt.s.d $f0, $f0 -/* C809C8 80240828 E600003C */ swc1 $f0, 0x3c($s0) -/* C809CC 8024082C C600003C */ lwc1 $f0, 0x3c($s0) -/* C809D0 80240830 46002001 */ sub.s $f0, $f4, $f0 -/* C809D4 80240834 3C013FF0 */ lui $at, 0x3ff0 -/* C809D8 80240838 44811800 */ mtc1 $at, $f3 -/* C809DC 8024083C 44801000 */ mtc1 $zero, $f2 -/* C809E0 80240840 46000005 */ abs.s $f0, $f0 -/* C809E4 80240844 46000021 */ cvt.d.s $f0, $f0 -/* C809E8 80240848 4622003C */ c.lt.d $f0, $f2 -/* C809EC 8024084C 00000000 */ nop -/* C809F0 80240850 45000036 */ bc1f .L8024092C -/* C809F4 80240854 2403FFEF */ addiu $v1, $zero, -0x11 -/* C809F8 80240858 E604003C */ swc1 $f4, 0x3c($s0) -/* C809FC 8024085C 8E22006C */ lw $v0, 0x6c($s1) -/* C80A00 80240860 00431024 */ and $v0, $v0, $v1 -/* C80A04 80240864 0809024B */ j .L8024092C -/* C80A08 80240868 AE22006C */ sw $v0, 0x6c($s1) -.L8024086C: -/* C80A0C 8024086C 8E220070 */ lw $v0, 0x70($s1) -/* C80A10 80240870 1840002E */ blez $v0, .L8024092C -/* C80A14 80240874 00000000 */ nop -/* C80A18 80240878 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C80A1C 8024087C 0C00A8BB */ jal sin_deg -/* C80A20 80240880 46806320 */ cvt.s.w $f12, $f12 -/* C80A24 80240884 8E020000 */ lw $v0, ($s0) -/* C80A28 80240888 30420008 */ andi $v0, $v0, 8 -/* C80A2C 8024088C 10400003 */ beqz $v0, .L8024089C -/* C80A30 80240890 46000506 */ mov.s $f20, $f0 -/* C80A34 80240894 08090237 */ j .L802408DC -/* C80A38 80240898 0000102D */ daddu $v0, $zero, $zero -.L8024089C: -/* C80A3C 8024089C 27A50028 */ addiu $a1, $sp, 0x28 -/* C80A40 802408A0 27A6002C */ addiu $a2, $sp, 0x2c -/* C80A44 802408A4 C6000038 */ lwc1 $f0, 0x38($s0) -/* C80A48 802408A8 C602003C */ lwc1 $f2, 0x3c($s0) -/* C80A4C 802408AC C6040040 */ lwc1 $f4, 0x40($s0) -/* C80A50 802408B0 3C01447A */ lui $at, 0x447a -/* C80A54 802408B4 44813000 */ mtc1 $at, $f6 -/* C80A58 802408B8 27A20034 */ addiu $v0, $sp, 0x34 -/* C80A5C 802408BC E7A00028 */ swc1 $f0, 0x28($sp) -/* C80A60 802408C0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C80A64 802408C4 E7A40030 */ swc1 $f4, 0x30($sp) -/* C80A68 802408C8 E7A60034 */ swc1 $f6, 0x34($sp) -/* C80A6C 802408CC AFA20010 */ sw $v0, 0x10($sp) -/* C80A70 802408D0 8E040080 */ lw $a0, 0x80($s0) -/* C80A74 802408D4 0C0372DF */ jal func_800DCB7C -/* C80A78 802408D8 27A70030 */ addiu $a3, $sp, 0x30 -.L802408DC: -/* C80A7C 802408DC 10400007 */ beqz $v0, .L802408FC -/* C80A80 802408E0 00000000 */ nop -/* C80A84 802408E4 4616A082 */ mul.s $f2, $f20, $f22 -/* C80A88 802408E8 00000000 */ nop -/* C80A8C 802408EC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C80A90 802408F0 461A0000 */ add.s $f0, $f0, $f26 -/* C80A94 802408F4 08090242 */ j .L80240908 -/* C80A98 802408F8 46020000 */ add.s $f0, $f0, $f2 -.L802408FC: -/* C80A9C 802408FC 4616A002 */ mul.s $f0, $f20, $f22 -/* C80AA0 80240900 00000000 */ nop -/* C80AA4 80240904 4600C000 */ add.s $f0, $f24, $f0 -.L80240908: -/* C80AA8 80240908 E600003C */ swc1 $f0, 0x3c($s0) -/* C80AAC 8024090C 8E220074 */ lw $v0, 0x74($s1) -/* C80AB0 80240910 2442000A */ addiu $v0, $v0, 0xa -/* C80AB4 80240914 44826000 */ mtc1 $v0, $f12 -/* C80AB8 80240918 00000000 */ nop -/* C80ABC 8024091C 0C00A6C9 */ jal clamp_angle -/* C80AC0 80240920 46806320 */ cvt.s.w $f12, $f12 -/* C80AC4 80240924 4600020D */ trunc.w.s $f8, $f0 -/* C80AC8 80240928 E6280074 */ swc1 $f8, 0x74($s1) -.L8024092C: -/* C80ACC 8024092C 8E220090 */ lw $v0, 0x90($s1) -/* C80AD0 80240930 1C40004A */ bgtz $v0, .L80240A5C -/* C80AD4 80240934 2442FFFF */ addiu $v0, $v0, -1 -/* C80AD8 80240938 8E430014 */ lw $v1, 0x14($s2) -/* C80ADC 8024093C 04600048 */ bltz $v1, .L80240A60 -/* C80AE0 80240940 00000000 */ nop -/* C80AE4 80240944 8E620074 */ lw $v0, 0x74($s3) -/* C80AE8 80240948 1C400042 */ bgtz $v0, .L80240A54 -/* C80AEC 8024094C 2442FFFF */ addiu $v0, $v0, -1 -/* C80AF0 80240950 AE630074 */ sw $v1, 0x74($s3) -/* C80AF4 80240954 860200A8 */ lh $v0, 0xa8($s0) -/* C80AF8 80240958 C602003C */ lwc1 $f2, 0x3c($s0) -/* C80AFC 8024095C 44820000 */ mtc1 $v0, $f0 -/* C80B00 80240960 00000000 */ nop -/* C80B04 80240964 46800020 */ cvt.s.w $f0, $f0 -/* C80B08 80240968 46001080 */ add.s $f2, $f2, $f0 -/* C80B0C 8024096C 3C014024 */ lui $at, 0x4024 -/* C80B10 80240970 44810800 */ mtc1 $at, $f1 -/* C80B14 80240974 44800000 */ mtc1 $zero, $f0 -/* C80B18 80240978 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C80B1C 8024097C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C80B20 80240980 460010A1 */ cvt.d.s $f2, $f2 -/* C80B24 80240984 46201080 */ add.d $f2, $f2, $f0 -/* C80B28 80240988 C440002C */ lwc1 $f0, 0x2c($v0) -/* C80B2C 8024098C 46000021 */ cvt.d.s $f0, $f0 -/* C80B30 80240990 4622003C */ c.lt.d $f0, $f2 -/* C80B34 80240994 00000000 */ nop -/* C80B38 80240998 4500002C */ bc1f .L80240A4C -/* C80B3C 8024099C 02A0202D */ daddu $a0, $s5, $zero -/* C80B40 802409A0 AFA00010 */ sw $zero, 0x10($sp) -/* C80B44 802409A4 8E46000C */ lw $a2, 0xc($s2) -/* C80B48 802409A8 8E470010 */ lw $a3, 0x10($s2) -/* C80B4C 802409AC 0C01242D */ jal func_800490B4 -/* C80B50 802409B0 0220282D */ daddu $a1, $s1, $zero -/* C80B54 802409B4 10400025 */ beqz $v0, .L80240A4C -/* C80B58 802409B8 0000202D */ daddu $a0, $zero, $zero -/* C80B5C 802409BC 0200282D */ daddu $a1, $s0, $zero -/* C80B60 802409C0 0000302D */ daddu $a2, $zero, $zero -/* C80B64 802409C4 2412000C */ addiu $s2, $zero, 0xc -/* C80B68 802409C8 860300A8 */ lh $v1, 0xa8($s0) -/* C80B6C 802409CC 3C013F80 */ lui $at, 0x3f80 -/* C80B70 802409D0 44810000 */ mtc1 $at, $f0 -/* C80B74 802409D4 3C014000 */ lui $at, 0x4000 -/* C80B78 802409D8 44811000 */ mtc1 $at, $f2 -/* C80B7C 802409DC 3C01C1A0 */ lui $at, 0xc1a0 -/* C80B80 802409E0 44812000 */ mtc1 $at, $f4 -/* C80B84 802409E4 44834000 */ mtc1 $v1, $f8 -/* C80B88 802409E8 00000000 */ nop -/* C80B8C 802409EC 46804220 */ cvt.s.w $f8, $f8 -/* C80B90 802409F0 44074000 */ mfc1 $a3, $f8 -/* C80B94 802409F4 27A20038 */ addiu $v0, $sp, 0x38 -/* C80B98 802409F8 AFB2001C */ sw $s2, 0x1c($sp) -/* C80B9C 802409FC AFA20020 */ sw $v0, 0x20($sp) -/* C80BA0 80240A00 E7A00010 */ swc1 $f0, 0x10($sp) -/* C80BA4 80240A04 E7A20014 */ swc1 $f2, 0x14($sp) -/* C80BA8 80240A08 0C01BFA4 */ jal fx_emote -/* C80BAC 80240A0C E7A40018 */ swc1 $f4, 0x18($sp) -/* C80BB0 80240A10 0200202D */ daddu $a0, $s0, $zero -/* C80BB4 80240A14 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C80BB8 80240A18 C480003C */ lwc1 $f0, 0x3c($a0) -/* C80BBC 80240A1C 3C060020 */ lui $a2, 0x20 -/* C80BC0 80240A20 0C012530 */ jal func_800494C0 -/* C80BC4 80240A24 E4800064 */ swc1 $f0, 0x64($a0) -/* C80BC8 80240A28 8E220018 */ lw $v0, 0x18($s1) -/* C80BCC 80240A2C 9442002A */ lhu $v0, 0x2a($v0) -/* C80BD0 80240A30 30420001 */ andi $v0, $v0, 1 -/* C80BD4 80240A34 10400003 */ beqz $v0, .L80240A44 -/* C80BD8 80240A38 2402000A */ addiu $v0, $zero, 0xa -/* C80BDC 80240A3C 08090301 */ j .L80240C04 -/* C80BE0 80240A40 AE620070 */ sw $v0, 0x70($s3) -.L80240A44: -/* C80BE4 80240A44 08090301 */ j .L80240C04 -/* C80BE8 80240A48 AE720070 */ sw $s2, 0x70($s3) -.L80240A4C: -/* C80BEC 80240A4C 8E620074 */ lw $v0, 0x74($s3) -/* C80BF0 80240A50 2442FFFF */ addiu $v0, $v0, -1 -.L80240A54: -/* C80BF4 80240A54 08090298 */ j .L80240A60 -/* C80BF8 80240A58 AE620074 */ sw $v0, 0x74($s3) -.L80240A5C: -/* C80BFC 80240A5C AE220090 */ sw $v0, 0x90($s1) -.L80240A60: -/* C80C00 80240A60 8E2300D0 */ lw $v1, 0xd0($s1) -/* C80C04 80240A64 C6000040 */ lwc1 $f0, 0x40($s0) -/* C80C08 80240A68 C4620000 */ lwc1 $f2, ($v1) -/* C80C0C 80240A6C 468010A0 */ cvt.s.w $f2, $f2 -/* C80C10 80240A70 C4640008 */ lwc1 $f4, 8($v1) -/* C80C14 80240A74 46802120 */ cvt.s.w $f4, $f4 -/* C80C18 80240A78 E7A00010 */ swc1 $f0, 0x10($sp) -/* C80C1C 80240A7C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C80C20 80240A80 44051000 */ mfc1 $a1, $f2 -/* C80C24 80240A84 C440000C */ lwc1 $f0, 0xc($v0) -/* C80C28 80240A88 46800020 */ cvt.s.w $f0, $f0 -/* C80C2C 80240A8C E7A00014 */ swc1 $f0, 0x14($sp) -/* C80C30 80240A90 8E2200D0 */ lw $v0, 0xd0($s1) -/* C80C34 80240A94 44062000 */ mfc1 $a2, $f4 -/* C80C38 80240A98 C4400010 */ lwc1 $f0, 0x10($v0) -/* C80C3C 80240A9C 46800020 */ cvt.s.w $f0, $f0 -/* C80C40 80240AA0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C80C44 80240AA4 8C640018 */ lw $a0, 0x18($v1) -/* C80C48 80240AA8 0C0123F5 */ jal is_point_within_region -/* C80C4C 80240AAC 8E070038 */ lw $a3, 0x38($s0) -/* C80C50 80240AB0 1040001A */ beqz $v0, .L80240B1C -/* C80C54 80240AB4 00000000 */ nop -/* C80C58 80240AB8 8E060038 */ lw $a2, 0x38($s0) -/* C80C5C 80240ABC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C80C60 80240AC0 8E070040 */ lw $a3, 0x40($s0) -/* C80C64 80240AC4 C44C0000 */ lwc1 $f12, ($v0) -/* C80C68 80240AC8 46806320 */ cvt.s.w $f12, $f12 -/* C80C6C 80240ACC C44E0008 */ lwc1 $f14, 8($v0) -/* C80C70 80240AD0 0C00A7B5 */ jal dist2D -/* C80C74 80240AD4 468073A0 */ cvt.s.w $f14, $f14 -/* C80C78 80240AD8 C6020018 */ lwc1 $f2, 0x18($s0) -/* C80C7C 80240ADC 4600103C */ c.lt.s $f2, $f0 -/* C80C80 80240AE0 00000000 */ nop -/* C80C84 80240AE4 4500000D */ bc1f .L80240B1C -/* C80C88 80240AE8 E7A00034 */ swc1 $f0, 0x34($sp) -/* C80C8C 80240AEC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C80C90 80240AF0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C80C94 80240AF4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C80C98 80240AF8 C4480000 */ lwc1 $f8, ($v0) -/* C80C9C 80240AFC 46804220 */ cvt.s.w $f8, $f8 -/* C80CA0 80240B00 44064000 */ mfc1 $a2, $f8 -/* C80CA4 80240B04 C4480008 */ lwc1 $f8, 8($v0) -/* C80CA8 80240B08 46804220 */ cvt.s.w $f8, $f8 -/* C80CAC 80240B0C 44074000 */ mfc1 $a3, $f8 -/* C80CB0 80240B10 0C00A720 */ jal atan2 -/* C80CB4 80240B14 24140001 */ addiu $s4, $zero, 1 -/* C80CB8 80240B18 E600000C */ swc1 $f0, 0xc($s0) -.L80240B1C: -/* C80CBC 80240B1C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C80CC0 80240B20 8C43000C */ lw $v1, 0xc($v0) -/* C80CC4 80240B24 8C420010 */ lw $v0, 0x10($v0) -/* C80CC8 80240B28 00621825 */ or $v1, $v1, $v0 -/* C80CCC 80240B2C 00741825 */ or $v1, $v1, $s4 -/* C80CD0 80240B30 10600008 */ beqz $v1, .L80240B54 -/* C80CD4 80240B34 00000000 */ nop -/* C80CD8 80240B38 8602008C */ lh $v0, 0x8c($s0) -/* C80CDC 80240B3C 14400031 */ bnez $v0, .L80240C04 -/* C80CE0 80240B40 00000000 */ nop -/* C80CE4 80240B44 8E050018 */ lw $a1, 0x18($s0) -/* C80CE8 80240B48 8E06000C */ lw $a2, 0xc($s0) -/* C80CEC 80240B4C 0C00EA95 */ jal npc_move_heading -/* C80CF0 80240B50 0200202D */ daddu $a0, $s0, $zero -.L80240B54: -/* C80CF4 80240B54 C600003C */ lwc1 $f0, 0x3c($s0) -/* C80CF8 80240B58 3C014059 */ lui $at, 0x4059 -/* C80CFC 80240B5C 44811800 */ mtc1 $at, $f3 -/* C80D00 80240B60 44801000 */ mtc1 $zero, $f2 -/* C80D04 80240B64 46000021 */ cvt.d.s $f0, $f0 -/* C80D08 80240B68 46220002 */ mul.d $f0, $f0, $f2 -/* C80D0C 80240B6C 00000000 */ nop -/* C80D10 80240B70 4620020D */ trunc.w.d $f8, $f0 -/* C80D14 80240B74 E628007C */ swc1 $f8, 0x7c($s1) -/* C80D18 80240B78 8E420004 */ lw $v0, 4($s2) -/* C80D1C 80240B7C 18400021 */ blez $v0, .L80240C04 -/* C80D20 80240B80 00000000 */ nop -/* C80D24 80240B84 8602008E */ lh $v0, 0x8e($s0) -/* C80D28 80240B88 9603008E */ lhu $v1, 0x8e($s0) -/* C80D2C 80240B8C 18400005 */ blez $v0, .L80240BA4 -/* C80D30 80240B90 2462FFFF */ addiu $v0, $v1, -1 -/* C80D34 80240B94 A602008E */ sh $v0, 0x8e($s0) -/* C80D38 80240B98 00021400 */ sll $v0, $v0, 0x10 -/* C80D3C 80240B9C 1C400019 */ bgtz $v0, .L80240C04 -/* C80D40 80240BA0 00000000 */ nop -.L80240BA4: -/* C80D44 80240BA4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C80D48 80240BA8 24020002 */ addiu $v0, $zero, 2 -/* C80D4C 80240BAC 0C00A67F */ jal rand_int -/* C80D50 80240BB0 AE620070 */ sw $v0, 0x70($s3) -/* C80D54 80240BB4 3C035555 */ lui $v1, 0x5555 -/* C80D58 80240BB8 34635556 */ ori $v1, $v1, 0x5556 -/* C80D5C 80240BBC 00430018 */ mult $v0, $v1 -/* C80D60 80240BC0 000227C3 */ sra $a0, $v0, 0x1f -/* C80D64 80240BC4 00004010 */ mfhi $t0 -/* C80D68 80240BC8 01042023 */ subu $a0, $t0, $a0 -/* C80D6C 80240BCC 00041840 */ sll $v1, $a0, 1 -/* C80D70 80240BD0 00641821 */ addu $v1, $v1, $a0 -/* C80D74 80240BD4 00431023 */ subu $v0, $v0, $v1 -/* C80D78 80240BD8 24430002 */ addiu $v1, $v0, 2 -/* C80D7C 80240BDC AE630074 */ sw $v1, 0x74($s3) -/* C80D80 80240BE0 8E42002C */ lw $v0, 0x2c($s2) -/* C80D84 80240BE4 58400007 */ blezl $v0, .L80240C04 -/* C80D88 80240BE8 AE600070 */ sw $zero, 0x70($s3) -/* C80D8C 80240BEC 8E420008 */ lw $v0, 8($s2) -/* C80D90 80240BF0 18400003 */ blez $v0, .L80240C00 -/* C80D94 80240BF4 28620003 */ slti $v0, $v1, 3 -/* C80D98 80240BF8 10400002 */ beqz $v0, .L80240C04 -/* C80D9C 80240BFC 00000000 */ nop -.L80240C00: -/* C80DA0 80240C00 AE600070 */ sw $zero, 0x70($s3) -.L80240C04: -/* C80DA4 80240C04 8FBF0058 */ lw $ra, 0x58($sp) -/* C80DA8 80240C08 8FB50054 */ lw $s5, 0x54($sp) -/* C80DAC 80240C0C 8FB40050 */ lw $s4, 0x50($sp) -/* C80DB0 80240C10 8FB3004C */ lw $s3, 0x4c($sp) -/* C80DB4 80240C14 8FB20048 */ lw $s2, 0x48($sp) -/* C80DB8 80240C18 8FB10044 */ lw $s1, 0x44($sp) -/* C80DBC 80240C1C 8FB00040 */ lw $s0, 0x40($sp) -/* C80DC0 80240C20 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* C80DC4 80240C24 D7B80070 */ ldc1 $f24, 0x70($sp) -/* C80DC8 80240C28 D7B60068 */ ldc1 $f22, 0x68($sp) -/* C80DCC 80240C2C D7B40060 */ ldc1 $f20, 0x60($sp) -/* C80DD0 80240C30 03E00008 */ jr $ra -/* C80DD4 80240C34 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/func_80240C38_C801A0.s b/asm/nonmatchings/world/area_kzn/kzn_11/func_80240C38_C801A0.s deleted file mode 100644 index 24bbc93d57..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/func_80240C38_C801A0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C38_C80DD8 -/* C80DD8 80240C38 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C80DDC 80240C3C AFB3001C */ sw $s3, 0x1c($sp) -/* C80DE0 80240C40 0080982D */ daddu $s3, $a0, $zero -/* C80DE4 80240C44 AFBF0020 */ sw $ra, 0x20($sp) -/* C80DE8 80240C48 AFB20018 */ sw $s2, 0x18($sp) -/* C80DEC 80240C4C AFB10014 */ sw $s1, 0x14($sp) -/* C80DF0 80240C50 AFB00010 */ sw $s0, 0x10($sp) -/* C80DF4 80240C54 8E720148 */ lw $s2, 0x148($s3) -/* C80DF8 80240C58 86440008 */ lh $a0, 8($s2) -/* C80DFC 80240C5C 0C00EABB */ jal get_npc_unsafe -/* C80E00 80240C60 00A0882D */ daddu $s1, $a1, $zero -/* C80E04 80240C64 8E240008 */ lw $a0, 8($s1) -/* C80E08 80240C68 0040802D */ daddu $s0, $v0, $zero -/* C80E0C 80240C6C 00041FC2 */ srl $v1, $a0, 0x1f -/* C80E10 80240C70 00832021 */ addu $a0, $a0, $v1 -/* C80E14 80240C74 00042043 */ sra $a0, $a0, 1 -/* C80E18 80240C78 0C00A67F */ jal rand_int -/* C80E1C 80240C7C 24840001 */ addiu $a0, $a0, 1 -/* C80E20 80240C80 8E230008 */ lw $v1, 8($s1) -/* C80E24 80240C84 240400B4 */ addiu $a0, $zero, 0xb4 -/* C80E28 80240C88 00032FC2 */ srl $a1, $v1, 0x1f -/* C80E2C 80240C8C 00651821 */ addu $v1, $v1, $a1 -/* C80E30 80240C90 00031843 */ sra $v1, $v1, 1 -/* C80E34 80240C94 00621821 */ addu $v1, $v1, $v0 -/* C80E38 80240C98 0C00A67F */ jal rand_int -/* C80E3C 80240C9C A603008E */ sh $v1, 0x8e($s0) -/* C80E40 80240CA0 C60C000C */ lwc1 $f12, 0xc($s0) -/* C80E44 80240CA4 44820000 */ mtc1 $v0, $f0 -/* C80E48 80240CA8 00000000 */ nop -/* C80E4C 80240CAC 46800020 */ cvt.s.w $f0, $f0 -/* C80E50 80240CB0 46006300 */ add.s $f12, $f12, $f0 -/* C80E54 80240CB4 3C0142B4 */ lui $at, 0x42b4 -/* C80E58 80240CB8 44810000 */ mtc1 $at, $f0 -/* C80E5C 80240CBC 0C00A6C9 */ jal clamp_angle -/* C80E60 80240CC0 46006301 */ sub.s $f12, $f12, $f0 -/* C80E64 80240CC4 E600000C */ swc1 $f0, 0xc($s0) -/* C80E68 80240CC8 8E4200CC */ lw $v0, 0xcc($s2) -/* C80E6C 80240CCC 8C420000 */ lw $v0, ($v0) -/* C80E70 80240CD0 AE020028 */ sw $v0, 0x28($s0) -/* C80E74 80240CD4 24020003 */ addiu $v0, $zero, 3 -/* C80E78 80240CD8 AE620070 */ sw $v0, 0x70($s3) -/* C80E7C 80240CDC 8FBF0020 */ lw $ra, 0x20($sp) -/* C80E80 80240CE0 8FB3001C */ lw $s3, 0x1c($sp) -/* C80E84 80240CE4 8FB20018 */ lw $s2, 0x18($sp) -/* C80E88 80240CE8 8FB10014 */ lw $s1, 0x14($sp) -/* C80E8C 80240CEC 8FB00010 */ lw $s0, 0x10($sp) -/* C80E90 80240CF0 03E00008 */ jr $ra -/* C80E94 80240CF4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/func_80240CF8_C801A0.s b/asm/nonmatchings/world/area_kzn/kzn_11/func_80240CF8_C801A0.s deleted file mode 100644 index 42e744974d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/func_80240CF8_C801A0.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CF8_C80E98 -/* C80E98 80240CF8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C80E9C 80240CFC AFB3004C */ sw $s3, 0x4c($sp) -/* C80EA0 80240D00 0080982D */ daddu $s3, $a0, $zero -/* C80EA4 80240D04 AFBF0054 */ sw $ra, 0x54($sp) -/* C80EA8 80240D08 AFB40050 */ sw $s4, 0x50($sp) -/* C80EAC 80240D0C AFB20048 */ sw $s2, 0x48($sp) -/* C80EB0 80240D10 AFB10044 */ sw $s1, 0x44($sp) -/* C80EB4 80240D14 AFB00040 */ sw $s0, 0x40($sp) -/* C80EB8 80240D18 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C80EBC 80240D1C F7B80068 */ sdc1 $f24, 0x68($sp) -/* C80EC0 80240D20 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C80EC4 80240D24 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C80EC8 80240D28 8E710148 */ lw $s1, 0x148($s3) -/* C80ECC 80240D2C 00A0902D */ daddu $s2, $a1, $zero -/* C80ED0 80240D30 86240008 */ lh $a0, 8($s1) -/* C80ED4 80240D34 0C00EABB */ jal get_npc_unsafe -/* C80ED8 80240D38 00C0A02D */ daddu $s4, $a2, $zero -/* C80EDC 80240D3C 0040802D */ daddu $s0, $v0, $zero -/* C80EE0 80240D40 C6200078 */ lwc1 $f0, 0x78($s1) -/* C80EE4 80240D44 46800020 */ cvt.s.w $f0, $f0 -/* C80EE8 80240D48 46000021 */ cvt.d.s $f0, $f0 -/* C80EEC 80240D4C 3C014059 */ lui $at, 0x4059 -/* C80EF0 80240D50 44811800 */ mtc1 $at, $f3 -/* C80EF4 80240D54 44801000 */ mtc1 $zero, $f2 -/* C80EF8 80240D58 8602008E */ lh $v0, 0x8e($s0) -/* C80EFC 80240D5C 9603008E */ lhu $v1, 0x8e($s0) -/* C80F00 80240D60 46220003 */ div.d $f0, $f0, $f2 -/* C80F04 80240D64 46200620 */ cvt.s.d $f24, $f0 -/* C80F08 80240D68 C6200088 */ lwc1 $f0, 0x88($s1) -/* C80F0C 80240D6C 46800020 */ cvt.s.w $f0, $f0 -/* C80F10 80240D70 46000021 */ cvt.d.s $f0, $f0 -/* C80F14 80240D74 46220003 */ div.d $f0, $f0, $f2 -/* C80F18 80240D78 46200020 */ cvt.s.d $f0, $f0 -/* C80F1C 80240D7C 18400003 */ blez $v0, .L80240D8C -/* C80F20 80240D80 4600C680 */ add.s $f26, $f24, $f0 -/* C80F24 80240D84 2462FFFF */ addiu $v0, $v1, -1 -/* C80F28 80240D88 A602008E */ sh $v0, 0x8e($s0) -.L80240D8C: -/* C80F2C 80240D8C 8E220070 */ lw $v0, 0x70($s1) -/* C80F30 80240D90 18400034 */ blez $v0, .L80240E64 -/* C80F34 80240D94 00000000 */ nop -/* C80F38 80240D98 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C80F3C 80240D9C 46806320 */ cvt.s.w $f12, $f12 -/* C80F40 80240DA0 44820000 */ mtc1 $v0, $f0 -/* C80F44 80240DA4 00000000 */ nop -/* C80F48 80240DA8 46800020 */ cvt.s.w $f0, $f0 -/* C80F4C 80240DAC 46000021 */ cvt.d.s $f0, $f0 -/* C80F50 80240DB0 46220003 */ div.d $f0, $f0, $f2 -/* C80F54 80240DB4 0C00A8BB */ jal sin_deg -/* C80F58 80240DB8 462005A0 */ cvt.s.d $f22, $f0 -/* C80F5C 80240DBC 8E020000 */ lw $v0, ($s0) -/* C80F60 80240DC0 30420008 */ andi $v0, $v0, 8 -/* C80F64 80240DC4 10400003 */ beqz $v0, .L80240DD4 -/* C80F68 80240DC8 46000506 */ mov.s $f20, $f0 -/* C80F6C 80240DCC 08090385 */ j .L80240E14 -/* C80F70 80240DD0 0000102D */ daddu $v0, $zero, $zero -.L80240DD4: -/* C80F74 80240DD4 27A50028 */ addiu $a1, $sp, 0x28 -/* C80F78 80240DD8 27A6002C */ addiu $a2, $sp, 0x2c -/* C80F7C 80240DDC C6000038 */ lwc1 $f0, 0x38($s0) -/* C80F80 80240DE0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C80F84 80240DE4 C6040040 */ lwc1 $f4, 0x40($s0) -/* C80F88 80240DE8 3C01447A */ lui $at, 0x447a -/* C80F8C 80240DEC 44813000 */ mtc1 $at, $f6 -/* C80F90 80240DF0 27A20034 */ addiu $v0, $sp, 0x34 -/* C80F94 80240DF4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C80F98 80240DF8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C80F9C 80240DFC E7A40030 */ swc1 $f4, 0x30($sp) -/* C80FA0 80240E00 E7A60034 */ swc1 $f6, 0x34($sp) -/* C80FA4 80240E04 AFA20010 */ sw $v0, 0x10($sp) -/* C80FA8 80240E08 8E040080 */ lw $a0, 0x80($s0) -/* C80FAC 80240E0C 0C0372DF */ jal func_800DCB7C -/* C80FB0 80240E10 27A70030 */ addiu $a3, $sp, 0x30 -.L80240E14: -/* C80FB4 80240E14 10400007 */ beqz $v0, .L80240E34 -/* C80FB8 80240E18 00000000 */ nop -/* C80FBC 80240E1C 4616A082 */ mul.s $f2, $f20, $f22 -/* C80FC0 80240E20 00000000 */ nop -/* C80FC4 80240E24 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C80FC8 80240E28 46180000 */ add.s $f0, $f0, $f24 -/* C80FCC 80240E2C 08090390 */ j .L80240E40 -/* C80FD0 80240E30 46020000 */ add.s $f0, $f0, $f2 -.L80240E34: -/* C80FD4 80240E34 4616A002 */ mul.s $f0, $f20, $f22 -/* C80FD8 80240E38 00000000 */ nop -/* C80FDC 80240E3C 4600D000 */ add.s $f0, $f26, $f0 -.L80240E40: -/* C80FE0 80240E40 E600003C */ swc1 $f0, 0x3c($s0) -/* C80FE4 80240E44 8E220074 */ lw $v0, 0x74($s1) -/* C80FE8 80240E48 2442000A */ addiu $v0, $v0, 0xa -/* C80FEC 80240E4C 44826000 */ mtc1 $v0, $f12 -/* C80FF0 80240E50 00000000 */ nop -/* C80FF4 80240E54 0C00A6C9 */ jal clamp_angle -/* C80FF8 80240E58 46806320 */ cvt.s.w $f12, $f12 -/* C80FFC 80240E5C 4600020D */ trunc.w.s $f8, $f0 -/* C81000 80240E60 E6280074 */ swc1 $f8, 0x74($s1) -.L80240E64: -/* C81004 80240E64 8E220090 */ lw $v0, 0x90($s1) -/* C81008 80240E68 1C400040 */ bgtz $v0, .L80240F6C -/* C8100C 80240E6C 2442FFFF */ addiu $v0, $v0, -1 -/* C81010 80240E70 860200A8 */ lh $v0, 0xa8($s0) -/* C81014 80240E74 C600003C */ lwc1 $f0, 0x3c($s0) -/* C81018 80240E78 44821000 */ mtc1 $v0, $f2 -/* C8101C 80240E7C 00000000 */ nop -/* C81020 80240E80 468010A0 */ cvt.s.w $f2, $f2 -/* C81024 80240E84 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C81028 80240E88 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C8102C 80240E8C 46020000 */ add.s $f0, $f0, $f2 -/* C81030 80240E90 3C014024 */ lui $at, 0x4024 -/* C81034 80240E94 44812800 */ mtc1 $at, $f5 -/* C81038 80240E98 44802000 */ mtc1 $zero, $f4 -/* C8103C 80240E9C C442002C */ lwc1 $f2, 0x2c($v0) -/* C81040 80240EA0 46000021 */ cvt.d.s $f0, $f0 -/* C81044 80240EA4 46240000 */ add.d $f0, $f0, $f4 -/* C81048 80240EA8 460010A1 */ cvt.d.s $f2, $f2 -/* C8104C 80240EAC 4620103C */ c.lt.d $f2, $f0 -/* C81050 80240EB0 00000000 */ nop -/* C81054 80240EB4 4500002E */ bc1f .L80240F70 -/* C81058 80240EB8 0280202D */ daddu $a0, $s4, $zero -/* C8105C 80240EBC 24020001 */ addiu $v0, $zero, 1 -/* C81060 80240EC0 AFA20010 */ sw $v0, 0x10($sp) -/* C81064 80240EC4 8E460024 */ lw $a2, 0x24($s2) -/* C81068 80240EC8 8E470028 */ lw $a3, 0x28($s2) -/* C8106C 80240ECC 0C01242D */ jal func_800490B4 -/* C81070 80240ED0 0220282D */ daddu $a1, $s1, $zero -/* C81074 80240ED4 10400026 */ beqz $v0, .L80240F70 -/* C81078 80240ED8 0000202D */ daddu $a0, $zero, $zero -/* C8107C 80240EDC 0200282D */ daddu $a1, $s0, $zero -/* C81080 80240EE0 0000302D */ daddu $a2, $zero, $zero -/* C81084 80240EE4 2412000C */ addiu $s2, $zero, 0xc -/* C81088 80240EE8 860300A8 */ lh $v1, 0xa8($s0) -/* C8108C 80240EEC 3C013F80 */ lui $at, 0x3f80 -/* C81090 80240EF0 44810000 */ mtc1 $at, $f0 -/* C81094 80240EF4 3C014000 */ lui $at, 0x4000 -/* C81098 80240EF8 44811000 */ mtc1 $at, $f2 -/* C8109C 80240EFC 3C01C1A0 */ lui $at, 0xc1a0 -/* C810A0 80240F00 44812000 */ mtc1 $at, $f4 -/* C810A4 80240F04 44834000 */ mtc1 $v1, $f8 -/* C810A8 80240F08 00000000 */ nop -/* C810AC 80240F0C 46804220 */ cvt.s.w $f8, $f8 -/* C810B0 80240F10 44074000 */ mfc1 $a3, $f8 -/* C810B4 80240F14 27A20038 */ addiu $v0, $sp, 0x38 -/* C810B8 80240F18 AFB2001C */ sw $s2, 0x1c($sp) -/* C810BC 80240F1C AFA20020 */ sw $v0, 0x20($sp) -/* C810C0 80240F20 E7A00010 */ swc1 $f0, 0x10($sp) -/* C810C4 80240F24 E7A20014 */ swc1 $f2, 0x14($sp) -/* C810C8 80240F28 0C01BFA4 */ jal fx_emote -/* C810CC 80240F2C E7A40018 */ swc1 $f4, 0x18($sp) -/* C810D0 80240F30 0200202D */ daddu $a0, $s0, $zero -/* C810D4 80240F34 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C810D8 80240F38 C480003C */ lwc1 $f0, 0x3c($a0) -/* C810DC 80240F3C 3C060020 */ lui $a2, 0x20 -/* C810E0 80240F40 0C012530 */ jal func_800494C0 -/* C810E4 80240F44 E4800064 */ swc1 $f0, 0x64($a0) -/* C810E8 80240F48 8E220018 */ lw $v0, 0x18($s1) -/* C810EC 80240F4C 9442002A */ lhu $v0, 0x2a($v0) -/* C810F0 80240F50 30420001 */ andi $v0, $v0, 1 -/* C810F4 80240F54 10400003 */ beqz $v0, .L80240F64 -/* C810F8 80240F58 2402000A */ addiu $v0, $zero, 0xa -/* C810FC 80240F5C 08090403 */ j .L8024100C -/* C81100 80240F60 AE620070 */ sw $v0, 0x70($s3) -.L80240F64: -/* C81104 80240F64 08090403 */ j .L8024100C -/* C81108 80240F68 AE720070 */ sw $s2, 0x70($s3) -.L80240F6C: -/* C8110C 80240F6C AE220090 */ sw $v0, 0x90($s1) -.L80240F70: -/* C81110 80240F70 8602008C */ lh $v0, 0x8c($s0) -/* C81114 80240F74 14400025 */ bnez $v0, .L8024100C -/* C81118 80240F78 00000000 */ nop -/* C8111C 80240F7C 8602008E */ lh $v0, 0x8e($s0) -/* C81120 80240F80 1C400022 */ bgtz $v0, .L8024100C -/* C81124 80240F84 00000000 */ nop -/* C81128 80240F88 8E620074 */ lw $v0, 0x74($s3) -/* C8112C 80240F8C 2442FFFF */ addiu $v0, $v0, -1 -/* C81130 80240F90 1840001D */ blez $v0, .L80241008 -/* C81134 80240F94 AE620074 */ sw $v0, 0x74($s3) -/* C81138 80240F98 8E220018 */ lw $v0, 0x18($s1) -/* C8113C 80240F9C 9442002A */ lhu $v0, 0x2a($v0) -/* C81140 80240FA0 30420010 */ andi $v0, $v0, 0x10 -/* C81144 80240FA4 14400007 */ bnez $v0, .L80240FC4 -/* C81148 80240FA8 00000000 */ nop -/* C8114C 80240FAC C600000C */ lwc1 $f0, 0xc($s0) -/* C81150 80240FB0 3C014334 */ lui $at, 0x4334 -/* C81154 80240FB4 44816000 */ mtc1 $at, $f12 -/* C81158 80240FB8 0C00A6C9 */ jal clamp_angle -/* C8115C 80240FBC 460C0300 */ add.s $f12, $f0, $f12 -/* C81160 80240FC0 E600000C */ swc1 $f0, 0xc($s0) -.L80240FC4: -/* C81164 80240FC4 0C00A67F */ jal rand_int -/* C81168 80240FC8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C8116C 80240FCC 3C032E8B */ lui $v1, 0x2e8b -/* C81170 80240FD0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* C81174 80240FD4 00430018 */ mult $v0, $v1 -/* C81178 80240FD8 00021FC3 */ sra $v1, $v0, 0x1f -/* C8117C 80240FDC 00004010 */ mfhi $t0 -/* C81180 80240FE0 00082043 */ sra $a0, $t0, 1 -/* C81184 80240FE4 00832023 */ subu $a0, $a0, $v1 -/* C81188 80240FE8 00041840 */ sll $v1, $a0, 1 -/* C8118C 80240FEC 00641821 */ addu $v1, $v1, $a0 -/* C81190 80240FF0 00031880 */ sll $v1, $v1, 2 -/* C81194 80240FF4 00641823 */ subu $v1, $v1, $a0 -/* C81198 80240FF8 00431023 */ subu $v0, $v0, $v1 -/* C8119C 80240FFC 24420005 */ addiu $v0, $v0, 5 -/* C811A0 80241000 08090403 */ j .L8024100C -/* C811A4 80241004 A602008E */ sh $v0, 0x8e($s0) -.L80241008: -/* C811A8 80241008 AE600070 */ sw $zero, 0x70($s3) -.L8024100C: -/* C811AC 8024100C 8FBF0054 */ lw $ra, 0x54($sp) -/* C811B0 80241010 8FB40050 */ lw $s4, 0x50($sp) -/* C811B4 80241014 8FB3004C */ lw $s3, 0x4c($sp) -/* C811B8 80241018 8FB20048 */ lw $s2, 0x48($sp) -/* C811BC 8024101C 8FB10044 */ lw $s1, 0x44($sp) -/* C811C0 80241020 8FB00040 */ lw $s0, 0x40($sp) -/* C811C4 80241024 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C811C8 80241028 D7B80068 */ ldc1 $f24, 0x68($sp) -/* C811CC 8024102C D7B60060 */ ldc1 $f22, 0x60($sp) -/* C811D0 80241030 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C811D4 80241034 03E00008 */ jr $ra -/* C811D8 80241038 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/func_802410B4_C801A0.s b/asm/nonmatchings/world/area_kzn/kzn_11/func_802410B4_C801A0.s deleted file mode 100644 index b5ee11c593..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/func_802410B4_C801A0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410B4_C81254 -/* C81254 802410B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C81258 802410B8 AFB00010 */ sw $s0, 0x10($sp) -/* C8125C 802410BC 0080802D */ daddu $s0, $a0, $zero -/* C81260 802410C0 AFBF0014 */ sw $ra, 0x14($sp) -/* C81264 802410C4 8E020148 */ lw $v0, 0x148($s0) -/* C81268 802410C8 0C00EABB */ jal get_npc_unsafe -/* C8126C 802410CC 84440008 */ lh $a0, 8($v0) -/* C81270 802410D0 9443008E */ lhu $v1, 0x8e($v0) -/* C81274 802410D4 C440003C */ lwc1 $f0, 0x3c($v0) -/* C81278 802410D8 24640001 */ addiu $a0, $v1, 1 -/* C8127C 802410DC 00031C00 */ sll $v1, $v1, 0x10 -/* C81280 802410E0 00031B83 */ sra $v1, $v1, 0xe -/* C81284 802410E4 A444008E */ sh $a0, 0x8e($v0) -/* C81288 802410E8 3C018024 */ lui $at, 0x8024 -/* C8128C 802410EC 00230821 */ addu $at, $at, $v1 -/* C81290 802410F0 C42236D0 */ lwc1 $f2, 0x36d0($at) -/* C81294 802410F4 8443008E */ lh $v1, 0x8e($v0) -/* C81298 802410F8 46020000 */ add.s $f0, $f0, $f2 -/* C8129C 802410FC 28630005 */ slti $v1, $v1, 5 -/* C812A0 80241100 14600003 */ bnez $v1, .L80241110 -/* C812A4 80241104 E440003C */ swc1 $f0, 0x3c($v0) -/* C812A8 80241108 2402000C */ addiu $v0, $zero, 0xc -/* C812AC 8024110C AE020070 */ sw $v0, 0x70($s0) -.L80241110: -/* C812B0 80241110 8FBF0014 */ lw $ra, 0x14($sp) -/* C812B4 80241114 8FB00010 */ lw $s0, 0x10($sp) -/* C812B8 80241118 03E00008 */ jr $ra -/* C812BC 8024111C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/func_80241120_C801A0.s b/asm/nonmatchings/world/area_kzn/kzn_11/func_80241120_C801A0.s deleted file mode 100644 index 14f79cc455..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/func_80241120_C801A0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241120_C812C0 -/* C812C0 80241120 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C812C4 80241124 AFB3001C */ sw $s3, 0x1c($sp) -/* C812C8 80241128 0080982D */ daddu $s3, $a0, $zero -/* C812CC 8024112C AFBF0020 */ sw $ra, 0x20($sp) -/* C812D0 80241130 AFB20018 */ sw $s2, 0x18($sp) -/* C812D4 80241134 AFB10014 */ sw $s1, 0x14($sp) -/* C812D8 80241138 AFB00010 */ sw $s0, 0x10($sp) -/* C812DC 8024113C 8E720148 */ lw $s2, 0x148($s3) -/* C812E0 80241140 86440008 */ lh $a0, 8($s2) -/* C812E4 80241144 0C00EABB */ jal get_npc_unsafe -/* C812E8 80241148 00A0802D */ daddu $s0, $a1, $zero -/* C812EC 8024114C 0040882D */ daddu $s1, $v0, $zero -/* C812F0 80241150 C6420080 */ lwc1 $f2, 0x80($s2) -/* C812F4 80241154 468010A0 */ cvt.s.w $f2, $f2 -/* C812F8 80241158 460010A1 */ cvt.d.s $f2, $f2 -/* C812FC 8024115C C6400084 */ lwc1 $f0, 0x84($s2) -/* C81300 80241160 46800020 */ cvt.s.w $f0, $f0 -/* C81304 80241164 46000021 */ cvt.d.s $f0, $f0 -/* C81308 80241168 3C014059 */ lui $at, 0x4059 -/* C8130C 8024116C 44812800 */ mtc1 $at, $f5 -/* C81310 80241170 44802000 */ mtc1 $zero, $f4 -/* C81314 80241174 8E4200CC */ lw $v0, 0xcc($s2) -/* C81318 80241178 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C8131C 8024117C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C81320 80241180 46241083 */ div.d $f2, $f2, $f4 -/* C81324 80241184 462010A0 */ cvt.s.d $f2, $f2 -/* C81328 80241188 46240003 */ div.d $f0, $f0, $f4 -/* C8132C 8024118C 8C420020 */ lw $v0, 0x20($v0) -/* C81330 80241190 46200020 */ cvt.s.d $f0, $f0 -/* C81334 80241194 E622001C */ swc1 $f2, 0x1c($s1) -/* C81338 80241198 E6200014 */ swc1 $f0, 0x14($s1) -/* C8133C 8024119C AE220028 */ sw $v0, 0x28($s1) -/* C81340 802411A0 C6000018 */ lwc1 $f0, 0x18($s0) -/* C81344 802411A4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C81348 802411A8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C8134C 802411AC E6200018 */ swc1 $f0, 0x18($s1) -/* C81350 802411B0 8C460028 */ lw $a2, 0x28($v0) -/* C81354 802411B4 0C00A720 */ jal atan2 -/* C81358 802411B8 8C470030 */ lw $a3, 0x30($v0) -/* C8135C 802411BC E620000C */ swc1 $f0, 0xc($s1) -/* C81360 802411C0 8E420018 */ lw $v0, 0x18($s2) -/* C81364 802411C4 AE400074 */ sw $zero, 0x74($s2) -/* C81368 802411C8 9442002A */ lhu $v0, 0x2a($v0) -/* C8136C 802411CC 30420002 */ andi $v0, $v0, 2 -/* C81370 802411D0 10400005 */ beqz $v0, .L802411E8 -/* C81374 802411D4 24020003 */ addiu $v0, $zero, 3 -/* C81378 802411D8 A622008E */ sh $v0, 0x8e($s1) -/* C8137C 802411DC 2402000D */ addiu $v0, $zero, 0xd -/* C81380 802411E0 0809048E */ j .L80241238 -/* C81384 802411E4 AE620070 */ sw $v0, 0x70($s3) -.L802411E8: -/* C81388 802411E8 24030001 */ addiu $v1, $zero, 1 -/* C8138C 802411EC 2402000E */ addiu $v0, $zero, 0xe -/* C81390 802411F0 A623008E */ sh $v1, 0x8e($s1) -/* C81394 802411F4 AE620070 */ sw $v0, 0x70($s3) -/* C81398 802411F8 C6200038 */ lwc1 $f0, 0x38($s1) -/* C8139C 802411FC 4600018D */ trunc.w.s $f6, $f0 -/* C813A0 80241200 44023000 */ mfc1 $v0, $f6 -/* C813A4 80241204 00000000 */ nop -/* C813A8 80241208 A6420010 */ sh $v0, 0x10($s2) -/* C813AC 8024120C C620003C */ lwc1 $f0, 0x3c($s1) -/* C813B0 80241210 4600018D */ trunc.w.s $f6, $f0 -/* C813B4 80241214 44023000 */ mfc1 $v0, $f6 -/* C813B8 80241218 00000000 */ nop -/* C813BC 8024121C A6420012 */ sh $v0, 0x12($s2) -/* C813C0 80241220 C6200040 */ lwc1 $f0, 0x40($s1) -/* C813C4 80241224 A2430007 */ sb $v1, 7($s2) -/* C813C8 80241228 4600018D */ trunc.w.s $f6, $f0 -/* C813CC 8024122C 44023000 */ mfc1 $v0, $f6 -/* C813D0 80241230 00000000 */ nop -/* C813D4 80241234 A6420014 */ sh $v0, 0x14($s2) -.L80241238: -/* C813D8 80241238 8FBF0020 */ lw $ra, 0x20($sp) -/* C813DC 8024123C 8FB3001C */ lw $s3, 0x1c($sp) -/* C813E0 80241240 8FB20018 */ lw $s2, 0x18($sp) -/* C813E4 80241244 8FB10014 */ lw $s1, 0x14($sp) -/* C813E8 80241248 8FB00010 */ lw $s0, 0x10($sp) -/* C813EC 8024124C 03E00008 */ jr $ra -/* C813F0 80241250 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/func_80241648_C801A0.s b/asm/nonmatchings/world/area_kzn/kzn_11/func_80241648_C801A0.s deleted file mode 100644 index 6e586fb985..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/func_80241648_C801A0.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241648_C817E8 -/* C817E8 80241648 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C817EC 8024164C AFB00028 */ sw $s0, 0x28($sp) -/* C817F0 80241650 00A0802D */ daddu $s0, $a1, $zero -/* C817F4 80241654 AFB1002C */ sw $s1, 0x2c($sp) -/* C817F8 80241658 00C0882D */ daddu $s1, $a2, $zero -/* C817FC 8024165C AFBF0034 */ sw $ra, 0x34($sp) -/* C81800 80241660 AFB20030 */ sw $s2, 0x30($sp) -/* C81804 80241664 AE200070 */ sw $zero, 0x70($s1) -/* C81808 80241668 8C830000 */ lw $v1, ($a0) -/* C8180C 8024166C 2402FDFF */ addiu $v0, $zero, -0x201 -/* C81810 80241670 A480008E */ sh $zero, 0x8e($a0) -/* C81814 80241674 00621824 */ and $v1, $v1, $v0 -/* C81818 80241678 34650800 */ ori $a1, $v1, 0x800 -/* C8181C 8024167C AC850000 */ sw $a1, ($a0) -/* C81820 80241680 8E0200D0 */ lw $v0, 0xd0($s0) -/* C81824 80241684 8C420034 */ lw $v0, 0x34($v0) -/* C81828 80241688 10400003 */ beqz $v0, .L80241698 -/* C8182C 8024168C 00E0902D */ daddu $s2, $a3, $zero -/* C81830 80241690 080905A8 */ j .L802416A0 -/* C81834 80241694 34620808 */ ori $v0, $v1, 0x808 -.L80241698: -/* C81838 80241698 2402FFF7 */ addiu $v0, $zero, -9 -/* C8183C 8024169C 00A21024 */ and $v0, $a1, $v0 -.L802416A0: -/* C81840 802416A0 AC820000 */ sw $v0, ($a0) -/* C81844 802416A4 27A20024 */ addiu $v0, $sp, 0x24 -/* C81848 802416A8 27A50018 */ addiu $a1, $sp, 0x18 -/* C8184C 802416AC C4800038 */ lwc1 $f0, 0x38($a0) -/* C81850 802416B0 C482003C */ lwc1 $f2, 0x3c($a0) -/* C81854 802416B4 C4840040 */ lwc1 $f4, 0x40($a0) -/* C81858 802416B8 3C01447A */ lui $at, 0x447a -/* C8185C 802416BC 44813000 */ mtc1 $at, $f6 -/* C81860 802416C0 27A6001C */ addiu $a2, $sp, 0x1c -/* C81864 802416C4 E7A00018 */ swc1 $f0, 0x18($sp) -/* C81868 802416C8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C8186C 802416CC E7A40020 */ swc1 $f4, 0x20($sp) -/* C81870 802416D0 E7A60024 */ swc1 $f6, 0x24($sp) -/* C81874 802416D4 AFA20010 */ sw $v0, 0x10($sp) -/* C81878 802416D8 8C840080 */ lw $a0, 0x80($a0) -/* C8187C 802416DC 0C0372DF */ jal func_800DCB7C -/* C81880 802416E0 27A70020 */ addiu $a3, $sp, 0x20 -/* C81884 802416E4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* C81888 802416E8 3C014059 */ lui $at, 0x4059 -/* C8188C 802416EC 44812800 */ mtc1 $at, $f5 -/* C81890 802416F0 44802000 */ mtc1 $zero, $f4 -/* C81894 802416F4 460010A1 */ cvt.d.s $f2, $f2 -/* C81898 802416F8 46241082 */ mul.d $f2, $f2, $f4 -/* C8189C 802416FC 00000000 */ nop -/* C818A0 80241700 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C818A4 80241704 46000021 */ cvt.d.s $f0, $f0 -/* C818A8 80241708 46240002 */ mul.d $f0, $f0, $f4 -/* C818AC 8024170C 00000000 */ nop -/* C818B0 80241710 3C013FE0 */ lui $at, 0x3fe0 -/* C818B4 80241714 44812800 */ mtc1 $at, $f5 -/* C818B8 80241718 44802000 */ mtc1 $zero, $f4 -/* C818BC 8024171C 00000000 */ nop -/* C818C0 80241720 46241080 */ add.d $f2, $f2, $f4 -/* C818C4 80241724 AE000074 */ sw $zero, 0x74($s0) -/* C818C8 80241728 46240000 */ add.d $f0, $f0, $f4 -/* C818CC 8024172C AE000090 */ sw $zero, 0x90($s0) -/* C818D0 80241730 4620120D */ trunc.w.d $f8, $f2 -/* C818D4 80241734 E6080078 */ swc1 $f8, 0x78($s0) -/* C818D8 80241738 4620020D */ trunc.w.d $f8, $f0 -/* C818DC 8024173C E6080088 */ swc1 $f8, 0x88($s0) -/* C818E0 80241740 8E420014 */ lw $v0, 0x14($s2) -/* C818E4 80241744 AE220074 */ sw $v0, 0x74($s1) -/* C818E8 80241748 8E0200B0 */ lw $v0, 0xb0($s0) -/* C818EC 8024174C 34420010 */ ori $v0, $v0, 0x10 -/* C818F0 80241750 AE0200B0 */ sw $v0, 0xb0($s0) -/* C818F4 80241754 8FBF0034 */ lw $ra, 0x34($sp) -/* C818F8 80241758 8FB20030 */ lw $s2, 0x30($sp) -/* C818FC 8024175C 8FB1002C */ lw $s1, 0x2c($sp) -/* C81900 80241760 8FB00028 */ lw $s0, 0x28($sp) -/* C81904 80241764 03E00008 */ jr $ra -/* C81908 80241768 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/func_80241D08_C801A0.s b/asm/nonmatchings/world/area_kzn/kzn_11/func_80241D08_C801A0.s deleted file mode 100644 index 5bd4132314..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/func_80241D08_C801A0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D08_C81EA8 -/* C81EA8 80241D08 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C81EAC 80241D0C AFB10014 */ sw $s1, 0x14($sp) -/* C81EB0 80241D10 0080882D */ daddu $s1, $a0, $zero -/* C81EB4 80241D14 AFBF0018 */ sw $ra, 0x18($sp) -/* C81EB8 80241D18 AFB00010 */ sw $s0, 0x10($sp) -/* C81EBC 80241D1C 8E300148 */ lw $s0, 0x148($s1) -/* C81EC0 80241D20 0C00EABB */ jal get_npc_unsafe -/* C81EC4 80241D24 86040008 */ lh $a0, 8($s0) -/* C81EC8 80241D28 0040182D */ daddu $v1, $v0, $zero -/* C81ECC 80241D2C 9462008E */ lhu $v0, 0x8e($v1) -/* C81ED0 80241D30 2442FFFF */ addiu $v0, $v0, -1 -/* C81ED4 80241D34 A462008E */ sh $v0, 0x8e($v1) -/* C81ED8 80241D38 00021400 */ sll $v0, $v0, 0x10 -/* C81EDC 80241D3C 1C400004 */ bgtz $v0, .L80241D50 -/* C81EE0 80241D40 00000000 */ nop -/* C81EE4 80241D44 AE000074 */ sw $zero, 0x74($s0) -/* C81EE8 80241D48 A460008E */ sh $zero, 0x8e($v1) -/* C81EEC 80241D4C AE200070 */ sw $zero, 0x70($s1) -.L80241D50: -/* C81EF0 80241D50 8FBF0018 */ lw $ra, 0x18($sp) -/* C81EF4 80241D54 8FB10014 */ lw $s1, 0x14($sp) -/* C81EF8 80241D58 8FB00010 */ lw $s0, 0x10($sp) -/* C81EFC 80241D5C 03E00008 */ jr $ra -/* C81F00 80241D60 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/func_80241F4C_C801A0.s b/asm/nonmatchings/world/area_kzn/kzn_11/func_80241F4C_C801A0.s deleted file mode 100644 index 155f31cbe9..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/func_80241F4C_C801A0.s +++ /dev/null @@ -1,401 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F4C_C820EC -/* C820EC 80241F4C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C820F0 80241F50 AFB40028 */ sw $s4, 0x28($sp) -/* C820F4 80241F54 0080A02D */ daddu $s4, $a0, $zero -/* C820F8 80241F58 AFBF0038 */ sw $ra, 0x38($sp) -/* C820FC 80241F5C AFB70034 */ sw $s7, 0x34($sp) -/* C82100 80241F60 AFB60030 */ sw $s6, 0x30($sp) -/* C82104 80241F64 AFB5002C */ sw $s5, 0x2c($sp) -/* C82108 80241F68 AFB30024 */ sw $s3, 0x24($sp) -/* C8210C 80241F6C AFB20020 */ sw $s2, 0x20($sp) -/* C82110 80241F70 AFB1001C */ sw $s1, 0x1c($sp) -/* C82114 80241F74 AFB00018 */ sw $s0, 0x18($sp) -/* C82118 80241F78 F7B80050 */ sdc1 $f24, 0x50($sp) -/* C8211C 80241F7C F7B60048 */ sdc1 $f22, 0x48($sp) -/* C82120 80241F80 F7B40040 */ sdc1 $f20, 0x40($sp) -/* C82124 80241F84 8E82000C */ lw $v0, 0xc($s4) -/* C82128 80241F88 00A0802D */ daddu $s0, $a1, $zero -/* C8212C 80241F8C 8C450000 */ lw $a1, ($v0) -/* C82130 80241F90 0C0B1EAF */ jal get_variable -/* C82134 80241F94 0000A82D */ daddu $s5, $zero, $zero -/* C82138 80241F98 8E830148 */ lw $v1, 0x148($s4) -/* C8213C 80241F9C 84640008 */ lh $a0, 8($v1) -/* C82140 80241FA0 0C00EABB */ jal get_npc_unsafe -/* C82144 80241FA4 0040902D */ daddu $s2, $v0, $zero -/* C82148 80241FA8 0040882D */ daddu $s1, $v0, $zero -/* C8214C 80241FAC 0C00EABB */ jal get_npc_unsafe -/* C82150 80241FB0 2404FFFC */ addiu $a0, $zero, -4 -/* C82154 80241FB4 3C138011 */ lui $s3, %hi(gPlayerStatus) -/* C82158 80241FB8 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) -/* C8215C 80241FBC 3C168011 */ lui $s6, %hi(D_8010EBB0) -/* C82160 80241FC0 26D6EBB0 */ addiu $s6, $s6, %lo(D_8010EBB0) -/* C82164 80241FC4 1200001C */ beqz $s0, .L80242038 -/* C82168 80241FC8 0040B82D */ daddu $s7, $v0, $zero -/* C8216C 80241FCC 0C00AB39 */ jal heap_malloc -/* C82170 80241FD0 24040030 */ addiu $a0, $zero, 0x30 -/* C82174 80241FD4 0040802D */ daddu $s0, $v0, $zero -/* C82178 80241FD8 AE900074 */ sw $s0, 0x74($s4) -/* C8217C 80241FDC AE000000 */ sw $zero, ($s0) -/* C82180 80241FE0 C6400000 */ lwc1 $f0, ($s2) -/* C82184 80241FE4 46800020 */ cvt.s.w $f0, $f0 -/* C82188 80241FE8 E6000004 */ swc1 $f0, 4($s0) -/* C8218C 80241FEC C6400004 */ lwc1 $f0, 4($s2) -/* C82190 80241FF0 46800020 */ cvt.s.w $f0, $f0 -/* C82194 80241FF4 E6000008 */ swc1 $f0, 8($s0) -/* C82198 80241FF8 C6400008 */ lwc1 $f0, 8($s2) -/* C8219C 80241FFC 46800020 */ cvt.s.w $f0, $f0 -/* C821A0 80242000 E600000C */ swc1 $f0, 0xc($s0) -/* C821A4 80242004 C640000C */ lwc1 $f0, 0xc($s2) -/* C821A8 80242008 46800020 */ cvt.s.w $f0, $f0 -/* C821AC 8024200C E6000010 */ swc1 $f0, 0x10($s0) -/* C821B0 80242010 8E420010 */ lw $v0, 0x10($s2) -/* C821B4 80242014 AE020014 */ sw $v0, 0x14($s0) -/* C821B8 80242018 8E420014 */ lw $v0, 0x14($s2) -/* C821BC 8024201C AE020018 */ sw $v0, 0x18($s0) -/* C821C0 80242020 8E420018 */ lw $v0, 0x18($s2) -/* C821C4 80242024 AE000020 */ sw $zero, 0x20($s0) -/* C821C8 80242028 AE000024 */ sw $zero, 0x24($s0) -/* C821CC 8024202C AE000028 */ sw $zero, 0x28($s0) -/* C821D0 80242030 AE12002C */ sw $s2, 0x2c($s0) -/* C821D4 80242034 AE02001C */ sw $v0, 0x1c($s0) -.L80242038: -/* C821D8 80242038 0C009C64 */ jal func_80027190 -/* C821DC 8024203C 00000000 */ nop -/* C821E0 80242040 14400131 */ bnez $v0, .L80242508 -/* C821E4 80242044 0000102D */ daddu $v0, $zero, $zero -/* C821E8 80242048 8E900074 */ lw $s0, 0x74($s4) -/* C821EC 8024204C 8E020018 */ lw $v0, 0x18($s0) -/* C821F0 80242050 02A2102A */ slt $v0, $s5, $v0 -/* C821F4 80242054 10400082 */ beqz $v0, .L80242260 -/* C821F8 80242058 0000902D */ daddu $s2, $zero, $zero -/* C821FC 8024205C 3C013F00 */ lui $at, 0x3f00 -/* C82200 80242060 4481C000 */ mtc1 $at, $f24 -.L80242064: -/* C82204 80242064 8E040014 */ lw $a0, 0x14($s0) -/* C82208 80242068 0C00EABB */ jal get_npc_unsafe -/* C8220C 8024206C 00922021 */ addu $a0, $a0, $s2 -/* C82210 80242070 8E030000 */ lw $v1, ($s0) -/* C82214 80242074 30630001 */ andi $v1, $v1, 1 -/* C82218 80242078 14600020 */ bnez $v1, .L802420FC -/* C8221C 8024207C 0040882D */ daddu $s1, $v0, $zero -/* C82220 80242080 862200A6 */ lh $v0, 0xa6($s1) -/* C82224 80242084 02420018 */ mult $s2, $v0 -/* C82228 80242088 00004012 */ mflo $t0 -/* C8222C 8024208C C6200054 */ lwc1 $f0, 0x54($s1) -/* C82230 80242090 4488A000 */ mtc1 $t0, $f20 -/* C82234 80242094 00000000 */ nop -/* C82238 80242098 4680A520 */ cvt.s.w $f20, $f20 -/* C8223C 8024209C 4600A502 */ mul.s $f20, $f20, $f0 -/* C82240 802420A0 00000000 */ nop -/* C82244 802420A4 0C00A8BB */ jal sin_deg -/* C82248 802420A8 C60C0028 */ lwc1 $f12, 0x28($s0) -/* C8224C 802420AC C60C0028 */ lwc1 $f12, 0x28($s0) -/* C82250 802420B0 4600A582 */ mul.s $f22, $f20, $f0 -/* C82254 802420B4 0C00A8D4 */ jal cos_deg -/* C82258 802420B8 00000000 */ nop -/* C8225C 802420BC C6020004 */ lwc1 $f2, 4($s0) -/* C82260 802420C0 46161080 */ add.s $f2, $f2, $f22 -/* C82264 802420C4 4600A507 */ neg.s $f20, $f20 -/* C82268 802420C8 4600A502 */ mul.s $f20, $f20, $f0 -/* C8226C 802420CC 00000000 */ nop -/* C82270 802420D0 E6220038 */ swc1 $f2, 0x38($s1) -/* C82274 802420D4 C6000008 */ lwc1 $f0, 8($s0) -/* C82278 802420D8 E620003C */ swc1 $f0, 0x3c($s1) -/* C8227C 802420DC C60E000C */ lwc1 $f14, 0xc($s0) -/* C82280 802420E0 46147380 */ add.s $f14, $f14, $f20 -/* C82284 802420E4 E62E0040 */ swc1 $f14, 0x40($s1) -/* C82288 802420E8 8E660028 */ lw $a2, 0x28($s3) -/* C8228C 802420EC 8E670030 */ lw $a3, 0x30($s3) -/* C82290 802420F0 0C00A720 */ jal atan2 -/* C82294 802420F4 46001306 */ mov.s $f12, $f2 -/* C82298 802420F8 E620000C */ swc1 $f0, 0xc($s1) -.L802420FC: -/* C8229C 802420FC 8E020000 */ lw $v0, ($s0) -/* C822A0 80242100 30420002 */ andi $v0, $v0, 2 -/* C822A4 80242104 14400051 */ bnez $v0, .L8024224C -/* C822A8 80242108 00000000 */ nop -/* C822AC 8024210C 8E620000 */ lw $v0, ($s3) -/* C822B0 80242110 30428000 */ andi $v0, $v0, 0x8000 -/* C822B4 80242114 1440004D */ bnez $v0, .L8024224C -/* C822B8 80242118 24020001 */ addiu $v0, $zero, 1 -/* C822BC 8024211C C664002C */ lwc1 $f4, 0x2c($s3) -/* C822C0 80242120 C622003C */ lwc1 $f2, 0x3c($s1) -/* C822C4 80242124 82C30000 */ lb $v1, ($s6) -/* C822C8 80242128 1462000F */ bne $v1, $v0, .L80242168 -/* C822CC 8024212C 46022181 */ sub.s $f6, $f4, $f2 -/* C822D0 80242130 82C30003 */ lb $v1, 3($s6) -/* C822D4 80242134 24020008 */ addiu $v0, $zero, 8 -/* C822D8 80242138 14620004 */ bne $v1, $v0, .L8024214C -/* C822DC 8024213C 24020004 */ addiu $v0, $zero, 4 -/* C822E0 80242140 C6E0003C */ lwc1 $f0, 0x3c($s7) -/* C822E4 80242144 0809085A */ j .L80242168 -/* C822E8 80242148 46020181 */ sub.s $f6, $f0, $f2 -.L8024214C: -/* C822EC 8024214C 14620006 */ bne $v1, $v0, .L80242168 -/* C822F0 80242150 00000000 */ nop -/* C822F4 80242154 3C014120 */ lui $at, 0x4120 -/* C822F8 80242158 44810000 */ mtc1 $at, $f0 -/* C822FC 8024215C 00000000 */ nop -/* C82300 80242160 46002001 */ sub.s $f0, $f4, $f0 -/* C82304 80242164 46020181 */ sub.s $f6, $f0, $f2 -.L80242168: -/* C82308 80242168 862200A8 */ lh $v0, 0xa8($s1) -/* C8230C 8024216C 3C013F4C */ lui $at, 0x3f4c -/* C82310 80242170 3421CCCD */ ori $at, $at, 0xcccd -/* C82314 80242174 44810000 */ mtc1 $at, $f0 -/* C82318 80242178 44822000 */ mtc1 $v0, $f4 -/* C8231C 8024217C 00000000 */ nop -/* C82320 80242180 46802120 */ cvt.s.w $f4, $f4 -/* C82324 80242184 46002102 */ mul.s $f4, $f4, $f0 -/* C82328 80242188 00000000 */ nop -/* C8232C 8024218C C6620028 */ lwc1 $f2, 0x28($s3) -/* C82330 80242190 C6200038 */ lwc1 $f0, 0x38($s1) -/* C82334 80242194 46001581 */ sub.s $f22, $f2, $f0 -/* C82338 80242198 C6620030 */ lwc1 $f2, 0x30($s3) -/* C8233C 8024219C C6200040 */ lwc1 $f0, 0x40($s1) -/* C82340 802421A0 46001501 */ sub.s $f20, $f2, $f0 -/* C82344 802421A4 46003005 */ abs.s $f0, $f6 -/* C82348 802421A8 4604003C */ c.lt.s $f0, $f4 -/* C8234C 802421AC 00000000 */ nop -/* C82350 802421B0 45000026 */ bc1f .L8024224C -/* C82354 802421B4 00000000 */ nop -/* C82358 802421B8 4616B082 */ mul.s $f2, $f22, $f22 -/* C8235C 802421BC 00000000 */ nop -/* C82360 802421C0 4614A002 */ mul.s $f0, $f20, $f20 -/* C82364 802421C4 00000000 */ nop -/* C82368 802421C8 46001300 */ add.s $f12, $f2, $f0 -/* C8236C 802421CC 46006104 */ sqrt.s $f4, $f12 -/* C82370 802421D0 46042032 */ c.eq.s $f4, $f4 -/* C82374 802421D4 00000000 */ nop -/* C82378 802421D8 45010004 */ bc1t .L802421EC -/* C8237C 802421DC 00000000 */ nop -/* C82380 802421E0 0C0187BC */ jal sqrtf -/* C82384 802421E4 00000000 */ nop -/* C82388 802421E8 46000106 */ mov.s $f4, $f0 -.L802421EC: -/* C8238C 802421EC 862200A6 */ lh $v0, 0xa6($s1) -/* C82390 802421F0 44821000 */ mtc1 $v0, $f2 -/* C82394 802421F4 00000000 */ nop -/* C82398 802421F8 468010A0 */ cvt.s.w $f2, $f2 -/* C8239C 802421FC 46181082 */ mul.s $f2, $f2, $f24 -/* C823A0 80242200 00000000 */ nop -/* C823A4 80242204 C6200054 */ lwc1 $f0, 0x54($s1) -/* C823A8 80242208 46001082 */ mul.s $f2, $f2, $f0 -/* C823AC 8024220C 00000000 */ nop -/* C823B0 80242210 866200B2 */ lh $v0, 0xb2($s3) -/* C823B4 80242214 44820000 */ mtc1 $v0, $f0 -/* C823B8 80242218 00000000 */ nop -/* C823BC 8024221C 46800020 */ cvt.s.w $f0, $f0 -/* C823C0 80242220 46180002 */ mul.s $f0, $f0, $f24 -/* C823C4 80242224 00000000 */ nop -/* C823C8 80242228 46181082 */ mul.s $f2, $f2, $f24 -/* C823CC 8024222C 00000000 */ nop -/* C823D0 80242230 46180002 */ mul.s $f0, $f0, $f24 -/* C823D4 80242234 00000000 */ nop -/* C823D8 80242238 46001080 */ add.s $f2, $f2, $f0 -/* C823DC 8024223C 4602203E */ c.le.s $f4, $f2 -/* C823E0 80242240 00000000 */ nop -/* C823E4 80242244 45030001 */ bc1tl .L8024224C -/* C823E8 80242248 24150001 */ addiu $s5, $zero, 1 -.L8024224C: -/* C823EC 8024224C 8E020018 */ lw $v0, 0x18($s0) -/* C823F0 80242250 26520001 */ addiu $s2, $s2, 1 -/* C823F4 80242254 0242102A */ slt $v0, $s2, $v0 -/* C823F8 80242258 1440FF82 */ bnez $v0, .L80242064 -/* C823FC 8024225C 00000000 */ nop -.L80242260: -/* C82400 80242260 8E620000 */ lw $v0, ($s3) -/* C82404 80242264 30428000 */ andi $v0, $v0, 0x8000 -/* C82408 80242268 54400001 */ bnel $v0, $zero, .L80242270 -/* C8240C 8024226C 2415FFFF */ addiu $s5, $zero, -1 -.L80242270: -/* C82410 80242270 C60C0028 */ lwc1 $f12, 0x28($s0) -/* C82414 80242274 C6000010 */ lwc1 $f0, 0x10($s0) -/* C82418 80242278 46006300 */ add.s $f12, $f12, $f0 -/* C8241C 8024227C 0C00A6C9 */ jal clamp_angle -/* C82420 80242280 E60C0028 */ swc1 $f12, 0x28($s0) -/* C82424 80242284 C6020028 */ lwc1 $f2, 0x28($s0) -/* C82428 80242288 46000106 */ mov.s $f4, $f0 -/* C8242C 8024228C 46022032 */ c.eq.s $f4, $f2 -/* C82430 80242290 00000000 */ nop -/* C82434 80242294 4501000D */ bc1t .L802422CC -/* C82438 80242298 00000000 */ nop -/* C8243C 8024229C 8E020020 */ lw $v0, 0x20($s0) -/* C82440 802422A0 C600000C */ lwc1 $f0, 0xc($s0) -/* C82444 802422A4 E6040028 */ swc1 $f4, 0x28($s0) -/* C82448 802422A8 00021080 */ sll $v0, $v0, 2 -/* C8244C 802422AC E7A00010 */ swc1 $f0, 0x10($sp) -/* C82450 802422B0 3C048024 */ lui $a0, 0x8024 -/* C82454 802422B4 00822021 */ addu $a0, $a0, $v0 -/* C82458 802422B8 8C8437B4 */ lw $a0, 0x37b4($a0) -/* C8245C 802422BC 8E060004 */ lw $a2, 4($s0) -/* C82460 802422C0 8E070008 */ lw $a3, 8($s0) -/* C82464 802422C4 0C052757 */ jal play_sound_at_position -/* C82468 802422C8 0000282D */ daddu $a1, $zero, $zero -.L802422CC: -/* C8246C 802422CC C60C0004 */ lwc1 $f12, 4($s0) -/* C82470 802422D0 C60E000C */ lwc1 $f14, 0xc($s0) -/* C82474 802422D4 8E660028 */ lw $a2, 0x28($s3) -/* C82478 802422D8 0C00A7B5 */ jal dist2D -/* C8247C 802422DC 8E670030 */ lw $a3, 0x30($s3) -/* C82480 802422E0 C60C0004 */ lwc1 $f12, 4($s0) -/* C82484 802422E4 C60E000C */ lwc1 $f14, 0xc($s0) -/* C82488 802422E8 8E260038 */ lw $a2, 0x38($s1) -/* C8248C 802422EC 8E270040 */ lw $a3, 0x40($s1) -/* C82490 802422F0 0C00A7B5 */ jal dist2D -/* C82494 802422F4 46000586 */ mov.s $f22, $f0 -/* C82498 802422F8 862200A6 */ lh $v0, 0xa6($s1) -/* C8249C 802422FC 3C013F00 */ lui $at, 0x3f00 -/* C824A0 80242300 44813000 */ mtc1 $at, $f6 -/* C824A4 80242304 44821000 */ mtc1 $v0, $f2 -/* C824A8 80242308 00000000 */ nop -/* C824AC 8024230C 468010A0 */ cvt.s.w $f2, $f2 -/* C824B0 80242310 46061082 */ mul.s $f2, $f2, $f6 -/* C824B4 80242314 00000000 */ nop -/* C824B8 80242318 C6240054 */ lwc1 $f4, 0x54($s1) -/* C824BC 8024231C 46041082 */ mul.s $f2, $f2, $f4 -/* C824C0 80242320 00000000 */ nop -/* C824C4 80242324 866200B2 */ lh $v0, 0xb2($s3) -/* C824C8 80242328 44822000 */ mtc1 $v0, $f4 -/* C824CC 8024232C 00000000 */ nop -/* C824D0 80242330 46802120 */ cvt.s.w $f4, $f4 -/* C824D4 80242334 46062102 */ mul.s $f4, $f4, $f6 -/* C824D8 80242338 00000000 */ nop -/* C824DC 8024233C 46061082 */ mul.s $f2, $f2, $f6 -/* C824E0 80242340 00000000 */ nop -/* C824E4 80242344 46062102 */ mul.s $f4, $f4, $f6 -/* C824E8 80242348 00000000 */ nop -/* C824EC 8024234C C60C0004 */ lwc1 $f12, 4($s0) -/* C824F0 80242350 C60E000C */ lwc1 $f14, 0xc($s0) -/* C824F4 80242354 46020000 */ add.s $f0, $f0, $f2 -/* C824F8 80242358 8E660028 */ lw $a2, 0x28($s3) -/* C824FC 8024235C 8E670030 */ lw $a3, 0x30($s3) -/* C82500 80242360 0C00A720 */ jal atan2 -/* C82504 80242364 46040600 */ add.s $f24, $f0, $f4 -/* C82508 80242368 C60C0004 */ lwc1 $f12, 4($s0) -/* C8250C 8024236C C60E000C */ lwc1 $f14, 0xc($s0) -/* C82510 80242370 8E260038 */ lw $a2, 0x38($s1) -/* C82514 80242374 8E270040 */ lw $a3, 0x40($s1) -/* C82518 80242378 0C00A720 */ jal atan2 -/* C8251C 8024237C 46000506 */ mov.s $f20, $f0 -/* C82520 80242380 4600A306 */ mov.s $f12, $f20 -/* C82524 80242384 0C00A70A */ jal get_clamped_angle_diff -/* C82528 80242388 46000386 */ mov.s $f14, $f0 -/* C8252C 8024238C 1AA0002A */ blez $s5, .L80242438 -/* C82530 80242390 46000506 */ mov.s $f20, $f0 -/* C82534 80242394 826300B4 */ lb $v1, 0xb4($s3) -/* C82538 80242398 24020015 */ addiu $v0, $zero, 0x15 -/* C8253C 8024239C 10620026 */ beq $v1, $v0, .L80242438 -/* C82540 802423A0 0040202D */ daddu $a0, $v0, $zero -/* C82544 802423A4 24020003 */ addiu $v0, $zero, 3 -/* C82548 802423A8 0C039769 */ jal set_action_state -/* C8254C 802423AC A26200BF */ sb $v0, 0xbf($s3) -/* C82550 802423B0 240400E8 */ addiu $a0, $zero, 0xe8 -/* C82554 802423B4 8E660028 */ lw $a2, 0x28($s3) -/* C82558 802423B8 8E67002C */ lw $a3, 0x2c($s3) -/* C8255C 802423BC C6600030 */ lwc1 $f0, 0x30($s3) -/* C82560 802423C0 0000282D */ daddu $a1, $zero, $zero -/* C82564 802423C4 0C052757 */ jal play_sound_at_position -/* C82568 802423C8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C8256C 802423CC 2402002D */ addiu $v0, $zero, 0x2d -/* C82570 802423D0 3C01800B */ lui $at, 0x800b -/* C82574 802423D4 A0220F1A */ sb $v0, 0xf1a($at) -/* C82578 802423D8 C6600028 */ lwc1 $f0, 0x28($s3) -/* C8257C 802423DC C6620030 */ lwc1 $f2, 0x30($s3) -/* C82580 802423E0 2402002D */ addiu $v0, $zero, 0x2d -/* C82584 802423E4 A6620010 */ sh $v0, 0x10($s3) -/* C82588 802423E8 4600020D */ trunc.w.s $f8, $f0 -/* C8258C 802423EC 44024000 */ mfc1 $v0, $f8 -/* C82590 802423F0 C660002C */ lwc1 $f0, 0x2c($s3) -/* C82594 802423F4 A6620016 */ sh $v0, 0x16($s3) -/* C82598 802423F8 4600020D */ trunc.w.s $f8, $f0 -/* C8259C 802423FC 44024000 */ mfc1 $v0, $f8 -/* C825A0 80242400 00000000 */ nop -/* C825A4 80242404 A6620018 */ sh $v0, 0x18($s3) -/* C825A8 80242408 4600120D */ trunc.w.s $f8, $f2 -/* C825AC 8024240C 44024000 */ mfc1 $v0, $f8 -/* C825B0 80242410 00000000 */ nop -/* C825B4 80242414 A662001A */ sh $v0, 0x1a($s3) -/* C825B8 80242418 8E02001C */ lw $v0, 0x1c($s0) -/* C825BC 8024241C 10400033 */ beqz $v0, .L802424EC -/* C825C0 80242420 AE000020 */ sw $zero, 0x20($s0) -/* C825C4 80242424 0200202D */ daddu $a0, $s0, $zero -/* C825C8 80242428 0040F809 */ jalr $v0 -/* C825CC 8024242C 24050002 */ addiu $a1, $zero, 2 -/* C825D0 80242430 0809093B */ j .L802424EC -/* C825D4 80242434 00000000 */ nop -.L80242438: -/* C825D8 80242438 4618B03C */ c.lt.s $f22, $f24 -/* C825DC 8024243C 00000000 */ nop -/* C825E0 80242440 4500002A */ bc1f .L802424EC -/* C825E4 80242444 00000000 */ nop -/* C825E8 80242448 8E020000 */ lw $v0, ($s0) -/* C825EC 8024244C 30420002 */ andi $v0, $v0, 2 -/* C825F0 80242450 14400026 */ bnez $v0, .L802424EC -/* C825F4 80242454 00000000 */ nop -/* C825F8 80242458 16A00024 */ bnez $s5, .L802424EC -/* C825FC 8024245C 24020015 */ addiu $v0, $zero, 0x15 -/* C82600 80242460 826300B4 */ lb $v1, 0xb4($s3) -/* C82604 80242464 10620021 */ beq $v1, $v0, .L802424EC -/* C82608 80242468 00000000 */ nop -/* C8260C 8024246C C6000010 */ lwc1 $f0, 0x10($s0) -/* C82610 80242470 44801000 */ mtc1 $zero, $f2 -/* C82614 80242474 00000000 */ nop -/* C82618 80242478 4600103C */ c.lt.s $f2, $f0 -/* C8261C 8024247C 00000000 */ nop -/* C82620 80242480 45000009 */ bc1f .L802424A8 -/* C82624 80242484 00000000 */ nop -/* C82628 80242488 C6000024 */ lwc1 $f0, 0x24($s0) -/* C8262C 8024248C 4602003C */ c.lt.s $f0, $f2 -/* C82630 80242490 00000000 */ nop -/* C82634 80242494 45000015 */ bc1f .L802424EC -/* C82638 80242498 00000000 */ nop -/* C8263C 8024249C 4614103C */ c.lt.s $f2, $f20 -/* C82640 802424A0 08090931 */ j .L802424C4 -/* C82644 802424A4 00000000 */ nop -.L802424A8: -/* C82648 802424A8 C6000024 */ lwc1 $f0, 0x24($s0) -/* C8264C 802424AC 4600103C */ c.lt.s $f2, $f0 -/* C82650 802424B0 00000000 */ nop -/* C82654 802424B4 4500000D */ bc1f .L802424EC -/* C82658 802424B8 00000000 */ nop -/* C8265C 802424BC 4602A03C */ c.lt.s $f20, $f2 -/* C82660 802424C0 00000000 */ nop -.L802424C4: -/* C82664 802424C4 45000009 */ bc1f .L802424EC -/* C82668 802424C8 00000000 */ nop -/* C8266C 802424CC 8E020020 */ lw $v0, 0x20($s0) -/* C82670 802424D0 8E03001C */ lw $v1, 0x1c($s0) -/* C82674 802424D4 24420001 */ addiu $v0, $v0, 1 -/* C82678 802424D8 10600004 */ beqz $v1, .L802424EC -/* C8267C 802424DC AE020020 */ sw $v0, 0x20($s0) -/* C82680 802424E0 0200202D */ daddu $a0, $s0, $zero -/* C82684 802424E4 0060F809 */ jalr $v1 -/* C82688 802424E8 24050001 */ addiu $a1, $zero, 1 -.L802424EC: -/* C8268C 802424EC 8E02001C */ lw $v0, 0x1c($s0) -/* C82690 802424F0 10400004 */ beqz $v0, .L80242504 -/* C82694 802424F4 E6140024 */ swc1 $f20, 0x24($s0) -/* C82698 802424F8 0200202D */ daddu $a0, $s0, $zero -/* C8269C 802424FC 0040F809 */ jalr $v0 -/* C826A0 80242500 0000282D */ daddu $a1, $zero, $zero -.L80242504: -/* C826A4 80242504 0000102D */ daddu $v0, $zero, $zero -.L80242508: -/* C826A8 80242508 8FBF0038 */ lw $ra, 0x38($sp) -/* C826AC 8024250C 8FB70034 */ lw $s7, 0x34($sp) -/* C826B0 80242510 8FB60030 */ lw $s6, 0x30($sp) -/* C826B4 80242514 8FB5002C */ lw $s5, 0x2c($sp) -/* C826B8 80242518 8FB40028 */ lw $s4, 0x28($sp) -/* C826BC 8024251C 8FB30024 */ lw $s3, 0x24($sp) -/* C826C0 80242520 8FB20020 */ lw $s2, 0x20($sp) -/* C826C4 80242524 8FB1001C */ lw $s1, 0x1c($sp) -/* C826C8 80242528 8FB00018 */ lw $s0, 0x18($sp) -/* C826CC 8024252C D7B80050 */ ldc1 $f24, 0x50($sp) -/* C826D0 80242530 D7B60048 */ ldc1 $f22, 0x48($sp) -/* C826D4 80242534 D7B40040 */ ldc1 $f20, 0x40($sp) -/* C826D8 80242538 03E00008 */ jr $ra -/* C826DC 8024253C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/func_80242540_C801A0.s b/asm/nonmatchings/world/area_kzn/kzn_11/func_80242540_C801A0.s deleted file mode 100644 index b28744e28c..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/func_80242540_C801A0.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242540_C826E0 -/* C826E0 80242540 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C826E4 80242544 AFB00010 */ sw $s0, 0x10($sp) -/* C826E8 80242548 0080802D */ daddu $s0, $a0, $zero -/* C826EC 8024254C 24020001 */ addiu $v0, $zero, 1 -/* C826F0 80242550 10A20019 */ beq $a1, $v0, .L802425B8 -/* C826F4 80242554 AFBF0014 */ sw $ra, 0x14($sp) -/* C826F8 80242558 28A20002 */ slti $v0, $a1, 2 -/* C826FC 8024255C 50400005 */ beql $v0, $zero, .L80242574 -/* C82700 80242560 24020002 */ addiu $v0, $zero, 2 -/* C82704 80242564 10A00007 */ beqz $a1, .L80242584 -/* C82708 80242568 00000000 */ nop -/* C8270C 8024256C 08090993 */ j .L8024264C -/* C82710 80242570 00000000 */ nop -.L80242574: -/* C82714 80242574 10A20028 */ beq $a1, $v0, .L80242618 -/* C82718 80242578 00000000 */ nop -/* C8271C 8024257C 08090993 */ j .L8024264C -/* C82720 80242580 00000000 */ nop -.L80242584: -/* C82724 80242584 8E020000 */ lw $v0, ($s0) -/* C82728 80242588 30420002 */ andi $v0, $v0, 2 -/* C8272C 8024258C 1040002F */ beqz $v0, .L8024264C -/* C82730 80242590 00000000 */ nop -/* C82734 80242594 C6000010 */ lwc1 $f0, 0x10($s0) -/* C82738 80242598 3C013F73 */ lui $at, 0x3f73 -/* C8273C 8024259C 34213333 */ ori $at, $at, 0x3333 -/* C82740 802425A0 44811000 */ mtc1 $at, $f2 -/* C82744 802425A4 00000000 */ nop -/* C82748 802425A8 46020002 */ mul.s $f0, $f0, $f2 -/* C8274C 802425AC 00000000 */ nop -/* C82750 802425B0 08090993 */ j .L8024264C -/* C82754 802425B4 E6000010 */ swc1 $f0, 0x10($s0) -.L802425B8: -/* C82758 802425B8 C6000010 */ lwc1 $f0, 0x10($s0) -/* C8275C 802425BC 3C013F8F */ lui $at, 0x3f8f -/* C82760 802425C0 34215C29 */ ori $at, $at, 0x5c29 -/* C82764 802425C4 44811000 */ mtc1 $at, $f2 -/* C82768 802425C8 00000000 */ nop -/* C8276C 802425CC 46020002 */ mul.s $f0, $f0, $f2 -/* C82770 802425D0 00000000 */ nop -/* C82774 802425D4 8E030020 */ lw $v1, 0x20($s0) -/* C82778 802425D8 2402000A */ addiu $v0, $zero, 0xa -/* C8277C 802425DC 1462001B */ bne $v1, $v0, .L8024264C -/* C82780 802425E0 E6000010 */ swc1 $f0, 0x10($s0) -/* C82784 802425E4 3C048024 */ lui $a0, 0x8024 -/* C82788 802425E8 248437E0 */ addiu $a0, $a0, 0x37e0 -/* C8278C 802425EC 24050001 */ addiu $a1, $zero, 1 -/* C82790 802425F0 0C0B0CF8 */ jal start_script -/* C82794 802425F4 0000302D */ daddu $a2, $zero, $zero -/* C82798 802425F8 8E030014 */ lw $v1, 0x14($s0) -/* C8279C 802425FC AC430084 */ sw $v1, 0x84($v0) -/* C827A0 80242600 8E030018 */ lw $v1, 0x18($s0) -/* C827A4 80242604 AC430088 */ sw $v1, 0x88($v0) -/* C827A8 80242608 8E020000 */ lw $v0, ($s0) -/* C827AC 8024260C 34420002 */ ori $v0, $v0, 2 -/* C827B0 80242610 08090993 */ j .L8024264C -/* C827B4 80242614 AE020000 */ sw $v0, ($s0) -.L80242618: -/* C827B8 80242618 C60C0010 */ lwc1 $f12, 0x10($s0) -/* C827BC 8024261C 0C00A69F */ jal signF -/* C827C0 80242620 46006307 */ neg.s $f12, $f12 -/* C827C4 80242624 8E02002C */ lw $v0, 0x2c($s0) -/* C827C8 80242628 8C42000C */ lw $v0, 0xc($v0) -/* C827CC 8024262C 04420001 */ bltzl $v0, .L80242634 -/* C827D0 80242630 00021023 */ negu $v0, $v0 -.L80242634: -/* C827D4 80242634 44821000 */ mtc1 $v0, $f2 -/* C827D8 80242638 00000000 */ nop -/* C827DC 8024263C 468010A0 */ cvt.s.w $f2, $f2 -/* C827E0 80242640 46001082 */ mul.s $f2, $f2, $f0 -/* C827E4 80242644 00000000 */ nop -/* C827E8 80242648 E6020010 */ swc1 $f2, 0x10($s0) -.L8024264C: -/* C827EC 8024264C 8FBF0014 */ lw $ra, 0x14($sp) -/* C827F0 80242650 8FB00010 */ lw $s0, 0x10($sp) -/* C827F4 80242654 03E00008 */ jr $ra -/* C827F8 80242658 27BD0018 */ addiu $sp, $sp, 0x18 -/* C827FC 8024265C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80240124_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80240124_C85AB0.s deleted file mode 100644 index f0441dea86..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80240124_C85AB0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C85BD4 -/* C85BD4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C85BD8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C85BDC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C85BE0 80240130 10A00005 */ beqz $a1, .L80240148 -/* C85BE4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C85BE8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C85BEC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C85BF0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C85BF4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C85BF8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C85BFC 8024014C 1440000E */ bnez $v0, .L80240188 -/* C85C00 80240150 00000000 */ nop -/* C85C04 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C85C08 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C85C0C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C85C10 80240160 04610004 */ bgez $v1, .L80240174 -/* C85C14 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C85C18 80240168 3C020002 */ lui $v0, 2 -/* C85C1C 8024016C 08090061 */ j .L80240184 -/* C85C20 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C85C24 80240174 3C040002 */ lui $a0, 2 -/* C85C28 80240178 0083102A */ slt $v0, $a0, $v1 -/* C85C2C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C85C30 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C85C34 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C85C38 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C85C3C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C85C40 80240190 00000000 */ nop -/* C85C44 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C85C48 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C85C4C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C85C50 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C85C54 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C85C58 802401A8 3C020002 */ lui $v0, 2 -/* C85C5C 802401AC 08090071 */ j .L802401C4 -/* C85C60 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C85C64 802401B4 3C040002 */ lui $a0, 2 -/* C85C68 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C85C6C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C85C70 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C85C74 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C85C78 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C85C7C 802401CC 1440000E */ bnez $v0, .L80240208 -/* C85C80 802401D0 00000000 */ nop -/* C85C84 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C85C88 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C85C8C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C85C90 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C85C94 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C85C98 802401E8 3C020002 */ lui $v0, 2 -/* C85C9C 802401EC 08090081 */ j .L80240204 -/* C85CA0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C85CA4 802401F4 3C040002 */ lui $a0, 2 -/* C85CA8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C85CAC 802401FC 10400002 */ beqz $v0, .L80240208 -/* C85CB0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C85CB4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C85CB8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C85CBC 8024020C 1440000E */ bnez $v0, .L80240248 -/* C85CC0 80240210 00000000 */ nop -/* C85CC4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C85CC8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C85CCC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C85CD0 80240220 04610004 */ bgez $v1, .L80240234 -/* C85CD4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C85CD8 80240228 3C020002 */ lui $v0, 2 -/* C85CDC 8024022C 08090091 */ j .L80240244 -/* C85CE0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C85CE4 80240234 3C040002 */ lui $a0, 2 -/* C85CE8 80240238 0083102A */ slt $v0, $a0, $v1 -/* C85CEC 8024023C 10400002 */ beqz $v0, .L80240248 -/* C85CF0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C85CF4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C85CF8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C85CFC 8024024C 0C046F07 */ jal set_main_pan_u -/* C85D00 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C85D04 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C85D08 80240258 0C046F0D */ jal set_main_pan_v -/* C85D0C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C85D10 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C85D14 80240264 0C046F13 */ jal set_aux_pan_u -/* C85D18 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C85D1C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C85D20 80240270 0C046F19 */ jal set_aux_pan_v -/* C85D24 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C85D28 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C85D2C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C85D30 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C85D34 80240284 24420001 */ addiu $v0, $v0, 1 -/* C85D38 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C85D3C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C85D40 80240290 24630001 */ addiu $v1, $v1, 1 -/* C85D44 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C85D48 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C85D4C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C85D50 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C85D54 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C85D58 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C85D5C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C85D60 802402B0 14600002 */ bnez $v1, .L802402BC -/* C85D64 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C85D68 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C85D6C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C85D70 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C85D74 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C85D78 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C85D7C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C85D80 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C85D84 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C85D88 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C85D8C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C85D90 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C85D94 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C85D98 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C85D9C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C85DA0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C85DA4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C85DA8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C85DAC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C85DB0 80240300 0000102D */ daddu $v0, $zero, $zero -/* C85DB4 80240304 03E00008 */ jr $ra -/* C85DB8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C85DBC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80240310_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80240310_C85AB0.s deleted file mode 100644 index f60311e138..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80240310_C85AB0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_C85DC0 -/* C85DC0 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C85DC4 80240314 AFB10014 */ sw $s1, 0x14($sp) -/* C85DC8 80240318 0080882D */ daddu $s1, $a0, $zero -/* C85DCC 8024031C AFBF0018 */ sw $ra, 0x18($sp) -/* C85DD0 80240320 AFB00010 */ sw $s0, 0x10($sp) -/* C85DD4 80240324 8E300148 */ lw $s0, 0x148($s1) -/* C85DD8 80240328 0C00EABB */ jal get_npc_unsafe -/* C85DDC 8024032C 86040008 */ lh $a0, 8($s0) -/* C85DE0 80240330 24030001 */ addiu $v1, $zero, 1 -/* C85DE4 80240334 0040202D */ daddu $a0, $v0, $zero -/* C85DE8 80240338 AE03006C */ sw $v1, 0x6c($s0) -/* C85DEC 8024033C 8482008C */ lh $v0, 0x8c($a0) -/* C85DF0 80240340 14400009 */ bnez $v0, .L80240368 -/* C85DF4 80240344 24020002 */ addiu $v0, $zero, 2 -/* C85DF8 80240348 96030072 */ lhu $v1, 0x72($s0) -/* C85DFC 8024034C AE02006C */ sw $v0, 0x6c($s0) -/* C85E00 80240350 A483008E */ sh $v1, 0x8e($a0) -/* C85E04 80240354 8E0200CC */ lw $v0, 0xcc($s0) -/* C85E08 80240358 8C420020 */ lw $v0, 0x20($v0) -/* C85E0C 8024035C AC820028 */ sw $v0, 0x28($a0) -/* C85E10 80240360 2402001F */ addiu $v0, $zero, 0x1f -/* C85E14 80240364 AE220070 */ sw $v0, 0x70($s1) -.L80240368: -/* C85E18 80240368 8FBF0018 */ lw $ra, 0x18($sp) -/* C85E1C 8024036C 8FB10014 */ lw $s1, 0x14($sp) -/* C85E20 80240370 8FB00010 */ lw $s0, 0x10($sp) -/* C85E24 80240374 03E00008 */ jr $ra -/* C85E28 80240378 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_8024037C_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_8024037C_C85AB0.s deleted file mode 100644 index 24b9be23a5..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_8024037C_C85AB0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024037C_C85E2C -/* C85E2C 8024037C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C85E30 80240380 AFB10014 */ sw $s1, 0x14($sp) -/* C85E34 80240384 0080882D */ daddu $s1, $a0, $zero -/* C85E38 80240388 AFBF0018 */ sw $ra, 0x18($sp) -/* C85E3C 8024038C AFB00010 */ sw $s0, 0x10($sp) -/* C85E40 80240390 8E300148 */ lw $s0, 0x148($s1) -/* C85E44 80240394 0C00EABB */ jal get_npc_unsafe -/* C85E48 80240398 86040008 */ lh $a0, 8($s0) -/* C85E4C 8024039C 0040202D */ daddu $a0, $v0, $zero -/* C85E50 802403A0 9482008E */ lhu $v0, 0x8e($a0) -/* C85E54 802403A4 2442FFFF */ addiu $v0, $v0, -1 -/* C85E58 802403A8 A482008E */ sh $v0, 0x8e($a0) -/* C85E5C 802403AC 00021400 */ sll $v0, $v0, 0x10 -/* C85E60 802403B0 1C400009 */ bgtz $v0, .L802403D8 -/* C85E64 802403B4 24020003 */ addiu $v0, $zero, 3 -/* C85E68 802403B8 96030076 */ lhu $v1, 0x76($s0) -/* C85E6C 802403BC AE02006C */ sw $v0, 0x6c($s0) -/* C85E70 802403C0 A483008E */ sh $v1, 0x8e($a0) -/* C85E74 802403C4 8E0200CC */ lw $v0, 0xcc($s0) -/* C85E78 802403C8 8C420024 */ lw $v0, 0x24($v0) -/* C85E7C 802403CC AC820028 */ sw $v0, 0x28($a0) -/* C85E80 802403D0 24020020 */ addiu $v0, $zero, 0x20 -/* C85E84 802403D4 AE220070 */ sw $v0, 0x70($s1) -.L802403D8: -/* C85E88 802403D8 8FBF0018 */ lw $ra, 0x18($sp) -/* C85E8C 802403DC 8FB10014 */ lw $s1, 0x14($sp) -/* C85E90 802403E0 8FB00010 */ lw $s0, 0x10($sp) -/* C85E94 802403E4 03E00008 */ jr $ra -/* C85E98 802403E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_802404C4_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_802404C4_C85AB0.s deleted file mode 100644 index 128a6e6715..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_802404C4_C85AB0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C4_C85F74 -/* C85F74 802404C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C85F78 802404C8 AFB10014 */ sw $s1, 0x14($sp) -/* C85F7C 802404CC 0080882D */ daddu $s1, $a0, $zero -/* C85F80 802404D0 AFBF0018 */ sw $ra, 0x18($sp) -/* C85F84 802404D4 AFB00010 */ sw $s0, 0x10($sp) -/* C85F88 802404D8 8E300148 */ lw $s0, 0x148($s1) -/* C85F8C 802404DC 0C00EABB */ jal get_npc_unsafe -/* C85F90 802404E0 86040008 */ lh $a0, 8($s0) -/* C85F94 802404E4 9443008E */ lhu $v1, 0x8e($v0) -/* C85F98 802404E8 2463FFFF */ addiu $v1, $v1, -1 -/* C85F9C 802404EC A443008E */ sh $v1, 0x8e($v0) -/* C85FA0 802404F0 00031C00 */ sll $v1, $v1, 0x10 -/* C85FA4 802404F4 1C600003 */ bgtz $v1, .L80240504 -/* C85FA8 802404F8 2402000C */ addiu $v0, $zero, 0xc -/* C85FAC 802404FC AE00006C */ sw $zero, 0x6c($s0) -/* C85FB0 80240500 AE220070 */ sw $v0, 0x70($s1) -.L80240504: -/* C85FB4 80240504 8FBF0018 */ lw $ra, 0x18($sp) -/* C85FB8 80240508 8FB10014 */ lw $s1, 0x14($sp) -/* C85FBC 8024050C 8FB00010 */ lw $s0, 0x10($sp) -/* C85FC0 80240510 03E00008 */ jr $ra -/* C85FC4 80240514 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80240518_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80240518_C85AB0.s deleted file mode 100644 index df2bee84b8..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80240518_C85AB0.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240518_C85FC8 -/* C85FC8 80240518 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C85FCC 8024051C AFBF0024 */ sw $ra, 0x24($sp) -/* C85FD0 80240520 AFB40020 */ sw $s4, 0x20($sp) -/* C85FD4 80240524 AFB3001C */ sw $s3, 0x1c($sp) -/* C85FD8 80240528 AFB20018 */ sw $s2, 0x18($sp) -/* C85FDC 8024052C AFB10014 */ sw $s1, 0x14($sp) -/* C85FE0 80240530 AFB00010 */ sw $s0, 0x10($sp) -/* C85FE4 80240534 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C85FE8 80240538 8C900148 */ lw $s0, 0x148($a0) -/* C85FEC 8024053C 86040008 */ lh $a0, 8($s0) -/* C85FF0 80240540 0C00EABB */ jal get_npc_unsafe -/* C85FF4 80240544 24110001 */ addiu $s1, $zero, 1 -/* C85FF8 80240548 86040008 */ lh $a0, 8($s0) -/* C85FFC 8024054C 0040802D */ daddu $s0, $v0, $zero -/* C86000 80240550 3C05800B */ lui $a1, %hi(gCameras) -/* C86004 80240554 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C86008 80240558 3C03800A */ lui $v1, 0x800a -/* C8600C 8024055C 8463A634 */ lh $v1, -0x59cc($v1) -/* C86010 80240560 00912021 */ addu $a0, $a0, $s1 -/* C86014 80240564 00031080 */ sll $v0, $v1, 2 -/* C86018 80240568 00431021 */ addu $v0, $v0, $v1 -/* C8601C 8024056C 00021080 */ sll $v0, $v0, 2 -/* C86020 80240570 00431023 */ subu $v0, $v0, $v1 -/* C86024 80240574 000218C0 */ sll $v1, $v0, 3 -/* C86028 80240578 00431021 */ addu $v0, $v0, $v1 -/* C8602C 8024057C 000210C0 */ sll $v0, $v0, 3 -/* C86030 80240580 0C00FB3A */ jal get_enemy -/* C86034 80240584 00459021 */ addu $s2, $v0, $a1 -/* C86038 80240588 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C8603C 8024058C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C86040 80240590 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C86044 80240594 8E830000 */ lw $v1, ($s4) -/* C86048 80240598 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C8604C 8024059C 8C660028 */ lw $a2, 0x28($v1) -/* C86050 802405A0 8C670030 */ lw $a3, 0x30($v1) -/* C86054 802405A4 0C00A7B5 */ jal dist2D -/* C86058 802405A8 0040982D */ daddu $s3, $v0, $zero -/* C8605C 802405AC C6620074 */ lwc1 $f2, 0x74($s3) -/* C86060 802405B0 468010A0 */ cvt.s.w $f2, $f2 -/* C86064 802405B4 4600103C */ c.lt.s $f2, $f0 -/* C86068 802405B8 00000000 */ nop -/* C8606C 802405BC 45030001 */ bc1tl .L802405C4 -/* C86070 802405C0 0000882D */ daddu $s1, $zero, $zero -.L802405C4: -/* C86074 802405C4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C86078 802405C8 C60E000C */ lwc1 $f14, 0xc($s0) -/* C8607C 802405CC 3C014387 */ lui $at, 0x4387 -/* C86080 802405D0 4481A000 */ mtc1 $at, $f20 -/* C86084 802405D4 0C00A70A */ jal get_clamped_angle_diff -/* C86088 802405D8 00000000 */ nop -/* C8608C 802405DC 0C00A6C9 */ jal clamp_angle -/* C86090 802405E0 46000306 */ mov.s $f12, $f0 -/* C86094 802405E4 3C018024 */ lui $at, 0x8024 -/* C86098 802405E8 D42263A0 */ ldc1 $f2, 0x63a0($at) -/* C8609C 802405EC 46000021 */ cvt.d.s $f0, $f0 -/* C860A0 802405F0 4622003C */ c.lt.d $f0, $f2 -/* C860A4 802405F4 00000000 */ nop -/* C860A8 802405F8 45000003 */ bc1f .L80240608 -/* C860AC 802405FC 00000000 */ nop -/* C860B0 80240600 3C0142B4 */ lui $at, 0x42b4 -/* C860B4 80240604 4481A000 */ mtc1 $at, $f20 -.L80240608: -/* C860B8 80240608 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C860BC 8024060C 8E820000 */ lw $v0, ($s4) -/* C860C0 80240610 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C860C4 80240614 8C460028 */ lw $a2, 0x28($v0) -/* C860C8 80240618 0C00A720 */ jal atan2 -/* C860CC 8024061C 8C470030 */ lw $a3, 0x30($v0) -/* C860D0 80240620 4600A306 */ mov.s $f12, $f20 -/* C860D4 80240624 0C00A70A */ jal get_clamped_angle_diff -/* C860D8 80240628 46000386 */ mov.s $f14, $f0 -/* C860DC 8024062C C6620078 */ lwc1 $f2, 0x78($s3) -/* C860E0 80240630 468010A0 */ cvt.s.w $f2, $f2 -/* C860E4 80240634 46000005 */ abs.s $f0, $f0 -/* C860E8 80240638 4600103C */ c.lt.s $f2, $f0 -/* C860EC 8024063C 00000000 */ nop -/* C860F0 80240640 45030001 */ bc1tl .L80240648 -/* C860F4 80240644 0000882D */ daddu $s1, $zero, $zero -.L80240648: -/* C860F8 80240648 8E820000 */ lw $v0, ($s4) -/* C860FC 8024064C C600003C */ lwc1 $f0, 0x3c($s0) -/* C86100 80240650 C442002C */ lwc1 $f2, 0x2c($v0) -/* C86104 80240654 860200A8 */ lh $v0, 0xa8($s0) -/* C86108 80240658 46020001 */ sub.s $f0, $f0, $f2 -/* C8610C 8024065C 44821000 */ mtc1 $v0, $f2 -/* C86110 80240660 00000000 */ nop -/* C86114 80240664 468010A1 */ cvt.d.w $f2, $f2 -/* C86118 80240668 46221080 */ add.d $f2, $f2, $f2 -/* C8611C 8024066C 46000005 */ abs.s $f0, $f0 -/* C86120 80240670 46000021 */ cvt.d.s $f0, $f0 -/* C86124 80240674 4620103E */ c.le.d $f2, $f0 -/* C86128 80240678 00000000 */ nop -/* C8612C 8024067C 45030001 */ bc1tl .L80240684 -/* C86130 80240680 0000882D */ daddu $s1, $zero, $zero -.L80240684: -/* C86134 80240684 3C038011 */ lui $v1, 0x8011 -/* C86138 80240688 8063EBB3 */ lb $v1, -0x144d($v1) -/* C8613C 8024068C 24020009 */ addiu $v0, $zero, 9 -/* C86140 80240690 50620001 */ beql $v1, $v0, .L80240698 -/* C86144 80240694 0000882D */ daddu $s1, $zero, $zero -.L80240698: -/* C86148 80240698 24020007 */ addiu $v0, $zero, 7 -/* C8614C 8024069C 50620001 */ beql $v1, $v0, .L802406A4 -/* C86150 802406A0 0000882D */ daddu $s1, $zero, $zero -.L802406A4: -/* C86154 802406A4 0220102D */ daddu $v0, $s1, $zero -/* C86158 802406A8 8FBF0024 */ lw $ra, 0x24($sp) -/* C8615C 802406AC 8FB40020 */ lw $s4, 0x20($sp) -/* C86160 802406B0 8FB3001C */ lw $s3, 0x1c($sp) -/* C86164 802406B4 8FB20018 */ lw $s2, 0x18($sp) -/* C86168 802406B8 8FB10014 */ lw $s1, 0x14($sp) -/* C8616C 802406BC 8FB00010 */ lw $s0, 0x10($sp) -/* C86170 802406C0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C86174 802406C4 03E00008 */ jr $ra -/* C86178 802406C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_802406CC_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_802406CC_C85AB0.s deleted file mode 100644 index ba2c57210e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_802406CC_C85AB0.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406CC_C8617C -/* C8617C 802406CC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C86180 802406D0 AFB40028 */ sw $s4, 0x28($sp) -/* C86184 802406D4 0080A02D */ daddu $s4, $a0, $zero -/* C86188 802406D8 AFBF002C */ sw $ra, 0x2c($sp) -/* C8618C 802406DC AFB30024 */ sw $s3, 0x24($sp) -/* C86190 802406E0 AFB20020 */ sw $s2, 0x20($sp) -/* C86194 802406E4 AFB1001C */ sw $s1, 0x1c($sp) -/* C86198 802406E8 AFB00018 */ sw $s0, 0x18($sp) -/* C8619C 802406EC 8E910148 */ lw $s1, 0x148($s4) -/* C861A0 802406F0 86240008 */ lh $a0, 8($s1) -/* C861A4 802406F4 0C00EABB */ jal get_npc_unsafe -/* C861A8 802406F8 00A0802D */ daddu $s0, $a1, $zero -/* C861AC 802406FC 16000005 */ bnez $s0, .L80240714 -/* C861B0 80240700 0040902D */ daddu $s2, $v0, $zero -/* C861B4 80240704 8E2200B0 */ lw $v0, 0xb0($s1) -/* C861B8 80240708 30420004 */ andi $v0, $v0, 4 -/* C861BC 8024070C 10400015 */ beqz $v0, .L80240764 -/* C861C0 80240710 00000000 */ nop -.L80240714: -/* C861C4 80240714 AE800070 */ sw $zero, 0x70($s4) -/* C861C8 80240718 8E420000 */ lw $v0, ($s2) -/* C861CC 8024071C 3C031F30 */ lui $v1, 0x1f30 -/* C861D0 80240720 A640008E */ sh $zero, 0x8e($s2) -/* C861D4 80240724 34420102 */ ori $v0, $v0, 0x102 -/* C861D8 80240728 AE420000 */ sw $v0, ($s2) -/* C861DC 8024072C 8E220000 */ lw $v0, ($s1) -/* C861E0 80240730 3C01C47A */ lui $at, 0xc47a -/* C861E4 80240734 44810000 */ mtc1 $at, $f0 -/* C861E8 80240738 00431025 */ or $v0, $v0, $v1 -/* C861EC 8024073C AE220000 */ sw $v0, ($s1) -/* C861F0 80240740 AE400038 */ sw $zero, 0x38($s2) -/* C861F4 80240744 E640003C */ swc1 $f0, 0x3c($s2) -/* C861F8 80240748 AE400040 */ sw $zero, 0x40($s2) -/* C861FC 8024074C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C86200 80240750 30620004 */ andi $v0, $v1, 4 -/* C86204 80240754 10400003 */ beqz $v0, .L80240764 -/* C86208 80240758 2402FFFB */ addiu $v0, $zero, -5 -/* C8620C 8024075C 00621024 */ and $v0, $v1, $v0 -/* C86210 80240760 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240764: -/* C86214 80240764 8E930070 */ lw $s3, 0x70($s4) -/* C86218 80240768 12600005 */ beqz $s3, .L80240780 -/* C8621C 8024076C 24020001 */ addiu $v0, $zero, 1 -/* C86220 80240770 12620048 */ beq $s3, $v0, .L80240894 -/* C86224 80240774 00000000 */ nop -/* C86228 80240778 08090242 */ j .L80240908 -/* C8622C 8024077C 00000000 */ nop -.L80240780: -/* C86230 80240780 86240008 */ lh $a0, 8($s1) -/* C86234 80240784 0C00FB3A */ jal get_enemy -/* C86238 80240788 2484FFFF */ addiu $a0, $a0, -1 -/* C8623C 8024078C 0040802D */ daddu $s0, $v0, $zero -/* C86240 80240790 0C00EABB */ jal get_npc_unsafe -/* C86244 80240794 86040008 */ lh $a0, 8($s0) -/* C86248 80240798 24030001 */ addiu $v1, $zero, 1 -/* C8624C 8024079C 0040982D */ daddu $s3, $v0, $zero -/* C86250 802407A0 A2230007 */ sb $v1, 7($s1) -/* C86254 802407A4 8E03006C */ lw $v1, 0x6c($s0) -/* C86258 802407A8 24020003 */ addiu $v0, $zero, 3 -/* C8625C 802407AC 14620056 */ bne $v1, $v0, .L80240908 -/* C86260 802407B0 00000000 */ nop -/* C86264 802407B4 8E2500A8 */ lw $a1, 0xa8($s1) -/* C86268 802407B8 10A00003 */ beqz $a1, .L802407C8 -/* C8626C 802407BC 0260202D */ daddu $a0, $s3, $zero -/* C86270 802407C0 0C012530 */ jal func_800494C0 -/* C86274 802407C4 0000302D */ daddu $a2, $zero, $zero -.L802407C8: -/* C86278 802407C8 27A40010 */ addiu $a0, $sp, 0x10 -/* C8627C 802407CC C6280070 */ lwc1 $f8, 0x70($s1) -/* C86280 802407D0 46804220 */ cvt.s.w $f8, $f8 -/* C86284 802407D4 C6620034 */ lwc1 $f2, 0x34($s3) -/* C86288 802407D8 3C014387 */ lui $at, 0x4387 -/* C8628C 802407DC 44810000 */ mtc1 $at, $f0 -/* C86290 802407E0 44064000 */ mfc1 $a2, $f8 -/* C86294 802407E4 46020001 */ sub.s $f0, $f0, $f2 -/* C86298 802407E8 C6660038 */ lwc1 $f6, 0x38($s3) -/* C8629C 802407EC C6640040 */ lwc1 $f4, 0x40($s3) -/* C862A0 802407F0 44070000 */ mfc1 $a3, $f0 -/* C862A4 802407F4 27A50014 */ addiu $a1, $sp, 0x14 -/* C862A8 802407F8 E7A60010 */ swc1 $f6, 0x10($sp) -/* C862AC 802407FC 0C00A7E7 */ jal add_vec2D_polar -/* C862B0 80240800 E7A40014 */ swc1 $f4, 0x14($sp) -/* C862B4 80240804 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C862B8 80240808 4600020D */ trunc.w.s $f8, $f0 -/* C862BC 8024080C 44024000 */ mfc1 $v0, $f8 -/* C862C0 80240810 E6400038 */ swc1 $f0, 0x38($s2) -/* C862C4 80240814 A6220010 */ sh $v0, 0x10($s1) -/* C862C8 80240818 C660003C */ lwc1 $f0, 0x3c($s3) -/* C862CC 8024081C C622006C */ lwc1 $f2, 0x6c($s1) -/* C862D0 80240820 468010A0 */ cvt.s.w $f2, $f2 -/* C862D4 80240824 46020000 */ add.s $f0, $f0, $f2 -/* C862D8 80240828 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C862DC 8024082C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C862E0 80240830 E640003C */ swc1 $f0, 0x3c($s2) -/* C862E4 80240834 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C862E8 80240838 4600020D */ trunc.w.s $f8, $f0 -/* C862EC 8024083C 44024000 */ mfc1 $v0, $f8 -/* C862F0 80240840 00000000 */ nop -/* C862F4 80240844 A6220012 */ sh $v0, 0x12($s1) -/* C862F8 80240848 4600120D */ trunc.w.s $f8, $f2 -/* C862FC 8024084C 44024000 */ mfc1 $v0, $f8 -/* C86300 80240850 E6420040 */ swc1 $f2, 0x40($s2) -/* C86304 80240854 A6220014 */ sh $v0, 0x14($s1) -/* C86308 80240858 8C660028 */ lw $a2, 0x28($v1) -/* C8630C 8024085C 8C670030 */ lw $a3, 0x30($v1) -/* C86310 80240860 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C86314 80240864 0C00A720 */ jal atan2 -/* C86318 80240868 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C8631C 8024086C 3C03E0EF */ lui $v1, 0xe0ef -/* C86320 80240870 E640000C */ swc1 $f0, 0xc($s2) -/* C86324 80240874 8E220000 */ lw $v0, ($s1) -/* C86328 80240878 3463FFFF */ ori $v1, $v1, 0xffff -/* C8632C 8024087C 00431024 */ and $v0, $v0, $v1 -/* C86330 80240880 AE220000 */ sw $v0, ($s1) -/* C86334 80240884 24020001 */ addiu $v0, $zero, 1 -/* C86338 80240888 A640008E */ sh $zero, 0x8e($s2) -/* C8633C 8024088C 08090242 */ j .L80240908 -/* C86340 80240890 AE820070 */ sw $v0, 0x70($s4) -.L80240894: -/* C86344 80240894 86240008 */ lh $a0, 8($s1) -/* C86348 80240898 0C00FB3A */ jal get_enemy -/* C8634C 8024089C 2484FFFF */ addiu $a0, $a0, -1 -/* C86350 802408A0 0040802D */ daddu $s0, $v0, $zero -/* C86354 802408A4 0C00EABB */ jal get_npc_unsafe -/* C86358 802408A8 86040008 */ lh $a0, 8($s0) -/* C8635C 802408AC 9642008E */ lhu $v0, 0x8e($s2) -/* C86360 802408B0 24420001 */ addiu $v0, $v0, 1 -/* C86364 802408B4 A642008E */ sh $v0, 0x8e($s2) -/* C86368 802408B8 00021400 */ sll $v0, $v0, 0x10 -/* C8636C 802408BC 8E23007C */ lw $v1, 0x7c($s1) -/* C86370 802408C0 00021403 */ sra $v0, $v0, 0x10 -/* C86374 802408C4 0043102A */ slt $v0, $v0, $v1 -/* C86378 802408C8 50400001 */ beql $v0, $zero, .L802408D0 -/* C8637C 802408CC A2200007 */ sb $zero, 7($s1) -.L802408D0: -/* C86380 802408D0 8E03006C */ lw $v1, 0x6c($s0) -/* C86384 802408D4 24020004 */ addiu $v0, $zero, 4 -/* C86388 802408D8 1462000B */ bne $v1, $v0, .L80240908 -/* C8638C 802408DC 3C021F10 */ lui $v0, 0x1f10 -/* C86390 802408E0 8E230000 */ lw $v1, ($s1) -/* C86394 802408E4 3C01C47A */ lui $at, 0xc47a -/* C86398 802408E8 44810000 */ mtc1 $at, $f0 -/* C8639C 802408EC 00621825 */ or $v1, $v1, $v0 -/* C863A0 802408F0 AE230000 */ sw $v1, ($s1) -/* C863A4 802408F4 AE400038 */ sw $zero, 0x38($s2) -/* C863A8 802408F8 E640003C */ swc1 $f0, 0x3c($s2) -/* C863AC 802408FC AE400040 */ sw $zero, 0x40($s2) -/* C863B0 80240900 A2330007 */ sb $s3, 7($s1) -/* C863B4 80240904 AE800070 */ sw $zero, 0x70($s4) -.L80240908: -/* C863B8 80240908 8FBF002C */ lw $ra, 0x2c($sp) -/* C863BC 8024090C 8FB40028 */ lw $s4, 0x28($sp) -/* C863C0 80240910 8FB30024 */ lw $s3, 0x24($sp) -/* C863C4 80240914 8FB20020 */ lw $s2, 0x20($sp) -/* C863C8 80240918 8FB1001C */ lw $s1, 0x1c($sp) -/* C863CC 8024091C 8FB00018 */ lw $s0, 0x18($sp) -/* C863D0 80240920 0000102D */ daddu $v0, $zero, $zero -/* C863D4 80240924 03E00008 */ jr $ra -/* C863D8 80240928 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_8024092C_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_8024092C_C85AB0.s deleted file mode 100644 index fc4d2fc2c7..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_8024092C_C85AB0.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024092C_C863DC -/* C863DC 8024092C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C863E0 80240930 AFB20038 */ sw $s2, 0x38($sp) -/* C863E4 80240934 0080902D */ daddu $s2, $a0, $zero -/* C863E8 80240938 AFBF0048 */ sw $ra, 0x48($sp) -/* C863EC 8024093C AFB50044 */ sw $s5, 0x44($sp) -/* C863F0 80240940 AFB40040 */ sw $s4, 0x40($sp) -/* C863F4 80240944 AFB3003C */ sw $s3, 0x3c($sp) -/* C863F8 80240948 AFB10034 */ sw $s1, 0x34($sp) -/* C863FC 8024094C AFB00030 */ sw $s0, 0x30($sp) -/* C86400 80240950 8E510148 */ lw $s1, 0x148($s2) -/* C86404 80240954 86240008 */ lh $a0, 8($s1) -/* C86408 80240958 0C00EABB */ jal get_npc_unsafe -/* C8640C 8024095C 00A0802D */ daddu $s0, $a1, $zero -/* C86410 80240960 8E43000C */ lw $v1, 0xc($s2) -/* C86414 80240964 0240202D */ daddu $a0, $s2, $zero -/* C86418 80240968 8C650000 */ lw $a1, ($v1) -/* C8641C 8024096C 0C0B1EAF */ jal get_variable -/* C86420 80240970 0040A82D */ daddu $s5, $v0, $zero -/* C86424 80240974 AFA00010 */ sw $zero, 0x10($sp) -/* C86428 80240978 8E2300D0 */ lw $v1, 0xd0($s1) -/* C8642C 8024097C 8C630030 */ lw $v1, 0x30($v1) -/* C86430 80240980 AFA30014 */ sw $v1, 0x14($sp) -/* C86434 80240984 8E2300D0 */ lw $v1, 0xd0($s1) -/* C86438 80240988 8C63001C */ lw $v1, 0x1c($v1) -/* C8643C 8024098C AFA30018 */ sw $v1, 0x18($sp) -/* C86440 80240990 8E2300D0 */ lw $v1, 0xd0($s1) -/* C86444 80240994 8C630024 */ lw $v1, 0x24($v1) -/* C86448 80240998 AFA3001C */ sw $v1, 0x1c($sp) -/* C8644C 8024099C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C86450 802409A0 8C630028 */ lw $v1, 0x28($v1) -/* C86454 802409A4 27B40010 */ addiu $s4, $sp, 0x10 -/* C86458 802409A8 AFA30020 */ sw $v1, 0x20($sp) -/* C8645C 802409AC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C86460 802409B0 3C014282 */ lui $at, 0x4282 -/* C86464 802409B4 44810000 */ mtc1 $at, $f0 -/* C86468 802409B8 8C63002C */ lw $v1, 0x2c($v1) -/* C8646C 802409BC 0040982D */ daddu $s3, $v0, $zero -/* C86470 802409C0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C86474 802409C4 A7A0002C */ sh $zero, 0x2c($sp) -/* C86478 802409C8 16000005 */ bnez $s0, .L802409E0 -/* C8647C 802409CC AFA30024 */ sw $v1, 0x24($sp) -/* C86480 802409D0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C86484 802409D4 30420004 */ andi $v0, $v0, 4 -/* C86488 802409D8 10400020 */ beqz $v0, .L80240A5C -/* C8648C 802409DC 00000000 */ nop -.L802409E0: -/* C86490 802409E0 2404F7FF */ addiu $a0, $zero, -0x801 -/* C86494 802409E4 AE400070 */ sw $zero, 0x70($s2) -/* C86498 802409E8 A6A0008E */ sh $zero, 0x8e($s5) -/* C8649C 802409EC 8E2200CC */ lw $v0, 0xcc($s1) -/* C864A0 802409F0 8EA30000 */ lw $v1, ($s5) -/* C864A4 802409F4 8C420000 */ lw $v0, ($v0) -/* C864A8 802409F8 00641824 */ and $v1, $v1, $a0 -/* C864AC 802409FC AEA30000 */ sw $v1, ($s5) -/* C864B0 80240A00 AEA20028 */ sw $v0, 0x28($s5) -/* C864B4 80240A04 8E2200D0 */ lw $v0, 0xd0($s1) -/* C864B8 80240A08 8C420034 */ lw $v0, 0x34($v0) -/* C864BC 80240A0C 54400005 */ bnel $v0, $zero, .L80240A24 -/* C864C0 80240A10 2402FDFF */ addiu $v0, $zero, -0x201 -/* C864C4 80240A14 34620200 */ ori $v0, $v1, 0x200 -/* C864C8 80240A18 2403FFF7 */ addiu $v1, $zero, -9 -/* C864CC 80240A1C 0809028B */ j .L80240A2C -/* C864D0 80240A20 00431024 */ and $v0, $v0, $v1 -.L80240A24: -/* C864D4 80240A24 00621024 */ and $v0, $v1, $v0 -/* C864D8 80240A28 34420008 */ ori $v0, $v0, 8 -.L80240A2C: -/* C864DC 80240A2C AEA20000 */ sw $v0, ($s5) -/* C864E0 80240A30 8E2200B0 */ lw $v0, 0xb0($s1) -/* C864E4 80240A34 30420004 */ andi $v0, $v0, 4 -/* C864E8 80240A38 10400007 */ beqz $v0, .L80240A58 -/* C864EC 80240A3C 24020063 */ addiu $v0, $zero, 0x63 -/* C864F0 80240A40 AE420070 */ sw $v0, 0x70($s2) -/* C864F4 80240A44 AE400074 */ sw $zero, 0x74($s2) -/* C864F8 80240A48 8E2200B0 */ lw $v0, 0xb0($s1) -/* C864FC 80240A4C 2403FFFB */ addiu $v1, $zero, -5 -/* C86500 80240A50 00431024 */ and $v0, $v0, $v1 -/* C86504 80240A54 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240A58: -/* C86508 80240A58 AE20006C */ sw $zero, 0x6c($s1) -.L80240A5C: -/* C8650C 80240A5C 8E420070 */ lw $v0, 0x70($s2) -/* C86510 80240A60 2842001E */ slti $v0, $v0, 0x1e -/* C86514 80240A64 10400009 */ beqz $v0, .L80240A8C -/* C86518 80240A68 00000000 */ nop -/* C8651C 80240A6C 8E22006C */ lw $v0, 0x6c($s1) -/* C86520 80240A70 14400006 */ bnez $v0, .L80240A8C -/* C86524 80240A74 00000000 */ nop -/* C86528 80240A78 0C090146 */ jal func_80240518 -/* C8652C 80240A7C 0240202D */ daddu $a0, $s2, $zero -/* C86530 80240A80 10400002 */ beqz $v0, .L80240A8C -/* C86534 80240A84 2402001E */ addiu $v0, $zero, 0x1e -/* C86538 80240A88 AE420070 */ sw $v0, 0x70($s2) -.L80240A8C: -/* C8653C 80240A8C 8E430070 */ lw $v1, 0x70($s2) -/* C86540 80240A90 2C620064 */ sltiu $v0, $v1, 0x64 -/* C86544 80240A94 10400048 */ beqz $v0, .L80240BB8 -/* C86548 80240A98 00031080 */ sll $v0, $v1, 2 -/* C8654C 80240A9C 3C018024 */ lui $at, 0x8024 -/* C86550 80240AA0 00220821 */ addu $at, $at, $v0 -/* C86554 80240AA4 8C2263A8 */ lw $v0, 0x63a8($at) -/* C86558 80240AA8 00400008 */ jr $v0 -/* C8655C 80240AAC 00000000 */ nop -/* C86560 80240AB0 0240202D */ daddu $a0, $s2, $zero -/* C86564 80240AB4 0260282D */ daddu $a1, $s3, $zero -/* C86568 80240AB8 0C012568 */ jal func_800495A0 -/* C8656C 80240ABC 0280302D */ daddu $a2, $s4, $zero -/* C86570 80240AC0 0240202D */ daddu $a0, $s2, $zero -/* C86574 80240AC4 0260282D */ daddu $a1, $s3, $zero -/* C86578 80240AC8 0C0125AE */ jal func_800496B8 -/* C8657C 80240ACC 0280302D */ daddu $a2, $s4, $zero -/* C86580 80240AD0 080902EE */ j .L80240BB8 -/* C86584 80240AD4 00000000 */ nop -/* C86588 80240AD8 0240202D */ daddu $a0, $s2, $zero -/* C8658C 80240ADC 0260282D */ daddu $a1, $s3, $zero -/* C86590 80240AE0 0C0126D1 */ jal func_80049B44 -/* C86594 80240AE4 0280302D */ daddu $a2, $s4, $zero -/* C86598 80240AE8 0240202D */ daddu $a0, $s2, $zero -/* C8659C 80240AEC 0260282D */ daddu $a1, $s3, $zero -/* C865A0 80240AF0 0C012701 */ jal func_80049C04 -/* C865A4 80240AF4 0280302D */ daddu $a2, $s4, $zero -/* C865A8 80240AF8 080902EE */ j .L80240BB8 -/* C865AC 80240AFC 00000000 */ nop -/* C865B0 80240B00 0240202D */ daddu $a0, $s2, $zero -/* C865B4 80240B04 0260282D */ daddu $a1, $s3, $zero -/* C865B8 80240B08 0C01278F */ jal func_80049E3C -/* C865BC 80240B0C 0280302D */ daddu $a2, $s4, $zero -/* C865C0 80240B10 0240202D */ daddu $a0, $s2, $zero -/* C865C4 80240B14 0260282D */ daddu $a1, $s3, $zero -/* C865C8 80240B18 0C0127B3 */ jal func_80049ECC -/* C865CC 80240B1C 0280302D */ daddu $a2, $s4, $zero -/* C865D0 80240B20 080902EE */ j .L80240BB8 -/* C865D4 80240B24 00000000 */ nop -/* C865D8 80240B28 0240202D */ daddu $a0, $s2, $zero -/* C865DC 80240B2C 0260282D */ daddu $a1, $s3, $zero -/* C865E0 80240B30 0C0127DF */ jal func_80049F7C -/* C865E4 80240B34 0280302D */ daddu $a2, $s4, $zero -/* C865E8 80240B38 0240202D */ daddu $a0, $s2, $zero -/* C865EC 80240B3C 0260282D */ daddu $a1, $s3, $zero -/* C865F0 80240B40 0C012849 */ jal func_8004A124 -/* C865F4 80240B44 0280302D */ daddu $a2, $s4, $zero -/* C865F8 80240B48 080902EE */ j .L80240BB8 -/* C865FC 80240B4C 00000000 */ nop -/* C86600 80240B50 0240202D */ daddu $a0, $s2, $zero -/* C86604 80240B54 0260282D */ daddu $a1, $s3, $zero -/* C86608 80240B58 0C0128FA */ jal func_8004A3E8 -/* C8660C 80240B5C 0280302D */ daddu $a2, $s4, $zero -/* C86610 80240B60 080902EE */ j .L80240BB8 -/* C86614 80240B64 00000000 */ nop -/* C86618 80240B68 0C0900C4 */ jal func_80240310 -/* C8661C 80240B6C 0240202D */ daddu $a0, $s2, $zero -/* C86620 80240B70 0C0900DF */ jal func_8024037C -/* C86624 80240B74 0240202D */ daddu $a0, $s2, $zero -/* C86628 80240B78 8E430070 */ lw $v1, 0x70($s2) -/* C8662C 80240B7C 24020020 */ addiu $v0, $zero, 0x20 -/* C86630 80240B80 1462000D */ bne $v1, $v0, .L80240BB8 -/* C86634 80240B84 00000000 */ nop -/* C86638 80240B88 0C0900FB */ jal func_802403EC -/* C8663C 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* C86640 80240B90 8E430070 */ lw $v1, 0x70($s2) -/* C86644 80240B94 24020021 */ addiu $v0, $zero, 0x21 -/* C86648 80240B98 14620007 */ bne $v1, $v0, .L80240BB8 -/* C8664C 80240B9C 00000000 */ nop -/* C86650 80240BA0 0C090131 */ jal func_802404C4 -/* C86654 80240BA4 0240202D */ daddu $a0, $s2, $zero -/* C86658 80240BA8 080902EE */ j .L80240BB8 -/* C8665C 80240BAC 00000000 */ nop -/* C86660 80240BB0 0C0129CF */ jal func_8004A73C -/* C86664 80240BB4 0240202D */ daddu $a0, $s2, $zero -.L80240BB8: -/* C86668 80240BB8 8FBF0048 */ lw $ra, 0x48($sp) -/* C8666C 80240BBC 8FB50044 */ lw $s5, 0x44($sp) -/* C86670 80240BC0 8FB40040 */ lw $s4, 0x40($sp) -/* C86674 80240BC4 8FB3003C */ lw $s3, 0x3c($sp) -/* C86678 80240BC8 8FB20038 */ lw $s2, 0x38($sp) -/* C8667C 80240BCC 8FB10034 */ lw $s1, 0x34($sp) -/* C86680 80240BD0 8FB00030 */ lw $s0, 0x30($sp) -/* C86684 80240BD4 0000102D */ daddu $v0, $zero, $zero -/* C86688 80240BD8 03E00008 */ jr $ra -/* C8668C 80240BDC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80240BE0_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80240BE0_C85AB0.s deleted file mode 100644 index 03e26e7d6d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80240BE0_C85AB0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BE0_C86690 -/* C86690 80240BE0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C86694 80240BE4 AFB10014 */ sw $s1, 0x14($sp) -/* C86698 80240BE8 0080882D */ daddu $s1, $a0, $zero -/* C8669C 80240BEC AFBF0018 */ sw $ra, 0x18($sp) -/* C866A0 80240BF0 AFB00010 */ sw $s0, 0x10($sp) -/* C866A4 80240BF4 8E300148 */ lw $s0, 0x148($s1) -/* C866A8 80240BF8 0C00EABB */ jal get_npc_unsafe -/* C866AC 80240BFC 86040008 */ lh $a0, 8($s0) -/* C866B0 80240C00 0040202D */ daddu $a0, $v0, $zero -/* C866B4 80240C04 8482008E */ lh $v0, 0x8e($a0) -/* C866B8 80240C08 9483008E */ lhu $v1, 0x8e($a0) -/* C866BC 80240C0C 18400003 */ blez $v0, .L80240C1C -/* C866C0 80240C10 2462FFFF */ addiu $v0, $v1, -1 -/* C866C4 80240C14 0809030E */ j .L80240C38 -/* C866C8 80240C18 A482008E */ sh $v0, 0x8e($a0) -.L80240C1C: -/* C866CC 80240C1C 8E0200CC */ lw $v0, 0xcc($s0) -/* C866D0 80240C20 AE00006C */ sw $zero, 0x6c($s0) -/* C866D4 80240C24 8C420000 */ lw $v0, ($v0) -/* C866D8 80240C28 AC820028 */ sw $v0, 0x28($a0) -/* C866DC 80240C2C 24020001 */ addiu $v0, $zero, 1 -/* C866E0 80240C30 AE200074 */ sw $zero, 0x74($s1) -/* C866E4 80240C34 AE220070 */ sw $v0, 0x70($s1) -.L80240C38: -/* C866E8 80240C38 8FBF0018 */ lw $ra, 0x18($sp) -/* C866EC 80240C3C 8FB10014 */ lw $s1, 0x14($sp) -/* C866F0 80240C40 8FB00010 */ lw $s0, 0x10($sp) -/* C866F4 80240C44 03E00008 */ jr $ra -/* C866F8 80240C48 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80240C4C_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80240C4C_C85AB0.s deleted file mode 100644 index 0bf2cd612d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80240C4C_C85AB0.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_C866FC -/* C866FC 80240C4C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C86700 80240C50 AFB3003C */ sw $s3, 0x3c($sp) -/* C86704 80240C54 0080982D */ daddu $s3, $a0, $zero -/* C86708 80240C58 AFBF0040 */ sw $ra, 0x40($sp) -/* C8670C 80240C5C AFB20038 */ sw $s2, 0x38($sp) -/* C86710 80240C60 AFB10034 */ sw $s1, 0x34($sp) -/* C86714 80240C64 AFB00030 */ sw $s0, 0x30($sp) -/* C86718 80240C68 8E720148 */ lw $s2, 0x148($s3) -/* C8671C 80240C6C 00A0882D */ daddu $s1, $a1, $zero -/* C86720 80240C70 86440008 */ lh $a0, 8($s2) -/* C86724 80240C74 0C00EABB */ jal get_npc_unsafe -/* C86728 80240C78 00C0802D */ daddu $s0, $a2, $zero -/* C8672C 80240C7C 0200202D */ daddu $a0, $s0, $zero -/* C86730 80240C80 0240282D */ daddu $a1, $s2, $zero -/* C86734 80240C84 AFA00010 */ sw $zero, 0x10($sp) -/* C86738 80240C88 8E26000C */ lw $a2, 0xc($s1) -/* C8673C 80240C8C 8E270010 */ lw $a3, 0x10($s1) -/* C86740 80240C90 0C01242D */ jal func_800490B4 -/* C86744 80240C94 0040882D */ daddu $s1, $v0, $zero -/* C86748 80240C98 10400024 */ beqz $v0, .L80240D2C -/* C8674C 80240C9C 0220202D */ daddu $a0, $s1, $zero -/* C86750 80240CA0 24050322 */ addiu $a1, $zero, 0x322 -/* C86754 80240CA4 0C012530 */ jal func_800494C0 -/* C86758 80240CA8 0000302D */ daddu $a2, $zero, $zero -/* C8675C 80240CAC 0000202D */ daddu $a0, $zero, $zero -/* C86760 80240CB0 0220282D */ daddu $a1, $s1, $zero -/* C86764 80240CB4 0000302D */ daddu $a2, $zero, $zero -/* C86768 80240CB8 2410000A */ addiu $s0, $zero, 0xa -/* C8676C 80240CBC 862300A8 */ lh $v1, 0xa8($s1) -/* C86770 80240CC0 3C013F80 */ lui $at, 0x3f80 -/* C86774 80240CC4 44810000 */ mtc1 $at, $f0 -/* C86778 80240CC8 3C014000 */ lui $at, 0x4000 -/* C8677C 80240CCC 44811000 */ mtc1 $at, $f2 -/* C86780 80240CD0 3C01C1A0 */ lui $at, 0xc1a0 -/* C86784 80240CD4 44812000 */ mtc1 $at, $f4 -/* C86788 80240CD8 44833000 */ mtc1 $v1, $f6 -/* C8678C 80240CDC 00000000 */ nop -/* C86790 80240CE0 468031A0 */ cvt.s.w $f6, $f6 -/* C86794 80240CE4 44073000 */ mfc1 $a3, $f6 -/* C86798 80240CE8 27A20028 */ addiu $v0, $sp, 0x28 -/* C8679C 80240CEC AFB0001C */ sw $s0, 0x1c($sp) -/* C867A0 80240CF0 AFA20020 */ sw $v0, 0x20($sp) -/* C867A4 80240CF4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C867A8 80240CF8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C867AC 80240CFC 0C01BFA4 */ jal fx_emote -/* C867B0 80240D00 E7A40018 */ swc1 $f4, 0x18($sp) -/* C867B4 80240D04 0220202D */ daddu $a0, $s1, $zero -/* C867B8 80240D08 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C867BC 80240D0C 0C012530 */ jal func_800494C0 -/* C867C0 80240D10 3C060020 */ lui $a2, 0x20 -/* C867C4 80240D14 8E4200CC */ lw $v0, 0xcc($s2) -/* C867C8 80240D18 8C420020 */ lw $v0, 0x20($v0) -/* C867CC 80240D1C AE220028 */ sw $v0, 0x28($s1) -/* C867D0 80240D20 9642008E */ lhu $v0, 0x8e($s2) -/* C867D4 80240D24 A622008E */ sh $v0, 0x8e($s1) -/* C867D8 80240D28 AE700070 */ sw $s0, 0x70($s3) -.L80240D2C: -/* C867DC 80240D2C 8FBF0040 */ lw $ra, 0x40($sp) -/* C867E0 80240D30 8FB3003C */ lw $s3, 0x3c($sp) -/* C867E4 80240D34 8FB20038 */ lw $s2, 0x38($sp) -/* C867E8 80240D38 8FB10034 */ lw $s1, 0x34($sp) -/* C867EC 80240D3C 8FB00030 */ lw $s0, 0x30($sp) -/* C867F0 80240D40 03E00008 */ jr $ra -/* C867F4 80240D44 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80241788_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80241788_C85AB0.s deleted file mode 100644 index 5636bcef6e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80241788_C85AB0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241788_C87238 -/* C87238 80241788 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C8723C 8024178C AFB10014 */ sw $s1, 0x14($sp) -/* C87240 80241790 0080882D */ daddu $s1, $a0, $zero -/* C87244 80241794 AFBF0018 */ sw $ra, 0x18($sp) -/* C87248 80241798 AFB00010 */ sw $s0, 0x10($sp) -/* C8724C 8024179C 8E300148 */ lw $s0, 0x148($s1) -/* C87250 802417A0 0C00EABB */ jal get_npc_unsafe -/* C87254 802417A4 86040008 */ lh $a0, 8($s0) -/* C87258 802417A8 0040202D */ daddu $a0, $v0, $zero -/* C8725C 802417AC 9482008E */ lhu $v0, 0x8e($a0) -/* C87260 802417B0 2442FFFF */ addiu $v0, $v0, -1 -/* C87264 802417B4 A482008E */ sh $v0, 0x8e($a0) -/* C87268 802417B8 00021400 */ sll $v0, $v0, 0x10 -/* C8726C 802417BC 8E030098 */ lw $v1, 0x98($s0) -/* C87270 802417C0 00021403 */ sra $v0, $v0, 0x10 -/* C87274 802417C4 0062182A */ slt $v1, $v1, $v0 -/* C87278 802417C8 14600005 */ bnez $v1, .L802417E0 -/* C8727C 802417CC 3C03E0EF */ lui $v1, 0xe0ef -/* C87280 802417D0 8E020000 */ lw $v0, ($s0) -/* C87284 802417D4 3463FFFF */ ori $v1, $v1, 0xffff -/* C87288 802417D8 00431024 */ and $v0, $v0, $v1 -/* C8728C 802417DC AE020000 */ sw $v0, ($s0) -.L802417E0: -/* C87290 802417E0 8482008E */ lh $v0, 0x8e($a0) -/* C87294 802417E4 14400007 */ bnez $v0, .L80241804 -/* C87298 802417E8 00000000 */ nop -/* C8729C 802417EC 8E0200CC */ lw $v0, 0xcc($s0) -/* C872A0 802417F0 8C420028 */ lw $v0, 0x28($v0) -/* C872A4 802417F4 A480008E */ sh $zero, 0x8e($a0) -/* C872A8 802417F8 AC820028 */ sw $v0, 0x28($a0) -/* C872AC 802417FC 2402000C */ addiu $v0, $zero, 0xc -/* C872B0 80241800 AE220070 */ sw $v0, 0x70($s1) -.L80241804: -/* C872B4 80241804 8FBF0018 */ lw $ra, 0x18($sp) -/* C872B8 80241808 8FB10014 */ lw $s1, 0x14($sp) -/* C872BC 8024180C 8FB00010 */ lw $s0, 0x10($sp) -/* C872C0 80241810 03E00008 */ jr $ra -/* C872C4 80241814 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80241818_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80241818_C85AB0.s deleted file mode 100644 index d9b8a84897..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80241818_C85AB0.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241818_C872C8 -/* C872C8 80241818 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C872CC 8024181C AFB10034 */ sw $s1, 0x34($sp) -/* C872D0 80241820 0080882D */ daddu $s1, $a0, $zero -/* C872D4 80241824 AFBF0038 */ sw $ra, 0x38($sp) -/* C872D8 80241828 AFB00030 */ sw $s0, 0x30($sp) -/* C872DC 8024182C 8E300148 */ lw $s0, 0x148($s1) -/* C872E0 80241830 0C00EABB */ jal get_npc_unsafe -/* C872E4 80241834 86040008 */ lh $a0, 8($s0) -/* C872E8 80241838 0040282D */ daddu $a1, $v0, $zero -/* C872EC 8024183C 94A2008E */ lhu $v0, 0x8e($a1) -/* C872F0 80241840 24420001 */ addiu $v0, $v0, 1 -/* C872F4 80241844 A4A2008E */ sh $v0, 0x8e($a1) -/* C872F8 80241848 00021400 */ sll $v0, $v0, 0x10 -/* C872FC 8024184C 8E0300A0 */ lw $v1, 0xa0($s0) -/* C87300 80241850 00021403 */ sra $v0, $v0, 0x10 -/* C87304 80241854 14430004 */ bne $v0, $v1, .L80241868 -/* C87308 80241858 00000000 */ nop -/* C8730C 8024185C 8E0200CC */ lw $v0, 0xcc($s0) -/* C87310 80241860 8C42002C */ lw $v0, 0x2c($v0) -/* C87314 80241864 ACA20028 */ sw $v0, 0x28($a1) -.L80241868: -/* C87318 80241868 84A3008E */ lh $v1, 0x8e($a1) -/* C8731C 8024186C 8E0200A4 */ lw $v0, 0xa4($s0) -/* C87320 80241870 14620002 */ bne $v1, $v0, .L8024187C -/* C87324 80241874 24020003 */ addiu $v0, $zero, 3 -/* C87328 80241878 AE02006C */ sw $v0, 0x6c($s0) -.L8024187C: -/* C8732C 8024187C 84A2008E */ lh $v0, 0x8e($a1) -/* C87330 80241880 8E03009C */ lw $v1, 0x9c($s0) -/* C87334 80241884 0043102A */ slt $v0, $v0, $v1 -/* C87338 80241888 1440001E */ bnez $v0, .L80241904 -/* C8733C 8024188C 24020004 */ addiu $v0, $zero, 4 -/* C87340 80241890 AE02006C */ sw $v0, 0x6c($s0) -/* C87344 80241894 24020008 */ addiu $v0, $zero, 8 -/* C87348 80241898 24040003 */ addiu $a0, $zero, 3 -/* C8734C 8024189C A4A2008E */ sh $v0, 0x8e($a1) -/* C87350 802418A0 8E0200CC */ lw $v0, 0xcc($s0) -/* C87354 802418A4 84A300A8 */ lh $v1, 0xa8($a1) -/* C87358 802418A8 3C013F80 */ lui $at, 0x3f80 -/* C8735C 802418AC 44810000 */ mtc1 $at, $f0 -/* C87360 802418B0 3C014000 */ lui $at, 0x4000 -/* C87364 802418B4 44811000 */ mtc1 $at, $f2 -/* C87368 802418B8 3C01C1A0 */ lui $at, 0xc1a0 -/* C8736C 802418BC 44812000 */ mtc1 $at, $f4 -/* C87370 802418C0 44833000 */ mtc1 $v1, $f6 -/* C87374 802418C4 00000000 */ nop -/* C87378 802418C8 468031A0 */ cvt.s.w $f6, $f6 -/* C8737C 802418CC 8C420000 */ lw $v0, ($v0) -/* C87380 802418D0 44073000 */ mfc1 $a3, $f6 -/* C87384 802418D4 0000302D */ daddu $a2, $zero, $zero -/* C87388 802418D8 ACA20028 */ sw $v0, 0x28($a1) -/* C8738C 802418DC 2402000A */ addiu $v0, $zero, 0xa -/* C87390 802418E0 AFA2001C */ sw $v0, 0x1c($sp) -/* C87394 802418E4 27A20028 */ addiu $v0, $sp, 0x28 -/* C87398 802418E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C8739C 802418EC E7A20014 */ swc1 $f2, 0x14($sp) -/* C873A0 802418F0 E7A40018 */ swc1 $f4, 0x18($sp) -/* C873A4 802418F4 0C01BFA4 */ jal fx_emote -/* C873A8 802418F8 AFA20020 */ sw $v0, 0x20($sp) -/* C873AC 802418FC 2402000D */ addiu $v0, $zero, 0xd -/* C873B0 80241900 AE220070 */ sw $v0, 0x70($s1) -.L80241904: -/* C873B4 80241904 8FBF0038 */ lw $ra, 0x38($sp) -/* C873B8 80241908 8FB10034 */ lw $s1, 0x34($sp) -/* C873BC 8024190C 8FB00030 */ lw $s0, 0x30($sp) -/* C873C0 80241910 03E00008 */ jr $ra -/* C873C4 80241914 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80241918_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80241918_C85AB0.s deleted file mode 100644 index dae24c4e5f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80241918_C85AB0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241918_C873C8 -/* C873C8 80241918 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C873CC 8024191C AFB10014 */ sw $s1, 0x14($sp) -/* C873D0 80241920 0080882D */ daddu $s1, $a0, $zero -/* C873D4 80241924 AFBF0018 */ sw $ra, 0x18($sp) -/* C873D8 80241928 AFB00010 */ sw $s0, 0x10($sp) -/* C873DC 8024192C 8E300148 */ lw $s0, 0x148($s1) -/* C873E0 80241930 0C00EABB */ jal get_npc_unsafe -/* C873E4 80241934 86040008 */ lh $a0, 8($s0) -/* C873E8 80241938 0040182D */ daddu $v1, $v0, $zero -/* C873EC 8024193C 9462008E */ lhu $v0, 0x8e($v1) -/* C873F0 80241940 2442FFFF */ addiu $v0, $v0, -1 -/* C873F4 80241944 A462008E */ sh $v0, 0x8e($v1) -/* C873F8 80241948 00021400 */ sll $v0, $v0, 0x10 -/* C873FC 8024194C 14400005 */ bnez $v0, .L80241964 -/* C87400 80241950 00000000 */ nop -/* C87404 80241954 960200AA */ lhu $v0, 0xaa($s0) -/* C87408 80241958 A462008E */ sh $v0, 0x8e($v1) -/* C8740C 8024195C 2402000E */ addiu $v0, $zero, 0xe -/* C87410 80241960 AE220070 */ sw $v0, 0x70($s1) -.L80241964: -/* C87414 80241964 8FBF0018 */ lw $ra, 0x18($sp) -/* C87418 80241968 8FB10014 */ lw $s1, 0x14($sp) -/* C8741C 8024196C 8FB00010 */ lw $s0, 0x10($sp) -/* C87420 80241970 03E00008 */ jr $ra -/* C87424 80241974 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80241978_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80241978_C85AB0.s deleted file mode 100644 index 864cd4e624..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80241978_C85AB0.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241978_C87428 -/* C87428 80241978 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C8742C 8024197C AFB40040 */ sw $s4, 0x40($sp) -/* C87430 80241980 0080A02D */ daddu $s4, $a0, $zero -/* C87434 80241984 AFBF0044 */ sw $ra, 0x44($sp) -/* C87438 80241988 AFB3003C */ sw $s3, 0x3c($sp) -/* C8743C 8024198C AFB20038 */ sw $s2, 0x38($sp) -/* C87440 80241990 AFB10034 */ sw $s1, 0x34($sp) -/* C87444 80241994 AFB00030 */ sw $s0, 0x30($sp) -/* C87448 80241998 8E910148 */ lw $s1, 0x148($s4) -/* C8744C 8024199C 00A0902D */ daddu $s2, $a1, $zero -/* C87450 802419A0 86240008 */ lh $a0, 8($s1) -/* C87454 802419A4 0C00EABB */ jal get_npc_unsafe -/* C87458 802419A8 00C0982D */ daddu $s3, $a2, $zero -/* C8745C 802419AC 0040802D */ daddu $s0, $v0, $zero -/* C87460 802419B0 9602008E */ lhu $v0, 0x8e($s0) -/* C87464 802419B4 2442FFFF */ addiu $v0, $v0, -1 -/* C87468 802419B8 A602008E */ sh $v0, 0x8e($s0) -/* C8746C 802419BC 00021400 */ sll $v0, $v0, 0x10 -/* C87470 802419C0 14400020 */ bnez $v0, .L80241A44 -/* C87474 802419C4 0260202D */ daddu $a0, $s3, $zero -/* C87478 802419C8 AFA00010 */ sw $zero, 0x10($sp) -/* C8747C 802419CC 8E46000C */ lw $a2, 0xc($s2) -/* C87480 802419D0 8E470010 */ lw $a3, 0x10($s2) -/* C87484 802419D4 0C01242D */ jal func_800490B4 -/* C87488 802419D8 0220282D */ daddu $a1, $s1, $zero -/* C8748C 802419DC 54400018 */ bnel $v0, $zero, .L80241A40 -/* C87490 802419E0 A600008E */ sh $zero, 0x8e($s0) -/* C87494 802419E4 24040002 */ addiu $a0, $zero, 2 -/* C87498 802419E8 0200282D */ daddu $a1, $s0, $zero -/* C8749C 802419EC 0000302D */ daddu $a2, $zero, $zero -/* C874A0 802419F0 860300A8 */ lh $v1, 0xa8($s0) -/* C874A4 802419F4 3C013F80 */ lui $at, 0x3f80 -/* C874A8 802419F8 44810000 */ mtc1 $at, $f0 -/* C874AC 802419FC 3C014000 */ lui $at, 0x4000 -/* C874B0 80241A00 44811000 */ mtc1 $at, $f2 -/* C874B4 80241A04 3C01C1A0 */ lui $at, 0xc1a0 -/* C874B8 80241A08 44812000 */ mtc1 $at, $f4 -/* C874BC 80241A0C 2402000F */ addiu $v0, $zero, 0xf -/* C874C0 80241A10 AFA2001C */ sw $v0, 0x1c($sp) -/* C874C4 80241A14 44833000 */ mtc1 $v1, $f6 -/* C874C8 80241A18 00000000 */ nop -/* C874CC 80241A1C 468031A0 */ cvt.s.w $f6, $f6 -/* C874D0 80241A20 44073000 */ mfc1 $a3, $f6 -/* C874D4 80241A24 27A20028 */ addiu $v0, $sp, 0x28 -/* C874D8 80241A28 AFA20020 */ sw $v0, 0x20($sp) -/* C874DC 80241A2C E7A00010 */ swc1 $f0, 0x10($sp) -/* C874E0 80241A30 E7A20014 */ swc1 $f2, 0x14($sp) -/* C874E4 80241A34 0C01BFA4 */ jal fx_emote -/* C874E8 80241A38 E7A40018 */ swc1 $f4, 0x18($sp) -/* C874EC 80241A3C A600008E */ sh $zero, 0x8e($s0) -.L80241A40: -/* C874F0 80241A40 AE800070 */ sw $zero, 0x70($s4) -.L80241A44: -/* C874F4 80241A44 8FBF0044 */ lw $ra, 0x44($sp) -/* C874F8 80241A48 8FB40040 */ lw $s4, 0x40($sp) -/* C874FC 80241A4C 8FB3003C */ lw $s3, 0x3c($sp) -/* C87500 80241A50 8FB20038 */ lw $s2, 0x38($sp) -/* C87504 80241A54 8FB10034 */ lw $s1, 0x34($sp) -/* C87508 80241A58 8FB00030 */ lw $s0, 0x30($sp) -/* C8750C 80241A5C 03E00008 */ jr $ra -/* C87510 80241A60 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80241A64_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80241A64_C85AB0.s deleted file mode 100644 index fc34ece226..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80241A64_C85AB0.s +++ /dev/null @@ -1,165 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A64_C87514 -/* C87514 80241A64 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C87518 80241A68 AFB20038 */ sw $s2, 0x38($sp) -/* C8751C 80241A6C 0080902D */ daddu $s2, $a0, $zero -/* C87520 80241A70 AFBF0048 */ sw $ra, 0x48($sp) -/* C87524 80241A74 AFB50044 */ sw $s5, 0x44($sp) -/* C87528 80241A78 AFB40040 */ sw $s4, 0x40($sp) -/* C8752C 80241A7C AFB3003C */ sw $s3, 0x3c($sp) -/* C87530 80241A80 AFB10034 */ sw $s1, 0x34($sp) -/* C87534 80241A84 AFB00030 */ sw $s0, 0x30($sp) -/* C87538 80241A88 8E510148 */ lw $s1, 0x148($s2) -/* C8753C 80241A8C 86240008 */ lh $a0, 8($s1) -/* C87540 80241A90 0C00EABB */ jal get_npc_unsafe -/* C87544 80241A94 00A0802D */ daddu $s0, $a1, $zero -/* C87548 80241A98 8E43000C */ lw $v1, 0xc($s2) -/* C8754C 80241A9C 0240202D */ daddu $a0, $s2, $zero -/* C87550 80241AA0 8C650000 */ lw $a1, ($v1) -/* C87554 80241AA4 0C0B1EAF */ jal get_variable -/* C87558 80241AA8 0040A82D */ daddu $s5, $v0, $zero -/* C8755C 80241AAC AFA00010 */ sw $zero, 0x10($sp) -/* C87560 80241AB0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87564 80241AB4 8C630030 */ lw $v1, 0x30($v1) -/* C87568 80241AB8 AFA30014 */ sw $v1, 0x14($sp) -/* C8756C 80241ABC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87570 80241AC0 8C63001C */ lw $v1, 0x1c($v1) -/* C87574 80241AC4 AFA30018 */ sw $v1, 0x18($sp) -/* C87578 80241AC8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C8757C 80241ACC 8C630024 */ lw $v1, 0x24($v1) -/* C87580 80241AD0 AFA3001C */ sw $v1, 0x1c($sp) -/* C87584 80241AD4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87588 80241AD8 8C630028 */ lw $v1, 0x28($v1) -/* C8758C 80241ADC 27B40010 */ addiu $s4, $sp, 0x10 -/* C87590 80241AE0 AFA30020 */ sw $v1, 0x20($sp) -/* C87594 80241AE4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87598 80241AE8 3C014348 */ lui $at, 0x4348 -/* C8759C 80241AEC 44810000 */ mtc1 $at, $f0 -/* C875A0 80241AF0 8C63002C */ lw $v1, 0x2c($v1) -/* C875A4 80241AF4 0040982D */ daddu $s3, $v0, $zero -/* C875A8 80241AF8 E7A00028 */ swc1 $f0, 0x28($sp) -/* C875AC 80241AFC A7A0002C */ sh $zero, 0x2c($sp) -/* C875B0 80241B00 16000005 */ bnez $s0, .L80241B18 -/* C875B4 80241B04 AFA30024 */ sw $v1, 0x24($sp) -/* C875B8 80241B08 8E2200B0 */ lw $v0, 0xb0($s1) -/* C875BC 80241B0C 30420004 */ andi $v0, $v0, 4 -/* C875C0 80241B10 10400011 */ beqz $v0, .L80241B58 -/* C875C4 80241B14 00000000 */ nop -.L80241B18: -/* C875C8 80241B18 AE400070 */ sw $zero, 0x70($s2) -/* C875CC 80241B1C A6A0008E */ sh $zero, 0x8e($s5) -/* C875D0 80241B20 8E2200CC */ lw $v0, 0xcc($s1) -/* C875D4 80241B24 8C420000 */ lw $v0, ($v0) -/* C875D8 80241B28 AEA20028 */ sw $v0, 0x28($s5) -/* C875DC 80241B2C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C875E0 80241B30 30420004 */ andi $v0, $v0, 4 -/* C875E4 80241B34 10400008 */ beqz $v0, .L80241B58 -/* C875E8 80241B38 AE20006C */ sw $zero, 0x6c($s1) -/* C875EC 80241B3C 24020063 */ addiu $v0, $zero, 0x63 -/* C875F0 80241B40 AE420070 */ sw $v0, 0x70($s2) -/* C875F4 80241B44 AE400074 */ sw $zero, 0x74($s2) -/* C875F8 80241B48 8E2200B0 */ lw $v0, 0xb0($s1) -/* C875FC 80241B4C 2403FFFB */ addiu $v1, $zero, -5 -/* C87600 80241B50 00431024 */ and $v0, $v0, $v1 -/* C87604 80241B54 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241B58: -/* C87608 80241B58 8E430070 */ lw $v1, 0x70($s2) -/* C8760C 80241B5C 2410000B */ addiu $s0, $zero, 0xb -/* C87610 80241B60 1070002A */ beq $v1, $s0, .L80241C0C -/* C87614 80241B64 2862000C */ slti $v0, $v1, 0xc -/* C87618 80241B68 1040000D */ beqz $v0, .L80241BA0 -/* C8761C 80241B6C 24020001 */ addiu $v0, $zero, 1 -/* C87620 80241B70 1062001A */ beq $v1, $v0, .L80241BDC -/* C87624 80241B74 28620002 */ slti $v0, $v1, 2 -/* C87628 80241B78 10400005 */ beqz $v0, .L80241B90 -/* C8762C 80241B7C 2402000A */ addiu $v0, $zero, 0xa -/* C87630 80241B80 10600013 */ beqz $v1, .L80241BD0 -/* C87634 80241B84 0240202D */ daddu $a0, $s2, $zero -/* C87638 80241B88 08090723 */ j .L80241C8C -/* C8763C 80241B8C 00000000 */ nop -.L80241B90: -/* C87640 80241B90 10620018 */ beq $v1, $v0, .L80241BF4 -/* C87644 80241B94 0240202D */ daddu $a0, $s2, $zero -/* C87648 80241B98 08090723 */ j .L80241C8C -/* C8764C 80241B9C 00000000 */ nop -.L80241BA0: -/* C87650 80241BA0 2402000D */ addiu $v0, $zero, 0xd -/* C87654 80241BA4 10620029 */ beq $v1, $v0, .L80241C4C -/* C87658 80241BA8 0062102A */ slt $v0, $v1, $v0 -/* C8765C 80241BAC 14400020 */ bnez $v0, .L80241C30 -/* C87660 80241BB0 0240202D */ daddu $a0, $s2, $zero -/* C87664 80241BB4 2402000E */ addiu $v0, $zero, 0xe -/* C87668 80241BB8 1062002D */ beq $v1, $v0, .L80241C70 -/* C8766C 80241BBC 24020063 */ addiu $v0, $zero, 0x63 -/* C87670 80241BC0 10620030 */ beq $v1, $v0, .L80241C84 -/* C87674 80241BC4 00000000 */ nop -/* C87678 80241BC8 08090723 */ j .L80241C8C -/* C8767C 80241BCC 00000000 */ nop -.L80241BD0: -/* C87680 80241BD0 0260282D */ daddu $a1, $s3, $zero -/* C87684 80241BD4 0C0902F8 */ jal func_80240BE0 -/* C87688 80241BD8 0280302D */ daddu $a2, $s4, $zero -.L80241BDC: -/* C8768C 80241BDC 0240202D */ daddu $a0, $s2, $zero -/* C87690 80241BE0 0260282D */ daddu $a1, $s3, $zero -/* C87694 80241BE4 0C090313 */ jal func_80240C4C -/* C87698 80241BE8 0280302D */ daddu $a2, $s4, $zero -/* C8769C 80241BEC 08090723 */ j .L80241C8C -/* C876A0 80241BF0 00000000 */ nop -.L80241BF4: -/* C876A4 80241BF4 0260282D */ daddu $a1, $s3, $zero -/* C876A8 80241BF8 0C090352 */ jal func_80240D48 -/* C876AC 80241BFC 0280302D */ daddu $a2, $s4, $zero -/* C876B0 80241C00 8E420070 */ lw $v0, 0x70($s2) -/* C876B4 80241C04 14500021 */ bne $v0, $s0, .L80241C8C -/* C876B8 80241C08 00000000 */ nop -.L80241C0C: -/* C876BC 80241C0C 0240202D */ daddu $a0, $s2, $zero -/* C876C0 80241C10 0260282D */ daddu $a1, $s3, $zero -/* C876C4 80241C14 0C0905E2 */ jal func_80241788 -/* C876C8 80241C18 0280302D */ daddu $a2, $s4, $zero -/* C876CC 80241C1C 8E430070 */ lw $v1, 0x70($s2) -/* C876D0 80241C20 2402000C */ addiu $v0, $zero, 0xc -/* C876D4 80241C24 14620019 */ bne $v1, $v0, .L80241C8C -/* C876D8 80241C28 00000000 */ nop -/* C876DC 80241C2C 0240202D */ daddu $a0, $s2, $zero -.L80241C30: -/* C876E0 80241C30 0260282D */ daddu $a1, $s3, $zero -/* C876E4 80241C34 0C090606 */ jal func_80241818 -/* C876E8 80241C38 0280302D */ daddu $a2, $s4, $zero -/* C876EC 80241C3C 8E430070 */ lw $v1, 0x70($s2) -/* C876F0 80241C40 2402000D */ addiu $v0, $zero, 0xd -/* C876F4 80241C44 14620011 */ bne $v1, $v0, .L80241C8C -/* C876F8 80241C48 00000000 */ nop -.L80241C4C: -/* C876FC 80241C4C 0240202D */ daddu $a0, $s2, $zero -/* C87700 80241C50 0260282D */ daddu $a1, $s3, $zero -/* C87704 80241C54 0C090646 */ jal func_80241918 -/* C87708 80241C58 0280302D */ daddu $a2, $s4, $zero -/* C8770C 80241C5C 8E430070 */ lw $v1, 0x70($s2) -/* C87710 80241C60 2402000E */ addiu $v0, $zero, 0xe -/* C87714 80241C64 14620009 */ bne $v1, $v0, .L80241C8C -/* C87718 80241C68 00000000 */ nop -/* C8771C 80241C6C 0240202D */ daddu $a0, $s2, $zero -.L80241C70: -/* C87720 80241C70 0260282D */ daddu $a1, $s3, $zero -/* C87724 80241C74 0C09065E */ jal func_80241978 -/* C87728 80241C78 0280302D */ daddu $a2, $s4, $zero -/* C8772C 80241C7C 08090723 */ j .L80241C8C -/* C87730 80241C80 00000000 */ nop -.L80241C84: -/* C87734 80241C84 0C0129CF */ jal func_8004A73C -/* C87738 80241C88 0240202D */ daddu $a0, $s2, $zero -.L80241C8C: -/* C8773C 80241C8C 8FBF0048 */ lw $ra, 0x48($sp) -/* C87740 80241C90 8FB50044 */ lw $s5, 0x44($sp) -/* C87744 80241C94 8FB40040 */ lw $s4, 0x40($sp) -/* C87748 80241C98 8FB3003C */ lw $s3, 0x3c($sp) -/* C8774C 80241C9C 8FB20038 */ lw $s2, 0x38($sp) -/* C87750 80241CA0 8FB10034 */ lw $s1, 0x34($sp) -/* C87754 80241CA4 8FB00030 */ lw $s0, 0x30($sp) -/* C87758 80241CA8 0000102D */ daddu $v0, $zero, $zero -/* C8775C 80241CAC 03E00008 */ jr $ra -/* C87760 80241CB0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80241CB4_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80241CB4_C85AB0.s deleted file mode 100644 index 2dc6ad0da2..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80241CB4_C85AB0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CB4_C87764 -/* C87764 80241CB4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C87768 80241CB8 AFB20018 */ sw $s2, 0x18($sp) -/* C8776C 80241CBC 0080902D */ daddu $s2, $a0, $zero -/* C87770 80241CC0 AFBF001C */ sw $ra, 0x1c($sp) -/* C87774 80241CC4 AFB10014 */ sw $s1, 0x14($sp) -/* C87778 80241CC8 AFB00010 */ sw $s0, 0x10($sp) -/* C8777C 80241CCC 8E510148 */ lw $s1, 0x148($s2) -/* C87780 80241CD0 0C00EABB */ jal get_npc_unsafe -/* C87784 80241CD4 86240008 */ lh $a0, 8($s1) -/* C87788 80241CD8 0040802D */ daddu $s0, $v0, $zero -/* C8778C 80241CDC 8E2300CC */ lw $v1, 0xcc($s1) -/* C87790 80241CE0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C87794 80241CE4 8C630020 */ lw $v1, 0x20($v1) -/* C87798 80241CE8 AE030028 */ sw $v1, 0x28($s0) -/* C8779C 80241CEC 96220076 */ lhu $v0, 0x76($s1) -/* C877A0 80241CF0 A602008E */ sh $v0, 0x8e($s0) -/* C877A4 80241CF4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C877A8 80241CF8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C877AC 80241CFC C60E0040 */ lwc1 $f14, 0x40($s0) -/* C877B0 80241D00 8C460028 */ lw $a2, 0x28($v0) -/* C877B4 80241D04 0C00A720 */ jal atan2 -/* C877B8 80241D08 8C470030 */ lw $a3, 0x30($v0) -/* C877BC 80241D0C 2402000D */ addiu $v0, $zero, 0xd -/* C877C0 80241D10 E600000C */ swc1 $f0, 0xc($s0) -/* C877C4 80241D14 AE420070 */ sw $v0, 0x70($s2) -/* C877C8 80241D18 8FBF001C */ lw $ra, 0x1c($sp) -/* C877CC 80241D1C 8FB20018 */ lw $s2, 0x18($sp) -/* C877D0 80241D20 8FB10014 */ lw $s1, 0x14($sp) -/* C877D4 80241D24 8FB00010 */ lw $s0, 0x10($sp) -/* C877D8 80241D28 03E00008 */ jr $ra -/* C877DC 80241D2C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80241D30_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80241D30_C85AB0.s deleted file mode 100644 index 08e4432322..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80241D30_C85AB0.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D30_C877E0 -/* C877E0 80241D30 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C877E4 80241D34 AFB3001C */ sw $s3, 0x1c($sp) -/* C877E8 80241D38 0080982D */ daddu $s3, $a0, $zero -/* C877EC 80241D3C AFBF0020 */ sw $ra, 0x20($sp) -/* C877F0 80241D40 AFB20018 */ sw $s2, 0x18($sp) -/* C877F4 80241D44 AFB10014 */ sw $s1, 0x14($sp) -/* C877F8 80241D48 AFB00010 */ sw $s0, 0x10($sp) -/* C877FC 80241D4C 8E710148 */ lw $s1, 0x148($s3) -/* C87800 80241D50 86240008 */ lh $a0, 8($s1) -/* C87804 80241D54 0C00EABB */ jal get_npc_unsafe -/* C87808 80241D58 00A0902D */ daddu $s2, $a1, $zero -/* C8780C 80241D5C 0040802D */ daddu $s0, $v0, $zero -/* C87810 80241D60 8602008E */ lh $v0, 0x8e($s0) -/* C87814 80241D64 9603008E */ lhu $v1, 0x8e($s0) -/* C87818 80241D68 18400005 */ blez $v0, .L80241D80 -/* C8781C 80241D6C 2462FFFF */ addiu $v0, $v1, -1 -/* C87820 80241D70 A602008E */ sh $v0, 0x8e($s0) -/* C87824 80241D74 00021400 */ sll $v0, $v0, 0x10 -/* C87828 80241D78 1C400033 */ bgtz $v0, .L80241E48 -/* C8782C 80241D7C 00000000 */ nop -.L80241D80: -/* C87830 80241D80 8602008C */ lh $v0, 0x8c($s0) -/* C87834 80241D84 14400030 */ bnez $v0, .L80241E48 -/* C87838 80241D88 00000000 */ nop -/* C8783C 80241D8C 8E2200CC */ lw $v0, 0xcc($s1) -/* C87840 80241D90 8C420024 */ lw $v0, 0x24($v0) -/* C87844 80241D94 AE020028 */ sw $v0, 0x28($s0) -/* C87848 80241D98 C6400018 */ lwc1 $f0, 0x18($s2) -/* C8784C 80241D9C E6000018 */ swc1 $f0, 0x18($s0) -/* C87850 80241DA0 8E230088 */ lw $v1, 0x88($s1) -/* C87854 80241DA4 24020005 */ addiu $v0, $zero, 5 -/* C87858 80241DA8 10620005 */ beq $v1, $v0, .L80241DC0 -/* C8785C 80241DAC 00000000 */ nop -/* C87860 80241DB0 10600003 */ beqz $v1, .L80241DC0 -/* C87864 80241DB4 24020001 */ addiu $v0, $zero, 1 -/* C87868 80241DB8 14620006 */ bne $v1, $v0, .L80241DD4 -/* C8786C 80241DBC 00000000 */ nop -.L80241DC0: -/* C87870 80241DC0 8E220084 */ lw $v0, 0x84($s1) -/* C87874 80241DC4 00021FC2 */ srl $v1, $v0, 0x1f -/* C87878 80241DC8 00431021 */ addu $v0, $v0, $v1 -/* C8787C 80241DCC 00021043 */ sra $v0, $v0, 1 -/* C87880 80241DD0 A60200A8 */ sh $v0, 0xa8($s0) -.L80241DD4: -/* C87884 80241DD4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C87888 80241DD8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C8788C 80241DDC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C87890 80241DE0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C87894 80241DE4 8C460028 */ lw $a2, 0x28($v0) -/* C87898 80241DE8 0C00A7B5 */ jal dist2D -/* C8789C 80241DEC 8C470030 */ lw $a3, 0x30($v0) -/* C878A0 80241DF0 C6020018 */ lwc1 $f2, 0x18($s0) -/* C878A4 80241DF4 46020003 */ div.s $f0, $f0, $f2 -/* C878A8 80241DF8 3C018024 */ lui $at, 0x8024 -/* C878AC 80241DFC D4226568 */ ldc1 $f2, 0x6568($at) -/* C878B0 80241E00 46000021 */ cvt.d.s $f0, $f0 -/* C878B4 80241E04 46220000 */ add.d $f0, $f0, $f2 -/* C878B8 80241E08 4620010D */ trunc.w.d $f4, $f0 -/* C878BC 80241E0C 44022000 */ mfc1 $v0, $f4 -/* C878C0 80241E10 00000000 */ nop -/* C878C4 80241E14 A602008E */ sh $v0, 0x8e($s0) -/* C878C8 80241E18 00021400 */ sll $v0, $v0, 0x10 -/* C878CC 80241E1C 8E230078 */ lw $v1, 0x78($s1) -/* C878D0 80241E20 00021403 */ sra $v0, $v0, 0x10 -/* C878D4 80241E24 0043102A */ slt $v0, $v0, $v1 -/* C878D8 80241E28 10400003 */ beqz $v0, .L80241E38 -/* C878DC 80241E2C 00000000 */ nop -/* C878E0 80241E30 9622007A */ lhu $v0, 0x7a($s1) -/* C878E4 80241E34 A602008E */ sh $v0, 0x8e($s0) -.L80241E38: -/* C878E8 80241E38 8602008E */ lh $v0, 0x8e($s0) -/* C878EC 80241E3C AE22007C */ sw $v0, 0x7c($s1) -/* C878F0 80241E40 2402000E */ addiu $v0, $zero, 0xe -/* C878F4 80241E44 AE620070 */ sw $v0, 0x70($s3) -.L80241E48: -/* C878F8 80241E48 8FBF0020 */ lw $ra, 0x20($sp) -/* C878FC 80241E4C 8FB3001C */ lw $s3, 0x1c($sp) -/* C87900 80241E50 8FB20018 */ lw $s2, 0x18($sp) -/* C87904 80241E54 8FB10014 */ lw $s1, 0x14($sp) -/* C87908 80241E58 8FB00010 */ lw $s0, 0x10($sp) -/* C8790C 80241E5C 03E00008 */ jr $ra -/* C87910 80241E60 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80241FC8_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80241FC8_C85AB0.s deleted file mode 100644 index 53c1234703..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80241FC8_C85AB0.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FC8_C87A78 -/* C87A78 80241FC8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C87A7C 80241FCC AFB10014 */ sw $s1, 0x14($sp) -/* C87A80 80241FD0 0080882D */ daddu $s1, $a0, $zero -/* C87A84 80241FD4 AFBF0018 */ sw $ra, 0x18($sp) -/* C87A88 80241FD8 AFB00010 */ sw $s0, 0x10($sp) -/* C87A8C 80241FDC 8E300148 */ lw $s0, 0x148($s1) -/* C87A90 80241FE0 0C00EABB */ jal get_npc_unsafe -/* C87A94 80241FE4 86040008 */ lh $a0, 8($s0) -/* C87A98 80241FE8 0040202D */ daddu $a0, $v0, $zero -/* C87A9C 80241FEC 9482008E */ lhu $v0, 0x8e($a0) -/* C87AA0 80241FF0 24030003 */ addiu $v1, $zero, 3 -/* C87AA4 80241FF4 24420001 */ addiu $v0, $v0, 1 -/* C87AA8 80241FF8 A482008E */ sh $v0, 0x8e($a0) -/* C87AAC 80241FFC 00021400 */ sll $v0, $v0, 0x10 -/* C87AB0 80242000 00021403 */ sra $v0, $v0, 0x10 -/* C87AB4 80242004 14430003 */ bne $v0, $v1, .L80242014 -/* C87AB8 80242008 00000000 */ nop -/* C87ABC 8024200C 96020086 */ lhu $v0, 0x86($s0) -/* C87AC0 80242010 A48200A8 */ sh $v0, 0xa8($a0) -.L80242014: -/* C87AC4 80242014 8482008E */ lh $v0, 0x8e($a0) -/* C87AC8 80242018 8E030080 */ lw $v1, 0x80($s0) -/* C87ACC 8024201C 0043102A */ slt $v0, $v0, $v1 -/* C87AD0 80242020 14400004 */ bnez $v0, .L80242034 -/* C87AD4 80242024 00000000 */ nop -/* C87AD8 80242028 96020086 */ lhu $v0, 0x86($s0) -/* C87ADC 8024202C A48200A8 */ sh $v0, 0xa8($a0) -/* C87AE0 80242030 AE200070 */ sw $zero, 0x70($s1) -.L80242034: -/* C87AE4 80242034 8FBF0018 */ lw $ra, 0x18($sp) -/* C87AE8 80242038 8FB10014 */ lw $s1, 0x14($sp) -/* C87AEC 8024203C 8FB00010 */ lw $s0, 0x10($sp) -/* C87AF0 80242040 03E00008 */ jr $ra -/* C87AF4 80242044 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242488_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80242488_C85AB0.s deleted file mode 100644 index 10b027a330..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242488_C85AB0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242488_C87F38 -/* C87F38 80242488 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C87F3C 8024248C AFBF0010 */ sw $ra, 0x10($sp) -/* C87F40 80242490 0C00EAD2 */ jal get_npc_safe -/* C87F44 80242494 8C84014C */ lw $a0, 0x14c($a0) -/* C87F48 80242498 0040182D */ daddu $v1, $v0, $zero -/* C87F4C 8024249C 846200A8 */ lh $v0, 0xa8($v1) -/* C87F50 802424A0 C462003C */ lwc1 $f2, 0x3c($v1) -/* C87F54 802424A4 906400A9 */ lbu $a0, 0xa9($v1) -/* C87F58 802424A8 44820000 */ mtc1 $v0, $f0 -/* C87F5C 802424AC 00000000 */ nop -/* C87F60 802424B0 46800020 */ cvt.s.w $f0, $f0 -/* C87F64 802424B4 46001081 */ sub.s $f2, $f2, $f0 -/* C87F68 802424B8 A06400AB */ sb $a0, 0xab($v1) -/* C87F6C 802424BC E462003C */ swc1 $f2, 0x3c($v1) -/* C87F70 802424C0 8FBF0010 */ lw $ra, 0x10($sp) -/* C87F74 802424C4 24020002 */ addiu $v0, $zero, 2 -/* C87F78 802424C8 03E00008 */ jr $ra -/* C87F7C 802424CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242528_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80242528_C85AB0.s deleted file mode 100644 index 023c8ab5d1..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242528_C85AB0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242528_C87FD8 -/* C87FD8 80242528 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C87FDC 8024252C 0080102D */ daddu $v0, $a0, $zero -/* C87FE0 80242530 AFB00010 */ sw $s0, 0x10($sp) -/* C87FE4 80242534 AFBF0018 */ sw $ra, 0x18($sp) -/* C87FE8 80242538 AFB10014 */ sw $s1, 0x14($sp) -/* C87FEC 8024253C 8C44014C */ lw $a0, 0x14c($v0) -/* C87FF0 80242540 8C510148 */ lw $s1, 0x148($v0) -/* C87FF4 80242544 0C00EAD2 */ jal get_npc_safe -/* C87FF8 80242548 00A0802D */ daddu $s0, $a1, $zero -/* C87FFC 8024254C 56000001 */ bnel $s0, $zero, .L80242554 -/* C88000 80242550 A04000AB */ sb $zero, 0xab($v0) -.L80242554: -/* C88004 80242554 8C420000 */ lw $v0, ($v0) -/* C88008 80242558 30421000 */ andi $v0, $v0, 0x1000 -/* C8800C 8024255C 1040000A */ beqz $v0, .L80242588 -/* C88010 80242560 0000102D */ daddu $v0, $zero, $zero -/* C88014 80242564 82220004 */ lb $v0, 4($s1) -/* C88018 80242568 3C03800B */ lui $v1, %hi(gCurrentEncounter) -/* C8801C 8024256C 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) -/* C88020 80242570 00021080 */ sll $v0, $v0, 2 -/* C88024 80242574 00431021 */ addu $v0, $v0, $v1 -/* C88028 80242578 8C440028 */ lw $a0, 0x28($v0) -/* C8802C 8024257C 9623006E */ lhu $v1, 0x6e($s1) -/* C88030 80242580 24020002 */ addiu $v0, $zero, 2 -/* C88034 80242584 A4830044 */ sh $v1, 0x44($a0) -.L80242588: -/* C88038 80242588 8FBF0018 */ lw $ra, 0x18($sp) -/* C8803C 8024258C 8FB10014 */ lw $s1, 0x14($sp) -/* C88040 80242590 8FB00010 */ lw $s0, 0x10($sp) -/* C88044 80242594 03E00008 */ jr $ra -/* C88048 80242598 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_8024259C_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_8024259C_C85AB0.s deleted file mode 100644 index 583adf9614..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_8024259C_C85AB0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024259C_C8804C -/* C8804C 8024259C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C88050 802425A0 AFB00010 */ sw $s0, 0x10($sp) -/* C88054 802425A4 3C108024 */ lui $s0, 0x8024 -/* C88058 802425A8 26104074 */ addiu $s0, $s0, 0x4074 -/* C8805C 802425AC AFBF0018 */ sw $ra, 0x18($sp) -/* C88060 802425B0 AFB10014 */ sw $s1, 0x14($sp) -/* C88064 802425B4 8E020000 */ lw $v0, ($s0) -/* C88068 802425B8 14400010 */ bnez $v0, .L802425FC -/* C8806C 802425BC 0080882D */ daddu $s1, $a0, $zero -/* C88070 802425C0 0C00AB39 */ jal heap_malloc -/* C88074 802425C4 24040040 */ addiu $a0, $zero, 0x40 -/* C88078 802425C8 AE020000 */ sw $v0, ($s0) -/* C8807C 802425CC 0000182D */ daddu $v1, $zero, $zero -/* C88080 802425D0 0040282D */ daddu $a1, $v0, $zero -/* C88084 802425D4 0220202D */ daddu $a0, $s1, $zero -.L802425D8: -/* C88088 802425D8 8C820084 */ lw $v0, 0x84($a0) -/* C8808C 802425DC 24840004 */ addiu $a0, $a0, 4 -/* C88090 802425E0 24630001 */ addiu $v1, $v1, 1 -/* C88094 802425E4 ACA20000 */ sw $v0, ($a1) -/* C88098 802425E8 28620010 */ slti $v0, $v1, 0x10 -/* C8809C 802425EC 1440FFFA */ bnez $v0, .L802425D8 -/* C880A0 802425F0 24A50004 */ addiu $a1, $a1, 4 -/* C880A4 802425F4 0809098E */ j .L80242638 -/* C880A8 802425F8 00000000 */ nop -.L802425FC: -/* C880AC 802425FC 0000182D */ daddu $v1, $zero, $zero -/* C880B0 80242600 0040282D */ daddu $a1, $v0, $zero -/* C880B4 80242604 0220202D */ daddu $a0, $s1, $zero -.L80242608: -/* C880B8 80242608 8CA20000 */ lw $v0, ($a1) -/* C880BC 8024260C 24A50004 */ addiu $a1, $a1, 4 -/* C880C0 80242610 24630001 */ addiu $v1, $v1, 1 -/* C880C4 80242614 AC820084 */ sw $v0, 0x84($a0) -/* C880C8 80242618 28620010 */ slti $v0, $v1, 0x10 -/* C880CC 8024261C 1440FFFA */ bnez $v0, .L80242608 -/* C880D0 80242620 24840004 */ addiu $a0, $a0, 4 -/* C880D4 80242624 3C108024 */ lui $s0, 0x8024 -/* C880D8 80242628 26104074 */ addiu $s0, $s0, 0x4074 -/* C880DC 8024262C 0C00AB4B */ jal heap_free -/* C880E0 80242630 8E040000 */ lw $a0, ($s0) -/* C880E4 80242634 AE000000 */ sw $zero, ($s0) -.L80242638: -/* C880E8 80242638 8FBF0018 */ lw $ra, 0x18($sp) -/* C880EC 8024263C 8FB10014 */ lw $s1, 0x14($sp) -/* C880F0 80242640 8FB00010 */ lw $s0, 0x10($sp) -/* C880F4 80242644 24020002 */ addiu $v0, $zero, 2 -/* C880F8 80242648 03E00008 */ jr $ra -/* C880FC 8024264C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242650_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80242650_C85AB0.s deleted file mode 100644 index c37789fcd3..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242650_C85AB0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242650_C88100 -/* C88100 80242650 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C88104 80242654 AFB00010 */ sw $s0, 0x10($sp) -/* C88108 80242658 0080802D */ daddu $s0, $a0, $zero -/* C8810C 8024265C AFBF0018 */ sw $ra, 0x18($sp) -/* C88110 80242660 AFB10014 */ sw $s1, 0x14($sp) -/* C88114 80242664 8E02000C */ lw $v0, 0xc($s0) -/* C88118 80242668 8C510000 */ lw $s1, ($v0) -/* C8811C 8024266C 0C0B1EAF */ jal get_variable -/* C88120 80242670 0220282D */ daddu $a1, $s1, $zero -/* C88124 80242674 3C03FFF0 */ lui $v1, 0xfff0 -/* C88128 80242678 3463FFFF */ ori $v1, $v1, 0xffff -/* C8812C 8024267C 0200202D */ daddu $a0, $s0, $zero -/* C88130 80242680 00431024 */ and $v0, $v0, $v1 -/* C88134 80242684 00021140 */ sll $v0, $v0, 5 -/* C88138 80242688 3C068008 */ lui $a2, %hi(gItemTable) -/* C8813C 8024268C 00C23021 */ addu $a2, $a2, $v0 -/* C88140 80242690 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* C88144 80242694 0C0B2026 */ jal set_variable -/* C88148 80242698 0220282D */ daddu $a1, $s1, $zero -/* C8814C 8024269C 8FBF0018 */ lw $ra, 0x18($sp) -/* C88150 802426A0 8FB10014 */ lw $s1, 0x14($sp) -/* C88154 802426A4 8FB00010 */ lw $s0, 0x10($sp) -/* C88158 802426A8 24020002 */ addiu $v0, $zero, 2 -/* C8815C 802426AC 03E00008 */ jr $ra -/* C88160 802426B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_802426B4_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_802426B4_C85AB0.s deleted file mode 100644 index 0c0dabb0c2..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_802426B4_C85AB0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426B4_C88164 -/* C88164 802426B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C88168 802426B8 AFB10014 */ sw $s1, 0x14($sp) -/* C8816C 802426BC 0080882D */ daddu $s1, $a0, $zero -/* C88170 802426C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C88174 802426C4 AFB00010 */ sw $s0, 0x10($sp) -/* C88178 802426C8 8E30000C */ lw $s0, 0xc($s1) -/* C8817C 802426CC 8E050000 */ lw $a1, ($s0) -/* C88180 802426D0 0C0B1EAF */ jal get_variable -/* C88184 802426D4 26100004 */ addiu $s0, $s0, 4 -/* C88188 802426D8 0C00EAD2 */ jal get_npc_safe -/* C8818C 802426DC 0040202D */ daddu $a0, $v0, $zero -/* C88190 802426E0 10400005 */ beqz $v0, .L802426F8 -/* C88194 802426E4 00000000 */ nop -/* C88198 802426E8 8E050000 */ lw $a1, ($s0) -/* C8819C 802426EC 844600A8 */ lh $a2, 0xa8($v0) -/* C881A0 802426F0 0C0B2026 */ jal set_variable -/* C881A4 802426F4 0220202D */ daddu $a0, $s1, $zero -.L802426F8: -/* C881A8 802426F8 8FBF0018 */ lw $ra, 0x18($sp) -/* C881AC 802426FC 8FB10014 */ lw $s1, 0x14($sp) -/* C881B0 80242700 8FB00010 */ lw $s0, 0x10($sp) -/* C881B4 80242704 24020002 */ addiu $v0, $zero, 2 -/* C881B8 80242708 03E00008 */ jr $ra -/* C881BC 8024270C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242710_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80242710_C85AB0.s deleted file mode 100644 index ca10133db9..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242710_C85AB0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242710_C881C0 -/* C881C0 80242710 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C881C4 80242714 AFB10014 */ sw $s1, 0x14($sp) -/* C881C8 80242718 0080882D */ daddu $s1, $a0, $zero -/* C881CC 8024271C AFBF0024 */ sw $ra, 0x24($sp) -/* C881D0 80242720 AFB40020 */ sw $s4, 0x20($sp) -/* C881D4 80242724 AFB3001C */ sw $s3, 0x1c($sp) -/* C881D8 80242728 AFB20018 */ sw $s2, 0x18($sp) -/* C881DC 8024272C AFB00010 */ sw $s0, 0x10($sp) -/* C881E0 80242730 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* C881E4 80242734 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* C881E8 80242738 F7B80038 */ sdc1 $f24, 0x38($sp) -/* C881EC 8024273C F7B60030 */ sdc1 $f22, 0x30($sp) -/* C881F0 80242740 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C881F4 80242744 8E30000C */ lw $s0, 0xc($s1) -/* C881F8 80242748 8E130000 */ lw $s3, ($s0) -/* C881FC 8024274C 26100004 */ addiu $s0, $s0, 4 -/* C88200 80242750 0C0B1EAF */ jal get_variable -/* C88204 80242754 0260282D */ daddu $a1, $s3, $zero -/* C88208 80242758 4482E000 */ mtc1 $v0, $f28 -/* C8820C 8024275C 00000000 */ nop -/* C88210 80242760 4680E720 */ cvt.s.w $f28, $f28 -/* C88214 80242764 8E140000 */ lw $s4, ($s0) -/* C88218 80242768 26100004 */ addiu $s0, $s0, 4 -/* C8821C 8024276C 0220202D */ daddu $a0, $s1, $zero -/* C88220 80242770 0C0B1EAF */ jal get_variable -/* C88224 80242774 0280282D */ daddu $a1, $s4, $zero -/* C88228 80242778 4482D000 */ mtc1 $v0, $f26 -/* C8822C 8024277C 00000000 */ nop -/* C88230 80242780 4680D6A0 */ cvt.s.w $f26, $f26 -/* C88234 80242784 8E100000 */ lw $s0, ($s0) -/* C88238 80242788 0220202D */ daddu $a0, $s1, $zero -/* C8823C 8024278C 0C0B1EAF */ jal get_variable -/* C88240 80242790 0200282D */ daddu $a1, $s0, $zero -/* C88244 80242794 4482C000 */ mtc1 $v0, $f24 -/* C88248 80242798 00000000 */ nop -/* C8824C 8024279C 4680C620 */ cvt.s.w $f24, $f24 -/* C88250 802427A0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* C88254 802427A4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* C88258 802427A8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C8825C 802427AC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C88260 802427B0 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* C88264 802427B4 44800000 */ mtc1 $zero, $f0 -/* C88268 802427B8 00031080 */ sll $v0, $v1, 2 -/* C8826C 802427BC 00431021 */ addu $v0, $v0, $v1 -/* C88270 802427C0 00021080 */ sll $v0, $v0, 2 -/* C88274 802427C4 00431023 */ subu $v0, $v0, $v1 -/* C88278 802427C8 000218C0 */ sll $v1, $v0, 3 -/* C8827C 802427CC 00431021 */ addu $v0, $v0, $v1 -/* C88280 802427D0 000210C0 */ sll $v0, $v0, 3 -/* C88284 802427D4 46001032 */ c.eq.s $f2, $f0 -/* C88288 802427D8 3C01800B */ lui $at, 0x800b -/* C8828C 802427DC 00220821 */ addu $at, $at, $v0 -/* C88290 802427E0 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* C88294 802427E4 45000005 */ bc1f .L802427FC -/* C88298 802427E8 00000000 */ nop -/* C8829C 802427EC 3C0142C8 */ lui $at, 0x42c8 -/* C882A0 802427F0 44810000 */ mtc1 $at, $f0 -/* C882A4 802427F4 08090A03 */ j .L8024280C -/* C882A8 802427F8 4600B581 */ sub.s $f22, $f22, $f0 -.L802427FC: -/* C882AC 802427FC 3C0142C8 */ lui $at, 0x42c8 -/* C882B0 80242800 44810000 */ mtc1 $at, $f0 -/* C882B4 80242804 00000000 */ nop -/* C882B8 80242808 4600B580 */ add.s $f22, $f22, $f0 -.L8024280C: -/* C882BC 8024280C 0C00A6C9 */ jal clamp_angle -/* C882C0 80242810 4600B306 */ mov.s $f12, $f22 -/* C882C4 80242814 46000586 */ mov.s $f22, $f0 -/* C882C8 80242818 3C014170 */ lui $at, 0x4170 -/* C882CC 8024281C 4481A000 */ mtc1 $at, $f20 -/* C882D0 80242820 0C00A8BB */ jal sin_deg -/* C882D4 80242824 4600B306 */ mov.s $f12, $f22 -/* C882D8 80242828 46140002 */ mul.s $f0, $f0, $f20 -/* C882DC 8024282C 00000000 */ nop -/* C882E0 80242830 864200B0 */ lh $v0, 0xb0($s2) -/* C882E4 80242834 3C013F00 */ lui $at, 0x3f00 -/* C882E8 80242838 44812000 */ mtc1 $at, $f4 -/* C882EC 8024283C 44821000 */ mtc1 $v0, $f2 -/* C882F0 80242840 00000000 */ nop -/* C882F4 80242844 468010A0 */ cvt.s.w $f2, $f2 -/* C882F8 80242848 46041082 */ mul.s $f2, $f2, $f4 -/* C882FC 8024284C 00000000 */ nop -/* C88300 80242850 4600E700 */ add.s $f28, $f28, $f0 -/* C88304 80242854 4602D680 */ add.s $f26, $f26, $f2 -/* C88308 80242858 0C00A8D4 */ jal cos_deg -/* C8830C 8024285C 4600B306 */ mov.s $f12, $f22 -/* C88310 80242860 46140002 */ mul.s $f0, $f0, $f20 -/* C88314 80242864 00000000 */ nop -/* C88318 80242868 0220202D */ daddu $a0, $s1, $zero -/* C8831C 8024286C 0260282D */ daddu $a1, $s3, $zero -/* C88320 80242870 4600E18D */ trunc.w.s $f6, $f28 -/* C88324 80242874 44063000 */ mfc1 $a2, $f6 -/* C88328 80242878 0C0B2026 */ jal set_variable -/* C8832C 8024287C 4600C601 */ sub.s $f24, $f24, $f0 -/* C88330 80242880 0220202D */ daddu $a0, $s1, $zero -/* C88334 80242884 4600D18D */ trunc.w.s $f6, $f26 -/* C88338 80242888 44063000 */ mfc1 $a2, $f6 -/* C8833C 8024288C 0C0B2026 */ jal set_variable -/* C88340 80242890 0280282D */ daddu $a1, $s4, $zero -/* C88344 80242894 0220202D */ daddu $a0, $s1, $zero -/* C88348 80242898 4600C18D */ trunc.w.s $f6, $f24 -/* C8834C 8024289C 44063000 */ mfc1 $a2, $f6 -/* C88350 802428A0 0C0B2026 */ jal set_variable -/* C88354 802428A4 0200282D */ daddu $a1, $s0, $zero -/* C88358 802428A8 8FBF0024 */ lw $ra, 0x24($sp) -/* C8835C 802428AC 8FB40020 */ lw $s4, 0x20($sp) -/* C88360 802428B0 8FB3001C */ lw $s3, 0x1c($sp) -/* C88364 802428B4 8FB20018 */ lw $s2, 0x18($sp) -/* C88368 802428B8 8FB10014 */ lw $s1, 0x14($sp) -/* C8836C 802428BC 8FB00010 */ lw $s0, 0x10($sp) -/* C88370 802428C0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* C88374 802428C4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* C88378 802428C8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* C8837C 802428CC D7B60030 */ ldc1 $f22, 0x30($sp) -/* C88380 802428D0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C88384 802428D4 24020002 */ addiu $v0, $zero, 2 -/* C88388 802428D8 03E00008 */ jr $ra -/* C8838C 802428DC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_802428E0_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_802428E0_C85AB0.s deleted file mode 100644 index 7aba5596e3..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_802428E0_C85AB0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428E0_C88390 -/* C88390 802428E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C88394 802428E4 AFBF0010 */ sw $ra, 0x10($sp) -/* C88398 802428E8 10A00003 */ beqz $a1, .L802428F8 -/* C8839C 802428EC 8C86000C */ lw $a2, 0xc($a0) -/* C883A0 802428F0 3C018024 */ lui $at, 0x8024 -/* C883A4 802428F4 AC2040D8 */ sw $zero, 0x40d8($at) -.L802428F8: -/* C883A8 802428F8 3C038024 */ lui $v1, 0x8024 -/* C883AC 802428FC 246340D8 */ addiu $v1, $v1, 0x40d8 -/* C883B0 80242900 8C620000 */ lw $v0, ($v1) -/* C883B4 80242904 54400003 */ bnel $v0, $zero, .L80242914 -/* C883B8 80242908 AC600000 */ sw $zero, ($v1) -/* C883BC 8024290C 08090A4A */ j .L80242928 -/* C883C0 80242910 0000102D */ daddu $v0, $zero, $zero -.L80242914: -/* C883C4 80242914 8CC50000 */ lw $a1, ($a2) -/* C883C8 80242918 3C068024 */ lui $a2, 0x8024 -/* C883CC 8024291C 0C0B2026 */ jal set_variable -/* C883D0 80242920 8CC640DC */ lw $a2, 0x40dc($a2) -/* C883D4 80242924 24020002 */ addiu $v0, $zero, 2 -.L80242928: -/* C883D8 80242928 8FBF0010 */ lw $ra, 0x10($sp) -/* C883DC 8024292C 03E00008 */ jr $ra -/* C883E0 80242930 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242934_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80242934_C85AB0.s deleted file mode 100644 index d8f6ab9855..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242934_C85AB0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242934_C883E4 -/* C883E4 80242934 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C883E8 80242938 AFBF0010 */ sw $ra, 0x10($sp) -/* C883EC 8024293C 8C82000C */ lw $v0, 0xc($a0) -/* C883F0 80242940 0C0B1EAF */ jal get_variable -/* C883F4 80242944 8C450000 */ lw $a1, ($v0) -/* C883F8 80242948 3C018024 */ lui $at, 0x8024 -/* C883FC 8024294C AC2240DC */ sw $v0, 0x40dc($at) -/* C88400 80242950 24020002 */ addiu $v0, $zero, 2 -/* C88404 80242954 8FBF0010 */ lw $ra, 0x10($sp) -/* C88408 80242958 24030001 */ addiu $v1, $zero, 1 -/* C8840C 8024295C 3C018024 */ lui $at, 0x8024 -/* C88410 80242960 AC2340D8 */ sw $v1, 0x40d8($at) -/* C88414 80242964 03E00008 */ jr $ra -/* C88418 80242968 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_8024296C_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_8024296C_C85AB0.s deleted file mode 100644 index 86d8b2f529..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_8024296C_C85AB0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024296C_C8841C -/* C8841C 8024296C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C88420 80242970 AFBF0010 */ sw $ra, 0x10($sp) -/* C88424 80242974 8C82000C */ lw $v0, 0xc($a0) -/* C88428 80242978 0C0B1EAF */ jal get_variable -/* C8842C 8024297C 8C450000 */ lw $a1, ($v0) -/* C88430 80242980 0040182D */ daddu $v1, $v0, $zero -/* C88434 80242984 10600012 */ beqz $v1, .L802429D0 -/* C88438 80242988 0000202D */ daddu $a0, $zero, $zero -/* C8843C 8024298C 8C620000 */ lw $v0, ($v1) -/* C88440 80242990 5040000A */ beql $v0, $zero, .L802429BC -/* C88444 80242994 00041080 */ sll $v0, $a0, 2 -/* C88448 80242998 3C058024 */ lui $a1, 0x8024 -/* C8844C 8024299C 24A565F0 */ addiu $a1, $a1, 0x65f0 -.L802429A0: -/* C88450 802429A0 24630004 */ addiu $v1, $v1, 4 -/* C88454 802429A4 24840001 */ addiu $a0, $a0, 1 -/* C88458 802429A8 ACA20000 */ sw $v0, ($a1) -/* C8845C 802429AC 8C620000 */ lw $v0, ($v1) -/* C88460 802429B0 1440FFFB */ bnez $v0, .L802429A0 -/* C88464 802429B4 24A50004 */ addiu $a1, $a1, 4 -/* C88468 802429B8 00041080 */ sll $v0, $a0, 2 -.L802429BC: -/* C8846C 802429BC 3C018024 */ lui $at, 0x8024 -/* C88470 802429C0 00220821 */ addu $at, $at, $v0 -/* C88474 802429C4 AC2065F0 */ sw $zero, 0x65f0($at) -/* C88478 802429C8 08090A7E */ j .L802429F8 -/* C8847C 802429CC 00000000 */ nop -.L802429D0: -/* C88480 802429D0 3C038024 */ lui $v1, 0x8024 -/* C88484 802429D4 246365F0 */ addiu $v1, $v1, 0x65f0 -/* C88488 802429D8 0060282D */ daddu $a1, $v1, $zero -.L802429DC: -/* C8848C 802429DC 24820010 */ addiu $v0, $a0, 0x10 -/* C88490 802429E0 AC620000 */ sw $v0, ($v1) -/* C88494 802429E4 24630004 */ addiu $v1, $v1, 4 -/* C88498 802429E8 24840001 */ addiu $a0, $a0, 1 -/* C8849C 802429EC 28820070 */ slti $v0, $a0, 0x70 -/* C884A0 802429F0 1440FFFA */ bnez $v0, .L802429DC -/* C884A4 802429F4 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802429F8: -/* C884A8 802429F8 8FBF0010 */ lw $ra, 0x10($sp) -/* C884AC 802429FC 24020002 */ addiu $v0, $zero, 2 -/* C884B0 80242A00 03E00008 */ jr $ra -/* C884B4 80242A04 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242A08_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80242A08_C85AB0.s deleted file mode 100644 index e9541fa82f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242A08_C85AB0.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A08_C884B8 -/* C884B8 80242A08 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C884BC 80242A0C AFB10014 */ sw $s1, 0x14($sp) -/* C884C0 80242A10 0080882D */ daddu $s1, $a0, $zero -/* C884C4 80242A14 AFBF0018 */ sw $ra, 0x18($sp) -/* C884C8 80242A18 AFB00010 */ sw $s0, 0x10($sp) -/* C884CC 80242A1C 8E30000C */ lw $s0, 0xc($s1) -/* C884D0 80242A20 8E050000 */ lw $a1, ($s0) -/* C884D4 80242A24 0C0B1EAF */ jal get_variable -/* C884D8 80242A28 26100004 */ addiu $s0, $s0, 4 -/* C884DC 80242A2C AE22008C */ sw $v0, 0x8c($s1) -/* C884E0 80242A30 8E050000 */ lw $a1, ($s0) -/* C884E4 80242A34 26100004 */ addiu $s0, $s0, 4 -/* C884E8 80242A38 0C0B1EAF */ jal get_variable -/* C884EC 80242A3C 0220202D */ daddu $a0, $s1, $zero -/* C884F0 80242A40 AE220090 */ sw $v0, 0x90($s1) -/* C884F4 80242A44 8E050000 */ lw $a1, ($s0) -/* C884F8 80242A48 26100004 */ addiu $s0, $s0, 4 -/* C884FC 80242A4C 0C0B1EAF */ jal get_variable -/* C88500 80242A50 0220202D */ daddu $a0, $s1, $zero -/* C88504 80242A54 AE220094 */ sw $v0, 0x94($s1) -/* C88508 80242A58 8E050000 */ lw $a1, ($s0) -/* C8850C 80242A5C 26100004 */ addiu $s0, $s0, 4 -/* C88510 80242A60 0C0B1EAF */ jal get_variable -/* C88514 80242A64 0220202D */ daddu $a0, $s1, $zero -/* C88518 80242A68 AE220098 */ sw $v0, 0x98($s1) -/* C8851C 80242A6C 8E050000 */ lw $a1, ($s0) -/* C88520 80242A70 26100004 */ addiu $s0, $s0, 4 -/* C88524 80242A74 0C0B1EAF */ jal get_variable -/* C88528 80242A78 0220202D */ daddu $a0, $s1, $zero -/* C8852C 80242A7C AE22009C */ sw $v0, 0x9c($s1) -/* C88530 80242A80 8E050000 */ lw $a1, ($s0) -/* C88534 80242A84 26100004 */ addiu $s0, $s0, 4 -/* C88538 80242A88 0C0B1EAF */ jal get_variable -/* C8853C 80242A8C 0220202D */ daddu $a0, $s1, $zero -/* C88540 80242A90 AE2200A0 */ sw $v0, 0xa0($s1) -/* C88544 80242A94 8E050000 */ lw $a1, ($s0) -/* C88548 80242A98 26100004 */ addiu $s0, $s0, 4 -/* C8854C 80242A9C 0C0B1EAF */ jal get_variable -/* C88550 80242AA0 0220202D */ daddu $a0, $s1, $zero -/* C88554 80242AA4 AE2200A4 */ sw $v0, 0xa4($s1) -/* C88558 80242AA8 8E050000 */ lw $a1, ($s0) -/* C8855C 80242AAC 26100004 */ addiu $s0, $s0, 4 -/* C88560 80242AB0 0C0B1EAF */ jal get_variable -/* C88564 80242AB4 0220202D */ daddu $a0, $s1, $zero -/* C88568 80242AB8 AE2200A8 */ sw $v0, 0xa8($s1) -/* C8856C 80242ABC 8E050000 */ lw $a1, ($s0) -/* C88570 80242AC0 26100004 */ addiu $s0, $s0, 4 -/* C88574 80242AC4 0C0B1EAF */ jal get_variable -/* C88578 80242AC8 0220202D */ daddu $a0, $s1, $zero -/* C8857C 80242ACC AE2200AC */ sw $v0, 0xac($s1) -/* C88580 80242AD0 8E050000 */ lw $a1, ($s0) -/* C88584 80242AD4 0C0B1EAF */ jal get_variable -/* C88588 80242AD8 0220202D */ daddu $a0, $s1, $zero -/* C8858C 80242ADC AE2200B0 */ sw $v0, 0xb0($s1) -/* C88590 80242AE0 8FBF0018 */ lw $ra, 0x18($sp) -/* C88594 80242AE4 8FB10014 */ lw $s1, 0x14($sp) -/* C88598 80242AE8 8FB00010 */ lw $s0, 0x10($sp) -/* C8859C 80242AEC 24020002 */ addiu $v0, $zero, 2 -/* C885A0 80242AF0 03E00008 */ jr $ra -/* C885A4 80242AF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242AF8_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80242AF8_C85AB0.s deleted file mode 100644 index 580fc25257..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242AF8_C85AB0.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AF8_C885A8 -/* C885A8 80242AF8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C885AC 80242AFC AFB1001C */ sw $s1, 0x1c($sp) -/* C885B0 80242B00 0080882D */ daddu $s1, $a0, $zero -/* C885B4 80242B04 AFBF0034 */ sw $ra, 0x34($sp) -/* C885B8 80242B08 AFB60030 */ sw $s6, 0x30($sp) -/* C885BC 80242B0C AFB5002C */ sw $s5, 0x2c($sp) -/* C885C0 80242B10 AFB40028 */ sw $s4, 0x28($sp) -/* C885C4 80242B14 AFB30024 */ sw $s3, 0x24($sp) -/* C885C8 80242B18 AFB20020 */ sw $s2, 0x20($sp) -/* C885CC 80242B1C AFB00018 */ sw $s0, 0x18($sp) -/* C885D0 80242B20 F7B60040 */ sdc1 $f22, 0x40($sp) -/* C885D4 80242B24 F7B40038 */ sdc1 $f20, 0x38($sp) -/* C885D8 80242B28 8E30000C */ lw $s0, 0xc($s1) -/* C885DC 80242B2C 8E160000 */ lw $s6, ($s0) -/* C885E0 80242B30 26100004 */ addiu $s0, $s0, 4 -/* C885E4 80242B34 0C0B1EAF */ jal get_variable -/* C885E8 80242B38 02C0282D */ daddu $a1, $s6, $zero -/* C885EC 80242B3C 44820000 */ mtc1 $v0, $f0 -/* C885F0 80242B40 00000000 */ nop -/* C885F4 80242B44 46800020 */ cvt.s.w $f0, $f0 -/* C885F8 80242B48 E7A00010 */ swc1 $f0, 0x10($sp) -/* C885FC 80242B4C 8E140000 */ lw $s4, ($s0) -/* C88600 80242B50 26100004 */ addiu $s0, $s0, 4 -/* C88604 80242B54 0220202D */ daddu $a0, $s1, $zero -/* C88608 80242B58 0C0B1EAF */ jal get_variable -/* C8860C 80242B5C 0280282D */ daddu $a1, $s4, $zero -/* C88610 80242B60 0220202D */ daddu $a0, $s1, $zero -/* C88614 80242B64 8E150000 */ lw $s5, ($s0) -/* C88618 80242B68 4482B000 */ mtc1 $v0, $f22 -/* C8861C 80242B6C 00000000 */ nop -/* C88620 80242B70 4680B5A0 */ cvt.s.w $f22, $f22 -/* C88624 80242B74 0C0B1EAF */ jal get_variable -/* C88628 80242B78 02A0282D */ daddu $a1, $s5, $zero -/* C8862C 80242B7C 2404FFFC */ addiu $a0, $zero, -4 -/* C88630 80242B80 44820000 */ mtc1 $v0, $f0 -/* C88634 80242B84 00000000 */ nop -/* C88638 80242B88 46800020 */ cvt.s.w $f0, $f0 -/* C8863C 80242B8C 0C00EABB */ jal get_npc_unsafe -/* C88640 80242B90 E7A00014 */ swc1 $f0, 0x14($sp) -/* C88644 80242B94 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C88648 80242B98 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C8864C 80242B9C 3C014334 */ lui $at, 0x4334 -/* C88650 80242BA0 44816000 */ mtc1 $at, $f12 -/* C88654 80242BA4 00041880 */ sll $v1, $a0, 2 -/* C88658 80242BA8 00641821 */ addu $v1, $v1, $a0 -/* C8865C 80242BAC 00031880 */ sll $v1, $v1, 2 -/* C88660 80242BB0 00641823 */ subu $v1, $v1, $a0 -/* C88664 80242BB4 000320C0 */ sll $a0, $v1, 3 -/* C88668 80242BB8 00641821 */ addu $v1, $v1, $a0 -/* C8866C 80242BBC 000318C0 */ sll $v1, $v1, 3 -/* C88670 80242BC0 3C01800B */ lui $at, 0x800b -/* C88674 80242BC4 00230821 */ addu $at, $at, $v1 -/* C88678 80242BC8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C8867C 80242BCC 460C0300 */ add.s $f12, $f0, $f12 -/* C88680 80242BD0 0C00A6C9 */ jal clamp_angle -/* C88684 80242BD4 0040982D */ daddu $s3, $v0, $zero -/* C88688 80242BD8 27B00010 */ addiu $s0, $sp, 0x10 -/* C8868C 80242BDC 0200202D */ daddu $a0, $s0, $zero -/* C88690 80242BE0 27B20014 */ addiu $s2, $sp, 0x14 -/* C88694 80242BE4 0240282D */ daddu $a1, $s2, $zero -/* C88698 80242BE8 3C064170 */ lui $a2, 0x4170 -/* C8869C 80242BEC 8E67000C */ lw $a3, 0xc($s3) -/* C886A0 80242BF0 0C00A7E7 */ jal add_vec2D_polar -/* C886A4 80242BF4 46000506 */ mov.s $f20, $f0 -/* C886A8 80242BF8 0200202D */ daddu $a0, $s0, $zero -/* C886AC 80242BFC 3C064120 */ lui $a2, 0x4120 -/* C886B0 80242C00 4407A000 */ mfc1 $a3, $f20 -/* C886B4 80242C04 0C00A7E7 */ jal add_vec2D_polar -/* C886B8 80242C08 0240282D */ daddu $a1, $s2, $zero -/* C886BC 80242C0C 0220202D */ daddu $a0, $s1, $zero -/* C886C0 80242C10 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C886C4 80242C14 4600008D */ trunc.w.s $f2, $f0 -/* C886C8 80242C18 44061000 */ mfc1 $a2, $f2 -/* C886CC 80242C1C 0C0B2026 */ jal set_variable -/* C886D0 80242C20 02C0282D */ daddu $a1, $s6, $zero -/* C886D4 80242C24 0220202D */ daddu $a0, $s1, $zero -/* C886D8 80242C28 4600B08D */ trunc.w.s $f2, $f22 -/* C886DC 80242C2C 44061000 */ mfc1 $a2, $f2 -/* C886E0 80242C30 0C0B2026 */ jal set_variable -/* C886E4 80242C34 0280282D */ daddu $a1, $s4, $zero -/* C886E8 80242C38 0220202D */ daddu $a0, $s1, $zero -/* C886EC 80242C3C C7A00014 */ lwc1 $f0, 0x14($sp) -/* C886F0 80242C40 4600008D */ trunc.w.s $f2, $f0 -/* C886F4 80242C44 44061000 */ mfc1 $a2, $f2 -/* C886F8 80242C48 0C0B2026 */ jal set_variable -/* C886FC 80242C4C 02A0282D */ daddu $a1, $s5, $zero -/* C88700 80242C50 8FBF0034 */ lw $ra, 0x34($sp) -/* C88704 80242C54 8FB60030 */ lw $s6, 0x30($sp) -/* C88708 80242C58 8FB5002C */ lw $s5, 0x2c($sp) -/* C8870C 80242C5C 8FB40028 */ lw $s4, 0x28($sp) -/* C88710 80242C60 8FB30024 */ lw $s3, 0x24($sp) -/* C88714 80242C64 8FB20020 */ lw $s2, 0x20($sp) -/* C88718 80242C68 8FB1001C */ lw $s1, 0x1c($sp) -/* C8871C 80242C6C 8FB00018 */ lw $s0, 0x18($sp) -/* C88720 80242C70 D7B60040 */ ldc1 $f22, 0x40($sp) -/* C88724 80242C74 D7B40038 */ ldc1 $f20, 0x38($sp) -/* C88728 80242C78 24020002 */ addiu $v0, $zero, 2 -/* C8872C 80242C7C 03E00008 */ jr $ra -/* C88730 80242C80 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242C84_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80242C84_C85AB0.s deleted file mode 100644 index 9529281c77..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242C84_C85AB0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C84_C88734 -/* C88734 80242C84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C88738 80242C88 AFB00010 */ sw $s0, 0x10($sp) -/* C8873C 80242C8C 0080802D */ daddu $s0, $a0, $zero -/* C88740 80242C90 AFBF0014 */ sw $ra, 0x14($sp) -/* C88744 80242C94 0C00EABB */ jal get_npc_unsafe -/* C88748 80242C98 8E04008C */ lw $a0, 0x8c($s0) -/* C8874C 80242C9C 0040282D */ daddu $a1, $v0, $zero -/* C88750 80242CA0 8E040094 */ lw $a0, 0x94($s0) -/* C88754 80242CA4 8CA30028 */ lw $v1, 0x28($a1) -/* C88758 80242CA8 ACA40028 */ sw $a0, 0x28($a1) -/* C8875C 80242CAC 8FBF0014 */ lw $ra, 0x14($sp) -/* C88760 80242CB0 8FB00010 */ lw $s0, 0x10($sp) -/* C88764 80242CB4 24020002 */ addiu $v0, $zero, 2 -/* C88768 80242CB8 3C018024 */ lui $at, 0x8024 -/* C8876C 80242CBC AC2367B4 */ sw $v1, 0x67b4($at) -/* C88770 80242CC0 03E00008 */ jr $ra -/* C88774 80242CC4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242CC8_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80242CC8_C85AB0.s deleted file mode 100644 index 4d99d87e09..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242CC8_C85AB0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242CC8_C88778 -/* C88778 80242CC8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8877C 80242CCC AFBF0010 */ sw $ra, 0x10($sp) -/* C88780 80242CD0 0C00EABB */ jal get_npc_unsafe -/* C88784 80242CD4 8C84008C */ lw $a0, 0x8c($a0) -/* C88788 80242CD8 3C038024 */ lui $v1, 0x8024 -/* C8878C 80242CDC 8C6367B4 */ lw $v1, 0x67b4($v1) -/* C88790 80242CE0 AC430028 */ sw $v1, 0x28($v0) -/* C88794 80242CE4 8FBF0010 */ lw $ra, 0x10($sp) -/* C88798 80242CE8 24020002 */ addiu $v0, $zero, 2 -/* C8879C 80242CEC 03E00008 */ jr $ra -/* C887A0 80242CF0 27BD0018 */ addiu $sp, $sp, 0x18 -/* C887A4 80242CF4 00000000 */ nop -/* C887A8 80242CF8 00000000 */ nop -/* C887AC 80242CFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242D00_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80242D00_C85AB0.s deleted file mode 100644 index 274e03d9e3..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242D00_C85AB0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D00_C887B0 -/* C887B0 80242D00 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C887B4 80242D04 AFBF0010 */ sw $ra, 0x10($sp) -/* C887B8 80242D08 0C03A8CD */ jal subtract_hp -/* C887BC 80242D0C 24040001 */ addiu $a0, $zero, 1 -/* C887C0 80242D10 8FBF0010 */ lw $ra, 0x10($sp) -/* C887C4 80242D14 24020002 */ addiu $v0, $zero, 2 -/* C887C8 80242D18 03E00008 */ jr $ra -/* C887CC 80242D1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242D20_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80242D20_C85AB0.s deleted file mode 100644 index fa058a0cd3..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242D20_C85AB0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D20_C887D0 -/* C887D0 80242D20 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C887D4 80242D24 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* C887D8 80242D28 80620000 */ lb $v0, ($v1) -/* C887DC 80242D2C 10400004 */ beqz $v0, .L80242D40 -/* C887E0 80242D30 2402FFFF */ addiu $v0, $zero, -1 -/* C887E4 80242D34 80620003 */ lb $v0, 3($v1) -/* C887E8 80242D38 08090B51 */ j .L80242D44 -/* C887EC 80242D3C AC820084 */ sw $v0, 0x84($a0) -.L80242D40: -/* C887F0 80242D40 AC820084 */ sw $v0, 0x84($a0) -.L80242D44: -/* C887F4 80242D44 03E00008 */ jr $ra -/* C887F8 80242D48 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242E84_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80242E84_C85AB0.s deleted file mode 100644 index 07cf6bf3b4..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242E84_C85AB0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E84_C88934 -/* C88934 80242E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C88938 80242E88 AFBF0010 */ sw $ra, 0x10($sp) -/* C8893C 80242E8C 8C82000C */ lw $v0, 0xc($a0) -/* C88940 80242E90 0C0B1EAF */ jal get_variable -/* C88944 80242E94 8C450000 */ lw $a1, ($v0) -/* C88948 80242E98 44820000 */ mtc1 $v0, $f0 -/* C8894C 80242E9C 00000000 */ nop -/* C88950 80242EA0 46800020 */ cvt.s.w $f0, $f0 -/* C88954 80242EA4 8FBF0010 */ lw $ra, 0x10($sp) -/* C88958 80242EA8 24020002 */ addiu $v0, $zero, 2 -/* C8895C 80242EAC 3C018011 */ lui $at, 0x8011 -/* C88960 80242EB0 E420F054 */ swc1 $f0, -0xfac($at) -/* C88964 80242EB4 03E00008 */ jr $ra -/* C88968 80242EB8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242EBC_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80242EBC_C85AB0.s deleted file mode 100644 index 78f664db91..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242EBC_C85AB0.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242EBC_C8896C -/* C8896C 80242EBC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C88970 80242EC0 AFB00010 */ sw $s0, 0x10($sp) -/* C88974 80242EC4 0080802D */ daddu $s0, $a0, $zero -/* C88978 80242EC8 AFBF0014 */ sw $ra, 0x14($sp) -/* C8897C 80242ECC F7B40018 */ sdc1 $f20, 0x18($sp) -/* C88980 80242ED0 C60C0090 */ lwc1 $f12, 0x90($s0) -/* C88984 80242ED4 46806320 */ cvt.s.w $f12, $f12 -/* C88988 80242ED8 3C018024 */ lui $at, 0x8024 -/* C8898C 80242EDC D43465D0 */ ldc1 $f20, 0x65d0($at) -/* C88990 80242EE0 46006307 */ neg.s $f12, $f12 -/* C88994 80242EE4 46006321 */ cvt.d.s $f12, $f12 -/* C88998 80242EE8 46346301 */ sub.d $f12, $f12, $f20 -/* C8899C 80242EEC 0C00A8D4 */ jal cos_deg -/* C889A0 80242EF0 46206320 */ cvt.s.d $f12, $f12 -/* C889A4 80242EF4 3C014008 */ lui $at, 0x4008 -/* C889A8 80242EF8 44811800 */ mtc1 $at, $f3 -/* C889AC 80242EFC 44801000 */ mtc1 $zero, $f2 -/* C889B0 80242F00 46000021 */ cvt.d.s $f0, $f0 -/* C889B4 80242F04 46220002 */ mul.d $f0, $f0, $f2 -/* C889B8 80242F08 00000000 */ nop -/* C889BC 80242F0C C60C0090 */ lwc1 $f12, 0x90($s0) -/* C889C0 80242F10 46806320 */ cvt.s.w $f12, $f12 -/* C889C4 80242F14 46006307 */ neg.s $f12, $f12 -/* C889C8 80242F18 46006321 */ cvt.d.s $f12, $f12 -/* C889CC 80242F1C 46346301 */ sub.d $f12, $f12, $f20 -/* C889D0 80242F20 3C018024 */ lui $at, 0x8024 -/* C889D4 80242F24 D42265D8 */ ldc1 $f2, 0x65d8($at) -/* C889D8 80242F28 46220001 */ sub.d $f0, $f0, $f2 -/* C889DC 80242F2C 4620010D */ trunc.w.d $f4, $f0 -/* C889E0 80242F30 E6040098 */ swc1 $f4, 0x98($s0) -/* C889E4 80242F34 0C00A8BB */ jal sin_deg -/* C889E8 80242F38 46206320 */ cvt.s.d $f12, $f12 -/* C889EC 80242F3C 3C014014 */ lui $at, 0x4014 -/* C889F0 80242F40 44811800 */ mtc1 $at, $f3 -/* C889F4 80242F44 44801000 */ mtc1 $zero, $f2 -/* C889F8 80242F48 46000021 */ cvt.d.s $f0, $f0 -/* C889FC 80242F4C 46220002 */ mul.d $f0, $f0, $f2 -/* C88A00 80242F50 00000000 */ nop -/* C88A04 80242F54 4620010D */ trunc.w.d $f4, $f0 -/* C88A08 80242F58 E604009C */ swc1 $f4, 0x9c($s0) -/* C88A0C 80242F5C 8FBF0014 */ lw $ra, 0x14($sp) -/* C88A10 80242F60 8FB00010 */ lw $s0, 0x10($sp) -/* C88A14 80242F64 D7B40018 */ ldc1 $f20, 0x18($sp) -/* C88A18 80242F68 24020002 */ addiu $v0, $zero, 2 -/* C88A1C 80242F6C 03E00008 */ jr $ra -/* C88A20 80242F70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242F74_C85AB0.s b/asm/nonmatchings/world/area_kzn/kzn_17/func_80242F74_C85AB0.s deleted file mode 100644 index b0425e0b4e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/func_80242F74_C85AB0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F74_C88A24 -/* C88A24 80242F74 3C018024 */ lui $at, 0x8024 -/* C88A28 80242F78 D42265E0 */ ldc1 $f2, 0x65e0($at) -/* C88A2C 80242F7C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C88A30 80242F80 AFB00010 */ sw $s0, 0x10($sp) -/* C88A34 80242F84 0080802D */ daddu $s0, $a0, $zero -/* C88A38 80242F88 AFBF0014 */ sw $ra, 0x14($sp) -/* C88A3C 80242F8C C6000084 */ lwc1 $f0, 0x84($s0) -/* C88A40 80242F90 46800021 */ cvt.d.w $f0, $f0 -/* C88A44 80242F94 46201081 */ sub.d $f2, $f2, $f0 -/* C88A48 80242F98 462010A0 */ cvt.s.d $f2, $f2 -/* C88A4C 80242F9C 46021082 */ mul.s $f2, $f2, $f2 -/* C88A50 80242FA0 00000000 */ nop -/* C88A54 80242FA4 3C018024 */ lui $at, 0x8024 -/* C88A58 80242FA8 D42065E8 */ ldc1 $f0, 0x65e8($at) -/* C88A5C 80242FAC C604008C */ lwc1 $f4, 0x8c($s0) -/* C88A60 80242FB0 46802121 */ cvt.d.w $f4, $f4 -/* C88A64 80242FB4 46240001 */ sub.d $f0, $f0, $f4 -/* C88A68 80242FB8 46200020 */ cvt.s.d $f0, $f0 -/* C88A6C 80242FBC 46000002 */ mul.s $f0, $f0, $f0 -/* C88A70 80242FC0 00000000 */ nop -/* C88A74 80242FC4 46001300 */ add.s $f12, $f2, $f0 -/* C88A78 80242FC8 46006004 */ sqrt.s $f0, $f12 -/* C88A7C 80242FCC 46000032 */ c.eq.s $f0, $f0 -/* C88A80 80242FD0 00000000 */ nop -/* C88A84 80242FD4 45030004 */ bc1tl .L80242FE8 -/* C88A88 80242FD8 46000007 */ neg.s $f0, $f0 -/* C88A8C 80242FDC 0C0187BC */ jal sqrtf -/* C88A90 80242FE0 00000000 */ nop -/* C88A94 80242FE4 46000007 */ neg.s $f0, $f0 -.L80242FE8: -/* C88A98 80242FE8 4600018D */ trunc.w.s $f6, $f0 -/* C88A9C 80242FEC E6060090 */ swc1 $f6, 0x90($s0) -/* C88AA0 80242FF0 8FBF0014 */ lw $ra, 0x14($sp) -/* C88AA4 80242FF4 8FB00010 */ lw $s0, 0x10($sp) -/* C88AA8 80242FF8 24020002 */ addiu $v0, $zero, 2 -/* C88AAC 80242FFC 03E00008 */ jr $ra -/* C88AB0 80243000 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_18/func_80240040_C8C0A0.s b/asm/nonmatchings/world/area_kzn/kzn_18/func_80240040_C8C0A0.s deleted file mode 100644 index 0cadb364a4..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_18/func_80240040_C8C0A0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_C8C0E0 -/* C8C0E0 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8C0E4 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* C8C0E8 80240048 0080802D */ daddu $s0, $a0, $zero -/* C8C0EC 8024004C AFBF0014 */ sw $ra, 0x14($sp) -/* C8C0F0 80240050 8E0300A8 */ lw $v1, 0xa8($s0) -/* C8C0F4 80240054 8E020088 */ lw $v0, 0x88($s0) -/* C8C0F8 80240058 00621821 */ addu $v1, $v1, $v0 -/* C8C0FC 8024005C 04610004 */ bgez $v1, .L80240070 -/* C8C100 80240060 AE0300A8 */ sw $v1, 0xa8($s0) -/* C8C104 80240064 3C020002 */ lui $v0, 2 -/* C8C108 80240068 08090020 */ j .L80240080 -/* C8C10C 8024006C 00621021 */ addu $v0, $v1, $v0 -.L80240070: -/* C8C110 80240070 3C040002 */ lui $a0, 2 -/* C8C114 80240074 0083102A */ slt $v0, $a0, $v1 -/* C8C118 80240078 10400002 */ beqz $v0, .L80240084 -/* C8C11C 8024007C 00641023 */ subu $v0, $v1, $a0 -.L80240080: -/* C8C120 80240080 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240084: -/* C8C124 80240084 8E0300AC */ lw $v1, 0xac($s0) -/* C8C128 80240088 8E02008C */ lw $v0, 0x8c($s0) -/* C8C12C 8024008C 00621821 */ addu $v1, $v1, $v0 -/* C8C130 80240090 04610004 */ bgez $v1, .L802400A4 -/* C8C134 80240094 AE0300AC */ sw $v1, 0xac($s0) -/* C8C138 80240098 3C020002 */ lui $v0, 2 -/* C8C13C 8024009C 0809002D */ j .L802400B4 -/* C8C140 802400A0 00621021 */ addu $v0, $v1, $v0 -.L802400A4: -/* C8C144 802400A4 3C040002 */ lui $a0, 2 -/* C8C148 802400A8 0083102A */ slt $v0, $a0, $v1 -/* C8C14C 802400AC 10400002 */ beqz $v0, .L802400B8 -/* C8C150 802400B0 00641023 */ subu $v0, $v1, $a0 -.L802400B4: -/* C8C154 802400B4 AE0200AC */ sw $v0, 0xac($s0) -.L802400B8: -/* C8C158 802400B8 8E0300B0 */ lw $v1, 0xb0($s0) -/* C8C15C 802400BC 8E020090 */ lw $v0, 0x90($s0) -/* C8C160 802400C0 00621821 */ addu $v1, $v1, $v0 -/* C8C164 802400C4 04610004 */ bgez $v1, .L802400D8 -/* C8C168 802400C8 AE0300B0 */ sw $v1, 0xb0($s0) -/* C8C16C 802400CC 3C020002 */ lui $v0, 2 -/* C8C170 802400D0 0809003A */ j .L802400E8 -/* C8C174 802400D4 00621021 */ addu $v0, $v1, $v0 -.L802400D8: -/* C8C178 802400D8 3C040002 */ lui $a0, 2 -/* C8C17C 802400DC 0083102A */ slt $v0, $a0, $v1 -/* C8C180 802400E0 10400002 */ beqz $v0, .L802400EC -/* C8C184 802400E4 00641023 */ subu $v0, $v1, $a0 -.L802400E8: -/* C8C188 802400E8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400EC: -/* C8C18C 802400EC 8E0300B4 */ lw $v1, 0xb4($s0) -/* C8C190 802400F0 8E020094 */ lw $v0, 0x94($s0) -/* C8C194 802400F4 00621821 */ addu $v1, $v1, $v0 -/* C8C198 802400F8 04610004 */ bgez $v1, .L8024010C -/* C8C19C 802400FC AE0300B4 */ sw $v1, 0xb4($s0) -/* C8C1A0 80240100 3C020002 */ lui $v0, 2 -/* C8C1A4 80240104 08090047 */ j .L8024011C -/* C8C1A8 80240108 00621021 */ addu $v0, $v1, $v0 -.L8024010C: -/* C8C1AC 8024010C 3C040002 */ lui $a0, 2 -/* C8C1B0 80240110 0083102A */ slt $v0, $a0, $v1 -/* C8C1B4 80240114 10400002 */ beqz $v0, .L80240120 -/* C8C1B8 80240118 00641023 */ subu $v0, $v1, $a0 -.L8024011C: -/* C8C1BC 8024011C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240120: -/* C8C1C0 80240120 8E040084 */ lw $a0, 0x84($s0) -/* C8C1C4 80240124 0C046F07 */ jal set_main_pan_u -/* C8C1C8 80240128 8E0500A8 */ lw $a1, 0xa8($s0) -/* C8C1CC 8024012C 8E040084 */ lw $a0, 0x84($s0) -/* C8C1D0 80240130 0C046F0D */ jal set_main_pan_v -/* C8C1D4 80240134 8E0500AC */ lw $a1, 0xac($s0) -/* C8C1D8 80240138 8E040084 */ lw $a0, 0x84($s0) -/* C8C1DC 8024013C 0C046F13 */ jal set_aux_pan_u -/* C8C1E0 80240140 8E0500B0 */ lw $a1, 0xb0($s0) -/* C8C1E4 80240144 8E040084 */ lw $a0, 0x84($s0) -/* C8C1E8 80240148 0C046F19 */ jal set_aux_pan_v -/* C8C1EC 8024014C 8E0500B4 */ lw $a1, 0xb4($s0) -/* C8C1F0 80240150 8FBF0014 */ lw $ra, 0x14($sp) -/* C8C1F4 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* C8C1F8 80240158 0000102D */ daddu $v0, $zero, $zero -/* C8C1FC 8024015C 03E00008 */ jr $ra -/* C8C200 80240160 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_18/func_80240164_C8C0A0.s b/asm/nonmatchings/world/area_kzn/kzn_18/func_80240164_C8C0A0.s deleted file mode 100644 index dcda292bd8..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_18/func_80240164_C8C0A0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240164_C8C204 -/* C8C204 80240164 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8C208 80240168 AFB00010 */ sw $s0, 0x10($sp) -/* C8C20C 8024016C 0080802D */ daddu $s0, $a0, $zero -/* C8C210 80240170 10A00005 */ beqz $a1, .L80240188 -/* C8C214 80240174 AFBF0014 */ sw $ra, 0x14($sp) -/* C8C218 80240178 AE000070 */ sw $zero, 0x70($s0) -/* C8C21C 8024017C AE000074 */ sw $zero, 0x74($s0) -/* C8C220 80240180 AE000078 */ sw $zero, 0x78($s0) -/* C8C224 80240184 AE00007C */ sw $zero, 0x7c($s0) -.L80240188: -/* C8C228 80240188 8E020070 */ lw $v0, 0x70($s0) -/* C8C22C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C8C230 80240190 00000000 */ nop -/* C8C234 80240194 8E0300A8 */ lw $v1, 0xa8($s0) -/* C8C238 80240198 8E020088 */ lw $v0, 0x88($s0) -/* C8C23C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C8C240 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C8C244 802401A4 AE0300A8 */ sw $v1, 0xa8($s0) -/* C8C248 802401A8 3C020002 */ lui $v0, 2 -/* C8C24C 802401AC 08090071 */ j .L802401C4 -/* C8C250 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C8C254 802401B4 3C040002 */ lui $a0, 2 -/* C8C258 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C8C25C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C8C260 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C8C264 802401C4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401C8: -/* C8C268 802401C8 8E020074 */ lw $v0, 0x74($s0) -/* C8C26C 802401CC 1440000E */ bnez $v0, .L80240208 -/* C8C270 802401D0 00000000 */ nop -/* C8C274 802401D4 8E0300AC */ lw $v1, 0xac($s0) -/* C8C278 802401D8 8E02008C */ lw $v0, 0x8c($s0) -/* C8C27C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C8C280 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C8C284 802401E4 AE0300AC */ sw $v1, 0xac($s0) -/* C8C288 802401E8 3C020002 */ lui $v0, 2 -/* C8C28C 802401EC 08090081 */ j .L80240204 -/* C8C290 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C8C294 802401F4 3C040002 */ lui $a0, 2 -/* C8C298 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C8C29C 802401FC 10400002 */ beqz $v0, .L80240208 -/* C8C2A0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C8C2A4 80240204 AE0200AC */ sw $v0, 0xac($s0) -.L80240208: -/* C8C2A8 80240208 8E020078 */ lw $v0, 0x78($s0) -/* C8C2AC 8024020C 1440000E */ bnez $v0, .L80240248 -/* C8C2B0 80240210 00000000 */ nop -/* C8C2B4 80240214 8E0300B0 */ lw $v1, 0xb0($s0) -/* C8C2B8 80240218 8E020090 */ lw $v0, 0x90($s0) -/* C8C2BC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C8C2C0 80240220 04610004 */ bgez $v1, .L80240234 -/* C8C2C4 80240224 AE0300B0 */ sw $v1, 0xb0($s0) -/* C8C2C8 80240228 3C020002 */ lui $v0, 2 -/* C8C2CC 8024022C 08090091 */ j .L80240244 -/* C8C2D0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C8C2D4 80240234 3C040002 */ lui $a0, 2 -/* C8C2D8 80240238 0083102A */ slt $v0, $a0, $v1 -/* C8C2DC 8024023C 10400002 */ beqz $v0, .L80240248 -/* C8C2E0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C8C2E4 80240244 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240248: -/* C8C2E8 80240248 8E02007C */ lw $v0, 0x7c($s0) -/* C8C2EC 8024024C 1440000E */ bnez $v0, .L80240288 -/* C8C2F0 80240250 00000000 */ nop -/* C8C2F4 80240254 8E0300B4 */ lw $v1, 0xb4($s0) -/* C8C2F8 80240258 8E020094 */ lw $v0, 0x94($s0) -/* C8C2FC 8024025C 00621821 */ addu $v1, $v1, $v0 -/* C8C300 80240260 04610004 */ bgez $v1, .L80240274 -/* C8C304 80240264 AE0300B4 */ sw $v1, 0xb4($s0) -/* C8C308 80240268 3C020002 */ lui $v0, 2 -/* C8C30C 8024026C 080900A1 */ j .L80240284 -/* C8C310 80240270 00621021 */ addu $v0, $v1, $v0 -.L80240274: -/* C8C314 80240274 3C040002 */ lui $a0, 2 -/* C8C318 80240278 0083102A */ slt $v0, $a0, $v1 -/* C8C31C 8024027C 10400002 */ beqz $v0, .L80240288 -/* C8C320 80240280 00641023 */ subu $v0, $v1, $a0 -.L80240284: -/* C8C324 80240284 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240288: -/* C8C328 80240288 8E040084 */ lw $a0, 0x84($s0) -/* C8C32C 8024028C 0C046F07 */ jal set_main_pan_u -/* C8C330 80240290 8E0500A8 */ lw $a1, 0xa8($s0) -/* C8C334 80240294 8E040084 */ lw $a0, 0x84($s0) -/* C8C338 80240298 0C046F0D */ jal set_main_pan_v -/* C8C33C 8024029C 8E0500AC */ lw $a1, 0xac($s0) -/* C8C340 802402A0 8E040084 */ lw $a0, 0x84($s0) -/* C8C344 802402A4 0C046F13 */ jal set_aux_pan_u -/* C8C348 802402A8 8E0500B0 */ lw $a1, 0xb0($s0) -/* C8C34C 802402AC 8E040084 */ lw $a0, 0x84($s0) -/* C8C350 802402B0 0C046F19 */ jal set_aux_pan_v -/* C8C354 802402B4 8E0500B4 */ lw $a1, 0xb4($s0) -/* C8C358 802402B8 8E020070 */ lw $v0, 0x70($s0) -/* C8C35C 802402BC 8E030078 */ lw $v1, 0x78($s0) -/* C8C360 802402C0 8E040098 */ lw $a0, 0x98($s0) -/* C8C364 802402C4 24420001 */ addiu $v0, $v0, 1 -/* C8C368 802402C8 AE020070 */ sw $v0, 0x70($s0) -/* C8C36C 802402CC 8E020074 */ lw $v0, 0x74($s0) -/* C8C370 802402D0 24630001 */ addiu $v1, $v1, 1 -/* C8C374 802402D4 AE030078 */ sw $v1, 0x78($s0) -/* C8C378 802402D8 8E030070 */ lw $v1, 0x70($s0) -/* C8C37C 802402DC 24420001 */ addiu $v0, $v0, 1 -/* C8C380 802402E0 AE020074 */ sw $v0, 0x74($s0) -/* C8C384 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C8C388 802402E8 0064182A */ slt $v1, $v1, $a0 -/* C8C38C 802402EC 24420001 */ addiu $v0, $v0, 1 -/* C8C390 802402F0 14600002 */ bnez $v1, .L802402FC -/* C8C394 802402F4 AE02007C */ sw $v0, 0x7c($s0) -/* C8C398 802402F8 AE000070 */ sw $zero, 0x70($s0) -.L802402FC: -/* C8C39C 802402FC 8E020074 */ lw $v0, 0x74($s0) -/* C8C3A0 80240300 8E03009C */ lw $v1, 0x9c($s0) -/* C8C3A4 80240304 0043102A */ slt $v0, $v0, $v1 -/* C8C3A8 80240308 50400001 */ beql $v0, $zero, .L80240310 -/* C8C3AC 8024030C AE000074 */ sw $zero, 0x74($s0) -.L80240310: -/* C8C3B0 80240310 8E020078 */ lw $v0, 0x78($s0) -/* C8C3B4 80240314 8E0300A0 */ lw $v1, 0xa0($s0) -/* C8C3B8 80240318 0043102A */ slt $v0, $v0, $v1 -/* C8C3BC 8024031C 50400001 */ beql $v0, $zero, .L80240324 -/* C8C3C0 80240320 AE000078 */ sw $zero, 0x78($s0) -.L80240324: -/* C8C3C4 80240324 8E02007C */ lw $v0, 0x7c($s0) -/* C8C3C8 80240328 8E0300A4 */ lw $v1, 0xa4($s0) -/* C8C3CC 8024032C 0043102A */ slt $v0, $v0, $v1 -/* C8C3D0 80240330 50400001 */ beql $v0, $zero, .L80240338 -/* C8C3D4 80240334 AE00007C */ sw $zero, 0x7c($s0) -.L80240338: -/* C8C3D8 80240338 8FBF0014 */ lw $ra, 0x14($sp) -/* C8C3DC 8024033C 8FB00010 */ lw $s0, 0x10($sp) -/* C8C3E0 80240340 0000102D */ daddu $v0, $zero, $zero -/* C8C3E4 80240344 03E00008 */ jr $ra -/* C8C3E8 80240348 27BD0018 */ addiu $sp, $sp, 0x18 -/* C8C3EC 8024034C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_18/func_80240350_C8C0A0.s b/asm/nonmatchings/world/area_kzn/kzn_18/func_80240350_C8C0A0.s deleted file mode 100644 index f285d63a8f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_18/func_80240350_C8C0A0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240350_C8C3F0 -/* C8C3F0 80240350 3C03800B */ lui $v1, %hi(gCameras) -/* C8C3F4 80240354 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* C8C3F8 80240358 94620000 */ lhu $v0, ($v1) -/* C8C3FC 8024035C 34421000 */ ori $v0, $v0, 0x1000 -/* C8C400 80240360 A4620000 */ sh $v0, ($v1) -/* C8C404 80240364 03E00008 */ jr $ra -/* C8C408 80240368 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_18/func_8024036C_C8C0A0.s b/asm/nonmatchings/world/area_kzn/kzn_18/func_8024036C_C8C0A0.s deleted file mode 100644 index 790947be76..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_18/func_8024036C_C8C0A0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024036C_C8C40C -/* C8C40C 8024036C 3C03800B */ lui $v1, %hi(gCameras) -/* C8C410 80240370 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* C8C414 80240374 94620000 */ lhu $v0, ($v1) -/* C8C418 80240378 3042EFFF */ andi $v0, $v0, 0xefff -/* C8C41C 8024037C A4620000 */ sh $v0, ($v1) -/* C8C420 80240380 03E00008 */ jr $ra -/* C8C424 80240384 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_18/func_80240388_C8C0A0.s b/asm/nonmatchings/world/area_kzn/kzn_18/func_80240388_C8C0A0.s deleted file mode 100644 index 4665cbf1fb..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_18/func_80240388_C8C0A0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240388_C8C428 -/* C8C428 80240388 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8C42C 8024038C AFBF0010 */ sw $ra, 0x10($sp) -/* C8C430 80240390 8C82000C */ lw $v0, 0xc($a0) -/* C8C434 80240394 3C068016 */ lui $a2, 0x8016 -/* C8C438 80240398 84C6A552 */ lh $a2, -0x5aae($a2) -/* C8C43C 8024039C 0C0B2026 */ jal set_variable -/* C8C440 802403A0 8C450000 */ lw $a1, ($v0) -/* C8C444 802403A4 8FBF0010 */ lw $ra, 0x10($sp) -/* C8C448 802403A8 24020002 */ addiu $v0, $zero, 2 -/* C8C44C 802403AC 03E00008 */ jr $ra -/* C8C450 802403B0 27BD0018 */ addiu $sp, $sp, 0x18 -/* C8C454 802403B4 00000000 */ nop -/* C8C458 802403B8 00000000 */ nop -/* C8C45C 802403BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/func_80240124_C8DBB0.s b/asm/nonmatchings/world/area_kzn/kzn_19/func_80240124_C8DBB0.s deleted file mode 100644 index 971fa9a634..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/func_80240124_C8DBB0.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C8DCD4 -/* C8DCD4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8DCD8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C8DCDC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C8DCE0 80240130 10A00005 */ beqz $a1, .L80240148 -/* C8DCE4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C8DCE8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C8DCEC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C8DCF0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C8DCF4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C8DCF8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C8DCFC 8024014C 1440000E */ bnez $v0, .L80240188 -/* C8DD00 80240150 00000000 */ nop -/* C8DD04 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C8DD08 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C8DD0C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C8DD10 80240160 04610004 */ bgez $v1, .L80240174 -/* C8DD14 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C8DD18 80240168 3C020002 */ lui $v0, 2 -/* C8DD1C 8024016C 08090061 */ j .L80240184 -/* C8DD20 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C8DD24 80240174 3C040002 */ lui $a0, 2 -/* C8DD28 80240178 0083102A */ slt $v0, $a0, $v1 -/* C8DD2C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C8DD30 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C8DD34 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C8DD38 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C8DD3C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C8DD40 80240190 00000000 */ nop -/* C8DD44 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C8DD48 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C8DD4C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C8DD50 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C8DD54 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C8DD58 802401A8 3C020002 */ lui $v0, 2 -/* C8DD5C 802401AC 08090071 */ j .L802401C4 -/* C8DD60 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C8DD64 802401B4 3C040002 */ lui $a0, 2 -/* C8DD68 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C8DD6C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C8DD70 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C8DD74 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C8DD78 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C8DD7C 802401CC 1440000E */ bnez $v0, .L80240208 -/* C8DD80 802401D0 00000000 */ nop -/* C8DD84 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C8DD88 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C8DD8C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C8DD90 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C8DD94 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C8DD98 802401E8 3C020002 */ lui $v0, 2 -/* C8DD9C 802401EC 08090081 */ j .L80240204 -/* C8DDA0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C8DDA4 802401F4 3C040002 */ lui $a0, 2 -/* C8DDA8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C8DDAC 802401FC 10400002 */ beqz $v0, .L80240208 -/* C8DDB0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C8DDB4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C8DDB8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C8DDBC 8024020C 1440000E */ bnez $v0, .L80240248 -/* C8DDC0 80240210 00000000 */ nop -/* C8DDC4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C8DDC8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C8DDCC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C8DDD0 80240220 04610004 */ bgez $v1, .L80240234 -/* C8DDD4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C8DDD8 80240228 3C020002 */ lui $v0, 2 -/* C8DDDC 8024022C 08090091 */ j .L80240244 -/* C8DDE0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C8DDE4 80240234 3C040002 */ lui $a0, 2 -/* C8DDE8 80240238 0083102A */ slt $v0, $a0, $v1 -/* C8DDEC 8024023C 10400002 */ beqz $v0, .L80240248 -/* C8DDF0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C8DDF4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C8DDF8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C8DDFC 8024024C 0C046F07 */ jal set_main_pan_u -/* C8DE00 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C8DE04 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C8DE08 80240258 0C046F0D */ jal set_main_pan_v -/* C8DE0C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C8DE10 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C8DE14 80240264 0C046F13 */ jal set_aux_pan_u -/* C8DE18 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C8DE1C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C8DE20 80240270 0C046F19 */ jal set_aux_pan_v -/* C8DE24 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C8DE28 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C8DE2C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C8DE30 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C8DE34 80240284 24420001 */ addiu $v0, $v0, 1 -/* C8DE38 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C8DE3C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C8DE40 80240290 24630001 */ addiu $v1, $v1, 1 -/* C8DE44 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C8DE48 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C8DE4C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C8DE50 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C8DE54 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C8DE58 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C8DE5C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C8DE60 802402B0 14600002 */ bnez $v1, .L802402BC -/* C8DE64 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C8DE68 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C8DE6C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C8DE70 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C8DE74 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C8DE78 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C8DE7C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C8DE80 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C8DE84 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C8DE88 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C8DE8C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C8DE90 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C8DE94 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C8DE98 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C8DE9C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C8DEA0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C8DEA4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C8DEA8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C8DEAC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C8DEB0 80240300 0000102D */ daddu $v0, $zero, $zero -/* C8DEB4 80240304 03E00008 */ jr $ra -/* C8DEB8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/func_8024030C_C8DBB0.s b/asm/nonmatchings/world/area_kzn/kzn_19/func_8024030C_C8DBB0.s deleted file mode 100644 index f59a729b8d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/func_8024030C_C8DBB0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_C8DEBC -/* C8DEBC 8024030C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C8DEC0 80240310 AFBF001C */ sw $ra, 0x1c($sp) -/* C8DEC4 80240314 AFB00018 */ sw $s0, 0x18($sp) -/* C8DEC8 80240318 8C900084 */ lw $s0, 0x84($a0) -/* C8DECC 8024031C C6000008 */ lwc1 $f0, 8($s0) -/* C8DED0 80240320 240400A2 */ addiu $a0, $zero, 0xa2 -/* C8DED4 80240324 E7A00010 */ swc1 $f0, 0x10($sp) -/* C8DED8 80240328 8E060000 */ lw $a2, ($s0) -/* C8DEDC 8024032C 8E070004 */ lw $a3, 4($s0) -/* C8DEE0 80240330 0C05267B */ jal func_801499EC -/* C8DEE4 80240334 0000282D */ daddu $a1, $zero, $zero -/* C8DEE8 80240338 86020044 */ lh $v0, 0x44($s0) -/* C8DEEC 8024033C 8FBF001C */ lw $ra, 0x1c($sp) -/* C8DEF0 80240340 8FB00018 */ lw $s0, 0x18($sp) -/* C8DEF4 80240344 28420002 */ slti $v0, $v0, 2 -/* C8DEF8 80240348 38420001 */ xori $v0, $v0, 1 -/* C8DEFC 8024034C 00021040 */ sll $v0, $v0, 1 -/* C8DF00 80240350 03E00008 */ jr $ra -/* C8DF04 80240354 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/func_80240358_C8DBB0.s b/asm/nonmatchings/world/area_kzn/kzn_19/func_80240358_C8DBB0.s deleted file mode 100644 index 3f9ae9c41e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/func_80240358_C8DBB0.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240358_C8DF08 -/* C8DF08 80240358 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C8DF0C 8024035C AFB20020 */ sw $s2, 0x20($sp) -/* C8DF10 80240360 0080902D */ daddu $s2, $a0, $zero -/* C8DF14 80240364 AFBF0024 */ sw $ra, 0x24($sp) -/* C8DF18 80240368 AFB1001C */ sw $s1, 0x1c($sp) -/* C8DF1C 8024036C AFB00018 */ sw $s0, 0x18($sp) -/* C8DF20 80240370 10A0004A */ beqz $a1, .L8024049C -/* C8DF24 80240374 8E51000C */ lw $s1, 0xc($s2) -/* C8DF28 80240378 0C00AB39 */ jal heap_malloc -/* C8DF2C 8024037C 24040058 */ addiu $a0, $zero, 0x58 -/* C8DF30 80240380 0000202D */ daddu $a0, $zero, $zero -/* C8DF34 80240384 3C05FD05 */ lui $a1, 0xfd05 -/* C8DF38 80240388 34A50F81 */ ori $a1, $a1, 0xf81 -/* C8DF3C 8024038C 0040802D */ daddu $s0, $v0, $zero -/* C8DF40 80240390 0200302D */ daddu $a2, $s0, $zero -/* C8DF44 80240394 0C0B2026 */ jal set_variable -/* C8DF48 80240398 AE500084 */ sw $s0, 0x84($s2) -/* C8DF4C 8024039C 8E250000 */ lw $a1, ($s1) -/* C8DF50 802403A0 26310004 */ addiu $s1, $s1, 4 -/* C8DF54 802403A4 0C0B1EAF */ jal get_variable -/* C8DF58 802403A8 0240202D */ daddu $a0, $s2, $zero -/* C8DF5C 802403AC AE020038 */ sw $v0, 0x38($s0) -/* C8DF60 802403B0 8E250000 */ lw $a1, ($s1) -/* C8DF64 802403B4 26310004 */ addiu $s1, $s1, 4 -/* C8DF68 802403B8 0C0B1EAF */ jal get_variable -/* C8DF6C 802403BC 0240202D */ daddu $a0, $s2, $zero -/* C8DF70 802403C0 AE02003C */ sw $v0, 0x3c($s0) -/* C8DF74 802403C4 8E250000 */ lw $a1, ($s1) -/* C8DF78 802403C8 26310004 */ addiu $s1, $s1, 4 -/* C8DF7C 802403CC 0C0B210B */ jal get_float_variable -/* C8DF80 802403D0 0240202D */ daddu $a0, $s2, $zero -/* C8DF84 802403D4 E600000C */ swc1 $f0, 0xc($s0) -/* C8DF88 802403D8 8E250000 */ lw $a1, ($s1) -/* C8DF8C 802403DC 26310004 */ addiu $s1, $s1, 4 -/* C8DF90 802403E0 0C0B210B */ jal get_float_variable -/* C8DF94 802403E4 0240202D */ daddu $a0, $s2, $zero -/* C8DF98 802403E8 E6000010 */ swc1 $f0, 0x10($s0) -/* C8DF9C 802403EC 8E250000 */ lw $a1, ($s1) -/* C8DFA0 802403F0 26310004 */ addiu $s1, $s1, 4 -/* C8DFA4 802403F4 0C0B210B */ jal get_float_variable -/* C8DFA8 802403F8 0240202D */ daddu $a0, $s2, $zero -/* C8DFAC 802403FC E6000014 */ swc1 $f0, 0x14($s0) -/* C8DFB0 80240400 8E250000 */ lw $a1, ($s1) -/* C8DFB4 80240404 26310004 */ addiu $s1, $s1, 4 -/* C8DFB8 80240408 0C0B210B */ jal get_float_variable -/* C8DFBC 8024040C 0240202D */ daddu $a0, $s2, $zero -/* C8DFC0 80240410 E6000018 */ swc1 $f0, 0x18($s0) -/* C8DFC4 80240414 8E250000 */ lw $a1, ($s1) -/* C8DFC8 80240418 26310004 */ addiu $s1, $s1, 4 -/* C8DFCC 8024041C 0C0B210B */ jal get_float_variable -/* C8DFD0 80240420 0240202D */ daddu $a0, $s2, $zero -/* C8DFD4 80240424 E600001C */ swc1 $f0, 0x1c($s0) -/* C8DFD8 80240428 8E250000 */ lw $a1, ($s1) -/* C8DFDC 8024042C 26310004 */ addiu $s1, $s1, 4 -/* C8DFE0 80240430 0C0B210B */ jal get_float_variable -/* C8DFE4 80240434 0240202D */ daddu $a0, $s2, $zero -/* C8DFE8 80240438 E6000020 */ swc1 $f0, 0x20($s0) -/* C8DFEC 8024043C 8E250000 */ lw $a1, ($s1) -/* C8DFF0 80240440 26310004 */ addiu $s1, $s1, 4 -/* C8DFF4 80240444 0C0B210B */ jal get_float_variable -/* C8DFF8 80240448 0240202D */ daddu $a0, $s2, $zero -/* C8DFFC 8024044C E6000024 */ swc1 $f0, 0x24($s0) -/* C8E000 80240450 8E250000 */ lw $a1, ($s1) -/* C8E004 80240454 0C0B210B */ jal get_float_variable -/* C8E008 80240458 0240202D */ daddu $a0, $s2, $zero -/* C8E00C 8024045C 3C013F80 */ lui $at, 0x3f80 -/* C8E010 80240460 44811000 */ mtc1 $at, $f2 -/* C8E014 80240464 E6000028 */ swc1 $f0, 0x28($s0) -/* C8E018 80240468 AFA00014 */ sw $zero, 0x14($sp) -/* C8E01C 8024046C E7A20010 */ swc1 $f2, 0x10($sp) -/* C8E020 80240470 8E05000C */ lw $a1, 0xc($s0) -/* C8E024 80240474 8E060010 */ lw $a2, 0x10($s0) -/* C8E028 80240478 8E070014 */ lw $a3, 0x14($s0) -/* C8E02C 8024047C 0C01CA6C */ jal func_800729B0 -/* C8E030 80240480 24040002 */ addiu $a0, $zero, 2 -/* C8E034 80240484 AE020050 */ sw $v0, 0x50($s0) -/* C8E038 80240488 A600004E */ sh $zero, 0x4e($s0) -/* C8E03C 8024048C A6000048 */ sh $zero, 0x48($s0) -/* C8E040 80240490 A600004A */ sh $zero, 0x4a($s0) -/* C8E044 80240494 A6000044 */ sh $zero, 0x44($s0) -/* C8E048 80240498 A6000046 */ sh $zero, 0x46($s0) -.L8024049C: -/* C8E04C 8024049C 8FBF0024 */ lw $ra, 0x24($sp) -/* C8E050 802404A0 8FB20020 */ lw $s2, 0x20($sp) -/* C8E054 802404A4 8FB1001C */ lw $s1, 0x1c($sp) -/* C8E058 802404A8 8FB00018 */ lw $s0, 0x18($sp) -/* C8E05C 802404AC 24020002 */ addiu $v0, $zero, 2 -/* C8E060 802404B0 03E00008 */ jr $ra -/* C8E064 802404B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/func_80240908_C8DBB0.s b/asm/nonmatchings/world/area_kzn/kzn_19/func_80240908_C8DBB0.s deleted file mode 100644 index 3e49effbd2..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/func_80240908_C8DBB0.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240908_C8E4B8 -/* C8E4B8 80240908 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C8E4BC 8024090C AFB20020 */ sw $s2, 0x20($sp) -/* C8E4C0 80240910 0080902D */ daddu $s2, $a0, $zero -/* C8E4C4 80240914 AFBF0024 */ sw $ra, 0x24($sp) -/* C8E4C8 80240918 AFB1001C */ sw $s1, 0x1c($sp) -/* C8E4CC 8024091C AFB00018 */ sw $s0, 0x18($sp) -/* C8E4D0 80240920 10A00035 */ beqz $a1, .L802409F8 -/* C8E4D4 80240924 8E51000C */ lw $s1, 0xc($s2) -/* C8E4D8 80240928 0C00AB39 */ jal heap_malloc -/* C8E4DC 8024092C 24040058 */ addiu $a0, $zero, 0x58 -/* C8E4E0 80240930 0040802D */ daddu $s0, $v0, $zero -/* C8E4E4 80240934 AE500084 */ sw $s0, 0x84($s2) -/* C8E4E8 80240938 8E250000 */ lw $a1, ($s1) -/* C8E4EC 8024093C 26310004 */ addiu $s1, $s1, 4 -/* C8E4F0 80240940 0C0B1EAF */ jal get_variable -/* C8E4F4 80240944 0240202D */ daddu $a0, $s2, $zero -/* C8E4F8 80240948 AE020038 */ sw $v0, 0x38($s0) -/* C8E4FC 8024094C 8E250000 */ lw $a1, ($s1) -/* C8E500 80240950 26310004 */ addiu $s1, $s1, 4 -/* C8E504 80240954 0C0B210B */ jal get_float_variable -/* C8E508 80240958 0240202D */ daddu $a0, $s2, $zero -/* C8E50C 8024095C E6000018 */ swc1 $f0, 0x18($s0) -/* C8E510 80240960 8E250000 */ lw $a1, ($s1) -/* C8E514 80240964 26310004 */ addiu $s1, $s1, 4 -/* C8E518 80240968 0C0B210B */ jal get_float_variable -/* C8E51C 8024096C 0240202D */ daddu $a0, $s2, $zero -/* C8E520 80240970 E6000024 */ swc1 $f0, 0x24($s0) -/* C8E524 80240974 8E250000 */ lw $a1, ($s1) -/* C8E528 80240978 26310004 */ addiu $s1, $s1, 4 -/* C8E52C 8024097C 0C0B210B */ jal get_float_variable -/* C8E530 80240980 0240202D */ daddu $a0, $s2, $zero -/* C8E534 80240984 E6000020 */ swc1 $f0, 0x20($s0) -/* C8E538 80240988 8E250000 */ lw $a1, ($s1) -/* C8E53C 8024098C 0C0B210B */ jal get_float_variable -/* C8E540 80240990 0240202D */ daddu $a0, $s2, $zero -/* C8E544 80240994 3C013F80 */ lui $at, 0x3f80 -/* C8E548 80240998 44811000 */ mtc1 $at, $f2 -/* C8E54C 8024099C E6000028 */ swc1 $f0, 0x28($s0) -/* C8E550 802409A0 AFA00014 */ sw $zero, 0x14($sp) -/* C8E554 802409A4 E7A20010 */ swc1 $f2, 0x10($sp) -/* C8E558 802409A8 8E050018 */ lw $a1, 0x18($s0) -/* C8E55C 802409AC 8E060024 */ lw $a2, 0x24($s0) -/* C8E560 802409B0 8E070020 */ lw $a3, 0x20($s0) -/* C8E564 802409B4 0C01C9AC */ jal func_800726B0 -/* C8E568 802409B8 24040001 */ addiu $a0, $zero, 1 -/* C8E56C 802409BC AE020054 */ sw $v0, 0x54($s0) -/* C8E570 802409C0 8C43000C */ lw $v1, 0xc($v0) -/* C8E574 802409C4 9202003B */ lbu $v0, 0x3b($s0) -/* C8E578 802409C8 A0620034 */ sb $v0, 0x34($v1) -/* C8E57C 802409CC 8E020054 */ lw $v0, 0x54($s0) -/* C8E580 802409D0 8C42000C */ lw $v0, 0xc($v0) -/* C8E584 802409D4 AC400020 */ sw $zero, 0x20($v0) -/* C8E588 802409D8 8E050018 */ lw $a1, 0x18($s0) -/* C8E58C 802409DC 8E060028 */ lw $a2, 0x28($s0) -/* C8E590 802409E0 8E070020 */ lw $a3, 0x20($s0) -/* C8E594 802409E4 0C044898 */ jal create_shadow_type -/* C8E598 802409E8 0000202D */ daddu $a0, $zero, $zero -/* C8E59C 802409EC AE020040 */ sw $v0, 0x40($s0) -/* C8E5A0 802409F0 2402010E */ addiu $v0, $zero, 0x10e -/* C8E5A4 802409F4 A602004C */ sh $v0, 0x4c($s0) -.L802409F8: -/* C8E5A8 802409F8 8FBF0024 */ lw $ra, 0x24($sp) -/* C8E5AC 802409FC 8FB20020 */ lw $s2, 0x20($sp) -/* C8E5B0 80240A00 8FB1001C */ lw $s1, 0x1c($sp) -/* C8E5B4 80240A04 8FB00018 */ lw $s0, 0x18($sp) -/* C8E5B8 80240A08 24020002 */ addiu $v0, $zero, 2 -/* C8E5BC 80240A0C 03E00008 */ jr $ra -/* C8E5C0 80240A10 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/func_80240A14_C8DBB0.s b/asm/nonmatchings/world/area_kzn/kzn_19/func_80240A14_C8DBB0.s deleted file mode 100644 index d6a8fb82a0..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/func_80240A14_C8DBB0.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A14_C8E5C4 -/* C8E5C4 80240A14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8E5C8 80240A18 AFBF0014 */ sw $ra, 0x14($sp) -/* C8E5CC 80240A1C AFB00010 */ sw $s0, 0x10($sp) -/* C8E5D0 80240A20 8C900084 */ lw $s0, 0x84($a0) -/* C8E5D4 80240A24 8602004C */ lh $v0, 0x4c($s0) -/* C8E5D8 80240A28 44826000 */ mtc1 $v0, $f12 -/* C8E5DC 80240A2C 00000000 */ nop -/* C8E5E0 80240A30 0C00A8BB */ jal sin_deg -/* C8E5E4 80240A34 46806320 */ cvt.s.w $f12, $f12 -/* C8E5E8 80240A38 3C013F80 */ lui $at, 0x3f80 -/* C8E5EC 80240A3C 44811000 */ mtc1 $at, $f2 -/* C8E5F0 80240A40 00000000 */ nop -/* C8E5F4 80240A44 46020000 */ add.s $f0, $f0, $f2 -/* C8E5F8 80240A48 46000000 */ add.s $f0, $f0, $f0 -/* C8E5FC 80240A4C C6020024 */ lwc1 $f2, 0x24($s0) -/* C8E600 80240A50 8602004C */ lh $v0, 0x4c($s0) -/* C8E604 80240A54 46001080 */ add.s $f2, $f2, $f0 -/* C8E608 80240A58 24420008 */ addiu $v0, $v0, 8 -/* C8E60C 80240A5C 44826000 */ mtc1 $v0, $f12 -/* C8E610 80240A60 00000000 */ nop -/* C8E614 80240A64 46806320 */ cvt.s.w $f12, $f12 -/* C8E618 80240A68 0C00A6C9 */ jal clamp_angle -/* C8E61C 80240A6C E6020004 */ swc1 $f2, 4($s0) -/* C8E620 80240A70 4600010D */ trunc.w.s $f4, $f0 -/* C8E624 80240A74 44022000 */ mfc1 $v0, $f4 -/* C8E628 80240A78 00000000 */ nop -/* C8E62C 80240A7C A602004C */ sh $v0, 0x4c($s0) -/* C8E630 80240A80 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* C8E634 80240A84 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* C8E638 80240A88 C44C0028 */ lwc1 $f12, 0x28($v0) -/* C8E63C 80240A8C C44E0030 */ lwc1 $f14, 0x30($v0) -/* C8E640 80240A90 8E060018 */ lw $a2, 0x18($s0) -/* C8E644 80240A94 0C00A7B5 */ jal dist2D -/* C8E648 80240A98 8E070020 */ lw $a3, 0x20($s0) -/* C8E64C 80240A9C 3C0141F0 */ lui $at, 0x41f0 -/* C8E650 80240AA0 44811000 */ mtc1 $at, $f2 -/* C8E654 80240AA4 00000000 */ nop -/* C8E658 80240AA8 4602003E */ c.le.s $f0, $f2 -/* C8E65C 80240AAC 00000000 */ nop -/* C8E660 80240AB0 45000002 */ bc1f .L80240ABC -/* C8E664 80240AB4 24020003 */ addiu $v0, $zero, 3 -/* C8E668 80240AB8 A602004E */ sh $v0, 0x4e($s0) -.L80240ABC: -/* C8E66C 80240ABC 8E020054 */ lw $v0, 0x54($s0) -/* C8E670 80240AC0 C6000018 */ lwc1 $f0, 0x18($s0) -/* C8E674 80240AC4 8C42000C */ lw $v0, 0xc($v0) -/* C8E678 80240AC8 E4400004 */ swc1 $f0, 4($v0) -/* C8E67C 80240ACC 8E020054 */ lw $v0, 0x54($s0) -/* C8E680 80240AD0 C6000004 */ lwc1 $f0, 4($s0) -/* C8E684 80240AD4 8C42000C */ lw $v0, 0xc($v0) -/* C8E688 80240AD8 E4400008 */ swc1 $f0, 8($v0) -/* C8E68C 80240ADC 8E020054 */ lw $v0, 0x54($s0) -/* C8E690 80240AE0 C6000020 */ lwc1 $f0, 0x20($s0) -/* C8E694 80240AE4 8C42000C */ lw $v0, 0xc($v0) -/* C8E698 80240AE8 E440000C */ swc1 $f0, 0xc($v0) -/* C8E69C 80240AEC 8FBF0014 */ lw $ra, 0x14($sp) -/* C8E6A0 80240AF0 8FB00010 */ lw $s0, 0x10($sp) -/* C8E6A4 80240AF4 0000102D */ daddu $v0, $zero, $zero -/* C8E6A8 80240AF8 03E00008 */ jr $ra -/* C8E6AC 80240AFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/func_80240B00_C8DBB0.s b/asm/nonmatchings/world/area_kzn/kzn_19/func_80240B00_C8DBB0.s deleted file mode 100644 index c7f0c6ae8d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/func_80240B00_C8DBB0.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B00_C8E6B0 -/* C8E6B0 80240B00 27BDFE60 */ addiu $sp, $sp, -0x1a0 -/* C8E6B4 80240B04 AFB30194 */ sw $s3, 0x194($sp) -/* C8E6B8 80240B08 0080982D */ daddu $s3, $a0, $zero -/* C8E6BC 80240B0C AFB1018C */ sw $s1, 0x18c($sp) -/* C8E6C0 80240B10 27B10010 */ addiu $s1, $sp, 0x10 -/* C8E6C4 80240B14 0220202D */ daddu $a0, $s1, $zero -/* C8E6C8 80240B18 24050001 */ addiu $a1, $zero, 1 -/* C8E6CC 80240B1C AFBF0198 */ sw $ra, 0x198($sp) -/* C8E6D0 80240B20 AFB20190 */ sw $s2, 0x190($sp) -/* C8E6D4 80240B24 AFB00188 */ sw $s0, 0x188($sp) -/* C8E6D8 80240B28 8E630090 */ lw $v1, 0x90($s3) -/* C8E6DC 80240B2C 0000902D */ daddu $s2, $zero, $zero -/* C8E6E0 80240B30 AFB3017C */ sw $s3, 0x17c($sp) -/* C8E6E4 80240B34 00A31004 */ sllv $v0, $v1, $a1 -/* C8E6E8 80240B38 00431021 */ addu $v0, $v0, $v1 -/* C8E6EC 80240B3C AFA20178 */ sw $v0, 0x178($sp) -/* C8E6F0 80240B40 8E630090 */ lw $v1, 0x90($s3) -/* C8E6F4 80240B44 27A20178 */ addiu $v0, $sp, 0x178 -/* C8E6F8 80240B48 AFA00184 */ sw $zero, 0x184($sp) -/* C8E6FC 80240B4C AFA2001C */ sw $v0, 0x1c($sp) -/* C8E700 80240B50 0C0B550C */ jal LoadPath -/* C8E704 80240B54 AFA30180 */ sw $v1, 0x180($sp) -/* C8E708 80240B58 0260802D */ daddu $s0, $s3, $zero -.L80240B5C: -/* C8E70C 80240B5C 0220202D */ daddu $a0, $s1, $zero -/* C8E710 80240B60 0C0B5549 */ jal GetNextPathPos -/* C8E714 80240B64 24050001 */ addiu $a1, $zero, 1 -/* C8E718 80240B68 0220202D */ daddu $a0, $s1, $zero -/* C8E71C 80240B6C 3C05FE36 */ lui $a1, 0xfe36 -/* C8E720 80240B70 0C0B210B */ jal get_float_variable -/* C8E724 80240B74 34A53C81 */ ori $a1, $a1, 0x3c81 -/* C8E728 80240B78 0220202D */ daddu $a0, $s1, $zero -/* C8E72C 80240B7C 3C05FE36 */ lui $a1, 0xfe36 -/* C8E730 80240B80 34A53C82 */ ori $a1, $a1, 0x3c82 -/* C8E734 80240B84 0C0B210B */ jal get_float_variable -/* C8E738 80240B88 E6000098 */ swc1 $f0, 0x98($s0) -/* C8E73C 80240B8C 0220202D */ daddu $a0, $s1, $zero -/* C8E740 80240B90 3C05FE36 */ lui $a1, 0xfe36 -/* C8E744 80240B94 34A53C83 */ ori $a1, $a1, 0x3c83 -/* C8E748 80240B98 0C0B210B */ jal get_float_variable -/* C8E74C 80240B9C E600009C */ swc1 $f0, 0x9c($s0) -/* C8E750 80240BA0 E60000A0 */ swc1 $f0, 0xa0($s0) -/* C8E754 80240BA4 2610000C */ addiu $s0, $s0, 0xc -/* C8E758 80240BA8 8E220084 */ lw $v0, 0x84($s1) -/* C8E75C 80240BAC 1440FFEB */ bnez $v0, .L80240B5C -/* C8E760 80240BB0 26520001 */ addiu $s2, $s2, 1 -/* C8E764 80240BB4 AE7201DC */ sw $s2, 0x1dc($s3) -/* C8E768 80240BB8 8FBF0198 */ lw $ra, 0x198($sp) -/* C8E76C 80240BBC 8FB30194 */ lw $s3, 0x194($sp) -/* C8E770 80240BC0 8FB20190 */ lw $s2, 0x190($sp) -/* C8E774 80240BC4 8FB1018C */ lw $s1, 0x18c($sp) -/* C8E778 80240BC8 8FB00188 */ lw $s0, 0x188($sp) -/* C8E77C 80240BCC 03E00008 */ jr $ra -/* C8E780 80240BD0 27BD01A0 */ addiu $sp, $sp, 0x1a0 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/func_80240BD4_C8DBB0.s b/asm/nonmatchings/world/area_kzn/kzn_19/func_80240BD4_C8DBB0.s deleted file mode 100644 index 4adfcaced5..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/func_80240BD4_C8DBB0.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BD4_C8E784 -/* C8E784 80240BD4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C8E788 80240BD8 AFB10014 */ sw $s1, 0x14($sp) -/* C8E78C 80240BDC 0080882D */ daddu $s1, $a0, $zero -/* C8E790 80240BE0 AFBF0024 */ sw $ra, 0x24($sp) -/* C8E794 80240BE4 AFB40020 */ sw $s4, 0x20($sp) -/* C8E798 80240BE8 AFB3001C */ sw $s3, 0x1c($sp) -/* C8E79C 80240BEC AFB20018 */ sw $s2, 0x18($sp) -/* C8E7A0 80240BF0 AFB00010 */ sw $s0, 0x10($sp) -/* C8E7A4 80240BF4 8E30000C */ lw $s0, 0xc($s1) -/* C8E7A8 80240BF8 8E050000 */ lw $a1, ($s0) -/* C8E7AC 80240BFC 0C0B1EAF */ jal get_variable -/* C8E7B0 80240C00 26100004 */ addiu $s0, $s0, 4 -/* C8E7B4 80240C04 8E050000 */ lw $a1, ($s0) -/* C8E7B8 80240C08 26100004 */ addiu $s0, $s0, 4 -/* C8E7BC 80240C0C 0220202D */ daddu $a0, $s1, $zero -/* C8E7C0 80240C10 0C0B1EAF */ jal get_variable -/* C8E7C4 80240C14 0040982D */ daddu $s3, $v0, $zero -/* C8E7C8 80240C18 8E050000 */ lw $a1, ($s0) -/* C8E7CC 80240C1C 26100004 */ addiu $s0, $s0, 4 -/* C8E7D0 80240C20 0220202D */ daddu $a0, $s1, $zero -/* C8E7D4 80240C24 0C0B1EAF */ jal get_variable -/* C8E7D8 80240C28 0040902D */ daddu $s2, $v0, $zero -/* C8E7DC 80240C2C 8E050000 */ lw $a1, ($s0) -/* C8E7E0 80240C30 26100004 */ addiu $s0, $s0, 4 -/* C8E7E4 80240C34 0220202D */ daddu $a0, $s1, $zero -/* C8E7E8 80240C38 0C0B1EAF */ jal get_variable -/* C8E7EC 80240C3C 0040A02D */ daddu $s4, $v0, $zero -/* C8E7F0 80240C40 0220202D */ daddu $a0, $s1, $zero -/* C8E7F4 80240C44 8E050000 */ lw $a1, ($s0) -/* C8E7F8 80240C48 0C0B1EAF */ jal get_variable -/* C8E7FC 80240C4C 0040882D */ daddu $s1, $v0, $zero -/* C8E800 80240C50 0000202D */ daddu $a0, $zero, $zero -/* C8E804 80240C54 3C05FD05 */ lui $a1, 0xfd05 -/* C8E808 80240C58 34A50F80 */ ori $a1, $a1, 0xf80 -/* C8E80C 80240C5C 0C0B1EAF */ jal get_variable -/* C8E810 80240C60 0040802D */ daddu $s0, $v0, $zero -/* C8E814 80240C64 00131900 */ sll $v1, $s3, 4 -/* C8E818 80240C68 00731823 */ subu $v1, $v1, $s3 -/* C8E81C 80240C6C 00031940 */ sll $v1, $v1, 5 -/* C8E820 80240C70 00432021 */ addu $a0, $v0, $v1 -/* C8E824 80240C74 24020002 */ addiu $v0, $zero, 2 -/* C8E828 80240C78 00121840 */ sll $v1, $s2, 1 -/* C8E82C 80240C7C 00721821 */ addu $v1, $v1, $s2 -/* C8E830 80240C80 00431804 */ sllv $v1, $v1, $v0 -/* C8E834 80240C84 00832021 */ addu $a0, $a0, $v1 -/* C8E838 80240C88 44940000 */ mtc1 $s4, $f0 -/* C8E83C 80240C8C 00000000 */ nop -/* C8E840 80240C90 46800020 */ cvt.s.w $f0, $f0 -/* C8E844 80240C94 E4800000 */ swc1 $f0, ($a0) -/* C8E848 80240C98 44910000 */ mtc1 $s1, $f0 -/* C8E84C 80240C9C 00000000 */ nop -/* C8E850 80240CA0 46800020 */ cvt.s.w $f0, $f0 -/* C8E854 80240CA4 E4800004 */ swc1 $f0, 4($a0) -/* C8E858 80240CA8 44900000 */ mtc1 $s0, $f0 -/* C8E85C 80240CAC 00000000 */ nop -/* C8E860 80240CB0 46800020 */ cvt.s.w $f0, $f0 -/* C8E864 80240CB4 E4800008 */ swc1 $f0, 8($a0) -/* C8E868 80240CB8 8FBF0024 */ lw $ra, 0x24($sp) -/* C8E86C 80240CBC 8FB40020 */ lw $s4, 0x20($sp) -/* C8E870 80240CC0 8FB3001C */ lw $s3, 0x1c($sp) -/* C8E874 80240CC4 8FB20018 */ lw $s2, 0x18($sp) -/* C8E878 80240CC8 8FB10014 */ lw $s1, 0x14($sp) -/* C8E87C 80240CCC 8FB00010 */ lw $s0, 0x10($sp) -/* C8E880 80240CD0 03E00008 */ jr $ra -/* C8E884 80240CD4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/func_80240DA4_C8DBB0.s b/asm/nonmatchings/world/area_kzn/kzn_19/func_80240DA4_C8DBB0.s deleted file mode 100644 index e647a8ff58..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/func_80240DA4_C8DBB0.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DA4_C8E954 -/* C8E954 80240DA4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C8E958 80240DA8 AFB10014 */ sw $s1, 0x14($sp) -/* C8E95C 80240DAC 0080882D */ daddu $s1, $a0, $zero -/* C8E960 80240DB0 AFBF0018 */ sw $ra, 0x18($sp) -/* C8E964 80240DB4 AFB00010 */ sw $s0, 0x10($sp) -/* C8E968 80240DB8 8E30000C */ lw $s0, 0xc($s1) -/* C8E96C 80240DBC 8E050000 */ lw $a1, ($s0) -/* C8E970 80240DC0 0C0B1EAF */ jal get_variable -/* C8E974 80240DC4 26100004 */ addiu $s0, $s0, 4 -/* C8E978 80240DC8 8E050000 */ lw $a1, ($s0) -/* C8E97C 80240DCC 26100004 */ addiu $s0, $s0, 4 -/* C8E980 80240DD0 0C0B1EAF */ jal get_variable -/* C8E984 80240DD4 0220202D */ daddu $a0, $s1, $zero -/* C8E988 80240DD8 8E050000 */ lw $a1, ($s0) -/* C8E98C 80240DDC 26100004 */ addiu $s0, $s0, 4 -/* C8E990 80240DE0 0C0B1EAF */ jal get_variable -/* C8E994 80240DE4 0220202D */ daddu $a0, $s1, $zero -/* C8E998 80240DE8 8E050000 */ lw $a1, ($s0) -/* C8E99C 80240DEC 26100004 */ addiu $s0, $s0, 4 -/* C8E9A0 80240DF0 0C0B1EAF */ jal get_variable -/* C8E9A4 80240DF4 0220202D */ daddu $a0, $s1, $zero -/* C8E9A8 80240DF8 8E050000 */ lw $a1, ($s0) -/* C8E9AC 80240DFC 0C0B1EAF */ jal get_variable -/* C8E9B0 80240E00 0220202D */ daddu $a0, $s1, $zero -/* C8E9B4 80240E04 0000202D */ daddu $a0, $zero, $zero -/* C8E9B8 80240E08 3C05FD05 */ lui $a1, 0xfd05 -/* C8E9BC 80240E0C 0C0B1EAF */ jal get_variable -/* C8E9C0 80240E10 34A50F80 */ ori $a1, $a1, 0xf80 -/* C8E9C4 80240E14 8FBF0018 */ lw $ra, 0x18($sp) -/* C8E9C8 80240E18 8FB10014 */ lw $s1, 0x14($sp) -/* C8E9CC 80240E1C 8FB00010 */ lw $s0, 0x10($sp) -/* C8E9D0 80240E20 24020002 */ addiu $v0, $zero, 2 -/* C8E9D4 80240E24 03E00008 */ jr $ra -/* C8E9D8 80240E28 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/func_802413C0_C8DBB0.s b/asm/nonmatchings/world/area_kzn/kzn_19/func_802413C0_C8DBB0.s deleted file mode 100644 index a1936ef072..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/func_802413C0_C8DBB0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413C0_C8EF70 -/* C8EF70 802413C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C8EF74 802413C4 3C028024 */ lui $v0, 0x8024 -/* C8EF78 802413C8 24420E2C */ addiu $v0, $v0, 0xe2c -/* C8EF7C 802413CC AFA2001C */ sw $v0, 0x1c($sp) -/* C8EF80 802413D0 2402000A */ addiu $v0, $zero, 0xa -/* C8EF84 802413D4 AFA20014 */ sw $v0, 0x14($sp) -/* C8EF88 802413D8 24020001 */ addiu $v0, $zero, 1 -/* C8EF8C 802413DC 27A40010 */ addiu $a0, $sp, 0x10 -/* C8EF90 802413E0 AFBF0020 */ sw $ra, 0x20($sp) -/* C8EF94 802413E4 AFA00018 */ sw $zero, 0x18($sp) -/* C8EF98 802413E8 0C047644 */ jal queue_render_task -/* C8EF9C 802413EC AFA20010 */ sw $v0, 0x10($sp) -/* C8EFA0 802413F0 8FBF0020 */ lw $ra, 0x20($sp) -/* C8EFA4 802413F4 03E00008 */ jr $ra -/* C8EFA8 802413F8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/func_802413FC_C8DBB0.s b/asm/nonmatchings/world/area_kzn/kzn_19/func_802413FC_C8DBB0.s deleted file mode 100644 index ab021e08b5..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/func_802413FC_C8DBB0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413FC_C8EFAC -/* C8EFAC 802413FC 3C018025 */ lui $at, 0x8025 -/* C8EFB0 80241400 AC208380 */ sw $zero, -0x7c80($at) -/* C8EFB4 80241404 03E00008 */ jr $ra -/* C8EFB8 80241408 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/func_802417AC_C8DBB0.s b/asm/nonmatchings/world/area_kzn/kzn_19/func_802417AC_C8DBB0.s deleted file mode 100644 index 163de8e533..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/func_802417AC_C8DBB0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417AC_C8F35C -/* C8F35C 802417AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8F360 802417B0 AFBF0010 */ sw $ra, 0x10($sp) -/* C8F364 802417B4 10A00003 */ beqz $a1, .L802417C4 -/* C8F368 802417B8 8C86000C */ lw $a2, 0xc($a0) -/* C8F36C 802417BC 3C018024 */ lui $at, 0x8024 -/* C8F370 802417C0 AC203DD8 */ sw $zero, 0x3dd8($at) -.L802417C4: -/* C8F374 802417C4 3C038024 */ lui $v1, 0x8024 -/* C8F378 802417C8 24633DD8 */ addiu $v1, $v1, 0x3dd8 -/* C8F37C 802417CC 8C620000 */ lw $v0, ($v1) -/* C8F380 802417D0 54400003 */ bnel $v0, $zero, .L802417E0 -/* C8F384 802417D4 AC600000 */ sw $zero, ($v1) -/* C8F388 802417D8 080905FD */ j .L802417F4 -/* C8F38C 802417DC 0000102D */ daddu $v0, $zero, $zero -.L802417E0: -/* C8F390 802417E0 8CC50000 */ lw $a1, ($a2) -/* C8F394 802417E4 3C068024 */ lui $a2, 0x8024 -/* C8F398 802417E8 0C0B2026 */ jal set_variable -/* C8F39C 802417EC 8CC63DDC */ lw $a2, 0x3ddc($a2) -/* C8F3A0 802417F0 24020002 */ addiu $v0, $zero, 2 -.L802417F4: -/* C8F3A4 802417F4 8FBF0010 */ lw $ra, 0x10($sp) -/* C8F3A8 802417F8 03E00008 */ jr $ra -/* C8F3AC 802417FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/func_80241800_C8DBB0.s b/asm/nonmatchings/world/area_kzn/kzn_19/func_80241800_C8DBB0.s deleted file mode 100644 index 77e1012e2f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/func_80241800_C8DBB0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241800_C8F3B0 -/* C8F3B0 80241800 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8F3B4 80241804 AFBF0010 */ sw $ra, 0x10($sp) -/* C8F3B8 80241808 8C82000C */ lw $v0, 0xc($a0) -/* C8F3BC 8024180C 0C0B1EAF */ jal get_variable -/* C8F3C0 80241810 8C450000 */ lw $a1, ($v0) -/* C8F3C4 80241814 3C018024 */ lui $at, 0x8024 -/* C8F3C8 80241818 AC223DDC */ sw $v0, 0x3ddc($at) -/* C8F3CC 8024181C 24020002 */ addiu $v0, $zero, 2 -/* C8F3D0 80241820 8FBF0010 */ lw $ra, 0x10($sp) -/* C8F3D4 80241824 24030001 */ addiu $v1, $zero, 1 -/* C8F3D8 80241828 3C018024 */ lui $at, 0x8024 -/* C8F3DC 8024182C AC233DD8 */ sw $v1, 0x3dd8($at) -/* C8F3E0 80241830 03E00008 */ jr $ra -/* C8F3E4 80241834 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/func_802418D4_C8DBB0.s b/asm/nonmatchings/world/area_kzn/kzn_19/func_802418D4_C8DBB0.s deleted file mode 100644 index d0ad0d1938..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/func_802418D4_C8DBB0.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418D4_C8F484 -/* C8F484 802418D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C8F488 802418D8 AFB10014 */ sw $s1, 0x14($sp) -/* C8F48C 802418DC 0080882D */ daddu $s1, $a0, $zero -/* C8F490 802418E0 AFBF0018 */ sw $ra, 0x18($sp) -/* C8F494 802418E4 AFB00010 */ sw $s0, 0x10($sp) -/* C8F498 802418E8 8E30000C */ lw $s0, 0xc($s1) -/* C8F49C 802418EC 8E050000 */ lw $a1, ($s0) -/* C8F4A0 802418F0 0C0B1EAF */ jal get_variable -/* C8F4A4 802418F4 26100004 */ addiu $s0, $s0, 4 -/* C8F4A8 802418F8 AE22008C */ sw $v0, 0x8c($s1) -/* C8F4AC 802418FC 8E050000 */ lw $a1, ($s0) -/* C8F4B0 80241900 26100004 */ addiu $s0, $s0, 4 -/* C8F4B4 80241904 0C0B1EAF */ jal get_variable -/* C8F4B8 80241908 0220202D */ daddu $a0, $s1, $zero -/* C8F4BC 8024190C AE220090 */ sw $v0, 0x90($s1) -/* C8F4C0 80241910 8E050000 */ lw $a1, ($s0) -/* C8F4C4 80241914 26100004 */ addiu $s0, $s0, 4 -/* C8F4C8 80241918 0C0B1EAF */ jal get_variable -/* C8F4CC 8024191C 0220202D */ daddu $a0, $s1, $zero -/* C8F4D0 80241920 AE220094 */ sw $v0, 0x94($s1) -/* C8F4D4 80241924 8E050000 */ lw $a1, ($s0) -/* C8F4D8 80241928 26100004 */ addiu $s0, $s0, 4 -/* C8F4DC 8024192C 0C0B1EAF */ jal get_variable -/* C8F4E0 80241930 0220202D */ daddu $a0, $s1, $zero -/* C8F4E4 80241934 AE220098 */ sw $v0, 0x98($s1) -/* C8F4E8 80241938 8E050000 */ lw $a1, ($s0) -/* C8F4EC 8024193C 26100004 */ addiu $s0, $s0, 4 -/* C8F4F0 80241940 0C0B1EAF */ jal get_variable -/* C8F4F4 80241944 0220202D */ daddu $a0, $s1, $zero -/* C8F4F8 80241948 AE22009C */ sw $v0, 0x9c($s1) -/* C8F4FC 8024194C 8E050000 */ lw $a1, ($s0) -/* C8F500 80241950 26100004 */ addiu $s0, $s0, 4 -/* C8F504 80241954 0C0B1EAF */ jal get_variable -/* C8F508 80241958 0220202D */ daddu $a0, $s1, $zero -/* C8F50C 8024195C AE2200A0 */ sw $v0, 0xa0($s1) -/* C8F510 80241960 8E050000 */ lw $a1, ($s0) -/* C8F514 80241964 26100004 */ addiu $s0, $s0, 4 -/* C8F518 80241968 0C0B1EAF */ jal get_variable -/* C8F51C 8024196C 0220202D */ daddu $a0, $s1, $zero -/* C8F520 80241970 AE2200A4 */ sw $v0, 0xa4($s1) -/* C8F524 80241974 8E050000 */ lw $a1, ($s0) -/* C8F528 80241978 26100004 */ addiu $s0, $s0, 4 -/* C8F52C 8024197C 0C0B1EAF */ jal get_variable -/* C8F530 80241980 0220202D */ daddu $a0, $s1, $zero -/* C8F534 80241984 AE2200A8 */ sw $v0, 0xa8($s1) -/* C8F538 80241988 8E050000 */ lw $a1, ($s0) -/* C8F53C 8024198C 26100004 */ addiu $s0, $s0, 4 -/* C8F540 80241990 0C0B1EAF */ jal get_variable -/* C8F544 80241994 0220202D */ daddu $a0, $s1, $zero -/* C8F548 80241998 AE2200AC */ sw $v0, 0xac($s1) -/* C8F54C 8024199C 8E050000 */ lw $a1, ($s0) -/* C8F550 802419A0 0C0B1EAF */ jal get_variable -/* C8F554 802419A4 0220202D */ daddu $a0, $s1, $zero -/* C8F558 802419A8 AE2200B0 */ sw $v0, 0xb0($s1) -/* C8F55C 802419AC 8FBF0018 */ lw $ra, 0x18($sp) -/* C8F560 802419B0 8FB10014 */ lw $s1, 0x14($sp) -/* C8F564 802419B4 8FB00010 */ lw $s0, 0x10($sp) -/* C8F568 802419B8 24020002 */ addiu $v0, $zero, 2 -/* C8F56C 802419BC 03E00008 */ jr $ra -/* C8F570 802419C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/func_802419C4_C8DBB0.s b/asm/nonmatchings/world/area_kzn/kzn_19/func_802419C4_C8DBB0.s deleted file mode 100644 index 0430f2e068..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/func_802419C4_C8DBB0.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419C4_C8F574 -/* C8F574 802419C4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C8F578 802419C8 AFB1001C */ sw $s1, 0x1c($sp) -/* C8F57C 802419CC 0080882D */ daddu $s1, $a0, $zero -/* C8F580 802419D0 AFBF0034 */ sw $ra, 0x34($sp) -/* C8F584 802419D4 AFB60030 */ sw $s6, 0x30($sp) -/* C8F588 802419D8 AFB5002C */ sw $s5, 0x2c($sp) -/* C8F58C 802419DC AFB40028 */ sw $s4, 0x28($sp) -/* C8F590 802419E0 AFB30024 */ sw $s3, 0x24($sp) -/* C8F594 802419E4 AFB20020 */ sw $s2, 0x20($sp) -/* C8F598 802419E8 AFB00018 */ sw $s0, 0x18($sp) -/* C8F59C 802419EC F7B60040 */ sdc1 $f22, 0x40($sp) -/* C8F5A0 802419F0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* C8F5A4 802419F4 8E30000C */ lw $s0, 0xc($s1) -/* C8F5A8 802419F8 8E160000 */ lw $s6, ($s0) -/* C8F5AC 802419FC 26100004 */ addiu $s0, $s0, 4 -/* C8F5B0 80241A00 0C0B1EAF */ jal get_variable -/* C8F5B4 80241A04 02C0282D */ daddu $a1, $s6, $zero -/* C8F5B8 80241A08 44820000 */ mtc1 $v0, $f0 -/* C8F5BC 80241A0C 00000000 */ nop -/* C8F5C0 80241A10 46800020 */ cvt.s.w $f0, $f0 -/* C8F5C4 80241A14 E7A00010 */ swc1 $f0, 0x10($sp) -/* C8F5C8 80241A18 8E140000 */ lw $s4, ($s0) -/* C8F5CC 80241A1C 26100004 */ addiu $s0, $s0, 4 -/* C8F5D0 80241A20 0220202D */ daddu $a0, $s1, $zero -/* C8F5D4 80241A24 0C0B1EAF */ jal get_variable -/* C8F5D8 80241A28 0280282D */ daddu $a1, $s4, $zero -/* C8F5DC 80241A2C 0220202D */ daddu $a0, $s1, $zero -/* C8F5E0 80241A30 8E150000 */ lw $s5, ($s0) -/* C8F5E4 80241A34 4482B000 */ mtc1 $v0, $f22 -/* C8F5E8 80241A38 00000000 */ nop -/* C8F5EC 80241A3C 4680B5A0 */ cvt.s.w $f22, $f22 -/* C8F5F0 80241A40 0C0B1EAF */ jal get_variable -/* C8F5F4 80241A44 02A0282D */ daddu $a1, $s5, $zero -/* C8F5F8 80241A48 2404FFFC */ addiu $a0, $zero, -4 -/* C8F5FC 80241A4C 44820000 */ mtc1 $v0, $f0 -/* C8F600 80241A50 00000000 */ nop -/* C8F604 80241A54 46800020 */ cvt.s.w $f0, $f0 -/* C8F608 80241A58 0C00EABB */ jal get_npc_unsafe -/* C8F60C 80241A5C E7A00014 */ swc1 $f0, 0x14($sp) -/* C8F610 80241A60 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C8F614 80241A64 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C8F618 80241A68 3C014334 */ lui $at, 0x4334 -/* C8F61C 80241A6C 44816000 */ mtc1 $at, $f12 -/* C8F620 80241A70 00041880 */ sll $v1, $a0, 2 -/* C8F624 80241A74 00641821 */ addu $v1, $v1, $a0 -/* C8F628 80241A78 00031880 */ sll $v1, $v1, 2 -/* C8F62C 80241A7C 00641823 */ subu $v1, $v1, $a0 -/* C8F630 80241A80 000320C0 */ sll $a0, $v1, 3 -/* C8F634 80241A84 00641821 */ addu $v1, $v1, $a0 -/* C8F638 80241A88 000318C0 */ sll $v1, $v1, 3 -/* C8F63C 80241A8C 3C01800B */ lui $at, 0x800b -/* C8F640 80241A90 00230821 */ addu $at, $at, $v1 -/* C8F644 80241A94 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C8F648 80241A98 460C0300 */ add.s $f12, $f0, $f12 -/* C8F64C 80241A9C 0C00A6C9 */ jal clamp_angle -/* C8F650 80241AA0 0040982D */ daddu $s3, $v0, $zero -/* C8F654 80241AA4 27B00010 */ addiu $s0, $sp, 0x10 -/* C8F658 80241AA8 0200202D */ daddu $a0, $s0, $zero -/* C8F65C 80241AAC 27B20014 */ addiu $s2, $sp, 0x14 -/* C8F660 80241AB0 0240282D */ daddu $a1, $s2, $zero -/* C8F664 80241AB4 3C064170 */ lui $a2, 0x4170 -/* C8F668 80241AB8 8E67000C */ lw $a3, 0xc($s3) -/* C8F66C 80241ABC 0C00A7E7 */ jal add_vec2D_polar -/* C8F670 80241AC0 46000506 */ mov.s $f20, $f0 -/* C8F674 80241AC4 0200202D */ daddu $a0, $s0, $zero -/* C8F678 80241AC8 3C064120 */ lui $a2, 0x4120 -/* C8F67C 80241ACC 4407A000 */ mfc1 $a3, $f20 -/* C8F680 80241AD0 0C00A7E7 */ jal add_vec2D_polar -/* C8F684 80241AD4 0240282D */ daddu $a1, $s2, $zero -/* C8F688 80241AD8 0220202D */ daddu $a0, $s1, $zero -/* C8F68C 80241ADC C7A00010 */ lwc1 $f0, 0x10($sp) -/* C8F690 80241AE0 4600008D */ trunc.w.s $f2, $f0 -/* C8F694 80241AE4 44061000 */ mfc1 $a2, $f2 -/* C8F698 80241AE8 0C0B2026 */ jal set_variable -/* C8F69C 80241AEC 02C0282D */ daddu $a1, $s6, $zero -/* C8F6A0 80241AF0 0220202D */ daddu $a0, $s1, $zero -/* C8F6A4 80241AF4 4600B08D */ trunc.w.s $f2, $f22 -/* C8F6A8 80241AF8 44061000 */ mfc1 $a2, $f2 -/* C8F6AC 80241AFC 0C0B2026 */ jal set_variable -/* C8F6B0 80241B00 0280282D */ daddu $a1, $s4, $zero -/* C8F6B4 80241B04 0220202D */ daddu $a0, $s1, $zero -/* C8F6B8 80241B08 C7A00014 */ lwc1 $f0, 0x14($sp) -/* C8F6BC 80241B0C 4600008D */ trunc.w.s $f2, $f0 -/* C8F6C0 80241B10 44061000 */ mfc1 $a2, $f2 -/* C8F6C4 80241B14 0C0B2026 */ jal set_variable -/* C8F6C8 80241B18 02A0282D */ daddu $a1, $s5, $zero -/* C8F6CC 80241B1C 8FBF0034 */ lw $ra, 0x34($sp) -/* C8F6D0 80241B20 8FB60030 */ lw $s6, 0x30($sp) -/* C8F6D4 80241B24 8FB5002C */ lw $s5, 0x2c($sp) -/* C8F6D8 80241B28 8FB40028 */ lw $s4, 0x28($sp) -/* C8F6DC 80241B2C 8FB30024 */ lw $s3, 0x24($sp) -/* C8F6E0 80241B30 8FB20020 */ lw $s2, 0x20($sp) -/* C8F6E4 80241B34 8FB1001C */ lw $s1, 0x1c($sp) -/* C8F6E8 80241B38 8FB00018 */ lw $s0, 0x18($sp) -/* C8F6EC 80241B3C D7B60040 */ ldc1 $f22, 0x40($sp) -/* C8F6F0 80241B40 D7B40038 */ ldc1 $f20, 0x38($sp) -/* C8F6F4 80241B44 24020002 */ addiu $v0, $zero, 2 -/* C8F6F8 80241B48 03E00008 */ jr $ra -/* C8F6FC 80241B4C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/func_80241B50_C8DBB0.s b/asm/nonmatchings/world/area_kzn/kzn_19/func_80241B50_C8DBB0.s deleted file mode 100644 index 5fd7332104..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/func_80241B50_C8DBB0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B50_C8F700 -/* C8F700 80241B50 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8F704 80241B54 AFB00010 */ sw $s0, 0x10($sp) -/* C8F708 80241B58 0080802D */ daddu $s0, $a0, $zero -/* C8F70C 80241B5C AFBF0014 */ sw $ra, 0x14($sp) -/* C8F710 80241B60 0C00EABB */ jal get_npc_unsafe -/* C8F714 80241B64 8E04008C */ lw $a0, 0x8c($s0) -/* C8F718 80241B68 0040282D */ daddu $a1, $v0, $zero -/* C8F71C 80241B6C 8E040094 */ lw $a0, 0x94($s0) -/* C8F720 80241B70 8CA30028 */ lw $v1, 0x28($a1) -/* C8F724 80241B74 ACA40028 */ sw $a0, 0x28($a1) -/* C8F728 80241B78 8FBF0014 */ lw $ra, 0x14($sp) -/* C8F72C 80241B7C 8FB00010 */ lw $s0, 0x10($sp) -/* C8F730 80241B80 24020002 */ addiu $v0, $zero, 2 -/* C8F734 80241B84 3C018025 */ lui $at, 0x8025 -/* C8F738 80241B88 AC23854C */ sw $v1, -0x7ab4($at) -/* C8F73C 80241B8C 03E00008 */ jr $ra -/* C8F740 80241B90 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/func_80240124_C95F30.s b/asm/nonmatchings/world/area_kzn/kzn_20/func_80240124_C95F30.s deleted file mode 100644 index 1606244805..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/func_80240124_C95F30.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C96054 -/* C96054 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C96058 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C9605C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C96060 80240130 10A00005 */ beqz $a1, .L80240148 -/* C96064 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C96068 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C9606C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C96070 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C96074 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C96078 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C9607C 8024014C 1440000E */ bnez $v0, .L80240188 -/* C96080 80240150 00000000 */ nop -/* C96084 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C96088 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C9608C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C96090 80240160 04610004 */ bgez $v1, .L80240174 -/* C96094 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C96098 80240168 3C020002 */ lui $v0, 2 -/* C9609C 8024016C 08090061 */ j .L80240184 -/* C960A0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C960A4 80240174 3C040002 */ lui $a0, 2 -/* C960A8 80240178 0083102A */ slt $v0, $a0, $v1 -/* C960AC 8024017C 10400002 */ beqz $v0, .L80240188 -/* C960B0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C960B4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C960B8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C960BC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C960C0 80240190 00000000 */ nop -/* C960C4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C960C8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C960CC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C960D0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C960D4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C960D8 802401A8 3C020002 */ lui $v0, 2 -/* C960DC 802401AC 08090071 */ j .L802401C4 -/* C960E0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C960E4 802401B4 3C040002 */ lui $a0, 2 -/* C960E8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C960EC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C960F0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C960F4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C960F8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C960FC 802401CC 1440000E */ bnez $v0, .L80240208 -/* C96100 802401D0 00000000 */ nop -/* C96104 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C96108 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C9610C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C96110 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C96114 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C96118 802401E8 3C020002 */ lui $v0, 2 -/* C9611C 802401EC 08090081 */ j .L80240204 -/* C96120 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C96124 802401F4 3C040002 */ lui $a0, 2 -/* C96128 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C9612C 802401FC 10400002 */ beqz $v0, .L80240208 -/* C96130 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C96134 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C96138 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C9613C 8024020C 1440000E */ bnez $v0, .L80240248 -/* C96140 80240210 00000000 */ nop -/* C96144 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C96148 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C9614C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C96150 80240220 04610004 */ bgez $v1, .L80240234 -/* C96154 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C96158 80240228 3C020002 */ lui $v0, 2 -/* C9615C 8024022C 08090091 */ j .L80240244 -/* C96160 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C96164 80240234 3C040002 */ lui $a0, 2 -/* C96168 80240238 0083102A */ slt $v0, $a0, $v1 -/* C9616C 8024023C 10400002 */ beqz $v0, .L80240248 -/* C96170 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C96174 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C96178 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C9617C 8024024C 0C046F07 */ jal set_main_pan_u -/* C96180 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C96184 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C96188 80240258 0C046F0D */ jal set_main_pan_v -/* C9618C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C96190 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C96194 80240264 0C046F13 */ jal set_aux_pan_u -/* C96198 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C9619C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C961A0 80240270 0C046F19 */ jal set_aux_pan_v -/* C961A4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C961A8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C961AC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C961B0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C961B4 80240284 24420001 */ addiu $v0, $v0, 1 -/* C961B8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C961BC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C961C0 80240290 24630001 */ addiu $v1, $v1, 1 -/* C961C4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C961C8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C961CC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C961D0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C961D4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C961D8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C961DC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C961E0 802402B0 14600002 */ bnez $v1, .L802402BC -/* C961E4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C961E8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C961EC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C961F0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C961F4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C961F8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C961FC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C96200 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C96204 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C96208 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C9620C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C96210 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C96214 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C96218 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C9621C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C96220 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C96224 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C96228 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C9622C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C96230 80240300 0000102D */ daddu $v0, $zero, $zero -/* C96234 80240304 03E00008 */ jr $ra -/* C96238 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C9623C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/func_80240310_C95F30.s b/asm/nonmatchings/world/area_kzn/kzn_20/func_80240310_C95F30.s deleted file mode 100644 index 78db0247bf..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/func_80240310_C95F30.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_C96240 -/* C96240 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C96244 80240314 AFB00010 */ sw $s0, 0x10($sp) -/* C96248 80240318 3C108024 */ lui $s0, 0x8024 -/* C9624C 8024031C 26101780 */ addiu $s0, $s0, 0x1780 -/* C96250 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* C96254 80240324 AFB10014 */ sw $s1, 0x14($sp) -/* C96258 80240328 8E020000 */ lw $v0, ($s0) -/* C9625C 8024032C 14400010 */ bnez $v0, .L80240370 -/* C96260 80240330 0080882D */ daddu $s1, $a0, $zero -/* C96264 80240334 0C00AB39 */ jal heap_malloc -/* C96268 80240338 24040040 */ addiu $a0, $zero, 0x40 -/* C9626C 8024033C AE020000 */ sw $v0, ($s0) -/* C96270 80240340 0000182D */ daddu $v1, $zero, $zero -/* C96274 80240344 0040282D */ daddu $a1, $v0, $zero -/* C96278 80240348 0220202D */ daddu $a0, $s1, $zero -.L8024034C: -/* C9627C 8024034C 8C820084 */ lw $v0, 0x84($a0) -/* C96280 80240350 24840004 */ addiu $a0, $a0, 4 -/* C96284 80240354 24630001 */ addiu $v1, $v1, 1 -/* C96288 80240358 ACA20000 */ sw $v0, ($a1) -/* C9628C 8024035C 28620010 */ slti $v0, $v1, 0x10 -/* C96290 80240360 1440FFFA */ bnez $v0, .L8024034C -/* C96294 80240364 24A50004 */ addiu $a1, $a1, 4 -/* C96298 80240368 080900EB */ j .L802403AC -/* C9629C 8024036C 00000000 */ nop -.L80240370: -/* C962A0 80240370 0000182D */ daddu $v1, $zero, $zero -/* C962A4 80240374 0040282D */ daddu $a1, $v0, $zero -/* C962A8 80240378 0220202D */ daddu $a0, $s1, $zero -.L8024037C: -/* C962AC 8024037C 8CA20000 */ lw $v0, ($a1) -/* C962B0 80240380 24A50004 */ addiu $a1, $a1, 4 -/* C962B4 80240384 24630001 */ addiu $v1, $v1, 1 -/* C962B8 80240388 AC820084 */ sw $v0, 0x84($a0) -/* C962BC 8024038C 28620010 */ slti $v0, $v1, 0x10 -/* C962C0 80240390 1440FFFA */ bnez $v0, .L8024037C -/* C962C4 80240394 24840004 */ addiu $a0, $a0, 4 -/* C962C8 80240398 3C108024 */ lui $s0, 0x8024 -/* C962CC 8024039C 26101780 */ addiu $s0, $s0, 0x1780 -/* C962D0 802403A0 0C00AB4B */ jal heap_free -/* C962D4 802403A4 8E040000 */ lw $a0, ($s0) -/* C962D8 802403A8 AE000000 */ sw $zero, ($s0) -.L802403AC: -/* C962DC 802403AC 8FBF0018 */ lw $ra, 0x18($sp) -/* C962E0 802403B0 8FB10014 */ lw $s1, 0x14($sp) -/* C962E4 802403B4 8FB00010 */ lw $s0, 0x10($sp) -/* C962E8 802403B8 24020002 */ addiu $v0, $zero, 2 -/* C962EC 802403BC 03E00008 */ jr $ra -/* C962F0 802403C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/func_802403C4_C95F30.s b/asm/nonmatchings/world/area_kzn/kzn_20/func_802403C4_C95F30.s deleted file mode 100644 index c83eba0f10..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/func_802403C4_C95F30.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C4_C962F4 -/* C962F4 802403C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C962F8 802403C8 AFB00010 */ sw $s0, 0x10($sp) -/* C962FC 802403CC 0080802D */ daddu $s0, $a0, $zero -/* C96300 802403D0 AFBF0018 */ sw $ra, 0x18($sp) -/* C96304 802403D4 AFB10014 */ sw $s1, 0x14($sp) -/* C96308 802403D8 8E02000C */ lw $v0, 0xc($s0) -/* C9630C 802403DC 8C510000 */ lw $s1, ($v0) -/* C96310 802403E0 0C0B1EAF */ jal get_variable -/* C96314 802403E4 0220282D */ daddu $a1, $s1, $zero -/* C96318 802403E8 3C03FFF0 */ lui $v1, 0xfff0 -/* C9631C 802403EC 3463FFFF */ ori $v1, $v1, 0xffff -/* C96320 802403F0 0200202D */ daddu $a0, $s0, $zero -/* C96324 802403F4 00431024 */ and $v0, $v0, $v1 -/* C96328 802403F8 00021140 */ sll $v0, $v0, 5 -/* C9632C 802403FC 3C068008 */ lui $a2, %hi(gItemTable) -/* C96330 80240400 00C23021 */ addu $a2, $a2, $v0 -/* C96334 80240404 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* C96338 80240408 0C0B2026 */ jal set_variable -/* C9633C 8024040C 0220282D */ daddu $a1, $s1, $zero -/* C96340 80240410 8FBF0018 */ lw $ra, 0x18($sp) -/* C96344 80240414 8FB10014 */ lw $s1, 0x14($sp) -/* C96348 80240418 8FB00010 */ lw $s0, 0x10($sp) -/* C9634C 8024041C 24020002 */ addiu $v0, $zero, 2 -/* C96350 80240420 03E00008 */ jr $ra -/* C96354 80240424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/func_80240428_C95F30.s b/asm/nonmatchings/world/area_kzn/kzn_20/func_80240428_C95F30.s deleted file mode 100644 index 7c9d60210b..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/func_80240428_C95F30.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240428_C96358 -/* C96358 80240428 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C9635C 8024042C AFB10014 */ sw $s1, 0x14($sp) -/* C96360 80240430 0080882D */ daddu $s1, $a0, $zero -/* C96364 80240434 AFBF0018 */ sw $ra, 0x18($sp) -/* C96368 80240438 AFB00010 */ sw $s0, 0x10($sp) -/* C9636C 8024043C 8E30000C */ lw $s0, 0xc($s1) -/* C96370 80240440 8E050000 */ lw $a1, ($s0) -/* C96374 80240444 0C0B1EAF */ jal get_variable -/* C96378 80240448 26100004 */ addiu $s0, $s0, 4 -/* C9637C 8024044C 0C00EAD2 */ jal get_npc_safe -/* C96380 80240450 0040202D */ daddu $a0, $v0, $zero -/* C96384 80240454 10400005 */ beqz $v0, .L8024046C -/* C96388 80240458 00000000 */ nop -/* C9638C 8024045C 8E050000 */ lw $a1, ($s0) -/* C96390 80240460 844600A8 */ lh $a2, 0xa8($v0) -/* C96394 80240464 0C0B2026 */ jal set_variable -/* C96398 80240468 0220202D */ daddu $a0, $s1, $zero -.L8024046C: -/* C9639C 8024046C 8FBF0018 */ lw $ra, 0x18($sp) -/* C963A0 80240470 8FB10014 */ lw $s1, 0x14($sp) -/* C963A4 80240474 8FB00010 */ lw $s0, 0x10($sp) -/* C963A8 80240478 24020002 */ addiu $v0, $zero, 2 -/* C963AC 8024047C 03E00008 */ jr $ra -/* C963B0 80240480 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/func_80240484_C95F30.s b/asm/nonmatchings/world/area_kzn/kzn_20/func_80240484_C95F30.s deleted file mode 100644 index afcbefaf3d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/func_80240484_C95F30.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240484_C963B4 -/* C963B4 80240484 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C963B8 80240488 AFB10014 */ sw $s1, 0x14($sp) -/* C963BC 8024048C 0080882D */ daddu $s1, $a0, $zero -/* C963C0 80240490 AFBF0024 */ sw $ra, 0x24($sp) -/* C963C4 80240494 AFB40020 */ sw $s4, 0x20($sp) -/* C963C8 80240498 AFB3001C */ sw $s3, 0x1c($sp) -/* C963CC 8024049C AFB20018 */ sw $s2, 0x18($sp) -/* C963D0 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* C963D4 802404A4 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* C963D8 802404A8 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* C963DC 802404AC F7B80038 */ sdc1 $f24, 0x38($sp) -/* C963E0 802404B0 F7B60030 */ sdc1 $f22, 0x30($sp) -/* C963E4 802404B4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C963E8 802404B8 8E30000C */ lw $s0, 0xc($s1) -/* C963EC 802404BC 8E130000 */ lw $s3, ($s0) -/* C963F0 802404C0 26100004 */ addiu $s0, $s0, 4 -/* C963F4 802404C4 0C0B1EAF */ jal get_variable -/* C963F8 802404C8 0260282D */ daddu $a1, $s3, $zero -/* C963FC 802404CC 4482E000 */ mtc1 $v0, $f28 -/* C96400 802404D0 00000000 */ nop -/* C96404 802404D4 4680E720 */ cvt.s.w $f28, $f28 -/* C96408 802404D8 8E140000 */ lw $s4, ($s0) -/* C9640C 802404DC 26100004 */ addiu $s0, $s0, 4 -/* C96410 802404E0 0220202D */ daddu $a0, $s1, $zero -/* C96414 802404E4 0C0B1EAF */ jal get_variable -/* C96418 802404E8 0280282D */ daddu $a1, $s4, $zero -/* C9641C 802404EC 4482D000 */ mtc1 $v0, $f26 -/* C96420 802404F0 00000000 */ nop -/* C96424 802404F4 4680D6A0 */ cvt.s.w $f26, $f26 -/* C96428 802404F8 8E100000 */ lw $s0, ($s0) -/* C9642C 802404FC 0220202D */ daddu $a0, $s1, $zero -/* C96430 80240500 0C0B1EAF */ jal get_variable -/* C96434 80240504 0200282D */ daddu $a1, $s0, $zero -/* C96438 80240508 4482C000 */ mtc1 $v0, $f24 -/* C9643C 8024050C 00000000 */ nop -/* C96440 80240510 4680C620 */ cvt.s.w $f24, $f24 -/* C96444 80240514 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* C96448 80240518 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* C9644C 8024051C 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C96450 80240520 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C96454 80240524 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* C96458 80240528 44800000 */ mtc1 $zero, $f0 -/* C9645C 8024052C 00031080 */ sll $v0, $v1, 2 -/* C96460 80240530 00431021 */ addu $v0, $v0, $v1 -/* C96464 80240534 00021080 */ sll $v0, $v0, 2 -/* C96468 80240538 00431023 */ subu $v0, $v0, $v1 -/* C9646C 8024053C 000218C0 */ sll $v1, $v0, 3 -/* C96470 80240540 00431021 */ addu $v0, $v0, $v1 -/* C96474 80240544 000210C0 */ sll $v0, $v0, 3 -/* C96478 80240548 46001032 */ c.eq.s $f2, $f0 -/* C9647C 8024054C 3C01800B */ lui $at, 0x800b -/* C96480 80240550 00220821 */ addu $at, $at, $v0 -/* C96484 80240554 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* C96488 80240558 45000005 */ bc1f .L80240570 -/* C9648C 8024055C 00000000 */ nop -/* C96490 80240560 3C0142C8 */ lui $at, 0x42c8 -/* C96494 80240564 44810000 */ mtc1 $at, $f0 -/* C96498 80240568 08090160 */ j .L80240580 -/* C9649C 8024056C 4600B581 */ sub.s $f22, $f22, $f0 -.L80240570: -/* C964A0 80240570 3C0142C8 */ lui $at, 0x42c8 -/* C964A4 80240574 44810000 */ mtc1 $at, $f0 -/* C964A8 80240578 00000000 */ nop -/* C964AC 8024057C 4600B580 */ add.s $f22, $f22, $f0 -.L80240580: -/* C964B0 80240580 0C00A6C9 */ jal clamp_angle -/* C964B4 80240584 4600B306 */ mov.s $f12, $f22 -/* C964B8 80240588 46000586 */ mov.s $f22, $f0 -/* C964BC 8024058C 3C014170 */ lui $at, 0x4170 -/* C964C0 80240590 4481A000 */ mtc1 $at, $f20 -/* C964C4 80240594 0C00A8BB */ jal sin_deg -/* C964C8 80240598 4600B306 */ mov.s $f12, $f22 -/* C964CC 8024059C 46140002 */ mul.s $f0, $f0, $f20 -/* C964D0 802405A0 00000000 */ nop -/* C964D4 802405A4 864200B0 */ lh $v0, 0xb0($s2) -/* C964D8 802405A8 3C013F00 */ lui $at, 0x3f00 -/* C964DC 802405AC 44812000 */ mtc1 $at, $f4 -/* C964E0 802405B0 44821000 */ mtc1 $v0, $f2 -/* C964E4 802405B4 00000000 */ nop -/* C964E8 802405B8 468010A0 */ cvt.s.w $f2, $f2 -/* C964EC 802405BC 46041082 */ mul.s $f2, $f2, $f4 -/* C964F0 802405C0 00000000 */ nop -/* C964F4 802405C4 4600E700 */ add.s $f28, $f28, $f0 -/* C964F8 802405C8 4602D680 */ add.s $f26, $f26, $f2 -/* C964FC 802405CC 0C00A8D4 */ jal cos_deg -/* C96500 802405D0 4600B306 */ mov.s $f12, $f22 -/* C96504 802405D4 46140002 */ mul.s $f0, $f0, $f20 -/* C96508 802405D8 00000000 */ nop -/* C9650C 802405DC 0220202D */ daddu $a0, $s1, $zero -/* C96510 802405E0 0260282D */ daddu $a1, $s3, $zero -/* C96514 802405E4 4600E18D */ trunc.w.s $f6, $f28 -/* C96518 802405E8 44063000 */ mfc1 $a2, $f6 -/* C9651C 802405EC 0C0B2026 */ jal set_variable -/* C96520 802405F0 4600C601 */ sub.s $f24, $f24, $f0 -/* C96524 802405F4 0220202D */ daddu $a0, $s1, $zero -/* C96528 802405F8 4600D18D */ trunc.w.s $f6, $f26 -/* C9652C 802405FC 44063000 */ mfc1 $a2, $f6 -/* C96530 80240600 0C0B2026 */ jal set_variable -/* C96534 80240604 0280282D */ daddu $a1, $s4, $zero -/* C96538 80240608 0220202D */ daddu $a0, $s1, $zero -/* C9653C 8024060C 4600C18D */ trunc.w.s $f6, $f24 -/* C96540 80240610 44063000 */ mfc1 $a2, $f6 -/* C96544 80240614 0C0B2026 */ jal set_variable -/* C96548 80240618 0200282D */ daddu $a1, $s0, $zero -/* C9654C 8024061C 8FBF0024 */ lw $ra, 0x24($sp) -/* C96550 80240620 8FB40020 */ lw $s4, 0x20($sp) -/* C96554 80240624 8FB3001C */ lw $s3, 0x1c($sp) -/* C96558 80240628 8FB20018 */ lw $s2, 0x18($sp) -/* C9655C 8024062C 8FB10014 */ lw $s1, 0x14($sp) -/* C96560 80240630 8FB00010 */ lw $s0, 0x10($sp) -/* C96564 80240634 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* C96568 80240638 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* C9656C 8024063C D7B80038 */ ldc1 $f24, 0x38($sp) -/* C96570 80240640 D7B60030 */ ldc1 $f22, 0x30($sp) -/* C96574 80240644 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C96578 80240648 24020002 */ addiu $v0, $zero, 2 -/* C9657C 8024064C 03E00008 */ jr $ra -/* C96580 80240650 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/func_80240654_C95F30.s b/asm/nonmatchings/world/area_kzn/kzn_20/func_80240654_C95F30.s deleted file mode 100644 index 8ad88f00e7..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/func_80240654_C95F30.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240654_C96584 -/* C96584 80240654 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C96588 80240658 AFBF0010 */ sw $ra, 0x10($sp) -/* C9658C 8024065C 10A00003 */ beqz $a1, .L8024066C -/* C96590 80240660 8C86000C */ lw $a2, 0xc($a0) -/* C96594 80240664 3C018024 */ lui $at, 0x8024 -/* C96598 80240668 AC2017E4 */ sw $zero, 0x17e4($at) -.L8024066C: -/* C9659C 8024066C 3C038024 */ lui $v1, 0x8024 -/* C965A0 80240670 246317E4 */ addiu $v1, $v1, 0x17e4 -/* C965A4 80240674 8C620000 */ lw $v0, ($v1) -/* C965A8 80240678 54400003 */ bnel $v0, $zero, .L80240688 -/* C965AC 8024067C AC600000 */ sw $zero, ($v1) -/* C965B0 80240680 080901A7 */ j .L8024069C -/* C965B4 80240684 0000102D */ daddu $v0, $zero, $zero -.L80240688: -/* C965B8 80240688 8CC50000 */ lw $a1, ($a2) -/* C965BC 8024068C 3C068024 */ lui $a2, 0x8024 -/* C965C0 80240690 0C0B2026 */ jal set_variable -/* C965C4 80240694 8CC617E8 */ lw $a2, 0x17e8($a2) -/* C965C8 80240698 24020002 */ addiu $v0, $zero, 2 -.L8024069C: -/* C965CC 8024069C 8FBF0010 */ lw $ra, 0x10($sp) -/* C965D0 802406A0 03E00008 */ jr $ra -/* C965D4 802406A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/func_802406A8_C95F30.s b/asm/nonmatchings/world/area_kzn/kzn_20/func_802406A8_C95F30.s deleted file mode 100644 index 71313df522..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/func_802406A8_C95F30.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A8_C965D8 -/* C965D8 802406A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C965DC 802406AC AFBF0010 */ sw $ra, 0x10($sp) -/* C965E0 802406B0 8C82000C */ lw $v0, 0xc($a0) -/* C965E4 802406B4 0C0B1EAF */ jal get_variable -/* C965E8 802406B8 8C450000 */ lw $a1, ($v0) -/* C965EC 802406BC 3C018024 */ lui $at, 0x8024 -/* C965F0 802406C0 AC2217E8 */ sw $v0, 0x17e8($at) -/* C965F4 802406C4 24020002 */ addiu $v0, $zero, 2 -/* C965F8 802406C8 8FBF0010 */ lw $ra, 0x10($sp) -/* C965FC 802406CC 24030001 */ addiu $v1, $zero, 1 -/* C96600 802406D0 3C018024 */ lui $at, 0x8024 -/* C96604 802406D4 AC2317E4 */ sw $v1, 0x17e4($at) -/* C96608 802406D8 03E00008 */ jr $ra -/* C9660C 802406DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/func_802406E0_C95F30.s b/asm/nonmatchings/world/area_kzn/kzn_20/func_802406E0_C95F30.s deleted file mode 100644 index 81e80d8a0f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/func_802406E0_C95F30.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406E0_C96610 -/* C96610 802406E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C96614 802406E4 AFBF0010 */ sw $ra, 0x10($sp) -/* C96618 802406E8 8C82000C */ lw $v0, 0xc($a0) -/* C9661C 802406EC 0C0B1EAF */ jal get_variable -/* C96620 802406F0 8C450000 */ lw $a1, ($v0) -/* C96624 802406F4 0040182D */ daddu $v1, $v0, $zero -/* C96628 802406F8 10600012 */ beqz $v1, .L80240744 -/* C9662C 802406FC 0000202D */ daddu $a0, $zero, $zero -/* C96630 80240700 8C620000 */ lw $v0, ($v1) -/* C96634 80240704 5040000A */ beql $v0, $zero, .L80240730 -/* C96638 80240708 00041080 */ sll $v0, $a0, 2 -/* C9663C 8024070C 3C058024 */ lui $a1, 0x8024 -/* C96640 80240710 24A542D0 */ addiu $a1, $a1, 0x42d0 -.L80240714: -/* C96644 80240714 24630004 */ addiu $v1, $v1, 4 -/* C96648 80240718 24840001 */ addiu $a0, $a0, 1 -/* C9664C 8024071C ACA20000 */ sw $v0, ($a1) -/* C96650 80240720 8C620000 */ lw $v0, ($v1) -/* C96654 80240724 1440FFFB */ bnez $v0, .L80240714 -/* C96658 80240728 24A50004 */ addiu $a1, $a1, 4 -/* C9665C 8024072C 00041080 */ sll $v0, $a0, 2 -.L80240730: -/* C96660 80240730 3C018024 */ lui $at, 0x8024 -/* C96664 80240734 00220821 */ addu $at, $at, $v0 -/* C96668 80240738 AC2042D0 */ sw $zero, 0x42d0($at) -/* C9666C 8024073C 080901DB */ j .L8024076C -/* C96670 80240740 00000000 */ nop -.L80240744: -/* C96674 80240744 3C038024 */ lui $v1, 0x8024 -/* C96678 80240748 246342D0 */ addiu $v1, $v1, 0x42d0 -/* C9667C 8024074C 0060282D */ daddu $a1, $v1, $zero -.L80240750: -/* C96680 80240750 24820010 */ addiu $v0, $a0, 0x10 -/* C96684 80240754 AC620000 */ sw $v0, ($v1) -/* C96688 80240758 24630004 */ addiu $v1, $v1, 4 -/* C9668C 8024075C 24840001 */ addiu $a0, $a0, 1 -/* C96690 80240760 28820070 */ slti $v0, $a0, 0x70 -/* C96694 80240764 1440FFFA */ bnez $v0, .L80240750 -/* C96698 80240768 ACA001C0 */ sw $zero, 0x1c0($a1) -.L8024076C: -/* C9669C 8024076C 8FBF0010 */ lw $ra, 0x10($sp) -/* C966A0 80240770 24020002 */ addiu $v0, $zero, 2 -/* C966A4 80240774 03E00008 */ jr $ra -/* C966A8 80240778 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/func_8024077C_C95F30.s b/asm/nonmatchings/world/area_kzn/kzn_20/func_8024077C_C95F30.s deleted file mode 100644 index 84f90ea99a..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/func_8024077C_C95F30.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024077C_C966AC -/* C966AC 8024077C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C966B0 80240780 AFB10014 */ sw $s1, 0x14($sp) -/* C966B4 80240784 0080882D */ daddu $s1, $a0, $zero -/* C966B8 80240788 AFBF0018 */ sw $ra, 0x18($sp) -/* C966BC 8024078C AFB00010 */ sw $s0, 0x10($sp) -/* C966C0 80240790 8E30000C */ lw $s0, 0xc($s1) -/* C966C4 80240794 8E050000 */ lw $a1, ($s0) -/* C966C8 80240798 0C0B1EAF */ jal get_variable -/* C966CC 8024079C 26100004 */ addiu $s0, $s0, 4 -/* C966D0 802407A0 AE22008C */ sw $v0, 0x8c($s1) -/* C966D4 802407A4 8E050000 */ lw $a1, ($s0) -/* C966D8 802407A8 26100004 */ addiu $s0, $s0, 4 -/* C966DC 802407AC 0C0B1EAF */ jal get_variable -/* C966E0 802407B0 0220202D */ daddu $a0, $s1, $zero -/* C966E4 802407B4 AE220090 */ sw $v0, 0x90($s1) -/* C966E8 802407B8 8E050000 */ lw $a1, ($s0) -/* C966EC 802407BC 26100004 */ addiu $s0, $s0, 4 -/* C966F0 802407C0 0C0B1EAF */ jal get_variable -/* C966F4 802407C4 0220202D */ daddu $a0, $s1, $zero -/* C966F8 802407C8 AE220094 */ sw $v0, 0x94($s1) -/* C966FC 802407CC 8E050000 */ lw $a1, ($s0) -/* C96700 802407D0 26100004 */ addiu $s0, $s0, 4 -/* C96704 802407D4 0C0B1EAF */ jal get_variable -/* C96708 802407D8 0220202D */ daddu $a0, $s1, $zero -/* C9670C 802407DC AE220098 */ sw $v0, 0x98($s1) -/* C96710 802407E0 8E050000 */ lw $a1, ($s0) -/* C96714 802407E4 26100004 */ addiu $s0, $s0, 4 -/* C96718 802407E8 0C0B1EAF */ jal get_variable -/* C9671C 802407EC 0220202D */ daddu $a0, $s1, $zero -/* C96720 802407F0 AE22009C */ sw $v0, 0x9c($s1) -/* C96724 802407F4 8E050000 */ lw $a1, ($s0) -/* C96728 802407F8 26100004 */ addiu $s0, $s0, 4 -/* C9672C 802407FC 0C0B1EAF */ jal get_variable -/* C96730 80240800 0220202D */ daddu $a0, $s1, $zero -/* C96734 80240804 AE2200A0 */ sw $v0, 0xa0($s1) -/* C96738 80240808 8E050000 */ lw $a1, ($s0) -/* C9673C 8024080C 26100004 */ addiu $s0, $s0, 4 -/* C96740 80240810 0C0B1EAF */ jal get_variable -/* C96744 80240814 0220202D */ daddu $a0, $s1, $zero -/* C96748 80240818 AE2200A4 */ sw $v0, 0xa4($s1) -/* C9674C 8024081C 8E050000 */ lw $a1, ($s0) -/* C96750 80240820 26100004 */ addiu $s0, $s0, 4 -/* C96754 80240824 0C0B1EAF */ jal get_variable -/* C96758 80240828 0220202D */ daddu $a0, $s1, $zero -/* C9675C 8024082C AE2200A8 */ sw $v0, 0xa8($s1) -/* C96760 80240830 8E050000 */ lw $a1, ($s0) -/* C96764 80240834 26100004 */ addiu $s0, $s0, 4 -/* C96768 80240838 0C0B1EAF */ jal get_variable -/* C9676C 8024083C 0220202D */ daddu $a0, $s1, $zero -/* C96770 80240840 AE2200AC */ sw $v0, 0xac($s1) -/* C96774 80240844 8E050000 */ lw $a1, ($s0) -/* C96778 80240848 0C0B1EAF */ jal get_variable -/* C9677C 8024084C 0220202D */ daddu $a0, $s1, $zero -/* C96780 80240850 AE2200B0 */ sw $v0, 0xb0($s1) -/* C96784 80240854 8FBF0018 */ lw $ra, 0x18($sp) -/* C96788 80240858 8FB10014 */ lw $s1, 0x14($sp) -/* C9678C 8024085C 8FB00010 */ lw $s0, 0x10($sp) -/* C96790 80240860 24020002 */ addiu $v0, $zero, 2 -/* C96794 80240864 03E00008 */ jr $ra -/* C96798 80240868 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/func_8024086C_C95F30.s b/asm/nonmatchings/world/area_kzn/kzn_20/func_8024086C_C95F30.s deleted file mode 100644 index dec2ac5fe2..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/func_8024086C_C95F30.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024086C_C9679C -/* C9679C 8024086C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C967A0 80240870 AFB1001C */ sw $s1, 0x1c($sp) -/* C967A4 80240874 0080882D */ daddu $s1, $a0, $zero -/* C967A8 80240878 AFBF0034 */ sw $ra, 0x34($sp) -/* C967AC 8024087C AFB60030 */ sw $s6, 0x30($sp) -/* C967B0 80240880 AFB5002C */ sw $s5, 0x2c($sp) -/* C967B4 80240884 AFB40028 */ sw $s4, 0x28($sp) -/* C967B8 80240888 AFB30024 */ sw $s3, 0x24($sp) -/* C967BC 8024088C AFB20020 */ sw $s2, 0x20($sp) -/* C967C0 80240890 AFB00018 */ sw $s0, 0x18($sp) -/* C967C4 80240894 F7B60040 */ sdc1 $f22, 0x40($sp) -/* C967C8 80240898 F7B40038 */ sdc1 $f20, 0x38($sp) -/* C967CC 8024089C 8E30000C */ lw $s0, 0xc($s1) -/* C967D0 802408A0 8E160000 */ lw $s6, ($s0) -/* C967D4 802408A4 26100004 */ addiu $s0, $s0, 4 -/* C967D8 802408A8 0C0B1EAF */ jal get_variable -/* C967DC 802408AC 02C0282D */ daddu $a1, $s6, $zero -/* C967E0 802408B0 44820000 */ mtc1 $v0, $f0 -/* C967E4 802408B4 00000000 */ nop -/* C967E8 802408B8 46800020 */ cvt.s.w $f0, $f0 -/* C967EC 802408BC E7A00010 */ swc1 $f0, 0x10($sp) -/* C967F0 802408C0 8E140000 */ lw $s4, ($s0) -/* C967F4 802408C4 26100004 */ addiu $s0, $s0, 4 -/* C967F8 802408C8 0220202D */ daddu $a0, $s1, $zero -/* C967FC 802408CC 0C0B1EAF */ jal get_variable -/* C96800 802408D0 0280282D */ daddu $a1, $s4, $zero -/* C96804 802408D4 0220202D */ daddu $a0, $s1, $zero -/* C96808 802408D8 8E150000 */ lw $s5, ($s0) -/* C9680C 802408DC 4482B000 */ mtc1 $v0, $f22 -/* C96810 802408E0 00000000 */ nop -/* C96814 802408E4 4680B5A0 */ cvt.s.w $f22, $f22 -/* C96818 802408E8 0C0B1EAF */ jal get_variable -/* C9681C 802408EC 02A0282D */ daddu $a1, $s5, $zero -/* C96820 802408F0 2404FFFC */ addiu $a0, $zero, -4 -/* C96824 802408F4 44820000 */ mtc1 $v0, $f0 -/* C96828 802408F8 00000000 */ nop -/* C9682C 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* C96830 80240900 0C00EABB */ jal get_npc_unsafe -/* C96834 80240904 E7A00014 */ swc1 $f0, 0x14($sp) -/* C96838 80240908 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C9683C 8024090C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C96840 80240910 3C014334 */ lui $at, 0x4334 -/* C96844 80240914 44816000 */ mtc1 $at, $f12 -/* C96848 80240918 00041880 */ sll $v1, $a0, 2 -/* C9684C 8024091C 00641821 */ addu $v1, $v1, $a0 -/* C96850 80240920 00031880 */ sll $v1, $v1, 2 -/* C96854 80240924 00641823 */ subu $v1, $v1, $a0 -/* C96858 80240928 000320C0 */ sll $a0, $v1, 3 -/* C9685C 8024092C 00641821 */ addu $v1, $v1, $a0 -/* C96860 80240930 000318C0 */ sll $v1, $v1, 3 -/* C96864 80240934 3C01800B */ lui $at, 0x800b -/* C96868 80240938 00230821 */ addu $at, $at, $v1 -/* C9686C 8024093C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C96870 80240940 460C0300 */ add.s $f12, $f0, $f12 -/* C96874 80240944 0C00A6C9 */ jal clamp_angle -/* C96878 80240948 0040982D */ daddu $s3, $v0, $zero -/* C9687C 8024094C 27B00010 */ addiu $s0, $sp, 0x10 -/* C96880 80240950 0200202D */ daddu $a0, $s0, $zero -/* C96884 80240954 27B20014 */ addiu $s2, $sp, 0x14 -/* C96888 80240958 0240282D */ daddu $a1, $s2, $zero -/* C9688C 8024095C 3C064170 */ lui $a2, 0x4170 -/* C96890 80240960 8E67000C */ lw $a3, 0xc($s3) -/* C96894 80240964 0C00A7E7 */ jal add_vec2D_polar -/* C96898 80240968 46000506 */ mov.s $f20, $f0 -/* C9689C 8024096C 0200202D */ daddu $a0, $s0, $zero -/* C968A0 80240970 3C064120 */ lui $a2, 0x4120 -/* C968A4 80240974 4407A000 */ mfc1 $a3, $f20 -/* C968A8 80240978 0C00A7E7 */ jal add_vec2D_polar -/* C968AC 8024097C 0240282D */ daddu $a1, $s2, $zero -/* C968B0 80240980 0220202D */ daddu $a0, $s1, $zero -/* C968B4 80240984 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C968B8 80240988 4600008D */ trunc.w.s $f2, $f0 -/* C968BC 8024098C 44061000 */ mfc1 $a2, $f2 -/* C968C0 80240990 0C0B2026 */ jal set_variable -/* C968C4 80240994 02C0282D */ daddu $a1, $s6, $zero -/* C968C8 80240998 0220202D */ daddu $a0, $s1, $zero -/* C968CC 8024099C 4600B08D */ trunc.w.s $f2, $f22 -/* C968D0 802409A0 44061000 */ mfc1 $a2, $f2 -/* C968D4 802409A4 0C0B2026 */ jal set_variable -/* C968D8 802409A8 0280282D */ daddu $a1, $s4, $zero -/* C968DC 802409AC 0220202D */ daddu $a0, $s1, $zero -/* C968E0 802409B0 C7A00014 */ lwc1 $f0, 0x14($sp) -/* C968E4 802409B4 4600008D */ trunc.w.s $f2, $f0 -/* C968E8 802409B8 44061000 */ mfc1 $a2, $f2 -/* C968EC 802409BC 0C0B2026 */ jal set_variable -/* C968F0 802409C0 02A0282D */ daddu $a1, $s5, $zero -/* C968F4 802409C4 8FBF0034 */ lw $ra, 0x34($sp) -/* C968F8 802409C8 8FB60030 */ lw $s6, 0x30($sp) -/* C968FC 802409CC 8FB5002C */ lw $s5, 0x2c($sp) -/* C96900 802409D0 8FB40028 */ lw $s4, 0x28($sp) -/* C96904 802409D4 8FB30024 */ lw $s3, 0x24($sp) -/* C96908 802409D8 8FB20020 */ lw $s2, 0x20($sp) -/* C9690C 802409DC 8FB1001C */ lw $s1, 0x1c($sp) -/* C96910 802409E0 8FB00018 */ lw $s0, 0x18($sp) -/* C96914 802409E4 D7B60040 */ ldc1 $f22, 0x40($sp) -/* C96918 802409E8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* C9691C 802409EC 24020002 */ addiu $v0, $zero, 2 -/* C96920 802409F0 03E00008 */ jr $ra -/* C96924 802409F4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/func_802409F8_C95F30.s b/asm/nonmatchings/world/area_kzn/kzn_20/func_802409F8_C95F30.s deleted file mode 100644 index 12f5e78621..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/func_802409F8_C95F30.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409F8_C96928 -/* C96928 802409F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9692C 802409FC AFB00010 */ sw $s0, 0x10($sp) -/* C96930 80240A00 0080802D */ daddu $s0, $a0, $zero -/* C96934 80240A04 AFBF0014 */ sw $ra, 0x14($sp) -/* C96938 80240A08 0C00EABB */ jal get_npc_unsafe -/* C9693C 80240A0C 8E04008C */ lw $a0, 0x8c($s0) -/* C96940 80240A10 0040282D */ daddu $a1, $v0, $zero -/* C96944 80240A14 8E040094 */ lw $a0, 0x94($s0) -/* C96948 80240A18 8CA30028 */ lw $v1, 0x28($a1) -/* C9694C 80240A1C ACA40028 */ sw $a0, 0x28($a1) -/* C96950 80240A20 8FBF0014 */ lw $ra, 0x14($sp) -/* C96954 80240A24 8FB00010 */ lw $s0, 0x10($sp) -/* C96958 80240A28 24020002 */ addiu $v0, $zero, 2 -/* C9695C 80240A2C 3C018024 */ lui $at, 0x8024 -/* C96960 80240A30 AC234494 */ sw $v1, 0x4494($at) -/* C96964 80240A34 03E00008 */ jr $ra -/* C96968 80240A38 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/func_80240A3C_C95F30.s b/asm/nonmatchings/world/area_kzn/kzn_20/func_80240A3C_C95F30.s deleted file mode 100644 index 49c7f10d66..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/func_80240A3C_C95F30.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A3C_C9696C -/* C9696C 80240A3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C96970 80240A40 AFBF0010 */ sw $ra, 0x10($sp) -/* C96974 80240A44 0C00EABB */ jal get_npc_unsafe -/* C96978 80240A48 8C84008C */ lw $a0, 0x8c($a0) -/* C9697C 80240A4C 3C038024 */ lui $v1, 0x8024 -/* C96980 80240A50 8C634494 */ lw $v1, 0x4494($v1) -/* C96984 80240A54 AC430028 */ sw $v1, 0x28($v0) -/* C96988 80240A58 8FBF0010 */ lw $ra, 0x10($sp) -/* C9698C 80240A5C 24020002 */ addiu $v0, $zero, 2 -/* C96990 80240A60 03E00008 */ jr $ra -/* C96994 80240A64 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/func_80240A68_C95F30.s b/asm/nonmatchings/world/area_kzn/kzn_20/func_80240A68_C95F30.s deleted file mode 100644 index f125c1c398..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/func_80240A68_C95F30.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A68_C96998 -/* C96998 80240A68 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9699C 80240A6C 0000202D */ daddu $a0, $zero, $zero -/* C969A0 80240A70 AFBF0010 */ sw $ra, 0x10($sp) -/* C969A4 80240A74 0C015586 */ jal func_80055618 -/* C969A8 80240A78 24050001 */ addiu $a1, $zero, 1 -/* C969AC 80240A7C 8FBF0010 */ lw $ra, 0x10($sp) -/* C969B0 80240A80 24020002 */ addiu $v0, $zero, 2 -/* C969B4 80240A84 03E00008 */ jr $ra -/* C969B8 80240A88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/func_80240A8C_C95F30.s b/asm/nonmatchings/world/area_kzn/kzn_20/func_80240A8C_C95F30.s deleted file mode 100644 index af76b8e4fd..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/func_80240A8C_C95F30.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A8C_C969BC -/* C969BC 80240A8C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C969C0 80240A90 AFBF0010 */ sw $ra, 0x10($sp) -/* C969C4 80240A94 8C82000C */ lw $v0, 0xc($a0) -/* C969C8 80240A98 3C068016 */ lui $a2, 0x8016 -/* C969CC 80240A9C 84C6A552 */ lh $a2, -0x5aae($a2) -/* C969D0 80240AA0 0C0B2026 */ jal set_variable -/* C969D4 80240AA4 8C450000 */ lw $a1, ($v0) -/* C969D8 80240AA8 8FBF0010 */ lw $ra, 0x10($sp) -/* C969DC 80240AAC 24020002 */ addiu $v0, $zero, 2 -/* C969E0 80240AB0 03E00008 */ jr $ra -/* C969E4 80240AB4 27BD0018 */ addiu $sp, $sp, 0x18 -/* C969E8 80240AB8 00000000 */ nop -/* C969EC 80240ABC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_22/func_80240124_C9A200.s b/asm/nonmatchings/world/area_kzn/kzn_22/func_80240124_C9A200.s deleted file mode 100644 index 768d492cff..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_22/func_80240124_C9A200.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C9A324 -/* C9A324 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9A328 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C9A32C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C9A330 80240130 10A00005 */ beqz $a1, .L80240148 -/* C9A334 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C9A338 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C9A33C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C9A340 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C9A344 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C9A348 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C9A34C 8024014C 1440000E */ bnez $v0, .L80240188 -/* C9A350 80240150 00000000 */ nop -/* C9A354 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C9A358 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C9A35C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C9A360 80240160 04610004 */ bgez $v1, .L80240174 -/* C9A364 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C9A368 80240168 3C020002 */ lui $v0, 2 -/* C9A36C 8024016C 08090061 */ j .L80240184 -/* C9A370 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C9A374 80240174 3C040002 */ lui $a0, 2 -/* C9A378 80240178 0083102A */ slt $v0, $a0, $v1 -/* C9A37C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C9A380 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C9A384 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C9A388 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C9A38C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C9A390 80240190 00000000 */ nop -/* C9A394 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C9A398 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C9A39C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C9A3A0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C9A3A4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C9A3A8 802401A8 3C020002 */ lui $v0, 2 -/* C9A3AC 802401AC 08090071 */ j .L802401C4 -/* C9A3B0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C9A3B4 802401B4 3C040002 */ lui $a0, 2 -/* C9A3B8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C9A3BC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C9A3C0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C9A3C4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C9A3C8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C9A3CC 802401CC 1440000E */ bnez $v0, .L80240208 -/* C9A3D0 802401D0 00000000 */ nop -/* C9A3D4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C9A3D8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C9A3DC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C9A3E0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C9A3E4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C9A3E8 802401E8 3C020002 */ lui $v0, 2 -/* C9A3EC 802401EC 08090081 */ j .L80240204 -/* C9A3F0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C9A3F4 802401F4 3C040002 */ lui $a0, 2 -/* C9A3F8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C9A3FC 802401FC 10400002 */ beqz $v0, .L80240208 -/* C9A400 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C9A404 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C9A408 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C9A40C 8024020C 1440000E */ bnez $v0, .L80240248 -/* C9A410 80240210 00000000 */ nop -/* C9A414 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C9A418 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C9A41C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C9A420 80240220 04610004 */ bgez $v1, .L80240234 -/* C9A424 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C9A428 80240228 3C020002 */ lui $v0, 2 -/* C9A42C 8024022C 08090091 */ j .L80240244 -/* C9A430 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C9A434 80240234 3C040002 */ lui $a0, 2 -/* C9A438 80240238 0083102A */ slt $v0, $a0, $v1 -/* C9A43C 8024023C 10400002 */ beqz $v0, .L80240248 -/* C9A440 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C9A444 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C9A448 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C9A44C 8024024C 0C046F07 */ jal set_main_pan_u -/* C9A450 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C9A454 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C9A458 80240258 0C046F0D */ jal set_main_pan_v -/* C9A45C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C9A460 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C9A464 80240264 0C046F13 */ jal set_aux_pan_u -/* C9A468 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C9A46C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C9A470 80240270 0C046F19 */ jal set_aux_pan_v -/* C9A474 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C9A478 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C9A47C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C9A480 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C9A484 80240284 24420001 */ addiu $v0, $v0, 1 -/* C9A488 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C9A48C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C9A490 80240290 24630001 */ addiu $v1, $v1, 1 -/* C9A494 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C9A498 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C9A49C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C9A4A0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C9A4A4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C9A4A8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C9A4AC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C9A4B0 802402B0 14600002 */ bnez $v1, .L802402BC -/* C9A4B4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C9A4B8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C9A4BC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C9A4C0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C9A4C4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C9A4C8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C9A4CC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C9A4D0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C9A4D4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C9A4D8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C9A4DC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C9A4E0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C9A4E4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C9A4E8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C9A4EC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C9A4F0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C9A4F4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C9A4F8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C9A4FC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C9A500 80240300 0000102D */ daddu $v0, $zero, $zero -/* C9A504 80240304 03E00008 */ jr $ra -/* C9A508 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_22/func_8024030C_C9A200.s b/asm/nonmatchings/world/area_kzn/kzn_22/func_8024030C_C9A200.s deleted file mode 100644 index 8ce4e1fd6d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_22/func_8024030C_C9A200.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_C9A50C -/* C9A50C 8024030C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9A510 80240310 AFBF0010 */ sw $ra, 0x10($sp) -/* C9A514 80240314 8C82000C */ lw $v0, 0xc($a0) -/* C9A518 80240318 3C068016 */ lui $a2, 0x8016 -/* C9A51C 8024031C 84C6A552 */ lh $a2, -0x5aae($a2) -/* C9A520 80240320 0C0B2026 */ jal set_variable -/* C9A524 80240324 8C450000 */ lw $a1, ($v0) -/* C9A528 80240328 8FBF0010 */ lw $ra, 0x10($sp) -/* C9A52C 8024032C 24020002 */ addiu $v0, $zero, 2 -/* C9A530 80240330 03E00008 */ jr $ra -/* C9A534 80240334 27BD0018 */ addiu $sp, $sp, 0x18 -/* C9A538 80240338 00000000 */ nop -/* C9A53C 8024033C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_22/func_80240340_C9A200.s b/asm/nonmatchings/world/area_kzn/kzn_22/func_80240340_C9A200.s deleted file mode 100644 index daec3900e7..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_22/func_80240340_C9A200.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240340_C9A540 -/* C9A540 80240340 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9A544 80240344 AFBF0010 */ sw $ra, 0x10($sp) -/* C9A548 80240348 8C82000C */ lw $v0, 0xc($a0) -/* C9A54C 8024034C 3C068016 */ lui $a2, 0x8016 -/* C9A550 80240350 84C6A552 */ lh $a2, -0x5aae($a2) -/* C9A554 80240354 0C0B2026 */ jal set_variable -/* C9A558 80240358 8C450000 */ lw $a1, ($v0) -/* C9A55C 8024035C 8FBF0010 */ lw $ra, 0x10($sp) -/* C9A560 80240360 24020002 */ addiu $v0, $zero, 2 -/* C9A564 80240364 03E00008 */ jr $ra -/* C9A568 80240368 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_22/func_8024036C_C9A200.s b/asm/nonmatchings/world/area_kzn/kzn_22/func_8024036C_C9A200.s deleted file mode 100644 index 4df4300b5f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_22/func_8024036C_C9A200.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024036C_C9A56C -/* C9A56C 8024036C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9A570 80240370 0000202D */ daddu $a0, $zero, $zero -/* C9A574 80240374 AFBF0010 */ sw $ra, 0x10($sp) -/* C9A578 80240378 0C015586 */ jal func_80055618 -/* C9A57C 8024037C 24050001 */ addiu $a1, $zero, 1 -/* C9A580 80240380 8FBF0010 */ lw $ra, 0x10($sp) -/* C9A584 80240384 24020002 */ addiu $v0, $zero, 2 -/* C9A588 80240388 03E00008 */ jr $ra -/* C9A58C 8024038C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_23/func_80240124_C9C300.s b/asm/nonmatchings/world/area_kzn/kzn_23/func_80240124_C9C300.s deleted file mode 100644 index 956ce672b9..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_23/func_80240124_C9C300.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_C9C424 -/* C9C424 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9C428 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* C9C42C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* C9C430 80240130 10A00005 */ beqz $a1, .L80240148 -/* C9C434 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* C9C438 80240138 AE000070 */ sw $zero, 0x70($s0) -/* C9C43C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* C9C440 80240140 AE000078 */ sw $zero, 0x78($s0) -/* C9C444 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* C9C448 80240148 8E020070 */ lw $v0, 0x70($s0) -/* C9C44C 8024014C 1440000E */ bnez $v0, .L80240188 -/* C9C450 80240150 00000000 */ nop -/* C9C454 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* C9C458 80240158 8E020088 */ lw $v0, 0x88($s0) -/* C9C45C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* C9C460 80240160 04610004 */ bgez $v1, .L80240174 -/* C9C464 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* C9C468 80240168 3C020002 */ lui $v0, 2 -/* C9C46C 8024016C 08090061 */ j .L80240184 -/* C9C470 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* C9C474 80240174 3C040002 */ lui $a0, 2 -/* C9C478 80240178 0083102A */ slt $v0, $a0, $v1 -/* C9C47C 8024017C 10400002 */ beqz $v0, .L80240188 -/* C9C480 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* C9C484 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* C9C488 80240188 8E020074 */ lw $v0, 0x74($s0) -/* C9C48C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* C9C490 80240190 00000000 */ nop -/* C9C494 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* C9C498 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* C9C49C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* C9C4A0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* C9C4A4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* C9C4A8 802401A8 3C020002 */ lui $v0, 2 -/* C9C4AC 802401AC 08090071 */ j .L802401C4 -/* C9C4B0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* C9C4B4 802401B4 3C040002 */ lui $a0, 2 -/* C9C4B8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* C9C4BC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* C9C4C0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* C9C4C4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* C9C4C8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* C9C4CC 802401CC 1440000E */ bnez $v0, .L80240208 -/* C9C4D0 802401D0 00000000 */ nop -/* C9C4D4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* C9C4D8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* C9C4DC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* C9C4E0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* C9C4E4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* C9C4E8 802401E8 3C020002 */ lui $v0, 2 -/* C9C4EC 802401EC 08090081 */ j .L80240204 -/* C9C4F0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* C9C4F4 802401F4 3C040002 */ lui $a0, 2 -/* C9C4F8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* C9C4FC 802401FC 10400002 */ beqz $v0, .L80240208 -/* C9C500 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* C9C504 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* C9C508 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* C9C50C 8024020C 1440000E */ bnez $v0, .L80240248 -/* C9C510 80240210 00000000 */ nop -/* C9C514 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* C9C518 80240218 8E020094 */ lw $v0, 0x94($s0) -/* C9C51C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* C9C520 80240220 04610004 */ bgez $v1, .L80240234 -/* C9C524 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* C9C528 80240228 3C020002 */ lui $v0, 2 -/* C9C52C 8024022C 08090091 */ j .L80240244 -/* C9C530 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* C9C534 80240234 3C040002 */ lui $a0, 2 -/* C9C538 80240238 0083102A */ slt $v0, $a0, $v1 -/* C9C53C 8024023C 10400002 */ beqz $v0, .L80240248 -/* C9C540 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* C9C544 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* C9C548 80240248 8E040084 */ lw $a0, 0x84($s0) -/* C9C54C 8024024C 0C046F07 */ jal set_main_pan_u -/* C9C550 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* C9C554 80240254 8E040084 */ lw $a0, 0x84($s0) -/* C9C558 80240258 0C046F0D */ jal set_main_pan_v -/* C9C55C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* C9C560 80240260 8E040084 */ lw $a0, 0x84($s0) -/* C9C564 80240264 0C046F13 */ jal set_aux_pan_u -/* C9C568 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* C9C56C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* C9C570 80240270 0C046F19 */ jal set_aux_pan_v -/* C9C574 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* C9C578 80240278 8E020070 */ lw $v0, 0x70($s0) -/* C9C57C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* C9C580 80240280 8E040098 */ lw $a0, 0x98($s0) -/* C9C584 80240284 24420001 */ addiu $v0, $v0, 1 -/* C9C588 80240288 AE020070 */ sw $v0, 0x70($s0) -/* C9C58C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* C9C590 80240290 24630001 */ addiu $v1, $v1, 1 -/* C9C594 80240294 AE030078 */ sw $v1, 0x78($s0) -/* C9C598 80240298 8E030070 */ lw $v1, 0x70($s0) -/* C9C59C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* C9C5A0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* C9C5A4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* C9C5A8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* C9C5AC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* C9C5B0 802402B0 14600002 */ bnez $v1, .L802402BC -/* C9C5B4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* C9C5B8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* C9C5BC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* C9C5C0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* C9C5C4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* C9C5C8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* C9C5CC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* C9C5D0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* C9C5D4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* C9C5D8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* C9C5DC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* C9C5E0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* C9C5E4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* C9C5E8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* C9C5EC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* C9C5F0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* C9C5F4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* C9C5F8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* C9C5FC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* C9C600 80240300 0000102D */ daddu $v0, $zero, $zero -/* C9C604 80240304 03E00008 */ jr $ra -/* C9C608 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* C9C60C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_23/func_80240310_C9C300.s b/asm/nonmatchings/world/area_kzn/kzn_23/func_80240310_C9C300.s deleted file mode 100644 index 7009a18a0b..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_23/func_80240310_C9C300.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_C9C610 -/* C9C610 80240310 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C9C614 80240314 AFB10014 */ sw $s1, 0x14($sp) -/* C9C618 80240318 0080882D */ daddu $s1, $a0, $zero -/* C9C61C 8024031C AFBF001C */ sw $ra, 0x1c($sp) -/* C9C620 80240320 AFB20018 */ sw $s2, 0x18($sp) -/* C9C624 80240324 AFB00010 */ sw $s0, 0x10($sp) -/* C9C628 80240328 F7B80030 */ sdc1 $f24, 0x30($sp) -/* C9C62C 8024032C F7B60028 */ sdc1 $f22, 0x28($sp) -/* C9C630 80240330 F7B40020 */ sdc1 $f20, 0x20($sp) -/* C9C634 80240334 8E30000C */ lw $s0, 0xc($s1) -/* C9C638 80240338 8E050000 */ lw $a1, ($s0) -/* C9C63C 8024033C 0C0B1EAF */ jal get_variable -/* C9C640 80240340 26100004 */ addiu $s0, $s0, 4 -/* C9C644 80240344 8E050000 */ lw $a1, ($s0) -/* C9C648 80240348 26100004 */ addiu $s0, $s0, 4 -/* C9C64C 8024034C 0220202D */ daddu $a0, $s1, $zero -/* C9C650 80240350 0C0B1EAF */ jal get_variable -/* C9C654 80240354 0040902D */ daddu $s2, $v0, $zero -/* C9C658 80240358 8E050000 */ lw $a1, ($s0) -/* C9C65C 8024035C 26100004 */ addiu $s0, $s0, 4 -/* C9C660 80240360 4482C000 */ mtc1 $v0, $f24 -/* C9C664 80240364 00000000 */ nop -/* C9C668 80240368 4680C620 */ cvt.s.w $f24, $f24 -/* C9C66C 8024036C 0C0B1EAF */ jal get_variable -/* C9C670 80240370 0220202D */ daddu $a0, $s1, $zero -/* C9C674 80240374 8E050000 */ lw $a1, ($s0) -/* C9C678 80240378 4482B000 */ mtc1 $v0, $f22 -/* C9C67C 8024037C 00000000 */ nop -/* C9C680 80240380 4680B5A0 */ cvt.s.w $f22, $f22 -/* C9C684 80240384 0C0B1EAF */ jal get_variable -/* C9C688 80240388 0220202D */ daddu $a0, $s1, $zero -/* C9C68C 8024038C 4482A000 */ mtc1 $v0, $f20 -/* C9C690 80240390 00000000 */ nop -/* C9C694 80240394 4680A520 */ cvt.s.w $f20, $f20 -/* C9C698 80240398 0C04417A */ jal get_entity_by_index -/* C9C69C 8024039C 0240202D */ daddu $a0, $s2, $zero -/* C9C6A0 802403A0 0040182D */ daddu $v1, $v0, $zero -/* C9C6A4 802403A4 E4780048 */ swc1 $f24, 0x48($v1) -/* C9C6A8 802403A8 E476004C */ swc1 $f22, 0x4c($v1) -/* C9C6AC 802403AC E4740050 */ swc1 $f20, 0x50($v1) -/* C9C6B0 802403B0 8FBF001C */ lw $ra, 0x1c($sp) -/* C9C6B4 802403B4 8FB20018 */ lw $s2, 0x18($sp) -/* C9C6B8 802403B8 8FB10014 */ lw $s1, 0x14($sp) -/* C9C6BC 802403BC 8FB00010 */ lw $s0, 0x10($sp) -/* C9C6C0 802403C0 D7B80030 */ ldc1 $f24, 0x30($sp) -/* C9C6C4 802403C4 D7B60028 */ ldc1 $f22, 0x28($sp) -/* C9C6C8 802403C8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* C9C6CC 802403CC 24020002 */ addiu $v0, $zero, 2 -/* C9C6D0 802403D0 03E00008 */ jr $ra -/* C9C6D4 802403D4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kzn/kzn_23/func_802403D8_C9C300.s b/asm/nonmatchings/world/area_kzn/kzn_23/func_802403D8_C9C300.s deleted file mode 100644 index 4802aef01e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_23/func_802403D8_C9C300.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403D8_C9C6D8 -/* C9C6D8 802403D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C9C6DC 802403DC AFB20018 */ sw $s2, 0x18($sp) -/* C9C6E0 802403E0 0080902D */ daddu $s2, $a0, $zero -/* C9C6E4 802403E4 AFBF001C */ sw $ra, 0x1c($sp) -/* C9C6E8 802403E8 AFB10014 */ sw $s1, 0x14($sp) -/* C9C6EC 802403EC AFB00010 */ sw $s0, 0x10($sp) -/* C9C6F0 802403F0 8E50000C */ lw $s0, 0xc($s2) -/* C9C6F4 802403F4 8E050000 */ lw $a1, ($s0) -/* C9C6F8 802403F8 0C0B1EAF */ jal get_variable -/* C9C6FC 802403FC 26100004 */ addiu $s0, $s0, 4 -/* C9C700 80240400 0C04417A */ jal get_entity_by_index -/* C9C704 80240404 0040202D */ daddu $a0, $v0, $zero -/* C9C708 80240408 8E050000 */ lw $a1, ($s0) -/* C9C70C 8024040C 26100004 */ addiu $s0, $s0, 4 -/* C9C710 80240410 0040882D */ daddu $s1, $v0, $zero -/* C9C714 80240414 C6200048 */ lwc1 $f0, 0x48($s1) -/* C9C718 80240418 4600008D */ trunc.w.s $f2, $f0 -/* C9C71C 8024041C 44061000 */ mfc1 $a2, $f2 -/* C9C720 80240420 0C0B2026 */ jal set_variable -/* C9C724 80240424 0240202D */ daddu $a0, $s2, $zero -/* C9C728 80240428 8E050000 */ lw $a1, ($s0) -/* C9C72C 8024042C 26100004 */ addiu $s0, $s0, 4 -/* C9C730 80240430 C620004C */ lwc1 $f0, 0x4c($s1) -/* C9C734 80240434 4600008D */ trunc.w.s $f2, $f0 -/* C9C738 80240438 44061000 */ mfc1 $a2, $f2 -/* C9C73C 8024043C 0C0B2026 */ jal set_variable -/* C9C740 80240440 0240202D */ daddu $a0, $s2, $zero -/* C9C744 80240444 C6200050 */ lwc1 $f0, 0x50($s1) -/* C9C748 80240448 8E050000 */ lw $a1, ($s0) -/* C9C74C 8024044C 4600008D */ trunc.w.s $f2, $f0 -/* C9C750 80240450 44061000 */ mfc1 $a2, $f2 -/* C9C754 80240454 0C0B2026 */ jal set_variable -/* C9C758 80240458 0240202D */ daddu $a0, $s2, $zero -/* C9C75C 8024045C 8FBF001C */ lw $ra, 0x1c($sp) -/* C9C760 80240460 8FB20018 */ lw $s2, 0x18($sp) -/* C9C764 80240464 8FB10014 */ lw $s1, 0x14($sp) -/* C9C768 80240468 8FB00010 */ lw $s0, 0x10($sp) -/* C9C76C 8024046C 24020002 */ addiu $v0, $zero, 2 -/* C9C770 80240470 03E00008 */ jr $ra -/* C9C774 80240474 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_23/func_80240478_C9C300.s b/asm/nonmatchings/world/area_kzn/kzn_23/func_80240478_C9C300.s deleted file mode 100644 index 07b8d69c25..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_23/func_80240478_C9C300.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240478_C9C778 -/* C9C778 80240478 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C9C77C 8024047C AFB10014 */ sw $s1, 0x14($sp) -/* C9C780 80240480 0080882D */ daddu $s1, $a0, $zero -/* C9C784 80240484 AFBF0018 */ sw $ra, 0x18($sp) -/* C9C788 80240488 AFB00010 */ sw $s0, 0x10($sp) -/* C9C78C 8024048C F7B60028 */ sdc1 $f22, 0x28($sp) -/* C9C790 80240490 F7B40020 */ sdc1 $f20, 0x20($sp) -/* C9C794 80240494 8E30000C */ lw $s0, 0xc($s1) -/* C9C798 80240498 8E050000 */ lw $a1, ($s0) -/* C9C79C 8024049C 0C0B210B */ jal get_float_variable -/* C9C7A0 802404A0 26100004 */ addiu $s0, $s0, 4 -/* C9C7A4 802404A4 8E050000 */ lw $a1, ($s0) -/* C9C7A8 802404A8 26100004 */ addiu $s0, $s0, 4 -/* C9C7AC 802404AC 0220202D */ daddu $a0, $s1, $zero -/* C9C7B0 802404B0 0C0B210B */ jal get_float_variable -/* C9C7B4 802404B4 46000586 */ mov.s $f22, $f0 -/* C9C7B8 802404B8 0220202D */ daddu $a0, $s1, $zero -/* C9C7BC 802404BC 8E050000 */ lw $a1, ($s0) -/* C9C7C0 802404C0 0C0B210B */ jal get_float_variable -/* C9C7C4 802404C4 46000506 */ mov.s $f20, $f0 -/* C9C7C8 802404C8 8E2300BC */ lw $v1, 0xbc($s1) -/* C9C7CC 802404CC 8C62000C */ lw $v0, 0xc($v1) -/* C9C7D0 802404D0 E4560038 */ swc1 $f22, 0x38($v0) -/* C9C7D4 802404D4 8C62000C */ lw $v0, 0xc($v1) -/* C9C7D8 802404D8 E454003C */ swc1 $f20, 0x3c($v0) -/* C9C7DC 802404DC 8C62000C */ lw $v0, 0xc($v1) -/* C9C7E0 802404E0 E4400040 */ swc1 $f0, 0x40($v0) -/* C9C7E4 802404E4 8FBF0018 */ lw $ra, 0x18($sp) -/* C9C7E8 802404E8 8FB10014 */ lw $s1, 0x14($sp) -/* C9C7EC 802404EC 8FB00010 */ lw $s0, 0x10($sp) -/* C9C7F0 802404F0 D7B60028 */ ldc1 $f22, 0x28($sp) -/* C9C7F4 802404F4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* C9C7F8 802404F8 24020002 */ addiu $v0, $zero, 2 -/* C9C7FC 802404FC 03E00008 */ jr $ra -/* C9C800 80240500 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_23/func_80240520_C9C300.s b/asm/nonmatchings/world/area_kzn/kzn_23/func_80240520_C9C300.s deleted file mode 100644 index 3378152538..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_23/func_80240520_C9C300.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240520_C9C820 -/* C9C820 80240520 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C9C824 80240524 AFB20018 */ sw $s2, 0x18($sp) -/* C9C828 80240528 0080902D */ daddu $s2, $a0, $zero -/* C9C82C 8024052C AFBF001C */ sw $ra, 0x1c($sp) -/* C9C830 80240530 AFB10014 */ sw $s1, 0x14($sp) -/* C9C834 80240534 AFB00010 */ sw $s0, 0x10($sp) -/* C9C838 80240538 8E4400AC */ lw $a0, 0xac($s2) -/* C9C83C 8024053C 0C04417A */ jal get_entity_by_index -/* C9C840 80240540 00A0802D */ daddu $s0, $a1, $zero -/* C9C844 80240544 12000004 */ beqz $s0, .L80240558 -/* C9C848 80240548 0040882D */ daddu $s1, $v0, $zero -/* C9C84C 8024054C 2402003C */ addiu $v0, $zero, 0x3c -/* C9C850 80240550 AE400070 */ sw $zero, 0x70($s2) -/* C9C854 80240554 AE420074 */ sw $v0, 0x74($s2) -.L80240558: -/* C9C858 80240558 C6400074 */ lwc1 $f0, 0x74($s2) -/* C9C85C 8024055C 46800020 */ cvt.s.w $f0, $f0 -/* C9C860 80240560 3C014270 */ lui $at, 0x4270 -/* C9C864 80240564 44811000 */ mtc1 $at, $f2 -/* C9C868 80240568 3C014049 */ lui $at, 0x4049 -/* C9C86C 8024056C 34210FD8 */ ori $at, $at, 0xfd8 -/* C9C870 80240570 44816000 */ mtc1 $at, $f12 -/* C9C874 80240574 46020003 */ div.s $f0, $f0, $f2 -/* C9C878 80240578 E6200054 */ swc1 $f0, 0x54($s1) -/* C9C87C 8024057C C6400074 */ lwc1 $f0, 0x74($s2) -/* C9C880 80240580 46800020 */ cvt.s.w $f0, $f0 -/* C9C884 80240584 46020003 */ div.s $f0, $f0, $f2 -/* C9C888 80240588 460C0302 */ mul.s $f12, $f0, $f12 -/* C9C88C 8024058C 00000000 */ nop -/* C9C890 80240590 E6200058 */ swc1 $f0, 0x58($s1) -/* C9C894 80240594 C6400074 */ lwc1 $f0, 0x74($s2) -/* C9C898 80240598 46800020 */ cvt.s.w $f0, $f0 -/* C9C89C 8024059C 46020003 */ div.s $f0, $f0, $f2 -/* C9C8A0 802405A0 0C00A874 */ jal cos_rad -/* C9C8A4 802405A4 E620005C */ swc1 $f0, 0x5c($s1) -/* C9C8A8 802405A8 3C013F80 */ lui $at, 0x3f80 -/* C9C8AC 802405AC 44811000 */ mtc1 $at, $f2 -/* C9C8B0 802405B0 00000000 */ nop -/* C9C8B4 802405B4 46001081 */ sub.s $f2, $f2, $f0 -/* C9C8B8 802405B8 3C018024 */ lui $at, 0x8024 -/* C9C8BC 802405BC D4201C10 */ ldc1 $f0, 0x1c10($at) -/* C9C8C0 802405C0 460010A1 */ cvt.d.s $f2, $f2 -/* C9C8C4 802405C4 46201082 */ mul.d $f2, $f2, $f0 -/* C9C8C8 802405C8 00000000 */ nop -/* C9C8CC 802405CC 3C013FE0 */ lui $at, 0x3fe0 -/* C9C8D0 802405D0 44810800 */ mtc1 $at, $f1 -/* C9C8D4 802405D4 44800000 */ mtc1 $zero, $f0 -/* C9C8D8 802405D8 00000000 */ nop -/* C9C8DC 802405DC 46201082 */ mul.d $f2, $f2, $f0 -/* C9C8E0 802405E0 00000000 */ nop -/* C9C8E4 802405E4 462010A0 */ cvt.s.d $f2, $f2 -/* C9C8E8 802405E8 E6220064 */ swc1 $f2, 0x64($s1) -/* C9C8EC 802405EC 8E430074 */ lw $v1, 0x74($s2) -/* C9C8F0 802405F0 2463FFFF */ addiu $v1, $v1, -1 -/* C9C8F4 802405F4 00031027 */ nor $v0, $zero, $v1 -/* C9C8F8 802405F8 2C420001 */ sltiu $v0, $v0, 1 -/* C9C8FC 802405FC AE430074 */ sw $v1, 0x74($s2) -/* C9C900 80240600 8FBF001C */ lw $ra, 0x1c($sp) -/* C9C904 80240604 8FB20018 */ lw $s2, 0x18($sp) -/* C9C908 80240608 8FB10014 */ lw $s1, 0x14($sp) -/* C9C90C 8024060C 8FB00010 */ lw $s0, 0x10($sp) -/* C9C910 80240610 00021040 */ sll $v0, $v0, 1 -/* C9C914 80240614 03E00008 */ jr $ra -/* C9C918 80240618 27BD0020 */ addiu $sp, $sp, 0x20 -/* C9C91C 8024061C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/func_802400C8_800880.s b/asm/nonmatchings/world/area_mac/mac_01/func_802400C8_800880.s deleted file mode 100644 index b8e9d9dd73..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/func_802400C8_800880.s +++ /dev/null @@ -1,204 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400C8_800948 -/* 800948 802400C8 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 80094C 802400CC AFBE0078 */ sw $fp, 0x78($sp) -/* 800950 802400D0 0080F02D */ daddu $fp, $a0, $zero -/* 800954 802400D4 AFB5006C */ sw $s5, 0x6c($sp) -/* 800958 802400D8 3C15F840 */ lui $s5, 0xf840 -/* 80095C 802400DC 36B55C05 */ ori $s5, $s5, 0x5c05 -/* 800960 802400E0 3C07F840 */ lui $a3, 0xf840 -/* 800964 802400E4 34E76200 */ ori $a3, $a3, 0x6200 -/* 800968 802400E8 24040030 */ addiu $a0, $zero, 0x30 -/* 80096C 802400EC AFBF007C */ sw $ra, 0x7c($sp) -/* 800970 802400F0 AFB70074 */ sw $s7, 0x74($sp) -/* 800974 802400F4 AFB60070 */ sw $s6, 0x70($sp) -/* 800978 802400F8 AFB40068 */ sw $s4, 0x68($sp) -/* 80097C 802400FC AFB30064 */ sw $s3, 0x64($sp) -/* 800980 80240100 AFB20060 */ sw $s2, 0x60($sp) -/* 800984 80240104 AFB1005C */ sw $s1, 0x5c($sp) -/* 800988 80240108 AFB00058 */ sw $s0, 0x58($sp) -/* 80098C 8024010C 0C00AB39 */ jal heap_malloc -/* 800990 80240110 AFA70050 */ sw $a3, 0x50($sp) -/* 800994 80240114 2404000C */ addiu $a0, $zero, 0xc -/* 800998 80240118 0C00AB39 */ jal heap_malloc -/* 80099C 8024011C 0040B82D */ daddu $s7, $v0, $zero -/* 8009A0 80240120 03C0202D */ daddu $a0, $fp, $zero -/* 8009A4 80240124 3C05F840 */ lui $a1, 0xf840 -/* 8009A8 80240128 AFA20054 */ sw $v0, 0x54($sp) -/* 8009AC 8024012C AC400000 */ sw $zero, ($v0) -/* 8009B0 80240130 8FA70054 */ lw $a3, 0x54($sp) -/* 8009B4 80240134 34A55C87 */ ori $a1, $a1, 0x5c87 -/* 8009B8 80240138 ACE00004 */ sw $zero, 4($a3) -/* 8009BC 8024013C ACE00008 */ sw $zero, 8($a3) -/* 8009C0 80240140 AEE00000 */ sw $zero, ($s7) -/* 8009C4 80240144 AEE0000C */ sw $zero, 0xc($s7) -/* 8009C8 80240148 AEE00018 */ sw $zero, 0x18($s7) -/* 8009CC 8024014C 0C0B1EAF */ jal get_variable -/* 8009D0 80240150 AEE00024 */ sw $zero, 0x24($s7) -/* 8009D4 80240154 1440005E */ bnez $v0, .L802402D0 -/* 8009D8 80240158 03C0202D */ daddu $a0, $fp, $zero -/* 8009DC 8024015C 0000982D */ daddu $s3, $zero, $zero -/* 8009E0 80240160 0260882D */ daddu $s1, $s3, $zero -/* 8009E4 80240164 24140001 */ addiu $s4, $zero, 1 -/* 8009E8 80240168 27B20010 */ addiu $s2, $sp, 0x10 -/* 8009EC 8024016C 0000202D */ daddu $a0, $zero, $zero -.L80240170: -/* 8009F0 80240170 0C0B1EAF */ jal get_variable -/* 8009F4 80240174 02B12821 */ addu $a1, $s5, $s1 -/* 8009F8 80240178 0000202D */ daddu $a0, $zero, $zero -/* 8009FC 8024017C 8FA70050 */ lw $a3, 0x50($sp) -/* 800A00 80240180 0040802D */ daddu $s0, $v0, $zero -/* 800A04 80240184 0C0B1EAF */ jal get_variable -/* 800A08 80240188 00F12821 */ addu $a1, $a3, $s1 -/* 800A0C 8024018C 56140007 */ bnel $s0, $s4, .L802401AC -/* 800A10 80240190 26310001 */ addiu $s1, $s1, 1 -/* 800A14 80240194 54400005 */ bnel $v0, $zero, .L802401AC -/* 800A18 80240198 26310001 */ addiu $s1, $s1, 1 -/* 800A1C 8024019C AE510000 */ sw $s1, ($s2) -/* 800A20 802401A0 26520004 */ addiu $s2, $s2, 4 -/* 800A24 802401A4 26730001 */ addiu $s3, $s3, 1 -/* 800A28 802401A8 26310001 */ addiu $s1, $s1, 1 -.L802401AC: -/* 800A2C 802401AC 2E220010 */ sltiu $v0, $s1, 0x10 -/* 800A30 802401B0 1440FFEF */ bnez $v0, .L80240170 -/* 800A34 802401B4 0000202D */ daddu $a0, $zero, $zero -/* 800A38 802401B8 12600039 */ beqz $s3, .L802402A0 -/* 800A3C 802401BC 0000A82D */ daddu $s5, $zero, $zero -/* 800A40 802401C0 27B40010 */ addiu $s4, $sp, 0x10 -/* 800A44 802401C4 2672FFFF */ addiu $s2, $s3, -1 -/* 800A48 802401C8 8FB60054 */ lw $s6, 0x54($sp) -/* 800A4C 802401CC 02E0802D */ daddu $s0, $s7, $zero -.L802401D0: -/* 800A50 802401D0 0C00A67F */ jal rand_int -/* 800A54 802401D4 0240202D */ daddu $a0, $s2, $zero -/* 800A58 802401D8 3C05F5DE */ lui $a1, 0xf5de -/* 800A5C 802401DC 34A501A9 */ ori $a1, $a1, 0x1a9 -/* 800A60 802401E0 0040882D */ daddu $s1, $v0, $zero -/* 800A64 802401E4 00111080 */ sll $v0, $s1, 2 -/* 800A68 802401E8 02821021 */ addu $v0, $s4, $v0 -/* 800A6C 802401EC 8C460000 */ lw $a2, ($v0) -/* 800A70 802401F0 3C078024 */ lui $a3, 0x8024 -/* 800A74 802401F4 24E77F88 */ addiu $a3, $a3, 0x7f88 -/* 800A78 802401F8 00061840 */ sll $v1, $a2, 1 -/* 800A7C 802401FC 00661821 */ addu $v1, $v1, $a2 -/* 800A80 80240200 00031880 */ sll $v1, $v1, 2 -/* 800A84 80240204 00671821 */ addu $v1, $v1, $a3 -/* 800A88 80240208 8C620000 */ lw $v0, ($v1) -/* 800A8C 8024020C 3C078008 */ lui $a3, %hi(gItemTable) -/* 800A90 80240210 24E778E0 */ addiu $a3, $a3, %lo(gItemTable) -/* 800A94 80240214 AE020000 */ sw $v0, ($s0) -/* 800A98 80240218 00021140 */ sll $v0, $v0, 5 -/* 800A9C 8024021C 00471021 */ addu $v0, $v0, $a3 -/* 800AA0 80240220 8442000C */ lh $v0, 0xc($v0) -/* 800AA4 80240224 03C0202D */ daddu $a0, $fp, $zero -/* 800AA8 80240228 AE020004 */ sw $v0, 4($s0) -/* 800AAC 8024022C 8C620008 */ lw $v0, 8($v1) -/* 800AB0 80240230 02A52821 */ addu $a1, $s5, $a1 -/* 800AB4 80240234 AE020008 */ sw $v0, 8($s0) -/* 800AB8 80240238 8FA70050 */ lw $a3, 0x50($sp) -/* 800ABC 8024023C 26B50001 */ addiu $s5, $s5, 1 -/* 800AC0 80240240 00E61021 */ addu $v0, $a3, $a2 -/* 800AC4 80240244 0C0B2026 */ jal set_variable -/* 800AC8 80240248 AEC20000 */ sw $v0, ($s6) -/* 800ACC 8024024C 26D60004 */ addiu $s6, $s6, 4 -/* 800AD0 80240250 2AA20003 */ slti $v0, $s5, 3 -/* 800AD4 80240254 10400012 */ beqz $v0, .L802402A0 -/* 800AD8 80240258 2610000C */ addiu $s0, $s0, 0xc -/* 800ADC 8024025C 0232102A */ slt $v0, $s1, $s2 -/* 800AE0 80240260 1040000C */ beqz $v0, .L80240294 -/* 800AE4 80240264 0240202D */ daddu $a0, $s2, $zero -/* 800AE8 80240268 00111880 */ sll $v1, $s1, 2 -.L8024026C: -/* 800AEC 8024026C 26220001 */ addiu $v0, $s1, 1 -/* 800AF0 80240270 0040882D */ daddu $s1, $v0, $zero -/* 800AF4 80240274 00111080 */ sll $v0, $s1, 2 -/* 800AF8 80240278 02821021 */ addu $v0, $s4, $v0 -/* 800AFC 8024027C 8C420000 */ lw $v0, ($v0) -/* 800B00 80240280 02831821 */ addu $v1, $s4, $v1 -/* 800B04 80240284 AC620000 */ sw $v0, ($v1) -/* 800B08 80240288 0224102A */ slt $v0, $s1, $a0 -/* 800B0C 8024028C 1440FFF7 */ bnez $v0, .L8024026C -/* 800B10 80240290 00111880 */ sll $v1, $s1, 2 -.L80240294: -/* 800B14 80240294 2673FFFF */ addiu $s3, $s3, -1 -/* 800B18 80240298 1660FFCD */ bnez $s3, .L802401D0 -/* 800B1C 8024029C 2652FFFF */ addiu $s2, $s2, -1 -.L802402A0: -/* 800B20 802402A0 03C0202D */ daddu $a0, $fp, $zero -/* 800B24 802402A4 3C05F5DE */ lui $a1, 0xf5de -/* 800B28 802402A8 34A501AC */ ori $a1, $a1, 0x1ac -/* 800B2C 802402AC 0C0B2026 */ jal set_variable -/* 800B30 802402B0 02A0302D */ daddu $a2, $s5, $zero -/* 800B34 802402B4 03C0202D */ daddu $a0, $fp, $zero -/* 800B38 802402B8 3C05F840 */ lui $a1, 0xf840 -/* 800B3C 802402BC 34A55C87 */ ori $a1, $a1, 0x5c87 -/* 800B40 802402C0 0C0B2026 */ jal set_variable -/* 800B44 802402C4 24060001 */ addiu $a2, $zero, 1 -/* 800B48 802402C8 080900DC */ j .L80240370 -/* 800B4C 802402CC AFC00090 */ sw $zero, 0x90($fp) -.L802402D0: -/* 800B50 802402D0 3C05F5DE */ lui $a1, 0xf5de -/* 800B54 802402D4 0C0B1EAF */ jal get_variable -/* 800B58 802402D8 34A501AC */ ori $a1, $a1, 0x1ac -/* 800B5C 802402DC 0040A82D */ daddu $s5, $v0, $zero -/* 800B60 802402E0 1AA00021 */ blez $s5, .L80240368 -/* 800B64 802402E4 0000882D */ daddu $s1, $zero, $zero -/* 800B68 802402E8 3C13F5DE */ lui $s3, 0xf5de -/* 800B6C 802402EC 367301A9 */ ori $s3, $s3, 0x1a9 -/* 800B70 802402F0 3C168024 */ lui $s6, 0x8024 -/* 800B74 802402F4 26D67F88 */ addiu $s6, $s6, 0x7f88 -/* 800B78 802402F8 3C148008 */ lui $s4, %hi(gItemTable) -/* 800B7C 802402FC 269478E0 */ addiu $s4, $s4, %lo(gItemTable) -/* 800B80 80240300 8FB20054 */ lw $s2, 0x54($sp) -/* 800B84 80240304 02E0802D */ daddu $s0, $s7, $zero -.L80240308: -/* 800B88 80240308 03C0202D */ daddu $a0, $fp, $zero -/* 800B8C 8024030C 0C0B1EAF */ jal get_variable -/* 800B90 80240310 02332821 */ addu $a1, $s1, $s3 -/* 800B94 80240314 0040302D */ daddu $a2, $v0, $zero -/* 800B98 80240318 00061840 */ sll $v1, $a2, 1 -/* 800B9C 8024031C 00661821 */ addu $v1, $v1, $a2 -/* 800BA0 80240320 00031880 */ sll $v1, $v1, 2 -/* 800BA4 80240324 00761821 */ addu $v1, $v1, $s6 -/* 800BA8 80240328 8C620000 */ lw $v0, ($v1) -/* 800BAC 8024032C AE020000 */ sw $v0, ($s0) -/* 800BB0 80240330 00021140 */ sll $v0, $v0, 5 -/* 800BB4 80240334 00541021 */ addu $v0, $v0, $s4 -/* 800BB8 80240338 8442000C */ lh $v0, 0xc($v0) -/* 800BBC 8024033C AE020004 */ sw $v0, 4($s0) -/* 800BC0 80240340 8C620008 */ lw $v0, 8($v1) -/* 800BC4 80240344 26310001 */ addiu $s1, $s1, 1 -/* 800BC8 80240348 AE020008 */ sw $v0, 8($s0) -/* 800BCC 8024034C 8FA70050 */ lw $a3, 0x50($sp) -/* 800BD0 80240350 2610000C */ addiu $s0, $s0, 0xc -/* 800BD4 80240354 00E61021 */ addu $v0, $a3, $a2 -/* 800BD8 80240358 AE420000 */ sw $v0, ($s2) -/* 800BDC 8024035C 0235102A */ slt $v0, $s1, $s5 -/* 800BE0 80240360 1440FFE9 */ bnez $v0, .L80240308 -/* 800BE4 80240364 26520004 */ addiu $s2, $s2, 4 -.L80240368: -/* 800BE8 80240368 24020001 */ addiu $v0, $zero, 1 -/* 800BEC 8024036C AFC20090 */ sw $v0, 0x90($fp) -.L80240370: -/* 800BF0 80240370 AFD50084 */ sw $s5, 0x84($fp) -/* 800BF4 80240374 8FA70054 */ lw $a3, 0x54($sp) -/* 800BF8 80240378 AFC70088 */ sw $a3, 0x88($fp) -/* 800BFC 8024037C AFD7008C */ sw $s7, 0x8c($fp) -/* 800C00 80240380 8FBF007C */ lw $ra, 0x7c($sp) -/* 800C04 80240384 8FBE0078 */ lw $fp, 0x78($sp) -/* 800C08 80240388 8FB70074 */ lw $s7, 0x74($sp) -/* 800C0C 8024038C 8FB60070 */ lw $s6, 0x70($sp) -/* 800C10 80240390 8FB5006C */ lw $s5, 0x6c($sp) -/* 800C14 80240394 8FB40068 */ lw $s4, 0x68($sp) -/* 800C18 80240398 8FB30064 */ lw $s3, 0x64($sp) -/* 800C1C 8024039C 8FB20060 */ lw $s2, 0x60($sp) -/* 800C20 802403A0 8FB1005C */ lw $s1, 0x5c($sp) -/* 800C24 802403A4 8FB00058 */ lw $s0, 0x58($sp) -/* 800C28 802403A8 24020002 */ addiu $v0, $zero, 2 -/* 800C2C 802403AC 03E00008 */ jr $ra -/* 800C30 802403B0 27BD0080 */ addiu $sp, $sp, 0x80 -/* 800C34 802403B4 00000000 */ nop -/* 800C38 802403B8 00000000 */ nop -/* 800C3C 802403BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/func_80241540_800880.s b/asm/nonmatchings/world/area_mac/mac_01/func_80241540_800880.s deleted file mode 100644 index 7d4c910b32..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/func_80241540_800880.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241540_801DC0 -/* 801DC0 80241540 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 801DC4 80241544 AFB40040 */ sw $s4, 0x40($sp) -/* 801DC8 80241548 0080A02D */ daddu $s4, $a0, $zero -/* 801DCC 8024154C AFBF0044 */ sw $ra, 0x44($sp) -/* 801DD0 80241550 AFB3003C */ sw $s3, 0x3c($sp) -/* 801DD4 80241554 AFB20038 */ sw $s2, 0x38($sp) -/* 801DD8 80241558 AFB10034 */ sw $s1, 0x34($sp) -/* 801DDC 8024155C AFB00030 */ sw $s0, 0x30($sp) -/* 801DE0 80241560 8E910148 */ lw $s1, 0x148($s4) -/* 801DE4 80241564 00A0902D */ daddu $s2, $a1, $zero -/* 801DE8 80241568 86240008 */ lh $a0, 8($s1) -/* 801DEC 8024156C 0C00EABB */ jal get_npc_unsafe -/* 801DF0 80241570 00C0982D */ daddu $s3, $a2, $zero -/* 801DF4 80241574 8E430014 */ lw $v1, 0x14($s2) -/* 801DF8 80241578 04600031 */ bltz $v1, .L80241640 -/* 801DFC 8024157C 0040802D */ daddu $s0, $v0, $zero -/* 801E00 80241580 0260202D */ daddu $a0, $s3, $zero -/* 801E04 80241584 AFA00010 */ sw $zero, 0x10($sp) -/* 801E08 80241588 8E460024 */ lw $a2, 0x24($s2) -/* 801E0C 8024158C 8E470028 */ lw $a3, 0x28($s2) -/* 801E10 80241590 0C01242D */ jal func_800490B4 -/* 801E14 80241594 0220282D */ daddu $a1, $s1, $zero -/* 801E18 80241598 10400029 */ beqz $v0, .L80241640 -/* 801E1C 8024159C 0000202D */ daddu $a0, $zero, $zero -/* 801E20 802415A0 0200282D */ daddu $a1, $s0, $zero -/* 801E24 802415A4 0000302D */ daddu $a2, $zero, $zero -/* 801E28 802415A8 860300A8 */ lh $v1, 0xa8($s0) -/* 801E2C 802415AC 3C013F80 */ lui $at, 0x3f80 -/* 801E30 802415B0 44810000 */ mtc1 $at, $f0 -/* 801E34 802415B4 3C014000 */ lui $at, 0x4000 -/* 801E38 802415B8 44811000 */ mtc1 $at, $f2 -/* 801E3C 802415BC 3C01C1A0 */ lui $at, 0xc1a0 -/* 801E40 802415C0 44812000 */ mtc1 $at, $f4 -/* 801E44 802415C4 2402000F */ addiu $v0, $zero, 0xf -/* 801E48 802415C8 AFA2001C */ sw $v0, 0x1c($sp) -/* 801E4C 802415CC 44833000 */ mtc1 $v1, $f6 -/* 801E50 802415D0 00000000 */ nop -/* 801E54 802415D4 468031A0 */ cvt.s.w $f6, $f6 -/* 801E58 802415D8 44073000 */ mfc1 $a3, $f6 -/* 801E5C 802415DC 27A20028 */ addiu $v0, $sp, 0x28 -/* 801E60 802415E0 AFA20020 */ sw $v0, 0x20($sp) -/* 801E64 802415E4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 801E68 802415E8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 801E6C 802415EC 0C01BFA4 */ jal fx_emote -/* 801E70 802415F0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 801E74 802415F4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 801E78 802415F8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 801E7C 802415FC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 801E80 80241600 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 801E84 80241604 8C460028 */ lw $a2, 0x28($v0) -/* 801E88 80241608 0C00A720 */ jal atan2 -/* 801E8C 8024160C 8C470030 */ lw $a3, 0x30($v0) -/* 801E90 80241610 0200202D */ daddu $a0, $s0, $zero -/* 801E94 80241614 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 801E98 80241618 3C060020 */ lui $a2, 0x20 -/* 801E9C 8024161C 0C012530 */ jal func_800494C0 -/* 801EA0 80241620 E480000C */ swc1 $f0, 0xc($a0) -/* 801EA4 80241624 8E220018 */ lw $v0, 0x18($s1) -/* 801EA8 80241628 9442002A */ lhu $v0, 0x2a($v0) -/* 801EAC 8024162C 30420001 */ andi $v0, $v0, 1 -/* 801EB0 80241630 14400029 */ bnez $v0, .L802416D8 -/* 801EB4 80241634 2402000A */ addiu $v0, $zero, 0xa -/* 801EB8 80241638 080905B6 */ j .L802416D8 -/* 801EBC 8024163C 2402000C */ addiu $v0, $zero, 0xc -.L80241640: -/* 801EC0 80241640 8602008C */ lh $v0, 0x8c($s0) -/* 801EC4 80241644 14400025 */ bnez $v0, .L802416DC -/* 801EC8 80241648 00000000 */ nop -/* 801ECC 8024164C 9602008E */ lhu $v0, 0x8e($s0) -/* 801ED0 80241650 2442FFFF */ addiu $v0, $v0, -1 -/* 801ED4 80241654 A602008E */ sh $v0, 0x8e($s0) -/* 801ED8 80241658 00021400 */ sll $v0, $v0, 0x10 -/* 801EDC 8024165C 1440001F */ bnez $v0, .L802416DC -/* 801EE0 80241660 00000000 */ nop -/* 801EE4 80241664 8E820074 */ lw $v0, 0x74($s4) -/* 801EE8 80241668 2442FFFF */ addiu $v0, $v0, -1 -/* 801EEC 8024166C 10400019 */ beqz $v0, .L802416D4 -/* 801EF0 80241670 AE820074 */ sw $v0, 0x74($s4) -/* 801EF4 80241674 8E220018 */ lw $v0, 0x18($s1) -/* 801EF8 80241678 9442002A */ lhu $v0, 0x2a($v0) -/* 801EFC 8024167C 30420010 */ andi $v0, $v0, 0x10 -/* 801F00 80241680 14400007 */ bnez $v0, .L802416A0 -/* 801F04 80241684 00000000 */ nop -/* 801F08 80241688 C600000C */ lwc1 $f0, 0xc($s0) -/* 801F0C 8024168C 3C014334 */ lui $at, 0x4334 -/* 801F10 80241690 44816000 */ mtc1 $at, $f12 -/* 801F14 80241694 0C00A6C9 */ jal clamp_angle -/* 801F18 80241698 460C0300 */ add.s $f12, $f0, $f12 -/* 801F1C 8024169C E600000C */ swc1 $f0, 0xc($s0) -.L802416A0: -/* 801F20 802416A0 8E440008 */ lw $a0, 8($s2) -/* 801F24 802416A4 000417C2 */ srl $v0, $a0, 0x1f -/* 801F28 802416A8 00822021 */ addu $a0, $a0, $v0 -/* 801F2C 802416AC 00042043 */ sra $a0, $a0, 1 -/* 801F30 802416B0 0C00A67F */ jal rand_int -/* 801F34 802416B4 24840001 */ addiu $a0, $a0, 1 -/* 801F38 802416B8 8E430008 */ lw $v1, 8($s2) -/* 801F3C 802416BC 000327C2 */ srl $a0, $v1, 0x1f -/* 801F40 802416C0 00641821 */ addu $v1, $v1, $a0 -/* 801F44 802416C4 00031843 */ sra $v1, $v1, 1 -/* 801F48 802416C8 00621821 */ addu $v1, $v1, $v0 -/* 801F4C 802416CC 080905B7 */ j .L802416DC -/* 801F50 802416D0 A603008E */ sh $v1, 0x8e($s0) -.L802416D4: -/* 801F54 802416D4 24020004 */ addiu $v0, $zero, 4 -.L802416D8: -/* 801F58 802416D8 AE820070 */ sw $v0, 0x70($s4) -.L802416DC: -/* 801F5C 802416DC 8FBF0044 */ lw $ra, 0x44($sp) -/* 801F60 802416E0 8FB40040 */ lw $s4, 0x40($sp) -/* 801F64 802416E4 8FB3003C */ lw $s3, 0x3c($sp) -/* 801F68 802416E8 8FB20038 */ lw $s2, 0x38($sp) -/* 801F6C 802416EC 8FB10034 */ lw $s1, 0x34($sp) -/* 801F70 802416F0 8FB00030 */ lw $s0, 0x30($sp) -/* 801F74 802416F4 03E00008 */ jr $ra -/* 801F78 802416F8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/func_80243380_800880.s b/asm/nonmatchings/world/area_mac/mac_01/func_80243380_800880.s deleted file mode 100644 index d0f1950f46..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/func_80243380_800880.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243380_803C00 -/* 803C00 80243380 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 803C04 80243384 AFB3001C */ sw $s3, 0x1c($sp) -/* 803C08 80243388 0080982D */ daddu $s3, $a0, $zero -/* 803C0C 8024338C AFBF0020 */ sw $ra, 0x20($sp) -/* 803C10 80243390 AFB20018 */ sw $s2, 0x18($sp) -/* 803C14 80243394 AFB10014 */ sw $s1, 0x14($sp) -/* 803C18 80243398 AFB00010 */ sw $s0, 0x10($sp) -/* 803C1C 8024339C 8E70000C */ lw $s0, 0xc($s3) -/* 803C20 802433A0 8E050000 */ lw $a1, ($s0) -/* 803C24 802433A4 0C0B1EAF */ jal get_variable -/* 803C28 802433A8 26100004 */ addiu $s0, $s0, 4 -/* 803C2C 802433AC 0260202D */ daddu $a0, $s3, $zero -/* 803C30 802433B0 8E050000 */ lw $a1, ($s0) -/* 803C34 802433B4 0C0B1EAF */ jal get_variable -/* 803C38 802433B8 0040902D */ daddu $s2, $v0, $zero -/* 803C3C 802433BC 2404003C */ addiu $a0, $zero, 0x3c -/* 803C40 802433C0 0C00AB39 */ jal heap_malloc -/* 803C44 802433C4 0040882D */ daddu $s1, $v0, $zero -/* 803C48 802433C8 0040802D */ daddu $s0, $v0, $zero -/* 803C4C 802433CC 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 803C50 802433D0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 803C54 802433D4 AE120008 */ sw $s2, 8($s0) -/* 803C58 802433D8 AE11000C */ sw $s1, 0xc($s0) -/* 803C5C 802433DC 846200B0 */ lh $v0, 0xb0($v1) -/* 803C60 802433E0 44820000 */ mtc1 $v0, $f0 -/* 803C64 802433E4 00000000 */ nop -/* 803C68 802433E8 46800020 */ cvt.s.w $f0, $f0 -/* 803C6C 802433EC E6000034 */ swc1 $f0, 0x34($s0) -/* 803C70 802433F0 846200B2 */ lh $v0, 0xb2($v1) -/* 803C74 802433F4 44820000 */ mtc1 $v0, $f0 -/* 803C78 802433F8 00000000 */ nop -/* 803C7C 802433FC 46800020 */ cvt.s.w $f0, $f0 -/* 803C80 80243400 E6000038 */ swc1 $f0, 0x38($s0) -/* 803C84 80243404 C4600028 */ lwc1 $f0, 0x28($v1) -/* 803C88 80243408 E6000010 */ swc1 $f0, 0x10($s0) -/* 803C8C 8024340C C460002C */ lwc1 $f0, 0x2c($v1) -/* 803C90 80243410 E6000014 */ swc1 $f0, 0x14($s0) -/* 803C94 80243414 C4620030 */ lwc1 $f2, 0x30($v1) -/* 803C98 80243418 3C013F36 */ lui $at, 0x3f36 -/* 803C9C 8024341C 3421DB6E */ ori $at, $at, 0xdb6e -/* 803CA0 80243420 44810000 */ mtc1 $at, $f0 -/* 803CA4 80243424 24040001 */ addiu $a0, $zero, 1 -/* 803CA8 80243428 AE00001C */ sw $zero, 0x1c($s0) -/* 803CAC 8024342C AE000020 */ sw $zero, 0x20($s0) -/* 803CB0 80243430 AE000024 */ sw $zero, 0x24($s0) -/* 803CB4 80243434 E6000028 */ swc1 $f0, 0x28($s0) -/* 803CB8 80243438 E600002C */ swc1 $f0, 0x2c($s0) -/* 803CBC 8024343C E6000030 */ swc1 $f0, 0x30($s0) -/* 803CC0 80243440 0C04E9C1 */ jal func_8013A704 -/* 803CC4 80243444 E6020018 */ swc1 $f2, 0x18($s0) -/* 803CC8 80243448 0000202D */ daddu $a0, $zero, $zero -/* 803CCC 8024344C 3C058024 */ lui $a1, 0x8024 -/* 803CD0 80243450 24A52FA4 */ addiu $a1, $a1, 0x2fa4 -/* 803CD4 80243454 0C048C56 */ jal bind_dynamic_entity_3 -/* 803CD8 80243458 AE020000 */ sw $v0, ($s0) -/* 803CDC 8024345C 0260202D */ daddu $a0, $s3, $zero -/* 803CE0 80243460 3C05FD05 */ lui $a1, 0xfd05 -/* 803CE4 80243464 34A50F8A */ ori $a1, $a1, 0xf8a -/* 803CE8 80243468 0200302D */ daddu $a2, $s0, $zero -/* 803CEC 8024346C 0C0B2026 */ jal set_variable -/* 803CF0 80243470 AE020004 */ sw $v0, 4($s0) -/* 803CF4 80243474 8FBF0020 */ lw $ra, 0x20($sp) -/* 803CF8 80243478 8FB3001C */ lw $s3, 0x1c($sp) -/* 803CFC 8024347C 8FB20018 */ lw $s2, 0x18($sp) -/* 803D00 80243480 8FB10014 */ lw $s1, 0x14($sp) -/* 803D04 80243484 8FB00010 */ lw $s0, 0x10($sp) -/* 803D08 80243488 24020002 */ addiu $v0, $zero, 2 -/* 803D0C 8024348C 03E00008 */ jr $ra -/* 803D10 80243490 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/func_80243EEC_800880.s b/asm/nonmatchings/world/area_mac/mac_01/func_80243EEC_800880.s deleted file mode 100644 index 89937430de..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/func_80243EEC_800880.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243EEC_80476C -/* 80476C 80243EEC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 804770 80243EF0 AFB1001C */ sw $s1, 0x1c($sp) -/* 804774 80243EF4 0080882D */ daddu $s1, $a0, $zero -/* 804778 80243EF8 AFBF0034 */ sw $ra, 0x34($sp) -/* 80477C 80243EFC AFB60030 */ sw $s6, 0x30($sp) -/* 804780 80243F00 AFB5002C */ sw $s5, 0x2c($sp) -/* 804784 80243F04 AFB40028 */ sw $s4, 0x28($sp) -/* 804788 80243F08 AFB30024 */ sw $s3, 0x24($sp) -/* 80478C 80243F0C AFB20020 */ sw $s2, 0x20($sp) -/* 804790 80243F10 AFB00018 */ sw $s0, 0x18($sp) -/* 804794 80243F14 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 804798 80243F18 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 80479C 80243F1C 8E30000C */ lw $s0, 0xc($s1) -/* 8047A0 80243F20 8E160000 */ lw $s6, ($s0) -/* 8047A4 80243F24 26100004 */ addiu $s0, $s0, 4 -/* 8047A8 80243F28 0C0B1EAF */ jal get_variable -/* 8047AC 80243F2C 02C0282D */ daddu $a1, $s6, $zero -/* 8047B0 80243F30 44820000 */ mtc1 $v0, $f0 -/* 8047B4 80243F34 00000000 */ nop -/* 8047B8 80243F38 46800020 */ cvt.s.w $f0, $f0 -/* 8047BC 80243F3C E7A00010 */ swc1 $f0, 0x10($sp) -/* 8047C0 80243F40 8E140000 */ lw $s4, ($s0) -/* 8047C4 80243F44 26100004 */ addiu $s0, $s0, 4 -/* 8047C8 80243F48 0220202D */ daddu $a0, $s1, $zero -/* 8047CC 80243F4C 0C0B1EAF */ jal get_variable -/* 8047D0 80243F50 0280282D */ daddu $a1, $s4, $zero -/* 8047D4 80243F54 0220202D */ daddu $a0, $s1, $zero -/* 8047D8 80243F58 8E150000 */ lw $s5, ($s0) -/* 8047DC 80243F5C 4482B000 */ mtc1 $v0, $f22 -/* 8047E0 80243F60 00000000 */ nop -/* 8047E4 80243F64 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8047E8 80243F68 0C0B1EAF */ jal get_variable -/* 8047EC 80243F6C 02A0282D */ daddu $a1, $s5, $zero -/* 8047F0 80243F70 2404FFFC */ addiu $a0, $zero, -4 -/* 8047F4 80243F74 44820000 */ mtc1 $v0, $f0 -/* 8047F8 80243F78 00000000 */ nop -/* 8047FC 80243F7C 46800020 */ cvt.s.w $f0, $f0 -/* 804800 80243F80 0C00EABB */ jal get_npc_unsafe -/* 804804 80243F84 E7A00014 */ swc1 $f0, 0x14($sp) -/* 804808 80243F88 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 80480C 80243F8C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 804810 80243F90 3C014334 */ lui $at, 0x4334 -/* 804814 80243F94 44816000 */ mtc1 $at, $f12 -/* 804818 80243F98 00041880 */ sll $v1, $a0, 2 -/* 80481C 80243F9C 00641821 */ addu $v1, $v1, $a0 -/* 804820 80243FA0 00031880 */ sll $v1, $v1, 2 -/* 804824 80243FA4 00641823 */ subu $v1, $v1, $a0 -/* 804828 80243FA8 000320C0 */ sll $a0, $v1, 3 -/* 80482C 80243FAC 00641821 */ addu $v1, $v1, $a0 -/* 804830 80243FB0 000318C0 */ sll $v1, $v1, 3 -/* 804834 80243FB4 3C01800B */ lui $at, 0x800b -/* 804838 80243FB8 00230821 */ addu $at, $at, $v1 -/* 80483C 80243FBC C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 804840 80243FC0 460C0300 */ add.s $f12, $f0, $f12 -/* 804844 80243FC4 0C00A6C9 */ jal clamp_angle -/* 804848 80243FC8 0040982D */ daddu $s3, $v0, $zero -/* 80484C 80243FCC 27B00010 */ addiu $s0, $sp, 0x10 -/* 804850 80243FD0 0200202D */ daddu $a0, $s0, $zero -/* 804854 80243FD4 27B20014 */ addiu $s2, $sp, 0x14 -/* 804858 80243FD8 0240282D */ daddu $a1, $s2, $zero -/* 80485C 80243FDC 3C064170 */ lui $a2, 0x4170 -/* 804860 80243FE0 8E67000C */ lw $a3, 0xc($s3) -/* 804864 80243FE4 0C00A7E7 */ jal add_vec2D_polar -/* 804868 80243FE8 46000506 */ mov.s $f20, $f0 -/* 80486C 80243FEC 0200202D */ daddu $a0, $s0, $zero -/* 804870 80243FF0 3C064120 */ lui $a2, 0x4120 -/* 804874 80243FF4 4407A000 */ mfc1 $a3, $f20 -/* 804878 80243FF8 0C00A7E7 */ jal add_vec2D_polar -/* 80487C 80243FFC 0240282D */ daddu $a1, $s2, $zero -/* 804880 80244000 0220202D */ daddu $a0, $s1, $zero -/* 804884 80244004 C7A00010 */ lwc1 $f0, 0x10($sp) -/* 804888 80244008 4600008D */ trunc.w.s $f2, $f0 -/* 80488C 8024400C 44061000 */ mfc1 $a2, $f2 -/* 804890 80244010 0C0B2026 */ jal set_variable -/* 804894 80244014 02C0282D */ daddu $a1, $s6, $zero -/* 804898 80244018 0220202D */ daddu $a0, $s1, $zero -/* 80489C 8024401C 4600B08D */ trunc.w.s $f2, $f22 -/* 8048A0 80244020 44061000 */ mfc1 $a2, $f2 -/* 8048A4 80244024 0C0B2026 */ jal set_variable -/* 8048A8 80244028 0280282D */ daddu $a1, $s4, $zero -/* 8048AC 8024402C 0220202D */ daddu $a0, $s1, $zero -/* 8048B0 80244030 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 8048B4 80244034 4600008D */ trunc.w.s $f2, $f0 -/* 8048B8 80244038 44061000 */ mfc1 $a2, $f2 -/* 8048BC 8024403C 0C0B2026 */ jal set_variable -/* 8048C0 80244040 02A0282D */ daddu $a1, $s5, $zero -/* 8048C4 80244044 8FBF0034 */ lw $ra, 0x34($sp) -/* 8048C8 80244048 8FB60030 */ lw $s6, 0x30($sp) -/* 8048CC 8024404C 8FB5002C */ lw $s5, 0x2c($sp) -/* 8048D0 80244050 8FB40028 */ lw $s4, 0x28($sp) -/* 8048D4 80244054 8FB30024 */ lw $s3, 0x24($sp) -/* 8048D8 80244058 8FB20020 */ lw $s2, 0x20($sp) -/* 8048DC 8024405C 8FB1001C */ lw $s1, 0x1c($sp) -/* 8048E0 80244060 8FB00018 */ lw $s0, 0x18($sp) -/* 8048E4 80244064 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 8048E8 80244068 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 8048EC 8024406C 24020002 */ addiu $v0, $zero, 2 -/* 8048F0 80244070 03E00008 */ jr $ra -/* 8048F4 80244074 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/func_802440BC_800880.s b/asm/nonmatchings/world/area_mac/mac_01/func_802440BC_800880.s deleted file mode 100644 index e63f70c4cd..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/func_802440BC_800880.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802440BC_80493C -/* 80493C 802440BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 804940 802440C0 AFBF0010 */ sw $ra, 0x10($sp) -/* 804944 802440C4 0C00EABB */ jal get_npc_unsafe -/* 804948 802440C8 8C84008C */ lw $a0, 0x8c($a0) -/* 80494C 802440CC 3C038026 */ lui $v1, 0x8026 -/* 804950 802440D0 8C632C34 */ lw $v1, 0x2c34($v1) -/* 804954 802440D4 AC430028 */ sw $v1, 0x28($v0) -/* 804958 802440D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 80495C 802440DC 24020002 */ addiu $v0, $zero, 2 -/* 804960 802440E0 03E00008 */ jr $ra -/* 804964 802440E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/func_80245440_800880.s b/asm/nonmatchings/world/area_mac/mac_01/func_80245440_800880.s deleted file mode 100644 index fd0bbefcb5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/func_80245440_800880.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245440_805CC0 -/* 805CC0 80245440 3C028011 */ lui $v0, 0x8011 -/* 805CC4 80245444 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 805CC8 80245448 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 805CCC 8024544C AFB00010 */ sw $s0, 0x10($sp) -/* 805CD0 80245450 0080802D */ daddu $s0, $a0, $zero -/* 805CD4 80245454 AFBF0014 */ sw $ra, 0x14($sp) -/* 805CD8 80245458 8E0400AC */ lw $a0, 0xac($s0) -/* 805CDC 8024545C 50440005 */ beql $v0, $a0, .L80245474 -/* 805CE0 80245460 AE000088 */ sw $zero, 0x88($s0) -/* 805CE4 80245464 0C03AC5A */ jal func_800EB168 -/* 805CE8 80245468 00000000 */ nop -/* 805CEC 8024546C 24020001 */ addiu $v0, $zero, 1 -/* 805CF0 80245470 AE020088 */ sw $v0, 0x88($s0) -.L80245474: -/* 805CF4 80245474 24020002 */ addiu $v0, $zero, 2 -/* 805CF8 80245478 8FBF0014 */ lw $ra, 0x14($sp) -/* 805CFC 8024547C 8FB00010 */ lw $s0, 0x10($sp) -/* 805D00 80245480 03E00008 */ jr $ra -/* 805D04 80245484 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/pause_tabs_draw_badges_800880.s b/asm/nonmatchings/world/area_mac/mac_01/pause_tabs_draw_badges_800880.s deleted file mode 100644 index e3372695d1..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/pause_tabs_draw_badges_800880.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_tabs_draw_badges_805540 -/* 805540 80244CC0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 805544 80244CC4 AFBF0010 */ sw $ra, 0x10($sp) -/* 805548 80244CC8 0000202D */ daddu $a0, $zero, $zero -/* 80554C 80244CCC 3C05F840 */ lui $a1, 0xf840 -/* 805550 80244CD0 0C0B1EAF */ jal get_variable -/* 805554 80244CD4 34A55C84 */ ori $a1, $a1, 0x5c84 -/* 805558 80244CD8 14400008 */ bnez $v0, .L80244CFC -/* 80555C 80244CDC 0000202D */ daddu $a0, $zero, $zero -/* 805560 80244CE0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 805564 80244CE4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 805568 80244CE8 8C420140 */ lw $v0, 0x140($v0) -/* 80556C 80244CEC 8C440000 */ lw $a0, ($v0) -/* 805570 80244CF0 0C04D062 */ jal clear_item_entity_flags -/* 805574 80244CF4 24050040 */ addiu $a1, $zero, 0x40 -/* 805578 80244CF8 0000202D */ daddu $a0, $zero, $zero -.L80244CFC: -/* 80557C 80244CFC 3C05F840 */ lui $a1, 0xf840 -/* 805580 80244D00 0C0B1EAF */ jal get_variable -/* 805584 80244D04 34A55C85 */ ori $a1, $a1, 0x5c85 -/* 805588 80244D08 14400008 */ bnez $v0, .L80244D2C -/* 80558C 80244D0C 0000202D */ daddu $a0, $zero, $zero -/* 805590 80244D10 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 805594 80244D14 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 805598 80244D18 8C420140 */ lw $v0, 0x140($v0) -/* 80559C 80244D1C 8C440010 */ lw $a0, 0x10($v0) -/* 8055A0 80244D20 0C04D062 */ jal clear_item_entity_flags -/* 8055A4 80244D24 24050040 */ addiu $a1, $zero, 0x40 -/* 8055A8 80244D28 0000202D */ daddu $a0, $zero, $zero -.L80244D2C: -/* 8055AC 80244D2C 3C05F840 */ lui $a1, 0xf840 -/* 8055B0 80244D30 0C0B1EAF */ jal get_variable -/* 8055B4 80244D34 34A55C86 */ ori $a1, $a1, 0x5c86 -/* 8055B8 80244D38 14400007 */ bnez $v0, .L80244D58 -/* 8055BC 80244D3C 00000000 */ nop -/* 8055C0 80244D40 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 8055C4 80244D44 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 8055C8 80244D48 8C420140 */ lw $v0, 0x140($v0) -/* 8055CC 80244D4C 8C440020 */ lw $a0, 0x20($v0) -/* 8055D0 80244D50 0C04D062 */ jal clear_item_entity_flags -/* 8055D4 80244D54 24050040 */ addiu $a1, $zero, 0x40 -.L80244D58: -/* 8055D8 80244D58 8FBF0010 */ lw $ra, 0x10($sp) -/* 8055DC 80244D5C 24020002 */ addiu $v0, $zero, 2 -/* 8055E0 80244D60 03E00008 */ jr $ra -/* 8055E4 80244D64 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/pause_tabs_draw_stats_800880.s b/asm/nonmatchings/world/area_mac/mac_01/pause_tabs_draw_stats_800880.s deleted file mode 100644 index 79e7ff693f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/pause_tabs_draw_stats_800880.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_tabs_draw_stats_805418 -/* 805418 80244B98 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 80541C 80244B9C 0000202D */ daddu $a0, $zero, $zero -/* 805420 80244BA0 3C05FD05 */ lui $a1, 0xfd05 -/* 805424 80244BA4 34A50F80 */ ori $a1, $a1, 0xf80 -/* 805428 80244BA8 AFBF0024 */ sw $ra, 0x24($sp) -/* 80542C 80244BAC 0C0B1EAF */ jal get_variable -/* 805430 80244BB0 AFB00020 */ sw $s0, 0x20($sp) -/* 805434 80244BB4 0000202D */ daddu $a0, $zero, $zero -/* 805438 80244BB8 27A50010 */ addiu $a1, $sp, 0x10 -/* 80543C 80244BBC 0040802D */ daddu $s0, $v0, $zero -/* 805440 80244BC0 27A60014 */ addiu $a2, $sp, 0x14 -/* 805444 80244BC4 0C0470AC */ jal func_8011C2B0 -/* 805448 80244BC8 27A70018 */ addiu $a3, $sp, 0x18 -/* 80544C 80244BCC 8FA20018 */ lw $v0, 0x18($sp) -/* 805450 80244BD0 1840002C */ blez $v0, .L80244C84 -/* 805454 80244BD4 0000302D */ daddu $a2, $zero, $zero -/* 805458 80244BD8 240AFFB2 */ addiu $t2, $zero, -0x4e -/* 80545C 80244BDC 2409FFF0 */ addiu $t1, $zero, -0x10 -/* 805460 80244BE0 0040402D */ daddu $t0, $v0, $zero -/* 805464 80244BE4 8FA70014 */ lw $a3, 0x14($sp) -/* 805468 80244BE8 8FA50010 */ lw $a1, 0x10($sp) -.L80244BEC: -/* 80546C 80244BEC 84A20000 */ lh $v0, ($a1) -/* 805470 80244BF0 144A000F */ bne $v0, $t2, .L80244C30 -/* 805474 80244BF4 00061900 */ sll $v1, $a2, 4 -/* 805478 80244BF8 00E32021 */ addu $a0, $a3, $v1 -/* 80547C 80244BFC 84A20002 */ lh $v0, 2($a1) -/* 805480 80244C00 14400007 */ bnez $v0, .L80244C20 -/* 805484 80244C04 94A30002 */ lhu $v1, 2($a1) -/* 805488 80244C08 06010002 */ bgez $s0, .L80244C14 -/* 80548C 80244C0C 0200102D */ daddu $v0, $s0, $zero -/* 805490 80244C10 26020003 */ addiu $v0, $s0, 3 -.L80244C14: -/* 805494 80244C14 00021083 */ sra $v0, $v0, 2 -/* 805498 80244C18 0809131C */ j .L80244C70 -/* 80549C 80244C1C 00621023 */ subu $v0, $v1, $v0 -.L80244C20: -/* 8054A0 80244C20 06010011 */ bgez $s0, .L80244C68 -/* 8054A4 80244C24 0200102D */ daddu $v0, $s0, $zero -/* 8054A8 80244C28 0809131A */ j .L80244C68 -/* 8054AC 80244C2C 26020003 */ addiu $v0, $s0, 3 -.L80244C30: -/* 8054B0 80244C30 54490011 */ bnel $v0, $t1, .L80244C78 -/* 8054B4 80244C34 24C60001 */ addiu $a2, $a2, 1 -/* 8054B8 80244C38 00E32021 */ addu $a0, $a3, $v1 -/* 8054BC 80244C3C 84A20002 */ lh $v0, 2($a1) -/* 8054C0 80244C40 94A30002 */ lhu $v1, 2($a1) -/* 8054C4 80244C44 14400006 */ bnez $v0, .L80244C60 -/* 8054C8 80244C48 0200102D */ daddu $v0, $s0, $zero -/* 8054CC 80244C4C 06020001 */ bltzl $s0, .L80244C54 -/* 8054D0 80244C50 26020003 */ addiu $v0, $s0, 3 -.L80244C54: -/* 8054D4 80244C54 00021083 */ sra $v0, $v0, 2 -/* 8054D8 80244C58 0809131C */ j .L80244C70 -/* 8054DC 80244C5C 00621023 */ subu $v0, $v1, $v0 -.L80244C60: -/* 8054E0 80244C60 04420001 */ bltzl $v0, .L80244C68 -/* 8054E4 80244C64 24420003 */ addiu $v0, $v0, 3 -.L80244C68: -/* 8054E8 80244C68 00021083 */ sra $v0, $v0, 2 -/* 8054EC 80244C6C 00621021 */ addu $v0, $v1, $v0 -.L80244C70: -/* 8054F0 80244C70 A4820002 */ sh $v0, 2($a0) -/* 8054F4 80244C74 24C60001 */ addiu $a2, $a2, 1 -.L80244C78: -/* 8054F8 80244C78 00C8102A */ slt $v0, $a2, $t0 -/* 8054FC 80244C7C 1440FFDB */ bnez $v0, .L80244BEC -/* 805500 80244C80 24A50010 */ addiu $a1, $a1, 0x10 -.L80244C84: -/* 805504 80244C84 3C03800A */ lui $v1, 0x800a -/* 805508 80244C88 2463A66C */ addiu $v1, $v1, -0x5994 -/* 80550C 80244C8C 8C620000 */ lw $v0, ($v1) -/* 805510 80244C90 0000202D */ daddu $a0, $zero, $zero -/* 805514 80244C94 0040802D */ daddu $s0, $v0, $zero -/* 805518 80244C98 24420008 */ addiu $v0, $v0, 8 -/* 80551C 80244C9C AC620000 */ sw $v0, ($v1) -/* 805520 80244CA0 3C02DE00 */ lui $v0, 0xde00 -/* 805524 80244CA4 0C0470BB */ jal func_8011C2EC -/* 805528 80244CA8 AE020000 */ sw $v0, ($s0) -/* 80552C 80244CAC AE020004 */ sw $v0, 4($s0) -/* 805530 80244CB0 8FBF0024 */ lw $ra, 0x24($sp) -/* 805534 80244CB4 8FB00020 */ lw $s0, 0x20($sp) -/* 805538 80244CB8 03E00008 */ jr $ra -/* 80553C 80244CBC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/pause_tutorial_draw_contents_800880.s b/asm/nonmatchings/world/area_mac/mac_01/pause_tutorial_draw_contents_800880.s deleted file mode 100644 index 3506f1ead3..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/pause_tutorial_draw_contents_800880.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_tutorial_draw_contents_804074 -/* 804074 802437F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 804078 802437F8 AFB10014 */ sw $s1, 0x14($sp) -/* 80407C 802437FC 0080882D */ daddu $s1, $a0, $zero -/* 804080 80243800 AFBF0018 */ sw $ra, 0x18($sp) -/* 804084 80243804 AFB00010 */ sw $s0, 0x10($sp) -/* 804088 80243808 8E30000C */ lw $s0, 0xc($s1) -/* 80408C 8024380C 8E050000 */ lw $a1, ($s0) -/* 804090 80243810 0C0B1EAF */ jal get_variable -/* 804094 80243814 26100004 */ addiu $s0, $s0, 4 -/* 804098 80243818 0220202D */ daddu $a0, $s1, $zero -/* 80409C 8024381C 8E050000 */ lw $a1, ($s0) -/* 8040A0 80243820 0C0B1EAF */ jal get_variable -/* 8040A4 80243824 0040882D */ daddu $s1, $v0, $zero -/* 8040A8 80243828 0000202D */ daddu $a0, $zero, $zero -/* 8040AC 8024382C 0080282D */ daddu $a1, $a0, $zero -/* 8040B0 80243830 0040802D */ daddu $s0, $v0, $zero -/* 8040B4 80243834 240600BE */ addiu $a2, $zero, 0xbe -/* 8040B8 80243838 0C04DF93 */ jal func_80137E4C -/* 8040BC 8024383C 24070091 */ addiu $a3, $zero, 0x91 -/* 8040C0 80243840 44900000 */ mtc1 $s0, $f0 -/* 8040C4 80243844 00000000 */ nop -/* 8040C8 80243848 46800020 */ cvt.s.w $f0, $f0 -/* 8040CC 8024384C 44050000 */ mfc1 $a1, $f0 -/* 8040D0 80243850 0C04DF62 */ jal func_80137D88 -/* 8040D4 80243854 322400FF */ andi $a0, $s1, 0xff -/* 8040D8 80243858 8FBF0018 */ lw $ra, 0x18($sp) -/* 8040DC 8024385C 8FB10014 */ lw $s1, 0x14($sp) -/* 8040E0 80243860 8FB00010 */ lw $s0, 0x10($sp) -/* 8040E4 80243864 24020002 */ addiu $v0, $zero, 2 -/* 8040E8 80243868 03E00008 */ jr $ra -/* 8040EC 8024386C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/func_80240020_8232C0.s b/asm/nonmatchings/world/area_mac/mac_02/func_80240020_8232C0.s deleted file mode 100644 index b953280293..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/func_80240020_8232C0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_8232E0 -/* 8232E0 80240020 3C028016 */ lui $v0, 0x8016 -/* 8232E4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 8232E8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 8232EC 8024002C 03E00008 */ jr $ra -/* 8232F0 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/func_80240034_8232C0.s b/asm/nonmatchings/world/area_mac/mac_02/func_80240034_8232C0.s deleted file mode 100644 index 5def5d2817..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/func_80240034_8232C0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_8232F4 -/* 8232F4 80240034 3C038016 */ lui $v1, 0x8016 -/* 8232F8 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* 8232FC 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 823300 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 823304 80240044 0080802D */ daddu $s0, $a0, $zero -/* 823308 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* 82330C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 823310 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* 823314 80240054 24020002 */ addiu $v0, $zero, 2 -/* 823318 80240058 08090038 */ j .L802400E0 -/* 82331C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* 823320 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 823324 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 823328 80240068 80620040 */ lb $v0, 0x40($v1) -/* 82332C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* 823330 80240070 04420001 */ bltzl $v0, .L80240078 -/* 823334 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* 823338 80240078 14400003 */ bnez $v0, .L80240088 -/* 82333C 8024007C 00000000 */ nop -/* 823340 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* 823344 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* 823348 80240088 44822000 */ mtc1 $v0, $f4 -/* 82334C 8024008C 00000000 */ nop -/* 823350 80240090 46802120 */ cvt.s.w $f4, $f4 -/* 823354 80240094 44062000 */ mfc1 $a2, $f4 -/* 823358 80240098 44872000 */ mtc1 $a3, $f4 -/* 82335C 8024009C 00000000 */ nop -/* 823360 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* 823364 802400A4 44806000 */ mtc1 $zero, $f12 -/* 823368 802400A8 44072000 */ mfc1 $a3, $f4 -/* 82336C 802400AC 0C00A720 */ jal atan2 -/* 823370 802400B0 46006386 */ mov.s $f14, $f12 -/* 823374 802400B4 3C014270 */ lui $at, 0x4270 -/* 823378 802400B8 44811000 */ mtc1 $at, $f2 -/* 82337C 802400BC 00000000 */ nop -/* 823380 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 823384 802400C4 00000000 */ nop -/* 823388 802400C8 45000004 */ bc1f .L802400DC -/* 82338C 802400CC 24020001 */ addiu $v0, $zero, 1 -/* 823390 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* 823394 802400D4 08090038 */ j .L802400E0 -/* 823398 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* 82339C 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* 8233A0 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8233A4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 8233A8 802400E8 03E00008 */ jr $ra -/* 8233AC 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/func_802400F0_8232C0.s b/asm/nonmatchings/world/area_mac/mac_02/func_802400F0_8232C0.s deleted file mode 100644 index c39f666487..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/func_802400F0_8232C0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8233B0 -/* 8233B0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8233B4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8233B8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8233BC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 8233C0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 8233C4 80240104 0C016AFA */ jal get_current_map_header -/* 8233C8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 8233CC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 8233D0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 8233D4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8233D8 80240118 0C0B1EAF */ jal get_variable -/* 8233DC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 8233E0 80240120 0220202D */ daddu $a0, $s1, $zero -/* 8233E4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 8233E8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 8233EC 8024012C 00028100 */ sll $s0, $v0, 4 -/* 8233F0 80240130 02031821 */ addu $v1, $s0, $v1 -/* 8233F4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 8233F8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 8233FC 8024013C 44061000 */ mfc1 $a2, $f2 -/* 823400 80240140 0C0B2026 */ jal set_variable -/* 823404 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 823408 80240148 0220202D */ daddu $a0, $s1, $zero -/* 82340C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 823410 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 823414 80240154 02021021 */ addu $v0, $s0, $v0 -/* 823418 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 82341C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 823420 80240160 44061000 */ mfc1 $a2, $f2 -/* 823424 80240164 0C0B2026 */ jal set_variable -/* 823428 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 82342C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 823430 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 823434 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 823438 80240178 02021021 */ addu $v0, $s0, $v0 -/* 82343C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 823440 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 823444 80240184 44061000 */ mfc1 $a2, $f2 -/* 823448 80240188 0C0B2026 */ jal set_variable -/* 82344C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 823450 80240190 0220202D */ daddu $a0, $s1, $zero -/* 823454 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 823458 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 82345C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 823460 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 823464 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 823468 802401A8 44061000 */ mfc1 $a2, $f2 -/* 82346C 802401AC 0C0B2026 */ jal set_variable -/* 823470 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 823474 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 823478 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 82347C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 823480 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 823484 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 823488 802401C8 03E00008 */ jr $ra -/* 82348C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/func_802401D0_8232C0.s b/asm/nonmatchings/world/area_mac/mac_02/func_802401D0_8232C0.s deleted file mode 100644 index 77b30abaea..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/func_802401D0_8232C0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_823490 -/* 823490 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 823494 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 823498 802401D8 3C014334 */ lui $at, 0x4334 -/* 82349C 802401DC 44816000 */ mtc1 $at, $f12 -/* 8234A0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8234A4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8234A8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 8234AC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 8234B0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 8234B4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 8234B8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 8234BC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 8234C0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 8234C4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 8234C8 80240208 3C01800B */ lui $at, 0x800b -/* 8234CC 8024020C 00220821 */ addu $at, $at, $v0 -/* 8234D0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8234D4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 8234D8 80240218 0C00A6C9 */ jal clamp_angle -/* 8234DC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 8234E0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 8234E4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 8234E8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 8234EC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 8234F0 80240230 24020002 */ addiu $v0, $zero, 2 -/* 8234F4 80240234 03E00008 */ jr $ra -/* 8234F8 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/func_8024023C_8232C0.s b/asm/nonmatchings/world/area_mac/mac_02/func_8024023C_8232C0.s deleted file mode 100644 index b1394b64e3..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/func_8024023C_8232C0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_8234FC -/* 8234FC 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 823500 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 823504 80240244 0080802D */ daddu $s0, $a0, $zero -/* 823508 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 82350C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 823510 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 823514 80240254 0C0B210B */ jal get_float_variable -/* 823518 80240258 8C450000 */ lw $a1, ($v0) -/* 82351C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 823520 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 823524 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 823528 80240268 44060000 */ mfc1 $a2, $f0 -/* 82352C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 823530 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 823534 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 823538 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 82353C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 823540 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 823544 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 823548 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 82354C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 823550 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 823554 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 823558 80240298 0C0B2190 */ jal set_float_variable -/* 82355C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 823560 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 823564 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 823568 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 82356C 802402AC 0C0B2190 */ jal set_float_variable -/* 823570 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 823574 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 823578 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 82357C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 823580 802402C0 0C0B2190 */ jal set_float_variable -/* 823584 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 823588 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 82358C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 823590 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 823594 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 823598 802402D8 03E00008 */ jr $ra -/* 82359C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/func_802402E0_8232C0.s b/asm/nonmatchings/world/area_mac/mac_02/func_802402E0_8232C0.s deleted file mode 100644 index 6fafadbd55..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/func_802402E0_8232C0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_8235A0 -/* 8235A0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8235A4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 8235A8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 8235AC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 8235B0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8235B4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 8235B8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 8235BC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 8235C0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8235C4 80240304 3C020002 */ lui $v0, 2 -/* 8235C8 80240308 080900C8 */ j .L80240320 -/* 8235CC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 8235D0 80240310 3C040002 */ lui $a0, 2 -/* 8235D4 80240314 0083102A */ slt $v0, $a0, $v1 -/* 8235D8 80240318 10400002 */ beqz $v0, .L80240324 -/* 8235DC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 8235E0 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 8235E4 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 8235E8 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 8235EC 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 8235F0 80240330 04610004 */ bgez $v1, .L80240344 -/* 8235F4 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 8235F8 80240338 3C020002 */ lui $v0, 2 -/* 8235FC 8024033C 080900D5 */ j .L80240354 -/* 823600 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 823604 80240344 3C040002 */ lui $a0, 2 -/* 823608 80240348 0083102A */ slt $v0, $a0, $v1 -/* 82360C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 823610 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 823614 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 823618 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 82361C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 823620 80240360 00621821 */ addu $v1, $v1, $v0 -/* 823624 80240364 04610004 */ bgez $v1, .L80240378 -/* 823628 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 82362C 8024036C 3C020002 */ lui $v0, 2 -/* 823630 80240370 080900E2 */ j .L80240388 -/* 823634 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 823638 80240378 3C040002 */ lui $a0, 2 -/* 82363C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 823640 80240380 10400002 */ beqz $v0, .L8024038C -/* 823644 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 823648 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 82364C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 823650 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 823654 80240394 00621821 */ addu $v1, $v1, $v0 -/* 823658 80240398 04610004 */ bgez $v1, .L802403AC -/* 82365C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 823660 802403A0 3C020002 */ lui $v0, 2 -/* 823664 802403A4 080900EF */ j .L802403BC -/* 823668 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 82366C 802403AC 3C040002 */ lui $a0, 2 -/* 823670 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 823674 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 823678 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 82367C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 823680 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 823684 802403C4 0C046F07 */ jal set_main_pan_u -/* 823688 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 82368C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 823690 802403D0 0C046F0D */ jal set_main_pan_v -/* 823694 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 823698 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 82369C 802403DC 0C046F13 */ jal set_aux_pan_u -/* 8236A0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8236A4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 8236A8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 8236AC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8236B0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8236B4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 8236B8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 8236BC 802403FC 03E00008 */ jr $ra -/* 8236C0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/func_80240404_8232C0.s b/asm/nonmatchings/world/area_mac/mac_02/func_80240404_8232C0.s deleted file mode 100644 index 5e95e0e9b1..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/func_80240404_8232C0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_8236C4 -/* 8236C4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8236C8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 8236CC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 8236D0 80240410 10A00005 */ beqz $a1, .L80240428 -/* 8236D4 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 8236D8 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 8236DC 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 8236E0 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 8236E4 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 8236E8 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 8236EC 8024042C 1440000E */ bnez $v0, .L80240468 -/* 8236F0 80240430 00000000 */ nop -/* 8236F4 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8236F8 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 8236FC 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 823700 80240440 04610004 */ bgez $v1, .L80240454 -/* 823704 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 823708 80240448 3C020002 */ lui $v0, 2 -/* 82370C 8024044C 08090119 */ j .L80240464 -/* 823710 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 823714 80240454 3C040002 */ lui $a0, 2 -/* 823718 80240458 0083102A */ slt $v0, $a0, $v1 -/* 82371C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 823720 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 823724 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 823728 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 82372C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 823730 80240470 00000000 */ nop -/* 823734 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 823738 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 82373C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 823740 80240480 04610004 */ bgez $v1, .L80240494 -/* 823744 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 823748 80240488 3C020002 */ lui $v0, 2 -/* 82374C 8024048C 08090129 */ j .L802404A4 -/* 823750 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 823754 80240494 3C040002 */ lui $a0, 2 -/* 823758 80240498 0083102A */ slt $v0, $a0, $v1 -/* 82375C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 823760 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 823764 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 823768 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 82376C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 823770 802404B0 00000000 */ nop -/* 823774 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 823778 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 82377C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 823780 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 823784 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 823788 802404C8 3C020002 */ lui $v0, 2 -/* 82378C 802404CC 08090139 */ j .L802404E4 -/* 823790 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 823794 802404D4 3C040002 */ lui $a0, 2 -/* 823798 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 82379C 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 8237A0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 8237A4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 8237A8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 8237AC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 8237B0 802404F0 00000000 */ nop -/* 8237B4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8237B8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 8237BC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 8237C0 80240500 04610004 */ bgez $v1, .L80240514 -/* 8237C4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8237C8 80240508 3C020002 */ lui $v0, 2 -/* 8237CC 8024050C 08090149 */ j .L80240524 -/* 8237D0 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 8237D4 80240514 3C040002 */ lui $a0, 2 -/* 8237D8 80240518 0083102A */ slt $v0, $a0, $v1 -/* 8237DC 8024051C 10400002 */ beqz $v0, .L80240528 -/* 8237E0 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 8237E4 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 8237E8 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 8237EC 8024052C 0C046F07 */ jal set_main_pan_u -/* 8237F0 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8237F4 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 8237F8 80240538 0C046F0D */ jal set_main_pan_v -/* 8237FC 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 823800 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 823804 80240544 0C046F13 */ jal set_aux_pan_u -/* 823808 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 82380C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 823810 80240550 0C046F19 */ jal set_aux_pan_v -/* 823814 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 823818 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 82381C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 823820 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 823824 80240564 24420001 */ addiu $v0, $v0, 1 -/* 823828 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 82382C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 823830 80240570 24630001 */ addiu $v1, $v1, 1 -/* 823834 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 823838 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 82383C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 823840 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 823844 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 823848 80240588 0064182A */ slt $v1, $v1, $a0 -/* 82384C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 823850 80240590 14600002 */ bnez $v1, .L8024059C -/* 823854 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 823858 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 82385C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 823860 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 823864 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 823868 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 82386C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 823870 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 823874 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 823878 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 82387C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 823880 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 823884 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 823888 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 82388C 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 823890 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 823894 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 823898 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 82389C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 8238A0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 8238A4 802405E4 03E00008 */ jr $ra -/* 8238A8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8238AC 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/func_80242BA8_8232C0.s b/asm/nonmatchings/world/area_mac/mac_02/func_80242BA8_8232C0.s deleted file mode 100644 index 2c55c7f12d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/func_80242BA8_8232C0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242BA8_825E68 -/* 825E68 80242BA8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 825E6C 80242BAC AFBF0010 */ sw $ra, 0x10($sp) -/* 825E70 80242BB0 8C82000C */ lw $v0, 0xc($a0) -/* 825E74 80242BB4 0C0B1EAF */ jal get_variable -/* 825E78 80242BB8 8C450000 */ lw $a1, ($v0) -/* 825E7C 80242BBC 0040182D */ daddu $v1, $v0, $zero -/* 825E80 80242BC0 10600012 */ beqz $v1, .L80242C0C -/* 825E84 80242BC4 0000202D */ daddu $a0, $zero, $zero -/* 825E88 80242BC8 8C620000 */ lw $v0, ($v1) -/* 825E8C 80242BCC 5040000A */ beql $v0, $zero, .L80242BF8 -/* 825E90 80242BD0 00041080 */ sll $v0, $a0, 2 -/* 825E94 80242BD4 3C058025 */ lui $a1, 0x8025 -/* 825E98 80242BD8 24A5E738 */ addiu $a1, $a1, -0x18c8 -.L80242BDC: -/* 825E9C 80242BDC 24630004 */ addiu $v1, $v1, 4 -/* 825EA0 80242BE0 24840001 */ addiu $a0, $a0, 1 -/* 825EA4 80242BE4 ACA20000 */ sw $v0, ($a1) -/* 825EA8 80242BE8 8C620000 */ lw $v0, ($v1) -/* 825EAC 80242BEC 1440FFFB */ bnez $v0, .L80242BDC -/* 825EB0 80242BF0 24A50004 */ addiu $a1, $a1, 4 -/* 825EB4 80242BF4 00041080 */ sll $v0, $a0, 2 -.L80242BF8: -/* 825EB8 80242BF8 3C018025 */ lui $at, 0x8025 -/* 825EBC 80242BFC 00220821 */ addu $at, $at, $v0 -/* 825EC0 80242C00 AC20E738 */ sw $zero, -0x18c8($at) -/* 825EC4 80242C04 08090B0D */ j .L80242C34 -/* 825EC8 80242C08 00000000 */ nop -.L80242C0C: -/* 825ECC 80242C0C 3C038025 */ lui $v1, 0x8025 -/* 825ED0 80242C10 2463E738 */ addiu $v1, $v1, -0x18c8 -/* 825ED4 80242C14 0060282D */ daddu $a1, $v1, $zero -.L80242C18: -/* 825ED8 80242C18 24820080 */ addiu $v0, $a0, 0x80 -/* 825EDC 80242C1C AC620000 */ sw $v0, ($v1) -/* 825EE0 80242C20 24630004 */ addiu $v1, $v1, 4 -/* 825EE4 80242C24 24840001 */ addiu $a0, $a0, 1 -/* 825EE8 80242C28 2882005B */ slti $v0, $a0, 0x5b -/* 825EEC 80242C2C 1440FFFA */ bnez $v0, .L80242C18 -/* 825EF0 80242C30 ACA0016C */ sw $zero, 0x16c($a1) -.L80242C34: -/* 825EF4 80242C34 8FBF0010 */ lw $ra, 0x10($sp) -/* 825EF8 80242C38 24020002 */ addiu $v0, $zero, 2 -/* 825EFC 80242C3C 03E00008 */ jr $ra -/* 825F00 80242C40 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/func_80243104_8232C0.s b/asm/nonmatchings/world/area_mac/mac_02/func_80243104_8232C0.s deleted file mode 100644 index f35d9a9c0c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/func_80243104_8232C0.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243104_8263C4 -/* 8263C4 80243104 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8263C8 80243108 AFB10014 */ sw $s1, 0x14($sp) -/* 8263CC 8024310C 0080882D */ daddu $s1, $a0, $zero -/* 8263D0 80243110 AFBF0018 */ sw $ra, 0x18($sp) -/* 8263D4 80243114 AFB00010 */ sw $s0, 0x10($sp) -/* 8263D8 80243118 8E30000C */ lw $s0, 0xc($s1) -/* 8263DC 8024311C 8E050000 */ lw $a1, ($s0) -/* 8263E0 80243120 0C0B1EAF */ jal get_variable -/* 8263E4 80243124 26100004 */ addiu $s0, $s0, 4 -/* 8263E8 80243128 AE22008C */ sw $v0, 0x8c($s1) -/* 8263EC 8024312C 8E050000 */ lw $a1, ($s0) -/* 8263F0 80243130 26100004 */ addiu $s0, $s0, 4 -/* 8263F4 80243134 0C0B1EAF */ jal get_variable -/* 8263F8 80243138 0220202D */ daddu $a0, $s1, $zero -/* 8263FC 8024313C AE220090 */ sw $v0, 0x90($s1) -/* 826400 80243140 8E050000 */ lw $a1, ($s0) -/* 826404 80243144 26100004 */ addiu $s0, $s0, 4 -/* 826408 80243148 0C0B1EAF */ jal get_variable -/* 82640C 8024314C 0220202D */ daddu $a0, $s1, $zero -/* 826410 80243150 AE220094 */ sw $v0, 0x94($s1) -/* 826414 80243154 8E050000 */ lw $a1, ($s0) -/* 826418 80243158 26100004 */ addiu $s0, $s0, 4 -/* 82641C 8024315C 0C0B1EAF */ jal get_variable -/* 826420 80243160 0220202D */ daddu $a0, $s1, $zero -/* 826424 80243164 AE220098 */ sw $v0, 0x98($s1) -/* 826428 80243168 8E050000 */ lw $a1, ($s0) -/* 82642C 8024316C 26100004 */ addiu $s0, $s0, 4 -/* 826430 80243170 0C0B1EAF */ jal get_variable -/* 826434 80243174 0220202D */ daddu $a0, $s1, $zero -/* 826438 80243178 AE22009C */ sw $v0, 0x9c($s1) -/* 82643C 8024317C 8E050000 */ lw $a1, ($s0) -/* 826440 80243180 26100004 */ addiu $s0, $s0, 4 -/* 826444 80243184 0C0B1EAF */ jal get_variable -/* 826448 80243188 0220202D */ daddu $a0, $s1, $zero -/* 82644C 8024318C AE2200A0 */ sw $v0, 0xa0($s1) -/* 826450 80243190 8E050000 */ lw $a1, ($s0) -/* 826454 80243194 26100004 */ addiu $s0, $s0, 4 -/* 826458 80243198 0C0B1EAF */ jal get_variable -/* 82645C 8024319C 0220202D */ daddu $a0, $s1, $zero -/* 826460 802431A0 AE2200A4 */ sw $v0, 0xa4($s1) -/* 826464 802431A4 8E050000 */ lw $a1, ($s0) -/* 826468 802431A8 26100004 */ addiu $s0, $s0, 4 -/* 82646C 802431AC 0C0B1EAF */ jal get_variable -/* 826470 802431B0 0220202D */ daddu $a0, $s1, $zero -/* 826474 802431B4 AE2200A8 */ sw $v0, 0xa8($s1) -/* 826478 802431B8 8E050000 */ lw $a1, ($s0) -/* 82647C 802431BC 26100004 */ addiu $s0, $s0, 4 -/* 826480 802431C0 0C0B1EAF */ jal get_variable -/* 826484 802431C4 0220202D */ daddu $a0, $s1, $zero -/* 826488 802431C8 AE2200AC */ sw $v0, 0xac($s1) -/* 82648C 802431CC 8E050000 */ lw $a1, ($s0) -/* 826490 802431D0 0C0B1EAF */ jal get_variable -/* 826494 802431D4 0220202D */ daddu $a0, $s1, $zero -/* 826498 802431D8 AE2200B0 */ sw $v0, 0xb0($s1) -/* 82649C 802431DC 8FBF0018 */ lw $ra, 0x18($sp) -/* 8264A0 802431E0 8FB10014 */ lw $s1, 0x14($sp) -/* 8264A4 802431E4 8FB00010 */ lw $s0, 0x10($sp) -/* 8264A8 802431E8 24020002 */ addiu $v0, $zero, 2 -/* 8264AC 802431EC 03E00008 */ jr $ra -/* 8264B0 802431F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/func_80243380_8232C0.s b/asm/nonmatchings/world/area_mac/mac_02/func_80243380_8232C0.s deleted file mode 100644 index 1aba243679..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/func_80243380_8232C0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243380_826640 -/* 826640 80243380 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 826644 80243384 AFB00010 */ sw $s0, 0x10($sp) -/* 826648 80243388 0080802D */ daddu $s0, $a0, $zero -/* 82664C 8024338C AFBF0014 */ sw $ra, 0x14($sp) -/* 826650 80243390 0C00EABB */ jal get_npc_unsafe -/* 826654 80243394 8E04008C */ lw $a0, 0x8c($s0) -/* 826658 80243398 0040282D */ daddu $a1, $v0, $zero -/* 82665C 8024339C 8E040094 */ lw $a0, 0x94($s0) -/* 826660 802433A0 8CA30028 */ lw $v1, 0x28($a1) -/* 826664 802433A4 ACA40028 */ sw $a0, 0x28($a1) -/* 826668 802433A8 8FBF0014 */ lw $ra, 0x14($sp) -/* 82666C 802433AC 8FB00010 */ lw $s0, 0x10($sp) -/* 826670 802433B0 24020002 */ addiu $v0, $zero, 2 -/* 826674 802433B4 3C018025 */ lui $at, 0x8025 -/* 826678 802433B8 AC23EA18 */ sw $v1, -0x15e8($at) -/* 82667C 802433BC 03E00008 */ jr $ra -/* 826680 802433C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/func_80240020_831800.s b/asm/nonmatchings/world/area_mac/mac_03/func_80240020_831800.s deleted file mode 100644 index 1a22ff08da..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/func_80240020_831800.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_831820 -/* 831820 80240020 3C028016 */ lui $v0, 0x8016 -/* 831824 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 831828 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 83182C 8024002C 03E00008 */ jr $ra -/* 831830 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/func_80240034_831800.s b/asm/nonmatchings/world/area_mac/mac_03/func_80240034_831800.s deleted file mode 100644 index 1f464b34d9..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/func_80240034_831800.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_831834 -/* 831834 80240034 3C038016 */ lui $v1, 0x8016 -/* 831838 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* 83183C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 831840 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 831844 80240044 0080802D */ daddu $s0, $a0, $zero -/* 831848 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* 83184C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 831850 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* 831854 80240054 24020002 */ addiu $v0, $zero, 2 -/* 831858 80240058 08090038 */ j .L802400E0 -/* 83185C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* 831860 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 831864 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 831868 80240068 80620040 */ lb $v0, 0x40($v1) -/* 83186C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* 831870 80240070 04420001 */ bltzl $v0, .L80240078 -/* 831874 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* 831878 80240078 14400003 */ bnez $v0, .L80240088 -/* 83187C 8024007C 00000000 */ nop -/* 831880 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* 831884 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* 831888 80240088 44822000 */ mtc1 $v0, $f4 -/* 83188C 8024008C 00000000 */ nop -/* 831890 80240090 46802120 */ cvt.s.w $f4, $f4 -/* 831894 80240094 44062000 */ mfc1 $a2, $f4 -/* 831898 80240098 44872000 */ mtc1 $a3, $f4 -/* 83189C 8024009C 00000000 */ nop -/* 8318A0 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* 8318A4 802400A4 44806000 */ mtc1 $zero, $f12 -/* 8318A8 802400A8 44072000 */ mfc1 $a3, $f4 -/* 8318AC 802400AC 0C00A720 */ jal atan2 -/* 8318B0 802400B0 46006386 */ mov.s $f14, $f12 -/* 8318B4 802400B4 3C014270 */ lui $at, 0x4270 -/* 8318B8 802400B8 44811000 */ mtc1 $at, $f2 -/* 8318BC 802400BC 00000000 */ nop -/* 8318C0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 8318C4 802400C4 00000000 */ nop -/* 8318C8 802400C8 45000004 */ bc1f .L802400DC -/* 8318CC 802400CC 24020001 */ addiu $v0, $zero, 1 -/* 8318D0 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* 8318D4 802400D4 08090038 */ j .L802400E0 -/* 8318D8 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* 8318DC 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* 8318E0 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8318E4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 8318E8 802400E8 03E00008 */ jr $ra -/* 8318EC 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/func_802400F0_831800.s b/asm/nonmatchings/world/area_mac/mac_03/func_802400F0_831800.s deleted file mode 100644 index 2c1f4cda97..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/func_802400F0_831800.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8318F0 -/* 8318F0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8318F4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8318F8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8318FC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 831900 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 831904 80240104 0C016AFA */ jal get_current_map_header -/* 831908 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 83190C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 831910 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 831914 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 831918 80240118 0C0B1EAF */ jal get_variable -/* 83191C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 831920 80240120 0220202D */ daddu $a0, $s1, $zero -/* 831924 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 831928 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 83192C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 831930 80240130 02031821 */ addu $v1, $s0, $v1 -/* 831934 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 831938 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 83193C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 831940 80240140 0C0B2026 */ jal set_variable -/* 831944 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 831948 80240148 0220202D */ daddu $a0, $s1, $zero -/* 83194C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 831950 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 831954 80240154 02021021 */ addu $v0, $s0, $v0 -/* 831958 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 83195C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 831960 80240160 44061000 */ mfc1 $a2, $f2 -/* 831964 80240164 0C0B2026 */ jal set_variable -/* 831968 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 83196C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 831970 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 831974 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 831978 80240178 02021021 */ addu $v0, $s0, $v0 -/* 83197C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 831980 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 831984 80240184 44061000 */ mfc1 $a2, $f2 -/* 831988 80240188 0C0B2026 */ jal set_variable -/* 83198C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 831990 80240190 0220202D */ daddu $a0, $s1, $zero -/* 831994 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 831998 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 83199C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 8319A0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 8319A4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 8319A8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 8319AC 802401AC 0C0B2026 */ jal set_variable -/* 8319B0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8319B4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 8319B8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 8319BC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 8319C0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 8319C4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 8319C8 802401C8 03E00008 */ jr $ra -/* 8319CC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/func_802401D0_831800.s b/asm/nonmatchings/world/area_mac/mac_03/func_802401D0_831800.s deleted file mode 100644 index 10898df856..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/func_802401D0_831800.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_8319D0 -/* 8319D0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8319D4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8319D8 802401D8 3C014334 */ lui $at, 0x4334 -/* 8319DC 802401DC 44816000 */ mtc1 $at, $f12 -/* 8319E0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8319E4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8319E8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 8319EC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 8319F0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 8319F4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 8319F8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 8319FC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 831A00 80240200 00431021 */ addu $v0, $v0, $v1 -/* 831A04 80240204 000210C0 */ sll $v0, $v0, 3 -/* 831A08 80240208 3C01800B */ lui $at, 0x800b -/* 831A0C 8024020C 00220821 */ addu $at, $at, $v0 -/* 831A10 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 831A14 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 831A18 80240218 0C00A6C9 */ jal clamp_angle -/* 831A1C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 831A20 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 831A24 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 831A28 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 831A2C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 831A30 80240230 24020002 */ addiu $v0, $zero, 2 -/* 831A34 80240234 03E00008 */ jr $ra -/* 831A38 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/func_8024023C_831800.s b/asm/nonmatchings/world/area_mac/mac_03/func_8024023C_831800.s deleted file mode 100644 index 184078e93c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/func_8024023C_831800.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_831A3C -/* 831A3C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 831A40 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 831A44 80240244 0080802D */ daddu $s0, $a0, $zero -/* 831A48 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 831A4C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 831A50 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 831A54 80240254 0C0B210B */ jal get_float_variable -/* 831A58 80240258 8C450000 */ lw $a1, ($v0) -/* 831A5C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 831A60 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 831A64 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 831A68 80240268 44060000 */ mfc1 $a2, $f0 -/* 831A6C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 831A70 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 831A74 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 831A78 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 831A7C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 831A80 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 831A84 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 831A88 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 831A8C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 831A90 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 831A94 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 831A98 80240298 0C0B2190 */ jal set_float_variable -/* 831A9C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 831AA0 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 831AA4 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 831AA8 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 831AAC 802402AC 0C0B2190 */ jal set_float_variable -/* 831AB0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 831AB4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 831AB8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 831ABC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 831AC0 802402C0 0C0B2190 */ jal set_float_variable -/* 831AC4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 831AC8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 831ACC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 831AD0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 831AD4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 831AD8 802402D8 03E00008 */ jr $ra -/* 831ADC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_03/func_802402E0_831800.s b/asm/nonmatchings/world/area_mac/mac_03/func_802402E0_831800.s deleted file mode 100644 index 5c4cbd99dc..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/func_802402E0_831800.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_831AE0 -/* 831AE0 802402E0 8C8200C0 */ lw $v0, 0xc0($a0) -/* 831AE4 802402E4 284202D1 */ slti $v0, $v0, 0x2d1 -/* 831AE8 802402E8 50400001 */ beql $v0, $zero, .L802402F0 -/* 831AEC 802402EC AC8000C0 */ sw $zero, 0xc0($a0) -.L802402F0: -/* 831AF0 802402F0 8C8300C0 */ lw $v1, 0xc0($a0) -/* 831AF4 802402F4 00031040 */ sll $v0, $v1, 1 -/* 831AF8 802402F8 00431021 */ addu $v0, $v0, $v1 -/* 831AFC 802402FC 00021040 */ sll $v0, $v0, 1 -/* 831B00 80240300 AC820084 */ sw $v0, 0x84($a0) -/* 831B04 80240304 000317C2 */ srl $v0, $v1, 0x1f -/* 831B08 80240308 00621821 */ addu $v1, $v1, $v0 -/* 831B0C 8024030C 00031843 */ sra $v1, $v1, 1 -/* 831B10 80240310 24020002 */ addiu $v0, $zero, 2 -/* 831B14 80240314 03E00008 */ jr $ra -/* 831B18 80240318 AC830088 */ sw $v1, 0x88($a0) -/* 831B1C 8024031C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_03/func_802404B0_831800.s b/asm/nonmatchings/world/area_mac/mac_03/func_802404B0_831800.s deleted file mode 100644 index dcba09f277..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/func_802404B0_831800.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404B0_831CB0 -/* 831CB0 802404B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 831CB4 802404B4 AFB00010 */ sw $s0, 0x10($sp) -/* 831CB8 802404B8 3C108024 */ lui $s0, 0x8024 -/* 831CBC 802404BC 26106644 */ addiu $s0, $s0, 0x6644 -/* 831CC0 802404C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 831CC4 802404C4 AFB10014 */ sw $s1, 0x14($sp) -/* 831CC8 802404C8 8E020000 */ lw $v0, ($s0) -/* 831CCC 802404CC 14400010 */ bnez $v0, .L80240510 -/* 831CD0 802404D0 0080882D */ daddu $s1, $a0, $zero -/* 831CD4 802404D4 0C00AB39 */ jal heap_malloc -/* 831CD8 802404D8 24040040 */ addiu $a0, $zero, 0x40 -/* 831CDC 802404DC AE020000 */ sw $v0, ($s0) -/* 831CE0 802404E0 0000182D */ daddu $v1, $zero, $zero -/* 831CE4 802404E4 0040282D */ daddu $a1, $v0, $zero -/* 831CE8 802404E8 0220202D */ daddu $a0, $s1, $zero -.L802404EC: -/* 831CEC 802404EC 8C820084 */ lw $v0, 0x84($a0) -/* 831CF0 802404F0 24840004 */ addiu $a0, $a0, 4 -/* 831CF4 802404F4 24630001 */ addiu $v1, $v1, 1 -/* 831CF8 802404F8 ACA20000 */ sw $v0, ($a1) -/* 831CFC 802404FC 28620010 */ slti $v0, $v1, 0x10 -/* 831D00 80240500 1440FFFA */ bnez $v0, .L802404EC -/* 831D04 80240504 24A50004 */ addiu $a1, $a1, 4 -/* 831D08 80240508 08090153 */ j .L8024054C -/* 831D0C 8024050C 00000000 */ nop -.L80240510: -/* 831D10 80240510 0000182D */ daddu $v1, $zero, $zero -/* 831D14 80240514 0040282D */ daddu $a1, $v0, $zero -/* 831D18 80240518 0220202D */ daddu $a0, $s1, $zero -.L8024051C: -/* 831D1C 8024051C 8CA20000 */ lw $v0, ($a1) -/* 831D20 80240520 24A50004 */ addiu $a1, $a1, 4 -/* 831D24 80240524 24630001 */ addiu $v1, $v1, 1 -/* 831D28 80240528 AC820084 */ sw $v0, 0x84($a0) -/* 831D2C 8024052C 28620010 */ slti $v0, $v1, 0x10 -/* 831D30 80240530 1440FFFA */ bnez $v0, .L8024051C -/* 831D34 80240534 24840004 */ addiu $a0, $a0, 4 -/* 831D38 80240538 3C108024 */ lui $s0, 0x8024 -/* 831D3C 8024053C 26106644 */ addiu $s0, $s0, 0x6644 -/* 831D40 80240540 0C00AB4B */ jal heap_free -/* 831D44 80240544 8E040000 */ lw $a0, ($s0) -/* 831D48 80240548 AE000000 */ sw $zero, ($s0) -.L8024054C: -/* 831D4C 8024054C 8FBF0018 */ lw $ra, 0x18($sp) -/* 831D50 80240550 8FB10014 */ lw $s1, 0x14($sp) -/* 831D54 80240554 8FB00010 */ lw $s0, 0x10($sp) -/* 831D58 80240558 24020002 */ addiu $v0, $zero, 2 -/* 831D5C 8024055C 03E00008 */ jr $ra -/* 831D60 80240560 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/func_802405EC_831800.s b/asm/nonmatchings/world/area_mac/mac_03/func_802405EC_831800.s deleted file mode 100644 index 689c44cf40..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/func_802405EC_831800.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_831DEC -/* 831DEC 802405EC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 831DF0 802405F0 AFB10024 */ sw $s1, 0x24($sp) -/* 831DF4 802405F4 0080882D */ daddu $s1, $a0, $zero -/* 831DF8 802405F8 3C05F840 */ lui $a1, 0xf840 -/* 831DFC 802405FC AFBF0044 */ sw $ra, 0x44($sp) -/* 831E00 80240600 AFBE0040 */ sw $fp, 0x40($sp) -/* 831E04 80240604 AFB7003C */ sw $s7, 0x3c($sp) -/* 831E08 80240608 AFB60038 */ sw $s6, 0x38($sp) -/* 831E0C 8024060C AFB50034 */ sw $s5, 0x34($sp) -/* 831E10 80240610 AFB40030 */ sw $s4, 0x30($sp) -/* 831E14 80240614 AFB3002C */ sw $s3, 0x2c($sp) -/* 831E18 80240618 AFB20028 */ sw $s2, 0x28($sp) -/* 831E1C 8024061C AFB00020 */ sw $s0, 0x20($sp) -/* 831E20 80240620 8E3E0148 */ lw $fp, 0x148($s1) -/* 831E24 80240624 0C0B1EAF */ jal get_variable -/* 831E28 80240628 34A56268 */ ori $a1, $a1, 0x6268 -/* 831E2C 8024062C 0040802D */ daddu $s0, $v0, $zero -/* 831E30 80240630 0220202D */ daddu $a0, $s1, $zero -/* 831E34 80240634 3C05F840 */ lui $a1, 0xf840 -/* 831E38 80240638 0C0B1EAF */ jal get_variable -/* 831E3C 8024063C 34A56269 */ ori $a1, $a1, 0x6269 -/* 831E40 80240640 0040B82D */ daddu $s7, $v0, $zero -/* 831E44 80240644 0220202D */ daddu $a0, $s1, $zero -/* 831E48 80240648 3C05F5DE */ lui $a1, 0xf5de -/* 831E4C 8024064C 0C0B1EAF */ jal get_variable -/* 831E50 80240650 34A502DE */ ori $a1, $a1, 0x2de -/* 831E54 80240654 0040B02D */ daddu $s6, $v0, $zero -/* 831E58 80240658 0220202D */ daddu $a0, $s1, $zero -/* 831E5C 8024065C 3C05F5DE */ lui $a1, 0xf5de -/* 831E60 80240660 0C0B1EAF */ jal get_variable -/* 831E64 80240664 34A502DF */ ori $a1, $a1, 0x2df -/* 831E68 80240668 0040A82D */ daddu $s5, $v0, $zero -/* 831E6C 8024066C 93D3006D */ lbu $s3, 0x6d($fp) -/* 831E70 80240670 32C2FFFF */ andi $v0, $s6, 0xffff -/* 831E74 80240674 A7B30010 */ sh $s3, 0x10($sp) -/* 831E78 80240678 93D2006E */ lbu $s2, 0x6e($fp) -/* 831E7C 8024067C 93C7006F */ lbu $a3, 0x6f($fp) -/* 831E80 80240680 3274FFFF */ andi $s4, $s3, 0xffff -/* 831E84 80240684 12820003 */ beq $s4, $v0, .L80240694 -/* 831E88 80240688 A7A7001E */ sh $a3, 0x1e($sp) -/* 831E8C 8024068C 0000B82D */ daddu $s7, $zero, $zero -/* 831E90 80240690 02E0802D */ daddu $s0, $s7, $zero -.L80240694: -/* 831E94 80240694 3202FFFF */ andi $v0, $s0, 0xffff -/* 831E98 80240698 14400016 */ bnez $v0, .L802406F4 -/* 831E9C 8024069C 0220202D */ daddu $a0, $s1, $zero -/* 831EA0 802406A0 0C00A67F */ jal rand_int -/* 831EA4 802406A4 24040064 */ addiu $a0, $zero, 0x64 -/* 831EA8 802406A8 2842001E */ slti $v0, $v0, 0x1e -/* 831EAC 802406AC 10400011 */ beqz $v0, .L802406F4 -/* 831EB0 802406B0 0220202D */ daddu $a0, $s1, $zero -/* 831EB4 802406B4 0C00A67F */ jal rand_int -/* 831EB8 802406B8 2644FFFF */ addiu $a0, $s2, -1 -/* 831EBC 802406BC 0040A82D */ daddu $s5, $v0, $zero -/* 831EC0 802406C0 0260B02D */ daddu $s6, $s3, $zero -/* 831EC4 802406C4 0220202D */ daddu $a0, $s1, $zero -/* 831EC8 802406C8 3C05F5DE */ lui $a1, 0xf5de -/* 831ECC 802406CC 34A502DE */ ori $a1, $a1, 0x2de -/* 831ED0 802406D0 0C0B2026 */ jal set_variable -/* 831ED4 802406D4 0280302D */ daddu $a2, $s4, $zero -/* 831ED8 802406D8 0220202D */ daddu $a0, $s1, $zero -/* 831EDC 802406DC 3C05F5DE */ lui $a1, 0xf5de -/* 831EE0 802406E0 34A502DF */ ori $a1, $a1, 0x2df -/* 831EE4 802406E4 0C0B2026 */ jal set_variable -/* 831EE8 802406E8 32A6FFFF */ andi $a2, $s5, 0xffff -/* 831EEC 802406EC 24100001 */ addiu $s0, $zero, 1 -/* 831EF0 802406F0 0220202D */ daddu $a0, $s1, $zero -.L802406F4: -/* 831EF4 802406F4 3C05F840 */ lui $a1, 0xf840 -/* 831EF8 802406F8 34A56268 */ ori $a1, $a1, 0x6268 -/* 831EFC 802406FC 0C0B2026 */ jal set_variable -/* 831F00 80240700 3206FFFF */ andi $a2, $s0, 0xffff -/* 831F04 80240704 0220202D */ daddu $a0, $s1, $zero -/* 831F08 80240708 3C05F840 */ lui $a1, 0xf840 -/* 831F0C 8024070C 34A56269 */ ori $a1, $a1, 0x6269 -/* 831F10 80240710 0C0B2026 */ jal set_variable -/* 831F14 80240714 32E6FFFF */ andi $a2, $s7, 0xffff -/* 831F18 80240718 0000202D */ daddu $a0, $zero, $zero -/* 831F1C 8024071C 3C05F5DE */ lui $a1, 0xf5de -/* 831F20 80240720 0C0B1EAF */ jal get_variable -/* 831F24 80240724 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 831F28 80240728 0000202D */ daddu $a0, $zero, $zero -/* 831F2C 8024072C 3C05F5DE */ lui $a1, 0xf5de -/* 831F30 80240730 34A50180 */ ori $a1, $a1, 0x180 -/* 831F34 80240734 0C0B1EAF */ jal get_variable -/* 831F38 80240738 0040802D */ daddu $s0, $v0, $zero -/* 831F3C 8024073C 0040282D */ daddu $a1, $v0, $zero -/* 831F40 80240740 0000182D */ daddu $v1, $zero, $zero -/* 831F44 80240744 3C068024 */ lui $a2, 0x8024 -/* 831F48 80240748 24C666E8 */ addiu $a2, $a2, 0x66e8 -/* 831F4C 8024074C 00C0202D */ daddu $a0, $a2, $zero -.L80240750: -/* 831F50 80240750 8C820000 */ lw $v0, ($a0) -/* 831F54 80240754 00A2102A */ slt $v0, $a1, $v0 -/* 831F58 80240758 14400006 */ bnez $v0, .L80240774 -/* 831F5C 8024075C 000310C0 */ sll $v0, $v1, 3 -/* 831F60 80240760 24630001 */ addiu $v1, $v1, 1 -/* 831F64 80240764 28620008 */ slti $v0, $v1, 8 -/* 831F68 80240768 1440FFF9 */ bnez $v0, .L80240750 -/* 831F6C 8024076C 24840008 */ addiu $a0, $a0, 8 -/* 831F70 80240770 000310C0 */ sll $v0, $v1, 3 -.L80240774: -/* 831F74 80240774 00461021 */ addu $v0, $v0, $a2 -/* 831F78 80240778 8C420004 */ lw $v0, 4($v0) -/* 831F7C 8024077C 97A30010 */ lhu $v1, 0x10($sp) -/* 831F80 80240780 0202202A */ slt $a0, $s0, $v0 -/* 831F84 80240784 32C2FFFF */ andi $v0, $s6, 0xffff -/* 831F88 80240788 14620008 */ bne $v1, $v0, .L802407AC -/* 831F8C 8024078C 32A2FFFF */ andi $v0, $s5, 0xffff -/* 831F90 80240790 97A7001E */ lhu $a3, 0x1e($sp) -/* 831F94 80240794 14E20005 */ bne $a3, $v0, .L802407AC -/* 831F98 80240798 32E2FFFF */ andi $v0, $s7, 0xffff -/* 831F9C 8024079C 14400003 */ bnez $v0, .L802407AC -/* 831FA0 802407A0 00000000 */ nop -/* 831FA4 802407A4 14800008 */ bnez $a0, .L802407C8 -/* 831FA8 802407A8 24020001 */ addiu $v0, $zero, 1 -.L802407AC: -/* 831FAC 802407AC 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 831FB0 802407B0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 831FB4 802407B4 80420075 */ lb $v0, 0x75($v0) -/* 831FB8 802407B8 10400005 */ beqz $v0, .L802407D0 -/* 831FBC 802407BC 00000000 */ nop -/* 831FC0 802407C0 10800003 */ beqz $a0, .L802407D0 -/* 831FC4 802407C4 24020001 */ addiu $v0, $zero, 1 -.L802407C8: -/* 831FC8 802407C8 080901F7 */ j .L802407DC -/* 831FCC 802407CC AE220084 */ sw $v0, 0x84($s1) -.L802407D0: -/* 831FD0 802407D0 0C00F9EB */ jal kill_enemy -/* 831FD4 802407D4 03C0202D */ daddu $a0, $fp, $zero -/* 831FD8 802407D8 AE200084 */ sw $zero, 0x84($s1) -.L802407DC: -/* 831FDC 802407DC 8FBF0044 */ lw $ra, 0x44($sp) -/* 831FE0 802407E0 8FBE0040 */ lw $fp, 0x40($sp) -/* 831FE4 802407E4 8FB7003C */ lw $s7, 0x3c($sp) -/* 831FE8 802407E8 8FB60038 */ lw $s6, 0x38($sp) -/* 831FEC 802407EC 8FB50034 */ lw $s5, 0x34($sp) -/* 831FF0 802407F0 8FB40030 */ lw $s4, 0x30($sp) -/* 831FF4 802407F4 8FB3002C */ lw $s3, 0x2c($sp) -/* 831FF8 802407F8 8FB20028 */ lw $s2, 0x28($sp) -/* 831FFC 802407FC 8FB10024 */ lw $s1, 0x24($sp) -/* 832000 80240800 8FB00020 */ lw $s0, 0x20($sp) -/* 832004 80240804 24020002 */ addiu $v0, $zero, 2 -/* 832008 80240808 03E00008 */ jr $ra -/* 83200C 8024080C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_03/func_80240FB8_831800.s b/asm/nonmatchings/world/area_mac/mac_03/func_80240FB8_831800.s deleted file mode 100644 index 35d47c46a5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/func_80240FB8_831800.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FB8_8327B8 -/* 8327B8 80240FB8 3C028025 */ lui $v0, 0x8025 -/* 8327BC 80240FBC 8C4213F8 */ lw $v0, 0x13f8($v0) -/* 8327C0 80240FC0 8C43000C */ lw $v1, 0xc($v0) -/* 8327C4 80240FC4 24020001 */ addiu $v0, $zero, 1 -/* 8327C8 80240FC8 AC62001C */ sw $v0, 0x1c($v1) -/* 8327CC 80240FCC 03E00008 */ jr $ra -/* 8327D0 80240FD0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/func_80241B14_831800.s b/asm/nonmatchings/world/area_mac/mac_03/func_80241B14_831800.s deleted file mode 100644 index d3389c39b4..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/func_80241B14_831800.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B14_833314 -/* 833314 80241B14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 833318 80241B18 AFB00010 */ sw $s0, 0x10($sp) -/* 83331C 80241B1C 0080802D */ daddu $s0, $a0, $zero -/* 833320 80241B20 AFBF0014 */ sw $ra, 0x14($sp) -/* 833324 80241B24 0C00EABB */ jal get_npc_unsafe -/* 833328 80241B28 8E04008C */ lw $a0, 0x8c($s0) -/* 83332C 80241B2C 0040282D */ daddu $a1, $v0, $zero -/* 833330 80241B30 8E040094 */ lw $a0, 0x94($s0) -/* 833334 80241B34 8CA30028 */ lw $v1, 0x28($a1) -/* 833338 80241B38 ACA40028 */ sw $a0, 0x28($a1) -/* 83333C 80241B3C 8FBF0014 */ lw $ra, 0x14($sp) -/* 833340 80241B40 8FB00010 */ lw $s0, 0x10($sp) -/* 833344 80241B44 24020002 */ addiu $v0, $zero, 2 -/* 833348 80241B48 3C018025 */ lui $at, 0x8025 -/* 83334C 80241B4C AC2315C4 */ sw $v1, 0x15c4($at) -/* 833350 80241B50 03E00008 */ jr $ra -/* 833354 80241B54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/func_80240F50_842BD0.s b/asm/nonmatchings/world/area_mac/mac_04/func_80240F50_842BD0.s deleted file mode 100644 index 3cc3506b0b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/func_80240F50_842BD0.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F50_843B20 -/* 843B20 80240F50 3C028025 */ lui $v0, 0x8025 -/* 843B24 80240F54 8C42F5C8 */ lw $v0, -0xa38($v0) -/* 843B28 80240F58 8C42000C */ lw $v0, 0xc($v0) -/* 843B2C 80240F5C AC40001C */ sw $zero, 0x1c($v0) -/* 843B30 80240F60 03E00008 */ jr $ra -/* 843B34 80240F64 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/func_8024127C_842BD0.s b/asm/nonmatchings/world/area_mac/mac_04/func_8024127C_842BD0.s deleted file mode 100644 index 8d546c52ff..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/func_8024127C_842BD0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024127C_843E4C -/* 843E4C 8024127C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 843E50 80241280 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 843E54 80241284 10A00002 */ beqz $a1, .L80241290 -/* 843E58 80241288 2402003C */ addiu $v0, $zero, 0x3c -/* 843E5C 8024128C AC820070 */ sw $v0, 0x70($a0) -.L80241290: -/* 843E60 80241290 C4620080 */ lwc1 $f2, 0x80($v1) -/* 843E64 80241294 3C0141F0 */ lui $at, 0x41f0 -/* 843E68 80241298 44810000 */ mtc1 $at, $f0 -/* 843E6C 8024129C 00000000 */ nop -/* 843E70 802412A0 46001000 */ add.s $f0, $f2, $f0 -/* 843E74 802412A4 3C0143B4 */ lui $at, 0x43b4 -/* 843E78 802412A8 44811000 */ mtc1 $at, $f2 -/* 843E7C 802412AC 00000000 */ nop -/* 843E80 802412B0 4600103E */ c.le.s $f2, $f0 -/* 843E84 802412B4 00000000 */ nop -/* 843E88 802412B8 45000003 */ bc1f .L802412C8 -/* 843E8C 802412BC E4600080 */ swc1 $f0, 0x80($v1) -/* 843E90 802412C0 46020001 */ sub.s $f0, $f0, $f2 -/* 843E94 802412C4 E4600080 */ swc1 $f0, 0x80($v1) -.L802412C8: -/* 843E98 802412C8 8C820070 */ lw $v0, 0x70($a0) -/* 843E9C 802412CC 2442FFFF */ addiu $v0, $v0, -1 -/* 843EA0 802412D0 AC820070 */ sw $v0, 0x70($a0) -/* 843EA4 802412D4 000217C3 */ sra $v0, $v0, 0x1f -/* 843EA8 802412D8 03E00008 */ jr $ra -/* 843EAC 802412DC 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/func_802414C4_842BD0.s b/asm/nonmatchings/world/area_mac/mac_04/func_802414C4_842BD0.s deleted file mode 100644 index e89262db0c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/func_802414C4_842BD0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414C4_844094 -/* 844094 802414C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 844098 802414C8 3C058024 */ lui $a1, 0x8024 -/* 84409C 802414CC 24A51458 */ addiu $a1, $a1, 0x1458 -/* 8440A0 802414D0 AFBF0010 */ sw $ra, 0x10($sp) -/* 8440A4 802414D4 0C048C8F */ jal bind_dynamic_entity_7 -/* 8440A8 802414D8 0000202D */ daddu $a0, $zero, $zero -/* 8440AC 802414DC 8FBF0010 */ lw $ra, 0x10($sp) -/* 8440B0 802414E0 3C018025 */ lui $at, 0x8025 -/* 8440B4 802414E4 AC22F5A0 */ sw $v0, -0xa60($at) -/* 8440B8 802414E8 24020002 */ addiu $v0, $zero, 2 -/* 8440BC 802414EC 03E00008 */ jr $ra -/* 8440C0 802414F0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/func_80241720_842BD0.s b/asm/nonmatchings/world/area_mac/mac_04/func_80241720_842BD0.s deleted file mode 100644 index afb00658eb..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/func_80241720_842BD0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241720_8442F0 -/* 8442F0 80241720 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8442F4 80241724 AFBF0010 */ sw $ra, 0x10($sp) -/* 8442F8 80241728 10A00003 */ beqz $a1, .L80241738 -/* 8442FC 8024172C 8C86000C */ lw $a2, 0xc($a0) -/* 844300 80241730 3C018024 */ lui $at, 0x8024 -/* 844304 80241734 AC206610 */ sw $zero, 0x6610($at) -.L80241738: -/* 844308 80241738 3C038024 */ lui $v1, 0x8024 -/* 84430C 8024173C 24636610 */ addiu $v1, $v1, 0x6610 -/* 844310 80241740 8C620000 */ lw $v0, ($v1) -/* 844314 80241744 54400003 */ bnel $v0, $zero, .L80241754 -/* 844318 80241748 AC600000 */ sw $zero, ($v1) -/* 84431C 8024174C 080905DA */ j .L80241768 -/* 844320 80241750 0000102D */ daddu $v0, $zero, $zero -.L80241754: -/* 844324 80241754 8CC50000 */ lw $a1, ($a2) -/* 844328 80241758 3C068024 */ lui $a2, 0x8024 -/* 84432C 8024175C 0C0B2026 */ jal set_variable -/* 844330 80241760 8CC66614 */ lw $a2, 0x6614($a2) -/* 844334 80241764 24020002 */ addiu $v0, $zero, 2 -.L80241768: -/* 844338 80241768 8FBF0010 */ lw $ra, 0x10($sp) -/* 84433C 8024176C 03E00008 */ jr $ra -/* 844340 80241770 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/func_80241944_842BD0.s b/asm/nonmatchings/world/area_mac/mac_04/func_80241944_842BD0.s deleted file mode 100644 index 88db0fe7dd..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/func_80241944_842BD0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241944_844514 -/* 844514 80241944 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 844518 80241948 AFBF0010 */ sw $ra, 0x10($sp) -/* 84451C 8024194C 0C03A876 */ jal set_max_SP -/* 844520 80241950 24040004 */ addiu $a0, $zero, 4 -/* 844524 80241954 3C028011 */ lui $v0, %hi(gPlayerData) -/* 844528 80241958 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 84452C 8024195C 90430003 */ lbu $v1, 3($v0) -/* 844530 80241960 90440006 */ lbu $a0, 6($v0) -/* 844534 80241964 A0430002 */ sb $v1, 2($v0) -/* 844538 80241968 0C03A6DB */ jal sync_status_menu -/* 84453C 8024196C A0440005 */ sb $a0, 5($v0) -/* 844540 80241970 8FBF0010 */ lw $ra, 0x10($sp) -/* 844544 80241974 24020002 */ addiu $v0, $zero, 2 -/* 844548 80241978 03E00008 */ jr $ra -/* 84454C 8024197C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/func_80241D30_842BD0.s b/asm/nonmatchings/world/area_mac/mac_04/func_80241D30_842BD0.s deleted file mode 100644 index 866f054a7c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/func_80241D30_842BD0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D30_844900 -/* 844900 80241D30 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 844904 80241D34 3C04800A */ lui $a0, 0x800a -/* 844908 80241D38 8484A634 */ lh $a0, -0x59cc($a0) -/* 84490C 80241D3C 27A20030 */ addiu $v0, $sp, 0x30 -/* 844910 80241D40 AFA20010 */ sw $v0, 0x10($sp) -/* 844914 80241D44 27A20034 */ addiu $v0, $sp, 0x34 -/* 844918 80241D48 AFA20014 */ sw $v0, 0x14($sp) -/* 84491C 80241D4C 27A20038 */ addiu $v0, $sp, 0x38 -/* 844920 80241D50 AFB00040 */ sw $s0, 0x40($sp) -/* 844924 80241D54 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* 844928 80241D58 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* 84492C 80241D5C AFBF0044 */ sw $ra, 0x44($sp) -/* 844930 80241D60 AFA20018 */ sw $v0, 0x18($sp) -/* 844934 80241D64 8E050028 */ lw $a1, 0x28($s0) -/* 844938 80241D68 8E06002C */ lw $a2, 0x2c($s0) -/* 84493C 80241D6C 0C00B94E */ jal get_screen_coords -/* 844940 80241D70 8E070030 */ lw $a3, 0x30($s0) -/* 844944 80241D74 27A40020 */ addiu $a0, $sp, 0x20 -/* 844948 80241D78 AFB00028 */ sw $s0, 0x28($sp) -/* 84494C 80241D7C 820300BE */ lb $v1, 0xbe($s0) -/* 844950 80241D80 8FA50038 */ lw $a1, 0x38($sp) -/* 844954 80241D84 3C028024 */ lui $v0, 0x8024 -/* 844958 80241D88 24421DAC */ addiu $v0, $v0, 0x1dac -/* 84495C 80241D8C AFA2002C */ sw $v0, 0x2c($sp) -/* 844960 80241D90 AFA30020 */ sw $v1, 0x20($sp) -/* 844964 80241D94 0C047644 */ jal queue_render_task -/* 844968 80241D98 AFA50024 */ sw $a1, 0x24($sp) -/* 84496C 80241D9C 8FBF0044 */ lw $ra, 0x44($sp) -/* 844970 80241DA0 8FB00040 */ lw $s0, 0x40($sp) -/* 844974 80241DA4 03E00008 */ jr $ra -/* 844978 80241DA8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/func_802405E8_852170.s b/asm/nonmatchings/world/area_mac/mac_05/func_802405E8_852170.s deleted file mode 100644 index d498b1573d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/func_802405E8_852170.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405E8_852758 -/* 852758 802405E8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 85275C 802405EC AFB20038 */ sw $s2, 0x38($sp) -/* 852760 802405F0 0080902D */ daddu $s2, $a0, $zero -/* 852764 802405F4 AFBF0044 */ sw $ra, 0x44($sp) -/* 852768 802405F8 AFB40040 */ sw $s4, 0x40($sp) -/* 85276C 802405FC AFB3003C */ sw $s3, 0x3c($sp) -/* 852770 80240600 AFB10034 */ sw $s1, 0x34($sp) -/* 852774 80240604 AFB00030 */ sw $s0, 0x30($sp) -/* 852778 80240608 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 85277C 8024060C F7B40048 */ sdc1 $f20, 0x48($sp) -/* 852780 80240610 8E510148 */ lw $s1, 0x148($s2) -/* 852784 80240614 00A0982D */ daddu $s3, $a1, $zero -/* 852788 80240618 86240008 */ lh $a0, 8($s1) -/* 85278C 8024061C 0C00EABB */ jal get_npc_unsafe -/* 852790 80240620 00C0A02D */ daddu $s4, $a2, $zero -/* 852794 80240624 8E630014 */ lw $v1, 0x14($s3) -/* 852798 80240628 04600030 */ bltz $v1, .L802406EC -/* 85279C 8024062C 0040802D */ daddu $s0, $v0, $zero -/* 8527A0 80240630 8E420074 */ lw $v0, 0x74($s2) -/* 8527A4 80240634 1C40002C */ bgtz $v0, .L802406E8 -/* 8527A8 80240638 2442FFFF */ addiu $v0, $v0, -1 -/* 8527AC 8024063C 0280202D */ daddu $a0, $s4, $zero -/* 8527B0 80240640 AE430074 */ sw $v1, 0x74($s2) -/* 8527B4 80240644 AFA00010 */ sw $zero, 0x10($sp) -/* 8527B8 80240648 8E66000C */ lw $a2, 0xc($s3) -/* 8527BC 8024064C 8E670010 */ lw $a3, 0x10($s3) -/* 8527C0 80240650 0C01242D */ jal func_800490B4 -/* 8527C4 80240654 0220282D */ daddu $a1, $s1, $zero -/* 8527C8 80240658 10400021 */ beqz $v0, .L802406E0 -/* 8527CC 8024065C 0000202D */ daddu $a0, $zero, $zero -/* 8527D0 80240660 0200282D */ daddu $a1, $s0, $zero -/* 8527D4 80240664 0000302D */ daddu $a2, $zero, $zero -/* 8527D8 80240668 860300A8 */ lh $v1, 0xa8($s0) -/* 8527DC 8024066C 3C013F80 */ lui $at, 0x3f80 -/* 8527E0 80240670 44810000 */ mtc1 $at, $f0 -/* 8527E4 80240674 3C014000 */ lui $at, 0x4000 -/* 8527E8 80240678 44811000 */ mtc1 $at, $f2 -/* 8527EC 8024067C 3C01C1A0 */ lui $at, 0xc1a0 -/* 8527F0 80240680 44812000 */ mtc1 $at, $f4 -/* 8527F4 80240684 2402000F */ addiu $v0, $zero, 0xf -/* 8527F8 80240688 AFA2001C */ sw $v0, 0x1c($sp) -/* 8527FC 8024068C 44833000 */ mtc1 $v1, $f6 -/* 852800 80240690 00000000 */ nop -/* 852804 80240694 468031A0 */ cvt.s.w $f6, $f6 -/* 852808 80240698 44073000 */ mfc1 $a3, $f6 -/* 85280C 8024069C 27A20028 */ addiu $v0, $sp, 0x28 -/* 852810 802406A0 AFA20020 */ sw $v0, 0x20($sp) -/* 852814 802406A4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 852818 802406A8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 85281C 802406AC 0C01BFA4 */ jal fx_emote -/* 852820 802406B0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 852824 802406B4 0200202D */ daddu $a0, $s0, $zero -/* 852828 802406B8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 85282C 802406BC 0C012530 */ jal func_800494C0 -/* 852830 802406C0 3C060020 */ lui $a2, 0x20 -/* 852834 802406C4 8E220018 */ lw $v0, 0x18($s1) -/* 852838 802406C8 9442002A */ lhu $v0, 0x2a($v0) -/* 85283C 802406CC 30420001 */ andi $v0, $v0, 1 -/* 852840 802406D0 14400064 */ bnez $v0, .L80240864 -/* 852844 802406D4 2402000A */ addiu $v0, $zero, 0xa -/* 852848 802406D8 08090219 */ j .L80240864 -/* 85284C 802406DC 2402000C */ addiu $v0, $zero, 0xc -.L802406E0: -/* 852850 802406E0 8E420074 */ lw $v0, 0x74($s2) -/* 852854 802406E4 2442FFFF */ addiu $v0, $v0, -1 -.L802406E8: -/* 852858 802406E8 AE420074 */ sw $v0, 0x74($s2) -.L802406EC: -/* 85285C 802406EC 8602008C */ lh $v0, 0x8c($s0) -/* 852860 802406F0 1440005D */ bnez $v0, .L80240868 -/* 852864 802406F4 00000000 */ nop -/* 852868 802406F8 C6000018 */ lwc1 $f0, 0x18($s0) -/* 85286C 802406FC 3C014010 */ lui $at, 0x4010 -/* 852870 80240700 44811800 */ mtc1 $at, $f3 -/* 852874 80240704 44801000 */ mtc1 $zero, $f2 -/* 852878 80240708 46000021 */ cvt.d.s $f0, $f0 -/* 85287C 8024070C 4622003C */ c.lt.d $f0, $f2 -/* 852880 80240710 00000000 */ nop -/* 852884 80240714 45000003 */ bc1f .L80240724 -/* 852888 80240718 0200202D */ daddu $a0, $s0, $zero -/* 85288C 8024071C 080901CA */ j .L80240728 -/* 852890 80240720 0000282D */ daddu $a1, $zero, $zero -.L80240724: -/* 852894 80240724 24050001 */ addiu $a1, $zero, 1 -.L80240728: -/* 852898 80240728 0C00F598 */ jal func_8003D660 -/* 85289C 8024072C 00000000 */ nop -/* 8528A0 80240730 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8528A4 80240734 8E430078 */ lw $v1, 0x78($s2) -/* 8528A8 80240738 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8528AC 8024073C 00031040 */ sll $v0, $v1, 1 -/* 8528B0 80240740 00431021 */ addu $v0, $v0, $v1 -/* 8528B4 80240744 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8528B8 80240748 00021080 */ sll $v0, $v0, 2 -/* 8528BC 8024074C 00431021 */ addu $v0, $v0, $v1 -/* 8528C0 80240750 C4560004 */ lwc1 $f22, 4($v0) -/* 8528C4 80240754 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8528C8 80240758 C454000C */ lwc1 $f20, 0xc($v0) -/* 8528CC 8024075C 4680A520 */ cvt.s.w $f20, $f20 -/* 8528D0 80240760 4406B000 */ mfc1 $a2, $f22 -/* 8528D4 80240764 4407A000 */ mfc1 $a3, $f20 -/* 8528D8 80240768 0C00A720 */ jal atan2 -/* 8528DC 8024076C 00000000 */ nop -/* 8528E0 80240770 8E050018 */ lw $a1, 0x18($s0) -/* 8528E4 80240774 44060000 */ mfc1 $a2, $f0 -/* 8528E8 80240778 0200202D */ daddu $a0, $s0, $zero -/* 8528EC 8024077C 0C00EA95 */ jal npc_move_heading -/* 8528F0 80240780 AE06000C */ sw $a2, 0xc($s0) -/* 8528F4 80240784 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8528F8 80240788 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8528FC 8024078C 4406B000 */ mfc1 $a2, $f22 -/* 852900 80240790 4407A000 */ mfc1 $a3, $f20 -/* 852904 80240794 0C00A7B5 */ jal dist2D -/* 852908 80240798 00000000 */ nop -/* 85290C 8024079C C6020018 */ lwc1 $f2, 0x18($s0) -/* 852910 802407A0 4602003E */ c.le.s $f0, $f2 -/* 852914 802407A4 00000000 */ nop -/* 852918 802407A8 4500002F */ bc1f .L80240868 -/* 85291C 802407AC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 852920 802407B0 24020002 */ addiu $v0, $zero, 2 -/* 852924 802407B4 0C00A67F */ jal rand_int -/* 852928 802407B8 AE420070 */ sw $v0, 0x70($s2) -/* 85292C 802407BC 3C035555 */ lui $v1, 0x5555 -/* 852930 802407C0 34635556 */ ori $v1, $v1, 0x5556 -/* 852934 802407C4 00430018 */ mult $v0, $v1 -/* 852938 802407C8 000227C3 */ sra $a0, $v0, 0x1f -/* 85293C 802407CC 00004010 */ mfhi $t0 -/* 852940 802407D0 01042023 */ subu $a0, $t0, $a0 -/* 852944 802407D4 00041840 */ sll $v1, $a0, 1 -/* 852948 802407D8 00641821 */ addu $v1, $v1, $a0 -/* 85294C 802407DC 00431023 */ subu $v0, $v0, $v1 -/* 852950 802407E0 24430002 */ addiu $v1, $v0, 2 -/* 852954 802407E4 AE430074 */ sw $v1, 0x74($s2) -/* 852958 802407E8 8E62002C */ lw $v0, 0x2c($s3) -/* 85295C 802407EC 18400009 */ blez $v0, .L80240814 -/* 852960 802407F0 24020004 */ addiu $v0, $zero, 4 -/* 852964 802407F4 8E620004 */ lw $v0, 4($s3) -/* 852968 802407F8 18400006 */ blez $v0, .L80240814 -/* 85296C 802407FC 24020004 */ addiu $v0, $zero, 4 -/* 852970 80240800 8E620008 */ lw $v0, 8($s3) -/* 852974 80240804 18400003 */ blez $v0, .L80240814 -/* 852978 80240808 24020004 */ addiu $v0, $zero, 4 -/* 85297C 8024080C 14600002 */ bnez $v1, .L80240818 -/* 852980 80240810 00000000 */ nop -.L80240814: -/* 852984 80240814 AE420070 */ sw $v0, 0x70($s2) -.L80240818: -/* 852988 80240818 0C00A67F */ jal rand_int -/* 85298C 8024081C 24042710 */ addiu $a0, $zero, 0x2710 -/* 852990 80240820 3C0351EB */ lui $v1, 0x51eb -/* 852994 80240824 3463851F */ ori $v1, $v1, 0x851f -/* 852998 80240828 00430018 */ mult $v0, $v1 -/* 85299C 8024082C 00021FC3 */ sra $v1, $v0, 0x1f -/* 8529A0 80240830 00004010 */ mfhi $t0 -/* 8529A4 80240834 00082143 */ sra $a0, $t0, 5 -/* 8529A8 80240838 00832023 */ subu $a0, $a0, $v1 -/* 8529AC 8024083C 00041840 */ sll $v1, $a0, 1 -/* 8529B0 80240840 00641821 */ addu $v1, $v1, $a0 -/* 8529B4 80240844 000318C0 */ sll $v1, $v1, 3 -/* 8529B8 80240848 00641821 */ addu $v1, $v1, $a0 -/* 8529BC 8024084C 00031880 */ sll $v1, $v1, 2 -/* 8529C0 80240850 8E640004 */ lw $a0, 4($s3) -/* 8529C4 80240854 00431023 */ subu $v0, $v0, $v1 -/* 8529C8 80240858 0044102A */ slt $v0, $v0, $a0 -/* 8529CC 8024085C 10400002 */ beqz $v0, .L80240868 -/* 8529D0 80240860 24020004 */ addiu $v0, $zero, 4 -.L80240864: -/* 8529D4 80240864 AE420070 */ sw $v0, 0x70($s2) -.L80240868: -/* 8529D8 80240868 8FBF0044 */ lw $ra, 0x44($sp) -/* 8529DC 8024086C 8FB40040 */ lw $s4, 0x40($sp) -/* 8529E0 80240870 8FB3003C */ lw $s3, 0x3c($sp) -/* 8529E4 80240874 8FB20038 */ lw $s2, 0x38($sp) -/* 8529E8 80240878 8FB10034 */ lw $s1, 0x34($sp) -/* 8529EC 8024087C 8FB00030 */ lw $s0, 0x30($sp) -/* 8529F0 80240880 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 8529F4 80240884 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 8529F8 80240888 03E00008 */ jr $ra -/* 8529FC 8024088C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_mac/mac_05/func_8024144C_852170.s b/asm/nonmatchings/world/area_mac/mac_05/func_8024144C_852170.s deleted file mode 100644 index fb3ec316b1..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/func_8024144C_852170.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024144C_8535BC -/* 8535BC 8024144C 3C018015 */ lui $at, %hi(D_80151310) -/* 8535C0 80241450 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 8535C4 80241454 03E00008 */ jr $ra -/* 8535C8 80241458 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_05/func_80241898_852170.s b/asm/nonmatchings/world/area_mac/mac_05/func_80241898_852170.s deleted file mode 100644 index 9f88e678b0..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/func_80241898_852170.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241898_853A08 -/* 853A08 80241898 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 853A0C 8024189C AFB00010 */ sw $s0, 0x10($sp) -/* 853A10 802418A0 0080802D */ daddu $s0, $a0, $zero -/* 853A14 802418A4 AFBF0020 */ sw $ra, 0x20($sp) -/* 853A18 802418A8 AFB3001C */ sw $s3, 0x1c($sp) -/* 853A1C 802418AC AFB20018 */ sw $s2, 0x18($sp) -/* 853A20 802418B0 10A00009 */ beqz $a1, .L802418D8 -/* 853A24 802418B4 AFB10014 */ sw $s1, 0x14($sp) -/* 853A28 802418B8 0000202D */ daddu $a0, $zero, $zero -/* 853A2C 802418BC 0080282D */ daddu $a1, $a0, $zero -/* 853A30 802418C0 0080302D */ daddu $a2, $a0, $zero -/* 853A34 802418C4 0C046F97 */ jal set_background_color_blend -/* 853A38 802418C8 240700FF */ addiu $a3, $zero, 0xff -/* 853A3C 802418CC 240200FF */ addiu $v0, $zero, 0xff -/* 853A40 802418D0 AE020070 */ sw $v0, 0x70($s0) -/* 853A44 802418D4 AE000074 */ sw $zero, 0x74($s0) -.L802418D8: -/* 853A48 802418D8 8E020070 */ lw $v0, 0x70($s0) -/* 853A4C 802418DC 2442FFF8 */ addiu $v0, $v0, -8 -/* 853A50 802418E0 04410002 */ bgez $v0, .L802418EC -/* 853A54 802418E4 AE020070 */ sw $v0, 0x70($s0) -/* 853A58 802418E8 AE000070 */ sw $zero, 0x70($s0) -.L802418EC: -/* 853A5C 802418EC 0000202D */ daddu $a0, $zero, $zero -/* 853A60 802418F0 0080282D */ daddu $a1, $a0, $zero -/* 853A64 802418F4 92070073 */ lbu $a3, 0x73($s0) -/* 853A68 802418F8 0C046F97 */ jal set_background_color_blend -/* 853A6C 802418FC 0080302D */ daddu $a2, $a0, $zero -/* 853A70 80241900 8E020070 */ lw $v0, 0x70($s0) -/* 853A74 80241904 14400006 */ bnez $v0, .L80241920 -/* 853A78 80241908 00000000 */ nop -/* 853A7C 8024190C 8E020074 */ lw $v0, 0x74($s0) -/* 853A80 80241910 14400003 */ bnez $v0, .L80241920 -/* 853A84 80241914 24020001 */ addiu $v0, $zero, 1 -/* 853A88 80241918 0809067B */ j .L802419EC -/* 853A8C 8024191C AE020074 */ sw $v0, 0x74($s0) -.L80241920: -/* 853A90 80241920 8E030074 */ lw $v1, 0x74($s0) -/* 853A94 80241924 24020001 */ addiu $v0, $zero, 1 -/* 853A98 80241928 14620031 */ bne $v1, $v0, .L802419F0 -/* 853A9C 8024192C 0000102D */ daddu $v0, $zero, $zero -/* 853AA0 80241930 0C04760B */ jal func_8011D82C -/* 853AA4 80241934 0000202D */ daddu $a0, $zero, $zero -/* 853AA8 80241938 0000802D */ daddu $s0, $zero, $zero -/* 853AAC 8024193C 2413FFFC */ addiu $s3, $zero, -4 -/* 853AB0 80241940 24120006 */ addiu $s2, $zero, 6 -/* 853AB4 80241944 3C11FF7F */ lui $s1, 0xff7f -/* 853AB8 80241948 3C028015 */ lui $v0, 0x8015 -/* 853ABC 8024194C 8C4212F0 */ lw $v0, 0x12f0($v0) -/* 853AC0 80241950 3631FFFF */ ori $s1, $s1, 0xffff -/* 853AC4 80241954 A0400000 */ sb $zero, ($v0) -.L80241958: -/* 853AC8 80241958 0C00E2B7 */ jal get_npc_by_index -/* 853ACC 8024195C 0200202D */ daddu $a0, $s0, $zero -/* 853AD0 80241960 0040202D */ daddu $a0, $v0, $zero -/* 853AD4 80241964 5080000B */ beql $a0, $zero, .L80241994 -/* 853AD8 80241968 26100001 */ addiu $s0, $s0, 1 -/* 853ADC 8024196C 8C820000 */ lw $v0, ($a0) -/* 853AE0 80241970 50400008 */ beql $v0, $zero, .L80241994 -/* 853AE4 80241974 26100001 */ addiu $s0, $s0, 1 -/* 853AE8 80241978 808300A4 */ lb $v1, 0xa4($a0) -/* 853AEC 8024197C 10730005 */ beq $v1, $s3, .L80241994 -/* 853AF0 80241980 26100001 */ addiu $s0, $s0, 1 -/* 853AF4 80241984 10720003 */ beq $v1, $s2, .L80241994 -/* 853AF8 80241988 00000000 */ nop -/* 853AFC 8024198C 00511024 */ and $v0, $v0, $s1 -/* 853B00 80241990 AC820000 */ sw $v0, ($a0) -.L80241994: -/* 853B04 80241994 2A020040 */ slti $v0, $s0, 0x40 -/* 853B08 80241998 1440FFEF */ bnez $v0, .L80241958 -/* 853B0C 8024199C 00000000 */ nop -/* 853B10 802419A0 0000802D */ daddu $s0, $zero, $zero -/* 853B14 802419A4 3C11F7FF */ lui $s1, 0xf7ff -/* 853B18 802419A8 3631FFFF */ ori $s1, $s1, 0xffff -.L802419AC: -/* 853B1C 802419AC 0C04C3D6 */ jal get_item_entity -/* 853B20 802419B0 0200202D */ daddu $a0, $s0, $zero -/* 853B24 802419B4 0040182D */ daddu $v1, $v0, $zero -/* 853B28 802419B8 10600007 */ beqz $v1, .L802419D8 -/* 853B2C 802419BC 26100001 */ addiu $s0, $s0, 1 -/* 853B30 802419C0 8C640000 */ lw $a0, ($v1) -/* 853B34 802419C4 30820010 */ andi $v0, $a0, 0x10 -/* 853B38 802419C8 10400003 */ beqz $v0, .L802419D8 -/* 853B3C 802419CC 00000000 */ nop -/* 853B40 802419D0 00911024 */ and $v0, $a0, $s1 -/* 853B44 802419D4 AC620000 */ sw $v0, ($v1) -.L802419D8: -/* 853B48 802419D8 2A020100 */ slti $v0, $s0, 0x100 -/* 853B4C 802419DC 1440FFF3 */ bnez $v0, .L802419AC -/* 853B50 802419E0 24020002 */ addiu $v0, $zero, 2 -/* 853B54 802419E4 0809067C */ j .L802419F0 -/* 853B58 802419E8 00000000 */ nop -.L802419EC: -/* 853B5C 802419EC 0000102D */ daddu $v0, $zero, $zero -.L802419F0: -/* 853B60 802419F0 8FBF0020 */ lw $ra, 0x20($sp) -/* 853B64 802419F4 8FB3001C */ lw $s3, 0x1c($sp) -/* 853B68 802419F8 8FB20018 */ lw $s2, 0x18($sp) -/* 853B6C 802419FC 8FB10014 */ lw $s1, 0x14($sp) -/* 853B70 80241A00 8FB00010 */ lw $s0, 0x10($sp) -/* 853B74 80241A04 03E00008 */ jr $ra -/* 853B78 80241A08 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_05/func_80241FA0_852170.s b/asm/nonmatchings/world/area_mac/mac_05/func_80241FA0_852170.s deleted file mode 100644 index 07ecacde2e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/func_80241FA0_852170.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FA0_854110 -/* 854110 80241FA0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 854114 80241FA4 AFB20018 */ sw $s2, 0x18($sp) -/* 854118 80241FA8 0080902D */ daddu $s2, $a0, $zero -/* 85411C 80241FAC AFBF0030 */ sw $ra, 0x30($sp) -/* 854120 80241FB0 AFB7002C */ sw $s7, 0x2c($sp) -/* 854124 80241FB4 AFB60028 */ sw $s6, 0x28($sp) -/* 854128 80241FB8 AFB50024 */ sw $s5, 0x24($sp) -/* 85412C 80241FBC AFB40020 */ sw $s4, 0x20($sp) -/* 854130 80241FC0 AFB3001C */ sw $s3, 0x1c($sp) -/* 854134 80241FC4 AFB10014 */ sw $s1, 0x14($sp) -/* 854138 80241FC8 AFB00010 */ sw $s0, 0x10($sp) -/* 85413C 80241FCC F7B60040 */ sdc1 $f22, 0x40($sp) -/* 854140 80241FD0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 854144 80241FD4 8E50000C */ lw $s0, 0xc($s2) -/* 854148 80241FD8 8E050000 */ lw $a1, ($s0) -/* 85414C 80241FDC 0C0B1EAF */ jal get_variable -/* 854150 80241FE0 26100004 */ addiu $s0, $s0, 4 -/* 854154 80241FE4 8E050000 */ lw $a1, ($s0) -/* 854158 80241FE8 26100004 */ addiu $s0, $s0, 4 -/* 85415C 80241FEC 0240202D */ daddu $a0, $s2, $zero -/* 854160 80241FF0 0C0B1EAF */ jal get_variable -/* 854164 80241FF4 0040B82D */ daddu $s7, $v0, $zero -/* 854168 80241FF8 8E050000 */ lw $a1, ($s0) -/* 85416C 80241FFC 26100004 */ addiu $s0, $s0, 4 -/* 854170 80242000 0240202D */ daddu $a0, $s2, $zero -/* 854174 80242004 0C0B1EAF */ jal get_variable -/* 854178 80242008 0040B02D */ daddu $s6, $v0, $zero -/* 85417C 8024200C 0240202D */ daddu $a0, $s2, $zero -/* 854180 80242010 3C05F4AC */ lui $a1, 0xf4ac -/* 854184 80242014 34A5D481 */ ori $a1, $a1, 0xd481 -/* 854188 80242018 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 85418C 8024201C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 854190 80242020 8E140000 */ lw $s4, ($s0) -/* 854194 80242024 00061880 */ sll $v1, $a2, 2 -/* 854198 80242028 00661821 */ addu $v1, $v1, $a2 -/* 85419C 8024202C 00031880 */ sll $v1, $v1, 2 -/* 8541A0 80242030 00661823 */ subu $v1, $v1, $a2 -/* 8541A4 80242034 000330C0 */ sll $a2, $v1, 3 -/* 8541A8 80242038 00661821 */ addu $v1, $v1, $a2 -/* 8541AC 8024203C 000318C0 */ sll $v1, $v1, 3 -/* 8541B0 80242040 3C01800B */ lui $at, 0x800b -/* 8541B4 80242044 00230821 */ addu $at, $at, $v1 -/* 8541B8 80242048 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8541BC 8024204C 8E150004 */ lw $s5, 4($s0) -/* 8541C0 80242050 4600010D */ trunc.w.s $f4, $f0 -/* 8541C4 80242054 44112000 */ mfc1 $s1, $f4 -/* 8541C8 80242058 0C0B1EAF */ jal get_variable -/* 8541CC 8024205C 0040982D */ daddu $s3, $v0, $zero -/* 8541D0 80242060 4491B000 */ mtc1 $s1, $f22 -/* 8541D4 80242064 00000000 */ nop -/* 8541D8 80242068 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8541DC 8024206C 4600B306 */ mov.s $f12, $f22 -/* 8541E0 80242070 0C00A8D4 */ jal cos_deg -/* 8541E4 80242074 0040802D */ daddu $s0, $v0, $zero -/* 8541E8 80242078 4493A000 */ mtc1 $s3, $f20 -/* 8541EC 8024207C 00000000 */ nop -/* 8541F0 80242080 4680A520 */ cvt.s.w $f20, $f20 -/* 8541F4 80242084 4600A002 */ mul.s $f0, $f20, $f0 -/* 8541F8 80242088 00000000 */ nop -/* 8541FC 8024208C 0240202D */ daddu $a0, $s2, $zero -/* 854200 80242090 44901000 */ mtc1 $s0, $f2 -/* 854204 80242094 00000000 */ nop -/* 854208 80242098 468010A0 */ cvt.s.w $f2, $f2 -/* 85420C 8024209C 46001081 */ sub.s $f2, $f2, $f0 -/* 854210 802420A0 3C05F4AC */ lui $a1, 0xf4ac -/* 854214 802420A4 4600110D */ trunc.w.s $f4, $f2 -/* 854218 802420A8 44102000 */ mfc1 $s0, $f4 -/* 85421C 802420AC 0C0B1EAF */ jal get_variable -/* 854220 802420B0 34A5D483 */ ori $a1, $a1, 0xd483 -/* 854224 802420B4 4600B306 */ mov.s $f12, $f22 -/* 854228 802420B8 0C00A8BB */ jal sin_deg -/* 85422C 802420BC 0040882D */ daddu $s1, $v0, $zero -/* 854230 802420C0 4600A502 */ mul.s $f20, $f20, $f0 -/* 854234 802420C4 00000000 */ nop -/* 854238 802420C8 0240202D */ daddu $a0, $s2, $zero -/* 85423C 802420CC 44910000 */ mtc1 $s1, $f0 -/* 854240 802420D0 00000000 */ nop -/* 854244 802420D4 46800020 */ cvt.s.w $f0, $f0 -/* 854248 802420D8 46140001 */ sub.s $f0, $f0, $f20 -/* 85424C 802420DC 0280282D */ daddu $a1, $s4, $zero -/* 854250 802420E0 02173023 */ subu $a2, $s0, $s7 -/* 854254 802420E4 4600010D */ trunc.w.s $f4, $f0 -/* 854258 802420E8 44102000 */ mfc1 $s0, $f4 -/* 85425C 802420EC 0C0B2026 */ jal set_variable -/* 854260 802420F0 02168023 */ subu $s0, $s0, $s6 -/* 854264 802420F4 0240202D */ daddu $a0, $s2, $zero -/* 854268 802420F8 02A0282D */ daddu $a1, $s5, $zero -/* 85426C 802420FC 0C0B2026 */ jal set_variable -/* 854270 80242100 0200302D */ daddu $a2, $s0, $zero -/* 854274 80242104 8FBF0030 */ lw $ra, 0x30($sp) -/* 854278 80242108 8FB7002C */ lw $s7, 0x2c($sp) -/* 85427C 8024210C 8FB60028 */ lw $s6, 0x28($sp) -/* 854280 80242110 8FB50024 */ lw $s5, 0x24($sp) -/* 854284 80242114 8FB40020 */ lw $s4, 0x20($sp) -/* 854288 80242118 8FB3001C */ lw $s3, 0x1c($sp) -/* 85428C 8024211C 8FB20018 */ lw $s2, 0x18($sp) -/* 854290 80242120 8FB10014 */ lw $s1, 0x14($sp) -/* 854294 80242124 8FB00010 */ lw $s0, 0x10($sp) -/* 854298 80242128 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 85429C 8024212C D7B40038 */ ldc1 $f20, 0x38($sp) -/* 8542A0 80242130 24020002 */ addiu $v0, $zero, 2 -/* 8542A4 80242134 03E00008 */ jr $ra -/* 8542A8 80242138 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/func_80242230_852170.s b/asm/nonmatchings/world/area_mac/mac_05/func_80242230_852170.s deleted file mode 100644 index 0cb1bb647a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/func_80242230_852170.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242230_8543A0 -/* 8543A0 80242230 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8543A4 80242234 AFB10014 */ sw $s1, 0x14($sp) -/* 8543A8 80242238 0080882D */ daddu $s1, $a0, $zero -/* 8543AC 8024223C AFB00010 */ sw $s0, 0x10($sp) -/* 8543B0 80242240 00A0802D */ daddu $s0, $a1, $zero -/* 8543B4 80242244 AFBF001C */ sw $ra, 0x1c($sp) -/* 8543B8 80242248 AFB20018 */ sw $s2, 0x18($sp) -/* 8543BC 8024224C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8543C0 80242250 0C00EABB */ jal get_npc_unsafe -/* 8543C4 80242254 2404FFFC */ addiu $a0, $zero, -4 -/* 8543C8 80242258 12000017 */ beqz $s0, .L802422B8 -/* 8543CC 8024225C 0040902D */ daddu $s2, $v0, $zero -/* 8543D0 80242260 0220202D */ daddu $a0, $s1, $zero -/* 8543D4 80242264 3C05FE36 */ lui $a1, 0xfe36 -/* 8543D8 80242268 0C0B210B */ jal get_float_variable -/* 8543DC 8024226C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8543E0 80242270 0220202D */ daddu $a0, $s1, $zero -/* 8543E4 80242274 3C05FE36 */ lui $a1, 0xfe36 -/* 8543E8 80242278 3C014270 */ lui $at, 0x4270 -/* 8543EC 8024227C 4481A000 */ mtc1 $at, $f20 -/* 8543F0 80242280 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 8543F4 80242284 46140003 */ div.s $f0, $f0, $f20 -/* 8543F8 80242288 0C0B210B */ jal get_float_variable -/* 8543FC 8024228C E6200074 */ swc1 $f0, 0x74($s1) -/* 854400 80242290 0220202D */ daddu $a0, $s1, $zero -/* 854404 80242294 3C05FE36 */ lui $a1, 0xfe36 -/* 854408 80242298 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 85440C 8024229C 46140003 */ div.s $f0, $f0, $f20 -/* 854410 802422A0 0C0B210B */ jal get_float_variable -/* 854414 802422A4 E6200078 */ swc1 $f0, 0x78($s1) -/* 854418 802422A8 46140003 */ div.s $f0, $f0, $f20 -/* 85441C 802422AC 2402003C */ addiu $v0, $zero, 0x3c -/* 854420 802422B0 E620007C */ swc1 $f0, 0x7c($s1) -/* 854424 802422B4 AE220070 */ sw $v0, 0x70($s1) -.L802422B8: -/* 854428 802422B8 C6400038 */ lwc1 $f0, 0x38($s2) -/* 85442C 802422BC C6220074 */ lwc1 $f2, 0x74($s1) -/* 854430 802422C0 46020000 */ add.s $f0, $f0, $f2 -/* 854434 802422C4 E6400038 */ swc1 $f0, 0x38($s2) -/* 854438 802422C8 C640003C */ lwc1 $f0, 0x3c($s2) -/* 85443C 802422CC C6220078 */ lwc1 $f2, 0x78($s1) -/* 854440 802422D0 46020000 */ add.s $f0, $f0, $f2 -/* 854444 802422D4 E640003C */ swc1 $f0, 0x3c($s2) -/* 854448 802422D8 C6400040 */ lwc1 $f0, 0x40($s2) -/* 85444C 802422DC C622007C */ lwc1 $f2, 0x7c($s1) -/* 854450 802422E0 46020000 */ add.s $f0, $f0, $f2 -/* 854454 802422E4 E6400040 */ swc1 $f0, 0x40($s2) -/* 854458 802422E8 8E230070 */ lw $v1, 0x70($s1) -/* 85445C 802422EC 2463FFFF */ addiu $v1, $v1, -1 -/* 854460 802422F0 2C620001 */ sltiu $v0, $v1, 1 -/* 854464 802422F4 AE230070 */ sw $v1, 0x70($s1) -/* 854468 802422F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 85446C 802422FC 8FB20018 */ lw $s2, 0x18($sp) -/* 854470 80242300 8FB10014 */ lw $s1, 0x14($sp) -/* 854474 80242304 8FB00010 */ lw $s0, 0x10($sp) -/* 854478 80242308 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 85447C 8024230C 00021040 */ sll $v0, $v0, 1 -/* 854480 80242310 03E00008 */ jr $ra -/* 854484 80242314 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_05/func_80242384_852170.s b/asm/nonmatchings/world/area_mac/mac_05/func_80242384_852170.s deleted file mode 100644 index a1a8389835..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/func_80242384_852170.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242384_8544F4 -/* 8544F4 80242384 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8544F8 80242388 3C058024 */ lui $a1, 0x8024 -/* 8544FC 8024238C 24A52318 */ addiu $a1, $a1, 0x2318 -/* 854500 80242390 AFBF0010 */ sw $ra, 0x10($sp) -/* 854504 80242394 0C048C8F */ jal bind_dynamic_entity_7 -/* 854508 80242398 0000202D */ daddu $a0, $zero, $zero -/* 85450C 8024239C 8FBF0010 */ lw $ra, 0x10($sp) -/* 854510 802423A0 3C018025 */ lui $at, 0x8025 -/* 854514 802423A4 AC2229D0 */ sw $v0, 0x29d0($at) -/* 854518 802423A8 24020002 */ addiu $v0, $zero, 2 -/* 85451C 802423AC 03E00008 */ jr $ra -/* 854520 802423B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/func_80243088_852170.s b/asm/nonmatchings/world/area_mac/mac_05/func_80243088_852170.s deleted file mode 100644 index b76d36a544..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/func_80243088_852170.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243088_8551F8 -/* 8551F8 80243088 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8551FC 8024308C AFBF0010 */ sw $ra, 0x10($sp) -/* 855200 80243090 8C82000C */ lw $v0, 0xc($a0) -/* 855204 80243094 3C068016 */ lui $a2, 0x8016 -/* 855208 80243098 84C6A552 */ lh $a2, -0x5aae($a2) -/* 85520C 8024309C 0C0B2026 */ jal set_variable -/* 855210 802430A0 8C450000 */ lw $a1, ($v0) -/* 855214 802430A4 8FBF0010 */ lw $ra, 0x10($sp) -/* 855218 802430A8 24020002 */ addiu $v0, $zero, 2 -/* 85521C 802430AC 03E00008 */ jr $ra -/* 855220 802430B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/func_80243380_852170.s b/asm/nonmatchings/world/area_mac/mac_05/func_80243380_852170.s deleted file mode 100644 index c1cbcd0104..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/func_80243380_852170.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243380_8554F0 -/* 8554F0 80243380 3C038011 */ lui $v1, %hi(gPlayerData) -/* 8554F4 80243384 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 8554F8 80243388 8C6202BC */ lw $v0, 0x2bc($v1) -/* 8554FC 8024338C 8C630324 */ lw $v1, 0x324($v1) -/* 855500 80243390 00431023 */ subu $v0, $v0, $v1 -/* 855504 80243394 3C0391A2 */ lui $v1, 0x91a2 -/* 855508 80243398 3463B3C5 */ ori $v1, $v1, 0xb3c5 -/* 85550C 8024339C 00430019 */ multu $v0, $v1 -/* 855510 802433A0 8C830084 */ lw $v1, 0x84($a0) -/* 855514 802433A4 00002810 */ mfhi $a1 -/* 855518 802433A8 000512C2 */ srl $v0, $a1, 0xb -/* 85551C 802433AC 0043102A */ slt $v0, $v0, $v1 -/* 855520 802433B0 AC820084 */ sw $v0, 0x84($a0) -/* 855524 802433B4 03E00008 */ jr $ra -/* 855528 802433B8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_05/func_802433F0_852170.s b/asm/nonmatchings/world/area_mac/mac_05/func_802433F0_852170.s deleted file mode 100644 index c026e134c4..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/func_802433F0_852170.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802433F0_855560 -/* 855560 802433F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 855564 802433F4 0080182D */ daddu $v1, $a0, $zero -/* 855568 802433F8 00A0202D */ daddu $a0, $a1, $zero -/* 85556C 802433FC 2402FFFF */ addiu $v0, $zero, -1 -/* 855570 80243400 14820004 */ bne $a0, $v0, .L80243414 -/* 855574 80243404 AFBF0010 */ sw $ra, 0x10($sp) -/* 855578 80243408 8C64014C */ lw $a0, 0x14c($v1) -/* 85557C 8024340C 08090D0A */ j .L80243428 -/* 855580 80243410 00000000 */ nop -.L80243414: -/* 855584 80243414 3C02EFE8 */ lui $v0, 0xefe8 -/* 855588 80243418 34422080 */ ori $v0, $v0, 0x2080 -/* 85558C 8024341C 0082102A */ slt $v0, $a0, $v0 -/* 855590 80243420 14400003 */ bnez $v0, .L80243430 -/* 855594 80243424 0080102D */ daddu $v0, $a0, $zero -.L80243428: -/* 855598 80243428 0C00EAD2 */ jal get_npc_safe -/* 85559C 8024342C 00000000 */ nop -.L80243430: -/* 8555A0 80243430 8FBF0010 */ lw $ra, 0x10($sp) -/* 8555A4 80243434 03E00008 */ jr $ra -/* 8555A8 80243438 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/func_80243CD4_852170.s b/asm/nonmatchings/world/area_mac/mac_05/func_80243CD4_852170.s deleted file mode 100644 index 27a28326e9..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/func_80243CD4_852170.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243CD4_855E44 -/* 855E44 80243CD4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 855E48 80243CD8 AFB10014 */ sw $s1, 0x14($sp) -/* 855E4C 80243CDC 0080882D */ daddu $s1, $a0, $zero -/* 855E50 80243CE0 AFBF001C */ sw $ra, 0x1c($sp) -/* 855E54 80243CE4 AFB20018 */ sw $s2, 0x18($sp) -/* 855E58 80243CE8 AFB00010 */ sw $s0, 0x10($sp) -/* 855E5C 80243CEC F7B60028 */ sdc1 $f22, 0x28($sp) -/* 855E60 80243CF0 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 855E64 80243CF4 8E30000C */ lw $s0, 0xc($s1) -/* 855E68 80243CF8 8E050000 */ lw $a1, ($s0) -/* 855E6C 80243CFC 0C0B1EAF */ jal get_variable -/* 855E70 80243D00 26100004 */ addiu $s0, $s0, 4 -/* 855E74 80243D04 8E050000 */ lw $a1, ($s0) -/* 855E78 80243D08 26100004 */ addiu $s0, $s0, 4 -/* 855E7C 80243D0C 0220202D */ daddu $a0, $s1, $zero -/* 855E80 80243D10 0C0B210B */ jal get_float_variable -/* 855E84 80243D14 0040902D */ daddu $s2, $v0, $zero -/* 855E88 80243D18 8E050000 */ lw $a1, ($s0) -/* 855E8C 80243D1C 26100004 */ addiu $s0, $s0, 4 -/* 855E90 80243D20 0220202D */ daddu $a0, $s1, $zero -/* 855E94 80243D24 0C0B210B */ jal get_float_variable -/* 855E98 80243D28 46000586 */ mov.s $f22, $f0 -/* 855E9C 80243D2C 0220202D */ daddu $a0, $s1, $zero -/* 855EA0 80243D30 8E050000 */ lw $a1, ($s0) -/* 855EA4 80243D34 0C0B210B */ jal get_float_variable -/* 855EA8 80243D38 46000506 */ mov.s $f20, $f0 -/* 855EAC 80243D3C 8E42000C */ lw $v0, 0xc($s2) -/* 855EB0 80243D40 E4560008 */ swc1 $f22, 8($v0) -/* 855EB4 80243D44 8E42000C */ lw $v0, 0xc($s2) -/* 855EB8 80243D48 E454000C */ swc1 $f20, 0xc($v0) -/* 855EBC 80243D4C 8E43000C */ lw $v1, 0xc($s2) -/* 855EC0 80243D50 E4600010 */ swc1 $f0, 0x10($v1) -/* 855EC4 80243D54 8FBF001C */ lw $ra, 0x1c($sp) -/* 855EC8 80243D58 8FB20018 */ lw $s2, 0x18($sp) -/* 855ECC 80243D5C 8FB10014 */ lw $s1, 0x14($sp) -/* 855ED0 80243D60 8FB00010 */ lw $s0, 0x10($sp) -/* 855ED4 80243D64 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 855ED8 80243D68 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 855EDC 80243D6C 24020002 */ addiu $v0, $zero, 2 -/* 855EE0 80243D70 03E00008 */ jr $ra -/* 855EE4 80243D74 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_06/func_80240124_864B40.s b/asm/nonmatchings/world/area_mac/mac_06/func_80240124_864B40.s deleted file mode 100644 index fbd40a6f91..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/func_80240124_864B40.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_864C64 -/* 864C64 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 864C68 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 864C6C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 864C70 80240130 10A00005 */ beqz $a1, .L80240148 -/* 864C74 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 864C78 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 864C7C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 864C80 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 864C84 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 864C88 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 864C8C 8024014C 1440000E */ bnez $v0, .L80240188 -/* 864C90 80240150 00000000 */ nop -/* 864C94 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 864C98 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 864C9C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 864CA0 80240160 04610004 */ bgez $v1, .L80240174 -/* 864CA4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 864CA8 80240168 3C020002 */ lui $v0, 2 -/* 864CAC 8024016C 08090061 */ j .L80240184 -/* 864CB0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 864CB4 80240174 3C040002 */ lui $a0, 2 -/* 864CB8 80240178 0083102A */ slt $v0, $a0, $v1 -/* 864CBC 8024017C 10400002 */ beqz $v0, .L80240188 -/* 864CC0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 864CC4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 864CC8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 864CCC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 864CD0 80240190 00000000 */ nop -/* 864CD4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 864CD8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 864CDC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 864CE0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 864CE4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 864CE8 802401A8 3C020002 */ lui $v0, 2 -/* 864CEC 802401AC 08090071 */ j .L802401C4 -/* 864CF0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 864CF4 802401B4 3C040002 */ lui $a0, 2 -/* 864CF8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 864CFC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 864D00 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 864D04 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 864D08 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 864D0C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 864D10 802401D0 00000000 */ nop -/* 864D14 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 864D18 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 864D1C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 864D20 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 864D24 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 864D28 802401E8 3C020002 */ lui $v0, 2 -/* 864D2C 802401EC 08090081 */ j .L80240204 -/* 864D30 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 864D34 802401F4 3C040002 */ lui $a0, 2 -/* 864D38 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 864D3C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 864D40 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 864D44 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 864D48 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 864D4C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 864D50 80240210 00000000 */ nop -/* 864D54 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 864D58 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 864D5C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 864D60 80240220 04610004 */ bgez $v1, .L80240234 -/* 864D64 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 864D68 80240228 3C020002 */ lui $v0, 2 -/* 864D6C 8024022C 08090091 */ j .L80240244 -/* 864D70 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 864D74 80240234 3C040002 */ lui $a0, 2 -/* 864D78 80240238 0083102A */ slt $v0, $a0, $v1 -/* 864D7C 8024023C 10400002 */ beqz $v0, .L80240248 -/* 864D80 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 864D84 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 864D88 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 864D8C 8024024C 0C046F07 */ jal set_main_pan_u -/* 864D90 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 864D94 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 864D98 80240258 0C046F0D */ jal set_main_pan_v -/* 864D9C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 864DA0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 864DA4 80240264 0C046F13 */ jal set_aux_pan_u -/* 864DA8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 864DAC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 864DB0 80240270 0C046F19 */ jal set_aux_pan_v -/* 864DB4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 864DB8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 864DBC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 864DC0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 864DC4 80240284 24420001 */ addiu $v0, $v0, 1 -/* 864DC8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 864DCC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 864DD0 80240290 24630001 */ addiu $v1, $v1, 1 -/* 864DD4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 864DD8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 864DDC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 864DE0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 864DE4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 864DE8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 864DEC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 864DF0 802402B0 14600002 */ bnez $v1, .L802402BC -/* 864DF4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 864DF8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 864DFC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 864E00 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 864E04 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 864E08 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 864E0C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 864E10 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 864E14 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 864E18 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 864E1C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 864E20 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 864E24 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 864E28 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 864E2C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 864E30 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 864E34 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 864E38 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 864E3C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 864E40 80240300 0000102D */ daddu $v0, $zero, $zero -/* 864E44 80240304 03E00008 */ jr $ra -/* 864E48 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_06/func_8024030C_864B40.s b/asm/nonmatchings/world/area_mac/mac_06/func_8024030C_864B40.s deleted file mode 100644 index 6201c8ff08..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/func_8024030C_864B40.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_864E4C -/* 864E4C 8024030C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 864E50 80240310 AFB20018 */ sw $s2, 0x18($sp) -/* 864E54 80240314 0080902D */ daddu $s2, $a0, $zero -/* 864E58 80240318 AFBF0028 */ sw $ra, 0x28($sp) -/* 864E5C 8024031C AFB50024 */ sw $s5, 0x24($sp) -/* 864E60 80240320 AFB40020 */ sw $s4, 0x20($sp) -/* 864E64 80240324 AFB3001C */ sw $s3, 0x1c($sp) -/* 864E68 80240328 AFB10014 */ sw $s1, 0x14($sp) -/* 864E6C 8024032C AFB00010 */ sw $s0, 0x10($sp) -/* 864E70 80240330 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 864E74 80240334 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 864E78 80240338 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 864E7C 8024033C 8E50000C */ lw $s0, 0xc($s2) -/* 864E80 80240340 8E140000 */ lw $s4, ($s0) -/* 864E84 80240344 26100004 */ addiu $s0, $s0, 4 -/* 864E88 80240348 0C0B1EAF */ jal get_variable -/* 864E8C 8024034C 0280282D */ daddu $a1, $s4, $zero -/* 864E90 80240350 0040982D */ daddu $s3, $v0, $zero -/* 864E94 80240354 8E150000 */ lw $s5, ($s0) -/* 864E98 80240358 26100004 */ addiu $s0, $s0, 4 -/* 864E9C 8024035C 8E050000 */ lw $a1, ($s0) -/* 864EA0 80240360 26100004 */ addiu $s0, $s0, 4 -/* 864EA4 80240364 0C0B210B */ jal get_float_variable -/* 864EA8 80240368 0240202D */ daddu $a0, $s2, $zero -/* 864EAC 8024036C 8E050000 */ lw $a1, ($s0) -/* 864EB0 80240370 26100004 */ addiu $s0, $s0, 4 -/* 864EB4 80240374 0240202D */ daddu $a0, $s2, $zero -/* 864EB8 80240378 0C0B210B */ jal get_float_variable -/* 864EBC 8024037C 46000606 */ mov.s $f24, $f0 -/* 864EC0 80240380 8E050000 */ lw $a1, ($s0) -/* 864EC4 80240384 26100004 */ addiu $s0, $s0, 4 -/* 864EC8 80240388 0240202D */ daddu $a0, $s2, $zero -/* 864ECC 8024038C 0C0B1EAF */ jal get_variable -/* 864ED0 80240390 46000506 */ mov.s $f20, $f0 -/* 864ED4 80240394 8E050000 */ lw $a1, ($s0) -/* 864ED8 80240398 26100004 */ addiu $s0, $s0, 4 -/* 864EDC 8024039C 0240202D */ daddu $a0, $s2, $zero -/* 864EE0 802403A0 0C0B1EAF */ jal get_variable -/* 864EE4 802403A4 0040882D */ daddu $s1, $v0, $zero -/* 864EE8 802403A8 0240202D */ daddu $a0, $s2, $zero -/* 864EEC 802403AC 8E050000 */ lw $a1, ($s0) -/* 864EF0 802403B0 0C0B210B */ jal get_float_variable -/* 864EF4 802403B4 0040802D */ daddu $s0, $v0, $zero -/* 864EF8 802403B8 4618A501 */ sub.s $f20, $f20, $f24 -/* 864EFC 802403BC 3C013F00 */ lui $at, 0x3f00 -/* 864F00 802403C0 44811000 */ mtc1 $at, $f2 -/* 864F04 802403C4 00000000 */ nop -/* 864F08 802403C8 4602A502 */ mul.s $f20, $f20, $f2 -/* 864F0C 802403CC 00000000 */ nop -/* 864F10 802403D0 12000008 */ beqz $s0, .L802403F4 -/* 864F14 802403D4 46000586 */ mov.s $f22, $f0 -/* 864F18 802403D8 0233102A */ slt $v0, $s1, $s3 -/* 864F1C 802403DC 10400005 */ beqz $v0, .L802403F4 -/* 864F20 802403E0 0240202D */ daddu $a0, $s2, $zero -/* 864F24 802403E4 0220982D */ daddu $s3, $s1, $zero -/* 864F28 802403E8 0280282D */ daddu $a1, $s4, $zero -/* 864F2C 802403EC 0C0B2026 */ jal set_variable -/* 864F30 802403F0 0220302D */ daddu $a2, $s1, $zero -.L802403F4: -/* 864F34 802403F4 3C014334 */ lui $at, 0x4334 -/* 864F38 802403F8 44810000 */ mtc1 $at, $f0 -/* 864F3C 802403FC 44936000 */ mtc1 $s3, $f12 -/* 864F40 80240400 00000000 */ nop -/* 864F44 80240404 46806320 */ cvt.s.w $f12, $f12 -/* 864F48 80240408 46006302 */ mul.s $f12, $f12, $f0 -/* 864F4C 8024040C 00000000 */ nop -/* 864F50 80240410 44910000 */ mtc1 $s1, $f0 -/* 864F54 80240414 00000000 */ nop -/* 864F58 80240418 46800020 */ cvt.s.w $f0, $f0 -/* 864F5C 8024041C 46006303 */ div.s $f12, $f12, $f0 -/* 864F60 80240420 0C00A8D4 */ jal cos_deg -/* 864F64 80240424 46166300 */ add.s $f12, $f12, $f22 -/* 864F68 80240428 4600A002 */ mul.s $f0, $f20, $f0 -/* 864F6C 8024042C 00000000 */ nop -/* 864F70 80240430 4614C080 */ add.s $f2, $f24, $f20 -/* 864F74 80240434 46001081 */ sub.s $f2, $f2, $f0 -/* 864F78 80240438 0240202D */ daddu $a0, $s2, $zero -/* 864F7C 8024043C 44061000 */ mfc1 $a2, $f2 -/* 864F80 80240440 0C0B2190 */ jal set_float_variable -/* 864F84 80240444 02A0282D */ daddu $a1, $s5, $zero -/* 864F88 80240448 8FBF0028 */ lw $ra, 0x28($sp) -/* 864F8C 8024044C 8FB50024 */ lw $s5, 0x24($sp) -/* 864F90 80240450 8FB40020 */ lw $s4, 0x20($sp) -/* 864F94 80240454 8FB3001C */ lw $s3, 0x1c($sp) -/* 864F98 80240458 8FB20018 */ lw $s2, 0x18($sp) -/* 864F9C 8024045C 8FB10014 */ lw $s1, 0x14($sp) -/* 864FA0 80240460 8FB00010 */ lw $s0, 0x10($sp) -/* 864FA4 80240464 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 864FA8 80240468 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 864FAC 8024046C D7B40030 */ ldc1 $f20, 0x30($sp) -/* 864FB0 80240470 24020002 */ addiu $v0, $zero, 2 -/* 864FB4 80240474 03E00008 */ jr $ra -/* 864FB8 80240478 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_06/func_8024047C_864B40.s b/asm/nonmatchings/world/area_mac/mac_06/func_8024047C_864B40.s deleted file mode 100644 index 6d8e22ca67..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/func_8024047C_864B40.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024047C_864FBC -/* 864FBC 8024047C 44800000 */ mtc1 $zero, $f0 -/* 864FC0 80240480 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 864FC4 80240484 44050000 */ mfc1 $a1, $f0 -/* 864FC8 80240488 0000202D */ daddu $a0, $zero, $zero -/* 864FCC 8024048C AFBF0018 */ sw $ra, 0x18($sp) -/* 864FD0 80240490 AFA00014 */ sw $zero, 0x14($sp) -/* 864FD4 80240494 E7A00010 */ swc1 $f0, 0x10($sp) -/* 864FD8 80240498 00A0302D */ daddu $a2, $a1, $zero -/* 864FDC 8024049C 0C01CA54 */ jal func_80072950 -/* 864FE0 802404A0 00A0382D */ daddu $a3, $a1, $zero -/* 864FE4 802404A4 8FBF0018 */ lw $ra, 0x18($sp) -/* 864FE8 802404A8 24020002 */ addiu $v0, $zero, 2 -/* 864FEC 802404AC 03E00008 */ jr $ra -/* 864FF0 802404B0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 864FF4 802404B4 00000000 */ nop -/* 864FF8 802404B8 00000000 */ nop -/* 864FFC 802404BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_06/func_80240E80_864B40.s b/asm/nonmatchings/world/area_mac/mac_06/func_80240E80_864B40.s deleted file mode 100644 index cf4ad8e0f6..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/func_80240E80_864B40.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E80_8659C0 -/* 8659C0 80240E80 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 8659C4 80240E84 AFB3001C */ sw $s3, 0x1c($sp) -/* 8659C8 80240E88 0080982D */ daddu $s3, $a0, $zero -/* 8659CC 80240E8C AFB00010 */ sw $s0, 0x10($sp) -/* 8659D0 80240E90 00A0802D */ daddu $s0, $a1, $zero -/* 8659D4 80240E94 AFBF0020 */ sw $ra, 0x20($sp) -/* 8659D8 80240E98 AFB20018 */ sw $s2, 0x18($sp) -/* 8659DC 80240E9C AFB10014 */ sw $s1, 0x14($sp) -/* 8659E0 80240EA0 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8659E4 80240EA4 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8659E8 80240EA8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8659EC 80240EAC 8E72000C */ lw $s2, 0xc($s3) -/* 8659F0 80240EB0 0C00EAD2 */ jal get_npc_safe -/* 8659F4 80240EB4 0000202D */ daddu $a0, $zero, $zero -/* 8659F8 80240EB8 12000010 */ beqz $s0, .L80240EFC -/* 8659FC 80240EBC 0040882D */ daddu $s1, $v0, $zero -/* 865A00 80240EC0 8E450000 */ lw $a1, ($s2) -/* 865A04 80240EC4 0C0B1EAF */ jal get_variable -/* 865A08 80240EC8 0260202D */ daddu $a0, $s3, $zero -/* 865A0C 80240ECC 0040182D */ daddu $v1, $v0, $zero -/* 865A10 80240ED0 10600006 */ beqz $v1, .L80240EEC -/* 865A14 80240ED4 AE630070 */ sw $v1, 0x70($s3) -/* 865A18 80240ED8 24020001 */ addiu $v0, $zero, 1 -/* 865A1C 80240EDC 10620005 */ beq $v1, $v0, .L80240EF4 -/* 865A20 80240EE0 24020028 */ addiu $v0, $zero, 0x28 -/* 865A24 80240EE4 080903BF */ j .L80240EFC -/* 865A28 80240EE8 AE620074 */ sw $v0, 0x74($s3) -.L80240EEC: -/* 865A2C 80240EEC 080903BE */ j .L80240EF8 -/* 865A30 80240EF0 24020046 */ addiu $v0, $zero, 0x46 -.L80240EF4: -/* 865A34 80240EF4 24020064 */ addiu $v0, $zero, 0x64 -.L80240EF8: -/* 865A38 80240EF8 AE620074 */ sw $v0, 0x74($s3) -.L80240EFC: -/* 865A3C 80240EFC C634000C */ lwc1 $f20, 0xc($s1) -/* 865A40 80240F00 C6760074 */ lwc1 $f22, 0x74($s3) -/* 865A44 80240F04 4680B5A0 */ cvt.s.w $f22, $f22 -/* 865A48 80240F08 4600A507 */ neg.s $f20, $f20 -/* 865A4C 80240F0C 0C00A8BB */ jal sin_deg -/* 865A50 80240F10 4600A306 */ mov.s $f12, $f20 -/* 865A54 80240F14 46160002 */ mul.s $f0, $f0, $f22 -/* 865A58 80240F18 00000000 */ nop -/* 865A5C 80240F1C C6220038 */ lwc1 $f2, 0x38($s1) -/* 865A60 80240F20 3C0141F0 */ lui $at, 0x41f0 -/* 865A64 80240F24 44812000 */ mtc1 $at, $f4 -/* 865A68 80240F28 00000000 */ nop -/* 865A6C 80240F2C 46041080 */ add.s $f2, $f2, $f4 -/* 865A70 80240F30 46001600 */ add.s $f24, $f2, $f0 -/* 865A74 80240F34 0C00A8D4 */ jal cos_deg -/* 865A78 80240F38 4600A306 */ mov.s $f12, $f20 -/* 865A7C 80240F3C 46160002 */ mul.s $f0, $f0, $f22 -/* 865A80 80240F40 00000000 */ nop -/* 865A84 80240F44 24020001 */ addiu $v0, $zero, 1 -/* 865A88 80240F48 C6220040 */ lwc1 $f2, 0x40($s1) -/* 865A8C 80240F4C C624003C */ lwc1 $f4, 0x3c($s1) -/* 865A90 80240F50 46001580 */ add.s $f22, $f2, $f0 -/* 865A94 80240F54 3C014248 */ lui $at, 0x4248 -/* 865A98 80240F58 44810000 */ mtc1 $at, $f0 -/* 865A9C 80240F5C 8E640070 */ lw $a0, 0x70($s3) -/* 865AA0 80240F60 1082001F */ beq $a0, $v0, .L80240FE0 -/* 865AA4 80240F64 46002500 */ add.s $f20, $f4, $f0 -/* 865AA8 80240F68 28820002 */ slti $v0, $a0, 2 -/* 865AAC 80240F6C 10400005 */ beqz $v0, .L80240F84 -/* 865AB0 80240F70 24020002 */ addiu $v0, $zero, 2 -/* 865AB4 80240F74 10800007 */ beqz $a0, .L80240F94 -/* 865AB8 80240F78 0000102D */ daddu $v0, $zero, $zero -/* 865ABC 80240F7C 0809041C */ j .L80241070 -/* 865AC0 80240F80 00000000 */ nop -.L80240F84: -/* 865AC4 80240F84 1082002A */ beq $a0, $v0, .L80241030 -/* 865AC8 80240F88 0000102D */ daddu $v0, $zero, $zero -/* 865ACC 80240F8C 0809041C */ j .L80241070 -/* 865AD0 80240F90 00000000 */ nop -.L80240F94: -/* 865AD4 80240F94 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 865AD8 80240F98 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 865ADC 80240F9C 3C018024 */ lui $at, 0x8024 -/* 865AE0 80240FA0 C4203434 */ lwc1 $f0, 0x3434($at) -/* 865AE4 80240FA4 3C030001 */ lui $v1, 1 -/* 865AE8 80240FA8 4600A000 */ add.s $f0, $f20, $f0 -/* 865AEC 80240FAC E4580028 */ swc1 $f24, 0x28($v0) -/* 865AF0 80240FB0 E4560030 */ swc1 $f22, 0x30($v0) -/* 865AF4 80240FB4 E440002C */ swc1 $f0, 0x2c($v0) -/* 865AF8 80240FB8 C6200038 */ lwc1 $f0, 0x38($s1) -/* 865AFC 80240FBC C622003C */ lwc1 $f2, 0x3c($s1) -/* 865B00 80240FC0 8E220000 */ lw $v0, ($s1) -/* 865B04 80240FC4 C6240040 */ lwc1 $f4, 0x40($s1) -/* 865B08 80240FC8 00431025 */ or $v0, $v0, $v1 -/* 865B0C 80240FCC E620006C */ swc1 $f0, 0x6c($s1) -/* 865B10 80240FD0 E6220070 */ swc1 $f2, 0x70($s1) -/* 865B14 80240FD4 E6240074 */ swc1 $f4, 0x74($s1) -/* 865B18 80240FD8 0809041B */ j .L8024106C -/* 865B1C 80240FDC AE220000 */ sw $v0, ($s1) -.L80240FE0: -/* 865B20 80240FE0 0C00EAD2 */ jal get_npc_safe -/* 865B24 80240FE4 2404FFFC */ addiu $a0, $zero, -4 -/* 865B28 80240FE8 0040202D */ daddu $a0, $v0, $zero -/* 865B2C 80240FEC 54800003 */ bnel $a0, $zero, .L80240FFC -/* 865B30 80240FF0 E4980038 */ swc1 $f24, 0x38($a0) -/* 865B34 80240FF4 0809041C */ j .L80241070 -/* 865B38 80240FF8 24020002 */ addiu $v0, $zero, 2 -.L80240FFC: -/* 865B3C 80240FFC 4600C006 */ mov.s $f0, $f24 -/* 865B40 80241000 E494003C */ swc1 $f20, 0x3c($a0) -/* 865B44 80241004 4600A086 */ mov.s $f2, $f20 -/* 865B48 80241008 E4960040 */ swc1 $f22, 0x40($a0) -/* 865B4C 8024100C 4600B106 */ mov.s $f4, $f22 -/* 865B50 80241010 8C820000 */ lw $v0, ($a0) -/* 865B54 80241014 3C030001 */ lui $v1, 1 -/* 865B58 80241018 E480006C */ swc1 $f0, 0x6c($a0) -/* 865B5C 8024101C E4820070 */ swc1 $f2, 0x70($a0) -/* 865B60 80241020 E4840074 */ swc1 $f4, 0x74($a0) -/* 865B64 80241024 00431025 */ or $v0, $v0, $v1 -/* 865B68 80241028 0809041B */ j .L8024106C -/* 865B6C 8024102C AC820000 */ sw $v0, ($a0) -.L80241030: -/* 865B70 80241030 0C00EAD2 */ jal get_npc_safe -/* 865B74 80241034 24040002 */ addiu $a0, $zero, 2 -/* 865B78 80241038 E4580038 */ swc1 $f24, 0x38($v0) -/* 865B7C 8024103C 4600C006 */ mov.s $f0, $f24 -/* 865B80 80241040 E454003C */ swc1 $f20, 0x3c($v0) -/* 865B84 80241044 4600A086 */ mov.s $f2, $f20 -/* 865B88 80241048 E4560040 */ swc1 $f22, 0x40($v0) -/* 865B8C 8024104C 4600B106 */ mov.s $f4, $f22 -/* 865B90 80241050 8C430000 */ lw $v1, ($v0) -/* 865B94 80241054 3C040001 */ lui $a0, 1 -/* 865B98 80241058 E440006C */ swc1 $f0, 0x6c($v0) -/* 865B9C 8024105C E4420070 */ swc1 $f2, 0x70($v0) -/* 865BA0 80241060 E4440074 */ swc1 $f4, 0x74($v0) -/* 865BA4 80241064 00641825 */ or $v1, $v1, $a0 -/* 865BA8 80241068 AC430000 */ sw $v1, ($v0) -.L8024106C: -/* 865BAC 8024106C 0000102D */ daddu $v0, $zero, $zero -.L80241070: -/* 865BB0 80241070 8FBF0020 */ lw $ra, 0x20($sp) -/* 865BB4 80241074 8FB3001C */ lw $s3, 0x1c($sp) -/* 865BB8 80241078 8FB20018 */ lw $s2, 0x18($sp) -/* 865BBC 8024107C 8FB10014 */ lw $s1, 0x14($sp) -/* 865BC0 80241080 8FB00010 */ lw $s0, 0x10($sp) -/* 865BC4 80241084 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 865BC8 80241088 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 865BCC 8024108C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 865BD0 80241090 03E00008 */ jr $ra -/* 865BD4 80241094 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/machi/_7E7550/func_802401B0.s b/asm/nonmatchings/world/area_mac/machi/_7E7550/func_802401B0.s new file mode 100644 index 0000000000..426a52bb68 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/_7E7550/func_802401B0.s @@ -0,0 +1,85 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401B0 +/* 7E7550 802401B0 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 7E7554 802401B4 AFBF002C */ sw $ra, 0x2c($sp) +/* 7E7558 802401B8 AFB20028 */ sw $s2, 0x28($sp) +/* 7E755C 802401BC AFB10024 */ sw $s1, 0x24($sp) +/* 7E7560 802401C0 AFB00020 */ sw $s0, 0x20($sp) +/* 7E7564 802401C4 F7B60038 */ sdc1 $f22, 0x38($sp) +/* 7E7568 802401C8 F7B40030 */ sdc1 $f20, 0x30($sp) +/* 7E756C 802401CC 8C820148 */ lw $v0, 0x148($a0) +/* 7E7570 802401D0 0C00EABB */ jal get_npc_unsafe +/* 7E7574 802401D4 84440008 */ lh $a0, 8($v0) +/* 7E7578 802401D8 240403E8 */ addiu $a0, $zero, 0x3e8 +/* 7E757C 802401DC 0C00A67F */ jal rand_int +/* 7E7580 802401E0 0040902D */ daddu $s2, $v0, $zero +/* 7E7584 802401E4 284201F4 */ slti $v0, $v0, 0x1f4 +/* 7E7588 802401E8 10400019 */ beqz $v0, .L80240250 +/* 7E758C 802401EC 00000000 */ nop +/* 7E7590 802401F0 0C00A67F */ jal rand_int +/* 7E7594 802401F4 24040004 */ addiu $a0, $zero, 4 +/* 7E7598 802401F8 24420001 */ addiu $v0, $v0, 1 +/* 7E759C 802401FC 4482B000 */ mtc1 $v0, $f22 +/* 7E75A0 80240200 00000000 */ nop +/* 7E75A4 80240204 4680B5A0 */ cvt.s.w $f22, $f22 +/* 7E75A8 80240208 0C00A67F */ jal rand_int +/* 7E75AC 8024020C 24040003 */ addiu $a0, $zero, 3 +/* 7E75B0 80240210 24420005 */ addiu $v0, $v0, 5 +/* 7E75B4 80240214 4482A000 */ mtc1 $v0, $f20 +/* 7E75B8 80240218 00000000 */ nop +/* 7E75BC 8024021C 4680A520 */ cvt.s.w $f20, $f20 +/* 7E75C0 80240220 0C00A67F */ jal rand_int +/* 7E75C4 80240224 24040032 */ addiu $a0, $zero, 0x32 +/* 7E75C8 80240228 24040064 */ addiu $a0, $zero, 0x64 +/* 7E75CC 8024022C 0C00A67F */ jal rand_int +/* 7E75D0 80240230 24500032 */ addiu $s0, $v0, 0x32 +/* 7E75D4 80240234 0240202D */ daddu $a0, $s2, $zero +/* 7E75D8 80240238 2405FFFF */ addiu $a1, $zero, -1 +/* 7E75DC 8024023C 3C068024 */ lui $a2, 0x8024 +/* 7E75E0 80240240 24C61180 */ addiu $a2, $a2, 0x1180 +/* 7E75E4 80240244 4407B000 */ mfc1 $a3, $f22 +/* 7E75E8 80240248 080900AE */ j .L802402B8 +/* 7E75EC 8024024C 24420064 */ addiu $v0, $v0, 0x64 +.L80240250: +/* 7E75F0 80240250 0C00A67F */ jal rand_int +/* 7E75F4 80240254 24040003 */ addiu $a0, $zero, 3 +/* 7E75F8 80240258 24040004 */ addiu $a0, $zero, 4 +/* 7E75FC 8024025C 0C00A67F */ jal rand_int +/* 7E7600 80240260 2451000A */ addiu $s1, $v0, 0xa +/* 7E7604 80240264 24420001 */ addiu $v0, $v0, 1 +/* 7E7608 80240268 4482B000 */ mtc1 $v0, $f22 +/* 7E760C 8024026C 00000000 */ nop +/* 7E7610 80240270 4680B5A0 */ cvt.s.w $f22, $f22 +/* 7E7614 80240274 0C00A67F */ jal rand_int +/* 7E7618 80240278 24040003 */ addiu $a0, $zero, 3 +/* 7E761C 8024027C 24420005 */ addiu $v0, $v0, 5 +/* 7E7620 80240280 4482A000 */ mtc1 $v0, $f20 +/* 7E7624 80240284 00000000 */ nop +/* 7E7628 80240288 4680A520 */ cvt.s.w $f20, $f20 +/* 7E762C 8024028C 0C00A67F */ jal rand_int +/* 7E7630 80240290 24040032 */ addiu $a0, $zero, 0x32 +/* 7E7634 80240294 24040064 */ addiu $a0, $zero, 0x64 +/* 7E7638 80240298 0C00A67F */ jal rand_int +/* 7E763C 8024029C 24500032 */ addiu $s0, $v0, 0x32 +/* 7E7640 802402A0 0240202D */ daddu $a0, $s2, $zero +/* 7E7644 802402A4 0220282D */ daddu $a1, $s1, $zero +/* 7E7648 802402A8 3C068024 */ lui $a2, 0x8024 +/* 7E764C 802402AC 24C61180 */ addiu $a2, $a2, 0x1180 +/* 7E7650 802402B0 4407B000 */ mfc1 $a3, $f22 +/* 7E7654 802402B4 2442000A */ addiu $v0, $v0, 0xa +.L802402B8: +/* 7E7658 802402B8 E7B40010 */ swc1 $f20, 0x10($sp) +/* 7E765C 802402BC AFB00014 */ sw $s0, 0x14($sp) +/* 7E7660 802402C0 0C0177B3 */ jal func_8005DECC +/* 7E7664 802402C4 AFA20018 */ sw $v0, 0x18($sp) +/* 7E7668 802402C8 8FBF002C */ lw $ra, 0x2c($sp) +/* 7E766C 802402CC 8FB20028 */ lw $s2, 0x28($sp) +/* 7E7670 802402D0 8FB10024 */ lw $s1, 0x24($sp) +/* 7E7674 802402D4 8FB00020 */ lw $s0, 0x20($sp) +/* 7E7678 802402D8 D7B60038 */ ldc1 $f22, 0x38($sp) +/* 7E767C 802402DC D7B40030 */ ldc1 $f20, 0x30($sp) +/* 7E7680 802402E0 24020002 */ addiu $v0, $zero, 2 +/* 7E7684 802402E4 03E00008 */ jr $ra +/* 7E7688 802402E8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/machi/_7E7550/func_802402EC.s b/asm/nonmatchings/world/area_mac/machi/_7E7550/func_802402EC.s new file mode 100644 index 0000000000..ebb344bc4f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/_7E7550/func_802402EC.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402EC +/* 7E768C 802402EC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7E7690 802402F0 AFBF0010 */ sw $ra, 0x10($sp) +/* 7E7694 802402F4 8C820148 */ lw $v0, 0x148($a0) +/* 7E7698 802402F8 0C00EABB */ jal get_npc_unsafe +/* 7E769C 802402FC 84440008 */ lh $a0, 8($v0) +/* 7E76A0 80240300 0C0177F5 */ jal func_8005DFD4 +/* 7E76A4 80240304 0040202D */ daddu $a0, $v0, $zero +/* 7E76A8 80240308 8FBF0010 */ lw $ra, 0x10($sp) +/* 7E76AC 8024030C 24020002 */ addiu $v0, $zero, 2 +/* 7E76B0 80240310 03E00008 */ jr $ra +/* 7E76B4 80240314 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/machi/_7E7550/func_80240318.s b/asm/nonmatchings/world/area_mac/machi/_7E7550/func_80240318.s new file mode 100644 index 0000000000..2902a03fc8 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/_7E7550/func_80240318.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240318 +/* 7E76B8 80240318 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7E76BC 8024031C AFBF0010 */ sw $ra, 0x10($sp) +/* 7E76C0 80240320 8C820148 */ lw $v0, 0x148($a0) +/* 7E76C4 80240324 0C00EABB */ jal get_npc_unsafe +/* 7E76C8 80240328 84440008 */ lh $a0, 8($v0) +/* 7E76CC 8024032C 0C01784B */ jal func_8005E12C +/* 7E76D0 80240330 0040202D */ daddu $a0, $v0, $zero +/* 7E76D4 80240334 8FBF0010 */ lw $ra, 0x10($sp) +/* 7E76D8 80240338 24020002 */ addiu $v0, $zero, 2 +/* 7E76DC 8024033C 03E00008 */ jr $ra +/* 7E76E0 80240340 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/machi/_7E7550/func_80240344.s b/asm/nonmatchings/world/area_mac/machi/_7E7550/func_80240344.s new file mode 100644 index 0000000000..12742262e8 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/_7E7550/func_80240344.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240344 +/* 7E76E4 80240344 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7E76E8 80240348 2405000B */ addiu $a1, $zero, 0xb +/* 7E76EC 8024034C 3C028011 */ lui $v0, %hi(gPlayerData) +/* 7E76F0 80240350 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) +/* 7E76F4 80240354 24440058 */ addiu $a0, $v0, 0x58 +/* 7E76F8 80240358 24030005 */ addiu $v1, $zero, 5 +/* 7E76FC 8024035C AFBF0010 */ sw $ra, 0x10($sp) +/* 7E7700 80240360 A0430002 */ sb $v1, 2($v0) +/* 7E7704 80240364 A0430003 */ sb $v1, 3($v0) +/* 7E7708 80240368 2403FFFF */ addiu $v1, $zero, -1 +/* 7E770C 8024036C A0400000 */ sb $zero, ($v0) +/* 7E7710 80240370 A0430001 */ sb $v1, 1($v0) +/* 7E7714 80240374 A040000E */ sb $zero, 0xe($v0) +.L80240378: +/* 7E7718 80240378 A0800014 */ sb $zero, 0x14($a0) +/* 7E771C 8024037C 24A5FFFF */ addiu $a1, $a1, -1 +/* 7E7720 80240380 04A1FFFD */ bgez $a1, .L80240378 +/* 7E7724 80240384 2484FFF8 */ addiu $a0, $a0, -8 +/* 7E7728 80240388 0C03AC5A */ jal func_800EB168 +/* 7E772C 8024038C 0000202D */ daddu $a0, $zero, $zero +/* 7E7730 80240390 8FBF0010 */ lw $ra, 0x10($sp) +/* 7E7734 80240394 24020002 */ addiu $v0, $zero, 2 +/* 7E7738 80240398 03E00008 */ jr $ra +/* 7E773C 8024039C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/machi/_7E7550/func_802403A0.s b/asm/nonmatchings/world/area_mac/machi/_7E7550/func_802403A0.s new file mode 100644 index 0000000000..f16fc0bb44 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/_7E7550/func_802403A0.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403A0 +/* 7E7740 802403A0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E7744 802403A4 AFBF001C */ sw $ra, 0x1c($sp) +/* 7E7748 802403A8 AFB00018 */ sw $s0, 0x18($sp) +/* 7E774C 802403AC 8C820148 */ lw $v0, 0x148($a0) +/* 7E7750 802403B0 0C00EABB */ jal get_npc_unsafe +/* 7E7754 802403B4 84440008 */ lh $a0, 8($v0) +/* 7E7758 802403B8 0040802D */ daddu $s0, $v0, $zero +/* 7E775C 802403BC 0200202D */ daddu $a0, $s0, $zero +/* 7E7760 802403C0 0C00ECF4 */ jal func_8003B3D0 +/* 7E7764 802403C4 24050003 */ addiu $a1, $zero, 3 +/* 7E7768 802403C8 0200202D */ daddu $a0, $s0, $zero +/* 7E776C 802403CC 0000282D */ daddu $a1, $zero, $zero +/* 7E7770 802403D0 24060001 */ addiu $a2, $zero, 1 +/* 7E7774 802403D4 2407001E */ addiu $a3, $zero, 0x1e +/* 7E7778 802403D8 2402000A */ addiu $v0, $zero, 0xa +/* 7E777C 802403DC 0C00ED13 */ jal func_8003B44C +/* 7E7780 802403E0 AFA20010 */ sw $v0, 0x10($sp) +/* 7E7784 802403E4 0200202D */ daddu $a0, $s0, $zero +/* 7E7788 802403E8 2405003C */ addiu $a1, $zero, 0x3c +/* 7E778C 802403EC 24060014 */ addiu $a2, $zero, 0x14 +/* 7E7790 802403F0 0000382D */ daddu $a3, $zero, $zero +/* 7E7794 802403F4 0C00ED19 */ jal func_8003B464 +/* 7E7798 802403F8 AFA00010 */ sw $zero, 0x10($sp) +/* 7E779C 802403FC 8FBF001C */ lw $ra, 0x1c($sp) +/* 7E77A0 80240400 8FB00018 */ lw $s0, 0x18($sp) +/* 7E77A4 80240404 24020002 */ addiu $v0, $zero, 2 +/* 7E77A8 80240408 03E00008 */ jr $ra +/* 7E77AC 8024040C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/machi/_7E7550/func_80240410.s b/asm/nonmatchings/world/area_mac/machi/_7E7550/func_80240410.s new file mode 100644 index 0000000000..e633b4f405 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/_7E7550/func_80240410.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240410 +/* 7E77B0 80240410 24050001 */ addiu $a1, $zero, 1 +/* 7E77B4 80240414 3C028011 */ lui $v0, %hi(gPlayerData) +/* 7E77B8 80240418 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) +/* 7E77BC 8024041C 24440008 */ addiu $a0, $v0, 8 +/* 7E77C0 80240420 24030008 */ addiu $v1, $zero, 8 +/* 7E77C4 80240424 A0430002 */ sb $v1, 2($v0) +/* 7E77C8 80240428 A0430003 */ sb $v1, 3($v0) +/* 7E77CC 8024042C 00A0182D */ daddu $v1, $a1, $zero +/* 7E77D0 80240430 A0400000 */ sb $zero, ($v0) +/* 7E77D4 80240434 A0400001 */ sb $zero, 1($v0) +/* 7E77D8 80240438 A040000E */ sb $zero, 0xe($v0) +/* 7E77DC 8024043C A0430014 */ sb $v1, 0x14($v0) +.L80240440: +/* 7E77E0 80240440 A0800014 */ sb $zero, 0x14($a0) +/* 7E77E4 80240444 24A50001 */ addiu $a1, $a1, 1 +/* 7E77E8 80240448 28A2000C */ slti $v0, $a1, 0xc +/* 7E77EC 8024044C 1440FFFC */ bnez $v0, .L80240440 +/* 7E77F0 80240450 24840008 */ addiu $a0, $a0, 8 +/* 7E77F4 80240454 03E00008 */ jr $ra +/* 7E77F8 80240458 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/machi/_7E7550/func_8024045C.s b/asm/nonmatchings/world/area_mac/machi/_7E7550/func_8024045C.s new file mode 100644 index 0000000000..8b0556b2d8 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/_7E7550/func_8024045C.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024045C +/* 7E77FC 8024045C 2404000B */ addiu $a0, $zero, 0xb +/* 7E7800 80240460 3C058011 */ lui $a1, %hi(gPlayerData) +/* 7E7804 80240464 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) +/* 7E7808 80240468 24A30058 */ addiu $v1, $a1, 0x58 +/* 7E780C 8024046C 0080102D */ daddu $v0, $a0, $zero +/* 7E7810 80240470 A0A20002 */ sb $v0, 2($a1) +/* 7E7814 80240474 A0A20003 */ sb $v0, 3($a1) +/* 7E7818 80240478 A0A00000 */ sb $zero, ($a1) +/* 7E781C 8024047C A0A00001 */ sb $zero, 1($a1) +/* 7E7820 80240480 A0A0000E */ sb $zero, 0xe($a1) +.L80240484: +/* 7E7824 80240484 A0600014 */ sb $zero, 0x14($v1) +/* 7E7828 80240488 2484FFFF */ addiu $a0, $a0, -1 +/* 7E782C 8024048C 0481FFFD */ bgez $a0, .L80240484 +/* 7E7830 80240490 2463FFF8 */ addiu $v1, $v1, -8 +/* 7E7834 80240494 24020001 */ addiu $v0, $zero, 1 +/* 7E7838 80240498 A0A20014 */ sb $v0, 0x14($a1) +/* 7E783C 8024049C A0A2001C */ sb $v0, 0x1c($a1) +/* 7E7840 802404A0 A0A2002C */ sb $v0, 0x2c($a1) +/* 7E7844 802404A4 03E00008 */ jr $ra +/* 7E7848 802404A8 24020002 */ addiu $v0, $zero, 2 +/* 7E784C 802404AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/func_80240020_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/func_80240020_E0E7A0.s deleted file mode 100644 index 44765d72ce..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/func_80240020_E0E7A0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_E0E7C0 -/* E0E7C0 80240020 3C028016 */ lui $v0, 0x8016 -/* E0E7C4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* E0E7C8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* E0E7CC 8024002C 03E00008 */ jr $ra -/* E0E7D0 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/func_80240034_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/func_80240034_E0E7A0.s deleted file mode 100644 index 52656af611..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/func_80240034_E0E7A0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_E0E7D4 -/* E0E7D4 80240034 3C038016 */ lui $v1, 0x8016 -/* E0E7D8 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* E0E7DC 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E0E7E0 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* E0E7E4 80240044 0080802D */ daddu $s0, $a0, $zero -/* E0E7E8 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* E0E7EC 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* E0E7F0 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* E0E7F4 80240054 24020002 */ addiu $v0, $zero, 2 -/* E0E7F8 80240058 08090038 */ j .L802400E0 -/* E0E7FC 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* E0E800 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* E0E804 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* E0E808 80240068 80620040 */ lb $v0, 0x40($v1) -/* E0E80C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* E0E810 80240070 04420001 */ bltzl $v0, .L80240078 -/* E0E814 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* E0E818 80240078 14400003 */ bnez $v0, .L80240088 -/* E0E81C 8024007C 00000000 */ nop -/* E0E820 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* E0E824 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* E0E828 80240088 44822000 */ mtc1 $v0, $f4 -/* E0E82C 8024008C 00000000 */ nop -/* E0E830 80240090 46802120 */ cvt.s.w $f4, $f4 -/* E0E834 80240094 44062000 */ mfc1 $a2, $f4 -/* E0E838 80240098 44872000 */ mtc1 $a3, $f4 -/* E0E83C 8024009C 00000000 */ nop -/* E0E840 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* E0E844 802400A4 44806000 */ mtc1 $zero, $f12 -/* E0E848 802400A8 44072000 */ mfc1 $a3, $f4 -/* E0E84C 802400AC 0C00A720 */ jal atan2 -/* E0E850 802400B0 46006386 */ mov.s $f14, $f12 -/* E0E854 802400B4 3C014270 */ lui $at, 0x4270 -/* E0E858 802400B8 44811000 */ mtc1 $at, $f2 -/* E0E85C 802400BC 00000000 */ nop -/* E0E860 802400C0 4602003C */ c.lt.s $f0, $f2 -/* E0E864 802400C4 00000000 */ nop -/* E0E868 802400C8 45000004 */ bc1f .L802400DC -/* E0E86C 802400CC 24020001 */ addiu $v0, $zero, 1 -/* E0E870 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* E0E874 802400D4 08090038 */ j .L802400E0 -/* E0E878 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* E0E87C 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* E0E880 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* E0E884 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* E0E888 802400E8 03E00008 */ jr $ra -/* E0E88C 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/func_802400F0_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/func_802400F0_E0E7A0.s deleted file mode 100644 index d508313413..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/func_802400F0_E0E7A0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_E0E890 -/* E0E890 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E0E894 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* E0E898 802400F8 0080882D */ daddu $s1, $a0, $zero -/* E0E89C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* E0E8A0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* E0E8A4 80240104 0C016AFA */ jal get_current_map_header -/* E0E8A8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* E0E8AC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* E0E8B0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* E0E8B4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* E0E8B8 80240118 0C0B1EAF */ jal get_variable -/* E0E8BC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* E0E8C0 80240120 0220202D */ daddu $a0, $s1, $zero -/* E0E8C4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* E0E8C8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* E0E8CC 8024012C 00028100 */ sll $s0, $v0, 4 -/* E0E8D0 80240130 02031821 */ addu $v1, $s0, $v1 -/* E0E8D4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* E0E8D8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* E0E8DC 8024013C 44061000 */ mfc1 $a2, $f2 -/* E0E8E0 80240140 0C0B2026 */ jal set_variable -/* E0E8E4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* E0E8E8 80240148 0220202D */ daddu $a0, $s1, $zero -/* E0E8EC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* E0E8F0 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* E0E8F4 80240154 02021021 */ addu $v0, $s0, $v0 -/* E0E8F8 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* E0E8FC 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* E0E900 80240160 44061000 */ mfc1 $a2, $f2 -/* E0E904 80240164 0C0B2026 */ jal set_variable -/* E0E908 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* E0E90C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* E0E910 80240170 8E420014 */ lw $v0, 0x14($s2) -/* E0E914 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* E0E918 80240178 02021021 */ addu $v0, $s0, $v0 -/* E0E91C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* E0E920 80240180 4600008D */ trunc.w.s $f2, $f0 -/* E0E924 80240184 44061000 */ mfc1 $a2, $f2 -/* E0E928 80240188 0C0B2026 */ jal set_variable -/* E0E92C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E0E930 80240190 0220202D */ daddu $a0, $s1, $zero -/* E0E934 80240194 8E420014 */ lw $v0, 0x14($s2) -/* E0E938 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* E0E93C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* E0E940 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* E0E944 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* E0E948 802401A8 44061000 */ mfc1 $a2, $f2 -/* E0E94C 802401AC 0C0B2026 */ jal set_variable -/* E0E950 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* E0E954 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* E0E958 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* E0E95C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* E0E960 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* E0E964 802401C4 24020002 */ addiu $v0, $zero, 2 -/* E0E968 802401C8 03E00008 */ jr $ra -/* E0E96C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/func_802401D0_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/func_802401D0_E0E7A0.s deleted file mode 100644 index 69847dc83e..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/func_802401D0_E0E7A0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_E0E970 -/* E0E970 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* E0E974 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* E0E978 802401D8 3C014334 */ lui $at, 0x4334 -/* E0E97C 802401DC 44816000 */ mtc1 $at, $f12 -/* E0E980 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E0E984 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* E0E988 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* E0E98C 802401EC 00031080 */ sll $v0, $v1, 2 -/* E0E990 802401F0 00431021 */ addu $v0, $v0, $v1 -/* E0E994 802401F4 00021080 */ sll $v0, $v0, 2 -/* E0E998 802401F8 00431023 */ subu $v0, $v0, $v1 -/* E0E99C 802401FC 000218C0 */ sll $v1, $v0, 3 -/* E0E9A0 80240200 00431021 */ addu $v0, $v0, $v1 -/* E0E9A4 80240204 000210C0 */ sll $v0, $v0, 3 -/* E0E9A8 80240208 3C01800B */ lui $at, 0x800b -/* E0E9AC 8024020C 00220821 */ addu $at, $at, $v0 -/* E0E9B0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* E0E9B4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* E0E9B8 80240218 0C00A6C9 */ jal clamp_angle -/* E0E9BC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* E0E9C0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* E0E9C4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* E0E9C8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* E0E9CC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* E0E9D0 80240230 24020002 */ addiu $v0, $zero, 2 -/* E0E9D4 80240234 03E00008 */ jr $ra -/* E0E9D8 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/func_8024023C_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/func_8024023C_E0E7A0.s deleted file mode 100644 index ae700c7939..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/func_8024023C_E0E7A0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_E0E9DC -/* E0E9DC 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E0E9E0 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* E0E9E4 80240244 0080802D */ daddu $s0, $a0, $zero -/* E0E9E8 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* E0E9EC 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* E0E9F0 80240250 8E02000C */ lw $v0, 0xc($s0) -/* E0E9F4 80240254 0C0B210B */ jal get_float_variable -/* E0E9F8 80240258 8C450000 */ lw $a1, ($v0) -/* E0E9FC 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* E0EA00 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* E0EA04 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* E0EA08 80240268 44060000 */ mfc1 $a2, $f0 -/* E0EA0C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* E0EA10 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* E0EA14 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* E0EA18 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* E0EA1C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* E0EA20 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* E0EA24 80240284 0C00A7E7 */ jal add_vec2D_polar -/* E0EA28 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* E0EA2C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* E0EA30 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* E0EA34 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* E0EA38 80240298 0C0B2190 */ jal set_float_variable -/* E0EA3C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* E0EA40 802402A0 0200202D */ daddu $a0, $s0, $zero -/* E0EA44 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* E0EA48 802402A8 4406A000 */ mfc1 $a2, $f20 -/* E0EA4C 802402AC 0C0B2190 */ jal set_float_variable -/* E0EA50 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* E0EA54 802402B4 0200202D */ daddu $a0, $s0, $zero -/* E0EA58 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* E0EA5C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* E0EA60 802402C0 0C0B2190 */ jal set_float_variable -/* E0EA64 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* E0EA68 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* E0EA6C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* E0EA70 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* E0EA74 802402D4 24020002 */ addiu $v0, $zero, 2 -/* E0EA78 802402D8 03E00008 */ jr $ra -/* E0EA7C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/func_802402E0_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/func_802402E0_E0E7A0.s deleted file mode 100644 index a7013eb69c..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/func_802402E0_E0E7A0.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_E0EA80 -/* E0EA80 802402E0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* E0EA84 802402E4 AFB50024 */ sw $s5, 0x24($sp) -/* E0EA88 802402E8 0080A82D */ daddu $s5, $a0, $zero -/* E0EA8C 802402EC AFBF002C */ sw $ra, 0x2c($sp) -/* E0EA90 802402F0 AFB60028 */ sw $s6, 0x28($sp) -/* E0EA94 802402F4 AFB40020 */ sw $s4, 0x20($sp) -/* E0EA98 802402F8 AFB3001C */ sw $s3, 0x1c($sp) -/* E0EA9C 802402FC AFB20018 */ sw $s2, 0x18($sp) -/* E0EAA0 80240300 AFB10014 */ sw $s1, 0x14($sp) -/* E0EAA4 80240304 AFB00010 */ sw $s0, 0x10($sp) -/* E0EAA8 80240308 F7B80040 */ sdc1 $f24, 0x40($sp) -/* E0EAAC 8024030C F7B60038 */ sdc1 $f22, 0x38($sp) -/* E0EAB0 80240310 F7B40030 */ sdc1 $f20, 0x30($sp) -/* E0EAB4 80240314 8EB30148 */ lw $s3, 0x148($s5) -/* E0EAB8 80240318 86640008 */ lh $a0, 8($s3) -/* E0EABC 8024031C 0C00EABB */ jal get_npc_unsafe -/* E0EAC0 80240320 00A0B02D */ daddu $s6, $a1, $zero -/* E0EAC4 80240324 0040A02D */ daddu $s4, $v0, $zero -/* E0EAC8 80240328 AEA00074 */ sw $zero, 0x74($s5) -/* E0EACC 8024032C C6980038 */ lwc1 $f24, 0x38($s4) -/* E0EAD0 80240330 C6960040 */ lwc1 $f22, 0x40($s4) -/* E0EAD4 80240334 0000902D */ daddu $s2, $zero, $zero -/* E0EAD8 80240338 AEA00078 */ sw $zero, 0x78($s5) -/* E0EADC 8024033C 8E6300D0 */ lw $v1, 0xd0($s3) -/* E0EAE0 80240340 8C620000 */ lw $v0, ($v1) -/* E0EAE4 80240344 3C0146FF */ lui $at, 0x46ff -/* E0EAE8 80240348 3421FE00 */ ori $at, $at, 0xfe00 -/* E0EAEC 8024034C 4481A000 */ mtc1 $at, $f20 -/* E0EAF0 80240350 18400018 */ blez $v0, .L802403B4 -/* E0EAF4 80240354 0240802D */ daddu $s0, $s2, $zero -/* E0EAF8 80240358 0240882D */ daddu $s1, $s2, $zero -.L8024035C: -/* E0EAFC 8024035C 02231021 */ addu $v0, $s1, $v1 -/* E0EB00 80240360 4600C306 */ mov.s $f12, $f24 -/* E0EB04 80240364 C4440004 */ lwc1 $f4, 4($v0) -/* E0EB08 80240368 46802120 */ cvt.s.w $f4, $f4 -/* E0EB0C 8024036C 44062000 */ mfc1 $a2, $f4 -/* E0EB10 80240370 C444000C */ lwc1 $f4, 0xc($v0) -/* E0EB14 80240374 46802120 */ cvt.s.w $f4, $f4 -/* E0EB18 80240378 44072000 */ mfc1 $a3, $f4 -/* E0EB1C 8024037C 0C00A7B5 */ jal dist2D -/* E0EB20 80240380 4600B386 */ mov.s $f14, $f22 -/* E0EB24 80240384 4614003C */ c.lt.s $f0, $f20 -/* E0EB28 80240388 00000000 */ nop -/* E0EB2C 8024038C 45000003 */ bc1f .L8024039C -/* E0EB30 80240390 2631000C */ addiu $s1, $s1, 0xc -/* E0EB34 80240394 46000506 */ mov.s $f20, $f0 -/* E0EB38 80240398 AEB20078 */ sw $s2, 0x78($s5) -.L8024039C: -/* E0EB3C 8024039C 8E6300D0 */ lw $v1, 0xd0($s3) -/* E0EB40 802403A0 26100001 */ addiu $s0, $s0, 1 -/* E0EB44 802403A4 8C620000 */ lw $v0, ($v1) -/* E0EB48 802403A8 0202102A */ slt $v0, $s0, $v0 -/* E0EB4C 802403AC 1440FFEB */ bnez $v0, .L8024035C -/* E0EB50 802403B0 26520001 */ addiu $s2, $s2, 1 -.L802403B4: -/* E0EB54 802403B4 8E6200CC */ lw $v0, 0xcc($s3) -/* E0EB58 802403B8 8C420004 */ lw $v0, 4($v0) -/* E0EB5C 802403BC AE820028 */ sw $v0, 0x28($s4) -/* E0EB60 802403C0 8E6200D0 */ lw $v0, 0xd0($s3) -/* E0EB64 802403C4 8C42007C */ lw $v0, 0x7c($v0) -/* E0EB68 802403C8 04410004 */ bgez $v0, .L802403DC -/* E0EB6C 802403CC 00000000 */ nop -/* E0EB70 802403D0 C6C00000 */ lwc1 $f0, ($s6) -/* E0EB74 802403D4 080900FF */ j .L802403FC -/* E0EB78 802403D8 E6800018 */ swc1 $f0, 0x18($s4) -.L802403DC: -/* E0EB7C 802403DC 3C018024 */ lui $at, 0x8024 -/* E0EB80 802403E0 D4223DF0 */ ldc1 $f2, 0x3df0($at) -/* E0EB84 802403E4 44820000 */ mtc1 $v0, $f0 -/* E0EB88 802403E8 00000000 */ nop -/* E0EB8C 802403EC 46800021 */ cvt.d.w $f0, $f0 -/* E0EB90 802403F0 46220003 */ div.d $f0, $f0, $f2 -/* E0EB94 802403F4 46200020 */ cvt.s.d $f0, $f0 -/* E0EB98 802403F8 E6800018 */ swc1 $f0, 0x18($s4) -.L802403FC: -/* E0EB9C 802403FC 24020001 */ addiu $v0, $zero, 1 -/* E0EBA0 80240400 AEA20070 */ sw $v0, 0x70($s5) -/* E0EBA4 80240404 8FBF002C */ lw $ra, 0x2c($sp) -/* E0EBA8 80240408 8FB60028 */ lw $s6, 0x28($sp) -/* E0EBAC 8024040C 8FB50024 */ lw $s5, 0x24($sp) -/* E0EBB0 80240410 8FB40020 */ lw $s4, 0x20($sp) -/* E0EBB4 80240414 8FB3001C */ lw $s3, 0x1c($sp) -/* E0EBB8 80240418 8FB20018 */ lw $s2, 0x18($sp) -/* E0EBBC 8024041C 8FB10014 */ lw $s1, 0x14($sp) -/* E0EBC0 80240420 8FB00010 */ lw $s0, 0x10($sp) -/* E0EBC4 80240424 D7B80040 */ ldc1 $f24, 0x40($sp) -/* E0EBC8 80240428 D7B60038 */ ldc1 $f22, 0x38($sp) -/* E0EBCC 8024042C D7B40030 */ ldc1 $f20, 0x30($sp) -/* E0EBD0 80240430 03E00008 */ jr $ra -/* E0EBD4 80240434 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/func_80240438_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/func_80240438_E0E7A0.s deleted file mode 100644 index 1c3a3a3985..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/func_80240438_E0E7A0.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240438_E0EBD8 -/* E0EBD8 80240438 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* E0EBDC 8024043C AFB20038 */ sw $s2, 0x38($sp) -/* E0EBE0 80240440 0080902D */ daddu $s2, $a0, $zero -/* E0EBE4 80240444 AFBF0044 */ sw $ra, 0x44($sp) -/* E0EBE8 80240448 AFB40040 */ sw $s4, 0x40($sp) -/* E0EBEC 8024044C AFB3003C */ sw $s3, 0x3c($sp) -/* E0EBF0 80240450 AFB10034 */ sw $s1, 0x34($sp) -/* E0EBF4 80240454 AFB00030 */ sw $s0, 0x30($sp) -/* E0EBF8 80240458 F7B60050 */ sdc1 $f22, 0x50($sp) -/* E0EBFC 8024045C F7B40048 */ sdc1 $f20, 0x48($sp) -/* E0EC00 80240460 8E510148 */ lw $s1, 0x148($s2) -/* E0EC04 80240464 00A0982D */ daddu $s3, $a1, $zero -/* E0EC08 80240468 86240008 */ lh $a0, 8($s1) -/* E0EC0C 8024046C 0C00EABB */ jal get_npc_unsafe -/* E0EC10 80240470 00C0A02D */ daddu $s4, $a2, $zero -/* E0EC14 80240474 8E630014 */ lw $v1, 0x14($s3) -/* E0EC18 80240478 04600030 */ bltz $v1, .L8024053C -/* E0EC1C 8024047C 0040802D */ daddu $s0, $v0, $zero -/* E0EC20 80240480 8E420074 */ lw $v0, 0x74($s2) -/* E0EC24 80240484 1C40002C */ bgtz $v0, .L80240538 -/* E0EC28 80240488 2442FFFF */ addiu $v0, $v0, -1 -/* E0EC2C 8024048C 0280202D */ daddu $a0, $s4, $zero -/* E0EC30 80240490 AE430074 */ sw $v1, 0x74($s2) -/* E0EC34 80240494 AFA00010 */ sw $zero, 0x10($sp) -/* E0EC38 80240498 8E66000C */ lw $a2, 0xc($s3) -/* E0EC3C 8024049C 8E670010 */ lw $a3, 0x10($s3) -/* E0EC40 802404A0 0C01242D */ jal func_800490B4 -/* E0EC44 802404A4 0220282D */ daddu $a1, $s1, $zero -/* E0EC48 802404A8 10400021 */ beqz $v0, .L80240530 -/* E0EC4C 802404AC 0000202D */ daddu $a0, $zero, $zero -/* E0EC50 802404B0 0200282D */ daddu $a1, $s0, $zero -/* E0EC54 802404B4 0000302D */ daddu $a2, $zero, $zero -/* E0EC58 802404B8 860300A8 */ lh $v1, 0xa8($s0) -/* E0EC5C 802404BC 3C013F80 */ lui $at, 0x3f80 -/* E0EC60 802404C0 44810000 */ mtc1 $at, $f0 -/* E0EC64 802404C4 3C014000 */ lui $at, 0x4000 -/* E0EC68 802404C8 44811000 */ mtc1 $at, $f2 -/* E0EC6C 802404CC 3C01C1A0 */ lui $at, 0xc1a0 -/* E0EC70 802404D0 44812000 */ mtc1 $at, $f4 -/* E0EC74 802404D4 2402000F */ addiu $v0, $zero, 0xf -/* E0EC78 802404D8 AFA2001C */ sw $v0, 0x1c($sp) -/* E0EC7C 802404DC 44833000 */ mtc1 $v1, $f6 -/* E0EC80 802404E0 00000000 */ nop -/* E0EC84 802404E4 468031A0 */ cvt.s.w $f6, $f6 -/* E0EC88 802404E8 44073000 */ mfc1 $a3, $f6 -/* E0EC8C 802404EC 27A20028 */ addiu $v0, $sp, 0x28 -/* E0EC90 802404F0 AFA20020 */ sw $v0, 0x20($sp) -/* E0EC94 802404F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* E0EC98 802404F8 E7A20014 */ swc1 $f2, 0x14($sp) -/* E0EC9C 802404FC 0C01BFA4 */ jal fx_emote -/* E0ECA0 80240500 E7A40018 */ swc1 $f4, 0x18($sp) -/* E0ECA4 80240504 0200202D */ daddu $a0, $s0, $zero -/* E0ECA8 80240508 240502F4 */ addiu $a1, $zero, 0x2f4 -/* E0ECAC 8024050C 0C012530 */ jal func_800494C0 -/* E0ECB0 80240510 3C060020 */ lui $a2, 0x20 -/* E0ECB4 80240514 8E220018 */ lw $v0, 0x18($s1) -/* E0ECB8 80240518 9442002A */ lhu $v0, 0x2a($v0) -/* E0ECBC 8024051C 30420001 */ andi $v0, $v0, 1 -/* E0ECC0 80240520 14400064 */ bnez $v0, .L802406B4 -/* E0ECC4 80240524 2402000A */ addiu $v0, $zero, 0xa -/* E0ECC8 80240528 080901AD */ j .L802406B4 -/* E0ECCC 8024052C 2402000C */ addiu $v0, $zero, 0xc -.L80240530: -/* E0ECD0 80240530 8E420074 */ lw $v0, 0x74($s2) -/* E0ECD4 80240534 2442FFFF */ addiu $v0, $v0, -1 -.L80240538: -/* E0ECD8 80240538 AE420074 */ sw $v0, 0x74($s2) -.L8024053C: -/* E0ECDC 8024053C 8602008C */ lh $v0, 0x8c($s0) -/* E0ECE0 80240540 1440005D */ bnez $v0, .L802406B8 -/* E0ECE4 80240544 00000000 */ nop -/* E0ECE8 80240548 C6000018 */ lwc1 $f0, 0x18($s0) -/* E0ECEC 8024054C 3C014010 */ lui $at, 0x4010 -/* E0ECF0 80240550 44811800 */ mtc1 $at, $f3 -/* E0ECF4 80240554 44801000 */ mtc1 $zero, $f2 -/* E0ECF8 80240558 46000021 */ cvt.d.s $f0, $f0 -/* E0ECFC 8024055C 4622003C */ c.lt.d $f0, $f2 -/* E0ED00 80240560 00000000 */ nop -/* E0ED04 80240564 45000003 */ bc1f .L80240574 -/* E0ED08 80240568 0200202D */ daddu $a0, $s0, $zero -/* E0ED0C 8024056C 0809015E */ j .L80240578 -/* E0ED10 80240570 0000282D */ daddu $a1, $zero, $zero -.L80240574: -/* E0ED14 80240574 24050001 */ addiu $a1, $zero, 1 -.L80240578: -/* E0ED18 80240578 0C00F598 */ jal func_8003D660 -/* E0ED1C 8024057C 00000000 */ nop -/* E0ED20 80240580 C60C0038 */ lwc1 $f12, 0x38($s0) -/* E0ED24 80240584 8E430078 */ lw $v1, 0x78($s2) -/* E0ED28 80240588 C60E0040 */ lwc1 $f14, 0x40($s0) -/* E0ED2C 8024058C 00031040 */ sll $v0, $v1, 1 -/* E0ED30 80240590 00431021 */ addu $v0, $v0, $v1 -/* E0ED34 80240594 8E2300D0 */ lw $v1, 0xd0($s1) -/* E0ED38 80240598 00021080 */ sll $v0, $v0, 2 -/* E0ED3C 8024059C 00431021 */ addu $v0, $v0, $v1 -/* E0ED40 802405A0 C4560004 */ lwc1 $f22, 4($v0) -/* E0ED44 802405A4 4680B5A0 */ cvt.s.w $f22, $f22 -/* E0ED48 802405A8 C454000C */ lwc1 $f20, 0xc($v0) -/* E0ED4C 802405AC 4680A520 */ cvt.s.w $f20, $f20 -/* E0ED50 802405B0 4406B000 */ mfc1 $a2, $f22 -/* E0ED54 802405B4 4407A000 */ mfc1 $a3, $f20 -/* E0ED58 802405B8 0C00A720 */ jal atan2 -/* E0ED5C 802405BC 00000000 */ nop -/* E0ED60 802405C0 8E050018 */ lw $a1, 0x18($s0) -/* E0ED64 802405C4 44060000 */ mfc1 $a2, $f0 -/* E0ED68 802405C8 0200202D */ daddu $a0, $s0, $zero -/* E0ED6C 802405CC 0C00EA95 */ jal npc_move_heading -/* E0ED70 802405D0 AE06000C */ sw $a2, 0xc($s0) -/* E0ED74 802405D4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* E0ED78 802405D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* E0ED7C 802405DC 4406B000 */ mfc1 $a2, $f22 -/* E0ED80 802405E0 4407A000 */ mfc1 $a3, $f20 -/* E0ED84 802405E4 0C00A7B5 */ jal dist2D -/* E0ED88 802405E8 00000000 */ nop -/* E0ED8C 802405EC C6020018 */ lwc1 $f2, 0x18($s0) -/* E0ED90 802405F0 4602003E */ c.le.s $f0, $f2 -/* E0ED94 802405F4 00000000 */ nop -/* E0ED98 802405F8 4500002F */ bc1f .L802406B8 -/* E0ED9C 802405FC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* E0EDA0 80240600 24020002 */ addiu $v0, $zero, 2 -/* E0EDA4 80240604 0C00A67F */ jal rand_int -/* E0EDA8 80240608 AE420070 */ sw $v0, 0x70($s2) -/* E0EDAC 8024060C 3C035555 */ lui $v1, 0x5555 -/* E0EDB0 80240610 34635556 */ ori $v1, $v1, 0x5556 -/* E0EDB4 80240614 00430018 */ mult $v0, $v1 -/* E0EDB8 80240618 000227C3 */ sra $a0, $v0, 0x1f -/* E0EDBC 8024061C 00004010 */ mfhi $t0 -/* E0EDC0 80240620 01042023 */ subu $a0, $t0, $a0 -/* E0EDC4 80240624 00041840 */ sll $v1, $a0, 1 -/* E0EDC8 80240628 00641821 */ addu $v1, $v1, $a0 -/* E0EDCC 8024062C 00431023 */ subu $v0, $v0, $v1 -/* E0EDD0 80240630 24430002 */ addiu $v1, $v0, 2 -/* E0EDD4 80240634 AE430074 */ sw $v1, 0x74($s2) -/* E0EDD8 80240638 8E62002C */ lw $v0, 0x2c($s3) -/* E0EDDC 8024063C 18400009 */ blez $v0, .L80240664 -/* E0EDE0 80240640 24020004 */ addiu $v0, $zero, 4 -/* E0EDE4 80240644 8E620004 */ lw $v0, 4($s3) -/* E0EDE8 80240648 18400006 */ blez $v0, .L80240664 -/* E0EDEC 8024064C 24020004 */ addiu $v0, $zero, 4 -/* E0EDF0 80240650 8E620008 */ lw $v0, 8($s3) -/* E0EDF4 80240654 18400003 */ blez $v0, .L80240664 -/* E0EDF8 80240658 24020004 */ addiu $v0, $zero, 4 -/* E0EDFC 8024065C 14600002 */ bnez $v1, .L80240668 -/* E0EE00 80240660 00000000 */ nop -.L80240664: -/* E0EE04 80240664 AE420070 */ sw $v0, 0x70($s2) -.L80240668: -/* E0EE08 80240668 0C00A67F */ jal rand_int -/* E0EE0C 8024066C 24042710 */ addiu $a0, $zero, 0x2710 -/* E0EE10 80240670 3C0351EB */ lui $v1, 0x51eb -/* E0EE14 80240674 3463851F */ ori $v1, $v1, 0x851f -/* E0EE18 80240678 00430018 */ mult $v0, $v1 -/* E0EE1C 8024067C 00021FC3 */ sra $v1, $v0, 0x1f -/* E0EE20 80240680 00004010 */ mfhi $t0 -/* E0EE24 80240684 00082143 */ sra $a0, $t0, 5 -/* E0EE28 80240688 00832023 */ subu $a0, $a0, $v1 -/* E0EE2C 8024068C 00041840 */ sll $v1, $a0, 1 -/* E0EE30 80240690 00641821 */ addu $v1, $v1, $a0 -/* E0EE34 80240694 000318C0 */ sll $v1, $v1, 3 -/* E0EE38 80240698 00641821 */ addu $v1, $v1, $a0 -/* E0EE3C 8024069C 00031880 */ sll $v1, $v1, 2 -/* E0EE40 802406A0 8E640004 */ lw $a0, 4($s3) -/* E0EE44 802406A4 00431023 */ subu $v0, $v0, $v1 -/* E0EE48 802406A8 0044102A */ slt $v0, $v0, $a0 -/* E0EE4C 802406AC 10400002 */ beqz $v0, .L802406B8 -/* E0EE50 802406B0 24020004 */ addiu $v0, $zero, 4 -.L802406B4: -/* E0EE54 802406B4 AE420070 */ sw $v0, 0x70($s2) -.L802406B8: -/* E0EE58 802406B8 8FBF0044 */ lw $ra, 0x44($sp) -/* E0EE5C 802406BC 8FB40040 */ lw $s4, 0x40($sp) -/* E0EE60 802406C0 8FB3003C */ lw $s3, 0x3c($sp) -/* E0EE64 802406C4 8FB20038 */ lw $s2, 0x38($sp) -/* E0EE68 802406C8 8FB10034 */ lw $s1, 0x34($sp) -/* E0EE6C 802406CC 8FB00030 */ lw $s0, 0x30($sp) -/* E0EE70 802406D0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* E0EE74 802406D4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* E0EE78 802406D8 03E00008 */ jr $ra -/* E0EE7C 802406DC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/func_802406E0_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/func_802406E0_E0E7A0.s deleted file mode 100644 index 3e80b5fc57..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/func_802406E0_E0E7A0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406E0_E0EE80 -/* E0EE80 802406E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E0EE84 802406E4 AFB3001C */ sw $s3, 0x1c($sp) -/* E0EE88 802406E8 0080982D */ daddu $s3, $a0, $zero -/* E0EE8C 802406EC AFBF0020 */ sw $ra, 0x20($sp) -/* E0EE90 802406F0 AFB20018 */ sw $s2, 0x18($sp) -/* E0EE94 802406F4 AFB10014 */ sw $s1, 0x14($sp) -/* E0EE98 802406F8 AFB00010 */ sw $s0, 0x10($sp) -/* E0EE9C 802406FC 8E720148 */ lw $s2, 0x148($s3) -/* E0EEA0 80240700 86440008 */ lh $a0, 8($s2) -/* E0EEA4 80240704 0C00EABB */ jal get_npc_unsafe -/* E0EEA8 80240708 00A0882D */ daddu $s1, $a1, $zero -/* E0EEAC 8024070C 8E240008 */ lw $a0, 8($s1) -/* E0EEB0 80240710 0040802D */ daddu $s0, $v0, $zero -/* E0EEB4 80240714 00041FC2 */ srl $v1, $a0, 0x1f -/* E0EEB8 80240718 00832021 */ addu $a0, $a0, $v1 -/* E0EEBC 8024071C 00042043 */ sra $a0, $a0, 1 -/* E0EEC0 80240720 0C00A67F */ jal rand_int -/* E0EEC4 80240724 24840001 */ addiu $a0, $a0, 1 -/* E0EEC8 80240728 8E230008 */ lw $v1, 8($s1) -/* E0EECC 8024072C 240400B4 */ addiu $a0, $zero, 0xb4 -/* E0EED0 80240730 00032FC2 */ srl $a1, $v1, 0x1f -/* E0EED4 80240734 00651821 */ addu $v1, $v1, $a1 -/* E0EED8 80240738 00031843 */ sra $v1, $v1, 1 -/* E0EEDC 8024073C 00621821 */ addu $v1, $v1, $v0 -/* E0EEE0 80240740 0C00A67F */ jal rand_int -/* E0EEE4 80240744 A603008E */ sh $v1, 0x8e($s0) -/* E0EEE8 80240748 C60C000C */ lwc1 $f12, 0xc($s0) -/* E0EEEC 8024074C 44820000 */ mtc1 $v0, $f0 -/* E0EEF0 80240750 00000000 */ nop -/* E0EEF4 80240754 46800020 */ cvt.s.w $f0, $f0 -/* E0EEF8 80240758 46006300 */ add.s $f12, $f12, $f0 -/* E0EEFC 8024075C 3C0142B4 */ lui $at, 0x42b4 -/* E0EF00 80240760 44810000 */ mtc1 $at, $f0 -/* E0EF04 80240764 0C00A6C9 */ jal clamp_angle -/* E0EF08 80240768 46006301 */ sub.s $f12, $f12, $f0 -/* E0EF0C 8024076C E600000C */ swc1 $f0, 0xc($s0) -/* E0EF10 80240770 8E4200CC */ lw $v0, 0xcc($s2) -/* E0EF14 80240774 8C420000 */ lw $v0, ($v0) -/* E0EF18 80240778 AE020028 */ sw $v0, 0x28($s0) -/* E0EF1C 8024077C 24020003 */ addiu $v0, $zero, 3 -/* E0EF20 80240780 AE620070 */ sw $v0, 0x70($s3) -/* E0EF24 80240784 8FBF0020 */ lw $ra, 0x20($sp) -/* E0EF28 80240788 8FB3001C */ lw $s3, 0x1c($sp) -/* E0EF2C 8024078C 8FB20018 */ lw $s2, 0x18($sp) -/* E0EF30 80240790 8FB10014 */ lw $s1, 0x14($sp) -/* E0EF34 80240794 8FB00010 */ lw $s0, 0x10($sp) -/* E0EF38 80240798 03E00008 */ jr $ra -/* E0EF3C 8024079C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/func_802407A0_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/func_802407A0_E0E7A0.s deleted file mode 100644 index e32dd35cd1..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/func_802407A0_E0E7A0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A0_E0EF40 -/* E0EF40 802407A0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* E0EF44 802407A4 AFB40040 */ sw $s4, 0x40($sp) -/* E0EF48 802407A8 0080A02D */ daddu $s4, $a0, $zero -/* E0EF4C 802407AC AFBF0044 */ sw $ra, 0x44($sp) -/* E0EF50 802407B0 AFB3003C */ sw $s3, 0x3c($sp) -/* E0EF54 802407B4 AFB20038 */ sw $s2, 0x38($sp) -/* E0EF58 802407B8 AFB10034 */ sw $s1, 0x34($sp) -/* E0EF5C 802407BC AFB00030 */ sw $s0, 0x30($sp) -/* E0EF60 802407C0 8E910148 */ lw $s1, 0x148($s4) -/* E0EF64 802407C4 00A0902D */ daddu $s2, $a1, $zero -/* E0EF68 802407C8 86240008 */ lh $a0, 8($s1) -/* E0EF6C 802407CC 0C00EABB */ jal get_npc_unsafe -/* E0EF70 802407D0 00C0982D */ daddu $s3, $a2, $zero -/* E0EF74 802407D4 8E430014 */ lw $v1, 0x14($s2) -/* E0EF78 802407D8 04600031 */ bltz $v1, .L802408A0 -/* E0EF7C 802407DC 0040802D */ daddu $s0, $v0, $zero -/* E0EF80 802407E0 0260202D */ daddu $a0, $s3, $zero -/* E0EF84 802407E4 AFA00010 */ sw $zero, 0x10($sp) -/* E0EF88 802407E8 8E460024 */ lw $a2, 0x24($s2) -/* E0EF8C 802407EC 8E470028 */ lw $a3, 0x28($s2) -/* E0EF90 802407F0 0C01242D */ jal func_800490B4 -/* E0EF94 802407F4 0220282D */ daddu $a1, $s1, $zero -/* E0EF98 802407F8 10400029 */ beqz $v0, .L802408A0 -/* E0EF9C 802407FC 0000202D */ daddu $a0, $zero, $zero -/* E0EFA0 80240800 0200282D */ daddu $a1, $s0, $zero -/* E0EFA4 80240804 0000302D */ daddu $a2, $zero, $zero -/* E0EFA8 80240808 860300A8 */ lh $v1, 0xa8($s0) -/* E0EFAC 8024080C 3C013F80 */ lui $at, 0x3f80 -/* E0EFB0 80240810 44810000 */ mtc1 $at, $f0 -/* E0EFB4 80240814 3C014000 */ lui $at, 0x4000 -/* E0EFB8 80240818 44811000 */ mtc1 $at, $f2 -/* E0EFBC 8024081C 3C01C1A0 */ lui $at, 0xc1a0 -/* E0EFC0 80240820 44812000 */ mtc1 $at, $f4 -/* E0EFC4 80240824 2402000F */ addiu $v0, $zero, 0xf -/* E0EFC8 80240828 AFA2001C */ sw $v0, 0x1c($sp) -/* E0EFCC 8024082C 44833000 */ mtc1 $v1, $f6 -/* E0EFD0 80240830 00000000 */ nop -/* E0EFD4 80240834 468031A0 */ cvt.s.w $f6, $f6 -/* E0EFD8 80240838 44073000 */ mfc1 $a3, $f6 -/* E0EFDC 8024083C 27A20028 */ addiu $v0, $sp, 0x28 -/* E0EFE0 80240840 AFA20020 */ sw $v0, 0x20($sp) -/* E0EFE4 80240844 E7A00010 */ swc1 $f0, 0x10($sp) -/* E0EFE8 80240848 E7A20014 */ swc1 $f2, 0x14($sp) -/* E0EFEC 8024084C 0C01BFA4 */ jal fx_emote -/* E0EFF0 80240850 E7A40018 */ swc1 $f4, 0x18($sp) -/* E0EFF4 80240854 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E0EFF8 80240858 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E0EFFC 8024085C C60C0038 */ lwc1 $f12, 0x38($s0) -/* E0F000 80240860 C60E0040 */ lwc1 $f14, 0x40($s0) -/* E0F004 80240864 8C460028 */ lw $a2, 0x28($v0) -/* E0F008 80240868 0C00A720 */ jal atan2 -/* E0F00C 8024086C 8C470030 */ lw $a3, 0x30($v0) -/* E0F010 80240870 0200202D */ daddu $a0, $s0, $zero -/* E0F014 80240874 240502F4 */ addiu $a1, $zero, 0x2f4 -/* E0F018 80240878 3C060020 */ lui $a2, 0x20 -/* E0F01C 8024087C 0C012530 */ jal func_800494C0 -/* E0F020 80240880 E480000C */ swc1 $f0, 0xc($a0) -/* E0F024 80240884 8E220018 */ lw $v0, 0x18($s1) -/* E0F028 80240888 9442002A */ lhu $v0, 0x2a($v0) -/* E0F02C 8024088C 30420001 */ andi $v0, $v0, 1 -/* E0F030 80240890 14400029 */ bnez $v0, .L80240938 -/* E0F034 80240894 2402000A */ addiu $v0, $zero, 0xa -/* E0F038 80240898 0809024E */ j .L80240938 -/* E0F03C 8024089C 2402000C */ addiu $v0, $zero, 0xc -.L802408A0: -/* E0F040 802408A0 8602008C */ lh $v0, 0x8c($s0) -/* E0F044 802408A4 14400025 */ bnez $v0, .L8024093C -/* E0F048 802408A8 00000000 */ nop -/* E0F04C 802408AC 9602008E */ lhu $v0, 0x8e($s0) -/* E0F050 802408B0 2442FFFF */ addiu $v0, $v0, -1 -/* E0F054 802408B4 A602008E */ sh $v0, 0x8e($s0) -/* E0F058 802408B8 00021400 */ sll $v0, $v0, 0x10 -/* E0F05C 802408BC 1440001F */ bnez $v0, .L8024093C -/* E0F060 802408C0 00000000 */ nop -/* E0F064 802408C4 8E820074 */ lw $v0, 0x74($s4) -/* E0F068 802408C8 2442FFFF */ addiu $v0, $v0, -1 -/* E0F06C 802408CC 10400019 */ beqz $v0, .L80240934 -/* E0F070 802408D0 AE820074 */ sw $v0, 0x74($s4) -/* E0F074 802408D4 8E220018 */ lw $v0, 0x18($s1) -/* E0F078 802408D8 9442002A */ lhu $v0, 0x2a($v0) -/* E0F07C 802408DC 30420010 */ andi $v0, $v0, 0x10 -/* E0F080 802408E0 14400007 */ bnez $v0, .L80240900 -/* E0F084 802408E4 00000000 */ nop -/* E0F088 802408E8 C600000C */ lwc1 $f0, 0xc($s0) -/* E0F08C 802408EC 3C014334 */ lui $at, 0x4334 -/* E0F090 802408F0 44816000 */ mtc1 $at, $f12 -/* E0F094 802408F4 0C00A6C9 */ jal clamp_angle -/* E0F098 802408F8 460C0300 */ add.s $f12, $f0, $f12 -/* E0F09C 802408FC E600000C */ swc1 $f0, 0xc($s0) -.L80240900: -/* E0F0A0 80240900 8E440008 */ lw $a0, 8($s2) -/* E0F0A4 80240904 000417C2 */ srl $v0, $a0, 0x1f -/* E0F0A8 80240908 00822021 */ addu $a0, $a0, $v0 -/* E0F0AC 8024090C 00042043 */ sra $a0, $a0, 1 -/* E0F0B0 80240910 0C00A67F */ jal rand_int -/* E0F0B4 80240914 24840001 */ addiu $a0, $a0, 1 -/* E0F0B8 80240918 8E430008 */ lw $v1, 8($s2) -/* E0F0BC 8024091C 000327C2 */ srl $a0, $v1, 0x1f -/* E0F0C0 80240920 00641821 */ addu $v1, $v1, $a0 -/* E0F0C4 80240924 00031843 */ sra $v1, $v1, 1 -/* E0F0C8 80240928 00621821 */ addu $v1, $v1, $v0 -/* E0F0CC 8024092C 0809024F */ j .L8024093C -/* E0F0D0 80240930 A603008E */ sh $v1, 0x8e($s0) -.L80240934: -/* E0F0D4 80240934 24020004 */ addiu $v0, $zero, 4 -.L80240938: -/* E0F0D8 80240938 AE820070 */ sw $v0, 0x70($s4) -.L8024093C: -/* E0F0DC 8024093C 8FBF0044 */ lw $ra, 0x44($sp) -/* E0F0E0 80240940 8FB40040 */ lw $s4, 0x40($sp) -/* E0F0E4 80240944 8FB3003C */ lw $s3, 0x3c($sp) -/* E0F0E8 80240948 8FB20038 */ lw $s2, 0x38($sp) -/* E0F0EC 8024094C 8FB10034 */ lw $s1, 0x34($sp) -/* E0F0F0 80240950 8FB00030 */ lw $s0, 0x30($sp) -/* E0F0F4 80240954 03E00008 */ jr $ra -/* E0F0F8 80240958 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/func_8024095C_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/func_8024095C_E0E7A0.s deleted file mode 100644 index c04453147c..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/func_8024095C_E0E7A0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024095C_E0F0FC -/* E0F0FC 8024095C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E0F100 80240960 AFB10014 */ sw $s1, 0x14($sp) -/* E0F104 80240964 0080882D */ daddu $s1, $a0, $zero -/* E0F108 80240968 AFBF001C */ sw $ra, 0x1c($sp) -/* E0F10C 8024096C AFB20018 */ sw $s2, 0x18($sp) -/* E0F110 80240970 AFB00010 */ sw $s0, 0x10($sp) -/* E0F114 80240974 8E300148 */ lw $s0, 0x148($s1) -/* E0F118 80240978 86040008 */ lh $a0, 8($s0) -/* E0F11C 8024097C 0C00EABB */ jal get_npc_unsafe -/* E0F120 80240980 00A0902D */ daddu $s2, $a1, $zero -/* E0F124 80240984 8E230078 */ lw $v1, 0x78($s1) -/* E0F128 80240988 24630001 */ addiu $v1, $v1, 1 -/* E0F12C 8024098C AE230078 */ sw $v1, 0x78($s1) -/* E0F130 80240990 8E0400D0 */ lw $a0, 0xd0($s0) -/* E0F134 80240994 8C840000 */ lw $a0, ($a0) -/* E0F138 80240998 0064182A */ slt $v1, $v1, $a0 -/* E0F13C 8024099C 14600002 */ bnez $v1, .L802409A8 -/* E0F140 802409A0 0040282D */ daddu $a1, $v0, $zero -/* E0F144 802409A4 AE200078 */ sw $zero, 0x78($s1) -.L802409A8: -/* E0F148 802409A8 8E0200CC */ lw $v0, 0xcc($s0) -/* E0F14C 802409AC 8C420004 */ lw $v0, 4($v0) -/* E0F150 802409B0 ACA20028 */ sw $v0, 0x28($a1) -/* E0F154 802409B4 8E0200D0 */ lw $v0, 0xd0($s0) -/* E0F158 802409B8 8C42007C */ lw $v0, 0x7c($v0) -/* E0F15C 802409BC 04410004 */ bgez $v0, .L802409D0 -/* E0F160 802409C0 00000000 */ nop -/* E0F164 802409C4 C6400000 */ lwc1 $f0, ($s2) -/* E0F168 802409C8 0809027C */ j .L802409F0 -/* E0F16C 802409CC E4A00018 */ swc1 $f0, 0x18($a1) -.L802409D0: -/* E0F170 802409D0 3C018024 */ lui $at, 0x8024 -/* E0F174 802409D4 D4223DF8 */ ldc1 $f2, 0x3df8($at) -/* E0F178 802409D8 44820000 */ mtc1 $v0, $f0 -/* E0F17C 802409DC 00000000 */ nop -/* E0F180 802409E0 46800021 */ cvt.d.w $f0, $f0 -/* E0F184 802409E4 46220003 */ div.d $f0, $f0, $f2 -/* E0F188 802409E8 46200020 */ cvt.s.d $f0, $f0 -/* E0F18C 802409EC E4A00018 */ swc1 $f0, 0x18($a1) -.L802409F0: -/* E0F190 802409F0 24020001 */ addiu $v0, $zero, 1 -/* E0F194 802409F4 AE220070 */ sw $v0, 0x70($s1) -/* E0F198 802409F8 8FBF001C */ lw $ra, 0x1c($sp) -/* E0F19C 802409FC 8FB20018 */ lw $s2, 0x18($sp) -/* E0F1A0 80240A00 8FB10014 */ lw $s1, 0x14($sp) -/* E0F1A4 80240A04 8FB00010 */ lw $s0, 0x10($sp) -/* E0F1A8 80240A08 03E00008 */ jr $ra -/* E0F1AC 80240A0C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/func_80240A10_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/func_80240A10_E0E7A0.s deleted file mode 100644 index ddfa46214b..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/func_80240A10_E0E7A0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A10_E0F1B0 -/* E0F1B0 80240A10 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E0F1B4 80240A14 AFB10014 */ sw $s1, 0x14($sp) -/* E0F1B8 80240A18 0080882D */ daddu $s1, $a0, $zero -/* E0F1BC 80240A1C AFBF0018 */ sw $ra, 0x18($sp) -/* E0F1C0 80240A20 AFB00010 */ sw $s0, 0x10($sp) -/* E0F1C4 80240A24 8E300148 */ lw $s0, 0x148($s1) -/* E0F1C8 80240A28 0C00EABB */ jal get_npc_unsafe -/* E0F1CC 80240A2C 86040008 */ lh $a0, 8($s0) -/* E0F1D0 80240A30 8E0300CC */ lw $v1, 0xcc($s0) -/* E0F1D4 80240A34 3C014120 */ lui $at, 0x4120 -/* E0F1D8 80240A38 44812000 */ mtc1 $at, $f4 -/* E0F1DC 80240A3C 3C014000 */ lui $at, 0x4000 -/* E0F1E0 80240A40 44810000 */ mtc1 $at, $f0 -/* E0F1E4 80240A44 C442003C */ lwc1 $f2, 0x3c($v0) -/* E0F1E8 80240A48 8C640010 */ lw $a0, 0x10($v1) -/* E0F1EC 80240A4C 8C430000 */ lw $v1, ($v0) -/* E0F1F0 80240A50 E444001C */ swc1 $f4, 0x1c($v0) -/* E0F1F4 80240A54 E4400014 */ swc1 $f0, 0x14($v0) -/* E0F1F8 80240A58 E4420064 */ swc1 $f2, 0x64($v0) -/* E0F1FC 80240A5C 34630800 */ ori $v1, $v1, 0x800 -/* E0F200 80240A60 AC430000 */ sw $v1, ($v0) -/* E0F204 80240A64 AC440028 */ sw $a0, 0x28($v0) -/* E0F208 80240A68 2402000B */ addiu $v0, $zero, 0xb -/* E0F20C 80240A6C AE220070 */ sw $v0, 0x70($s1) -/* E0F210 80240A70 8FBF0018 */ lw $ra, 0x18($sp) -/* E0F214 80240A74 8FB10014 */ lw $s1, 0x14($sp) -/* E0F218 80240A78 8FB00010 */ lw $s0, 0x10($sp) -/* E0F21C 80240A7C 03E00008 */ jr $ra -/* E0F220 80240A80 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/func_80240A84_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/func_80240A84_E0E7A0.s deleted file mode 100644 index faba66310b..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/func_80240A84_E0E7A0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A84_E0F224 -/* E0F224 80240A84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E0F228 80240A88 AFB00010 */ sw $s0, 0x10($sp) -/* E0F22C 80240A8C 0080802D */ daddu $s0, $a0, $zero -/* E0F230 80240A90 AFBF0014 */ sw $ra, 0x14($sp) -/* E0F234 80240A94 8E020148 */ lw $v0, 0x148($s0) -/* E0F238 80240A98 0C00EABB */ jal get_npc_unsafe -/* E0F23C 80240A9C 84440008 */ lh $a0, 8($v0) -/* E0F240 80240AA0 0040202D */ daddu $a0, $v0, $zero -/* E0F244 80240AA4 C482003C */ lwc1 $f2, 0x3c($a0) -/* E0F248 80240AA8 C480001C */ lwc1 $f0, 0x1c($a0) -/* E0F24C 80240AAC 46001080 */ add.s $f2, $f2, $f0 -/* E0F250 80240AB0 C4840014 */ lwc1 $f4, 0x14($a0) -/* E0F254 80240AB4 46040001 */ sub.s $f0, $f0, $f4 -/* E0F258 80240AB8 C4840064 */ lwc1 $f4, 0x64($a0) -/* E0F25C 80240ABC 4602203C */ c.lt.s $f4, $f2 -/* E0F260 80240AC0 E482003C */ swc1 $f2, 0x3c($a0) -/* E0F264 80240AC4 45010009 */ bc1t .L80240AEC -/* E0F268 80240AC8 E480001C */ swc1 $f0, 0x1c($a0) -/* E0F26C 80240ACC 8C820000 */ lw $v0, ($a0) -/* E0F270 80240AD0 2403F7FF */ addiu $v1, $zero, -0x801 -/* E0F274 80240AD4 E484003C */ swc1 $f4, 0x3c($a0) -/* E0F278 80240AD8 AC80001C */ sw $zero, 0x1c($a0) -/* E0F27C 80240ADC 00431024 */ and $v0, $v0, $v1 -/* E0F280 80240AE0 AC820000 */ sw $v0, ($a0) -/* E0F284 80240AE4 2402000C */ addiu $v0, $zero, 0xc -/* E0F288 80240AE8 AE020070 */ sw $v0, 0x70($s0) -.L80240AEC: -/* E0F28C 80240AEC 8FBF0014 */ lw $ra, 0x14($sp) -/* E0F290 80240AF0 8FB00010 */ lw $s0, 0x10($sp) -/* E0F294 80240AF4 03E00008 */ jr $ra -/* E0F298 80240AF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/func_80240C2C_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/func_80240C2C_E0E7A0.s deleted file mode 100644 index 7a17d014d0..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/func_80240C2C_E0E7A0.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C2C_E0F3CC -/* E0F3CC 80240C2C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* E0F3D0 80240C30 AFB3003C */ sw $s3, 0x3c($sp) -/* E0F3D4 80240C34 0080982D */ daddu $s3, $a0, $zero -/* E0F3D8 80240C38 AFBF0040 */ sw $ra, 0x40($sp) -/* E0F3DC 80240C3C AFB20038 */ sw $s2, 0x38($sp) -/* E0F3E0 80240C40 AFB10034 */ sw $s1, 0x34($sp) -/* E0F3E4 80240C44 AFB00030 */ sw $s0, 0x30($sp) -/* E0F3E8 80240C48 8E720148 */ lw $s2, 0x148($s3) -/* E0F3EC 80240C4C 00A0882D */ daddu $s1, $a1, $zero -/* E0F3F0 80240C50 86440008 */ lh $a0, 8($s2) -/* E0F3F4 80240C54 0C00EABB */ jal get_npc_unsafe -/* E0F3F8 80240C58 00C0802D */ daddu $s0, $a2, $zero -/* E0F3FC 80240C5C 0200202D */ daddu $a0, $s0, $zero -/* E0F400 80240C60 0240282D */ daddu $a1, $s2, $zero -/* E0F404 80240C64 24030001 */ addiu $v1, $zero, 1 -/* E0F408 80240C68 AFA30010 */ sw $v1, 0x10($sp) -/* E0F40C 80240C6C 8E260024 */ lw $a2, 0x24($s1) -/* E0F410 80240C70 8E270028 */ lw $a3, 0x28($s1) -/* E0F414 80240C74 0C01242D */ jal func_800490B4 -/* E0F418 80240C78 0040802D */ daddu $s0, $v0, $zero -/* E0F41C 80240C7C 1440001E */ bnez $v0, .L80240CF8 -/* E0F420 80240C80 0200202D */ daddu $a0, $s0, $zero -/* E0F424 80240C84 24040002 */ addiu $a0, $zero, 2 -/* E0F428 80240C88 0200282D */ daddu $a1, $s0, $zero -/* E0F42C 80240C8C 0000302D */ daddu $a2, $zero, $zero -/* E0F430 80240C90 860300A8 */ lh $v1, 0xa8($s0) -/* E0F434 80240C94 3C013F80 */ lui $at, 0x3f80 -/* E0F438 80240C98 44810000 */ mtc1 $at, $f0 -/* E0F43C 80240C9C 3C014000 */ lui $at, 0x4000 -/* E0F440 80240CA0 44811000 */ mtc1 $at, $f2 -/* E0F444 80240CA4 3C01C1A0 */ lui $at, 0xc1a0 -/* E0F448 80240CA8 44812000 */ mtc1 $at, $f4 -/* E0F44C 80240CAC 2402000F */ addiu $v0, $zero, 0xf -/* E0F450 80240CB0 AFA2001C */ sw $v0, 0x1c($sp) -/* E0F454 80240CB4 44833000 */ mtc1 $v1, $f6 -/* E0F458 80240CB8 00000000 */ nop -/* E0F45C 80240CBC 468031A0 */ cvt.s.w $f6, $f6 -/* E0F460 80240CC0 44073000 */ mfc1 $a3, $f6 -/* E0F464 80240CC4 27A20028 */ addiu $v0, $sp, 0x28 -/* E0F468 80240CC8 AFA20020 */ sw $v0, 0x20($sp) -/* E0F46C 80240CCC E7A00010 */ swc1 $f0, 0x10($sp) -/* E0F470 80240CD0 E7A20014 */ swc1 $f2, 0x14($sp) -/* E0F474 80240CD4 0C01BFA4 */ jal fx_emote -/* E0F478 80240CD8 E7A40018 */ swc1 $f4, 0x18($sp) -/* E0F47C 80240CDC 8E4200CC */ lw $v0, 0xcc($s2) -/* E0F480 80240CE0 8C430000 */ lw $v1, ($v0) -/* E0F484 80240CE4 24020019 */ addiu $v0, $zero, 0x19 -/* E0F488 80240CE8 A602008E */ sh $v0, 0x8e($s0) -/* E0F48C 80240CEC 2402000E */ addiu $v0, $zero, 0xe -/* E0F490 80240CF0 0809034B */ j .L80240D2C -/* E0F494 80240CF4 AE030028 */ sw $v1, 0x28($s0) -.L80240CF8: -/* E0F498 80240CF8 0C00F598 */ jal func_8003D660 -/* E0F49C 80240CFC 24050001 */ addiu $a1, $zero, 1 -/* E0F4A0 80240D00 8E050018 */ lw $a1, 0x18($s0) -/* E0F4A4 80240D04 8E06000C */ lw $a2, 0xc($s0) -/* E0F4A8 80240D08 0C00EA95 */ jal npc_move_heading -/* E0F4AC 80240D0C 0200202D */ daddu $a0, $s0, $zero -/* E0F4B0 80240D10 8602008E */ lh $v0, 0x8e($s0) -/* E0F4B4 80240D14 9603008E */ lhu $v1, 0x8e($s0) -/* E0F4B8 80240D18 18400003 */ blez $v0, .L80240D28 -/* E0F4BC 80240D1C 2462FFFF */ addiu $v0, $v1, -1 -/* E0F4C0 80240D20 0809034C */ j .L80240D30 -/* E0F4C4 80240D24 A602008E */ sh $v0, 0x8e($s0) -.L80240D28: -/* E0F4C8 80240D28 2402000C */ addiu $v0, $zero, 0xc -.L80240D2C: -/* E0F4CC 80240D2C AE620070 */ sw $v0, 0x70($s3) -.L80240D30: -/* E0F4D0 80240D30 8FBF0040 */ lw $ra, 0x40($sp) -/* E0F4D4 80240D34 8FB3003C */ lw $s3, 0x3c($sp) -/* E0F4D8 80240D38 8FB20038 */ lw $s2, 0x38($sp) -/* E0F4DC 80240D3C 8FB10034 */ lw $s1, 0x34($sp) -/* E0F4E0 80240D40 8FB00030 */ lw $s0, 0x30($sp) -/* E0F4E4 80240D44 03E00008 */ jr $ra -/* E0F4E8 80240D48 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/func_80241170_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/func_80241170_E0E7A0.s deleted file mode 100644 index f2522bb485..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/func_80241170_E0E7A0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241170_E0F910 -/* E0F910 80241170 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E0F914 80241174 AFB10014 */ sw $s1, 0x14($sp) -/* E0F918 80241178 0080882D */ daddu $s1, $a0, $zero -/* E0F91C 8024117C AFB00010 */ sw $s0, 0x10($sp) -/* E0F920 80241180 0000802D */ daddu $s0, $zero, $zero -/* E0F924 80241184 AFBF0018 */ sw $ra, 0x18($sp) -/* E0F928 80241188 0C039D91 */ jal find_item -/* E0F92C 8024118C 2404007C */ addiu $a0, $zero, 0x7c -/* E0F930 80241190 04400003 */ bltz $v0, .L802411A0 -/* E0F934 80241194 00000000 */ nop -/* E0F938 80241198 0809046C */ j .L802411B0 -/* E0F93C 8024119C 24100002 */ addiu $s0, $zero, 2 -.L802411A0: -/* E0F940 802411A0 0C039D91 */ jal find_item -/* E0F944 802411A4 2404007B */ addiu $a0, $zero, 0x7b -/* E0F948 802411A8 04430001 */ bgezl $v0, .L802411B0 -/* E0F94C 802411AC 24100001 */ addiu $s0, $zero, 1 -.L802411B0: -/* E0F950 802411B0 0220202D */ daddu $a0, $s1, $zero -/* E0F954 802411B4 3C05FE36 */ lui $a1, 0xfe36 -/* E0F958 802411B8 34A53C85 */ ori $a1, $a1, 0x3c85 -/* E0F95C 802411BC 0C0B2026 */ jal set_variable -/* E0F960 802411C0 0200302D */ daddu $a2, $s0, $zero -/* E0F964 802411C4 8FBF0018 */ lw $ra, 0x18($sp) -/* E0F968 802411C8 8FB10014 */ lw $s1, 0x14($sp) -/* E0F96C 802411CC 8FB00010 */ lw $s0, 0x10($sp) -/* E0F970 802411D0 24020002 */ addiu $v0, $zero, 2 -/* E0F974 802411D4 03E00008 */ jr $ra -/* E0F978 802411D8 27BD0020 */ addiu $sp, $sp, 0x20 -/* E0F97C 802411DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/func_80241540_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/func_80241540_E0E7A0.s deleted file mode 100644 index c60e4cd0f0..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/func_80241540_E0E7A0.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241540_E0FCE0 -/* E0FCE0 80241540 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E0FCE4 80241544 0000202D */ daddu $a0, $zero, $zero -/* E0FCE8 80241548 3C05FD05 */ lui $a1, 0xfd05 -/* E0FCEC 8024154C 34A50F8A */ ori $a1, $a1, 0xf8a -/* E0FCF0 80241550 AFBF0020 */ sw $ra, 0x20($sp) -/* E0FCF4 80241554 AFB1001C */ sw $s1, 0x1c($sp) -/* E0FCF8 80241558 0C0B1EAF */ jal get_variable -/* E0FCFC 8024155C AFB00018 */ sw $s0, 0x18($sp) -/* E0FD00 80241560 0040802D */ daddu $s0, $v0, $zero -/* E0FD04 80241564 8E030000 */ lw $v1, ($s0) -/* E0FD08 80241568 2C620005 */ sltiu $v0, $v1, 5 -/* E0FD0C 8024156C 1040004C */ beqz $v0, .L802416A0 -/* E0FD10 80241570 00031080 */ sll $v0, $v1, 2 -/* E0FD14 80241574 3C018024 */ lui $at, 0x8024 -/* E0FD18 80241578 00220821 */ addu $at, $at, $v0 -/* E0FD1C 8024157C 8C223FA0 */ lw $v0, 0x3fa0($at) -/* E0FD20 80241580 00400008 */ jr $v0 -/* E0FD24 80241584 00000000 */ nop -/* E0FD28 80241588 2404021C */ addiu $a0, $zero, 0x21c -/* E0FD2C 8024158C 0000282D */ daddu $a1, $zero, $zero -/* E0FD30 80241590 00A0302D */ daddu $a2, $a1, $zero -/* E0FD34 80241594 24020001 */ addiu $v0, $zero, 1 -/* E0FD38 80241598 AE000004 */ sw $zero, 4($s0) -/* E0FD3C 8024159C 0C015478 */ jal func_800551E0 -/* E0FD40 802415A0 AE020000 */ sw $v0, ($s0) -/* E0FD44 802415A4 3C054200 */ lui $a1, 0x4200 -/* E0FD48 802415A8 8E020004 */ lw $v0, 4($s0) -/* E0FD4C 802415AC 3C06437F */ lui $a2, 0x437f -/* E0FD50 802415B0 24420001 */ addiu $v0, $v0, 1 -/* E0FD54 802415B4 AE020004 */ sw $v0, 4($s0) -/* E0FD58 802415B8 24020005 */ addiu $v0, $zero, 5 -/* E0FD5C 802415BC AFA20010 */ sw $v0, 0x10($sp) -/* E0FD60 802415C0 8E070004 */ lw $a3, 4($s0) -/* E0FD64 802415C4 0C00A8ED */ jal update_lerp -/* E0FD68 802415C8 0000202D */ daddu $a0, $zero, $zero -/* E0FD6C 802415CC 8E020004 */ lw $v0, 4($s0) -/* E0FD70 802415D0 4600008D */ trunc.w.s $f2, $f0 -/* E0FD74 802415D4 44031000 */ mfc1 $v1, $f2 -/* E0FD78 802415D8 00000000 */ nop -/* E0FD7C 802415DC AE03000C */ sw $v1, 0xc($s0) -/* E0FD80 802415E0 28420005 */ slti $v0, $v0, 5 -/* E0FD84 802415E4 1440002E */ bnez $v0, .L802416A0 -/* E0FD88 802415E8 AE030010 */ sw $v1, 0x10($s0) -/* E0FD8C 802415EC 24020002 */ addiu $v0, $zero, 2 -/* E0FD90 802415F0 AE020000 */ sw $v0, ($s0) -/* E0FD94 802415F4 240200FF */ addiu $v0, $zero, 0xff -/* E0FD98 802415F8 AE02000C */ sw $v0, 0xc($s0) -/* E0FD9C 802415FC 080905A8 */ j .L802416A0 -/* E0FDA0 80241600 AE020010 */ sw $v0, 0x10($s0) -/* E0FDA4 80241604 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* E0FDA8 80241608 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* E0FDAC 8024160C 240200FF */ addiu $v0, $zero, 0xff -/* E0FDB0 80241610 AE02000C */ sw $v0, 0xc($s0) -/* E0FDB4 80241614 AE020010 */ sw $v0, 0x10($s0) -/* E0FDB8 80241618 8C620000 */ lw $v0, ($v1) -/* E0FDBC 8024161C 3042C000 */ andi $v0, $v0, 0xc000 -/* E0FDC0 80241620 10400002 */ beqz $v0, .L8024162C -/* E0FDC4 80241624 24020003 */ addiu $v0, $zero, 3 -/* E0FDC8 80241628 AE020000 */ sw $v0, ($s0) -.L8024162C: -/* E0FDCC 8024162C 8E030000 */ lw $v1, ($s0) -/* E0FDD0 80241630 24020003 */ addiu $v0, $zero, 3 -/* E0FDD4 80241634 1462001A */ bne $v1, $v0, .L802416A0 -/* E0FDD8 80241638 00000000 */ nop -/* E0FDDC 8024163C 240400CA */ addiu $a0, $zero, 0xca -/* E0FDE0 80241640 0000282D */ daddu $a1, $zero, $zero -/* E0FDE4 80241644 00A0302D */ daddu $a2, $a1, $zero -/* E0FDE8 80241648 24020004 */ addiu $v0, $zero, 4 -/* E0FDEC 8024164C AE000004 */ sw $zero, 4($s0) -/* E0FDF0 80241650 0C015478 */ jal func_800551E0 -/* E0FDF4 80241654 AE020000 */ sw $v0, ($s0) -/* E0FDF8 80241658 0000202D */ daddu $a0, $zero, $zero -/* E0FDFC 8024165C C6000010 */ lwc1 $f0, 0x10($s0) -/* E0FE00 80241660 46800020 */ cvt.s.w $f0, $f0 -/* E0FE04 80241664 24110005 */ addiu $s1, $zero, 5 -/* E0FE08 80241668 8E020004 */ lw $v0, 4($s0) -/* E0FE0C 8024166C 44050000 */ mfc1 $a1, $f0 -/* E0FE10 80241670 24420001 */ addiu $v0, $v0, 1 -/* E0FE14 80241674 AE020004 */ sw $v0, 4($s0) -/* E0FE18 80241678 AFB10010 */ sw $s1, 0x10($sp) -/* E0FE1C 8024167C 8E070004 */ lw $a3, 4($s0) -/* E0FE20 80241680 0C00A8ED */ jal update_lerp -/* E0FE24 80241684 0000302D */ daddu $a2, $zero, $zero -/* E0FE28 80241688 8E020004 */ lw $v0, 4($s0) -/* E0FE2C 8024168C 4600008D */ trunc.w.s $f2, $f0 -/* E0FE30 80241690 E602000C */ swc1 $f2, 0xc($s0) -/* E0FE34 80241694 0051102A */ slt $v0, $v0, $s1 -/* E0FE38 80241698 50400001 */ beql $v0, $zero, .L802416A0 -/* E0FE3C 8024169C AE110000 */ sw $s1, ($s0) -.L802416A0: -/* E0FE40 802416A0 8E05000C */ lw $a1, 0xc($s0) -/* E0FE44 802416A4 0C090478 */ jal func_802411E0 -/* E0FE48 802416A8 0200202D */ daddu $a0, $s0, $zero -/* E0FE4C 802416AC 8FBF0020 */ lw $ra, 0x20($sp) -/* E0FE50 802416B0 8FB1001C */ lw $s1, 0x1c($sp) -/* E0FE54 802416B4 8FB00018 */ lw $s0, 0x18($sp) -/* E0FE58 802416B8 03E00008 */ jr $ra -/* E0FE5C 802416BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/func_802416C0_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/func_802416C0_E0E7A0.s deleted file mode 100644 index 95b0cc2f47..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/func_802416C0_E0E7A0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416C0_E0FE60 -/* E0FE60 802416C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E0FE64 802416C4 2402002D */ addiu $v0, $zero, 0x2d -/* E0FE68 802416C8 AFA20010 */ sw $v0, 0x10($sp) -/* E0FE6C 802416CC 3C028024 */ lui $v0, 0x8024 -/* E0FE70 802416D0 24421540 */ addiu $v0, $v0, 0x1540 -/* E0FE74 802416D4 27A40010 */ addiu $a0, $sp, 0x10 -/* E0FE78 802416D8 AFBF0020 */ sw $ra, 0x20($sp) -/* E0FE7C 802416DC AFA00018 */ sw $zero, 0x18($sp) -/* E0FE80 802416E0 AFA2001C */ sw $v0, 0x1c($sp) -/* E0FE84 802416E4 0C047644 */ jal queue_render_task -/* E0FE88 802416E8 AFA00014 */ sw $zero, 0x14($sp) -/* E0FE8C 802416EC 8FBF0020 */ lw $ra, 0x20($sp) -/* E0FE90 802416F0 03E00008 */ jr $ra -/* E0FE94 802416F4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/func_802416F8_E0E7A0.s b/asm/nonmatchings/world/area_mgm/mgm_00/func_802416F8_E0E7A0.s deleted file mode 100644 index 964ba79493..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/func_802416F8_E0E7A0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416F8_E0FE98 -/* E0FE98 802416F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E0FE9C 802416FC AFB10014 */ sw $s1, 0x14($sp) -/* E0FEA0 80241700 0080882D */ daddu $s1, $a0, $zero -/* E0FEA4 80241704 AFBF001C */ sw $ra, 0x1c($sp) -/* E0FEA8 80241708 AFB20018 */ sw $s2, 0x18($sp) -/* E0FEAC 8024170C AFB00010 */ sw $s0, 0x10($sp) -/* E0FEB0 80241710 8E22000C */ lw $v0, 0xc($s1) -/* E0FEB4 80241714 00A0802D */ daddu $s0, $a1, $zero -/* E0FEB8 80241718 0C0B1EAF */ jal get_variable -/* E0FEBC 8024171C 8C450000 */ lw $a1, ($v0) -/* E0FEC0 80241720 12000013 */ beqz $s0, .L80241770 -/* E0FEC4 80241724 0040902D */ daddu $s2, $v0, $zero -/* E0FEC8 80241728 0C00AB39 */ jal heap_malloc -/* E0FECC 8024172C 24040018 */ addiu $a0, $zero, 0x18 -/* E0FED0 80241730 0040802D */ daddu $s0, $v0, $zero -/* E0FED4 80241734 0000202D */ daddu $a0, $zero, $zero -/* E0FED8 80241738 3C058024 */ lui $a1, 0x8024 -/* E0FEDC 8024173C 24A516C0 */ addiu $a1, $a1, 0x16c0 -/* E0FEE0 80241740 240200FF */ addiu $v0, $zero, 0xff -/* E0FEE4 80241744 AE300070 */ sw $s0, 0x70($s1) -/* E0FEE8 80241748 AE000000 */ sw $zero, ($s0) -/* E0FEEC 8024174C 0C048C56 */ jal bind_dynamic_entity_3 -/* E0FEF0 80241750 AE02000C */ sw $v0, 0xc($s0) -/* E0FEF4 80241754 0220202D */ daddu $a0, $s1, $zero -/* E0FEF8 80241758 3C05FD05 */ lui $a1, 0xfd05 -/* E0FEFC 8024175C 34A50F8A */ ori $a1, $a1, 0xf8a -/* E0FF00 80241760 0200302D */ daddu $a2, $s0, $zero -/* E0FF04 80241764 AE020014 */ sw $v0, 0x14($s0) -/* E0FF08 80241768 0C0B2026 */ jal set_variable -/* E0FF0C 8024176C AE120008 */ sw $s2, 8($s0) -.L80241770: -/* E0FF10 80241770 8E300070 */ lw $s0, 0x70($s1) -/* E0FF14 80241774 8E030000 */ lw $v1, ($s0) -/* E0FF18 80241778 24020005 */ addiu $v0, $zero, 5 -/* E0FF1C 8024177C 14620007 */ bne $v1, $v0, .L8024179C -/* E0FF20 80241780 0000102D */ daddu $v0, $zero, $zero -/* E0FF24 80241784 8E040014 */ lw $a0, 0x14($s0) -/* E0FF28 80241788 0C048D70 */ jal func_801235C0 -/* E0FF2C 8024178C 00000000 */ nop -/* E0FF30 80241790 0C00AB4B */ jal heap_free -/* E0FF34 80241794 0200202D */ daddu $a0, $s0, $zero -/* E0FF38 80241798 24020001 */ addiu $v0, $zero, 1 -.L8024179C: -/* E0FF3C 8024179C 8FBF001C */ lw $ra, 0x1c($sp) -/* E0FF40 802417A0 8FB20018 */ lw $s2, 0x18($sp) -/* E0FF44 802417A4 8FB10014 */ lw $s1, 0x14($sp) -/* E0FF48 802417A8 8FB00010 */ lw $s0, 0x10($sp) -/* E0FF4C 802417AC 03E00008 */ jr $ra -/* E0FF50 802417B0 27BD0020 */ addiu $sp, $sp, 0x20 -/* E0FF54 802417B4 00000000 */ nop -/* E0FF58 802417B8 00000000 */ nop -/* E0FF5C 802417BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_802401D0_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_802401D0_E12760.s deleted file mode 100644 index 4c69a80aaa..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_802401D0_E12760.s +++ /dev/null @@ -1,141 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_E12930 -/* E12930 802401D0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* E12934 802401D4 0000202D */ daddu $a0, $zero, $zero -/* E12938 802401D8 AFBF0058 */ sw $ra, 0x58($sp) -/* E1293C 802401DC AFB10054 */ sw $s1, 0x54($sp) -/* E12940 802401E0 0C00FB3A */ jal get_enemy -/* E12944 802401E4 AFB00050 */ sw $s0, 0x50($sp) -/* E12948 802401E8 2404FFFF */ addiu $a0, $zero, -1 -/* E1294C 802401EC 8C430074 */ lw $v1, 0x74($v0) -/* E12950 802401F0 1464000B */ bne $v1, $a0, .L80240220 -/* E12954 802401F4 8C510080 */ lw $s1, 0x80($v0) -/* E12958 802401F8 8E230014 */ lw $v1, 0x14($s1) -/* E1295C 802401FC 28620141 */ slti $v0, $v1, 0x141 -/* E12960 80240200 1040006B */ beqz $v0, .L802403B0 -/* E12964 80240204 2462000A */ addiu $v0, $v1, 0xa -/* E12968 80240208 AE220014 */ sw $v0, 0x14($s1) -/* E1296C 8024020C 28420142 */ slti $v0, $v0, 0x142 -/* E12970 80240210 1440000C */ bnez $v0, .L80240244 -/* E12974 80240214 24020141 */ addiu $v0, $zero, 0x141 -/* E12978 80240218 08090091 */ j .L80240244 -/* E1297C 8024021C AE220014 */ sw $v0, 0x14($s1) -.L80240220: -/* E12980 80240220 8E230014 */ lw $v1, 0x14($s1) -/* E12984 80240224 286200DD */ slti $v0, $v1, 0xdd -/* E12988 80240228 14400006 */ bnez $v0, .L80240244 -/* E1298C 8024022C 2462FFF6 */ addiu $v0, $v1, -0xa -/* E12990 80240230 AE220014 */ sw $v0, 0x14($s1) -/* E12994 80240234 284200DC */ slti $v0, $v0, 0xdc -/* E12998 80240238 10400002 */ beqz $v0, .L80240244 -/* E1299C 8024023C 240200DC */ addiu $v0, $zero, 0xdc -/* E129A0 80240240 AE220014 */ sw $v0, 0x14($s1) -.L80240244: -/* E129A4 80240244 8E220014 */ lw $v0, 0x14($s1) -/* E129A8 80240248 28420141 */ slti $v0, $v0, 0x141 -/* E129AC 8024024C 10400058 */ beqz $v0, .L802403B0 -/* E129B0 80240250 0000202D */ daddu $a0, $zero, $zero -/* E129B4 80240254 24050009 */ addiu $a1, $zero, 9 -/* E129B8 80240258 24020048 */ addiu $v0, $zero, 0x48 -/* E129BC 8024025C AFA20014 */ sw $v0, 0x14($sp) -/* E129C0 80240260 24020014 */ addiu $v0, $zero, 0x14 -/* E129C4 80240264 AFA20018 */ sw $v0, 0x18($sp) -/* E129C8 80240268 240200FF */ addiu $v0, $zero, 0xff -/* E129CC 8024026C AFA2001C */ sw $v0, 0x1c($sp) -/* E129D0 80240270 24020140 */ addiu $v0, $zero, 0x140 -/* E129D4 80240274 AFA20044 */ sw $v0, 0x44($sp) -/* E129D8 80240278 240200F0 */ addiu $v0, $zero, 0xf0 -/* E129DC 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* E129E0 80240280 AFA00020 */ sw $zero, 0x20($sp) -/* E129E4 80240284 AFA00024 */ sw $zero, 0x24($sp) -/* E129E8 80240288 AFA00028 */ sw $zero, 0x28($sp) -/* E129EC 8024028C AFA0002C */ sw $zero, 0x2c($sp) -/* E129F0 80240290 AFA00030 */ sw $zero, 0x30($sp) -/* E129F4 80240294 AFA00034 */ sw $zero, 0x34($sp) -/* E129F8 80240298 AFA00038 */ sw $zero, 0x38($sp) -/* E129FC 8024029C AFA0003C */ sw $zero, 0x3c($sp) -/* E12A00 802402A0 AFA00040 */ sw $zero, 0x40($sp) -/* E12A04 802402A4 AFA20048 */ sw $v0, 0x48($sp) -/* E12A08 802402A8 AFA0004C */ sw $zero, 0x4c($sp) -/* E12A0C 802402AC 8E260014 */ lw $a2, 0x14($s1) -/* E12A10 802402B0 0C03D4B8 */ jal draw_box -/* E12A14 802402B4 2407001C */ addiu $a3, $zero, 0x1c -/* E12A18 802402B8 24060027 */ addiu $a2, $zero, 0x27 -/* E12A1C 802402BC 8E300004 */ lw $s0, 4($s1) -/* E12A20 802402C0 8E250014 */ lw $a1, 0x14($s1) -/* E12A24 802402C4 0200202D */ daddu $a0, $s0, $zero -/* E12A28 802402C8 0C051261 */ jal set_icon_render_pos -/* E12A2C 802402CC 24A5000F */ addiu $a1, $a1, 0xf -/* E12A30 802402D0 0C0511EA */ jal draw_icon_0 -/* E12A34 802402D4 0200202D */ daddu $a0, $s0, $zero -/* E12A38 802402D8 8E24000C */ lw $a0, 0xc($s1) -/* E12A3C 802402DC 8E230010 */ lw $v1, 0x10($s1) -/* E12A40 802402E0 0064102A */ slt $v0, $v1, $a0 -/* E12A44 802402E4 10400003 */ beqz $v0, .L802402F4 -/* E12A48 802402E8 0083102A */ slt $v0, $a0, $v1 -/* E12A4C 802402EC 080900E1 */ j .L80240384 -/* E12A50 802402F0 AE23000C */ sw $v1, 0xc($s1) -.L802402F4: -/* E12A54 802402F4 10400023 */ beqz $v0, .L80240384 -/* E12A58 802402F8 00641823 */ subu $v1, $v1, $a0 -/* E12A5C 802402FC 28620065 */ slti $v0, $v1, 0x65 -/* E12A60 80240300 14400003 */ bnez $v0, .L80240310 -/* E12A64 80240304 2862004C */ slti $v0, $v1, 0x4c -/* E12A68 80240308 080900DB */ j .L8024036C -/* E12A6C 8024030C 24820028 */ addiu $v0, $a0, 0x28 -.L80240310: -/* E12A70 80240310 14400003 */ bnez $v0, .L80240320 -/* E12A74 80240314 28620033 */ slti $v0, $v1, 0x33 -/* E12A78 80240318 080900DB */ j .L8024036C -/* E12A7C 8024031C 24820023 */ addiu $v0, $a0, 0x23 -.L80240320: -/* E12A80 80240320 14400003 */ bnez $v0, .L80240330 -/* E12A84 80240324 2862001F */ slti $v0, $v1, 0x1f -/* E12A88 80240328 080900DB */ j .L8024036C -/* E12A8C 8024032C 2482001E */ addiu $v0, $a0, 0x1e -.L80240330: -/* E12A90 80240330 14400003 */ bnez $v0, .L80240340 -/* E12A94 80240334 28620015 */ slti $v0, $v1, 0x15 -/* E12A98 80240338 080900DB */ j .L8024036C -/* E12A9C 8024033C 24820014 */ addiu $v0, $a0, 0x14 -.L80240340: -/* E12AA0 80240340 14400003 */ bnez $v0, .L80240350 -/* E12AA4 80240344 2862000B */ slti $v0, $v1, 0xb -/* E12AA8 80240348 080900DB */ j .L8024036C -/* E12AAC 8024034C 2482000A */ addiu $v0, $a0, 0xa -.L80240350: -/* E12AB0 80240350 14400003 */ bnez $v0, .L80240360 -/* E12AB4 80240354 28620006 */ slti $v0, $v1, 6 -/* E12AB8 80240358 080900DB */ j .L8024036C -/* E12ABC 8024035C 24820005 */ addiu $v0, $a0, 5 -.L80240360: -/* E12AC0 80240360 14400002 */ bnez $v0, .L8024036C -/* E12AC4 80240364 24820001 */ addiu $v0, $a0, 1 -/* E12AC8 80240368 24820002 */ addiu $v0, $a0, 2 -.L8024036C: -/* E12ACC 8024036C AE22000C */ sw $v0, 0xc($s1) -/* E12AD0 80240370 24040211 */ addiu $a0, $zero, 0x211 -/* E12AD4 80240374 0000282D */ daddu $a1, $zero, $zero -/* E12AD8 80240378 24060040 */ addiu $a2, $zero, 0x40 -/* E12ADC 8024037C 0C0526AE */ jal _play_sound -/* E12AE0 80240380 24070032 */ addiu $a3, $zero, 0x32 -.L80240384: -/* E12AE4 80240384 24060020 */ addiu $a2, $zero, 0x20 -/* E12AE8 80240388 24070001 */ addiu $a3, $zero, 1 -/* E12AEC 8024038C 8E250014 */ lw $a1, 0x14($s1) -/* E12AF0 80240390 240200FF */ addiu $v0, $zero, 0xff -/* E12AF4 80240394 AFA20014 */ sw $v0, 0x14($sp) -/* E12AF8 80240398 24020003 */ addiu $v0, $zero, 3 -/* E12AFC 8024039C AFA00010 */ sw $zero, 0x10($sp) -/* E12B00 802403A0 AFA20018 */ sw $v0, 0x18($sp) -/* E12B04 802403A4 8E24000C */ lw $a0, 0xc($s1) -/* E12B08 802403A8 0C049DA7 */ jal draw_number -/* E12B0C 802403AC 24A5003F */ addiu $a1, $a1, 0x3f -.L802403B0: -/* E12B10 802403B0 8FBF0058 */ lw $ra, 0x58($sp) -/* E12B14 802403B4 8FB10054 */ lw $s1, 0x54($sp) -/* E12B18 802403B8 8FB00050 */ lw $s0, 0x50($sp) -/* E12B1C 802403BC 03E00008 */ jr $ra -/* E12B20 802403C0 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_802403C4_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_802403C4_E12760.s deleted file mode 100644 index 2bcbd7aae1..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_802403C4_E12760.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C4_E12B24 -/* E12B24 802403C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E12B28 802403C8 2402002D */ addiu $v0, $zero, 0x2d -/* E12B2C 802403CC AFA20010 */ sw $v0, 0x10($sp) -/* E12B30 802403D0 3C028024 */ lui $v0, 0x8024 -/* E12B34 802403D4 244201D0 */ addiu $v0, $v0, 0x1d0 -/* E12B38 802403D8 27A40010 */ addiu $a0, $sp, 0x10 -/* E12B3C 802403DC AFBF0020 */ sw $ra, 0x20($sp) -/* E12B40 802403E0 AFA00018 */ sw $zero, 0x18($sp) -/* E12B44 802403E4 AFA2001C */ sw $v0, 0x1c($sp) -/* E12B48 802403E8 0C047644 */ jal queue_render_task -/* E12B4C 802403EC AFA00014 */ sw $zero, 0x14($sp) -/* E12B50 802403F0 8FBF0020 */ lw $ra, 0x20($sp) -/* E12B54 802403F4 03E00008 */ jr $ra -/* E12B58 802403F8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_802403FC_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_802403FC_E12760.s deleted file mode 100644 index 4dc0143567..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_802403FC_E12760.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403FC_E12B5C -/* E12B5C 802403FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E12B60 80240400 3C02800A */ lui $v0, %hi(D_8009A650) -/* E12B64 80240404 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* E12B68 80240408 AFBF0010 */ sw $ra, 0x10($sp) -/* E12B6C 8024040C 8C430000 */ lw $v1, ($v0) -/* E12B70 80240410 3C040004 */ lui $a0, 4 -/* E12B74 80240414 00641825 */ or $v1, $v1, $a0 -/* E12B78 80240418 0C03A625 */ jal func_800E9894 -/* E12B7C 8024041C AC430000 */ sw $v1, ($v0) -/* E12B80 80240420 0C03A5EE */ jal func_800E97B8 -/* E12B84 80240424 00000000 */ nop -/* E12B88 80240428 8FBF0010 */ lw $ra, 0x10($sp) -/* E12B8C 8024042C 24020002 */ addiu $v0, $zero, 2 -/* E12B90 80240430 03E00008 */ jr $ra -/* E12B94 80240434 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_80240438_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_80240438_E12760.s deleted file mode 100644 index ba91a71738..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_80240438_E12760.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240438_E12B98 -/* E12B98 80240438 3C04FFFB */ lui $a0, 0xfffb -/* E12B9C 8024043C 3C03800A */ lui $v1, %hi(D_8009A650) -/* E12BA0 80240440 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* E12BA4 80240444 8C620000 */ lw $v0, ($v1) -/* E12BA8 80240448 3484FFFF */ ori $a0, $a0, 0xffff -/* E12BAC 8024044C 00441024 */ and $v0, $v0, $a0 -/* E12BB0 80240450 AC620000 */ sw $v0, ($v1) -/* E12BB4 80240454 03E00008 */ jr $ra -/* E12BB8 80240458 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_8024045C_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_8024045C_E12760.s deleted file mode 100644 index 26cfd21b8d..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_8024045C_E12760.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024045C_E12BBC -/* E12BBC 8024045C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E12BC0 80240460 AFB10014 */ sw $s1, 0x14($sp) -/* E12BC4 80240464 0080882D */ daddu $s1, $a0, $zero -/* E12BC8 80240468 0000202D */ daddu $a0, $zero, $zero -/* E12BCC 8024046C AFBF0018 */ sw $ra, 0x18($sp) -/* E12BD0 80240470 0C00FB3A */ jal get_enemy -/* E12BD4 80240474 AFB00010 */ sw $s0, 0x10($sp) -/* E12BD8 80240478 8E23000C */ lw $v1, 0xc($s1) -/* E12BDC 8024047C 8C650000 */ lw $a1, ($v1) -/* E12BE0 80240480 8C500080 */ lw $s0, 0x80($v0) -/* E12BE4 80240484 0C0B1EAF */ jal get_variable -/* E12BE8 80240488 0220202D */ daddu $a0, $s1, $zero -/* E12BEC 8024048C 0220202D */ daddu $a0, $s1, $zero -/* E12BF0 80240490 3C05FE36 */ lui $a1, 0xfe36 -/* E12BF4 80240494 00021840 */ sll $v1, $v0, 1 -/* E12BF8 80240498 00621821 */ addu $v1, $v1, $v0 -/* E12BFC 8024049C 000318C0 */ sll $v1, $v1, 3 -/* E12C00 802404A0 00621823 */ subu $v1, $v1, $v0 -/* E12C04 802404A4 00031880 */ sll $v1, $v1, 2 -/* E12C08 802404A8 02038021 */ addu $s0, $s0, $v1 -/* E12C0C 802404AC 8E060074 */ lw $a2, 0x74($s0) -/* E12C10 802404B0 0C0B2026 */ jal set_variable -/* E12C14 802404B4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* E12C18 802404B8 0220202D */ daddu $a0, $s1, $zero -/* E12C1C 802404BC 3C05FE36 */ lui $a1, 0xfe36 -/* E12C20 802404C0 8E060078 */ lw $a2, 0x78($s0) -/* E12C24 802404C4 0C0B2026 */ jal set_variable -/* E12C28 802404C8 34A53C81 */ ori $a1, $a1, 0x3c81 -/* E12C2C 802404CC 0220202D */ daddu $a0, $s1, $zero -/* E12C30 802404D0 3C05FE36 */ lui $a1, 0xfe36 -/* E12C34 802404D4 8E06007C */ lw $a2, 0x7c($s0) -/* E12C38 802404D8 0C0B2026 */ jal set_variable -/* E12C3C 802404DC 34A53C82 */ ori $a1, $a1, 0x3c82 -/* E12C40 802404E0 0220202D */ daddu $a0, $s1, $zero -/* E12C44 802404E4 3C05FE36 */ lui $a1, 0xfe36 -/* E12C48 802404E8 8E060084 */ lw $a2, 0x84($s0) -/* E12C4C 802404EC 0C0B2026 */ jal set_variable -/* E12C50 802404F0 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E12C54 802404F4 8FBF0018 */ lw $ra, 0x18($sp) -/* E12C58 802404F8 8FB10014 */ lw $s1, 0x14($sp) -/* E12C5C 802404FC 8FB00010 */ lw $s0, 0x10($sp) -/* E12C60 80240500 24020002 */ addiu $v0, $zero, 2 -/* E12C64 80240504 03E00008 */ jr $ra -/* E12C68 80240508 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_8024050C_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_8024050C_E12760.s deleted file mode 100644 index 3e74c820e6..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_8024050C_E12760.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024050C_E12C6C -/* E12C6C 8024050C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E12C70 80240510 AFB10014 */ sw $s1, 0x14($sp) -/* E12C74 80240514 0080882D */ daddu $s1, $a0, $zero -/* E12C78 80240518 0000202D */ daddu $a0, $zero, $zero -/* E12C7C 8024051C AFBF001C */ sw $ra, 0x1c($sp) -/* E12C80 80240520 AFB20018 */ sw $s2, 0x18($sp) -/* E12C84 80240524 0C00FB3A */ jal get_enemy -/* E12C88 80240528 AFB00010 */ sw $s0, 0x10($sp) -/* E12C8C 8024052C 0220202D */ daddu $a0, $s1, $zero -/* E12C90 80240530 8E30000C */ lw $s0, 0xc($s1) -/* E12C94 80240534 8C520080 */ lw $s2, 0x80($v0) -/* E12C98 80240538 8E050000 */ lw $a1, ($s0) -/* E12C9C 8024053C 0C0B1EAF */ jal get_variable -/* E12CA0 80240540 26100004 */ addiu $s0, $s0, 4 -/* E12CA4 80240544 0220202D */ daddu $a0, $s1, $zero -/* E12CA8 80240548 8E050000 */ lw $a1, ($s0) -/* E12CAC 8024054C 0C0B1EAF */ jal get_variable -/* E12CB0 80240550 0040802D */ daddu $s0, $v0, $zero -/* E12CB4 80240554 00101840 */ sll $v1, $s0, 1 -/* E12CB8 80240558 00701821 */ addu $v1, $v1, $s0 -/* E12CBC 8024055C 000318C0 */ sll $v1, $v1, 3 -/* E12CC0 80240560 00701823 */ subu $v1, $v1, $s0 -/* E12CC4 80240564 00031880 */ sll $v1, $v1, 2 -/* E12CC8 80240568 02439021 */ addu $s2, $s2, $v1 -/* E12CCC 8024056C AE420074 */ sw $v0, 0x74($s2) -/* E12CD0 80240570 8FBF001C */ lw $ra, 0x1c($sp) -/* E12CD4 80240574 8FB20018 */ lw $s2, 0x18($sp) -/* E12CD8 80240578 8FB10014 */ lw $s1, 0x14($sp) -/* E12CDC 8024057C 8FB00010 */ lw $s0, 0x10($sp) -/* E12CE0 80240580 24020002 */ addiu $v0, $zero, 2 -/* E12CE4 80240584 03E00008 */ jr $ra -/* E12CE8 80240588 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_8024058C_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_8024058C_E12760.s deleted file mode 100644 index 41f233445f..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_8024058C_E12760.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024058C_E12CEC -/* E12CEC 8024058C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E12CF0 80240590 AFB00010 */ sw $s0, 0x10($sp) -/* E12CF4 80240594 0080802D */ daddu $s0, $a0, $zero -/* E12CF8 80240598 AFBF0014 */ sw $ra, 0x14($sp) -/* E12CFC 8024059C 0C00FB3A */ jal get_enemy -/* E12D00 802405A0 0000202D */ daddu $a0, $zero, $zero -/* E12D04 802405A4 8E03000C */ lw $v1, 0xc($s0) -/* E12D08 802405A8 0200202D */ daddu $a0, $s0, $zero -/* E12D0C 802405AC 8C650000 */ lw $a1, ($v1) -/* E12D10 802405B0 0C0B1EAF */ jal get_variable -/* E12D14 802405B4 8C500080 */ lw $s0, 0x80($v0) -/* E12D18 802405B8 00021840 */ sll $v1, $v0, 1 -/* E12D1C 802405BC 00621821 */ addu $v1, $v1, $v0 -/* E12D20 802405C0 000318C0 */ sll $v1, $v1, 3 -/* E12D24 802405C4 00621823 */ subu $v1, $v1, $v0 -/* E12D28 802405C8 00031880 */ sll $v1, $v1, 2 -/* E12D2C 802405CC 02038021 */ addu $s0, $s0, $v1 -/* E12D30 802405D0 8E030080 */ lw $v1, 0x80($s0) -/* E12D34 802405D4 24020005 */ addiu $v0, $zero, 5 -/* E12D38 802405D8 AE00008C */ sw $zero, 0x8c($s0) -/* E12D3C 802405DC AE020090 */ sw $v0, 0x90($s0) -/* E12D40 802405E0 3C028024 */ lui $v0, 0x8024 -/* E12D44 802405E4 00431021 */ addu $v0, $v0, $v1 -/* E12D48 802405E8 80421AC8 */ lb $v0, 0x1ac8($v0) -/* E12D4C 802405EC 44820000 */ mtc1 $v0, $f0 -/* E12D50 802405F0 00000000 */ nop -/* E12D54 802405F4 46800020 */ cvt.s.w $f0, $f0 -/* E12D58 802405F8 E6000094 */ swc1 $f0, 0x94($s0) -/* E12D5C 802405FC 3C028024 */ lui $v0, 0x8024 -/* E12D60 80240600 00431021 */ addu $v0, $v0, $v1 -/* E12D64 80240604 80421AD4 */ lb $v0, 0x1ad4($v0) -/* E12D68 80240608 3C01402E */ lui $at, 0x402e -/* E12D6C 8024060C 44811800 */ mtc1 $at, $f3 -/* E12D70 80240610 44801000 */ mtc1 $zero, $f2 -/* E12D74 80240614 44820000 */ mtc1 $v0, $f0 -/* E12D78 80240618 00000000 */ nop -/* E12D7C 8024061C 46800021 */ cvt.d.w $f0, $f0 -/* E12D80 80240620 46220000 */ add.d $f0, $f0, $f2 -/* E12D84 80240624 3C014000 */ lui $at, 0x4000 -/* E12D88 80240628 44813000 */ mtc1 $at, $f6 -/* E12D8C 8024062C C6020094 */ lwc1 $f2, 0x94($s0) -/* E12D90 80240630 46200020 */ cvt.s.d $f0, $f0 -/* E12D94 80240634 E6000098 */ swc1 $f0, 0x98($s0) -/* E12D98 80240638 3C018024 */ lui $at, 0x8024 -/* E12D9C 8024063C 00230821 */ addu $at, $at, $v1 -/* E12DA0 80240640 80231AE0 */ lb $v1, 0x1ae0($at) -/* E12DA4 80240644 3C013F80 */ lui $at, 0x3f80 -/* E12DA8 80240648 44810000 */ mtc1 $at, $f0 -/* E12DAC 8024064C 46001106 */ mov.s $f4, $f2 -/* E12DB0 80240650 E60400AC */ swc1 $f4, 0xac($s0) -/* E12DB4 80240654 C6040098 */ lwc1 $f4, 0x98($s0) -/* E12DB8 80240658 E60200A0 */ swc1 $f2, 0xa0($s0) -/* E12DBC 8024065C AE0000B8 */ sw $zero, 0xb8($s0) -/* E12DC0 80240660 E60600CC */ swc1 $f6, 0xcc($s0) -/* E12DC4 80240664 2463000C */ addiu $v1, $v1, 0xc -/* E12DC8 80240668 E60000C4 */ swc1 $f0, 0xc4($s0) -/* E12DCC 8024066C E60000C8 */ swc1 $f0, 0xc8($s0) -/* E12DD0 80240670 46002006 */ mov.s $f0, $f4 -/* E12DD4 80240674 44831000 */ mtc1 $v1, $f2 -/* E12DD8 80240678 00000000 */ nop -/* E12DDC 8024067C 468010A0 */ cvt.s.w $f2, $f2 -/* E12DE0 80240680 E602009C */ swc1 $f2, 0x9c($s0) -/* E12DE4 80240684 46001186 */ mov.s $f6, $f2 -/* E12DE8 80240688 3C018024 */ lui $at, 0x8024 -/* E12DEC 8024068C D42235E0 */ ldc1 $f2, 0x35e0($at) -/* E12DF0 80240690 46000021 */ cvt.d.s $f0, $f0 -/* E12DF4 80240694 E60400A4 */ swc1 $f4, 0xa4($s0) -/* E12DF8 80240698 46003106 */ mov.s $f4, $f6 -/* E12DFC 8024069C 46220000 */ add.d $f0, $f0, $f2 -/* E12E00 802406A0 E60600A8 */ swc1 $f6, 0xa8($s0) -/* E12E04 802406A4 E60400B4 */ swc1 $f4, 0xb4($s0) -/* E12E08 802406A8 46200020 */ cvt.s.d $f0, $f0 -/* E12E0C 802406AC E60000B0 */ swc1 $f0, 0xb0($s0) -/* E12E10 802406B0 8FBF0014 */ lw $ra, 0x14($sp) -/* E12E14 802406B4 8FB00010 */ lw $s0, 0x10($sp) -/* E12E18 802406B8 24020002 */ addiu $v0, $zero, 2 -/* E12E1C 802406BC 03E00008 */ jr $ra -/* E12E20 802406C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_802406C4_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_802406C4_E12760.s deleted file mode 100644 index 2979b8c327..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_802406C4_E12760.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406C4_E12E24 -/* E12E24 802406C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E12E28 802406C8 AFB1001C */ sw $s1, 0x1c($sp) -/* E12E2C 802406CC 0080882D */ daddu $s1, $a0, $zero -/* E12E30 802406D0 0000202D */ daddu $a0, $zero, $zero -/* E12E34 802406D4 AFBF0020 */ sw $ra, 0x20($sp) -/* E12E38 802406D8 0C00FB3A */ jal get_enemy -/* E12E3C 802406DC AFB00018 */ sw $s0, 0x18($sp) -/* E12E40 802406E0 8E23000C */ lw $v1, 0xc($s1) -/* E12E44 802406E4 8C650000 */ lw $a1, ($v1) -/* E12E48 802406E8 8C500080 */ lw $s0, 0x80($v0) -/* E12E4C 802406EC 0C0B1EAF */ jal get_variable -/* E12E50 802406F0 0220202D */ daddu $a0, $s1, $zero -/* E12E54 802406F4 00021840 */ sll $v1, $v0, 1 -/* E12E58 802406F8 00621821 */ addu $v1, $v1, $v0 -/* E12E5C 802406FC 000318C0 */ sll $v1, $v1, 3 -/* E12E60 80240700 00621823 */ subu $v1, $v1, $v0 -/* E12E64 80240704 00031880 */ sll $v1, $v1, 2 -/* E12E68 80240708 02038021 */ addu $s0, $s0, $v1 -/* E12E6C 8024070C 8E020090 */ lw $v0, 0x90($s0) -/* E12E70 80240710 AFA20010 */ sw $v0, 0x10($sp) -/* E12E74 80240714 8E0500A0 */ lw $a1, 0xa0($s0) -/* E12E78 80240718 8E0600AC */ lw $a2, 0xac($s0) -/* E12E7C 8024071C 8E07008C */ lw $a3, 0x8c($s0) -/* E12E80 80240720 0C00A8ED */ jal update_lerp -/* E12E84 80240724 24040004 */ addiu $a0, $zero, 4 -/* E12E88 80240728 8E020090 */ lw $v0, 0x90($s0) -/* E12E8C 8024072C E6000094 */ swc1 $f0, 0x94($s0) -/* E12E90 80240730 AFA20010 */ sw $v0, 0x10($sp) -/* E12E94 80240734 8E0500A4 */ lw $a1, 0xa4($s0) -/* E12E98 80240738 8E0600B0 */ lw $a2, 0xb0($s0) -/* E12E9C 8024073C 8E07008C */ lw $a3, 0x8c($s0) -/* E12EA0 80240740 0C00A8ED */ jal update_lerp -/* E12EA4 80240744 24040004 */ addiu $a0, $zero, 4 -/* E12EA8 80240748 8E020090 */ lw $v0, 0x90($s0) -/* E12EAC 8024074C E6000098 */ swc1 $f0, 0x98($s0) -/* E12EB0 80240750 AFA20010 */ sw $v0, 0x10($sp) -/* E12EB4 80240754 8E0500A8 */ lw $a1, 0xa8($s0) -/* E12EB8 80240758 8E0600B4 */ lw $a2, 0xb4($s0) -/* E12EBC 8024075C 8E07008C */ lw $a3, 0x8c($s0) -/* E12EC0 80240760 0C00A8ED */ jal update_lerp -/* E12EC4 80240764 24040004 */ addiu $a0, $zero, 4 -/* E12EC8 80240768 8E020090 */ lw $v0, 0x90($s0) -/* E12ECC 8024076C E600009C */ swc1 $f0, 0x9c($s0) -/* E12ED0 80240770 AFA20010 */ sw $v0, 0x10($sp) -/* E12ED4 80240774 8E0500C8 */ lw $a1, 0xc8($s0) -/* E12ED8 80240778 8E0600CC */ lw $a2, 0xcc($s0) -/* E12EDC 8024077C 8E07008C */ lw $a3, 0x8c($s0) -/* E12EE0 80240780 0C00A8ED */ jal update_lerp -/* E12EE4 80240784 0000202D */ daddu $a0, $zero, $zero -/* E12EE8 80240788 8E02008C */ lw $v0, 0x8c($s0) -/* E12EEC 8024078C 8E030090 */ lw $v1, 0x90($s0) -/* E12EF0 80240790 E60000C4 */ swc1 $f0, 0xc4($s0) -/* E12EF4 80240794 24420001 */ addiu $v0, $v0, 1 -/* E12EF8 80240798 AE02008C */ sw $v0, 0x8c($s0) -/* E12EFC 8024079C 0043102A */ slt $v0, $v0, $v1 -/* E12F00 802407A0 14400005 */ bnez $v0, .L802407B8 -/* E12F04 802407A4 0220202D */ daddu $a0, $s1, $zero -/* E12F08 802407A8 3C05FE36 */ lui $a1, 0xfe36 -/* E12F0C 802407AC 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E12F10 802407B0 080901F1 */ j .L802407C4 -/* E12F14 802407B4 24060001 */ addiu $a2, $zero, 1 -.L802407B8: -/* E12F18 802407B8 3C05FE36 */ lui $a1, 0xfe36 -/* E12F1C 802407BC 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E12F20 802407C0 0000302D */ daddu $a2, $zero, $zero -.L802407C4: -/* E12F24 802407C4 0C0B2026 */ jal set_variable -/* E12F28 802407C8 00000000 */ nop -/* E12F2C 802407CC 8FBF0020 */ lw $ra, 0x20($sp) -/* E12F30 802407D0 8FB1001C */ lw $s1, 0x1c($sp) -/* E12F34 802407D4 8FB00018 */ lw $s0, 0x18($sp) -/* E12F38 802407D8 24020002 */ addiu $v0, $zero, 2 -/* E12F3C 802407DC 03E00008 */ jr $ra -/* E12F40 802407E0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_802407E4_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_802407E4_E12760.s deleted file mode 100644 index 68d2a731c2..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_802407E4_E12760.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407E4_E12F44 -/* E12F44 802407E4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E12F48 802407E8 AFB00010 */ sw $s0, 0x10($sp) -/* E12F4C 802407EC 0080802D */ daddu $s0, $a0, $zero -/* E12F50 802407F0 AFBF0014 */ sw $ra, 0x14($sp) -/* E12F54 802407F4 0C00FB3A */ jal get_enemy -/* E12F58 802407F8 0000202D */ daddu $a0, $zero, $zero -/* E12F5C 802407FC 8E03000C */ lw $v1, 0xc($s0) -/* E12F60 80240800 0200202D */ daddu $a0, $s0, $zero -/* E12F64 80240804 8C650000 */ lw $a1, ($v1) -/* E12F68 80240808 0C0B1EAF */ jal get_variable -/* E12F6C 8024080C 8C500080 */ lw $s0, 0x80($v0) -/* E12F70 80240810 0040202D */ daddu $a0, $v0, $zero -/* E12F74 80240814 24020002 */ addiu $v0, $zero, 2 -/* E12F78 80240818 00041840 */ sll $v1, $a0, 1 -/* E12F7C 8024081C 00641821 */ addu $v1, $v1, $a0 -/* E12F80 80240820 000318C0 */ sll $v1, $v1, 3 -/* E12F84 80240824 00641823 */ subu $v1, $v1, $a0 -/* E12F88 80240828 00431804 */ sllv $v1, $v1, $v0 -/* E12F8C 8024082C 02038021 */ addu $s0, $s0, $v1 -/* E12F90 80240830 2403000A */ addiu $v1, $zero, 0xa -/* E12F94 80240834 AE00008C */ sw $zero, 0x8c($s0) -/* E12F98 80240838 AE030090 */ sw $v1, 0x90($s0) -/* E12F9C 8024083C 8FBF0014 */ lw $ra, 0x14($sp) -/* E12FA0 80240840 8FB00010 */ lw $s0, 0x10($sp) -/* E12FA4 80240844 03E00008 */ jr $ra -/* E12FA8 80240848 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_8024084C_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_8024084C_E12760.s deleted file mode 100644 index f90434d41d..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_8024084C_E12760.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024084C_E12FAC -/* E12FAC 8024084C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E12FB0 80240850 AFB10014 */ sw $s1, 0x14($sp) -/* E12FB4 80240854 0080882D */ daddu $s1, $a0, $zero -/* E12FB8 80240858 0000202D */ daddu $a0, $zero, $zero -/* E12FBC 8024085C AFBF0018 */ sw $ra, 0x18($sp) -/* E12FC0 80240860 0C00FB3A */ jal get_enemy -/* E12FC4 80240864 AFB00010 */ sw $s0, 0x10($sp) -/* E12FC8 80240868 8E23000C */ lw $v1, 0xc($s1) -/* E12FCC 8024086C 8C650000 */ lw $a1, ($v1) -/* E12FD0 80240870 8C500080 */ lw $s0, 0x80($v0) -/* E12FD4 80240874 0C0B1EAF */ jal get_variable -/* E12FD8 80240878 0220202D */ daddu $a0, $s1, $zero -/* E12FDC 8024087C 00021840 */ sll $v1, $v0, 1 -/* E12FE0 80240880 00621821 */ addu $v1, $v1, $v0 -/* E12FE4 80240884 000318C0 */ sll $v1, $v1, 3 -/* E12FE8 80240888 00621823 */ subu $v1, $v1, $v0 -/* E12FEC 8024088C 00031880 */ sll $v1, $v1, 2 -/* E12FF0 80240890 02038021 */ addu $s0, $s0, $v1 -/* E12FF4 80240894 8E02008C */ lw $v0, 0x8c($s0) -/* E12FF8 80240898 8E030090 */ lw $v1, 0x90($s0) -/* E12FFC 8024089C 24420001 */ addiu $v0, $v0, 1 -/* E13000 802408A0 AE02008C */ sw $v0, 0x8c($s0) -/* E13004 802408A4 0043102A */ slt $v0, $v0, $v1 -/* E13008 802408A8 14400005 */ bnez $v0, .L802408C0 -/* E1300C 802408AC 0220202D */ daddu $a0, $s1, $zero -/* E13010 802408B0 3C05FE36 */ lui $a1, 0xfe36 -/* E13014 802408B4 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E13018 802408B8 08090233 */ j .L802408CC -/* E1301C 802408BC 24060001 */ addiu $a2, $zero, 1 -.L802408C0: -/* E13020 802408C0 3C05FE36 */ lui $a1, 0xfe36 -/* E13024 802408C4 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E13028 802408C8 0000302D */ daddu $a2, $zero, $zero -.L802408CC: -/* E1302C 802408CC 0C0B2026 */ jal set_variable -/* E13030 802408D0 00000000 */ nop -/* E13034 802408D4 8FBF0018 */ lw $ra, 0x18($sp) -/* E13038 802408D8 8FB10014 */ lw $s1, 0x14($sp) -/* E1303C 802408DC 8FB00010 */ lw $s0, 0x10($sp) -/* E13040 802408E0 24020002 */ addiu $v0, $zero, 2 -/* E13044 802408E4 03E00008 */ jr $ra -/* E13048 802408E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_80240AAC_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_80240AAC_E12760.s deleted file mode 100644 index 5e92276f86..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_80240AAC_E12760.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AAC_E1320C -/* E1320C 80240AAC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E13210 80240AB0 AFB1001C */ sw $s1, 0x1c($sp) -/* E13214 80240AB4 0080882D */ daddu $s1, $a0, $zero -/* E13218 80240AB8 0000202D */ daddu $a0, $zero, $zero -/* E1321C 80240ABC AFBF0020 */ sw $ra, 0x20($sp) -/* E13220 80240AC0 0C00FB3A */ jal get_enemy -/* E13224 80240AC4 AFB00018 */ sw $s0, 0x18($sp) -/* E13228 80240AC8 8E23000C */ lw $v1, 0xc($s1) -/* E1322C 80240ACC 8C650000 */ lw $a1, ($v1) -/* E13230 80240AD0 8C500080 */ lw $s0, 0x80($v0) -/* E13234 80240AD4 0C0B1EAF */ jal get_variable -/* E13238 80240AD8 0220202D */ daddu $a0, $s1, $zero -/* E1323C 80240ADC 00021840 */ sll $v1, $v0, 1 -/* E13240 80240AE0 00621821 */ addu $v1, $v1, $v0 -/* E13244 80240AE4 000318C0 */ sll $v1, $v1, 3 -/* E13248 80240AE8 00621823 */ subu $v1, $v1, $v0 -/* E1324C 80240AEC 00031880 */ sll $v1, $v1, 2 -/* E13250 80240AF0 02038021 */ addu $s0, $s0, $v1 -/* E13254 80240AF4 8E02008C */ lw $v0, 0x8c($s0) -/* E13258 80240AF8 8E030090 */ lw $v1, 0x90($s0) -/* E1325C 80240AFC 24420001 */ addiu $v0, $v0, 1 -/* E13260 80240B00 AE02008C */ sw $v0, 0x8c($s0) -/* E13264 80240B04 AFA30010 */ sw $v1, 0x10($sp) -/* E13268 80240B08 8E0500A0 */ lw $a1, 0xa0($s0) -/* E1326C 80240B0C 8E0600AC */ lw $a2, 0xac($s0) -/* E13270 80240B10 8E07008C */ lw $a3, 0x8c($s0) -/* E13274 80240B14 0C00A8ED */ jal update_lerp -/* E13278 80240B18 24040004 */ addiu $a0, $zero, 4 -/* E1327C 80240B1C 8E020090 */ lw $v0, 0x90($s0) -/* E13280 80240B20 E6000094 */ swc1 $f0, 0x94($s0) -/* E13284 80240B24 AFA20010 */ sw $v0, 0x10($sp) -/* E13288 80240B28 8E0500A4 */ lw $a1, 0xa4($s0) -/* E1328C 80240B2C 8E0600B0 */ lw $a2, 0xb0($s0) -/* E13290 80240B30 8E07008C */ lw $a3, 0x8c($s0) -/* E13294 80240B34 0C00A8ED */ jal update_lerp -/* E13298 80240B38 24040004 */ addiu $a0, $zero, 4 -/* E1329C 80240B3C 8E020090 */ lw $v0, 0x90($s0) -/* E132A0 80240B40 E6000098 */ swc1 $f0, 0x98($s0) -/* E132A4 80240B44 AFA20010 */ sw $v0, 0x10($sp) -/* E132A8 80240B48 8E0500A8 */ lw $a1, 0xa8($s0) -/* E132AC 80240B4C 8E0600B4 */ lw $a2, 0xb4($s0) -/* E132B0 80240B50 8E07008C */ lw $a3, 0x8c($s0) -/* E132B4 80240B54 0C00A8ED */ jal update_lerp -/* E132B8 80240B58 0000202D */ daddu $a0, $zero, $zero -/* E132BC 80240B5C 8E020090 */ lw $v0, 0x90($s0) -/* E132C0 80240B60 E600009C */ swc1 $f0, 0x9c($s0) -/* E132C4 80240B64 AFA20010 */ sw $v0, 0x10($sp) -/* E132C8 80240B68 8E0500BC */ lw $a1, 0xbc($s0) -/* E132CC 80240B6C 8E0600C0 */ lw $a2, 0xc0($s0) -/* E132D0 80240B70 8E07008C */ lw $a3, 0x8c($s0) -/* E132D4 80240B74 0C00A8ED */ jal update_lerp -/* E132D8 80240B78 0000202D */ daddu $a0, $zero, $zero -/* E132DC 80240B7C 8E020090 */ lw $v0, 0x90($s0) -/* E132E0 80240B80 E60000B8 */ swc1 $f0, 0xb8($s0) -/* E132E4 80240B84 AFA20010 */ sw $v0, 0x10($sp) -/* E132E8 80240B88 8E0500C8 */ lw $a1, 0xc8($s0) -/* E132EC 80240B8C 8E0600CC */ lw $a2, 0xcc($s0) -/* E132F0 80240B90 8E07008C */ lw $a3, 0x8c($s0) -/* E132F4 80240B94 0C00A8ED */ jal update_lerp -/* E132F8 80240B98 0000202D */ daddu $a0, $zero, $zero -/* E132FC 80240B9C 8E02008C */ lw $v0, 0x8c($s0) -/* E13300 80240BA0 8E030090 */ lw $v1, 0x90($s0) -/* E13304 80240BA4 0043102A */ slt $v0, $v0, $v1 -/* E13308 80240BA8 14400006 */ bnez $v0, .L80240BC4 -/* E1330C 80240BAC E60000C4 */ swc1 $f0, 0xc4($s0) -/* E13310 80240BB0 0220202D */ daddu $a0, $s1, $zero -/* E13314 80240BB4 3C05FE36 */ lui $a1, 0xfe36 -/* E13318 80240BB8 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E1331C 80240BBC 080902F5 */ j .L80240BD4 -/* E13320 80240BC0 24060001 */ addiu $a2, $zero, 1 -.L80240BC4: -/* E13324 80240BC4 0220202D */ daddu $a0, $s1, $zero -/* E13328 80240BC8 3C05FE36 */ lui $a1, 0xfe36 -/* E1332C 80240BCC 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E13330 80240BD0 0000302D */ daddu $a2, $zero, $zero -.L80240BD4: -/* E13334 80240BD4 0C0B2026 */ jal set_variable -/* E13338 80240BD8 00000000 */ nop -/* E1333C 80240BDC 8FBF0020 */ lw $ra, 0x20($sp) -/* E13340 80240BE0 8FB1001C */ lw $s1, 0x1c($sp) -/* E13344 80240BE4 8FB00018 */ lw $s0, 0x18($sp) -/* E13348 80240BE8 24020002 */ addiu $v0, $zero, 2 -/* E1334C 80240BEC 03E00008 */ jr $ra -/* E13350 80240BF0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_80240BF4_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_80240BF4_E12760.s deleted file mode 100644 index f1d68d827c..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_80240BF4_E12760.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BF4_E13354 -/* E13354 80240BF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13358 80240BF8 AFB00010 */ sw $s0, 0x10($sp) -/* E1335C 80240BFC 0080802D */ daddu $s0, $a0, $zero -/* E13360 80240C00 AFBF0014 */ sw $ra, 0x14($sp) -/* E13364 80240C04 0C00FB3A */ jal get_enemy -/* E13368 80240C08 0000202D */ daddu $a0, $zero, $zero -/* E1336C 80240C0C 8E03000C */ lw $v1, 0xc($s0) -/* E13370 80240C10 0200202D */ daddu $a0, $s0, $zero -/* E13374 80240C14 8C650000 */ lw $a1, ($v1) -/* E13378 80240C18 0C0B1EAF */ jal get_variable -/* E1337C 80240C1C 8C500080 */ lw $s0, 0x80($v0) -/* E13380 80240C20 0040202D */ daddu $a0, $v0, $zero -/* E13384 80240C24 24020002 */ addiu $v0, $zero, 2 -/* E13388 80240C28 00041840 */ sll $v1, $a0, 1 -/* E1338C 80240C2C 00641821 */ addu $v1, $v1, $a0 -/* E13390 80240C30 000318C0 */ sll $v1, $v1, 3 -/* E13394 80240C34 00641823 */ subu $v1, $v1, $a0 -/* E13398 80240C38 00431804 */ sllv $v1, $v1, $v0 -/* E1339C 80240C3C 02038021 */ addu $s0, $s0, $v1 -/* E133A0 80240C40 AE0000B8 */ sw $zero, 0xb8($s0) -/* E133A4 80240C44 8FBF0014 */ lw $ra, 0x14($sp) -/* E133A8 80240C48 8FB00010 */ lw $s0, 0x10($sp) -/* E133AC 80240C4C 03E00008 */ jr $ra -/* E133B0 80240C50 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_80240C54_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_80240C54_E12760.s deleted file mode 100644 index c394ad9a0c..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_80240C54_E12760.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C54_E133B4 -/* E133B4 80240C54 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E133B8 80240C58 AFBF0010 */ sw $ra, 0x10($sp) -/* E133BC 80240C5C 0C00FB3A */ jal get_enemy -/* E133C0 80240C60 0000202D */ daddu $a0, $zero, $zero -/* E133C4 80240C64 3C060001 */ lui $a2, 1 -/* E133C8 80240C68 3C058011 */ lui $a1, %hi(gPlayerData) -/* E133CC 80240C6C 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* E133D0 80240C70 34C6869F */ ori $a2, $a2, 0x869f -/* E133D4 80240C74 8C440080 */ lw $a0, 0x80($v0) -/* E133D8 80240C78 8CA20330 */ lw $v0, 0x330($a1) -/* E133DC 80240C7C 8C83000C */ lw $v1, 0xc($a0) -/* E133E0 80240C80 00431021 */ addu $v0, $v0, $v1 -/* E133E4 80240C84 ACA20330 */ sw $v0, 0x330($a1) -/* E133E8 80240C88 00C2102B */ sltu $v0, $a2, $v0 -/* E133EC 80240C8C 10400002 */ beqz $v0, .L80240C98 -/* E133F0 80240C90 00A0382D */ daddu $a3, $a1, $zero -/* E133F4 80240C94 ACA60330 */ sw $a2, 0x330($a1) -.L80240C98: -/* E133F8 80240C98 94E20334 */ lhu $v0, 0x334($a3) -/* E133FC 80240C9C 8C83000C */ lw $v1, 0xc($a0) -/* E13400 80240CA0 0043102A */ slt $v0, $v0, $v1 -/* E13404 80240CA4 10400003 */ beqz $v0, .L80240CB4 -/* E13408 80240CA8 00000000 */ nop -/* E1340C 80240CAC 9482000E */ lhu $v0, 0xe($a0) -/* E13410 80240CB0 A4E20334 */ sh $v0, 0x334($a3) -.L80240CB4: -/* E13414 80240CB4 8C84000C */ lw $a0, 0xc($a0) -/* E13418 80240CB8 0C0496FA */ jal set_message_value -/* E1341C 80240CBC 0000282D */ daddu $a1, $zero, $zero -/* E13420 80240CC0 8FBF0010 */ lw $ra, 0x10($sp) -/* E13424 80240CC4 24020002 */ addiu $v0, $zero, 2 -/* E13428 80240CC8 03E00008 */ jr $ra -/* E1342C 80240CCC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_80240CD0_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_80240CD0_E12760.s deleted file mode 100644 index c6c3a06f53..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_80240CD0_E12760.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CD0_E13430 -/* E13430 80240CD0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13434 80240CD4 0000202D */ daddu $a0, $zero, $zero -/* E13438 80240CD8 AFBF0014 */ sw $ra, 0x14($sp) -/* E1343C 80240CDC 0C00FB3A */ jal get_enemy -/* E13440 80240CE0 AFB00010 */ sw $s0, 0x10($sp) -/* E13444 80240CE4 8C500080 */ lw $s0, 0x80($v0) -/* E13448 80240CE8 8E03000C */ lw $v1, 0xc($s0) -/* E1344C 80240CEC 28620065 */ slti $v0, $v1, 0x65 -/* E13450 80240CF0 14400003 */ bnez $v0, .L80240D00 -/* E13454 80240CF4 2862004C */ slti $v0, $v1, 0x4c -/* E13458 80240CF8 08090352 */ j .L80240D48 -/* E1345C 80240CFC 24040028 */ addiu $a0, $zero, 0x28 -.L80240D00: -/* E13460 80240D00 14400003 */ bnez $v0, .L80240D10 -/* E13464 80240D04 28620033 */ slti $v0, $v1, 0x33 -/* E13468 80240D08 08090352 */ j .L80240D48 -/* E1346C 80240D0C 24040023 */ addiu $a0, $zero, 0x23 -.L80240D10: -/* E13470 80240D10 14400003 */ bnez $v0, .L80240D20 -/* E13474 80240D14 2862001F */ slti $v0, $v1, 0x1f -/* E13478 80240D18 08090352 */ j .L80240D48 -/* E1347C 80240D1C 2404001E */ addiu $a0, $zero, 0x1e -.L80240D20: -/* E13480 80240D20 14400003 */ bnez $v0, .L80240D30 -/* E13484 80240D24 28620015 */ slti $v0, $v1, 0x15 -/* E13488 80240D28 08090352 */ j .L80240D48 -/* E1348C 80240D2C 2404000A */ addiu $a0, $zero, 0xa -.L80240D30: -/* E13490 80240D30 10400005 */ beqz $v0, .L80240D48 -/* E13494 80240D34 24040005 */ addiu $a0, $zero, 5 -/* E13498 80240D38 2862000B */ slti $v0, $v1, 0xb -/* E1349C 80240D3C 14400002 */ bnez $v0, .L80240D48 -/* E134A0 80240D40 24040001 */ addiu $a0, $zero, 1 -/* E134A4 80240D44 24040002 */ addiu $a0, $zero, 2 -.L80240D48: -/* E134A8 80240D48 8E02000C */ lw $v0, 0xc($s0) -/* E134AC 80240D4C 00441023 */ subu $v0, $v0, $a0 -/* E134B0 80240D50 0C03A830 */ jal add_coins -/* E134B4 80240D54 AE02000C */ sw $v0, 0xc($s0) -/* E134B8 80240D58 8E02000C */ lw $v0, 0xc($s0) -/* E134BC 80240D5C 24040211 */ addiu $a0, $zero, 0x211 -/* E134C0 80240D60 0C05272D */ jal play_sound -/* E134C4 80240D64 AE020010 */ sw $v0, 0x10($s0) -/* E134C8 80240D68 8E02000C */ lw $v0, 0xc($s0) -/* E134CC 80240D6C 8FBF0014 */ lw $ra, 0x14($sp) -/* E134D0 80240D70 8FB00010 */ lw $s0, 0x10($sp) -/* E134D4 80240D74 28420001 */ slti $v0, $v0, 1 -/* E134D8 80240D78 00021040 */ sll $v0, $v0, 1 -/* E134DC 80240D7C 03E00008 */ jr $ra -/* E134E0 80240D80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_80240D84_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_80240D84_E12760.s deleted file mode 100644 index 35d1627214..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_80240D84_E12760.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D84_E134E4 -/* E134E4 80240D84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E134E8 80240D88 AFBF0010 */ sw $ra, 0x10($sp) -/* E134EC 80240D8C 0C00FB3A */ jal get_enemy -/* E134F0 80240D90 0000202D */ daddu $a0, $zero, $zero -/* E134F4 80240D94 8C440080 */ lw $a0, 0x80($v0) -/* E134F8 80240D98 8C83000C */ lw $v1, 0xc($a0) -/* E134FC 80240D9C 00031840 */ sll $v1, $v1, 1 -/* E13500 80240DA0 AC83000C */ sw $v1, 0xc($a0) -/* E13504 80240DA4 AC830010 */ sw $v1, 0x10($a0) -/* E13508 80240DA8 8FBF0010 */ lw $ra, 0x10($sp) -/* E1350C 80240DAC 24020002 */ addiu $v0, $zero, 2 -/* E13510 80240DB0 03E00008 */ jr $ra -/* E13514 80240DB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_80240ECC_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_80240ECC_E12760.s deleted file mode 100644 index 6e1df13ec2..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_80240ECC_E12760.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ECC_E1362C -/* E1362C 80240ECC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E13630 80240ED0 AFB10014 */ sw $s1, 0x14($sp) -/* E13634 80240ED4 0080882D */ daddu $s1, $a0, $zero -/* E13638 80240ED8 0000202D */ daddu $a0, $zero, $zero -/* E1363C 80240EDC AFBF0018 */ sw $ra, 0x18($sp) -/* E13640 80240EE0 0C00FB3A */ jal get_enemy -/* E13644 80240EE4 AFB00010 */ sw $s0, 0x10($sp) -/* E13648 80240EE8 8E23000C */ lw $v1, 0xc($s1) -/* E1364C 80240EEC 8C650000 */ lw $a1, ($v1) -/* E13650 80240EF0 8C500080 */ lw $s0, 0x80($v0) -/* E13654 80240EF4 0C0B1EAF */ jal get_variable -/* E13658 80240EF8 0220202D */ daddu $a0, $s1, $zero -/* E1365C 80240EFC 0220202D */ daddu $a0, $s1, $zero -/* E13660 80240F00 3C05FE36 */ lui $a1, 0xfe36 -/* E13664 80240F04 00021840 */ sll $v1, $v0, 1 -/* E13668 80240F08 00621821 */ addu $v1, $v1, $v0 -/* E1366C 80240F0C 000318C0 */ sll $v1, $v1, 3 -/* E13670 80240F10 00621823 */ subu $v1, $v1, $v0 -/* E13674 80240F14 00031880 */ sll $v1, $v1, 2 -/* E13678 80240F18 02038021 */ addu $s0, $s0, $v1 -/* E1367C 80240F1C 8E060094 */ lw $a2, 0x94($s0) -/* E13680 80240F20 0C0B2190 */ jal set_float_variable -/* E13684 80240F24 34A53C85 */ ori $a1, $a1, 0x3c85 -/* E13688 80240F28 0220202D */ daddu $a0, $s1, $zero -/* E1368C 80240F2C 3C05FE36 */ lui $a1, 0xfe36 -/* E13690 80240F30 8E060098 */ lw $a2, 0x98($s0) -/* E13694 80240F34 0C0B2190 */ jal set_float_variable -/* E13698 80240F38 34A53C86 */ ori $a1, $a1, 0x3c86 -/* E1369C 80240F3C 0220202D */ daddu $a0, $s1, $zero -/* E136A0 80240F40 3C05FE36 */ lui $a1, 0xfe36 -/* E136A4 80240F44 8E06009C */ lw $a2, 0x9c($s0) -/* E136A8 80240F48 0C0B2190 */ jal set_float_variable -/* E136AC 80240F4C 34A53C87 */ ori $a1, $a1, 0x3c87 -/* E136B0 80240F50 0220202D */ daddu $a0, $s1, $zero -/* E136B4 80240F54 3C05FE36 */ lui $a1, 0xfe36 -/* E136B8 80240F58 8E0600B8 */ lw $a2, 0xb8($s0) -/* E136BC 80240F5C 0C0B2190 */ jal set_float_variable -/* E136C0 80240F60 34A53C88 */ ori $a1, $a1, 0x3c88 -/* E136C4 80240F64 0220202D */ daddu $a0, $s1, $zero -/* E136C8 80240F68 3C05FE36 */ lui $a1, 0xfe36 -/* E136CC 80240F6C 8E0600C4 */ lw $a2, 0xc4($s0) -/* E136D0 80240F70 0C0B2190 */ jal set_float_variable -/* E136D4 80240F74 34A53C89 */ ori $a1, $a1, 0x3c89 -/* E136D8 80240F78 8FBF0018 */ lw $ra, 0x18($sp) -/* E136DC 80240F7C 8FB10014 */ lw $s1, 0x14($sp) -/* E136E0 80240F80 8FB00010 */ lw $s0, 0x10($sp) -/* E136E4 80240F84 24020002 */ addiu $v0, $zero, 2 -/* E136E8 80240F88 03E00008 */ jr $ra -/* E136EC 80240F8C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_80240F90_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_80240F90_E12760.s deleted file mode 100644 index 6af066f472..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_80240F90_E12760.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F90_E136F0 -/* E136F0 80240F90 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* E136F4 80240F94 0000202D */ daddu $a0, $zero, $zero -/* E136F8 80240F98 AFBF002C */ sw $ra, 0x2c($sp) -/* E136FC 80240F9C AFB40028 */ sw $s4, 0x28($sp) -/* E13700 80240FA0 AFB30024 */ sw $s3, 0x24($sp) -/* E13704 80240FA4 AFB20020 */ sw $s2, 0x20($sp) -/* E13708 80240FA8 AFB1001C */ sw $s1, 0x1c($sp) -/* E1370C 80240FAC 0C00FB3A */ jal get_enemy -/* E13710 80240FB0 AFB00018 */ sw $s0, 0x18($sp) -/* E13714 80240FB4 0000802D */ daddu $s0, $zero, $zero -/* E13718 80240FB8 3C148024 */ lui $s4, 0x8024 -/* E1371C 80240FBC 26941AC8 */ addiu $s4, $s4, 0x1ac8 -/* E13720 80240FC0 3C138024 */ lui $s3, 0x8024 -/* E13724 80240FC4 26731AD4 */ addiu $s3, $s3, 0x1ad4 -/* E13728 80240FC8 3C128024 */ lui $s2, 0x8024 -/* E1372C 80240FCC 26521AE0 */ addiu $s2, $s2, 0x1ae0 -/* E13730 80240FD0 8C510080 */ lw $s1, 0x80($v0) -.L80240FD4: -/* E13734 80240FD4 8E220088 */ lw $v0, 0x88($s1) -/* E13738 80240FD8 0440001B */ bltz $v0, .L80241048 -/* E1373C 80240FDC 02141021 */ addu $v0, $s0, $s4 -/* E13740 80240FE0 02131821 */ addu $v1, $s0, $s3 -/* E13744 80240FE4 02122021 */ addu $a0, $s0, $s2 -/* E13748 80240FE8 80450000 */ lb $a1, ($v0) -/* E1374C 80240FEC 80620000 */ lb $v0, ($v1) -/* E13750 80240FF0 80830000 */ lb $v1, ($a0) -/* E13754 80240FF4 44850000 */ mtc1 $a1, $f0 -/* E13758 80240FF8 00000000 */ nop -/* E1375C 80240FFC 46800020 */ cvt.s.w $f0, $f0 -/* E13760 80241000 2442000D */ addiu $v0, $v0, 0xd -/* E13764 80241004 44050000 */ mfc1 $a1, $f0 -/* E13768 80241008 44820000 */ mtc1 $v0, $f0 -/* E1376C 8024100C 00000000 */ nop -/* E13770 80241010 46800020 */ cvt.s.w $f0, $f0 -/* E13774 80241014 24630005 */ addiu $v1, $v1, 5 -/* E13778 80241018 44060000 */ mfc1 $a2, $f0 -/* E1377C 8024101C 44830000 */ mtc1 $v1, $f0 -/* E13780 80241020 00000000 */ nop -/* E13784 80241024 46800020 */ cvt.s.w $f0, $f0 -/* E13788 80241028 44070000 */ mfc1 $a3, $f0 -/* E1378C 8024102C 24040001 */ addiu $a0, $zero, 1 -/* E13790 80241030 AFA00010 */ sw $zero, 0x10($sp) -/* E13794 80241034 0C01BECC */ jal fx_walk_normal -/* E13798 80241038 AFA00014 */ sw $zero, 0x14($sp) -/* E1379C 8024103C 8E240088 */ lw $a0, 0x88($s1) -/* E137A0 80241040 0C0441B4 */ jal delete_entity -/* E137A4 80241044 00000000 */ nop -.L80241048: -/* E137A8 80241048 26100001 */ addiu $s0, $s0, 1 -/* E137AC 8024104C 2A02000B */ slti $v0, $s0, 0xb -/* E137B0 80241050 1440FFE0 */ bnez $v0, .L80240FD4 -/* E137B4 80241054 2631005C */ addiu $s1, $s1, 0x5c -/* E137B8 80241058 24040283 */ addiu $a0, $zero, 0x283 -/* E137BC 8024105C 24050050 */ addiu $a1, $zero, 0x50 -/* E137C0 80241060 0000302D */ daddu $a2, $zero, $zero -/* E137C4 80241064 0C0526AE */ jal _play_sound -/* E137C8 80241068 00C0382D */ daddu $a3, $a2, $zero -/* E137CC 8024106C 8FBF002C */ lw $ra, 0x2c($sp) -/* E137D0 80241070 8FB40028 */ lw $s4, 0x28($sp) -/* E137D4 80241074 8FB30024 */ lw $s3, 0x24($sp) -/* E137D8 80241078 8FB20020 */ lw $s2, 0x20($sp) -/* E137DC 8024107C 8FB1001C */ lw $s1, 0x1c($sp) -/* E137E0 80241080 8FB00018 */ lw $s0, 0x18($sp) -/* E137E4 80241084 24020002 */ addiu $v0, $zero, 2 -/* E137E8 80241088 03E00008 */ jr $ra -/* E137EC 8024108C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_80241090_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_80241090_E12760.s deleted file mode 100644 index 0de47dc5f0..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_80241090_E12760.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241090_E137F0 -/* E137F0 80241090 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* E137F4 80241094 AFB00010 */ sw $s0, 0x10($sp) -/* E137F8 80241098 0080802D */ daddu $s0, $a0, $zero -/* E137FC 8024109C 0000202D */ daddu $a0, $zero, $zero -/* E13800 802410A0 AFBF0034 */ sw $ra, 0x34($sp) -/* E13804 802410A4 AFBE0030 */ sw $fp, 0x30($sp) -/* E13808 802410A8 AFB7002C */ sw $s7, 0x2c($sp) -/* E1380C 802410AC AFB60028 */ sw $s6, 0x28($sp) -/* E13810 802410B0 AFB50024 */ sw $s5, 0x24($sp) -/* E13814 802410B4 AFB40020 */ sw $s4, 0x20($sp) -/* E13818 802410B8 AFB3001C */ sw $s3, 0x1c($sp) -/* E1381C 802410BC AFB20018 */ sw $s2, 0x18($sp) -/* E13820 802410C0 0C00FB3A */ jal get_enemy -/* E13824 802410C4 AFB10014 */ sw $s1, 0x14($sp) -/* E13828 802410C8 0200202D */ daddu $a0, $s0, $zero -/* E1382C 802410CC 8C83000C */ lw $v1, 0xc($a0) -/* E13830 802410D0 0040B02D */ daddu $s6, $v0, $zero -/* E13834 802410D4 8C650000 */ lw $a1, ($v1) -/* E13838 802410D8 8ED20080 */ lw $s2, 0x80($s6) -/* E1383C 802410DC 0C0B1EAF */ jal get_variable -/* E13840 802410E0 0000802D */ daddu $s0, $zero, $zero -/* E13844 802410E4 0040982D */ daddu $s3, $v0, $zero -/* E13848 802410E8 00131880 */ sll $v1, $s3, 2 -/* E1384C 802410EC 02431821 */ addu $v1, $s2, $v1 -/* E13850 802410F0 8ED40074 */ lw $s4, 0x74($s6) -/* E13854 802410F4 8C75001C */ lw $s5, 0x1c($v1) -/* E13858 802410F8 2403FFFF */ addiu $v1, $zero, -1 -/* E1385C 802410FC 00141080 */ sll $v0, $s4, 2 -/* E13860 80241100 02421021 */ addu $v0, $s2, $v0 -/* E13864 80241104 AC550048 */ sw $s5, 0x48($v0) -/* E13868 80241108 00131040 */ sll $v0, $s3, 1 -/* E1386C 8024110C 00531021 */ addu $v0, $v0, $s3 -/* E13870 80241110 000210C0 */ sll $v0, $v0, 3 -/* E13874 80241114 00531023 */ subu $v0, $v0, $s3 -/* E13878 80241118 00021080 */ sll $v0, $v0, 2 -/* E1387C 8024111C 02421021 */ addu $v0, $s2, $v0 -/* E13880 80241120 AC430088 */ sw $v1, 0x88($v0) -/* E13884 80241124 26820001 */ addiu $v0, $s4, 1 -/* E13888 80241128 18400020 */ blez $v0, .L802411AC -/* E1388C 8024112C 0200202D */ daddu $a0, $s0, $zero -/* E13890 80241130 241E0003 */ addiu $fp, $zero, 3 -/* E13894 80241134 0040B82D */ daddu $s7, $v0, $zero -/* E13898 80241138 0240882D */ daddu $s1, $s2, $zero -.L8024113C: -/* E1389C 8024113C 8E230048 */ lw $v1, 0x48($s1) -/* E138A0 80241140 24060001 */ addiu $a2, $zero, 1 -/* E138A4 80241144 1066000D */ beq $v1, $a2, .L8024117C -/* E138A8 80241148 28620002 */ slti $v0, $v1, 2 -/* E138AC 8024114C 50400005 */ beql $v0, $zero, .L80241164 -/* E138B0 80241150 24060002 */ addiu $a2, $zero, 2 -/* E138B4 80241154 50600010 */ beql $v1, $zero, .L80241198 -/* E138B8 80241158 24840001 */ addiu $a0, $a0, 1 -/* E138BC 8024115C 08090467 */ j .L8024119C -/* E138C0 80241160 26310004 */ addiu $s1, $s1, 4 -.L80241164: -/* E138C4 80241164 10660007 */ beq $v1, $a2, .L80241184 -/* E138C8 80241168 00041080 */ sll $v0, $a0, 2 -/* E138CC 8024116C 107E0007 */ beq $v1, $fp, .L8024118C -/* E138D0 80241170 00000000 */ nop -/* E138D4 80241174 08090467 */ j .L8024119C -/* E138D8 80241178 26310004 */ addiu $s1, $s1, 4 -.L8024117C: -/* E138DC 8024117C 08090466 */ j .L80241198 -/* E138E0 80241180 24840005 */ addiu $a0, $a0, 5 -.L80241184: -/* E138E4 80241184 08090466 */ j .L80241198 -/* E138E8 80241188 00822021 */ addu $a0, $a0, $v0 -.L8024118C: -/* E138EC 8024118C 0C05272D */ jal play_sound -/* E138F0 80241190 2404021D */ addiu $a0, $zero, 0x21d -/* E138F4 80241194 0000202D */ daddu $a0, $zero, $zero -.L80241198: -/* E138F8 80241198 26310004 */ addiu $s1, $s1, 4 -.L8024119C: -/* E138FC 8024119C 26100001 */ addiu $s0, $s0, 1 -/* E13900 802411A0 0217102A */ slt $v0, $s0, $s7 -/* E13904 802411A4 1440FFE5 */ bnez $v0, .L8024113C -/* E13908 802411A8 00000000 */ nop -.L802411AC: -/* E1390C 802411AC AE440010 */ sw $a0, 0x10($s2) -/* E13910 802411B0 0000802D */ daddu $s0, $zero, $zero -/* E13914 802411B4 24040001 */ addiu $a0, $zero, 1 -/* E13918 802411B8 24050002 */ addiu $a1, $zero, 2 -/* E1391C 802411BC 0240182D */ daddu $v1, $s2, $zero -.L802411C0: -/* E13920 802411C0 8C62007C */ lw $v0, 0x7c($v1) -/* E13924 802411C4 16A20008 */ bne $s5, $v0, .L802411E8 -/* E13928 802411C8 26100001 */ addiu $s0, $s0, 1 -/* E1392C 802411CC 8C620074 */ lw $v0, 0x74($v1) -/* E13930 802411D0 14440006 */ bne $v0, $a0, .L802411EC -/* E13934 802411D4 2A02000B */ slti $v0, $s0, 0xb -/* E13938 802411D8 AC650074 */ sw $a1, 0x74($v1) -/* E1393C 802411DC AC730080 */ sw $s3, 0x80($v1) -/* E13940 802411E0 0809047D */ j .L802411F4 -/* E13944 802411E4 AC740084 */ sw $s4, 0x84($v1) -.L802411E8: -/* E13948 802411E8 2A02000B */ slti $v0, $s0, 0xb -.L802411EC: -/* E1394C 802411EC 1440FFF4 */ bnez $v0, .L802411C0 -/* E13950 802411F0 2463005C */ addiu $v1, $v1, 0x5c -.L802411F4: -/* E13954 802411F4 8EC30074 */ lw $v1, 0x74($s6) -/* E13958 802411F8 24630001 */ addiu $v1, $v1, 1 -/* E1395C 802411FC AEC30074 */ sw $v1, 0x74($s6) -/* E13960 80241200 8FBF0034 */ lw $ra, 0x34($sp) -/* E13964 80241204 8FBE0030 */ lw $fp, 0x30($sp) -/* E13968 80241208 8FB7002C */ lw $s7, 0x2c($sp) -/* E1396C 8024120C 8FB60028 */ lw $s6, 0x28($sp) -/* E13970 80241210 8FB50024 */ lw $s5, 0x24($sp) -/* E13974 80241214 8FB40020 */ lw $s4, 0x20($sp) -/* E13978 80241218 8FB3001C */ lw $s3, 0x1c($sp) -/* E1397C 8024121C 8FB20018 */ lw $s2, 0x18($sp) -/* E13980 80241220 8FB10014 */ lw $s1, 0x14($sp) -/* E13984 80241224 8FB00010 */ lw $s0, 0x10($sp) -/* E13988 80241228 24020002 */ addiu $v0, $zero, 2 -/* E1398C 8024122C 03E00008 */ jr $ra -/* E13990 80241230 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_80241510_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_80241510_E12760.s deleted file mode 100644 index ef894878a0..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_80241510_E12760.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241510_E13C70 -/* E13C70 80241510 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13C74 80241514 AFB00010 */ sw $s0, 0x10($sp) -/* E13C78 80241518 0080802D */ daddu $s0, $a0, $zero -/* E13C7C 8024151C 3C038011 */ lui $v1, %hi(gPlayerData) -/* E13C80 80241520 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* E13C84 80241524 10A00005 */ beqz $a1, .L8024153C -/* E13C88 80241528 AFBF0014 */ sw $ra, 0x14($sp) -/* E13C8C 8024152C 9462032E */ lhu $v0, 0x32e($v1) -/* E13C90 80241530 24420001 */ addiu $v0, $v0, 1 -/* E13C94 80241534 A462032E */ sh $v0, 0x32e($v1) -/* E13C98 80241538 AE000070 */ sw $zero, 0x70($s0) -.L8024153C: -/* E13C9C 8024153C 0C03A830 */ jal add_coins -/* E13CA0 80241540 2404FFFF */ addiu $a0, $zero, -1 -/* E13CA4 80241544 0C05272D */ jal play_sound -/* E13CA8 80241548 24040211 */ addiu $a0, $zero, 0x211 -/* E13CAC 8024154C 8E030070 */ lw $v1, 0x70($s0) -/* E13CB0 80241550 24630001 */ addiu $v1, $v1, 1 -/* E13CB4 80241554 3862000A */ xori $v0, $v1, 0xa -/* E13CB8 80241558 2C420001 */ sltiu $v0, $v0, 1 -/* E13CBC 8024155C AE030070 */ sw $v1, 0x70($s0) -/* E13CC0 80241560 8FBF0014 */ lw $ra, 0x14($sp) -/* E13CC4 80241564 8FB00010 */ lw $s0, 0x10($sp) -/* E13CC8 80241568 00021040 */ sll $v0, $v0, 1 -/* E13CCC 8024156C 03E00008 */ jr $ra -/* E13CD0 80241570 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_80241574_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_80241574_E12760.s deleted file mode 100644 index 7f6c2ab07d..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_80241574_E12760.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241574_E13CD4 -/* E13CD4 80241574 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13CD8 80241578 AFBF0010 */ sw $ra, 0x10($sp) -/* E13CDC 8024157C 0C00FB3A */ jal get_enemy -/* E13CE0 80241580 0000202D */ daddu $a0, $zero, $zero -/* E13CE4 80241584 0000302D */ daddu $a2, $zero, $zero -/* E13CE8 80241588 2407FFFF */ addiu $a3, $zero, -1 -/* E13CEC 8024158C 3C058024 */ lui $a1, 0x8024 -/* E13CF0 80241590 24A51B70 */ addiu $a1, $a1, 0x1b70 -/* E13CF4 80241594 8C420080 */ lw $v0, 0x80($v0) -/* E13CF8 80241598 3C048024 */ lui $a0, 0x8024 -/* E13CFC 8024159C 24841B44 */ addiu $a0, $a0, 0x1b44 -/* E13D00 802415A0 0040182D */ daddu $v1, $v0, $zero -/* E13D04 802415A4 AC60000C */ sw $zero, 0xc($v1) -/* E13D08 802415A8 AC600010 */ sw $zero, 0x10($v1) -.L802415AC: -/* E13D0C 802415AC AC600074 */ sw $zero, 0x74($v1) -/* E13D10 802415B0 8C820000 */ lw $v0, ($a0) -/* E13D14 802415B4 24840004 */ addiu $a0, $a0, 4 -/* E13D18 802415B8 24C60001 */ addiu $a2, $a2, 1 -/* E13D1C 802415BC AC620078 */ sw $v0, 0x78($v1) -/* E13D20 802415C0 8CA20000 */ lw $v0, ($a1) -/* E13D24 802415C4 24A50004 */ addiu $a1, $a1, 4 -/* E13D28 802415C8 AC670084 */ sw $a3, 0x84($v1) -/* E13D2C 802415CC AC62007C */ sw $v0, 0x7c($v1) -/* E13D30 802415D0 28C2000B */ slti $v0, $a2, 0xb -/* E13D34 802415D4 1440FFF5 */ bnez $v0, .L802415AC -/* E13D38 802415D8 2463005C */ addiu $v1, $v1, 0x5c -/* E13D3C 802415DC 8FBF0010 */ lw $ra, 0x10($sp) -/* E13D40 802415E0 24020002 */ addiu $v0, $zero, 2 -/* E13D44 802415E4 03E00008 */ jr $ra -/* E13D48 802415E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_802415EC_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_802415EC_E12760.s deleted file mode 100644 index 7c037489bf..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_802415EC_E12760.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415EC_E13D4C -/* E13D4C 802415EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E13D50 802415F0 0000202D */ daddu $a0, $zero, $zero -/* E13D54 802415F4 AFBF0018 */ sw $ra, 0x18($sp) -/* E13D58 802415F8 AFB10014 */ sw $s1, 0x14($sp) -/* E13D5C 802415FC 0C00FB3A */ jal get_enemy -/* E13D60 80241600 AFB00010 */ sw $s0, 0x10($sp) -/* E13D64 80241604 24040468 */ addiu $a0, $zero, 0x468 -/* E13D68 80241608 0C00AB0A */ jal general_heap_malloc -/* E13D6C 8024160C 0040882D */ daddu $s1, $v0, $zero -/* E13D70 80241610 0000202D */ daddu $a0, $zero, $zero -/* E13D74 80241614 3C058024 */ lui $a1, 0x8024 -/* E13D78 80241618 24A503C4 */ addiu $a1, $a1, 0x3c4 -/* E13D7C 8024161C 0040802D */ daddu $s0, $v0, $zero -/* E13D80 80241620 0C048C56 */ jal bind_dynamic_entity_3 -/* E13D84 80241624 AE300080 */ sw $s0, 0x80($s1) -/* E13D88 80241628 3C048011 */ lui $a0, %hi(D_80108558) -/* E13D8C 8024162C 24848558 */ addiu $a0, $a0, %lo(D_80108558) -/* E13D90 80241630 0C050529 */ jal create_icon -/* E13D94 80241634 AE020000 */ sw $v0, ($s0) -/* E13D98 80241638 0040202D */ daddu $a0, $v0, $zero -/* E13D9C 8024163C 24050080 */ addiu $a1, $zero, 0x80 -/* E13DA0 80241640 0C051280 */ jal set_icon_flags -/* E13DA4 80241644 AE040004 */ sw $a0, 4($s0) -/* E13DA8 80241648 240500FF */ addiu $a1, $zero, 0xff -/* E13DAC 8024164C 00A0302D */ daddu $a2, $a1, $zero -/* E13DB0 80241650 8E040004 */ lw $a0, 4($s0) -/* E13DB4 80241654 0C0513BF */ jal icon_set_tint -/* E13DB8 80241658 00A0382D */ daddu $a3, $a1, $zero -/* E13DBC 8024165C 24020141 */ addiu $v0, $zero, 0x141 -/* E13DC0 80241660 AE020014 */ sw $v0, 0x14($s0) -/* E13DC4 80241664 2402001C */ addiu $v0, $zero, 0x1c -/* E13DC8 80241668 0C03A625 */ jal func_800E9894 -/* E13DCC 8024166C AE020018 */ sw $v0, 0x18($s0) -/* E13DD0 80241670 0C03A5EE */ jal func_800E97B8 -/* E13DD4 80241674 00000000 */ nop -/* E13DD8 80241678 8FBF0018 */ lw $ra, 0x18($sp) -/* E13DDC 8024167C 8FB10014 */ lw $s1, 0x14($sp) -/* E13DE0 80241680 8FB00010 */ lw $s0, 0x10($sp) -/* E13DE4 80241684 24020002 */ addiu $v0, $zero, 2 -/* E13DE8 80241688 03E00008 */ jr $ra -/* E13DEC 8024168C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_80241690_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_80241690_E12760.s deleted file mode 100644 index aea6264fa5..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_80241690_E12760.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241690_E13DF0 -/* E13DF0 80241690 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13DF4 80241694 0000202D */ daddu $a0, $zero, $zero -/* E13DF8 80241698 AFBF0014 */ sw $ra, 0x14($sp) -/* E13DFC 8024169C 0C00FB3A */ jal get_enemy -/* E13E00 802416A0 AFB00010 */ sw $s0, 0x10($sp) -/* E13E04 802416A4 8C500080 */ lw $s0, 0x80($v0) -/* E13E08 802416A8 0C048D70 */ jal func_801235C0 -/* E13E0C 802416AC 8E040000 */ lw $a0, ($s0) -/* E13E10 802416B0 0C05123D */ jal free_icon -/* E13E14 802416B4 8E040004 */ lw $a0, 4($s0) -/* E13E18 802416B8 8FBF0014 */ lw $ra, 0x14($sp) -/* E13E1C 802416BC 8FB00010 */ lw $s0, 0x10($sp) -/* E13E20 802416C0 24020002 */ addiu $v0, $zero, 2 -/* E13E24 802416C4 03E00008 */ jr $ra -/* E13E28 802416C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_802416CC_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_802416CC_E12760.s deleted file mode 100644 index 9fe30cc31d..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_802416CC_E12760.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416CC_E13E2C -/* E13E2C 802416CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13E30 802416D0 3C05FE36 */ lui $a1, 0xfe36 -/* E13E34 802416D4 3C068011 */ lui $a2, 0x8011 -/* E13E38 802416D8 84C6F29C */ lh $a2, -0xd64($a2) -/* E13E3C 802416DC AFBF0010 */ sw $ra, 0x10($sp) -/* E13E40 802416E0 0C0B2026 */ jal set_variable -/* E13E44 802416E4 34A53C8A */ ori $a1, $a1, 0x3c8a -/* E13E48 802416E8 8FBF0010 */ lw $ra, 0x10($sp) -/* E13E4C 802416EC 24020002 */ addiu $v0, $zero, 2 -/* E13E50 802416F0 03E00008 */ jr $ra -/* E13E54 802416F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_802416F8_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_802416F8_E12760.s deleted file mode 100644 index a4161e932f..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_802416F8_E12760.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416F8_E13E58 -/* E13E58 802416F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13E5C 802416FC 0000202D */ daddu $a0, $zero, $zero -/* E13E60 80241700 AFBF0014 */ sw $ra, 0x14($sp) -/* E13E64 80241704 0C00FB3A */ jal get_enemy -/* E13E68 80241708 AFB00010 */ sw $s0, 0x10($sp) -/* E13E6C 8024170C 8C50007C */ lw $s0, 0x7c($v0) -/* E13E70 80241710 8C420074 */ lw $v0, 0x74($v0) -/* E13E74 80241714 0000282D */ daddu $a1, $zero, $zero -/* E13E78 80241718 02028023 */ subu $s0, $s0, $v0 -/* E13E7C 8024171C 26100001 */ addiu $s0, $s0, 1 -/* E13E80 80241720 0C0496FA */ jal set_message_value -/* E13E84 80241724 0200202D */ daddu $a0, $s0, $zero -/* E13E88 80241728 3C048015 */ lui $a0, 0x8015 -/* E13E8C 8024172C 2484C290 */ addiu $a0, $a0, -0x3d70 -/* E13E90 80241730 24020001 */ addiu $v0, $zero, 1 -/* E13E94 80241734 16020003 */ bne $s0, $v0, .L80241744 -/* E13E98 80241738 00000000 */ nop -/* E13E9C 8024173C 3C048015 */ lui $a0, 0x8015 -/* E13EA0 80241740 2484C294 */ addiu $a0, $a0, -0x3d6c -.L80241744: -/* E13EA4 80241744 0C0496CF */ jal set_message_string -/* E13EA8 80241748 24050001 */ addiu $a1, $zero, 1 -/* E13EAC 8024174C 8FBF0014 */ lw $ra, 0x14($sp) -/* E13EB0 80241750 8FB00010 */ lw $s0, 0x10($sp) -/* E13EB4 80241754 24020002 */ addiu $v0, $zero, 2 -/* E13EB8 80241758 03E00008 */ jr $ra -/* E13EBC 8024175C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_80241760_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_80241760_E12760.s deleted file mode 100644 index 431a5dbe42..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_80241760_E12760.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241760_E13EC0 -/* E13EC0 80241760 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13EC4 80241764 AFBF0010 */ sw $ra, 0x10($sp) -/* E13EC8 80241768 0C03A5B2 */ jal func_800E96C8 -/* E13ECC 8024176C 00000000 */ nop -/* E13ED0 80241770 8FBF0010 */ lw $ra, 0x10($sp) -/* E13ED4 80241774 24020002 */ addiu $v0, $zero, 2 -/* E13ED8 80241778 03E00008 */ jr $ra -/* E13EDC 8024177C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/func_80241780_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/func_80241780_E12760.s deleted file mode 100644 index a8bd896ba2..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/func_80241780_E12760.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241780_E13EE0 -/* E13EE0 80241780 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13EE4 80241784 3C048024 */ lui $a0, 0x8024 -/* E13EE8 80241788 24843560 */ addiu $a0, $a0, 0x3560 -/* E13EEC 8024178C AFBF0010 */ sw $ra, 0x10($sp) -/* E13EF0 80241790 0C0496CB */ jal set_message_images -/* E13EF4 80241794 00000000 */ nop -/* E13EF8 80241798 8FBF0010 */ lw $ra, 0x10($sp) -/* E13EFC 8024179C 24020002 */ addiu $v0, $zero, 2 -/* E13F00 802417A0 03E00008 */ jr $ra -/* E13F04 802417A4 27BD0018 */ addiu $sp, $sp, 0x18 -/* E13F08 802417A8 00000000 */ nop -/* E13F0C 802417AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/func_80240430_E15D80.s b/asm/nonmatchings/world/area_mgm/mgm_02/func_80240430_E15D80.s deleted file mode 100644 index 7da7001eaa..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/func_80240430_E15D80.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240430_E161B0 -/* E161B0 80240430 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E161B4 80240434 2402002D */ addiu $v0, $zero, 0x2d -/* E161B8 80240438 AFA20010 */ sw $v0, 0x10($sp) -/* E161BC 8024043C 3C028024 */ lui $v0, 0x8024 -/* E161C0 80240440 24420000 */ addiu $v0, $v0, 0 -/* E161C4 80240444 27A40010 */ addiu $a0, $sp, 0x10 -/* E161C8 80240448 AFBF0020 */ sw $ra, 0x20($sp) -/* E161CC 8024044C AFA00018 */ sw $zero, 0x18($sp) -/* E161D0 80240450 AFA2001C */ sw $v0, 0x1c($sp) -/* E161D4 80240454 0C047644 */ jal queue_render_task -/* E161D8 80240458 AFA00014 */ sw $zero, 0x14($sp) -/* E161DC 8024045C 8FBF0020 */ lw $ra, 0x20($sp) -/* E161E0 80240460 03E00008 */ jr $ra -/* E161E4 80240464 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/func_80240468_E15D80.s b/asm/nonmatchings/world/area_mgm/mgm_02/func_80240468_E15D80.s deleted file mode 100644 index 8208bf8c9e..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/func_80240468_E15D80.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240468_E161E8 -/* E161E8 80240468 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E161EC 8024046C AFB00010 */ sw $s0, 0x10($sp) -/* E161F0 80240470 00A0802D */ daddu $s0, $a1, $zero -/* E161F4 80240474 0000202D */ daddu $a0, $zero, $zero -/* E161F8 80240478 AFBF001C */ sw $ra, 0x1c($sp) -/* E161FC 8024047C AFB20018 */ sw $s2, 0x18($sp) -/* E16200 80240480 0C00FB3A */ jal get_enemy -/* E16204 80240484 AFB10014 */ sw $s1, 0x14($sp) -/* E16208 80240488 8C52006C */ lw $s2, 0x6c($v0) -/* E1620C 8024048C 12000026 */ beqz $s0, .L80240528 -/* E16210 80240490 00000000 */ nop -/* E16214 80240494 3C058024 */ lui $a1, 0x8024 -/* E16218 80240498 24A50430 */ addiu $a1, $a1, 0x430 -/* E1621C 8024049C 0C048C56 */ jal bind_dynamic_entity_3 -/* E16220 802404A0 0000202D */ daddu $a0, $zero, $zero -/* E16224 802404A4 3C118011 */ lui $s1, 0x8011 -/* E16228 802404A8 26318B28 */ addiu $s1, $s1, -0x74d8 -/* E1622C 802404AC 0220202D */ daddu $a0, $s1, $zero -/* E16230 802404B0 0C050529 */ jal create_icon -/* E16234 802404B4 AE420000 */ sw $v0, ($s2) -/* E16238 802404B8 0040802D */ daddu $s0, $v0, $zero -/* E1623C 802404BC 0200202D */ daddu $a0, $s0, $zero -/* E16240 802404C0 0000282D */ daddu $a1, $zero, $zero -/* E16244 802404C4 0C051277 */ jal func_801449DC -/* E16248 802404C8 AE50000C */ sw $s0, 0xc($s2) -/* E1624C 802404CC 0200202D */ daddu $a0, $s0, $zero -/* E16250 802404D0 0C051280 */ jal set_icon_flags -/* E16254 802404D4 24050080 */ addiu $a1, $zero, 0x80 -/* E16258 802404D8 0200202D */ daddu $a0, $s0, $zero -/* E1625C 802404DC 240500FF */ addiu $a1, $zero, 0xff -/* E16260 802404E0 00A0302D */ daddu $a2, $a1, $zero -/* E16264 802404E4 0C0513BF */ jal icon_set_tint -/* E16268 802404E8 00A0382D */ daddu $a3, $a1, $zero -/* E1626C 802404EC 0200202D */ daddu $a0, $s0, $zero -/* E16270 802404F0 0C0511FF */ jal set_menu_icon_script -/* E16274 802404F4 0220282D */ daddu $a1, $s1, $zero -/* E16278 802404F8 3C048011 */ lui $a0, 0x8011 -/* E1627C 802404FC 24848AFC */ addiu $a0, $a0, -0x7504 -/* E16280 80240500 0C050529 */ jal create_icon -/* E16284 80240504 00000000 */ nop -/* E16288 80240508 0040802D */ daddu $s0, $v0, $zero -/* E1628C 8024050C 0200202D */ daddu $a0, $s0, $zero -/* E16290 80240510 0000282D */ daddu $a1, $zero, $zero -/* E16294 80240514 0C051277 */ jal func_801449DC -/* E16298 80240518 AE500010 */ sw $s0, 0x10($s2) -/* E1629C 8024051C 0200202D */ daddu $a0, $s0, $zero -/* E162A0 80240520 0C051280 */ jal set_icon_flags -/* E162A4 80240524 24050080 */ addiu $a1, $zero, 0x80 -.L80240528: -/* E162A8 80240528 8FBF001C */ lw $ra, 0x1c($sp) -/* E162AC 8024052C 8FB20018 */ lw $s2, 0x18($sp) -/* E162B0 80240530 8FB10014 */ lw $s1, 0x14($sp) -/* E162B4 80240534 8FB00010 */ lw $s0, 0x10($sp) -/* E162B8 80240538 0000102D */ daddu $v0, $zero, $zero -/* E162BC 8024053C 03E00008 */ jr $ra -/* E162C0 80240540 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/func_80240544_E15D80.s b/asm/nonmatchings/world/area_mgm/mgm_02/func_80240544_E15D80.s deleted file mode 100644 index 88d93e4035..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/func_80240544_E15D80.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240544_E162C4 -/* E162C4 80240544 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E162C8 80240548 3C02800A */ lui $v0, %hi(D_8009A650) -/* E162CC 8024054C 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* E162D0 80240550 AFBF0010 */ sw $ra, 0x10($sp) -/* E162D4 80240554 8C430000 */ lw $v1, ($v0) -/* E162D8 80240558 3C040004 */ lui $a0, 4 -/* E162DC 8024055C 00641825 */ or $v1, $v1, $a0 -/* E162E0 80240560 0C03A625 */ jal func_800E9894 -/* E162E4 80240564 AC430000 */ sw $v1, ($v0) -/* E162E8 80240568 0C03A5EE */ jal func_800E97B8 -/* E162EC 8024056C 00000000 */ nop -/* E162F0 80240570 8FBF0010 */ lw $ra, 0x10($sp) -/* E162F4 80240574 24020002 */ addiu $v0, $zero, 2 -/* E162F8 80240578 03E00008 */ jr $ra -/* E162FC 8024057C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/func_80240580_E15D80.s b/asm/nonmatchings/world/area_mgm/mgm_02/func_80240580_E15D80.s deleted file mode 100644 index d18696c29f..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/func_80240580_E15D80.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240580_E16300 -/* E16300 80240580 3C04FFFB */ lui $a0, 0xfffb -/* E16304 80240584 3C03800A */ lui $v1, %hi(D_8009A650) -/* E16308 80240588 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* E1630C 8024058C 8C620000 */ lw $v0, ($v1) -/* E16310 80240590 3484FFFF */ ori $a0, $a0, 0xffff -/* E16314 80240594 00441024 */ and $v0, $v0, $a0 -/* E16318 80240598 AC620000 */ sw $v0, ($v1) -/* E1631C 8024059C 03E00008 */ jr $ra -/* E16320 802405A0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/func_802405A4_E15D80.s b/asm/nonmatchings/world/area_mgm/mgm_02/func_802405A4_E15D80.s deleted file mode 100644 index 3bdfdd9b89..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/func_802405A4_E15D80.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A4_E16324 -/* E16324 802405A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E16328 802405A8 AFBF0010 */ sw $ra, 0x10($sp) -/* E1632C 802405AC 0C00FB3A */ jal get_enemy -/* E16330 802405B0 0000202D */ daddu $a0, $zero, $zero -/* E16334 802405B4 8C42006C */ lw $v0, 0x6c($v0) -/* E16338 802405B8 0C0441B4 */ jal delete_entity -/* E1633C 802405BC 8C44001C */ lw $a0, 0x1c($v0) -/* E16340 802405C0 8FBF0010 */ lw $ra, 0x10($sp) -/* E16344 802405C4 24020002 */ addiu $v0, $zero, 2 -/* E16348 802405C8 03E00008 */ jr $ra -/* E1634C 802405CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/func_802405D0_E15D80.s b/asm/nonmatchings/world/area_mgm/mgm_02/func_802405D0_E15D80.s deleted file mode 100644 index 76f0a5816e..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/func_802405D0_E15D80.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405D0_E16350 -/* E16350 802405D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* E16354 802405D4 0000202D */ daddu $a0, $zero, $zero -/* E16358 802405D8 AFBF002C */ sw $ra, 0x2c($sp) -/* E1635C 802405DC 0C00FB3A */ jal get_enemy -/* E16360 802405E0 AFB00028 */ sw $s0, 0x28($sp) -/* E16364 802405E4 3C04802F */ lui $a0, 0x802f -/* E16368 802405E8 2484AFDC */ addiu $a0, $a0, -0x5024 -/* E1636C 802405EC 8C50006C */ lw $s0, 0x6c($v0) -/* E16370 802405F0 3C028000 */ lui $v0, 0x8000 -/* E16374 802405F4 24050163 */ addiu $a1, $zero, 0x163 -/* E16378 802405F8 24060014 */ addiu $a2, $zero, 0x14 -/* E1637C 802405FC 2407FF4C */ addiu $a3, $zero, -0xb4 -/* E16380 80240600 AFA00010 */ sw $zero, 0x10($sp) -/* E16384 80240604 AFA00014 */ sw $zero, 0x14($sp) -/* E16388 80240608 AFA00018 */ sw $zero, 0x18($sp) -/* E1638C 8024060C AFA0001C */ sw $zero, 0x1c($sp) -/* E16390 80240610 0C044631 */ jal create_entity -/* E16394 80240614 AFA20020 */ sw $v0, 0x20($sp) -/* E16398 80240618 0040202D */ daddu $a0, $v0, $zero -/* E1639C 8024061C 0C04417A */ jal get_entity_by_index -/* E163A0 80240620 AE04001C */ sw $a0, 0x1c($s0) -/* E163A4 80240624 3C038024 */ lui $v1, 0x8024 -/* E163A8 80240628 24632A3C */ addiu $v1, $v1, 0x2a3c -/* E163AC 8024062C AC430028 */ sw $v1, 0x28($v0) -/* E163B0 80240630 8FBF002C */ lw $ra, 0x2c($sp) -/* E163B4 80240634 8FB00028 */ lw $s0, 0x28($sp) -/* E163B8 80240638 24020002 */ addiu $v0, $zero, 2 -/* E163BC 8024063C 03E00008 */ jr $ra -/* E163C0 80240640 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/func_80240644_E15D80.s b/asm/nonmatchings/world/area_mgm/mgm_02/func_80240644_E15D80.s deleted file mode 100644 index 2d28fcb059..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/func_80240644_E15D80.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240644_E163C4 -/* E163C4 80240644 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E163C8 80240648 AFB20018 */ sw $s2, 0x18($sp) -/* E163CC 8024064C 0080902D */ daddu $s2, $a0, $zero -/* E163D0 80240650 0000202D */ daddu $a0, $zero, $zero -/* E163D4 80240654 AFBF001C */ sw $ra, 0x1c($sp) -/* E163D8 80240658 AFB10014 */ sw $s1, 0x14($sp) -/* E163DC 8024065C 0C00FB3A */ jal get_enemy -/* E163E0 80240660 AFB00010 */ sw $s0, 0x10($sp) -/* E163E4 80240664 0240202D */ daddu $a0, $s2, $zero -/* E163E8 80240668 3C05FE36 */ lui $a1, 0xfe36 -/* E163EC 8024066C 8C51006C */ lw $s1, 0x6c($v0) -/* E163F0 80240670 0C0B1EAF */ jal get_variable -/* E163F4 80240674 34A53C8A */ ori $a1, $a1, 0x3c8a -/* E163F8 80240678 0240202D */ daddu $a0, $s2, $zero -/* E163FC 8024067C 3C05FE36 */ lui $a1, 0xfe36 -/* E16400 80240680 34A53C8B */ ori $a1, $a1, 0x3c8b -/* E16404 80240684 0C0B1EAF */ jal get_variable -/* E16408 80240688 0040802D */ daddu $s0, $v0, $zero -/* E1640C 8024068C 0000182D */ daddu $v1, $zero, $zero -/* E16410 80240690 0220202D */ daddu $a0, $s1, $zero -.L80240694: -/* E16414 80240694 8C820038 */ lw $v0, 0x38($a0) -/* E16418 80240698 52020006 */ beql $s0, $v0, .L802406B4 -/* E1641C 8024069C 0240202D */ daddu $a0, $s2, $zero -/* E16420 802406A0 24630001 */ addiu $v1, $v1, 1 -/* E16424 802406A4 28620023 */ slti $v0, $v1, 0x23 -/* E16428 802406A8 1440FFFA */ bnez $v0, .L80240694 -/* E1642C 802406AC 2484001C */ addiu $a0, $a0, 0x1c -/* E16430 802406B0 0240202D */ daddu $a0, $s2, $zero -.L802406B4: -/* E16434 802406B4 3C05FE36 */ lui $a1, 0xfe36 -/* E16438 802406B8 000310C0 */ sll $v0, $v1, 3 -/* E1643C 802406BC 00431023 */ subu $v0, $v0, $v1 -/* E16440 802406C0 00021080 */ sll $v0, $v0, 2 -/* E16444 802406C4 02228021 */ addu $s0, $s1, $v0 -/* E16448 802406C8 8E060034 */ lw $a2, 0x34($s0) -/* E1644C 802406CC 0C0B2026 */ jal set_variable -/* E16450 802406D0 34A53C8C */ ori $a1, $a1, 0x3c8c -/* E16454 802406D4 8E030034 */ lw $v1, 0x34($s0) -/* E16458 802406D8 24020001 */ addiu $v0, $zero, 1 -/* E1645C 802406DC 10620013 */ beq $v1, $v0, .L8024072C -/* E16460 802406E0 28620002 */ slti $v0, $v1, 2 -/* E16464 802406E4 10400005 */ beqz $v0, .L802406FC -/* E16468 802406E8 24020002 */ addiu $v0, $zero, 2 -/* E1646C 802406EC 10600009 */ beqz $v1, .L80240714 -/* E16470 802406F0 0240202D */ daddu $a0, $s2, $zero -/* E16474 802406F4 080901DD */ j .L80240774 -/* E16478 802406F8 00000000 */ nop -.L802406FC: -/* E1647C 802406FC 10620018 */ beq $v1, $v0, .L80240760 -/* E16480 80240700 24020003 */ addiu $v0, $zero, 3 -/* E16484 80240704 10620010 */ beq $v1, $v0, .L80240748 -/* E16488 80240708 0240202D */ daddu $a0, $s2, $zero -/* E1648C 8024070C 080901DD */ j .L80240774 -/* E16490 80240710 00000000 */ nop -.L80240714: -/* E16494 80240714 3C05FE36 */ lui $a1, 0xfe36 -/* E16498 80240718 8E060040 */ lw $a2, 0x40($s0) -/* E1649C 8024071C 0C0B2026 */ jal set_variable -/* E164A0 80240720 34A53C8D */ ori $a1, $a1, 0x3c8d -/* E164A4 80240724 080901DC */ j .L80240770 -/* E164A8 80240728 2402000D */ addiu $v0, $zero, 0xd -.L8024072C: -/* E164AC 8024072C 0240202D */ daddu $a0, $s2, $zero -/* E164B0 80240730 3C05FE36 */ lui $a1, 0xfe36 -/* E164B4 80240734 8E060040 */ lw $a2, 0x40($s0) -/* E164B8 80240738 0C0B2026 */ jal set_variable -/* E164BC 8024073C 34A53C8D */ ori $a1, $a1, 0x3c8d -/* E164C0 80240740 080901DC */ j .L80240770 -/* E164C4 80240744 24020021 */ addiu $v0, $zero, 0x21 -.L80240748: -/* E164C8 80240748 3C05FE36 */ lui $a1, 0xfe36 -/* E164CC 8024074C 8E060040 */ lw $a2, 0x40($s0) -/* E164D0 80240750 0C0B2026 */ jal set_variable -/* E164D4 80240754 34A53C8D */ ori $a1, $a1, 0x3c8d -/* E164D8 80240758 080901DC */ j .L80240770 -/* E164DC 8024075C 24020034 */ addiu $v0, $zero, 0x34 -.L80240760: -/* E164E0 80240760 8E220004 */ lw $v0, 4($s1) -/* E164E4 80240764 24420001 */ addiu $v0, $v0, 1 -/* E164E8 80240768 AE220004 */ sw $v0, 4($s1) -/* E164EC 8024076C 24020049 */ addiu $v0, $zero, 0x49 -.L80240770: -/* E164F0 80240770 AE02002C */ sw $v0, 0x2c($s0) -.L80240774: -/* E164F4 80240774 8FBF001C */ lw $ra, 0x1c($sp) -/* E164F8 80240778 8FB20018 */ lw $s2, 0x18($sp) -/* E164FC 8024077C 8FB10014 */ lw $s1, 0x14($sp) -/* E16500 80240780 8FB00010 */ lw $s0, 0x10($sp) -/* E16504 80240784 24020002 */ addiu $v0, $zero, 2 -/* E16508 80240788 03E00008 */ jr $ra -/* E1650C 8024078C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/func_80240790_E15D80.s b/asm/nonmatchings/world/area_mgm/mgm_02/func_80240790_E15D80.s deleted file mode 100644 index 838e69023e..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/func_80240790_E15D80.s +++ /dev/null @@ -1,292 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240790_E16510 -/* E16510 80240790 27BDFF40 */ addiu $sp, $sp, -0xc0 -/* E16514 80240794 0000202D */ daddu $a0, $zero, $zero -/* E16518 80240798 AFBF00BC */ sw $ra, 0xbc($sp) -/* E1651C 8024079C AFB600B8 */ sw $s6, 0xb8($sp) -/* E16520 802407A0 AFB500B4 */ sw $s5, 0xb4($sp) -/* E16524 802407A4 AFB400B0 */ sw $s4, 0xb0($sp) -/* E16528 802407A8 AFB300AC */ sw $s3, 0xac($sp) -/* E1652C 802407AC AFB200A8 */ sw $s2, 0xa8($sp) -/* E16530 802407B0 AFB100A4 */ sw $s1, 0xa4($sp) -/* E16534 802407B4 0C00FB3A */ jal get_enemy -/* E16538 802407B8 AFB000A0 */ sw $s0, 0xa0($sp) -/* E1653C 802407BC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* E16540 802407C0 8C55006C */ lw $s5, 0x6c($v0) -/* E16544 802407C4 2402038E */ addiu $v0, $zero, 0x38e -/* E16548 802407C8 AEA00004 */ sw $zero, 4($s5) -/* E1654C 802407CC AEA20008 */ sw $v0, 8($s5) -/* E16550 802407D0 AEA00020 */ sw $zero, 0x20($s5) -/* E16554 802407D4 AEA00024 */ sw $zero, 0x24($s5) -/* E16558 802407D8 0C00A67F */ jal rand_int -/* E1655C 802407DC AEA00028 */ sw $zero, 0x28($s5) -/* E16560 802407E0 3C035555 */ lui $v1, 0x5555 -/* E16564 802407E4 34635556 */ ori $v1, $v1, 0x5556 -/* E16568 802407E8 00430018 */ mult $v0, $v1 -/* E1656C 802407EC 0000802D */ daddu $s0, $zero, $zero -/* E16570 802407F0 3C068024 */ lui $a2, 0x8024 -/* E16574 802407F4 24C6273C */ addiu $a2, $a2, 0x273c -/* E16578 802407F8 27A50010 */ addiu $a1, $sp, 0x10 -/* E1657C 802407FC 00021FC3 */ sra $v1, $v0, 0x1f -/* E16580 80240800 00004010 */ mfhi $t0 -/* E16584 80240804 01032023 */ subu $a0, $t0, $v1 -/* E16588 80240808 00041840 */ sll $v1, $a0, 1 -/* E1658C 8024080C 00641821 */ addu $v1, $v1, $a0 -/* E16590 80240810 00432023 */ subu $a0, $v0, $v1 -/* E16594 80240814 000410C0 */ sll $v0, $a0, 3 -/* E16598 80240818 00441021 */ addu $v0, $v0, $a0 -/* E1659C 8024081C 00021080 */ sll $v0, $v0, 2 -/* E165A0 80240820 00441023 */ subu $v0, $v0, $a0 -/* E165A4 80240824 00021880 */ sll $v1, $v0, 2 -.L80240828: -/* E165A8 80240828 00661021 */ addu $v0, $v1, $a2 -/* E165AC 8024082C 24630004 */ addiu $v1, $v1, 4 -/* E165B0 80240830 8C420000 */ lw $v0, ($v0) -/* E165B4 80240834 26100001 */ addiu $s0, $s0, 1 -/* E165B8 80240838 ACA20000 */ sw $v0, ($a1) -/* E165BC 8024083C 2A020023 */ slti $v0, $s0, 0x23 -/* E165C0 80240840 1440FFF9 */ bnez $v0, .L80240828 -/* E165C4 80240844 24A50004 */ addiu $a1, $a1, 4 -/* E165C8 80240848 0000802D */ daddu $s0, $zero, $zero -/* E165CC 8024084C 3C13EA0E */ lui $s3, 0xea0e -/* E165D0 80240850 3673A0EB */ ori $s3, $s3, 0xa0eb -/* E165D4 80240854 27B20010 */ addiu $s2, $sp, 0x10 -.L80240858: -/* E165D8 80240858 0C00A67F */ jal rand_int -/* E165DC 8024085C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* E165E0 80240860 00530018 */ mult $v0, $s3 -/* E165E4 80240864 240403E8 */ addiu $a0, $zero, 0x3e8 -/* E165E8 80240868 00022FC3 */ sra $a1, $v0, 0x1f -/* E165EC 8024086C 00004010 */ mfhi $t0 -/* E165F0 80240870 01021821 */ addu $v1, $t0, $v0 -/* E165F4 80240874 00031943 */ sra $v1, $v1, 5 -/* E165F8 80240878 00658823 */ subu $s1, $v1, $a1 -/* E165FC 8024087C 001118C0 */ sll $v1, $s1, 3 -/* E16600 80240880 00711821 */ addu $v1, $v1, $s1 -/* E16604 80240884 00031880 */ sll $v1, $v1, 2 -/* E16608 80240888 00711823 */ subu $v1, $v1, $s1 -/* E1660C 8024088C 0C00A67F */ jal rand_int -/* E16610 80240890 00438823 */ subu $s1, $v0, $v1 -/* E16614 80240894 00530018 */ mult $v0, $s3 -/* E16618 80240898 000227C3 */ sra $a0, $v0, 0x1f -/* E1661C 8024089C 00004010 */ mfhi $t0 -/* E16620 802408A0 01021821 */ addu $v1, $t0, $v0 -/* E16624 802408A4 00031943 */ sra $v1, $v1, 5 -/* E16628 802408A8 00642023 */ subu $a0, $v1, $a0 -/* E1662C 802408AC 000418C0 */ sll $v1, $a0, 3 -/* E16630 802408B0 00641821 */ addu $v1, $v1, $a0 -/* E16634 802408B4 00031880 */ sll $v1, $v1, 2 -/* E16638 802408B8 00641823 */ subu $v1, $v1, $a0 -/* E1663C 802408BC 00432023 */ subu $a0, $v0, $v1 -/* E16640 802408C0 12240009 */ beq $s1, $a0, .L802408E8 -/* E16644 802408C4 26100001 */ addiu $s0, $s0, 1 -/* E16648 802408C8 00041880 */ sll $v1, $a0, 2 -/* E1664C 802408CC 02431821 */ addu $v1, $s2, $v1 -/* E16650 802408D0 00111080 */ sll $v0, $s1, 2 -/* E16654 802408D4 02421021 */ addu $v0, $s2, $v0 -/* E16658 802408D8 8C440000 */ lw $a0, ($v0) -/* E1665C 802408DC 8C650000 */ lw $a1, ($v1) -/* E16660 802408E0 AC640000 */ sw $a0, ($v1) -/* E16664 802408E4 AC450000 */ sw $a1, ($v0) -.L802408E8: -/* E16668 802408E8 2A022710 */ slti $v0, $s0, 0x2710 -/* E1666C 802408EC 1440FFDA */ bnez $v0, .L80240858 -/* E16670 802408F0 2407FFFF */ addiu $a3, $zero, -1 -/* E16674 802408F4 0000802D */ daddu $s0, $zero, $zero -/* E16678 802408F8 3C068024 */ lui $a2, 0x8024 -/* E1667C 802408FC 24C6296C */ addiu $a2, $a2, 0x296c -/* E16680 80240900 3C058024 */ lui $a1, 0x8024 -/* E16684 80240904 24A528E0 */ addiu $a1, $a1, 0x28e0 -/* E16688 80240908 27A40010 */ addiu $a0, $sp, 0x10 -/* E1668C 8024090C 02A0182D */ daddu $v1, $s5, $zero -.L80240910: -/* E16690 80240910 AC67002C */ sw $a3, 0x2c($v1) -/* E16694 80240914 AC600030 */ sw $zero, 0x30($v1) -/* E16698 80240918 8C820000 */ lw $v0, ($a0) -/* E1669C 8024091C 24840004 */ addiu $a0, $a0, 4 -/* E166A0 80240920 26100001 */ addiu $s0, $s0, 1 -/* E166A4 80240924 AC620034 */ sw $v0, 0x34($v1) -/* E166A8 80240928 8CA20000 */ lw $v0, ($a1) -/* E166AC 8024092C 24A50004 */ addiu $a1, $a1, 4 -/* E166B0 80240930 AC620038 */ sw $v0, 0x38($v1) -/* E166B4 80240934 8CC20000 */ lw $v0, ($a2) -/* E166B8 80240938 24C60004 */ addiu $a2, $a2, 4 -/* E166BC 8024093C AC670040 */ sw $a3, 0x40($v1) -/* E166C0 80240940 AC670044 */ sw $a3, 0x44($v1) -/* E166C4 80240944 AC62003C */ sw $v0, 0x3c($v1) -/* E166C8 80240948 2A020023 */ slti $v0, $s0, 0x23 -/* E166CC 8024094C 1440FFF0 */ bnez $v0, .L80240910 -/* E166D0 80240950 2463001C */ addiu $v1, $v1, 0x1c -/* E166D4 80240954 2410000A */ addiu $s0, $zero, 0xa -.L80240958: -/* E166D8 80240958 0C00FB3A */ jal get_enemy -/* E166DC 8024095C 0200202D */ daddu $a0, $s0, $zero -/* E166E0 80240960 AC40006C */ sw $zero, 0x6c($v0) -/* E166E4 80240964 26100001 */ addiu $s0, $s0, 1 -/* E166E8 80240968 2A02000F */ slti $v0, $s0, 0xf -/* E166EC 8024096C 1440FFFA */ bnez $v0, .L80240958 -/* E166F0 80240970 00000000 */ nop -/* E166F4 80240974 2410001E */ addiu $s0, $zero, 0x1e -.L80240978: -/* E166F8 80240978 0C00FB3A */ jal get_enemy -/* E166FC 8024097C 0200202D */ daddu $a0, $s0, $zero -/* E16700 80240980 AC40006C */ sw $zero, 0x6c($v0) -/* E16704 80240984 26100001 */ addiu $s0, $s0, 1 -/* E16708 80240988 2A020023 */ slti $v0, $s0, 0x23 -/* E1670C 8024098C 1440FFFA */ bnez $v0, .L80240978 -/* E16710 80240990 00000000 */ nop -/* E16714 80240994 24100064 */ addiu $s0, $zero, 0x64 -.L80240998: -/* E16718 80240998 0C00FB3A */ jal get_enemy -/* E1671C 8024099C 0200202D */ daddu $a0, $s0, $zero -/* E16720 802409A0 AC40006C */ sw $zero, 0x6c($v0) -/* E16724 802409A4 26100001 */ addiu $s0, $s0, 1 -/* E16728 802409A8 2A02006E */ slti $v0, $s0, 0x6e -/* E1672C 802409AC 1440FFFA */ bnez $v0, .L80240998 -/* E16730 802409B0 00000000 */ nop -/* E16734 802409B4 24100009 */ addiu $s0, $zero, 9 -/* E16738 802409B8 3C028025 */ lui $v0, 0x8025 -/* E1673C 802409BC 24428624 */ addiu $v0, $v0, -0x79dc -.L802409C0: -/* E16740 802409C0 AC400000 */ sw $zero, ($v0) -/* E16744 802409C4 2610FFFF */ addiu $s0, $s0, -1 -/* E16748 802409C8 0601FFFD */ bgez $s0, .L802409C0 -/* E1674C 802409CC 2442FFFC */ addiu $v0, $v0, -4 -/* E16750 802409D0 24140001 */ addiu $s4, $zero, 1 -/* E16754 802409D4 3C168025 */ lui $s6, 0x8025 -/* E16758 802409D8 26D68600 */ addiu $s6, $s6, -0x7a00 -/* E1675C 802409DC 02A0982D */ daddu $s3, $s5, $zero -.L802409E0: -/* E16760 802409E0 8E630034 */ lw $v1, 0x34($s3) -/* E16764 802409E4 1074001B */ beq $v1, $s4, .L80240A54 -/* E16768 802409E8 28620002 */ slti $v0, $v1, 2 -/* E1676C 802409EC 10400005 */ beqz $v0, .L80240A04 -/* E16770 802409F0 24020002 */ addiu $v0, $zero, 2 -/* E16774 802409F4 10600009 */ beqz $v1, .L80240A1C -/* E16778 802409F8 2402000A */ addiu $v0, $zero, 0xa -/* E1677C 802409FC 080902DD */ j .L80240B74 -/* E16780 80240A00 2673001C */ addiu $s3, $s3, 0x1c -.L80240A04: -/* E16784 80240A04 1062002E */ beq $v1, $v0, .L80240AC0 -/* E16788 80240A08 24020003 */ addiu $v0, $zero, 3 -/* E1678C 80240A0C 10620057 */ beq $v1, $v0, .L80240B6C -/* E16790 80240A10 24020032 */ addiu $v0, $zero, 0x32 -/* E16794 80240A14 080902DD */ j .L80240B74 -/* E16798 80240A18 2673001C */ addiu $s3, $s3, 0x1c -.L80240A1C: -/* E1679C 80240A1C AE62002C */ sw $v0, 0x2c($s3) -/* E167A0 80240A20 0040882D */ daddu $s1, $v0, $zero -.L80240A24: -/* E167A4 80240A24 0C00FB3A */ jal get_enemy -/* E167A8 80240A28 0220202D */ daddu $a0, $s1, $zero -/* E167AC 80240A2C 0040802D */ daddu $s0, $v0, $zero -/* E167B0 80240A30 8E02006C */ lw $v0, 0x6c($s0) -/* E167B4 80240A34 1040003B */ beqz $v0, .L80240B24 -/* E167B8 80240A38 00000000 */ nop -/* E167BC 80240A3C 26310001 */ addiu $s1, $s1, 1 -/* E167C0 80240A40 2A22000F */ slti $v0, $s1, 0xf -/* E167C4 80240A44 1440FFF7 */ bnez $v0, .L80240A24 -/* E167C8 80240A48 00000000 */ nop -/* E167CC 80240A4C 080902DD */ j .L80240B74 -/* E167D0 80240A50 2673001C */ addiu $s3, $s3, 0x1c -.L80240A54: -/* E167D4 80240A54 2402001E */ addiu $v0, $zero, 0x1e -/* E167D8 80240A58 AE62002C */ sw $v0, 0x2c($s3) -/* E167DC 80240A5C 0040882D */ daddu $s1, $v0, $zero -.L80240A60: -/* E167E0 80240A60 0C00FB3A */ jal get_enemy -/* E167E4 80240A64 0220202D */ daddu $a0, $s1, $zero -/* E167E8 80240A68 0040802D */ daddu $s0, $v0, $zero -/* E167EC 80240A6C 8E02006C */ lw $v0, 0x6c($s0) -/* E167F0 80240A70 1040002C */ beqz $v0, .L80240B24 -/* E167F4 80240A74 00000000 */ nop -/* E167F8 80240A78 26310001 */ addiu $s1, $s1, 1 -/* E167FC 80240A7C 2A220023 */ slti $v0, $s1, 0x23 -/* E16800 80240A80 1440FFF7 */ bnez $v0, .L80240A60 -/* E16804 80240A84 00000000 */ nop -/* E16808 80240A88 080902DD */ j .L80240B74 -/* E1680C 80240A8C 2673001C */ addiu $s3, $s3, 0x1c -.L80240A90: -/* E16810 80240A90 86040008 */ lh $a0, 8($s0) -/* E16814 80240A94 0C00EABB */ jal get_npc_unsafe -/* E16818 80240A98 00000000 */ nop -/* E1681C 80240A9C 0040902D */ daddu $s2, $v0, $zero -/* E16820 80240AA0 0040202D */ daddu $a0, $v0, $zero -/* E16824 80240AA4 AE14006C */ sw $s4, 0x6c($s0) -/* E16828 80240AA8 0C00EAFF */ jal disable_npc_shadow -/* E1682C 80240AAC AE710040 */ sw $s1, 0x40($s3) -/* E16830 80240AB0 8E420000 */ lw $v0, ($s2) -/* E16834 80240AB4 34420002 */ ori $v0, $v0, 2 -/* E16838 80240AB8 080902BD */ j .L80240AF4 -/* E1683C 80240ABC AE420000 */ sw $v0, ($s2) -.L80240AC0: -/* E16840 80240AC0 24020046 */ addiu $v0, $zero, 0x46 -/* E16844 80240AC4 AE62002C */ sw $v0, 0x2c($s3) -/* E16848 80240AC8 24110064 */ addiu $s1, $zero, 0x64 -.L80240ACC: -/* E1684C 80240ACC 0C00FB3A */ jal get_enemy -/* E16850 80240AD0 0220202D */ daddu $a0, $s1, $zero -/* E16854 80240AD4 0040802D */ daddu $s0, $v0, $zero -/* E16858 80240AD8 8E02006C */ lw $v0, 0x6c($s0) -/* E1685C 80240ADC 1040FFEC */ beqz $v0, .L80240A90 -/* E16860 80240AE0 00000000 */ nop -/* E16864 80240AE4 26310001 */ addiu $s1, $s1, 1 -/* E16868 80240AE8 2A22006E */ slti $v0, $s1, 0x6e -/* E1686C 80240AEC 1440FFF7 */ bnez $v0, .L80240ACC -/* E16870 80240AF0 00000000 */ nop -.L80240AF4: -/* E16874 80240AF4 0000882D */ daddu $s1, $zero, $zero -/* E16878 80240AF8 02C0202D */ daddu $a0, $s6, $zero -.L80240AFC: -/* E1687C 80240AFC 0080182D */ daddu $v1, $a0, $zero -/* E16880 80240B00 8C620000 */ lw $v0, ($v1) -/* E16884 80240B04 10400013 */ beqz $v0, .L80240B54 -/* E16888 80240B08 00112880 */ sll $a1, $s1, 2 -/* E1688C 80240B0C 26310001 */ addiu $s1, $s1, 1 -/* E16890 80240B10 2A22000B */ slti $v0, $s1, 0xb -/* E16894 80240B14 1440FFF9 */ bnez $v0, .L80240AFC -/* E16898 80240B18 24640004 */ addiu $a0, $v1, 4 -/* E1689C 80240B1C 080902DD */ j .L80240B74 -/* E168A0 80240B20 2673001C */ addiu $s3, $s3, 0x1c -.L80240B24: -/* E168A4 80240B24 86040008 */ lh $a0, 8($s0) -/* E168A8 80240B28 0C00EABB */ jal get_npc_unsafe -/* E168AC 80240B2C 00000000 */ nop -/* E168B0 80240B30 0040902D */ daddu $s2, $v0, $zero -/* E168B4 80240B34 0240202D */ daddu $a0, $s2, $zero -/* E168B8 80240B38 AE14006C */ sw $s4, 0x6c($s0) -/* E168BC 80240B3C 0C00EAFF */ jal disable_npc_shadow -/* E168C0 80240B40 AE710040 */ sw $s1, 0x40($s3) -/* E168C4 80240B44 8E420000 */ lw $v0, ($s2) -/* E168C8 80240B48 34420002 */ ori $v0, $v0, 2 -/* E168CC 80240B4C 080902DC */ j .L80240B70 -/* E168D0 80240B50 AE420000 */ sw $v0, ($s2) -.L80240B54: -/* E168D4 80240B54 AC940000 */ sw $s4, ($a0) -/* E168D8 80240B58 3C028024 */ lui $v0, 0x8024 -/* E168DC 80240B5C 00451021 */ addu $v0, $v0, $a1 -/* E168E0 80240B60 8C4229F8 */ lw $v0, 0x29f8($v0) -/* E168E4 80240B64 080902DC */ j .L80240B70 -/* E168E8 80240B68 AE620044 */ sw $v0, 0x44($s3) -.L80240B6C: -/* E168EC 80240B6C AE62002C */ sw $v0, 0x2c($s3) -.L80240B70: -/* E168F0 80240B70 2673001C */ addiu $s3, $s3, 0x1c -.L80240B74: -/* E168F4 80240B74 26A203D4 */ addiu $v0, $s5, 0x3d4 -/* E168F8 80240B78 0262102A */ slt $v0, $s3, $v0 -/* E168FC 80240B7C 1440FF98 */ bnez $v0, .L802409E0 -/* E16900 80240B80 00000000 */ nop -/* E16904 80240B84 8FBF00BC */ lw $ra, 0xbc($sp) -/* E16908 80240B88 8FB600B8 */ lw $s6, 0xb8($sp) -/* E1690C 80240B8C 8FB500B4 */ lw $s5, 0xb4($sp) -/* E16910 80240B90 8FB400B0 */ lw $s4, 0xb0($sp) -/* E16914 80240B94 8FB300AC */ lw $s3, 0xac($sp) -/* E16918 80240B98 8FB200A8 */ lw $s2, 0xa8($sp) -/* E1691C 80240B9C 8FB100A4 */ lw $s1, 0xa4($sp) -/* E16920 80240BA0 8FB000A0 */ lw $s0, 0xa0($sp) -/* E16924 80240BA4 24020002 */ addiu $v0, $zero, 2 -/* E16928 80240BA8 03E00008 */ jr $ra -/* E1692C 80240BAC 27BD00C0 */ addiu $sp, $sp, 0xc0 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/func_80240BB0_E15D80.s b/asm/nonmatchings/world/area_mgm/mgm_02/func_80240BB0_E15D80.s deleted file mode 100644 index 2c53b126e8..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/func_80240BB0_E15D80.s +++ /dev/null @@ -1,1208 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BB0_E16930 -/* E16930 80240BB0 27BDFF18 */ addiu $sp, $sp, -0xe8 -/* E16934 80240BB4 0000202D */ daddu $a0, $zero, $zero -/* E16938 80240BB8 AFBF00B4 */ sw $ra, 0xb4($sp) -/* E1693C 80240BBC AFBE00B0 */ sw $fp, 0xb0($sp) -/* E16940 80240BC0 AFB700AC */ sw $s7, 0xac($sp) -/* E16944 80240BC4 AFB600A8 */ sw $s6, 0xa8($sp) -/* E16948 80240BC8 AFB500A4 */ sw $s5, 0xa4($sp) -/* E1694C 80240BCC AFB400A0 */ sw $s4, 0xa0($sp) -/* E16950 80240BD0 AFB3009C */ sw $s3, 0x9c($sp) -/* E16954 80240BD4 AFB20098 */ sw $s2, 0x98($sp) -/* E16958 80240BD8 AFB10094 */ sw $s1, 0x94($sp) -/* E1695C 80240BDC AFB00090 */ sw $s0, 0x90($sp) -/* E16960 80240BE0 F7BE00E0 */ sdc1 $f30, 0xe0($sp) -/* E16964 80240BE4 F7BC00D8 */ sdc1 $f28, 0xd8($sp) -/* E16968 80240BE8 F7BA00D0 */ sdc1 $f26, 0xd0($sp) -/* E1696C 80240BEC F7B800C8 */ sdc1 $f24, 0xc8($sp) -/* E16970 80240BF0 F7B600C0 */ sdc1 $f22, 0xc0($sp) -/* E16974 80240BF4 F7B400B8 */ sdc1 $f20, 0xb8($sp) -/* E16978 80240BF8 AFA00084 */ sw $zero, 0x84($sp) -/* E1697C 80240BFC 0C00FB3A */ jal get_enemy -/* E16980 80240C00 AFA00088 */ sw $zero, 0x88($sp) -/* E16984 80240C04 27BE0074 */ addiu $fp, $sp, 0x74 -/* E16988 80240C08 27B60078 */ addiu $s6, $sp, 0x78 -/* E1698C 80240C0C 27B7007C */ addiu $s7, $sp, 0x7c -/* E16990 80240C10 3C01C47A */ lui $at, 0xc47a -/* E16994 80240C14 4481D000 */ mtc1 $at, $f26 -/* E16998 80240C18 3C014000 */ lui $at, 0x4000 -/* E1699C 80240C1C 4481C800 */ mtc1 $at, $f25 -/* E169A0 80240C20 4480C000 */ mtc1 $zero, $f24 -/* E169A4 80240C24 4480E000 */ mtc1 $zero, $f28 -/* E169A8 80240C28 3C014000 */ lui $at, 0x4000 -/* E169AC 80240C2C 4481F000 */ mtc1 $at, $f30 -/* E169B0 80240C30 3C014120 */ lui $at, 0x4120 -/* E169B4 80240C34 4481B000 */ mtc1 $at, $f22 -/* E169B8 80240C38 8C55006C */ lw $s5, 0x6c($v0) -/* E169BC 80240C3C 3C014024 */ lui $at, 0x4024 -/* E169C0 80240C40 4481A800 */ mtc1 $at, $f21 -/* E169C4 80240C44 4480A000 */ mtc1 $zero, $f20 -/* E169C8 80240C48 02A0A02D */ daddu $s4, $s5, $zero -.L80240C4C: -/* E169CC 80240C4C 8E840040 */ lw $a0, 0x40($s4) -/* E169D0 80240C50 2402FFFF */ addiu $v0, $zero, -1 -/* E169D4 80240C54 108203B2 */ beq $a0, $v0, .L80241B20 -/* E169D8 80240C58 24020032 */ addiu $v0, $zero, 0x32 -/* E169DC 80240C5C 0C00FB3A */ jal get_enemy -/* E169E0 80240C60 00000000 */ nop -/* E169E4 80240C64 84440008 */ lh $a0, 8($v0) -/* E169E8 80240C68 0C00EABB */ jal get_npc_unsafe -/* E169EC 80240C6C 0040802D */ daddu $s0, $v0, $zero -/* E169F0 80240C70 8E83002C */ lw $v1, 0x2c($s4) -/* E169F4 80240C74 0040982D */ daddu $s3, $v0, $zero -/* E169F8 80240C78 2463FFF6 */ addiu $v1, $v1, -0xa -/* E169FC 80240C7C 2C620042 */ sltiu $v0, $v1, 0x42 -/* E16A00 80240C80 104003AD */ beqz $v0, .L80241B38 -/* E16A04 80240C84 00031080 */ sll $v0, $v1, 2 -/* E16A08 80240C88 3C018025 */ lui $at, 0x8025 -/* E16A0C 80240C8C 00220821 */ addu $at, $at, $v0 -/* E16A10 80240C90 8C2284E8 */ lw $v0, -0x7b18($at) -/* E16A14 80240C94 00400008 */ jr $v0 -/* E16A18 80240C98 00000000 */ nop -/* E16A1C 80240C9C 240400D2 */ addiu $a0, $zero, 0xd2 -/* E16A20 80240CA0 2402000B */ addiu $v0, $zero, 0xb -/* E16A24 80240CA4 0C00A67F */ jal rand_int -/* E16A28 80240CA8 AE82002C */ sw $v0, 0x2c($s4) -/* E16A2C 80240CAC 0260202D */ daddu $a0, $s3, $zero -/* E16A30 80240CB0 AE820030 */ sw $v0, 0x30($s4) -/* E16A34 80240CB4 8E620000 */ lw $v0, ($s3) -/* E16A38 80240CB8 2403FFFD */ addiu $v1, $zero, -3 -/* E16A3C 80240CBC E67A003C */ swc1 $f26, 0x3c($s3) -/* E16A40 80240CC0 00431024 */ and $v0, $v0, $v1 -/* E16A44 80240CC4 0C00EAFF */ jal disable_npc_shadow -/* E16A48 80240CC8 AE620000 */ sw $v0, ($s3) -/* E16A4C 80240CCC 8E820030 */ lw $v0, 0x30($s4) -/* E16A50 80240CD0 2442FFFF */ addiu $v0, $v0, -1 -/* E16A54 80240CD4 1C400398 */ bgtz $v0, .L80241B38 -/* E16A58 80240CD8 AE820030 */ sw $v0, 0x30($s4) -/* E16A5C 80240CDC 3C02002B */ lui $v0, 0x2b -/* E16A60 80240CE0 34420002 */ ori $v0, $v0, 2 -/* E16A64 80240CE4 AE620028 */ sw $v0, 0x28($s3) -/* E16A68 80240CE8 2402000C */ addiu $v0, $zero, 0xc -/* E16A6C 80240CEC AE82002C */ sw $v0, 0x2c($s4) -/* E16A70 80240CF0 C6600040 */ lwc1 $f0, 0x40($s3) -/* E16A74 80240CF4 E7A00010 */ swc1 $f0, 0x10($sp) -/* E16A78 80240CF8 8E04008C */ lw $a0, 0x8c($s0) -/* E16A7C 80240CFC 8E660038 */ lw $a2, 0x38($s3) -/* E16A80 80240D00 8E67003C */ lw $a3, 0x3c($s3) -/* E16A84 80240D04 0C052757 */ jal play_sound_at_position -/* E16A88 80240D08 3C050010 */ lui $a1, 0x10 -/* E16A8C 80240D0C 27A50068 */ addiu $a1, $sp, 0x68 -/* E16A90 80240D10 27A6006C */ addiu $a2, $sp, 0x6c -/* E16A94 80240D14 9684003A */ lhu $a0, 0x3a($s4) -/* E16A98 80240D18 27A70070 */ addiu $a3, $sp, 0x70 -/* E16A9C 80240D1C AFBE0010 */ sw $fp, 0x10($sp) -/* E16AA0 80240D20 AFB60014 */ sw $s6, 0x14($sp) -/* E16AA4 80240D24 0C046C3B */ jal get_model_center_and_size -/* E16AA8 80240D28 AFB70018 */ sw $s7, 0x18($sp) -/* E16AAC 80240D2C 3C014128 */ lui $at, 0x4128 -/* E16AB0 80240D30 44810000 */ mtc1 $at, $f0 -/* E16AB4 80240D34 C7A40068 */ lwc1 $f4, 0x68($sp) -/* E16AB8 80240D38 C7A2006C */ lwc1 $f2, 0x6c($sp) -/* E16ABC 80240D3C E660001C */ swc1 $f0, 0x1c($s3) -/* E16AC0 80240D40 3C014029 */ lui $at, 0x4029 -/* E16AC4 80240D44 44810800 */ mtc1 $at, $f1 -/* E16AC8 80240D48 44800000 */ mtc1 $zero, $f0 -/* E16ACC 80240D4C 460010A1 */ cvt.d.s $f2, $f2 -/* E16AD0 80240D50 E6640038 */ swc1 $f4, 0x38($s3) -/* E16AD4 80240D54 3C013FC0 */ lui $at, 0x3fc0 -/* E16AD8 80240D58 44812000 */ mtc1 $at, $f4 -/* E16ADC 80240D5C 46201081 */ sub.d $f2, $f2, $f0 -/* E16AE0 80240D60 E6640014 */ swc1 $f4, 0x14($s3) -/* E16AE4 80240D64 C7A00070 */ lwc1 $f0, 0x70($sp) -/* E16AE8 80240D68 46000021 */ cvt.d.s $f0, $f0 -/* E16AEC 80240D6C 46380000 */ add.d $f0, $f0, $f24 -/* E16AF0 80240D70 462010A0 */ cvt.s.d $f2, $f2 -/* E16AF4 80240D74 E662003C */ swc1 $f2, 0x3c($s3) -/* E16AF8 80240D78 E6620064 */ swc1 $f2, 0x64($s3) -/* E16AFC 80240D7C 46200020 */ cvt.s.d $f0, $f0 -/* E16B00 80240D80 080906CD */ j .L80241B34 -/* E16B04 80240D84 E6600040 */ swc1 $f0, 0x40($s3) -/* E16B08 80240D88 8E820030 */ lw $v0, 0x30($s4) -/* E16B0C 80240D8C 24420001 */ addiu $v0, $v0, 1 -/* E16B10 80240D90 AE820030 */ sw $v0, 0x30($s4) -/* E16B14 80240D94 C660001C */ lwc1 $f0, 0x1c($s3) -/* E16B18 80240D98 C664003C */ lwc1 $f4, 0x3c($s3) -/* E16B1C 80240D9C 46000186 */ mov.s $f6, $f0 -/* E16B20 80240DA0 46002100 */ add.s $f4, $f4, $f0 -/* E16B24 80240DA4 C6600014 */ lwc1 $f0, 0x14($s3) -/* E16B28 80240DA8 3C0141A0 */ lui $at, 0x41a0 -/* E16B2C 80240DAC 44811000 */ mtc1 $at, $f2 -/* E16B30 80240DB0 46003181 */ sub.s $f6, $f6, $f0 -/* E16B34 80240DB4 C6600064 */ lwc1 $f0, 0x64($s3) -/* E16B38 80240DB8 46020000 */ add.s $f0, $f0, $f2 -/* E16B3C 80240DBC E664003C */ swc1 $f4, 0x3c($s3) -/* E16B40 80240DC0 46002086 */ mov.s $f2, $f4 -/* E16B44 80240DC4 4602003C */ c.lt.s $f0, $f2 -/* E16B48 80240DC8 00000000 */ nop -/* E16B4C 80240DCC 45000005 */ bc1f .L80240DE4 -/* E16B50 80240DD0 E666001C */ swc1 $f6, 0x1c($s3) -/* E16B54 80240DD4 0C00EAE8 */ jal enable_npc_shadow -/* E16B58 80240DD8 0260202D */ daddu $a0, $s3, $zero -/* E16B5C 80240DDC 0809037B */ j .L80240DEC -/* E16B60 80240DE0 00000000 */ nop -.L80240DE4: -/* E16B64 80240DE4 0C00EAFF */ jal disable_npc_shadow -/* E16B68 80240DE8 0260202D */ daddu $a0, $s3, $zero -.L80240DEC: -/* E16B6C 80240DEC C660001C */ lwc1 $f0, 0x1c($s3) -/* E16B70 80240DF0 44801000 */ mtc1 $zero, $f2 -/* E16B74 80240DF4 44801800 */ mtc1 $zero, $f3 -/* E16B78 80240DF8 46000021 */ cvt.d.s $f0, $f0 -/* E16B7C 80240DFC 4622003C */ c.lt.d $f0, $f2 -/* E16B80 80240E00 00000000 */ nop -/* E16B84 80240E04 4502034D */ bc1fl .L80241B3C -/* E16B88 80240E08 2694001C */ addiu $s4, $s4, 0x1c -/* E16B8C 80240E0C C662003C */ lwc1 $f2, 0x3c($s3) -/* E16B90 80240E10 C6600064 */ lwc1 $f0, 0x64($s3) -/* E16B94 80240E14 4600103E */ c.le.s $f2, $f0 -/* E16B98 80240E18 00000000 */ nop -/* E16B9C 80240E1C 45000346 */ bc1f .L80241B38 -/* E16BA0 80240E20 2404014A */ addiu $a0, $zero, 0x14a -/* E16BA4 80240E24 2402000B */ addiu $v0, $zero, 0xb -/* E16BA8 80240E28 0C00A67F */ jal rand_int -/* E16BAC 80240E2C AE82002C */ sw $v0, 0x2c($s4) -/* E16BB0 80240E30 24040064 */ addiu $a0, $zero, 0x64 -/* E16BB4 80240E34 2442005A */ addiu $v0, $v0, 0x5a -/* E16BB8 80240E38 AE820030 */ sw $v0, 0x30($s4) -/* E16BBC 80240E3C 0C00A67F */ jal rand_int -/* E16BC0 80240E40 E67A003C */ swc1 $f26, 0x3c($s3) -/* E16BC4 80240E44 28420032 */ slti $v0, $v0, 0x32 -/* E16BC8 80240E48 104001B0 */ beqz $v0, .L8024150C -/* E16BCC 80240E4C 00000000 */ nop -/* E16BD0 80240E50 3C014387 */ lui $at, 0x4387 -/* E16BD4 80240E54 44810000 */ mtc1 $at, $f0 -/* E16BD8 80240E58 08090547 */ j .L8024151C -/* E16BDC 80240E5C E660000C */ swc1 $f0, 0xc($s3) -/* E16BE0 80240E60 8EA4000C */ lw $a0, 0xc($s5) -/* E16BE4 80240E64 3C058011 */ lui $a1, 0x8011 -/* E16BE8 80240E68 24A58B28 */ addiu $a1, $a1, -0x74d8 -/* E16BEC 80240E6C 0C0511FF */ jal set_menu_icon_script -/* E16BF0 80240E70 00000000 */ nop -/* E16BF4 80240E74 8EA4000C */ lw $a0, 0xc($s5) -/* E16BF8 80240E78 0C0513AC */ jal icon_set_opacity -/* E16BFC 80240E7C 240500A0 */ addiu $a1, $zero, 0xa0 -/* E16C00 80240E80 8EA40010 */ lw $a0, 0x10($s5) -/* E16C04 80240E84 0C0513AC */ jal icon_set_opacity -/* E16C08 80240E88 240500A0 */ addiu $a1, $zero, 0xa0 -/* E16C0C 80240E8C 8EA20028 */ lw $v0, 0x28($s5) -/* E16C10 80240E90 0260202D */ daddu $a0, $s3, $zero -/* E16C14 80240E94 AEA00024 */ sw $zero, 0x24($s5) -/* E16C18 80240E98 34420004 */ ori $v0, $v0, 4 -/* E16C1C 80240E9C 0C00EAE8 */ jal enable_npc_shadow -/* E16C20 80240EA0 AEA20028 */ sw $v0, 0x28($s5) -/* E16C24 80240EA4 8EA20028 */ lw $v0, 0x28($s5) -/* E16C28 80240EA8 34420003 */ ori $v0, $v0, 3 -/* E16C2C 80240EAC AEA20028 */ sw $v0, 0x28($s5) -/* E16C30 80240EB0 24020008 */ addiu $v0, $zero, 8 -/* E16C34 80240EB4 A662008E */ sh $v0, 0x8e($s3) -/* E16C38 80240EB8 0C05272D */ jal play_sound -/* E16C3C 80240EBC 8E04008C */ lw $a0, 0x8c($s0) -/* E16C40 80240EC0 3C070001 */ lui $a3, 1 -/* E16C44 80240EC4 34E70001 */ ori $a3, $a3, 1 -/* E16C48 80240EC8 3C04002B */ lui $a0, 0x2b -/* E16C4C 80240ECC 34840003 */ ori $a0, $a0, 3 -/* E16C50 80240ED0 27A50068 */ addiu $a1, $sp, 0x68 -/* E16C54 80240ED4 27A6006C */ addiu $a2, $sp, 0x6c -/* E16C58 80240ED8 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* E16C5C 80240EDC 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* E16C60 80240EE0 2402000E */ addiu $v0, $zero, 0xe -/* E16C64 80240EE4 AE82002C */ sw $v0, 0x2c($s4) -/* E16C68 80240EE8 AC6700B8 */ sw $a3, 0xb8($v1) -/* E16C6C 80240EEC AE640028 */ sw $a0, 0x28($s3) -/* E16C70 80240EF0 9684003A */ lhu $a0, 0x3a($s4) -/* E16C74 80240EF4 27A70070 */ addiu $a3, $sp, 0x70 -/* E16C78 80240EF8 AFBE0010 */ sw $fp, 0x10($sp) -/* E16C7C 80240EFC AFB60014 */ sw $s6, 0x14($sp) -/* E16C80 80240F00 0C046C3B */ jal get_model_center_and_size -/* E16C84 80240F04 AFB70018 */ sw $s7, 0x18($sp) -/* E16C88 80240F08 0000202D */ daddu $a0, $zero, $zero -/* E16C8C 80240F0C 0260282D */ daddu $a1, $s3, $zero -/* E16C90 80240F10 4406E000 */ mfc1 $a2, $f28 -/* E16C94 80240F14 C7A20068 */ lwc1 $f2, 0x68($sp) -/* E16C98 80240F18 C7A00070 */ lwc1 $f0, 0x70($sp) -/* E16C9C 80240F1C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E16CA0 80240F20 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E16CA4 80240F24 3C014128 */ lui $at, 0x4128 -/* E16CA8 80240F28 44812000 */ mtc1 $at, $f4 -/* E16CAC 80240F2C 46000021 */ cvt.d.s $f0, $f0 -/* E16CB0 80240F30 E6620038 */ swc1 $f2, 0x38($s3) -/* E16CB4 80240F34 C7A2006C */ lwc1 $f2, 0x6c($sp) -/* E16CB8 80240F38 46380000 */ add.d $f0, $f0, $f24 -/* E16CBC 80240F3C E662003C */ swc1 $f2, 0x3c($s3) -/* E16CC0 80240F40 3C01420C */ lui $at, 0x420c -/* E16CC4 80240F44 44811000 */ mtc1 $at, $f2 -/* E16CC8 80240F48 46200020 */ cvt.s.d $f0, $f0 -/* E16CCC 80240F4C E6600040 */ swc1 $f0, 0x40($s3) -/* E16CD0 80240F50 C440002C */ lwc1 $f0, 0x2c($v0) -/* E16CD4 80240F54 3C013FC0 */ lui $at, 0x3fc0 -/* E16CD8 80240F58 44813000 */ mtc1 $at, $f6 -/* E16CDC 80240F5C 46020000 */ add.s $f0, $f0, $f2 -/* E16CE0 80240F60 E664001C */ swc1 $f4, 0x1c($s3) -/* E16CE4 80240F64 E6660014 */ swc1 $f6, 0x14($s3) -/* E16CE8 80240F68 E6600064 */ swc1 $f0, 0x64($s3) -/* E16CEC 80240F6C AE800030 */ sw $zero, 0x30($s4) -/* E16CF0 80240F70 866300A8 */ lh $v1, 0xa8($s3) -/* E16CF4 80240F74 3C013F80 */ lui $at, 0x3f80 -/* E16CF8 80240F78 44810000 */ mtc1 $at, $f0 -/* E16CFC 80240F7C 2402000A */ addiu $v0, $zero, 0xa -/* E16D00 80240F80 AFA2001C */ sw $v0, 0x1c($sp) -/* E16D04 80240F84 44834000 */ mtc1 $v1, $f8 -/* E16D08 80240F88 00000000 */ nop -/* E16D0C 80240F8C 46804220 */ cvt.s.w $f8, $f8 -/* E16D10 80240F90 44074000 */ mfc1 $a3, $f8 -/* E16D14 80240F94 27A20080 */ addiu $v0, $sp, 0x80 -/* E16D18 80240F98 E7BE0014 */ swc1 $f30, 0x14($sp) -/* E16D1C 80240F9C E7BC0018 */ swc1 $f28, 0x18($sp) -/* E16D20 80240FA0 AFA20020 */ sw $v0, 0x20($sp) -/* E16D24 80240FA4 0C01BFA4 */ jal fx_emote -/* E16D28 80240FA8 E7A00010 */ swc1 $f0, 0x10($sp) -/* E16D2C 80240FAC C6600038 */ lwc1 $f0, 0x38($s3) -/* E16D30 80240FB0 46160002 */ mul.s $f0, $f0, $f22 -/* E16D34 80240FB4 00000000 */ nop -/* E16D38 80240FB8 4600020D */ trunc.w.s $f8, $f0 -/* E16D3C 80240FBC E6080070 */ swc1 $f8, 0x70($s0) -/* E16D40 80240FC0 C660003C */ lwc1 $f0, 0x3c($s3) -/* E16D44 80240FC4 46160002 */ mul.s $f0, $f0, $f22 -/* E16D48 80240FC8 00000000 */ nop -/* E16D4C 80240FCC 4600020D */ trunc.w.s $f8, $f0 -/* E16D50 80240FD0 E6080074 */ swc1 $f8, 0x74($s0) -/* E16D54 80240FD4 C6600040 */ lwc1 $f0, 0x40($s3) -/* E16D58 80240FD8 46160002 */ mul.s $f0, $f0, $f22 -/* E16D5C 80240FDC 00000000 */ nop -/* E16D60 80240FE0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E16D64 80240FE4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E16D68 80240FE8 4600020D */ trunc.w.s $f8, $f0 -/* E16D6C 80240FEC E6080078 */ swc1 $f8, 0x78($s0) -/* E16D70 80240FF0 C4400028 */ lwc1 $f0, 0x28($v0) -/* E16D74 80240FF4 46160002 */ mul.s $f0, $f0, $f22 -/* E16D78 80240FF8 00000000 */ nop -/* E16D7C 80240FFC 3C0141E0 */ lui $at, 0x41e0 -/* E16D80 80241000 44811000 */ mtc1 $at, $f2 -/* E16D84 80241004 4600020D */ trunc.w.s $f8, $f0 -/* E16D88 80241008 E608007C */ swc1 $f8, 0x7c($s0) -/* E16D8C 8024100C C440002C */ lwc1 $f0, 0x2c($v0) -/* E16D90 80241010 46020000 */ add.s $f0, $f0, $f2 -/* E16D94 80241014 46160002 */ mul.s $f0, $f0, $f22 -/* E16D98 80241018 00000000 */ nop -/* E16D9C 8024101C 4600020D */ trunc.w.s $f8, $f0 -/* E16DA0 80241020 E6080080 */ swc1 $f8, 0x80($s0) -/* E16DA4 80241024 C4400030 */ lwc1 $f0, 0x30($v0) -/* E16DA8 80241028 461E0000 */ add.s $f0, $f0, $f30 -/* E16DAC 8024102C 46160002 */ mul.s $f0, $f0, $f22 -/* E16DB0 80241030 00000000 */ nop -/* E16DB4 80241034 AE000088 */ sw $zero, 0x88($s0) -/* E16DB8 80241038 4600020D */ trunc.w.s $f8, $f0 -/* E16DBC 8024103C E6080084 */ swc1 $f8, 0x84($s0) -/* E16DC0 80241040 080906CF */ j .L80241B3C -/* E16DC4 80241044 2694001C */ addiu $s4, $s4, 0x1c -/* E16DC8 80241048 C6000070 */ lwc1 $f0, 0x70($s0) -/* E16DCC 8024104C 46800020 */ cvt.s.w $f0, $f0 -/* E16DD0 80241050 46000021 */ cvt.d.s $f0, $f0 -/* E16DD4 80241054 46340003 */ div.d $f0, $f0, $f20 -/* E16DD8 80241058 46200020 */ cvt.s.d $f0, $f0 -/* E16DDC 8024105C 44050000 */ mfc1 $a1, $f0 -/* E16DE0 80241060 C600007C */ lwc1 $f0, 0x7c($s0) -/* E16DE4 80241064 46800020 */ cvt.s.w $f0, $f0 -/* E16DE8 80241068 46000021 */ cvt.d.s $f0, $f0 -/* E16DEC 8024106C 46340003 */ div.d $f0, $f0, $f20 -/* E16DF0 80241070 46200020 */ cvt.s.d $f0, $f0 -/* E16DF4 80241074 8E020088 */ lw $v0, 0x88($s0) -/* E16DF8 80241078 44060000 */ mfc1 $a2, $f0 -/* E16DFC 8024107C 24420001 */ addiu $v0, $v0, 1 -/* E16E00 80241080 AE020088 */ sw $v0, 0x88($s0) -/* E16E04 80241084 24080008 */ addiu $t0, $zero, 8 -/* E16E08 80241088 AFA80010 */ sw $t0, 0x10($sp) -/* E16E0C 8024108C 8E070088 */ lw $a3, 0x88($s0) -/* E16E10 80241090 0C00A8ED */ jal update_lerp -/* E16E14 80241094 0000202D */ daddu $a0, $zero, $zero -/* E16E18 80241098 E6600038 */ swc1 $f0, 0x38($s3) -/* E16E1C 8024109C C6000074 */ lwc1 $f0, 0x74($s0) -/* E16E20 802410A0 46800020 */ cvt.s.w $f0, $f0 -/* E16E24 802410A4 46000021 */ cvt.d.s $f0, $f0 -/* E16E28 802410A8 46340003 */ div.d $f0, $f0, $f20 -/* E16E2C 802410AC 46200020 */ cvt.s.d $f0, $f0 -/* E16E30 802410B0 44050000 */ mfc1 $a1, $f0 -/* E16E34 802410B4 C6000080 */ lwc1 $f0, 0x80($s0) -/* E16E38 802410B8 46800020 */ cvt.s.w $f0, $f0 -/* E16E3C 802410BC 24080008 */ addiu $t0, $zero, 8 -/* E16E40 802410C0 46000021 */ cvt.d.s $f0, $f0 -/* E16E44 802410C4 46340003 */ div.d $f0, $f0, $f20 -/* E16E48 802410C8 46200020 */ cvt.s.d $f0, $f0 -/* E16E4C 802410CC AFA80010 */ sw $t0, 0x10($sp) -/* E16E50 802410D0 8E070088 */ lw $a3, 0x88($s0) -/* E16E54 802410D4 44060000 */ mfc1 $a2, $f0 -/* E16E58 802410D8 0C00A8ED */ jal update_lerp -/* E16E5C 802410DC 0000202D */ daddu $a0, $zero, $zero -/* E16E60 802410E0 E660003C */ swc1 $f0, 0x3c($s3) -/* E16E64 802410E4 C6000078 */ lwc1 $f0, 0x78($s0) -/* E16E68 802410E8 46800020 */ cvt.s.w $f0, $f0 -/* E16E6C 802410EC 46000021 */ cvt.d.s $f0, $f0 -/* E16E70 802410F0 46340003 */ div.d $f0, $f0, $f20 -/* E16E74 802410F4 46200020 */ cvt.s.d $f0, $f0 -/* E16E78 802410F8 44050000 */ mfc1 $a1, $f0 -/* E16E7C 802410FC C6000084 */ lwc1 $f0, 0x84($s0) -/* E16E80 80241100 46800020 */ cvt.s.w $f0, $f0 -/* E16E84 80241104 24080008 */ addiu $t0, $zero, 8 -/* E16E88 80241108 46000021 */ cvt.d.s $f0, $f0 -/* E16E8C 8024110C 46340003 */ div.d $f0, $f0, $f20 -/* E16E90 80241110 46200020 */ cvt.s.d $f0, $f0 -/* E16E94 80241114 AFA80010 */ sw $t0, 0x10($sp) -/* E16E98 80241118 8E070088 */ lw $a3, 0x88($s0) -/* E16E9C 8024111C 44060000 */ mfc1 $a2, $f0 -/* E16EA0 80241120 0C00A8ED */ jal update_lerp -/* E16EA4 80241124 0000202D */ daddu $a0, $zero, $zero -/* E16EA8 80241128 3C020001 */ lui $v0, 1 -/* E16EAC 8024112C 3C04800F */ lui $a0, %hi(gPlayerStatusPtr) -/* E16EB0 80241130 8C847B30 */ lw $a0, %lo(gPlayerStatusPtr)($a0) -/* E16EB4 80241134 34420001 */ ori $v0, $v0, 1 -/* E16EB8 80241138 E6600040 */ swc1 $f0, 0x40($s3) -/* E16EBC 8024113C AC8200B8 */ sw $v0, 0xb8($a0) -/* E16EC0 80241140 9662008E */ lhu $v0, 0x8e($s3) -/* E16EC4 80241144 2442FFFF */ addiu $v0, $v0, -1 -/* E16EC8 80241148 A662008E */ sh $v0, 0x8e($s3) -/* E16ECC 8024114C 00021400 */ sll $v0, $v0, 0x10 -/* E16ED0 80241150 5C40027A */ bgtzl $v0, .L80241B3C -/* E16ED4 80241154 2694001C */ addiu $s4, $s4, 0x1c -/* E16ED8 80241158 3C03002B */ lui $v1, 0x2b -/* E16EDC 8024115C 3463000F */ ori $v1, $v1, 0xf -/* E16EE0 80241160 3C020001 */ lui $v0, 1 -/* E16EE4 80241164 3442001B */ ori $v0, $v0, 0x1b -/* E16EE8 80241168 AE630028 */ sw $v1, 0x28($s3) -/* E16EEC 8024116C AC8200B8 */ sw $v0, 0xb8($a0) -/* E16EF0 80241170 AEA00024 */ sw $zero, 0x24($s5) -/* E16EF4 80241174 C4800028 */ lwc1 $f0, 0x28($a0) -/* E16EF8 80241178 E6600038 */ swc1 $f0, 0x38($s3) -/* E16EFC 8024117C C480002C */ lwc1 $f0, 0x2c($a0) -/* E16F00 80241180 3C01403C */ lui $at, 0x403c -/* E16F04 80241184 44811800 */ mtc1 $at, $f3 -/* E16F08 80241188 44801000 */ mtc1 $zero, $f2 -/* E16F0C 8024118C 46000021 */ cvt.d.s $f0, $f0 -/* E16F10 80241190 46220000 */ add.d $f0, $f0, $f2 -/* E16F14 80241194 46200020 */ cvt.s.d $f0, $f0 -/* E16F18 80241198 E660003C */ swc1 $f0, 0x3c($s3) -/* E16F1C 8024119C C4800030 */ lwc1 $f0, 0x30($a0) -/* E16F20 802411A0 46000021 */ cvt.d.s $f0, $f0 -/* E16F24 802411A4 46380000 */ add.d $f0, $f0, $f24 -/* E16F28 802411A8 46200020 */ cvt.s.d $f0, $f0 -/* E16F2C 802411AC E6600040 */ swc1 $f0, 0x40($s3) -/* E16F30 802411B0 8EA4000C */ lw $a0, 0xc($s5) -/* E16F34 802411B4 3C058011 */ lui $a1, 0x8011 -/* E16F38 802411B8 24A58B80 */ addiu $a1, $a1, -0x7480 -/* E16F3C 802411BC 0C0511FF */ jal set_menu_icon_script -/* E16F40 802411C0 00000000 */ nop -/* E16F44 802411C4 8EA4000C */ lw $a0, 0xc($s5) -/* E16F48 802411C8 0C0513AC */ jal icon_set_opacity -/* E16F4C 802411CC 240500FF */ addiu $a1, $zero, 0xff -/* E16F50 802411D0 8EA40010 */ lw $a0, 0x10($s5) -/* E16F54 802411D4 0C0513AC */ jal icon_set_opacity -/* E16F58 802411D8 240500FF */ addiu $a1, $zero, 0xff -/* E16F5C 802411DC 2402000F */ addiu $v0, $zero, 0xf -/* E16F60 802411E0 080906CE */ j .L80241B38 -/* E16F64 802411E4 AE82002C */ sw $v0, 0x2c($s4) -/* E16F68 802411E8 3C040001 */ lui $a0, 1 -/* E16F6C 802411EC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E16F70 802411F0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E16F74 802411F4 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* E16F78 802411F8 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* E16F7C 802411FC 3484001B */ ori $a0, $a0, 0x1b -/* E16F80 80241200 AC4400B8 */ sw $a0, 0xb8($v0) -/* E16F84 80241204 8C620010 */ lw $v0, 0x10($v1) -/* E16F88 80241208 30428000 */ andi $v0, $v0, 0x8000 -/* E16F8C 8024120C 10400004 */ beqz $v0, .L80241220 -/* E16F90 80241210 00000000 */ nop -/* E16F94 80241214 8EA20024 */ lw $v0, 0x24($s5) -/* E16F98 80241218 24420001 */ addiu $v0, $v0, 1 -/* E16F9C 8024121C AEA20024 */ sw $v0, 0x24($s5) -.L80241220: -/* E16FA0 80241220 8EA20024 */ lw $v0, 0x24($s5) -/* E16FA4 80241224 2842000C */ slti $v0, $v0, 0xc -/* E16FA8 80241228 54400244 */ bnel $v0, $zero, .L80241B3C -/* E16FAC 8024122C 2694001C */ addiu $s4, $s4, 0x1c -/* E16FB0 80241230 3C030001 */ lui $v1, 1 -/* E16FB4 80241234 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E16FB8 80241238 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E16FBC 8024123C 34630002 */ ori $v1, $v1, 2 -/* E16FC0 80241240 AC4300B8 */ sw $v1, 0xb8($v0) -/* E16FC4 80241244 8EA20028 */ lw $v0, 0x28($s5) -/* E16FC8 80241248 2403FFFE */ addiu $v1, $zero, -2 -/* E16FCC 8024124C 00431024 */ and $v0, $v0, $v1 -/* E16FD0 80241250 34420002 */ ori $v0, $v0, 2 -/* E16FD4 80241254 AEA20028 */ sw $v0, 0x28($s5) -/* E16FD8 80241258 24020010 */ addiu $v0, $zero, 0x10 -/* E16FDC 8024125C AE82002C */ sw $v0, 0x2c($s4) -/* E16FE0 80241260 2402000A */ addiu $v0, $zero, 0xa -/* E16FE4 80241264 A662008E */ sh $v0, 0x8e($s3) -/* E16FE8 80241268 8EA4000C */ lw $a0, 0xc($s5) -/* E16FEC 8024126C 3C058011 */ lui $a1, 0x8011 -/* E16FF0 80241270 24A58B28 */ addiu $a1, $a1, -0x74d8 -/* E16FF4 80241274 0C0511FF */ jal set_menu_icon_script -/* E16FF8 80241278 2694001C */ addiu $s4, $s4, 0x1c -/* E16FFC 8024127C 8EA4000C */ lw $a0, 0xc($s5) -/* E17000 80241280 0C0513AC */ jal icon_set_opacity -/* E17004 80241284 240500A0 */ addiu $a1, $zero, 0xa0 -/* E17008 80241288 8EA40010 */ lw $a0, 0x10($s5) -/* E1700C 8024128C 0C0513AC */ jal icon_set_opacity -/* E17010 80241290 240500A0 */ addiu $a1, $zero, 0xa0 -/* E17014 80241294 3C02002B */ lui $v0, 0x2b -/* E17018 80241298 C660003C */ lwc1 $f0, 0x3c($s3) -/* E1701C 8024129C 3C014008 */ lui $at, 0x4008 -/* E17020 802412A0 44811800 */ mtc1 $at, $f3 -/* E17024 802412A4 44801000 */ mtc1 $zero, $f2 -/* E17028 802412A8 46000021 */ cvt.d.s $f0, $f0 -/* E1702C 802412AC 46220000 */ add.d $f0, $f0, $f2 -/* E17030 802412B0 34420008 */ ori $v0, $v0, 8 -/* E17034 802412B4 AE620028 */ sw $v0, 0x28($s3) -/* E17038 802412B8 46200020 */ cvt.s.d $f0, $f0 -/* E1703C 802412BC 080906CF */ j .L80241B3C -/* E17040 802412C0 E660003C */ swc1 $f0, 0x3c($s3) -/* E17044 802412C4 9662008E */ lhu $v0, 0x8e($s3) -/* E17048 802412C8 24080008 */ addiu $t0, $zero, 8 -/* E1704C 802412CC 2442FFFF */ addiu $v0, $v0, -1 -/* E17050 802412D0 A662008E */ sh $v0, 0x8e($s3) -/* E17054 802412D4 00021400 */ sll $v0, $v0, 0x10 -/* E17058 802412D8 00021403 */ sra $v0, $v0, 0x10 -/* E1705C 802412DC 14480004 */ bne $v0, $t0, .L802412F0 -/* E17060 802412E0 2403FFFB */ addiu $v1, $zero, -5 -/* E17064 802412E4 8EA20028 */ lw $v0, 0x28($s5) -/* E17068 802412E8 00431024 */ and $v0, $v0, $v1 -/* E1706C 802412EC AEA20028 */ sw $v0, 0x28($s5) -.L802412F0: -/* E17070 802412F0 8662008E */ lh $v0, 0x8e($s3) -/* E17074 802412F4 5C400211 */ bgtzl $v0, .L80241B3C -/* E17078 802412F8 2694001C */ addiu $s4, $s4, 0x1c -/* E1707C 802412FC 0260202D */ daddu $a0, $s3, $zero -/* E17080 80241300 24020011 */ addiu $v0, $zero, 0x11 -/* E17084 80241304 0C00EAFF */ jal disable_npc_shadow -/* E17088 80241308 AE82002C */ sw $v0, 0x2c($s4) -/* E1708C 8024130C C660003C */ lwc1 $f0, 0x3c($s3) -/* E17090 80241310 46160000 */ add.s $f0, $f0, $f22 -/* E17094 80241314 C6620040 */ lwc1 $f2, 0x40($s3) -/* E17098 80241318 8E620000 */ lw $v0, ($s3) -/* E1709C 8024131C 44060000 */ mfc1 $a2, $f0 -/* E170A0 80241320 3C013F80 */ lui $at, 0x3f80 -/* E170A4 80241324 44810000 */ mtc1 $at, $f0 -/* E170A8 80241328 34420002 */ ori $v0, $v0, 2 -/* E170AC 8024132C AE620000 */ sw $v0, ($s3) -/* E170B0 80241330 AFA00010 */ sw $zero, 0x10($sp) -/* E170B4 80241334 46001080 */ add.s $f2, $f2, $f0 -/* E170B8 80241338 AFA00014 */ sw $zero, 0x14($sp) -/* E170BC 8024133C 8E650038 */ lw $a1, 0x38($s3) -/* E170C0 80241340 44071000 */ mfc1 $a3, $f2 -/* E170C4 80241344 0C01BECC */ jal fx_walk_normal -/* E170C8 80241348 24040001 */ addiu $a0, $zero, 1 -/* E170CC 8024134C 080906CF */ j .L80241B3C -/* E170D0 80241350 2694001C */ addiu $s4, $s4, 0x1c -/* E170D4 80241354 240400D2 */ addiu $a0, $zero, 0xd2 -/* E170D8 80241358 2402001F */ addiu $v0, $zero, 0x1f -/* E170DC 8024135C 0C00A67F */ jal rand_int -/* E170E0 80241360 AE82002C */ sw $v0, 0x2c($s4) -/* E170E4 80241364 0260202D */ daddu $a0, $s3, $zero -/* E170E8 80241368 AE820030 */ sw $v0, 0x30($s4) -/* E170EC 8024136C 0C00EAFF */ jal disable_npc_shadow -/* E170F0 80241370 E67A003C */ swc1 $f26, 0x3c($s3) -/* E170F4 80241374 8E620000 */ lw $v0, ($s3) -/* E170F8 80241378 2403FFFD */ addiu $v1, $zero, -3 -/* E170FC 8024137C 00431024 */ and $v0, $v0, $v1 -/* E17100 80241380 AE620000 */ sw $v0, ($s3) -/* E17104 80241384 8E820030 */ lw $v0, 0x30($s4) -/* E17108 80241388 2442FFFF */ addiu $v0, $v0, -1 -/* E1710C 8024138C 1C4001EA */ bgtz $v0, .L80241B38 -/* E17110 80241390 AE820030 */ sw $v0, 0x30($s4) -/* E17114 80241394 24020020 */ addiu $v0, $zero, 0x20 -/* E17118 80241398 AE82002C */ sw $v0, 0x2c($s4) -/* E1711C 8024139C C6600040 */ lwc1 $f0, 0x40($s3) -/* E17120 802413A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* E17124 802413A4 8E04008C */ lw $a0, 0x8c($s0) -/* E17128 802413A8 8E660038 */ lw $a2, 0x38($s3) -/* E1712C 802413AC 8E67003C */ lw $a3, 0x3c($s3) -/* E17130 802413B0 0C052757 */ jal play_sound_at_position -/* E17134 802413B4 3C050010 */ lui $a1, 0x10 -/* E17138 802413B8 27A50068 */ addiu $a1, $sp, 0x68 -/* E1713C 802413BC 27A6006C */ addiu $a2, $sp, 0x6c -/* E17140 802413C0 9684003A */ lhu $a0, 0x3a($s4) -/* E17144 802413C4 27A70070 */ addiu $a3, $sp, 0x70 -/* E17148 802413C8 AFBE0010 */ sw $fp, 0x10($sp) -/* E1714C 802413CC AFB60014 */ sw $s6, 0x14($sp) -/* E17150 802413D0 0C046C3B */ jal get_model_center_and_size -/* E17154 802413D4 AFB70018 */ sw $s7, 0x18($sp) -/* E17158 802413D8 3C014128 */ lui $at, 0x4128 -/* E1715C 802413DC 44810000 */ mtc1 $at, $f0 -/* E17160 802413E0 C7A40068 */ lwc1 $f4, 0x68($sp) -/* E17164 802413E4 C7A2006C */ lwc1 $f2, 0x6c($sp) -/* E17168 802413E8 E660001C */ swc1 $f0, 0x1c($s3) -/* E1716C 802413EC 3C014029 */ lui $at, 0x4029 -/* E17170 802413F0 44810800 */ mtc1 $at, $f1 -/* E17174 802413F4 44800000 */ mtc1 $zero, $f0 -/* E17178 802413F8 460010A1 */ cvt.d.s $f2, $f2 -/* E1717C 802413FC E6640038 */ swc1 $f4, 0x38($s3) -/* E17180 80241400 3C013FC0 */ lui $at, 0x3fc0 -/* E17184 80241404 44812000 */ mtc1 $at, $f4 -/* E17188 80241408 46201081 */ sub.d $f2, $f2, $f0 -/* E1718C 8024140C E6640014 */ swc1 $f4, 0x14($s3) -/* E17190 80241410 C7A00070 */ lwc1 $f0, 0x70($sp) -/* E17194 80241414 46000021 */ cvt.d.s $f0, $f0 -/* E17198 80241418 46380000 */ add.d $f0, $f0, $f24 -/* E1719C 8024141C 462010A0 */ cvt.s.d $f2, $f2 -/* E171A0 80241420 E662003C */ swc1 $f2, 0x3c($s3) -/* E171A4 80241424 E6620064 */ swc1 $f2, 0x64($s3) -/* E171A8 80241428 46200020 */ cvt.s.d $f0, $f0 -/* E171AC 8024142C 080906CD */ j .L80241B34 -/* E171B0 80241430 E6600040 */ swc1 $f0, 0x40($s3) -/* E171B4 80241434 8E820030 */ lw $v0, 0x30($s4) -/* E171B8 80241438 24420001 */ addiu $v0, $v0, 1 -/* E171BC 8024143C AE820030 */ sw $v0, 0x30($s4) -/* E171C0 80241440 C660001C */ lwc1 $f0, 0x1c($s3) -/* E171C4 80241444 C664003C */ lwc1 $f4, 0x3c($s3) -/* E171C8 80241448 46000186 */ mov.s $f6, $f0 -/* E171CC 8024144C 46002100 */ add.s $f4, $f4, $f0 -/* E171D0 80241450 C6600014 */ lwc1 $f0, 0x14($s3) -/* E171D4 80241454 3C0141A0 */ lui $at, 0x41a0 -/* E171D8 80241458 44811000 */ mtc1 $at, $f2 -/* E171DC 8024145C 46003181 */ sub.s $f6, $f6, $f0 -/* E171E0 80241460 C6600064 */ lwc1 $f0, 0x64($s3) -/* E171E4 80241464 46020000 */ add.s $f0, $f0, $f2 -/* E171E8 80241468 E664003C */ swc1 $f4, 0x3c($s3) -/* E171EC 8024146C 46002086 */ mov.s $f2, $f4 -/* E171F0 80241470 4602003C */ c.lt.s $f0, $f2 -/* E171F4 80241474 00000000 */ nop -/* E171F8 80241478 45000005 */ bc1f .L80241490 -/* E171FC 8024147C E666001C */ swc1 $f6, 0x1c($s3) -/* E17200 80241480 0C00EAE8 */ jal enable_npc_shadow -/* E17204 80241484 0260202D */ daddu $a0, $s3, $zero -/* E17208 80241488 08090526 */ j .L80241498 -/* E1720C 8024148C 00000000 */ nop -.L80241490: -/* E17210 80241490 0C00EAFF */ jal disable_npc_shadow -/* E17214 80241494 0260202D */ daddu $a0, $s3, $zero -.L80241498: -/* E17218 80241498 C660001C */ lwc1 $f0, 0x1c($s3) -/* E1721C 8024149C 44801000 */ mtc1 $zero, $f2 -/* E17220 802414A0 44801800 */ mtc1 $zero, $f3 -/* E17224 802414A4 46000021 */ cvt.d.s $f0, $f0 -/* E17228 802414A8 4622003C */ c.lt.d $f0, $f2 -/* E1722C 802414AC 00000000 */ nop -/* E17230 802414B0 450201A2 */ bc1fl .L80241B3C -/* E17234 802414B4 2694001C */ addiu $s4, $s4, 0x1c -/* E17238 802414B8 C662003C */ lwc1 $f2, 0x3c($s3) -/* E1723C 802414BC C6600064 */ lwc1 $f0, 0x64($s3) -/* E17240 802414C0 4600103E */ c.le.s $f2, $f0 -/* E17244 802414C4 00000000 */ nop -/* E17248 802414C8 4500019B */ bc1f .L80241B38 -/* E1724C 802414CC 2404014A */ addiu $a0, $zero, 0x14a -/* E17250 802414D0 2402001F */ addiu $v0, $zero, 0x1f -/* E17254 802414D4 0C00A67F */ jal rand_int -/* E17258 802414D8 AE82002C */ sw $v0, 0x2c($s4) -/* E1725C 802414DC 24040064 */ addiu $a0, $zero, 0x64 -/* E17260 802414E0 2442005A */ addiu $v0, $v0, 0x5a -/* E17264 802414E4 AE820030 */ sw $v0, 0x30($s4) -/* E17268 802414E8 0C00A67F */ jal rand_int -/* E1726C 802414EC E67A003C */ swc1 $f26, 0x3c($s3) -/* E17270 802414F0 28420032 */ slti $v0, $v0, 0x32 -/* E17274 802414F4 10400005 */ beqz $v0, .L8024150C -/* E17278 802414F8 00000000 */ nop -/* E1727C 802414FC 3C014387 */ lui $at, 0x4387 -/* E17280 80241500 44810000 */ mtc1 $at, $f0 -/* E17284 80241504 08090547 */ j .L8024151C -/* E17288 80241508 E660000C */ swc1 $f0, 0xc($s3) -.L8024150C: -/* E1728C 8024150C 3C0142B4 */ lui $at, 0x42b4 -/* E17290 80241510 44810000 */ mtc1 $at, $f0 -/* E17294 80241514 00000000 */ nop -/* E17298 80241518 E660000C */ swc1 $f0, 0xc($s3) -.L8024151C: -/* E1729C 8024151C 0C00EAFF */ jal disable_npc_shadow -/* E172A0 80241520 0260202D */ daddu $a0, $s3, $zero -/* E172A4 80241524 080906CF */ j .L80241B3C -/* E172A8 80241528 2694001C */ addiu $s4, $s4, 0x1c -/* E172AC 8024152C 0C00EAE8 */ jal enable_npc_shadow -/* E172B0 80241530 0260202D */ daddu $a0, $s3, $zero -/* E172B4 80241534 3C03002C */ lui $v1, 0x2c -/* E172B8 80241538 34630005 */ ori $v1, $v1, 5 -/* E172BC 8024153C 27A50068 */ addiu $a1, $sp, 0x68 -/* E172C0 80241540 27A6006C */ addiu $a2, $sp, 0x6c -/* E172C4 80241544 2402000F */ addiu $v0, $zero, 0xf -/* E172C8 80241548 A662008E */ sh $v0, 0x8e($s3) -/* E172CC 8024154C AE630028 */ sw $v1, 0x28($s3) -/* E172D0 80241550 8EA20028 */ lw $v0, 0x28($s5) -/* E172D4 80241554 27A70070 */ addiu $a3, $sp, 0x70 -/* E172D8 80241558 34420003 */ ori $v0, $v0, 3 -/* E172DC 8024155C AEA20028 */ sw $v0, 0x28($s5) -/* E172E0 80241560 9684003A */ lhu $a0, 0x3a($s4) -/* E172E4 80241564 24020022 */ addiu $v0, $zero, 0x22 -/* E172E8 80241568 AE82002C */ sw $v0, 0x2c($s4) -/* E172EC 8024156C AFBE0010 */ sw $fp, 0x10($sp) -/* E172F0 80241570 AFB60014 */ sw $s6, 0x14($sp) -/* E172F4 80241574 0C046C3B */ jal get_model_center_and_size -/* E172F8 80241578 AFB70018 */ sw $s7, 0x18($sp) -/* E172FC 8024157C 0000202D */ daddu $a0, $zero, $zero -/* E17300 80241580 0260282D */ daddu $a1, $s3, $zero -/* E17304 80241584 4406E000 */ mfc1 $a2, $f28 -/* E17308 80241588 C7A00068 */ lwc1 $f0, 0x68($sp) -/* E1730C 8024158C 866200A8 */ lh $v0, 0xa8($s3) -/* E17310 80241590 C7A4006C */ lwc1 $f4, 0x6c($sp) -/* E17314 80241594 3C014020 */ lui $at, 0x4020 -/* E17318 80241598 44811800 */ mtc1 $at, $f3 -/* E1731C 8024159C 44801000 */ mtc1 $zero, $f2 -/* E17320 802415A0 44824000 */ mtc1 $v0, $f8 -/* E17324 802415A4 00000000 */ nop -/* E17328 802415A8 46804220 */ cvt.s.w $f8, $f8 -/* E1732C 802415AC 46162101 */ sub.s $f4, $f4, $f22 -/* E17330 802415B0 E6600038 */ swc1 $f0, 0x38($s3) -/* E17334 802415B4 C7A00070 */ lwc1 $f0, 0x70($sp) -/* E17338 802415B8 44074000 */ mfc1 $a3, $f8 -/* E1733C 802415BC 46000021 */ cvt.d.s $f0, $f0 -/* E17340 802415C0 46220000 */ add.d $f0, $f0, $f2 -/* E17344 802415C4 3C013F80 */ lui $at, 0x3f80 -/* E17348 802415C8 44811000 */ mtc1 $at, $f2 -/* E1734C 802415CC 2402000A */ addiu $v0, $zero, 0xa -/* E17350 802415D0 E664003C */ swc1 $f4, 0x3c($s3) -/* E17354 802415D4 46200020 */ cvt.s.d $f0, $f0 -/* E17358 802415D8 E6600040 */ swc1 $f0, 0x40($s3) -/* E1735C 802415DC AFA2001C */ sw $v0, 0x1c($sp) -/* E17360 802415E0 27A20080 */ addiu $v0, $sp, 0x80 -/* E17364 802415E4 E7A20010 */ swc1 $f2, 0x10($sp) -/* E17368 802415E8 E7BE0014 */ swc1 $f30, 0x14($sp) -/* E1736C 802415EC E7BC0018 */ swc1 $f28, 0x18($sp) -/* E17370 802415F0 0C01BFA4 */ jal fx_emote -/* E17374 802415F4 AFA20020 */ sw $v0, 0x20($sp) -/* E17378 802415F8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E1737C 802415FC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E17380 80241600 C6620038 */ lwc1 $f2, 0x38($s3) -/* E17384 80241604 C4400028 */ lwc1 $f0, 0x28($v0) -/* E17388 80241608 4602003C */ c.lt.s $f0, $f2 -/* E1738C 8024160C 00000000 */ nop -/* E17390 80241610 45000007 */ bc1f .L80241630 -/* E17394 80241614 00000000 */ nop -/* E17398 80241618 3C014387 */ lui $at, 0x4387 -/* E1739C 8024161C 44810000 */ mtc1 $at, $f0 -/* E173A0 80241620 3C0142BE */ lui $at, 0x42be -/* E173A4 80241624 44811000 */ mtc1 $at, $f2 -/* E173A8 80241628 08090592 */ j .L80241648 -/* E173AC 8024162C E660000C */ swc1 $f0, 0xc($s3) -.L80241630: -/* E173B0 80241630 3C0142B4 */ lui $at, 0x42b4 -/* E173B4 80241634 44810000 */ mtc1 $at, $f0 -/* E173B8 80241638 3C014384 */ lui $at, 0x4384 -/* E173BC 8024163C 34218000 */ ori $at, $at, 0x8000 -/* E173C0 80241640 44811000 */ mtc1 $at, $f2 -/* E173C4 80241644 E660000C */ swc1 $f0, 0xc($s3) -.L80241648: -/* E173C8 80241648 E4420080 */ swc1 $f2, 0x80($v0) -/* E173CC 8024164C 3C030001 */ lui $v1, 1 -/* E173D0 80241650 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E173D4 80241654 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E173D8 80241658 34630001 */ ori $v1, $v1, 1 -/* E173DC 8024165C AC4300B8 */ sw $v1, 0xb8($v0) -/* E173E0 80241660 9662008E */ lhu $v0, 0x8e($s3) -/* E173E4 80241664 2442FFFF */ addiu $v0, $v0, -1 -/* E173E8 80241668 A662008E */ sh $v0, 0x8e($s3) -/* E173EC 8024166C 00021400 */ sll $v0, $v0, 0x10 -/* E173F0 80241670 5C400132 */ bgtzl $v0, .L80241B3C -/* E173F4 80241674 2694001C */ addiu $s4, $s4, 0x1c -/* E173F8 80241678 C6620040 */ lwc1 $f2, 0x40($s3) -/* E173FC 8024167C 3C013F80 */ lui $at, 0x3f80 -/* E17400 80241680 44810000 */ mtc1 $at, $f0 -/* E17404 80241684 00000000 */ nop -/* E17408 80241688 46001080 */ add.s $f2, $f2, $f0 -/* E1740C 8024168C 8E650038 */ lw $a1, 0x38($s3) -/* E17410 80241690 8E66003C */ lw $a2, 0x3c($s3) -/* E17414 80241694 44071000 */ mfc1 $a3, $f2 -/* E17418 80241698 0C01C07C */ jal func_800701F0 -/* E1741C 8024169C 0000202D */ daddu $a0, $zero, $zero -/* E17420 802416A0 24042076 */ addiu $a0, $zero, 0x2076 -/* E17424 802416A4 2402001E */ addiu $v0, $zero, 0x1e -/* E17428 802416A8 A662008E */ sh $v0, 0x8e($s3) -/* E1742C 802416AC 24020023 */ addiu $v0, $zero, 0x23 -/* E17430 802416B0 E67A003C */ swc1 $f26, 0x3c($s3) -/* E17434 802416B4 0C05272D */ jal play_sound -/* E17438 802416B8 AE82002C */ sw $v0, 0x2c($s4) -/* E1743C 802416BC 080906CF */ j .L80241B3C -/* E17440 802416C0 2694001C */ addiu $s4, $s4, 0x1c -/* E17444 802416C4 9662008E */ lhu $v0, 0x8e($s3) -/* E17448 802416C8 24030019 */ addiu $v1, $zero, 0x19 -/* E1744C 802416CC 2442FFFF */ addiu $v0, $v0, -1 -/* E17450 802416D0 A662008E */ sh $v0, 0x8e($s3) -/* E17454 802416D4 00021400 */ sll $v0, $v0, 0x10 -/* E17458 802416D8 00021403 */ sra $v0, $v0, 0x10 -/* E1745C 802416DC 14430005 */ bne $v0, $v1, .L802416F4 -/* E17460 802416E0 3C030001 */ lui $v1, 1 -/* E17464 802416E4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E17468 802416E8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E1746C 802416EC 3463002F */ ori $v1, $v1, 0x2f -/* E17470 802416F0 AC4300B8 */ sw $v1, 0xb8($v0) -.L802416F4: -/* E17474 802416F4 8662008E */ lh $v0, 0x8e($s3) -/* E17478 802416F8 5C400110 */ bgtzl $v0, .L80241B3C -/* E1747C 802416FC 2694001C */ addiu $s4, $s4, 0x1c -/* E17480 80241700 3C030001 */ lui $v1, 1 -/* E17484 80241704 34630002 */ ori $v1, $v1, 2 -/* E17488 80241708 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E1748C 8024170C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E17490 80241710 0260202D */ daddu $a0, $s3, $zero -/* E17494 80241714 AC4300B8 */ sw $v1, 0xb8($v0) -/* E17498 80241718 8EA20028 */ lw $v0, 0x28($s5) -/* E1749C 8024171C 2403FFFE */ addiu $v1, $zero, -2 -/* E174A0 80241720 00431024 */ and $v0, $v0, $v1 -/* E174A4 80241724 34420002 */ ori $v0, $v0, 2 -/* E174A8 80241728 AEA20028 */ sw $v0, 0x28($s5) -/* E174AC 8024172C 24020024 */ addiu $v0, $zero, 0x24 -/* E174B0 80241730 0C00EAFF */ jal disable_npc_shadow -/* E174B4 80241734 AE82002C */ sw $v0, 0x2c($s4) -/* E174B8 80241738 8E620000 */ lw $v0, ($s3) -/* E174BC 8024173C 34420002 */ ori $v0, $v0, 2 -/* E174C0 80241740 080906CE */ j .L80241B38 -/* E174C4 80241744 AE620000 */ sw $v0, ($s3) -/* E174C8 80241748 27A50068 */ addiu $a1, $sp, 0x68 -/* E174CC 8024174C 27A6006C */ addiu $a2, $sp, 0x6c -/* E174D0 80241750 9684003A */ lhu $a0, 0x3a($s4) -/* E174D4 80241754 27A70070 */ addiu $a3, $sp, 0x70 -/* E174D8 80241758 AFBE0010 */ sw $fp, 0x10($sp) -/* E174DC 8024175C AFB60014 */ sw $s6, 0x14($sp) -/* E174E0 80241760 0C046C3B */ jal get_model_center_and_size -/* E174E4 80241764 AFB70018 */ sw $s7, 0x18($sp) -/* E174E8 80241768 240400D2 */ addiu $a0, $zero, 0xd2 -/* E174EC 8024176C 24020047 */ addiu $v0, $zero, 0x47 -/* E174F0 80241770 0C00A67F */ jal rand_int -/* E174F4 80241774 AE82002C */ sw $v0, 0x2c($s4) -/* E174F8 80241778 C7A20068 */ lwc1 $f2, 0x68($sp) -/* E174FC 8024177C C7A00070 */ lwc1 $f0, 0x70($sp) -/* E17500 80241780 0260202D */ daddu $a0, $s3, $zero -/* E17504 80241784 AE820030 */ sw $v0, 0x30($s4) -/* E17508 80241788 46000021 */ cvt.d.s $f0, $f0 -/* E1750C 8024178C E6620038 */ swc1 $f2, 0x38($s3) -/* E17510 80241790 C7A2006C */ lwc1 $f2, 0x6c($sp) -/* E17514 80241794 46380000 */ add.d $f0, $f0, $f24 -/* E17518 80241798 E662003C */ swc1 $f2, 0x3c($s3) -/* E1751C 8024179C E6620064 */ swc1 $f2, 0x64($s3) -/* E17520 802417A0 46200020 */ cvt.s.d $f0, $f0 -/* E17524 802417A4 0C00EAFF */ jal disable_npc_shadow -/* E17528 802417A8 E6600040 */ swc1 $f0, 0x40($s3) -/* E1752C 802417AC 8E820030 */ lw $v0, 0x30($s4) -/* E17530 802417B0 2442FFFF */ addiu $v0, $v0, -1 -/* E17534 802417B4 1C4000E0 */ bgtz $v0, .L80241B38 -/* E17538 802417B8 AE820030 */ sw $v0, 0x30($s4) -/* E1753C 802417BC 27B20068 */ addiu $s2, $sp, 0x68 -/* E17540 802417C0 0240282D */ daddu $a1, $s2, $zero -/* E17544 802417C4 27B0006C */ addiu $s0, $sp, 0x6c -/* E17548 802417C8 0200302D */ daddu $a2, $s0, $zero -/* E1754C 802417CC 27B10070 */ addiu $s1, $sp, 0x70 -/* E17550 802417D0 9684003A */ lhu $a0, 0x3a($s4) -/* E17554 802417D4 0220382D */ daddu $a3, $s1, $zero -/* E17558 802417D8 AFBE0010 */ sw $fp, 0x10($sp) -/* E1755C 802417DC AFB60014 */ sw $s6, 0x14($sp) -/* E17560 802417E0 0C046C3B */ jal get_model_center_and_size -/* E17564 802417E4 AFB70018 */ sw $s7, 0x18($sp) -/* E17568 802417E8 24020048 */ addiu $v0, $zero, 0x48 -/* E1756C 802417EC AE82002C */ sw $v0, 0x2c($s4) -/* E17570 802417F0 C6600040 */ lwc1 $f0, 0x40($s3) -/* E17574 802417F4 24040214 */ addiu $a0, $zero, 0x214 -/* E17578 802417F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* E1757C 802417FC 8E660038 */ lw $a2, 0x38($s3) -/* E17580 80241800 8E67003C */ lw $a3, 0x3c($s3) -/* E17584 80241804 0C052757 */ jal play_sound_at_position -/* E17588 80241808 3C050020 */ lui $a1, 0x20 -/* E1758C 8024180C 0240282D */ daddu $a1, $s2, $zero -/* E17590 80241810 0200302D */ daddu $a2, $s0, $zero -/* E17594 80241814 9684003A */ lhu $a0, 0x3a($s4) -/* E17598 80241818 0220382D */ daddu $a3, $s1, $zero -/* E1759C 8024181C AFBE0010 */ sw $fp, 0x10($sp) -/* E175A0 80241820 AFB60014 */ sw $s6, 0x14($sp) -/* E175A4 80241824 0C046C3B */ jal get_model_center_and_size -/* E175A8 80241828 AFB70018 */ sw $s7, 0x18($sp) -/* E175AC 8024182C C6600064 */ lwc1 $f0, 0x64($s3) -/* E175B0 80241830 3C013F8C */ lui $at, 0x3f8c -/* E175B4 80241834 3421CCCD */ ori $at, $at, 0xcccd -/* E175B8 80241838 44811000 */ mtc1 $at, $f2 -/* E175BC 8024183C E676001C */ swc1 $f22, 0x1c($s3) -/* E175C0 80241840 E660003C */ swc1 $f0, 0x3c($s3) -/* E175C4 80241844 E6620014 */ swc1 $f2, 0x14($s3) -/* E175C8 80241848 8E840044 */ lw $a0, 0x44($s4) -/* E175CC 8024184C 0C046C04 */ jal get_model_list_index_from_tree_index -/* E175D0 80241850 AE800030 */ sw $zero, 0x30($s4) -/* E175D4 80241854 0C046B4C */ jal get_model_from_list_index -/* E175D8 80241858 0040202D */ daddu $a0, $v0, $zero -/* E175DC 8024185C 0040802D */ daddu $s0, $v0, $zero -/* E175E0 80241860 96030000 */ lhu $v1, ($s0) -/* E175E4 80241864 3062FFFD */ andi $v0, $v1, 0xfffd -/* E175E8 80241868 30630400 */ andi $v1, $v1, 0x400 -/* E175EC 8024186C 1460000A */ bnez $v1, .L80241898 -/* E175F0 80241870 A6020000 */ sh $v0, ($s0) -/* E175F4 80241874 8E650038 */ lw $a1, 0x38($s3) -/* E175F8 80241878 8E66003C */ lw $a2, 0x3c($s3) -/* E175FC 8024187C 8E670040 */ lw $a3, 0x40($s3) -/* E17600 80241880 0C019E40 */ jal guTranslateF -/* E17604 80241884 26040058 */ addiu $a0, $s0, 0x58 -/* E17608 80241888 96020000 */ lhu $v0, ($s0) -/* E1760C 8024188C 34421400 */ ori $v0, $v0, 0x1400 -/* E17610 80241890 080906CE */ j .L80241B38 -/* E17614 80241894 A6020000 */ sh $v0, ($s0) -.L80241898: -/* E17618 80241898 8E650038 */ lw $a1, 0x38($s3) -/* E1761C 8024189C 8E66003C */ lw $a2, 0x3c($s3) -/* E17620 802418A0 8E670040 */ lw $a3, 0x40($s3) -/* E17624 802418A4 0C019E40 */ jal guTranslateF -/* E17628 802418A8 27A40028 */ addiu $a0, $sp, 0x28 -/* E1762C 802418AC 27A40028 */ addiu $a0, $sp, 0x28 -/* E17630 802418B0 26050058 */ addiu $a1, $s0, 0x58 -/* E17634 802418B4 0C019D80 */ jal guMtxCatF -/* E17638 802418B8 00A0302D */ daddu $a2, $a1, $zero -/* E1763C 802418BC 080906CF */ j .L80241B3C -/* E17640 802418C0 2694001C */ addiu $s4, $s4, 0x1c -/* E17644 802418C4 8E820030 */ lw $v0, 0x30($s4) -/* E17648 802418C8 24420001 */ addiu $v0, $v0, 1 -/* E1764C 802418CC AE820030 */ sw $v0, 0x30($s4) -/* E17650 802418D0 C660001C */ lwc1 $f0, 0x1c($s3) -/* E17654 802418D4 C664003C */ lwc1 $f4, 0x3c($s3) -/* E17658 802418D8 46000086 */ mov.s $f2, $f0 -/* E1765C 802418DC 46002100 */ add.s $f4, $f4, $f0 -/* E17660 802418E0 C6600014 */ lwc1 $f0, 0x14($s3) -/* E17664 802418E4 46001081 */ sub.s $f2, $f2, $f0 -/* E17668 802418E8 E664003C */ swc1 $f4, 0x3c($s3) -/* E1766C 802418EC E662001C */ swc1 $f2, 0x1c($s3) -/* E17670 802418F0 0C046C04 */ jal get_model_list_index_from_tree_index -/* E17674 802418F4 8E840044 */ lw $a0, 0x44($s4) -/* E17678 802418F8 0C046B4C */ jal get_model_from_list_index -/* E1767C 802418FC 0040202D */ daddu $a0, $v0, $zero -/* E17680 80241900 0040802D */ daddu $s0, $v0, $zero -/* E17684 80241904 96020000 */ lhu $v0, ($s0) -/* E17688 80241908 30420400 */ andi $v0, $v0, 0x400 -/* E1768C 8024190C 1440000A */ bnez $v0, .L80241938 -/* E17690 80241910 00000000 */ nop -/* E17694 80241914 8E650038 */ lw $a1, 0x38($s3) -/* E17698 80241918 8E66003C */ lw $a2, 0x3c($s3) -/* E1769C 8024191C 8E670040 */ lw $a3, 0x40($s3) -/* E176A0 80241920 0C019E40 */ jal guTranslateF -/* E176A4 80241924 26040058 */ addiu $a0, $s0, 0x58 -/* E176A8 80241928 96020000 */ lhu $v0, ($s0) -/* E176AC 8024192C 34421400 */ ori $v0, $v0, 0x1400 -/* E176B0 80241930 08090657 */ j .L8024195C -/* E176B4 80241934 A6020000 */ sh $v0, ($s0) -.L80241938: -/* E176B8 80241938 8E650038 */ lw $a1, 0x38($s3) -/* E176BC 8024193C 8E66003C */ lw $a2, 0x3c($s3) -/* E176C0 80241940 8E670040 */ lw $a3, 0x40($s3) -/* E176C4 80241944 0C019E40 */ jal guTranslateF -/* E176C8 80241948 27A40028 */ addiu $a0, $sp, 0x28 -/* E176CC 8024194C 27A40028 */ addiu $a0, $sp, 0x28 -/* E176D0 80241950 26050058 */ addiu $a1, $s0, 0x58 -/* E176D4 80241954 0C019D80 */ jal guMtxCatF -/* E176D8 80241958 00A0302D */ daddu $a2, $a1, $zero -.L8024195C: -/* E176DC 8024195C C6600064 */ lwc1 $f0, 0x64($s3) -/* E176E0 80241960 3C0141A0 */ lui $at, 0x41a0 -/* E176E4 80241964 44811000 */ mtc1 $at, $f2 -/* E176E8 80241968 00000000 */ nop -/* E176EC 8024196C 46020000 */ add.s $f0, $f0, $f2 -/* E176F0 80241970 C662003C */ lwc1 $f2, 0x3c($s3) -/* E176F4 80241974 4602003C */ c.lt.s $f0, $f2 -/* E176F8 80241978 00000000 */ nop -/* E176FC 8024197C 45000005 */ bc1f .L80241994 -/* E17700 80241980 00000000 */ nop -/* E17704 80241984 0C00EAE8 */ jal enable_npc_shadow -/* E17708 80241988 0260202D */ daddu $a0, $s3, $zero -/* E1770C 8024198C 08090667 */ j .L8024199C -/* E17710 80241990 00000000 */ nop -.L80241994: -/* E17714 80241994 0C00EAFF */ jal disable_npc_shadow -/* E17718 80241998 0260202D */ daddu $a0, $s3, $zero -.L8024199C: -/* E1771C 8024199C C660001C */ lwc1 $f0, 0x1c($s3) -/* E17720 802419A0 44801000 */ mtc1 $zero, $f2 -/* E17724 802419A4 44801800 */ mtc1 $zero, $f3 -/* E17728 802419A8 46000021 */ cvt.d.s $f0, $f0 -/* E1772C 802419AC 4622003C */ c.lt.d $f0, $f2 -/* E17730 802419B0 00000000 */ nop -/* E17734 802419B4 45020061 */ bc1fl .L80241B3C -/* E17738 802419B8 2694001C */ addiu $s4, $s4, 0x1c -/* E1773C 802419BC C662003C */ lwc1 $f2, 0x3c($s3) -/* E17740 802419C0 C6600064 */ lwc1 $f0, 0x64($s3) -/* E17744 802419C4 4600103E */ c.le.s $f2, $f0 -/* E17748 802419C8 00000000 */ nop -/* E1774C 802419CC 4500005A */ bc1f .L80241B38 -/* E17750 802419D0 2404014A */ addiu $a0, $zero, 0x14a -/* E17754 802419D4 24020047 */ addiu $v0, $zero, 0x47 -/* E17758 802419D8 0C00A67F */ jal rand_int -/* E1775C 802419DC AE82002C */ sw $v0, 0x2c($s4) -/* E17760 802419E0 0260202D */ daddu $a0, $s3, $zero -/* E17764 802419E4 2442005A */ addiu $v0, $v0, 0x5a -/* E17768 802419E8 080906C2 */ j .L80241B08 -/* E1776C 802419EC AE820030 */ sw $v0, 0x30($s4) -/* E17770 802419F0 0C05272D */ jal play_sound -/* E17774 802419F4 2404021C */ addiu $a0, $zero, 0x21c -/* E17778 802419F8 8E840044 */ lw $a0, 0x44($s4) -/* E1777C 802419FC 0C046C04 */ jal get_model_list_index_from_tree_index -/* E17780 80241A00 00000000 */ nop -/* E17784 80241A04 0C046B4C */ jal get_model_from_list_index -/* E17788 80241A08 0040202D */ daddu $a0, $v0, $zero -/* E1778C 80241A0C 0040802D */ daddu $s0, $v0, $zero -/* E17790 80241A10 0C00EAE8 */ jal enable_npc_shadow -/* E17794 80241A14 0260202D */ daddu $a0, $s3, $zero -/* E17798 80241A18 2402004A */ addiu $v0, $zero, 0x4a -/* E1779C 80241A1C A660008E */ sh $zero, 0x8e($s3) -/* E177A0 80241A20 AE82002C */ sw $v0, 0x2c($s4) -/* E177A4 80241A24 96020000 */ lhu $v0, ($s0) -/* E177A8 80241A28 3042FFFD */ andi $v0, $v0, 0xfffd -/* E177AC 80241A2C A6020000 */ sh $v0, ($s0) -/* E177B0 80241A30 8E840044 */ lw $a0, 0x44($s4) -/* E177B4 80241A34 24080001 */ addiu $t0, $zero, 1 -/* E177B8 80241A38 0C046C04 */ jal get_model_list_index_from_tree_index -/* E177BC 80241A3C AFA80088 */ sw $t0, 0x88($sp) -/* E177C0 80241A40 0C046B4C */ jal get_model_from_list_index -/* E177C4 80241A44 0040202D */ daddu $a0, $v0, $zero -/* E177C8 80241A48 0040802D */ daddu $s0, $v0, $zero -/* E177CC 80241A4C 2402001E */ addiu $v0, $zero, 0x1e -/* E177D0 80241A50 C6600064 */ lwc1 $f0, 0x64($s3) -/* E177D4 80241A54 8667008E */ lh $a3, 0x8e($s3) -/* E177D8 80241A58 3C01403E */ lui $at, 0x403e -/* E177DC 80241A5C 44811800 */ mtc1 $at, $f3 -/* E177E0 80241A60 44801000 */ mtc1 $zero, $f2 -/* E177E4 80241A64 46000021 */ cvt.d.s $f0, $f0 -/* E177E8 80241A68 46220000 */ add.d $f0, $f0, $f2 -/* E177EC 80241A6C AFA20010 */ sw $v0, 0x10($sp) -/* E177F0 80241A70 8E650064 */ lw $a1, 0x64($s3) -/* E177F4 80241A74 46200020 */ cvt.s.d $f0, $f0 -/* E177F8 80241A78 44060000 */ mfc1 $a2, $f0 -/* E177FC 80241A7C 0C00A8ED */ jal update_lerp -/* E17800 80241A80 24040004 */ addiu $a0, $zero, 4 -/* E17804 80241A84 96020000 */ lhu $v0, ($s0) -/* E17808 80241A88 30420400 */ andi $v0, $v0, 0x400 -/* E1780C 80241A8C 1440000A */ bnez $v0, .L80241AB8 -/* E17810 80241A90 E7A0006C */ swc1 $f0, 0x6c($sp) -/* E17814 80241A94 8E650038 */ lw $a1, 0x38($s3) -/* E17818 80241A98 44060000 */ mfc1 $a2, $f0 -/* E1781C 80241A9C 8E670040 */ lw $a3, 0x40($s3) -/* E17820 80241AA0 0C019E40 */ jal guTranslateF -/* E17824 80241AA4 26040058 */ addiu $a0, $s0, 0x58 -/* E17828 80241AA8 96020000 */ lhu $v0, ($s0) -/* E1782C 80241AAC 34421400 */ ori $v0, $v0, 0x1400 -/* E17830 80241AB0 080906B7 */ j .L80241ADC -/* E17834 80241AB4 A6020000 */ sh $v0, ($s0) -.L80241AB8: -/* E17838 80241AB8 8E650038 */ lw $a1, 0x38($s3) -/* E1783C 80241ABC 44060000 */ mfc1 $a2, $f0 -/* E17840 80241AC0 8E670040 */ lw $a3, 0x40($s3) -/* E17844 80241AC4 0C019E40 */ jal guTranslateF -/* E17848 80241AC8 27A40028 */ addiu $a0, $sp, 0x28 -/* E1784C 80241ACC 27A40028 */ addiu $a0, $sp, 0x28 -/* E17850 80241AD0 26050058 */ addiu $a1, $s0, 0x58 -/* E17854 80241AD4 0C019D80 */ jal guMtxCatF -/* E17858 80241AD8 00A0302D */ daddu $a2, $a1, $zero -.L80241ADC: -/* E1785C 80241ADC 9662008E */ lhu $v0, 0x8e($s3) -/* E17860 80241AE0 24420001 */ addiu $v0, $v0, 1 -/* E17864 80241AE4 A662008E */ sh $v0, 0x8e($s3) -/* E17868 80241AE8 00021400 */ sll $v0, $v0, 0x10 -/* E1786C 80241AEC 00021403 */ sra $v0, $v0, 0x10 -/* E17870 80241AF0 2842001E */ slti $v0, $v0, 0x1e -/* E17874 80241AF4 54400011 */ bnel $v0, $zero, .L80241B3C -/* E17878 80241AF8 2694001C */ addiu $s4, $s4, 0x1c -/* E1787C 80241AFC 0260202D */ daddu $a0, $s3, $zero -/* E17880 80241B00 2402004B */ addiu $v0, $zero, 0x4b -/* E17884 80241B04 AE82002C */ sw $v0, 0x2c($s4) -.L80241B08: -/* E17888 80241B08 0C00EAFF */ jal disable_npc_shadow -/* E1788C 80241B0C 2694001C */ addiu $s4, $s4, 0x1c -/* E17890 80241B10 96020000 */ lhu $v0, ($s0) -/* E17894 80241B14 34420002 */ ori $v0, $v0, 2 -/* E17898 80241B18 080906CF */ j .L80241B3C -/* E1789C 80241B1C A6020000 */ sh $v0, ($s0) -.L80241B20: -/* E178A0 80241B20 8E83002C */ lw $v1, 0x2c($s4) -/* E178A4 80241B24 54620005 */ bnel $v1, $v0, .L80241B3C -/* E178A8 80241B28 2694001C */ addiu $s4, $s4, 0x1c -/* E178AC 80241B2C 24020033 */ addiu $v0, $zero, 0x33 -/* E178B0 80241B30 AE82002C */ sw $v0, 0x2c($s4) -.L80241B34: -/* E178B4 80241B34 AE800030 */ sw $zero, 0x30($s4) -.L80241B38: -/* E178B8 80241B38 2694001C */ addiu $s4, $s4, 0x1c -.L80241B3C: -/* E178BC 80241B3C 26A203D4 */ addiu $v0, $s5, 0x3d4 -/* E178C0 80241B40 0282102A */ slt $v0, $s4, $v0 -/* E178C4 80241B44 1440FC41 */ bnez $v0, .L80240C4C -/* E178C8 80241B48 00000000 */ nop -/* E178CC 80241B4C 8EA30008 */ lw $v1, 8($s5) -/* E178D0 80241B50 18600040 */ blez $v1, .L80241C54 -/* E178D4 80241B54 00000000 */ nop -/* E178D8 80241B58 8EA20004 */ lw $v0, 4($s5) -/* E178DC 80241B5C 2842000A */ slti $v0, $v0, 0xa -/* E178E0 80241B60 10400031 */ beqz $v0, .L80241C28 -/* E178E4 80241B64 2463FFFF */ addiu $v1, $v1, -1 -/* E178E8 80241B68 240202EE */ addiu $v0, $zero, 0x2ee -/* E178EC 80241B6C 14620003 */ bne $v1, $v0, .L80241B7C -/* E178F0 80241B70 AEA30008 */ sw $v1, 8($s5) -/* E178F4 80241B74 08090708 */ j .L80241C20 -/* E178F8 80241B78 240401A5 */ addiu $a0, $zero, 0x1a5 -.L80241B7C: -/* E178FC 80241B7C 24020258 */ addiu $v0, $zero, 0x258 -/* E17900 80241B80 14620003 */ bne $v1, $v0, .L80241B90 -/* E17904 80241B84 240201C2 */ addiu $v0, $zero, 0x1c2 -/* E17908 80241B88 08090708 */ j .L80241C20 -/* E1790C 80241B8C 240401A5 */ addiu $a0, $zero, 0x1a5 -.L80241B90: -/* E17910 80241B90 14620003 */ bne $v1, $v0, .L80241BA0 -/* E17914 80241B94 2402012C */ addiu $v0, $zero, 0x12c -/* E17918 80241B98 08090708 */ j .L80241C20 -/* E1791C 80241B9C 240401A5 */ addiu $a0, $zero, 0x1a5 -.L80241BA0: -/* E17920 80241BA0 14620003 */ bne $v1, $v0, .L80241BB0 -/* E17924 80241BA4 2402010E */ addiu $v0, $zero, 0x10e -/* E17928 80241BA8 08090708 */ j .L80241C20 -/* E1792C 80241BAC 240401A6 */ addiu $a0, $zero, 0x1a6 -.L80241BB0: -/* E17930 80241BB0 14620003 */ bne $v1, $v0, .L80241BC0 -/* E17934 80241BB4 240200F0 */ addiu $v0, $zero, 0xf0 -/* E17938 80241BB8 08090708 */ j .L80241C20 -/* E1793C 80241BBC 240401A6 */ addiu $a0, $zero, 0x1a6 -.L80241BC0: -/* E17940 80241BC0 14620003 */ bne $v1, $v0, .L80241BD0 -/* E17944 80241BC4 240200D2 */ addiu $v0, $zero, 0xd2 -/* E17948 80241BC8 08090708 */ j .L80241C20 -/* E1794C 80241BCC 240401A6 */ addiu $a0, $zero, 0x1a6 -.L80241BD0: -/* E17950 80241BD0 14620003 */ bne $v1, $v0, .L80241BE0 -/* E17954 80241BD4 240200B4 */ addiu $v0, $zero, 0xb4 -/* E17958 80241BD8 08090708 */ j .L80241C20 -/* E1795C 80241BDC 240401A6 */ addiu $a0, $zero, 0x1a6 -.L80241BE0: -/* E17960 80241BE0 14620003 */ bne $v1, $v0, .L80241BF0 -/* E17964 80241BE4 24020096 */ addiu $v0, $zero, 0x96 -/* E17968 80241BE8 08090708 */ j .L80241C20 -/* E1796C 80241BEC 240401A6 */ addiu $a0, $zero, 0x1a6 -.L80241BF0: -/* E17970 80241BF0 1062000A */ beq $v1, $v0, .L80241C1C -/* E17974 80241BF4 24020078 */ addiu $v0, $zero, 0x78 -/* E17978 80241BF8 10620008 */ beq $v1, $v0, .L80241C1C -/* E1797C 80241BFC 2402005A */ addiu $v0, $zero, 0x5a -/* E17980 80241C00 8EA30008 */ lw $v1, 8($s5) -/* E17984 80241C04 10620005 */ beq $v1, $v0, .L80241C1C -/* E17988 80241C08 2402003C */ addiu $v0, $zero, 0x3c -/* E1798C 80241C0C 10620003 */ beq $v1, $v0, .L80241C1C -/* E17990 80241C10 2402001E */ addiu $v0, $zero, 0x1e -/* E17994 80241C14 14620004 */ bne $v1, $v0, .L80241C28 -/* E17998 80241C18 00000000 */ nop -.L80241C1C: -/* E1799C 80241C1C 240401A7 */ addiu $a0, $zero, 0x1a7 -.L80241C20: -/* E179A0 80241C20 0C05272D */ jal play_sound -/* E179A4 80241C24 00000000 */ nop -.L80241C28: -/* E179A8 80241C28 8EA20008 */ lw $v0, 8($s5) -/* E179AC 80241C2C 18400009 */ blez $v0, .L80241C54 -/* E179B0 80241C30 2402000A */ addiu $v0, $zero, 0xa -/* E179B4 80241C34 8EA30004 */ lw $v1, 4($s5) -/* E179B8 80241C38 14620006 */ bne $v1, $v0, .L80241C54 -/* E179BC 80241C3C 00000000 */ nop -/* E179C0 80241C40 8EA30028 */ lw $v1, 0x28($s5) -/* E179C4 80241C44 30620001 */ andi $v0, $v1, 1 -/* E179C8 80241C48 14400002 */ bnez $v0, .L80241C54 -/* E179CC 80241C4C 34620003 */ ori $v0, $v1, 3 -/* E179D0 80241C50 AEA20028 */ sw $v0, 0x28($s5) -.L80241C54: -/* E179D4 80241C54 8EA20008 */ lw $v0, 8($s5) -/* E179D8 80241C58 1440000A */ bnez $v0, .L80241C84 -/* E179DC 80241C5C 00000000 */ nop -/* E179E0 80241C60 8FA80088 */ lw $t0, 0x88($sp) -/* E179E4 80241C64 11000007 */ beqz $t0, .L80241C84 -/* E179E8 80241C68 00000000 */ nop -/* E179EC 80241C6C 8EA30028 */ lw $v1, 0x28($s5) -/* E179F0 80241C70 30620001 */ andi $v0, $v1, 1 -/* E179F4 80241C74 14400005 */ bnez $v0, .L80241C8C -/* E179F8 80241C78 30620002 */ andi $v0, $v1, 2 -/* E179FC 80241C7C 34620003 */ ori $v0, $v1, 3 -/* E17A00 80241C80 AEA20028 */ sw $v0, 0x28($s5) -.L80241C84: -/* E17A04 80241C84 8EA30028 */ lw $v1, 0x28($s5) -/* E17A08 80241C88 30620002 */ andi $v0, $v1, 2 -.L80241C8C: -/* E17A0C 80241C8C 10400010 */ beqz $v0, .L80241CD0 -/* E17A10 80241C90 2402FFFD */ addiu $v0, $zero, -3 -/* E17A14 80241C94 00621024 */ and $v0, $v1, $v0 -/* E17A18 80241C98 AEA20028 */ sw $v0, 0x28($s5) -/* E17A1C 80241C9C 30620001 */ andi $v0, $v1, 1 -/* E17A20 80241CA0 10400007 */ beqz $v0, .L80241CC0 -/* E17A24 80241CA4 00000000 */ nop -/* E17A28 80241CA8 0C03805E */ jal disable_player_input -/* E17A2C 80241CAC 00000000 */ nop -/* E17A30 80241CB0 0C03BD8A */ jal func_800EF628 -/* E17A34 80241CB4 00000000 */ nop -/* E17A38 80241CB8 08090734 */ j .L80241CD0 -/* E17A3C 80241CBC 00000000 */ nop -.L80241CC0: -/* E17A40 80241CC0 0C038069 */ jal enable_player_input -/* E17A44 80241CC4 00000000 */ nop -/* E17A48 80241CC8 0C03BD80 */ jal func_800EF600 -/* E17A4C 80241CCC 00000000 */ nop -.L80241CD0: -/* E17A50 80241CD0 8FA80088 */ lw $t0, 0x88($sp) -/* E17A54 80241CD4 1500000E */ bnez $t0, .L80241D10 -/* E17A58 80241CD8 2402000A */ addiu $v0, $zero, 0xa -/* E17A5C 80241CDC 8EA30004 */ lw $v1, 4($s5) -/* E17A60 80241CE0 5062000A */ beql $v1, $v0, .L80241D0C -/* E17A64 80241CE4 24080001 */ addiu $t0, $zero, 1 -/* E17A68 80241CE8 8EA20008 */ lw $v0, 8($s5) -/* E17A6C 80241CEC 14400008 */ bnez $v0, .L80241D10 -/* E17A70 80241CF0 00000000 */ nop -/* E17A74 80241CF4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E17A78 80241CF8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E17A7C 80241CFC 804300B4 */ lb $v1, 0xb4($v0) -/* E17A80 80241D00 24020012 */ addiu $v0, $zero, 0x12 -/* E17A84 80241D04 10620002 */ beq $v1, $v0, .L80241D10 -/* E17A88 80241D08 24080001 */ addiu $t0, $zero, 1 -.L80241D0C: -/* E17A8C 80241D0C AFA80084 */ sw $t0, 0x84($sp) -.L80241D10: -/* E17A90 80241D10 8FA80084 */ lw $t0, 0x84($sp) -/* E17A94 80241D14 1100001B */ beqz $t0, .L80241D84 -/* E17A98 80241D18 0000102D */ daddu $v0, $zero, $zero -/* E17A9C 80241D1C 8EA20028 */ lw $v0, 0x28($s5) -/* E17AA0 80241D20 30420001 */ andi $v0, $v0, 1 -/* E17AA4 80241D24 10400005 */ beqz $v0, .L80241D3C -/* E17AA8 80241D28 00000000 */ nop -/* E17AAC 80241D2C 0C038069 */ jal enable_player_input -/* E17AB0 80241D30 00000000 */ nop -/* E17AB4 80241D34 0C03BD80 */ jal func_800EF600 -/* E17AB8 80241D38 00000000 */ nop -.L80241D3C: -/* E17ABC 80241D3C 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* E17AC0 80241D40 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* E17AC4 80241D44 8E020000 */ lw $v0, ($s0) -/* E17AC8 80241D48 3C014334 */ lui $at, 0x4334 -/* E17ACC 80241D4C 44810000 */ mtc1 $at, $f0 -/* E17AD0 80241D50 AEA00028 */ sw $zero, 0x28($s5) -/* E17AD4 80241D54 E4400080 */ swc1 $f0, 0x80($v0) -/* E17AD8 80241D58 8EA20008 */ lw $v0, 8($s5) -/* E17ADC 80241D5C 14400002 */ bnez $v0, .L80241D68 -/* E17AE0 80241D60 240400D4 */ addiu $a0, $zero, 0xd4 -/* E17AE4 80241D64 2404021D */ addiu $a0, $zero, 0x21d -.L80241D68: -/* E17AE8 80241D68 0C05272D */ jal play_sound -/* E17AEC 80241D6C 00000000 */ nop -/* E17AF0 80241D70 3C030001 */ lui $v1, 1 -/* E17AF4 80241D74 8E020000 */ lw $v0, ($s0) -/* E17AF8 80241D78 34630002 */ ori $v1, $v1, 2 -/* E17AFC 80241D7C AC4300B8 */ sw $v1, 0xb8($v0) -/* E17B00 80241D80 24020002 */ addiu $v0, $zero, 2 -.L80241D84: -/* E17B04 80241D84 8FBF00B4 */ lw $ra, 0xb4($sp) -/* E17B08 80241D88 8FBE00B0 */ lw $fp, 0xb0($sp) -/* E17B0C 80241D8C 8FB700AC */ lw $s7, 0xac($sp) -/* E17B10 80241D90 8FB600A8 */ lw $s6, 0xa8($sp) -/* E17B14 80241D94 8FB500A4 */ lw $s5, 0xa4($sp) -/* E17B18 80241D98 8FB400A0 */ lw $s4, 0xa0($sp) -/* E17B1C 80241D9C 8FB3009C */ lw $s3, 0x9c($sp) -/* E17B20 80241DA0 8FB20098 */ lw $s2, 0x98($sp) -/* E17B24 80241DA4 8FB10094 */ lw $s1, 0x94($sp) -/* E17B28 80241DA8 8FB00090 */ lw $s0, 0x90($sp) -/* E17B2C 80241DAC D7BE00E0 */ ldc1 $f30, 0xe0($sp) -/* E17B30 80241DB0 D7BC00D8 */ ldc1 $f28, 0xd8($sp) -/* E17B34 80241DB4 D7BA00D0 */ ldc1 $f26, 0xd0($sp) -/* E17B38 80241DB8 D7B800C8 */ ldc1 $f24, 0xc8($sp) -/* E17B3C 80241DBC D7B600C0 */ ldc1 $f22, 0xc0($sp) -/* E17B40 80241DC0 D7B400B8 */ ldc1 $f20, 0xb8($sp) -/* E17B44 80241DC4 03E00008 */ jr $ra -/* E17B48 80241DC8 27BD00E8 */ addiu $sp, $sp, 0xe8 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/func_80241DCC_E15D80.s b/asm/nonmatchings/world/area_mgm/mgm_02/func_80241DCC_E15D80.s deleted file mode 100644 index 70aded07bc..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/func_80241DCC_E15D80.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DCC_E17B4C -/* E17B4C 80241DCC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E17B50 80241DD0 AFB40020 */ sw $s4, 0x20($sp) -/* E17B54 80241DD4 0080A02D */ daddu $s4, $a0, $zero -/* E17B58 80241DD8 0000202D */ daddu $a0, $zero, $zero -/* E17B5C 80241DDC AFBF0024 */ sw $ra, 0x24($sp) -/* E17B60 80241DE0 AFB3001C */ sw $s3, 0x1c($sp) -/* E17B64 80241DE4 AFB20018 */ sw $s2, 0x18($sp) -/* E17B68 80241DE8 AFB10014 */ sw $s1, 0x14($sp) -/* E17B6C 80241DEC 0C00FB3A */ jal get_enemy -/* E17B70 80241DF0 AFB00010 */ sw $s0, 0x10($sp) -/* E17B74 80241DF4 8C51006C */ lw $s1, 0x6c($v0) -/* E17B78 80241DF8 3C028888 */ lui $v0, 0x8888 -/* E17B7C 80241DFC 8E240008 */ lw $a0, 8($s1) -/* E17B80 80241E00 34428889 */ ori $v0, $v0, 0x8889 -/* E17B84 80241E04 00820018 */ mult $a0, $v0 -/* E17B88 80241E08 3C014024 */ lui $at, 0x4024 -/* E17B8C 80241E0C 44811800 */ mtc1 $at, $f3 -/* E17B90 80241E10 44801000 */ mtc1 $zero, $f2 -/* E17B94 80241E14 00041FC3 */ sra $v1, $a0, 0x1f -/* E17B98 80241E18 00003810 */ mfhi $a3 -/* E17B9C 80241E1C 00E41021 */ addu $v0, $a3, $a0 -/* E17BA0 80241E20 00021103 */ sra $v0, $v0, 4 -/* E17BA4 80241E24 00432823 */ subu $a1, $v0, $v1 -/* E17BA8 80241E28 00051100 */ sll $v0, $a1, 4 -/* E17BAC 80241E2C 00451023 */ subu $v0, $v0, $a1 -/* E17BB0 80241E30 00021040 */ sll $v0, $v0, 1 -/* E17BB4 80241E34 00822023 */ subu $a0, $a0, $v0 -/* E17BB8 80241E38 44840000 */ mtc1 $a0, $f0 -/* E17BBC 80241E3C 00000000 */ nop -/* E17BC0 80241E40 46800020 */ cvt.s.w $f0, $f0 -/* E17BC4 80241E44 46000021 */ cvt.d.s $f0, $f0 -/* E17BC8 80241E48 46220002 */ mul.d $f0, $f0, $f2 -/* E17BCC 80241E4C 00000000 */ nop -/* E17BD0 80241E50 3C108011 */ lui $s0, %hi(gPlayerData) -/* E17BD4 80241E54 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* E17BD8 80241E58 3C040001 */ lui $a0, 1 -/* E17BDC 80241E5C 00051080 */ sll $v0, $a1, 2 -/* E17BE0 80241E60 00451021 */ addu $v0, $v0, $a1 -/* E17BE4 80241E64 3C01403E */ lui $at, 0x403e -/* E17BE8 80241E68 44811800 */ mtc1 $at, $f3 -/* E17BEC 80241E6C 44801000 */ mtc1 $zero, $f2 -/* E17BF0 80241E70 00021040 */ sll $v0, $v0, 1 -/* E17BF4 80241E74 46220003 */ div.d $f0, $f0, $f2 -/* E17BF8 80241E78 4620010D */ trunc.w.d $f4, $f0 -/* E17BFC 80241E7C 44132000 */ mfc1 $s3, $f4 -/* E17C00 80241E80 00000000 */ nop -/* E17C04 80241E84 00531021 */ addu $v0, $v0, $s3 -/* E17C08 80241E88 AE220020 */ sw $v0, 0x20($s1) -/* E17C0C 80241E8C 8E030338 */ lw $v1, 0x338($s0) -/* E17C10 80241E90 3484869F */ ori $a0, $a0, 0x869f -/* E17C14 80241E94 00621821 */ addu $v1, $v1, $v0 -/* E17C18 80241E98 AE030338 */ sw $v1, 0x338($s0) -/* E17C1C 80241E9C 0083182B */ sltu $v1, $a0, $v1 -/* E17C20 80241EA0 10600002 */ beqz $v1, .L80241EAC -/* E17C24 80241EA4 0200902D */ daddu $s2, $s0, $zero -/* E17C28 80241EA8 AE040338 */ sw $a0, 0x338($s0) -.L80241EAC: -/* E17C2C 80241EAC 9642033C */ lhu $v0, 0x33c($s2) -/* E17C30 80241EB0 8E230020 */ lw $v1, 0x20($s1) -/* E17C34 80241EB4 0043102A */ slt $v0, $v0, $v1 -/* E17C38 80241EB8 10400003 */ beqz $v0, .L80241EC8 -/* E17C3C 80241EBC 00A0202D */ daddu $a0, $a1, $zero -/* E17C40 80241EC0 96220022 */ lhu $v0, 0x22($s1) -/* E17C44 80241EC4 A642033C */ sh $v0, 0x33c($s2) -.L80241EC8: -/* E17C48 80241EC8 0C0496FA */ jal set_message_value -/* E17C4C 80241ECC 0000282D */ daddu $a1, $zero, $zero -/* E17C50 80241ED0 0260202D */ daddu $a0, $s3, $zero -/* E17C54 80241ED4 0C0496FA */ jal set_message_value -/* E17C58 80241ED8 24050001 */ addiu $a1, $zero, 1 -/* E17C5C 80241EDC 8E240020 */ lw $a0, 0x20($s1) -/* E17C60 80241EE0 0C0496FA */ jal set_message_value -/* E17C64 80241EE4 24050002 */ addiu $a1, $zero, 2 -/* E17C68 80241EE8 8E260020 */ lw $a2, 0x20($s1) -/* E17C6C 80241EEC 14C00006 */ bnez $a2, .L80241F08 -/* E17C70 80241EF0 0280202D */ daddu $a0, $s4, $zero -/* E17C74 80241EF4 8E230004 */ lw $v1, 4($s1) -/* E17C78 80241EF8 2402000A */ addiu $v0, $zero, 0xa -/* E17C7C 80241EFC 50620002 */ beql $v1, $v0, .L80241F08 -/* E17C80 80241F00 2406FFFF */ addiu $a2, $zero, -1 -/* E17C84 80241F04 0280202D */ daddu $a0, $s4, $zero -.L80241F08: -/* E17C88 80241F08 3C05FE36 */ lui $a1, 0xfe36 -/* E17C8C 80241F0C 0C0B2026 */ jal set_variable -/* E17C90 80241F10 34A53C80 */ ori $a1, $a1, 0x3c80 -/* E17C94 80241F14 8FBF0024 */ lw $ra, 0x24($sp) -/* E17C98 80241F18 8FB40020 */ lw $s4, 0x20($sp) -/* E17C9C 80241F1C 8FB3001C */ lw $s3, 0x1c($sp) -/* E17CA0 80241F20 8FB20018 */ lw $s2, 0x18($sp) -/* E17CA4 80241F24 8FB10014 */ lw $s1, 0x14($sp) -/* E17CA8 80241F28 8FB00010 */ lw $s0, 0x10($sp) -/* E17CAC 80241F2C 24020002 */ addiu $v0, $zero, 2 -/* E17CB0 80241F30 03E00008 */ jr $ra -/* E17CB4 80241F34 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/func_80241F38_E15D80.s b/asm/nonmatchings/world/area_mgm/mgm_02/func_80241F38_E15D80.s deleted file mode 100644 index 36dac5edb0..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/func_80241F38_E15D80.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F38_E17CB8 -/* E17CB8 80241F38 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E17CBC 80241F3C 0000202D */ daddu $a0, $zero, $zero -/* E17CC0 80241F40 AFBF0014 */ sw $ra, 0x14($sp) -/* E17CC4 80241F44 0C00FB3A */ jal get_enemy -/* E17CC8 80241F48 AFB00010 */ sw $s0, 0x10($sp) -/* E17CCC 80241F4C 8C50006C */ lw $s0, 0x6c($v0) -/* E17CD0 80241F50 8E030020 */ lw $v1, 0x20($s0) -/* E17CD4 80241F54 28620065 */ slti $v0, $v1, 0x65 -/* E17CD8 80241F58 14400003 */ bnez $v0, .L80241F68 -/* E17CDC 80241F5C 2862004C */ slti $v0, $v1, 0x4c -/* E17CE0 80241F60 080907EC */ j .L80241FB0 -/* E17CE4 80241F64 24040028 */ addiu $a0, $zero, 0x28 -.L80241F68: -/* E17CE8 80241F68 14400003 */ bnez $v0, .L80241F78 -/* E17CEC 80241F6C 28620033 */ slti $v0, $v1, 0x33 -/* E17CF0 80241F70 080907EC */ j .L80241FB0 -/* E17CF4 80241F74 24040023 */ addiu $a0, $zero, 0x23 -.L80241F78: -/* E17CF8 80241F78 14400003 */ bnez $v0, .L80241F88 -/* E17CFC 80241F7C 2862001F */ slti $v0, $v1, 0x1f -/* E17D00 80241F80 080907EC */ j .L80241FB0 -/* E17D04 80241F84 2404001E */ addiu $a0, $zero, 0x1e -.L80241F88: -/* E17D08 80241F88 14400003 */ bnez $v0, .L80241F98 -/* E17D0C 80241F8C 28620015 */ slti $v0, $v1, 0x15 -/* E17D10 80241F90 080907EC */ j .L80241FB0 -/* E17D14 80241F94 2404000A */ addiu $a0, $zero, 0xa -.L80241F98: -/* E17D18 80241F98 10400005 */ beqz $v0, .L80241FB0 -/* E17D1C 80241F9C 24040005 */ addiu $a0, $zero, 5 -/* E17D20 80241FA0 2862000B */ slti $v0, $v1, 0xb -/* E17D24 80241FA4 14400002 */ bnez $v0, .L80241FB0 -/* E17D28 80241FA8 24040001 */ addiu $a0, $zero, 1 -/* E17D2C 80241FAC 24040002 */ addiu $a0, $zero, 2 -.L80241FB0: -/* E17D30 80241FB0 8E020020 */ lw $v0, 0x20($s0) -/* E17D34 80241FB4 00441023 */ subu $v0, $v0, $a0 -/* E17D38 80241FB8 0C03A830 */ jal add_coins -/* E17D3C 80241FBC AE020020 */ sw $v0, 0x20($s0) -/* E17D40 80241FC0 0C05272D */ jal play_sound -/* E17D44 80241FC4 24040211 */ addiu $a0, $zero, 0x211 -/* E17D48 80241FC8 8E020020 */ lw $v0, 0x20($s0) -/* E17D4C 80241FCC 8FBF0014 */ lw $ra, 0x14($sp) -/* E17D50 80241FD0 8FB00010 */ lw $s0, 0x10($sp) -/* E17D54 80241FD4 28420001 */ slti $v0, $v0, 1 -/* E17D58 80241FD8 00021040 */ sll $v0, $v0, 1 -/* E17D5C 80241FDC 03E00008 */ jr $ra -/* E17D60 80241FE0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/func_80242314_E15D80.s b/asm/nonmatchings/world/area_mgm/mgm_02/func_80242314_E15D80.s deleted file mode 100644 index 11f9e63790..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/func_80242314_E15D80.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242314_E18094 -/* E18094 80242314 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E18098 80242318 3C05FE36 */ lui $a1, 0xfe36 -/* E1809C 8024231C 3C068011 */ lui $a2, 0x8011 -/* E180A0 80242320 84C6F29C */ lh $a2, -0xd64($a2) -/* E180A4 80242324 AFBF0010 */ sw $ra, 0x10($sp) -/* E180A8 80242328 0C0B2026 */ jal set_variable -/* E180AC 8024232C 34A53C8A */ ori $a1, $a1, 0x3c8a -/* E180B0 80242330 8FBF0010 */ lw $ra, 0x10($sp) -/* E180B4 80242334 24020002 */ addiu $v0, $zero, 2 -/* E180B8 80242338 03E00008 */ jr $ra -/* E180BC 8024233C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/func_802423D0_E15D80.s b/asm/nonmatchings/world/area_mgm/mgm_02/func_802423D0_E15D80.s deleted file mode 100644 index b47a82f0c4..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/func_802423D0_E15D80.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423D0_E18150 -/* E18150 802423D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E18154 802423D4 3C048025 */ lui $a0, 0x8025 -/* E18158 802423D8 248484C0 */ addiu $a0, $a0, -0x7b40 -/* E1815C 802423DC AFBF0010 */ sw $ra, 0x10($sp) -/* E18160 802423E0 0C0496CB */ jal set_message_images -/* E18164 802423E4 00000000 */ nop -/* E18168 802423E8 8FBF0010 */ lw $ra, 0x10($sp) -/* E1816C 802423EC 24020002 */ addiu $v0, $zero, 2 -/* E18170 802423F0 03E00008 */ jr $ra -/* E18174 802423F4 27BD0018 */ addiu $sp, $sp, 0x18 -/* E18178 802423F8 00000000 */ nop -/* E1817C 802423FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_01/func_80240070_B93440.s b/asm/nonmatchings/world/area_mim/mim_01/func_80240070_B93440.s deleted file mode 100644 index 93462f0ad7..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/func_80240070_B93440.s +++ /dev/null @@ -1,239 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_B934B0 -/* B934B0 80240070 27BDFF88 */ addiu $sp, $sp, -0x78 -/* B934B4 80240074 F7B60050 */ sdc1 $f22, 0x50($sp) -/* B934B8 80240078 4480B000 */ mtc1 $zero, $f22 -/* B934BC 8024007C AFB30034 */ sw $s3, 0x34($sp) -/* B934C0 80240080 00A0982D */ daddu $s3, $a1, $zero -/* B934C4 80240084 AFB40038 */ sw $s4, 0x38($sp) -/* B934C8 80240088 00C0A02D */ daddu $s4, $a2, $zero -/* B934CC 8024008C AFB5003C */ sw $s5, 0x3c($sp) -/* B934D0 80240090 00E0A82D */ daddu $s5, $a3, $zero -/* B934D4 80240094 AFB20030 */ sw $s2, 0x30($sp) -/* B934D8 80240098 0080902D */ daddu $s2, $a0, $zero -/* B934DC 8024009C AFB1002C */ sw $s1, 0x2c($sp) -/* B934E0 802400A0 3C118024 */ lui $s1, 0x8024 -/* B934E4 802400A4 263147C0 */ addiu $s1, $s1, 0x47c0 -/* B934E8 802400A8 AFBF0040 */ sw $ra, 0x40($sp) -/* B934EC 802400AC AFB00028 */ sw $s0, 0x28($sp) -/* B934F0 802400B0 F7BE0070 */ sdc1 $f30, 0x70($sp) -/* B934F4 802400B4 F7BC0068 */ sdc1 $f28, 0x68($sp) -/* B934F8 802400B8 F7BA0060 */ sdc1 $f26, 0x60($sp) -/* B934FC 802400BC F7B80058 */ sdc1 $f24, 0x58($sp) -/* B93500 802400C0 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B93504 802400C4 4600B006 */ mov.s $f0, $f22 -/* B93508 802400C8 4600B406 */ mov.s $f16, $f22 -/* B9350C 802400CC 4600B506 */ mov.s $f20, $f22 -/* B93510 802400D0 4600A786 */ mov.s $f30, $f20 -/* B93514 802400D4 4600A086 */ mov.s $f2, $f20 -/* B93518 802400D8 4600A606 */ mov.s $f24, $f20 -/* B9351C 802400DC 4600A686 */ mov.s $f26, $f20 -/* B93520 802400E0 4600A706 */ mov.s $f28, $f20 -.L802400E4: -/* B93524 802400E4 24020006 */ addiu $v0, $zero, 6 -/* B93528 802400E8 8E460000 */ lw $a2, ($s2) -/* B9352C 802400EC 8E470004 */ lw $a3, 4($s2) -/* B93530 802400F0 00061E02 */ srl $v1, $a2, 0x18 -/* B93534 802400F4 1062004E */ beq $v1, $v0, .L80240230 -/* B93538 802400F8 0000802D */ daddu $s0, $zero, $zero -/* B9353C 802400FC 28620007 */ slti $v0, $v1, 7 -/* B93540 80240100 10400007 */ beqz $v0, .L80240120 -/* B93544 80240104 24020001 */ addiu $v0, $zero, 1 -/* B93548 80240108 10620018 */ beq $v1, $v0, .L8024016C -/* B9354C 8024010C 24020005 */ addiu $v0, $zero, 5 -/* B93550 80240110 10620029 */ beq $v1, $v0, .L802401B8 -/* B93554 80240114 000713C2 */ srl $v0, $a3, 0xf -/* B93558 80240118 080900BD */ j .L802402F4 -/* B9355C 8024011C 00000000 */ nop -.L80240120: -/* B93560 80240120 240200DE */ addiu $v0, $zero, 0xde -/* B93564 80240124 10620005 */ beq $v1, $v0, .L8024013C -/* B93568 80240128 240200DF */ addiu $v0, $zero, 0xdf -/* B9356C 8024012C 50620071 */ beql $v1, $v0, .L802402F4 -/* B93570 80240130 24100001 */ addiu $s0, $zero, 1 -/* B93574 80240134 080900BD */ j .L802402F4 -/* B93578 80240138 00000000 */ nop -.L8024013C: -/* B9357C 8024013C 00E0202D */ daddu $a0, $a3, $zero -/* B93580 80240140 0260282D */ daddu $a1, $s3, $zero -/* B93584 80240144 0280302D */ daddu $a2, $s4, $zero -/* B93588 80240148 02A0382D */ daddu $a3, $s5, $zero -/* B9358C 8024014C E7A00018 */ swc1 $f0, 0x18($sp) -/* B93590 80240150 E7A2001C */ swc1 $f2, 0x1c($sp) -/* B93594 80240154 0C09001C */ jal func_80240070 -/* B93598 80240158 E7B00020 */ swc1 $f16, 0x20($sp) -/* B9359C 8024015C C7A00018 */ lwc1 $f0, 0x18($sp) -/* B935A0 80240160 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* B935A4 80240164 080900BD */ j .L802402F4 -/* B935A8 80240168 C7B00020 */ lwc1 $f16, 0x20($sp) -.L8024016C: -/* B935AC 8024016C 00061302 */ srl $v0, $a2, 0xc -/* B935B0 80240170 304500FF */ andi $a1, $v0, 0xff -/* B935B4 80240174 0205102B */ sltu $v0, $s0, $a1 -/* B935B8 80240178 1040005E */ beqz $v0, .L802402F4 -/* B935BC 8024017C 0000182D */ daddu $v1, $zero, $zero -/* B935C0 80240180 00061042 */ srl $v0, $a2, 1 -/* B935C4 80240184 3042007F */ andi $v0, $v0, 0x7f -/* B935C8 80240188 00453023 */ subu $a2, $v0, $a1 -/* B935CC 8024018C 00E0202D */ daddu $a0, $a3, $zero -.L80240190: -/* B935D0 80240190 00C31021 */ addu $v0, $a2, $v1 -/* B935D4 80240194 00021080 */ sll $v0, $v0, 2 -/* B935D8 80240198 00511021 */ addu $v0, $v0, $s1 -/* B935DC 8024019C AC440000 */ sw $a0, ($v0) -/* B935E0 802401A0 24630001 */ addiu $v1, $v1, 1 -/* B935E4 802401A4 0065102B */ sltu $v0, $v1, $a1 -/* B935E8 802401A8 1440FFF9 */ bnez $v0, .L80240190 -/* B935EC 802401AC 24840010 */ addiu $a0, $a0, 0x10 -/* B935F0 802401B0 080900BD */ j .L802402F4 -/* B935F4 802401B4 00000000 */ nop -.L802401B8: -/* B935F8 802401B8 304201FC */ andi $v0, $v0, 0x1fc -/* B935FC 802401BC 00511021 */ addu $v0, $v0, $s1 -/* B93600 802401C0 8C440000 */ lw $a0, ($v0) -/* B93604 802401C4 24100002 */ addiu $s0, $zero, 2 -/* B93608 802401C8 84820000 */ lh $v0, ($a0) -/* B9360C 802401CC 84830002 */ lh $v1, 2($a0) -/* B93610 802401D0 44828000 */ mtc1 $v0, $f16 -/* B93614 802401D4 00000000 */ nop -/* B93618 802401D8 46808420 */ cvt.s.w $f16, $f16 -/* B9361C 802401DC 44830000 */ mtc1 $v1, $f0 -/* B93620 802401E0 00000000 */ nop -/* B93624 802401E4 46800020 */ cvt.s.w $f0, $f0 -/* B93628 802401E8 000711C2 */ srl $v0, $a3, 7 -/* B9362C 802401EC 304201FC */ andi $v0, $v0, 0x1fc -/* B93630 802401F0 00511021 */ addu $v0, $v0, $s1 -/* B93634 802401F4 84830004 */ lh $v1, 4($a0) -/* B93638 802401F8 8C440000 */ lw $a0, ($v0) -/* B9363C 802401FC 4483B000 */ mtc1 $v1, $f22 -/* B93640 80240200 00000000 */ nop -/* B93644 80240204 4680B5A0 */ cvt.s.w $f22, $f22 -/* B93648 80240208 84820000 */ lh $v0, ($a0) -/* B9364C 8024020C 84830002 */ lh $v1, 2($a0) -/* B93650 80240210 44821000 */ mtc1 $v0, $f2 -/* B93654 80240214 00000000 */ nop -/* B93658 80240218 468010A0 */ cvt.s.w $f2, $f2 -/* B9365C 8024021C 4483F000 */ mtc1 $v1, $f30 -/* B93660 80240220 00000000 */ nop -/* B93664 80240224 4680F7A0 */ cvt.s.w $f30, $f30 -/* B93668 80240228 080900AA */ j .L802402A8 -/* B9366C 8024022C 00071040 */ sll $v0, $a3, 1 -.L80240230: -/* B93670 80240230 000613C2 */ srl $v0, $a2, 0xf -/* B93674 80240234 304201FC */ andi $v0, $v0, 0x1fc -/* B93678 80240238 00511021 */ addu $v0, $v0, $s1 -/* B9367C 8024023C 8C440000 */ lw $a0, ($v0) -/* B93680 80240240 24100002 */ addiu $s0, $zero, 2 -/* B93684 80240244 84820000 */ lh $v0, ($a0) -/* B93688 80240248 84830002 */ lh $v1, 2($a0) -/* B9368C 8024024C 44828000 */ mtc1 $v0, $f16 -/* B93690 80240250 00000000 */ nop -/* B93694 80240254 46808420 */ cvt.s.w $f16, $f16 -/* B93698 80240258 44830000 */ mtc1 $v1, $f0 -/* B9369C 8024025C 00000000 */ nop -/* B936A0 80240260 46800020 */ cvt.s.w $f0, $f0 -/* B936A4 80240264 000611C2 */ srl $v0, $a2, 7 -/* B936A8 80240268 304201FC */ andi $v0, $v0, 0x1fc -/* B936AC 8024026C 00511021 */ addu $v0, $v0, $s1 -/* B936B0 80240270 84830004 */ lh $v1, 4($a0) -/* B936B4 80240274 8C440000 */ lw $a0, ($v0) -/* B936B8 80240278 4483B000 */ mtc1 $v1, $f22 -/* B936BC 8024027C 00000000 */ nop -/* B936C0 80240280 4680B5A0 */ cvt.s.w $f22, $f22 -/* B936C4 80240284 84820000 */ lh $v0, ($a0) -/* B936C8 80240288 84830002 */ lh $v1, 2($a0) -/* B936CC 8024028C 44821000 */ mtc1 $v0, $f2 -/* B936D0 80240290 00000000 */ nop -/* B936D4 80240294 468010A0 */ cvt.s.w $f2, $f2 -/* B936D8 80240298 4483F000 */ mtc1 $v1, $f30 -/* B936DC 8024029C 00000000 */ nop -/* B936E0 802402A0 4680F7A0 */ cvt.s.w $f30, $f30 -/* B936E4 802402A4 00061040 */ sll $v0, $a2, 1 -.L802402A8: -/* B936E8 802402A8 304201FC */ andi $v0, $v0, 0x1fc -/* B936EC 802402AC 00511021 */ addu $v0, $v0, $s1 -/* B936F0 802402B0 84830004 */ lh $v1, 4($a0) -/* B936F4 802402B4 8C420000 */ lw $v0, ($v0) -/* B936F8 802402B8 4483A000 */ mtc1 $v1, $f20 -/* B936FC 802402BC 00000000 */ nop -/* B93700 802402C0 4680A520 */ cvt.s.w $f20, $f20 -/* B93704 802402C4 84440000 */ lh $a0, ($v0) -/* B93708 802402C8 84430002 */ lh $v1, 2($v0) -/* B9370C 802402CC 84420004 */ lh $v0, 4($v0) -/* B93710 802402D0 4484E000 */ mtc1 $a0, $f28 -/* B93714 802402D4 00000000 */ nop -/* B93718 802402D8 4680E720 */ cvt.s.w $f28, $f28 -/* B9371C 802402DC 4483D000 */ mtc1 $v1, $f26 -/* B93720 802402E0 00000000 */ nop -/* B93724 802402E4 4680D6A0 */ cvt.s.w $f26, $f26 -/* B93728 802402E8 4482C000 */ mtc1 $v0, $f24 -/* B9372C 802402EC 00000000 */ nop -/* B93730 802402F0 4680C620 */ cvt.s.w $f24, $f24 -.L802402F4: -/* B93734 802402F4 1200FF7B */ beqz $s0, .L802400E4 -/* B93738 802402F8 26520008 */ addiu $s2, $s2, 8 -/* B9373C 802402FC 24020002 */ addiu $v0, $zero, 2 -/* B93740 80240300 1602002C */ bne $s0, $v0, .L802403B4 -/* B93744 80240304 00000000 */ nop -/* B93748 80240308 461E0201 */ sub.s $f8, $f0, $f30 -/* B9374C 8024030C 4614C181 */ sub.s $f6, $f24, $f20 -/* B93750 80240310 46064382 */ mul.s $f14, $f8, $f6 -/* B93754 80240314 00000000 */ nop -/* B93758 80240318 4614B101 */ sub.s $f4, $f22, $f20 -/* B9375C 8024031C 461ED281 */ sub.s $f10, $f26, $f30 -/* B93760 80240320 460A2302 */ mul.s $f12, $f4, $f10 -/* B93764 80240324 00000000 */ nop -/* B93768 80240328 4602E001 */ sub.s $f0, $f28, $f2 -/* B9376C 8024032C 46002102 */ mul.s $f4, $f4, $f0 -/* B93770 80240330 00000000 */ nop -/* B93774 80240334 46028081 */ sub.s $f2, $f16, $f2 -/* B93778 80240338 46061182 */ mul.s $f6, $f2, $f6 -/* B9377C 8024033C 00000000 */ nop -/* B93780 80240340 460A1082 */ mul.s $f2, $f2, $f10 -/* B93784 80240344 00000000 */ nop -/* B93788 80240348 46004202 */ mul.s $f8, $f8, $f0 -/* B9378C 8024034C 00000000 */ nop -/* B93790 80240350 460C7501 */ sub.s $f20, $f14, $f12 -/* B93794 80240354 4614A002 */ mul.s $f0, $f20, $f20 -/* B93798 80240358 00000000 */ nop -/* B9379C 8024035C 46062581 */ sub.s $f22, $f4, $f6 -/* B937A0 80240360 4616B102 */ mul.s $f4, $f22, $f22 -/* B937A4 80240364 00000000 */ nop -/* B937A8 80240368 46081601 */ sub.s $f24, $f2, $f8 -/* B937AC 8024036C 4618C082 */ mul.s $f2, $f24, $f24 -/* B937B0 80240370 00000000 */ nop -/* B937B4 80240374 46040000 */ add.s $f0, $f0, $f4 -/* B937B8 80240378 46020300 */ add.s $f12, $f0, $f2 -/* B937BC 8024037C 46006084 */ sqrt.s $f2, $f12 -/* B937C0 80240380 46021032 */ c.eq.s $f2, $f2 -/* B937C4 80240384 00000000 */ nop -/* B937C8 80240388 45030005 */ bc1tl .L802403A0 -/* B937CC 8024038C 4602A003 */ div.s $f0, $f20, $f2 -/* B937D0 80240390 0C0187BC */ jal sqrtf -/* B937D4 80240394 00000000 */ nop -/* B937D8 80240398 46000086 */ mov.s $f2, $f0 -/* B937DC 8024039C 4602A003 */ div.s $f0, $f20, $f2 -.L802403A0: -/* B937E0 802403A0 E6600000 */ swc1 $f0, ($s3) -/* B937E4 802403A4 4602B003 */ div.s $f0, $f22, $f2 -/* B937E8 802403A8 E6800000 */ swc1 $f0, ($s4) -/* B937EC 802403AC 4602C003 */ div.s $f0, $f24, $f2 -/* B937F0 802403B0 E6A00000 */ swc1 $f0, ($s5) -.L802403B4: -/* B937F4 802403B4 8FBF0040 */ lw $ra, 0x40($sp) -/* B937F8 802403B8 8FB5003C */ lw $s5, 0x3c($sp) -/* B937FC 802403BC 8FB40038 */ lw $s4, 0x38($sp) -/* B93800 802403C0 8FB30034 */ lw $s3, 0x34($sp) -/* B93804 802403C4 8FB20030 */ lw $s2, 0x30($sp) -/* B93808 802403C8 8FB1002C */ lw $s1, 0x2c($sp) -/* B9380C 802403CC 8FB00028 */ lw $s0, 0x28($sp) -/* B93810 802403D0 D7BE0070 */ ldc1 $f30, 0x70($sp) -/* B93814 802403D4 D7BC0068 */ ldc1 $f28, 0x68($sp) -/* B93818 802403D8 D7BA0060 */ ldc1 $f26, 0x60($sp) -/* B9381C 802403DC D7B80058 */ ldc1 $f24, 0x58($sp) -/* B93820 802403E0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B93824 802403E4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B93828 802403E8 03E00008 */ jr $ra -/* B9382C 802403EC 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_mim/mim_01/func_802403F0_B93440.s b/asm/nonmatchings/world/area_mim/mim_01/func_802403F0_B93440.s deleted file mode 100644 index 5931f204e0..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/func_802403F0_B93440.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F0_B93830 -/* B93830 802403F0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B93834 802403F4 AFB10024 */ sw $s1, 0x24($sp) -/* B93838 802403F8 0080882D */ daddu $s1, $a0, $zero -/* B9383C 802403FC AFBF0028 */ sw $ra, 0x28($sp) -/* B93840 80240400 AFB00020 */ sw $s0, 0x20($sp) -/* B93844 80240404 F7B60038 */ sdc1 $f22, 0x38($sp) -/* B93848 80240408 F7B40030 */ sdc1 $f20, 0x30($sp) -/* B9384C 8024040C 8E30000C */ lw $s0, 0xc($s1) -/* B93850 80240410 8E050000 */ lw $a1, ($s0) -/* B93854 80240414 0C0B1EAF */ jal get_variable -/* B93858 80240418 26100004 */ addiu $s0, $s0, 4 -/* B9385C 8024041C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B93860 80240420 0040202D */ daddu $a0, $v0, $zero -/* B93864 80240424 0C046B4C */ jal get_model_from_list_index -/* B93868 80240428 0040202D */ daddu $a0, $v0, $zero -/* B9386C 8024042C 8C420008 */ lw $v0, 8($v0) -/* B93870 80240430 27A50010 */ addiu $a1, $sp, 0x10 -/* B93874 80240434 8C420004 */ lw $v0, 4($v0) -/* B93878 80240438 27A60014 */ addiu $a2, $sp, 0x14 -/* B9387C 8024043C 8C440000 */ lw $a0, ($v0) -/* B93880 80240440 0C09001C */ jal func_80240070 -/* B93884 80240444 27A70018 */ addiu $a3, $sp, 0x18 -/* B93888 80240448 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B9388C 8024044C 3C014480 */ lui $at, 0x4480 -/* B93890 80240450 4481A000 */ mtc1 $at, $f20 -/* B93894 80240454 00000000 */ nop -/* B93898 80240458 46140002 */ mul.s $f0, $f0, $f20 -/* B9389C 8024045C 00000000 */ nop -/* B938A0 80240460 3C01CD5B */ lui $at, 0xcd5b -/* B938A4 80240464 34215858 */ ori $at, $at, 0x5858 -/* B938A8 80240468 4481B000 */ mtc1 $at, $f22 -/* B938AC 8024046C 00000000 */ nop -/* B938B0 80240470 46160000 */ add.s $f0, $f0, $f22 -/* B938B4 80240474 8E050000 */ lw $a1, ($s0) -/* B938B8 80240478 4600008D */ trunc.w.s $f2, $f0 -/* B938BC 8024047C 44061000 */ mfc1 $a2, $f2 -/* B938C0 80240480 0C0B2026 */ jal set_variable -/* B938C4 80240484 0220202D */ daddu $a0, $s1, $zero -/* B938C8 80240488 C7A00014 */ lwc1 $f0, 0x14($sp) -/* B938CC 8024048C 46140002 */ mul.s $f0, $f0, $f20 -/* B938D0 80240490 00000000 */ nop -/* B938D4 80240494 26100004 */ addiu $s0, $s0, 4 -/* B938D8 80240498 46160000 */ add.s $f0, $f0, $f22 -/* B938DC 8024049C 8E050000 */ lw $a1, ($s0) -/* B938E0 802404A0 4600008D */ trunc.w.s $f2, $f0 -/* B938E4 802404A4 44061000 */ mfc1 $a2, $f2 -/* B938E8 802404A8 0C0B2026 */ jal set_variable -/* B938EC 802404AC 0220202D */ daddu $a0, $s1, $zero -/* B938F0 802404B0 C7A00018 */ lwc1 $f0, 0x18($sp) -/* B938F4 802404B4 46140002 */ mul.s $f0, $f0, $f20 -/* B938F8 802404B8 00000000 */ nop -/* B938FC 802404BC 26100004 */ addiu $s0, $s0, 4 -/* B93900 802404C0 46160000 */ add.s $f0, $f0, $f22 -/* B93904 802404C4 8E050000 */ lw $a1, ($s0) -/* B93908 802404C8 4600008D */ trunc.w.s $f2, $f0 -/* B9390C 802404CC 44061000 */ mfc1 $a2, $f2 -/* B93910 802404D0 0C0B2026 */ jal set_variable -/* B93914 802404D4 0220202D */ daddu $a0, $s1, $zero -/* B93918 802404D8 8FBF0028 */ lw $ra, 0x28($sp) -/* B9391C 802404DC 8FB10024 */ lw $s1, 0x24($sp) -/* B93920 802404E0 8FB00020 */ lw $s0, 0x20($sp) -/* B93924 802404E4 D7B60038 */ ldc1 $f22, 0x38($sp) -/* B93928 802404E8 D7B40030 */ ldc1 $f20, 0x30($sp) -/* B9392C 802404EC 24020002 */ addiu $v0, $zero, 2 -/* B93930 802404F0 03E00008 */ jr $ra -/* B93934 802404F4 27BD0040 */ addiu $sp, $sp, 0x40 -/* B93938 802404F8 00000000 */ nop -/* B9393C 802404FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_01/func_80240500_B93440.s b/asm/nonmatchings/world/area_mim/mim_01/func_80240500_B93440.s deleted file mode 100644 index 7559c459af..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/func_80240500_B93440.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_B93940 -/* B93940 80240500 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B93944 80240504 AFB10014 */ sw $s1, 0x14($sp) -/* B93948 80240508 0080882D */ daddu $s1, $a0, $zero -/* B9394C 8024050C AFBF0018 */ sw $ra, 0x18($sp) -/* B93950 80240510 AFB00010 */ sw $s0, 0x10($sp) -/* B93954 80240514 8E300148 */ lw $s0, 0x148($s1) -/* B93958 80240518 0C00EABB */ jal get_npc_unsafe -/* B9395C 8024051C 86040008 */ lh $a0, 8($s0) -/* B93960 80240520 24030001 */ addiu $v1, $zero, 1 -/* B93964 80240524 0040202D */ daddu $a0, $v0, $zero -/* B93968 80240528 AE03006C */ sw $v1, 0x6c($s0) -/* B9396C 8024052C 8482008C */ lh $v0, 0x8c($a0) -/* B93970 80240530 14400009 */ bnez $v0, .L80240558 -/* B93974 80240534 24020002 */ addiu $v0, $zero, 2 -/* B93978 80240538 96030072 */ lhu $v1, 0x72($s0) -/* B9397C 8024053C AE02006C */ sw $v0, 0x6c($s0) -/* B93980 80240540 A483008E */ sh $v1, 0x8e($a0) -/* B93984 80240544 8E0200CC */ lw $v0, 0xcc($s0) -/* B93988 80240548 8C420020 */ lw $v0, 0x20($v0) -/* B9398C 8024054C AC820028 */ sw $v0, 0x28($a0) -/* B93990 80240550 2402001F */ addiu $v0, $zero, 0x1f -/* B93994 80240554 AE220070 */ sw $v0, 0x70($s1) -.L80240558: -/* B93998 80240558 8FBF0018 */ lw $ra, 0x18($sp) -/* B9399C 8024055C 8FB10014 */ lw $s1, 0x14($sp) -/* B939A0 80240560 8FB00010 */ lw $s0, 0x10($sp) -/* B939A4 80240564 03E00008 */ jr $ra -/* B939A8 80240568 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_01/func_8024056C_B93440.s b/asm/nonmatchings/world/area_mim/mim_01/func_8024056C_B93440.s deleted file mode 100644 index b20e906739..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/func_8024056C_B93440.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024056C_B939AC -/* B939AC 8024056C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B939B0 80240570 AFB10014 */ sw $s1, 0x14($sp) -/* B939B4 80240574 0080882D */ daddu $s1, $a0, $zero -/* B939B8 80240578 AFBF0018 */ sw $ra, 0x18($sp) -/* B939BC 8024057C AFB00010 */ sw $s0, 0x10($sp) -/* B939C0 80240580 8E300148 */ lw $s0, 0x148($s1) -/* B939C4 80240584 0C00EABB */ jal get_npc_unsafe -/* B939C8 80240588 86040008 */ lh $a0, 8($s0) -/* B939CC 8024058C 0040202D */ daddu $a0, $v0, $zero -/* B939D0 80240590 9482008E */ lhu $v0, 0x8e($a0) -/* B939D4 80240594 2442FFFF */ addiu $v0, $v0, -1 -/* B939D8 80240598 A482008E */ sh $v0, 0x8e($a0) -/* B939DC 8024059C 00021400 */ sll $v0, $v0, 0x10 -/* B939E0 802405A0 1C400009 */ bgtz $v0, .L802405C8 -/* B939E4 802405A4 24020003 */ addiu $v0, $zero, 3 -/* B939E8 802405A8 96030076 */ lhu $v1, 0x76($s0) -/* B939EC 802405AC AE02006C */ sw $v0, 0x6c($s0) -/* B939F0 802405B0 A483008E */ sh $v1, 0x8e($a0) -/* B939F4 802405B4 8E0200CC */ lw $v0, 0xcc($s0) -/* B939F8 802405B8 8C420024 */ lw $v0, 0x24($v0) -/* B939FC 802405BC AC820028 */ sw $v0, 0x28($a0) -/* B93A00 802405C0 24020020 */ addiu $v0, $zero, 0x20 -/* B93A04 802405C4 AE220070 */ sw $v0, 0x70($s1) -.L802405C8: -/* B93A08 802405C8 8FBF0018 */ lw $ra, 0x18($sp) -/* B93A0C 802405CC 8FB10014 */ lw $s1, 0x14($sp) -/* B93A10 802405D0 8FB00010 */ lw $s0, 0x10($sp) -/* B93A14 802405D4 03E00008 */ jr $ra -/* B93A18 802405D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_01/func_802405DC_B93440.s b/asm/nonmatchings/world/area_mim/mim_01/func_802405DC_B93440.s deleted file mode 100644 index 4cdfe2ee96..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/func_802405DC_B93440.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405DC_B93A1C -/* B93A1C 802405DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B93A20 802405E0 AFB10034 */ sw $s1, 0x34($sp) -/* B93A24 802405E4 0080882D */ daddu $s1, $a0, $zero -/* B93A28 802405E8 AFBF0038 */ sw $ra, 0x38($sp) -/* B93A2C 802405EC AFB00030 */ sw $s0, 0x30($sp) -/* B93A30 802405F0 8E300148 */ lw $s0, 0x148($s1) -/* B93A34 802405F4 0C00EABB */ jal get_npc_unsafe -/* B93A38 802405F8 86040008 */ lh $a0, 8($s0) -/* B93A3C 802405FC 0040282D */ daddu $a1, $v0, $zero -/* B93A40 80240600 94A2008E */ lhu $v0, 0x8e($a1) -/* B93A44 80240604 2442FFFF */ addiu $v0, $v0, -1 -/* B93A48 80240608 A4A2008E */ sh $v0, 0x8e($a1) -/* B93A4C 8024060C 00021400 */ sll $v0, $v0, 0x10 -/* B93A50 80240610 1C400023 */ bgtz $v0, .L802406A0 -/* B93A54 80240614 24020004 */ addiu $v0, $zero, 4 -/* B93A58 80240618 8E0300CC */ lw $v1, 0xcc($s0) -/* B93A5C 8024061C AE02006C */ sw $v0, 0x6c($s0) -/* B93A60 80240620 8C620000 */ lw $v0, ($v1) -/* B93A64 80240624 ACA20028 */ sw $v0, 0x28($a1) -/* B93A68 80240628 9602007A */ lhu $v0, 0x7a($s0) -/* B93A6C 8024062C A4A2008E */ sh $v0, 0x8e($a1) -/* B93A70 80240630 8E020078 */ lw $v0, 0x78($s0) -/* B93A74 80240634 28420008 */ slti $v0, $v0, 8 -/* B93A78 80240638 14400018 */ bnez $v0, .L8024069C -/* B93A7C 8024063C 24020021 */ addiu $v0, $zero, 0x21 -/* B93A80 80240640 24040003 */ addiu $a0, $zero, 3 -/* B93A84 80240644 27A30028 */ addiu $v1, $sp, 0x28 -/* B93A88 80240648 84A700A8 */ lh $a3, 0xa8($a1) -/* B93A8C 8024064C 3C013F80 */ lui $at, 0x3f80 -/* B93A90 80240650 44810000 */ mtc1 $at, $f0 -/* B93A94 80240654 3C014000 */ lui $at, 0x4000 -/* B93A98 80240658 44811000 */ mtc1 $at, $f2 -/* B93A9C 8024065C 3C01C1A0 */ lui $at, 0xc1a0 -/* B93AA0 80240660 44812000 */ mtc1 $at, $f4 -/* B93AA4 80240664 44873000 */ mtc1 $a3, $f6 -/* B93AA8 80240668 00000000 */ nop -/* B93AAC 8024066C 468031A0 */ cvt.s.w $f6, $f6 -/* B93AB0 80240670 E7A00010 */ swc1 $f0, 0x10($sp) -/* B93AB4 80240674 E7A20014 */ swc1 $f2, 0x14($sp) -/* B93AB8 80240678 E7A40018 */ swc1 $f4, 0x18($sp) -/* B93ABC 8024067C 8E020078 */ lw $v0, 0x78($s0) -/* B93AC0 80240680 44073000 */ mfc1 $a3, $f6 -/* B93AC4 80240684 0000302D */ daddu $a2, $zero, $zero -/* B93AC8 80240688 AFA30020 */ sw $v1, 0x20($sp) -/* B93ACC 8024068C 2442FFFF */ addiu $v0, $v0, -1 -/* B93AD0 80240690 0C01BFA4 */ jal fx_emote -/* B93AD4 80240694 AFA2001C */ sw $v0, 0x1c($sp) -/* B93AD8 80240698 24020021 */ addiu $v0, $zero, 0x21 -.L8024069C: -/* B93ADC 8024069C AE220070 */ sw $v0, 0x70($s1) -.L802406A0: -/* B93AE0 802406A0 8FBF0038 */ lw $ra, 0x38($sp) -/* B93AE4 802406A4 8FB10034 */ lw $s1, 0x34($sp) -/* B93AE8 802406A8 8FB00030 */ lw $s0, 0x30($sp) -/* B93AEC 802406AC 03E00008 */ jr $ra -/* B93AF0 802406B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_01/func_80240708_B93440.s b/asm/nonmatchings/world/area_mim/mim_01/func_80240708_B93440.s deleted file mode 100644 index 2f56ecf513..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/func_80240708_B93440.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240708_B93B48 -/* B93B48 80240708 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B93B4C 8024070C AFBF0024 */ sw $ra, 0x24($sp) -/* B93B50 80240710 AFB40020 */ sw $s4, 0x20($sp) -/* B93B54 80240714 AFB3001C */ sw $s3, 0x1c($sp) -/* B93B58 80240718 AFB20018 */ sw $s2, 0x18($sp) -/* B93B5C 8024071C AFB10014 */ sw $s1, 0x14($sp) -/* B93B60 80240720 AFB00010 */ sw $s0, 0x10($sp) -/* B93B64 80240724 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B93B68 80240728 8C900148 */ lw $s0, 0x148($a0) -/* B93B6C 8024072C 86040008 */ lh $a0, 8($s0) -/* B93B70 80240730 0C00EABB */ jal get_npc_unsafe -/* B93B74 80240734 24110001 */ addiu $s1, $zero, 1 -/* B93B78 80240738 86040008 */ lh $a0, 8($s0) -/* B93B7C 8024073C 0040802D */ daddu $s0, $v0, $zero -/* B93B80 80240740 3C05800B */ lui $a1, %hi(gCameras) -/* B93B84 80240744 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* B93B88 80240748 3C03800A */ lui $v1, 0x800a -/* B93B8C 8024074C 8463A634 */ lh $v1, -0x59cc($v1) -/* B93B90 80240750 00912021 */ addu $a0, $a0, $s1 -/* B93B94 80240754 00031080 */ sll $v0, $v1, 2 -/* B93B98 80240758 00431021 */ addu $v0, $v0, $v1 -/* B93B9C 8024075C 00021080 */ sll $v0, $v0, 2 -/* B93BA0 80240760 00431023 */ subu $v0, $v0, $v1 -/* B93BA4 80240764 000218C0 */ sll $v1, $v0, 3 -/* B93BA8 80240768 00431021 */ addu $v0, $v0, $v1 -/* B93BAC 8024076C 000210C0 */ sll $v0, $v0, 3 -/* B93BB0 80240770 0C00FB3A */ jal get_enemy -/* B93BB4 80240774 00459021 */ addu $s2, $v0, $a1 -/* B93BB8 80240778 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* B93BBC 8024077C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* B93BC0 80240780 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B93BC4 80240784 8E830000 */ lw $v1, ($s4) -/* B93BC8 80240788 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B93BCC 8024078C 8C660028 */ lw $a2, 0x28($v1) -/* B93BD0 80240790 8C670030 */ lw $a3, 0x30($v1) -/* B93BD4 80240794 0C00A7B5 */ jal dist2D -/* B93BD8 80240798 0040982D */ daddu $s3, $v0, $zero -/* B93BDC 8024079C C6620074 */ lwc1 $f2, 0x74($s3) -/* B93BE0 802407A0 468010A0 */ cvt.s.w $f2, $f2 -/* B93BE4 802407A4 4600103C */ c.lt.s $f2, $f0 -/* B93BE8 802407A8 00000000 */ nop -/* B93BEC 802407AC 45030001 */ bc1tl .L802407B4 -/* B93BF0 802407B0 0000882D */ daddu $s1, $zero, $zero -.L802407B4: -/* B93BF4 802407B4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* B93BF8 802407B8 C60E000C */ lwc1 $f14, 0xc($s0) -/* B93BFC 802407BC 3C014387 */ lui $at, 0x4387 -/* B93C00 802407C0 4481A000 */ mtc1 $at, $f20 -/* B93C04 802407C4 0C00A70A */ jal get_clamped_angle_diff -/* B93C08 802407C8 00000000 */ nop -/* B93C0C 802407CC 0C00A6C9 */ jal clamp_angle -/* B93C10 802407D0 46000306 */ mov.s $f12, $f0 -/* B93C14 802407D4 3C018024 */ lui $at, 0x8024 -/* B93C18 802407D8 D42245F0 */ ldc1 $f2, 0x45f0($at) -/* B93C1C 802407DC 46000021 */ cvt.d.s $f0, $f0 -/* B93C20 802407E0 4622003C */ c.lt.d $f0, $f2 -/* B93C24 802407E4 00000000 */ nop -/* B93C28 802407E8 45000003 */ bc1f .L802407F8 -/* B93C2C 802407EC 00000000 */ nop -/* B93C30 802407F0 3C0142B4 */ lui $at, 0x42b4 -/* B93C34 802407F4 4481A000 */ mtc1 $at, $f20 -.L802407F8: -/* B93C38 802407F8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B93C3C 802407FC 8E820000 */ lw $v0, ($s4) -/* B93C40 80240800 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B93C44 80240804 8C460028 */ lw $a2, 0x28($v0) -/* B93C48 80240808 0C00A720 */ jal atan2 -/* B93C4C 8024080C 8C470030 */ lw $a3, 0x30($v0) -/* B93C50 80240810 4600A306 */ mov.s $f12, $f20 -/* B93C54 80240814 0C00A70A */ jal get_clamped_angle_diff -/* B93C58 80240818 46000386 */ mov.s $f14, $f0 -/* B93C5C 8024081C C6620078 */ lwc1 $f2, 0x78($s3) -/* B93C60 80240820 468010A0 */ cvt.s.w $f2, $f2 -/* B93C64 80240824 46000005 */ abs.s $f0, $f0 -/* B93C68 80240828 4600103C */ c.lt.s $f2, $f0 -/* B93C6C 8024082C 00000000 */ nop -/* B93C70 80240830 45030001 */ bc1tl .L80240838 -/* B93C74 80240834 0000882D */ daddu $s1, $zero, $zero -.L80240838: -/* B93C78 80240838 8E820000 */ lw $v0, ($s4) -/* B93C7C 8024083C C600003C */ lwc1 $f0, 0x3c($s0) -/* B93C80 80240840 C442002C */ lwc1 $f2, 0x2c($v0) -/* B93C84 80240844 860200A8 */ lh $v0, 0xa8($s0) -/* B93C88 80240848 46020001 */ sub.s $f0, $f0, $f2 -/* B93C8C 8024084C 44821000 */ mtc1 $v0, $f2 -/* B93C90 80240850 00000000 */ nop -/* B93C94 80240854 468010A1 */ cvt.d.w $f2, $f2 -/* B93C98 80240858 46221080 */ add.d $f2, $f2, $f2 -/* B93C9C 8024085C 46000005 */ abs.s $f0, $f0 -/* B93CA0 80240860 46000021 */ cvt.d.s $f0, $f0 -/* B93CA4 80240864 4620103E */ c.le.d $f2, $f0 -/* B93CA8 80240868 00000000 */ nop -/* B93CAC 8024086C 45030001 */ bc1tl .L80240874 -/* B93CB0 80240870 0000882D */ daddu $s1, $zero, $zero -.L80240874: -/* B93CB4 80240874 3C038011 */ lui $v1, 0x8011 -/* B93CB8 80240878 8063EBB3 */ lb $v1, -0x144d($v1) -/* B93CBC 8024087C 24020009 */ addiu $v0, $zero, 9 -/* B93CC0 80240880 50620001 */ beql $v1, $v0, .L80240888 -/* B93CC4 80240884 0000882D */ daddu $s1, $zero, $zero -.L80240888: -/* B93CC8 80240888 24020007 */ addiu $v0, $zero, 7 -/* B93CCC 8024088C 50620001 */ beql $v1, $v0, .L80240894 -/* B93CD0 80240890 0000882D */ daddu $s1, $zero, $zero -.L80240894: -/* B93CD4 80240894 0220102D */ daddu $v0, $s1, $zero -/* B93CD8 80240898 8FBF0024 */ lw $ra, 0x24($sp) -/* B93CDC 8024089C 8FB40020 */ lw $s4, 0x20($sp) -/* B93CE0 802408A0 8FB3001C */ lw $s3, 0x1c($sp) -/* B93CE4 802408A4 8FB20018 */ lw $s2, 0x18($sp) -/* B93CE8 802408A8 8FB10014 */ lw $s1, 0x14($sp) -/* B93CEC 802408AC 8FB00010 */ lw $s0, 0x10($sp) -/* B93CF0 802408B0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B93CF4 802408B4 03E00008 */ jr $ra -/* B93CF8 802408B8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mim/mim_01/func_802408BC_B93440.s b/asm/nonmatchings/world/area_mim/mim_01/func_802408BC_B93440.s deleted file mode 100644 index 03bc251a05..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/func_802408BC_B93440.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408BC_B93CFC -/* B93CFC 802408BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B93D00 802408C0 AFB40028 */ sw $s4, 0x28($sp) -/* B93D04 802408C4 0080A02D */ daddu $s4, $a0, $zero -/* B93D08 802408C8 AFBF002C */ sw $ra, 0x2c($sp) -/* B93D0C 802408CC AFB30024 */ sw $s3, 0x24($sp) -/* B93D10 802408D0 AFB20020 */ sw $s2, 0x20($sp) -/* B93D14 802408D4 AFB1001C */ sw $s1, 0x1c($sp) -/* B93D18 802408D8 AFB00018 */ sw $s0, 0x18($sp) -/* B93D1C 802408DC 8E910148 */ lw $s1, 0x148($s4) -/* B93D20 802408E0 86240008 */ lh $a0, 8($s1) -/* B93D24 802408E4 0C00EABB */ jal get_npc_unsafe -/* B93D28 802408E8 00A0802D */ daddu $s0, $a1, $zero -/* B93D2C 802408EC 16000005 */ bnez $s0, .L80240904 -/* B93D30 802408F0 0040902D */ daddu $s2, $v0, $zero -/* B93D34 802408F4 8E2200B0 */ lw $v0, 0xb0($s1) -/* B93D38 802408F8 30420004 */ andi $v0, $v0, 4 -/* B93D3C 802408FC 10400015 */ beqz $v0, .L80240954 -/* B93D40 80240900 00000000 */ nop -.L80240904: -/* B93D44 80240904 AE800070 */ sw $zero, 0x70($s4) -/* B93D48 80240908 8E420000 */ lw $v0, ($s2) -/* B93D4C 8024090C 3C031F30 */ lui $v1, 0x1f30 -/* B93D50 80240910 A640008E */ sh $zero, 0x8e($s2) -/* B93D54 80240914 34420102 */ ori $v0, $v0, 0x102 -/* B93D58 80240918 AE420000 */ sw $v0, ($s2) -/* B93D5C 8024091C 8E220000 */ lw $v0, ($s1) -/* B93D60 80240920 3C01C47A */ lui $at, 0xc47a -/* B93D64 80240924 44810000 */ mtc1 $at, $f0 -/* B93D68 80240928 00431025 */ or $v0, $v0, $v1 -/* B93D6C 8024092C AE220000 */ sw $v0, ($s1) -/* B93D70 80240930 AE400038 */ sw $zero, 0x38($s2) -/* B93D74 80240934 E640003C */ swc1 $f0, 0x3c($s2) -/* B93D78 80240938 AE400040 */ sw $zero, 0x40($s2) -/* B93D7C 8024093C 8E2300B0 */ lw $v1, 0xb0($s1) -/* B93D80 80240940 30620004 */ andi $v0, $v1, 4 -/* B93D84 80240944 10400003 */ beqz $v0, .L80240954 -/* B93D88 80240948 2402FFFB */ addiu $v0, $zero, -5 -/* B93D8C 8024094C 00621024 */ and $v0, $v1, $v0 -/* B93D90 80240950 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240954: -/* B93D94 80240954 8E930070 */ lw $s3, 0x70($s4) -/* B93D98 80240958 12600005 */ beqz $s3, .L80240970 -/* B93D9C 8024095C 24020001 */ addiu $v0, $zero, 1 -/* B93DA0 80240960 12620048 */ beq $s3, $v0, .L80240A84 -/* B93DA4 80240964 00000000 */ nop -/* B93DA8 80240968 080902BE */ j .L80240AF8 -/* B93DAC 8024096C 00000000 */ nop -.L80240970: -/* B93DB0 80240970 86240008 */ lh $a0, 8($s1) -/* B93DB4 80240974 0C00FB3A */ jal get_enemy -/* B93DB8 80240978 2484FFFF */ addiu $a0, $a0, -1 -/* B93DBC 8024097C 0040802D */ daddu $s0, $v0, $zero -/* B93DC0 80240980 0C00EABB */ jal get_npc_unsafe -/* B93DC4 80240984 86040008 */ lh $a0, 8($s0) -/* B93DC8 80240988 24030001 */ addiu $v1, $zero, 1 -/* B93DCC 8024098C 0040982D */ daddu $s3, $v0, $zero -/* B93DD0 80240990 A2230007 */ sb $v1, 7($s1) -/* B93DD4 80240994 8E03006C */ lw $v1, 0x6c($s0) -/* B93DD8 80240998 24020003 */ addiu $v0, $zero, 3 -/* B93DDC 8024099C 14620056 */ bne $v1, $v0, .L80240AF8 -/* B93DE0 802409A0 00000000 */ nop -/* B93DE4 802409A4 8E2500A8 */ lw $a1, 0xa8($s1) -/* B93DE8 802409A8 10A00003 */ beqz $a1, .L802409B8 -/* B93DEC 802409AC 0260202D */ daddu $a0, $s3, $zero -/* B93DF0 802409B0 0C012530 */ jal func_800494C0 -/* B93DF4 802409B4 0000302D */ daddu $a2, $zero, $zero -.L802409B8: -/* B93DF8 802409B8 27A40010 */ addiu $a0, $sp, 0x10 -/* B93DFC 802409BC C6280070 */ lwc1 $f8, 0x70($s1) -/* B93E00 802409C0 46804220 */ cvt.s.w $f8, $f8 -/* B93E04 802409C4 C6620034 */ lwc1 $f2, 0x34($s3) -/* B93E08 802409C8 3C014387 */ lui $at, 0x4387 -/* B93E0C 802409CC 44810000 */ mtc1 $at, $f0 -/* B93E10 802409D0 44064000 */ mfc1 $a2, $f8 -/* B93E14 802409D4 46020001 */ sub.s $f0, $f0, $f2 -/* B93E18 802409D8 C6660038 */ lwc1 $f6, 0x38($s3) -/* B93E1C 802409DC C6640040 */ lwc1 $f4, 0x40($s3) -/* B93E20 802409E0 44070000 */ mfc1 $a3, $f0 -/* B93E24 802409E4 27A50014 */ addiu $a1, $sp, 0x14 -/* B93E28 802409E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* B93E2C 802409EC 0C00A7E7 */ jal add_vec2D_polar -/* B93E30 802409F0 E7A40014 */ swc1 $f4, 0x14($sp) -/* B93E34 802409F4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B93E38 802409F8 4600020D */ trunc.w.s $f8, $f0 -/* B93E3C 802409FC 44024000 */ mfc1 $v0, $f8 -/* B93E40 80240A00 E6400038 */ swc1 $f0, 0x38($s2) -/* B93E44 80240A04 A6220010 */ sh $v0, 0x10($s1) -/* B93E48 80240A08 C660003C */ lwc1 $f0, 0x3c($s3) -/* B93E4C 80240A0C C622006C */ lwc1 $f2, 0x6c($s1) -/* B93E50 80240A10 468010A0 */ cvt.s.w $f2, $f2 -/* B93E54 80240A14 46020000 */ add.s $f0, $f0, $f2 -/* B93E58 80240A18 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* B93E5C 80240A1C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* B93E60 80240A20 E640003C */ swc1 $f0, 0x3c($s2) -/* B93E64 80240A24 C7A20014 */ lwc1 $f2, 0x14($sp) -/* B93E68 80240A28 4600020D */ trunc.w.s $f8, $f0 -/* B93E6C 80240A2C 44024000 */ mfc1 $v0, $f8 -/* B93E70 80240A30 00000000 */ nop -/* B93E74 80240A34 A6220012 */ sh $v0, 0x12($s1) -/* B93E78 80240A38 4600120D */ trunc.w.s $f8, $f2 -/* B93E7C 80240A3C 44024000 */ mfc1 $v0, $f8 -/* B93E80 80240A40 E6420040 */ swc1 $f2, 0x40($s2) -/* B93E84 80240A44 A6220014 */ sh $v0, 0x14($s1) -/* B93E88 80240A48 8C660028 */ lw $a2, 0x28($v1) -/* B93E8C 80240A4C 8C670030 */ lw $a3, 0x30($v1) -/* B93E90 80240A50 C64C0038 */ lwc1 $f12, 0x38($s2) -/* B93E94 80240A54 0C00A720 */ jal atan2 -/* B93E98 80240A58 C64E0040 */ lwc1 $f14, 0x40($s2) -/* B93E9C 80240A5C 3C03E0EF */ lui $v1, 0xe0ef -/* B93EA0 80240A60 E640000C */ swc1 $f0, 0xc($s2) -/* B93EA4 80240A64 8E220000 */ lw $v0, ($s1) -/* B93EA8 80240A68 3463FFFF */ ori $v1, $v1, 0xffff -/* B93EAC 80240A6C 00431024 */ and $v0, $v0, $v1 -/* B93EB0 80240A70 AE220000 */ sw $v0, ($s1) -/* B93EB4 80240A74 24020001 */ addiu $v0, $zero, 1 -/* B93EB8 80240A78 A640008E */ sh $zero, 0x8e($s2) -/* B93EBC 80240A7C 080902BE */ j .L80240AF8 -/* B93EC0 80240A80 AE820070 */ sw $v0, 0x70($s4) -.L80240A84: -/* B93EC4 80240A84 86240008 */ lh $a0, 8($s1) -/* B93EC8 80240A88 0C00FB3A */ jal get_enemy -/* B93ECC 80240A8C 2484FFFF */ addiu $a0, $a0, -1 -/* B93ED0 80240A90 0040802D */ daddu $s0, $v0, $zero -/* B93ED4 80240A94 0C00EABB */ jal get_npc_unsafe -/* B93ED8 80240A98 86040008 */ lh $a0, 8($s0) -/* B93EDC 80240A9C 9642008E */ lhu $v0, 0x8e($s2) -/* B93EE0 80240AA0 24420001 */ addiu $v0, $v0, 1 -/* B93EE4 80240AA4 A642008E */ sh $v0, 0x8e($s2) -/* B93EE8 80240AA8 00021400 */ sll $v0, $v0, 0x10 -/* B93EEC 80240AAC 8E23007C */ lw $v1, 0x7c($s1) -/* B93EF0 80240AB0 00021403 */ sra $v0, $v0, 0x10 -/* B93EF4 80240AB4 0043102A */ slt $v0, $v0, $v1 -/* B93EF8 80240AB8 50400001 */ beql $v0, $zero, .L80240AC0 -/* B93EFC 80240ABC A2200007 */ sb $zero, 7($s1) -.L80240AC0: -/* B93F00 80240AC0 8E03006C */ lw $v1, 0x6c($s0) -/* B93F04 80240AC4 24020004 */ addiu $v0, $zero, 4 -/* B93F08 80240AC8 1462000B */ bne $v1, $v0, .L80240AF8 -/* B93F0C 80240ACC 3C021F10 */ lui $v0, 0x1f10 -/* B93F10 80240AD0 8E230000 */ lw $v1, ($s1) -/* B93F14 80240AD4 3C01C47A */ lui $at, 0xc47a -/* B93F18 80240AD8 44810000 */ mtc1 $at, $f0 -/* B93F1C 80240ADC 00621825 */ or $v1, $v1, $v0 -/* B93F20 80240AE0 AE230000 */ sw $v1, ($s1) -/* B93F24 80240AE4 AE400038 */ sw $zero, 0x38($s2) -/* B93F28 80240AE8 E640003C */ swc1 $f0, 0x3c($s2) -/* B93F2C 80240AEC AE400040 */ sw $zero, 0x40($s2) -/* B93F30 80240AF0 A2330007 */ sb $s3, 7($s1) -/* B93F34 80240AF4 AE800070 */ sw $zero, 0x70($s4) -.L80240AF8: -/* B93F38 80240AF8 8FBF002C */ lw $ra, 0x2c($sp) -/* B93F3C 80240AFC 8FB40028 */ lw $s4, 0x28($sp) -/* B93F40 80240B00 8FB30024 */ lw $s3, 0x24($sp) -/* B93F44 80240B04 8FB20020 */ lw $s2, 0x20($sp) -/* B93F48 80240B08 8FB1001C */ lw $s1, 0x1c($sp) -/* B93F4C 80240B0C 8FB00018 */ lw $s0, 0x18($sp) -/* B93F50 80240B10 0000102D */ daddu $v0, $zero, $zero -/* B93F54 80240B14 03E00008 */ jr $ra -/* B93F58 80240B18 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mim/mim_01/func_80240B1C_B93440.s b/asm/nonmatchings/world/area_mim/mim_01/func_80240B1C_B93440.s deleted file mode 100644 index de193be10b..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/func_80240B1C_B93440.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B1C_B93F5C -/* B93F5C 80240B1C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B93F60 80240B20 AFB20038 */ sw $s2, 0x38($sp) -/* B93F64 80240B24 0080902D */ daddu $s2, $a0, $zero -/* B93F68 80240B28 AFBF0048 */ sw $ra, 0x48($sp) -/* B93F6C 80240B2C AFB50044 */ sw $s5, 0x44($sp) -/* B93F70 80240B30 AFB40040 */ sw $s4, 0x40($sp) -/* B93F74 80240B34 AFB3003C */ sw $s3, 0x3c($sp) -/* B93F78 80240B38 AFB10034 */ sw $s1, 0x34($sp) -/* B93F7C 80240B3C AFB00030 */ sw $s0, 0x30($sp) -/* B93F80 80240B40 8E510148 */ lw $s1, 0x148($s2) -/* B93F84 80240B44 86240008 */ lh $a0, 8($s1) -/* B93F88 80240B48 0C00EABB */ jal get_npc_unsafe -/* B93F8C 80240B4C 00A0802D */ daddu $s0, $a1, $zero -/* B93F90 80240B50 8E43000C */ lw $v1, 0xc($s2) -/* B93F94 80240B54 0240202D */ daddu $a0, $s2, $zero -/* B93F98 80240B58 8C650000 */ lw $a1, ($v1) -/* B93F9C 80240B5C 0C0B1EAF */ jal get_variable -/* B93FA0 80240B60 0040A82D */ daddu $s5, $v0, $zero -/* B93FA4 80240B64 AFA00010 */ sw $zero, 0x10($sp) -/* B93FA8 80240B68 8E2300D0 */ lw $v1, 0xd0($s1) -/* B93FAC 80240B6C 8C630030 */ lw $v1, 0x30($v1) -/* B93FB0 80240B70 AFA30014 */ sw $v1, 0x14($sp) -/* B93FB4 80240B74 8E2300D0 */ lw $v1, 0xd0($s1) -/* B93FB8 80240B78 8C63001C */ lw $v1, 0x1c($v1) -/* B93FBC 80240B7C AFA30018 */ sw $v1, 0x18($sp) -/* B93FC0 80240B80 8E2300D0 */ lw $v1, 0xd0($s1) -/* B93FC4 80240B84 8C630024 */ lw $v1, 0x24($v1) -/* B93FC8 80240B88 AFA3001C */ sw $v1, 0x1c($sp) -/* B93FCC 80240B8C 8E2300D0 */ lw $v1, 0xd0($s1) -/* B93FD0 80240B90 8C630028 */ lw $v1, 0x28($v1) -/* B93FD4 80240B94 27B40010 */ addiu $s4, $sp, 0x10 -/* B93FD8 80240B98 AFA30020 */ sw $v1, 0x20($sp) -/* B93FDC 80240B9C 8E2300D0 */ lw $v1, 0xd0($s1) -/* B93FE0 80240BA0 3C014282 */ lui $at, 0x4282 -/* B93FE4 80240BA4 44810000 */ mtc1 $at, $f0 -/* B93FE8 80240BA8 8C63002C */ lw $v1, 0x2c($v1) -/* B93FEC 80240BAC 0040982D */ daddu $s3, $v0, $zero -/* B93FF0 80240BB0 E7A00028 */ swc1 $f0, 0x28($sp) -/* B93FF4 80240BB4 A7A0002C */ sh $zero, 0x2c($sp) -/* B93FF8 80240BB8 16000005 */ bnez $s0, .L80240BD0 -/* B93FFC 80240BBC AFA30024 */ sw $v1, 0x24($sp) -/* B94000 80240BC0 8E2200B0 */ lw $v0, 0xb0($s1) -/* B94004 80240BC4 30420004 */ andi $v0, $v0, 4 -/* B94008 80240BC8 10400020 */ beqz $v0, .L80240C4C -/* B9400C 80240BCC 00000000 */ nop -.L80240BD0: -/* B94010 80240BD0 2404F7FF */ addiu $a0, $zero, -0x801 -/* B94014 80240BD4 AE400070 */ sw $zero, 0x70($s2) -/* B94018 80240BD8 A6A0008E */ sh $zero, 0x8e($s5) -/* B9401C 80240BDC 8E2200CC */ lw $v0, 0xcc($s1) -/* B94020 80240BE0 8EA30000 */ lw $v1, ($s5) -/* B94024 80240BE4 8C420000 */ lw $v0, ($v0) -/* B94028 80240BE8 00641824 */ and $v1, $v1, $a0 -/* B9402C 80240BEC AEA30000 */ sw $v1, ($s5) -/* B94030 80240BF0 AEA20028 */ sw $v0, 0x28($s5) -/* B94034 80240BF4 8E2200D0 */ lw $v0, 0xd0($s1) -/* B94038 80240BF8 8C420034 */ lw $v0, 0x34($v0) -/* B9403C 80240BFC 54400005 */ bnel $v0, $zero, .L80240C14 -/* B94040 80240C00 2402FDFF */ addiu $v0, $zero, -0x201 -/* B94044 80240C04 34620200 */ ori $v0, $v1, 0x200 -/* B94048 80240C08 2403FFF7 */ addiu $v1, $zero, -9 -/* B9404C 80240C0C 08090307 */ j .L80240C1C -/* B94050 80240C10 00431024 */ and $v0, $v0, $v1 -.L80240C14: -/* B94054 80240C14 00621024 */ and $v0, $v1, $v0 -/* B94058 80240C18 34420008 */ ori $v0, $v0, 8 -.L80240C1C: -/* B9405C 80240C1C AEA20000 */ sw $v0, ($s5) -/* B94060 80240C20 8E2200B0 */ lw $v0, 0xb0($s1) -/* B94064 80240C24 30420004 */ andi $v0, $v0, 4 -/* B94068 80240C28 10400007 */ beqz $v0, .L80240C48 -/* B9406C 80240C2C 24020063 */ addiu $v0, $zero, 0x63 -/* B94070 80240C30 AE420070 */ sw $v0, 0x70($s2) -/* B94074 80240C34 AE400074 */ sw $zero, 0x74($s2) -/* B94078 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) -/* B9407C 80240C3C 2403FFFB */ addiu $v1, $zero, -5 -/* B94080 80240C40 00431024 */ and $v0, $v0, $v1 -/* B94084 80240C44 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240C48: -/* B94088 80240C48 AE20006C */ sw $zero, 0x6c($s1) -.L80240C4C: -/* B9408C 80240C4C 8E420070 */ lw $v0, 0x70($s2) -/* B94090 80240C50 2842001E */ slti $v0, $v0, 0x1e -/* B94094 80240C54 10400009 */ beqz $v0, .L80240C7C -/* B94098 80240C58 00000000 */ nop -/* B9409C 80240C5C 8E22006C */ lw $v0, 0x6c($s1) -/* B940A0 80240C60 14400006 */ bnez $v0, .L80240C7C -/* B940A4 80240C64 00000000 */ nop -/* B940A8 80240C68 0C0901C2 */ jal func_80240708 -/* B940AC 80240C6C 0240202D */ daddu $a0, $s2, $zero -/* B940B0 80240C70 10400002 */ beqz $v0, .L80240C7C -/* B940B4 80240C74 2402001E */ addiu $v0, $zero, 0x1e -/* B940B8 80240C78 AE420070 */ sw $v0, 0x70($s2) -.L80240C7C: -/* B940BC 80240C7C 8E430070 */ lw $v1, 0x70($s2) -/* B940C0 80240C80 2C620064 */ sltiu $v0, $v1, 0x64 -/* B940C4 80240C84 10400048 */ beqz $v0, .L80240DA8 -/* B940C8 80240C88 00031080 */ sll $v0, $v1, 2 -/* B940CC 80240C8C 3C018024 */ lui $at, 0x8024 -/* B940D0 80240C90 00220821 */ addu $at, $at, $v0 -/* B940D4 80240C94 8C2245F8 */ lw $v0, 0x45f8($at) -/* B940D8 80240C98 00400008 */ jr $v0 -/* B940DC 80240C9C 00000000 */ nop -/* B940E0 80240CA0 0240202D */ daddu $a0, $s2, $zero -/* B940E4 80240CA4 0260282D */ daddu $a1, $s3, $zero -/* B940E8 80240CA8 0C012568 */ jal func_800495A0 -/* B940EC 80240CAC 0280302D */ daddu $a2, $s4, $zero -/* B940F0 80240CB0 0240202D */ daddu $a0, $s2, $zero -/* B940F4 80240CB4 0260282D */ daddu $a1, $s3, $zero -/* B940F8 80240CB8 0C0125AE */ jal func_800496B8 -/* B940FC 80240CBC 0280302D */ daddu $a2, $s4, $zero -/* B94100 80240CC0 0809036A */ j .L80240DA8 -/* B94104 80240CC4 00000000 */ nop -/* B94108 80240CC8 0240202D */ daddu $a0, $s2, $zero -/* B9410C 80240CCC 0260282D */ daddu $a1, $s3, $zero -/* B94110 80240CD0 0C0126D1 */ jal func_80049B44 -/* B94114 80240CD4 0280302D */ daddu $a2, $s4, $zero -/* B94118 80240CD8 0240202D */ daddu $a0, $s2, $zero -/* B9411C 80240CDC 0260282D */ daddu $a1, $s3, $zero -/* B94120 80240CE0 0C012701 */ jal func_80049C04 -/* B94124 80240CE4 0280302D */ daddu $a2, $s4, $zero -/* B94128 80240CE8 0809036A */ j .L80240DA8 -/* B9412C 80240CEC 00000000 */ nop -/* B94130 80240CF0 0240202D */ daddu $a0, $s2, $zero -/* B94134 80240CF4 0260282D */ daddu $a1, $s3, $zero -/* B94138 80240CF8 0C01278F */ jal func_80049E3C -/* B9413C 80240CFC 0280302D */ daddu $a2, $s4, $zero -/* B94140 80240D00 0240202D */ daddu $a0, $s2, $zero -/* B94144 80240D04 0260282D */ daddu $a1, $s3, $zero -/* B94148 80240D08 0C0127B3 */ jal func_80049ECC -/* B9414C 80240D0C 0280302D */ daddu $a2, $s4, $zero -/* B94150 80240D10 0809036A */ j .L80240DA8 -/* B94154 80240D14 00000000 */ nop -/* B94158 80240D18 0240202D */ daddu $a0, $s2, $zero -/* B9415C 80240D1C 0260282D */ daddu $a1, $s3, $zero -/* B94160 80240D20 0C0127DF */ jal func_80049F7C -/* B94164 80240D24 0280302D */ daddu $a2, $s4, $zero -/* B94168 80240D28 0240202D */ daddu $a0, $s2, $zero -/* B9416C 80240D2C 0260282D */ daddu $a1, $s3, $zero -/* B94170 80240D30 0C012849 */ jal func_8004A124 -/* B94174 80240D34 0280302D */ daddu $a2, $s4, $zero -/* B94178 80240D38 0809036A */ j .L80240DA8 -/* B9417C 80240D3C 00000000 */ nop -/* B94180 80240D40 0240202D */ daddu $a0, $s2, $zero -/* B94184 80240D44 0260282D */ daddu $a1, $s3, $zero -/* B94188 80240D48 0C0128FA */ jal func_8004A3E8 -/* B9418C 80240D4C 0280302D */ daddu $a2, $s4, $zero -/* B94190 80240D50 0809036A */ j .L80240DA8 -/* B94194 80240D54 00000000 */ nop -/* B94198 80240D58 0C090140 */ jal func_80240500 -/* B9419C 80240D5C 0240202D */ daddu $a0, $s2, $zero -/* B941A0 80240D60 0C09015B */ jal func_8024056C -/* B941A4 80240D64 0240202D */ daddu $a0, $s2, $zero -/* B941A8 80240D68 8E430070 */ lw $v1, 0x70($s2) -/* B941AC 80240D6C 24020020 */ addiu $v0, $zero, 0x20 -/* B941B0 80240D70 1462000D */ bne $v1, $v0, .L80240DA8 -/* B941B4 80240D74 00000000 */ nop -/* B941B8 80240D78 0C090177 */ jal func_802405DC -/* B941BC 80240D7C 0240202D */ daddu $a0, $s2, $zero -/* B941C0 80240D80 8E430070 */ lw $v1, 0x70($s2) -/* B941C4 80240D84 24020021 */ addiu $v0, $zero, 0x21 -/* B941C8 80240D88 14620007 */ bne $v1, $v0, .L80240DA8 -/* B941CC 80240D8C 00000000 */ nop -/* B941D0 80240D90 0C0901AD */ jal func_802406B4 -/* B941D4 80240D94 0240202D */ daddu $a0, $s2, $zero -/* B941D8 80240D98 0809036A */ j .L80240DA8 -/* B941DC 80240D9C 00000000 */ nop -/* B941E0 80240DA0 0C0129CF */ jal func_8004A73C -/* B941E4 80240DA4 0240202D */ daddu $a0, $s2, $zero -.L80240DA8: -/* B941E8 80240DA8 8FBF0048 */ lw $ra, 0x48($sp) -/* B941EC 80240DAC 8FB50044 */ lw $s5, 0x44($sp) -/* B941F0 80240DB0 8FB40040 */ lw $s4, 0x40($sp) -/* B941F4 80240DB4 8FB3003C */ lw $s3, 0x3c($sp) -/* B941F8 80240DB8 8FB20038 */ lw $s2, 0x38($sp) -/* B941FC 80240DBC 8FB10034 */ lw $s1, 0x34($sp) -/* B94200 80240DC0 8FB00030 */ lw $s0, 0x30($sp) -/* B94204 80240DC4 0000102D */ daddu $v0, $zero, $zero -/* B94208 80240DC8 03E00008 */ jr $ra -/* B9420C 80240DCC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mim/mim_01/func_80240DD0_B93440.s b/asm/nonmatchings/world/area_mim/mim_01/func_80240DD0_B93440.s deleted file mode 100644 index 3de95990dd..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/func_80240DD0_B93440.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DD0_B94210 -/* B94210 80240DD0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B94214 80240DD4 AFB10014 */ sw $s1, 0x14($sp) -/* B94218 80240DD8 0080882D */ daddu $s1, $a0, $zero -/* B9421C 80240DDC AFBF0018 */ sw $ra, 0x18($sp) -/* B94220 80240DE0 AFB00010 */ sw $s0, 0x10($sp) -/* B94224 80240DE4 8E300148 */ lw $s0, 0x148($s1) -/* B94228 80240DE8 0C00EABB */ jal get_npc_unsafe -/* B9422C 80240DEC 86040008 */ lh $a0, 8($s0) -/* B94230 80240DF0 0040202D */ daddu $a0, $v0, $zero -/* B94234 80240DF4 8482008E */ lh $v0, 0x8e($a0) -/* B94238 80240DF8 9483008E */ lhu $v1, 0x8e($a0) -/* B9423C 80240DFC 18400003 */ blez $v0, .L80240E0C -/* B94240 80240E00 2462FFFF */ addiu $v0, $v1, -1 -/* B94244 80240E04 0809038A */ j .L80240E28 -/* B94248 80240E08 A482008E */ sh $v0, 0x8e($a0) -.L80240E0C: -/* B9424C 80240E0C 8E0200CC */ lw $v0, 0xcc($s0) -/* B94250 80240E10 AE00006C */ sw $zero, 0x6c($s0) -/* B94254 80240E14 8C420000 */ lw $v0, ($v0) -/* B94258 80240E18 AC820028 */ sw $v0, 0x28($a0) -/* B9425C 80240E1C 24020001 */ addiu $v0, $zero, 1 -/* B94260 80240E20 AE200074 */ sw $zero, 0x74($s1) -/* B94264 80240E24 AE220070 */ sw $v0, 0x70($s1) -.L80240E28: -/* B94268 80240E28 8FBF0018 */ lw $ra, 0x18($sp) -/* B9426C 80240E2C 8FB10014 */ lw $s1, 0x14($sp) -/* B94270 80240E30 8FB00010 */ lw $s0, 0x10($sp) -/* B94274 80240E34 03E00008 */ jr $ra -/* B94278 80240E38 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_01/func_80240E3C_B93440.s b/asm/nonmatchings/world/area_mim/mim_01/func_80240E3C_B93440.s deleted file mode 100644 index 38c8e05cab..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/func_80240E3C_B93440.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E3C_B9427C -/* B9427C 80240E3C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B94280 80240E40 AFB3003C */ sw $s3, 0x3c($sp) -/* B94284 80240E44 0080982D */ daddu $s3, $a0, $zero -/* B94288 80240E48 AFBF0040 */ sw $ra, 0x40($sp) -/* B9428C 80240E4C AFB20038 */ sw $s2, 0x38($sp) -/* B94290 80240E50 AFB10034 */ sw $s1, 0x34($sp) -/* B94294 80240E54 AFB00030 */ sw $s0, 0x30($sp) -/* B94298 80240E58 8E720148 */ lw $s2, 0x148($s3) -/* B9429C 80240E5C 00A0882D */ daddu $s1, $a1, $zero -/* B942A0 80240E60 86440008 */ lh $a0, 8($s2) -/* B942A4 80240E64 0C00EABB */ jal get_npc_unsafe -/* B942A8 80240E68 00C0802D */ daddu $s0, $a2, $zero -/* B942AC 80240E6C 0200202D */ daddu $a0, $s0, $zero -/* B942B0 80240E70 0240282D */ daddu $a1, $s2, $zero -/* B942B4 80240E74 AFA00010 */ sw $zero, 0x10($sp) -/* B942B8 80240E78 8E26000C */ lw $a2, 0xc($s1) -/* B942BC 80240E7C 8E270010 */ lw $a3, 0x10($s1) -/* B942C0 80240E80 0C01242D */ jal func_800490B4 -/* B942C4 80240E84 0040882D */ daddu $s1, $v0, $zero -/* B942C8 80240E88 10400024 */ beqz $v0, .L80240F1C -/* B942CC 80240E8C 0220202D */ daddu $a0, $s1, $zero -/* B942D0 80240E90 24050322 */ addiu $a1, $zero, 0x322 -/* B942D4 80240E94 0C012530 */ jal func_800494C0 -/* B942D8 80240E98 0000302D */ daddu $a2, $zero, $zero -/* B942DC 80240E9C 0000202D */ daddu $a0, $zero, $zero -/* B942E0 80240EA0 0220282D */ daddu $a1, $s1, $zero -/* B942E4 80240EA4 0000302D */ daddu $a2, $zero, $zero -/* B942E8 80240EA8 2410000A */ addiu $s0, $zero, 0xa -/* B942EC 80240EAC 862300A8 */ lh $v1, 0xa8($s1) -/* B942F0 80240EB0 3C013F80 */ lui $at, 0x3f80 -/* B942F4 80240EB4 44810000 */ mtc1 $at, $f0 -/* B942F8 80240EB8 3C014000 */ lui $at, 0x4000 -/* B942FC 80240EBC 44811000 */ mtc1 $at, $f2 -/* B94300 80240EC0 3C01C1A0 */ lui $at, 0xc1a0 -/* B94304 80240EC4 44812000 */ mtc1 $at, $f4 -/* B94308 80240EC8 44833000 */ mtc1 $v1, $f6 -/* B9430C 80240ECC 00000000 */ nop -/* B94310 80240ED0 468031A0 */ cvt.s.w $f6, $f6 -/* B94314 80240ED4 44073000 */ mfc1 $a3, $f6 -/* B94318 80240ED8 27A20028 */ addiu $v0, $sp, 0x28 -/* B9431C 80240EDC AFB0001C */ sw $s0, 0x1c($sp) -/* B94320 80240EE0 AFA20020 */ sw $v0, 0x20($sp) -/* B94324 80240EE4 E7A00010 */ swc1 $f0, 0x10($sp) -/* B94328 80240EE8 E7A20014 */ swc1 $f2, 0x14($sp) -/* B9432C 80240EEC 0C01BFA4 */ jal fx_emote -/* B94330 80240EF0 E7A40018 */ swc1 $f4, 0x18($sp) -/* B94334 80240EF4 0220202D */ daddu $a0, $s1, $zero -/* B94338 80240EF8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B9433C 80240EFC 0C012530 */ jal func_800494C0 -/* B94340 80240F00 3C060020 */ lui $a2, 0x20 -/* B94344 80240F04 8E4200CC */ lw $v0, 0xcc($s2) -/* B94348 80240F08 8C420020 */ lw $v0, 0x20($v0) -/* B9434C 80240F0C AE220028 */ sw $v0, 0x28($s1) -/* B94350 80240F10 9642008E */ lhu $v0, 0x8e($s2) -/* B94354 80240F14 A622008E */ sh $v0, 0x8e($s1) -/* B94358 80240F18 AE700070 */ sw $s0, 0x70($s3) -.L80240F1C: -/* B9435C 80240F1C 8FBF0040 */ lw $ra, 0x40($sp) -/* B94360 80240F20 8FB3003C */ lw $s3, 0x3c($sp) -/* B94364 80240F24 8FB20038 */ lw $s2, 0x38($sp) -/* B94368 80240F28 8FB10034 */ lw $s1, 0x34($sp) -/* B9436C 80240F2C 8FB00030 */ lw $s0, 0x30($sp) -/* B94370 80240F30 03E00008 */ jr $ra -/* B94374 80240F34 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_01/func_80241B08_B93440.s b/asm/nonmatchings/world/area_mim/mim_01/func_80241B08_B93440.s deleted file mode 100644 index 6bf2e96587..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/func_80241B08_B93440.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B08_B94F48 -/* B94F48 80241B08 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B94F4C 80241B0C AFB10014 */ sw $s1, 0x14($sp) -/* B94F50 80241B10 0080882D */ daddu $s1, $a0, $zero -/* B94F54 80241B14 AFBF0018 */ sw $ra, 0x18($sp) -/* B94F58 80241B18 AFB00010 */ sw $s0, 0x10($sp) -/* B94F5C 80241B1C 8E300148 */ lw $s0, 0x148($s1) -/* B94F60 80241B20 0C00EABB */ jal get_npc_unsafe -/* B94F64 80241B24 86040008 */ lh $a0, 8($s0) -/* B94F68 80241B28 0040182D */ daddu $v1, $v0, $zero -/* B94F6C 80241B2C 9462008E */ lhu $v0, 0x8e($v1) -/* B94F70 80241B30 2442FFFF */ addiu $v0, $v0, -1 -/* B94F74 80241B34 A462008E */ sh $v0, 0x8e($v1) -/* B94F78 80241B38 00021400 */ sll $v0, $v0, 0x10 -/* B94F7C 80241B3C 14400005 */ bnez $v0, .L80241B54 -/* B94F80 80241B40 00000000 */ nop -/* B94F84 80241B44 960200AA */ lhu $v0, 0xaa($s0) -/* B94F88 80241B48 A462008E */ sh $v0, 0x8e($v1) -/* B94F8C 80241B4C 2402000E */ addiu $v0, $zero, 0xe -/* B94F90 80241B50 AE220070 */ sw $v0, 0x70($s1) -.L80241B54: -/* B94F94 80241B54 8FBF0018 */ lw $ra, 0x18($sp) -/* B94F98 80241B58 8FB10014 */ lw $s1, 0x14($sp) -/* B94F9C 80241B5C 8FB00010 */ lw $s0, 0x10($sp) -/* B94FA0 80241B60 03E00008 */ jr $ra -/* B94FA4 80241B64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_01/func_80241C54_B93440.s b/asm/nonmatchings/world/area_mim/mim_01/func_80241C54_B93440.s deleted file mode 100644 index 40da1c5f2f..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/func_80241C54_B93440.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C54_B95094 -/* B95094 80241C54 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B95098 80241C58 AFB20038 */ sw $s2, 0x38($sp) -/* B9509C 80241C5C 0080902D */ daddu $s2, $a0, $zero -/* B950A0 80241C60 AFBF0048 */ sw $ra, 0x48($sp) -/* B950A4 80241C64 AFB50044 */ sw $s5, 0x44($sp) -/* B950A8 80241C68 AFB40040 */ sw $s4, 0x40($sp) -/* B950AC 80241C6C AFB3003C */ sw $s3, 0x3c($sp) -/* B950B0 80241C70 AFB10034 */ sw $s1, 0x34($sp) -/* B950B4 80241C74 AFB00030 */ sw $s0, 0x30($sp) -/* B950B8 80241C78 8E510148 */ lw $s1, 0x148($s2) -/* B950BC 80241C7C 86240008 */ lh $a0, 8($s1) -/* B950C0 80241C80 0C00EABB */ jal get_npc_unsafe -/* B950C4 80241C84 00A0802D */ daddu $s0, $a1, $zero -/* B950C8 80241C88 8E43000C */ lw $v1, 0xc($s2) -/* B950CC 80241C8C 0240202D */ daddu $a0, $s2, $zero -/* B950D0 80241C90 8C650000 */ lw $a1, ($v1) -/* B950D4 80241C94 0C0B1EAF */ jal get_variable -/* B950D8 80241C98 0040A82D */ daddu $s5, $v0, $zero -/* B950DC 80241C9C AFA00010 */ sw $zero, 0x10($sp) -/* B950E0 80241CA0 8E2300D0 */ lw $v1, 0xd0($s1) -/* B950E4 80241CA4 8C630030 */ lw $v1, 0x30($v1) -/* B950E8 80241CA8 AFA30014 */ sw $v1, 0x14($sp) -/* B950EC 80241CAC 8E2300D0 */ lw $v1, 0xd0($s1) -/* B950F0 80241CB0 8C63001C */ lw $v1, 0x1c($v1) -/* B950F4 80241CB4 AFA30018 */ sw $v1, 0x18($sp) -/* B950F8 80241CB8 8E2300D0 */ lw $v1, 0xd0($s1) -/* B950FC 80241CBC 8C630024 */ lw $v1, 0x24($v1) -/* B95100 80241CC0 AFA3001C */ sw $v1, 0x1c($sp) -/* B95104 80241CC4 8E2300D0 */ lw $v1, 0xd0($s1) -/* B95108 80241CC8 8C630028 */ lw $v1, 0x28($v1) -/* B9510C 80241CCC 27B40010 */ addiu $s4, $sp, 0x10 -/* B95110 80241CD0 AFA30020 */ sw $v1, 0x20($sp) -/* B95114 80241CD4 8E2300D0 */ lw $v1, 0xd0($s1) -/* B95118 80241CD8 3C014348 */ lui $at, 0x4348 -/* B9511C 80241CDC 44810000 */ mtc1 $at, $f0 -/* B95120 80241CE0 8C63002C */ lw $v1, 0x2c($v1) -/* B95124 80241CE4 0040982D */ daddu $s3, $v0, $zero -/* B95128 80241CE8 E7A00028 */ swc1 $f0, 0x28($sp) -/* B9512C 80241CEC A7A0002C */ sh $zero, 0x2c($sp) -/* B95130 80241CF0 16000005 */ bnez $s0, .L80241D08 -/* B95134 80241CF4 AFA30024 */ sw $v1, 0x24($sp) -/* B95138 80241CF8 8E2200B0 */ lw $v0, 0xb0($s1) -/* B9513C 80241CFC 30420004 */ andi $v0, $v0, 4 -/* B95140 80241D00 10400011 */ beqz $v0, .L80241D48 -/* B95144 80241D04 00000000 */ nop -.L80241D08: -/* B95148 80241D08 AE400070 */ sw $zero, 0x70($s2) -/* B9514C 80241D0C A6A0008E */ sh $zero, 0x8e($s5) -/* B95150 80241D10 8E2200CC */ lw $v0, 0xcc($s1) -/* B95154 80241D14 8C420000 */ lw $v0, ($v0) -/* B95158 80241D18 AEA20028 */ sw $v0, 0x28($s5) -/* B9515C 80241D1C 8E2200B0 */ lw $v0, 0xb0($s1) -/* B95160 80241D20 30420004 */ andi $v0, $v0, 4 -/* B95164 80241D24 10400008 */ beqz $v0, .L80241D48 -/* B95168 80241D28 AE20006C */ sw $zero, 0x6c($s1) -/* B9516C 80241D2C 24020063 */ addiu $v0, $zero, 0x63 -/* B95170 80241D30 AE420070 */ sw $v0, 0x70($s2) -/* B95174 80241D34 AE400074 */ sw $zero, 0x74($s2) -/* B95178 80241D38 8E2200B0 */ lw $v0, 0xb0($s1) -/* B9517C 80241D3C 2403FFFB */ addiu $v1, $zero, -5 -/* B95180 80241D40 00431024 */ and $v0, $v0, $v1 -/* B95184 80241D44 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241D48: -/* B95188 80241D48 8E430070 */ lw $v1, 0x70($s2) -/* B9518C 80241D4C 2410000B */ addiu $s0, $zero, 0xb -/* B95190 80241D50 1070002A */ beq $v1, $s0, .L80241DFC -/* B95194 80241D54 2862000C */ slti $v0, $v1, 0xc -/* B95198 80241D58 1040000D */ beqz $v0, .L80241D90 -/* B9519C 80241D5C 24020001 */ addiu $v0, $zero, 1 -/* B951A0 80241D60 1062001A */ beq $v1, $v0, .L80241DCC -/* B951A4 80241D64 28620002 */ slti $v0, $v1, 2 -/* B951A8 80241D68 10400005 */ beqz $v0, .L80241D80 -/* B951AC 80241D6C 2402000A */ addiu $v0, $zero, 0xa -/* B951B0 80241D70 10600013 */ beqz $v1, .L80241DC0 -/* B951B4 80241D74 0240202D */ daddu $a0, $s2, $zero -/* B951B8 80241D78 0809079F */ j .L80241E7C -/* B951BC 80241D7C 00000000 */ nop -.L80241D80: -/* B951C0 80241D80 10620018 */ beq $v1, $v0, .L80241DE4 -/* B951C4 80241D84 0240202D */ daddu $a0, $s2, $zero -/* B951C8 80241D88 0809079F */ j .L80241E7C -/* B951CC 80241D8C 00000000 */ nop -.L80241D90: -/* B951D0 80241D90 2402000D */ addiu $v0, $zero, 0xd -/* B951D4 80241D94 10620029 */ beq $v1, $v0, .L80241E3C -/* B951D8 80241D98 0062102A */ slt $v0, $v1, $v0 -/* B951DC 80241D9C 14400020 */ bnez $v0, .L80241E20 -/* B951E0 80241DA0 0240202D */ daddu $a0, $s2, $zero -/* B951E4 80241DA4 2402000E */ addiu $v0, $zero, 0xe -/* B951E8 80241DA8 1062002D */ beq $v1, $v0, .L80241E60 -/* B951EC 80241DAC 24020063 */ addiu $v0, $zero, 0x63 -/* B951F0 80241DB0 10620030 */ beq $v1, $v0, .L80241E74 -/* B951F4 80241DB4 00000000 */ nop -/* B951F8 80241DB8 0809079F */ j .L80241E7C -/* B951FC 80241DBC 00000000 */ nop -.L80241DC0: -/* B95200 80241DC0 0260282D */ daddu $a1, $s3, $zero -/* B95204 80241DC4 0C090374 */ jal func_80240DD0 -/* B95208 80241DC8 0280302D */ daddu $a2, $s4, $zero -.L80241DCC: -/* B9520C 80241DCC 0240202D */ daddu $a0, $s2, $zero -/* B95210 80241DD0 0260282D */ daddu $a1, $s3, $zero -/* B95214 80241DD4 0C09038F */ jal func_80240E3C -/* B95218 80241DD8 0280302D */ daddu $a2, $s4, $zero -/* B9521C 80241DDC 0809079F */ j .L80241E7C -/* B95220 80241DE0 00000000 */ nop -.L80241DE4: -/* B95224 80241DE4 0260282D */ daddu $a1, $s3, $zero -/* B95228 80241DE8 0C0903CE */ jal func_80240F38 -/* B9522C 80241DEC 0280302D */ daddu $a2, $s4, $zero -/* B95230 80241DF0 8E420070 */ lw $v0, 0x70($s2) -/* B95234 80241DF4 14500021 */ bne $v0, $s0, .L80241E7C -/* B95238 80241DF8 00000000 */ nop -.L80241DFC: -/* B9523C 80241DFC 0240202D */ daddu $a0, $s2, $zero -/* B95240 80241E00 0260282D */ daddu $a1, $s3, $zero -/* B95244 80241E04 0C09065E */ jal func_80241978 -/* B95248 80241E08 0280302D */ daddu $a2, $s4, $zero -/* B9524C 80241E0C 8E430070 */ lw $v1, 0x70($s2) -/* B95250 80241E10 2402000C */ addiu $v0, $zero, 0xc -/* B95254 80241E14 14620019 */ bne $v1, $v0, .L80241E7C -/* B95258 80241E18 00000000 */ nop -/* B9525C 80241E1C 0240202D */ daddu $a0, $s2, $zero -.L80241E20: -/* B95260 80241E20 0260282D */ daddu $a1, $s3, $zero -/* B95264 80241E24 0C090682 */ jal func_80241A08 -/* B95268 80241E28 0280302D */ daddu $a2, $s4, $zero -/* B9526C 80241E2C 8E430070 */ lw $v1, 0x70($s2) -/* B95270 80241E30 2402000D */ addiu $v0, $zero, 0xd -/* B95274 80241E34 14620011 */ bne $v1, $v0, .L80241E7C -/* B95278 80241E38 00000000 */ nop -.L80241E3C: -/* B9527C 80241E3C 0240202D */ daddu $a0, $s2, $zero -/* B95280 80241E40 0260282D */ daddu $a1, $s3, $zero -/* B95284 80241E44 0C0906C2 */ jal func_80241B08 -/* B95288 80241E48 0280302D */ daddu $a2, $s4, $zero -/* B9528C 80241E4C 8E430070 */ lw $v1, 0x70($s2) -/* B95290 80241E50 2402000E */ addiu $v0, $zero, 0xe -/* B95294 80241E54 14620009 */ bne $v1, $v0, .L80241E7C -/* B95298 80241E58 00000000 */ nop -/* B9529C 80241E5C 0240202D */ daddu $a0, $s2, $zero -.L80241E60: -/* B952A0 80241E60 0260282D */ daddu $a1, $s3, $zero -/* B952A4 80241E64 0C0906DA */ jal func_80241B68 -/* B952A8 80241E68 0280302D */ daddu $a2, $s4, $zero -/* B952AC 80241E6C 0809079F */ j .L80241E7C -/* B952B0 80241E70 00000000 */ nop -.L80241E74: -/* B952B4 80241E74 0C0129CF */ jal func_8004A73C -/* B952B8 80241E78 0240202D */ daddu $a0, $s2, $zero -.L80241E7C: -/* B952BC 80241E7C 8FBF0048 */ lw $ra, 0x48($sp) -/* B952C0 80241E80 8FB50044 */ lw $s5, 0x44($sp) -/* B952C4 80241E84 8FB40040 */ lw $s4, 0x40($sp) -/* B952C8 80241E88 8FB3003C */ lw $s3, 0x3c($sp) -/* B952CC 80241E8C 8FB20038 */ lw $s2, 0x38($sp) -/* B952D0 80241E90 8FB10034 */ lw $s1, 0x34($sp) -/* B952D4 80241E94 8FB00030 */ lw $s0, 0x30($sp) -/* B952D8 80241E98 0000102D */ daddu $v0, $zero, $zero -/* B952DC 80241E9C 03E00008 */ jr $ra -/* B952E0 80241EA0 27BD0050 */ addiu $sp, $sp, 0x50 -/* B952E4 80241EA4 00000000 */ nop -/* B952E8 80241EA8 00000000 */ nop -/* B952EC 80241EAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_02/func_80240070_B97C00.s b/asm/nonmatchings/world/area_mim/mim_02/func_80240070_B97C00.s deleted file mode 100644 index ef574944bc..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/func_80240070_B97C00.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_B97C70 -/* B97C70 80240070 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B97C74 80240074 AFB00030 */ sw $s0, 0x30($sp) -/* B97C78 80240078 0080802D */ daddu $s0, $a0, $zero -/* B97C7C 8024007C AFBF0040 */ sw $ra, 0x40($sp) -/* B97C80 80240080 AFB3003C */ sw $s3, 0x3c($sp) -/* B97C84 80240084 AFB20038 */ sw $s2, 0x38($sp) -/* B97C88 80240088 AFB10034 */ sw $s1, 0x34($sp) -/* B97C8C 8024008C F7B60050 */ sdc1 $f22, 0x50($sp) -/* B97C90 80240090 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B97C94 80240094 8E130148 */ lw $s3, 0x148($s0) -/* B97C98 80240098 00A0882D */ daddu $s1, $a1, $zero -/* B97C9C 8024009C 86640008 */ lh $a0, 8($s3) -/* B97CA0 802400A0 0C00EABB */ jal get_npc_unsafe -/* B97CA4 802400A4 00C0902D */ daddu $s2, $a2, $zero -/* B97CA8 802400A8 0200202D */ daddu $a0, $s0, $zero -/* B97CAC 802400AC 0220282D */ daddu $a1, $s1, $zero -/* B97CB0 802400B0 0240302D */ daddu $a2, $s2, $zero -/* B97CB4 802400B4 0C012568 */ jal func_800495A0 -/* B97CB8 802400B8 0040802D */ daddu $s0, $v0, $zero -/* B97CBC 802400BC 8E020000 */ lw $v0, ($s0) -/* B97CC0 802400C0 2404002D */ addiu $a0, $zero, 0x2d -/* B97CC4 802400C4 34420800 */ ori $v0, $v0, 0x800 -/* B97CC8 802400C8 0C00A67F */ jal rand_int -/* B97CCC 802400CC AE020000 */ sw $v0, ($s0) -/* B97CD0 802400D0 0200202D */ daddu $a0, $s0, $zero -/* B97CD4 802400D4 3C05B000 */ lui $a1, 0xb000 -/* B97CD8 802400D8 34A50017 */ ori $a1, $a1, 0x17 -/* B97CDC 802400DC 44820000 */ mtc1 $v0, $f0 -/* B97CE0 802400E0 00000000 */ nop -/* B97CE4 802400E4 46800021 */ cvt.d.w $f0, $f0 -/* B97CE8 802400E8 3C014024 */ lui $at, 0x4024 -/* B97CEC 802400EC 44811800 */ mtc1 $at, $f3 -/* B97CF0 802400F0 44801000 */ mtc1 $zero, $f2 -/* B97CF4 802400F4 3C014020 */ lui $at, 0x4020 -/* B97CF8 802400F8 44812800 */ mtc1 $at, $f5 -/* B97CFC 802400FC 44802000 */ mtc1 $zero, $f4 -/* B97D00 80240100 46220003 */ div.d $f0, $f0, $f2 -/* B97D04 80240104 46240000 */ add.d $f0, $f0, $f4 -/* B97D08 80240108 3C013FC0 */ lui $at, 0x3fc0 -/* B97D0C 8024010C 44811000 */ mtc1 $at, $f2 -/* B97D10 80240110 0000302D */ daddu $a2, $zero, $zero -/* B97D14 80240114 E6020014 */ swc1 $f2, 0x14($s0) -/* B97D18 80240118 46200020 */ cvt.s.d $f0, $f0 -/* B97D1C 8024011C 0C012530 */ jal func_800494C0 -/* B97D20 80240120 E600001C */ swc1 $f0, 0x1c($s0) -/* B97D24 80240124 8E6300D0 */ lw $v1, 0xd0($s3) -/* B97D28 80240128 C6000040 */ lwc1 $f0, 0x40($s0) -/* B97D2C 8024012C C4620000 */ lwc1 $f2, ($v1) -/* B97D30 80240130 468010A0 */ cvt.s.w $f2, $f2 -/* B97D34 80240134 C4640008 */ lwc1 $f4, 8($v1) -/* B97D38 80240138 46802120 */ cvt.s.w $f4, $f4 -/* B97D3C 8024013C E7A00010 */ swc1 $f0, 0x10($sp) -/* B97D40 80240140 8E6200D0 */ lw $v0, 0xd0($s3) -/* B97D44 80240144 44051000 */ mfc1 $a1, $f2 -/* B97D48 80240148 C440000C */ lwc1 $f0, 0xc($v0) -/* B97D4C 8024014C 46800020 */ cvt.s.w $f0, $f0 -/* B97D50 80240150 E7A00014 */ swc1 $f0, 0x14($sp) -/* B97D54 80240154 8E6200D0 */ lw $v0, 0xd0($s3) -/* B97D58 80240158 44062000 */ mfc1 $a2, $f4 -/* B97D5C 8024015C C4400010 */ lwc1 $f0, 0x10($v0) -/* B97D60 80240160 46800020 */ cvt.s.w $f0, $f0 -/* B97D64 80240164 E7A00018 */ swc1 $f0, 0x18($sp) -/* B97D68 80240168 8C640018 */ lw $a0, 0x18($v1) -/* B97D6C 8024016C 0C0123F5 */ jal is_point_within_region -/* B97D70 80240170 8E070038 */ lw $a3, 0x38($s0) -/* B97D74 80240174 10400035 */ beqz $v0, .L8024024C -/* B97D78 80240178 00000000 */ nop -/* B97D7C 8024017C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B97D80 80240180 3C0141C8 */ lui $at, 0x41c8 -/* B97D84 80240184 4481B000 */ mtc1 $at, $f22 -/* B97D88 80240188 8E6200D0 */ lw $v0, 0xd0($s3) -/* B97D8C 8024018C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B97D90 80240190 C4480000 */ lwc1 $f8, ($v0) -/* B97D94 80240194 46804220 */ cvt.s.w $f8, $f8 -/* B97D98 80240198 44064000 */ mfc1 $a2, $f8 -/* B97D9C 8024019C C4480008 */ lwc1 $f8, 8($v0) -/* B97DA0 802401A0 46804220 */ cvt.s.w $f8, $f8 -/* B97DA4 802401A4 44074000 */ mfc1 $a3, $f8 -/* B97DA8 802401A8 3C01403E */ lui $at, 0x403e -/* B97DAC 802401AC 4481A800 */ mtc1 $at, $f21 -/* B97DB0 802401B0 4480A000 */ mtc1 $zero, $f20 -/* B97DB4 802401B4 0C00A720 */ jal atan2 -/* B97DB8 802401B8 0000882D */ daddu $s1, $zero, $zero -/* B97DBC 802401BC C6020038 */ lwc1 $f2, 0x38($s0) -/* B97DC0 802401C0 C604003C */ lwc1 $f4, 0x3c($s0) -/* B97DC4 802401C4 C6060040 */ lwc1 $f6, 0x40($s0) -/* B97DC8 802401C8 E600000C */ swc1 $f0, 0xc($s0) -/* B97DCC 802401CC E7A20020 */ swc1 $f2, 0x20($sp) -/* B97DD0 802401D0 E7A40024 */ swc1 $f4, 0x24($sp) -/* B97DD4 802401D4 E7A60028 */ swc1 $f6, 0x28($sp) -.L802401D8: -/* B97DD8 802401D8 E7B60010 */ swc1 $f22, 0x10($sp) -/* B97DDC 802401DC C600000C */ lwc1 $f0, 0xc($s0) -/* B97DE0 802401E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* B97DE4 802401E4 860200A8 */ lh $v0, 0xa8($s0) -/* B97DE8 802401E8 27A50020 */ addiu $a1, $sp, 0x20 -/* B97DEC 802401EC 44820000 */ mtc1 $v0, $f0 -/* B97DF0 802401F0 00000000 */ nop -/* B97DF4 802401F4 46800020 */ cvt.s.w $f0, $f0 -/* B97DF8 802401F8 E7A00018 */ swc1 $f0, 0x18($sp) -/* B97DFC 802401FC 860200A6 */ lh $v0, 0xa6($s0) -/* B97E00 80240200 27A60024 */ addiu $a2, $sp, 0x24 -/* B97E04 80240204 44820000 */ mtc1 $v0, $f0 -/* B97E08 80240208 00000000 */ nop -/* B97E0C 8024020C 46800020 */ cvt.s.w $f0, $f0 -/* B97E10 80240210 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B97E14 80240214 8E040080 */ lw $a0, 0x80($s0) -/* B97E18 80240218 0C037711 */ jal func_800DDC44 -/* B97E1C 8024021C 27A70028 */ addiu $a3, $sp, 0x28 -/* B97E20 80240220 10400016 */ beqz $v0, .L8024027C -/* B97E24 80240224 26310001 */ addiu $s1, $s1, 1 -/* B97E28 80240228 C600000C */ lwc1 $f0, 0xc($s0) -/* B97E2C 8024022C 46000021 */ cvt.d.s $f0, $f0 -/* B97E30 80240230 46340000 */ add.d $f0, $f0, $f20 -/* B97E34 80240234 2A220006 */ slti $v0, $s1, 6 -/* B97E38 80240238 46200020 */ cvt.s.d $f0, $f0 -/* B97E3C 8024023C 1440FFE6 */ bnez $v0, .L802401D8 -/* B97E40 80240240 E600000C */ swc1 $f0, 0xc($s0) -/* B97E44 80240244 0809009F */ j .L8024027C -/* B97E48 80240248 00000000 */ nop -.L8024024C: -/* B97E4C 8024024C 0C00A67F */ jal rand_int -/* B97E50 80240250 2404003C */ addiu $a0, $zero, 0x3c -/* B97E54 80240254 C60C000C */ lwc1 $f12, 0xc($s0) -/* B97E58 80240258 44820000 */ mtc1 $v0, $f0 -/* B97E5C 8024025C 00000000 */ nop -/* B97E60 80240260 46800020 */ cvt.s.w $f0, $f0 -/* B97E64 80240264 46006300 */ add.s $f12, $f12, $f0 -/* B97E68 80240268 3C0141F0 */ lui $at, 0x41f0 -/* B97E6C 8024026C 44810000 */ mtc1 $at, $f0 -/* B97E70 80240270 0C00A6C9 */ jal clamp_angle -/* B97E74 80240274 46006301 */ sub.s $f12, $f12, $f0 -/* B97E78 80240278 E600000C */ swc1 $f0, 0xc($s0) -.L8024027C: -/* B97E7C 8024027C 8FBF0040 */ lw $ra, 0x40($sp) -/* B97E80 80240280 8FB3003C */ lw $s3, 0x3c($sp) -/* B97E84 80240284 8FB20038 */ lw $s2, 0x38($sp) -/* B97E88 80240288 8FB10034 */ lw $s1, 0x34($sp) -/* B97E8C 8024028C 8FB00030 */ lw $s0, 0x30($sp) -/* B97E90 80240290 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B97E94 80240294 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B97E98 80240298 03E00008 */ jr $ra -/* B97E9C 8024029C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_mim/mim_02/func_802402A0_B97C00.s b/asm/nonmatchings/world/area_mim/mim_02/func_802402A0_B97C00.s deleted file mode 100644 index 550bfb380b..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/func_802402A0_B97C00.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402A0_B97EA0 -/* B97EA0 802402A0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* B97EA4 802402A4 AFB3004C */ sw $s3, 0x4c($sp) -/* B97EA8 802402A8 0080982D */ daddu $s3, $a0, $zero -/* B97EAC 802402AC AFBF0054 */ sw $ra, 0x54($sp) -/* B97EB0 802402B0 AFB40050 */ sw $s4, 0x50($sp) -/* B97EB4 802402B4 AFB20048 */ sw $s2, 0x48($sp) -/* B97EB8 802402B8 AFB10044 */ sw $s1, 0x44($sp) -/* B97EBC 802402BC AFB00040 */ sw $s0, 0x40($sp) -/* B97EC0 802402C0 F7B40058 */ sdc1 $f20, 0x58($sp) -/* B97EC4 802402C4 8E710148 */ lw $s1, 0x148($s3) -/* B97EC8 802402C8 00A0A02D */ daddu $s4, $a1, $zero -/* B97ECC 802402CC 86240008 */ lh $a0, 8($s1) -/* B97ED0 802402D0 0C00EABB */ jal get_npc_unsafe -/* B97ED4 802402D4 00C0902D */ daddu $s2, $a2, $zero -/* B97ED8 802402D8 8E830014 */ lw $v1, 0x14($s4) -/* B97EDC 802402DC 04600034 */ bltz $v1, .L802403B0 -/* B97EE0 802402E0 0040802D */ daddu $s0, $v0, $zero -/* B97EE4 802402E4 8E620074 */ lw $v0, 0x74($s3) -/* B97EE8 802402E8 1C400030 */ bgtz $v0, .L802403AC -/* B97EEC 802402EC 2442FFFF */ addiu $v0, $v0, -1 -/* B97EF0 802402F0 0240202D */ daddu $a0, $s2, $zero -/* B97EF4 802402F4 AE630074 */ sw $v1, 0x74($s3) -/* B97EF8 802402F8 AFA00010 */ sw $zero, 0x10($sp) -/* B97EFC 802402FC 8E86000C */ lw $a2, 0xc($s4) -/* B97F00 80240300 8E870010 */ lw $a3, 0x10($s4) -/* B97F04 80240304 0C01242D */ jal func_800490B4 -/* B97F08 80240308 0220282D */ daddu $a1, $s1, $zero -/* B97F0C 8024030C 10400025 */ beqz $v0, .L802403A4 -/* B97F10 80240310 0000202D */ daddu $a0, $zero, $zero -/* B97F14 80240314 0200282D */ daddu $a1, $s0, $zero -/* B97F18 80240318 0000302D */ daddu $a2, $zero, $zero -/* B97F1C 8024031C 860300A8 */ lh $v1, 0xa8($s0) -/* B97F20 80240320 3C013F80 */ lui $at, 0x3f80 -/* B97F24 80240324 44810000 */ mtc1 $at, $f0 -/* B97F28 80240328 3C014000 */ lui $at, 0x4000 -/* B97F2C 8024032C 44811000 */ mtc1 $at, $f2 -/* B97F30 80240330 3C01C1A0 */ lui $at, 0xc1a0 -/* B97F34 80240334 44812000 */ mtc1 $at, $f4 -/* B97F38 80240338 2402000F */ addiu $v0, $zero, 0xf -/* B97F3C 8024033C AFA2001C */ sw $v0, 0x1c($sp) -/* B97F40 80240340 44835000 */ mtc1 $v1, $f10 -/* B97F44 80240344 00000000 */ nop -/* B97F48 80240348 468052A0 */ cvt.s.w $f10, $f10 -/* B97F4C 8024034C 44075000 */ mfc1 $a3, $f10 -/* B97F50 80240350 27A20028 */ addiu $v0, $sp, 0x28 -/* B97F54 80240354 AFA20020 */ sw $v0, 0x20($sp) -/* B97F58 80240358 E7A00010 */ swc1 $f0, 0x10($sp) -/* B97F5C 8024035C E7A20014 */ swc1 $f2, 0x14($sp) -/* B97F60 80240360 0C01BFA4 */ jal fx_emote -/* B97F64 80240364 E7A40018 */ swc1 $f4, 0x18($sp) -/* B97F68 80240368 0200202D */ daddu $a0, $s0, $zero -/* B97F6C 8024036C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B97F70 80240370 0C012530 */ jal func_800494C0 -/* B97F74 80240374 3C060020 */ lui $a2, 0x20 -/* B97F78 80240378 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B97F7C 8024037C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B97F80 80240380 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B97F84 80240384 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B97F88 80240388 8C460028 */ lw $a2, 0x28($v0) -/* B97F8C 8024038C 0C00A720 */ jal atan2 -/* B97F90 80240390 8C470030 */ lw $a3, 0x30($v0) -/* B97F94 80240394 2402000C */ addiu $v0, $zero, 0xc -/* B97F98 80240398 E600000C */ swc1 $f0, 0xc($s0) -/* B97F9C 8024039C 0809016D */ j .L802405B4 -/* B97FA0 802403A0 AE620070 */ sw $v0, 0x70($s3) -.L802403A4: -/* B97FA4 802403A4 8E620074 */ lw $v0, 0x74($s3) -/* B97FA8 802403A8 2442FFFF */ addiu $v0, $v0, -1 -.L802403AC: -/* B97FAC 802403AC AE620074 */ sw $v0, 0x74($s3) -.L802403B0: -/* B97FB0 802403B0 C6000018 */ lwc1 $f0, 0x18($s0) -/* B97FB4 802403B4 44801000 */ mtc1 $zero, $f2 -/* B97FB8 802403B8 44801800 */ mtc1 $zero, $f3 -/* B97FBC 802403BC 46000021 */ cvt.d.s $f0, $f0 -/* B97FC0 802403C0 4620103C */ c.lt.d $f2, $f0 -/* B97FC4 802403C4 00000000 */ nop -/* B97FC8 802403C8 45000025 */ bc1f .L80240460 -/* B97FCC 802403CC 27A5002C */ addiu $a1, $sp, 0x2c -/* B97FD0 802403D0 C6000038 */ lwc1 $f0, 0x38($s0) -/* B97FD4 802403D4 860200A6 */ lh $v0, 0xa6($s0) -/* B97FD8 802403D8 3C018024 */ lui $at, 0x8024 -/* B97FDC 802403DC D4223830 */ ldc1 $f2, 0x3830($at) -/* B97FE0 802403E0 27A60030 */ addiu $a2, $sp, 0x30 -/* B97FE4 802403E4 E7A0002C */ swc1 $f0, 0x2c($sp) -/* B97FE8 802403E8 44820000 */ mtc1 $v0, $f0 -/* B97FEC 802403EC 00000000 */ nop -/* B97FF0 802403F0 46800020 */ cvt.s.w $f0, $f0 -/* B97FF4 802403F4 46000021 */ cvt.d.s $f0, $f0 -/* B97FF8 802403F8 C604003C */ lwc1 $f4, 0x3c($s0) -/* B97FFC 802403FC C6060040 */ lwc1 $f6, 0x40($s0) -/* B98000 80240400 C6080018 */ lwc1 $f8, 0x18($s0) -/* B98004 80240404 860200A8 */ lh $v0, 0xa8($s0) -/* B98008 80240408 46220002 */ mul.d $f0, $f0, $f2 -/* B9800C 8024040C 00000000 */ nop -/* B98010 80240410 E7A40030 */ swc1 $f4, 0x30($sp) -/* B98014 80240414 E7A60034 */ swc1 $f6, 0x34($sp) -/* B98018 80240418 E7A80010 */ swc1 $f8, 0x10($sp) -/* B9801C 8024041C C604000C */ lwc1 $f4, 0xc($s0) -/* B98020 80240420 44821000 */ mtc1 $v0, $f2 -/* B98024 80240424 00000000 */ nop -/* B98028 80240428 468010A0 */ cvt.s.w $f2, $f2 -/* B9802C 8024042C E7A20018 */ swc1 $f2, 0x18($sp) -/* B98030 80240430 E7A40014 */ swc1 $f4, 0x14($sp) -/* B98034 80240434 46200020 */ cvt.s.d $f0, $f0 -/* B98038 80240438 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B9803C 8024043C 8E040080 */ lw $a0, 0x80($s0) -/* B98040 80240440 0C037711 */ jal func_800DDC44 -/* B98044 80240444 27A70034 */ addiu $a3, $sp, 0x34 -/* B98048 80240448 54400005 */ bnel $v0, $zero, .L80240460 -/* B9804C 8024044C AE000018 */ sw $zero, 0x18($s0) -/* B98050 80240450 8E050018 */ lw $a1, 0x18($s0) -/* B98054 80240454 8E06000C */ lw $a2, 0xc($s0) -/* B98058 80240458 0C00EA95 */ jal npc_move_heading -/* B9805C 8024045C 0200202D */ daddu $a0, $s0, $zero -.L80240460: -/* B98060 80240460 C600001C */ lwc1 $f0, 0x1c($s0) -/* B98064 80240464 44801000 */ mtc1 $zero, $f2 -/* B98068 80240468 44801800 */ mtc1 $zero, $f3 -/* B9806C 8024046C 46000021 */ cvt.d.s $f0, $f0 -/* B98070 80240470 4622003C */ c.lt.d $f0, $f2 -/* B98074 80240474 00000000 */ nop -/* B98078 80240478 45000047 */ bc1f .L80240598 -/* B9807C 8024047C 27A5002C */ addiu $a1, $sp, 0x2c -/* B98080 80240480 27A60030 */ addiu $a2, $sp, 0x30 -/* B98084 80240484 27A20038 */ addiu $v0, $sp, 0x38 -/* B98088 80240488 C602003C */ lwc1 $f2, 0x3c($s0) -/* B9808C 8024048C C6060038 */ lwc1 $f6, 0x38($s0) -/* B98090 80240490 3C01402A */ lui $at, 0x402a -/* B98094 80240494 4481A800 */ mtc1 $at, $f21 -/* B98098 80240498 4480A000 */ mtc1 $zero, $f20 -/* B9809C 8024049C 460010A1 */ cvt.d.s $f2, $f2 -/* B980A0 802404A0 46341080 */ add.d $f2, $f2, $f20 -/* B980A4 802404A4 C600001C */ lwc1 $f0, 0x1c($s0) -/* B980A8 802404A8 C6040040 */ lwc1 $f4, 0x40($s0) -/* B980AC 802404AC 46000005 */ abs.s $f0, $f0 -/* B980B0 802404B0 E7A40034 */ swc1 $f4, 0x34($sp) -/* B980B4 802404B4 3C014030 */ lui $at, 0x4030 -/* B980B8 802404B8 44812800 */ mtc1 $at, $f5 -/* B980BC 802404BC 44802000 */ mtc1 $zero, $f4 -/* B980C0 802404C0 46000021 */ cvt.d.s $f0, $f0 -/* B980C4 802404C4 E7A6002C */ swc1 $f6, 0x2c($sp) -/* B980C8 802404C8 46240000 */ add.d $f0, $f0, $f4 -/* B980CC 802404CC 462010A0 */ cvt.s.d $f2, $f2 -/* B980D0 802404D0 E7A20030 */ swc1 $f2, 0x30($sp) -/* B980D4 802404D4 46200020 */ cvt.s.d $f0, $f0 -/* B980D8 802404D8 E7A00038 */ swc1 $f0, 0x38($sp) -/* B980DC 802404DC AFA20010 */ sw $v0, 0x10($sp) -/* B980E0 802404E0 8E040080 */ lw $a0, 0x80($s0) -/* B980E4 802404E4 0C0372DF */ jal func_800DCB7C -/* B980E8 802404E8 27A70034 */ addiu $a3, $sp, 0x34 -/* B980EC 802404EC 1040002A */ beqz $v0, .L80240598 -/* B980F0 802404F0 00000000 */ nop -/* B980F4 802404F4 C600001C */ lwc1 $f0, 0x1c($s0) -/* B980F8 802404F8 C7A20038 */ lwc1 $f2, 0x38($sp) -/* B980FC 802404FC 46000005 */ abs.s $f0, $f0 -/* B98100 80240500 46000021 */ cvt.d.s $f0, $f0 -/* B98104 80240504 46340000 */ add.d $f0, $f0, $f20 -/* B98108 80240508 460010A1 */ cvt.d.s $f2, $f2 -/* B9810C 8024050C 4620103E */ c.le.d $f2, $f0 -/* B98110 80240510 00000000 */ nop -/* B98114 80240514 45000020 */ bc1f .L80240598 -/* B98118 80240518 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B9811C 8024051C C7A00030 */ lwc1 $f0, 0x30($sp) -/* B98120 80240520 8E020000 */ lw $v0, ($s0) -/* B98124 80240524 2403F7FF */ addiu $v1, $zero, -0x801 -/* B98128 80240528 AE00001C */ sw $zero, 0x1c($s0) -/* B9812C 8024052C 00431024 */ and $v0, $v0, $v1 -/* B98130 80240530 AE020000 */ sw $v0, ($s0) -/* B98134 80240534 24020002 */ addiu $v0, $zero, 2 -/* B98138 80240538 E600003C */ swc1 $f0, 0x3c($s0) -/* B9813C 8024053C 0C00A67F */ jal rand_int -/* B98140 80240540 AE620070 */ sw $v0, 0x70($s3) -/* B98144 80240544 3C035555 */ lui $v1, 0x5555 -/* B98148 80240548 34635556 */ ori $v1, $v1, 0x5556 -/* B9814C 8024054C 00430018 */ mult $v0, $v1 -/* B98150 80240550 000227C3 */ sra $a0, $v0, 0x1f -/* B98154 80240554 00004010 */ mfhi $t0 -/* B98158 80240558 01042023 */ subu $a0, $t0, $a0 -/* B9815C 8024055C 00041840 */ sll $v1, $a0, 1 -/* B98160 80240560 00641821 */ addu $v1, $v1, $a0 -/* B98164 80240564 00431023 */ subu $v0, $v0, $v1 -/* B98168 80240568 24430002 */ addiu $v1, $v0, 2 -/* B9816C 8024056C AE630074 */ sw $v1, 0x74($s3) -/* B98170 80240570 8E82002C */ lw $v0, 0x2c($s4) -/* B98174 80240574 5840000F */ blezl $v0, .L802405B4 -/* B98178 80240578 AE600070 */ sw $zero, 0x70($s3) -/* B9817C 8024057C 8E820004 */ lw $v0, 4($s4) -/* B98180 80240580 5840000C */ blezl $v0, .L802405B4 -/* B98184 80240584 AE600070 */ sw $zero, 0x70($s3) -/* B98188 80240588 1460000A */ bnez $v1, .L802405B4 -/* B9818C 8024058C 00000000 */ nop -/* B98190 80240590 0809016D */ j .L802405B4 -/* B98194 80240594 AE600070 */ sw $zero, 0x70($s3) -.L80240598: -/* B98198 80240598 C604003C */ lwc1 $f4, 0x3c($s0) -/* B9819C 8024059C C600001C */ lwc1 $f0, 0x1c($s0) -/* B981A0 802405A0 46002100 */ add.s $f4, $f4, $f0 -/* B981A4 802405A4 C6020014 */ lwc1 $f2, 0x14($s0) -/* B981A8 802405A8 46020001 */ sub.s $f0, $f0, $f2 -/* B981AC 802405AC E604003C */ swc1 $f4, 0x3c($s0) -/* B981B0 802405B0 E600001C */ swc1 $f0, 0x1c($s0) -.L802405B4: -/* B981B4 802405B4 8FBF0054 */ lw $ra, 0x54($sp) -/* B981B8 802405B8 8FB40050 */ lw $s4, 0x50($sp) -/* B981BC 802405BC 8FB3004C */ lw $s3, 0x4c($sp) -/* B981C0 802405C0 8FB20048 */ lw $s2, 0x48($sp) -/* B981C4 802405C4 8FB10044 */ lw $s1, 0x44($sp) -/* B981C8 802405C8 8FB00040 */ lw $s0, 0x40($sp) -/* B981CC 802405CC D7B40058 */ ldc1 $f20, 0x58($sp) -/* B981D0 802405D0 03E00008 */ jr $ra -/* B981D4 802405D4 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_mim/mim_02/func_802405D8_B97C00.s b/asm/nonmatchings/world/area_mim/mim_02/func_802405D8_B97C00.s deleted file mode 100644 index 93abcaad68..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/func_802405D8_B97C00.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405D8_B981D8 -/* B981D8 802405D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B981DC 802405DC AFB3001C */ sw $s3, 0x1c($sp) -/* B981E0 802405E0 0080982D */ daddu $s3, $a0, $zero -/* B981E4 802405E4 AFBF0020 */ sw $ra, 0x20($sp) -/* B981E8 802405E8 AFB20018 */ sw $s2, 0x18($sp) -/* B981EC 802405EC AFB10014 */ sw $s1, 0x14($sp) -/* B981F0 802405F0 AFB00010 */ sw $s0, 0x10($sp) -/* B981F4 802405F4 8E720148 */ lw $s2, 0x148($s3) -/* B981F8 802405F8 86440008 */ lh $a0, 8($s2) -/* B981FC 802405FC 0C00EABB */ jal get_npc_unsafe -/* B98200 80240600 00A0882D */ daddu $s1, $a1, $zero -/* B98204 80240604 8E240008 */ lw $a0, 8($s1) -/* B98208 80240608 0040802D */ daddu $s0, $v0, $zero -/* B9820C 8024060C 00041FC2 */ srl $v1, $a0, 0x1f -/* B98210 80240610 00832021 */ addu $a0, $a0, $v1 -/* B98214 80240614 00042043 */ sra $a0, $a0, 1 -/* B98218 80240618 0C00A67F */ jal rand_int -/* B9821C 8024061C 24840001 */ addiu $a0, $a0, 1 -/* B98220 80240620 8E230008 */ lw $v1, 8($s1) -/* B98224 80240624 240400B4 */ addiu $a0, $zero, 0xb4 -/* B98228 80240628 00032FC2 */ srl $a1, $v1, 0x1f -/* B9822C 8024062C 00651821 */ addu $v1, $v1, $a1 -/* B98230 80240630 00031843 */ sra $v1, $v1, 1 -/* B98234 80240634 00621821 */ addu $v1, $v1, $v0 -/* B98238 80240638 0C00A67F */ jal rand_int -/* B9823C 8024063C A603008E */ sh $v1, 0x8e($s0) -/* B98240 80240640 C60C000C */ lwc1 $f12, 0xc($s0) -/* B98244 80240644 44820000 */ mtc1 $v0, $f0 -/* B98248 80240648 00000000 */ nop -/* B9824C 8024064C 46800020 */ cvt.s.w $f0, $f0 -/* B98250 80240650 46006300 */ add.s $f12, $f12, $f0 -/* B98254 80240654 3C0142B4 */ lui $at, 0x42b4 -/* B98258 80240658 44810000 */ mtc1 $at, $f0 -/* B9825C 8024065C 0C00A6C9 */ jal clamp_angle -/* B98260 80240660 46006301 */ sub.s $f12, $f12, $f0 -/* B98264 80240664 E600000C */ swc1 $f0, 0xc($s0) -/* B98268 80240668 8E4200CC */ lw $v0, 0xcc($s2) -/* B9826C 8024066C 8C420000 */ lw $v0, ($v0) -/* B98270 80240670 AE020028 */ sw $v0, 0x28($s0) -/* B98274 80240674 24020003 */ addiu $v0, $zero, 3 -/* B98278 80240678 AE620070 */ sw $v0, 0x70($s3) -/* B9827C 8024067C 8FBF0020 */ lw $ra, 0x20($sp) -/* B98280 80240680 8FB3001C */ lw $s3, 0x1c($sp) -/* B98284 80240684 8FB20018 */ lw $s2, 0x18($sp) -/* B98288 80240688 8FB10014 */ lw $s1, 0x14($sp) -/* B9828C 8024068C 8FB00010 */ lw $s0, 0x10($sp) -/* B98290 80240690 03E00008 */ jr $ra -/* B98294 80240694 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_02/func_8024091C_B97C00.s b/asm/nonmatchings/world/area_mim/mim_02/func_8024091C_B97C00.s deleted file mode 100644 index 82f1c80412..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/func_8024091C_B97C00.s +++ /dev/null @@ -1,200 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024091C_B9851C -/* B9851C 8024091C 27BDFF90 */ addiu $sp, $sp, -0x70 -/* B98520 80240920 AFB40050 */ sw $s4, 0x50($sp) -/* B98524 80240924 0080A02D */ daddu $s4, $a0, $zero -/* B98528 80240928 AFBF0060 */ sw $ra, 0x60($sp) -/* B9852C 8024092C AFB7005C */ sw $s7, 0x5c($sp) -/* B98530 80240930 AFB60058 */ sw $s6, 0x58($sp) -/* B98534 80240934 AFB50054 */ sw $s5, 0x54($sp) -/* B98538 80240938 AFB3004C */ sw $s3, 0x4c($sp) -/* B9853C 8024093C AFB20048 */ sw $s2, 0x48($sp) -/* B98540 80240940 AFB10044 */ sw $s1, 0x44($sp) -/* B98544 80240944 AFB00040 */ sw $s0, 0x40($sp) -/* B98548 80240948 F7B40068 */ sdc1 $f20, 0x68($sp) -/* B9854C 8024094C 8E950148 */ lw $s5, 0x148($s4) -/* B98550 80240950 00A0B02D */ daddu $s6, $a1, $zero -/* B98554 80240954 86A40008 */ lh $a0, 8($s5) -/* B98558 80240958 0C00EABB */ jal get_npc_unsafe -/* B9855C 8024095C 00C0B82D */ daddu $s7, $a2, $zero -/* B98560 80240960 0040982D */ daddu $s3, $v0, $zero -/* B98564 80240964 C6600018 */ lwc1 $f0, 0x18($s3) -/* B98568 80240968 44801000 */ mtc1 $zero, $f2 -/* B9856C 8024096C 44801800 */ mtc1 $zero, $f3 -/* B98570 80240970 46000021 */ cvt.d.s $f0, $f0 -/* B98574 80240974 4620103C */ c.lt.d $f2, $f0 -/* B98578 80240978 00000000 */ nop -/* B9857C 8024097C 45000021 */ bc1f .L80240A04 -/* B98580 80240980 27A50028 */ addiu $a1, $sp, 0x28 -/* B98584 80240984 C6600038 */ lwc1 $f0, 0x38($s3) -/* B98588 80240988 C662003C */ lwc1 $f2, 0x3c($s3) -/* B9858C 8024098C C6640040 */ lwc1 $f4, 0x40($s3) -/* B98590 80240990 C6660018 */ lwc1 $f6, 0x18($s3) -/* B98594 80240994 E7A00028 */ swc1 $f0, 0x28($sp) -/* B98598 80240998 E7A2002C */ swc1 $f2, 0x2c($sp) -/* B9859C 8024099C E7A40030 */ swc1 $f4, 0x30($sp) -/* B985A0 802409A0 E7A60010 */ swc1 $f6, 0x10($sp) -/* B985A4 802409A4 C660000C */ lwc1 $f0, 0xc($s3) -/* B985A8 802409A8 E7A00014 */ swc1 $f0, 0x14($sp) -/* B985AC 802409AC 866200A8 */ lh $v0, 0xa8($s3) -/* B985B0 802409B0 44820000 */ mtc1 $v0, $f0 -/* B985B4 802409B4 00000000 */ nop -/* B985B8 802409B8 46800020 */ cvt.s.w $f0, $f0 -/* B985BC 802409BC E7A00018 */ swc1 $f0, 0x18($sp) -/* B985C0 802409C0 866200A6 */ lh $v0, 0xa6($s3) -/* B985C4 802409C4 27A6002C */ addiu $a2, $sp, 0x2c -/* B985C8 802409C8 44820000 */ mtc1 $v0, $f0 -/* B985CC 802409CC 00000000 */ nop -/* B985D0 802409D0 46800020 */ cvt.s.w $f0, $f0 -/* B985D4 802409D4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B985D8 802409D8 8E640080 */ lw $a0, 0x80($s3) -/* B985DC 802409DC 0C037711 */ jal func_800DDC44 -/* B985E0 802409E0 27A70030 */ addiu $a3, $sp, 0x30 -/* B985E4 802409E4 10400003 */ beqz $v0, .L802409F4 -/* B985E8 802409E8 00000000 */ nop -/* B985EC 802409EC 08090281 */ j .L80240A04 -/* B985F0 802409F0 AE600018 */ sw $zero, 0x18($s3) -.L802409F4: -/* B985F4 802409F4 8E650018 */ lw $a1, 0x18($s3) -/* B985F8 802409F8 8E66000C */ lw $a2, 0xc($s3) -/* B985FC 802409FC 0C00EA95 */ jal npc_move_heading -/* B98600 80240A00 0260202D */ daddu $a0, $s3, $zero -.L80240A04: -/* B98604 80240A04 C660001C */ lwc1 $f0, 0x1c($s3) -/* B98608 80240A08 44801000 */ mtc1 $zero, $f2 -/* B9860C 80240A0C 44801800 */ mtc1 $zero, $f3 -/* B98610 80240A10 46000021 */ cvt.d.s $f0, $f0 -/* B98614 80240A14 4622003C */ c.lt.d $f0, $f2 -/* B98618 80240A18 00000000 */ nop -/* B9861C 80240A1C 4500006C */ bc1f .L80240BD0 -/* B98620 80240A20 27B00028 */ addiu $s0, $sp, 0x28 -/* B98624 80240A24 0200282D */ daddu $a1, $s0, $zero -/* B98628 80240A28 27A60034 */ addiu $a2, $sp, 0x34 -/* B9862C 80240A2C 27B20038 */ addiu $s2, $sp, 0x38 -/* B98630 80240A30 C6600038 */ lwc1 $f0, 0x38($s3) -/* B98634 80240A34 3C0142C8 */ lui $at, 0x42c8 -/* B98638 80240A38 44811000 */ mtc1 $at, $f2 -/* B9863C 80240A3C C6640040 */ lwc1 $f4, 0x40($s3) -/* B98640 80240A40 3C01447A */ lui $at, 0x447a -/* B98644 80240A44 44813000 */ mtc1 $at, $f6 -/* B98648 80240A48 27B10030 */ addiu $s1, $sp, 0x30 -/* B9864C 80240A4C E7A00028 */ swc1 $f0, 0x28($sp) -/* B98650 80240A50 E7A20034 */ swc1 $f2, 0x34($sp) -/* B98654 80240A54 E7A40030 */ swc1 $f4, 0x30($sp) -/* B98658 80240A58 E7A60038 */ swc1 $f6, 0x38($sp) -/* B9865C 80240A5C AFB20010 */ sw $s2, 0x10($sp) -/* B98660 80240A60 8E640080 */ lw $a0, 0x80($s3) -/* B98664 80240A64 0C0372DF */ jal func_800DCB7C -/* B98668 80240A68 0220382D */ daddu $a3, $s1, $zero -/* B9866C 80240A6C 0200282D */ daddu $a1, $s0, $zero -/* B98670 80240A70 27A6002C */ addiu $a2, $sp, 0x2c -/* B98674 80240A74 C662003C */ lwc1 $f2, 0x3c($s3) -/* B98678 80240A78 C6660038 */ lwc1 $f6, 0x38($s3) -/* B9867C 80240A7C 3C01402A */ lui $at, 0x402a -/* B98680 80240A80 4481A800 */ mtc1 $at, $f21 -/* B98684 80240A84 4480A000 */ mtc1 $zero, $f20 -/* B98688 80240A88 460010A1 */ cvt.d.s $f2, $f2 -/* B9868C 80240A8C 46341080 */ add.d $f2, $f2, $f20 -/* B98690 80240A90 C660001C */ lwc1 $f0, 0x1c($s3) -/* B98694 80240A94 C6640040 */ lwc1 $f4, 0x40($s3) -/* B98698 80240A98 46000005 */ abs.s $f0, $f0 -/* B9869C 80240A9C E7A40030 */ swc1 $f4, 0x30($sp) -/* B986A0 80240AA0 3C014030 */ lui $at, 0x4030 -/* B986A4 80240AA4 44812800 */ mtc1 $at, $f5 -/* B986A8 80240AA8 44802000 */ mtc1 $zero, $f4 -/* B986AC 80240AAC 46000021 */ cvt.d.s $f0, $f0 -/* B986B0 80240AB0 E7A60028 */ swc1 $f6, 0x28($sp) -/* B986B4 80240AB4 46240000 */ add.d $f0, $f0, $f4 -/* B986B8 80240AB8 462010A0 */ cvt.s.d $f2, $f2 -/* B986BC 80240ABC E7A2002C */ swc1 $f2, 0x2c($sp) -/* B986C0 80240AC0 46200020 */ cvt.s.d $f0, $f0 -/* B986C4 80240AC4 E7A00038 */ swc1 $f0, 0x38($sp) -/* B986C8 80240AC8 AFB20010 */ sw $s2, 0x10($sp) -/* B986CC 80240ACC 8E640080 */ lw $a0, 0x80($s3) -/* B986D0 80240AD0 0C0372DF */ jal func_800DCB7C -/* B986D4 80240AD4 0220382D */ daddu $a3, $s1, $zero -/* B986D8 80240AD8 1040003D */ beqz $v0, .L80240BD0 -/* B986DC 80240ADC 00000000 */ nop -/* B986E0 80240AE0 C660001C */ lwc1 $f0, 0x1c($s3) -/* B986E4 80240AE4 C7A20038 */ lwc1 $f2, 0x38($sp) -/* B986E8 80240AE8 46000005 */ abs.s $f0, $f0 -/* B986EC 80240AEC 46000021 */ cvt.d.s $f0, $f0 -/* B986F0 80240AF0 46340000 */ add.d $f0, $f0, $f20 -/* B986F4 80240AF4 460010A1 */ cvt.d.s $f2, $f2 -/* B986F8 80240AF8 4620103E */ c.le.d $f2, $f0 -/* B986FC 80240AFC 00000000 */ nop -/* B98700 80240B00 45000033 */ bc1f .L80240BD0 -/* B98704 80240B04 2403F7FF */ addiu $v1, $zero, -0x801 -/* B98708 80240B08 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* B9870C 80240B0C 8E620000 */ lw $v0, ($s3) -/* B98710 80240B10 AE60001C */ sw $zero, 0x1c($s3) -/* B98714 80240B14 00431024 */ and $v0, $v0, $v1 -/* B98718 80240B18 E660003C */ swc1 $f0, 0x3c($s3) -/* B9871C 80240B1C AE620000 */ sw $v0, ($s3) -/* B98720 80240B20 AFA00010 */ sw $zero, 0x10($sp) -/* B98724 80240B24 AFA00014 */ sw $zero, 0x14($sp) -/* B98728 80240B28 8E650038 */ lw $a1, 0x38($s3) -/* B9872C 80240B2C 8E66003C */ lw $a2, 0x3c($s3) -/* B98730 80240B30 8E670040 */ lw $a3, 0x40($s3) -/* B98734 80240B34 0C01BECC */ jal fx_walk_normal -/* B98738 80240B38 24040002 */ addiu $a0, $zero, 2 -/* B9873C 80240B3C 02E0202D */ daddu $a0, $s7, $zero -/* B98740 80240B40 2402000C */ addiu $v0, $zero, 0xc -/* B98744 80240B44 AE820070 */ sw $v0, 0x70($s4) -/* B98748 80240B48 24020001 */ addiu $v0, $zero, 1 -/* B9874C 80240B4C AFA20010 */ sw $v0, 0x10($sp) -/* B98750 80240B50 8EC60024 */ lw $a2, 0x24($s6) -/* B98754 80240B54 8EC70028 */ lw $a3, 0x28($s6) -/* B98758 80240B58 0C01242D */ jal func_800490B4 -/* B9875C 80240B5C 02A0282D */ daddu $a1, $s5, $zero -/* B98760 80240B60 14400022 */ bnez $v0, .L80240BEC -/* B98764 80240B64 24040002 */ addiu $a0, $zero, 2 -/* B98768 80240B68 0260282D */ daddu $a1, $s3, $zero -/* B9876C 80240B6C 0000302D */ daddu $a2, $zero, $zero -/* B98770 80240B70 866300A8 */ lh $v1, 0xa8($s3) -/* B98774 80240B74 3C013F80 */ lui $at, 0x3f80 -/* B98778 80240B78 44810000 */ mtc1 $at, $f0 -/* B9877C 80240B7C 3C014000 */ lui $at, 0x4000 -/* B98780 80240B80 44811000 */ mtc1 $at, $f2 -/* B98784 80240B84 3C01C1A0 */ lui $at, 0xc1a0 -/* B98788 80240B88 44812000 */ mtc1 $at, $f4 -/* B9878C 80240B8C 2402000F */ addiu $v0, $zero, 0xf -/* B98790 80240B90 AFA2001C */ sw $v0, 0x1c($sp) -/* B98794 80240B94 44834000 */ mtc1 $v1, $f8 -/* B98798 80240B98 00000000 */ nop -/* B9879C 80240B9C 46804220 */ cvt.s.w $f8, $f8 -/* B987A0 80240BA0 44074000 */ mfc1 $a3, $f8 -/* B987A4 80240BA4 27A2003C */ addiu $v0, $sp, 0x3c -/* B987A8 80240BA8 AFA20020 */ sw $v0, 0x20($sp) -/* B987AC 80240BAC E7A00010 */ swc1 $f0, 0x10($sp) -/* B987B0 80240BB0 E7A20014 */ swc1 $f2, 0x14($sp) -/* B987B4 80240BB4 0C01BFA4 */ jal fx_emote -/* B987B8 80240BB8 E7A40018 */ swc1 $f4, 0x18($sp) -/* B987BC 80240BBC 24020019 */ addiu $v0, $zero, 0x19 -/* B987C0 80240BC0 A662008E */ sh $v0, 0x8e($s3) -/* B987C4 80240BC4 2402000E */ addiu $v0, $zero, 0xe -/* B987C8 80240BC8 080902FB */ j .L80240BEC -/* B987CC 80240BCC AE820070 */ sw $v0, 0x70($s4) -.L80240BD0: -/* B987D0 80240BD0 C664003C */ lwc1 $f4, 0x3c($s3) -/* B987D4 80240BD4 C660001C */ lwc1 $f0, 0x1c($s3) -/* B987D8 80240BD8 46002100 */ add.s $f4, $f4, $f0 -/* B987DC 80240BDC C6620014 */ lwc1 $f2, 0x14($s3) -/* B987E0 80240BE0 46020001 */ sub.s $f0, $f0, $f2 -/* B987E4 80240BE4 E664003C */ swc1 $f4, 0x3c($s3) -/* B987E8 80240BE8 E660001C */ swc1 $f0, 0x1c($s3) -.L80240BEC: -/* B987EC 80240BEC 8FBF0060 */ lw $ra, 0x60($sp) -/* B987F0 80240BF0 8FB7005C */ lw $s7, 0x5c($sp) -/* B987F4 80240BF4 8FB60058 */ lw $s6, 0x58($sp) -/* B987F8 80240BF8 8FB50054 */ lw $s5, 0x54($sp) -/* B987FC 80240BFC 8FB40050 */ lw $s4, 0x50($sp) -/* B98800 80240C00 8FB3004C */ lw $s3, 0x4c($sp) -/* B98804 80240C04 8FB20048 */ lw $s2, 0x48($sp) -/* B98808 80240C08 8FB10044 */ lw $s1, 0x44($sp) -/* B9880C 80240C0C 8FB00040 */ lw $s0, 0x40($sp) -/* B98810 80240C10 D7B40068 */ ldc1 $f20, 0x68($sp) -/* B98814 80240C14 03E00008 */ jr $ra -/* B98818 80240C18 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_mim/mim_02/func_80240C1C_B97C00.s b/asm/nonmatchings/world/area_mim/mim_02/func_80240C1C_B97C00.s deleted file mode 100644 index a794aeaab1..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/func_80240C1C_B97C00.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C1C_B9881C -/* B9881C 80240C1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B98820 80240C20 AFB00010 */ sw $s0, 0x10($sp) -/* B98824 80240C24 0080802D */ daddu $s0, $a0, $zero -/* B98828 80240C28 AFBF0014 */ sw $ra, 0x14($sp) -/* B9882C 80240C2C 8E020148 */ lw $v0, 0x148($s0) -/* B98830 80240C30 0C00EABB */ jal get_npc_unsafe -/* B98834 80240C34 84440008 */ lh $a0, 8($v0) -/* B98838 80240C38 9443008E */ lhu $v1, 0x8e($v0) -/* B9883C 80240C3C 2463FFFF */ addiu $v1, $v1, -1 -/* B98840 80240C40 A443008E */ sh $v1, 0x8e($v0) -/* B98844 80240C44 00031C00 */ sll $v1, $v1, 0x10 -/* B98848 80240C48 58600001 */ blezl $v1, .L80240C50 -/* B9884C 80240C4C AE000070 */ sw $zero, 0x70($s0) -.L80240C50: -/* B98850 80240C50 8FBF0014 */ lw $ra, 0x14($sp) -/* B98854 80240C54 8FB00010 */ lw $s0, 0x10($sp) -/* B98858 80240C58 03E00008 */ jr $ra -/* B9885C 80240C5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_02/func_80240C60_B97C00.s b/asm/nonmatchings/world/area_mim/mim_02/func_80240C60_B97C00.s deleted file mode 100644 index ff7595ab11..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/func_80240C60_B97C00.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C60_B98860 -/* B98860 80240C60 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B98864 80240C64 AFB3003C */ sw $s3, 0x3c($sp) -/* B98868 80240C68 0080982D */ daddu $s3, $a0, $zero -/* B9886C 80240C6C AFBF0048 */ sw $ra, 0x48($sp) -/* B98870 80240C70 AFB50044 */ sw $s5, 0x44($sp) -/* B98874 80240C74 AFB40040 */ sw $s4, 0x40($sp) -/* B98878 80240C78 AFB20038 */ sw $s2, 0x38($sp) -/* B9887C 80240C7C AFB10034 */ sw $s1, 0x34($sp) -/* B98880 80240C80 AFB00030 */ sw $s0, 0x30($sp) -/* B98884 80240C84 8E720148 */ lw $s2, 0x148($s3) -/* B98888 80240C88 86440008 */ lh $a0, 8($s2) -/* B9888C 80240C8C 8E70000C */ lw $s0, 0xc($s3) -/* B98890 80240C90 0C00EABB */ jal get_npc_unsafe -/* B98894 80240C94 00A0882D */ daddu $s1, $a1, $zero -/* B98898 80240C98 8E050000 */ lw $a1, ($s0) -/* B9889C 80240C9C 26100004 */ addiu $s0, $s0, 4 -/* B988A0 80240CA0 0260202D */ daddu $a0, $s3, $zero -/* B988A4 80240CA4 0C0B1EAF */ jal get_variable -/* B988A8 80240CA8 0040A82D */ daddu $s5, $v0, $zero -/* B988AC 80240CAC 0260202D */ daddu $a0, $s3, $zero -/* B988B0 80240CB0 8E050000 */ lw $a1, ($s0) -/* B988B4 80240CB4 0C0B1EAF */ jal get_variable -/* B988B8 80240CB8 0040A02D */ daddu $s4, $v0, $zero -/* B988BC 80240CBC AE420094 */ sw $v0, 0x94($s2) -/* B988C0 80240CC0 AFA00010 */ sw $zero, 0x10($sp) -/* B988C4 80240CC4 8E4200D0 */ lw $v0, 0xd0($s2) -/* B988C8 80240CC8 8C420030 */ lw $v0, 0x30($v0) -/* B988CC 80240CCC AFA20014 */ sw $v0, 0x14($sp) -/* B988D0 80240CD0 8E4200D0 */ lw $v0, 0xd0($s2) -/* B988D4 80240CD4 8C42001C */ lw $v0, 0x1c($v0) -/* B988D8 80240CD8 AFA20018 */ sw $v0, 0x18($sp) -/* B988DC 80240CDC 8E4200D0 */ lw $v0, 0xd0($s2) -/* B988E0 80240CE0 8C420024 */ lw $v0, 0x24($v0) -/* B988E4 80240CE4 AFA2001C */ sw $v0, 0x1c($sp) -/* B988E8 80240CE8 8E4200D0 */ lw $v0, 0xd0($s2) -/* B988EC 80240CEC 8C420028 */ lw $v0, 0x28($v0) -/* B988F0 80240CF0 AFA20020 */ sw $v0, 0x20($sp) -/* B988F4 80240CF4 8E4200D0 */ lw $v0, 0xd0($s2) -/* B988F8 80240CF8 3C0142C8 */ lui $at, 0x42c8 -/* B988FC 80240CFC 44810000 */ mtc1 $at, $f0 -/* B98900 80240D00 8C42002C */ lw $v0, 0x2c($v0) -/* B98904 80240D04 27B00010 */ addiu $s0, $sp, 0x10 -/* B98908 80240D08 E7A00028 */ swc1 $f0, 0x28($sp) -/* B9890C 80240D0C A7A0002C */ sh $zero, 0x2c($sp) -/* B98910 80240D10 12200019 */ beqz $s1, .L80240D78 -/* B98914 80240D14 AFA20024 */ sw $v0, 0x24($sp) -/* B98918 80240D18 AE600070 */ sw $zero, 0x70($s3) -/* B9891C 80240D1C A6A0008E */ sh $zero, 0x8e($s5) -/* B98920 80240D20 AE600074 */ sw $zero, 0x74($s3) -/* B98924 80240D24 8EA20000 */ lw $v0, ($s5) -/* B98928 80240D28 2403F7FF */ addiu $v1, $zero, -0x801 -/* B9892C 80240D2C 00431024 */ and $v0, $v0, $v1 -/* B98930 80240D30 2403FDFF */ addiu $v1, $zero, -0x201 -/* B98934 80240D34 00431024 */ and $v0, $v0, $v1 -/* B98938 80240D38 34420008 */ ori $v0, $v0, 8 -/* B9893C 80240D3C AEA20000 */ sw $v0, ($s5) -/* B98940 80240D40 8E4200B0 */ lw $v0, 0xb0($s2) -/* B98944 80240D44 34420018 */ ori $v0, $v0, 0x18 -/* B98948 80240D48 AE4200B0 */ sw $v0, 0xb0($s2) -/* B9894C 80240D4C 8E420000 */ lw $v0, ($s2) -/* B98950 80240D50 3C034000 */ lui $v1, 0x4000 -/* B98954 80240D54 00431024 */ and $v0, $v0, $v1 -/* B98958 80240D58 10400007 */ beqz $v0, .L80240D78 -/* B9895C 80240D5C 3C03BFFF */ lui $v1, 0xbfff -/* B98960 80240D60 2402000C */ addiu $v0, $zero, 0xc -/* B98964 80240D64 AE620070 */ sw $v0, 0x70($s3) -/* B98968 80240D68 8E420000 */ lw $v0, ($s2) -/* B9896C 80240D6C 3463FFFF */ ori $v1, $v1, 0xffff -/* B98970 80240D70 00431024 */ and $v0, $v0, $v1 -/* B98974 80240D74 AE420000 */ sw $v0, ($s2) -.L80240D78: -/* B98978 80240D78 8E4300B0 */ lw $v1, 0xb0($s2) -/* B9897C 80240D7C 30620004 */ andi $v0, $v1, 4 -/* B98980 80240D80 10400007 */ beqz $v0, .L80240DA0 -/* B98984 80240D84 00000000 */ nop -/* B98988 80240D88 824200B4 */ lb $v0, 0xb4($s2) -/* B9898C 80240D8C 14400034 */ bnez $v0, .L80240E60 -/* B98990 80240D90 0000102D */ daddu $v0, $zero, $zero -/* B98994 80240D94 2402FFFB */ addiu $v0, $zero, -5 -/* B98998 80240D98 00621024 */ and $v0, $v1, $v0 -/* B9899C 80240D9C AE4200B0 */ sw $v0, 0xb0($s2) -.L80240DA0: -/* B989A0 80240DA0 8E630070 */ lw $v1, 0x70($s3) -/* B989A4 80240DA4 2C62000F */ sltiu $v0, $v1, 0xf -/* B989A8 80240DA8 1040002C */ beqz $v0, .L80240E5C -/* B989AC 80240DAC 00031080 */ sll $v0, $v1, 2 -/* B989B0 80240DB0 3C018024 */ lui $at, 0x8024 -/* B989B4 80240DB4 00220821 */ addu $at, $at, $v0 -/* B989B8 80240DB8 8C223838 */ lw $v0, 0x3838($at) -/* B989BC 80240DBC 00400008 */ jr $v0 -/* B989C0 80240DC0 00000000 */ nop -/* B989C4 80240DC4 0260202D */ daddu $a0, $s3, $zero -/* B989C8 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* B989CC 80240DCC 0C09001C */ jal func_80240070 -/* B989D0 80240DD0 0200302D */ daddu $a2, $s0, $zero -/* B989D4 80240DD4 0260202D */ daddu $a0, $s3, $zero -/* B989D8 80240DD8 0280282D */ daddu $a1, $s4, $zero -/* B989DC 80240DDC 0C0900A8 */ jal func_802402A0 -/* B989E0 80240DE0 0200302D */ daddu $a2, $s0, $zero -/* B989E4 80240DE4 08090398 */ j .L80240E60 -/* B989E8 80240DE8 0000102D */ daddu $v0, $zero, $zero -/* B989EC 80240DEC 0260202D */ daddu $a0, $s3, $zero -/* B989F0 80240DF0 0280282D */ daddu $a1, $s4, $zero -/* B989F4 80240DF4 0C090176 */ jal func_802405D8 -/* B989F8 80240DF8 0200302D */ daddu $a2, $s0, $zero -/* B989FC 80240DFC 8E630070 */ lw $v1, 0x70($s3) -/* B98A00 80240E00 24020003 */ addiu $v0, $zero, 3 -/* B98A04 80240E04 14620016 */ bne $v1, $v0, .L80240E60 -/* B98A08 80240E08 0000102D */ daddu $v0, $zero, $zero -/* B98A0C 80240E0C 0260202D */ daddu $a0, $s3, $zero -/* B98A10 80240E10 0280282D */ daddu $a1, $s4, $zero -/* B98A14 80240E14 0C0901A6 */ jal func_80240698 -/* B98A18 80240E18 0200302D */ daddu $a2, $s0, $zero -/* B98A1C 80240E1C 08090398 */ j .L80240E60 -/* B98A20 80240E20 0000102D */ daddu $v0, $zero, $zero -/* B98A24 80240E24 0260202D */ daddu $a0, $s3, $zero -/* B98A28 80240E28 0280282D */ daddu $a1, $s4, $zero -/* B98A2C 80240E2C 0C09020F */ jal func_8024083C -/* B98A30 80240E30 0200302D */ daddu $a2, $s0, $zero -/* B98A34 80240E34 0260202D */ daddu $a0, $s3, $zero -/* B98A38 80240E38 0280282D */ daddu $a1, $s4, $zero -/* B98A3C 80240E3C 0C090247 */ jal func_8024091C -/* B98A40 80240E40 0200302D */ daddu $a2, $s0, $zero -/* B98A44 80240E44 08090398 */ j .L80240E60 -/* B98A48 80240E48 0000102D */ daddu $v0, $zero, $zero -/* B98A4C 80240E4C 0260202D */ daddu $a0, $s3, $zero -/* B98A50 80240E50 0280282D */ daddu $a1, $s4, $zero -/* B98A54 80240E54 0C090307 */ jal func_80240C1C -/* B98A58 80240E58 0200302D */ daddu $a2, $s0, $zero -.L80240E5C: -/* B98A5C 80240E5C 0000102D */ daddu $v0, $zero, $zero -.L80240E60: -/* B98A60 80240E60 8FBF0048 */ lw $ra, 0x48($sp) -/* B98A64 80240E64 8FB50044 */ lw $s5, 0x44($sp) -/* B98A68 80240E68 8FB40040 */ lw $s4, 0x40($sp) -/* B98A6C 80240E6C 8FB3003C */ lw $s3, 0x3c($sp) -/* B98A70 80240E70 8FB20038 */ lw $s2, 0x38($sp) -/* B98A74 80240E74 8FB10034 */ lw $s1, 0x34($sp) -/* B98A78 80240E78 8FB00030 */ lw $s0, 0x30($sp) -/* B98A7C 80240E7C 03E00008 */ jr $ra -/* B98A80 80240E80 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mim/mim_02/func_80240EE0_B97C00.s b/asm/nonmatchings/world/area_mim/mim_02/func_80240EE0_B97C00.s deleted file mode 100644 index 729972795a..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/func_80240EE0_B97C00.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE0_B98AE0 -/* B98AE0 80240EE0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B98AE4 80240EE4 AFB10014 */ sw $s1, 0x14($sp) -/* B98AE8 80240EE8 0080882D */ daddu $s1, $a0, $zero -/* B98AEC 80240EEC AFBF0024 */ sw $ra, 0x24($sp) -/* B98AF0 80240EF0 AFB40020 */ sw $s4, 0x20($sp) -/* B98AF4 80240EF4 AFB3001C */ sw $s3, 0x1c($sp) -/* B98AF8 80240EF8 AFB20018 */ sw $s2, 0x18($sp) -/* B98AFC 80240EFC AFB00010 */ sw $s0, 0x10($sp) -/* B98B00 80240F00 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* B98B04 80240F04 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* B98B08 80240F08 F7B80038 */ sdc1 $f24, 0x38($sp) -/* B98B0C 80240F0C F7B60030 */ sdc1 $f22, 0x30($sp) -/* B98B10 80240F10 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B98B14 80240F14 8E30000C */ lw $s0, 0xc($s1) -/* B98B18 80240F18 8E130000 */ lw $s3, ($s0) -/* B98B1C 80240F1C 26100004 */ addiu $s0, $s0, 4 -/* B98B20 80240F20 0C0B1EAF */ jal get_variable -/* B98B24 80240F24 0260282D */ daddu $a1, $s3, $zero -/* B98B28 80240F28 4482E000 */ mtc1 $v0, $f28 -/* B98B2C 80240F2C 00000000 */ nop -/* B98B30 80240F30 4680E720 */ cvt.s.w $f28, $f28 -/* B98B34 80240F34 8E140000 */ lw $s4, ($s0) -/* B98B38 80240F38 26100004 */ addiu $s0, $s0, 4 -/* B98B3C 80240F3C 0220202D */ daddu $a0, $s1, $zero -/* B98B40 80240F40 0C0B1EAF */ jal get_variable -/* B98B44 80240F44 0280282D */ daddu $a1, $s4, $zero -/* B98B48 80240F48 4482D000 */ mtc1 $v0, $f26 -/* B98B4C 80240F4C 00000000 */ nop -/* B98B50 80240F50 4680D6A0 */ cvt.s.w $f26, $f26 -/* B98B54 80240F54 8E100000 */ lw $s0, ($s0) -/* B98B58 80240F58 0220202D */ daddu $a0, $s1, $zero -/* B98B5C 80240F5C 0C0B1EAF */ jal get_variable -/* B98B60 80240F60 0200282D */ daddu $a1, $s0, $zero -/* B98B64 80240F64 4482C000 */ mtc1 $v0, $f24 -/* B98B68 80240F68 00000000 */ nop -/* B98B6C 80240F6C 4680C620 */ cvt.s.w $f24, $f24 -/* B98B70 80240F70 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* B98B74 80240F74 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* B98B78 80240F78 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* B98B7C 80240F7C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* B98B80 80240F80 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* B98B84 80240F84 44800000 */ mtc1 $zero, $f0 -/* B98B88 80240F88 00031080 */ sll $v0, $v1, 2 -/* B98B8C 80240F8C 00431021 */ addu $v0, $v0, $v1 -/* B98B90 80240F90 00021080 */ sll $v0, $v0, 2 -/* B98B94 80240F94 00431023 */ subu $v0, $v0, $v1 -/* B98B98 80240F98 000218C0 */ sll $v1, $v0, 3 -/* B98B9C 80240F9C 00431021 */ addu $v0, $v0, $v1 -/* B98BA0 80240FA0 000210C0 */ sll $v0, $v0, 3 -/* B98BA4 80240FA4 46001032 */ c.eq.s $f2, $f0 -/* B98BA8 80240FA8 3C01800B */ lui $at, 0x800b -/* B98BAC 80240FAC 00220821 */ addu $at, $at, $v0 -/* B98BB0 80240FB0 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* B98BB4 80240FB4 45000005 */ bc1f .L80240FCC -/* B98BB8 80240FB8 00000000 */ nop -/* B98BBC 80240FBC 3C0142C8 */ lui $at, 0x42c8 -/* B98BC0 80240FC0 44810000 */ mtc1 $at, $f0 -/* B98BC4 80240FC4 080903F7 */ j .L80240FDC -/* B98BC8 80240FC8 4600B581 */ sub.s $f22, $f22, $f0 -.L80240FCC: -/* B98BCC 80240FCC 3C0142C8 */ lui $at, 0x42c8 -/* B98BD0 80240FD0 44810000 */ mtc1 $at, $f0 -/* B98BD4 80240FD4 00000000 */ nop -/* B98BD8 80240FD8 4600B580 */ add.s $f22, $f22, $f0 -.L80240FDC: -/* B98BDC 80240FDC 0C00A6C9 */ jal clamp_angle -/* B98BE0 80240FE0 4600B306 */ mov.s $f12, $f22 -/* B98BE4 80240FE4 46000586 */ mov.s $f22, $f0 -/* B98BE8 80240FE8 3C014170 */ lui $at, 0x4170 -/* B98BEC 80240FEC 4481A000 */ mtc1 $at, $f20 -/* B98BF0 80240FF0 0C00A8BB */ jal sin_deg -/* B98BF4 80240FF4 4600B306 */ mov.s $f12, $f22 -/* B98BF8 80240FF8 46140002 */ mul.s $f0, $f0, $f20 -/* B98BFC 80240FFC 00000000 */ nop -/* B98C00 80241000 864200B0 */ lh $v0, 0xb0($s2) -/* B98C04 80241004 3C013F00 */ lui $at, 0x3f00 -/* B98C08 80241008 44812000 */ mtc1 $at, $f4 -/* B98C0C 8024100C 44821000 */ mtc1 $v0, $f2 -/* B98C10 80241010 00000000 */ nop -/* B98C14 80241014 468010A0 */ cvt.s.w $f2, $f2 -/* B98C18 80241018 46041082 */ mul.s $f2, $f2, $f4 -/* B98C1C 8024101C 00000000 */ nop -/* B98C20 80241020 4600E700 */ add.s $f28, $f28, $f0 -/* B98C24 80241024 4602D680 */ add.s $f26, $f26, $f2 -/* B98C28 80241028 0C00A8D4 */ jal cos_deg -/* B98C2C 8024102C 4600B306 */ mov.s $f12, $f22 -/* B98C30 80241030 46140002 */ mul.s $f0, $f0, $f20 -/* B98C34 80241034 00000000 */ nop -/* B98C38 80241038 0220202D */ daddu $a0, $s1, $zero -/* B98C3C 8024103C 0260282D */ daddu $a1, $s3, $zero -/* B98C40 80241040 4600E18D */ trunc.w.s $f6, $f28 -/* B98C44 80241044 44063000 */ mfc1 $a2, $f6 -/* B98C48 80241048 0C0B2026 */ jal set_variable -/* B98C4C 8024104C 4600C601 */ sub.s $f24, $f24, $f0 -/* B98C50 80241050 0220202D */ daddu $a0, $s1, $zero -/* B98C54 80241054 4600D18D */ trunc.w.s $f6, $f26 -/* B98C58 80241058 44063000 */ mfc1 $a2, $f6 -/* B98C5C 8024105C 0C0B2026 */ jal set_variable -/* B98C60 80241060 0280282D */ daddu $a1, $s4, $zero -/* B98C64 80241064 0220202D */ daddu $a0, $s1, $zero -/* B98C68 80241068 4600C18D */ trunc.w.s $f6, $f24 -/* B98C6C 8024106C 44063000 */ mfc1 $a2, $f6 -/* B98C70 80241070 0C0B2026 */ jal set_variable -/* B98C74 80241074 0200282D */ daddu $a1, $s0, $zero -/* B98C78 80241078 8FBF0024 */ lw $ra, 0x24($sp) -/* B98C7C 8024107C 8FB40020 */ lw $s4, 0x20($sp) -/* B98C80 80241080 8FB3001C */ lw $s3, 0x1c($sp) -/* B98C84 80241084 8FB20018 */ lw $s2, 0x18($sp) -/* B98C88 80241088 8FB10014 */ lw $s1, 0x14($sp) -/* B98C8C 8024108C 8FB00010 */ lw $s0, 0x10($sp) -/* B98C90 80241090 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* B98C94 80241094 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* B98C98 80241098 D7B80038 */ ldc1 $f24, 0x38($sp) -/* B98C9C 8024109C D7B60030 */ ldc1 $f22, 0x30($sp) -/* B98CA0 802410A0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B98CA4 802410A4 24020002 */ addiu $v0, $zero, 2 -/* B98CA8 802410A8 03E00008 */ jr $ra -/* B98CAC 802410AC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mim/mim_02/func_802410B0_B97C00.s b/asm/nonmatchings/world/area_mim/mim_02/func_802410B0_B97C00.s deleted file mode 100644 index ac447c65c1..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/func_802410B0_B97C00.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410B0_B98CB0 -/* B98CB0 802410B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B98CB4 802410B4 AFBF0010 */ sw $ra, 0x10($sp) -/* B98CB8 802410B8 10A00003 */ beqz $a1, .L802410C8 -/* B98CBC 802410BC 8C86000C */ lw $a2, 0xc($a0) -/* B98CC0 802410C0 3C018024 */ lui $at, 0x8024 -/* B98CC4 802410C4 AC2016AC */ sw $zero, 0x16ac($at) -.L802410C8: -/* B98CC8 802410C8 3C038024 */ lui $v1, 0x8024 -/* B98CCC 802410CC 246316AC */ addiu $v1, $v1, 0x16ac -/* B98CD0 802410D0 8C620000 */ lw $v0, ($v1) -/* B98CD4 802410D4 54400003 */ bnel $v0, $zero, .L802410E4 -/* B98CD8 802410D8 AC600000 */ sw $zero, ($v1) -/* B98CDC 802410DC 0809043E */ j .L802410F8 -/* B98CE0 802410E0 0000102D */ daddu $v0, $zero, $zero -.L802410E4: -/* B98CE4 802410E4 8CC50000 */ lw $a1, ($a2) -/* B98CE8 802410E8 3C068024 */ lui $a2, 0x8024 -/* B98CEC 802410EC 0C0B2026 */ jal set_variable -/* B98CF0 802410F0 8CC616B0 */ lw $a2, 0x16b0($a2) -/* B98CF4 802410F4 24020002 */ addiu $v0, $zero, 2 -.L802410F8: -/* B98CF8 802410F8 8FBF0010 */ lw $ra, 0x10($sp) -/* B98CFC 802410FC 03E00008 */ jr $ra -/* B98D00 80241100 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_02/func_80241104_B97C00.s b/asm/nonmatchings/world/area_mim/mim_02/func_80241104_B97C00.s deleted file mode 100644 index a0176a96d2..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/func_80241104_B97C00.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241104_B98D04 -/* B98D04 80241104 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B98D08 80241108 AFBF0010 */ sw $ra, 0x10($sp) -/* B98D0C 8024110C 8C82000C */ lw $v0, 0xc($a0) -/* B98D10 80241110 0C0B1EAF */ jal get_variable -/* B98D14 80241114 8C450000 */ lw $a1, ($v0) -/* B98D18 80241118 3C018024 */ lui $at, 0x8024 -/* B98D1C 8024111C AC2216B0 */ sw $v0, 0x16b0($at) -/* B98D20 80241120 24020002 */ addiu $v0, $zero, 2 -/* B98D24 80241124 8FBF0010 */ lw $ra, 0x10($sp) -/* B98D28 80241128 24030001 */ addiu $v1, $zero, 1 -/* B98D2C 8024112C 3C018024 */ lui $at, 0x8024 -/* B98D30 80241130 AC2316AC */ sw $v1, 0x16ac($at) -/* B98D34 80241134 03E00008 */ jr $ra -/* B98D38 80241138 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_03/func_80240068_B9B480.s b/asm/nonmatchings/world/area_mim/mim_03/func_80240068_B9B480.s deleted file mode 100644 index aa7d49fd90..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_03/func_80240068_B9B480.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240068_B9B4E8 -/* B9B4E8 80240068 44806000 */ mtc1 $zero, $f12 -/* B9B4EC 8024006C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B9B4F0 80240070 AFB00010 */ sw $s0, 0x10($sp) -/* B9B4F4 80240074 0080802D */ daddu $s0, $a0, $zero -/* B9B4F8 80240078 AFBF0014 */ sw $ra, 0x14($sp) -/* B9B4FC 8024007C 0C038022 */ jal func_800E0088 -/* B9B500 80240080 46006386 */ mov.s $f14, $f12 -/* B9B504 80240084 4600008D */ trunc.w.s $f2, $f0 -/* B9B508 80240088 E6020084 */ swc1 $f2, 0x84($s0) -/* B9B50C 8024008C 8FBF0014 */ lw $ra, 0x14($sp) -/* B9B510 80240090 8FB00010 */ lw $s0, 0x10($sp) -/* B9B514 80240094 24020002 */ addiu $v0, $zero, 2 -/* B9B518 80240098 03E00008 */ jr $ra -/* B9B51C 8024009C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_03/func_802400A0_B9B480.s b/asm/nonmatchings/world/area_mim/mim_03/func_802400A0_B9B480.s deleted file mode 100644 index 19eab88408..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_03/func_802400A0_B9B480.s +++ /dev/null @@ -1,239 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400A0_B9B520 -/* B9B520 802400A0 27BDFF88 */ addiu $sp, $sp, -0x78 -/* B9B524 802400A4 F7B60050 */ sdc1 $f22, 0x50($sp) -/* B9B528 802400A8 4480B000 */ mtc1 $zero, $f22 -/* B9B52C 802400AC AFB30034 */ sw $s3, 0x34($sp) -/* B9B530 802400B0 00A0982D */ daddu $s3, $a1, $zero -/* B9B534 802400B4 AFB40038 */ sw $s4, 0x38($sp) -/* B9B538 802400B8 00C0A02D */ daddu $s4, $a2, $zero -/* B9B53C 802400BC AFB5003C */ sw $s5, 0x3c($sp) -/* B9B540 802400C0 00E0A82D */ daddu $s5, $a3, $zero -/* B9B544 802400C4 AFB20030 */ sw $s2, 0x30($sp) -/* B9B548 802400C8 0080902D */ daddu $s2, $a0, $zero -/* B9B54C 802400CC AFB1002C */ sw $s1, 0x2c($sp) -/* B9B550 802400D0 3C118024 */ lui $s1, 0x8024 -/* B9B554 802400D4 263124E0 */ addiu $s1, $s1, 0x24e0 -/* B9B558 802400D8 AFBF0040 */ sw $ra, 0x40($sp) -/* B9B55C 802400DC AFB00028 */ sw $s0, 0x28($sp) -/* B9B560 802400E0 F7BE0070 */ sdc1 $f30, 0x70($sp) -/* B9B564 802400E4 F7BC0068 */ sdc1 $f28, 0x68($sp) -/* B9B568 802400E8 F7BA0060 */ sdc1 $f26, 0x60($sp) -/* B9B56C 802400EC F7B80058 */ sdc1 $f24, 0x58($sp) -/* B9B570 802400F0 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B9B574 802400F4 4600B006 */ mov.s $f0, $f22 -/* B9B578 802400F8 4600B406 */ mov.s $f16, $f22 -/* B9B57C 802400FC 4600B506 */ mov.s $f20, $f22 -/* B9B580 80240100 4600A786 */ mov.s $f30, $f20 -/* B9B584 80240104 4600A086 */ mov.s $f2, $f20 -/* B9B588 80240108 4600A606 */ mov.s $f24, $f20 -/* B9B58C 8024010C 4600A686 */ mov.s $f26, $f20 -/* B9B590 80240110 4600A706 */ mov.s $f28, $f20 -.L80240114: -/* B9B594 80240114 24020006 */ addiu $v0, $zero, 6 -/* B9B598 80240118 8E460000 */ lw $a2, ($s2) -/* B9B59C 8024011C 8E470004 */ lw $a3, 4($s2) -/* B9B5A0 80240120 00061E02 */ srl $v1, $a2, 0x18 -/* B9B5A4 80240124 1062004E */ beq $v1, $v0, .L80240260 -/* B9B5A8 80240128 0000802D */ daddu $s0, $zero, $zero -/* B9B5AC 8024012C 28620007 */ slti $v0, $v1, 7 -/* B9B5B0 80240130 10400007 */ beqz $v0, .L80240150 -/* B9B5B4 80240134 24020001 */ addiu $v0, $zero, 1 -/* B9B5B8 80240138 10620018 */ beq $v1, $v0, .L8024019C -/* B9B5BC 8024013C 24020005 */ addiu $v0, $zero, 5 -/* B9B5C0 80240140 10620029 */ beq $v1, $v0, .L802401E8 -/* B9B5C4 80240144 000713C2 */ srl $v0, $a3, 0xf -/* B9B5C8 80240148 080900C9 */ j .L80240324 -/* B9B5CC 8024014C 00000000 */ nop -.L80240150: -/* B9B5D0 80240150 240200DE */ addiu $v0, $zero, 0xde -/* B9B5D4 80240154 10620005 */ beq $v1, $v0, .L8024016C -/* B9B5D8 80240158 240200DF */ addiu $v0, $zero, 0xdf -/* B9B5DC 8024015C 50620071 */ beql $v1, $v0, .L80240324 -/* B9B5E0 80240160 24100001 */ addiu $s0, $zero, 1 -/* B9B5E4 80240164 080900C9 */ j .L80240324 -/* B9B5E8 80240168 00000000 */ nop -.L8024016C: -/* B9B5EC 8024016C 00E0202D */ daddu $a0, $a3, $zero -/* B9B5F0 80240170 0260282D */ daddu $a1, $s3, $zero -/* B9B5F4 80240174 0280302D */ daddu $a2, $s4, $zero -/* B9B5F8 80240178 02A0382D */ daddu $a3, $s5, $zero -/* B9B5FC 8024017C E7A00018 */ swc1 $f0, 0x18($sp) -/* B9B600 80240180 E7A2001C */ swc1 $f2, 0x1c($sp) -/* B9B604 80240184 0C090028 */ jal func_802400A0 -/* B9B608 80240188 E7B00020 */ swc1 $f16, 0x20($sp) -/* B9B60C 8024018C C7A00018 */ lwc1 $f0, 0x18($sp) -/* B9B610 80240190 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* B9B614 80240194 080900C9 */ j .L80240324 -/* B9B618 80240198 C7B00020 */ lwc1 $f16, 0x20($sp) -.L8024019C: -/* B9B61C 8024019C 00061302 */ srl $v0, $a2, 0xc -/* B9B620 802401A0 304500FF */ andi $a1, $v0, 0xff -/* B9B624 802401A4 0205102B */ sltu $v0, $s0, $a1 -/* B9B628 802401A8 1040005E */ beqz $v0, .L80240324 -/* B9B62C 802401AC 0000182D */ daddu $v1, $zero, $zero -/* B9B630 802401B0 00061042 */ srl $v0, $a2, 1 -/* B9B634 802401B4 3042007F */ andi $v0, $v0, 0x7f -/* B9B638 802401B8 00453023 */ subu $a2, $v0, $a1 -/* B9B63C 802401BC 00E0202D */ daddu $a0, $a3, $zero -.L802401C0: -/* B9B640 802401C0 00C31021 */ addu $v0, $a2, $v1 -/* B9B644 802401C4 00021080 */ sll $v0, $v0, 2 -/* B9B648 802401C8 00511021 */ addu $v0, $v0, $s1 -/* B9B64C 802401CC AC440000 */ sw $a0, ($v0) -/* B9B650 802401D0 24630001 */ addiu $v1, $v1, 1 -/* B9B654 802401D4 0065102B */ sltu $v0, $v1, $a1 -/* B9B658 802401D8 1440FFF9 */ bnez $v0, .L802401C0 -/* B9B65C 802401DC 24840010 */ addiu $a0, $a0, 0x10 -/* B9B660 802401E0 080900C9 */ j .L80240324 -/* B9B664 802401E4 00000000 */ nop -.L802401E8: -/* B9B668 802401E8 304201FC */ andi $v0, $v0, 0x1fc -/* B9B66C 802401EC 00511021 */ addu $v0, $v0, $s1 -/* B9B670 802401F0 8C440000 */ lw $a0, ($v0) -/* B9B674 802401F4 24100002 */ addiu $s0, $zero, 2 -/* B9B678 802401F8 84820000 */ lh $v0, ($a0) -/* B9B67C 802401FC 84830002 */ lh $v1, 2($a0) -/* B9B680 80240200 44828000 */ mtc1 $v0, $f16 -/* B9B684 80240204 00000000 */ nop -/* B9B688 80240208 46808420 */ cvt.s.w $f16, $f16 -/* B9B68C 8024020C 44830000 */ mtc1 $v1, $f0 -/* B9B690 80240210 00000000 */ nop -/* B9B694 80240214 46800020 */ cvt.s.w $f0, $f0 -/* B9B698 80240218 000711C2 */ srl $v0, $a3, 7 -/* B9B69C 8024021C 304201FC */ andi $v0, $v0, 0x1fc -/* B9B6A0 80240220 00511021 */ addu $v0, $v0, $s1 -/* B9B6A4 80240224 84830004 */ lh $v1, 4($a0) -/* B9B6A8 80240228 8C440000 */ lw $a0, ($v0) -/* B9B6AC 8024022C 4483B000 */ mtc1 $v1, $f22 -/* B9B6B0 80240230 00000000 */ nop -/* B9B6B4 80240234 4680B5A0 */ cvt.s.w $f22, $f22 -/* B9B6B8 80240238 84820000 */ lh $v0, ($a0) -/* B9B6BC 8024023C 84830002 */ lh $v1, 2($a0) -/* B9B6C0 80240240 44821000 */ mtc1 $v0, $f2 -/* B9B6C4 80240244 00000000 */ nop -/* B9B6C8 80240248 468010A0 */ cvt.s.w $f2, $f2 -/* B9B6CC 8024024C 4483F000 */ mtc1 $v1, $f30 -/* B9B6D0 80240250 00000000 */ nop -/* B9B6D4 80240254 4680F7A0 */ cvt.s.w $f30, $f30 -/* B9B6D8 80240258 080900B6 */ j .L802402D8 -/* B9B6DC 8024025C 00071040 */ sll $v0, $a3, 1 -.L80240260: -/* B9B6E0 80240260 000613C2 */ srl $v0, $a2, 0xf -/* B9B6E4 80240264 304201FC */ andi $v0, $v0, 0x1fc -/* B9B6E8 80240268 00511021 */ addu $v0, $v0, $s1 -/* B9B6EC 8024026C 8C440000 */ lw $a0, ($v0) -/* B9B6F0 80240270 24100002 */ addiu $s0, $zero, 2 -/* B9B6F4 80240274 84820000 */ lh $v0, ($a0) -/* B9B6F8 80240278 84830002 */ lh $v1, 2($a0) -/* B9B6FC 8024027C 44828000 */ mtc1 $v0, $f16 -/* B9B700 80240280 00000000 */ nop -/* B9B704 80240284 46808420 */ cvt.s.w $f16, $f16 -/* B9B708 80240288 44830000 */ mtc1 $v1, $f0 -/* B9B70C 8024028C 00000000 */ nop -/* B9B710 80240290 46800020 */ cvt.s.w $f0, $f0 -/* B9B714 80240294 000611C2 */ srl $v0, $a2, 7 -/* B9B718 80240298 304201FC */ andi $v0, $v0, 0x1fc -/* B9B71C 8024029C 00511021 */ addu $v0, $v0, $s1 -/* B9B720 802402A0 84830004 */ lh $v1, 4($a0) -/* B9B724 802402A4 8C440000 */ lw $a0, ($v0) -/* B9B728 802402A8 4483B000 */ mtc1 $v1, $f22 -/* B9B72C 802402AC 00000000 */ nop -/* B9B730 802402B0 4680B5A0 */ cvt.s.w $f22, $f22 -/* B9B734 802402B4 84820000 */ lh $v0, ($a0) -/* B9B738 802402B8 84830002 */ lh $v1, 2($a0) -/* B9B73C 802402BC 44821000 */ mtc1 $v0, $f2 -/* B9B740 802402C0 00000000 */ nop -/* B9B744 802402C4 468010A0 */ cvt.s.w $f2, $f2 -/* B9B748 802402C8 4483F000 */ mtc1 $v1, $f30 -/* B9B74C 802402CC 00000000 */ nop -/* B9B750 802402D0 4680F7A0 */ cvt.s.w $f30, $f30 -/* B9B754 802402D4 00061040 */ sll $v0, $a2, 1 -.L802402D8: -/* B9B758 802402D8 304201FC */ andi $v0, $v0, 0x1fc -/* B9B75C 802402DC 00511021 */ addu $v0, $v0, $s1 -/* B9B760 802402E0 84830004 */ lh $v1, 4($a0) -/* B9B764 802402E4 8C420000 */ lw $v0, ($v0) -/* B9B768 802402E8 4483A000 */ mtc1 $v1, $f20 -/* B9B76C 802402EC 00000000 */ nop -/* B9B770 802402F0 4680A520 */ cvt.s.w $f20, $f20 -/* B9B774 802402F4 84440000 */ lh $a0, ($v0) -/* B9B778 802402F8 84430002 */ lh $v1, 2($v0) -/* B9B77C 802402FC 84420004 */ lh $v0, 4($v0) -/* B9B780 80240300 4484E000 */ mtc1 $a0, $f28 -/* B9B784 80240304 00000000 */ nop -/* B9B788 80240308 4680E720 */ cvt.s.w $f28, $f28 -/* B9B78C 8024030C 4483D000 */ mtc1 $v1, $f26 -/* B9B790 80240310 00000000 */ nop -/* B9B794 80240314 4680D6A0 */ cvt.s.w $f26, $f26 -/* B9B798 80240318 4482C000 */ mtc1 $v0, $f24 -/* B9B79C 8024031C 00000000 */ nop -/* B9B7A0 80240320 4680C620 */ cvt.s.w $f24, $f24 -.L80240324: -/* B9B7A4 80240324 1200FF7B */ beqz $s0, .L80240114 -/* B9B7A8 80240328 26520008 */ addiu $s2, $s2, 8 -/* B9B7AC 8024032C 24020002 */ addiu $v0, $zero, 2 -/* B9B7B0 80240330 1602002C */ bne $s0, $v0, .L802403E4 -/* B9B7B4 80240334 00000000 */ nop -/* B9B7B8 80240338 461E0201 */ sub.s $f8, $f0, $f30 -/* B9B7BC 8024033C 4614C181 */ sub.s $f6, $f24, $f20 -/* B9B7C0 80240340 46064382 */ mul.s $f14, $f8, $f6 -/* B9B7C4 80240344 00000000 */ nop -/* B9B7C8 80240348 4614B101 */ sub.s $f4, $f22, $f20 -/* B9B7CC 8024034C 461ED281 */ sub.s $f10, $f26, $f30 -/* B9B7D0 80240350 460A2302 */ mul.s $f12, $f4, $f10 -/* B9B7D4 80240354 00000000 */ nop -/* B9B7D8 80240358 4602E001 */ sub.s $f0, $f28, $f2 -/* B9B7DC 8024035C 46002102 */ mul.s $f4, $f4, $f0 -/* B9B7E0 80240360 00000000 */ nop -/* B9B7E4 80240364 46028081 */ sub.s $f2, $f16, $f2 -/* B9B7E8 80240368 46061182 */ mul.s $f6, $f2, $f6 -/* B9B7EC 8024036C 00000000 */ nop -/* B9B7F0 80240370 460A1082 */ mul.s $f2, $f2, $f10 -/* B9B7F4 80240374 00000000 */ nop -/* B9B7F8 80240378 46004202 */ mul.s $f8, $f8, $f0 -/* B9B7FC 8024037C 00000000 */ nop -/* B9B800 80240380 460C7501 */ sub.s $f20, $f14, $f12 -/* B9B804 80240384 4614A002 */ mul.s $f0, $f20, $f20 -/* B9B808 80240388 00000000 */ nop -/* B9B80C 8024038C 46062581 */ sub.s $f22, $f4, $f6 -/* B9B810 80240390 4616B102 */ mul.s $f4, $f22, $f22 -/* B9B814 80240394 00000000 */ nop -/* B9B818 80240398 46081601 */ sub.s $f24, $f2, $f8 -/* B9B81C 8024039C 4618C082 */ mul.s $f2, $f24, $f24 -/* B9B820 802403A0 00000000 */ nop -/* B9B824 802403A4 46040000 */ add.s $f0, $f0, $f4 -/* B9B828 802403A8 46020300 */ add.s $f12, $f0, $f2 -/* B9B82C 802403AC 46006084 */ sqrt.s $f2, $f12 -/* B9B830 802403B0 46021032 */ c.eq.s $f2, $f2 -/* B9B834 802403B4 00000000 */ nop -/* B9B838 802403B8 45030005 */ bc1tl .L802403D0 -/* B9B83C 802403BC 4602A003 */ div.s $f0, $f20, $f2 -/* B9B840 802403C0 0C0187BC */ jal sqrtf -/* B9B844 802403C4 00000000 */ nop -/* B9B848 802403C8 46000086 */ mov.s $f2, $f0 -/* B9B84C 802403CC 4602A003 */ div.s $f0, $f20, $f2 -.L802403D0: -/* B9B850 802403D0 E6600000 */ swc1 $f0, ($s3) -/* B9B854 802403D4 4602B003 */ div.s $f0, $f22, $f2 -/* B9B858 802403D8 E6800000 */ swc1 $f0, ($s4) -/* B9B85C 802403DC 4602C003 */ div.s $f0, $f24, $f2 -/* B9B860 802403E0 E6A00000 */ swc1 $f0, ($s5) -.L802403E4: -/* B9B864 802403E4 8FBF0040 */ lw $ra, 0x40($sp) -/* B9B868 802403E8 8FB5003C */ lw $s5, 0x3c($sp) -/* B9B86C 802403EC 8FB40038 */ lw $s4, 0x38($sp) -/* B9B870 802403F0 8FB30034 */ lw $s3, 0x34($sp) -/* B9B874 802403F4 8FB20030 */ lw $s2, 0x30($sp) -/* B9B878 802403F8 8FB1002C */ lw $s1, 0x2c($sp) -/* B9B87C 802403FC 8FB00028 */ lw $s0, 0x28($sp) -/* B9B880 80240400 D7BE0070 */ ldc1 $f30, 0x70($sp) -/* B9B884 80240404 D7BC0068 */ ldc1 $f28, 0x68($sp) -/* B9B888 80240408 D7BA0060 */ ldc1 $f26, 0x60($sp) -/* B9B88C 8024040C D7B80058 */ ldc1 $f24, 0x58($sp) -/* B9B890 80240410 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B9B894 80240414 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B9B898 80240418 03E00008 */ jr $ra -/* B9B89C 8024041C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_mim/mim_03/func_80240420_B9B480.s b/asm/nonmatchings/world/area_mim/mim_03/func_80240420_B9B480.s deleted file mode 100644 index f1e8dc2166..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_03/func_80240420_B9B480.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240420_B9B8A0 -/* B9B8A0 80240420 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B9B8A4 80240424 AFB10024 */ sw $s1, 0x24($sp) -/* B9B8A8 80240428 0080882D */ daddu $s1, $a0, $zero -/* B9B8AC 8024042C AFBF0028 */ sw $ra, 0x28($sp) -/* B9B8B0 80240430 AFB00020 */ sw $s0, 0x20($sp) -/* B9B8B4 80240434 F7B60038 */ sdc1 $f22, 0x38($sp) -/* B9B8B8 80240438 F7B40030 */ sdc1 $f20, 0x30($sp) -/* B9B8BC 8024043C 8E30000C */ lw $s0, 0xc($s1) -/* B9B8C0 80240440 8E050000 */ lw $a1, ($s0) -/* B9B8C4 80240444 0C0B1EAF */ jal get_variable -/* B9B8C8 80240448 26100004 */ addiu $s0, $s0, 4 -/* B9B8CC 8024044C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B9B8D0 80240450 0040202D */ daddu $a0, $v0, $zero -/* B9B8D4 80240454 0C046B4C */ jal get_model_from_list_index -/* B9B8D8 80240458 0040202D */ daddu $a0, $v0, $zero -/* B9B8DC 8024045C 8C420008 */ lw $v0, 8($v0) -/* B9B8E0 80240460 27A50010 */ addiu $a1, $sp, 0x10 -/* B9B8E4 80240464 8C420004 */ lw $v0, 4($v0) -/* B9B8E8 80240468 27A60014 */ addiu $a2, $sp, 0x14 -/* B9B8EC 8024046C 8C440000 */ lw $a0, ($v0) -/* B9B8F0 80240470 0C090028 */ jal func_802400A0 -/* B9B8F4 80240474 27A70018 */ addiu $a3, $sp, 0x18 -/* B9B8F8 80240478 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B9B8FC 8024047C 3C014480 */ lui $at, 0x4480 -/* B9B900 80240480 4481A000 */ mtc1 $at, $f20 -/* B9B904 80240484 00000000 */ nop -/* B9B908 80240488 46140002 */ mul.s $f0, $f0, $f20 -/* B9B90C 8024048C 00000000 */ nop -/* B9B910 80240490 3C01CD5B */ lui $at, 0xcd5b -/* B9B914 80240494 34215858 */ ori $at, $at, 0x5858 -/* B9B918 80240498 4481B000 */ mtc1 $at, $f22 -/* B9B91C 8024049C 00000000 */ nop -/* B9B920 802404A0 46160000 */ add.s $f0, $f0, $f22 -/* B9B924 802404A4 8E050000 */ lw $a1, ($s0) -/* B9B928 802404A8 4600008D */ trunc.w.s $f2, $f0 -/* B9B92C 802404AC 44061000 */ mfc1 $a2, $f2 -/* B9B930 802404B0 0C0B2026 */ jal set_variable -/* B9B934 802404B4 0220202D */ daddu $a0, $s1, $zero -/* B9B938 802404B8 C7A00014 */ lwc1 $f0, 0x14($sp) -/* B9B93C 802404BC 46140002 */ mul.s $f0, $f0, $f20 -/* B9B940 802404C0 00000000 */ nop -/* B9B944 802404C4 26100004 */ addiu $s0, $s0, 4 -/* B9B948 802404C8 46160000 */ add.s $f0, $f0, $f22 -/* B9B94C 802404CC 8E050000 */ lw $a1, ($s0) -/* B9B950 802404D0 4600008D */ trunc.w.s $f2, $f0 -/* B9B954 802404D4 44061000 */ mfc1 $a2, $f2 -/* B9B958 802404D8 0C0B2026 */ jal set_variable -/* B9B95C 802404DC 0220202D */ daddu $a0, $s1, $zero -/* B9B960 802404E0 C7A00018 */ lwc1 $f0, 0x18($sp) -/* B9B964 802404E4 46140002 */ mul.s $f0, $f0, $f20 -/* B9B968 802404E8 00000000 */ nop -/* B9B96C 802404EC 26100004 */ addiu $s0, $s0, 4 -/* B9B970 802404F0 46160000 */ add.s $f0, $f0, $f22 -/* B9B974 802404F4 8E050000 */ lw $a1, ($s0) -/* B9B978 802404F8 4600008D */ trunc.w.s $f2, $f0 -/* B9B97C 802404FC 44061000 */ mfc1 $a2, $f2 -/* B9B980 80240500 0C0B2026 */ jal set_variable -/* B9B984 80240504 0220202D */ daddu $a0, $s1, $zero -/* B9B988 80240508 8FBF0028 */ lw $ra, 0x28($sp) -/* B9B98C 8024050C 8FB10024 */ lw $s1, 0x24($sp) -/* B9B990 80240510 8FB00020 */ lw $s0, 0x20($sp) -/* B9B994 80240514 D7B60038 */ ldc1 $f22, 0x38($sp) -/* B9B998 80240518 D7B40030 */ ldc1 $f20, 0x30($sp) -/* B9B99C 8024051C 24020002 */ addiu $v0, $zero, 2 -/* B9B9A0 80240520 03E00008 */ jr $ra -/* B9B9A4 80240524 27BD0040 */ addiu $sp, $sp, 0x40 -/* B9B9A8 80240528 00000000 */ nop -/* B9B9AC 8024052C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_04/func_80240070_B9D960.s b/asm/nonmatchings/world/area_mim/mim_04/func_80240070_B9D960.s deleted file mode 100644 index 69fca9d0de..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_04/func_80240070_B9D960.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_B9D9D0 -/* B9D9D0 80240070 3C058024 */ lui $a1, 0x8024 -/* B9D9D4 80240074 24A51530 */ addiu $a1, $a1, 0x1530 -/* B9D9D8 80240078 8CA30000 */ lw $v1, ($a1) -/* B9D9DC 8024007C 24040002 */ addiu $a0, $zero, 2 -/* B9D9E0 80240080 10640012 */ beq $v1, $a0, .L802400CC -/* B9D9E4 80240084 28620003 */ slti $v0, $v1, 3 -/* B9D9E8 80240088 10400005 */ beqz $v0, .L802400A0 -/* B9D9EC 8024008C 24020001 */ addiu $v0, $zero, 1 -/* B9D9F0 80240090 1062000A */ beq $v1, $v0, .L802400BC -/* B9D9F4 80240094 3C02E300 */ lui $v0, 0xe300 -/* B9D9F8 80240098 08090057 */ j .L8024015C -/* B9D9FC 8024009C 34420A01 */ ori $v0, $v0, 0xa01 -.L802400A0: -/* B9DA00 802400A0 24020003 */ addiu $v0, $zero, 3 -/* B9DA04 802400A4 10620019 */ beq $v1, $v0, .L8024010C -/* B9DA08 802400A8 24020004 */ addiu $v0, $zero, 4 -/* B9DA0C 802400AC 10620021 */ beq $v1, $v0, .L80240134 -/* B9DA10 802400B0 3C02E300 */ lui $v0, 0xe300 -/* B9DA14 802400B4 08090057 */ j .L8024015C -/* B9DA18 802400B8 34420A01 */ ori $v0, $v0, 0xa01 -.L802400BC: -/* B9DA1C 802400BC 3C018024 */ lui $at, 0x8024 -/* B9DA20 802400C0 AC201538 */ sw $zero, 0x1538($at) -/* B9DA24 802400C4 08090055 */ j .L80240154 -/* B9DA28 802400C8 ACA40000 */ sw $a0, ($a1) -.L802400CC: -/* B9DA2C 802400CC 3C038024 */ lui $v1, 0x8024 -/* B9DA30 802400D0 24631538 */ addiu $v1, $v1, 0x1538 -/* B9DA34 802400D4 8C620000 */ lw $v0, ($v1) -/* B9DA38 802400D8 2442000A */ addiu $v0, $v0, 0xa -/* B9DA3C 802400DC AC620000 */ sw $v0, ($v1) -/* B9DA40 802400E0 28420100 */ slti $v0, $v0, 0x100 -/* B9DA44 802400E4 1440001C */ bnez $v0, .L80240158 -/* B9DA48 802400E8 3C02E300 */ lui $v0, 0xe300 -/* B9DA4C 802400EC 240200FF */ addiu $v0, $zero, 0xff -/* B9DA50 802400F0 AC620000 */ sw $v0, ($v1) -/* B9DA54 802400F4 24020014 */ addiu $v0, $zero, 0x14 -/* B9DA58 802400F8 3C018024 */ lui $at, 0x8024 -/* B9DA5C 802400FC AC221534 */ sw $v0, 0x1534($at) -/* B9DA60 80240100 24020003 */ addiu $v0, $zero, 3 -/* B9DA64 80240104 08090055 */ j .L80240154 -/* B9DA68 80240108 ACA20000 */ sw $v0, ($a1) -.L8024010C: -/* B9DA6C 8024010C 3C038024 */ lui $v1, 0x8024 -/* B9DA70 80240110 24631534 */ addiu $v1, $v1, 0x1534 -/* B9DA74 80240114 8C620000 */ lw $v0, ($v1) -/* B9DA78 80240118 2442FFFF */ addiu $v0, $v0, -1 -/* B9DA7C 8024011C 0441000D */ bgez $v0, .L80240154 -/* B9DA80 80240120 AC620000 */ sw $v0, ($v1) -/* B9DA84 80240124 24020004 */ addiu $v0, $zero, 4 -/* B9DA88 80240128 AC600000 */ sw $zero, ($v1) -/* B9DA8C 8024012C 08090055 */ j .L80240154 -/* B9DA90 80240130 ACA20000 */ sw $v0, ($a1) -.L80240134: -/* B9DA94 80240134 3C038024 */ lui $v1, 0x8024 -/* B9DA98 80240138 24631538 */ addiu $v1, $v1, 0x1538 -/* B9DA9C 8024013C 8C620000 */ lw $v0, ($v1) -/* B9DAA0 80240140 2442FFF6 */ addiu $v0, $v0, -0xa -/* B9DAA4 80240144 04410003 */ bgez $v0, .L80240154 -/* B9DAA8 80240148 AC620000 */ sw $v0, ($v1) -/* B9DAAC 8024014C AC600000 */ sw $zero, ($v1) -/* B9DAB0 80240150 ACA00000 */ sw $zero, ($a1) -.L80240154: -/* B9DAB4 80240154 3C02E300 */ lui $v0, 0xe300 -.L80240158: -/* B9DAB8 80240158 34420A01 */ ori $v0, $v0, 0xa01 -.L8024015C: -/* B9DABC 8024015C 3C06FC12 */ lui $a2, 0xfc12 -/* B9DAC0 80240160 34C6160A */ ori $a2, $a2, 0x160a -/* B9DAC4 80240164 3C08E200 */ lui $t0, 0xe200 -/* B9DAC8 80240168 3508001C */ ori $t0, $t0, 0x1c -/* B9DACC 8024016C 3C07C810 */ lui $a3, 0xc810 -/* B9DAD0 80240170 3C05800A */ lui $a1, 0x800a -/* B9DAD4 80240174 24A5A66C */ addiu $a1, $a1, -0x5994 -/* B9DAD8 80240178 8CA30000 */ lw $v1, ($a1) -/* B9DADC 8024017C 34E74DD8 */ ori $a3, $a3, 0x4dd8 -/* B9DAE0 80240180 0060202D */ daddu $a0, $v1, $zero -/* B9DAE4 80240184 24630008 */ addiu $v1, $v1, 8 -/* B9DAE8 80240188 ACA30000 */ sw $v1, ($a1) -/* B9DAEC 8024018C AC820000 */ sw $v0, ($a0) -/* B9DAF0 80240190 3C020010 */ lui $v0, 0x10 -/* B9DAF4 80240194 AC820004 */ sw $v0, 4($a0) -/* B9DAF8 80240198 24620008 */ addiu $v0, $v1, 8 -/* B9DAFC 8024019C ACA20000 */ sw $v0, ($a1) -/* B9DB00 802401A0 3C048024 */ lui $a0, 0x8024 -/* B9DB04 802401A4 9084153B */ lbu $a0, 0x153b($a0) -/* B9DB08 802401A8 3C02FA00 */ lui $v0, 0xfa00 -/* B9DB0C 802401AC AC620000 */ sw $v0, ($v1) -/* B9DB10 802401B0 24620010 */ addiu $v0, $v1, 0x10 -/* B9DB14 802401B4 AC640004 */ sw $a0, 4($v1) -/* B9DB18 802401B8 ACA20000 */ sw $v0, ($a1) -/* B9DB1C 802401BC 2402FFF8 */ addiu $v0, $zero, -8 -/* B9DB20 802401C0 AC62000C */ sw $v0, 0xc($v1) -/* B9DB24 802401C4 24620018 */ addiu $v0, $v1, 0x18 -/* B9DB28 802401C8 AC660008 */ sw $a2, 8($v1) -/* B9DB2C 802401CC ACA20000 */ sw $v0, ($a1) -/* B9DB30 802401D0 AC680010 */ sw $t0, 0x10($v1) -/* B9DB34 802401D4 03E00008 */ jr $ra -/* B9DB38 802401D8 AC670014 */ sw $a3, 0x14($v1) diff --git a/asm/nonmatchings/world/area_mim/mim_04/func_802401DC_B9D960.s b/asm/nonmatchings/world/area_mim/mim_04/func_802401DC_B9D960.s deleted file mode 100644 index 2a4c6fd79a..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_04/func_802401DC_B9D960.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401DC_B9DB3C -/* B9DB3C 802401DC 3C038024 */ lui $v1, 0x8024 -/* B9DB40 802401E0 24631530 */ addiu $v1, $v1, 0x1530 -/* B9DB44 802401E4 8C620000 */ lw $v0, ($v1) -/* B9DB48 802401E8 14400002 */ bnez $v0, .L802401F4 -/* B9DB4C 802401EC 24020001 */ addiu $v0, $zero, 1 -/* B9DB50 802401F0 AC620000 */ sw $v0, ($v1) -.L802401F4: -/* B9DB54 802401F4 03E00008 */ jr $ra -/* B9DB58 802401F8 24020002 */ addiu $v0, $zero, 2 -/* B9DB5C 802401FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_04/func_80240200_B9D960.s b/asm/nonmatchings/world/area_mim/mim_04/func_80240200_B9D960.s deleted file mode 100644 index 7c50beab29..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_04/func_80240200_B9D960.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240200_B9DB60 -/* B9DB60 80240200 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B9DB64 80240204 AFB00030 */ sw $s0, 0x30($sp) -/* B9DB68 80240208 0080802D */ daddu $s0, $a0, $zero -/* B9DB6C 8024020C AFBF0040 */ sw $ra, 0x40($sp) -/* B9DB70 80240210 AFB3003C */ sw $s3, 0x3c($sp) -/* B9DB74 80240214 AFB20038 */ sw $s2, 0x38($sp) -/* B9DB78 80240218 AFB10034 */ sw $s1, 0x34($sp) -/* B9DB7C 8024021C F7B60050 */ sdc1 $f22, 0x50($sp) -/* B9DB80 80240220 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B9DB84 80240224 8E130148 */ lw $s3, 0x148($s0) -/* B9DB88 80240228 00A0882D */ daddu $s1, $a1, $zero -/* B9DB8C 8024022C 86640008 */ lh $a0, 8($s3) -/* B9DB90 80240230 0C00EABB */ jal get_npc_unsafe -/* B9DB94 80240234 00C0902D */ daddu $s2, $a2, $zero -/* B9DB98 80240238 0200202D */ daddu $a0, $s0, $zero -/* B9DB9C 8024023C 0220282D */ daddu $a1, $s1, $zero -/* B9DBA0 80240240 0240302D */ daddu $a2, $s2, $zero -/* B9DBA4 80240244 0C012568 */ jal func_800495A0 -/* B9DBA8 80240248 0040802D */ daddu $s0, $v0, $zero -/* B9DBAC 8024024C 8E020000 */ lw $v0, ($s0) -/* B9DBB0 80240250 2404002D */ addiu $a0, $zero, 0x2d -/* B9DBB4 80240254 34420800 */ ori $v0, $v0, 0x800 -/* B9DBB8 80240258 0C00A67F */ jal rand_int -/* B9DBBC 8024025C AE020000 */ sw $v0, ($s0) -/* B9DBC0 80240260 0200202D */ daddu $a0, $s0, $zero -/* B9DBC4 80240264 3C05B000 */ lui $a1, 0xb000 -/* B9DBC8 80240268 34A50017 */ ori $a1, $a1, 0x17 -/* B9DBCC 8024026C 44820000 */ mtc1 $v0, $f0 -/* B9DBD0 80240270 00000000 */ nop -/* B9DBD4 80240274 46800021 */ cvt.d.w $f0, $f0 -/* B9DBD8 80240278 3C014024 */ lui $at, 0x4024 -/* B9DBDC 8024027C 44811800 */ mtc1 $at, $f3 -/* B9DBE0 80240280 44801000 */ mtc1 $zero, $f2 -/* B9DBE4 80240284 3C014020 */ lui $at, 0x4020 -/* B9DBE8 80240288 44812800 */ mtc1 $at, $f5 -/* B9DBEC 8024028C 44802000 */ mtc1 $zero, $f4 -/* B9DBF0 80240290 46220003 */ div.d $f0, $f0, $f2 -/* B9DBF4 80240294 46240000 */ add.d $f0, $f0, $f4 -/* B9DBF8 80240298 3C013FC0 */ lui $at, 0x3fc0 -/* B9DBFC 8024029C 44811000 */ mtc1 $at, $f2 -/* B9DC00 802402A0 0000302D */ daddu $a2, $zero, $zero -/* B9DC04 802402A4 E6020014 */ swc1 $f2, 0x14($s0) -/* B9DC08 802402A8 46200020 */ cvt.s.d $f0, $f0 -/* B9DC0C 802402AC 0C012530 */ jal func_800494C0 -/* B9DC10 802402B0 E600001C */ swc1 $f0, 0x1c($s0) -/* B9DC14 802402B4 8E6300D0 */ lw $v1, 0xd0($s3) -/* B9DC18 802402B8 C6000040 */ lwc1 $f0, 0x40($s0) -/* B9DC1C 802402BC C4620000 */ lwc1 $f2, ($v1) -/* B9DC20 802402C0 468010A0 */ cvt.s.w $f2, $f2 -/* B9DC24 802402C4 C4640008 */ lwc1 $f4, 8($v1) -/* B9DC28 802402C8 46802120 */ cvt.s.w $f4, $f4 -/* B9DC2C 802402CC E7A00010 */ swc1 $f0, 0x10($sp) -/* B9DC30 802402D0 8E6200D0 */ lw $v0, 0xd0($s3) -/* B9DC34 802402D4 44051000 */ mfc1 $a1, $f2 -/* B9DC38 802402D8 C440000C */ lwc1 $f0, 0xc($v0) -/* B9DC3C 802402DC 46800020 */ cvt.s.w $f0, $f0 -/* B9DC40 802402E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* B9DC44 802402E4 8E6200D0 */ lw $v0, 0xd0($s3) -/* B9DC48 802402E8 44062000 */ mfc1 $a2, $f4 -/* B9DC4C 802402EC C4400010 */ lwc1 $f0, 0x10($v0) -/* B9DC50 802402F0 46800020 */ cvt.s.w $f0, $f0 -/* B9DC54 802402F4 E7A00018 */ swc1 $f0, 0x18($sp) -/* B9DC58 802402F8 8C640018 */ lw $a0, 0x18($v1) -/* B9DC5C 802402FC 0C0123F5 */ jal is_point_within_region -/* B9DC60 80240300 8E070038 */ lw $a3, 0x38($s0) -/* B9DC64 80240304 10400035 */ beqz $v0, .L802403DC -/* B9DC68 80240308 00000000 */ nop -/* B9DC6C 8024030C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B9DC70 80240310 3C0141C8 */ lui $at, 0x41c8 -/* B9DC74 80240314 4481B000 */ mtc1 $at, $f22 -/* B9DC78 80240318 8E6200D0 */ lw $v0, 0xd0($s3) -/* B9DC7C 8024031C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B9DC80 80240320 C4480000 */ lwc1 $f8, ($v0) -/* B9DC84 80240324 46804220 */ cvt.s.w $f8, $f8 -/* B9DC88 80240328 44064000 */ mfc1 $a2, $f8 -/* B9DC8C 8024032C C4480008 */ lwc1 $f8, 8($v0) -/* B9DC90 80240330 46804220 */ cvt.s.w $f8, $f8 -/* B9DC94 80240334 44074000 */ mfc1 $a3, $f8 -/* B9DC98 80240338 3C01403E */ lui $at, 0x403e -/* B9DC9C 8024033C 4481A800 */ mtc1 $at, $f21 -/* B9DCA0 80240340 4480A000 */ mtc1 $zero, $f20 -/* B9DCA4 80240344 0C00A720 */ jal atan2 -/* B9DCA8 80240348 0000882D */ daddu $s1, $zero, $zero -/* B9DCAC 8024034C C6020038 */ lwc1 $f2, 0x38($s0) -/* B9DCB0 80240350 C604003C */ lwc1 $f4, 0x3c($s0) -/* B9DCB4 80240354 C6060040 */ lwc1 $f6, 0x40($s0) -/* B9DCB8 80240358 E600000C */ swc1 $f0, 0xc($s0) -/* B9DCBC 8024035C E7A20020 */ swc1 $f2, 0x20($sp) -/* B9DCC0 80240360 E7A40024 */ swc1 $f4, 0x24($sp) -/* B9DCC4 80240364 E7A60028 */ swc1 $f6, 0x28($sp) -.L80240368: -/* B9DCC8 80240368 E7B60010 */ swc1 $f22, 0x10($sp) -/* B9DCCC 8024036C C600000C */ lwc1 $f0, 0xc($s0) -/* B9DCD0 80240370 E7A00014 */ swc1 $f0, 0x14($sp) -/* B9DCD4 80240374 860200A8 */ lh $v0, 0xa8($s0) -/* B9DCD8 80240378 27A50020 */ addiu $a1, $sp, 0x20 -/* B9DCDC 8024037C 44820000 */ mtc1 $v0, $f0 -/* B9DCE0 80240380 00000000 */ nop -/* B9DCE4 80240384 46800020 */ cvt.s.w $f0, $f0 -/* B9DCE8 80240388 E7A00018 */ swc1 $f0, 0x18($sp) -/* B9DCEC 8024038C 860200A6 */ lh $v0, 0xa6($s0) -/* B9DCF0 80240390 27A60024 */ addiu $a2, $sp, 0x24 -/* B9DCF4 80240394 44820000 */ mtc1 $v0, $f0 -/* B9DCF8 80240398 00000000 */ nop -/* B9DCFC 8024039C 46800020 */ cvt.s.w $f0, $f0 -/* B9DD00 802403A0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B9DD04 802403A4 8E040080 */ lw $a0, 0x80($s0) -/* B9DD08 802403A8 0C037711 */ jal func_800DDC44 -/* B9DD0C 802403AC 27A70028 */ addiu $a3, $sp, 0x28 -/* B9DD10 802403B0 10400016 */ beqz $v0, .L8024040C -/* B9DD14 802403B4 26310001 */ addiu $s1, $s1, 1 -/* B9DD18 802403B8 C600000C */ lwc1 $f0, 0xc($s0) -/* B9DD1C 802403BC 46000021 */ cvt.d.s $f0, $f0 -/* B9DD20 802403C0 46340000 */ add.d $f0, $f0, $f20 -/* B9DD24 802403C4 2A220006 */ slti $v0, $s1, 6 -/* B9DD28 802403C8 46200020 */ cvt.s.d $f0, $f0 -/* B9DD2C 802403CC 1440FFE6 */ bnez $v0, .L80240368 -/* B9DD30 802403D0 E600000C */ swc1 $f0, 0xc($s0) -/* B9DD34 802403D4 08090103 */ j .L8024040C -/* B9DD38 802403D8 00000000 */ nop -.L802403DC: -/* B9DD3C 802403DC 0C00A67F */ jal rand_int -/* B9DD40 802403E0 2404003C */ addiu $a0, $zero, 0x3c -/* B9DD44 802403E4 C60C000C */ lwc1 $f12, 0xc($s0) -/* B9DD48 802403E8 44820000 */ mtc1 $v0, $f0 -/* B9DD4C 802403EC 00000000 */ nop -/* B9DD50 802403F0 46800020 */ cvt.s.w $f0, $f0 -/* B9DD54 802403F4 46006300 */ add.s $f12, $f12, $f0 -/* B9DD58 802403F8 3C0141F0 */ lui $at, 0x41f0 -/* B9DD5C 802403FC 44810000 */ mtc1 $at, $f0 -/* B9DD60 80240400 0C00A6C9 */ jal clamp_angle -/* B9DD64 80240404 46006301 */ sub.s $f12, $f12, $f0 -/* B9DD68 80240408 E600000C */ swc1 $f0, 0xc($s0) -.L8024040C: -/* B9DD6C 8024040C 8FBF0040 */ lw $ra, 0x40($sp) -/* B9DD70 80240410 8FB3003C */ lw $s3, 0x3c($sp) -/* B9DD74 80240414 8FB20038 */ lw $s2, 0x38($sp) -/* B9DD78 80240418 8FB10034 */ lw $s1, 0x34($sp) -/* B9DD7C 8024041C 8FB00030 */ lw $s0, 0x30($sp) -/* B9DD80 80240420 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B9DD84 80240424 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B9DD88 80240428 03E00008 */ jr $ra -/* B9DD8C 8024042C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_mim/mim_04/func_80240430_B9D960.s b/asm/nonmatchings/world/area_mim/mim_04/func_80240430_B9D960.s deleted file mode 100644 index 1d5eb50aaa..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_04/func_80240430_B9D960.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240430_B9DD90 -/* B9DD90 80240430 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* B9DD94 80240434 AFB3004C */ sw $s3, 0x4c($sp) -/* B9DD98 80240438 0080982D */ daddu $s3, $a0, $zero -/* B9DD9C 8024043C AFBF0054 */ sw $ra, 0x54($sp) -/* B9DDA0 80240440 AFB40050 */ sw $s4, 0x50($sp) -/* B9DDA4 80240444 AFB20048 */ sw $s2, 0x48($sp) -/* B9DDA8 80240448 AFB10044 */ sw $s1, 0x44($sp) -/* B9DDAC 8024044C AFB00040 */ sw $s0, 0x40($sp) -/* B9DDB0 80240450 F7B40058 */ sdc1 $f20, 0x58($sp) -/* B9DDB4 80240454 8E710148 */ lw $s1, 0x148($s3) -/* B9DDB8 80240458 00A0A02D */ daddu $s4, $a1, $zero -/* B9DDBC 8024045C 86240008 */ lh $a0, 8($s1) -/* B9DDC0 80240460 0C00EABB */ jal get_npc_unsafe -/* B9DDC4 80240464 00C0902D */ daddu $s2, $a2, $zero -/* B9DDC8 80240468 8E830014 */ lw $v1, 0x14($s4) -/* B9DDCC 8024046C 04600034 */ bltz $v1, .L80240540 -/* B9DDD0 80240470 0040802D */ daddu $s0, $v0, $zero -/* B9DDD4 80240474 8E620074 */ lw $v0, 0x74($s3) -/* B9DDD8 80240478 1C400030 */ bgtz $v0, .L8024053C -/* B9DDDC 8024047C 2442FFFF */ addiu $v0, $v0, -1 -/* B9DDE0 80240480 0240202D */ daddu $a0, $s2, $zero -/* B9DDE4 80240484 AE630074 */ sw $v1, 0x74($s3) -/* B9DDE8 80240488 AFA00010 */ sw $zero, 0x10($sp) -/* B9DDEC 8024048C 8E86000C */ lw $a2, 0xc($s4) -/* B9DDF0 80240490 8E870010 */ lw $a3, 0x10($s4) -/* B9DDF4 80240494 0C01242D */ jal func_800490B4 -/* B9DDF8 80240498 0220282D */ daddu $a1, $s1, $zero -/* B9DDFC 8024049C 10400025 */ beqz $v0, .L80240534 -/* B9DE00 802404A0 0000202D */ daddu $a0, $zero, $zero -/* B9DE04 802404A4 0200282D */ daddu $a1, $s0, $zero -/* B9DE08 802404A8 0000302D */ daddu $a2, $zero, $zero -/* B9DE0C 802404AC 860300A8 */ lh $v1, 0xa8($s0) -/* B9DE10 802404B0 3C013F80 */ lui $at, 0x3f80 -/* B9DE14 802404B4 44810000 */ mtc1 $at, $f0 -/* B9DE18 802404B8 3C014000 */ lui $at, 0x4000 -/* B9DE1C 802404BC 44811000 */ mtc1 $at, $f2 -/* B9DE20 802404C0 3C01C1A0 */ lui $at, 0xc1a0 -/* B9DE24 802404C4 44812000 */ mtc1 $at, $f4 -/* B9DE28 802404C8 2402000F */ addiu $v0, $zero, 0xf -/* B9DE2C 802404CC AFA2001C */ sw $v0, 0x1c($sp) -/* B9DE30 802404D0 44835000 */ mtc1 $v1, $f10 -/* B9DE34 802404D4 00000000 */ nop -/* B9DE38 802404D8 468052A0 */ cvt.s.w $f10, $f10 -/* B9DE3C 802404DC 44075000 */ mfc1 $a3, $f10 -/* B9DE40 802404E0 27A20028 */ addiu $v0, $sp, 0x28 -/* B9DE44 802404E4 AFA20020 */ sw $v0, 0x20($sp) -/* B9DE48 802404E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* B9DE4C 802404EC E7A20014 */ swc1 $f2, 0x14($sp) -/* B9DE50 802404F0 0C01BFA4 */ jal fx_emote -/* B9DE54 802404F4 E7A40018 */ swc1 $f4, 0x18($sp) -/* B9DE58 802404F8 0200202D */ daddu $a0, $s0, $zero -/* B9DE5C 802404FC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B9DE60 80240500 0C012530 */ jal func_800494C0 -/* B9DE64 80240504 3C060020 */ lui $a2, 0x20 -/* B9DE68 80240508 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B9DE6C 8024050C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B9DE70 80240510 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B9DE74 80240514 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B9DE78 80240518 8C460028 */ lw $a2, 0x28($v0) -/* B9DE7C 8024051C 0C00A720 */ jal atan2 -/* B9DE80 80240520 8C470030 */ lw $a3, 0x30($v0) -/* B9DE84 80240524 2402000C */ addiu $v0, $zero, 0xc -/* B9DE88 80240528 E600000C */ swc1 $f0, 0xc($s0) -/* B9DE8C 8024052C 080901D1 */ j .L80240744 -/* B9DE90 80240530 AE620070 */ sw $v0, 0x70($s3) -.L80240534: -/* B9DE94 80240534 8E620074 */ lw $v0, 0x74($s3) -/* B9DE98 80240538 2442FFFF */ addiu $v0, $v0, -1 -.L8024053C: -/* B9DE9C 8024053C AE620074 */ sw $v0, 0x74($s3) -.L80240540: -/* B9DEA0 80240540 C6000018 */ lwc1 $f0, 0x18($s0) -/* B9DEA4 80240544 44801000 */ mtc1 $zero, $f2 -/* B9DEA8 80240548 44801800 */ mtc1 $zero, $f3 -/* B9DEAC 8024054C 46000021 */ cvt.d.s $f0, $f0 -/* B9DEB0 80240550 4620103C */ c.lt.d $f2, $f0 -/* B9DEB4 80240554 00000000 */ nop -/* B9DEB8 80240558 45000025 */ bc1f .L802405F0 -/* B9DEBC 8024055C 27A5002C */ addiu $a1, $sp, 0x2c -/* B9DEC0 80240560 C6000038 */ lwc1 $f0, 0x38($s0) -/* B9DEC4 80240564 860200A6 */ lh $v0, 0xa6($s0) -/* B9DEC8 80240568 3C018024 */ lui $at, 0x8024 -/* B9DECC 8024056C D4222D80 */ ldc1 $f2, 0x2d80($at) -/* B9DED0 80240570 27A60030 */ addiu $a2, $sp, 0x30 -/* B9DED4 80240574 E7A0002C */ swc1 $f0, 0x2c($sp) -/* B9DED8 80240578 44820000 */ mtc1 $v0, $f0 -/* B9DEDC 8024057C 00000000 */ nop -/* B9DEE0 80240580 46800020 */ cvt.s.w $f0, $f0 -/* B9DEE4 80240584 46000021 */ cvt.d.s $f0, $f0 -/* B9DEE8 80240588 C604003C */ lwc1 $f4, 0x3c($s0) -/* B9DEEC 8024058C C6060040 */ lwc1 $f6, 0x40($s0) -/* B9DEF0 80240590 C6080018 */ lwc1 $f8, 0x18($s0) -/* B9DEF4 80240594 860200A8 */ lh $v0, 0xa8($s0) -/* B9DEF8 80240598 46220002 */ mul.d $f0, $f0, $f2 -/* B9DEFC 8024059C 00000000 */ nop -/* B9DF00 802405A0 E7A40030 */ swc1 $f4, 0x30($sp) -/* B9DF04 802405A4 E7A60034 */ swc1 $f6, 0x34($sp) -/* B9DF08 802405A8 E7A80010 */ swc1 $f8, 0x10($sp) -/* B9DF0C 802405AC C604000C */ lwc1 $f4, 0xc($s0) -/* B9DF10 802405B0 44821000 */ mtc1 $v0, $f2 -/* B9DF14 802405B4 00000000 */ nop -/* B9DF18 802405B8 468010A0 */ cvt.s.w $f2, $f2 -/* B9DF1C 802405BC E7A20018 */ swc1 $f2, 0x18($sp) -/* B9DF20 802405C0 E7A40014 */ swc1 $f4, 0x14($sp) -/* B9DF24 802405C4 46200020 */ cvt.s.d $f0, $f0 -/* B9DF28 802405C8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B9DF2C 802405CC 8E040080 */ lw $a0, 0x80($s0) -/* B9DF30 802405D0 0C037711 */ jal func_800DDC44 -/* B9DF34 802405D4 27A70034 */ addiu $a3, $sp, 0x34 -/* B9DF38 802405D8 54400005 */ bnel $v0, $zero, .L802405F0 -/* B9DF3C 802405DC AE000018 */ sw $zero, 0x18($s0) -/* B9DF40 802405E0 8E050018 */ lw $a1, 0x18($s0) -/* B9DF44 802405E4 8E06000C */ lw $a2, 0xc($s0) -/* B9DF48 802405E8 0C00EA95 */ jal npc_move_heading -/* B9DF4C 802405EC 0200202D */ daddu $a0, $s0, $zero -.L802405F0: -/* B9DF50 802405F0 C600001C */ lwc1 $f0, 0x1c($s0) -/* B9DF54 802405F4 44801000 */ mtc1 $zero, $f2 -/* B9DF58 802405F8 44801800 */ mtc1 $zero, $f3 -/* B9DF5C 802405FC 46000021 */ cvt.d.s $f0, $f0 -/* B9DF60 80240600 4622003C */ c.lt.d $f0, $f2 -/* B9DF64 80240604 00000000 */ nop -/* B9DF68 80240608 45000047 */ bc1f .L80240728 -/* B9DF6C 8024060C 27A5002C */ addiu $a1, $sp, 0x2c -/* B9DF70 80240610 27A60030 */ addiu $a2, $sp, 0x30 -/* B9DF74 80240614 27A20038 */ addiu $v0, $sp, 0x38 -/* B9DF78 80240618 C602003C */ lwc1 $f2, 0x3c($s0) -/* B9DF7C 8024061C C6060038 */ lwc1 $f6, 0x38($s0) -/* B9DF80 80240620 3C01402A */ lui $at, 0x402a -/* B9DF84 80240624 4481A800 */ mtc1 $at, $f21 -/* B9DF88 80240628 4480A000 */ mtc1 $zero, $f20 -/* B9DF8C 8024062C 460010A1 */ cvt.d.s $f2, $f2 -/* B9DF90 80240630 46341080 */ add.d $f2, $f2, $f20 -/* B9DF94 80240634 C600001C */ lwc1 $f0, 0x1c($s0) -/* B9DF98 80240638 C6040040 */ lwc1 $f4, 0x40($s0) -/* B9DF9C 8024063C 46000005 */ abs.s $f0, $f0 -/* B9DFA0 80240640 E7A40034 */ swc1 $f4, 0x34($sp) -/* B9DFA4 80240644 3C014030 */ lui $at, 0x4030 -/* B9DFA8 80240648 44812800 */ mtc1 $at, $f5 -/* B9DFAC 8024064C 44802000 */ mtc1 $zero, $f4 -/* B9DFB0 80240650 46000021 */ cvt.d.s $f0, $f0 -/* B9DFB4 80240654 E7A6002C */ swc1 $f6, 0x2c($sp) -/* B9DFB8 80240658 46240000 */ add.d $f0, $f0, $f4 -/* B9DFBC 8024065C 462010A0 */ cvt.s.d $f2, $f2 -/* B9DFC0 80240660 E7A20030 */ swc1 $f2, 0x30($sp) -/* B9DFC4 80240664 46200020 */ cvt.s.d $f0, $f0 -/* B9DFC8 80240668 E7A00038 */ swc1 $f0, 0x38($sp) -/* B9DFCC 8024066C AFA20010 */ sw $v0, 0x10($sp) -/* B9DFD0 80240670 8E040080 */ lw $a0, 0x80($s0) -/* B9DFD4 80240674 0C0372DF */ jal func_800DCB7C -/* B9DFD8 80240678 27A70034 */ addiu $a3, $sp, 0x34 -/* B9DFDC 8024067C 1040002A */ beqz $v0, .L80240728 -/* B9DFE0 80240680 00000000 */ nop -/* B9DFE4 80240684 C600001C */ lwc1 $f0, 0x1c($s0) -/* B9DFE8 80240688 C7A20038 */ lwc1 $f2, 0x38($sp) -/* B9DFEC 8024068C 46000005 */ abs.s $f0, $f0 -/* B9DFF0 80240690 46000021 */ cvt.d.s $f0, $f0 -/* B9DFF4 80240694 46340000 */ add.d $f0, $f0, $f20 -/* B9DFF8 80240698 460010A1 */ cvt.d.s $f2, $f2 -/* B9DFFC 8024069C 4620103E */ c.le.d $f2, $f0 -/* B9E000 802406A0 00000000 */ nop -/* B9E004 802406A4 45000020 */ bc1f .L80240728 -/* B9E008 802406A8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B9E00C 802406AC C7A00030 */ lwc1 $f0, 0x30($sp) -/* B9E010 802406B0 8E020000 */ lw $v0, ($s0) -/* B9E014 802406B4 2403F7FF */ addiu $v1, $zero, -0x801 -/* B9E018 802406B8 AE00001C */ sw $zero, 0x1c($s0) -/* B9E01C 802406BC 00431024 */ and $v0, $v0, $v1 -/* B9E020 802406C0 AE020000 */ sw $v0, ($s0) -/* B9E024 802406C4 24020002 */ addiu $v0, $zero, 2 -/* B9E028 802406C8 E600003C */ swc1 $f0, 0x3c($s0) -/* B9E02C 802406CC 0C00A67F */ jal rand_int -/* B9E030 802406D0 AE620070 */ sw $v0, 0x70($s3) -/* B9E034 802406D4 3C035555 */ lui $v1, 0x5555 -/* B9E038 802406D8 34635556 */ ori $v1, $v1, 0x5556 -/* B9E03C 802406DC 00430018 */ mult $v0, $v1 -/* B9E040 802406E0 000227C3 */ sra $a0, $v0, 0x1f -/* B9E044 802406E4 00004010 */ mfhi $t0 -/* B9E048 802406E8 01042023 */ subu $a0, $t0, $a0 -/* B9E04C 802406EC 00041840 */ sll $v1, $a0, 1 -/* B9E050 802406F0 00641821 */ addu $v1, $v1, $a0 -/* B9E054 802406F4 00431023 */ subu $v0, $v0, $v1 -/* B9E058 802406F8 24430002 */ addiu $v1, $v0, 2 -/* B9E05C 802406FC AE630074 */ sw $v1, 0x74($s3) -/* B9E060 80240700 8E82002C */ lw $v0, 0x2c($s4) -/* B9E064 80240704 5840000F */ blezl $v0, .L80240744 -/* B9E068 80240708 AE600070 */ sw $zero, 0x70($s3) -/* B9E06C 8024070C 8E820004 */ lw $v0, 4($s4) -/* B9E070 80240710 5840000C */ blezl $v0, .L80240744 -/* B9E074 80240714 AE600070 */ sw $zero, 0x70($s3) -/* B9E078 80240718 1460000A */ bnez $v1, .L80240744 -/* B9E07C 8024071C 00000000 */ nop -/* B9E080 80240720 080901D1 */ j .L80240744 -/* B9E084 80240724 AE600070 */ sw $zero, 0x70($s3) -.L80240728: -/* B9E088 80240728 C604003C */ lwc1 $f4, 0x3c($s0) -/* B9E08C 8024072C C600001C */ lwc1 $f0, 0x1c($s0) -/* B9E090 80240730 46002100 */ add.s $f4, $f4, $f0 -/* B9E094 80240734 C6020014 */ lwc1 $f2, 0x14($s0) -/* B9E098 80240738 46020001 */ sub.s $f0, $f0, $f2 -/* B9E09C 8024073C E604003C */ swc1 $f4, 0x3c($s0) -/* B9E0A0 80240740 E600001C */ swc1 $f0, 0x1c($s0) -.L80240744: -/* B9E0A4 80240744 8FBF0054 */ lw $ra, 0x54($sp) -/* B9E0A8 80240748 8FB40050 */ lw $s4, 0x50($sp) -/* B9E0AC 8024074C 8FB3004C */ lw $s3, 0x4c($sp) -/* B9E0B0 80240750 8FB20048 */ lw $s2, 0x48($sp) -/* B9E0B4 80240754 8FB10044 */ lw $s1, 0x44($sp) -/* B9E0B8 80240758 8FB00040 */ lw $s0, 0x40($sp) -/* B9E0BC 8024075C D7B40058 */ ldc1 $f20, 0x58($sp) -/* B9E0C0 80240760 03E00008 */ jr $ra -/* B9E0C4 80240764 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_mim/mim_04/func_80240768_B9D960.s b/asm/nonmatchings/world/area_mim/mim_04/func_80240768_B9D960.s deleted file mode 100644 index a765f3789d..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_04/func_80240768_B9D960.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240768_B9E0C8 -/* B9E0C8 80240768 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B9E0CC 8024076C AFB3001C */ sw $s3, 0x1c($sp) -/* B9E0D0 80240770 0080982D */ daddu $s3, $a0, $zero -/* B9E0D4 80240774 AFBF0020 */ sw $ra, 0x20($sp) -/* B9E0D8 80240778 AFB20018 */ sw $s2, 0x18($sp) -/* B9E0DC 8024077C AFB10014 */ sw $s1, 0x14($sp) -/* B9E0E0 80240780 AFB00010 */ sw $s0, 0x10($sp) -/* B9E0E4 80240784 8E720148 */ lw $s2, 0x148($s3) -/* B9E0E8 80240788 86440008 */ lh $a0, 8($s2) -/* B9E0EC 8024078C 0C00EABB */ jal get_npc_unsafe -/* B9E0F0 80240790 00A0882D */ daddu $s1, $a1, $zero -/* B9E0F4 80240794 8E240008 */ lw $a0, 8($s1) -/* B9E0F8 80240798 0040802D */ daddu $s0, $v0, $zero -/* B9E0FC 8024079C 00041FC2 */ srl $v1, $a0, 0x1f -/* B9E100 802407A0 00832021 */ addu $a0, $a0, $v1 -/* B9E104 802407A4 00042043 */ sra $a0, $a0, 1 -/* B9E108 802407A8 0C00A67F */ jal rand_int -/* B9E10C 802407AC 24840001 */ addiu $a0, $a0, 1 -/* B9E110 802407B0 8E230008 */ lw $v1, 8($s1) -/* B9E114 802407B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* B9E118 802407B8 00032FC2 */ srl $a1, $v1, 0x1f -/* B9E11C 802407BC 00651821 */ addu $v1, $v1, $a1 -/* B9E120 802407C0 00031843 */ sra $v1, $v1, 1 -/* B9E124 802407C4 00621821 */ addu $v1, $v1, $v0 -/* B9E128 802407C8 0C00A67F */ jal rand_int -/* B9E12C 802407CC A603008E */ sh $v1, 0x8e($s0) -/* B9E130 802407D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* B9E134 802407D4 44820000 */ mtc1 $v0, $f0 -/* B9E138 802407D8 00000000 */ nop -/* B9E13C 802407DC 46800020 */ cvt.s.w $f0, $f0 -/* B9E140 802407E0 46006300 */ add.s $f12, $f12, $f0 -/* B9E144 802407E4 3C0142B4 */ lui $at, 0x42b4 -/* B9E148 802407E8 44810000 */ mtc1 $at, $f0 -/* B9E14C 802407EC 0C00A6C9 */ jal clamp_angle -/* B9E150 802407F0 46006301 */ sub.s $f12, $f12, $f0 -/* B9E154 802407F4 E600000C */ swc1 $f0, 0xc($s0) -/* B9E158 802407F8 8E4200CC */ lw $v0, 0xcc($s2) -/* B9E15C 802407FC 8C420000 */ lw $v0, ($v0) -/* B9E160 80240800 AE020028 */ sw $v0, 0x28($s0) -/* B9E164 80240804 24020003 */ addiu $v0, $zero, 3 -/* B9E168 80240808 AE620070 */ sw $v0, 0x70($s3) -/* B9E16C 8024080C 8FBF0020 */ lw $ra, 0x20($sp) -/* B9E170 80240810 8FB3001C */ lw $s3, 0x1c($sp) -/* B9E174 80240814 8FB20018 */ lw $s2, 0x18($sp) -/* B9E178 80240818 8FB10014 */ lw $s1, 0x14($sp) -/* B9E17C 8024081C 8FB00010 */ lw $s0, 0x10($sp) -/* B9E180 80240820 03E00008 */ jr $ra -/* B9E184 80240824 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_04/func_80240828_B9D960.s b/asm/nonmatchings/world/area_mim/mim_04/func_80240828_B9D960.s deleted file mode 100644 index d0f950c2a4..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_04/func_80240828_B9D960.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240828_B9E188 -/* B9E188 80240828 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B9E18C 8024082C AFB40040 */ sw $s4, 0x40($sp) -/* B9E190 80240830 0080A02D */ daddu $s4, $a0, $zero -/* B9E194 80240834 AFBF0044 */ sw $ra, 0x44($sp) -/* B9E198 80240838 AFB3003C */ sw $s3, 0x3c($sp) -/* B9E19C 8024083C AFB20038 */ sw $s2, 0x38($sp) -/* B9E1A0 80240840 AFB10034 */ sw $s1, 0x34($sp) -/* B9E1A4 80240844 AFB00030 */ sw $s0, 0x30($sp) -/* B9E1A8 80240848 8E920148 */ lw $s2, 0x148($s4) -/* B9E1AC 8024084C 00A0882D */ daddu $s1, $a1, $zero -/* B9E1B0 80240850 86440008 */ lh $a0, 8($s2) -/* B9E1B4 80240854 0C00EABB */ jal get_npc_unsafe -/* B9E1B8 80240858 00C0982D */ daddu $s3, $a2, $zero -/* B9E1BC 8024085C 8E230014 */ lw $v1, 0x14($s1) -/* B9E1C0 80240860 0460002D */ bltz $v1, .L80240918 -/* B9E1C4 80240864 0040802D */ daddu $s0, $v0, $zero -/* B9E1C8 80240868 0260202D */ daddu $a0, $s3, $zero -/* B9E1CC 8024086C AFA00010 */ sw $zero, 0x10($sp) -/* B9E1D0 80240870 8E260024 */ lw $a2, 0x24($s1) -/* B9E1D4 80240874 8E270028 */ lw $a3, 0x28($s1) -/* B9E1D8 80240878 0C01242D */ jal func_800490B4 -/* B9E1DC 8024087C 0240282D */ daddu $a1, $s2, $zero -/* B9E1E0 80240880 10400025 */ beqz $v0, .L80240918 -/* B9E1E4 80240884 0000202D */ daddu $a0, $zero, $zero -/* B9E1E8 80240888 0200282D */ daddu $a1, $s0, $zero -/* B9E1EC 8024088C 0000302D */ daddu $a2, $zero, $zero -/* B9E1F0 80240890 860300A8 */ lh $v1, 0xa8($s0) -/* B9E1F4 80240894 3C013F80 */ lui $at, 0x3f80 -/* B9E1F8 80240898 44810000 */ mtc1 $at, $f0 -/* B9E1FC 8024089C 3C014000 */ lui $at, 0x4000 -/* B9E200 802408A0 44811000 */ mtc1 $at, $f2 -/* B9E204 802408A4 3C01C1A0 */ lui $at, 0xc1a0 -/* B9E208 802408A8 44812000 */ mtc1 $at, $f4 -/* B9E20C 802408AC 2402000F */ addiu $v0, $zero, 0xf -/* B9E210 802408B0 AFA2001C */ sw $v0, 0x1c($sp) -/* B9E214 802408B4 44833000 */ mtc1 $v1, $f6 -/* B9E218 802408B8 00000000 */ nop -/* B9E21C 802408BC 468031A0 */ cvt.s.w $f6, $f6 -/* B9E220 802408C0 44073000 */ mfc1 $a3, $f6 -/* B9E224 802408C4 27A20028 */ addiu $v0, $sp, 0x28 -/* B9E228 802408C8 AFA20020 */ sw $v0, 0x20($sp) -/* B9E22C 802408CC E7A00010 */ swc1 $f0, 0x10($sp) -/* B9E230 802408D0 E7A20014 */ swc1 $f2, 0x14($sp) -/* B9E234 802408D4 0C01BFA4 */ jal fx_emote -/* B9E238 802408D8 E7A40018 */ swc1 $f4, 0x18($sp) -/* B9E23C 802408DC 0200202D */ daddu $a0, $s0, $zero -/* B9E240 802408E0 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B9E244 802408E4 0C012530 */ jal func_800494C0 -/* B9E248 802408E8 3C060020 */ lui $a2, 0x20 -/* B9E24C 802408EC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B9E250 802408F0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B9E254 802408F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B9E258 802408F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B9E25C 802408FC 8C460028 */ lw $a2, 0x28($v0) -/* B9E260 80240900 0C00A720 */ jal atan2 -/* B9E264 80240904 8C470030 */ lw $a3, 0x30($v0) -/* B9E268 80240908 2402000C */ addiu $v0, $zero, 0xc -/* B9E26C 8024090C E600000C */ swc1 $f0, 0xc($s0) -/* B9E270 80240910 0809026B */ j .L802409AC -/* B9E274 80240914 AE820070 */ sw $v0, 0x70($s4) -.L80240918: -/* B9E278 80240918 8602008C */ lh $v0, 0x8c($s0) -/* B9E27C 8024091C 14400023 */ bnez $v0, .L802409AC -/* B9E280 80240920 00000000 */ nop -/* B9E284 80240924 9602008E */ lhu $v0, 0x8e($s0) -/* B9E288 80240928 2442FFFF */ addiu $v0, $v0, -1 -/* B9E28C 8024092C A602008E */ sh $v0, 0x8e($s0) -/* B9E290 80240930 00021400 */ sll $v0, $v0, 0x10 -/* B9E294 80240934 1C40001D */ bgtz $v0, .L802409AC -/* B9E298 80240938 00000000 */ nop -/* B9E29C 8024093C 8E820074 */ lw $v0, 0x74($s4) -/* B9E2A0 80240940 2442FFFF */ addiu $v0, $v0, -1 -/* B9E2A4 80240944 18400018 */ blez $v0, .L802409A8 -/* B9E2A8 80240948 AE820074 */ sw $v0, 0x74($s4) -/* B9E2AC 8024094C C600000C */ lwc1 $f0, 0xc($s0) -/* B9E2B0 80240950 3C014334 */ lui $at, 0x4334 -/* B9E2B4 80240954 44816000 */ mtc1 $at, $f12 -/* B9E2B8 80240958 0C00A6C9 */ jal clamp_angle -/* B9E2BC 8024095C 460C0300 */ add.s $f12, $f0, $f12 -/* B9E2C0 80240960 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B9E2C4 80240964 0C00A67F */ jal rand_int -/* B9E2C8 80240968 E600000C */ swc1 $f0, 0xc($s0) -/* B9E2CC 8024096C 3C032E8B */ lui $v1, 0x2e8b -/* B9E2D0 80240970 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* B9E2D4 80240974 00430018 */ mult $v0, $v1 -/* B9E2D8 80240978 00021FC3 */ sra $v1, $v0, 0x1f -/* B9E2DC 8024097C 00004010 */ mfhi $t0 -/* B9E2E0 80240980 00082043 */ sra $a0, $t0, 1 -/* B9E2E4 80240984 00832023 */ subu $a0, $a0, $v1 -/* B9E2E8 80240988 00041840 */ sll $v1, $a0, 1 -/* B9E2EC 8024098C 00641821 */ addu $v1, $v1, $a0 -/* B9E2F0 80240990 00031880 */ sll $v1, $v1, 2 -/* B9E2F4 80240994 00641823 */ subu $v1, $v1, $a0 -/* B9E2F8 80240998 00431023 */ subu $v0, $v0, $v1 -/* B9E2FC 8024099C 24420005 */ addiu $v0, $v0, 5 -/* B9E300 802409A0 0809026B */ j .L802409AC -/* B9E304 802409A4 A602008E */ sh $v0, 0x8e($s0) -.L802409A8: -/* B9E308 802409A8 AE800070 */ sw $zero, 0x70($s4) -.L802409AC: -/* B9E30C 802409AC 8FBF0044 */ lw $ra, 0x44($sp) -/* B9E310 802409B0 8FB40040 */ lw $s4, 0x40($sp) -/* B9E314 802409B4 8FB3003C */ lw $s3, 0x3c($sp) -/* B9E318 802409B8 8FB20038 */ lw $s2, 0x38($sp) -/* B9E31C 802409BC 8FB10034 */ lw $s1, 0x34($sp) -/* B9E320 802409C0 8FB00030 */ lw $s0, 0x30($sp) -/* B9E324 802409C4 03E00008 */ jr $ra -/* B9E328 802409C8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_04/func_802409CC_B9D960.s b/asm/nonmatchings/world/area_mim/mim_04/func_802409CC_B9D960.s deleted file mode 100644 index 7e4a483609..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_04/func_802409CC_B9D960.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409CC_B9E32C -/* B9E32C 802409CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B9E330 802409D0 AFB10014 */ sw $s1, 0x14($sp) -/* B9E334 802409D4 0080882D */ daddu $s1, $a0, $zero -/* B9E338 802409D8 AFBF001C */ sw $ra, 0x1c($sp) -/* B9E33C 802409DC AFB20018 */ sw $s2, 0x18($sp) -/* B9E340 802409E0 AFB00010 */ sw $s0, 0x10($sp) -/* B9E344 802409E4 8E220148 */ lw $v0, 0x148($s1) -/* B9E348 802409E8 00A0902D */ daddu $s2, $a1, $zero -/* B9E34C 802409EC 84440008 */ lh $a0, 8($v0) -/* B9E350 802409F0 0C00EABB */ jal get_npc_unsafe -/* B9E354 802409F4 00C0802D */ daddu $s0, $a2, $zero -/* B9E358 802409F8 0220202D */ daddu $a0, $s1, $zero -/* B9E35C 802409FC 0240282D */ daddu $a1, $s2, $zero -/* B9E360 80240A00 0200302D */ daddu $a2, $s0, $zero -/* B9E364 80240A04 0C0127DF */ jal func_80049F7C -/* B9E368 80240A08 0040802D */ daddu $s0, $v0, $zero -/* B9E36C 80240A0C 8E020000 */ lw $v0, ($s0) -/* B9E370 80240A10 24040005 */ addiu $a0, $zero, 5 -/* B9E374 80240A14 34420800 */ ori $v0, $v0, 0x800 -/* B9E378 80240A18 0C00A67F */ jal rand_int -/* B9E37C 80240A1C AE020000 */ sw $v0, ($s0) -/* B9E380 80240A20 44820000 */ mtc1 $v0, $f0 -/* B9E384 80240A24 00000000 */ nop -/* B9E388 80240A28 46800021 */ cvt.d.w $f0, $f0 -/* B9E38C 80240A2C 3C014024 */ lui $at, 0x4024 -/* B9E390 80240A30 44811800 */ mtc1 $at, $f3 -/* B9E394 80240A34 44801000 */ mtc1 $zero, $f2 -/* B9E398 80240A38 3C013FC0 */ lui $at, 0x3fc0 -/* B9E39C 80240A3C 44812000 */ mtc1 $at, $f4 -/* B9E3A0 80240A40 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B9E3A4 80240A44 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B9E3A8 80240A48 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B9E3AC 80240A4C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B9E3B0 80240A50 46220000 */ add.d $f0, $f0, $f2 -/* B9E3B4 80240A54 E6040014 */ swc1 $f4, 0x14($s0) -/* B9E3B8 80240A58 46200020 */ cvt.s.d $f0, $f0 -/* B9E3BC 80240A5C E600001C */ swc1 $f0, 0x1c($s0) -/* B9E3C0 80240A60 8C460028 */ lw $a2, 0x28($v0) -/* B9E3C4 80240A64 0C00A720 */ jal atan2 -/* B9E3C8 80240A68 8C470030 */ lw $a3, 0x30($v0) -/* B9E3CC 80240A6C 0200202D */ daddu $a0, $s0, $zero -/* B9E3D0 80240A70 3C05B000 */ lui $a1, 0xb000 -/* B9E3D4 80240A74 34A50017 */ ori $a1, $a1, 0x17 -/* B9E3D8 80240A78 0000302D */ daddu $a2, $zero, $zero -/* B9E3DC 80240A7C E480000C */ swc1 $f0, 0xc($a0) -/* B9E3E0 80240A80 C6400018 */ lwc1 $f0, 0x18($s2) -/* B9E3E4 80240A84 2402000D */ addiu $v0, $zero, 0xd -/* B9E3E8 80240A88 E4800018 */ swc1 $f0, 0x18($a0) -/* B9E3EC 80240A8C 0C012530 */ jal func_800494C0 -/* B9E3F0 80240A90 AE220070 */ sw $v0, 0x70($s1) -/* B9E3F4 80240A94 8FBF001C */ lw $ra, 0x1c($sp) -/* B9E3F8 80240A98 8FB20018 */ lw $s2, 0x18($sp) -/* B9E3FC 80240A9C 8FB10014 */ lw $s1, 0x14($sp) -/* B9E400 80240AA0 8FB00010 */ lw $s0, 0x10($sp) -/* B9E404 80240AA4 03E00008 */ jr $ra -/* B9E408 80240AA8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_04/func_80240AAC_B9D960.s b/asm/nonmatchings/world/area_mim/mim_04/func_80240AAC_B9D960.s deleted file mode 100644 index 2560cdee53..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_04/func_80240AAC_B9D960.s +++ /dev/null @@ -1,200 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AAC_B9E40C -/* B9E40C 80240AAC 27BDFF90 */ addiu $sp, $sp, -0x70 -/* B9E410 80240AB0 AFB40050 */ sw $s4, 0x50($sp) -/* B9E414 80240AB4 0080A02D */ daddu $s4, $a0, $zero -/* B9E418 80240AB8 AFBF0060 */ sw $ra, 0x60($sp) -/* B9E41C 80240ABC AFB7005C */ sw $s7, 0x5c($sp) -/* B9E420 80240AC0 AFB60058 */ sw $s6, 0x58($sp) -/* B9E424 80240AC4 AFB50054 */ sw $s5, 0x54($sp) -/* B9E428 80240AC8 AFB3004C */ sw $s3, 0x4c($sp) -/* B9E42C 80240ACC AFB20048 */ sw $s2, 0x48($sp) -/* B9E430 80240AD0 AFB10044 */ sw $s1, 0x44($sp) -/* B9E434 80240AD4 AFB00040 */ sw $s0, 0x40($sp) -/* B9E438 80240AD8 F7B40068 */ sdc1 $f20, 0x68($sp) -/* B9E43C 80240ADC 8E950148 */ lw $s5, 0x148($s4) -/* B9E440 80240AE0 00A0B02D */ daddu $s6, $a1, $zero -/* B9E444 80240AE4 86A40008 */ lh $a0, 8($s5) -/* B9E448 80240AE8 0C00EABB */ jal get_npc_unsafe -/* B9E44C 80240AEC 00C0B82D */ daddu $s7, $a2, $zero -/* B9E450 80240AF0 0040982D */ daddu $s3, $v0, $zero -/* B9E454 80240AF4 C6600018 */ lwc1 $f0, 0x18($s3) -/* B9E458 80240AF8 44801000 */ mtc1 $zero, $f2 -/* B9E45C 80240AFC 44801800 */ mtc1 $zero, $f3 -/* B9E460 80240B00 46000021 */ cvt.d.s $f0, $f0 -/* B9E464 80240B04 4620103C */ c.lt.d $f2, $f0 -/* B9E468 80240B08 00000000 */ nop -/* B9E46C 80240B0C 45000021 */ bc1f .L80240B94 -/* B9E470 80240B10 27A50028 */ addiu $a1, $sp, 0x28 -/* B9E474 80240B14 C6600038 */ lwc1 $f0, 0x38($s3) -/* B9E478 80240B18 C662003C */ lwc1 $f2, 0x3c($s3) -/* B9E47C 80240B1C C6640040 */ lwc1 $f4, 0x40($s3) -/* B9E480 80240B20 C6660018 */ lwc1 $f6, 0x18($s3) -/* B9E484 80240B24 E7A00028 */ swc1 $f0, 0x28($sp) -/* B9E488 80240B28 E7A2002C */ swc1 $f2, 0x2c($sp) -/* B9E48C 80240B2C E7A40030 */ swc1 $f4, 0x30($sp) -/* B9E490 80240B30 E7A60010 */ swc1 $f6, 0x10($sp) -/* B9E494 80240B34 C660000C */ lwc1 $f0, 0xc($s3) -/* B9E498 80240B38 E7A00014 */ swc1 $f0, 0x14($sp) -/* B9E49C 80240B3C 866200A8 */ lh $v0, 0xa8($s3) -/* B9E4A0 80240B40 44820000 */ mtc1 $v0, $f0 -/* B9E4A4 80240B44 00000000 */ nop -/* B9E4A8 80240B48 46800020 */ cvt.s.w $f0, $f0 -/* B9E4AC 80240B4C E7A00018 */ swc1 $f0, 0x18($sp) -/* B9E4B0 80240B50 866200A6 */ lh $v0, 0xa6($s3) -/* B9E4B4 80240B54 27A6002C */ addiu $a2, $sp, 0x2c -/* B9E4B8 80240B58 44820000 */ mtc1 $v0, $f0 -/* B9E4BC 80240B5C 00000000 */ nop -/* B9E4C0 80240B60 46800020 */ cvt.s.w $f0, $f0 -/* B9E4C4 80240B64 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B9E4C8 80240B68 8E640080 */ lw $a0, 0x80($s3) -/* B9E4CC 80240B6C 0C037711 */ jal func_800DDC44 -/* B9E4D0 80240B70 27A70030 */ addiu $a3, $sp, 0x30 -/* B9E4D4 80240B74 10400003 */ beqz $v0, .L80240B84 -/* B9E4D8 80240B78 00000000 */ nop -/* B9E4DC 80240B7C 080902E5 */ j .L80240B94 -/* B9E4E0 80240B80 AE600018 */ sw $zero, 0x18($s3) -.L80240B84: -/* B9E4E4 80240B84 8E650018 */ lw $a1, 0x18($s3) -/* B9E4E8 80240B88 8E66000C */ lw $a2, 0xc($s3) -/* B9E4EC 80240B8C 0C00EA95 */ jal npc_move_heading -/* B9E4F0 80240B90 0260202D */ daddu $a0, $s3, $zero -.L80240B94: -/* B9E4F4 80240B94 C660001C */ lwc1 $f0, 0x1c($s3) -/* B9E4F8 80240B98 44801000 */ mtc1 $zero, $f2 -/* B9E4FC 80240B9C 44801800 */ mtc1 $zero, $f3 -/* B9E500 80240BA0 46000021 */ cvt.d.s $f0, $f0 -/* B9E504 80240BA4 4622003C */ c.lt.d $f0, $f2 -/* B9E508 80240BA8 00000000 */ nop -/* B9E50C 80240BAC 4500006C */ bc1f .L80240D60 -/* B9E510 80240BB0 27B00028 */ addiu $s0, $sp, 0x28 -/* B9E514 80240BB4 0200282D */ daddu $a1, $s0, $zero -/* B9E518 80240BB8 27A60034 */ addiu $a2, $sp, 0x34 -/* B9E51C 80240BBC 27B20038 */ addiu $s2, $sp, 0x38 -/* B9E520 80240BC0 C6600038 */ lwc1 $f0, 0x38($s3) -/* B9E524 80240BC4 3C0142C8 */ lui $at, 0x42c8 -/* B9E528 80240BC8 44811000 */ mtc1 $at, $f2 -/* B9E52C 80240BCC C6640040 */ lwc1 $f4, 0x40($s3) -/* B9E530 80240BD0 3C01447A */ lui $at, 0x447a -/* B9E534 80240BD4 44813000 */ mtc1 $at, $f6 -/* B9E538 80240BD8 27B10030 */ addiu $s1, $sp, 0x30 -/* B9E53C 80240BDC E7A00028 */ swc1 $f0, 0x28($sp) -/* B9E540 80240BE0 E7A20034 */ swc1 $f2, 0x34($sp) -/* B9E544 80240BE4 E7A40030 */ swc1 $f4, 0x30($sp) -/* B9E548 80240BE8 E7A60038 */ swc1 $f6, 0x38($sp) -/* B9E54C 80240BEC AFB20010 */ sw $s2, 0x10($sp) -/* B9E550 80240BF0 8E640080 */ lw $a0, 0x80($s3) -/* B9E554 80240BF4 0C0372DF */ jal func_800DCB7C -/* B9E558 80240BF8 0220382D */ daddu $a3, $s1, $zero -/* B9E55C 80240BFC 0200282D */ daddu $a1, $s0, $zero -/* B9E560 80240C00 27A6002C */ addiu $a2, $sp, 0x2c -/* B9E564 80240C04 C662003C */ lwc1 $f2, 0x3c($s3) -/* B9E568 80240C08 C6660038 */ lwc1 $f6, 0x38($s3) -/* B9E56C 80240C0C 3C01402A */ lui $at, 0x402a -/* B9E570 80240C10 4481A800 */ mtc1 $at, $f21 -/* B9E574 80240C14 4480A000 */ mtc1 $zero, $f20 -/* B9E578 80240C18 460010A1 */ cvt.d.s $f2, $f2 -/* B9E57C 80240C1C 46341080 */ add.d $f2, $f2, $f20 -/* B9E580 80240C20 C660001C */ lwc1 $f0, 0x1c($s3) -/* B9E584 80240C24 C6640040 */ lwc1 $f4, 0x40($s3) -/* B9E588 80240C28 46000005 */ abs.s $f0, $f0 -/* B9E58C 80240C2C E7A40030 */ swc1 $f4, 0x30($sp) -/* B9E590 80240C30 3C014030 */ lui $at, 0x4030 -/* B9E594 80240C34 44812800 */ mtc1 $at, $f5 -/* B9E598 80240C38 44802000 */ mtc1 $zero, $f4 -/* B9E59C 80240C3C 46000021 */ cvt.d.s $f0, $f0 -/* B9E5A0 80240C40 E7A60028 */ swc1 $f6, 0x28($sp) -/* B9E5A4 80240C44 46240000 */ add.d $f0, $f0, $f4 -/* B9E5A8 80240C48 462010A0 */ cvt.s.d $f2, $f2 -/* B9E5AC 80240C4C E7A2002C */ swc1 $f2, 0x2c($sp) -/* B9E5B0 80240C50 46200020 */ cvt.s.d $f0, $f0 -/* B9E5B4 80240C54 E7A00038 */ swc1 $f0, 0x38($sp) -/* B9E5B8 80240C58 AFB20010 */ sw $s2, 0x10($sp) -/* B9E5BC 80240C5C 8E640080 */ lw $a0, 0x80($s3) -/* B9E5C0 80240C60 0C0372DF */ jal func_800DCB7C -/* B9E5C4 80240C64 0220382D */ daddu $a3, $s1, $zero -/* B9E5C8 80240C68 1040003D */ beqz $v0, .L80240D60 -/* B9E5CC 80240C6C 00000000 */ nop -/* B9E5D0 80240C70 C660001C */ lwc1 $f0, 0x1c($s3) -/* B9E5D4 80240C74 C7A20038 */ lwc1 $f2, 0x38($sp) -/* B9E5D8 80240C78 46000005 */ abs.s $f0, $f0 -/* B9E5DC 80240C7C 46000021 */ cvt.d.s $f0, $f0 -/* B9E5E0 80240C80 46340000 */ add.d $f0, $f0, $f20 -/* B9E5E4 80240C84 460010A1 */ cvt.d.s $f2, $f2 -/* B9E5E8 80240C88 4620103E */ c.le.d $f2, $f0 -/* B9E5EC 80240C8C 00000000 */ nop -/* B9E5F0 80240C90 45000033 */ bc1f .L80240D60 -/* B9E5F4 80240C94 2403F7FF */ addiu $v1, $zero, -0x801 -/* B9E5F8 80240C98 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* B9E5FC 80240C9C 8E620000 */ lw $v0, ($s3) -/* B9E600 80240CA0 AE60001C */ sw $zero, 0x1c($s3) -/* B9E604 80240CA4 00431024 */ and $v0, $v0, $v1 -/* B9E608 80240CA8 E660003C */ swc1 $f0, 0x3c($s3) -/* B9E60C 80240CAC AE620000 */ sw $v0, ($s3) -/* B9E610 80240CB0 AFA00010 */ sw $zero, 0x10($sp) -/* B9E614 80240CB4 AFA00014 */ sw $zero, 0x14($sp) -/* B9E618 80240CB8 8E650038 */ lw $a1, 0x38($s3) -/* B9E61C 80240CBC 8E66003C */ lw $a2, 0x3c($s3) -/* B9E620 80240CC0 8E670040 */ lw $a3, 0x40($s3) -/* B9E624 80240CC4 0C01BECC */ jal fx_walk_normal -/* B9E628 80240CC8 24040002 */ addiu $a0, $zero, 2 -/* B9E62C 80240CCC 02E0202D */ daddu $a0, $s7, $zero -/* B9E630 80240CD0 2402000C */ addiu $v0, $zero, 0xc -/* B9E634 80240CD4 AE820070 */ sw $v0, 0x70($s4) -/* B9E638 80240CD8 24020001 */ addiu $v0, $zero, 1 -/* B9E63C 80240CDC AFA20010 */ sw $v0, 0x10($sp) -/* B9E640 80240CE0 8EC60024 */ lw $a2, 0x24($s6) -/* B9E644 80240CE4 8EC70028 */ lw $a3, 0x28($s6) -/* B9E648 80240CE8 0C01242D */ jal func_800490B4 -/* B9E64C 80240CEC 02A0282D */ daddu $a1, $s5, $zero -/* B9E650 80240CF0 14400022 */ bnez $v0, .L80240D7C -/* B9E654 80240CF4 24040002 */ addiu $a0, $zero, 2 -/* B9E658 80240CF8 0260282D */ daddu $a1, $s3, $zero -/* B9E65C 80240CFC 0000302D */ daddu $a2, $zero, $zero -/* B9E660 80240D00 866300A8 */ lh $v1, 0xa8($s3) -/* B9E664 80240D04 3C013F80 */ lui $at, 0x3f80 -/* B9E668 80240D08 44810000 */ mtc1 $at, $f0 -/* B9E66C 80240D0C 3C014000 */ lui $at, 0x4000 -/* B9E670 80240D10 44811000 */ mtc1 $at, $f2 -/* B9E674 80240D14 3C01C1A0 */ lui $at, 0xc1a0 -/* B9E678 80240D18 44812000 */ mtc1 $at, $f4 -/* B9E67C 80240D1C 2402000F */ addiu $v0, $zero, 0xf -/* B9E680 80240D20 AFA2001C */ sw $v0, 0x1c($sp) -/* B9E684 80240D24 44834000 */ mtc1 $v1, $f8 -/* B9E688 80240D28 00000000 */ nop -/* B9E68C 80240D2C 46804220 */ cvt.s.w $f8, $f8 -/* B9E690 80240D30 44074000 */ mfc1 $a3, $f8 -/* B9E694 80240D34 27A2003C */ addiu $v0, $sp, 0x3c -/* B9E698 80240D38 AFA20020 */ sw $v0, 0x20($sp) -/* B9E69C 80240D3C E7A00010 */ swc1 $f0, 0x10($sp) -/* B9E6A0 80240D40 E7A20014 */ swc1 $f2, 0x14($sp) -/* B9E6A4 80240D44 0C01BFA4 */ jal fx_emote -/* B9E6A8 80240D48 E7A40018 */ swc1 $f4, 0x18($sp) -/* B9E6AC 80240D4C 24020019 */ addiu $v0, $zero, 0x19 -/* B9E6B0 80240D50 A662008E */ sh $v0, 0x8e($s3) -/* B9E6B4 80240D54 2402000E */ addiu $v0, $zero, 0xe -/* B9E6B8 80240D58 0809035F */ j .L80240D7C -/* B9E6BC 80240D5C AE820070 */ sw $v0, 0x70($s4) -.L80240D60: -/* B9E6C0 80240D60 C664003C */ lwc1 $f4, 0x3c($s3) -/* B9E6C4 80240D64 C660001C */ lwc1 $f0, 0x1c($s3) -/* B9E6C8 80240D68 46002100 */ add.s $f4, $f4, $f0 -/* B9E6CC 80240D6C C6620014 */ lwc1 $f2, 0x14($s3) -/* B9E6D0 80240D70 46020001 */ sub.s $f0, $f0, $f2 -/* B9E6D4 80240D74 E664003C */ swc1 $f4, 0x3c($s3) -/* B9E6D8 80240D78 E660001C */ swc1 $f0, 0x1c($s3) -.L80240D7C: -/* B9E6DC 80240D7C 8FBF0060 */ lw $ra, 0x60($sp) -/* B9E6E0 80240D80 8FB7005C */ lw $s7, 0x5c($sp) -/* B9E6E4 80240D84 8FB60058 */ lw $s6, 0x58($sp) -/* B9E6E8 80240D88 8FB50054 */ lw $s5, 0x54($sp) -/* B9E6EC 80240D8C 8FB40050 */ lw $s4, 0x50($sp) -/* B9E6F0 80240D90 8FB3004C */ lw $s3, 0x4c($sp) -/* B9E6F4 80240D94 8FB20048 */ lw $s2, 0x48($sp) -/* B9E6F8 80240D98 8FB10044 */ lw $s1, 0x44($sp) -/* B9E6FC 80240D9C 8FB00040 */ lw $s0, 0x40($sp) -/* B9E700 80240DA0 D7B40068 */ ldc1 $f20, 0x68($sp) -/* B9E704 80240DA4 03E00008 */ jr $ra -/* B9E708 80240DA8 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_mim/mim_04/func_80240DAC_B9D960.s b/asm/nonmatchings/world/area_mim/mim_04/func_80240DAC_B9D960.s deleted file mode 100644 index 615426b56c..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_04/func_80240DAC_B9D960.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DAC_B9E70C -/* B9E70C 80240DAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B9E710 80240DB0 AFB00010 */ sw $s0, 0x10($sp) -/* B9E714 80240DB4 0080802D */ daddu $s0, $a0, $zero -/* B9E718 80240DB8 AFBF0014 */ sw $ra, 0x14($sp) -/* B9E71C 80240DBC 8E020148 */ lw $v0, 0x148($s0) -/* B9E720 80240DC0 0C00EABB */ jal get_npc_unsafe -/* B9E724 80240DC4 84440008 */ lh $a0, 8($v0) -/* B9E728 80240DC8 9443008E */ lhu $v1, 0x8e($v0) -/* B9E72C 80240DCC 2463FFFF */ addiu $v1, $v1, -1 -/* B9E730 80240DD0 A443008E */ sh $v1, 0x8e($v0) -/* B9E734 80240DD4 00031C00 */ sll $v1, $v1, 0x10 -/* B9E738 80240DD8 58600001 */ blezl $v1, .L80240DE0 -/* B9E73C 80240DDC AE000070 */ sw $zero, 0x70($s0) -.L80240DE0: -/* B9E740 80240DE0 8FBF0014 */ lw $ra, 0x14($sp) -/* B9E744 80240DE4 8FB00010 */ lw $s0, 0x10($sp) -/* B9E748 80240DE8 03E00008 */ jr $ra -/* B9E74C 80240DEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_04/func_80240DF0_B9D960.s b/asm/nonmatchings/world/area_mim/mim_04/func_80240DF0_B9D960.s deleted file mode 100644 index c2019d8868..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_04/func_80240DF0_B9D960.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF0_B9E750 -/* B9E750 80240DF0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B9E754 80240DF4 AFB3003C */ sw $s3, 0x3c($sp) -/* B9E758 80240DF8 0080982D */ daddu $s3, $a0, $zero -/* B9E75C 80240DFC AFBF0048 */ sw $ra, 0x48($sp) -/* B9E760 80240E00 AFB50044 */ sw $s5, 0x44($sp) -/* B9E764 80240E04 AFB40040 */ sw $s4, 0x40($sp) -/* B9E768 80240E08 AFB20038 */ sw $s2, 0x38($sp) -/* B9E76C 80240E0C AFB10034 */ sw $s1, 0x34($sp) -/* B9E770 80240E10 AFB00030 */ sw $s0, 0x30($sp) -/* B9E774 80240E14 8E720148 */ lw $s2, 0x148($s3) -/* B9E778 80240E18 86440008 */ lh $a0, 8($s2) -/* B9E77C 80240E1C 8E70000C */ lw $s0, 0xc($s3) -/* B9E780 80240E20 0C00EABB */ jal get_npc_unsafe -/* B9E784 80240E24 00A0882D */ daddu $s1, $a1, $zero -/* B9E788 80240E28 8E050000 */ lw $a1, ($s0) -/* B9E78C 80240E2C 26100004 */ addiu $s0, $s0, 4 -/* B9E790 80240E30 0260202D */ daddu $a0, $s3, $zero -/* B9E794 80240E34 0C0B1EAF */ jal get_variable -/* B9E798 80240E38 0040A82D */ daddu $s5, $v0, $zero -/* B9E79C 80240E3C 0260202D */ daddu $a0, $s3, $zero -/* B9E7A0 80240E40 8E050000 */ lw $a1, ($s0) -/* B9E7A4 80240E44 0C0B1EAF */ jal get_variable -/* B9E7A8 80240E48 0040A02D */ daddu $s4, $v0, $zero -/* B9E7AC 80240E4C AE420094 */ sw $v0, 0x94($s2) -/* B9E7B0 80240E50 AFA00010 */ sw $zero, 0x10($sp) -/* B9E7B4 80240E54 8E4200D0 */ lw $v0, 0xd0($s2) -/* B9E7B8 80240E58 8C420030 */ lw $v0, 0x30($v0) -/* B9E7BC 80240E5C AFA20014 */ sw $v0, 0x14($sp) -/* B9E7C0 80240E60 8E4200D0 */ lw $v0, 0xd0($s2) -/* B9E7C4 80240E64 8C42001C */ lw $v0, 0x1c($v0) -/* B9E7C8 80240E68 AFA20018 */ sw $v0, 0x18($sp) -/* B9E7CC 80240E6C 8E4200D0 */ lw $v0, 0xd0($s2) -/* B9E7D0 80240E70 8C420024 */ lw $v0, 0x24($v0) -/* B9E7D4 80240E74 AFA2001C */ sw $v0, 0x1c($sp) -/* B9E7D8 80240E78 8E4200D0 */ lw $v0, 0xd0($s2) -/* B9E7DC 80240E7C 8C420028 */ lw $v0, 0x28($v0) -/* B9E7E0 80240E80 AFA20020 */ sw $v0, 0x20($sp) -/* B9E7E4 80240E84 8E4200D0 */ lw $v0, 0xd0($s2) -/* B9E7E8 80240E88 3C0142C8 */ lui $at, 0x42c8 -/* B9E7EC 80240E8C 44810000 */ mtc1 $at, $f0 -/* B9E7F0 80240E90 8C42002C */ lw $v0, 0x2c($v0) -/* B9E7F4 80240E94 27B00010 */ addiu $s0, $sp, 0x10 -/* B9E7F8 80240E98 E7A00028 */ swc1 $f0, 0x28($sp) -/* B9E7FC 80240E9C A7A0002C */ sh $zero, 0x2c($sp) -/* B9E800 80240EA0 12200019 */ beqz $s1, .L80240F08 -/* B9E804 80240EA4 AFA20024 */ sw $v0, 0x24($sp) -/* B9E808 80240EA8 AE600070 */ sw $zero, 0x70($s3) -/* B9E80C 80240EAC A6A0008E */ sh $zero, 0x8e($s5) -/* B9E810 80240EB0 AE600074 */ sw $zero, 0x74($s3) -/* B9E814 80240EB4 8EA20000 */ lw $v0, ($s5) -/* B9E818 80240EB8 2403F7FF */ addiu $v1, $zero, -0x801 -/* B9E81C 80240EBC 00431024 */ and $v0, $v0, $v1 -/* B9E820 80240EC0 2403FDFF */ addiu $v1, $zero, -0x201 -/* B9E824 80240EC4 00431024 */ and $v0, $v0, $v1 -/* B9E828 80240EC8 34420008 */ ori $v0, $v0, 8 -/* B9E82C 80240ECC AEA20000 */ sw $v0, ($s5) -/* B9E830 80240ED0 8E4200B0 */ lw $v0, 0xb0($s2) -/* B9E834 80240ED4 34420018 */ ori $v0, $v0, 0x18 -/* B9E838 80240ED8 AE4200B0 */ sw $v0, 0xb0($s2) -/* B9E83C 80240EDC 8E420000 */ lw $v0, ($s2) -/* B9E840 80240EE0 3C034000 */ lui $v1, 0x4000 -/* B9E844 80240EE4 00431024 */ and $v0, $v0, $v1 -/* B9E848 80240EE8 10400007 */ beqz $v0, .L80240F08 -/* B9E84C 80240EEC 3C03BFFF */ lui $v1, 0xbfff -/* B9E850 80240EF0 2402000C */ addiu $v0, $zero, 0xc -/* B9E854 80240EF4 AE620070 */ sw $v0, 0x70($s3) -/* B9E858 80240EF8 8E420000 */ lw $v0, ($s2) -/* B9E85C 80240EFC 3463FFFF */ ori $v1, $v1, 0xffff -/* B9E860 80240F00 00431024 */ and $v0, $v0, $v1 -/* B9E864 80240F04 AE420000 */ sw $v0, ($s2) -.L80240F08: -/* B9E868 80240F08 8E4300B0 */ lw $v1, 0xb0($s2) -/* B9E86C 80240F0C 30620004 */ andi $v0, $v1, 4 -/* B9E870 80240F10 10400007 */ beqz $v0, .L80240F30 -/* B9E874 80240F14 00000000 */ nop -/* B9E878 80240F18 824200B4 */ lb $v0, 0xb4($s2) -/* B9E87C 80240F1C 14400034 */ bnez $v0, .L80240FF0 -/* B9E880 80240F20 0000102D */ daddu $v0, $zero, $zero -/* B9E884 80240F24 2402FFFB */ addiu $v0, $zero, -5 -/* B9E888 80240F28 00621024 */ and $v0, $v1, $v0 -/* B9E88C 80240F2C AE4200B0 */ sw $v0, 0xb0($s2) -.L80240F30: -/* B9E890 80240F30 8E630070 */ lw $v1, 0x70($s3) -/* B9E894 80240F34 2C62000F */ sltiu $v0, $v1, 0xf -/* B9E898 80240F38 1040002C */ beqz $v0, .L80240FEC -/* B9E89C 80240F3C 00031080 */ sll $v0, $v1, 2 -/* B9E8A0 80240F40 3C018024 */ lui $at, 0x8024 -/* B9E8A4 80240F44 00220821 */ addu $at, $at, $v0 -/* B9E8A8 80240F48 8C222D88 */ lw $v0, 0x2d88($at) -/* B9E8AC 80240F4C 00400008 */ jr $v0 -/* B9E8B0 80240F50 00000000 */ nop -/* B9E8B4 80240F54 0260202D */ daddu $a0, $s3, $zero -/* B9E8B8 80240F58 0280282D */ daddu $a1, $s4, $zero -/* B9E8BC 80240F5C 0C090080 */ jal func_80240200 -/* B9E8C0 80240F60 0200302D */ daddu $a2, $s0, $zero -/* B9E8C4 80240F64 0260202D */ daddu $a0, $s3, $zero -/* B9E8C8 80240F68 0280282D */ daddu $a1, $s4, $zero -/* B9E8CC 80240F6C 0C09010C */ jal func_80240430 -/* B9E8D0 80240F70 0200302D */ daddu $a2, $s0, $zero -/* B9E8D4 80240F74 080903FC */ j .L80240FF0 -/* B9E8D8 80240F78 0000102D */ daddu $v0, $zero, $zero -/* B9E8DC 80240F7C 0260202D */ daddu $a0, $s3, $zero -/* B9E8E0 80240F80 0280282D */ daddu $a1, $s4, $zero -/* B9E8E4 80240F84 0C0901DA */ jal func_80240768 -/* B9E8E8 80240F88 0200302D */ daddu $a2, $s0, $zero -/* B9E8EC 80240F8C 8E630070 */ lw $v1, 0x70($s3) -/* B9E8F0 80240F90 24020003 */ addiu $v0, $zero, 3 -/* B9E8F4 80240F94 14620016 */ bne $v1, $v0, .L80240FF0 -/* B9E8F8 80240F98 0000102D */ daddu $v0, $zero, $zero -/* B9E8FC 80240F9C 0260202D */ daddu $a0, $s3, $zero -/* B9E900 80240FA0 0280282D */ daddu $a1, $s4, $zero -/* B9E904 80240FA4 0C09020A */ jal func_80240828 -/* B9E908 80240FA8 0200302D */ daddu $a2, $s0, $zero -/* B9E90C 80240FAC 080903FC */ j .L80240FF0 -/* B9E910 80240FB0 0000102D */ daddu $v0, $zero, $zero -/* B9E914 80240FB4 0260202D */ daddu $a0, $s3, $zero -/* B9E918 80240FB8 0280282D */ daddu $a1, $s4, $zero -/* B9E91C 80240FBC 0C090273 */ jal func_802409CC -/* B9E920 80240FC0 0200302D */ daddu $a2, $s0, $zero -/* B9E924 80240FC4 0260202D */ daddu $a0, $s3, $zero -/* B9E928 80240FC8 0280282D */ daddu $a1, $s4, $zero -/* B9E92C 80240FCC 0C0902AB */ jal func_80240AAC -/* B9E930 80240FD0 0200302D */ daddu $a2, $s0, $zero -/* B9E934 80240FD4 080903FC */ j .L80240FF0 -/* B9E938 80240FD8 0000102D */ daddu $v0, $zero, $zero -/* B9E93C 80240FDC 0260202D */ daddu $a0, $s3, $zero -/* B9E940 80240FE0 0280282D */ daddu $a1, $s4, $zero -/* B9E944 80240FE4 0C09036B */ jal func_80240DAC -/* B9E948 80240FE8 0200302D */ daddu $a2, $s0, $zero -.L80240FEC: -/* B9E94C 80240FEC 0000102D */ daddu $v0, $zero, $zero -.L80240FF0: -/* B9E950 80240FF0 8FBF0048 */ lw $ra, 0x48($sp) -/* B9E954 80240FF4 8FB50044 */ lw $s5, 0x44($sp) -/* B9E958 80240FF8 8FB40040 */ lw $s4, 0x40($sp) -/* B9E95C 80240FFC 8FB3003C */ lw $s3, 0x3c($sp) -/* B9E960 80241000 8FB20038 */ lw $s2, 0x38($sp) -/* B9E964 80241004 8FB10034 */ lw $s1, 0x34($sp) -/* B9E968 80241008 8FB00030 */ lw $s0, 0x30($sp) -/* B9E96C 8024100C 03E00008 */ jr $ra -/* B9E970 80241010 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mim/mim_04/func_802410C8_B9D960.s b/asm/nonmatchings/world/area_mim/mim_04/func_802410C8_B9D960.s deleted file mode 100644 index 91a3c08cfc..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_04/func_802410C8_B9D960.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410C8_B9EA28 -/* B9EA28 802410C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B9EA2C 802410CC AFB00010 */ sw $s0, 0x10($sp) -/* B9EA30 802410D0 0080802D */ daddu $s0, $a0, $zero -/* B9EA34 802410D4 AFBF0018 */ sw $ra, 0x18($sp) -/* B9EA38 802410D8 AFB10014 */ sw $s1, 0x14($sp) -/* B9EA3C 802410DC 8E02000C */ lw $v0, 0xc($s0) -/* B9EA40 802410E0 8C510000 */ lw $s1, ($v0) -/* B9EA44 802410E4 0C0B1EAF */ jal get_variable -/* B9EA48 802410E8 0220282D */ daddu $a1, $s1, $zero -/* B9EA4C 802410EC 3C03FFF0 */ lui $v1, 0xfff0 -/* B9EA50 802410F0 3463FFFF */ ori $v1, $v1, 0xffff -/* B9EA54 802410F4 0200202D */ daddu $a0, $s0, $zero -/* B9EA58 802410F8 00431024 */ and $v0, $v0, $v1 -/* B9EA5C 802410FC 00021140 */ sll $v0, $v0, 5 -/* B9EA60 80241100 3C068008 */ lui $a2, %hi(gItemTable) -/* B9EA64 80241104 00C23021 */ addu $a2, $a2, $v0 -/* B9EA68 80241108 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* B9EA6C 8024110C 0C0B2026 */ jal set_variable -/* B9EA70 80241110 0220282D */ daddu $a1, $s1, $zero -/* B9EA74 80241114 8FBF0018 */ lw $ra, 0x18($sp) -/* B9EA78 80241118 8FB10014 */ lw $s1, 0x14($sp) -/* B9EA7C 8024111C 8FB00010 */ lw $s0, 0x10($sp) -/* B9EA80 80241120 24020002 */ addiu $v0, $zero, 2 -/* B9EA84 80241124 03E00008 */ jr $ra -/* B9EA88 80241128 27BD0020 */ addiu $sp, $sp, 0x20 -/* B9EA8C 8024112C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_05/func_80240070_BA0730.s b/asm/nonmatchings/world/area_mim/mim_05/func_80240070_BA0730.s deleted file mode 100644 index f44566ea32..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/func_80240070_BA0730.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_BA07A0 -/* BA07A0 80240070 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA07A4 80240074 AFB10014 */ sw $s1, 0x14($sp) -/* BA07A8 80240078 0080882D */ daddu $s1, $a0, $zero -/* BA07AC 8024007C AFBF0018 */ sw $ra, 0x18($sp) -/* BA07B0 80240080 AFB00010 */ sw $s0, 0x10($sp) -/* BA07B4 80240084 8E300148 */ lw $s0, 0x148($s1) -/* BA07B8 80240088 0C00EABB */ jal get_npc_unsafe -/* BA07BC 8024008C 86040008 */ lh $a0, 8($s0) -/* BA07C0 80240090 24030001 */ addiu $v1, $zero, 1 -/* BA07C4 80240094 0040202D */ daddu $a0, $v0, $zero -/* BA07C8 80240098 AE03006C */ sw $v1, 0x6c($s0) -/* BA07CC 8024009C 8482008C */ lh $v0, 0x8c($a0) -/* BA07D0 802400A0 14400009 */ bnez $v0, .L802400C8 -/* BA07D4 802400A4 24020002 */ addiu $v0, $zero, 2 -/* BA07D8 802400A8 96030072 */ lhu $v1, 0x72($s0) -/* BA07DC 802400AC AE02006C */ sw $v0, 0x6c($s0) -/* BA07E0 802400B0 A483008E */ sh $v1, 0x8e($a0) -/* BA07E4 802400B4 8E0200CC */ lw $v0, 0xcc($s0) -/* BA07E8 802400B8 8C420020 */ lw $v0, 0x20($v0) -/* BA07EC 802400BC AC820028 */ sw $v0, 0x28($a0) -/* BA07F0 802400C0 2402001F */ addiu $v0, $zero, 0x1f -/* BA07F4 802400C4 AE220070 */ sw $v0, 0x70($s1) -.L802400C8: -/* BA07F8 802400C8 8FBF0018 */ lw $ra, 0x18($sp) -/* BA07FC 802400CC 8FB10014 */ lw $s1, 0x14($sp) -/* BA0800 802400D0 8FB00010 */ lw $s0, 0x10($sp) -/* BA0804 802400D4 03E00008 */ jr $ra -/* BA0808 802400D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_05/func_80240224_BA0730.s b/asm/nonmatchings/world/area_mim/mim_05/func_80240224_BA0730.s deleted file mode 100644 index fea4dc339e..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/func_80240224_BA0730.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240224_BA0954 -/* BA0954 80240224 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA0958 80240228 AFB10014 */ sw $s1, 0x14($sp) -/* BA095C 8024022C 0080882D */ daddu $s1, $a0, $zero -/* BA0960 80240230 AFBF0018 */ sw $ra, 0x18($sp) -/* BA0964 80240234 AFB00010 */ sw $s0, 0x10($sp) -/* BA0968 80240238 8E300148 */ lw $s0, 0x148($s1) -/* BA096C 8024023C 0C00EABB */ jal get_npc_unsafe -/* BA0970 80240240 86040008 */ lh $a0, 8($s0) -/* BA0974 80240244 9443008E */ lhu $v1, 0x8e($v0) -/* BA0978 80240248 2463FFFF */ addiu $v1, $v1, -1 -/* BA097C 8024024C A443008E */ sh $v1, 0x8e($v0) -/* BA0980 80240250 00031C00 */ sll $v1, $v1, 0x10 -/* BA0984 80240254 1C600003 */ bgtz $v1, .L80240264 -/* BA0988 80240258 2402000C */ addiu $v0, $zero, 0xc -/* BA098C 8024025C AE00006C */ sw $zero, 0x6c($s0) -/* BA0990 80240260 AE220070 */ sw $v0, 0x70($s1) -.L80240264: -/* BA0994 80240264 8FBF0018 */ lw $ra, 0x18($sp) -/* BA0998 80240268 8FB10014 */ lw $s1, 0x14($sp) -/* BA099C 8024026C 8FB00010 */ lw $s0, 0x10($sp) -/* BA09A0 80240270 03E00008 */ jr $ra -/* BA09A4 80240274 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_05/func_8024042C_BA0730.s b/asm/nonmatchings/world/area_mim/mim_05/func_8024042C_BA0730.s deleted file mode 100644 index c3b1e030f3..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/func_8024042C_BA0730.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024042C_BA0B5C -/* BA0B5C 8024042C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BA0B60 80240430 AFB40028 */ sw $s4, 0x28($sp) -/* BA0B64 80240434 0080A02D */ daddu $s4, $a0, $zero -/* BA0B68 80240438 AFBF002C */ sw $ra, 0x2c($sp) -/* BA0B6C 8024043C AFB30024 */ sw $s3, 0x24($sp) -/* BA0B70 80240440 AFB20020 */ sw $s2, 0x20($sp) -/* BA0B74 80240444 AFB1001C */ sw $s1, 0x1c($sp) -/* BA0B78 80240448 AFB00018 */ sw $s0, 0x18($sp) -/* BA0B7C 8024044C 8E910148 */ lw $s1, 0x148($s4) -/* BA0B80 80240450 86240008 */ lh $a0, 8($s1) -/* BA0B84 80240454 0C00EABB */ jal get_npc_unsafe -/* BA0B88 80240458 00A0802D */ daddu $s0, $a1, $zero -/* BA0B8C 8024045C 16000005 */ bnez $s0, .L80240474 -/* BA0B90 80240460 0040902D */ daddu $s2, $v0, $zero -/* BA0B94 80240464 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA0B98 80240468 30420004 */ andi $v0, $v0, 4 -/* BA0B9C 8024046C 10400015 */ beqz $v0, .L802404C4 -/* BA0BA0 80240470 00000000 */ nop -.L80240474: -/* BA0BA4 80240474 AE800070 */ sw $zero, 0x70($s4) -/* BA0BA8 80240478 8E420000 */ lw $v0, ($s2) -/* BA0BAC 8024047C 3C031F30 */ lui $v1, 0x1f30 -/* BA0BB0 80240480 A640008E */ sh $zero, 0x8e($s2) -/* BA0BB4 80240484 34420102 */ ori $v0, $v0, 0x102 -/* BA0BB8 80240488 AE420000 */ sw $v0, ($s2) -/* BA0BBC 8024048C 8E220000 */ lw $v0, ($s1) -/* BA0BC0 80240490 3C01C47A */ lui $at, 0xc47a -/* BA0BC4 80240494 44810000 */ mtc1 $at, $f0 -/* BA0BC8 80240498 00431025 */ or $v0, $v0, $v1 -/* BA0BCC 8024049C AE220000 */ sw $v0, ($s1) -/* BA0BD0 802404A0 AE400038 */ sw $zero, 0x38($s2) -/* BA0BD4 802404A4 E640003C */ swc1 $f0, 0x3c($s2) -/* BA0BD8 802404A8 AE400040 */ sw $zero, 0x40($s2) -/* BA0BDC 802404AC 8E2300B0 */ lw $v1, 0xb0($s1) -/* BA0BE0 802404B0 30620004 */ andi $v0, $v1, 4 -/* BA0BE4 802404B4 10400003 */ beqz $v0, .L802404C4 -/* BA0BE8 802404B8 2402FFFB */ addiu $v0, $zero, -5 -/* BA0BEC 802404BC 00621024 */ and $v0, $v1, $v0 -/* BA0BF0 802404C0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802404C4: -/* BA0BF4 802404C4 8E930070 */ lw $s3, 0x70($s4) -/* BA0BF8 802404C8 12600005 */ beqz $s3, .L802404E0 -/* BA0BFC 802404CC 24020001 */ addiu $v0, $zero, 1 -/* BA0C00 802404D0 12620048 */ beq $s3, $v0, .L802405F4 -/* BA0C04 802404D4 00000000 */ nop -/* BA0C08 802404D8 0809019A */ j .L80240668 -/* BA0C0C 802404DC 00000000 */ nop -.L802404E0: -/* BA0C10 802404E0 86240008 */ lh $a0, 8($s1) -/* BA0C14 802404E4 0C00FB3A */ jal get_enemy -/* BA0C18 802404E8 2484FFFF */ addiu $a0, $a0, -1 -/* BA0C1C 802404EC 0040802D */ daddu $s0, $v0, $zero -/* BA0C20 802404F0 0C00EABB */ jal get_npc_unsafe -/* BA0C24 802404F4 86040008 */ lh $a0, 8($s0) -/* BA0C28 802404F8 24030001 */ addiu $v1, $zero, 1 -/* BA0C2C 802404FC 0040982D */ daddu $s3, $v0, $zero -/* BA0C30 80240500 A2230007 */ sb $v1, 7($s1) -/* BA0C34 80240504 8E03006C */ lw $v1, 0x6c($s0) -/* BA0C38 80240508 24020003 */ addiu $v0, $zero, 3 -/* BA0C3C 8024050C 14620056 */ bne $v1, $v0, .L80240668 -/* BA0C40 80240510 00000000 */ nop -/* BA0C44 80240514 8E2500A8 */ lw $a1, 0xa8($s1) -/* BA0C48 80240518 10A00003 */ beqz $a1, .L80240528 -/* BA0C4C 8024051C 0260202D */ daddu $a0, $s3, $zero -/* BA0C50 80240520 0C012530 */ jal func_800494C0 -/* BA0C54 80240524 0000302D */ daddu $a2, $zero, $zero -.L80240528: -/* BA0C58 80240528 27A40010 */ addiu $a0, $sp, 0x10 -/* BA0C5C 8024052C C6280070 */ lwc1 $f8, 0x70($s1) -/* BA0C60 80240530 46804220 */ cvt.s.w $f8, $f8 -/* BA0C64 80240534 C6620034 */ lwc1 $f2, 0x34($s3) -/* BA0C68 80240538 3C014387 */ lui $at, 0x4387 -/* BA0C6C 8024053C 44810000 */ mtc1 $at, $f0 -/* BA0C70 80240540 44064000 */ mfc1 $a2, $f8 -/* BA0C74 80240544 46020001 */ sub.s $f0, $f0, $f2 -/* BA0C78 80240548 C6660038 */ lwc1 $f6, 0x38($s3) -/* BA0C7C 8024054C C6640040 */ lwc1 $f4, 0x40($s3) -/* BA0C80 80240550 44070000 */ mfc1 $a3, $f0 -/* BA0C84 80240554 27A50014 */ addiu $a1, $sp, 0x14 -/* BA0C88 80240558 E7A60010 */ swc1 $f6, 0x10($sp) -/* BA0C8C 8024055C 0C00A7E7 */ jal add_vec2D_polar -/* BA0C90 80240560 E7A40014 */ swc1 $f4, 0x14($sp) -/* BA0C94 80240564 C7A00010 */ lwc1 $f0, 0x10($sp) -/* BA0C98 80240568 4600020D */ trunc.w.s $f8, $f0 -/* BA0C9C 8024056C 44024000 */ mfc1 $v0, $f8 -/* BA0CA0 80240570 E6400038 */ swc1 $f0, 0x38($s2) -/* BA0CA4 80240574 A6220010 */ sh $v0, 0x10($s1) -/* BA0CA8 80240578 C660003C */ lwc1 $f0, 0x3c($s3) -/* BA0CAC 8024057C C622006C */ lwc1 $f2, 0x6c($s1) -/* BA0CB0 80240580 468010A0 */ cvt.s.w $f2, $f2 -/* BA0CB4 80240584 46020000 */ add.s $f0, $f0, $f2 -/* BA0CB8 80240588 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* BA0CBC 8024058C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* BA0CC0 80240590 E640003C */ swc1 $f0, 0x3c($s2) -/* BA0CC4 80240594 C7A20014 */ lwc1 $f2, 0x14($sp) -/* BA0CC8 80240598 4600020D */ trunc.w.s $f8, $f0 -/* BA0CCC 8024059C 44024000 */ mfc1 $v0, $f8 -/* BA0CD0 802405A0 00000000 */ nop -/* BA0CD4 802405A4 A6220012 */ sh $v0, 0x12($s1) -/* BA0CD8 802405A8 4600120D */ trunc.w.s $f8, $f2 -/* BA0CDC 802405AC 44024000 */ mfc1 $v0, $f8 -/* BA0CE0 802405B0 E6420040 */ swc1 $f2, 0x40($s2) -/* BA0CE4 802405B4 A6220014 */ sh $v0, 0x14($s1) -/* BA0CE8 802405B8 8C660028 */ lw $a2, 0x28($v1) -/* BA0CEC 802405BC 8C670030 */ lw $a3, 0x30($v1) -/* BA0CF0 802405C0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* BA0CF4 802405C4 0C00A720 */ jal atan2 -/* BA0CF8 802405C8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* BA0CFC 802405CC 3C03E0EF */ lui $v1, 0xe0ef -/* BA0D00 802405D0 E640000C */ swc1 $f0, 0xc($s2) -/* BA0D04 802405D4 8E220000 */ lw $v0, ($s1) -/* BA0D08 802405D8 3463FFFF */ ori $v1, $v1, 0xffff -/* BA0D0C 802405DC 00431024 */ and $v0, $v0, $v1 -/* BA0D10 802405E0 AE220000 */ sw $v0, ($s1) -/* BA0D14 802405E4 24020001 */ addiu $v0, $zero, 1 -/* BA0D18 802405E8 A640008E */ sh $zero, 0x8e($s2) -/* BA0D1C 802405EC 0809019A */ j .L80240668 -/* BA0D20 802405F0 AE820070 */ sw $v0, 0x70($s4) -.L802405F4: -/* BA0D24 802405F4 86240008 */ lh $a0, 8($s1) -/* BA0D28 802405F8 0C00FB3A */ jal get_enemy -/* BA0D2C 802405FC 2484FFFF */ addiu $a0, $a0, -1 -/* BA0D30 80240600 0040802D */ daddu $s0, $v0, $zero -/* BA0D34 80240604 0C00EABB */ jal get_npc_unsafe -/* BA0D38 80240608 86040008 */ lh $a0, 8($s0) -/* BA0D3C 8024060C 9642008E */ lhu $v0, 0x8e($s2) -/* BA0D40 80240610 24420001 */ addiu $v0, $v0, 1 -/* BA0D44 80240614 A642008E */ sh $v0, 0x8e($s2) -/* BA0D48 80240618 00021400 */ sll $v0, $v0, 0x10 -/* BA0D4C 8024061C 8E23007C */ lw $v1, 0x7c($s1) -/* BA0D50 80240620 00021403 */ sra $v0, $v0, 0x10 -/* BA0D54 80240624 0043102A */ slt $v0, $v0, $v1 -/* BA0D58 80240628 50400001 */ beql $v0, $zero, .L80240630 -/* BA0D5C 8024062C A2200007 */ sb $zero, 7($s1) -.L80240630: -/* BA0D60 80240630 8E03006C */ lw $v1, 0x6c($s0) -/* BA0D64 80240634 24020004 */ addiu $v0, $zero, 4 -/* BA0D68 80240638 1462000B */ bne $v1, $v0, .L80240668 -/* BA0D6C 8024063C 3C021F10 */ lui $v0, 0x1f10 -/* BA0D70 80240640 8E230000 */ lw $v1, ($s1) -/* BA0D74 80240644 3C01C47A */ lui $at, 0xc47a -/* BA0D78 80240648 44810000 */ mtc1 $at, $f0 -/* BA0D7C 8024064C 00621825 */ or $v1, $v1, $v0 -/* BA0D80 80240650 AE230000 */ sw $v1, ($s1) -/* BA0D84 80240654 AE400038 */ sw $zero, 0x38($s2) -/* BA0D88 80240658 E640003C */ swc1 $f0, 0x3c($s2) -/* BA0D8C 8024065C AE400040 */ sw $zero, 0x40($s2) -/* BA0D90 80240660 A2330007 */ sb $s3, 7($s1) -/* BA0D94 80240664 AE800070 */ sw $zero, 0x70($s4) -.L80240668: -/* BA0D98 80240668 8FBF002C */ lw $ra, 0x2c($sp) -/* BA0D9C 8024066C 8FB40028 */ lw $s4, 0x28($sp) -/* BA0DA0 80240670 8FB30024 */ lw $s3, 0x24($sp) -/* BA0DA4 80240674 8FB20020 */ lw $s2, 0x20($sp) -/* BA0DA8 80240678 8FB1001C */ lw $s1, 0x1c($sp) -/* BA0DAC 8024067C 8FB00018 */ lw $s0, 0x18($sp) -/* BA0DB0 80240680 0000102D */ daddu $v0, $zero, $zero -/* BA0DB4 80240684 03E00008 */ jr $ra -/* BA0DB8 80240688 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mim/mim_05/func_8024068C_BA0730.s b/asm/nonmatchings/world/area_mim/mim_05/func_8024068C_BA0730.s deleted file mode 100644 index 26d527a268..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/func_8024068C_BA0730.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_BA0DBC -/* BA0DBC 8024068C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BA0DC0 80240690 AFB20038 */ sw $s2, 0x38($sp) -/* BA0DC4 80240694 0080902D */ daddu $s2, $a0, $zero -/* BA0DC8 80240698 AFBF0048 */ sw $ra, 0x48($sp) -/* BA0DCC 8024069C AFB50044 */ sw $s5, 0x44($sp) -/* BA0DD0 802406A0 AFB40040 */ sw $s4, 0x40($sp) -/* BA0DD4 802406A4 AFB3003C */ sw $s3, 0x3c($sp) -/* BA0DD8 802406A8 AFB10034 */ sw $s1, 0x34($sp) -/* BA0DDC 802406AC AFB00030 */ sw $s0, 0x30($sp) -/* BA0DE0 802406B0 8E510148 */ lw $s1, 0x148($s2) -/* BA0DE4 802406B4 86240008 */ lh $a0, 8($s1) -/* BA0DE8 802406B8 0C00EABB */ jal get_npc_unsafe -/* BA0DEC 802406BC 00A0802D */ daddu $s0, $a1, $zero -/* BA0DF0 802406C0 8E43000C */ lw $v1, 0xc($s2) -/* BA0DF4 802406C4 0240202D */ daddu $a0, $s2, $zero -/* BA0DF8 802406C8 8C650000 */ lw $a1, ($v1) -/* BA0DFC 802406CC 0C0B1EAF */ jal get_variable -/* BA0E00 802406D0 0040A82D */ daddu $s5, $v0, $zero -/* BA0E04 802406D4 AFA00010 */ sw $zero, 0x10($sp) -/* BA0E08 802406D8 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA0E0C 802406DC 8C630030 */ lw $v1, 0x30($v1) -/* BA0E10 802406E0 AFA30014 */ sw $v1, 0x14($sp) -/* BA0E14 802406E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA0E18 802406E8 8C63001C */ lw $v1, 0x1c($v1) -/* BA0E1C 802406EC AFA30018 */ sw $v1, 0x18($sp) -/* BA0E20 802406F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA0E24 802406F4 8C630024 */ lw $v1, 0x24($v1) -/* BA0E28 802406F8 AFA3001C */ sw $v1, 0x1c($sp) -/* BA0E2C 802406FC 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA0E30 80240700 8C630028 */ lw $v1, 0x28($v1) -/* BA0E34 80240704 27B40010 */ addiu $s4, $sp, 0x10 -/* BA0E38 80240708 AFA30020 */ sw $v1, 0x20($sp) -/* BA0E3C 8024070C 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA0E40 80240710 3C014282 */ lui $at, 0x4282 -/* BA0E44 80240714 44810000 */ mtc1 $at, $f0 -/* BA0E48 80240718 8C63002C */ lw $v1, 0x2c($v1) -/* BA0E4C 8024071C 0040982D */ daddu $s3, $v0, $zero -/* BA0E50 80240720 E7A00028 */ swc1 $f0, 0x28($sp) -/* BA0E54 80240724 A7A0002C */ sh $zero, 0x2c($sp) -/* BA0E58 80240728 16000005 */ bnez $s0, .L80240740 -/* BA0E5C 8024072C AFA30024 */ sw $v1, 0x24($sp) -/* BA0E60 80240730 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA0E64 80240734 30420004 */ andi $v0, $v0, 4 -/* BA0E68 80240738 10400020 */ beqz $v0, .L802407BC -/* BA0E6C 8024073C 00000000 */ nop -.L80240740: -/* BA0E70 80240740 2404F7FF */ addiu $a0, $zero, -0x801 -/* BA0E74 80240744 AE400070 */ sw $zero, 0x70($s2) -/* BA0E78 80240748 A6A0008E */ sh $zero, 0x8e($s5) -/* BA0E7C 8024074C 8E2200CC */ lw $v0, 0xcc($s1) -/* BA0E80 80240750 8EA30000 */ lw $v1, ($s5) -/* BA0E84 80240754 8C420000 */ lw $v0, ($v0) -/* BA0E88 80240758 00641824 */ and $v1, $v1, $a0 -/* BA0E8C 8024075C AEA30000 */ sw $v1, ($s5) -/* BA0E90 80240760 AEA20028 */ sw $v0, 0x28($s5) -/* BA0E94 80240764 8E2200D0 */ lw $v0, 0xd0($s1) -/* BA0E98 80240768 8C420034 */ lw $v0, 0x34($v0) -/* BA0E9C 8024076C 54400005 */ bnel $v0, $zero, .L80240784 -/* BA0EA0 80240770 2402FDFF */ addiu $v0, $zero, -0x201 -/* BA0EA4 80240774 34620200 */ ori $v0, $v1, 0x200 -/* BA0EA8 80240778 2403FFF7 */ addiu $v1, $zero, -9 -/* BA0EAC 8024077C 080901E3 */ j .L8024078C -/* BA0EB0 80240780 00431024 */ and $v0, $v0, $v1 -.L80240784: -/* BA0EB4 80240784 00621024 */ and $v0, $v1, $v0 -/* BA0EB8 80240788 34420008 */ ori $v0, $v0, 8 -.L8024078C: -/* BA0EBC 8024078C AEA20000 */ sw $v0, ($s5) -/* BA0EC0 80240790 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA0EC4 80240794 30420004 */ andi $v0, $v0, 4 -/* BA0EC8 80240798 10400007 */ beqz $v0, .L802407B8 -/* BA0ECC 8024079C 24020063 */ addiu $v0, $zero, 0x63 -/* BA0ED0 802407A0 AE420070 */ sw $v0, 0x70($s2) -/* BA0ED4 802407A4 AE400074 */ sw $zero, 0x74($s2) -/* BA0ED8 802407A8 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA0EDC 802407AC 2403FFFB */ addiu $v1, $zero, -5 -/* BA0EE0 802407B0 00431024 */ and $v0, $v0, $v1 -/* BA0EE4 802407B4 AE2200B0 */ sw $v0, 0xb0($s1) -.L802407B8: -/* BA0EE8 802407B8 AE20006C */ sw $zero, 0x6c($s1) -.L802407BC: -/* BA0EEC 802407BC 8E420070 */ lw $v0, 0x70($s2) -/* BA0EF0 802407C0 2842001E */ slti $v0, $v0, 0x1e -/* BA0EF4 802407C4 10400009 */ beqz $v0, .L802407EC -/* BA0EF8 802407C8 00000000 */ nop -/* BA0EFC 802407CC 8E22006C */ lw $v0, 0x6c($s1) -/* BA0F00 802407D0 14400006 */ bnez $v0, .L802407EC -/* BA0F04 802407D4 00000000 */ nop -/* BA0F08 802407D8 0C09009E */ jal func_80240278 -/* BA0F0C 802407DC 0240202D */ daddu $a0, $s2, $zero -/* BA0F10 802407E0 10400002 */ beqz $v0, .L802407EC -/* BA0F14 802407E4 2402001E */ addiu $v0, $zero, 0x1e -/* BA0F18 802407E8 AE420070 */ sw $v0, 0x70($s2) -.L802407EC: -/* BA0F1C 802407EC 8E430070 */ lw $v1, 0x70($s2) -/* BA0F20 802407F0 2C620064 */ sltiu $v0, $v1, 0x64 -/* BA0F24 802407F4 10400048 */ beqz $v0, .L80240918 -/* BA0F28 802407F8 00031080 */ sll $v0, $v1, 2 -/* BA0F2C 802407FC 3C018024 */ lui $at, 0x8024 -/* BA0F30 80240800 00220821 */ addu $at, $at, $v0 -/* BA0F34 80240804 8C223E88 */ lw $v0, 0x3e88($at) -/* BA0F38 80240808 00400008 */ jr $v0 -/* BA0F3C 8024080C 00000000 */ nop -/* BA0F40 80240810 0240202D */ daddu $a0, $s2, $zero -/* BA0F44 80240814 0260282D */ daddu $a1, $s3, $zero -/* BA0F48 80240818 0C012568 */ jal func_800495A0 -/* BA0F4C 8024081C 0280302D */ daddu $a2, $s4, $zero -/* BA0F50 80240820 0240202D */ daddu $a0, $s2, $zero -/* BA0F54 80240824 0260282D */ daddu $a1, $s3, $zero -/* BA0F58 80240828 0C0125AE */ jal func_800496B8 -/* BA0F5C 8024082C 0280302D */ daddu $a2, $s4, $zero -/* BA0F60 80240830 08090246 */ j .L80240918 -/* BA0F64 80240834 00000000 */ nop -/* BA0F68 80240838 0240202D */ daddu $a0, $s2, $zero -/* BA0F6C 8024083C 0260282D */ daddu $a1, $s3, $zero -/* BA0F70 80240840 0C0126D1 */ jal func_80049B44 -/* BA0F74 80240844 0280302D */ daddu $a2, $s4, $zero -/* BA0F78 80240848 0240202D */ daddu $a0, $s2, $zero -/* BA0F7C 8024084C 0260282D */ daddu $a1, $s3, $zero -/* BA0F80 80240850 0C012701 */ jal func_80049C04 -/* BA0F84 80240854 0280302D */ daddu $a2, $s4, $zero -/* BA0F88 80240858 08090246 */ j .L80240918 -/* BA0F8C 8024085C 00000000 */ nop -/* BA0F90 80240860 0240202D */ daddu $a0, $s2, $zero -/* BA0F94 80240864 0260282D */ daddu $a1, $s3, $zero -/* BA0F98 80240868 0C01278F */ jal func_80049E3C -/* BA0F9C 8024086C 0280302D */ daddu $a2, $s4, $zero -/* BA0FA0 80240870 0240202D */ daddu $a0, $s2, $zero -/* BA0FA4 80240874 0260282D */ daddu $a1, $s3, $zero -/* BA0FA8 80240878 0C0127B3 */ jal func_80049ECC -/* BA0FAC 8024087C 0280302D */ daddu $a2, $s4, $zero -/* BA0FB0 80240880 08090246 */ j .L80240918 -/* BA0FB4 80240884 00000000 */ nop -/* BA0FB8 80240888 0240202D */ daddu $a0, $s2, $zero -/* BA0FBC 8024088C 0260282D */ daddu $a1, $s3, $zero -/* BA0FC0 80240890 0C0127DF */ jal func_80049F7C -/* BA0FC4 80240894 0280302D */ daddu $a2, $s4, $zero -/* BA0FC8 80240898 0240202D */ daddu $a0, $s2, $zero -/* BA0FCC 8024089C 0260282D */ daddu $a1, $s3, $zero -/* BA0FD0 802408A0 0C012849 */ jal func_8004A124 -/* BA0FD4 802408A4 0280302D */ daddu $a2, $s4, $zero -/* BA0FD8 802408A8 08090246 */ j .L80240918 -/* BA0FDC 802408AC 00000000 */ nop -/* BA0FE0 802408B0 0240202D */ daddu $a0, $s2, $zero -/* BA0FE4 802408B4 0260282D */ daddu $a1, $s3, $zero -/* BA0FE8 802408B8 0C0128FA */ jal func_8004A3E8 -/* BA0FEC 802408BC 0280302D */ daddu $a2, $s4, $zero -/* BA0FF0 802408C0 08090246 */ j .L80240918 -/* BA0FF4 802408C4 00000000 */ nop -/* BA0FF8 802408C8 0C09001C */ jal func_80240070 -/* BA0FFC 802408CC 0240202D */ daddu $a0, $s2, $zero -/* BA1000 802408D0 0C090037 */ jal func_802400DC -/* BA1004 802408D4 0240202D */ daddu $a0, $s2, $zero -/* BA1008 802408D8 8E430070 */ lw $v1, 0x70($s2) -/* BA100C 802408DC 24020020 */ addiu $v0, $zero, 0x20 -/* BA1010 802408E0 1462000D */ bne $v1, $v0, .L80240918 -/* BA1014 802408E4 00000000 */ nop -/* BA1018 802408E8 0C090053 */ jal func_8024014C -/* BA101C 802408EC 0240202D */ daddu $a0, $s2, $zero -/* BA1020 802408F0 8E430070 */ lw $v1, 0x70($s2) -/* BA1024 802408F4 24020021 */ addiu $v0, $zero, 0x21 -/* BA1028 802408F8 14620007 */ bne $v1, $v0, .L80240918 -/* BA102C 802408FC 00000000 */ nop -/* BA1030 80240900 0C090089 */ jal func_80240224 -/* BA1034 80240904 0240202D */ daddu $a0, $s2, $zero -/* BA1038 80240908 08090246 */ j .L80240918 -/* BA103C 8024090C 00000000 */ nop -/* BA1040 80240910 0C0129CF */ jal func_8004A73C -/* BA1044 80240914 0240202D */ daddu $a0, $s2, $zero -.L80240918: -/* BA1048 80240918 8FBF0048 */ lw $ra, 0x48($sp) -/* BA104C 8024091C 8FB50044 */ lw $s5, 0x44($sp) -/* BA1050 80240920 8FB40040 */ lw $s4, 0x40($sp) -/* BA1054 80240924 8FB3003C */ lw $s3, 0x3c($sp) -/* BA1058 80240928 8FB20038 */ lw $s2, 0x38($sp) -/* BA105C 8024092C 8FB10034 */ lw $s1, 0x34($sp) -/* BA1060 80240930 8FB00030 */ lw $s0, 0x30($sp) -/* BA1064 80240934 0000102D */ daddu $v0, $zero, $zero -/* BA1068 80240938 03E00008 */ jr $ra -/* BA106C 8024093C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mim/mim_05/func_80240940_BA0730.s b/asm/nonmatchings/world/area_mim/mim_05/func_80240940_BA0730.s deleted file mode 100644 index e080f983df..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/func_80240940_BA0730.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240940_BA1070 -/* BA1070 80240940 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA1074 80240944 AFB10014 */ sw $s1, 0x14($sp) -/* BA1078 80240948 0080882D */ daddu $s1, $a0, $zero -/* BA107C 8024094C AFBF0018 */ sw $ra, 0x18($sp) -/* BA1080 80240950 AFB00010 */ sw $s0, 0x10($sp) -/* BA1084 80240954 8E300148 */ lw $s0, 0x148($s1) -/* BA1088 80240958 0C00EABB */ jal get_npc_unsafe -/* BA108C 8024095C 86040008 */ lh $a0, 8($s0) -/* BA1090 80240960 0040202D */ daddu $a0, $v0, $zero -/* BA1094 80240964 8482008E */ lh $v0, 0x8e($a0) -/* BA1098 80240968 9483008E */ lhu $v1, 0x8e($a0) -/* BA109C 8024096C 18400003 */ blez $v0, .L8024097C -/* BA10A0 80240970 2462FFFF */ addiu $v0, $v1, -1 -/* BA10A4 80240974 08090266 */ j .L80240998 -/* BA10A8 80240978 A482008E */ sh $v0, 0x8e($a0) -.L8024097C: -/* BA10AC 8024097C 8E0200CC */ lw $v0, 0xcc($s0) -/* BA10B0 80240980 AE00006C */ sw $zero, 0x6c($s0) -/* BA10B4 80240984 8C420000 */ lw $v0, ($v0) -/* BA10B8 80240988 AC820028 */ sw $v0, 0x28($a0) -/* BA10BC 8024098C 24020001 */ addiu $v0, $zero, 1 -/* BA10C0 80240990 AE200074 */ sw $zero, 0x74($s1) -/* BA10C4 80240994 AE220070 */ sw $v0, 0x70($s1) -.L80240998: -/* BA10C8 80240998 8FBF0018 */ lw $ra, 0x18($sp) -/* BA10CC 8024099C 8FB10014 */ lw $s1, 0x14($sp) -/* BA10D0 802409A0 8FB00010 */ lw $s0, 0x10($sp) -/* BA10D4 802409A4 03E00008 */ jr $ra -/* BA10D8 802409A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_05/func_802409AC_BA0730.s b/asm/nonmatchings/world/area_mim/mim_05/func_802409AC_BA0730.s deleted file mode 100644 index 71b35efcde..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/func_802409AC_BA0730.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409AC_BA10DC -/* BA10DC 802409AC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BA10E0 802409B0 AFB3003C */ sw $s3, 0x3c($sp) -/* BA10E4 802409B4 0080982D */ daddu $s3, $a0, $zero -/* BA10E8 802409B8 AFBF0040 */ sw $ra, 0x40($sp) -/* BA10EC 802409BC AFB20038 */ sw $s2, 0x38($sp) -/* BA10F0 802409C0 AFB10034 */ sw $s1, 0x34($sp) -/* BA10F4 802409C4 AFB00030 */ sw $s0, 0x30($sp) -/* BA10F8 802409C8 8E720148 */ lw $s2, 0x148($s3) -/* BA10FC 802409CC 00A0882D */ daddu $s1, $a1, $zero -/* BA1100 802409D0 86440008 */ lh $a0, 8($s2) -/* BA1104 802409D4 0C00EABB */ jal get_npc_unsafe -/* BA1108 802409D8 00C0802D */ daddu $s0, $a2, $zero -/* BA110C 802409DC 0200202D */ daddu $a0, $s0, $zero -/* BA1110 802409E0 0240282D */ daddu $a1, $s2, $zero -/* BA1114 802409E4 AFA00010 */ sw $zero, 0x10($sp) -/* BA1118 802409E8 8E26000C */ lw $a2, 0xc($s1) -/* BA111C 802409EC 8E270010 */ lw $a3, 0x10($s1) -/* BA1120 802409F0 0C01242D */ jal func_800490B4 -/* BA1124 802409F4 0040882D */ daddu $s1, $v0, $zero -/* BA1128 802409F8 10400024 */ beqz $v0, .L80240A8C -/* BA112C 802409FC 0220202D */ daddu $a0, $s1, $zero -/* BA1130 80240A00 24050322 */ addiu $a1, $zero, 0x322 -/* BA1134 80240A04 0C012530 */ jal func_800494C0 -/* BA1138 80240A08 0000302D */ daddu $a2, $zero, $zero -/* BA113C 80240A0C 0000202D */ daddu $a0, $zero, $zero -/* BA1140 80240A10 0220282D */ daddu $a1, $s1, $zero -/* BA1144 80240A14 0000302D */ daddu $a2, $zero, $zero -/* BA1148 80240A18 2410000A */ addiu $s0, $zero, 0xa -/* BA114C 80240A1C 862300A8 */ lh $v1, 0xa8($s1) -/* BA1150 80240A20 3C013F80 */ lui $at, 0x3f80 -/* BA1154 80240A24 44810000 */ mtc1 $at, $f0 -/* BA1158 80240A28 3C014000 */ lui $at, 0x4000 -/* BA115C 80240A2C 44811000 */ mtc1 $at, $f2 -/* BA1160 80240A30 3C01C1A0 */ lui $at, 0xc1a0 -/* BA1164 80240A34 44812000 */ mtc1 $at, $f4 -/* BA1168 80240A38 44833000 */ mtc1 $v1, $f6 -/* BA116C 80240A3C 00000000 */ nop -/* BA1170 80240A40 468031A0 */ cvt.s.w $f6, $f6 -/* BA1174 80240A44 44073000 */ mfc1 $a3, $f6 -/* BA1178 80240A48 27A20028 */ addiu $v0, $sp, 0x28 -/* BA117C 80240A4C AFB0001C */ sw $s0, 0x1c($sp) -/* BA1180 80240A50 AFA20020 */ sw $v0, 0x20($sp) -/* BA1184 80240A54 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA1188 80240A58 E7A20014 */ swc1 $f2, 0x14($sp) -/* BA118C 80240A5C 0C01BFA4 */ jal fx_emote -/* BA1190 80240A60 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA1194 80240A64 0220202D */ daddu $a0, $s1, $zero -/* BA1198 80240A68 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BA119C 80240A6C 0C012530 */ jal func_800494C0 -/* BA11A0 80240A70 3C060020 */ lui $a2, 0x20 -/* BA11A4 80240A74 8E4200CC */ lw $v0, 0xcc($s2) -/* BA11A8 80240A78 8C420020 */ lw $v0, 0x20($v0) -/* BA11AC 80240A7C AE220028 */ sw $v0, 0x28($s1) -/* BA11B0 80240A80 9642008E */ lhu $v0, 0x8e($s2) -/* BA11B4 80240A84 A622008E */ sh $v0, 0x8e($s1) -/* BA11B8 80240A88 AE700070 */ sw $s0, 0x70($s3) -.L80240A8C: -/* BA11BC 80240A8C 8FBF0040 */ lw $ra, 0x40($sp) -/* BA11C0 80240A90 8FB3003C */ lw $s3, 0x3c($sp) -/* BA11C4 80240A94 8FB20038 */ lw $s2, 0x38($sp) -/* BA11C8 80240A98 8FB10034 */ lw $s1, 0x34($sp) -/* BA11CC 80240A9C 8FB00030 */ lw $s0, 0x30($sp) -/* BA11D0 80240AA0 03E00008 */ jr $ra -/* BA11D4 80240AA4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_05/func_80240AA8_BA0730.s b/asm/nonmatchings/world/area_mim/mim_05/func_80240AA8_BA0730.s deleted file mode 100644 index f3321551c0..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/func_80240AA8_BA0730.s +++ /dev/null @@ -1,688 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AA8_BA11D8 -/* BA11D8 80240AA8 27BDFF80 */ addiu $sp, $sp, -0x80 -/* BA11DC 80240AAC AFBF0064 */ sw $ra, 0x64($sp) -/* BA11E0 80240AB0 AFBE0060 */ sw $fp, 0x60($sp) -/* BA11E4 80240AB4 AFB7005C */ sw $s7, 0x5c($sp) -/* BA11E8 80240AB8 AFB60058 */ sw $s6, 0x58($sp) -/* BA11EC 80240ABC AFB50054 */ sw $s5, 0x54($sp) -/* BA11F0 80240AC0 AFB40050 */ sw $s4, 0x50($sp) -/* BA11F4 80240AC4 AFB3004C */ sw $s3, 0x4c($sp) -/* BA11F8 80240AC8 AFB20048 */ sw $s2, 0x48($sp) -/* BA11FC 80240ACC AFB10044 */ sw $s1, 0x44($sp) -/* BA1200 80240AD0 AFB00040 */ sw $s0, 0x40($sp) -/* BA1204 80240AD4 F7B80078 */ sdc1 $f24, 0x78($sp) -/* BA1208 80240AD8 F7B60070 */ sdc1 $f22, 0x70($sp) -/* BA120C 80240ADC F7B40068 */ sdc1 $f20, 0x68($sp) -/* BA1210 80240AE0 AFA40080 */ sw $a0, 0x80($sp) -/* BA1214 80240AE4 8C960148 */ lw $s6, 0x148($a0) -/* BA1218 80240AE8 00C0902D */ daddu $s2, $a2, $zero -/* BA121C 80240AEC 86C40008 */ lh $a0, 8($s6) -/* BA1220 80240AF0 0C00EABB */ jal get_npc_unsafe -/* BA1224 80240AF4 0000B82D */ daddu $s7, $zero, $zero -/* BA1228 80240AF8 0040882D */ daddu $s1, $v0, $zero -/* BA122C 80240AFC 9622008E */ lhu $v0, 0x8e($s1) -/* BA1230 80240B00 2442FFFF */ addiu $v0, $v0, -1 -/* BA1234 80240B04 A622008E */ sh $v0, 0x8e($s1) -/* BA1238 80240B08 00021400 */ sll $v0, $v0, 0x10 -/* BA123C 80240B0C 8EC30090 */ lw $v1, 0x90($s6) -/* BA1240 80240B10 00021403 */ sra $v0, $v0, 0x10 -/* BA1244 80240B14 0062182A */ slt $v1, $v1, $v0 -/* BA1248 80240B18 14600005 */ bnez $v1, .L80240B30 -/* BA124C 80240B1C 02E0F02D */ daddu $fp, $s7, $zero -/* BA1250 80240B20 8EC20000 */ lw $v0, ($s6) -/* BA1254 80240B24 3C031F10 */ lui $v1, 0x1f10 -/* BA1258 80240B28 00431025 */ or $v0, $v0, $v1 -/* BA125C 80240B2C AEC20000 */ sw $v0, ($s6) -.L80240B30: -/* BA1260 80240B30 8622008E */ lh $v0, 0x8e($s1) -/* BA1264 80240B34 1440025D */ bnez $v0, .L802414AC -/* BA1268 80240B38 00000000 */ nop -/* BA126C 80240B3C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BA1270 80240B40 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BA1274 80240B44 0C00A6C9 */ jal clamp_angle -/* BA1278 80240B48 C44C00A8 */ lwc1 $f12, 0xa8($v0) -/* BA127C 80240B4C 3C014334 */ lui $at, 0x4334 -/* BA1280 80240B50 44811000 */ mtc1 $at, $f2 -/* BA1284 80240B54 00000000 */ nop -/* BA1288 80240B58 4602003C */ c.lt.s $f0, $f2 -/* BA128C 80240B5C 00000000 */ nop -/* BA1290 80240B60 45000011 */ bc1f .L80240BA8 -/* BA1294 80240B64 00000000 */ nop -/* BA1298 80240B68 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* BA129C 80240B6C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* BA12A0 80240B70 3C0142B4 */ lui $at, 0x42b4 -/* BA12A4 80240B74 44816000 */ mtc1 $at, $f12 -/* BA12A8 80240B78 00031080 */ sll $v0, $v1, 2 -/* BA12AC 80240B7C 00431021 */ addu $v0, $v0, $v1 -/* BA12B0 80240B80 00021080 */ sll $v0, $v0, 2 -/* BA12B4 80240B84 00431023 */ subu $v0, $v0, $v1 -/* BA12B8 80240B88 000218C0 */ sll $v1, $v0, 3 -/* BA12BC 80240B8C 00431021 */ addu $v0, $v0, $v1 -/* BA12C0 80240B90 000210C0 */ sll $v0, $v0, 3 -/* BA12C4 80240B94 3C01800B */ lui $at, 0x800b -/* BA12C8 80240B98 00220821 */ addu $at, $at, $v0 -/* BA12CC 80240B9C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* BA12D0 80240BA0 080902F9 */ j .L80240BE4 -/* BA12D4 80240BA4 460C0301 */ sub.s $f12, $f0, $f12 -.L80240BA8: -/* BA12D8 80240BA8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* BA12DC 80240BAC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* BA12E0 80240BB0 3C0142B4 */ lui $at, 0x42b4 -/* BA12E4 80240BB4 44816000 */ mtc1 $at, $f12 -/* BA12E8 80240BB8 00031080 */ sll $v0, $v1, 2 -/* BA12EC 80240BBC 00431021 */ addu $v0, $v0, $v1 -/* BA12F0 80240BC0 00021080 */ sll $v0, $v0, 2 -/* BA12F4 80240BC4 00431023 */ subu $v0, $v0, $v1 -/* BA12F8 80240BC8 000218C0 */ sll $v1, $v0, 3 -/* BA12FC 80240BCC 00431021 */ addu $v0, $v0, $v1 -/* BA1300 80240BD0 000210C0 */ sll $v0, $v0, 3 -/* BA1304 80240BD4 3C01800B */ lui $at, 0x800b -/* BA1308 80240BD8 00220821 */ addu $at, $at, $v0 -/* BA130C 80240BDC C4201DEC */ lwc1 $f0, 0x1dec($at) -/* BA1310 80240BE0 460C0300 */ add.s $f12, $f0, $f12 -.L80240BE4: -/* BA1314 80240BE4 0C00A6C9 */ jal clamp_angle -/* BA1318 80240BE8 00000000 */ nop -/* BA131C 80240BEC 46000586 */ mov.s $f22, $f0 -/* BA1320 80240BF0 3C014334 */ lui $at, 0x4334 -/* BA1324 80240BF4 44816000 */ mtc1 $at, $f12 -/* BA1328 80240BF8 0C00A6C9 */ jal clamp_angle -/* BA132C 80240BFC 460CB300 */ add.s $f12, $f22, $f12 -/* BA1330 80240C00 8EC20088 */ lw $v0, 0x88($s6) -/* BA1334 80240C04 14400010 */ bnez $v0, .L80240C48 -/* BA1338 80240C08 46000606 */ mov.s $f24, $f0 -/* BA133C 80240C0C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BA1340 80240C10 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BA1344 80240C14 804300B4 */ lb $v1, 0xb4($v0) -/* BA1348 80240C18 3C014200 */ lui $at, 0x4200 -/* BA134C 80240C1C 4481A000 */ mtc1 $at, $f20 -/* BA1350 80240C20 10600016 */ beqz $v1, .L80240C7C -/* BA1354 80240C24 24020001 */ addiu $v0, $zero, 1 -/* BA1358 80240C28 3C0142C8 */ lui $at, 0x42c8 -/* BA135C 80240C2C 4481A000 */ mtc1 $at, $f20 -/* BA1360 80240C30 14620013 */ bne $v1, $v0, .L80240C80 -/* BA1364 80240C34 26300038 */ addiu $s0, $s1, 0x38 -/* BA1368 80240C38 3C0142B4 */ lui $at, 0x42b4 -/* BA136C 80240C3C 4481A000 */ mtc1 $at, $f20 -/* BA1370 80240C40 08090321 */ j .L80240C84 -/* BA1374 80240C44 0200202D */ daddu $a0, $s0, $zero -.L80240C48: -/* BA1378 80240C48 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BA137C 80240C4C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BA1380 80240C50 804300B4 */ lb $v1, 0xb4($v0) -/* BA1384 80240C54 3C014218 */ lui $at, 0x4218 -/* BA1388 80240C58 4481A000 */ mtc1 $at, $f20 -/* BA138C 80240C5C 10600007 */ beqz $v1, .L80240C7C -/* BA1390 80240C60 24020001 */ addiu $v0, $zero, 1 -/* BA1394 80240C64 3C0142B4 */ lui $at, 0x42b4 -/* BA1398 80240C68 4481A000 */ mtc1 $at, $f20 -/* BA139C 80240C6C 14620004 */ bne $v1, $v0, .L80240C80 -/* BA13A0 80240C70 26300038 */ addiu $s0, $s1, 0x38 -/* BA13A4 80240C74 3C014296 */ lui $at, 0x4296 -/* BA13A8 80240C78 4481A000 */ mtc1 $at, $f20 -.L80240C7C: -/* BA13AC 80240C7C 26300038 */ addiu $s0, $s1, 0x38 -.L80240C80: -/* BA13B0 80240C80 0200202D */ daddu $a0, $s0, $zero -.L80240C84: -/* BA13B4 80240C84 3C15800F */ lui $s5, %hi(gPlayerStatusPtr) -/* BA13B8 80240C88 26B57B30 */ addiu $s5, $s5, %lo(gPlayerStatusPtr) -/* BA13BC 80240C8C 4407C000 */ mfc1 $a3, $f24 -/* BA13C0 80240C90 862200A6 */ lh $v0, 0xa6($s1) -/* BA13C4 80240C94 8EA30000 */ lw $v1, ($s5) -/* BA13C8 80240C98 44824000 */ mtc1 $v0, $f8 -/* BA13CC 80240C9C 00000000 */ nop -/* BA13D0 80240CA0 46804220 */ cvt.s.w $f8, $f8 -/* BA13D4 80240CA4 C4600028 */ lwc1 $f0, 0x28($v1) -/* BA13D8 80240CA8 44064000 */ mfc1 $a2, $f8 -/* BA13DC 80240CAC 26330040 */ addiu $s3, $s1, 0x40 -/* BA13E0 80240CB0 E6200038 */ swc1 $f0, 0x38($s1) -/* BA13E4 80240CB4 C4600030 */ lwc1 $f0, 0x30($v1) -/* BA13E8 80240CB8 0260282D */ daddu $a1, $s3, $zero -/* BA13EC 80240CBC 0C00A7E7 */ jal add_vec2D_polar -/* BA13F0 80240CC0 E6200040 */ swc1 $f0, 0x40($s1) -/* BA13F4 80240CC4 862200A6 */ lh $v0, 0xa6($s1) -/* BA13F8 80240CC8 44820000 */ mtc1 $v0, $f0 -/* BA13FC 80240CCC 00000000 */ nop -/* BA1400 80240CD0 46800020 */ cvt.s.w $f0, $f0 -/* BA1404 80240CD4 4600A000 */ add.s $f0, $f20, $f0 -/* BA1408 80240CD8 4406B000 */ mfc1 $a2, $f22 -/* BA140C 80240CDC 44050000 */ mfc1 $a1, $f0 -/* BA1410 80240CE0 0C00EA95 */ jal npc_move_heading -/* BA1414 80240CE4 0220202D */ daddu $a0, $s1, $zero -/* BA1418 80240CE8 8EC20088 */ lw $v0, 0x88($s6) -/* BA141C 80240CEC 1440005D */ bnez $v0, .L80240E64 -/* BA1420 80240CF0 00000000 */ nop -/* BA1424 80240CF4 C6200038 */ lwc1 $f0, 0x38($s1) -/* BA1428 80240CF8 3C018024 */ lui $at, 0x8024 -/* BA142C 80240CFC D4244018 */ ldc1 $f4, 0x4018($at) -/* BA1430 80240D00 46000021 */ cvt.d.s $f0, $f0 -/* BA1434 80240D04 4620203C */ c.lt.d $f4, $f0 -/* BA1438 80240D08 00000000 */ nop -/* BA143C 80240D0C 45000005 */ bc1f .L80240D24 -/* BA1440 80240D10 00000000 */ nop -/* BA1444 80240D14 3C0143BE */ lui $at, 0x43be -/* BA1448 80240D18 44810000 */ mtc1 $at, $f0 -/* BA144C 80240D1C 00000000 */ nop -/* BA1450 80240D20 E6200038 */ swc1 $f0, 0x38($s1) -.L80240D24: -/* BA1454 80240D24 C6200038 */ lwc1 $f0, 0x38($s1) -/* BA1458 80240D28 3C018024 */ lui $at, 0x8024 -/* BA145C 80240D2C D4224020 */ ldc1 $f2, 0x4020($at) -/* BA1460 80240D30 46000021 */ cvt.d.s $f0, $f0 -/* BA1464 80240D34 4622003C */ c.lt.d $f0, $f2 -/* BA1468 80240D38 00000000 */ nop -/* BA146C 80240D3C 45000005 */ bc1f .L80240D54 -/* BA1470 80240D40 00000000 */ nop -/* BA1474 80240D44 3C01C3BE */ lui $at, 0xc3be -/* BA1478 80240D48 44810000 */ mtc1 $at, $f0 -/* BA147C 80240D4C 00000000 */ nop -/* BA1480 80240D50 E6200038 */ swc1 $f0, 0x38($s1) -.L80240D54: -/* BA1484 80240D54 C6200040 */ lwc1 $f0, 0x40($s1) -/* BA1488 80240D58 46000021 */ cvt.d.s $f0, $f0 -/* BA148C 80240D5C 4620203C */ c.lt.d $f4, $f0 -/* BA1490 80240D60 00000000 */ nop -/* BA1494 80240D64 45000005 */ bc1f .L80240D7C -/* BA1498 80240D68 00000000 */ nop -/* BA149C 80240D6C 3C0143BE */ lui $at, 0x43be -/* BA14A0 80240D70 44810000 */ mtc1 $at, $f0 -/* BA14A4 80240D74 00000000 */ nop -/* BA14A8 80240D78 E6200040 */ swc1 $f0, 0x40($s1) -.L80240D7C: -/* BA14AC 80240D7C C6200040 */ lwc1 $f0, 0x40($s1) -/* BA14B0 80240D80 46000021 */ cvt.d.s $f0, $f0 -/* BA14B4 80240D84 4622003C */ c.lt.d $f0, $f2 -/* BA14B8 80240D88 00000000 */ nop -/* BA14BC 80240D8C 45000005 */ bc1f .L80240DA4 -/* BA14C0 80240D90 00000000 */ nop -/* BA14C4 80240D94 3C01C3BE */ lui $at, 0xc3be -/* BA14C8 80240D98 44810000 */ mtc1 $at, $f0 -/* BA14CC 80240D9C 00000000 */ nop -/* BA14D0 80240DA0 E6200040 */ swc1 $f0, 0x40($s1) -.L80240DA4: -/* BA14D4 80240DA4 C6220038 */ lwc1 $f2, 0x38($s1) -/* BA14D8 80240DA8 46021082 */ mul.s $f2, $f2, $f2 -/* BA14DC 80240DAC 00000000 */ nop -/* BA14E0 80240DB0 C6200040 */ lwc1 $f0, 0x40($s1) -/* BA14E4 80240DB4 46000002 */ mul.s $f0, $f0, $f0 -/* BA14E8 80240DB8 00000000 */ nop -/* BA14EC 80240DBC 46001300 */ add.s $f12, $f2, $f0 -/* BA14F0 80240DC0 46006004 */ sqrt.s $f0, $f12 -/* BA14F4 80240DC4 46000032 */ c.eq.s $f0, $f0 -/* BA14F8 80240DC8 00000000 */ nop -/* BA14FC 80240DCC 45010003 */ bc1t .L80240DDC -/* BA1500 80240DD0 00000000 */ nop -/* BA1504 80240DD4 0C0187BC */ jal sqrtf -/* BA1508 80240DD8 00000000 */ nop -.L80240DDC: -/* BA150C 80240DDC 8E260038 */ lw $a2, 0x38($s1) -/* BA1510 80240DE0 8E270040 */ lw $a3, 0x40($s1) -/* BA1514 80240DE4 4480A000 */ mtc1 $zero, $f20 -/* BA1518 80240DE8 E7A00038 */ swc1 $f0, 0x38($sp) -/* BA151C 80240DEC 4600A306 */ mov.s $f12, $f20 -/* BA1520 80240DF0 0C00A720 */ jal atan2 -/* BA1524 80240DF4 4600A386 */ mov.s $f14, $f20 -/* BA1528 80240DF8 46000586 */ mov.s $f22, $f0 -/* BA152C 80240DFC C7A20038 */ lwc1 $f2, 0x38($sp) -/* BA1530 80240E00 3C018024 */ lui $at, 0x8024 -/* BA1534 80240E04 D4204028 */ ldc1 $f0, 0x4028($at) -/* BA1538 80240E08 460010A1 */ cvt.d.s $f2, $f2 -/* BA153C 80240E0C 4620103C */ c.lt.d $f2, $f0 -/* BA1540 80240E10 00000000 */ nop -/* BA1544 80240E14 45000004 */ bc1f .L80240E28 -/* BA1548 80240E18 0200202D */ daddu $a0, $s0, $zero -/* BA154C 80240E1C 3C064398 */ lui $a2, 0x4398 -/* BA1550 80240E20 08090392 */ j .L80240E48 -/* BA1554 80240E24 34C68000 */ ori $a2, $a2, 0x8000 -.L80240E28: -/* BA1558 80240E28 3C018024 */ lui $at, 0x8024 -/* BA155C 80240E2C D4204030 */ ldc1 $f0, 0x4030($at) -/* BA1560 80240E30 4622003C */ c.lt.d $f0, $f2 -/* BA1564 80240E34 00000000 */ nop -/* BA1568 80240E38 450000FA */ bc1f .L80241224 -/* BA156C 80240E3C 00000000 */ nop -/* BA1570 80240E40 3C0643BB */ lui $a2, 0x43bb -/* BA1574 80240E44 34C68000 */ ori $a2, $a2, 0x8000 -.L80240E48: -/* BA1578 80240E48 4407B000 */ mfc1 $a3, $f22 -/* BA157C 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* BA1580 80240E50 E6340038 */ swc1 $f20, 0x38($s1) -/* BA1584 80240E54 0C00A7E7 */ jal add_vec2D_polar -/* BA1588 80240E58 E6340040 */ swc1 $f20, 0x40($s1) -/* BA158C 80240E5C 08090489 */ j .L80241224 -/* BA1590 80240E60 00000000 */ nop -.L80240E64: -/* BA1594 80240E64 8E220000 */ lw $v0, ($s1) -/* BA1598 80240E68 30420040 */ andi $v0, $v0, 0x40 -/* BA159C 80240E6C 144000B0 */ bnez $v0, .L80241130 -/* BA15A0 80240E70 27A50020 */ addiu $a1, $sp, 0x20 -/* BA15A4 80240E74 27B40020 */ addiu $s4, $sp, 0x20 -/* BA15A8 80240E78 0280282D */ daddu $a1, $s4, $zero -/* BA15AC 80240E7C 27B30024 */ addiu $s3, $sp, 0x24 -/* BA15B0 80240E80 8EA20000 */ lw $v0, ($s5) -/* BA15B4 80240E84 3C014032 */ lui $at, 0x4032 -/* BA15B8 80240E88 44811800 */ mtc1 $at, $f3 -/* BA15BC 80240E8C 44801000 */ mtc1 $zero, $f2 -/* BA15C0 80240E90 C440002C */ lwc1 $f0, 0x2c($v0) -/* BA15C4 80240E94 C4460028 */ lwc1 $f6, 0x28($v0) -/* BA15C8 80240E98 C4440030 */ lwc1 $f4, 0x30($v0) -/* BA15CC 80240E9C 46000021 */ cvt.d.s $f0, $f0 -/* BA15D0 80240EA0 46220000 */ add.d $f0, $f0, $f2 -/* BA15D4 80240EA4 E7A60020 */ swc1 $f6, 0x20($sp) -/* BA15D8 80240EA8 E7A40028 */ swc1 $f4, 0x28($sp) -/* BA15DC 80240EAC 46200020 */ cvt.s.d $f0, $f0 -/* BA15E0 80240EB0 E7A00024 */ swc1 $f0, 0x24($sp) -/* BA15E4 80240EB4 E7B40010 */ swc1 $f20, 0x10($sp) -/* BA15E8 80240EB8 E7B60014 */ swc1 $f22, 0x14($sp) -/* BA15EC 80240EBC 862200A8 */ lh $v0, 0xa8($s1) -/* BA15F0 80240EC0 0260302D */ daddu $a2, $s3, $zero -/* BA15F4 80240EC4 44820000 */ mtc1 $v0, $f0 -/* BA15F8 80240EC8 00000000 */ nop -/* BA15FC 80240ECC 46800020 */ cvt.s.w $f0, $f0 -/* BA1600 80240ED0 E7A00018 */ swc1 $f0, 0x18($sp) -/* BA1604 80240ED4 862200A6 */ lh $v0, 0xa6($s1) -/* BA1608 80240ED8 27B00028 */ addiu $s0, $sp, 0x28 -/* BA160C 80240EDC 44820000 */ mtc1 $v0, $f0 -/* BA1610 80240EE0 00000000 */ nop -/* BA1614 80240EE4 46800020 */ cvt.s.w $f0, $f0 -/* BA1618 80240EE8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BA161C 80240EEC 8E240080 */ lw $a0, 0x80($s1) -/* BA1620 80240EF0 0C037711 */ jal func_800DDC44 -/* BA1624 80240EF4 0200382D */ daddu $a3, $s0, $zero -/* BA1628 80240EF8 104000CA */ beqz $v0, .L80241224 -/* BA162C 80240EFC 0280282D */ daddu $a1, $s4, $zero -/* BA1630 80240F00 8EA20000 */ lw $v0, ($s5) -/* BA1634 80240F04 3C018024 */ lui $at, 0x8024 -/* BA1638 80240F08 D4224038 */ ldc1 $f2, 0x4038($at) -/* BA163C 80240F0C C440002C */ lwc1 $f0, 0x2c($v0) -/* BA1640 80240F10 C4460028 */ lwc1 $f6, 0x28($v0) -/* BA1644 80240F14 C4440030 */ lwc1 $f4, 0x30($v0) -/* BA1648 80240F18 46000021 */ cvt.d.s $f0, $f0 -/* BA164C 80240F1C 46220000 */ add.d $f0, $f0, $f2 -/* BA1650 80240F20 E7A60020 */ swc1 $f6, 0x20($sp) -/* BA1654 80240F24 E7A40028 */ swc1 $f4, 0x28($sp) -/* BA1658 80240F28 46200020 */ cvt.s.d $f0, $f0 -/* BA165C 80240F2C E7A00024 */ swc1 $f0, 0x24($sp) -/* BA1660 80240F30 E7B40010 */ swc1 $f20, 0x10($sp) -/* BA1664 80240F34 E7B60014 */ swc1 $f22, 0x14($sp) -/* BA1668 80240F38 862200A8 */ lh $v0, 0xa8($s1) -/* BA166C 80240F3C 44820000 */ mtc1 $v0, $f0 -/* BA1670 80240F40 00000000 */ nop -/* BA1674 80240F44 46800020 */ cvt.s.w $f0, $f0 -/* BA1678 80240F48 E7A00018 */ swc1 $f0, 0x18($sp) -/* BA167C 80240F4C 862200A6 */ lh $v0, 0xa6($s1) -/* BA1680 80240F50 0260302D */ daddu $a2, $s3, $zero -/* BA1684 80240F54 44820000 */ mtc1 $v0, $f0 -/* BA1688 80240F58 00000000 */ nop -/* BA168C 80240F5C 46800020 */ cvt.s.w $f0, $f0 -/* BA1690 80240F60 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BA1694 80240F64 8E240080 */ lw $a0, 0x80($s1) -/* BA1698 80240F68 0C037711 */ jal func_800DDC44 -/* BA169C 80240F6C 0200382D */ daddu $a3, $s0, $zero -/* BA16A0 80240F70 27A5002C */ addiu $a1, $sp, 0x2c -/* BA16A4 80240F74 27A60030 */ addiu $a2, $sp, 0x30 -/* BA16A8 80240F78 27A70034 */ addiu $a3, $sp, 0x34 -/* BA16AC 80240F7C 27A30038 */ addiu $v1, $sp, 0x38 -/* BA16B0 80240F80 C6220038 */ lwc1 $f2, 0x38($s1) -/* BA16B4 80240F84 C620003C */ lwc1 $f0, 0x3c($s1) -/* BA16B8 80240F88 3C014348 */ lui $at, 0x4348 -/* BA16BC 80240F8C 44813000 */ mtc1 $at, $f6 -/* BA16C0 80240F90 46000021 */ cvt.d.s $f0, $f0 -/* BA16C4 80240F94 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BA16C8 80240F98 3C014059 */ lui $at, 0x4059 -/* BA16CC 80240F9C 44811800 */ mtc1 $at, $f3 -/* BA16D0 80240FA0 44801000 */ mtc1 $zero, $f2 -/* BA16D4 80240FA4 C6240040 */ lwc1 $f4, 0x40($s1) -/* BA16D8 80240FA8 46220000 */ add.d $f0, $f0, $f2 -/* BA16DC 80240FAC E7A60038 */ swc1 $f6, 0x38($sp) -/* BA16E0 80240FB0 E7A40034 */ swc1 $f4, 0x34($sp) -/* BA16E4 80240FB4 46200020 */ cvt.s.d $f0, $f0 -/* BA16E8 80240FB8 E7A00030 */ swc1 $f0, 0x30($sp) -/* BA16EC 80240FBC AFA30010 */ sw $v1, 0x10($sp) -/* BA16F0 80240FC0 8E240080 */ lw $a0, 0x80($s1) -/* BA16F4 80240FC4 0C0372DF */ jal func_800DCB7C -/* BA16F8 80240FC8 0040802D */ daddu $s0, $v0, $zero -/* BA16FC 80240FCC 1600001C */ bnez $s0, .L80241040 -/* BA1700 80240FD0 00000000 */ nop -/* BA1704 80240FD4 1040001A */ beqz $v0, .L80241040 -/* BA1708 80240FD8 00000000 */ nop -/* BA170C 80240FDC C7A20038 */ lwc1 $f2, 0x38($sp) -/* BA1710 80240FE0 3C014054 */ lui $at, 0x4054 -/* BA1714 80240FE4 44810800 */ mtc1 $at, $f1 -/* BA1718 80240FE8 44800000 */ mtc1 $zero, $f0 -/* BA171C 80240FEC 460010A1 */ cvt.d.s $f2, $f2 -/* BA1720 80240FF0 4622003C */ c.lt.d $f0, $f2 -/* BA1724 80240FF4 00000000 */ nop -/* BA1728 80240FF8 45000011 */ bc1f .L80241040 -/* BA172C 80240FFC 00000000 */ nop -/* BA1730 80241000 3C01405E */ lui $at, 0x405e -/* BA1734 80241004 44810800 */ mtc1 $at, $f1 -/* BA1738 80241008 44800000 */ mtc1 $zero, $f0 -/* BA173C 8024100C 00000000 */ nop -/* BA1740 80241010 4620103C */ c.lt.d $f2, $f0 -/* BA1744 80241014 00000000 */ nop -/* BA1748 80241018 45000009 */ bc1f .L80241040 -/* BA174C 8024101C 00000000 */ nop -/* BA1750 80241020 C622003C */ lwc1 $f2, 0x3c($s1) -/* BA1754 80241024 C7A00030 */ lwc1 $f0, 0x30($sp) -/* BA1758 80241028 46001032 */ c.eq.s $f2, $f0 -/* BA175C 8024102C 00000000 */ nop -/* BA1760 80241030 45010003 */ bc1t .L80241040 -/* BA1764 80241034 00000000 */ nop -/* BA1768 80241038 08090489 */ j .L80241224 -/* BA176C 8024103C 241E0001 */ addiu $fp, $zero, 1 -.L80241040: -/* BA1770 80241040 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* BA1774 80241044 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* BA1778 80241048 8E020000 */ lw $v0, ($s0) -/* BA177C 8024104C 3C014024 */ lui $at, 0x4024 -/* BA1780 80241050 44811800 */ mtc1 $at, $f3 -/* BA1784 80241054 44801000 */ mtc1 $zero, $f2 -/* BA1788 80241058 C440002C */ lwc1 $f0, 0x2c($v0) -/* BA178C 8024105C C4460028 */ lwc1 $f6, 0x28($v0) -/* BA1790 80241060 C4440030 */ lwc1 $f4, 0x30($v0) -/* BA1794 80241064 46000021 */ cvt.d.s $f0, $f0 -/* BA1798 80241068 46220000 */ add.d $f0, $f0, $f2 -/* BA179C 8024106C E7A60020 */ swc1 $f6, 0x20($sp) -/* BA17A0 80241070 E7A40028 */ swc1 $f4, 0x28($sp) -/* BA17A4 80241074 46200020 */ cvt.s.d $f0, $f0 -/* BA17A8 80241078 E7A00024 */ swc1 $f0, 0x24($sp) -/* BA17AC 8024107C E7B40010 */ swc1 $f20, 0x10($sp) -/* BA17B0 80241080 E7B60014 */ swc1 $f22, 0x14($sp) -/* BA17B4 80241084 862200A8 */ lh $v0, 0xa8($s1) -/* BA17B8 80241088 27A50020 */ addiu $a1, $sp, 0x20 -/* BA17BC 8024108C 44820000 */ mtc1 $v0, $f0 -/* BA17C0 80241090 00000000 */ nop -/* BA17C4 80241094 46800020 */ cvt.s.w $f0, $f0 -/* BA17C8 80241098 E7A00018 */ swc1 $f0, 0x18($sp) -/* BA17CC 8024109C 862200A6 */ lh $v0, 0xa6($s1) -/* BA17D0 802410A0 27A60024 */ addiu $a2, $sp, 0x24 -/* BA17D4 802410A4 44820000 */ mtc1 $v0, $f0 -/* BA17D8 802410A8 00000000 */ nop -/* BA17DC 802410AC 46800020 */ cvt.s.w $f0, $f0 -/* BA17E0 802410B0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BA17E4 802410B4 8E240080 */ lw $a0, 0x80($s1) -/* BA17E8 802410B8 0C037711 */ jal func_800DDC44 -/* BA17EC 802410BC 27A70028 */ addiu $a3, $sp, 0x28 -/* BA17F0 802410C0 8FA60020 */ lw $a2, 0x20($sp) -/* BA17F4 802410C4 8E020000 */ lw $v0, ($s0) -/* BA17F8 802410C8 8FA70028 */ lw $a3, 0x28($sp) -/* BA17FC 802410CC C44C0028 */ lwc1 $f12, 0x28($v0) -/* BA1800 802410D0 C44E0030 */ lwc1 $f14, 0x30($v0) -/* BA1804 802410D4 0C00A7B5 */ jal dist2D -/* BA1808 802410D8 24170001 */ addiu $s7, $zero, 1 -/* BA180C 802410DC 46000506 */ mov.s $f20, $f0 -/* BA1810 802410E0 8E030000 */ lw $v1, ($s0) -/* BA1814 802410E4 862200A6 */ lh $v0, 0xa6($s1) -/* BA1818 802410E8 4407C000 */ mfc1 $a3, $f24 -/* BA181C 802410EC 44824000 */ mtc1 $v0, $f8 -/* BA1820 802410F0 00000000 */ nop -/* BA1824 802410F4 46804220 */ cvt.s.w $f8, $f8 -/* BA1828 802410F8 C4600028 */ lwc1 $f0, 0x28($v1) -/* BA182C 802410FC 44064000 */ mfc1 $a2, $f8 -/* BA1830 80241100 26240038 */ addiu $a0, $s1, 0x38 -/* BA1834 80241104 E6200038 */ swc1 $f0, 0x38($s1) -/* BA1838 80241108 C4600030 */ lwc1 $f0, 0x30($v1) -/* BA183C 8024110C 26250040 */ addiu $a1, $s1, 0x40 -/* BA1840 80241110 0C00A7E7 */ jal add_vec2D_polar -/* BA1844 80241114 E6200040 */ swc1 $f0, 0x40($s1) -/* BA1848 80241118 862200A6 */ lh $v0, 0xa6($s1) -/* BA184C 8024111C 44820000 */ mtc1 $v0, $f0 -/* BA1850 80241120 00000000 */ nop -/* BA1854 80241124 46800020 */ cvt.s.w $f0, $f0 -/* BA1858 80241128 08090485 */ j .L80241214 -/* BA185C 8024112C 4600A500 */ add.s $f20, $f20, $f0 -.L80241130: -/* BA1860 80241130 8EA20000 */ lw $v0, ($s5) -/* BA1864 80241134 3C014032 */ lui $at, 0x4032 -/* BA1868 80241138 44811800 */ mtc1 $at, $f3 -/* BA186C 8024113C 44801000 */ mtc1 $zero, $f2 -/* BA1870 80241140 C440002C */ lwc1 $f0, 0x2c($v0) -/* BA1874 80241144 C4460028 */ lwc1 $f6, 0x28($v0) -/* BA1878 80241148 C4440030 */ lwc1 $f4, 0x30($v0) -/* BA187C 8024114C 46000021 */ cvt.d.s $f0, $f0 -/* BA1880 80241150 46220000 */ add.d $f0, $f0, $f2 -/* BA1884 80241154 E7A60020 */ swc1 $f6, 0x20($sp) -/* BA1888 80241158 E7A40028 */ swc1 $f4, 0x28($sp) -/* BA188C 8024115C 46200020 */ cvt.s.d $f0, $f0 -/* BA1890 80241160 E7A00024 */ swc1 $f0, 0x24($sp) -/* BA1894 80241164 E7B40010 */ swc1 $f20, 0x10($sp) -/* BA1898 80241168 E7B60014 */ swc1 $f22, 0x14($sp) -/* BA189C 8024116C 862200A8 */ lh $v0, 0xa8($s1) -/* BA18A0 80241170 44820000 */ mtc1 $v0, $f0 -/* BA18A4 80241174 00000000 */ nop -/* BA18A8 80241178 46800020 */ cvt.s.w $f0, $f0 -/* BA18AC 8024117C E7A00018 */ swc1 $f0, 0x18($sp) -/* BA18B0 80241180 862200A6 */ lh $v0, 0xa6($s1) -/* BA18B4 80241184 27A60024 */ addiu $a2, $sp, 0x24 -/* BA18B8 80241188 44820000 */ mtc1 $v0, $f0 -/* BA18BC 8024118C 00000000 */ nop -/* BA18C0 80241190 46800020 */ cvt.s.w $f0, $f0 -/* BA18C4 80241194 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BA18C8 80241198 8E240080 */ lw $a0, 0x80($s1) -/* BA18CC 8024119C 0C037711 */ jal func_800DDC44 -/* BA18D0 802411A0 27A70028 */ addiu $a3, $sp, 0x28 -/* BA18D4 802411A4 1040001F */ beqz $v0, .L80241224 -/* BA18D8 802411A8 00000000 */ nop -/* BA18DC 802411AC 8FA60020 */ lw $a2, 0x20($sp) -/* BA18E0 802411B0 8EA20000 */ lw $v0, ($s5) -/* BA18E4 802411B4 8FA70028 */ lw $a3, 0x28($sp) -/* BA18E8 802411B8 C44C0028 */ lwc1 $f12, 0x28($v0) -/* BA18EC 802411BC 0C00A7B5 */ jal dist2D -/* BA18F0 802411C0 C44E0030 */ lwc1 $f14, 0x30($v0) -/* BA18F4 802411C4 46000506 */ mov.s $f20, $f0 -/* BA18F8 802411C8 8EA30000 */ lw $v1, ($s5) -/* BA18FC 802411CC 862200A6 */ lh $v0, 0xa6($s1) -/* BA1900 802411D0 4407C000 */ mfc1 $a3, $f24 -/* BA1904 802411D4 44824000 */ mtc1 $v0, $f8 -/* BA1908 802411D8 00000000 */ nop -/* BA190C 802411DC 46804220 */ cvt.s.w $f8, $f8 -/* BA1910 802411E0 C4600028 */ lwc1 $f0, 0x28($v1) -/* BA1914 802411E4 44064000 */ mfc1 $a2, $f8 -/* BA1918 802411E8 0200202D */ daddu $a0, $s0, $zero -/* BA191C 802411EC E6200038 */ swc1 $f0, 0x38($s1) -/* BA1920 802411F0 C4600030 */ lwc1 $f0, 0x30($v1) -/* BA1924 802411F4 0260282D */ daddu $a1, $s3, $zero -/* BA1928 802411F8 0C00A7E7 */ jal add_vec2D_polar -/* BA192C 802411FC E6200040 */ swc1 $f0, 0x40($s1) -/* BA1930 80241200 862200A6 */ lh $v0, 0xa6($s1) -/* BA1934 80241204 44820000 */ mtc1 $v0, $f0 -/* BA1938 80241208 00000000 */ nop -/* BA193C 8024120C 46800020 */ cvt.s.w $f0, $f0 -/* BA1940 80241210 4600A500 */ add.s $f20, $f20, $f0 -.L80241214: -/* BA1944 80241214 4406B000 */ mfc1 $a2, $f22 -/* BA1948 80241218 4405A000 */ mfc1 $a1, $f20 -/* BA194C 8024121C 0C00EA95 */ jal npc_move_heading -/* BA1950 80241220 0220202D */ daddu $a0, $s1, $zero -.L80241224: -/* BA1954 80241224 C6400008 */ lwc1 $f0, 8($s2) -/* BA1958 80241228 46800020 */ cvt.s.w $f0, $f0 -/* BA195C 8024122C 44050000 */ mfc1 $a1, $f0 -/* BA1960 80241230 C640000C */ lwc1 $f0, 0xc($s2) -/* BA1964 80241234 46800020 */ cvt.s.w $f0, $f0 -/* BA1968 80241238 44060000 */ mfc1 $a2, $f0 -/* BA196C 8024123C C6200040 */ lwc1 $f0, 0x40($s1) -/* BA1970 80241240 26300038 */ addiu $s0, $s1, 0x38 -/* BA1974 80241244 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA1978 80241248 C6400010 */ lwc1 $f0, 0x10($s2) -/* BA197C 8024124C 46800020 */ cvt.s.w $f0, $f0 -/* BA1980 80241250 E7A00014 */ swc1 $f0, 0x14($sp) -/* BA1984 80241254 C6400014 */ lwc1 $f0, 0x14($s2) -/* BA1988 80241258 46800020 */ cvt.s.w $f0, $f0 -/* BA198C 8024125C E7A00018 */ swc1 $f0, 0x18($sp) -/* BA1990 80241260 8E440004 */ lw $a0, 4($s2) -/* BA1994 80241264 8E270038 */ lw $a3, 0x38($s1) -/* BA1998 80241268 0C0123F5 */ jal is_point_within_region -/* BA199C 8024126C 26330040 */ addiu $s3, $s1, 0x40 -/* BA19A0 80241270 1040005A */ beqz $v0, .L802413DC -/* BA19A4 80241274 00000000 */ nop -/* BA19A8 80241278 8E430004 */ lw $v1, 4($s2) -/* BA19AC 8024127C 10600005 */ beqz $v1, .L80241294 -/* BA19B0 80241280 24020001 */ addiu $v0, $zero, 1 -/* BA19B4 80241284 10620029 */ beq $v1, $v0, .L8024132C -/* BA19B8 80241288 00000000 */ nop -/* BA19BC 8024128C 080904F7 */ j .L802413DC -/* BA19C0 80241290 00000000 */ nop -.L80241294: -/* BA19C4 80241294 C6480008 */ lwc1 $f8, 8($s2) -/* BA19C8 80241298 46804220 */ cvt.s.w $f8, $f8 -/* BA19CC 8024129C 44064000 */ mfc1 $a2, $f8 -/* BA19D0 802412A0 C648000C */ lwc1 $f8, 0xc($s2) -/* BA19D4 802412A4 46804220 */ cvt.s.w $f8, $f8 -/* BA19D8 802412A8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BA19DC 802412AC C62E0040 */ lwc1 $f14, 0x40($s1) -/* BA19E0 802412B0 44074000 */ mfc1 $a3, $f8 -/* BA19E4 802412B4 0C00A7B5 */ jal dist2D -/* BA19E8 802412B8 00000000 */ nop -/* BA19EC 802412BC C6420010 */ lwc1 $f2, 0x10($s2) -/* BA19F0 802412C0 468010A0 */ cvt.s.w $f2, $f2 -/* BA19F4 802412C4 4600103C */ c.lt.s $f2, $f0 -/* BA19F8 802412C8 00000000 */ nop -/* BA19FC 802412CC 45000043 */ bc1f .L802413DC -/* BA1A00 802412D0 E7A00038 */ swc1 $f0, 0x38($sp) -/* BA1A04 802412D4 C64C0008 */ lwc1 $f12, 8($s2) -/* BA1A08 802412D8 46806320 */ cvt.s.w $f12, $f12 -/* BA1A0C 802412DC 8E260038 */ lw $a2, 0x38($s1) -/* BA1A10 802412E0 8E270040 */ lw $a3, 0x40($s1) -/* BA1A14 802412E4 C64E000C */ lwc1 $f14, 0xc($s2) -/* BA1A18 802412E8 0C00A720 */ jal atan2 -/* BA1A1C 802412EC 468073A0 */ cvt.s.w $f14, $f14 -/* BA1A20 802412F0 0200202D */ daddu $a0, $s0, $zero -/* BA1A24 802412F4 44070000 */ mfc1 $a3, $f0 -/* BA1A28 802412F8 C6400008 */ lwc1 $f0, 8($s2) -/* BA1A2C 802412FC 46800020 */ cvt.s.w $f0, $f0 -/* BA1A30 80241300 E6200038 */ swc1 $f0, 0x38($s1) -/* BA1A34 80241304 C640000C */ lwc1 $f0, 0xc($s2) -/* BA1A38 80241308 46800020 */ cvt.s.w $f0, $f0 -/* BA1A3C 8024130C E6200040 */ swc1 $f0, 0x40($s1) -/* BA1A40 80241310 C6480010 */ lwc1 $f8, 0x10($s2) -/* BA1A44 80241314 46804220 */ cvt.s.w $f8, $f8 -/* BA1A48 80241318 44064000 */ mfc1 $a2, $f8 -/* BA1A4C 8024131C 0C00A7E7 */ jal add_vec2D_polar -/* BA1A50 80241320 0260282D */ daddu $a1, $s3, $zero -/* BA1A54 80241324 080904F7 */ j .L802413DC -/* BA1A58 80241328 00000000 */ nop -.L8024132C: -/* BA1A5C 8024132C 8E420008 */ lw $v0, 8($s2) -/* BA1A60 80241330 8E430010 */ lw $v1, 0x10($s2) -/* BA1A64 80241334 C6200038 */ lwc1 $f0, 0x38($s1) -/* BA1A68 80241338 00431021 */ addu $v0, $v0, $v1 -/* BA1A6C 8024133C 44821000 */ mtc1 $v0, $f2 -/* BA1A70 80241340 00000000 */ nop -/* BA1A74 80241344 468010A0 */ cvt.s.w $f2, $f2 -/* BA1A78 80241348 4600103C */ c.lt.s $f2, $f0 -/* BA1A7C 8024134C 00000000 */ nop -/* BA1A80 80241350 45030001 */ bc1tl .L80241358 -/* BA1A84 80241354 E6220038 */ swc1 $f2, 0x38($s1) -.L80241358: -/* BA1A88 80241358 8E420008 */ lw $v0, 8($s2) -/* BA1A8C 8024135C 8E430010 */ lw $v1, 0x10($s2) -/* BA1A90 80241360 C6200038 */ lwc1 $f0, 0x38($s1) -/* BA1A94 80241364 00431023 */ subu $v0, $v0, $v1 -/* BA1A98 80241368 44821000 */ mtc1 $v0, $f2 -/* BA1A9C 8024136C 00000000 */ nop -/* BA1AA0 80241370 468010A0 */ cvt.s.w $f2, $f2 -/* BA1AA4 80241374 4602003C */ c.lt.s $f0, $f2 -/* BA1AA8 80241378 00000000 */ nop -/* BA1AAC 8024137C 45030001 */ bc1tl .L80241384 -/* BA1AB0 80241380 E6220038 */ swc1 $f2, 0x38($s1) -.L80241384: -/* BA1AB4 80241384 8E42000C */ lw $v0, 0xc($s2) -/* BA1AB8 80241388 8E430014 */ lw $v1, 0x14($s2) -/* BA1ABC 8024138C C6200040 */ lwc1 $f0, 0x40($s1) -/* BA1AC0 80241390 00431021 */ addu $v0, $v0, $v1 -/* BA1AC4 80241394 44821000 */ mtc1 $v0, $f2 -/* BA1AC8 80241398 00000000 */ nop -/* BA1ACC 8024139C 468010A0 */ cvt.s.w $f2, $f2 -/* BA1AD0 802413A0 4600103C */ c.lt.s $f2, $f0 -/* BA1AD4 802413A4 00000000 */ nop -/* BA1AD8 802413A8 45030001 */ bc1tl .L802413B0 -/* BA1ADC 802413AC E6220040 */ swc1 $f2, 0x40($s1) -.L802413B0: -/* BA1AE0 802413B0 8E42000C */ lw $v0, 0xc($s2) -/* BA1AE4 802413B4 8E430014 */ lw $v1, 0x14($s2) -/* BA1AE8 802413B8 C6200040 */ lwc1 $f0, 0x40($s1) -/* BA1AEC 802413BC 00431023 */ subu $v0, $v0, $v1 -/* BA1AF0 802413C0 44821000 */ mtc1 $v0, $f2 -/* BA1AF4 802413C4 00000000 */ nop -/* BA1AF8 802413C8 468010A0 */ cvt.s.w $f2, $f2 -/* BA1AFC 802413CC 4602003C */ c.lt.s $f0, $f2 -/* BA1B00 802413D0 00000000 */ nop -/* BA1B04 802413D4 45030001 */ bc1tl .L802413DC -/* BA1B08 802413D8 E6220040 */ swc1 $f2, 0x40($s1) -.L802413DC: -/* BA1B0C 802413DC 16E0001F */ bnez $s7, .L8024145C -/* BA1B10 802413E0 00000000 */ nop -/* BA1B14 802413E4 8E220000 */ lw $v0, ($s1) -/* BA1B18 802413E8 30420008 */ andi $v0, $v0, 8 -/* BA1B1C 802413EC 10400003 */ beqz $v0, .L802413FC -/* BA1B20 802413F0 27A50020 */ addiu $a1, $sp, 0x20 -/* BA1B24 802413F4 13C00019 */ beqz $fp, .L8024145C -/* BA1B28 802413F8 00000000 */ nop -.L802413FC: -/* BA1B2C 802413FC 27A60024 */ addiu $a2, $sp, 0x24 -/* BA1B30 80241400 27A20038 */ addiu $v0, $sp, 0x38 -/* BA1B34 80241404 C6220038 */ lwc1 $f2, 0x38($s1) -/* BA1B38 80241408 C620003C */ lwc1 $f0, 0x3c($s1) -/* BA1B3C 8024140C 3C0143C8 */ lui $at, 0x43c8 -/* BA1B40 80241410 44813000 */ mtc1 $at, $f6 -/* BA1B44 80241414 46000021 */ cvt.d.s $f0, $f0 -/* BA1B48 80241418 E7A20020 */ swc1 $f2, 0x20($sp) -/* BA1B4C 8024141C 3C018024 */ lui $at, 0x8024 -/* BA1B50 80241420 D4224040 */ ldc1 $f2, 0x4040($at) -/* BA1B54 80241424 C6240040 */ lwc1 $f4, 0x40($s1) -/* BA1B58 80241428 46220000 */ add.d $f0, $f0, $f2 -/* BA1B5C 8024142C E7A60038 */ swc1 $f6, 0x38($sp) -/* BA1B60 80241430 E7A40028 */ swc1 $f4, 0x28($sp) -/* BA1B64 80241434 46200020 */ cvt.s.d $f0, $f0 -/* BA1B68 80241438 E7A00024 */ swc1 $f0, 0x24($sp) -/* BA1B6C 8024143C AFA20010 */ sw $v0, 0x10($sp) -/* BA1B70 80241440 8E240080 */ lw $a0, 0x80($s1) -/* BA1B74 80241444 0C0372DF */ jal func_800DCB7C -/* BA1B78 80241448 27A70028 */ addiu $a3, $sp, 0x28 -/* BA1B7C 8024144C 10400003 */ beqz $v0, .L8024145C -/* BA1B80 80241450 00000000 */ nop -/* BA1B84 80241454 C7A00024 */ lwc1 $f0, 0x24($sp) -/* BA1B88 80241458 E620003C */ swc1 $f0, 0x3c($s1) -.L8024145C: -/* BA1B8C 8024145C C62C0038 */ lwc1 $f12, 0x38($s1) -/* BA1B90 80241460 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BA1B94 80241464 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BA1B98 80241468 C62E0040 */ lwc1 $f14, 0x40($s1) -/* BA1B9C 8024146C 8C460028 */ lw $a2, 0x28($v0) -/* BA1BA0 80241470 0C00A720 */ jal atan2 -/* BA1BA4 80241474 8C470030 */ lw $a3, 0x30($v0) -/* BA1BA8 80241478 0220202D */ daddu $a0, $s1, $zero -/* BA1BAC 8024147C 24050321 */ addiu $a1, $zero, 0x321 -/* BA1BB0 80241480 0000302D */ daddu $a2, $zero, $zero -/* BA1BB4 80241484 0C012530 */ jal func_800494C0 -/* BA1BB8 80241488 E620000C */ swc1 $f0, 0xc($s1) -/* BA1BBC 8024148C 8EC200CC */ lw $v0, 0xcc($s6) -/* BA1BC0 80241490 8C420024 */ lw $v0, 0x24($v0) -/* BA1BC4 80241494 AE220028 */ sw $v0, 0x28($s1) -/* BA1BC8 80241498 96C20096 */ lhu $v0, 0x96($s6) -/* BA1BCC 8024149C A622008E */ sh $v0, 0x8e($s1) -/* BA1BD0 802414A0 8FA80080 */ lw $t0, 0x80($sp) -/* BA1BD4 802414A4 2402000B */ addiu $v0, $zero, 0xb -/* BA1BD8 802414A8 AD020070 */ sw $v0, 0x70($t0) -.L802414AC: -/* BA1BDC 802414AC 8FBF0064 */ lw $ra, 0x64($sp) -/* BA1BE0 802414B0 8FBE0060 */ lw $fp, 0x60($sp) -/* BA1BE4 802414B4 8FB7005C */ lw $s7, 0x5c($sp) -/* BA1BE8 802414B8 8FB60058 */ lw $s6, 0x58($sp) -/* BA1BEC 802414BC 8FB50054 */ lw $s5, 0x54($sp) -/* BA1BF0 802414C0 8FB40050 */ lw $s4, 0x50($sp) -/* BA1BF4 802414C4 8FB3004C */ lw $s3, 0x4c($sp) -/* BA1BF8 802414C8 8FB20048 */ lw $s2, 0x48($sp) -/* BA1BFC 802414CC 8FB10044 */ lw $s1, 0x44($sp) -/* BA1C00 802414D0 8FB00040 */ lw $s0, 0x40($sp) -/* BA1C04 802414D4 D7B80078 */ ldc1 $f24, 0x78($sp) -/* BA1C08 802414D8 D7B60070 */ ldc1 $f22, 0x70($sp) -/* BA1C0C 802414DC D7B40068 */ ldc1 $f20, 0x68($sp) -/* BA1C10 802414E0 03E00008 */ jr $ra -/* BA1C14 802414E4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_mim/mim_05/func_802414E8_BA0730.s b/asm/nonmatchings/world/area_mim/mim_05/func_802414E8_BA0730.s deleted file mode 100644 index 554b407434..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/func_802414E8_BA0730.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414E8_BA1C18 -/* BA1C18 802414E8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA1C1C 802414EC AFB10014 */ sw $s1, 0x14($sp) -/* BA1C20 802414F0 0080882D */ daddu $s1, $a0, $zero -/* BA1C24 802414F4 AFBF0018 */ sw $ra, 0x18($sp) -/* BA1C28 802414F8 AFB00010 */ sw $s0, 0x10($sp) -/* BA1C2C 802414FC 8E300148 */ lw $s0, 0x148($s1) -/* BA1C30 80241500 0C00EABB */ jal get_npc_unsafe -/* BA1C34 80241504 86040008 */ lh $a0, 8($s0) -/* BA1C38 80241508 0040202D */ daddu $a0, $v0, $zero -/* BA1C3C 8024150C 9482008E */ lhu $v0, 0x8e($a0) -/* BA1C40 80241510 2442FFFF */ addiu $v0, $v0, -1 -/* BA1C44 80241514 A482008E */ sh $v0, 0x8e($a0) -/* BA1C48 80241518 00021400 */ sll $v0, $v0, 0x10 -/* BA1C4C 8024151C 8E030098 */ lw $v1, 0x98($s0) -/* BA1C50 80241520 00021403 */ sra $v0, $v0, 0x10 -/* BA1C54 80241524 0062182A */ slt $v1, $v1, $v0 -/* BA1C58 80241528 14600005 */ bnez $v1, .L80241540 -/* BA1C5C 8024152C 3C03E0EF */ lui $v1, 0xe0ef -/* BA1C60 80241530 8E020000 */ lw $v0, ($s0) -/* BA1C64 80241534 3463FFFF */ ori $v1, $v1, 0xffff -/* BA1C68 80241538 00431024 */ and $v0, $v0, $v1 -/* BA1C6C 8024153C AE020000 */ sw $v0, ($s0) -.L80241540: -/* BA1C70 80241540 8482008E */ lh $v0, 0x8e($a0) -/* BA1C74 80241544 14400007 */ bnez $v0, .L80241564 -/* BA1C78 80241548 00000000 */ nop -/* BA1C7C 8024154C 8E0200CC */ lw $v0, 0xcc($s0) -/* BA1C80 80241550 8C420028 */ lw $v0, 0x28($v0) -/* BA1C84 80241554 A480008E */ sh $zero, 0x8e($a0) -/* BA1C88 80241558 AC820028 */ sw $v0, 0x28($a0) -/* BA1C8C 8024155C 2402000C */ addiu $v0, $zero, 0xc -/* BA1C90 80241560 AE220070 */ sw $v0, 0x70($s1) -.L80241564: -/* BA1C94 80241564 8FBF0018 */ lw $ra, 0x18($sp) -/* BA1C98 80241568 8FB10014 */ lw $s1, 0x14($sp) -/* BA1C9C 8024156C 8FB00010 */ lw $s0, 0x10($sp) -/* BA1CA0 80241570 03E00008 */ jr $ra -/* BA1CA4 80241574 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_05/func_80241578_BA0730.s b/asm/nonmatchings/world/area_mim/mim_05/func_80241578_BA0730.s deleted file mode 100644 index a7ddca3f2d..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/func_80241578_BA0730.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241578_BA1CA8 -/* BA1CA8 80241578 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BA1CAC 8024157C AFB10034 */ sw $s1, 0x34($sp) -/* BA1CB0 80241580 0080882D */ daddu $s1, $a0, $zero -/* BA1CB4 80241584 AFBF0038 */ sw $ra, 0x38($sp) -/* BA1CB8 80241588 AFB00030 */ sw $s0, 0x30($sp) -/* BA1CBC 8024158C 8E300148 */ lw $s0, 0x148($s1) -/* BA1CC0 80241590 0C00EABB */ jal get_npc_unsafe -/* BA1CC4 80241594 86040008 */ lh $a0, 8($s0) -/* BA1CC8 80241598 0040282D */ daddu $a1, $v0, $zero -/* BA1CCC 8024159C 94A2008E */ lhu $v0, 0x8e($a1) -/* BA1CD0 802415A0 24420001 */ addiu $v0, $v0, 1 -/* BA1CD4 802415A4 A4A2008E */ sh $v0, 0x8e($a1) -/* BA1CD8 802415A8 00021400 */ sll $v0, $v0, 0x10 -/* BA1CDC 802415AC 8E0300A0 */ lw $v1, 0xa0($s0) -/* BA1CE0 802415B0 00021403 */ sra $v0, $v0, 0x10 -/* BA1CE4 802415B4 14430004 */ bne $v0, $v1, .L802415C8 -/* BA1CE8 802415B8 00000000 */ nop -/* BA1CEC 802415BC 8E0200CC */ lw $v0, 0xcc($s0) -/* BA1CF0 802415C0 8C42002C */ lw $v0, 0x2c($v0) -/* BA1CF4 802415C4 ACA20028 */ sw $v0, 0x28($a1) -.L802415C8: -/* BA1CF8 802415C8 84A3008E */ lh $v1, 0x8e($a1) -/* BA1CFC 802415CC 8E0200A4 */ lw $v0, 0xa4($s0) -/* BA1D00 802415D0 14620002 */ bne $v1, $v0, .L802415DC -/* BA1D04 802415D4 24020003 */ addiu $v0, $zero, 3 -/* BA1D08 802415D8 AE02006C */ sw $v0, 0x6c($s0) -.L802415DC: -/* BA1D0C 802415DC 84A2008E */ lh $v0, 0x8e($a1) -/* BA1D10 802415E0 8E03009C */ lw $v1, 0x9c($s0) -/* BA1D14 802415E4 0043102A */ slt $v0, $v0, $v1 -/* BA1D18 802415E8 1440001E */ bnez $v0, .L80241664 -/* BA1D1C 802415EC 24020004 */ addiu $v0, $zero, 4 -/* BA1D20 802415F0 AE02006C */ sw $v0, 0x6c($s0) -/* BA1D24 802415F4 24020008 */ addiu $v0, $zero, 8 -/* BA1D28 802415F8 24040003 */ addiu $a0, $zero, 3 -/* BA1D2C 802415FC A4A2008E */ sh $v0, 0x8e($a1) -/* BA1D30 80241600 8E0200CC */ lw $v0, 0xcc($s0) -/* BA1D34 80241604 84A300A8 */ lh $v1, 0xa8($a1) -/* BA1D38 80241608 3C013F80 */ lui $at, 0x3f80 -/* BA1D3C 8024160C 44810000 */ mtc1 $at, $f0 -/* BA1D40 80241610 3C014000 */ lui $at, 0x4000 -/* BA1D44 80241614 44811000 */ mtc1 $at, $f2 -/* BA1D48 80241618 3C01C1A0 */ lui $at, 0xc1a0 -/* BA1D4C 8024161C 44812000 */ mtc1 $at, $f4 -/* BA1D50 80241620 44833000 */ mtc1 $v1, $f6 -/* BA1D54 80241624 00000000 */ nop -/* BA1D58 80241628 468031A0 */ cvt.s.w $f6, $f6 -/* BA1D5C 8024162C 8C420000 */ lw $v0, ($v0) -/* BA1D60 80241630 44073000 */ mfc1 $a3, $f6 -/* BA1D64 80241634 0000302D */ daddu $a2, $zero, $zero -/* BA1D68 80241638 ACA20028 */ sw $v0, 0x28($a1) -/* BA1D6C 8024163C 2402000A */ addiu $v0, $zero, 0xa -/* BA1D70 80241640 AFA2001C */ sw $v0, 0x1c($sp) -/* BA1D74 80241644 27A20028 */ addiu $v0, $sp, 0x28 -/* BA1D78 80241648 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA1D7C 8024164C E7A20014 */ swc1 $f2, 0x14($sp) -/* BA1D80 80241650 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA1D84 80241654 0C01BFA4 */ jal fx_emote -/* BA1D88 80241658 AFA20020 */ sw $v0, 0x20($sp) -/* BA1D8C 8024165C 2402000D */ addiu $v0, $zero, 0xd -/* BA1D90 80241660 AE220070 */ sw $v0, 0x70($s1) -.L80241664: -/* BA1D94 80241664 8FBF0038 */ lw $ra, 0x38($sp) -/* BA1D98 80241668 8FB10034 */ lw $s1, 0x34($sp) -/* BA1D9C 8024166C 8FB00030 */ lw $s0, 0x30($sp) -/* BA1DA0 80241670 03E00008 */ jr $ra -/* BA1DA4 80241674 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_05/func_802417C4_BA0730.s b/asm/nonmatchings/world/area_mim/mim_05/func_802417C4_BA0730.s deleted file mode 100644 index b1ac546351..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/func_802417C4_BA0730.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417C4_BA1EF4 -/* BA1EF4 802417C4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BA1EF8 802417C8 AFB20038 */ sw $s2, 0x38($sp) -/* BA1EFC 802417CC 0080902D */ daddu $s2, $a0, $zero -/* BA1F00 802417D0 AFBF0048 */ sw $ra, 0x48($sp) -/* BA1F04 802417D4 AFB50044 */ sw $s5, 0x44($sp) -/* BA1F08 802417D8 AFB40040 */ sw $s4, 0x40($sp) -/* BA1F0C 802417DC AFB3003C */ sw $s3, 0x3c($sp) -/* BA1F10 802417E0 AFB10034 */ sw $s1, 0x34($sp) -/* BA1F14 802417E4 AFB00030 */ sw $s0, 0x30($sp) -/* BA1F18 802417E8 8E510148 */ lw $s1, 0x148($s2) -/* BA1F1C 802417EC 86240008 */ lh $a0, 8($s1) -/* BA1F20 802417F0 0C00EABB */ jal get_npc_unsafe -/* BA1F24 802417F4 00A0802D */ daddu $s0, $a1, $zero -/* BA1F28 802417F8 8E43000C */ lw $v1, 0xc($s2) -/* BA1F2C 802417FC 0240202D */ daddu $a0, $s2, $zero -/* BA1F30 80241800 8C650000 */ lw $a1, ($v1) -/* BA1F34 80241804 0C0B1EAF */ jal get_variable -/* BA1F38 80241808 0040A82D */ daddu $s5, $v0, $zero -/* BA1F3C 8024180C AFA00010 */ sw $zero, 0x10($sp) -/* BA1F40 80241810 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA1F44 80241814 8C630030 */ lw $v1, 0x30($v1) -/* BA1F48 80241818 AFA30014 */ sw $v1, 0x14($sp) -/* BA1F4C 8024181C 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA1F50 80241820 8C63001C */ lw $v1, 0x1c($v1) -/* BA1F54 80241824 AFA30018 */ sw $v1, 0x18($sp) -/* BA1F58 80241828 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA1F5C 8024182C 8C630024 */ lw $v1, 0x24($v1) -/* BA1F60 80241830 AFA3001C */ sw $v1, 0x1c($sp) -/* BA1F64 80241834 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA1F68 80241838 8C630028 */ lw $v1, 0x28($v1) -/* BA1F6C 8024183C 27B40010 */ addiu $s4, $sp, 0x10 -/* BA1F70 80241840 AFA30020 */ sw $v1, 0x20($sp) -/* BA1F74 80241844 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA1F78 80241848 3C014348 */ lui $at, 0x4348 -/* BA1F7C 8024184C 44810000 */ mtc1 $at, $f0 -/* BA1F80 80241850 8C63002C */ lw $v1, 0x2c($v1) -/* BA1F84 80241854 0040982D */ daddu $s3, $v0, $zero -/* BA1F88 80241858 E7A00028 */ swc1 $f0, 0x28($sp) -/* BA1F8C 8024185C A7A0002C */ sh $zero, 0x2c($sp) -/* BA1F90 80241860 16000005 */ bnez $s0, .L80241878 -/* BA1F94 80241864 AFA30024 */ sw $v1, 0x24($sp) -/* BA1F98 80241868 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA1F9C 8024186C 30420004 */ andi $v0, $v0, 4 -/* BA1FA0 80241870 10400011 */ beqz $v0, .L802418B8 -/* BA1FA4 80241874 00000000 */ nop -.L80241878: -/* BA1FA8 80241878 AE400070 */ sw $zero, 0x70($s2) -/* BA1FAC 8024187C A6A0008E */ sh $zero, 0x8e($s5) -/* BA1FB0 80241880 8E2200CC */ lw $v0, 0xcc($s1) -/* BA1FB4 80241884 8C420000 */ lw $v0, ($v0) -/* BA1FB8 80241888 AEA20028 */ sw $v0, 0x28($s5) -/* BA1FBC 8024188C 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA1FC0 80241890 30420004 */ andi $v0, $v0, 4 -/* BA1FC4 80241894 10400008 */ beqz $v0, .L802418B8 -/* BA1FC8 80241898 AE20006C */ sw $zero, 0x6c($s1) -/* BA1FCC 8024189C 24020063 */ addiu $v0, $zero, 0x63 -/* BA1FD0 802418A0 AE420070 */ sw $v0, 0x70($s2) -/* BA1FD4 802418A4 AE400074 */ sw $zero, 0x74($s2) -/* BA1FD8 802418A8 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA1FDC 802418AC 2403FFFB */ addiu $v1, $zero, -5 -/* BA1FE0 802418B0 00431024 */ and $v0, $v0, $v1 -/* BA1FE4 802418B4 AE2200B0 */ sw $v0, 0xb0($s1) -.L802418B8: -/* BA1FE8 802418B8 8E430070 */ lw $v1, 0x70($s2) -/* BA1FEC 802418BC 2410000B */ addiu $s0, $zero, 0xb -/* BA1FF0 802418C0 1070002A */ beq $v1, $s0, .L8024196C -/* BA1FF4 802418C4 2862000C */ slti $v0, $v1, 0xc -/* BA1FF8 802418C8 1040000D */ beqz $v0, .L80241900 -/* BA1FFC 802418CC 24020001 */ addiu $v0, $zero, 1 -/* BA2000 802418D0 1062001A */ beq $v1, $v0, .L8024193C -/* BA2004 802418D4 28620002 */ slti $v0, $v1, 2 -/* BA2008 802418D8 10400005 */ beqz $v0, .L802418F0 -/* BA200C 802418DC 2402000A */ addiu $v0, $zero, 0xa -/* BA2010 802418E0 10600013 */ beqz $v1, .L80241930 -/* BA2014 802418E4 0240202D */ daddu $a0, $s2, $zero -/* BA2018 802418E8 0809067B */ j .L802419EC -/* BA201C 802418EC 00000000 */ nop -.L802418F0: -/* BA2020 802418F0 10620018 */ beq $v1, $v0, .L80241954 -/* BA2024 802418F4 0240202D */ daddu $a0, $s2, $zero -/* BA2028 802418F8 0809067B */ j .L802419EC -/* BA202C 802418FC 00000000 */ nop -.L80241900: -/* BA2030 80241900 2402000D */ addiu $v0, $zero, 0xd -/* BA2034 80241904 10620029 */ beq $v1, $v0, .L802419AC -/* BA2038 80241908 0062102A */ slt $v0, $v1, $v0 -/* BA203C 8024190C 14400020 */ bnez $v0, .L80241990 -/* BA2040 80241910 0240202D */ daddu $a0, $s2, $zero -/* BA2044 80241914 2402000E */ addiu $v0, $zero, 0xe -/* BA2048 80241918 1062002D */ beq $v1, $v0, .L802419D0 -/* BA204C 8024191C 24020063 */ addiu $v0, $zero, 0x63 -/* BA2050 80241920 10620030 */ beq $v1, $v0, .L802419E4 -/* BA2054 80241924 00000000 */ nop -/* BA2058 80241928 0809067B */ j .L802419EC -/* BA205C 8024192C 00000000 */ nop -.L80241930: -/* BA2060 80241930 0260282D */ daddu $a1, $s3, $zero -/* BA2064 80241934 0C090250 */ jal func_80240940 -/* BA2068 80241938 0280302D */ daddu $a2, $s4, $zero -.L8024193C: -/* BA206C 8024193C 0240202D */ daddu $a0, $s2, $zero -/* BA2070 80241940 0260282D */ daddu $a1, $s3, $zero -/* BA2074 80241944 0C09026B */ jal func_802409AC -/* BA2078 80241948 0280302D */ daddu $a2, $s4, $zero -/* BA207C 8024194C 0809067B */ j .L802419EC -/* BA2080 80241950 00000000 */ nop -.L80241954: -/* BA2084 80241954 0260282D */ daddu $a1, $s3, $zero -/* BA2088 80241958 0C0902AA */ jal func_80240AA8 -/* BA208C 8024195C 0280302D */ daddu $a2, $s4, $zero -/* BA2090 80241960 8E420070 */ lw $v0, 0x70($s2) -/* BA2094 80241964 14500021 */ bne $v0, $s0, .L802419EC -/* BA2098 80241968 00000000 */ nop -.L8024196C: -/* BA209C 8024196C 0240202D */ daddu $a0, $s2, $zero -/* BA20A0 80241970 0260282D */ daddu $a1, $s3, $zero -/* BA20A4 80241974 0C09053A */ jal func_802414E8 -/* BA20A8 80241978 0280302D */ daddu $a2, $s4, $zero -/* BA20AC 8024197C 8E430070 */ lw $v1, 0x70($s2) -/* BA20B0 80241980 2402000C */ addiu $v0, $zero, 0xc -/* BA20B4 80241984 14620019 */ bne $v1, $v0, .L802419EC -/* BA20B8 80241988 00000000 */ nop -/* BA20BC 8024198C 0240202D */ daddu $a0, $s2, $zero -.L80241990: -/* BA20C0 80241990 0260282D */ daddu $a1, $s3, $zero -/* BA20C4 80241994 0C09055E */ jal func_80241578 -/* BA20C8 80241998 0280302D */ daddu $a2, $s4, $zero -/* BA20CC 8024199C 8E430070 */ lw $v1, 0x70($s2) -/* BA20D0 802419A0 2402000D */ addiu $v0, $zero, 0xd -/* BA20D4 802419A4 14620011 */ bne $v1, $v0, .L802419EC -/* BA20D8 802419A8 00000000 */ nop -.L802419AC: -/* BA20DC 802419AC 0240202D */ daddu $a0, $s2, $zero -/* BA20E0 802419B0 0260282D */ daddu $a1, $s3, $zero -/* BA20E4 802419B4 0C09059E */ jal func_80241678 -/* BA20E8 802419B8 0280302D */ daddu $a2, $s4, $zero -/* BA20EC 802419BC 8E430070 */ lw $v1, 0x70($s2) -/* BA20F0 802419C0 2402000E */ addiu $v0, $zero, 0xe -/* BA20F4 802419C4 14620009 */ bne $v1, $v0, .L802419EC -/* BA20F8 802419C8 00000000 */ nop -/* BA20FC 802419CC 0240202D */ daddu $a0, $s2, $zero -.L802419D0: -/* BA2100 802419D0 0260282D */ daddu $a1, $s3, $zero -/* BA2104 802419D4 0C0905B6 */ jal func_802416D8 -/* BA2108 802419D8 0280302D */ daddu $a2, $s4, $zero -/* BA210C 802419DC 0809067B */ j .L802419EC -/* BA2110 802419E0 00000000 */ nop -.L802419E4: -/* BA2114 802419E4 0C0129CF */ jal func_8004A73C -/* BA2118 802419E8 0240202D */ daddu $a0, $s2, $zero -.L802419EC: -/* BA211C 802419EC 8FBF0048 */ lw $ra, 0x48($sp) -/* BA2120 802419F0 8FB50044 */ lw $s5, 0x44($sp) -/* BA2124 802419F4 8FB40040 */ lw $s4, 0x40($sp) -/* BA2128 802419F8 8FB3003C */ lw $s3, 0x3c($sp) -/* BA212C 802419FC 8FB20038 */ lw $s2, 0x38($sp) -/* BA2130 80241A00 8FB10034 */ lw $s1, 0x34($sp) -/* BA2134 80241A04 8FB00030 */ lw $s0, 0x30($sp) -/* BA2138 80241A08 0000102D */ daddu $v0, $zero, $zero -/* BA213C 80241A0C 03E00008 */ jr $ra -/* BA2140 80241A10 27BD0050 */ addiu $sp, $sp, 0x50 -/* BA2144 80241A14 00000000 */ nop -/* BA2148 80241A18 00000000 */ nop -/* BA214C 80241A1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_80240070_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_80240070_BA4780.s deleted file mode 100644 index 8eff6d5b5b..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_80240070_BA4780.s +++ /dev/null @@ -1,239 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_BA47F0 -/* BA47F0 80240070 27BDFF88 */ addiu $sp, $sp, -0x78 -/* BA47F4 80240074 F7B60050 */ sdc1 $f22, 0x50($sp) -/* BA47F8 80240078 4480B000 */ mtc1 $zero, $f22 -/* BA47FC 8024007C AFB30034 */ sw $s3, 0x34($sp) -/* BA4800 80240080 00A0982D */ daddu $s3, $a1, $zero -/* BA4804 80240084 AFB40038 */ sw $s4, 0x38($sp) -/* BA4808 80240088 00C0A02D */ daddu $s4, $a2, $zero -/* BA480C 8024008C AFB5003C */ sw $s5, 0x3c($sp) -/* BA4810 80240090 00E0A82D */ daddu $s5, $a3, $zero -/* BA4814 80240094 AFB20030 */ sw $s2, 0x30($sp) -/* BA4818 80240098 0080902D */ daddu $s2, $a0, $zero -/* BA481C 8024009C AFB1002C */ sw $s1, 0x2c($sp) -/* BA4820 802400A0 3C118024 */ lui $s1, 0x8024 -/* BA4824 802400A4 263159C0 */ addiu $s1, $s1, 0x59c0 -/* BA4828 802400A8 AFBF0040 */ sw $ra, 0x40($sp) -/* BA482C 802400AC AFB00028 */ sw $s0, 0x28($sp) -/* BA4830 802400B0 F7BE0070 */ sdc1 $f30, 0x70($sp) -/* BA4834 802400B4 F7BC0068 */ sdc1 $f28, 0x68($sp) -/* BA4838 802400B8 F7BA0060 */ sdc1 $f26, 0x60($sp) -/* BA483C 802400BC F7B80058 */ sdc1 $f24, 0x58($sp) -/* BA4840 802400C0 F7B40048 */ sdc1 $f20, 0x48($sp) -/* BA4844 802400C4 4600B006 */ mov.s $f0, $f22 -/* BA4848 802400C8 4600B406 */ mov.s $f16, $f22 -/* BA484C 802400CC 4600B506 */ mov.s $f20, $f22 -/* BA4850 802400D0 4600A786 */ mov.s $f30, $f20 -/* BA4854 802400D4 4600A086 */ mov.s $f2, $f20 -/* BA4858 802400D8 4600A606 */ mov.s $f24, $f20 -/* BA485C 802400DC 4600A686 */ mov.s $f26, $f20 -/* BA4860 802400E0 4600A706 */ mov.s $f28, $f20 -.L802400E4: -/* BA4864 802400E4 24020006 */ addiu $v0, $zero, 6 -/* BA4868 802400E8 8E460000 */ lw $a2, ($s2) -/* BA486C 802400EC 8E470004 */ lw $a3, 4($s2) -/* BA4870 802400F0 00061E02 */ srl $v1, $a2, 0x18 -/* BA4874 802400F4 1062004E */ beq $v1, $v0, .L80240230 -/* BA4878 802400F8 0000802D */ daddu $s0, $zero, $zero -/* BA487C 802400FC 28620007 */ slti $v0, $v1, 7 -/* BA4880 80240100 10400007 */ beqz $v0, .L80240120 -/* BA4884 80240104 24020001 */ addiu $v0, $zero, 1 -/* BA4888 80240108 10620018 */ beq $v1, $v0, .L8024016C -/* BA488C 8024010C 24020005 */ addiu $v0, $zero, 5 -/* BA4890 80240110 10620029 */ beq $v1, $v0, .L802401B8 -/* BA4894 80240114 000713C2 */ srl $v0, $a3, 0xf -/* BA4898 80240118 080900BD */ j .L802402F4 -/* BA489C 8024011C 00000000 */ nop -.L80240120: -/* BA48A0 80240120 240200DE */ addiu $v0, $zero, 0xde -/* BA48A4 80240124 10620005 */ beq $v1, $v0, .L8024013C -/* BA48A8 80240128 240200DF */ addiu $v0, $zero, 0xdf -/* BA48AC 8024012C 50620071 */ beql $v1, $v0, .L802402F4 -/* BA48B0 80240130 24100001 */ addiu $s0, $zero, 1 -/* BA48B4 80240134 080900BD */ j .L802402F4 -/* BA48B8 80240138 00000000 */ nop -.L8024013C: -/* BA48BC 8024013C 00E0202D */ daddu $a0, $a3, $zero -/* BA48C0 80240140 0260282D */ daddu $a1, $s3, $zero -/* BA48C4 80240144 0280302D */ daddu $a2, $s4, $zero -/* BA48C8 80240148 02A0382D */ daddu $a3, $s5, $zero -/* BA48CC 8024014C E7A00018 */ swc1 $f0, 0x18($sp) -/* BA48D0 80240150 E7A2001C */ swc1 $f2, 0x1c($sp) -/* BA48D4 80240154 0C09001C */ jal func_80240070 -/* BA48D8 80240158 E7B00020 */ swc1 $f16, 0x20($sp) -/* BA48DC 8024015C C7A00018 */ lwc1 $f0, 0x18($sp) -/* BA48E0 80240160 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* BA48E4 80240164 080900BD */ j .L802402F4 -/* BA48E8 80240168 C7B00020 */ lwc1 $f16, 0x20($sp) -.L8024016C: -/* BA48EC 8024016C 00061302 */ srl $v0, $a2, 0xc -/* BA48F0 80240170 304500FF */ andi $a1, $v0, 0xff -/* BA48F4 80240174 0205102B */ sltu $v0, $s0, $a1 -/* BA48F8 80240178 1040005E */ beqz $v0, .L802402F4 -/* BA48FC 8024017C 0000182D */ daddu $v1, $zero, $zero -/* BA4900 80240180 00061042 */ srl $v0, $a2, 1 -/* BA4904 80240184 3042007F */ andi $v0, $v0, 0x7f -/* BA4908 80240188 00453023 */ subu $a2, $v0, $a1 -/* BA490C 8024018C 00E0202D */ daddu $a0, $a3, $zero -.L80240190: -/* BA4910 80240190 00C31021 */ addu $v0, $a2, $v1 -/* BA4914 80240194 00021080 */ sll $v0, $v0, 2 -/* BA4918 80240198 00511021 */ addu $v0, $v0, $s1 -/* BA491C 8024019C AC440000 */ sw $a0, ($v0) -/* BA4920 802401A0 24630001 */ addiu $v1, $v1, 1 -/* BA4924 802401A4 0065102B */ sltu $v0, $v1, $a1 -/* BA4928 802401A8 1440FFF9 */ bnez $v0, .L80240190 -/* BA492C 802401AC 24840010 */ addiu $a0, $a0, 0x10 -/* BA4930 802401B0 080900BD */ j .L802402F4 -/* BA4934 802401B4 00000000 */ nop -.L802401B8: -/* BA4938 802401B8 304201FC */ andi $v0, $v0, 0x1fc -/* BA493C 802401BC 00511021 */ addu $v0, $v0, $s1 -/* BA4940 802401C0 8C440000 */ lw $a0, ($v0) -/* BA4944 802401C4 24100002 */ addiu $s0, $zero, 2 -/* BA4948 802401C8 84820000 */ lh $v0, ($a0) -/* BA494C 802401CC 84830002 */ lh $v1, 2($a0) -/* BA4950 802401D0 44828000 */ mtc1 $v0, $f16 -/* BA4954 802401D4 00000000 */ nop -/* BA4958 802401D8 46808420 */ cvt.s.w $f16, $f16 -/* BA495C 802401DC 44830000 */ mtc1 $v1, $f0 -/* BA4960 802401E0 00000000 */ nop -/* BA4964 802401E4 46800020 */ cvt.s.w $f0, $f0 -/* BA4968 802401E8 000711C2 */ srl $v0, $a3, 7 -/* BA496C 802401EC 304201FC */ andi $v0, $v0, 0x1fc -/* BA4970 802401F0 00511021 */ addu $v0, $v0, $s1 -/* BA4974 802401F4 84830004 */ lh $v1, 4($a0) -/* BA4978 802401F8 8C440000 */ lw $a0, ($v0) -/* BA497C 802401FC 4483B000 */ mtc1 $v1, $f22 -/* BA4980 80240200 00000000 */ nop -/* BA4984 80240204 4680B5A0 */ cvt.s.w $f22, $f22 -/* BA4988 80240208 84820000 */ lh $v0, ($a0) -/* BA498C 8024020C 84830002 */ lh $v1, 2($a0) -/* BA4990 80240210 44821000 */ mtc1 $v0, $f2 -/* BA4994 80240214 00000000 */ nop -/* BA4998 80240218 468010A0 */ cvt.s.w $f2, $f2 -/* BA499C 8024021C 4483F000 */ mtc1 $v1, $f30 -/* BA49A0 80240220 00000000 */ nop -/* BA49A4 80240224 4680F7A0 */ cvt.s.w $f30, $f30 -/* BA49A8 80240228 080900AA */ j .L802402A8 -/* BA49AC 8024022C 00071040 */ sll $v0, $a3, 1 -.L80240230: -/* BA49B0 80240230 000613C2 */ srl $v0, $a2, 0xf -/* BA49B4 80240234 304201FC */ andi $v0, $v0, 0x1fc -/* BA49B8 80240238 00511021 */ addu $v0, $v0, $s1 -/* BA49BC 8024023C 8C440000 */ lw $a0, ($v0) -/* BA49C0 80240240 24100002 */ addiu $s0, $zero, 2 -/* BA49C4 80240244 84820000 */ lh $v0, ($a0) -/* BA49C8 80240248 84830002 */ lh $v1, 2($a0) -/* BA49CC 8024024C 44828000 */ mtc1 $v0, $f16 -/* BA49D0 80240250 00000000 */ nop -/* BA49D4 80240254 46808420 */ cvt.s.w $f16, $f16 -/* BA49D8 80240258 44830000 */ mtc1 $v1, $f0 -/* BA49DC 8024025C 00000000 */ nop -/* BA49E0 80240260 46800020 */ cvt.s.w $f0, $f0 -/* BA49E4 80240264 000611C2 */ srl $v0, $a2, 7 -/* BA49E8 80240268 304201FC */ andi $v0, $v0, 0x1fc -/* BA49EC 8024026C 00511021 */ addu $v0, $v0, $s1 -/* BA49F0 80240270 84830004 */ lh $v1, 4($a0) -/* BA49F4 80240274 8C440000 */ lw $a0, ($v0) -/* BA49F8 80240278 4483B000 */ mtc1 $v1, $f22 -/* BA49FC 8024027C 00000000 */ nop -/* BA4A00 80240280 4680B5A0 */ cvt.s.w $f22, $f22 -/* BA4A04 80240284 84820000 */ lh $v0, ($a0) -/* BA4A08 80240288 84830002 */ lh $v1, 2($a0) -/* BA4A0C 8024028C 44821000 */ mtc1 $v0, $f2 -/* BA4A10 80240290 00000000 */ nop -/* BA4A14 80240294 468010A0 */ cvt.s.w $f2, $f2 -/* BA4A18 80240298 4483F000 */ mtc1 $v1, $f30 -/* BA4A1C 8024029C 00000000 */ nop -/* BA4A20 802402A0 4680F7A0 */ cvt.s.w $f30, $f30 -/* BA4A24 802402A4 00061040 */ sll $v0, $a2, 1 -.L802402A8: -/* BA4A28 802402A8 304201FC */ andi $v0, $v0, 0x1fc -/* BA4A2C 802402AC 00511021 */ addu $v0, $v0, $s1 -/* BA4A30 802402B0 84830004 */ lh $v1, 4($a0) -/* BA4A34 802402B4 8C420000 */ lw $v0, ($v0) -/* BA4A38 802402B8 4483A000 */ mtc1 $v1, $f20 -/* BA4A3C 802402BC 00000000 */ nop -/* BA4A40 802402C0 4680A520 */ cvt.s.w $f20, $f20 -/* BA4A44 802402C4 84440000 */ lh $a0, ($v0) -/* BA4A48 802402C8 84430002 */ lh $v1, 2($v0) -/* BA4A4C 802402CC 84420004 */ lh $v0, 4($v0) -/* BA4A50 802402D0 4484E000 */ mtc1 $a0, $f28 -/* BA4A54 802402D4 00000000 */ nop -/* BA4A58 802402D8 4680E720 */ cvt.s.w $f28, $f28 -/* BA4A5C 802402DC 4483D000 */ mtc1 $v1, $f26 -/* BA4A60 802402E0 00000000 */ nop -/* BA4A64 802402E4 4680D6A0 */ cvt.s.w $f26, $f26 -/* BA4A68 802402E8 4482C000 */ mtc1 $v0, $f24 -/* BA4A6C 802402EC 00000000 */ nop -/* BA4A70 802402F0 4680C620 */ cvt.s.w $f24, $f24 -.L802402F4: -/* BA4A74 802402F4 1200FF7B */ beqz $s0, .L802400E4 -/* BA4A78 802402F8 26520008 */ addiu $s2, $s2, 8 -/* BA4A7C 802402FC 24020002 */ addiu $v0, $zero, 2 -/* BA4A80 80240300 1602002C */ bne $s0, $v0, .L802403B4 -/* BA4A84 80240304 00000000 */ nop -/* BA4A88 80240308 461E0201 */ sub.s $f8, $f0, $f30 -/* BA4A8C 8024030C 4614C181 */ sub.s $f6, $f24, $f20 -/* BA4A90 80240310 46064382 */ mul.s $f14, $f8, $f6 -/* BA4A94 80240314 00000000 */ nop -/* BA4A98 80240318 4614B101 */ sub.s $f4, $f22, $f20 -/* BA4A9C 8024031C 461ED281 */ sub.s $f10, $f26, $f30 -/* BA4AA0 80240320 460A2302 */ mul.s $f12, $f4, $f10 -/* BA4AA4 80240324 00000000 */ nop -/* BA4AA8 80240328 4602E001 */ sub.s $f0, $f28, $f2 -/* BA4AAC 8024032C 46002102 */ mul.s $f4, $f4, $f0 -/* BA4AB0 80240330 00000000 */ nop -/* BA4AB4 80240334 46028081 */ sub.s $f2, $f16, $f2 -/* BA4AB8 80240338 46061182 */ mul.s $f6, $f2, $f6 -/* BA4ABC 8024033C 00000000 */ nop -/* BA4AC0 80240340 460A1082 */ mul.s $f2, $f2, $f10 -/* BA4AC4 80240344 00000000 */ nop -/* BA4AC8 80240348 46004202 */ mul.s $f8, $f8, $f0 -/* BA4ACC 8024034C 00000000 */ nop -/* BA4AD0 80240350 460C7501 */ sub.s $f20, $f14, $f12 -/* BA4AD4 80240354 4614A002 */ mul.s $f0, $f20, $f20 -/* BA4AD8 80240358 00000000 */ nop -/* BA4ADC 8024035C 46062581 */ sub.s $f22, $f4, $f6 -/* BA4AE0 80240360 4616B102 */ mul.s $f4, $f22, $f22 -/* BA4AE4 80240364 00000000 */ nop -/* BA4AE8 80240368 46081601 */ sub.s $f24, $f2, $f8 -/* BA4AEC 8024036C 4618C082 */ mul.s $f2, $f24, $f24 -/* BA4AF0 80240370 00000000 */ nop -/* BA4AF4 80240374 46040000 */ add.s $f0, $f0, $f4 -/* BA4AF8 80240378 46020300 */ add.s $f12, $f0, $f2 -/* BA4AFC 8024037C 46006084 */ sqrt.s $f2, $f12 -/* BA4B00 80240380 46021032 */ c.eq.s $f2, $f2 -/* BA4B04 80240384 00000000 */ nop -/* BA4B08 80240388 45030005 */ bc1tl .L802403A0 -/* BA4B0C 8024038C 4602A003 */ div.s $f0, $f20, $f2 -/* BA4B10 80240390 0C0187BC */ jal sqrtf -/* BA4B14 80240394 00000000 */ nop -/* BA4B18 80240398 46000086 */ mov.s $f2, $f0 -/* BA4B1C 8024039C 4602A003 */ div.s $f0, $f20, $f2 -.L802403A0: -/* BA4B20 802403A0 E6600000 */ swc1 $f0, ($s3) -/* BA4B24 802403A4 4602B003 */ div.s $f0, $f22, $f2 -/* BA4B28 802403A8 E6800000 */ swc1 $f0, ($s4) -/* BA4B2C 802403AC 4602C003 */ div.s $f0, $f24, $f2 -/* BA4B30 802403B0 E6A00000 */ swc1 $f0, ($s5) -.L802403B4: -/* BA4B34 802403B4 8FBF0040 */ lw $ra, 0x40($sp) -/* BA4B38 802403B8 8FB5003C */ lw $s5, 0x3c($sp) -/* BA4B3C 802403BC 8FB40038 */ lw $s4, 0x38($sp) -/* BA4B40 802403C0 8FB30034 */ lw $s3, 0x34($sp) -/* BA4B44 802403C4 8FB20030 */ lw $s2, 0x30($sp) -/* BA4B48 802403C8 8FB1002C */ lw $s1, 0x2c($sp) -/* BA4B4C 802403CC 8FB00028 */ lw $s0, 0x28($sp) -/* BA4B50 802403D0 D7BE0070 */ ldc1 $f30, 0x70($sp) -/* BA4B54 802403D4 D7BC0068 */ ldc1 $f28, 0x68($sp) -/* BA4B58 802403D8 D7BA0060 */ ldc1 $f26, 0x60($sp) -/* BA4B5C 802403DC D7B80058 */ ldc1 $f24, 0x58($sp) -/* BA4B60 802403E0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* BA4B64 802403E4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* BA4B68 802403E8 03E00008 */ jr $ra -/* BA4B6C 802403EC 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_802403F0_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_802403F0_BA4780.s deleted file mode 100644 index 032b07a76f..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_802403F0_BA4780.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F0_BA4B70 -/* BA4B70 802403F0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BA4B74 802403F4 AFB10024 */ sw $s1, 0x24($sp) -/* BA4B78 802403F8 0080882D */ daddu $s1, $a0, $zero -/* BA4B7C 802403FC AFBF0028 */ sw $ra, 0x28($sp) -/* BA4B80 80240400 AFB00020 */ sw $s0, 0x20($sp) -/* BA4B84 80240404 F7B60038 */ sdc1 $f22, 0x38($sp) -/* BA4B88 80240408 F7B40030 */ sdc1 $f20, 0x30($sp) -/* BA4B8C 8024040C 8E30000C */ lw $s0, 0xc($s1) -/* BA4B90 80240410 8E050000 */ lw $a1, ($s0) -/* BA4B94 80240414 0C0B1EAF */ jal get_variable -/* BA4B98 80240418 26100004 */ addiu $s0, $s0, 4 -/* BA4B9C 8024041C 0C046C04 */ jal get_model_list_index_from_tree_index -/* BA4BA0 80240420 0040202D */ daddu $a0, $v0, $zero -/* BA4BA4 80240424 0C046B4C */ jal get_model_from_list_index -/* BA4BA8 80240428 0040202D */ daddu $a0, $v0, $zero -/* BA4BAC 8024042C 8C420008 */ lw $v0, 8($v0) -/* BA4BB0 80240430 27A50010 */ addiu $a1, $sp, 0x10 -/* BA4BB4 80240434 8C420004 */ lw $v0, 4($v0) -/* BA4BB8 80240438 27A60014 */ addiu $a2, $sp, 0x14 -/* BA4BBC 8024043C 8C440000 */ lw $a0, ($v0) -/* BA4BC0 80240440 0C09001C */ jal func_80240070 -/* BA4BC4 80240444 27A70018 */ addiu $a3, $sp, 0x18 -/* BA4BC8 80240448 C7A00010 */ lwc1 $f0, 0x10($sp) -/* BA4BCC 8024044C 3C014480 */ lui $at, 0x4480 -/* BA4BD0 80240450 4481A000 */ mtc1 $at, $f20 -/* BA4BD4 80240454 00000000 */ nop -/* BA4BD8 80240458 46140002 */ mul.s $f0, $f0, $f20 -/* BA4BDC 8024045C 00000000 */ nop -/* BA4BE0 80240460 3C01CD5B */ lui $at, 0xcd5b -/* BA4BE4 80240464 34215858 */ ori $at, $at, 0x5858 -/* BA4BE8 80240468 4481B000 */ mtc1 $at, $f22 -/* BA4BEC 8024046C 00000000 */ nop -/* BA4BF0 80240470 46160000 */ add.s $f0, $f0, $f22 -/* BA4BF4 80240474 8E050000 */ lw $a1, ($s0) -/* BA4BF8 80240478 4600008D */ trunc.w.s $f2, $f0 -/* BA4BFC 8024047C 44061000 */ mfc1 $a2, $f2 -/* BA4C00 80240480 0C0B2026 */ jal set_variable -/* BA4C04 80240484 0220202D */ daddu $a0, $s1, $zero -/* BA4C08 80240488 C7A00014 */ lwc1 $f0, 0x14($sp) -/* BA4C0C 8024048C 46140002 */ mul.s $f0, $f0, $f20 -/* BA4C10 80240490 00000000 */ nop -/* BA4C14 80240494 26100004 */ addiu $s0, $s0, 4 -/* BA4C18 80240498 46160000 */ add.s $f0, $f0, $f22 -/* BA4C1C 8024049C 8E050000 */ lw $a1, ($s0) -/* BA4C20 802404A0 4600008D */ trunc.w.s $f2, $f0 -/* BA4C24 802404A4 44061000 */ mfc1 $a2, $f2 -/* BA4C28 802404A8 0C0B2026 */ jal set_variable -/* BA4C2C 802404AC 0220202D */ daddu $a0, $s1, $zero -/* BA4C30 802404B0 C7A00018 */ lwc1 $f0, 0x18($sp) -/* BA4C34 802404B4 46140002 */ mul.s $f0, $f0, $f20 -/* BA4C38 802404B8 00000000 */ nop -/* BA4C3C 802404BC 26100004 */ addiu $s0, $s0, 4 -/* BA4C40 802404C0 46160000 */ add.s $f0, $f0, $f22 -/* BA4C44 802404C4 8E050000 */ lw $a1, ($s0) -/* BA4C48 802404C8 4600008D */ trunc.w.s $f2, $f0 -/* BA4C4C 802404CC 44061000 */ mfc1 $a2, $f2 -/* BA4C50 802404D0 0C0B2026 */ jal set_variable -/* BA4C54 802404D4 0220202D */ daddu $a0, $s1, $zero -/* BA4C58 802404D8 8FBF0028 */ lw $ra, 0x28($sp) -/* BA4C5C 802404DC 8FB10024 */ lw $s1, 0x24($sp) -/* BA4C60 802404E0 8FB00020 */ lw $s0, 0x20($sp) -/* BA4C64 802404E4 D7B60038 */ ldc1 $f22, 0x38($sp) -/* BA4C68 802404E8 D7B40030 */ ldc1 $f20, 0x30($sp) -/* BA4C6C 802404EC 24020002 */ addiu $v0, $zero, 2 -/* BA4C70 802404F0 03E00008 */ jr $ra -/* BA4C74 802404F4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_802404F8_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_802404F8_BA4780.s deleted file mode 100644 index 74f63caa25..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_802404F8_BA4780.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404F8_BA4C78 -/* BA4C78 802404F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA4C7C 802404FC AFB10014 */ sw $s1, 0x14($sp) -/* BA4C80 80240500 0080882D */ daddu $s1, $a0, $zero -/* BA4C84 80240504 AFBF0018 */ sw $ra, 0x18($sp) -/* BA4C88 80240508 AFB00010 */ sw $s0, 0x10($sp) -/* BA4C8C 8024050C 8E30000C */ lw $s0, 0xc($s1) -/* BA4C90 80240510 8E050000 */ lw $a1, ($s0) -/* BA4C94 80240514 0C0B1EAF */ jal get_variable -/* BA4C98 80240518 26100004 */ addiu $s0, $s0, 4 -/* BA4C9C 8024051C 44826000 */ mtc1 $v0, $f12 -/* BA4CA0 80240520 00000000 */ nop -/* BA4CA4 80240524 0C00A8BB */ jal sin_deg -/* BA4CA8 80240528 46806320 */ cvt.s.w $f12, $f12 -/* BA4CAC 8024052C 3C014120 */ lui $at, 0x4120 -/* BA4CB0 80240530 44811000 */ mtc1 $at, $f2 -/* BA4CB4 80240534 00000000 */ nop -/* BA4CB8 80240538 46020002 */ mul.s $f0, $f0, $f2 -/* BA4CBC 8024053C 00000000 */ nop -/* BA4CC0 80240540 8E050000 */ lw $a1, ($s0) -/* BA4CC4 80240544 4600010D */ trunc.w.s $f4, $f0 -/* BA4CC8 80240548 44062000 */ mfc1 $a2, $f4 -/* BA4CCC 8024054C 0C0B2026 */ jal set_variable -/* BA4CD0 80240550 0220202D */ daddu $a0, $s1, $zero -/* BA4CD4 80240554 8FBF0018 */ lw $ra, 0x18($sp) -/* BA4CD8 80240558 8FB10014 */ lw $s1, 0x14($sp) -/* BA4CDC 8024055C 8FB00010 */ lw $s0, 0x10($sp) -/* BA4CE0 80240560 24020002 */ addiu $v0, $zero, 2 -/* BA4CE4 80240564 03E00008 */ jr $ra -/* BA4CE8 80240568 27BD0020 */ addiu $sp, $sp, 0x20 -/* BA4CEC 8024056C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_80240570_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_80240570_BA4780.s deleted file mode 100644 index 34f1d94a7a..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_80240570_BA4780.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240570_BA4CF0 -/* BA4CF0 80240570 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA4CF4 80240574 AFB10014 */ sw $s1, 0x14($sp) -/* BA4CF8 80240578 0080882D */ daddu $s1, $a0, $zero -/* BA4CFC 8024057C AFBF0018 */ sw $ra, 0x18($sp) -/* BA4D00 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* BA4D04 80240584 8E300148 */ lw $s0, 0x148($s1) -/* BA4D08 80240588 0C00EABB */ jal get_npc_unsafe -/* BA4D0C 8024058C 86040008 */ lh $a0, 8($s0) -/* BA4D10 80240590 24030001 */ addiu $v1, $zero, 1 -/* BA4D14 80240594 0040202D */ daddu $a0, $v0, $zero -/* BA4D18 80240598 AE03006C */ sw $v1, 0x6c($s0) -/* BA4D1C 8024059C 8482008C */ lh $v0, 0x8c($a0) -/* BA4D20 802405A0 14400009 */ bnez $v0, .L802405C8 -/* BA4D24 802405A4 24020002 */ addiu $v0, $zero, 2 -/* BA4D28 802405A8 96030072 */ lhu $v1, 0x72($s0) -/* BA4D2C 802405AC AE02006C */ sw $v0, 0x6c($s0) -/* BA4D30 802405B0 A483008E */ sh $v1, 0x8e($a0) -/* BA4D34 802405B4 8E0200CC */ lw $v0, 0xcc($s0) -/* BA4D38 802405B8 8C420020 */ lw $v0, 0x20($v0) -/* BA4D3C 802405BC AC820028 */ sw $v0, 0x28($a0) -/* BA4D40 802405C0 2402001F */ addiu $v0, $zero, 0x1f -/* BA4D44 802405C4 AE220070 */ sw $v0, 0x70($s1) -.L802405C8: -/* BA4D48 802405C8 8FBF0018 */ lw $ra, 0x18($sp) -/* BA4D4C 802405CC 8FB10014 */ lw $s1, 0x14($sp) -/* BA4D50 802405D0 8FB00010 */ lw $s0, 0x10($sp) -/* BA4D54 802405D4 03E00008 */ jr $ra -/* BA4D58 802405D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_802405DC_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_802405DC_BA4780.s deleted file mode 100644 index 93bea96856..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_802405DC_BA4780.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405DC_BA4D5C -/* BA4D5C 802405DC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA4D60 802405E0 AFB10014 */ sw $s1, 0x14($sp) -/* BA4D64 802405E4 0080882D */ daddu $s1, $a0, $zero -/* BA4D68 802405E8 AFBF0018 */ sw $ra, 0x18($sp) -/* BA4D6C 802405EC AFB00010 */ sw $s0, 0x10($sp) -/* BA4D70 802405F0 8E300148 */ lw $s0, 0x148($s1) -/* BA4D74 802405F4 0C00EABB */ jal get_npc_unsafe -/* BA4D78 802405F8 86040008 */ lh $a0, 8($s0) -/* BA4D7C 802405FC 0040202D */ daddu $a0, $v0, $zero -/* BA4D80 80240600 9482008E */ lhu $v0, 0x8e($a0) -/* BA4D84 80240604 2442FFFF */ addiu $v0, $v0, -1 -/* BA4D88 80240608 A482008E */ sh $v0, 0x8e($a0) -/* BA4D8C 8024060C 00021400 */ sll $v0, $v0, 0x10 -/* BA4D90 80240610 1C400009 */ bgtz $v0, .L80240638 -/* BA4D94 80240614 24020003 */ addiu $v0, $zero, 3 -/* BA4D98 80240618 96030076 */ lhu $v1, 0x76($s0) -/* BA4D9C 8024061C AE02006C */ sw $v0, 0x6c($s0) -/* BA4DA0 80240620 A483008E */ sh $v1, 0x8e($a0) -/* BA4DA4 80240624 8E0200CC */ lw $v0, 0xcc($s0) -/* BA4DA8 80240628 8C420024 */ lw $v0, 0x24($v0) -/* BA4DAC 8024062C AC820028 */ sw $v0, 0x28($a0) -/* BA4DB0 80240630 24020020 */ addiu $v0, $zero, 0x20 -/* BA4DB4 80240634 AE220070 */ sw $v0, 0x70($s1) -.L80240638: -/* BA4DB8 80240638 8FBF0018 */ lw $ra, 0x18($sp) -/* BA4DBC 8024063C 8FB10014 */ lw $s1, 0x14($sp) -/* BA4DC0 80240640 8FB00010 */ lw $s0, 0x10($sp) -/* BA4DC4 80240644 03E00008 */ jr $ra -/* BA4DC8 80240648 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_80240724_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_80240724_BA4780.s deleted file mode 100644 index f3443534e9..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_80240724_BA4780.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240724_BA4EA4 -/* BA4EA4 80240724 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA4EA8 80240728 AFB10014 */ sw $s1, 0x14($sp) -/* BA4EAC 8024072C 0080882D */ daddu $s1, $a0, $zero -/* BA4EB0 80240730 AFBF0018 */ sw $ra, 0x18($sp) -/* BA4EB4 80240734 AFB00010 */ sw $s0, 0x10($sp) -/* BA4EB8 80240738 8E300148 */ lw $s0, 0x148($s1) -/* BA4EBC 8024073C 0C00EABB */ jal get_npc_unsafe -/* BA4EC0 80240740 86040008 */ lh $a0, 8($s0) -/* BA4EC4 80240744 9443008E */ lhu $v1, 0x8e($v0) -/* BA4EC8 80240748 2463FFFF */ addiu $v1, $v1, -1 -/* BA4ECC 8024074C A443008E */ sh $v1, 0x8e($v0) -/* BA4ED0 80240750 00031C00 */ sll $v1, $v1, 0x10 -/* BA4ED4 80240754 1C600003 */ bgtz $v1, .L80240764 -/* BA4ED8 80240758 2402000C */ addiu $v0, $zero, 0xc -/* BA4EDC 8024075C AE00006C */ sw $zero, 0x6c($s0) -/* BA4EE0 80240760 AE220070 */ sw $v0, 0x70($s1) -.L80240764: -/* BA4EE4 80240764 8FBF0018 */ lw $ra, 0x18($sp) -/* BA4EE8 80240768 8FB10014 */ lw $s1, 0x14($sp) -/* BA4EEC 8024076C 8FB00010 */ lw $s0, 0x10($sp) -/* BA4EF0 80240770 03E00008 */ jr $ra -/* BA4EF4 80240774 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_80240778_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_80240778_BA4780.s deleted file mode 100644 index 7909110eb4..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_80240778_BA4780.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240778_BA4EF8 -/* BA4EF8 80240778 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BA4EFC 8024077C AFBF0024 */ sw $ra, 0x24($sp) -/* BA4F00 80240780 AFB40020 */ sw $s4, 0x20($sp) -/* BA4F04 80240784 AFB3001C */ sw $s3, 0x1c($sp) -/* BA4F08 80240788 AFB20018 */ sw $s2, 0x18($sp) -/* BA4F0C 8024078C AFB10014 */ sw $s1, 0x14($sp) -/* BA4F10 80240790 AFB00010 */ sw $s0, 0x10($sp) -/* BA4F14 80240794 F7B40028 */ sdc1 $f20, 0x28($sp) -/* BA4F18 80240798 8C900148 */ lw $s0, 0x148($a0) -/* BA4F1C 8024079C 86040008 */ lh $a0, 8($s0) -/* BA4F20 802407A0 0C00EABB */ jal get_npc_unsafe -/* BA4F24 802407A4 24110001 */ addiu $s1, $zero, 1 -/* BA4F28 802407A8 86040008 */ lh $a0, 8($s0) -/* BA4F2C 802407AC 0040802D */ daddu $s0, $v0, $zero -/* BA4F30 802407B0 3C05800B */ lui $a1, %hi(gCameras) -/* BA4F34 802407B4 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* BA4F38 802407B8 3C03800A */ lui $v1, 0x800a -/* BA4F3C 802407BC 8463A634 */ lh $v1, -0x59cc($v1) -/* BA4F40 802407C0 00912021 */ addu $a0, $a0, $s1 -/* BA4F44 802407C4 00031080 */ sll $v0, $v1, 2 -/* BA4F48 802407C8 00431021 */ addu $v0, $v0, $v1 -/* BA4F4C 802407CC 00021080 */ sll $v0, $v0, 2 -/* BA4F50 802407D0 00431023 */ subu $v0, $v0, $v1 -/* BA4F54 802407D4 000218C0 */ sll $v1, $v0, 3 -/* BA4F58 802407D8 00431021 */ addu $v0, $v0, $v1 -/* BA4F5C 802407DC 000210C0 */ sll $v0, $v0, 3 -/* BA4F60 802407E0 0C00FB3A */ jal get_enemy -/* BA4F64 802407E4 00459021 */ addu $s2, $v0, $a1 -/* BA4F68 802407E8 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* BA4F6C 802407EC 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* BA4F70 802407F0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BA4F74 802407F4 8E830000 */ lw $v1, ($s4) -/* BA4F78 802407F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BA4F7C 802407FC 8C660028 */ lw $a2, 0x28($v1) -/* BA4F80 80240800 8C670030 */ lw $a3, 0x30($v1) -/* BA4F84 80240804 0C00A7B5 */ jal dist2D -/* BA4F88 80240808 0040982D */ daddu $s3, $v0, $zero -/* BA4F8C 8024080C C6620074 */ lwc1 $f2, 0x74($s3) -/* BA4F90 80240810 468010A0 */ cvt.s.w $f2, $f2 -/* BA4F94 80240814 4600103C */ c.lt.s $f2, $f0 -/* BA4F98 80240818 00000000 */ nop -/* BA4F9C 8024081C 45030001 */ bc1tl .L80240824 -/* BA4FA0 80240820 0000882D */ daddu $s1, $zero, $zero -.L80240824: -/* BA4FA4 80240824 C64C006C */ lwc1 $f12, 0x6c($s2) -/* BA4FA8 80240828 C60E000C */ lwc1 $f14, 0xc($s0) -/* BA4FAC 8024082C 3C014387 */ lui $at, 0x4387 -/* BA4FB0 80240830 4481A000 */ mtc1 $at, $f20 -/* BA4FB4 80240834 0C00A70A */ jal get_clamped_angle_diff -/* BA4FB8 80240838 00000000 */ nop -/* BA4FBC 8024083C 0C00A6C9 */ jal clamp_angle -/* BA4FC0 80240840 46000306 */ mov.s $f12, $f0 -/* BA4FC4 80240844 3C018024 */ lui $at, 0x8024 -/* BA4FC8 80240848 D42257B0 */ ldc1 $f2, 0x57b0($at) -/* BA4FCC 8024084C 46000021 */ cvt.d.s $f0, $f0 -/* BA4FD0 80240850 4622003C */ c.lt.d $f0, $f2 -/* BA4FD4 80240854 00000000 */ nop -/* BA4FD8 80240858 45000003 */ bc1f .L80240868 -/* BA4FDC 8024085C 00000000 */ nop -/* BA4FE0 80240860 3C0142B4 */ lui $at, 0x42b4 -/* BA4FE4 80240864 4481A000 */ mtc1 $at, $f20 -.L80240868: -/* BA4FE8 80240868 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BA4FEC 8024086C 8E820000 */ lw $v0, ($s4) -/* BA4FF0 80240870 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BA4FF4 80240874 8C460028 */ lw $a2, 0x28($v0) -/* BA4FF8 80240878 0C00A720 */ jal atan2 -/* BA4FFC 8024087C 8C470030 */ lw $a3, 0x30($v0) -/* BA5000 80240880 4600A306 */ mov.s $f12, $f20 -/* BA5004 80240884 0C00A70A */ jal get_clamped_angle_diff -/* BA5008 80240888 46000386 */ mov.s $f14, $f0 -/* BA500C 8024088C C6620078 */ lwc1 $f2, 0x78($s3) -/* BA5010 80240890 468010A0 */ cvt.s.w $f2, $f2 -/* BA5014 80240894 46000005 */ abs.s $f0, $f0 -/* BA5018 80240898 4600103C */ c.lt.s $f2, $f0 -/* BA501C 8024089C 00000000 */ nop -/* BA5020 802408A0 45030001 */ bc1tl .L802408A8 -/* BA5024 802408A4 0000882D */ daddu $s1, $zero, $zero -.L802408A8: -/* BA5028 802408A8 8E820000 */ lw $v0, ($s4) -/* BA502C 802408AC C600003C */ lwc1 $f0, 0x3c($s0) -/* BA5030 802408B0 C442002C */ lwc1 $f2, 0x2c($v0) -/* BA5034 802408B4 860200A8 */ lh $v0, 0xa8($s0) -/* BA5038 802408B8 46020001 */ sub.s $f0, $f0, $f2 -/* BA503C 802408BC 44821000 */ mtc1 $v0, $f2 -/* BA5040 802408C0 00000000 */ nop -/* BA5044 802408C4 468010A1 */ cvt.d.w $f2, $f2 -/* BA5048 802408C8 46221080 */ add.d $f2, $f2, $f2 -/* BA504C 802408CC 46000005 */ abs.s $f0, $f0 -/* BA5050 802408D0 46000021 */ cvt.d.s $f0, $f0 -/* BA5054 802408D4 4620103E */ c.le.d $f2, $f0 -/* BA5058 802408D8 00000000 */ nop -/* BA505C 802408DC 45030001 */ bc1tl .L802408E4 -/* BA5060 802408E0 0000882D */ daddu $s1, $zero, $zero -.L802408E4: -/* BA5064 802408E4 3C038011 */ lui $v1, 0x8011 -/* BA5068 802408E8 8063EBB3 */ lb $v1, -0x144d($v1) -/* BA506C 802408EC 24020009 */ addiu $v0, $zero, 9 -/* BA5070 802408F0 50620001 */ beql $v1, $v0, .L802408F8 -/* BA5074 802408F4 0000882D */ daddu $s1, $zero, $zero -.L802408F8: -/* BA5078 802408F8 24020007 */ addiu $v0, $zero, 7 -/* BA507C 802408FC 50620001 */ beql $v1, $v0, .L80240904 -/* BA5080 80240900 0000882D */ daddu $s1, $zero, $zero -.L80240904: -/* BA5084 80240904 0220102D */ daddu $v0, $s1, $zero -/* BA5088 80240908 8FBF0024 */ lw $ra, 0x24($sp) -/* BA508C 8024090C 8FB40020 */ lw $s4, 0x20($sp) -/* BA5090 80240910 8FB3001C */ lw $s3, 0x1c($sp) -/* BA5094 80240914 8FB20018 */ lw $s2, 0x18($sp) -/* BA5098 80240918 8FB10014 */ lw $s1, 0x14($sp) -/* BA509C 8024091C 8FB00010 */ lw $s0, 0x10($sp) -/* BA50A0 80240920 D7B40028 */ ldc1 $f20, 0x28($sp) -/* BA50A4 80240924 03E00008 */ jr $ra -/* BA50A8 80240928 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_8024092C_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_8024092C_BA4780.s deleted file mode 100644 index 31e48330f4..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_8024092C_BA4780.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024092C_BA50AC -/* BA50AC 8024092C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BA50B0 80240930 AFB40028 */ sw $s4, 0x28($sp) -/* BA50B4 80240934 0080A02D */ daddu $s4, $a0, $zero -/* BA50B8 80240938 AFBF002C */ sw $ra, 0x2c($sp) -/* BA50BC 8024093C AFB30024 */ sw $s3, 0x24($sp) -/* BA50C0 80240940 AFB20020 */ sw $s2, 0x20($sp) -/* BA50C4 80240944 AFB1001C */ sw $s1, 0x1c($sp) -/* BA50C8 80240948 AFB00018 */ sw $s0, 0x18($sp) -/* BA50CC 8024094C 8E910148 */ lw $s1, 0x148($s4) -/* BA50D0 80240950 86240008 */ lh $a0, 8($s1) -/* BA50D4 80240954 0C00EABB */ jal get_npc_unsafe -/* BA50D8 80240958 00A0802D */ daddu $s0, $a1, $zero -/* BA50DC 8024095C 16000005 */ bnez $s0, .L80240974 -/* BA50E0 80240960 0040902D */ daddu $s2, $v0, $zero -/* BA50E4 80240964 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA50E8 80240968 30420004 */ andi $v0, $v0, 4 -/* BA50EC 8024096C 10400015 */ beqz $v0, .L802409C4 -/* BA50F0 80240970 00000000 */ nop -.L80240974: -/* BA50F4 80240974 AE800070 */ sw $zero, 0x70($s4) -/* BA50F8 80240978 8E420000 */ lw $v0, ($s2) -/* BA50FC 8024097C 3C031F30 */ lui $v1, 0x1f30 -/* BA5100 80240980 A640008E */ sh $zero, 0x8e($s2) -/* BA5104 80240984 34420102 */ ori $v0, $v0, 0x102 -/* BA5108 80240988 AE420000 */ sw $v0, ($s2) -/* BA510C 8024098C 8E220000 */ lw $v0, ($s1) -/* BA5110 80240990 3C01C47A */ lui $at, 0xc47a -/* BA5114 80240994 44810000 */ mtc1 $at, $f0 -/* BA5118 80240998 00431025 */ or $v0, $v0, $v1 -/* BA511C 8024099C AE220000 */ sw $v0, ($s1) -/* BA5120 802409A0 AE400038 */ sw $zero, 0x38($s2) -/* BA5124 802409A4 E640003C */ swc1 $f0, 0x3c($s2) -/* BA5128 802409A8 AE400040 */ sw $zero, 0x40($s2) -/* BA512C 802409AC 8E2300B0 */ lw $v1, 0xb0($s1) -/* BA5130 802409B0 30620004 */ andi $v0, $v1, 4 -/* BA5134 802409B4 10400003 */ beqz $v0, .L802409C4 -/* BA5138 802409B8 2402FFFB */ addiu $v0, $zero, -5 -/* BA513C 802409BC 00621024 */ and $v0, $v1, $v0 -/* BA5140 802409C0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802409C4: -/* BA5144 802409C4 8E930070 */ lw $s3, 0x70($s4) -/* BA5148 802409C8 12600005 */ beqz $s3, .L802409E0 -/* BA514C 802409CC 24020001 */ addiu $v0, $zero, 1 -/* BA5150 802409D0 12620048 */ beq $s3, $v0, .L80240AF4 -/* BA5154 802409D4 00000000 */ nop -/* BA5158 802409D8 080902DA */ j .L80240B68 -/* BA515C 802409DC 00000000 */ nop -.L802409E0: -/* BA5160 802409E0 86240008 */ lh $a0, 8($s1) -/* BA5164 802409E4 0C00FB3A */ jal get_enemy -/* BA5168 802409E8 2484FFFF */ addiu $a0, $a0, -1 -/* BA516C 802409EC 0040802D */ daddu $s0, $v0, $zero -/* BA5170 802409F0 0C00EABB */ jal get_npc_unsafe -/* BA5174 802409F4 86040008 */ lh $a0, 8($s0) -/* BA5178 802409F8 24030001 */ addiu $v1, $zero, 1 -/* BA517C 802409FC 0040982D */ daddu $s3, $v0, $zero -/* BA5180 80240A00 A2230007 */ sb $v1, 7($s1) -/* BA5184 80240A04 8E03006C */ lw $v1, 0x6c($s0) -/* BA5188 80240A08 24020003 */ addiu $v0, $zero, 3 -/* BA518C 80240A0C 14620056 */ bne $v1, $v0, .L80240B68 -/* BA5190 80240A10 00000000 */ nop -/* BA5194 80240A14 8E2500A8 */ lw $a1, 0xa8($s1) -/* BA5198 80240A18 10A00003 */ beqz $a1, .L80240A28 -/* BA519C 80240A1C 0260202D */ daddu $a0, $s3, $zero -/* BA51A0 80240A20 0C012530 */ jal func_800494C0 -/* BA51A4 80240A24 0000302D */ daddu $a2, $zero, $zero -.L80240A28: -/* BA51A8 80240A28 27A40010 */ addiu $a0, $sp, 0x10 -/* BA51AC 80240A2C C6280070 */ lwc1 $f8, 0x70($s1) -/* BA51B0 80240A30 46804220 */ cvt.s.w $f8, $f8 -/* BA51B4 80240A34 C6620034 */ lwc1 $f2, 0x34($s3) -/* BA51B8 80240A38 3C014387 */ lui $at, 0x4387 -/* BA51BC 80240A3C 44810000 */ mtc1 $at, $f0 -/* BA51C0 80240A40 44064000 */ mfc1 $a2, $f8 -/* BA51C4 80240A44 46020001 */ sub.s $f0, $f0, $f2 -/* BA51C8 80240A48 C6660038 */ lwc1 $f6, 0x38($s3) -/* BA51CC 80240A4C C6640040 */ lwc1 $f4, 0x40($s3) -/* BA51D0 80240A50 44070000 */ mfc1 $a3, $f0 -/* BA51D4 80240A54 27A50014 */ addiu $a1, $sp, 0x14 -/* BA51D8 80240A58 E7A60010 */ swc1 $f6, 0x10($sp) -/* BA51DC 80240A5C 0C00A7E7 */ jal add_vec2D_polar -/* BA51E0 80240A60 E7A40014 */ swc1 $f4, 0x14($sp) -/* BA51E4 80240A64 C7A00010 */ lwc1 $f0, 0x10($sp) -/* BA51E8 80240A68 4600020D */ trunc.w.s $f8, $f0 -/* BA51EC 80240A6C 44024000 */ mfc1 $v0, $f8 -/* BA51F0 80240A70 E6400038 */ swc1 $f0, 0x38($s2) -/* BA51F4 80240A74 A6220010 */ sh $v0, 0x10($s1) -/* BA51F8 80240A78 C660003C */ lwc1 $f0, 0x3c($s3) -/* BA51FC 80240A7C C622006C */ lwc1 $f2, 0x6c($s1) -/* BA5200 80240A80 468010A0 */ cvt.s.w $f2, $f2 -/* BA5204 80240A84 46020000 */ add.s $f0, $f0, $f2 -/* BA5208 80240A88 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* BA520C 80240A8C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* BA5210 80240A90 E640003C */ swc1 $f0, 0x3c($s2) -/* BA5214 80240A94 C7A20014 */ lwc1 $f2, 0x14($sp) -/* BA5218 80240A98 4600020D */ trunc.w.s $f8, $f0 -/* BA521C 80240A9C 44024000 */ mfc1 $v0, $f8 -/* BA5220 80240AA0 00000000 */ nop -/* BA5224 80240AA4 A6220012 */ sh $v0, 0x12($s1) -/* BA5228 80240AA8 4600120D */ trunc.w.s $f8, $f2 -/* BA522C 80240AAC 44024000 */ mfc1 $v0, $f8 -/* BA5230 80240AB0 E6420040 */ swc1 $f2, 0x40($s2) -/* BA5234 80240AB4 A6220014 */ sh $v0, 0x14($s1) -/* BA5238 80240AB8 8C660028 */ lw $a2, 0x28($v1) -/* BA523C 80240ABC 8C670030 */ lw $a3, 0x30($v1) -/* BA5240 80240AC0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* BA5244 80240AC4 0C00A720 */ jal atan2 -/* BA5248 80240AC8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* BA524C 80240ACC 3C03E0EF */ lui $v1, 0xe0ef -/* BA5250 80240AD0 E640000C */ swc1 $f0, 0xc($s2) -/* BA5254 80240AD4 8E220000 */ lw $v0, ($s1) -/* BA5258 80240AD8 3463FFFF */ ori $v1, $v1, 0xffff -/* BA525C 80240ADC 00431024 */ and $v0, $v0, $v1 -/* BA5260 80240AE0 AE220000 */ sw $v0, ($s1) -/* BA5264 80240AE4 24020001 */ addiu $v0, $zero, 1 -/* BA5268 80240AE8 A640008E */ sh $zero, 0x8e($s2) -/* BA526C 80240AEC 080902DA */ j .L80240B68 -/* BA5270 80240AF0 AE820070 */ sw $v0, 0x70($s4) -.L80240AF4: -/* BA5274 80240AF4 86240008 */ lh $a0, 8($s1) -/* BA5278 80240AF8 0C00FB3A */ jal get_enemy -/* BA527C 80240AFC 2484FFFF */ addiu $a0, $a0, -1 -/* BA5280 80240B00 0040802D */ daddu $s0, $v0, $zero -/* BA5284 80240B04 0C00EABB */ jal get_npc_unsafe -/* BA5288 80240B08 86040008 */ lh $a0, 8($s0) -/* BA528C 80240B0C 9642008E */ lhu $v0, 0x8e($s2) -/* BA5290 80240B10 24420001 */ addiu $v0, $v0, 1 -/* BA5294 80240B14 A642008E */ sh $v0, 0x8e($s2) -/* BA5298 80240B18 00021400 */ sll $v0, $v0, 0x10 -/* BA529C 80240B1C 8E23007C */ lw $v1, 0x7c($s1) -/* BA52A0 80240B20 00021403 */ sra $v0, $v0, 0x10 -/* BA52A4 80240B24 0043102A */ slt $v0, $v0, $v1 -/* BA52A8 80240B28 50400001 */ beql $v0, $zero, .L80240B30 -/* BA52AC 80240B2C A2200007 */ sb $zero, 7($s1) -.L80240B30: -/* BA52B0 80240B30 8E03006C */ lw $v1, 0x6c($s0) -/* BA52B4 80240B34 24020004 */ addiu $v0, $zero, 4 -/* BA52B8 80240B38 1462000B */ bne $v1, $v0, .L80240B68 -/* BA52BC 80240B3C 3C021F10 */ lui $v0, 0x1f10 -/* BA52C0 80240B40 8E230000 */ lw $v1, ($s1) -/* BA52C4 80240B44 3C01C47A */ lui $at, 0xc47a -/* BA52C8 80240B48 44810000 */ mtc1 $at, $f0 -/* BA52CC 80240B4C 00621825 */ or $v1, $v1, $v0 -/* BA52D0 80240B50 AE230000 */ sw $v1, ($s1) -/* BA52D4 80240B54 AE400038 */ sw $zero, 0x38($s2) -/* BA52D8 80240B58 E640003C */ swc1 $f0, 0x3c($s2) -/* BA52DC 80240B5C AE400040 */ sw $zero, 0x40($s2) -/* BA52E0 80240B60 A2330007 */ sb $s3, 7($s1) -/* BA52E4 80240B64 AE800070 */ sw $zero, 0x70($s4) -.L80240B68: -/* BA52E8 80240B68 8FBF002C */ lw $ra, 0x2c($sp) -/* BA52EC 80240B6C 8FB40028 */ lw $s4, 0x28($sp) -/* BA52F0 80240B70 8FB30024 */ lw $s3, 0x24($sp) -/* BA52F4 80240B74 8FB20020 */ lw $s2, 0x20($sp) -/* BA52F8 80240B78 8FB1001C */ lw $s1, 0x1c($sp) -/* BA52FC 80240B7C 8FB00018 */ lw $s0, 0x18($sp) -/* BA5300 80240B80 0000102D */ daddu $v0, $zero, $zero -/* BA5304 80240B84 03E00008 */ jr $ra -/* BA5308 80240B88 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_80240B8C_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_80240B8C_BA4780.s deleted file mode 100644 index d68f617cc1..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_80240B8C_BA4780.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B8C_BA530C -/* BA530C 80240B8C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BA5310 80240B90 AFB20038 */ sw $s2, 0x38($sp) -/* BA5314 80240B94 0080902D */ daddu $s2, $a0, $zero -/* BA5318 80240B98 AFBF0048 */ sw $ra, 0x48($sp) -/* BA531C 80240B9C AFB50044 */ sw $s5, 0x44($sp) -/* BA5320 80240BA0 AFB40040 */ sw $s4, 0x40($sp) -/* BA5324 80240BA4 AFB3003C */ sw $s3, 0x3c($sp) -/* BA5328 80240BA8 AFB10034 */ sw $s1, 0x34($sp) -/* BA532C 80240BAC AFB00030 */ sw $s0, 0x30($sp) -/* BA5330 80240BB0 8E510148 */ lw $s1, 0x148($s2) -/* BA5334 80240BB4 86240008 */ lh $a0, 8($s1) -/* BA5338 80240BB8 0C00EABB */ jal get_npc_unsafe -/* BA533C 80240BBC 00A0802D */ daddu $s0, $a1, $zero -/* BA5340 80240BC0 8E43000C */ lw $v1, 0xc($s2) -/* BA5344 80240BC4 0240202D */ daddu $a0, $s2, $zero -/* BA5348 80240BC8 8C650000 */ lw $a1, ($v1) -/* BA534C 80240BCC 0C0B1EAF */ jal get_variable -/* BA5350 80240BD0 0040A82D */ daddu $s5, $v0, $zero -/* BA5354 80240BD4 AFA00010 */ sw $zero, 0x10($sp) -/* BA5358 80240BD8 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA535C 80240BDC 8C630030 */ lw $v1, 0x30($v1) -/* BA5360 80240BE0 AFA30014 */ sw $v1, 0x14($sp) -/* BA5364 80240BE4 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA5368 80240BE8 8C63001C */ lw $v1, 0x1c($v1) -/* BA536C 80240BEC AFA30018 */ sw $v1, 0x18($sp) -/* BA5370 80240BF0 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA5374 80240BF4 8C630024 */ lw $v1, 0x24($v1) -/* BA5378 80240BF8 AFA3001C */ sw $v1, 0x1c($sp) -/* BA537C 80240BFC 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA5380 80240C00 8C630028 */ lw $v1, 0x28($v1) -/* BA5384 80240C04 27B40010 */ addiu $s4, $sp, 0x10 -/* BA5388 80240C08 AFA30020 */ sw $v1, 0x20($sp) -/* BA538C 80240C0C 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA5390 80240C10 3C014282 */ lui $at, 0x4282 -/* BA5394 80240C14 44810000 */ mtc1 $at, $f0 -/* BA5398 80240C18 8C63002C */ lw $v1, 0x2c($v1) -/* BA539C 80240C1C 0040982D */ daddu $s3, $v0, $zero -/* BA53A0 80240C20 E7A00028 */ swc1 $f0, 0x28($sp) -/* BA53A4 80240C24 A7A0002C */ sh $zero, 0x2c($sp) -/* BA53A8 80240C28 16000005 */ bnez $s0, .L80240C40 -/* BA53AC 80240C2C AFA30024 */ sw $v1, 0x24($sp) -/* BA53B0 80240C30 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA53B4 80240C34 30420004 */ andi $v0, $v0, 4 -/* BA53B8 80240C38 10400020 */ beqz $v0, .L80240CBC -/* BA53BC 80240C3C 00000000 */ nop -.L80240C40: -/* BA53C0 80240C40 2404F7FF */ addiu $a0, $zero, -0x801 -/* BA53C4 80240C44 AE400070 */ sw $zero, 0x70($s2) -/* BA53C8 80240C48 A6A0008E */ sh $zero, 0x8e($s5) -/* BA53CC 80240C4C 8E2200CC */ lw $v0, 0xcc($s1) -/* BA53D0 80240C50 8EA30000 */ lw $v1, ($s5) -/* BA53D4 80240C54 8C420000 */ lw $v0, ($v0) -/* BA53D8 80240C58 00641824 */ and $v1, $v1, $a0 -/* BA53DC 80240C5C AEA30000 */ sw $v1, ($s5) -/* BA53E0 80240C60 AEA20028 */ sw $v0, 0x28($s5) -/* BA53E4 80240C64 8E2200D0 */ lw $v0, 0xd0($s1) -/* BA53E8 80240C68 8C420034 */ lw $v0, 0x34($v0) -/* BA53EC 80240C6C 54400005 */ bnel $v0, $zero, .L80240C84 -/* BA53F0 80240C70 2402FDFF */ addiu $v0, $zero, -0x201 -/* BA53F4 80240C74 34620200 */ ori $v0, $v1, 0x200 -/* BA53F8 80240C78 2403FFF7 */ addiu $v1, $zero, -9 -/* BA53FC 80240C7C 08090323 */ j .L80240C8C -/* BA5400 80240C80 00431024 */ and $v0, $v0, $v1 -.L80240C84: -/* BA5404 80240C84 00621024 */ and $v0, $v1, $v0 -/* BA5408 80240C88 34420008 */ ori $v0, $v0, 8 -.L80240C8C: -/* BA540C 80240C8C AEA20000 */ sw $v0, ($s5) -/* BA5410 80240C90 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA5414 80240C94 30420004 */ andi $v0, $v0, 4 -/* BA5418 80240C98 10400007 */ beqz $v0, .L80240CB8 -/* BA541C 80240C9C 24020063 */ addiu $v0, $zero, 0x63 -/* BA5420 80240CA0 AE420070 */ sw $v0, 0x70($s2) -/* BA5424 80240CA4 AE400074 */ sw $zero, 0x74($s2) -/* BA5428 80240CA8 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA542C 80240CAC 2403FFFB */ addiu $v1, $zero, -5 -/* BA5430 80240CB0 00431024 */ and $v0, $v0, $v1 -/* BA5434 80240CB4 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240CB8: -/* BA5438 80240CB8 AE20006C */ sw $zero, 0x6c($s1) -.L80240CBC: -/* BA543C 80240CBC 8E420070 */ lw $v0, 0x70($s2) -/* BA5440 80240CC0 2842001E */ slti $v0, $v0, 0x1e -/* BA5444 80240CC4 10400009 */ beqz $v0, .L80240CEC -/* BA5448 80240CC8 00000000 */ nop -/* BA544C 80240CCC 8E22006C */ lw $v0, 0x6c($s1) -/* BA5450 80240CD0 14400006 */ bnez $v0, .L80240CEC -/* BA5454 80240CD4 00000000 */ nop -/* BA5458 80240CD8 0C0901DE */ jal func_80240778 -/* BA545C 80240CDC 0240202D */ daddu $a0, $s2, $zero -/* BA5460 80240CE0 10400002 */ beqz $v0, .L80240CEC -/* BA5464 80240CE4 2402001E */ addiu $v0, $zero, 0x1e -/* BA5468 80240CE8 AE420070 */ sw $v0, 0x70($s2) -.L80240CEC: -/* BA546C 80240CEC 8E430070 */ lw $v1, 0x70($s2) -/* BA5470 80240CF0 2C620064 */ sltiu $v0, $v1, 0x64 -/* BA5474 80240CF4 10400048 */ beqz $v0, .L80240E18 -/* BA5478 80240CF8 00031080 */ sll $v0, $v1, 2 -/* BA547C 80240CFC 3C018024 */ lui $at, 0x8024 -/* BA5480 80240D00 00220821 */ addu $at, $at, $v0 -/* BA5484 80240D04 8C2257B8 */ lw $v0, 0x57b8($at) -/* BA5488 80240D08 00400008 */ jr $v0 -/* BA548C 80240D0C 00000000 */ nop -/* BA5490 80240D10 0240202D */ daddu $a0, $s2, $zero -/* BA5494 80240D14 0260282D */ daddu $a1, $s3, $zero -/* BA5498 80240D18 0C012568 */ jal func_800495A0 -/* BA549C 80240D1C 0280302D */ daddu $a2, $s4, $zero -/* BA54A0 80240D20 0240202D */ daddu $a0, $s2, $zero -/* BA54A4 80240D24 0260282D */ daddu $a1, $s3, $zero -/* BA54A8 80240D28 0C0125AE */ jal func_800496B8 -/* BA54AC 80240D2C 0280302D */ daddu $a2, $s4, $zero -/* BA54B0 80240D30 08090386 */ j .L80240E18 -/* BA54B4 80240D34 00000000 */ nop -/* BA54B8 80240D38 0240202D */ daddu $a0, $s2, $zero -/* BA54BC 80240D3C 0260282D */ daddu $a1, $s3, $zero -/* BA54C0 80240D40 0C0126D1 */ jal func_80049B44 -/* BA54C4 80240D44 0280302D */ daddu $a2, $s4, $zero -/* BA54C8 80240D48 0240202D */ daddu $a0, $s2, $zero -/* BA54CC 80240D4C 0260282D */ daddu $a1, $s3, $zero -/* BA54D0 80240D50 0C012701 */ jal func_80049C04 -/* BA54D4 80240D54 0280302D */ daddu $a2, $s4, $zero -/* BA54D8 80240D58 08090386 */ j .L80240E18 -/* BA54DC 80240D5C 00000000 */ nop -/* BA54E0 80240D60 0240202D */ daddu $a0, $s2, $zero -/* BA54E4 80240D64 0260282D */ daddu $a1, $s3, $zero -/* BA54E8 80240D68 0C01278F */ jal func_80049E3C -/* BA54EC 80240D6C 0280302D */ daddu $a2, $s4, $zero -/* BA54F0 80240D70 0240202D */ daddu $a0, $s2, $zero -/* BA54F4 80240D74 0260282D */ daddu $a1, $s3, $zero -/* BA54F8 80240D78 0C0127B3 */ jal func_80049ECC -/* BA54FC 80240D7C 0280302D */ daddu $a2, $s4, $zero -/* BA5500 80240D80 08090386 */ j .L80240E18 -/* BA5504 80240D84 00000000 */ nop -/* BA5508 80240D88 0240202D */ daddu $a0, $s2, $zero -/* BA550C 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* BA5510 80240D90 0C0127DF */ jal func_80049F7C -/* BA5514 80240D94 0280302D */ daddu $a2, $s4, $zero -/* BA5518 80240D98 0240202D */ daddu $a0, $s2, $zero -/* BA551C 80240D9C 0260282D */ daddu $a1, $s3, $zero -/* BA5520 80240DA0 0C012849 */ jal func_8004A124 -/* BA5524 80240DA4 0280302D */ daddu $a2, $s4, $zero -/* BA5528 80240DA8 08090386 */ j .L80240E18 -/* BA552C 80240DAC 00000000 */ nop -/* BA5530 80240DB0 0240202D */ daddu $a0, $s2, $zero -/* BA5534 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* BA5538 80240DB8 0C0128FA */ jal func_8004A3E8 -/* BA553C 80240DBC 0280302D */ daddu $a2, $s4, $zero -/* BA5540 80240DC0 08090386 */ j .L80240E18 -/* BA5544 80240DC4 00000000 */ nop -/* BA5548 80240DC8 0C09015C */ jal func_80240570 -/* BA554C 80240DCC 0240202D */ daddu $a0, $s2, $zero -/* BA5550 80240DD0 0C090177 */ jal func_802405DC -/* BA5554 80240DD4 0240202D */ daddu $a0, $s2, $zero -/* BA5558 80240DD8 8E430070 */ lw $v1, 0x70($s2) -/* BA555C 80240DDC 24020020 */ addiu $v0, $zero, 0x20 -/* BA5560 80240DE0 1462000D */ bne $v1, $v0, .L80240E18 -/* BA5564 80240DE4 00000000 */ nop -/* BA5568 80240DE8 0C090193 */ jal func_8024064C -/* BA556C 80240DEC 0240202D */ daddu $a0, $s2, $zero -/* BA5570 80240DF0 8E430070 */ lw $v1, 0x70($s2) -/* BA5574 80240DF4 24020021 */ addiu $v0, $zero, 0x21 -/* BA5578 80240DF8 14620007 */ bne $v1, $v0, .L80240E18 -/* BA557C 80240DFC 00000000 */ nop -/* BA5580 80240E00 0C0901C9 */ jal func_80240724 -/* BA5584 80240E04 0240202D */ daddu $a0, $s2, $zero -/* BA5588 80240E08 08090386 */ j .L80240E18 -/* BA558C 80240E0C 00000000 */ nop -/* BA5590 80240E10 0C0129CF */ jal func_8004A73C -/* BA5594 80240E14 0240202D */ daddu $a0, $s2, $zero -.L80240E18: -/* BA5598 80240E18 8FBF0048 */ lw $ra, 0x48($sp) -/* BA559C 80240E1C 8FB50044 */ lw $s5, 0x44($sp) -/* BA55A0 80240E20 8FB40040 */ lw $s4, 0x40($sp) -/* BA55A4 80240E24 8FB3003C */ lw $s3, 0x3c($sp) -/* BA55A8 80240E28 8FB20038 */ lw $s2, 0x38($sp) -/* BA55AC 80240E2C 8FB10034 */ lw $s1, 0x34($sp) -/* BA55B0 80240E30 8FB00030 */ lw $s0, 0x30($sp) -/* BA55B4 80240E34 0000102D */ daddu $v0, $zero, $zero -/* BA55B8 80240E38 03E00008 */ jr $ra -/* BA55BC 80240E3C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_80240E40_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_80240E40_BA4780.s deleted file mode 100644 index d764903f48..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_80240E40_BA4780.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E40_BA55C0 -/* BA55C0 80240E40 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA55C4 80240E44 AFB10014 */ sw $s1, 0x14($sp) -/* BA55C8 80240E48 0080882D */ daddu $s1, $a0, $zero -/* BA55CC 80240E4C AFBF0018 */ sw $ra, 0x18($sp) -/* BA55D0 80240E50 AFB00010 */ sw $s0, 0x10($sp) -/* BA55D4 80240E54 8E300148 */ lw $s0, 0x148($s1) -/* BA55D8 80240E58 0C00EABB */ jal get_npc_unsafe -/* BA55DC 80240E5C 86040008 */ lh $a0, 8($s0) -/* BA55E0 80240E60 0040202D */ daddu $a0, $v0, $zero -/* BA55E4 80240E64 8482008E */ lh $v0, 0x8e($a0) -/* BA55E8 80240E68 9483008E */ lhu $v1, 0x8e($a0) -/* BA55EC 80240E6C 18400003 */ blez $v0, .L80240E7C -/* BA55F0 80240E70 2462FFFF */ addiu $v0, $v1, -1 -/* BA55F4 80240E74 080903A6 */ j .L80240E98 -/* BA55F8 80240E78 A482008E */ sh $v0, 0x8e($a0) -.L80240E7C: -/* BA55FC 80240E7C 8E0200CC */ lw $v0, 0xcc($s0) -/* BA5600 80240E80 AE00006C */ sw $zero, 0x6c($s0) -/* BA5604 80240E84 8C420000 */ lw $v0, ($v0) -/* BA5608 80240E88 AC820028 */ sw $v0, 0x28($a0) -/* BA560C 80240E8C 24020001 */ addiu $v0, $zero, 1 -/* BA5610 80240E90 AE200074 */ sw $zero, 0x74($s1) -/* BA5614 80240E94 AE220070 */ sw $v0, 0x70($s1) -.L80240E98: -/* BA5618 80240E98 8FBF0018 */ lw $ra, 0x18($sp) -/* BA561C 80240E9C 8FB10014 */ lw $s1, 0x14($sp) -/* BA5620 80240EA0 8FB00010 */ lw $s0, 0x10($sp) -/* BA5624 80240EA4 03E00008 */ jr $ra -/* BA5628 80240EA8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_80240FA8_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_80240FA8_BA4780.s deleted file mode 100644 index 93da91bd93..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_80240FA8_BA4780.s +++ /dev/null @@ -1,688 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FA8_BA5728 -/* BA5728 80240FA8 27BDFF80 */ addiu $sp, $sp, -0x80 -/* BA572C 80240FAC AFBF0064 */ sw $ra, 0x64($sp) -/* BA5730 80240FB0 AFBE0060 */ sw $fp, 0x60($sp) -/* BA5734 80240FB4 AFB7005C */ sw $s7, 0x5c($sp) -/* BA5738 80240FB8 AFB60058 */ sw $s6, 0x58($sp) -/* BA573C 80240FBC AFB50054 */ sw $s5, 0x54($sp) -/* BA5740 80240FC0 AFB40050 */ sw $s4, 0x50($sp) -/* BA5744 80240FC4 AFB3004C */ sw $s3, 0x4c($sp) -/* BA5748 80240FC8 AFB20048 */ sw $s2, 0x48($sp) -/* BA574C 80240FCC AFB10044 */ sw $s1, 0x44($sp) -/* BA5750 80240FD0 AFB00040 */ sw $s0, 0x40($sp) -/* BA5754 80240FD4 F7B80078 */ sdc1 $f24, 0x78($sp) -/* BA5758 80240FD8 F7B60070 */ sdc1 $f22, 0x70($sp) -/* BA575C 80240FDC F7B40068 */ sdc1 $f20, 0x68($sp) -/* BA5760 80240FE0 AFA40080 */ sw $a0, 0x80($sp) -/* BA5764 80240FE4 8C960148 */ lw $s6, 0x148($a0) -/* BA5768 80240FE8 00C0902D */ daddu $s2, $a2, $zero -/* BA576C 80240FEC 86C40008 */ lh $a0, 8($s6) -/* BA5770 80240FF0 0C00EABB */ jal get_npc_unsafe -/* BA5774 80240FF4 0000B82D */ daddu $s7, $zero, $zero -/* BA5778 80240FF8 0040882D */ daddu $s1, $v0, $zero -/* BA577C 80240FFC 9622008E */ lhu $v0, 0x8e($s1) -/* BA5780 80241000 2442FFFF */ addiu $v0, $v0, -1 -/* BA5784 80241004 A622008E */ sh $v0, 0x8e($s1) -/* BA5788 80241008 00021400 */ sll $v0, $v0, 0x10 -/* BA578C 8024100C 8EC30090 */ lw $v1, 0x90($s6) -/* BA5790 80241010 00021403 */ sra $v0, $v0, 0x10 -/* BA5794 80241014 0062182A */ slt $v1, $v1, $v0 -/* BA5798 80241018 14600005 */ bnez $v1, .L80241030 -/* BA579C 8024101C 02E0F02D */ daddu $fp, $s7, $zero -/* BA57A0 80241020 8EC20000 */ lw $v0, ($s6) -/* BA57A4 80241024 3C031F10 */ lui $v1, 0x1f10 -/* BA57A8 80241028 00431025 */ or $v0, $v0, $v1 -/* BA57AC 8024102C AEC20000 */ sw $v0, ($s6) -.L80241030: -/* BA57B0 80241030 8622008E */ lh $v0, 0x8e($s1) -/* BA57B4 80241034 1440025D */ bnez $v0, .L802419AC -/* BA57B8 80241038 00000000 */ nop -/* BA57BC 8024103C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BA57C0 80241040 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BA57C4 80241044 0C00A6C9 */ jal clamp_angle -/* BA57C8 80241048 C44C00A8 */ lwc1 $f12, 0xa8($v0) -/* BA57CC 8024104C 3C014334 */ lui $at, 0x4334 -/* BA57D0 80241050 44811000 */ mtc1 $at, $f2 -/* BA57D4 80241054 00000000 */ nop -/* BA57D8 80241058 4602003C */ c.lt.s $f0, $f2 -/* BA57DC 8024105C 00000000 */ nop -/* BA57E0 80241060 45000011 */ bc1f .L802410A8 -/* BA57E4 80241064 00000000 */ nop -/* BA57E8 80241068 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* BA57EC 8024106C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* BA57F0 80241070 3C0142B4 */ lui $at, 0x42b4 -/* BA57F4 80241074 44816000 */ mtc1 $at, $f12 -/* BA57F8 80241078 00031080 */ sll $v0, $v1, 2 -/* BA57FC 8024107C 00431021 */ addu $v0, $v0, $v1 -/* BA5800 80241080 00021080 */ sll $v0, $v0, 2 -/* BA5804 80241084 00431023 */ subu $v0, $v0, $v1 -/* BA5808 80241088 000218C0 */ sll $v1, $v0, 3 -/* BA580C 8024108C 00431021 */ addu $v0, $v0, $v1 -/* BA5810 80241090 000210C0 */ sll $v0, $v0, 3 -/* BA5814 80241094 3C01800B */ lui $at, 0x800b -/* BA5818 80241098 00220821 */ addu $at, $at, $v0 -/* BA581C 8024109C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* BA5820 802410A0 08090439 */ j .L802410E4 -/* BA5824 802410A4 460C0301 */ sub.s $f12, $f0, $f12 -.L802410A8: -/* BA5828 802410A8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* BA582C 802410AC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* BA5830 802410B0 3C0142B4 */ lui $at, 0x42b4 -/* BA5834 802410B4 44816000 */ mtc1 $at, $f12 -/* BA5838 802410B8 00031080 */ sll $v0, $v1, 2 -/* BA583C 802410BC 00431021 */ addu $v0, $v0, $v1 -/* BA5840 802410C0 00021080 */ sll $v0, $v0, 2 -/* BA5844 802410C4 00431023 */ subu $v0, $v0, $v1 -/* BA5848 802410C8 000218C0 */ sll $v1, $v0, 3 -/* BA584C 802410CC 00431021 */ addu $v0, $v0, $v1 -/* BA5850 802410D0 000210C0 */ sll $v0, $v0, 3 -/* BA5854 802410D4 3C01800B */ lui $at, 0x800b -/* BA5858 802410D8 00220821 */ addu $at, $at, $v0 -/* BA585C 802410DC C4201DEC */ lwc1 $f0, 0x1dec($at) -/* BA5860 802410E0 460C0300 */ add.s $f12, $f0, $f12 -.L802410E4: -/* BA5864 802410E4 0C00A6C9 */ jal clamp_angle -/* BA5868 802410E8 00000000 */ nop -/* BA586C 802410EC 46000586 */ mov.s $f22, $f0 -/* BA5870 802410F0 3C014334 */ lui $at, 0x4334 -/* BA5874 802410F4 44816000 */ mtc1 $at, $f12 -/* BA5878 802410F8 0C00A6C9 */ jal clamp_angle -/* BA587C 802410FC 460CB300 */ add.s $f12, $f22, $f12 -/* BA5880 80241100 8EC20088 */ lw $v0, 0x88($s6) -/* BA5884 80241104 14400010 */ bnez $v0, .L80241148 -/* BA5888 80241108 46000606 */ mov.s $f24, $f0 -/* BA588C 8024110C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BA5890 80241110 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BA5894 80241114 804300B4 */ lb $v1, 0xb4($v0) -/* BA5898 80241118 3C014200 */ lui $at, 0x4200 -/* BA589C 8024111C 4481A000 */ mtc1 $at, $f20 -/* BA58A0 80241120 10600016 */ beqz $v1, .L8024117C -/* BA58A4 80241124 24020001 */ addiu $v0, $zero, 1 -/* BA58A8 80241128 3C0142C8 */ lui $at, 0x42c8 -/* BA58AC 8024112C 4481A000 */ mtc1 $at, $f20 -/* BA58B0 80241130 14620013 */ bne $v1, $v0, .L80241180 -/* BA58B4 80241134 26300038 */ addiu $s0, $s1, 0x38 -/* BA58B8 80241138 3C0142B4 */ lui $at, 0x42b4 -/* BA58BC 8024113C 4481A000 */ mtc1 $at, $f20 -/* BA58C0 80241140 08090461 */ j .L80241184 -/* BA58C4 80241144 0200202D */ daddu $a0, $s0, $zero -.L80241148: -/* BA58C8 80241148 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BA58CC 8024114C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BA58D0 80241150 804300B4 */ lb $v1, 0xb4($v0) -/* BA58D4 80241154 3C014218 */ lui $at, 0x4218 -/* BA58D8 80241158 4481A000 */ mtc1 $at, $f20 -/* BA58DC 8024115C 10600007 */ beqz $v1, .L8024117C -/* BA58E0 80241160 24020001 */ addiu $v0, $zero, 1 -/* BA58E4 80241164 3C0142B4 */ lui $at, 0x42b4 -/* BA58E8 80241168 4481A000 */ mtc1 $at, $f20 -/* BA58EC 8024116C 14620004 */ bne $v1, $v0, .L80241180 -/* BA58F0 80241170 26300038 */ addiu $s0, $s1, 0x38 -/* BA58F4 80241174 3C014296 */ lui $at, 0x4296 -/* BA58F8 80241178 4481A000 */ mtc1 $at, $f20 -.L8024117C: -/* BA58FC 8024117C 26300038 */ addiu $s0, $s1, 0x38 -.L80241180: -/* BA5900 80241180 0200202D */ daddu $a0, $s0, $zero -.L80241184: -/* BA5904 80241184 3C15800F */ lui $s5, %hi(gPlayerStatusPtr) -/* BA5908 80241188 26B57B30 */ addiu $s5, $s5, %lo(gPlayerStatusPtr) -/* BA590C 8024118C 4407C000 */ mfc1 $a3, $f24 -/* BA5910 80241190 862200A6 */ lh $v0, 0xa6($s1) -/* BA5914 80241194 8EA30000 */ lw $v1, ($s5) -/* BA5918 80241198 44824000 */ mtc1 $v0, $f8 -/* BA591C 8024119C 00000000 */ nop -/* BA5920 802411A0 46804220 */ cvt.s.w $f8, $f8 -/* BA5924 802411A4 C4600028 */ lwc1 $f0, 0x28($v1) -/* BA5928 802411A8 44064000 */ mfc1 $a2, $f8 -/* BA592C 802411AC 26330040 */ addiu $s3, $s1, 0x40 -/* BA5930 802411B0 E6200038 */ swc1 $f0, 0x38($s1) -/* BA5934 802411B4 C4600030 */ lwc1 $f0, 0x30($v1) -/* BA5938 802411B8 0260282D */ daddu $a1, $s3, $zero -/* BA593C 802411BC 0C00A7E7 */ jal add_vec2D_polar -/* BA5940 802411C0 E6200040 */ swc1 $f0, 0x40($s1) -/* BA5944 802411C4 862200A6 */ lh $v0, 0xa6($s1) -/* BA5948 802411C8 44820000 */ mtc1 $v0, $f0 -/* BA594C 802411CC 00000000 */ nop -/* BA5950 802411D0 46800020 */ cvt.s.w $f0, $f0 -/* BA5954 802411D4 4600A000 */ add.s $f0, $f20, $f0 -/* BA5958 802411D8 4406B000 */ mfc1 $a2, $f22 -/* BA595C 802411DC 44050000 */ mfc1 $a1, $f0 -/* BA5960 802411E0 0C00EA95 */ jal npc_move_heading -/* BA5964 802411E4 0220202D */ daddu $a0, $s1, $zero -/* BA5968 802411E8 8EC20088 */ lw $v0, 0x88($s6) -/* BA596C 802411EC 1440005D */ bnez $v0, .L80241364 -/* BA5970 802411F0 00000000 */ nop -/* BA5974 802411F4 C6200038 */ lwc1 $f0, 0x38($s1) -/* BA5978 802411F8 3C018024 */ lui $at, 0x8024 -/* BA597C 802411FC D4245948 */ ldc1 $f4, 0x5948($at) -/* BA5980 80241200 46000021 */ cvt.d.s $f0, $f0 -/* BA5984 80241204 4620203C */ c.lt.d $f4, $f0 -/* BA5988 80241208 00000000 */ nop -/* BA598C 8024120C 45000005 */ bc1f .L80241224 -/* BA5990 80241210 00000000 */ nop -/* BA5994 80241214 3C0143BE */ lui $at, 0x43be -/* BA5998 80241218 44810000 */ mtc1 $at, $f0 -/* BA599C 8024121C 00000000 */ nop -/* BA59A0 80241220 E6200038 */ swc1 $f0, 0x38($s1) -.L80241224: -/* BA59A4 80241224 C6200038 */ lwc1 $f0, 0x38($s1) -/* BA59A8 80241228 3C018024 */ lui $at, 0x8024 -/* BA59AC 8024122C D4225950 */ ldc1 $f2, 0x5950($at) -/* BA59B0 80241230 46000021 */ cvt.d.s $f0, $f0 -/* BA59B4 80241234 4622003C */ c.lt.d $f0, $f2 -/* BA59B8 80241238 00000000 */ nop -/* BA59BC 8024123C 45000005 */ bc1f .L80241254 -/* BA59C0 80241240 00000000 */ nop -/* BA59C4 80241244 3C01C3BE */ lui $at, 0xc3be -/* BA59C8 80241248 44810000 */ mtc1 $at, $f0 -/* BA59CC 8024124C 00000000 */ nop -/* BA59D0 80241250 E6200038 */ swc1 $f0, 0x38($s1) -.L80241254: -/* BA59D4 80241254 C6200040 */ lwc1 $f0, 0x40($s1) -/* BA59D8 80241258 46000021 */ cvt.d.s $f0, $f0 -/* BA59DC 8024125C 4620203C */ c.lt.d $f4, $f0 -/* BA59E0 80241260 00000000 */ nop -/* BA59E4 80241264 45000005 */ bc1f .L8024127C -/* BA59E8 80241268 00000000 */ nop -/* BA59EC 8024126C 3C0143BE */ lui $at, 0x43be -/* BA59F0 80241270 44810000 */ mtc1 $at, $f0 -/* BA59F4 80241274 00000000 */ nop -/* BA59F8 80241278 E6200040 */ swc1 $f0, 0x40($s1) -.L8024127C: -/* BA59FC 8024127C C6200040 */ lwc1 $f0, 0x40($s1) -/* BA5A00 80241280 46000021 */ cvt.d.s $f0, $f0 -/* BA5A04 80241284 4622003C */ c.lt.d $f0, $f2 -/* BA5A08 80241288 00000000 */ nop -/* BA5A0C 8024128C 45000005 */ bc1f .L802412A4 -/* BA5A10 80241290 00000000 */ nop -/* BA5A14 80241294 3C01C3BE */ lui $at, 0xc3be -/* BA5A18 80241298 44810000 */ mtc1 $at, $f0 -/* BA5A1C 8024129C 00000000 */ nop -/* BA5A20 802412A0 E6200040 */ swc1 $f0, 0x40($s1) -.L802412A4: -/* BA5A24 802412A4 C6220038 */ lwc1 $f2, 0x38($s1) -/* BA5A28 802412A8 46021082 */ mul.s $f2, $f2, $f2 -/* BA5A2C 802412AC 00000000 */ nop -/* BA5A30 802412B0 C6200040 */ lwc1 $f0, 0x40($s1) -/* BA5A34 802412B4 46000002 */ mul.s $f0, $f0, $f0 -/* BA5A38 802412B8 00000000 */ nop -/* BA5A3C 802412BC 46001300 */ add.s $f12, $f2, $f0 -/* BA5A40 802412C0 46006004 */ sqrt.s $f0, $f12 -/* BA5A44 802412C4 46000032 */ c.eq.s $f0, $f0 -/* BA5A48 802412C8 00000000 */ nop -/* BA5A4C 802412CC 45010003 */ bc1t .L802412DC -/* BA5A50 802412D0 00000000 */ nop -/* BA5A54 802412D4 0C0187BC */ jal sqrtf -/* BA5A58 802412D8 00000000 */ nop -.L802412DC: -/* BA5A5C 802412DC 8E260038 */ lw $a2, 0x38($s1) -/* BA5A60 802412E0 8E270040 */ lw $a3, 0x40($s1) -/* BA5A64 802412E4 4480A000 */ mtc1 $zero, $f20 -/* BA5A68 802412E8 E7A00038 */ swc1 $f0, 0x38($sp) -/* BA5A6C 802412EC 4600A306 */ mov.s $f12, $f20 -/* BA5A70 802412F0 0C00A720 */ jal atan2 -/* BA5A74 802412F4 4600A386 */ mov.s $f14, $f20 -/* BA5A78 802412F8 46000586 */ mov.s $f22, $f0 -/* BA5A7C 802412FC C7A20038 */ lwc1 $f2, 0x38($sp) -/* BA5A80 80241300 3C018024 */ lui $at, 0x8024 -/* BA5A84 80241304 D4205958 */ ldc1 $f0, 0x5958($at) -/* BA5A88 80241308 460010A1 */ cvt.d.s $f2, $f2 -/* BA5A8C 8024130C 4620103C */ c.lt.d $f2, $f0 -/* BA5A90 80241310 00000000 */ nop -/* BA5A94 80241314 45000004 */ bc1f .L80241328 -/* BA5A98 80241318 0200202D */ daddu $a0, $s0, $zero -/* BA5A9C 8024131C 3C064398 */ lui $a2, 0x4398 -/* BA5AA0 80241320 080904D2 */ j .L80241348 -/* BA5AA4 80241324 34C68000 */ ori $a2, $a2, 0x8000 -.L80241328: -/* BA5AA8 80241328 3C018024 */ lui $at, 0x8024 -/* BA5AAC 8024132C D4205960 */ ldc1 $f0, 0x5960($at) -/* BA5AB0 80241330 4622003C */ c.lt.d $f0, $f2 -/* BA5AB4 80241334 00000000 */ nop -/* BA5AB8 80241338 450000FA */ bc1f .L80241724 -/* BA5ABC 8024133C 00000000 */ nop -/* BA5AC0 80241340 3C0643BB */ lui $a2, 0x43bb -/* BA5AC4 80241344 34C68000 */ ori $a2, $a2, 0x8000 -.L80241348: -/* BA5AC8 80241348 4407B000 */ mfc1 $a3, $f22 -/* BA5ACC 8024134C 0260282D */ daddu $a1, $s3, $zero -/* BA5AD0 80241350 E6340038 */ swc1 $f20, 0x38($s1) -/* BA5AD4 80241354 0C00A7E7 */ jal add_vec2D_polar -/* BA5AD8 80241358 E6340040 */ swc1 $f20, 0x40($s1) -/* BA5ADC 8024135C 080905C9 */ j .L80241724 -/* BA5AE0 80241360 00000000 */ nop -.L80241364: -/* BA5AE4 80241364 8E220000 */ lw $v0, ($s1) -/* BA5AE8 80241368 30420040 */ andi $v0, $v0, 0x40 -/* BA5AEC 8024136C 144000B0 */ bnez $v0, .L80241630 -/* BA5AF0 80241370 27A50020 */ addiu $a1, $sp, 0x20 -/* BA5AF4 80241374 27B40020 */ addiu $s4, $sp, 0x20 -/* BA5AF8 80241378 0280282D */ daddu $a1, $s4, $zero -/* BA5AFC 8024137C 27B30024 */ addiu $s3, $sp, 0x24 -/* BA5B00 80241380 8EA20000 */ lw $v0, ($s5) -/* BA5B04 80241384 3C014032 */ lui $at, 0x4032 -/* BA5B08 80241388 44811800 */ mtc1 $at, $f3 -/* BA5B0C 8024138C 44801000 */ mtc1 $zero, $f2 -/* BA5B10 80241390 C440002C */ lwc1 $f0, 0x2c($v0) -/* BA5B14 80241394 C4460028 */ lwc1 $f6, 0x28($v0) -/* BA5B18 80241398 C4440030 */ lwc1 $f4, 0x30($v0) -/* BA5B1C 8024139C 46000021 */ cvt.d.s $f0, $f0 -/* BA5B20 802413A0 46220000 */ add.d $f0, $f0, $f2 -/* BA5B24 802413A4 E7A60020 */ swc1 $f6, 0x20($sp) -/* BA5B28 802413A8 E7A40028 */ swc1 $f4, 0x28($sp) -/* BA5B2C 802413AC 46200020 */ cvt.s.d $f0, $f0 -/* BA5B30 802413B0 E7A00024 */ swc1 $f0, 0x24($sp) -/* BA5B34 802413B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* BA5B38 802413B8 E7B60014 */ swc1 $f22, 0x14($sp) -/* BA5B3C 802413BC 862200A8 */ lh $v0, 0xa8($s1) -/* BA5B40 802413C0 0260302D */ daddu $a2, $s3, $zero -/* BA5B44 802413C4 44820000 */ mtc1 $v0, $f0 -/* BA5B48 802413C8 00000000 */ nop -/* BA5B4C 802413CC 46800020 */ cvt.s.w $f0, $f0 -/* BA5B50 802413D0 E7A00018 */ swc1 $f0, 0x18($sp) -/* BA5B54 802413D4 862200A6 */ lh $v0, 0xa6($s1) -/* BA5B58 802413D8 27B00028 */ addiu $s0, $sp, 0x28 -/* BA5B5C 802413DC 44820000 */ mtc1 $v0, $f0 -/* BA5B60 802413E0 00000000 */ nop -/* BA5B64 802413E4 46800020 */ cvt.s.w $f0, $f0 -/* BA5B68 802413E8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BA5B6C 802413EC 8E240080 */ lw $a0, 0x80($s1) -/* BA5B70 802413F0 0C037711 */ jal func_800DDC44 -/* BA5B74 802413F4 0200382D */ daddu $a3, $s0, $zero -/* BA5B78 802413F8 104000CA */ beqz $v0, .L80241724 -/* BA5B7C 802413FC 0280282D */ daddu $a1, $s4, $zero -/* BA5B80 80241400 8EA20000 */ lw $v0, ($s5) -/* BA5B84 80241404 3C018024 */ lui $at, 0x8024 -/* BA5B88 80241408 D4225968 */ ldc1 $f2, 0x5968($at) -/* BA5B8C 8024140C C440002C */ lwc1 $f0, 0x2c($v0) -/* BA5B90 80241410 C4460028 */ lwc1 $f6, 0x28($v0) -/* BA5B94 80241414 C4440030 */ lwc1 $f4, 0x30($v0) -/* BA5B98 80241418 46000021 */ cvt.d.s $f0, $f0 -/* BA5B9C 8024141C 46220000 */ add.d $f0, $f0, $f2 -/* BA5BA0 80241420 E7A60020 */ swc1 $f6, 0x20($sp) -/* BA5BA4 80241424 E7A40028 */ swc1 $f4, 0x28($sp) -/* BA5BA8 80241428 46200020 */ cvt.s.d $f0, $f0 -/* BA5BAC 8024142C E7A00024 */ swc1 $f0, 0x24($sp) -/* BA5BB0 80241430 E7B40010 */ swc1 $f20, 0x10($sp) -/* BA5BB4 80241434 E7B60014 */ swc1 $f22, 0x14($sp) -/* BA5BB8 80241438 862200A8 */ lh $v0, 0xa8($s1) -/* BA5BBC 8024143C 44820000 */ mtc1 $v0, $f0 -/* BA5BC0 80241440 00000000 */ nop -/* BA5BC4 80241444 46800020 */ cvt.s.w $f0, $f0 -/* BA5BC8 80241448 E7A00018 */ swc1 $f0, 0x18($sp) -/* BA5BCC 8024144C 862200A6 */ lh $v0, 0xa6($s1) -/* BA5BD0 80241450 0260302D */ daddu $a2, $s3, $zero -/* BA5BD4 80241454 44820000 */ mtc1 $v0, $f0 -/* BA5BD8 80241458 00000000 */ nop -/* BA5BDC 8024145C 46800020 */ cvt.s.w $f0, $f0 -/* BA5BE0 80241460 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BA5BE4 80241464 8E240080 */ lw $a0, 0x80($s1) -/* BA5BE8 80241468 0C037711 */ jal func_800DDC44 -/* BA5BEC 8024146C 0200382D */ daddu $a3, $s0, $zero -/* BA5BF0 80241470 27A5002C */ addiu $a1, $sp, 0x2c -/* BA5BF4 80241474 27A60030 */ addiu $a2, $sp, 0x30 -/* BA5BF8 80241478 27A70034 */ addiu $a3, $sp, 0x34 -/* BA5BFC 8024147C 27A30038 */ addiu $v1, $sp, 0x38 -/* BA5C00 80241480 C6220038 */ lwc1 $f2, 0x38($s1) -/* BA5C04 80241484 C620003C */ lwc1 $f0, 0x3c($s1) -/* BA5C08 80241488 3C014348 */ lui $at, 0x4348 -/* BA5C0C 8024148C 44813000 */ mtc1 $at, $f6 -/* BA5C10 80241490 46000021 */ cvt.d.s $f0, $f0 -/* BA5C14 80241494 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BA5C18 80241498 3C014059 */ lui $at, 0x4059 -/* BA5C1C 8024149C 44811800 */ mtc1 $at, $f3 -/* BA5C20 802414A0 44801000 */ mtc1 $zero, $f2 -/* BA5C24 802414A4 C6240040 */ lwc1 $f4, 0x40($s1) -/* BA5C28 802414A8 46220000 */ add.d $f0, $f0, $f2 -/* BA5C2C 802414AC E7A60038 */ swc1 $f6, 0x38($sp) -/* BA5C30 802414B0 E7A40034 */ swc1 $f4, 0x34($sp) -/* BA5C34 802414B4 46200020 */ cvt.s.d $f0, $f0 -/* BA5C38 802414B8 E7A00030 */ swc1 $f0, 0x30($sp) -/* BA5C3C 802414BC AFA30010 */ sw $v1, 0x10($sp) -/* BA5C40 802414C0 8E240080 */ lw $a0, 0x80($s1) -/* BA5C44 802414C4 0C0372DF */ jal func_800DCB7C -/* BA5C48 802414C8 0040802D */ daddu $s0, $v0, $zero -/* BA5C4C 802414CC 1600001C */ bnez $s0, .L80241540 -/* BA5C50 802414D0 00000000 */ nop -/* BA5C54 802414D4 1040001A */ beqz $v0, .L80241540 -/* BA5C58 802414D8 00000000 */ nop -/* BA5C5C 802414DC C7A20038 */ lwc1 $f2, 0x38($sp) -/* BA5C60 802414E0 3C014054 */ lui $at, 0x4054 -/* BA5C64 802414E4 44810800 */ mtc1 $at, $f1 -/* BA5C68 802414E8 44800000 */ mtc1 $zero, $f0 -/* BA5C6C 802414EC 460010A1 */ cvt.d.s $f2, $f2 -/* BA5C70 802414F0 4622003C */ c.lt.d $f0, $f2 -/* BA5C74 802414F4 00000000 */ nop -/* BA5C78 802414F8 45000011 */ bc1f .L80241540 -/* BA5C7C 802414FC 00000000 */ nop -/* BA5C80 80241500 3C01405E */ lui $at, 0x405e -/* BA5C84 80241504 44810800 */ mtc1 $at, $f1 -/* BA5C88 80241508 44800000 */ mtc1 $zero, $f0 -/* BA5C8C 8024150C 00000000 */ nop -/* BA5C90 80241510 4620103C */ c.lt.d $f2, $f0 -/* BA5C94 80241514 00000000 */ nop -/* BA5C98 80241518 45000009 */ bc1f .L80241540 -/* BA5C9C 8024151C 00000000 */ nop -/* BA5CA0 80241520 C622003C */ lwc1 $f2, 0x3c($s1) -/* BA5CA4 80241524 C7A00030 */ lwc1 $f0, 0x30($sp) -/* BA5CA8 80241528 46001032 */ c.eq.s $f2, $f0 -/* BA5CAC 8024152C 00000000 */ nop -/* BA5CB0 80241530 45010003 */ bc1t .L80241540 -/* BA5CB4 80241534 00000000 */ nop -/* BA5CB8 80241538 080905C9 */ j .L80241724 -/* BA5CBC 8024153C 241E0001 */ addiu $fp, $zero, 1 -.L80241540: -/* BA5CC0 80241540 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* BA5CC4 80241544 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* BA5CC8 80241548 8E020000 */ lw $v0, ($s0) -/* BA5CCC 8024154C 3C014024 */ lui $at, 0x4024 -/* BA5CD0 80241550 44811800 */ mtc1 $at, $f3 -/* BA5CD4 80241554 44801000 */ mtc1 $zero, $f2 -/* BA5CD8 80241558 C440002C */ lwc1 $f0, 0x2c($v0) -/* BA5CDC 8024155C C4460028 */ lwc1 $f6, 0x28($v0) -/* BA5CE0 80241560 C4440030 */ lwc1 $f4, 0x30($v0) -/* BA5CE4 80241564 46000021 */ cvt.d.s $f0, $f0 -/* BA5CE8 80241568 46220000 */ add.d $f0, $f0, $f2 -/* BA5CEC 8024156C E7A60020 */ swc1 $f6, 0x20($sp) -/* BA5CF0 80241570 E7A40028 */ swc1 $f4, 0x28($sp) -/* BA5CF4 80241574 46200020 */ cvt.s.d $f0, $f0 -/* BA5CF8 80241578 E7A00024 */ swc1 $f0, 0x24($sp) -/* BA5CFC 8024157C E7B40010 */ swc1 $f20, 0x10($sp) -/* BA5D00 80241580 E7B60014 */ swc1 $f22, 0x14($sp) -/* BA5D04 80241584 862200A8 */ lh $v0, 0xa8($s1) -/* BA5D08 80241588 27A50020 */ addiu $a1, $sp, 0x20 -/* BA5D0C 8024158C 44820000 */ mtc1 $v0, $f0 -/* BA5D10 80241590 00000000 */ nop -/* BA5D14 80241594 46800020 */ cvt.s.w $f0, $f0 -/* BA5D18 80241598 E7A00018 */ swc1 $f0, 0x18($sp) -/* BA5D1C 8024159C 862200A6 */ lh $v0, 0xa6($s1) -/* BA5D20 802415A0 27A60024 */ addiu $a2, $sp, 0x24 -/* BA5D24 802415A4 44820000 */ mtc1 $v0, $f0 -/* BA5D28 802415A8 00000000 */ nop -/* BA5D2C 802415AC 46800020 */ cvt.s.w $f0, $f0 -/* BA5D30 802415B0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BA5D34 802415B4 8E240080 */ lw $a0, 0x80($s1) -/* BA5D38 802415B8 0C037711 */ jal func_800DDC44 -/* BA5D3C 802415BC 27A70028 */ addiu $a3, $sp, 0x28 -/* BA5D40 802415C0 8FA60020 */ lw $a2, 0x20($sp) -/* BA5D44 802415C4 8E020000 */ lw $v0, ($s0) -/* BA5D48 802415C8 8FA70028 */ lw $a3, 0x28($sp) -/* BA5D4C 802415CC C44C0028 */ lwc1 $f12, 0x28($v0) -/* BA5D50 802415D0 C44E0030 */ lwc1 $f14, 0x30($v0) -/* BA5D54 802415D4 0C00A7B5 */ jal dist2D -/* BA5D58 802415D8 24170001 */ addiu $s7, $zero, 1 -/* BA5D5C 802415DC 46000506 */ mov.s $f20, $f0 -/* BA5D60 802415E0 8E030000 */ lw $v1, ($s0) -/* BA5D64 802415E4 862200A6 */ lh $v0, 0xa6($s1) -/* BA5D68 802415E8 4407C000 */ mfc1 $a3, $f24 -/* BA5D6C 802415EC 44824000 */ mtc1 $v0, $f8 -/* BA5D70 802415F0 00000000 */ nop -/* BA5D74 802415F4 46804220 */ cvt.s.w $f8, $f8 -/* BA5D78 802415F8 C4600028 */ lwc1 $f0, 0x28($v1) -/* BA5D7C 802415FC 44064000 */ mfc1 $a2, $f8 -/* BA5D80 80241600 26240038 */ addiu $a0, $s1, 0x38 -/* BA5D84 80241604 E6200038 */ swc1 $f0, 0x38($s1) -/* BA5D88 80241608 C4600030 */ lwc1 $f0, 0x30($v1) -/* BA5D8C 8024160C 26250040 */ addiu $a1, $s1, 0x40 -/* BA5D90 80241610 0C00A7E7 */ jal add_vec2D_polar -/* BA5D94 80241614 E6200040 */ swc1 $f0, 0x40($s1) -/* BA5D98 80241618 862200A6 */ lh $v0, 0xa6($s1) -/* BA5D9C 8024161C 44820000 */ mtc1 $v0, $f0 -/* BA5DA0 80241620 00000000 */ nop -/* BA5DA4 80241624 46800020 */ cvt.s.w $f0, $f0 -/* BA5DA8 80241628 080905C5 */ j .L80241714 -/* BA5DAC 8024162C 4600A500 */ add.s $f20, $f20, $f0 -.L80241630: -/* BA5DB0 80241630 8EA20000 */ lw $v0, ($s5) -/* BA5DB4 80241634 3C014032 */ lui $at, 0x4032 -/* BA5DB8 80241638 44811800 */ mtc1 $at, $f3 -/* BA5DBC 8024163C 44801000 */ mtc1 $zero, $f2 -/* BA5DC0 80241640 C440002C */ lwc1 $f0, 0x2c($v0) -/* BA5DC4 80241644 C4460028 */ lwc1 $f6, 0x28($v0) -/* BA5DC8 80241648 C4440030 */ lwc1 $f4, 0x30($v0) -/* BA5DCC 8024164C 46000021 */ cvt.d.s $f0, $f0 -/* BA5DD0 80241650 46220000 */ add.d $f0, $f0, $f2 -/* BA5DD4 80241654 E7A60020 */ swc1 $f6, 0x20($sp) -/* BA5DD8 80241658 E7A40028 */ swc1 $f4, 0x28($sp) -/* BA5DDC 8024165C 46200020 */ cvt.s.d $f0, $f0 -/* BA5DE0 80241660 E7A00024 */ swc1 $f0, 0x24($sp) -/* BA5DE4 80241664 E7B40010 */ swc1 $f20, 0x10($sp) -/* BA5DE8 80241668 E7B60014 */ swc1 $f22, 0x14($sp) -/* BA5DEC 8024166C 862200A8 */ lh $v0, 0xa8($s1) -/* BA5DF0 80241670 44820000 */ mtc1 $v0, $f0 -/* BA5DF4 80241674 00000000 */ nop -/* BA5DF8 80241678 46800020 */ cvt.s.w $f0, $f0 -/* BA5DFC 8024167C E7A00018 */ swc1 $f0, 0x18($sp) -/* BA5E00 80241680 862200A6 */ lh $v0, 0xa6($s1) -/* BA5E04 80241684 27A60024 */ addiu $a2, $sp, 0x24 -/* BA5E08 80241688 44820000 */ mtc1 $v0, $f0 -/* BA5E0C 8024168C 00000000 */ nop -/* BA5E10 80241690 46800020 */ cvt.s.w $f0, $f0 -/* BA5E14 80241694 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BA5E18 80241698 8E240080 */ lw $a0, 0x80($s1) -/* BA5E1C 8024169C 0C037711 */ jal func_800DDC44 -/* BA5E20 802416A0 27A70028 */ addiu $a3, $sp, 0x28 -/* BA5E24 802416A4 1040001F */ beqz $v0, .L80241724 -/* BA5E28 802416A8 00000000 */ nop -/* BA5E2C 802416AC 8FA60020 */ lw $a2, 0x20($sp) -/* BA5E30 802416B0 8EA20000 */ lw $v0, ($s5) -/* BA5E34 802416B4 8FA70028 */ lw $a3, 0x28($sp) -/* BA5E38 802416B8 C44C0028 */ lwc1 $f12, 0x28($v0) -/* BA5E3C 802416BC 0C00A7B5 */ jal dist2D -/* BA5E40 802416C0 C44E0030 */ lwc1 $f14, 0x30($v0) -/* BA5E44 802416C4 46000506 */ mov.s $f20, $f0 -/* BA5E48 802416C8 8EA30000 */ lw $v1, ($s5) -/* BA5E4C 802416CC 862200A6 */ lh $v0, 0xa6($s1) -/* BA5E50 802416D0 4407C000 */ mfc1 $a3, $f24 -/* BA5E54 802416D4 44824000 */ mtc1 $v0, $f8 -/* BA5E58 802416D8 00000000 */ nop -/* BA5E5C 802416DC 46804220 */ cvt.s.w $f8, $f8 -/* BA5E60 802416E0 C4600028 */ lwc1 $f0, 0x28($v1) -/* BA5E64 802416E4 44064000 */ mfc1 $a2, $f8 -/* BA5E68 802416E8 0200202D */ daddu $a0, $s0, $zero -/* BA5E6C 802416EC E6200038 */ swc1 $f0, 0x38($s1) -/* BA5E70 802416F0 C4600030 */ lwc1 $f0, 0x30($v1) -/* BA5E74 802416F4 0260282D */ daddu $a1, $s3, $zero -/* BA5E78 802416F8 0C00A7E7 */ jal add_vec2D_polar -/* BA5E7C 802416FC E6200040 */ swc1 $f0, 0x40($s1) -/* BA5E80 80241700 862200A6 */ lh $v0, 0xa6($s1) -/* BA5E84 80241704 44820000 */ mtc1 $v0, $f0 -/* BA5E88 80241708 00000000 */ nop -/* BA5E8C 8024170C 46800020 */ cvt.s.w $f0, $f0 -/* BA5E90 80241710 4600A500 */ add.s $f20, $f20, $f0 -.L80241714: -/* BA5E94 80241714 4406B000 */ mfc1 $a2, $f22 -/* BA5E98 80241718 4405A000 */ mfc1 $a1, $f20 -/* BA5E9C 8024171C 0C00EA95 */ jal npc_move_heading -/* BA5EA0 80241720 0220202D */ daddu $a0, $s1, $zero -.L80241724: -/* BA5EA4 80241724 C6400008 */ lwc1 $f0, 8($s2) -/* BA5EA8 80241728 46800020 */ cvt.s.w $f0, $f0 -/* BA5EAC 8024172C 44050000 */ mfc1 $a1, $f0 -/* BA5EB0 80241730 C640000C */ lwc1 $f0, 0xc($s2) -/* BA5EB4 80241734 46800020 */ cvt.s.w $f0, $f0 -/* BA5EB8 80241738 44060000 */ mfc1 $a2, $f0 -/* BA5EBC 8024173C C6200040 */ lwc1 $f0, 0x40($s1) -/* BA5EC0 80241740 26300038 */ addiu $s0, $s1, 0x38 -/* BA5EC4 80241744 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA5EC8 80241748 C6400010 */ lwc1 $f0, 0x10($s2) -/* BA5ECC 8024174C 46800020 */ cvt.s.w $f0, $f0 -/* BA5ED0 80241750 E7A00014 */ swc1 $f0, 0x14($sp) -/* BA5ED4 80241754 C6400014 */ lwc1 $f0, 0x14($s2) -/* BA5ED8 80241758 46800020 */ cvt.s.w $f0, $f0 -/* BA5EDC 8024175C E7A00018 */ swc1 $f0, 0x18($sp) -/* BA5EE0 80241760 8E440004 */ lw $a0, 4($s2) -/* BA5EE4 80241764 8E270038 */ lw $a3, 0x38($s1) -/* BA5EE8 80241768 0C0123F5 */ jal is_point_within_region -/* BA5EEC 8024176C 26330040 */ addiu $s3, $s1, 0x40 -/* BA5EF0 80241770 1040005A */ beqz $v0, .L802418DC -/* BA5EF4 80241774 00000000 */ nop -/* BA5EF8 80241778 8E430004 */ lw $v1, 4($s2) -/* BA5EFC 8024177C 10600005 */ beqz $v1, .L80241794 -/* BA5F00 80241780 24020001 */ addiu $v0, $zero, 1 -/* BA5F04 80241784 10620029 */ beq $v1, $v0, .L8024182C -/* BA5F08 80241788 00000000 */ nop -/* BA5F0C 8024178C 08090637 */ j .L802418DC -/* BA5F10 80241790 00000000 */ nop -.L80241794: -/* BA5F14 80241794 C6480008 */ lwc1 $f8, 8($s2) -/* BA5F18 80241798 46804220 */ cvt.s.w $f8, $f8 -/* BA5F1C 8024179C 44064000 */ mfc1 $a2, $f8 -/* BA5F20 802417A0 C648000C */ lwc1 $f8, 0xc($s2) -/* BA5F24 802417A4 46804220 */ cvt.s.w $f8, $f8 -/* BA5F28 802417A8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BA5F2C 802417AC C62E0040 */ lwc1 $f14, 0x40($s1) -/* BA5F30 802417B0 44074000 */ mfc1 $a3, $f8 -/* BA5F34 802417B4 0C00A7B5 */ jal dist2D -/* BA5F38 802417B8 00000000 */ nop -/* BA5F3C 802417BC C6420010 */ lwc1 $f2, 0x10($s2) -/* BA5F40 802417C0 468010A0 */ cvt.s.w $f2, $f2 -/* BA5F44 802417C4 4600103C */ c.lt.s $f2, $f0 -/* BA5F48 802417C8 00000000 */ nop -/* BA5F4C 802417CC 45000043 */ bc1f .L802418DC -/* BA5F50 802417D0 E7A00038 */ swc1 $f0, 0x38($sp) -/* BA5F54 802417D4 C64C0008 */ lwc1 $f12, 8($s2) -/* BA5F58 802417D8 46806320 */ cvt.s.w $f12, $f12 -/* BA5F5C 802417DC 8E260038 */ lw $a2, 0x38($s1) -/* BA5F60 802417E0 8E270040 */ lw $a3, 0x40($s1) -/* BA5F64 802417E4 C64E000C */ lwc1 $f14, 0xc($s2) -/* BA5F68 802417E8 0C00A720 */ jal atan2 -/* BA5F6C 802417EC 468073A0 */ cvt.s.w $f14, $f14 -/* BA5F70 802417F0 0200202D */ daddu $a0, $s0, $zero -/* BA5F74 802417F4 44070000 */ mfc1 $a3, $f0 -/* BA5F78 802417F8 C6400008 */ lwc1 $f0, 8($s2) -/* BA5F7C 802417FC 46800020 */ cvt.s.w $f0, $f0 -/* BA5F80 80241800 E6200038 */ swc1 $f0, 0x38($s1) -/* BA5F84 80241804 C640000C */ lwc1 $f0, 0xc($s2) -/* BA5F88 80241808 46800020 */ cvt.s.w $f0, $f0 -/* BA5F8C 8024180C E6200040 */ swc1 $f0, 0x40($s1) -/* BA5F90 80241810 C6480010 */ lwc1 $f8, 0x10($s2) -/* BA5F94 80241814 46804220 */ cvt.s.w $f8, $f8 -/* BA5F98 80241818 44064000 */ mfc1 $a2, $f8 -/* BA5F9C 8024181C 0C00A7E7 */ jal add_vec2D_polar -/* BA5FA0 80241820 0260282D */ daddu $a1, $s3, $zero -/* BA5FA4 80241824 08090637 */ j .L802418DC -/* BA5FA8 80241828 00000000 */ nop -.L8024182C: -/* BA5FAC 8024182C 8E420008 */ lw $v0, 8($s2) -/* BA5FB0 80241830 8E430010 */ lw $v1, 0x10($s2) -/* BA5FB4 80241834 C6200038 */ lwc1 $f0, 0x38($s1) -/* BA5FB8 80241838 00431021 */ addu $v0, $v0, $v1 -/* BA5FBC 8024183C 44821000 */ mtc1 $v0, $f2 -/* BA5FC0 80241840 00000000 */ nop -/* BA5FC4 80241844 468010A0 */ cvt.s.w $f2, $f2 -/* BA5FC8 80241848 4600103C */ c.lt.s $f2, $f0 -/* BA5FCC 8024184C 00000000 */ nop -/* BA5FD0 80241850 45030001 */ bc1tl .L80241858 -/* BA5FD4 80241854 E6220038 */ swc1 $f2, 0x38($s1) -.L80241858: -/* BA5FD8 80241858 8E420008 */ lw $v0, 8($s2) -/* BA5FDC 8024185C 8E430010 */ lw $v1, 0x10($s2) -/* BA5FE0 80241860 C6200038 */ lwc1 $f0, 0x38($s1) -/* BA5FE4 80241864 00431023 */ subu $v0, $v0, $v1 -/* BA5FE8 80241868 44821000 */ mtc1 $v0, $f2 -/* BA5FEC 8024186C 00000000 */ nop -/* BA5FF0 80241870 468010A0 */ cvt.s.w $f2, $f2 -/* BA5FF4 80241874 4602003C */ c.lt.s $f0, $f2 -/* BA5FF8 80241878 00000000 */ nop -/* BA5FFC 8024187C 45030001 */ bc1tl .L80241884 -/* BA6000 80241880 E6220038 */ swc1 $f2, 0x38($s1) -.L80241884: -/* BA6004 80241884 8E42000C */ lw $v0, 0xc($s2) -/* BA6008 80241888 8E430014 */ lw $v1, 0x14($s2) -/* BA600C 8024188C C6200040 */ lwc1 $f0, 0x40($s1) -/* BA6010 80241890 00431021 */ addu $v0, $v0, $v1 -/* BA6014 80241894 44821000 */ mtc1 $v0, $f2 -/* BA6018 80241898 00000000 */ nop -/* BA601C 8024189C 468010A0 */ cvt.s.w $f2, $f2 -/* BA6020 802418A0 4600103C */ c.lt.s $f2, $f0 -/* BA6024 802418A4 00000000 */ nop -/* BA6028 802418A8 45030001 */ bc1tl .L802418B0 -/* BA602C 802418AC E6220040 */ swc1 $f2, 0x40($s1) -.L802418B0: -/* BA6030 802418B0 8E42000C */ lw $v0, 0xc($s2) -/* BA6034 802418B4 8E430014 */ lw $v1, 0x14($s2) -/* BA6038 802418B8 C6200040 */ lwc1 $f0, 0x40($s1) -/* BA603C 802418BC 00431023 */ subu $v0, $v0, $v1 -/* BA6040 802418C0 44821000 */ mtc1 $v0, $f2 -/* BA6044 802418C4 00000000 */ nop -/* BA6048 802418C8 468010A0 */ cvt.s.w $f2, $f2 -/* BA604C 802418CC 4602003C */ c.lt.s $f0, $f2 -/* BA6050 802418D0 00000000 */ nop -/* BA6054 802418D4 45030001 */ bc1tl .L802418DC -/* BA6058 802418D8 E6220040 */ swc1 $f2, 0x40($s1) -.L802418DC: -/* BA605C 802418DC 16E0001F */ bnez $s7, .L8024195C -/* BA6060 802418E0 00000000 */ nop -/* BA6064 802418E4 8E220000 */ lw $v0, ($s1) -/* BA6068 802418E8 30420008 */ andi $v0, $v0, 8 -/* BA606C 802418EC 10400003 */ beqz $v0, .L802418FC -/* BA6070 802418F0 27A50020 */ addiu $a1, $sp, 0x20 -/* BA6074 802418F4 13C00019 */ beqz $fp, .L8024195C -/* BA6078 802418F8 00000000 */ nop -.L802418FC: -/* BA607C 802418FC 27A60024 */ addiu $a2, $sp, 0x24 -/* BA6080 80241900 27A20038 */ addiu $v0, $sp, 0x38 -/* BA6084 80241904 C6220038 */ lwc1 $f2, 0x38($s1) -/* BA6088 80241908 C620003C */ lwc1 $f0, 0x3c($s1) -/* BA608C 8024190C 3C0143C8 */ lui $at, 0x43c8 -/* BA6090 80241910 44813000 */ mtc1 $at, $f6 -/* BA6094 80241914 46000021 */ cvt.d.s $f0, $f0 -/* BA6098 80241918 E7A20020 */ swc1 $f2, 0x20($sp) -/* BA609C 8024191C 3C018024 */ lui $at, 0x8024 -/* BA60A0 80241920 D4225970 */ ldc1 $f2, 0x5970($at) -/* BA60A4 80241924 C6240040 */ lwc1 $f4, 0x40($s1) -/* BA60A8 80241928 46220000 */ add.d $f0, $f0, $f2 -/* BA60AC 8024192C E7A60038 */ swc1 $f6, 0x38($sp) -/* BA60B0 80241930 E7A40028 */ swc1 $f4, 0x28($sp) -/* BA60B4 80241934 46200020 */ cvt.s.d $f0, $f0 -/* BA60B8 80241938 E7A00024 */ swc1 $f0, 0x24($sp) -/* BA60BC 8024193C AFA20010 */ sw $v0, 0x10($sp) -/* BA60C0 80241940 8E240080 */ lw $a0, 0x80($s1) -/* BA60C4 80241944 0C0372DF */ jal func_800DCB7C -/* BA60C8 80241948 27A70028 */ addiu $a3, $sp, 0x28 -/* BA60CC 8024194C 10400003 */ beqz $v0, .L8024195C -/* BA60D0 80241950 00000000 */ nop -/* BA60D4 80241954 C7A00024 */ lwc1 $f0, 0x24($sp) -/* BA60D8 80241958 E620003C */ swc1 $f0, 0x3c($s1) -.L8024195C: -/* BA60DC 8024195C C62C0038 */ lwc1 $f12, 0x38($s1) -/* BA60E0 80241960 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BA60E4 80241964 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BA60E8 80241968 C62E0040 */ lwc1 $f14, 0x40($s1) -/* BA60EC 8024196C 8C460028 */ lw $a2, 0x28($v0) -/* BA60F0 80241970 0C00A720 */ jal atan2 -/* BA60F4 80241974 8C470030 */ lw $a3, 0x30($v0) -/* BA60F8 80241978 0220202D */ daddu $a0, $s1, $zero -/* BA60FC 8024197C 24050321 */ addiu $a1, $zero, 0x321 -/* BA6100 80241980 0000302D */ daddu $a2, $zero, $zero -/* BA6104 80241984 0C012530 */ jal func_800494C0 -/* BA6108 80241988 E620000C */ swc1 $f0, 0xc($s1) -/* BA610C 8024198C 8EC200CC */ lw $v0, 0xcc($s6) -/* BA6110 80241990 8C420024 */ lw $v0, 0x24($v0) -/* BA6114 80241994 AE220028 */ sw $v0, 0x28($s1) -/* BA6118 80241998 96C20096 */ lhu $v0, 0x96($s6) -/* BA611C 8024199C A622008E */ sh $v0, 0x8e($s1) -/* BA6120 802419A0 8FA80080 */ lw $t0, 0x80($sp) -/* BA6124 802419A4 2402000B */ addiu $v0, $zero, 0xb -/* BA6128 802419A8 AD020070 */ sw $v0, 0x70($t0) -.L802419AC: -/* BA612C 802419AC 8FBF0064 */ lw $ra, 0x64($sp) -/* BA6130 802419B0 8FBE0060 */ lw $fp, 0x60($sp) -/* BA6134 802419B4 8FB7005C */ lw $s7, 0x5c($sp) -/* BA6138 802419B8 8FB60058 */ lw $s6, 0x58($sp) -/* BA613C 802419BC 8FB50054 */ lw $s5, 0x54($sp) -/* BA6140 802419C0 8FB40050 */ lw $s4, 0x50($sp) -/* BA6144 802419C4 8FB3004C */ lw $s3, 0x4c($sp) -/* BA6148 802419C8 8FB20048 */ lw $s2, 0x48($sp) -/* BA614C 802419CC 8FB10044 */ lw $s1, 0x44($sp) -/* BA6150 802419D0 8FB00040 */ lw $s0, 0x40($sp) -/* BA6154 802419D4 D7B80078 */ ldc1 $f24, 0x78($sp) -/* BA6158 802419D8 D7B60070 */ ldc1 $f22, 0x70($sp) -/* BA615C 802419DC D7B40068 */ ldc1 $f20, 0x68($sp) -/* BA6160 802419E0 03E00008 */ jr $ra -/* BA6164 802419E4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_802419E8_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_802419E8_BA4780.s deleted file mode 100644 index fe0640254c..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_802419E8_BA4780.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419E8_BA6168 -/* BA6168 802419E8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA616C 802419EC AFB10014 */ sw $s1, 0x14($sp) -/* BA6170 802419F0 0080882D */ daddu $s1, $a0, $zero -/* BA6174 802419F4 AFBF0018 */ sw $ra, 0x18($sp) -/* BA6178 802419F8 AFB00010 */ sw $s0, 0x10($sp) -/* BA617C 802419FC 8E300148 */ lw $s0, 0x148($s1) -/* BA6180 80241A00 0C00EABB */ jal get_npc_unsafe -/* BA6184 80241A04 86040008 */ lh $a0, 8($s0) -/* BA6188 80241A08 0040202D */ daddu $a0, $v0, $zero -/* BA618C 80241A0C 9482008E */ lhu $v0, 0x8e($a0) -/* BA6190 80241A10 2442FFFF */ addiu $v0, $v0, -1 -/* BA6194 80241A14 A482008E */ sh $v0, 0x8e($a0) -/* BA6198 80241A18 00021400 */ sll $v0, $v0, 0x10 -/* BA619C 80241A1C 8E030098 */ lw $v1, 0x98($s0) -/* BA61A0 80241A20 00021403 */ sra $v0, $v0, 0x10 -/* BA61A4 80241A24 0062182A */ slt $v1, $v1, $v0 -/* BA61A8 80241A28 14600005 */ bnez $v1, .L80241A40 -/* BA61AC 80241A2C 3C03E0EF */ lui $v1, 0xe0ef -/* BA61B0 80241A30 8E020000 */ lw $v0, ($s0) -/* BA61B4 80241A34 3463FFFF */ ori $v1, $v1, 0xffff -/* BA61B8 80241A38 00431024 */ and $v0, $v0, $v1 -/* BA61BC 80241A3C AE020000 */ sw $v0, ($s0) -.L80241A40: -/* BA61C0 80241A40 8482008E */ lh $v0, 0x8e($a0) -/* BA61C4 80241A44 14400007 */ bnez $v0, .L80241A64 -/* BA61C8 80241A48 00000000 */ nop -/* BA61CC 80241A4C 8E0200CC */ lw $v0, 0xcc($s0) -/* BA61D0 80241A50 8C420028 */ lw $v0, 0x28($v0) -/* BA61D4 80241A54 A480008E */ sh $zero, 0x8e($a0) -/* BA61D8 80241A58 AC820028 */ sw $v0, 0x28($a0) -/* BA61DC 80241A5C 2402000C */ addiu $v0, $zero, 0xc -/* BA61E0 80241A60 AE220070 */ sw $v0, 0x70($s1) -.L80241A64: -/* BA61E4 80241A64 8FBF0018 */ lw $ra, 0x18($sp) -/* BA61E8 80241A68 8FB10014 */ lw $s1, 0x14($sp) -/* BA61EC 80241A6C 8FB00010 */ lw $s0, 0x10($sp) -/* BA61F0 80241A70 03E00008 */ jr $ra -/* BA61F4 80241A74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_80241BD8_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_80241BD8_BA4780.s deleted file mode 100644 index 2f5af832ba..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_80241BD8_BA4780.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BD8_BA6358 -/* BA6358 80241BD8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BA635C 80241BDC AFB40040 */ sw $s4, 0x40($sp) -/* BA6360 80241BE0 0080A02D */ daddu $s4, $a0, $zero -/* BA6364 80241BE4 AFBF0044 */ sw $ra, 0x44($sp) -/* BA6368 80241BE8 AFB3003C */ sw $s3, 0x3c($sp) -/* BA636C 80241BEC AFB20038 */ sw $s2, 0x38($sp) -/* BA6370 80241BF0 AFB10034 */ sw $s1, 0x34($sp) -/* BA6374 80241BF4 AFB00030 */ sw $s0, 0x30($sp) -/* BA6378 80241BF8 8E910148 */ lw $s1, 0x148($s4) -/* BA637C 80241BFC 00A0902D */ daddu $s2, $a1, $zero -/* BA6380 80241C00 86240008 */ lh $a0, 8($s1) -/* BA6384 80241C04 0C00EABB */ jal get_npc_unsafe -/* BA6388 80241C08 00C0982D */ daddu $s3, $a2, $zero -/* BA638C 80241C0C 0040802D */ daddu $s0, $v0, $zero -/* BA6390 80241C10 9602008E */ lhu $v0, 0x8e($s0) -/* BA6394 80241C14 2442FFFF */ addiu $v0, $v0, -1 -/* BA6398 80241C18 A602008E */ sh $v0, 0x8e($s0) -/* BA639C 80241C1C 00021400 */ sll $v0, $v0, 0x10 -/* BA63A0 80241C20 14400020 */ bnez $v0, .L80241CA4 -/* BA63A4 80241C24 0260202D */ daddu $a0, $s3, $zero -/* BA63A8 80241C28 AFA00010 */ sw $zero, 0x10($sp) -/* BA63AC 80241C2C 8E46000C */ lw $a2, 0xc($s2) -/* BA63B0 80241C30 8E470010 */ lw $a3, 0x10($s2) -/* BA63B4 80241C34 0C01242D */ jal func_800490B4 -/* BA63B8 80241C38 0220282D */ daddu $a1, $s1, $zero -/* BA63BC 80241C3C 54400018 */ bnel $v0, $zero, .L80241CA0 -/* BA63C0 80241C40 A600008E */ sh $zero, 0x8e($s0) -/* BA63C4 80241C44 24040002 */ addiu $a0, $zero, 2 -/* BA63C8 80241C48 0200282D */ daddu $a1, $s0, $zero -/* BA63CC 80241C4C 0000302D */ daddu $a2, $zero, $zero -/* BA63D0 80241C50 860300A8 */ lh $v1, 0xa8($s0) -/* BA63D4 80241C54 3C013F80 */ lui $at, 0x3f80 -/* BA63D8 80241C58 44810000 */ mtc1 $at, $f0 -/* BA63DC 80241C5C 3C014000 */ lui $at, 0x4000 -/* BA63E0 80241C60 44811000 */ mtc1 $at, $f2 -/* BA63E4 80241C64 3C01C1A0 */ lui $at, 0xc1a0 -/* BA63E8 80241C68 44812000 */ mtc1 $at, $f4 -/* BA63EC 80241C6C 2402000F */ addiu $v0, $zero, 0xf -/* BA63F0 80241C70 AFA2001C */ sw $v0, 0x1c($sp) -/* BA63F4 80241C74 44833000 */ mtc1 $v1, $f6 -/* BA63F8 80241C78 00000000 */ nop -/* BA63FC 80241C7C 468031A0 */ cvt.s.w $f6, $f6 -/* BA6400 80241C80 44073000 */ mfc1 $a3, $f6 -/* BA6404 80241C84 27A20028 */ addiu $v0, $sp, 0x28 -/* BA6408 80241C88 AFA20020 */ sw $v0, 0x20($sp) -/* BA640C 80241C8C E7A00010 */ swc1 $f0, 0x10($sp) -/* BA6410 80241C90 E7A20014 */ swc1 $f2, 0x14($sp) -/* BA6414 80241C94 0C01BFA4 */ jal fx_emote -/* BA6418 80241C98 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA641C 80241C9C A600008E */ sh $zero, 0x8e($s0) -.L80241CA0: -/* BA6420 80241CA0 AE800070 */ sw $zero, 0x70($s4) -.L80241CA4: -/* BA6424 80241CA4 8FBF0044 */ lw $ra, 0x44($sp) -/* BA6428 80241CA8 8FB40040 */ lw $s4, 0x40($sp) -/* BA642C 80241CAC 8FB3003C */ lw $s3, 0x3c($sp) -/* BA6430 80241CB0 8FB20038 */ lw $s2, 0x38($sp) -/* BA6434 80241CB4 8FB10034 */ lw $s1, 0x34($sp) -/* BA6438 80241CB8 8FB00030 */ lw $s0, 0x30($sp) -/* BA643C 80241CBC 03E00008 */ jr $ra -/* BA6440 80241CC0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_80242144_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_80242144_BA4780.s deleted file mode 100644 index 00bcefef84..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_80242144_BA4780.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242144_BA68C4 -/* BA68C4 80242144 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* BA68C8 80242148 AFB3004C */ sw $s3, 0x4c($sp) -/* BA68CC 8024214C 0080982D */ daddu $s3, $a0, $zero -/* BA68D0 80242150 AFBF0054 */ sw $ra, 0x54($sp) -/* BA68D4 80242154 AFB40050 */ sw $s4, 0x50($sp) -/* BA68D8 80242158 AFB20048 */ sw $s2, 0x48($sp) -/* BA68DC 8024215C AFB10044 */ sw $s1, 0x44($sp) -/* BA68E0 80242160 AFB00040 */ sw $s0, 0x40($sp) -/* BA68E4 80242164 F7B40058 */ sdc1 $f20, 0x58($sp) -/* BA68E8 80242168 8E710148 */ lw $s1, 0x148($s3) -/* BA68EC 8024216C 00A0A02D */ daddu $s4, $a1, $zero -/* BA68F0 80242170 86240008 */ lh $a0, 8($s1) -/* BA68F4 80242174 0C00EABB */ jal get_npc_unsafe -/* BA68F8 80242178 00C0902D */ daddu $s2, $a2, $zero -/* BA68FC 8024217C 8E830014 */ lw $v1, 0x14($s4) -/* BA6900 80242180 04600034 */ bltz $v1, .L80242254 -/* BA6904 80242184 0040802D */ daddu $s0, $v0, $zero -/* BA6908 80242188 8E620074 */ lw $v0, 0x74($s3) -/* BA690C 8024218C 1C400030 */ bgtz $v0, .L80242250 -/* BA6910 80242190 2442FFFF */ addiu $v0, $v0, -1 -/* BA6914 80242194 0240202D */ daddu $a0, $s2, $zero -/* BA6918 80242198 AE630074 */ sw $v1, 0x74($s3) -/* BA691C 8024219C AFA00010 */ sw $zero, 0x10($sp) -/* BA6920 802421A0 8E86000C */ lw $a2, 0xc($s4) -/* BA6924 802421A4 8E870010 */ lw $a3, 0x10($s4) -/* BA6928 802421A8 0C01242D */ jal func_800490B4 -/* BA692C 802421AC 0220282D */ daddu $a1, $s1, $zero -/* BA6930 802421B0 10400025 */ beqz $v0, .L80242248 -/* BA6934 802421B4 0000202D */ daddu $a0, $zero, $zero -/* BA6938 802421B8 0200282D */ daddu $a1, $s0, $zero -/* BA693C 802421BC 0000302D */ daddu $a2, $zero, $zero -/* BA6940 802421C0 860300A8 */ lh $v1, 0xa8($s0) -/* BA6944 802421C4 3C013F80 */ lui $at, 0x3f80 -/* BA6948 802421C8 44810000 */ mtc1 $at, $f0 -/* BA694C 802421CC 3C014000 */ lui $at, 0x4000 -/* BA6950 802421D0 44811000 */ mtc1 $at, $f2 -/* BA6954 802421D4 3C01C1A0 */ lui $at, 0xc1a0 -/* BA6958 802421D8 44812000 */ mtc1 $at, $f4 -/* BA695C 802421DC 2402000F */ addiu $v0, $zero, 0xf -/* BA6960 802421E0 AFA2001C */ sw $v0, 0x1c($sp) -/* BA6964 802421E4 44835000 */ mtc1 $v1, $f10 -/* BA6968 802421E8 00000000 */ nop -/* BA696C 802421EC 468052A0 */ cvt.s.w $f10, $f10 -/* BA6970 802421F0 44075000 */ mfc1 $a3, $f10 -/* BA6974 802421F4 27A20028 */ addiu $v0, $sp, 0x28 -/* BA6978 802421F8 AFA20020 */ sw $v0, 0x20($sp) -/* BA697C 802421FC E7A00010 */ swc1 $f0, 0x10($sp) -/* BA6980 80242200 E7A20014 */ swc1 $f2, 0x14($sp) -/* BA6984 80242204 0C01BFA4 */ jal fx_emote -/* BA6988 80242208 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA698C 8024220C 0200202D */ daddu $a0, $s0, $zero -/* BA6990 80242210 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BA6994 80242214 0C012530 */ jal func_800494C0 -/* BA6998 80242218 3C060020 */ lui $a2, 0x20 -/* BA699C 8024221C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BA69A0 80242220 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BA69A4 80242224 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BA69A8 80242228 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BA69AC 8024222C 8C460028 */ lw $a2, 0x28($v0) -/* BA69B0 80242230 0C00A720 */ jal atan2 -/* BA69B4 80242234 8C470030 */ lw $a3, 0x30($v0) -/* BA69B8 80242238 2402000C */ addiu $v0, $zero, 0xc -/* BA69BC 8024223C E600000C */ swc1 $f0, 0xc($s0) -/* BA69C0 80242240 08090916 */ j .L80242458 -/* BA69C4 80242244 AE620070 */ sw $v0, 0x70($s3) -.L80242248: -/* BA69C8 80242248 8E620074 */ lw $v0, 0x74($s3) -/* BA69CC 8024224C 2442FFFF */ addiu $v0, $v0, -1 -.L80242250: -/* BA69D0 80242250 AE620074 */ sw $v0, 0x74($s3) -.L80242254: -/* BA69D4 80242254 C6000018 */ lwc1 $f0, 0x18($s0) -/* BA69D8 80242258 44801000 */ mtc1 $zero, $f2 -/* BA69DC 8024225C 44801800 */ mtc1 $zero, $f3 -/* BA69E0 80242260 46000021 */ cvt.d.s $f0, $f0 -/* BA69E4 80242264 4620103C */ c.lt.d $f2, $f0 -/* BA69E8 80242268 00000000 */ nop -/* BA69EC 8024226C 45000025 */ bc1f .L80242304 -/* BA69F0 80242270 27A5002C */ addiu $a1, $sp, 0x2c -/* BA69F4 80242274 C6000038 */ lwc1 $f0, 0x38($s0) -/* BA69F8 80242278 860200A6 */ lh $v0, 0xa6($s0) -/* BA69FC 8024227C 3C018024 */ lui $at, 0x8024 -/* BA6A00 80242280 D4225978 */ ldc1 $f2, 0x5978($at) -/* BA6A04 80242284 27A60030 */ addiu $a2, $sp, 0x30 -/* BA6A08 80242288 E7A0002C */ swc1 $f0, 0x2c($sp) -/* BA6A0C 8024228C 44820000 */ mtc1 $v0, $f0 -/* BA6A10 80242290 00000000 */ nop -/* BA6A14 80242294 46800020 */ cvt.s.w $f0, $f0 -/* BA6A18 80242298 46000021 */ cvt.d.s $f0, $f0 -/* BA6A1C 8024229C C604003C */ lwc1 $f4, 0x3c($s0) -/* BA6A20 802422A0 C6060040 */ lwc1 $f6, 0x40($s0) -/* BA6A24 802422A4 C6080018 */ lwc1 $f8, 0x18($s0) -/* BA6A28 802422A8 860200A8 */ lh $v0, 0xa8($s0) -/* BA6A2C 802422AC 46220002 */ mul.d $f0, $f0, $f2 -/* BA6A30 802422B0 00000000 */ nop -/* BA6A34 802422B4 E7A40030 */ swc1 $f4, 0x30($sp) -/* BA6A38 802422B8 E7A60034 */ swc1 $f6, 0x34($sp) -/* BA6A3C 802422BC E7A80010 */ swc1 $f8, 0x10($sp) -/* BA6A40 802422C0 C604000C */ lwc1 $f4, 0xc($s0) -/* BA6A44 802422C4 44821000 */ mtc1 $v0, $f2 -/* BA6A48 802422C8 00000000 */ nop -/* BA6A4C 802422CC 468010A0 */ cvt.s.w $f2, $f2 -/* BA6A50 802422D0 E7A20018 */ swc1 $f2, 0x18($sp) -/* BA6A54 802422D4 E7A40014 */ swc1 $f4, 0x14($sp) -/* BA6A58 802422D8 46200020 */ cvt.s.d $f0, $f0 -/* BA6A5C 802422DC E7A0001C */ swc1 $f0, 0x1c($sp) -/* BA6A60 802422E0 8E040080 */ lw $a0, 0x80($s0) -/* BA6A64 802422E4 0C037711 */ jal func_800DDC44 -/* BA6A68 802422E8 27A70034 */ addiu $a3, $sp, 0x34 -/* BA6A6C 802422EC 54400005 */ bnel $v0, $zero, .L80242304 -/* BA6A70 802422F0 AE000018 */ sw $zero, 0x18($s0) -/* BA6A74 802422F4 8E050018 */ lw $a1, 0x18($s0) -/* BA6A78 802422F8 8E06000C */ lw $a2, 0xc($s0) -/* BA6A7C 802422FC 0C00EA95 */ jal npc_move_heading -/* BA6A80 80242300 0200202D */ daddu $a0, $s0, $zero -.L80242304: -/* BA6A84 80242304 C600001C */ lwc1 $f0, 0x1c($s0) -/* BA6A88 80242308 44801000 */ mtc1 $zero, $f2 -/* BA6A8C 8024230C 44801800 */ mtc1 $zero, $f3 -/* BA6A90 80242310 46000021 */ cvt.d.s $f0, $f0 -/* BA6A94 80242314 4622003C */ c.lt.d $f0, $f2 -/* BA6A98 80242318 00000000 */ nop -/* BA6A9C 8024231C 45000047 */ bc1f .L8024243C -/* BA6AA0 80242320 27A5002C */ addiu $a1, $sp, 0x2c -/* BA6AA4 80242324 27A60030 */ addiu $a2, $sp, 0x30 -/* BA6AA8 80242328 27A20038 */ addiu $v0, $sp, 0x38 -/* BA6AAC 8024232C C602003C */ lwc1 $f2, 0x3c($s0) -/* BA6AB0 80242330 C6060038 */ lwc1 $f6, 0x38($s0) -/* BA6AB4 80242334 3C01402A */ lui $at, 0x402a -/* BA6AB8 80242338 4481A800 */ mtc1 $at, $f21 -/* BA6ABC 8024233C 4480A000 */ mtc1 $zero, $f20 -/* BA6AC0 80242340 460010A1 */ cvt.d.s $f2, $f2 -/* BA6AC4 80242344 46341080 */ add.d $f2, $f2, $f20 -/* BA6AC8 80242348 C600001C */ lwc1 $f0, 0x1c($s0) -/* BA6ACC 8024234C C6040040 */ lwc1 $f4, 0x40($s0) -/* BA6AD0 80242350 46000005 */ abs.s $f0, $f0 -/* BA6AD4 80242354 E7A40034 */ swc1 $f4, 0x34($sp) -/* BA6AD8 80242358 3C014030 */ lui $at, 0x4030 -/* BA6ADC 8024235C 44812800 */ mtc1 $at, $f5 -/* BA6AE0 80242360 44802000 */ mtc1 $zero, $f4 -/* BA6AE4 80242364 46000021 */ cvt.d.s $f0, $f0 -/* BA6AE8 80242368 E7A6002C */ swc1 $f6, 0x2c($sp) -/* BA6AEC 8024236C 46240000 */ add.d $f0, $f0, $f4 -/* BA6AF0 80242370 462010A0 */ cvt.s.d $f2, $f2 -/* BA6AF4 80242374 E7A20030 */ swc1 $f2, 0x30($sp) -/* BA6AF8 80242378 46200020 */ cvt.s.d $f0, $f0 -/* BA6AFC 8024237C E7A00038 */ swc1 $f0, 0x38($sp) -/* BA6B00 80242380 AFA20010 */ sw $v0, 0x10($sp) -/* BA6B04 80242384 8E040080 */ lw $a0, 0x80($s0) -/* BA6B08 80242388 0C0372DF */ jal func_800DCB7C -/* BA6B0C 8024238C 27A70034 */ addiu $a3, $sp, 0x34 -/* BA6B10 80242390 1040002A */ beqz $v0, .L8024243C -/* BA6B14 80242394 00000000 */ nop -/* BA6B18 80242398 C600001C */ lwc1 $f0, 0x1c($s0) -/* BA6B1C 8024239C C7A20038 */ lwc1 $f2, 0x38($sp) -/* BA6B20 802423A0 46000005 */ abs.s $f0, $f0 -/* BA6B24 802423A4 46000021 */ cvt.d.s $f0, $f0 -/* BA6B28 802423A8 46340000 */ add.d $f0, $f0, $f20 -/* BA6B2C 802423AC 460010A1 */ cvt.d.s $f2, $f2 -/* BA6B30 802423B0 4620103E */ c.le.d $f2, $f0 -/* BA6B34 802423B4 00000000 */ nop -/* BA6B38 802423B8 45000020 */ bc1f .L8024243C -/* BA6B3C 802423BC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BA6B40 802423C0 C7A00030 */ lwc1 $f0, 0x30($sp) -/* BA6B44 802423C4 8E020000 */ lw $v0, ($s0) -/* BA6B48 802423C8 2403F7FF */ addiu $v1, $zero, -0x801 -/* BA6B4C 802423CC AE00001C */ sw $zero, 0x1c($s0) -/* BA6B50 802423D0 00431024 */ and $v0, $v0, $v1 -/* BA6B54 802423D4 AE020000 */ sw $v0, ($s0) -/* BA6B58 802423D8 24020002 */ addiu $v0, $zero, 2 -/* BA6B5C 802423DC E600003C */ swc1 $f0, 0x3c($s0) -/* BA6B60 802423E0 0C00A67F */ jal rand_int -/* BA6B64 802423E4 AE620070 */ sw $v0, 0x70($s3) -/* BA6B68 802423E8 3C035555 */ lui $v1, 0x5555 -/* BA6B6C 802423EC 34635556 */ ori $v1, $v1, 0x5556 -/* BA6B70 802423F0 00430018 */ mult $v0, $v1 -/* BA6B74 802423F4 000227C3 */ sra $a0, $v0, 0x1f -/* BA6B78 802423F8 00004010 */ mfhi $t0 -/* BA6B7C 802423FC 01042023 */ subu $a0, $t0, $a0 -/* BA6B80 80242400 00041840 */ sll $v1, $a0, 1 -/* BA6B84 80242404 00641821 */ addu $v1, $v1, $a0 -/* BA6B88 80242408 00431023 */ subu $v0, $v0, $v1 -/* BA6B8C 8024240C 24430002 */ addiu $v1, $v0, 2 -/* BA6B90 80242410 AE630074 */ sw $v1, 0x74($s3) -/* BA6B94 80242414 8E82002C */ lw $v0, 0x2c($s4) -/* BA6B98 80242418 5840000F */ blezl $v0, .L80242458 -/* BA6B9C 8024241C AE600070 */ sw $zero, 0x70($s3) -/* BA6BA0 80242420 8E820004 */ lw $v0, 4($s4) -/* BA6BA4 80242424 5840000C */ blezl $v0, .L80242458 -/* BA6BA8 80242428 AE600070 */ sw $zero, 0x70($s3) -/* BA6BAC 8024242C 1460000A */ bnez $v1, .L80242458 -/* BA6BB0 80242430 00000000 */ nop -/* BA6BB4 80242434 08090916 */ j .L80242458 -/* BA6BB8 80242438 AE600070 */ sw $zero, 0x70($s3) -.L8024243C: -/* BA6BBC 8024243C C604003C */ lwc1 $f4, 0x3c($s0) -/* BA6BC0 80242440 C600001C */ lwc1 $f0, 0x1c($s0) -/* BA6BC4 80242444 46002100 */ add.s $f4, $f4, $f0 -/* BA6BC8 80242448 C6020014 */ lwc1 $f2, 0x14($s0) -/* BA6BCC 8024244C 46020001 */ sub.s $f0, $f0, $f2 -/* BA6BD0 80242450 E604003C */ swc1 $f4, 0x3c($s0) -/* BA6BD4 80242454 E600001C */ swc1 $f0, 0x1c($s0) -.L80242458: -/* BA6BD8 80242458 8FBF0054 */ lw $ra, 0x54($sp) -/* BA6BDC 8024245C 8FB40050 */ lw $s4, 0x50($sp) -/* BA6BE0 80242460 8FB3004C */ lw $s3, 0x4c($sp) -/* BA6BE4 80242464 8FB20048 */ lw $s2, 0x48($sp) -/* BA6BE8 80242468 8FB10044 */ lw $s1, 0x44($sp) -/* BA6BEC 8024246C 8FB00040 */ lw $s0, 0x40($sp) -/* BA6BF0 80242470 D7B40058 */ ldc1 $f20, 0x58($sp) -/* BA6BF4 80242474 03E00008 */ jr $ra -/* BA6BF8 80242478 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_8024247C_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_8024247C_BA4780.s deleted file mode 100644 index d44cb7733c..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_8024247C_BA4780.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024247C_BA6BFC -/* BA6BFC 8024247C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BA6C00 80242480 AFB3001C */ sw $s3, 0x1c($sp) -/* BA6C04 80242484 0080982D */ daddu $s3, $a0, $zero -/* BA6C08 80242488 AFBF0020 */ sw $ra, 0x20($sp) -/* BA6C0C 8024248C AFB20018 */ sw $s2, 0x18($sp) -/* BA6C10 80242490 AFB10014 */ sw $s1, 0x14($sp) -/* BA6C14 80242494 AFB00010 */ sw $s0, 0x10($sp) -/* BA6C18 80242498 8E720148 */ lw $s2, 0x148($s3) -/* BA6C1C 8024249C 86440008 */ lh $a0, 8($s2) -/* BA6C20 802424A0 0C00EABB */ jal get_npc_unsafe -/* BA6C24 802424A4 00A0882D */ daddu $s1, $a1, $zero -/* BA6C28 802424A8 8E240008 */ lw $a0, 8($s1) -/* BA6C2C 802424AC 0040802D */ daddu $s0, $v0, $zero -/* BA6C30 802424B0 00041FC2 */ srl $v1, $a0, 0x1f -/* BA6C34 802424B4 00832021 */ addu $a0, $a0, $v1 -/* BA6C38 802424B8 00042043 */ sra $a0, $a0, 1 -/* BA6C3C 802424BC 0C00A67F */ jal rand_int -/* BA6C40 802424C0 24840001 */ addiu $a0, $a0, 1 -/* BA6C44 802424C4 8E230008 */ lw $v1, 8($s1) -/* BA6C48 802424C8 240400B4 */ addiu $a0, $zero, 0xb4 -/* BA6C4C 802424CC 00032FC2 */ srl $a1, $v1, 0x1f -/* BA6C50 802424D0 00651821 */ addu $v1, $v1, $a1 -/* BA6C54 802424D4 00031843 */ sra $v1, $v1, 1 -/* BA6C58 802424D8 00621821 */ addu $v1, $v1, $v0 -/* BA6C5C 802424DC 0C00A67F */ jal rand_int -/* BA6C60 802424E0 A603008E */ sh $v1, 0x8e($s0) -/* BA6C64 802424E4 C60C000C */ lwc1 $f12, 0xc($s0) -/* BA6C68 802424E8 44820000 */ mtc1 $v0, $f0 -/* BA6C6C 802424EC 00000000 */ nop -/* BA6C70 802424F0 46800020 */ cvt.s.w $f0, $f0 -/* BA6C74 802424F4 46006300 */ add.s $f12, $f12, $f0 -/* BA6C78 802424F8 3C0142B4 */ lui $at, 0x42b4 -/* BA6C7C 802424FC 44810000 */ mtc1 $at, $f0 -/* BA6C80 80242500 0C00A6C9 */ jal clamp_angle -/* BA6C84 80242504 46006301 */ sub.s $f12, $f12, $f0 -/* BA6C88 80242508 E600000C */ swc1 $f0, 0xc($s0) -/* BA6C8C 8024250C 8E4200CC */ lw $v0, 0xcc($s2) -/* BA6C90 80242510 8C420000 */ lw $v0, ($v0) -/* BA6C94 80242514 AE020028 */ sw $v0, 0x28($s0) -/* BA6C98 80242518 24020003 */ addiu $v0, $zero, 3 -/* BA6C9C 8024251C AE620070 */ sw $v0, 0x70($s3) -/* BA6CA0 80242520 8FBF0020 */ lw $ra, 0x20($sp) -/* BA6CA4 80242524 8FB3001C */ lw $s3, 0x1c($sp) -/* BA6CA8 80242528 8FB20018 */ lw $s2, 0x18($sp) -/* BA6CAC 8024252C 8FB10014 */ lw $s1, 0x14($sp) -/* BA6CB0 80242530 8FB00010 */ lw $s0, 0x10($sp) -/* BA6CB4 80242534 03E00008 */ jr $ra -/* BA6CB8 80242538 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_802426E0_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_802426E0_BA4780.s deleted file mode 100644 index c9bda87fda..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_802426E0_BA4780.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426E0_BA6E60 -/* BA6E60 802426E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA6E64 802426E4 AFB10014 */ sw $s1, 0x14($sp) -/* BA6E68 802426E8 0080882D */ daddu $s1, $a0, $zero -/* BA6E6C 802426EC AFBF001C */ sw $ra, 0x1c($sp) -/* BA6E70 802426F0 AFB20018 */ sw $s2, 0x18($sp) -/* BA6E74 802426F4 AFB00010 */ sw $s0, 0x10($sp) -/* BA6E78 802426F8 8E220148 */ lw $v0, 0x148($s1) -/* BA6E7C 802426FC 00A0902D */ daddu $s2, $a1, $zero -/* BA6E80 80242700 84440008 */ lh $a0, 8($v0) -/* BA6E84 80242704 0C00EABB */ jal get_npc_unsafe -/* BA6E88 80242708 00C0802D */ daddu $s0, $a2, $zero -/* BA6E8C 8024270C 0220202D */ daddu $a0, $s1, $zero -/* BA6E90 80242710 0240282D */ daddu $a1, $s2, $zero -/* BA6E94 80242714 0200302D */ daddu $a2, $s0, $zero -/* BA6E98 80242718 0C0127DF */ jal func_80049F7C -/* BA6E9C 8024271C 0040802D */ daddu $s0, $v0, $zero -/* BA6EA0 80242720 8E020000 */ lw $v0, ($s0) -/* BA6EA4 80242724 24040005 */ addiu $a0, $zero, 5 -/* BA6EA8 80242728 34420800 */ ori $v0, $v0, 0x800 -/* BA6EAC 8024272C 0C00A67F */ jal rand_int -/* BA6EB0 80242730 AE020000 */ sw $v0, ($s0) -/* BA6EB4 80242734 44820000 */ mtc1 $v0, $f0 -/* BA6EB8 80242738 00000000 */ nop -/* BA6EBC 8024273C 46800021 */ cvt.d.w $f0, $f0 -/* BA6EC0 80242740 3C014024 */ lui $at, 0x4024 -/* BA6EC4 80242744 44811800 */ mtc1 $at, $f3 -/* BA6EC8 80242748 44801000 */ mtc1 $zero, $f2 -/* BA6ECC 8024274C 3C013FC0 */ lui $at, 0x3fc0 -/* BA6ED0 80242750 44812000 */ mtc1 $at, $f4 -/* BA6ED4 80242754 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BA6ED8 80242758 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BA6EDC 8024275C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BA6EE0 80242760 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BA6EE4 80242764 46220000 */ add.d $f0, $f0, $f2 -/* BA6EE8 80242768 E6040014 */ swc1 $f4, 0x14($s0) -/* BA6EEC 8024276C 46200020 */ cvt.s.d $f0, $f0 -/* BA6EF0 80242770 E600001C */ swc1 $f0, 0x1c($s0) -/* BA6EF4 80242774 8C460028 */ lw $a2, 0x28($v0) -/* BA6EF8 80242778 0C00A720 */ jal atan2 -/* BA6EFC 8024277C 8C470030 */ lw $a3, 0x30($v0) -/* BA6F00 80242780 0200202D */ daddu $a0, $s0, $zero -/* BA6F04 80242784 3C05B000 */ lui $a1, 0xb000 -/* BA6F08 80242788 34A50017 */ ori $a1, $a1, 0x17 -/* BA6F0C 8024278C 0000302D */ daddu $a2, $zero, $zero -/* BA6F10 80242790 E480000C */ swc1 $f0, 0xc($a0) -/* BA6F14 80242794 C6400018 */ lwc1 $f0, 0x18($s2) -/* BA6F18 80242798 2402000D */ addiu $v0, $zero, 0xd -/* BA6F1C 8024279C E4800018 */ swc1 $f0, 0x18($a0) -/* BA6F20 802427A0 0C012530 */ jal func_800494C0 -/* BA6F24 802427A4 AE220070 */ sw $v0, 0x70($s1) -/* BA6F28 802427A8 8FBF001C */ lw $ra, 0x1c($sp) -/* BA6F2C 802427AC 8FB20018 */ lw $s2, 0x18($sp) -/* BA6F30 802427B0 8FB10014 */ lw $s1, 0x14($sp) -/* BA6F34 802427B4 8FB00010 */ lw $s0, 0x10($sp) -/* BA6F38 802427B8 03E00008 */ jr $ra -/* BA6F3C 802427BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_802427C0_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_802427C0_BA4780.s deleted file mode 100644 index 28c744b88b..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_802427C0_BA4780.s +++ /dev/null @@ -1,200 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427C0_BA6F40 -/* BA6F40 802427C0 27BDFF90 */ addiu $sp, $sp, -0x70 -/* BA6F44 802427C4 AFB40050 */ sw $s4, 0x50($sp) -/* BA6F48 802427C8 0080A02D */ daddu $s4, $a0, $zero -/* BA6F4C 802427CC AFBF0060 */ sw $ra, 0x60($sp) -/* BA6F50 802427D0 AFB7005C */ sw $s7, 0x5c($sp) -/* BA6F54 802427D4 AFB60058 */ sw $s6, 0x58($sp) -/* BA6F58 802427D8 AFB50054 */ sw $s5, 0x54($sp) -/* BA6F5C 802427DC AFB3004C */ sw $s3, 0x4c($sp) -/* BA6F60 802427E0 AFB20048 */ sw $s2, 0x48($sp) -/* BA6F64 802427E4 AFB10044 */ sw $s1, 0x44($sp) -/* BA6F68 802427E8 AFB00040 */ sw $s0, 0x40($sp) -/* BA6F6C 802427EC F7B40068 */ sdc1 $f20, 0x68($sp) -/* BA6F70 802427F0 8E950148 */ lw $s5, 0x148($s4) -/* BA6F74 802427F4 00A0B02D */ daddu $s6, $a1, $zero -/* BA6F78 802427F8 86A40008 */ lh $a0, 8($s5) -/* BA6F7C 802427FC 0C00EABB */ jal get_npc_unsafe -/* BA6F80 80242800 00C0B82D */ daddu $s7, $a2, $zero -/* BA6F84 80242804 0040982D */ daddu $s3, $v0, $zero -/* BA6F88 80242808 C6600018 */ lwc1 $f0, 0x18($s3) -/* BA6F8C 8024280C 44801000 */ mtc1 $zero, $f2 -/* BA6F90 80242810 44801800 */ mtc1 $zero, $f3 -/* BA6F94 80242814 46000021 */ cvt.d.s $f0, $f0 -/* BA6F98 80242818 4620103C */ c.lt.d $f2, $f0 -/* BA6F9C 8024281C 00000000 */ nop -/* BA6FA0 80242820 45000021 */ bc1f .L802428A8 -/* BA6FA4 80242824 27A50028 */ addiu $a1, $sp, 0x28 -/* BA6FA8 80242828 C6600038 */ lwc1 $f0, 0x38($s3) -/* BA6FAC 8024282C C662003C */ lwc1 $f2, 0x3c($s3) -/* BA6FB0 80242830 C6640040 */ lwc1 $f4, 0x40($s3) -/* BA6FB4 80242834 C6660018 */ lwc1 $f6, 0x18($s3) -/* BA6FB8 80242838 E7A00028 */ swc1 $f0, 0x28($sp) -/* BA6FBC 8024283C E7A2002C */ swc1 $f2, 0x2c($sp) -/* BA6FC0 80242840 E7A40030 */ swc1 $f4, 0x30($sp) -/* BA6FC4 80242844 E7A60010 */ swc1 $f6, 0x10($sp) -/* BA6FC8 80242848 C660000C */ lwc1 $f0, 0xc($s3) -/* BA6FCC 8024284C E7A00014 */ swc1 $f0, 0x14($sp) -/* BA6FD0 80242850 866200A8 */ lh $v0, 0xa8($s3) -/* BA6FD4 80242854 44820000 */ mtc1 $v0, $f0 -/* BA6FD8 80242858 00000000 */ nop -/* BA6FDC 8024285C 46800020 */ cvt.s.w $f0, $f0 -/* BA6FE0 80242860 E7A00018 */ swc1 $f0, 0x18($sp) -/* BA6FE4 80242864 866200A6 */ lh $v0, 0xa6($s3) -/* BA6FE8 80242868 27A6002C */ addiu $a2, $sp, 0x2c -/* BA6FEC 8024286C 44820000 */ mtc1 $v0, $f0 -/* BA6FF0 80242870 00000000 */ nop -/* BA6FF4 80242874 46800020 */ cvt.s.w $f0, $f0 -/* BA6FF8 80242878 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BA6FFC 8024287C 8E640080 */ lw $a0, 0x80($s3) -/* BA7000 80242880 0C037711 */ jal func_800DDC44 -/* BA7004 80242884 27A70030 */ addiu $a3, $sp, 0x30 -/* BA7008 80242888 10400003 */ beqz $v0, .L80242898 -/* BA700C 8024288C 00000000 */ nop -/* BA7010 80242890 08090A2A */ j .L802428A8 -/* BA7014 80242894 AE600018 */ sw $zero, 0x18($s3) -.L80242898: -/* BA7018 80242898 8E650018 */ lw $a1, 0x18($s3) -/* BA701C 8024289C 8E66000C */ lw $a2, 0xc($s3) -/* BA7020 802428A0 0C00EA95 */ jal npc_move_heading -/* BA7024 802428A4 0260202D */ daddu $a0, $s3, $zero -.L802428A8: -/* BA7028 802428A8 C660001C */ lwc1 $f0, 0x1c($s3) -/* BA702C 802428AC 44801000 */ mtc1 $zero, $f2 -/* BA7030 802428B0 44801800 */ mtc1 $zero, $f3 -/* BA7034 802428B4 46000021 */ cvt.d.s $f0, $f0 -/* BA7038 802428B8 4622003C */ c.lt.d $f0, $f2 -/* BA703C 802428BC 00000000 */ nop -/* BA7040 802428C0 4500006C */ bc1f .L80242A74 -/* BA7044 802428C4 27B00028 */ addiu $s0, $sp, 0x28 -/* BA7048 802428C8 0200282D */ daddu $a1, $s0, $zero -/* BA704C 802428CC 27A60034 */ addiu $a2, $sp, 0x34 -/* BA7050 802428D0 27B20038 */ addiu $s2, $sp, 0x38 -/* BA7054 802428D4 C6600038 */ lwc1 $f0, 0x38($s3) -/* BA7058 802428D8 3C0142C8 */ lui $at, 0x42c8 -/* BA705C 802428DC 44811000 */ mtc1 $at, $f2 -/* BA7060 802428E0 C6640040 */ lwc1 $f4, 0x40($s3) -/* BA7064 802428E4 3C01447A */ lui $at, 0x447a -/* BA7068 802428E8 44813000 */ mtc1 $at, $f6 -/* BA706C 802428EC 27B10030 */ addiu $s1, $sp, 0x30 -/* BA7070 802428F0 E7A00028 */ swc1 $f0, 0x28($sp) -/* BA7074 802428F4 E7A20034 */ swc1 $f2, 0x34($sp) -/* BA7078 802428F8 E7A40030 */ swc1 $f4, 0x30($sp) -/* BA707C 802428FC E7A60038 */ swc1 $f6, 0x38($sp) -/* BA7080 80242900 AFB20010 */ sw $s2, 0x10($sp) -/* BA7084 80242904 8E640080 */ lw $a0, 0x80($s3) -/* BA7088 80242908 0C0372DF */ jal func_800DCB7C -/* BA708C 8024290C 0220382D */ daddu $a3, $s1, $zero -/* BA7090 80242910 0200282D */ daddu $a1, $s0, $zero -/* BA7094 80242914 27A6002C */ addiu $a2, $sp, 0x2c -/* BA7098 80242918 C662003C */ lwc1 $f2, 0x3c($s3) -/* BA709C 8024291C C6660038 */ lwc1 $f6, 0x38($s3) -/* BA70A0 80242920 3C01402A */ lui $at, 0x402a -/* BA70A4 80242924 4481A800 */ mtc1 $at, $f21 -/* BA70A8 80242928 4480A000 */ mtc1 $zero, $f20 -/* BA70AC 8024292C 460010A1 */ cvt.d.s $f2, $f2 -/* BA70B0 80242930 46341080 */ add.d $f2, $f2, $f20 -/* BA70B4 80242934 C660001C */ lwc1 $f0, 0x1c($s3) -/* BA70B8 80242938 C6640040 */ lwc1 $f4, 0x40($s3) -/* BA70BC 8024293C 46000005 */ abs.s $f0, $f0 -/* BA70C0 80242940 E7A40030 */ swc1 $f4, 0x30($sp) -/* BA70C4 80242944 3C014030 */ lui $at, 0x4030 -/* BA70C8 80242948 44812800 */ mtc1 $at, $f5 -/* BA70CC 8024294C 44802000 */ mtc1 $zero, $f4 -/* BA70D0 80242950 46000021 */ cvt.d.s $f0, $f0 -/* BA70D4 80242954 E7A60028 */ swc1 $f6, 0x28($sp) -/* BA70D8 80242958 46240000 */ add.d $f0, $f0, $f4 -/* BA70DC 8024295C 462010A0 */ cvt.s.d $f2, $f2 -/* BA70E0 80242960 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BA70E4 80242964 46200020 */ cvt.s.d $f0, $f0 -/* BA70E8 80242968 E7A00038 */ swc1 $f0, 0x38($sp) -/* BA70EC 8024296C AFB20010 */ sw $s2, 0x10($sp) -/* BA70F0 80242970 8E640080 */ lw $a0, 0x80($s3) -/* BA70F4 80242974 0C0372DF */ jal func_800DCB7C -/* BA70F8 80242978 0220382D */ daddu $a3, $s1, $zero -/* BA70FC 8024297C 1040003D */ beqz $v0, .L80242A74 -/* BA7100 80242980 00000000 */ nop -/* BA7104 80242984 C660001C */ lwc1 $f0, 0x1c($s3) -/* BA7108 80242988 C7A20038 */ lwc1 $f2, 0x38($sp) -/* BA710C 8024298C 46000005 */ abs.s $f0, $f0 -/* BA7110 80242990 46000021 */ cvt.d.s $f0, $f0 -/* BA7114 80242994 46340000 */ add.d $f0, $f0, $f20 -/* BA7118 80242998 460010A1 */ cvt.d.s $f2, $f2 -/* BA711C 8024299C 4620103E */ c.le.d $f2, $f0 -/* BA7120 802429A0 00000000 */ nop -/* BA7124 802429A4 45000033 */ bc1f .L80242A74 -/* BA7128 802429A8 2403F7FF */ addiu $v1, $zero, -0x801 -/* BA712C 802429AC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BA7130 802429B0 8E620000 */ lw $v0, ($s3) -/* BA7134 802429B4 AE60001C */ sw $zero, 0x1c($s3) -/* BA7138 802429B8 00431024 */ and $v0, $v0, $v1 -/* BA713C 802429BC E660003C */ swc1 $f0, 0x3c($s3) -/* BA7140 802429C0 AE620000 */ sw $v0, ($s3) -/* BA7144 802429C4 AFA00010 */ sw $zero, 0x10($sp) -/* BA7148 802429C8 AFA00014 */ sw $zero, 0x14($sp) -/* BA714C 802429CC 8E650038 */ lw $a1, 0x38($s3) -/* BA7150 802429D0 8E66003C */ lw $a2, 0x3c($s3) -/* BA7154 802429D4 8E670040 */ lw $a3, 0x40($s3) -/* BA7158 802429D8 0C01BECC */ jal fx_walk_normal -/* BA715C 802429DC 24040002 */ addiu $a0, $zero, 2 -/* BA7160 802429E0 02E0202D */ daddu $a0, $s7, $zero -/* BA7164 802429E4 2402000C */ addiu $v0, $zero, 0xc -/* BA7168 802429E8 AE820070 */ sw $v0, 0x70($s4) -/* BA716C 802429EC 24020001 */ addiu $v0, $zero, 1 -/* BA7170 802429F0 AFA20010 */ sw $v0, 0x10($sp) -/* BA7174 802429F4 8EC60024 */ lw $a2, 0x24($s6) -/* BA7178 802429F8 8EC70028 */ lw $a3, 0x28($s6) -/* BA717C 802429FC 0C01242D */ jal func_800490B4 -/* BA7180 80242A00 02A0282D */ daddu $a1, $s5, $zero -/* BA7184 80242A04 14400022 */ bnez $v0, .L80242A90 -/* BA7188 80242A08 24040002 */ addiu $a0, $zero, 2 -/* BA718C 80242A0C 0260282D */ daddu $a1, $s3, $zero -/* BA7190 80242A10 0000302D */ daddu $a2, $zero, $zero -/* BA7194 80242A14 866300A8 */ lh $v1, 0xa8($s3) -/* BA7198 80242A18 3C013F80 */ lui $at, 0x3f80 -/* BA719C 80242A1C 44810000 */ mtc1 $at, $f0 -/* BA71A0 80242A20 3C014000 */ lui $at, 0x4000 -/* BA71A4 80242A24 44811000 */ mtc1 $at, $f2 -/* BA71A8 80242A28 3C01C1A0 */ lui $at, 0xc1a0 -/* BA71AC 80242A2C 44812000 */ mtc1 $at, $f4 -/* BA71B0 80242A30 2402000F */ addiu $v0, $zero, 0xf -/* BA71B4 80242A34 AFA2001C */ sw $v0, 0x1c($sp) -/* BA71B8 80242A38 44834000 */ mtc1 $v1, $f8 -/* BA71BC 80242A3C 00000000 */ nop -/* BA71C0 80242A40 46804220 */ cvt.s.w $f8, $f8 -/* BA71C4 80242A44 44074000 */ mfc1 $a3, $f8 -/* BA71C8 80242A48 27A2003C */ addiu $v0, $sp, 0x3c -/* BA71CC 80242A4C AFA20020 */ sw $v0, 0x20($sp) -/* BA71D0 80242A50 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA71D4 80242A54 E7A20014 */ swc1 $f2, 0x14($sp) -/* BA71D8 80242A58 0C01BFA4 */ jal fx_emote -/* BA71DC 80242A5C E7A40018 */ swc1 $f4, 0x18($sp) -/* BA71E0 80242A60 24020019 */ addiu $v0, $zero, 0x19 -/* BA71E4 80242A64 A662008E */ sh $v0, 0x8e($s3) -/* BA71E8 80242A68 2402000E */ addiu $v0, $zero, 0xe -/* BA71EC 80242A6C 08090AA4 */ j .L80242A90 -/* BA71F0 80242A70 AE820070 */ sw $v0, 0x70($s4) -.L80242A74: -/* BA71F4 80242A74 C664003C */ lwc1 $f4, 0x3c($s3) -/* BA71F8 80242A78 C660001C */ lwc1 $f0, 0x1c($s3) -/* BA71FC 80242A7C 46002100 */ add.s $f4, $f4, $f0 -/* BA7200 80242A80 C6620014 */ lwc1 $f2, 0x14($s3) -/* BA7204 80242A84 46020001 */ sub.s $f0, $f0, $f2 -/* BA7208 80242A88 E664003C */ swc1 $f4, 0x3c($s3) -/* BA720C 80242A8C E660001C */ swc1 $f0, 0x1c($s3) -.L80242A90: -/* BA7210 80242A90 8FBF0060 */ lw $ra, 0x60($sp) -/* BA7214 80242A94 8FB7005C */ lw $s7, 0x5c($sp) -/* BA7218 80242A98 8FB60058 */ lw $s6, 0x58($sp) -/* BA721C 80242A9C 8FB50054 */ lw $s5, 0x54($sp) -/* BA7220 80242AA0 8FB40050 */ lw $s4, 0x50($sp) -/* BA7224 80242AA4 8FB3004C */ lw $s3, 0x4c($sp) -/* BA7228 80242AA8 8FB20048 */ lw $s2, 0x48($sp) -/* BA722C 80242AAC 8FB10044 */ lw $s1, 0x44($sp) -/* BA7230 80242AB0 8FB00040 */ lw $s0, 0x40($sp) -/* BA7234 80242AB4 D7B40068 */ ldc1 $f20, 0x68($sp) -/* BA7238 80242AB8 03E00008 */ jr $ra -/* BA723C 80242ABC 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_80242AC0_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_80242AC0_BA4780.s deleted file mode 100644 index d6769c1105..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_80242AC0_BA4780.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AC0_BA7240 -/* BA7240 80242AC0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BA7244 80242AC4 AFB00010 */ sw $s0, 0x10($sp) -/* BA7248 80242AC8 0080802D */ daddu $s0, $a0, $zero -/* BA724C 80242ACC AFBF0014 */ sw $ra, 0x14($sp) -/* BA7250 80242AD0 8E020148 */ lw $v0, 0x148($s0) -/* BA7254 80242AD4 0C00EABB */ jal get_npc_unsafe -/* BA7258 80242AD8 84440008 */ lh $a0, 8($v0) -/* BA725C 80242ADC 9443008E */ lhu $v1, 0x8e($v0) -/* BA7260 80242AE0 2463FFFF */ addiu $v1, $v1, -1 -/* BA7264 80242AE4 A443008E */ sh $v1, 0x8e($v0) -/* BA7268 80242AE8 00031C00 */ sll $v1, $v1, 0x10 -/* BA726C 80242AEC 58600001 */ blezl $v1, .L80242AF4 -/* BA7270 80242AF0 AE000070 */ sw $zero, 0x70($s0) -.L80242AF4: -/* BA7274 80242AF4 8FBF0014 */ lw $ra, 0x14($sp) -/* BA7278 80242AF8 8FB00010 */ lw $s0, 0x10($sp) -/* BA727C 80242AFC 03E00008 */ jr $ra -/* BA7280 80242B00 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_06/func_80242B04_BA4780.s b/asm/nonmatchings/world/area_mim/mim_06/func_80242B04_BA4780.s deleted file mode 100644 index 440c2f8bc8..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/func_80242B04_BA4780.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B04_BA7284 -/* BA7284 80242B04 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BA7288 80242B08 AFB3003C */ sw $s3, 0x3c($sp) -/* BA728C 80242B0C 0080982D */ daddu $s3, $a0, $zero -/* BA7290 80242B10 AFBF0048 */ sw $ra, 0x48($sp) -/* BA7294 80242B14 AFB50044 */ sw $s5, 0x44($sp) -/* BA7298 80242B18 AFB40040 */ sw $s4, 0x40($sp) -/* BA729C 80242B1C AFB20038 */ sw $s2, 0x38($sp) -/* BA72A0 80242B20 AFB10034 */ sw $s1, 0x34($sp) -/* BA72A4 80242B24 AFB00030 */ sw $s0, 0x30($sp) -/* BA72A8 80242B28 8E720148 */ lw $s2, 0x148($s3) -/* BA72AC 80242B2C 86440008 */ lh $a0, 8($s2) -/* BA72B0 80242B30 8E70000C */ lw $s0, 0xc($s3) -/* BA72B4 80242B34 0C00EABB */ jal get_npc_unsafe -/* BA72B8 80242B38 00A0882D */ daddu $s1, $a1, $zero -/* BA72BC 80242B3C 8E050000 */ lw $a1, ($s0) -/* BA72C0 80242B40 26100004 */ addiu $s0, $s0, 4 -/* BA72C4 80242B44 0260202D */ daddu $a0, $s3, $zero -/* BA72C8 80242B48 0C0B1EAF */ jal get_variable -/* BA72CC 80242B4C 0040A82D */ daddu $s5, $v0, $zero -/* BA72D0 80242B50 0260202D */ daddu $a0, $s3, $zero -/* BA72D4 80242B54 8E050000 */ lw $a1, ($s0) -/* BA72D8 80242B58 0C0B1EAF */ jal get_variable -/* BA72DC 80242B5C 0040A02D */ daddu $s4, $v0, $zero -/* BA72E0 80242B60 AE420094 */ sw $v0, 0x94($s2) -/* BA72E4 80242B64 AFA00010 */ sw $zero, 0x10($sp) -/* BA72E8 80242B68 8E4200D0 */ lw $v0, 0xd0($s2) -/* BA72EC 80242B6C 8C420030 */ lw $v0, 0x30($v0) -/* BA72F0 80242B70 AFA20014 */ sw $v0, 0x14($sp) -/* BA72F4 80242B74 8E4200D0 */ lw $v0, 0xd0($s2) -/* BA72F8 80242B78 8C42001C */ lw $v0, 0x1c($v0) -/* BA72FC 80242B7C AFA20018 */ sw $v0, 0x18($sp) -/* BA7300 80242B80 8E4200D0 */ lw $v0, 0xd0($s2) -/* BA7304 80242B84 8C420024 */ lw $v0, 0x24($v0) -/* BA7308 80242B88 AFA2001C */ sw $v0, 0x1c($sp) -/* BA730C 80242B8C 8E4200D0 */ lw $v0, 0xd0($s2) -/* BA7310 80242B90 8C420028 */ lw $v0, 0x28($v0) -/* BA7314 80242B94 AFA20020 */ sw $v0, 0x20($sp) -/* BA7318 80242B98 8E4200D0 */ lw $v0, 0xd0($s2) -/* BA731C 80242B9C 3C0142C8 */ lui $at, 0x42c8 -/* BA7320 80242BA0 44810000 */ mtc1 $at, $f0 -/* BA7324 80242BA4 8C42002C */ lw $v0, 0x2c($v0) -/* BA7328 80242BA8 27B00010 */ addiu $s0, $sp, 0x10 -/* BA732C 80242BAC E7A00028 */ swc1 $f0, 0x28($sp) -/* BA7330 80242BB0 A7A0002C */ sh $zero, 0x2c($sp) -/* BA7334 80242BB4 12200019 */ beqz $s1, .L80242C1C -/* BA7338 80242BB8 AFA20024 */ sw $v0, 0x24($sp) -/* BA733C 80242BBC AE600070 */ sw $zero, 0x70($s3) -/* BA7340 80242BC0 A6A0008E */ sh $zero, 0x8e($s5) -/* BA7344 80242BC4 AE600074 */ sw $zero, 0x74($s3) -/* BA7348 80242BC8 8EA20000 */ lw $v0, ($s5) -/* BA734C 80242BCC 2403F7FF */ addiu $v1, $zero, -0x801 -/* BA7350 80242BD0 00431024 */ and $v0, $v0, $v1 -/* BA7354 80242BD4 2403FDFF */ addiu $v1, $zero, -0x201 -/* BA7358 80242BD8 00431024 */ and $v0, $v0, $v1 -/* BA735C 80242BDC 34420008 */ ori $v0, $v0, 8 -/* BA7360 80242BE0 AEA20000 */ sw $v0, ($s5) -/* BA7364 80242BE4 8E4200B0 */ lw $v0, 0xb0($s2) -/* BA7368 80242BE8 34420018 */ ori $v0, $v0, 0x18 -/* BA736C 80242BEC AE4200B0 */ sw $v0, 0xb0($s2) -/* BA7370 80242BF0 8E420000 */ lw $v0, ($s2) -/* BA7374 80242BF4 3C034000 */ lui $v1, 0x4000 -/* BA7378 80242BF8 00431024 */ and $v0, $v0, $v1 -/* BA737C 80242BFC 10400007 */ beqz $v0, .L80242C1C -/* BA7380 80242C00 3C03BFFF */ lui $v1, 0xbfff -/* BA7384 80242C04 2402000C */ addiu $v0, $zero, 0xc -/* BA7388 80242C08 AE620070 */ sw $v0, 0x70($s3) -/* BA738C 80242C0C 8E420000 */ lw $v0, ($s2) -/* BA7390 80242C10 3463FFFF */ ori $v1, $v1, 0xffff -/* BA7394 80242C14 00431024 */ and $v0, $v0, $v1 -/* BA7398 80242C18 AE420000 */ sw $v0, ($s2) -.L80242C1C: -/* BA739C 80242C1C 8E4300B0 */ lw $v1, 0xb0($s2) -/* BA73A0 80242C20 30620004 */ andi $v0, $v1, 4 -/* BA73A4 80242C24 10400007 */ beqz $v0, .L80242C44 -/* BA73A8 80242C28 00000000 */ nop -/* BA73AC 80242C2C 824200B4 */ lb $v0, 0xb4($s2) -/* BA73B0 80242C30 14400034 */ bnez $v0, .L80242D04 -/* BA73B4 80242C34 0000102D */ daddu $v0, $zero, $zero -/* BA73B8 80242C38 2402FFFB */ addiu $v0, $zero, -5 -/* BA73BC 80242C3C 00621024 */ and $v0, $v1, $v0 -/* BA73C0 80242C40 AE4200B0 */ sw $v0, 0xb0($s2) -.L80242C44: -/* BA73C4 80242C44 8E630070 */ lw $v1, 0x70($s3) -/* BA73C8 80242C48 2C62000F */ sltiu $v0, $v1, 0xf -/* BA73CC 80242C4C 1040002C */ beqz $v0, .L80242D00 -/* BA73D0 80242C50 00031080 */ sll $v0, $v1, 2 -/* BA73D4 80242C54 3C018024 */ lui $at, 0x8024 -/* BA73D8 80242C58 00220821 */ addu $at, $at, $v0 -/* BA73DC 80242C5C 8C225980 */ lw $v0, 0x5980($at) -/* BA73E0 80242C60 00400008 */ jr $v0 -/* BA73E4 80242C64 00000000 */ nop -/* BA73E8 80242C68 0260202D */ daddu $a0, $s3, $zero -/* BA73EC 80242C6C 0280282D */ daddu $a1, $s4, $zero -/* BA73F0 80242C70 0C0907C5 */ jal func_80241F14 -/* BA73F4 80242C74 0200302D */ daddu $a2, $s0, $zero -/* BA73F8 80242C78 0260202D */ daddu $a0, $s3, $zero -/* BA73FC 80242C7C 0280282D */ daddu $a1, $s4, $zero -/* BA7400 80242C80 0C090851 */ jal func_80242144 -/* BA7404 80242C84 0200302D */ daddu $a2, $s0, $zero -/* BA7408 80242C88 08090B41 */ j .L80242D04 -/* BA740C 80242C8C 0000102D */ daddu $v0, $zero, $zero -/* BA7410 80242C90 0260202D */ daddu $a0, $s3, $zero -/* BA7414 80242C94 0280282D */ daddu $a1, $s4, $zero -/* BA7418 80242C98 0C09091F */ jal func_8024247C -/* BA741C 80242C9C 0200302D */ daddu $a2, $s0, $zero -/* BA7420 80242CA0 8E630070 */ lw $v1, 0x70($s3) -/* BA7424 80242CA4 24020003 */ addiu $v0, $zero, 3 -/* BA7428 80242CA8 14620016 */ bne $v1, $v0, .L80242D04 -/* BA742C 80242CAC 0000102D */ daddu $v0, $zero, $zero -/* BA7430 80242CB0 0260202D */ daddu $a0, $s3, $zero -/* BA7434 80242CB4 0280282D */ daddu $a1, $s4, $zero -/* BA7438 80242CB8 0C09094F */ jal func_8024253C -/* BA743C 80242CBC 0200302D */ daddu $a2, $s0, $zero -/* BA7440 80242CC0 08090B41 */ j .L80242D04 -/* BA7444 80242CC4 0000102D */ daddu $v0, $zero, $zero -/* BA7448 80242CC8 0260202D */ daddu $a0, $s3, $zero -/* BA744C 80242CCC 0280282D */ daddu $a1, $s4, $zero -/* BA7450 80242CD0 0C0909B8 */ jal func_802426E0 -/* BA7454 80242CD4 0200302D */ daddu $a2, $s0, $zero -/* BA7458 80242CD8 0260202D */ daddu $a0, $s3, $zero -/* BA745C 80242CDC 0280282D */ daddu $a1, $s4, $zero -/* BA7460 80242CE0 0C0909F0 */ jal func_802427C0 -/* BA7464 80242CE4 0200302D */ daddu $a2, $s0, $zero -/* BA7468 80242CE8 08090B41 */ j .L80242D04 -/* BA746C 80242CEC 0000102D */ daddu $v0, $zero, $zero -/* BA7470 80242CF0 0260202D */ daddu $a0, $s3, $zero -/* BA7474 80242CF4 0280282D */ daddu $a1, $s4, $zero -/* BA7478 80242CF8 0C090AB0 */ jal func_80242AC0 -/* BA747C 80242CFC 0200302D */ daddu $a2, $s0, $zero -.L80242D00: -/* BA7480 80242D00 0000102D */ daddu $v0, $zero, $zero -.L80242D04: -/* BA7484 80242D04 8FBF0048 */ lw $ra, 0x48($sp) -/* BA7488 80242D08 8FB50044 */ lw $s5, 0x44($sp) -/* BA748C 80242D0C 8FB40040 */ lw $s4, 0x40($sp) -/* BA7490 80242D10 8FB3003C */ lw $s3, 0x3c($sp) -/* BA7494 80242D14 8FB20038 */ lw $s2, 0x38($sp) -/* BA7498 80242D18 8FB10034 */ lw $s1, 0x34($sp) -/* BA749C 80242D1C 8FB00030 */ lw $s0, 0x30($sp) -/* BA74A0 80242D20 03E00008 */ jr $ra -/* BA74A4 80242D24 27BD0050 */ addiu $sp, $sp, 0x50 -/* BA74A8 80242D28 00000000 */ nop -/* BA74AC 80242D2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_07/func_80240070_BAA140.s b/asm/nonmatchings/world/area_mim/mim_07/func_80240070_BAA140.s deleted file mode 100644 index f604274df0..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_07/func_80240070_BAA140.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_BAA1B0 -/* BAA1B0 80240070 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BAA1B4 80240074 AFBF0010 */ sw $ra, 0x10($sp) -/* BAA1B8 80240078 0C046ED4 */ jal enable_world_fog -/* BAA1BC 8024007C 00000000 */ nop -/* BAA1C0 80240080 240403DE */ addiu $a0, $zero, 0x3de -/* BAA1C4 80240084 0C046EDD */ jal set_world_fog_dist -/* BAA1C8 80240088 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BAA1CC 8024008C 0000202D */ daddu $a0, $zero, $zero -/* BAA1D0 80240090 0080282D */ daddu $a1, $a0, $zero -/* BAA1D4 80240094 0080302D */ daddu $a2, $a0, $zero -/* BAA1D8 80240098 0C046EE2 */ jal set_world_fog_color -/* BAA1DC 8024009C 240700FF */ addiu $a3, $zero, 0xff -/* BAA1E0 802400A0 0C048BFB */ jal enable_entity_fog -/* BAA1E4 802400A4 00000000 */ nop -/* BAA1E8 802400A8 240403DE */ addiu $a0, $zero, 0x3de -/* BAA1EC 802400AC 0C048C04 */ jal set_entity_fog_dist -/* BAA1F0 802400B0 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BAA1F4 802400B4 0000202D */ daddu $a0, $zero, $zero -/* BAA1F8 802400B8 0080282D */ daddu $a1, $a0, $zero -/* BAA1FC 802400BC 0080302D */ daddu $a2, $a0, $zero -/* BAA200 802400C0 0C048C0A */ jal set_entity_fog_color -/* BAA204 802400C4 240700FF */ addiu $a3, $zero, 0xff -/* BAA208 802400C8 8FBF0010 */ lw $ra, 0x10($sp) -/* BAA20C 802400CC 24020002 */ addiu $v0, $zero, 2 -/* BAA210 802400D0 03E00008 */ jr $ra -/* BAA214 802400D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_07/func_80240270_BAA140.s b/asm/nonmatchings/world/area_mim/mim_07/func_80240270_BAA140.s deleted file mode 100644 index 11969e2a5b..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_07/func_80240270_BAA140.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240270_BAA3B0 -/* BAA3B0 80240270 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* BAA3B4 80240274 AFB00030 */ sw $s0, 0x30($sp) -/* BAA3B8 80240278 0080802D */ daddu $s0, $a0, $zero -/* BAA3BC 8024027C AFBF0040 */ sw $ra, 0x40($sp) -/* BAA3C0 80240280 AFB3003C */ sw $s3, 0x3c($sp) -/* BAA3C4 80240284 AFB20038 */ sw $s2, 0x38($sp) -/* BAA3C8 80240288 AFB10034 */ sw $s1, 0x34($sp) -/* BAA3CC 8024028C F7B60050 */ sdc1 $f22, 0x50($sp) -/* BAA3D0 80240290 F7B40048 */ sdc1 $f20, 0x48($sp) -/* BAA3D4 80240294 8E130148 */ lw $s3, 0x148($s0) -/* BAA3D8 80240298 00A0882D */ daddu $s1, $a1, $zero -/* BAA3DC 8024029C 86640008 */ lh $a0, 8($s3) -/* BAA3E0 802402A0 0C00EABB */ jal get_npc_unsafe -/* BAA3E4 802402A4 00C0902D */ daddu $s2, $a2, $zero -/* BAA3E8 802402A8 0200202D */ daddu $a0, $s0, $zero -/* BAA3EC 802402AC 0220282D */ daddu $a1, $s1, $zero -/* BAA3F0 802402B0 0240302D */ daddu $a2, $s2, $zero -/* BAA3F4 802402B4 0C012568 */ jal func_800495A0 -/* BAA3F8 802402B8 0040802D */ daddu $s0, $v0, $zero -/* BAA3FC 802402BC 8E020000 */ lw $v0, ($s0) -/* BAA400 802402C0 2404002D */ addiu $a0, $zero, 0x2d -/* BAA404 802402C4 34420800 */ ori $v0, $v0, 0x800 -/* BAA408 802402C8 0C00A67F */ jal rand_int -/* BAA40C 802402CC AE020000 */ sw $v0, ($s0) -/* BAA410 802402D0 0200202D */ daddu $a0, $s0, $zero -/* BAA414 802402D4 3C05B000 */ lui $a1, 0xb000 -/* BAA418 802402D8 34A50017 */ ori $a1, $a1, 0x17 -/* BAA41C 802402DC 44820000 */ mtc1 $v0, $f0 -/* BAA420 802402E0 00000000 */ nop -/* BAA424 802402E4 46800021 */ cvt.d.w $f0, $f0 -/* BAA428 802402E8 3C014024 */ lui $at, 0x4024 -/* BAA42C 802402EC 44811800 */ mtc1 $at, $f3 -/* BAA430 802402F0 44801000 */ mtc1 $zero, $f2 -/* BAA434 802402F4 3C014020 */ lui $at, 0x4020 -/* BAA438 802402F8 44812800 */ mtc1 $at, $f5 -/* BAA43C 802402FC 44802000 */ mtc1 $zero, $f4 -/* BAA440 80240300 46220003 */ div.d $f0, $f0, $f2 -/* BAA444 80240304 46240000 */ add.d $f0, $f0, $f4 -/* BAA448 80240308 3C013FC0 */ lui $at, 0x3fc0 -/* BAA44C 8024030C 44811000 */ mtc1 $at, $f2 -/* BAA450 80240310 0000302D */ daddu $a2, $zero, $zero -/* BAA454 80240314 E6020014 */ swc1 $f2, 0x14($s0) -/* BAA458 80240318 46200020 */ cvt.s.d $f0, $f0 -/* BAA45C 8024031C 0C012530 */ jal func_800494C0 -/* BAA460 80240320 E600001C */ swc1 $f0, 0x1c($s0) -/* BAA464 80240324 8E6300D0 */ lw $v1, 0xd0($s3) -/* BAA468 80240328 C6000040 */ lwc1 $f0, 0x40($s0) -/* BAA46C 8024032C C4620000 */ lwc1 $f2, ($v1) -/* BAA470 80240330 468010A0 */ cvt.s.w $f2, $f2 -/* BAA474 80240334 C4640008 */ lwc1 $f4, 8($v1) -/* BAA478 80240338 46802120 */ cvt.s.w $f4, $f4 -/* BAA47C 8024033C E7A00010 */ swc1 $f0, 0x10($sp) -/* BAA480 80240340 8E6200D0 */ lw $v0, 0xd0($s3) -/* BAA484 80240344 44051000 */ mfc1 $a1, $f2 -/* BAA488 80240348 C440000C */ lwc1 $f0, 0xc($v0) -/* BAA48C 8024034C 46800020 */ cvt.s.w $f0, $f0 -/* BAA490 80240350 E7A00014 */ swc1 $f0, 0x14($sp) -/* BAA494 80240354 8E6200D0 */ lw $v0, 0xd0($s3) -/* BAA498 80240358 44062000 */ mfc1 $a2, $f4 -/* BAA49C 8024035C C4400010 */ lwc1 $f0, 0x10($v0) -/* BAA4A0 80240360 46800020 */ cvt.s.w $f0, $f0 -/* BAA4A4 80240364 E7A00018 */ swc1 $f0, 0x18($sp) -/* BAA4A8 80240368 8C640018 */ lw $a0, 0x18($v1) -/* BAA4AC 8024036C 0C0123F5 */ jal is_point_within_region -/* BAA4B0 80240370 8E070038 */ lw $a3, 0x38($s0) -/* BAA4B4 80240374 10400035 */ beqz $v0, .L8024044C -/* BAA4B8 80240378 00000000 */ nop -/* BAA4BC 8024037C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BAA4C0 80240380 3C0141C8 */ lui $at, 0x41c8 -/* BAA4C4 80240384 4481B000 */ mtc1 $at, $f22 -/* BAA4C8 80240388 8E6200D0 */ lw $v0, 0xd0($s3) -/* BAA4CC 8024038C C60E0040 */ lwc1 $f14, 0x40($s0) -/* BAA4D0 80240390 C4480000 */ lwc1 $f8, ($v0) -/* BAA4D4 80240394 46804220 */ cvt.s.w $f8, $f8 -/* BAA4D8 80240398 44064000 */ mfc1 $a2, $f8 -/* BAA4DC 8024039C C4480008 */ lwc1 $f8, 8($v0) -/* BAA4E0 802403A0 46804220 */ cvt.s.w $f8, $f8 -/* BAA4E4 802403A4 44074000 */ mfc1 $a3, $f8 -/* BAA4E8 802403A8 3C01403E */ lui $at, 0x403e -/* BAA4EC 802403AC 4481A800 */ mtc1 $at, $f21 -/* BAA4F0 802403B0 4480A000 */ mtc1 $zero, $f20 -/* BAA4F4 802403B4 0C00A720 */ jal atan2 -/* BAA4F8 802403B8 0000882D */ daddu $s1, $zero, $zero -/* BAA4FC 802403BC C6020038 */ lwc1 $f2, 0x38($s0) -/* BAA500 802403C0 C604003C */ lwc1 $f4, 0x3c($s0) -/* BAA504 802403C4 C6060040 */ lwc1 $f6, 0x40($s0) -/* BAA508 802403C8 E600000C */ swc1 $f0, 0xc($s0) -/* BAA50C 802403CC E7A20020 */ swc1 $f2, 0x20($sp) -/* BAA510 802403D0 E7A40024 */ swc1 $f4, 0x24($sp) -/* BAA514 802403D4 E7A60028 */ swc1 $f6, 0x28($sp) -.L802403D8: -/* BAA518 802403D8 E7B60010 */ swc1 $f22, 0x10($sp) -/* BAA51C 802403DC C600000C */ lwc1 $f0, 0xc($s0) -/* BAA520 802403E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* BAA524 802403E4 860200A8 */ lh $v0, 0xa8($s0) -/* BAA528 802403E8 27A50020 */ addiu $a1, $sp, 0x20 -/* BAA52C 802403EC 44820000 */ mtc1 $v0, $f0 -/* BAA530 802403F0 00000000 */ nop -/* BAA534 802403F4 46800020 */ cvt.s.w $f0, $f0 -/* BAA538 802403F8 E7A00018 */ swc1 $f0, 0x18($sp) -/* BAA53C 802403FC 860200A6 */ lh $v0, 0xa6($s0) -/* BAA540 80240400 27A60024 */ addiu $a2, $sp, 0x24 -/* BAA544 80240404 44820000 */ mtc1 $v0, $f0 -/* BAA548 80240408 00000000 */ nop -/* BAA54C 8024040C 46800020 */ cvt.s.w $f0, $f0 -/* BAA550 80240410 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BAA554 80240414 8E040080 */ lw $a0, 0x80($s0) -/* BAA558 80240418 0C037711 */ jal func_800DDC44 -/* BAA55C 8024041C 27A70028 */ addiu $a3, $sp, 0x28 -/* BAA560 80240420 10400016 */ beqz $v0, .L8024047C -/* BAA564 80240424 26310001 */ addiu $s1, $s1, 1 -/* BAA568 80240428 C600000C */ lwc1 $f0, 0xc($s0) -/* BAA56C 8024042C 46000021 */ cvt.d.s $f0, $f0 -/* BAA570 80240430 46340000 */ add.d $f0, $f0, $f20 -/* BAA574 80240434 2A220006 */ slti $v0, $s1, 6 -/* BAA578 80240438 46200020 */ cvt.s.d $f0, $f0 -/* BAA57C 8024043C 1440FFE6 */ bnez $v0, .L802403D8 -/* BAA580 80240440 E600000C */ swc1 $f0, 0xc($s0) -/* BAA584 80240444 0809011F */ j .L8024047C -/* BAA588 80240448 00000000 */ nop -.L8024044C: -/* BAA58C 8024044C 0C00A67F */ jal rand_int -/* BAA590 80240450 2404003C */ addiu $a0, $zero, 0x3c -/* BAA594 80240454 C60C000C */ lwc1 $f12, 0xc($s0) -/* BAA598 80240458 44820000 */ mtc1 $v0, $f0 -/* BAA59C 8024045C 00000000 */ nop -/* BAA5A0 80240460 46800020 */ cvt.s.w $f0, $f0 -/* BAA5A4 80240464 46006300 */ add.s $f12, $f12, $f0 -/* BAA5A8 80240468 3C0141F0 */ lui $at, 0x41f0 -/* BAA5AC 8024046C 44810000 */ mtc1 $at, $f0 -/* BAA5B0 80240470 0C00A6C9 */ jal clamp_angle -/* BAA5B4 80240474 46006301 */ sub.s $f12, $f12, $f0 -/* BAA5B8 80240478 E600000C */ swc1 $f0, 0xc($s0) -.L8024047C: -/* BAA5BC 8024047C 8FBF0040 */ lw $ra, 0x40($sp) -/* BAA5C0 80240480 8FB3003C */ lw $s3, 0x3c($sp) -/* BAA5C4 80240484 8FB20038 */ lw $s2, 0x38($sp) -/* BAA5C8 80240488 8FB10034 */ lw $s1, 0x34($sp) -/* BAA5CC 8024048C 8FB00030 */ lw $s0, 0x30($sp) -/* BAA5D0 80240490 D7B60050 */ ldc1 $f22, 0x50($sp) -/* BAA5D4 80240494 D7B40048 */ ldc1 $f20, 0x48($sp) -/* BAA5D8 80240498 03E00008 */ jr $ra -/* BAA5DC 8024049C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_mim/mim_07/func_802404A0_BAA140.s b/asm/nonmatchings/world/area_mim/mim_07/func_802404A0_BAA140.s deleted file mode 100644 index 03d8e9f933..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_07/func_802404A0_BAA140.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404A0_BAA5E0 -/* BAA5E0 802404A0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* BAA5E4 802404A4 AFB3004C */ sw $s3, 0x4c($sp) -/* BAA5E8 802404A8 0080982D */ daddu $s3, $a0, $zero -/* BAA5EC 802404AC AFBF0054 */ sw $ra, 0x54($sp) -/* BAA5F0 802404B0 AFB40050 */ sw $s4, 0x50($sp) -/* BAA5F4 802404B4 AFB20048 */ sw $s2, 0x48($sp) -/* BAA5F8 802404B8 AFB10044 */ sw $s1, 0x44($sp) -/* BAA5FC 802404BC AFB00040 */ sw $s0, 0x40($sp) -/* BAA600 802404C0 F7B40058 */ sdc1 $f20, 0x58($sp) -/* BAA604 802404C4 8E710148 */ lw $s1, 0x148($s3) -/* BAA608 802404C8 00A0A02D */ daddu $s4, $a1, $zero -/* BAA60C 802404CC 86240008 */ lh $a0, 8($s1) -/* BAA610 802404D0 0C00EABB */ jal get_npc_unsafe -/* BAA614 802404D4 00C0902D */ daddu $s2, $a2, $zero -/* BAA618 802404D8 8E830014 */ lw $v1, 0x14($s4) -/* BAA61C 802404DC 04600034 */ bltz $v1, .L802405B0 -/* BAA620 802404E0 0040802D */ daddu $s0, $v0, $zero -/* BAA624 802404E4 8E620074 */ lw $v0, 0x74($s3) -/* BAA628 802404E8 1C400030 */ bgtz $v0, .L802405AC -/* BAA62C 802404EC 2442FFFF */ addiu $v0, $v0, -1 -/* BAA630 802404F0 0240202D */ daddu $a0, $s2, $zero -/* BAA634 802404F4 AE630074 */ sw $v1, 0x74($s3) -/* BAA638 802404F8 AFA00010 */ sw $zero, 0x10($sp) -/* BAA63C 802404FC 8E86000C */ lw $a2, 0xc($s4) -/* BAA640 80240500 8E870010 */ lw $a3, 0x10($s4) -/* BAA644 80240504 0C01242D */ jal func_800490B4 -/* BAA648 80240508 0220282D */ daddu $a1, $s1, $zero -/* BAA64C 8024050C 10400025 */ beqz $v0, .L802405A4 -/* BAA650 80240510 0000202D */ daddu $a0, $zero, $zero -/* BAA654 80240514 0200282D */ daddu $a1, $s0, $zero -/* BAA658 80240518 0000302D */ daddu $a2, $zero, $zero -/* BAA65C 8024051C 860300A8 */ lh $v1, 0xa8($s0) -/* BAA660 80240520 3C013F80 */ lui $at, 0x3f80 -/* BAA664 80240524 44810000 */ mtc1 $at, $f0 -/* BAA668 80240528 3C014000 */ lui $at, 0x4000 -/* BAA66C 8024052C 44811000 */ mtc1 $at, $f2 -/* BAA670 80240530 3C01C1A0 */ lui $at, 0xc1a0 -/* BAA674 80240534 44812000 */ mtc1 $at, $f4 -/* BAA678 80240538 2402000F */ addiu $v0, $zero, 0xf -/* BAA67C 8024053C AFA2001C */ sw $v0, 0x1c($sp) -/* BAA680 80240540 44835000 */ mtc1 $v1, $f10 -/* BAA684 80240544 00000000 */ nop -/* BAA688 80240548 468052A0 */ cvt.s.w $f10, $f10 -/* BAA68C 8024054C 44075000 */ mfc1 $a3, $f10 -/* BAA690 80240550 27A20028 */ addiu $v0, $sp, 0x28 -/* BAA694 80240554 AFA20020 */ sw $v0, 0x20($sp) -/* BAA698 80240558 E7A00010 */ swc1 $f0, 0x10($sp) -/* BAA69C 8024055C E7A20014 */ swc1 $f2, 0x14($sp) -/* BAA6A0 80240560 0C01BFA4 */ jal fx_emote -/* BAA6A4 80240564 E7A40018 */ swc1 $f4, 0x18($sp) -/* BAA6A8 80240568 0200202D */ daddu $a0, $s0, $zero -/* BAA6AC 8024056C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BAA6B0 80240570 0C012530 */ jal func_800494C0 -/* BAA6B4 80240574 3C060020 */ lui $a2, 0x20 -/* BAA6B8 80240578 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BAA6BC 8024057C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BAA6C0 80240580 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BAA6C4 80240584 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BAA6C8 80240588 8C460028 */ lw $a2, 0x28($v0) -/* BAA6CC 8024058C 0C00A720 */ jal atan2 -/* BAA6D0 80240590 8C470030 */ lw $a3, 0x30($v0) -/* BAA6D4 80240594 2402000C */ addiu $v0, $zero, 0xc -/* BAA6D8 80240598 E600000C */ swc1 $f0, 0xc($s0) -/* BAA6DC 8024059C 080901ED */ j .L802407B4 -/* BAA6E0 802405A0 AE620070 */ sw $v0, 0x70($s3) -.L802405A4: -/* BAA6E4 802405A4 8E620074 */ lw $v0, 0x74($s3) -/* BAA6E8 802405A8 2442FFFF */ addiu $v0, $v0, -1 -.L802405AC: -/* BAA6EC 802405AC AE620074 */ sw $v0, 0x74($s3) -.L802405B0: -/* BAA6F0 802405B0 C6000018 */ lwc1 $f0, 0x18($s0) -/* BAA6F4 802405B4 44801000 */ mtc1 $zero, $f2 -/* BAA6F8 802405B8 44801800 */ mtc1 $zero, $f3 -/* BAA6FC 802405BC 46000021 */ cvt.d.s $f0, $f0 -/* BAA700 802405C0 4620103C */ c.lt.d $f2, $f0 -/* BAA704 802405C4 00000000 */ nop -/* BAA708 802405C8 45000025 */ bc1f .L80240660 -/* BAA70C 802405CC 27A5002C */ addiu $a1, $sp, 0x2c -/* BAA710 802405D0 C6000038 */ lwc1 $f0, 0x38($s0) -/* BAA714 802405D4 860200A6 */ lh $v0, 0xa6($s0) -/* BAA718 802405D8 3C018024 */ lui $at, 0x8024 -/* BAA71C 802405DC D42237B0 */ ldc1 $f2, 0x37b0($at) -/* BAA720 802405E0 27A60030 */ addiu $a2, $sp, 0x30 -/* BAA724 802405E4 E7A0002C */ swc1 $f0, 0x2c($sp) -/* BAA728 802405E8 44820000 */ mtc1 $v0, $f0 -/* BAA72C 802405EC 00000000 */ nop -/* BAA730 802405F0 46800020 */ cvt.s.w $f0, $f0 -/* BAA734 802405F4 46000021 */ cvt.d.s $f0, $f0 -/* BAA738 802405F8 C604003C */ lwc1 $f4, 0x3c($s0) -/* BAA73C 802405FC C6060040 */ lwc1 $f6, 0x40($s0) -/* BAA740 80240600 C6080018 */ lwc1 $f8, 0x18($s0) -/* BAA744 80240604 860200A8 */ lh $v0, 0xa8($s0) -/* BAA748 80240608 46220002 */ mul.d $f0, $f0, $f2 -/* BAA74C 8024060C 00000000 */ nop -/* BAA750 80240610 E7A40030 */ swc1 $f4, 0x30($sp) -/* BAA754 80240614 E7A60034 */ swc1 $f6, 0x34($sp) -/* BAA758 80240618 E7A80010 */ swc1 $f8, 0x10($sp) -/* BAA75C 8024061C C604000C */ lwc1 $f4, 0xc($s0) -/* BAA760 80240620 44821000 */ mtc1 $v0, $f2 -/* BAA764 80240624 00000000 */ nop -/* BAA768 80240628 468010A0 */ cvt.s.w $f2, $f2 -/* BAA76C 8024062C E7A20018 */ swc1 $f2, 0x18($sp) -/* BAA770 80240630 E7A40014 */ swc1 $f4, 0x14($sp) -/* BAA774 80240634 46200020 */ cvt.s.d $f0, $f0 -/* BAA778 80240638 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BAA77C 8024063C 8E040080 */ lw $a0, 0x80($s0) -/* BAA780 80240640 0C037711 */ jal func_800DDC44 -/* BAA784 80240644 27A70034 */ addiu $a3, $sp, 0x34 -/* BAA788 80240648 54400005 */ bnel $v0, $zero, .L80240660 -/* BAA78C 8024064C AE000018 */ sw $zero, 0x18($s0) -/* BAA790 80240650 8E050018 */ lw $a1, 0x18($s0) -/* BAA794 80240654 8E06000C */ lw $a2, 0xc($s0) -/* BAA798 80240658 0C00EA95 */ jal npc_move_heading -/* BAA79C 8024065C 0200202D */ daddu $a0, $s0, $zero -.L80240660: -/* BAA7A0 80240660 C600001C */ lwc1 $f0, 0x1c($s0) -/* BAA7A4 80240664 44801000 */ mtc1 $zero, $f2 -/* BAA7A8 80240668 44801800 */ mtc1 $zero, $f3 -/* BAA7AC 8024066C 46000021 */ cvt.d.s $f0, $f0 -/* BAA7B0 80240670 4622003C */ c.lt.d $f0, $f2 -/* BAA7B4 80240674 00000000 */ nop -/* BAA7B8 80240678 45000047 */ bc1f .L80240798 -/* BAA7BC 8024067C 27A5002C */ addiu $a1, $sp, 0x2c -/* BAA7C0 80240680 27A60030 */ addiu $a2, $sp, 0x30 -/* BAA7C4 80240684 27A20038 */ addiu $v0, $sp, 0x38 -/* BAA7C8 80240688 C602003C */ lwc1 $f2, 0x3c($s0) -/* BAA7CC 8024068C C6060038 */ lwc1 $f6, 0x38($s0) -/* BAA7D0 80240690 3C01402A */ lui $at, 0x402a -/* BAA7D4 80240694 4481A800 */ mtc1 $at, $f21 -/* BAA7D8 80240698 4480A000 */ mtc1 $zero, $f20 -/* BAA7DC 8024069C 460010A1 */ cvt.d.s $f2, $f2 -/* BAA7E0 802406A0 46341080 */ add.d $f2, $f2, $f20 -/* BAA7E4 802406A4 C600001C */ lwc1 $f0, 0x1c($s0) -/* BAA7E8 802406A8 C6040040 */ lwc1 $f4, 0x40($s0) -/* BAA7EC 802406AC 46000005 */ abs.s $f0, $f0 -/* BAA7F0 802406B0 E7A40034 */ swc1 $f4, 0x34($sp) -/* BAA7F4 802406B4 3C014030 */ lui $at, 0x4030 -/* BAA7F8 802406B8 44812800 */ mtc1 $at, $f5 -/* BAA7FC 802406BC 44802000 */ mtc1 $zero, $f4 -/* BAA800 802406C0 46000021 */ cvt.d.s $f0, $f0 -/* BAA804 802406C4 E7A6002C */ swc1 $f6, 0x2c($sp) -/* BAA808 802406C8 46240000 */ add.d $f0, $f0, $f4 -/* BAA80C 802406CC 462010A0 */ cvt.s.d $f2, $f2 -/* BAA810 802406D0 E7A20030 */ swc1 $f2, 0x30($sp) -/* BAA814 802406D4 46200020 */ cvt.s.d $f0, $f0 -/* BAA818 802406D8 E7A00038 */ swc1 $f0, 0x38($sp) -/* BAA81C 802406DC AFA20010 */ sw $v0, 0x10($sp) -/* BAA820 802406E0 8E040080 */ lw $a0, 0x80($s0) -/* BAA824 802406E4 0C0372DF */ jal func_800DCB7C -/* BAA828 802406E8 27A70034 */ addiu $a3, $sp, 0x34 -/* BAA82C 802406EC 1040002A */ beqz $v0, .L80240798 -/* BAA830 802406F0 00000000 */ nop -/* BAA834 802406F4 C600001C */ lwc1 $f0, 0x1c($s0) -/* BAA838 802406F8 C7A20038 */ lwc1 $f2, 0x38($sp) -/* BAA83C 802406FC 46000005 */ abs.s $f0, $f0 -/* BAA840 80240700 46000021 */ cvt.d.s $f0, $f0 -/* BAA844 80240704 46340000 */ add.d $f0, $f0, $f20 -/* BAA848 80240708 460010A1 */ cvt.d.s $f2, $f2 -/* BAA84C 8024070C 4620103E */ c.le.d $f2, $f0 -/* BAA850 80240710 00000000 */ nop -/* BAA854 80240714 45000020 */ bc1f .L80240798 -/* BAA858 80240718 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BAA85C 8024071C C7A00030 */ lwc1 $f0, 0x30($sp) -/* BAA860 80240720 8E020000 */ lw $v0, ($s0) -/* BAA864 80240724 2403F7FF */ addiu $v1, $zero, -0x801 -/* BAA868 80240728 AE00001C */ sw $zero, 0x1c($s0) -/* BAA86C 8024072C 00431024 */ and $v0, $v0, $v1 -/* BAA870 80240730 AE020000 */ sw $v0, ($s0) -/* BAA874 80240734 24020002 */ addiu $v0, $zero, 2 -/* BAA878 80240738 E600003C */ swc1 $f0, 0x3c($s0) -/* BAA87C 8024073C 0C00A67F */ jal rand_int -/* BAA880 80240740 AE620070 */ sw $v0, 0x70($s3) -/* BAA884 80240744 3C035555 */ lui $v1, 0x5555 -/* BAA888 80240748 34635556 */ ori $v1, $v1, 0x5556 -/* BAA88C 8024074C 00430018 */ mult $v0, $v1 -/* BAA890 80240750 000227C3 */ sra $a0, $v0, 0x1f -/* BAA894 80240754 00004010 */ mfhi $t0 -/* BAA898 80240758 01042023 */ subu $a0, $t0, $a0 -/* BAA89C 8024075C 00041840 */ sll $v1, $a0, 1 -/* BAA8A0 80240760 00641821 */ addu $v1, $v1, $a0 -/* BAA8A4 80240764 00431023 */ subu $v0, $v0, $v1 -/* BAA8A8 80240768 24430002 */ addiu $v1, $v0, 2 -/* BAA8AC 8024076C AE630074 */ sw $v1, 0x74($s3) -/* BAA8B0 80240770 8E82002C */ lw $v0, 0x2c($s4) -/* BAA8B4 80240774 5840000F */ blezl $v0, .L802407B4 -/* BAA8B8 80240778 AE600070 */ sw $zero, 0x70($s3) -/* BAA8BC 8024077C 8E820004 */ lw $v0, 4($s4) -/* BAA8C0 80240780 5840000C */ blezl $v0, .L802407B4 -/* BAA8C4 80240784 AE600070 */ sw $zero, 0x70($s3) -/* BAA8C8 80240788 1460000A */ bnez $v1, .L802407B4 -/* BAA8CC 8024078C 00000000 */ nop -/* BAA8D0 80240790 080901ED */ j .L802407B4 -/* BAA8D4 80240794 AE600070 */ sw $zero, 0x70($s3) -.L80240798: -/* BAA8D8 80240798 C604003C */ lwc1 $f4, 0x3c($s0) -/* BAA8DC 8024079C C600001C */ lwc1 $f0, 0x1c($s0) -/* BAA8E0 802407A0 46002100 */ add.s $f4, $f4, $f0 -/* BAA8E4 802407A4 C6020014 */ lwc1 $f2, 0x14($s0) -/* BAA8E8 802407A8 46020001 */ sub.s $f0, $f0, $f2 -/* BAA8EC 802407AC E604003C */ swc1 $f4, 0x3c($s0) -/* BAA8F0 802407B0 E600001C */ swc1 $f0, 0x1c($s0) -.L802407B4: -/* BAA8F4 802407B4 8FBF0054 */ lw $ra, 0x54($sp) -/* BAA8F8 802407B8 8FB40050 */ lw $s4, 0x50($sp) -/* BAA8FC 802407BC 8FB3004C */ lw $s3, 0x4c($sp) -/* BAA900 802407C0 8FB20048 */ lw $s2, 0x48($sp) -/* BAA904 802407C4 8FB10044 */ lw $s1, 0x44($sp) -/* BAA908 802407C8 8FB00040 */ lw $s0, 0x40($sp) -/* BAA90C 802407CC D7B40058 */ ldc1 $f20, 0x58($sp) -/* BAA910 802407D0 03E00008 */ jr $ra -/* BAA914 802407D4 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_mim/mim_07/func_802407D8_BAA140.s b/asm/nonmatchings/world/area_mim/mim_07/func_802407D8_BAA140.s deleted file mode 100644 index 56efa15a05..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_07/func_802407D8_BAA140.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D8_BAA918 -/* BAA918 802407D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BAA91C 802407DC AFB3001C */ sw $s3, 0x1c($sp) -/* BAA920 802407E0 0080982D */ daddu $s3, $a0, $zero -/* BAA924 802407E4 AFBF0020 */ sw $ra, 0x20($sp) -/* BAA928 802407E8 AFB20018 */ sw $s2, 0x18($sp) -/* BAA92C 802407EC AFB10014 */ sw $s1, 0x14($sp) -/* BAA930 802407F0 AFB00010 */ sw $s0, 0x10($sp) -/* BAA934 802407F4 8E720148 */ lw $s2, 0x148($s3) -/* BAA938 802407F8 86440008 */ lh $a0, 8($s2) -/* BAA93C 802407FC 0C00EABB */ jal get_npc_unsafe -/* BAA940 80240800 00A0882D */ daddu $s1, $a1, $zero -/* BAA944 80240804 8E240008 */ lw $a0, 8($s1) -/* BAA948 80240808 0040802D */ daddu $s0, $v0, $zero -/* BAA94C 8024080C 00041FC2 */ srl $v1, $a0, 0x1f -/* BAA950 80240810 00832021 */ addu $a0, $a0, $v1 -/* BAA954 80240814 00042043 */ sra $a0, $a0, 1 -/* BAA958 80240818 0C00A67F */ jal rand_int -/* BAA95C 8024081C 24840001 */ addiu $a0, $a0, 1 -/* BAA960 80240820 8E230008 */ lw $v1, 8($s1) -/* BAA964 80240824 240400B4 */ addiu $a0, $zero, 0xb4 -/* BAA968 80240828 00032FC2 */ srl $a1, $v1, 0x1f -/* BAA96C 8024082C 00651821 */ addu $v1, $v1, $a1 -/* BAA970 80240830 00031843 */ sra $v1, $v1, 1 -/* BAA974 80240834 00621821 */ addu $v1, $v1, $v0 -/* BAA978 80240838 0C00A67F */ jal rand_int -/* BAA97C 8024083C A603008E */ sh $v1, 0x8e($s0) -/* BAA980 80240840 C60C000C */ lwc1 $f12, 0xc($s0) -/* BAA984 80240844 44820000 */ mtc1 $v0, $f0 -/* BAA988 80240848 00000000 */ nop -/* BAA98C 8024084C 46800020 */ cvt.s.w $f0, $f0 -/* BAA990 80240850 46006300 */ add.s $f12, $f12, $f0 -/* BAA994 80240854 3C0142B4 */ lui $at, 0x42b4 -/* BAA998 80240858 44810000 */ mtc1 $at, $f0 -/* BAA99C 8024085C 0C00A6C9 */ jal clamp_angle -/* BAA9A0 80240860 46006301 */ sub.s $f12, $f12, $f0 -/* BAA9A4 80240864 E600000C */ swc1 $f0, 0xc($s0) -/* BAA9A8 80240868 8E4200CC */ lw $v0, 0xcc($s2) -/* BAA9AC 8024086C 8C420000 */ lw $v0, ($v0) -/* BAA9B0 80240870 AE020028 */ sw $v0, 0x28($s0) -/* BAA9B4 80240874 24020003 */ addiu $v0, $zero, 3 -/* BAA9B8 80240878 AE620070 */ sw $v0, 0x70($s3) -/* BAA9BC 8024087C 8FBF0020 */ lw $ra, 0x20($sp) -/* BAA9C0 80240880 8FB3001C */ lw $s3, 0x1c($sp) -/* BAA9C4 80240884 8FB20018 */ lw $s2, 0x18($sp) -/* BAA9C8 80240888 8FB10014 */ lw $s1, 0x14($sp) -/* BAA9CC 8024088C 8FB00010 */ lw $s0, 0x10($sp) -/* BAA9D0 80240890 03E00008 */ jr $ra -/* BAA9D4 80240894 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_07/func_80240898_BAA140.s b/asm/nonmatchings/world/area_mim/mim_07/func_80240898_BAA140.s deleted file mode 100644 index 27db327493..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_07/func_80240898_BAA140.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240898_BAA9D8 -/* BAA9D8 80240898 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BAA9DC 8024089C AFB40040 */ sw $s4, 0x40($sp) -/* BAA9E0 802408A0 0080A02D */ daddu $s4, $a0, $zero -/* BAA9E4 802408A4 AFBF0044 */ sw $ra, 0x44($sp) -/* BAA9E8 802408A8 AFB3003C */ sw $s3, 0x3c($sp) -/* BAA9EC 802408AC AFB20038 */ sw $s2, 0x38($sp) -/* BAA9F0 802408B0 AFB10034 */ sw $s1, 0x34($sp) -/* BAA9F4 802408B4 AFB00030 */ sw $s0, 0x30($sp) -/* BAA9F8 802408B8 8E920148 */ lw $s2, 0x148($s4) -/* BAA9FC 802408BC 00A0882D */ daddu $s1, $a1, $zero -/* BAAA00 802408C0 86440008 */ lh $a0, 8($s2) -/* BAAA04 802408C4 0C00EABB */ jal get_npc_unsafe -/* BAAA08 802408C8 00C0982D */ daddu $s3, $a2, $zero -/* BAAA0C 802408CC 8E230014 */ lw $v1, 0x14($s1) -/* BAAA10 802408D0 0460002D */ bltz $v1, .L80240988 -/* BAAA14 802408D4 0040802D */ daddu $s0, $v0, $zero -/* BAAA18 802408D8 0260202D */ daddu $a0, $s3, $zero -/* BAAA1C 802408DC AFA00010 */ sw $zero, 0x10($sp) -/* BAAA20 802408E0 8E260024 */ lw $a2, 0x24($s1) -/* BAAA24 802408E4 8E270028 */ lw $a3, 0x28($s1) -/* BAAA28 802408E8 0C01242D */ jal func_800490B4 -/* BAAA2C 802408EC 0240282D */ daddu $a1, $s2, $zero -/* BAAA30 802408F0 10400025 */ beqz $v0, .L80240988 -/* BAAA34 802408F4 0000202D */ daddu $a0, $zero, $zero -/* BAAA38 802408F8 0200282D */ daddu $a1, $s0, $zero -/* BAAA3C 802408FC 0000302D */ daddu $a2, $zero, $zero -/* BAAA40 80240900 860300A8 */ lh $v1, 0xa8($s0) -/* BAAA44 80240904 3C013F80 */ lui $at, 0x3f80 -/* BAAA48 80240908 44810000 */ mtc1 $at, $f0 -/* BAAA4C 8024090C 3C014000 */ lui $at, 0x4000 -/* BAAA50 80240910 44811000 */ mtc1 $at, $f2 -/* BAAA54 80240914 3C01C1A0 */ lui $at, 0xc1a0 -/* BAAA58 80240918 44812000 */ mtc1 $at, $f4 -/* BAAA5C 8024091C 2402000F */ addiu $v0, $zero, 0xf -/* BAAA60 80240920 AFA2001C */ sw $v0, 0x1c($sp) -/* BAAA64 80240924 44833000 */ mtc1 $v1, $f6 -/* BAAA68 80240928 00000000 */ nop -/* BAAA6C 8024092C 468031A0 */ cvt.s.w $f6, $f6 -/* BAAA70 80240930 44073000 */ mfc1 $a3, $f6 -/* BAAA74 80240934 27A20028 */ addiu $v0, $sp, 0x28 -/* BAAA78 80240938 AFA20020 */ sw $v0, 0x20($sp) -/* BAAA7C 8024093C E7A00010 */ swc1 $f0, 0x10($sp) -/* BAAA80 80240940 E7A20014 */ swc1 $f2, 0x14($sp) -/* BAAA84 80240944 0C01BFA4 */ jal fx_emote -/* BAAA88 80240948 E7A40018 */ swc1 $f4, 0x18($sp) -/* BAAA8C 8024094C 0200202D */ daddu $a0, $s0, $zero -/* BAAA90 80240950 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BAAA94 80240954 0C012530 */ jal func_800494C0 -/* BAAA98 80240958 3C060020 */ lui $a2, 0x20 -/* BAAA9C 8024095C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BAAAA0 80240960 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BAAAA4 80240964 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BAAAA8 80240968 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BAAAAC 8024096C 8C460028 */ lw $a2, 0x28($v0) -/* BAAAB0 80240970 0C00A720 */ jal atan2 -/* BAAAB4 80240974 8C470030 */ lw $a3, 0x30($v0) -/* BAAAB8 80240978 2402000C */ addiu $v0, $zero, 0xc -/* BAAABC 8024097C E600000C */ swc1 $f0, 0xc($s0) -/* BAAAC0 80240980 08090287 */ j .L80240A1C -/* BAAAC4 80240984 AE820070 */ sw $v0, 0x70($s4) -.L80240988: -/* BAAAC8 80240988 8602008C */ lh $v0, 0x8c($s0) -/* BAAACC 8024098C 14400023 */ bnez $v0, .L80240A1C -/* BAAAD0 80240990 00000000 */ nop -/* BAAAD4 80240994 9602008E */ lhu $v0, 0x8e($s0) -/* BAAAD8 80240998 2442FFFF */ addiu $v0, $v0, -1 -/* BAAADC 8024099C A602008E */ sh $v0, 0x8e($s0) -/* BAAAE0 802409A0 00021400 */ sll $v0, $v0, 0x10 -/* BAAAE4 802409A4 1C40001D */ bgtz $v0, .L80240A1C -/* BAAAE8 802409A8 00000000 */ nop -/* BAAAEC 802409AC 8E820074 */ lw $v0, 0x74($s4) -/* BAAAF0 802409B0 2442FFFF */ addiu $v0, $v0, -1 -/* BAAAF4 802409B4 18400018 */ blez $v0, .L80240A18 -/* BAAAF8 802409B8 AE820074 */ sw $v0, 0x74($s4) -/* BAAAFC 802409BC C600000C */ lwc1 $f0, 0xc($s0) -/* BAAB00 802409C0 3C014334 */ lui $at, 0x4334 -/* BAAB04 802409C4 44816000 */ mtc1 $at, $f12 -/* BAAB08 802409C8 0C00A6C9 */ jal clamp_angle -/* BAAB0C 802409CC 460C0300 */ add.s $f12, $f0, $f12 -/* BAAB10 802409D0 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BAAB14 802409D4 0C00A67F */ jal rand_int -/* BAAB18 802409D8 E600000C */ swc1 $f0, 0xc($s0) -/* BAAB1C 802409DC 3C032E8B */ lui $v1, 0x2e8b -/* BAAB20 802409E0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* BAAB24 802409E4 00430018 */ mult $v0, $v1 -/* BAAB28 802409E8 00021FC3 */ sra $v1, $v0, 0x1f -/* BAAB2C 802409EC 00004010 */ mfhi $t0 -/* BAAB30 802409F0 00082043 */ sra $a0, $t0, 1 -/* BAAB34 802409F4 00832023 */ subu $a0, $a0, $v1 -/* BAAB38 802409F8 00041840 */ sll $v1, $a0, 1 -/* BAAB3C 802409FC 00641821 */ addu $v1, $v1, $a0 -/* BAAB40 80240A00 00031880 */ sll $v1, $v1, 2 -/* BAAB44 80240A04 00641823 */ subu $v1, $v1, $a0 -/* BAAB48 80240A08 00431023 */ subu $v0, $v0, $v1 -/* BAAB4C 80240A0C 24420005 */ addiu $v0, $v0, 5 -/* BAAB50 80240A10 08090287 */ j .L80240A1C -/* BAAB54 80240A14 A602008E */ sh $v0, 0x8e($s0) -.L80240A18: -/* BAAB58 80240A18 AE800070 */ sw $zero, 0x70($s4) -.L80240A1C: -/* BAAB5C 80240A1C 8FBF0044 */ lw $ra, 0x44($sp) -/* BAAB60 80240A20 8FB40040 */ lw $s4, 0x40($sp) -/* BAAB64 80240A24 8FB3003C */ lw $s3, 0x3c($sp) -/* BAAB68 80240A28 8FB20038 */ lw $s2, 0x38($sp) -/* BAAB6C 80240A2C 8FB10034 */ lw $s1, 0x34($sp) -/* BAAB70 80240A30 8FB00030 */ lw $s0, 0x30($sp) -/* BAAB74 80240A34 03E00008 */ jr $ra -/* BAAB78 80240A38 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_07/func_80240A3C_BAA140.s b/asm/nonmatchings/world/area_mim/mim_07/func_80240A3C_BAA140.s deleted file mode 100644 index aaf3df213d..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_07/func_80240A3C_BAA140.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A3C_BAAB7C -/* BAAB7C 80240A3C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BAAB80 80240A40 AFB10014 */ sw $s1, 0x14($sp) -/* BAAB84 80240A44 0080882D */ daddu $s1, $a0, $zero -/* BAAB88 80240A48 AFBF001C */ sw $ra, 0x1c($sp) -/* BAAB8C 80240A4C AFB20018 */ sw $s2, 0x18($sp) -/* BAAB90 80240A50 AFB00010 */ sw $s0, 0x10($sp) -/* BAAB94 80240A54 8E220148 */ lw $v0, 0x148($s1) -/* BAAB98 80240A58 00A0902D */ daddu $s2, $a1, $zero -/* BAAB9C 80240A5C 84440008 */ lh $a0, 8($v0) -/* BAABA0 80240A60 0C00EABB */ jal get_npc_unsafe -/* BAABA4 80240A64 00C0802D */ daddu $s0, $a2, $zero -/* BAABA8 80240A68 0220202D */ daddu $a0, $s1, $zero -/* BAABAC 80240A6C 0240282D */ daddu $a1, $s2, $zero -/* BAABB0 80240A70 0200302D */ daddu $a2, $s0, $zero -/* BAABB4 80240A74 0C0127DF */ jal func_80049F7C -/* BAABB8 80240A78 0040802D */ daddu $s0, $v0, $zero -/* BAABBC 80240A7C 8E020000 */ lw $v0, ($s0) -/* BAABC0 80240A80 24040005 */ addiu $a0, $zero, 5 -/* BAABC4 80240A84 34420800 */ ori $v0, $v0, 0x800 -/* BAABC8 80240A88 0C00A67F */ jal rand_int -/* BAABCC 80240A8C AE020000 */ sw $v0, ($s0) -/* BAABD0 80240A90 44820000 */ mtc1 $v0, $f0 -/* BAABD4 80240A94 00000000 */ nop -/* BAABD8 80240A98 46800021 */ cvt.d.w $f0, $f0 -/* BAABDC 80240A9C 3C014024 */ lui $at, 0x4024 -/* BAABE0 80240AA0 44811800 */ mtc1 $at, $f3 -/* BAABE4 80240AA4 44801000 */ mtc1 $zero, $f2 -/* BAABE8 80240AA8 3C013FC0 */ lui $at, 0x3fc0 -/* BAABEC 80240AAC 44812000 */ mtc1 $at, $f4 -/* BAABF0 80240AB0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BAABF4 80240AB4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BAABF8 80240AB8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BAABFC 80240ABC C60E0040 */ lwc1 $f14, 0x40($s0) -/* BAAC00 80240AC0 46220000 */ add.d $f0, $f0, $f2 -/* BAAC04 80240AC4 E6040014 */ swc1 $f4, 0x14($s0) -/* BAAC08 80240AC8 46200020 */ cvt.s.d $f0, $f0 -/* BAAC0C 80240ACC E600001C */ swc1 $f0, 0x1c($s0) -/* BAAC10 80240AD0 8C460028 */ lw $a2, 0x28($v0) -/* BAAC14 80240AD4 0C00A720 */ jal atan2 -/* BAAC18 80240AD8 8C470030 */ lw $a3, 0x30($v0) -/* BAAC1C 80240ADC 0200202D */ daddu $a0, $s0, $zero -/* BAAC20 80240AE0 3C05B000 */ lui $a1, 0xb000 -/* BAAC24 80240AE4 34A50017 */ ori $a1, $a1, 0x17 -/* BAAC28 80240AE8 0000302D */ daddu $a2, $zero, $zero -/* BAAC2C 80240AEC E480000C */ swc1 $f0, 0xc($a0) -/* BAAC30 80240AF0 C6400018 */ lwc1 $f0, 0x18($s2) -/* BAAC34 80240AF4 2402000D */ addiu $v0, $zero, 0xd -/* BAAC38 80240AF8 E4800018 */ swc1 $f0, 0x18($a0) -/* BAAC3C 80240AFC 0C012530 */ jal func_800494C0 -/* BAAC40 80240B00 AE220070 */ sw $v0, 0x70($s1) -/* BAAC44 80240B04 8FBF001C */ lw $ra, 0x1c($sp) -/* BAAC48 80240B08 8FB20018 */ lw $s2, 0x18($sp) -/* BAAC4C 80240B0C 8FB10014 */ lw $s1, 0x14($sp) -/* BAAC50 80240B10 8FB00010 */ lw $s0, 0x10($sp) -/* BAAC54 80240B14 03E00008 */ jr $ra -/* BAAC58 80240B18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_07/func_80240B1C_BAA140.s b/asm/nonmatchings/world/area_mim/mim_07/func_80240B1C_BAA140.s deleted file mode 100644 index bcc4c4fd9a..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_07/func_80240B1C_BAA140.s +++ /dev/null @@ -1,200 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B1C_BAAC5C -/* BAAC5C 80240B1C 27BDFF90 */ addiu $sp, $sp, -0x70 -/* BAAC60 80240B20 AFB40050 */ sw $s4, 0x50($sp) -/* BAAC64 80240B24 0080A02D */ daddu $s4, $a0, $zero -/* BAAC68 80240B28 AFBF0060 */ sw $ra, 0x60($sp) -/* BAAC6C 80240B2C AFB7005C */ sw $s7, 0x5c($sp) -/* BAAC70 80240B30 AFB60058 */ sw $s6, 0x58($sp) -/* BAAC74 80240B34 AFB50054 */ sw $s5, 0x54($sp) -/* BAAC78 80240B38 AFB3004C */ sw $s3, 0x4c($sp) -/* BAAC7C 80240B3C AFB20048 */ sw $s2, 0x48($sp) -/* BAAC80 80240B40 AFB10044 */ sw $s1, 0x44($sp) -/* BAAC84 80240B44 AFB00040 */ sw $s0, 0x40($sp) -/* BAAC88 80240B48 F7B40068 */ sdc1 $f20, 0x68($sp) -/* BAAC8C 80240B4C 8E950148 */ lw $s5, 0x148($s4) -/* BAAC90 80240B50 00A0B02D */ daddu $s6, $a1, $zero -/* BAAC94 80240B54 86A40008 */ lh $a0, 8($s5) -/* BAAC98 80240B58 0C00EABB */ jal get_npc_unsafe -/* BAAC9C 80240B5C 00C0B82D */ daddu $s7, $a2, $zero -/* BAACA0 80240B60 0040982D */ daddu $s3, $v0, $zero -/* BAACA4 80240B64 C6600018 */ lwc1 $f0, 0x18($s3) -/* BAACA8 80240B68 44801000 */ mtc1 $zero, $f2 -/* BAACAC 80240B6C 44801800 */ mtc1 $zero, $f3 -/* BAACB0 80240B70 46000021 */ cvt.d.s $f0, $f0 -/* BAACB4 80240B74 4620103C */ c.lt.d $f2, $f0 -/* BAACB8 80240B78 00000000 */ nop -/* BAACBC 80240B7C 45000021 */ bc1f .L80240C04 -/* BAACC0 80240B80 27A50028 */ addiu $a1, $sp, 0x28 -/* BAACC4 80240B84 C6600038 */ lwc1 $f0, 0x38($s3) -/* BAACC8 80240B88 C662003C */ lwc1 $f2, 0x3c($s3) -/* BAACCC 80240B8C C6640040 */ lwc1 $f4, 0x40($s3) -/* BAACD0 80240B90 C6660018 */ lwc1 $f6, 0x18($s3) -/* BAACD4 80240B94 E7A00028 */ swc1 $f0, 0x28($sp) -/* BAACD8 80240B98 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BAACDC 80240B9C E7A40030 */ swc1 $f4, 0x30($sp) -/* BAACE0 80240BA0 E7A60010 */ swc1 $f6, 0x10($sp) -/* BAACE4 80240BA4 C660000C */ lwc1 $f0, 0xc($s3) -/* BAACE8 80240BA8 E7A00014 */ swc1 $f0, 0x14($sp) -/* BAACEC 80240BAC 866200A8 */ lh $v0, 0xa8($s3) -/* BAACF0 80240BB0 44820000 */ mtc1 $v0, $f0 -/* BAACF4 80240BB4 00000000 */ nop -/* BAACF8 80240BB8 46800020 */ cvt.s.w $f0, $f0 -/* BAACFC 80240BBC E7A00018 */ swc1 $f0, 0x18($sp) -/* BAAD00 80240BC0 866200A6 */ lh $v0, 0xa6($s3) -/* BAAD04 80240BC4 27A6002C */ addiu $a2, $sp, 0x2c -/* BAAD08 80240BC8 44820000 */ mtc1 $v0, $f0 -/* BAAD0C 80240BCC 00000000 */ nop -/* BAAD10 80240BD0 46800020 */ cvt.s.w $f0, $f0 -/* BAAD14 80240BD4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BAAD18 80240BD8 8E640080 */ lw $a0, 0x80($s3) -/* BAAD1C 80240BDC 0C037711 */ jal func_800DDC44 -/* BAAD20 80240BE0 27A70030 */ addiu $a3, $sp, 0x30 -/* BAAD24 80240BE4 10400003 */ beqz $v0, .L80240BF4 -/* BAAD28 80240BE8 00000000 */ nop -/* BAAD2C 80240BEC 08090301 */ j .L80240C04 -/* BAAD30 80240BF0 AE600018 */ sw $zero, 0x18($s3) -.L80240BF4: -/* BAAD34 80240BF4 8E650018 */ lw $a1, 0x18($s3) -/* BAAD38 80240BF8 8E66000C */ lw $a2, 0xc($s3) -/* BAAD3C 80240BFC 0C00EA95 */ jal npc_move_heading -/* BAAD40 80240C00 0260202D */ daddu $a0, $s3, $zero -.L80240C04: -/* BAAD44 80240C04 C660001C */ lwc1 $f0, 0x1c($s3) -/* BAAD48 80240C08 44801000 */ mtc1 $zero, $f2 -/* BAAD4C 80240C0C 44801800 */ mtc1 $zero, $f3 -/* BAAD50 80240C10 46000021 */ cvt.d.s $f0, $f0 -/* BAAD54 80240C14 4622003C */ c.lt.d $f0, $f2 -/* BAAD58 80240C18 00000000 */ nop -/* BAAD5C 80240C1C 4500006C */ bc1f .L80240DD0 -/* BAAD60 80240C20 27B00028 */ addiu $s0, $sp, 0x28 -/* BAAD64 80240C24 0200282D */ daddu $a1, $s0, $zero -/* BAAD68 80240C28 27A60034 */ addiu $a2, $sp, 0x34 -/* BAAD6C 80240C2C 27B20038 */ addiu $s2, $sp, 0x38 -/* BAAD70 80240C30 C6600038 */ lwc1 $f0, 0x38($s3) -/* BAAD74 80240C34 3C0142C8 */ lui $at, 0x42c8 -/* BAAD78 80240C38 44811000 */ mtc1 $at, $f2 -/* BAAD7C 80240C3C C6640040 */ lwc1 $f4, 0x40($s3) -/* BAAD80 80240C40 3C01447A */ lui $at, 0x447a -/* BAAD84 80240C44 44813000 */ mtc1 $at, $f6 -/* BAAD88 80240C48 27B10030 */ addiu $s1, $sp, 0x30 -/* BAAD8C 80240C4C E7A00028 */ swc1 $f0, 0x28($sp) -/* BAAD90 80240C50 E7A20034 */ swc1 $f2, 0x34($sp) -/* BAAD94 80240C54 E7A40030 */ swc1 $f4, 0x30($sp) -/* BAAD98 80240C58 E7A60038 */ swc1 $f6, 0x38($sp) -/* BAAD9C 80240C5C AFB20010 */ sw $s2, 0x10($sp) -/* BAADA0 80240C60 8E640080 */ lw $a0, 0x80($s3) -/* BAADA4 80240C64 0C0372DF */ jal func_800DCB7C -/* BAADA8 80240C68 0220382D */ daddu $a3, $s1, $zero -/* BAADAC 80240C6C 0200282D */ daddu $a1, $s0, $zero -/* BAADB0 80240C70 27A6002C */ addiu $a2, $sp, 0x2c -/* BAADB4 80240C74 C662003C */ lwc1 $f2, 0x3c($s3) -/* BAADB8 80240C78 C6660038 */ lwc1 $f6, 0x38($s3) -/* BAADBC 80240C7C 3C01402A */ lui $at, 0x402a -/* BAADC0 80240C80 4481A800 */ mtc1 $at, $f21 -/* BAADC4 80240C84 4480A000 */ mtc1 $zero, $f20 -/* BAADC8 80240C88 460010A1 */ cvt.d.s $f2, $f2 -/* BAADCC 80240C8C 46341080 */ add.d $f2, $f2, $f20 -/* BAADD0 80240C90 C660001C */ lwc1 $f0, 0x1c($s3) -/* BAADD4 80240C94 C6640040 */ lwc1 $f4, 0x40($s3) -/* BAADD8 80240C98 46000005 */ abs.s $f0, $f0 -/* BAADDC 80240C9C E7A40030 */ swc1 $f4, 0x30($sp) -/* BAADE0 80240CA0 3C014030 */ lui $at, 0x4030 -/* BAADE4 80240CA4 44812800 */ mtc1 $at, $f5 -/* BAADE8 80240CA8 44802000 */ mtc1 $zero, $f4 -/* BAADEC 80240CAC 46000021 */ cvt.d.s $f0, $f0 -/* BAADF0 80240CB0 E7A60028 */ swc1 $f6, 0x28($sp) -/* BAADF4 80240CB4 46240000 */ add.d $f0, $f0, $f4 -/* BAADF8 80240CB8 462010A0 */ cvt.s.d $f2, $f2 -/* BAADFC 80240CBC E7A2002C */ swc1 $f2, 0x2c($sp) -/* BAAE00 80240CC0 46200020 */ cvt.s.d $f0, $f0 -/* BAAE04 80240CC4 E7A00038 */ swc1 $f0, 0x38($sp) -/* BAAE08 80240CC8 AFB20010 */ sw $s2, 0x10($sp) -/* BAAE0C 80240CCC 8E640080 */ lw $a0, 0x80($s3) -/* BAAE10 80240CD0 0C0372DF */ jal func_800DCB7C -/* BAAE14 80240CD4 0220382D */ daddu $a3, $s1, $zero -/* BAAE18 80240CD8 1040003D */ beqz $v0, .L80240DD0 -/* BAAE1C 80240CDC 00000000 */ nop -/* BAAE20 80240CE0 C660001C */ lwc1 $f0, 0x1c($s3) -/* BAAE24 80240CE4 C7A20038 */ lwc1 $f2, 0x38($sp) -/* BAAE28 80240CE8 46000005 */ abs.s $f0, $f0 -/* BAAE2C 80240CEC 46000021 */ cvt.d.s $f0, $f0 -/* BAAE30 80240CF0 46340000 */ add.d $f0, $f0, $f20 -/* BAAE34 80240CF4 460010A1 */ cvt.d.s $f2, $f2 -/* BAAE38 80240CF8 4620103E */ c.le.d $f2, $f0 -/* BAAE3C 80240CFC 00000000 */ nop -/* BAAE40 80240D00 45000033 */ bc1f .L80240DD0 -/* BAAE44 80240D04 2403F7FF */ addiu $v1, $zero, -0x801 -/* BAAE48 80240D08 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BAAE4C 80240D0C 8E620000 */ lw $v0, ($s3) -/* BAAE50 80240D10 AE60001C */ sw $zero, 0x1c($s3) -/* BAAE54 80240D14 00431024 */ and $v0, $v0, $v1 -/* BAAE58 80240D18 E660003C */ swc1 $f0, 0x3c($s3) -/* BAAE5C 80240D1C AE620000 */ sw $v0, ($s3) -/* BAAE60 80240D20 AFA00010 */ sw $zero, 0x10($sp) -/* BAAE64 80240D24 AFA00014 */ sw $zero, 0x14($sp) -/* BAAE68 80240D28 8E650038 */ lw $a1, 0x38($s3) -/* BAAE6C 80240D2C 8E66003C */ lw $a2, 0x3c($s3) -/* BAAE70 80240D30 8E670040 */ lw $a3, 0x40($s3) -/* BAAE74 80240D34 0C01BECC */ jal fx_walk_normal -/* BAAE78 80240D38 24040002 */ addiu $a0, $zero, 2 -/* BAAE7C 80240D3C 02E0202D */ daddu $a0, $s7, $zero -/* BAAE80 80240D40 2402000C */ addiu $v0, $zero, 0xc -/* BAAE84 80240D44 AE820070 */ sw $v0, 0x70($s4) -/* BAAE88 80240D48 24020001 */ addiu $v0, $zero, 1 -/* BAAE8C 80240D4C AFA20010 */ sw $v0, 0x10($sp) -/* BAAE90 80240D50 8EC60024 */ lw $a2, 0x24($s6) -/* BAAE94 80240D54 8EC70028 */ lw $a3, 0x28($s6) -/* BAAE98 80240D58 0C01242D */ jal func_800490B4 -/* BAAE9C 80240D5C 02A0282D */ daddu $a1, $s5, $zero -/* BAAEA0 80240D60 14400022 */ bnez $v0, .L80240DEC -/* BAAEA4 80240D64 24040002 */ addiu $a0, $zero, 2 -/* BAAEA8 80240D68 0260282D */ daddu $a1, $s3, $zero -/* BAAEAC 80240D6C 0000302D */ daddu $a2, $zero, $zero -/* BAAEB0 80240D70 866300A8 */ lh $v1, 0xa8($s3) -/* BAAEB4 80240D74 3C013F80 */ lui $at, 0x3f80 -/* BAAEB8 80240D78 44810000 */ mtc1 $at, $f0 -/* BAAEBC 80240D7C 3C014000 */ lui $at, 0x4000 -/* BAAEC0 80240D80 44811000 */ mtc1 $at, $f2 -/* BAAEC4 80240D84 3C01C1A0 */ lui $at, 0xc1a0 -/* BAAEC8 80240D88 44812000 */ mtc1 $at, $f4 -/* BAAECC 80240D8C 2402000F */ addiu $v0, $zero, 0xf -/* BAAED0 80240D90 AFA2001C */ sw $v0, 0x1c($sp) -/* BAAED4 80240D94 44834000 */ mtc1 $v1, $f8 -/* BAAED8 80240D98 00000000 */ nop -/* BAAEDC 80240D9C 46804220 */ cvt.s.w $f8, $f8 -/* BAAEE0 80240DA0 44074000 */ mfc1 $a3, $f8 -/* BAAEE4 80240DA4 27A2003C */ addiu $v0, $sp, 0x3c -/* BAAEE8 80240DA8 AFA20020 */ sw $v0, 0x20($sp) -/* BAAEEC 80240DAC E7A00010 */ swc1 $f0, 0x10($sp) -/* BAAEF0 80240DB0 E7A20014 */ swc1 $f2, 0x14($sp) -/* BAAEF4 80240DB4 0C01BFA4 */ jal fx_emote -/* BAAEF8 80240DB8 E7A40018 */ swc1 $f4, 0x18($sp) -/* BAAEFC 80240DBC 24020019 */ addiu $v0, $zero, 0x19 -/* BAAF00 80240DC0 A662008E */ sh $v0, 0x8e($s3) -/* BAAF04 80240DC4 2402000E */ addiu $v0, $zero, 0xe -/* BAAF08 80240DC8 0809037B */ j .L80240DEC -/* BAAF0C 80240DCC AE820070 */ sw $v0, 0x70($s4) -.L80240DD0: -/* BAAF10 80240DD0 C664003C */ lwc1 $f4, 0x3c($s3) -/* BAAF14 80240DD4 C660001C */ lwc1 $f0, 0x1c($s3) -/* BAAF18 80240DD8 46002100 */ add.s $f4, $f4, $f0 -/* BAAF1C 80240DDC C6620014 */ lwc1 $f2, 0x14($s3) -/* BAAF20 80240DE0 46020001 */ sub.s $f0, $f0, $f2 -/* BAAF24 80240DE4 E664003C */ swc1 $f4, 0x3c($s3) -/* BAAF28 80240DE8 E660001C */ swc1 $f0, 0x1c($s3) -.L80240DEC: -/* BAAF2C 80240DEC 8FBF0060 */ lw $ra, 0x60($sp) -/* BAAF30 80240DF0 8FB7005C */ lw $s7, 0x5c($sp) -/* BAAF34 80240DF4 8FB60058 */ lw $s6, 0x58($sp) -/* BAAF38 80240DF8 8FB50054 */ lw $s5, 0x54($sp) -/* BAAF3C 80240DFC 8FB40050 */ lw $s4, 0x50($sp) -/* BAAF40 80240E00 8FB3004C */ lw $s3, 0x4c($sp) -/* BAAF44 80240E04 8FB20048 */ lw $s2, 0x48($sp) -/* BAAF48 80240E08 8FB10044 */ lw $s1, 0x44($sp) -/* BAAF4C 80240E0C 8FB00040 */ lw $s0, 0x40($sp) -/* BAAF50 80240E10 D7B40068 */ ldc1 $f20, 0x68($sp) -/* BAAF54 80240E14 03E00008 */ jr $ra -/* BAAF58 80240E18 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_mim/mim_07/func_80240E1C_BAA140.s b/asm/nonmatchings/world/area_mim/mim_07/func_80240E1C_BAA140.s deleted file mode 100644 index 2e17611a72..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_07/func_80240E1C_BAA140.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E1C_BAAF5C -/* BAAF5C 80240E1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BAAF60 80240E20 AFB00010 */ sw $s0, 0x10($sp) -/* BAAF64 80240E24 0080802D */ daddu $s0, $a0, $zero -/* BAAF68 80240E28 AFBF0014 */ sw $ra, 0x14($sp) -/* BAAF6C 80240E2C 8E020148 */ lw $v0, 0x148($s0) -/* BAAF70 80240E30 0C00EABB */ jal get_npc_unsafe -/* BAAF74 80240E34 84440008 */ lh $a0, 8($v0) -/* BAAF78 80240E38 9443008E */ lhu $v1, 0x8e($v0) -/* BAAF7C 80240E3C 2463FFFF */ addiu $v1, $v1, -1 -/* BAAF80 80240E40 A443008E */ sh $v1, 0x8e($v0) -/* BAAF84 80240E44 00031C00 */ sll $v1, $v1, 0x10 -/* BAAF88 80240E48 58600001 */ blezl $v1, .L80240E50 -/* BAAF8C 80240E4C AE000070 */ sw $zero, 0x70($s0) -.L80240E50: -/* BAAF90 80240E50 8FBF0014 */ lw $ra, 0x14($sp) -/* BAAF94 80240E54 8FB00010 */ lw $s0, 0x10($sp) -/* BAAF98 80240E58 03E00008 */ jr $ra -/* BAAF9C 80240E5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_07/func_80240E60_BAA140.s b/asm/nonmatchings/world/area_mim/mim_07/func_80240E60_BAA140.s deleted file mode 100644 index 6efb64e04e..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_07/func_80240E60_BAA140.s +++ /dev/null @@ -1,148 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E60_BAAFA0 -/* BAAFA0 80240E60 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BAAFA4 80240E64 AFB3003C */ sw $s3, 0x3c($sp) -/* BAAFA8 80240E68 0080982D */ daddu $s3, $a0, $zero -/* BAAFAC 80240E6C AFBF0048 */ sw $ra, 0x48($sp) -/* BAAFB0 80240E70 AFB50044 */ sw $s5, 0x44($sp) -/* BAAFB4 80240E74 AFB40040 */ sw $s4, 0x40($sp) -/* BAAFB8 80240E78 AFB20038 */ sw $s2, 0x38($sp) -/* BAAFBC 80240E7C AFB10034 */ sw $s1, 0x34($sp) -/* BAAFC0 80240E80 AFB00030 */ sw $s0, 0x30($sp) -/* BAAFC4 80240E84 8E720148 */ lw $s2, 0x148($s3) -/* BAAFC8 80240E88 86440008 */ lh $a0, 8($s2) -/* BAAFCC 80240E8C 8E70000C */ lw $s0, 0xc($s3) -/* BAAFD0 80240E90 0C00EABB */ jal get_npc_unsafe -/* BAAFD4 80240E94 00A0882D */ daddu $s1, $a1, $zero -/* BAAFD8 80240E98 8E050000 */ lw $a1, ($s0) -/* BAAFDC 80240E9C 26100004 */ addiu $s0, $s0, 4 -/* BAAFE0 80240EA0 0260202D */ daddu $a0, $s3, $zero -/* BAAFE4 80240EA4 0C0B1EAF */ jal get_variable -/* BAAFE8 80240EA8 0040A82D */ daddu $s5, $v0, $zero -/* BAAFEC 80240EAC 0260202D */ daddu $a0, $s3, $zero -/* BAAFF0 80240EB0 8E050000 */ lw $a1, ($s0) -/* BAAFF4 80240EB4 0C0B1EAF */ jal get_variable -/* BAAFF8 80240EB8 0040A02D */ daddu $s4, $v0, $zero -/* BAAFFC 80240EBC AE420094 */ sw $v0, 0x94($s2) -/* BAB000 80240EC0 AFA00010 */ sw $zero, 0x10($sp) -/* BAB004 80240EC4 8E4200D0 */ lw $v0, 0xd0($s2) -/* BAB008 80240EC8 8C420030 */ lw $v0, 0x30($v0) -/* BAB00C 80240ECC AFA20014 */ sw $v0, 0x14($sp) -/* BAB010 80240ED0 8E4200D0 */ lw $v0, 0xd0($s2) -/* BAB014 80240ED4 8C42001C */ lw $v0, 0x1c($v0) -/* BAB018 80240ED8 AFA20018 */ sw $v0, 0x18($sp) -/* BAB01C 80240EDC 8E4200D0 */ lw $v0, 0xd0($s2) -/* BAB020 80240EE0 8C420024 */ lw $v0, 0x24($v0) -/* BAB024 80240EE4 AFA2001C */ sw $v0, 0x1c($sp) -/* BAB028 80240EE8 8E4200D0 */ lw $v0, 0xd0($s2) -/* BAB02C 80240EEC 8C420028 */ lw $v0, 0x28($v0) -/* BAB030 80240EF0 AFA20020 */ sw $v0, 0x20($sp) -/* BAB034 80240EF4 8E4200D0 */ lw $v0, 0xd0($s2) -/* BAB038 80240EF8 3C0142C8 */ lui $at, 0x42c8 -/* BAB03C 80240EFC 44810000 */ mtc1 $at, $f0 -/* BAB040 80240F00 8C42002C */ lw $v0, 0x2c($v0) -/* BAB044 80240F04 27B00010 */ addiu $s0, $sp, 0x10 -/* BAB048 80240F08 E7A00028 */ swc1 $f0, 0x28($sp) -/* BAB04C 80240F0C A7A0002C */ sh $zero, 0x2c($sp) -/* BAB050 80240F10 12200019 */ beqz $s1, .L80240F78 -/* BAB054 80240F14 AFA20024 */ sw $v0, 0x24($sp) -/* BAB058 80240F18 AE600070 */ sw $zero, 0x70($s3) -/* BAB05C 80240F1C A6A0008E */ sh $zero, 0x8e($s5) -/* BAB060 80240F20 AE600074 */ sw $zero, 0x74($s3) -/* BAB064 80240F24 8EA20000 */ lw $v0, ($s5) -/* BAB068 80240F28 2403F7FF */ addiu $v1, $zero, -0x801 -/* BAB06C 80240F2C 00431024 */ and $v0, $v0, $v1 -/* BAB070 80240F30 2403FDFF */ addiu $v1, $zero, -0x201 -/* BAB074 80240F34 00431024 */ and $v0, $v0, $v1 -/* BAB078 80240F38 34420008 */ ori $v0, $v0, 8 -/* BAB07C 80240F3C AEA20000 */ sw $v0, ($s5) -/* BAB080 80240F40 8E4200B0 */ lw $v0, 0xb0($s2) -/* BAB084 80240F44 34420018 */ ori $v0, $v0, 0x18 -/* BAB088 80240F48 AE4200B0 */ sw $v0, 0xb0($s2) -/* BAB08C 80240F4C 8E420000 */ lw $v0, ($s2) -/* BAB090 80240F50 3C034000 */ lui $v1, 0x4000 -/* BAB094 80240F54 00431024 */ and $v0, $v0, $v1 -/* BAB098 80240F58 10400007 */ beqz $v0, .L80240F78 -/* BAB09C 80240F5C 3C03BFFF */ lui $v1, 0xbfff -/* BAB0A0 80240F60 2402000C */ addiu $v0, $zero, 0xc -/* BAB0A4 80240F64 AE620070 */ sw $v0, 0x70($s3) -/* BAB0A8 80240F68 8E420000 */ lw $v0, ($s2) -/* BAB0AC 80240F6C 3463FFFF */ ori $v1, $v1, 0xffff -/* BAB0B0 80240F70 00431024 */ and $v0, $v0, $v1 -/* BAB0B4 80240F74 AE420000 */ sw $v0, ($s2) -.L80240F78: -/* BAB0B8 80240F78 8E4300B0 */ lw $v1, 0xb0($s2) -/* BAB0BC 80240F7C 30620004 */ andi $v0, $v1, 4 -/* BAB0C0 80240F80 10400007 */ beqz $v0, .L80240FA0 -/* BAB0C4 80240F84 00000000 */ nop -/* BAB0C8 80240F88 824200B4 */ lb $v0, 0xb4($s2) -/* BAB0CC 80240F8C 14400034 */ bnez $v0, .L80241060 -/* BAB0D0 80240F90 0000102D */ daddu $v0, $zero, $zero -/* BAB0D4 80240F94 2402FFFB */ addiu $v0, $zero, -5 -/* BAB0D8 80240F98 00621024 */ and $v0, $v1, $v0 -/* BAB0DC 80240F9C AE4200B0 */ sw $v0, 0xb0($s2) -.L80240FA0: -/* BAB0E0 80240FA0 8E630070 */ lw $v1, 0x70($s3) -/* BAB0E4 80240FA4 2C62000F */ sltiu $v0, $v1, 0xf -/* BAB0E8 80240FA8 1040002C */ beqz $v0, .L8024105C -/* BAB0EC 80240FAC 00031080 */ sll $v0, $v1, 2 -/* BAB0F0 80240FB0 3C018024 */ lui $at, 0x8024 -/* BAB0F4 80240FB4 00220821 */ addu $at, $at, $v0 -/* BAB0F8 80240FB8 8C2237B8 */ lw $v0, 0x37b8($at) -/* BAB0FC 80240FBC 00400008 */ jr $v0 -/* BAB100 80240FC0 00000000 */ nop -/* BAB104 80240FC4 0260202D */ daddu $a0, $s3, $zero -/* BAB108 80240FC8 0280282D */ daddu $a1, $s4, $zero -/* BAB10C 80240FCC 0C09009C */ jal func_80240270 -/* BAB110 80240FD0 0200302D */ daddu $a2, $s0, $zero -/* BAB114 80240FD4 0260202D */ daddu $a0, $s3, $zero -/* BAB118 80240FD8 0280282D */ daddu $a1, $s4, $zero -/* BAB11C 80240FDC 0C090128 */ jal func_802404A0 -/* BAB120 80240FE0 0200302D */ daddu $a2, $s0, $zero -/* BAB124 80240FE4 08090418 */ j .L80241060 -/* BAB128 80240FE8 0000102D */ daddu $v0, $zero, $zero -/* BAB12C 80240FEC 0260202D */ daddu $a0, $s3, $zero -/* BAB130 80240FF0 0280282D */ daddu $a1, $s4, $zero -/* BAB134 80240FF4 0C0901F6 */ jal func_802407D8 -/* BAB138 80240FF8 0200302D */ daddu $a2, $s0, $zero -/* BAB13C 80240FFC 8E630070 */ lw $v1, 0x70($s3) -/* BAB140 80241000 24020003 */ addiu $v0, $zero, 3 -/* BAB144 80241004 14620016 */ bne $v1, $v0, .L80241060 -/* BAB148 80241008 0000102D */ daddu $v0, $zero, $zero -/* BAB14C 8024100C 0260202D */ daddu $a0, $s3, $zero -/* BAB150 80241010 0280282D */ daddu $a1, $s4, $zero -/* BAB154 80241014 0C090226 */ jal func_80240898 -/* BAB158 80241018 0200302D */ daddu $a2, $s0, $zero -/* BAB15C 8024101C 08090418 */ j .L80241060 -/* BAB160 80241020 0000102D */ daddu $v0, $zero, $zero -/* BAB164 80241024 0260202D */ daddu $a0, $s3, $zero -/* BAB168 80241028 0280282D */ daddu $a1, $s4, $zero -/* BAB16C 8024102C 0C09028F */ jal func_80240A3C -/* BAB170 80241030 0200302D */ daddu $a2, $s0, $zero -/* BAB174 80241034 0260202D */ daddu $a0, $s3, $zero -/* BAB178 80241038 0280282D */ daddu $a1, $s4, $zero -/* BAB17C 8024103C 0C0902C7 */ jal func_80240B1C -/* BAB180 80241040 0200302D */ daddu $a2, $s0, $zero -/* BAB184 80241044 08090418 */ j .L80241060 -/* BAB188 80241048 0000102D */ daddu $v0, $zero, $zero -/* BAB18C 8024104C 0260202D */ daddu $a0, $s3, $zero -/* BAB190 80241050 0280282D */ daddu $a1, $s4, $zero -/* BAB194 80241054 0C090387 */ jal func_80240E1C -/* BAB198 80241058 0200302D */ daddu $a2, $s0, $zero -.L8024105C: -/* BAB19C 8024105C 0000102D */ daddu $v0, $zero, $zero -.L80241060: -/* BAB1A0 80241060 8FBF0048 */ lw $ra, 0x48($sp) -/* BAB1A4 80241064 8FB50044 */ lw $s5, 0x44($sp) -/* BAB1A8 80241068 8FB40040 */ lw $s4, 0x40($sp) -/* BAB1AC 8024106C 8FB3003C */ lw $s3, 0x3c($sp) -/* BAB1B0 80241070 8FB20038 */ lw $s2, 0x38($sp) -/* BAB1B4 80241074 8FB10034 */ lw $s1, 0x34($sp) -/* BAB1B8 80241078 8FB00030 */ lw $s0, 0x30($sp) -/* BAB1BC 8024107C 03E00008 */ jr $ra -/* BAB1C0 80241080 27BD0050 */ addiu $sp, $sp, 0x50 -/* BAB1C4 80241084 00000000 */ nop -/* BAB1C8 80241088 00000000 */ nop -/* BAB1CC 8024108C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_08/func_80240068_BAD940.s b/asm/nonmatchings/world/area_mim/mim_08/func_80240068_BAD940.s deleted file mode 100644 index 62cf56544f..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/func_80240068_BAD940.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240068_BAD9A8 -/* BAD9A8 80240068 44806000 */ mtc1 $zero, $f12 -/* BAD9AC 8024006C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BAD9B0 80240070 AFB00010 */ sw $s0, 0x10($sp) -/* BAD9B4 80240074 0080802D */ daddu $s0, $a0, $zero -/* BAD9B8 80240078 AFBF0014 */ sw $ra, 0x14($sp) -/* BAD9BC 8024007C 0C038022 */ jal func_800E0088 -/* BAD9C0 80240080 46006386 */ mov.s $f14, $f12 -/* BAD9C4 80240084 4600008D */ trunc.w.s $f2, $f0 -/* BAD9C8 80240088 E6020084 */ swc1 $f2, 0x84($s0) -/* BAD9CC 8024008C 8FBF0014 */ lw $ra, 0x14($sp) -/* BAD9D0 80240090 8FB00010 */ lw $s0, 0x10($sp) -/* BAD9D4 80240094 24020002 */ addiu $v0, $zero, 2 -/* BAD9D8 80240098 03E00008 */ jr $ra -/* BAD9DC 8024009C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_08/func_802400A0_BAD940.s b/asm/nonmatchings/world/area_mim/mim_08/func_802400A0_BAD940.s deleted file mode 100644 index f936a9d18a..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/func_802400A0_BAD940.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400A0_BAD9E0 -/* BAD9E0 802400A0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* BAD9E4 802400A4 AFB3002C */ sw $s3, 0x2c($sp) -/* BAD9E8 802400A8 0080982D */ daddu $s3, $a0, $zero -/* BAD9EC 802400AC AFBF0030 */ sw $ra, 0x30($sp) -/* BAD9F0 802400B0 AFB20028 */ sw $s2, 0x28($sp) -/* BAD9F4 802400B4 AFB10024 */ sw $s1, 0x24($sp) -/* BAD9F8 802400B8 AFB00020 */ sw $s0, 0x20($sp) -/* BAD9FC 802400BC 8E710148 */ lw $s1, 0x148($s3) -/* BADA00 802400C0 86240008 */ lh $a0, 8($s1) -/* BADA04 802400C4 0C00EABB */ jal get_npc_unsafe -/* BADA08 802400C8 00A0902D */ daddu $s2, $a1, $zero -/* BADA0C 802400CC 8E440004 */ lw $a0, 4($s2) -/* BADA10 802400D0 0040802D */ daddu $s0, $v0, $zero -/* BADA14 802400D4 00041FC2 */ srl $v1, $a0, 0x1f -/* BADA18 802400D8 00832021 */ addu $a0, $a0, $v1 -/* BADA1C 802400DC 00042043 */ sra $a0, $a0, 1 -/* BADA20 802400E0 0C00A67F */ jal rand_int -/* BADA24 802400E4 24840001 */ addiu $a0, $a0, 1 -/* BADA28 802400E8 8E430004 */ lw $v1, 4($s2) -/* BADA2C 802400EC 000327C2 */ srl $a0, $v1, 0x1f -/* BADA30 802400F0 00641821 */ addu $v1, $v1, $a0 -/* BADA34 802400F4 00031843 */ sra $v1, $v1, 1 -/* BADA38 802400F8 00621821 */ addu $v1, $v1, $v0 -/* BADA3C 802400FC A603008E */ sh $v1, 0x8e($s0) -/* BADA40 80240100 8E2300D0 */ lw $v1, 0xd0($s1) -/* BADA44 80240104 C6000040 */ lwc1 $f0, 0x40($s0) -/* BADA48 80240108 C4640000 */ lwc1 $f4, ($v1) -/* BADA4C 8024010C 46802120 */ cvt.s.w $f4, $f4 -/* BADA50 80240110 C4620008 */ lwc1 $f2, 8($v1) -/* BADA54 80240114 468010A0 */ cvt.s.w $f2, $f2 -/* BADA58 80240118 E7A00010 */ swc1 $f0, 0x10($sp) -/* BADA5C 8024011C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BADA60 80240120 44061000 */ mfc1 $a2, $f2 -/* BADA64 80240124 C440000C */ lwc1 $f0, 0xc($v0) -/* BADA68 80240128 46800020 */ cvt.s.w $f0, $f0 -/* BADA6C 8024012C E7A00014 */ swc1 $f0, 0x14($sp) -/* BADA70 80240130 8E2200D0 */ lw $v0, 0xd0($s1) -/* BADA74 80240134 44052000 */ mfc1 $a1, $f4 -/* BADA78 80240138 C4400010 */ lwc1 $f0, 0x10($v0) -/* BADA7C 8024013C 46800020 */ cvt.s.w $f0, $f0 -/* BADA80 80240140 E7A00018 */ swc1 $f0, 0x18($sp) -/* BADA84 80240144 8C640018 */ lw $a0, 0x18($v1) -/* BADA88 80240148 0C0123F5 */ jal is_point_within_region -/* BADA8C 8024014C 8E070038 */ lw $a3, 0x38($s0) -/* BADA90 80240150 1040000E */ beqz $v0, .L8024018C -/* BADA94 80240154 00000000 */ nop -/* BADA98 80240158 8E2200D0 */ lw $v0, 0xd0($s1) -/* BADA9C 8024015C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BADAA0 80240160 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BADAA4 80240164 C4460000 */ lwc1 $f6, ($v0) -/* BADAA8 80240168 468031A0 */ cvt.s.w $f6, $f6 -/* BADAAC 8024016C 44063000 */ mfc1 $a2, $f6 -/* BADAB0 80240170 C4460008 */ lwc1 $f6, 8($v0) -/* BADAB4 80240174 468031A0 */ cvt.s.w $f6, $f6 -/* BADAB8 80240178 44073000 */ mfc1 $a3, $f6 -/* BADABC 8024017C 0C00A720 */ jal atan2 -/* BADAC0 80240180 00000000 */ nop -/* BADAC4 80240184 0809006F */ j .L802401BC -/* BADAC8 80240188 E600000C */ swc1 $f0, 0xc($s0) -.L8024018C: -/* BADACC 8024018C 0C00A67F */ jal rand_int -/* BADAD0 80240190 2404003C */ addiu $a0, $zero, 0x3c -/* BADAD4 80240194 C60C000C */ lwc1 $f12, 0xc($s0) -/* BADAD8 80240198 44820000 */ mtc1 $v0, $f0 -/* BADADC 8024019C 00000000 */ nop -/* BADAE0 802401A0 46800020 */ cvt.s.w $f0, $f0 -/* BADAE4 802401A4 46006300 */ add.s $f12, $f12, $f0 -/* BADAE8 802401A8 3C0141F0 */ lui $at, 0x41f0 -/* BADAEC 802401AC 44810000 */ mtc1 $at, $f0 -/* BADAF0 802401B0 0C00A6C9 */ jal clamp_angle -/* BADAF4 802401B4 46006301 */ sub.s $f12, $f12, $f0 -/* BADAF8 802401B8 E600000C */ swc1 $f0, 0xc($s0) -.L802401BC: -/* BADAFC 802401BC 8E2200CC */ lw $v0, 0xcc($s1) -/* BADB00 802401C0 8C420004 */ lw $v0, 4($v0) -/* BADB04 802401C4 AE020028 */ sw $v0, 0x28($s0) -/* BADB08 802401C8 AE600074 */ sw $zero, 0x74($s3) -/* BADB0C 802401CC 8E2200D0 */ lw $v0, 0xd0($s1) -/* BADB10 802401D0 8C420014 */ lw $v0, 0x14($v0) -/* BADB14 802401D4 04410004 */ bgez $v0, .L802401E8 -/* BADB18 802401D8 00000000 */ nop -/* BADB1C 802401DC C6400000 */ lwc1 $f0, ($s2) -/* BADB20 802401E0 08090082 */ j .L80240208 -/* BADB24 802401E4 E6000018 */ swc1 $f0, 0x18($s0) -.L802401E8: -/* BADB28 802401E8 3C018024 */ lui $at, 0x8024 -/* BADB2C 802401EC D42252A0 */ ldc1 $f2, 0x52a0($at) -/* BADB30 802401F0 44820000 */ mtc1 $v0, $f0 -/* BADB34 802401F4 00000000 */ nop -/* BADB38 802401F8 46800021 */ cvt.d.w $f0, $f0 -/* BADB3C 802401FC 46220003 */ div.d $f0, $f0, $f2 -/* BADB40 80240200 46200020 */ cvt.s.d $f0, $f0 -/* BADB44 80240204 E6000018 */ swc1 $f0, 0x18($s0) -.L80240208: -/* BADB48 80240208 C600003C */ lwc1 $f0, 0x3c($s0) -/* BADB4C 8024020C 3C014059 */ lui $at, 0x4059 -/* BADB50 80240210 44811800 */ mtc1 $at, $f3 -/* BADB54 80240214 44801000 */ mtc1 $zero, $f2 -/* BADB58 80240218 46000021 */ cvt.d.s $f0, $f0 -/* BADB5C 8024021C 46220002 */ mul.d $f0, $f0, $f2 -/* BADB60 80240220 00000000 */ nop -/* BADB64 80240224 24020001 */ addiu $v0, $zero, 1 -/* BADB68 80240228 4620018D */ trunc.w.d $f6, $f0 -/* BADB6C 8024022C E626007C */ swc1 $f6, 0x7c($s1) -/* BADB70 80240230 AE620070 */ sw $v0, 0x70($s3) -/* BADB74 80240234 8FBF0030 */ lw $ra, 0x30($sp) -/* BADB78 80240238 8FB3002C */ lw $s3, 0x2c($sp) -/* BADB7C 8024023C 8FB20028 */ lw $s2, 0x28($sp) -/* BADB80 80240240 8FB10024 */ lw $s1, 0x24($sp) -/* BADB84 80240244 8FB00020 */ lw $s0, 0x20($sp) -/* BADB88 80240248 03E00008 */ jr $ra -/* BADB8C 8024024C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mim/mim_08/func_80240250_BAD940.s b/asm/nonmatchings/world/area_mim/mim_08/func_80240250_BAD940.s deleted file mode 100644 index 3b92ed6044..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/func_80240250_BAD940.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240250_BADB90 -/* BADB90 80240250 27BDFF80 */ addiu $sp, $sp, -0x80 -/* BADB94 80240254 AFB3004C */ sw $s3, 0x4c($sp) -/* BADB98 80240258 0080982D */ daddu $s3, $a0, $zero -/* BADB9C 8024025C AFBF0058 */ sw $ra, 0x58($sp) -/* BADBA0 80240260 AFB50054 */ sw $s5, 0x54($sp) -/* BADBA4 80240264 AFB40050 */ sw $s4, 0x50($sp) -/* BADBA8 80240268 AFB20048 */ sw $s2, 0x48($sp) -/* BADBAC 8024026C AFB10044 */ sw $s1, 0x44($sp) -/* BADBB0 80240270 AFB00040 */ sw $s0, 0x40($sp) -/* BADBB4 80240274 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* BADBB8 80240278 F7B80070 */ sdc1 $f24, 0x70($sp) -/* BADBBC 8024027C F7B60068 */ sdc1 $f22, 0x68($sp) -/* BADBC0 80240280 F7B40060 */ sdc1 $f20, 0x60($sp) -/* BADBC4 80240284 8E710148 */ lw $s1, 0x148($s3) -/* BADBC8 80240288 00A0902D */ daddu $s2, $a1, $zero -/* BADBCC 8024028C 86240008 */ lh $a0, 8($s1) -/* BADBD0 80240290 0C00EABB */ jal get_npc_unsafe -/* BADBD4 80240294 00C0A82D */ daddu $s5, $a2, $zero -/* BADBD8 80240298 0040802D */ daddu $s0, $v0, $zero -/* BADBDC 8024029C 0000A02D */ daddu $s4, $zero, $zero -/* BADBE0 802402A0 C624007C */ lwc1 $f4, 0x7c($s1) -/* BADBE4 802402A4 46802120 */ cvt.s.w $f4, $f4 -/* BADBE8 802402A8 C6220088 */ lwc1 $f2, 0x88($s1) -/* BADBEC 802402AC 468010A0 */ cvt.s.w $f2, $f2 -/* BADBF0 802402B0 460010A1 */ cvt.d.s $f2, $f2 -/* BADBF4 802402B4 46002121 */ cvt.d.s $f4, $f4 -/* BADBF8 802402B8 C600003C */ lwc1 $f0, 0x3c($s0) -/* BADBFC 802402BC 3C014059 */ lui $at, 0x4059 -/* BADC00 802402C0 44813800 */ mtc1 $at, $f7 -/* BADC04 802402C4 44803000 */ mtc1 $zero, $f6 -/* BADC08 802402C8 46000021 */ cvt.d.s $f0, $f0 -/* BADC0C 802402CC 46260002 */ mul.d $f0, $f0, $f6 -/* BADC10 802402D0 00000000 */ nop -/* BADC14 802402D4 24020001 */ addiu $v0, $zero, 1 -/* BADC18 802402D8 8E24006C */ lw $a0, 0x6c($s1) -/* BADC1C 802402DC 46261083 */ div.d $f2, $f2, $f6 -/* BADC20 802402E0 462010A0 */ cvt.s.d $f2, $f2 -/* BADC24 802402E4 46262103 */ div.d $f4, $f4, $f6 -/* BADC28 802402E8 46202520 */ cvt.s.d $f20, $f4 -/* BADC2C 802402EC 30830011 */ andi $v1, $a0, 0x11 -/* BADC30 802402F0 4620020D */ trunc.w.d $f8, $f0 -/* BADC34 802402F4 E628007C */ swc1 $f8, 0x7c($s1) -/* BADC38 802402F8 C6200078 */ lwc1 $f0, 0x78($s1) -/* BADC3C 802402FC 46800020 */ cvt.s.w $f0, $f0 -/* BADC40 80240300 46000021 */ cvt.d.s $f0, $f0 -/* BADC44 80240304 46260003 */ div.d $f0, $f0, $f6 -/* BADC48 80240308 462006A0 */ cvt.s.d $f26, $f0 -/* BADC4C 8024030C C6200070 */ lwc1 $f0, 0x70($s1) -/* BADC50 80240310 46800020 */ cvt.s.w $f0, $f0 -/* BADC54 80240314 46000021 */ cvt.d.s $f0, $f0 -/* BADC58 80240318 46260003 */ div.d $f0, $f0, $f6 -/* BADC5C 8024031C 462005A0 */ cvt.s.d $f22, $f0 -/* BADC60 80240320 14620025 */ bne $v1, $v0, .L802403B8 -/* BADC64 80240324 4602D600 */ add.s $f24, $f26, $f2 -/* BADC68 80240328 8E020000 */ lw $v0, ($s0) -/* BADC6C 8024032C 30420008 */ andi $v0, $v0, 8 -/* BADC70 80240330 10400009 */ beqz $v0, .L80240358 -/* BADC74 80240334 27A50028 */ addiu $a1, $sp, 0x28 -/* BADC78 80240338 C600003C */ lwc1 $f0, 0x3c($s0) -/* BADC7C 8024033C 4600C001 */ sub.s $f0, $f24, $f0 -/* BADC80 80240340 4600B03C */ c.lt.s $f22, $f0 -/* BADC84 80240344 00000000 */ nop -/* BADC88 80240348 4500001B */ bc1f .L802403B8 -/* BADC8C 8024034C 34820010 */ ori $v0, $a0, 0x10 -/* BADC90 80240350 080900EE */ j .L802403B8 -/* BADC94 80240354 AE22006C */ sw $v0, 0x6c($s1) -.L80240358: -/* BADC98 80240358 27A6002C */ addiu $a2, $sp, 0x2c -/* BADC9C 8024035C C6000038 */ lwc1 $f0, 0x38($s0) -/* BADCA0 80240360 C602003C */ lwc1 $f2, 0x3c($s0) -/* BADCA4 80240364 C6040040 */ lwc1 $f4, 0x40($s0) -/* BADCA8 80240368 3C01447A */ lui $at, 0x447a -/* BADCAC 8024036C 44813000 */ mtc1 $at, $f6 -/* BADCB0 80240370 27A20034 */ addiu $v0, $sp, 0x34 -/* BADCB4 80240374 E7A00028 */ swc1 $f0, 0x28($sp) -/* BADCB8 80240378 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BADCBC 8024037C E7A40030 */ swc1 $f4, 0x30($sp) -/* BADCC0 80240380 E7A60034 */ swc1 $f6, 0x34($sp) -/* BADCC4 80240384 AFA20010 */ sw $v0, 0x10($sp) -/* BADCC8 80240388 8E040080 */ lw $a0, 0x80($s0) -/* BADCCC 8024038C 0C0372DF */ jal func_800DCB7C -/* BADCD0 80240390 27A70030 */ addiu $a3, $sp, 0x30 -/* BADCD4 80240394 C7A00034 */ lwc1 $f0, 0x34($sp) -/* BADCD8 80240398 4600D001 */ sub.s $f0, $f26, $f0 -/* BADCDC 8024039C 4600B03C */ c.lt.s $f22, $f0 -/* BADCE0 802403A0 00000000 */ nop -/* BADCE4 802403A4 45000004 */ bc1f .L802403B8 -/* BADCE8 802403A8 00000000 */ nop -/* BADCEC 802403AC 8E22006C */ lw $v0, 0x6c($s1) -/* BADCF0 802403B0 34420010 */ ori $v0, $v0, 0x10 -/* BADCF4 802403B4 AE22006C */ sw $v0, 0x6c($s1) -.L802403B8: -/* BADCF8 802403B8 8E22006C */ lw $v0, 0x6c($s1) -/* BADCFC 802403BC 24030011 */ addiu $v1, $zero, 0x11 -/* BADD00 802403C0 30420011 */ andi $v0, $v0, 0x11 -/* BADD04 802403C4 14430039 */ bne $v0, $v1, .L802404AC -/* BADD08 802403C8 00000000 */ nop -/* BADD0C 802403CC 8E020000 */ lw $v0, ($s0) -/* BADD10 802403D0 30420008 */ andi $v0, $v0, 8 -/* BADD14 802403D4 1040000A */ beqz $v0, .L80240400 -/* BADD18 802403D8 4600C106 */ mov.s $f4, $f24 -/* BADD1C 802403DC 4614C081 */ sub.s $f2, $f24, $f20 -/* BADD20 802403E0 3C018024 */ lui $at, 0x8024 -/* BADD24 802403E4 D42052A8 */ ldc1 $f0, 0x52a8($at) -/* BADD28 802403E8 460010A1 */ cvt.d.s $f2, $f2 -/* BADD2C 802403EC 46201082 */ mul.d $f2, $f2, $f0 -/* BADD30 802403F0 00000000 */ nop -/* BADD34 802403F4 4600A021 */ cvt.d.s $f0, $f20 -/* BADD38 802403F8 08090119 */ j .L80240464 -/* BADD3C 802403FC 46220000 */ add.d $f0, $f0, $f2 -.L80240400: -/* BADD40 80240400 27A50028 */ addiu $a1, $sp, 0x28 -/* BADD44 80240404 27A6002C */ addiu $a2, $sp, 0x2c -/* BADD48 80240408 C6000038 */ lwc1 $f0, 0x38($s0) -/* BADD4C 8024040C C6020040 */ lwc1 $f2, 0x40($s0) -/* BADD50 80240410 3C01447A */ lui $at, 0x447a -/* BADD54 80240414 44812000 */ mtc1 $at, $f4 -/* BADD58 80240418 27A20034 */ addiu $v0, $sp, 0x34 -/* BADD5C 8024041C E7B4002C */ swc1 $f20, 0x2c($sp) -/* BADD60 80240420 E7A00028 */ swc1 $f0, 0x28($sp) -/* BADD64 80240424 E7A20030 */ swc1 $f2, 0x30($sp) -/* BADD68 80240428 E7A40034 */ swc1 $f4, 0x34($sp) -/* BADD6C 8024042C AFA20010 */ sw $v0, 0x10($sp) -/* BADD70 80240430 8E040080 */ lw $a0, 0x80($s0) -/* BADD74 80240434 0C0372DF */ jal func_800DCB7C -/* BADD78 80240438 27A70030 */ addiu $a3, $sp, 0x30 -/* BADD7C 8024043C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* BADD80 80240440 461A2100 */ add.s $f4, $f4, $f26 -/* BADD84 80240444 46142081 */ sub.s $f2, $f4, $f20 -/* BADD88 80240448 3C018024 */ lui $at, 0x8024 -/* BADD8C 8024044C D42052B0 */ ldc1 $f0, 0x52b0($at) -/* BADD90 80240450 460010A1 */ cvt.d.s $f2, $f2 -/* BADD94 80240454 46201082 */ mul.d $f2, $f2, $f0 -/* BADD98 80240458 00000000 */ nop -/* BADD9C 8024045C 4600A021 */ cvt.d.s $f0, $f20 -/* BADDA0 80240460 46220000 */ add.d $f0, $f0, $f2 -.L80240464: -/* BADDA4 80240464 46200020 */ cvt.s.d $f0, $f0 -/* BADDA8 80240468 E600003C */ swc1 $f0, 0x3c($s0) -/* BADDAC 8024046C C600003C */ lwc1 $f0, 0x3c($s0) -/* BADDB0 80240470 46002001 */ sub.s $f0, $f4, $f0 -/* BADDB4 80240474 3C013FF0 */ lui $at, 0x3ff0 -/* BADDB8 80240478 44811800 */ mtc1 $at, $f3 -/* BADDBC 8024047C 44801000 */ mtc1 $zero, $f2 -/* BADDC0 80240480 46000005 */ abs.s $f0, $f0 -/* BADDC4 80240484 46000021 */ cvt.d.s $f0, $f0 -/* BADDC8 80240488 4622003C */ c.lt.d $f0, $f2 -/* BADDCC 8024048C 00000000 */ nop -/* BADDD0 80240490 45000036 */ bc1f .L8024056C -/* BADDD4 80240494 2403FFEF */ addiu $v1, $zero, -0x11 -/* BADDD8 80240498 E604003C */ swc1 $f4, 0x3c($s0) -/* BADDDC 8024049C 8E22006C */ lw $v0, 0x6c($s1) -/* BADDE0 802404A0 00431024 */ and $v0, $v0, $v1 -/* BADDE4 802404A4 0809015B */ j .L8024056C -/* BADDE8 802404A8 AE22006C */ sw $v0, 0x6c($s1) -.L802404AC: -/* BADDEC 802404AC 8E220070 */ lw $v0, 0x70($s1) -/* BADDF0 802404B0 1840002E */ blez $v0, .L8024056C -/* BADDF4 802404B4 00000000 */ nop -/* BADDF8 802404B8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* BADDFC 802404BC 0C00A8BB */ jal sin_deg -/* BADE00 802404C0 46806320 */ cvt.s.w $f12, $f12 -/* BADE04 802404C4 8E020000 */ lw $v0, ($s0) -/* BADE08 802404C8 30420008 */ andi $v0, $v0, 8 -/* BADE0C 802404CC 10400003 */ beqz $v0, .L802404DC -/* BADE10 802404D0 46000506 */ mov.s $f20, $f0 -/* BADE14 802404D4 08090147 */ j .L8024051C -/* BADE18 802404D8 0000102D */ daddu $v0, $zero, $zero -.L802404DC: -/* BADE1C 802404DC 27A50028 */ addiu $a1, $sp, 0x28 -/* BADE20 802404E0 27A6002C */ addiu $a2, $sp, 0x2c -/* BADE24 802404E4 C6000038 */ lwc1 $f0, 0x38($s0) -/* BADE28 802404E8 C602003C */ lwc1 $f2, 0x3c($s0) -/* BADE2C 802404EC C6040040 */ lwc1 $f4, 0x40($s0) -/* BADE30 802404F0 3C01447A */ lui $at, 0x447a -/* BADE34 802404F4 44813000 */ mtc1 $at, $f6 -/* BADE38 802404F8 27A20034 */ addiu $v0, $sp, 0x34 -/* BADE3C 802404FC E7A00028 */ swc1 $f0, 0x28($sp) -/* BADE40 80240500 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BADE44 80240504 E7A40030 */ swc1 $f4, 0x30($sp) -/* BADE48 80240508 E7A60034 */ swc1 $f6, 0x34($sp) -/* BADE4C 8024050C AFA20010 */ sw $v0, 0x10($sp) -/* BADE50 80240510 8E040080 */ lw $a0, 0x80($s0) -/* BADE54 80240514 0C0372DF */ jal func_800DCB7C -/* BADE58 80240518 27A70030 */ addiu $a3, $sp, 0x30 -.L8024051C: -/* BADE5C 8024051C 10400007 */ beqz $v0, .L8024053C -/* BADE60 80240520 00000000 */ nop -/* BADE64 80240524 4616A082 */ mul.s $f2, $f20, $f22 -/* BADE68 80240528 00000000 */ nop -/* BADE6C 8024052C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BADE70 80240530 461A0000 */ add.s $f0, $f0, $f26 -/* BADE74 80240534 08090152 */ j .L80240548 -/* BADE78 80240538 46020000 */ add.s $f0, $f0, $f2 -.L8024053C: -/* BADE7C 8024053C 4616A002 */ mul.s $f0, $f20, $f22 -/* BADE80 80240540 00000000 */ nop -/* BADE84 80240544 4600C000 */ add.s $f0, $f24, $f0 -.L80240548: -/* BADE88 80240548 E600003C */ swc1 $f0, 0x3c($s0) -/* BADE8C 8024054C 8E220074 */ lw $v0, 0x74($s1) -/* BADE90 80240550 2442000A */ addiu $v0, $v0, 0xa -/* BADE94 80240554 44826000 */ mtc1 $v0, $f12 -/* BADE98 80240558 00000000 */ nop -/* BADE9C 8024055C 0C00A6C9 */ jal clamp_angle -/* BADEA0 80240560 46806320 */ cvt.s.w $f12, $f12 -/* BADEA4 80240564 4600020D */ trunc.w.s $f8, $f0 -/* BADEA8 80240568 E6280074 */ swc1 $f8, 0x74($s1) -.L8024056C: -/* BADEAC 8024056C 8E220090 */ lw $v0, 0x90($s1) -/* BADEB0 80240570 1C40004A */ bgtz $v0, .L8024069C -/* BADEB4 80240574 2442FFFF */ addiu $v0, $v0, -1 -/* BADEB8 80240578 8E430014 */ lw $v1, 0x14($s2) -/* BADEBC 8024057C 04600048 */ bltz $v1, .L802406A0 -/* BADEC0 80240580 00000000 */ nop -/* BADEC4 80240584 8E620074 */ lw $v0, 0x74($s3) -/* BADEC8 80240588 1C400042 */ bgtz $v0, .L80240694 -/* BADECC 8024058C 2442FFFF */ addiu $v0, $v0, -1 -/* BADED0 80240590 AE630074 */ sw $v1, 0x74($s3) -/* BADED4 80240594 860200A8 */ lh $v0, 0xa8($s0) -/* BADED8 80240598 C602003C */ lwc1 $f2, 0x3c($s0) -/* BADEDC 8024059C 44820000 */ mtc1 $v0, $f0 -/* BADEE0 802405A0 00000000 */ nop -/* BADEE4 802405A4 46800020 */ cvt.s.w $f0, $f0 -/* BADEE8 802405A8 46001080 */ add.s $f2, $f2, $f0 -/* BADEEC 802405AC 3C014024 */ lui $at, 0x4024 -/* BADEF0 802405B0 44810800 */ mtc1 $at, $f1 -/* BADEF4 802405B4 44800000 */ mtc1 $zero, $f0 -/* BADEF8 802405B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BADEFC 802405BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BADF00 802405C0 460010A1 */ cvt.d.s $f2, $f2 -/* BADF04 802405C4 46201080 */ add.d $f2, $f2, $f0 -/* BADF08 802405C8 C440002C */ lwc1 $f0, 0x2c($v0) -/* BADF0C 802405CC 46000021 */ cvt.d.s $f0, $f0 -/* BADF10 802405D0 4622003C */ c.lt.d $f0, $f2 -/* BADF14 802405D4 00000000 */ nop -/* BADF18 802405D8 4500002C */ bc1f .L8024068C -/* BADF1C 802405DC 02A0202D */ daddu $a0, $s5, $zero -/* BADF20 802405E0 AFA00010 */ sw $zero, 0x10($sp) -/* BADF24 802405E4 8E46000C */ lw $a2, 0xc($s2) -/* BADF28 802405E8 8E470010 */ lw $a3, 0x10($s2) -/* BADF2C 802405EC 0C01242D */ jal func_800490B4 -/* BADF30 802405F0 0220282D */ daddu $a1, $s1, $zero -/* BADF34 802405F4 10400025 */ beqz $v0, .L8024068C -/* BADF38 802405F8 0000202D */ daddu $a0, $zero, $zero -/* BADF3C 802405FC 0200282D */ daddu $a1, $s0, $zero -/* BADF40 80240600 0000302D */ daddu $a2, $zero, $zero -/* BADF44 80240604 2412000C */ addiu $s2, $zero, 0xc -/* BADF48 80240608 860300A8 */ lh $v1, 0xa8($s0) -/* BADF4C 8024060C 3C013F80 */ lui $at, 0x3f80 -/* BADF50 80240610 44810000 */ mtc1 $at, $f0 -/* BADF54 80240614 3C014000 */ lui $at, 0x4000 -/* BADF58 80240618 44811000 */ mtc1 $at, $f2 -/* BADF5C 8024061C 3C01C1A0 */ lui $at, 0xc1a0 -/* BADF60 80240620 44812000 */ mtc1 $at, $f4 -/* BADF64 80240624 44834000 */ mtc1 $v1, $f8 -/* BADF68 80240628 00000000 */ nop -/* BADF6C 8024062C 46804220 */ cvt.s.w $f8, $f8 -/* BADF70 80240630 44074000 */ mfc1 $a3, $f8 -/* BADF74 80240634 27A20038 */ addiu $v0, $sp, 0x38 -/* BADF78 80240638 AFB2001C */ sw $s2, 0x1c($sp) -/* BADF7C 8024063C AFA20020 */ sw $v0, 0x20($sp) -/* BADF80 80240640 E7A00010 */ swc1 $f0, 0x10($sp) -/* BADF84 80240644 E7A20014 */ swc1 $f2, 0x14($sp) -/* BADF88 80240648 0C01BFA4 */ jal fx_emote -/* BADF8C 8024064C E7A40018 */ swc1 $f4, 0x18($sp) -/* BADF90 80240650 0200202D */ daddu $a0, $s0, $zero -/* BADF94 80240654 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BADF98 80240658 C480003C */ lwc1 $f0, 0x3c($a0) -/* BADF9C 8024065C 3C060020 */ lui $a2, 0x20 -/* BADFA0 80240660 0C012530 */ jal func_800494C0 -/* BADFA4 80240664 E4800064 */ swc1 $f0, 0x64($a0) -/* BADFA8 80240668 8E220018 */ lw $v0, 0x18($s1) -/* BADFAC 8024066C 9442002A */ lhu $v0, 0x2a($v0) -/* BADFB0 80240670 30420001 */ andi $v0, $v0, 1 -/* BADFB4 80240674 10400003 */ beqz $v0, .L80240684 -/* BADFB8 80240678 2402000A */ addiu $v0, $zero, 0xa -/* BADFBC 8024067C 08090211 */ j .L80240844 -/* BADFC0 80240680 AE620070 */ sw $v0, 0x70($s3) -.L80240684: -/* BADFC4 80240684 08090211 */ j .L80240844 -/* BADFC8 80240688 AE720070 */ sw $s2, 0x70($s3) -.L8024068C: -/* BADFCC 8024068C 8E620074 */ lw $v0, 0x74($s3) -/* BADFD0 80240690 2442FFFF */ addiu $v0, $v0, -1 -.L80240694: -/* BADFD4 80240694 080901A8 */ j .L802406A0 -/* BADFD8 80240698 AE620074 */ sw $v0, 0x74($s3) -.L8024069C: -/* BADFDC 8024069C AE220090 */ sw $v0, 0x90($s1) -.L802406A0: -/* BADFE0 802406A0 8E2300D0 */ lw $v1, 0xd0($s1) -/* BADFE4 802406A4 C6000040 */ lwc1 $f0, 0x40($s0) -/* BADFE8 802406A8 C4620000 */ lwc1 $f2, ($v1) -/* BADFEC 802406AC 468010A0 */ cvt.s.w $f2, $f2 -/* BADFF0 802406B0 C4640008 */ lwc1 $f4, 8($v1) -/* BADFF4 802406B4 46802120 */ cvt.s.w $f4, $f4 -/* BADFF8 802406B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* BADFFC 802406BC 8E2200D0 */ lw $v0, 0xd0($s1) -/* BAE000 802406C0 44051000 */ mfc1 $a1, $f2 -/* BAE004 802406C4 C440000C */ lwc1 $f0, 0xc($v0) -/* BAE008 802406C8 46800020 */ cvt.s.w $f0, $f0 -/* BAE00C 802406CC E7A00014 */ swc1 $f0, 0x14($sp) -/* BAE010 802406D0 8E2200D0 */ lw $v0, 0xd0($s1) -/* BAE014 802406D4 44062000 */ mfc1 $a2, $f4 -/* BAE018 802406D8 C4400010 */ lwc1 $f0, 0x10($v0) -/* BAE01C 802406DC 46800020 */ cvt.s.w $f0, $f0 -/* BAE020 802406E0 E7A00018 */ swc1 $f0, 0x18($sp) -/* BAE024 802406E4 8C640018 */ lw $a0, 0x18($v1) -/* BAE028 802406E8 0C0123F5 */ jal is_point_within_region -/* BAE02C 802406EC 8E070038 */ lw $a3, 0x38($s0) -/* BAE030 802406F0 1040001A */ beqz $v0, .L8024075C -/* BAE034 802406F4 00000000 */ nop -/* BAE038 802406F8 8E060038 */ lw $a2, 0x38($s0) -/* BAE03C 802406FC 8E2200D0 */ lw $v0, 0xd0($s1) -/* BAE040 80240700 8E070040 */ lw $a3, 0x40($s0) -/* BAE044 80240704 C44C0000 */ lwc1 $f12, ($v0) -/* BAE048 80240708 46806320 */ cvt.s.w $f12, $f12 -/* BAE04C 8024070C C44E0008 */ lwc1 $f14, 8($v0) -/* BAE050 80240710 0C00A7B5 */ jal dist2D -/* BAE054 80240714 468073A0 */ cvt.s.w $f14, $f14 -/* BAE058 80240718 C6020018 */ lwc1 $f2, 0x18($s0) -/* BAE05C 8024071C 4600103C */ c.lt.s $f2, $f0 -/* BAE060 80240720 00000000 */ nop -/* BAE064 80240724 4500000D */ bc1f .L8024075C -/* BAE068 80240728 E7A00034 */ swc1 $f0, 0x34($sp) -/* BAE06C 8024072C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BAE070 80240730 8E2200D0 */ lw $v0, 0xd0($s1) -/* BAE074 80240734 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BAE078 80240738 C4480000 */ lwc1 $f8, ($v0) -/* BAE07C 8024073C 46804220 */ cvt.s.w $f8, $f8 -/* BAE080 80240740 44064000 */ mfc1 $a2, $f8 -/* BAE084 80240744 C4480008 */ lwc1 $f8, 8($v0) -/* BAE088 80240748 46804220 */ cvt.s.w $f8, $f8 -/* BAE08C 8024074C 44074000 */ mfc1 $a3, $f8 -/* BAE090 80240750 0C00A720 */ jal atan2 -/* BAE094 80240754 24140001 */ addiu $s4, $zero, 1 -/* BAE098 80240758 E600000C */ swc1 $f0, 0xc($s0) -.L8024075C: -/* BAE09C 8024075C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BAE0A0 80240760 8C43000C */ lw $v1, 0xc($v0) -/* BAE0A4 80240764 8C420010 */ lw $v0, 0x10($v0) -/* BAE0A8 80240768 00621825 */ or $v1, $v1, $v0 -/* BAE0AC 8024076C 00741825 */ or $v1, $v1, $s4 -/* BAE0B0 80240770 10600008 */ beqz $v1, .L80240794 -/* BAE0B4 80240774 00000000 */ nop -/* BAE0B8 80240778 8602008C */ lh $v0, 0x8c($s0) -/* BAE0BC 8024077C 14400031 */ bnez $v0, .L80240844 -/* BAE0C0 80240780 00000000 */ nop -/* BAE0C4 80240784 8E050018 */ lw $a1, 0x18($s0) -/* BAE0C8 80240788 8E06000C */ lw $a2, 0xc($s0) -/* BAE0CC 8024078C 0C00EA95 */ jal npc_move_heading -/* BAE0D0 80240790 0200202D */ daddu $a0, $s0, $zero -.L80240794: -/* BAE0D4 80240794 C600003C */ lwc1 $f0, 0x3c($s0) -/* BAE0D8 80240798 3C014059 */ lui $at, 0x4059 -/* BAE0DC 8024079C 44811800 */ mtc1 $at, $f3 -/* BAE0E0 802407A0 44801000 */ mtc1 $zero, $f2 -/* BAE0E4 802407A4 46000021 */ cvt.d.s $f0, $f0 -/* BAE0E8 802407A8 46220002 */ mul.d $f0, $f0, $f2 -/* BAE0EC 802407AC 00000000 */ nop -/* BAE0F0 802407B0 4620020D */ trunc.w.d $f8, $f0 -/* BAE0F4 802407B4 E628007C */ swc1 $f8, 0x7c($s1) -/* BAE0F8 802407B8 8E420004 */ lw $v0, 4($s2) -/* BAE0FC 802407BC 18400021 */ blez $v0, .L80240844 -/* BAE100 802407C0 00000000 */ nop -/* BAE104 802407C4 8602008E */ lh $v0, 0x8e($s0) -/* BAE108 802407C8 9603008E */ lhu $v1, 0x8e($s0) -/* BAE10C 802407CC 18400005 */ blez $v0, .L802407E4 -/* BAE110 802407D0 2462FFFF */ addiu $v0, $v1, -1 -/* BAE114 802407D4 A602008E */ sh $v0, 0x8e($s0) -/* BAE118 802407D8 00021400 */ sll $v0, $v0, 0x10 -/* BAE11C 802407DC 1C400019 */ bgtz $v0, .L80240844 -/* BAE120 802407E0 00000000 */ nop -.L802407E4: -/* BAE124 802407E4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BAE128 802407E8 24020002 */ addiu $v0, $zero, 2 -/* BAE12C 802407EC 0C00A67F */ jal rand_int -/* BAE130 802407F0 AE620070 */ sw $v0, 0x70($s3) -/* BAE134 802407F4 3C035555 */ lui $v1, 0x5555 -/* BAE138 802407F8 34635556 */ ori $v1, $v1, 0x5556 -/* BAE13C 802407FC 00430018 */ mult $v0, $v1 -/* BAE140 80240800 000227C3 */ sra $a0, $v0, 0x1f -/* BAE144 80240804 00004010 */ mfhi $t0 -/* BAE148 80240808 01042023 */ subu $a0, $t0, $a0 -/* BAE14C 8024080C 00041840 */ sll $v1, $a0, 1 -/* BAE150 80240810 00641821 */ addu $v1, $v1, $a0 -/* BAE154 80240814 00431023 */ subu $v0, $v0, $v1 -/* BAE158 80240818 24430002 */ addiu $v1, $v0, 2 -/* BAE15C 8024081C AE630074 */ sw $v1, 0x74($s3) -/* BAE160 80240820 8E42002C */ lw $v0, 0x2c($s2) -/* BAE164 80240824 58400007 */ blezl $v0, .L80240844 -/* BAE168 80240828 AE600070 */ sw $zero, 0x70($s3) -/* BAE16C 8024082C 8E420008 */ lw $v0, 8($s2) -/* BAE170 80240830 18400003 */ blez $v0, .L80240840 -/* BAE174 80240834 28620003 */ slti $v0, $v1, 3 -/* BAE178 80240838 10400002 */ beqz $v0, .L80240844 -/* BAE17C 8024083C 00000000 */ nop -.L80240840: -/* BAE180 80240840 AE600070 */ sw $zero, 0x70($s3) -.L80240844: -/* BAE184 80240844 8FBF0058 */ lw $ra, 0x58($sp) -/* BAE188 80240848 8FB50054 */ lw $s5, 0x54($sp) -/* BAE18C 8024084C 8FB40050 */ lw $s4, 0x50($sp) -/* BAE190 80240850 8FB3004C */ lw $s3, 0x4c($sp) -/* BAE194 80240854 8FB20048 */ lw $s2, 0x48($sp) -/* BAE198 80240858 8FB10044 */ lw $s1, 0x44($sp) -/* BAE19C 8024085C 8FB00040 */ lw $s0, 0x40($sp) -/* BAE1A0 80240860 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* BAE1A4 80240864 D7B80070 */ ldc1 $f24, 0x70($sp) -/* BAE1A8 80240868 D7B60068 */ ldc1 $f22, 0x68($sp) -/* BAE1AC 8024086C D7B40060 */ ldc1 $f20, 0x60($sp) -/* BAE1B0 80240870 03E00008 */ jr $ra -/* BAE1B4 80240874 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_mim/mim_08/func_80240878_BAD940.s b/asm/nonmatchings/world/area_mim/mim_08/func_80240878_BAD940.s deleted file mode 100644 index 99da355b0f..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/func_80240878_BAD940.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240878_BAE1B8 -/* BAE1B8 80240878 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BAE1BC 8024087C AFB3001C */ sw $s3, 0x1c($sp) -/* BAE1C0 80240880 0080982D */ daddu $s3, $a0, $zero -/* BAE1C4 80240884 AFBF0020 */ sw $ra, 0x20($sp) -/* BAE1C8 80240888 AFB20018 */ sw $s2, 0x18($sp) -/* BAE1CC 8024088C AFB10014 */ sw $s1, 0x14($sp) -/* BAE1D0 80240890 AFB00010 */ sw $s0, 0x10($sp) -/* BAE1D4 80240894 8E720148 */ lw $s2, 0x148($s3) -/* BAE1D8 80240898 86440008 */ lh $a0, 8($s2) -/* BAE1DC 8024089C 0C00EABB */ jal get_npc_unsafe -/* BAE1E0 802408A0 00A0882D */ daddu $s1, $a1, $zero -/* BAE1E4 802408A4 8E240008 */ lw $a0, 8($s1) -/* BAE1E8 802408A8 0040802D */ daddu $s0, $v0, $zero -/* BAE1EC 802408AC 00041FC2 */ srl $v1, $a0, 0x1f -/* BAE1F0 802408B0 00832021 */ addu $a0, $a0, $v1 -/* BAE1F4 802408B4 00042043 */ sra $a0, $a0, 1 -/* BAE1F8 802408B8 0C00A67F */ jal rand_int -/* BAE1FC 802408BC 24840001 */ addiu $a0, $a0, 1 -/* BAE200 802408C0 8E230008 */ lw $v1, 8($s1) -/* BAE204 802408C4 240400B4 */ addiu $a0, $zero, 0xb4 -/* BAE208 802408C8 00032FC2 */ srl $a1, $v1, 0x1f -/* BAE20C 802408CC 00651821 */ addu $v1, $v1, $a1 -/* BAE210 802408D0 00031843 */ sra $v1, $v1, 1 -/* BAE214 802408D4 00621821 */ addu $v1, $v1, $v0 -/* BAE218 802408D8 0C00A67F */ jal rand_int -/* BAE21C 802408DC A603008E */ sh $v1, 0x8e($s0) -/* BAE220 802408E0 C60C000C */ lwc1 $f12, 0xc($s0) -/* BAE224 802408E4 44820000 */ mtc1 $v0, $f0 -/* BAE228 802408E8 00000000 */ nop -/* BAE22C 802408EC 46800020 */ cvt.s.w $f0, $f0 -/* BAE230 802408F0 46006300 */ add.s $f12, $f12, $f0 -/* BAE234 802408F4 3C0142B4 */ lui $at, 0x42b4 -/* BAE238 802408F8 44810000 */ mtc1 $at, $f0 -/* BAE23C 802408FC 0C00A6C9 */ jal clamp_angle -/* BAE240 80240900 46006301 */ sub.s $f12, $f12, $f0 -/* BAE244 80240904 E600000C */ swc1 $f0, 0xc($s0) -/* BAE248 80240908 8E4200CC */ lw $v0, 0xcc($s2) -/* BAE24C 8024090C 8C420000 */ lw $v0, ($v0) -/* BAE250 80240910 AE020028 */ sw $v0, 0x28($s0) -/* BAE254 80240914 24020003 */ addiu $v0, $zero, 3 -/* BAE258 80240918 AE620070 */ sw $v0, 0x70($s3) -/* BAE25C 8024091C 8FBF0020 */ lw $ra, 0x20($sp) -/* BAE260 80240920 8FB3001C */ lw $s3, 0x1c($sp) -/* BAE264 80240924 8FB20018 */ lw $s2, 0x18($sp) -/* BAE268 80240928 8FB10014 */ lw $s1, 0x14($sp) -/* BAE26C 8024092C 8FB00010 */ lw $s0, 0x10($sp) -/* BAE270 80240930 03E00008 */ jr $ra -/* BAE274 80240934 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_08/func_80240938_BAD940.s b/asm/nonmatchings/world/area_mim/mim_08/func_80240938_BAD940.s deleted file mode 100644 index f9eedeb8c0..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/func_80240938_BAD940.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240938_BAE278 -/* BAE278 80240938 27BDFF88 */ addiu $sp, $sp, -0x78 -/* BAE27C 8024093C AFB3004C */ sw $s3, 0x4c($sp) -/* BAE280 80240940 0080982D */ daddu $s3, $a0, $zero -/* BAE284 80240944 AFBF0054 */ sw $ra, 0x54($sp) -/* BAE288 80240948 AFB40050 */ sw $s4, 0x50($sp) -/* BAE28C 8024094C AFB20048 */ sw $s2, 0x48($sp) -/* BAE290 80240950 AFB10044 */ sw $s1, 0x44($sp) -/* BAE294 80240954 AFB00040 */ sw $s0, 0x40($sp) -/* BAE298 80240958 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* BAE29C 8024095C F7B80068 */ sdc1 $f24, 0x68($sp) -/* BAE2A0 80240960 F7B60060 */ sdc1 $f22, 0x60($sp) -/* BAE2A4 80240964 F7B40058 */ sdc1 $f20, 0x58($sp) -/* BAE2A8 80240968 8E710148 */ lw $s1, 0x148($s3) -/* BAE2AC 8024096C 00A0902D */ daddu $s2, $a1, $zero -/* BAE2B0 80240970 86240008 */ lh $a0, 8($s1) -/* BAE2B4 80240974 0C00EABB */ jal get_npc_unsafe -/* BAE2B8 80240978 00C0A02D */ daddu $s4, $a2, $zero -/* BAE2BC 8024097C 0040802D */ daddu $s0, $v0, $zero -/* BAE2C0 80240980 C6200078 */ lwc1 $f0, 0x78($s1) -/* BAE2C4 80240984 46800020 */ cvt.s.w $f0, $f0 -/* BAE2C8 80240988 46000021 */ cvt.d.s $f0, $f0 -/* BAE2CC 8024098C 3C014059 */ lui $at, 0x4059 -/* BAE2D0 80240990 44811800 */ mtc1 $at, $f3 -/* BAE2D4 80240994 44801000 */ mtc1 $zero, $f2 -/* BAE2D8 80240998 8602008E */ lh $v0, 0x8e($s0) -/* BAE2DC 8024099C 9603008E */ lhu $v1, 0x8e($s0) -/* BAE2E0 802409A0 46220003 */ div.d $f0, $f0, $f2 -/* BAE2E4 802409A4 46200620 */ cvt.s.d $f24, $f0 -/* BAE2E8 802409A8 C6200088 */ lwc1 $f0, 0x88($s1) -/* BAE2EC 802409AC 46800020 */ cvt.s.w $f0, $f0 -/* BAE2F0 802409B0 46000021 */ cvt.d.s $f0, $f0 -/* BAE2F4 802409B4 46220003 */ div.d $f0, $f0, $f2 -/* BAE2F8 802409B8 46200020 */ cvt.s.d $f0, $f0 -/* BAE2FC 802409BC 18400003 */ blez $v0, .L802409CC -/* BAE300 802409C0 4600C680 */ add.s $f26, $f24, $f0 -/* BAE304 802409C4 2462FFFF */ addiu $v0, $v1, -1 -/* BAE308 802409C8 A602008E */ sh $v0, 0x8e($s0) -.L802409CC: -/* BAE30C 802409CC 8E220070 */ lw $v0, 0x70($s1) -/* BAE310 802409D0 18400034 */ blez $v0, .L80240AA4 -/* BAE314 802409D4 00000000 */ nop -/* BAE318 802409D8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* BAE31C 802409DC 46806320 */ cvt.s.w $f12, $f12 -/* BAE320 802409E0 44820000 */ mtc1 $v0, $f0 -/* BAE324 802409E4 00000000 */ nop -/* BAE328 802409E8 46800020 */ cvt.s.w $f0, $f0 -/* BAE32C 802409EC 46000021 */ cvt.d.s $f0, $f0 -/* BAE330 802409F0 46220003 */ div.d $f0, $f0, $f2 -/* BAE334 802409F4 0C00A8BB */ jal sin_deg -/* BAE338 802409F8 462005A0 */ cvt.s.d $f22, $f0 -/* BAE33C 802409FC 8E020000 */ lw $v0, ($s0) -/* BAE340 80240A00 30420008 */ andi $v0, $v0, 8 -/* BAE344 80240A04 10400003 */ beqz $v0, .L80240A14 -/* BAE348 80240A08 46000506 */ mov.s $f20, $f0 -/* BAE34C 80240A0C 08090295 */ j .L80240A54 -/* BAE350 80240A10 0000102D */ daddu $v0, $zero, $zero -.L80240A14: -/* BAE354 80240A14 27A50028 */ addiu $a1, $sp, 0x28 -/* BAE358 80240A18 27A6002C */ addiu $a2, $sp, 0x2c -/* BAE35C 80240A1C C6000038 */ lwc1 $f0, 0x38($s0) -/* BAE360 80240A20 C602003C */ lwc1 $f2, 0x3c($s0) -/* BAE364 80240A24 C6040040 */ lwc1 $f4, 0x40($s0) -/* BAE368 80240A28 3C01447A */ lui $at, 0x447a -/* BAE36C 80240A2C 44813000 */ mtc1 $at, $f6 -/* BAE370 80240A30 27A20034 */ addiu $v0, $sp, 0x34 -/* BAE374 80240A34 E7A00028 */ swc1 $f0, 0x28($sp) -/* BAE378 80240A38 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BAE37C 80240A3C E7A40030 */ swc1 $f4, 0x30($sp) -/* BAE380 80240A40 E7A60034 */ swc1 $f6, 0x34($sp) -/* BAE384 80240A44 AFA20010 */ sw $v0, 0x10($sp) -/* BAE388 80240A48 8E040080 */ lw $a0, 0x80($s0) -/* BAE38C 80240A4C 0C0372DF */ jal func_800DCB7C -/* BAE390 80240A50 27A70030 */ addiu $a3, $sp, 0x30 -.L80240A54: -/* BAE394 80240A54 10400007 */ beqz $v0, .L80240A74 -/* BAE398 80240A58 00000000 */ nop -/* BAE39C 80240A5C 4616A082 */ mul.s $f2, $f20, $f22 -/* BAE3A0 80240A60 00000000 */ nop -/* BAE3A4 80240A64 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BAE3A8 80240A68 46180000 */ add.s $f0, $f0, $f24 -/* BAE3AC 80240A6C 080902A0 */ j .L80240A80 -/* BAE3B0 80240A70 46020000 */ add.s $f0, $f0, $f2 -.L80240A74: -/* BAE3B4 80240A74 4616A002 */ mul.s $f0, $f20, $f22 -/* BAE3B8 80240A78 00000000 */ nop -/* BAE3BC 80240A7C 4600D000 */ add.s $f0, $f26, $f0 -.L80240A80: -/* BAE3C0 80240A80 E600003C */ swc1 $f0, 0x3c($s0) -/* BAE3C4 80240A84 8E220074 */ lw $v0, 0x74($s1) -/* BAE3C8 80240A88 2442000A */ addiu $v0, $v0, 0xa -/* BAE3CC 80240A8C 44826000 */ mtc1 $v0, $f12 -/* BAE3D0 80240A90 00000000 */ nop -/* BAE3D4 80240A94 0C00A6C9 */ jal clamp_angle -/* BAE3D8 80240A98 46806320 */ cvt.s.w $f12, $f12 -/* BAE3DC 80240A9C 4600020D */ trunc.w.s $f8, $f0 -/* BAE3E0 80240AA0 E6280074 */ swc1 $f8, 0x74($s1) -.L80240AA4: -/* BAE3E4 80240AA4 8E220090 */ lw $v0, 0x90($s1) -/* BAE3E8 80240AA8 1C400040 */ bgtz $v0, .L80240BAC -/* BAE3EC 80240AAC 2442FFFF */ addiu $v0, $v0, -1 -/* BAE3F0 80240AB0 860200A8 */ lh $v0, 0xa8($s0) -/* BAE3F4 80240AB4 C600003C */ lwc1 $f0, 0x3c($s0) -/* BAE3F8 80240AB8 44821000 */ mtc1 $v0, $f2 -/* BAE3FC 80240ABC 00000000 */ nop -/* BAE400 80240AC0 468010A0 */ cvt.s.w $f2, $f2 -/* BAE404 80240AC4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BAE408 80240AC8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BAE40C 80240ACC 46020000 */ add.s $f0, $f0, $f2 -/* BAE410 80240AD0 3C014024 */ lui $at, 0x4024 -/* BAE414 80240AD4 44812800 */ mtc1 $at, $f5 -/* BAE418 80240AD8 44802000 */ mtc1 $zero, $f4 -/* BAE41C 80240ADC C442002C */ lwc1 $f2, 0x2c($v0) -/* BAE420 80240AE0 46000021 */ cvt.d.s $f0, $f0 -/* BAE424 80240AE4 46240000 */ add.d $f0, $f0, $f4 -/* BAE428 80240AE8 460010A1 */ cvt.d.s $f2, $f2 -/* BAE42C 80240AEC 4620103C */ c.lt.d $f2, $f0 -/* BAE430 80240AF0 00000000 */ nop -/* BAE434 80240AF4 4500002E */ bc1f .L80240BB0 -/* BAE438 80240AF8 0280202D */ daddu $a0, $s4, $zero -/* BAE43C 80240AFC 24020001 */ addiu $v0, $zero, 1 -/* BAE440 80240B00 AFA20010 */ sw $v0, 0x10($sp) -/* BAE444 80240B04 8E460024 */ lw $a2, 0x24($s2) -/* BAE448 80240B08 8E470028 */ lw $a3, 0x28($s2) -/* BAE44C 80240B0C 0C01242D */ jal func_800490B4 -/* BAE450 80240B10 0220282D */ daddu $a1, $s1, $zero -/* BAE454 80240B14 10400026 */ beqz $v0, .L80240BB0 -/* BAE458 80240B18 0000202D */ daddu $a0, $zero, $zero -/* BAE45C 80240B1C 0200282D */ daddu $a1, $s0, $zero -/* BAE460 80240B20 0000302D */ daddu $a2, $zero, $zero -/* BAE464 80240B24 2412000C */ addiu $s2, $zero, 0xc -/* BAE468 80240B28 860300A8 */ lh $v1, 0xa8($s0) -/* BAE46C 80240B2C 3C013F80 */ lui $at, 0x3f80 -/* BAE470 80240B30 44810000 */ mtc1 $at, $f0 -/* BAE474 80240B34 3C014000 */ lui $at, 0x4000 -/* BAE478 80240B38 44811000 */ mtc1 $at, $f2 -/* BAE47C 80240B3C 3C01C1A0 */ lui $at, 0xc1a0 -/* BAE480 80240B40 44812000 */ mtc1 $at, $f4 -/* BAE484 80240B44 44834000 */ mtc1 $v1, $f8 -/* BAE488 80240B48 00000000 */ nop -/* BAE48C 80240B4C 46804220 */ cvt.s.w $f8, $f8 -/* BAE490 80240B50 44074000 */ mfc1 $a3, $f8 -/* BAE494 80240B54 27A20038 */ addiu $v0, $sp, 0x38 -/* BAE498 80240B58 AFB2001C */ sw $s2, 0x1c($sp) -/* BAE49C 80240B5C AFA20020 */ sw $v0, 0x20($sp) -/* BAE4A0 80240B60 E7A00010 */ swc1 $f0, 0x10($sp) -/* BAE4A4 80240B64 E7A20014 */ swc1 $f2, 0x14($sp) -/* BAE4A8 80240B68 0C01BFA4 */ jal fx_emote -/* BAE4AC 80240B6C E7A40018 */ swc1 $f4, 0x18($sp) -/* BAE4B0 80240B70 0200202D */ daddu $a0, $s0, $zero -/* BAE4B4 80240B74 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BAE4B8 80240B78 C480003C */ lwc1 $f0, 0x3c($a0) -/* BAE4BC 80240B7C 3C060020 */ lui $a2, 0x20 -/* BAE4C0 80240B80 0C012530 */ jal func_800494C0 -/* BAE4C4 80240B84 E4800064 */ swc1 $f0, 0x64($a0) -/* BAE4C8 80240B88 8E220018 */ lw $v0, 0x18($s1) -/* BAE4CC 80240B8C 9442002A */ lhu $v0, 0x2a($v0) -/* BAE4D0 80240B90 30420001 */ andi $v0, $v0, 1 -/* BAE4D4 80240B94 10400003 */ beqz $v0, .L80240BA4 -/* BAE4D8 80240B98 2402000A */ addiu $v0, $zero, 0xa -/* BAE4DC 80240B9C 08090313 */ j .L80240C4C -/* BAE4E0 80240BA0 AE620070 */ sw $v0, 0x70($s3) -.L80240BA4: -/* BAE4E4 80240BA4 08090313 */ j .L80240C4C -/* BAE4E8 80240BA8 AE720070 */ sw $s2, 0x70($s3) -.L80240BAC: -/* BAE4EC 80240BAC AE220090 */ sw $v0, 0x90($s1) -.L80240BB0: -/* BAE4F0 80240BB0 8602008C */ lh $v0, 0x8c($s0) -/* BAE4F4 80240BB4 14400025 */ bnez $v0, .L80240C4C -/* BAE4F8 80240BB8 00000000 */ nop -/* BAE4FC 80240BBC 8602008E */ lh $v0, 0x8e($s0) -/* BAE500 80240BC0 1C400022 */ bgtz $v0, .L80240C4C -/* BAE504 80240BC4 00000000 */ nop -/* BAE508 80240BC8 8E620074 */ lw $v0, 0x74($s3) -/* BAE50C 80240BCC 2442FFFF */ addiu $v0, $v0, -1 -/* BAE510 80240BD0 1840001D */ blez $v0, .L80240C48 -/* BAE514 80240BD4 AE620074 */ sw $v0, 0x74($s3) -/* BAE518 80240BD8 8E220018 */ lw $v0, 0x18($s1) -/* BAE51C 80240BDC 9442002A */ lhu $v0, 0x2a($v0) -/* BAE520 80240BE0 30420010 */ andi $v0, $v0, 0x10 -/* BAE524 80240BE4 14400007 */ bnez $v0, .L80240C04 -/* BAE528 80240BE8 00000000 */ nop -/* BAE52C 80240BEC C600000C */ lwc1 $f0, 0xc($s0) -/* BAE530 80240BF0 3C014334 */ lui $at, 0x4334 -/* BAE534 80240BF4 44816000 */ mtc1 $at, $f12 -/* BAE538 80240BF8 0C00A6C9 */ jal clamp_angle -/* BAE53C 80240BFC 460C0300 */ add.s $f12, $f0, $f12 -/* BAE540 80240C00 E600000C */ swc1 $f0, 0xc($s0) -.L80240C04: -/* BAE544 80240C04 0C00A67F */ jal rand_int -/* BAE548 80240C08 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BAE54C 80240C0C 3C032E8B */ lui $v1, 0x2e8b -/* BAE550 80240C10 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* BAE554 80240C14 00430018 */ mult $v0, $v1 -/* BAE558 80240C18 00021FC3 */ sra $v1, $v0, 0x1f -/* BAE55C 80240C1C 00004010 */ mfhi $t0 -/* BAE560 80240C20 00082043 */ sra $a0, $t0, 1 -/* BAE564 80240C24 00832023 */ subu $a0, $a0, $v1 -/* BAE568 80240C28 00041840 */ sll $v1, $a0, 1 -/* BAE56C 80240C2C 00641821 */ addu $v1, $v1, $a0 -/* BAE570 80240C30 00031880 */ sll $v1, $v1, 2 -/* BAE574 80240C34 00641823 */ subu $v1, $v1, $a0 -/* BAE578 80240C38 00431023 */ subu $v0, $v0, $v1 -/* BAE57C 80240C3C 24420005 */ addiu $v0, $v0, 5 -/* BAE580 80240C40 08090313 */ j .L80240C4C -/* BAE584 80240C44 A602008E */ sh $v0, 0x8e($s0) -.L80240C48: -/* BAE588 80240C48 AE600070 */ sw $zero, 0x70($s3) -.L80240C4C: -/* BAE58C 80240C4C 8FBF0054 */ lw $ra, 0x54($sp) -/* BAE590 80240C50 8FB40050 */ lw $s4, 0x50($sp) -/* BAE594 80240C54 8FB3004C */ lw $s3, 0x4c($sp) -/* BAE598 80240C58 8FB20048 */ lw $s2, 0x48($sp) -/* BAE59C 80240C5C 8FB10044 */ lw $s1, 0x44($sp) -/* BAE5A0 80240C60 8FB00040 */ lw $s0, 0x40($sp) -/* BAE5A4 80240C64 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* BAE5A8 80240C68 D7B80068 */ ldc1 $f24, 0x68($sp) -/* BAE5AC 80240C6C D7B60060 */ ldc1 $f22, 0x60($sp) -/* BAE5B0 80240C70 D7B40058 */ ldc1 $f20, 0x58($sp) -/* BAE5B4 80240C74 03E00008 */ jr $ra -/* BAE5B8 80240C78 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_mim/mim_08/func_80240CF4_BAD940.s b/asm/nonmatchings/world/area_mim/mim_08/func_80240CF4_BAD940.s deleted file mode 100644 index 993dba914a..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/func_80240CF4_BAD940.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CF4_BAE634 -/* BAE634 80240CF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BAE638 80240CF8 AFB00010 */ sw $s0, 0x10($sp) -/* BAE63C 80240CFC 0080802D */ daddu $s0, $a0, $zero -/* BAE640 80240D00 AFBF0014 */ sw $ra, 0x14($sp) -/* BAE644 80240D04 8E020148 */ lw $v0, 0x148($s0) -/* BAE648 80240D08 0C00EABB */ jal get_npc_unsafe -/* BAE64C 80240D0C 84440008 */ lh $a0, 8($v0) -/* BAE650 80240D10 9443008E */ lhu $v1, 0x8e($v0) -/* BAE654 80240D14 C440003C */ lwc1 $f0, 0x3c($v0) -/* BAE658 80240D18 24640001 */ addiu $a0, $v1, 1 -/* BAE65C 80240D1C 00031C00 */ sll $v1, $v1, 0x10 -/* BAE660 80240D20 00031B83 */ sra $v1, $v1, 0xe -/* BAE664 80240D24 A444008E */ sh $a0, 0x8e($v0) -/* BAE668 80240D28 3C018024 */ lui $at, 0x8024 -/* BAE66C 80240D2C 00230821 */ addu $at, $at, $v1 -/* BAE670 80240D30 C42243C0 */ lwc1 $f2, 0x43c0($at) -/* BAE674 80240D34 8443008E */ lh $v1, 0x8e($v0) -/* BAE678 80240D38 46020000 */ add.s $f0, $f0, $f2 -/* BAE67C 80240D3C 28630005 */ slti $v1, $v1, 5 -/* BAE680 80240D40 14600003 */ bnez $v1, .L80240D50 -/* BAE684 80240D44 E440003C */ swc1 $f0, 0x3c($v0) -/* BAE688 80240D48 2402000C */ addiu $v0, $zero, 0xc -/* BAE68C 80240D4C AE020070 */ sw $v0, 0x70($s0) -.L80240D50: -/* BAE690 80240D50 8FBF0014 */ lw $ra, 0x14($sp) -/* BAE694 80240D54 8FB00010 */ lw $s0, 0x10($sp) -/* BAE698 80240D58 03E00008 */ jr $ra -/* BAE69C 80240D5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_08/func_80240D60_BAD940.s b/asm/nonmatchings/world/area_mim/mim_08/func_80240D60_BAD940.s deleted file mode 100644 index c7ba2b6760..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/func_80240D60_BAD940.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D60_BAE6A0 -/* BAE6A0 80240D60 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BAE6A4 80240D64 AFB3001C */ sw $s3, 0x1c($sp) -/* BAE6A8 80240D68 0080982D */ daddu $s3, $a0, $zero -/* BAE6AC 80240D6C AFBF0020 */ sw $ra, 0x20($sp) -/* BAE6B0 80240D70 AFB20018 */ sw $s2, 0x18($sp) -/* BAE6B4 80240D74 AFB10014 */ sw $s1, 0x14($sp) -/* BAE6B8 80240D78 AFB00010 */ sw $s0, 0x10($sp) -/* BAE6BC 80240D7C 8E720148 */ lw $s2, 0x148($s3) -/* BAE6C0 80240D80 86440008 */ lh $a0, 8($s2) -/* BAE6C4 80240D84 0C00EABB */ jal get_npc_unsafe -/* BAE6C8 80240D88 00A0802D */ daddu $s0, $a1, $zero -/* BAE6CC 80240D8C 0040882D */ daddu $s1, $v0, $zero -/* BAE6D0 80240D90 C6420080 */ lwc1 $f2, 0x80($s2) -/* BAE6D4 80240D94 468010A0 */ cvt.s.w $f2, $f2 -/* BAE6D8 80240D98 460010A1 */ cvt.d.s $f2, $f2 -/* BAE6DC 80240D9C C6400084 */ lwc1 $f0, 0x84($s2) -/* BAE6E0 80240DA0 46800020 */ cvt.s.w $f0, $f0 -/* BAE6E4 80240DA4 46000021 */ cvt.d.s $f0, $f0 -/* BAE6E8 80240DA8 3C014059 */ lui $at, 0x4059 -/* BAE6EC 80240DAC 44812800 */ mtc1 $at, $f5 -/* BAE6F0 80240DB0 44802000 */ mtc1 $zero, $f4 -/* BAE6F4 80240DB4 8E4200CC */ lw $v0, 0xcc($s2) -/* BAE6F8 80240DB8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BAE6FC 80240DBC C62E0040 */ lwc1 $f14, 0x40($s1) -/* BAE700 80240DC0 46241083 */ div.d $f2, $f2, $f4 -/* BAE704 80240DC4 462010A0 */ cvt.s.d $f2, $f2 -/* BAE708 80240DC8 46240003 */ div.d $f0, $f0, $f4 -/* BAE70C 80240DCC 8C420020 */ lw $v0, 0x20($v0) -/* BAE710 80240DD0 46200020 */ cvt.s.d $f0, $f0 -/* BAE714 80240DD4 E622001C */ swc1 $f2, 0x1c($s1) -/* BAE718 80240DD8 E6200014 */ swc1 $f0, 0x14($s1) -/* BAE71C 80240DDC AE220028 */ sw $v0, 0x28($s1) -/* BAE720 80240DE0 C6000018 */ lwc1 $f0, 0x18($s0) -/* BAE724 80240DE4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BAE728 80240DE8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BAE72C 80240DEC E6200018 */ swc1 $f0, 0x18($s1) -/* BAE730 80240DF0 8C460028 */ lw $a2, 0x28($v0) -/* BAE734 80240DF4 0C00A720 */ jal atan2 -/* BAE738 80240DF8 8C470030 */ lw $a3, 0x30($v0) -/* BAE73C 80240DFC E620000C */ swc1 $f0, 0xc($s1) -/* BAE740 80240E00 8E420018 */ lw $v0, 0x18($s2) -/* BAE744 80240E04 AE400074 */ sw $zero, 0x74($s2) -/* BAE748 80240E08 9442002A */ lhu $v0, 0x2a($v0) -/* BAE74C 80240E0C 30420002 */ andi $v0, $v0, 2 -/* BAE750 80240E10 10400005 */ beqz $v0, .L80240E28 -/* BAE754 80240E14 24020003 */ addiu $v0, $zero, 3 -/* BAE758 80240E18 A622008E */ sh $v0, 0x8e($s1) -/* BAE75C 80240E1C 2402000D */ addiu $v0, $zero, 0xd -/* BAE760 80240E20 0809039E */ j .L80240E78 -/* BAE764 80240E24 AE620070 */ sw $v0, 0x70($s3) -.L80240E28: -/* BAE768 80240E28 24030001 */ addiu $v1, $zero, 1 -/* BAE76C 80240E2C 2402000E */ addiu $v0, $zero, 0xe -/* BAE770 80240E30 A623008E */ sh $v1, 0x8e($s1) -/* BAE774 80240E34 AE620070 */ sw $v0, 0x70($s3) -/* BAE778 80240E38 C6200038 */ lwc1 $f0, 0x38($s1) -/* BAE77C 80240E3C 4600018D */ trunc.w.s $f6, $f0 -/* BAE780 80240E40 44023000 */ mfc1 $v0, $f6 -/* BAE784 80240E44 00000000 */ nop -/* BAE788 80240E48 A6420010 */ sh $v0, 0x10($s2) -/* BAE78C 80240E4C C620003C */ lwc1 $f0, 0x3c($s1) -/* BAE790 80240E50 4600018D */ trunc.w.s $f6, $f0 -/* BAE794 80240E54 44023000 */ mfc1 $v0, $f6 -/* BAE798 80240E58 00000000 */ nop -/* BAE79C 80240E5C A6420012 */ sh $v0, 0x12($s2) -/* BAE7A0 80240E60 C6200040 */ lwc1 $f0, 0x40($s1) -/* BAE7A4 80240E64 A2430007 */ sb $v1, 7($s2) -/* BAE7A8 80240E68 4600018D */ trunc.w.s $f6, $f0 -/* BAE7AC 80240E6C 44023000 */ mfc1 $v0, $f6 -/* BAE7B0 80240E70 00000000 */ nop -/* BAE7B4 80240E74 A6420014 */ sh $v0, 0x14($s2) -.L80240E78: -/* BAE7B8 80240E78 8FBF0020 */ lw $ra, 0x20($sp) -/* BAE7BC 80240E7C 8FB3001C */ lw $s3, 0x1c($sp) -/* BAE7C0 80240E80 8FB20018 */ lw $s2, 0x18($sp) -/* BAE7C4 80240E84 8FB10014 */ lw $s1, 0x14($sp) -/* BAE7C8 80240E88 8FB00010 */ lw $s0, 0x10($sp) -/* BAE7CC 80240E8C 03E00008 */ jr $ra -/* BAE7D0 80240E90 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_08/func_80240E94_BAD940.s b/asm/nonmatchings/world/area_mim/mim_08/func_80240E94_BAD940.s deleted file mode 100644 index a9726ca891..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/func_80240E94_BAD940.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E94_BAE7D4 -/* BAE7D4 80240E94 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BAE7D8 80240E98 AFB00010 */ sw $s0, 0x10($sp) -/* BAE7DC 80240E9C 0080802D */ daddu $s0, $a0, $zero -/* BAE7E0 80240EA0 AFBF0014 */ sw $ra, 0x14($sp) -/* BAE7E4 80240EA4 8E020148 */ lw $v0, 0x148($s0) -/* BAE7E8 80240EA8 0C00EABB */ jal get_npc_unsafe -/* BAE7EC 80240EAC 84440008 */ lh $a0, 8($v0) -/* BAE7F0 80240EB0 0040202D */ daddu $a0, $v0, $zero -/* BAE7F4 80240EB4 8482008E */ lh $v0, 0x8e($a0) -/* BAE7F8 80240EB8 9483008E */ lhu $v1, 0x8e($a0) -/* BAE7FC 80240EBC 18400005 */ blez $v0, .L80240ED4 -/* BAE800 80240EC0 2462FFFF */ addiu $v0, $v1, -1 -/* BAE804 80240EC4 A482008E */ sh $v0, 0x8e($a0) -/* BAE808 80240EC8 00021400 */ sll $v0, $v0, 0x10 -/* BAE80C 80240ECC 1C400006 */ bgtz $v0, .L80240EE8 -/* BAE810 80240ED0 00000000 */ nop -.L80240ED4: -/* BAE814 80240ED4 8482008C */ lh $v0, 0x8c($a0) -/* BAE818 80240ED8 14400003 */ bnez $v0, .L80240EE8 -/* BAE81C 80240EDC 2402000E */ addiu $v0, $zero, 0xe -/* BAE820 80240EE0 A480008E */ sh $zero, 0x8e($a0) -/* BAE824 80240EE4 AE020070 */ sw $v0, 0x70($s0) -.L80240EE8: -/* BAE828 80240EE8 8FBF0014 */ lw $ra, 0x14($sp) -/* BAE82C 80240EEC 8FB00010 */ lw $s0, 0x10($sp) -/* BAE830 80240EF0 03E00008 */ jr $ra -/* BAE834 80240EF4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_08/func_8024174C_BAD940.s b/asm/nonmatchings/world/area_mim/mim_08/func_8024174C_BAD940.s deleted file mode 100644 index 63d23c353d..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/func_8024174C_BAD940.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024174C_BAF08C -/* BAF08C 8024174C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BAF090 80241750 AFB10014 */ sw $s1, 0x14($sp) -/* BAF094 80241754 0080882D */ daddu $s1, $a0, $zero -/* BAF098 80241758 AFBF0018 */ sw $ra, 0x18($sp) -/* BAF09C 8024175C AFB00010 */ sw $s0, 0x10($sp) -/* BAF0A0 80241760 8E300148 */ lw $s0, 0x148($s1) -/* BAF0A4 80241764 0C00EABB */ jal get_npc_unsafe -/* BAF0A8 80241768 86040008 */ lh $a0, 8($s0) -/* BAF0AC 8024176C 9443008E */ lhu $v1, 0x8e($v0) -/* BAF0B0 80241770 2463FFFF */ addiu $v1, $v1, -1 -/* BAF0B4 80241774 A443008E */ sh $v1, 0x8e($v0) -/* BAF0B8 80241778 00031C00 */ sll $v1, $v1, 0x10 -/* BAF0BC 8024177C 1C600003 */ bgtz $v1, .L8024178C -/* BAF0C0 80241780 2402000C */ addiu $v0, $zero, 0xc -/* BAF0C4 80241784 AE00006C */ sw $zero, 0x6c($s0) -/* BAF0C8 80241788 AE220070 */ sw $v0, 0x70($s1) -.L8024178C: -/* BAF0CC 8024178C 8FBF0018 */ lw $ra, 0x18($sp) -/* BAF0D0 80241790 8FB10014 */ lw $s1, 0x14($sp) -/* BAF0D4 80241794 8FB00010 */ lw $s0, 0x10($sp) -/* BAF0D8 80241798 03E00008 */ jr $ra -/* BAF0DC 8024179C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_08/func_802417A0_BAD940.s b/asm/nonmatchings/world/area_mim/mim_08/func_802417A0_BAD940.s deleted file mode 100644 index c79b72ac73..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/func_802417A0_BAD940.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417A0_BAF0E0 -/* BAF0E0 802417A0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BAF0E4 802417A4 AFBF0024 */ sw $ra, 0x24($sp) -/* BAF0E8 802417A8 AFB40020 */ sw $s4, 0x20($sp) -/* BAF0EC 802417AC AFB3001C */ sw $s3, 0x1c($sp) -/* BAF0F0 802417B0 AFB20018 */ sw $s2, 0x18($sp) -/* BAF0F4 802417B4 AFB10014 */ sw $s1, 0x14($sp) -/* BAF0F8 802417B8 AFB00010 */ sw $s0, 0x10($sp) -/* BAF0FC 802417BC F7B40028 */ sdc1 $f20, 0x28($sp) -/* BAF100 802417C0 8C900148 */ lw $s0, 0x148($a0) -/* BAF104 802417C4 86040008 */ lh $a0, 8($s0) -/* BAF108 802417C8 0C00EABB */ jal get_npc_unsafe -/* BAF10C 802417CC 24110001 */ addiu $s1, $zero, 1 -/* BAF110 802417D0 86040008 */ lh $a0, 8($s0) -/* BAF114 802417D4 0040802D */ daddu $s0, $v0, $zero -/* BAF118 802417D8 3C05800B */ lui $a1, %hi(gCameras) -/* BAF11C 802417DC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* BAF120 802417E0 3C03800A */ lui $v1, 0x800a -/* BAF124 802417E4 8463A634 */ lh $v1, -0x59cc($v1) -/* BAF128 802417E8 00912021 */ addu $a0, $a0, $s1 -/* BAF12C 802417EC 00031080 */ sll $v0, $v1, 2 -/* BAF130 802417F0 00431021 */ addu $v0, $v0, $v1 -/* BAF134 802417F4 00021080 */ sll $v0, $v0, 2 -/* BAF138 802417F8 00431023 */ subu $v0, $v0, $v1 -/* BAF13C 802417FC 000218C0 */ sll $v1, $v0, 3 -/* BAF140 80241800 00431021 */ addu $v0, $v0, $v1 -/* BAF144 80241804 000210C0 */ sll $v0, $v0, 3 -/* BAF148 80241808 0C00FB3A */ jal get_enemy -/* BAF14C 8024180C 00459021 */ addu $s2, $v0, $a1 -/* BAF150 80241810 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* BAF154 80241814 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* BAF158 80241818 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BAF15C 8024181C 8E830000 */ lw $v1, ($s4) -/* BAF160 80241820 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BAF164 80241824 8C660028 */ lw $a2, 0x28($v1) -/* BAF168 80241828 8C670030 */ lw $a3, 0x30($v1) -/* BAF16C 8024182C 0C00A7B5 */ jal dist2D -/* BAF170 80241830 0040982D */ daddu $s3, $v0, $zero -/* BAF174 80241834 C6620074 */ lwc1 $f2, 0x74($s3) -/* BAF178 80241838 468010A0 */ cvt.s.w $f2, $f2 -/* BAF17C 8024183C 4600103C */ c.lt.s $f2, $f0 -/* BAF180 80241840 00000000 */ nop -/* BAF184 80241844 45030001 */ bc1tl .L8024184C -/* BAF188 80241848 0000882D */ daddu $s1, $zero, $zero -.L8024184C: -/* BAF18C 8024184C C64C006C */ lwc1 $f12, 0x6c($s2) -/* BAF190 80241850 C60E000C */ lwc1 $f14, 0xc($s0) -/* BAF194 80241854 3C014387 */ lui $at, 0x4387 -/* BAF198 80241858 4481A000 */ mtc1 $at, $f20 -/* BAF19C 8024185C 0C00A70A */ jal get_clamped_angle_diff -/* BAF1A0 80241860 00000000 */ nop -/* BAF1A4 80241864 0C00A6C9 */ jal clamp_angle -/* BAF1A8 80241868 46000306 */ mov.s $f12, $f0 -/* BAF1AC 8024186C 3C018024 */ lui $at, 0x8024 -/* BAF1B0 80241870 D42252F8 */ ldc1 $f2, 0x52f8($at) -/* BAF1B4 80241874 46000021 */ cvt.d.s $f0, $f0 -/* BAF1B8 80241878 4622003C */ c.lt.d $f0, $f2 -/* BAF1BC 8024187C 00000000 */ nop -/* BAF1C0 80241880 45000003 */ bc1f .L80241890 -/* BAF1C4 80241884 00000000 */ nop -/* BAF1C8 80241888 3C0142B4 */ lui $at, 0x42b4 -/* BAF1CC 8024188C 4481A000 */ mtc1 $at, $f20 -.L80241890: -/* BAF1D0 80241890 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BAF1D4 80241894 8E820000 */ lw $v0, ($s4) -/* BAF1D8 80241898 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BAF1DC 8024189C 8C460028 */ lw $a2, 0x28($v0) -/* BAF1E0 802418A0 0C00A720 */ jal atan2 -/* BAF1E4 802418A4 8C470030 */ lw $a3, 0x30($v0) -/* BAF1E8 802418A8 4600A306 */ mov.s $f12, $f20 -/* BAF1EC 802418AC 0C00A70A */ jal get_clamped_angle_diff -/* BAF1F0 802418B0 46000386 */ mov.s $f14, $f0 -/* BAF1F4 802418B4 C6620078 */ lwc1 $f2, 0x78($s3) -/* BAF1F8 802418B8 468010A0 */ cvt.s.w $f2, $f2 -/* BAF1FC 802418BC 46000005 */ abs.s $f0, $f0 -/* BAF200 802418C0 4600103C */ c.lt.s $f2, $f0 -/* BAF204 802418C4 00000000 */ nop -/* BAF208 802418C8 45030001 */ bc1tl .L802418D0 -/* BAF20C 802418CC 0000882D */ daddu $s1, $zero, $zero -.L802418D0: -/* BAF210 802418D0 8E820000 */ lw $v0, ($s4) -/* BAF214 802418D4 C600003C */ lwc1 $f0, 0x3c($s0) -/* BAF218 802418D8 C442002C */ lwc1 $f2, 0x2c($v0) -/* BAF21C 802418DC 860200A8 */ lh $v0, 0xa8($s0) -/* BAF220 802418E0 46020001 */ sub.s $f0, $f0, $f2 -/* BAF224 802418E4 44821000 */ mtc1 $v0, $f2 -/* BAF228 802418E8 00000000 */ nop -/* BAF22C 802418EC 468010A1 */ cvt.d.w $f2, $f2 -/* BAF230 802418F0 46221080 */ add.d $f2, $f2, $f2 -/* BAF234 802418F4 46000005 */ abs.s $f0, $f0 -/* BAF238 802418F8 46000021 */ cvt.d.s $f0, $f0 -/* BAF23C 802418FC 4620103E */ c.le.d $f2, $f0 -/* BAF240 80241900 00000000 */ nop -/* BAF244 80241904 45030001 */ bc1tl .L8024190C -/* BAF248 80241908 0000882D */ daddu $s1, $zero, $zero -.L8024190C: -/* BAF24C 8024190C 3C038011 */ lui $v1, 0x8011 -/* BAF250 80241910 8063EBB3 */ lb $v1, -0x144d($v1) -/* BAF254 80241914 24020009 */ addiu $v0, $zero, 9 -/* BAF258 80241918 50620001 */ beql $v1, $v0, .L80241920 -/* BAF25C 8024191C 0000882D */ daddu $s1, $zero, $zero -.L80241920: -/* BAF260 80241920 24020007 */ addiu $v0, $zero, 7 -/* BAF264 80241924 50620001 */ beql $v1, $v0, .L8024192C -/* BAF268 80241928 0000882D */ daddu $s1, $zero, $zero -.L8024192C: -/* BAF26C 8024192C 0220102D */ daddu $v0, $s1, $zero -/* BAF270 80241930 8FBF0024 */ lw $ra, 0x24($sp) -/* BAF274 80241934 8FB40020 */ lw $s4, 0x20($sp) -/* BAF278 80241938 8FB3001C */ lw $s3, 0x1c($sp) -/* BAF27C 8024193C 8FB20018 */ lw $s2, 0x18($sp) -/* BAF280 80241940 8FB10014 */ lw $s1, 0x14($sp) -/* BAF284 80241944 8FB00010 */ lw $s0, 0x10($sp) -/* BAF288 80241948 D7B40028 */ ldc1 $f20, 0x28($sp) -/* BAF28C 8024194C 03E00008 */ jr $ra -/* BAF290 80241950 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mim/mim_08/func_80241FD0_BAD940.s b/asm/nonmatchings/world/area_mim/mim_08/func_80241FD0_BAD940.s deleted file mode 100644 index e514a8c449..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/func_80241FD0_BAD940.s +++ /dev/null @@ -1,688 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FD0_BAF910 -/* BAF910 80241FD0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* BAF914 80241FD4 AFBF0064 */ sw $ra, 0x64($sp) -/* BAF918 80241FD8 AFBE0060 */ sw $fp, 0x60($sp) -/* BAF91C 80241FDC AFB7005C */ sw $s7, 0x5c($sp) -/* BAF920 80241FE0 AFB60058 */ sw $s6, 0x58($sp) -/* BAF924 80241FE4 AFB50054 */ sw $s5, 0x54($sp) -/* BAF928 80241FE8 AFB40050 */ sw $s4, 0x50($sp) -/* BAF92C 80241FEC AFB3004C */ sw $s3, 0x4c($sp) -/* BAF930 80241FF0 AFB20048 */ sw $s2, 0x48($sp) -/* BAF934 80241FF4 AFB10044 */ sw $s1, 0x44($sp) -/* BAF938 80241FF8 AFB00040 */ sw $s0, 0x40($sp) -/* BAF93C 80241FFC F7B80078 */ sdc1 $f24, 0x78($sp) -/* BAF940 80242000 F7B60070 */ sdc1 $f22, 0x70($sp) -/* BAF944 80242004 F7B40068 */ sdc1 $f20, 0x68($sp) -/* BAF948 80242008 AFA40080 */ sw $a0, 0x80($sp) -/* BAF94C 8024200C 8C960148 */ lw $s6, 0x148($a0) -/* BAF950 80242010 00C0902D */ daddu $s2, $a2, $zero -/* BAF954 80242014 86C40008 */ lh $a0, 8($s6) -/* BAF958 80242018 0C00EABB */ jal get_npc_unsafe -/* BAF95C 8024201C 0000B82D */ daddu $s7, $zero, $zero -/* BAF960 80242020 0040882D */ daddu $s1, $v0, $zero -/* BAF964 80242024 9622008E */ lhu $v0, 0x8e($s1) -/* BAF968 80242028 2442FFFF */ addiu $v0, $v0, -1 -/* BAF96C 8024202C A622008E */ sh $v0, 0x8e($s1) -/* BAF970 80242030 00021400 */ sll $v0, $v0, 0x10 -/* BAF974 80242034 8EC30090 */ lw $v1, 0x90($s6) -/* BAF978 80242038 00021403 */ sra $v0, $v0, 0x10 -/* BAF97C 8024203C 0062182A */ slt $v1, $v1, $v0 -/* BAF980 80242040 14600005 */ bnez $v1, .L80242058 -/* BAF984 80242044 02E0F02D */ daddu $fp, $s7, $zero -/* BAF988 80242048 8EC20000 */ lw $v0, ($s6) -/* BAF98C 8024204C 3C031F10 */ lui $v1, 0x1f10 -/* BAF990 80242050 00431025 */ or $v0, $v0, $v1 -/* BAF994 80242054 AEC20000 */ sw $v0, ($s6) -.L80242058: -/* BAF998 80242058 8622008E */ lh $v0, 0x8e($s1) -/* BAF99C 8024205C 1440025D */ bnez $v0, .L802429D4 -/* BAF9A0 80242060 00000000 */ nop -/* BAF9A4 80242064 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BAF9A8 80242068 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BAF9AC 8024206C 0C00A6C9 */ jal clamp_angle -/* BAF9B0 80242070 C44C00A8 */ lwc1 $f12, 0xa8($v0) -/* BAF9B4 80242074 3C014334 */ lui $at, 0x4334 -/* BAF9B8 80242078 44811000 */ mtc1 $at, $f2 -/* BAF9BC 8024207C 00000000 */ nop -/* BAF9C0 80242080 4602003C */ c.lt.s $f0, $f2 -/* BAF9C4 80242084 00000000 */ nop -/* BAF9C8 80242088 45000011 */ bc1f .L802420D0 -/* BAF9CC 8024208C 00000000 */ nop -/* BAF9D0 80242090 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* BAF9D4 80242094 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* BAF9D8 80242098 3C0142B4 */ lui $at, 0x42b4 -/* BAF9DC 8024209C 44816000 */ mtc1 $at, $f12 -/* BAF9E0 802420A0 00031080 */ sll $v0, $v1, 2 -/* BAF9E4 802420A4 00431021 */ addu $v0, $v0, $v1 -/* BAF9E8 802420A8 00021080 */ sll $v0, $v0, 2 -/* BAF9EC 802420AC 00431023 */ subu $v0, $v0, $v1 -/* BAF9F0 802420B0 000218C0 */ sll $v1, $v0, 3 -/* BAF9F4 802420B4 00431021 */ addu $v0, $v0, $v1 -/* BAF9F8 802420B8 000210C0 */ sll $v0, $v0, 3 -/* BAF9FC 802420BC 3C01800B */ lui $at, 0x800b -/* BAFA00 802420C0 00220821 */ addu $at, $at, $v0 -/* BAFA04 802420C4 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* BAFA08 802420C8 08090843 */ j .L8024210C -/* BAFA0C 802420CC 460C0301 */ sub.s $f12, $f0, $f12 -.L802420D0: -/* BAFA10 802420D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* BAFA14 802420D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* BAFA18 802420D8 3C0142B4 */ lui $at, 0x42b4 -/* BAFA1C 802420DC 44816000 */ mtc1 $at, $f12 -/* BAFA20 802420E0 00031080 */ sll $v0, $v1, 2 -/* BAFA24 802420E4 00431021 */ addu $v0, $v0, $v1 -/* BAFA28 802420E8 00021080 */ sll $v0, $v0, 2 -/* BAFA2C 802420EC 00431023 */ subu $v0, $v0, $v1 -/* BAFA30 802420F0 000218C0 */ sll $v1, $v0, 3 -/* BAFA34 802420F4 00431021 */ addu $v0, $v0, $v1 -/* BAFA38 802420F8 000210C0 */ sll $v0, $v0, 3 -/* BAFA3C 802420FC 3C01800B */ lui $at, 0x800b -/* BAFA40 80242100 00220821 */ addu $at, $at, $v0 -/* BAFA44 80242104 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* BAFA48 80242108 460C0300 */ add.s $f12, $f0, $f12 -.L8024210C: -/* BAFA4C 8024210C 0C00A6C9 */ jal clamp_angle -/* BAFA50 80242110 00000000 */ nop -/* BAFA54 80242114 46000586 */ mov.s $f22, $f0 -/* BAFA58 80242118 3C014334 */ lui $at, 0x4334 -/* BAFA5C 8024211C 44816000 */ mtc1 $at, $f12 -/* BAFA60 80242120 0C00A6C9 */ jal clamp_angle -/* BAFA64 80242124 460CB300 */ add.s $f12, $f22, $f12 -/* BAFA68 80242128 8EC20088 */ lw $v0, 0x88($s6) -/* BAFA6C 8024212C 14400010 */ bnez $v0, .L80242170 -/* BAFA70 80242130 46000606 */ mov.s $f24, $f0 -/* BAFA74 80242134 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BAFA78 80242138 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BAFA7C 8024213C 804300B4 */ lb $v1, 0xb4($v0) -/* BAFA80 80242140 3C014200 */ lui $at, 0x4200 -/* BAFA84 80242144 4481A000 */ mtc1 $at, $f20 -/* BAFA88 80242148 10600016 */ beqz $v1, .L802421A4 -/* BAFA8C 8024214C 24020001 */ addiu $v0, $zero, 1 -/* BAFA90 80242150 3C0142C8 */ lui $at, 0x42c8 -/* BAFA94 80242154 4481A000 */ mtc1 $at, $f20 -/* BAFA98 80242158 14620013 */ bne $v1, $v0, .L802421A8 -/* BAFA9C 8024215C 26300038 */ addiu $s0, $s1, 0x38 -/* BAFAA0 80242160 3C0142B4 */ lui $at, 0x42b4 -/* BAFAA4 80242164 4481A000 */ mtc1 $at, $f20 -/* BAFAA8 80242168 0809086B */ j .L802421AC -/* BAFAAC 8024216C 0200202D */ daddu $a0, $s0, $zero -.L80242170: -/* BAFAB0 80242170 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BAFAB4 80242174 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BAFAB8 80242178 804300B4 */ lb $v1, 0xb4($v0) -/* BAFABC 8024217C 3C014218 */ lui $at, 0x4218 -/* BAFAC0 80242180 4481A000 */ mtc1 $at, $f20 -/* BAFAC4 80242184 10600007 */ beqz $v1, .L802421A4 -/* BAFAC8 80242188 24020001 */ addiu $v0, $zero, 1 -/* BAFACC 8024218C 3C0142B4 */ lui $at, 0x42b4 -/* BAFAD0 80242190 4481A000 */ mtc1 $at, $f20 -/* BAFAD4 80242194 14620004 */ bne $v1, $v0, .L802421A8 -/* BAFAD8 80242198 26300038 */ addiu $s0, $s1, 0x38 -/* BAFADC 8024219C 3C014296 */ lui $at, 0x4296 -/* BAFAE0 802421A0 4481A000 */ mtc1 $at, $f20 -.L802421A4: -/* BAFAE4 802421A4 26300038 */ addiu $s0, $s1, 0x38 -.L802421A8: -/* BAFAE8 802421A8 0200202D */ daddu $a0, $s0, $zero -.L802421AC: -/* BAFAEC 802421AC 3C15800F */ lui $s5, %hi(gPlayerStatusPtr) -/* BAFAF0 802421B0 26B57B30 */ addiu $s5, $s5, %lo(gPlayerStatusPtr) -/* BAFAF4 802421B4 4407C000 */ mfc1 $a3, $f24 -/* BAFAF8 802421B8 862200A6 */ lh $v0, 0xa6($s1) -/* BAFAFC 802421BC 8EA30000 */ lw $v1, ($s5) -/* BAFB00 802421C0 44824000 */ mtc1 $v0, $f8 -/* BAFB04 802421C4 00000000 */ nop -/* BAFB08 802421C8 46804220 */ cvt.s.w $f8, $f8 -/* BAFB0C 802421CC C4600028 */ lwc1 $f0, 0x28($v1) -/* BAFB10 802421D0 44064000 */ mfc1 $a2, $f8 -/* BAFB14 802421D4 26330040 */ addiu $s3, $s1, 0x40 -/* BAFB18 802421D8 E6200038 */ swc1 $f0, 0x38($s1) -/* BAFB1C 802421DC C4600030 */ lwc1 $f0, 0x30($v1) -/* BAFB20 802421E0 0260282D */ daddu $a1, $s3, $zero -/* BAFB24 802421E4 0C00A7E7 */ jal add_vec2D_polar -/* BAFB28 802421E8 E6200040 */ swc1 $f0, 0x40($s1) -/* BAFB2C 802421EC 862200A6 */ lh $v0, 0xa6($s1) -/* BAFB30 802421F0 44820000 */ mtc1 $v0, $f0 -/* BAFB34 802421F4 00000000 */ nop -/* BAFB38 802421F8 46800020 */ cvt.s.w $f0, $f0 -/* BAFB3C 802421FC 4600A000 */ add.s $f0, $f20, $f0 -/* BAFB40 80242200 4406B000 */ mfc1 $a2, $f22 -/* BAFB44 80242204 44050000 */ mfc1 $a1, $f0 -/* BAFB48 80242208 0C00EA95 */ jal npc_move_heading -/* BAFB4C 8024220C 0220202D */ daddu $a0, $s1, $zero -/* BAFB50 80242210 8EC20088 */ lw $v0, 0x88($s6) -/* BAFB54 80242214 1440005D */ bnez $v0, .L8024238C -/* BAFB58 80242218 00000000 */ nop -/* BAFB5C 8024221C C6200038 */ lwc1 $f0, 0x38($s1) -/* BAFB60 80242220 3C018024 */ lui $at, 0x8024 -/* BAFB64 80242224 D4245490 */ ldc1 $f4, 0x5490($at) -/* BAFB68 80242228 46000021 */ cvt.d.s $f0, $f0 -/* BAFB6C 8024222C 4620203C */ c.lt.d $f4, $f0 -/* BAFB70 80242230 00000000 */ nop -/* BAFB74 80242234 45000005 */ bc1f .L8024224C -/* BAFB78 80242238 00000000 */ nop -/* BAFB7C 8024223C 3C0143BE */ lui $at, 0x43be -/* BAFB80 80242240 44810000 */ mtc1 $at, $f0 -/* BAFB84 80242244 00000000 */ nop -/* BAFB88 80242248 E6200038 */ swc1 $f0, 0x38($s1) -.L8024224C: -/* BAFB8C 8024224C C6200038 */ lwc1 $f0, 0x38($s1) -/* BAFB90 80242250 3C018024 */ lui $at, 0x8024 -/* BAFB94 80242254 D4225498 */ ldc1 $f2, 0x5498($at) -/* BAFB98 80242258 46000021 */ cvt.d.s $f0, $f0 -/* BAFB9C 8024225C 4622003C */ c.lt.d $f0, $f2 -/* BAFBA0 80242260 00000000 */ nop -/* BAFBA4 80242264 45000005 */ bc1f .L8024227C -/* BAFBA8 80242268 00000000 */ nop -/* BAFBAC 8024226C 3C01C3BE */ lui $at, 0xc3be -/* BAFBB0 80242270 44810000 */ mtc1 $at, $f0 -/* BAFBB4 80242274 00000000 */ nop -/* BAFBB8 80242278 E6200038 */ swc1 $f0, 0x38($s1) -.L8024227C: -/* BAFBBC 8024227C C6200040 */ lwc1 $f0, 0x40($s1) -/* BAFBC0 80242280 46000021 */ cvt.d.s $f0, $f0 -/* BAFBC4 80242284 4620203C */ c.lt.d $f4, $f0 -/* BAFBC8 80242288 00000000 */ nop -/* BAFBCC 8024228C 45000005 */ bc1f .L802422A4 -/* BAFBD0 80242290 00000000 */ nop -/* BAFBD4 80242294 3C0143BE */ lui $at, 0x43be -/* BAFBD8 80242298 44810000 */ mtc1 $at, $f0 -/* BAFBDC 8024229C 00000000 */ nop -/* BAFBE0 802422A0 E6200040 */ swc1 $f0, 0x40($s1) -.L802422A4: -/* BAFBE4 802422A4 C6200040 */ lwc1 $f0, 0x40($s1) -/* BAFBE8 802422A8 46000021 */ cvt.d.s $f0, $f0 -/* BAFBEC 802422AC 4622003C */ c.lt.d $f0, $f2 -/* BAFBF0 802422B0 00000000 */ nop -/* BAFBF4 802422B4 45000005 */ bc1f .L802422CC -/* BAFBF8 802422B8 00000000 */ nop -/* BAFBFC 802422BC 3C01C3BE */ lui $at, 0xc3be -/* BAFC00 802422C0 44810000 */ mtc1 $at, $f0 -/* BAFC04 802422C4 00000000 */ nop -/* BAFC08 802422C8 E6200040 */ swc1 $f0, 0x40($s1) -.L802422CC: -/* BAFC0C 802422CC C6220038 */ lwc1 $f2, 0x38($s1) -/* BAFC10 802422D0 46021082 */ mul.s $f2, $f2, $f2 -/* BAFC14 802422D4 00000000 */ nop -/* BAFC18 802422D8 C6200040 */ lwc1 $f0, 0x40($s1) -/* BAFC1C 802422DC 46000002 */ mul.s $f0, $f0, $f0 -/* BAFC20 802422E0 00000000 */ nop -/* BAFC24 802422E4 46001300 */ add.s $f12, $f2, $f0 -/* BAFC28 802422E8 46006004 */ sqrt.s $f0, $f12 -/* BAFC2C 802422EC 46000032 */ c.eq.s $f0, $f0 -/* BAFC30 802422F0 00000000 */ nop -/* BAFC34 802422F4 45010003 */ bc1t .L80242304 -/* BAFC38 802422F8 00000000 */ nop -/* BAFC3C 802422FC 0C0187BC */ jal sqrtf -/* BAFC40 80242300 00000000 */ nop -.L80242304: -/* BAFC44 80242304 8E260038 */ lw $a2, 0x38($s1) -/* BAFC48 80242308 8E270040 */ lw $a3, 0x40($s1) -/* BAFC4C 8024230C 4480A000 */ mtc1 $zero, $f20 -/* BAFC50 80242310 E7A00038 */ swc1 $f0, 0x38($sp) -/* BAFC54 80242314 4600A306 */ mov.s $f12, $f20 -/* BAFC58 80242318 0C00A720 */ jal atan2 -/* BAFC5C 8024231C 4600A386 */ mov.s $f14, $f20 -/* BAFC60 80242320 46000586 */ mov.s $f22, $f0 -/* BAFC64 80242324 C7A20038 */ lwc1 $f2, 0x38($sp) -/* BAFC68 80242328 3C018024 */ lui $at, 0x8024 -/* BAFC6C 8024232C D42054A0 */ ldc1 $f0, 0x54a0($at) -/* BAFC70 80242330 460010A1 */ cvt.d.s $f2, $f2 -/* BAFC74 80242334 4620103C */ c.lt.d $f2, $f0 -/* BAFC78 80242338 00000000 */ nop -/* BAFC7C 8024233C 45000004 */ bc1f .L80242350 -/* BAFC80 80242340 0200202D */ daddu $a0, $s0, $zero -/* BAFC84 80242344 3C064398 */ lui $a2, 0x4398 -/* BAFC88 80242348 080908DC */ j .L80242370 -/* BAFC8C 8024234C 34C68000 */ ori $a2, $a2, 0x8000 -.L80242350: -/* BAFC90 80242350 3C018024 */ lui $at, 0x8024 -/* BAFC94 80242354 D42054A8 */ ldc1 $f0, 0x54a8($at) -/* BAFC98 80242358 4622003C */ c.lt.d $f0, $f2 -/* BAFC9C 8024235C 00000000 */ nop -/* BAFCA0 80242360 450000FA */ bc1f .L8024274C -/* BAFCA4 80242364 00000000 */ nop -/* BAFCA8 80242368 3C0643BB */ lui $a2, 0x43bb -/* BAFCAC 8024236C 34C68000 */ ori $a2, $a2, 0x8000 -.L80242370: -/* BAFCB0 80242370 4407B000 */ mfc1 $a3, $f22 -/* BAFCB4 80242374 0260282D */ daddu $a1, $s3, $zero -/* BAFCB8 80242378 E6340038 */ swc1 $f20, 0x38($s1) -/* BAFCBC 8024237C 0C00A7E7 */ jal add_vec2D_polar -/* BAFCC0 80242380 E6340040 */ swc1 $f20, 0x40($s1) -/* BAFCC4 80242384 080909D3 */ j .L8024274C -/* BAFCC8 80242388 00000000 */ nop -.L8024238C: -/* BAFCCC 8024238C 8E220000 */ lw $v0, ($s1) -/* BAFCD0 80242390 30420040 */ andi $v0, $v0, 0x40 -/* BAFCD4 80242394 144000B0 */ bnez $v0, .L80242658 -/* BAFCD8 80242398 27A50020 */ addiu $a1, $sp, 0x20 -/* BAFCDC 8024239C 27B40020 */ addiu $s4, $sp, 0x20 -/* BAFCE0 802423A0 0280282D */ daddu $a1, $s4, $zero -/* BAFCE4 802423A4 27B30024 */ addiu $s3, $sp, 0x24 -/* BAFCE8 802423A8 8EA20000 */ lw $v0, ($s5) -/* BAFCEC 802423AC 3C014032 */ lui $at, 0x4032 -/* BAFCF0 802423B0 44811800 */ mtc1 $at, $f3 -/* BAFCF4 802423B4 44801000 */ mtc1 $zero, $f2 -/* BAFCF8 802423B8 C440002C */ lwc1 $f0, 0x2c($v0) -/* BAFCFC 802423BC C4460028 */ lwc1 $f6, 0x28($v0) -/* BAFD00 802423C0 C4440030 */ lwc1 $f4, 0x30($v0) -/* BAFD04 802423C4 46000021 */ cvt.d.s $f0, $f0 -/* BAFD08 802423C8 46220000 */ add.d $f0, $f0, $f2 -/* BAFD0C 802423CC E7A60020 */ swc1 $f6, 0x20($sp) -/* BAFD10 802423D0 E7A40028 */ swc1 $f4, 0x28($sp) -/* BAFD14 802423D4 46200020 */ cvt.s.d $f0, $f0 -/* BAFD18 802423D8 E7A00024 */ swc1 $f0, 0x24($sp) -/* BAFD1C 802423DC E7B40010 */ swc1 $f20, 0x10($sp) -/* BAFD20 802423E0 E7B60014 */ swc1 $f22, 0x14($sp) -/* BAFD24 802423E4 862200A8 */ lh $v0, 0xa8($s1) -/* BAFD28 802423E8 0260302D */ daddu $a2, $s3, $zero -/* BAFD2C 802423EC 44820000 */ mtc1 $v0, $f0 -/* BAFD30 802423F0 00000000 */ nop -/* BAFD34 802423F4 46800020 */ cvt.s.w $f0, $f0 -/* BAFD38 802423F8 E7A00018 */ swc1 $f0, 0x18($sp) -/* BAFD3C 802423FC 862200A6 */ lh $v0, 0xa6($s1) -/* BAFD40 80242400 27B00028 */ addiu $s0, $sp, 0x28 -/* BAFD44 80242404 44820000 */ mtc1 $v0, $f0 -/* BAFD48 80242408 00000000 */ nop -/* BAFD4C 8024240C 46800020 */ cvt.s.w $f0, $f0 -/* BAFD50 80242410 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BAFD54 80242414 8E240080 */ lw $a0, 0x80($s1) -/* BAFD58 80242418 0C037711 */ jal func_800DDC44 -/* BAFD5C 8024241C 0200382D */ daddu $a3, $s0, $zero -/* BAFD60 80242420 104000CA */ beqz $v0, .L8024274C -/* BAFD64 80242424 0280282D */ daddu $a1, $s4, $zero -/* BAFD68 80242428 8EA20000 */ lw $v0, ($s5) -/* BAFD6C 8024242C 3C018024 */ lui $at, 0x8024 -/* BAFD70 80242430 D42254B0 */ ldc1 $f2, 0x54b0($at) -/* BAFD74 80242434 C440002C */ lwc1 $f0, 0x2c($v0) -/* BAFD78 80242438 C4460028 */ lwc1 $f6, 0x28($v0) -/* BAFD7C 8024243C C4440030 */ lwc1 $f4, 0x30($v0) -/* BAFD80 80242440 46000021 */ cvt.d.s $f0, $f0 -/* BAFD84 80242444 46220000 */ add.d $f0, $f0, $f2 -/* BAFD88 80242448 E7A60020 */ swc1 $f6, 0x20($sp) -/* BAFD8C 8024244C E7A40028 */ swc1 $f4, 0x28($sp) -/* BAFD90 80242450 46200020 */ cvt.s.d $f0, $f0 -/* BAFD94 80242454 E7A00024 */ swc1 $f0, 0x24($sp) -/* BAFD98 80242458 E7B40010 */ swc1 $f20, 0x10($sp) -/* BAFD9C 8024245C E7B60014 */ swc1 $f22, 0x14($sp) -/* BAFDA0 80242460 862200A8 */ lh $v0, 0xa8($s1) -/* BAFDA4 80242464 44820000 */ mtc1 $v0, $f0 -/* BAFDA8 80242468 00000000 */ nop -/* BAFDAC 8024246C 46800020 */ cvt.s.w $f0, $f0 -/* BAFDB0 80242470 E7A00018 */ swc1 $f0, 0x18($sp) -/* BAFDB4 80242474 862200A6 */ lh $v0, 0xa6($s1) -/* BAFDB8 80242478 0260302D */ daddu $a2, $s3, $zero -/* BAFDBC 8024247C 44820000 */ mtc1 $v0, $f0 -/* BAFDC0 80242480 00000000 */ nop -/* BAFDC4 80242484 46800020 */ cvt.s.w $f0, $f0 -/* BAFDC8 80242488 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BAFDCC 8024248C 8E240080 */ lw $a0, 0x80($s1) -/* BAFDD0 80242490 0C037711 */ jal func_800DDC44 -/* BAFDD4 80242494 0200382D */ daddu $a3, $s0, $zero -/* BAFDD8 80242498 27A5002C */ addiu $a1, $sp, 0x2c -/* BAFDDC 8024249C 27A60030 */ addiu $a2, $sp, 0x30 -/* BAFDE0 802424A0 27A70034 */ addiu $a3, $sp, 0x34 -/* BAFDE4 802424A4 27A30038 */ addiu $v1, $sp, 0x38 -/* BAFDE8 802424A8 C6220038 */ lwc1 $f2, 0x38($s1) -/* BAFDEC 802424AC C620003C */ lwc1 $f0, 0x3c($s1) -/* BAFDF0 802424B0 3C014348 */ lui $at, 0x4348 -/* BAFDF4 802424B4 44813000 */ mtc1 $at, $f6 -/* BAFDF8 802424B8 46000021 */ cvt.d.s $f0, $f0 -/* BAFDFC 802424BC E7A2002C */ swc1 $f2, 0x2c($sp) -/* BAFE00 802424C0 3C014059 */ lui $at, 0x4059 -/* BAFE04 802424C4 44811800 */ mtc1 $at, $f3 -/* BAFE08 802424C8 44801000 */ mtc1 $zero, $f2 -/* BAFE0C 802424CC C6240040 */ lwc1 $f4, 0x40($s1) -/* BAFE10 802424D0 46220000 */ add.d $f0, $f0, $f2 -/* BAFE14 802424D4 E7A60038 */ swc1 $f6, 0x38($sp) -/* BAFE18 802424D8 E7A40034 */ swc1 $f4, 0x34($sp) -/* BAFE1C 802424DC 46200020 */ cvt.s.d $f0, $f0 -/* BAFE20 802424E0 E7A00030 */ swc1 $f0, 0x30($sp) -/* BAFE24 802424E4 AFA30010 */ sw $v1, 0x10($sp) -/* BAFE28 802424E8 8E240080 */ lw $a0, 0x80($s1) -/* BAFE2C 802424EC 0C0372DF */ jal func_800DCB7C -/* BAFE30 802424F0 0040802D */ daddu $s0, $v0, $zero -/* BAFE34 802424F4 1600001C */ bnez $s0, .L80242568 -/* BAFE38 802424F8 00000000 */ nop -/* BAFE3C 802424FC 1040001A */ beqz $v0, .L80242568 -/* BAFE40 80242500 00000000 */ nop -/* BAFE44 80242504 C7A20038 */ lwc1 $f2, 0x38($sp) -/* BAFE48 80242508 3C014054 */ lui $at, 0x4054 -/* BAFE4C 8024250C 44810800 */ mtc1 $at, $f1 -/* BAFE50 80242510 44800000 */ mtc1 $zero, $f0 -/* BAFE54 80242514 460010A1 */ cvt.d.s $f2, $f2 -/* BAFE58 80242518 4622003C */ c.lt.d $f0, $f2 -/* BAFE5C 8024251C 00000000 */ nop -/* BAFE60 80242520 45000011 */ bc1f .L80242568 -/* BAFE64 80242524 00000000 */ nop -/* BAFE68 80242528 3C01405E */ lui $at, 0x405e -/* BAFE6C 8024252C 44810800 */ mtc1 $at, $f1 -/* BAFE70 80242530 44800000 */ mtc1 $zero, $f0 -/* BAFE74 80242534 00000000 */ nop -/* BAFE78 80242538 4620103C */ c.lt.d $f2, $f0 -/* BAFE7C 8024253C 00000000 */ nop -/* BAFE80 80242540 45000009 */ bc1f .L80242568 -/* BAFE84 80242544 00000000 */ nop -/* BAFE88 80242548 C622003C */ lwc1 $f2, 0x3c($s1) -/* BAFE8C 8024254C C7A00030 */ lwc1 $f0, 0x30($sp) -/* BAFE90 80242550 46001032 */ c.eq.s $f2, $f0 -/* BAFE94 80242554 00000000 */ nop -/* BAFE98 80242558 45010003 */ bc1t .L80242568 -/* BAFE9C 8024255C 00000000 */ nop -/* BAFEA0 80242560 080909D3 */ j .L8024274C -/* BAFEA4 80242564 241E0001 */ addiu $fp, $zero, 1 -.L80242568: -/* BAFEA8 80242568 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* BAFEAC 8024256C 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* BAFEB0 80242570 8E020000 */ lw $v0, ($s0) -/* BAFEB4 80242574 3C014024 */ lui $at, 0x4024 -/* BAFEB8 80242578 44811800 */ mtc1 $at, $f3 -/* BAFEBC 8024257C 44801000 */ mtc1 $zero, $f2 -/* BAFEC0 80242580 C440002C */ lwc1 $f0, 0x2c($v0) -/* BAFEC4 80242584 C4460028 */ lwc1 $f6, 0x28($v0) -/* BAFEC8 80242588 C4440030 */ lwc1 $f4, 0x30($v0) -/* BAFECC 8024258C 46000021 */ cvt.d.s $f0, $f0 -/* BAFED0 80242590 46220000 */ add.d $f0, $f0, $f2 -/* BAFED4 80242594 E7A60020 */ swc1 $f6, 0x20($sp) -/* BAFED8 80242598 E7A40028 */ swc1 $f4, 0x28($sp) -/* BAFEDC 8024259C 46200020 */ cvt.s.d $f0, $f0 -/* BAFEE0 802425A0 E7A00024 */ swc1 $f0, 0x24($sp) -/* BAFEE4 802425A4 E7B40010 */ swc1 $f20, 0x10($sp) -/* BAFEE8 802425A8 E7B60014 */ swc1 $f22, 0x14($sp) -/* BAFEEC 802425AC 862200A8 */ lh $v0, 0xa8($s1) -/* BAFEF0 802425B0 27A50020 */ addiu $a1, $sp, 0x20 -/* BAFEF4 802425B4 44820000 */ mtc1 $v0, $f0 -/* BAFEF8 802425B8 00000000 */ nop -/* BAFEFC 802425BC 46800020 */ cvt.s.w $f0, $f0 -/* BAFF00 802425C0 E7A00018 */ swc1 $f0, 0x18($sp) -/* BAFF04 802425C4 862200A6 */ lh $v0, 0xa6($s1) -/* BAFF08 802425C8 27A60024 */ addiu $a2, $sp, 0x24 -/* BAFF0C 802425CC 44820000 */ mtc1 $v0, $f0 -/* BAFF10 802425D0 00000000 */ nop -/* BAFF14 802425D4 46800020 */ cvt.s.w $f0, $f0 -/* BAFF18 802425D8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BAFF1C 802425DC 8E240080 */ lw $a0, 0x80($s1) -/* BAFF20 802425E0 0C037711 */ jal func_800DDC44 -/* BAFF24 802425E4 27A70028 */ addiu $a3, $sp, 0x28 -/* BAFF28 802425E8 8FA60020 */ lw $a2, 0x20($sp) -/* BAFF2C 802425EC 8E020000 */ lw $v0, ($s0) -/* BAFF30 802425F0 8FA70028 */ lw $a3, 0x28($sp) -/* BAFF34 802425F4 C44C0028 */ lwc1 $f12, 0x28($v0) -/* BAFF38 802425F8 C44E0030 */ lwc1 $f14, 0x30($v0) -/* BAFF3C 802425FC 0C00A7B5 */ jal dist2D -/* BAFF40 80242600 24170001 */ addiu $s7, $zero, 1 -/* BAFF44 80242604 46000506 */ mov.s $f20, $f0 -/* BAFF48 80242608 8E030000 */ lw $v1, ($s0) -/* BAFF4C 8024260C 862200A6 */ lh $v0, 0xa6($s1) -/* BAFF50 80242610 4407C000 */ mfc1 $a3, $f24 -/* BAFF54 80242614 44824000 */ mtc1 $v0, $f8 -/* BAFF58 80242618 00000000 */ nop -/* BAFF5C 8024261C 46804220 */ cvt.s.w $f8, $f8 -/* BAFF60 80242620 C4600028 */ lwc1 $f0, 0x28($v1) -/* BAFF64 80242624 44064000 */ mfc1 $a2, $f8 -/* BAFF68 80242628 26240038 */ addiu $a0, $s1, 0x38 -/* BAFF6C 8024262C E6200038 */ swc1 $f0, 0x38($s1) -/* BAFF70 80242630 C4600030 */ lwc1 $f0, 0x30($v1) -/* BAFF74 80242634 26250040 */ addiu $a1, $s1, 0x40 -/* BAFF78 80242638 0C00A7E7 */ jal add_vec2D_polar -/* BAFF7C 8024263C E6200040 */ swc1 $f0, 0x40($s1) -/* BAFF80 80242640 862200A6 */ lh $v0, 0xa6($s1) -/* BAFF84 80242644 44820000 */ mtc1 $v0, $f0 -/* BAFF88 80242648 00000000 */ nop -/* BAFF8C 8024264C 46800020 */ cvt.s.w $f0, $f0 -/* BAFF90 80242650 080909CF */ j .L8024273C -/* BAFF94 80242654 4600A500 */ add.s $f20, $f20, $f0 -.L80242658: -/* BAFF98 80242658 8EA20000 */ lw $v0, ($s5) -/* BAFF9C 8024265C 3C014032 */ lui $at, 0x4032 -/* BAFFA0 80242660 44811800 */ mtc1 $at, $f3 -/* BAFFA4 80242664 44801000 */ mtc1 $zero, $f2 -/* BAFFA8 80242668 C440002C */ lwc1 $f0, 0x2c($v0) -/* BAFFAC 8024266C C4460028 */ lwc1 $f6, 0x28($v0) -/* BAFFB0 80242670 C4440030 */ lwc1 $f4, 0x30($v0) -/* BAFFB4 80242674 46000021 */ cvt.d.s $f0, $f0 -/* BAFFB8 80242678 46220000 */ add.d $f0, $f0, $f2 -/* BAFFBC 8024267C E7A60020 */ swc1 $f6, 0x20($sp) -/* BAFFC0 80242680 E7A40028 */ swc1 $f4, 0x28($sp) -/* BAFFC4 80242684 46200020 */ cvt.s.d $f0, $f0 -/* BAFFC8 80242688 E7A00024 */ swc1 $f0, 0x24($sp) -/* BAFFCC 8024268C E7B40010 */ swc1 $f20, 0x10($sp) -/* BAFFD0 80242690 E7B60014 */ swc1 $f22, 0x14($sp) -/* BAFFD4 80242694 862200A8 */ lh $v0, 0xa8($s1) -/* BAFFD8 80242698 44820000 */ mtc1 $v0, $f0 -/* BAFFDC 8024269C 00000000 */ nop -/* BAFFE0 802426A0 46800020 */ cvt.s.w $f0, $f0 -/* BAFFE4 802426A4 E7A00018 */ swc1 $f0, 0x18($sp) -/* BAFFE8 802426A8 862200A6 */ lh $v0, 0xa6($s1) -/* BAFFEC 802426AC 27A60024 */ addiu $a2, $sp, 0x24 -/* BAFFF0 802426B0 44820000 */ mtc1 $v0, $f0 -/* BAFFF4 802426B4 00000000 */ nop -/* BAFFF8 802426B8 46800020 */ cvt.s.w $f0, $f0 -/* BAFFFC 802426BC E7A0001C */ swc1 $f0, 0x1c($sp) -/* BB0000 802426C0 8E240080 */ lw $a0, 0x80($s1) -/* BB0004 802426C4 0C037711 */ jal func_800DDC44 -/* BB0008 802426C8 27A70028 */ addiu $a3, $sp, 0x28 -/* BB000C 802426CC 1040001F */ beqz $v0, .L8024274C -/* BB0010 802426D0 00000000 */ nop -/* BB0014 802426D4 8FA60020 */ lw $a2, 0x20($sp) -/* BB0018 802426D8 8EA20000 */ lw $v0, ($s5) -/* BB001C 802426DC 8FA70028 */ lw $a3, 0x28($sp) -/* BB0020 802426E0 C44C0028 */ lwc1 $f12, 0x28($v0) -/* BB0024 802426E4 0C00A7B5 */ jal dist2D -/* BB0028 802426E8 C44E0030 */ lwc1 $f14, 0x30($v0) -/* BB002C 802426EC 46000506 */ mov.s $f20, $f0 -/* BB0030 802426F0 8EA30000 */ lw $v1, ($s5) -/* BB0034 802426F4 862200A6 */ lh $v0, 0xa6($s1) -/* BB0038 802426F8 4407C000 */ mfc1 $a3, $f24 -/* BB003C 802426FC 44824000 */ mtc1 $v0, $f8 -/* BB0040 80242700 00000000 */ nop -/* BB0044 80242704 46804220 */ cvt.s.w $f8, $f8 -/* BB0048 80242708 C4600028 */ lwc1 $f0, 0x28($v1) -/* BB004C 8024270C 44064000 */ mfc1 $a2, $f8 -/* BB0050 80242710 0200202D */ daddu $a0, $s0, $zero -/* BB0054 80242714 E6200038 */ swc1 $f0, 0x38($s1) -/* BB0058 80242718 C4600030 */ lwc1 $f0, 0x30($v1) -/* BB005C 8024271C 0260282D */ daddu $a1, $s3, $zero -/* BB0060 80242720 0C00A7E7 */ jal add_vec2D_polar -/* BB0064 80242724 E6200040 */ swc1 $f0, 0x40($s1) -/* BB0068 80242728 862200A6 */ lh $v0, 0xa6($s1) -/* BB006C 8024272C 44820000 */ mtc1 $v0, $f0 -/* BB0070 80242730 00000000 */ nop -/* BB0074 80242734 46800020 */ cvt.s.w $f0, $f0 -/* BB0078 80242738 4600A500 */ add.s $f20, $f20, $f0 -.L8024273C: -/* BB007C 8024273C 4406B000 */ mfc1 $a2, $f22 -/* BB0080 80242740 4405A000 */ mfc1 $a1, $f20 -/* BB0084 80242744 0C00EA95 */ jal npc_move_heading -/* BB0088 80242748 0220202D */ daddu $a0, $s1, $zero -.L8024274C: -/* BB008C 8024274C C6400008 */ lwc1 $f0, 8($s2) -/* BB0090 80242750 46800020 */ cvt.s.w $f0, $f0 -/* BB0094 80242754 44050000 */ mfc1 $a1, $f0 -/* BB0098 80242758 C640000C */ lwc1 $f0, 0xc($s2) -/* BB009C 8024275C 46800020 */ cvt.s.w $f0, $f0 -/* BB00A0 80242760 44060000 */ mfc1 $a2, $f0 -/* BB00A4 80242764 C6200040 */ lwc1 $f0, 0x40($s1) -/* BB00A8 80242768 26300038 */ addiu $s0, $s1, 0x38 -/* BB00AC 8024276C E7A00010 */ swc1 $f0, 0x10($sp) -/* BB00B0 80242770 C6400010 */ lwc1 $f0, 0x10($s2) -/* BB00B4 80242774 46800020 */ cvt.s.w $f0, $f0 -/* BB00B8 80242778 E7A00014 */ swc1 $f0, 0x14($sp) -/* BB00BC 8024277C C6400014 */ lwc1 $f0, 0x14($s2) -/* BB00C0 80242780 46800020 */ cvt.s.w $f0, $f0 -/* BB00C4 80242784 E7A00018 */ swc1 $f0, 0x18($sp) -/* BB00C8 80242788 8E440004 */ lw $a0, 4($s2) -/* BB00CC 8024278C 8E270038 */ lw $a3, 0x38($s1) -/* BB00D0 80242790 0C0123F5 */ jal is_point_within_region -/* BB00D4 80242794 26330040 */ addiu $s3, $s1, 0x40 -/* BB00D8 80242798 1040005A */ beqz $v0, .L80242904 -/* BB00DC 8024279C 00000000 */ nop -/* BB00E0 802427A0 8E430004 */ lw $v1, 4($s2) -/* BB00E4 802427A4 10600005 */ beqz $v1, .L802427BC -/* BB00E8 802427A8 24020001 */ addiu $v0, $zero, 1 -/* BB00EC 802427AC 10620029 */ beq $v1, $v0, .L80242854 -/* BB00F0 802427B0 00000000 */ nop -/* BB00F4 802427B4 08090A41 */ j .L80242904 -/* BB00F8 802427B8 00000000 */ nop -.L802427BC: -/* BB00FC 802427BC C6480008 */ lwc1 $f8, 8($s2) -/* BB0100 802427C0 46804220 */ cvt.s.w $f8, $f8 -/* BB0104 802427C4 44064000 */ mfc1 $a2, $f8 -/* BB0108 802427C8 C648000C */ lwc1 $f8, 0xc($s2) -/* BB010C 802427CC 46804220 */ cvt.s.w $f8, $f8 -/* BB0110 802427D0 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BB0114 802427D4 C62E0040 */ lwc1 $f14, 0x40($s1) -/* BB0118 802427D8 44074000 */ mfc1 $a3, $f8 -/* BB011C 802427DC 0C00A7B5 */ jal dist2D -/* BB0120 802427E0 00000000 */ nop -/* BB0124 802427E4 C6420010 */ lwc1 $f2, 0x10($s2) -/* BB0128 802427E8 468010A0 */ cvt.s.w $f2, $f2 -/* BB012C 802427EC 4600103C */ c.lt.s $f2, $f0 -/* BB0130 802427F0 00000000 */ nop -/* BB0134 802427F4 45000043 */ bc1f .L80242904 -/* BB0138 802427F8 E7A00038 */ swc1 $f0, 0x38($sp) -/* BB013C 802427FC C64C0008 */ lwc1 $f12, 8($s2) -/* BB0140 80242800 46806320 */ cvt.s.w $f12, $f12 -/* BB0144 80242804 8E260038 */ lw $a2, 0x38($s1) -/* BB0148 80242808 8E270040 */ lw $a3, 0x40($s1) -/* BB014C 8024280C C64E000C */ lwc1 $f14, 0xc($s2) -/* BB0150 80242810 0C00A720 */ jal atan2 -/* BB0154 80242814 468073A0 */ cvt.s.w $f14, $f14 -/* BB0158 80242818 0200202D */ daddu $a0, $s0, $zero -/* BB015C 8024281C 44070000 */ mfc1 $a3, $f0 -/* BB0160 80242820 C6400008 */ lwc1 $f0, 8($s2) -/* BB0164 80242824 46800020 */ cvt.s.w $f0, $f0 -/* BB0168 80242828 E6200038 */ swc1 $f0, 0x38($s1) -/* BB016C 8024282C C640000C */ lwc1 $f0, 0xc($s2) -/* BB0170 80242830 46800020 */ cvt.s.w $f0, $f0 -/* BB0174 80242834 E6200040 */ swc1 $f0, 0x40($s1) -/* BB0178 80242838 C6480010 */ lwc1 $f8, 0x10($s2) -/* BB017C 8024283C 46804220 */ cvt.s.w $f8, $f8 -/* BB0180 80242840 44064000 */ mfc1 $a2, $f8 -/* BB0184 80242844 0C00A7E7 */ jal add_vec2D_polar -/* BB0188 80242848 0260282D */ daddu $a1, $s3, $zero -/* BB018C 8024284C 08090A41 */ j .L80242904 -/* BB0190 80242850 00000000 */ nop -.L80242854: -/* BB0194 80242854 8E420008 */ lw $v0, 8($s2) -/* BB0198 80242858 8E430010 */ lw $v1, 0x10($s2) -/* BB019C 8024285C C6200038 */ lwc1 $f0, 0x38($s1) -/* BB01A0 80242860 00431021 */ addu $v0, $v0, $v1 -/* BB01A4 80242864 44821000 */ mtc1 $v0, $f2 -/* BB01A8 80242868 00000000 */ nop -/* BB01AC 8024286C 468010A0 */ cvt.s.w $f2, $f2 -/* BB01B0 80242870 4600103C */ c.lt.s $f2, $f0 -/* BB01B4 80242874 00000000 */ nop -/* BB01B8 80242878 45030001 */ bc1tl .L80242880 -/* BB01BC 8024287C E6220038 */ swc1 $f2, 0x38($s1) -.L80242880: -/* BB01C0 80242880 8E420008 */ lw $v0, 8($s2) -/* BB01C4 80242884 8E430010 */ lw $v1, 0x10($s2) -/* BB01C8 80242888 C6200038 */ lwc1 $f0, 0x38($s1) -/* BB01CC 8024288C 00431023 */ subu $v0, $v0, $v1 -/* BB01D0 80242890 44821000 */ mtc1 $v0, $f2 -/* BB01D4 80242894 00000000 */ nop -/* BB01D8 80242898 468010A0 */ cvt.s.w $f2, $f2 -/* BB01DC 8024289C 4602003C */ c.lt.s $f0, $f2 -/* BB01E0 802428A0 00000000 */ nop -/* BB01E4 802428A4 45030001 */ bc1tl .L802428AC -/* BB01E8 802428A8 E6220038 */ swc1 $f2, 0x38($s1) -.L802428AC: -/* BB01EC 802428AC 8E42000C */ lw $v0, 0xc($s2) -/* BB01F0 802428B0 8E430014 */ lw $v1, 0x14($s2) -/* BB01F4 802428B4 C6200040 */ lwc1 $f0, 0x40($s1) -/* BB01F8 802428B8 00431021 */ addu $v0, $v0, $v1 -/* BB01FC 802428BC 44821000 */ mtc1 $v0, $f2 -/* BB0200 802428C0 00000000 */ nop -/* BB0204 802428C4 468010A0 */ cvt.s.w $f2, $f2 -/* BB0208 802428C8 4600103C */ c.lt.s $f2, $f0 -/* BB020C 802428CC 00000000 */ nop -/* BB0210 802428D0 45030001 */ bc1tl .L802428D8 -/* BB0214 802428D4 E6220040 */ swc1 $f2, 0x40($s1) -.L802428D8: -/* BB0218 802428D8 8E42000C */ lw $v0, 0xc($s2) -/* BB021C 802428DC 8E430014 */ lw $v1, 0x14($s2) -/* BB0220 802428E0 C6200040 */ lwc1 $f0, 0x40($s1) -/* BB0224 802428E4 00431023 */ subu $v0, $v0, $v1 -/* BB0228 802428E8 44821000 */ mtc1 $v0, $f2 -/* BB022C 802428EC 00000000 */ nop -/* BB0230 802428F0 468010A0 */ cvt.s.w $f2, $f2 -/* BB0234 802428F4 4602003C */ c.lt.s $f0, $f2 -/* BB0238 802428F8 00000000 */ nop -/* BB023C 802428FC 45030001 */ bc1tl .L80242904 -/* BB0240 80242900 E6220040 */ swc1 $f2, 0x40($s1) -.L80242904: -/* BB0244 80242904 16E0001F */ bnez $s7, .L80242984 -/* BB0248 80242908 00000000 */ nop -/* BB024C 8024290C 8E220000 */ lw $v0, ($s1) -/* BB0250 80242910 30420008 */ andi $v0, $v0, 8 -/* BB0254 80242914 10400003 */ beqz $v0, .L80242924 -/* BB0258 80242918 27A50020 */ addiu $a1, $sp, 0x20 -/* BB025C 8024291C 13C00019 */ beqz $fp, .L80242984 -/* BB0260 80242920 00000000 */ nop -.L80242924: -/* BB0264 80242924 27A60024 */ addiu $a2, $sp, 0x24 -/* BB0268 80242928 27A20038 */ addiu $v0, $sp, 0x38 -/* BB026C 8024292C C6220038 */ lwc1 $f2, 0x38($s1) -/* BB0270 80242930 C620003C */ lwc1 $f0, 0x3c($s1) -/* BB0274 80242934 3C0143C8 */ lui $at, 0x43c8 -/* BB0278 80242938 44813000 */ mtc1 $at, $f6 -/* BB027C 8024293C 46000021 */ cvt.d.s $f0, $f0 -/* BB0280 80242940 E7A20020 */ swc1 $f2, 0x20($sp) -/* BB0284 80242944 3C018024 */ lui $at, 0x8024 -/* BB0288 80242948 D42254B8 */ ldc1 $f2, 0x54b8($at) -/* BB028C 8024294C C6240040 */ lwc1 $f4, 0x40($s1) -/* BB0290 80242950 46220000 */ add.d $f0, $f0, $f2 -/* BB0294 80242954 E7A60038 */ swc1 $f6, 0x38($sp) -/* BB0298 80242958 E7A40028 */ swc1 $f4, 0x28($sp) -/* BB029C 8024295C 46200020 */ cvt.s.d $f0, $f0 -/* BB02A0 80242960 E7A00024 */ swc1 $f0, 0x24($sp) -/* BB02A4 80242964 AFA20010 */ sw $v0, 0x10($sp) -/* BB02A8 80242968 8E240080 */ lw $a0, 0x80($s1) -/* BB02AC 8024296C 0C0372DF */ jal func_800DCB7C -/* BB02B0 80242970 27A70028 */ addiu $a3, $sp, 0x28 -/* BB02B4 80242974 10400003 */ beqz $v0, .L80242984 -/* BB02B8 80242978 00000000 */ nop -/* BB02BC 8024297C C7A00024 */ lwc1 $f0, 0x24($sp) -/* BB02C0 80242980 E620003C */ swc1 $f0, 0x3c($s1) -.L80242984: -/* BB02C4 80242984 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BB02C8 80242988 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BB02CC 8024298C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BB02D0 80242990 C62E0040 */ lwc1 $f14, 0x40($s1) -/* BB02D4 80242994 8C460028 */ lw $a2, 0x28($v0) -/* BB02D8 80242998 0C00A720 */ jal atan2 -/* BB02DC 8024299C 8C470030 */ lw $a3, 0x30($v0) -/* BB02E0 802429A0 0220202D */ daddu $a0, $s1, $zero -/* BB02E4 802429A4 24050321 */ addiu $a1, $zero, 0x321 -/* BB02E8 802429A8 0000302D */ daddu $a2, $zero, $zero -/* BB02EC 802429AC 0C012530 */ jal func_800494C0 -/* BB02F0 802429B0 E620000C */ swc1 $f0, 0xc($s1) -/* BB02F4 802429B4 8EC200CC */ lw $v0, 0xcc($s6) -/* BB02F8 802429B8 8C420024 */ lw $v0, 0x24($v0) -/* BB02FC 802429BC AE220028 */ sw $v0, 0x28($s1) -/* BB0300 802429C0 96C20096 */ lhu $v0, 0x96($s6) -/* BB0304 802429C4 A622008E */ sh $v0, 0x8e($s1) -/* BB0308 802429C8 8FA80080 */ lw $t0, 0x80($sp) -/* BB030C 802429CC 2402000B */ addiu $v0, $zero, 0xb -/* BB0310 802429D0 AD020070 */ sw $v0, 0x70($t0) -.L802429D4: -/* BB0314 802429D4 8FBF0064 */ lw $ra, 0x64($sp) -/* BB0318 802429D8 8FBE0060 */ lw $fp, 0x60($sp) -/* BB031C 802429DC 8FB7005C */ lw $s7, 0x5c($sp) -/* BB0320 802429E0 8FB60058 */ lw $s6, 0x58($sp) -/* BB0324 802429E4 8FB50054 */ lw $s5, 0x54($sp) -/* BB0328 802429E8 8FB40050 */ lw $s4, 0x50($sp) -/* BB032C 802429EC 8FB3004C */ lw $s3, 0x4c($sp) -/* BB0330 802429F0 8FB20048 */ lw $s2, 0x48($sp) -/* BB0334 802429F4 8FB10044 */ lw $s1, 0x44($sp) -/* BB0338 802429F8 8FB00040 */ lw $s0, 0x40($sp) -/* BB033C 802429FC D7B80078 */ ldc1 $f24, 0x78($sp) -/* BB0340 80242A00 D7B60070 */ ldc1 $f22, 0x70($sp) -/* BB0344 80242A04 D7B40068 */ ldc1 $f20, 0x68($sp) -/* BB0348 80242A08 03E00008 */ jr $ra -/* BB034C 80242A0C 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_mim/mim_08/func_80242C00_BAD940.s b/asm/nonmatchings/world/area_mim/mim_08/func_80242C00_BAD940.s deleted file mode 100644 index 1bf8c9bfc4..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/func_80242C00_BAD940.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C00_BB0540 -/* BB0540 80242C00 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BB0544 80242C04 AFB40040 */ sw $s4, 0x40($sp) -/* BB0548 80242C08 0080A02D */ daddu $s4, $a0, $zero -/* BB054C 80242C0C AFBF0044 */ sw $ra, 0x44($sp) -/* BB0550 80242C10 AFB3003C */ sw $s3, 0x3c($sp) -/* BB0554 80242C14 AFB20038 */ sw $s2, 0x38($sp) -/* BB0558 80242C18 AFB10034 */ sw $s1, 0x34($sp) -/* BB055C 80242C1C AFB00030 */ sw $s0, 0x30($sp) -/* BB0560 80242C20 8E910148 */ lw $s1, 0x148($s4) -/* BB0564 80242C24 00A0902D */ daddu $s2, $a1, $zero -/* BB0568 80242C28 86240008 */ lh $a0, 8($s1) -/* BB056C 80242C2C 0C00EABB */ jal get_npc_unsafe -/* BB0570 80242C30 00C0982D */ daddu $s3, $a2, $zero -/* BB0574 80242C34 0040802D */ daddu $s0, $v0, $zero -/* BB0578 80242C38 9602008E */ lhu $v0, 0x8e($s0) -/* BB057C 80242C3C 2442FFFF */ addiu $v0, $v0, -1 -/* BB0580 80242C40 A602008E */ sh $v0, 0x8e($s0) -/* BB0584 80242C44 00021400 */ sll $v0, $v0, 0x10 -/* BB0588 80242C48 14400020 */ bnez $v0, .L80242CCC -/* BB058C 80242C4C 0260202D */ daddu $a0, $s3, $zero -/* BB0590 80242C50 AFA00010 */ sw $zero, 0x10($sp) -/* BB0594 80242C54 8E46000C */ lw $a2, 0xc($s2) -/* BB0598 80242C58 8E470010 */ lw $a3, 0x10($s2) -/* BB059C 80242C5C 0C01242D */ jal func_800490B4 -/* BB05A0 80242C60 0220282D */ daddu $a1, $s1, $zero -/* BB05A4 80242C64 54400018 */ bnel $v0, $zero, .L80242CC8 -/* BB05A8 80242C68 A600008E */ sh $zero, 0x8e($s0) -/* BB05AC 80242C6C 24040002 */ addiu $a0, $zero, 2 -/* BB05B0 80242C70 0200282D */ daddu $a1, $s0, $zero -/* BB05B4 80242C74 0000302D */ daddu $a2, $zero, $zero -/* BB05B8 80242C78 860300A8 */ lh $v1, 0xa8($s0) -/* BB05BC 80242C7C 3C013F80 */ lui $at, 0x3f80 -/* BB05C0 80242C80 44810000 */ mtc1 $at, $f0 -/* BB05C4 80242C84 3C014000 */ lui $at, 0x4000 -/* BB05C8 80242C88 44811000 */ mtc1 $at, $f2 -/* BB05CC 80242C8C 3C01C1A0 */ lui $at, 0xc1a0 -/* BB05D0 80242C90 44812000 */ mtc1 $at, $f4 -/* BB05D4 80242C94 2402000F */ addiu $v0, $zero, 0xf -/* BB05D8 80242C98 AFA2001C */ sw $v0, 0x1c($sp) -/* BB05DC 80242C9C 44833000 */ mtc1 $v1, $f6 -/* BB05E0 80242CA0 00000000 */ nop -/* BB05E4 80242CA4 468031A0 */ cvt.s.w $f6, $f6 -/* BB05E8 80242CA8 44073000 */ mfc1 $a3, $f6 -/* BB05EC 80242CAC 27A20028 */ addiu $v0, $sp, 0x28 -/* BB05F0 80242CB0 AFA20020 */ sw $v0, 0x20($sp) -/* BB05F4 80242CB4 E7A00010 */ swc1 $f0, 0x10($sp) -/* BB05F8 80242CB8 E7A20014 */ swc1 $f2, 0x14($sp) -/* BB05FC 80242CBC 0C01BFA4 */ jal fx_emote -/* BB0600 80242CC0 E7A40018 */ swc1 $f4, 0x18($sp) -/* BB0604 80242CC4 A600008E */ sh $zero, 0x8e($s0) -.L80242CC8: -/* BB0608 80242CC8 AE800070 */ sw $zero, 0x70($s4) -.L80242CCC: -/* BB060C 80242CCC 8FBF0044 */ lw $ra, 0x44($sp) -/* BB0610 80242CD0 8FB40040 */ lw $s4, 0x40($sp) -/* BB0614 80242CD4 8FB3003C */ lw $s3, 0x3c($sp) -/* BB0618 80242CD8 8FB20038 */ lw $s2, 0x38($sp) -/* BB061C 80242CDC 8FB10034 */ lw $s1, 0x34($sp) -/* BB0620 80242CE0 8FB00030 */ lw $s0, 0x30($sp) -/* BB0624 80242CE4 03E00008 */ jr $ra -/* BB0628 80242CE8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_08/pause_set_cursor_opacity_BAD940.s b/asm/nonmatchings/world/area_mim/mim_08/pause_set_cursor_opacity_BAD940.s deleted file mode 100644 index 9e24c75af3..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/pause_set_cursor_opacity_BAD940.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_set_cursor_opacity_BB04E0 -/* BB04E0 80242BA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BB04E4 80242BA4 AFB10014 */ sw $s1, 0x14($sp) -/* BB04E8 80242BA8 0080882D */ daddu $s1, $a0, $zero -/* BB04EC 80242BAC AFBF0018 */ sw $ra, 0x18($sp) -/* BB04F0 80242BB0 AFB00010 */ sw $s0, 0x10($sp) -/* BB04F4 80242BB4 8E300148 */ lw $s0, 0x148($s1) -/* BB04F8 80242BB8 0C00EABB */ jal get_npc_unsafe -/* BB04FC 80242BBC 86040008 */ lh $a0, 8($s0) -/* BB0500 80242BC0 0040182D */ daddu $v1, $v0, $zero -/* BB0504 80242BC4 9462008E */ lhu $v0, 0x8e($v1) -/* BB0508 80242BC8 2442FFFF */ addiu $v0, $v0, -1 -/* BB050C 80242BCC A462008E */ sh $v0, 0x8e($v1) -/* BB0510 80242BD0 00021400 */ sll $v0, $v0, 0x10 -/* BB0514 80242BD4 14400005 */ bnez $v0, .L80242BEC -/* BB0518 80242BD8 00000000 */ nop -/* BB051C 80242BDC 960200AA */ lhu $v0, 0xaa($s0) -/* BB0520 80242BE0 A462008E */ sh $v0, 0x8e($v1) -/* BB0524 80242BE4 2402000E */ addiu $v0, $zero, 0xe -/* BB0528 80242BE8 AE220070 */ sw $v0, 0x70($s1) -.L80242BEC: -/* BB052C 80242BEC 8FBF0018 */ lw $ra, 0x18($sp) -/* BB0530 80242BF0 8FB10014 */ lw $s1, 0x14($sp) -/* BB0534 80242BF4 8FB00010 */ lw $s0, 0x10($sp) -/* BB0538 80242BF8 03E00008 */ jr $ra -/* BB053C 80242BFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_09/func_80240068_BB2E00.s b/asm/nonmatchings/world/area_mim/mim_09/func_80240068_BB2E00.s deleted file mode 100644 index ea475967bc..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_09/func_80240068_BB2E00.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240068_BB2E68 -/* BB2E68 80240068 44806000 */ mtc1 $zero, $f12 -/* BB2E6C 8024006C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB2E70 80240070 AFB00010 */ sw $s0, 0x10($sp) -/* BB2E74 80240074 0080802D */ daddu $s0, $a0, $zero -/* BB2E78 80240078 AFBF0014 */ sw $ra, 0x14($sp) -/* BB2E7C 8024007C 0C038022 */ jal func_800E0088 -/* BB2E80 80240080 46006386 */ mov.s $f14, $f12 -/* BB2E84 80240084 4600008D */ trunc.w.s $f2, $f0 -/* BB2E88 80240088 E6020084 */ swc1 $f2, 0x84($s0) -/* BB2E8C 8024008C 8FBF0014 */ lw $ra, 0x14($sp) -/* BB2E90 80240090 8FB00010 */ lw $s0, 0x10($sp) -/* BB2E94 80240094 24020002 */ addiu $v0, $zero, 2 -/* BB2E98 80240098 03E00008 */ jr $ra -/* BB2E9C 8024009C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_09/func_802400A0_BB2E00.s b/asm/nonmatchings/world/area_mim/mim_09/func_802400A0_BB2E00.s deleted file mode 100644 index 4ec0106909..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_09/func_802400A0_BB2E00.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400A0_BB2EA0 -/* BB2EA0 802400A0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* BB2EA4 802400A4 AFB00030 */ sw $s0, 0x30($sp) -/* BB2EA8 802400A8 0080802D */ daddu $s0, $a0, $zero -/* BB2EAC 802400AC AFBF0040 */ sw $ra, 0x40($sp) -/* BB2EB0 802400B0 AFB3003C */ sw $s3, 0x3c($sp) -/* BB2EB4 802400B4 AFB20038 */ sw $s2, 0x38($sp) -/* BB2EB8 802400B8 AFB10034 */ sw $s1, 0x34($sp) -/* BB2EBC 802400BC F7B60050 */ sdc1 $f22, 0x50($sp) -/* BB2EC0 802400C0 F7B40048 */ sdc1 $f20, 0x48($sp) -/* BB2EC4 802400C4 8E130148 */ lw $s3, 0x148($s0) -/* BB2EC8 802400C8 00A0882D */ daddu $s1, $a1, $zero -/* BB2ECC 802400CC 86640008 */ lh $a0, 8($s3) -/* BB2ED0 802400D0 0C00EABB */ jal get_npc_unsafe -/* BB2ED4 802400D4 00C0902D */ daddu $s2, $a2, $zero -/* BB2ED8 802400D8 0200202D */ daddu $a0, $s0, $zero -/* BB2EDC 802400DC 0220282D */ daddu $a1, $s1, $zero -/* BB2EE0 802400E0 0240302D */ daddu $a2, $s2, $zero -/* BB2EE4 802400E4 0C012568 */ jal func_800495A0 -/* BB2EE8 802400E8 0040802D */ daddu $s0, $v0, $zero -/* BB2EEC 802400EC 8E020000 */ lw $v0, ($s0) -/* BB2EF0 802400F0 2404002D */ addiu $a0, $zero, 0x2d -/* BB2EF4 802400F4 34420800 */ ori $v0, $v0, 0x800 -/* BB2EF8 802400F8 0C00A67F */ jal rand_int -/* BB2EFC 802400FC AE020000 */ sw $v0, ($s0) -/* BB2F00 80240100 0200202D */ daddu $a0, $s0, $zero -/* BB2F04 80240104 3C05B000 */ lui $a1, 0xb000 -/* BB2F08 80240108 34A50017 */ ori $a1, $a1, 0x17 -/* BB2F0C 8024010C 44820000 */ mtc1 $v0, $f0 -/* BB2F10 80240110 00000000 */ nop -/* BB2F14 80240114 46800021 */ cvt.d.w $f0, $f0 -/* BB2F18 80240118 3C014024 */ lui $at, 0x4024 -/* BB2F1C 8024011C 44811800 */ mtc1 $at, $f3 -/* BB2F20 80240120 44801000 */ mtc1 $zero, $f2 -/* BB2F24 80240124 3C014020 */ lui $at, 0x4020 -/* BB2F28 80240128 44812800 */ mtc1 $at, $f5 -/* BB2F2C 8024012C 44802000 */ mtc1 $zero, $f4 -/* BB2F30 80240130 46220003 */ div.d $f0, $f0, $f2 -/* BB2F34 80240134 46240000 */ add.d $f0, $f0, $f4 -/* BB2F38 80240138 3C013FC0 */ lui $at, 0x3fc0 -/* BB2F3C 8024013C 44811000 */ mtc1 $at, $f2 -/* BB2F40 80240140 0000302D */ daddu $a2, $zero, $zero -/* BB2F44 80240144 E6020014 */ swc1 $f2, 0x14($s0) -/* BB2F48 80240148 46200020 */ cvt.s.d $f0, $f0 -/* BB2F4C 8024014C 0C012530 */ jal func_800494C0 -/* BB2F50 80240150 E600001C */ swc1 $f0, 0x1c($s0) -/* BB2F54 80240154 8E6300D0 */ lw $v1, 0xd0($s3) -/* BB2F58 80240158 C6000040 */ lwc1 $f0, 0x40($s0) -/* BB2F5C 8024015C C4620000 */ lwc1 $f2, ($v1) -/* BB2F60 80240160 468010A0 */ cvt.s.w $f2, $f2 -/* BB2F64 80240164 C4640008 */ lwc1 $f4, 8($v1) -/* BB2F68 80240168 46802120 */ cvt.s.w $f4, $f4 -/* BB2F6C 8024016C E7A00010 */ swc1 $f0, 0x10($sp) -/* BB2F70 80240170 8E6200D0 */ lw $v0, 0xd0($s3) -/* BB2F74 80240174 44051000 */ mfc1 $a1, $f2 -/* BB2F78 80240178 C440000C */ lwc1 $f0, 0xc($v0) -/* BB2F7C 8024017C 46800020 */ cvt.s.w $f0, $f0 -/* BB2F80 80240180 E7A00014 */ swc1 $f0, 0x14($sp) -/* BB2F84 80240184 8E6200D0 */ lw $v0, 0xd0($s3) -/* BB2F88 80240188 44062000 */ mfc1 $a2, $f4 -/* BB2F8C 8024018C C4400010 */ lwc1 $f0, 0x10($v0) -/* BB2F90 80240190 46800020 */ cvt.s.w $f0, $f0 -/* BB2F94 80240194 E7A00018 */ swc1 $f0, 0x18($sp) -/* BB2F98 80240198 8C640018 */ lw $a0, 0x18($v1) -/* BB2F9C 8024019C 0C0123F5 */ jal is_point_within_region -/* BB2FA0 802401A0 8E070038 */ lw $a3, 0x38($s0) -/* BB2FA4 802401A4 10400035 */ beqz $v0, .L8024027C -/* BB2FA8 802401A8 00000000 */ nop -/* BB2FAC 802401AC C60C0038 */ lwc1 $f12, 0x38($s0) -/* BB2FB0 802401B0 3C0141C8 */ lui $at, 0x41c8 -/* BB2FB4 802401B4 4481B000 */ mtc1 $at, $f22 -/* BB2FB8 802401B8 8E6200D0 */ lw $v0, 0xd0($s3) -/* BB2FBC 802401BC C60E0040 */ lwc1 $f14, 0x40($s0) -/* BB2FC0 802401C0 C4480000 */ lwc1 $f8, ($v0) -/* BB2FC4 802401C4 46804220 */ cvt.s.w $f8, $f8 -/* BB2FC8 802401C8 44064000 */ mfc1 $a2, $f8 -/* BB2FCC 802401CC C4480008 */ lwc1 $f8, 8($v0) -/* BB2FD0 802401D0 46804220 */ cvt.s.w $f8, $f8 -/* BB2FD4 802401D4 44074000 */ mfc1 $a3, $f8 -/* BB2FD8 802401D8 3C01403E */ lui $at, 0x403e -/* BB2FDC 802401DC 4481A800 */ mtc1 $at, $f21 -/* BB2FE0 802401E0 4480A000 */ mtc1 $zero, $f20 -/* BB2FE4 802401E4 0C00A720 */ jal atan2 -/* BB2FE8 802401E8 0000882D */ daddu $s1, $zero, $zero -/* BB2FEC 802401EC C6020038 */ lwc1 $f2, 0x38($s0) -/* BB2FF0 802401F0 C604003C */ lwc1 $f4, 0x3c($s0) -/* BB2FF4 802401F4 C6060040 */ lwc1 $f6, 0x40($s0) -/* BB2FF8 802401F8 E600000C */ swc1 $f0, 0xc($s0) -/* BB2FFC 802401FC E7A20020 */ swc1 $f2, 0x20($sp) -/* BB3000 80240200 E7A40024 */ swc1 $f4, 0x24($sp) -/* BB3004 80240204 E7A60028 */ swc1 $f6, 0x28($sp) -.L80240208: -/* BB3008 80240208 E7B60010 */ swc1 $f22, 0x10($sp) -/* BB300C 8024020C C600000C */ lwc1 $f0, 0xc($s0) -/* BB3010 80240210 E7A00014 */ swc1 $f0, 0x14($sp) -/* BB3014 80240214 860200A8 */ lh $v0, 0xa8($s0) -/* BB3018 80240218 27A50020 */ addiu $a1, $sp, 0x20 -/* BB301C 8024021C 44820000 */ mtc1 $v0, $f0 -/* BB3020 80240220 00000000 */ nop -/* BB3024 80240224 46800020 */ cvt.s.w $f0, $f0 -/* BB3028 80240228 E7A00018 */ swc1 $f0, 0x18($sp) -/* BB302C 8024022C 860200A6 */ lh $v0, 0xa6($s0) -/* BB3030 80240230 27A60024 */ addiu $a2, $sp, 0x24 -/* BB3034 80240234 44820000 */ mtc1 $v0, $f0 -/* BB3038 80240238 00000000 */ nop -/* BB303C 8024023C 46800020 */ cvt.s.w $f0, $f0 -/* BB3040 80240240 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BB3044 80240244 8E040080 */ lw $a0, 0x80($s0) -/* BB3048 80240248 0C037711 */ jal func_800DDC44 -/* BB304C 8024024C 27A70028 */ addiu $a3, $sp, 0x28 -/* BB3050 80240250 10400016 */ beqz $v0, .L802402AC -/* BB3054 80240254 26310001 */ addiu $s1, $s1, 1 -/* BB3058 80240258 C600000C */ lwc1 $f0, 0xc($s0) -/* BB305C 8024025C 46000021 */ cvt.d.s $f0, $f0 -/* BB3060 80240260 46340000 */ add.d $f0, $f0, $f20 -/* BB3064 80240264 2A220006 */ slti $v0, $s1, 6 -/* BB3068 80240268 46200020 */ cvt.s.d $f0, $f0 -/* BB306C 8024026C 1440FFE6 */ bnez $v0, .L80240208 -/* BB3070 80240270 E600000C */ swc1 $f0, 0xc($s0) -/* BB3074 80240274 080900AB */ j .L802402AC -/* BB3078 80240278 00000000 */ nop -.L8024027C: -/* BB307C 8024027C 0C00A67F */ jal rand_int -/* BB3080 80240280 2404003C */ addiu $a0, $zero, 0x3c -/* BB3084 80240284 C60C000C */ lwc1 $f12, 0xc($s0) -/* BB3088 80240288 44820000 */ mtc1 $v0, $f0 -/* BB308C 8024028C 00000000 */ nop -/* BB3090 80240290 46800020 */ cvt.s.w $f0, $f0 -/* BB3094 80240294 46006300 */ add.s $f12, $f12, $f0 -/* BB3098 80240298 3C0141F0 */ lui $at, 0x41f0 -/* BB309C 8024029C 44810000 */ mtc1 $at, $f0 -/* BB30A0 802402A0 0C00A6C9 */ jal clamp_angle -/* BB30A4 802402A4 46006301 */ sub.s $f12, $f12, $f0 -/* BB30A8 802402A8 E600000C */ swc1 $f0, 0xc($s0) -.L802402AC: -/* BB30AC 802402AC 8FBF0040 */ lw $ra, 0x40($sp) -/* BB30B0 802402B0 8FB3003C */ lw $s3, 0x3c($sp) -/* BB30B4 802402B4 8FB20038 */ lw $s2, 0x38($sp) -/* BB30B8 802402B8 8FB10034 */ lw $s1, 0x34($sp) -/* BB30BC 802402BC 8FB00030 */ lw $s0, 0x30($sp) -/* BB30C0 802402C0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* BB30C4 802402C4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* BB30C8 802402C8 03E00008 */ jr $ra -/* BB30CC 802402CC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_mim/mim_09/func_802402D0_BB2E00.s b/asm/nonmatchings/world/area_mim/mim_09/func_802402D0_BB2E00.s deleted file mode 100644 index 4d837705a1..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_09/func_802402D0_BB2E00.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402D0_BB30D0 -/* BB30D0 802402D0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* BB30D4 802402D4 AFB3004C */ sw $s3, 0x4c($sp) -/* BB30D8 802402D8 0080982D */ daddu $s3, $a0, $zero -/* BB30DC 802402DC AFBF0054 */ sw $ra, 0x54($sp) -/* BB30E0 802402E0 AFB40050 */ sw $s4, 0x50($sp) -/* BB30E4 802402E4 AFB20048 */ sw $s2, 0x48($sp) -/* BB30E8 802402E8 AFB10044 */ sw $s1, 0x44($sp) -/* BB30EC 802402EC AFB00040 */ sw $s0, 0x40($sp) -/* BB30F0 802402F0 F7B40058 */ sdc1 $f20, 0x58($sp) -/* BB30F4 802402F4 8E710148 */ lw $s1, 0x148($s3) -/* BB30F8 802402F8 00A0A02D */ daddu $s4, $a1, $zero -/* BB30FC 802402FC 86240008 */ lh $a0, 8($s1) -/* BB3100 80240300 0C00EABB */ jal get_npc_unsafe -/* BB3104 80240304 00C0902D */ daddu $s2, $a2, $zero -/* BB3108 80240308 8E830014 */ lw $v1, 0x14($s4) -/* BB310C 8024030C 04600034 */ bltz $v1, .L802403E0 -/* BB3110 80240310 0040802D */ daddu $s0, $v0, $zero -/* BB3114 80240314 8E620074 */ lw $v0, 0x74($s3) -/* BB3118 80240318 1C400030 */ bgtz $v0, .L802403DC -/* BB311C 8024031C 2442FFFF */ addiu $v0, $v0, -1 -/* BB3120 80240320 0240202D */ daddu $a0, $s2, $zero -/* BB3124 80240324 AE630074 */ sw $v1, 0x74($s3) -/* BB3128 80240328 AFA00010 */ sw $zero, 0x10($sp) -/* BB312C 8024032C 8E86000C */ lw $a2, 0xc($s4) -/* BB3130 80240330 8E870010 */ lw $a3, 0x10($s4) -/* BB3134 80240334 0C01242D */ jal func_800490B4 -/* BB3138 80240338 0220282D */ daddu $a1, $s1, $zero -/* BB313C 8024033C 10400025 */ beqz $v0, .L802403D4 -/* BB3140 80240340 0000202D */ daddu $a0, $zero, $zero -/* BB3144 80240344 0200282D */ daddu $a1, $s0, $zero -/* BB3148 80240348 0000302D */ daddu $a2, $zero, $zero -/* BB314C 8024034C 860300A8 */ lh $v1, 0xa8($s0) -/* BB3150 80240350 3C013F80 */ lui $at, 0x3f80 -/* BB3154 80240354 44810000 */ mtc1 $at, $f0 -/* BB3158 80240358 3C014000 */ lui $at, 0x4000 -/* BB315C 8024035C 44811000 */ mtc1 $at, $f2 -/* BB3160 80240360 3C01C1A0 */ lui $at, 0xc1a0 -/* BB3164 80240364 44812000 */ mtc1 $at, $f4 -/* BB3168 80240368 2402000F */ addiu $v0, $zero, 0xf -/* BB316C 8024036C AFA2001C */ sw $v0, 0x1c($sp) -/* BB3170 80240370 44835000 */ mtc1 $v1, $f10 -/* BB3174 80240374 00000000 */ nop -/* BB3178 80240378 468052A0 */ cvt.s.w $f10, $f10 -/* BB317C 8024037C 44075000 */ mfc1 $a3, $f10 -/* BB3180 80240380 27A20028 */ addiu $v0, $sp, 0x28 -/* BB3184 80240384 AFA20020 */ sw $v0, 0x20($sp) -/* BB3188 80240388 E7A00010 */ swc1 $f0, 0x10($sp) -/* BB318C 8024038C E7A20014 */ swc1 $f2, 0x14($sp) -/* BB3190 80240390 0C01BFA4 */ jal fx_emote -/* BB3194 80240394 E7A40018 */ swc1 $f4, 0x18($sp) -/* BB3198 80240398 0200202D */ daddu $a0, $s0, $zero -/* BB319C 8024039C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BB31A0 802403A0 0C012530 */ jal func_800494C0 -/* BB31A4 802403A4 3C060020 */ lui $a2, 0x20 -/* BB31A8 802403A8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BB31AC 802403AC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BB31B0 802403B0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BB31B4 802403B4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BB31B8 802403B8 8C460028 */ lw $a2, 0x28($v0) -/* BB31BC 802403BC 0C00A720 */ jal atan2 -/* BB31C0 802403C0 8C470030 */ lw $a3, 0x30($v0) -/* BB31C4 802403C4 2402000C */ addiu $v0, $zero, 0xc -/* BB31C8 802403C8 E600000C */ swc1 $f0, 0xc($s0) -/* BB31CC 802403CC 08090179 */ j .L802405E4 -/* BB31D0 802403D0 AE620070 */ sw $v0, 0x70($s3) -.L802403D4: -/* BB31D4 802403D4 8E620074 */ lw $v0, 0x74($s3) -/* BB31D8 802403D8 2442FFFF */ addiu $v0, $v0, -1 -.L802403DC: -/* BB31DC 802403DC AE620074 */ sw $v0, 0x74($s3) -.L802403E0: -/* BB31E0 802403E0 C6000018 */ lwc1 $f0, 0x18($s0) -/* BB31E4 802403E4 44801000 */ mtc1 $zero, $f2 -/* BB31E8 802403E8 44801800 */ mtc1 $zero, $f3 -/* BB31EC 802403EC 46000021 */ cvt.d.s $f0, $f0 -/* BB31F0 802403F0 4620103C */ c.lt.d $f2, $f0 -/* BB31F4 802403F4 00000000 */ nop -/* BB31F8 802403F8 45000025 */ bc1f .L80240490 -/* BB31FC 802403FC 27A5002C */ addiu $a1, $sp, 0x2c -/* BB3200 80240400 C6000038 */ lwc1 $f0, 0x38($s0) -/* BB3204 80240404 860200A6 */ lh $v0, 0xa6($s0) -/* BB3208 80240408 3C018024 */ lui $at, 0x8024 -/* BB320C 8024040C D4222B90 */ ldc1 $f2, 0x2b90($at) -/* BB3210 80240410 27A60030 */ addiu $a2, $sp, 0x30 -/* BB3214 80240414 E7A0002C */ swc1 $f0, 0x2c($sp) -/* BB3218 80240418 44820000 */ mtc1 $v0, $f0 -/* BB321C 8024041C 00000000 */ nop -/* BB3220 80240420 46800020 */ cvt.s.w $f0, $f0 -/* BB3224 80240424 46000021 */ cvt.d.s $f0, $f0 -/* BB3228 80240428 C604003C */ lwc1 $f4, 0x3c($s0) -/* BB322C 8024042C C6060040 */ lwc1 $f6, 0x40($s0) -/* BB3230 80240430 C6080018 */ lwc1 $f8, 0x18($s0) -/* BB3234 80240434 860200A8 */ lh $v0, 0xa8($s0) -/* BB3238 80240438 46220002 */ mul.d $f0, $f0, $f2 -/* BB323C 8024043C 00000000 */ nop -/* BB3240 80240440 E7A40030 */ swc1 $f4, 0x30($sp) -/* BB3244 80240444 E7A60034 */ swc1 $f6, 0x34($sp) -/* BB3248 80240448 E7A80010 */ swc1 $f8, 0x10($sp) -/* BB324C 8024044C C604000C */ lwc1 $f4, 0xc($s0) -/* BB3250 80240450 44821000 */ mtc1 $v0, $f2 -/* BB3254 80240454 00000000 */ nop -/* BB3258 80240458 468010A0 */ cvt.s.w $f2, $f2 -/* BB325C 8024045C E7A20018 */ swc1 $f2, 0x18($sp) -/* BB3260 80240460 E7A40014 */ swc1 $f4, 0x14($sp) -/* BB3264 80240464 46200020 */ cvt.s.d $f0, $f0 -/* BB3268 80240468 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BB326C 8024046C 8E040080 */ lw $a0, 0x80($s0) -/* BB3270 80240470 0C037711 */ jal func_800DDC44 -/* BB3274 80240474 27A70034 */ addiu $a3, $sp, 0x34 -/* BB3278 80240478 54400005 */ bnel $v0, $zero, .L80240490 -/* BB327C 8024047C AE000018 */ sw $zero, 0x18($s0) -/* BB3280 80240480 8E050018 */ lw $a1, 0x18($s0) -/* BB3284 80240484 8E06000C */ lw $a2, 0xc($s0) -/* BB3288 80240488 0C00EA95 */ jal npc_move_heading -/* BB328C 8024048C 0200202D */ daddu $a0, $s0, $zero -.L80240490: -/* BB3290 80240490 C600001C */ lwc1 $f0, 0x1c($s0) -/* BB3294 80240494 44801000 */ mtc1 $zero, $f2 -/* BB3298 80240498 44801800 */ mtc1 $zero, $f3 -/* BB329C 8024049C 46000021 */ cvt.d.s $f0, $f0 -/* BB32A0 802404A0 4622003C */ c.lt.d $f0, $f2 -/* BB32A4 802404A4 00000000 */ nop -/* BB32A8 802404A8 45000047 */ bc1f .L802405C8 -/* BB32AC 802404AC 27A5002C */ addiu $a1, $sp, 0x2c -/* BB32B0 802404B0 27A60030 */ addiu $a2, $sp, 0x30 -/* BB32B4 802404B4 27A20038 */ addiu $v0, $sp, 0x38 -/* BB32B8 802404B8 C602003C */ lwc1 $f2, 0x3c($s0) -/* BB32BC 802404BC C6060038 */ lwc1 $f6, 0x38($s0) -/* BB32C0 802404C0 3C01402A */ lui $at, 0x402a -/* BB32C4 802404C4 4481A800 */ mtc1 $at, $f21 -/* BB32C8 802404C8 4480A000 */ mtc1 $zero, $f20 -/* BB32CC 802404CC 460010A1 */ cvt.d.s $f2, $f2 -/* BB32D0 802404D0 46341080 */ add.d $f2, $f2, $f20 -/* BB32D4 802404D4 C600001C */ lwc1 $f0, 0x1c($s0) -/* BB32D8 802404D8 C6040040 */ lwc1 $f4, 0x40($s0) -/* BB32DC 802404DC 46000005 */ abs.s $f0, $f0 -/* BB32E0 802404E0 E7A40034 */ swc1 $f4, 0x34($sp) -/* BB32E4 802404E4 3C014030 */ lui $at, 0x4030 -/* BB32E8 802404E8 44812800 */ mtc1 $at, $f5 -/* BB32EC 802404EC 44802000 */ mtc1 $zero, $f4 -/* BB32F0 802404F0 46000021 */ cvt.d.s $f0, $f0 -/* BB32F4 802404F4 E7A6002C */ swc1 $f6, 0x2c($sp) -/* BB32F8 802404F8 46240000 */ add.d $f0, $f0, $f4 -/* BB32FC 802404FC 462010A0 */ cvt.s.d $f2, $f2 -/* BB3300 80240500 E7A20030 */ swc1 $f2, 0x30($sp) -/* BB3304 80240504 46200020 */ cvt.s.d $f0, $f0 -/* BB3308 80240508 E7A00038 */ swc1 $f0, 0x38($sp) -/* BB330C 8024050C AFA20010 */ sw $v0, 0x10($sp) -/* BB3310 80240510 8E040080 */ lw $a0, 0x80($s0) -/* BB3314 80240514 0C0372DF */ jal func_800DCB7C -/* BB3318 80240518 27A70034 */ addiu $a3, $sp, 0x34 -/* BB331C 8024051C 1040002A */ beqz $v0, .L802405C8 -/* BB3320 80240520 00000000 */ nop -/* BB3324 80240524 C600001C */ lwc1 $f0, 0x1c($s0) -/* BB3328 80240528 C7A20038 */ lwc1 $f2, 0x38($sp) -/* BB332C 8024052C 46000005 */ abs.s $f0, $f0 -/* BB3330 80240530 46000021 */ cvt.d.s $f0, $f0 -/* BB3334 80240534 46340000 */ add.d $f0, $f0, $f20 -/* BB3338 80240538 460010A1 */ cvt.d.s $f2, $f2 -/* BB333C 8024053C 4620103E */ c.le.d $f2, $f0 -/* BB3340 80240540 00000000 */ nop -/* BB3344 80240544 45000020 */ bc1f .L802405C8 -/* BB3348 80240548 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BB334C 8024054C C7A00030 */ lwc1 $f0, 0x30($sp) -/* BB3350 80240550 8E020000 */ lw $v0, ($s0) -/* BB3354 80240554 2403F7FF */ addiu $v1, $zero, -0x801 -/* BB3358 80240558 AE00001C */ sw $zero, 0x1c($s0) -/* BB335C 8024055C 00431024 */ and $v0, $v0, $v1 -/* BB3360 80240560 AE020000 */ sw $v0, ($s0) -/* BB3364 80240564 24020002 */ addiu $v0, $zero, 2 -/* BB3368 80240568 E600003C */ swc1 $f0, 0x3c($s0) -/* BB336C 8024056C 0C00A67F */ jal rand_int -/* BB3370 80240570 AE620070 */ sw $v0, 0x70($s3) -/* BB3374 80240574 3C035555 */ lui $v1, 0x5555 -/* BB3378 80240578 34635556 */ ori $v1, $v1, 0x5556 -/* BB337C 8024057C 00430018 */ mult $v0, $v1 -/* BB3380 80240580 000227C3 */ sra $a0, $v0, 0x1f -/* BB3384 80240584 00004010 */ mfhi $t0 -/* BB3388 80240588 01042023 */ subu $a0, $t0, $a0 -/* BB338C 8024058C 00041840 */ sll $v1, $a0, 1 -/* BB3390 80240590 00641821 */ addu $v1, $v1, $a0 -/* BB3394 80240594 00431023 */ subu $v0, $v0, $v1 -/* BB3398 80240598 24430002 */ addiu $v1, $v0, 2 -/* BB339C 8024059C AE630074 */ sw $v1, 0x74($s3) -/* BB33A0 802405A0 8E82002C */ lw $v0, 0x2c($s4) -/* BB33A4 802405A4 5840000F */ blezl $v0, .L802405E4 -/* BB33A8 802405A8 AE600070 */ sw $zero, 0x70($s3) -/* BB33AC 802405AC 8E820004 */ lw $v0, 4($s4) -/* BB33B0 802405B0 5840000C */ blezl $v0, .L802405E4 -/* BB33B4 802405B4 AE600070 */ sw $zero, 0x70($s3) -/* BB33B8 802405B8 1460000A */ bnez $v1, .L802405E4 -/* BB33BC 802405BC 00000000 */ nop -/* BB33C0 802405C0 08090179 */ j .L802405E4 -/* BB33C4 802405C4 AE600070 */ sw $zero, 0x70($s3) -.L802405C8: -/* BB33C8 802405C8 C604003C */ lwc1 $f4, 0x3c($s0) -/* BB33CC 802405CC C600001C */ lwc1 $f0, 0x1c($s0) -/* BB33D0 802405D0 46002100 */ add.s $f4, $f4, $f0 -/* BB33D4 802405D4 C6020014 */ lwc1 $f2, 0x14($s0) -/* BB33D8 802405D8 46020001 */ sub.s $f0, $f0, $f2 -/* BB33DC 802405DC E604003C */ swc1 $f4, 0x3c($s0) -/* BB33E0 802405E0 E600001C */ swc1 $f0, 0x1c($s0) -.L802405E4: -/* BB33E4 802405E4 8FBF0054 */ lw $ra, 0x54($sp) -/* BB33E8 802405E8 8FB40050 */ lw $s4, 0x50($sp) -/* BB33EC 802405EC 8FB3004C */ lw $s3, 0x4c($sp) -/* BB33F0 802405F0 8FB20048 */ lw $s2, 0x48($sp) -/* BB33F4 802405F4 8FB10044 */ lw $s1, 0x44($sp) -/* BB33F8 802405F8 8FB00040 */ lw $s0, 0x40($sp) -/* BB33FC 802405FC D7B40058 */ ldc1 $f20, 0x58($sp) -/* BB3400 80240600 03E00008 */ jr $ra -/* BB3404 80240604 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_mim/mim_09/func_802406C8_BB2E00.s b/asm/nonmatchings/world/area_mim/mim_09/func_802406C8_BB2E00.s deleted file mode 100644 index c16362cc0d..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_09/func_802406C8_BB2E00.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406C8_BB34C8 -/* BB34C8 802406C8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BB34CC 802406CC AFB40040 */ sw $s4, 0x40($sp) -/* BB34D0 802406D0 0080A02D */ daddu $s4, $a0, $zero -/* BB34D4 802406D4 AFBF0044 */ sw $ra, 0x44($sp) -/* BB34D8 802406D8 AFB3003C */ sw $s3, 0x3c($sp) -/* BB34DC 802406DC AFB20038 */ sw $s2, 0x38($sp) -/* BB34E0 802406E0 AFB10034 */ sw $s1, 0x34($sp) -/* BB34E4 802406E4 AFB00030 */ sw $s0, 0x30($sp) -/* BB34E8 802406E8 8E920148 */ lw $s2, 0x148($s4) -/* BB34EC 802406EC 00A0882D */ daddu $s1, $a1, $zero -/* BB34F0 802406F0 86440008 */ lh $a0, 8($s2) -/* BB34F4 802406F4 0C00EABB */ jal get_npc_unsafe -/* BB34F8 802406F8 00C0982D */ daddu $s3, $a2, $zero -/* BB34FC 802406FC 8E230014 */ lw $v1, 0x14($s1) -/* BB3500 80240700 0460002D */ bltz $v1, .L802407B8 -/* BB3504 80240704 0040802D */ daddu $s0, $v0, $zero -/* BB3508 80240708 0260202D */ daddu $a0, $s3, $zero -/* BB350C 8024070C AFA00010 */ sw $zero, 0x10($sp) -/* BB3510 80240710 8E260024 */ lw $a2, 0x24($s1) -/* BB3514 80240714 8E270028 */ lw $a3, 0x28($s1) -/* BB3518 80240718 0C01242D */ jal func_800490B4 -/* BB351C 8024071C 0240282D */ daddu $a1, $s2, $zero -/* BB3520 80240720 10400025 */ beqz $v0, .L802407B8 -/* BB3524 80240724 0000202D */ daddu $a0, $zero, $zero -/* BB3528 80240728 0200282D */ daddu $a1, $s0, $zero -/* BB352C 8024072C 0000302D */ daddu $a2, $zero, $zero -/* BB3530 80240730 860300A8 */ lh $v1, 0xa8($s0) -/* BB3534 80240734 3C013F80 */ lui $at, 0x3f80 -/* BB3538 80240738 44810000 */ mtc1 $at, $f0 -/* BB353C 8024073C 3C014000 */ lui $at, 0x4000 -/* BB3540 80240740 44811000 */ mtc1 $at, $f2 -/* BB3544 80240744 3C01C1A0 */ lui $at, 0xc1a0 -/* BB3548 80240748 44812000 */ mtc1 $at, $f4 -/* BB354C 8024074C 2402000F */ addiu $v0, $zero, 0xf -/* BB3550 80240750 AFA2001C */ sw $v0, 0x1c($sp) -/* BB3554 80240754 44833000 */ mtc1 $v1, $f6 -/* BB3558 80240758 00000000 */ nop -/* BB355C 8024075C 468031A0 */ cvt.s.w $f6, $f6 -/* BB3560 80240760 44073000 */ mfc1 $a3, $f6 -/* BB3564 80240764 27A20028 */ addiu $v0, $sp, 0x28 -/* BB3568 80240768 AFA20020 */ sw $v0, 0x20($sp) -/* BB356C 8024076C E7A00010 */ swc1 $f0, 0x10($sp) -/* BB3570 80240770 E7A20014 */ swc1 $f2, 0x14($sp) -/* BB3574 80240774 0C01BFA4 */ jal fx_emote -/* BB3578 80240778 E7A40018 */ swc1 $f4, 0x18($sp) -/* BB357C 8024077C 0200202D */ daddu $a0, $s0, $zero -/* BB3580 80240780 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BB3584 80240784 0C012530 */ jal func_800494C0 -/* BB3588 80240788 3C060020 */ lui $a2, 0x20 -/* BB358C 8024078C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BB3590 80240790 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BB3594 80240794 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BB3598 80240798 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BB359C 8024079C 8C460028 */ lw $a2, 0x28($v0) -/* BB35A0 802407A0 0C00A720 */ jal atan2 -/* BB35A4 802407A4 8C470030 */ lw $a3, 0x30($v0) -/* BB35A8 802407A8 2402000C */ addiu $v0, $zero, 0xc -/* BB35AC 802407AC E600000C */ swc1 $f0, 0xc($s0) -/* BB35B0 802407B0 08090213 */ j .L8024084C -/* BB35B4 802407B4 AE820070 */ sw $v0, 0x70($s4) -.L802407B8: -/* BB35B8 802407B8 8602008C */ lh $v0, 0x8c($s0) -/* BB35BC 802407BC 14400023 */ bnez $v0, .L8024084C -/* BB35C0 802407C0 00000000 */ nop -/* BB35C4 802407C4 9602008E */ lhu $v0, 0x8e($s0) -/* BB35C8 802407C8 2442FFFF */ addiu $v0, $v0, -1 -/* BB35CC 802407CC A602008E */ sh $v0, 0x8e($s0) -/* BB35D0 802407D0 00021400 */ sll $v0, $v0, 0x10 -/* BB35D4 802407D4 1C40001D */ bgtz $v0, .L8024084C -/* BB35D8 802407D8 00000000 */ nop -/* BB35DC 802407DC 8E820074 */ lw $v0, 0x74($s4) -/* BB35E0 802407E0 2442FFFF */ addiu $v0, $v0, -1 -/* BB35E4 802407E4 18400018 */ blez $v0, .L80240848 -/* BB35E8 802407E8 AE820074 */ sw $v0, 0x74($s4) -/* BB35EC 802407EC C600000C */ lwc1 $f0, 0xc($s0) -/* BB35F0 802407F0 3C014334 */ lui $at, 0x4334 -/* BB35F4 802407F4 44816000 */ mtc1 $at, $f12 -/* BB35F8 802407F8 0C00A6C9 */ jal clamp_angle -/* BB35FC 802407FC 460C0300 */ add.s $f12, $f0, $f12 -/* BB3600 80240800 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BB3604 80240804 0C00A67F */ jal rand_int -/* BB3608 80240808 E600000C */ swc1 $f0, 0xc($s0) -/* BB360C 8024080C 3C032E8B */ lui $v1, 0x2e8b -/* BB3610 80240810 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* BB3614 80240814 00430018 */ mult $v0, $v1 -/* BB3618 80240818 00021FC3 */ sra $v1, $v0, 0x1f -/* BB361C 8024081C 00004010 */ mfhi $t0 -/* BB3620 80240820 00082043 */ sra $a0, $t0, 1 -/* BB3624 80240824 00832023 */ subu $a0, $a0, $v1 -/* BB3628 80240828 00041840 */ sll $v1, $a0, 1 -/* BB362C 8024082C 00641821 */ addu $v1, $v1, $a0 -/* BB3630 80240830 00031880 */ sll $v1, $v1, 2 -/* BB3634 80240834 00641823 */ subu $v1, $v1, $a0 -/* BB3638 80240838 00431023 */ subu $v0, $v0, $v1 -/* BB363C 8024083C 24420005 */ addiu $v0, $v0, 5 -/* BB3640 80240840 08090213 */ j .L8024084C -/* BB3644 80240844 A602008E */ sh $v0, 0x8e($s0) -.L80240848: -/* BB3648 80240848 AE800070 */ sw $zero, 0x70($s4) -.L8024084C: -/* BB364C 8024084C 8FBF0044 */ lw $ra, 0x44($sp) -/* BB3650 80240850 8FB40040 */ lw $s4, 0x40($sp) -/* BB3654 80240854 8FB3003C */ lw $s3, 0x3c($sp) -/* BB3658 80240858 8FB20038 */ lw $s2, 0x38($sp) -/* BB365C 8024085C 8FB10034 */ lw $s1, 0x34($sp) -/* BB3660 80240860 8FB00030 */ lw $s0, 0x30($sp) -/* BB3664 80240864 03E00008 */ jr $ra -/* BB3668 80240868 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_09/func_8024086C_BB2E00.s b/asm/nonmatchings/world/area_mim/mim_09/func_8024086C_BB2E00.s deleted file mode 100644 index f9c966c5a7..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_09/func_8024086C_BB2E00.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024086C_BB366C -/* BB366C 8024086C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BB3670 80240870 AFB10014 */ sw $s1, 0x14($sp) -/* BB3674 80240874 0080882D */ daddu $s1, $a0, $zero -/* BB3678 80240878 AFBF001C */ sw $ra, 0x1c($sp) -/* BB367C 8024087C AFB20018 */ sw $s2, 0x18($sp) -/* BB3680 80240880 AFB00010 */ sw $s0, 0x10($sp) -/* BB3684 80240884 8E220148 */ lw $v0, 0x148($s1) -/* BB3688 80240888 00A0902D */ daddu $s2, $a1, $zero -/* BB368C 8024088C 84440008 */ lh $a0, 8($v0) -/* BB3690 80240890 0C00EABB */ jal get_npc_unsafe -/* BB3694 80240894 00C0802D */ daddu $s0, $a2, $zero -/* BB3698 80240898 0220202D */ daddu $a0, $s1, $zero -/* BB369C 8024089C 0240282D */ daddu $a1, $s2, $zero -/* BB36A0 802408A0 0200302D */ daddu $a2, $s0, $zero -/* BB36A4 802408A4 0C0127DF */ jal func_80049F7C -/* BB36A8 802408A8 0040802D */ daddu $s0, $v0, $zero -/* BB36AC 802408AC 8E020000 */ lw $v0, ($s0) -/* BB36B0 802408B0 24040005 */ addiu $a0, $zero, 5 -/* BB36B4 802408B4 34420800 */ ori $v0, $v0, 0x800 -/* BB36B8 802408B8 0C00A67F */ jal rand_int -/* BB36BC 802408BC AE020000 */ sw $v0, ($s0) -/* BB36C0 802408C0 44820000 */ mtc1 $v0, $f0 -/* BB36C4 802408C4 00000000 */ nop -/* BB36C8 802408C8 46800021 */ cvt.d.w $f0, $f0 -/* BB36CC 802408CC 3C014024 */ lui $at, 0x4024 -/* BB36D0 802408D0 44811800 */ mtc1 $at, $f3 -/* BB36D4 802408D4 44801000 */ mtc1 $zero, $f2 -/* BB36D8 802408D8 3C013FC0 */ lui $at, 0x3fc0 -/* BB36DC 802408DC 44812000 */ mtc1 $at, $f4 -/* BB36E0 802408E0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BB36E4 802408E4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BB36E8 802408E8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BB36EC 802408EC C60E0040 */ lwc1 $f14, 0x40($s0) -/* BB36F0 802408F0 46220000 */ add.d $f0, $f0, $f2 -/* BB36F4 802408F4 E6040014 */ swc1 $f4, 0x14($s0) -/* BB36F8 802408F8 46200020 */ cvt.s.d $f0, $f0 -/* BB36FC 802408FC E600001C */ swc1 $f0, 0x1c($s0) -/* BB3700 80240900 8C460028 */ lw $a2, 0x28($v0) -/* BB3704 80240904 0C00A720 */ jal atan2 -/* BB3708 80240908 8C470030 */ lw $a3, 0x30($v0) -/* BB370C 8024090C 0200202D */ daddu $a0, $s0, $zero -/* BB3710 80240910 3C05B000 */ lui $a1, 0xb000 -/* BB3714 80240914 34A50017 */ ori $a1, $a1, 0x17 -/* BB3718 80240918 0000302D */ daddu $a2, $zero, $zero -/* BB371C 8024091C E480000C */ swc1 $f0, 0xc($a0) -/* BB3720 80240920 C6400018 */ lwc1 $f0, 0x18($s2) -/* BB3724 80240924 2402000D */ addiu $v0, $zero, 0xd -/* BB3728 80240928 E4800018 */ swc1 $f0, 0x18($a0) -/* BB372C 8024092C 0C012530 */ jal func_800494C0 -/* BB3730 80240930 AE220070 */ sw $v0, 0x70($s1) -/* BB3734 80240934 8FBF001C */ lw $ra, 0x1c($sp) -/* BB3738 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* BB373C 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* BB3740 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* BB3744 80240944 03E00008 */ jr $ra -/* BB3748 80240948 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_09/func_8024094C_BB2E00.s b/asm/nonmatchings/world/area_mim/mim_09/func_8024094C_BB2E00.s deleted file mode 100644 index 3412692157..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_09/func_8024094C_BB2E00.s +++ /dev/null @@ -1,200 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024094C_BB374C -/* BB374C 8024094C 27BDFF90 */ addiu $sp, $sp, -0x70 -/* BB3750 80240950 AFB40050 */ sw $s4, 0x50($sp) -/* BB3754 80240954 0080A02D */ daddu $s4, $a0, $zero -/* BB3758 80240958 AFBF0060 */ sw $ra, 0x60($sp) -/* BB375C 8024095C AFB7005C */ sw $s7, 0x5c($sp) -/* BB3760 80240960 AFB60058 */ sw $s6, 0x58($sp) -/* BB3764 80240964 AFB50054 */ sw $s5, 0x54($sp) -/* BB3768 80240968 AFB3004C */ sw $s3, 0x4c($sp) -/* BB376C 8024096C AFB20048 */ sw $s2, 0x48($sp) -/* BB3770 80240970 AFB10044 */ sw $s1, 0x44($sp) -/* BB3774 80240974 AFB00040 */ sw $s0, 0x40($sp) -/* BB3778 80240978 F7B40068 */ sdc1 $f20, 0x68($sp) -/* BB377C 8024097C 8E950148 */ lw $s5, 0x148($s4) -/* BB3780 80240980 00A0B02D */ daddu $s6, $a1, $zero -/* BB3784 80240984 86A40008 */ lh $a0, 8($s5) -/* BB3788 80240988 0C00EABB */ jal get_npc_unsafe -/* BB378C 8024098C 00C0B82D */ daddu $s7, $a2, $zero -/* BB3790 80240990 0040982D */ daddu $s3, $v0, $zero -/* BB3794 80240994 C6600018 */ lwc1 $f0, 0x18($s3) -/* BB3798 80240998 44801000 */ mtc1 $zero, $f2 -/* BB379C 8024099C 44801800 */ mtc1 $zero, $f3 -/* BB37A0 802409A0 46000021 */ cvt.d.s $f0, $f0 -/* BB37A4 802409A4 4620103C */ c.lt.d $f2, $f0 -/* BB37A8 802409A8 00000000 */ nop -/* BB37AC 802409AC 45000021 */ bc1f .L80240A34 -/* BB37B0 802409B0 27A50028 */ addiu $a1, $sp, 0x28 -/* BB37B4 802409B4 C6600038 */ lwc1 $f0, 0x38($s3) -/* BB37B8 802409B8 C662003C */ lwc1 $f2, 0x3c($s3) -/* BB37BC 802409BC C6640040 */ lwc1 $f4, 0x40($s3) -/* BB37C0 802409C0 C6660018 */ lwc1 $f6, 0x18($s3) -/* BB37C4 802409C4 E7A00028 */ swc1 $f0, 0x28($sp) -/* BB37C8 802409C8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BB37CC 802409CC E7A40030 */ swc1 $f4, 0x30($sp) -/* BB37D0 802409D0 E7A60010 */ swc1 $f6, 0x10($sp) -/* BB37D4 802409D4 C660000C */ lwc1 $f0, 0xc($s3) -/* BB37D8 802409D8 E7A00014 */ swc1 $f0, 0x14($sp) -/* BB37DC 802409DC 866200A8 */ lh $v0, 0xa8($s3) -/* BB37E0 802409E0 44820000 */ mtc1 $v0, $f0 -/* BB37E4 802409E4 00000000 */ nop -/* BB37E8 802409E8 46800020 */ cvt.s.w $f0, $f0 -/* BB37EC 802409EC E7A00018 */ swc1 $f0, 0x18($sp) -/* BB37F0 802409F0 866200A6 */ lh $v0, 0xa6($s3) -/* BB37F4 802409F4 27A6002C */ addiu $a2, $sp, 0x2c -/* BB37F8 802409F8 44820000 */ mtc1 $v0, $f0 -/* BB37FC 802409FC 00000000 */ nop -/* BB3800 80240A00 46800020 */ cvt.s.w $f0, $f0 -/* BB3804 80240A04 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BB3808 80240A08 8E640080 */ lw $a0, 0x80($s3) -/* BB380C 80240A0C 0C037711 */ jal func_800DDC44 -/* BB3810 80240A10 27A70030 */ addiu $a3, $sp, 0x30 -/* BB3814 80240A14 10400003 */ beqz $v0, .L80240A24 -/* BB3818 80240A18 00000000 */ nop -/* BB381C 80240A1C 0809028D */ j .L80240A34 -/* BB3820 80240A20 AE600018 */ sw $zero, 0x18($s3) -.L80240A24: -/* BB3824 80240A24 8E650018 */ lw $a1, 0x18($s3) -/* BB3828 80240A28 8E66000C */ lw $a2, 0xc($s3) -/* BB382C 80240A2C 0C00EA95 */ jal npc_move_heading -/* BB3830 80240A30 0260202D */ daddu $a0, $s3, $zero -.L80240A34: -/* BB3834 80240A34 C660001C */ lwc1 $f0, 0x1c($s3) -/* BB3838 80240A38 44801000 */ mtc1 $zero, $f2 -/* BB383C 80240A3C 44801800 */ mtc1 $zero, $f3 -/* BB3840 80240A40 46000021 */ cvt.d.s $f0, $f0 -/* BB3844 80240A44 4622003C */ c.lt.d $f0, $f2 -/* BB3848 80240A48 00000000 */ nop -/* BB384C 80240A4C 4500006C */ bc1f .L80240C00 -/* BB3850 80240A50 27B00028 */ addiu $s0, $sp, 0x28 -/* BB3854 80240A54 0200282D */ daddu $a1, $s0, $zero -/* BB3858 80240A58 27A60034 */ addiu $a2, $sp, 0x34 -/* BB385C 80240A5C 27B20038 */ addiu $s2, $sp, 0x38 -/* BB3860 80240A60 C6600038 */ lwc1 $f0, 0x38($s3) -/* BB3864 80240A64 3C0142C8 */ lui $at, 0x42c8 -/* BB3868 80240A68 44811000 */ mtc1 $at, $f2 -/* BB386C 80240A6C C6640040 */ lwc1 $f4, 0x40($s3) -/* BB3870 80240A70 3C01447A */ lui $at, 0x447a -/* BB3874 80240A74 44813000 */ mtc1 $at, $f6 -/* BB3878 80240A78 27B10030 */ addiu $s1, $sp, 0x30 -/* BB387C 80240A7C E7A00028 */ swc1 $f0, 0x28($sp) -/* BB3880 80240A80 E7A20034 */ swc1 $f2, 0x34($sp) -/* BB3884 80240A84 E7A40030 */ swc1 $f4, 0x30($sp) -/* BB3888 80240A88 E7A60038 */ swc1 $f6, 0x38($sp) -/* BB388C 80240A8C AFB20010 */ sw $s2, 0x10($sp) -/* BB3890 80240A90 8E640080 */ lw $a0, 0x80($s3) -/* BB3894 80240A94 0C0372DF */ jal func_800DCB7C -/* BB3898 80240A98 0220382D */ daddu $a3, $s1, $zero -/* BB389C 80240A9C 0200282D */ daddu $a1, $s0, $zero -/* BB38A0 80240AA0 27A6002C */ addiu $a2, $sp, 0x2c -/* BB38A4 80240AA4 C662003C */ lwc1 $f2, 0x3c($s3) -/* BB38A8 80240AA8 C6660038 */ lwc1 $f6, 0x38($s3) -/* BB38AC 80240AAC 3C01402A */ lui $at, 0x402a -/* BB38B0 80240AB0 4481A800 */ mtc1 $at, $f21 -/* BB38B4 80240AB4 4480A000 */ mtc1 $zero, $f20 -/* BB38B8 80240AB8 460010A1 */ cvt.d.s $f2, $f2 -/* BB38BC 80240ABC 46341080 */ add.d $f2, $f2, $f20 -/* BB38C0 80240AC0 C660001C */ lwc1 $f0, 0x1c($s3) -/* BB38C4 80240AC4 C6640040 */ lwc1 $f4, 0x40($s3) -/* BB38C8 80240AC8 46000005 */ abs.s $f0, $f0 -/* BB38CC 80240ACC E7A40030 */ swc1 $f4, 0x30($sp) -/* BB38D0 80240AD0 3C014030 */ lui $at, 0x4030 -/* BB38D4 80240AD4 44812800 */ mtc1 $at, $f5 -/* BB38D8 80240AD8 44802000 */ mtc1 $zero, $f4 -/* BB38DC 80240ADC 46000021 */ cvt.d.s $f0, $f0 -/* BB38E0 80240AE0 E7A60028 */ swc1 $f6, 0x28($sp) -/* BB38E4 80240AE4 46240000 */ add.d $f0, $f0, $f4 -/* BB38E8 80240AE8 462010A0 */ cvt.s.d $f2, $f2 -/* BB38EC 80240AEC E7A2002C */ swc1 $f2, 0x2c($sp) -/* BB38F0 80240AF0 46200020 */ cvt.s.d $f0, $f0 -/* BB38F4 80240AF4 E7A00038 */ swc1 $f0, 0x38($sp) -/* BB38F8 80240AF8 AFB20010 */ sw $s2, 0x10($sp) -/* BB38FC 80240AFC 8E640080 */ lw $a0, 0x80($s3) -/* BB3900 80240B00 0C0372DF */ jal func_800DCB7C -/* BB3904 80240B04 0220382D */ daddu $a3, $s1, $zero -/* BB3908 80240B08 1040003D */ beqz $v0, .L80240C00 -/* BB390C 80240B0C 00000000 */ nop -/* BB3910 80240B10 C660001C */ lwc1 $f0, 0x1c($s3) -/* BB3914 80240B14 C7A20038 */ lwc1 $f2, 0x38($sp) -/* BB3918 80240B18 46000005 */ abs.s $f0, $f0 -/* BB391C 80240B1C 46000021 */ cvt.d.s $f0, $f0 -/* BB3920 80240B20 46340000 */ add.d $f0, $f0, $f20 -/* BB3924 80240B24 460010A1 */ cvt.d.s $f2, $f2 -/* BB3928 80240B28 4620103E */ c.le.d $f2, $f0 -/* BB392C 80240B2C 00000000 */ nop -/* BB3930 80240B30 45000033 */ bc1f .L80240C00 -/* BB3934 80240B34 2403F7FF */ addiu $v1, $zero, -0x801 -/* BB3938 80240B38 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BB393C 80240B3C 8E620000 */ lw $v0, ($s3) -/* BB3940 80240B40 AE60001C */ sw $zero, 0x1c($s3) -/* BB3944 80240B44 00431024 */ and $v0, $v0, $v1 -/* BB3948 80240B48 E660003C */ swc1 $f0, 0x3c($s3) -/* BB394C 80240B4C AE620000 */ sw $v0, ($s3) -/* BB3950 80240B50 AFA00010 */ sw $zero, 0x10($sp) -/* BB3954 80240B54 AFA00014 */ sw $zero, 0x14($sp) -/* BB3958 80240B58 8E650038 */ lw $a1, 0x38($s3) -/* BB395C 80240B5C 8E66003C */ lw $a2, 0x3c($s3) -/* BB3960 80240B60 8E670040 */ lw $a3, 0x40($s3) -/* BB3964 80240B64 0C01BECC */ jal fx_walk_normal -/* BB3968 80240B68 24040002 */ addiu $a0, $zero, 2 -/* BB396C 80240B6C 02E0202D */ daddu $a0, $s7, $zero -/* BB3970 80240B70 2402000C */ addiu $v0, $zero, 0xc -/* BB3974 80240B74 AE820070 */ sw $v0, 0x70($s4) -/* BB3978 80240B78 24020001 */ addiu $v0, $zero, 1 -/* BB397C 80240B7C AFA20010 */ sw $v0, 0x10($sp) -/* BB3980 80240B80 8EC60024 */ lw $a2, 0x24($s6) -/* BB3984 80240B84 8EC70028 */ lw $a3, 0x28($s6) -/* BB3988 80240B88 0C01242D */ jal func_800490B4 -/* BB398C 80240B8C 02A0282D */ daddu $a1, $s5, $zero -/* BB3990 80240B90 14400022 */ bnez $v0, .L80240C1C -/* BB3994 80240B94 24040002 */ addiu $a0, $zero, 2 -/* BB3998 80240B98 0260282D */ daddu $a1, $s3, $zero -/* BB399C 80240B9C 0000302D */ daddu $a2, $zero, $zero -/* BB39A0 80240BA0 866300A8 */ lh $v1, 0xa8($s3) -/* BB39A4 80240BA4 3C013F80 */ lui $at, 0x3f80 -/* BB39A8 80240BA8 44810000 */ mtc1 $at, $f0 -/* BB39AC 80240BAC 3C014000 */ lui $at, 0x4000 -/* BB39B0 80240BB0 44811000 */ mtc1 $at, $f2 -/* BB39B4 80240BB4 3C01C1A0 */ lui $at, 0xc1a0 -/* BB39B8 80240BB8 44812000 */ mtc1 $at, $f4 -/* BB39BC 80240BBC 2402000F */ addiu $v0, $zero, 0xf -/* BB39C0 80240BC0 AFA2001C */ sw $v0, 0x1c($sp) -/* BB39C4 80240BC4 44834000 */ mtc1 $v1, $f8 -/* BB39C8 80240BC8 00000000 */ nop -/* BB39CC 80240BCC 46804220 */ cvt.s.w $f8, $f8 -/* BB39D0 80240BD0 44074000 */ mfc1 $a3, $f8 -/* BB39D4 80240BD4 27A2003C */ addiu $v0, $sp, 0x3c -/* BB39D8 80240BD8 AFA20020 */ sw $v0, 0x20($sp) -/* BB39DC 80240BDC E7A00010 */ swc1 $f0, 0x10($sp) -/* BB39E0 80240BE0 E7A20014 */ swc1 $f2, 0x14($sp) -/* BB39E4 80240BE4 0C01BFA4 */ jal fx_emote -/* BB39E8 80240BE8 E7A40018 */ swc1 $f4, 0x18($sp) -/* BB39EC 80240BEC 24020019 */ addiu $v0, $zero, 0x19 -/* BB39F0 80240BF0 A662008E */ sh $v0, 0x8e($s3) -/* BB39F4 80240BF4 2402000E */ addiu $v0, $zero, 0xe -/* BB39F8 80240BF8 08090307 */ j .L80240C1C -/* BB39FC 80240BFC AE820070 */ sw $v0, 0x70($s4) -.L80240C00: -/* BB3A00 80240C00 C664003C */ lwc1 $f4, 0x3c($s3) -/* BB3A04 80240C04 C660001C */ lwc1 $f0, 0x1c($s3) -/* BB3A08 80240C08 46002100 */ add.s $f4, $f4, $f0 -/* BB3A0C 80240C0C C6620014 */ lwc1 $f2, 0x14($s3) -/* BB3A10 80240C10 46020001 */ sub.s $f0, $f0, $f2 -/* BB3A14 80240C14 E664003C */ swc1 $f4, 0x3c($s3) -/* BB3A18 80240C18 E660001C */ swc1 $f0, 0x1c($s3) -.L80240C1C: -/* BB3A1C 80240C1C 8FBF0060 */ lw $ra, 0x60($sp) -/* BB3A20 80240C20 8FB7005C */ lw $s7, 0x5c($sp) -/* BB3A24 80240C24 8FB60058 */ lw $s6, 0x58($sp) -/* BB3A28 80240C28 8FB50054 */ lw $s5, 0x54($sp) -/* BB3A2C 80240C2C 8FB40050 */ lw $s4, 0x50($sp) -/* BB3A30 80240C30 8FB3004C */ lw $s3, 0x4c($sp) -/* BB3A34 80240C34 8FB20048 */ lw $s2, 0x48($sp) -/* BB3A38 80240C38 8FB10044 */ lw $s1, 0x44($sp) -/* BB3A3C 80240C3C 8FB00040 */ lw $s0, 0x40($sp) -/* BB3A40 80240C40 D7B40068 */ ldc1 $f20, 0x68($sp) -/* BB3A44 80240C44 03E00008 */ jr $ra -/* BB3A48 80240C48 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_mim/mim_09/func_80240C4C_BB2E00.s b/asm/nonmatchings/world/area_mim/mim_09/func_80240C4C_BB2E00.s deleted file mode 100644 index c68ea30b0c..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_09/func_80240C4C_BB2E00.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_BB3A4C -/* BB3A4C 80240C4C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB3A50 80240C50 AFB00010 */ sw $s0, 0x10($sp) -/* BB3A54 80240C54 0080802D */ daddu $s0, $a0, $zero -/* BB3A58 80240C58 AFBF0014 */ sw $ra, 0x14($sp) -/* BB3A5C 80240C5C 8E020148 */ lw $v0, 0x148($s0) -/* BB3A60 80240C60 0C00EABB */ jal get_npc_unsafe -/* BB3A64 80240C64 84440008 */ lh $a0, 8($v0) -/* BB3A68 80240C68 9443008E */ lhu $v1, 0x8e($v0) -/* BB3A6C 80240C6C 2463FFFF */ addiu $v1, $v1, -1 -/* BB3A70 80240C70 A443008E */ sh $v1, 0x8e($v0) -/* BB3A74 80240C74 00031C00 */ sll $v1, $v1, 0x10 -/* BB3A78 80240C78 58600001 */ blezl $v1, .L80240C80 -/* BB3A7C 80240C7C AE000070 */ sw $zero, 0x70($s0) -.L80240C80: -/* BB3A80 80240C80 8FBF0014 */ lw $ra, 0x14($sp) -/* BB3A84 80240C84 8FB00010 */ lw $s0, 0x10($sp) -/* BB3A88 80240C88 03E00008 */ jr $ra -/* BB3A8C 80240C8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_09/func_80240C90_BB2E00.s b/asm/nonmatchings/world/area_mim/mim_09/func_80240C90_BB2E00.s deleted file mode 100644 index 6c02221e52..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_09/func_80240C90_BB2E00.s +++ /dev/null @@ -1,148 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C90_BB3A90 -/* BB3A90 80240C90 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BB3A94 80240C94 AFB3003C */ sw $s3, 0x3c($sp) -/* BB3A98 80240C98 0080982D */ daddu $s3, $a0, $zero -/* BB3A9C 80240C9C AFBF0048 */ sw $ra, 0x48($sp) -/* BB3AA0 80240CA0 AFB50044 */ sw $s5, 0x44($sp) -/* BB3AA4 80240CA4 AFB40040 */ sw $s4, 0x40($sp) -/* BB3AA8 80240CA8 AFB20038 */ sw $s2, 0x38($sp) -/* BB3AAC 80240CAC AFB10034 */ sw $s1, 0x34($sp) -/* BB3AB0 80240CB0 AFB00030 */ sw $s0, 0x30($sp) -/* BB3AB4 80240CB4 8E720148 */ lw $s2, 0x148($s3) -/* BB3AB8 80240CB8 86440008 */ lh $a0, 8($s2) -/* BB3ABC 80240CBC 8E70000C */ lw $s0, 0xc($s3) -/* BB3AC0 80240CC0 0C00EABB */ jal get_npc_unsafe -/* BB3AC4 80240CC4 00A0882D */ daddu $s1, $a1, $zero -/* BB3AC8 80240CC8 8E050000 */ lw $a1, ($s0) -/* BB3ACC 80240CCC 26100004 */ addiu $s0, $s0, 4 -/* BB3AD0 80240CD0 0260202D */ daddu $a0, $s3, $zero -/* BB3AD4 80240CD4 0C0B1EAF */ jal get_variable -/* BB3AD8 80240CD8 0040A82D */ daddu $s5, $v0, $zero -/* BB3ADC 80240CDC 0260202D */ daddu $a0, $s3, $zero -/* BB3AE0 80240CE0 8E050000 */ lw $a1, ($s0) -/* BB3AE4 80240CE4 0C0B1EAF */ jal get_variable -/* BB3AE8 80240CE8 0040A02D */ daddu $s4, $v0, $zero -/* BB3AEC 80240CEC AE420094 */ sw $v0, 0x94($s2) -/* BB3AF0 80240CF0 AFA00010 */ sw $zero, 0x10($sp) -/* BB3AF4 80240CF4 8E4200D0 */ lw $v0, 0xd0($s2) -/* BB3AF8 80240CF8 8C420030 */ lw $v0, 0x30($v0) -/* BB3AFC 80240CFC AFA20014 */ sw $v0, 0x14($sp) -/* BB3B00 80240D00 8E4200D0 */ lw $v0, 0xd0($s2) -/* BB3B04 80240D04 8C42001C */ lw $v0, 0x1c($v0) -/* BB3B08 80240D08 AFA20018 */ sw $v0, 0x18($sp) -/* BB3B0C 80240D0C 8E4200D0 */ lw $v0, 0xd0($s2) -/* BB3B10 80240D10 8C420024 */ lw $v0, 0x24($v0) -/* BB3B14 80240D14 AFA2001C */ sw $v0, 0x1c($sp) -/* BB3B18 80240D18 8E4200D0 */ lw $v0, 0xd0($s2) -/* BB3B1C 80240D1C 8C420028 */ lw $v0, 0x28($v0) -/* BB3B20 80240D20 AFA20020 */ sw $v0, 0x20($sp) -/* BB3B24 80240D24 8E4200D0 */ lw $v0, 0xd0($s2) -/* BB3B28 80240D28 3C0142C8 */ lui $at, 0x42c8 -/* BB3B2C 80240D2C 44810000 */ mtc1 $at, $f0 -/* BB3B30 80240D30 8C42002C */ lw $v0, 0x2c($v0) -/* BB3B34 80240D34 27B00010 */ addiu $s0, $sp, 0x10 -/* BB3B38 80240D38 E7A00028 */ swc1 $f0, 0x28($sp) -/* BB3B3C 80240D3C A7A0002C */ sh $zero, 0x2c($sp) -/* BB3B40 80240D40 12200019 */ beqz $s1, .L80240DA8 -/* BB3B44 80240D44 AFA20024 */ sw $v0, 0x24($sp) -/* BB3B48 80240D48 AE600070 */ sw $zero, 0x70($s3) -/* BB3B4C 80240D4C A6A0008E */ sh $zero, 0x8e($s5) -/* BB3B50 80240D50 AE600074 */ sw $zero, 0x74($s3) -/* BB3B54 80240D54 8EA20000 */ lw $v0, ($s5) -/* BB3B58 80240D58 2403F7FF */ addiu $v1, $zero, -0x801 -/* BB3B5C 80240D5C 00431024 */ and $v0, $v0, $v1 -/* BB3B60 80240D60 2403FDFF */ addiu $v1, $zero, -0x201 -/* BB3B64 80240D64 00431024 */ and $v0, $v0, $v1 -/* BB3B68 80240D68 34420008 */ ori $v0, $v0, 8 -/* BB3B6C 80240D6C AEA20000 */ sw $v0, ($s5) -/* BB3B70 80240D70 8E4200B0 */ lw $v0, 0xb0($s2) -/* BB3B74 80240D74 34420018 */ ori $v0, $v0, 0x18 -/* BB3B78 80240D78 AE4200B0 */ sw $v0, 0xb0($s2) -/* BB3B7C 80240D7C 8E420000 */ lw $v0, ($s2) -/* BB3B80 80240D80 3C034000 */ lui $v1, 0x4000 -/* BB3B84 80240D84 00431024 */ and $v0, $v0, $v1 -/* BB3B88 80240D88 10400007 */ beqz $v0, .L80240DA8 -/* BB3B8C 80240D8C 3C03BFFF */ lui $v1, 0xbfff -/* BB3B90 80240D90 2402000C */ addiu $v0, $zero, 0xc -/* BB3B94 80240D94 AE620070 */ sw $v0, 0x70($s3) -/* BB3B98 80240D98 8E420000 */ lw $v0, ($s2) -/* BB3B9C 80240D9C 3463FFFF */ ori $v1, $v1, 0xffff -/* BB3BA0 80240DA0 00431024 */ and $v0, $v0, $v1 -/* BB3BA4 80240DA4 AE420000 */ sw $v0, ($s2) -.L80240DA8: -/* BB3BA8 80240DA8 8E4300B0 */ lw $v1, 0xb0($s2) -/* BB3BAC 80240DAC 30620004 */ andi $v0, $v1, 4 -/* BB3BB0 80240DB0 10400007 */ beqz $v0, .L80240DD0 -/* BB3BB4 80240DB4 00000000 */ nop -/* BB3BB8 80240DB8 824200B4 */ lb $v0, 0xb4($s2) -/* BB3BBC 80240DBC 14400034 */ bnez $v0, .L80240E90 -/* BB3BC0 80240DC0 0000102D */ daddu $v0, $zero, $zero -/* BB3BC4 80240DC4 2402FFFB */ addiu $v0, $zero, -5 -/* BB3BC8 80240DC8 00621024 */ and $v0, $v1, $v0 -/* BB3BCC 80240DCC AE4200B0 */ sw $v0, 0xb0($s2) -.L80240DD0: -/* BB3BD0 80240DD0 8E630070 */ lw $v1, 0x70($s3) -/* BB3BD4 80240DD4 2C62000F */ sltiu $v0, $v1, 0xf -/* BB3BD8 80240DD8 1040002C */ beqz $v0, .L80240E8C -/* BB3BDC 80240DDC 00031080 */ sll $v0, $v1, 2 -/* BB3BE0 80240DE0 3C018024 */ lui $at, 0x8024 -/* BB3BE4 80240DE4 00220821 */ addu $at, $at, $v0 -/* BB3BE8 80240DE8 8C222B98 */ lw $v0, 0x2b98($at) -/* BB3BEC 80240DEC 00400008 */ jr $v0 -/* BB3BF0 80240DF0 00000000 */ nop -/* BB3BF4 80240DF4 0260202D */ daddu $a0, $s3, $zero -/* BB3BF8 80240DF8 0280282D */ daddu $a1, $s4, $zero -/* BB3BFC 80240DFC 0C090028 */ jal func_802400A0 -/* BB3C00 80240E00 0200302D */ daddu $a2, $s0, $zero -/* BB3C04 80240E04 0260202D */ daddu $a0, $s3, $zero -/* BB3C08 80240E08 0280282D */ daddu $a1, $s4, $zero -/* BB3C0C 80240E0C 0C0900B4 */ jal func_802402D0 -/* BB3C10 80240E10 0200302D */ daddu $a2, $s0, $zero -/* BB3C14 80240E14 080903A4 */ j .L80240E90 -/* BB3C18 80240E18 0000102D */ daddu $v0, $zero, $zero -/* BB3C1C 80240E1C 0260202D */ daddu $a0, $s3, $zero -/* BB3C20 80240E20 0280282D */ daddu $a1, $s4, $zero -/* BB3C24 80240E24 0C090182 */ jal func_80240608 -/* BB3C28 80240E28 0200302D */ daddu $a2, $s0, $zero -/* BB3C2C 80240E2C 8E630070 */ lw $v1, 0x70($s3) -/* BB3C30 80240E30 24020003 */ addiu $v0, $zero, 3 -/* BB3C34 80240E34 14620016 */ bne $v1, $v0, .L80240E90 -/* BB3C38 80240E38 0000102D */ daddu $v0, $zero, $zero -/* BB3C3C 80240E3C 0260202D */ daddu $a0, $s3, $zero -/* BB3C40 80240E40 0280282D */ daddu $a1, $s4, $zero -/* BB3C44 80240E44 0C0901B2 */ jal func_802406C8 -/* BB3C48 80240E48 0200302D */ daddu $a2, $s0, $zero -/* BB3C4C 80240E4C 080903A4 */ j .L80240E90 -/* BB3C50 80240E50 0000102D */ daddu $v0, $zero, $zero -/* BB3C54 80240E54 0260202D */ daddu $a0, $s3, $zero -/* BB3C58 80240E58 0280282D */ daddu $a1, $s4, $zero -/* BB3C5C 80240E5C 0C09021B */ jal func_8024086C -/* BB3C60 80240E60 0200302D */ daddu $a2, $s0, $zero -/* BB3C64 80240E64 0260202D */ daddu $a0, $s3, $zero -/* BB3C68 80240E68 0280282D */ daddu $a1, $s4, $zero -/* BB3C6C 80240E6C 0C090253 */ jal func_8024094C -/* BB3C70 80240E70 0200302D */ daddu $a2, $s0, $zero -/* BB3C74 80240E74 080903A4 */ j .L80240E90 -/* BB3C78 80240E78 0000102D */ daddu $v0, $zero, $zero -/* BB3C7C 80240E7C 0260202D */ daddu $a0, $s3, $zero -/* BB3C80 80240E80 0280282D */ daddu $a1, $s4, $zero -/* BB3C84 80240E84 0C090313 */ jal func_80240C4C -/* BB3C88 80240E88 0200302D */ daddu $a2, $s0, $zero -.L80240E8C: -/* BB3C8C 80240E8C 0000102D */ daddu $v0, $zero, $zero -.L80240E90: -/* BB3C90 80240E90 8FBF0048 */ lw $ra, 0x48($sp) -/* BB3C94 80240E94 8FB50044 */ lw $s5, 0x44($sp) -/* BB3C98 80240E98 8FB40040 */ lw $s4, 0x40($sp) -/* BB3C9C 80240E9C 8FB3003C */ lw $s3, 0x3c($sp) -/* BB3CA0 80240EA0 8FB20038 */ lw $s2, 0x38($sp) -/* BB3CA4 80240EA4 8FB10034 */ lw $s1, 0x34($sp) -/* BB3CA8 80240EA8 8FB00030 */ lw $s0, 0x30($sp) -/* BB3CAC 80240EAC 03E00008 */ jr $ra -/* BB3CB0 80240EB0 27BD0050 */ addiu $sp, $sp, 0x50 -/* BB3CB4 80240EB4 00000000 */ nop -/* BB3CB8 80240EB8 00000000 */ nop -/* BB3CBC 80240EBC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_10/func_80240030_BB59E0.s b/asm/nonmatchings/world/area_mim/mim_10/func_80240030_BB59E0.s deleted file mode 100644 index e9b359fc9b..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_10/func_80240030_BB59E0.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240030_BB5A10 -/* BB5A10 80240030 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB5A14 80240034 AFBF0010 */ sw $ra, 0x10($sp) -/* BB5A18 80240038 0C046ED4 */ jal enable_world_fog -/* BB5A1C 8024003C 00000000 */ nop -/* BB5A20 80240040 24040010 */ addiu $a0, $zero, 0x10 -/* BB5A24 80240044 0080282D */ daddu $a1, $a0, $zero -/* BB5A28 80240048 0080302D */ daddu $a2, $a0, $zero -/* BB5A2C 8024004C 0C046EE2 */ jal set_world_fog_color -/* BB5A30 80240050 240700FF */ addiu $a3, $zero, 0xff -/* BB5A34 80240054 3C02800B */ lui $v0, %hi(gCameras) -/* BB5A38 80240058 24421D80 */ addiu $v0, $v0, %lo(gCameras) -/* BB5A3C 8024005C 24030014 */ addiu $v1, $zero, 0x14 -/* BB5A40 80240060 A443002C */ sh $v1, 0x2c($v0) -/* BB5A44 80240064 A443002E */ sh $v1, 0x2e($v0) -/* BB5A48 80240068 2403001C */ addiu $v1, $zero, 0x1c -/* BB5A4C 8024006C A4430030 */ sh $v1, 0x30($v0) -/* BB5A50 80240070 8FBF0010 */ lw $ra, 0x10($sp) -/* BB5A54 80240074 24020002 */ addiu $v0, $zero, 2 -/* BB5A58 80240078 03E00008 */ jr $ra -/* BB5A5C 8024007C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_10/func_80240080_BB59E0.s b/asm/nonmatchings/world/area_mim/mim_10/func_80240080_BB59E0.s deleted file mode 100644 index 414b0ebfdd..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_10/func_80240080_BB59E0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240080_BB5A60 -/* BB5A60 80240080 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB5A64 80240084 AFBF0010 */ sw $ra, 0x10($sp) -/* BB5A68 80240088 0C046ED4 */ jal enable_world_fog -/* BB5A6C 8024008C 00000000 */ nop -/* BB5A70 80240090 240403DE */ addiu $a0, $zero, 0x3de -/* BB5A74 80240094 0C046EDD */ jal set_world_fog_dist -/* BB5A78 80240098 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BB5A7C 8024009C 24040010 */ addiu $a0, $zero, 0x10 -/* BB5A80 802400A0 0080282D */ daddu $a1, $a0, $zero -/* BB5A84 802400A4 0080302D */ daddu $a2, $a0, $zero -/* BB5A88 802400A8 0C046EE2 */ jal set_world_fog_color -/* BB5A8C 802400AC 240700FF */ addiu $a3, $zero, 0xff -/* BB5A90 802400B0 3C03800B */ lui $v1, %hi(gCameras) -/* BB5A94 802400B4 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* BB5A98 802400B8 24020014 */ addiu $v0, $zero, 0x14 -/* BB5A9C 802400BC A462002C */ sh $v0, 0x2c($v1) -/* BB5AA0 802400C0 A462002E */ sh $v0, 0x2e($v1) -/* BB5AA4 802400C4 2402001C */ addiu $v0, $zero, 0x1c -/* BB5AA8 802400C8 A4620030 */ sh $v0, 0x30($v1) -/* BB5AAC 802400CC 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* BB5AB0 802400D0 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* BB5AB4 802400D4 240200F0 */ addiu $v0, $zero, 0xf0 -/* BB5AB8 802400D8 A462015C */ sh $v0, 0x15c($v1) -/* BB5ABC 802400DC 8FBF0010 */ lw $ra, 0x10($sp) -/* BB5AC0 802400E0 24020002 */ addiu $v0, $zero, 2 -/* BB5AC4 802400E4 03E00008 */ jr $ra -/* BB5AC8 802400E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_11/func_80240020_BB7070.s b/asm/nonmatchings/world/area_mim/mim_11/func_80240020_BB7070.s deleted file mode 100644 index 86b437d73c..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/func_80240020_BB7070.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_BB7090 -/* BB7090 80240020 3C028016 */ lui $v0, 0x8016 -/* BB7094 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* BB7098 80240028 AC820084 */ sw $v0, 0x84($a0) -/* BB709C 8024002C 03E00008 */ jr $ra -/* BB70A0 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mim/mim_11/func_80240034_BB7070.s b/asm/nonmatchings/world/area_mim/mim_11/func_80240034_BB7070.s deleted file mode 100644 index 493af3f948..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/func_80240034_BB7070.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_BB70A4 -/* BB70A4 80240034 3C038016 */ lui $v1, 0x8016 -/* BB70A8 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* BB70AC 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB70B0 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* BB70B4 80240044 0080802D */ daddu $s0, $a0, $zero -/* BB70B8 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* BB70BC 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* BB70C0 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* BB70C4 80240054 24020002 */ addiu $v0, $zero, 2 -/* BB70C8 80240058 08090038 */ j .L802400E0 -/* BB70CC 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* BB70D0 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* BB70D4 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* BB70D8 80240068 80620040 */ lb $v0, 0x40($v1) -/* BB70DC 8024006C 80670044 */ lb $a3, 0x44($v1) -/* BB70E0 80240070 04420001 */ bltzl $v0, .L80240078 -/* BB70E4 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* BB70E8 80240078 14400003 */ bnez $v0, .L80240088 -/* BB70EC 8024007C 00000000 */ nop -/* BB70F0 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* BB70F4 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* BB70F8 80240088 44822000 */ mtc1 $v0, $f4 -/* BB70FC 8024008C 00000000 */ nop -/* BB7100 80240090 46802120 */ cvt.s.w $f4, $f4 -/* BB7104 80240094 44062000 */ mfc1 $a2, $f4 -/* BB7108 80240098 44872000 */ mtc1 $a3, $f4 -/* BB710C 8024009C 00000000 */ nop -/* BB7110 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* BB7114 802400A4 44806000 */ mtc1 $zero, $f12 -/* BB7118 802400A8 44072000 */ mfc1 $a3, $f4 -/* BB711C 802400AC 0C00A720 */ jal atan2 -/* BB7120 802400B0 46006386 */ mov.s $f14, $f12 -/* BB7124 802400B4 3C014270 */ lui $at, 0x4270 -/* BB7128 802400B8 44811000 */ mtc1 $at, $f2 -/* BB712C 802400BC 00000000 */ nop -/* BB7130 802400C0 4602003C */ c.lt.s $f0, $f2 -/* BB7134 802400C4 00000000 */ nop -/* BB7138 802400C8 45000004 */ bc1f .L802400DC -/* BB713C 802400CC 24020001 */ addiu $v0, $zero, 1 -/* BB7140 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* BB7144 802400D4 08090038 */ j .L802400E0 -/* BB7148 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* BB714C 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* BB7150 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* BB7154 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* BB7158 802400E8 03E00008 */ jr $ra -/* BB715C 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_11/func_802400F0_BB7070.s b/asm/nonmatchings/world/area_mim/mim_11/func_802400F0_BB7070.s deleted file mode 100644 index bff89e4906..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/func_802400F0_BB7070.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_BB7160 -/* BB7160 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BB7164 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* BB7168 802400F8 0080882D */ daddu $s1, $a0, $zero -/* BB716C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* BB7170 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* BB7174 80240104 0C016AFA */ jal get_current_map_header -/* BB7178 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* BB717C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* BB7180 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* BB7184 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BB7188 80240118 0C0B1EAF */ jal get_variable -/* BB718C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* BB7190 80240120 0220202D */ daddu $a0, $s1, $zero -/* BB7194 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* BB7198 80240128 8E430014 */ lw $v1, 0x14($s2) -/* BB719C 8024012C 00028100 */ sll $s0, $v0, 4 -/* BB71A0 80240130 02031821 */ addu $v1, $s0, $v1 -/* BB71A4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* BB71A8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* BB71AC 8024013C 44061000 */ mfc1 $a2, $f2 -/* BB71B0 80240140 0C0B2026 */ jal set_variable -/* BB71B4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* BB71B8 80240148 0220202D */ daddu $a0, $s1, $zero -/* BB71BC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* BB71C0 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* BB71C4 80240154 02021021 */ addu $v0, $s0, $v0 -/* BB71C8 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* BB71CC 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* BB71D0 80240160 44061000 */ mfc1 $a2, $f2 -/* BB71D4 80240164 0C0B2026 */ jal set_variable -/* BB71D8 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* BB71DC 8024016C 0220202D */ daddu $a0, $s1, $zero -/* BB71E0 80240170 8E420014 */ lw $v0, 0x14($s2) -/* BB71E4 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* BB71E8 80240178 02021021 */ addu $v0, $s0, $v0 -/* BB71EC 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* BB71F0 80240180 4600008D */ trunc.w.s $f2, $f0 -/* BB71F4 80240184 44061000 */ mfc1 $a2, $f2 -/* BB71F8 80240188 0C0B2026 */ jal set_variable -/* BB71FC 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* BB7200 80240190 0220202D */ daddu $a0, $s1, $zero -/* BB7204 80240194 8E420014 */ lw $v0, 0x14($s2) -/* BB7208 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* BB720C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* BB7210 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* BB7214 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* BB7218 802401A8 44061000 */ mfc1 $a2, $f2 -/* BB721C 802401AC 0C0B2026 */ jal set_variable -/* BB7220 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* BB7224 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* BB7228 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* BB722C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* BB7230 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* BB7234 802401C4 24020002 */ addiu $v0, $zero, 2 -/* BB7238 802401C8 03E00008 */ jr $ra -/* BB723C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_11/func_802401D0_BB7070.s b/asm/nonmatchings/world/area_mim/mim_11/func_802401D0_BB7070.s deleted file mode 100644 index 3b632c0bce..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/func_802401D0_BB7070.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_BB7240 -/* BB7240 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* BB7244 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* BB7248 802401D8 3C014334 */ lui $at, 0x4334 -/* BB724C 802401DC 44816000 */ mtc1 $at, $f12 -/* BB7250 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB7254 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* BB7258 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* BB725C 802401EC 00031080 */ sll $v0, $v1, 2 -/* BB7260 802401F0 00431021 */ addu $v0, $v0, $v1 -/* BB7264 802401F4 00021080 */ sll $v0, $v0, 2 -/* BB7268 802401F8 00431023 */ subu $v0, $v0, $v1 -/* BB726C 802401FC 000218C0 */ sll $v1, $v0, 3 -/* BB7270 80240200 00431021 */ addu $v0, $v0, $v1 -/* BB7274 80240204 000210C0 */ sll $v0, $v0, 3 -/* BB7278 80240208 3C01800B */ lui $at, 0x800b -/* BB727C 8024020C 00220821 */ addu $at, $at, $v0 -/* BB7280 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* BB7284 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* BB7288 80240218 0C00A6C9 */ jal clamp_angle -/* BB728C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* BB7290 80240220 4600008D */ trunc.w.s $f2, $f0 -/* BB7294 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* BB7298 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* BB729C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* BB72A0 80240230 24020002 */ addiu $v0, $zero, 2 -/* BB72A4 80240234 03E00008 */ jr $ra -/* BB72A8 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_11/func_8024023C_BB7070.s b/asm/nonmatchings/world/area_mim/mim_11/func_8024023C_BB7070.s deleted file mode 100644 index 3bc463e44a..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/func_8024023C_BB7070.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_BB72AC -/* BB72AC 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BB72B0 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* BB72B4 80240244 0080802D */ daddu $s0, $a0, $zero -/* BB72B8 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* BB72BC 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* BB72C0 80240250 8E02000C */ lw $v0, 0xc($s0) -/* BB72C4 80240254 0C0B210B */ jal get_float_variable -/* BB72C8 80240258 8C450000 */ lw $a1, ($v0) -/* BB72CC 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* BB72D0 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* BB72D4 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* BB72D8 80240268 44060000 */ mfc1 $a2, $f0 -/* BB72DC 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* BB72E0 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* BB72E4 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* BB72E8 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* BB72EC 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* BB72F0 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* BB72F4 80240284 0C00A7E7 */ jal add_vec2D_polar -/* BB72F8 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* BB72FC 8024028C 0200202D */ daddu $a0, $s0, $zero -/* BB7300 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* BB7304 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* BB7308 80240298 0C0B2190 */ jal set_float_variable -/* BB730C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BB7310 802402A0 0200202D */ daddu $a0, $s0, $zero -/* BB7314 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* BB7318 802402A8 4406A000 */ mfc1 $a2, $f20 -/* BB731C 802402AC 0C0B2190 */ jal set_float_variable -/* BB7320 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* BB7324 802402B4 0200202D */ daddu $a0, $s0, $zero -/* BB7328 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* BB732C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* BB7330 802402C0 0C0B2190 */ jal set_float_variable -/* BB7334 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* BB7338 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* BB733C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* BB7340 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* BB7344 802402D4 24020002 */ addiu $v0, $zero, 2 -/* BB7348 802402D8 03E00008 */ jr $ra -/* BB734C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_11/func_802402E0_BB7070.s b/asm/nonmatchings/world/area_mim/mim_11/func_802402E0_BB7070.s deleted file mode 100644 index 79e0a55612..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/func_802402E0_BB7070.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_BB7350 -/* BB7350 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB7354 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* BB7358 802402E8 0080802D */ daddu $s0, $a0, $zero -/* BB735C 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* BB7360 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* BB7364 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* BB7368 802402F8 00621821 */ addu $v1, $v1, $v0 -/* BB736C 802402FC 04610004 */ bgez $v1, .L80240310 -/* BB7370 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* BB7374 80240304 3C020002 */ lui $v0, 2 -/* BB7378 80240308 080900C8 */ j .L80240320 -/* BB737C 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* BB7380 80240310 3C040002 */ lui $a0, 2 -/* BB7384 80240314 0083102A */ slt $v0, $a0, $v1 -/* BB7388 80240318 10400002 */ beqz $v0, .L80240324 -/* BB738C 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* BB7390 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* BB7394 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* BB7398 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* BB739C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* BB73A0 80240330 04610004 */ bgez $v1, .L80240344 -/* BB73A4 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* BB73A8 80240338 3C020002 */ lui $v0, 2 -/* BB73AC 8024033C 080900D5 */ j .L80240354 -/* BB73B0 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* BB73B4 80240344 3C040002 */ lui $a0, 2 -/* BB73B8 80240348 0083102A */ slt $v0, $a0, $v1 -/* BB73BC 8024034C 10400002 */ beqz $v0, .L80240358 -/* BB73C0 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* BB73C4 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* BB73C8 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* BB73CC 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* BB73D0 80240360 00621821 */ addu $v1, $v1, $v0 -/* BB73D4 80240364 04610004 */ bgez $v1, .L80240378 -/* BB73D8 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* BB73DC 8024036C 3C020002 */ lui $v0, 2 -/* BB73E0 80240370 080900E2 */ j .L80240388 -/* BB73E4 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* BB73E8 80240378 3C040002 */ lui $a0, 2 -/* BB73EC 8024037C 0083102A */ slt $v0, $a0, $v1 -/* BB73F0 80240380 10400002 */ beqz $v0, .L8024038C -/* BB73F4 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* BB73F8 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* BB73FC 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* BB7400 80240390 8E020094 */ lw $v0, 0x94($s0) -/* BB7404 80240394 00621821 */ addu $v1, $v1, $v0 -/* BB7408 80240398 04610004 */ bgez $v1, .L802403AC -/* BB740C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* BB7410 802403A0 3C020002 */ lui $v0, 2 -/* BB7414 802403A4 080900EF */ j .L802403BC -/* BB7418 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* BB741C 802403AC 3C040002 */ lui $a0, 2 -/* BB7420 802403B0 0083102A */ slt $v0, $a0, $v1 -/* BB7424 802403B4 10400002 */ beqz $v0, .L802403C0 -/* BB7428 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* BB742C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* BB7430 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* BB7434 802403C4 0C046F07 */ jal set_main_pan_u -/* BB7438 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* BB743C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* BB7440 802403D0 0C046F0D */ jal set_main_pan_v -/* BB7444 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* BB7448 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* BB744C 802403DC 0C046F13 */ jal set_aux_pan_u -/* BB7450 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* BB7454 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* BB7458 802403E8 0C046F19 */ jal set_aux_pan_v -/* BB745C 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* BB7460 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* BB7464 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* BB7468 802403F8 0000102D */ daddu $v0, $zero, $zero -/* BB746C 802403FC 03E00008 */ jr $ra -/* BB7470 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_11/func_80240404_BB7070.s b/asm/nonmatchings/world/area_mim/mim_11/func_80240404_BB7070.s deleted file mode 100644 index 015baef8e3..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/func_80240404_BB7070.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_BB7474 -/* BB7474 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB7478 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* BB747C 8024040C 0080802D */ daddu $s0, $a0, $zero -/* BB7480 80240410 10A00005 */ beqz $a1, .L80240428 -/* BB7484 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* BB7488 80240418 AE000070 */ sw $zero, 0x70($s0) -/* BB748C 8024041C AE000074 */ sw $zero, 0x74($s0) -/* BB7490 80240420 AE000078 */ sw $zero, 0x78($s0) -/* BB7494 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* BB7498 80240428 8E020070 */ lw $v0, 0x70($s0) -/* BB749C 8024042C 1440000E */ bnez $v0, .L80240468 -/* BB74A0 80240430 00000000 */ nop -/* BB74A4 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* BB74A8 80240438 8E020088 */ lw $v0, 0x88($s0) -/* BB74AC 8024043C 00621821 */ addu $v1, $v1, $v0 -/* BB74B0 80240440 04610004 */ bgez $v1, .L80240454 -/* BB74B4 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* BB74B8 80240448 3C020002 */ lui $v0, 2 -/* BB74BC 8024044C 08090119 */ j .L80240464 -/* BB74C0 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* BB74C4 80240454 3C040002 */ lui $a0, 2 -/* BB74C8 80240458 0083102A */ slt $v0, $a0, $v1 -/* BB74CC 8024045C 10400002 */ beqz $v0, .L80240468 -/* BB74D0 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* BB74D4 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* BB74D8 80240468 8E020074 */ lw $v0, 0x74($s0) -/* BB74DC 8024046C 1440000E */ bnez $v0, .L802404A8 -/* BB74E0 80240470 00000000 */ nop -/* BB74E4 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* BB74E8 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* BB74EC 8024047C 00621821 */ addu $v1, $v1, $v0 -/* BB74F0 80240480 04610004 */ bgez $v1, .L80240494 -/* BB74F4 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* BB74F8 80240488 3C020002 */ lui $v0, 2 -/* BB74FC 8024048C 08090129 */ j .L802404A4 -/* BB7500 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* BB7504 80240494 3C040002 */ lui $a0, 2 -/* BB7508 80240498 0083102A */ slt $v0, $a0, $v1 -/* BB750C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* BB7510 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* BB7514 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* BB7518 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* BB751C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* BB7520 802404B0 00000000 */ nop -/* BB7524 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* BB7528 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* BB752C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* BB7530 802404C0 04610004 */ bgez $v1, .L802404D4 -/* BB7534 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* BB7538 802404C8 3C020002 */ lui $v0, 2 -/* BB753C 802404CC 08090139 */ j .L802404E4 -/* BB7540 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* BB7544 802404D4 3C040002 */ lui $a0, 2 -/* BB7548 802404D8 0083102A */ slt $v0, $a0, $v1 -/* BB754C 802404DC 10400002 */ beqz $v0, .L802404E8 -/* BB7550 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* BB7554 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* BB7558 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* BB755C 802404EC 1440000E */ bnez $v0, .L80240528 -/* BB7560 802404F0 00000000 */ nop -/* BB7564 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* BB7568 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* BB756C 802404FC 00621821 */ addu $v1, $v1, $v0 -/* BB7570 80240500 04610004 */ bgez $v1, .L80240514 -/* BB7574 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* BB7578 80240508 3C020002 */ lui $v0, 2 -/* BB757C 8024050C 08090149 */ j .L80240524 -/* BB7580 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* BB7584 80240514 3C040002 */ lui $a0, 2 -/* BB7588 80240518 0083102A */ slt $v0, $a0, $v1 -/* BB758C 8024051C 10400002 */ beqz $v0, .L80240528 -/* BB7590 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* BB7594 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* BB7598 80240528 8E040084 */ lw $a0, 0x84($s0) -/* BB759C 8024052C 0C046F07 */ jal set_main_pan_u -/* BB75A0 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* BB75A4 80240534 8E040084 */ lw $a0, 0x84($s0) -/* BB75A8 80240538 0C046F0D */ jal set_main_pan_v -/* BB75AC 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* BB75B0 80240540 8E040084 */ lw $a0, 0x84($s0) -/* BB75B4 80240544 0C046F13 */ jal set_aux_pan_u -/* BB75B8 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* BB75BC 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* BB75C0 80240550 0C046F19 */ jal set_aux_pan_v -/* BB75C4 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* BB75C8 80240558 8E020070 */ lw $v0, 0x70($s0) -/* BB75CC 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* BB75D0 80240560 8E040098 */ lw $a0, 0x98($s0) -/* BB75D4 80240564 24420001 */ addiu $v0, $v0, 1 -/* BB75D8 80240568 AE020070 */ sw $v0, 0x70($s0) -/* BB75DC 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* BB75E0 80240570 24630001 */ addiu $v1, $v1, 1 -/* BB75E4 80240574 AE030078 */ sw $v1, 0x78($s0) -/* BB75E8 80240578 8E030070 */ lw $v1, 0x70($s0) -/* BB75EC 8024057C 24420001 */ addiu $v0, $v0, 1 -/* BB75F0 80240580 AE020074 */ sw $v0, 0x74($s0) -/* BB75F4 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* BB75F8 80240588 0064182A */ slt $v1, $v1, $a0 -/* BB75FC 8024058C 24420001 */ addiu $v0, $v0, 1 -/* BB7600 80240590 14600002 */ bnez $v1, .L8024059C -/* BB7604 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* BB7608 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* BB760C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* BB7610 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* BB7614 802405A4 0043102A */ slt $v0, $v0, $v1 -/* BB7618 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* BB761C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* BB7620 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* BB7624 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* BB7628 802405B8 0043102A */ slt $v0, $v0, $v1 -/* BB762C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* BB7630 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* BB7634 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* BB7638 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* BB763C 802405CC 0043102A */ slt $v0, $v0, $v1 -/* BB7640 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* BB7644 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* BB7648 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* BB764C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* BB7650 802405E0 0000102D */ daddu $v0, $zero, $zero -/* BB7654 802405E4 03E00008 */ jr $ra -/* BB7658 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_11/func_802405EC_BB7070.s b/asm/nonmatchings/world/area_mim/mim_11/func_802405EC_BB7070.s deleted file mode 100644 index 101fcb9892..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/func_802405EC_BB7070.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_BB765C -/* BB765C 802405EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB7660 802405F0 AFBF0010 */ sw $ra, 0x10($sp) -/* BB7664 802405F4 0C046ED4 */ jal enable_world_fog -/* BB7668 802405F8 00000000 */ nop -/* BB766C 802405FC 240403C0 */ addiu $a0, $zero, 0x3c0 -/* BB7670 80240600 0C046EDD */ jal set_world_fog_dist -/* BB7674 80240604 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BB7678 80240608 24040020 */ addiu $a0, $zero, 0x20 -/* BB767C 8024060C 2405001E */ addiu $a1, $zero, 0x1e -/* BB7680 80240610 2406001C */ addiu $a2, $zero, 0x1c -/* BB7684 80240614 0C046EE2 */ jal set_world_fog_color -/* BB7688 80240618 240700FF */ addiu $a3, $zero, 0xff -/* BB768C 8024061C 0C048BFB */ jal enable_entity_fog -/* BB7690 80240620 00000000 */ nop -/* BB7694 80240624 240403DE */ addiu $a0, $zero, 0x3de -/* BB7698 80240628 0C048C04 */ jal set_entity_fog_dist -/* BB769C 8024062C 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BB76A0 80240630 0000202D */ daddu $a0, $zero, $zero -/* BB76A4 80240634 0080282D */ daddu $a1, $a0, $zero -/* BB76A8 80240638 0080302D */ daddu $a2, $a0, $zero -/* BB76AC 8024063C 0C048C0A */ jal set_entity_fog_color -/* BB76B0 80240640 240700FF */ addiu $a3, $zero, 0xff -/* BB76B4 80240644 3C03800B */ lui $v1, %hi(gCameras) -/* BB76B8 80240648 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* BB76BC 8024064C 24020018 */ addiu $v0, $zero, 0x18 -/* BB76C0 80240650 A462002C */ sh $v0, 0x2c($v1) -/* BB76C4 80240654 A462002E */ sh $v0, 0x2e($v1) -/* BB76C8 80240658 A4620030 */ sh $v0, 0x30($v1) -/* BB76CC 8024065C 8FBF0010 */ lw $ra, 0x10($sp) -/* BB76D0 80240660 24020002 */ addiu $v0, $zero, 2 -/* BB76D4 80240664 03E00008 */ jr $ra -/* BB76D8 80240668 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_11/func_802408D0_BB7070.s b/asm/nonmatchings/world/area_mim/mim_11/func_802408D0_BB7070.s deleted file mode 100644 index c09b334cf2..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/func_802408D0_BB7070.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408D0_BB7940 -/* BB7940 802408D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB7944 802408D4 AFBF0010 */ sw $ra, 0x10($sp) -/* BB7948 802408D8 0C03A86D */ jal increment_max_SP -/* BB794C 802408DC 00000000 */ nop -/* BB7950 802408E0 8FBF0010 */ lw $ra, 0x10($sp) -/* BB7954 802408E4 24020002 */ addiu $v0, $zero, 2 -/* BB7958 802408E8 03E00008 */ jr $ra -/* BB795C 802408EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_11/func_802408F0_BB7070.s b/asm/nonmatchings/world/area_mim/mim_11/func_802408F0_BB7070.s deleted file mode 100644 index c8c429a451..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/func_802408F0_BB7070.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408F0_BB7960 -/* BB7960 802408F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BB7964 802408F4 AFB10014 */ sw $s1, 0x14($sp) -/* BB7968 802408F8 0080882D */ daddu $s1, $a0, $zero -/* BB796C 802408FC AFBF0018 */ sw $ra, 0x18($sp) -/* BB7970 80240900 10A00005 */ beqz $a1, .L80240918 -/* BB7974 80240904 AFB00010 */ sw $s0, 0x10($sp) -/* BB7978 80240908 8E24014C */ lw $a0, 0x14c($s1) -/* BB797C 8024090C 0C00EAD2 */ jal get_npc_safe -/* BB7980 80240910 AE200074 */ sw $zero, 0x74($s1) -/* BB7984 80240914 AE220078 */ sw $v0, 0x78($s1) -.L80240918: -/* BB7988 80240918 C62C0074 */ lwc1 $f12, 0x74($s1) -/* BB798C 8024091C 0C00A8BB */ jal sin_deg -/* BB7990 80240920 8E300078 */ lw $s0, 0x78($s1) -/* BB7994 80240924 3C0140C0 */ lui $at, 0x40c0 -/* BB7998 80240928 44811000 */ mtc1 $at, $f2 -/* BB799C 8024092C 00000000 */ nop -/* BB79A0 80240930 46020002 */ mul.s $f0, $f0, $f2 -/* BB79A4 80240934 00000000 */ nop -/* BB79A8 80240938 3C014190 */ lui $at, 0x4190 -/* BB79AC 8024093C 44816000 */ mtc1 $at, $f12 -/* BB79B0 80240940 4600010D */ trunc.w.s $f4, $f0 -/* BB79B4 80240944 44022000 */ mfc1 $v0, $f4 -/* BB79B8 80240948 00000000 */ nop -/* BB79BC 8024094C A20200AB */ sb $v0, 0xab($s0) -/* BB79C0 80240950 C6200074 */ lwc1 $f0, 0x74($s1) -/* BB79C4 80240954 0C00A6C9 */ jal clamp_angle -/* BB79C8 80240958 460C0300 */ add.s $f12, $f0, $f12 -/* BB79CC 8024095C E6200074 */ swc1 $f0, 0x74($s1) -/* BB79D0 80240960 8FBF0018 */ lw $ra, 0x18($sp) -/* BB79D4 80240964 8FB10014 */ lw $s1, 0x14($sp) -/* BB79D8 80240968 8FB00010 */ lw $s0, 0x10($sp) -/* BB79DC 8024096C 0000102D */ daddu $v0, $zero, $zero -/* BB79E0 80240970 03E00008 */ jr $ra -/* BB79E4 80240974 27BD0020 */ addiu $sp, $sp, 0x20 -/* BB79E8 80240978 00000000 */ nop -/* BB79EC 8024097C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_12/func_80240064_BBB380.s b/asm/nonmatchings/world/area_mim/mim_12/func_80240064_BBB380.s deleted file mode 100644 index 759a639dcd..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_12/func_80240064_BBB380.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240064_BBB3E4 -/* BBB3E4 80240064 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BBB3E8 80240068 AFBF0010 */ sw $ra, 0x10($sp) -/* BBB3EC 8024006C 0C046ED4 */ jal enable_world_fog -/* BBB3F0 80240070 00000000 */ nop -/* BBB3F4 80240074 240403D4 */ addiu $a0, $zero, 0x3d4 -/* BBB3F8 80240078 0C046EDD */ jal set_world_fog_dist -/* BBB3FC 8024007C 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BBB400 80240080 0000202D */ daddu $a0, $zero, $zero -/* BBB404 80240084 24050008 */ addiu $a1, $zero, 8 -/* BBB408 80240088 24060018 */ addiu $a2, $zero, 0x18 -/* BBB40C 8024008C 0C046EE2 */ jal set_world_fog_color -/* BBB410 80240090 240700FF */ addiu $a3, $zero, 0xff -/* BBB414 80240094 3C03800B */ lui $v1, %hi(gCameras) -/* BBB418 80240098 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* BBB41C 8024009C 24020018 */ addiu $v0, $zero, 0x18 -/* BBB420 802400A0 A462002C */ sh $v0, 0x2c($v1) -/* BBB424 802400A4 A462002E */ sh $v0, 0x2e($v1) -/* BBB428 802400A8 A4620030 */ sh $v0, 0x30($v1) -/* BBB42C 802400AC 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* BBB430 802400B0 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* BBB434 802400B4 240200E8 */ addiu $v0, $zero, 0xe8 -/* BBB438 802400B8 A462015C */ sh $v0, 0x15c($v1) -/* BBB43C 802400BC 8FBF0010 */ lw $ra, 0x10($sp) -/* BBB440 802400C0 24020002 */ addiu $v0, $zero, 2 -/* BBB444 802400C4 03E00008 */ jr $ra -/* BBB448 802400C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_12/func_8024019C_BBB380.s b/asm/nonmatchings/world/area_mim/mim_12/func_8024019C_BBB380.s deleted file mode 100644 index 815208b69c..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_12/func_8024019C_BBB380.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024019C_BBB51C -/* BBB51C 8024019C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BBB520 802401A0 AFB10014 */ sw $s1, 0x14($sp) -/* BBB524 802401A4 0080882D */ daddu $s1, $a0, $zero -/* BBB528 802401A8 AFB20018 */ sw $s2, 0x18($sp) -/* BBB52C 802401AC AFBF001C */ sw $ra, 0x1c($sp) -/* BBB530 802401B0 AFB00010 */ sw $s0, 0x10($sp) -/* BBB534 802401B4 8E30000C */ lw $s0, 0xc($s1) -/* BBB538 802401B8 10A0000E */ beqz $a1, .L802401F4 -/* BBB53C 802401BC 0000902D */ daddu $s2, $zero, $zero -/* BBB540 802401C0 8E050000 */ lw $a1, ($s0) -/* BBB544 802401C4 0C0B1EAF */ jal get_variable -/* BBB548 802401C8 26100004 */ addiu $s0, $s0, 4 -/* BBB54C 802401CC AE220074 */ sw $v0, 0x74($s1) -/* BBB550 802401D0 8E050000 */ lw $a1, ($s0) -/* BBB554 802401D4 26100004 */ addiu $s0, $s0, 4 -/* BBB558 802401D8 0C0B1EAF */ jal get_variable -/* BBB55C 802401DC 0220202D */ daddu $a0, $s1, $zero -/* BBB560 802401E0 AE220078 */ sw $v0, 0x78($s1) -/* BBB564 802401E4 8E050000 */ lw $a1, ($s0) -/* BBB568 802401E8 0C0B1EAF */ jal get_variable -/* BBB56C 802401EC 0220202D */ daddu $a0, $s1, $zero -/* BBB570 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* BBB574 802401F4 8E23007C */ lw $v1, 0x7c($s1) -/* BBB578 802401F8 8E220074 */ lw $v0, 0x74($s1) -/* BBB57C 802401FC 0060202D */ daddu $a0, $v1, $zero -/* BBB580 80240200 00431021 */ addu $v0, $v0, $v1 -/* BBB584 80240204 04800004 */ bltz $a0, .L80240218 -/* BBB588 80240208 AE220074 */ sw $v0, 0x74($s1) -/* BBB58C 8024020C 8E230078 */ lw $v1, 0x78($s1) -/* BBB590 80240210 08090088 */ j .L80240220 -/* BBB594 80240214 0043102A */ slt $v0, $v0, $v1 -.L80240218: -/* BBB598 80240218 8E230078 */ lw $v1, 0x78($s1) -/* BBB59C 8024021C 0062102A */ slt $v0, $v1, $v0 -.L80240220: -/* BBB5A0 80240220 14400003 */ bnez $v0, .L80240230 -/* BBB5A4 80240224 00000000 */ nop -/* BBB5A8 80240228 AE230074 */ sw $v1, 0x74($s1) -/* BBB5AC 8024022C 24120002 */ addiu $s2, $zero, 2 -.L80240230: -/* BBB5B0 80240230 3C048007 */ lui $a0, %hi(gGameStatusPtr) -/* BBB5B4 80240234 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) -/* BBB5B8 80240238 96230076 */ lhu $v1, 0x76($s1) -/* BBB5BC 8024023C 0240102D */ daddu $v0, $s2, $zero -/* BBB5C0 80240240 A483015C */ sh $v1, 0x15c($a0) -/* BBB5C4 80240244 8FBF001C */ lw $ra, 0x1c($sp) -/* BBB5C8 80240248 8FB20018 */ lw $s2, 0x18($sp) -/* BBB5CC 8024024C 8FB10014 */ lw $s1, 0x14($sp) -/* BBB5D0 80240250 8FB00010 */ lw $s0, 0x10($sp) -/* BBB5D4 80240254 03E00008 */ jr $ra -/* BBB5D8 80240258 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_12/func_802404A8_BBB380.s b/asm/nonmatchings/world/area_mim/mim_12/func_802404A8_BBB380.s deleted file mode 100644 index 576eacda73..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_12/func_802404A8_BBB380.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404A8_BBB828 -/* BBB828 802404A8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BBB82C 802404AC AFB10024 */ sw $s1, 0x24($sp) -/* BBB830 802404B0 0080882D */ daddu $s1, $a0, $zero -/* BBB834 802404B4 AFB00020 */ sw $s0, 0x20($sp) -/* BBB838 802404B8 00A0802D */ daddu $s0, $a1, $zero -/* BBB83C 802404BC AFBF002C */ sw $ra, 0x2c($sp) -/* BBB840 802404C0 AFB20028 */ sw $s2, 0x28($sp) -/* BBB844 802404C4 0C0B36B0 */ jal resolve_npc -/* BBB848 802404C8 8E250084 */ lw $a1, 0x84($s1) -/* BBB84C 802404CC 1200000E */ beqz $s0, .L80240508 -/* BBB850 802404D0 0040902D */ daddu $s2, $v0, $zero -/* BBB854 802404D4 C6260088 */ lwc1 $f6, 0x88($s1) -/* BBB858 802404D8 468031A0 */ cvt.s.w $f6, $f6 -/* BBB85C 802404DC 44063000 */ mfc1 $a2, $f6 -/* BBB860 802404E0 C626008C */ lwc1 $f6, 0x8c($s1) -/* BBB864 802404E4 468031A0 */ cvt.s.w $f6, $f6 -/* BBB868 802404E8 8E220098 */ lw $v0, 0x98($s1) -/* BBB86C 802404EC 44073000 */ mfc1 $a3, $f6 -/* BBB870 802404F0 AE22009C */ sw $v0, 0x9c($s1) -/* BBB874 802404F4 C64C0038 */ lwc1 $f12, 0x38($s2) -/* BBB878 802404F8 0C00A7B5 */ jal dist2D -/* BBB87C 802404FC C64E0040 */ lwc1 $f14, 0x40($s2) -/* BBB880 80240500 4600018D */ trunc.w.s $f6, $f0 -/* BBB884 80240504 E62600A0 */ swc1 $f6, 0xa0($s1) -.L80240508: -/* BBB888 80240508 8E22009C */ lw $v0, 0x9c($s1) -/* BBB88C 8024050C 1C400003 */ bgtz $v0, .L8024051C -/* BBB890 80240510 00000000 */ nop -/* BBB894 80240514 08090172 */ j .L802405C8 -/* BBB898 80240518 24020002 */ addiu $v0, $zero, 2 -.L8024051C: -/* BBB89C 8024051C C6220090 */ lwc1 $f2, 0x90($s1) -/* BBB8A0 80240520 468010A0 */ cvt.s.w $f2, $f2 -/* BBB8A4 80240524 C6240094 */ lwc1 $f4, 0x94($s1) -/* BBB8A8 80240528 46802120 */ cvt.s.w $f4, $f4 -/* BBB8AC 8024052C C6200098 */ lwc1 $f0, 0x98($s1) -/* BBB8B0 80240530 46800020 */ cvt.s.w $f0, $f0 -/* BBB8B4 80240534 4600018D */ trunc.w.s $f6, $f0 -/* BBB8B8 80240538 E7A60010 */ swc1 $f6, 0x10($sp) -/* BBB8BC 8024053C 44820000 */ mtc1 $v0, $f0 -/* BBB8C0 80240540 00000000 */ nop -/* BBB8C4 80240544 46800020 */ cvt.s.w $f0, $f0 -/* BBB8C8 80240548 44051000 */ mfc1 $a1, $f2 -/* BBB8CC 8024054C 44062000 */ mfc1 $a2, $f4 -/* BBB8D0 80240550 4600018D */ trunc.w.s $f6, $f0 -/* BBB8D4 80240554 44073000 */ mfc1 $a3, $f6 -/* BBB8D8 80240558 0C00A8ED */ jal update_lerp -/* BBB8DC 8024055C 0000202D */ daddu $a0, $zero, $zero -/* BBB8E0 80240560 46000306 */ mov.s $f12, $f0 -/* BBB8E4 80240564 27A50018 */ addiu $a1, $sp, 0x18 -/* BBB8E8 80240568 0C00A88D */ jal sin_cos_deg -/* BBB8EC 8024056C 27A6001C */ addiu $a2, $sp, 0x1c -/* BBB8F0 80240570 C7A00018 */ lwc1 $f0, 0x18($sp) -/* BBB8F4 80240574 C62200A0 */ lwc1 $f2, 0xa0($s1) -/* BBB8F8 80240578 468010A0 */ cvt.s.w $f2, $f2 -/* BBB8FC 8024057C 46001082 */ mul.s $f2, $f2, $f0 -/* BBB900 80240580 00000000 */ nop -/* BBB904 80240584 C6200088 */ lwc1 $f0, 0x88($s1) -/* BBB908 80240588 46800020 */ cvt.s.w $f0, $f0 -/* BBB90C 8024058C 46020000 */ add.s $f0, $f0, $f2 -/* BBB910 80240590 E6400038 */ swc1 $f0, 0x38($s2) -/* BBB914 80240594 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BBB918 80240598 C62200A0 */ lwc1 $f2, 0xa0($s1) -/* BBB91C 8024059C 468010A0 */ cvt.s.w $f2, $f2 -/* BBB920 802405A0 46001082 */ mul.s $f2, $f2, $f0 -/* BBB924 802405A4 00000000 */ nop -/* BBB928 802405A8 C620008C */ lwc1 $f0, 0x8c($s1) -/* BBB92C 802405AC 46800020 */ cvt.s.w $f0, $f0 -/* BBB930 802405B0 46020000 */ add.s $f0, $f0, $f2 -/* BBB934 802405B4 E6400040 */ swc1 $f0, 0x40($s2) -/* BBB938 802405B8 8E23009C */ lw $v1, 0x9c($s1) -/* BBB93C 802405BC 0000102D */ daddu $v0, $zero, $zero -/* BBB940 802405C0 2463FFFF */ addiu $v1, $v1, -1 -/* BBB944 802405C4 AE23009C */ sw $v1, 0x9c($s1) -.L802405C8: -/* BBB948 802405C8 8FBF002C */ lw $ra, 0x2c($sp) -/* BBB94C 802405CC 8FB20028 */ lw $s2, 0x28($sp) -/* BBB950 802405D0 8FB10024 */ lw $s1, 0x24($sp) -/* BBB954 802405D4 8FB00020 */ lw $s0, 0x20($sp) -/* BBB958 802405D8 03E00008 */ jr $ra -/* BBB95C 802405DC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_01/delete_player_actor_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/delete_player_actor_9C53E0.s deleted file mode 100644 index 7db4295853..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/delete_player_actor_9C53E0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel delete_player_actor_9C6148 -/* 9C6148 80240D68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C614C 80240D6C AFB00010 */ sw $s0, 0x10($sp) -/* 9C6150 80240D70 3C108024 */ lui $s0, 0x8024 -/* 9C6154 80240D74 26105F44 */ addiu $s0, $s0, 0x5f44 -/* 9C6158 80240D78 AFBF0018 */ sw $ra, 0x18($sp) -/* 9C615C 80240D7C AFB10014 */ sw $s1, 0x14($sp) -/* 9C6160 80240D80 8E020000 */ lw $v0, ($s0) -/* 9C6164 80240D84 14400010 */ bnez $v0, .L80240DC8 -/* 9C6168 80240D88 0080882D */ daddu $s1, $a0, $zero -/* 9C616C 80240D8C 0C00AB39 */ jal heap_malloc -/* 9C6170 80240D90 24040040 */ addiu $a0, $zero, 0x40 -/* 9C6174 80240D94 AE020000 */ sw $v0, ($s0) -/* 9C6178 80240D98 0000182D */ daddu $v1, $zero, $zero -/* 9C617C 80240D9C 0040282D */ daddu $a1, $v0, $zero -/* 9C6180 80240DA0 0220202D */ daddu $a0, $s1, $zero -.L80240DA4: -/* 9C6184 80240DA4 8C820084 */ lw $v0, 0x84($a0) -/* 9C6188 80240DA8 24840004 */ addiu $a0, $a0, 4 -/* 9C618C 80240DAC 24630001 */ addiu $v1, $v1, 1 -/* 9C6190 80240DB0 ACA20000 */ sw $v0, ($a1) -/* 9C6194 80240DB4 28620010 */ slti $v0, $v1, 0x10 -/* 9C6198 80240DB8 1440FFFA */ bnez $v0, .L80240DA4 -/* 9C619C 80240DBC 24A50004 */ addiu $a1, $a1, 4 -/* 9C61A0 80240DC0 08090381 */ j .L80240E04 -/* 9C61A4 80240DC4 00000000 */ nop -.L80240DC8: -/* 9C61A8 80240DC8 0000182D */ daddu $v1, $zero, $zero -/* 9C61AC 80240DCC 0040282D */ daddu $a1, $v0, $zero -/* 9C61B0 80240DD0 0220202D */ daddu $a0, $s1, $zero -.L80240DD4: -/* 9C61B4 80240DD4 8CA20000 */ lw $v0, ($a1) -/* 9C61B8 80240DD8 24A50004 */ addiu $a1, $a1, 4 -/* 9C61BC 80240DDC 24630001 */ addiu $v1, $v1, 1 -/* 9C61C0 80240DE0 AC820084 */ sw $v0, 0x84($a0) -/* 9C61C4 80240DE4 28620010 */ slti $v0, $v1, 0x10 -/* 9C61C8 80240DE8 1440FFFA */ bnez $v0, .L80240DD4 -/* 9C61CC 80240DEC 24840004 */ addiu $a0, $a0, 4 -/* 9C61D0 80240DF0 3C108024 */ lui $s0, 0x8024 -/* 9C61D4 80240DF4 26105F44 */ addiu $s0, $s0, 0x5f44 -/* 9C61D8 80240DF8 0C00AB4B */ jal heap_free -/* 9C61DC 80240DFC 8E040000 */ lw $a0, ($s0) -/* 9C61E0 80240E00 AE000000 */ sw $zero, ($s0) -.L80240E04: -/* 9C61E4 80240E04 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C61E8 80240E08 8FB10014 */ lw $s1, 0x14($sp) -/* 9C61EC 80240E0C 8FB00010 */ lw $s0, 0x10($sp) -/* 9C61F0 80240E10 24020002 */ addiu $v0, $zero, 2 -/* 9C61F4 80240E14 03E00008 */ jr $ra -/* 9C61F8 80240E18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_802400B4_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_802400B4_9C53E0.s deleted file mode 100644 index c2eaa3dec9..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_802400B4_9C53E0.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_9C5494 -/* 9C5494 802400B4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9C5498 802400B8 AFB40040 */ sw $s4, 0x40($sp) -/* 9C549C 802400BC 0080A02D */ daddu $s4, $a0, $zero -/* 9C54A0 802400C0 AFBF0044 */ sw $ra, 0x44($sp) -/* 9C54A4 802400C4 AFB3003C */ sw $s3, 0x3c($sp) -/* 9C54A8 802400C8 AFB20038 */ sw $s2, 0x38($sp) -/* 9C54AC 802400CC AFB10034 */ sw $s1, 0x34($sp) -/* 9C54B0 802400D0 AFB00030 */ sw $s0, 0x30($sp) -/* 9C54B4 802400D4 8E920148 */ lw $s2, 0x148($s4) -/* 9C54B8 802400D8 00A0802D */ daddu $s0, $a1, $zero -/* 9C54BC 802400DC 86440008 */ lh $a0, 8($s2) -/* 9C54C0 802400E0 0C00EABB */ jal get_npc_unsafe -/* 9C54C4 802400E4 00C0982D */ daddu $s3, $a2, $zero -/* 9C54C8 802400E8 8E030008 */ lw $v1, 8($s0) -/* 9C54CC 802400EC 04600031 */ bltz $v1, .L802401B4 -/* 9C54D0 802400F0 0040882D */ daddu $s1, $v0, $zero -/* 9C54D4 802400F4 0260202D */ daddu $a0, $s3, $zero -/* 9C54D8 802400F8 AFA00010 */ sw $zero, 0x10($sp) -/* 9C54DC 802400FC 8E060018 */ lw $a2, 0x18($s0) -/* 9C54E0 80240100 8E07001C */ lw $a3, 0x1c($s0) -/* 9C54E4 80240104 0C01242D */ jal func_800490B4 -/* 9C54E8 80240108 0240282D */ daddu $a1, $s2, $zero -/* 9C54EC 8024010C 10400029 */ beqz $v0, .L802401B4 -/* 9C54F0 80240110 0000202D */ daddu $a0, $zero, $zero -/* 9C54F4 80240114 0220282D */ daddu $a1, $s1, $zero -/* 9C54F8 80240118 0000302D */ daddu $a2, $zero, $zero -/* 9C54FC 8024011C 862300A8 */ lh $v1, 0xa8($s1) -/* 9C5500 80240120 3C013F80 */ lui $at, 0x3f80 -/* 9C5504 80240124 44810000 */ mtc1 $at, $f0 -/* 9C5508 80240128 3C014000 */ lui $at, 0x4000 -/* 9C550C 8024012C 44811000 */ mtc1 $at, $f2 -/* 9C5510 80240130 3C01C1A0 */ lui $at, 0xc1a0 -/* 9C5514 80240134 44812000 */ mtc1 $at, $f4 -/* 9C5518 80240138 2402000F */ addiu $v0, $zero, 0xf -/* 9C551C 8024013C AFA2001C */ sw $v0, 0x1c($sp) -/* 9C5520 80240140 44833000 */ mtc1 $v1, $f6 -/* 9C5524 80240144 00000000 */ nop -/* 9C5528 80240148 468031A0 */ cvt.s.w $f6, $f6 -/* 9C552C 8024014C 44073000 */ mfc1 $a3, $f6 -/* 9C5530 80240150 27A20028 */ addiu $v0, $sp, 0x28 -/* 9C5534 80240154 AFA20020 */ sw $v0, 0x20($sp) -/* 9C5538 80240158 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9C553C 8024015C E7A20014 */ swc1 $f2, 0x14($sp) -/* 9C5540 80240160 0C01BFA4 */ jal fx_emote -/* 9C5544 80240164 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9C5548 80240168 0220202D */ daddu $a0, $s1, $zero -/* 9C554C 8024016C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9C5550 80240170 0C012530 */ jal func_800494C0 -/* 9C5554 80240174 3C060020 */ lui $a2, 0x20 -/* 9C5558 80240178 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9C555C 8024017C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9C5560 80240180 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 9C5564 80240184 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 9C5568 80240188 8C460028 */ lw $a2, 0x28($v0) -/* 9C556C 8024018C 0C00A720 */ jal atan2 -/* 9C5570 80240190 8C470030 */ lw $a3, 0x30($v0) -/* 9C5574 80240194 E620000C */ swc1 $f0, 0xc($s1) -/* 9C5578 80240198 8E420018 */ lw $v0, 0x18($s2) -/* 9C557C 8024019C 9442002A */ lhu $v0, 0x2a($v0) -/* 9C5580 802401A0 30420001 */ andi $v0, $v0, 1 -/* 9C5584 802401A4 14400002 */ bnez $v0, .L802401B0 -/* 9C5588 802401A8 2402000A */ addiu $v0, $zero, 0xa -/* 9C558C 802401AC 2402000C */ addiu $v0, $zero, 0xc -.L802401B0: -/* 9C5590 802401B0 AE820070 */ sw $v0, 0x70($s4) -.L802401B4: -/* 9C5594 802401B4 8FBF0044 */ lw $ra, 0x44($sp) -/* 9C5598 802401B8 8FB40040 */ lw $s4, 0x40($sp) -/* 9C559C 802401BC 8FB3003C */ lw $s3, 0x3c($sp) -/* 9C55A0 802401C0 8FB20038 */ lw $s2, 0x38($sp) -/* 9C55A4 802401C4 8FB10034 */ lw $s1, 0x34($sp) -/* 9C55A8 802401C8 8FB00030 */ lw $s0, 0x30($sp) -/* 9C55AC 802401CC 03E00008 */ jr $ra -/* 9C55B0 802401D0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_802401D4_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_802401D4_9C53E0.s deleted file mode 100644 index 8665fa9467..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_802401D4_9C53E0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D4_9C55B4 -/* 9C55B4 802401D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C55B8 802401D8 AFB00010 */ sw $s0, 0x10($sp) -/* 9C55BC 802401DC 0080802D */ daddu $s0, $a0, $zero -/* 9C55C0 802401E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 9C55C4 802401E4 8E020148 */ lw $v0, 0x148($s0) -/* 9C55C8 802401E8 0C00EABB */ jal get_npc_unsafe -/* 9C55CC 802401EC 84440008 */ lh $a0, 8($v0) -/* 9C55D0 802401F0 3C014120 */ lui $at, 0x4120 -/* 9C55D4 802401F4 44810000 */ mtc1 $at, $f0 -/* 9C55D8 802401F8 3C014000 */ lui $at, 0x4000 -/* 9C55DC 802401FC 44811000 */ mtc1 $at, $f2 -/* 9C55E0 80240200 8C430000 */ lw $v1, ($v0) -/* 9C55E4 80240204 C444003C */ lwc1 $f4, 0x3c($v0) -/* 9C55E8 80240208 34630800 */ ori $v1, $v1, 0x800 -/* 9C55EC 8024020C E440001C */ swc1 $f0, 0x1c($v0) -/* 9C55F0 80240210 E4420014 */ swc1 $f2, 0x14($v0) -/* 9C55F4 80240214 E4440064 */ swc1 $f4, 0x64($v0) -/* 9C55F8 80240218 AC430000 */ sw $v1, ($v0) -/* 9C55FC 8024021C 2402000B */ addiu $v0, $zero, 0xb -/* 9C5600 80240220 AE020070 */ sw $v0, 0x70($s0) -/* 9C5604 80240224 8FBF0014 */ lw $ra, 0x14($sp) -/* 9C5608 80240228 8FB00010 */ lw $s0, 0x10($sp) -/* 9C560C 8024022C 03E00008 */ jr $ra -/* 9C5610 80240230 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_80240234_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_80240234_9C53E0.s deleted file mode 100644 index 03607e2ff0..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_80240234_9C53E0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240234_9C5614 -/* 9C5614 80240234 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C5618 80240238 AFB00010 */ sw $s0, 0x10($sp) -/* 9C561C 8024023C 0080802D */ daddu $s0, $a0, $zero -/* 9C5620 80240240 AFBF0014 */ sw $ra, 0x14($sp) -/* 9C5624 80240244 8E020148 */ lw $v0, 0x148($s0) -/* 9C5628 80240248 0C00EABB */ jal get_npc_unsafe -/* 9C562C 8024024C 84440008 */ lh $a0, 8($v0) -/* 9C5630 80240250 0040202D */ daddu $a0, $v0, $zero -/* 9C5634 80240254 C482003C */ lwc1 $f2, 0x3c($a0) -/* 9C5638 80240258 C480001C */ lwc1 $f0, 0x1c($a0) -/* 9C563C 8024025C 46001080 */ add.s $f2, $f2, $f0 -/* 9C5640 80240260 C4840014 */ lwc1 $f4, 0x14($a0) -/* 9C5644 80240264 46040001 */ sub.s $f0, $f0, $f4 -/* 9C5648 80240268 C4840064 */ lwc1 $f4, 0x64($a0) -/* 9C564C 8024026C 4602203C */ c.lt.s $f4, $f2 -/* 9C5650 80240270 E482003C */ swc1 $f2, 0x3c($a0) -/* 9C5654 80240274 45010009 */ bc1t .L8024029C -/* 9C5658 80240278 E480001C */ swc1 $f0, 0x1c($a0) -/* 9C565C 8024027C 8C820000 */ lw $v0, ($a0) -/* 9C5660 80240280 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9C5664 80240284 E484003C */ swc1 $f4, 0x3c($a0) -/* 9C5668 80240288 AC80001C */ sw $zero, 0x1c($a0) -/* 9C566C 8024028C 00431024 */ and $v0, $v0, $v1 -/* 9C5670 80240290 AC820000 */ sw $v0, ($a0) -/* 9C5674 80240294 2402000C */ addiu $v0, $zero, 0xc -/* 9C5678 80240298 AE020070 */ sw $v0, 0x70($s0) -.L8024029C: -/* 9C567C 8024029C 8FBF0014 */ lw $ra, 0x14($sp) -/* 9C5680 802402A0 8FB00010 */ lw $s0, 0x10($sp) -/* 9C5684 802402A4 03E00008 */ jr $ra -/* 9C5688 802402A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_802402AC_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_802402AC_9C53E0.s deleted file mode 100644 index be4e23694a..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_802402AC_9C53E0.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402AC_9C568C -/* 9C568C 802402AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9C5690 802402B0 AFB3001C */ sw $s3, 0x1c($sp) -/* 9C5694 802402B4 0080982D */ daddu $s3, $a0, $zero -/* 9C5698 802402B8 AFBF0020 */ sw $ra, 0x20($sp) -/* 9C569C 802402BC AFB20018 */ sw $s2, 0x18($sp) -/* 9C56A0 802402C0 AFB10014 */ sw $s1, 0x14($sp) -/* 9C56A4 802402C4 AFB00010 */ sw $s0, 0x10($sp) -/* 9C56A8 802402C8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 9C56AC 802402CC 8E710148 */ lw $s1, 0x148($s3) -/* 9C56B0 802402D0 86240008 */ lh $a0, 8($s1) -/* 9C56B4 802402D4 0C00EABB */ jal get_npc_unsafe -/* 9C56B8 802402D8 00A0802D */ daddu $s0, $a1, $zero -/* 9C56BC 802402DC 8E040014 */ lw $a0, 0x14($s0) -/* 9C56C0 802402E0 0040902D */ daddu $s2, $v0, $zero -/* 9C56C4 802402E4 00041FC2 */ srl $v1, $a0, 0x1f -/* 9C56C8 802402E8 00832021 */ addu $a0, $a0, $v1 -/* 9C56CC 802402EC 00042043 */ sra $a0, $a0, 1 -/* 9C56D0 802402F0 0C00A67F */ jal rand_int -/* 9C56D4 802402F4 24840001 */ addiu $a0, $a0, 1 -/* 9C56D8 802402F8 8E030014 */ lw $v1, 0x14($s0) -/* 9C56DC 802402FC C64C0038 */ lwc1 $f12, 0x38($s2) -/* 9C56E0 80240300 000327C2 */ srl $a0, $v1, 0x1f -/* 9C56E4 80240304 00641821 */ addu $v1, $v1, $a0 -/* 9C56E8 80240308 00031843 */ sra $v1, $v1, 1 -/* 9C56EC 8024030C 00621821 */ addu $v1, $v1, $v0 -/* 9C56F0 80240310 A643008E */ sh $v1, 0x8e($s2) -/* 9C56F4 80240314 8E2200CC */ lw $v0, 0xcc($s1) -/* 9C56F8 80240318 C64E0040 */ lwc1 $f14, 0x40($s2) -/* 9C56FC 8024031C 8C42000C */ lw $v0, 0xc($v0) -/* 9C5700 80240320 AE420028 */ sw $v0, 0x28($s2) -/* 9C5704 80240324 C600000C */ lwc1 $f0, 0xc($s0) -/* 9C5708 80240328 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9C570C 8024032C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9C5710 80240330 E6400018 */ swc1 $f0, 0x18($s2) -/* 9C5714 80240334 8C460028 */ lw $a2, 0x28($v0) -/* 9C5718 80240338 0C00A720 */ jal atan2 -/* 9C571C 8024033C 8C470030 */ lw $a3, 0x30($v0) -/* 9C5720 80240340 46000506 */ mov.s $f20, $f0 -/* 9C5724 80240344 C64C000C */ lwc1 $f12, 0xc($s2) -/* 9C5728 80240348 0C00A70A */ jal get_clamped_angle_diff -/* 9C572C 8024034C 4600A386 */ mov.s $f14, $f20 -/* 9C5730 80240350 46000086 */ mov.s $f2, $f0 -/* 9C5734 80240354 8E020010 */ lw $v0, 0x10($s0) -/* 9C5738 80240358 46001005 */ abs.s $f0, $f2 -/* 9C573C 8024035C 44822000 */ mtc1 $v0, $f4 -/* 9C5740 80240360 00000000 */ nop -/* 9C5744 80240364 46802120 */ cvt.s.w $f4, $f4 -/* 9C5748 80240368 4600203C */ c.lt.s $f4, $f0 -/* 9C574C 8024036C 00000000 */ nop -/* 9C5750 80240370 4500000D */ bc1f .L802403A8 -/* 9C5754 80240374 00000000 */ nop -/* 9C5758 80240378 44800000 */ mtc1 $zero, $f0 -/* 9C575C 8024037C C654000C */ lwc1 $f20, 0xc($s2) -/* 9C5760 80240380 4600103C */ c.lt.s $f2, $f0 -/* 9C5764 80240384 00000000 */ nop -/* 9C5768 80240388 45000006 */ bc1f .L802403A4 -/* 9C576C 8024038C 00021023 */ negu $v0, $v0 -/* 9C5770 80240390 44820000 */ mtc1 $v0, $f0 -/* 9C5774 80240394 00000000 */ nop -/* 9C5778 80240398 46800020 */ cvt.s.w $f0, $f0 -/* 9C577C 8024039C 080900EA */ j .L802403A8 -/* 9C5780 802403A0 4600A500 */ add.s $f20, $f20, $f0 -.L802403A4: -/* 9C5784 802403A4 4604A500 */ add.s $f20, $f20, $f4 -.L802403A8: -/* 9C5788 802403A8 0C00A6C9 */ jal clamp_angle -/* 9C578C 802403AC 4600A306 */ mov.s $f12, $f20 -/* 9C5790 802403B0 2402000D */ addiu $v0, $zero, 0xd -/* 9C5794 802403B4 E640000C */ swc1 $f0, 0xc($s2) -/* 9C5798 802403B8 AE620070 */ sw $v0, 0x70($s3) -/* 9C579C 802403BC 8FBF0020 */ lw $ra, 0x20($sp) -/* 9C57A0 802403C0 8FB3001C */ lw $s3, 0x1c($sp) -/* 9C57A4 802403C4 8FB20018 */ lw $s2, 0x18($sp) -/* 9C57A8 802403C8 8FB10014 */ lw $s1, 0x14($sp) -/* 9C57AC 802403CC 8FB00010 */ lw $s0, 0x10($sp) -/* 9C57B0 802403D0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 9C57B4 802403D4 03E00008 */ jr $ra -/* 9C57B8 802403D8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_802403DC_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_802403DC_9C53E0.s deleted file mode 100644 index 7eb6cc8a1b..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_802403DC_9C53E0.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403DC_9C57BC -/* 9C57BC 802403DC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9C57C0 802403E0 AFB3003C */ sw $s3, 0x3c($sp) -/* 9C57C4 802403E4 0080982D */ daddu $s3, $a0, $zero -/* 9C57C8 802403E8 AFBF0040 */ sw $ra, 0x40($sp) -/* 9C57CC 802403EC AFB20038 */ sw $s2, 0x38($sp) -/* 9C57D0 802403F0 AFB10034 */ sw $s1, 0x34($sp) -/* 9C57D4 802403F4 AFB00030 */ sw $s0, 0x30($sp) -/* 9C57D8 802403F8 8E720148 */ lw $s2, 0x148($s3) -/* 9C57DC 802403FC 00A0882D */ daddu $s1, $a1, $zero -/* 9C57E0 80240400 86440008 */ lh $a0, 8($s2) -/* 9C57E4 80240404 0C00EABB */ jal get_npc_unsafe -/* 9C57E8 80240408 00C0802D */ daddu $s0, $a2, $zero -/* 9C57EC 8024040C 0200202D */ daddu $a0, $s0, $zero -/* 9C57F0 80240410 0240282D */ daddu $a1, $s2, $zero -/* 9C57F4 80240414 24030001 */ addiu $v1, $zero, 1 -/* 9C57F8 80240418 AFA30010 */ sw $v1, 0x10($sp) -/* 9C57FC 8024041C 8E260018 */ lw $a2, 0x18($s1) -/* 9C5800 80240420 8E27001C */ lw $a3, 0x1c($s1) -/* 9C5804 80240424 0C01242D */ jal func_800490B4 -/* 9C5808 80240428 0040802D */ daddu $s0, $v0, $zero -/* 9C580C 8024042C 1440001D */ bnez $v0, .L802404A4 -/* 9C5810 80240430 24040002 */ addiu $a0, $zero, 2 -/* 9C5814 80240434 0200282D */ daddu $a1, $s0, $zero -/* 9C5818 80240438 0000302D */ daddu $a2, $zero, $zero -/* 9C581C 8024043C 860300A8 */ lh $v1, 0xa8($s0) -/* 9C5820 80240440 3C013F80 */ lui $at, 0x3f80 -/* 9C5824 80240444 44810000 */ mtc1 $at, $f0 -/* 9C5828 80240448 3C014000 */ lui $at, 0x4000 -/* 9C582C 8024044C 44811000 */ mtc1 $at, $f2 -/* 9C5830 80240450 3C01C1A0 */ lui $at, 0xc1a0 -/* 9C5834 80240454 44812000 */ mtc1 $at, $f4 -/* 9C5838 80240458 2402000F */ addiu $v0, $zero, 0xf -/* 9C583C 8024045C AFA2001C */ sw $v0, 0x1c($sp) -/* 9C5840 80240460 44833000 */ mtc1 $v1, $f6 -/* 9C5844 80240464 00000000 */ nop -/* 9C5848 80240468 468031A0 */ cvt.s.w $f6, $f6 -/* 9C584C 8024046C 44073000 */ mfc1 $a3, $f6 -/* 9C5850 80240470 27A20028 */ addiu $v0, $sp, 0x28 -/* 9C5854 80240474 AFA20020 */ sw $v0, 0x20($sp) -/* 9C5858 80240478 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9C585C 8024047C E7A20014 */ swc1 $f2, 0x14($sp) -/* 9C5860 80240480 0C01BFA4 */ jal fx_emote -/* 9C5864 80240484 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9C5868 80240488 8E4200CC */ lw $v0, 0xcc($s2) -/* 9C586C 8024048C 8C430000 */ lw $v1, ($v0) -/* 9C5870 80240490 24020019 */ addiu $v0, $zero, 0x19 -/* 9C5874 80240494 A602008E */ sh $v0, 0x8e($s0) -/* 9C5878 80240498 2402000E */ addiu $v0, $zero, 0xe -/* 9C587C 8024049C 08090136 */ j .L802404D8 -/* 9C5880 802404A0 AE030028 */ sw $v1, 0x28($s0) -.L802404A4: -/* 9C5884 802404A4 8E050018 */ lw $a1, 0x18($s0) -/* 9C5888 802404A8 8E06000C */ lw $a2, 0xc($s0) -/* 9C588C 802404AC 0C00EA95 */ jal npc_move_heading -/* 9C5890 802404B0 0200202D */ daddu $a0, $s0, $zero -/* 9C5894 802404B4 0200202D */ daddu $a0, $s0, $zero -/* 9C5898 802404B8 0C00F598 */ jal func_8003D660 -/* 9C589C 802404BC 24050001 */ addiu $a1, $zero, 1 -/* 9C58A0 802404C0 9602008E */ lhu $v0, 0x8e($s0) -/* 9C58A4 802404C4 2442FFFF */ addiu $v0, $v0, -1 -/* 9C58A8 802404C8 A602008E */ sh $v0, 0x8e($s0) -/* 9C58AC 802404CC 00021400 */ sll $v0, $v0, 0x10 -/* 9C58B0 802404D0 14400002 */ bnez $v0, .L802404DC -/* 9C58B4 802404D4 2402000C */ addiu $v0, $zero, 0xc -.L802404D8: -/* 9C58B8 802404D8 AE620070 */ sw $v0, 0x70($s3) -.L802404DC: -/* 9C58BC 802404DC 8FBF0040 */ lw $ra, 0x40($sp) -/* 9C58C0 802404E0 8FB3003C */ lw $s3, 0x3c($sp) -/* 9C58C4 802404E4 8FB20038 */ lw $s2, 0x38($sp) -/* 9C58C8 802404E8 8FB10034 */ lw $s1, 0x34($sp) -/* 9C58CC 802404EC 8FB00030 */ lw $s0, 0x30($sp) -/* 9C58D0 802404F0 03E00008 */ jr $ra -/* 9C58D4 802404F4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_802404F8_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_802404F8_9C53E0.s deleted file mode 100644 index 73ddf28e22..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_802404F8_9C53E0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404F8_9C58D8 -/* 9C58D8 802404F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C58DC 802404FC AFB00010 */ sw $s0, 0x10($sp) -/* 9C58E0 80240500 0080802D */ daddu $s0, $a0, $zero -/* 9C58E4 80240504 AFBF0014 */ sw $ra, 0x14($sp) -/* 9C58E8 80240508 8E020148 */ lw $v0, 0x148($s0) -/* 9C58EC 8024050C 0C00EABB */ jal get_npc_unsafe -/* 9C58F0 80240510 84440008 */ lh $a0, 8($v0) -/* 9C58F4 80240514 9443008E */ lhu $v1, 0x8e($v0) -/* 9C58F8 80240518 2463FFFF */ addiu $v1, $v1, -1 -/* 9C58FC 8024051C A443008E */ sh $v1, 0x8e($v0) -/* 9C5900 80240520 00031C00 */ sll $v1, $v1, 0x10 -/* 9C5904 80240524 14600002 */ bnez $v1, .L80240530 -/* 9C5908 80240528 2402000F */ addiu $v0, $zero, 0xf -/* 9C590C 8024052C AE020070 */ sw $v0, 0x70($s0) -.L80240530: -/* 9C5910 80240530 8FBF0014 */ lw $ra, 0x14($sp) -/* 9C5914 80240534 8FB00010 */ lw $s0, 0x10($sp) -/* 9C5918 80240538 03E00008 */ jr $ra -/* 9C591C 8024053C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_80240540_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_80240540_9C53E0.s deleted file mode 100644 index 879bd1263b..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_80240540_9C53E0.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240540_9C5920 -/* 9C5920 80240540 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C5924 80240544 AFB10014 */ sw $s1, 0x14($sp) -/* 9C5928 80240548 0080882D */ daddu $s1, $a0, $zero -/* 9C592C 8024054C AFBF001C */ sw $ra, 0x1c($sp) -/* 9C5930 80240550 AFB20018 */ sw $s2, 0x18($sp) -/* 9C5934 80240554 AFB00010 */ sw $s0, 0x10($sp) -/* 9C5938 80240558 8E300148 */ lw $s0, 0x148($s1) -/* 9C593C 8024055C 86040008 */ lh $a0, 8($s0) -/* 9C5940 80240560 0C00EABB */ jal get_npc_unsafe -/* 9C5944 80240564 00A0902D */ daddu $s2, $a1, $zero -/* 9C5948 80240568 8E0300CC */ lw $v1, 0xcc($s0) -/* 9C594C 8024056C 8C630004 */ lw $v1, 4($v1) -/* 9C5950 80240570 0040202D */ daddu $a0, $v0, $zero -/* 9C5954 80240574 AC830028 */ sw $v1, 0x28($a0) -/* 9C5958 80240578 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9C595C 8024057C 8C420014 */ lw $v0, 0x14($v0) -/* 9C5960 80240580 04410009 */ bgez $v0, .L802405A8 -/* 9C5964 80240584 00000000 */ nop -/* 9C5968 80240588 C640000C */ lwc1 $f0, 0xc($s2) -/* 9C596C 8024058C 3C018025 */ lui $at, 0x8025 -/* 9C5970 80240590 D4221A98 */ ldc1 $f2, 0x1a98($at) -/* 9C5974 80240594 46000021 */ cvt.d.s $f0, $f0 -/* 9C5978 80240598 46220002 */ mul.d $f0, $f0, $f2 -/* 9C597C 8024059C 00000000 */ nop -/* 9C5980 802405A0 08090171 */ j .L802405C4 -/* 9C5984 802405A4 46200020 */ cvt.s.d $f0, $f0 -.L802405A8: -/* 9C5988 802405A8 3C018025 */ lui $at, 0x8025 -/* 9C598C 802405AC D4221AA0 */ ldc1 $f2, 0x1aa0($at) -/* 9C5990 802405B0 44820000 */ mtc1 $v0, $f0 -/* 9C5994 802405B4 00000000 */ nop -/* 9C5998 802405B8 46800021 */ cvt.d.w $f0, $f0 -/* 9C599C 802405BC 46220003 */ div.d $f0, $f0, $f2 -/* 9C59A0 802405C0 46200020 */ cvt.s.d $f0, $f0 -.L802405C4: -/* 9C59A4 802405C4 E4800018 */ swc1 $f0, 0x18($a0) -/* 9C59A8 802405C8 24020010 */ addiu $v0, $zero, 0x10 -/* 9C59AC 802405CC AE200074 */ sw $zero, 0x74($s1) -/* 9C59B0 802405D0 AE220070 */ sw $v0, 0x70($s1) -/* 9C59B4 802405D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 9C59B8 802405D8 8FB20018 */ lw $s2, 0x18($sp) -/* 9C59BC 802405DC 8FB10014 */ lw $s1, 0x14($sp) -/* 9C59C0 802405E0 8FB00010 */ lw $s0, 0x10($sp) -/* 9C59C4 802405E4 03E00008 */ jr $ra -/* 9C59C8 802405E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_802405EC_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_802405EC_9C53E0.s deleted file mode 100644 index 764b3cd255..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_802405EC_9C53E0.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_9C59CC -/* 9C59CC 802405EC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9C59D0 802405F0 AFB3003C */ sw $s3, 0x3c($sp) -/* 9C59D4 802405F4 0080982D */ daddu $s3, $a0, $zero -/* 9C59D8 802405F8 AFBF0044 */ sw $ra, 0x44($sp) -/* 9C59DC 802405FC AFB40040 */ sw $s4, 0x40($sp) -/* 9C59E0 80240600 AFB20038 */ sw $s2, 0x38($sp) -/* 9C59E4 80240604 AFB10034 */ sw $s1, 0x34($sp) -/* 9C59E8 80240608 AFB00030 */ sw $s0, 0x30($sp) -/* 9C59EC 8024060C 8E710148 */ lw $s1, 0x148($s3) -/* 9C59F0 80240610 00A0902D */ daddu $s2, $a1, $zero -/* 9C59F4 80240614 86240008 */ lh $a0, 8($s1) -/* 9C59F8 80240618 0C00EABB */ jal get_npc_unsafe -/* 9C59FC 8024061C 00C0A02D */ daddu $s4, $a2, $zero -/* 9C5A00 80240620 8E430008 */ lw $v1, 8($s2) -/* 9C5A04 80240624 0460003B */ bltz $v1, .L80240714 -/* 9C5A08 80240628 0040802D */ daddu $s0, $v0, $zero -/* 9C5A0C 8024062C 8E620074 */ lw $v0, 0x74($s3) -/* 9C5A10 80240630 1C400037 */ bgtz $v0, .L80240710 -/* 9C5A14 80240634 2442FFFF */ addiu $v0, $v0, -1 -/* 9C5A18 80240638 0280202D */ daddu $a0, $s4, $zero -/* 9C5A1C 8024063C AE630074 */ sw $v1, 0x74($s3) -/* 9C5A20 80240640 AFA00010 */ sw $zero, 0x10($sp) -/* 9C5A24 80240644 8E460018 */ lw $a2, 0x18($s2) -/* 9C5A28 80240648 8E47001C */ lw $a3, 0x1c($s2) -/* 9C5A2C 8024064C 0C01242D */ jal func_800490B4 -/* 9C5A30 80240650 0220282D */ daddu $a1, $s1, $zero -/* 9C5A34 80240654 1040002C */ beqz $v0, .L80240708 -/* 9C5A38 80240658 0000202D */ daddu $a0, $zero, $zero -/* 9C5A3C 8024065C 0200282D */ daddu $a1, $s0, $zero -/* 9C5A40 80240660 0000302D */ daddu $a2, $zero, $zero -/* 9C5A44 80240664 860300A8 */ lh $v1, 0xa8($s0) -/* 9C5A48 80240668 3C013F80 */ lui $at, 0x3f80 -/* 9C5A4C 8024066C 44810000 */ mtc1 $at, $f0 -/* 9C5A50 80240670 3C014000 */ lui $at, 0x4000 -/* 9C5A54 80240674 44811000 */ mtc1 $at, $f2 -/* 9C5A58 80240678 3C01C1A0 */ lui $at, 0xc1a0 -/* 9C5A5C 8024067C 44812000 */ mtc1 $at, $f4 -/* 9C5A60 80240680 2402000F */ addiu $v0, $zero, 0xf -/* 9C5A64 80240684 AFA2001C */ sw $v0, 0x1c($sp) -/* 9C5A68 80240688 44833000 */ mtc1 $v1, $f6 -/* 9C5A6C 8024068C 00000000 */ nop -/* 9C5A70 80240690 468031A0 */ cvt.s.w $f6, $f6 -/* 9C5A74 80240694 44073000 */ mfc1 $a3, $f6 -/* 9C5A78 80240698 27A20028 */ addiu $v0, $sp, 0x28 -/* 9C5A7C 8024069C AFA20020 */ sw $v0, 0x20($sp) -/* 9C5A80 802406A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9C5A84 802406A4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9C5A88 802406A8 0C01BFA4 */ jal fx_emote -/* 9C5A8C 802406AC E7A40018 */ swc1 $f4, 0x18($sp) -/* 9C5A90 802406B0 0200202D */ daddu $a0, $s0, $zero -/* 9C5A94 802406B4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9C5A98 802406B8 0C012530 */ jal func_800494C0 -/* 9C5A9C 802406BC 3C060020 */ lui $a2, 0x20 -/* 9C5AA0 802406C0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9C5AA4 802406C4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9C5AA8 802406C8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9C5AAC 802406CC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9C5AB0 802406D0 8C460028 */ lw $a2, 0x28($v0) -/* 9C5AB4 802406D4 0C00A720 */ jal atan2 -/* 9C5AB8 802406D8 8C470030 */ lw $a3, 0x30($v0) -/* 9C5ABC 802406DC E600000C */ swc1 $f0, 0xc($s0) -/* 9C5AC0 802406E0 8E220018 */ lw $v0, 0x18($s1) -/* 9C5AC4 802406E4 9442002A */ lhu $v0, 0x2a($v0) -/* 9C5AC8 802406E8 30420001 */ andi $v0, $v0, 1 -/* 9C5ACC 802406EC 10400003 */ beqz $v0, .L802406FC -/* 9C5AD0 802406F0 2402000A */ addiu $v0, $zero, 0xa -/* 9C5AD4 802406F4 080901F5 */ j .L802407D4 -/* 9C5AD8 802406F8 AE620070 */ sw $v0, 0x70($s3) -.L802406FC: -/* 9C5ADC 802406FC 2402000C */ addiu $v0, $zero, 0xc -/* 9C5AE0 80240700 080901F5 */ j .L802407D4 -/* 9C5AE4 80240704 AE620070 */ sw $v0, 0x70($s3) -.L80240708: -/* 9C5AE8 80240708 8E620074 */ lw $v0, 0x74($s3) -/* 9C5AEC 8024070C 2442FFFF */ addiu $v0, $v0, -1 -.L80240710: -/* 9C5AF0 80240710 AE620074 */ sw $v0, 0x74($s3) -.L80240714: -/* 9C5AF4 80240714 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9C5AF8 80240718 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9C5AFC 8024071C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9C5B00 80240720 C4460000 */ lwc1 $f6, ($v0) -/* 9C5B04 80240724 468031A0 */ cvt.s.w $f6, $f6 -/* 9C5B08 80240728 44063000 */ mfc1 $a2, $f6 -/* 9C5B0C 8024072C C4460008 */ lwc1 $f6, 8($v0) -/* 9C5B10 80240730 468031A0 */ cvt.s.w $f6, $f6 -/* 9C5B14 80240734 44073000 */ mfc1 $a3, $f6 -/* 9C5B18 80240738 0C00A7B5 */ jal dist2D -/* 9C5B1C 8024073C 00000000 */ nop -/* 9C5B20 80240740 C6020018 */ lwc1 $f2, 0x18($s0) -/* 9C5B24 80240744 4602003C */ c.lt.s $f0, $f2 -/* 9C5B28 80240748 00000000 */ nop -/* 9C5B2C 8024074C 4500000E */ bc1f .L80240788 -/* 9C5B30 80240750 00000000 */ nop -/* 9C5B34 80240754 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9C5B38 80240758 C4400000 */ lwc1 $f0, ($v0) -/* 9C5B3C 8024075C 46800020 */ cvt.s.w $f0, $f0 -/* 9C5B40 80240760 E6000038 */ swc1 $f0, 0x38($s0) -/* 9C5B44 80240764 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9C5B48 80240768 C4400008 */ lwc1 $f0, 8($v0) -/* 9C5B4C 8024076C 46800020 */ cvt.s.w $f0, $f0 -/* 9C5B50 80240770 E6000040 */ swc1 $f0, 0x40($s0) -/* 9C5B54 80240774 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9C5B58 80240778 C440000C */ lwc1 $f0, 0xc($v0) -/* 9C5B5C 8024077C 46800020 */ cvt.s.w $f0, $f0 -/* 9C5B60 80240780 E600000C */ swc1 $f0, 0xc($s0) -/* 9C5B64 80240784 AE600070 */ sw $zero, 0x70($s3) -.L80240788: -/* 9C5B68 80240788 8602008C */ lh $v0, 0x8c($s0) -/* 9C5B6C 8024078C 14400011 */ bnez $v0, .L802407D4 -/* 9C5B70 80240790 00000000 */ nop -/* 9C5B74 80240794 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9C5B78 80240798 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9C5B7C 8024079C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9C5B80 802407A0 C4460000 */ lwc1 $f6, ($v0) -/* 9C5B84 802407A4 468031A0 */ cvt.s.w $f6, $f6 -/* 9C5B88 802407A8 44063000 */ mfc1 $a2, $f6 -/* 9C5B8C 802407AC C4460008 */ lwc1 $f6, 8($v0) -/* 9C5B90 802407B0 468031A0 */ cvt.s.w $f6, $f6 -/* 9C5B94 802407B4 44073000 */ mfc1 $a3, $f6 -/* 9C5B98 802407B8 0C00A720 */ jal atan2 -/* 9C5B9C 802407BC 00000000 */ nop -/* 9C5BA0 802407C0 8E050018 */ lw $a1, 0x18($s0) -/* 9C5BA4 802407C4 44060000 */ mfc1 $a2, $f0 -/* 9C5BA8 802407C8 0200202D */ daddu $a0, $s0, $zero -/* 9C5BAC 802407CC 0C00EA95 */ jal npc_move_heading -/* 9C5BB0 802407D0 AC86000C */ sw $a2, 0xc($a0) -.L802407D4: -/* 9C5BB4 802407D4 8FBF0044 */ lw $ra, 0x44($sp) -/* 9C5BB8 802407D8 8FB40040 */ lw $s4, 0x40($sp) -/* 9C5BBC 802407DC 8FB3003C */ lw $s3, 0x3c($sp) -/* 9C5BC0 802407E0 8FB20038 */ lw $s2, 0x38($sp) -/* 9C5BC4 802407E4 8FB10034 */ lw $s1, 0x34($sp) -/* 9C5BC8 802407E8 8FB00030 */ lw $s0, 0x30($sp) -/* 9C5BCC 802407EC 03E00008 */ jr $ra -/* 9C5BD0 802407F0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_802407F4_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_802407F4_9C53E0.s deleted file mode 100644 index 26b05c07ca..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_802407F4_9C53E0.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407F4_9C5BD4 -/* 9C5BD4 802407F4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9C5BD8 802407F8 AFB40040 */ sw $s4, 0x40($sp) -/* 9C5BDC 802407FC 0080A02D */ daddu $s4, $a0, $zero -/* 9C5BE0 80240800 AFBF0048 */ sw $ra, 0x48($sp) -/* 9C5BE4 80240804 AFB50044 */ sw $s5, 0x44($sp) -/* 9C5BE8 80240808 AFB3003C */ sw $s3, 0x3c($sp) -/* 9C5BEC 8024080C AFB20038 */ sw $s2, 0x38($sp) -/* 9C5BF0 80240810 AFB10034 */ sw $s1, 0x34($sp) -/* 9C5BF4 80240814 AFB00030 */ sw $s0, 0x30($sp) -/* 9C5BF8 80240818 8E920148 */ lw $s2, 0x148($s4) -/* 9C5BFC 8024081C 86440008 */ lh $a0, 8($s2) -/* 9C5C00 80240820 8E90000C */ lw $s0, 0xc($s4) -/* 9C5C04 80240824 0C00EABB */ jal get_npc_unsafe -/* 9C5C08 80240828 00A0882D */ daddu $s1, $a1, $zero -/* 9C5C0C 8024082C 0280202D */ daddu $a0, $s4, $zero -/* 9C5C10 80240830 8E050000 */ lw $a1, ($s0) -/* 9C5C14 80240834 0C0B1EAF */ jal get_variable -/* 9C5C18 80240838 0040802D */ daddu $s0, $v0, $zero -/* 9C5C1C 8024083C AFA00010 */ sw $zero, 0x10($sp) -/* 9C5C20 80240840 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9C5C24 80240844 8C630030 */ lw $v1, 0x30($v1) -/* 9C5C28 80240848 AFA30014 */ sw $v1, 0x14($sp) -/* 9C5C2C 8024084C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9C5C30 80240850 8C63001C */ lw $v1, 0x1c($v1) -/* 9C5C34 80240854 AFA30018 */ sw $v1, 0x18($sp) -/* 9C5C38 80240858 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9C5C3C 8024085C 8C630024 */ lw $v1, 0x24($v1) -/* 9C5C40 80240860 AFA3001C */ sw $v1, 0x1c($sp) -/* 9C5C44 80240864 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9C5C48 80240868 8C630028 */ lw $v1, 0x28($v1) -/* 9C5C4C 8024086C 27B50010 */ addiu $s5, $sp, 0x10 -/* 9C5C50 80240870 AFA30020 */ sw $v1, 0x20($sp) -/* 9C5C54 80240874 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9C5C58 80240878 3C014282 */ lui $at, 0x4282 -/* 9C5C5C 8024087C 44810000 */ mtc1 $at, $f0 -/* 9C5C60 80240880 8C63002C */ lw $v1, 0x2c($v1) -/* 9C5C64 80240884 0040982D */ daddu $s3, $v0, $zero -/* 9C5C68 80240888 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9C5C6C 8024088C A7A0002C */ sh $zero, 0x2c($sp) -/* 9C5C70 80240890 16200005 */ bnez $s1, .L802408A8 -/* 9C5C74 80240894 AFA30024 */ sw $v1, 0x24($sp) -/* 9C5C78 80240898 8E4200B0 */ lw $v0, 0xb0($s2) -/* 9C5C7C 8024089C 30420004 */ andi $v0, $v0, 4 -/* 9C5C80 802408A0 1040002F */ beqz $v0, .L80240960 -/* 9C5C84 802408A4 00000000 */ nop -.L802408A8: -/* 9C5C88 802408A8 AE800070 */ sw $zero, 0x70($s4) -/* 9C5C8C 802408AC C600000C */ lwc1 $f0, 0xc($s0) -/* 9C5C90 802408B0 A600008E */ sh $zero, 0x8e($s0) -/* 9C5C94 802408B4 8E4200CC */ lw $v0, 0xcc($s2) -/* 9C5C98 802408B8 4600008D */ trunc.w.s $f2, $f0 -/* 9C5C9C 802408BC E642006C */ swc1 $f2, 0x6c($s2) -/* 9C5CA0 802408C0 8C420000 */ lw $v0, ($v0) -/* 9C5CA4 802408C4 8E030000 */ lw $v1, ($s0) -/* 9C5CA8 802408C8 AE020028 */ sw $v0, 0x28($s0) -/* 9C5CAC 802408CC 2402F7FF */ addiu $v0, $zero, -0x801 -/* 9C5CB0 802408D0 00621824 */ and $v1, $v1, $v0 -/* 9C5CB4 802408D4 AE030000 */ sw $v1, ($s0) -/* 9C5CB8 802408D8 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9C5CBC 802408DC 8C420034 */ lw $v0, 0x34($v0) -/* 9C5CC0 802408E0 54400005 */ bnel $v0, $zero, .L802408F8 -/* 9C5CC4 802408E4 2402FDFF */ addiu $v0, $zero, -0x201 -/* 9C5CC8 802408E8 34620200 */ ori $v0, $v1, 0x200 -/* 9C5CCC 802408EC 2403FFF7 */ addiu $v1, $zero, -9 -/* 9C5CD0 802408F0 08090240 */ j .L80240900 -/* 9C5CD4 802408F4 00431024 */ and $v0, $v0, $v1 -.L802408F8: -/* 9C5CD8 802408F8 00621024 */ and $v0, $v1, $v0 -/* 9C5CDC 802408FC 34420008 */ ori $v0, $v0, 8 -.L80240900: -/* 9C5CE0 80240900 AE020000 */ sw $v0, ($s0) -/* 9C5CE4 80240904 8E4200B0 */ lw $v0, 0xb0($s2) -/* 9C5CE8 80240908 30420004 */ andi $v0, $v0, 4 -/* 9C5CEC 8024090C 10400009 */ beqz $v0, .L80240934 -/* 9C5CF0 80240910 24020063 */ addiu $v0, $zero, 0x63 -/* 9C5CF4 80240914 AE820070 */ sw $v0, 0x70($s4) -/* 9C5CF8 80240918 2402000F */ addiu $v0, $zero, 0xf -/* 9C5CFC 8024091C AE820074 */ sw $v0, 0x74($s4) -/* 9C5D00 80240920 8E4200B0 */ lw $v0, 0xb0($s2) -/* 9C5D04 80240924 2403FFFB */ addiu $v1, $zero, -5 -/* 9C5D08 80240928 00431024 */ and $v0, $v0, $v1 -/* 9C5D0C 8024092C 08090258 */ j .L80240960 -/* 9C5D10 80240930 AE4200B0 */ sw $v0, 0xb0($s2) -.L80240934: -/* 9C5D14 80240934 8E420000 */ lw $v0, ($s2) -/* 9C5D18 80240938 3C034000 */ lui $v1, 0x4000 -/* 9C5D1C 8024093C 00431024 */ and $v0, $v0, $v1 -/* 9C5D20 80240940 10400007 */ beqz $v0, .L80240960 -/* 9C5D24 80240944 3C03BFFF */ lui $v1, 0xbfff -/* 9C5D28 80240948 2402000C */ addiu $v0, $zero, 0xc -/* 9C5D2C 8024094C AE820070 */ sw $v0, 0x70($s4) -/* 9C5D30 80240950 8E420000 */ lw $v0, ($s2) -/* 9C5D34 80240954 3463FFFF */ ori $v1, $v1, 0xffff -/* 9C5D38 80240958 00431024 */ and $v0, $v0, $v1 -/* 9C5D3C 8024095C AE420000 */ sw $v0, ($s2) -.L80240960: -/* 9C5D40 80240960 8E830070 */ lw $v1, 0x70($s4) -/* 9C5D44 80240964 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9C5D48 80240968 10400036 */ beqz $v0, .L80240A44 -/* 9C5D4C 8024096C 00031080 */ sll $v0, $v1, 2 -/* 9C5D50 80240970 3C018025 */ lui $at, 0x8025 -/* 9C5D54 80240974 00220821 */ addu $at, $at, $v0 -/* 9C5D58 80240978 8C221AA8 */ lw $v0, 0x1aa8($at) -/* 9C5D5C 8024097C 00400008 */ jr $v0 -/* 9C5D60 80240980 00000000 */ nop -/* 9C5D64 80240984 0280202D */ daddu $a0, $s4, $zero -/* 9C5D68 80240988 0260282D */ daddu $a1, $s3, $zero -/* 9C5D6C 8024098C 0C090000 */ jal func_80240000 -/* 9C5D70 80240990 02A0302D */ daddu $a2, $s5, $zero -/* 9C5D74 80240994 0280202D */ daddu $a0, $s4, $zero -/* 9C5D78 80240998 0260282D */ daddu $a1, $s3, $zero -/* 9C5D7C 8024099C 0C09002D */ jal func_802400B4 -/* 9C5D80 802409A0 02A0302D */ daddu $a2, $s5, $zero -/* 9C5D84 802409A4 08090291 */ j .L80240A44 -/* 9C5D88 802409A8 00000000 */ nop -/* 9C5D8C 802409AC 0280202D */ daddu $a0, $s4, $zero -/* 9C5D90 802409B0 0260282D */ daddu $a1, $s3, $zero -/* 9C5D94 802409B4 0C090075 */ jal func_802401D4 -/* 9C5D98 802409B8 02A0302D */ daddu $a2, $s5, $zero -/* 9C5D9C 802409BC 0280202D */ daddu $a0, $s4, $zero -/* 9C5DA0 802409C0 0260282D */ daddu $a1, $s3, $zero -/* 9C5DA4 802409C4 0C09008D */ jal func_80240234 -/* 9C5DA8 802409C8 02A0302D */ daddu $a2, $s5, $zero -/* 9C5DAC 802409CC 08090291 */ j .L80240A44 -/* 9C5DB0 802409D0 00000000 */ nop -/* 9C5DB4 802409D4 0280202D */ daddu $a0, $s4, $zero -/* 9C5DB8 802409D8 0260282D */ daddu $a1, $s3, $zero -/* 9C5DBC 802409DC 0C0900AB */ jal func_802402AC -/* 9C5DC0 802409E0 02A0302D */ daddu $a2, $s5, $zero -/* 9C5DC4 802409E4 0280202D */ daddu $a0, $s4, $zero -/* 9C5DC8 802409E8 0260282D */ daddu $a1, $s3, $zero -/* 9C5DCC 802409EC 0C0900F7 */ jal func_802403DC -/* 9C5DD0 802409F0 02A0302D */ daddu $a2, $s5, $zero -/* 9C5DD4 802409F4 08090291 */ j .L80240A44 -/* 9C5DD8 802409F8 00000000 */ nop -/* 9C5DDC 802409FC 0280202D */ daddu $a0, $s4, $zero -/* 9C5DE0 80240A00 0260282D */ daddu $a1, $s3, $zero -/* 9C5DE4 80240A04 0C09013E */ jal func_802404F8 -/* 9C5DE8 80240A08 02A0302D */ daddu $a2, $s5, $zero -/* 9C5DEC 80240A0C 08090291 */ j .L80240A44 -/* 9C5DF0 80240A10 00000000 */ nop -/* 9C5DF4 80240A14 0280202D */ daddu $a0, $s4, $zero -/* 9C5DF8 80240A18 0260282D */ daddu $a1, $s3, $zero -/* 9C5DFC 80240A1C 0C090150 */ jal func_80240540 -/* 9C5E00 80240A20 02A0302D */ daddu $a2, $s5, $zero -/* 9C5E04 80240A24 0280202D */ daddu $a0, $s4, $zero -/* 9C5E08 80240A28 0260282D */ daddu $a1, $s3, $zero -/* 9C5E0C 80240A2C 0C09017B */ jal func_802405EC -/* 9C5E10 80240A30 02A0302D */ daddu $a2, $s5, $zero -/* 9C5E14 80240A34 08090291 */ j .L80240A44 -/* 9C5E18 80240A38 00000000 */ nop -/* 9C5E1C 80240A3C 0C0129CF */ jal func_8004A73C -/* 9C5E20 80240A40 0280202D */ daddu $a0, $s4, $zero -.L80240A44: -/* 9C5E24 80240A44 8FBF0048 */ lw $ra, 0x48($sp) -/* 9C5E28 80240A48 8FB50044 */ lw $s5, 0x44($sp) -/* 9C5E2C 80240A4C 8FB40040 */ lw $s4, 0x40($sp) -/* 9C5E30 80240A50 8FB3003C */ lw $s3, 0x3c($sp) -/* 9C5E34 80240A54 8FB20038 */ lw $s2, 0x38($sp) -/* 9C5E38 80240A58 8FB10034 */ lw $s1, 0x34($sp) -/* 9C5E3C 80240A5C 8FB00030 */ lw $s0, 0x30($sp) -/* 9C5E40 80240A60 0000102D */ daddu $v0, $zero, $zero -/* 9C5E44 80240A64 03E00008 */ jr $ra -/* 9C5E48 80240A68 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_80240A6C_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_80240A6C_9C53E0.s deleted file mode 100644 index f088194dcb..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_80240A6C_9C53E0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_9C5E4C -/* 9C5E4C 80240A6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C5E50 80240A70 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C5E54 80240A74 0C03A625 */ jal func_800E9894 -/* 9C5E58 80240A78 00000000 */ nop -/* 9C5E5C 80240A7C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C5E60 80240A80 24020002 */ addiu $v0, $zero, 2 -/* 9C5E64 80240A84 03E00008 */ jr $ra -/* 9C5E68 80240A88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_80240BE0_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_80240BE0_9C53E0.s deleted file mode 100644 index 16b30d3430..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_80240BE0_9C53E0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BE0_9C5FC0 -/* 9C5FC0 80240BE0 3C028011 */ lui $v0, 0x8011 -/* 9C5FC4 80240BE4 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 9C5FC8 80240BE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C5FCC 80240BEC 10400003 */ beqz $v0, .L80240BFC -/* 9C5FD0 80240BF0 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C5FD4 80240BF4 0C03AE06 */ jal partner_suspend_ability_script -/* 9C5FD8 80240BF8 00000000 */ nop -.L80240BFC: -/* 9C5FDC 80240BFC 24020002 */ addiu $v0, $zero, 2 -/* 9C5FE0 80240C00 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C5FE4 80240C04 03E00008 */ jr $ra -/* 9C5FE8 80240C08 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_80240C80_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_80240C80_9C53E0.s deleted file mode 100644 index bcc46998d6..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_80240C80_9C53E0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C80_9C6060 -/* 9C6060 80240C80 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C6064 80240C84 AFB10014 */ sw $s1, 0x14($sp) -/* 9C6068 80240C88 0080882D */ daddu $s1, $a0, $zero -/* 9C606C 80240C8C AFBF001C */ sw $ra, 0x1c($sp) -/* 9C6070 80240C90 AFB20018 */ sw $s2, 0x18($sp) -/* 9C6074 80240C94 AFB00010 */ sw $s0, 0x10($sp) -/* 9C6078 80240C98 8E30000C */ lw $s0, 0xc($s1) -/* 9C607C 80240C9C 8E050000 */ lw $a1, ($s0) -/* 9C6080 80240CA0 0C0B1EAF */ jal get_variable -/* 9C6084 80240CA4 26100004 */ addiu $s0, $s0, 4 -/* 9C6088 80240CA8 8E050000 */ lw $a1, ($s0) -/* 9C608C 80240CAC 26100004 */ addiu $s0, $s0, 4 -/* 9C6090 80240CB0 0220202D */ daddu $a0, $s1, $zero -/* 9C6094 80240CB4 0C0B1EAF */ jal get_variable -/* 9C6098 80240CB8 0040902D */ daddu $s2, $v0, $zero -/* 9C609C 80240CBC 0220202D */ daddu $a0, $s1, $zero -/* 9C60A0 80240CC0 8E050000 */ lw $a1, ($s0) -/* 9C60A4 80240CC4 0C0B1EAF */ jal get_variable -/* 9C60A8 80240CC8 0040802D */ daddu $s0, $v0, $zero -/* 9C60AC 80240CCC 0000202D */ daddu $a0, $zero, $zero -/* 9C60B0 80240CD0 324500FF */ andi $a1, $s2, 0xff -/* 9C60B4 80240CD4 320600FF */ andi $a2, $s0, 0xff -/* 9C60B8 80240CD8 0C04DF84 */ jal func_80137E10 -/* 9C60BC 80240CDC 304700FF */ andi $a3, $v0, 0xff -/* 9C60C0 80240CE0 8FBF001C */ lw $ra, 0x1c($sp) -/* 9C60C4 80240CE4 8FB20018 */ lw $s2, 0x18($sp) -/* 9C60C8 80240CE8 8FB10014 */ lw $s1, 0x14($sp) -/* 9C60CC 80240CEC 8FB00010 */ lw $s0, 0x10($sp) -/* 9C60D0 80240CF0 24020002 */ addiu $v0, $zero, 2 -/* 9C60D4 80240CF4 03E00008 */ jr $ra -/* 9C60D8 80240CF8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_80240D30_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_80240D30_9C53E0.s deleted file mode 100644 index 393eda7a34..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_80240D30_9C53E0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D30_9C6110 -/* 9C6110 80240D30 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C6114 80240D34 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C6118 80240D38 8C82000C */ lw $v0, 0xc($a0) -/* 9C611C 80240D3C 0C0B1EAF */ jal get_variable -/* 9C6120 80240D40 8C450000 */ lw $a1, ($v0) -/* 9C6124 80240D44 00021600 */ sll $v0, $v0, 0x18 -/* 9C6128 80240D48 0C03AC5A */ jal func_800EB168 -/* 9C612C 80240D4C 00022603 */ sra $a0, $v0, 0x18 -/* 9C6130 80240D50 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C6134 80240D54 24020002 */ addiu $v0, $zero, 2 -/* 9C6138 80240D58 03E00008 */ jr $ra -/* 9C613C 80240D5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_80240E80_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_80240E80_9C53E0.s deleted file mode 100644 index cf6b163608..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_80240E80_9C53E0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E80_9C6260 -/* 9C6260 80240E80 24020001 */ addiu $v0, $zero, 1 -/* 9C6264 80240E84 3C018015 */ lui $at, %hi(D_80151310) -/* 9C6268 80240E88 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 9C626C 80240E8C 03E00008 */ jr $ra -/* 9C6270 80240E90 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_802412E0_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_802412E0_9C53E0.s deleted file mode 100644 index 3340d9adf9..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_802412E0_9C53E0.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412E0_9C66C0 -/* 9C66C0 802412E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9C66C4 802412E4 AFB00010 */ sw $s0, 0x10($sp) -/* 9C66C8 802412E8 0080802D */ daddu $s0, $a0, $zero -/* 9C66CC 802412EC AFBF0020 */ sw $ra, 0x20($sp) -/* 9C66D0 802412F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 9C66D4 802412F4 AFB20018 */ sw $s2, 0x18($sp) -/* 9C66D8 802412F8 10A00009 */ beqz $a1, .L80241320 -/* 9C66DC 802412FC AFB10014 */ sw $s1, 0x14($sp) -/* 9C66E0 80241300 0000202D */ daddu $a0, $zero, $zero -/* 9C66E4 80241304 0080282D */ daddu $a1, $a0, $zero -/* 9C66E8 80241308 0080302D */ daddu $a2, $a0, $zero -/* 9C66EC 8024130C 0C046F97 */ jal set_background_color_blend -/* 9C66F0 80241310 240700FF */ addiu $a3, $zero, 0xff -/* 9C66F4 80241314 240200FF */ addiu $v0, $zero, 0xff -/* 9C66F8 80241318 AE020070 */ sw $v0, 0x70($s0) -/* 9C66FC 8024131C AE000074 */ sw $zero, 0x74($s0) -.L80241320: -/* 9C6700 80241320 8E020070 */ lw $v0, 0x70($s0) -/* 9C6704 80241324 2442FFF8 */ addiu $v0, $v0, -8 -/* 9C6708 80241328 04410002 */ bgez $v0, .L80241334 -/* 9C670C 8024132C AE020070 */ sw $v0, 0x70($s0) -/* 9C6710 80241330 AE000070 */ sw $zero, 0x70($s0) -.L80241334: -/* 9C6714 80241334 0000202D */ daddu $a0, $zero, $zero -/* 9C6718 80241338 0080282D */ daddu $a1, $a0, $zero -/* 9C671C 8024133C 92070073 */ lbu $a3, 0x73($s0) -/* 9C6720 80241340 0C046F97 */ jal set_background_color_blend -/* 9C6724 80241344 0080302D */ daddu $a2, $a0, $zero -/* 9C6728 80241348 8E020070 */ lw $v0, 0x70($s0) -/* 9C672C 8024134C 14400006 */ bnez $v0, .L80241368 -/* 9C6730 80241350 00000000 */ nop -/* 9C6734 80241354 8E020074 */ lw $v0, 0x74($s0) -/* 9C6738 80241358 14400003 */ bnez $v0, .L80241368 -/* 9C673C 8024135C 24020001 */ addiu $v0, $zero, 1 -/* 9C6740 80241360 0809050D */ j .L80241434 -/* 9C6744 80241364 AE020074 */ sw $v0, 0x74($s0) -.L80241368: -/* 9C6748 80241368 8E030074 */ lw $v1, 0x74($s0) -/* 9C674C 8024136C 24020001 */ addiu $v0, $zero, 1 -/* 9C6750 80241370 14620031 */ bne $v1, $v0, .L80241438 -/* 9C6754 80241374 0000102D */ daddu $v0, $zero, $zero -/* 9C6758 80241378 0C04760B */ jal func_8011D82C -/* 9C675C 8024137C 0000202D */ daddu $a0, $zero, $zero -/* 9C6760 80241380 0000802D */ daddu $s0, $zero, $zero -/* 9C6764 80241384 2413FFFC */ addiu $s3, $zero, -4 -/* 9C6768 80241388 2412000F */ addiu $s2, $zero, 0xf -/* 9C676C 8024138C 3C11FF7F */ lui $s1, 0xff7f -/* 9C6770 80241390 3C028015 */ lui $v0, 0x8015 -/* 9C6774 80241394 8C4212F0 */ lw $v0, 0x12f0($v0) -/* 9C6778 80241398 3631FFFF */ ori $s1, $s1, 0xffff -/* 9C677C 8024139C A0400000 */ sb $zero, ($v0) -.L802413A0: -/* 9C6780 802413A0 0C00E2B7 */ jal get_npc_by_index -/* 9C6784 802413A4 0200202D */ daddu $a0, $s0, $zero -/* 9C6788 802413A8 0040202D */ daddu $a0, $v0, $zero -/* 9C678C 802413AC 5080000B */ beql $a0, $zero, .L802413DC -/* 9C6790 802413B0 26100001 */ addiu $s0, $s0, 1 -/* 9C6794 802413B4 8C820000 */ lw $v0, ($a0) -/* 9C6798 802413B8 50400008 */ beql $v0, $zero, .L802413DC -/* 9C679C 802413BC 26100001 */ addiu $s0, $s0, 1 -/* 9C67A0 802413C0 808300A4 */ lb $v1, 0xa4($a0) -/* 9C67A4 802413C4 10730005 */ beq $v1, $s3, .L802413DC -/* 9C67A8 802413C8 26100001 */ addiu $s0, $s0, 1 -/* 9C67AC 802413CC 10720003 */ beq $v1, $s2, .L802413DC -/* 9C67B0 802413D0 00000000 */ nop -/* 9C67B4 802413D4 00511024 */ and $v0, $v0, $s1 -/* 9C67B8 802413D8 AC820000 */ sw $v0, ($a0) -.L802413DC: -/* 9C67BC 802413DC 2A020040 */ slti $v0, $s0, 0x40 -/* 9C67C0 802413E0 1440FFEF */ bnez $v0, .L802413A0 -/* 9C67C4 802413E4 00000000 */ nop -/* 9C67C8 802413E8 0000802D */ daddu $s0, $zero, $zero -/* 9C67CC 802413EC 3C11F7FF */ lui $s1, 0xf7ff -/* 9C67D0 802413F0 3631FFFF */ ori $s1, $s1, 0xffff -.L802413F4: -/* 9C67D4 802413F4 0C04C3D6 */ jal get_item_entity -/* 9C67D8 802413F8 0200202D */ daddu $a0, $s0, $zero -/* 9C67DC 802413FC 0040182D */ daddu $v1, $v0, $zero -/* 9C67E0 80241400 10600007 */ beqz $v1, .L80241420 -/* 9C67E4 80241404 26100001 */ addiu $s0, $s0, 1 -/* 9C67E8 80241408 8C640000 */ lw $a0, ($v1) -/* 9C67EC 8024140C 30820010 */ andi $v0, $a0, 0x10 -/* 9C67F0 80241410 10400003 */ beqz $v0, .L80241420 -/* 9C67F4 80241414 00000000 */ nop -/* 9C67F8 80241418 00911024 */ and $v0, $a0, $s1 -/* 9C67FC 8024141C AC620000 */ sw $v0, ($v1) -.L80241420: -/* 9C6800 80241420 2A020100 */ slti $v0, $s0, 0x100 -/* 9C6804 80241424 1440FFF3 */ bnez $v0, .L802413F4 -/* 9C6808 80241428 24020002 */ addiu $v0, $zero, 2 -/* 9C680C 8024142C 0809050E */ j .L80241438 -/* 9C6810 80241430 00000000 */ nop -.L80241434: -/* 9C6814 80241434 0000102D */ daddu $v0, $zero, $zero -.L80241438: -/* 9C6818 80241438 8FBF0020 */ lw $ra, 0x20($sp) -/* 9C681C 8024143C 8FB3001C */ lw $s3, 0x1c($sp) -/* 9C6820 80241440 8FB20018 */ lw $s2, 0x18($sp) -/* 9C6824 80241444 8FB10014 */ lw $s1, 0x14($sp) -/* 9C6828 80241448 8FB00010 */ lw $s0, 0x10($sp) -/* 9C682C 8024144C 03E00008 */ jr $ra -/* 9C6830 80241450 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_802414D8_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_802414D8_9C53E0.s deleted file mode 100644 index 97d4835dcd..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_802414D8_9C53E0.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414D8_9C68B8 -/* 9C68B8 802414D8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9C68BC 802414DC AFB1001C */ sw $s1, 0x1c($sp) -/* 9C68C0 802414E0 AFBF0020 */ sw $ra, 0x20($sp) -/* 9C68C4 802414E4 AFB00018 */ sw $s0, 0x18($sp) -/* 9C68C8 802414E8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 9C68CC 802414EC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 9C68D0 802414F0 10A00060 */ beqz $a1, .L80241674 -/* 9C68D4 802414F4 0080882D */ daddu $s1, $a0, $zero -/* 9C68D8 802414F8 3C05F4AC */ lui $a1, 0xf4ac -/* 9C68DC 802414FC 0C0B1EAF */ jal get_variable -/* 9C68E0 80241500 34A5D481 */ ori $a1, $a1, 0xd481 -/* 9C68E4 80241504 0220202D */ daddu $a0, $s1, $zero -/* 9C68E8 80241508 3C05F4AC */ lui $a1, 0xf4ac -/* 9C68EC 8024150C 4482B000 */ mtc1 $v0, $f22 -/* 9C68F0 80241510 00000000 */ nop -/* 9C68F4 80241514 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9C68F8 80241518 0C0B1EAF */ jal get_variable -/* 9C68FC 8024151C 34A5D482 */ ori $a1, $a1, 0xd482 -/* 9C6900 80241520 0220202D */ daddu $a0, $s1, $zero -/* 9C6904 80241524 3C05F4AC */ lui $a1, 0xf4ac -/* 9C6908 80241528 4482A000 */ mtc1 $v0, $f20 -/* 9C690C 8024152C 00000000 */ nop -/* 9C6910 80241530 4680A520 */ cvt.s.w $f20, $f20 -/* 9C6914 80241534 0C0B1EAF */ jal get_variable -/* 9C6918 80241538 34A5D483 */ ori $a1, $a1, 0xd483 -/* 9C691C 8024153C 44821000 */ mtc1 $v0, $f2 -/* 9C6920 80241540 00000000 */ nop -/* 9C6924 80241544 468010A0 */ cvt.s.w $f2, $f2 -/* 9C6928 80241548 4405B000 */ mfc1 $a1, $f22 -/* 9C692C 8024154C 4406A000 */ mfc1 $a2, $f20 -/* 9C6930 80241550 44071000 */ mfc1 $a3, $f2 -/* 9C6934 80241554 0C01C574 */ jal func_800715D0 -/* 9C6938 80241558 0000202D */ daddu $a0, $zero, $zero -/* 9C693C 8024155C 0220202D */ daddu $a0, $s1, $zero -/* 9C6940 80241560 3C05F4AC */ lui $a1, 0xf4ac -/* 9C6944 80241564 34A5D481 */ ori $a1, $a1, 0xd481 -/* 9C6948 80241568 3C108025 */ lui $s0, 0x8025 -/* 9C694C 8024156C 26101C60 */ addiu $s0, $s0, 0x1c60 -/* 9C6950 80241570 0C0B1EAF */ jal get_variable -/* 9C6954 80241574 AE020000 */ sw $v0, ($s0) -/* 9C6958 80241578 0220202D */ daddu $a0, $s1, $zero -/* 9C695C 8024157C 3C05F4AC */ lui $a1, 0xf4ac -/* 9C6960 80241580 4482B000 */ mtc1 $v0, $f22 -/* 9C6964 80241584 00000000 */ nop -/* 9C6968 80241588 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9C696C 8024158C 0C0B1EAF */ jal get_variable -/* 9C6970 80241590 34A5D482 */ ori $a1, $a1, 0xd482 -/* 9C6974 80241594 0220202D */ daddu $a0, $s1, $zero -/* 9C6978 80241598 3C05F4AC */ lui $a1, 0xf4ac -/* 9C697C 8024159C 4482A000 */ mtc1 $v0, $f20 -/* 9C6980 802415A0 00000000 */ nop -/* 9C6984 802415A4 4680A520 */ cvt.s.w $f20, $f20 -/* 9C6988 802415A8 0C0B1EAF */ jal get_variable -/* 9C698C 802415AC 34A5D483 */ ori $a1, $a1, 0xd483 -/* 9C6990 802415B0 44821000 */ mtc1 $v0, $f2 -/* 9C6994 802415B4 00000000 */ nop -/* 9C6998 802415B8 468010A0 */ cvt.s.w $f2, $f2 -/* 9C699C 802415BC 4405B000 */ mfc1 $a1, $f22 -/* 9C69A0 802415C0 4406A000 */ mfc1 $a2, $f20 -/* 9C69A4 802415C4 44071000 */ mfc1 $a3, $f2 -/* 9C69A8 802415C8 0C01C604 */ jal func_80071810 -/* 9C69AC 802415CC 0000202D */ daddu $a0, $zero, $zero -/* 9C69B0 802415D0 0220202D */ daddu $a0, $s1, $zero -/* 9C69B4 802415D4 3C05F4AC */ lui $a1, 0xf4ac -/* 9C69B8 802415D8 3C018025 */ lui $at, 0x8025 -/* 9C69BC 802415DC AC221C64 */ sw $v0, 0x1c64($at) -/* 9C69C0 802415E0 0C0B1EAF */ jal get_variable -/* 9C69C4 802415E4 34A5D481 */ ori $a1, $a1, 0xd481 -/* 9C69C8 802415E8 0220202D */ daddu $a0, $s1, $zero -/* 9C69CC 802415EC 3C05F4AC */ lui $a1, 0xf4ac -/* 9C69D0 802415F0 4482B000 */ mtc1 $v0, $f22 -/* 9C69D4 802415F4 00000000 */ nop -/* 9C69D8 802415F8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9C69DC 802415FC 0C0B1EAF */ jal get_variable -/* 9C69E0 80241600 34A5D482 */ ori $a1, $a1, 0xd482 -/* 9C69E4 80241604 0220202D */ daddu $a0, $s1, $zero -/* 9C69E8 80241608 3C05F4AC */ lui $a1, 0xf4ac -/* 9C69EC 8024160C 4482A000 */ mtc1 $v0, $f20 -/* 9C69F0 80241610 00000000 */ nop -/* 9C69F4 80241614 4680A520 */ cvt.s.w $f20, $f20 -/* 9C69F8 80241618 0C0B1EAF */ jal get_variable -/* 9C69FC 8024161C 34A5D483 */ ori $a1, $a1, 0xd483 -/* 9C6A00 80241620 44821000 */ mtc1 $v0, $f2 -/* 9C6A04 80241624 00000000 */ nop -/* 9C6A08 80241628 468010A0 */ cvt.s.w $f2, $f2 -/* 9C6A0C 8024162C 4405B000 */ mfc1 $a1, $f22 -/* 9C6A10 80241630 4406A000 */ mfc1 $a2, $f20 -/* 9C6A14 80241634 3C013F80 */ lui $at, 0x3f80 -/* 9C6A18 80241638 44810000 */ mtc1 $at, $f0 -/* 9C6A1C 8024163C 44071000 */ mfc1 $a3, $f2 -/* 9C6A20 80241640 0000202D */ daddu $a0, $zero, $zero -/* 9C6A24 80241644 AFA00014 */ sw $zero, 0x14($sp) -/* 9C6A28 80241648 0C01CA24 */ jal func_80072890 -/* 9C6A2C 8024164C E7A00010 */ swc1 $f0, 0x10($sp) -/* 9C6A30 80241650 8E030000 */ lw $v1, ($s0) -/* 9C6A34 80241654 8C64000C */ lw $a0, 0xc($v1) -/* 9C6A38 80241658 3C018025 */ lui $at, 0x8025 -/* 9C6A3C 8024165C AC221C68 */ sw $v0, 0x1c68($at) -/* 9C6A40 80241660 AC800018 */ sw $zero, 0x18($a0) -/* 9C6A44 80241664 AC800020 */ sw $zero, 0x20($a0) -/* 9C6A48 80241668 AC800024 */ sw $zero, 0x24($a0) -/* 9C6A4C 8024166C AC800028 */ sw $zero, 0x28($a0) -/* 9C6A50 80241670 AC80001C */ sw $zero, 0x1c($a0) -.L80241674: -/* 9C6A54 80241674 3C028025 */ lui $v0, 0x8025 -/* 9C6A58 80241678 8C421C60 */ lw $v0, 0x1c60($v0) -/* 9C6A5C 8024167C 8C44000C */ lw $a0, 0xc($v0) -/* 9C6A60 80241680 8C820020 */ lw $v0, 0x20($a0) -/* 9C6A64 80241684 8C830028 */ lw $v1, 0x28($a0) -/* 9C6A68 80241688 2442000A */ addiu $v0, $v0, 0xa -/* 9C6A6C 8024168C AC820020 */ sw $v0, 0x20($a0) -/* 9C6A70 80241690 8C820024 */ lw $v0, 0x24($a0) -/* 9C6A74 80241694 2463000A */ addiu $v1, $v1, 0xa -/* 9C6A78 80241698 AC830028 */ sw $v1, 0x28($a0) -/* 9C6A7C 8024169C 8C830018 */ lw $v1, 0x18($a0) -/* 9C6A80 802416A0 2442000A */ addiu $v0, $v0, 0xa -/* 9C6A84 802416A4 AC820024 */ sw $v0, 0x24($a0) -/* 9C6A88 802416A8 8C82001C */ lw $v0, 0x1c($a0) -/* 9C6A8C 802416AC 2463000A */ addiu $v1, $v1, 0xa -/* 9C6A90 802416B0 AC830018 */ sw $v1, 0x18($a0) -/* 9C6A94 802416B4 286300FF */ slti $v1, $v1, 0xff -/* 9C6A98 802416B8 2442000A */ addiu $v0, $v0, 0xa -/* 9C6A9C 802416BC AC82001C */ sw $v0, 0x1c($a0) -/* 9C6AA0 802416C0 14600004 */ bnez $v1, .L802416D4 -/* 9C6AA4 802416C4 0000102D */ daddu $v0, $zero, $zero -/* 9C6AA8 802416C8 240200FF */ addiu $v0, $zero, 0xff -/* 9C6AAC 802416CC AC820018 */ sw $v0, 0x18($a0) -/* 9C6AB0 802416D0 24020002 */ addiu $v0, $zero, 2 -.L802416D4: -/* 9C6AB4 802416D4 8FBF0020 */ lw $ra, 0x20($sp) -/* 9C6AB8 802416D8 8FB1001C */ lw $s1, 0x1c($sp) -/* 9C6ABC 802416DC 8FB00018 */ lw $s0, 0x18($sp) -/* 9C6AC0 802416E0 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 9C6AC4 802416E4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 9C6AC8 802416E8 03E00008 */ jr $ra -/* 9C6ACC 802416EC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_802416F0_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_802416F0_9C53E0.s deleted file mode 100644 index 5a7f95aac1..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_802416F0_9C53E0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416F0_9C6AD0 -/* 9C6AD0 802416F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C6AD4 802416F4 10A0000B */ beqz $a1, .L80241724 -/* 9C6AD8 802416F8 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C6ADC 802416FC 3C038025 */ lui $v1, 0x8025 -/* 9C6AE0 80241700 8C631C64 */ lw $v1, 0x1c64($v1) -/* 9C6AE4 80241704 8C620000 */ lw $v0, ($v1) -/* 9C6AE8 80241708 3C048025 */ lui $a0, 0x8025 -/* 9C6AEC 8024170C 8C841C68 */ lw $a0, 0x1c68($a0) -/* 9C6AF0 80241710 34420010 */ ori $v0, $v0, 0x10 -/* 9C6AF4 80241714 AC620000 */ sw $v0, ($v1) -/* 9C6AF8 80241718 8C820000 */ lw $v0, ($a0) -/* 9C6AFC 8024171C 34420010 */ ori $v0, $v0, 0x10 -/* 9C6B00 80241720 AC820000 */ sw $v0, ($a0) -.L80241724: -/* 9C6B04 80241724 3C048025 */ lui $a0, 0x8025 -/* 9C6B08 80241728 8C841C60 */ lw $a0, 0x1c60($a0) -/* 9C6B0C 8024172C 8C85000C */ lw $a1, 0xc($a0) -/* 9C6B10 80241730 8CA20018 */ lw $v0, 0x18($a1) -/* 9C6B14 80241734 8CA30020 */ lw $v1, 0x20($a1) -/* 9C6B18 80241738 2442FFF6 */ addiu $v0, $v0, -0xa -/* 9C6B1C 8024173C ACA20018 */ sw $v0, 0x18($a1) -/* 9C6B20 80241740 8CA20024 */ lw $v0, 0x24($a1) -/* 9C6B24 80241744 2463FFF6 */ addiu $v1, $v1, -0xa -/* 9C6B28 80241748 ACA30020 */ sw $v1, 0x20($a1) -/* 9C6B2C 8024174C 8CA30028 */ lw $v1, 0x28($a1) -/* 9C6B30 80241750 2442FFF6 */ addiu $v0, $v0, -0xa -/* 9C6B34 80241754 ACA20024 */ sw $v0, 0x24($a1) -/* 9C6B38 80241758 8CA2001C */ lw $v0, 0x1c($a1) -/* 9C6B3C 8024175C 2463FFF6 */ addiu $v1, $v1, -0xa -/* 9C6B40 80241760 ACA30028 */ sw $v1, 0x28($a1) -/* 9C6B44 80241764 8CA30018 */ lw $v1, 0x18($a1) -/* 9C6B48 80241768 2442FFF6 */ addiu $v0, $v0, -0xa -/* 9C6B4C 8024176C 18600003 */ blez $v1, .L8024177C -/* 9C6B50 80241770 ACA2001C */ sw $v0, 0x1c($a1) -/* 9C6B54 80241774 080905E6 */ j .L80241798 -/* 9C6B58 80241778 0000102D */ daddu $v0, $zero, $zero -.L8024177C: -/* 9C6B5C 8024177C 0C016914 */ jal remove_effect -/* 9C6B60 80241780 ACA00018 */ sw $zero, 0x18($a1) -/* 9C6B64 80241784 3C048025 */ lui $a0, 0x8025 -/* 9C6B68 80241788 8C841C40 */ lw $a0, 0x1c40($a0) -/* 9C6B6C 8024178C 0C048D70 */ jal func_801235C0 -/* 9C6B70 80241790 00000000 */ nop -/* 9C6B74 80241794 24020002 */ addiu $v0, $zero, 2 -.L80241798: -/* 9C6B78 80241798 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C6B7C 8024179C 03E00008 */ jr $ra -/* 9C6B80 802417A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_802417A4_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_802417A4_9C53E0.s deleted file mode 100644 index 630b184a30..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_802417A4_9C53E0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417A4_9C6B84 -/* 9C6B84 802417A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C6B88 802417A8 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C6B8C 802417AC 8C82000C */ lw $v0, 0xc($a0) -/* 9C6B90 802417B0 0C0B1EAF */ jal get_variable -/* 9C6B94 802417B4 8C450000 */ lw $a1, ($v0) -/* 9C6B98 802417B8 3C038025 */ lui $v1, 0x8025 -/* 9C6B9C 802417BC 8C631C60 */ lw $v1, 0x1c60($v1) -/* 9C6BA0 802417C0 8C63000C */ lw $v1, 0xc($v1) -/* 9C6BA4 802417C4 AC620034 */ sw $v0, 0x34($v1) -/* 9C6BA8 802417C8 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C6BAC 802417CC 24020002 */ addiu $v0, $zero, 2 -/* 9C6BB0 802417D0 03E00008 */ jr $ra -/* 9C6BB4 802417D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_80241870_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_80241870_9C53E0.s deleted file mode 100644 index 9efb8f047d..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_80241870_9C53E0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241870_9C6C50 -/* 9C6C50 80241870 3C028025 */ lui $v0, 0x8025 -/* 9C6C54 80241874 8C421C68 */ lw $v0, 0x1c68($v0) -/* 9C6C58 80241878 8C43000C */ lw $v1, 0xc($v0) -/* 9C6C5C 8024187C 24020001 */ addiu $v0, $zero, 1 -/* 9C6C60 80241880 AC62001C */ sw $v0, 0x1c($v1) -/* 9C6C64 80241884 03E00008 */ jr $ra -/* 9C6C68 80241888 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_802419E8_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_802419E8_9C53E0.s deleted file mode 100644 index abdcd550d0..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_802419E8_9C53E0.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419E8_9C6DC8 -/* 9C6DC8 802419E8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9C6DCC 802419EC AFB20018 */ sw $s2, 0x18($sp) -/* 9C6DD0 802419F0 0080902D */ daddu $s2, $a0, $zero -/* 9C6DD4 802419F4 AFBF0030 */ sw $ra, 0x30($sp) -/* 9C6DD8 802419F8 AFB7002C */ sw $s7, 0x2c($sp) -/* 9C6DDC 802419FC AFB60028 */ sw $s6, 0x28($sp) -/* 9C6DE0 80241A00 AFB50024 */ sw $s5, 0x24($sp) -/* 9C6DE4 80241A04 AFB40020 */ sw $s4, 0x20($sp) -/* 9C6DE8 80241A08 AFB3001C */ sw $s3, 0x1c($sp) -/* 9C6DEC 80241A0C AFB10014 */ sw $s1, 0x14($sp) -/* 9C6DF0 80241A10 AFB00010 */ sw $s0, 0x10($sp) -/* 9C6DF4 80241A14 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 9C6DF8 80241A18 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 9C6DFC 80241A1C 8E50000C */ lw $s0, 0xc($s2) -/* 9C6E00 80241A20 8E050000 */ lw $a1, ($s0) -/* 9C6E04 80241A24 0C0B1EAF */ jal get_variable -/* 9C6E08 80241A28 26100004 */ addiu $s0, $s0, 4 -/* 9C6E0C 80241A2C 8E050000 */ lw $a1, ($s0) -/* 9C6E10 80241A30 26100004 */ addiu $s0, $s0, 4 -/* 9C6E14 80241A34 0240202D */ daddu $a0, $s2, $zero -/* 9C6E18 80241A38 0C0B1EAF */ jal get_variable -/* 9C6E1C 80241A3C 0040B82D */ daddu $s7, $v0, $zero -/* 9C6E20 80241A40 8E050000 */ lw $a1, ($s0) -/* 9C6E24 80241A44 26100004 */ addiu $s0, $s0, 4 -/* 9C6E28 80241A48 0240202D */ daddu $a0, $s2, $zero -/* 9C6E2C 80241A4C 0C0B1EAF */ jal get_variable -/* 9C6E30 80241A50 0040B02D */ daddu $s6, $v0, $zero -/* 9C6E34 80241A54 0240202D */ daddu $a0, $s2, $zero -/* 9C6E38 80241A58 3C05F4AC */ lui $a1, 0xf4ac -/* 9C6E3C 80241A5C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 9C6E40 80241A60 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 9C6E44 80241A64 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 9C6E48 80241A68 8E140000 */ lw $s4, ($s0) -/* 9C6E4C 80241A6C 00061880 */ sll $v1, $a2, 2 -/* 9C6E50 80241A70 00661821 */ addu $v1, $v1, $a2 -/* 9C6E54 80241A74 00031880 */ sll $v1, $v1, 2 -/* 9C6E58 80241A78 00661823 */ subu $v1, $v1, $a2 -/* 9C6E5C 80241A7C 000330C0 */ sll $a2, $v1, 3 -/* 9C6E60 80241A80 00661821 */ addu $v1, $v1, $a2 -/* 9C6E64 80241A84 000318C0 */ sll $v1, $v1, 3 -/* 9C6E68 80241A88 3C01800B */ lui $at, 0x800b -/* 9C6E6C 80241A8C 00230821 */ addu $at, $at, $v1 -/* 9C6E70 80241A90 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 9C6E74 80241A94 8E150004 */ lw $s5, 4($s0) -/* 9C6E78 80241A98 4600010D */ trunc.w.s $f4, $f0 -/* 9C6E7C 80241A9C 44112000 */ mfc1 $s1, $f4 -/* 9C6E80 80241AA0 0C0B1EAF */ jal get_variable -/* 9C6E84 80241AA4 0040982D */ daddu $s3, $v0, $zero -/* 9C6E88 80241AA8 4491B000 */ mtc1 $s1, $f22 -/* 9C6E8C 80241AAC 00000000 */ nop -/* 9C6E90 80241AB0 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9C6E94 80241AB4 4600B306 */ mov.s $f12, $f22 -/* 9C6E98 80241AB8 0C00A8D4 */ jal cos_deg -/* 9C6E9C 80241ABC 0040802D */ daddu $s0, $v0, $zero -/* 9C6EA0 80241AC0 4493A000 */ mtc1 $s3, $f20 -/* 9C6EA4 80241AC4 00000000 */ nop -/* 9C6EA8 80241AC8 4680A520 */ cvt.s.w $f20, $f20 -/* 9C6EAC 80241ACC 4600A002 */ mul.s $f0, $f20, $f0 -/* 9C6EB0 80241AD0 00000000 */ nop -/* 9C6EB4 80241AD4 0240202D */ daddu $a0, $s2, $zero -/* 9C6EB8 80241AD8 44901000 */ mtc1 $s0, $f2 -/* 9C6EBC 80241ADC 00000000 */ nop -/* 9C6EC0 80241AE0 468010A0 */ cvt.s.w $f2, $f2 -/* 9C6EC4 80241AE4 46001081 */ sub.s $f2, $f2, $f0 -/* 9C6EC8 80241AE8 3C05F4AC */ lui $a1, 0xf4ac -/* 9C6ECC 80241AEC 4600110D */ trunc.w.s $f4, $f2 -/* 9C6ED0 80241AF0 44102000 */ mfc1 $s0, $f4 -/* 9C6ED4 80241AF4 0C0B1EAF */ jal get_variable -/* 9C6ED8 80241AF8 34A5D483 */ ori $a1, $a1, 0xd483 -/* 9C6EDC 80241AFC 4600B306 */ mov.s $f12, $f22 -/* 9C6EE0 80241B00 0C00A8BB */ jal sin_deg -/* 9C6EE4 80241B04 0040882D */ daddu $s1, $v0, $zero -/* 9C6EE8 80241B08 4600A502 */ mul.s $f20, $f20, $f0 -/* 9C6EEC 80241B0C 00000000 */ nop -/* 9C6EF0 80241B10 0240202D */ daddu $a0, $s2, $zero -/* 9C6EF4 80241B14 44910000 */ mtc1 $s1, $f0 -/* 9C6EF8 80241B18 00000000 */ nop -/* 9C6EFC 80241B1C 46800020 */ cvt.s.w $f0, $f0 -/* 9C6F00 80241B20 46140001 */ sub.s $f0, $f0, $f20 -/* 9C6F04 80241B24 0280282D */ daddu $a1, $s4, $zero -/* 9C6F08 80241B28 02173023 */ subu $a2, $s0, $s7 -/* 9C6F0C 80241B2C 4600010D */ trunc.w.s $f4, $f0 -/* 9C6F10 80241B30 44102000 */ mfc1 $s0, $f4 -/* 9C6F14 80241B34 0C0B2026 */ jal set_variable -/* 9C6F18 80241B38 02168023 */ subu $s0, $s0, $s6 -/* 9C6F1C 80241B3C 0240202D */ daddu $a0, $s2, $zero -/* 9C6F20 80241B40 02A0282D */ daddu $a1, $s5, $zero -/* 9C6F24 80241B44 0C0B2026 */ jal set_variable -/* 9C6F28 80241B48 0200302D */ daddu $a2, $s0, $zero -/* 9C6F2C 80241B4C 8FBF0030 */ lw $ra, 0x30($sp) -/* 9C6F30 80241B50 8FB7002C */ lw $s7, 0x2c($sp) -/* 9C6F34 80241B54 8FB60028 */ lw $s6, 0x28($sp) -/* 9C6F38 80241B58 8FB50024 */ lw $s5, 0x24($sp) -/* 9C6F3C 80241B5C 8FB40020 */ lw $s4, 0x20($sp) -/* 9C6F40 80241B60 8FB3001C */ lw $s3, 0x1c($sp) -/* 9C6F44 80241B64 8FB20018 */ lw $s2, 0x18($sp) -/* 9C6F48 80241B68 8FB10014 */ lw $s1, 0x14($sp) -/* 9C6F4C 80241B6C 8FB00010 */ lw $s0, 0x10($sp) -/* 9C6F50 80241B70 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 9C6F54 80241B74 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 9C6F58 80241B78 24020002 */ addiu $v0, $zero, 2 -/* 9C6F5C 80241B7C 03E00008 */ jr $ra -/* 9C6F60 80241B80 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_80241B84_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_80241B84_9C53E0.s deleted file mode 100644 index e2b0f233ea..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_80241B84_9C53E0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B84_9C6F64 -/* 9C6F64 80241B84 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 9C6F68 80241B88 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 9C6F6C 80241B8C 10A00002 */ beqz $a1, .L80241B98 -/* 9C6F70 80241B90 2402003C */ addiu $v0, $zero, 0x3c -/* 9C6F74 80241B94 AC820070 */ sw $v0, 0x70($a0) -.L80241B98: -/* 9C6F78 80241B98 C4620080 */ lwc1 $f2, 0x80($v1) -/* 9C6F7C 80241B9C 3C0141F0 */ lui $at, 0x41f0 -/* 9C6F80 80241BA0 44810000 */ mtc1 $at, $f0 -/* 9C6F84 80241BA4 00000000 */ nop -/* 9C6F88 80241BA8 46001000 */ add.s $f0, $f2, $f0 -/* 9C6F8C 80241BAC 3C0143B4 */ lui $at, 0x43b4 -/* 9C6F90 80241BB0 44811000 */ mtc1 $at, $f2 -/* 9C6F94 80241BB4 00000000 */ nop -/* 9C6F98 80241BB8 4600103E */ c.le.s $f2, $f0 -/* 9C6F9C 80241BBC 00000000 */ nop -/* 9C6FA0 80241BC0 45000003 */ bc1f .L80241BD0 -/* 9C6FA4 80241BC4 E4600080 */ swc1 $f0, 0x80($v1) -/* 9C6FA8 80241BC8 46020001 */ sub.s $f0, $f0, $f2 -/* 9C6FAC 80241BCC E4600080 */ swc1 $f0, 0x80($v1) -.L80241BD0: -/* 9C6FB0 80241BD0 8C820070 */ lw $v0, 0x70($a0) -/* 9C6FB4 80241BD4 2442FFFF */ addiu $v0, $v0, -1 -/* 9C6FB8 80241BD8 AC820070 */ sw $v0, 0x70($a0) -/* 9C6FBC 80241BDC 000217C3 */ sra $v0, $v0, 0x1f -/* 9C6FC0 80241BE0 03E00008 */ jr $ra -/* 9C6FC4 80241BE4 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_80241C78_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_80241C78_9C53E0.s deleted file mode 100644 index 1d6636bac3..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_80241C78_9C53E0.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C78_9C7058 -/* 9C7058 80241C78 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9C705C 80241C7C AFB10014 */ sw $s1, 0x14($sp) -/* 9C7060 80241C80 0080882D */ daddu $s1, $a0, $zero -/* 9C7064 80241C84 AFB00010 */ sw $s0, 0x10($sp) -/* 9C7068 80241C88 00A0802D */ daddu $s0, $a1, $zero -/* 9C706C 80241C8C AFBF001C */ sw $ra, 0x1c($sp) -/* 9C7070 80241C90 AFB20018 */ sw $s2, 0x18($sp) -/* 9C7074 80241C94 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9C7078 80241C98 0C00EABB */ jal get_npc_unsafe -/* 9C707C 80241C9C 2404FFFC */ addiu $a0, $zero, -4 -/* 9C7080 80241CA0 12000017 */ beqz $s0, .L80241D00 -/* 9C7084 80241CA4 0040902D */ daddu $s2, $v0, $zero -/* 9C7088 80241CA8 0220202D */ daddu $a0, $s1, $zero -/* 9C708C 80241CAC 3C05FE36 */ lui $a1, 0xfe36 -/* 9C7090 80241CB0 0C0B210B */ jal get_float_variable -/* 9C7094 80241CB4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 9C7098 80241CB8 0220202D */ daddu $a0, $s1, $zero -/* 9C709C 80241CBC 3C05FE36 */ lui $a1, 0xfe36 -/* 9C70A0 80241CC0 3C014270 */ lui $at, 0x4270 -/* 9C70A4 80241CC4 4481A000 */ mtc1 $at, $f20 -/* 9C70A8 80241CC8 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 9C70AC 80241CCC 46140003 */ div.s $f0, $f0, $f20 -/* 9C70B0 80241CD0 0C0B210B */ jal get_float_variable -/* 9C70B4 80241CD4 E6200074 */ swc1 $f0, 0x74($s1) -/* 9C70B8 80241CD8 0220202D */ daddu $a0, $s1, $zero -/* 9C70BC 80241CDC 3C05FE36 */ lui $a1, 0xfe36 -/* 9C70C0 80241CE0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 9C70C4 80241CE4 46140003 */ div.s $f0, $f0, $f20 -/* 9C70C8 80241CE8 0C0B210B */ jal get_float_variable -/* 9C70CC 80241CEC E6200078 */ swc1 $f0, 0x78($s1) -/* 9C70D0 80241CF0 46140003 */ div.s $f0, $f0, $f20 -/* 9C70D4 80241CF4 2402003C */ addiu $v0, $zero, 0x3c -/* 9C70D8 80241CF8 E620007C */ swc1 $f0, 0x7c($s1) -/* 9C70DC 80241CFC AE220070 */ sw $v0, 0x70($s1) -.L80241D00: -/* 9C70E0 80241D00 C6400038 */ lwc1 $f0, 0x38($s2) -/* 9C70E4 80241D04 C6220074 */ lwc1 $f2, 0x74($s1) -/* 9C70E8 80241D08 46020000 */ add.s $f0, $f0, $f2 -/* 9C70EC 80241D0C E6400038 */ swc1 $f0, 0x38($s2) -/* 9C70F0 80241D10 C640003C */ lwc1 $f0, 0x3c($s2) -/* 9C70F4 80241D14 C6220078 */ lwc1 $f2, 0x78($s1) -/* 9C70F8 80241D18 46020000 */ add.s $f0, $f0, $f2 -/* 9C70FC 80241D1C E640003C */ swc1 $f0, 0x3c($s2) -/* 9C7100 80241D20 C6400040 */ lwc1 $f0, 0x40($s2) -/* 9C7104 80241D24 C622007C */ lwc1 $f2, 0x7c($s1) -/* 9C7108 80241D28 46020000 */ add.s $f0, $f0, $f2 -/* 9C710C 80241D2C E6400040 */ swc1 $f0, 0x40($s2) -/* 9C7110 80241D30 8E230070 */ lw $v1, 0x70($s1) -/* 9C7114 80241D34 2463FFFF */ addiu $v1, $v1, -1 -/* 9C7118 80241D38 2C620001 */ sltiu $v0, $v1, 1 -/* 9C711C 80241D3C AE230070 */ sw $v1, 0x70($s1) -/* 9C7120 80241D40 8FBF001C */ lw $ra, 0x1c($sp) -/* 9C7124 80241D44 8FB20018 */ lw $s2, 0x18($sp) -/* 9C7128 80241D48 8FB10014 */ lw $s1, 0x14($sp) -/* 9C712C 80241D4C 8FB00010 */ lw $s0, 0x10($sp) -/* 9C7130 80241D50 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9C7134 80241D54 00021040 */ sll $v0, $v0, 1 -/* 9C7138 80241D58 03E00008 */ jr $ra -/* 9C713C 80241D5C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_80242028_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_80242028_9C53E0.s deleted file mode 100644 index b9c55c8e32..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_80242028_9C53E0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242028_9C7408 -/* 9C7408 80242028 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C740C 8024202C AFBF0010 */ sw $ra, 0x10($sp) -/* 9C7410 80242030 10A00003 */ beqz $a1, .L80242040 -/* 9C7414 80242034 8C86000C */ lw $a2, 0xc($a0) -/* 9C7418 80242038 3C018025 */ lui $at, 0x8025 -/* 9C741C 8024203C AC20856C */ sw $zero, -0x7a94($at) -.L80242040: -/* 9C7420 80242040 3C038025 */ lui $v1, 0x8025 -/* 9C7424 80242044 2463856C */ addiu $v1, $v1, -0x7a94 -/* 9C7428 80242048 8C620000 */ lw $v0, ($v1) -/* 9C742C 8024204C 54400003 */ bnel $v0, $zero, .L8024205C -/* 9C7430 80242050 AC600000 */ sw $zero, ($v1) -/* 9C7434 80242054 0809081C */ j .L80242070 -/* 9C7438 80242058 0000102D */ daddu $v0, $zero, $zero -.L8024205C: -/* 9C743C 8024205C 8CC50000 */ lw $a1, ($a2) -/* 9C7440 80242060 3C068025 */ lui $a2, 0x8025 -/* 9C7444 80242064 0C0B2026 */ jal set_variable -/* 9C7448 80242068 8CC68570 */ lw $a2, -0x7a90($a2) -/* 9C744C 8024206C 24020002 */ addiu $v0, $zero, 2 -.L80242070: -/* 9C7450 80242070 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7454 80242074 03E00008 */ jr $ra -/* 9C7458 80242078 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_80242410_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_80242410_9C53E0.s deleted file mode 100644 index 73ae6092f3..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_80242410_9C53E0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242410_9C77F0 -/* 9C77F0 80242410 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C77F4 80242414 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C77F8 80242418 0C00EABB */ jal get_npc_unsafe -/* 9C77FC 8024241C 8C84008C */ lw $a0, 0x8c($a0) -/* 9C7800 80242420 3C038025 */ lui $v1, 0x8025 -/* 9C7804 80242424 8C631E34 */ lw $v1, 0x1e34($v1) -/* 9C7808 80242428 AC430028 */ sw $v1, 0x28($v0) -/* 9C780C 8024242C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7810 80242430 24020002 */ addiu $v0, $zero, 2 -/* 9C7814 80242434 03E00008 */ jr $ra -/* 9C7818 80242438 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_80242514_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_80242514_9C53E0.s deleted file mode 100644 index b2485e32c2..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_80242514_9C53E0.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242514_9C78F4 -/* 9C78F4 80242514 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9C78F8 80242518 AFB20018 */ sw $s2, 0x18($sp) -/* 9C78FC 8024251C 0080902D */ daddu $s2, $a0, $zero -/* 9C7900 80242520 AFBF0028 */ sw $ra, 0x28($sp) -/* 9C7904 80242524 AFB50024 */ sw $s5, 0x24($sp) -/* 9C7908 80242528 AFB40020 */ sw $s4, 0x20($sp) -/* 9C790C 8024252C AFB3001C */ sw $s3, 0x1c($sp) -/* 9C7910 80242530 AFB10014 */ sw $s1, 0x14($sp) -/* 9C7914 80242534 AFB00010 */ sw $s0, 0x10($sp) -/* 9C7918 80242538 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 9C791C 8024253C F7B60038 */ sdc1 $f22, 0x38($sp) -/* 9C7920 80242540 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9C7924 80242544 8E50000C */ lw $s0, 0xc($s2) -/* 9C7928 80242548 8E140000 */ lw $s4, ($s0) -/* 9C792C 8024254C 26100004 */ addiu $s0, $s0, 4 -/* 9C7930 80242550 0C0B1EAF */ jal get_variable -/* 9C7934 80242554 0280282D */ daddu $a1, $s4, $zero -/* 9C7938 80242558 0040982D */ daddu $s3, $v0, $zero -/* 9C793C 8024255C 8E150000 */ lw $s5, ($s0) -/* 9C7940 80242560 26100004 */ addiu $s0, $s0, 4 -/* 9C7944 80242564 8E050000 */ lw $a1, ($s0) -/* 9C7948 80242568 26100004 */ addiu $s0, $s0, 4 -/* 9C794C 8024256C 0C0B210B */ jal get_float_variable -/* 9C7950 80242570 0240202D */ daddu $a0, $s2, $zero -/* 9C7954 80242574 8E050000 */ lw $a1, ($s0) -/* 9C7958 80242578 26100004 */ addiu $s0, $s0, 4 -/* 9C795C 8024257C 0240202D */ daddu $a0, $s2, $zero -/* 9C7960 80242580 0C0B210B */ jal get_float_variable -/* 9C7964 80242584 46000606 */ mov.s $f24, $f0 -/* 9C7968 80242588 8E050000 */ lw $a1, ($s0) -/* 9C796C 8024258C 26100004 */ addiu $s0, $s0, 4 -/* 9C7970 80242590 0240202D */ daddu $a0, $s2, $zero -/* 9C7974 80242594 0C0B1EAF */ jal get_variable -/* 9C7978 80242598 46000506 */ mov.s $f20, $f0 -/* 9C797C 8024259C 8E050000 */ lw $a1, ($s0) -/* 9C7980 802425A0 26100004 */ addiu $s0, $s0, 4 -/* 9C7984 802425A4 0240202D */ daddu $a0, $s2, $zero -/* 9C7988 802425A8 0C0B1EAF */ jal get_variable -/* 9C798C 802425AC 0040882D */ daddu $s1, $v0, $zero -/* 9C7990 802425B0 0240202D */ daddu $a0, $s2, $zero -/* 9C7994 802425B4 8E050000 */ lw $a1, ($s0) -/* 9C7998 802425B8 0C0B210B */ jal get_float_variable -/* 9C799C 802425BC 0040802D */ daddu $s0, $v0, $zero -/* 9C79A0 802425C0 3C014334 */ lui $at, 0x4334 -/* 9C79A4 802425C4 44811000 */ mtc1 $at, $f2 -/* 9C79A8 802425C8 3C014049 */ lui $at, 0x4049 -/* 9C79AC 802425CC 34210FD8 */ ori $at, $at, 0xfd8 -/* 9C79B0 802425D0 44812000 */ mtc1 $at, $f4 -/* 9C79B4 802425D4 46020003 */ div.s $f0, $f0, $f2 -/* 9C79B8 802425D8 46040582 */ mul.s $f22, $f0, $f4 -/* 9C79BC 802425DC 00000000 */ nop -/* 9C79C0 802425E0 4618A501 */ sub.s $f20, $f20, $f24 -/* 9C79C4 802425E4 3C013F00 */ lui $at, 0x3f00 -/* 9C79C8 802425E8 44810000 */ mtc1 $at, $f0 -/* 9C79CC 802425EC 00000000 */ nop -/* 9C79D0 802425F0 4600A502 */ mul.s $f20, $f20, $f0 -/* 9C79D4 802425F4 00000000 */ nop -/* 9C79D8 802425F8 12000007 */ beqz $s0, .L80242618 -/* 9C79DC 802425FC 0233102A */ slt $v0, $s1, $s3 -/* 9C79E0 80242600 10400005 */ beqz $v0, .L80242618 -/* 9C79E4 80242604 0240202D */ daddu $a0, $s2, $zero -/* 9C79E8 80242608 0220982D */ daddu $s3, $s1, $zero -/* 9C79EC 8024260C 0280282D */ daddu $a1, $s4, $zero -/* 9C79F0 80242610 0C0B2026 */ jal set_variable -/* 9C79F4 80242614 0220302D */ daddu $a2, $s1, $zero -.L80242618: -/* 9C79F8 80242618 3C014049 */ lui $at, 0x4049 -/* 9C79FC 8024261C 34210FD8 */ ori $at, $at, 0xfd8 -/* 9C7A00 80242620 44810000 */ mtc1 $at, $f0 -/* 9C7A04 80242624 44936000 */ mtc1 $s3, $f12 -/* 9C7A08 80242628 00000000 */ nop -/* 9C7A0C 8024262C 46806320 */ cvt.s.w $f12, $f12 -/* 9C7A10 80242630 46006302 */ mul.s $f12, $f12, $f0 -/* 9C7A14 80242634 00000000 */ nop -/* 9C7A18 80242638 44910000 */ mtc1 $s1, $f0 -/* 9C7A1C 8024263C 00000000 */ nop -/* 9C7A20 80242640 46800020 */ cvt.s.w $f0, $f0 -/* 9C7A24 80242644 46006303 */ div.s $f12, $f12, $f0 -/* 9C7A28 80242648 0C00A874 */ jal cos_rad -/* 9C7A2C 8024264C 46166300 */ add.s $f12, $f12, $f22 -/* 9C7A30 80242650 4600A002 */ mul.s $f0, $f20, $f0 -/* 9C7A34 80242654 00000000 */ nop -/* 9C7A38 80242658 4614C080 */ add.s $f2, $f24, $f20 -/* 9C7A3C 8024265C 46001081 */ sub.s $f2, $f2, $f0 -/* 9C7A40 80242660 0240202D */ daddu $a0, $s2, $zero -/* 9C7A44 80242664 44061000 */ mfc1 $a2, $f2 -/* 9C7A48 80242668 0C0B2190 */ jal set_float_variable -/* 9C7A4C 8024266C 02A0282D */ daddu $a1, $s5, $zero -/* 9C7A50 80242670 8FBF0028 */ lw $ra, 0x28($sp) -/* 9C7A54 80242674 8FB50024 */ lw $s5, 0x24($sp) -/* 9C7A58 80242678 8FB40020 */ lw $s4, 0x20($sp) -/* 9C7A5C 8024267C 8FB3001C */ lw $s3, 0x1c($sp) -/* 9C7A60 80242680 8FB20018 */ lw $s2, 0x18($sp) -/* 9C7A64 80242684 8FB10014 */ lw $s1, 0x14($sp) -/* 9C7A68 80242688 8FB00010 */ lw $s0, 0x10($sp) -/* 9C7A6C 8024268C D7B80040 */ ldc1 $f24, 0x40($sp) -/* 9C7A70 80242690 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 9C7A74 80242694 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9C7A78 80242698 24020002 */ addiu $v0, $zero, 2 -/* 9C7A7C 8024269C 03E00008 */ jr $ra -/* 9C7A80 802426A0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_80242858_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_80242858_9C53E0.s deleted file mode 100644 index 493120d346..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_80242858_9C53E0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242858_9C7C38 -/* 9C7C38 80242858 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C7C3C 8024285C AFBF0010 */ sw $ra, 0x10($sp) -/* 9C7C40 80242860 8C82000C */ lw $v0, 0xc($a0) -/* 9C7C44 80242864 0C0B1EAF */ jal get_variable -/* 9C7C48 80242868 8C450000 */ lw $a1, ($v0) -/* 9C7C4C 8024286C 240505DC */ addiu $a1, $zero, 0x5dc -/* 9C7C50 80242870 00021040 */ sll $v0, $v0, 1 -/* 9C7C54 80242874 3C048025 */ lui $a0, 0x8025 -/* 9C7C58 80242878 00822021 */ addu $a0, $a0, $v0 -/* 9C7C5C 8024287C 84840810 */ lh $a0, 0x810($a0) -/* 9C7C60 80242880 0C01559B */ jal func_8005566C -/* 9C7C64 80242884 24060001 */ addiu $a2, $zero, 1 -/* 9C7C68 80242888 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7C6C 8024288C 24020002 */ addiu $v0, $zero, 2 -/* 9C7C70 80242890 03E00008 */ jr $ra -/* 9C7C74 80242894 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/func_80242898_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/func_80242898_9C53E0.s deleted file mode 100644 index 1a0c482b5b..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/func_80242898_9C53E0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242898_9C7C78 -/* 9C7C78 80242898 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C7C7C 8024289C AFBF0010 */ sw $ra, 0x10($sp) -/* 9C7C80 802428A0 0C015612 */ jal func_80055848 -/* 9C7C84 802428A4 24040004 */ addiu $a0, $zero, 4 -/* 9C7C88 802428A8 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7C8C 802428AC 24020002 */ addiu $v0, $zero, 2 -/* 9C7C90 802428B0 03E00008 */ jr $ra -/* 9C7C94 802428B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_80240020_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_80240020_9D7020.s deleted file mode 100644 index 10e1037560..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_80240020_9D7020.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_9D7040 -/* 9D7040 80240020 3C028016 */ lui $v0, 0x8016 -/* 9D7044 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 9D7048 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 9D704C 8024002C 03E00008 */ jr $ra -/* 9D7050 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_80240034_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_80240034_9D7020.s deleted file mode 100644 index 4dfd99ecb4..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_80240034_9D7020.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_9D7054 -/* 9D7054 80240034 3C038016 */ lui $v1, 0x8016 -/* 9D7058 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* 9D705C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D7060 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 9D7064 80240044 0080802D */ daddu $s0, $a0, $zero -/* 9D7068 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* 9D706C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9D7070 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* 9D7074 80240054 24020002 */ addiu $v0, $zero, 2 -/* 9D7078 80240058 08090038 */ j .L802400E0 -/* 9D707C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* 9D7080 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 9D7084 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 9D7088 80240068 80620040 */ lb $v0, 0x40($v1) -/* 9D708C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* 9D7090 80240070 04420001 */ bltzl $v0, .L80240078 -/* 9D7094 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* 9D7098 80240078 14400003 */ bnez $v0, .L80240088 -/* 9D709C 8024007C 00000000 */ nop -/* 9D70A0 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* 9D70A4 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* 9D70A8 80240088 44822000 */ mtc1 $v0, $f4 -/* 9D70AC 8024008C 00000000 */ nop -/* 9D70B0 80240090 46802120 */ cvt.s.w $f4, $f4 -/* 9D70B4 80240094 44062000 */ mfc1 $a2, $f4 -/* 9D70B8 80240098 44872000 */ mtc1 $a3, $f4 -/* 9D70BC 8024009C 00000000 */ nop -/* 9D70C0 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* 9D70C4 802400A4 44806000 */ mtc1 $zero, $f12 -/* 9D70C8 802400A8 44072000 */ mfc1 $a3, $f4 -/* 9D70CC 802400AC 0C00A720 */ jal atan2 -/* 9D70D0 802400B0 46006386 */ mov.s $f14, $f12 -/* 9D70D4 802400B4 3C014270 */ lui $at, 0x4270 -/* 9D70D8 802400B8 44811000 */ mtc1 $at, $f2 -/* 9D70DC 802400BC 00000000 */ nop -/* 9D70E0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 9D70E4 802400C4 00000000 */ nop -/* 9D70E8 802400C8 45000004 */ bc1f .L802400DC -/* 9D70EC 802400CC 24020001 */ addiu $v0, $zero, 1 -/* 9D70F0 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* 9D70F4 802400D4 08090038 */ j .L802400E0 -/* 9D70F8 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* 9D70FC 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* 9D7100 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 9D7104 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 9D7108 802400E8 03E00008 */ jr $ra -/* 9D710C 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_802400F0_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_802400F0_9D7020.s deleted file mode 100644 index 73eeb8eb4f..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_802400F0_9D7020.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_9D7110 -/* 9D7110 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D7114 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 9D7118 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 9D711C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 9D7120 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 9D7124 80240104 0C016AFA */ jal get_current_map_header -/* 9D7128 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 9D712C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 9D7130 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 9D7134 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 9D7138 80240118 0C0B1EAF */ jal get_variable -/* 9D713C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 9D7140 80240120 0220202D */ daddu $a0, $s1, $zero -/* 9D7144 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 9D7148 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 9D714C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 9D7150 80240130 02031821 */ addu $v1, $s0, $v1 -/* 9D7154 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 9D7158 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 9D715C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 9D7160 80240140 0C0B2026 */ jal set_variable -/* 9D7164 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 9D7168 80240148 0220202D */ daddu $a0, $s1, $zero -/* 9D716C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 9D7170 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 9D7174 80240154 02021021 */ addu $v0, $s0, $v0 -/* 9D7178 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 9D717C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 9D7180 80240160 44061000 */ mfc1 $a2, $f2 -/* 9D7184 80240164 0C0B2026 */ jal set_variable -/* 9D7188 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 9D718C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 9D7190 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 9D7194 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 9D7198 80240178 02021021 */ addu $v0, $s0, $v0 -/* 9D719C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 9D71A0 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 9D71A4 80240184 44061000 */ mfc1 $a2, $f2 -/* 9D71A8 80240188 0C0B2026 */ jal set_variable -/* 9D71AC 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 9D71B0 80240190 0220202D */ daddu $a0, $s1, $zero -/* 9D71B4 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 9D71B8 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 9D71BC 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 9D71C0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 9D71C4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 9D71C8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 9D71CC 802401AC 0C0B2026 */ jal set_variable -/* 9D71D0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 9D71D4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 9D71D8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 9D71DC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 9D71E0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 9D71E4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 9D71E8 802401C8 03E00008 */ jr $ra -/* 9D71EC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_802401D0_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_802401D0_9D7020.s deleted file mode 100644 index 913d6c2aad..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_802401D0_9D7020.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_9D71F0 -/* 9D71F0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 9D71F4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 9D71F8 802401D8 3C014334 */ lui $at, 0x4334 -/* 9D71FC 802401DC 44816000 */ mtc1 $at, $f12 -/* 9D7200 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D7204 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 9D7208 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 9D720C 802401EC 00031080 */ sll $v0, $v1, 2 -/* 9D7210 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 9D7214 802401F4 00021080 */ sll $v0, $v0, 2 -/* 9D7218 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 9D721C 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 9D7220 80240200 00431021 */ addu $v0, $v0, $v1 -/* 9D7224 80240204 000210C0 */ sll $v0, $v0, 3 -/* 9D7228 80240208 3C01800B */ lui $at, 0x800b -/* 9D722C 8024020C 00220821 */ addu $at, $at, $v0 -/* 9D7230 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 9D7234 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 9D7238 80240218 0C00A6C9 */ jal clamp_angle -/* 9D723C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 9D7240 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 9D7244 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 9D7248 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 9D724C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 9D7250 80240230 24020002 */ addiu $v0, $zero, 2 -/* 9D7254 80240234 03E00008 */ jr $ra -/* 9D7258 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_8024023C_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_8024023C_9D7020.s deleted file mode 100644 index 7b09b6f0dd..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_8024023C_9D7020.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_9D725C -/* 9D725C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9D7260 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 9D7264 80240244 0080802D */ daddu $s0, $a0, $zero -/* 9D7268 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 9D726C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9D7270 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 9D7274 80240254 0C0B210B */ jal get_float_variable -/* 9D7278 80240258 8C450000 */ lw $a1, ($v0) -/* 9D727C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 9D7280 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 9D7284 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 9D7288 80240268 44060000 */ mfc1 $a2, $f0 -/* 9D728C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 9D7290 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 9D7294 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9D7298 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9D729C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 9D72A0 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 9D72A4 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 9D72A8 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 9D72AC 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 9D72B0 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 9D72B4 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 9D72B8 80240298 0C0B2190 */ jal set_float_variable -/* 9D72BC 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 9D72C0 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 9D72C4 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 9D72C8 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 9D72CC 802402AC 0C0B2190 */ jal set_float_variable -/* 9D72D0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 9D72D4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 9D72D8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 9D72DC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 9D72E0 802402C0 0C0B2190 */ jal set_float_variable -/* 9D72E4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 9D72E8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 9D72EC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 9D72F0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9D72F4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 9D72F8 802402D8 03E00008 */ jr $ra -/* 9D72FC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_802402E0_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_802402E0_9D7020.s deleted file mode 100644 index ed29f61581..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_802402E0_9D7020.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_9D7300 -/* 9D7300 802402E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D7304 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 9D7308 802402E8 3C108024 */ lui $s0, 0x8024 -/* 9D730C 802402EC 261053D0 */ addiu $s0, $s0, 0x53d0 -/* 9D7310 802402F0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D7314 802402F4 AFB10014 */ sw $s1, 0x14($sp) -/* 9D7318 802402F8 8E020000 */ lw $v0, ($s0) -/* 9D731C 802402FC 14400010 */ bnez $v0, .L80240340 -/* 9D7320 80240300 0080882D */ daddu $s1, $a0, $zero -/* 9D7324 80240304 0C00AB39 */ jal heap_malloc -/* 9D7328 80240308 24040040 */ addiu $a0, $zero, 0x40 -/* 9D732C 8024030C AE020000 */ sw $v0, ($s0) -/* 9D7330 80240310 0000182D */ daddu $v1, $zero, $zero -/* 9D7334 80240314 0040282D */ daddu $a1, $v0, $zero -/* 9D7338 80240318 0220202D */ daddu $a0, $s1, $zero -.L8024031C: -/* 9D733C 8024031C 8C820084 */ lw $v0, 0x84($a0) -/* 9D7340 80240320 24840004 */ addiu $a0, $a0, 4 -/* 9D7344 80240324 24630001 */ addiu $v1, $v1, 1 -/* 9D7348 80240328 ACA20000 */ sw $v0, ($a1) -/* 9D734C 8024032C 28620010 */ slti $v0, $v1, 0x10 -/* 9D7350 80240330 1440FFFA */ bnez $v0, .L8024031C -/* 9D7354 80240334 24A50004 */ addiu $a1, $a1, 4 -/* 9D7358 80240338 080900DF */ j .L8024037C -/* 9D735C 8024033C 00000000 */ nop -.L80240340: -/* 9D7360 80240340 0000182D */ daddu $v1, $zero, $zero -/* 9D7364 80240344 0040282D */ daddu $a1, $v0, $zero -/* 9D7368 80240348 0220202D */ daddu $a0, $s1, $zero -.L8024034C: -/* 9D736C 8024034C 8CA20000 */ lw $v0, ($a1) -/* 9D7370 80240350 24A50004 */ addiu $a1, $a1, 4 -/* 9D7374 80240354 24630001 */ addiu $v1, $v1, 1 -/* 9D7378 80240358 AC820084 */ sw $v0, 0x84($a0) -/* 9D737C 8024035C 28620010 */ slti $v0, $v1, 0x10 -/* 9D7380 80240360 1440FFFA */ bnez $v0, .L8024034C -/* 9D7384 80240364 24840004 */ addiu $a0, $a0, 4 -/* 9D7388 80240368 3C108024 */ lui $s0, 0x8024 -/* 9D738C 8024036C 261053D0 */ addiu $s0, $s0, 0x53d0 -/* 9D7390 80240370 0C00AB4B */ jal heap_free -/* 9D7394 80240374 8E040000 */ lw $a0, ($s0) -/* 9D7398 80240378 AE000000 */ sw $zero, ($s0) -.L8024037C: -/* 9D739C 8024037C 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D73A0 80240380 8FB10014 */ lw $s1, 0x14($sp) -/* 9D73A4 80240384 8FB00010 */ lw $s0, 0x10($sp) -/* 9D73A8 80240388 24020002 */ addiu $v0, $zero, 2 -/* 9D73AC 8024038C 03E00008 */ jr $ra -/* 9D73B0 80240390 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_80240394_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_80240394_9D7020.s deleted file mode 100644 index 5855c8310c..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_80240394_9D7020.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240394_9D73B4 -/* 9D73B4 80240394 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D73B8 80240398 AFB00010 */ sw $s0, 0x10($sp) -/* 9D73BC 8024039C 0080802D */ daddu $s0, $a0, $zero -/* 9D73C0 802403A0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D73C4 802403A4 AFB10014 */ sw $s1, 0x14($sp) -/* 9D73C8 802403A8 8E02000C */ lw $v0, 0xc($s0) -/* 9D73CC 802403AC 8C510000 */ lw $s1, ($v0) -/* 9D73D0 802403B0 0C0B1EAF */ jal get_variable -/* 9D73D4 802403B4 0220282D */ daddu $a1, $s1, $zero -/* 9D73D8 802403B8 3C03FFF0 */ lui $v1, 0xfff0 -/* 9D73DC 802403BC 3463FFFF */ ori $v1, $v1, 0xffff -/* 9D73E0 802403C0 0200202D */ daddu $a0, $s0, $zero -/* 9D73E4 802403C4 00431024 */ and $v0, $v0, $v1 -/* 9D73E8 802403C8 00021140 */ sll $v0, $v0, 5 -/* 9D73EC 802403CC 3C068008 */ lui $a2, %hi(gItemTable) -/* 9D73F0 802403D0 00C23021 */ addu $a2, $a2, $v0 -/* 9D73F4 802403D4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 9D73F8 802403D8 0C0B2026 */ jal set_variable -/* 9D73FC 802403DC 0220282D */ daddu $a1, $s1, $zero -/* 9D7400 802403E0 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D7404 802403E4 8FB10014 */ lw $s1, 0x14($sp) -/* 9D7408 802403E8 8FB00010 */ lw $s0, 0x10($sp) -/* 9D740C 802403EC 24020002 */ addiu $v0, $zero, 2 -/* 9D7410 802403F0 03E00008 */ jr $ra -/* 9D7414 802403F4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_80240624_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_80240624_9D7020.s deleted file mode 100644 index dc7a8ad753..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_80240624_9D7020.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240624_9D7644 -/* 9D7644 80240624 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D7648 80240628 AFBF0010 */ sw $ra, 0x10($sp) -/* 9D764C 8024062C 10A00003 */ beqz $a1, .L8024063C -/* 9D7650 80240630 8C86000C */ lw $a2, 0xc($a0) -/* 9D7654 80240634 3C018024 */ lui $at, 0x8024 -/* 9D7658 80240638 AC205434 */ sw $zero, 0x5434($at) -.L8024063C: -/* 9D765C 8024063C 3C038024 */ lui $v1, 0x8024 -/* 9D7660 80240640 24635434 */ addiu $v1, $v1, 0x5434 -/* 9D7664 80240644 8C620000 */ lw $v0, ($v1) -/* 9D7668 80240648 54400003 */ bnel $v0, $zero, .L80240658 -/* 9D766C 8024064C AC600000 */ sw $zero, ($v1) -/* 9D7670 80240650 0809019B */ j .L8024066C -/* 9D7674 80240654 0000102D */ daddu $v0, $zero, $zero -.L80240658: -/* 9D7678 80240658 8CC50000 */ lw $a1, ($a2) -/* 9D767C 8024065C 3C068024 */ lui $a2, 0x8024 -/* 9D7680 80240660 0C0B2026 */ jal set_variable -/* 9D7684 80240664 8CC65438 */ lw $a2, 0x5438($a2) -/* 9D7688 80240668 24020002 */ addiu $v0, $zero, 2 -.L8024066C: -/* 9D768C 8024066C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D7690 80240670 03E00008 */ jr $ra -/* 9D7694 80240674 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_802406B0_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_802406B0_9D7020.s deleted file mode 100644 index a61560de4f..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_802406B0_9D7020.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406B0_9D76D0 -/* 9D76D0 802406B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D76D4 802406B4 AFBF0010 */ sw $ra, 0x10($sp) -/* 9D76D8 802406B8 8C82000C */ lw $v0, 0xc($a0) -/* 9D76DC 802406BC 0C0B1EAF */ jal get_variable -/* 9D76E0 802406C0 8C450000 */ lw $a1, ($v0) -/* 9D76E4 802406C4 0040182D */ daddu $v1, $v0, $zero -/* 9D76E8 802406C8 10600012 */ beqz $v1, .L80240714 -/* 9D76EC 802406CC 0000202D */ daddu $a0, $zero, $zero -/* 9D76F0 802406D0 8C620000 */ lw $v0, ($v1) -/* 9D76F4 802406D4 5040000A */ beql $v0, $zero, .L80240700 -/* 9D76F8 802406D8 00041080 */ sll $v0, $a0, 2 -/* 9D76FC 802406DC 3C058025 */ lui $a1, 0x8025 -/* 9D7700 802406E0 24A547D0 */ addiu $a1, $a1, 0x47d0 -.L802406E4: -/* 9D7704 802406E4 24630004 */ addiu $v1, $v1, 4 -/* 9D7708 802406E8 24840001 */ addiu $a0, $a0, 1 -/* 9D770C 802406EC ACA20000 */ sw $v0, ($a1) -/* 9D7710 802406F0 8C620000 */ lw $v0, ($v1) -/* 9D7714 802406F4 1440FFFB */ bnez $v0, .L802406E4 -/* 9D7718 802406F8 24A50004 */ addiu $a1, $a1, 4 -/* 9D771C 802406FC 00041080 */ sll $v0, $a0, 2 -.L80240700: -/* 9D7720 80240700 3C018025 */ lui $at, 0x8025 -/* 9D7724 80240704 00220821 */ addu $at, $at, $v0 -/* 9D7728 80240708 AC2047D0 */ sw $zero, 0x47d0($at) -/* 9D772C 8024070C 080901CF */ j .L8024073C -/* 9D7730 80240710 00000000 */ nop -.L80240714: -/* 9D7734 80240714 3C038025 */ lui $v1, 0x8025 -/* 9D7738 80240718 246347D0 */ addiu $v1, $v1, 0x47d0 -/* 9D773C 8024071C 0060282D */ daddu $a1, $v1, $zero -.L80240720: -/* 9D7740 80240720 24820010 */ addiu $v0, $a0, 0x10 -/* 9D7744 80240724 AC620000 */ sw $v0, ($v1) -/* 9D7748 80240728 24630004 */ addiu $v1, $v1, 4 -/* 9D774C 8024072C 24840001 */ addiu $a0, $a0, 1 -/* 9D7750 80240730 28820070 */ slti $v0, $a0, 0x70 -/* 9D7754 80240734 1440FFFA */ bnez $v0, .L80240720 -/* 9D7758 80240738 ACA001C0 */ sw $zero, 0x1c0($a1) -.L8024073C: -/* 9D775C 8024073C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D7760 80240740 24020002 */ addiu $v0, $zero, 2 -/* 9D7764 80240744 03E00008 */ jr $ra -/* 9D7768 80240748 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9D776C 8024074C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_80240970_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_80240970_9D7020.s deleted file mode 100644 index f8d1934df7..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_80240970_9D7020.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240970_9D7990 -/* 9D7990 80240970 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9D7994 80240974 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D7998 80240978 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 9D799C 8024097C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9D79A0 80240980 0C00A67F */ jal rand_int -/* 9D79A4 80240984 240400C8 */ addiu $a0, $zero, 0xc8 -/* 9D79A8 80240988 2442FF9C */ addiu $v0, $v0, -0x64 -/* 9D79AC 8024098C 4482A000 */ mtc1 $v0, $f20 -/* 9D79B0 80240990 00000000 */ nop -/* 9D79B4 80240994 4680A520 */ cvt.s.w $f20, $f20 -/* 9D79B8 80240998 0C00A67F */ jal rand_int -/* 9D79BC 8024099C 24040096 */ addiu $a0, $zero, 0x96 -/* 9D79C0 802409A0 44820000 */ mtc1 $v0, $f0 -/* 9D79C4 802409A4 00000000 */ nop -/* 9D79C8 802409A8 46800020 */ cvt.s.w $f0, $f0 -/* 9D79CC 802409AC 3C01C334 */ lui $at, 0xc334 -/* 9D79D0 802409B0 4481B000 */ mtc1 $at, $f22 -/* 9D79D4 802409B4 4405A000 */ mfc1 $a1, $f20 -/* 9D79D8 802409B8 44060000 */ mfc1 $a2, $f0 -/* 9D79DC 802409BC 4407B000 */ mfc1 $a3, $f22 -/* 9D79E0 802409C0 24040002 */ addiu $a0, $zero, 2 -/* 9D79E4 802409C4 AFA00010 */ sw $zero, 0x10($sp) -/* 9D79E8 802409C8 0C01BECC */ jal fx_walk_normal -/* 9D79EC 802409CC AFA00014 */ sw $zero, 0x14($sp) -/* 9D79F0 802409D0 0C00A67F */ jal rand_int -/* 9D79F4 802409D4 240400C8 */ addiu $a0, $zero, 0xc8 -/* 9D79F8 802409D8 2442FF9C */ addiu $v0, $v0, -0x64 -/* 9D79FC 802409DC 4482A000 */ mtc1 $v0, $f20 -/* 9D7A00 802409E0 00000000 */ nop -/* 9D7A04 802409E4 4680A520 */ cvt.s.w $f20, $f20 -/* 9D7A08 802409E8 0C00A67F */ jal rand_int -/* 9D7A0C 802409EC 24040096 */ addiu $a0, $zero, 0x96 -/* 9D7A10 802409F0 44820000 */ mtc1 $v0, $f0 -/* 9D7A14 802409F4 00000000 */ nop -/* 9D7A18 802409F8 46800020 */ cvt.s.w $f0, $f0 -/* 9D7A1C 802409FC 4405A000 */ mfc1 $a1, $f20 -/* 9D7A20 80240A00 4407B000 */ mfc1 $a3, $f22 -/* 9D7A24 80240A04 44060000 */ mfc1 $a2, $f0 -/* 9D7A28 80240A08 24040002 */ addiu $a0, $zero, 2 -/* 9D7A2C 80240A0C AFA00010 */ sw $zero, 0x10($sp) -/* 9D7A30 80240A10 0C01BECC */ jal fx_walk_normal -/* 9D7A34 80240A14 AFA00014 */ sw $zero, 0x14($sp) -/* 9D7A38 80240A18 0C00A67F */ jal rand_int -/* 9D7A3C 80240A1C 240400C8 */ addiu $a0, $zero, 0xc8 -/* 9D7A40 80240A20 2442FF9C */ addiu $v0, $v0, -0x64 -/* 9D7A44 80240A24 4482A000 */ mtc1 $v0, $f20 -/* 9D7A48 80240A28 00000000 */ nop -/* 9D7A4C 80240A2C 4680A520 */ cvt.s.w $f20, $f20 -/* 9D7A50 80240A30 0C00A67F */ jal rand_int -/* 9D7A54 80240A34 24040096 */ addiu $a0, $zero, 0x96 -/* 9D7A58 80240A38 44820000 */ mtc1 $v0, $f0 -/* 9D7A5C 80240A3C 00000000 */ nop -/* 9D7A60 80240A40 46800020 */ cvt.s.w $f0, $f0 -/* 9D7A64 80240A44 4405A000 */ mfc1 $a1, $f20 -/* 9D7A68 80240A48 4407B000 */ mfc1 $a3, $f22 -/* 9D7A6C 80240A4C 44060000 */ mfc1 $a2, $f0 -/* 9D7A70 80240A50 24040002 */ addiu $a0, $zero, 2 -/* 9D7A74 80240A54 AFA00010 */ sw $zero, 0x10($sp) -/* 9D7A78 80240A58 0C01BECC */ jal fx_walk_normal -/* 9D7A7C 80240A5C AFA00014 */ sw $zero, 0x14($sp) -/* 9D7A80 80240A60 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D7A84 80240A64 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 9D7A88 80240A68 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9D7A8C 80240A6C 24020002 */ addiu $v0, $zero, 2 -/* 9D7A90 80240A70 03E00008 */ jr $ra -/* 9D7A94 80240A74 27BD0030 */ addiu $sp, $sp, 0x30 -/* 9D7A98 80240A78 00000000 */ nop -/* 9D7A9C 80240A7C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_80240BD8_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_80240BD8_9D7020.s deleted file mode 100644 index 00cb0b3d51..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_80240BD8_9D7020.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BD8_9D7BF8 -/* 9D7BF8 80240BD8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 9D7BFC 80240BDC AFB20038 */ sw $s2, 0x38($sp) -/* 9D7C00 80240BE0 0080902D */ daddu $s2, $a0, $zero -/* 9D7C04 80240BE4 AFBF0044 */ sw $ra, 0x44($sp) -/* 9D7C08 80240BE8 AFB40040 */ sw $s4, 0x40($sp) -/* 9D7C0C 80240BEC AFB3003C */ sw $s3, 0x3c($sp) -/* 9D7C10 80240BF0 AFB10034 */ sw $s1, 0x34($sp) -/* 9D7C14 80240BF4 AFB00030 */ sw $s0, 0x30($sp) -/* 9D7C18 80240BF8 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 9D7C1C 80240BFC F7B40048 */ sdc1 $f20, 0x48($sp) -/* 9D7C20 80240C00 8E510148 */ lw $s1, 0x148($s2) -/* 9D7C24 80240C04 00A0982D */ daddu $s3, $a1, $zero -/* 9D7C28 80240C08 86240008 */ lh $a0, 8($s1) -/* 9D7C2C 80240C0C 0C00EABB */ jal get_npc_unsafe -/* 9D7C30 80240C10 00C0A02D */ daddu $s4, $a2, $zero -/* 9D7C34 80240C14 8E630014 */ lw $v1, 0x14($s3) -/* 9D7C38 80240C18 04600030 */ bltz $v1, .L80240CDC -/* 9D7C3C 80240C1C 0040802D */ daddu $s0, $v0, $zero -/* 9D7C40 80240C20 8E420074 */ lw $v0, 0x74($s2) -/* 9D7C44 80240C24 1C40002C */ bgtz $v0, .L80240CD8 -/* 9D7C48 80240C28 2442FFFF */ addiu $v0, $v0, -1 -/* 9D7C4C 80240C2C 0280202D */ daddu $a0, $s4, $zero -/* 9D7C50 80240C30 AE430074 */ sw $v1, 0x74($s2) -/* 9D7C54 80240C34 AFA00010 */ sw $zero, 0x10($sp) -/* 9D7C58 80240C38 8E66000C */ lw $a2, 0xc($s3) -/* 9D7C5C 80240C3C 8E670010 */ lw $a3, 0x10($s3) -/* 9D7C60 80240C40 0C01242D */ jal func_800490B4 -/* 9D7C64 80240C44 0220282D */ daddu $a1, $s1, $zero -/* 9D7C68 80240C48 10400021 */ beqz $v0, .L80240CD0 -/* 9D7C6C 80240C4C 0000202D */ daddu $a0, $zero, $zero -/* 9D7C70 80240C50 0200282D */ daddu $a1, $s0, $zero -/* 9D7C74 80240C54 0000302D */ daddu $a2, $zero, $zero -/* 9D7C78 80240C58 860300A8 */ lh $v1, 0xa8($s0) -/* 9D7C7C 80240C5C 3C013F80 */ lui $at, 0x3f80 -/* 9D7C80 80240C60 44810000 */ mtc1 $at, $f0 -/* 9D7C84 80240C64 3C014000 */ lui $at, 0x4000 -/* 9D7C88 80240C68 44811000 */ mtc1 $at, $f2 -/* 9D7C8C 80240C6C 3C01C1A0 */ lui $at, 0xc1a0 -/* 9D7C90 80240C70 44812000 */ mtc1 $at, $f4 -/* 9D7C94 80240C74 2402000F */ addiu $v0, $zero, 0xf -/* 9D7C98 80240C78 AFA2001C */ sw $v0, 0x1c($sp) -/* 9D7C9C 80240C7C 44833000 */ mtc1 $v1, $f6 -/* 9D7CA0 80240C80 00000000 */ nop -/* 9D7CA4 80240C84 468031A0 */ cvt.s.w $f6, $f6 -/* 9D7CA8 80240C88 44073000 */ mfc1 $a3, $f6 -/* 9D7CAC 80240C8C 27A20028 */ addiu $v0, $sp, 0x28 -/* 9D7CB0 80240C90 AFA20020 */ sw $v0, 0x20($sp) -/* 9D7CB4 80240C94 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9D7CB8 80240C98 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9D7CBC 80240C9C 0C01BFA4 */ jal fx_emote -/* 9D7CC0 80240CA0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9D7CC4 80240CA4 0200202D */ daddu $a0, $s0, $zero -/* 9D7CC8 80240CA8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9D7CCC 80240CAC 0C012530 */ jal func_800494C0 -/* 9D7CD0 80240CB0 3C060020 */ lui $a2, 0x20 -/* 9D7CD4 80240CB4 8E220018 */ lw $v0, 0x18($s1) -/* 9D7CD8 80240CB8 9442002A */ lhu $v0, 0x2a($v0) -/* 9D7CDC 80240CBC 30420001 */ andi $v0, $v0, 1 -/* 9D7CE0 80240CC0 14400064 */ bnez $v0, .L80240E54 -/* 9D7CE4 80240CC4 2402000A */ addiu $v0, $zero, 0xa -/* 9D7CE8 80240CC8 08090395 */ j .L80240E54 -/* 9D7CEC 80240CCC 2402000C */ addiu $v0, $zero, 0xc -.L80240CD0: -/* 9D7CF0 80240CD0 8E420074 */ lw $v0, 0x74($s2) -/* 9D7CF4 80240CD4 2442FFFF */ addiu $v0, $v0, -1 -.L80240CD8: -/* 9D7CF8 80240CD8 AE420074 */ sw $v0, 0x74($s2) -.L80240CDC: -/* 9D7CFC 80240CDC 8602008C */ lh $v0, 0x8c($s0) -/* 9D7D00 80240CE0 1440005D */ bnez $v0, .L80240E58 -/* 9D7D04 80240CE4 00000000 */ nop -/* 9D7D08 80240CE8 C6000018 */ lwc1 $f0, 0x18($s0) -/* 9D7D0C 80240CEC 3C014010 */ lui $at, 0x4010 -/* 9D7D10 80240CF0 44811800 */ mtc1 $at, $f3 -/* 9D7D14 80240CF4 44801000 */ mtc1 $zero, $f2 -/* 9D7D18 80240CF8 46000021 */ cvt.d.s $f0, $f0 -/* 9D7D1C 80240CFC 4622003C */ c.lt.d $f0, $f2 -/* 9D7D20 80240D00 00000000 */ nop -/* 9D7D24 80240D04 45000003 */ bc1f .L80240D14 -/* 9D7D28 80240D08 0200202D */ daddu $a0, $s0, $zero -/* 9D7D2C 80240D0C 08090346 */ j .L80240D18 -/* 9D7D30 80240D10 0000282D */ daddu $a1, $zero, $zero -.L80240D14: -/* 9D7D34 80240D14 24050001 */ addiu $a1, $zero, 1 -.L80240D18: -/* 9D7D38 80240D18 0C00F598 */ jal func_8003D660 -/* 9D7D3C 80240D1C 00000000 */ nop -/* 9D7D40 80240D20 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9D7D44 80240D24 8E430078 */ lw $v1, 0x78($s2) -/* 9D7D48 80240D28 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9D7D4C 80240D2C 00031040 */ sll $v0, $v1, 1 -/* 9D7D50 80240D30 00431021 */ addu $v0, $v0, $v1 -/* 9D7D54 80240D34 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9D7D58 80240D38 00021080 */ sll $v0, $v0, 2 -/* 9D7D5C 80240D3C 00431021 */ addu $v0, $v0, $v1 -/* 9D7D60 80240D40 C4560004 */ lwc1 $f22, 4($v0) -/* 9D7D64 80240D44 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9D7D68 80240D48 C454000C */ lwc1 $f20, 0xc($v0) -/* 9D7D6C 80240D4C 4680A520 */ cvt.s.w $f20, $f20 -/* 9D7D70 80240D50 4406B000 */ mfc1 $a2, $f22 -/* 9D7D74 80240D54 4407A000 */ mfc1 $a3, $f20 -/* 9D7D78 80240D58 0C00A720 */ jal atan2 -/* 9D7D7C 80240D5C 00000000 */ nop -/* 9D7D80 80240D60 8E050018 */ lw $a1, 0x18($s0) -/* 9D7D84 80240D64 44060000 */ mfc1 $a2, $f0 -/* 9D7D88 80240D68 0200202D */ daddu $a0, $s0, $zero -/* 9D7D8C 80240D6C 0C00EA95 */ jal npc_move_heading -/* 9D7D90 80240D70 AE06000C */ sw $a2, 0xc($s0) -/* 9D7D94 80240D74 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9D7D98 80240D78 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9D7D9C 80240D7C 4406B000 */ mfc1 $a2, $f22 -/* 9D7DA0 80240D80 4407A000 */ mfc1 $a3, $f20 -/* 9D7DA4 80240D84 0C00A7B5 */ jal dist2D -/* 9D7DA8 80240D88 00000000 */ nop -/* 9D7DAC 80240D8C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9D7DB0 80240D90 4602003E */ c.le.s $f0, $f2 -/* 9D7DB4 80240D94 00000000 */ nop -/* 9D7DB8 80240D98 4500002F */ bc1f .L80240E58 -/* 9D7DBC 80240D9C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9D7DC0 80240DA0 24020002 */ addiu $v0, $zero, 2 -/* 9D7DC4 80240DA4 0C00A67F */ jal rand_int -/* 9D7DC8 80240DA8 AE420070 */ sw $v0, 0x70($s2) -/* 9D7DCC 80240DAC 3C035555 */ lui $v1, 0x5555 -/* 9D7DD0 80240DB0 34635556 */ ori $v1, $v1, 0x5556 -/* 9D7DD4 80240DB4 00430018 */ mult $v0, $v1 -/* 9D7DD8 80240DB8 000227C3 */ sra $a0, $v0, 0x1f -/* 9D7DDC 80240DBC 00004010 */ mfhi $t0 -/* 9D7DE0 80240DC0 01042023 */ subu $a0, $t0, $a0 -/* 9D7DE4 80240DC4 00041840 */ sll $v1, $a0, 1 -/* 9D7DE8 80240DC8 00641821 */ addu $v1, $v1, $a0 -/* 9D7DEC 80240DCC 00431023 */ subu $v0, $v0, $v1 -/* 9D7DF0 80240DD0 24430002 */ addiu $v1, $v0, 2 -/* 9D7DF4 80240DD4 AE430074 */ sw $v1, 0x74($s2) -/* 9D7DF8 80240DD8 8E62002C */ lw $v0, 0x2c($s3) -/* 9D7DFC 80240DDC 18400009 */ blez $v0, .L80240E04 -/* 9D7E00 80240DE0 24020004 */ addiu $v0, $zero, 4 -/* 9D7E04 80240DE4 8E620004 */ lw $v0, 4($s3) -/* 9D7E08 80240DE8 18400006 */ blez $v0, .L80240E04 -/* 9D7E0C 80240DEC 24020004 */ addiu $v0, $zero, 4 -/* 9D7E10 80240DF0 8E620008 */ lw $v0, 8($s3) -/* 9D7E14 80240DF4 18400003 */ blez $v0, .L80240E04 -/* 9D7E18 80240DF8 24020004 */ addiu $v0, $zero, 4 -/* 9D7E1C 80240DFC 14600002 */ bnez $v1, .L80240E08 -/* 9D7E20 80240E00 00000000 */ nop -.L80240E04: -/* 9D7E24 80240E04 AE420070 */ sw $v0, 0x70($s2) -.L80240E08: -/* 9D7E28 80240E08 0C00A67F */ jal rand_int -/* 9D7E2C 80240E0C 24042710 */ addiu $a0, $zero, 0x2710 -/* 9D7E30 80240E10 3C0351EB */ lui $v1, 0x51eb -/* 9D7E34 80240E14 3463851F */ ori $v1, $v1, 0x851f -/* 9D7E38 80240E18 00430018 */ mult $v0, $v1 -/* 9D7E3C 80240E1C 00021FC3 */ sra $v1, $v0, 0x1f -/* 9D7E40 80240E20 00004010 */ mfhi $t0 -/* 9D7E44 80240E24 00082143 */ sra $a0, $t0, 5 -/* 9D7E48 80240E28 00832023 */ subu $a0, $a0, $v1 -/* 9D7E4C 80240E2C 00041840 */ sll $v1, $a0, 1 -/* 9D7E50 80240E30 00641821 */ addu $v1, $v1, $a0 -/* 9D7E54 80240E34 000318C0 */ sll $v1, $v1, 3 -/* 9D7E58 80240E38 00641821 */ addu $v1, $v1, $a0 -/* 9D7E5C 80240E3C 00031880 */ sll $v1, $v1, 2 -/* 9D7E60 80240E40 8E640004 */ lw $a0, 4($s3) -/* 9D7E64 80240E44 00431023 */ subu $v0, $v0, $v1 -/* 9D7E68 80240E48 0044102A */ slt $v0, $v0, $a0 -/* 9D7E6C 80240E4C 10400002 */ beqz $v0, .L80240E58 -/* 9D7E70 80240E50 24020004 */ addiu $v0, $zero, 4 -.L80240E54: -/* 9D7E74 80240E54 AE420070 */ sw $v0, 0x70($s2) -.L80240E58: -/* 9D7E78 80240E58 8FBF0044 */ lw $ra, 0x44($sp) -/* 9D7E7C 80240E5C 8FB40040 */ lw $s4, 0x40($sp) -/* 9D7E80 80240E60 8FB3003C */ lw $s3, 0x3c($sp) -/* 9D7E84 80240E64 8FB20038 */ lw $s2, 0x38($sp) -/* 9D7E88 80240E68 8FB10034 */ lw $s1, 0x34($sp) -/* 9D7E8C 80240E6C 8FB00030 */ lw $s0, 0x30($sp) -/* 9D7E90 80240E70 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 9D7E94 80240E74 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 9D7E98 80240E78 03E00008 */ jr $ra -/* 9D7E9C 80240E7C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_80240E80_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_80240E80_9D7020.s deleted file mode 100644 index 352b09cc7e..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_80240E80_9D7020.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E80_9D7EA0 -/* 9D7EA0 80240E80 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9D7EA4 80240E84 AFB3001C */ sw $s3, 0x1c($sp) -/* 9D7EA8 80240E88 0080982D */ daddu $s3, $a0, $zero -/* 9D7EAC 80240E8C AFBF0020 */ sw $ra, 0x20($sp) -/* 9D7EB0 80240E90 AFB20018 */ sw $s2, 0x18($sp) -/* 9D7EB4 80240E94 AFB10014 */ sw $s1, 0x14($sp) -/* 9D7EB8 80240E98 AFB00010 */ sw $s0, 0x10($sp) -/* 9D7EBC 80240E9C 8E720148 */ lw $s2, 0x148($s3) -/* 9D7EC0 80240EA0 86440008 */ lh $a0, 8($s2) -/* 9D7EC4 80240EA4 0C00EABB */ jal get_npc_unsafe -/* 9D7EC8 80240EA8 00A0882D */ daddu $s1, $a1, $zero -/* 9D7ECC 80240EAC 8E240008 */ lw $a0, 8($s1) -/* 9D7ED0 80240EB0 0040802D */ daddu $s0, $v0, $zero -/* 9D7ED4 80240EB4 00041FC2 */ srl $v1, $a0, 0x1f -/* 9D7ED8 80240EB8 00832021 */ addu $a0, $a0, $v1 -/* 9D7EDC 80240EBC 00042043 */ sra $a0, $a0, 1 -/* 9D7EE0 80240EC0 0C00A67F */ jal rand_int -/* 9D7EE4 80240EC4 24840001 */ addiu $a0, $a0, 1 -/* 9D7EE8 80240EC8 8E230008 */ lw $v1, 8($s1) -/* 9D7EEC 80240ECC 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9D7EF0 80240ED0 00032FC2 */ srl $a1, $v1, 0x1f -/* 9D7EF4 80240ED4 00651821 */ addu $v1, $v1, $a1 -/* 9D7EF8 80240ED8 00031843 */ sra $v1, $v1, 1 -/* 9D7EFC 80240EDC 00621821 */ addu $v1, $v1, $v0 -/* 9D7F00 80240EE0 0C00A67F */ jal rand_int -/* 9D7F04 80240EE4 A603008E */ sh $v1, 0x8e($s0) -/* 9D7F08 80240EE8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9D7F0C 80240EEC 44820000 */ mtc1 $v0, $f0 -/* 9D7F10 80240EF0 00000000 */ nop -/* 9D7F14 80240EF4 46800020 */ cvt.s.w $f0, $f0 -/* 9D7F18 80240EF8 46006300 */ add.s $f12, $f12, $f0 -/* 9D7F1C 80240EFC 3C0142B4 */ lui $at, 0x42b4 -/* 9D7F20 80240F00 44810000 */ mtc1 $at, $f0 -/* 9D7F24 80240F04 0C00A6C9 */ jal clamp_angle -/* 9D7F28 80240F08 46006301 */ sub.s $f12, $f12, $f0 -/* 9D7F2C 80240F0C E600000C */ swc1 $f0, 0xc($s0) -/* 9D7F30 80240F10 8E4200CC */ lw $v0, 0xcc($s2) -/* 9D7F34 80240F14 8C420000 */ lw $v0, ($v0) -/* 9D7F38 80240F18 AE020028 */ sw $v0, 0x28($s0) -/* 9D7F3C 80240F1C 24020003 */ addiu $v0, $zero, 3 -/* 9D7F40 80240F20 AE620070 */ sw $v0, 0x70($s3) -/* 9D7F44 80240F24 8FBF0020 */ lw $ra, 0x20($sp) -/* 9D7F48 80240F28 8FB3001C */ lw $s3, 0x1c($sp) -/* 9D7F4C 80240F2C 8FB20018 */ lw $s2, 0x18($sp) -/* 9D7F50 80240F30 8FB10014 */ lw $s1, 0x14($sp) -/* 9D7F54 80240F34 8FB00010 */ lw $s0, 0x10($sp) -/* 9D7F58 80240F38 03E00008 */ jr $ra -/* 9D7F5C 80240F3C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_80240F40_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_80240F40_9D7020.s deleted file mode 100644 index 3d52ea02ad..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_80240F40_9D7020.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F40_9D7F60 -/* 9D7F60 80240F40 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9D7F64 80240F44 AFB40040 */ sw $s4, 0x40($sp) -/* 9D7F68 80240F48 0080A02D */ daddu $s4, $a0, $zero -/* 9D7F6C 80240F4C AFBF0044 */ sw $ra, 0x44($sp) -/* 9D7F70 80240F50 AFB3003C */ sw $s3, 0x3c($sp) -/* 9D7F74 80240F54 AFB20038 */ sw $s2, 0x38($sp) -/* 9D7F78 80240F58 AFB10034 */ sw $s1, 0x34($sp) -/* 9D7F7C 80240F5C AFB00030 */ sw $s0, 0x30($sp) -/* 9D7F80 80240F60 8E910148 */ lw $s1, 0x148($s4) -/* 9D7F84 80240F64 00A0902D */ daddu $s2, $a1, $zero -/* 9D7F88 80240F68 86240008 */ lh $a0, 8($s1) -/* 9D7F8C 80240F6C 0C00EABB */ jal get_npc_unsafe -/* 9D7F90 80240F70 00C0982D */ daddu $s3, $a2, $zero -/* 9D7F94 80240F74 8E430014 */ lw $v1, 0x14($s2) -/* 9D7F98 80240F78 04600031 */ bltz $v1, .L80241040 -/* 9D7F9C 80240F7C 0040802D */ daddu $s0, $v0, $zero -/* 9D7FA0 80240F80 0260202D */ daddu $a0, $s3, $zero -/* 9D7FA4 80240F84 AFA00010 */ sw $zero, 0x10($sp) -/* 9D7FA8 80240F88 8E460024 */ lw $a2, 0x24($s2) -/* 9D7FAC 80240F8C 8E470028 */ lw $a3, 0x28($s2) -/* 9D7FB0 80240F90 0C01242D */ jal func_800490B4 -/* 9D7FB4 80240F94 0220282D */ daddu $a1, $s1, $zero -/* 9D7FB8 80240F98 10400029 */ beqz $v0, .L80241040 -/* 9D7FBC 80240F9C 0000202D */ daddu $a0, $zero, $zero -/* 9D7FC0 80240FA0 0200282D */ daddu $a1, $s0, $zero -/* 9D7FC4 80240FA4 0000302D */ daddu $a2, $zero, $zero -/* 9D7FC8 80240FA8 860300A8 */ lh $v1, 0xa8($s0) -/* 9D7FCC 80240FAC 3C013F80 */ lui $at, 0x3f80 -/* 9D7FD0 80240FB0 44810000 */ mtc1 $at, $f0 -/* 9D7FD4 80240FB4 3C014000 */ lui $at, 0x4000 -/* 9D7FD8 80240FB8 44811000 */ mtc1 $at, $f2 -/* 9D7FDC 80240FBC 3C01C1A0 */ lui $at, 0xc1a0 -/* 9D7FE0 80240FC0 44812000 */ mtc1 $at, $f4 -/* 9D7FE4 80240FC4 2402000F */ addiu $v0, $zero, 0xf -/* 9D7FE8 80240FC8 AFA2001C */ sw $v0, 0x1c($sp) -/* 9D7FEC 80240FCC 44833000 */ mtc1 $v1, $f6 -/* 9D7FF0 80240FD0 00000000 */ nop -/* 9D7FF4 80240FD4 468031A0 */ cvt.s.w $f6, $f6 -/* 9D7FF8 80240FD8 44073000 */ mfc1 $a3, $f6 -/* 9D7FFC 80240FDC 27A20028 */ addiu $v0, $sp, 0x28 -/* 9D8000 80240FE0 AFA20020 */ sw $v0, 0x20($sp) -/* 9D8004 80240FE4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9D8008 80240FE8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9D800C 80240FEC 0C01BFA4 */ jal fx_emote -/* 9D8010 80240FF0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9D8014 80240FF4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9D8018 80240FF8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9D801C 80240FFC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9D8020 80241000 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9D8024 80241004 8C460028 */ lw $a2, 0x28($v0) -/* 9D8028 80241008 0C00A720 */ jal atan2 -/* 9D802C 8024100C 8C470030 */ lw $a3, 0x30($v0) -/* 9D8030 80241010 0200202D */ daddu $a0, $s0, $zero -/* 9D8034 80241014 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9D8038 80241018 3C060020 */ lui $a2, 0x20 -/* 9D803C 8024101C 0C012530 */ jal func_800494C0 -/* 9D8040 80241020 E480000C */ swc1 $f0, 0xc($a0) -/* 9D8044 80241024 8E220018 */ lw $v0, 0x18($s1) -/* 9D8048 80241028 9442002A */ lhu $v0, 0x2a($v0) -/* 9D804C 8024102C 30420001 */ andi $v0, $v0, 1 -/* 9D8050 80241030 14400029 */ bnez $v0, .L802410D8 -/* 9D8054 80241034 2402000A */ addiu $v0, $zero, 0xa -/* 9D8058 80241038 08090436 */ j .L802410D8 -/* 9D805C 8024103C 2402000C */ addiu $v0, $zero, 0xc -.L80241040: -/* 9D8060 80241040 8602008C */ lh $v0, 0x8c($s0) -/* 9D8064 80241044 14400025 */ bnez $v0, .L802410DC -/* 9D8068 80241048 00000000 */ nop -/* 9D806C 8024104C 9602008E */ lhu $v0, 0x8e($s0) -/* 9D8070 80241050 2442FFFF */ addiu $v0, $v0, -1 -/* 9D8074 80241054 A602008E */ sh $v0, 0x8e($s0) -/* 9D8078 80241058 00021400 */ sll $v0, $v0, 0x10 -/* 9D807C 8024105C 1440001F */ bnez $v0, .L802410DC -/* 9D8080 80241060 00000000 */ nop -/* 9D8084 80241064 8E820074 */ lw $v0, 0x74($s4) -/* 9D8088 80241068 2442FFFF */ addiu $v0, $v0, -1 -/* 9D808C 8024106C 10400019 */ beqz $v0, .L802410D4 -/* 9D8090 80241070 AE820074 */ sw $v0, 0x74($s4) -/* 9D8094 80241074 8E220018 */ lw $v0, 0x18($s1) -/* 9D8098 80241078 9442002A */ lhu $v0, 0x2a($v0) -/* 9D809C 8024107C 30420010 */ andi $v0, $v0, 0x10 -/* 9D80A0 80241080 14400007 */ bnez $v0, .L802410A0 -/* 9D80A4 80241084 00000000 */ nop -/* 9D80A8 80241088 C600000C */ lwc1 $f0, 0xc($s0) -/* 9D80AC 8024108C 3C014334 */ lui $at, 0x4334 -/* 9D80B0 80241090 44816000 */ mtc1 $at, $f12 -/* 9D80B4 80241094 0C00A6C9 */ jal clamp_angle -/* 9D80B8 80241098 460C0300 */ add.s $f12, $f0, $f12 -/* 9D80BC 8024109C E600000C */ swc1 $f0, 0xc($s0) -.L802410A0: -/* 9D80C0 802410A0 8E440008 */ lw $a0, 8($s2) -/* 9D80C4 802410A4 000417C2 */ srl $v0, $a0, 0x1f -/* 9D80C8 802410A8 00822021 */ addu $a0, $a0, $v0 -/* 9D80CC 802410AC 00042043 */ sra $a0, $a0, 1 -/* 9D80D0 802410B0 0C00A67F */ jal rand_int -/* 9D80D4 802410B4 24840001 */ addiu $a0, $a0, 1 -/* 9D80D8 802410B8 8E430008 */ lw $v1, 8($s2) -/* 9D80DC 802410BC 000327C2 */ srl $a0, $v1, 0x1f -/* 9D80E0 802410C0 00641821 */ addu $v1, $v1, $a0 -/* 9D80E4 802410C4 00031843 */ sra $v1, $v1, 1 -/* 9D80E8 802410C8 00621821 */ addu $v1, $v1, $v0 -/* 9D80EC 802410CC 08090437 */ j .L802410DC -/* 9D80F0 802410D0 A603008E */ sh $v1, 0x8e($s0) -.L802410D4: -/* 9D80F4 802410D4 24020004 */ addiu $v0, $zero, 4 -.L802410D8: -/* 9D80F8 802410D8 AE820070 */ sw $v0, 0x70($s4) -.L802410DC: -/* 9D80FC 802410DC 8FBF0044 */ lw $ra, 0x44($sp) -/* 9D8100 802410E0 8FB40040 */ lw $s4, 0x40($sp) -/* 9D8104 802410E4 8FB3003C */ lw $s3, 0x3c($sp) -/* 9D8108 802410E8 8FB20038 */ lw $s2, 0x38($sp) -/* 9D810C 802410EC 8FB10034 */ lw $s1, 0x34($sp) -/* 9D8110 802410F0 8FB00030 */ lw $s0, 0x30($sp) -/* 9D8114 802410F4 03E00008 */ jr $ra -/* 9D8118 802410F8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_802411B0_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_802411B0_9D7020.s deleted file mode 100644 index 03c15f84de..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_802411B0_9D7020.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411B0_9D81D0 -/* 9D81D0 802411B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D81D4 802411B4 AFB10014 */ sw $s1, 0x14($sp) -/* 9D81D8 802411B8 0080882D */ daddu $s1, $a0, $zero -/* 9D81DC 802411BC AFBF0018 */ sw $ra, 0x18($sp) -/* 9D81E0 802411C0 AFB00010 */ sw $s0, 0x10($sp) -/* 9D81E4 802411C4 8E300148 */ lw $s0, 0x148($s1) -/* 9D81E8 802411C8 0C00EABB */ jal get_npc_unsafe -/* 9D81EC 802411CC 86040008 */ lh $a0, 8($s0) -/* 9D81F0 802411D0 8E0300CC */ lw $v1, 0xcc($s0) -/* 9D81F4 802411D4 3C014120 */ lui $at, 0x4120 -/* 9D81F8 802411D8 44812000 */ mtc1 $at, $f4 -/* 9D81FC 802411DC 3C014000 */ lui $at, 0x4000 -/* 9D8200 802411E0 44810000 */ mtc1 $at, $f0 -/* 9D8204 802411E4 C442003C */ lwc1 $f2, 0x3c($v0) -/* 9D8208 802411E8 8C640010 */ lw $a0, 0x10($v1) -/* 9D820C 802411EC 8C430000 */ lw $v1, ($v0) -/* 9D8210 802411F0 E444001C */ swc1 $f4, 0x1c($v0) -/* 9D8214 802411F4 E4400014 */ swc1 $f0, 0x14($v0) -/* 9D8218 802411F8 E4420064 */ swc1 $f2, 0x64($v0) -/* 9D821C 802411FC 34630800 */ ori $v1, $v1, 0x800 -/* 9D8220 80241200 AC430000 */ sw $v1, ($v0) -/* 9D8224 80241204 AC440028 */ sw $a0, 0x28($v0) -/* 9D8228 80241208 2402000B */ addiu $v0, $zero, 0xb -/* 9D822C 8024120C AE220070 */ sw $v0, 0x70($s1) -/* 9D8230 80241210 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D8234 80241214 8FB10014 */ lw $s1, 0x14($sp) -/* 9D8238 80241218 8FB00010 */ lw $s0, 0x10($sp) -/* 9D823C 8024121C 03E00008 */ jr $ra -/* 9D8240 80241220 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_80241A4C_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_80241A4C_9D7020.s deleted file mode 100644 index 65aa42a0e6..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_80241A4C_9D7020.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A4C_9D8A6C -/* 9D8A6C 80241A4C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9D8A70 80241A50 AFB10024 */ sw $s1, 0x24($sp) -/* 9D8A74 80241A54 0080882D */ daddu $s1, $a0, $zero -/* 9D8A78 80241A58 3C05F840 */ lui $a1, 0xf840 -/* 9D8A7C 80241A5C AFBF0044 */ sw $ra, 0x44($sp) -/* 9D8A80 80241A60 AFBE0040 */ sw $fp, 0x40($sp) -/* 9D8A84 80241A64 AFB7003C */ sw $s7, 0x3c($sp) -/* 9D8A88 80241A68 AFB60038 */ sw $s6, 0x38($sp) -/* 9D8A8C 80241A6C AFB50034 */ sw $s5, 0x34($sp) -/* 9D8A90 80241A70 AFB40030 */ sw $s4, 0x30($sp) -/* 9D8A94 80241A74 AFB3002C */ sw $s3, 0x2c($sp) -/* 9D8A98 80241A78 AFB20028 */ sw $s2, 0x28($sp) -/* 9D8A9C 80241A7C AFB00020 */ sw $s0, 0x20($sp) -/* 9D8AA0 80241A80 8E3E0148 */ lw $fp, 0x148($s1) -/* 9D8AA4 80241A84 0C0B1EAF */ jal get_variable -/* 9D8AA8 80241A88 34A56268 */ ori $a1, $a1, 0x6268 -/* 9D8AAC 80241A8C 0040802D */ daddu $s0, $v0, $zero -/* 9D8AB0 80241A90 0220202D */ daddu $a0, $s1, $zero -/* 9D8AB4 80241A94 3C05F840 */ lui $a1, 0xf840 -/* 9D8AB8 80241A98 0C0B1EAF */ jal get_variable -/* 9D8ABC 80241A9C 34A56269 */ ori $a1, $a1, 0x6269 -/* 9D8AC0 80241AA0 0040B82D */ daddu $s7, $v0, $zero -/* 9D8AC4 80241AA4 0220202D */ daddu $a0, $s1, $zero -/* 9D8AC8 80241AA8 3C05F5DE */ lui $a1, 0xf5de -/* 9D8ACC 80241AAC 0C0B1EAF */ jal get_variable -/* 9D8AD0 80241AB0 34A502DE */ ori $a1, $a1, 0x2de -/* 9D8AD4 80241AB4 0040B02D */ daddu $s6, $v0, $zero -/* 9D8AD8 80241AB8 0220202D */ daddu $a0, $s1, $zero -/* 9D8ADC 80241ABC 3C05F5DE */ lui $a1, 0xf5de -/* 9D8AE0 80241AC0 0C0B1EAF */ jal get_variable -/* 9D8AE4 80241AC4 34A502DF */ ori $a1, $a1, 0x2df -/* 9D8AE8 80241AC8 0040A82D */ daddu $s5, $v0, $zero -/* 9D8AEC 80241ACC 93D3006D */ lbu $s3, 0x6d($fp) -/* 9D8AF0 80241AD0 32C2FFFF */ andi $v0, $s6, 0xffff -/* 9D8AF4 80241AD4 A7B30010 */ sh $s3, 0x10($sp) -/* 9D8AF8 80241AD8 93D2006E */ lbu $s2, 0x6e($fp) -/* 9D8AFC 80241ADC 93C7006F */ lbu $a3, 0x6f($fp) -/* 9D8B00 80241AE0 3274FFFF */ andi $s4, $s3, 0xffff -/* 9D8B04 80241AE4 12820003 */ beq $s4, $v0, .L80241AF4 -/* 9D8B08 80241AE8 A7A7001E */ sh $a3, 0x1e($sp) -/* 9D8B0C 80241AEC 0000B82D */ daddu $s7, $zero, $zero -/* 9D8B10 80241AF0 02E0802D */ daddu $s0, $s7, $zero -.L80241AF4: -/* 9D8B14 80241AF4 3202FFFF */ andi $v0, $s0, 0xffff -/* 9D8B18 80241AF8 14400016 */ bnez $v0, .L80241B54 -/* 9D8B1C 80241AFC 0220202D */ daddu $a0, $s1, $zero -/* 9D8B20 80241B00 0C00A67F */ jal rand_int -/* 9D8B24 80241B04 24040064 */ addiu $a0, $zero, 0x64 -/* 9D8B28 80241B08 2842001E */ slti $v0, $v0, 0x1e -/* 9D8B2C 80241B0C 10400011 */ beqz $v0, .L80241B54 -/* 9D8B30 80241B10 0220202D */ daddu $a0, $s1, $zero -/* 9D8B34 80241B14 0C00A67F */ jal rand_int -/* 9D8B38 80241B18 2644FFFF */ addiu $a0, $s2, -1 -/* 9D8B3C 80241B1C 0040A82D */ daddu $s5, $v0, $zero -/* 9D8B40 80241B20 0260B02D */ daddu $s6, $s3, $zero -/* 9D8B44 80241B24 0220202D */ daddu $a0, $s1, $zero -/* 9D8B48 80241B28 3C05F5DE */ lui $a1, 0xf5de -/* 9D8B4C 80241B2C 34A502DE */ ori $a1, $a1, 0x2de -/* 9D8B50 80241B30 0C0B2026 */ jal set_variable -/* 9D8B54 80241B34 0280302D */ daddu $a2, $s4, $zero -/* 9D8B58 80241B38 0220202D */ daddu $a0, $s1, $zero -/* 9D8B5C 80241B3C 3C05F5DE */ lui $a1, 0xf5de -/* 9D8B60 80241B40 34A502DF */ ori $a1, $a1, 0x2df -/* 9D8B64 80241B44 0C0B2026 */ jal set_variable -/* 9D8B68 80241B48 32A6FFFF */ andi $a2, $s5, 0xffff -/* 9D8B6C 80241B4C 24100001 */ addiu $s0, $zero, 1 -/* 9D8B70 80241B50 0220202D */ daddu $a0, $s1, $zero -.L80241B54: -/* 9D8B74 80241B54 3C05F840 */ lui $a1, 0xf840 -/* 9D8B78 80241B58 34A56268 */ ori $a1, $a1, 0x6268 -/* 9D8B7C 80241B5C 0C0B2026 */ jal set_variable -/* 9D8B80 80241B60 3206FFFF */ andi $a2, $s0, 0xffff -/* 9D8B84 80241B64 0220202D */ daddu $a0, $s1, $zero -/* 9D8B88 80241B68 3C05F840 */ lui $a1, 0xf840 -/* 9D8B8C 80241B6C 34A56269 */ ori $a1, $a1, 0x6269 -/* 9D8B90 80241B70 0C0B2026 */ jal set_variable -/* 9D8B94 80241B74 32E6FFFF */ andi $a2, $s7, 0xffff -/* 9D8B98 80241B78 0000202D */ daddu $a0, $zero, $zero -/* 9D8B9C 80241B7C 3C05F5DE */ lui $a1, 0xf5de -/* 9D8BA0 80241B80 0C0B1EAF */ jal get_variable -/* 9D8BA4 80241B84 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 9D8BA8 80241B88 0000202D */ daddu $a0, $zero, $zero -/* 9D8BAC 80241B8C 3C05F5DE */ lui $a1, 0xf5de -/* 9D8BB0 80241B90 34A50180 */ ori $a1, $a1, 0x180 -/* 9D8BB4 80241B94 0C0B1EAF */ jal get_variable -/* 9D8BB8 80241B98 0040802D */ daddu $s0, $v0, $zero -/* 9D8BBC 80241B9C 0040282D */ daddu $a1, $v0, $zero -/* 9D8BC0 80241BA0 0000182D */ daddu $v1, $zero, $zero -/* 9D8BC4 80241BA4 3C068024 */ lui $a2, 0x8024 -/* 9D8BC8 80241BA8 24C6716C */ addiu $a2, $a2, 0x716c -/* 9D8BCC 80241BAC 00C0202D */ daddu $a0, $a2, $zero -.L80241BB0: -/* 9D8BD0 80241BB0 8C820000 */ lw $v0, ($a0) -/* 9D8BD4 80241BB4 00A2102A */ slt $v0, $a1, $v0 -/* 9D8BD8 80241BB8 14400006 */ bnez $v0, .L80241BD4 -/* 9D8BDC 80241BBC 000310C0 */ sll $v0, $v1, 3 -/* 9D8BE0 80241BC0 24630001 */ addiu $v1, $v1, 1 -/* 9D8BE4 80241BC4 28620008 */ slti $v0, $v1, 8 -/* 9D8BE8 80241BC8 1440FFF9 */ bnez $v0, .L80241BB0 -/* 9D8BEC 80241BCC 24840008 */ addiu $a0, $a0, 8 -/* 9D8BF0 80241BD0 000310C0 */ sll $v0, $v1, 3 -.L80241BD4: -/* 9D8BF4 80241BD4 00461021 */ addu $v0, $v0, $a2 -/* 9D8BF8 80241BD8 8C420004 */ lw $v0, 4($v0) -/* 9D8BFC 80241BDC 97A30010 */ lhu $v1, 0x10($sp) -/* 9D8C00 80241BE0 0202202A */ slt $a0, $s0, $v0 -/* 9D8C04 80241BE4 32C2FFFF */ andi $v0, $s6, 0xffff -/* 9D8C08 80241BE8 14620008 */ bne $v1, $v0, .L80241C0C -/* 9D8C0C 80241BEC 32A2FFFF */ andi $v0, $s5, 0xffff -/* 9D8C10 80241BF0 97A7001E */ lhu $a3, 0x1e($sp) -/* 9D8C14 80241BF4 14E20005 */ bne $a3, $v0, .L80241C0C -/* 9D8C18 80241BF8 32E2FFFF */ andi $v0, $s7, 0xffff -/* 9D8C1C 80241BFC 14400003 */ bnez $v0, .L80241C0C -/* 9D8C20 80241C00 00000000 */ nop -/* 9D8C24 80241C04 14800008 */ bnez $a0, .L80241C28 -/* 9D8C28 80241C08 24020001 */ addiu $v0, $zero, 1 -.L80241C0C: -/* 9D8C2C 80241C0C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 9D8C30 80241C10 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 9D8C34 80241C14 80420075 */ lb $v0, 0x75($v0) -/* 9D8C38 80241C18 10400005 */ beqz $v0, .L80241C30 -/* 9D8C3C 80241C1C 00000000 */ nop -/* 9D8C40 80241C20 10800003 */ beqz $a0, .L80241C30 -/* 9D8C44 80241C24 24020001 */ addiu $v0, $zero, 1 -.L80241C28: -/* 9D8C48 80241C28 0809070F */ j .L80241C3C -/* 9D8C4C 80241C2C AE220084 */ sw $v0, 0x84($s1) -.L80241C30: -/* 9D8C50 80241C30 0C00F9EB */ jal kill_enemy -/* 9D8C54 80241C34 03C0202D */ daddu $a0, $fp, $zero -/* 9D8C58 80241C38 AE200084 */ sw $zero, 0x84($s1) -.L80241C3C: -/* 9D8C5C 80241C3C 8FBF0044 */ lw $ra, 0x44($sp) -/* 9D8C60 80241C40 8FBE0040 */ lw $fp, 0x40($sp) -/* 9D8C64 80241C44 8FB7003C */ lw $s7, 0x3c($sp) -/* 9D8C68 80241C48 8FB60038 */ lw $s6, 0x38($sp) -/* 9D8C6C 80241C4C 8FB50034 */ lw $s5, 0x34($sp) -/* 9D8C70 80241C50 8FB40030 */ lw $s4, 0x30($sp) -/* 9D8C74 80241C54 8FB3002C */ lw $s3, 0x2c($sp) -/* 9D8C78 80241C58 8FB20028 */ lw $s2, 0x28($sp) -/* 9D8C7C 80241C5C 8FB10024 */ lw $s1, 0x24($sp) -/* 9D8C80 80241C60 8FB00020 */ lw $s0, 0x20($sp) -/* 9D8C84 80241C64 24020002 */ addiu $v0, $zero, 2 -/* 9D8C88 80241C68 03E00008 */ jr $ra -/* 9D8C8C 80241C6C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_80242380_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_80242380_9D7020.s deleted file mode 100644 index 17bf50779c..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_80242380_9D7020.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242380_9D93A0 -/* 9D93A0 80242380 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D93A4 80242384 AFBF0010 */ sw $ra, 0x10($sp) -/* 9D93A8 80242388 8C82000C */ lw $v0, 0xc($a0) -/* 9D93AC 8024238C 0C0B1EAF */ jal get_variable -/* 9D93B0 80242390 8C450000 */ lw $a1, ($v0) -/* 9D93B4 80242394 0040202D */ daddu $a0, $v0, $zero -/* 9D93B8 80242398 3C028025 */ lui $v0, 0x8025 -/* 9D93BC 8024239C 8C4249C0 */ lw $v0, 0x49c0($v0) -/* 9D93C0 802423A0 24030001 */ addiu $v1, $zero, 1 -/* 9D93C4 802423A4 8C45000C */ lw $a1, 0xc($v0) -/* 9D93C8 802423A8 1083000D */ beq $a0, $v1, .L802423E0 -/* 9D93CC 802423AC 28820002 */ slti $v0, $a0, 2 -/* 9D93D0 802423B0 10400005 */ beqz $v0, .L802423C8 -/* 9D93D4 802423B4 24020002 */ addiu $v0, $zero, 2 -/* 9D93D8 802423B8 10800007 */ beqz $a0, .L802423D8 -/* 9D93DC 802423BC 240200C0 */ addiu $v0, $zero, 0xc0 -/* 9D93E0 802423C0 080908FC */ j .L802423F0 -/* 9D93E4 802423C4 ACA00038 */ sw $zero, 0x38($a1) -.L802423C8: -/* 9D93E8 802423C8 10820008 */ beq $a0, $v0, .L802423EC -/* 9D93EC 802423CC 24020040 */ addiu $v0, $zero, 0x40 -/* 9D93F0 802423D0 080908FC */ j .L802423F0 -/* 9D93F4 802423D4 ACA00038 */ sw $zero, 0x38($a1) -.L802423D8: -/* 9D93F8 802423D8 080908FC */ j .L802423F0 -/* 9D93FC 802423DC ACA20038 */ sw $v0, 0x38($a1) -.L802423E0: -/* 9D9400 802423E0 24020080 */ addiu $v0, $zero, 0x80 -/* 9D9404 802423E4 080908FC */ j .L802423F0 -/* 9D9408 802423E8 ACA20038 */ sw $v0, 0x38($a1) -.L802423EC: -/* 9D940C 802423EC ACA20038 */ sw $v0, 0x38($a1) -.L802423F0: -/* 9D9410 802423F0 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D9414 802423F4 24020002 */ addiu $v0, $zero, 2 -/* 9D9418 802423F8 03E00008 */ jr $ra -/* 9D941C 802423FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_80242790_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_80242790_9D7020.s deleted file mode 100644 index 0b09a0ed76..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_80242790_9D7020.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242790_9D97B0 -/* 9D97B0 80242790 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D97B4 80242794 AFB10014 */ sw $s1, 0x14($sp) -/* 9D97B8 80242798 0080882D */ daddu $s1, $a0, $zero -/* 9D97BC 8024279C AFB00010 */ sw $s0, 0x10($sp) -/* 9D97C0 802427A0 00A0802D */ daddu $s0, $a1, $zero -/* 9D97C4 802427A4 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D97C8 802427A8 0C00EABB */ jal get_npc_unsafe -/* 9D97CC 802427AC 2404FFFC */ addiu $a0, $zero, -4 -/* 9D97D0 802427B0 12000003 */ beqz $s0, .L802427C0 -/* 9D97D4 802427B4 0040182D */ daddu $v1, $v0, $zero -/* 9D97D8 802427B8 2402003C */ addiu $v0, $zero, 0x3c -/* 9D97DC 802427BC AE220070 */ sw $v0, 0x70($s1) -.L802427C0: -/* 9D97E0 802427C0 C462000C */ lwc1 $f2, 0xc($v1) -/* 9D97E4 802427C4 3C0141F0 */ lui $at, 0x41f0 -/* 9D97E8 802427C8 44810000 */ mtc1 $at, $f0 -/* 9D97EC 802427CC 00000000 */ nop -/* 9D97F0 802427D0 46001000 */ add.s $f0, $f2, $f0 -/* 9D97F4 802427D4 3C0143B4 */ lui $at, 0x43b4 -/* 9D97F8 802427D8 44811000 */ mtc1 $at, $f2 -/* 9D97FC 802427DC 00000000 */ nop -/* 9D9800 802427E0 4600103E */ c.le.s $f2, $f0 -/* 9D9804 802427E4 00000000 */ nop -/* 9D9808 802427E8 45000003 */ bc1f .L802427F8 -/* 9D980C 802427EC E460000C */ swc1 $f0, 0xc($v1) -/* 9D9810 802427F0 46020001 */ sub.s $f0, $f0, $f2 -/* 9D9814 802427F4 E460000C */ swc1 $f0, 0xc($v1) -.L802427F8: -/* 9D9818 802427F8 8E230070 */ lw $v1, 0x70($s1) -/* 9D981C 802427FC 2463FFFF */ addiu $v1, $v1, -1 -/* 9D9820 80242800 000317C3 */ sra $v0, $v1, 0x1f -/* 9D9824 80242804 AE230070 */ sw $v1, 0x70($s1) -/* 9D9828 80242808 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D982C 8024280C 8FB10014 */ lw $s1, 0x14($sp) -/* 9D9830 80242810 8FB00010 */ lw $s0, 0x10($sp) -/* 9D9834 80242814 30420002 */ andi $v0, $v0, 2 -/* 9D9838 80242818 03E00008 */ jr $ra -/* 9D983C 8024281C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_80242908_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_80242908_9D7020.s deleted file mode 100644 index b98b3b0de0..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_80242908_9D7020.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242908_9D9928 -/* 9D9928 80242908 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D992C 8024290C 3C058025 */ lui $a1, 0x8025 -/* 9D9930 80242910 8CA549B8 */ lw $a1, 0x49b8($a1) -/* 9D9934 80242914 AFBF0010 */ sw $ra, 0x10($sp) -/* 9D9938 80242918 0C0B1EAF */ jal get_variable -/* 9D993C 8024291C 0000202D */ daddu $a0, $zero, $zero -/* 9D9940 80242920 0040182D */ daddu $v1, $v0, $zero -/* 9D9944 80242924 24020001 */ addiu $v0, $zero, 1 -/* 9D9948 80242928 14620006 */ bne $v1, $v0, .L80242944 -/* 9D994C 8024292C 24020002 */ addiu $v0, $zero, 2 -/* 9D9950 80242930 44800000 */ mtc1 $zero, $f0 -/* 9D9954 80242934 00000000 */ nop -/* 9D9958 80242938 44050000 */ mfc1 $a1, $f0 -/* 9D995C 8024293C 08090A57 */ j .L8024295C -/* 9D9960 80242940 0000202D */ daddu $a0, $zero, $zero -.L80242944: -/* 9D9964 80242944 14620008 */ bne $v1, $v0, .L80242968 -/* 9D9968 80242948 24040001 */ addiu $a0, $zero, 1 -/* 9D996C 8024294C 44800000 */ mtc1 $zero, $f0 -/* 9D9970 80242950 00000000 */ nop -/* 9D9974 80242954 44050000 */ mfc1 $a1, $f0 -/* 9D9978 80242958 00000000 */ nop -.L8024295C: -/* 9D997C 8024295C 00A0302D */ daddu $a2, $a1, $zero -/* 9D9980 80242960 0C01C5A4 */ jal func_80071690 -/* 9D9984 80242964 00A0382D */ daddu $a3, $a1, $zero -.L80242968: -/* 9D9988 80242968 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D998C 8024296C 03E00008 */ jr $ra -/* 9D9990 80242970 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_80242A00_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_80242A00_9D7020.s deleted file mode 100644 index 2091b7ad34..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_80242A00_9D7020.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A00_9D9A20 -/* 9D9A20 80242A00 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9D9A24 80242A04 AFB10014 */ sw $s1, 0x14($sp) -/* 9D9A28 80242A08 0080882D */ daddu $s1, $a0, $zero -/* 9D9A2C 80242A0C AFBF0024 */ sw $ra, 0x24($sp) -/* 9D9A30 80242A10 AFB40020 */ sw $s4, 0x20($sp) -/* 9D9A34 80242A14 AFB3001C */ sw $s3, 0x1c($sp) -/* 9D9A38 80242A18 AFB20018 */ sw $s2, 0x18($sp) -/* 9D9A3C 80242A1C AFB00010 */ sw $s0, 0x10($sp) -/* 9D9A40 80242A20 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 9D9A44 80242A24 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 9D9A48 80242A28 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 9D9A4C 80242A2C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 9D9A50 80242A30 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 9D9A54 80242A34 8E30000C */ lw $s0, 0xc($s1) -/* 9D9A58 80242A38 8E130000 */ lw $s3, ($s0) -/* 9D9A5C 80242A3C 26100004 */ addiu $s0, $s0, 4 -/* 9D9A60 80242A40 0C0B1EAF */ jal get_variable -/* 9D9A64 80242A44 0260282D */ daddu $a1, $s3, $zero -/* 9D9A68 80242A48 4482E000 */ mtc1 $v0, $f28 -/* 9D9A6C 80242A4C 00000000 */ nop -/* 9D9A70 80242A50 4680E720 */ cvt.s.w $f28, $f28 -/* 9D9A74 80242A54 8E140000 */ lw $s4, ($s0) -/* 9D9A78 80242A58 26100004 */ addiu $s0, $s0, 4 -/* 9D9A7C 80242A5C 0220202D */ daddu $a0, $s1, $zero -/* 9D9A80 80242A60 0C0B1EAF */ jal get_variable -/* 9D9A84 80242A64 0280282D */ daddu $a1, $s4, $zero -/* 9D9A88 80242A68 4482D000 */ mtc1 $v0, $f26 -/* 9D9A8C 80242A6C 00000000 */ nop -/* 9D9A90 80242A70 4680D6A0 */ cvt.s.w $f26, $f26 -/* 9D9A94 80242A74 8E100000 */ lw $s0, ($s0) -/* 9D9A98 80242A78 0220202D */ daddu $a0, $s1, $zero -/* 9D9A9C 80242A7C 0C0B1EAF */ jal get_variable -/* 9D9AA0 80242A80 0200282D */ daddu $a1, $s0, $zero -/* 9D9AA4 80242A84 4482C000 */ mtc1 $v0, $f24 -/* 9D9AA8 80242A88 00000000 */ nop -/* 9D9AAC 80242A8C 4680C620 */ cvt.s.w $f24, $f24 -/* 9D9AB0 80242A90 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 9D9AB4 80242A94 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 9D9AB8 80242A98 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 9D9ABC 80242A9C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 9D9AC0 80242AA0 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 9D9AC4 80242AA4 44800000 */ mtc1 $zero, $f0 -/* 9D9AC8 80242AA8 00031080 */ sll $v0, $v1, 2 -/* 9D9ACC 80242AAC 00431021 */ addu $v0, $v0, $v1 -/* 9D9AD0 80242AB0 00021080 */ sll $v0, $v0, 2 -/* 9D9AD4 80242AB4 00431023 */ subu $v0, $v0, $v1 -/* 9D9AD8 80242AB8 000218C0 */ sll $v1, $v0, 3 -/* 9D9ADC 80242ABC 00431021 */ addu $v0, $v0, $v1 -/* 9D9AE0 80242AC0 000210C0 */ sll $v0, $v0, 3 -/* 9D9AE4 80242AC4 46001032 */ c.eq.s $f2, $f0 -/* 9D9AE8 80242AC8 3C01800B */ lui $at, 0x800b -/* 9D9AEC 80242ACC 00220821 */ addu $at, $at, $v0 -/* 9D9AF0 80242AD0 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 9D9AF4 80242AD4 45000005 */ bc1f .L80242AEC -/* 9D9AF8 80242AD8 00000000 */ nop -/* 9D9AFC 80242ADC 3C0142C8 */ lui $at, 0x42c8 -/* 9D9B00 80242AE0 44810000 */ mtc1 $at, $f0 -/* 9D9B04 80242AE4 08090ABF */ j .L80242AFC -/* 9D9B08 80242AE8 4600B581 */ sub.s $f22, $f22, $f0 -.L80242AEC: -/* 9D9B0C 80242AEC 3C0142C8 */ lui $at, 0x42c8 -/* 9D9B10 80242AF0 44810000 */ mtc1 $at, $f0 -/* 9D9B14 80242AF4 00000000 */ nop -/* 9D9B18 80242AF8 4600B580 */ add.s $f22, $f22, $f0 -.L80242AFC: -/* 9D9B1C 80242AFC 0C00A6C9 */ jal clamp_angle -/* 9D9B20 80242B00 4600B306 */ mov.s $f12, $f22 -/* 9D9B24 80242B04 46000586 */ mov.s $f22, $f0 -/* 9D9B28 80242B08 3C014170 */ lui $at, 0x4170 -/* 9D9B2C 80242B0C 4481A000 */ mtc1 $at, $f20 -/* 9D9B30 80242B10 0C00A8BB */ jal sin_deg -/* 9D9B34 80242B14 4600B306 */ mov.s $f12, $f22 -/* 9D9B38 80242B18 46140002 */ mul.s $f0, $f0, $f20 -/* 9D9B3C 80242B1C 00000000 */ nop -/* 9D9B40 80242B20 864200B0 */ lh $v0, 0xb0($s2) -/* 9D9B44 80242B24 3C013F00 */ lui $at, 0x3f00 -/* 9D9B48 80242B28 44812000 */ mtc1 $at, $f4 -/* 9D9B4C 80242B2C 44821000 */ mtc1 $v0, $f2 -/* 9D9B50 80242B30 00000000 */ nop -/* 9D9B54 80242B34 468010A0 */ cvt.s.w $f2, $f2 -/* 9D9B58 80242B38 46041082 */ mul.s $f2, $f2, $f4 -/* 9D9B5C 80242B3C 00000000 */ nop -/* 9D9B60 80242B40 4600E700 */ add.s $f28, $f28, $f0 -/* 9D9B64 80242B44 4602D680 */ add.s $f26, $f26, $f2 -/* 9D9B68 80242B48 0C00A8D4 */ jal cos_deg -/* 9D9B6C 80242B4C 4600B306 */ mov.s $f12, $f22 -/* 9D9B70 80242B50 46140002 */ mul.s $f0, $f0, $f20 -/* 9D9B74 80242B54 00000000 */ nop -/* 9D9B78 80242B58 0220202D */ daddu $a0, $s1, $zero -/* 9D9B7C 80242B5C 0260282D */ daddu $a1, $s3, $zero -/* 9D9B80 80242B60 4600E18D */ trunc.w.s $f6, $f28 -/* 9D9B84 80242B64 44063000 */ mfc1 $a2, $f6 -/* 9D9B88 80242B68 0C0B2026 */ jal set_variable -/* 9D9B8C 80242B6C 4600C601 */ sub.s $f24, $f24, $f0 -/* 9D9B90 80242B70 0220202D */ daddu $a0, $s1, $zero -/* 9D9B94 80242B74 4600D18D */ trunc.w.s $f6, $f26 -/* 9D9B98 80242B78 44063000 */ mfc1 $a2, $f6 -/* 9D9B9C 80242B7C 0C0B2026 */ jal set_variable -/* 9D9BA0 80242B80 0280282D */ daddu $a1, $s4, $zero -/* 9D9BA4 80242B84 0220202D */ daddu $a0, $s1, $zero -/* 9D9BA8 80242B88 4600C18D */ trunc.w.s $f6, $f24 -/* 9D9BAC 80242B8C 44063000 */ mfc1 $a2, $f6 -/* 9D9BB0 80242B90 0C0B2026 */ jal set_variable -/* 9D9BB4 80242B94 0200282D */ daddu $a1, $s0, $zero -/* 9D9BB8 80242B98 8FBF0024 */ lw $ra, 0x24($sp) -/* 9D9BBC 80242B9C 8FB40020 */ lw $s4, 0x20($sp) -/* 9D9BC0 80242BA0 8FB3001C */ lw $s3, 0x1c($sp) -/* 9D9BC4 80242BA4 8FB20018 */ lw $s2, 0x18($sp) -/* 9D9BC8 80242BA8 8FB10014 */ lw $s1, 0x14($sp) -/* 9D9BCC 80242BAC 8FB00010 */ lw $s0, 0x10($sp) -/* 9D9BD0 80242BB0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 9D9BD4 80242BB4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 9D9BD8 80242BB8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 9D9BDC 80242BBC D7B60030 */ ldc1 $f22, 0x30($sp) -/* 9D9BE0 80242BC0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 9D9BE4 80242BC4 24020002 */ addiu $v0, $zero, 2 -/* 9D9BE8 80242BC8 03E00008 */ jr $ra -/* 9D9BEC 80242BCC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_80242F74_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_80242F74_9D7020.s deleted file mode 100644 index 366119e77d..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_80242F74_9D7020.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F74_9D9F94 -/* 9D9F94 80242F74 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D9F98 80242F78 AFB00010 */ sw $s0, 0x10($sp) -/* 9D9F9C 80242F7C 0080802D */ daddu $s0, $a0, $zero -/* 9D9FA0 80242F80 AFBF0014 */ sw $ra, 0x14($sp) -/* 9D9FA4 80242F84 0C00EABB */ jal get_npc_unsafe -/* 9D9FA8 80242F88 8E04008C */ lw $a0, 0x8c($s0) -/* 9D9FAC 80242F8C 0040282D */ daddu $a1, $v0, $zero -/* 9D9FB0 80242F90 8E040094 */ lw $a0, 0x94($s0) -/* 9D9FB4 80242F94 8CA30028 */ lw $v1, 0x28($a1) -/* 9D9FB8 80242F98 ACA40028 */ sw $a0, 0x28($a1) -/* 9D9FBC 80242F9C 8FBF0014 */ lw $ra, 0x14($sp) -/* 9D9FC0 80242FA0 8FB00010 */ lw $s0, 0x10($sp) -/* 9D9FC4 80242FA4 24020002 */ addiu $v0, $zero, 2 -/* 9D9FC8 80242FA8 3C018025 */ lui $at, 0x8025 -/* 9D9FCC 80242FAC AC234B94 */ sw $v1, 0x4b94($at) -/* 9D9FD0 80242FB0 03E00008 */ jr $ra -/* 9D9FD4 80242FB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_80243754_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_80243754_9D7020.s deleted file mode 100644 index 40a1bf4d78..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_80243754_9D7020.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243754_9DA774 -/* 9DA774 80243754 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9DA778 80243758 AFB20018 */ sw $s2, 0x18($sp) -/* 9DA77C 8024375C 0080902D */ daddu $s2, $a0, $zero -/* 9DA780 80243760 AFBF001C */ sw $ra, 0x1c($sp) -/* 9DA784 80243764 AFB10014 */ sw $s1, 0x14($sp) -/* 9DA788 80243768 AFB00010 */ sw $s0, 0x10($sp) -/* 9DA78C 8024376C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9DA790 80243770 10A0002D */ beqz $a1, .L80243828 -/* 9DA794 80243774 8E51000C */ lw $s1, 0xc($s2) -/* 9DA798 80243778 8E250000 */ lw $a1, ($s1) -/* 9DA79C 8024377C 0C0B1EAF */ jal get_variable -/* 9DA7A0 80243780 26310004 */ addiu $s1, $s1, 4 -/* 9DA7A4 80243784 0040802D */ daddu $s0, $v0, $zero -/* 9DA7A8 80243788 AE500074 */ sw $s0, 0x74($s2) -/* 9DA7AC 8024378C 8E250000 */ lw $a1, ($s1) -/* 9DA7B0 80243790 0C0B1EAF */ jal get_variable -/* 9DA7B4 80243794 0240202D */ daddu $a0, $s2, $zero -/* 9DA7B8 80243798 C6020038 */ lwc1 $f2, 0x38($s0) -/* 9DA7BC 8024379C 44820000 */ mtc1 $v0, $f0 -/* 9DA7C0 802437A0 00000000 */ nop -/* 9DA7C4 802437A4 46800020 */ cvt.s.w $f0, $f0 -/* 9DA7C8 802437A8 46020000 */ add.s $f0, $f0, $f2 -/* 9DA7CC 802437AC 3C013F00 */ lui $at, 0x3f00 -/* 9DA7D0 802437B0 4481A000 */ mtc1 $at, $f20 -/* 9DA7D4 802437B4 00000000 */ nop -/* 9DA7D8 802437B8 46140002 */ mul.s $f0, $f0, $f20 -/* 9DA7DC 802437BC 00000000 */ nop -/* 9DA7E0 802437C0 26310004 */ addiu $s1, $s1, 4 -/* 9DA7E4 802437C4 E6000060 */ swc1 $f0, 0x60($s0) -/* 9DA7E8 802437C8 8E250000 */ lw $a1, ($s1) -/* 9DA7EC 802437CC 0C0B1EAF */ jal get_variable -/* 9DA7F0 802437D0 0240202D */ daddu $a0, $s2, $zero -/* 9DA7F4 802437D4 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9DA7F8 802437D8 44827000 */ mtc1 $v0, $f14 -/* 9DA7FC 802437DC 00000000 */ nop -/* 9DA800 802437E0 468073A0 */ cvt.s.w $f14, $f14 -/* 9DA804 802437E4 46007380 */ add.s $f14, $f14, $f0 -/* 9DA808 802437E8 46147382 */ mul.s $f14, $f14, $f20 -/* 9DA80C 802437EC 00000000 */ nop -/* 9DA810 802437F0 C60C0060 */ lwc1 $f12, 0x60($s0) -/* 9DA814 802437F4 8E060038 */ lw $a2, 0x38($s0) -/* 9DA818 802437F8 44070000 */ mfc1 $a3, $f0 -/* 9DA81C 802437FC 0C00A7B5 */ jal dist2D -/* 9DA820 80243800 E60E0068 */ swc1 $f14, 0x68($s0) -/* 9DA824 80243804 C60C0060 */ lwc1 $f12, 0x60($s0) -/* 9DA828 80243808 C60E0068 */ lwc1 $f14, 0x68($s0) -/* 9DA82C 8024380C 8E060038 */ lw $a2, 0x38($s0) -/* 9DA830 80243810 8E070040 */ lw $a3, 0x40($s0) -/* 9DA834 80243814 0C00A720 */ jal atan2 -/* 9DA838 80243818 E6000064 */ swc1 $f0, 0x64($s0) -/* 9DA83C 8024381C 4600010D */ trunc.w.s $f4, $f0 -/* 9DA840 80243820 E6440078 */ swc1 $f4, 0x78($s2) -/* 9DA844 80243824 A600008E */ sh $zero, 0x8e($s0) -.L80243828: -/* 9DA848 80243828 8E500074 */ lw $s0, 0x74($s2) -/* 9DA84C 8024382C C6000060 */ lwc1 $f0, 0x60($s0) -/* 9DA850 80243830 9602008E */ lhu $v0, 0x8e($s0) -/* 9DA854 80243834 C6020068 */ lwc1 $f2, 0x68($s0) -/* 9DA858 80243838 24420009 */ addiu $v0, $v0, 9 -/* 9DA85C 8024383C A602008E */ sh $v0, 0x8e($s0) -/* 9DA860 80243840 00021400 */ sll $v0, $v0, 0x10 -/* 9DA864 80243844 00021403 */ sra $v0, $v0, 0x10 -/* 9DA868 80243848 28420168 */ slti $v0, $v0, 0x168 -/* 9DA86C 8024384C E6000038 */ swc1 $f0, 0x38($s0) -/* 9DA870 80243850 14400003 */ bnez $v0, .L80243860 -/* 9DA874 80243854 E6020040 */ swc1 $f2, 0x40($s0) -/* 9DA878 80243858 24020168 */ addiu $v0, $zero, 0x168 -/* 9DA87C 8024385C A602008E */ sh $v0, 0x8e($s0) -.L80243860: -/* 9DA880 80243860 8603008E */ lh $v1, 0x8e($s0) -/* 9DA884 80243864 8E420078 */ lw $v0, 0x78($s2) -/* 9DA888 80243868 3C0142B4 */ lui $at, 0x42b4 -/* 9DA88C 8024386C 44816000 */ mtc1 $at, $f12 -/* 9DA890 80243870 00431021 */ addu $v0, $v0, $v1 -/* 9DA894 80243874 4482A000 */ mtc1 $v0, $f20 -/* 9DA898 80243878 00000000 */ nop -/* 9DA89C 8024387C 4680A520 */ cvt.s.w $f20, $f20 -/* 9DA8A0 80243880 0C00A6C9 */ jal clamp_angle -/* 9DA8A4 80243884 460CA300 */ add.s $f12, $f20, $f12 -/* 9DA8A8 80243888 8E050064 */ lw $a1, 0x64($s0) -/* 9DA8AC 8024388C 4406A000 */ mfc1 $a2, $f20 -/* 9DA8B0 80243890 0200202D */ daddu $a0, $s0, $zero -/* 9DA8B4 80243894 0C00EA95 */ jal npc_move_heading -/* 9DA8B8 80243898 E600000C */ swc1 $f0, 0xc($s0) -/* 9DA8BC 8024389C 8602008E */ lh $v0, 0x8e($s0) -/* 9DA8C0 802438A0 8FBF001C */ lw $ra, 0x1c($sp) -/* 9DA8C4 802438A4 8FB20018 */ lw $s2, 0x18($sp) -/* 9DA8C8 802438A8 8FB10014 */ lw $s1, 0x14($sp) -/* 9DA8CC 802438AC 8FB00010 */ lw $s0, 0x10($sp) -/* 9DA8D0 802438B0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9DA8D4 802438B4 38420168 */ xori $v0, $v0, 0x168 -/* 9DA8D8 802438B8 2C420001 */ sltiu $v0, $v0, 1 -/* 9DA8DC 802438BC 00021040 */ sll $v0, $v0, 1 -/* 9DA8E0 802438C0 03E00008 */ jr $ra -/* 9DA8E4 802438C4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9DA8E8 802438C8 00000000 */ nop -/* 9DA8EC 802438CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_802439C0_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_802439C0_9D7020.s deleted file mode 100644 index d5acc1b5fc..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_802439C0_9D7020.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802439C0_9DA9E0 -/* 9DA9E0 802439C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9DA9E4 802439C4 AFB10014 */ sw $s1, 0x14($sp) -/* 9DA9E8 802439C8 0080882D */ daddu $s1, $a0, $zero -/* 9DA9EC 802439CC AFBF0018 */ sw $ra, 0x18($sp) -/* 9DA9F0 802439D0 AFB00010 */ sw $s0, 0x10($sp) -/* 9DA9F4 802439D4 8E30000C */ lw $s0, 0xc($s1) -/* 9DA9F8 802439D8 8E050000 */ lw $a1, ($s0) -/* 9DA9FC 802439DC 0C0B1EAF */ jal get_variable -/* 9DAA00 802439E0 26100004 */ addiu $s0, $s0, 4 -/* 9DAA04 802439E4 0C00EAD2 */ jal get_npc_safe -/* 9DAA08 802439E8 0040202D */ daddu $a0, $v0, $zero -/* 9DAA0C 802439EC 10400005 */ beqz $v0, .L80243A04 -/* 9DAA10 802439F0 00000000 */ nop -/* 9DAA14 802439F4 8E050000 */ lw $a1, ($s0) -/* 9DAA18 802439F8 844600A8 */ lh $a2, 0xa8($v0) -/* 9DAA1C 802439FC 0C0B2026 */ jal set_variable -/* 9DAA20 80243A00 0220202D */ daddu $a0, $s1, $zero -.L80243A04: -/* 9DAA24 80243A04 8FBF0018 */ lw $ra, 0x18($sp) -/* 9DAA28 80243A08 8FB10014 */ lw $s1, 0x14($sp) -/* 9DAA2C 80243A0C 8FB00010 */ lw $s0, 0x10($sp) -/* 9DAA30 80243A10 24020002 */ addiu $v0, $zero, 2 -/* 9DAA34 80243A14 03E00008 */ jr $ra -/* 9DAA38 80243A18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_80243DB0_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_80243DB0_9D7020.s deleted file mode 100644 index 8e438f29e8..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_80243DB0_9D7020.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243DB0_9DADD0 -/* 9DADD0 80243DB0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9DADD4 80243DB4 AFB00010 */ sw $s0, 0x10($sp) -/* 9DADD8 80243DB8 3C108025 */ lui $s0, 0x8025 -/* 9DADDC 80243DBC 26102720 */ addiu $s0, $s0, 0x2720 -/* 9DADE0 80243DC0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9DADE4 80243DC4 AFB10014 */ sw $s1, 0x14($sp) -/* 9DADE8 80243DC8 8E020000 */ lw $v0, ($s0) -/* 9DADEC 80243DCC 14400010 */ bnez $v0, .L80243E10 -/* 9DADF0 80243DD0 0080882D */ daddu $s1, $a0, $zero -/* 9DADF4 80243DD4 0C00AB39 */ jal heap_malloc -/* 9DADF8 80243DD8 24040040 */ addiu $a0, $zero, 0x40 -/* 9DADFC 80243DDC AE020000 */ sw $v0, ($s0) -/* 9DAE00 80243DE0 0000182D */ daddu $v1, $zero, $zero -/* 9DAE04 80243DE4 0040282D */ daddu $a1, $v0, $zero -/* 9DAE08 80243DE8 0220202D */ daddu $a0, $s1, $zero -.L80243DEC: -/* 9DAE0C 80243DEC 8C820084 */ lw $v0, 0x84($a0) -/* 9DAE10 80243DF0 24840004 */ addiu $a0, $a0, 4 -/* 9DAE14 80243DF4 24630001 */ addiu $v1, $v1, 1 -/* 9DAE18 80243DF8 ACA20000 */ sw $v0, ($a1) -/* 9DAE1C 80243DFC 28620010 */ slti $v0, $v1, 0x10 -/* 9DAE20 80243E00 1440FFFA */ bnez $v0, .L80243DEC -/* 9DAE24 80243E04 24A50004 */ addiu $a1, $a1, 4 -/* 9DAE28 80243E08 08090F93 */ j .L80243E4C -/* 9DAE2C 80243E0C 00000000 */ nop -.L80243E10: -/* 9DAE30 80243E10 0000182D */ daddu $v1, $zero, $zero -/* 9DAE34 80243E14 0040282D */ daddu $a1, $v0, $zero -/* 9DAE38 80243E18 0220202D */ daddu $a0, $s1, $zero -.L80243E1C: -/* 9DAE3C 80243E1C 8CA20000 */ lw $v0, ($a1) -/* 9DAE40 80243E20 24A50004 */ addiu $a1, $a1, 4 -/* 9DAE44 80243E24 24630001 */ addiu $v1, $v1, 1 -/* 9DAE48 80243E28 AC820084 */ sw $v0, 0x84($a0) -/* 9DAE4C 80243E2C 28620010 */ slti $v0, $v1, 0x10 -/* 9DAE50 80243E30 1440FFFA */ bnez $v0, .L80243E1C -/* 9DAE54 80243E34 24840004 */ addiu $a0, $a0, 4 -/* 9DAE58 80243E38 3C108025 */ lui $s0, 0x8025 -/* 9DAE5C 80243E3C 26102720 */ addiu $s0, $s0, 0x2720 -/* 9DAE60 80243E40 0C00AB4B */ jal heap_free -/* 9DAE64 80243E44 8E040000 */ lw $a0, ($s0) -/* 9DAE68 80243E48 AE000000 */ sw $zero, ($s0) -.L80243E4C: -/* 9DAE6C 80243E4C 8FBF0018 */ lw $ra, 0x18($sp) -/* 9DAE70 80243E50 8FB10014 */ lw $s1, 0x14($sp) -/* 9DAE74 80243E54 8FB00010 */ lw $s0, 0x10($sp) -/* 9DAE78 80243E58 24020002 */ addiu $v0, $zero, 2 -/* 9DAE7C 80243E5C 03E00008 */ jr $ra -/* 9DAE80 80243E60 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/func_80244078_9D7020.s b/asm/nonmatchings/world/area_nok/nok_02/func_80244078_9D7020.s deleted file mode 100644 index ea3d82bae2..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/func_80244078_9D7020.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244078_9DB098 -/* 9DB098 80244078 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9DB09C 8024407C AFB40020 */ sw $s4, 0x20($sp) -/* 9DB0A0 80244080 0080A02D */ daddu $s4, $a0, $zero -/* 9DB0A4 80244084 AFB3001C */ sw $s3, 0x1c($sp) -/* 9DB0A8 80244088 0000982D */ daddu $s3, $zero, $zero -/* 9DB0AC 8024408C AFB20018 */ sw $s2, 0x18($sp) -/* 9DB0B0 80244090 3C128025 */ lui $s2, 0x8025 -/* 9DB0B4 80244094 26522784 */ addiu $s2, $s2, 0x2784 -/* 9DB0B8 80244098 AFBF0030 */ sw $ra, 0x30($sp) -/* 9DB0BC 8024409C AFB7002C */ sw $s7, 0x2c($sp) -/* 9DB0C0 802440A0 AFB60028 */ sw $s6, 0x28($sp) -/* 9DB0C4 802440A4 AFB50024 */ sw $s5, 0x24($sp) -/* 9DB0C8 802440A8 AFB10014 */ sw $s1, 0x14($sp) -/* 9DB0CC 802440AC AFB00010 */ sw $s0, 0x10($sp) -/* 9DB0D0 802440B0 8E82000C */ lw $v0, 0xc($s4) -/* 9DB0D4 802440B4 0260882D */ daddu $s1, $s3, $zero -/* 9DB0D8 802440B8 8C560000 */ lw $s6, ($v0) -/* 9DB0DC 802440BC 26500010 */ addiu $s0, $s2, 0x10 -/* 9DB0E0 802440C0 0C0B1EAF */ jal get_variable -/* 9DB0E4 802440C4 02C0282D */ daddu $a1, $s6, $zero -/* 9DB0E8 802440C8 0280202D */ daddu $a0, $s4, $zero -/* 9DB0EC 802440CC 2455FFFF */ addiu $s5, $v0, -1 -/* 9DB0F0 802440D0 001510C0 */ sll $v0, $s5, 3 -/* 9DB0F4 802440D4 00551023 */ subu $v0, $v0, $s5 -/* 9DB0F8 802440D8 00021080 */ sll $v0, $v0, 2 -/* 9DB0FC 802440DC 3C058025 */ lui $a1, 0x8025 -/* 9DB100 802440E0 00A22821 */ addu $a1, $a1, $v0 -/* 9DB104 802440E4 8CA52794 */ lw $a1, 0x2794($a1) -/* 9DB108 802440E8 0C0B2026 */ jal set_variable -/* 9DB10C 802440EC 24060001 */ addiu $a2, $zero, 1 -.L802440F0: -/* 9DB110 802440F0 8E05FFFC */ lw $a1, -4($s0) -/* 9DB114 802440F4 0C0B1EAF */ jal get_variable -/* 9DB118 802440F8 0280202D */ daddu $a0, $s4, $zero -/* 9DB11C 802440FC 5040000D */ beql $v0, $zero, .L80244134 -/* 9DB120 80244100 26310001 */ addiu $s1, $s1, 1 -/* 9DB124 80244104 8E050004 */ lw $a1, 4($s0) -/* 9DB128 80244108 0C0B1EAF */ jal get_variable -/* 9DB12C 8024410C 0280202D */ daddu $a0, $s4, $zero -/* 9DB130 80244110 54400008 */ bnel $v0, $zero, .L80244134 -/* 9DB134 80244114 26310001 */ addiu $s1, $s1, 1 -/* 9DB138 80244118 26730001 */ addiu $s3, $s3, 1 -/* 9DB13C 8024411C 8E050000 */ lw $a1, ($s0) -/* 9DB140 80244120 0C0B1EAF */ jal get_variable -/* 9DB144 80244124 0280202D */ daddu $a0, $s4, $zero -/* 9DB148 80244128 10400007 */ beqz $v0, .L80244148 -/* 9DB14C 8024412C 24020014 */ addiu $v0, $zero, 0x14 -/* 9DB150 80244130 26310001 */ addiu $s1, $s1, 1 -.L80244134: -/* 9DB154 80244134 2610001C */ addiu $s0, $s0, 0x1c -/* 9DB158 80244138 2E220014 */ sltiu $v0, $s1, 0x14 -/* 9DB15C 8024413C 1440FFEC */ bnez $v0, .L802440F0 -/* 9DB160 80244140 2652001C */ addiu $s2, $s2, 0x1c -/* 9DB164 80244144 24020014 */ addiu $v0, $zero, 0x14 -.L80244148: -/* 9DB168 80244148 16220024 */ bne $s1, $v0, .L802441DC -/* 9DB16C 8024414C 0280202D */ daddu $a0, $s4, $zero -/* 9DB170 80244150 2A620002 */ slti $v0, $s3, 2 -/* 9DB174 80244154 10400004 */ beqz $v0, .L80244168 -/* 9DB178 80244158 02C0282D */ daddu $a1, $s6, $zero -/* 9DB17C 8024415C AE800084 */ sw $zero, 0x84($s4) -/* 9DB180 80244160 0809107B */ j .L802441EC -/* 9DB184 80244164 240600FF */ addiu $a2, $zero, 0xff -.L80244168: -/* 9DB188 80244168 0C00A67F */ jal rand_int -/* 9DB18C 8024416C 2664FFFE */ addiu $a0, $s3, -2 -/* 9DB190 80244170 0040B82D */ daddu $s7, $v0, $zero -/* 9DB194 80244174 0000982D */ daddu $s3, $zero, $zero -/* 9DB198 80244178 3C128025 */ lui $s2, 0x8025 -/* 9DB19C 8024417C 26522784 */ addiu $s2, $s2, 0x2784 -/* 9DB1A0 80244180 0260882D */ daddu $s1, $s3, $zero -/* 9DB1A4 80244184 26500014 */ addiu $s0, $s2, 0x14 -.L80244188: -/* 9DB1A8 80244188 5235000F */ beql $s1, $s5, .L802441C8 -/* 9DB1AC 8024418C 26310001 */ addiu $s1, $s1, 1 -/* 9DB1B0 80244190 8E05FFF8 */ lw $a1, -8($s0) -/* 9DB1B4 80244194 0C0B1EAF */ jal get_variable -/* 9DB1B8 80244198 0280202D */ daddu $a0, $s4, $zero -/* 9DB1BC 8024419C 5040000A */ beql $v0, $zero, .L802441C8 -/* 9DB1C0 802441A0 26310001 */ addiu $s1, $s1, 1 -/* 9DB1C4 802441A4 8E050000 */ lw $a1, ($s0) -/* 9DB1C8 802441A8 0C0B1EAF */ jal get_variable -/* 9DB1CC 802441AC 0280202D */ daddu $a0, $s4, $zero -/* 9DB1D0 802441B0 54400005 */ bnel $v0, $zero, .L802441C8 -/* 9DB1D4 802441B4 26310001 */ addiu $s1, $s1, 1 -/* 9DB1D8 802441B8 0260102D */ daddu $v0, $s3, $zero -/* 9DB1DC 802441BC 10570006 */ beq $v0, $s7, .L802441D8 -/* 9DB1E0 802441C0 26730001 */ addiu $s3, $s3, 1 -/* 9DB1E4 802441C4 26310001 */ addiu $s1, $s1, 1 -.L802441C8: -/* 9DB1E8 802441C8 2610001C */ addiu $s0, $s0, 0x1c -/* 9DB1EC 802441CC 2E220014 */ sltiu $v0, $s1, 0x14 -/* 9DB1F0 802441D0 1440FFED */ bnez $v0, .L80244188 -/* 9DB1F4 802441D4 2652001C */ addiu $s2, $s2, 0x1c -.L802441D8: -/* 9DB1F8 802441D8 0280202D */ daddu $a0, $s4, $zero -.L802441DC: -/* 9DB1FC 802441DC 02C0282D */ daddu $a1, $s6, $zero -/* 9DB200 802441E0 8E420000 */ lw $v0, ($s2) -/* 9DB204 802441E4 26260001 */ addiu $a2, $s1, 1 -/* 9DB208 802441E8 AC820084 */ sw $v0, 0x84($a0) -.L802441EC: -/* 9DB20C 802441EC 0C0B2026 */ jal set_variable -/* 9DB210 802441F0 00000000 */ nop -/* 9DB214 802441F4 24020002 */ addiu $v0, $zero, 2 -/* 9DB218 802441F8 8FBF0030 */ lw $ra, 0x30($sp) -/* 9DB21C 802441FC 8FB7002C */ lw $s7, 0x2c($sp) -/* 9DB220 80244200 8FB60028 */ lw $s6, 0x28($sp) -/* 9DB224 80244204 8FB50024 */ lw $s5, 0x24($sp) -/* 9DB228 80244208 8FB40020 */ lw $s4, 0x20($sp) -/* 9DB22C 8024420C 8FB3001C */ lw $s3, 0x1c($sp) -/* 9DB230 80244210 8FB20018 */ lw $s2, 0x18($sp) -/* 9DB234 80244214 8FB10014 */ lw $s1, 0x14($sp) -/* 9DB238 80244218 8FB00010 */ lw $s0, 0x10($sp) -/* 9DB23C 8024421C 03E00008 */ jr $ra -/* 9DB240 80244220 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_nok/nok_03/func_80240230_9EB7F0.s b/asm/nonmatchings/world/area_nok/nok_03/func_80240230_9EB7F0.s deleted file mode 100644 index acaf8d1ddf..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_03/func_80240230_9EB7F0.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240230_9EBA20 -/* 9EBA20 80240230 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 9EBA24 80240234 AFB3004C */ sw $s3, 0x4c($sp) -/* 9EBA28 80240238 0080982D */ daddu $s3, $a0, $zero -/* 9EBA2C 8024023C AFBF0054 */ sw $ra, 0x54($sp) -/* 9EBA30 80240240 AFB40050 */ sw $s4, 0x50($sp) -/* 9EBA34 80240244 AFB20048 */ sw $s2, 0x48($sp) -/* 9EBA38 80240248 AFB10044 */ sw $s1, 0x44($sp) -/* 9EBA3C 8024024C AFB00040 */ sw $s0, 0x40($sp) -/* 9EBA40 80240250 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 9EBA44 80240254 8E710148 */ lw $s1, 0x148($s3) -/* 9EBA48 80240258 00A0A02D */ daddu $s4, $a1, $zero -/* 9EBA4C 8024025C 86240008 */ lh $a0, 8($s1) -/* 9EBA50 80240260 0C00EABB */ jal get_npc_unsafe -/* 9EBA54 80240264 00C0902D */ daddu $s2, $a2, $zero -/* 9EBA58 80240268 8E830014 */ lw $v1, 0x14($s4) -/* 9EBA5C 8024026C 04600034 */ bltz $v1, .L80240340 -/* 9EBA60 80240270 0040802D */ daddu $s0, $v0, $zero -/* 9EBA64 80240274 8E620074 */ lw $v0, 0x74($s3) -/* 9EBA68 80240278 1C400030 */ bgtz $v0, .L8024033C -/* 9EBA6C 8024027C 2442FFFF */ addiu $v0, $v0, -1 -/* 9EBA70 80240280 0240202D */ daddu $a0, $s2, $zero -/* 9EBA74 80240284 AE630074 */ sw $v1, 0x74($s3) -/* 9EBA78 80240288 AFA00010 */ sw $zero, 0x10($sp) -/* 9EBA7C 8024028C 8E86000C */ lw $a2, 0xc($s4) -/* 9EBA80 80240290 8E870010 */ lw $a3, 0x10($s4) -/* 9EBA84 80240294 0C01242D */ jal func_800490B4 -/* 9EBA88 80240298 0220282D */ daddu $a1, $s1, $zero -/* 9EBA8C 8024029C 10400025 */ beqz $v0, .L80240334 -/* 9EBA90 802402A0 0000202D */ daddu $a0, $zero, $zero -/* 9EBA94 802402A4 0200282D */ daddu $a1, $s0, $zero -/* 9EBA98 802402A8 0000302D */ daddu $a2, $zero, $zero -/* 9EBA9C 802402AC 860300A8 */ lh $v1, 0xa8($s0) -/* 9EBAA0 802402B0 3C013F80 */ lui $at, 0x3f80 -/* 9EBAA4 802402B4 44810000 */ mtc1 $at, $f0 -/* 9EBAA8 802402B8 3C014000 */ lui $at, 0x4000 -/* 9EBAAC 802402BC 44811000 */ mtc1 $at, $f2 -/* 9EBAB0 802402C0 3C01C1A0 */ lui $at, 0xc1a0 -/* 9EBAB4 802402C4 44812000 */ mtc1 $at, $f4 -/* 9EBAB8 802402C8 2402000F */ addiu $v0, $zero, 0xf -/* 9EBABC 802402CC AFA2001C */ sw $v0, 0x1c($sp) -/* 9EBAC0 802402D0 44835000 */ mtc1 $v1, $f10 -/* 9EBAC4 802402D4 00000000 */ nop -/* 9EBAC8 802402D8 468052A0 */ cvt.s.w $f10, $f10 -/* 9EBACC 802402DC 44075000 */ mfc1 $a3, $f10 -/* 9EBAD0 802402E0 27A20028 */ addiu $v0, $sp, 0x28 -/* 9EBAD4 802402E4 AFA20020 */ sw $v0, 0x20($sp) -/* 9EBAD8 802402E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9EBADC 802402EC E7A20014 */ swc1 $f2, 0x14($sp) -/* 9EBAE0 802402F0 0C01BFA4 */ jal fx_emote -/* 9EBAE4 802402F4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9EBAE8 802402F8 0200202D */ daddu $a0, $s0, $zero -/* 9EBAEC 802402FC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9EBAF0 80240300 0C012530 */ jal func_800494C0 -/* 9EBAF4 80240304 3C060020 */ lui $a2, 0x20 -/* 9EBAF8 80240308 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9EBAFC 8024030C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9EBB00 80240310 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9EBB04 80240314 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9EBB08 80240318 8C460028 */ lw $a2, 0x28($v0) -/* 9EBB0C 8024031C 0C00A720 */ jal atan2 -/* 9EBB10 80240320 8C470030 */ lw $a3, 0x30($v0) -/* 9EBB14 80240324 2402000C */ addiu $v0, $zero, 0xc -/* 9EBB18 80240328 E600000C */ swc1 $f0, 0xc($s0) -/* 9EBB1C 8024032C 08090151 */ j .L80240544 -/* 9EBB20 80240330 AE620070 */ sw $v0, 0x70($s3) -.L80240334: -/* 9EBB24 80240334 8E620074 */ lw $v0, 0x74($s3) -/* 9EBB28 80240338 2442FFFF */ addiu $v0, $v0, -1 -.L8024033C: -/* 9EBB2C 8024033C AE620074 */ sw $v0, 0x74($s3) -.L80240340: -/* 9EBB30 80240340 C6000018 */ lwc1 $f0, 0x18($s0) -/* 9EBB34 80240344 44801000 */ mtc1 $zero, $f2 -/* 9EBB38 80240348 44801800 */ mtc1 $zero, $f3 -/* 9EBB3C 8024034C 46000021 */ cvt.d.s $f0, $f0 -/* 9EBB40 80240350 4620103C */ c.lt.d $f2, $f0 -/* 9EBB44 80240354 00000000 */ nop -/* 9EBB48 80240358 45000025 */ bc1f .L802403F0 -/* 9EBB4C 8024035C 27A5002C */ addiu $a1, $sp, 0x2c -/* 9EBB50 80240360 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9EBB54 80240364 860200A6 */ lh $v0, 0xa6($s0) -/* 9EBB58 80240368 3C018024 */ lui $at, 0x8024 -/* 9EBB5C 8024036C D42223B0 */ ldc1 $f2, 0x23b0($at) -/* 9EBB60 80240370 27A60030 */ addiu $a2, $sp, 0x30 -/* 9EBB64 80240374 E7A0002C */ swc1 $f0, 0x2c($sp) -/* 9EBB68 80240378 44820000 */ mtc1 $v0, $f0 -/* 9EBB6C 8024037C 00000000 */ nop -/* 9EBB70 80240380 46800020 */ cvt.s.w $f0, $f0 -/* 9EBB74 80240384 46000021 */ cvt.d.s $f0, $f0 -/* 9EBB78 80240388 C604003C */ lwc1 $f4, 0x3c($s0) -/* 9EBB7C 8024038C C6060040 */ lwc1 $f6, 0x40($s0) -/* 9EBB80 80240390 C6080018 */ lwc1 $f8, 0x18($s0) -/* 9EBB84 80240394 860200A8 */ lh $v0, 0xa8($s0) -/* 9EBB88 80240398 46220002 */ mul.d $f0, $f0, $f2 -/* 9EBB8C 8024039C 00000000 */ nop -/* 9EBB90 802403A0 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9EBB94 802403A4 E7A60034 */ swc1 $f6, 0x34($sp) -/* 9EBB98 802403A8 E7A80010 */ swc1 $f8, 0x10($sp) -/* 9EBB9C 802403AC C604000C */ lwc1 $f4, 0xc($s0) -/* 9EBBA0 802403B0 44821000 */ mtc1 $v0, $f2 -/* 9EBBA4 802403B4 00000000 */ nop -/* 9EBBA8 802403B8 468010A0 */ cvt.s.w $f2, $f2 -/* 9EBBAC 802403BC E7A20018 */ swc1 $f2, 0x18($sp) -/* 9EBBB0 802403C0 E7A40014 */ swc1 $f4, 0x14($sp) -/* 9EBBB4 802403C4 46200020 */ cvt.s.d $f0, $f0 -/* 9EBBB8 802403C8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 9EBBBC 802403CC 8E040080 */ lw $a0, 0x80($s0) -/* 9EBBC0 802403D0 0C037711 */ jal func_800DDC44 -/* 9EBBC4 802403D4 27A70034 */ addiu $a3, $sp, 0x34 -/* 9EBBC8 802403D8 54400005 */ bnel $v0, $zero, .L802403F0 -/* 9EBBCC 802403DC AE000018 */ sw $zero, 0x18($s0) -/* 9EBBD0 802403E0 8E050018 */ lw $a1, 0x18($s0) -/* 9EBBD4 802403E4 8E06000C */ lw $a2, 0xc($s0) -/* 9EBBD8 802403E8 0C00EA95 */ jal npc_move_heading -/* 9EBBDC 802403EC 0200202D */ daddu $a0, $s0, $zero -.L802403F0: -/* 9EBBE0 802403F0 C600001C */ lwc1 $f0, 0x1c($s0) -/* 9EBBE4 802403F4 44801000 */ mtc1 $zero, $f2 -/* 9EBBE8 802403F8 44801800 */ mtc1 $zero, $f3 -/* 9EBBEC 802403FC 46000021 */ cvt.d.s $f0, $f0 -/* 9EBBF0 80240400 4622003C */ c.lt.d $f0, $f2 -/* 9EBBF4 80240404 00000000 */ nop -/* 9EBBF8 80240408 45000047 */ bc1f .L80240528 -/* 9EBBFC 8024040C 27A5002C */ addiu $a1, $sp, 0x2c -/* 9EBC00 80240410 27A60030 */ addiu $a2, $sp, 0x30 -/* 9EBC04 80240414 27A20038 */ addiu $v0, $sp, 0x38 -/* 9EBC08 80240418 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9EBC0C 8024041C C6060038 */ lwc1 $f6, 0x38($s0) -/* 9EBC10 80240420 3C01402A */ lui $at, 0x402a -/* 9EBC14 80240424 4481A800 */ mtc1 $at, $f21 -/* 9EBC18 80240428 4480A000 */ mtc1 $zero, $f20 -/* 9EBC1C 8024042C 460010A1 */ cvt.d.s $f2, $f2 -/* 9EBC20 80240430 46341080 */ add.d $f2, $f2, $f20 -/* 9EBC24 80240434 C600001C */ lwc1 $f0, 0x1c($s0) -/* 9EBC28 80240438 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9EBC2C 8024043C 46000005 */ abs.s $f0, $f0 -/* 9EBC30 80240440 E7A40034 */ swc1 $f4, 0x34($sp) -/* 9EBC34 80240444 3C014030 */ lui $at, 0x4030 -/* 9EBC38 80240448 44812800 */ mtc1 $at, $f5 -/* 9EBC3C 8024044C 44802000 */ mtc1 $zero, $f4 -/* 9EBC40 80240450 46000021 */ cvt.d.s $f0, $f0 -/* 9EBC44 80240454 E7A6002C */ swc1 $f6, 0x2c($sp) -/* 9EBC48 80240458 46240000 */ add.d $f0, $f0, $f4 -/* 9EBC4C 8024045C 462010A0 */ cvt.s.d $f2, $f2 -/* 9EBC50 80240460 E7A20030 */ swc1 $f2, 0x30($sp) -/* 9EBC54 80240464 46200020 */ cvt.s.d $f0, $f0 -/* 9EBC58 80240468 E7A00038 */ swc1 $f0, 0x38($sp) -/* 9EBC5C 8024046C AFA20010 */ sw $v0, 0x10($sp) -/* 9EBC60 80240470 8E040080 */ lw $a0, 0x80($s0) -/* 9EBC64 80240474 0C0372DF */ jal func_800DCB7C -/* 9EBC68 80240478 27A70034 */ addiu $a3, $sp, 0x34 -/* 9EBC6C 8024047C 1040002A */ beqz $v0, .L80240528 -/* 9EBC70 80240480 00000000 */ nop -/* 9EBC74 80240484 C600001C */ lwc1 $f0, 0x1c($s0) -/* 9EBC78 80240488 C7A20038 */ lwc1 $f2, 0x38($sp) -/* 9EBC7C 8024048C 46000005 */ abs.s $f0, $f0 -/* 9EBC80 80240490 46000021 */ cvt.d.s $f0, $f0 -/* 9EBC84 80240494 46340000 */ add.d $f0, $f0, $f20 -/* 9EBC88 80240498 460010A1 */ cvt.d.s $f2, $f2 -/* 9EBC8C 8024049C 4620103E */ c.le.d $f2, $f0 -/* 9EBC90 802404A0 00000000 */ nop -/* 9EBC94 802404A4 45000020 */ bc1f .L80240528 -/* 9EBC98 802404A8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9EBC9C 802404AC C7A00030 */ lwc1 $f0, 0x30($sp) -/* 9EBCA0 802404B0 8E020000 */ lw $v0, ($s0) -/* 9EBCA4 802404B4 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9EBCA8 802404B8 AE00001C */ sw $zero, 0x1c($s0) -/* 9EBCAC 802404BC 00431024 */ and $v0, $v0, $v1 -/* 9EBCB0 802404C0 AE020000 */ sw $v0, ($s0) -/* 9EBCB4 802404C4 24020002 */ addiu $v0, $zero, 2 -/* 9EBCB8 802404C8 E600003C */ swc1 $f0, 0x3c($s0) -/* 9EBCBC 802404CC 0C00A67F */ jal rand_int -/* 9EBCC0 802404D0 AE620070 */ sw $v0, 0x70($s3) -/* 9EBCC4 802404D4 3C035555 */ lui $v1, 0x5555 -/* 9EBCC8 802404D8 34635556 */ ori $v1, $v1, 0x5556 -/* 9EBCCC 802404DC 00430018 */ mult $v0, $v1 -/* 9EBCD0 802404E0 000227C3 */ sra $a0, $v0, 0x1f -/* 9EBCD4 802404E4 00004010 */ mfhi $t0 -/* 9EBCD8 802404E8 01042023 */ subu $a0, $t0, $a0 -/* 9EBCDC 802404EC 00041840 */ sll $v1, $a0, 1 -/* 9EBCE0 802404F0 00641821 */ addu $v1, $v1, $a0 -/* 9EBCE4 802404F4 00431023 */ subu $v0, $v0, $v1 -/* 9EBCE8 802404F8 24430002 */ addiu $v1, $v0, 2 -/* 9EBCEC 802404FC AE630074 */ sw $v1, 0x74($s3) -/* 9EBCF0 80240500 8E82002C */ lw $v0, 0x2c($s4) -/* 9EBCF4 80240504 5840000F */ blezl $v0, .L80240544 -/* 9EBCF8 80240508 AE600070 */ sw $zero, 0x70($s3) -/* 9EBCFC 8024050C 8E820004 */ lw $v0, 4($s4) -/* 9EBD00 80240510 5840000C */ blezl $v0, .L80240544 -/* 9EBD04 80240514 AE600070 */ sw $zero, 0x70($s3) -/* 9EBD08 80240518 1460000A */ bnez $v1, .L80240544 -/* 9EBD0C 8024051C 00000000 */ nop -/* 9EBD10 80240520 08090151 */ j .L80240544 -/* 9EBD14 80240524 AE600070 */ sw $zero, 0x70($s3) -.L80240528: -/* 9EBD18 80240528 C604003C */ lwc1 $f4, 0x3c($s0) -/* 9EBD1C 8024052C C600001C */ lwc1 $f0, 0x1c($s0) -/* 9EBD20 80240530 46002100 */ add.s $f4, $f4, $f0 -/* 9EBD24 80240534 C6020014 */ lwc1 $f2, 0x14($s0) -/* 9EBD28 80240538 46020001 */ sub.s $f0, $f0, $f2 -/* 9EBD2C 8024053C E604003C */ swc1 $f4, 0x3c($s0) -/* 9EBD30 80240540 E600001C */ swc1 $f0, 0x1c($s0) -.L80240544: -/* 9EBD34 80240544 8FBF0054 */ lw $ra, 0x54($sp) -/* 9EBD38 80240548 8FB40050 */ lw $s4, 0x50($sp) -/* 9EBD3C 8024054C 8FB3004C */ lw $s3, 0x4c($sp) -/* 9EBD40 80240550 8FB20048 */ lw $s2, 0x48($sp) -/* 9EBD44 80240554 8FB10044 */ lw $s1, 0x44($sp) -/* 9EBD48 80240558 8FB00040 */ lw $s0, 0x40($sp) -/* 9EBD4C 8024055C D7B40058 */ ldc1 $f20, 0x58($sp) -/* 9EBD50 80240560 03E00008 */ jr $ra -/* 9EBD54 80240564 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_nok/nok_03/func_80240568_9EB7F0.s b/asm/nonmatchings/world/area_nok/nok_03/func_80240568_9EB7F0.s deleted file mode 100644 index 3a1108673d..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_03/func_80240568_9EB7F0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_9EBD58 -/* 9EBD58 80240568 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9EBD5C 8024056C AFB3001C */ sw $s3, 0x1c($sp) -/* 9EBD60 80240570 0080982D */ daddu $s3, $a0, $zero -/* 9EBD64 80240574 AFBF0020 */ sw $ra, 0x20($sp) -/* 9EBD68 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* 9EBD6C 8024057C AFB10014 */ sw $s1, 0x14($sp) -/* 9EBD70 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* 9EBD74 80240584 8E720148 */ lw $s2, 0x148($s3) -/* 9EBD78 80240588 86440008 */ lh $a0, 8($s2) -/* 9EBD7C 8024058C 0C00EABB */ jal get_npc_unsafe -/* 9EBD80 80240590 00A0882D */ daddu $s1, $a1, $zero -/* 9EBD84 80240594 8E240008 */ lw $a0, 8($s1) -/* 9EBD88 80240598 0040802D */ daddu $s0, $v0, $zero -/* 9EBD8C 8024059C 00041FC2 */ srl $v1, $a0, 0x1f -/* 9EBD90 802405A0 00832021 */ addu $a0, $a0, $v1 -/* 9EBD94 802405A4 00042043 */ sra $a0, $a0, 1 -/* 9EBD98 802405A8 0C00A67F */ jal rand_int -/* 9EBD9C 802405AC 24840001 */ addiu $a0, $a0, 1 -/* 9EBDA0 802405B0 8E230008 */ lw $v1, 8($s1) -/* 9EBDA4 802405B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9EBDA8 802405B8 00032FC2 */ srl $a1, $v1, 0x1f -/* 9EBDAC 802405BC 00651821 */ addu $v1, $v1, $a1 -/* 9EBDB0 802405C0 00031843 */ sra $v1, $v1, 1 -/* 9EBDB4 802405C4 00621821 */ addu $v1, $v1, $v0 -/* 9EBDB8 802405C8 0C00A67F */ jal rand_int -/* 9EBDBC 802405CC A603008E */ sh $v1, 0x8e($s0) -/* 9EBDC0 802405D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9EBDC4 802405D4 44820000 */ mtc1 $v0, $f0 -/* 9EBDC8 802405D8 00000000 */ nop -/* 9EBDCC 802405DC 46800020 */ cvt.s.w $f0, $f0 -/* 9EBDD0 802405E0 46006300 */ add.s $f12, $f12, $f0 -/* 9EBDD4 802405E4 3C0142B4 */ lui $at, 0x42b4 -/* 9EBDD8 802405E8 44810000 */ mtc1 $at, $f0 -/* 9EBDDC 802405EC 0C00A6C9 */ jal clamp_angle -/* 9EBDE0 802405F0 46006301 */ sub.s $f12, $f12, $f0 -/* 9EBDE4 802405F4 E600000C */ swc1 $f0, 0xc($s0) -/* 9EBDE8 802405F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 9EBDEC 802405FC 8C420000 */ lw $v0, ($v0) -/* 9EBDF0 80240600 AE020028 */ sw $v0, 0x28($s0) -/* 9EBDF4 80240604 24020003 */ addiu $v0, $zero, 3 -/* 9EBDF8 80240608 AE620070 */ sw $v0, 0x70($s3) -/* 9EBDFC 8024060C 8FBF0020 */ lw $ra, 0x20($sp) -/* 9EBE00 80240610 8FB3001C */ lw $s3, 0x1c($sp) -/* 9EBE04 80240614 8FB20018 */ lw $s2, 0x18($sp) -/* 9EBE08 80240618 8FB10014 */ lw $s1, 0x14($sp) -/* 9EBE0C 8024061C 8FB00010 */ lw $s0, 0x10($sp) -/* 9EBE10 80240620 03E00008 */ jr $ra -/* 9EBE14 80240624 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_03/func_80240628_9EB7F0.s b/asm/nonmatchings/world/area_nok/nok_03/func_80240628_9EB7F0.s deleted file mode 100644 index da71df6535..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_03/func_80240628_9EB7F0.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240628_9EBE18 -/* 9EBE18 80240628 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9EBE1C 8024062C AFB40040 */ sw $s4, 0x40($sp) -/* 9EBE20 80240630 0080A02D */ daddu $s4, $a0, $zero -/* 9EBE24 80240634 AFBF0044 */ sw $ra, 0x44($sp) -/* 9EBE28 80240638 AFB3003C */ sw $s3, 0x3c($sp) -/* 9EBE2C 8024063C AFB20038 */ sw $s2, 0x38($sp) -/* 9EBE30 80240640 AFB10034 */ sw $s1, 0x34($sp) -/* 9EBE34 80240644 AFB00030 */ sw $s0, 0x30($sp) -/* 9EBE38 80240648 8E920148 */ lw $s2, 0x148($s4) -/* 9EBE3C 8024064C 00A0882D */ daddu $s1, $a1, $zero -/* 9EBE40 80240650 86440008 */ lh $a0, 8($s2) -/* 9EBE44 80240654 0C00EABB */ jal get_npc_unsafe -/* 9EBE48 80240658 00C0982D */ daddu $s3, $a2, $zero -/* 9EBE4C 8024065C 8E230014 */ lw $v1, 0x14($s1) -/* 9EBE50 80240660 0460002D */ bltz $v1, .L80240718 -/* 9EBE54 80240664 0040802D */ daddu $s0, $v0, $zero -/* 9EBE58 80240668 0260202D */ daddu $a0, $s3, $zero -/* 9EBE5C 8024066C AFA00010 */ sw $zero, 0x10($sp) -/* 9EBE60 80240670 8E260024 */ lw $a2, 0x24($s1) -/* 9EBE64 80240674 8E270028 */ lw $a3, 0x28($s1) -/* 9EBE68 80240678 0C01242D */ jal func_800490B4 -/* 9EBE6C 8024067C 0240282D */ daddu $a1, $s2, $zero -/* 9EBE70 80240680 10400025 */ beqz $v0, .L80240718 -/* 9EBE74 80240684 0000202D */ daddu $a0, $zero, $zero -/* 9EBE78 80240688 0200282D */ daddu $a1, $s0, $zero -/* 9EBE7C 8024068C 0000302D */ daddu $a2, $zero, $zero -/* 9EBE80 80240690 860300A8 */ lh $v1, 0xa8($s0) -/* 9EBE84 80240694 3C013F80 */ lui $at, 0x3f80 -/* 9EBE88 80240698 44810000 */ mtc1 $at, $f0 -/* 9EBE8C 8024069C 3C014000 */ lui $at, 0x4000 -/* 9EBE90 802406A0 44811000 */ mtc1 $at, $f2 -/* 9EBE94 802406A4 3C01C1A0 */ lui $at, 0xc1a0 -/* 9EBE98 802406A8 44812000 */ mtc1 $at, $f4 -/* 9EBE9C 802406AC 2402000F */ addiu $v0, $zero, 0xf -/* 9EBEA0 802406B0 AFA2001C */ sw $v0, 0x1c($sp) -/* 9EBEA4 802406B4 44833000 */ mtc1 $v1, $f6 -/* 9EBEA8 802406B8 00000000 */ nop -/* 9EBEAC 802406BC 468031A0 */ cvt.s.w $f6, $f6 -/* 9EBEB0 802406C0 44073000 */ mfc1 $a3, $f6 -/* 9EBEB4 802406C4 27A20028 */ addiu $v0, $sp, 0x28 -/* 9EBEB8 802406C8 AFA20020 */ sw $v0, 0x20($sp) -/* 9EBEBC 802406CC E7A00010 */ swc1 $f0, 0x10($sp) -/* 9EBEC0 802406D0 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9EBEC4 802406D4 0C01BFA4 */ jal fx_emote -/* 9EBEC8 802406D8 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9EBECC 802406DC 0200202D */ daddu $a0, $s0, $zero -/* 9EBED0 802406E0 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9EBED4 802406E4 0C012530 */ jal func_800494C0 -/* 9EBED8 802406E8 3C060020 */ lui $a2, 0x20 -/* 9EBEDC 802406EC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9EBEE0 802406F0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9EBEE4 802406F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9EBEE8 802406F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9EBEEC 802406FC 8C460028 */ lw $a2, 0x28($v0) -/* 9EBEF0 80240700 0C00A720 */ jal atan2 -/* 9EBEF4 80240704 8C470030 */ lw $a3, 0x30($v0) -/* 9EBEF8 80240708 2402000C */ addiu $v0, $zero, 0xc -/* 9EBEFC 8024070C E600000C */ swc1 $f0, 0xc($s0) -/* 9EBF00 80240710 080901EB */ j .L802407AC -/* 9EBF04 80240714 AE820070 */ sw $v0, 0x70($s4) -.L80240718: -/* 9EBF08 80240718 8602008C */ lh $v0, 0x8c($s0) -/* 9EBF0C 8024071C 14400023 */ bnez $v0, .L802407AC -/* 9EBF10 80240720 00000000 */ nop -/* 9EBF14 80240724 9602008E */ lhu $v0, 0x8e($s0) -/* 9EBF18 80240728 2442FFFF */ addiu $v0, $v0, -1 -/* 9EBF1C 8024072C A602008E */ sh $v0, 0x8e($s0) -/* 9EBF20 80240730 00021400 */ sll $v0, $v0, 0x10 -/* 9EBF24 80240734 1C40001D */ bgtz $v0, .L802407AC -/* 9EBF28 80240738 00000000 */ nop -/* 9EBF2C 8024073C 8E820074 */ lw $v0, 0x74($s4) -/* 9EBF30 80240740 2442FFFF */ addiu $v0, $v0, -1 -/* 9EBF34 80240744 18400018 */ blez $v0, .L802407A8 -/* 9EBF38 80240748 AE820074 */ sw $v0, 0x74($s4) -/* 9EBF3C 8024074C C600000C */ lwc1 $f0, 0xc($s0) -/* 9EBF40 80240750 3C014334 */ lui $at, 0x4334 -/* 9EBF44 80240754 44816000 */ mtc1 $at, $f12 -/* 9EBF48 80240758 0C00A6C9 */ jal clamp_angle -/* 9EBF4C 8024075C 460C0300 */ add.s $f12, $f0, $f12 -/* 9EBF50 80240760 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9EBF54 80240764 0C00A67F */ jal rand_int -/* 9EBF58 80240768 E600000C */ swc1 $f0, 0xc($s0) -/* 9EBF5C 8024076C 3C032E8B */ lui $v1, 0x2e8b -/* 9EBF60 80240770 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 9EBF64 80240774 00430018 */ mult $v0, $v1 -/* 9EBF68 80240778 00021FC3 */ sra $v1, $v0, 0x1f -/* 9EBF6C 8024077C 00004010 */ mfhi $t0 -/* 9EBF70 80240780 00082043 */ sra $a0, $t0, 1 -/* 9EBF74 80240784 00832023 */ subu $a0, $a0, $v1 -/* 9EBF78 80240788 00041840 */ sll $v1, $a0, 1 -/* 9EBF7C 8024078C 00641821 */ addu $v1, $v1, $a0 -/* 9EBF80 80240790 00031880 */ sll $v1, $v1, 2 -/* 9EBF84 80240794 00641823 */ subu $v1, $v1, $a0 -/* 9EBF88 80240798 00431023 */ subu $v0, $v0, $v1 -/* 9EBF8C 8024079C 24420005 */ addiu $v0, $v0, 5 -/* 9EBF90 802407A0 080901EB */ j .L802407AC -/* 9EBF94 802407A4 A602008E */ sh $v0, 0x8e($s0) -.L802407A8: -/* 9EBF98 802407A8 AE800070 */ sw $zero, 0x70($s4) -.L802407AC: -/* 9EBF9C 802407AC 8FBF0044 */ lw $ra, 0x44($sp) -/* 9EBFA0 802407B0 8FB40040 */ lw $s4, 0x40($sp) -/* 9EBFA4 802407B4 8FB3003C */ lw $s3, 0x3c($sp) -/* 9EBFA8 802407B8 8FB20038 */ lw $s2, 0x38($sp) -/* 9EBFAC 802407BC 8FB10034 */ lw $s1, 0x34($sp) -/* 9EBFB0 802407C0 8FB00030 */ lw $s0, 0x30($sp) -/* 9EBFB4 802407C4 03E00008 */ jr $ra -/* 9EBFB8 802407C8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_03/func_802407CC_9EB7F0.s b/asm/nonmatchings/world/area_nok/nok_03/func_802407CC_9EB7F0.s deleted file mode 100644 index 076ba773e1..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_03/func_802407CC_9EB7F0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407CC_9EBFBC -/* 9EBFBC 802407CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9EBFC0 802407D0 AFB10014 */ sw $s1, 0x14($sp) -/* 9EBFC4 802407D4 0080882D */ daddu $s1, $a0, $zero -/* 9EBFC8 802407D8 AFBF001C */ sw $ra, 0x1c($sp) -/* 9EBFCC 802407DC AFB20018 */ sw $s2, 0x18($sp) -/* 9EBFD0 802407E0 AFB00010 */ sw $s0, 0x10($sp) -/* 9EBFD4 802407E4 8E220148 */ lw $v0, 0x148($s1) -/* 9EBFD8 802407E8 00A0902D */ daddu $s2, $a1, $zero -/* 9EBFDC 802407EC 84440008 */ lh $a0, 8($v0) -/* 9EBFE0 802407F0 0C00EABB */ jal get_npc_unsafe -/* 9EBFE4 802407F4 00C0802D */ daddu $s0, $a2, $zero -/* 9EBFE8 802407F8 0220202D */ daddu $a0, $s1, $zero -/* 9EBFEC 802407FC 0240282D */ daddu $a1, $s2, $zero -/* 9EBFF0 80240800 0200302D */ daddu $a2, $s0, $zero -/* 9EBFF4 80240804 0C0127DF */ jal func_80049F7C -/* 9EBFF8 80240808 0040802D */ daddu $s0, $v0, $zero -/* 9EBFFC 8024080C 8E020000 */ lw $v0, ($s0) -/* 9EC000 80240810 24040005 */ addiu $a0, $zero, 5 -/* 9EC004 80240814 34420800 */ ori $v0, $v0, 0x800 -/* 9EC008 80240818 0C00A67F */ jal rand_int -/* 9EC00C 8024081C AE020000 */ sw $v0, ($s0) -/* 9EC010 80240820 44820000 */ mtc1 $v0, $f0 -/* 9EC014 80240824 00000000 */ nop -/* 9EC018 80240828 46800021 */ cvt.d.w $f0, $f0 -/* 9EC01C 8024082C 3C014024 */ lui $at, 0x4024 -/* 9EC020 80240830 44811800 */ mtc1 $at, $f3 -/* 9EC024 80240834 44801000 */ mtc1 $zero, $f2 -/* 9EC028 80240838 3C013FC0 */ lui $at, 0x3fc0 -/* 9EC02C 8024083C 44812000 */ mtc1 $at, $f4 -/* 9EC030 80240840 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9EC034 80240844 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9EC038 80240848 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9EC03C 8024084C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9EC040 80240850 46220000 */ add.d $f0, $f0, $f2 -/* 9EC044 80240854 E6040014 */ swc1 $f4, 0x14($s0) -/* 9EC048 80240858 46200020 */ cvt.s.d $f0, $f0 -/* 9EC04C 8024085C E600001C */ swc1 $f0, 0x1c($s0) -/* 9EC050 80240860 8C460028 */ lw $a2, 0x28($v0) -/* 9EC054 80240864 0C00A720 */ jal atan2 -/* 9EC058 80240868 8C470030 */ lw $a3, 0x30($v0) -/* 9EC05C 8024086C 0200202D */ daddu $a0, $s0, $zero -/* 9EC060 80240870 3C05B000 */ lui $a1, 0xb000 -/* 9EC064 80240874 34A50017 */ ori $a1, $a1, 0x17 -/* 9EC068 80240878 0000302D */ daddu $a2, $zero, $zero -/* 9EC06C 8024087C E480000C */ swc1 $f0, 0xc($a0) -/* 9EC070 80240880 C6400018 */ lwc1 $f0, 0x18($s2) -/* 9EC074 80240884 2402000D */ addiu $v0, $zero, 0xd -/* 9EC078 80240888 E4800018 */ swc1 $f0, 0x18($a0) -/* 9EC07C 8024088C 0C012530 */ jal func_800494C0 -/* 9EC080 80240890 AE220070 */ sw $v0, 0x70($s1) -/* 9EC084 80240894 8FBF001C */ lw $ra, 0x1c($sp) -/* 9EC088 80240898 8FB20018 */ lw $s2, 0x18($sp) -/* 9EC08C 8024089C 8FB10014 */ lw $s1, 0x14($sp) -/* 9EC090 802408A0 8FB00010 */ lw $s0, 0x10($sp) -/* 9EC094 802408A4 03E00008 */ jr $ra -/* 9EC098 802408A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_03/func_802408AC_9EB7F0.s b/asm/nonmatchings/world/area_nok/nok_03/func_802408AC_9EB7F0.s deleted file mode 100644 index e8261fdded..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_03/func_802408AC_9EB7F0.s +++ /dev/null @@ -1,200 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408AC_9EC09C -/* 9EC09C 802408AC 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9EC0A0 802408B0 AFB40050 */ sw $s4, 0x50($sp) -/* 9EC0A4 802408B4 0080A02D */ daddu $s4, $a0, $zero -/* 9EC0A8 802408B8 AFBF0060 */ sw $ra, 0x60($sp) -/* 9EC0AC 802408BC AFB7005C */ sw $s7, 0x5c($sp) -/* 9EC0B0 802408C0 AFB60058 */ sw $s6, 0x58($sp) -/* 9EC0B4 802408C4 AFB50054 */ sw $s5, 0x54($sp) -/* 9EC0B8 802408C8 AFB3004C */ sw $s3, 0x4c($sp) -/* 9EC0BC 802408CC AFB20048 */ sw $s2, 0x48($sp) -/* 9EC0C0 802408D0 AFB10044 */ sw $s1, 0x44($sp) -/* 9EC0C4 802408D4 AFB00040 */ sw $s0, 0x40($sp) -/* 9EC0C8 802408D8 F7B40068 */ sdc1 $f20, 0x68($sp) -/* 9EC0CC 802408DC 8E950148 */ lw $s5, 0x148($s4) -/* 9EC0D0 802408E0 00A0B02D */ daddu $s6, $a1, $zero -/* 9EC0D4 802408E4 86A40008 */ lh $a0, 8($s5) -/* 9EC0D8 802408E8 0C00EABB */ jal get_npc_unsafe -/* 9EC0DC 802408EC 00C0B82D */ daddu $s7, $a2, $zero -/* 9EC0E0 802408F0 0040982D */ daddu $s3, $v0, $zero -/* 9EC0E4 802408F4 C6600018 */ lwc1 $f0, 0x18($s3) -/* 9EC0E8 802408F8 44801000 */ mtc1 $zero, $f2 -/* 9EC0EC 802408FC 44801800 */ mtc1 $zero, $f3 -/* 9EC0F0 80240900 46000021 */ cvt.d.s $f0, $f0 -/* 9EC0F4 80240904 4620103C */ c.lt.d $f2, $f0 -/* 9EC0F8 80240908 00000000 */ nop -/* 9EC0FC 8024090C 45000021 */ bc1f .L80240994 -/* 9EC100 80240910 27A50028 */ addiu $a1, $sp, 0x28 -/* 9EC104 80240914 C6600038 */ lwc1 $f0, 0x38($s3) -/* 9EC108 80240918 C662003C */ lwc1 $f2, 0x3c($s3) -/* 9EC10C 8024091C C6640040 */ lwc1 $f4, 0x40($s3) -/* 9EC110 80240920 C6660018 */ lwc1 $f6, 0x18($s3) -/* 9EC114 80240924 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9EC118 80240928 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9EC11C 8024092C E7A40030 */ swc1 $f4, 0x30($sp) -/* 9EC120 80240930 E7A60010 */ swc1 $f6, 0x10($sp) -/* 9EC124 80240934 C660000C */ lwc1 $f0, 0xc($s3) -/* 9EC128 80240938 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9EC12C 8024093C 866200A8 */ lh $v0, 0xa8($s3) -/* 9EC130 80240940 44820000 */ mtc1 $v0, $f0 -/* 9EC134 80240944 00000000 */ nop -/* 9EC138 80240948 46800020 */ cvt.s.w $f0, $f0 -/* 9EC13C 8024094C E7A00018 */ swc1 $f0, 0x18($sp) -/* 9EC140 80240950 866200A6 */ lh $v0, 0xa6($s3) -/* 9EC144 80240954 27A6002C */ addiu $a2, $sp, 0x2c -/* 9EC148 80240958 44820000 */ mtc1 $v0, $f0 -/* 9EC14C 8024095C 00000000 */ nop -/* 9EC150 80240960 46800020 */ cvt.s.w $f0, $f0 -/* 9EC154 80240964 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 9EC158 80240968 8E640080 */ lw $a0, 0x80($s3) -/* 9EC15C 8024096C 0C037711 */ jal func_800DDC44 -/* 9EC160 80240970 27A70030 */ addiu $a3, $sp, 0x30 -/* 9EC164 80240974 10400003 */ beqz $v0, .L80240984 -/* 9EC168 80240978 00000000 */ nop -/* 9EC16C 8024097C 08090265 */ j .L80240994 -/* 9EC170 80240980 AE600018 */ sw $zero, 0x18($s3) -.L80240984: -/* 9EC174 80240984 8E650018 */ lw $a1, 0x18($s3) -/* 9EC178 80240988 8E66000C */ lw $a2, 0xc($s3) -/* 9EC17C 8024098C 0C00EA95 */ jal npc_move_heading -/* 9EC180 80240990 0260202D */ daddu $a0, $s3, $zero -.L80240994: -/* 9EC184 80240994 C660001C */ lwc1 $f0, 0x1c($s3) -/* 9EC188 80240998 44801000 */ mtc1 $zero, $f2 -/* 9EC18C 8024099C 44801800 */ mtc1 $zero, $f3 -/* 9EC190 802409A0 46000021 */ cvt.d.s $f0, $f0 -/* 9EC194 802409A4 4622003C */ c.lt.d $f0, $f2 -/* 9EC198 802409A8 00000000 */ nop -/* 9EC19C 802409AC 4500006C */ bc1f .L80240B60 -/* 9EC1A0 802409B0 27B00028 */ addiu $s0, $sp, 0x28 -/* 9EC1A4 802409B4 0200282D */ daddu $a1, $s0, $zero -/* 9EC1A8 802409B8 27A60034 */ addiu $a2, $sp, 0x34 -/* 9EC1AC 802409BC 27B20038 */ addiu $s2, $sp, 0x38 -/* 9EC1B0 802409C0 C6600038 */ lwc1 $f0, 0x38($s3) -/* 9EC1B4 802409C4 3C0142C8 */ lui $at, 0x42c8 -/* 9EC1B8 802409C8 44811000 */ mtc1 $at, $f2 -/* 9EC1BC 802409CC C6640040 */ lwc1 $f4, 0x40($s3) -/* 9EC1C0 802409D0 3C01447A */ lui $at, 0x447a -/* 9EC1C4 802409D4 44813000 */ mtc1 $at, $f6 -/* 9EC1C8 802409D8 27B10030 */ addiu $s1, $sp, 0x30 -/* 9EC1CC 802409DC E7A00028 */ swc1 $f0, 0x28($sp) -/* 9EC1D0 802409E0 E7A20034 */ swc1 $f2, 0x34($sp) -/* 9EC1D4 802409E4 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9EC1D8 802409E8 E7A60038 */ swc1 $f6, 0x38($sp) -/* 9EC1DC 802409EC AFB20010 */ sw $s2, 0x10($sp) -/* 9EC1E0 802409F0 8E640080 */ lw $a0, 0x80($s3) -/* 9EC1E4 802409F4 0C0372DF */ jal func_800DCB7C -/* 9EC1E8 802409F8 0220382D */ daddu $a3, $s1, $zero -/* 9EC1EC 802409FC 0200282D */ daddu $a1, $s0, $zero -/* 9EC1F0 80240A00 27A6002C */ addiu $a2, $sp, 0x2c -/* 9EC1F4 80240A04 C662003C */ lwc1 $f2, 0x3c($s3) -/* 9EC1F8 80240A08 C6660038 */ lwc1 $f6, 0x38($s3) -/* 9EC1FC 80240A0C 3C01402A */ lui $at, 0x402a -/* 9EC200 80240A10 4481A800 */ mtc1 $at, $f21 -/* 9EC204 80240A14 4480A000 */ mtc1 $zero, $f20 -/* 9EC208 80240A18 460010A1 */ cvt.d.s $f2, $f2 -/* 9EC20C 80240A1C 46341080 */ add.d $f2, $f2, $f20 -/* 9EC210 80240A20 C660001C */ lwc1 $f0, 0x1c($s3) -/* 9EC214 80240A24 C6640040 */ lwc1 $f4, 0x40($s3) -/* 9EC218 80240A28 46000005 */ abs.s $f0, $f0 -/* 9EC21C 80240A2C E7A40030 */ swc1 $f4, 0x30($sp) -/* 9EC220 80240A30 3C014030 */ lui $at, 0x4030 -/* 9EC224 80240A34 44812800 */ mtc1 $at, $f5 -/* 9EC228 80240A38 44802000 */ mtc1 $zero, $f4 -/* 9EC22C 80240A3C 46000021 */ cvt.d.s $f0, $f0 -/* 9EC230 80240A40 E7A60028 */ swc1 $f6, 0x28($sp) -/* 9EC234 80240A44 46240000 */ add.d $f0, $f0, $f4 -/* 9EC238 80240A48 462010A0 */ cvt.s.d $f2, $f2 -/* 9EC23C 80240A4C E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9EC240 80240A50 46200020 */ cvt.s.d $f0, $f0 -/* 9EC244 80240A54 E7A00038 */ swc1 $f0, 0x38($sp) -/* 9EC248 80240A58 AFB20010 */ sw $s2, 0x10($sp) -/* 9EC24C 80240A5C 8E640080 */ lw $a0, 0x80($s3) -/* 9EC250 80240A60 0C0372DF */ jal func_800DCB7C -/* 9EC254 80240A64 0220382D */ daddu $a3, $s1, $zero -/* 9EC258 80240A68 1040003D */ beqz $v0, .L80240B60 -/* 9EC25C 80240A6C 00000000 */ nop -/* 9EC260 80240A70 C660001C */ lwc1 $f0, 0x1c($s3) -/* 9EC264 80240A74 C7A20038 */ lwc1 $f2, 0x38($sp) -/* 9EC268 80240A78 46000005 */ abs.s $f0, $f0 -/* 9EC26C 80240A7C 46000021 */ cvt.d.s $f0, $f0 -/* 9EC270 80240A80 46340000 */ add.d $f0, $f0, $f20 -/* 9EC274 80240A84 460010A1 */ cvt.d.s $f2, $f2 -/* 9EC278 80240A88 4620103E */ c.le.d $f2, $f0 -/* 9EC27C 80240A8C 00000000 */ nop -/* 9EC280 80240A90 45000033 */ bc1f .L80240B60 -/* 9EC284 80240A94 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9EC288 80240A98 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 9EC28C 80240A9C 8E620000 */ lw $v0, ($s3) -/* 9EC290 80240AA0 AE60001C */ sw $zero, 0x1c($s3) -/* 9EC294 80240AA4 00431024 */ and $v0, $v0, $v1 -/* 9EC298 80240AA8 E660003C */ swc1 $f0, 0x3c($s3) -/* 9EC29C 80240AAC AE620000 */ sw $v0, ($s3) -/* 9EC2A0 80240AB0 AFA00010 */ sw $zero, 0x10($sp) -/* 9EC2A4 80240AB4 AFA00014 */ sw $zero, 0x14($sp) -/* 9EC2A8 80240AB8 8E650038 */ lw $a1, 0x38($s3) -/* 9EC2AC 80240ABC 8E66003C */ lw $a2, 0x3c($s3) -/* 9EC2B0 80240AC0 8E670040 */ lw $a3, 0x40($s3) -/* 9EC2B4 80240AC4 0C01BECC */ jal fx_walk_normal -/* 9EC2B8 80240AC8 24040002 */ addiu $a0, $zero, 2 -/* 9EC2BC 80240ACC 02E0202D */ daddu $a0, $s7, $zero -/* 9EC2C0 80240AD0 2402000C */ addiu $v0, $zero, 0xc -/* 9EC2C4 80240AD4 AE820070 */ sw $v0, 0x70($s4) -/* 9EC2C8 80240AD8 24020001 */ addiu $v0, $zero, 1 -/* 9EC2CC 80240ADC AFA20010 */ sw $v0, 0x10($sp) -/* 9EC2D0 80240AE0 8EC60024 */ lw $a2, 0x24($s6) -/* 9EC2D4 80240AE4 8EC70028 */ lw $a3, 0x28($s6) -/* 9EC2D8 80240AE8 0C01242D */ jal func_800490B4 -/* 9EC2DC 80240AEC 02A0282D */ daddu $a1, $s5, $zero -/* 9EC2E0 80240AF0 14400022 */ bnez $v0, .L80240B7C -/* 9EC2E4 80240AF4 24040002 */ addiu $a0, $zero, 2 -/* 9EC2E8 80240AF8 0260282D */ daddu $a1, $s3, $zero -/* 9EC2EC 80240AFC 0000302D */ daddu $a2, $zero, $zero -/* 9EC2F0 80240B00 866300A8 */ lh $v1, 0xa8($s3) -/* 9EC2F4 80240B04 3C013F80 */ lui $at, 0x3f80 -/* 9EC2F8 80240B08 44810000 */ mtc1 $at, $f0 -/* 9EC2FC 80240B0C 3C014000 */ lui $at, 0x4000 -/* 9EC300 80240B10 44811000 */ mtc1 $at, $f2 -/* 9EC304 80240B14 3C01C1A0 */ lui $at, 0xc1a0 -/* 9EC308 80240B18 44812000 */ mtc1 $at, $f4 -/* 9EC30C 80240B1C 2402000F */ addiu $v0, $zero, 0xf -/* 9EC310 80240B20 AFA2001C */ sw $v0, 0x1c($sp) -/* 9EC314 80240B24 44834000 */ mtc1 $v1, $f8 -/* 9EC318 80240B28 00000000 */ nop -/* 9EC31C 80240B2C 46804220 */ cvt.s.w $f8, $f8 -/* 9EC320 80240B30 44074000 */ mfc1 $a3, $f8 -/* 9EC324 80240B34 27A2003C */ addiu $v0, $sp, 0x3c -/* 9EC328 80240B38 AFA20020 */ sw $v0, 0x20($sp) -/* 9EC32C 80240B3C E7A00010 */ swc1 $f0, 0x10($sp) -/* 9EC330 80240B40 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9EC334 80240B44 0C01BFA4 */ jal fx_emote -/* 9EC338 80240B48 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9EC33C 80240B4C 24020019 */ addiu $v0, $zero, 0x19 -/* 9EC340 80240B50 A662008E */ sh $v0, 0x8e($s3) -/* 9EC344 80240B54 2402000E */ addiu $v0, $zero, 0xe -/* 9EC348 80240B58 080902DF */ j .L80240B7C -/* 9EC34C 80240B5C AE820070 */ sw $v0, 0x70($s4) -.L80240B60: -/* 9EC350 80240B60 C664003C */ lwc1 $f4, 0x3c($s3) -/* 9EC354 80240B64 C660001C */ lwc1 $f0, 0x1c($s3) -/* 9EC358 80240B68 46002100 */ add.s $f4, $f4, $f0 -/* 9EC35C 80240B6C C6620014 */ lwc1 $f2, 0x14($s3) -/* 9EC360 80240B70 46020001 */ sub.s $f0, $f0, $f2 -/* 9EC364 80240B74 E664003C */ swc1 $f4, 0x3c($s3) -/* 9EC368 80240B78 E660001C */ swc1 $f0, 0x1c($s3) -.L80240B7C: -/* 9EC36C 80240B7C 8FBF0060 */ lw $ra, 0x60($sp) -/* 9EC370 80240B80 8FB7005C */ lw $s7, 0x5c($sp) -/* 9EC374 80240B84 8FB60058 */ lw $s6, 0x58($sp) -/* 9EC378 80240B88 8FB50054 */ lw $s5, 0x54($sp) -/* 9EC37C 80240B8C 8FB40050 */ lw $s4, 0x50($sp) -/* 9EC380 80240B90 8FB3004C */ lw $s3, 0x4c($sp) -/* 9EC384 80240B94 8FB20048 */ lw $s2, 0x48($sp) -/* 9EC388 80240B98 8FB10044 */ lw $s1, 0x44($sp) -/* 9EC38C 80240B9C 8FB00040 */ lw $s0, 0x40($sp) -/* 9EC390 80240BA0 D7B40068 */ ldc1 $f20, 0x68($sp) -/* 9EC394 80240BA4 03E00008 */ jr $ra -/* 9EC398 80240BA8 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_nok/nok_03/func_80240BAC_9EB7F0.s b/asm/nonmatchings/world/area_nok/nok_03/func_80240BAC_9EB7F0.s deleted file mode 100644 index ef7f03f1ee..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_03/func_80240BAC_9EB7F0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BAC_9EC39C -/* 9EC39C 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9EC3A0 80240BB0 AFB00010 */ sw $s0, 0x10($sp) -/* 9EC3A4 80240BB4 0080802D */ daddu $s0, $a0, $zero -/* 9EC3A8 80240BB8 AFBF0014 */ sw $ra, 0x14($sp) -/* 9EC3AC 80240BBC 8E020148 */ lw $v0, 0x148($s0) -/* 9EC3B0 80240BC0 0C00EABB */ jal get_npc_unsafe -/* 9EC3B4 80240BC4 84440008 */ lh $a0, 8($v0) -/* 9EC3B8 80240BC8 9443008E */ lhu $v1, 0x8e($v0) -/* 9EC3BC 80240BCC 2463FFFF */ addiu $v1, $v1, -1 -/* 9EC3C0 80240BD0 A443008E */ sh $v1, 0x8e($v0) -/* 9EC3C4 80240BD4 00031C00 */ sll $v1, $v1, 0x10 -/* 9EC3C8 80240BD8 58600001 */ blezl $v1, .L80240BE0 -/* 9EC3CC 80240BDC AE000070 */ sw $zero, 0x70($s0) -.L80240BE0: -/* 9EC3D0 80240BE0 8FBF0014 */ lw $ra, 0x14($sp) -/* 9EC3D4 80240BE4 8FB00010 */ lw $s0, 0x10($sp) -/* 9EC3D8 80240BE8 03E00008 */ jr $ra -/* 9EC3DC 80240BEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_03/func_80240BF0_9EB7F0.s b/asm/nonmatchings/world/area_nok/nok_03/func_80240BF0_9EB7F0.s deleted file mode 100644 index 0eac6f1d19..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_03/func_80240BF0_9EB7F0.s +++ /dev/null @@ -1,148 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BF0_9EC3E0 -/* 9EC3E0 80240BF0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9EC3E4 80240BF4 AFB3003C */ sw $s3, 0x3c($sp) -/* 9EC3E8 80240BF8 0080982D */ daddu $s3, $a0, $zero -/* 9EC3EC 80240BFC AFBF0048 */ sw $ra, 0x48($sp) -/* 9EC3F0 80240C00 AFB50044 */ sw $s5, 0x44($sp) -/* 9EC3F4 80240C04 AFB40040 */ sw $s4, 0x40($sp) -/* 9EC3F8 80240C08 AFB20038 */ sw $s2, 0x38($sp) -/* 9EC3FC 80240C0C AFB10034 */ sw $s1, 0x34($sp) -/* 9EC400 80240C10 AFB00030 */ sw $s0, 0x30($sp) -/* 9EC404 80240C14 8E720148 */ lw $s2, 0x148($s3) -/* 9EC408 80240C18 86440008 */ lh $a0, 8($s2) -/* 9EC40C 80240C1C 8E70000C */ lw $s0, 0xc($s3) -/* 9EC410 80240C20 0C00EABB */ jal get_npc_unsafe -/* 9EC414 80240C24 00A0882D */ daddu $s1, $a1, $zero -/* 9EC418 80240C28 8E050000 */ lw $a1, ($s0) -/* 9EC41C 80240C2C 26100004 */ addiu $s0, $s0, 4 -/* 9EC420 80240C30 0260202D */ daddu $a0, $s3, $zero -/* 9EC424 80240C34 0C0B1EAF */ jal get_variable -/* 9EC428 80240C38 0040A82D */ daddu $s5, $v0, $zero -/* 9EC42C 80240C3C 0260202D */ daddu $a0, $s3, $zero -/* 9EC430 80240C40 8E050000 */ lw $a1, ($s0) -/* 9EC434 80240C44 0C0B1EAF */ jal get_variable -/* 9EC438 80240C48 0040A02D */ daddu $s4, $v0, $zero -/* 9EC43C 80240C4C AE420094 */ sw $v0, 0x94($s2) -/* 9EC440 80240C50 AFA00010 */ sw $zero, 0x10($sp) -/* 9EC444 80240C54 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9EC448 80240C58 8C420030 */ lw $v0, 0x30($v0) -/* 9EC44C 80240C5C AFA20014 */ sw $v0, 0x14($sp) -/* 9EC450 80240C60 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9EC454 80240C64 8C42001C */ lw $v0, 0x1c($v0) -/* 9EC458 80240C68 AFA20018 */ sw $v0, 0x18($sp) -/* 9EC45C 80240C6C 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9EC460 80240C70 8C420024 */ lw $v0, 0x24($v0) -/* 9EC464 80240C74 AFA2001C */ sw $v0, 0x1c($sp) -/* 9EC468 80240C78 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9EC46C 80240C7C 8C420028 */ lw $v0, 0x28($v0) -/* 9EC470 80240C80 AFA20020 */ sw $v0, 0x20($sp) -/* 9EC474 80240C84 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9EC478 80240C88 3C0142C8 */ lui $at, 0x42c8 -/* 9EC47C 80240C8C 44810000 */ mtc1 $at, $f0 -/* 9EC480 80240C90 8C42002C */ lw $v0, 0x2c($v0) -/* 9EC484 80240C94 27B00010 */ addiu $s0, $sp, 0x10 -/* 9EC488 80240C98 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9EC48C 80240C9C A7A0002C */ sh $zero, 0x2c($sp) -/* 9EC490 80240CA0 12200019 */ beqz $s1, .L80240D08 -/* 9EC494 80240CA4 AFA20024 */ sw $v0, 0x24($sp) -/* 9EC498 80240CA8 AE600070 */ sw $zero, 0x70($s3) -/* 9EC49C 80240CAC A6A0008E */ sh $zero, 0x8e($s5) -/* 9EC4A0 80240CB0 AE600074 */ sw $zero, 0x74($s3) -/* 9EC4A4 80240CB4 8EA20000 */ lw $v0, ($s5) -/* 9EC4A8 80240CB8 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9EC4AC 80240CBC 00431024 */ and $v0, $v0, $v1 -/* 9EC4B0 80240CC0 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9EC4B4 80240CC4 00431024 */ and $v0, $v0, $v1 -/* 9EC4B8 80240CC8 34420008 */ ori $v0, $v0, 8 -/* 9EC4BC 80240CCC AEA20000 */ sw $v0, ($s5) -/* 9EC4C0 80240CD0 8E4200B0 */ lw $v0, 0xb0($s2) -/* 9EC4C4 80240CD4 34420018 */ ori $v0, $v0, 0x18 -/* 9EC4C8 80240CD8 AE4200B0 */ sw $v0, 0xb0($s2) -/* 9EC4CC 80240CDC 8E420000 */ lw $v0, ($s2) -/* 9EC4D0 80240CE0 3C034000 */ lui $v1, 0x4000 -/* 9EC4D4 80240CE4 00431024 */ and $v0, $v0, $v1 -/* 9EC4D8 80240CE8 10400007 */ beqz $v0, .L80240D08 -/* 9EC4DC 80240CEC 3C03BFFF */ lui $v1, 0xbfff -/* 9EC4E0 80240CF0 2402000C */ addiu $v0, $zero, 0xc -/* 9EC4E4 80240CF4 AE620070 */ sw $v0, 0x70($s3) -/* 9EC4E8 80240CF8 8E420000 */ lw $v0, ($s2) -/* 9EC4EC 80240CFC 3463FFFF */ ori $v1, $v1, 0xffff -/* 9EC4F0 80240D00 00431024 */ and $v0, $v0, $v1 -/* 9EC4F4 80240D04 AE420000 */ sw $v0, ($s2) -.L80240D08: -/* 9EC4F8 80240D08 8E4300B0 */ lw $v1, 0xb0($s2) -/* 9EC4FC 80240D0C 30620004 */ andi $v0, $v1, 4 -/* 9EC500 80240D10 10400007 */ beqz $v0, .L80240D30 -/* 9EC504 80240D14 00000000 */ nop -/* 9EC508 80240D18 824200B4 */ lb $v0, 0xb4($s2) -/* 9EC50C 80240D1C 14400034 */ bnez $v0, .L80240DF0 -/* 9EC510 80240D20 0000102D */ daddu $v0, $zero, $zero -/* 9EC514 80240D24 2402FFFB */ addiu $v0, $zero, -5 -/* 9EC518 80240D28 00621024 */ and $v0, $v1, $v0 -/* 9EC51C 80240D2C AE4200B0 */ sw $v0, 0xb0($s2) -.L80240D30: -/* 9EC520 80240D30 8E630070 */ lw $v1, 0x70($s3) -/* 9EC524 80240D34 2C62000F */ sltiu $v0, $v1, 0xf -/* 9EC528 80240D38 1040002C */ beqz $v0, .L80240DEC -/* 9EC52C 80240D3C 00031080 */ sll $v0, $v1, 2 -/* 9EC530 80240D40 3C018024 */ lui $at, 0x8024 -/* 9EC534 80240D44 00220821 */ addu $at, $at, $v0 -/* 9EC538 80240D48 8C2223B8 */ lw $v0, 0x23b8($at) -/* 9EC53C 80240D4C 00400008 */ jr $v0 -/* 9EC540 80240D50 00000000 */ nop -/* 9EC544 80240D54 0260202D */ daddu $a0, $s3, $zero -/* 9EC548 80240D58 0280282D */ daddu $a1, $s4, $zero -/* 9EC54C 80240D5C 0C090000 */ jal func_80240000 -/* 9EC550 80240D60 0200302D */ daddu $a2, $s0, $zero -/* 9EC554 80240D64 0260202D */ daddu $a0, $s3, $zero -/* 9EC558 80240D68 0280282D */ daddu $a1, $s4, $zero -/* 9EC55C 80240D6C 0C09008C */ jal func_80240230 -/* 9EC560 80240D70 0200302D */ daddu $a2, $s0, $zero -/* 9EC564 80240D74 0809037C */ j .L80240DF0 -/* 9EC568 80240D78 0000102D */ daddu $v0, $zero, $zero -/* 9EC56C 80240D7C 0260202D */ daddu $a0, $s3, $zero -/* 9EC570 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 9EC574 80240D84 0C09015A */ jal func_80240568 -/* 9EC578 80240D88 0200302D */ daddu $a2, $s0, $zero -/* 9EC57C 80240D8C 8E630070 */ lw $v1, 0x70($s3) -/* 9EC580 80240D90 24020003 */ addiu $v0, $zero, 3 -/* 9EC584 80240D94 14620016 */ bne $v1, $v0, .L80240DF0 -/* 9EC588 80240D98 0000102D */ daddu $v0, $zero, $zero -/* 9EC58C 80240D9C 0260202D */ daddu $a0, $s3, $zero -/* 9EC590 80240DA0 0280282D */ daddu $a1, $s4, $zero -/* 9EC594 80240DA4 0C09018A */ jal func_80240628 -/* 9EC598 80240DA8 0200302D */ daddu $a2, $s0, $zero -/* 9EC59C 80240DAC 0809037C */ j .L80240DF0 -/* 9EC5A0 80240DB0 0000102D */ daddu $v0, $zero, $zero -/* 9EC5A4 80240DB4 0260202D */ daddu $a0, $s3, $zero -/* 9EC5A8 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* 9EC5AC 80240DBC 0C0901F3 */ jal func_802407CC -/* 9EC5B0 80240DC0 0200302D */ daddu $a2, $s0, $zero -/* 9EC5B4 80240DC4 0260202D */ daddu $a0, $s3, $zero -/* 9EC5B8 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* 9EC5BC 80240DCC 0C09022B */ jal func_802408AC -/* 9EC5C0 80240DD0 0200302D */ daddu $a2, $s0, $zero -/* 9EC5C4 80240DD4 0809037C */ j .L80240DF0 -/* 9EC5C8 80240DD8 0000102D */ daddu $v0, $zero, $zero -/* 9EC5CC 80240DDC 0260202D */ daddu $a0, $s3, $zero -/* 9EC5D0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 9EC5D4 80240DE4 0C0902EB */ jal func_80240BAC -/* 9EC5D8 80240DE8 0200302D */ daddu $a2, $s0, $zero -.L80240DEC: -/* 9EC5DC 80240DEC 0000102D */ daddu $v0, $zero, $zero -.L80240DF0: -/* 9EC5E0 80240DF0 8FBF0048 */ lw $ra, 0x48($sp) -/* 9EC5E4 80240DF4 8FB50044 */ lw $s5, 0x44($sp) -/* 9EC5E8 80240DF8 8FB40040 */ lw $s4, 0x40($sp) -/* 9EC5EC 80240DFC 8FB3003C */ lw $s3, 0x3c($sp) -/* 9EC5F0 80240E00 8FB20038 */ lw $s2, 0x38($sp) -/* 9EC5F4 80240E04 8FB10034 */ lw $s1, 0x34($sp) -/* 9EC5F8 80240E08 8FB00030 */ lw $s0, 0x30($sp) -/* 9EC5FC 80240E0C 03E00008 */ jr $ra -/* 9EC600 80240E10 27BD0050 */ addiu $sp, $sp, 0x50 -/* 9EC604 80240E14 00000000 */ nop -/* 9EC608 80240E18 00000000 */ nop -/* 9EC60C 80240E1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_04/func_80240184_9EDBF0.s b/asm/nonmatchings/world/area_nok/nok_04/func_80240184_9EDBF0.s deleted file mode 100644 index 4199fd6fcf..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_04/func_80240184_9EDBF0.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240184_9EDD74 -/* 9EDD74 80240184 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9EDD78 80240188 AFB20018 */ sw $s2, 0x18($sp) -/* 9EDD7C 8024018C 0080902D */ daddu $s2, $a0, $zero -/* 9EDD80 80240190 AFBF0028 */ sw $ra, 0x28($sp) -/* 9EDD84 80240194 AFB50024 */ sw $s5, 0x24($sp) -/* 9EDD88 80240198 AFB40020 */ sw $s4, 0x20($sp) -/* 9EDD8C 8024019C AFB3001C */ sw $s3, 0x1c($sp) -/* 9EDD90 802401A0 AFB10014 */ sw $s1, 0x14($sp) -/* 9EDD94 802401A4 AFB00010 */ sw $s0, 0x10($sp) -/* 9EDD98 802401A8 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 9EDD9C 802401AC F7B60038 */ sdc1 $f22, 0x38($sp) -/* 9EDDA0 802401B0 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9EDDA4 802401B4 8E50000C */ lw $s0, 0xc($s2) -/* 9EDDA8 802401B8 8E140000 */ lw $s4, ($s0) -/* 9EDDAC 802401BC 26100004 */ addiu $s0, $s0, 4 -/* 9EDDB0 802401C0 0C0B1EAF */ jal get_variable -/* 9EDDB4 802401C4 0280282D */ daddu $a1, $s4, $zero -/* 9EDDB8 802401C8 0040982D */ daddu $s3, $v0, $zero -/* 9EDDBC 802401CC 8E150000 */ lw $s5, ($s0) -/* 9EDDC0 802401D0 26100004 */ addiu $s0, $s0, 4 -/* 9EDDC4 802401D4 8E050000 */ lw $a1, ($s0) -/* 9EDDC8 802401D8 26100004 */ addiu $s0, $s0, 4 -/* 9EDDCC 802401DC 0C0B210B */ jal get_float_variable -/* 9EDDD0 802401E0 0240202D */ daddu $a0, $s2, $zero -/* 9EDDD4 802401E4 8E050000 */ lw $a1, ($s0) -/* 9EDDD8 802401E8 26100004 */ addiu $s0, $s0, 4 -/* 9EDDDC 802401EC 0240202D */ daddu $a0, $s2, $zero -/* 9EDDE0 802401F0 0C0B210B */ jal get_float_variable -/* 9EDDE4 802401F4 46000606 */ mov.s $f24, $f0 -/* 9EDDE8 802401F8 8E050000 */ lw $a1, ($s0) -/* 9EDDEC 802401FC 26100004 */ addiu $s0, $s0, 4 -/* 9EDDF0 80240200 0240202D */ daddu $a0, $s2, $zero -/* 9EDDF4 80240204 0C0B1EAF */ jal get_variable -/* 9EDDF8 80240208 46000506 */ mov.s $f20, $f0 -/* 9EDDFC 8024020C 8E050000 */ lw $a1, ($s0) -/* 9EDE00 80240210 26100004 */ addiu $s0, $s0, 4 -/* 9EDE04 80240214 0240202D */ daddu $a0, $s2, $zero -/* 9EDE08 80240218 0C0B1EAF */ jal get_variable -/* 9EDE0C 8024021C 0040882D */ daddu $s1, $v0, $zero -/* 9EDE10 80240220 0240202D */ daddu $a0, $s2, $zero -/* 9EDE14 80240224 8E050000 */ lw $a1, ($s0) -/* 9EDE18 80240228 0C0B210B */ jal get_float_variable -/* 9EDE1C 8024022C 0040802D */ daddu $s0, $v0, $zero -/* 9EDE20 80240230 3C014334 */ lui $at, 0x4334 -/* 9EDE24 80240234 44811000 */ mtc1 $at, $f2 -/* 9EDE28 80240238 3C014049 */ lui $at, 0x4049 -/* 9EDE2C 8024023C 34210FD8 */ ori $at, $at, 0xfd8 -/* 9EDE30 80240240 44812000 */ mtc1 $at, $f4 -/* 9EDE34 80240244 46020003 */ div.s $f0, $f0, $f2 -/* 9EDE38 80240248 46040582 */ mul.s $f22, $f0, $f4 -/* 9EDE3C 8024024C 00000000 */ nop -/* 9EDE40 80240250 4618A501 */ sub.s $f20, $f20, $f24 -/* 9EDE44 80240254 3C013F00 */ lui $at, 0x3f00 -/* 9EDE48 80240258 44810000 */ mtc1 $at, $f0 -/* 9EDE4C 8024025C 00000000 */ nop -/* 9EDE50 80240260 4600A502 */ mul.s $f20, $f20, $f0 -/* 9EDE54 80240264 00000000 */ nop -/* 9EDE58 80240268 12000007 */ beqz $s0, .L80240288 -/* 9EDE5C 8024026C 0233102A */ slt $v0, $s1, $s3 -/* 9EDE60 80240270 10400005 */ beqz $v0, .L80240288 -/* 9EDE64 80240274 0240202D */ daddu $a0, $s2, $zero -/* 9EDE68 80240278 0220982D */ daddu $s3, $s1, $zero -/* 9EDE6C 8024027C 0280282D */ daddu $a1, $s4, $zero -/* 9EDE70 80240280 0C0B2026 */ jal set_variable -/* 9EDE74 80240284 0220302D */ daddu $a2, $s1, $zero -.L80240288: -/* 9EDE78 80240288 3C014049 */ lui $at, 0x4049 -/* 9EDE7C 8024028C 34210FD8 */ ori $at, $at, 0xfd8 -/* 9EDE80 80240290 44810000 */ mtc1 $at, $f0 -/* 9EDE84 80240294 44936000 */ mtc1 $s3, $f12 -/* 9EDE88 80240298 00000000 */ nop -/* 9EDE8C 8024029C 46806320 */ cvt.s.w $f12, $f12 -/* 9EDE90 802402A0 46006302 */ mul.s $f12, $f12, $f0 -/* 9EDE94 802402A4 00000000 */ nop -/* 9EDE98 802402A8 44910000 */ mtc1 $s1, $f0 -/* 9EDE9C 802402AC 00000000 */ nop -/* 9EDEA0 802402B0 46800020 */ cvt.s.w $f0, $f0 -/* 9EDEA4 802402B4 46006303 */ div.s $f12, $f12, $f0 -/* 9EDEA8 802402B8 0C00A874 */ jal cos_rad -/* 9EDEAC 802402BC 46166300 */ add.s $f12, $f12, $f22 -/* 9EDEB0 802402C0 4600A002 */ mul.s $f0, $f20, $f0 -/* 9EDEB4 802402C4 00000000 */ nop -/* 9EDEB8 802402C8 4614C080 */ add.s $f2, $f24, $f20 -/* 9EDEBC 802402CC 46001081 */ sub.s $f2, $f2, $f0 -/* 9EDEC0 802402D0 0240202D */ daddu $a0, $s2, $zero -/* 9EDEC4 802402D4 44061000 */ mfc1 $a2, $f2 -/* 9EDEC8 802402D8 0C0B2190 */ jal set_float_variable -/* 9EDECC 802402DC 02A0282D */ daddu $a1, $s5, $zero -/* 9EDED0 802402E0 8FBF0028 */ lw $ra, 0x28($sp) -/* 9EDED4 802402E4 8FB50024 */ lw $s5, 0x24($sp) -/* 9EDED8 802402E8 8FB40020 */ lw $s4, 0x20($sp) -/* 9EDEDC 802402EC 8FB3001C */ lw $s3, 0x1c($sp) -/* 9EDEE0 802402F0 8FB20018 */ lw $s2, 0x18($sp) -/* 9EDEE4 802402F4 8FB10014 */ lw $s1, 0x14($sp) -/* 9EDEE8 802402F8 8FB00010 */ lw $s0, 0x10($sp) -/* 9EDEEC 802402FC D7B80040 */ ldc1 $f24, 0x40($sp) -/* 9EDEF0 80240300 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 9EDEF4 80240304 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9EDEF8 80240308 24020002 */ addiu $v0, $zero, 2 -/* 9EDEFC 8024030C 03E00008 */ jr $ra -/* 9EDF00 80240310 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_04/func_80240314_9EDBF0.s b/asm/nonmatchings/world/area_nok/nok_04/func_80240314_9EDBF0.s deleted file mode 100644 index d3915066b4..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_04/func_80240314_9EDBF0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240314_9EDF04 -/* 9EDF04 80240314 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9EDF08 80240318 AFB10014 */ sw $s1, 0x14($sp) -/* 9EDF0C 8024031C 0080882D */ daddu $s1, $a0, $zero -/* 9EDF10 80240320 AFBF001C */ sw $ra, 0x1c($sp) -/* 9EDF14 80240324 AFB20018 */ sw $s2, 0x18($sp) -/* 9EDF18 80240328 AFB00010 */ sw $s0, 0x10($sp) -/* 9EDF1C 8024032C 8E30000C */ lw $s0, 0xc($s1) -/* 9EDF20 80240330 8E050000 */ lw $a1, ($s0) -/* 9EDF24 80240334 0C0B1EAF */ jal get_variable -/* 9EDF28 80240338 26100004 */ addiu $s0, $s0, 4 -/* 9EDF2C 8024033C 8E050000 */ lw $a1, ($s0) -/* 9EDF30 80240340 26100004 */ addiu $s0, $s0, 4 -/* 9EDF34 80240344 0220202D */ daddu $a0, $s1, $zero -/* 9EDF38 80240348 0C0B1EAF */ jal get_variable -/* 9EDF3C 8024034C 0040902D */ daddu $s2, $v0, $zero -/* 9EDF40 80240350 0220202D */ daddu $a0, $s1, $zero -/* 9EDF44 80240354 8E050000 */ lw $a1, ($s0) -/* 9EDF48 80240358 0C0B1EAF */ jal get_variable -/* 9EDF4C 8024035C 0040802D */ daddu $s0, $v0, $zero -/* 9EDF50 80240360 44823000 */ mtc1 $v0, $f6 -/* 9EDF54 80240364 00000000 */ nop -/* 9EDF58 80240368 468031A0 */ cvt.s.w $f6, $f6 -/* 9EDF5C 8024036C 3C038024 */ lui $v1, 0x8024 -/* 9EDF60 80240370 246313F8 */ addiu $v1, $v1, 0x13f8 -/* 9EDF64 80240374 44922000 */ mtc1 $s2, $f4 -/* 9EDF68 80240378 00000000 */ nop -/* 9EDF6C 8024037C 46802120 */ cvt.s.w $f4, $f4 -/* 9EDF70 80240380 3C014080 */ lui $at, 0x4080 -/* 9EDF74 80240384 44811000 */ mtc1 $at, $f2 -/* 9EDF78 80240388 44900000 */ mtc1 $s0, $f0 -/* 9EDF7C 8024038C 00000000 */ nop -/* 9EDF80 80240390 46800020 */ cvt.s.w $f0, $f0 -/* 9EDF84 80240394 46020000 */ add.s $f0, $f0, $f2 -/* 9EDF88 80240398 E4640000 */ swc1 $f4, ($v1) -/* 9EDF8C 8024039C E4660008 */ swc1 $f6, 8($v1) -/* 9EDF90 802403A0 E4600004 */ swc1 $f0, 4($v1) -/* 9EDF94 802403A4 8FBF001C */ lw $ra, 0x1c($sp) -/* 9EDF98 802403A8 8FB20018 */ lw $s2, 0x18($sp) -/* 9EDF9C 802403AC 8FB10014 */ lw $s1, 0x14($sp) -/* 9EDFA0 802403B0 8FB00010 */ lw $s0, 0x10($sp) -/* 9EDFA4 802403B4 24020002 */ addiu $v0, $zero, 2 -/* 9EDFA8 802403B8 03E00008 */ jr $ra -/* 9EDFAC 802403BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_04/func_802403C0_9EDBF0.s b/asm/nonmatchings/world/area_nok/nok_04/func_802403C0_9EDBF0.s deleted file mode 100644 index 51265b88a3..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_04/func_802403C0_9EDBF0.s +++ /dev/null @@ -1,75 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C0_9EDFB0 -/* 9EDFB0 802403C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9EDFB4 802403C4 AFB10014 */ sw $s1, 0x14($sp) -/* 9EDFB8 802403C8 0080882D */ daddu $s1, $a0, $zero -/* 9EDFBC 802403CC AFBF001C */ sw $ra, 0x1c($sp) -/* 9EDFC0 802403D0 AFB20018 */ sw $s2, 0x18($sp) -/* 9EDFC4 802403D4 AFB00010 */ sw $s0, 0x10($sp) -/* 9EDFC8 802403D8 8E30000C */ lw $s0, 0xc($s1) -/* 9EDFCC 802403DC 8E050000 */ lw $a1, ($s0) -/* 9EDFD0 802403E0 0C0B1EAF */ jal get_variable -/* 9EDFD4 802403E4 26100004 */ addiu $s0, $s0, 4 -/* 9EDFD8 802403E8 8E050000 */ lw $a1, ($s0) -/* 9EDFDC 802403EC 26100004 */ addiu $s0, $s0, 4 -/* 9EDFE0 802403F0 0220202D */ daddu $a0, $s1, $zero -/* 9EDFE4 802403F4 0C0B1EAF */ jal get_variable -/* 9EDFE8 802403F8 0040902D */ daddu $s2, $v0, $zero -/* 9EDFEC 802403FC 0220202D */ daddu $a0, $s1, $zero -/* 9EDFF0 80240400 8E050000 */ lw $a1, ($s0) -/* 9EDFF4 80240404 0C0B1EAF */ jal get_variable -/* 9EDFF8 80240408 0040802D */ daddu $s0, $v0, $zero -/* 9EDFFC 8024040C 3C038024 */ lui $v1, 0x8024 -/* 9EE000 80240410 246313F8 */ addiu $v1, $v1, 0x13f8 -/* 9EE004 80240414 06010002 */ bgez $s0, .L80240420 -/* 9EE008 80240418 0040202D */ daddu $a0, $v0, $zero -/* 9EE00C 8024041C 2610000F */ addiu $s0, $s0, 0xf -.L80240420: -/* 9EE010 80240420 00101103 */ sra $v0, $s0, 4 -/* 9EE014 80240424 44824000 */ mtc1 $v0, $f8 -/* 9EE018 80240428 00000000 */ nop -/* 9EE01C 8024042C 46804220 */ cvt.s.w $f8, $f8 -/* 9EE020 80240430 3C013D80 */ lui $at, 0x3d80 -/* 9EE024 80240434 44811000 */ mtc1 $at, $f2 -/* 9EE028 80240438 44920000 */ mtc1 $s2, $f0 -/* 9EE02C 8024043C 00000000 */ nop -/* 9EE030 80240440 46800020 */ cvt.s.w $f0, $f0 -/* 9EE034 80240444 AC600034 */ sw $zero, 0x34($v1) -/* 9EE038 80240448 46020182 */ mul.s $f6, $f0, $f2 -/* 9EE03C 8024044C 00000000 */ nop -/* 9EE040 80240450 C46A0034 */ lwc1 $f10, 0x34($v1) -/* 9EE044 80240454 44842000 */ mtc1 $a0, $f4 -/* 9EE048 80240458 00000000 */ nop -/* 9EE04C 8024045C 46802120 */ cvt.s.w $f4, $f4 -/* 9EE050 80240460 E4680018 */ swc1 $f8, 0x18($v1) -/* 9EE054 80240464 E4640030 */ swc1 $f4, 0x30($v1) -/* 9EE058 80240468 4604503C */ c.lt.s $f10, $f4 -/* 9EE05C 8024046C 00000000 */ nop -/* 9EE060 80240470 45000009 */ bc1f .L80240498 -/* 9EE064 80240474 E466000C */ swc1 $f6, 0xc($v1) -/* 9EE068 80240478 C4600010 */ lwc1 $f0, 0x10($v1) -/* 9EE06C 8024047C 46003001 */ sub.s $f0, $f6, $f0 -/* 9EE070 80240480 C4620020 */ lwc1 $f2, 0x20($v1) -/* 9EE074 80240484 46024081 */ sub.s $f2, $f8, $f2 -/* 9EE078 80240488 46040003 */ div.s $f0, $f0, $f4 -/* 9EE07C 8024048C 46041083 */ div.s $f2, $f2, $f4 -/* 9EE080 80240490 E4600038 */ swc1 $f0, 0x38($v1) -/* 9EE084 80240494 E462003C */ swc1 $f2, 0x3c($v1) -.L80240498: -/* 9EE088 80240498 460A203C */ c.lt.s $f4, $f10 -/* 9EE08C 8024049C 00000000 */ nop -/* 9EE090 802404A0 45000004 */ bc1f .L802404B4 -/* 9EE094 802404A4 00000000 */ nop -/* 9EE098 802404A8 E4660010 */ swc1 $f6, 0x10($v1) -/* 9EE09C 802404AC E4680020 */ swc1 $f8, 0x20($v1) -/* 9EE0A0 802404B0 E46A0030 */ swc1 $f10, 0x30($v1) -.L802404B4: -/* 9EE0A4 802404B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 9EE0A8 802404B8 8FB20018 */ lw $s2, 0x18($sp) -/* 9EE0AC 802404BC 8FB10014 */ lw $s1, 0x14($sp) -/* 9EE0B0 802404C0 8FB00010 */ lw $s0, 0x10($sp) -/* 9EE0B4 802404C4 24020002 */ addiu $v0, $zero, 2 -/* 9EE0B8 802404C8 03E00008 */ jr $ra -/* 9EE0BC 802404CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_04/func_802404D0_9EDBF0.s b/asm/nonmatchings/world/area_nok/nok_04/func_802404D0_9EDBF0.s deleted file mode 100644 index 4893c012ca..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_04/func_802404D0_9EDBF0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404D0_9EE0C0 -/* 9EE0C0 802404D0 3C028024 */ lui $v0, 0x8024 -/* 9EE0C4 802404D4 244213F8 */ addiu $v0, $v0, 0x13f8 -/* 9EE0C8 802404D8 AC400000 */ sw $zero, ($v0) -/* 9EE0CC 802404DC AC400004 */ sw $zero, 4($v0) -/* 9EE0D0 802404E0 AC400008 */ sw $zero, 8($v0) -/* 9EE0D4 802404E4 AC400010 */ sw $zero, 0x10($v0) -/* 9EE0D8 802404E8 AC40000C */ sw $zero, 0xc($v0) -/* 9EE0DC 802404EC AC400014 */ sw $zero, 0x14($v0) -/* 9EE0E0 802404F0 AC400018 */ sw $zero, 0x18($v0) -/* 9EE0E4 802404F4 AC400020 */ sw $zero, 0x20($v0) -/* 9EE0E8 802404F8 AC40001C */ sw $zero, 0x1c($v0) -/* 9EE0EC 802404FC AC400040 */ sw $zero, 0x40($v0) -/* 9EE0F0 80240500 AC400044 */ sw $zero, 0x44($v0) -/* 9EE0F4 80240504 AC400034 */ sw $zero, 0x34($v0) -/* 9EE0F8 80240508 AC400030 */ sw $zero, 0x30($v0) -/* 9EE0FC 8024050C AC400038 */ sw $zero, 0x38($v0) -/* 9EE100 80240510 AC40003C */ sw $zero, 0x3c($v0) -/* 9EE104 80240514 03E00008 */ jr $ra -/* 9EE108 80240518 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_04/func_80240548_9EDBF0.s b/asm/nonmatchings/world/area_nok/nok_04/func_80240548_9EDBF0.s deleted file mode 100644 index aca6a5907d..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_04/func_80240548_9EDBF0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240548_9EE138 -/* 9EE138 80240548 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9EE13C 8024054C AFBF0010 */ sw $ra, 0x10($sp) -/* 9EE140 80240550 8C82000C */ lw $v0, 0xc($a0) -/* 9EE144 80240554 0C0B1EAF */ jal get_variable -/* 9EE148 80240558 8C450000 */ lw $a1, ($v0) -/* 9EE14C 8024055C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9EE150 80240560 3C018024 */ lui $at, 0x8024 -/* 9EE154 80240564 AC22143C */ sw $v0, 0x143c($at) -/* 9EE158 80240568 24020002 */ addiu $v0, $zero, 2 -/* 9EE15C 8024056C 03E00008 */ jr $ra -/* 9EE160 80240570 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_04/func_80240574_9EDBF0.s b/asm/nonmatchings/world/area_nok/nok_04/func_80240574_9EDBF0.s deleted file mode 100644 index 5e0d0e6d72..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_04/func_80240574_9EDBF0.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240574_9EE164 -/* 9EE164 80240574 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9EE168 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* 9EE16C 8024057C 0080902D */ daddu $s2, $a0, $zero -/* 9EE170 80240580 AFBF0020 */ sw $ra, 0x20($sp) -/* 9EE174 80240584 AFB3001C */ sw $s3, 0x1c($sp) -/* 9EE178 80240588 AFB10014 */ sw $s1, 0x14($sp) -/* 9EE17C 8024058C AFB00010 */ sw $s0, 0x10($sp) -/* 9EE180 80240590 8E50000C */ lw $s0, 0xc($s2) -/* 9EE184 80240594 8E050000 */ lw $a1, ($s0) -/* 9EE188 80240598 0C0B1EAF */ jal get_variable -/* 9EE18C 8024059C 26100004 */ addiu $s0, $s0, 4 -/* 9EE190 802405A0 8E050000 */ lw $a1, ($s0) -/* 9EE194 802405A4 26100004 */ addiu $s0, $s0, 4 -/* 9EE198 802405A8 00028840 */ sll $s1, $v0, 1 -/* 9EE19C 802405AC 02228821 */ addu $s1, $s1, $v0 -/* 9EE1A0 802405B0 00111080 */ sll $v0, $s1, 2 -/* 9EE1A4 802405B4 3C068024 */ lui $a2, 0x8024 -/* 9EE1A8 802405B8 00C23021 */ addu $a2, $a2, $v0 -/* 9EE1AC 802405BC 8CC61440 */ lw $a2, 0x1440($a2) -/* 9EE1B0 802405C0 8E130000 */ lw $s3, ($s0) -/* 9EE1B4 802405C4 8E100004 */ lw $s0, 4($s0) -/* 9EE1B8 802405C8 0C0B2026 */ jal set_variable -/* 9EE1BC 802405CC 0240202D */ daddu $a0, $s2, $zero -/* 9EE1C0 802405D0 0240202D */ daddu $a0, $s2, $zero -/* 9EE1C4 802405D4 26220001 */ addiu $v0, $s1, 1 -/* 9EE1C8 802405D8 00021080 */ sll $v0, $v0, 2 -/* 9EE1CC 802405DC 3C068024 */ lui $a2, 0x8024 -/* 9EE1D0 802405E0 00C23021 */ addu $a2, $a2, $v0 -/* 9EE1D4 802405E4 8CC61440 */ lw $a2, 0x1440($a2) -/* 9EE1D8 802405E8 0C0B2026 */ jal set_variable -/* 9EE1DC 802405EC 0260282D */ daddu $a1, $s3, $zero -/* 9EE1E0 802405F0 0240202D */ daddu $a0, $s2, $zero -/* 9EE1E4 802405F4 26310002 */ addiu $s1, $s1, 2 -/* 9EE1E8 802405F8 00118880 */ sll $s1, $s1, 2 -/* 9EE1EC 802405FC 3C068024 */ lui $a2, 0x8024 -/* 9EE1F0 80240600 00D13021 */ addu $a2, $a2, $s1 -/* 9EE1F4 80240604 8CC61440 */ lw $a2, 0x1440($a2) -/* 9EE1F8 80240608 0C0B2026 */ jal set_variable -/* 9EE1FC 8024060C 0200282D */ daddu $a1, $s0, $zero -/* 9EE200 80240610 8FBF0020 */ lw $ra, 0x20($sp) -/* 9EE204 80240614 8FB3001C */ lw $s3, 0x1c($sp) -/* 9EE208 80240618 8FB20018 */ lw $s2, 0x18($sp) -/* 9EE20C 8024061C 8FB10014 */ lw $s1, 0x14($sp) -/* 9EE210 80240620 8FB00010 */ lw $s0, 0x10($sp) -/* 9EE214 80240624 24020002 */ addiu $v0, $zero, 2 -/* 9EE218 80240628 03E00008 */ jr $ra -/* 9EE21C 8024062C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_04/func_80240630_9EDBF0.s b/asm/nonmatchings/world/area_nok/nok_04/func_80240630_9EDBF0.s deleted file mode 100644 index 47fc720da9..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_04/func_80240630_9EDBF0.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240630_9EE220 -/* 9EE220 80240630 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9EE224 80240634 AFB10014 */ sw $s1, 0x14($sp) -/* 9EE228 80240638 0080882D */ daddu $s1, $a0, $zero -/* 9EE22C 8024063C AFBF0018 */ sw $ra, 0x18($sp) -/* 9EE230 80240640 AFB00010 */ sw $s0, 0x10($sp) -/* 9EE234 80240644 8E30000C */ lw $s0, 0xc($s1) -/* 9EE238 80240648 8E050000 */ lw $a1, ($s0) -/* 9EE23C 8024064C 0C0B1EAF */ jal get_variable -/* 9EE240 80240650 26100004 */ addiu $s0, $s0, 4 -/* 9EE244 80240654 0040382D */ daddu $a3, $v0, $zero -/* 9EE248 80240658 3C022AAA */ lui $v0, 0x2aaa -/* 9EE24C 8024065C 3442AAAB */ ori $v0, $v0, 0xaaab -/* 9EE250 80240660 00E20018 */ mult $a3, $v0 -/* 9EE254 80240664 00071FC3 */ sra $v1, $a3, 0x1f -/* 9EE258 80240668 8E050000 */ lw $a1, ($s0) -/* 9EE25C 8024066C 00004010 */ mfhi $t0 -/* 9EE260 80240670 01031823 */ subu $v1, $t0, $v1 -/* 9EE264 80240674 00031040 */ sll $v0, $v1, 1 -/* 9EE268 80240678 00431021 */ addu $v0, $v0, $v1 -/* 9EE26C 8024067C 00021040 */ sll $v0, $v0, 1 -/* 9EE270 80240680 00E23023 */ subu $a2, $a3, $v0 -/* 9EE274 80240684 28C20004 */ slti $v0, $a2, 4 -/* 9EE278 80240688 10400003 */ beqz $v0, .L80240698 -/* 9EE27C 8024068C 00C0382D */ daddu $a3, $a2, $zero -/* 9EE280 80240690 080901A9 */ j .L802406A4 -/* 9EE284 80240694 0220202D */ daddu $a0, $s1, $zero -.L80240698: -/* 9EE288 80240698 0220202D */ daddu $a0, $s1, $zero -/* 9EE28C 8024069C 24060006 */ addiu $a2, $zero, 6 -/* 9EE290 802406A0 00C73023 */ subu $a2, $a2, $a3 -.L802406A4: -/* 9EE294 802406A4 0C0B2026 */ jal set_variable -/* 9EE298 802406A8 00000000 */ nop -/* 9EE29C 802406AC 8FBF0018 */ lw $ra, 0x18($sp) -/* 9EE2A0 802406B0 8FB10014 */ lw $s1, 0x14($sp) -/* 9EE2A4 802406B4 8FB00010 */ lw $s0, 0x10($sp) -/* 9EE2A8 802406B8 24020002 */ addiu $v0, $zero, 2 -/* 9EE2AC 802406BC 03E00008 */ jr $ra -/* 9EE2B0 802406C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_04/func_802406C4_9EDBF0.s b/asm/nonmatchings/world/area_nok/nok_04/func_802406C4_9EDBF0.s deleted file mode 100644 index b401be4b99..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_04/func_802406C4_9EDBF0.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406C4_9EE2B4 -/* 9EE2B4 802406C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9EE2B8 802406C8 AFB3001C */ sw $s3, 0x1c($sp) -/* 9EE2BC 802406CC 0080982D */ daddu $s3, $a0, $zero -/* 9EE2C0 802406D0 AFBF0020 */ sw $ra, 0x20($sp) -/* 9EE2C4 802406D4 AFB20018 */ sw $s2, 0x18($sp) -/* 9EE2C8 802406D8 AFB10014 */ sw $s1, 0x14($sp) -/* 9EE2CC 802406DC AFB00010 */ sw $s0, 0x10($sp) -/* 9EE2D0 802406E0 8E70000C */ lw $s0, 0xc($s3) -/* 9EE2D4 802406E4 8E050000 */ lw $a1, ($s0) -/* 9EE2D8 802406E8 0C0B1EAF */ jal get_variable -/* 9EE2DC 802406EC 26100004 */ addiu $s0, $s0, 4 -/* 9EE2E0 802406F0 0040882D */ daddu $s1, $v0, $zero -/* 9EE2E4 802406F4 8E050000 */ lw $a1, ($s0) -/* 9EE2E8 802406F8 0C0B1EAF */ jal get_variable -/* 9EE2EC 802406FC 0260202D */ daddu $a0, $s3, $zero -/* 9EE2F0 80240700 3C032AAA */ lui $v1, 0x2aaa -/* 9EE2F4 80240704 3463AAAB */ ori $v1, $v1, 0xaaab -/* 9EE2F8 80240708 02230018 */ mult $s1, $v1 -/* 9EE2FC 8024070C 001127C3 */ sra $a0, $s1, 0x1f -/* 9EE300 80240710 0040902D */ daddu $s2, $v0, $zero -/* 9EE304 80240714 00003810 */ mfhi $a3 -/* 9EE308 80240718 00E42023 */ subu $a0, $a3, $a0 -/* 9EE30C 8024071C 00041840 */ sll $v1, $a0, 1 -/* 9EE310 80240720 00641821 */ addu $v1, $v1, $a0 -/* 9EE314 80240724 00031840 */ sll $v1, $v1, 1 -/* 9EE318 80240728 02238823 */ subu $s1, $s1, $v1 -/* 9EE31C 8024072C 2A220004 */ slti $v0, $s1, 4 -/* 9EE320 80240730 14400004 */ bnez $v0, .L80240744 -/* 9EE324 80240734 26220006 */ addiu $v0, $s1, 6 -/* 9EE328 80240738 24020006 */ addiu $v0, $zero, 6 -/* 9EE32C 8024073C 00518823 */ subu $s1, $v0, $s1 -/* 9EE330 80240740 26220006 */ addiu $v0, $s1, 6 -.L80240744: -/* 9EE334 80240744 00021080 */ sll $v0, $v0, 2 -/* 9EE338 80240748 02628021 */ addu $s0, $s3, $v0 -/* 9EE33C 8024074C 0C0B1059 */ jal does_script_exist -/* 9EE340 80240750 8E040084 */ lw $a0, 0x84($s0) -/* 9EE344 80240754 10400003 */ beqz $v0, .L80240764 -/* 9EE348 80240758 00000000 */ nop -/* 9EE34C 8024075C 0C0B102B */ jal kill_script_by_ID -/* 9EE350 80240760 8E040084 */ lw $a0, 0x84($s0) -.L80240764: -/* 9EE354 80240764 3C048024 */ lui $a0, 0x8024 -/* 9EE358 80240768 24841470 */ addiu $a0, $a0, 0x1470 -/* 9EE35C 8024076C 12400005 */ beqz $s2, .L80240784 -/* 9EE360 80240770 24020001 */ addiu $v0, $zero, 1 -/* 9EE364 80240774 16420004 */ bne $s2, $v0, .L80240788 -/* 9EE368 80240778 24050001 */ addiu $a1, $zero, 1 -/* 9EE36C 8024077C 3C048024 */ lui $a0, 0x8024 -/* 9EE370 80240780 2484161C */ addiu $a0, $a0, 0x161c -.L80240784: -/* 9EE374 80240784 24050001 */ addiu $a1, $zero, 1 -.L80240788: -/* 9EE378 80240788 0C0B0CF8 */ jal start_script -/* 9EE37C 8024078C 0000302D */ daddu $a2, $zero, $zero -/* 9EE380 80240790 0040202D */ daddu $a0, $v0, $zero -/* 9EE384 80240794 26220006 */ addiu $v0, $s1, 6 -/* 9EE388 80240798 00021080 */ sll $v0, $v0, 2 -/* 9EE38C 8024079C 8C830144 */ lw $v1, 0x144($a0) -/* 9EE390 802407A0 02621021 */ addu $v0, $s3, $v0 -/* 9EE394 802407A4 AC430084 */ sw $v1, 0x84($v0) -/* 9EE398 802407A8 24020001 */ addiu $v0, $zero, 1 -/* 9EE39C 802407AC 1222000D */ beq $s1, $v0, .L802407E4 -/* 9EE3A0 802407B0 2A220002 */ slti $v0, $s1, 2 -/* 9EE3A4 802407B4 10400005 */ beqz $v0, .L802407CC -/* 9EE3A8 802407B8 24020002 */ addiu $v0, $zero, 2 -/* 9EE3AC 802407BC 1220000C */ beqz $s1, .L802407F0 -/* 9EE3B0 802407C0 2402004C */ addiu $v0, $zero, 0x4c -/* 9EE3B4 802407C4 080901FD */ j .L802407F4 -/* 9EE3B8 802407C8 00000000 */ nop -.L802407CC: -/* 9EE3BC 802407CC 12220007 */ beq $s1, $v0, .L802407EC -/* 9EE3C0 802407D0 24020003 */ addiu $v0, $zero, 3 -/* 9EE3C4 802407D4 12220006 */ beq $s1, $v0, .L802407F0 -/* 9EE3C8 802407D8 2402004F */ addiu $v0, $zero, 0x4f -/* 9EE3CC 802407DC 080901FD */ j .L802407F4 -/* 9EE3D0 802407E0 00000000 */ nop -.L802407E4: -/* 9EE3D4 802407E4 080901FC */ j .L802407F0 -/* 9EE3D8 802407E8 2402004D */ addiu $v0, $zero, 0x4d -.L802407EC: -/* 9EE3DC 802407EC 2402004E */ addiu $v0, $zero, 0x4e -.L802407F0: -/* 9EE3E0 802407F0 AC820084 */ sw $v0, 0x84($a0) -.L802407F4: -/* 9EE3E4 802407F4 8FBF0020 */ lw $ra, 0x20($sp) -/* 9EE3E8 802407F8 8FB3001C */ lw $s3, 0x1c($sp) -/* 9EE3EC 802407FC 8FB20018 */ lw $s2, 0x18($sp) -/* 9EE3F0 80240800 8FB10014 */ lw $s1, 0x14($sp) -/* 9EE3F4 80240804 8FB00010 */ lw $s0, 0x10($sp) -/* 9EE3F8 80240808 24020002 */ addiu $v0, $zero, 2 -/* 9EE3FC 8024080C 03E00008 */ jr $ra -/* 9EE400 80240810 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_04/func_80240814_9EDBF0.s b/asm/nonmatchings/world/area_nok/nok_04/func_80240814_9EDBF0.s deleted file mode 100644 index 82822b9d46..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_04/func_80240814_9EDBF0.s +++ /dev/null @@ -1,409 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240814_9EE404 -/* 9EE404 80240814 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 9EE408 80240818 3C028024 */ lui $v0, 0x8024 -/* 9EE40C 8024081C 244213F8 */ addiu $v0, $v0, 0x13f8 -/* 9EE410 80240820 AFBF0048 */ sw $ra, 0x48($sp) -/* 9EE414 80240824 AFB70044 */ sw $s7, 0x44($sp) -/* 9EE418 80240828 AFB60040 */ sw $s6, 0x40($sp) -/* 9EE41C 8024082C AFB5003C */ sw $s5, 0x3c($sp) -/* 9EE420 80240830 AFB40038 */ sw $s4, 0x38($sp) -/* 9EE424 80240834 AFB30034 */ sw $s3, 0x34($sp) -/* 9EE428 80240838 AFB20030 */ sw $s2, 0x30($sp) -/* 9EE42C 8024083C AFB1002C */ sw $s1, 0x2c($sp) -/* 9EE430 80240840 AFB00028 */ sw $s0, 0x28($sp) -/* 9EE434 80240844 F7BE0078 */ sdc1 $f30, 0x78($sp) -/* 9EE438 80240848 F7BC0070 */ sdc1 $f28, 0x70($sp) -/* 9EE43C 8024084C F7BA0068 */ sdc1 $f26, 0x68($sp) -/* 9EE440 80240850 F7B80060 */ sdc1 $f24, 0x60($sp) -/* 9EE444 80240854 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 9EE448 80240858 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 9EE44C 8024085C C44E0000 */ lwc1 $f14, ($v0) -/* 9EE450 80240860 3C018024 */ lui $at, 0x8024 -/* 9EE454 80240864 D4226E20 */ ldc1 $f2, 0x6e20($at) -/* 9EE458 80240868 44805000 */ mtc1 $zero, $f10 -/* 9EE45C 8024086C E7AE0020 */ swc1 $f14, 0x20($sp) -/* 9EE460 80240870 C4400014 */ lwc1 $f0, 0x14($v0) -/* 9EE464 80240874 C4480030 */ lwc1 $f8, 0x30($v0) -/* 9EE468 80240878 46000021 */ cvt.d.s $f0, $f0 -/* 9EE46C 8024087C 46220000 */ add.d $f0, $f0, $f2 -/* 9EE470 80240880 C45E0004 */ lwc1 $f30, 4($v0) -/* 9EE474 80240884 C44E0008 */ lwc1 $f14, 8($v0) -/* 9EE478 80240888 460A4032 */ c.eq.s $f8, $f10 -/* 9EE47C 8024088C 46200120 */ cvt.s.d $f4, $f0 -/* 9EE480 80240890 E4440014 */ swc1 $f4, 0x14($v0) -/* 9EE484 80240894 4501002D */ bc1t .L8024094C -/* 9EE488 80240898 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 9EE48C 8024089C C4420010 */ lwc1 $f2, 0x10($v0) -/* 9EE490 802408A0 C4400038 */ lwc1 $f0, 0x38($v0) -/* 9EE494 802408A4 46001080 */ add.s $f2, $f2, $f0 -/* 9EE498 802408A8 C440000C */ lwc1 $f0, 0xc($v0) -/* 9EE49C 802408AC 4602003C */ c.lt.s $f0, $f2 -/* 9EE4A0 802408B0 00000000 */ nop -/* 9EE4A4 802408B4 45000009 */ bc1f .L802408DC -/* 9EE4A8 802408B8 E4420010 */ swc1 $f2, 0x10($v0) -/* 9EE4AC 802408BC 46020001 */ sub.s $f0, $f0, $f2 -/* 9EE4B0 802408C0 3C013F00 */ lui $at, 0x3f00 -/* 9EE4B4 802408C4 44811000 */ mtc1 $at, $f2 -/* 9EE4B8 802408C8 00000000 */ nop -/* 9EE4BC 802408CC 46020002 */ mul.s $f0, $f0, $f2 -/* 9EE4C0 802408D0 00000000 */ nop -/* 9EE4C4 802408D4 46002000 */ add.s $f0, $f4, $f0 -/* 9EE4C8 802408D8 E4400014 */ swc1 $f0, 0x14($v0) -.L802408DC: -/* 9EE4CC 802408DC C4420018 */ lwc1 $f2, 0x18($v0) -/* 9EE4D0 802408E0 C4460020 */ lwc1 $f6, 0x20($v0) -/* 9EE4D4 802408E4 46061081 */ sub.s $f2, $f2, $f6 -/* 9EE4D8 802408E8 3C014120 */ lui $at, 0x4120 -/* 9EE4DC 802408EC 44812000 */ mtc1 $at, $f4 -/* 9EE4E0 802408F0 C440001C */ lwc1 $f0, 0x1c($v0) -/* 9EE4E4 802408F4 46041083 */ div.s $f2, $f2, $f4 -/* 9EE4E8 802408F8 46020000 */ add.s $f0, $f0, $f2 -/* 9EE4EC 802408FC 3C018024 */ lui $at, 0x8024 -/* 9EE4F0 80240900 D4226E28 */ ldc1 $f2, 0x6e28($at) -/* 9EE4F4 80240904 46000021 */ cvt.d.s $f0, $f0 -/* 9EE4F8 80240908 46220002 */ mul.d $f0, $f0, $f2 -/* 9EE4FC 8024090C 00000000 */ nop -/* 9EE500 80240910 C4440034 */ lwc1 $f4, 0x34($v0) -/* 9EE504 80240914 3C013F80 */ lui $at, 0x3f80 -/* 9EE508 80240918 44811000 */ mtc1 $at, $f2 -/* 9EE50C 8024091C 00000000 */ nop -/* 9EE510 80240920 46022100 */ add.s $f4, $f4, $f2 -/* 9EE514 80240924 C442003C */ lwc1 $f2, 0x3c($v0) -/* 9EE518 80240928 46023180 */ add.s $f6, $f6, $f2 -/* 9EE51C 8024092C 4604403E */ c.le.s $f8, $f4 -/* 9EE520 80240930 E4440034 */ swc1 $f4, 0x34($v0) -/* 9EE524 80240934 E4460020 */ swc1 $f6, 0x20($v0) -/* 9EE528 80240938 46200020 */ cvt.s.d $f0, $f0 -/* 9EE52C 8024093C 45000023 */ bc1f .L802409CC -/* 9EE530 80240940 E440001C */ swc1 $f0, 0x1c($v0) -/* 9EE534 80240944 08090273 */ j .L802409CC -/* 9EE538 80240948 E44A0030 */ swc1 $f10, 0x30($v0) -.L8024094C: -/* 9EE53C 8024094C C4400010 */ lwc1 $f0, 0x10($v0) -/* 9EE540 80240950 46040000 */ add.s $f0, $f0, $f4 -/* 9EE544 80240954 C442000C */ lwc1 $f2, 0xc($v0) -/* 9EE548 80240958 4600103C */ c.lt.s $f2, $f0 -/* 9EE54C 8024095C 00000000 */ nop -/* 9EE550 80240960 45000009 */ bc1f .L80240988 -/* 9EE554 80240964 E4400010 */ swc1 $f0, 0x10($v0) -/* 9EE558 80240968 46001001 */ sub.s $f0, $f2, $f0 -/* 9EE55C 8024096C 3C013F00 */ lui $at, 0x3f00 -/* 9EE560 80240970 44811000 */ mtc1 $at, $f2 -/* 9EE564 80240974 00000000 */ nop -/* 9EE568 80240978 46020002 */ mul.s $f0, $f0, $f2 -/* 9EE56C 8024097C 00000000 */ nop -/* 9EE570 80240980 46002000 */ add.s $f0, $f4, $f0 -/* 9EE574 80240984 E4400014 */ swc1 $f0, 0x14($v0) -.L80240988: -/* 9EE578 80240988 C4420018 */ lwc1 $f2, 0x18($v0) -/* 9EE57C 8024098C C4460020 */ lwc1 $f6, 0x20($v0) -/* 9EE580 80240990 46061081 */ sub.s $f2, $f2, $f6 -/* 9EE584 80240994 3C014120 */ lui $at, 0x4120 -/* 9EE588 80240998 44812000 */ mtc1 $at, $f4 -/* 9EE58C 8024099C C440001C */ lwc1 $f0, 0x1c($v0) -/* 9EE590 802409A0 46041083 */ div.s $f2, $f2, $f4 -/* 9EE594 802409A4 46020000 */ add.s $f0, $f0, $f2 -/* 9EE598 802409A8 3C018024 */ lui $at, 0x8024 -/* 9EE59C 802409AC D4226E30 */ ldc1 $f2, 0x6e30($at) -/* 9EE5A0 802409B0 46000021 */ cvt.d.s $f0, $f0 -/* 9EE5A4 802409B4 46220002 */ mul.d $f0, $f0, $f2 -/* 9EE5A8 802409B8 00000000 */ nop -/* 9EE5AC 802409BC 46200020 */ cvt.s.d $f0, $f0 -/* 9EE5B0 802409C0 46003180 */ add.s $f6, $f6, $f0 -/* 9EE5B4 802409C4 E440001C */ swc1 $f0, 0x1c($v0) -/* 9EE5B8 802409C8 E4460020 */ swc1 $f6, 0x20($v0) -.L802409CC: -/* 9EE5BC 802409CC 3C108024 */ lui $s0, 0x8024 -/* 9EE5C0 802409D0 261013F8 */ addiu $s0, $s0, 0x13f8 -/* 9EE5C4 802409D4 3C140001 */ lui $s4, 1 -/* 9EE5C8 802409D8 C6000014 */ lwc1 $f0, 0x14($s0) -/* 9EE5CC 802409DC 3C013FE0 */ lui $at, 0x3fe0 -/* 9EE5D0 802409E0 44811800 */ mtc1 $at, $f3 -/* 9EE5D4 802409E4 44801000 */ mtc1 $zero, $f2 -/* 9EE5D8 802409E8 46000021 */ cvt.d.s $f0, $f0 -/* 9EE5DC 802409EC 46220002 */ mul.d $f0, $f0, $f2 -/* 9EE5E0 802409F0 00000000 */ nop -/* 9EE5E4 802409F4 3C12800A */ lui $s2, 0x800a -/* 9EE5E8 802409F8 2652A66C */ addiu $s2, $s2, -0x5994 -/* 9EE5EC 802409FC 36941630 */ ori $s4, $s4, 0x1630 -/* 9EE5F0 80240A00 3C02DE00 */ lui $v0, 0xde00 -/* 9EE5F4 80240A04 3C118007 */ lui $s1, 0x8007 -/* 9EE5F8 80240A08 263141F0 */ addiu $s1, $s1, 0x41f0 -/* 9EE5FC 80240A0C 8E430000 */ lw $v1, ($s2) -/* 9EE600 80240A10 3C13800A */ lui $s3, 0x800a -/* 9EE604 80240A14 2673A674 */ addiu $s3, $s3, -0x598c -/* 9EE608 80240A18 0060202D */ daddu $a0, $v1, $zero -/* 9EE60C 80240A1C 46200020 */ cvt.s.d $f0, $f0 -/* 9EE610 80240A20 E6000014 */ swc1 $f0, 0x14($s0) -/* 9EE614 80240A24 AC820000 */ sw $v0, ($a0) -/* 9EE618 80240A28 3C028024 */ lui $v0, 0x8024 -/* 9EE61C 80240A2C 24421768 */ addiu $v0, $v0, 0x1768 -/* 9EE620 80240A30 AC820004 */ sw $v0, 4($a0) -/* 9EE624 80240A34 8E050000 */ lw $a1, ($s0) -/* 9EE628 80240A38 8E060004 */ lw $a2, 4($s0) -/* 9EE62C 80240A3C 8E070008 */ lw $a3, 8($s0) -/* 9EE630 80240A40 96240000 */ lhu $a0, ($s1) -/* 9EE634 80240A44 8E620000 */ lw $v0, ($s3) -/* 9EE638 80240A48 24630008 */ addiu $v1, $v1, 8 -/* 9EE63C 80240A4C AE430000 */ sw $v1, ($s2) -/* 9EE640 80240A50 00042180 */ sll $a0, $a0, 6 -/* 9EE644 80240A54 00942021 */ addu $a0, $a0, $s4 -/* 9EE648 80240A58 0C019E08 */ jal guTranslate -/* 9EE64C 80240A5C 00442021 */ addu $a0, $v0, $a0 -/* 9EE650 80240A60 3C02DA38 */ lui $v0, 0xda38 -/* 9EE654 80240A64 34420002 */ ori $v0, $v0, 2 -/* 9EE658 80240A68 8E440000 */ lw $a0, ($s2) -/* 9EE65C 80240A6C 96250000 */ lhu $a1, ($s1) -/* 9EE660 80240A70 4480C000 */ mtc1 $zero, $f24 -/* 9EE664 80240A74 0080302D */ daddu $a2, $a0, $zero -/* 9EE668 80240A78 ACC20000 */ sw $v0, ($a2) -/* 9EE66C 80240A7C 30A2FFFF */ andi $v0, $a1, 0xffff -/* 9EE670 80240A80 00021180 */ sll $v0, $v0, 6 -/* 9EE674 80240A84 8E630000 */ lw $v1, ($s3) -/* 9EE678 80240A88 00541021 */ addu $v0, $v0, $s4 -/* 9EE67C 80240A8C 00621821 */ addu $v1, $v1, $v0 -/* 9EE680 80240A90 ACC30004 */ sw $v1, 4($a2) -/* 9EE684 80240A94 C61C0020 */ lwc1 $f28, 0x20($s0) -/* 9EE688 80240A98 4618E302 */ mul.s $f12, $f28, $f24 -/* 9EE68C 80240A9C 00000000 */ nop -/* 9EE690 80240AA0 3C014334 */ lui $at, 0x4334 -/* 9EE694 80240AA4 4481A000 */ mtc1 $at, $f20 -/* 9EE698 80240AA8 3C014049 */ lui $at, 0x4049 -/* 9EE69C 80240AAC 34210FD8 */ ori $at, $at, 0xfd8 -/* 9EE6A0 80240AB0 4481B000 */ mtc1 $at, $f22 -/* 9EE6A4 80240AB4 24840008 */ addiu $a0, $a0, 8 -/* 9EE6A8 80240AB8 46146303 */ div.s $f12, $f12, $f20 -/* 9EE6AC 80240ABC 46166302 */ mul.s $f12, $f12, $f22 -/* 9EE6B0 80240AC0 00000000 */ nop -/* 9EE6B4 80240AC4 24A50001 */ addiu $a1, $a1, 1 -/* 9EE6B8 80240AC8 AE440000 */ sw $a0, ($s2) -/* 9EE6BC 80240ACC A6250000 */ sh $a1, ($s1) -/* 9EE6C0 80240AD0 C61A0010 */ lwc1 $f26, 0x10($s0) -/* 9EE6C4 80240AD4 0C00A85B */ jal sin_rad -/* 9EE6C8 80240AD8 24150001 */ addiu $s5, $zero, 1 -/* 9EE6CC 80240ADC C60C0020 */ lwc1 $f12, 0x20($s0) -/* 9EE6D0 80240AE0 46186302 */ mul.s $f12, $f12, $f24 -/* 9EE6D4 80240AE4 00000000 */ nop -/* 9EE6D8 80240AE8 4600D002 */ mul.s $f0, $f26, $f0 -/* 9EE6DC 80240AEC 00000000 */ nop -/* 9EE6E0 80240AF0 46146303 */ div.s $f12, $f12, $f20 -/* 9EE6E4 80240AF4 46166302 */ mul.s $f12, $f12, $f22 -/* 9EE6E8 80240AF8 00000000 */ nop -/* 9EE6EC 80240AFC 0200B02D */ daddu $s6, $s0, $zero -/* 9EE6F0 80240B00 C7AE0020 */ lwc1 $f14, 0x20($sp) -/* 9EE6F4 80240B04 3C178024 */ lui $s7, 0x8024 -/* 9EE6F8 80240B08 26F71748 */ addiu $s7, $s7, 0x1748 -/* 9EE6FC 80240B0C 46007380 */ add.s $f14, $f14, $f0 -/* 9EE700 80240B10 3C100001 */ lui $s0, 1 -/* 9EE704 80240B14 36101630 */ ori $s0, $s0, 0x1630 -/* 9EE708 80240B18 0C00A874 */ jal cos_rad -/* 9EE70C 80240B1C E7AE0020 */ swc1 $f14, 0x20($sp) -/* 9EE710 80240B20 4600D587 */ neg.s $f22, $f26 -/* 9EE714 80240B24 4405C000 */ mfc1 $a1, $f24 -/* 9EE718 80240B28 4406C000 */ mfc1 $a2, $f24 -/* 9EE71C 80240B2C 4407E000 */ mfc1 $a3, $f28 -/* 9EE720 80240B30 96240000 */ lhu $a0, ($s1) -/* 9EE724 80240B34 4600B002 */ mul.s $f0, $f22, $f0 -/* 9EE728 80240B38 00000000 */ nop -/* 9EE72C 80240B3C E7B80014 */ swc1 $f24, 0x14($sp) -/* 9EE730 80240B40 E7B60018 */ swc1 $f22, 0x18($sp) -/* 9EE734 80240B44 E7B8001C */ swc1 $f24, 0x1c($sp) -/* 9EE738 80240B48 8E620000 */ lw $v0, ($s3) -/* 9EE73C 80240B4C 3C013F80 */ lui $at, 0x3f80 -/* 9EE740 80240B50 44811000 */ mtc1 $at, $f2 -/* 9EE744 80240B54 00042180 */ sll $a0, $a0, 6 -/* 9EE748 80240B58 00942021 */ addu $a0, $a0, $s4 -/* 9EE74C 80240B5C 00442021 */ addu $a0, $v0, $a0 -/* 9EE750 80240B60 E7A20010 */ swc1 $f2, 0x10($sp) -/* 9EE754 80240B64 0C01903A */ jal guPosition -/* 9EE758 80240B68 4600F780 */ add.s $f30, $f30, $f0 -/* 9EE75C 80240B6C 3C04DA38 */ lui $a0, 0xda38 -/* 9EE760 80240B70 00952025 */ or $a0, $a0, $s5 -/* 9EE764 80240B74 8E430000 */ lw $v1, ($s2) -/* 9EE768 80240B78 96220000 */ lhu $v0, ($s1) -/* 9EE76C 80240B7C 0060282D */ daddu $a1, $v1, $zero -/* 9EE770 80240B80 24630008 */ addiu $v1, $v1, 8 -/* 9EE774 80240B84 AE430000 */ sw $v1, ($s2) -/* 9EE778 80240B88 00551821 */ addu $v1, $v0, $s5 -/* 9EE77C 80240B8C 3042FFFF */ andi $v0, $v0, 0xffff -/* 9EE780 80240B90 00021180 */ sll $v0, $v0, 6 -/* 9EE784 80240B94 ACA40000 */ sw $a0, ($a1) -/* 9EE788 80240B98 A6230000 */ sh $v1, ($s1) -/* 9EE78C 80240B9C 8E630000 */ lw $v1, ($s3) -/* 9EE790 80240BA0 00541021 */ addu $v0, $v0, $s4 -/* 9EE794 80240BA4 00621821 */ addu $v1, $v1, $v0 -/* 9EE798 80240BA8 ACA30004 */ sw $v1, 4($a1) -.L80240BAC: -/* 9EE79C 80240BAC C6DC0020 */ lwc1 $f28, 0x20($s6) -/* 9EE7A0 80240BB0 4495A000 */ mtc1 $s5, $f20 -/* 9EE7A4 80240BB4 00000000 */ nop -/* 9EE7A8 80240BB8 4680A520 */ cvt.s.w $f20, $f20 -/* 9EE7AC 80240BBC 4614E302 */ mul.s $f12, $f28, $f20 -/* 9EE7B0 80240BC0 00000000 */ nop -/* 9EE7B4 80240BC4 3C014334 */ lui $at, 0x4334 -/* 9EE7B8 80240BC8 44817000 */ mtc1 $at, $f14 -/* 9EE7BC 80240BCC 00000000 */ nop -/* 9EE7C0 80240BD0 460E6303 */ div.s $f12, $f12, $f14 -/* 9EE7C4 80240BD4 3C014049 */ lui $at, 0x4049 -/* 9EE7C8 80240BD8 34210FD8 */ ori $at, $at, 0xfd8 -/* 9EE7CC 80240BDC 44817000 */ mtc1 $at, $f14 -/* 9EE7D0 80240BE0 00000000 */ nop -/* 9EE7D4 80240BE4 460E6302 */ mul.s $f12, $f12, $f14 -/* 9EE7D8 80240BE8 00000000 */ nop -/* 9EE7DC 80240BEC C6D60010 */ lwc1 $f22, 0x10($s6) -/* 9EE7E0 80240BF0 0C00A85B */ jal sin_rad -/* 9EE7E4 80240BF4 26B50001 */ addiu $s5, $s5, 1 -/* 9EE7E8 80240BF8 C6CC0020 */ lwc1 $f12, 0x20($s6) -/* 9EE7EC 80240BFC 46146302 */ mul.s $f12, $f12, $f20 -/* 9EE7F0 80240C00 00000000 */ nop -/* 9EE7F4 80240C04 4600B002 */ mul.s $f0, $f22, $f0 -/* 9EE7F8 80240C08 00000000 */ nop -/* 9EE7FC 80240C0C 3C014334 */ lui $at, 0x4334 -/* 9EE800 80240C10 44817000 */ mtc1 $at, $f14 -/* 9EE804 80240C14 00000000 */ nop -/* 9EE808 80240C18 460E6303 */ div.s $f12, $f12, $f14 -/* 9EE80C 80240C1C 3C014049 */ lui $at, 0x4049 -/* 9EE810 80240C20 34210FD8 */ ori $at, $at, 0xfd8 -/* 9EE814 80240C24 44817000 */ mtc1 $at, $f14 -/* 9EE818 80240C28 00000000 */ nop -/* 9EE81C 80240C2C 460E6302 */ mul.s $f12, $f12, $f14 -/* 9EE820 80240C30 00000000 */ nop -/* 9EE824 80240C34 C7AE0020 */ lwc1 $f14, 0x20($sp) -/* 9EE828 80240C38 46007380 */ add.s $f14, $f14, $f0 -/* 9EE82C 80240C3C 4600B587 */ neg.s $f22, $f22 -/* 9EE830 80240C40 0C00A874 */ jal cos_rad -/* 9EE834 80240C44 E7AE0020 */ swc1 $f14, 0x20($sp) -/* 9EE838 80240C48 3C090100 */ lui $t1, 0x100 -/* 9EE83C 80240C4C 35292004 */ ori $t1, $t1, 0x2004 -/* 9EE840 80240C50 4600B002 */ mul.s $f0, $f22, $f0 -/* 9EE844 80240C54 00000000 */ nop -/* 9EE848 80240C58 8E430000 */ lw $v1, ($s2) -/* 9EE84C 80240C5C 4405C000 */ mfc1 $a1, $f24 -/* 9EE850 80240C60 4406C000 */ mfc1 $a2, $f24 -/* 9EE854 80240C64 4407E000 */ mfc1 $a3, $f28 -/* 9EE858 80240C68 96240000 */ lhu $a0, ($s1) -/* 9EE85C 80240C6C 8E620000 */ lw $v0, ($s3) -/* 9EE860 80240C70 3C013F80 */ lui $at, 0x3f80 -/* 9EE864 80240C74 44811000 */ mtc1 $at, $f2 -/* 9EE868 80240C78 0060402D */ daddu $t0, $v1, $zero -/* 9EE86C 80240C7C 24630008 */ addiu $v1, $v1, 8 -/* 9EE870 80240C80 00042180 */ sll $a0, $a0, 6 -/* 9EE874 80240C84 00902021 */ addu $a0, $a0, $s0 -/* 9EE878 80240C88 00442021 */ addu $a0, $v0, $a0 -/* 9EE87C 80240C8C AE430000 */ sw $v1, ($s2) -/* 9EE880 80240C90 AD090000 */ sw $t1, ($t0) -/* 9EE884 80240C94 AD170004 */ sw $s7, 4($t0) -/* 9EE888 80240C98 E7A20010 */ swc1 $f2, 0x10($sp) -/* 9EE88C 80240C9C E7B80014 */ swc1 $f24, 0x14($sp) -/* 9EE890 80240CA0 E7B60018 */ swc1 $f22, 0x18($sp) -/* 9EE894 80240CA4 E7B8001C */ swc1 $f24, 0x1c($sp) -/* 9EE898 80240CA8 0C01903A */ jal guPosition -/* 9EE89C 80240CAC 4600F780 */ add.s $f30, $f30, $f0 -/* 9EE8A0 80240CB0 3C02DA38 */ lui $v0, 0xda38 -/* 9EE8A4 80240CB4 34420001 */ ori $v0, $v0, 1 -/* 9EE8A8 80240CB8 3C060100 */ lui $a2, 0x100 -/* 9EE8AC 80240CBC 34C62008 */ ori $a2, $a2, 0x2008 -/* 9EE8B0 80240CC0 3C080600 */ lui $t0, 0x600 -/* 9EE8B4 80240CC4 35080402 */ ori $t0, $t0, 0x402 -/* 9EE8B8 80240CC8 3C070004 */ lui $a3, 4 -/* 9EE8BC 80240CCC 34E70602 */ ori $a3, $a3, 0x602 -/* 9EE8C0 80240CD0 8E440000 */ lw $a0, ($s2) -/* 9EE8C4 80240CD4 96230000 */ lhu $v1, ($s1) -/* 9EE8C8 80240CD8 0080282D */ daddu $a1, $a0, $zero -/* 9EE8CC 80240CDC 24840008 */ addiu $a0, $a0, 8 -/* 9EE8D0 80240CE0 AE440000 */ sw $a0, ($s2) -/* 9EE8D4 80240CE4 ACA20000 */ sw $v0, ($a1) -/* 9EE8D8 80240CE8 24620001 */ addiu $v0, $v1, 1 -/* 9EE8DC 80240CEC 3063FFFF */ andi $v1, $v1, 0xffff -/* 9EE8E0 80240CF0 00031980 */ sll $v1, $v1, 6 -/* 9EE8E4 80240CF4 A6220000 */ sh $v0, ($s1) -/* 9EE8E8 80240CF8 8E620000 */ lw $v0, ($s3) -/* 9EE8EC 80240CFC 00701821 */ addu $v1, $v1, $s0 -/* 9EE8F0 80240D00 00431021 */ addu $v0, $v0, $v1 -/* 9EE8F4 80240D04 ACA20004 */ sw $v0, 4($a1) -/* 9EE8F8 80240D08 24820008 */ addiu $v0, $a0, 8 -/* 9EE8FC 80240D0C AE420000 */ sw $v0, ($s2) -/* 9EE900 80240D10 24820010 */ addiu $v0, $a0, 0x10 -/* 9EE904 80240D14 AC860000 */ sw $a2, ($a0) -/* 9EE908 80240D18 AC970004 */ sw $s7, 4($a0) -/* 9EE90C 80240D1C AE420000 */ sw $v0, ($s2) -/* 9EE910 80240D20 2AA20010 */ slti $v0, $s5, 0x10 -/* 9EE914 80240D24 AC880008 */ sw $t0, 8($a0) -/* 9EE918 80240D28 1440FFA0 */ bnez $v0, .L80240BAC -/* 9EE91C 80240D2C AC87000C */ sw $a3, 0xc($a0) -/* 9EE920 80240D30 3C03D838 */ lui $v1, 0xd838 -/* 9EE924 80240D34 3C05800A */ lui $a1, 0x800a -/* 9EE928 80240D38 24A5A66C */ addiu $a1, $a1, -0x5994 -/* 9EE92C 80240D3C 8CA20000 */ lw $v0, ($a1) -/* 9EE930 80240D40 34630002 */ ori $v1, $v1, 2 -/* 9EE934 80240D44 0040202D */ daddu $a0, $v0, $zero -/* 9EE938 80240D48 24420008 */ addiu $v0, $v0, 8 -/* 9EE93C 80240D4C ACA20000 */ sw $v0, ($a1) -/* 9EE940 80240D50 AC830000 */ sw $v1, ($a0) -/* 9EE944 80240D54 24030040 */ addiu $v1, $zero, 0x40 -/* 9EE948 80240D58 AC830004 */ sw $v1, 4($a0) -/* 9EE94C 80240D5C 3C03E700 */ lui $v1, 0xe700 -/* 9EE950 80240D60 AC430000 */ sw $v1, ($v0) -/* 9EE954 80240D64 3C038024 */ lui $v1, 0x8024 -/* 9EE958 80240D68 246313F8 */ addiu $v1, $v1, 0x13f8 -/* 9EE95C 80240D6C AC400004 */ sw $zero, 4($v0) -/* 9EE960 80240D70 8C640040 */ lw $a0, 0x40($v1) -/* 9EE964 80240D74 24420008 */ addiu $v0, $v0, 8 -/* 9EE968 80240D78 ACA20000 */ sw $v0, ($a1) -/* 9EE96C 80240D7C C7AE0020 */ lwc1 $f14, 0x20($sp) -/* 9EE970 80240D80 E47E0028 */ swc1 $f30, 0x28($v1) -/* 9EE974 80240D84 E46E0024 */ swc1 $f14, 0x24($v1) -/* 9EE978 80240D88 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 9EE97C 80240D8C 1080000E */ beqz $a0, .L80240DC8 -/* 9EE980 80240D90 E46E002C */ swc1 $f14, 0x2c($v1) -/* 9EE984 80240D94 3C014080 */ lui $at, 0x4080 -/* 9EE988 80240D98 44811000 */ mtc1 $at, $f2 -/* 9EE98C 80240D9C C7AE0020 */ lwc1 $f14, 0x20($sp) -/* 9EE990 80240DA0 3C0140C0 */ lui $at, 0x40c0 -/* 9EE994 80240DA4 44810000 */ mtc1 $at, $f0 -/* 9EE998 80240DA8 4602F081 */ sub.s $f2, $f30, $f2 -/* 9EE99C 80240DAC E48E0038 */ swc1 $f14, 0x38($a0) -/* 9EE9A0 80240DB0 8C620040 */ lw $v0, 0x40($v1) -/* 9EE9A4 80240DB4 E442003C */ swc1 $f2, 0x3c($v0) -/* 9EE9A8 80240DB8 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 9EE9AC 80240DBC 46007000 */ add.s $f0, $f14, $f0 -/* 9EE9B0 80240DC0 8C620040 */ lw $v0, 0x40($v1) -/* 9EE9B4 80240DC4 E4400040 */ swc1 $f0, 0x40($v0) -.L80240DC8: -/* 9EE9B8 80240DC8 8C620044 */ lw $v0, 0x44($v1) -/* 9EE9BC 80240DCC 1040000E */ beqz $v0, .L80240E08 -/* 9EE9C0 80240DD0 00000000 */ nop -/* 9EE9C4 80240DD4 3C014080 */ lui $at, 0x4080 -/* 9EE9C8 80240DD8 44811000 */ mtc1 $at, $f2 -/* 9EE9CC 80240DDC C7AE0020 */ lwc1 $f14, 0x20($sp) -/* 9EE9D0 80240DE0 3C014040 */ lui $at, 0x4040 -/* 9EE9D4 80240DE4 44810000 */ mtc1 $at, $f0 -/* 9EE9D8 80240DE8 4602F081 */ sub.s $f2, $f30, $f2 -/* 9EE9DC 80240DEC E44E0038 */ swc1 $f14, 0x38($v0) -/* 9EE9E0 80240DF0 8C620044 */ lw $v0, 0x44($v1) -/* 9EE9E4 80240DF4 E442003C */ swc1 $f2, 0x3c($v0) -/* 9EE9E8 80240DF8 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 9EE9EC 80240DFC 46007000 */ add.s $f0, $f14, $f0 -/* 9EE9F0 80240E00 8C620044 */ lw $v0, 0x44($v1) -/* 9EE9F4 80240E04 E4400040 */ swc1 $f0, 0x40($v0) -.L80240E08: -/* 9EE9F8 80240E08 8FBF0048 */ lw $ra, 0x48($sp) -/* 9EE9FC 80240E0C 8FB70044 */ lw $s7, 0x44($sp) -/* 9EEA00 80240E10 8FB60040 */ lw $s6, 0x40($sp) -/* 9EEA04 80240E14 8FB5003C */ lw $s5, 0x3c($sp) -/* 9EEA08 80240E18 8FB40038 */ lw $s4, 0x38($sp) -/* 9EEA0C 80240E1C 8FB30034 */ lw $s3, 0x34($sp) -/* 9EEA10 80240E20 8FB20030 */ lw $s2, 0x30($sp) -/* 9EEA14 80240E24 8FB1002C */ lw $s1, 0x2c($sp) -/* 9EEA18 80240E28 8FB00028 */ lw $s0, 0x28($sp) -/* 9EEA1C 80240E2C D7BE0078 */ ldc1 $f30, 0x78($sp) -/* 9EEA20 80240E30 D7BC0070 */ ldc1 $f28, 0x70($sp) -/* 9EEA24 80240E34 D7BA0068 */ ldc1 $f26, 0x68($sp) -/* 9EEA28 80240E38 D7B80060 */ ldc1 $f24, 0x60($sp) -/* 9EEA2C 80240E3C D7B60058 */ ldc1 $f22, 0x58($sp) -/* 9EEA30 80240E40 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 9EEA34 80240E44 03E00008 */ jr $ra -/* 9EEA38 80240E48 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_nok/nok_04/func_80240E70_9EDBF0.s b/asm/nonmatchings/world/area_nok/nok_04/func_80240E70_9EDBF0.s deleted file mode 100644 index 3d29d3d219..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_04/func_80240E70_9EDBF0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E70_9EEA60 -/* 9EEA60 80240E70 24020001 */ addiu $v0, $zero, 1 -/* 9EEA64 80240E74 3C018024 */ lui $at, 0x8024 -/* 9EEA68 80240E78 AC223254 */ sw $v0, 0x3254($at) -/* 9EEA6C 80240E7C 03E00008 */ jr $ra -/* 9EEA70 80240E80 24020002 */ addiu $v0, $zero, 2 -/* 9EEA74 80240E84 00000000 */ nop -/* 9EEA78 80240E88 00000000 */ nop -/* 9EEA7C 80240E8C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_04/func_80240E90_9EDBF0.s b/asm/nonmatchings/world/area_nok/nok_04/func_80240E90_9EDBF0.s deleted file mode 100644 index 9bce1d94f6..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_04/func_80240E90_9EDBF0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E90_9EEA80 -/* 9EEA80 80240E90 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9EEA84 80240E94 3C048024 */ lui $a0, 0x8024 -/* 9EEA88 80240E98 24846E40 */ addiu $a0, $a0, 0x6e40 -/* 9EEA8C 80240E9C 27A50010 */ addiu $a1, $sp, 0x10 -/* 9EEA90 80240EA0 AFBF0020 */ sw $ra, 0x20($sp) -/* 9EEA94 80240EA4 AFB1001C */ sw $s1, 0x1c($sp) -/* 9EEA98 80240EA8 0C016B3A */ jal load_asset_by_name -/* 9EEA9C 80240EAC AFB00018 */ sw $s0, 0x18($sp) -/* 9EEAA0 80240EB0 0040802D */ daddu $s0, $v0, $zero -/* 9EEAA4 80240EB4 0200202D */ daddu $a0, $s0, $zero -/* 9EEAA8 80240EB8 3C118024 */ lui $s1, 0x8024 -/* 9EEAAC 80240EBC 26316E50 */ addiu $s1, $s1, 0x6e50 -/* 9EEAB0 80240EC0 0C01BB7C */ jal decode_yay0 -/* 9EEAB4 80240EC4 0220282D */ daddu $a1, $s1, $zero -/* 9EEAB8 80240EC8 0C00AB1E */ jal general_heap_free -/* 9EEABC 80240ECC 0200202D */ daddu $a0, $s0, $zero -/* 9EEAC0 80240ED0 3C048025 */ lui $a0, %hi(pause_partners_load_portrait) -/* 9EEAC4 80240ED4 2484ADE0 */ addiu $a0, $a0, %lo(pause_partners_load_portrait) -/* 9EEAC8 80240ED8 3C028024 */ lui $v0, 0x8024 -/* 9EEACC 80240EDC 24427050 */ addiu $v0, $v0, 0x7050 -/* 9EEAD0 80240EE0 AC820000 */ sw $v0, ($a0) -/* 9EEAD4 80240EE4 24020096 */ addiu $v0, $zero, 0x96 -/* 9EEAD8 80240EE8 A4820008 */ sh $v0, 8($a0) -/* 9EEADC 80240EEC 24020069 */ addiu $v0, $zero, 0x69 -/* 9EEAE0 80240EF0 A482000A */ sh $v0, 0xa($a0) -/* 9EEAE4 80240EF4 24020002 */ addiu $v0, $zero, 2 -/* 9EEAE8 80240EF8 AC82000C */ sw $v0, 0xc($a0) -/* 9EEAEC 80240EFC 24020001 */ addiu $v0, $zero, 1 -/* 9EEAF0 80240F00 AC910004 */ sw $s1, 4($a0) -/* 9EEAF4 80240F04 0C0496CB */ jal set_message_images -/* 9EEAF8 80240F08 AC820010 */ sw $v0, 0x10($a0) -/* 9EEAFC 80240F0C 8FBF0020 */ lw $ra, 0x20($sp) -/* 9EEB00 80240F10 8FB1001C */ lw $s1, 0x1c($sp) -/* 9EEB04 80240F14 8FB00018 */ lw $s0, 0x18($sp) -/* 9EEB08 80240F18 24020002 */ addiu $v0, $zero, 2 -/* 9EEB0C 80240F1C 03E00008 */ jr $ra -/* 9EEB10 80240F20 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9EEB14 80240F24 00000000 */ nop -/* 9EEB18 80240F28 00000000 */ nop -/* 9EEB1C 80240F2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_11/func_8024007C_9F4A40.s b/asm/nonmatchings/world/area_nok/nok_11/func_8024007C_9F4A40.s deleted file mode 100644 index c6b8997979..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/func_8024007C_9F4A40.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024007C_9F4ABC -/* 9F4ABC 8024007C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9F4AC0 80240080 AFB3001C */ sw $s3, 0x1c($sp) -/* 9F4AC4 80240084 0080982D */ daddu $s3, $a0, $zero -/* 9F4AC8 80240088 AFBF0020 */ sw $ra, 0x20($sp) -/* 9F4ACC 8024008C AFB20018 */ sw $s2, 0x18($sp) -/* 9F4AD0 80240090 AFB10014 */ sw $s1, 0x14($sp) -/* 9F4AD4 80240094 AFB00010 */ sw $s0, 0x10($sp) -/* 9F4AD8 80240098 8E710148 */ lw $s1, 0x148($s3) -/* 9F4ADC 8024009C 86240008 */ lh $a0, 8($s1) -/* 9F4AE0 802400A0 0C00EABB */ jal get_npc_unsafe -/* 9F4AE4 802400A4 00A0902D */ daddu $s2, $a1, $zero -/* 9F4AE8 802400A8 0040802D */ daddu $s0, $v0, $zero -/* 9F4AEC 802400AC 8602008E */ lh $v0, 0x8e($s0) -/* 9F4AF0 802400B0 9603008E */ lhu $v1, 0x8e($s0) -/* 9F4AF4 802400B4 18400005 */ blez $v0, .L802400CC -/* 9F4AF8 802400B8 2462FFFF */ addiu $v0, $v1, -1 -/* 9F4AFC 802400BC A602008E */ sh $v0, 0x8e($s0) -/* 9F4B00 802400C0 00021400 */ sll $v0, $v0, 0x10 -/* 9F4B04 802400C4 1C400033 */ bgtz $v0, .L80240194 -/* 9F4B08 802400C8 00000000 */ nop -.L802400CC: -/* 9F4B0C 802400CC 8602008C */ lh $v0, 0x8c($s0) -/* 9F4B10 802400D0 14400030 */ bnez $v0, .L80240194 -/* 9F4B14 802400D4 00000000 */ nop -/* 9F4B18 802400D8 8E2200CC */ lw $v0, 0xcc($s1) -/* 9F4B1C 802400DC 8C420024 */ lw $v0, 0x24($v0) -/* 9F4B20 802400E0 AE020028 */ sw $v0, 0x28($s0) -/* 9F4B24 802400E4 C6400018 */ lwc1 $f0, 0x18($s2) -/* 9F4B28 802400E8 E6000018 */ swc1 $f0, 0x18($s0) -/* 9F4B2C 802400EC 8E230088 */ lw $v1, 0x88($s1) -/* 9F4B30 802400F0 24020005 */ addiu $v0, $zero, 5 -/* 9F4B34 802400F4 10620005 */ beq $v1, $v0, .L8024010C -/* 9F4B38 802400F8 00000000 */ nop -/* 9F4B3C 802400FC 10600003 */ beqz $v1, .L8024010C -/* 9F4B40 80240100 24020001 */ addiu $v0, $zero, 1 -/* 9F4B44 80240104 14620006 */ bne $v1, $v0, .L80240120 -/* 9F4B48 80240108 00000000 */ nop -.L8024010C: -/* 9F4B4C 8024010C 8E220084 */ lw $v0, 0x84($s1) -/* 9F4B50 80240110 00021FC2 */ srl $v1, $v0, 0x1f -/* 9F4B54 80240114 00431021 */ addu $v0, $v0, $v1 -/* 9F4B58 80240118 00021043 */ sra $v0, $v0, 1 -/* 9F4B5C 8024011C A60200A8 */ sh $v0, 0xa8($s0) -.L80240120: -/* 9F4B60 80240120 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9F4B64 80240124 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9F4B68 80240128 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9F4B6C 8024012C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9F4B70 80240130 8C460028 */ lw $a2, 0x28($v0) -/* 9F4B74 80240134 0C00A7B5 */ jal dist2D -/* 9F4B78 80240138 8C470030 */ lw $a3, 0x30($v0) -/* 9F4B7C 8024013C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9F4B80 80240140 46020003 */ div.s $f0, $f0, $f2 -/* 9F4B84 80240144 3C018024 */ lui $at, 0x8024 -/* 9F4B88 80240148 D4225CF0 */ ldc1 $f2, 0x5cf0($at) -/* 9F4B8C 8024014C 46000021 */ cvt.d.s $f0, $f0 -/* 9F4B90 80240150 46220000 */ add.d $f0, $f0, $f2 -/* 9F4B94 80240154 4620010D */ trunc.w.d $f4, $f0 -/* 9F4B98 80240158 44022000 */ mfc1 $v0, $f4 -/* 9F4B9C 8024015C 00000000 */ nop -/* 9F4BA0 80240160 A602008E */ sh $v0, 0x8e($s0) -/* 9F4BA4 80240164 00021400 */ sll $v0, $v0, 0x10 -/* 9F4BA8 80240168 8E230078 */ lw $v1, 0x78($s1) -/* 9F4BAC 8024016C 00021403 */ sra $v0, $v0, 0x10 -/* 9F4BB0 80240170 0043102A */ slt $v0, $v0, $v1 -/* 9F4BB4 80240174 10400003 */ beqz $v0, .L80240184 -/* 9F4BB8 80240178 00000000 */ nop -/* 9F4BBC 8024017C 9622007A */ lhu $v0, 0x7a($s1) -/* 9F4BC0 80240180 A602008E */ sh $v0, 0x8e($s0) -.L80240184: -/* 9F4BC4 80240184 8602008E */ lh $v0, 0x8e($s0) -/* 9F4BC8 80240188 AE22007C */ sw $v0, 0x7c($s1) -/* 9F4BCC 8024018C 2402000E */ addiu $v0, $zero, 0xe -/* 9F4BD0 80240190 AE620070 */ sw $v0, 0x70($s3) -.L80240194: -/* 9F4BD4 80240194 8FBF0020 */ lw $ra, 0x20($sp) -/* 9F4BD8 80240198 8FB3001C */ lw $s3, 0x1c($sp) -/* 9F4BDC 8024019C 8FB20018 */ lw $s2, 0x18($sp) -/* 9F4BE0 802401A0 8FB10014 */ lw $s1, 0x14($sp) -/* 9F4BE4 802401A4 8FB00010 */ lw $s0, 0x10($sp) -/* 9F4BE8 802401A8 03E00008 */ jr $ra -/* 9F4BEC 802401AC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_11/func_802401B0_9F4A40.s b/asm/nonmatchings/world/area_nok/nok_11/func_802401B0_9F4A40.s deleted file mode 100644 index 171787a68b..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/func_802401B0_9F4A40.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_9F4BF0 -/* 9F4BF0 802401B0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9F4BF4 802401B4 AFB3003C */ sw $s3, 0x3c($sp) -/* 9F4BF8 802401B8 0080982D */ daddu $s3, $a0, $zero -/* 9F4BFC 802401BC AFBF0040 */ sw $ra, 0x40($sp) -/* 9F4C00 802401C0 AFB20038 */ sw $s2, 0x38($sp) -/* 9F4C04 802401C4 AFB10034 */ sw $s1, 0x34($sp) -/* 9F4C08 802401C8 AFB00030 */ sw $s0, 0x30($sp) -/* 9F4C0C 802401CC 8E710148 */ lw $s1, 0x148($s3) -/* 9F4C10 802401D0 0C00EABB */ jal get_npc_unsafe -/* 9F4C14 802401D4 86240008 */ lh $a0, 8($s1) -/* 9F4C18 802401D8 0040802D */ daddu $s0, $v0, $zero -/* 9F4C1C 802401DC 8E22007C */ lw $v0, 0x7c($s1) -/* 9F4C20 802401E0 8603008E */ lh $v1, 0x8e($s0) -/* 9F4C24 802401E4 2442FFFF */ addiu $v0, $v0, -1 -/* 9F4C28 802401E8 14620012 */ bne $v1, $v0, .L80240234 -/* 9F4C2C 802401EC 00000000 */ nop -/* 9F4C30 802401F0 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9F4C34 802401F4 4600020D */ trunc.w.s $f8, $f0 -/* 9F4C38 802401F8 44024000 */ mfc1 $v0, $f8 -/* 9F4C3C 802401FC 00000000 */ nop -/* 9F4C40 80240200 A6220010 */ sh $v0, 0x10($s1) -/* 9F4C44 80240204 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F4C48 80240208 4600020D */ trunc.w.s $f8, $f0 -/* 9F4C4C 8024020C 44024000 */ mfc1 $v0, $f8 -/* 9F4C50 80240210 00000000 */ nop -/* 9F4C54 80240214 A6220012 */ sh $v0, 0x12($s1) -/* 9F4C58 80240218 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9F4C5C 8024021C 24020001 */ addiu $v0, $zero, 1 -/* 9F4C60 80240220 A2220007 */ sb $v0, 7($s1) -/* 9F4C64 80240224 4600020D */ trunc.w.s $f8, $f0 -/* 9F4C68 80240228 44024000 */ mfc1 $v0, $f8 -/* 9F4C6C 8024022C 00000000 */ nop -/* 9F4C70 80240230 A6220014 */ sh $v0, 0x14($s1) -.L80240234: -/* 9F4C74 80240234 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9F4C78 80240238 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9F4C7C 8024023C C6040040 */ lwc1 $f4, 0x40($s0) -/* 9F4C80 80240240 C6060018 */ lwc1 $f6, 0x18($s0) -/* 9F4C84 80240244 E7A00020 */ swc1 $f0, 0x20($sp) -/* 9F4C88 80240248 E7A20024 */ swc1 $f2, 0x24($sp) -/* 9F4C8C 8024024C E7A40028 */ swc1 $f4, 0x28($sp) -/* 9F4C90 80240250 E7A60010 */ swc1 $f6, 0x10($sp) -/* 9F4C94 80240254 C600000C */ lwc1 $f0, 0xc($s0) -/* 9F4C98 80240258 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9F4C9C 8024025C 860200A8 */ lh $v0, 0xa8($s0) -/* 9F4CA0 80240260 27A50020 */ addiu $a1, $sp, 0x20 -/* 9F4CA4 80240264 44820000 */ mtc1 $v0, $f0 -/* 9F4CA8 80240268 00000000 */ nop -/* 9F4CAC 8024026C 46800020 */ cvt.s.w $f0, $f0 -/* 9F4CB0 80240270 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9F4CB4 80240274 860200A6 */ lh $v0, 0xa6($s0) -/* 9F4CB8 80240278 27A60024 */ addiu $a2, $sp, 0x24 -/* 9F4CBC 8024027C 44820000 */ mtc1 $v0, $f0 -/* 9F4CC0 80240280 00000000 */ nop -/* 9F4CC4 80240284 46800020 */ cvt.s.w $f0, $f0 -/* 9F4CC8 80240288 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 9F4CCC 8024028C 8E040080 */ lw $a0, 0x80($s0) -/* 9F4CD0 80240290 0C037711 */ jal func_800DDC44 -/* 9F4CD4 80240294 27A70028 */ addiu $a3, $sp, 0x28 -/* 9F4CD8 80240298 0040902D */ daddu $s2, $v0, $zero -/* 9F4CDC 8024029C 16400005 */ bnez $s2, .L802402B4 -/* 9F4CE0 802402A0 00000000 */ nop -/* 9F4CE4 802402A4 8E050018 */ lw $a1, 0x18($s0) -/* 9F4CE8 802402A8 8E06000C */ lw $a2, 0xc($s0) -/* 9F4CEC 802402AC 0C00EA95 */ jal npc_move_heading -/* 9F4CF0 802402B0 0200202D */ daddu $a0, $s0, $zero -.L802402B4: -/* 9F4CF4 802402B4 8602008E */ lh $v0, 0x8e($s0) -/* 9F4CF8 802402B8 9603008E */ lhu $v1, 0x8e($s0) -/* 9F4CFC 802402BC 18400007 */ blez $v0, .L802402DC -/* 9F4D00 802402C0 2462FFFF */ addiu $v0, $v1, -1 -/* 9F4D04 802402C4 A602008E */ sh $v0, 0x8e($s0) -/* 9F4D08 802402C8 00021400 */ sll $v0, $v0, 0x10 -/* 9F4D0C 802402CC 18400003 */ blez $v0, .L802402DC -/* 9F4D10 802402D0 00000000 */ nop -/* 9F4D14 802402D4 12400008 */ beqz $s2, .L802402F8 -/* 9F4D18 802402D8 00000000 */ nop -.L802402DC: -/* 9F4D1C 802402DC 8E2200CC */ lw $v0, 0xcc($s1) -/* 9F4D20 802402E0 A2200007 */ sb $zero, 7($s1) -/* 9F4D24 802402E4 8C420028 */ lw $v0, 0x28($v0) -/* 9F4D28 802402E8 A600008E */ sh $zero, 0x8e($s0) -/* 9F4D2C 802402EC AE020028 */ sw $v0, 0x28($s0) -/* 9F4D30 802402F0 2402000F */ addiu $v0, $zero, 0xf -/* 9F4D34 802402F4 AE620070 */ sw $v0, 0x70($s3) -.L802402F8: -/* 9F4D38 802402F8 8FBF0040 */ lw $ra, 0x40($sp) -/* 9F4D3C 802402FC 8FB3003C */ lw $s3, 0x3c($sp) -/* 9F4D40 80240300 8FB20038 */ lw $s2, 0x38($sp) -/* 9F4D44 80240304 8FB10034 */ lw $s1, 0x34($sp) -/* 9F4D48 80240308 8FB00030 */ lw $s0, 0x30($sp) -/* 9F4D4C 8024030C 03E00008 */ jr $ra -/* 9F4D50 80240310 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_11/func_80240314_9F4A40.s b/asm/nonmatchings/world/area_nok/nok_11/func_80240314_9F4A40.s deleted file mode 100644 index 58fd3983f5..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/func_80240314_9F4A40.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240314_9F4D54 -/* 9F4D54 80240314 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9F4D58 80240318 AFB10014 */ sw $s1, 0x14($sp) -/* 9F4D5C 8024031C 0080882D */ daddu $s1, $a0, $zero -/* 9F4D60 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* 9F4D64 80240324 AFB00010 */ sw $s0, 0x10($sp) -/* 9F4D68 80240328 8E300148 */ lw $s0, 0x148($s1) -/* 9F4D6C 8024032C 0C00EABB */ jal get_npc_unsafe -/* 9F4D70 80240330 86040008 */ lh $a0, 8($s0) -/* 9F4D74 80240334 0040202D */ daddu $a0, $v0, $zero -/* 9F4D78 80240338 9482008E */ lhu $v0, 0x8e($a0) -/* 9F4D7C 8024033C 24030003 */ addiu $v1, $zero, 3 -/* 9F4D80 80240340 24420001 */ addiu $v0, $v0, 1 -/* 9F4D84 80240344 A482008E */ sh $v0, 0x8e($a0) -/* 9F4D88 80240348 00021400 */ sll $v0, $v0, 0x10 -/* 9F4D8C 8024034C 00021403 */ sra $v0, $v0, 0x10 -/* 9F4D90 80240350 14430003 */ bne $v0, $v1, .L80240360 -/* 9F4D94 80240354 00000000 */ nop -/* 9F4D98 80240358 96020086 */ lhu $v0, 0x86($s0) -/* 9F4D9C 8024035C A48200A8 */ sh $v0, 0xa8($a0) -.L80240360: -/* 9F4DA0 80240360 8482008E */ lh $v0, 0x8e($a0) -/* 9F4DA4 80240364 8E030080 */ lw $v1, 0x80($s0) -/* 9F4DA8 80240368 0043102A */ slt $v0, $v0, $v1 -/* 9F4DAC 8024036C 14400004 */ bnez $v0, .L80240380 -/* 9F4DB0 80240370 00000000 */ nop -/* 9F4DB4 80240374 96020086 */ lhu $v0, 0x86($s0) -/* 9F4DB8 80240378 A48200A8 */ sh $v0, 0xa8($a0) -/* 9F4DBC 8024037C AE200070 */ sw $zero, 0x70($s1) -.L80240380: -/* 9F4DC0 80240380 8FBF0018 */ lw $ra, 0x18($sp) -/* 9F4DC4 80240384 8FB10014 */ lw $s1, 0x14($sp) -/* 9F4DC8 80240388 8FB00010 */ lw $s0, 0x10($sp) -/* 9F4DCC 8024038C 03E00008 */ jr $ra -/* 9F4DD0 80240390 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_11/func_80240394_9F4A40.s b/asm/nonmatchings/world/area_nok/nok_11/func_80240394_9F4A40.s deleted file mode 100644 index e25f6b6a17..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/func_80240394_9F4A40.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240394_9F4DD4 -/* 9F4DD4 80240394 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9F4DD8 80240398 AFB3005C */ sw $s3, 0x5c($sp) -/* 9F4DDC 8024039C 0080982D */ daddu $s3, $a0, $zero -/* 9F4DE0 802403A0 AFBF0068 */ sw $ra, 0x68($sp) -/* 9F4DE4 802403A4 AFB50064 */ sw $s5, 0x64($sp) -/* 9F4DE8 802403A8 AFB40060 */ sw $s4, 0x60($sp) -/* 9F4DEC 802403AC AFB20058 */ sw $s2, 0x58($sp) -/* 9F4DF0 802403B0 AFB10054 */ sw $s1, 0x54($sp) -/* 9F4DF4 802403B4 AFB00050 */ sw $s0, 0x50($sp) -/* 9F4DF8 802403B8 8E710148 */ lw $s1, 0x148($s3) -/* 9F4DFC 802403BC 86240008 */ lh $a0, 8($s1) -/* 9F4E00 802403C0 0C00EABB */ jal get_npc_unsafe -/* 9F4E04 802403C4 00A0802D */ daddu $s0, $a1, $zero -/* 9F4E08 802403C8 8E63000C */ lw $v1, 0xc($s3) -/* 9F4E0C 802403CC 0260202D */ daddu $a0, $s3, $zero -/* 9F4E10 802403D0 8C650000 */ lw $a1, ($v1) -/* 9F4E14 802403D4 0C0B1EAF */ jal get_variable -/* 9F4E18 802403D8 0040902D */ daddu $s2, $v0, $zero -/* 9F4E1C 802403DC AFA00028 */ sw $zero, 0x28($sp) -/* 9F4E20 802403E0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9F4E24 802403E4 8C630030 */ lw $v1, 0x30($v1) -/* 9F4E28 802403E8 AFA3002C */ sw $v1, 0x2c($sp) -/* 9F4E2C 802403EC 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9F4E30 802403F0 8C63001C */ lw $v1, 0x1c($v1) -/* 9F4E34 802403F4 AFA30030 */ sw $v1, 0x30($sp) -/* 9F4E38 802403F8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9F4E3C 802403FC 8C630024 */ lw $v1, 0x24($v1) -/* 9F4E40 80240400 AFA30034 */ sw $v1, 0x34($sp) -/* 9F4E44 80240404 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9F4E48 80240408 8C630028 */ lw $v1, 0x28($v1) -/* 9F4E4C 8024040C 27B50028 */ addiu $s5, $sp, 0x28 -/* 9F4E50 80240410 AFA30038 */ sw $v1, 0x38($sp) -/* 9F4E54 80240414 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9F4E58 80240418 3C0142C8 */ lui $at, 0x42c8 -/* 9F4E5C 8024041C 44810000 */ mtc1 $at, $f0 -/* 9F4E60 80240420 8C63002C */ lw $v1, 0x2c($v1) -/* 9F4E64 80240424 0040A02D */ daddu $s4, $v0, $zero -/* 9F4E68 80240428 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9F4E6C 8024042C A7A00044 */ sh $zero, 0x44($sp) -/* 9F4E70 80240430 12000009 */ beqz $s0, .L80240458 -/* 9F4E74 80240434 AFA3003C */ sw $v1, 0x3c($sp) -/* 9F4E78 80240438 864300A8 */ lh $v1, 0xa8($s2) -/* 9F4E7C 8024043C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9F4E80 80240440 AE20008C */ sw $zero, 0x8c($s1) -/* 9F4E84 80240444 A22000B5 */ sb $zero, 0xb5($s1) -/* 9F4E88 80240448 34420008 */ ori $v0, $v0, 8 -/* 9F4E8C 8024044C AE230084 */ sw $v1, 0x84($s1) -/* 9F4E90 80240450 0809011A */ j .L80240468 -/* 9F4E94 80240454 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240458: -/* 9F4E98 80240458 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9F4E9C 8024045C 30420004 */ andi $v0, $v0, 4 -/* 9F4EA0 80240460 10400047 */ beqz $v0, .L80240580 -/* 9F4EA4 80240464 00000000 */ nop -.L80240468: -/* 9F4EA8 80240468 AE600070 */ sw $zero, 0x70($s3) -/* 9F4EAC 8024046C A640008E */ sh $zero, 0x8e($s2) -/* 9F4EB0 80240470 8E2300CC */ lw $v1, 0xcc($s1) -/* 9F4EB4 80240474 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9F4EB8 80240478 A2200007 */ sb $zero, 7($s1) -/* 9F4EBC 8024047C 8E420000 */ lw $v0, ($s2) -/* 9F4EC0 80240480 8C630000 */ lw $v1, ($v1) -/* 9F4EC4 80240484 00441024 */ and $v0, $v0, $a0 -/* 9F4EC8 80240488 AE420000 */ sw $v0, ($s2) -/* 9F4ECC 8024048C AE430028 */ sw $v1, 0x28($s2) -/* 9F4ED0 80240490 96220086 */ lhu $v0, 0x86($s1) -/* 9F4ED4 80240494 A64200A8 */ sh $v0, 0xa8($s2) -/* 9F4ED8 80240498 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F4EDC 8024049C AE200090 */ sw $zero, 0x90($s1) -/* 9F4EE0 802404A0 8C420034 */ lw $v0, 0x34($v0) -/* 9F4EE4 802404A4 14400006 */ bnez $v0, .L802404C0 -/* 9F4EE8 802404A8 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9F4EEC 802404AC 8E420000 */ lw $v0, ($s2) -/* 9F4EF0 802404B0 2403FFF7 */ addiu $v1, $zero, -9 -/* 9F4EF4 802404B4 34420200 */ ori $v0, $v0, 0x200 -/* 9F4EF8 802404B8 08090133 */ j .L802404CC -/* 9F4EFC 802404BC 00431024 */ and $v0, $v0, $v1 -.L802404C0: -/* 9F4F00 802404C0 8E420000 */ lw $v0, ($s2) -/* 9F4F04 802404C4 00431024 */ and $v0, $v0, $v1 -/* 9F4F08 802404C8 34420008 */ ori $v0, $v0, 8 -.L802404CC: -/* 9F4F0C 802404CC AE420000 */ sw $v0, ($s2) -/* 9F4F10 802404D0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9F4F14 802404D4 30420004 */ andi $v0, $v0, 4 -/* 9F4F18 802404D8 1040001E */ beqz $v0, .L80240554 -/* 9F4F1C 802404DC 24040002 */ addiu $a0, $zero, 2 -/* 9F4F20 802404E0 0240282D */ daddu $a1, $s2, $zero -/* 9F4F24 802404E4 0000302D */ daddu $a2, $zero, $zero -/* 9F4F28 802404E8 24020063 */ addiu $v0, $zero, 0x63 -/* 9F4F2C 802404EC AE620070 */ sw $v0, 0x70($s3) -/* 9F4F30 802404F0 AE600074 */ sw $zero, 0x74($s3) -/* 9F4F34 802404F4 864300A8 */ lh $v1, 0xa8($s2) -/* 9F4F38 802404F8 3C013F80 */ lui $at, 0x3f80 -/* 9F4F3C 802404FC 44810000 */ mtc1 $at, $f0 -/* 9F4F40 80240500 3C014000 */ lui $at, 0x4000 -/* 9F4F44 80240504 44811000 */ mtc1 $at, $f2 -/* 9F4F48 80240508 3C01C1A0 */ lui $at, 0xc1a0 -/* 9F4F4C 8024050C 44812000 */ mtc1 $at, $f4 -/* 9F4F50 80240510 24020028 */ addiu $v0, $zero, 0x28 -/* 9F4F54 80240514 AFA2001C */ sw $v0, 0x1c($sp) -/* 9F4F58 80240518 44833000 */ mtc1 $v1, $f6 -/* 9F4F5C 8024051C 00000000 */ nop -/* 9F4F60 80240520 468031A0 */ cvt.s.w $f6, $f6 -/* 9F4F64 80240524 44073000 */ mfc1 $a3, $f6 -/* 9F4F68 80240528 27A20048 */ addiu $v0, $sp, 0x48 -/* 9F4F6C 8024052C AFA20020 */ sw $v0, 0x20($sp) -/* 9F4F70 80240530 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9F4F74 80240534 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9F4F78 80240538 0C01BFA4 */ jal fx_emote -/* 9F4F7C 8024053C E7A40018 */ swc1 $f4, 0x18($sp) -/* 9F4F80 80240540 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9F4F84 80240544 2403FFFB */ addiu $v1, $zero, -5 -/* 9F4F88 80240548 00431024 */ and $v0, $v0, $v1 -/* 9F4F8C 8024054C 08090160 */ j .L80240580 -/* 9F4F90 80240550 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240554: -/* 9F4F94 80240554 8E220000 */ lw $v0, ($s1) -/* 9F4F98 80240558 3C034000 */ lui $v1, 0x4000 -/* 9F4F9C 8024055C 00431024 */ and $v0, $v0, $v1 -/* 9F4FA0 80240560 10400007 */ beqz $v0, .L80240580 -/* 9F4FA4 80240564 3C03BFFF */ lui $v1, 0xbfff -/* 9F4FA8 80240568 2402000C */ addiu $v0, $zero, 0xc -/* 9F4FAC 8024056C AE620070 */ sw $v0, 0x70($s3) -/* 9F4FB0 80240570 8E220000 */ lw $v0, ($s1) -/* 9F4FB4 80240574 3463FFFF */ ori $v1, $v1, 0xffff -/* 9F4FB8 80240578 00431024 */ and $v0, $v0, $v1 -/* 9F4FBC 8024057C AE220000 */ sw $v0, ($s1) -.L80240580: -/* 9F4FC0 80240580 8E220090 */ lw $v0, 0x90($s1) -/* 9F4FC4 80240584 1840000C */ blez $v0, .L802405B8 -/* 9F4FC8 80240588 2442FFFF */ addiu $v0, $v0, -1 -/* 9F4FCC 8024058C 14400087 */ bnez $v0, .L802407AC -/* 9F4FD0 80240590 AE220090 */ sw $v0, 0x90($s1) -/* 9F4FD4 80240594 3C03FFAA */ lui $v1, 0xffaa -/* 9F4FD8 80240598 8E420028 */ lw $v0, 0x28($s2) -/* 9F4FDC 8024059C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 9F4FE0 802405A0 00431021 */ addu $v0, $v0, $v1 -/* 9F4FE4 802405A4 2C420002 */ sltiu $v0, $v0, 2 -/* 9F4FE8 802405A8 10400003 */ beqz $v0, .L802405B8 -/* 9F4FEC 802405AC 3C020055 */ lui $v0, 0x55 -/* 9F4FF0 802405B0 3442000C */ ori $v0, $v0, 0xc -/* 9F4FF4 802405B4 AE420028 */ sw $v0, 0x28($s2) -.L802405B8: -/* 9F4FF8 802405B8 8E630070 */ lw $v1, 0x70($s3) -/* 9F4FFC 802405BC 2402000C */ addiu $v0, $zero, 0xc -/* 9F5000 802405C0 10620048 */ beq $v1, $v0, .L802406E4 -/* 9F5004 802405C4 2862000D */ slti $v0, $v1, 0xd -/* 9F5008 802405C8 1040000F */ beqz $v0, .L80240608 -/* 9F500C 802405CC 24100001 */ addiu $s0, $zero, 1 -/* 9F5010 802405D0 1070001E */ beq $v1, $s0, .L8024064C -/* 9F5014 802405D4 28620002 */ slti $v0, $v1, 2 -/* 9F5018 802405D8 10400005 */ beqz $v0, .L802405F0 -/* 9F501C 802405DC 24020002 */ addiu $v0, $zero, 2 -/* 9F5020 802405E0 10600015 */ beqz $v1, .L80240638 -/* 9F5024 802405E4 0260202D */ daddu $a0, $s3, $zero -/* 9F5028 802405E8 080901D0 */ j .L80240740 -/* 9F502C 802405EC 00000000 */ nop -.L802405F0: -/* 9F5030 802405F0 1062001C */ beq $v1, $v0, .L80240664 -/* 9F5034 802405F4 24020003 */ addiu $v0, $zero, 3 -/* 9F5038 802405F8 10620035 */ beq $v1, $v0, .L802406D0 -/* 9F503C 802405FC 0260202D */ daddu $a0, $s3, $zero -/* 9F5040 80240600 080901D0 */ j .L80240740 -/* 9F5044 80240604 00000000 */ nop -.L80240608: -/* 9F5048 80240608 2402000E */ addiu $v0, $zero, 0xe -/* 9F504C 8024060C 1062003F */ beq $v1, $v0, .L8024070C -/* 9F5050 80240610 0062102A */ slt $v0, $v1, $v0 -/* 9F5054 80240614 14400038 */ bnez $v0, .L802406F8 -/* 9F5058 80240618 0260202D */ daddu $a0, $s3, $zero -/* 9F505C 8024061C 2402000F */ addiu $v0, $zero, 0xf -/* 9F5060 80240620 10620040 */ beq $v1, $v0, .L80240724 -/* 9F5064 80240624 24020063 */ addiu $v0, $zero, 0x63 -/* 9F5068 80240628 10620043 */ beq $v1, $v0, .L80240738 -/* 9F506C 8024062C 00000000 */ nop -/* 9F5070 80240630 080901D0 */ j .L80240740 -/* 9F5074 80240634 00000000 */ nop -.L80240638: -/* 9F5078 80240638 0280282D */ daddu $a1, $s4, $zero -/* 9F507C 8024063C 0C012568 */ jal func_800495A0 -/* 9F5080 80240640 02A0302D */ daddu $a2, $s5, $zero -/* 9F5084 80240644 96220086 */ lhu $v0, 0x86($s1) -/* 9F5088 80240648 A64200A8 */ sh $v0, 0xa8($s2) -.L8024064C: -/* 9F508C 8024064C 0260202D */ daddu $a0, $s3, $zero -/* 9F5090 80240650 0280282D */ daddu $a1, $s4, $zero -/* 9F5094 80240654 0C0125AE */ jal func_800496B8 -/* 9F5098 80240658 02A0302D */ daddu $a2, $s5, $zero -/* 9F509C 8024065C 080901D0 */ j .L80240740 -/* 9F50A0 80240660 00000000 */ nop -.L80240664: -/* 9F50A4 80240664 0260202D */ daddu $a0, $s3, $zero -/* 9F50A8 80240668 0280282D */ daddu $a1, $s4, $zero -/* 9F50AC 8024066C 0C0126D1 */ jal func_80049B44 -/* 9F50B0 80240670 02A0302D */ daddu $a2, $s5, $zero -/* 9F50B4 80240674 8E230088 */ lw $v1, 0x88($s1) -/* 9F50B8 80240678 24020006 */ addiu $v0, $zero, 6 -/* 9F50BC 8024067C 14620014 */ bne $v1, $v0, .L802406D0 -/* 9F50C0 80240680 0260202D */ daddu $a0, $s3, $zero -/* 9F50C4 80240684 0C00A67F */ jal rand_int -/* 9F50C8 80240688 24040064 */ addiu $a0, $zero, 0x64 -/* 9F50CC 8024068C 28420021 */ slti $v0, $v0, 0x21 -/* 9F50D0 80240690 5040000F */ beql $v0, $zero, .L802406D0 -/* 9F50D4 80240694 0260202D */ daddu $a0, $s3, $zero -/* 9F50D8 80240698 8E22008C */ lw $v0, 0x8c($s1) -/* 9F50DC 8024069C 10400005 */ beqz $v0, .L802406B4 -/* 9F50E0 802406A0 3C020055 */ lui $v0, 0x55 -/* 9F50E4 802406A4 3442002F */ ori $v0, $v0, 0x2f -/* 9F50E8 802406A8 AE20008C */ sw $zero, 0x8c($s1) -/* 9F50EC 802406AC 080901B0 */ j .L802406C0 -/* 9F50F0 802406B0 A22000B5 */ sb $zero, 0xb5($s1) -.L802406B4: -/* 9F50F4 802406B4 3442002E */ ori $v0, $v0, 0x2e -/* 9F50F8 802406B8 AE30008C */ sw $s0, 0x8c($s1) -/* 9F50FC 802406BC A23000B5 */ sb $s0, 0xb5($s1) -.L802406C0: -/* 9F5100 802406C0 AE420028 */ sw $v0, 0x28($s2) -/* 9F5104 802406C4 24020007 */ addiu $v0, $zero, 7 -/* 9F5108 802406C8 080901EB */ j .L802407AC -/* 9F510C 802406CC AE220090 */ sw $v0, 0x90($s1) -.L802406D0: -/* 9F5110 802406D0 0280282D */ daddu $a1, $s4, $zero -/* 9F5114 802406D4 0C012701 */ jal func_80049C04 -/* 9F5118 802406D8 02A0302D */ daddu $a2, $s5, $zero -/* 9F511C 802406DC 080901D0 */ j .L80240740 -/* 9F5120 802406E0 00000000 */ nop -.L802406E4: -/* 9F5124 802406E4 0260202D */ daddu $a0, $s3, $zero -/* 9F5128 802406E8 0280282D */ daddu $a1, $s4, $zero -/* 9F512C 802406EC 0C090000 */ jal func_80240000 -/* 9F5130 802406F0 02A0302D */ daddu $a2, $s5, $zero -/* 9F5134 802406F4 0260202D */ daddu $a0, $s3, $zero -.L802406F8: -/* 9F5138 802406F8 0280282D */ daddu $a1, $s4, $zero -/* 9F513C 802406FC 0C09001F */ jal func_8024007C -/* 9F5140 80240700 02A0302D */ daddu $a2, $s5, $zero -/* 9F5144 80240704 080901D0 */ j .L80240740 -/* 9F5148 80240708 00000000 */ nop -.L8024070C: -/* 9F514C 8024070C 0260202D */ daddu $a0, $s3, $zero -/* 9F5150 80240710 0280282D */ daddu $a1, $s4, $zero -/* 9F5154 80240714 0C09006C */ jal func_802401B0 -/* 9F5158 80240718 02A0302D */ daddu $a2, $s5, $zero -/* 9F515C 8024071C 080901D0 */ j .L80240740 -/* 9F5160 80240720 00000000 */ nop -.L80240724: -/* 9F5164 80240724 0280282D */ daddu $a1, $s4, $zero -/* 9F5168 80240728 0C0900C5 */ jal func_80240314 -/* 9F516C 8024072C 02A0302D */ daddu $a2, $s5, $zero -/* 9F5170 80240730 080901D0 */ j .L80240740 -/* 9F5174 80240734 00000000 */ nop -.L80240738: -/* 9F5178 80240738 0C0129CF */ jal func_8004A73C -/* 9F517C 8024073C 0260202D */ daddu $a0, $s3, $zero -.L80240740: -/* 9F5180 80240740 8E230088 */ lw $v1, 0x88($s1) -/* 9F5184 80240744 24020006 */ addiu $v0, $zero, 6 -/* 9F5188 80240748 14620019 */ bne $v1, $v0, .L802407B0 -/* 9F518C 8024074C 0000102D */ daddu $v0, $zero, $zero -/* 9F5190 80240750 8E22008C */ lw $v0, 0x8c($s1) -/* 9F5194 80240754 10400003 */ beqz $v0, .L80240764 -/* 9F5198 80240758 24020001 */ addiu $v0, $zero, 1 -/* 9F519C 8024075C 080901DA */ j .L80240768 -/* 9F51A0 80240760 A22200B5 */ sb $v0, 0xb5($s1) -.L80240764: -/* 9F51A4 80240764 A22000B5 */ sb $zero, 0xb5($s1) -.L80240768: -/* 9F51A8 80240768 8E22008C */ lw $v0, 0x8c($s1) -/* 9F51AC 8024076C 1040000F */ beqz $v0, .L802407AC -/* 9F51B0 80240770 3C03FFAA */ lui $v1, 0xffaa -/* 9F51B4 80240774 8E420028 */ lw $v0, 0x28($s2) -/* 9F51B8 80240778 3463FFFC */ ori $v1, $v1, 0xfffc -/* 9F51BC 8024077C 00431821 */ addu $v1, $v0, $v1 -/* 9F51C0 80240780 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9F51C4 80240784 10400009 */ beqz $v0, .L802407AC -/* 9F51C8 80240788 00031080 */ sll $v0, $v1, 2 -/* 9F51CC 8024078C 3C018024 */ lui $at, 0x8024 -/* 9F51D0 80240790 00220821 */ addu $at, $at, $v0 -/* 9F51D4 80240794 8C225CF8 */ lw $v0, 0x5cf8($at) -/* 9F51D8 80240798 00400008 */ jr $v0 -/* 9F51DC 8024079C 00000000 */ nop -/* 9F51E0 802407A0 8E420028 */ lw $v0, 0x28($s2) -/* 9F51E4 802407A4 24420001 */ addiu $v0, $v0, 1 -/* 9F51E8 802407A8 AE420028 */ sw $v0, 0x28($s2) -.L802407AC: -/* 9F51EC 802407AC 0000102D */ daddu $v0, $zero, $zero -.L802407B0: -/* 9F51F0 802407B0 8FBF0068 */ lw $ra, 0x68($sp) -/* 9F51F4 802407B4 8FB50064 */ lw $s5, 0x64($sp) -/* 9F51F8 802407B8 8FB40060 */ lw $s4, 0x60($sp) -/* 9F51FC 802407BC 8FB3005C */ lw $s3, 0x5c($sp) -/* 9F5200 802407C0 8FB20058 */ lw $s2, 0x58($sp) -/* 9F5204 802407C4 8FB10054 */ lw $s1, 0x54($sp) -/* 9F5208 802407C8 8FB00050 */ lw $s0, 0x50($sp) -/* 9F520C 802407CC 03E00008 */ jr $ra -/* 9F5210 802407D0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_nok/nok_11/func_802407D4_9F4A40.s b/asm/nonmatchings/world/area_nok/nok_11/func_802407D4_9F4A40.s deleted file mode 100644 index 9d3719d317..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/func_802407D4_9F4A40.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D4_9F5214 -/* 9F5214 802407D4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9F5218 802407D8 AFB3002C */ sw $s3, 0x2c($sp) -/* 9F521C 802407DC 0080982D */ daddu $s3, $a0, $zero -/* 9F5220 802407E0 AFBF0030 */ sw $ra, 0x30($sp) -/* 9F5224 802407E4 AFB20028 */ sw $s2, 0x28($sp) -/* 9F5228 802407E8 AFB10024 */ sw $s1, 0x24($sp) -/* 9F522C 802407EC AFB00020 */ sw $s0, 0x20($sp) -/* 9F5230 802407F0 8E710148 */ lw $s1, 0x148($s3) -/* 9F5234 802407F4 86240008 */ lh $a0, 8($s1) -/* 9F5238 802407F8 0C00EABB */ jal get_npc_unsafe -/* 9F523C 802407FC 00A0902D */ daddu $s2, $a1, $zero -/* 9F5240 80240800 8E440004 */ lw $a0, 4($s2) -/* 9F5244 80240804 0040802D */ daddu $s0, $v0, $zero -/* 9F5248 80240808 00041FC2 */ srl $v1, $a0, 0x1f -/* 9F524C 8024080C 00832021 */ addu $a0, $a0, $v1 -/* 9F5250 80240810 00042043 */ sra $a0, $a0, 1 -/* 9F5254 80240814 0C00A67F */ jal rand_int -/* 9F5258 80240818 24840001 */ addiu $a0, $a0, 1 -/* 9F525C 8024081C 8E430004 */ lw $v1, 4($s2) -/* 9F5260 80240820 000327C2 */ srl $a0, $v1, 0x1f -/* 9F5264 80240824 00641821 */ addu $v1, $v1, $a0 -/* 9F5268 80240828 00031843 */ sra $v1, $v1, 1 -/* 9F526C 8024082C 00621821 */ addu $v1, $v1, $v0 -/* 9F5270 80240830 A603008E */ sh $v1, 0x8e($s0) -/* 9F5274 80240834 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9F5278 80240838 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9F527C 8024083C C4640000 */ lwc1 $f4, ($v1) -/* 9F5280 80240840 46802120 */ cvt.s.w $f4, $f4 -/* 9F5284 80240844 C4620008 */ lwc1 $f2, 8($v1) -/* 9F5288 80240848 468010A0 */ cvt.s.w $f2, $f2 -/* 9F528C 8024084C E7A00010 */ swc1 $f0, 0x10($sp) -/* 9F5290 80240850 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F5294 80240854 44061000 */ mfc1 $a2, $f2 -/* 9F5298 80240858 C440000C */ lwc1 $f0, 0xc($v0) -/* 9F529C 8024085C 46800020 */ cvt.s.w $f0, $f0 -/* 9F52A0 80240860 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9F52A4 80240864 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F52A8 80240868 44052000 */ mfc1 $a1, $f4 -/* 9F52AC 8024086C C4400010 */ lwc1 $f0, 0x10($v0) -/* 9F52B0 80240870 46800020 */ cvt.s.w $f0, $f0 -/* 9F52B4 80240874 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9F52B8 80240878 8C640018 */ lw $a0, 0x18($v1) -/* 9F52BC 8024087C 0C0123F5 */ jal is_point_within_region -/* 9F52C0 80240880 8E070038 */ lw $a3, 0x38($s0) -/* 9F52C4 80240884 1040000E */ beqz $v0, .L802408C0 -/* 9F52C8 80240888 00000000 */ nop -/* 9F52CC 8024088C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F52D0 80240890 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9F52D4 80240894 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9F52D8 80240898 C4460000 */ lwc1 $f6, ($v0) -/* 9F52DC 8024089C 468031A0 */ cvt.s.w $f6, $f6 -/* 9F52E0 802408A0 44063000 */ mfc1 $a2, $f6 -/* 9F52E4 802408A4 C4460008 */ lwc1 $f6, 8($v0) -/* 9F52E8 802408A8 468031A0 */ cvt.s.w $f6, $f6 -/* 9F52EC 802408AC 44073000 */ mfc1 $a3, $f6 -/* 9F52F0 802408B0 0C00A720 */ jal atan2 -/* 9F52F4 802408B4 00000000 */ nop -/* 9F52F8 802408B8 0809023C */ j .L802408F0 -/* 9F52FC 802408BC E600000C */ swc1 $f0, 0xc($s0) -.L802408C0: -/* 9F5300 802408C0 0C00A67F */ jal rand_int -/* 9F5304 802408C4 2404003C */ addiu $a0, $zero, 0x3c -/* 9F5308 802408C8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9F530C 802408CC 44820000 */ mtc1 $v0, $f0 -/* 9F5310 802408D0 00000000 */ nop -/* 9F5314 802408D4 46800020 */ cvt.s.w $f0, $f0 -/* 9F5318 802408D8 46006300 */ add.s $f12, $f12, $f0 -/* 9F531C 802408DC 3C0141F0 */ lui $at, 0x41f0 -/* 9F5320 802408E0 44810000 */ mtc1 $at, $f0 -/* 9F5324 802408E4 0C00A6C9 */ jal clamp_angle -/* 9F5328 802408E8 46006301 */ sub.s $f12, $f12, $f0 -/* 9F532C 802408EC E600000C */ swc1 $f0, 0xc($s0) -.L802408F0: -/* 9F5330 802408F0 8E2200CC */ lw $v0, 0xcc($s1) -/* 9F5334 802408F4 8C420004 */ lw $v0, 4($v0) -/* 9F5338 802408F8 AE020028 */ sw $v0, 0x28($s0) -/* 9F533C 802408FC AE600074 */ sw $zero, 0x74($s3) -/* 9F5340 80240900 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F5344 80240904 8C420014 */ lw $v0, 0x14($v0) -/* 9F5348 80240908 04410004 */ bgez $v0, .L8024091C -/* 9F534C 8024090C 00000000 */ nop -/* 9F5350 80240910 C6400000 */ lwc1 $f0, ($s2) -/* 9F5354 80240914 0809024F */ j .L8024093C -/* 9F5358 80240918 E6000018 */ swc1 $f0, 0x18($s0) -.L8024091C: -/* 9F535C 8024091C 3C018024 */ lui $at, 0x8024 -/* 9F5360 80240920 D4225D50 */ ldc1 $f2, 0x5d50($at) -/* 9F5364 80240924 44820000 */ mtc1 $v0, $f0 -/* 9F5368 80240928 00000000 */ nop -/* 9F536C 8024092C 46800021 */ cvt.d.w $f0, $f0 -/* 9F5370 80240930 46220003 */ div.d $f0, $f0, $f2 -/* 9F5374 80240934 46200020 */ cvt.s.d $f0, $f0 -/* 9F5378 80240938 E6000018 */ swc1 $f0, 0x18($s0) -.L8024093C: -/* 9F537C 8024093C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F5380 80240940 3C014059 */ lui $at, 0x4059 -/* 9F5384 80240944 44811800 */ mtc1 $at, $f3 -/* 9F5388 80240948 44801000 */ mtc1 $zero, $f2 -/* 9F538C 8024094C 46000021 */ cvt.d.s $f0, $f0 -/* 9F5390 80240950 46220002 */ mul.d $f0, $f0, $f2 -/* 9F5394 80240954 00000000 */ nop -/* 9F5398 80240958 24020001 */ addiu $v0, $zero, 1 -/* 9F539C 8024095C 4620018D */ trunc.w.d $f6, $f0 -/* 9F53A0 80240960 E626007C */ swc1 $f6, 0x7c($s1) -/* 9F53A4 80240964 AE620070 */ sw $v0, 0x70($s3) -/* 9F53A8 80240968 8FBF0030 */ lw $ra, 0x30($sp) -/* 9F53AC 8024096C 8FB3002C */ lw $s3, 0x2c($sp) -/* 9F53B0 80240970 8FB20028 */ lw $s2, 0x28($sp) -/* 9F53B4 80240974 8FB10024 */ lw $s1, 0x24($sp) -/* 9F53B8 80240978 8FB00020 */ lw $s0, 0x20($sp) -/* 9F53BC 8024097C 03E00008 */ jr $ra -/* 9F53C0 80240980 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_nok/nok_11/func_80240984_9F4A40.s b/asm/nonmatchings/world/area_nok/nok_11/func_80240984_9F4A40.s deleted file mode 100644 index f98ccdd6a8..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/func_80240984_9F4A40.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240984_9F53C4 -/* 9F53C4 80240984 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 9F53C8 80240988 AFB3004C */ sw $s3, 0x4c($sp) -/* 9F53CC 8024098C 0080982D */ daddu $s3, $a0, $zero -/* 9F53D0 80240990 AFBF0058 */ sw $ra, 0x58($sp) -/* 9F53D4 80240994 AFB50054 */ sw $s5, 0x54($sp) -/* 9F53D8 80240998 AFB40050 */ sw $s4, 0x50($sp) -/* 9F53DC 8024099C AFB20048 */ sw $s2, 0x48($sp) -/* 9F53E0 802409A0 AFB10044 */ sw $s1, 0x44($sp) -/* 9F53E4 802409A4 AFB00040 */ sw $s0, 0x40($sp) -/* 9F53E8 802409A8 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 9F53EC 802409AC F7B80070 */ sdc1 $f24, 0x70($sp) -/* 9F53F0 802409B0 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 9F53F4 802409B4 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 9F53F8 802409B8 8E710148 */ lw $s1, 0x148($s3) -/* 9F53FC 802409BC 00A0902D */ daddu $s2, $a1, $zero -/* 9F5400 802409C0 86240008 */ lh $a0, 8($s1) -/* 9F5404 802409C4 0C00EABB */ jal get_npc_unsafe -/* 9F5408 802409C8 00C0A82D */ daddu $s5, $a2, $zero -/* 9F540C 802409CC 0040802D */ daddu $s0, $v0, $zero -/* 9F5410 802409D0 0000A02D */ daddu $s4, $zero, $zero -/* 9F5414 802409D4 C624007C */ lwc1 $f4, 0x7c($s1) -/* 9F5418 802409D8 46802120 */ cvt.s.w $f4, $f4 -/* 9F541C 802409DC C6220088 */ lwc1 $f2, 0x88($s1) -/* 9F5420 802409E0 468010A0 */ cvt.s.w $f2, $f2 -/* 9F5424 802409E4 460010A1 */ cvt.d.s $f2, $f2 -/* 9F5428 802409E8 46002121 */ cvt.d.s $f4, $f4 -/* 9F542C 802409EC C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F5430 802409F0 3C014059 */ lui $at, 0x4059 -/* 9F5434 802409F4 44813800 */ mtc1 $at, $f7 -/* 9F5438 802409F8 44803000 */ mtc1 $zero, $f6 -/* 9F543C 802409FC 46000021 */ cvt.d.s $f0, $f0 -/* 9F5440 80240A00 46260002 */ mul.d $f0, $f0, $f6 -/* 9F5444 80240A04 00000000 */ nop -/* 9F5448 80240A08 24020001 */ addiu $v0, $zero, 1 -/* 9F544C 80240A0C 8E24006C */ lw $a0, 0x6c($s1) -/* 9F5450 80240A10 46261083 */ div.d $f2, $f2, $f6 -/* 9F5454 80240A14 462010A0 */ cvt.s.d $f2, $f2 -/* 9F5458 80240A18 46262103 */ div.d $f4, $f4, $f6 -/* 9F545C 80240A1C 46202520 */ cvt.s.d $f20, $f4 -/* 9F5460 80240A20 30830011 */ andi $v1, $a0, 0x11 -/* 9F5464 80240A24 4620020D */ trunc.w.d $f8, $f0 -/* 9F5468 80240A28 E628007C */ swc1 $f8, 0x7c($s1) -/* 9F546C 80240A2C C6200078 */ lwc1 $f0, 0x78($s1) -/* 9F5470 80240A30 46800020 */ cvt.s.w $f0, $f0 -/* 9F5474 80240A34 46000021 */ cvt.d.s $f0, $f0 -/* 9F5478 80240A38 46260003 */ div.d $f0, $f0, $f6 -/* 9F547C 80240A3C 462006A0 */ cvt.s.d $f26, $f0 -/* 9F5480 80240A40 C6200070 */ lwc1 $f0, 0x70($s1) -/* 9F5484 80240A44 46800020 */ cvt.s.w $f0, $f0 -/* 9F5488 80240A48 46000021 */ cvt.d.s $f0, $f0 -/* 9F548C 80240A4C 46260003 */ div.d $f0, $f0, $f6 -/* 9F5490 80240A50 462005A0 */ cvt.s.d $f22, $f0 -/* 9F5494 80240A54 14620025 */ bne $v1, $v0, .L80240AEC -/* 9F5498 80240A58 4602D600 */ add.s $f24, $f26, $f2 -/* 9F549C 80240A5C 8E020000 */ lw $v0, ($s0) -/* 9F54A0 80240A60 30420008 */ andi $v0, $v0, 8 -/* 9F54A4 80240A64 10400009 */ beqz $v0, .L80240A8C -/* 9F54A8 80240A68 27A50028 */ addiu $a1, $sp, 0x28 -/* 9F54AC 80240A6C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F54B0 80240A70 4600C001 */ sub.s $f0, $f24, $f0 -/* 9F54B4 80240A74 4600B03C */ c.lt.s $f22, $f0 -/* 9F54B8 80240A78 00000000 */ nop -/* 9F54BC 80240A7C 4500001B */ bc1f .L80240AEC -/* 9F54C0 80240A80 34820010 */ ori $v0, $a0, 0x10 -/* 9F54C4 80240A84 080902BB */ j .L80240AEC -/* 9F54C8 80240A88 AE22006C */ sw $v0, 0x6c($s1) -.L80240A8C: -/* 9F54CC 80240A8C 27A6002C */ addiu $a2, $sp, 0x2c -/* 9F54D0 80240A90 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9F54D4 80240A94 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9F54D8 80240A98 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9F54DC 80240A9C 3C01447A */ lui $at, 0x447a -/* 9F54E0 80240AA0 44813000 */ mtc1 $at, $f6 -/* 9F54E4 80240AA4 27A20034 */ addiu $v0, $sp, 0x34 -/* 9F54E8 80240AA8 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9F54EC 80240AAC E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9F54F0 80240AB0 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9F54F4 80240AB4 E7A60034 */ swc1 $f6, 0x34($sp) -/* 9F54F8 80240AB8 AFA20010 */ sw $v0, 0x10($sp) -/* 9F54FC 80240ABC 8E040080 */ lw $a0, 0x80($s0) -/* 9F5500 80240AC0 0C0372DF */ jal func_800DCB7C -/* 9F5504 80240AC4 27A70030 */ addiu $a3, $sp, 0x30 -/* 9F5508 80240AC8 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 9F550C 80240ACC 4600D001 */ sub.s $f0, $f26, $f0 -/* 9F5510 80240AD0 4600B03C */ c.lt.s $f22, $f0 -/* 9F5514 80240AD4 00000000 */ nop -/* 9F5518 80240AD8 45000004 */ bc1f .L80240AEC -/* 9F551C 80240ADC 00000000 */ nop -/* 9F5520 80240AE0 8E22006C */ lw $v0, 0x6c($s1) -/* 9F5524 80240AE4 34420010 */ ori $v0, $v0, 0x10 -/* 9F5528 80240AE8 AE22006C */ sw $v0, 0x6c($s1) -.L80240AEC: -/* 9F552C 80240AEC 8E22006C */ lw $v0, 0x6c($s1) -/* 9F5530 80240AF0 24030011 */ addiu $v1, $zero, 0x11 -/* 9F5534 80240AF4 30420011 */ andi $v0, $v0, 0x11 -/* 9F5538 80240AF8 14430039 */ bne $v0, $v1, .L80240BE0 -/* 9F553C 80240AFC 00000000 */ nop -/* 9F5540 80240B00 8E020000 */ lw $v0, ($s0) -/* 9F5544 80240B04 30420008 */ andi $v0, $v0, 8 -/* 9F5548 80240B08 1040000A */ beqz $v0, .L80240B34 -/* 9F554C 80240B0C 4600C106 */ mov.s $f4, $f24 -/* 9F5550 80240B10 4614C081 */ sub.s $f2, $f24, $f20 -/* 9F5554 80240B14 3C018024 */ lui $at, 0x8024 -/* 9F5558 80240B18 D4205D58 */ ldc1 $f0, 0x5d58($at) -/* 9F555C 80240B1C 460010A1 */ cvt.d.s $f2, $f2 -/* 9F5560 80240B20 46201082 */ mul.d $f2, $f2, $f0 -/* 9F5564 80240B24 00000000 */ nop -/* 9F5568 80240B28 4600A021 */ cvt.d.s $f0, $f20 -/* 9F556C 80240B2C 080902E6 */ j .L80240B98 -/* 9F5570 80240B30 46220000 */ add.d $f0, $f0, $f2 -.L80240B34: -/* 9F5574 80240B34 27A50028 */ addiu $a1, $sp, 0x28 -/* 9F5578 80240B38 27A6002C */ addiu $a2, $sp, 0x2c -/* 9F557C 80240B3C C6000038 */ lwc1 $f0, 0x38($s0) -/* 9F5580 80240B40 C6020040 */ lwc1 $f2, 0x40($s0) -/* 9F5584 80240B44 3C01447A */ lui $at, 0x447a -/* 9F5588 80240B48 44812000 */ mtc1 $at, $f4 -/* 9F558C 80240B4C 27A20034 */ addiu $v0, $sp, 0x34 -/* 9F5590 80240B50 E7B4002C */ swc1 $f20, 0x2c($sp) -/* 9F5594 80240B54 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9F5598 80240B58 E7A20030 */ swc1 $f2, 0x30($sp) -/* 9F559C 80240B5C E7A40034 */ swc1 $f4, 0x34($sp) -/* 9F55A0 80240B60 AFA20010 */ sw $v0, 0x10($sp) -/* 9F55A4 80240B64 8E040080 */ lw $a0, 0x80($s0) -/* 9F55A8 80240B68 0C0372DF */ jal func_800DCB7C -/* 9F55AC 80240B6C 27A70030 */ addiu $a3, $sp, 0x30 -/* 9F55B0 80240B70 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* 9F55B4 80240B74 461A2100 */ add.s $f4, $f4, $f26 -/* 9F55B8 80240B78 46142081 */ sub.s $f2, $f4, $f20 -/* 9F55BC 80240B7C 3C018024 */ lui $at, 0x8024 -/* 9F55C0 80240B80 D4205D60 */ ldc1 $f0, 0x5d60($at) -/* 9F55C4 80240B84 460010A1 */ cvt.d.s $f2, $f2 -/* 9F55C8 80240B88 46201082 */ mul.d $f2, $f2, $f0 -/* 9F55CC 80240B8C 00000000 */ nop -/* 9F55D0 80240B90 4600A021 */ cvt.d.s $f0, $f20 -/* 9F55D4 80240B94 46220000 */ add.d $f0, $f0, $f2 -.L80240B98: -/* 9F55D8 80240B98 46200020 */ cvt.s.d $f0, $f0 -/* 9F55DC 80240B9C E600003C */ swc1 $f0, 0x3c($s0) -/* 9F55E0 80240BA0 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F55E4 80240BA4 46002001 */ sub.s $f0, $f4, $f0 -/* 9F55E8 80240BA8 3C013FF0 */ lui $at, 0x3ff0 -/* 9F55EC 80240BAC 44811800 */ mtc1 $at, $f3 -/* 9F55F0 80240BB0 44801000 */ mtc1 $zero, $f2 -/* 9F55F4 80240BB4 46000005 */ abs.s $f0, $f0 -/* 9F55F8 80240BB8 46000021 */ cvt.d.s $f0, $f0 -/* 9F55FC 80240BBC 4622003C */ c.lt.d $f0, $f2 -/* 9F5600 80240BC0 00000000 */ nop -/* 9F5604 80240BC4 45000036 */ bc1f .L80240CA0 -/* 9F5608 80240BC8 2403FFEF */ addiu $v1, $zero, -0x11 -/* 9F560C 80240BCC E604003C */ swc1 $f4, 0x3c($s0) -/* 9F5610 80240BD0 8E22006C */ lw $v0, 0x6c($s1) -/* 9F5614 80240BD4 00431024 */ and $v0, $v0, $v1 -/* 9F5618 80240BD8 08090328 */ j .L80240CA0 -/* 9F561C 80240BDC AE22006C */ sw $v0, 0x6c($s1) -.L80240BE0: -/* 9F5620 80240BE0 8E220070 */ lw $v0, 0x70($s1) -/* 9F5624 80240BE4 1840002E */ blez $v0, .L80240CA0 -/* 9F5628 80240BE8 00000000 */ nop -/* 9F562C 80240BEC C62C0074 */ lwc1 $f12, 0x74($s1) -/* 9F5630 80240BF0 0C00A8BB */ jal sin_deg -/* 9F5634 80240BF4 46806320 */ cvt.s.w $f12, $f12 -/* 9F5638 80240BF8 8E020000 */ lw $v0, ($s0) -/* 9F563C 80240BFC 30420008 */ andi $v0, $v0, 8 -/* 9F5640 80240C00 10400003 */ beqz $v0, .L80240C10 -/* 9F5644 80240C04 46000506 */ mov.s $f20, $f0 -/* 9F5648 80240C08 08090314 */ j .L80240C50 -/* 9F564C 80240C0C 0000102D */ daddu $v0, $zero, $zero -.L80240C10: -/* 9F5650 80240C10 27A50028 */ addiu $a1, $sp, 0x28 -/* 9F5654 80240C14 27A6002C */ addiu $a2, $sp, 0x2c -/* 9F5658 80240C18 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9F565C 80240C1C C602003C */ lwc1 $f2, 0x3c($s0) -/* 9F5660 80240C20 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9F5664 80240C24 3C01447A */ lui $at, 0x447a -/* 9F5668 80240C28 44813000 */ mtc1 $at, $f6 -/* 9F566C 80240C2C 27A20034 */ addiu $v0, $sp, 0x34 -/* 9F5670 80240C30 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9F5674 80240C34 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9F5678 80240C38 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9F567C 80240C3C E7A60034 */ swc1 $f6, 0x34($sp) -/* 9F5680 80240C40 AFA20010 */ sw $v0, 0x10($sp) -/* 9F5684 80240C44 8E040080 */ lw $a0, 0x80($s0) -/* 9F5688 80240C48 0C0372DF */ jal func_800DCB7C -/* 9F568C 80240C4C 27A70030 */ addiu $a3, $sp, 0x30 -.L80240C50: -/* 9F5690 80240C50 10400007 */ beqz $v0, .L80240C70 -/* 9F5694 80240C54 00000000 */ nop -/* 9F5698 80240C58 4616A082 */ mul.s $f2, $f20, $f22 -/* 9F569C 80240C5C 00000000 */ nop -/* 9F56A0 80240C60 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 9F56A4 80240C64 461A0000 */ add.s $f0, $f0, $f26 -/* 9F56A8 80240C68 0809031F */ j .L80240C7C -/* 9F56AC 80240C6C 46020000 */ add.s $f0, $f0, $f2 -.L80240C70: -/* 9F56B0 80240C70 4616A002 */ mul.s $f0, $f20, $f22 -/* 9F56B4 80240C74 00000000 */ nop -/* 9F56B8 80240C78 4600C000 */ add.s $f0, $f24, $f0 -.L80240C7C: -/* 9F56BC 80240C7C E600003C */ swc1 $f0, 0x3c($s0) -/* 9F56C0 80240C80 8E220074 */ lw $v0, 0x74($s1) -/* 9F56C4 80240C84 2442000A */ addiu $v0, $v0, 0xa -/* 9F56C8 80240C88 44826000 */ mtc1 $v0, $f12 -/* 9F56CC 80240C8C 00000000 */ nop -/* 9F56D0 80240C90 0C00A6C9 */ jal clamp_angle -/* 9F56D4 80240C94 46806320 */ cvt.s.w $f12, $f12 -/* 9F56D8 80240C98 4600020D */ trunc.w.s $f8, $f0 -/* 9F56DC 80240C9C E6280074 */ swc1 $f8, 0x74($s1) -.L80240CA0: -/* 9F56E0 80240CA0 8E220090 */ lw $v0, 0x90($s1) -/* 9F56E4 80240CA4 1C40004A */ bgtz $v0, .L80240DD0 -/* 9F56E8 80240CA8 2442FFFF */ addiu $v0, $v0, -1 -/* 9F56EC 80240CAC 8E430014 */ lw $v1, 0x14($s2) -/* 9F56F0 80240CB0 04600048 */ bltz $v1, .L80240DD4 -/* 9F56F4 80240CB4 00000000 */ nop -/* 9F56F8 80240CB8 8E620074 */ lw $v0, 0x74($s3) -/* 9F56FC 80240CBC 1C400042 */ bgtz $v0, .L80240DC8 -/* 9F5700 80240CC0 2442FFFF */ addiu $v0, $v0, -1 -/* 9F5704 80240CC4 AE630074 */ sw $v1, 0x74($s3) -/* 9F5708 80240CC8 860200A8 */ lh $v0, 0xa8($s0) -/* 9F570C 80240CCC C602003C */ lwc1 $f2, 0x3c($s0) -/* 9F5710 80240CD0 44820000 */ mtc1 $v0, $f0 -/* 9F5714 80240CD4 00000000 */ nop -/* 9F5718 80240CD8 46800020 */ cvt.s.w $f0, $f0 -/* 9F571C 80240CDC 46001080 */ add.s $f2, $f2, $f0 -/* 9F5720 80240CE0 3C014024 */ lui $at, 0x4024 -/* 9F5724 80240CE4 44810800 */ mtc1 $at, $f1 -/* 9F5728 80240CE8 44800000 */ mtc1 $zero, $f0 -/* 9F572C 80240CEC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9F5730 80240CF0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9F5734 80240CF4 460010A1 */ cvt.d.s $f2, $f2 -/* 9F5738 80240CF8 46201080 */ add.d $f2, $f2, $f0 -/* 9F573C 80240CFC C440002C */ lwc1 $f0, 0x2c($v0) -/* 9F5740 80240D00 46000021 */ cvt.d.s $f0, $f0 -/* 9F5744 80240D04 4622003C */ c.lt.d $f0, $f2 -/* 9F5748 80240D08 00000000 */ nop -/* 9F574C 80240D0C 4500002C */ bc1f .L80240DC0 -/* 9F5750 80240D10 02A0202D */ daddu $a0, $s5, $zero -/* 9F5754 80240D14 AFA00010 */ sw $zero, 0x10($sp) -/* 9F5758 80240D18 8E46000C */ lw $a2, 0xc($s2) -/* 9F575C 80240D1C 8E470010 */ lw $a3, 0x10($s2) -/* 9F5760 80240D20 0C01242D */ jal func_800490B4 -/* 9F5764 80240D24 0220282D */ daddu $a1, $s1, $zero -/* 9F5768 80240D28 10400025 */ beqz $v0, .L80240DC0 -/* 9F576C 80240D2C 0000202D */ daddu $a0, $zero, $zero -/* 9F5770 80240D30 0200282D */ daddu $a1, $s0, $zero -/* 9F5774 80240D34 0000302D */ daddu $a2, $zero, $zero -/* 9F5778 80240D38 2412000C */ addiu $s2, $zero, 0xc -/* 9F577C 80240D3C 860300A8 */ lh $v1, 0xa8($s0) -/* 9F5780 80240D40 3C013F80 */ lui $at, 0x3f80 -/* 9F5784 80240D44 44810000 */ mtc1 $at, $f0 -/* 9F5788 80240D48 3C014000 */ lui $at, 0x4000 -/* 9F578C 80240D4C 44811000 */ mtc1 $at, $f2 -/* 9F5790 80240D50 3C01C1A0 */ lui $at, 0xc1a0 -/* 9F5794 80240D54 44812000 */ mtc1 $at, $f4 -/* 9F5798 80240D58 44834000 */ mtc1 $v1, $f8 -/* 9F579C 80240D5C 00000000 */ nop -/* 9F57A0 80240D60 46804220 */ cvt.s.w $f8, $f8 -/* 9F57A4 80240D64 44074000 */ mfc1 $a3, $f8 -/* 9F57A8 80240D68 27A20038 */ addiu $v0, $sp, 0x38 -/* 9F57AC 80240D6C AFB2001C */ sw $s2, 0x1c($sp) -/* 9F57B0 80240D70 AFA20020 */ sw $v0, 0x20($sp) -/* 9F57B4 80240D74 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9F57B8 80240D78 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9F57BC 80240D7C 0C01BFA4 */ jal fx_emote -/* 9F57C0 80240D80 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9F57C4 80240D84 0200202D */ daddu $a0, $s0, $zero -/* 9F57C8 80240D88 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9F57CC 80240D8C C480003C */ lwc1 $f0, 0x3c($a0) -/* 9F57D0 80240D90 3C060020 */ lui $a2, 0x20 -/* 9F57D4 80240D94 0C012530 */ jal func_800494C0 -/* 9F57D8 80240D98 E4800064 */ swc1 $f0, 0x64($a0) -/* 9F57DC 80240D9C 8E220018 */ lw $v0, 0x18($s1) -/* 9F57E0 80240DA0 9442002A */ lhu $v0, 0x2a($v0) -/* 9F57E4 80240DA4 30420001 */ andi $v0, $v0, 1 -/* 9F57E8 80240DA8 10400003 */ beqz $v0, .L80240DB8 -/* 9F57EC 80240DAC 2402000A */ addiu $v0, $zero, 0xa -/* 9F57F0 80240DB0 080903DE */ j .L80240F78 -/* 9F57F4 80240DB4 AE620070 */ sw $v0, 0x70($s3) -.L80240DB8: -/* 9F57F8 80240DB8 080903DE */ j .L80240F78 -/* 9F57FC 80240DBC AE720070 */ sw $s2, 0x70($s3) -.L80240DC0: -/* 9F5800 80240DC0 8E620074 */ lw $v0, 0x74($s3) -/* 9F5804 80240DC4 2442FFFF */ addiu $v0, $v0, -1 -.L80240DC8: -/* 9F5808 80240DC8 08090375 */ j .L80240DD4 -/* 9F580C 80240DCC AE620074 */ sw $v0, 0x74($s3) -.L80240DD0: -/* 9F5810 80240DD0 AE220090 */ sw $v0, 0x90($s1) -.L80240DD4: -/* 9F5814 80240DD4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9F5818 80240DD8 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9F581C 80240DDC C4620000 */ lwc1 $f2, ($v1) -/* 9F5820 80240DE0 468010A0 */ cvt.s.w $f2, $f2 -/* 9F5824 80240DE4 C4640008 */ lwc1 $f4, 8($v1) -/* 9F5828 80240DE8 46802120 */ cvt.s.w $f4, $f4 -/* 9F582C 80240DEC E7A00010 */ swc1 $f0, 0x10($sp) -/* 9F5830 80240DF0 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F5834 80240DF4 44051000 */ mfc1 $a1, $f2 -/* 9F5838 80240DF8 C440000C */ lwc1 $f0, 0xc($v0) -/* 9F583C 80240DFC 46800020 */ cvt.s.w $f0, $f0 -/* 9F5840 80240E00 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9F5844 80240E04 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F5848 80240E08 44062000 */ mfc1 $a2, $f4 -/* 9F584C 80240E0C C4400010 */ lwc1 $f0, 0x10($v0) -/* 9F5850 80240E10 46800020 */ cvt.s.w $f0, $f0 -/* 9F5854 80240E14 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9F5858 80240E18 8C640018 */ lw $a0, 0x18($v1) -/* 9F585C 80240E1C 0C0123F5 */ jal is_point_within_region -/* 9F5860 80240E20 8E070038 */ lw $a3, 0x38($s0) -/* 9F5864 80240E24 1040001A */ beqz $v0, .L80240E90 -/* 9F5868 80240E28 00000000 */ nop -/* 9F586C 80240E2C 8E060038 */ lw $a2, 0x38($s0) -/* 9F5870 80240E30 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F5874 80240E34 8E070040 */ lw $a3, 0x40($s0) -/* 9F5878 80240E38 C44C0000 */ lwc1 $f12, ($v0) -/* 9F587C 80240E3C 46806320 */ cvt.s.w $f12, $f12 -/* 9F5880 80240E40 C44E0008 */ lwc1 $f14, 8($v0) -/* 9F5884 80240E44 0C00A7B5 */ jal dist2D -/* 9F5888 80240E48 468073A0 */ cvt.s.w $f14, $f14 -/* 9F588C 80240E4C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9F5890 80240E50 4600103C */ c.lt.s $f2, $f0 -/* 9F5894 80240E54 00000000 */ nop -/* 9F5898 80240E58 4500000D */ bc1f .L80240E90 -/* 9F589C 80240E5C E7A00034 */ swc1 $f0, 0x34($sp) -/* 9F58A0 80240E60 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9F58A4 80240E64 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F58A8 80240E68 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9F58AC 80240E6C C4480000 */ lwc1 $f8, ($v0) -/* 9F58B0 80240E70 46804220 */ cvt.s.w $f8, $f8 -/* 9F58B4 80240E74 44064000 */ mfc1 $a2, $f8 -/* 9F58B8 80240E78 C4480008 */ lwc1 $f8, 8($v0) -/* 9F58BC 80240E7C 46804220 */ cvt.s.w $f8, $f8 -/* 9F58C0 80240E80 44074000 */ mfc1 $a3, $f8 -/* 9F58C4 80240E84 0C00A720 */ jal atan2 -/* 9F58C8 80240E88 24140001 */ addiu $s4, $zero, 1 -/* 9F58CC 80240E8C E600000C */ swc1 $f0, 0xc($s0) -.L80240E90: -/* 9F58D0 80240E90 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F58D4 80240E94 8C43000C */ lw $v1, 0xc($v0) -/* 9F58D8 80240E98 8C420010 */ lw $v0, 0x10($v0) -/* 9F58DC 80240E9C 00621825 */ or $v1, $v1, $v0 -/* 9F58E0 80240EA0 00741825 */ or $v1, $v1, $s4 -/* 9F58E4 80240EA4 10600008 */ beqz $v1, .L80240EC8 -/* 9F58E8 80240EA8 00000000 */ nop -/* 9F58EC 80240EAC 8602008C */ lh $v0, 0x8c($s0) -/* 9F58F0 80240EB0 14400031 */ bnez $v0, .L80240F78 -/* 9F58F4 80240EB4 00000000 */ nop -/* 9F58F8 80240EB8 8E050018 */ lw $a1, 0x18($s0) -/* 9F58FC 80240EBC 8E06000C */ lw $a2, 0xc($s0) -/* 9F5900 80240EC0 0C00EA95 */ jal npc_move_heading -/* 9F5904 80240EC4 0200202D */ daddu $a0, $s0, $zero -.L80240EC8: -/* 9F5908 80240EC8 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F590C 80240ECC 3C014059 */ lui $at, 0x4059 -/* 9F5910 80240ED0 44811800 */ mtc1 $at, $f3 -/* 9F5914 80240ED4 44801000 */ mtc1 $zero, $f2 -/* 9F5918 80240ED8 46000021 */ cvt.d.s $f0, $f0 -/* 9F591C 80240EDC 46220002 */ mul.d $f0, $f0, $f2 -/* 9F5920 80240EE0 00000000 */ nop -/* 9F5924 80240EE4 4620020D */ trunc.w.d $f8, $f0 -/* 9F5928 80240EE8 E628007C */ swc1 $f8, 0x7c($s1) -/* 9F592C 80240EEC 8E420004 */ lw $v0, 4($s2) -/* 9F5930 80240EF0 18400021 */ blez $v0, .L80240F78 -/* 9F5934 80240EF4 00000000 */ nop -/* 9F5938 80240EF8 8602008E */ lh $v0, 0x8e($s0) -/* 9F593C 80240EFC 9603008E */ lhu $v1, 0x8e($s0) -/* 9F5940 80240F00 18400005 */ blez $v0, .L80240F18 -/* 9F5944 80240F04 2462FFFF */ addiu $v0, $v1, -1 -/* 9F5948 80240F08 A602008E */ sh $v0, 0x8e($s0) -/* 9F594C 80240F0C 00021400 */ sll $v0, $v0, 0x10 -/* 9F5950 80240F10 1C400019 */ bgtz $v0, .L80240F78 -/* 9F5954 80240F14 00000000 */ nop -.L80240F18: -/* 9F5958 80240F18 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9F595C 80240F1C 24020002 */ addiu $v0, $zero, 2 -/* 9F5960 80240F20 0C00A67F */ jal rand_int -/* 9F5964 80240F24 AE620070 */ sw $v0, 0x70($s3) -/* 9F5968 80240F28 3C035555 */ lui $v1, 0x5555 -/* 9F596C 80240F2C 34635556 */ ori $v1, $v1, 0x5556 -/* 9F5970 80240F30 00430018 */ mult $v0, $v1 -/* 9F5974 80240F34 000227C3 */ sra $a0, $v0, 0x1f -/* 9F5978 80240F38 00004010 */ mfhi $t0 -/* 9F597C 80240F3C 01042023 */ subu $a0, $t0, $a0 -/* 9F5980 80240F40 00041840 */ sll $v1, $a0, 1 -/* 9F5984 80240F44 00641821 */ addu $v1, $v1, $a0 -/* 9F5988 80240F48 00431023 */ subu $v0, $v0, $v1 -/* 9F598C 80240F4C 24430002 */ addiu $v1, $v0, 2 -/* 9F5990 80240F50 AE630074 */ sw $v1, 0x74($s3) -/* 9F5994 80240F54 8E42002C */ lw $v0, 0x2c($s2) -/* 9F5998 80240F58 58400007 */ blezl $v0, .L80240F78 -/* 9F599C 80240F5C AE600070 */ sw $zero, 0x70($s3) -/* 9F59A0 80240F60 8E420008 */ lw $v0, 8($s2) -/* 9F59A4 80240F64 18400003 */ blez $v0, .L80240F74 -/* 9F59A8 80240F68 28620003 */ slti $v0, $v1, 3 -/* 9F59AC 80240F6C 10400002 */ beqz $v0, .L80240F78 -/* 9F59B0 80240F70 00000000 */ nop -.L80240F74: -/* 9F59B4 80240F74 AE600070 */ sw $zero, 0x70($s3) -.L80240F78: -/* 9F59B8 80240F78 8FBF0058 */ lw $ra, 0x58($sp) -/* 9F59BC 80240F7C 8FB50054 */ lw $s5, 0x54($sp) -/* 9F59C0 80240F80 8FB40050 */ lw $s4, 0x50($sp) -/* 9F59C4 80240F84 8FB3004C */ lw $s3, 0x4c($sp) -/* 9F59C8 80240F88 8FB20048 */ lw $s2, 0x48($sp) -/* 9F59CC 80240F8C 8FB10044 */ lw $s1, 0x44($sp) -/* 9F59D0 80240F90 8FB00040 */ lw $s0, 0x40($sp) -/* 9F59D4 80240F94 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 9F59D8 80240F98 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 9F59DC 80240F9C D7B60068 */ ldc1 $f22, 0x68($sp) -/* 9F59E0 80240FA0 D7B40060 */ ldc1 $f20, 0x60($sp) -/* 9F59E4 80240FA4 03E00008 */ jr $ra -/* 9F59E8 80240FA8 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_nok/nok_11/func_80240FAC_9F4A40.s b/asm/nonmatchings/world/area_nok/nok_11/func_80240FAC_9F4A40.s deleted file mode 100644 index bf18817f8e..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/func_80240FAC_9F4A40.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FAC_9F59EC -/* 9F59EC 80240FAC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9F59F0 80240FB0 AFB3001C */ sw $s3, 0x1c($sp) -/* 9F59F4 80240FB4 0080982D */ daddu $s3, $a0, $zero -/* 9F59F8 80240FB8 AFBF0020 */ sw $ra, 0x20($sp) -/* 9F59FC 80240FBC AFB20018 */ sw $s2, 0x18($sp) -/* 9F5A00 80240FC0 AFB10014 */ sw $s1, 0x14($sp) -/* 9F5A04 80240FC4 AFB00010 */ sw $s0, 0x10($sp) -/* 9F5A08 80240FC8 8E720148 */ lw $s2, 0x148($s3) -/* 9F5A0C 80240FCC 86440008 */ lh $a0, 8($s2) -/* 9F5A10 80240FD0 0C00EABB */ jal get_npc_unsafe -/* 9F5A14 80240FD4 00A0882D */ daddu $s1, $a1, $zero -/* 9F5A18 80240FD8 8E240008 */ lw $a0, 8($s1) -/* 9F5A1C 80240FDC 0040802D */ daddu $s0, $v0, $zero -/* 9F5A20 80240FE0 00041FC2 */ srl $v1, $a0, 0x1f -/* 9F5A24 80240FE4 00832021 */ addu $a0, $a0, $v1 -/* 9F5A28 80240FE8 00042043 */ sra $a0, $a0, 1 -/* 9F5A2C 80240FEC 0C00A67F */ jal rand_int -/* 9F5A30 80240FF0 24840001 */ addiu $a0, $a0, 1 -/* 9F5A34 80240FF4 8E230008 */ lw $v1, 8($s1) -/* 9F5A38 80240FF8 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9F5A3C 80240FFC 00032FC2 */ srl $a1, $v1, 0x1f -/* 9F5A40 80241000 00651821 */ addu $v1, $v1, $a1 -/* 9F5A44 80241004 00031843 */ sra $v1, $v1, 1 -/* 9F5A48 80241008 00621821 */ addu $v1, $v1, $v0 -/* 9F5A4C 8024100C 0C00A67F */ jal rand_int -/* 9F5A50 80241010 A603008E */ sh $v1, 0x8e($s0) -/* 9F5A54 80241014 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9F5A58 80241018 44820000 */ mtc1 $v0, $f0 -/* 9F5A5C 8024101C 00000000 */ nop -/* 9F5A60 80241020 46800020 */ cvt.s.w $f0, $f0 -/* 9F5A64 80241024 46006300 */ add.s $f12, $f12, $f0 -/* 9F5A68 80241028 3C0142B4 */ lui $at, 0x42b4 -/* 9F5A6C 8024102C 44810000 */ mtc1 $at, $f0 -/* 9F5A70 80241030 0C00A6C9 */ jal clamp_angle -/* 9F5A74 80241034 46006301 */ sub.s $f12, $f12, $f0 -/* 9F5A78 80241038 E600000C */ swc1 $f0, 0xc($s0) -/* 9F5A7C 8024103C 8E4200CC */ lw $v0, 0xcc($s2) -/* 9F5A80 80241040 8C420000 */ lw $v0, ($v0) -/* 9F5A84 80241044 AE020028 */ sw $v0, 0x28($s0) -/* 9F5A88 80241048 24020003 */ addiu $v0, $zero, 3 -/* 9F5A8C 8024104C AE620070 */ sw $v0, 0x70($s3) -/* 9F5A90 80241050 8FBF0020 */ lw $ra, 0x20($sp) -/* 9F5A94 80241054 8FB3001C */ lw $s3, 0x1c($sp) -/* 9F5A98 80241058 8FB20018 */ lw $s2, 0x18($sp) -/* 9F5A9C 8024105C 8FB10014 */ lw $s1, 0x14($sp) -/* 9F5AA0 80241060 8FB00010 */ lw $s0, 0x10($sp) -/* 9F5AA4 80241064 03E00008 */ jr $ra -/* 9F5AA8 80241068 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_11/func_8024106C_9F4A40.s b/asm/nonmatchings/world/area_nok/nok_11/func_8024106C_9F4A40.s deleted file mode 100644 index cc15ed9f49..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/func_8024106C_9F4A40.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024106C_9F5AAC -/* 9F5AAC 8024106C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 9F5AB0 80241070 AFB3004C */ sw $s3, 0x4c($sp) -/* 9F5AB4 80241074 0080982D */ daddu $s3, $a0, $zero -/* 9F5AB8 80241078 AFBF0054 */ sw $ra, 0x54($sp) -/* 9F5ABC 8024107C AFB40050 */ sw $s4, 0x50($sp) -/* 9F5AC0 80241080 AFB20048 */ sw $s2, 0x48($sp) -/* 9F5AC4 80241084 AFB10044 */ sw $s1, 0x44($sp) -/* 9F5AC8 80241088 AFB00040 */ sw $s0, 0x40($sp) -/* 9F5ACC 8024108C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* 9F5AD0 80241090 F7B80068 */ sdc1 $f24, 0x68($sp) -/* 9F5AD4 80241094 F7B60060 */ sdc1 $f22, 0x60($sp) -/* 9F5AD8 80241098 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 9F5ADC 8024109C 8E710148 */ lw $s1, 0x148($s3) -/* 9F5AE0 802410A0 00A0902D */ daddu $s2, $a1, $zero -/* 9F5AE4 802410A4 86240008 */ lh $a0, 8($s1) -/* 9F5AE8 802410A8 0C00EABB */ jal get_npc_unsafe -/* 9F5AEC 802410AC 00C0A02D */ daddu $s4, $a2, $zero -/* 9F5AF0 802410B0 0040802D */ daddu $s0, $v0, $zero -/* 9F5AF4 802410B4 C6200078 */ lwc1 $f0, 0x78($s1) -/* 9F5AF8 802410B8 46800020 */ cvt.s.w $f0, $f0 -/* 9F5AFC 802410BC 46000021 */ cvt.d.s $f0, $f0 -/* 9F5B00 802410C0 3C014059 */ lui $at, 0x4059 -/* 9F5B04 802410C4 44811800 */ mtc1 $at, $f3 -/* 9F5B08 802410C8 44801000 */ mtc1 $zero, $f2 -/* 9F5B0C 802410CC 8602008E */ lh $v0, 0x8e($s0) -/* 9F5B10 802410D0 9603008E */ lhu $v1, 0x8e($s0) -/* 9F5B14 802410D4 46220003 */ div.d $f0, $f0, $f2 -/* 9F5B18 802410D8 46200620 */ cvt.s.d $f24, $f0 -/* 9F5B1C 802410DC C6200088 */ lwc1 $f0, 0x88($s1) -/* 9F5B20 802410E0 46800020 */ cvt.s.w $f0, $f0 -/* 9F5B24 802410E4 46000021 */ cvt.d.s $f0, $f0 -/* 9F5B28 802410E8 46220003 */ div.d $f0, $f0, $f2 -/* 9F5B2C 802410EC 46200020 */ cvt.s.d $f0, $f0 -/* 9F5B30 802410F0 18400003 */ blez $v0, .L80241100 -/* 9F5B34 802410F4 4600C680 */ add.s $f26, $f24, $f0 -/* 9F5B38 802410F8 2462FFFF */ addiu $v0, $v1, -1 -/* 9F5B3C 802410FC A602008E */ sh $v0, 0x8e($s0) -.L80241100: -/* 9F5B40 80241100 8E220070 */ lw $v0, 0x70($s1) -/* 9F5B44 80241104 18400034 */ blez $v0, .L802411D8 -/* 9F5B48 80241108 00000000 */ nop -/* 9F5B4C 8024110C C62C0074 */ lwc1 $f12, 0x74($s1) -/* 9F5B50 80241110 46806320 */ cvt.s.w $f12, $f12 -/* 9F5B54 80241114 44820000 */ mtc1 $v0, $f0 -/* 9F5B58 80241118 00000000 */ nop -/* 9F5B5C 8024111C 46800020 */ cvt.s.w $f0, $f0 -/* 9F5B60 80241120 46000021 */ cvt.d.s $f0, $f0 -/* 9F5B64 80241124 46220003 */ div.d $f0, $f0, $f2 -/* 9F5B68 80241128 0C00A8BB */ jal sin_deg -/* 9F5B6C 8024112C 462005A0 */ cvt.s.d $f22, $f0 -/* 9F5B70 80241130 8E020000 */ lw $v0, ($s0) -/* 9F5B74 80241134 30420008 */ andi $v0, $v0, 8 -/* 9F5B78 80241138 10400003 */ beqz $v0, .L80241148 -/* 9F5B7C 8024113C 46000506 */ mov.s $f20, $f0 -/* 9F5B80 80241140 08090462 */ j .L80241188 -/* 9F5B84 80241144 0000102D */ daddu $v0, $zero, $zero -.L80241148: -/* 9F5B88 80241148 27A50028 */ addiu $a1, $sp, 0x28 -/* 9F5B8C 8024114C 27A6002C */ addiu $a2, $sp, 0x2c -/* 9F5B90 80241150 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9F5B94 80241154 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9F5B98 80241158 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9F5B9C 8024115C 3C01447A */ lui $at, 0x447a -/* 9F5BA0 80241160 44813000 */ mtc1 $at, $f6 -/* 9F5BA4 80241164 27A20034 */ addiu $v0, $sp, 0x34 -/* 9F5BA8 80241168 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9F5BAC 8024116C E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9F5BB0 80241170 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9F5BB4 80241174 E7A60034 */ swc1 $f6, 0x34($sp) -/* 9F5BB8 80241178 AFA20010 */ sw $v0, 0x10($sp) -/* 9F5BBC 8024117C 8E040080 */ lw $a0, 0x80($s0) -/* 9F5BC0 80241180 0C0372DF */ jal func_800DCB7C -/* 9F5BC4 80241184 27A70030 */ addiu $a3, $sp, 0x30 -.L80241188: -/* 9F5BC8 80241188 10400007 */ beqz $v0, .L802411A8 -/* 9F5BCC 8024118C 00000000 */ nop -/* 9F5BD0 80241190 4616A082 */ mul.s $f2, $f20, $f22 -/* 9F5BD4 80241194 00000000 */ nop -/* 9F5BD8 80241198 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 9F5BDC 8024119C 46180000 */ add.s $f0, $f0, $f24 -/* 9F5BE0 802411A0 0809046D */ j .L802411B4 -/* 9F5BE4 802411A4 46020000 */ add.s $f0, $f0, $f2 -.L802411A8: -/* 9F5BE8 802411A8 4616A002 */ mul.s $f0, $f20, $f22 -/* 9F5BEC 802411AC 00000000 */ nop -/* 9F5BF0 802411B0 4600D000 */ add.s $f0, $f26, $f0 -.L802411B4: -/* 9F5BF4 802411B4 E600003C */ swc1 $f0, 0x3c($s0) -/* 9F5BF8 802411B8 8E220074 */ lw $v0, 0x74($s1) -/* 9F5BFC 802411BC 2442000A */ addiu $v0, $v0, 0xa -/* 9F5C00 802411C0 44826000 */ mtc1 $v0, $f12 -/* 9F5C04 802411C4 00000000 */ nop -/* 9F5C08 802411C8 0C00A6C9 */ jal clamp_angle -/* 9F5C0C 802411CC 46806320 */ cvt.s.w $f12, $f12 -/* 9F5C10 802411D0 4600020D */ trunc.w.s $f8, $f0 -/* 9F5C14 802411D4 E6280074 */ swc1 $f8, 0x74($s1) -.L802411D8: -/* 9F5C18 802411D8 8E220090 */ lw $v0, 0x90($s1) -/* 9F5C1C 802411DC 1C400040 */ bgtz $v0, .L802412E0 -/* 9F5C20 802411E0 2442FFFF */ addiu $v0, $v0, -1 -/* 9F5C24 802411E4 860200A8 */ lh $v0, 0xa8($s0) -/* 9F5C28 802411E8 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F5C2C 802411EC 44821000 */ mtc1 $v0, $f2 -/* 9F5C30 802411F0 00000000 */ nop -/* 9F5C34 802411F4 468010A0 */ cvt.s.w $f2, $f2 -/* 9F5C38 802411F8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9F5C3C 802411FC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9F5C40 80241200 46020000 */ add.s $f0, $f0, $f2 -/* 9F5C44 80241204 3C014024 */ lui $at, 0x4024 -/* 9F5C48 80241208 44812800 */ mtc1 $at, $f5 -/* 9F5C4C 8024120C 44802000 */ mtc1 $zero, $f4 -/* 9F5C50 80241210 C442002C */ lwc1 $f2, 0x2c($v0) -/* 9F5C54 80241214 46000021 */ cvt.d.s $f0, $f0 -/* 9F5C58 80241218 46240000 */ add.d $f0, $f0, $f4 -/* 9F5C5C 8024121C 460010A1 */ cvt.d.s $f2, $f2 -/* 9F5C60 80241220 4620103C */ c.lt.d $f2, $f0 -/* 9F5C64 80241224 00000000 */ nop -/* 9F5C68 80241228 4500002E */ bc1f .L802412E4 -/* 9F5C6C 8024122C 0280202D */ daddu $a0, $s4, $zero -/* 9F5C70 80241230 24020001 */ addiu $v0, $zero, 1 -/* 9F5C74 80241234 AFA20010 */ sw $v0, 0x10($sp) -/* 9F5C78 80241238 8E460024 */ lw $a2, 0x24($s2) -/* 9F5C7C 8024123C 8E470028 */ lw $a3, 0x28($s2) -/* 9F5C80 80241240 0C01242D */ jal func_800490B4 -/* 9F5C84 80241244 0220282D */ daddu $a1, $s1, $zero -/* 9F5C88 80241248 10400026 */ beqz $v0, .L802412E4 -/* 9F5C8C 8024124C 0000202D */ daddu $a0, $zero, $zero -/* 9F5C90 80241250 0200282D */ daddu $a1, $s0, $zero -/* 9F5C94 80241254 0000302D */ daddu $a2, $zero, $zero -/* 9F5C98 80241258 2412000C */ addiu $s2, $zero, 0xc -/* 9F5C9C 8024125C 860300A8 */ lh $v1, 0xa8($s0) -/* 9F5CA0 80241260 3C013F80 */ lui $at, 0x3f80 -/* 9F5CA4 80241264 44810000 */ mtc1 $at, $f0 -/* 9F5CA8 80241268 3C014000 */ lui $at, 0x4000 -/* 9F5CAC 8024126C 44811000 */ mtc1 $at, $f2 -/* 9F5CB0 80241270 3C01C1A0 */ lui $at, 0xc1a0 -/* 9F5CB4 80241274 44812000 */ mtc1 $at, $f4 -/* 9F5CB8 80241278 44834000 */ mtc1 $v1, $f8 -/* 9F5CBC 8024127C 00000000 */ nop -/* 9F5CC0 80241280 46804220 */ cvt.s.w $f8, $f8 -/* 9F5CC4 80241284 44074000 */ mfc1 $a3, $f8 -/* 9F5CC8 80241288 27A20038 */ addiu $v0, $sp, 0x38 -/* 9F5CCC 8024128C AFB2001C */ sw $s2, 0x1c($sp) -/* 9F5CD0 80241290 AFA20020 */ sw $v0, 0x20($sp) -/* 9F5CD4 80241294 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9F5CD8 80241298 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9F5CDC 8024129C 0C01BFA4 */ jal fx_emote -/* 9F5CE0 802412A0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9F5CE4 802412A4 0200202D */ daddu $a0, $s0, $zero -/* 9F5CE8 802412A8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9F5CEC 802412AC C480003C */ lwc1 $f0, 0x3c($a0) -/* 9F5CF0 802412B0 3C060020 */ lui $a2, 0x20 -/* 9F5CF4 802412B4 0C012530 */ jal func_800494C0 -/* 9F5CF8 802412B8 E4800064 */ swc1 $f0, 0x64($a0) -/* 9F5CFC 802412BC 8E220018 */ lw $v0, 0x18($s1) -/* 9F5D00 802412C0 9442002A */ lhu $v0, 0x2a($v0) -/* 9F5D04 802412C4 30420001 */ andi $v0, $v0, 1 -/* 9F5D08 802412C8 10400003 */ beqz $v0, .L802412D8 -/* 9F5D0C 802412CC 2402000A */ addiu $v0, $zero, 0xa -/* 9F5D10 802412D0 080904E0 */ j .L80241380 -/* 9F5D14 802412D4 AE620070 */ sw $v0, 0x70($s3) -.L802412D8: -/* 9F5D18 802412D8 080904E0 */ j .L80241380 -/* 9F5D1C 802412DC AE720070 */ sw $s2, 0x70($s3) -.L802412E0: -/* 9F5D20 802412E0 AE220090 */ sw $v0, 0x90($s1) -.L802412E4: -/* 9F5D24 802412E4 8602008C */ lh $v0, 0x8c($s0) -/* 9F5D28 802412E8 14400025 */ bnez $v0, .L80241380 -/* 9F5D2C 802412EC 00000000 */ nop -/* 9F5D30 802412F0 8602008E */ lh $v0, 0x8e($s0) -/* 9F5D34 802412F4 1C400022 */ bgtz $v0, .L80241380 -/* 9F5D38 802412F8 00000000 */ nop -/* 9F5D3C 802412FC 8E620074 */ lw $v0, 0x74($s3) -/* 9F5D40 80241300 2442FFFF */ addiu $v0, $v0, -1 -/* 9F5D44 80241304 1840001D */ blez $v0, .L8024137C -/* 9F5D48 80241308 AE620074 */ sw $v0, 0x74($s3) -/* 9F5D4C 8024130C 8E220018 */ lw $v0, 0x18($s1) -/* 9F5D50 80241310 9442002A */ lhu $v0, 0x2a($v0) -/* 9F5D54 80241314 30420010 */ andi $v0, $v0, 0x10 -/* 9F5D58 80241318 14400007 */ bnez $v0, .L80241338 -/* 9F5D5C 8024131C 00000000 */ nop -/* 9F5D60 80241320 C600000C */ lwc1 $f0, 0xc($s0) -/* 9F5D64 80241324 3C014334 */ lui $at, 0x4334 -/* 9F5D68 80241328 44816000 */ mtc1 $at, $f12 -/* 9F5D6C 8024132C 0C00A6C9 */ jal clamp_angle -/* 9F5D70 80241330 460C0300 */ add.s $f12, $f0, $f12 -/* 9F5D74 80241334 E600000C */ swc1 $f0, 0xc($s0) -.L80241338: -/* 9F5D78 80241338 0C00A67F */ jal rand_int -/* 9F5D7C 8024133C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9F5D80 80241340 3C032E8B */ lui $v1, 0x2e8b -/* 9F5D84 80241344 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 9F5D88 80241348 00430018 */ mult $v0, $v1 -/* 9F5D8C 8024134C 00021FC3 */ sra $v1, $v0, 0x1f -/* 9F5D90 80241350 00004010 */ mfhi $t0 -/* 9F5D94 80241354 00082043 */ sra $a0, $t0, 1 -/* 9F5D98 80241358 00832023 */ subu $a0, $a0, $v1 -/* 9F5D9C 8024135C 00041840 */ sll $v1, $a0, 1 -/* 9F5DA0 80241360 00641821 */ addu $v1, $v1, $a0 -/* 9F5DA4 80241364 00031880 */ sll $v1, $v1, 2 -/* 9F5DA8 80241368 00641823 */ subu $v1, $v1, $a0 -/* 9F5DAC 8024136C 00431023 */ subu $v0, $v0, $v1 -/* 9F5DB0 80241370 24420005 */ addiu $v0, $v0, 5 -/* 9F5DB4 80241374 080904E0 */ j .L80241380 -/* 9F5DB8 80241378 A602008E */ sh $v0, 0x8e($s0) -.L8024137C: -/* 9F5DBC 8024137C AE600070 */ sw $zero, 0x70($s3) -.L80241380: -/* 9F5DC0 80241380 8FBF0054 */ lw $ra, 0x54($sp) -/* 9F5DC4 80241384 8FB40050 */ lw $s4, 0x50($sp) -/* 9F5DC8 80241388 8FB3004C */ lw $s3, 0x4c($sp) -/* 9F5DCC 8024138C 8FB20048 */ lw $s2, 0x48($sp) -/* 9F5DD0 80241390 8FB10044 */ lw $s1, 0x44($sp) -/* 9F5DD4 80241394 8FB00040 */ lw $s0, 0x40($sp) -/* 9F5DD8 80241398 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* 9F5DDC 8024139C D7B80068 */ ldc1 $f24, 0x68($sp) -/* 9F5DE0 802413A0 D7B60060 */ ldc1 $f22, 0x60($sp) -/* 9F5DE4 802413A4 D7B40058 */ ldc1 $f20, 0x58($sp) -/* 9F5DE8 802413A8 03E00008 */ jr $ra -/* 9F5DEC 802413AC 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_nok/nok_11/func_80241428_9F4A40.s b/asm/nonmatchings/world/area_nok/nok_11/func_80241428_9F4A40.s deleted file mode 100644 index 497095c5a5..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/func_80241428_9F4A40.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241428_9F5E68 -/* 9F5E68 80241428 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9F5E6C 8024142C AFB00010 */ sw $s0, 0x10($sp) -/* 9F5E70 80241430 0080802D */ daddu $s0, $a0, $zero -/* 9F5E74 80241434 AFBF0014 */ sw $ra, 0x14($sp) -/* 9F5E78 80241438 8E020148 */ lw $v0, 0x148($s0) -/* 9F5E7C 8024143C 0C00EABB */ jal get_npc_unsafe -/* 9F5E80 80241440 84440008 */ lh $a0, 8($v0) -/* 9F5E84 80241444 9443008E */ lhu $v1, 0x8e($v0) -/* 9F5E88 80241448 C440003C */ lwc1 $f0, 0x3c($v0) -/* 9F5E8C 8024144C 24640001 */ addiu $a0, $v1, 1 -/* 9F5E90 80241450 00031C00 */ sll $v1, $v1, 0x10 -/* 9F5E94 80241454 00031B83 */ sra $v1, $v1, 0xe -/* 9F5E98 80241458 A444008E */ sh $a0, 0x8e($v0) -/* 9F5E9C 8024145C 3C018024 */ lui $at, 0x8024 -/* 9F5EA0 80241460 00230821 */ addu $at, $at, $v1 -/* 9F5EA4 80241464 C4222888 */ lwc1 $f2, 0x2888($at) -/* 9F5EA8 80241468 8443008E */ lh $v1, 0x8e($v0) -/* 9F5EAC 8024146C 46020000 */ add.s $f0, $f0, $f2 -/* 9F5EB0 80241470 28630005 */ slti $v1, $v1, 5 -/* 9F5EB4 80241474 14600003 */ bnez $v1, .L80241484 -/* 9F5EB8 80241478 E440003C */ swc1 $f0, 0x3c($v0) -/* 9F5EBC 8024147C 2402000C */ addiu $v0, $zero, 0xc -/* 9F5EC0 80241480 AE020070 */ sw $v0, 0x70($s0) -.L80241484: -/* 9F5EC4 80241484 8FBF0014 */ lw $ra, 0x14($sp) -/* 9F5EC8 80241488 8FB00010 */ lw $s0, 0x10($sp) -/* 9F5ECC 8024148C 03E00008 */ jr $ra -/* 9F5ED0 80241490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_11/func_802419BC_9F4A40.s b/asm/nonmatchings/world/area_nok/nok_11/func_802419BC_9F4A40.s deleted file mode 100644 index e33ddd7130..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/func_802419BC_9F4A40.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419BC_9F63FC -/* 9F63FC 802419BC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9F6400 802419C0 AFB00028 */ sw $s0, 0x28($sp) -/* 9F6404 802419C4 00A0802D */ daddu $s0, $a1, $zero -/* 9F6408 802419C8 AFB1002C */ sw $s1, 0x2c($sp) -/* 9F640C 802419CC 00C0882D */ daddu $s1, $a2, $zero -/* 9F6410 802419D0 AFBF0034 */ sw $ra, 0x34($sp) -/* 9F6414 802419D4 AFB20030 */ sw $s2, 0x30($sp) -/* 9F6418 802419D8 AE200070 */ sw $zero, 0x70($s1) -/* 9F641C 802419DC 8C830000 */ lw $v1, ($a0) -/* 9F6420 802419E0 2402FDFF */ addiu $v0, $zero, -0x201 -/* 9F6424 802419E4 A480008E */ sh $zero, 0x8e($a0) -/* 9F6428 802419E8 00621824 */ and $v1, $v1, $v0 -/* 9F642C 802419EC 34650800 */ ori $a1, $v1, 0x800 -/* 9F6430 802419F0 AC850000 */ sw $a1, ($a0) -/* 9F6434 802419F4 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9F6438 802419F8 8C420034 */ lw $v0, 0x34($v0) -/* 9F643C 802419FC 10400003 */ beqz $v0, .L80241A0C -/* 9F6440 80241A00 00E0902D */ daddu $s2, $a3, $zero -/* 9F6444 80241A04 08090685 */ j .L80241A14 -/* 9F6448 80241A08 34620808 */ ori $v0, $v1, 0x808 -.L80241A0C: -/* 9F644C 80241A0C 2402FFF7 */ addiu $v0, $zero, -9 -/* 9F6450 80241A10 00A21024 */ and $v0, $a1, $v0 -.L80241A14: -/* 9F6454 80241A14 AC820000 */ sw $v0, ($a0) -/* 9F6458 80241A18 27A20024 */ addiu $v0, $sp, 0x24 -/* 9F645C 80241A1C 27A50018 */ addiu $a1, $sp, 0x18 -/* 9F6460 80241A20 C4800038 */ lwc1 $f0, 0x38($a0) -/* 9F6464 80241A24 C482003C */ lwc1 $f2, 0x3c($a0) -/* 9F6468 80241A28 C4840040 */ lwc1 $f4, 0x40($a0) -/* 9F646C 80241A2C 3C01447A */ lui $at, 0x447a -/* 9F6470 80241A30 44813000 */ mtc1 $at, $f6 -/* 9F6474 80241A34 27A6001C */ addiu $a2, $sp, 0x1c -/* 9F6478 80241A38 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9F647C 80241A3C E7A2001C */ swc1 $f2, 0x1c($sp) -/* 9F6480 80241A40 E7A40020 */ swc1 $f4, 0x20($sp) -/* 9F6484 80241A44 E7A60024 */ swc1 $f6, 0x24($sp) -/* 9F6488 80241A48 AFA20010 */ sw $v0, 0x10($sp) -/* 9F648C 80241A4C 8C840080 */ lw $a0, 0x80($a0) -/* 9F6490 80241A50 0C0372DF */ jal func_800DCB7C -/* 9F6494 80241A54 27A70020 */ addiu $a3, $sp, 0x20 -/* 9F6498 80241A58 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 9F649C 80241A5C 3C014059 */ lui $at, 0x4059 -/* 9F64A0 80241A60 44812800 */ mtc1 $at, $f5 -/* 9F64A4 80241A64 44802000 */ mtc1 $zero, $f4 -/* 9F64A8 80241A68 460010A1 */ cvt.d.s $f2, $f2 -/* 9F64AC 80241A6C 46241082 */ mul.d $f2, $f2, $f4 -/* 9F64B0 80241A70 00000000 */ nop -/* 9F64B4 80241A74 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9F64B8 80241A78 46000021 */ cvt.d.s $f0, $f0 -/* 9F64BC 80241A7C 46240002 */ mul.d $f0, $f0, $f4 -/* 9F64C0 80241A80 00000000 */ nop -/* 9F64C4 80241A84 3C013FE0 */ lui $at, 0x3fe0 -/* 9F64C8 80241A88 44812800 */ mtc1 $at, $f5 -/* 9F64CC 80241A8C 44802000 */ mtc1 $zero, $f4 -/* 9F64D0 80241A90 00000000 */ nop -/* 9F64D4 80241A94 46241080 */ add.d $f2, $f2, $f4 -/* 9F64D8 80241A98 AE000074 */ sw $zero, 0x74($s0) -/* 9F64DC 80241A9C 46240000 */ add.d $f0, $f0, $f4 -/* 9F64E0 80241AA0 AE000090 */ sw $zero, 0x90($s0) -/* 9F64E4 80241AA4 4620120D */ trunc.w.d $f8, $f2 -/* 9F64E8 80241AA8 E6080078 */ swc1 $f8, 0x78($s0) -/* 9F64EC 80241AAC 4620020D */ trunc.w.d $f8, $f0 -/* 9F64F0 80241AB0 E6080088 */ swc1 $f8, 0x88($s0) -/* 9F64F4 80241AB4 8E420014 */ lw $v0, 0x14($s2) -/* 9F64F8 80241AB8 AE220074 */ sw $v0, 0x74($s1) -/* 9F64FC 80241ABC 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9F6500 80241AC0 34420010 */ ori $v0, $v0, 0x10 -/* 9F6504 80241AC4 AE0200B0 */ sw $v0, 0xb0($s0) -/* 9F6508 80241AC8 8FBF0034 */ lw $ra, 0x34($sp) -/* 9F650C 80241ACC 8FB20030 */ lw $s2, 0x30($sp) -/* 9F6510 80241AD0 8FB1002C */ lw $s1, 0x2c($sp) -/* 9F6514 80241AD4 8FB00028 */ lw $s0, 0x28($sp) -/* 9F6518 80241AD8 03E00008 */ jr $ra -/* 9F651C 80241ADC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_nok/nok_11/func_80241CCC_9F4A40.s b/asm/nonmatchings/world/area_nok/nok_11/func_80241CCC_9F4A40.s deleted file mode 100644 index e0136ed59e..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/func_80241CCC_9F4A40.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CCC_9F670C -/* 9F670C 80241CCC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9F6710 80241CD0 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 9F6714 80241CD4 4485A000 */ mtc1 $a1, $f20 -/* 9F6718 80241CD8 F7B60020 */ sdc1 $f22, 0x20($sp) -/* 9F671C 80241CDC 4486B000 */ mtc1 $a2, $f22 -/* 9F6720 80241CE0 AFB00010 */ sw $s0, 0x10($sp) -/* 9F6724 80241CE4 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 9F6728 80241CE8 4487C000 */ mtc1 $a3, $f24 -/* 9F672C 80241CEC AFBF0014 */ sw $ra, 0x14($sp) -/* 9F6730 80241CF0 0C019D28 */ jal guMtxIdentF -/* 9F6734 80241CF4 0080802D */ daddu $s0, $a0, $zero -/* 9F6738 80241CF8 4616A582 */ mul.s $f22, $f20, $f22 -/* 9F673C 80241CFC 00000000 */ nop -/* 9F6740 80241D00 4618A502 */ mul.s $f20, $f20, $f24 -/* 9F6744 80241D04 00000000 */ nop -/* 9F6748 80241D08 3C013F80 */ lui $at, 0x3f80 -/* 9F674C 80241D0C 44810000 */ mtc1 $at, $f0 -/* 9F6750 80241D10 00000000 */ nop -/* 9F6754 80241D14 E6000014 */ swc1 $f0, 0x14($s0) -/* 9F6758 80241D18 E6160010 */ swc1 $f22, 0x10($s0) -/* 9F675C 80241D1C E6140018 */ swc1 $f20, 0x18($s0) -/* 9F6760 80241D20 8FBF0014 */ lw $ra, 0x14($sp) -/* 9F6764 80241D24 8FB00010 */ lw $s0, 0x10($sp) -/* 9F6768 80241D28 D7B80028 */ ldc1 $f24, 0x28($sp) -/* 9F676C 80241D2C D7B60020 */ ldc1 $f22, 0x20($sp) -/* 9F6770 80241D30 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 9F6774 80241D34 03E00008 */ jr $ra -/* 9F6778 80241D38 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_11/func_80241D3C_9F4A40.s b/asm/nonmatchings/world/area_nok/nok_11/func_80241D3C_9F4A40.s deleted file mode 100644 index 165bb768d2..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/func_80241D3C_9F4A40.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D3C_9F677C -/* 9F677C 80241D3C 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 9F6780 80241D40 AFB10054 */ sw $s1, 0x54($sp) -/* 9F6784 80241D44 0080882D */ daddu $s1, $a0, $zero -/* 9F6788 80241D48 AFBF005C */ sw $ra, 0x5c($sp) -/* 9F678C 80241D4C AFB20058 */ sw $s2, 0x58($sp) -/* 9F6790 80241D50 AFB00050 */ sw $s0, 0x50($sp) -/* 9F6794 80241D54 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 9F6798 80241D58 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 9F679C 80241D5C F7B80070 */ sdc1 $f24, 0x70($sp) -/* 9F67A0 80241D60 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 9F67A4 80241D64 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 9F67A8 80241D68 8E30000C */ lw $s0, 0xc($s1) -/* 9F67AC 80241D6C 8E050000 */ lw $a1, ($s0) -/* 9F67B0 80241D70 0C0B1EAF */ jal get_variable -/* 9F67B4 80241D74 26100004 */ addiu $s0, $s0, 4 -/* 9F67B8 80241D78 0C046C04 */ jal get_model_list_index_from_tree_index -/* 9F67BC 80241D7C 0040202D */ daddu $a0, $v0, $zero -/* 9F67C0 80241D80 8E050000 */ lw $a1, ($s0) -/* 9F67C4 80241D84 26100004 */ addiu $s0, $s0, 4 -/* 9F67C8 80241D88 0220202D */ daddu $a0, $s1, $zero -/* 9F67CC 80241D8C 0C0B210B */ jal get_float_variable -/* 9F67D0 80241D90 0040902D */ daddu $s2, $v0, $zero -/* 9F67D4 80241D94 8E050000 */ lw $a1, ($s0) -/* 9F67D8 80241D98 26100004 */ addiu $s0, $s0, 4 -/* 9F67DC 80241D9C 0220202D */ daddu $a0, $s1, $zero -/* 9F67E0 80241DA0 0C0B210B */ jal get_float_variable -/* 9F67E4 80241DA4 46000706 */ mov.s $f28, $f0 -/* 9F67E8 80241DA8 8E050000 */ lw $a1, ($s0) -/* 9F67EC 80241DAC 26100004 */ addiu $s0, $s0, 4 -/* 9F67F0 80241DB0 0220202D */ daddu $a0, $s1, $zero -/* 9F67F4 80241DB4 0C0B210B */ jal get_float_variable -/* 9F67F8 80241DB8 46000686 */ mov.s $f26, $f0 -/* 9F67FC 80241DBC 0220202D */ daddu $a0, $s1, $zero -/* 9F6800 80241DC0 8E050000 */ lw $a1, ($s0) -/* 9F6804 80241DC4 0C0B210B */ jal get_float_variable -/* 9F6808 80241DC8 46000586 */ mov.s $f22, $f0 -/* 9F680C 80241DCC 0240202D */ daddu $a0, $s2, $zero -/* 9F6810 80241DD0 0C046B4C */ jal get_model_from_list_index -/* 9F6814 80241DD4 46000606 */ mov.s $f24, $f0 -/* 9F6818 80241DD8 0040882D */ daddu $s1, $v0, $zero -/* 9F681C 80241DDC 96220000 */ lhu $v0, ($s1) -/* 9F6820 80241DE0 30420400 */ andi $v0, $v0, 0x400 -/* 9F6824 80241DE4 1440001E */ bnez $v0, .L80241E60 -/* 9F6828 80241DE8 26300058 */ addiu $s0, $s1, 0x58 -/* 9F682C 80241DEC 4480A000 */ mtc1 $zero, $f20 -/* 9F6830 80241DF0 4406B000 */ mfc1 $a2, $f22 -/* 9F6834 80241DF4 4405A000 */ mfc1 $a1, $f20 -/* 9F6838 80241DF8 4407A000 */ mfc1 $a3, $f20 -/* 9F683C 80241DFC 0C019E40 */ jal guTranslateF -/* 9F6840 80241E00 0200202D */ daddu $a0, $s0, $zero -/* 9F6844 80241E04 4405E000 */ mfc1 $a1, $f28 -/* 9F6848 80241E08 4406D000 */ mfc1 $a2, $f26 -/* 9F684C 80241E0C 4407C000 */ mfc1 $a3, $f24 -/* 9F6850 80241E10 0C090733 */ jal func_80241CCC -/* 9F6854 80241E14 27A40010 */ addiu $a0, $sp, 0x10 -/* 9F6858 80241E18 27A40010 */ addiu $a0, $sp, 0x10 -/* 9F685C 80241E1C 0200282D */ daddu $a1, $s0, $zero -/* 9F6860 80241E20 0C019D80 */ jal guMtxCatF -/* 9F6864 80241E24 0200302D */ daddu $a2, $s0, $zero -/* 9F6868 80241E28 27A40010 */ addiu $a0, $sp, 0x10 -/* 9F686C 80241E2C 4600B587 */ neg.s $f22, $f22 -/* 9F6870 80241E30 4405A000 */ mfc1 $a1, $f20 -/* 9F6874 80241E34 4406B000 */ mfc1 $a2, $f22 -/* 9F6878 80241E38 0C019E40 */ jal guTranslateF -/* 9F687C 80241E3C 00A0382D */ daddu $a3, $a1, $zero -/* 9F6880 80241E40 27A40010 */ addiu $a0, $sp, 0x10 -/* 9F6884 80241E44 0200282D */ daddu $a1, $s0, $zero -/* 9F6888 80241E48 0C019D80 */ jal guMtxCatF -/* 9F688C 80241E4C 00A0302D */ daddu $a2, $a1, $zero -/* 9F6890 80241E50 96220000 */ lhu $v0, ($s1) -/* 9F6894 80241E54 34421400 */ ori $v0, $v0, 0x1400 -/* 9F6898 80241E58 080907B6 */ j .L80241ED8 -/* 9F689C 80241E5C A6220000 */ sh $v0, ($s1) -.L80241E60: -/* 9F68A0 80241E60 4480A000 */ mtc1 $zero, $f20 -/* 9F68A4 80241E64 4406B000 */ mfc1 $a2, $f22 -/* 9F68A8 80241E68 4405A000 */ mfc1 $a1, $f20 -/* 9F68AC 80241E6C 4407A000 */ mfc1 $a3, $f20 -/* 9F68B0 80241E70 0C019E40 */ jal guTranslateF -/* 9F68B4 80241E74 27A40010 */ addiu $a0, $sp, 0x10 -/* 9F68B8 80241E78 27A40010 */ addiu $a0, $sp, 0x10 -/* 9F68BC 80241E7C 26300058 */ addiu $s0, $s1, 0x58 -/* 9F68C0 80241E80 0200282D */ daddu $a1, $s0, $zero -/* 9F68C4 80241E84 0C019D80 */ jal guMtxCatF -/* 9F68C8 80241E88 0200302D */ daddu $a2, $s0, $zero -/* 9F68CC 80241E8C 4405E000 */ mfc1 $a1, $f28 -/* 9F68D0 80241E90 4406D000 */ mfc1 $a2, $f26 -/* 9F68D4 80241E94 4407C000 */ mfc1 $a3, $f24 -/* 9F68D8 80241E98 0C090733 */ jal func_80241CCC -/* 9F68DC 80241E9C 27A40010 */ addiu $a0, $sp, 0x10 -/* 9F68E0 80241EA0 27A40010 */ addiu $a0, $sp, 0x10 -/* 9F68E4 80241EA4 0200282D */ daddu $a1, $s0, $zero -/* 9F68E8 80241EA8 0C019D80 */ jal guMtxCatF -/* 9F68EC 80241EAC 0200302D */ daddu $a2, $s0, $zero -/* 9F68F0 80241EB0 27A40010 */ addiu $a0, $sp, 0x10 -/* 9F68F4 80241EB4 4600B587 */ neg.s $f22, $f22 -/* 9F68F8 80241EB8 4405A000 */ mfc1 $a1, $f20 -/* 9F68FC 80241EBC 4406B000 */ mfc1 $a2, $f22 -/* 9F6900 80241EC0 0C019E40 */ jal guTranslateF -/* 9F6904 80241EC4 00A0382D */ daddu $a3, $a1, $zero -/* 9F6908 80241EC8 27A40010 */ addiu $a0, $sp, 0x10 -/* 9F690C 80241ECC 0200282D */ daddu $a1, $s0, $zero -/* 9F6910 80241ED0 0C019D80 */ jal guMtxCatF -/* 9F6914 80241ED4 00A0302D */ daddu $a2, $a1, $zero -.L80241ED8: -/* 9F6918 80241ED8 8FBF005C */ lw $ra, 0x5c($sp) -/* 9F691C 80241EDC 8FB20058 */ lw $s2, 0x58($sp) -/* 9F6920 80241EE0 8FB10054 */ lw $s1, 0x54($sp) -/* 9F6924 80241EE4 8FB00050 */ lw $s0, 0x50($sp) -/* 9F6928 80241EE8 D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 9F692C 80241EEC D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 9F6930 80241EF0 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 9F6934 80241EF4 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 9F6938 80241EF8 D7B40060 */ ldc1 $f20, 0x60($sp) -/* 9F693C 80241EFC 24020002 */ addiu $v0, $zero, 2 -/* 9F6940 80241F00 03E00008 */ jr $ra -/* 9F6944 80241F04 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_nok/nok_11/func_80241F30_9F4A40.s b/asm/nonmatchings/world/area_nok/nok_11/func_80241F30_9F4A40.s deleted file mode 100644 index bf4d2f99d2..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/func_80241F30_9F4A40.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F30_9F6970 -/* 9F6970 80241F30 3C038011 */ lui $v1, %hi(gPlayerData) -/* 9F6974 80241F34 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 9F6978 80241F38 9462000C */ lhu $v0, 0xc($v1) -/* 9F697C 80241F3C 2442FF9C */ addiu $v0, $v0, -0x64 -/* 9F6980 80241F40 A462000C */ sh $v0, 0xc($v1) -/* 9F6984 80241F44 03E00008 */ jr $ra -/* 9F6988 80241F48 24020002 */ addiu $v0, $zero, 2 -/* 9F698C 80241F4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/func_802402F0_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/func_802402F0_9FA7F0.s deleted file mode 100644 index 47df6d3b36..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/func_802402F0_9FA7F0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_9FAAE0 -/* 9FAAE0 802402F0 3C03800B */ lui $v1, %hi(gCameras) -/* 9FAAE4 802402F4 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 9FAAE8 802402F8 94620000 */ lhu $v0, ($v1) -/* 9FAAEC 802402FC 34421000 */ ori $v0, $v0, 0x1000 -/* 9FAAF0 80240300 A4620000 */ sh $v0, ($v1) -/* 9FAAF4 80240304 03E00008 */ jr $ra -/* 9FAAF8 80240308 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_12/func_8024030C_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/func_8024030C_9FA7F0.s deleted file mode 100644 index 2d70d142dc..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/func_8024030C_9FA7F0.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_9FAAFC -/* 9FAAFC 8024030C 3C03800B */ lui $v1, %hi(gCameras) -/* 9FAB00 80240310 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 9FAB04 80240314 94620000 */ lhu $v0, ($v1) -/* 9FAB08 80240318 3042EFFF */ andi $v0, $v0, 0xefff -/* 9FAB0C 8024031C A4620000 */ sh $v0, ($v1) -/* 9FAB10 80240320 03E00008 */ jr $ra -/* 9FAB14 80240324 24020002 */ addiu $v0, $zero, 2 -/* 9FAB18 80240328 00000000 */ nop -/* 9FAB1C 8024032C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/func_80240330_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/func_80240330_9FA7F0.s deleted file mode 100644 index 97de7830dc..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/func_80240330_9FA7F0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240330_9FAB20 -/* 9FAB20 80240330 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9FAB24 80240334 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 9FAB28 80240338 4485A000 */ mtc1 $a1, $f20 -/* 9FAB2C 8024033C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 9FAB30 80240340 4486B000 */ mtc1 $a2, $f22 -/* 9FAB34 80240344 AFB00010 */ sw $s0, 0x10($sp) -/* 9FAB38 80240348 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 9FAB3C 8024034C 4487C000 */ mtc1 $a3, $f24 -/* 9FAB40 80240350 AFBF0014 */ sw $ra, 0x14($sp) -/* 9FAB44 80240354 0C019D28 */ jal guMtxIdentF -/* 9FAB48 80240358 0080802D */ daddu $s0, $a0, $zero -/* 9FAB4C 8024035C 4616A582 */ mul.s $f22, $f20, $f22 -/* 9FAB50 80240360 00000000 */ nop -/* 9FAB54 80240364 4618A502 */ mul.s $f20, $f20, $f24 -/* 9FAB58 80240368 00000000 */ nop -/* 9FAB5C 8024036C 3C013F80 */ lui $at, 0x3f80 -/* 9FAB60 80240370 44810000 */ mtc1 $at, $f0 -/* 9FAB64 80240374 00000000 */ nop -/* 9FAB68 80240378 E6000014 */ swc1 $f0, 0x14($s0) -/* 9FAB6C 8024037C E6160010 */ swc1 $f22, 0x10($s0) -/* 9FAB70 80240380 E6140018 */ swc1 $f20, 0x18($s0) -/* 9FAB74 80240384 8FBF0014 */ lw $ra, 0x14($sp) -/* 9FAB78 80240388 8FB00010 */ lw $s0, 0x10($sp) -/* 9FAB7C 8024038C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 9FAB80 80240390 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 9FAB84 80240394 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 9FAB88 80240398 03E00008 */ jr $ra -/* 9FAB8C 8024039C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_12/func_802403A0_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/func_802403A0_9FA7F0.s deleted file mode 100644 index a63ce279a1..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/func_802403A0_9FA7F0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403A0_9FAB90 -/* 9FAB90 802403A0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 9FAB94 802403A4 AFB10054 */ sw $s1, 0x54($sp) -/* 9FAB98 802403A8 0080882D */ daddu $s1, $a0, $zero -/* 9FAB9C 802403AC AFBF005C */ sw $ra, 0x5c($sp) -/* 9FABA0 802403B0 AFB20058 */ sw $s2, 0x58($sp) -/* 9FABA4 802403B4 AFB00050 */ sw $s0, 0x50($sp) -/* 9FABA8 802403B8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 9FABAC 802403BC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 9FABB0 802403C0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 9FABB4 802403C4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 9FABB8 802403C8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 9FABBC 802403CC 8E30000C */ lw $s0, 0xc($s1) -/* 9FABC0 802403D0 8E050000 */ lw $a1, ($s0) -/* 9FABC4 802403D4 0C0B1EAF */ jal get_variable -/* 9FABC8 802403D8 26100004 */ addiu $s0, $s0, 4 -/* 9FABCC 802403DC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 9FABD0 802403E0 0040202D */ daddu $a0, $v0, $zero -/* 9FABD4 802403E4 8E050000 */ lw $a1, ($s0) -/* 9FABD8 802403E8 26100004 */ addiu $s0, $s0, 4 -/* 9FABDC 802403EC 0220202D */ daddu $a0, $s1, $zero -/* 9FABE0 802403F0 0C0B210B */ jal get_float_variable -/* 9FABE4 802403F4 0040902D */ daddu $s2, $v0, $zero -/* 9FABE8 802403F8 8E050000 */ lw $a1, ($s0) -/* 9FABEC 802403FC 26100004 */ addiu $s0, $s0, 4 -/* 9FABF0 80240400 0220202D */ daddu $a0, $s1, $zero -/* 9FABF4 80240404 0C0B210B */ jal get_float_variable -/* 9FABF8 80240408 46000706 */ mov.s $f28, $f0 -/* 9FABFC 8024040C 8E050000 */ lw $a1, ($s0) -/* 9FAC00 80240410 26100004 */ addiu $s0, $s0, 4 -/* 9FAC04 80240414 0220202D */ daddu $a0, $s1, $zero -/* 9FAC08 80240418 0C0B210B */ jal get_float_variable -/* 9FAC0C 8024041C 46000686 */ mov.s $f26, $f0 -/* 9FAC10 80240420 0220202D */ daddu $a0, $s1, $zero -/* 9FAC14 80240424 8E050000 */ lw $a1, ($s0) -/* 9FAC18 80240428 0C0B210B */ jal get_float_variable -/* 9FAC1C 8024042C 46000586 */ mov.s $f22, $f0 -/* 9FAC20 80240430 0240202D */ daddu $a0, $s2, $zero -/* 9FAC24 80240434 0C046B4C */ jal get_model_from_list_index -/* 9FAC28 80240438 46000606 */ mov.s $f24, $f0 -/* 9FAC2C 8024043C 0040882D */ daddu $s1, $v0, $zero -/* 9FAC30 80240440 96220000 */ lhu $v0, ($s1) -/* 9FAC34 80240444 30420400 */ andi $v0, $v0, 0x400 -/* 9FAC38 80240448 1440001E */ bnez $v0, .L802404C4 -/* 9FAC3C 8024044C 26300058 */ addiu $s0, $s1, 0x58 -/* 9FAC40 80240450 4480A000 */ mtc1 $zero, $f20 -/* 9FAC44 80240454 4406B000 */ mfc1 $a2, $f22 -/* 9FAC48 80240458 4405A000 */ mfc1 $a1, $f20 -/* 9FAC4C 8024045C 4407A000 */ mfc1 $a3, $f20 -/* 9FAC50 80240460 0C019E40 */ jal guTranslateF -/* 9FAC54 80240464 0200202D */ daddu $a0, $s0, $zero -/* 9FAC58 80240468 4405E000 */ mfc1 $a1, $f28 -/* 9FAC5C 8024046C 4406D000 */ mfc1 $a2, $f26 -/* 9FAC60 80240470 4407C000 */ mfc1 $a3, $f24 -/* 9FAC64 80240474 0C0900CC */ jal func_80240330 -/* 9FAC68 80240478 27A40010 */ addiu $a0, $sp, 0x10 -/* 9FAC6C 8024047C 27A40010 */ addiu $a0, $sp, 0x10 -/* 9FAC70 80240480 0200282D */ daddu $a1, $s0, $zero -/* 9FAC74 80240484 0C019D80 */ jal guMtxCatF -/* 9FAC78 80240488 0200302D */ daddu $a2, $s0, $zero -/* 9FAC7C 8024048C 27A40010 */ addiu $a0, $sp, 0x10 -/* 9FAC80 80240490 4600B587 */ neg.s $f22, $f22 -/* 9FAC84 80240494 4405A000 */ mfc1 $a1, $f20 -/* 9FAC88 80240498 4406B000 */ mfc1 $a2, $f22 -/* 9FAC8C 8024049C 0C019E40 */ jal guTranslateF -/* 9FAC90 802404A0 00A0382D */ daddu $a3, $a1, $zero -/* 9FAC94 802404A4 27A40010 */ addiu $a0, $sp, 0x10 -/* 9FAC98 802404A8 0200282D */ daddu $a1, $s0, $zero -/* 9FAC9C 802404AC 0C019D80 */ jal guMtxCatF -/* 9FACA0 802404B0 00A0302D */ daddu $a2, $a1, $zero -/* 9FACA4 802404B4 96220000 */ lhu $v0, ($s1) -/* 9FACA8 802404B8 34421400 */ ori $v0, $v0, 0x1400 -/* 9FACAC 802404BC 0809014F */ j .L8024053C -/* 9FACB0 802404C0 A6220000 */ sh $v0, ($s1) -.L802404C4: -/* 9FACB4 802404C4 4480A000 */ mtc1 $zero, $f20 -/* 9FACB8 802404C8 4406B000 */ mfc1 $a2, $f22 -/* 9FACBC 802404CC 4405A000 */ mfc1 $a1, $f20 -/* 9FACC0 802404D0 4407A000 */ mfc1 $a3, $f20 -/* 9FACC4 802404D4 0C019E40 */ jal guTranslateF -/* 9FACC8 802404D8 27A40010 */ addiu $a0, $sp, 0x10 -/* 9FACCC 802404DC 27A40010 */ addiu $a0, $sp, 0x10 -/* 9FACD0 802404E0 26300058 */ addiu $s0, $s1, 0x58 -/* 9FACD4 802404E4 0200282D */ daddu $a1, $s0, $zero -/* 9FACD8 802404E8 0C019D80 */ jal guMtxCatF -/* 9FACDC 802404EC 0200302D */ daddu $a2, $s0, $zero -/* 9FACE0 802404F0 4405E000 */ mfc1 $a1, $f28 -/* 9FACE4 802404F4 4406D000 */ mfc1 $a2, $f26 -/* 9FACE8 802404F8 4407C000 */ mfc1 $a3, $f24 -/* 9FACEC 802404FC 0C0900CC */ jal func_80240330 -/* 9FACF0 80240500 27A40010 */ addiu $a0, $sp, 0x10 -/* 9FACF4 80240504 27A40010 */ addiu $a0, $sp, 0x10 -/* 9FACF8 80240508 0200282D */ daddu $a1, $s0, $zero -/* 9FACFC 8024050C 0C019D80 */ jal guMtxCatF -/* 9FAD00 80240510 0200302D */ daddu $a2, $s0, $zero -/* 9FAD04 80240514 27A40010 */ addiu $a0, $sp, 0x10 -/* 9FAD08 80240518 4600B587 */ neg.s $f22, $f22 -/* 9FAD0C 8024051C 4405A000 */ mfc1 $a1, $f20 -/* 9FAD10 80240520 4406B000 */ mfc1 $a2, $f22 -/* 9FAD14 80240524 0C019E40 */ jal guTranslateF -/* 9FAD18 80240528 00A0382D */ daddu $a3, $a1, $zero -/* 9FAD1C 8024052C 27A40010 */ addiu $a0, $sp, 0x10 -/* 9FAD20 80240530 0200282D */ daddu $a1, $s0, $zero -/* 9FAD24 80240534 0C019D80 */ jal guMtxCatF -/* 9FAD28 80240538 00A0302D */ daddu $a2, $a1, $zero -.L8024053C: -/* 9FAD2C 8024053C 8FBF005C */ lw $ra, 0x5c($sp) -/* 9FAD30 80240540 8FB20058 */ lw $s2, 0x58($sp) -/* 9FAD34 80240544 8FB10054 */ lw $s1, 0x54($sp) -/* 9FAD38 80240548 8FB00050 */ lw $s0, 0x50($sp) -/* 9FAD3C 8024054C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 9FAD40 80240550 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 9FAD44 80240554 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 9FAD48 80240558 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 9FAD4C 8024055C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 9FAD50 80240560 24020002 */ addiu $v0, $zero, 2 -/* 9FAD54 80240564 03E00008 */ jr $ra -/* 9FAD58 80240568 27BD0088 */ addiu $sp, $sp, 0x88 -/* 9FAD5C 8024056C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/func_802405EC_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/func_802405EC_9FA7F0.s deleted file mode 100644 index ec64d70c27..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/func_802405EC_9FA7F0.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_9FADDC -/* 9FADDC 802405EC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9FADE0 802405F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 9FADE4 802405F4 0080982D */ daddu $s3, $a0, $zero -/* 9FADE8 802405F8 AFBF0020 */ sw $ra, 0x20($sp) -/* 9FADEC 802405FC AFB20018 */ sw $s2, 0x18($sp) -/* 9FADF0 80240600 AFB10014 */ sw $s1, 0x14($sp) -/* 9FADF4 80240604 AFB00010 */ sw $s0, 0x10($sp) -/* 9FADF8 80240608 8E710148 */ lw $s1, 0x148($s3) -/* 9FADFC 8024060C 86240008 */ lh $a0, 8($s1) -/* 9FAE00 80240610 0C00EABB */ jal get_npc_unsafe -/* 9FAE04 80240614 00A0902D */ daddu $s2, $a1, $zero -/* 9FAE08 80240618 0040802D */ daddu $s0, $v0, $zero -/* 9FAE0C 8024061C 8602008E */ lh $v0, 0x8e($s0) -/* 9FAE10 80240620 9603008E */ lhu $v1, 0x8e($s0) -/* 9FAE14 80240624 18400005 */ blez $v0, .L8024063C -/* 9FAE18 80240628 2462FFFF */ addiu $v0, $v1, -1 -/* 9FAE1C 8024062C A602008E */ sh $v0, 0x8e($s0) -/* 9FAE20 80240630 00021400 */ sll $v0, $v0, 0x10 -/* 9FAE24 80240634 1C400033 */ bgtz $v0, .L80240704 -/* 9FAE28 80240638 00000000 */ nop -.L8024063C: -/* 9FAE2C 8024063C 8602008C */ lh $v0, 0x8c($s0) -/* 9FAE30 80240640 14400030 */ bnez $v0, .L80240704 -/* 9FAE34 80240644 00000000 */ nop -/* 9FAE38 80240648 8E2200CC */ lw $v0, 0xcc($s1) -/* 9FAE3C 8024064C 8C420024 */ lw $v0, 0x24($v0) -/* 9FAE40 80240650 AE020028 */ sw $v0, 0x28($s0) -/* 9FAE44 80240654 C6400018 */ lwc1 $f0, 0x18($s2) -/* 9FAE48 80240658 E6000018 */ swc1 $f0, 0x18($s0) -/* 9FAE4C 8024065C 8E230088 */ lw $v1, 0x88($s1) -/* 9FAE50 80240660 24020005 */ addiu $v0, $zero, 5 -/* 9FAE54 80240664 10620005 */ beq $v1, $v0, .L8024067C -/* 9FAE58 80240668 00000000 */ nop -/* 9FAE5C 8024066C 10600003 */ beqz $v1, .L8024067C -/* 9FAE60 80240670 24020001 */ addiu $v0, $zero, 1 -/* 9FAE64 80240674 14620006 */ bne $v1, $v0, .L80240690 -/* 9FAE68 80240678 00000000 */ nop -.L8024067C: -/* 9FAE6C 8024067C 8E220084 */ lw $v0, 0x84($s1) -/* 9FAE70 80240680 00021FC2 */ srl $v1, $v0, 0x1f -/* 9FAE74 80240684 00431021 */ addu $v0, $v0, $v1 -/* 9FAE78 80240688 00021043 */ sra $v0, $v0, 1 -/* 9FAE7C 8024068C A60200A8 */ sh $v0, 0xa8($s0) -.L80240690: -/* 9FAE80 80240690 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9FAE84 80240694 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9FAE88 80240698 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9FAE8C 8024069C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9FAE90 802406A0 8C460028 */ lw $a2, 0x28($v0) -/* 9FAE94 802406A4 0C00A7B5 */ jal dist2D -/* 9FAE98 802406A8 8C470030 */ lw $a3, 0x30($v0) -/* 9FAE9C 802406AC C6020018 */ lwc1 $f2, 0x18($s0) -/* 9FAEA0 802406B0 46020003 */ div.s $f0, $f0, $f2 -/* 9FAEA4 802406B4 3C018024 */ lui $at, 0x8024 -/* 9FAEA8 802406B8 D4225A70 */ ldc1 $f2, 0x5a70($at) -/* 9FAEAC 802406BC 46000021 */ cvt.d.s $f0, $f0 -/* 9FAEB0 802406C0 46220000 */ add.d $f0, $f0, $f2 -/* 9FAEB4 802406C4 4620010D */ trunc.w.d $f4, $f0 -/* 9FAEB8 802406C8 44022000 */ mfc1 $v0, $f4 -/* 9FAEBC 802406CC 00000000 */ nop -/* 9FAEC0 802406D0 A602008E */ sh $v0, 0x8e($s0) -/* 9FAEC4 802406D4 00021400 */ sll $v0, $v0, 0x10 -/* 9FAEC8 802406D8 8E230078 */ lw $v1, 0x78($s1) -/* 9FAECC 802406DC 00021403 */ sra $v0, $v0, 0x10 -/* 9FAED0 802406E0 0043102A */ slt $v0, $v0, $v1 -/* 9FAED4 802406E4 10400003 */ beqz $v0, .L802406F4 -/* 9FAED8 802406E8 00000000 */ nop -/* 9FAEDC 802406EC 9622007A */ lhu $v0, 0x7a($s1) -/* 9FAEE0 802406F0 A602008E */ sh $v0, 0x8e($s0) -.L802406F4: -/* 9FAEE4 802406F4 8602008E */ lh $v0, 0x8e($s0) -/* 9FAEE8 802406F8 AE22007C */ sw $v0, 0x7c($s1) -/* 9FAEEC 802406FC 2402000E */ addiu $v0, $zero, 0xe -/* 9FAEF0 80240700 AE620070 */ sw $v0, 0x70($s3) -.L80240704: -/* 9FAEF4 80240704 8FBF0020 */ lw $ra, 0x20($sp) -/* 9FAEF8 80240708 8FB3001C */ lw $s3, 0x1c($sp) -/* 9FAEFC 8024070C 8FB20018 */ lw $s2, 0x18($sp) -/* 9FAF00 80240710 8FB10014 */ lw $s1, 0x14($sp) -/* 9FAF04 80240714 8FB00010 */ lw $s0, 0x10($sp) -/* 9FAF08 80240718 03E00008 */ jr $ra -/* 9FAF0C 8024071C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_12/func_80240720_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/func_80240720_9FA7F0.s deleted file mode 100644 index 115cd46b71..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/func_80240720_9FA7F0.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240720_9FAF10 -/* 9FAF10 80240720 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9FAF14 80240724 AFB3003C */ sw $s3, 0x3c($sp) -/* 9FAF18 80240728 0080982D */ daddu $s3, $a0, $zero -/* 9FAF1C 8024072C AFBF0040 */ sw $ra, 0x40($sp) -/* 9FAF20 80240730 AFB20038 */ sw $s2, 0x38($sp) -/* 9FAF24 80240734 AFB10034 */ sw $s1, 0x34($sp) -/* 9FAF28 80240738 AFB00030 */ sw $s0, 0x30($sp) -/* 9FAF2C 8024073C 8E710148 */ lw $s1, 0x148($s3) -/* 9FAF30 80240740 0C00EABB */ jal get_npc_unsafe -/* 9FAF34 80240744 86240008 */ lh $a0, 8($s1) -/* 9FAF38 80240748 0040802D */ daddu $s0, $v0, $zero -/* 9FAF3C 8024074C 8E22007C */ lw $v0, 0x7c($s1) -/* 9FAF40 80240750 8603008E */ lh $v1, 0x8e($s0) -/* 9FAF44 80240754 2442FFFF */ addiu $v0, $v0, -1 -/* 9FAF48 80240758 14620012 */ bne $v1, $v0, .L802407A4 -/* 9FAF4C 8024075C 00000000 */ nop -/* 9FAF50 80240760 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9FAF54 80240764 4600020D */ trunc.w.s $f8, $f0 -/* 9FAF58 80240768 44024000 */ mfc1 $v0, $f8 -/* 9FAF5C 8024076C 00000000 */ nop -/* 9FAF60 80240770 A6220010 */ sh $v0, 0x10($s1) -/* 9FAF64 80240774 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9FAF68 80240778 4600020D */ trunc.w.s $f8, $f0 -/* 9FAF6C 8024077C 44024000 */ mfc1 $v0, $f8 -/* 9FAF70 80240780 00000000 */ nop -/* 9FAF74 80240784 A6220012 */ sh $v0, 0x12($s1) -/* 9FAF78 80240788 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9FAF7C 8024078C 24020001 */ addiu $v0, $zero, 1 -/* 9FAF80 80240790 A2220007 */ sb $v0, 7($s1) -/* 9FAF84 80240794 4600020D */ trunc.w.s $f8, $f0 -/* 9FAF88 80240798 44024000 */ mfc1 $v0, $f8 -/* 9FAF8C 8024079C 00000000 */ nop -/* 9FAF90 802407A0 A6220014 */ sh $v0, 0x14($s1) -.L802407A4: -/* 9FAF94 802407A4 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9FAF98 802407A8 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9FAF9C 802407AC C6040040 */ lwc1 $f4, 0x40($s0) -/* 9FAFA0 802407B0 C6060018 */ lwc1 $f6, 0x18($s0) -/* 9FAFA4 802407B4 E7A00020 */ swc1 $f0, 0x20($sp) -/* 9FAFA8 802407B8 E7A20024 */ swc1 $f2, 0x24($sp) -/* 9FAFAC 802407BC E7A40028 */ swc1 $f4, 0x28($sp) -/* 9FAFB0 802407C0 E7A60010 */ swc1 $f6, 0x10($sp) -/* 9FAFB4 802407C4 C600000C */ lwc1 $f0, 0xc($s0) -/* 9FAFB8 802407C8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9FAFBC 802407CC 860200A8 */ lh $v0, 0xa8($s0) -/* 9FAFC0 802407D0 27A50020 */ addiu $a1, $sp, 0x20 -/* 9FAFC4 802407D4 44820000 */ mtc1 $v0, $f0 -/* 9FAFC8 802407D8 00000000 */ nop -/* 9FAFCC 802407DC 46800020 */ cvt.s.w $f0, $f0 -/* 9FAFD0 802407E0 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9FAFD4 802407E4 860200A6 */ lh $v0, 0xa6($s0) -/* 9FAFD8 802407E8 27A60024 */ addiu $a2, $sp, 0x24 -/* 9FAFDC 802407EC 44820000 */ mtc1 $v0, $f0 -/* 9FAFE0 802407F0 00000000 */ nop -/* 9FAFE4 802407F4 46800020 */ cvt.s.w $f0, $f0 -/* 9FAFE8 802407F8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 9FAFEC 802407FC 8E040080 */ lw $a0, 0x80($s0) -/* 9FAFF0 80240800 0C037711 */ jal func_800DDC44 -/* 9FAFF4 80240804 27A70028 */ addiu $a3, $sp, 0x28 -/* 9FAFF8 80240808 0040902D */ daddu $s2, $v0, $zero -/* 9FAFFC 8024080C 16400005 */ bnez $s2, .L80240824 -/* 9FB000 80240810 00000000 */ nop -/* 9FB004 80240814 8E050018 */ lw $a1, 0x18($s0) -/* 9FB008 80240818 8E06000C */ lw $a2, 0xc($s0) -/* 9FB00C 8024081C 0C00EA95 */ jal npc_move_heading -/* 9FB010 80240820 0200202D */ daddu $a0, $s0, $zero -.L80240824: -/* 9FB014 80240824 8602008E */ lh $v0, 0x8e($s0) -/* 9FB018 80240828 9603008E */ lhu $v1, 0x8e($s0) -/* 9FB01C 8024082C 18400007 */ blez $v0, .L8024084C -/* 9FB020 80240830 2462FFFF */ addiu $v0, $v1, -1 -/* 9FB024 80240834 A602008E */ sh $v0, 0x8e($s0) -/* 9FB028 80240838 00021400 */ sll $v0, $v0, 0x10 -/* 9FB02C 8024083C 18400003 */ blez $v0, .L8024084C -/* 9FB030 80240840 00000000 */ nop -/* 9FB034 80240844 12400008 */ beqz $s2, .L80240868 -/* 9FB038 80240848 00000000 */ nop -.L8024084C: -/* 9FB03C 8024084C 8E2200CC */ lw $v0, 0xcc($s1) -/* 9FB040 80240850 A2200007 */ sb $zero, 7($s1) -/* 9FB044 80240854 8C420028 */ lw $v0, 0x28($v0) -/* 9FB048 80240858 A600008E */ sh $zero, 0x8e($s0) -/* 9FB04C 8024085C AE020028 */ sw $v0, 0x28($s0) -/* 9FB050 80240860 2402000F */ addiu $v0, $zero, 0xf -/* 9FB054 80240864 AE620070 */ sw $v0, 0x70($s3) -.L80240868: -/* 9FB058 80240868 8FBF0040 */ lw $ra, 0x40($sp) -/* 9FB05C 8024086C 8FB3003C */ lw $s3, 0x3c($sp) -/* 9FB060 80240870 8FB20038 */ lw $s2, 0x38($sp) -/* 9FB064 80240874 8FB10034 */ lw $s1, 0x34($sp) -/* 9FB068 80240878 8FB00030 */ lw $s0, 0x30($sp) -/* 9FB06C 8024087C 03E00008 */ jr $ra -/* 9FB070 80240880 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_12/func_80240904_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/func_80240904_9FA7F0.s deleted file mode 100644 index 22780146ff..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/func_80240904_9FA7F0.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240904_9FB0F4 -/* 9FB0F4 80240904 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9FB0F8 80240908 AFB3005C */ sw $s3, 0x5c($sp) -/* 9FB0FC 8024090C 0080982D */ daddu $s3, $a0, $zero -/* 9FB100 80240910 AFBF0068 */ sw $ra, 0x68($sp) -/* 9FB104 80240914 AFB50064 */ sw $s5, 0x64($sp) -/* 9FB108 80240918 AFB40060 */ sw $s4, 0x60($sp) -/* 9FB10C 8024091C AFB20058 */ sw $s2, 0x58($sp) -/* 9FB110 80240920 AFB10054 */ sw $s1, 0x54($sp) -/* 9FB114 80240924 AFB00050 */ sw $s0, 0x50($sp) -/* 9FB118 80240928 8E710148 */ lw $s1, 0x148($s3) -/* 9FB11C 8024092C 86240008 */ lh $a0, 8($s1) -/* 9FB120 80240930 0C00EABB */ jal get_npc_unsafe -/* 9FB124 80240934 00A0802D */ daddu $s0, $a1, $zero -/* 9FB128 80240938 8E63000C */ lw $v1, 0xc($s3) -/* 9FB12C 8024093C 0260202D */ daddu $a0, $s3, $zero -/* 9FB130 80240940 8C650000 */ lw $a1, ($v1) -/* 9FB134 80240944 0C0B1EAF */ jal get_variable -/* 9FB138 80240948 0040902D */ daddu $s2, $v0, $zero -/* 9FB13C 8024094C AFA00028 */ sw $zero, 0x28($sp) -/* 9FB140 80240950 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FB144 80240954 8C630030 */ lw $v1, 0x30($v1) -/* 9FB148 80240958 AFA3002C */ sw $v1, 0x2c($sp) -/* 9FB14C 8024095C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FB150 80240960 8C63001C */ lw $v1, 0x1c($v1) -/* 9FB154 80240964 AFA30030 */ sw $v1, 0x30($sp) -/* 9FB158 80240968 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FB15C 8024096C 8C630024 */ lw $v1, 0x24($v1) -/* 9FB160 80240970 AFA30034 */ sw $v1, 0x34($sp) -/* 9FB164 80240974 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FB168 80240978 8C630028 */ lw $v1, 0x28($v1) -/* 9FB16C 8024097C 27B50028 */ addiu $s5, $sp, 0x28 -/* 9FB170 80240980 AFA30038 */ sw $v1, 0x38($sp) -/* 9FB174 80240984 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FB178 80240988 3C0142C8 */ lui $at, 0x42c8 -/* 9FB17C 8024098C 44810000 */ mtc1 $at, $f0 -/* 9FB180 80240990 8C63002C */ lw $v1, 0x2c($v1) -/* 9FB184 80240994 0040A02D */ daddu $s4, $v0, $zero -/* 9FB188 80240998 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9FB18C 8024099C A7A00044 */ sh $zero, 0x44($sp) -/* 9FB190 802409A0 12000009 */ beqz $s0, .L802409C8 -/* 9FB194 802409A4 AFA3003C */ sw $v1, 0x3c($sp) -/* 9FB198 802409A8 864300A8 */ lh $v1, 0xa8($s2) -/* 9FB19C 802409AC 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FB1A0 802409B0 AE20008C */ sw $zero, 0x8c($s1) -/* 9FB1A4 802409B4 A22000B5 */ sb $zero, 0xb5($s1) -/* 9FB1A8 802409B8 34420008 */ ori $v0, $v0, 8 -/* 9FB1AC 802409BC AE230084 */ sw $v1, 0x84($s1) -/* 9FB1B0 802409C0 08090276 */ j .L802409D8 -/* 9FB1B4 802409C4 AE2200B0 */ sw $v0, 0xb0($s1) -.L802409C8: -/* 9FB1B8 802409C8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FB1BC 802409CC 30420004 */ andi $v0, $v0, 4 -/* 9FB1C0 802409D0 10400047 */ beqz $v0, .L80240AF0 -/* 9FB1C4 802409D4 00000000 */ nop -.L802409D8: -/* 9FB1C8 802409D8 AE600070 */ sw $zero, 0x70($s3) -/* 9FB1CC 802409DC A640008E */ sh $zero, 0x8e($s2) -/* 9FB1D0 802409E0 8E2300CC */ lw $v1, 0xcc($s1) -/* 9FB1D4 802409E4 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9FB1D8 802409E8 A2200007 */ sb $zero, 7($s1) -/* 9FB1DC 802409EC 8E420000 */ lw $v0, ($s2) -/* 9FB1E0 802409F0 8C630000 */ lw $v1, ($v1) -/* 9FB1E4 802409F4 00441024 */ and $v0, $v0, $a0 -/* 9FB1E8 802409F8 AE420000 */ sw $v0, ($s2) -/* 9FB1EC 802409FC AE430028 */ sw $v1, 0x28($s2) -/* 9FB1F0 80240A00 96220086 */ lhu $v0, 0x86($s1) -/* 9FB1F4 80240A04 A64200A8 */ sh $v0, 0xa8($s2) -/* 9FB1F8 80240A08 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9FB1FC 80240A0C AE200090 */ sw $zero, 0x90($s1) -/* 9FB200 80240A10 8C420034 */ lw $v0, 0x34($v0) -/* 9FB204 80240A14 14400006 */ bnez $v0, .L80240A30 -/* 9FB208 80240A18 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9FB20C 80240A1C 8E420000 */ lw $v0, ($s2) -/* 9FB210 80240A20 2403FFF7 */ addiu $v1, $zero, -9 -/* 9FB214 80240A24 34420200 */ ori $v0, $v0, 0x200 -/* 9FB218 80240A28 0809028F */ j .L80240A3C -/* 9FB21C 80240A2C 00431024 */ and $v0, $v0, $v1 -.L80240A30: -/* 9FB220 80240A30 8E420000 */ lw $v0, ($s2) -/* 9FB224 80240A34 00431024 */ and $v0, $v0, $v1 -/* 9FB228 80240A38 34420008 */ ori $v0, $v0, 8 -.L80240A3C: -/* 9FB22C 80240A3C AE420000 */ sw $v0, ($s2) -/* 9FB230 80240A40 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FB234 80240A44 30420004 */ andi $v0, $v0, 4 -/* 9FB238 80240A48 1040001E */ beqz $v0, .L80240AC4 -/* 9FB23C 80240A4C 24040002 */ addiu $a0, $zero, 2 -/* 9FB240 80240A50 0240282D */ daddu $a1, $s2, $zero -/* 9FB244 80240A54 0000302D */ daddu $a2, $zero, $zero -/* 9FB248 80240A58 24020063 */ addiu $v0, $zero, 0x63 -/* 9FB24C 80240A5C AE620070 */ sw $v0, 0x70($s3) -/* 9FB250 80240A60 AE600074 */ sw $zero, 0x74($s3) -/* 9FB254 80240A64 864300A8 */ lh $v1, 0xa8($s2) -/* 9FB258 80240A68 3C013F80 */ lui $at, 0x3f80 -/* 9FB25C 80240A6C 44810000 */ mtc1 $at, $f0 -/* 9FB260 80240A70 3C014000 */ lui $at, 0x4000 -/* 9FB264 80240A74 44811000 */ mtc1 $at, $f2 -/* 9FB268 80240A78 3C01C1A0 */ lui $at, 0xc1a0 -/* 9FB26C 80240A7C 44812000 */ mtc1 $at, $f4 -/* 9FB270 80240A80 24020028 */ addiu $v0, $zero, 0x28 -/* 9FB274 80240A84 AFA2001C */ sw $v0, 0x1c($sp) -/* 9FB278 80240A88 44833000 */ mtc1 $v1, $f6 -/* 9FB27C 80240A8C 00000000 */ nop -/* 9FB280 80240A90 468031A0 */ cvt.s.w $f6, $f6 -/* 9FB284 80240A94 44073000 */ mfc1 $a3, $f6 -/* 9FB288 80240A98 27A20048 */ addiu $v0, $sp, 0x48 -/* 9FB28C 80240A9C AFA20020 */ sw $v0, 0x20($sp) -/* 9FB290 80240AA0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9FB294 80240AA4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9FB298 80240AA8 0C01BFA4 */ jal fx_emote -/* 9FB29C 80240AAC E7A40018 */ swc1 $f4, 0x18($sp) -/* 9FB2A0 80240AB0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FB2A4 80240AB4 2403FFFB */ addiu $v1, $zero, -5 -/* 9FB2A8 80240AB8 00431024 */ and $v0, $v0, $v1 -/* 9FB2AC 80240ABC 080902BC */ j .L80240AF0 -/* 9FB2B0 80240AC0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240AC4: -/* 9FB2B4 80240AC4 8E220000 */ lw $v0, ($s1) -/* 9FB2B8 80240AC8 3C034000 */ lui $v1, 0x4000 -/* 9FB2BC 80240ACC 00431024 */ and $v0, $v0, $v1 -/* 9FB2C0 80240AD0 10400007 */ beqz $v0, .L80240AF0 -/* 9FB2C4 80240AD4 3C03BFFF */ lui $v1, 0xbfff -/* 9FB2C8 80240AD8 2402000C */ addiu $v0, $zero, 0xc -/* 9FB2CC 80240ADC AE620070 */ sw $v0, 0x70($s3) -/* 9FB2D0 80240AE0 8E220000 */ lw $v0, ($s1) -/* 9FB2D4 80240AE4 3463FFFF */ ori $v1, $v1, 0xffff -/* 9FB2D8 80240AE8 00431024 */ and $v0, $v0, $v1 -/* 9FB2DC 80240AEC AE220000 */ sw $v0, ($s1) -.L80240AF0: -/* 9FB2E0 80240AF0 8E220090 */ lw $v0, 0x90($s1) -/* 9FB2E4 80240AF4 1840000C */ blez $v0, .L80240B28 -/* 9FB2E8 80240AF8 2442FFFF */ addiu $v0, $v0, -1 -/* 9FB2EC 80240AFC 14400087 */ bnez $v0, .L80240D1C -/* 9FB2F0 80240B00 AE220090 */ sw $v0, 0x90($s1) -/* 9FB2F4 80240B04 3C03FFAA */ lui $v1, 0xffaa -/* 9FB2F8 80240B08 8E420028 */ lw $v0, 0x28($s2) -/* 9FB2FC 80240B0C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 9FB300 80240B10 00431021 */ addu $v0, $v0, $v1 -/* 9FB304 80240B14 2C420002 */ sltiu $v0, $v0, 2 -/* 9FB308 80240B18 10400003 */ beqz $v0, .L80240B28 -/* 9FB30C 80240B1C 3C020055 */ lui $v0, 0x55 -/* 9FB310 80240B20 3442000C */ ori $v0, $v0, 0xc -/* 9FB314 80240B24 AE420028 */ sw $v0, 0x28($s2) -.L80240B28: -/* 9FB318 80240B28 8E630070 */ lw $v1, 0x70($s3) -/* 9FB31C 80240B2C 2402000C */ addiu $v0, $zero, 0xc -/* 9FB320 80240B30 10620048 */ beq $v1, $v0, .L80240C54 -/* 9FB324 80240B34 2862000D */ slti $v0, $v1, 0xd -/* 9FB328 80240B38 1040000F */ beqz $v0, .L80240B78 -/* 9FB32C 80240B3C 24100001 */ addiu $s0, $zero, 1 -/* 9FB330 80240B40 1070001E */ beq $v1, $s0, .L80240BBC -/* 9FB334 80240B44 28620002 */ slti $v0, $v1, 2 -/* 9FB338 80240B48 10400005 */ beqz $v0, .L80240B60 -/* 9FB33C 80240B4C 24020002 */ addiu $v0, $zero, 2 -/* 9FB340 80240B50 10600015 */ beqz $v1, .L80240BA8 -/* 9FB344 80240B54 0260202D */ daddu $a0, $s3, $zero -/* 9FB348 80240B58 0809032C */ j .L80240CB0 -/* 9FB34C 80240B5C 00000000 */ nop -.L80240B60: -/* 9FB350 80240B60 1062001C */ beq $v1, $v0, .L80240BD4 -/* 9FB354 80240B64 24020003 */ addiu $v0, $zero, 3 -/* 9FB358 80240B68 10620035 */ beq $v1, $v0, .L80240C40 -/* 9FB35C 80240B6C 0260202D */ daddu $a0, $s3, $zero -/* 9FB360 80240B70 0809032C */ j .L80240CB0 -/* 9FB364 80240B74 00000000 */ nop -.L80240B78: -/* 9FB368 80240B78 2402000E */ addiu $v0, $zero, 0xe -/* 9FB36C 80240B7C 1062003F */ beq $v1, $v0, .L80240C7C -/* 9FB370 80240B80 0062102A */ slt $v0, $v1, $v0 -/* 9FB374 80240B84 14400038 */ bnez $v0, .L80240C68 -/* 9FB378 80240B88 0260202D */ daddu $a0, $s3, $zero -/* 9FB37C 80240B8C 2402000F */ addiu $v0, $zero, 0xf -/* 9FB380 80240B90 10620040 */ beq $v1, $v0, .L80240C94 -/* 9FB384 80240B94 24020063 */ addiu $v0, $zero, 0x63 -/* 9FB388 80240B98 10620043 */ beq $v1, $v0, .L80240CA8 -/* 9FB38C 80240B9C 00000000 */ nop -/* 9FB390 80240BA0 0809032C */ j .L80240CB0 -/* 9FB394 80240BA4 00000000 */ nop -.L80240BA8: -/* 9FB398 80240BA8 0280282D */ daddu $a1, $s4, $zero -/* 9FB39C 80240BAC 0C012568 */ jal func_800495A0 -/* 9FB3A0 80240BB0 02A0302D */ daddu $a2, $s5, $zero -/* 9FB3A4 80240BB4 96220086 */ lhu $v0, 0x86($s1) -/* 9FB3A8 80240BB8 A64200A8 */ sh $v0, 0xa8($s2) -.L80240BBC: -/* 9FB3AC 80240BBC 0260202D */ daddu $a0, $s3, $zero -/* 9FB3B0 80240BC0 0280282D */ daddu $a1, $s4, $zero -/* 9FB3B4 80240BC4 0C0125AE */ jal func_800496B8 -/* 9FB3B8 80240BC8 02A0302D */ daddu $a2, $s5, $zero -/* 9FB3BC 80240BCC 0809032C */ j .L80240CB0 -/* 9FB3C0 80240BD0 00000000 */ nop -.L80240BD4: -/* 9FB3C4 80240BD4 0260202D */ daddu $a0, $s3, $zero -/* 9FB3C8 80240BD8 0280282D */ daddu $a1, $s4, $zero -/* 9FB3CC 80240BDC 0C0126D1 */ jal func_80049B44 -/* 9FB3D0 80240BE0 02A0302D */ daddu $a2, $s5, $zero -/* 9FB3D4 80240BE4 8E230088 */ lw $v1, 0x88($s1) -/* 9FB3D8 80240BE8 24020006 */ addiu $v0, $zero, 6 -/* 9FB3DC 80240BEC 14620014 */ bne $v1, $v0, .L80240C40 -/* 9FB3E0 80240BF0 0260202D */ daddu $a0, $s3, $zero -/* 9FB3E4 80240BF4 0C00A67F */ jal rand_int -/* 9FB3E8 80240BF8 24040064 */ addiu $a0, $zero, 0x64 -/* 9FB3EC 80240BFC 28420021 */ slti $v0, $v0, 0x21 -/* 9FB3F0 80240C00 5040000F */ beql $v0, $zero, .L80240C40 -/* 9FB3F4 80240C04 0260202D */ daddu $a0, $s3, $zero -/* 9FB3F8 80240C08 8E22008C */ lw $v0, 0x8c($s1) -/* 9FB3FC 80240C0C 10400005 */ beqz $v0, .L80240C24 -/* 9FB400 80240C10 3C020055 */ lui $v0, 0x55 -/* 9FB404 80240C14 3442002F */ ori $v0, $v0, 0x2f -/* 9FB408 80240C18 AE20008C */ sw $zero, 0x8c($s1) -/* 9FB40C 80240C1C 0809030C */ j .L80240C30 -/* 9FB410 80240C20 A22000B5 */ sb $zero, 0xb5($s1) -.L80240C24: -/* 9FB414 80240C24 3442002E */ ori $v0, $v0, 0x2e -/* 9FB418 80240C28 AE30008C */ sw $s0, 0x8c($s1) -/* 9FB41C 80240C2C A23000B5 */ sb $s0, 0xb5($s1) -.L80240C30: -/* 9FB420 80240C30 AE420028 */ sw $v0, 0x28($s2) -/* 9FB424 80240C34 24020007 */ addiu $v0, $zero, 7 -/* 9FB428 80240C38 08090347 */ j .L80240D1C -/* 9FB42C 80240C3C AE220090 */ sw $v0, 0x90($s1) -.L80240C40: -/* 9FB430 80240C40 0280282D */ daddu $a1, $s4, $zero -/* 9FB434 80240C44 0C012701 */ jal func_80049C04 -/* 9FB438 80240C48 02A0302D */ daddu $a2, $s5, $zero -/* 9FB43C 80240C4C 0809032C */ j .L80240CB0 -/* 9FB440 80240C50 00000000 */ nop -.L80240C54: -/* 9FB444 80240C54 0260202D */ daddu $a0, $s3, $zero -/* 9FB448 80240C58 0280282D */ daddu $a1, $s4, $zero -/* 9FB44C 80240C5C 0C09015C */ jal func_80240570 -/* 9FB450 80240C60 02A0302D */ daddu $a2, $s5, $zero -/* 9FB454 80240C64 0260202D */ daddu $a0, $s3, $zero -.L80240C68: -/* 9FB458 80240C68 0280282D */ daddu $a1, $s4, $zero -/* 9FB45C 80240C6C 0C09017B */ jal func_802405EC -/* 9FB460 80240C70 02A0302D */ daddu $a2, $s5, $zero -/* 9FB464 80240C74 0809032C */ j .L80240CB0 -/* 9FB468 80240C78 00000000 */ nop -.L80240C7C: -/* 9FB46C 80240C7C 0260202D */ daddu $a0, $s3, $zero -/* 9FB470 80240C80 0280282D */ daddu $a1, $s4, $zero -/* 9FB474 80240C84 0C0901C8 */ jal func_80240720 -/* 9FB478 80240C88 02A0302D */ daddu $a2, $s5, $zero -/* 9FB47C 80240C8C 0809032C */ j .L80240CB0 -/* 9FB480 80240C90 00000000 */ nop -.L80240C94: -/* 9FB484 80240C94 0280282D */ daddu $a1, $s4, $zero -/* 9FB488 80240C98 0C090221 */ jal func_80240884 -/* 9FB48C 80240C9C 02A0302D */ daddu $a2, $s5, $zero -/* 9FB490 80240CA0 0809032C */ j .L80240CB0 -/* 9FB494 80240CA4 00000000 */ nop -.L80240CA8: -/* 9FB498 80240CA8 0C0129CF */ jal func_8004A73C -/* 9FB49C 80240CAC 0260202D */ daddu $a0, $s3, $zero -.L80240CB0: -/* 9FB4A0 80240CB0 8E230088 */ lw $v1, 0x88($s1) -/* 9FB4A4 80240CB4 24020006 */ addiu $v0, $zero, 6 -/* 9FB4A8 80240CB8 14620019 */ bne $v1, $v0, .L80240D20 -/* 9FB4AC 80240CBC 0000102D */ daddu $v0, $zero, $zero -/* 9FB4B0 80240CC0 8E22008C */ lw $v0, 0x8c($s1) -/* 9FB4B4 80240CC4 10400003 */ beqz $v0, .L80240CD4 -/* 9FB4B8 80240CC8 24020001 */ addiu $v0, $zero, 1 -/* 9FB4BC 80240CCC 08090336 */ j .L80240CD8 -/* 9FB4C0 80240CD0 A22200B5 */ sb $v0, 0xb5($s1) -.L80240CD4: -/* 9FB4C4 80240CD4 A22000B5 */ sb $zero, 0xb5($s1) -.L80240CD8: -/* 9FB4C8 80240CD8 8E22008C */ lw $v0, 0x8c($s1) -/* 9FB4CC 80240CDC 1040000F */ beqz $v0, .L80240D1C -/* 9FB4D0 80240CE0 3C03FFAA */ lui $v1, 0xffaa -/* 9FB4D4 80240CE4 8E420028 */ lw $v0, 0x28($s2) -/* 9FB4D8 80240CE8 3463FFFC */ ori $v1, $v1, 0xfffc -/* 9FB4DC 80240CEC 00431821 */ addu $v1, $v0, $v1 -/* 9FB4E0 80240CF0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9FB4E4 80240CF4 10400009 */ beqz $v0, .L80240D1C -/* 9FB4E8 80240CF8 00031080 */ sll $v0, $v1, 2 -/* 9FB4EC 80240CFC 3C018024 */ lui $at, 0x8024 -/* 9FB4F0 80240D00 00220821 */ addu $at, $at, $v0 -/* 9FB4F4 80240D04 8C225A78 */ lw $v0, 0x5a78($at) -/* 9FB4F8 80240D08 00400008 */ jr $v0 -/* 9FB4FC 80240D0C 00000000 */ nop -/* 9FB500 80240D10 8E420028 */ lw $v0, 0x28($s2) -/* 9FB504 80240D14 24420001 */ addiu $v0, $v0, 1 -/* 9FB508 80240D18 AE420028 */ sw $v0, 0x28($s2) -.L80240D1C: -/* 9FB50C 80240D1C 0000102D */ daddu $v0, $zero, $zero -.L80240D20: -/* 9FB510 80240D20 8FBF0068 */ lw $ra, 0x68($sp) -/* 9FB514 80240D24 8FB50064 */ lw $s5, 0x64($sp) -/* 9FB518 80240D28 8FB40060 */ lw $s4, 0x60($sp) -/* 9FB51C 80240D2C 8FB3005C */ lw $s3, 0x5c($sp) -/* 9FB520 80240D30 8FB20058 */ lw $s2, 0x58($sp) -/* 9FB524 80240D34 8FB10054 */ lw $s1, 0x54($sp) -/* 9FB528 80240D38 8FB00050 */ lw $s0, 0x50($sp) -/* 9FB52C 80240D3C 03E00008 */ jr $ra -/* 9FB530 80240D40 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_nok/nok_12/func_80240D44_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/func_80240D44_9FA7F0.s deleted file mode 100644 index fd246699b8..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/func_80240D44_9FA7F0.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D44_9FB534 -/* 9FB534 80240D44 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9FB538 80240D48 AFB50024 */ sw $s5, 0x24($sp) -/* 9FB53C 80240D4C 0080A82D */ daddu $s5, $a0, $zero -/* 9FB540 80240D50 AFBF002C */ sw $ra, 0x2c($sp) -/* 9FB544 80240D54 AFB60028 */ sw $s6, 0x28($sp) -/* 9FB548 80240D58 AFB40020 */ sw $s4, 0x20($sp) -/* 9FB54C 80240D5C AFB3001C */ sw $s3, 0x1c($sp) -/* 9FB550 80240D60 AFB20018 */ sw $s2, 0x18($sp) -/* 9FB554 80240D64 AFB10014 */ sw $s1, 0x14($sp) -/* 9FB558 80240D68 AFB00010 */ sw $s0, 0x10($sp) -/* 9FB55C 80240D6C F7B80040 */ sdc1 $f24, 0x40($sp) -/* 9FB560 80240D70 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 9FB564 80240D74 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9FB568 80240D78 8EB30148 */ lw $s3, 0x148($s5) -/* 9FB56C 80240D7C 86640008 */ lh $a0, 8($s3) -/* 9FB570 80240D80 0C00EABB */ jal get_npc_unsafe -/* 9FB574 80240D84 00A0B02D */ daddu $s6, $a1, $zero -/* 9FB578 80240D88 0040A02D */ daddu $s4, $v0, $zero -/* 9FB57C 80240D8C AEA00074 */ sw $zero, 0x74($s5) -/* 9FB580 80240D90 C6980038 */ lwc1 $f24, 0x38($s4) -/* 9FB584 80240D94 C6960040 */ lwc1 $f22, 0x40($s4) -/* 9FB588 80240D98 0000902D */ daddu $s2, $zero, $zero -/* 9FB58C 80240D9C AEA00078 */ sw $zero, 0x78($s5) -/* 9FB590 80240DA0 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9FB594 80240DA4 8C620000 */ lw $v0, ($v1) -/* 9FB598 80240DA8 3C0146FF */ lui $at, 0x46ff -/* 9FB59C 80240DAC 3421FE00 */ ori $at, $at, 0xfe00 -/* 9FB5A0 80240DB0 4481A000 */ mtc1 $at, $f20 -/* 9FB5A4 80240DB4 18400018 */ blez $v0, .L80240E18 -/* 9FB5A8 80240DB8 0240802D */ daddu $s0, $s2, $zero -/* 9FB5AC 80240DBC 0240882D */ daddu $s1, $s2, $zero -.L80240DC0: -/* 9FB5B0 80240DC0 02231021 */ addu $v0, $s1, $v1 -/* 9FB5B4 80240DC4 4600C306 */ mov.s $f12, $f24 -/* 9FB5B8 80240DC8 C4440004 */ lwc1 $f4, 4($v0) -/* 9FB5BC 80240DCC 46802120 */ cvt.s.w $f4, $f4 -/* 9FB5C0 80240DD0 44062000 */ mfc1 $a2, $f4 -/* 9FB5C4 80240DD4 C444000C */ lwc1 $f4, 0xc($v0) -/* 9FB5C8 80240DD8 46802120 */ cvt.s.w $f4, $f4 -/* 9FB5CC 80240DDC 44072000 */ mfc1 $a3, $f4 -/* 9FB5D0 80240DE0 0C00A7B5 */ jal dist2D -/* 9FB5D4 80240DE4 4600B386 */ mov.s $f14, $f22 -/* 9FB5D8 80240DE8 4614003C */ c.lt.s $f0, $f20 -/* 9FB5DC 80240DEC 00000000 */ nop -/* 9FB5E0 80240DF0 45000003 */ bc1f .L80240E00 -/* 9FB5E4 80240DF4 2631000C */ addiu $s1, $s1, 0xc -/* 9FB5E8 80240DF8 46000506 */ mov.s $f20, $f0 -/* 9FB5EC 80240DFC AEB20078 */ sw $s2, 0x78($s5) -.L80240E00: -/* 9FB5F0 80240E00 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9FB5F4 80240E04 26100001 */ addiu $s0, $s0, 1 -/* 9FB5F8 80240E08 8C620000 */ lw $v0, ($v1) -/* 9FB5FC 80240E0C 0202102A */ slt $v0, $s0, $v0 -/* 9FB600 80240E10 1440FFEB */ bnez $v0, .L80240DC0 -/* 9FB604 80240E14 26520001 */ addiu $s2, $s2, 1 -.L80240E18: -/* 9FB608 80240E18 8E6200CC */ lw $v0, 0xcc($s3) -/* 9FB60C 80240E1C 8C420004 */ lw $v0, 4($v0) -/* 9FB610 80240E20 AE820028 */ sw $v0, 0x28($s4) -/* 9FB614 80240E24 8E6200D0 */ lw $v0, 0xd0($s3) -/* 9FB618 80240E28 8C42007C */ lw $v0, 0x7c($v0) -/* 9FB61C 80240E2C 04410004 */ bgez $v0, .L80240E40 -/* 9FB620 80240E30 00000000 */ nop -/* 9FB624 80240E34 C6C00000 */ lwc1 $f0, ($s6) -/* 9FB628 80240E38 08090398 */ j .L80240E60 -/* 9FB62C 80240E3C E6800018 */ swc1 $f0, 0x18($s4) -.L80240E40: -/* 9FB630 80240E40 3C018024 */ lui $at, 0x8024 -/* 9FB634 80240E44 D4225AD0 */ ldc1 $f2, 0x5ad0($at) -/* 9FB638 80240E48 44820000 */ mtc1 $v0, $f0 -/* 9FB63C 80240E4C 00000000 */ nop -/* 9FB640 80240E50 46800021 */ cvt.d.w $f0, $f0 -/* 9FB644 80240E54 46220003 */ div.d $f0, $f0, $f2 -/* 9FB648 80240E58 46200020 */ cvt.s.d $f0, $f0 -/* 9FB64C 80240E5C E6800018 */ swc1 $f0, 0x18($s4) -.L80240E60: -/* 9FB650 80240E60 24020001 */ addiu $v0, $zero, 1 -/* 9FB654 80240E64 AEA20070 */ sw $v0, 0x70($s5) -/* 9FB658 80240E68 8FBF002C */ lw $ra, 0x2c($sp) -/* 9FB65C 80240E6C 8FB60028 */ lw $s6, 0x28($sp) -/* 9FB660 80240E70 8FB50024 */ lw $s5, 0x24($sp) -/* 9FB664 80240E74 8FB40020 */ lw $s4, 0x20($sp) -/* 9FB668 80240E78 8FB3001C */ lw $s3, 0x1c($sp) -/* 9FB66C 80240E7C 8FB20018 */ lw $s2, 0x18($sp) -/* 9FB670 80240E80 8FB10014 */ lw $s1, 0x14($sp) -/* 9FB674 80240E84 8FB00010 */ lw $s0, 0x10($sp) -/* 9FB678 80240E88 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 9FB67C 80240E8C D7B60038 */ ldc1 $f22, 0x38($sp) -/* 9FB680 80240E90 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9FB684 80240E94 03E00008 */ jr $ra -/* 9FB688 80240E98 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_12/func_80240E9C_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/func_80240E9C_9FA7F0.s deleted file mode 100644 index d0e0eb9ded..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/func_80240E9C_9FA7F0.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E9C_9FB68C -/* 9FB68C 80240E9C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 9FB690 80240EA0 AFB20038 */ sw $s2, 0x38($sp) -/* 9FB694 80240EA4 0080902D */ daddu $s2, $a0, $zero -/* 9FB698 80240EA8 AFBF0044 */ sw $ra, 0x44($sp) -/* 9FB69C 80240EAC AFB40040 */ sw $s4, 0x40($sp) -/* 9FB6A0 80240EB0 AFB3003C */ sw $s3, 0x3c($sp) -/* 9FB6A4 80240EB4 AFB10034 */ sw $s1, 0x34($sp) -/* 9FB6A8 80240EB8 AFB00030 */ sw $s0, 0x30($sp) -/* 9FB6AC 80240EBC F7B60050 */ sdc1 $f22, 0x50($sp) -/* 9FB6B0 80240EC0 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 9FB6B4 80240EC4 8E510148 */ lw $s1, 0x148($s2) -/* 9FB6B8 80240EC8 00A0982D */ daddu $s3, $a1, $zero -/* 9FB6BC 80240ECC 86240008 */ lh $a0, 8($s1) -/* 9FB6C0 80240ED0 0C00EABB */ jal get_npc_unsafe -/* 9FB6C4 80240ED4 00C0A02D */ daddu $s4, $a2, $zero -/* 9FB6C8 80240ED8 8E630014 */ lw $v1, 0x14($s3) -/* 9FB6CC 80240EDC 04600030 */ bltz $v1, .L80240FA0 -/* 9FB6D0 80240EE0 0040802D */ daddu $s0, $v0, $zero -/* 9FB6D4 80240EE4 8E420074 */ lw $v0, 0x74($s2) -/* 9FB6D8 80240EE8 1C40002C */ bgtz $v0, .L80240F9C -/* 9FB6DC 80240EEC 2442FFFF */ addiu $v0, $v0, -1 -/* 9FB6E0 80240EF0 0280202D */ daddu $a0, $s4, $zero -/* 9FB6E4 80240EF4 AE430074 */ sw $v1, 0x74($s2) -/* 9FB6E8 80240EF8 AFA00010 */ sw $zero, 0x10($sp) -/* 9FB6EC 80240EFC 8E66000C */ lw $a2, 0xc($s3) -/* 9FB6F0 80240F00 8E670010 */ lw $a3, 0x10($s3) -/* 9FB6F4 80240F04 0C01242D */ jal func_800490B4 -/* 9FB6F8 80240F08 0220282D */ daddu $a1, $s1, $zero -/* 9FB6FC 80240F0C 10400021 */ beqz $v0, .L80240F94 -/* 9FB700 80240F10 0000202D */ daddu $a0, $zero, $zero -/* 9FB704 80240F14 0200282D */ daddu $a1, $s0, $zero -/* 9FB708 80240F18 0000302D */ daddu $a2, $zero, $zero -/* 9FB70C 80240F1C 860300A8 */ lh $v1, 0xa8($s0) -/* 9FB710 80240F20 3C013F80 */ lui $at, 0x3f80 -/* 9FB714 80240F24 44810000 */ mtc1 $at, $f0 -/* 9FB718 80240F28 3C014000 */ lui $at, 0x4000 -/* 9FB71C 80240F2C 44811000 */ mtc1 $at, $f2 -/* 9FB720 80240F30 3C01C1A0 */ lui $at, 0xc1a0 -/* 9FB724 80240F34 44812000 */ mtc1 $at, $f4 -/* 9FB728 80240F38 2402000F */ addiu $v0, $zero, 0xf -/* 9FB72C 80240F3C AFA2001C */ sw $v0, 0x1c($sp) -/* 9FB730 80240F40 44833000 */ mtc1 $v1, $f6 -/* 9FB734 80240F44 00000000 */ nop -/* 9FB738 80240F48 468031A0 */ cvt.s.w $f6, $f6 -/* 9FB73C 80240F4C 44073000 */ mfc1 $a3, $f6 -/* 9FB740 80240F50 27A20028 */ addiu $v0, $sp, 0x28 -/* 9FB744 80240F54 AFA20020 */ sw $v0, 0x20($sp) -/* 9FB748 80240F58 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9FB74C 80240F5C E7A20014 */ swc1 $f2, 0x14($sp) -/* 9FB750 80240F60 0C01BFA4 */ jal fx_emote -/* 9FB754 80240F64 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9FB758 80240F68 0200202D */ daddu $a0, $s0, $zero -/* 9FB75C 80240F6C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9FB760 80240F70 0C012530 */ jal func_800494C0 -/* 9FB764 80240F74 3C060020 */ lui $a2, 0x20 -/* 9FB768 80240F78 8E220018 */ lw $v0, 0x18($s1) -/* 9FB76C 80240F7C 9442002A */ lhu $v0, 0x2a($v0) -/* 9FB770 80240F80 30420001 */ andi $v0, $v0, 1 -/* 9FB774 80240F84 14400064 */ bnez $v0, .L80241118 -/* 9FB778 80240F88 2402000A */ addiu $v0, $zero, 0xa -/* 9FB77C 80240F8C 08090446 */ j .L80241118 -/* 9FB780 80240F90 2402000C */ addiu $v0, $zero, 0xc -.L80240F94: -/* 9FB784 80240F94 8E420074 */ lw $v0, 0x74($s2) -/* 9FB788 80240F98 2442FFFF */ addiu $v0, $v0, -1 -.L80240F9C: -/* 9FB78C 80240F9C AE420074 */ sw $v0, 0x74($s2) -.L80240FA0: -/* 9FB790 80240FA0 8602008C */ lh $v0, 0x8c($s0) -/* 9FB794 80240FA4 1440005D */ bnez $v0, .L8024111C -/* 9FB798 80240FA8 00000000 */ nop -/* 9FB79C 80240FAC C6000018 */ lwc1 $f0, 0x18($s0) -/* 9FB7A0 80240FB0 3C014010 */ lui $at, 0x4010 -/* 9FB7A4 80240FB4 44811800 */ mtc1 $at, $f3 -/* 9FB7A8 80240FB8 44801000 */ mtc1 $zero, $f2 -/* 9FB7AC 80240FBC 46000021 */ cvt.d.s $f0, $f0 -/* 9FB7B0 80240FC0 4622003C */ c.lt.d $f0, $f2 -/* 9FB7B4 80240FC4 00000000 */ nop -/* 9FB7B8 80240FC8 45000003 */ bc1f .L80240FD8 -/* 9FB7BC 80240FCC 0200202D */ daddu $a0, $s0, $zero -/* 9FB7C0 80240FD0 080903F7 */ j .L80240FDC -/* 9FB7C4 80240FD4 0000282D */ daddu $a1, $zero, $zero -.L80240FD8: -/* 9FB7C8 80240FD8 24050001 */ addiu $a1, $zero, 1 -.L80240FDC: -/* 9FB7CC 80240FDC 0C00F598 */ jal func_8003D660 -/* 9FB7D0 80240FE0 00000000 */ nop -/* 9FB7D4 80240FE4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9FB7D8 80240FE8 8E430078 */ lw $v1, 0x78($s2) -/* 9FB7DC 80240FEC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9FB7E0 80240FF0 00031040 */ sll $v0, $v1, 1 -/* 9FB7E4 80240FF4 00431021 */ addu $v0, $v0, $v1 -/* 9FB7E8 80240FF8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FB7EC 80240FFC 00021080 */ sll $v0, $v0, 2 -/* 9FB7F0 80241000 00431021 */ addu $v0, $v0, $v1 -/* 9FB7F4 80241004 C4560004 */ lwc1 $f22, 4($v0) -/* 9FB7F8 80241008 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9FB7FC 8024100C C454000C */ lwc1 $f20, 0xc($v0) -/* 9FB800 80241010 4680A520 */ cvt.s.w $f20, $f20 -/* 9FB804 80241014 4406B000 */ mfc1 $a2, $f22 -/* 9FB808 80241018 4407A000 */ mfc1 $a3, $f20 -/* 9FB80C 8024101C 0C00A720 */ jal atan2 -/* 9FB810 80241020 00000000 */ nop -/* 9FB814 80241024 8E050018 */ lw $a1, 0x18($s0) -/* 9FB818 80241028 44060000 */ mfc1 $a2, $f0 -/* 9FB81C 8024102C 0200202D */ daddu $a0, $s0, $zero -/* 9FB820 80241030 0C00EA95 */ jal npc_move_heading -/* 9FB824 80241034 AE06000C */ sw $a2, 0xc($s0) -/* 9FB828 80241038 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9FB82C 8024103C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9FB830 80241040 4406B000 */ mfc1 $a2, $f22 -/* 9FB834 80241044 4407A000 */ mfc1 $a3, $f20 -/* 9FB838 80241048 0C00A7B5 */ jal dist2D -/* 9FB83C 8024104C 00000000 */ nop -/* 9FB840 80241050 C6020018 */ lwc1 $f2, 0x18($s0) -/* 9FB844 80241054 4602003E */ c.le.s $f0, $f2 -/* 9FB848 80241058 00000000 */ nop -/* 9FB84C 8024105C 4500002F */ bc1f .L8024111C -/* 9FB850 80241060 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9FB854 80241064 24020002 */ addiu $v0, $zero, 2 -/* 9FB858 80241068 0C00A67F */ jal rand_int -/* 9FB85C 8024106C AE420070 */ sw $v0, 0x70($s2) -/* 9FB860 80241070 3C035555 */ lui $v1, 0x5555 -/* 9FB864 80241074 34635556 */ ori $v1, $v1, 0x5556 -/* 9FB868 80241078 00430018 */ mult $v0, $v1 -/* 9FB86C 8024107C 000227C3 */ sra $a0, $v0, 0x1f -/* 9FB870 80241080 00004010 */ mfhi $t0 -/* 9FB874 80241084 01042023 */ subu $a0, $t0, $a0 -/* 9FB878 80241088 00041840 */ sll $v1, $a0, 1 -/* 9FB87C 8024108C 00641821 */ addu $v1, $v1, $a0 -/* 9FB880 80241090 00431023 */ subu $v0, $v0, $v1 -/* 9FB884 80241094 24430002 */ addiu $v1, $v0, 2 -/* 9FB888 80241098 AE430074 */ sw $v1, 0x74($s2) -/* 9FB88C 8024109C 8E62002C */ lw $v0, 0x2c($s3) -/* 9FB890 802410A0 18400009 */ blez $v0, .L802410C8 -/* 9FB894 802410A4 24020004 */ addiu $v0, $zero, 4 -/* 9FB898 802410A8 8E620004 */ lw $v0, 4($s3) -/* 9FB89C 802410AC 18400006 */ blez $v0, .L802410C8 -/* 9FB8A0 802410B0 24020004 */ addiu $v0, $zero, 4 -/* 9FB8A4 802410B4 8E620008 */ lw $v0, 8($s3) -/* 9FB8A8 802410B8 18400003 */ blez $v0, .L802410C8 -/* 9FB8AC 802410BC 24020004 */ addiu $v0, $zero, 4 -/* 9FB8B0 802410C0 14600002 */ bnez $v1, .L802410CC -/* 9FB8B4 802410C4 00000000 */ nop -.L802410C8: -/* 9FB8B8 802410C8 AE420070 */ sw $v0, 0x70($s2) -.L802410CC: -/* 9FB8BC 802410CC 0C00A67F */ jal rand_int -/* 9FB8C0 802410D0 24042710 */ addiu $a0, $zero, 0x2710 -/* 9FB8C4 802410D4 3C0351EB */ lui $v1, 0x51eb -/* 9FB8C8 802410D8 3463851F */ ori $v1, $v1, 0x851f -/* 9FB8CC 802410DC 00430018 */ mult $v0, $v1 -/* 9FB8D0 802410E0 00021FC3 */ sra $v1, $v0, 0x1f -/* 9FB8D4 802410E4 00004010 */ mfhi $t0 -/* 9FB8D8 802410E8 00082143 */ sra $a0, $t0, 5 -/* 9FB8DC 802410EC 00832023 */ subu $a0, $a0, $v1 -/* 9FB8E0 802410F0 00041840 */ sll $v1, $a0, 1 -/* 9FB8E4 802410F4 00641821 */ addu $v1, $v1, $a0 -/* 9FB8E8 802410F8 000318C0 */ sll $v1, $v1, 3 -/* 9FB8EC 802410FC 00641821 */ addu $v1, $v1, $a0 -/* 9FB8F0 80241100 00031880 */ sll $v1, $v1, 2 -/* 9FB8F4 80241104 8E640004 */ lw $a0, 4($s3) -/* 9FB8F8 80241108 00431023 */ subu $v0, $v0, $v1 -/* 9FB8FC 8024110C 0044102A */ slt $v0, $v0, $a0 -/* 9FB900 80241110 10400002 */ beqz $v0, .L8024111C -/* 9FB904 80241114 24020004 */ addiu $v0, $zero, 4 -.L80241118: -/* 9FB908 80241118 AE420070 */ sw $v0, 0x70($s2) -.L8024111C: -/* 9FB90C 8024111C 8FBF0044 */ lw $ra, 0x44($sp) -/* 9FB910 80241120 8FB40040 */ lw $s4, 0x40($sp) -/* 9FB914 80241124 8FB3003C */ lw $s3, 0x3c($sp) -/* 9FB918 80241128 8FB20038 */ lw $s2, 0x38($sp) -/* 9FB91C 8024112C 8FB10034 */ lw $s1, 0x34($sp) -/* 9FB920 80241130 8FB00030 */ lw $s0, 0x30($sp) -/* 9FB924 80241134 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 9FB928 80241138 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 9FB92C 8024113C 03E00008 */ jr $ra -/* 9FB930 80241140 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_nok/nok_12/func_80241144_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/func_80241144_9FA7F0.s deleted file mode 100644 index 661ad56312..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/func_80241144_9FA7F0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241144_9FB934 -/* 9FB934 80241144 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9FB938 80241148 AFB3001C */ sw $s3, 0x1c($sp) -/* 9FB93C 8024114C 0080982D */ daddu $s3, $a0, $zero -/* 9FB940 80241150 AFBF0020 */ sw $ra, 0x20($sp) -/* 9FB944 80241154 AFB20018 */ sw $s2, 0x18($sp) -/* 9FB948 80241158 AFB10014 */ sw $s1, 0x14($sp) -/* 9FB94C 8024115C AFB00010 */ sw $s0, 0x10($sp) -/* 9FB950 80241160 8E720148 */ lw $s2, 0x148($s3) -/* 9FB954 80241164 86440008 */ lh $a0, 8($s2) -/* 9FB958 80241168 0C00EABB */ jal get_npc_unsafe -/* 9FB95C 8024116C 00A0882D */ daddu $s1, $a1, $zero -/* 9FB960 80241170 8E240008 */ lw $a0, 8($s1) -/* 9FB964 80241174 0040802D */ daddu $s0, $v0, $zero -/* 9FB968 80241178 00041FC2 */ srl $v1, $a0, 0x1f -/* 9FB96C 8024117C 00832021 */ addu $a0, $a0, $v1 -/* 9FB970 80241180 00042043 */ sra $a0, $a0, 1 -/* 9FB974 80241184 0C00A67F */ jal rand_int -/* 9FB978 80241188 24840001 */ addiu $a0, $a0, 1 -/* 9FB97C 8024118C 8E230008 */ lw $v1, 8($s1) -/* 9FB980 80241190 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9FB984 80241194 00032FC2 */ srl $a1, $v1, 0x1f -/* 9FB988 80241198 00651821 */ addu $v1, $v1, $a1 -/* 9FB98C 8024119C 00031843 */ sra $v1, $v1, 1 -/* 9FB990 802411A0 00621821 */ addu $v1, $v1, $v0 -/* 9FB994 802411A4 0C00A67F */ jal rand_int -/* 9FB998 802411A8 A603008E */ sh $v1, 0x8e($s0) -/* 9FB99C 802411AC C60C000C */ lwc1 $f12, 0xc($s0) -/* 9FB9A0 802411B0 44820000 */ mtc1 $v0, $f0 -/* 9FB9A4 802411B4 00000000 */ nop -/* 9FB9A8 802411B8 46800020 */ cvt.s.w $f0, $f0 -/* 9FB9AC 802411BC 46006300 */ add.s $f12, $f12, $f0 -/* 9FB9B0 802411C0 3C0142B4 */ lui $at, 0x42b4 -/* 9FB9B4 802411C4 44810000 */ mtc1 $at, $f0 -/* 9FB9B8 802411C8 0C00A6C9 */ jal clamp_angle -/* 9FB9BC 802411CC 46006301 */ sub.s $f12, $f12, $f0 -/* 9FB9C0 802411D0 E600000C */ swc1 $f0, 0xc($s0) -/* 9FB9C4 802411D4 8E4200CC */ lw $v0, 0xcc($s2) -/* 9FB9C8 802411D8 8C420000 */ lw $v0, ($v0) -/* 9FB9CC 802411DC AE020028 */ sw $v0, 0x28($s0) -/* 9FB9D0 802411E0 24020003 */ addiu $v0, $zero, 3 -/* 9FB9D4 802411E4 AE620070 */ sw $v0, 0x70($s3) -/* 9FB9D8 802411E8 8FBF0020 */ lw $ra, 0x20($sp) -/* 9FB9DC 802411EC 8FB3001C */ lw $s3, 0x1c($sp) -/* 9FB9E0 802411F0 8FB20018 */ lw $s2, 0x18($sp) -/* 9FB9E4 802411F4 8FB10014 */ lw $s1, 0x14($sp) -/* 9FB9E8 802411F8 8FB00010 */ lw $s0, 0x10($sp) -/* 9FB9EC 802411FC 03E00008 */ jr $ra -/* 9FB9F0 80241200 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_12/func_80241204_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/func_80241204_9FA7F0.s deleted file mode 100644 index 4885a368f0..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/func_80241204_9FA7F0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241204_9FB9F4 -/* 9FB9F4 80241204 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9FB9F8 80241208 AFB40040 */ sw $s4, 0x40($sp) -/* 9FB9FC 8024120C 0080A02D */ daddu $s4, $a0, $zero -/* 9FBA00 80241210 AFBF0044 */ sw $ra, 0x44($sp) -/* 9FBA04 80241214 AFB3003C */ sw $s3, 0x3c($sp) -/* 9FBA08 80241218 AFB20038 */ sw $s2, 0x38($sp) -/* 9FBA0C 8024121C AFB10034 */ sw $s1, 0x34($sp) -/* 9FBA10 80241220 AFB00030 */ sw $s0, 0x30($sp) -/* 9FBA14 80241224 8E910148 */ lw $s1, 0x148($s4) -/* 9FBA18 80241228 00A0902D */ daddu $s2, $a1, $zero -/* 9FBA1C 8024122C 86240008 */ lh $a0, 8($s1) -/* 9FBA20 80241230 0C00EABB */ jal get_npc_unsafe -/* 9FBA24 80241234 00C0982D */ daddu $s3, $a2, $zero -/* 9FBA28 80241238 8E430014 */ lw $v1, 0x14($s2) -/* 9FBA2C 8024123C 04600031 */ bltz $v1, .L80241304 -/* 9FBA30 80241240 0040802D */ daddu $s0, $v0, $zero -/* 9FBA34 80241244 0260202D */ daddu $a0, $s3, $zero -/* 9FBA38 80241248 AFA00010 */ sw $zero, 0x10($sp) -/* 9FBA3C 8024124C 8E460024 */ lw $a2, 0x24($s2) -/* 9FBA40 80241250 8E470028 */ lw $a3, 0x28($s2) -/* 9FBA44 80241254 0C01242D */ jal func_800490B4 -/* 9FBA48 80241258 0220282D */ daddu $a1, $s1, $zero -/* 9FBA4C 8024125C 10400029 */ beqz $v0, .L80241304 -/* 9FBA50 80241260 0000202D */ daddu $a0, $zero, $zero -/* 9FBA54 80241264 0200282D */ daddu $a1, $s0, $zero -/* 9FBA58 80241268 0000302D */ daddu $a2, $zero, $zero -/* 9FBA5C 8024126C 860300A8 */ lh $v1, 0xa8($s0) -/* 9FBA60 80241270 3C013F80 */ lui $at, 0x3f80 -/* 9FBA64 80241274 44810000 */ mtc1 $at, $f0 -/* 9FBA68 80241278 3C014000 */ lui $at, 0x4000 -/* 9FBA6C 8024127C 44811000 */ mtc1 $at, $f2 -/* 9FBA70 80241280 3C01C1A0 */ lui $at, 0xc1a0 -/* 9FBA74 80241284 44812000 */ mtc1 $at, $f4 -/* 9FBA78 80241288 2402000F */ addiu $v0, $zero, 0xf -/* 9FBA7C 8024128C AFA2001C */ sw $v0, 0x1c($sp) -/* 9FBA80 80241290 44833000 */ mtc1 $v1, $f6 -/* 9FBA84 80241294 00000000 */ nop -/* 9FBA88 80241298 468031A0 */ cvt.s.w $f6, $f6 -/* 9FBA8C 8024129C 44073000 */ mfc1 $a3, $f6 -/* 9FBA90 802412A0 27A20028 */ addiu $v0, $sp, 0x28 -/* 9FBA94 802412A4 AFA20020 */ sw $v0, 0x20($sp) -/* 9FBA98 802412A8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9FBA9C 802412AC E7A20014 */ swc1 $f2, 0x14($sp) -/* 9FBAA0 802412B0 0C01BFA4 */ jal fx_emote -/* 9FBAA4 802412B4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9FBAA8 802412B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9FBAAC 802412BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9FBAB0 802412C0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9FBAB4 802412C4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9FBAB8 802412C8 8C460028 */ lw $a2, 0x28($v0) -/* 9FBABC 802412CC 0C00A720 */ jal atan2 -/* 9FBAC0 802412D0 8C470030 */ lw $a3, 0x30($v0) -/* 9FBAC4 802412D4 0200202D */ daddu $a0, $s0, $zero -/* 9FBAC8 802412D8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9FBACC 802412DC 3C060020 */ lui $a2, 0x20 -/* 9FBAD0 802412E0 0C012530 */ jal func_800494C0 -/* 9FBAD4 802412E4 E480000C */ swc1 $f0, 0xc($a0) -/* 9FBAD8 802412E8 8E220018 */ lw $v0, 0x18($s1) -/* 9FBADC 802412EC 9442002A */ lhu $v0, 0x2a($v0) -/* 9FBAE0 802412F0 30420001 */ andi $v0, $v0, 1 -/* 9FBAE4 802412F4 14400029 */ bnez $v0, .L8024139C -/* 9FBAE8 802412F8 2402000A */ addiu $v0, $zero, 0xa -/* 9FBAEC 802412FC 080904E7 */ j .L8024139C -/* 9FBAF0 80241300 2402000C */ addiu $v0, $zero, 0xc -.L80241304: -/* 9FBAF4 80241304 8602008C */ lh $v0, 0x8c($s0) -/* 9FBAF8 80241308 14400025 */ bnez $v0, .L802413A0 -/* 9FBAFC 8024130C 00000000 */ nop -/* 9FBB00 80241310 9602008E */ lhu $v0, 0x8e($s0) -/* 9FBB04 80241314 2442FFFF */ addiu $v0, $v0, -1 -/* 9FBB08 80241318 A602008E */ sh $v0, 0x8e($s0) -/* 9FBB0C 8024131C 00021400 */ sll $v0, $v0, 0x10 -/* 9FBB10 80241320 1440001F */ bnez $v0, .L802413A0 -/* 9FBB14 80241324 00000000 */ nop -/* 9FBB18 80241328 8E820074 */ lw $v0, 0x74($s4) -/* 9FBB1C 8024132C 2442FFFF */ addiu $v0, $v0, -1 -/* 9FBB20 80241330 10400019 */ beqz $v0, .L80241398 -/* 9FBB24 80241334 AE820074 */ sw $v0, 0x74($s4) -/* 9FBB28 80241338 8E220018 */ lw $v0, 0x18($s1) -/* 9FBB2C 8024133C 9442002A */ lhu $v0, 0x2a($v0) -/* 9FBB30 80241340 30420010 */ andi $v0, $v0, 0x10 -/* 9FBB34 80241344 14400007 */ bnez $v0, .L80241364 -/* 9FBB38 80241348 00000000 */ nop -/* 9FBB3C 8024134C C600000C */ lwc1 $f0, 0xc($s0) -/* 9FBB40 80241350 3C014334 */ lui $at, 0x4334 -/* 9FBB44 80241354 44816000 */ mtc1 $at, $f12 -/* 9FBB48 80241358 0C00A6C9 */ jal clamp_angle -/* 9FBB4C 8024135C 460C0300 */ add.s $f12, $f0, $f12 -/* 9FBB50 80241360 E600000C */ swc1 $f0, 0xc($s0) -.L80241364: -/* 9FBB54 80241364 8E440008 */ lw $a0, 8($s2) -/* 9FBB58 80241368 000417C2 */ srl $v0, $a0, 0x1f -/* 9FBB5C 8024136C 00822021 */ addu $a0, $a0, $v0 -/* 9FBB60 80241370 00042043 */ sra $a0, $a0, 1 -/* 9FBB64 80241374 0C00A67F */ jal rand_int -/* 9FBB68 80241378 24840001 */ addiu $a0, $a0, 1 -/* 9FBB6C 8024137C 8E430008 */ lw $v1, 8($s2) -/* 9FBB70 80241380 000327C2 */ srl $a0, $v1, 0x1f -/* 9FBB74 80241384 00641821 */ addu $v1, $v1, $a0 -/* 9FBB78 80241388 00031843 */ sra $v1, $v1, 1 -/* 9FBB7C 8024138C 00621821 */ addu $v1, $v1, $v0 -/* 9FBB80 80241390 080904E8 */ j .L802413A0 -/* 9FBB84 80241394 A603008E */ sh $v1, 0x8e($s0) -.L80241398: -/* 9FBB88 80241398 24020004 */ addiu $v0, $zero, 4 -.L8024139C: -/* 9FBB8C 8024139C AE820070 */ sw $v0, 0x70($s4) -.L802413A0: -/* 9FBB90 802413A0 8FBF0044 */ lw $ra, 0x44($sp) -/* 9FBB94 802413A4 8FB40040 */ lw $s4, 0x40($sp) -/* 9FBB98 802413A8 8FB3003C */ lw $s3, 0x3c($sp) -/* 9FBB9C 802413AC 8FB20038 */ lw $s2, 0x38($sp) -/* 9FBBA0 802413B0 8FB10034 */ lw $s1, 0x34($sp) -/* 9FBBA4 802413B4 8FB00030 */ lw $s0, 0x30($sp) -/* 9FBBA8 802413B8 03E00008 */ jr $ra -/* 9FBBAC 802413BC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_12/func_802413C0_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/func_802413C0_9FA7F0.s deleted file mode 100644 index af0dc077f9..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/func_802413C0_9FA7F0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413C0_9FBBB0 -/* 9FBBB0 802413C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9FBBB4 802413C4 AFB10014 */ sw $s1, 0x14($sp) -/* 9FBBB8 802413C8 0080882D */ daddu $s1, $a0, $zero -/* 9FBBBC 802413CC AFBF001C */ sw $ra, 0x1c($sp) -/* 9FBBC0 802413D0 AFB20018 */ sw $s2, 0x18($sp) -/* 9FBBC4 802413D4 AFB00010 */ sw $s0, 0x10($sp) -/* 9FBBC8 802413D8 8E300148 */ lw $s0, 0x148($s1) -/* 9FBBCC 802413DC 86040008 */ lh $a0, 8($s0) -/* 9FBBD0 802413E0 0C00EABB */ jal get_npc_unsafe -/* 9FBBD4 802413E4 00A0902D */ daddu $s2, $a1, $zero -/* 9FBBD8 802413E8 8E230078 */ lw $v1, 0x78($s1) -/* 9FBBDC 802413EC 24630001 */ addiu $v1, $v1, 1 -/* 9FBBE0 802413F0 AE230078 */ sw $v1, 0x78($s1) -/* 9FBBE4 802413F4 8E0400D0 */ lw $a0, 0xd0($s0) -/* 9FBBE8 802413F8 8C840000 */ lw $a0, ($a0) -/* 9FBBEC 802413FC 0064182A */ slt $v1, $v1, $a0 -/* 9FBBF0 80241400 14600002 */ bnez $v1, .L8024140C -/* 9FBBF4 80241404 0040282D */ daddu $a1, $v0, $zero -/* 9FBBF8 80241408 AE200078 */ sw $zero, 0x78($s1) -.L8024140C: -/* 9FBBFC 8024140C 8E0200CC */ lw $v0, 0xcc($s0) -/* 9FBC00 80241410 8C420004 */ lw $v0, 4($v0) -/* 9FBC04 80241414 ACA20028 */ sw $v0, 0x28($a1) -/* 9FBC08 80241418 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9FBC0C 8024141C 8C42007C */ lw $v0, 0x7c($v0) -/* 9FBC10 80241420 04410004 */ bgez $v0, .L80241434 -/* 9FBC14 80241424 00000000 */ nop -/* 9FBC18 80241428 C6400000 */ lwc1 $f0, ($s2) -/* 9FBC1C 8024142C 08090515 */ j .L80241454 -/* 9FBC20 80241430 E4A00018 */ swc1 $f0, 0x18($a1) -.L80241434: -/* 9FBC24 80241434 3C018024 */ lui $at, 0x8024 -/* 9FBC28 80241438 D4225AD8 */ ldc1 $f2, 0x5ad8($at) -/* 9FBC2C 8024143C 44820000 */ mtc1 $v0, $f0 -/* 9FBC30 80241440 00000000 */ nop -/* 9FBC34 80241444 46800021 */ cvt.d.w $f0, $f0 -/* 9FBC38 80241448 46220003 */ div.d $f0, $f0, $f2 -/* 9FBC3C 8024144C 46200020 */ cvt.s.d $f0, $f0 -/* 9FBC40 80241450 E4A00018 */ swc1 $f0, 0x18($a1) -.L80241454: -/* 9FBC44 80241454 24020001 */ addiu $v0, $zero, 1 -/* 9FBC48 80241458 AE220070 */ sw $v0, 0x70($s1) -/* 9FBC4C 8024145C 8FBF001C */ lw $ra, 0x1c($sp) -/* 9FBC50 80241460 8FB20018 */ lw $s2, 0x18($sp) -/* 9FBC54 80241464 8FB10014 */ lw $s1, 0x14($sp) -/* 9FBC58 80241468 8FB00010 */ lw $s0, 0x10($sp) -/* 9FBC5C 8024146C 03E00008 */ jr $ra -/* 9FBC60 80241470 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_12/func_80241560_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/func_80241560_9FA7F0.s deleted file mode 100644 index 40413f66cc..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/func_80241560_9FA7F0.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241560_9FBD50 -/* 9FBD50 80241560 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9FBD54 80241564 AFB3001C */ sw $s3, 0x1c($sp) -/* 9FBD58 80241568 0080982D */ daddu $s3, $a0, $zero -/* 9FBD5C 8024156C AFBF0020 */ sw $ra, 0x20($sp) -/* 9FBD60 80241570 AFB20018 */ sw $s2, 0x18($sp) -/* 9FBD64 80241574 AFB10014 */ sw $s1, 0x14($sp) -/* 9FBD68 80241578 AFB00010 */ sw $s0, 0x10($sp) -/* 9FBD6C 8024157C F7B40028 */ sdc1 $f20, 0x28($sp) -/* 9FBD70 80241580 8E710148 */ lw $s1, 0x148($s3) -/* 9FBD74 80241584 86240008 */ lh $a0, 8($s1) -/* 9FBD78 80241588 0C00EABB */ jal get_npc_unsafe -/* 9FBD7C 8024158C 00A0802D */ daddu $s0, $a1, $zero -/* 9FBD80 80241590 8E040020 */ lw $a0, 0x20($s0) -/* 9FBD84 80241594 0040902D */ daddu $s2, $v0, $zero -/* 9FBD88 80241598 00041FC2 */ srl $v1, $a0, 0x1f -/* 9FBD8C 8024159C 00832021 */ addu $a0, $a0, $v1 -/* 9FBD90 802415A0 00042043 */ sra $a0, $a0, 1 -/* 9FBD94 802415A4 0C00A67F */ jal rand_int -/* 9FBD98 802415A8 24840001 */ addiu $a0, $a0, 1 -/* 9FBD9C 802415AC 8E030020 */ lw $v1, 0x20($s0) -/* 9FBDA0 802415B0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* 9FBDA4 802415B4 000327C2 */ srl $a0, $v1, 0x1f -/* 9FBDA8 802415B8 00641821 */ addu $v1, $v1, $a0 -/* 9FBDAC 802415BC 00031843 */ sra $v1, $v1, 1 -/* 9FBDB0 802415C0 00621821 */ addu $v1, $v1, $v0 -/* 9FBDB4 802415C4 A643008E */ sh $v1, 0x8e($s2) -/* 9FBDB8 802415C8 8E2200CC */ lw $v0, 0xcc($s1) -/* 9FBDBC 802415CC C64E0040 */ lwc1 $f14, 0x40($s2) -/* 9FBDC0 802415D0 8C42000C */ lw $v0, 0xc($v0) -/* 9FBDC4 802415D4 AE420028 */ sw $v0, 0x28($s2) -/* 9FBDC8 802415D8 C6000018 */ lwc1 $f0, 0x18($s0) -/* 9FBDCC 802415DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9FBDD0 802415E0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9FBDD4 802415E4 E6400018 */ swc1 $f0, 0x18($s2) -/* 9FBDD8 802415E8 8C460028 */ lw $a2, 0x28($v0) -/* 9FBDDC 802415EC 0C00A720 */ jal atan2 -/* 9FBDE0 802415F0 8C470030 */ lw $a3, 0x30($v0) -/* 9FBDE4 802415F4 46000506 */ mov.s $f20, $f0 -/* 9FBDE8 802415F8 C64C000C */ lwc1 $f12, 0xc($s2) -/* 9FBDEC 802415FC 0C00A70A */ jal get_clamped_angle_diff -/* 9FBDF0 80241600 4600A386 */ mov.s $f14, $f20 -/* 9FBDF4 80241604 46000086 */ mov.s $f2, $f0 -/* 9FBDF8 80241608 8E02001C */ lw $v0, 0x1c($s0) -/* 9FBDFC 8024160C 46001005 */ abs.s $f0, $f2 -/* 9FBE00 80241610 44822000 */ mtc1 $v0, $f4 -/* 9FBE04 80241614 00000000 */ nop -/* 9FBE08 80241618 46802120 */ cvt.s.w $f4, $f4 -/* 9FBE0C 8024161C 4600203C */ c.lt.s $f4, $f0 -/* 9FBE10 80241620 00000000 */ nop -/* 9FBE14 80241624 4500000D */ bc1f .L8024165C -/* 9FBE18 80241628 00000000 */ nop -/* 9FBE1C 8024162C 44800000 */ mtc1 $zero, $f0 -/* 9FBE20 80241630 C654000C */ lwc1 $f20, 0xc($s2) -/* 9FBE24 80241634 4600103C */ c.lt.s $f2, $f0 -/* 9FBE28 80241638 00000000 */ nop -/* 9FBE2C 8024163C 45000006 */ bc1f .L80241658 -/* 9FBE30 80241640 00021023 */ negu $v0, $v0 -/* 9FBE34 80241644 44820000 */ mtc1 $v0, $f0 -/* 9FBE38 80241648 00000000 */ nop -/* 9FBE3C 8024164C 46800020 */ cvt.s.w $f0, $f0 -/* 9FBE40 80241650 08090597 */ j .L8024165C -/* 9FBE44 80241654 4600A500 */ add.s $f20, $f20, $f0 -.L80241658: -/* 9FBE48 80241658 4604A500 */ add.s $f20, $f20, $f4 -.L8024165C: -/* 9FBE4C 8024165C 0C00A6C9 */ jal clamp_angle -/* 9FBE50 80241660 4600A306 */ mov.s $f12, $f20 -/* 9FBE54 80241664 2402000D */ addiu $v0, $zero, 0xd -/* 9FBE58 80241668 E640000C */ swc1 $f0, 0xc($s2) -/* 9FBE5C 8024166C AE620070 */ sw $v0, 0x70($s3) -/* 9FBE60 80241670 8FBF0020 */ lw $ra, 0x20($sp) -/* 9FBE64 80241674 8FB3001C */ lw $s3, 0x1c($sp) -/* 9FBE68 80241678 8FB20018 */ lw $s2, 0x18($sp) -/* 9FBE6C 8024167C 8FB10014 */ lw $s1, 0x14($sp) -/* 9FBE70 80241680 8FB00010 */ lw $s0, 0x10($sp) -/* 9FBE74 80241684 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 9FBE78 80241688 03E00008 */ jr $ra -/* 9FBE7C 8024168C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_12/func_802417B0_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/func_802417B0_9FA7F0.s deleted file mode 100644 index 072eb07829..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/func_802417B0_9FA7F0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417B0_9FBFA0 -/* 9FBFA0 802417B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9FBFA4 802417B4 AFB10014 */ sw $s1, 0x14($sp) -/* 9FBFA8 802417B8 0080882D */ daddu $s1, $a0, $zero -/* 9FBFAC 802417BC AFBF0018 */ sw $ra, 0x18($sp) -/* 9FBFB0 802417C0 AFB00010 */ sw $s0, 0x10($sp) -/* 9FBFB4 802417C4 8E300148 */ lw $s0, 0x148($s1) -/* 9FBFB8 802417C8 0C00EABB */ jal get_npc_unsafe -/* 9FBFBC 802417CC 86040008 */ lh $a0, 8($s0) -/* 9FBFC0 802417D0 9443008E */ lhu $v1, 0x8e($v0) -/* 9FBFC4 802417D4 2463FFFF */ addiu $v1, $v1, -1 -/* 9FBFC8 802417D8 A443008E */ sh $v1, 0x8e($v0) -/* 9FBFCC 802417DC 00031C00 */ sll $v1, $v1, 0x10 -/* 9FBFD0 802417E0 14600008 */ bnez $v1, .L80241804 -/* 9FBFD4 802417E4 00000000 */ nop -/* 9FBFD8 802417E8 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9FBFDC 802417EC 30420080 */ andi $v0, $v0, 0x80 -/* 9FBFE0 802417F0 10400003 */ beqz $v0, .L80241800 -/* 9FBFE4 802417F4 2402000F */ addiu $v0, $zero, 0xf -/* 9FBFE8 802417F8 08090601 */ j .L80241804 -/* 9FBFEC 802417FC AE220070 */ sw $v0, 0x70($s1) -.L80241800: -/* 9FBFF0 80241800 AE200070 */ sw $zero, 0x70($s1) -.L80241804: -/* 9FBFF4 80241804 8FBF0018 */ lw $ra, 0x18($sp) -/* 9FBFF8 80241808 8FB10014 */ lw $s1, 0x14($sp) -/* 9FBFFC 8024180C 8FB00010 */ lw $s0, 0x10($sp) -/* 9FC000 80241810 03E00008 */ jr $ra -/* 9FC004 80241814 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_12/func_80241818_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/func_80241818_9FA7F0.s deleted file mode 100644 index 733468dd74..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/func_80241818_9FA7F0.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241818_9FC008 -/* 9FC008 80241818 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9FC00C 8024181C AFB10014 */ sw $s1, 0x14($sp) -/* 9FC010 80241820 0080882D */ daddu $s1, $a0, $zero -/* 9FC014 80241824 AFBF001C */ sw $ra, 0x1c($sp) -/* 9FC018 80241828 AFB20018 */ sw $s2, 0x18($sp) -/* 9FC01C 8024182C AFB00010 */ sw $s0, 0x10($sp) -/* 9FC020 80241830 8E300148 */ lw $s0, 0x148($s1) -/* 9FC024 80241834 86040008 */ lh $a0, 8($s0) -/* 9FC028 80241838 0C00EABB */ jal get_npc_unsafe -/* 9FC02C 8024183C 00A0902D */ daddu $s2, $a1, $zero -/* 9FC030 80241840 8E0300D0 */ lw $v1, 0xd0($s0) -/* 9FC034 80241844 8E240078 */ lw $a0, 0x78($s1) -/* 9FC038 80241848 8C630000 */ lw $v1, ($v1) -/* 9FC03C 8024184C 0083182A */ slt $v1, $a0, $v1 -/* 9FC040 80241850 10600013 */ beqz $v1, .L802418A0 -/* 9FC044 80241854 0040302D */ daddu $a2, $v0, $zero -/* 9FC048 80241858 00041040 */ sll $v0, $a0, 1 -/* 9FC04C 8024185C 00441021 */ addu $v0, $v0, $a0 -/* 9FC050 80241860 00022880 */ sll $a1, $v0, 2 -.L80241864: -/* 9FC054 80241864 8E0300D0 */ lw $v1, 0xd0($s0) -/* 9FC058 80241868 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 9FC05C 8024186C 00A31021 */ addu $v0, $a1, $v1 -/* 9FC060 80241870 C4400008 */ lwc1 $f0, 8($v0) -/* 9FC064 80241874 46800020 */ cvt.s.w $f0, $f0 -/* 9FC068 80241878 4602003E */ c.le.s $f0, $f2 -/* 9FC06C 8024187C 00000000 */ nop -/* 9FC070 80241880 45020003 */ bc1fl .L80241890 -/* 9FC074 80241884 24840001 */ addiu $a0, $a0, 1 -/* 9FC078 80241888 08090628 */ j .L802418A0 -/* 9FC07C 8024188C AE240078 */ sw $a0, 0x78($s1) -.L80241890: -/* 9FC080 80241890 8C620000 */ lw $v0, ($v1) -/* 9FC084 80241894 0082102A */ slt $v0, $a0, $v0 -/* 9FC088 80241898 1440FFF2 */ bnez $v0, .L80241864 -/* 9FC08C 8024189C 24A5000C */ addiu $a1, $a1, 0xc -.L802418A0: -/* 9FC090 802418A0 C6400000 */ lwc1 $f0, ($s2) -/* 9FC094 802418A4 E4C00018 */ swc1 $f0, 0x18($a2) -/* 9FC098 802418A8 8E0200CC */ lw $v0, 0xcc($s0) -/* 9FC09C 802418AC 8C420004 */ lw $v0, 4($v0) -/* 9FC0A0 802418B0 ACC20028 */ sw $v0, 0x28($a2) -/* 9FC0A4 802418B4 24020001 */ addiu $v0, $zero, 1 -/* 9FC0A8 802418B8 AE200074 */ sw $zero, 0x74($s1) -/* 9FC0AC 802418BC AE220070 */ sw $v0, 0x70($s1) -/* 9FC0B0 802418C0 8FBF001C */ lw $ra, 0x1c($sp) -/* 9FC0B4 802418C4 8FB20018 */ lw $s2, 0x18($sp) -/* 9FC0B8 802418C8 8FB10014 */ lw $s1, 0x14($sp) -/* 9FC0BC 802418CC 8FB00010 */ lw $s0, 0x10($sp) -/* 9FC0C0 802418D0 03E00008 */ jr $ra -/* 9FC0C4 802418D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_12/func_802418D8_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/func_802418D8_9FA7F0.s deleted file mode 100644 index a3cd4233b5..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/func_802418D8_9FA7F0.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418D8_9FC0C8 -/* 9FC0C8 802418D8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 9FC0CC 802418DC AFB40058 */ sw $s4, 0x58($sp) -/* 9FC0D0 802418E0 0080A02D */ daddu $s4, $a0, $zero -/* 9FC0D4 802418E4 AFBF0060 */ sw $ra, 0x60($sp) -/* 9FC0D8 802418E8 AFB5005C */ sw $s5, 0x5c($sp) -/* 9FC0DC 802418EC AFB30054 */ sw $s3, 0x54($sp) -/* 9FC0E0 802418F0 AFB20050 */ sw $s2, 0x50($sp) -/* 9FC0E4 802418F4 AFB1004C */ sw $s1, 0x4c($sp) -/* 9FC0E8 802418F8 AFB00048 */ sw $s0, 0x48($sp) -/* 9FC0EC 802418FC 8E910148 */ lw $s1, 0x148($s4) -/* 9FC0F0 80241900 86240008 */ lh $a0, 8($s1) -/* 9FC0F4 80241904 0C00EABB */ jal get_npc_unsafe -/* 9FC0F8 80241908 00A0802D */ daddu $s0, $a1, $zero -/* 9FC0FC 8024190C 8E83000C */ lw $v1, 0xc($s4) -/* 9FC100 80241910 0280202D */ daddu $a0, $s4, $zero -/* 9FC104 80241914 8C650000 */ lw $a1, ($v1) -/* 9FC108 80241918 0C0B1EAF */ jal get_variable -/* 9FC10C 8024191C 0040902D */ daddu $s2, $v0, $zero -/* 9FC110 80241920 AFA00018 */ sw $zero, 0x18($sp) -/* 9FC114 80241924 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FC118 80241928 8C630094 */ lw $v1, 0x94($v1) -/* 9FC11C 8024192C AFA3001C */ sw $v1, 0x1c($sp) -/* 9FC120 80241930 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FC124 80241934 8C630080 */ lw $v1, 0x80($v1) -/* 9FC128 80241938 AFA30020 */ sw $v1, 0x20($sp) -/* 9FC12C 8024193C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FC130 80241940 8C630088 */ lw $v1, 0x88($v1) -/* 9FC134 80241944 AFA30024 */ sw $v1, 0x24($sp) -/* 9FC138 80241948 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FC13C 8024194C 8C63008C */ lw $v1, 0x8c($v1) -/* 9FC140 80241950 27B50018 */ addiu $s5, $sp, 0x18 -/* 9FC144 80241954 AFA30028 */ sw $v1, 0x28($sp) -/* 9FC148 80241958 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FC14C 8024195C 3C014282 */ lui $at, 0x4282 -/* 9FC150 80241960 44810000 */ mtc1 $at, $f0 -/* 9FC154 80241964 8C630090 */ lw $v1, 0x90($v1) -/* 9FC158 80241968 0040982D */ daddu $s3, $v0, $zero -/* 9FC15C 8024196C E7A00030 */ swc1 $f0, 0x30($sp) -/* 9FC160 80241970 A7A00034 */ sh $zero, 0x34($sp) -/* 9FC164 80241974 16000005 */ bnez $s0, .L8024198C -/* 9FC168 80241978 AFA3002C */ sw $v1, 0x2c($sp) -/* 9FC16C 8024197C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FC170 80241980 30420004 */ andi $v0, $v0, 4 -/* 9FC174 80241984 10400044 */ beqz $v0, .L80241A98 -/* 9FC178 80241988 00000000 */ nop -.L8024198C: -/* 9FC17C 8024198C 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9FC180 80241990 AE800070 */ sw $zero, 0x70($s4) -/* 9FC184 80241994 A640008E */ sh $zero, 0x8e($s2) -/* 9FC188 80241998 8E2200CC */ lw $v0, 0xcc($s1) -/* 9FC18C 8024199C 8E430000 */ lw $v1, ($s2) -/* 9FC190 802419A0 8C420000 */ lw $v0, ($v0) -/* 9FC194 802419A4 00641824 */ and $v1, $v1, $a0 -/* 9FC198 802419A8 AE430000 */ sw $v1, ($s2) -/* 9FC19C 802419AC AE420028 */ sw $v0, 0x28($s2) -/* 9FC1A0 802419B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9FC1A4 802419B4 8C420098 */ lw $v0, 0x98($v0) -/* 9FC1A8 802419B8 54400005 */ bnel $v0, $zero, .L802419D0 -/* 9FC1AC 802419BC 2402FDFF */ addiu $v0, $zero, -0x201 -/* 9FC1B0 802419C0 34620200 */ ori $v0, $v1, 0x200 -/* 9FC1B4 802419C4 2403FFF7 */ addiu $v1, $zero, -9 -/* 9FC1B8 802419C8 08090676 */ j .L802419D8 -/* 9FC1BC 802419CC 00431024 */ and $v0, $v0, $v1 -.L802419D0: -/* 9FC1C0 802419D0 00621024 */ and $v0, $v1, $v0 -/* 9FC1C4 802419D4 34420008 */ ori $v0, $v0, 8 -.L802419D8: -/* 9FC1C8 802419D8 AE420000 */ sw $v0, ($s2) -/* 9FC1CC 802419DC 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FC1D0 802419E0 30420004 */ andi $v0, $v0, 4 -/* 9FC1D4 802419E4 10400008 */ beqz $v0, .L80241A08 -/* 9FC1D8 802419E8 24020063 */ addiu $v0, $zero, 0x63 -/* 9FC1DC 802419EC AE820070 */ sw $v0, 0x70($s4) -/* 9FC1E0 802419F0 AE800074 */ sw $zero, 0x74($s4) -/* 9FC1E4 802419F4 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FC1E8 802419F8 2403FFFB */ addiu $v1, $zero, -5 -/* 9FC1EC 802419FC 00431024 */ and $v0, $v0, $v1 -/* 9FC1F0 80241A00 0809068D */ j .L80241A34 -/* 9FC1F4 80241A04 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241A08: -/* 9FC1F8 80241A08 8E220000 */ lw $v0, ($s1) -/* 9FC1FC 80241A0C 3C034000 */ lui $v1, 0x4000 -/* 9FC200 80241A10 00431024 */ and $v0, $v0, $v1 -/* 9FC204 80241A14 10400007 */ beqz $v0, .L80241A34 -/* 9FC208 80241A18 3C03BFFF */ lui $v1, 0xbfff -/* 9FC20C 80241A1C 2402000C */ addiu $v0, $zero, 0xc -/* 9FC210 80241A20 AE820070 */ sw $v0, 0x70($s4) -/* 9FC214 80241A24 8E220000 */ lw $v0, ($s1) -/* 9FC218 80241A28 3463FFFF */ ori $v1, $v1, 0xffff -/* 9FC21C 80241A2C 00431024 */ and $v0, $v0, $v1 -/* 9FC220 80241A30 AE220000 */ sw $v0, ($s1) -.L80241A34: -/* 9FC224 80241A34 27A50038 */ addiu $a1, $sp, 0x38 -/* 9FC228 80241A38 27A6003C */ addiu $a2, $sp, 0x3c -/* 9FC22C 80241A3C C6400038 */ lwc1 $f0, 0x38($s2) -/* 9FC230 80241A40 864200A8 */ lh $v0, 0xa8($s2) -/* 9FC234 80241A44 3C0142C8 */ lui $at, 0x42c8 -/* 9FC238 80241A48 44812000 */ mtc1 $at, $f4 -/* 9FC23C 80241A4C 44823000 */ mtc1 $v0, $f6 -/* 9FC240 80241A50 00000000 */ nop -/* 9FC244 80241A54 468031A0 */ cvt.s.w $f6, $f6 -/* 9FC248 80241A58 27A20044 */ addiu $v0, $sp, 0x44 -/* 9FC24C 80241A5C E7A00038 */ swc1 $f0, 0x38($sp) -/* 9FC250 80241A60 C640003C */ lwc1 $f0, 0x3c($s2) -/* 9FC254 80241A64 C6420040 */ lwc1 $f2, 0x40($s2) -/* 9FC258 80241A68 46060000 */ add.s $f0, $f0, $f6 -/* 9FC25C 80241A6C E7A40044 */ swc1 $f4, 0x44($sp) -/* 9FC260 80241A70 E7A20040 */ swc1 $f2, 0x40($sp) -/* 9FC264 80241A74 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 9FC268 80241A78 AFA20010 */ sw $v0, 0x10($sp) -/* 9FC26C 80241A7C 8E440080 */ lw $a0, 0x80($s2) -/* 9FC270 80241A80 0C0372DF */ jal func_800DCB7C -/* 9FC274 80241A84 27A70040 */ addiu $a3, $sp, 0x40 -/* 9FC278 80241A88 10400003 */ beqz $v0, .L80241A98 -/* 9FC27C 80241A8C 00000000 */ nop -/* 9FC280 80241A90 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 9FC284 80241A94 E640003C */ swc1 $f0, 0x3c($s2) -.L80241A98: -/* 9FC288 80241A98 8E830070 */ lw $v1, 0x70($s4) -/* 9FC28C 80241A9C 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9FC290 80241AA0 10400042 */ beqz $v0, .L80241BAC -/* 9FC294 80241AA4 00031080 */ sll $v0, $v1, 2 -/* 9FC298 80241AA8 3C018024 */ lui $at, 0x8024 -/* 9FC29C 80241AAC 00220821 */ addu $at, $at, $v0 -/* 9FC2A0 80241AB0 8C225AE0 */ lw $v0, 0x5ae0($at) -/* 9FC2A4 80241AB4 00400008 */ jr $v0 -/* 9FC2A8 80241AB8 00000000 */ nop -/* 9FC2AC 80241ABC 0280202D */ daddu $a0, $s4, $zero -/* 9FC2B0 80241AC0 0260282D */ daddu $a1, $s3, $zero -/* 9FC2B4 80241AC4 0C090351 */ jal func_80240D44 -/* 9FC2B8 80241AC8 02A0302D */ daddu $a2, $s5, $zero -/* 9FC2BC 80241ACC 0280202D */ daddu $a0, $s4, $zero -/* 9FC2C0 80241AD0 0260282D */ daddu $a1, $s3, $zero -/* 9FC2C4 80241AD4 0C0903A7 */ jal func_80240E9C -/* 9FC2C8 80241AD8 02A0302D */ daddu $a2, $s5, $zero -/* 9FC2CC 80241ADC 080906EB */ j .L80241BAC -/* 9FC2D0 80241AE0 00000000 */ nop -/* 9FC2D4 80241AE4 0280202D */ daddu $a0, $s4, $zero -/* 9FC2D8 80241AE8 0260282D */ daddu $a1, $s3, $zero -/* 9FC2DC 80241AEC 0C090451 */ jal func_80241144 -/* 9FC2E0 80241AF0 02A0302D */ daddu $a2, $s5, $zero -/* 9FC2E4 80241AF4 0280202D */ daddu $a0, $s4, $zero -/* 9FC2E8 80241AF8 0260282D */ daddu $a1, $s3, $zero -/* 9FC2EC 80241AFC 0C090481 */ jal func_80241204 -/* 9FC2F0 80241B00 02A0302D */ daddu $a2, $s5, $zero -/* 9FC2F4 80241B04 080906EB */ j .L80241BAC -/* 9FC2F8 80241B08 00000000 */ nop -/* 9FC2FC 80241B0C 0280202D */ daddu $a0, $s4, $zero -/* 9FC300 80241B10 0260282D */ daddu $a1, $s3, $zero -/* 9FC304 80241B14 0C0904F0 */ jal func_802413C0 -/* 9FC308 80241B18 02A0302D */ daddu $a2, $s5, $zero -/* 9FC30C 80241B1C 080906EB */ j .L80241BAC -/* 9FC310 80241B20 00000000 */ nop -/* 9FC314 80241B24 0280202D */ daddu $a0, $s4, $zero -/* 9FC318 80241B28 0260282D */ daddu $a1, $s3, $zero -/* 9FC31C 80241B2C 0C09051D */ jal func_80241474 -/* 9FC320 80241B30 02A0302D */ daddu $a2, $s5, $zero -/* 9FC324 80241B34 0280202D */ daddu $a0, $s4, $zero -/* 9FC328 80241B38 0260282D */ daddu $a1, $s3, $zero -/* 9FC32C 80241B3C 0C09053A */ jal func_802414E8 -/* 9FC330 80241B40 02A0302D */ daddu $a2, $s5, $zero -/* 9FC334 80241B44 080906EB */ j .L80241BAC -/* 9FC338 80241B48 00000000 */ nop -/* 9FC33C 80241B4C 0280202D */ daddu $a0, $s4, $zero -/* 9FC340 80241B50 0260282D */ daddu $a1, $s3, $zero -/* 9FC344 80241B54 0C090558 */ jal func_80241560 -/* 9FC348 80241B58 02A0302D */ daddu $a2, $s5, $zero -/* 9FC34C 80241B5C 0280202D */ daddu $a0, $s4, $zero -/* 9FC350 80241B60 0260282D */ daddu $a1, $s3, $zero -/* 9FC354 80241B64 0C0905A4 */ jal func_80241690 -/* 9FC358 80241B68 02A0302D */ daddu $a2, $s5, $zero -/* 9FC35C 80241B6C 080906EB */ j .L80241BAC -/* 9FC360 80241B70 00000000 */ nop -/* 9FC364 80241B74 0280202D */ daddu $a0, $s4, $zero -/* 9FC368 80241B78 0260282D */ daddu $a1, $s3, $zero -/* 9FC36C 80241B7C 0C0905EC */ jal func_802417B0 -/* 9FC370 80241B80 02A0302D */ daddu $a2, $s5, $zero -/* 9FC374 80241B84 080906EB */ j .L80241BAC -/* 9FC378 80241B88 00000000 */ nop -/* 9FC37C 80241B8C 0280202D */ daddu $a0, $s4, $zero -/* 9FC380 80241B90 0260282D */ daddu $a1, $s3, $zero -/* 9FC384 80241B94 0C090606 */ jal func_80241818 -/* 9FC388 80241B98 02A0302D */ daddu $a2, $s5, $zero -/* 9FC38C 80241B9C 080906EB */ j .L80241BAC -/* 9FC390 80241BA0 00000000 */ nop -/* 9FC394 80241BA4 0C0129CF */ jal func_8004A73C -/* 9FC398 80241BA8 0280202D */ daddu $a0, $s4, $zero -.L80241BAC: -/* 9FC39C 80241BAC 8FBF0060 */ lw $ra, 0x60($sp) -/* 9FC3A0 80241BB0 8FB5005C */ lw $s5, 0x5c($sp) -/* 9FC3A4 80241BB4 8FB40058 */ lw $s4, 0x58($sp) -/* 9FC3A8 80241BB8 8FB30054 */ lw $s3, 0x54($sp) -/* 9FC3AC 80241BBC 8FB20050 */ lw $s2, 0x50($sp) -/* 9FC3B0 80241BC0 8FB1004C */ lw $s1, 0x4c($sp) -/* 9FC3B4 80241BC4 8FB00048 */ lw $s0, 0x48($sp) -/* 9FC3B8 80241BC8 0000102D */ daddu $v0, $zero, $zero -/* 9FC3BC 80241BCC 03E00008 */ jr $ra -/* 9FC3C0 80241BD0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_nok/nok_12/func_80241EE0_9FA7F0.s b/asm/nonmatchings/world/area_nok/nok_12/func_80241EE0_9FA7F0.s deleted file mode 100644 index bcff082999..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/func_80241EE0_9FA7F0.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EE0_9FC6D0 -/* 9FC6D0 80241EE0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9FC6D4 80241EE4 3C048024 */ lui $a0, 0x8024 -/* 9FC6D8 80241EE8 248459CC */ addiu $a0, $a0, 0x59cc -/* 9FC6DC 80241EEC AFBF0018 */ sw $ra, 0x18($sp) -/* 9FC6E0 80241EF0 AFB10014 */ sw $s1, 0x14($sp) -/* 9FC6E4 80241EF4 AFB00010 */ sw $s0, 0x10($sp) -/* 9FC6E8 80241EF8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9FC6EC 80241EFC 8C830000 */ lw $v1, ($a0) -/* 9FC6F0 80241F00 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* 9FC6F4 80241F04 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* 9FC6F8 80241F08 28620003 */ slti $v0, $v1, 3 -/* 9FC6FC 80241F0C 50400007 */ beql $v0, $zero, .L80241F2C -/* 9FC700 80241F10 24020003 */ addiu $v0, $zero, 3 -/* 9FC704 80241F14 1C60000C */ bgtz $v1, .L80241F48 -/* 9FC708 80241F18 24620001 */ addiu $v0, $v1, 1 -/* 9FC70C 80241F1C 10600007 */ beqz $v1, .L80241F3C -/* 9FC710 80241F20 0000102D */ daddu $v0, $zero, $zero -/* 9FC714 80241F24 080907EE */ j .L80241FB8 -/* 9FC718 80241F28 00000000 */ nop -.L80241F2C: -/* 9FC71C 80241F2C 10620008 */ beq $v1, $v0, .L80241F50 -/* 9FC720 80241F30 0000102D */ daddu $v0, $zero, $zero -/* 9FC724 80241F34 080907EE */ j .L80241FB8 -/* 9FC728 80241F38 00000000 */ nop -.L80241F3C: -/* 9FC72C 80241F3C 24020001 */ addiu $v0, $zero, 1 -/* 9FC730 80241F40 080907ED */ j .L80241FB4 -/* 9FC734 80241F44 AC820000 */ sw $v0, ($a0) -.L80241F48: -/* 9FC738 80241F48 080907ED */ j .L80241FB4 -/* 9FC73C 80241F4C AC820000 */ sw $v0, ($a0) -.L80241F50: -/* 9FC740 80241F50 3C108011 */ lui $s0, 0x8011 -/* 9FC744 80241F54 2610C930 */ addiu $s0, $s0, -0x36d0 -/* 9FC748 80241F58 0C03BD17 */ jal clear_partner_move_history -/* 9FC74C 80241F5C 8E040000 */ lw $a0, ($s0) -/* 9FC750 80241F60 C6200028 */ lwc1 $f0, 0x28($s1) -/* 9FC754 80241F64 C6220030 */ lwc1 $f2, 0x30($s1) -/* 9FC758 80241F68 4600010D */ trunc.w.s $f4, $f0 -/* 9FC75C 80241F6C 44042000 */ mfc1 $a0, $f4 -/* 9FC760 80241F70 4600110D */ trunc.w.s $f4, $f2 -/* 9FC764 80241F74 44052000 */ mfc1 $a1, $f4 -/* 9FC768 80241F78 0C03BCF0 */ jal func_800EF3C0 -/* 9FC76C 80241F7C 00000000 */ nop -/* 9FC770 80241F80 0C03BCF5 */ jal func_800EF3D4 -/* 9FC774 80241F84 0000202D */ daddu $a0, $zero, $zero -/* 9FC778 80241F88 3C0142B4 */ lui $at, 0x42b4 -/* 9FC77C 80241F8C 4481A000 */ mtc1 $at, $f20 -/* 9FC780 80241F90 8E040000 */ lw $a0, ($s0) -/* 9FC784 80241F94 4405A000 */ mfc1 $a1, $f20 -/* 9FC788 80241F98 0C00ECD0 */ jal set_npc_yaw -/* 9FC78C 80241F9C 00000000 */ nop -/* 9FC790 80241FA0 24020002 */ addiu $v0, $zero, 2 -/* 9FC794 80241FA4 E6340080 */ swc1 $f20, 0x80($s1) -/* 9FC798 80241FA8 E6340084 */ swc1 $f20, 0x84($s1) -/* 9FC79C 80241FAC 080907EE */ j .L80241FB8 -/* 9FC7A0 80241FB0 AE2000A8 */ sw $zero, 0xa8($s1) -.L80241FB4: -/* 9FC7A4 80241FB4 0000102D */ daddu $v0, $zero, $zero -.L80241FB8: -/* 9FC7A8 80241FB8 8FBF0018 */ lw $ra, 0x18($sp) -/* 9FC7AC 80241FBC 8FB10014 */ lw $s1, 0x14($sp) -/* 9FC7B0 80241FC0 8FB00010 */ lw $s0, 0x10($sp) -/* 9FC7B4 80241FC4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9FC7B8 80241FC8 03E00008 */ jr $ra -/* 9FC7BC 80241FCC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_13/func_80240230_A00600.s b/asm/nonmatchings/world/area_nok/nok_13/func_80240230_A00600.s deleted file mode 100644 index 70ab430fdf..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_13/func_80240230_A00600.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240230_A00830 -/* A00830 80240230 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* A00834 80240234 AFB3004C */ sw $s3, 0x4c($sp) -/* A00838 80240238 0080982D */ daddu $s3, $a0, $zero -/* A0083C 8024023C AFBF0054 */ sw $ra, 0x54($sp) -/* A00840 80240240 AFB40050 */ sw $s4, 0x50($sp) -/* A00844 80240244 AFB20048 */ sw $s2, 0x48($sp) -/* A00848 80240248 AFB10044 */ sw $s1, 0x44($sp) -/* A0084C 8024024C AFB00040 */ sw $s0, 0x40($sp) -/* A00850 80240250 F7B40058 */ sdc1 $f20, 0x58($sp) -/* A00854 80240254 8E710148 */ lw $s1, 0x148($s3) -/* A00858 80240258 00A0A02D */ daddu $s4, $a1, $zero -/* A0085C 8024025C 86240008 */ lh $a0, 8($s1) -/* A00860 80240260 0C00EABB */ jal get_npc_unsafe -/* A00864 80240264 00C0902D */ daddu $s2, $a2, $zero -/* A00868 80240268 8E830014 */ lw $v1, 0x14($s4) -/* A0086C 8024026C 04600034 */ bltz $v1, .L80240340 -/* A00870 80240270 0040802D */ daddu $s0, $v0, $zero -/* A00874 80240274 8E620074 */ lw $v0, 0x74($s3) -/* A00878 80240278 1C400030 */ bgtz $v0, .L8024033C -/* A0087C 8024027C 2442FFFF */ addiu $v0, $v0, -1 -/* A00880 80240280 0240202D */ daddu $a0, $s2, $zero -/* A00884 80240284 AE630074 */ sw $v1, 0x74($s3) -/* A00888 80240288 AFA00010 */ sw $zero, 0x10($sp) -/* A0088C 8024028C 8E86000C */ lw $a2, 0xc($s4) -/* A00890 80240290 8E870010 */ lw $a3, 0x10($s4) -/* A00894 80240294 0C01242D */ jal func_800490B4 -/* A00898 80240298 0220282D */ daddu $a1, $s1, $zero -/* A0089C 8024029C 10400025 */ beqz $v0, .L80240334 -/* A008A0 802402A0 0000202D */ daddu $a0, $zero, $zero -/* A008A4 802402A4 0200282D */ daddu $a1, $s0, $zero -/* A008A8 802402A8 0000302D */ daddu $a2, $zero, $zero -/* A008AC 802402AC 860300A8 */ lh $v1, 0xa8($s0) -/* A008B0 802402B0 3C013F80 */ lui $at, 0x3f80 -/* A008B4 802402B4 44810000 */ mtc1 $at, $f0 -/* A008B8 802402B8 3C014000 */ lui $at, 0x4000 -/* A008BC 802402BC 44811000 */ mtc1 $at, $f2 -/* A008C0 802402C0 3C01C1A0 */ lui $at, 0xc1a0 -/* A008C4 802402C4 44812000 */ mtc1 $at, $f4 -/* A008C8 802402C8 2402000F */ addiu $v0, $zero, 0xf -/* A008CC 802402CC AFA2001C */ sw $v0, 0x1c($sp) -/* A008D0 802402D0 44835000 */ mtc1 $v1, $f10 -/* A008D4 802402D4 00000000 */ nop -/* A008D8 802402D8 468052A0 */ cvt.s.w $f10, $f10 -/* A008DC 802402DC 44075000 */ mfc1 $a3, $f10 -/* A008E0 802402E0 27A20028 */ addiu $v0, $sp, 0x28 -/* A008E4 802402E4 AFA20020 */ sw $v0, 0x20($sp) -/* A008E8 802402E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* A008EC 802402EC E7A20014 */ swc1 $f2, 0x14($sp) -/* A008F0 802402F0 0C01BFA4 */ jal fx_emote -/* A008F4 802402F4 E7A40018 */ swc1 $f4, 0x18($sp) -/* A008F8 802402F8 0200202D */ daddu $a0, $s0, $zero -/* A008FC 802402FC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A00900 80240300 0C012530 */ jal func_800494C0 -/* A00904 80240304 3C060020 */ lui $a2, 0x20 -/* A00908 80240308 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A0090C 8024030C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A00910 80240310 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A00914 80240314 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A00918 80240318 8C460028 */ lw $a2, 0x28($v0) -/* A0091C 8024031C 0C00A720 */ jal atan2 -/* A00920 80240320 8C470030 */ lw $a3, 0x30($v0) -/* A00924 80240324 2402000C */ addiu $v0, $zero, 0xc -/* A00928 80240328 E600000C */ swc1 $f0, 0xc($s0) -/* A0092C 8024032C 08090151 */ j .L80240544 -/* A00930 80240330 AE620070 */ sw $v0, 0x70($s3) -.L80240334: -/* A00934 80240334 8E620074 */ lw $v0, 0x74($s3) -/* A00938 80240338 2442FFFF */ addiu $v0, $v0, -1 -.L8024033C: -/* A0093C 8024033C AE620074 */ sw $v0, 0x74($s3) -.L80240340: -/* A00940 80240340 C6000018 */ lwc1 $f0, 0x18($s0) -/* A00944 80240344 44801000 */ mtc1 $zero, $f2 -/* A00948 80240348 44801800 */ mtc1 $zero, $f3 -/* A0094C 8024034C 46000021 */ cvt.d.s $f0, $f0 -/* A00950 80240350 4620103C */ c.lt.d $f2, $f0 -/* A00954 80240354 00000000 */ nop -/* A00958 80240358 45000025 */ bc1f .L802403F0 -/* A0095C 8024035C 27A5002C */ addiu $a1, $sp, 0x2c -/* A00960 80240360 C6000038 */ lwc1 $f0, 0x38($s0) -/* A00964 80240364 860200A6 */ lh $v0, 0xa6($s0) -/* A00968 80240368 3C018024 */ lui $at, 0x8024 -/* A0096C 8024036C D42221D0 */ ldc1 $f2, 0x21d0($at) -/* A00970 80240370 27A60030 */ addiu $a2, $sp, 0x30 -/* A00974 80240374 E7A0002C */ swc1 $f0, 0x2c($sp) -/* A00978 80240378 44820000 */ mtc1 $v0, $f0 -/* A0097C 8024037C 00000000 */ nop -/* A00980 80240380 46800020 */ cvt.s.w $f0, $f0 -/* A00984 80240384 46000021 */ cvt.d.s $f0, $f0 -/* A00988 80240388 C604003C */ lwc1 $f4, 0x3c($s0) -/* A0098C 8024038C C6060040 */ lwc1 $f6, 0x40($s0) -/* A00990 80240390 C6080018 */ lwc1 $f8, 0x18($s0) -/* A00994 80240394 860200A8 */ lh $v0, 0xa8($s0) -/* A00998 80240398 46220002 */ mul.d $f0, $f0, $f2 -/* A0099C 8024039C 00000000 */ nop -/* A009A0 802403A0 E7A40030 */ swc1 $f4, 0x30($sp) -/* A009A4 802403A4 E7A60034 */ swc1 $f6, 0x34($sp) -/* A009A8 802403A8 E7A80010 */ swc1 $f8, 0x10($sp) -/* A009AC 802403AC C604000C */ lwc1 $f4, 0xc($s0) -/* A009B0 802403B0 44821000 */ mtc1 $v0, $f2 -/* A009B4 802403B4 00000000 */ nop -/* A009B8 802403B8 468010A0 */ cvt.s.w $f2, $f2 -/* A009BC 802403BC E7A20018 */ swc1 $f2, 0x18($sp) -/* A009C0 802403C0 E7A40014 */ swc1 $f4, 0x14($sp) -/* A009C4 802403C4 46200020 */ cvt.s.d $f0, $f0 -/* A009C8 802403C8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A009CC 802403CC 8E040080 */ lw $a0, 0x80($s0) -/* A009D0 802403D0 0C037711 */ jal func_800DDC44 -/* A009D4 802403D4 27A70034 */ addiu $a3, $sp, 0x34 -/* A009D8 802403D8 54400005 */ bnel $v0, $zero, .L802403F0 -/* A009DC 802403DC AE000018 */ sw $zero, 0x18($s0) -/* A009E0 802403E0 8E050018 */ lw $a1, 0x18($s0) -/* A009E4 802403E4 8E06000C */ lw $a2, 0xc($s0) -/* A009E8 802403E8 0C00EA95 */ jal npc_move_heading -/* A009EC 802403EC 0200202D */ daddu $a0, $s0, $zero -.L802403F0: -/* A009F0 802403F0 C600001C */ lwc1 $f0, 0x1c($s0) -/* A009F4 802403F4 44801000 */ mtc1 $zero, $f2 -/* A009F8 802403F8 44801800 */ mtc1 $zero, $f3 -/* A009FC 802403FC 46000021 */ cvt.d.s $f0, $f0 -/* A00A00 80240400 4622003C */ c.lt.d $f0, $f2 -/* A00A04 80240404 00000000 */ nop -/* A00A08 80240408 45000047 */ bc1f .L80240528 -/* A00A0C 8024040C 27A5002C */ addiu $a1, $sp, 0x2c -/* A00A10 80240410 27A60030 */ addiu $a2, $sp, 0x30 -/* A00A14 80240414 27A20038 */ addiu $v0, $sp, 0x38 -/* A00A18 80240418 C602003C */ lwc1 $f2, 0x3c($s0) -/* A00A1C 8024041C C6060038 */ lwc1 $f6, 0x38($s0) -/* A00A20 80240420 3C01402A */ lui $at, 0x402a -/* A00A24 80240424 4481A800 */ mtc1 $at, $f21 -/* A00A28 80240428 4480A000 */ mtc1 $zero, $f20 -/* A00A2C 8024042C 460010A1 */ cvt.d.s $f2, $f2 -/* A00A30 80240430 46341080 */ add.d $f2, $f2, $f20 -/* A00A34 80240434 C600001C */ lwc1 $f0, 0x1c($s0) -/* A00A38 80240438 C6040040 */ lwc1 $f4, 0x40($s0) -/* A00A3C 8024043C 46000005 */ abs.s $f0, $f0 -/* A00A40 80240440 E7A40034 */ swc1 $f4, 0x34($sp) -/* A00A44 80240444 3C014030 */ lui $at, 0x4030 -/* A00A48 80240448 44812800 */ mtc1 $at, $f5 -/* A00A4C 8024044C 44802000 */ mtc1 $zero, $f4 -/* A00A50 80240450 46000021 */ cvt.d.s $f0, $f0 -/* A00A54 80240454 E7A6002C */ swc1 $f6, 0x2c($sp) -/* A00A58 80240458 46240000 */ add.d $f0, $f0, $f4 -/* A00A5C 8024045C 462010A0 */ cvt.s.d $f2, $f2 -/* A00A60 80240460 E7A20030 */ swc1 $f2, 0x30($sp) -/* A00A64 80240464 46200020 */ cvt.s.d $f0, $f0 -/* A00A68 80240468 E7A00038 */ swc1 $f0, 0x38($sp) -/* A00A6C 8024046C AFA20010 */ sw $v0, 0x10($sp) -/* A00A70 80240470 8E040080 */ lw $a0, 0x80($s0) -/* A00A74 80240474 0C0372DF */ jal func_800DCB7C -/* A00A78 80240478 27A70034 */ addiu $a3, $sp, 0x34 -/* A00A7C 8024047C 1040002A */ beqz $v0, .L80240528 -/* A00A80 80240480 00000000 */ nop -/* A00A84 80240484 C600001C */ lwc1 $f0, 0x1c($s0) -/* A00A88 80240488 C7A20038 */ lwc1 $f2, 0x38($sp) -/* A00A8C 8024048C 46000005 */ abs.s $f0, $f0 -/* A00A90 80240490 46000021 */ cvt.d.s $f0, $f0 -/* A00A94 80240494 46340000 */ add.d $f0, $f0, $f20 -/* A00A98 80240498 460010A1 */ cvt.d.s $f2, $f2 -/* A00A9C 8024049C 4620103E */ c.le.d $f2, $f0 -/* A00AA0 802404A0 00000000 */ nop -/* A00AA4 802404A4 45000020 */ bc1f .L80240528 -/* A00AA8 802404A8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A00AAC 802404AC C7A00030 */ lwc1 $f0, 0x30($sp) -/* A00AB0 802404B0 8E020000 */ lw $v0, ($s0) -/* A00AB4 802404B4 2403F7FF */ addiu $v1, $zero, -0x801 -/* A00AB8 802404B8 AE00001C */ sw $zero, 0x1c($s0) -/* A00ABC 802404BC 00431024 */ and $v0, $v0, $v1 -/* A00AC0 802404C0 AE020000 */ sw $v0, ($s0) -/* A00AC4 802404C4 24020002 */ addiu $v0, $zero, 2 -/* A00AC8 802404C8 E600003C */ swc1 $f0, 0x3c($s0) -/* A00ACC 802404CC 0C00A67F */ jal rand_int -/* A00AD0 802404D0 AE620070 */ sw $v0, 0x70($s3) -/* A00AD4 802404D4 3C035555 */ lui $v1, 0x5555 -/* A00AD8 802404D8 34635556 */ ori $v1, $v1, 0x5556 -/* A00ADC 802404DC 00430018 */ mult $v0, $v1 -/* A00AE0 802404E0 000227C3 */ sra $a0, $v0, 0x1f -/* A00AE4 802404E4 00004010 */ mfhi $t0 -/* A00AE8 802404E8 01042023 */ subu $a0, $t0, $a0 -/* A00AEC 802404EC 00041840 */ sll $v1, $a0, 1 -/* A00AF0 802404F0 00641821 */ addu $v1, $v1, $a0 -/* A00AF4 802404F4 00431023 */ subu $v0, $v0, $v1 -/* A00AF8 802404F8 24430002 */ addiu $v1, $v0, 2 -/* A00AFC 802404FC AE630074 */ sw $v1, 0x74($s3) -/* A00B00 80240500 8E82002C */ lw $v0, 0x2c($s4) -/* A00B04 80240504 5840000F */ blezl $v0, .L80240544 -/* A00B08 80240508 AE600070 */ sw $zero, 0x70($s3) -/* A00B0C 8024050C 8E820004 */ lw $v0, 4($s4) -/* A00B10 80240510 5840000C */ blezl $v0, .L80240544 -/* A00B14 80240514 AE600070 */ sw $zero, 0x70($s3) -/* A00B18 80240518 1460000A */ bnez $v1, .L80240544 -/* A00B1C 8024051C 00000000 */ nop -/* A00B20 80240520 08090151 */ j .L80240544 -/* A00B24 80240524 AE600070 */ sw $zero, 0x70($s3) -.L80240528: -/* A00B28 80240528 C604003C */ lwc1 $f4, 0x3c($s0) -/* A00B2C 8024052C C600001C */ lwc1 $f0, 0x1c($s0) -/* A00B30 80240530 46002100 */ add.s $f4, $f4, $f0 -/* A00B34 80240534 C6020014 */ lwc1 $f2, 0x14($s0) -/* A00B38 80240538 46020001 */ sub.s $f0, $f0, $f2 -/* A00B3C 8024053C E604003C */ swc1 $f4, 0x3c($s0) -/* A00B40 80240540 E600001C */ swc1 $f0, 0x1c($s0) -.L80240544: -/* A00B44 80240544 8FBF0054 */ lw $ra, 0x54($sp) -/* A00B48 80240548 8FB40050 */ lw $s4, 0x50($sp) -/* A00B4C 8024054C 8FB3004C */ lw $s3, 0x4c($sp) -/* A00B50 80240550 8FB20048 */ lw $s2, 0x48($sp) -/* A00B54 80240554 8FB10044 */ lw $s1, 0x44($sp) -/* A00B58 80240558 8FB00040 */ lw $s0, 0x40($sp) -/* A00B5C 8024055C D7B40058 */ ldc1 $f20, 0x58($sp) -/* A00B60 80240560 03E00008 */ jr $ra -/* A00B64 80240564 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_nok/nok_13/func_80240568_A00600.s b/asm/nonmatchings/world/area_nok/nok_13/func_80240568_A00600.s deleted file mode 100644 index 9cc04efa17..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_13/func_80240568_A00600.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_A00B68 -/* A00B68 80240568 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A00B6C 8024056C AFB3001C */ sw $s3, 0x1c($sp) -/* A00B70 80240570 0080982D */ daddu $s3, $a0, $zero -/* A00B74 80240574 AFBF0020 */ sw $ra, 0x20($sp) -/* A00B78 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* A00B7C 8024057C AFB10014 */ sw $s1, 0x14($sp) -/* A00B80 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* A00B84 80240584 8E720148 */ lw $s2, 0x148($s3) -/* A00B88 80240588 86440008 */ lh $a0, 8($s2) -/* A00B8C 8024058C 0C00EABB */ jal get_npc_unsafe -/* A00B90 80240590 00A0882D */ daddu $s1, $a1, $zero -/* A00B94 80240594 8E240008 */ lw $a0, 8($s1) -/* A00B98 80240598 0040802D */ daddu $s0, $v0, $zero -/* A00B9C 8024059C 00041FC2 */ srl $v1, $a0, 0x1f -/* A00BA0 802405A0 00832021 */ addu $a0, $a0, $v1 -/* A00BA4 802405A4 00042043 */ sra $a0, $a0, 1 -/* A00BA8 802405A8 0C00A67F */ jal rand_int -/* A00BAC 802405AC 24840001 */ addiu $a0, $a0, 1 -/* A00BB0 802405B0 8E230008 */ lw $v1, 8($s1) -/* A00BB4 802405B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* A00BB8 802405B8 00032FC2 */ srl $a1, $v1, 0x1f -/* A00BBC 802405BC 00651821 */ addu $v1, $v1, $a1 -/* A00BC0 802405C0 00031843 */ sra $v1, $v1, 1 -/* A00BC4 802405C4 00621821 */ addu $v1, $v1, $v0 -/* A00BC8 802405C8 0C00A67F */ jal rand_int -/* A00BCC 802405CC A603008E */ sh $v1, 0x8e($s0) -/* A00BD0 802405D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* A00BD4 802405D4 44820000 */ mtc1 $v0, $f0 -/* A00BD8 802405D8 00000000 */ nop -/* A00BDC 802405DC 46800020 */ cvt.s.w $f0, $f0 -/* A00BE0 802405E0 46006300 */ add.s $f12, $f12, $f0 -/* A00BE4 802405E4 3C0142B4 */ lui $at, 0x42b4 -/* A00BE8 802405E8 44810000 */ mtc1 $at, $f0 -/* A00BEC 802405EC 0C00A6C9 */ jal clamp_angle -/* A00BF0 802405F0 46006301 */ sub.s $f12, $f12, $f0 -/* A00BF4 802405F4 E600000C */ swc1 $f0, 0xc($s0) -/* A00BF8 802405F8 8E4200CC */ lw $v0, 0xcc($s2) -/* A00BFC 802405FC 8C420000 */ lw $v0, ($v0) -/* A00C00 80240600 AE020028 */ sw $v0, 0x28($s0) -/* A00C04 80240604 24020003 */ addiu $v0, $zero, 3 -/* A00C08 80240608 AE620070 */ sw $v0, 0x70($s3) -/* A00C0C 8024060C 8FBF0020 */ lw $ra, 0x20($sp) -/* A00C10 80240610 8FB3001C */ lw $s3, 0x1c($sp) -/* A00C14 80240614 8FB20018 */ lw $s2, 0x18($sp) -/* A00C18 80240618 8FB10014 */ lw $s1, 0x14($sp) -/* A00C1C 8024061C 8FB00010 */ lw $s0, 0x10($sp) -/* A00C20 80240620 03E00008 */ jr $ra -/* A00C24 80240624 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_13/func_80240628_A00600.s b/asm/nonmatchings/world/area_nok/nok_13/func_80240628_A00600.s deleted file mode 100644 index 23ae9da1d3..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_13/func_80240628_A00600.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240628_A00C28 -/* A00C28 80240628 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A00C2C 8024062C AFB40040 */ sw $s4, 0x40($sp) -/* A00C30 80240630 0080A02D */ daddu $s4, $a0, $zero -/* A00C34 80240634 AFBF0044 */ sw $ra, 0x44($sp) -/* A00C38 80240638 AFB3003C */ sw $s3, 0x3c($sp) -/* A00C3C 8024063C AFB20038 */ sw $s2, 0x38($sp) -/* A00C40 80240640 AFB10034 */ sw $s1, 0x34($sp) -/* A00C44 80240644 AFB00030 */ sw $s0, 0x30($sp) -/* A00C48 80240648 8E920148 */ lw $s2, 0x148($s4) -/* A00C4C 8024064C 00A0882D */ daddu $s1, $a1, $zero -/* A00C50 80240650 86440008 */ lh $a0, 8($s2) -/* A00C54 80240654 0C00EABB */ jal get_npc_unsafe -/* A00C58 80240658 00C0982D */ daddu $s3, $a2, $zero -/* A00C5C 8024065C 8E230014 */ lw $v1, 0x14($s1) -/* A00C60 80240660 0460002D */ bltz $v1, .L80240718 -/* A00C64 80240664 0040802D */ daddu $s0, $v0, $zero -/* A00C68 80240668 0260202D */ daddu $a0, $s3, $zero -/* A00C6C 8024066C AFA00010 */ sw $zero, 0x10($sp) -/* A00C70 80240670 8E260024 */ lw $a2, 0x24($s1) -/* A00C74 80240674 8E270028 */ lw $a3, 0x28($s1) -/* A00C78 80240678 0C01242D */ jal func_800490B4 -/* A00C7C 8024067C 0240282D */ daddu $a1, $s2, $zero -/* A00C80 80240680 10400025 */ beqz $v0, .L80240718 -/* A00C84 80240684 0000202D */ daddu $a0, $zero, $zero -/* A00C88 80240688 0200282D */ daddu $a1, $s0, $zero -/* A00C8C 8024068C 0000302D */ daddu $a2, $zero, $zero -/* A00C90 80240690 860300A8 */ lh $v1, 0xa8($s0) -/* A00C94 80240694 3C013F80 */ lui $at, 0x3f80 -/* A00C98 80240698 44810000 */ mtc1 $at, $f0 -/* A00C9C 8024069C 3C014000 */ lui $at, 0x4000 -/* A00CA0 802406A0 44811000 */ mtc1 $at, $f2 -/* A00CA4 802406A4 3C01C1A0 */ lui $at, 0xc1a0 -/* A00CA8 802406A8 44812000 */ mtc1 $at, $f4 -/* A00CAC 802406AC 2402000F */ addiu $v0, $zero, 0xf -/* A00CB0 802406B0 AFA2001C */ sw $v0, 0x1c($sp) -/* A00CB4 802406B4 44833000 */ mtc1 $v1, $f6 -/* A00CB8 802406B8 00000000 */ nop -/* A00CBC 802406BC 468031A0 */ cvt.s.w $f6, $f6 -/* A00CC0 802406C0 44073000 */ mfc1 $a3, $f6 -/* A00CC4 802406C4 27A20028 */ addiu $v0, $sp, 0x28 -/* A00CC8 802406C8 AFA20020 */ sw $v0, 0x20($sp) -/* A00CCC 802406CC E7A00010 */ swc1 $f0, 0x10($sp) -/* A00CD0 802406D0 E7A20014 */ swc1 $f2, 0x14($sp) -/* A00CD4 802406D4 0C01BFA4 */ jal fx_emote -/* A00CD8 802406D8 E7A40018 */ swc1 $f4, 0x18($sp) -/* A00CDC 802406DC 0200202D */ daddu $a0, $s0, $zero -/* A00CE0 802406E0 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A00CE4 802406E4 0C012530 */ jal func_800494C0 -/* A00CE8 802406E8 3C060020 */ lui $a2, 0x20 -/* A00CEC 802406EC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A00CF0 802406F0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A00CF4 802406F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A00CF8 802406F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A00CFC 802406FC 8C460028 */ lw $a2, 0x28($v0) -/* A00D00 80240700 0C00A720 */ jal atan2 -/* A00D04 80240704 8C470030 */ lw $a3, 0x30($v0) -/* A00D08 80240708 2402000C */ addiu $v0, $zero, 0xc -/* A00D0C 8024070C E600000C */ swc1 $f0, 0xc($s0) -/* A00D10 80240710 080901EB */ j .L802407AC -/* A00D14 80240714 AE820070 */ sw $v0, 0x70($s4) -.L80240718: -/* A00D18 80240718 8602008C */ lh $v0, 0x8c($s0) -/* A00D1C 8024071C 14400023 */ bnez $v0, .L802407AC -/* A00D20 80240720 00000000 */ nop -/* A00D24 80240724 9602008E */ lhu $v0, 0x8e($s0) -/* A00D28 80240728 2442FFFF */ addiu $v0, $v0, -1 -/* A00D2C 8024072C A602008E */ sh $v0, 0x8e($s0) -/* A00D30 80240730 00021400 */ sll $v0, $v0, 0x10 -/* A00D34 80240734 1C40001D */ bgtz $v0, .L802407AC -/* A00D38 80240738 00000000 */ nop -/* A00D3C 8024073C 8E820074 */ lw $v0, 0x74($s4) -/* A00D40 80240740 2442FFFF */ addiu $v0, $v0, -1 -/* A00D44 80240744 18400018 */ blez $v0, .L802407A8 -/* A00D48 80240748 AE820074 */ sw $v0, 0x74($s4) -/* A00D4C 8024074C C600000C */ lwc1 $f0, 0xc($s0) -/* A00D50 80240750 3C014334 */ lui $at, 0x4334 -/* A00D54 80240754 44816000 */ mtc1 $at, $f12 -/* A00D58 80240758 0C00A6C9 */ jal clamp_angle -/* A00D5C 8024075C 460C0300 */ add.s $f12, $f0, $f12 -/* A00D60 80240760 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A00D64 80240764 0C00A67F */ jal rand_int -/* A00D68 80240768 E600000C */ swc1 $f0, 0xc($s0) -/* A00D6C 8024076C 3C032E8B */ lui $v1, 0x2e8b -/* A00D70 80240770 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* A00D74 80240774 00430018 */ mult $v0, $v1 -/* A00D78 80240778 00021FC3 */ sra $v1, $v0, 0x1f -/* A00D7C 8024077C 00004010 */ mfhi $t0 -/* A00D80 80240780 00082043 */ sra $a0, $t0, 1 -/* A00D84 80240784 00832023 */ subu $a0, $a0, $v1 -/* A00D88 80240788 00041840 */ sll $v1, $a0, 1 -/* A00D8C 8024078C 00641821 */ addu $v1, $v1, $a0 -/* A00D90 80240790 00031880 */ sll $v1, $v1, 2 -/* A00D94 80240794 00641823 */ subu $v1, $v1, $a0 -/* A00D98 80240798 00431023 */ subu $v0, $v0, $v1 -/* A00D9C 8024079C 24420005 */ addiu $v0, $v0, 5 -/* A00DA0 802407A0 080901EB */ j .L802407AC -/* A00DA4 802407A4 A602008E */ sh $v0, 0x8e($s0) -.L802407A8: -/* A00DA8 802407A8 AE800070 */ sw $zero, 0x70($s4) -.L802407AC: -/* A00DAC 802407AC 8FBF0044 */ lw $ra, 0x44($sp) -/* A00DB0 802407B0 8FB40040 */ lw $s4, 0x40($sp) -/* A00DB4 802407B4 8FB3003C */ lw $s3, 0x3c($sp) -/* A00DB8 802407B8 8FB20038 */ lw $s2, 0x38($sp) -/* A00DBC 802407BC 8FB10034 */ lw $s1, 0x34($sp) -/* A00DC0 802407C0 8FB00030 */ lw $s0, 0x30($sp) -/* A00DC4 802407C4 03E00008 */ jr $ra -/* A00DC8 802407C8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_13/func_802407CC_A00600.s b/asm/nonmatchings/world/area_nok/nok_13/func_802407CC_A00600.s deleted file mode 100644 index f6c8c9d38c..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_13/func_802407CC_A00600.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407CC_A00DCC -/* A00DCC 802407CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A00DD0 802407D0 AFB10014 */ sw $s1, 0x14($sp) -/* A00DD4 802407D4 0080882D */ daddu $s1, $a0, $zero -/* A00DD8 802407D8 AFBF001C */ sw $ra, 0x1c($sp) -/* A00DDC 802407DC AFB20018 */ sw $s2, 0x18($sp) -/* A00DE0 802407E0 AFB00010 */ sw $s0, 0x10($sp) -/* A00DE4 802407E4 8E220148 */ lw $v0, 0x148($s1) -/* A00DE8 802407E8 00A0902D */ daddu $s2, $a1, $zero -/* A00DEC 802407EC 84440008 */ lh $a0, 8($v0) -/* A00DF0 802407F0 0C00EABB */ jal get_npc_unsafe -/* A00DF4 802407F4 00C0802D */ daddu $s0, $a2, $zero -/* A00DF8 802407F8 0220202D */ daddu $a0, $s1, $zero -/* A00DFC 802407FC 0240282D */ daddu $a1, $s2, $zero -/* A00E00 80240800 0200302D */ daddu $a2, $s0, $zero -/* A00E04 80240804 0C0127DF */ jal func_80049F7C -/* A00E08 80240808 0040802D */ daddu $s0, $v0, $zero -/* A00E0C 8024080C 8E020000 */ lw $v0, ($s0) -/* A00E10 80240810 24040005 */ addiu $a0, $zero, 5 -/* A00E14 80240814 34420800 */ ori $v0, $v0, 0x800 -/* A00E18 80240818 0C00A67F */ jal rand_int -/* A00E1C 8024081C AE020000 */ sw $v0, ($s0) -/* A00E20 80240820 44820000 */ mtc1 $v0, $f0 -/* A00E24 80240824 00000000 */ nop -/* A00E28 80240828 46800021 */ cvt.d.w $f0, $f0 -/* A00E2C 8024082C 3C014024 */ lui $at, 0x4024 -/* A00E30 80240830 44811800 */ mtc1 $at, $f3 -/* A00E34 80240834 44801000 */ mtc1 $zero, $f2 -/* A00E38 80240838 3C013FC0 */ lui $at, 0x3fc0 -/* A00E3C 8024083C 44812000 */ mtc1 $at, $f4 -/* A00E40 80240840 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A00E44 80240844 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A00E48 80240848 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A00E4C 8024084C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A00E50 80240850 46220000 */ add.d $f0, $f0, $f2 -/* A00E54 80240854 E6040014 */ swc1 $f4, 0x14($s0) -/* A00E58 80240858 46200020 */ cvt.s.d $f0, $f0 -/* A00E5C 8024085C E600001C */ swc1 $f0, 0x1c($s0) -/* A00E60 80240860 8C460028 */ lw $a2, 0x28($v0) -/* A00E64 80240864 0C00A720 */ jal atan2 -/* A00E68 80240868 8C470030 */ lw $a3, 0x30($v0) -/* A00E6C 8024086C 0200202D */ daddu $a0, $s0, $zero -/* A00E70 80240870 3C05B000 */ lui $a1, 0xb000 -/* A00E74 80240874 34A50017 */ ori $a1, $a1, 0x17 -/* A00E78 80240878 0000302D */ daddu $a2, $zero, $zero -/* A00E7C 8024087C E480000C */ swc1 $f0, 0xc($a0) -/* A00E80 80240880 C6400018 */ lwc1 $f0, 0x18($s2) -/* A00E84 80240884 2402000D */ addiu $v0, $zero, 0xd -/* A00E88 80240888 E4800018 */ swc1 $f0, 0x18($a0) -/* A00E8C 8024088C 0C012530 */ jal func_800494C0 -/* A00E90 80240890 AE220070 */ sw $v0, 0x70($s1) -/* A00E94 80240894 8FBF001C */ lw $ra, 0x1c($sp) -/* A00E98 80240898 8FB20018 */ lw $s2, 0x18($sp) -/* A00E9C 8024089C 8FB10014 */ lw $s1, 0x14($sp) -/* A00EA0 802408A0 8FB00010 */ lw $s0, 0x10($sp) -/* A00EA4 802408A4 03E00008 */ jr $ra -/* A00EA8 802408A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_13/func_802408AC_A00600.s b/asm/nonmatchings/world/area_nok/nok_13/func_802408AC_A00600.s deleted file mode 100644 index 1a00de3a80..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_13/func_802408AC_A00600.s +++ /dev/null @@ -1,200 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408AC_A00EAC -/* A00EAC 802408AC 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A00EB0 802408B0 AFB40050 */ sw $s4, 0x50($sp) -/* A00EB4 802408B4 0080A02D */ daddu $s4, $a0, $zero -/* A00EB8 802408B8 AFBF0060 */ sw $ra, 0x60($sp) -/* A00EBC 802408BC AFB7005C */ sw $s7, 0x5c($sp) -/* A00EC0 802408C0 AFB60058 */ sw $s6, 0x58($sp) -/* A00EC4 802408C4 AFB50054 */ sw $s5, 0x54($sp) -/* A00EC8 802408C8 AFB3004C */ sw $s3, 0x4c($sp) -/* A00ECC 802408CC AFB20048 */ sw $s2, 0x48($sp) -/* A00ED0 802408D0 AFB10044 */ sw $s1, 0x44($sp) -/* A00ED4 802408D4 AFB00040 */ sw $s0, 0x40($sp) -/* A00ED8 802408D8 F7B40068 */ sdc1 $f20, 0x68($sp) -/* A00EDC 802408DC 8E950148 */ lw $s5, 0x148($s4) -/* A00EE0 802408E0 00A0B02D */ daddu $s6, $a1, $zero -/* A00EE4 802408E4 86A40008 */ lh $a0, 8($s5) -/* A00EE8 802408E8 0C00EABB */ jal get_npc_unsafe -/* A00EEC 802408EC 00C0B82D */ daddu $s7, $a2, $zero -/* A00EF0 802408F0 0040982D */ daddu $s3, $v0, $zero -/* A00EF4 802408F4 C6600018 */ lwc1 $f0, 0x18($s3) -/* A00EF8 802408F8 44801000 */ mtc1 $zero, $f2 -/* A00EFC 802408FC 44801800 */ mtc1 $zero, $f3 -/* A00F00 80240900 46000021 */ cvt.d.s $f0, $f0 -/* A00F04 80240904 4620103C */ c.lt.d $f2, $f0 -/* A00F08 80240908 00000000 */ nop -/* A00F0C 8024090C 45000021 */ bc1f .L80240994 -/* A00F10 80240910 27A50028 */ addiu $a1, $sp, 0x28 -/* A00F14 80240914 C6600038 */ lwc1 $f0, 0x38($s3) -/* A00F18 80240918 C662003C */ lwc1 $f2, 0x3c($s3) -/* A00F1C 8024091C C6640040 */ lwc1 $f4, 0x40($s3) -/* A00F20 80240920 C6660018 */ lwc1 $f6, 0x18($s3) -/* A00F24 80240924 E7A00028 */ swc1 $f0, 0x28($sp) -/* A00F28 80240928 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A00F2C 8024092C E7A40030 */ swc1 $f4, 0x30($sp) -/* A00F30 80240930 E7A60010 */ swc1 $f6, 0x10($sp) -/* A00F34 80240934 C660000C */ lwc1 $f0, 0xc($s3) -/* A00F38 80240938 E7A00014 */ swc1 $f0, 0x14($sp) -/* A00F3C 8024093C 866200A8 */ lh $v0, 0xa8($s3) -/* A00F40 80240940 44820000 */ mtc1 $v0, $f0 -/* A00F44 80240944 00000000 */ nop -/* A00F48 80240948 46800020 */ cvt.s.w $f0, $f0 -/* A00F4C 8024094C E7A00018 */ swc1 $f0, 0x18($sp) -/* A00F50 80240950 866200A6 */ lh $v0, 0xa6($s3) -/* A00F54 80240954 27A6002C */ addiu $a2, $sp, 0x2c -/* A00F58 80240958 44820000 */ mtc1 $v0, $f0 -/* A00F5C 8024095C 00000000 */ nop -/* A00F60 80240960 46800020 */ cvt.s.w $f0, $f0 -/* A00F64 80240964 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A00F68 80240968 8E640080 */ lw $a0, 0x80($s3) -/* A00F6C 8024096C 0C037711 */ jal func_800DDC44 -/* A00F70 80240970 27A70030 */ addiu $a3, $sp, 0x30 -/* A00F74 80240974 10400003 */ beqz $v0, .L80240984 -/* A00F78 80240978 00000000 */ nop -/* A00F7C 8024097C 08090265 */ j .L80240994 -/* A00F80 80240980 AE600018 */ sw $zero, 0x18($s3) -.L80240984: -/* A00F84 80240984 8E650018 */ lw $a1, 0x18($s3) -/* A00F88 80240988 8E66000C */ lw $a2, 0xc($s3) -/* A00F8C 8024098C 0C00EA95 */ jal npc_move_heading -/* A00F90 80240990 0260202D */ daddu $a0, $s3, $zero -.L80240994: -/* A00F94 80240994 C660001C */ lwc1 $f0, 0x1c($s3) -/* A00F98 80240998 44801000 */ mtc1 $zero, $f2 -/* A00F9C 8024099C 44801800 */ mtc1 $zero, $f3 -/* A00FA0 802409A0 46000021 */ cvt.d.s $f0, $f0 -/* A00FA4 802409A4 4622003C */ c.lt.d $f0, $f2 -/* A00FA8 802409A8 00000000 */ nop -/* A00FAC 802409AC 4500006C */ bc1f .L80240B60 -/* A00FB0 802409B0 27B00028 */ addiu $s0, $sp, 0x28 -/* A00FB4 802409B4 0200282D */ daddu $a1, $s0, $zero -/* A00FB8 802409B8 27A60034 */ addiu $a2, $sp, 0x34 -/* A00FBC 802409BC 27B20038 */ addiu $s2, $sp, 0x38 -/* A00FC0 802409C0 C6600038 */ lwc1 $f0, 0x38($s3) -/* A00FC4 802409C4 3C0142C8 */ lui $at, 0x42c8 -/* A00FC8 802409C8 44811000 */ mtc1 $at, $f2 -/* A00FCC 802409CC C6640040 */ lwc1 $f4, 0x40($s3) -/* A00FD0 802409D0 3C01447A */ lui $at, 0x447a -/* A00FD4 802409D4 44813000 */ mtc1 $at, $f6 -/* A00FD8 802409D8 27B10030 */ addiu $s1, $sp, 0x30 -/* A00FDC 802409DC E7A00028 */ swc1 $f0, 0x28($sp) -/* A00FE0 802409E0 E7A20034 */ swc1 $f2, 0x34($sp) -/* A00FE4 802409E4 E7A40030 */ swc1 $f4, 0x30($sp) -/* A00FE8 802409E8 E7A60038 */ swc1 $f6, 0x38($sp) -/* A00FEC 802409EC AFB20010 */ sw $s2, 0x10($sp) -/* A00FF0 802409F0 8E640080 */ lw $a0, 0x80($s3) -/* A00FF4 802409F4 0C0372DF */ jal func_800DCB7C -/* A00FF8 802409F8 0220382D */ daddu $a3, $s1, $zero -/* A00FFC 802409FC 0200282D */ daddu $a1, $s0, $zero -/* A01000 80240A00 27A6002C */ addiu $a2, $sp, 0x2c -/* A01004 80240A04 C662003C */ lwc1 $f2, 0x3c($s3) -/* A01008 80240A08 C6660038 */ lwc1 $f6, 0x38($s3) -/* A0100C 80240A0C 3C01402A */ lui $at, 0x402a -/* A01010 80240A10 4481A800 */ mtc1 $at, $f21 -/* A01014 80240A14 4480A000 */ mtc1 $zero, $f20 -/* A01018 80240A18 460010A1 */ cvt.d.s $f2, $f2 -/* A0101C 80240A1C 46341080 */ add.d $f2, $f2, $f20 -/* A01020 80240A20 C660001C */ lwc1 $f0, 0x1c($s3) -/* A01024 80240A24 C6640040 */ lwc1 $f4, 0x40($s3) -/* A01028 80240A28 46000005 */ abs.s $f0, $f0 -/* A0102C 80240A2C E7A40030 */ swc1 $f4, 0x30($sp) -/* A01030 80240A30 3C014030 */ lui $at, 0x4030 -/* A01034 80240A34 44812800 */ mtc1 $at, $f5 -/* A01038 80240A38 44802000 */ mtc1 $zero, $f4 -/* A0103C 80240A3C 46000021 */ cvt.d.s $f0, $f0 -/* A01040 80240A40 E7A60028 */ swc1 $f6, 0x28($sp) -/* A01044 80240A44 46240000 */ add.d $f0, $f0, $f4 -/* A01048 80240A48 462010A0 */ cvt.s.d $f2, $f2 -/* A0104C 80240A4C E7A2002C */ swc1 $f2, 0x2c($sp) -/* A01050 80240A50 46200020 */ cvt.s.d $f0, $f0 -/* A01054 80240A54 E7A00038 */ swc1 $f0, 0x38($sp) -/* A01058 80240A58 AFB20010 */ sw $s2, 0x10($sp) -/* A0105C 80240A5C 8E640080 */ lw $a0, 0x80($s3) -/* A01060 80240A60 0C0372DF */ jal func_800DCB7C -/* A01064 80240A64 0220382D */ daddu $a3, $s1, $zero -/* A01068 80240A68 1040003D */ beqz $v0, .L80240B60 -/* A0106C 80240A6C 00000000 */ nop -/* A01070 80240A70 C660001C */ lwc1 $f0, 0x1c($s3) -/* A01074 80240A74 C7A20038 */ lwc1 $f2, 0x38($sp) -/* A01078 80240A78 46000005 */ abs.s $f0, $f0 -/* A0107C 80240A7C 46000021 */ cvt.d.s $f0, $f0 -/* A01080 80240A80 46340000 */ add.d $f0, $f0, $f20 -/* A01084 80240A84 460010A1 */ cvt.d.s $f2, $f2 -/* A01088 80240A88 4620103E */ c.le.d $f2, $f0 -/* A0108C 80240A8C 00000000 */ nop -/* A01090 80240A90 45000033 */ bc1f .L80240B60 -/* A01094 80240A94 2403F7FF */ addiu $v1, $zero, -0x801 -/* A01098 80240A98 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A0109C 80240A9C 8E620000 */ lw $v0, ($s3) -/* A010A0 80240AA0 AE60001C */ sw $zero, 0x1c($s3) -/* A010A4 80240AA4 00431024 */ and $v0, $v0, $v1 -/* A010A8 80240AA8 E660003C */ swc1 $f0, 0x3c($s3) -/* A010AC 80240AAC AE620000 */ sw $v0, ($s3) -/* A010B0 80240AB0 AFA00010 */ sw $zero, 0x10($sp) -/* A010B4 80240AB4 AFA00014 */ sw $zero, 0x14($sp) -/* A010B8 80240AB8 8E650038 */ lw $a1, 0x38($s3) -/* A010BC 80240ABC 8E66003C */ lw $a2, 0x3c($s3) -/* A010C0 80240AC0 8E670040 */ lw $a3, 0x40($s3) -/* A010C4 80240AC4 0C01BECC */ jal fx_walk_normal -/* A010C8 80240AC8 24040002 */ addiu $a0, $zero, 2 -/* A010CC 80240ACC 02E0202D */ daddu $a0, $s7, $zero -/* A010D0 80240AD0 2402000C */ addiu $v0, $zero, 0xc -/* A010D4 80240AD4 AE820070 */ sw $v0, 0x70($s4) -/* A010D8 80240AD8 24020001 */ addiu $v0, $zero, 1 -/* A010DC 80240ADC AFA20010 */ sw $v0, 0x10($sp) -/* A010E0 80240AE0 8EC60024 */ lw $a2, 0x24($s6) -/* A010E4 80240AE4 8EC70028 */ lw $a3, 0x28($s6) -/* A010E8 80240AE8 0C01242D */ jal func_800490B4 -/* A010EC 80240AEC 02A0282D */ daddu $a1, $s5, $zero -/* A010F0 80240AF0 14400022 */ bnez $v0, .L80240B7C -/* A010F4 80240AF4 24040002 */ addiu $a0, $zero, 2 -/* A010F8 80240AF8 0260282D */ daddu $a1, $s3, $zero -/* A010FC 80240AFC 0000302D */ daddu $a2, $zero, $zero -/* A01100 80240B00 866300A8 */ lh $v1, 0xa8($s3) -/* A01104 80240B04 3C013F80 */ lui $at, 0x3f80 -/* A01108 80240B08 44810000 */ mtc1 $at, $f0 -/* A0110C 80240B0C 3C014000 */ lui $at, 0x4000 -/* A01110 80240B10 44811000 */ mtc1 $at, $f2 -/* A01114 80240B14 3C01C1A0 */ lui $at, 0xc1a0 -/* A01118 80240B18 44812000 */ mtc1 $at, $f4 -/* A0111C 80240B1C 2402000F */ addiu $v0, $zero, 0xf -/* A01120 80240B20 AFA2001C */ sw $v0, 0x1c($sp) -/* A01124 80240B24 44834000 */ mtc1 $v1, $f8 -/* A01128 80240B28 00000000 */ nop -/* A0112C 80240B2C 46804220 */ cvt.s.w $f8, $f8 -/* A01130 80240B30 44074000 */ mfc1 $a3, $f8 -/* A01134 80240B34 27A2003C */ addiu $v0, $sp, 0x3c -/* A01138 80240B38 AFA20020 */ sw $v0, 0x20($sp) -/* A0113C 80240B3C E7A00010 */ swc1 $f0, 0x10($sp) -/* A01140 80240B40 E7A20014 */ swc1 $f2, 0x14($sp) -/* A01144 80240B44 0C01BFA4 */ jal fx_emote -/* A01148 80240B48 E7A40018 */ swc1 $f4, 0x18($sp) -/* A0114C 80240B4C 24020019 */ addiu $v0, $zero, 0x19 -/* A01150 80240B50 A662008E */ sh $v0, 0x8e($s3) -/* A01154 80240B54 2402000E */ addiu $v0, $zero, 0xe -/* A01158 80240B58 080902DF */ j .L80240B7C -/* A0115C 80240B5C AE820070 */ sw $v0, 0x70($s4) -.L80240B60: -/* A01160 80240B60 C664003C */ lwc1 $f4, 0x3c($s3) -/* A01164 80240B64 C660001C */ lwc1 $f0, 0x1c($s3) -/* A01168 80240B68 46002100 */ add.s $f4, $f4, $f0 -/* A0116C 80240B6C C6620014 */ lwc1 $f2, 0x14($s3) -/* A01170 80240B70 46020001 */ sub.s $f0, $f0, $f2 -/* A01174 80240B74 E664003C */ swc1 $f4, 0x3c($s3) -/* A01178 80240B78 E660001C */ swc1 $f0, 0x1c($s3) -.L80240B7C: -/* A0117C 80240B7C 8FBF0060 */ lw $ra, 0x60($sp) -/* A01180 80240B80 8FB7005C */ lw $s7, 0x5c($sp) -/* A01184 80240B84 8FB60058 */ lw $s6, 0x58($sp) -/* A01188 80240B88 8FB50054 */ lw $s5, 0x54($sp) -/* A0118C 80240B8C 8FB40050 */ lw $s4, 0x50($sp) -/* A01190 80240B90 8FB3004C */ lw $s3, 0x4c($sp) -/* A01194 80240B94 8FB20048 */ lw $s2, 0x48($sp) -/* A01198 80240B98 8FB10044 */ lw $s1, 0x44($sp) -/* A0119C 80240B9C 8FB00040 */ lw $s0, 0x40($sp) -/* A011A0 80240BA0 D7B40068 */ ldc1 $f20, 0x68($sp) -/* A011A4 80240BA4 03E00008 */ jr $ra -/* A011A8 80240BA8 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_nok/nok_13/func_80240BAC_A00600.s b/asm/nonmatchings/world/area_nok/nok_13/func_80240BAC_A00600.s deleted file mode 100644 index 5ab0fa61d1..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_13/func_80240BAC_A00600.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BAC_A011AC -/* A011AC 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A011B0 80240BB0 AFB00010 */ sw $s0, 0x10($sp) -/* A011B4 80240BB4 0080802D */ daddu $s0, $a0, $zero -/* A011B8 80240BB8 AFBF0014 */ sw $ra, 0x14($sp) -/* A011BC 80240BBC 8E020148 */ lw $v0, 0x148($s0) -/* A011C0 80240BC0 0C00EABB */ jal get_npc_unsafe -/* A011C4 80240BC4 84440008 */ lh $a0, 8($v0) -/* A011C8 80240BC8 9443008E */ lhu $v1, 0x8e($v0) -/* A011CC 80240BCC 2463FFFF */ addiu $v1, $v1, -1 -/* A011D0 80240BD0 A443008E */ sh $v1, 0x8e($v0) -/* A011D4 80240BD4 00031C00 */ sll $v1, $v1, 0x10 -/* A011D8 80240BD8 58600001 */ blezl $v1, .L80240BE0 -/* A011DC 80240BDC AE000070 */ sw $zero, 0x70($s0) -.L80240BE0: -/* A011E0 80240BE0 8FBF0014 */ lw $ra, 0x14($sp) -/* A011E4 80240BE4 8FB00010 */ lw $s0, 0x10($sp) -/* A011E8 80240BE8 03E00008 */ jr $ra -/* A011EC 80240BEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_13/func_80240BF0_A00600.s b/asm/nonmatchings/world/area_nok/nok_13/func_80240BF0_A00600.s deleted file mode 100644 index f12a72bf3f..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_13/func_80240BF0_A00600.s +++ /dev/null @@ -1,148 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BF0_A011F0 -/* A011F0 80240BF0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A011F4 80240BF4 AFB3003C */ sw $s3, 0x3c($sp) -/* A011F8 80240BF8 0080982D */ daddu $s3, $a0, $zero -/* A011FC 80240BFC AFBF0048 */ sw $ra, 0x48($sp) -/* A01200 80240C00 AFB50044 */ sw $s5, 0x44($sp) -/* A01204 80240C04 AFB40040 */ sw $s4, 0x40($sp) -/* A01208 80240C08 AFB20038 */ sw $s2, 0x38($sp) -/* A0120C 80240C0C AFB10034 */ sw $s1, 0x34($sp) -/* A01210 80240C10 AFB00030 */ sw $s0, 0x30($sp) -/* A01214 80240C14 8E720148 */ lw $s2, 0x148($s3) -/* A01218 80240C18 86440008 */ lh $a0, 8($s2) -/* A0121C 80240C1C 8E70000C */ lw $s0, 0xc($s3) -/* A01220 80240C20 0C00EABB */ jal get_npc_unsafe -/* A01224 80240C24 00A0882D */ daddu $s1, $a1, $zero -/* A01228 80240C28 8E050000 */ lw $a1, ($s0) -/* A0122C 80240C2C 26100004 */ addiu $s0, $s0, 4 -/* A01230 80240C30 0260202D */ daddu $a0, $s3, $zero -/* A01234 80240C34 0C0B1EAF */ jal get_variable -/* A01238 80240C38 0040A82D */ daddu $s5, $v0, $zero -/* A0123C 80240C3C 0260202D */ daddu $a0, $s3, $zero -/* A01240 80240C40 8E050000 */ lw $a1, ($s0) -/* A01244 80240C44 0C0B1EAF */ jal get_variable -/* A01248 80240C48 0040A02D */ daddu $s4, $v0, $zero -/* A0124C 80240C4C AE420094 */ sw $v0, 0x94($s2) -/* A01250 80240C50 AFA00010 */ sw $zero, 0x10($sp) -/* A01254 80240C54 8E4200D0 */ lw $v0, 0xd0($s2) -/* A01258 80240C58 8C420030 */ lw $v0, 0x30($v0) -/* A0125C 80240C5C AFA20014 */ sw $v0, 0x14($sp) -/* A01260 80240C60 8E4200D0 */ lw $v0, 0xd0($s2) -/* A01264 80240C64 8C42001C */ lw $v0, 0x1c($v0) -/* A01268 80240C68 AFA20018 */ sw $v0, 0x18($sp) -/* A0126C 80240C6C 8E4200D0 */ lw $v0, 0xd0($s2) -/* A01270 80240C70 8C420024 */ lw $v0, 0x24($v0) -/* A01274 80240C74 AFA2001C */ sw $v0, 0x1c($sp) -/* A01278 80240C78 8E4200D0 */ lw $v0, 0xd0($s2) -/* A0127C 80240C7C 8C420028 */ lw $v0, 0x28($v0) -/* A01280 80240C80 AFA20020 */ sw $v0, 0x20($sp) -/* A01284 80240C84 8E4200D0 */ lw $v0, 0xd0($s2) -/* A01288 80240C88 3C0142C8 */ lui $at, 0x42c8 -/* A0128C 80240C8C 44810000 */ mtc1 $at, $f0 -/* A01290 80240C90 8C42002C */ lw $v0, 0x2c($v0) -/* A01294 80240C94 27B00010 */ addiu $s0, $sp, 0x10 -/* A01298 80240C98 E7A00028 */ swc1 $f0, 0x28($sp) -/* A0129C 80240C9C A7A0002C */ sh $zero, 0x2c($sp) -/* A012A0 80240CA0 12200019 */ beqz $s1, .L80240D08 -/* A012A4 80240CA4 AFA20024 */ sw $v0, 0x24($sp) -/* A012A8 80240CA8 AE600070 */ sw $zero, 0x70($s3) -/* A012AC 80240CAC A6A0008E */ sh $zero, 0x8e($s5) -/* A012B0 80240CB0 AE600074 */ sw $zero, 0x74($s3) -/* A012B4 80240CB4 8EA20000 */ lw $v0, ($s5) -/* A012B8 80240CB8 2403F7FF */ addiu $v1, $zero, -0x801 -/* A012BC 80240CBC 00431024 */ and $v0, $v0, $v1 -/* A012C0 80240CC0 2403FDFF */ addiu $v1, $zero, -0x201 -/* A012C4 80240CC4 00431024 */ and $v0, $v0, $v1 -/* A012C8 80240CC8 34420008 */ ori $v0, $v0, 8 -/* A012CC 80240CCC AEA20000 */ sw $v0, ($s5) -/* A012D0 80240CD0 8E4200B0 */ lw $v0, 0xb0($s2) -/* A012D4 80240CD4 34420018 */ ori $v0, $v0, 0x18 -/* A012D8 80240CD8 AE4200B0 */ sw $v0, 0xb0($s2) -/* A012DC 80240CDC 8E420000 */ lw $v0, ($s2) -/* A012E0 80240CE0 3C034000 */ lui $v1, 0x4000 -/* A012E4 80240CE4 00431024 */ and $v0, $v0, $v1 -/* A012E8 80240CE8 10400007 */ beqz $v0, .L80240D08 -/* A012EC 80240CEC 3C03BFFF */ lui $v1, 0xbfff -/* A012F0 80240CF0 2402000C */ addiu $v0, $zero, 0xc -/* A012F4 80240CF4 AE620070 */ sw $v0, 0x70($s3) -/* A012F8 80240CF8 8E420000 */ lw $v0, ($s2) -/* A012FC 80240CFC 3463FFFF */ ori $v1, $v1, 0xffff -/* A01300 80240D00 00431024 */ and $v0, $v0, $v1 -/* A01304 80240D04 AE420000 */ sw $v0, ($s2) -.L80240D08: -/* A01308 80240D08 8E4300B0 */ lw $v1, 0xb0($s2) -/* A0130C 80240D0C 30620004 */ andi $v0, $v1, 4 -/* A01310 80240D10 10400007 */ beqz $v0, .L80240D30 -/* A01314 80240D14 00000000 */ nop -/* A01318 80240D18 824200B4 */ lb $v0, 0xb4($s2) -/* A0131C 80240D1C 14400034 */ bnez $v0, .L80240DF0 -/* A01320 80240D20 0000102D */ daddu $v0, $zero, $zero -/* A01324 80240D24 2402FFFB */ addiu $v0, $zero, -5 -/* A01328 80240D28 00621024 */ and $v0, $v1, $v0 -/* A0132C 80240D2C AE4200B0 */ sw $v0, 0xb0($s2) -.L80240D30: -/* A01330 80240D30 8E630070 */ lw $v1, 0x70($s3) -/* A01334 80240D34 2C62000F */ sltiu $v0, $v1, 0xf -/* A01338 80240D38 1040002C */ beqz $v0, .L80240DEC -/* A0133C 80240D3C 00031080 */ sll $v0, $v1, 2 -/* A01340 80240D40 3C018024 */ lui $at, 0x8024 -/* A01344 80240D44 00220821 */ addu $at, $at, $v0 -/* A01348 80240D48 8C2221D8 */ lw $v0, 0x21d8($at) -/* A0134C 80240D4C 00400008 */ jr $v0 -/* A01350 80240D50 00000000 */ nop -/* A01354 80240D54 0260202D */ daddu $a0, $s3, $zero -/* A01358 80240D58 0280282D */ daddu $a1, $s4, $zero -/* A0135C 80240D5C 0C090000 */ jal func_80240000 -/* A01360 80240D60 0200302D */ daddu $a2, $s0, $zero -/* A01364 80240D64 0260202D */ daddu $a0, $s3, $zero -/* A01368 80240D68 0280282D */ daddu $a1, $s4, $zero -/* A0136C 80240D6C 0C09008C */ jal func_80240230 -/* A01370 80240D70 0200302D */ daddu $a2, $s0, $zero -/* A01374 80240D74 0809037C */ j .L80240DF0 -/* A01378 80240D78 0000102D */ daddu $v0, $zero, $zero -/* A0137C 80240D7C 0260202D */ daddu $a0, $s3, $zero -/* A01380 80240D80 0280282D */ daddu $a1, $s4, $zero -/* A01384 80240D84 0C09015A */ jal func_80240568 -/* A01388 80240D88 0200302D */ daddu $a2, $s0, $zero -/* A0138C 80240D8C 8E630070 */ lw $v1, 0x70($s3) -/* A01390 80240D90 24020003 */ addiu $v0, $zero, 3 -/* A01394 80240D94 14620016 */ bne $v1, $v0, .L80240DF0 -/* A01398 80240D98 0000102D */ daddu $v0, $zero, $zero -/* A0139C 80240D9C 0260202D */ daddu $a0, $s3, $zero -/* A013A0 80240DA0 0280282D */ daddu $a1, $s4, $zero -/* A013A4 80240DA4 0C09018A */ jal func_80240628 -/* A013A8 80240DA8 0200302D */ daddu $a2, $s0, $zero -/* A013AC 80240DAC 0809037C */ j .L80240DF0 -/* A013B0 80240DB0 0000102D */ daddu $v0, $zero, $zero -/* A013B4 80240DB4 0260202D */ daddu $a0, $s3, $zero -/* A013B8 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* A013BC 80240DBC 0C0901F3 */ jal func_802407CC -/* A013C0 80240DC0 0200302D */ daddu $a2, $s0, $zero -/* A013C4 80240DC4 0260202D */ daddu $a0, $s3, $zero -/* A013C8 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* A013CC 80240DCC 0C09022B */ jal func_802408AC -/* A013D0 80240DD0 0200302D */ daddu $a2, $s0, $zero -/* A013D4 80240DD4 0809037C */ j .L80240DF0 -/* A013D8 80240DD8 0000102D */ daddu $v0, $zero, $zero -/* A013DC 80240DDC 0260202D */ daddu $a0, $s3, $zero -/* A013E0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* A013E4 80240DE4 0C0902EB */ jal func_80240BAC -/* A013E8 80240DE8 0200302D */ daddu $a2, $s0, $zero -.L80240DEC: -/* A013EC 80240DEC 0000102D */ daddu $v0, $zero, $zero -.L80240DF0: -/* A013F0 80240DF0 8FBF0048 */ lw $ra, 0x48($sp) -/* A013F4 80240DF4 8FB50044 */ lw $s5, 0x44($sp) -/* A013F8 80240DF8 8FB40040 */ lw $s4, 0x40($sp) -/* A013FC 80240DFC 8FB3003C */ lw $s3, 0x3c($sp) -/* A01400 80240E00 8FB20038 */ lw $s2, 0x38($sp) -/* A01404 80240E04 8FB10034 */ lw $s1, 0x34($sp) -/* A01408 80240E08 8FB00030 */ lw $s0, 0x30($sp) -/* A0140C 80240E0C 03E00008 */ jr $ra -/* A01410 80240E10 27BD0050 */ addiu $sp, $sp, 0x50 -/* A01414 80240E14 00000000 */ nop -/* A01418 80240E18 00000000 */ nop -/* A0141C 80240E1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_13/func_80240E20_A00600.s b/asm/nonmatchings/world/area_nok/nok_13/func_80240E20_A00600.s deleted file mode 100644 index 0d830a628f..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_13/func_80240E20_A00600.s +++ /dev/null @@ -1,350 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E20_A01420 -/* A01420 80240E20 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A01424 80240E24 AFB20018 */ sw $s2, 0x18($sp) -/* A01428 80240E28 0080902D */ daddu $s2, $a0, $zero -/* A0142C 80240E2C AFBF0020 */ sw $ra, 0x20($sp) -/* A01430 80240E30 AFB3001C */ sw $s3, 0x1c($sp) -/* A01434 80240E34 AFB10014 */ sw $s1, 0x14($sp) -/* A01438 80240E38 AFB00010 */ sw $s0, 0x10($sp) -/* A0143C 80240E3C F7B40028 */ sdc1 $f20, 0x28($sp) -/* A01440 80240E40 8E42000C */ lw $v0, 0xc($s2) -/* A01444 80240E44 00A0802D */ daddu $s0, $a1, $zero -/* A01448 80240E48 0C0B1EAF */ jal get_variable -/* A0144C 80240E4C 8C450000 */ lw $a1, ($v0) -/* A01450 80240E50 3C138011 */ lui $s3, %hi(gPlayerStatus) -/* A01454 80240E54 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) -/* A01458 80240E58 1200001A */ beqz $s0, .L80240EC4 -/* A0145C 80240E5C 0040882D */ daddu $s1, $v0, $zero -/* A01460 80240E60 0C00AB39 */ jal heap_malloc -/* A01464 80240E64 2404003C */ addiu $a0, $zero, 0x3c -/* A01468 80240E68 AE420074 */ sw $v0, 0x74($s2) -/* A0146C 80240E6C 8E230000 */ lw $v1, ($s1) -/* A01470 80240E70 0040802D */ daddu $s0, $v0, $zero -/* A01474 80240E74 AE030000 */ sw $v1, ($s0) -/* A01478 80240E78 8E220004 */ lw $v0, 4($s1) -/* A0147C 80240E7C AE020004 */ sw $v0, 4($s0) -/* A01480 80240E80 8E220008 */ lw $v0, 8($s1) -/* A01484 80240E84 AE020008 */ sw $v0, 8($s0) -/* A01488 80240E88 8E22000C */ lw $v0, 0xc($s1) -/* A0148C 80240E8C AE02000C */ sw $v0, 0xc($s0) -/* A01490 80240E90 8E220010 */ lw $v0, 0x10($s1) -/* A01494 80240E94 AE020010 */ sw $v0, 0x10($s0) -/* A01498 80240E98 8E220014 */ lw $v0, 0x14($s1) -/* A0149C 80240E9C AE000018 */ sw $zero, 0x18($s0) -/* A014A0 80240EA0 AE00001C */ sw $zero, 0x1c($s0) -/* A014A4 80240EA4 AE000020 */ sw $zero, 0x20($s0) -/* A014A8 80240EA8 AE000024 */ sw $zero, 0x24($s0) -/* A014AC 80240EAC AE000028 */ sw $zero, 0x28($s0) -/* A014B0 80240EB0 AE00002C */ sw $zero, 0x2c($s0) -/* A014B4 80240EB4 AE000030 */ sw $zero, 0x30($s0) -/* A014B8 80240EB8 AE000034 */ sw $zero, 0x34($s0) -/* A014BC 80240EBC AE000038 */ sw $zero, 0x38($s0) -/* A014C0 80240EC0 AE020014 */ sw $v0, 0x14($s0) -.L80240EC4: -/* A014C4 80240EC4 8E500074 */ lw $s0, 0x74($s2) -/* A014C8 80240EC8 8E030020 */ lw $v1, 0x20($s0) -/* A014CC 80240ECC 2C620005 */ sltiu $v0, $v1, 5 -/* A014D0 80240ED0 10400116 */ beqz $v0, .L8024132C -/* A014D4 80240ED4 00031080 */ sll $v0, $v1, 2 -/* A014D8 80240ED8 3C018024 */ lui $at, 0x8024 -/* A014DC 80240EDC 00220821 */ addu $at, $at, $v0 -/* A014E0 80240EE0 8C222220 */ lw $v0, 0x2220($at) -/* A014E4 80240EE4 00400008 */ jr $v0 -/* A014E8 80240EE8 00000000 */ nop -/* A014EC 80240EEC C60C0000 */ lwc1 $f12, ($s0) -/* A014F0 80240EF0 46806320 */ cvt.s.w $f12, $f12 -/* A014F4 80240EF4 C60E0008 */ lwc1 $f14, 8($s0) -/* A014F8 80240EF8 0C038022 */ jal func_800E0088 -/* A014FC 80240EFC 468073A0 */ cvt.s.w $f14, $f14 -/* A01500 80240F00 8E02000C */ lw $v0, 0xc($s0) -/* A01504 80240F04 4600010D */ trunc.w.s $f4, $f0 -/* A01508 80240F08 44032000 */ mfc1 $v1, $f4 -/* A0150C 80240F0C 00000000 */ nop -/* A01510 80240F10 0062102A */ slt $v0, $v1, $v0 -/* A01514 80240F14 10400105 */ beqz $v0, .L8024132C -/* A01518 80240F18 00000000 */ nop -/* A0151C 80240F1C C6600028 */ lwc1 $f0, 0x28($s3) -/* A01520 80240F20 8E020020 */ lw $v0, 0x20($s0) -/* A01524 80240F24 E6000024 */ swc1 $f0, 0x24($s0) -/* A01528 80240F28 C6600030 */ lwc1 $f0, 0x30($s3) -/* A0152C 80240F2C 24420001 */ addiu $v0, $v0, 1 -/* A01530 80240F30 AE020020 */ sw $v0, 0x20($s0) -/* A01534 80240F34 080904CB */ j .L8024132C -/* A01538 80240F38 E6000028 */ swc1 $f0, 0x28($s0) -/* A0153C 80240F3C C60C0000 */ lwc1 $f12, ($s0) -/* A01540 80240F40 46806320 */ cvt.s.w $f12, $f12 -/* A01544 80240F44 C60E0008 */ lwc1 $f14, 8($s0) -/* A01548 80240F48 0C038022 */ jal func_800E0088 -/* A0154C 80240F4C 468073A0 */ cvt.s.w $f14, $f14 -/* A01550 80240F50 8E02000C */ lw $v0, 0xc($s0) -/* A01554 80240F54 4600010D */ trunc.w.s $f4, $f0 -/* A01558 80240F58 44032000 */ mfc1 $v1, $f4 -/* A0155C 80240F5C 00000000 */ nop -/* A01560 80240F60 0062102A */ slt $v0, $v1, $v0 -/* A01564 80240F64 504000F1 */ beql $v0, $zero, .L8024132C -/* A01568 80240F68 AE000020 */ sw $zero, 0x20($s0) -/* A0156C 80240F6C C60C0000 */ lwc1 $f12, ($s0) -/* A01570 80240F70 46806320 */ cvt.s.w $f12, $f12 -/* A01574 80240F74 8E060024 */ lw $a2, 0x24($s0) -/* A01578 80240F78 8E070028 */ lw $a3, 0x28($s0) -/* A0157C 80240F7C C60E0008 */ lwc1 $f14, 8($s0) -/* A01580 80240F80 0C00A720 */ jal atan2 -/* A01584 80240F84 468073A0 */ cvt.s.w $f14, $f14 -/* A01588 80240F88 4600010D */ trunc.w.s $f4, $f0 -/* A0158C 80240F8C 44112000 */ mfc1 $s1, $f4 -/* A01590 80240F90 C60C0000 */ lwc1 $f12, ($s0) -/* A01594 80240F94 46806320 */ cvt.s.w $f12, $f12 -/* A01598 80240F98 8E660028 */ lw $a2, 0x28($s3) -/* A0159C 80240F9C 8E670030 */ lw $a3, 0x30($s3) -/* A015A0 80240FA0 C60E0008 */ lwc1 $f14, 8($s0) -/* A015A4 80240FA4 0C00A720 */ jal atan2 -/* A015A8 80240FA8 468073A0 */ cvt.s.w $f14, $f14 -/* A015AC 80240FAC 4600010D */ trunc.w.s $f4, $f0 -/* A015B0 80240FB0 44022000 */ mfc1 $v0, $f4 -/* A015B4 80240FB4 44916000 */ mtc1 $s1, $f12 -/* A015B8 80240FB8 00000000 */ nop -/* A015BC 80240FBC 46806320 */ cvt.s.w $f12, $f12 -/* A015C0 80240FC0 44827000 */ mtc1 $v0, $f14 -/* A015C4 80240FC4 00000000 */ nop -/* A015C8 80240FC8 0C00A70A */ jal get_clamped_angle_diff -/* A015CC 80240FCC 468073A0 */ cvt.s.w $f14, $f14 -/* A015D0 80240FD0 4600010D */ trunc.w.s $f4, $f0 -/* A015D4 80240FD4 44022000 */ mfc1 $v0, $f4 -/* A015D8 80240FD8 00000000 */ nop -/* A015DC 80240FDC 44826000 */ mtc1 $v0, $f12 -/* A015E0 80240FE0 00000000 */ nop -/* A015E4 80240FE4 0C00A69F */ jal signF -/* A015E8 80240FE8 46806320 */ cvt.s.w $f12, $f12 -/* A015EC 80240FEC 8E020020 */ lw $v0, 0x20($s0) -/* A015F0 80240FF0 080904C4 */ j .L80241310 -/* A015F4 80240FF4 E6000034 */ swc1 $f0, 0x34($s0) -/* A015F8 80240FF8 C60C0000 */ lwc1 $f12, ($s0) -/* A015FC 80240FFC 46806320 */ cvt.s.w $f12, $f12 -/* A01600 80241000 C60E0008 */ lwc1 $f14, 8($s0) -/* A01604 80241004 0C038022 */ jal func_800E0088 -/* A01608 80241008 468073A0 */ cvt.s.w $f14, $f14 -/* A0160C 8024100C 8E02000C */ lw $v0, 0xc($s0) -/* A01610 80241010 4600010D */ trunc.w.s $f4, $f0 -/* A01614 80241014 44032000 */ mfc1 $v1, $f4 -/* A01618 80241018 00000000 */ nop -/* A0161C 8024101C 0062102A */ slt $v0, $v1, $v0 -/* A01620 80241020 504000C2 */ beql $v0, $zero, .L8024132C -/* A01624 80241024 AE000020 */ sw $zero, 0x20($s0) -/* A01628 80241028 C60C0000 */ lwc1 $f12, ($s0) -/* A0162C 8024102C 46806320 */ cvt.s.w $f12, $f12 -/* A01630 80241030 8E06002C */ lw $a2, 0x2c($s0) -/* A01634 80241034 8E070030 */ lw $a3, 0x30($s0) -/* A01638 80241038 C60E0008 */ lwc1 $f14, 8($s0) -/* A0163C 8024103C 0C00A720 */ jal atan2 -/* A01640 80241040 468073A0 */ cvt.s.w $f14, $f14 -/* A01644 80241044 4600010D */ trunc.w.s $f4, $f0 -/* A01648 80241048 44112000 */ mfc1 $s1, $f4 -/* A0164C 8024104C C60C0000 */ lwc1 $f12, ($s0) -/* A01650 80241050 46806320 */ cvt.s.w $f12, $f12 -/* A01654 80241054 8E660028 */ lw $a2, 0x28($s3) -/* A01658 80241058 8E670030 */ lw $a3, 0x30($s3) -/* A0165C 8024105C C60E0008 */ lwc1 $f14, 8($s0) -/* A01660 80241060 0C00A720 */ jal atan2 -/* A01664 80241064 468073A0 */ cvt.s.w $f14, $f14 -/* A01668 80241068 4600010D */ trunc.w.s $f4, $f0 -/* A0166C 8024106C 44022000 */ mfc1 $v0, $f4 -/* A01670 80241070 44916000 */ mtc1 $s1, $f12 -/* A01674 80241074 00000000 */ nop -/* A01678 80241078 46806320 */ cvt.s.w $f12, $f12 -/* A0167C 8024107C 44827000 */ mtc1 $v0, $f14 -/* A01680 80241080 00000000 */ nop -/* A01684 80241084 0C00A70A */ jal get_clamped_angle_diff -/* A01688 80241088 468073A0 */ cvt.s.w $f14, $f14 -/* A0168C 8024108C 4600010D */ trunc.w.s $f4, $f0 -/* A01690 80241090 44022000 */ mfc1 $v0, $f4 -/* A01694 80241094 00000000 */ nop -/* A01698 80241098 44826000 */ mtc1 $v0, $f12 -/* A0169C 8024109C 00000000 */ nop -/* A016A0 802410A0 0C00A69F */ jal signF -/* A016A4 802410A4 46806320 */ cvt.s.w $f12, $f12 -/* A016A8 802410A8 C6020034 */ lwc1 $f2, 0x34($s0) -/* A016AC 802410AC 46001032 */ c.eq.s $f2, $f0 -/* A016B0 802410B0 00000000 */ nop -/* A016B4 802410B4 4502009D */ bc1fl .L8024132C -/* A016B8 802410B8 AE000020 */ sw $zero, 0x20($s0) -/* A016BC 802410BC C60C0000 */ lwc1 $f12, ($s0) -/* A016C0 802410C0 46806320 */ cvt.s.w $f12, $f12 -/* A016C4 802410C4 8E060024 */ lw $a2, 0x24($s0) -/* A016C8 802410C8 8E070028 */ lw $a3, 0x28($s0) -/* A016CC 802410CC C60E0008 */ lwc1 $f14, 8($s0) -/* A016D0 802410D0 0C00A720 */ jal atan2 -/* A016D4 802410D4 468073A0 */ cvt.s.w $f14, $f14 -/* A016D8 802410D8 4600010D */ trunc.w.s $f4, $f0 -/* A016DC 802410DC 44112000 */ mfc1 $s1, $f4 -/* A016E0 802410E0 C60C0000 */ lwc1 $f12, ($s0) -/* A016E4 802410E4 46806320 */ cvt.s.w $f12, $f12 -/* A016E8 802410E8 8E660028 */ lw $a2, 0x28($s3) -/* A016EC 802410EC 8E670030 */ lw $a3, 0x30($s3) -/* A016F0 802410F0 C60E0008 */ lwc1 $f14, 8($s0) -/* A016F4 802410F4 0C00A720 */ jal atan2 -/* A016F8 802410F8 468073A0 */ cvt.s.w $f14, $f14 -/* A016FC 802410FC 4600010D */ trunc.w.s $f4, $f0 -/* A01700 80241100 44022000 */ mfc1 $v0, $f4 -/* A01704 80241104 44916000 */ mtc1 $s1, $f12 -/* A01708 80241108 00000000 */ nop -/* A0170C 8024110C 46806320 */ cvt.s.w $f12, $f12 -/* A01710 80241110 44827000 */ mtc1 $v0, $f14 -/* A01714 80241114 00000000 */ nop -/* A01718 80241118 0C00A70A */ jal get_clamped_angle_diff -/* A0171C 8024111C 468073A0 */ cvt.s.w $f14, $f14 -/* A01720 80241120 4600010D */ trunc.w.s $f4, $f0 -/* A01724 80241124 44022000 */ mfc1 $v0, $f4 -/* A01728 80241128 00000000 */ nop -/* A0172C 8024112C 44820000 */ mtc1 $v0, $f0 -/* A01730 80241130 00000000 */ nop -/* A01734 80241134 46800020 */ cvt.s.w $f0, $f0 -/* A01738 80241138 3C0142B4 */ lui $at, 0x42b4 -/* A0173C 8024113C 44811000 */ mtc1 $at, $f2 -/* A01740 80241140 46000505 */ abs.s $f20, $f0 -/* A01744 80241144 4614103C */ c.lt.s $f2, $f20 -/* A01748 80241148 00000000 */ nop -/* A0174C 8024114C 45000077 */ bc1f .L8024132C -/* A01750 80241150 00000000 */ nop -/* A01754 80241154 8E020014 */ lw $v0, 0x14($s0) -/* A01758 80241158 10400003 */ beqz $v0, .L80241168 -/* A0175C 8024115C 0200202D */ daddu $a0, $s0, $zero -/* A01760 80241160 0040F809 */ jalr $v0 -/* A01764 80241164 0000282D */ daddu $a1, $zero, $zero -.L80241168: -/* A01768 80241168 C6000018 */ lwc1 $f0, 0x18($s0) -/* A0176C 8024116C 46800020 */ cvt.s.w $f0, $f0 -/* A01770 80241170 8E020020 */ lw $v0, 0x20($s0) -/* A01774 80241174 46140000 */ add.s $f0, $f0, $f20 -/* A01778 80241178 24420001 */ addiu $v0, $v0, 1 -/* A0177C 8024117C AE020020 */ sw $v0, 0x20($s0) -/* A01780 80241180 4600010D */ trunc.w.s $f4, $f0 -/* A01784 80241184 080904CB */ j .L8024132C -/* A01788 80241188 E6040018 */ swc1 $f4, 0x18($s0) -/* A0178C 8024118C C60C0000 */ lwc1 $f12, ($s0) -/* A01790 80241190 46806320 */ cvt.s.w $f12, $f12 -/* A01794 80241194 C60E0008 */ lwc1 $f14, 8($s0) -/* A01798 80241198 0C038022 */ jal func_800E0088 -/* A0179C 8024119C 468073A0 */ cvt.s.w $f14, $f14 -/* A017A0 802411A0 8E020010 */ lw $v0, 0x10($s0) -/* A017A4 802411A4 4600010D */ trunc.w.s $f4, $f0 -/* A017A8 802411A8 44032000 */ mfc1 $v1, $f4 -/* A017AC 802411AC 00000000 */ nop -/* A017B0 802411B0 0062102A */ slt $v0, $v1, $v0 -/* A017B4 802411B4 10400050 */ beqz $v0, .L802412F8 -/* A017B8 802411B8 00000000 */ nop -/* A017BC 802411BC C60C0000 */ lwc1 $f12, ($s0) -/* A017C0 802411C0 46806320 */ cvt.s.w $f12, $f12 -/* A017C4 802411C4 8E06002C */ lw $a2, 0x2c($s0) -/* A017C8 802411C8 8E070030 */ lw $a3, 0x30($s0) -/* A017CC 802411CC C60E0008 */ lwc1 $f14, 8($s0) -/* A017D0 802411D0 0C00A720 */ jal atan2 -/* A017D4 802411D4 468073A0 */ cvt.s.w $f14, $f14 -/* A017D8 802411D8 4600010D */ trunc.w.s $f4, $f0 -/* A017DC 802411DC 44112000 */ mfc1 $s1, $f4 -/* A017E0 802411E0 C60C0000 */ lwc1 $f12, ($s0) -/* A017E4 802411E4 46806320 */ cvt.s.w $f12, $f12 -/* A017E8 802411E8 8E660028 */ lw $a2, 0x28($s3) -/* A017EC 802411EC 8E670030 */ lw $a3, 0x30($s3) -/* A017F0 802411F0 C60E0008 */ lwc1 $f14, 8($s0) -/* A017F4 802411F4 0C00A720 */ jal atan2 -/* A017F8 802411F8 468073A0 */ cvt.s.w $f14, $f14 -/* A017FC 802411FC 4600010D */ trunc.w.s $f4, $f0 -/* A01800 80241200 44022000 */ mfc1 $v0, $f4 -/* A01804 80241204 44916000 */ mtc1 $s1, $f12 -/* A01808 80241208 00000000 */ nop -/* A0180C 8024120C 46806320 */ cvt.s.w $f12, $f12 -/* A01810 80241210 44827000 */ mtc1 $v0, $f14 -/* A01814 80241214 00000000 */ nop -/* A01818 80241218 0C00A70A */ jal get_clamped_angle_diff -/* A0181C 8024121C 468073A0 */ cvt.s.w $f14, $f14 -/* A01820 80241220 4600010D */ trunc.w.s $f4, $f0 -/* A01824 80241224 44022000 */ mfc1 $v0, $f4 -/* A01828 80241228 00000000 */ nop -/* A0182C 8024122C 4482A000 */ mtc1 $v0, $f20 -/* A01830 80241230 00000000 */ nop -/* A01834 80241234 4680A520 */ cvt.s.w $f20, $f20 -/* A01838 80241238 0C00A69F */ jal signF -/* A0183C 8024123C 4600A306 */ mov.s $f12, $f20 -/* A01840 80241240 C6020034 */ lwc1 $f2, 0x34($s0) -/* A01844 80241244 46001032 */ c.eq.s $f2, $f0 -/* A01848 80241248 00000000 */ nop -/* A0184C 8024124C 4503000A */ bc1tl .L80241278 -/* A01850 80241250 4600A005 */ abs.s $f0, $f20 -/* A01854 80241254 8E020014 */ lw $v0, 0x14($s0) -/* A01858 80241258 10400003 */ beqz $v0, .L80241268 -/* A0185C 8024125C 0200202D */ daddu $a0, $s0, $zero -/* A01860 80241260 0040F809 */ jalr $v0 -/* A01864 80241264 24050003 */ addiu $a1, $zero, 3 -.L80241268: -/* A01868 80241268 8E020020 */ lw $v0, 0x20($s0) -/* A0186C 8024126C 24420001 */ addiu $v0, $v0, 1 -/* A01870 80241270 080904B7 */ j .L802412DC -/* A01874 80241274 AE020020 */ sw $v0, 0x20($s0) -.L80241278: -/* A01878 80241278 C6020018 */ lwc1 $f2, 0x18($s0) -/* A0187C 8024127C 468010A0 */ cvt.s.w $f2, $f2 -/* A01880 80241280 46001080 */ add.s $f2, $f2, $f0 -/* A01884 80241284 3C02B60B */ lui $v0, 0xb60b -/* A01888 80241288 344260B7 */ ori $v0, $v0, 0x60b7 -/* A0188C 8024128C 4600110D */ trunc.w.s $f4, $f2 -/* A01890 80241290 44032000 */ mfc1 $v1, $f4 -/* A01894 80241294 00000000 */ nop -/* A01898 80241298 00620018 */ mult $v1, $v0 -/* A0189C 8024129C 8E040038 */ lw $a0, 0x38($s0) -/* A018A0 802412A0 AE030018 */ sw $v1, 0x18($s0) -/* A018A4 802412A4 00004010 */ mfhi $t0 -/* A018A8 802412A8 01031021 */ addu $v0, $t0, $v1 -/* A018AC 802412AC 00021203 */ sra $v0, $v0, 8 -/* A018B0 802412B0 00031FC3 */ sra $v1, $v1, 0x1f -/* A018B4 802412B4 00431023 */ subu $v0, $v0, $v1 -/* A018B8 802412B8 10440008 */ beq $v0, $a0, .L802412DC -/* A018BC 802412BC AE02001C */ sw $v0, 0x1c($s0) -/* A018C0 802412C0 8E020014 */ lw $v0, 0x14($s0) -/* A018C4 802412C4 10400003 */ beqz $v0, .L802412D4 -/* A018C8 802412C8 0200202D */ daddu $a0, $s0, $zero -/* A018CC 802412CC 0040F809 */ jalr $v0 -/* A018D0 802412D0 24050001 */ addiu $a1, $zero, 1 -.L802412D4: -/* A018D4 802412D4 8E02001C */ lw $v0, 0x1c($s0) -/* A018D8 802412D8 AE020038 */ sw $v0, 0x38($s0) -.L802412DC: -/* A018DC 802412DC 8E020014 */ lw $v0, 0x14($s0) -/* A018E0 802412E0 10400012 */ beqz $v0, .L8024132C -/* A018E4 802412E4 0200202D */ daddu $a0, $s0, $zero -/* A018E8 802412E8 0040F809 */ jalr $v0 -/* A018EC 802412EC 24050002 */ addiu $a1, $zero, 2 -/* A018F0 802412F0 080904CB */ j .L8024132C -/* A018F4 802412F4 00000000 */ nop -.L802412F8: -/* A018F8 802412F8 8E020014 */ lw $v0, 0x14($s0) -/* A018FC 802412FC 10400003 */ beqz $v0, .L8024130C -/* A01900 80241300 0200202D */ daddu $a0, $s0, $zero -/* A01904 80241304 0040F809 */ jalr $v0 -/* A01908 80241308 24050004 */ addiu $a1, $zero, 4 -.L8024130C: -/* A0190C 8024130C 8E020020 */ lw $v0, 0x20($s0) -.L80241310: -/* A01910 80241310 24420001 */ addiu $v0, $v0, 1 -/* A01914 80241314 080904CB */ j .L8024132C -/* A01918 80241318 AE020020 */ sw $v0, 0x20($s0) -/* A0191C 8024131C AE000018 */ sw $zero, 0x18($s0) -/* A01920 80241320 AE00001C */ sw $zero, 0x1c($s0) -/* A01924 80241324 AE000038 */ sw $zero, 0x38($s0) -/* A01928 80241328 AE000020 */ sw $zero, 0x20($s0) -.L8024132C: -/* A0192C 8024132C C6600028 */ lwc1 $f0, 0x28($s3) -/* A01930 80241330 E600002C */ swc1 $f0, 0x2c($s0) -/* A01934 80241334 C6600030 */ lwc1 $f0, 0x30($s3) -/* A01938 80241338 E6000030 */ swc1 $f0, 0x30($s0) -/* A0193C 8024133C 8FBF0020 */ lw $ra, 0x20($sp) -/* A01940 80241340 8FB3001C */ lw $s3, 0x1c($sp) -/* A01944 80241344 8FB20018 */ lw $s2, 0x18($sp) -/* A01948 80241348 8FB10014 */ lw $s1, 0x14($sp) -/* A0194C 8024134C 8FB00010 */ lw $s0, 0x10($sp) -/* A01950 80241350 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A01954 80241354 0000102D */ daddu $v0, $zero, $zero -/* A01958 80241358 03E00008 */ jr $ra -/* A0195C 8024135C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_13/func_802413CC_A00600.s b/asm/nonmatchings/world/area_nok/nok_13/func_802413CC_A00600.s deleted file mode 100644 index 82499b87b5..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_13/func_802413CC_A00600.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413CC_A019CC -/* A019CC 802413CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A019D0 802413D0 AFBF0018 */ sw $ra, 0x18($sp) -/* A019D4 802413D4 24020001 */ addiu $v0, $zero, 1 -/* A019D8 802413D8 10A20014 */ beq $a1, $v0, .L8024142C -/* A019DC 802413DC 0080182D */ daddu $v1, $a0, $zero -/* A019E0 802413E0 28A20002 */ slti $v0, $a1, 2 -/* A019E4 802413E4 50400005 */ beql $v0, $zero, .L802413FC -/* A019E8 802413E8 28A20005 */ slti $v0, $a1, 5 -/* A019EC 802413EC 10A00009 */ beqz $a1, .L80241414 -/* A019F0 802413F0 24050001 */ addiu $a1, $zero, 1 -/* A019F4 802413F4 08090521 */ j .L80241484 -/* A019F8 802413F8 00000000 */ nop -.L802413FC: -/* A019FC 802413FC 10400021 */ beqz $v0, .L80241484 -/* A01A00 80241400 28A20003 */ slti $v0, $a1, 3 -/* A01A04 80241404 1440001F */ bnez $v0, .L80241484 -/* A01A08 80241408 24050001 */ addiu $a1, $zero, 1 -/* A01A0C 8024140C 0809051B */ j .L8024146C -/* A01A10 80241410 00000000 */ nop -.L80241414: -/* A01A14 80241414 3C048024 */ lui $a0, 0x8024 -/* A01A18 80241418 24842134 */ addiu $a0, $a0, 0x2134 -/* A01A1C 8024141C 0C0B0CF8 */ jal start_script -/* A01A20 80241420 0000302D */ daddu $a2, $zero, $zero -/* A01A24 80241424 08090520 */ j .L80241480 -/* A01A28 80241428 24030084 */ addiu $v1, $zero, 0x84 -.L8024142C: -/* A01A2C 8024142C 24040156 */ addiu $a0, $zero, 0x156 -/* A01A30 80241430 C4600000 */ lwc1 $f0, ($v1) -/* A01A34 80241434 46800020 */ cvt.s.w $f0, $f0 -/* A01A38 80241438 44050000 */ mfc1 $a1, $f0 -/* A01A3C 8024143C C4600004 */ lwc1 $f0, 4($v1) -/* A01A40 80241440 46800020 */ cvt.s.w $f0, $f0 -/* A01A44 80241444 44060000 */ mfc1 $a2, $f0 -/* A01A48 80241448 C4600008 */ lwc1 $f0, 8($v1) -/* A01A4C 8024144C 46800020 */ cvt.s.w $f0, $f0 -/* A01A50 80241450 44070000 */ mfc1 $a3, $f0 -/* A01A54 80241454 24020003 */ addiu $v0, $zero, 3 -/* A01A58 80241458 AFA20010 */ sw $v0, 0x10($sp) -/* A01A5C 8024145C 0C04C6A5 */ jal make_item_entity_nodelay -/* A01A60 80241460 AFA00014 */ sw $zero, 0x14($sp) -/* A01A64 80241464 08090521 */ j .L80241484 -/* A01A68 80241468 00000000 */ nop -.L8024146C: -/* A01A6C 8024146C 3C048024 */ lui $a0, 0x8024 -/* A01A70 80241470 24842134 */ addiu $a0, $a0, 0x2134 -/* A01A74 80241474 0C0B0CF8 */ jal start_script -/* A01A78 80241478 0000302D */ daddu $a2, $zero, $zero -/* A01A7C 8024147C 24030011 */ addiu $v1, $zero, 0x11 -.L80241480: -/* A01A80 80241480 AC430084 */ sw $v1, 0x84($v0) -.L80241484: -/* A01A84 80241484 8FBF0018 */ lw $ra, 0x18($sp) -/* A01A88 80241488 03E00008 */ jr $ra -/* A01A8C 8024148C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_14/func_80240180_A02840.s b/asm/nonmatchings/world/area_nok/nok_14/func_80240180_A02840.s deleted file mode 100644 index 89a413ad6e..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/func_80240180_A02840.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240180_A029C0 -/* A029C0 80240180 3C03800B */ lui $v1, %hi(gCameras) -/* A029C4 80240184 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* A029C8 80240188 94620000 */ lhu $v0, ($v1) -/* A029CC 8024018C 34421000 */ ori $v0, $v0, 0x1000 -/* A029D0 80240190 A4620000 */ sh $v0, ($v1) -/* A029D4 80240194 03E00008 */ jr $ra -/* A029D8 80240198 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_14/func_802401C0_A02840.s b/asm/nonmatchings/world/area_nok/nok_14/func_802401C0_A02840.s deleted file mode 100644 index e9b710c4e3..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/func_802401C0_A02840.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401C0_A02A00 -/* A02A00 802401C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A02A04 802401C4 AFB20018 */ sw $s2, 0x18($sp) -/* A02A08 802401C8 0080902D */ daddu $s2, $a0, $zero -/* A02A0C 802401CC AFBF001C */ sw $ra, 0x1c($sp) -/* A02A10 802401D0 AFB10014 */ sw $s1, 0x14($sp) -/* A02A14 802401D4 AFB00010 */ sw $s0, 0x10($sp) -/* A02A18 802401D8 8E510148 */ lw $s1, 0x148($s2) -/* A02A1C 802401DC 0C00EABB */ jal get_npc_unsafe -/* A02A20 802401E0 86240008 */ lh $a0, 8($s1) -/* A02A24 802401E4 0040802D */ daddu $s0, $v0, $zero -/* A02A28 802401E8 8E2300CC */ lw $v1, 0xcc($s1) -/* A02A2C 802401EC C60C0038 */ lwc1 $f12, 0x38($s0) -/* A02A30 802401F0 8C630020 */ lw $v1, 0x20($v1) -/* A02A34 802401F4 AE030028 */ sw $v1, 0x28($s0) -/* A02A38 802401F8 96220076 */ lhu $v0, 0x76($s1) -/* A02A3C 802401FC A602008E */ sh $v0, 0x8e($s0) -/* A02A40 80240200 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A02A44 80240204 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A02A48 80240208 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A02A4C 8024020C 8C460028 */ lw $a2, 0x28($v0) -/* A02A50 80240210 0C00A720 */ jal atan2 -/* A02A54 80240214 8C470030 */ lw $a3, 0x30($v0) -/* A02A58 80240218 2402000D */ addiu $v0, $zero, 0xd -/* A02A5C 8024021C E600000C */ swc1 $f0, 0xc($s0) -/* A02A60 80240220 AE420070 */ sw $v0, 0x70($s2) -/* A02A64 80240224 8FBF001C */ lw $ra, 0x1c($sp) -/* A02A68 80240228 8FB20018 */ lw $s2, 0x18($sp) -/* A02A6C 8024022C 8FB10014 */ lw $s1, 0x14($sp) -/* A02A70 80240230 8FB00010 */ lw $s0, 0x10($sp) -/* A02A74 80240234 03E00008 */ jr $ra -/* A02A78 80240238 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_14/func_8024023C_A02840.s b/asm/nonmatchings/world/area_nok/nok_14/func_8024023C_A02840.s deleted file mode 100644 index a7f2217718..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/func_8024023C_A02840.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_A02A7C -/* A02A7C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A02A80 80240240 AFB3001C */ sw $s3, 0x1c($sp) -/* A02A84 80240244 0080982D */ daddu $s3, $a0, $zero -/* A02A88 80240248 AFBF0020 */ sw $ra, 0x20($sp) -/* A02A8C 8024024C AFB20018 */ sw $s2, 0x18($sp) -/* A02A90 80240250 AFB10014 */ sw $s1, 0x14($sp) -/* A02A94 80240254 AFB00010 */ sw $s0, 0x10($sp) -/* A02A98 80240258 8E710148 */ lw $s1, 0x148($s3) -/* A02A9C 8024025C 86240008 */ lh $a0, 8($s1) -/* A02AA0 80240260 0C00EABB */ jal get_npc_unsafe -/* A02AA4 80240264 00A0902D */ daddu $s2, $a1, $zero -/* A02AA8 80240268 0040802D */ daddu $s0, $v0, $zero -/* A02AAC 8024026C 8602008E */ lh $v0, 0x8e($s0) -/* A02AB0 80240270 9603008E */ lhu $v1, 0x8e($s0) -/* A02AB4 80240274 18400005 */ blez $v0, .L8024028C -/* A02AB8 80240278 2462FFFF */ addiu $v0, $v1, -1 -/* A02ABC 8024027C A602008E */ sh $v0, 0x8e($s0) -/* A02AC0 80240280 00021400 */ sll $v0, $v0, 0x10 -/* A02AC4 80240284 1C400033 */ bgtz $v0, .L80240354 -/* A02AC8 80240288 00000000 */ nop -.L8024028C: -/* A02ACC 8024028C 8602008C */ lh $v0, 0x8c($s0) -/* A02AD0 80240290 14400030 */ bnez $v0, .L80240354 -/* A02AD4 80240294 00000000 */ nop -/* A02AD8 80240298 8E2200CC */ lw $v0, 0xcc($s1) -/* A02ADC 8024029C 8C420024 */ lw $v0, 0x24($v0) -/* A02AE0 802402A0 AE020028 */ sw $v0, 0x28($s0) -/* A02AE4 802402A4 C6400018 */ lwc1 $f0, 0x18($s2) -/* A02AE8 802402A8 E6000018 */ swc1 $f0, 0x18($s0) -/* A02AEC 802402AC 8E230088 */ lw $v1, 0x88($s1) -/* A02AF0 802402B0 24020005 */ addiu $v0, $zero, 5 -/* A02AF4 802402B4 10620005 */ beq $v1, $v0, .L802402CC -/* A02AF8 802402B8 00000000 */ nop -/* A02AFC 802402BC 10600003 */ beqz $v1, .L802402CC -/* A02B00 802402C0 24020001 */ addiu $v0, $zero, 1 -/* A02B04 802402C4 14620006 */ bne $v1, $v0, .L802402E0 -/* A02B08 802402C8 00000000 */ nop -.L802402CC: -/* A02B0C 802402CC 8E220084 */ lw $v0, 0x84($s1) -/* A02B10 802402D0 00021FC2 */ srl $v1, $v0, 0x1f -/* A02B14 802402D4 00431021 */ addu $v0, $v0, $v1 -/* A02B18 802402D8 00021043 */ sra $v0, $v0, 1 -/* A02B1C 802402DC A60200A8 */ sh $v0, 0xa8($s0) -.L802402E0: -/* A02B20 802402E0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A02B24 802402E4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A02B28 802402E8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A02B2C 802402EC C60E0040 */ lwc1 $f14, 0x40($s0) -/* A02B30 802402F0 8C460028 */ lw $a2, 0x28($v0) -/* A02B34 802402F4 0C00A7B5 */ jal dist2D -/* A02B38 802402F8 8C470030 */ lw $a3, 0x30($v0) -/* A02B3C 802402FC C6020018 */ lwc1 $f2, 0x18($s0) -/* A02B40 80240300 46020003 */ div.s $f0, $f0, $f2 -/* A02B44 80240304 3C018024 */ lui $at, 0x8024 -/* A02B48 80240308 D42245C0 */ ldc1 $f2, 0x45c0($at) -/* A02B4C 8024030C 46000021 */ cvt.d.s $f0, $f0 -/* A02B50 80240310 46220000 */ add.d $f0, $f0, $f2 -/* A02B54 80240314 4620010D */ trunc.w.d $f4, $f0 -/* A02B58 80240318 44022000 */ mfc1 $v0, $f4 -/* A02B5C 8024031C 00000000 */ nop -/* A02B60 80240320 A602008E */ sh $v0, 0x8e($s0) -/* A02B64 80240324 00021400 */ sll $v0, $v0, 0x10 -/* A02B68 80240328 8E230078 */ lw $v1, 0x78($s1) -/* A02B6C 8024032C 00021403 */ sra $v0, $v0, 0x10 -/* A02B70 80240330 0043102A */ slt $v0, $v0, $v1 -/* A02B74 80240334 10400003 */ beqz $v0, .L80240344 -/* A02B78 80240338 00000000 */ nop -/* A02B7C 8024033C 9622007A */ lhu $v0, 0x7a($s1) -/* A02B80 80240340 A602008E */ sh $v0, 0x8e($s0) -.L80240344: -/* A02B84 80240344 8602008E */ lh $v0, 0x8e($s0) -/* A02B88 80240348 AE22007C */ sw $v0, 0x7c($s1) -/* A02B8C 8024034C 2402000E */ addiu $v0, $zero, 0xe -/* A02B90 80240350 AE620070 */ sw $v0, 0x70($s3) -.L80240354: -/* A02B94 80240354 8FBF0020 */ lw $ra, 0x20($sp) -/* A02B98 80240358 8FB3001C */ lw $s3, 0x1c($sp) -/* A02B9C 8024035C 8FB20018 */ lw $s2, 0x18($sp) -/* A02BA0 80240360 8FB10014 */ lw $s1, 0x14($sp) -/* A02BA4 80240364 8FB00010 */ lw $s0, 0x10($sp) -/* A02BA8 80240368 03E00008 */ jr $ra -/* A02BAC 8024036C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_14/func_80240370_A02840.s b/asm/nonmatchings/world/area_nok/nok_14/func_80240370_A02840.s deleted file mode 100644 index 0579285d14..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/func_80240370_A02840.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240370_A02BB0 -/* A02BB0 80240370 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A02BB4 80240374 AFB3003C */ sw $s3, 0x3c($sp) -/* A02BB8 80240378 0080982D */ daddu $s3, $a0, $zero -/* A02BBC 8024037C AFBF0040 */ sw $ra, 0x40($sp) -/* A02BC0 80240380 AFB20038 */ sw $s2, 0x38($sp) -/* A02BC4 80240384 AFB10034 */ sw $s1, 0x34($sp) -/* A02BC8 80240388 AFB00030 */ sw $s0, 0x30($sp) -/* A02BCC 8024038C 8E710148 */ lw $s1, 0x148($s3) -/* A02BD0 80240390 0C00EABB */ jal get_npc_unsafe -/* A02BD4 80240394 86240008 */ lh $a0, 8($s1) -/* A02BD8 80240398 0040802D */ daddu $s0, $v0, $zero -/* A02BDC 8024039C 8E22007C */ lw $v0, 0x7c($s1) -/* A02BE0 802403A0 8603008E */ lh $v1, 0x8e($s0) -/* A02BE4 802403A4 2442FFFF */ addiu $v0, $v0, -1 -/* A02BE8 802403A8 14620012 */ bne $v1, $v0, .L802403F4 -/* A02BEC 802403AC 00000000 */ nop -/* A02BF0 802403B0 C6000038 */ lwc1 $f0, 0x38($s0) -/* A02BF4 802403B4 4600020D */ trunc.w.s $f8, $f0 -/* A02BF8 802403B8 44024000 */ mfc1 $v0, $f8 -/* A02BFC 802403BC 00000000 */ nop -/* A02C00 802403C0 A6220010 */ sh $v0, 0x10($s1) -/* A02C04 802403C4 C600003C */ lwc1 $f0, 0x3c($s0) -/* A02C08 802403C8 4600020D */ trunc.w.s $f8, $f0 -/* A02C0C 802403CC 44024000 */ mfc1 $v0, $f8 -/* A02C10 802403D0 00000000 */ nop -/* A02C14 802403D4 A6220012 */ sh $v0, 0x12($s1) -/* A02C18 802403D8 C6000040 */ lwc1 $f0, 0x40($s0) -/* A02C1C 802403DC 24020001 */ addiu $v0, $zero, 1 -/* A02C20 802403E0 A2220007 */ sb $v0, 7($s1) -/* A02C24 802403E4 4600020D */ trunc.w.s $f8, $f0 -/* A02C28 802403E8 44024000 */ mfc1 $v0, $f8 -/* A02C2C 802403EC 00000000 */ nop -/* A02C30 802403F0 A6220014 */ sh $v0, 0x14($s1) -.L802403F4: -/* A02C34 802403F4 C6000038 */ lwc1 $f0, 0x38($s0) -/* A02C38 802403F8 C602003C */ lwc1 $f2, 0x3c($s0) -/* A02C3C 802403FC C6040040 */ lwc1 $f4, 0x40($s0) -/* A02C40 80240400 C6060018 */ lwc1 $f6, 0x18($s0) -/* A02C44 80240404 E7A00020 */ swc1 $f0, 0x20($sp) -/* A02C48 80240408 E7A20024 */ swc1 $f2, 0x24($sp) -/* A02C4C 8024040C E7A40028 */ swc1 $f4, 0x28($sp) -/* A02C50 80240410 E7A60010 */ swc1 $f6, 0x10($sp) -/* A02C54 80240414 C600000C */ lwc1 $f0, 0xc($s0) -/* A02C58 80240418 E7A00014 */ swc1 $f0, 0x14($sp) -/* A02C5C 8024041C 860200A8 */ lh $v0, 0xa8($s0) -/* A02C60 80240420 27A50020 */ addiu $a1, $sp, 0x20 -/* A02C64 80240424 44820000 */ mtc1 $v0, $f0 -/* A02C68 80240428 00000000 */ nop -/* A02C6C 8024042C 46800020 */ cvt.s.w $f0, $f0 -/* A02C70 80240430 E7A00018 */ swc1 $f0, 0x18($sp) -/* A02C74 80240434 860200A6 */ lh $v0, 0xa6($s0) -/* A02C78 80240438 27A60024 */ addiu $a2, $sp, 0x24 -/* A02C7C 8024043C 44820000 */ mtc1 $v0, $f0 -/* A02C80 80240440 00000000 */ nop -/* A02C84 80240444 46800020 */ cvt.s.w $f0, $f0 -/* A02C88 80240448 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A02C8C 8024044C 8E040080 */ lw $a0, 0x80($s0) -/* A02C90 80240450 0C037711 */ jal func_800DDC44 -/* A02C94 80240454 27A70028 */ addiu $a3, $sp, 0x28 -/* A02C98 80240458 0040902D */ daddu $s2, $v0, $zero -/* A02C9C 8024045C 16400005 */ bnez $s2, .L80240474 -/* A02CA0 80240460 00000000 */ nop -/* A02CA4 80240464 8E050018 */ lw $a1, 0x18($s0) -/* A02CA8 80240468 8E06000C */ lw $a2, 0xc($s0) -/* A02CAC 8024046C 0C00EA95 */ jal npc_move_heading -/* A02CB0 80240470 0200202D */ daddu $a0, $s0, $zero -.L80240474: -/* A02CB4 80240474 8602008E */ lh $v0, 0x8e($s0) -/* A02CB8 80240478 9603008E */ lhu $v1, 0x8e($s0) -/* A02CBC 8024047C 18400007 */ blez $v0, .L8024049C -/* A02CC0 80240480 2462FFFF */ addiu $v0, $v1, -1 -/* A02CC4 80240484 A602008E */ sh $v0, 0x8e($s0) -/* A02CC8 80240488 00021400 */ sll $v0, $v0, 0x10 -/* A02CCC 8024048C 18400003 */ blez $v0, .L8024049C -/* A02CD0 80240490 00000000 */ nop -/* A02CD4 80240494 12400008 */ beqz $s2, .L802404B8 -/* A02CD8 80240498 00000000 */ nop -.L8024049C: -/* A02CDC 8024049C 8E2200CC */ lw $v0, 0xcc($s1) -/* A02CE0 802404A0 A2200007 */ sb $zero, 7($s1) -/* A02CE4 802404A4 8C420028 */ lw $v0, 0x28($v0) -/* A02CE8 802404A8 A600008E */ sh $zero, 0x8e($s0) -/* A02CEC 802404AC AE020028 */ sw $v0, 0x28($s0) -/* A02CF0 802404B0 2402000F */ addiu $v0, $zero, 0xf -/* A02CF4 802404B4 AE620070 */ sw $v0, 0x70($s3) -.L802404B8: -/* A02CF8 802404B8 8FBF0040 */ lw $ra, 0x40($sp) -/* A02CFC 802404BC 8FB3003C */ lw $s3, 0x3c($sp) -/* A02D00 802404C0 8FB20038 */ lw $s2, 0x38($sp) -/* A02D04 802404C4 8FB10034 */ lw $s1, 0x34($sp) -/* A02D08 802404C8 8FB00030 */ lw $s0, 0x30($sp) -/* A02D0C 802404CC 03E00008 */ jr $ra -/* A02D10 802404D0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_14/func_8024116C_A02840.s b/asm/nonmatchings/world/area_nok/nok_14/func_8024116C_A02840.s deleted file mode 100644 index 62a602931e..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/func_8024116C_A02840.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024116C_A039AC -/* A039AC 8024116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A039B0 80241170 AFB3001C */ sw $s3, 0x1c($sp) -/* A039B4 80241174 0080982D */ daddu $s3, $a0, $zero -/* A039B8 80241178 AFBF0020 */ sw $ra, 0x20($sp) -/* A039BC 8024117C AFB20018 */ sw $s2, 0x18($sp) -/* A039C0 80241180 AFB10014 */ sw $s1, 0x14($sp) -/* A039C4 80241184 AFB00010 */ sw $s0, 0x10($sp) -/* A039C8 80241188 8E720148 */ lw $s2, 0x148($s3) -/* A039CC 8024118C 86440008 */ lh $a0, 8($s2) -/* A039D0 80241190 0C00EABB */ jal get_npc_unsafe -/* A039D4 80241194 00A0882D */ daddu $s1, $a1, $zero -/* A039D8 80241198 8E240008 */ lw $a0, 8($s1) -/* A039DC 8024119C 0040802D */ daddu $s0, $v0, $zero -/* A039E0 802411A0 00041FC2 */ srl $v1, $a0, 0x1f -/* A039E4 802411A4 00832021 */ addu $a0, $a0, $v1 -/* A039E8 802411A8 00042043 */ sra $a0, $a0, 1 -/* A039EC 802411AC 0C00A67F */ jal rand_int -/* A039F0 802411B0 24840001 */ addiu $a0, $a0, 1 -/* A039F4 802411B4 8E230008 */ lw $v1, 8($s1) -/* A039F8 802411B8 240400B4 */ addiu $a0, $zero, 0xb4 -/* A039FC 802411BC 00032FC2 */ srl $a1, $v1, 0x1f -/* A03A00 802411C0 00651821 */ addu $v1, $v1, $a1 -/* A03A04 802411C4 00031843 */ sra $v1, $v1, 1 -/* A03A08 802411C8 00621821 */ addu $v1, $v1, $v0 -/* A03A0C 802411CC 0C00A67F */ jal rand_int -/* A03A10 802411D0 A603008E */ sh $v1, 0x8e($s0) -/* A03A14 802411D4 C60C000C */ lwc1 $f12, 0xc($s0) -/* A03A18 802411D8 44820000 */ mtc1 $v0, $f0 -/* A03A1C 802411DC 00000000 */ nop -/* A03A20 802411E0 46800020 */ cvt.s.w $f0, $f0 -/* A03A24 802411E4 46006300 */ add.s $f12, $f12, $f0 -/* A03A28 802411E8 3C0142B4 */ lui $at, 0x42b4 -/* A03A2C 802411EC 44810000 */ mtc1 $at, $f0 -/* A03A30 802411F0 0C00A6C9 */ jal clamp_angle -/* A03A34 802411F4 46006301 */ sub.s $f12, $f12, $f0 -/* A03A38 802411F8 E600000C */ swc1 $f0, 0xc($s0) -/* A03A3C 802411FC 8E4200CC */ lw $v0, 0xcc($s2) -/* A03A40 80241200 8C420000 */ lw $v0, ($v0) -/* A03A44 80241204 AE020028 */ sw $v0, 0x28($s0) -/* A03A48 80241208 24020003 */ addiu $v0, $zero, 3 -/* A03A4C 8024120C AE620070 */ sw $v0, 0x70($s3) -/* A03A50 80241210 8FBF0020 */ lw $ra, 0x20($sp) -/* A03A54 80241214 8FB3001C */ lw $s3, 0x1c($sp) -/* A03A58 80241218 8FB20018 */ lw $s2, 0x18($sp) -/* A03A5C 8024121C 8FB10014 */ lw $s1, 0x14($sp) -/* A03A60 80241220 8FB00010 */ lw $s0, 0x10($sp) -/* A03A64 80241224 03E00008 */ jr $ra -/* A03A68 80241228 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_14/func_80241570_A02840.s b/asm/nonmatchings/world/area_nok/nok_14/func_80241570_A02840.s deleted file mode 100644 index c4f31f2462..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/func_80241570_A02840.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241570_A03DB0 -/* A03DB0 80241570 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A03DB4 80241574 AFB20018 */ sw $s2, 0x18($sp) -/* A03DB8 80241578 0080902D */ daddu $s2, $a0, $zero -/* A03DBC 8024157C AFBF001C */ sw $ra, 0x1c($sp) -/* A03DC0 80241580 AFB10014 */ sw $s1, 0x14($sp) -/* A03DC4 80241584 AFB00010 */ sw $s0, 0x10($sp) -/* A03DC8 80241588 8E510148 */ lw $s1, 0x148($s2) -/* A03DCC 8024158C 0C00EABB */ jal get_npc_unsafe -/* A03DD0 80241590 86240008 */ lh $a0, 8($s1) -/* A03DD4 80241594 0040802D */ daddu $s0, $v0, $zero -/* A03DD8 80241598 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A03DDC 8024159C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A03DE0 802415A0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A03DE4 802415A4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A03DE8 802415A8 A600008E */ sh $zero, 0x8e($s0) -/* A03DEC 802415AC 8C460028 */ lw $a2, 0x28($v0) -/* A03DF0 802415B0 0C00A720 */ jal atan2 -/* A03DF4 802415B4 8C470030 */ lw $a3, 0x30($v0) -/* A03DF8 802415B8 E600000C */ swc1 $f0, 0xc($s0) -/* A03DFC 802415BC 8E2200CC */ lw $v0, 0xcc($s1) -/* A03E00 802415C0 8C420020 */ lw $v0, 0x20($v0) -/* A03E04 802415C4 AE020028 */ sw $v0, 0x28($s0) -/* A03E08 802415C8 2402000B */ addiu $v0, $zero, 0xb -/* A03E0C 802415CC AE420070 */ sw $v0, 0x70($s2) -/* A03E10 802415D0 8FBF001C */ lw $ra, 0x1c($sp) -/* A03E14 802415D4 8FB20018 */ lw $s2, 0x18($sp) -/* A03E18 802415D8 8FB10014 */ lw $s1, 0x14($sp) -/* A03E1C 802415DC 8FB00010 */ lw $s0, 0x10($sp) -/* A03E20 802415E0 03E00008 */ jr $ra -/* A03E24 802415E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_14/func_80241CA0_A02840.s b/asm/nonmatchings/world/area_nok/nok_14/func_80241CA0_A02840.s deleted file mode 100644 index 7a9fd056f2..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/func_80241CA0_A02840.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CA0_A044E0 -/* A044E0 80241CA0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A044E4 80241CA4 AFB40040 */ sw $s4, 0x40($sp) -/* A044E8 80241CA8 0080A02D */ daddu $s4, $a0, $zero -/* A044EC 80241CAC AFBF0048 */ sw $ra, 0x48($sp) -/* A044F0 80241CB0 AFB50044 */ sw $s5, 0x44($sp) -/* A044F4 80241CB4 AFB3003C */ sw $s3, 0x3c($sp) -/* A044F8 80241CB8 AFB20038 */ sw $s2, 0x38($sp) -/* A044FC 80241CBC AFB10034 */ sw $s1, 0x34($sp) -/* A04500 80241CC0 AFB00030 */ sw $s0, 0x30($sp) -/* A04504 80241CC4 8E920148 */ lw $s2, 0x148($s4) -/* A04508 80241CC8 86440008 */ lh $a0, 8($s2) -/* A0450C 80241CCC 8E90000C */ lw $s0, 0xc($s4) -/* A04510 80241CD0 0C00EABB */ jal get_npc_unsafe -/* A04514 80241CD4 00A0882D */ daddu $s1, $a1, $zero -/* A04518 80241CD8 0280202D */ daddu $a0, $s4, $zero -/* A0451C 80241CDC 8E050000 */ lw $a1, ($s0) -/* A04520 80241CE0 0C0B1EAF */ jal get_variable -/* A04524 80241CE4 0040A82D */ daddu $s5, $v0, $zero -/* A04528 80241CE8 AFA00010 */ sw $zero, 0x10($sp) -/* A0452C 80241CEC 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04530 80241CF0 8C630030 */ lw $v1, 0x30($v1) -/* A04534 80241CF4 AFA30014 */ sw $v1, 0x14($sp) -/* A04538 80241CF8 8E4300D0 */ lw $v1, 0xd0($s2) -/* A0453C 80241CFC 8C63001C */ lw $v1, 0x1c($v1) -/* A04540 80241D00 AFA30018 */ sw $v1, 0x18($sp) -/* A04544 80241D04 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04548 80241D08 8C630024 */ lw $v1, 0x24($v1) -/* A0454C 80241D0C AFA3001C */ sw $v1, 0x1c($sp) -/* A04550 80241D10 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04554 80241D14 8C630028 */ lw $v1, 0x28($v1) -/* A04558 80241D18 27B30010 */ addiu $s3, $sp, 0x10 -/* A0455C 80241D1C AFA30020 */ sw $v1, 0x20($sp) -/* A04560 80241D20 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04564 80241D24 3C0142F0 */ lui $at, 0x42f0 -/* A04568 80241D28 44810000 */ mtc1 $at, $f0 -/* A0456C 80241D2C 8C63002C */ lw $v1, 0x2c($v1) -/* A04570 80241D30 0040802D */ daddu $s0, $v0, $zero -/* A04574 80241D34 E7A00028 */ swc1 $f0, 0x28($sp) -/* A04578 80241D38 A7A0002C */ sh $zero, 0x2c($sp) -/* A0457C 80241D3C 12200006 */ beqz $s1, .L80241D58 -/* A04580 80241D40 AFA30024 */ sw $v1, 0x24($sp) -/* A04584 80241D44 02A0202D */ daddu $a0, $s5, $zero -/* A04588 80241D48 0240282D */ daddu $a1, $s2, $zero -/* A0458C 80241D4C 0280302D */ daddu $a2, $s4, $zero -/* A04590 80241D50 0C0906DF */ jal func_80241B7C -/* A04594 80241D54 0200382D */ daddu $a3, $s0, $zero -.L80241D58: -/* A04598 80241D58 2402FFFE */ addiu $v0, $zero, -2 -/* A0459C 80241D5C A2A200AB */ sb $v0, 0xab($s5) -/* A045A0 80241D60 8E4300B0 */ lw $v1, 0xb0($s2) -/* A045A4 80241D64 30620004 */ andi $v0, $v1, 4 -/* A045A8 80241D68 10400007 */ beqz $v0, .L80241D88 -/* A045AC 80241D6C 00000000 */ nop -/* A045B0 80241D70 824200B4 */ lb $v0, 0xb4($s2) -/* A045B4 80241D74 1440003C */ bnez $v0, .L80241E68 -/* A045B8 80241D78 0000102D */ daddu $v0, $zero, $zero -/* A045BC 80241D7C 2402FFFB */ addiu $v0, $zero, -5 -/* A045C0 80241D80 00621024 */ and $v0, $v1, $v0 -/* A045C4 80241D84 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241D88: -/* A045C8 80241D88 8E830070 */ lw $v1, 0x70($s4) -/* A045CC 80241D8C 2C62000F */ sltiu $v0, $v1, 0xf -/* A045D0 80241D90 10400034 */ beqz $v0, .L80241E64 -/* A045D4 80241D94 00031080 */ sll $v0, $v1, 2 -/* A045D8 80241D98 3C018024 */ lui $at, 0x8024 -/* A045DC 80241D9C 00220821 */ addu $at, $at, $v0 -/* A045E0 80241DA0 8C224638 */ lw $v0, 0x4638($at) -/* A045E4 80241DA4 00400008 */ jr $v0 -/* A045E8 80241DA8 00000000 */ nop -/* A045EC 80241DAC 0280202D */ daddu $a0, $s4, $zero -/* A045F0 80241DB0 0200282D */ daddu $a1, $s0, $zero -/* A045F4 80241DB4 0C090265 */ jal func_80240994 -/* A045F8 80241DB8 0260302D */ daddu $a2, $s3, $zero -/* A045FC 80241DBC 0280202D */ daddu $a0, $s4, $zero -/* A04600 80241DC0 0200282D */ daddu $a1, $s0, $zero -/* A04604 80241DC4 0C0902D1 */ jal func_80240B44 -/* A04608 80241DC8 0260302D */ daddu $a2, $s3, $zero -/* A0460C 80241DCC 0809079A */ j .L80241E68 -/* A04610 80241DD0 0000102D */ daddu $v0, $zero, $zero -/* A04614 80241DD4 0280202D */ daddu $a0, $s4, $zero -/* A04618 80241DD8 0200282D */ daddu $a1, $s0, $zero -/* A0461C 80241DDC 0C09045B */ jal func_8024116C -/* A04620 80241DE0 0260302D */ daddu $a2, $s3, $zero -/* A04624 80241DE4 0280202D */ daddu $a0, $s4, $zero -/* A04628 80241DE8 0200282D */ daddu $a1, $s0, $zero -/* A0462C 80241DEC 0C09048B */ jal func_8024122C -/* A04630 80241DF0 0260302D */ daddu $a2, $s3, $zero -/* A04634 80241DF4 0809079A */ j .L80241E68 -/* A04638 80241DF8 0000102D */ daddu $v0, $zero, $zero -/* A0463C 80241DFC 0280202D */ daddu $a0, $s4, $zero -/* A04640 80241E00 0200282D */ daddu $a1, $s0, $zero -/* A04644 80241E04 0C09055C */ jal func_80241570 -/* A04648 80241E08 0260302D */ daddu $a2, $s3, $zero -/* A0464C 80241E0C 0280202D */ daddu $a0, $s4, $zero -/* A04650 80241E10 0200282D */ daddu $a1, $s0, $zero -/* A04654 80241E14 0C09057A */ jal func_802415E8 -/* A04658 80241E18 0260302D */ daddu $a2, $s3, $zero -/* A0465C 80241E1C 0809079A */ j .L80241E68 -/* A04660 80241E20 0000102D */ daddu $v0, $zero, $zero -/* A04664 80241E24 0280202D */ daddu $a0, $s4, $zero -/* A04668 80241E28 0200282D */ daddu $a1, $s0, $zero -/* A0466C 80241E2C 0C090595 */ jal func_80241654 -/* A04670 80241E30 0260302D */ daddu $a2, $s3, $zero -/* A04674 80241E34 0809079A */ j .L80241E68 -/* A04678 80241E38 0000102D */ daddu $v0, $zero, $zero -/* A0467C 80241E3C 0280202D */ daddu $a0, $s4, $zero -/* A04680 80241E40 0200282D */ daddu $a1, $s0, $zero -/* A04684 80241E44 0C0905E2 */ jal func_80241788 -/* A04688 80241E48 0260302D */ daddu $a2, $s3, $zero -/* A0468C 80241E4C 0809079A */ j .L80241E68 -/* A04690 80241E50 0000102D */ daddu $v0, $zero, $zero -/* A04694 80241E54 0280202D */ daddu $a0, $s4, $zero -/* A04698 80241E58 0200282D */ daddu $a1, $s0, $zero -/* A0469C 80241E5C 0C0905FB */ jal func_802417EC -/* A046A0 80241E60 0260302D */ daddu $a2, $s3, $zero -.L80241E64: -/* A046A4 80241E64 0000102D */ daddu $v0, $zero, $zero -.L80241E68: -/* A046A8 80241E68 8FBF0048 */ lw $ra, 0x48($sp) -/* A046AC 80241E6C 8FB50044 */ lw $s5, 0x44($sp) -/* A046B0 80241E70 8FB40040 */ lw $s4, 0x40($sp) -/* A046B4 80241E74 8FB3003C */ lw $s3, 0x3c($sp) -/* A046B8 80241E78 8FB20038 */ lw $s2, 0x38($sp) -/* A046BC 80241E7C 8FB10034 */ lw $s1, 0x34($sp) -/* A046C0 80241E80 8FB00030 */ lw $s0, 0x30($sp) -/* A046C4 80241E84 03E00008 */ jr $ra -/* A046C8 80241E88 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_nok/nok_14/func_80241E8C_A02840.s b/asm/nonmatchings/world/area_nok/nok_14/func_80241E8C_A02840.s deleted file mode 100644 index e4c48bab14..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/func_80241E8C_A02840.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E8C_A046CC -/* A046CC 80241E8C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A046D0 80241E90 AFB3001C */ sw $s3, 0x1c($sp) -/* A046D4 80241E94 0080982D */ daddu $s3, $a0, $zero -/* A046D8 80241E98 AFBF0020 */ sw $ra, 0x20($sp) -/* A046DC 80241E9C AFB20018 */ sw $s2, 0x18($sp) -/* A046E0 80241EA0 AFB10014 */ sw $s1, 0x14($sp) -/* A046E4 80241EA4 AFB00010 */ sw $s0, 0x10($sp) -/* A046E8 80241EA8 8E710148 */ lw $s1, 0x148($s3) -/* A046EC 80241EAC 0C00EABB */ jal get_npc_unsafe -/* A046F0 80241EB0 86240008 */ lh $a0, 8($s1) -/* A046F4 80241EB4 0040802D */ daddu $s0, $v0, $zero -/* A046F8 80241EB8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A046FC 80241EBC 8E2200CC */ lw $v0, 0xcc($s1) -/* A04700 80241EC0 3C01C0A0 */ lui $at, 0xc0a0 -/* A04704 80241EC4 44811000 */ mtc1 $at, $f2 -/* A04708 80241EC8 3C013E19 */ lui $at, 0x3e19 -/* A0470C 80241ECC 3421999A */ ori $at, $at, 0x999a -/* A04710 80241ED0 44810000 */ mtc1 $at, $f0 -/* A04714 80241ED4 8C420024 */ lw $v0, 0x24($v0) -/* A04718 80241ED8 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* A0471C 80241EDC 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* A04720 80241EE0 E602001C */ swc1 $f2, 0x1c($s0) -/* A04724 80241EE4 E6000014 */ swc1 $f0, 0x14($s0) -/* A04728 80241EE8 AE020028 */ sw $v0, 0x28($s0) -/* A0472C 80241EEC 8E22008C */ lw $v0, 0x8c($s1) -/* A04730 80241EF0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A04734 80241EF4 00021FC2 */ srl $v1, $v0, 0x1f -/* A04738 80241EF8 00431021 */ addu $v0, $v0, $v1 -/* A0473C 80241EFC 8E430000 */ lw $v1, ($s2) -/* A04740 80241F00 00021043 */ sra $v0, $v0, 1 -/* A04744 80241F04 A60200A8 */ sh $v0, 0xa8($s0) -/* A04748 80241F08 8C660028 */ lw $a2, 0x28($v1) -/* A0474C 80241F0C 0C00A7B5 */ jal dist2D -/* A04750 80241F10 8C670030 */ lw $a3, 0x30($v1) -/* A04754 80241F14 0200202D */ daddu $a0, $s0, $zero -/* A04758 80241F18 0000302D */ daddu $a2, $zero, $zero -/* A0475C 80241F1C C6020038 */ lwc1 $f2, 0x38($s0) -/* A04760 80241F20 3C0140E0 */ lui $at, 0x40e0 -/* A04764 80241F24 44810000 */ mtc1 $at, $f0 -/* A04768 80241F28 4600110D */ trunc.w.s $f4, $f2 -/* A0476C 80241F2C 44022000 */ mfc1 $v0, $f4 -/* A04770 80241F30 E6000018 */ swc1 $f0, 0x18($s0) -/* A04774 80241F34 A6220010 */ sh $v0, 0x10($s1) -/* A04778 80241F38 C600003C */ lwc1 $f0, 0x3c($s0) -/* A0477C 80241F3C 240502C1 */ addiu $a1, $zero, 0x2c1 -/* A04780 80241F40 4600010D */ trunc.w.s $f4, $f0 -/* A04784 80241F44 44022000 */ mfc1 $v0, $f4 -/* A04788 80241F48 00000000 */ nop -/* A0478C 80241F4C A6220012 */ sh $v0, 0x12($s1) -/* A04790 80241F50 C6000040 */ lwc1 $f0, 0x40($s0) -/* A04794 80241F54 24020001 */ addiu $v0, $zero, 1 -/* A04798 80241F58 A2220007 */ sb $v0, 7($s1) -/* A0479C 80241F5C 4600010D */ trunc.w.s $f4, $f0 -/* A047A0 80241F60 44022000 */ mfc1 $v0, $f4 -/* A047A4 80241F64 0C012530 */ jal func_800494C0 -/* A047A8 80241F68 A6220014 */ sh $v0, 0x14($s1) -/* A047AC 80241F6C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A047B0 80241F70 8E420000 */ lw $v0, ($s2) -/* A047B4 80241F74 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A047B8 80241F78 8C460028 */ lw $a2, 0x28($v0) -/* A047BC 80241F7C 0C00A720 */ jal atan2 -/* A047C0 80241F80 8C470030 */ lw $a3, 0x30($v0) -/* A047C4 80241F84 2402000C */ addiu $v0, $zero, 0xc -/* A047C8 80241F88 A602008E */ sh $v0, 0x8e($s0) -/* A047CC 80241F8C 2402000D */ addiu $v0, $zero, 0xd -/* A047D0 80241F90 E600000C */ swc1 $f0, 0xc($s0) -/* A047D4 80241F94 AE620070 */ sw $v0, 0x70($s3) -/* A047D8 80241F98 8FBF0020 */ lw $ra, 0x20($sp) -/* A047DC 80241F9C 8FB3001C */ lw $s3, 0x1c($sp) -/* A047E0 80241FA0 8FB20018 */ lw $s2, 0x18($sp) -/* A047E4 80241FA4 8FB10014 */ lw $s1, 0x14($sp) -/* A047E8 80241FA8 8FB00010 */ lw $s0, 0x10($sp) -/* A047EC 80241FAC 03E00008 */ jr $ra -/* A047F0 80241FB0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_15/func_80240020_A06F00.s b/asm/nonmatchings/world/area_nok/nok_15/func_80240020_A06F00.s deleted file mode 100644 index 075cd7108b..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/func_80240020_A06F00.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_A06F20 -/* A06F20 80240020 3C028016 */ lui $v0, 0x8016 -/* A06F24 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* A06F28 80240028 AC820084 */ sw $v0, 0x84($a0) -/* A06F2C 8024002C 03E00008 */ jr $ra -/* A06F30 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_15/func_80240034_A06F00.s b/asm/nonmatchings/world/area_nok/nok_15/func_80240034_A06F00.s deleted file mode 100644 index 6fed470b27..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/func_80240034_A06F00.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_A06F34 -/* A06F34 80240034 3C038016 */ lui $v1, 0x8016 -/* A06F38 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* A06F3C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A06F40 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* A06F44 80240044 0080802D */ daddu $s0, $a0, $zero -/* A06F48 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* A06F4C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* A06F50 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* A06F54 80240054 24020002 */ addiu $v0, $zero, 2 -/* A06F58 80240058 08090038 */ j .L802400E0 -/* A06F5C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* A06F60 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* A06F64 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* A06F68 80240068 80620040 */ lb $v0, 0x40($v1) -/* A06F6C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* A06F70 80240070 04420001 */ bltzl $v0, .L80240078 -/* A06F74 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* A06F78 80240078 14400003 */ bnez $v0, .L80240088 -/* A06F7C 8024007C 00000000 */ nop -/* A06F80 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* A06F84 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* A06F88 80240088 44822000 */ mtc1 $v0, $f4 -/* A06F8C 8024008C 00000000 */ nop -/* A06F90 80240090 46802120 */ cvt.s.w $f4, $f4 -/* A06F94 80240094 44062000 */ mfc1 $a2, $f4 -/* A06F98 80240098 44872000 */ mtc1 $a3, $f4 -/* A06F9C 8024009C 00000000 */ nop -/* A06FA0 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* A06FA4 802400A4 44806000 */ mtc1 $zero, $f12 -/* A06FA8 802400A8 44072000 */ mfc1 $a3, $f4 -/* A06FAC 802400AC 0C00A720 */ jal atan2 -/* A06FB0 802400B0 46006386 */ mov.s $f14, $f12 -/* A06FB4 802400B4 3C014270 */ lui $at, 0x4270 -/* A06FB8 802400B8 44811000 */ mtc1 $at, $f2 -/* A06FBC 802400BC 00000000 */ nop -/* A06FC0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* A06FC4 802400C4 00000000 */ nop -/* A06FC8 802400C8 45000004 */ bc1f .L802400DC -/* A06FCC 802400CC 24020001 */ addiu $v0, $zero, 1 -/* A06FD0 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* A06FD4 802400D4 08090038 */ j .L802400E0 -/* A06FD8 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* A06FDC 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* A06FE0 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* A06FE4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* A06FE8 802400E8 03E00008 */ jr $ra -/* A06FEC 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_15/func_802400F0_A06F00.s b/asm/nonmatchings/world/area_nok/nok_15/func_802400F0_A06F00.s deleted file mode 100644 index de618075e6..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/func_802400F0_A06F00.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_A06FF0 -/* A06FF0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A06FF4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* A06FF8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* A06FFC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* A07000 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* A07004 80240104 0C016AFA */ jal get_current_map_header -/* A07008 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* A0700C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* A07010 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* A07014 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A07018 80240118 0C0B1EAF */ jal get_variable -/* A0701C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* A07020 80240120 0220202D */ daddu $a0, $s1, $zero -/* A07024 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* A07028 80240128 8E430014 */ lw $v1, 0x14($s2) -/* A0702C 8024012C 00028100 */ sll $s0, $v0, 4 -/* A07030 80240130 02031821 */ addu $v1, $s0, $v1 -/* A07034 80240134 C4600000 */ lwc1 $f0, ($v1) -/* A07038 80240138 4600008D */ trunc.w.s $f2, $f0 -/* A0703C 8024013C 44061000 */ mfc1 $a2, $f2 -/* A07040 80240140 0C0B2026 */ jal set_variable -/* A07044 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* A07048 80240148 0220202D */ daddu $a0, $s1, $zero -/* A0704C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* A07050 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* A07054 80240154 02021021 */ addu $v0, $s0, $v0 -/* A07058 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* A0705C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* A07060 80240160 44061000 */ mfc1 $a2, $f2 -/* A07064 80240164 0C0B2026 */ jal set_variable -/* A07068 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* A0706C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* A07070 80240170 8E420014 */ lw $v0, 0x14($s2) -/* A07074 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* A07078 80240178 02021021 */ addu $v0, $s0, $v0 -/* A0707C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* A07080 80240180 4600008D */ trunc.w.s $f2, $f0 -/* A07084 80240184 44061000 */ mfc1 $a2, $f2 -/* A07088 80240188 0C0B2026 */ jal set_variable -/* A0708C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* A07090 80240190 0220202D */ daddu $a0, $s1, $zero -/* A07094 80240194 8E420014 */ lw $v0, 0x14($s2) -/* A07098 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* A0709C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* A070A0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* A070A4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* A070A8 802401A8 44061000 */ mfc1 $a2, $f2 -/* A070AC 802401AC 0C0B2026 */ jal set_variable -/* A070B0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* A070B4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* A070B8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* A070BC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* A070C0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* A070C4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* A070C8 802401C8 03E00008 */ jr $ra -/* A070CC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_15/func_802401D0_A06F00.s b/asm/nonmatchings/world/area_nok/nok_15/func_802401D0_A06F00.s deleted file mode 100644 index 42fb09a552..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/func_802401D0_A06F00.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_A070D0 -/* A070D0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A070D4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A070D8 802401D8 3C014334 */ lui $at, 0x4334 -/* A070DC 802401DC 44816000 */ mtc1 $at, $f12 -/* A070E0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A070E4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* A070E8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* A070EC 802401EC 00031080 */ sll $v0, $v1, 2 -/* A070F0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* A070F4 802401F4 00021080 */ sll $v0, $v0, 2 -/* A070F8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* A070FC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* A07100 80240200 00431021 */ addu $v0, $v0, $v1 -/* A07104 80240204 000210C0 */ sll $v0, $v0, 3 -/* A07108 80240208 3C01800B */ lui $at, 0x800b -/* A0710C 8024020C 00220821 */ addu $at, $at, $v0 -/* A07110 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* A07114 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* A07118 80240218 0C00A6C9 */ jal clamp_angle -/* A0711C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* A07120 80240220 4600008D */ trunc.w.s $f2, $f0 -/* A07124 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* A07128 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* A0712C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* A07130 80240230 24020002 */ addiu $v0, $zero, 2 -/* A07134 80240234 03E00008 */ jr $ra -/* A07138 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_15/func_8024023C_A06F00.s b/asm/nonmatchings/world/area_nok/nok_15/func_8024023C_A06F00.s deleted file mode 100644 index db8d339636..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/func_8024023C_A06F00.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_A0713C -/* A0713C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A07140 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* A07144 80240244 0080802D */ daddu $s0, $a0, $zero -/* A07148 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* A0714C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* A07150 80240250 8E02000C */ lw $v0, 0xc($s0) -/* A07154 80240254 0C0B210B */ jal get_float_variable -/* A07158 80240258 8C450000 */ lw $a1, ($v0) -/* A0715C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* A07160 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* A07164 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* A07168 80240268 44060000 */ mfc1 $a2, $f0 -/* A0716C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* A07170 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* A07174 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* A07178 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* A0717C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* A07180 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* A07184 80240284 0C00A7E7 */ jal add_vec2D_polar -/* A07188 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* A0718C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* A07190 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* A07194 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* A07198 80240298 0C0B2190 */ jal set_float_variable -/* A0719C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A071A0 802402A0 0200202D */ daddu $a0, $s0, $zero -/* A071A4 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* A071A8 802402A8 4406A000 */ mfc1 $a2, $f20 -/* A071AC 802402AC 0C0B2190 */ jal set_float_variable -/* A071B0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* A071B4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* A071B8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* A071BC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* A071C0 802402C0 0C0B2190 */ jal set_float_variable -/* A071C4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* A071C8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* A071CC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* A071D0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* A071D4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* A071D8 802402D8 03E00008 */ jr $ra -/* A071DC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_15/func_802402E0_A06F00.s b/asm/nonmatchings/world/area_nok/nok_15/func_802402E0_A06F00.s deleted file mode 100644 index 9dd0fa0f00..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/func_802402E0_A06F00.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_A071E0 -/* A071E0 802402E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A071E4 802402E4 AFB20018 */ sw $s2, 0x18($sp) -/* A071E8 802402E8 0080902D */ daddu $s2, $a0, $zero -/* A071EC 802402EC AFBF001C */ sw $ra, 0x1c($sp) -/* A071F0 802402F0 AFB10014 */ sw $s1, 0x14($sp) -/* A071F4 802402F4 AFB00010 */ sw $s0, 0x10($sp) -/* A071F8 802402F8 8E510148 */ lw $s1, 0x148($s2) -/* A071FC 802402FC 0C00EABB */ jal get_npc_unsafe -/* A07200 80240300 86240008 */ lh $a0, 8($s1) -/* A07204 80240304 0040802D */ daddu $s0, $v0, $zero -/* A07208 80240308 8E2300CC */ lw $v1, 0xcc($s1) -/* A0720C 8024030C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A07210 80240310 8C630020 */ lw $v1, 0x20($v1) -/* A07214 80240314 AE030028 */ sw $v1, 0x28($s0) -/* A07218 80240318 96220076 */ lhu $v0, 0x76($s1) -/* A0721C 8024031C A602008E */ sh $v0, 0x8e($s0) -/* A07220 80240320 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A07224 80240324 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A07228 80240328 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A0722C 8024032C 8C460028 */ lw $a2, 0x28($v0) -/* A07230 80240330 0C00A720 */ jal atan2 -/* A07234 80240334 8C470030 */ lw $a3, 0x30($v0) -/* A07238 80240338 2402000D */ addiu $v0, $zero, 0xd -/* A0723C 8024033C E600000C */ swc1 $f0, 0xc($s0) -/* A07240 80240340 AE420070 */ sw $v0, 0x70($s2) -/* A07244 80240344 8FBF001C */ lw $ra, 0x1c($sp) -/* A07248 80240348 8FB20018 */ lw $s2, 0x18($sp) -/* A0724C 8024034C 8FB10014 */ lw $s1, 0x14($sp) -/* A07250 80240350 8FB00010 */ lw $s0, 0x10($sp) -/* A07254 80240354 03E00008 */ jr $ra -/* A07258 80240358 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_15/func_8024035C_A06F00.s b/asm/nonmatchings/world/area_nok/nok_15/func_8024035C_A06F00.s deleted file mode 100644 index a07481ba5b..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/func_8024035C_A06F00.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024035C_A0725C -/* A0725C 8024035C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A07260 80240360 AFB3001C */ sw $s3, 0x1c($sp) -/* A07264 80240364 0080982D */ daddu $s3, $a0, $zero -/* A07268 80240368 AFBF0020 */ sw $ra, 0x20($sp) -/* A0726C 8024036C AFB20018 */ sw $s2, 0x18($sp) -/* A07270 80240370 AFB10014 */ sw $s1, 0x14($sp) -/* A07274 80240374 AFB00010 */ sw $s0, 0x10($sp) -/* A07278 80240378 8E710148 */ lw $s1, 0x148($s3) -/* A0727C 8024037C 86240008 */ lh $a0, 8($s1) -/* A07280 80240380 0C00EABB */ jal get_npc_unsafe -/* A07284 80240384 00A0902D */ daddu $s2, $a1, $zero -/* A07288 80240388 0040802D */ daddu $s0, $v0, $zero -/* A0728C 8024038C 8602008E */ lh $v0, 0x8e($s0) -/* A07290 80240390 9603008E */ lhu $v1, 0x8e($s0) -/* A07294 80240394 18400005 */ blez $v0, .L802403AC -/* A07298 80240398 2462FFFF */ addiu $v0, $v1, -1 -/* A0729C 8024039C A602008E */ sh $v0, 0x8e($s0) -/* A072A0 802403A0 00021400 */ sll $v0, $v0, 0x10 -/* A072A4 802403A4 1C400033 */ bgtz $v0, .L80240474 -/* A072A8 802403A8 00000000 */ nop -.L802403AC: -/* A072AC 802403AC 8602008C */ lh $v0, 0x8c($s0) -/* A072B0 802403B0 14400030 */ bnez $v0, .L80240474 -/* A072B4 802403B4 00000000 */ nop -/* A072B8 802403B8 8E2200CC */ lw $v0, 0xcc($s1) -/* A072BC 802403BC 8C420024 */ lw $v0, 0x24($v0) -/* A072C0 802403C0 AE020028 */ sw $v0, 0x28($s0) -/* A072C4 802403C4 C6400018 */ lwc1 $f0, 0x18($s2) -/* A072C8 802403C8 E6000018 */ swc1 $f0, 0x18($s0) -/* A072CC 802403CC 8E230088 */ lw $v1, 0x88($s1) -/* A072D0 802403D0 24020005 */ addiu $v0, $zero, 5 -/* A072D4 802403D4 10620005 */ beq $v1, $v0, .L802403EC -/* A072D8 802403D8 00000000 */ nop -/* A072DC 802403DC 10600003 */ beqz $v1, .L802403EC -/* A072E0 802403E0 24020001 */ addiu $v0, $zero, 1 -/* A072E4 802403E4 14620006 */ bne $v1, $v0, .L80240400 -/* A072E8 802403E8 00000000 */ nop -.L802403EC: -/* A072EC 802403EC 8E220084 */ lw $v0, 0x84($s1) -/* A072F0 802403F0 00021FC2 */ srl $v1, $v0, 0x1f -/* A072F4 802403F4 00431021 */ addu $v0, $v0, $v1 -/* A072F8 802403F8 00021043 */ sra $v0, $v0, 1 -/* A072FC 802403FC A60200A8 */ sh $v0, 0xa8($s0) -.L80240400: -/* A07300 80240400 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A07304 80240404 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A07308 80240408 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A0730C 8024040C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A07310 80240410 8C460028 */ lw $a2, 0x28($v0) -/* A07314 80240414 0C00A7B5 */ jal dist2D -/* A07318 80240418 8C470030 */ lw $a3, 0x30($v0) -/* A0731C 8024041C C6020018 */ lwc1 $f2, 0x18($s0) -/* A07320 80240420 46020003 */ div.s $f0, $f0, $f2 -/* A07324 80240424 3C018024 */ lui $at, 0x8024 -/* A07328 80240428 D4224CF0 */ ldc1 $f2, 0x4cf0($at) -/* A0732C 8024042C 46000021 */ cvt.d.s $f0, $f0 -/* A07330 80240430 46220000 */ add.d $f0, $f0, $f2 -/* A07334 80240434 4620010D */ trunc.w.d $f4, $f0 -/* A07338 80240438 44022000 */ mfc1 $v0, $f4 -/* A0733C 8024043C 00000000 */ nop -/* A07340 80240440 A602008E */ sh $v0, 0x8e($s0) -/* A07344 80240444 00021400 */ sll $v0, $v0, 0x10 -/* A07348 80240448 8E230078 */ lw $v1, 0x78($s1) -/* A0734C 8024044C 00021403 */ sra $v0, $v0, 0x10 -/* A07350 80240450 0043102A */ slt $v0, $v0, $v1 -/* A07354 80240454 10400003 */ beqz $v0, .L80240464 -/* A07358 80240458 00000000 */ nop -/* A0735C 8024045C 9622007A */ lhu $v0, 0x7a($s1) -/* A07360 80240460 A602008E */ sh $v0, 0x8e($s0) -.L80240464: -/* A07364 80240464 8602008E */ lh $v0, 0x8e($s0) -/* A07368 80240468 AE22007C */ sw $v0, 0x7c($s1) -/* A0736C 8024046C 2402000E */ addiu $v0, $zero, 0xe -/* A07370 80240470 AE620070 */ sw $v0, 0x70($s3) -.L80240474: -/* A07374 80240474 8FBF0020 */ lw $ra, 0x20($sp) -/* A07378 80240478 8FB3001C */ lw $s3, 0x1c($sp) -/* A0737C 8024047C 8FB20018 */ lw $s2, 0x18($sp) -/* A07380 80240480 8FB10014 */ lw $s1, 0x14($sp) -/* A07384 80240484 8FB00010 */ lw $s0, 0x10($sp) -/* A07388 80240488 03E00008 */ jr $ra -/* A0738C 8024048C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_15/func_80240490_A06F00.s b/asm/nonmatchings/world/area_nok/nok_15/func_80240490_A06F00.s deleted file mode 100644 index 6c6d94a570..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/func_80240490_A06F00.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240490_A07390 -/* A07390 80240490 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A07394 80240494 AFB3003C */ sw $s3, 0x3c($sp) -/* A07398 80240498 0080982D */ daddu $s3, $a0, $zero -/* A0739C 8024049C AFBF0040 */ sw $ra, 0x40($sp) -/* A073A0 802404A0 AFB20038 */ sw $s2, 0x38($sp) -/* A073A4 802404A4 AFB10034 */ sw $s1, 0x34($sp) -/* A073A8 802404A8 AFB00030 */ sw $s0, 0x30($sp) -/* A073AC 802404AC 8E710148 */ lw $s1, 0x148($s3) -/* A073B0 802404B0 0C00EABB */ jal get_npc_unsafe -/* A073B4 802404B4 86240008 */ lh $a0, 8($s1) -/* A073B8 802404B8 0040802D */ daddu $s0, $v0, $zero -/* A073BC 802404BC 8E22007C */ lw $v0, 0x7c($s1) -/* A073C0 802404C0 8603008E */ lh $v1, 0x8e($s0) -/* A073C4 802404C4 2442FFFF */ addiu $v0, $v0, -1 -/* A073C8 802404C8 14620012 */ bne $v1, $v0, .L80240514 -/* A073CC 802404CC 00000000 */ nop -/* A073D0 802404D0 C6000038 */ lwc1 $f0, 0x38($s0) -/* A073D4 802404D4 4600020D */ trunc.w.s $f8, $f0 -/* A073D8 802404D8 44024000 */ mfc1 $v0, $f8 -/* A073DC 802404DC 00000000 */ nop -/* A073E0 802404E0 A6220010 */ sh $v0, 0x10($s1) -/* A073E4 802404E4 C600003C */ lwc1 $f0, 0x3c($s0) -/* A073E8 802404E8 4600020D */ trunc.w.s $f8, $f0 -/* A073EC 802404EC 44024000 */ mfc1 $v0, $f8 -/* A073F0 802404F0 00000000 */ nop -/* A073F4 802404F4 A6220012 */ sh $v0, 0x12($s1) -/* A073F8 802404F8 C6000040 */ lwc1 $f0, 0x40($s0) -/* A073FC 802404FC 24020001 */ addiu $v0, $zero, 1 -/* A07400 80240500 A2220007 */ sb $v0, 7($s1) -/* A07404 80240504 4600020D */ trunc.w.s $f8, $f0 -/* A07408 80240508 44024000 */ mfc1 $v0, $f8 -/* A0740C 8024050C 00000000 */ nop -/* A07410 80240510 A6220014 */ sh $v0, 0x14($s1) -.L80240514: -/* A07414 80240514 C6000038 */ lwc1 $f0, 0x38($s0) -/* A07418 80240518 C602003C */ lwc1 $f2, 0x3c($s0) -/* A0741C 8024051C C6040040 */ lwc1 $f4, 0x40($s0) -/* A07420 80240520 C6060018 */ lwc1 $f6, 0x18($s0) -/* A07424 80240524 E7A00020 */ swc1 $f0, 0x20($sp) -/* A07428 80240528 E7A20024 */ swc1 $f2, 0x24($sp) -/* A0742C 8024052C E7A40028 */ swc1 $f4, 0x28($sp) -/* A07430 80240530 E7A60010 */ swc1 $f6, 0x10($sp) -/* A07434 80240534 C600000C */ lwc1 $f0, 0xc($s0) -/* A07438 80240538 E7A00014 */ swc1 $f0, 0x14($sp) -/* A0743C 8024053C 860200A8 */ lh $v0, 0xa8($s0) -/* A07440 80240540 27A50020 */ addiu $a1, $sp, 0x20 -/* A07444 80240544 44820000 */ mtc1 $v0, $f0 -/* A07448 80240548 00000000 */ nop -/* A0744C 8024054C 46800020 */ cvt.s.w $f0, $f0 -/* A07450 80240550 E7A00018 */ swc1 $f0, 0x18($sp) -/* A07454 80240554 860200A6 */ lh $v0, 0xa6($s0) -/* A07458 80240558 27A60024 */ addiu $a2, $sp, 0x24 -/* A0745C 8024055C 44820000 */ mtc1 $v0, $f0 -/* A07460 80240560 00000000 */ nop -/* A07464 80240564 46800020 */ cvt.s.w $f0, $f0 -/* A07468 80240568 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A0746C 8024056C 8E040080 */ lw $a0, 0x80($s0) -/* A07470 80240570 0C037711 */ jal func_800DDC44 -/* A07474 80240574 27A70028 */ addiu $a3, $sp, 0x28 -/* A07478 80240578 0040902D */ daddu $s2, $v0, $zero -/* A0747C 8024057C 16400005 */ bnez $s2, .L80240594 -/* A07480 80240580 00000000 */ nop -/* A07484 80240584 8E050018 */ lw $a1, 0x18($s0) -/* A07488 80240588 8E06000C */ lw $a2, 0xc($s0) -/* A0748C 8024058C 0C00EA95 */ jal npc_move_heading -/* A07490 80240590 0200202D */ daddu $a0, $s0, $zero -.L80240594: -/* A07494 80240594 8602008E */ lh $v0, 0x8e($s0) -/* A07498 80240598 9603008E */ lhu $v1, 0x8e($s0) -/* A0749C 8024059C 18400007 */ blez $v0, .L802405BC -/* A074A0 802405A0 2462FFFF */ addiu $v0, $v1, -1 -/* A074A4 802405A4 A602008E */ sh $v0, 0x8e($s0) -/* A074A8 802405A8 00021400 */ sll $v0, $v0, 0x10 -/* A074AC 802405AC 18400003 */ blez $v0, .L802405BC -/* A074B0 802405B0 00000000 */ nop -/* A074B4 802405B4 12400008 */ beqz $s2, .L802405D8 -/* A074B8 802405B8 00000000 */ nop -.L802405BC: -/* A074BC 802405BC 8E2200CC */ lw $v0, 0xcc($s1) -/* A074C0 802405C0 A2200007 */ sb $zero, 7($s1) -/* A074C4 802405C4 8C420028 */ lw $v0, 0x28($v0) -/* A074C8 802405C8 A600008E */ sh $zero, 0x8e($s0) -/* A074CC 802405CC AE020028 */ sw $v0, 0x28($s0) -/* A074D0 802405D0 2402000F */ addiu $v0, $zero, 0xf -/* A074D4 802405D4 AE620070 */ sw $v0, 0x70($s3) -.L802405D8: -/* A074D8 802405D8 8FBF0040 */ lw $ra, 0x40($sp) -/* A074DC 802405DC 8FB3003C */ lw $s3, 0x3c($sp) -/* A074E0 802405E0 8FB20038 */ lw $s2, 0x38($sp) -/* A074E4 802405E4 8FB10034 */ lw $s1, 0x34($sp) -/* A074E8 802405E8 8FB00030 */ lw $s0, 0x30($sp) -/* A074EC 802405EC 03E00008 */ jr $ra -/* A074F0 802405F0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_15/func_80240AB4_A06F00.s b/asm/nonmatchings/world/area_nok/nok_15/func_80240AB4_A06F00.s deleted file mode 100644 index 8641ec305b..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/func_80240AB4_A06F00.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AB4_A079B4 -/* A079B4 80240AB4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A079B8 80240AB8 AFB3002C */ sw $s3, 0x2c($sp) -/* A079BC 80240ABC 0080982D */ daddu $s3, $a0, $zero -/* A079C0 80240AC0 AFBF0030 */ sw $ra, 0x30($sp) -/* A079C4 80240AC4 AFB20028 */ sw $s2, 0x28($sp) -/* A079C8 80240AC8 AFB10024 */ sw $s1, 0x24($sp) -/* A079CC 80240ACC AFB00020 */ sw $s0, 0x20($sp) -/* A079D0 80240AD0 8E710148 */ lw $s1, 0x148($s3) -/* A079D4 80240AD4 86240008 */ lh $a0, 8($s1) -/* A079D8 80240AD8 0C00EABB */ jal get_npc_unsafe -/* A079DC 80240ADC 00A0902D */ daddu $s2, $a1, $zero -/* A079E0 80240AE0 8E440004 */ lw $a0, 4($s2) -/* A079E4 80240AE4 0040802D */ daddu $s0, $v0, $zero -/* A079E8 80240AE8 00041FC2 */ srl $v1, $a0, 0x1f -/* A079EC 80240AEC 00832021 */ addu $a0, $a0, $v1 -/* A079F0 80240AF0 00042043 */ sra $a0, $a0, 1 -/* A079F4 80240AF4 0C00A67F */ jal rand_int -/* A079F8 80240AF8 24840001 */ addiu $a0, $a0, 1 -/* A079FC 80240AFC 8E430004 */ lw $v1, 4($s2) -/* A07A00 80240B00 000327C2 */ srl $a0, $v1, 0x1f -/* A07A04 80240B04 00641821 */ addu $v1, $v1, $a0 -/* A07A08 80240B08 00031843 */ sra $v1, $v1, 1 -/* A07A0C 80240B0C 00621821 */ addu $v1, $v1, $v0 -/* A07A10 80240B10 A603008E */ sh $v1, 0x8e($s0) -/* A07A14 80240B14 8E2300D0 */ lw $v1, 0xd0($s1) -/* A07A18 80240B18 C6000040 */ lwc1 $f0, 0x40($s0) -/* A07A1C 80240B1C C4640000 */ lwc1 $f4, ($v1) -/* A07A20 80240B20 46802120 */ cvt.s.w $f4, $f4 -/* A07A24 80240B24 C4620008 */ lwc1 $f2, 8($v1) -/* A07A28 80240B28 468010A0 */ cvt.s.w $f2, $f2 -/* A07A2C 80240B2C E7A00010 */ swc1 $f0, 0x10($sp) -/* A07A30 80240B30 8E2200D0 */ lw $v0, 0xd0($s1) -/* A07A34 80240B34 44061000 */ mfc1 $a2, $f2 -/* A07A38 80240B38 C440000C */ lwc1 $f0, 0xc($v0) -/* A07A3C 80240B3C 46800020 */ cvt.s.w $f0, $f0 -/* A07A40 80240B40 E7A00014 */ swc1 $f0, 0x14($sp) -/* A07A44 80240B44 8E2200D0 */ lw $v0, 0xd0($s1) -/* A07A48 80240B48 44052000 */ mfc1 $a1, $f4 -/* A07A4C 80240B4C C4400010 */ lwc1 $f0, 0x10($v0) -/* A07A50 80240B50 46800020 */ cvt.s.w $f0, $f0 -/* A07A54 80240B54 E7A00018 */ swc1 $f0, 0x18($sp) -/* A07A58 80240B58 8C640018 */ lw $a0, 0x18($v1) -/* A07A5C 80240B5C 0C0123F5 */ jal is_point_within_region -/* A07A60 80240B60 8E070038 */ lw $a3, 0x38($s0) -/* A07A64 80240B64 1040000E */ beqz $v0, .L80240BA0 -/* A07A68 80240B68 00000000 */ nop -/* A07A6C 80240B6C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A07A70 80240B70 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A07A74 80240B74 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A07A78 80240B78 C4460000 */ lwc1 $f6, ($v0) -/* A07A7C 80240B7C 468031A0 */ cvt.s.w $f6, $f6 -/* A07A80 80240B80 44063000 */ mfc1 $a2, $f6 -/* A07A84 80240B84 C4460008 */ lwc1 $f6, 8($v0) -/* A07A88 80240B88 468031A0 */ cvt.s.w $f6, $f6 -/* A07A8C 80240B8C 44073000 */ mfc1 $a3, $f6 -/* A07A90 80240B90 0C00A720 */ jal atan2 -/* A07A94 80240B94 00000000 */ nop -/* A07A98 80240B98 080902F4 */ j .L80240BD0 -/* A07A9C 80240B9C E600000C */ swc1 $f0, 0xc($s0) -.L80240BA0: -/* A07AA0 80240BA0 0C00A67F */ jal rand_int -/* A07AA4 80240BA4 2404003C */ addiu $a0, $zero, 0x3c -/* A07AA8 80240BA8 C60C000C */ lwc1 $f12, 0xc($s0) -/* A07AAC 80240BAC 44820000 */ mtc1 $v0, $f0 -/* A07AB0 80240BB0 00000000 */ nop -/* A07AB4 80240BB4 46800020 */ cvt.s.w $f0, $f0 -/* A07AB8 80240BB8 46006300 */ add.s $f12, $f12, $f0 -/* A07ABC 80240BBC 3C0141F0 */ lui $at, 0x41f0 -/* A07AC0 80240BC0 44810000 */ mtc1 $at, $f0 -/* A07AC4 80240BC4 0C00A6C9 */ jal clamp_angle -/* A07AC8 80240BC8 46006301 */ sub.s $f12, $f12, $f0 -/* A07ACC 80240BCC E600000C */ swc1 $f0, 0xc($s0) -.L80240BD0: -/* A07AD0 80240BD0 8E2200CC */ lw $v0, 0xcc($s1) -/* A07AD4 80240BD4 8C420004 */ lw $v0, 4($v0) -/* A07AD8 80240BD8 AE020028 */ sw $v0, 0x28($s0) -/* A07ADC 80240BDC AE600074 */ sw $zero, 0x74($s3) -/* A07AE0 80240BE0 8E2200D0 */ lw $v0, 0xd0($s1) -/* A07AE4 80240BE4 8C420014 */ lw $v0, 0x14($v0) -/* A07AE8 80240BE8 04410004 */ bgez $v0, .L80240BFC -/* A07AEC 80240BEC 00000000 */ nop -/* A07AF0 80240BF0 C6400000 */ lwc1 $f0, ($s2) -/* A07AF4 80240BF4 08090307 */ j .L80240C1C -/* A07AF8 80240BF8 E6000018 */ swc1 $f0, 0x18($s0) -.L80240BFC: -/* A07AFC 80240BFC 3C018024 */ lui $at, 0x8024 -/* A07B00 80240C00 D4224D50 */ ldc1 $f2, 0x4d50($at) -/* A07B04 80240C04 44820000 */ mtc1 $v0, $f0 -/* A07B08 80240C08 00000000 */ nop -/* A07B0C 80240C0C 46800021 */ cvt.d.w $f0, $f0 -/* A07B10 80240C10 46220003 */ div.d $f0, $f0, $f2 -/* A07B14 80240C14 46200020 */ cvt.s.d $f0, $f0 -/* A07B18 80240C18 E6000018 */ swc1 $f0, 0x18($s0) -.L80240C1C: -/* A07B1C 80240C1C C600003C */ lwc1 $f0, 0x3c($s0) -/* A07B20 80240C20 3C014059 */ lui $at, 0x4059 -/* A07B24 80240C24 44811800 */ mtc1 $at, $f3 -/* A07B28 80240C28 44801000 */ mtc1 $zero, $f2 -/* A07B2C 80240C2C 46000021 */ cvt.d.s $f0, $f0 -/* A07B30 80240C30 46220002 */ mul.d $f0, $f0, $f2 -/* A07B34 80240C34 00000000 */ nop -/* A07B38 80240C38 24020001 */ addiu $v0, $zero, 1 -/* A07B3C 80240C3C 4620018D */ trunc.w.d $f6, $f0 -/* A07B40 80240C40 E626007C */ swc1 $f6, 0x7c($s1) -/* A07B44 80240C44 AE620070 */ sw $v0, 0x70($s3) -/* A07B48 80240C48 8FBF0030 */ lw $ra, 0x30($sp) -/* A07B4C 80240C4C 8FB3002C */ lw $s3, 0x2c($sp) -/* A07B50 80240C50 8FB20028 */ lw $s2, 0x28($sp) -/* A07B54 80240C54 8FB10024 */ lw $s1, 0x24($sp) -/* A07B58 80240C58 8FB00020 */ lw $s0, 0x20($sp) -/* A07B5C 80240C5C 03E00008 */ jr $ra -/* A07B60 80240C60 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_nok/nok_15/func_80240C64_A06F00.s b/asm/nonmatchings/world/area_nok/nok_15/func_80240C64_A06F00.s deleted file mode 100644 index a7f58380af..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/func_80240C64_A06F00.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C64_A07B64 -/* A07B64 80240C64 27BDFF80 */ addiu $sp, $sp, -0x80 -/* A07B68 80240C68 AFB3004C */ sw $s3, 0x4c($sp) -/* A07B6C 80240C6C 0080982D */ daddu $s3, $a0, $zero -/* A07B70 80240C70 AFBF0058 */ sw $ra, 0x58($sp) -/* A07B74 80240C74 AFB50054 */ sw $s5, 0x54($sp) -/* A07B78 80240C78 AFB40050 */ sw $s4, 0x50($sp) -/* A07B7C 80240C7C AFB20048 */ sw $s2, 0x48($sp) -/* A07B80 80240C80 AFB10044 */ sw $s1, 0x44($sp) -/* A07B84 80240C84 AFB00040 */ sw $s0, 0x40($sp) -/* A07B88 80240C88 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* A07B8C 80240C8C F7B80070 */ sdc1 $f24, 0x70($sp) -/* A07B90 80240C90 F7B60068 */ sdc1 $f22, 0x68($sp) -/* A07B94 80240C94 F7B40060 */ sdc1 $f20, 0x60($sp) -/* A07B98 80240C98 8E710148 */ lw $s1, 0x148($s3) -/* A07B9C 80240C9C 00A0902D */ daddu $s2, $a1, $zero -/* A07BA0 80240CA0 86240008 */ lh $a0, 8($s1) -/* A07BA4 80240CA4 0C00EABB */ jal get_npc_unsafe -/* A07BA8 80240CA8 00C0A82D */ daddu $s5, $a2, $zero -/* A07BAC 80240CAC 0040802D */ daddu $s0, $v0, $zero -/* A07BB0 80240CB0 0000A02D */ daddu $s4, $zero, $zero -/* A07BB4 80240CB4 C624007C */ lwc1 $f4, 0x7c($s1) -/* A07BB8 80240CB8 46802120 */ cvt.s.w $f4, $f4 -/* A07BBC 80240CBC C6220088 */ lwc1 $f2, 0x88($s1) -/* A07BC0 80240CC0 468010A0 */ cvt.s.w $f2, $f2 -/* A07BC4 80240CC4 460010A1 */ cvt.d.s $f2, $f2 -/* A07BC8 80240CC8 46002121 */ cvt.d.s $f4, $f4 -/* A07BCC 80240CCC C600003C */ lwc1 $f0, 0x3c($s0) -/* A07BD0 80240CD0 3C014059 */ lui $at, 0x4059 -/* A07BD4 80240CD4 44813800 */ mtc1 $at, $f7 -/* A07BD8 80240CD8 44803000 */ mtc1 $zero, $f6 -/* A07BDC 80240CDC 46000021 */ cvt.d.s $f0, $f0 -/* A07BE0 80240CE0 46260002 */ mul.d $f0, $f0, $f6 -/* A07BE4 80240CE4 00000000 */ nop -/* A07BE8 80240CE8 24020001 */ addiu $v0, $zero, 1 -/* A07BEC 80240CEC 8E24006C */ lw $a0, 0x6c($s1) -/* A07BF0 80240CF0 46261083 */ div.d $f2, $f2, $f6 -/* A07BF4 80240CF4 462010A0 */ cvt.s.d $f2, $f2 -/* A07BF8 80240CF8 46262103 */ div.d $f4, $f4, $f6 -/* A07BFC 80240CFC 46202520 */ cvt.s.d $f20, $f4 -/* A07C00 80240D00 30830011 */ andi $v1, $a0, 0x11 -/* A07C04 80240D04 4620020D */ trunc.w.d $f8, $f0 -/* A07C08 80240D08 E628007C */ swc1 $f8, 0x7c($s1) -/* A07C0C 80240D0C C6200078 */ lwc1 $f0, 0x78($s1) -/* A07C10 80240D10 46800020 */ cvt.s.w $f0, $f0 -/* A07C14 80240D14 46000021 */ cvt.d.s $f0, $f0 -/* A07C18 80240D18 46260003 */ div.d $f0, $f0, $f6 -/* A07C1C 80240D1C 462006A0 */ cvt.s.d $f26, $f0 -/* A07C20 80240D20 C6200070 */ lwc1 $f0, 0x70($s1) -/* A07C24 80240D24 46800020 */ cvt.s.w $f0, $f0 -/* A07C28 80240D28 46000021 */ cvt.d.s $f0, $f0 -/* A07C2C 80240D2C 46260003 */ div.d $f0, $f0, $f6 -/* A07C30 80240D30 462005A0 */ cvt.s.d $f22, $f0 -/* A07C34 80240D34 14620025 */ bne $v1, $v0, .L80240DCC -/* A07C38 80240D38 4602D600 */ add.s $f24, $f26, $f2 -/* A07C3C 80240D3C 8E020000 */ lw $v0, ($s0) -/* A07C40 80240D40 30420008 */ andi $v0, $v0, 8 -/* A07C44 80240D44 10400009 */ beqz $v0, .L80240D6C -/* A07C48 80240D48 27A50028 */ addiu $a1, $sp, 0x28 -/* A07C4C 80240D4C C600003C */ lwc1 $f0, 0x3c($s0) -/* A07C50 80240D50 4600C001 */ sub.s $f0, $f24, $f0 -/* A07C54 80240D54 4600B03C */ c.lt.s $f22, $f0 -/* A07C58 80240D58 00000000 */ nop -/* A07C5C 80240D5C 4500001B */ bc1f .L80240DCC -/* A07C60 80240D60 34820010 */ ori $v0, $a0, 0x10 -/* A07C64 80240D64 08090373 */ j .L80240DCC -/* A07C68 80240D68 AE22006C */ sw $v0, 0x6c($s1) -.L80240D6C: -/* A07C6C 80240D6C 27A6002C */ addiu $a2, $sp, 0x2c -/* A07C70 80240D70 C6000038 */ lwc1 $f0, 0x38($s0) -/* A07C74 80240D74 C602003C */ lwc1 $f2, 0x3c($s0) -/* A07C78 80240D78 C6040040 */ lwc1 $f4, 0x40($s0) -/* A07C7C 80240D7C 3C01447A */ lui $at, 0x447a -/* A07C80 80240D80 44813000 */ mtc1 $at, $f6 -/* A07C84 80240D84 27A20034 */ addiu $v0, $sp, 0x34 -/* A07C88 80240D88 E7A00028 */ swc1 $f0, 0x28($sp) -/* A07C8C 80240D8C E7A2002C */ swc1 $f2, 0x2c($sp) -/* A07C90 80240D90 E7A40030 */ swc1 $f4, 0x30($sp) -/* A07C94 80240D94 E7A60034 */ swc1 $f6, 0x34($sp) -/* A07C98 80240D98 AFA20010 */ sw $v0, 0x10($sp) -/* A07C9C 80240D9C 8E040080 */ lw $a0, 0x80($s0) -/* A07CA0 80240DA0 0C0372DF */ jal func_800DCB7C -/* A07CA4 80240DA4 27A70030 */ addiu $a3, $sp, 0x30 -/* A07CA8 80240DA8 C7A00034 */ lwc1 $f0, 0x34($sp) -/* A07CAC 80240DAC 4600D001 */ sub.s $f0, $f26, $f0 -/* A07CB0 80240DB0 4600B03C */ c.lt.s $f22, $f0 -/* A07CB4 80240DB4 00000000 */ nop -/* A07CB8 80240DB8 45000004 */ bc1f .L80240DCC -/* A07CBC 80240DBC 00000000 */ nop -/* A07CC0 80240DC0 8E22006C */ lw $v0, 0x6c($s1) -/* A07CC4 80240DC4 34420010 */ ori $v0, $v0, 0x10 -/* A07CC8 80240DC8 AE22006C */ sw $v0, 0x6c($s1) -.L80240DCC: -/* A07CCC 80240DCC 8E22006C */ lw $v0, 0x6c($s1) -/* A07CD0 80240DD0 24030011 */ addiu $v1, $zero, 0x11 -/* A07CD4 80240DD4 30420011 */ andi $v0, $v0, 0x11 -/* A07CD8 80240DD8 14430039 */ bne $v0, $v1, .L80240EC0 -/* A07CDC 80240DDC 00000000 */ nop -/* A07CE0 80240DE0 8E020000 */ lw $v0, ($s0) -/* A07CE4 80240DE4 30420008 */ andi $v0, $v0, 8 -/* A07CE8 80240DE8 1040000A */ beqz $v0, .L80240E14 -/* A07CEC 80240DEC 4600C106 */ mov.s $f4, $f24 -/* A07CF0 80240DF0 4614C081 */ sub.s $f2, $f24, $f20 -/* A07CF4 80240DF4 3C018024 */ lui $at, 0x8024 -/* A07CF8 80240DF8 D4204D58 */ ldc1 $f0, 0x4d58($at) -/* A07CFC 80240DFC 460010A1 */ cvt.d.s $f2, $f2 -/* A07D00 80240E00 46201082 */ mul.d $f2, $f2, $f0 -/* A07D04 80240E04 00000000 */ nop -/* A07D08 80240E08 4600A021 */ cvt.d.s $f0, $f20 -/* A07D0C 80240E0C 0809039E */ j .L80240E78 -/* A07D10 80240E10 46220000 */ add.d $f0, $f0, $f2 -.L80240E14: -/* A07D14 80240E14 27A50028 */ addiu $a1, $sp, 0x28 -/* A07D18 80240E18 27A6002C */ addiu $a2, $sp, 0x2c -/* A07D1C 80240E1C C6000038 */ lwc1 $f0, 0x38($s0) -/* A07D20 80240E20 C6020040 */ lwc1 $f2, 0x40($s0) -/* A07D24 80240E24 3C01447A */ lui $at, 0x447a -/* A07D28 80240E28 44812000 */ mtc1 $at, $f4 -/* A07D2C 80240E2C 27A20034 */ addiu $v0, $sp, 0x34 -/* A07D30 80240E30 E7B4002C */ swc1 $f20, 0x2c($sp) -/* A07D34 80240E34 E7A00028 */ swc1 $f0, 0x28($sp) -/* A07D38 80240E38 E7A20030 */ swc1 $f2, 0x30($sp) -/* A07D3C 80240E3C E7A40034 */ swc1 $f4, 0x34($sp) -/* A07D40 80240E40 AFA20010 */ sw $v0, 0x10($sp) -/* A07D44 80240E44 8E040080 */ lw $a0, 0x80($s0) -/* A07D48 80240E48 0C0372DF */ jal func_800DCB7C -/* A07D4C 80240E4C 27A70030 */ addiu $a3, $sp, 0x30 -/* A07D50 80240E50 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* A07D54 80240E54 461A2100 */ add.s $f4, $f4, $f26 -/* A07D58 80240E58 46142081 */ sub.s $f2, $f4, $f20 -/* A07D5C 80240E5C 3C018024 */ lui $at, 0x8024 -/* A07D60 80240E60 D4204D60 */ ldc1 $f0, 0x4d60($at) -/* A07D64 80240E64 460010A1 */ cvt.d.s $f2, $f2 -/* A07D68 80240E68 46201082 */ mul.d $f2, $f2, $f0 -/* A07D6C 80240E6C 00000000 */ nop -/* A07D70 80240E70 4600A021 */ cvt.d.s $f0, $f20 -/* A07D74 80240E74 46220000 */ add.d $f0, $f0, $f2 -.L80240E78: -/* A07D78 80240E78 46200020 */ cvt.s.d $f0, $f0 -/* A07D7C 80240E7C E600003C */ swc1 $f0, 0x3c($s0) -/* A07D80 80240E80 C600003C */ lwc1 $f0, 0x3c($s0) -/* A07D84 80240E84 46002001 */ sub.s $f0, $f4, $f0 -/* A07D88 80240E88 3C013FF0 */ lui $at, 0x3ff0 -/* A07D8C 80240E8C 44811800 */ mtc1 $at, $f3 -/* A07D90 80240E90 44801000 */ mtc1 $zero, $f2 -/* A07D94 80240E94 46000005 */ abs.s $f0, $f0 -/* A07D98 80240E98 46000021 */ cvt.d.s $f0, $f0 -/* A07D9C 80240E9C 4622003C */ c.lt.d $f0, $f2 -/* A07DA0 80240EA0 00000000 */ nop -/* A07DA4 80240EA4 45000036 */ bc1f .L80240F80 -/* A07DA8 80240EA8 2403FFEF */ addiu $v1, $zero, -0x11 -/* A07DAC 80240EAC E604003C */ swc1 $f4, 0x3c($s0) -/* A07DB0 80240EB0 8E22006C */ lw $v0, 0x6c($s1) -/* A07DB4 80240EB4 00431024 */ and $v0, $v0, $v1 -/* A07DB8 80240EB8 080903E0 */ j .L80240F80 -/* A07DBC 80240EBC AE22006C */ sw $v0, 0x6c($s1) -.L80240EC0: -/* A07DC0 80240EC0 8E220070 */ lw $v0, 0x70($s1) -/* A07DC4 80240EC4 1840002E */ blez $v0, .L80240F80 -/* A07DC8 80240EC8 00000000 */ nop -/* A07DCC 80240ECC C62C0074 */ lwc1 $f12, 0x74($s1) -/* A07DD0 80240ED0 0C00A8BB */ jal sin_deg -/* A07DD4 80240ED4 46806320 */ cvt.s.w $f12, $f12 -/* A07DD8 80240ED8 8E020000 */ lw $v0, ($s0) -/* A07DDC 80240EDC 30420008 */ andi $v0, $v0, 8 -/* A07DE0 80240EE0 10400003 */ beqz $v0, .L80240EF0 -/* A07DE4 80240EE4 46000506 */ mov.s $f20, $f0 -/* A07DE8 80240EE8 080903CC */ j .L80240F30 -/* A07DEC 80240EEC 0000102D */ daddu $v0, $zero, $zero -.L80240EF0: -/* A07DF0 80240EF0 27A50028 */ addiu $a1, $sp, 0x28 -/* A07DF4 80240EF4 27A6002C */ addiu $a2, $sp, 0x2c -/* A07DF8 80240EF8 C6000038 */ lwc1 $f0, 0x38($s0) -/* A07DFC 80240EFC C602003C */ lwc1 $f2, 0x3c($s0) -/* A07E00 80240F00 C6040040 */ lwc1 $f4, 0x40($s0) -/* A07E04 80240F04 3C01447A */ lui $at, 0x447a -/* A07E08 80240F08 44813000 */ mtc1 $at, $f6 -/* A07E0C 80240F0C 27A20034 */ addiu $v0, $sp, 0x34 -/* A07E10 80240F10 E7A00028 */ swc1 $f0, 0x28($sp) -/* A07E14 80240F14 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A07E18 80240F18 E7A40030 */ swc1 $f4, 0x30($sp) -/* A07E1C 80240F1C E7A60034 */ swc1 $f6, 0x34($sp) -/* A07E20 80240F20 AFA20010 */ sw $v0, 0x10($sp) -/* A07E24 80240F24 8E040080 */ lw $a0, 0x80($s0) -/* A07E28 80240F28 0C0372DF */ jal func_800DCB7C -/* A07E2C 80240F2C 27A70030 */ addiu $a3, $sp, 0x30 -.L80240F30: -/* A07E30 80240F30 10400007 */ beqz $v0, .L80240F50 -/* A07E34 80240F34 00000000 */ nop -/* A07E38 80240F38 4616A082 */ mul.s $f2, $f20, $f22 -/* A07E3C 80240F3C 00000000 */ nop -/* A07E40 80240F40 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A07E44 80240F44 461A0000 */ add.s $f0, $f0, $f26 -/* A07E48 80240F48 080903D7 */ j .L80240F5C -/* A07E4C 80240F4C 46020000 */ add.s $f0, $f0, $f2 -.L80240F50: -/* A07E50 80240F50 4616A002 */ mul.s $f0, $f20, $f22 -/* A07E54 80240F54 00000000 */ nop -/* A07E58 80240F58 4600C000 */ add.s $f0, $f24, $f0 -.L80240F5C: -/* A07E5C 80240F5C E600003C */ swc1 $f0, 0x3c($s0) -/* A07E60 80240F60 8E220074 */ lw $v0, 0x74($s1) -/* A07E64 80240F64 2442000A */ addiu $v0, $v0, 0xa -/* A07E68 80240F68 44826000 */ mtc1 $v0, $f12 -/* A07E6C 80240F6C 00000000 */ nop -/* A07E70 80240F70 0C00A6C9 */ jal clamp_angle -/* A07E74 80240F74 46806320 */ cvt.s.w $f12, $f12 -/* A07E78 80240F78 4600020D */ trunc.w.s $f8, $f0 -/* A07E7C 80240F7C E6280074 */ swc1 $f8, 0x74($s1) -.L80240F80: -/* A07E80 80240F80 8E220090 */ lw $v0, 0x90($s1) -/* A07E84 80240F84 1C40004A */ bgtz $v0, .L802410B0 -/* A07E88 80240F88 2442FFFF */ addiu $v0, $v0, -1 -/* A07E8C 80240F8C 8E430014 */ lw $v1, 0x14($s2) -/* A07E90 80240F90 04600048 */ bltz $v1, .L802410B4 -/* A07E94 80240F94 00000000 */ nop -/* A07E98 80240F98 8E620074 */ lw $v0, 0x74($s3) -/* A07E9C 80240F9C 1C400042 */ bgtz $v0, .L802410A8 -/* A07EA0 80240FA0 2442FFFF */ addiu $v0, $v0, -1 -/* A07EA4 80240FA4 AE630074 */ sw $v1, 0x74($s3) -/* A07EA8 80240FA8 860200A8 */ lh $v0, 0xa8($s0) -/* A07EAC 80240FAC C602003C */ lwc1 $f2, 0x3c($s0) -/* A07EB0 80240FB0 44820000 */ mtc1 $v0, $f0 -/* A07EB4 80240FB4 00000000 */ nop -/* A07EB8 80240FB8 46800020 */ cvt.s.w $f0, $f0 -/* A07EBC 80240FBC 46001080 */ add.s $f2, $f2, $f0 -/* A07EC0 80240FC0 3C014024 */ lui $at, 0x4024 -/* A07EC4 80240FC4 44810800 */ mtc1 $at, $f1 -/* A07EC8 80240FC8 44800000 */ mtc1 $zero, $f0 -/* A07ECC 80240FCC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A07ED0 80240FD0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A07ED4 80240FD4 460010A1 */ cvt.d.s $f2, $f2 -/* A07ED8 80240FD8 46201080 */ add.d $f2, $f2, $f0 -/* A07EDC 80240FDC C440002C */ lwc1 $f0, 0x2c($v0) -/* A07EE0 80240FE0 46000021 */ cvt.d.s $f0, $f0 -/* A07EE4 80240FE4 4622003C */ c.lt.d $f0, $f2 -/* A07EE8 80240FE8 00000000 */ nop -/* A07EEC 80240FEC 4500002C */ bc1f .L802410A0 -/* A07EF0 80240FF0 02A0202D */ daddu $a0, $s5, $zero -/* A07EF4 80240FF4 AFA00010 */ sw $zero, 0x10($sp) -/* A07EF8 80240FF8 8E46000C */ lw $a2, 0xc($s2) -/* A07EFC 80240FFC 8E470010 */ lw $a3, 0x10($s2) -/* A07F00 80241000 0C01242D */ jal func_800490B4 -/* A07F04 80241004 0220282D */ daddu $a1, $s1, $zero -/* A07F08 80241008 10400025 */ beqz $v0, .L802410A0 -/* A07F0C 8024100C 0000202D */ daddu $a0, $zero, $zero -/* A07F10 80241010 0200282D */ daddu $a1, $s0, $zero -/* A07F14 80241014 0000302D */ daddu $a2, $zero, $zero -/* A07F18 80241018 2412000C */ addiu $s2, $zero, 0xc -/* A07F1C 8024101C 860300A8 */ lh $v1, 0xa8($s0) -/* A07F20 80241020 3C013F80 */ lui $at, 0x3f80 -/* A07F24 80241024 44810000 */ mtc1 $at, $f0 -/* A07F28 80241028 3C014000 */ lui $at, 0x4000 -/* A07F2C 8024102C 44811000 */ mtc1 $at, $f2 -/* A07F30 80241030 3C01C1A0 */ lui $at, 0xc1a0 -/* A07F34 80241034 44812000 */ mtc1 $at, $f4 -/* A07F38 80241038 44834000 */ mtc1 $v1, $f8 -/* A07F3C 8024103C 00000000 */ nop -/* A07F40 80241040 46804220 */ cvt.s.w $f8, $f8 -/* A07F44 80241044 44074000 */ mfc1 $a3, $f8 -/* A07F48 80241048 27A20038 */ addiu $v0, $sp, 0x38 -/* A07F4C 8024104C AFB2001C */ sw $s2, 0x1c($sp) -/* A07F50 80241050 AFA20020 */ sw $v0, 0x20($sp) -/* A07F54 80241054 E7A00010 */ swc1 $f0, 0x10($sp) -/* A07F58 80241058 E7A20014 */ swc1 $f2, 0x14($sp) -/* A07F5C 8024105C 0C01BFA4 */ jal fx_emote -/* A07F60 80241060 E7A40018 */ swc1 $f4, 0x18($sp) -/* A07F64 80241064 0200202D */ daddu $a0, $s0, $zero -/* A07F68 80241068 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A07F6C 8024106C C480003C */ lwc1 $f0, 0x3c($a0) -/* A07F70 80241070 3C060020 */ lui $a2, 0x20 -/* A07F74 80241074 0C012530 */ jal func_800494C0 -/* A07F78 80241078 E4800064 */ swc1 $f0, 0x64($a0) -/* A07F7C 8024107C 8E220018 */ lw $v0, 0x18($s1) -/* A07F80 80241080 9442002A */ lhu $v0, 0x2a($v0) -/* A07F84 80241084 30420001 */ andi $v0, $v0, 1 -/* A07F88 80241088 10400003 */ beqz $v0, .L80241098 -/* A07F8C 8024108C 2402000A */ addiu $v0, $zero, 0xa -/* A07F90 80241090 08090496 */ j .L80241258 -/* A07F94 80241094 AE620070 */ sw $v0, 0x70($s3) -.L80241098: -/* A07F98 80241098 08090496 */ j .L80241258 -/* A07F9C 8024109C AE720070 */ sw $s2, 0x70($s3) -.L802410A0: -/* A07FA0 802410A0 8E620074 */ lw $v0, 0x74($s3) -/* A07FA4 802410A4 2442FFFF */ addiu $v0, $v0, -1 -.L802410A8: -/* A07FA8 802410A8 0809042D */ j .L802410B4 -/* A07FAC 802410AC AE620074 */ sw $v0, 0x74($s3) -.L802410B0: -/* A07FB0 802410B0 AE220090 */ sw $v0, 0x90($s1) -.L802410B4: -/* A07FB4 802410B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A07FB8 802410B8 C6000040 */ lwc1 $f0, 0x40($s0) -/* A07FBC 802410BC C4620000 */ lwc1 $f2, ($v1) -/* A07FC0 802410C0 468010A0 */ cvt.s.w $f2, $f2 -/* A07FC4 802410C4 C4640008 */ lwc1 $f4, 8($v1) -/* A07FC8 802410C8 46802120 */ cvt.s.w $f4, $f4 -/* A07FCC 802410CC E7A00010 */ swc1 $f0, 0x10($sp) -/* A07FD0 802410D0 8E2200D0 */ lw $v0, 0xd0($s1) -/* A07FD4 802410D4 44051000 */ mfc1 $a1, $f2 -/* A07FD8 802410D8 C440000C */ lwc1 $f0, 0xc($v0) -/* A07FDC 802410DC 46800020 */ cvt.s.w $f0, $f0 -/* A07FE0 802410E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* A07FE4 802410E4 8E2200D0 */ lw $v0, 0xd0($s1) -/* A07FE8 802410E8 44062000 */ mfc1 $a2, $f4 -/* A07FEC 802410EC C4400010 */ lwc1 $f0, 0x10($v0) -/* A07FF0 802410F0 46800020 */ cvt.s.w $f0, $f0 -/* A07FF4 802410F4 E7A00018 */ swc1 $f0, 0x18($sp) -/* A07FF8 802410F8 8C640018 */ lw $a0, 0x18($v1) -/* A07FFC 802410FC 0C0123F5 */ jal is_point_within_region -/* A08000 80241100 8E070038 */ lw $a3, 0x38($s0) -/* A08004 80241104 1040001A */ beqz $v0, .L80241170 -/* A08008 80241108 00000000 */ nop -/* A0800C 8024110C 8E060038 */ lw $a2, 0x38($s0) -/* A08010 80241110 8E2200D0 */ lw $v0, 0xd0($s1) -/* A08014 80241114 8E070040 */ lw $a3, 0x40($s0) -/* A08018 80241118 C44C0000 */ lwc1 $f12, ($v0) -/* A0801C 8024111C 46806320 */ cvt.s.w $f12, $f12 -/* A08020 80241120 C44E0008 */ lwc1 $f14, 8($v0) -/* A08024 80241124 0C00A7B5 */ jal dist2D -/* A08028 80241128 468073A0 */ cvt.s.w $f14, $f14 -/* A0802C 8024112C C6020018 */ lwc1 $f2, 0x18($s0) -/* A08030 80241130 4600103C */ c.lt.s $f2, $f0 -/* A08034 80241134 00000000 */ nop -/* A08038 80241138 4500000D */ bc1f .L80241170 -/* A0803C 8024113C E7A00034 */ swc1 $f0, 0x34($sp) -/* A08040 80241140 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A08044 80241144 8E2200D0 */ lw $v0, 0xd0($s1) -/* A08048 80241148 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A0804C 8024114C C4480000 */ lwc1 $f8, ($v0) -/* A08050 80241150 46804220 */ cvt.s.w $f8, $f8 -/* A08054 80241154 44064000 */ mfc1 $a2, $f8 -/* A08058 80241158 C4480008 */ lwc1 $f8, 8($v0) -/* A0805C 8024115C 46804220 */ cvt.s.w $f8, $f8 -/* A08060 80241160 44074000 */ mfc1 $a3, $f8 -/* A08064 80241164 0C00A720 */ jal atan2 -/* A08068 80241168 24140001 */ addiu $s4, $zero, 1 -/* A0806C 8024116C E600000C */ swc1 $f0, 0xc($s0) -.L80241170: -/* A08070 80241170 8E2200D0 */ lw $v0, 0xd0($s1) -/* A08074 80241174 8C43000C */ lw $v1, 0xc($v0) -/* A08078 80241178 8C420010 */ lw $v0, 0x10($v0) -/* A0807C 8024117C 00621825 */ or $v1, $v1, $v0 -/* A08080 80241180 00741825 */ or $v1, $v1, $s4 -/* A08084 80241184 10600008 */ beqz $v1, .L802411A8 -/* A08088 80241188 00000000 */ nop -/* A0808C 8024118C 8602008C */ lh $v0, 0x8c($s0) -/* A08090 80241190 14400031 */ bnez $v0, .L80241258 -/* A08094 80241194 00000000 */ nop -/* A08098 80241198 8E050018 */ lw $a1, 0x18($s0) -/* A0809C 8024119C 8E06000C */ lw $a2, 0xc($s0) -/* A080A0 802411A0 0C00EA95 */ jal npc_move_heading -/* A080A4 802411A4 0200202D */ daddu $a0, $s0, $zero -.L802411A8: -/* A080A8 802411A8 C600003C */ lwc1 $f0, 0x3c($s0) -/* A080AC 802411AC 3C014059 */ lui $at, 0x4059 -/* A080B0 802411B0 44811800 */ mtc1 $at, $f3 -/* A080B4 802411B4 44801000 */ mtc1 $zero, $f2 -/* A080B8 802411B8 46000021 */ cvt.d.s $f0, $f0 -/* A080BC 802411BC 46220002 */ mul.d $f0, $f0, $f2 -/* A080C0 802411C0 00000000 */ nop -/* A080C4 802411C4 4620020D */ trunc.w.d $f8, $f0 -/* A080C8 802411C8 E628007C */ swc1 $f8, 0x7c($s1) -/* A080CC 802411CC 8E420004 */ lw $v0, 4($s2) -/* A080D0 802411D0 18400021 */ blez $v0, .L80241258 -/* A080D4 802411D4 00000000 */ nop -/* A080D8 802411D8 8602008E */ lh $v0, 0x8e($s0) -/* A080DC 802411DC 9603008E */ lhu $v1, 0x8e($s0) -/* A080E0 802411E0 18400005 */ blez $v0, .L802411F8 -/* A080E4 802411E4 2462FFFF */ addiu $v0, $v1, -1 -/* A080E8 802411E8 A602008E */ sh $v0, 0x8e($s0) -/* A080EC 802411EC 00021400 */ sll $v0, $v0, 0x10 -/* A080F0 802411F0 1C400019 */ bgtz $v0, .L80241258 -/* A080F4 802411F4 00000000 */ nop -.L802411F8: -/* A080F8 802411F8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A080FC 802411FC 24020002 */ addiu $v0, $zero, 2 -/* A08100 80241200 0C00A67F */ jal rand_int -/* A08104 80241204 AE620070 */ sw $v0, 0x70($s3) -/* A08108 80241208 3C035555 */ lui $v1, 0x5555 -/* A0810C 8024120C 34635556 */ ori $v1, $v1, 0x5556 -/* A08110 80241210 00430018 */ mult $v0, $v1 -/* A08114 80241214 000227C3 */ sra $a0, $v0, 0x1f -/* A08118 80241218 00004010 */ mfhi $t0 -/* A0811C 8024121C 01042023 */ subu $a0, $t0, $a0 -/* A08120 80241220 00041840 */ sll $v1, $a0, 1 -/* A08124 80241224 00641821 */ addu $v1, $v1, $a0 -/* A08128 80241228 00431023 */ subu $v0, $v0, $v1 -/* A0812C 8024122C 24430002 */ addiu $v1, $v0, 2 -/* A08130 80241230 AE630074 */ sw $v1, 0x74($s3) -/* A08134 80241234 8E42002C */ lw $v0, 0x2c($s2) -/* A08138 80241238 58400007 */ blezl $v0, .L80241258 -/* A0813C 8024123C AE600070 */ sw $zero, 0x70($s3) -/* A08140 80241240 8E420008 */ lw $v0, 8($s2) -/* A08144 80241244 18400003 */ blez $v0, .L80241254 -/* A08148 80241248 28620003 */ slti $v0, $v1, 3 -/* A0814C 8024124C 10400002 */ beqz $v0, .L80241258 -/* A08150 80241250 00000000 */ nop -.L80241254: -/* A08154 80241254 AE600070 */ sw $zero, 0x70($s3) -.L80241258: -/* A08158 80241258 8FBF0058 */ lw $ra, 0x58($sp) -/* A0815C 8024125C 8FB50054 */ lw $s5, 0x54($sp) -/* A08160 80241260 8FB40050 */ lw $s4, 0x50($sp) -/* A08164 80241264 8FB3004C */ lw $s3, 0x4c($sp) -/* A08168 80241268 8FB20048 */ lw $s2, 0x48($sp) -/* A0816C 8024126C 8FB10044 */ lw $s1, 0x44($sp) -/* A08170 80241270 8FB00040 */ lw $s0, 0x40($sp) -/* A08174 80241274 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* A08178 80241278 D7B80070 */ ldc1 $f24, 0x70($sp) -/* A0817C 8024127C D7B60068 */ ldc1 $f22, 0x68($sp) -/* A08180 80241280 D7B40060 */ ldc1 $f20, 0x60($sp) -/* A08184 80241284 03E00008 */ jr $ra -/* A08188 80241288 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_nok/nok_15/func_80241690_A06F00.s b/asm/nonmatchings/world/area_nok/nok_15/func_80241690_A06F00.s deleted file mode 100644 index 736cba68f3..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/func_80241690_A06F00.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241690_A08590 -/* A08590 80241690 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A08594 80241694 AFB20018 */ sw $s2, 0x18($sp) -/* A08598 80241698 0080902D */ daddu $s2, $a0, $zero -/* A0859C 8024169C AFBF001C */ sw $ra, 0x1c($sp) -/* A085A0 802416A0 AFB10014 */ sw $s1, 0x14($sp) -/* A085A4 802416A4 AFB00010 */ sw $s0, 0x10($sp) -/* A085A8 802416A8 8E510148 */ lw $s1, 0x148($s2) -/* A085AC 802416AC 0C00EABB */ jal get_npc_unsafe -/* A085B0 802416B0 86240008 */ lh $a0, 8($s1) -/* A085B4 802416B4 0040802D */ daddu $s0, $v0, $zero -/* A085B8 802416B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A085BC 802416BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A085C0 802416C0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A085C4 802416C4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A085C8 802416C8 A600008E */ sh $zero, 0x8e($s0) -/* A085CC 802416CC 8C460028 */ lw $a2, 0x28($v0) -/* A085D0 802416D0 0C00A720 */ jal atan2 -/* A085D4 802416D4 8C470030 */ lw $a3, 0x30($v0) -/* A085D8 802416D8 E600000C */ swc1 $f0, 0xc($s0) -/* A085DC 802416DC 8E2200CC */ lw $v0, 0xcc($s1) -/* A085E0 802416E0 8C420020 */ lw $v0, 0x20($v0) -/* A085E4 802416E4 AE020028 */ sw $v0, 0x28($s0) -/* A085E8 802416E8 2402000B */ addiu $v0, $zero, 0xb -/* A085EC 802416EC AE420070 */ sw $v0, 0x70($s2) -/* A085F0 802416F0 8FBF001C */ lw $ra, 0x1c($sp) -/* A085F4 802416F4 8FB20018 */ lw $s2, 0x18($sp) -/* A085F8 802416F8 8FB10014 */ lw $s1, 0x14($sp) -/* A085FC 802416FC 8FB00010 */ lw $s0, 0x10($sp) -/* A08600 80241700 03E00008 */ jr $ra -/* A08604 80241704 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_15/func_80241774_A06F00.s b/asm/nonmatchings/world/area_nok/nok_15/func_80241774_A06F00.s deleted file mode 100644 index 89767acd60..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/func_80241774_A06F00.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241774_A08674 -/* A08674 80241774 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A08678 80241778 AFB3001C */ sw $s3, 0x1c($sp) -/* A0867C 8024177C 0080982D */ daddu $s3, $a0, $zero -/* A08680 80241780 AFBF0020 */ sw $ra, 0x20($sp) -/* A08684 80241784 AFB20018 */ sw $s2, 0x18($sp) -/* A08688 80241788 AFB10014 */ sw $s1, 0x14($sp) -/* A0868C 8024178C AFB00010 */ sw $s0, 0x10($sp) -/* A08690 80241790 8E720148 */ lw $s2, 0x148($s3) -/* A08694 80241794 86440008 */ lh $a0, 8($s2) -/* A08698 80241798 0C00EABB */ jal get_npc_unsafe -/* A0869C 8024179C 00A0802D */ daddu $s0, $a1, $zero -/* A086A0 802417A0 0040882D */ daddu $s1, $v0, $zero -/* A086A4 802417A4 C6420080 */ lwc1 $f2, 0x80($s2) -/* A086A8 802417A8 468010A0 */ cvt.s.w $f2, $f2 -/* A086AC 802417AC 460010A1 */ cvt.d.s $f2, $f2 -/* A086B0 802417B0 C6400084 */ lwc1 $f0, 0x84($s2) -/* A086B4 802417B4 46800020 */ cvt.s.w $f0, $f0 -/* A086B8 802417B8 46000021 */ cvt.d.s $f0, $f0 -/* A086BC 802417BC 3C014059 */ lui $at, 0x4059 -/* A086C0 802417C0 44812800 */ mtc1 $at, $f5 -/* A086C4 802417C4 44802000 */ mtc1 $zero, $f4 -/* A086C8 802417C8 8E4200CC */ lw $v0, 0xcc($s2) -/* A086CC 802417CC C62C0038 */ lwc1 $f12, 0x38($s1) -/* A086D0 802417D0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A086D4 802417D4 46241083 */ div.d $f2, $f2, $f4 -/* A086D8 802417D8 462010A0 */ cvt.s.d $f2, $f2 -/* A086DC 802417DC 46240003 */ div.d $f0, $f0, $f4 -/* A086E0 802417E0 8C420020 */ lw $v0, 0x20($v0) -/* A086E4 802417E4 46200020 */ cvt.s.d $f0, $f0 -/* A086E8 802417E8 E622001C */ swc1 $f2, 0x1c($s1) -/* A086EC 802417EC E6200014 */ swc1 $f0, 0x14($s1) -/* A086F0 802417F0 AE220028 */ sw $v0, 0x28($s1) -/* A086F4 802417F4 C6000018 */ lwc1 $f0, 0x18($s0) -/* A086F8 802417F8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A086FC 802417FC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A08700 80241800 E6200018 */ swc1 $f0, 0x18($s1) -/* A08704 80241804 8C460028 */ lw $a2, 0x28($v0) -/* A08708 80241808 0C00A720 */ jal atan2 -/* A0870C 8024180C 8C470030 */ lw $a3, 0x30($v0) -/* A08710 80241810 E620000C */ swc1 $f0, 0xc($s1) -/* A08714 80241814 8E420018 */ lw $v0, 0x18($s2) -/* A08718 80241818 AE400074 */ sw $zero, 0x74($s2) -/* A0871C 8024181C 9442002A */ lhu $v0, 0x2a($v0) -/* A08720 80241820 30420002 */ andi $v0, $v0, 2 -/* A08724 80241824 10400005 */ beqz $v0, .L8024183C -/* A08728 80241828 24020003 */ addiu $v0, $zero, 3 -/* A0872C 8024182C A622008E */ sh $v0, 0x8e($s1) -/* A08730 80241830 2402000D */ addiu $v0, $zero, 0xd -/* A08734 80241834 08090623 */ j .L8024188C -/* A08738 80241838 AE620070 */ sw $v0, 0x70($s3) -.L8024183C: -/* A0873C 8024183C 24030001 */ addiu $v1, $zero, 1 -/* A08740 80241840 2402000E */ addiu $v0, $zero, 0xe -/* A08744 80241844 A623008E */ sh $v1, 0x8e($s1) -/* A08748 80241848 AE620070 */ sw $v0, 0x70($s3) -/* A0874C 8024184C C6200038 */ lwc1 $f0, 0x38($s1) -/* A08750 80241850 4600018D */ trunc.w.s $f6, $f0 -/* A08754 80241854 44023000 */ mfc1 $v0, $f6 -/* A08758 80241858 00000000 */ nop -/* A0875C 8024185C A6420010 */ sh $v0, 0x10($s2) -/* A08760 80241860 C620003C */ lwc1 $f0, 0x3c($s1) -/* A08764 80241864 4600018D */ trunc.w.s $f6, $f0 -/* A08768 80241868 44023000 */ mfc1 $v0, $f6 -/* A0876C 8024186C 00000000 */ nop -/* A08770 80241870 A6420012 */ sh $v0, 0x12($s2) -/* A08774 80241874 C6200040 */ lwc1 $f0, 0x40($s1) -/* A08778 80241878 A2430007 */ sb $v1, 7($s2) -/* A0877C 8024187C 4600018D */ trunc.w.s $f6, $f0 -/* A08780 80241880 44023000 */ mfc1 $v0, $f6 -/* A08784 80241884 00000000 */ nop -/* A08788 80241888 A6420014 */ sh $v0, 0x14($s2) -.L8024188C: -/* A0878C 8024188C 8FBF0020 */ lw $ra, 0x20($sp) -/* A08790 80241890 8FB3001C */ lw $s3, 0x1c($sp) -/* A08794 80241894 8FB20018 */ lw $s2, 0x18($sp) -/* A08798 80241898 8FB10014 */ lw $s1, 0x14($sp) -/* A0879C 8024189C 8FB00010 */ lw $s0, 0x10($sp) -/* A087A0 802418A0 03E00008 */ jr $ra -/* A087A4 802418A4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_15/func_8024190C_A06F00.s b/asm/nonmatchings/world/area_nok/nok_15/func_8024190C_A06F00.s deleted file mode 100644 index 153b9f7d6f..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/func_8024190C_A06F00.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024190C_A0880C -/* A0880C 8024190C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A08810 80241910 AFB20030 */ sw $s2, 0x30($sp) -/* A08814 80241914 0080902D */ daddu $s2, $a0, $zero -/* A08818 80241918 AFBF0038 */ sw $ra, 0x38($sp) -/* A0881C 8024191C AFB30034 */ sw $s3, 0x34($sp) -/* A08820 80241920 AFB1002C */ sw $s1, 0x2c($sp) -/* A08824 80241924 AFB00028 */ sw $s0, 0x28($sp) -/* A08828 80241928 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A0882C 8024192C F7B40040 */ sdc1 $f20, 0x40($sp) -/* A08830 80241930 8E510148 */ lw $s1, 0x148($s2) -/* A08834 80241934 86240008 */ lh $a0, 8($s1) -/* A08838 80241938 0C00EABB */ jal get_npc_unsafe -/* A0883C 8024193C 00A0982D */ daddu $s3, $a1, $zero -/* A08840 80241940 0040802D */ daddu $s0, $v0, $zero -/* A08844 80241944 0200202D */ daddu $a0, $s0, $zero -/* A08848 80241948 C6220088 */ lwc1 $f2, 0x88($s1) -/* A0884C 8024194C 468010A0 */ cvt.s.w $f2, $f2 -/* A08850 80241950 460010A1 */ cvt.d.s $f2, $f2 -/* A08854 80241954 C604001C */ lwc1 $f4, 0x1c($s0) -/* A08858 80241958 C6000014 */ lwc1 $f0, 0x14($s0) -/* A0885C 8024195C 8E050018 */ lw $a1, 0x18($s0) -/* A08860 80241960 46002100 */ add.s $f4, $f4, $f0 -/* A08864 80241964 8E06000C */ lw $a2, 0xc($s0) -/* A08868 80241968 C6200078 */ lwc1 $f0, 0x78($s1) -/* A0886C 8024196C 46800020 */ cvt.s.w $f0, $f0 -/* A08870 80241970 E604001C */ swc1 $f4, 0x1c($s0) -/* A08874 80241974 3C014059 */ lui $at, 0x4059 -/* A08878 80241978 44812800 */ mtc1 $at, $f5 -/* A0887C 8024197C 44802000 */ mtc1 $zero, $f4 -/* A08880 80241980 46000021 */ cvt.d.s $f0, $f0 -/* A08884 80241984 46240003 */ div.d $f0, $f0, $f4 -/* A08888 80241988 46200520 */ cvt.s.d $f20, $f0 -/* A0888C 8024198C 46241083 */ div.d $f2, $f2, $f4 -/* A08890 80241990 0C00EA95 */ jal npc_move_heading -/* A08894 80241994 462015A0 */ cvt.s.d $f22, $f2 -/* A08898 80241998 C604001C */ lwc1 $f4, 0x1c($s0) -/* A0889C 8024199C 44801000 */ mtc1 $zero, $f2 -/* A088A0 802419A0 44801800 */ mtc1 $zero, $f3 -/* A088A4 802419A4 46002021 */ cvt.d.s $f0, $f4 -/* A088A8 802419A8 4620103E */ c.le.d $f2, $f0 -/* A088AC 802419AC 00000000 */ nop -/* A088B0 802419B0 45000030 */ bc1f .L80241A74 -/* A088B4 802419B4 00000000 */ nop -/* A088B8 802419B8 C600003C */ lwc1 $f0, 0x3c($s0) -/* A088BC 802419BC 46040000 */ add.s $f0, $f0, $f4 -/* A088C0 802419C0 E600003C */ swc1 $f0, 0x3c($s0) -/* A088C4 802419C4 8E2200CC */ lw $v0, 0xcc($s1) -/* A088C8 802419C8 8C420024 */ lw $v0, 0x24($v0) -/* A088CC 802419CC AE020028 */ sw $v0, 0x28($s0) -/* A088D0 802419D0 A2200007 */ sb $zero, 7($s1) -/* A088D4 802419D4 8E020000 */ lw $v0, ($s0) -/* A088D8 802419D8 30420008 */ andi $v0, $v0, 8 -/* A088DC 802419DC 14400011 */ bnez $v0, .L80241A24 -/* A088E0 802419E0 0000102D */ daddu $v0, $zero, $zero -/* A088E4 802419E4 27A50018 */ addiu $a1, $sp, 0x18 -/* A088E8 802419E8 27A6001C */ addiu $a2, $sp, 0x1c -/* A088EC 802419EC C6000038 */ lwc1 $f0, 0x38($s0) -/* A088F0 802419F0 C602003C */ lwc1 $f2, 0x3c($s0) -/* A088F4 802419F4 C6040040 */ lwc1 $f4, 0x40($s0) -/* A088F8 802419F8 3C01447A */ lui $at, 0x447a -/* A088FC 802419FC 44813000 */ mtc1 $at, $f6 -/* A08900 80241A00 27A20024 */ addiu $v0, $sp, 0x24 -/* A08904 80241A04 E7A00018 */ swc1 $f0, 0x18($sp) -/* A08908 80241A08 E7A2001C */ swc1 $f2, 0x1c($sp) -/* A0890C 80241A0C E7A40020 */ swc1 $f4, 0x20($sp) -/* A08910 80241A10 E7A60024 */ swc1 $f6, 0x24($sp) -/* A08914 80241A14 AFA20010 */ sw $v0, 0x10($sp) -/* A08918 80241A18 8E040080 */ lw $a0, 0x80($s0) -/* A0891C 80241A1C 0C0372DF */ jal func_800DCB7C -/* A08920 80241A20 27A70020 */ addiu $a3, $sp, 0x20 -.L80241A24: -/* A08924 80241A24 1040000B */ beqz $v0, .L80241A54 -/* A08928 80241A28 00000000 */ nop -/* A0892C 80241A2C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A08930 80241A30 46140080 */ add.s $f2, $f0, $f20 -/* A08934 80241A34 C600003C */ lwc1 $f0, 0x3c($s0) -/* A08938 80241A38 4600103E */ c.le.s $f2, $f0 -/* A0893C 80241A3C 00000000 */ nop -/* A08940 80241A40 4500008D */ bc1f .L80241C78 -/* A08944 80241A44 00000000 */ nop -/* A08948 80241A48 E602003C */ swc1 $f2, 0x3c($s0) -/* A0894C 80241A4C 0809071E */ j .L80241C78 -/* A08950 80241A50 AE400070 */ sw $zero, 0x70($s2) -.L80241A54: -/* A08954 80241A54 C602003C */ lwc1 $f2, 0x3c($s0) -/* A08958 80241A58 C6000064 */ lwc1 $f0, 0x64($s0) -/* A0895C 80241A5C 4602003E */ c.le.s $f0, $f2 -/* A08960 80241A60 00000000 */ nop -/* A08964 80241A64 45030084 */ bc1tl .L80241C78 -/* A08968 80241A68 AE400070 */ sw $zero, 0x70($s2) -/* A0896C 80241A6C 0809071E */ j .L80241C78 -/* A08970 80241A70 00000000 */ nop -.L80241A74: -/* A08974 80241A74 4622003C */ c.lt.d $f0, $f2 -/* A08978 80241A78 00000000 */ nop -/* A0897C 80241A7C 4500007E */ bc1f .L80241C78 -/* A08980 80241A80 00000000 */ nop -/* A08984 80241A84 9602008E */ lhu $v0, 0x8e($s0) -/* A08988 80241A88 24420001 */ addiu $v0, $v0, 1 -/* A0898C 80241A8C A602008E */ sh $v0, 0x8e($s0) -/* A08990 80241A90 00021400 */ sll $v0, $v0, 0x10 -/* A08994 80241A94 8E630020 */ lw $v1, 0x20($s3) -/* A08998 80241A98 00021403 */ sra $v0, $v0, 0x10 -/* A0899C 80241A9C 0043102A */ slt $v0, $v0, $v1 -/* A089A0 80241AA0 14400026 */ bnez $v0, .L80241B3C -/* A089A4 80241AA4 00000000 */ nop -/* A089A8 80241AA8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A089AC 80241AAC C60E0040 */ lwc1 $f14, 0x40($s0) -/* A089B0 80241AB0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A089B4 80241AB4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A089B8 80241AB8 A600008E */ sh $zero, 0x8e($s0) -/* A089BC 80241ABC 8C460028 */ lw $a2, 0x28($v0) -/* A089C0 80241AC0 0C00A720 */ jal atan2 -/* A089C4 80241AC4 8C470030 */ lw $a3, 0x30($v0) -/* A089C8 80241AC8 46000506 */ mov.s $f20, $f0 -/* A089CC 80241ACC C60C000C */ lwc1 $f12, 0xc($s0) -/* A089D0 80241AD0 0C00A70A */ jal get_clamped_angle_diff -/* A089D4 80241AD4 4600A386 */ mov.s $f14, $f20 -/* A089D8 80241AD8 46000086 */ mov.s $f2, $f0 -/* A089DC 80241ADC 8E62001C */ lw $v0, 0x1c($s3) -/* A089E0 80241AE0 46001005 */ abs.s $f0, $f2 -/* A089E4 80241AE4 44822000 */ mtc1 $v0, $f4 -/* A089E8 80241AE8 00000000 */ nop -/* A089EC 80241AEC 46802120 */ cvt.s.w $f4, $f4 -/* A089F0 80241AF0 4600203C */ c.lt.s $f4, $f0 -/* A089F4 80241AF4 00000000 */ nop -/* A089F8 80241AF8 4500000D */ bc1f .L80241B30 -/* A089FC 80241AFC 00000000 */ nop -/* A08A00 80241B00 44800000 */ mtc1 $zero, $f0 -/* A08A04 80241B04 C614000C */ lwc1 $f20, 0xc($s0) -/* A08A08 80241B08 4600103C */ c.lt.s $f2, $f0 -/* A08A0C 80241B0C 00000000 */ nop -/* A08A10 80241B10 45000006 */ bc1f .L80241B2C -/* A08A14 80241B14 00021023 */ negu $v0, $v0 -/* A08A18 80241B18 44820000 */ mtc1 $v0, $f0 -/* A08A1C 80241B1C 00000000 */ nop -/* A08A20 80241B20 46800020 */ cvt.s.w $f0, $f0 -/* A08A24 80241B24 080906CC */ j .L80241B30 -/* A08A28 80241B28 4600A500 */ add.s $f20, $f20, $f0 -.L80241B2C: -/* A08A2C 80241B2C 4604A500 */ add.s $f20, $f20, $f4 -.L80241B30: -/* A08A30 80241B30 0C00A6C9 */ jal clamp_angle -/* A08A34 80241B34 4600A306 */ mov.s $f12, $f20 -/* A08A38 80241B38 E600000C */ swc1 $f0, 0xc($s0) -.L80241B3C: -/* A08A3C 80241B3C 8E020000 */ lw $v0, ($s0) -/* A08A40 80241B40 30420008 */ andi $v0, $v0, 8 -/* A08A44 80241B44 1040000A */ beqz $v0, .L80241B70 -/* A08A48 80241B48 27A50018 */ addiu $a1, $sp, 0x18 -/* A08A4C 80241B4C C602003C */ lwc1 $f2, 0x3c($s0) -/* A08A50 80241B50 C600001C */ lwc1 $f0, 0x1c($s0) -/* A08A54 80241B54 46001080 */ add.s $f2, $f2, $f0 -/* A08A58 80241B58 4616103C */ c.lt.s $f2, $f22 -/* A08A5C 80241B5C 00000000 */ nop -/* A08A60 80241B60 45020045 */ bc1fl .L80241C78 -/* A08A64 80241B64 E602003C */ swc1 $f2, 0x3c($s0) -/* A08A68 80241B68 0809071D */ j .L80241C74 -/* A08A6C 80241B6C E616003C */ swc1 $f22, 0x3c($s0) -.L80241B70: -/* A08A70 80241B70 C6000038 */ lwc1 $f0, 0x38($s0) -/* A08A74 80241B74 27A6001C */ addiu $a2, $sp, 0x1c -/* A08A78 80241B78 E7A00018 */ swc1 $f0, 0x18($sp) -/* A08A7C 80241B7C 860200A8 */ lh $v0, 0xa8($s0) -/* A08A80 80241B80 C600001C */ lwc1 $f0, 0x1c($s0) -/* A08A84 80241B84 C604003C */ lwc1 $f4, 0x3c($s0) -/* A08A88 80241B88 44821000 */ mtc1 $v0, $f2 -/* A08A8C 80241B8C 00000000 */ nop -/* A08A90 80241B90 468010A0 */ cvt.s.w $f2, $f2 -/* A08A94 80241B94 46000005 */ abs.s $f0, $f0 -/* A08A98 80241B98 46020000 */ add.s $f0, $f0, $f2 -/* A08A9C 80241B9C C6060040 */ lwc1 $f6, 0x40($s0) -/* A08AA0 80241BA0 27A20024 */ addiu $v0, $sp, 0x24 -/* A08AA4 80241BA4 46022100 */ add.s $f4, $f4, $f2 -/* A08AA8 80241BA8 3C014024 */ lui $at, 0x4024 -/* A08AAC 80241BAC 44811800 */ mtc1 $at, $f3 -/* A08AB0 80241BB0 44801000 */ mtc1 $zero, $f2 -/* A08AB4 80241BB4 46000021 */ cvt.d.s $f0, $f0 -/* A08AB8 80241BB8 46220000 */ add.d $f0, $f0, $f2 -/* A08ABC 80241BBC E7A60020 */ swc1 $f6, 0x20($sp) -/* A08AC0 80241BC0 E7A4001C */ swc1 $f4, 0x1c($sp) -/* A08AC4 80241BC4 46200020 */ cvt.s.d $f0, $f0 -/* A08AC8 80241BC8 E7A00024 */ swc1 $f0, 0x24($sp) -/* A08ACC 80241BCC AFA20010 */ sw $v0, 0x10($sp) -/* A08AD0 80241BD0 8E040080 */ lw $a0, 0x80($s0) -/* A08AD4 80241BD4 0C0372DF */ jal func_800DCB7C -/* A08AD8 80241BD8 27A70020 */ addiu $a3, $sp, 0x20 -/* A08ADC 80241BDC 10400015 */ beqz $v0, .L80241C34 -/* A08AE0 80241BE0 00000000 */ nop -/* A08AE4 80241BE4 860200A8 */ lh $v0, 0xa8($s0) -/* A08AE8 80241BE8 C604001C */ lwc1 $f4, 0x1c($s0) -/* A08AEC 80241BEC 44820000 */ mtc1 $v0, $f0 -/* A08AF0 80241BF0 00000000 */ nop -/* A08AF4 80241BF4 46800020 */ cvt.s.w $f0, $f0 -/* A08AF8 80241BF8 46002085 */ abs.s $f2, $f4 -/* A08AFC 80241BFC 46020000 */ add.s $f0, $f0, $f2 -/* A08B00 80241C00 C7A20024 */ lwc1 $f2, 0x24($sp) -/* A08B04 80241C04 4600103E */ c.le.s $f2, $f0 -/* A08B08 80241C08 00000000 */ nop -/* A08B0C 80241C0C 45000005 */ bc1f .L80241C24 -/* A08B10 80241C10 00000000 */ nop -/* A08B14 80241C14 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A08B18 80241C18 AE00001C */ sw $zero, 0x1c($s0) -/* A08B1C 80241C1C 0809071E */ j .L80241C78 -/* A08B20 80241C20 E600003C */ swc1 $f0, 0x3c($s0) -.L80241C24: -/* A08B24 80241C24 C600003C */ lwc1 $f0, 0x3c($s0) -/* A08B28 80241C28 46040000 */ add.s $f0, $f0, $f4 -/* A08B2C 80241C2C 0809071E */ j .L80241C78 -/* A08B30 80241C30 E600003C */ swc1 $f0, 0x3c($s0) -.L80241C34: -/* A08B34 80241C34 C606003C */ lwc1 $f6, 0x3c($s0) -/* A08B38 80241C38 860200A8 */ lh $v0, 0xa8($s0) -/* A08B3C 80241C3C 46163081 */ sub.s $f2, $f6, $f22 -/* A08B40 80241C40 44820000 */ mtc1 $v0, $f0 -/* A08B44 80241C44 00000000 */ nop -/* A08B48 80241C48 46800020 */ cvt.s.w $f0, $f0 -/* A08B4C 80241C4C 46001080 */ add.s $f2, $f2, $f0 -/* A08B50 80241C50 C604001C */ lwc1 $f4, 0x1c($s0) -/* A08B54 80241C54 46002005 */ abs.s $f0, $f4 -/* A08B58 80241C58 4602003C */ c.lt.s $f0, $f2 -/* A08B5C 80241C5C 00000000 */ nop -/* A08B60 80241C60 45020005 */ bc1fl .L80241C78 -/* A08B64 80241C64 AE00001C */ sw $zero, 0x1c($s0) -/* A08B68 80241C68 46043000 */ add.s $f0, $f6, $f4 -/* A08B6C 80241C6C 0809071E */ j .L80241C78 -/* A08B70 80241C70 E600003C */ swc1 $f0, 0x3c($s0) -.L80241C74: -/* A08B74 80241C74 AE00001C */ sw $zero, 0x1c($s0) -.L80241C78: -/* A08B78 80241C78 8FBF0038 */ lw $ra, 0x38($sp) -/* A08B7C 80241C7C 8FB30034 */ lw $s3, 0x34($sp) -/* A08B80 80241C80 8FB20030 */ lw $s2, 0x30($sp) -/* A08B84 80241C84 8FB1002C */ lw $s1, 0x2c($sp) -/* A08B88 80241C88 8FB00028 */ lw $s0, 0x28($sp) -/* A08B8C 80241C8C D7B60048 */ ldc1 $f22, 0x48($sp) -/* A08B90 80241C90 D7B40040 */ ldc1 $f20, 0x40($sp) -/* A08B94 80241C94 03E00008 */ jr $ra -/* A08B98 80241C98 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_nok/nok_15/func_80241C9C_A06F00.s b/asm/nonmatchings/world/area_nok/nok_15/func_80241C9C_A06F00.s deleted file mode 100644 index 54be654c79..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/func_80241C9C_A06F00.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C9C_A08B9C -/* A08B9C 80241C9C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A08BA0 80241CA0 AFB00028 */ sw $s0, 0x28($sp) -/* A08BA4 80241CA4 00A0802D */ daddu $s0, $a1, $zero -/* A08BA8 80241CA8 AFB1002C */ sw $s1, 0x2c($sp) -/* A08BAC 80241CAC 00C0882D */ daddu $s1, $a2, $zero -/* A08BB0 80241CB0 AFBF0034 */ sw $ra, 0x34($sp) -/* A08BB4 80241CB4 AFB20030 */ sw $s2, 0x30($sp) -/* A08BB8 80241CB8 AE200070 */ sw $zero, 0x70($s1) -/* A08BBC 80241CBC 8C830000 */ lw $v1, ($a0) -/* A08BC0 80241CC0 2402FDFF */ addiu $v0, $zero, -0x201 -/* A08BC4 80241CC4 A480008E */ sh $zero, 0x8e($a0) -/* A08BC8 80241CC8 00621824 */ and $v1, $v1, $v0 -/* A08BCC 80241CCC 34650800 */ ori $a1, $v1, 0x800 -/* A08BD0 80241CD0 AC850000 */ sw $a1, ($a0) -/* A08BD4 80241CD4 8E0200D0 */ lw $v0, 0xd0($s0) -/* A08BD8 80241CD8 8C420034 */ lw $v0, 0x34($v0) -/* A08BDC 80241CDC 10400003 */ beqz $v0, .L80241CEC -/* A08BE0 80241CE0 00E0902D */ daddu $s2, $a3, $zero -/* A08BE4 80241CE4 0809073D */ j .L80241CF4 -/* A08BE8 80241CE8 34620808 */ ori $v0, $v1, 0x808 -.L80241CEC: -/* A08BEC 80241CEC 2402FFF7 */ addiu $v0, $zero, -9 -/* A08BF0 80241CF0 00A21024 */ and $v0, $a1, $v0 -.L80241CF4: -/* A08BF4 80241CF4 AC820000 */ sw $v0, ($a0) -/* A08BF8 80241CF8 27A20024 */ addiu $v0, $sp, 0x24 -/* A08BFC 80241CFC 27A50018 */ addiu $a1, $sp, 0x18 -/* A08C00 80241D00 C4800038 */ lwc1 $f0, 0x38($a0) -/* A08C04 80241D04 C482003C */ lwc1 $f2, 0x3c($a0) -/* A08C08 80241D08 C4840040 */ lwc1 $f4, 0x40($a0) -/* A08C0C 80241D0C 3C01447A */ lui $at, 0x447a -/* A08C10 80241D10 44813000 */ mtc1 $at, $f6 -/* A08C14 80241D14 27A6001C */ addiu $a2, $sp, 0x1c -/* A08C18 80241D18 E7A00018 */ swc1 $f0, 0x18($sp) -/* A08C1C 80241D1C E7A2001C */ swc1 $f2, 0x1c($sp) -/* A08C20 80241D20 E7A40020 */ swc1 $f4, 0x20($sp) -/* A08C24 80241D24 E7A60024 */ swc1 $f6, 0x24($sp) -/* A08C28 80241D28 AFA20010 */ sw $v0, 0x10($sp) -/* A08C2C 80241D2C 8C840080 */ lw $a0, 0x80($a0) -/* A08C30 80241D30 0C0372DF */ jal func_800DCB7C -/* A08C34 80241D34 27A70020 */ addiu $a3, $sp, 0x20 -/* A08C38 80241D38 C7A20024 */ lwc1 $f2, 0x24($sp) -/* A08C3C 80241D3C 3C014059 */ lui $at, 0x4059 -/* A08C40 80241D40 44812800 */ mtc1 $at, $f5 -/* A08C44 80241D44 44802000 */ mtc1 $zero, $f4 -/* A08C48 80241D48 460010A1 */ cvt.d.s $f2, $f2 -/* A08C4C 80241D4C 46241082 */ mul.d $f2, $f2, $f4 -/* A08C50 80241D50 00000000 */ nop -/* A08C54 80241D54 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A08C58 80241D58 46000021 */ cvt.d.s $f0, $f0 -/* A08C5C 80241D5C 46240002 */ mul.d $f0, $f0, $f4 -/* A08C60 80241D60 00000000 */ nop -/* A08C64 80241D64 3C013FE0 */ lui $at, 0x3fe0 -/* A08C68 80241D68 44812800 */ mtc1 $at, $f5 -/* A08C6C 80241D6C 44802000 */ mtc1 $zero, $f4 -/* A08C70 80241D70 00000000 */ nop -/* A08C74 80241D74 46241080 */ add.d $f2, $f2, $f4 -/* A08C78 80241D78 AE000074 */ sw $zero, 0x74($s0) -/* A08C7C 80241D7C 46240000 */ add.d $f0, $f0, $f4 -/* A08C80 80241D80 AE000090 */ sw $zero, 0x90($s0) -/* A08C84 80241D84 4620120D */ trunc.w.d $f8, $f2 -/* A08C88 80241D88 E6080078 */ swc1 $f8, 0x78($s0) -/* A08C8C 80241D8C 4620020D */ trunc.w.d $f8, $f0 -/* A08C90 80241D90 E6080088 */ swc1 $f8, 0x88($s0) -/* A08C94 80241D94 8E420014 */ lw $v0, 0x14($s2) -/* A08C98 80241D98 AE220074 */ sw $v0, 0x74($s1) -/* A08C9C 80241D9C 8E0200B0 */ lw $v0, 0xb0($s0) -/* A08CA0 80241DA0 34420010 */ ori $v0, $v0, 0x10 -/* A08CA4 80241DA4 AE0200B0 */ sw $v0, 0xb0($s0) -/* A08CA8 80241DA8 8FBF0034 */ lw $ra, 0x34($sp) -/* A08CAC 80241DAC 8FB20030 */ lw $s2, 0x30($sp) -/* A08CB0 80241DB0 8FB1002C */ lw $s1, 0x2c($sp) -/* A08CB4 80241DB4 8FB00028 */ lw $s0, 0x28($sp) -/* A08CB8 80241DB8 03E00008 */ jr $ra -/* A08CBC 80241DBC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_nok/nok_15/func_80241FAC_A06F00.s b/asm/nonmatchings/world/area_nok/nok_15/func_80241FAC_A06F00.s deleted file mode 100644 index 269d5820c9..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/func_80241FAC_A06F00.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FAC_A08EAC -/* A08EAC 80241FAC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A08EB0 80241FB0 AFB3001C */ sw $s3, 0x1c($sp) -/* A08EB4 80241FB4 0080982D */ daddu $s3, $a0, $zero -/* A08EB8 80241FB8 AFBF0020 */ sw $ra, 0x20($sp) -/* A08EBC 80241FBC AFB20018 */ sw $s2, 0x18($sp) -/* A08EC0 80241FC0 AFB10014 */ sw $s1, 0x14($sp) -/* A08EC4 80241FC4 AFB00010 */ sw $s0, 0x10($sp) -/* A08EC8 80241FC8 8E710148 */ lw $s1, 0x148($s3) -/* A08ECC 80241FCC 0C00EABB */ jal get_npc_unsafe -/* A08ED0 80241FD0 86240008 */ lh $a0, 8($s1) -/* A08ED4 80241FD4 0040802D */ daddu $s0, $v0, $zero -/* A08ED8 80241FD8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A08EDC 80241FDC 8E2200CC */ lw $v0, 0xcc($s1) -/* A08EE0 80241FE0 3C01C0A0 */ lui $at, 0xc0a0 -/* A08EE4 80241FE4 44811000 */ mtc1 $at, $f2 -/* A08EE8 80241FE8 3C013E19 */ lui $at, 0x3e19 -/* A08EEC 80241FEC 3421999A */ ori $at, $at, 0x999a -/* A08EF0 80241FF0 44810000 */ mtc1 $at, $f0 -/* A08EF4 80241FF4 8C420024 */ lw $v0, 0x24($v0) -/* A08EF8 80241FF8 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* A08EFC 80241FFC 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* A08F00 80242000 E602001C */ swc1 $f2, 0x1c($s0) -/* A08F04 80242004 E6000014 */ swc1 $f0, 0x14($s0) -/* A08F08 80242008 AE020028 */ sw $v0, 0x28($s0) -/* A08F0C 8024200C 8E22008C */ lw $v0, 0x8c($s1) -/* A08F10 80242010 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A08F14 80242014 00021FC2 */ srl $v1, $v0, 0x1f -/* A08F18 80242018 00431021 */ addu $v0, $v0, $v1 -/* A08F1C 8024201C 8E430000 */ lw $v1, ($s2) -/* A08F20 80242020 00021043 */ sra $v0, $v0, 1 -/* A08F24 80242024 A60200A8 */ sh $v0, 0xa8($s0) -/* A08F28 80242028 8C660028 */ lw $a2, 0x28($v1) -/* A08F2C 8024202C 0C00A7B5 */ jal dist2D -/* A08F30 80242030 8C670030 */ lw $a3, 0x30($v1) -/* A08F34 80242034 0200202D */ daddu $a0, $s0, $zero -/* A08F38 80242038 0000302D */ daddu $a2, $zero, $zero -/* A08F3C 8024203C C6020038 */ lwc1 $f2, 0x38($s0) -/* A08F40 80242040 3C0140E0 */ lui $at, 0x40e0 -/* A08F44 80242044 44810000 */ mtc1 $at, $f0 -/* A08F48 80242048 4600110D */ trunc.w.s $f4, $f2 -/* A08F4C 8024204C 44022000 */ mfc1 $v0, $f4 -/* A08F50 80242050 E6000018 */ swc1 $f0, 0x18($s0) -/* A08F54 80242054 A6220010 */ sh $v0, 0x10($s1) -/* A08F58 80242058 C600003C */ lwc1 $f0, 0x3c($s0) -/* A08F5C 8024205C 240502C1 */ addiu $a1, $zero, 0x2c1 -/* A08F60 80242060 4600010D */ trunc.w.s $f4, $f0 -/* A08F64 80242064 44022000 */ mfc1 $v0, $f4 -/* A08F68 80242068 00000000 */ nop -/* A08F6C 8024206C A6220012 */ sh $v0, 0x12($s1) -/* A08F70 80242070 C6000040 */ lwc1 $f0, 0x40($s0) -/* A08F74 80242074 24020001 */ addiu $v0, $zero, 1 -/* A08F78 80242078 A2220007 */ sb $v0, 7($s1) -/* A08F7C 8024207C 4600010D */ trunc.w.s $f4, $f0 -/* A08F80 80242080 44022000 */ mfc1 $v0, $f4 -/* A08F84 80242084 0C012530 */ jal func_800494C0 -/* A08F88 80242088 A6220014 */ sh $v0, 0x14($s1) -/* A08F8C 8024208C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A08F90 80242090 8E420000 */ lw $v0, ($s2) -/* A08F94 80242094 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A08F98 80242098 8C460028 */ lw $a2, 0x28($v0) -/* A08F9C 8024209C 0C00A720 */ jal atan2 -/* A08FA0 802420A0 8C470030 */ lw $a3, 0x30($v0) -/* A08FA4 802420A4 2402000C */ addiu $v0, $zero, 0xc -/* A08FA8 802420A8 A602008E */ sh $v0, 0x8e($s0) -/* A08FAC 802420AC 2402000D */ addiu $v0, $zero, 0xd -/* A08FB0 802420B0 E600000C */ swc1 $f0, 0xc($s0) -/* A08FB4 802420B4 AE620070 */ sw $v0, 0x70($s3) -/* A08FB8 802420B8 8FBF0020 */ lw $ra, 0x20($sp) -/* A08FBC 802420BC 8FB3001C */ lw $s3, 0x1c($sp) -/* A08FC0 802420C0 8FB20018 */ lw $s2, 0x18($sp) -/* A08FC4 802420C4 8FB10014 */ lw $s1, 0x14($sp) -/* A08FC8 802420C8 8FB00010 */ lw $s0, 0x10($sp) -/* A08FCC 802420CC 03E00008 */ jr $ra -/* A08FD0 802420D0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_8024001C_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_8024001C_BBD1A0.s deleted file mode 100644 index a172df636a..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_8024001C_BBD1A0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_BBD1BC -/* BBD1BC 8024001C 3C03800B */ lui $v1, %hi(gCameras) -/* BBD1C0 80240020 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* BBD1C4 80240024 94620002 */ lhu $v0, 2($v1) -/* BBD1C8 80240028 34420001 */ ori $v0, $v0, 1 -/* BBD1CC 8024002C A4620002 */ sh $v0, 2($v1) -/* BBD1D0 80240030 03E00008 */ jr $ra -/* BBD1D4 80240034 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_80240038_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_80240038_BBD1A0.s deleted file mode 100644 index 3d32de06d5..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_80240038_BBD1A0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240038_BBD1D8 -/* BBD1D8 80240038 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BBD1DC 8024003C AFBF0010 */ sw $ra, 0x10($sp) -/* BBD1E0 80240040 8C82000C */ lw $v0, 0xc($a0) -/* BBD1E4 80240044 0C0B210B */ jal get_float_variable -/* BBD1E8 80240048 8C450000 */ lw $a1, ($v0) -/* BBD1EC 8024004C 4600008D */ trunc.w.s $f2, $f0 -/* BBD1F0 80240050 44021000 */ mfc1 $v0, $f2 -/* BBD1F4 80240054 00000000 */ nop -/* BBD1F8 80240058 44820000 */ mtc1 $v0, $f0 -/* BBD1FC 8024005C 00000000 */ nop -/* BBD200 80240060 46800020 */ cvt.s.w $f0, $f0 -/* BBD204 80240064 8FBF0010 */ lw $ra, 0x10($sp) -/* BBD208 80240068 24020002 */ addiu $v0, $zero, 2 -/* BBD20C 8024006C 3C01800B */ lui $at, 0x800b -/* BBD210 80240070 E4201D98 */ swc1 $f0, 0x1d98($at) -/* BBD214 80240074 03E00008 */ jr $ra -/* BBD218 80240078 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_8024007C_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_8024007C_BBD1A0.s deleted file mode 100644 index c95899eb4b..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_8024007C_BBD1A0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024007C_BBD21C -/* BBD21C 8024007C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* BBD220 80240080 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* BBD224 80240084 90420012 */ lbu $v0, 0x12($v0) -/* BBD228 80240088 000211C2 */ srl $v0, $v0, 7 -/* BBD22C 8024008C AC82009C */ sw $v0, 0x9c($a0) -/* BBD230 80240090 03E00008 */ jr $ra -/* BBD234 80240094 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_80240098_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_80240098_BBD1A0.s deleted file mode 100644 index 6efbf003b8..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_80240098_BBD1A0.s +++ /dev/null @@ -1,410 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240098_BBD238 -/* BBD238 80240098 27BDFF68 */ addiu $sp, $sp, -0x98 -/* BBD23C 8024009C AFB40078 */ sw $s4, 0x78($sp) -/* BBD240 802400A0 0080A02D */ daddu $s4, $a0, $zero -/* BBD244 802400A4 AFB5007C */ sw $s5, 0x7c($sp) -/* BBD248 802400A8 3C158011 */ lui $s5, %hi(gPlayerStatus) -/* BBD24C 802400AC 26B5EFC8 */ addiu $s5, $s5, %lo(gPlayerStatus) -/* BBD250 802400B0 AFBF0080 */ sw $ra, 0x80($sp) -/* BBD254 802400B4 AFB30074 */ sw $s3, 0x74($sp) -/* BBD258 802400B8 AFB20070 */ sw $s2, 0x70($sp) -/* BBD25C 802400BC AFB1006C */ sw $s1, 0x6c($sp) -/* BBD260 802400C0 AFB00068 */ sw $s0, 0x68($sp) -/* BBD264 802400C4 F7B60090 */ sdc1 $f22, 0x90($sp) -/* BBD268 802400C8 F7B40088 */ sdc1 $f20, 0x88($sp) -/* BBD26C 802400CC 10A00029 */ beqz $a1, .L80240174 -/* BBD270 802400D0 8E90000C */ lw $s0, 0xc($s4) -/* BBD274 802400D4 0C00AB39 */ jal heap_malloc -/* BBD278 802400D8 2404006C */ addiu $a0, $zero, 0x6c -/* BBD27C 802400DC 0040882D */ daddu $s1, $v0, $zero -/* BBD280 802400E0 0280202D */ daddu $a0, $s4, $zero -/* BBD284 802400E4 0000982D */ daddu $s3, $zero, $zero -/* BBD288 802400E8 AE910074 */ sw $s1, 0x74($s4) -/* BBD28C 802400EC 8E050000 */ lw $a1, ($s0) -/* BBD290 802400F0 3C108024 */ lui $s0, 0x8024 -/* BBD294 802400F4 26101C58 */ addiu $s0, $s0, 0x1c58 -/* BBD298 802400F8 0C0B1EAF */ jal get_variable -/* BBD29C 802400FC 0220902D */ daddu $s2, $s1, $zero -/* BBD2A0 80240100 AE220008 */ sw $v0, 8($s1) -/* BBD2A4 80240104 AC510000 */ sw $s1, ($v0) -.L80240108: -/* BBD2A8 80240108 8E040000 */ lw $a0, ($s0) -/* BBD2AC 8024010C 26100004 */ addiu $s0, $s0, 4 -/* BBD2B0 80240110 0C046C04 */ jal get_model_list_index_from_tree_index -/* BBD2B4 80240114 26730001 */ addiu $s3, $s3, 1 -/* BBD2B8 80240118 0C046B4C */ jal get_model_from_list_index -/* BBD2BC 8024011C 0040202D */ daddu $a0, $v0, $zero -/* BBD2C0 80240120 AE42005C */ sw $v0, 0x5c($s2) -/* BBD2C4 80240124 2A620004 */ slti $v0, $s3, 4 -/* BBD2C8 80240128 1440FFF7 */ bnez $v0, .L80240108 -/* BBD2CC 8024012C 26520004 */ addiu $s2, $s2, 4 -/* BBD2D0 80240130 2625001C */ addiu $a1, $s1, 0x1c -/* BBD2D4 80240134 8E32005C */ lw $s2, 0x5c($s1) -/* BBD2D8 80240138 4480B000 */ mtc1 $zero, $f22 -/* BBD2DC 8024013C 0C00A5C8 */ jal copy_matrix -/* BBD2E0 80240140 26440058 */ addiu $a0, $s2, 0x58 -/* BBD2E4 80240144 3C014334 */ lui $at, 0x4334 -/* BBD2E8 80240148 44810000 */ mtc1 $at, $f0 -/* BBD2EC 8024014C 3C014120 */ lui $at, 0x4120 -/* BBD2F0 80240150 44811000 */ mtc1 $at, $f2 -/* BBD2F4 80240154 E6360010 */ swc1 $f22, 0x10($s1) -/* BBD2F8 80240158 E6360014 */ swc1 $f22, 0x14($s1) -/* BBD2FC 8024015C AE200000 */ sw $zero, ($s1) -/* BBD300 80240160 E620000C */ swc1 $f0, 0xc($s1) -/* BBD304 80240164 E6220018 */ swc1 $f2, 0x18($s1) -/* BBD308 80240168 AE800070 */ sw $zero, 0x70($s4) -/* BBD30C 8024016C AE800078 */ sw $zero, 0x78($s4) -/* BBD310 80240170 AE80007C */ sw $zero, 0x7c($s4) -.L80240174: -/* BBD314 80240174 8E910074 */ lw $s1, 0x74($s4) -/* BBD318 80240178 8E32005C */ lw $s2, 0x5c($s1) -/* BBD31C 8024017C 8E220008 */ lw $v0, 8($s1) -/* BBD320 80240180 C6360010 */ lwc1 $f22, 0x10($s1) -/* BBD324 80240184 8C430004 */ lw $v1, 4($v0) -/* BBD328 80240188 24020002 */ addiu $v0, $zero, 2 -/* BBD32C 8024018C 14620006 */ bne $v1, $v0, .L802401A8 -/* BBD330 80240190 2404000A */ addiu $a0, $zero, 0xa -/* BBD334 80240194 AE840070 */ sw $a0, 0x70($s4) -/* BBD338 80240198 8E230008 */ lw $v1, 8($s1) -/* BBD33C 8024019C 24020003 */ addiu $v0, $zero, 3 -/* BBD340 802401A0 AC620004 */ sw $v0, 4($v1) -/* BBD344 802401A4 AE240004 */ sw $a0, 4($s1) -.L802401A8: -/* BBD348 802401A8 8E830070 */ lw $v1, 0x70($s4) -/* BBD34C 802401AC 2C62000C */ sltiu $v0, $v1, 0xc -/* BBD350 802401B0 10400076 */ beqz $v0, .L8024038C -/* BBD354 802401B4 00031080 */ sll $v0, $v1, 2 -/* BBD358 802401B8 3C018024 */ lui $at, 0x8024 -/* BBD35C 802401BC 00220821 */ addu $at, $at, $v0 -/* BBD360 802401C0 8C2258C0 */ lw $v0, 0x58c0($at) -/* BBD364 802401C4 00400008 */ jr $v0 -/* BBD368 802401C8 00000000 */ nop -/* BBD36C 802401CC 8E220008 */ lw $v0, 8($s1) -/* BBD370 802401D0 8C420004 */ lw $v0, 4($v0) -/* BBD374 802401D4 1040006D */ beqz $v0, .L8024038C -/* BBD378 802401D8 24020023 */ addiu $v0, $zero, 0x23 -/* BBD37C 802401DC AE220004 */ sw $v0, 4($s1) -/* BBD380 802401E0 24020001 */ addiu $v0, $zero, 1 -/* BBD384 802401E4 4480B000 */ mtc1 $zero, $f22 -/* BBD388 802401E8 3C014120 */ lui $at, 0x4120 -/* BBD38C 802401EC 44810000 */ mtc1 $at, $f0 -/* BBD390 802401F0 8E230000 */ lw $v1, ($s1) -/* BBD394 802401F4 3C014334 */ lui $at, 0x4334 -/* BBD398 802401F8 44811000 */ mtc1 $at, $f2 -/* BBD39C 802401FC 34630003 */ ori $v1, $v1, 3 -/* BBD3A0 80240200 E6360010 */ swc1 $f22, 0x10($s1) -/* BBD3A4 80240204 E6360014 */ swc1 $f22, 0x14($s1) -/* BBD3A8 80240208 E6200018 */ swc1 $f0, 0x18($s1) -/* BBD3AC 8024020C E622000C */ swc1 $f2, 0xc($s1) -/* BBD3B0 80240210 AE230000 */ sw $v1, ($s1) -/* BBD3B4 80240214 080900E3 */ j .L8024038C -/* BBD3B8 80240218 AE820070 */ sw $v0, 0x70($s4) -/* BBD3BC 8024021C 8E220004 */ lw $v0, 4($s1) -/* BBD3C0 80240220 2403FFFF */ addiu $v1, $zero, -1 -/* BBD3C4 80240224 2442FFFF */ addiu $v0, $v0, -1 -/* BBD3C8 80240228 14430058 */ bne $v0, $v1, .L8024038C -/* BBD3CC 8024022C AE220004 */ sw $v0, 4($s1) -/* BBD3D0 80240230 24020002 */ addiu $v0, $zero, 2 -/* BBD3D4 80240234 080900E3 */ j .L8024038C -/* BBD3D8 80240238 AE820070 */ sw $v0, 0x70($s4) -/* BBD3DC 8024023C C6200010 */ lwc1 $f0, 0x10($s1) -/* BBD3E0 80240240 3C01BFBB */ lui $at, 0xbfbb -/* BBD3E4 80240244 3421BBBC */ ori $at, $at, 0xbbbc -/* BBD3E8 80240248 44811000 */ mtc1 $at, $f2 -/* BBD3EC 8024024C 00000000 */ nop -/* BBD3F0 80240250 46020000 */ add.s $f0, $f0, $f2 -/* BBD3F4 80240254 3C01C35C */ lui $at, 0xc35c -/* BBD3F8 80240258 44811000 */ mtc1 $at, $f2 -/* BBD3FC 8024025C 00000000 */ nop -/* BBD400 80240260 4602003C */ c.lt.s $f0, $f2 -/* BBD404 80240264 00000000 */ nop -/* BBD408 80240268 45000048 */ bc1f .L8024038C -/* BBD40C 8024026C E6200010 */ swc1 $f0, 0x10($s1) -/* BBD410 80240270 24020003 */ addiu $v0, $zero, 3 -/* BBD414 80240274 E6220010 */ swc1 $f2, 0x10($s1) -/* BBD418 80240278 080900E3 */ j .L8024038C -/* BBD41C 8024027C AE820070 */ sw $v0, 0x70($s4) -/* BBD420 80240280 C6200018 */ lwc1 $f0, 0x18($s1) -/* BBD424 80240284 3C013D88 */ lui $at, 0x3d88 -/* BBD428 80240288 34218889 */ ori $at, $at, 0x8889 -/* BBD42C 8024028C 44811000 */ mtc1 $at, $f2 -/* BBD430 80240290 00000000 */ nop -/* BBD434 80240294 46020001 */ sub.s $f0, $f0, $f2 -/* BBD438 80240298 44801000 */ mtc1 $zero, $f2 -/* BBD43C 8024029C 00000000 */ nop -/* BBD440 802402A0 4602003C */ c.lt.s $f0, $f2 -/* BBD444 802402A4 00000000 */ nop -/* BBD448 802402A8 45000038 */ bc1f .L8024038C -/* BBD44C 802402AC E6200018 */ swc1 $f0, 0x18($s1) -/* BBD450 802402B0 24020004 */ addiu $v0, $zero, 4 -/* BBD454 802402B4 E6220018 */ swc1 $f2, 0x18($s1) -/* BBD458 802402B8 AE820070 */ sw $v0, 0x70($s4) -/* BBD45C 802402BC 8E220000 */ lw $v0, ($s1) -/* BBD460 802402C0 2403FFFE */ addiu $v1, $zero, -2 -/* BBD464 802402C4 00431024 */ and $v0, $v0, $v1 -/* BBD468 802402C8 34420004 */ ori $v0, $v0, 4 -/* BBD46C 802402CC 080900E3 */ j .L8024038C -/* BBD470 802402D0 AE220000 */ sw $v0, ($s1) -/* BBD474 802402D4 8E220004 */ lw $v0, 4($s1) -/* BBD478 802402D8 2403FFFF */ addiu $v1, $zero, -1 -/* BBD47C 802402DC 2442FFFF */ addiu $v0, $v0, -1 -/* BBD480 802402E0 1443002A */ bne $v0, $v1, .L8024038C -/* BBD484 802402E4 AE220004 */ sw $v0, 4($s1) -/* BBD488 802402E8 2402000B */ addiu $v0, $zero, 0xb -/* BBD48C 802402EC 080900E3 */ j .L8024038C -/* BBD490 802402F0 AE820070 */ sw $v0, 0x70($s4) -/* BBD494 802402F4 0000202D */ daddu $a0, $zero, $zero -/* BBD498 802402F8 2403FFFB */ addiu $v1, $zero, -5 -/* BBD49C 802402FC C6200010 */ lwc1 $f0, 0x10($s1) -/* BBD4A0 80240300 3C014080 */ lui $at, 0x4080 -/* BBD4A4 80240304 44811000 */ mtc1 $at, $f2 -/* BBD4A8 80240308 8E220000 */ lw $v0, ($s1) -/* BBD4AC 8024030C 44802000 */ mtc1 $zero, $f4 -/* BBD4B0 80240310 46020000 */ add.s $f0, $f0, $f2 -/* BBD4B4 80240314 00431024 */ and $v0, $v0, $v1 -/* BBD4B8 80240318 AE220000 */ sw $v0, ($s1) -/* BBD4BC 8024031C 4600203E */ c.le.s $f4, $f0 -/* BBD4C0 80240320 00000000 */ nop -/* BBD4C4 80240324 45000003 */ bc1f .L80240334 -/* BBD4C8 80240328 E6200010 */ swc1 $f0, 0x10($s1) -/* BBD4CC 8024032C E6240010 */ swc1 $f4, 0x10($s1) -/* BBD4D0 80240330 24040001 */ addiu $a0, $zero, 1 -.L80240334: -/* BBD4D4 80240334 C6200018 */ lwc1 $f0, 0x18($s1) -/* BBD4D8 80240338 3C013E4C */ lui $at, 0x3e4c -/* BBD4DC 8024033C 3421CCCD */ ori $at, $at, 0xcccd -/* BBD4E0 80240340 44811000 */ mtc1 $at, $f2 -/* BBD4E4 80240344 00000000 */ nop -/* BBD4E8 80240348 46020001 */ sub.s $f0, $f0, $f2 -/* BBD4EC 8024034C 4604003C */ c.lt.s $f0, $f4 -/* BBD4F0 80240350 00000000 */ nop -/* BBD4F4 80240354 45000007 */ bc1f .L80240374 -/* BBD4F8 80240358 E6200018 */ swc1 $f0, 0x18($s1) -/* BBD4FC 8024035C 24840001 */ addiu $a0, $a0, 1 -/* BBD500 80240360 8E220000 */ lw $v0, ($s1) -/* BBD504 80240364 2403FFFE */ addiu $v1, $zero, -2 -/* BBD508 80240368 E6240018 */ swc1 $f4, 0x18($s1) -/* BBD50C 8024036C 00431024 */ and $v0, $v0, $v1 -/* BBD510 80240370 AE220000 */ sw $v0, ($s1) -.L80240374: -/* BBD514 80240374 24020002 */ addiu $v0, $zero, 2 -/* BBD518 80240378 14820004 */ bne $a0, $v0, .L8024038C -/* BBD51C 8024037C 00000000 */ nop -/* BBD520 80240380 8E220008 */ lw $v0, 8($s1) -/* BBD524 80240384 AC400004 */ sw $zero, 4($v0) -/* BBD528 80240388 AE800070 */ sw $zero, 0x70($s4) -.L8024038C: -/* BBD52C 8024038C 8E220000 */ lw $v0, ($s1) -/* BBD530 80240390 30420001 */ andi $v0, $v0, 1 -/* BBD534 80240394 10400020 */ beqz $v0, .L80240418 -/* BBD538 80240398 00000000 */ nop -/* BBD53C 8024039C C620000C */ lwc1 $f0, 0xc($s1) -/* BBD540 802403A0 3C014066 */ lui $at, 0x4066 -/* BBD544 802403A4 34216666 */ ori $at, $at, 0x6666 -/* BBD548 802403A8 44816000 */ mtc1 $at, $f12 -/* BBD54C 802403AC 0C00A6C9 */ jal clamp_angle -/* BBD550 802403B0 460C0300 */ add.s $f12, $f0, $f12 -/* BBD554 802403B4 46000306 */ mov.s $f12, $f0 -/* BBD558 802403B8 0C00A8BB */ jal sin_deg -/* BBD55C 802403BC E62C000C */ swc1 $f12, 0xc($s1) -/* BBD560 802403C0 C6240014 */ lwc1 $f4, 0x14($s1) -/* BBD564 802403C4 44803000 */ mtc1 $zero, $f6 -/* BBD568 802403C8 C6220018 */ lwc1 $f2, 0x18($s1) -/* BBD56C 802403CC 46062032 */ c.eq.s $f4, $f6 -/* BBD570 802403D0 46020502 */ mul.s $f20, $f0, $f2 -/* BBD574 802403D4 00000000 */ nop -/* BBD578 802403D8 45000005 */ bc1f .L802403F0 -/* BBD57C 802403DC 00000000 */ nop -/* BBD580 802403E0 3C013F80 */ lui $at, 0x3f80 -/* BBD584 802403E4 44810000 */ mtc1 $at, $f0 -/* BBD588 802403E8 00000000 */ nop -/* BBD58C 802403EC E6200014 */ swc1 $f0, 0x14($s1) -.L802403F0: -/* BBD590 802403F0 C6200014 */ lwc1 $f0, 0x14($s1) -/* BBD594 802403F4 4600A002 */ mul.s $f0, $f20, $f0 -/* BBD598 802403F8 00000000 */ nop -/* BBD59C 802403FC 4606003E */ c.le.s $f0, $f6 -/* BBD5A0 80240400 00000000 */ nop -/* BBD5A4 80240404 45000003 */ bc1f .L80240414 -/* BBD5A8 80240408 2404009D */ addiu $a0, $zero, 0x9d -/* BBD5AC 8024040C 0C052736 */ jal play_sound_at_player -/* BBD5B0 80240410 0000282D */ daddu $a1, $zero, $zero -.L80240414: -/* BBD5B4 80240414 E6340014 */ swc1 $f20, 0x14($s1) -.L80240418: -/* BBD5B8 80240418 8E820078 */ lw $v0, 0x78($s4) -/* BBD5BC 8024041C 14400013 */ bnez $v0, .L8024046C -/* BBD5C0 80240420 00000000 */ nop -/* BBD5C4 80240424 C6200010 */ lwc1 $f0, 0x10($s1) -/* BBD5C8 80240428 46160032 */ c.eq.s $f0, $f22 -/* BBD5CC 8024042C 00000000 */ nop -/* BBD5D0 80240430 45010017 */ bc1t .L80240490 -/* BBD5D4 80240434 0280202D */ daddu $a0, $s4, $zero -/* BBD5D8 80240438 3C048000 */ lui $a0, 0x8000 -/* BBD5DC 8024043C 3C0643DC */ lui $a2, 0x43dc -/* BBD5E0 80240440 3C014387 */ lui $at, 0x4387 -/* BBD5E4 80240444 34218000 */ ori $at, $at, 0x8000 -/* BBD5E8 80240448 44810000 */ mtc1 $at, $f0 -/* BBD5EC 8024044C 3484000F */ ori $a0, $a0, 0xf -/* BBD5F0 80240450 E7A00010 */ swc1 $f0, 0x10($sp) -/* BBD5F4 80240454 8E270010 */ lw $a3, 0x10($s1) -/* BBD5F8 80240458 0C052757 */ jal play_sound_at_position -/* BBD5FC 8024045C 0000282D */ daddu $a1, $zero, $zero -/* BBD600 80240460 24020001 */ addiu $v0, $zero, 1 -/* BBD604 80240464 08090123 */ j .L8024048C -/* BBD608 80240468 AE820078 */ sw $v0, 0x78($s4) -.L8024046C: -/* BBD60C 8024046C C6200010 */ lwc1 $f0, 0x10($s1) -/* BBD610 80240470 46160032 */ c.eq.s $f0, $f22 -/* BBD614 80240474 00000000 */ nop -/* BBD618 80240478 45000004 */ bc1f .L8024048C -/* BBD61C 8024047C 3C048000 */ lui $a0, 0x8000 -/* BBD620 80240480 0C05271B */ jal stop_sound -/* BBD624 80240484 3484000F */ ori $a0, $a0, 0xf -/* BBD628 80240488 AE800078 */ sw $zero, 0x78($s4) -.L8024048C: -/* BBD62C 8024048C 0280202D */ daddu $a0, $s4, $zero -.L80240490: -/* BBD630 80240490 3C05FD05 */ lui $a1, 0xfd05 -/* BBD634 80240494 0C0B1EAF */ jal get_variable -/* BBD638 80240498 34A50F8B */ ori $a1, $a1, 0xf8b -/* BBD63C 8024049C 8E83007C */ lw $v1, 0x7c($s4) -/* BBD640 802404A0 14600015 */ bnez $v1, .L802404F8 -/* BBD644 802404A4 0040802D */ daddu $s0, $v0, $zero -/* BBD648 802404A8 8E820088 */ lw $v0, 0x88($s4) -/* BBD64C 802404AC 12020019 */ beq $s0, $v0, .L80240514 -/* BBD650 802404B0 2404006E */ addiu $a0, $zero, 0x6e -/* BBD654 802404B4 27A50058 */ addiu $a1, $sp, 0x58 -/* BBD658 802404B8 27A6005C */ addiu $a2, $sp, 0x5c -/* BBD65C 802404BC 0C016F84 */ jal get_collider_center -/* BBD660 802404C0 27A70060 */ addiu $a3, $sp, 0x60 -/* BBD664 802404C4 3C048000 */ lui $a0, 0x8000 -/* BBD668 802404C8 34840010 */ ori $a0, $a0, 0x10 -/* BBD66C 802404CC C7A00058 */ lwc1 $f0, 0x58($sp) -/* BBD670 802404D0 C7A2005C */ lwc1 $f2, 0x5c($sp) -/* BBD674 802404D4 44060000 */ mfc1 $a2, $f0 -/* BBD678 802404D8 44071000 */ mfc1 $a3, $f2 -/* BBD67C 802404DC C7A00060 */ lwc1 $f0, 0x60($sp) -/* BBD680 802404E0 0000282D */ daddu $a1, $zero, $zero -/* BBD684 802404E4 0C052757 */ jal play_sound_at_position -/* BBD688 802404E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* BBD68C 802404EC 24020001 */ addiu $v0, $zero, 1 -/* BBD690 802404F0 08090145 */ j .L80240514 -/* BBD694 802404F4 AE82007C */ sw $v0, 0x7c($s4) -.L802404F8: -/* BBD698 802404F8 8E820088 */ lw $v0, 0x88($s4) -/* BBD69C 802404FC 56020006 */ bnel $s0, $v0, .L80240518 -/* BBD6A0 80240500 AE900088 */ sw $s0, 0x88($s4) -/* BBD6A4 80240504 3C048000 */ lui $a0, 0x8000 -/* BBD6A8 80240508 0C05271B */ jal stop_sound -/* BBD6AC 8024050C 34840010 */ ori $a0, $a0, 0x10 -/* BBD6B0 80240510 AE80007C */ sw $zero, 0x7c($s4) -.L80240514: -/* BBD6B4 80240514 AE900088 */ sw $s0, 0x88($s4) -.L80240518: -/* BBD6B8 80240518 26500058 */ addiu $s0, $s2, 0x58 -/* BBD6BC 8024051C C6200010 */ lwc1 $f0, 0x10($s1) -/* BBD6C0 80240520 3C014396 */ lui $at, 0x4396 -/* BBD6C4 80240524 4481B000 */ mtc1 $at, $f22 -/* BBD6C8 80240528 4480A000 */ mtc1 $zero, $f20 -/* BBD6CC 8024052C 46160001 */ sub.s $f0, $f0, $f22 -/* BBD6D0 80240530 4405A000 */ mfc1 $a1, $f20 -/* BBD6D4 80240534 4407A000 */ mfc1 $a3, $f20 -/* BBD6D8 80240538 44060000 */ mfc1 $a2, $f0 -/* BBD6DC 8024053C 0C019E40 */ jal guTranslateF -/* BBD6E0 80240540 0200202D */ daddu $a0, $s0, $zero -/* BBD6E4 80240544 4406A000 */ mfc1 $a2, $f20 -/* BBD6E8 80240548 4407A000 */ mfc1 $a3, $f20 -/* BBD6EC 8024054C 3C013F80 */ lui $at, 0x3f80 -/* BBD6F0 80240550 44810000 */ mtc1 $at, $f0 -/* BBD6F4 80240554 24130001 */ addiu $s3, $zero, 1 -/* BBD6F8 80240558 E7A00010 */ swc1 $f0, 0x10($sp) -/* BBD6FC 8024055C 8E250014 */ lw $a1, 0x14($s1) -/* BBD700 80240560 0C019EC8 */ jal guRotateF -/* BBD704 80240564 27A40018 */ addiu $a0, $sp, 0x18 -/* BBD708 80240568 0200202D */ daddu $a0, $s0, $zero -/* BBD70C 8024056C 27A50018 */ addiu $a1, $sp, 0x18 -/* BBD710 80240570 0C019D80 */ jal guMtxCatF -/* BBD714 80240574 0200302D */ daddu $a2, $s0, $zero -/* BBD718 80240578 27A40018 */ addiu $a0, $sp, 0x18 -/* BBD71C 8024057C 4405A000 */ mfc1 $a1, $f20 -/* BBD720 80240580 4406B000 */ mfc1 $a2, $f22 -/* BBD724 80240584 0C019E40 */ jal guTranslateF -/* BBD728 80240588 00A0382D */ daddu $a3, $a1, $zero -/* BBD72C 8024058C 0200202D */ daddu $a0, $s0, $zero -/* BBD730 80240590 27A50018 */ addiu $a1, $sp, 0x18 -/* BBD734 80240594 0C019D80 */ jal guMtxCatF -/* BBD738 80240598 0200302D */ daddu $a2, $s0, $zero -/* BBD73C 8024059C 2624001C */ addiu $a0, $s1, 0x1c -/* BBD740 802405A0 0200282D */ daddu $a1, $s0, $zero -/* BBD744 802405A4 0C019D80 */ jal guMtxCatF -/* BBD748 802405A8 00A0302D */ daddu $a2, $a1, $zero -/* BBD74C 802405AC 96420000 */ lhu $v0, ($s2) -/* BBD750 802405B0 26300004 */ addiu $s0, $s1, 4 -/* BBD754 802405B4 34421400 */ ori $v0, $v0, 0x1400 -/* BBD758 802405B8 A6420000 */ sh $v0, ($s2) -.L802405BC: -/* BBD75C 802405BC 8E05005C */ lw $a1, 0x5c($s0) -/* BBD760 802405C0 26440058 */ addiu $a0, $s2, 0x58 -/* BBD764 802405C4 0C00A5C8 */ jal copy_matrix -/* BBD768 802405C8 24A50058 */ addiu $a1, $a1, 0x58 -/* BBD76C 802405CC 8E03005C */ lw $v1, 0x5c($s0) -/* BBD770 802405D0 26730001 */ addiu $s3, $s3, 1 -/* BBD774 802405D4 94620000 */ lhu $v0, ($v1) -/* BBD778 802405D8 34421400 */ ori $v0, $v0, 0x1400 -/* BBD77C 802405DC A4620000 */ sh $v0, ($v1) -/* BBD780 802405E0 2A620004 */ slti $v0, $s3, 4 -/* BBD784 802405E4 1440FFF5 */ bnez $v0, .L802405BC -/* BBD788 802405E8 26100004 */ addiu $s0, $s0, 4 -/* BBD78C 802405EC 8E220000 */ lw $v0, ($s1) -/* BBD790 802405F0 30420002 */ andi $v0, $v0, 2 -/* BBD794 802405F4 10400021 */ beqz $v0, .L8024067C -/* BBD798 802405F8 00000000 */ nop -/* BBD79C 802405FC 0C00A8BB */ jal sin_deg -/* BBD7A0 80240600 C62C0014 */ lwc1 $f12, 0x14($s1) -/* BBD7A4 80240604 C6220010 */ lwc1 $f2, 0x10($s1) -/* BBD7A8 80240608 3C014396 */ lui $at, 0x4396 -/* BBD7AC 8024060C 4481A000 */ mtc1 $at, $f20 -/* BBD7B0 80240610 00000000 */ nop -/* BBD7B4 80240614 46141081 */ sub.s $f2, $f2, $f20 -/* BBD7B8 80240618 46000007 */ neg.s $f0, $f0 -/* BBD7BC 8024061C 46020002 */ mul.s $f0, $f0, $f2 -/* BBD7C0 80240620 00000000 */ nop -/* BBD7C4 80240624 3C0143DE */ lui $at, 0x43de -/* BBD7C8 80240628 34218000 */ ori $at, $at, 0x8000 -/* BBD7CC 8024062C 44811000 */ mtc1 $at, $f2 -/* BBD7D0 80240630 00000000 */ nop -/* BBD7D4 80240634 46020000 */ add.s $f0, $f0, $f2 -/* BBD7D8 80240638 E6A00028 */ swc1 $f0, 0x28($s5) -/* BBD7DC 8024063C 0C00A8D4 */ jal cos_deg -/* BBD7E0 80240640 C62C0014 */ lwc1 $f12, 0x14($s1) -/* BBD7E4 80240644 C6220010 */ lwc1 $f2, 0x10($s1) -/* BBD7E8 80240648 46141081 */ sub.s $f2, $f2, $f20 -/* BBD7EC 8024064C 46020002 */ mul.s $f0, $f0, $f2 -/* BBD7F0 80240650 00000000 */ nop -/* BBD7F4 80240654 3C014307 */ lui $at, 0x4307 -/* BBD7F8 80240658 44811000 */ mtc1 $at, $f2 -/* BBD7FC 8024065C 00000000 */ nop -/* BBD800 80240660 46020001 */ sub.s $f0, $f0, $f2 -/* BBD804 80240664 3C01438B */ lui $at, 0x438b -/* BBD808 80240668 34218000 */ ori $at, $at, 0x8000 -/* BBD80C 8024066C 44811000 */ mtc1 $at, $f2 -/* BBD810 80240670 46140000 */ add.s $f0, $f0, $f20 -/* BBD814 80240674 E6A20030 */ swc1 $f2, 0x30($s5) -/* BBD818 80240678 E6A0002C */ swc1 $f0, 0x2c($s5) -.L8024067C: -/* BBD81C 8024067C 8FBF0080 */ lw $ra, 0x80($sp) -/* BBD820 80240680 8FB5007C */ lw $s5, 0x7c($sp) -/* BBD824 80240684 8FB40078 */ lw $s4, 0x78($sp) -/* BBD828 80240688 8FB30074 */ lw $s3, 0x74($sp) -/* BBD82C 8024068C 8FB20070 */ lw $s2, 0x70($sp) -/* BBD830 80240690 8FB1006C */ lw $s1, 0x6c($sp) -/* BBD834 80240694 8FB00068 */ lw $s0, 0x68($sp) -/* BBD838 80240698 D7B60090 */ ldc1 $f22, 0x90($sp) -/* BBD83C 8024069C D7B40088 */ ldc1 $f20, 0x88($sp) -/* BBD840 802406A0 0000102D */ daddu $v0, $zero, $zero -/* BBD844 802406A4 03E00008 */ jr $ra -/* BBD848 802406A8 27BD0098 */ addiu $sp, $sp, 0x98 diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_802406AC_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_802406AC_BBD1A0.s deleted file mode 100644 index c1922fc2d4..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_802406AC_BBD1A0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406AC_BBD84C -/* BBD84C 802406AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BBD850 802406B0 AFB00010 */ sw $s0, 0x10($sp) -/* BBD854 802406B4 0080802D */ daddu $s0, $a0, $zero -/* BBD858 802406B8 AFBF0014 */ sw $ra, 0x14($sp) -/* BBD85C 802406BC 10A00005 */ beqz $a1, .L802406D4 -/* BBD860 802406C0 8E02000C */ lw $v0, 0xc($s0) -/* BBD864 802406C4 0C0B1EAF */ jal get_variable -/* BBD868 802406C8 8C450000 */ lw $a1, ($v0) -/* BBD86C 802406CC 8C420000 */ lw $v0, ($v0) -/* BBD870 802406D0 AE020074 */ sw $v0, 0x74($s0) -.L802406D4: -/* BBD874 802406D4 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* BBD878 802406D8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* BBD87C 802406DC 8C420010 */ lw $v0, 0x10($v0) -/* BBD880 802406E0 8E050074 */ lw $a1, 0x74($s0) -/* BBD884 802406E4 30428000 */ andi $v0, $v0, 0x8000 -/* BBD888 802406E8 1040000D */ beqz $v0, .L80240720 -/* BBD88C 802406EC 0000102D */ daddu $v0, $zero, $zero -/* BBD890 802406F0 8CA20000 */ lw $v0, ($a1) -/* BBD894 802406F4 30420004 */ andi $v0, $v0, 4 -/* BBD898 802406F8 10400003 */ beqz $v0, .L80240708 -/* BBD89C 802406FC 24020001 */ addiu $v0, $zero, 1 -/* BBD8A0 80240700 080901C3 */ j .L8024070C -/* BBD8A4 80240704 AE020084 */ sw $v0, 0x84($s0) -.L80240708: -/* BBD8A8 80240708 AE000084 */ sw $zero, 0x84($s0) -.L8024070C: -/* BBD8AC 8024070C 24020002 */ addiu $v0, $zero, 2 -/* BBD8B0 80240710 8CA30000 */ lw $v1, ($a1) -/* BBD8B4 80240714 2404FFFD */ addiu $a0, $zero, -3 -/* BBD8B8 80240718 00641824 */ and $v1, $v1, $a0 -/* BBD8BC 8024071C ACA30000 */ sw $v1, ($a1) -.L80240720: -/* BBD8C0 80240720 8FBF0014 */ lw $ra, 0x14($sp) -/* BBD8C4 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* BBD8C8 80240728 03E00008 */ jr $ra -/* BBD8CC 8024072C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_80240730_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_80240730_BBD1A0.s deleted file mode 100644 index bc00429a24..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_80240730_BBD1A0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_BBD8D0 -/* BBD8D0 80240730 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BBD8D4 80240734 AFB00010 */ sw $s0, 0x10($sp) -/* BBD8D8 80240738 0080802D */ daddu $s0, $a0, $zero -/* BBD8DC 8024073C AFBF0014 */ sw $ra, 0x14($sp) -/* BBD8E0 80240740 10A00005 */ beqz $a1, .L80240758 -/* BBD8E4 80240744 8E02000C */ lw $v0, 0xc($s0) -/* BBD8E8 80240748 0C0B1EAF */ jal get_variable -/* BBD8EC 8024074C 8C450000 */ lw $a1, ($v0) -/* BBD8F0 80240750 8C420000 */ lw $v0, ($v0) -/* BBD8F4 80240754 AE020074 */ sw $v0, 0x74($s0) -.L80240758: -/* BBD8F8 80240758 8E040074 */ lw $a0, 0x74($s0) -/* BBD8FC 8024075C 8C830000 */ lw $v1, ($a0) -/* BBD900 80240760 30620004 */ andi $v0, $v1, 4 -/* BBD904 80240764 14400003 */ bnez $v0, .L80240774 -/* BBD908 80240768 2402FFFD */ addiu $v0, $zero, -3 -/* BBD90C 8024076C 080901E0 */ j .L80240780 -/* BBD910 80240770 0000102D */ daddu $v0, $zero, $zero -.L80240774: -/* BBD914 80240774 00621024 */ and $v0, $v1, $v0 -/* BBD918 80240778 AC820000 */ sw $v0, ($a0) -/* BBD91C 8024077C 24020002 */ addiu $v0, $zero, 2 -.L80240780: -/* BBD920 80240780 8FBF0014 */ lw $ra, 0x14($sp) -/* BBD924 80240784 8FB00010 */ lw $s0, 0x10($sp) -/* BBD928 80240788 03E00008 */ jr $ra -/* BBD92C 8024078C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_80240790_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_80240790_BBD1A0.s deleted file mode 100644 index 9599187db8..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_80240790_BBD1A0.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240790_BBD930 -/* BBD930 80240790 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BBD934 80240794 AFB00010 */ sw $s0, 0x10($sp) -/* BBD938 80240798 0080802D */ daddu $s0, $a0, $zero -/* BBD93C 8024079C AFBF0014 */ sw $ra, 0x14($sp) -/* BBD940 802407A0 0C04C3D6 */ jal get_item_entity -/* BBD944 802407A4 8E040084 */ lw $a0, 0x84($s0) -/* BBD948 802407A8 8E040084 */ lw $a0, 0x84($s0) -/* BBD94C 802407AC 0040802D */ daddu $s0, $v0, $zero -/* BBD950 802407B0 0C04D052 */ jal set_item_entity_flags -/* BBD954 802407B4 3C050008 */ lui $a1, 8 -/* BBD958 802407B8 240300FF */ addiu $v1, $zero, 0xff -/* BBD95C 802407BC A203002F */ sb $v1, 0x2f($s0) -/* BBD960 802407C0 8FBF0014 */ lw $ra, 0x14($sp) -/* BBD964 802407C4 8FB00010 */ lw $s0, 0x10($sp) -/* BBD968 802407C8 24020002 */ addiu $v0, $zero, 2 -/* BBD96C 802407CC 03E00008 */ jr $ra -/* BBD970 802407D0 27BD0018 */ addiu $sp, $sp, 0x18 -/* BBD974 802407D4 00000000 */ nop -/* BBD978 802407D8 00000000 */ nop -/* BBD97C 802407DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_802407E0_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_802407E0_BBD1A0.s deleted file mode 100644 index 52c42ec114..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_802407E0_BBD1A0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407E0_BBD980 -/* BBD980 802407E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BBD984 802407E4 AFB00010 */ sw $s0, 0x10($sp) -/* BBD988 802407E8 3C108024 */ lui $s0, 0x8024 -/* BBD98C 802407EC 261040F0 */ addiu $s0, $s0, 0x40f0 -/* BBD990 802407F0 AFBF0018 */ sw $ra, 0x18($sp) -/* BBD994 802407F4 AFB10014 */ sw $s1, 0x14($sp) -/* BBD998 802407F8 8E020000 */ lw $v0, ($s0) -/* BBD99C 802407FC 14400010 */ bnez $v0, .L80240840 -/* BBD9A0 80240800 0080882D */ daddu $s1, $a0, $zero -/* BBD9A4 80240804 0C00AB39 */ jal heap_malloc -/* BBD9A8 80240808 24040040 */ addiu $a0, $zero, 0x40 -/* BBD9AC 8024080C AE020000 */ sw $v0, ($s0) -/* BBD9B0 80240810 0000182D */ daddu $v1, $zero, $zero -/* BBD9B4 80240814 0040282D */ daddu $a1, $v0, $zero -/* BBD9B8 80240818 0220202D */ daddu $a0, $s1, $zero -.L8024081C: -/* BBD9BC 8024081C 8C820084 */ lw $v0, 0x84($a0) -/* BBD9C0 80240820 24840004 */ addiu $a0, $a0, 4 -/* BBD9C4 80240824 24630001 */ addiu $v1, $v1, 1 -/* BBD9C8 80240828 ACA20000 */ sw $v0, ($a1) -/* BBD9CC 8024082C 28620010 */ slti $v0, $v1, 0x10 -/* BBD9D0 80240830 1440FFFA */ bnez $v0, .L8024081C -/* BBD9D4 80240834 24A50004 */ addiu $a1, $a1, 4 -/* BBD9D8 80240838 0809021F */ j .L8024087C -/* BBD9DC 8024083C 00000000 */ nop -.L80240840: -/* BBD9E0 80240840 0000182D */ daddu $v1, $zero, $zero -/* BBD9E4 80240844 0040282D */ daddu $a1, $v0, $zero -/* BBD9E8 80240848 0220202D */ daddu $a0, $s1, $zero -.L8024084C: -/* BBD9EC 8024084C 8CA20000 */ lw $v0, ($a1) -/* BBD9F0 80240850 24A50004 */ addiu $a1, $a1, 4 -/* BBD9F4 80240854 24630001 */ addiu $v1, $v1, 1 -/* BBD9F8 80240858 AC820084 */ sw $v0, 0x84($a0) -/* BBD9FC 8024085C 28620010 */ slti $v0, $v1, 0x10 -/* BBDA00 80240860 1440FFFA */ bnez $v0, .L8024084C -/* BBDA04 80240864 24840004 */ addiu $a0, $a0, 4 -/* BBDA08 80240868 3C108024 */ lui $s0, 0x8024 -/* BBDA0C 8024086C 261040F0 */ addiu $s0, $s0, 0x40f0 -/* BBDA10 80240870 0C00AB4B */ jal heap_free -/* BBDA14 80240874 8E040000 */ lw $a0, ($s0) -/* BBDA18 80240878 AE000000 */ sw $zero, ($s0) -.L8024087C: -/* BBDA1C 8024087C 8FBF0018 */ lw $ra, 0x18($sp) -/* BBDA20 80240880 8FB10014 */ lw $s1, 0x14($sp) -/* BBDA24 80240884 8FB00010 */ lw $s0, 0x10($sp) -/* BBDA28 80240888 24020002 */ addiu $v0, $zero, 2 -/* BBDA2C 8024088C 03E00008 */ jr $ra -/* BBDA30 80240890 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_802408F8_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_802408F8_BBD1A0.s deleted file mode 100644 index 5fc8caee7b..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_802408F8_BBD1A0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408F8_BBDA98 -/* BBDA98 802408F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BBDA9C 802408FC AFB10014 */ sw $s1, 0x14($sp) -/* BBDAA0 80240900 0080882D */ daddu $s1, $a0, $zero -/* BBDAA4 80240904 AFBF0018 */ sw $ra, 0x18($sp) -/* BBDAA8 80240908 AFB00010 */ sw $s0, 0x10($sp) -/* BBDAAC 8024090C 8E30000C */ lw $s0, 0xc($s1) -/* BBDAB0 80240910 8E050000 */ lw $a1, ($s0) -/* BBDAB4 80240914 0C0B1EAF */ jal get_variable -/* BBDAB8 80240918 26100004 */ addiu $s0, $s0, 4 -/* BBDABC 8024091C 0C00EAD2 */ jal get_npc_safe -/* BBDAC0 80240920 0040202D */ daddu $a0, $v0, $zero -/* BBDAC4 80240924 10400005 */ beqz $v0, .L8024093C -/* BBDAC8 80240928 00000000 */ nop -/* BBDACC 8024092C 8E050000 */ lw $a1, ($s0) -/* BBDAD0 80240930 844600A8 */ lh $a2, 0xa8($v0) -/* BBDAD4 80240934 0C0B2026 */ jal set_variable -/* BBDAD8 80240938 0220202D */ daddu $a0, $s1, $zero -.L8024093C: -/* BBDADC 8024093C 8FBF0018 */ lw $ra, 0x18($sp) -/* BBDAE0 80240940 8FB10014 */ lw $s1, 0x14($sp) -/* BBDAE4 80240944 8FB00010 */ lw $s0, 0x10($sp) -/* BBDAE8 80240948 24020002 */ addiu $v0, $zero, 2 -/* BBDAEC 8024094C 03E00008 */ jr $ra -/* BBDAF0 80240950 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_80240954_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_80240954_BBD1A0.s deleted file mode 100644 index b14d1204c4..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_80240954_BBD1A0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240954_BBDAF4 -/* BBDAF4 80240954 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BBDAF8 80240958 AFB10014 */ sw $s1, 0x14($sp) -/* BBDAFC 8024095C 0080882D */ daddu $s1, $a0, $zero -/* BBDB00 80240960 AFBF0024 */ sw $ra, 0x24($sp) -/* BBDB04 80240964 AFB40020 */ sw $s4, 0x20($sp) -/* BBDB08 80240968 AFB3001C */ sw $s3, 0x1c($sp) -/* BBDB0C 8024096C AFB20018 */ sw $s2, 0x18($sp) -/* BBDB10 80240970 AFB00010 */ sw $s0, 0x10($sp) -/* BBDB14 80240974 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* BBDB18 80240978 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* BBDB1C 8024097C F7B80038 */ sdc1 $f24, 0x38($sp) -/* BBDB20 80240980 F7B60030 */ sdc1 $f22, 0x30($sp) -/* BBDB24 80240984 F7B40028 */ sdc1 $f20, 0x28($sp) -/* BBDB28 80240988 8E30000C */ lw $s0, 0xc($s1) -/* BBDB2C 8024098C 8E130000 */ lw $s3, ($s0) -/* BBDB30 80240990 26100004 */ addiu $s0, $s0, 4 -/* BBDB34 80240994 0C0B1EAF */ jal get_variable -/* BBDB38 80240998 0260282D */ daddu $a1, $s3, $zero -/* BBDB3C 8024099C 4482E000 */ mtc1 $v0, $f28 -/* BBDB40 802409A0 00000000 */ nop -/* BBDB44 802409A4 4680E720 */ cvt.s.w $f28, $f28 -/* BBDB48 802409A8 8E140000 */ lw $s4, ($s0) -/* BBDB4C 802409AC 26100004 */ addiu $s0, $s0, 4 -/* BBDB50 802409B0 0220202D */ daddu $a0, $s1, $zero -/* BBDB54 802409B4 0C0B1EAF */ jal get_variable -/* BBDB58 802409B8 0280282D */ daddu $a1, $s4, $zero -/* BBDB5C 802409BC 4482D000 */ mtc1 $v0, $f26 -/* BBDB60 802409C0 00000000 */ nop -/* BBDB64 802409C4 4680D6A0 */ cvt.s.w $f26, $f26 -/* BBDB68 802409C8 8E100000 */ lw $s0, ($s0) -/* BBDB6C 802409CC 0220202D */ daddu $a0, $s1, $zero -/* BBDB70 802409D0 0C0B1EAF */ jal get_variable -/* BBDB74 802409D4 0200282D */ daddu $a1, $s0, $zero -/* BBDB78 802409D8 4482C000 */ mtc1 $v0, $f24 -/* BBDB7C 802409DC 00000000 */ nop -/* BBDB80 802409E0 4680C620 */ cvt.s.w $f24, $f24 -/* BBDB84 802409E4 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* BBDB88 802409E8 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* BBDB8C 802409EC 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* BBDB90 802409F0 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* BBDB94 802409F4 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* BBDB98 802409F8 44800000 */ mtc1 $zero, $f0 -/* BBDB9C 802409FC 00031080 */ sll $v0, $v1, 2 -/* BBDBA0 80240A00 00431021 */ addu $v0, $v0, $v1 -/* BBDBA4 80240A04 00021080 */ sll $v0, $v0, 2 -/* BBDBA8 80240A08 00431023 */ subu $v0, $v0, $v1 -/* BBDBAC 80240A0C 000218C0 */ sll $v1, $v0, 3 -/* BBDBB0 80240A10 00431021 */ addu $v0, $v0, $v1 -/* BBDBB4 80240A14 000210C0 */ sll $v0, $v0, 3 -/* BBDBB8 80240A18 46001032 */ c.eq.s $f2, $f0 -/* BBDBBC 80240A1C 3C01800B */ lui $at, 0x800b -/* BBDBC0 80240A20 00220821 */ addu $at, $at, $v0 -/* BBDBC4 80240A24 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* BBDBC8 80240A28 45000005 */ bc1f .L80240A40 -/* BBDBCC 80240A2C 00000000 */ nop -/* BBDBD0 80240A30 3C0142C8 */ lui $at, 0x42c8 -/* BBDBD4 80240A34 44810000 */ mtc1 $at, $f0 -/* BBDBD8 80240A38 08090294 */ j .L80240A50 -/* BBDBDC 80240A3C 4600B581 */ sub.s $f22, $f22, $f0 -.L80240A40: -/* BBDBE0 80240A40 3C0142C8 */ lui $at, 0x42c8 -/* BBDBE4 80240A44 44810000 */ mtc1 $at, $f0 -/* BBDBE8 80240A48 00000000 */ nop -/* BBDBEC 80240A4C 4600B580 */ add.s $f22, $f22, $f0 -.L80240A50: -/* BBDBF0 80240A50 0C00A6C9 */ jal clamp_angle -/* BBDBF4 80240A54 4600B306 */ mov.s $f12, $f22 -/* BBDBF8 80240A58 46000586 */ mov.s $f22, $f0 -/* BBDBFC 80240A5C 3C014170 */ lui $at, 0x4170 -/* BBDC00 80240A60 4481A000 */ mtc1 $at, $f20 -/* BBDC04 80240A64 0C00A8BB */ jal sin_deg -/* BBDC08 80240A68 4600B306 */ mov.s $f12, $f22 -/* BBDC0C 80240A6C 46140002 */ mul.s $f0, $f0, $f20 -/* BBDC10 80240A70 00000000 */ nop -/* BBDC14 80240A74 864200B0 */ lh $v0, 0xb0($s2) -/* BBDC18 80240A78 3C013F00 */ lui $at, 0x3f00 -/* BBDC1C 80240A7C 44812000 */ mtc1 $at, $f4 -/* BBDC20 80240A80 44821000 */ mtc1 $v0, $f2 -/* BBDC24 80240A84 00000000 */ nop -/* BBDC28 80240A88 468010A0 */ cvt.s.w $f2, $f2 -/* BBDC2C 80240A8C 46041082 */ mul.s $f2, $f2, $f4 -/* BBDC30 80240A90 00000000 */ nop -/* BBDC34 80240A94 4600E700 */ add.s $f28, $f28, $f0 -/* BBDC38 80240A98 4602D680 */ add.s $f26, $f26, $f2 -/* BBDC3C 80240A9C 0C00A8D4 */ jal cos_deg -/* BBDC40 80240AA0 4600B306 */ mov.s $f12, $f22 -/* BBDC44 80240AA4 46140002 */ mul.s $f0, $f0, $f20 -/* BBDC48 80240AA8 00000000 */ nop -/* BBDC4C 80240AAC 0220202D */ daddu $a0, $s1, $zero -/* BBDC50 80240AB0 0260282D */ daddu $a1, $s3, $zero -/* BBDC54 80240AB4 4600E18D */ trunc.w.s $f6, $f28 -/* BBDC58 80240AB8 44063000 */ mfc1 $a2, $f6 -/* BBDC5C 80240ABC 0C0B2026 */ jal set_variable -/* BBDC60 80240AC0 4600C601 */ sub.s $f24, $f24, $f0 -/* BBDC64 80240AC4 0220202D */ daddu $a0, $s1, $zero -/* BBDC68 80240AC8 4600D18D */ trunc.w.s $f6, $f26 -/* BBDC6C 80240ACC 44063000 */ mfc1 $a2, $f6 -/* BBDC70 80240AD0 0C0B2026 */ jal set_variable -/* BBDC74 80240AD4 0280282D */ daddu $a1, $s4, $zero -/* BBDC78 80240AD8 0220202D */ daddu $a0, $s1, $zero -/* BBDC7C 80240ADC 4600C18D */ trunc.w.s $f6, $f24 -/* BBDC80 80240AE0 44063000 */ mfc1 $a2, $f6 -/* BBDC84 80240AE4 0C0B2026 */ jal set_variable -/* BBDC88 80240AE8 0200282D */ daddu $a1, $s0, $zero -/* BBDC8C 80240AEC 8FBF0024 */ lw $ra, 0x24($sp) -/* BBDC90 80240AF0 8FB40020 */ lw $s4, 0x20($sp) -/* BBDC94 80240AF4 8FB3001C */ lw $s3, 0x1c($sp) -/* BBDC98 80240AF8 8FB20018 */ lw $s2, 0x18($sp) -/* BBDC9C 80240AFC 8FB10014 */ lw $s1, 0x14($sp) -/* BBDCA0 80240B00 8FB00010 */ lw $s0, 0x10($sp) -/* BBDCA4 80240B04 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* BBDCA8 80240B08 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* BBDCAC 80240B0C D7B80038 */ ldc1 $f24, 0x38($sp) -/* BBDCB0 80240B10 D7B60030 */ ldc1 $f22, 0x30($sp) -/* BBDCB4 80240B14 D7B40028 */ ldc1 $f20, 0x28($sp) -/* BBDCB8 80240B18 24020002 */ addiu $v0, $zero, 2 -/* BBDCBC 80240B1C 03E00008 */ jr $ra -/* BBDCC0 80240B20 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_80240B78_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_80240B78_BBD1A0.s deleted file mode 100644 index 6bd28a215c..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_80240B78_BBD1A0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B78_BBDD18 -/* BBDD18 80240B78 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BBDD1C 80240B7C AFBF0010 */ sw $ra, 0x10($sp) -/* BBDD20 80240B80 8C82000C */ lw $v0, 0xc($a0) -/* BBDD24 80240B84 0C0B1EAF */ jal get_variable -/* BBDD28 80240B88 8C450000 */ lw $a1, ($v0) -/* BBDD2C 80240B8C 3C018024 */ lui $at, 0x8024 -/* BBDD30 80240B90 AC224158 */ sw $v0, 0x4158($at) -/* BBDD34 80240B94 24020002 */ addiu $v0, $zero, 2 -/* BBDD38 80240B98 8FBF0010 */ lw $ra, 0x10($sp) -/* BBDD3C 80240B9C 24030001 */ addiu $v1, $zero, 1 -/* BBDD40 80240BA0 3C018024 */ lui $at, 0x8024 -/* BBDD44 80240BA4 AC234154 */ sw $v1, 0x4154($at) -/* BBDD48 80240BA8 03E00008 */ jr $ra -/* BBDD4C 80240BAC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_80240BB0_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_80240BB0_BBD1A0.s deleted file mode 100644 index a263d867d1..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_80240BB0_BBD1A0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BB0_BBDD50 -/* BBDD50 80240BB0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BBDD54 80240BB4 AFBF0010 */ sw $ra, 0x10($sp) -/* BBDD58 80240BB8 8C82000C */ lw $v0, 0xc($a0) -/* BBDD5C 80240BBC 0C0B1EAF */ jal get_variable -/* BBDD60 80240BC0 8C450000 */ lw $a1, ($v0) -/* BBDD64 80240BC4 0040182D */ daddu $v1, $v0, $zero -/* BBDD68 80240BC8 10600012 */ beqz $v1, .L80240C14 -/* BBDD6C 80240BCC 0000202D */ daddu $a0, $zero, $zero -/* BBDD70 80240BD0 8C620000 */ lw $v0, ($v1) -/* BBDD74 80240BD4 5040000A */ beql $v0, $zero, .L80240C00 -/* BBDD78 80240BD8 00041080 */ sll $v0, $a0, 2 -/* BBDD7C 80240BDC 3C058024 */ lui $a1, 0x8024 -/* BBDD80 80240BE0 24A558F0 */ addiu $a1, $a1, 0x58f0 -.L80240BE4: -/* BBDD84 80240BE4 24630004 */ addiu $v1, $v1, 4 -/* BBDD88 80240BE8 24840001 */ addiu $a0, $a0, 1 -/* BBDD8C 80240BEC ACA20000 */ sw $v0, ($a1) -/* BBDD90 80240BF0 8C620000 */ lw $v0, ($v1) -/* BBDD94 80240BF4 1440FFFB */ bnez $v0, .L80240BE4 -/* BBDD98 80240BF8 24A50004 */ addiu $a1, $a1, 4 -/* BBDD9C 80240BFC 00041080 */ sll $v0, $a0, 2 -.L80240C00: -/* BBDDA0 80240C00 3C018024 */ lui $at, 0x8024 -/* BBDDA4 80240C04 00220821 */ addu $at, $at, $v0 -/* BBDDA8 80240C08 AC2058F0 */ sw $zero, 0x58f0($at) -/* BBDDAC 80240C0C 0809030F */ j .L80240C3C -/* BBDDB0 80240C10 00000000 */ nop -.L80240C14: -/* BBDDB4 80240C14 3C038024 */ lui $v1, 0x8024 -/* BBDDB8 80240C18 246358F0 */ addiu $v1, $v1, 0x58f0 -/* BBDDBC 80240C1C 0060282D */ daddu $a1, $v1, $zero -.L80240C20: -/* BBDDC0 80240C20 24820010 */ addiu $v0, $a0, 0x10 -/* BBDDC4 80240C24 AC620000 */ sw $v0, ($v1) -/* BBDDC8 80240C28 24630004 */ addiu $v1, $v1, 4 -/* BBDDCC 80240C2C 24840001 */ addiu $a0, $a0, 1 -/* BBDDD0 80240C30 28820070 */ slti $v0, $a0, 0x70 -/* BBDDD4 80240C34 1440FFFA */ bnez $v0, .L80240C20 -/* BBDDD8 80240C38 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80240C3C: -/* BBDDDC 80240C3C 8FBF0010 */ lw $ra, 0x10($sp) -/* BBDDE0 80240C40 24020002 */ addiu $v0, $zero, 2 -/* BBDDE4 80240C44 03E00008 */ jr $ra -/* BBDDE8 80240C48 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_80240C4C_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_80240C4C_BBD1A0.s deleted file mode 100644 index 92ce7605a0..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_80240C4C_BBD1A0.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_BBDDEC -/* BBDDEC 80240C4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BBDDF0 80240C50 AFB10014 */ sw $s1, 0x14($sp) -/* BBDDF4 80240C54 0080882D */ daddu $s1, $a0, $zero -/* BBDDF8 80240C58 AFBF0018 */ sw $ra, 0x18($sp) -/* BBDDFC 80240C5C AFB00010 */ sw $s0, 0x10($sp) -/* BBDE00 80240C60 8E30000C */ lw $s0, 0xc($s1) -/* BBDE04 80240C64 8E050000 */ lw $a1, ($s0) -/* BBDE08 80240C68 0C0B1EAF */ jal get_variable -/* BBDE0C 80240C6C 26100004 */ addiu $s0, $s0, 4 -/* BBDE10 80240C70 AE22008C */ sw $v0, 0x8c($s1) -/* BBDE14 80240C74 8E050000 */ lw $a1, ($s0) -/* BBDE18 80240C78 26100004 */ addiu $s0, $s0, 4 -/* BBDE1C 80240C7C 0C0B1EAF */ jal get_variable -/* BBDE20 80240C80 0220202D */ daddu $a0, $s1, $zero -/* BBDE24 80240C84 AE220090 */ sw $v0, 0x90($s1) -/* BBDE28 80240C88 8E050000 */ lw $a1, ($s0) -/* BBDE2C 80240C8C 26100004 */ addiu $s0, $s0, 4 -/* BBDE30 80240C90 0C0B1EAF */ jal get_variable -/* BBDE34 80240C94 0220202D */ daddu $a0, $s1, $zero -/* BBDE38 80240C98 AE220094 */ sw $v0, 0x94($s1) -/* BBDE3C 80240C9C 8E050000 */ lw $a1, ($s0) -/* BBDE40 80240CA0 26100004 */ addiu $s0, $s0, 4 -/* BBDE44 80240CA4 0C0B1EAF */ jal get_variable -/* BBDE48 80240CA8 0220202D */ daddu $a0, $s1, $zero -/* BBDE4C 80240CAC AE220098 */ sw $v0, 0x98($s1) -/* BBDE50 80240CB0 8E050000 */ lw $a1, ($s0) -/* BBDE54 80240CB4 26100004 */ addiu $s0, $s0, 4 -/* BBDE58 80240CB8 0C0B1EAF */ jal get_variable -/* BBDE5C 80240CBC 0220202D */ daddu $a0, $s1, $zero -/* BBDE60 80240CC0 AE22009C */ sw $v0, 0x9c($s1) -/* BBDE64 80240CC4 8E050000 */ lw $a1, ($s0) -/* BBDE68 80240CC8 26100004 */ addiu $s0, $s0, 4 -/* BBDE6C 80240CCC 0C0B1EAF */ jal get_variable -/* BBDE70 80240CD0 0220202D */ daddu $a0, $s1, $zero -/* BBDE74 80240CD4 AE2200A0 */ sw $v0, 0xa0($s1) -/* BBDE78 80240CD8 8E050000 */ lw $a1, ($s0) -/* BBDE7C 80240CDC 26100004 */ addiu $s0, $s0, 4 -/* BBDE80 80240CE0 0C0B1EAF */ jal get_variable -/* BBDE84 80240CE4 0220202D */ daddu $a0, $s1, $zero -/* BBDE88 80240CE8 AE2200A4 */ sw $v0, 0xa4($s1) -/* BBDE8C 80240CEC 8E050000 */ lw $a1, ($s0) -/* BBDE90 80240CF0 26100004 */ addiu $s0, $s0, 4 -/* BBDE94 80240CF4 0C0B1EAF */ jal get_variable -/* BBDE98 80240CF8 0220202D */ daddu $a0, $s1, $zero -/* BBDE9C 80240CFC AE2200A8 */ sw $v0, 0xa8($s1) -/* BBDEA0 80240D00 8E050000 */ lw $a1, ($s0) -/* BBDEA4 80240D04 26100004 */ addiu $s0, $s0, 4 -/* BBDEA8 80240D08 0C0B1EAF */ jal get_variable -/* BBDEAC 80240D0C 0220202D */ daddu $a0, $s1, $zero -/* BBDEB0 80240D10 AE2200AC */ sw $v0, 0xac($s1) -/* BBDEB4 80240D14 8E050000 */ lw $a1, ($s0) -/* BBDEB8 80240D18 0C0B1EAF */ jal get_variable -/* BBDEBC 80240D1C 0220202D */ daddu $a0, $s1, $zero -/* BBDEC0 80240D20 AE2200B0 */ sw $v0, 0xb0($s1) -/* BBDEC4 80240D24 8FBF0018 */ lw $ra, 0x18($sp) -/* BBDEC8 80240D28 8FB10014 */ lw $s1, 0x14($sp) -/* BBDECC 80240D2C 8FB00010 */ lw $s0, 0x10($sp) -/* BBDED0 80240D30 24020002 */ addiu $v0, $zero, 2 -/* BBDED4 80240D34 03E00008 */ jr $ra -/* BBDED8 80240D38 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_80240D3C_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_80240D3C_BBD1A0.s deleted file mode 100644 index 89154a92b1..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_80240D3C_BBD1A0.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_BBDEDC -/* BBDEDC 80240D3C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BBDEE0 80240D40 AFB1001C */ sw $s1, 0x1c($sp) -/* BBDEE4 80240D44 0080882D */ daddu $s1, $a0, $zero -/* BBDEE8 80240D48 AFBF0034 */ sw $ra, 0x34($sp) -/* BBDEEC 80240D4C AFB60030 */ sw $s6, 0x30($sp) -/* BBDEF0 80240D50 AFB5002C */ sw $s5, 0x2c($sp) -/* BBDEF4 80240D54 AFB40028 */ sw $s4, 0x28($sp) -/* BBDEF8 80240D58 AFB30024 */ sw $s3, 0x24($sp) -/* BBDEFC 80240D5C AFB20020 */ sw $s2, 0x20($sp) -/* BBDF00 80240D60 AFB00018 */ sw $s0, 0x18($sp) -/* BBDF04 80240D64 F7B60040 */ sdc1 $f22, 0x40($sp) -/* BBDF08 80240D68 F7B40038 */ sdc1 $f20, 0x38($sp) -/* BBDF0C 80240D6C 8E30000C */ lw $s0, 0xc($s1) -/* BBDF10 80240D70 8E160000 */ lw $s6, ($s0) -/* BBDF14 80240D74 26100004 */ addiu $s0, $s0, 4 -/* BBDF18 80240D78 0C0B1EAF */ jal get_variable -/* BBDF1C 80240D7C 02C0282D */ daddu $a1, $s6, $zero -/* BBDF20 80240D80 44820000 */ mtc1 $v0, $f0 -/* BBDF24 80240D84 00000000 */ nop -/* BBDF28 80240D88 46800020 */ cvt.s.w $f0, $f0 -/* BBDF2C 80240D8C E7A00010 */ swc1 $f0, 0x10($sp) -/* BBDF30 80240D90 8E140000 */ lw $s4, ($s0) -/* BBDF34 80240D94 26100004 */ addiu $s0, $s0, 4 -/* BBDF38 80240D98 0220202D */ daddu $a0, $s1, $zero -/* BBDF3C 80240D9C 0C0B1EAF */ jal get_variable -/* BBDF40 80240DA0 0280282D */ daddu $a1, $s4, $zero -/* BBDF44 80240DA4 0220202D */ daddu $a0, $s1, $zero -/* BBDF48 80240DA8 8E150000 */ lw $s5, ($s0) -/* BBDF4C 80240DAC 4482B000 */ mtc1 $v0, $f22 -/* BBDF50 80240DB0 00000000 */ nop -/* BBDF54 80240DB4 4680B5A0 */ cvt.s.w $f22, $f22 -/* BBDF58 80240DB8 0C0B1EAF */ jal get_variable -/* BBDF5C 80240DBC 02A0282D */ daddu $a1, $s5, $zero -/* BBDF60 80240DC0 2404FFFC */ addiu $a0, $zero, -4 -/* BBDF64 80240DC4 44820000 */ mtc1 $v0, $f0 -/* BBDF68 80240DC8 00000000 */ nop -/* BBDF6C 80240DCC 46800020 */ cvt.s.w $f0, $f0 -/* BBDF70 80240DD0 0C00EABB */ jal get_npc_unsafe -/* BBDF74 80240DD4 E7A00014 */ swc1 $f0, 0x14($sp) -/* BBDF78 80240DD8 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* BBDF7C 80240DDC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* BBDF80 80240DE0 3C014334 */ lui $at, 0x4334 -/* BBDF84 80240DE4 44816000 */ mtc1 $at, $f12 -/* BBDF88 80240DE8 00041880 */ sll $v1, $a0, 2 -/* BBDF8C 80240DEC 00641821 */ addu $v1, $v1, $a0 -/* BBDF90 80240DF0 00031880 */ sll $v1, $v1, 2 -/* BBDF94 80240DF4 00641823 */ subu $v1, $v1, $a0 -/* BBDF98 80240DF8 000320C0 */ sll $a0, $v1, 3 -/* BBDF9C 80240DFC 00641821 */ addu $v1, $v1, $a0 -/* BBDFA0 80240E00 000318C0 */ sll $v1, $v1, 3 -/* BBDFA4 80240E04 3C01800B */ lui $at, 0x800b -/* BBDFA8 80240E08 00230821 */ addu $at, $at, $v1 -/* BBDFAC 80240E0C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* BBDFB0 80240E10 460C0300 */ add.s $f12, $f0, $f12 -/* BBDFB4 80240E14 0C00A6C9 */ jal clamp_angle -/* BBDFB8 80240E18 0040982D */ daddu $s3, $v0, $zero -/* BBDFBC 80240E1C 27B00010 */ addiu $s0, $sp, 0x10 -/* BBDFC0 80240E20 0200202D */ daddu $a0, $s0, $zero -/* BBDFC4 80240E24 27B20014 */ addiu $s2, $sp, 0x14 -/* BBDFC8 80240E28 0240282D */ daddu $a1, $s2, $zero -/* BBDFCC 80240E2C 3C064170 */ lui $a2, 0x4170 -/* BBDFD0 80240E30 8E67000C */ lw $a3, 0xc($s3) -/* BBDFD4 80240E34 0C00A7E7 */ jal add_vec2D_polar -/* BBDFD8 80240E38 46000506 */ mov.s $f20, $f0 -/* BBDFDC 80240E3C 0200202D */ daddu $a0, $s0, $zero -/* BBDFE0 80240E40 3C064120 */ lui $a2, 0x4120 -/* BBDFE4 80240E44 4407A000 */ mfc1 $a3, $f20 -/* BBDFE8 80240E48 0C00A7E7 */ jal add_vec2D_polar -/* BBDFEC 80240E4C 0240282D */ daddu $a1, $s2, $zero -/* BBDFF0 80240E50 0220202D */ daddu $a0, $s1, $zero -/* BBDFF4 80240E54 C7A00010 */ lwc1 $f0, 0x10($sp) -/* BBDFF8 80240E58 4600008D */ trunc.w.s $f2, $f0 -/* BBDFFC 80240E5C 44061000 */ mfc1 $a2, $f2 -/* BBE000 80240E60 0C0B2026 */ jal set_variable -/* BBE004 80240E64 02C0282D */ daddu $a1, $s6, $zero -/* BBE008 80240E68 0220202D */ daddu $a0, $s1, $zero -/* BBE00C 80240E6C 4600B08D */ trunc.w.s $f2, $f22 -/* BBE010 80240E70 44061000 */ mfc1 $a2, $f2 -/* BBE014 80240E74 0C0B2026 */ jal set_variable -/* BBE018 80240E78 0280282D */ daddu $a1, $s4, $zero -/* BBE01C 80240E7C 0220202D */ daddu $a0, $s1, $zero -/* BBE020 80240E80 C7A00014 */ lwc1 $f0, 0x14($sp) -/* BBE024 80240E84 4600008D */ trunc.w.s $f2, $f0 -/* BBE028 80240E88 44061000 */ mfc1 $a2, $f2 -/* BBE02C 80240E8C 0C0B2026 */ jal set_variable -/* BBE030 80240E90 02A0282D */ daddu $a1, $s5, $zero -/* BBE034 80240E94 8FBF0034 */ lw $ra, 0x34($sp) -/* BBE038 80240E98 8FB60030 */ lw $s6, 0x30($sp) -/* BBE03C 80240E9C 8FB5002C */ lw $s5, 0x2c($sp) -/* BBE040 80240EA0 8FB40028 */ lw $s4, 0x28($sp) -/* BBE044 80240EA4 8FB30024 */ lw $s3, 0x24($sp) -/* BBE048 80240EA8 8FB20020 */ lw $s2, 0x20($sp) -/* BBE04C 80240EAC 8FB1001C */ lw $s1, 0x1c($sp) -/* BBE050 80240EB0 8FB00018 */ lw $s0, 0x18($sp) -/* BBE054 80240EB4 D7B60040 */ ldc1 $f22, 0x40($sp) -/* BBE058 80240EB8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* BBE05C 80240EBC 24020002 */ addiu $v0, $zero, 2 -/* BBE060 80240EC0 03E00008 */ jr $ra -/* BBE064 80240EC4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_80240EC8_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_80240EC8_BBD1A0.s deleted file mode 100644 index 813d83659b..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_80240EC8_BBD1A0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EC8_BBE068 -/* BBE068 80240EC8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BBE06C 80240ECC AFB00010 */ sw $s0, 0x10($sp) -/* BBE070 80240ED0 0080802D */ daddu $s0, $a0, $zero -/* BBE074 80240ED4 AFBF0014 */ sw $ra, 0x14($sp) -/* BBE078 80240ED8 0C00EABB */ jal get_npc_unsafe -/* BBE07C 80240EDC 8E04008C */ lw $a0, 0x8c($s0) -/* BBE080 80240EE0 0040282D */ daddu $a1, $v0, $zero -/* BBE084 80240EE4 8E040094 */ lw $a0, 0x94($s0) -/* BBE088 80240EE8 8CA30028 */ lw $v1, 0x28($a1) -/* BBE08C 80240EEC ACA40028 */ sw $a0, 0x28($a1) -/* BBE090 80240EF0 8FBF0014 */ lw $ra, 0x14($sp) -/* BBE094 80240EF4 8FB00010 */ lw $s0, 0x10($sp) -/* BBE098 80240EF8 24020002 */ addiu $v0, $zero, 2 -/* BBE09C 80240EFC 3C018024 */ lui $at, 0x8024 -/* BBE0A0 80240F00 AC235AB4 */ sw $v1, 0x5ab4($at) -/* BBE0A4 80240F04 03E00008 */ jr $ra -/* BBE0A8 80240F08 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_80240F0C_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_80240F0C_BBD1A0.s deleted file mode 100644 index 3753ac5355..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_80240F0C_BBD1A0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F0C_BBE0AC -/* BBE0AC 80240F0C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BBE0B0 80240F10 AFBF0010 */ sw $ra, 0x10($sp) -/* BBE0B4 80240F14 0C00EABB */ jal get_npc_unsafe -/* BBE0B8 80240F18 8C84008C */ lw $a0, 0x8c($a0) -/* BBE0BC 80240F1C 3C038024 */ lui $v1, 0x8024 -/* BBE0C0 80240F20 8C635AB4 */ lw $v1, 0x5ab4($v1) -/* BBE0C4 80240F24 AC430028 */ sw $v1, 0x28($v0) -/* BBE0C8 80240F28 8FBF0010 */ lw $ra, 0x10($sp) -/* BBE0CC 80240F2C 24020002 */ addiu $v0, $zero, 2 -/* BBE0D0 80240F30 03E00008 */ jr $ra -/* BBE0D4 80240F34 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_80240F38_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_80240F38_BBD1A0.s deleted file mode 100644 index e743dca863..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_80240F38_BBD1A0.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F38_BBE0D8 -/* BBE0D8 80240F38 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BBE0DC 80240F3C AFB20018 */ sw $s2, 0x18($sp) -/* BBE0E0 80240F40 0080902D */ daddu $s2, $a0, $zero -/* BBE0E4 80240F44 AFBF001C */ sw $ra, 0x1c($sp) -/* BBE0E8 80240F48 AFB10014 */ sw $s1, 0x14($sp) -/* BBE0EC 80240F4C AFB00010 */ sw $s0, 0x10($sp) -/* BBE0F0 80240F50 8E44014C */ lw $a0, 0x14c($s2) -/* BBE0F4 80240F54 0C00EAD2 */ jal get_npc_safe -/* BBE0F8 80240F58 00A0802D */ daddu $s0, $a1, $zero -/* BBE0FC 80240F5C 12000002 */ beqz $s0, .L80240F68 -/* BBE100 80240F60 0040882D */ daddu $s1, $v0, $zero -/* BBE104 80240F64 AE400074 */ sw $zero, 0x74($s2) -.L80240F68: -/* BBE108 80240F68 8E430074 */ lw $v1, 0x74($s2) -/* BBE10C 80240F6C 10600005 */ beqz $v1, .L80240F84 -/* BBE110 80240F70 24020001 */ addiu $v0, $zero, 1 -/* BBE114 80240F74 1062002C */ beq $v1, $v0, .L80241028 -/* BBE118 80240F78 00000000 */ nop -/* BBE11C 80240F7C 0809041E */ j .L80241078 -/* BBE120 80240F80 00000000 */ nop -.L80240F84: -/* BBE124 80240F84 0C00A67F */ jal rand_int -/* BBE128 80240F88 24040064 */ addiu $a0, $zero, 0x64 -/* BBE12C 80240F8C 24040064 */ addiu $a0, $zero, 0x64 -/* BBE130 80240F90 244200B4 */ addiu $v0, $v0, 0xb4 -/* BBE134 80240F94 44820000 */ mtc1 $v0, $f0 -/* BBE138 80240F98 00000000 */ nop -/* BBE13C 80240F9C 46800020 */ cvt.s.w $f0, $f0 -/* BBE140 80240FA0 0C00A67F */ jal rand_int -/* BBE144 80240FA4 E6200040 */ swc1 $f0, 0x40($s1) -/* BBE148 80240FA8 2442FF38 */ addiu $v0, $v0, -0xc8 -/* BBE14C 80240FAC 44820000 */ mtc1 $v0, $f0 -/* BBE150 80240FB0 00000000 */ nop -/* BBE154 80240FB4 46800020 */ cvt.s.w $f0, $f0 -/* BBE158 80240FB8 0C00A64D */ jal func_80029934 -/* BBE15C 80240FBC E620003C */ swc1 $f0, 0x3c($s1) -/* BBE160 80240FC0 46000000 */ add.s $f0, $f0, $f0 -/* BBE164 80240FC4 3C014000 */ lui $at, 0x4000 -/* BBE168 80240FC8 44811000 */ mtc1 $at, $f2 -/* BBE16C 80240FCC 00000000 */ nop -/* BBE170 80240FD0 46020000 */ add.s $f0, $f0, $f2 -/* BBE174 80240FD4 24040064 */ addiu $a0, $zero, 0x64 -/* BBE178 80240FD8 0C00A67F */ jal rand_int -/* BBE17C 80240FDC E6200018 */ swc1 $f0, 0x18($s1) -/* BBE180 80240FE0 28420032 */ slti $v0, $v0, 0x32 -/* BBE184 80240FE4 10400007 */ beqz $v0, .L80241004 -/* BBE188 80240FE8 00000000 */ nop -/* BBE18C 80240FEC 3C014466 */ lui $at, 0x4466 -/* BBE190 80240FF0 44810000 */ mtc1 $at, $f0 -/* BBE194 80240FF4 3C014387 */ lui $at, 0x4387 -/* BBE198 80240FF8 44811000 */ mtc1 $at, $f2 -/* BBE19C 80240FFC 08090406 */ j .L80241018 -/* BBE1A0 80241000 E6200038 */ swc1 $f0, 0x38($s1) -.L80241004: -/* BBE1A4 80241004 3C01C1A0 */ lui $at, 0xc1a0 -/* BBE1A8 80241008 44810000 */ mtc1 $at, $f0 -/* BBE1AC 8024100C 3C0142B4 */ lui $at, 0x42b4 -/* BBE1B0 80241010 44811000 */ mtc1 $at, $f2 -/* BBE1B4 80241014 E6200038 */ swc1 $f0, 0x38($s1) -.L80241018: -/* BBE1B8 80241018 E622000C */ swc1 $f2, 0xc($s1) -/* BBE1BC 8024101C 24020001 */ addiu $v0, $zero, 1 -/* BBE1C0 80241020 0809041E */ j .L80241078 -/* BBE1C4 80241024 AE420074 */ sw $v0, 0x74($s2) -.L80241028: -/* BBE1C8 80241028 8E250018 */ lw $a1, 0x18($s1) -/* BBE1CC 8024102C 8E26000C */ lw $a2, 0xc($s1) -/* BBE1D0 80241030 0C00EA95 */ jal npc_move_heading -/* BBE1D4 80241034 0220202D */ daddu $a0, $s1, $zero -/* BBE1D8 80241038 C6220038 */ lwc1 $f2, 0x38($s1) -/* BBE1DC 8024103C 3C01C1F0 */ lui $at, 0xc1f0 -/* BBE1E0 80241040 44810000 */ mtc1 $at, $f0 -/* BBE1E4 80241044 00000000 */ nop -/* BBE1E8 80241048 4600103C */ c.lt.s $f2, $f0 -/* BBE1EC 8024104C 00000000 */ nop -/* BBE1F0 80241050 45030009 */ bc1tl .L80241078 -/* BBE1F4 80241054 AE400074 */ sw $zero, 0x74($s2) -/* BBE1F8 80241058 3C014468 */ lui $at, 0x4468 -/* BBE1FC 8024105C 34218000 */ ori $at, $at, 0x8000 -/* BBE200 80241060 44810000 */ mtc1 $at, $f0 -/* BBE204 80241064 00000000 */ nop -/* BBE208 80241068 4602003C */ c.lt.s $f0, $f2 -/* BBE20C 8024106C 00000000 */ nop -/* BBE210 80241070 45030001 */ bc1tl .L80241078 -/* BBE214 80241074 AE400074 */ sw $zero, 0x74($s2) -.L80241078: -/* BBE218 80241078 8FBF001C */ lw $ra, 0x1c($sp) -/* BBE21C 8024107C 8FB20018 */ lw $s2, 0x18($sp) -/* BBE220 80241080 8FB10014 */ lw $s1, 0x14($sp) -/* BBE224 80241084 8FB00010 */ lw $s0, 0x10($sp) -/* BBE228 80241088 0000102D */ daddu $v0, $zero, $zero -/* BBE22C 8024108C 03E00008 */ jr $ra -/* BBE230 80241090 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_01/func_80241094_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/func_80241094_BBD1A0.s deleted file mode 100644 index 6be26cc46b..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/func_80241094_BBD1A0.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241094_BBE234 -/* BBE234 80241094 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BBE238 80241098 AFB10014 */ sw $s1, 0x14($sp) -/* BBE23C 8024109C 0080882D */ daddu $s1, $a0, $zero -/* BBE240 802410A0 AFBF0018 */ sw $ra, 0x18($sp) -/* BBE244 802410A4 AFB00010 */ sw $s0, 0x10($sp) -/* BBE248 802410A8 8E240088 */ lw $a0, 0x88($s1) -/* BBE24C 802410AC 1480000B */ bnez $a0, .L802410DC -/* BBE250 802410B0 8E300084 */ lw $s0, 0x84($s1) -/* BBE254 802410B4 0C00A67F */ jal rand_int -/* BBE258 802410B8 24040003 */ addiu $a0, $zero, 3 -/* BBE25C 802410BC 00021040 */ sll $v0, $v0, 1 -/* BBE260 802410C0 3C018024 */ lui $at, 0x8024 -/* BBE264 802410C4 00220821 */ addu $at, $at, $v0 -/* BBE268 802410C8 84224A54 */ lh $v0, 0x4a54($at) -/* BBE26C 802410CC 24040032 */ addiu $a0, $zero, 0x32 -/* BBE270 802410D0 0C00A67F */ jal rand_int -/* BBE274 802410D4 AE220078 */ sw $v0, 0x78($s1) -/* BBE278 802410D8 2444001E */ addiu $a0, $v0, 0x1e -.L802410DC: -/* BBE27C 802410DC 8E230078 */ lw $v1, 0x78($s1) -/* BBE280 802410E0 0203102A */ slt $v0, $s0, $v1 -/* BBE284 802410E4 10400006 */ beqz $v0, .L80241100 -/* BBE288 802410E8 2484FFFF */ addiu $a0, $a0, -1 -/* BBE28C 802410EC 2610000A */ addiu $s0, $s0, 0xa -/* BBE290 802410F0 0070102A */ slt $v0, $v1, $s0 -/* BBE294 802410F4 5040000A */ beql $v0, $zero, .L80241120 -/* BBE298 802410F8 AE300084 */ sw $s0, 0x84($s1) -/* BBE29C 802410FC 0060802D */ daddu $s0, $v1, $zero -.L80241100: -/* BBE2A0 80241100 0070102A */ slt $v0, $v1, $s0 -/* BBE2A4 80241104 50400006 */ beql $v0, $zero, .L80241120 -/* BBE2A8 80241108 AE300084 */ sw $s0, 0x84($s1) -/* BBE2AC 8024110C 2610FFF6 */ addiu $s0, $s0, -0xa -/* BBE2B0 80241110 0203102A */ slt $v0, $s0, $v1 -/* BBE2B4 80241114 54400001 */ bnel $v0, $zero, .L8024111C -/* BBE2B8 80241118 0060802D */ daddu $s0, $v1, $zero -.L8024111C: -/* BBE2BC 8024111C AE300084 */ sw $s0, 0x84($s1) -.L80241120: -/* BBE2C0 80241120 AE240088 */ sw $a0, 0x88($s1) -/* BBE2C4 80241124 8FBF0018 */ lw $ra, 0x18($sp) -/* BBE2C8 80241128 8FB10014 */ lw $s1, 0x14($sp) -/* BBE2CC 8024112C 8FB00010 */ lw $s0, 0x10($sp) -/* BBE2D0 80241130 24020002 */ addiu $v0, $zero, 2 -/* BBE2D4 80241134 03E00008 */ jr $ra -/* BBE2D8 80241138 27BD0020 */ addiu $sp, $sp, 0x20 -/* BBE2DC 8024113C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_02/func_80240194_BC2A90.s b/asm/nonmatchings/world/area_obk/obk_02/func_80240194_BC2A90.s deleted file mode 100644 index e5dddc3ca0..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_02/func_80240194_BC2A90.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240194_BC2C24 -/* BC2C24 80240194 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC2C28 80240198 AFB10014 */ sw $s1, 0x14($sp) -/* BC2C2C 8024019C 0080882D */ daddu $s1, $a0, $zero -/* BC2C30 802401A0 AFBF0018 */ sw $ra, 0x18($sp) -/* BC2C34 802401A4 AFB00010 */ sw $s0, 0x10($sp) -/* BC2C38 802401A8 8E240088 */ lw $a0, 0x88($s1) -/* BC2C3C 802401AC 1480000B */ bnez $a0, .L802401DC -/* BC2C40 802401B0 8E300084 */ lw $s0, 0x84($s1) -/* BC2C44 802401B4 0C00A67F */ jal rand_int -/* BC2C48 802401B8 24040003 */ addiu $a0, $zero, 3 -/* BC2C4C 802401BC 00021040 */ sll $v0, $v0, 1 -/* BC2C50 802401C0 3C018024 */ lui $at, 0x8024 -/* BC2C54 802401C4 00220821 */ addu $at, $at, $v0 -/* BC2C58 802401C8 84220CBC */ lh $v0, 0xcbc($at) -/* BC2C5C 802401CC 24040032 */ addiu $a0, $zero, 0x32 -/* BC2C60 802401D0 0C00A67F */ jal rand_int -/* BC2C64 802401D4 AE220078 */ sw $v0, 0x78($s1) -/* BC2C68 802401D8 2444001E */ addiu $a0, $v0, 0x1e -.L802401DC: -/* BC2C6C 802401DC 8E230078 */ lw $v1, 0x78($s1) -/* BC2C70 802401E0 0203102A */ slt $v0, $s0, $v1 -/* BC2C74 802401E4 10400006 */ beqz $v0, .L80240200 -/* BC2C78 802401E8 2484FFFF */ addiu $a0, $a0, -1 -/* BC2C7C 802401EC 2610000A */ addiu $s0, $s0, 0xa -/* BC2C80 802401F0 0070102A */ slt $v0, $v1, $s0 -/* BC2C84 802401F4 5040000A */ beql $v0, $zero, .L80240220 -/* BC2C88 802401F8 AE300084 */ sw $s0, 0x84($s1) -/* BC2C8C 802401FC 0060802D */ daddu $s0, $v1, $zero -.L80240200: -/* BC2C90 80240200 0070102A */ slt $v0, $v1, $s0 -/* BC2C94 80240204 50400006 */ beql $v0, $zero, .L80240220 -/* BC2C98 80240208 AE300084 */ sw $s0, 0x84($s1) -/* BC2C9C 8024020C 2610FFF6 */ addiu $s0, $s0, -0xa -/* BC2CA0 80240210 0203102A */ slt $v0, $s0, $v1 -/* BC2CA4 80240214 54400001 */ bnel $v0, $zero, .L8024021C -/* BC2CA8 80240218 0060802D */ daddu $s0, $v1, $zero -.L8024021C: -/* BC2CAC 8024021C AE300084 */ sw $s0, 0x84($s1) -.L80240220: -/* BC2CB0 80240220 AE240088 */ sw $a0, 0x88($s1) -/* BC2CB4 80240224 8FBF0018 */ lw $ra, 0x18($sp) -/* BC2CB8 80240228 8FB10014 */ lw $s1, 0x14($sp) -/* BC2CBC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* BC2CC0 80240230 24020002 */ addiu $v0, $zero, 2 -/* BC2CC4 80240234 03E00008 */ jr $ra -/* BC2CC8 80240238 27BD0020 */ addiu $sp, $sp, 0x20 -/* BC2CCC 8024023C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_02/func_80240240_BC2A90.s b/asm/nonmatchings/world/area_obk/obk_02/func_80240240_BC2A90.s deleted file mode 100644 index 25635eafc0..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_02/func_80240240_BC2A90.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240240_BC2CD0 -/* BC2CD0 80240240 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BC2CD4 80240244 AFB00010 */ sw $s0, 0x10($sp) -/* BC2CD8 80240248 0080802D */ daddu $s0, $a0, $zero -/* BC2CDC 8024024C AFBF0014 */ sw $ra, 0x14($sp) -/* BC2CE0 80240250 C60C0088 */ lwc1 $f12, 0x88($s0) -/* BC2CE4 80240254 0C00A8BB */ jal sin_deg -/* BC2CE8 80240258 46806320 */ cvt.s.w $f12, $f12 -/* BC2CEC 8024025C 3C014120 */ lui $at, 0x4120 -/* BC2CF0 80240260 44811000 */ mtc1 $at, $f2 -/* BC2CF4 80240264 00000000 */ nop -/* BC2CF8 80240268 46020002 */ mul.s $f0, $f0, $f2 -/* BC2CFC 8024026C 00000000 */ nop -/* BC2D00 80240270 8E020088 */ lw $v0, 0x88($s0) -/* BC2D04 80240274 24420006 */ addiu $v0, $v0, 6 -/* BC2D08 80240278 44826000 */ mtc1 $v0, $f12 -/* BC2D0C 8024027C 00000000 */ nop -/* BC2D10 80240280 46806320 */ cvt.s.w $f12, $f12 -/* BC2D14 80240284 4600010D */ trunc.w.s $f4, $f0 -/* BC2D18 80240288 0C00A6C9 */ jal clamp_angle -/* BC2D1C 8024028C E6040084 */ swc1 $f4, 0x84($s0) -/* BC2D20 80240290 4600010D */ trunc.w.s $f4, $f0 -/* BC2D24 80240294 E6040088 */ swc1 $f4, 0x88($s0) -/* BC2D28 80240298 8FBF0014 */ lw $ra, 0x14($sp) -/* BC2D2C 8024029C 8FB00010 */ lw $s0, 0x10($sp) -/* BC2D30 802402A0 24020002 */ addiu $v0, $zero, 2 -/* BC2D34 802402A4 03E00008 */ jr $ra -/* BC2D38 802402A8 27BD0018 */ addiu $sp, $sp, 0x18 -/* BC2D3C 802402AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_03/func_802400C4_BC4280.s b/asm/nonmatchings/world/area_obk/obk_03/func_802400C4_BC4280.s deleted file mode 100644 index 9d579bc1dd..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/func_802400C4_BC4280.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400C4_BC4344 -/* BC4344 802400C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC4348 802400C8 AFB20018 */ sw $s2, 0x18($sp) -/* BC434C 802400CC 0080902D */ daddu $s2, $a0, $zero -/* BC4350 802400D0 AFBF001C */ sw $ra, 0x1c($sp) -/* BC4354 802400D4 AFB10014 */ sw $s1, 0x14($sp) -/* BC4358 802400D8 AFB00010 */ sw $s0, 0x10($sp) -/* BC435C 802400DC 8E50000C */ lw $s0, 0xc($s2) -/* BC4360 802400E0 8E050000 */ lw $a1, ($s0) -/* BC4364 802400E4 0C0B1EAF */ jal get_variable -/* BC4368 802400E8 26100004 */ addiu $s0, $s0, 4 -/* BC436C 802400EC 0C04417A */ jal get_entity_by_index -/* BC4370 802400F0 0040202D */ daddu $a0, $v0, $zero -/* BC4374 802400F4 8E050000 */ lw $a1, ($s0) -/* BC4378 802400F8 26100004 */ addiu $s0, $s0, 4 -/* BC437C 802400FC 0040882D */ daddu $s1, $v0, $zero -/* BC4380 80240100 C6200048 */ lwc1 $f0, 0x48($s1) -/* BC4384 80240104 4600008D */ trunc.w.s $f2, $f0 -/* BC4388 80240108 44061000 */ mfc1 $a2, $f2 -/* BC438C 8024010C 0C0B2026 */ jal set_variable -/* BC4390 80240110 0240202D */ daddu $a0, $s2, $zero -/* BC4394 80240114 8E050000 */ lw $a1, ($s0) -/* BC4398 80240118 26100004 */ addiu $s0, $s0, 4 -/* BC439C 8024011C C620004C */ lwc1 $f0, 0x4c($s1) -/* BC43A0 80240120 4600008D */ trunc.w.s $f2, $f0 -/* BC43A4 80240124 44061000 */ mfc1 $a2, $f2 -/* BC43A8 80240128 0C0B2026 */ jal set_variable -/* BC43AC 8024012C 0240202D */ daddu $a0, $s2, $zero -/* BC43B0 80240130 C6200050 */ lwc1 $f0, 0x50($s1) -/* BC43B4 80240134 8E050000 */ lw $a1, ($s0) -/* BC43B8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* BC43BC 8024013C 44061000 */ mfc1 $a2, $f2 -/* BC43C0 80240140 0C0B2026 */ jal set_variable -/* BC43C4 80240144 0240202D */ daddu $a0, $s2, $zero -/* BC43C8 80240148 8FBF001C */ lw $ra, 0x1c($sp) -/* BC43CC 8024014C 8FB20018 */ lw $s2, 0x18($sp) -/* BC43D0 80240150 8FB10014 */ lw $s1, 0x14($sp) -/* BC43D4 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* BC43D8 80240158 24020002 */ addiu $v0, $zero, 2 -/* BC43DC 8024015C 03E00008 */ jr $ra -/* BC43E0 80240160 27BD0020 */ addiu $sp, $sp, 0x20 -/* BC43E4 80240164 00000000 */ nop -/* BC43E8 80240168 00000000 */ nop -/* BC43EC 8024016C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_03/func_80240170_BC4280.s b/asm/nonmatchings/world/area_obk/obk_03/func_80240170_BC4280.s deleted file mode 100644 index 9c1382757b..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/func_80240170_BC4280.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240170_BC43F0 -/* BC43F0 80240170 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC43F4 80240174 AFB00010 */ sw $s0, 0x10($sp) -/* BC43F8 80240178 3C108024 */ lui $s0, 0x8024 -/* BC43FC 8024017C 26102ECC */ addiu $s0, $s0, 0x2ecc -/* BC4400 80240180 AFBF0018 */ sw $ra, 0x18($sp) -/* BC4404 80240184 AFB10014 */ sw $s1, 0x14($sp) -/* BC4408 80240188 8E020000 */ lw $v0, ($s0) -/* BC440C 8024018C 14400010 */ bnez $v0, .L802401D0 -/* BC4410 80240190 0080882D */ daddu $s1, $a0, $zero -/* BC4414 80240194 0C00AB39 */ jal heap_malloc -/* BC4418 80240198 24040040 */ addiu $a0, $zero, 0x40 -/* BC441C 8024019C AE020000 */ sw $v0, ($s0) -/* BC4420 802401A0 0000182D */ daddu $v1, $zero, $zero -/* BC4424 802401A4 0040282D */ daddu $a1, $v0, $zero -/* BC4428 802401A8 0220202D */ daddu $a0, $s1, $zero -.L802401AC: -/* BC442C 802401AC 8C820084 */ lw $v0, 0x84($a0) -/* BC4430 802401B0 24840004 */ addiu $a0, $a0, 4 -/* BC4434 802401B4 24630001 */ addiu $v1, $v1, 1 -/* BC4438 802401B8 ACA20000 */ sw $v0, ($a1) -/* BC443C 802401BC 28620010 */ slti $v0, $v1, 0x10 -/* BC4440 802401C0 1440FFFA */ bnez $v0, .L802401AC -/* BC4444 802401C4 24A50004 */ addiu $a1, $a1, 4 -/* BC4448 802401C8 08090083 */ j .L8024020C -/* BC444C 802401CC 00000000 */ nop -.L802401D0: -/* BC4450 802401D0 0000182D */ daddu $v1, $zero, $zero -/* BC4454 802401D4 0040282D */ daddu $a1, $v0, $zero -/* BC4458 802401D8 0220202D */ daddu $a0, $s1, $zero -.L802401DC: -/* BC445C 802401DC 8CA20000 */ lw $v0, ($a1) -/* BC4460 802401E0 24A50004 */ addiu $a1, $a1, 4 -/* BC4464 802401E4 24630001 */ addiu $v1, $v1, 1 -/* BC4468 802401E8 AC820084 */ sw $v0, 0x84($a0) -/* BC446C 802401EC 28620010 */ slti $v0, $v1, 0x10 -/* BC4470 802401F0 1440FFFA */ bnez $v0, .L802401DC -/* BC4474 802401F4 24840004 */ addiu $a0, $a0, 4 -/* BC4478 802401F8 3C108024 */ lui $s0, 0x8024 -/* BC447C 802401FC 26102ECC */ addiu $s0, $s0, 0x2ecc -/* BC4480 80240200 0C00AB4B */ jal heap_free -/* BC4484 80240204 8E040000 */ lw $a0, ($s0) -/* BC4488 80240208 AE000000 */ sw $zero, ($s0) -.L8024020C: -/* BC448C 8024020C 8FBF0018 */ lw $ra, 0x18($sp) -/* BC4490 80240210 8FB10014 */ lw $s1, 0x14($sp) -/* BC4494 80240214 8FB00010 */ lw $s0, 0x10($sp) -/* BC4498 80240218 24020002 */ addiu $v0, $zero, 2 -/* BC449C 8024021C 03E00008 */ jr $ra -/* BC44A0 80240220 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_03/func_80240224_BC4280.s b/asm/nonmatchings/world/area_obk/obk_03/func_80240224_BC4280.s deleted file mode 100644 index c72cd99a30..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/func_80240224_BC4280.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240224_BC44A4 -/* BC44A4 80240224 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC44A8 80240228 AFB00010 */ sw $s0, 0x10($sp) -/* BC44AC 8024022C 0080802D */ daddu $s0, $a0, $zero -/* BC44B0 80240230 AFBF0018 */ sw $ra, 0x18($sp) -/* BC44B4 80240234 AFB10014 */ sw $s1, 0x14($sp) -/* BC44B8 80240238 8E02000C */ lw $v0, 0xc($s0) -/* BC44BC 8024023C 8C510000 */ lw $s1, ($v0) -/* BC44C0 80240240 0C0B1EAF */ jal get_variable -/* BC44C4 80240244 0220282D */ daddu $a1, $s1, $zero -/* BC44C8 80240248 3C03FFF0 */ lui $v1, 0xfff0 -/* BC44CC 8024024C 3463FFFF */ ori $v1, $v1, 0xffff -/* BC44D0 80240250 0200202D */ daddu $a0, $s0, $zero -/* BC44D4 80240254 00431024 */ and $v0, $v0, $v1 -/* BC44D8 80240258 00021140 */ sll $v0, $v0, 5 -/* BC44DC 8024025C 3C068008 */ lui $a2, %hi(gItemTable) -/* BC44E0 80240260 00C23021 */ addu $a2, $a2, $v0 -/* BC44E4 80240264 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* BC44E8 80240268 0C0B2026 */ jal set_variable -/* BC44EC 8024026C 0220282D */ daddu $a1, $s1, $zero -/* BC44F0 80240270 8FBF0018 */ lw $ra, 0x18($sp) -/* BC44F4 80240274 8FB10014 */ lw $s1, 0x14($sp) -/* BC44F8 80240278 8FB00010 */ lw $s0, 0x10($sp) -/* BC44FC 8024027C 24020002 */ addiu $v0, $zero, 2 -/* BC4500 80240280 03E00008 */ jr $ra -/* BC4504 80240284 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_03/func_80240508_BC4280.s b/asm/nonmatchings/world/area_obk/obk_03/func_80240508_BC4280.s deleted file mode 100644 index 4418299a2e..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/func_80240508_BC4280.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240508_BC4788 -/* BC4788 80240508 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BC478C 8024050C AFBF0010 */ sw $ra, 0x10($sp) -/* BC4790 80240510 8C82000C */ lw $v0, 0xc($a0) -/* BC4794 80240514 0C0B1EAF */ jal get_variable -/* BC4798 80240518 8C450000 */ lw $a1, ($v0) -/* BC479C 8024051C 3C018024 */ lui $at, 0x8024 -/* BC47A0 80240520 AC222F34 */ sw $v0, 0x2f34($at) -/* BC47A4 80240524 24020002 */ addiu $v0, $zero, 2 -/* BC47A8 80240528 8FBF0010 */ lw $ra, 0x10($sp) -/* BC47AC 8024052C 24030001 */ addiu $v1, $zero, 1 -/* BC47B0 80240530 3C018024 */ lui $at, 0x8024 -/* BC47B4 80240534 AC232F30 */ sw $v1, 0x2f30($at) -/* BC47B8 80240538 03E00008 */ jr $ra -/* BC47BC 8024053C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_03/func_80240540_BC4280.s b/asm/nonmatchings/world/area_obk/obk_03/func_80240540_BC4280.s deleted file mode 100644 index 71a654dd54..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/func_80240540_BC4280.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240540_BC47C0 -/* BC47C0 80240540 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BC47C4 80240544 AFBF0010 */ sw $ra, 0x10($sp) -/* BC47C8 80240548 8C82000C */ lw $v0, 0xc($a0) -/* BC47CC 8024054C 0C0B1EAF */ jal get_variable -/* BC47D0 80240550 8C450000 */ lw $a1, ($v0) -/* BC47D4 80240554 0040182D */ daddu $v1, $v0, $zero -/* BC47D8 80240558 10600012 */ beqz $v1, .L802405A4 -/* BC47DC 8024055C 0000202D */ daddu $a0, $zero, $zero -/* BC47E0 80240560 8C620000 */ lw $v0, ($v1) -/* BC47E4 80240564 5040000A */ beql $v0, $zero, .L80240590 -/* BC47E8 80240568 00041080 */ sll $v0, $a0, 2 -/* BC47EC 8024056C 3C058024 */ lui $a1, 0x8024 -/* BC47F0 80240570 24A53BE0 */ addiu $a1, $a1, 0x3be0 -.L80240574: -/* BC47F4 80240574 24630004 */ addiu $v1, $v1, 4 -/* BC47F8 80240578 24840001 */ addiu $a0, $a0, 1 -/* BC47FC 8024057C ACA20000 */ sw $v0, ($a1) -/* BC4800 80240580 8C620000 */ lw $v0, ($v1) -/* BC4804 80240584 1440FFFB */ bnez $v0, .L80240574 -/* BC4808 80240588 24A50004 */ addiu $a1, $a1, 4 -/* BC480C 8024058C 00041080 */ sll $v0, $a0, 2 -.L80240590: -/* BC4810 80240590 3C018024 */ lui $at, 0x8024 -/* BC4814 80240594 00220821 */ addu $at, $at, $v0 -/* BC4818 80240598 AC203BE0 */ sw $zero, 0x3be0($at) -/* BC481C 8024059C 08090173 */ j .L802405CC -/* BC4820 802405A0 00000000 */ nop -.L802405A4: -/* BC4824 802405A4 3C038024 */ lui $v1, 0x8024 -/* BC4828 802405A8 24633BE0 */ addiu $v1, $v1, 0x3be0 -/* BC482C 802405AC 0060282D */ daddu $a1, $v1, $zero -.L802405B0: -/* BC4830 802405B0 24820010 */ addiu $v0, $a0, 0x10 -/* BC4834 802405B4 AC620000 */ sw $v0, ($v1) -/* BC4838 802405B8 24630004 */ addiu $v1, $v1, 4 -/* BC483C 802405BC 24840001 */ addiu $a0, $a0, 1 -/* BC4840 802405C0 28820070 */ slti $v0, $a0, 0x70 -/* BC4844 802405C4 1440FFFA */ bnez $v0, .L802405B0 -/* BC4848 802405C8 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802405CC: -/* BC484C 802405CC 8FBF0010 */ lw $ra, 0x10($sp) -/* BC4850 802405D0 24020002 */ addiu $v0, $zero, 2 -/* BC4854 802405D4 03E00008 */ jr $ra -/* BC4858 802405D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_03/func_802405DC_BC4280.s b/asm/nonmatchings/world/area_obk/obk_03/func_802405DC_BC4280.s deleted file mode 100644 index 73df842251..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/func_802405DC_BC4280.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405DC_BC485C -/* BC485C 802405DC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC4860 802405E0 AFB10014 */ sw $s1, 0x14($sp) -/* BC4864 802405E4 0080882D */ daddu $s1, $a0, $zero -/* BC4868 802405E8 AFBF0018 */ sw $ra, 0x18($sp) -/* BC486C 802405EC AFB00010 */ sw $s0, 0x10($sp) -/* BC4870 802405F0 8E30000C */ lw $s0, 0xc($s1) -/* BC4874 802405F4 8E050000 */ lw $a1, ($s0) -/* BC4878 802405F8 0C0B1EAF */ jal get_variable -/* BC487C 802405FC 26100004 */ addiu $s0, $s0, 4 -/* BC4880 80240600 AE22008C */ sw $v0, 0x8c($s1) -/* BC4884 80240604 8E050000 */ lw $a1, ($s0) -/* BC4888 80240608 26100004 */ addiu $s0, $s0, 4 -/* BC488C 8024060C 0C0B1EAF */ jal get_variable -/* BC4890 80240610 0220202D */ daddu $a0, $s1, $zero -/* BC4894 80240614 AE220090 */ sw $v0, 0x90($s1) -/* BC4898 80240618 8E050000 */ lw $a1, ($s0) -/* BC489C 8024061C 26100004 */ addiu $s0, $s0, 4 -/* BC48A0 80240620 0C0B1EAF */ jal get_variable -/* BC48A4 80240624 0220202D */ daddu $a0, $s1, $zero -/* BC48A8 80240628 AE220094 */ sw $v0, 0x94($s1) -/* BC48AC 8024062C 8E050000 */ lw $a1, ($s0) -/* BC48B0 80240630 26100004 */ addiu $s0, $s0, 4 -/* BC48B4 80240634 0C0B1EAF */ jal get_variable -/* BC48B8 80240638 0220202D */ daddu $a0, $s1, $zero -/* BC48BC 8024063C AE220098 */ sw $v0, 0x98($s1) -/* BC48C0 80240640 8E050000 */ lw $a1, ($s0) -/* BC48C4 80240644 26100004 */ addiu $s0, $s0, 4 -/* BC48C8 80240648 0C0B1EAF */ jal get_variable -/* BC48CC 8024064C 0220202D */ daddu $a0, $s1, $zero -/* BC48D0 80240650 AE22009C */ sw $v0, 0x9c($s1) -/* BC48D4 80240654 8E050000 */ lw $a1, ($s0) -/* BC48D8 80240658 26100004 */ addiu $s0, $s0, 4 -/* BC48DC 8024065C 0C0B1EAF */ jal get_variable -/* BC48E0 80240660 0220202D */ daddu $a0, $s1, $zero -/* BC48E4 80240664 AE2200A0 */ sw $v0, 0xa0($s1) -/* BC48E8 80240668 8E050000 */ lw $a1, ($s0) -/* BC48EC 8024066C 26100004 */ addiu $s0, $s0, 4 -/* BC48F0 80240670 0C0B1EAF */ jal get_variable -/* BC48F4 80240674 0220202D */ daddu $a0, $s1, $zero -/* BC48F8 80240678 AE2200A4 */ sw $v0, 0xa4($s1) -/* BC48FC 8024067C 8E050000 */ lw $a1, ($s0) -/* BC4900 80240680 26100004 */ addiu $s0, $s0, 4 -/* BC4904 80240684 0C0B1EAF */ jal get_variable -/* BC4908 80240688 0220202D */ daddu $a0, $s1, $zero -/* BC490C 8024068C AE2200A8 */ sw $v0, 0xa8($s1) -/* BC4910 80240690 8E050000 */ lw $a1, ($s0) -/* BC4914 80240694 26100004 */ addiu $s0, $s0, 4 -/* BC4918 80240698 0C0B1EAF */ jal get_variable -/* BC491C 8024069C 0220202D */ daddu $a0, $s1, $zero -/* BC4920 802406A0 AE2200AC */ sw $v0, 0xac($s1) -/* BC4924 802406A4 8E050000 */ lw $a1, ($s0) -/* BC4928 802406A8 0C0B1EAF */ jal get_variable -/* BC492C 802406AC 0220202D */ daddu $a0, $s1, $zero -/* BC4930 802406B0 AE2200B0 */ sw $v0, 0xb0($s1) -/* BC4934 802406B4 8FBF0018 */ lw $ra, 0x18($sp) -/* BC4938 802406B8 8FB10014 */ lw $s1, 0x14($sp) -/* BC493C 802406BC 8FB00010 */ lw $s0, 0x10($sp) -/* BC4940 802406C0 24020002 */ addiu $v0, $zero, 2 -/* BC4944 802406C4 03E00008 */ jr $ra -/* BC4948 802406C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_03/func_802406CC_BC4280.s b/asm/nonmatchings/world/area_obk/obk_03/func_802406CC_BC4280.s deleted file mode 100644 index 3dfd7e9985..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/func_802406CC_BC4280.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406CC_BC494C -/* BC494C 802406CC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BC4950 802406D0 AFB1001C */ sw $s1, 0x1c($sp) -/* BC4954 802406D4 0080882D */ daddu $s1, $a0, $zero -/* BC4958 802406D8 AFBF0034 */ sw $ra, 0x34($sp) -/* BC495C 802406DC AFB60030 */ sw $s6, 0x30($sp) -/* BC4960 802406E0 AFB5002C */ sw $s5, 0x2c($sp) -/* BC4964 802406E4 AFB40028 */ sw $s4, 0x28($sp) -/* BC4968 802406E8 AFB30024 */ sw $s3, 0x24($sp) -/* BC496C 802406EC AFB20020 */ sw $s2, 0x20($sp) -/* BC4970 802406F0 AFB00018 */ sw $s0, 0x18($sp) -/* BC4974 802406F4 F7B60040 */ sdc1 $f22, 0x40($sp) -/* BC4978 802406F8 F7B40038 */ sdc1 $f20, 0x38($sp) -/* BC497C 802406FC 8E30000C */ lw $s0, 0xc($s1) -/* BC4980 80240700 8E160000 */ lw $s6, ($s0) -/* BC4984 80240704 26100004 */ addiu $s0, $s0, 4 -/* BC4988 80240708 0C0B1EAF */ jal get_variable -/* BC498C 8024070C 02C0282D */ daddu $a1, $s6, $zero -/* BC4990 80240710 44820000 */ mtc1 $v0, $f0 -/* BC4994 80240714 00000000 */ nop -/* BC4998 80240718 46800020 */ cvt.s.w $f0, $f0 -/* BC499C 8024071C E7A00010 */ swc1 $f0, 0x10($sp) -/* BC49A0 80240720 8E140000 */ lw $s4, ($s0) -/* BC49A4 80240724 26100004 */ addiu $s0, $s0, 4 -/* BC49A8 80240728 0220202D */ daddu $a0, $s1, $zero -/* BC49AC 8024072C 0C0B1EAF */ jal get_variable -/* BC49B0 80240730 0280282D */ daddu $a1, $s4, $zero -/* BC49B4 80240734 0220202D */ daddu $a0, $s1, $zero -/* BC49B8 80240738 8E150000 */ lw $s5, ($s0) -/* BC49BC 8024073C 4482B000 */ mtc1 $v0, $f22 -/* BC49C0 80240740 00000000 */ nop -/* BC49C4 80240744 4680B5A0 */ cvt.s.w $f22, $f22 -/* BC49C8 80240748 0C0B1EAF */ jal get_variable -/* BC49CC 8024074C 02A0282D */ daddu $a1, $s5, $zero -/* BC49D0 80240750 2404FFFC */ addiu $a0, $zero, -4 -/* BC49D4 80240754 44820000 */ mtc1 $v0, $f0 -/* BC49D8 80240758 00000000 */ nop -/* BC49DC 8024075C 46800020 */ cvt.s.w $f0, $f0 -/* BC49E0 80240760 0C00EABB */ jal get_npc_unsafe -/* BC49E4 80240764 E7A00014 */ swc1 $f0, 0x14($sp) -/* BC49E8 80240768 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* BC49EC 8024076C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* BC49F0 80240770 3C014334 */ lui $at, 0x4334 -/* BC49F4 80240774 44816000 */ mtc1 $at, $f12 -/* BC49F8 80240778 00041880 */ sll $v1, $a0, 2 -/* BC49FC 8024077C 00641821 */ addu $v1, $v1, $a0 -/* BC4A00 80240780 00031880 */ sll $v1, $v1, 2 -/* BC4A04 80240784 00641823 */ subu $v1, $v1, $a0 -/* BC4A08 80240788 000320C0 */ sll $a0, $v1, 3 -/* BC4A0C 8024078C 00641821 */ addu $v1, $v1, $a0 -/* BC4A10 80240790 000318C0 */ sll $v1, $v1, 3 -/* BC4A14 80240794 3C01800B */ lui $at, 0x800b -/* BC4A18 80240798 00230821 */ addu $at, $at, $v1 -/* BC4A1C 8024079C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* BC4A20 802407A0 460C0300 */ add.s $f12, $f0, $f12 -/* BC4A24 802407A4 0C00A6C9 */ jal clamp_angle -/* BC4A28 802407A8 0040982D */ daddu $s3, $v0, $zero -/* BC4A2C 802407AC 27B00010 */ addiu $s0, $sp, 0x10 -/* BC4A30 802407B0 0200202D */ daddu $a0, $s0, $zero -/* BC4A34 802407B4 27B20014 */ addiu $s2, $sp, 0x14 -/* BC4A38 802407B8 0240282D */ daddu $a1, $s2, $zero -/* BC4A3C 802407BC 3C064170 */ lui $a2, 0x4170 -/* BC4A40 802407C0 8E67000C */ lw $a3, 0xc($s3) -/* BC4A44 802407C4 0C00A7E7 */ jal add_vec2D_polar -/* BC4A48 802407C8 46000506 */ mov.s $f20, $f0 -/* BC4A4C 802407CC 0200202D */ daddu $a0, $s0, $zero -/* BC4A50 802407D0 3C064120 */ lui $a2, 0x4120 -/* BC4A54 802407D4 4407A000 */ mfc1 $a3, $f20 -/* BC4A58 802407D8 0C00A7E7 */ jal add_vec2D_polar -/* BC4A5C 802407DC 0240282D */ daddu $a1, $s2, $zero -/* BC4A60 802407E0 0220202D */ daddu $a0, $s1, $zero -/* BC4A64 802407E4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* BC4A68 802407E8 4600008D */ trunc.w.s $f2, $f0 -/* BC4A6C 802407EC 44061000 */ mfc1 $a2, $f2 -/* BC4A70 802407F0 0C0B2026 */ jal set_variable -/* BC4A74 802407F4 02C0282D */ daddu $a1, $s6, $zero -/* BC4A78 802407F8 0220202D */ daddu $a0, $s1, $zero -/* BC4A7C 802407FC 4600B08D */ trunc.w.s $f2, $f22 -/* BC4A80 80240800 44061000 */ mfc1 $a2, $f2 -/* BC4A84 80240804 0C0B2026 */ jal set_variable -/* BC4A88 80240808 0280282D */ daddu $a1, $s4, $zero -/* BC4A8C 8024080C 0220202D */ daddu $a0, $s1, $zero -/* BC4A90 80240810 C7A00014 */ lwc1 $f0, 0x14($sp) -/* BC4A94 80240814 4600008D */ trunc.w.s $f2, $f0 -/* BC4A98 80240818 44061000 */ mfc1 $a2, $f2 -/* BC4A9C 8024081C 0C0B2026 */ jal set_variable -/* BC4AA0 80240820 02A0282D */ daddu $a1, $s5, $zero -/* BC4AA4 80240824 8FBF0034 */ lw $ra, 0x34($sp) -/* BC4AA8 80240828 8FB60030 */ lw $s6, 0x30($sp) -/* BC4AAC 8024082C 8FB5002C */ lw $s5, 0x2c($sp) -/* BC4AB0 80240830 8FB40028 */ lw $s4, 0x28($sp) -/* BC4AB4 80240834 8FB30024 */ lw $s3, 0x24($sp) -/* BC4AB8 80240838 8FB20020 */ lw $s2, 0x20($sp) -/* BC4ABC 8024083C 8FB1001C */ lw $s1, 0x1c($sp) -/* BC4AC0 80240840 8FB00018 */ lw $s0, 0x18($sp) -/* BC4AC4 80240844 D7B60040 */ ldc1 $f22, 0x40($sp) -/* BC4AC8 80240848 D7B40038 */ ldc1 $f20, 0x38($sp) -/* BC4ACC 8024084C 24020002 */ addiu $v0, $zero, 2 -/* BC4AD0 80240850 03E00008 */ jr $ra -/* BC4AD4 80240854 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_obk/obk_03/func_8024089C_BC4280.s b/asm/nonmatchings/world/area_obk/obk_03/func_8024089C_BC4280.s deleted file mode 100644 index a628edd689..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/func_8024089C_BC4280.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024089C_BC4B1C -/* BC4B1C 8024089C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BC4B20 802408A0 AFBF0010 */ sw $ra, 0x10($sp) -/* BC4B24 802408A4 0C00EABB */ jal get_npc_unsafe -/* BC4B28 802408A8 8C84008C */ lw $a0, 0x8c($a0) -/* BC4B2C 802408AC 3C038024 */ lui $v1, 0x8024 -/* BC4B30 802408B0 8C633DA4 */ lw $v1, 0x3da4($v1) -/* BC4B34 802408B4 AC430028 */ sw $v1, 0x28($v0) -/* BC4B38 802408B8 8FBF0010 */ lw $ra, 0x10($sp) -/* BC4B3C 802408BC 24020002 */ addiu $v0, $zero, 2 -/* BC4B40 802408C0 03E00008 */ jr $ra -/* BC4B44 802408C4 27BD0018 */ addiu $sp, $sp, 0x18 -/* BC4B48 802408C8 00000000 */ nop -/* BC4B4C 802408CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_03/func_802408D0_BC4280.s b/asm/nonmatchings/world/area_obk/obk_03/func_802408D0_BC4280.s deleted file mode 100644 index 0ed6a6321d..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/func_802408D0_BC4280.s +++ /dev/null @@ -1,487 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408D0_BC4B50 -/* BC4B50 802408D0 27BDFF70 */ addiu $sp, $sp, -0x90 -/* BC4B54 802408D4 AFB20070 */ sw $s2, 0x70($sp) -/* BC4B58 802408D8 AFB30074 */ sw $s3, 0x74($sp) -/* BC4B5C 802408DC 3C138011 */ lui $s3, %hi(gPlayerStatus) -/* BC4B60 802408E0 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) -/* BC4B64 802408E4 AFB00068 */ sw $s0, 0x68($sp) -/* BC4B68 802408E8 3C108016 */ lui $s0, 0x8016 -/* BC4B6C 802408EC 2610A550 */ addiu $s0, $s0, -0x5ab0 -/* BC4B70 802408F0 AFBF0078 */ sw $ra, 0x78($sp) -/* BC4B74 802408F4 AFB1006C */ sw $s1, 0x6c($sp) -/* BC4B78 802408F8 F7B60088 */ sdc1 $f22, 0x88($sp) -/* BC4B7C 802408FC F7B40080 */ sdc1 $f20, 0x80($sp) -/* BC4B80 80240900 10A00014 */ beqz $a1, .L80240954 -/* BC4B84 80240904 0080902D */ daddu $s2, $a0, $zero -/* BC4B88 80240908 0C00AB39 */ jal heap_malloc -/* BC4B8C 8024090C 24040020 */ addiu $a0, $zero, 0x20 -/* BC4B90 80240910 3C013DCC */ lui $at, 0x3dcc -/* BC4B94 80240914 3421CCCD */ ori $at, $at, 0xcccd -/* BC4B98 80240918 44810000 */ mtc1 $at, $f0 -/* BC4B9C 8024091C 3C014040 */ lui $at, 0x4040 -/* BC4BA0 80240920 44811000 */ mtc1 $at, $f2 -/* BC4BA4 80240924 0040882D */ daddu $s1, $v0, $zero -/* BC4BA8 80240928 AE510074 */ sw $s1, 0x74($s2) -/* BC4BAC 8024092C AE200000 */ sw $zero, ($s1) -/* BC4BB0 80240930 AE20000C */ sw $zero, 0xc($s1) -/* BC4BB4 80240934 AE200008 */ sw $zero, 8($s1) -/* BC4BB8 80240938 AE200010 */ sw $zero, 0x10($s1) -/* BC4BBC 8024093C AE200014 */ sw $zero, 0x14($s1) -/* BC4BC0 80240940 E6200004 */ swc1 $f0, 4($s1) -/* BC4BC4 80240944 E6220018 */ swc1 $f2, 0x18($s1) -/* BC4BC8 80240948 AE400070 */ sw $zero, 0x70($s2) -/* BC4BCC 8024094C AE400078 */ sw $zero, 0x78($s2) -/* BC4BD0 80240950 AE40007C */ sw $zero, 0x7c($s2) -.L80240954: -/* BC4BD4 80240954 24040001 */ addiu $a0, $zero, 1 -/* BC4BD8 80240958 8E430070 */ lw $v1, 0x70($s2) -/* BC4BDC 8024095C 8E510074 */ lw $s1, 0x74($s2) -/* BC4BE0 80240960 10640022 */ beq $v1, $a0, .L802409EC -/* BC4BE4 80240964 28620002 */ slti $v0, $v1, 2 -/* BC4BE8 80240968 50400005 */ beql $v0, $zero, .L80240980 -/* BC4BEC 8024096C 24020002 */ addiu $v0, $zero, 2 -/* BC4BF0 80240970 10600007 */ beqz $v1, .L80240990 -/* BC4BF4 80240974 2402003C */ addiu $v0, $zero, 0x3c -/* BC4BF8 80240978 0809037C */ j .L80240DF0 -/* BC4BFC 8024097C 00000000 */ nop -.L80240980: -/* BC4C00 80240980 106200BF */ beq $v1, $v0, .L80240C80 -/* BC4C04 80240984 2402003C */ addiu $v0, $zero, 0x3c -/* BC4C08 80240988 0809037C */ j .L80240DF0 -/* BC4C0C 8024098C 00000000 */ nop -.L80240990: -/* BC4C10 80240990 86030002 */ lh $v1, 2($s0) -/* BC4C14 80240994 50620001 */ beql $v1, $v0, .L8024099C -/* BC4C18 80240998 AE440070 */ sw $a0, 0x70($s2) -.L8024099C: -/* BC4C1C 8024099C 86030002 */ lh $v1, 2($s0) -/* BC4C20 802409A0 2402003B */ addiu $v0, $zero, 0x3b -/* BC4C24 802409A4 50620001 */ beql $v1, $v0, .L802409AC -/* BC4C28 802409A8 AE440070 */ sw $a0, 0x70($s2) -.L802409AC: -/* BC4C2C 802409AC 3C013DCC */ lui $at, 0x3dcc -/* BC4C30 802409B0 3421CCCD */ ori $at, $at, 0xcccd -/* BC4C34 802409B4 44810000 */ mtc1 $at, $f0 -/* BC4C38 802409B8 3C014040 */ lui $at, 0x4040 -/* BC4C3C 802409BC 44811000 */ mtc1 $at, $f2 -/* BC4C40 802409C0 3C0141A0 */ lui $at, 0x41a0 -/* BC4C44 802409C4 44812000 */ mtc1 $at, $f4 -/* BC4C48 802409C8 AE200000 */ sw $zero, ($s1) -/* BC4C4C 802409CC AE20000C */ sw $zero, 0xc($s1) -/* BC4C50 802409D0 AE200010 */ sw $zero, 0x10($s1) -/* BC4C54 802409D4 AE200014 */ sw $zero, 0x14($s1) -/* BC4C58 802409D8 AE200008 */ sw $zero, 8($s1) -/* BC4C5C 802409DC E6200004 */ swc1 $f0, 4($s1) -/* BC4C60 802409E0 E6220018 */ swc1 $f2, 0x18($s1) -/* BC4C64 802409E4 0809037C */ j .L80240DF0 -/* BC4C68 802409E8 E624001C */ swc1 $f4, 0x1c($s1) -.L802409EC: -/* BC4C6C 802409EC 86030002 */ lh $v1, 2($s0) -/* BC4C70 802409F0 2402003C */ addiu $v0, $zero, 0x3c -/* BC4C74 802409F4 10620006 */ beq $v1, $v0, .L80240A10 -/* BC4C78 802409F8 2402003B */ addiu $v0, $zero, 0x3b -/* BC4C7C 802409FC 10620004 */ beq $v1, $v0, .L80240A10 -/* BC4C80 80240A00 24020078 */ addiu $v0, $zero, 0x78 -/* BC4C84 80240A04 AE42007C */ sw $v0, 0x7c($s2) -/* BC4C88 80240A08 24020002 */ addiu $v0, $zero, 2 -/* BC4C8C 80240A0C AE420070 */ sw $v0, 0x70($s2) -.L80240A10: -/* BC4C90 80240A10 C6200008 */ lwc1 $f0, 8($s1) -/* BC4C94 80240A14 3C0140A0 */ lui $at, 0x40a0 -/* BC4C98 80240A18 44811000 */ mtc1 $at, $f2 -/* BC4C9C 80240A1C 46000005 */ abs.s $f0, $f0 -/* BC4CA0 80240A20 4602003C */ c.lt.s $f0, $f2 -/* BC4CA4 80240A24 00000000 */ nop -/* BC4CA8 80240A28 4500000D */ bc1f .L80240A60 -/* BC4CAC 80240A2C 00000000 */ nop -/* BC4CB0 80240A30 C6600028 */ lwc1 $f0, 0x28($s3) -/* BC4CB4 80240A34 3C018024 */ lui $at, 0x8024 -/* BC4CB8 80240A38 D4223BD0 */ ldc1 $f2, 0x3bd0($at) -/* BC4CBC 80240A3C 46000021 */ cvt.d.s $f0, $f0 -/* BC4CC0 80240A40 46201081 */ sub.d $f2, $f2, $f0 -/* BC4CC4 80240A44 3C014348 */ lui $at, 0x4348 -/* BC4CC8 80240A48 44810000 */ mtc1 $at, $f0 -/* BC4CCC 80240A4C 462010A0 */ cvt.s.d $f2, $f2 -/* BC4CD0 80240A50 46001085 */ abs.s $f2, $f2 -/* BC4CD4 80240A54 46001083 */ div.s $f2, $f2, $f0 -/* BC4CD8 80240A58 0809029D */ j .L80240A74 -/* BC4CDC 80240A5C E6220004 */ swc1 $f2, 4($s1) -.L80240A60: -/* BC4CE0 80240A60 3C013DCC */ lui $at, 0x3dcc -/* BC4CE4 80240A64 3421CCCD */ ori $at, $at, 0xcccd -/* BC4CE8 80240A68 44810000 */ mtc1 $at, $f0 -/* BC4CEC 80240A6C 00000000 */ nop -/* BC4CF0 80240A70 E6200004 */ swc1 $f0, 4($s1) -.L80240A74: -/* BC4CF4 80240A74 C6600028 */ lwc1 $f0, 0x28($s3) -/* BC4CF8 80240A78 3C018024 */ lui $at, 0x8024 -/* BC4CFC 80240A7C D4243BD8 */ ldc1 $f4, 0x3bd8($at) -/* BC4D00 80240A80 46000021 */ cvt.d.s $f0, $f0 -/* BC4D04 80240A84 4624003E */ c.le.d $f0, $f4 -/* BC4D08 80240A88 00000000 */ nop -/* BC4D0C 80240A8C 45000024 */ bc1f .L80240B20 -/* BC4D10 80240A90 00000000 */ nop -/* BC4D14 80240A94 C6200010 */ lwc1 $f0, 0x10($s1) -/* BC4D18 80240A98 C6220004 */ lwc1 $f2, 4($s1) -/* BC4D1C 80240A9C 46020000 */ add.s $f0, $f0, $f2 -/* BC4D20 80240AA0 E6200010 */ swc1 $f0, 0x10($s1) -/* BC4D24 80240AA4 C6600028 */ lwc1 $f0, 0x28($s3) -/* BC4D28 80240AA8 46000021 */ cvt.d.s $f0, $f0 -/* BC4D2C 80240AAC 46202001 */ sub.d $f0, $f4, $f0 -/* BC4D30 80240AB0 46200020 */ cvt.s.d $f0, $f0 -/* BC4D34 80240AB4 46000005 */ abs.s $f0, $f0 -/* BC4D38 80240AB8 46000002 */ mul.s $f0, $f0, $f0 -/* BC4D3C 80240ABC 00000000 */ nop -/* BC4D40 80240AC0 3C014248 */ lui $at, 0x4248 -/* BC4D44 80240AC4 44811000 */ mtc1 $at, $f2 -/* BC4D48 80240AC8 3C014170 */ lui $at, 0x4170 -/* BC4D4C 80240ACC 44812000 */ mtc1 $at, $f4 -/* BC4D50 80240AD0 46020003 */ div.s $f0, $f0, $f2 -/* BC4D54 80240AD4 4600203C */ c.lt.s $f4, $f0 -/* BC4D58 80240AD8 00000000 */ nop -/* BC4D5C 80240ADC 45000002 */ bc1f .L80240AE8 -/* BC4D60 80240AE0 E620001C */ swc1 $f0, 0x1c($s1) -/* BC4D64 80240AE4 E624001C */ swc1 $f4, 0x1c($s1) -.L80240AE8: -/* BC4D68 80240AE8 C6220008 */ lwc1 $f2, 8($s1) -/* BC4D6C 80240AEC C620001C */ lwc1 $f0, 0x1c($s1) -/* BC4D70 80240AF0 4602003C */ c.lt.s $f0, $f2 -/* BC4D74 80240AF4 00000000 */ nop -/* BC4D78 80240AF8 45000031 */ bc1f .L80240BC0 -/* BC4D7C 80240AFC 00000000 */ nop -/* BC4D80 80240B00 C6200004 */ lwc1 $f0, 4($s1) -/* BC4D84 80240B04 C6220018 */ lwc1 $f2, 0x18($s1) -/* BC4D88 80240B08 46020002 */ mul.s $f0, $f0, $f2 -/* BC4D8C 80240B0C 00000000 */ nop -/* BC4D90 80240B10 C6220014 */ lwc1 $f2, 0x14($s1) -/* BC4D94 80240B14 46001080 */ add.s $f2, $f2, $f0 -/* BC4D98 80240B18 080902F0 */ j .L80240BC0 -/* BC4D9C 80240B1C E6220014 */ swc1 $f2, 0x14($s1) -.L80240B20: -/* BC4DA0 80240B20 C6200014 */ lwc1 $f0, 0x14($s1) -/* BC4DA4 80240B24 C6220004 */ lwc1 $f2, 4($s1) -/* BC4DA8 80240B28 46020000 */ add.s $f0, $f0, $f2 -/* BC4DAC 80240B2C E6200014 */ swc1 $f0, 0x14($s1) -/* BC4DB0 80240B30 C6600028 */ lwc1 $f0, 0x28($s3) -/* BC4DB4 80240B34 46000021 */ cvt.d.s $f0, $f0 -/* BC4DB8 80240B38 46202001 */ sub.d $f0, $f4, $f0 -/* BC4DBC 80240B3C 3C013F00 */ lui $at, 0x3f00 -/* BC4DC0 80240B40 44811000 */ mtc1 $at, $f2 -/* BC4DC4 80240B44 46200020 */ cvt.s.d $f0, $f0 -/* BC4DC8 80240B48 46000005 */ abs.s $f0, $f0 -/* BC4DCC 80240B4C 46000007 */ neg.s $f0, $f0 -/* BC4DD0 80240B50 46020002 */ mul.s $f0, $f0, $f2 -/* BC4DD4 80240B54 00000000 */ nop -/* BC4DD8 80240B58 46000002 */ mul.s $f0, $f0, $f0 -/* BC4DDC 80240B5C 00000000 */ nop -/* BC4DE0 80240B60 3C01C0A0 */ lui $at, 0xc0a0 -/* BC4DE4 80240B64 44812000 */ mtc1 $at, $f4 -/* BC4DE8 80240B68 3C014248 */ lui $at, 0x4248 -/* BC4DEC 80240B6C 44811000 */ mtc1 $at, $f2 -/* BC4DF0 80240B70 46000007 */ neg.s $f0, $f0 -/* BC4DF4 80240B74 46020003 */ div.s $f0, $f0, $f2 -/* BC4DF8 80240B78 4604003C */ c.lt.s $f0, $f4 -/* BC4DFC 80240B7C 00000000 */ nop -/* BC4E00 80240B80 45000002 */ bc1f .L80240B8C -/* BC4E04 80240B84 E620001C */ swc1 $f0, 0x1c($s1) -/* BC4E08 80240B88 E624001C */ swc1 $f4, 0x1c($s1) -.L80240B8C: -/* BC4E0C 80240B8C C6220008 */ lwc1 $f2, 8($s1) -/* BC4E10 80240B90 C620001C */ lwc1 $f0, 0x1c($s1) -/* BC4E14 80240B94 4600103C */ c.lt.s $f2, $f0 -/* BC4E18 80240B98 00000000 */ nop -/* BC4E1C 80240B9C 45000008 */ bc1f .L80240BC0 -/* BC4E20 80240BA0 00000000 */ nop -/* BC4E24 80240BA4 C6200004 */ lwc1 $f0, 4($s1) -/* BC4E28 80240BA8 C6220018 */ lwc1 $f2, 0x18($s1) -/* BC4E2C 80240BAC 46020002 */ mul.s $f0, $f0, $f2 -/* BC4E30 80240BB0 00000000 */ nop -/* BC4E34 80240BB4 C6220010 */ lwc1 $f2, 0x10($s1) -/* BC4E38 80240BB8 46001080 */ add.s $f2, $f2, $f0 -/* BC4E3C 80240BBC E6220010 */ swc1 $f2, 0x10($s1) -.L80240BC0: -/* BC4E40 80240BC0 C6200010 */ lwc1 $f0, 0x10($s1) -/* BC4E44 80240BC4 3C014059 */ lui $at, 0x4059 -/* BC4E48 80240BC8 44812800 */ mtc1 $at, $f5 -/* BC4E4C 80240BCC 44802000 */ mtc1 $zero, $f4 -/* BC4E50 80240BD0 460000A1 */ cvt.d.s $f2, $f0 -/* BC4E54 80240BD4 4622203C */ c.lt.d $f4, $f2 -/* BC4E58 80240BD8 00000000 */ nop -/* BC4E5C 80240BDC 4500000F */ bc1f .L80240C1C -/* BC4E60 80240BE0 00000000 */ nop -/* BC4E64 80240BE4 C6200014 */ lwc1 $f0, 0x14($s1) -/* BC4E68 80240BE8 46000021 */ cvt.d.s $f0, $f0 -/* BC4E6C 80240BEC 4620203C */ c.lt.d $f4, $f0 -/* BC4E70 80240BF0 00000000 */ nop -/* BC4E74 80240BF4 45000009 */ bc1f .L80240C1C -/* BC4E78 80240BF8 00000000 */ nop -/* BC4E7C 80240BFC C6200014 */ lwc1 $f0, 0x14($s1) -/* BC4E80 80240C00 46241081 */ sub.d $f2, $f2, $f4 -/* BC4E84 80240C04 46000021 */ cvt.d.s $f0, $f0 -/* BC4E88 80240C08 46240001 */ sub.d $f0, $f0, $f4 -/* BC4E8C 80240C0C 462010A0 */ cvt.s.d $f2, $f2 -/* BC4E90 80240C10 E6220010 */ swc1 $f2, 0x10($s1) -/* BC4E94 80240C14 46200020 */ cvt.s.d $f0, $f0 -/* BC4E98 80240C18 E6200014 */ swc1 $f0, 0x14($s1) -.L80240C1C: -/* BC4E9C 80240C1C C6240010 */ lwc1 $f4, 0x10($s1) -/* BC4EA0 80240C20 C6220014 */ lwc1 $f2, 0x14($s1) -/* BC4EA4 80240C24 46022001 */ sub.s $f0, $f4, $f2 -/* BC4EA8 80240C28 3C013FF8 */ lui $at, 0x3ff8 -/* BC4EAC 80240C2C 44813800 */ mtc1 $at, $f7 -/* BC4EB0 80240C30 44803000 */ mtc1 $zero, $f6 -/* BC4EB4 80240C34 46000005 */ abs.s $f0, $f0 -/* BC4EB8 80240C38 46000021 */ cvt.d.s $f0, $f0 -/* BC4EBC 80240C3C 4620303C */ c.lt.d $f6, $f0 -/* BC4EC0 80240C40 00000000 */ nop -/* BC4EC4 80240C44 45000063 */ bc1f .L80240DD4 -/* BC4EC8 80240C48 00000000 */ nop -/* BC4ECC 80240C4C 4602203C */ c.lt.s $f4, $f2 -/* BC4ED0 80240C50 00000000 */ nop -/* BC4ED4 80240C54 45020006 */ bc1fl .L80240C70 -/* BC4ED8 80240C58 46001021 */ cvt.d.s $f0, $f2 -/* BC4EDC 80240C5C 46002021 */ cvt.d.s $f0, $f4 -/* BC4EE0 80240C60 46260000 */ add.d $f0, $f0, $f6 -/* BC4EE4 80240C64 46200020 */ cvt.s.d $f0, $f0 -/* BC4EE8 80240C68 08090375 */ j .L80240DD4 -/* BC4EEC 80240C6C E6200014 */ swc1 $f0, 0x14($s1) -.L80240C70: -/* BC4EF0 80240C70 46260000 */ add.d $f0, $f0, $f6 -/* BC4EF4 80240C74 46200020 */ cvt.s.d $f0, $f0 -/* BC4EF8 80240C78 08090375 */ j .L80240DD4 -/* BC4EFC 80240C7C E6200010 */ swc1 $f0, 0x10($s1) -.L80240C80: -/* BC4F00 80240C80 86030002 */ lh $v1, 2($s0) -/* BC4F04 80240C84 50620001 */ beql $v1, $v0, .L80240C8C -/* BC4F08 80240C88 AE440070 */ sw $a0, 0x70($s2) -.L80240C8C: -/* BC4F0C 80240C8C 86030002 */ lh $v1, 2($s0) -/* BC4F10 80240C90 2402003B */ addiu $v0, $zero, 0x3b -/* BC4F14 80240C94 50620001 */ beql $v1, $v0, .L80240C9C -/* BC4F18 80240C98 AE440070 */ sw $a0, 0x70($s2) -.L80240C9C: -/* BC4F1C 80240C9C 3C013DCC */ lui $at, 0x3dcc -/* BC4F20 80240CA0 3421CCCD */ ori $at, $at, 0xcccd -/* BC4F24 80240CA4 44810000 */ mtc1 $at, $f0 -/* BC4F28 80240CA8 C6220010 */ lwc1 $f2, 0x10($s1) -/* BC4F2C 80240CAC C6240008 */ lwc1 $f4, 8($s1) -/* BC4F30 80240CB0 AE20001C */ sw $zero, 0x1c($s1) -/* BC4F34 80240CB4 46001080 */ add.s $f2, $f2, $f0 -/* BC4F38 80240CB8 E6200004 */ swc1 $f0, 4($s1) -/* BC4F3C 80240CBC C620001C */ lwc1 $f0, 0x1c($s1) -/* BC4F40 80240CC0 4604003C */ c.lt.s $f0, $f4 -/* BC4F44 80240CC4 00000000 */ nop -/* BC4F48 80240CC8 45000008 */ bc1f .L80240CEC -/* BC4F4C 80240CCC E6220010 */ swc1 $f2, 0x10($s1) -/* BC4F50 80240CD0 C6200004 */ lwc1 $f0, 4($s1) -/* BC4F54 80240CD4 C6220018 */ lwc1 $f2, 0x18($s1) -/* BC4F58 80240CD8 46020002 */ mul.s $f0, $f0, $f2 -/* BC4F5C 80240CDC 00000000 */ nop -/* BC4F60 80240CE0 C6220014 */ lwc1 $f2, 0x14($s1) -/* BC4F64 80240CE4 46001080 */ add.s $f2, $f2, $f0 -/* BC4F68 80240CE8 E6220014 */ swc1 $f2, 0x14($s1) -.L80240CEC: -/* BC4F6C 80240CEC C6200010 */ lwc1 $f0, 0x10($s1) -/* BC4F70 80240CF0 3C014059 */ lui $at, 0x4059 -/* BC4F74 80240CF4 44812800 */ mtc1 $at, $f5 -/* BC4F78 80240CF8 44802000 */ mtc1 $zero, $f4 -/* BC4F7C 80240CFC 460000A1 */ cvt.d.s $f2, $f0 -/* BC4F80 80240D00 4622203C */ c.lt.d $f4, $f2 -/* BC4F84 80240D04 00000000 */ nop -/* BC4F88 80240D08 4500000F */ bc1f .L80240D48 -/* BC4F8C 80240D0C 00000000 */ nop -/* BC4F90 80240D10 C6200014 */ lwc1 $f0, 0x14($s1) -/* BC4F94 80240D14 46000021 */ cvt.d.s $f0, $f0 -/* BC4F98 80240D18 4620203C */ c.lt.d $f4, $f0 -/* BC4F9C 80240D1C 00000000 */ nop -/* BC4FA0 80240D20 45000009 */ bc1f .L80240D48 -/* BC4FA4 80240D24 00000000 */ nop -/* BC4FA8 80240D28 C6200014 */ lwc1 $f0, 0x14($s1) -/* BC4FAC 80240D2C 46241081 */ sub.d $f2, $f2, $f4 -/* BC4FB0 80240D30 46000021 */ cvt.d.s $f0, $f0 -/* BC4FB4 80240D34 46240001 */ sub.d $f0, $f0, $f4 -/* BC4FB8 80240D38 462010A0 */ cvt.s.d $f2, $f2 -/* BC4FBC 80240D3C E6220010 */ swc1 $f2, 0x10($s1) -/* BC4FC0 80240D40 46200020 */ cvt.s.d $f0, $f0 -/* BC4FC4 80240D44 E6200014 */ swc1 $f0, 0x14($s1) -.L80240D48: -/* BC4FC8 80240D48 C6240010 */ lwc1 $f4, 0x10($s1) -/* BC4FCC 80240D4C C6220014 */ lwc1 $f2, 0x14($s1) -/* BC4FD0 80240D50 46022001 */ sub.s $f0, $f4, $f2 -/* BC4FD4 80240D54 3C013FE0 */ lui $at, 0x3fe0 -/* BC4FD8 80240D58 44813800 */ mtc1 $at, $f7 -/* BC4FDC 80240D5C 44803000 */ mtc1 $zero, $f6 -/* BC4FE0 80240D60 46000005 */ abs.s $f0, $f0 -/* BC4FE4 80240D64 46000021 */ cvt.d.s $f0, $f0 -/* BC4FE8 80240D68 4620303C */ c.lt.d $f6, $f0 -/* BC4FEC 80240D6C 00000000 */ nop -/* BC4FF0 80240D70 4500000D */ bc1f .L80240DA8 -/* BC4FF4 80240D74 00000000 */ nop -/* BC4FF8 80240D78 4602203C */ c.lt.s $f4, $f2 -/* BC4FFC 80240D7C 00000000 */ nop -/* BC5000 80240D80 45020006 */ bc1fl .L80240D9C -/* BC5004 80240D84 46001021 */ cvt.d.s $f0, $f2 -/* BC5008 80240D88 46002021 */ cvt.d.s $f0, $f4 -/* BC500C 80240D8C 46260000 */ add.d $f0, $f0, $f6 -/* BC5010 80240D90 46200020 */ cvt.s.d $f0, $f0 -/* BC5014 80240D94 0809036A */ j .L80240DA8 -/* BC5018 80240D98 E6200014 */ swc1 $f0, 0x14($s1) -.L80240D9C: -/* BC501C 80240D9C 46260000 */ add.d $f0, $f0, $f6 -/* BC5020 80240DA0 46200020 */ cvt.s.d $f0, $f0 -/* BC5024 80240DA4 E6200010 */ swc1 $f0, 0x10($s1) -.L80240DA8: -/* BC5028 80240DA8 8E42007C */ lw $v0, 0x7c($s2) -/* BC502C 80240DAC 04410008 */ bgez $v0, .L80240DD0 -/* BC5030 80240DB0 2442FFFF */ addiu $v0, $v0, -1 -/* BC5034 80240DB4 44800000 */ mtc1 $zero, $f0 -/* BC5038 80240DB8 00000000 */ nop -/* BC503C 80240DBC E6200014 */ swc1 $f0, 0x14($s1) -/* BC5040 80240DC0 E6200010 */ swc1 $f0, 0x10($s1) -/* BC5044 80240DC4 E6200000 */ swc1 $f0, ($s1) -/* BC5048 80240DC8 08090375 */ j .L80240DD4 -/* BC504C 80240DCC E6200008 */ swc1 $f0, 8($s1) -.L80240DD0: -/* BC5050 80240DD0 AE42007C */ sw $v0, 0x7c($s2) -.L80240DD4: -/* BC5054 80240DD4 C6200010 */ lwc1 $f0, 0x10($s1) -/* BC5058 80240DD8 C6220014 */ lwc1 $f2, 0x14($s1) -/* BC505C 80240DDC 46020001 */ sub.s $f0, $f0, $f2 -/* BC5060 80240DE0 C6220008 */ lwc1 $f2, 8($s1) -/* BC5064 80240DE4 46001080 */ add.s $f2, $f2, $f0 -/* BC5068 80240DE8 E6200000 */ swc1 $f0, ($s1) -/* BC506C 80240DEC E6220008 */ swc1 $f2, 8($s1) -.L80240DF0: -/* BC5070 80240DF0 C6220008 */ lwc1 $f2, 8($s1) -/* BC5074 80240DF4 3C01C0E0 */ lui $at, 0xc0e0 -/* BC5078 80240DF8 44810000 */ mtc1 $at, $f0 -/* BC507C 80240DFC 00000000 */ nop -/* BC5080 80240E00 4600103E */ c.le.s $f2, $f0 -/* BC5084 80240E04 00000000 */ nop -/* BC5088 80240E08 45000013 */ bc1f .L80240E58 -/* BC508C 80240E0C 2410FFFF */ addiu $s0, $zero, -1 -/* BC5090 80240E10 8E420078 */ lw $v0, 0x78($s2) -/* BC5094 80240E14 10500011 */ beq $v0, $s0, .L80240E5C -/* BC5098 80240E18 27A50058 */ addiu $a1, $sp, 0x58 -/* BC509C 80240E1C 2404003C */ addiu $a0, $zero, 0x3c -/* BC50A0 80240E20 27A6005C */ addiu $a2, $sp, 0x5c -/* BC50A4 80240E24 0C016F84 */ jal get_collider_center -/* BC50A8 80240E28 27A70060 */ addiu $a3, $sp, 0x60 -/* BC50AC 80240E2C 240401D6 */ addiu $a0, $zero, 0x1d6 -/* BC50B0 80240E30 C7A00058 */ lwc1 $f0, 0x58($sp) -/* BC50B4 80240E34 C7A2005C */ lwc1 $f2, 0x5c($sp) -/* BC50B8 80240E38 44060000 */ mfc1 $a2, $f0 -/* BC50BC 80240E3C 44071000 */ mfc1 $a3, $f2 -/* BC50C0 80240E40 C7A00060 */ lwc1 $f0, 0x60($sp) -/* BC50C4 80240E44 0000282D */ daddu $a1, $zero, $zero -/* BC50C8 80240E48 0C052757 */ jal play_sound_at_position -/* BC50CC 80240E4C E7A00010 */ swc1 $f0, 0x10($sp) -/* BC50D0 80240E50 08090397 */ j .L80240E5C -/* BC50D4 80240E54 AE500078 */ sw $s0, 0x78($s2) -.L80240E58: -/* BC50D8 80240E58 AE400078 */ sw $zero, 0x78($s2) -.L80240E5C: -/* BC50DC 80240E5C C6200008 */ lwc1 $f0, 8($s1) -/* BC50E0 80240E60 46000002 */ mul.s $f0, $f0, $f0 -/* BC50E4 80240E64 00000000 */ nop -/* BC50E8 80240E68 3C0142B4 */ lui $at, 0x42b4 -/* BC50EC 80240E6C 44811000 */ mtc1 $at, $f2 -/* BC50F0 80240E70 24040081 */ addiu $a0, $zero, 0x81 -/* BC50F4 80240E74 46020003 */ div.s $f0, $f0, $f2 -/* BC50F8 80240E78 0C046C04 */ jal get_model_list_index_from_tree_index -/* BC50FC 80240E7C E620000C */ swc1 $f0, 0xc($s1) -/* BC5100 80240E80 0C046B4C */ jal get_model_from_list_index -/* BC5104 80240E84 0040202D */ daddu $a0, $v0, $zero -/* BC5108 80240E88 0040182D */ daddu $v1, $v0, $zero -/* BC510C 80240E8C 24700058 */ addiu $s0, $v1, 0x58 -/* BC5110 80240E90 4480A000 */ mtc1 $zero, $f20 -/* BC5114 80240E94 94620000 */ lhu $v0, ($v1) -/* BC5118 80240E98 4405A000 */ mfc1 $a1, $f20 -/* BC511C 80240E9C 4407A000 */ mfc1 $a3, $f20 -/* BC5120 80240EA0 34421400 */ ori $v0, $v0, 0x1400 -/* BC5124 80240EA4 A4620000 */ sh $v0, ($v1) -/* BC5128 80240EA8 8E26000C */ lw $a2, 0xc($s1) -/* BC512C 80240EAC 3C013F80 */ lui $at, 0x3f80 -/* BC5130 80240EB0 4481B000 */ mtc1 $at, $f22 -/* BC5134 80240EB4 0C019E40 */ jal guTranslateF -/* BC5138 80240EB8 0200202D */ daddu $a0, $s0, $zero -/* BC513C 80240EBC E7B60010 */ swc1 $f22, 0x10($sp) -/* BC5140 80240EC0 8E250008 */ lw $a1, 8($s1) -/* BC5144 80240EC4 4406A000 */ mfc1 $a2, $f20 -/* BC5148 80240EC8 4407A000 */ mfc1 $a3, $f20 -/* BC514C 80240ECC 0C019EC8 */ jal guRotateF -/* BC5150 80240ED0 27A40018 */ addiu $a0, $sp, 0x18 -/* BC5154 80240ED4 0200202D */ daddu $a0, $s0, $zero -/* BC5158 80240ED8 27A50018 */ addiu $a1, $sp, 0x18 -/* BC515C 80240EDC 0C019D80 */ jal guMtxCatF -/* BC5160 80240EE0 0080302D */ daddu $a2, $a0, $zero -/* BC5164 80240EE4 0C016E89 */ jal update_collider_transform -/* BC5168 80240EE8 2404003C */ addiu $a0, $zero, 0x3c -/* BC516C 80240EEC 0C016E89 */ jal update_collider_transform -/* BC5170 80240EF0 2404003B */ addiu $a0, $zero, 0x3b -/* BC5174 80240EF4 0C046C04 */ jal get_model_list_index_from_tree_index -/* BC5178 80240EF8 24040080 */ addiu $a0, $zero, 0x80 -/* BC517C 80240EFC 0C046B4C */ jal get_model_from_list_index -/* BC5180 80240F00 0040202D */ daddu $a0, $v0, $zero -/* BC5184 80240F04 0040182D */ daddu $v1, $v0, $zero -/* BC5188 80240F08 24700058 */ addiu $s0, $v1, 0x58 -/* BC518C 80240F0C 4405A000 */ mfc1 $a1, $f20 -/* BC5190 80240F10 94620000 */ lhu $v0, ($v1) -/* BC5194 80240F14 4407A000 */ mfc1 $a3, $f20 -/* BC5198 80240F18 34421400 */ ori $v0, $v0, 0x1400 -/* BC519C 80240F1C A4620000 */ sh $v0, ($v1) -/* BC51A0 80240F20 8E26000C */ lw $a2, 0xc($s1) -/* BC51A4 80240F24 0C019E40 */ jal guTranslateF -/* BC51A8 80240F28 0200202D */ daddu $a0, $s0, $zero -/* BC51AC 80240F2C E7B60010 */ swc1 $f22, 0x10($sp) -/* BC51B0 80240F30 8E250008 */ lw $a1, 8($s1) -/* BC51B4 80240F34 4406A000 */ mfc1 $a2, $f20 -/* BC51B8 80240F38 4407A000 */ mfc1 $a3, $f20 -/* BC51BC 80240F3C 0C019EC8 */ jal guRotateF -/* BC51C0 80240F40 27A40018 */ addiu $a0, $sp, 0x18 -/* BC51C4 80240F44 0200202D */ daddu $a0, $s0, $zero -/* BC51C8 80240F48 27A50018 */ addiu $a1, $sp, 0x18 -/* BC51CC 80240F4C 0C019D80 */ jal guMtxCatF -/* BC51D0 80240F50 0080302D */ daddu $a2, $a0, $zero -/* BC51D4 80240F54 0C046C04 */ jal get_model_list_index_from_tree_index -/* BC51D8 80240F58 2404007F */ addiu $a0, $zero, 0x7f -/* BC51DC 80240F5C 0C046B4C */ jal get_model_from_list_index -/* BC51E0 80240F60 0040202D */ daddu $a0, $v0, $zero -/* BC51E4 80240F64 0040182D */ daddu $v1, $v0, $zero -/* BC51E8 80240F68 24700058 */ addiu $s0, $v1, 0x58 -/* BC51EC 80240F6C 4405A000 */ mfc1 $a1, $f20 -/* BC51F0 80240F70 94620000 */ lhu $v0, ($v1) -/* BC51F4 80240F74 4407A000 */ mfc1 $a3, $f20 -/* BC51F8 80240F78 34421400 */ ori $v0, $v0, 0x1400 -/* BC51FC 80240F7C A4620000 */ sh $v0, ($v1) -/* BC5200 80240F80 8E26000C */ lw $a2, 0xc($s1) -/* BC5204 80240F84 0C019E40 */ jal guTranslateF -/* BC5208 80240F88 0200202D */ daddu $a0, $s0, $zero -/* BC520C 80240F8C 4406A000 */ mfc1 $a2, $f20 -/* BC5210 80240F90 27A40018 */ addiu $a0, $sp, 0x18 -/* BC5214 80240F94 E7B60010 */ swc1 $f22, 0x10($sp) -/* BC5218 80240F98 8E250008 */ lw $a1, 8($s1) -/* BC521C 80240F9C 0C019EC8 */ jal guRotateF -/* BC5220 80240FA0 00C0382D */ daddu $a3, $a2, $zero -/* BC5224 80240FA4 0200202D */ daddu $a0, $s0, $zero -/* BC5228 80240FA8 27A50018 */ addiu $a1, $sp, 0x18 -/* BC522C 80240FAC 0C019D80 */ jal guMtxCatF -/* BC5230 80240FB0 0080302D */ daddu $a2, $a0, $zero -/* BC5234 80240FB4 0C016E89 */ jal update_collider_transform -/* BC5238 80240FB8 2404003A */ addiu $a0, $zero, 0x3a -/* BC523C 80240FBC 8FBF0078 */ lw $ra, 0x78($sp) -/* BC5240 80240FC0 8FB30074 */ lw $s3, 0x74($sp) -/* BC5244 80240FC4 8FB20070 */ lw $s2, 0x70($sp) -/* BC5248 80240FC8 8FB1006C */ lw $s1, 0x6c($sp) -/* BC524C 80240FCC 8FB00068 */ lw $s0, 0x68($sp) -/* BC5250 80240FD0 D7B60088 */ ldc1 $f22, 0x88($sp) -/* BC5254 80240FD4 D7B40080 */ ldc1 $f20, 0x80($sp) -/* BC5258 80240FD8 0000102D */ daddu $v0, $zero, $zero -/* BC525C 80240FDC 03E00008 */ jr $ra -/* BC5260 80240FE0 27BD0090 */ addiu $sp, $sp, 0x90 -/* BC5264 80240FE4 00000000 */ nop -/* BC5268 80240FE8 00000000 */ nop -/* BC526C 80240FEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_04/func_80240050_BC7E60.s b/asm/nonmatchings/world/area_obk/obk_04/func_80240050_BC7E60.s deleted file mode 100644 index ad9224c146..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/func_80240050_BC7E60.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_BC7EB0 -/* BC7EB0 80240050 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC7EB4 80240054 AFB10014 */ sw $s1, 0x14($sp) -/* BC7EB8 80240058 0080882D */ daddu $s1, $a0, $zero -/* BC7EBC 8024005C AFBF0018 */ sw $ra, 0x18($sp) -/* BC7EC0 80240060 AFB00010 */ sw $s0, 0x10($sp) -/* BC7EC4 80240064 0C00EABB */ jal get_npc_unsafe -/* BC7EC8 80240068 8E24014C */ lw $a0, 0x14c($s1) -/* BC7ECC 8024006C 24040004 */ addiu $a0, $zero, 4 -/* BC7ED0 80240070 0C00AB39 */ jal heap_malloc -/* BC7ED4 80240074 0040802D */ daddu $s0, $v0, $zero -/* BC7ED8 80240078 3C0142FA */ lui $at, 0x42fa -/* BC7EDC 8024007C 44810000 */ mtc1 $at, $f0 -/* BC7EE0 80240080 3C01C45A */ lui $at, 0xc45a -/* BC7EE4 80240084 3421C000 */ ori $at, $at, 0xc000 -/* BC7EE8 80240088 44811000 */ mtc1 $at, $f2 -/* BC7EEC 8024008C 0040182D */ daddu $v1, $v0, $zero -/* BC7EF0 80240090 AE030020 */ sw $v1, 0x20($s0) -/* BC7EF4 80240094 AC600000 */ sw $zero, ($v1) -/* BC7EF8 80240098 2403003C */ addiu $v1, $zero, 0x3c -/* BC7EFC 8024009C AE00000C */ sw $zero, 0xc($s0) -/* BC7F00 802400A0 AE000038 */ sw $zero, 0x38($s0) -/* BC7F04 802400A4 AE000040 */ sw $zero, 0x40($s0) -/* BC7F08 802400A8 A603008E */ sh $v1, 0x8e($s0) -/* BC7F0C 802400AC E6000010 */ swc1 $f0, 0x10($s0) -/* BC7F10 802400B0 E602003C */ swc1 $f2, 0x3c($s0) -/* BC7F14 802400B4 AE200074 */ sw $zero, 0x74($s1) -/* BC7F18 802400B8 8FBF0018 */ lw $ra, 0x18($sp) -/* BC7F1C 802400BC 8FB10014 */ lw $s1, 0x14($sp) -/* BC7F20 802400C0 8FB00010 */ lw $s0, 0x10($sp) -/* BC7F24 802400C4 24020002 */ addiu $v0, $zero, 2 -/* BC7F28 802400C8 03E00008 */ jr $ra -/* BC7F2C 802400CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_04/func_802400D0_BC7E60.s b/asm/nonmatchings/world/area_obk/obk_04/func_802400D0_BC7E60.s deleted file mode 100644 index 1cde28976d..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/func_802400D0_BC7E60.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400D0_BC7F30 -/* BC7F30 802400D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BC7F34 802400D4 AFB00020 */ sw $s0, 0x20($sp) -/* BC7F38 802400D8 0080802D */ daddu $s0, $a0, $zero -/* BC7F3C 802400DC AFBF0024 */ sw $ra, 0x24($sp) -/* BC7F40 802400E0 C602000C */ lwc1 $f2, 0xc($s0) -/* BC7F44 802400E4 3C0143AA */ lui $at, 0x43aa -/* BC7F48 802400E8 44810000 */ mtc1 $at, $f0 -/* BC7F4C 802400EC 00000000 */ nop -/* BC7F50 802400F0 4602003C */ c.lt.s $f0, $f2 -/* BC7F54 802400F4 00000000 */ nop -/* BC7F58 802400F8 45010008 */ bc1t .L8024011C -/* BC7F5C 802400FC 0200202D */ daddu $a0, $s0, $zero -/* BC7F60 80240100 3C0141A0 */ lui $at, 0x41a0 -/* BC7F64 80240104 44810000 */ mtc1 $at, $f0 -/* BC7F68 80240108 00000000 */ nop -/* BC7F6C 8024010C 4600103C */ c.lt.s $f2, $f0 -/* BC7F70 80240110 00000000 */ nop -/* BC7F74 80240114 4500000E */ bc1f .L80240150 -/* BC7F78 80240118 24020016 */ addiu $v0, $zero, 0x16 -.L8024011C: -/* BC7F7C 8024011C 0000282D */ daddu $a1, $zero, $zero -/* BC7F80 80240120 00A0302D */ daddu $a2, $a1, $zero -/* BC7F84 80240124 2402000D */ addiu $v0, $zero, 0xd -/* BC7F88 80240128 A08200AA */ sb $v0, 0xaa($a0) -/* BC7F8C 8024012C A48000A2 */ sh $zero, 0xa2($a0) -/* BC7F90 80240130 AFA00010 */ sw $zero, 0x10($sp) -/* BC7F94 80240134 AFA00014 */ sw $zero, 0x14($sp) -/* BC7F98 80240138 948200A2 */ lhu $v0, 0xa2($a0) -/* BC7F9C 8024013C 00A0382D */ daddu $a3, $a1, $zero -/* BC7FA0 80240140 0C00F589 */ jal func_8003D624 -/* BC7FA4 80240144 AFA20018 */ sw $v0, 0x18($sp) -/* BC7FA8 80240148 08090062 */ j .L80240188 -/* BC7FAC 8024014C 00000000 */ nop -.L80240150: -/* BC7FB0 80240150 A20200AA */ sb $v0, 0xaa($s0) -/* BC7FB4 80240154 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BC7FB8 80240158 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BC7FBC 8024015C 0200202D */ daddu $a0, $s0, $zero -/* BC7FC0 80240160 9046000E */ lbu $a2, 0xe($v0) -/* BC7FC4 80240164 24050007 */ addiu $a1, $zero, 7 -/* BC7FC8 80240168 AFA00010 */ sw $zero, 0x10($sp) -/* BC7FCC 8024016C AFA00014 */ sw $zero, 0x14($sp) -/* BC7FD0 80240170 960200A2 */ lhu $v0, 0xa2($s0) -/* BC7FD4 80240174 240700FF */ addiu $a3, $zero, 0xff -/* BC7FD8 80240178 0C00F589 */ jal func_8003D624 -/* BC7FDC 8024017C AFA20018 */ sw $v0, 0x18($sp) -/* BC7FE0 80240180 240200FF */ addiu $v0, $zero, 0xff -/* BC7FE4 80240184 A602009A */ sh $v0, 0x9a($s0) -.L80240188: -/* BC7FE8 80240188 8FBF0024 */ lw $ra, 0x24($sp) -/* BC7FEC 8024018C 8FB00020 */ lw $s0, 0x20($sp) -/* BC7FF0 80240190 03E00008 */ jr $ra -/* BC7FF4 80240194 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_obk/obk_04/func_8024022C_BC7E60.s b/asm/nonmatchings/world/area_obk/obk_04/func_8024022C_BC7E60.s deleted file mode 100644 index 21ddb4294c..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/func_8024022C_BC7E60.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024022C_BC808C -/* BC808C 8024022C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BC8090 80240230 AFBF0010 */ sw $ra, 0x10($sp) -/* BC8094 80240234 0C00EABB */ jal get_npc_unsafe -/* BC8098 80240238 24040001 */ addiu $a0, $zero, 1 -/* BC809C 8024023C 24040002 */ addiu $a0, $zero, 2 -/* BC80A0 80240240 0C00EABB */ jal get_npc_unsafe -/* BC80A4 80240244 A44000A2 */ sh $zero, 0xa2($v0) -/* BC80A8 80240248 24040003 */ addiu $a0, $zero, 3 -/* BC80AC 8024024C 0C00EABB */ jal get_npc_unsafe -/* BC80B0 80240250 A44000A2 */ sh $zero, 0xa2($v0) -/* BC80B4 80240254 24040004 */ addiu $a0, $zero, 4 -/* BC80B8 80240258 0C00EABB */ jal get_npc_unsafe -/* BC80BC 8024025C A44000A2 */ sh $zero, 0xa2($v0) -/* BC80C0 80240260 24040005 */ addiu $a0, $zero, 5 -/* BC80C4 80240264 0C00EABB */ jal get_npc_unsafe -/* BC80C8 80240268 A44000A2 */ sh $zero, 0xa2($v0) -/* BC80CC 8024026C 24040006 */ addiu $a0, $zero, 6 -/* BC80D0 80240270 0C00EABB */ jal get_npc_unsafe -/* BC80D4 80240274 A44000A2 */ sh $zero, 0xa2($v0) -/* BC80D8 80240278 24040007 */ addiu $a0, $zero, 7 -/* BC80DC 8024027C 0C00EABB */ jal get_npc_unsafe -/* BC80E0 80240280 A44000A2 */ sh $zero, 0xa2($v0) -/* BC80E4 80240284 24040008 */ addiu $a0, $zero, 8 -/* BC80E8 80240288 0C00EABB */ jal get_npc_unsafe -/* BC80EC 8024028C A44000A2 */ sh $zero, 0xa2($v0) -/* BC80F0 80240290 A44000A2 */ sh $zero, 0xa2($v0) -/* BC80F4 80240294 8FBF0010 */ lw $ra, 0x10($sp) -/* BC80F8 80240298 03E00008 */ jr $ra -/* BC80FC 8024029C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_04/func_802402A0_BC7E60.s b/asm/nonmatchings/world/area_obk/obk_04/func_802402A0_BC7E60.s deleted file mode 100644 index 20ebb713cd..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/func_802402A0_BC7E60.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402A0_BC8100 -/* BC8100 802402A0 24020001 */ addiu $v0, $zero, 1 -/* BC8104 802402A4 1082000B */ beq $a0, $v0, .L802402D4 -/* BC8108 802402A8 2403000C */ addiu $v1, $zero, 0xc -/* BC810C 802402AC 28820002 */ slti $v0, $a0, 2 -/* BC8110 802402B0 1440000E */ bnez $v0, .L802402EC -/* BC8114 802402B4 0060102D */ daddu $v0, $v1, $zero -/* BC8118 802402B8 24020002 */ addiu $v0, $zero, 2 -/* BC811C 802402BC 10820007 */ beq $a0, $v0, .L802402DC -/* BC8120 802402C0 24020003 */ addiu $v0, $zero, 3 -/* BC8124 802402C4 10820007 */ beq $a0, $v0, .L802402E4 -/* BC8128 802402C8 0060102D */ daddu $v0, $v1, $zero -/* BC812C 802402CC 080900BB */ j .L802402EC -/* BC8130 802402D0 00000000 */ nop -.L802402D4: -/* BC8134 802402D4 080900BA */ j .L802402E8 -/* BC8138 802402D8 24030064 */ addiu $v1, $zero, 0x64 -.L802402DC: -/* BC813C 802402DC 080900BA */ j .L802402E8 -/* BC8140 802402E0 2403000D */ addiu $v1, $zero, 0xd -.L802402E4: -/* BC8144 802402E4 2403000E */ addiu $v1, $zero, 0xe -.L802402E8: -/* BC8148 802402E8 0060102D */ daddu $v0, $v1, $zero -.L802402EC: -/* BC814C 802402EC 03E00008 */ jr $ra -/* BC8150 802402F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_04/func_802402F4_BC7E60.s b/asm/nonmatchings/world/area_obk/obk_04/func_802402F4_BC7E60.s deleted file mode 100644 index 961bb65976..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/func_802402F4_BC7E60.s +++ /dev/null @@ -1,197 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F4_BC8154 -/* BC8154 802402F4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BC8158 802402F8 AFB10014 */ sw $s1, 0x14($sp) -/* BC815C 802402FC 0080882D */ daddu $s1, $a0, $zero -/* BC8160 80240300 AFBF0024 */ sw $ra, 0x24($sp) -/* BC8164 80240304 AFB40020 */ sw $s4, 0x20($sp) -/* BC8168 80240308 AFB3001C */ sw $s3, 0x1c($sp) -/* BC816C 8024030C AFB20018 */ sw $s2, 0x18($sp) -/* BC8170 80240310 AFB00010 */ sw $s0, 0x10($sp) -/* BC8174 80240314 8E24014C */ lw $a0, 0x14c($s1) -/* BC8178 80240318 0C00EABB */ jal get_npc_unsafe -/* BC817C 8024031C 2414000C */ addiu $s4, $zero, 0xc -/* BC8180 80240320 0040802D */ daddu $s0, $v0, $zero -/* BC8184 80240324 8E230074 */ lw $v1, 0x74($s1) -/* BC8188 80240328 8E130020 */ lw $s3, 0x20($s0) -/* BC818C 8024032C 10740057 */ beq $v1, $s4, .L8024048C -/* BC8190 80240330 2862000D */ slti $v0, $v1, 0xd -/* BC8194 80240334 1040000F */ beqz $v0, .L80240374 -/* BC8198 80240338 24120001 */ addiu $s2, $zero, 1 -/* BC819C 8024033C 10720094 */ beq $v1, $s2, .L80240590 -/* BC81A0 80240340 28620002 */ slti $v0, $v1, 2 -/* BC81A4 80240344 10400005 */ beqz $v0, .L8024035C -/* BC81A8 80240348 2402000A */ addiu $v0, $zero, 0xa -/* BC81AC 8024034C 10600015 */ beqz $v1, .L802403A4 -/* BC81B0 80240350 0220202D */ daddu $a0, $s1, $zero -/* BC81B4 80240354 08090164 */ j .L80240590 -/* BC81B8 80240358 00000000 */ nop -.L8024035C: -/* BC81BC 8024035C 10620019 */ beq $v1, $v0, .L802403C4 -/* BC81C0 80240360 2402000B */ addiu $v0, $zero, 0xb -/* BC81C4 80240364 10620025 */ beq $v1, $v0, .L802403FC -/* BC81C8 80240368 00000000 */ nop -/* BC81CC 8024036C 08090164 */ j .L80240590 -/* BC81D0 80240370 00000000 */ nop -.L80240374: -/* BC81D4 80240374 2402000E */ addiu $v0, $zero, 0xe -/* BC81D8 80240378 1062005B */ beq $v1, $v0, .L802404E8 -/* BC81DC 8024037C 0062102A */ slt $v0, $v1, $v0 -/* BC81E0 80240380 1440004E */ bnez $v0, .L802404BC -/* BC81E4 80240384 0220202D */ daddu $a0, $s1, $zero -/* BC81E8 80240388 2402000F */ addiu $v0, $zero, 0xf -/* BC81EC 8024038C 10620069 */ beq $v1, $v0, .L80240534 -/* BC81F0 80240390 24020064 */ addiu $v0, $zero, 0x64 -/* BC81F4 80240394 10620079 */ beq $v1, $v0, .L8024057C -/* BC81F8 80240398 3C05FD05 */ lui $a1, 0xfd05 -/* BC81FC 8024039C 08090164 */ j .L80240590 -/* BC8200 802403A0 00000000 */ nop -.L802403A4: -/* BC8204 802403A4 3C05FD05 */ lui $a1, 0xfd05 -/* BC8208 802403A8 0C0B1EAF */ jal get_variable -/* BC820C 802403AC 34A50F81 */ ori $a1, $a1, 0xf81 -/* BC8210 802403B0 14520077 */ bne $v0, $s2, .L80240590 -/* BC8214 802403B4 00000000 */ nop -/* BC8218 802403B8 AE620000 */ sw $v0, ($s3) -/* BC821C 802403BC 08090163 */ j .L8024058C -/* BC8220 802403C0 2402000A */ addiu $v0, $zero, 0xa -.L802403C4: -/* BC8224 802403C4 C600000C */ lwc1 $f0, 0xc($s0) -/* BC8228 802403C8 3C014000 */ lui $at, 0x4000 -/* BC822C 802403CC 44816000 */ mtc1 $at, $f12 -/* BC8230 802403D0 0C00A6C9 */ jal clamp_angle -/* BC8234 802403D4 460C0300 */ add.s $f12, $f0, $f12 -/* BC8238 802403D8 9602008E */ lhu $v0, 0x8e($s0) -/* BC823C 802403DC E600000C */ swc1 $f0, 0xc($s0) -/* BC8240 802403E0 2442FFFF */ addiu $v0, $v0, -1 -/* BC8244 802403E4 A602008E */ sh $v0, 0x8e($s0) -/* BC8248 802403E8 00021400 */ sll $v0, $v0, 0x10 -/* BC824C 802403EC 14400068 */ bnez $v0, .L80240590 -/* BC8250 802403F0 2402000B */ addiu $v0, $zero, 0xb -/* BC8254 802403F4 08090164 */ j .L80240590 -/* BC8258 802403F8 AE220074 */ sw $v0, 0x74($s1) -.L802403FC: -/* BC825C 802403FC C602003C */ lwc1 $f2, 0x3c($s0) -/* BC8260 80240400 3C01C466 */ lui $at, 0xc466 -/* BC8264 80240404 44810000 */ mtc1 $at, $f0 -/* BC8268 80240408 00000000 */ nop -/* BC826C 8024040C 4600103E */ c.le.s $f2, $f0 -/* BC8270 80240410 00000000 */ nop -/* BC8274 80240414 45000003 */ bc1f .L80240424 -/* BC8278 80240418 00000000 */ nop -/* BC827C 8024041C 0C090066 */ jal func_80240198 -/* BC8280 80240420 00000000 */ nop -.L80240424: -/* BC8284 80240424 C600000C */ lwc1 $f0, 0xc($s0) -/* BC8288 80240428 3C014000 */ lui $at, 0x4000 -/* BC828C 8024042C 44816000 */ mtc1 $at, $f12 -/* BC8290 80240430 0C00A6C9 */ jal clamp_angle -/* BC8294 80240434 460C0300 */ add.s $f12, $f0, $f12 -/* BC8298 80240438 C604003C */ lwc1 $f4, 0x3c($s0) -/* BC829C 8024043C 3C013F00 */ lui $at, 0x3f00 -/* BC82A0 80240440 44811000 */ mtc1 $at, $f2 -/* BC82A4 80240444 00000000 */ nop -/* BC82A8 80240448 46022101 */ sub.s $f4, $f4, $f2 -/* BC82AC 8024044C 3C01C477 */ lui $at, 0xc477 -/* BC82B0 80240450 44811000 */ mtc1 $at, $f2 -/* BC82B4 80240454 E600000C */ swc1 $f0, 0xc($s0) -/* BC82B8 80240458 4602203E */ c.le.s $f4, $f2 -/* BC82BC 8024045C 00000000 */ nop -/* BC82C0 80240460 4500004B */ bc1f .L80240590 -/* BC82C4 80240464 E604003C */ swc1 $f4, 0x3c($s0) -/* BC82C8 80240468 0220202D */ daddu $a0, $s1, $zero -/* BC82CC 8024046C 3C05FD05 */ lui $a1, 0xfd05 -/* BC82D0 80240470 34A50F82 */ ori $a1, $a1, 0xf82 -/* BC82D4 80240474 0C0B2026 */ jal set_variable -/* BC82D8 80240478 24060001 */ addiu $a2, $zero, 1 -/* BC82DC 8024047C 0C09008B */ jal func_8024022C -/* BC82E0 80240480 00000000 */ nop -/* BC82E4 80240484 08090164 */ j .L80240590 -/* BC82E8 80240488 AE340074 */ sw $s4, 0x74($s1) -.L8024048C: -/* BC82EC 8024048C 0220202D */ daddu $a0, $s1, $zero -/* BC82F0 80240490 3C05FD05 */ lui $a1, 0xfd05 -/* BC82F4 80240494 0C0B1EAF */ jal get_variable -/* BC82F8 80240498 34A50F83 */ ori $a1, $a1, 0xf83 -/* BC82FC 8024049C 0C0900A8 */ jal func_802402A0 -/* BC8300 802404A0 0040202D */ daddu $a0, $v0, $zero -/* BC8304 802404A4 AE220074 */ sw $v0, 0x74($s1) -/* BC8308 802404A8 C600000C */ lwc1 $f0, 0xc($s0) -/* BC830C 802404AC 3C014000 */ lui $at, 0x4000 -/* BC8310 802404B0 44816000 */ mtc1 $at, $f12 -/* BC8314 802404B4 0809015B */ j .L8024056C -/* BC8318 802404B8 460C0300 */ add.s $f12, $f0, $f12 -.L802404BC: -/* BC831C 802404BC 3C05FD05 */ lui $a1, 0xfd05 -/* BC8320 802404C0 0C0B1EAF */ jal get_variable -/* BC8324 802404C4 34A50F83 */ ori $a1, $a1, 0xf83 -/* BC8328 802404C8 0C0900A8 */ jal func_802402A0 -/* BC832C 802404CC 0040202D */ daddu $a0, $v0, $zero -/* BC8330 802404D0 AE220074 */ sw $v0, 0x74($s1) -/* BC8334 802404D4 C600000C */ lwc1 $f0, 0xc($s0) -/* BC8338 802404D8 3C014000 */ lui $at, 0x4000 -/* BC833C 802404DC 44816000 */ mtc1 $at, $f12 -/* BC8340 802404E0 0809015B */ j .L8024056C -/* BC8344 802404E4 460C0301 */ sub.s $f12, $f0, $f12 -.L802404E8: -/* BC8348 802404E8 0220202D */ daddu $a0, $s1, $zero -/* BC834C 802404EC 3C05FD05 */ lui $a1, 0xfd05 -/* BC8350 802404F0 34A50F83 */ ori $a1, $a1, 0xf83 -/* BC8354 802404F4 0C0B2026 */ jal set_variable -/* BC8358 802404F8 0000302D */ daddu $a2, $zero, $zero -/* BC835C 802404FC 9602008E */ lhu $v0, 0x8e($s0) -/* BC8360 80240500 24030032 */ addiu $v1, $zero, 0x32 -/* BC8364 80240504 24420001 */ addiu $v0, $v0, 1 -/* BC8368 80240508 A602008E */ sh $v0, 0x8e($s0) -/* BC836C 8024050C 00021400 */ sll $v0, $v0, 0x10 -/* BC8370 80240510 00021403 */ sra $v0, $v0, 0x10 -/* BC8374 80240514 14430002 */ bne $v0, $v1, .L80240520 -/* BC8378 80240518 2402000F */ addiu $v0, $zero, 0xf -/* BC837C 8024051C AE220074 */ sw $v0, 0x74($s1) -.L80240520: -/* BC8380 80240520 C6000010 */ lwc1 $f0, 0x10($s0) -/* BC8384 80240524 3C014000 */ lui $at, 0x4000 -/* BC8388 80240528 44811000 */ mtc1 $at, $f2 -/* BC838C 8024052C 08090158 */ j .L80240560 -/* BC8390 80240530 46020001 */ sub.s $f0, $f0, $f2 -.L80240534: -/* BC8394 80240534 9602008E */ lhu $v0, 0x8e($s0) -/* BC8398 80240538 2442FFFF */ addiu $v0, $v0, -1 -/* BC839C 8024053C A602008E */ sh $v0, 0x8e($s0) -/* BC83A0 80240540 00021400 */ sll $v0, $v0, 0x10 -/* BC83A4 80240544 50400001 */ beql $v0, $zero, .L8024054C -/* BC83A8 80240548 AE340074 */ sw $s4, 0x74($s1) -.L8024054C: -/* BC83AC 8024054C C6000010 */ lwc1 $f0, 0x10($s0) -/* BC83B0 80240550 3C014000 */ lui $at, 0x4000 -/* BC83B4 80240554 44811000 */ mtc1 $at, $f2 -/* BC83B8 80240558 00000000 */ nop -/* BC83BC 8024055C 46020000 */ add.s $f0, $f0, $f2 -.L80240560: -/* BC83C0 80240560 C60C000C */ lwc1 $f12, 0xc($s0) -/* BC83C4 80240564 46026300 */ add.s $f12, $f12, $f2 -/* BC83C8 80240568 E6000010 */ swc1 $f0, 0x10($s0) -.L8024056C: -/* BC83CC 8024056C 0C00A6C9 */ jal clamp_angle -/* BC83D0 80240570 00000000 */ nop -/* BC83D4 80240574 08090164 */ j .L80240590 -/* BC83D8 80240578 E600000C */ swc1 $f0, 0xc($s0) -.L8024057C: -/* BC83DC 8024057C 0C0B1EAF */ jal get_variable -/* BC83E0 80240580 34A50F83 */ ori $a1, $a1, 0xf83 -/* BC83E4 80240584 0C0900A8 */ jal func_802402A0 -/* BC83E8 80240588 0040202D */ daddu $a0, $v0, $zero -.L8024058C: -/* BC83EC 8024058C AE220074 */ sw $v0, 0x74($s1) -.L80240590: -/* BC83F0 80240590 8FBF0024 */ lw $ra, 0x24($sp) -/* BC83F4 80240594 8FB40020 */ lw $s4, 0x20($sp) -/* BC83F8 80240598 8FB3001C */ lw $s3, 0x1c($sp) -/* BC83FC 8024059C 8FB20018 */ lw $s2, 0x18($sp) -/* BC8400 802405A0 8FB10014 */ lw $s1, 0x14($sp) -/* BC8404 802405A4 8FB00010 */ lw $s0, 0x10($sp) -/* BC8408 802405A8 24020002 */ addiu $v0, $zero, 2 -/* BC840C 802405AC 03E00008 */ jr $ra -/* BC8410 802405B0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_obk/obk_04/func_802405B4_BC7E60.s b/asm/nonmatchings/world/area_obk/obk_04/func_802405B4_BC7E60.s deleted file mode 100644 index 6611b4015f..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/func_802405B4_BC7E60.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405B4_BC8414 -/* BC8414 802405B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC8418 802405B8 AFB10014 */ sw $s1, 0x14($sp) -/* BC841C 802405BC 0080882D */ daddu $s1, $a0, $zero -/* BC8420 802405C0 AFBF0018 */ sw $ra, 0x18($sp) -/* BC8424 802405C4 AFB00010 */ sw $s0, 0x10($sp) -/* BC8428 802405C8 0C00EABB */ jal get_npc_unsafe -/* BC842C 802405CC 8E24014C */ lw $a0, 0x14c($s1) -/* BC8430 802405D0 0000202D */ daddu $a0, $zero, $zero -/* BC8434 802405D4 0C00EABB */ jal get_npc_unsafe -/* BC8438 802405D8 0040802D */ daddu $s0, $v0, $zero -/* BC843C 802405DC AE020020 */ sw $v0, 0x20($s0) -/* BC8440 802405E0 8E23014C */ lw $v1, 0x14c($s1) -/* BC8444 802405E4 00032040 */ sll $a0, $v1, 1 -/* BC8448 802405E8 00832021 */ addu $a0, $a0, $v1 -/* BC844C 802405EC 00041900 */ sll $v1, $a0, 4 -/* BC8450 802405F0 00641823 */ subu $v1, $v1, $a0 -/* BC8454 802405F4 AE230078 */ sw $v1, 0x78($s1) -/* BC8458 802405F8 8E030000 */ lw $v1, ($s0) -/* BC845C 802405FC 3C040004 */ lui $a0, 4 -/* BC8460 80240600 00641825 */ or $v1, $v1, $a0 -/* BC8464 80240604 AE030000 */ sw $v1, ($s0) -/* BC8468 80240608 AE200074 */ sw $zero, 0x74($s1) -/* BC846C 8024060C 8FBF0018 */ lw $ra, 0x18($sp) -/* BC8470 80240610 8FB10014 */ lw $s1, 0x14($sp) -/* BC8474 80240614 8FB00010 */ lw $s0, 0x10($sp) -/* BC8478 80240618 24020002 */ addiu $v0, $zero, 2 -/* BC847C 8024061C 03E00008 */ jr $ra -/* BC8480 80240620 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_04/func_80240624_BC7E60.s b/asm/nonmatchings/world/area_obk/obk_04/func_80240624_BC7E60.s deleted file mode 100644 index 79b72478b8..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/func_80240624_BC7E60.s +++ /dev/null @@ -1,199 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240624_BC8484 -/* BC8484 80240624 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* BC8488 80240628 AFB30024 */ sw $s3, 0x24($sp) -/* BC848C 8024062C 0080982D */ daddu $s3, $a0, $zero -/* BC8490 80240630 AFBF002C */ sw $ra, 0x2c($sp) -/* BC8494 80240634 AFB40028 */ sw $s4, 0x28($sp) -/* BC8498 80240638 AFB20020 */ sw $s2, 0x20($sp) -/* BC849C 8024063C AFB1001C */ sw $s1, 0x1c($sp) -/* BC84A0 80240640 AFB00018 */ sw $s0, 0x18($sp) -/* BC84A4 80240644 F7B40030 */ sdc1 $f20, 0x30($sp) -/* BC84A8 80240648 8E64014C */ lw $a0, 0x14c($s3) -/* BC84AC 8024064C 0C00EABB */ jal get_npc_unsafe -/* BC84B0 80240650 24140002 */ addiu $s4, $zero, 2 -/* BC84B4 80240654 0040802D */ daddu $s0, $v0, $zero -/* BC84B8 80240658 8E110020 */ lw $s1, 0x20($s0) -/* BC84BC 8024065C 8E630074 */ lw $v1, 0x74($s3) -/* BC84C0 80240660 8E320020 */ lw $s2, 0x20($s1) -/* BC84C4 80240664 1074003E */ beq $v1, $s4, .L80240760 -/* BC84C8 80240668 28620003 */ slti $v0, $v1, 3 -/* BC84CC 8024066C 10400007 */ beqz $v0, .L8024068C -/* BC84D0 80240670 2862000C */ slti $v0, $v1, 0xc -/* BC84D4 80240674 1060000D */ beqz $v1, .L802406AC -/* BC84D8 80240678 24020001 */ addiu $v0, $zero, 1 -/* BC84DC 8024067C 1062001B */ beq $v1, $v0, .L802406EC -/* BC84E0 80240680 00000000 */ nop -/* BC84E4 80240684 0809023A */ j .L802408E8 -/* BC84E8 80240688 00000000 */ nop -.L8024068C: -/* BC84EC 8024068C 14400096 */ bnez $v0, .L802408E8 -/* BC84F0 80240690 2862000F */ slti $v0, $v1, 0xf -/* BC84F4 80240694 14400071 */ bnez $v0, .L8024085C -/* BC84F8 80240698 24020064 */ addiu $v0, $zero, 0x64 -/* BC84FC 8024069C 1062008C */ beq $v1, $v0, .L802408D0 -/* BC8500 802406A0 0260202D */ daddu $a0, $s3, $zero -/* BC8504 802406A4 0809023A */ j .L802408E8 -/* BC8508 802406A8 00000000 */ nop -.L802406AC: -/* BC850C 802406AC C620000C */ lwc1 $f0, 0xc($s1) -/* BC8510 802406B0 C66C0078 */ lwc1 $f12, 0x78($s3) -/* BC8514 802406B4 46806320 */ cvt.s.w $f12, $f12 -/* BC8518 802406B8 0C00A6C9 */ jal clamp_angle -/* BC851C 802406BC 46006300 */ add.s $f12, $f12, $f0 -/* BC8520 802406C0 E600000C */ swc1 $f0, 0xc($s0) -/* BC8524 802406C4 8E430000 */ lw $v1, ($s2) -/* BC8528 802406C8 24020001 */ addiu $v0, $zero, 1 -/* BC852C 802406CC 14620086 */ bne $v1, $v0, .L802408E8 -/* BC8530 802406D0 00000000 */ nop -/* BC8534 802406D4 24040014 */ addiu $a0, $zero, 0x14 -/* BC8538 802406D8 0C00A67F */ jal rand_int -/* BC853C 802406DC AE630074 */ sw $v1, 0x74($s3) -/* BC8540 802406E0 2442000A */ addiu $v0, $v0, 0xa -/* BC8544 802406E4 0809023A */ j .L802408E8 -/* BC8548 802406E8 A602008E */ sh $v0, 0x8e($s0) -.L802406EC: -/* BC854C 802406EC C620000C */ lwc1 $f0, 0xc($s1) -/* BC8550 802406F0 C66C0078 */ lwc1 $f12, 0x78($s3) -/* BC8554 802406F4 46806320 */ cvt.s.w $f12, $f12 -/* BC8558 802406F8 0C00A6C9 */ jal clamp_angle -/* BC855C 802406FC 46006300 */ add.s $f12, $f12, $f0 -/* BC8560 80240700 9602008E */ lhu $v0, 0x8e($s0) -/* BC8564 80240704 E600000C */ swc1 $f0, 0xc($s0) -/* BC8568 80240708 2442FFFF */ addiu $v0, $v0, -1 -/* BC856C 8024070C A602008E */ sh $v0, 0x8e($s0) -/* BC8570 80240710 00021400 */ sll $v0, $v0, 0x10 -/* BC8574 80240714 14400074 */ bnez $v0, .L802408E8 -/* BC8578 80240718 00000000 */ nop -/* BC857C 8024071C 3C04B000 */ lui $a0, 0xb000 -/* BC8580 80240720 C6000040 */ lwc1 $f0, 0x40($s0) -/* BC8584 80240724 3484000F */ ori $a0, $a0, 0xf -/* BC8588 80240728 E7A00010 */ swc1 $f0, 0x10($sp) -/* BC858C 8024072C 8E060038 */ lw $a2, 0x38($s0) -/* BC8590 80240730 8E07003C */ lw $a3, 0x3c($s0) -/* BC8594 80240734 0C052757 */ jal play_sound_at_position -/* BC8598 80240738 0000282D */ daddu $a1, $zero, $zero -/* BC859C 8024073C AE740074 */ sw $s4, 0x74($s3) -/* BC85A0 80240740 C6000038 */ lwc1 $f0, 0x38($s0) -/* BC85A4 80240744 C602003C */ lwc1 $f2, 0x3c($s0) -/* BC85A8 80240748 C6040040 */ lwc1 $f4, 0x40($s0) -/* BC85AC 8024074C A600008E */ sh $zero, 0x8e($s0) -/* BC85B0 80240750 E6000060 */ swc1 $f0, 0x60($s0) -/* BC85B4 80240754 E6020064 */ swc1 $f2, 0x64($s0) -/* BC85B8 80240758 0809023A */ j .L802408E8 -/* BC85BC 8024075C E6040068 */ swc1 $f4, 0x68($s0) -.L80240760: -/* BC85C0 80240760 C620000C */ lwc1 $f0, 0xc($s1) -/* BC85C4 80240764 C66C0078 */ lwc1 $f12, 0x78($s3) -/* BC85C8 80240768 46806320 */ cvt.s.w $f12, $f12 -/* BC85CC 8024076C 0C00A6C9 */ jal clamp_angle -/* BC85D0 80240770 46006300 */ add.s $f12, $f12, $f0 -/* BC85D4 80240774 46000506 */ mov.s $f20, $f0 -/* BC85D8 80240778 4406A000 */ mfc1 $a2, $f20 -/* BC85DC 8024077C 00000000 */ nop -/* BC85E0 80240780 AE06000C */ sw $a2, 0xc($s0) -/* BC85E4 80240784 C6200038 */ lwc1 $f0, 0x38($s1) -/* BC85E8 80240788 E6000038 */ swc1 $f0, 0x38($s0) -/* BC85EC 8024078C C6200040 */ lwc1 $f0, 0x40($s1) -/* BC85F0 80240790 E6000040 */ swc1 $f0, 0x40($s0) -/* BC85F4 80240794 8E250010 */ lw $a1, 0x10($s1) -/* BC85F8 80240798 0C00EA95 */ jal npc_move_heading -/* BC85FC 8024079C 0200202D */ daddu $a0, $s0, $zero -/* BC8600 802407A0 8602008E */ lh $v0, 0x8e($s0) -/* BC8604 802407A4 3C014220 */ lui $at, 0x4220 -/* BC8608 802407A8 44810000 */ mtc1 $at, $f0 -/* BC860C 802407AC 44822000 */ mtc1 $v0, $f4 -/* BC8610 802407B0 00000000 */ nop -/* BC8614 802407B4 46802120 */ cvt.s.w $f4, $f4 -/* BC8618 802407B8 46040101 */ sub.s $f4, $f0, $f4 -/* BC861C 802407BC 46002103 */ div.s $f4, $f4, $f0 -/* BC8620 802407C0 46042282 */ mul.s $f10, $f4, $f4 -/* BC8624 802407C4 00000000 */ nop -/* BC8628 802407C8 46045102 */ mul.s $f4, $f10, $f4 -/* BC862C 802407CC 00000000 */ nop -/* BC8630 802407D0 C60E0038 */ lwc1 $f14, 0x38($s0) -/* BC8634 802407D4 C6080060 */ lwc1 $f8, 0x60($s0) -/* BC8638 802407D8 46087201 */ sub.s $f8, $f14, $f8 -/* BC863C 802407DC 460A4202 */ mul.s $f8, $f8, $f10 -/* BC8640 802407E0 00000000 */ nop -/* BC8644 802407E4 C60C0040 */ lwc1 $f12, 0x40($s0) -/* BC8648 802407E8 C6060068 */ lwc1 $f6, 0x68($s0) -/* BC864C 802407EC 46066181 */ sub.s $f6, $f12, $f6 -/* BC8650 802407F0 460A3182 */ mul.s $f6, $f6, $f10 -/* BC8654 802407F4 00000000 */ nop -/* BC8658 802407F8 C622003C */ lwc1 $f2, 0x3c($s1) -/* BC865C 802407FC 3C01447A */ lui $at, 0x447a -/* BC8660 80240800 44810000 */ mtc1 $at, $f0 -/* BC8664 80240804 00000000 */ nop -/* BC8668 80240808 46001080 */ add.s $f2, $f2, $f0 -/* BC866C 8024080C C6000064 */ lwc1 $f0, 0x64($s0) -/* BC8670 80240810 46001001 */ sub.s $f0, $f2, $f0 -/* BC8674 80240814 46040002 */ mul.s $f0, $f0, $f4 -/* BC8678 80240818 00000000 */ nop -/* BC867C 8024081C 9602008E */ lhu $v0, 0x8e($s0) -/* BC8680 80240820 24030028 */ addiu $v1, $zero, 0x28 -/* BC8684 80240824 24420001 */ addiu $v0, $v0, 1 -/* BC8688 80240828 46087381 */ sub.s $f14, $f14, $f8 -/* BC868C 8024082C A602008E */ sh $v0, 0x8e($s0) -/* BC8690 80240830 00021400 */ sll $v0, $v0, 0x10 -/* BC8694 80240834 46066301 */ sub.s $f12, $f12, $f6 -/* BC8698 80240838 00021403 */ sra $v0, $v0, 0x10 -/* BC869C 8024083C E602003C */ swc1 $f2, 0x3c($s0) -/* BC86A0 80240840 46001081 */ sub.s $f2, $f2, $f0 -/* BC86A4 80240844 E60E0038 */ swc1 $f14, 0x38($s0) -/* BC86A8 80240848 E60C0040 */ swc1 $f12, 0x40($s0) -/* BC86AC 8024084C 14430026 */ bne $v0, $v1, .L802408E8 -/* BC86B0 80240850 E602003C */ swc1 $f2, 0x3c($s0) -/* BC86B4 80240854 08090239 */ j .L802408E4 -/* BC86B8 80240858 2402000C */ addiu $v0, $zero, 0xc -.L8024085C: -/* BC86BC 8024085C C620000C */ lwc1 $f0, 0xc($s1) -/* BC86C0 80240860 C66C0078 */ lwc1 $f12, 0x78($s3) -/* BC86C4 80240864 46806320 */ cvt.s.w $f12, $f12 -/* BC86C8 80240868 0C00A6C9 */ jal clamp_angle -/* BC86CC 8024086C 46006300 */ add.s $f12, $f12, $f0 -/* BC86D0 80240870 46000506 */ mov.s $f20, $f0 -/* BC86D4 80240874 0260202D */ daddu $a0, $s3, $zero -/* BC86D8 80240878 3C05FD05 */ lui $a1, 0xfd05 -/* BC86DC 8024087C 34A50F83 */ ori $a1, $a1, 0xf83 -/* BC86E0 80240880 0C0B1EAF */ jal get_variable -/* BC86E4 80240884 E614000C */ swc1 $f20, 0xc($s0) -/* BC86E8 80240888 0C0900A8 */ jal func_802402A0 -/* BC86EC 8024088C 0040202D */ daddu $a0, $v0, $zero -/* BC86F0 80240890 AE620074 */ sw $v0, 0x74($s3) -/* BC86F4 80240894 C6200038 */ lwc1 $f0, 0x38($s1) -/* BC86F8 80240898 4406A000 */ mfc1 $a2, $f20 -/* BC86FC 8024089C E6000038 */ swc1 $f0, 0x38($s0) -/* BC8700 802408A0 C6200040 */ lwc1 $f0, 0x40($s1) -/* BC8704 802408A4 E6000040 */ swc1 $f0, 0x40($s0) -/* BC8708 802408A8 8E250010 */ lw $a1, 0x10($s1) -/* BC870C 802408AC 0C00EA95 */ jal npc_move_heading -/* BC8710 802408B0 0200202D */ daddu $a0, $s0, $zero -/* BC8714 802408B4 C620003C */ lwc1 $f0, 0x3c($s1) -/* BC8718 802408B8 3C01447A */ lui $at, 0x447a -/* BC871C 802408BC 44811000 */ mtc1 $at, $f2 -/* BC8720 802408C0 00000000 */ nop -/* BC8724 802408C4 46020000 */ add.s $f0, $f0, $f2 -/* BC8728 802408C8 0809023A */ j .L802408E8 -/* BC872C 802408CC E600003C */ swc1 $f0, 0x3c($s0) -.L802408D0: -/* BC8730 802408D0 3C05FD05 */ lui $a1, 0xfd05 -/* BC8734 802408D4 0C0B1EAF */ jal get_variable -/* BC8738 802408D8 34A50F83 */ ori $a1, $a1, 0xf83 -/* BC873C 802408DC 0C0900A8 */ jal func_802402A0 -/* BC8740 802408E0 0040202D */ daddu $a0, $v0, $zero -.L802408E4: -/* BC8744 802408E4 AE620074 */ sw $v0, 0x74($s3) -.L802408E8: -/* BC8748 802408E8 8FBF002C */ lw $ra, 0x2c($sp) -/* BC874C 802408EC 8FB40028 */ lw $s4, 0x28($sp) -/* BC8750 802408F0 8FB30024 */ lw $s3, 0x24($sp) -/* BC8754 802408F4 8FB20020 */ lw $s2, 0x20($sp) -/* BC8758 802408F8 8FB1001C */ lw $s1, 0x1c($sp) -/* BC875C 802408FC 8FB00018 */ lw $s0, 0x18($sp) -/* BC8760 80240900 D7B40030 */ ldc1 $f20, 0x30($sp) -/* BC8764 80240904 24020002 */ addiu $v0, $zero, 2 -/* BC8768 80240908 03E00008 */ jr $ra -/* BC876C 8024090C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_obk/obk_04/func_80240910_BC7E60.s b/asm/nonmatchings/world/area_obk/obk_04/func_80240910_BC7E60.s deleted file mode 100644 index c56bc5c8e8..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/func_80240910_BC7E60.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240910_BC8770 -/* BC8770 80240910 3C018011 */ lui $at, 0x8011 -/* BC8774 80240914 C422EFF4 */ lwc1 $f2, -0x100c($at) -/* BC8778 80240918 3C01C248 */ lui $at, 0xc248 -/* BC877C 8024091C 44810000 */ mtc1 $at, $f0 -/* BC8780 80240920 00000000 */ nop -/* BC8784 80240924 4600103C */ c.lt.s $f2, $f0 -/* BC8788 80240928 00000000 */ nop -/* BC878C 8024092C 45010002 */ bc1t .L80240938 -/* BC8790 80240930 24020002 */ addiu $v0, $zero, 2 -/* BC8794 80240934 0000102D */ daddu $v0, $zero, $zero -.L80240938: -/* BC8798 80240938 03E00008 */ jr $ra -/* BC879C 8024093C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_04/func_80240940_BC7E60.s b/asm/nonmatchings/world/area_obk/obk_04/func_80240940_BC7E60.s deleted file mode 100644 index 7ad09025c8..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/func_80240940_BC7E60.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240940_BC87A0 -/* BC87A0 80240940 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC87A4 80240944 AFB00010 */ sw $s0, 0x10($sp) -/* BC87A8 80240948 3C108024 */ lui $s0, 0x8024 -/* BC87AC 8024094C 26103A10 */ addiu $s0, $s0, 0x3a10 -/* BC87B0 80240950 AFBF0018 */ sw $ra, 0x18($sp) -/* BC87B4 80240954 AFB10014 */ sw $s1, 0x14($sp) -/* BC87B8 80240958 8E020000 */ lw $v0, ($s0) -/* BC87BC 8024095C 14400010 */ bnez $v0, .L802409A0 -/* BC87C0 80240960 0080882D */ daddu $s1, $a0, $zero -/* BC87C4 80240964 0C00AB39 */ jal heap_malloc -/* BC87C8 80240968 24040040 */ addiu $a0, $zero, 0x40 -/* BC87CC 8024096C AE020000 */ sw $v0, ($s0) -/* BC87D0 80240970 0000182D */ daddu $v1, $zero, $zero -/* BC87D4 80240974 0040282D */ daddu $a1, $v0, $zero -/* BC87D8 80240978 0220202D */ daddu $a0, $s1, $zero -.L8024097C: -/* BC87DC 8024097C 8C820084 */ lw $v0, 0x84($a0) -/* BC87E0 80240980 24840004 */ addiu $a0, $a0, 4 -/* BC87E4 80240984 24630001 */ addiu $v1, $v1, 1 -/* BC87E8 80240988 ACA20000 */ sw $v0, ($a1) -/* BC87EC 8024098C 28620010 */ slti $v0, $v1, 0x10 -/* BC87F0 80240990 1440FFFA */ bnez $v0, .L8024097C -/* BC87F4 80240994 24A50004 */ addiu $a1, $a1, 4 -/* BC87F8 80240998 08090277 */ j .L802409DC -/* BC87FC 8024099C 00000000 */ nop -.L802409A0: -/* BC8800 802409A0 0000182D */ daddu $v1, $zero, $zero -/* BC8804 802409A4 0040282D */ daddu $a1, $v0, $zero -/* BC8808 802409A8 0220202D */ daddu $a0, $s1, $zero -.L802409AC: -/* BC880C 802409AC 8CA20000 */ lw $v0, ($a1) -/* BC8810 802409B0 24A50004 */ addiu $a1, $a1, 4 -/* BC8814 802409B4 24630001 */ addiu $v1, $v1, 1 -/* BC8818 802409B8 AC820084 */ sw $v0, 0x84($a0) -/* BC881C 802409BC 28620010 */ slti $v0, $v1, 0x10 -/* BC8820 802409C0 1440FFFA */ bnez $v0, .L802409AC -/* BC8824 802409C4 24840004 */ addiu $a0, $a0, 4 -/* BC8828 802409C8 3C108024 */ lui $s0, 0x8024 -/* BC882C 802409CC 26103A10 */ addiu $s0, $s0, 0x3a10 -/* BC8830 802409D0 0C00AB4B */ jal heap_free -/* BC8834 802409D4 8E040000 */ lw $a0, ($s0) -/* BC8838 802409D8 AE000000 */ sw $zero, ($s0) -.L802409DC: -/* BC883C 802409DC 8FBF0018 */ lw $ra, 0x18($sp) -/* BC8840 802409E0 8FB10014 */ lw $s1, 0x14($sp) -/* BC8844 802409E4 8FB00010 */ lw $s0, 0x10($sp) -/* BC8848 802409E8 24020002 */ addiu $v0, $zero, 2 -/* BC884C 802409EC 03E00008 */ jr $ra -/* BC8850 802409F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_04/func_802409F4_BC7E60.s b/asm/nonmatchings/world/area_obk/obk_04/func_802409F4_BC7E60.s deleted file mode 100644 index c30a018847..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/func_802409F4_BC7E60.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409F4_BC8854 -/* BC8854 802409F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC8858 802409F8 AFB00010 */ sw $s0, 0x10($sp) -/* BC885C 802409FC 0080802D */ daddu $s0, $a0, $zero -/* BC8860 80240A00 AFBF0018 */ sw $ra, 0x18($sp) -/* BC8864 80240A04 AFB10014 */ sw $s1, 0x14($sp) -/* BC8868 80240A08 8E02000C */ lw $v0, 0xc($s0) -/* BC886C 80240A0C 8C510000 */ lw $s1, ($v0) -/* BC8870 80240A10 0C0B1EAF */ jal get_variable -/* BC8874 80240A14 0220282D */ daddu $a1, $s1, $zero -/* BC8878 80240A18 3C03FFF0 */ lui $v1, 0xfff0 -/* BC887C 80240A1C 3463FFFF */ ori $v1, $v1, 0xffff -/* BC8880 80240A20 0200202D */ daddu $a0, $s0, $zero -/* BC8884 80240A24 00431024 */ and $v0, $v0, $v1 -/* BC8888 80240A28 00021140 */ sll $v0, $v0, 5 -/* BC888C 80240A2C 3C068008 */ lui $a2, %hi(gItemTable) -/* BC8890 80240A30 00C23021 */ addu $a2, $a2, $v0 -/* BC8894 80240A34 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* BC8898 80240A38 0C0B2026 */ jal set_variable -/* BC889C 80240A3C 0220282D */ daddu $a1, $s1, $zero -/* BC88A0 80240A40 8FBF0018 */ lw $ra, 0x18($sp) -/* BC88A4 80240A44 8FB10014 */ lw $s1, 0x14($sp) -/* BC88A8 80240A48 8FB00010 */ lw $s0, 0x10($sp) -/* BC88AC 80240A4C 24020002 */ addiu $v0, $zero, 2 -/* BC88B0 80240A50 03E00008 */ jr $ra -/* BC88B4 80240A54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_04/func_80240C10_BC7E60.s b/asm/nonmatchings/world/area_obk/obk_04/func_80240C10_BC7E60.s deleted file mode 100644 index 467432281d..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/func_80240C10_BC7E60.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C10_BC8A70 -/* BC8A70 80240C10 3C0142FA */ lui $at, 0x42fa -/* BC8A74 80240C14 44810000 */ mtc1 $at, $f0 -/* BC8A78 80240C18 27BDFCA8 */ addiu $sp, $sp, -0x358 -/* BC8A7C 80240C1C AFB00350 */ sw $s0, 0x350($sp) -/* BC8A80 80240C20 0080802D */ daddu $s0, $a0, $zero -/* BC8A84 80240C24 AFBF0354 */ sw $ra, 0x354($sp) -/* BC8A88 80240C28 AFA00048 */ sw $zero, 0x48($sp) -/* BC8A8C 80240C2C AFA0004C */ sw $zero, 0x4c($sp) -/* BC8A90 80240C30 AFA00050 */ sw $zero, 0x50($sp) -/* BC8A94 80240C34 E7A00020 */ swc1 $f0, 0x20($sp) -/* BC8A98 80240C38 C6040084 */ lwc1 $f4, 0x84($s0) -/* BC8A9C 80240C3C 46802120 */ cvt.s.w $f4, $f4 -/* BC8AA0 80240C40 44050000 */ mfc1 $a1, $f0 -/* BC8AA4 80240C44 44062000 */ mfc1 $a2, $f4 -/* BC8AA8 80240C48 0C00EA95 */ jal npc_move_heading -/* BC8AAC 80240C4C 27A40010 */ addiu $a0, $sp, 0x10 -/* BC8AB0 80240C50 C7A00048 */ lwc1 $f0, 0x48($sp) -/* BC8AB4 80240C54 3C014120 */ lui $at, 0x4120 -/* BC8AB8 80240C58 44811000 */ mtc1 $at, $f2 -/* BC8ABC 80240C5C 4600010D */ trunc.w.s $f4, $f0 -/* BC8AC0 80240C60 E6040084 */ swc1 $f4, 0x84($s0) -/* BC8AC4 80240C64 C7A0004C */ lwc1 $f0, 0x4c($sp) -/* BC8AC8 80240C68 46020000 */ add.s $f0, $f0, $f2 -/* BC8ACC 80240C6C 3C0141A0 */ lui $at, 0x41a0 -/* BC8AD0 80240C70 44811000 */ mtc1 $at, $f2 -/* BC8AD4 80240C74 4600010D */ trunc.w.s $f4, $f0 -/* BC8AD8 80240C78 E6040088 */ swc1 $f4, 0x88($s0) -/* BC8ADC 80240C7C C7A00050 */ lwc1 $f0, 0x50($sp) -/* BC8AE0 80240C80 46020000 */ add.s $f0, $f0, $f2 -/* BC8AE4 80240C84 4600010D */ trunc.w.s $f4, $f0 -/* BC8AE8 80240C88 E604008C */ swc1 $f4, 0x8c($s0) -/* BC8AEC 80240C8C 8FBF0354 */ lw $ra, 0x354($sp) -/* BC8AF0 80240C90 8FB00350 */ lw $s0, 0x350($sp) -/* BC8AF4 80240C94 24020002 */ addiu $v0, $zero, 2 -/* BC8AF8 80240C98 03E00008 */ jr $ra -/* BC8AFC 80240C9C 27BD0358 */ addiu $sp, $sp, 0x358 diff --git a/asm/nonmatchings/world/area_obk/obk_04/func_80240D14_BC7E60.s b/asm/nonmatchings/world/area_obk/obk_04/func_80240D14_BC7E60.s deleted file mode 100644 index 0af03a642a..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/func_80240D14_BC7E60.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D14_BC8B74 -/* BC8B74 80240D14 27BDFC98 */ addiu $sp, $sp, -0x368 -/* BC8B78 80240D18 AFB20358 */ sw $s2, 0x358($sp) -/* BC8B7C 80240D1C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* BC8B80 80240D20 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* BC8B84 80240D24 AFBF035C */ sw $ra, 0x35c($sp) -/* BC8B88 80240D28 AFB10354 */ sw $s1, 0x354($sp) -/* BC8B8C 80240D2C AFB00350 */ sw $s0, 0x350($sp) -/* BC8B90 80240D30 F7B40360 */ sdc1 $f20, 0x360($sp) -/* BC8B94 80240D34 C64C0028 */ lwc1 $f12, 0x28($s2) -/* BC8B98 80240D38 4480A000 */ mtc1 $zero, $f20 -/* BC8B9C 80240D3C C64E0030 */ lwc1 $f14, 0x30($s2) -/* BC8BA0 80240D40 4406A000 */ mfc1 $a2, $f20 -/* BC8BA4 80240D44 4407A000 */ mfc1 $a3, $f20 -/* BC8BA8 80240D48 0C00A7B5 */ jal dist2D -/* BC8BAC 80240D4C 0080802D */ daddu $s0, $a0, $zero -/* BC8BB0 80240D50 24020001 */ addiu $v0, $zero, 1 -/* BC8BB4 80240D54 46000106 */ mov.s $f4, $f0 -/* BC8BB8 80240D58 3C0142B4 */ lui $at, 0x42b4 -/* BC8BBC 80240D5C 44811000 */ mtc1 $at, $f2 -/* BC8BC0 80240D60 00000000 */ nop -/* BC8BC4 80240D64 4604103C */ c.lt.s $f2, $f4 -/* BC8BC8 80240D68 00000000 */ nop -/* BC8BCC 80240D6C 45010002 */ bc1t .L80240D78 -/* BC8BD0 80240D70 0240882D */ daddu $s1, $s2, $zero -/* BC8BD4 80240D74 0000102D */ daddu $v0, $zero, $zero -.L80240D78: -/* BC8BD8 80240D78 3C014316 */ lui $at, 0x4316 -/* BC8BDC 80240D7C 44810000 */ mtc1 $at, $f0 -/* BC8BE0 80240D80 00000000 */ nop -/* BC8BE4 80240D84 4600203C */ c.lt.s $f4, $f0 -/* BC8BE8 80240D88 00000000 */ nop -/* BC8BEC 80240D8C 45010002 */ bc1t .L80240D98 -/* BC8BF0 80240D90 24030001 */ addiu $v1, $zero, 1 -/* BC8BF4 80240D94 0000182D */ daddu $v1, $zero, $zero -.L80240D98: -/* BC8BF8 80240D98 00431025 */ or $v0, $v0, $v1 -/* BC8BFC 80240D9C 1040001C */ beqz $v0, .L80240E10 -/* BC8C00 80240DA0 00000000 */ nop -/* BC8C04 80240DA4 C64C0028 */ lwc1 $f12, 0x28($s2) -/* BC8C08 80240DA8 C64E0030 */ lwc1 $f14, 0x30($s2) -/* BC8C0C 80240DAC 4406A000 */ mfc1 $a2, $f20 -/* BC8C10 80240DB0 4407A000 */ mfc1 $a3, $f20 -/* BC8C14 80240DB4 0C00A720 */ jal atan2 -/* BC8C18 80240DB8 00000000 */ nop -/* BC8C1C 80240DBC 3C014334 */ lui $at, 0x4334 -/* BC8C20 80240DC0 44811000 */ mtc1 $at, $f2 -/* BC8C24 80240DC4 00000000 */ nop -/* BC8C28 80240DC8 46020000 */ add.s $f0, $f0, $f2 -/* BC8C2C 80240DCC 3C0542A0 */ lui $a1, 0x42a0 -/* BC8C30 80240DD0 44060000 */ mfc1 $a2, $f0 -/* BC8C34 80240DD4 27A40010 */ addiu $a0, $sp, 0x10 -/* BC8C38 80240DD8 E7B40048 */ swc1 $f20, 0x48($sp) -/* BC8C3C 80240DDC E7B4004C */ swc1 $f20, 0x4c($sp) -/* BC8C40 80240DE0 0C00EA95 */ jal npc_move_heading -/* BC8C44 80240DE4 E7B40050 */ swc1 $f20, 0x50($sp) -/* BC8C48 80240DE8 C7A00048 */ lwc1 $f0, 0x48($sp) -/* BC8C4C 80240DEC 4600018D */ trunc.w.s $f6, $f0 -/* BC8C50 80240DF0 E6060084 */ swc1 $f6, 0x84($s0) -/* BC8C54 80240DF4 C7A0004C */ lwc1 $f0, 0x4c($sp) -/* BC8C58 80240DF8 4600018D */ trunc.w.s $f6, $f0 -/* BC8C5C 80240DFC E6060088 */ swc1 $f6, 0x88($s0) -/* BC8C60 80240E00 C7A00050 */ lwc1 $f0, 0x50($sp) -/* BC8C64 80240E04 24020001 */ addiu $v0, $zero, 1 -/* BC8C68 80240E08 0809038C */ j .L80240E30 -/* BC8C6C 80240E0C AE020090 */ sw $v0, 0x90($s0) -.L80240E10: -/* BC8C70 80240E10 C6200028 */ lwc1 $f0, 0x28($s1) -/* BC8C74 80240E14 4600018D */ trunc.w.s $f6, $f0 -/* BC8C78 80240E18 E6060084 */ swc1 $f6, 0x84($s0) -/* BC8C7C 80240E1C C620002C */ lwc1 $f0, 0x2c($s1) -/* BC8C80 80240E20 4600018D */ trunc.w.s $f6, $f0 -/* BC8C84 80240E24 E6060088 */ swc1 $f6, 0x88($s0) -/* BC8C88 80240E28 C6200030 */ lwc1 $f0, 0x30($s1) -/* BC8C8C 80240E2C AE000090 */ sw $zero, 0x90($s0) -.L80240E30: -/* BC8C90 80240E30 4600018D */ trunc.w.s $f6, $f0 -/* BC8C94 80240E34 E606008C */ swc1 $f6, 0x8c($s0) -/* BC8C98 80240E38 8FBF035C */ lw $ra, 0x35c($sp) -/* BC8C9C 80240E3C 8FB20358 */ lw $s2, 0x358($sp) -/* BC8CA0 80240E40 8FB10354 */ lw $s1, 0x354($sp) -/* BC8CA4 80240E44 8FB00350 */ lw $s0, 0x350($sp) -/* BC8CA8 80240E48 D7B40360 */ ldc1 $f20, 0x360($sp) -/* BC8CAC 80240E4C 24020002 */ addiu $v0, $zero, 2 -/* BC8CB0 80240E50 03E00008 */ jr $ra -/* BC8CB4 80240E54 27BD0368 */ addiu $sp, $sp, 0x368 diff --git a/asm/nonmatchings/world/area_obk/obk_04/func_80240E58_BC7E60.s b/asm/nonmatchings/world/area_obk/obk_04/func_80240E58_BC7E60.s deleted file mode 100644 index ca88a558e1..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/func_80240E58_BC7E60.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E58_BC8CB8 -/* BC8CB8 80240E58 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BC8CBC 80240E5C AFBF0010 */ sw $ra, 0x10($sp) -/* BC8CC0 80240E60 0C00EABB */ jal get_npc_unsafe -/* BC8CC4 80240E64 24040001 */ addiu $a0, $zero, 1 -/* BC8CC8 80240E68 8442008E */ lh $v0, 0x8e($v0) -/* BC8CCC 80240E6C 8FBF0010 */ lw $ra, 0x10($sp) -/* BC8CD0 80240E70 2C420001 */ sltiu $v0, $v0, 1 -/* BC8CD4 80240E74 00021040 */ sll $v0, $v0, 1 -/* BC8CD8 80240E78 03E00008 */ jr $ra -/* BC8CDC 80240E7C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_05/func_8024001C_BCD060.s b/asm/nonmatchings/world/area_obk/obk_05/func_8024001C_BCD060.s deleted file mode 100644 index 49fe2f9e41..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_05/func_8024001C_BCD060.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_BCD07C -/* BCD07C 8024001C 3C03800B */ lui $v1, %hi(gCameras) -/* BCD080 80240020 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* BCD084 80240024 94620002 */ lhu $v0, 2($v1) -/* BCD088 80240028 34420001 */ ori $v0, $v0, 1 -/* BCD08C 8024002C A4620002 */ sh $v0, 2($v1) -/* BCD090 80240030 03E00008 */ jr $ra -/* BCD094 80240034 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_obk/obk_05/func_80240038_BCD060.s b/asm/nonmatchings/world/area_obk/obk_05/func_80240038_BCD060.s deleted file mode 100644 index 3a8bc9cc61..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_05/func_80240038_BCD060.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240038_BCD098 -/* BCD098 80240038 3C028016 */ lui $v0, 0x8016 -/* BCD09C 8024003C 8442A552 */ lh $v0, -0x5aae($v0) -/* BCD0A0 80240040 38420014 */ xori $v0, $v0, 0x14 -/* BCD0A4 80240044 2C420001 */ sltiu $v0, $v0, 1 -/* BCD0A8 80240048 03E00008 */ jr $ra -/* BCD0AC 8024004C 00021040 */ sll $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_obk/obk_05/func_80240050_BCD060.s b/asm/nonmatchings/world/area_obk/obk_05/func_80240050_BCD060.s deleted file mode 100644 index 8b6a94c0f2..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_05/func_80240050_BCD060.s +++ /dev/null @@ -1,487 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_BCD0B0 -/* BCD0B0 80240050 27BDFF70 */ addiu $sp, $sp, -0x90 -/* BCD0B4 80240054 AFB20070 */ sw $s2, 0x70($sp) -/* BCD0B8 80240058 AFB30074 */ sw $s3, 0x74($sp) -/* BCD0BC 8024005C 3C138011 */ lui $s3, %hi(gPlayerStatus) -/* BCD0C0 80240060 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) -/* BCD0C4 80240064 AFB00068 */ sw $s0, 0x68($sp) -/* BCD0C8 80240068 3C108016 */ lui $s0, 0x8016 -/* BCD0CC 8024006C 2610A550 */ addiu $s0, $s0, -0x5ab0 -/* BCD0D0 80240070 AFBF0078 */ sw $ra, 0x78($sp) -/* BCD0D4 80240074 AFB1006C */ sw $s1, 0x6c($sp) -/* BCD0D8 80240078 F7B60088 */ sdc1 $f22, 0x88($sp) -/* BCD0DC 8024007C F7B40080 */ sdc1 $f20, 0x80($sp) -/* BCD0E0 80240080 10A00014 */ beqz $a1, .L802400D4 -/* BCD0E4 80240084 0080902D */ daddu $s2, $a0, $zero -/* BCD0E8 80240088 0C00AB39 */ jal heap_malloc -/* BCD0EC 8024008C 24040020 */ addiu $a0, $zero, 0x20 -/* BCD0F0 80240090 3C013DCC */ lui $at, 0x3dcc -/* BCD0F4 80240094 3421CCCD */ ori $at, $at, 0xcccd -/* BCD0F8 80240098 44810000 */ mtc1 $at, $f0 -/* BCD0FC 8024009C 3C014040 */ lui $at, 0x4040 -/* BCD100 802400A0 44811000 */ mtc1 $at, $f2 -/* BCD104 802400A4 0040882D */ daddu $s1, $v0, $zero -/* BCD108 802400A8 AE510074 */ sw $s1, 0x74($s2) -/* BCD10C 802400AC AE200000 */ sw $zero, ($s1) -/* BCD110 802400B0 AE20000C */ sw $zero, 0xc($s1) -/* BCD114 802400B4 AE200008 */ sw $zero, 8($s1) -/* BCD118 802400B8 AE200010 */ sw $zero, 0x10($s1) -/* BCD11C 802400BC AE200014 */ sw $zero, 0x14($s1) -/* BCD120 802400C0 E6200004 */ swc1 $f0, 4($s1) -/* BCD124 802400C4 E6220018 */ swc1 $f2, 0x18($s1) -/* BCD128 802400C8 AE400070 */ sw $zero, 0x70($s2) -/* BCD12C 802400CC AE400078 */ sw $zero, 0x78($s2) -/* BCD130 802400D0 AE40007C */ sw $zero, 0x7c($s2) -.L802400D4: -/* BCD134 802400D4 24040001 */ addiu $a0, $zero, 1 -/* BCD138 802400D8 8E430070 */ lw $v1, 0x70($s2) -/* BCD13C 802400DC 8E510074 */ lw $s1, 0x74($s2) -/* BCD140 802400E0 10640022 */ beq $v1, $a0, .L8024016C -/* BCD144 802400E4 28620002 */ slti $v0, $v1, 2 -/* BCD148 802400E8 50400005 */ beql $v0, $zero, .L80240100 -/* BCD14C 802400EC 24020002 */ addiu $v0, $zero, 2 -/* BCD150 802400F0 10600007 */ beqz $v1, .L80240110 -/* BCD154 802400F4 2402000A */ addiu $v0, $zero, 0xa -/* BCD158 802400F8 0809015C */ j .L80240570 -/* BCD15C 802400FC 00000000 */ nop -.L80240100: -/* BCD160 80240100 106200BF */ beq $v1, $v0, .L80240400 -/* BCD164 80240104 2402000A */ addiu $v0, $zero, 0xa -/* BCD168 80240108 0809015C */ j .L80240570 -/* BCD16C 8024010C 00000000 */ nop -.L80240110: -/* BCD170 80240110 86030002 */ lh $v1, 2($s0) -/* BCD174 80240114 50620001 */ beql $v1, $v0, .L8024011C -/* BCD178 80240118 AE440070 */ sw $a0, 0x70($s2) -.L8024011C: -/* BCD17C 8024011C 86030002 */ lh $v1, 2($s0) -/* BCD180 80240120 24020009 */ addiu $v0, $zero, 9 -/* BCD184 80240124 50620001 */ beql $v1, $v0, .L8024012C -/* BCD188 80240128 AE440070 */ sw $a0, 0x70($s2) -.L8024012C: -/* BCD18C 8024012C 3C013DCC */ lui $at, 0x3dcc -/* BCD190 80240130 3421CCCD */ ori $at, $at, 0xcccd -/* BCD194 80240134 44810000 */ mtc1 $at, $f0 -/* BCD198 80240138 3C014040 */ lui $at, 0x4040 -/* BCD19C 8024013C 44811000 */ mtc1 $at, $f2 -/* BCD1A0 80240140 3C0141A0 */ lui $at, 0x41a0 -/* BCD1A4 80240144 44812000 */ mtc1 $at, $f4 -/* BCD1A8 80240148 AE200000 */ sw $zero, ($s1) -/* BCD1AC 8024014C AE20000C */ sw $zero, 0xc($s1) -/* BCD1B0 80240150 AE200010 */ sw $zero, 0x10($s1) -/* BCD1B4 80240154 AE200014 */ sw $zero, 0x14($s1) -/* BCD1B8 80240158 AE200008 */ sw $zero, 8($s1) -/* BCD1BC 8024015C E6200004 */ swc1 $f0, 4($s1) -/* BCD1C0 80240160 E6220018 */ swc1 $f2, 0x18($s1) -/* BCD1C4 80240164 0809015C */ j .L80240570 -/* BCD1C8 80240168 E624001C */ swc1 $f4, 0x1c($s1) -.L8024016C: -/* BCD1CC 8024016C 86030002 */ lh $v1, 2($s0) -/* BCD1D0 80240170 2402000A */ addiu $v0, $zero, 0xa -/* BCD1D4 80240174 10620006 */ beq $v1, $v0, .L80240190 -/* BCD1D8 80240178 24020009 */ addiu $v0, $zero, 9 -/* BCD1DC 8024017C 10620004 */ beq $v1, $v0, .L80240190 -/* BCD1E0 80240180 24020078 */ addiu $v0, $zero, 0x78 -/* BCD1E4 80240184 AE42007C */ sw $v0, 0x7c($s2) -/* BCD1E8 80240188 24020002 */ addiu $v0, $zero, 2 -/* BCD1EC 8024018C AE420070 */ sw $v0, 0x70($s2) -.L80240190: -/* BCD1F0 80240190 C6200008 */ lwc1 $f0, 8($s1) -/* BCD1F4 80240194 3C0140A0 */ lui $at, 0x40a0 -/* BCD1F8 80240198 44811000 */ mtc1 $at, $f2 -/* BCD1FC 8024019C 46000005 */ abs.s $f0, $f0 -/* BCD200 802401A0 4602003C */ c.lt.s $f0, $f2 -/* BCD204 802401A4 00000000 */ nop -/* BCD208 802401A8 4500000D */ bc1f .L802401E0 -/* BCD20C 802401AC 00000000 */ nop -/* BCD210 802401B0 C6600028 */ lwc1 $f0, 0x28($s3) -/* BCD214 802401B4 44801000 */ mtc1 $zero, $f2 -/* BCD218 802401B8 44801800 */ mtc1 $zero, $f3 -/* BCD21C 802401BC 46000021 */ cvt.d.s $f0, $f0 -/* BCD220 802401C0 46201081 */ sub.d $f2, $f2, $f0 -/* BCD224 802401C4 3C014348 */ lui $at, 0x4348 -/* BCD228 802401C8 44810000 */ mtc1 $at, $f0 -/* BCD22C 802401CC 462010A0 */ cvt.s.d $f2, $f2 -/* BCD230 802401D0 46001085 */ abs.s $f2, $f2 -/* BCD234 802401D4 46001083 */ div.s $f2, $f2, $f0 -/* BCD238 802401D8 0809007D */ j .L802401F4 -/* BCD23C 802401DC E6220004 */ swc1 $f2, 4($s1) -.L802401E0: -/* BCD240 802401E0 3C013DCC */ lui $at, 0x3dcc -/* BCD244 802401E4 3421CCCD */ ori $at, $at, 0xcccd -/* BCD248 802401E8 44810000 */ mtc1 $at, $f0 -/* BCD24C 802401EC 00000000 */ nop -/* BCD250 802401F0 E6200004 */ swc1 $f0, 4($s1) -.L802401F4: -/* BCD254 802401F4 C6600028 */ lwc1 $f0, 0x28($s3) -/* BCD258 802401F8 44802000 */ mtc1 $zero, $f4 -/* BCD25C 802401FC 44802800 */ mtc1 $zero, $f5 -/* BCD260 80240200 46000021 */ cvt.d.s $f0, $f0 -/* BCD264 80240204 4624003E */ c.le.d $f0, $f4 -/* BCD268 80240208 00000000 */ nop -/* BCD26C 8024020C 45000024 */ bc1f .L802402A0 -/* BCD270 80240210 00000000 */ nop -/* BCD274 80240214 C6200010 */ lwc1 $f0, 0x10($s1) -/* BCD278 80240218 C6220004 */ lwc1 $f2, 4($s1) -/* BCD27C 8024021C 46020000 */ add.s $f0, $f0, $f2 -/* BCD280 80240220 E6200010 */ swc1 $f0, 0x10($s1) -/* BCD284 80240224 C6600028 */ lwc1 $f0, 0x28($s3) -/* BCD288 80240228 46000021 */ cvt.d.s $f0, $f0 -/* BCD28C 8024022C 46202001 */ sub.d $f0, $f4, $f0 -/* BCD290 80240230 46200020 */ cvt.s.d $f0, $f0 -/* BCD294 80240234 46000005 */ abs.s $f0, $f0 -/* BCD298 80240238 46000002 */ mul.s $f0, $f0, $f0 -/* BCD29C 8024023C 00000000 */ nop -/* BCD2A0 80240240 3C014248 */ lui $at, 0x4248 -/* BCD2A4 80240244 44811000 */ mtc1 $at, $f2 -/* BCD2A8 80240248 3C014170 */ lui $at, 0x4170 -/* BCD2AC 8024024C 44812000 */ mtc1 $at, $f4 -/* BCD2B0 80240250 46020003 */ div.s $f0, $f0, $f2 -/* BCD2B4 80240254 4600203C */ c.lt.s $f4, $f0 -/* BCD2B8 80240258 00000000 */ nop -/* BCD2BC 8024025C 45000002 */ bc1f .L80240268 -/* BCD2C0 80240260 E620001C */ swc1 $f0, 0x1c($s1) -/* BCD2C4 80240264 E624001C */ swc1 $f4, 0x1c($s1) -.L80240268: -/* BCD2C8 80240268 C6220008 */ lwc1 $f2, 8($s1) -/* BCD2CC 8024026C C620001C */ lwc1 $f0, 0x1c($s1) -/* BCD2D0 80240270 4602003C */ c.lt.s $f0, $f2 -/* BCD2D4 80240274 00000000 */ nop -/* BCD2D8 80240278 45000031 */ bc1f .L80240340 -/* BCD2DC 8024027C 00000000 */ nop -/* BCD2E0 80240280 C6200004 */ lwc1 $f0, 4($s1) -/* BCD2E4 80240284 C6220018 */ lwc1 $f2, 0x18($s1) -/* BCD2E8 80240288 46020002 */ mul.s $f0, $f0, $f2 -/* BCD2EC 8024028C 00000000 */ nop -/* BCD2F0 80240290 C6220014 */ lwc1 $f2, 0x14($s1) -/* BCD2F4 80240294 46001080 */ add.s $f2, $f2, $f0 -/* BCD2F8 80240298 080900D0 */ j .L80240340 -/* BCD2FC 8024029C E6220014 */ swc1 $f2, 0x14($s1) -.L802402A0: -/* BCD300 802402A0 C6200014 */ lwc1 $f0, 0x14($s1) -/* BCD304 802402A4 C6220004 */ lwc1 $f2, 4($s1) -/* BCD308 802402A8 46020000 */ add.s $f0, $f0, $f2 -/* BCD30C 802402AC E6200014 */ swc1 $f0, 0x14($s1) -/* BCD310 802402B0 C6600028 */ lwc1 $f0, 0x28($s3) -/* BCD314 802402B4 46000021 */ cvt.d.s $f0, $f0 -/* BCD318 802402B8 46202001 */ sub.d $f0, $f4, $f0 -/* BCD31C 802402BC 3C013F00 */ lui $at, 0x3f00 -/* BCD320 802402C0 44811000 */ mtc1 $at, $f2 -/* BCD324 802402C4 46200020 */ cvt.s.d $f0, $f0 -/* BCD328 802402C8 46000005 */ abs.s $f0, $f0 -/* BCD32C 802402CC 46000007 */ neg.s $f0, $f0 -/* BCD330 802402D0 46020002 */ mul.s $f0, $f0, $f2 -/* BCD334 802402D4 00000000 */ nop -/* BCD338 802402D8 46000002 */ mul.s $f0, $f0, $f0 -/* BCD33C 802402DC 00000000 */ nop -/* BCD340 802402E0 3C01C0A0 */ lui $at, 0xc0a0 -/* BCD344 802402E4 44812000 */ mtc1 $at, $f4 -/* BCD348 802402E8 3C014248 */ lui $at, 0x4248 -/* BCD34C 802402EC 44811000 */ mtc1 $at, $f2 -/* BCD350 802402F0 46000007 */ neg.s $f0, $f0 -/* BCD354 802402F4 46020003 */ div.s $f0, $f0, $f2 -/* BCD358 802402F8 4604003C */ c.lt.s $f0, $f4 -/* BCD35C 802402FC 00000000 */ nop -/* BCD360 80240300 45000002 */ bc1f .L8024030C -/* BCD364 80240304 E620001C */ swc1 $f0, 0x1c($s1) -/* BCD368 80240308 E624001C */ swc1 $f4, 0x1c($s1) -.L8024030C: -/* BCD36C 8024030C C6220008 */ lwc1 $f2, 8($s1) -/* BCD370 80240310 C620001C */ lwc1 $f0, 0x1c($s1) -/* BCD374 80240314 4600103C */ c.lt.s $f2, $f0 -/* BCD378 80240318 00000000 */ nop -/* BCD37C 8024031C 45000008 */ bc1f .L80240340 -/* BCD380 80240320 00000000 */ nop -/* BCD384 80240324 C6200004 */ lwc1 $f0, 4($s1) -/* BCD388 80240328 C6220018 */ lwc1 $f2, 0x18($s1) -/* BCD38C 8024032C 46020002 */ mul.s $f0, $f0, $f2 -/* BCD390 80240330 00000000 */ nop -/* BCD394 80240334 C6220010 */ lwc1 $f2, 0x10($s1) -/* BCD398 80240338 46001080 */ add.s $f2, $f2, $f0 -/* BCD39C 8024033C E6220010 */ swc1 $f2, 0x10($s1) -.L80240340: -/* BCD3A0 80240340 C6200010 */ lwc1 $f0, 0x10($s1) -/* BCD3A4 80240344 3C014059 */ lui $at, 0x4059 -/* BCD3A8 80240348 44812800 */ mtc1 $at, $f5 -/* BCD3AC 8024034C 44802000 */ mtc1 $zero, $f4 -/* BCD3B0 80240350 460000A1 */ cvt.d.s $f2, $f0 -/* BCD3B4 80240354 4622203C */ c.lt.d $f4, $f2 -/* BCD3B8 80240358 00000000 */ nop -/* BCD3BC 8024035C 4500000F */ bc1f .L8024039C -/* BCD3C0 80240360 00000000 */ nop -/* BCD3C4 80240364 C6200014 */ lwc1 $f0, 0x14($s1) -/* BCD3C8 80240368 46000021 */ cvt.d.s $f0, $f0 -/* BCD3CC 8024036C 4620203C */ c.lt.d $f4, $f0 -/* BCD3D0 80240370 00000000 */ nop -/* BCD3D4 80240374 45000009 */ bc1f .L8024039C -/* BCD3D8 80240378 00000000 */ nop -/* BCD3DC 8024037C C6200014 */ lwc1 $f0, 0x14($s1) -/* BCD3E0 80240380 46241081 */ sub.d $f2, $f2, $f4 -/* BCD3E4 80240384 46000021 */ cvt.d.s $f0, $f0 -/* BCD3E8 80240388 46240001 */ sub.d $f0, $f0, $f4 -/* BCD3EC 8024038C 462010A0 */ cvt.s.d $f2, $f2 -/* BCD3F0 80240390 E6220010 */ swc1 $f2, 0x10($s1) -/* BCD3F4 80240394 46200020 */ cvt.s.d $f0, $f0 -/* BCD3F8 80240398 E6200014 */ swc1 $f0, 0x14($s1) -.L8024039C: -/* BCD3FC 8024039C C6240010 */ lwc1 $f4, 0x10($s1) -/* BCD400 802403A0 C6220014 */ lwc1 $f2, 0x14($s1) -/* BCD404 802403A4 46022001 */ sub.s $f0, $f4, $f2 -/* BCD408 802403A8 3C013FF8 */ lui $at, 0x3ff8 -/* BCD40C 802403AC 44813800 */ mtc1 $at, $f7 -/* BCD410 802403B0 44803000 */ mtc1 $zero, $f6 -/* BCD414 802403B4 46000005 */ abs.s $f0, $f0 -/* BCD418 802403B8 46000021 */ cvt.d.s $f0, $f0 -/* BCD41C 802403BC 4620303C */ c.lt.d $f6, $f0 -/* BCD420 802403C0 00000000 */ nop -/* BCD424 802403C4 45000063 */ bc1f .L80240554 -/* BCD428 802403C8 00000000 */ nop -/* BCD42C 802403CC 4602203C */ c.lt.s $f4, $f2 -/* BCD430 802403D0 00000000 */ nop -/* BCD434 802403D4 45020006 */ bc1fl .L802403F0 -/* BCD438 802403D8 46001021 */ cvt.d.s $f0, $f2 -/* BCD43C 802403DC 46002021 */ cvt.d.s $f0, $f4 -/* BCD440 802403E0 46260000 */ add.d $f0, $f0, $f6 -/* BCD444 802403E4 46200020 */ cvt.s.d $f0, $f0 -/* BCD448 802403E8 08090155 */ j .L80240554 -/* BCD44C 802403EC E6200014 */ swc1 $f0, 0x14($s1) -.L802403F0: -/* BCD450 802403F0 46260000 */ add.d $f0, $f0, $f6 -/* BCD454 802403F4 46200020 */ cvt.s.d $f0, $f0 -/* BCD458 802403F8 08090155 */ j .L80240554 -/* BCD45C 802403FC E6200010 */ swc1 $f0, 0x10($s1) -.L80240400: -/* BCD460 80240400 86030002 */ lh $v1, 2($s0) -/* BCD464 80240404 50620001 */ beql $v1, $v0, .L8024040C -/* BCD468 80240408 AE440070 */ sw $a0, 0x70($s2) -.L8024040C: -/* BCD46C 8024040C 86030002 */ lh $v1, 2($s0) -/* BCD470 80240410 24020009 */ addiu $v0, $zero, 9 -/* BCD474 80240414 50620001 */ beql $v1, $v0, .L8024041C -/* BCD478 80240418 AE440070 */ sw $a0, 0x70($s2) -.L8024041C: -/* BCD47C 8024041C 3C013DCC */ lui $at, 0x3dcc -/* BCD480 80240420 3421CCCD */ ori $at, $at, 0xcccd -/* BCD484 80240424 44810000 */ mtc1 $at, $f0 -/* BCD488 80240428 C6220010 */ lwc1 $f2, 0x10($s1) -/* BCD48C 8024042C C6240008 */ lwc1 $f4, 8($s1) -/* BCD490 80240430 AE20001C */ sw $zero, 0x1c($s1) -/* BCD494 80240434 46001080 */ add.s $f2, $f2, $f0 -/* BCD498 80240438 E6200004 */ swc1 $f0, 4($s1) -/* BCD49C 8024043C C620001C */ lwc1 $f0, 0x1c($s1) -/* BCD4A0 80240440 4604003C */ c.lt.s $f0, $f4 -/* BCD4A4 80240444 00000000 */ nop -/* BCD4A8 80240448 45000008 */ bc1f .L8024046C -/* BCD4AC 8024044C E6220010 */ swc1 $f2, 0x10($s1) -/* BCD4B0 80240450 C6200004 */ lwc1 $f0, 4($s1) -/* BCD4B4 80240454 C6220018 */ lwc1 $f2, 0x18($s1) -/* BCD4B8 80240458 46020002 */ mul.s $f0, $f0, $f2 -/* BCD4BC 8024045C 00000000 */ nop -/* BCD4C0 80240460 C6220014 */ lwc1 $f2, 0x14($s1) -/* BCD4C4 80240464 46001080 */ add.s $f2, $f2, $f0 -/* BCD4C8 80240468 E6220014 */ swc1 $f2, 0x14($s1) -.L8024046C: -/* BCD4CC 8024046C C6200010 */ lwc1 $f0, 0x10($s1) -/* BCD4D0 80240470 3C014059 */ lui $at, 0x4059 -/* BCD4D4 80240474 44812800 */ mtc1 $at, $f5 -/* BCD4D8 80240478 44802000 */ mtc1 $zero, $f4 -/* BCD4DC 8024047C 460000A1 */ cvt.d.s $f2, $f0 -/* BCD4E0 80240480 4622203C */ c.lt.d $f4, $f2 -/* BCD4E4 80240484 00000000 */ nop -/* BCD4E8 80240488 4500000F */ bc1f .L802404C8 -/* BCD4EC 8024048C 00000000 */ nop -/* BCD4F0 80240490 C6200014 */ lwc1 $f0, 0x14($s1) -/* BCD4F4 80240494 46000021 */ cvt.d.s $f0, $f0 -/* BCD4F8 80240498 4620203C */ c.lt.d $f4, $f0 -/* BCD4FC 8024049C 00000000 */ nop -/* BCD500 802404A0 45000009 */ bc1f .L802404C8 -/* BCD504 802404A4 00000000 */ nop -/* BCD508 802404A8 C6200014 */ lwc1 $f0, 0x14($s1) -/* BCD50C 802404AC 46241081 */ sub.d $f2, $f2, $f4 -/* BCD510 802404B0 46000021 */ cvt.d.s $f0, $f0 -/* BCD514 802404B4 46240001 */ sub.d $f0, $f0, $f4 -/* BCD518 802404B8 462010A0 */ cvt.s.d $f2, $f2 -/* BCD51C 802404BC E6220010 */ swc1 $f2, 0x10($s1) -/* BCD520 802404C0 46200020 */ cvt.s.d $f0, $f0 -/* BCD524 802404C4 E6200014 */ swc1 $f0, 0x14($s1) -.L802404C8: -/* BCD528 802404C8 C6240010 */ lwc1 $f4, 0x10($s1) -/* BCD52C 802404CC C6220014 */ lwc1 $f2, 0x14($s1) -/* BCD530 802404D0 46022001 */ sub.s $f0, $f4, $f2 -/* BCD534 802404D4 3C013FE0 */ lui $at, 0x3fe0 -/* BCD538 802404D8 44813800 */ mtc1 $at, $f7 -/* BCD53C 802404DC 44803000 */ mtc1 $zero, $f6 -/* BCD540 802404E0 46000005 */ abs.s $f0, $f0 -/* BCD544 802404E4 46000021 */ cvt.d.s $f0, $f0 -/* BCD548 802404E8 4620303C */ c.lt.d $f6, $f0 -/* BCD54C 802404EC 00000000 */ nop -/* BCD550 802404F0 4500000D */ bc1f .L80240528 -/* BCD554 802404F4 00000000 */ nop -/* BCD558 802404F8 4602203C */ c.lt.s $f4, $f2 -/* BCD55C 802404FC 00000000 */ nop -/* BCD560 80240500 45020006 */ bc1fl .L8024051C -/* BCD564 80240504 46001021 */ cvt.d.s $f0, $f2 -/* BCD568 80240508 46002021 */ cvt.d.s $f0, $f4 -/* BCD56C 8024050C 46260000 */ add.d $f0, $f0, $f6 -/* BCD570 80240510 46200020 */ cvt.s.d $f0, $f0 -/* BCD574 80240514 0809014A */ j .L80240528 -/* BCD578 80240518 E6200014 */ swc1 $f0, 0x14($s1) -.L8024051C: -/* BCD57C 8024051C 46260000 */ add.d $f0, $f0, $f6 -/* BCD580 80240520 46200020 */ cvt.s.d $f0, $f0 -/* BCD584 80240524 E6200010 */ swc1 $f0, 0x10($s1) -.L80240528: -/* BCD588 80240528 8E42007C */ lw $v0, 0x7c($s2) -/* BCD58C 8024052C 04410008 */ bgez $v0, .L80240550 -/* BCD590 80240530 2442FFFF */ addiu $v0, $v0, -1 -/* BCD594 80240534 44800000 */ mtc1 $zero, $f0 -/* BCD598 80240538 00000000 */ nop -/* BCD59C 8024053C E6200014 */ swc1 $f0, 0x14($s1) -/* BCD5A0 80240540 E6200010 */ swc1 $f0, 0x10($s1) -/* BCD5A4 80240544 E6200000 */ swc1 $f0, ($s1) -/* BCD5A8 80240548 08090155 */ j .L80240554 -/* BCD5AC 8024054C E6200008 */ swc1 $f0, 8($s1) -.L80240550: -/* BCD5B0 80240550 AE42007C */ sw $v0, 0x7c($s2) -.L80240554: -/* BCD5B4 80240554 C6200010 */ lwc1 $f0, 0x10($s1) -/* BCD5B8 80240558 C6220014 */ lwc1 $f2, 0x14($s1) -/* BCD5BC 8024055C 46020001 */ sub.s $f0, $f0, $f2 -/* BCD5C0 80240560 C6220008 */ lwc1 $f2, 8($s1) -/* BCD5C4 80240564 46001080 */ add.s $f2, $f2, $f0 -/* BCD5C8 80240568 E6200000 */ swc1 $f0, ($s1) -/* BCD5CC 8024056C E6220008 */ swc1 $f2, 8($s1) -.L80240570: -/* BCD5D0 80240570 C6220008 */ lwc1 $f2, 8($s1) -/* BCD5D4 80240574 3C01C0E0 */ lui $at, 0xc0e0 -/* BCD5D8 80240578 44810000 */ mtc1 $at, $f0 -/* BCD5DC 8024057C 00000000 */ nop -/* BCD5E0 80240580 4600103E */ c.le.s $f2, $f0 -/* BCD5E4 80240584 00000000 */ nop -/* BCD5E8 80240588 45000013 */ bc1f .L802405D8 -/* BCD5EC 8024058C 2410FFFF */ addiu $s0, $zero, -1 -/* BCD5F0 80240590 8E420078 */ lw $v0, 0x78($s2) -/* BCD5F4 80240594 10500011 */ beq $v0, $s0, .L802405DC -/* BCD5F8 80240598 27A50058 */ addiu $a1, $sp, 0x58 -/* BCD5FC 8024059C 2404000A */ addiu $a0, $zero, 0xa -/* BCD600 802405A0 27A6005C */ addiu $a2, $sp, 0x5c -/* BCD604 802405A4 0C016F84 */ jal get_collider_center -/* BCD608 802405A8 27A70060 */ addiu $a3, $sp, 0x60 -/* BCD60C 802405AC 240401D6 */ addiu $a0, $zero, 0x1d6 -/* BCD610 802405B0 C7A00058 */ lwc1 $f0, 0x58($sp) -/* BCD614 802405B4 C7A2005C */ lwc1 $f2, 0x5c($sp) -/* BCD618 802405B8 44060000 */ mfc1 $a2, $f0 -/* BCD61C 802405BC 44071000 */ mfc1 $a3, $f2 -/* BCD620 802405C0 C7A00060 */ lwc1 $f0, 0x60($sp) -/* BCD624 802405C4 0000282D */ daddu $a1, $zero, $zero -/* BCD628 802405C8 0C052757 */ jal play_sound_at_position -/* BCD62C 802405CC E7A00010 */ swc1 $f0, 0x10($sp) -/* BCD630 802405D0 08090177 */ j .L802405DC -/* BCD634 802405D4 AE500078 */ sw $s0, 0x78($s2) -.L802405D8: -/* BCD638 802405D8 AE400078 */ sw $zero, 0x78($s2) -.L802405DC: -/* BCD63C 802405DC C6200008 */ lwc1 $f0, 8($s1) -/* BCD640 802405E0 46000002 */ mul.s $f0, $f0, $f0 -/* BCD644 802405E4 00000000 */ nop -/* BCD648 802405E8 3C0142B4 */ lui $at, 0x42b4 -/* BCD64C 802405EC 44811000 */ mtc1 $at, $f2 -/* BCD650 802405F0 2404001B */ addiu $a0, $zero, 0x1b -/* BCD654 802405F4 46020003 */ div.s $f0, $f0, $f2 -/* BCD658 802405F8 0C046C04 */ jal get_model_list_index_from_tree_index -/* BCD65C 802405FC E620000C */ swc1 $f0, 0xc($s1) -/* BCD660 80240600 0C046B4C */ jal get_model_from_list_index -/* BCD664 80240604 0040202D */ daddu $a0, $v0, $zero -/* BCD668 80240608 0040182D */ daddu $v1, $v0, $zero -/* BCD66C 8024060C 24700058 */ addiu $s0, $v1, 0x58 -/* BCD670 80240610 4480A000 */ mtc1 $zero, $f20 -/* BCD674 80240614 94620000 */ lhu $v0, ($v1) -/* BCD678 80240618 4405A000 */ mfc1 $a1, $f20 -/* BCD67C 8024061C 4407A000 */ mfc1 $a3, $f20 -/* BCD680 80240620 34421400 */ ori $v0, $v0, 0x1400 -/* BCD684 80240624 A4620000 */ sh $v0, ($v1) -/* BCD688 80240628 8E26000C */ lw $a2, 0xc($s1) -/* BCD68C 8024062C 3C013F80 */ lui $at, 0x3f80 -/* BCD690 80240630 4481B000 */ mtc1 $at, $f22 -/* BCD694 80240634 0C019E40 */ jal guTranslateF -/* BCD698 80240638 0200202D */ daddu $a0, $s0, $zero -/* BCD69C 8024063C E7B60010 */ swc1 $f22, 0x10($sp) -/* BCD6A0 80240640 8E250008 */ lw $a1, 8($s1) -/* BCD6A4 80240644 4406A000 */ mfc1 $a2, $f20 -/* BCD6A8 80240648 4407A000 */ mfc1 $a3, $f20 -/* BCD6AC 8024064C 0C019EC8 */ jal guRotateF -/* BCD6B0 80240650 27A40018 */ addiu $a0, $sp, 0x18 -/* BCD6B4 80240654 0200202D */ daddu $a0, $s0, $zero -/* BCD6B8 80240658 27A50018 */ addiu $a1, $sp, 0x18 -/* BCD6BC 8024065C 0C019D80 */ jal guMtxCatF -/* BCD6C0 80240660 0080302D */ daddu $a2, $a0, $zero -/* BCD6C4 80240664 0C016E89 */ jal update_collider_transform -/* BCD6C8 80240668 2404000A */ addiu $a0, $zero, 0xa -/* BCD6CC 8024066C 0C016E89 */ jal update_collider_transform -/* BCD6D0 80240670 24040009 */ addiu $a0, $zero, 9 -/* BCD6D4 80240674 0C046C04 */ jal get_model_list_index_from_tree_index -/* BCD6D8 80240678 2404001A */ addiu $a0, $zero, 0x1a -/* BCD6DC 8024067C 0C046B4C */ jal get_model_from_list_index -/* BCD6E0 80240680 0040202D */ daddu $a0, $v0, $zero -/* BCD6E4 80240684 0040182D */ daddu $v1, $v0, $zero -/* BCD6E8 80240688 24700058 */ addiu $s0, $v1, 0x58 -/* BCD6EC 8024068C 4405A000 */ mfc1 $a1, $f20 -/* BCD6F0 80240690 94620000 */ lhu $v0, ($v1) -/* BCD6F4 80240694 4407A000 */ mfc1 $a3, $f20 -/* BCD6F8 80240698 34421400 */ ori $v0, $v0, 0x1400 -/* BCD6FC 8024069C A4620000 */ sh $v0, ($v1) -/* BCD700 802406A0 8E26000C */ lw $a2, 0xc($s1) -/* BCD704 802406A4 0C019E40 */ jal guTranslateF -/* BCD708 802406A8 0200202D */ daddu $a0, $s0, $zero -/* BCD70C 802406AC E7B60010 */ swc1 $f22, 0x10($sp) -/* BCD710 802406B0 8E250008 */ lw $a1, 8($s1) -/* BCD714 802406B4 4406A000 */ mfc1 $a2, $f20 -/* BCD718 802406B8 4407A000 */ mfc1 $a3, $f20 -/* BCD71C 802406BC 0C019EC8 */ jal guRotateF -/* BCD720 802406C0 27A40018 */ addiu $a0, $sp, 0x18 -/* BCD724 802406C4 0200202D */ daddu $a0, $s0, $zero -/* BCD728 802406C8 27A50018 */ addiu $a1, $sp, 0x18 -/* BCD72C 802406CC 0C019D80 */ jal guMtxCatF -/* BCD730 802406D0 0080302D */ daddu $a2, $a0, $zero -/* BCD734 802406D4 0C046C04 */ jal get_model_list_index_from_tree_index -/* BCD738 802406D8 24040019 */ addiu $a0, $zero, 0x19 -/* BCD73C 802406DC 0C046B4C */ jal get_model_from_list_index -/* BCD740 802406E0 0040202D */ daddu $a0, $v0, $zero -/* BCD744 802406E4 0040182D */ daddu $v1, $v0, $zero -/* BCD748 802406E8 24700058 */ addiu $s0, $v1, 0x58 -/* BCD74C 802406EC 4405A000 */ mfc1 $a1, $f20 -/* BCD750 802406F0 94620000 */ lhu $v0, ($v1) -/* BCD754 802406F4 4407A000 */ mfc1 $a3, $f20 -/* BCD758 802406F8 34421400 */ ori $v0, $v0, 0x1400 -/* BCD75C 802406FC A4620000 */ sh $v0, ($v1) -/* BCD760 80240700 8E26000C */ lw $a2, 0xc($s1) -/* BCD764 80240704 0C019E40 */ jal guTranslateF -/* BCD768 80240708 0200202D */ daddu $a0, $s0, $zero -/* BCD76C 8024070C 4406A000 */ mfc1 $a2, $f20 -/* BCD770 80240710 27A40018 */ addiu $a0, $sp, 0x18 -/* BCD774 80240714 E7B60010 */ swc1 $f22, 0x10($sp) -/* BCD778 80240718 8E250008 */ lw $a1, 8($s1) -/* BCD77C 8024071C 0C019EC8 */ jal guRotateF -/* BCD780 80240720 00C0382D */ daddu $a3, $a2, $zero -/* BCD784 80240724 0200202D */ daddu $a0, $s0, $zero -/* BCD788 80240728 27A50018 */ addiu $a1, $sp, 0x18 -/* BCD78C 8024072C 0C019D80 */ jal guMtxCatF -/* BCD790 80240730 0080302D */ daddu $a2, $a0, $zero -/* BCD794 80240734 0C016E89 */ jal update_collider_transform -/* BCD798 80240738 24040008 */ addiu $a0, $zero, 8 -/* BCD79C 8024073C 8FBF0078 */ lw $ra, 0x78($sp) -/* BCD7A0 80240740 8FB30074 */ lw $s3, 0x74($sp) -/* BCD7A4 80240744 8FB20070 */ lw $s2, 0x70($sp) -/* BCD7A8 80240748 8FB1006C */ lw $s1, 0x6c($sp) -/* BCD7AC 8024074C 8FB00068 */ lw $s0, 0x68($sp) -/* BCD7B0 80240750 D7B60088 */ ldc1 $f22, 0x88($sp) -/* BCD7B4 80240754 D7B40080 */ ldc1 $f20, 0x80($sp) -/* BCD7B8 80240758 0000102D */ daddu $v0, $zero, $zero -/* BCD7BC 8024075C 03E00008 */ jr $ra -/* BCD7C0 80240760 27BD0090 */ addiu $sp, $sp, 0x90 -/* BCD7C4 80240764 00000000 */ nop -/* BCD7C8 80240768 00000000 */ nop -/* BCD7CC 8024076C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_05/func_80240770_BCD060.s b/asm/nonmatchings/world/area_obk/obk_05/func_80240770_BCD060.s deleted file mode 100644 index d4e95f6ca1..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_05/func_80240770_BCD060.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240770_BCD7D0 -/* BCD7D0 80240770 3C018011 */ lui $at, 0x8011 -/* BCD7D4 80240774 C422EFF4 */ lwc1 $f2, -0x100c($at) -/* BCD7D8 80240778 3C01C248 */ lui $at, 0xc248 -/* BCD7DC 8024077C 44810000 */ mtc1 $at, $f0 -/* BCD7E0 80240780 00000000 */ nop -/* BCD7E4 80240784 4600103C */ c.lt.s $f2, $f0 -/* BCD7E8 80240788 00000000 */ nop -/* BCD7EC 8024078C 45010002 */ bc1t .L80240798 -/* BCD7F0 80240790 24020002 */ addiu $v0, $zero, 2 -/* BCD7F4 80240794 0000102D */ daddu $v0, $zero, $zero -.L80240798: -/* BCD7F8 80240798 03E00008 */ jr $ra -/* BCD7FC 8024079C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_05/func_802407A0_BCD060.s b/asm/nonmatchings/world/area_obk/obk_05/func_802407A0_BCD060.s deleted file mode 100644 index 69e721a1d7..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_05/func_802407A0_BCD060.s +++ /dev/null @@ -1,7 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A0_BCD800 -/* BCD800 802407A0 AC800074 */ sw $zero, 0x74($a0) -/* BCD804 802407A4 03E00008 */ jr $ra -/* BCD808 802407A8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_obk/obk_05/func_80240934_BCD060.s b/asm/nonmatchings/world/area_obk/obk_05/func_80240934_BCD060.s deleted file mode 100644 index 64b77e5b2e..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_05/func_80240934_BCD060.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240934_BCD994 -/* BCD994 80240934 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BCD998 80240938 AFB10014 */ sw $s1, 0x14($sp) -/* BCD99C 8024093C 0080882D */ daddu $s1, $a0, $zero -/* BCD9A0 80240940 AFBF0018 */ sw $ra, 0x18($sp) -/* BCD9A4 80240944 AFB00010 */ sw $s0, 0x10($sp) -/* BCD9A8 80240948 8E240088 */ lw $a0, 0x88($s1) -/* BCD9AC 8024094C 1480000B */ bnez $a0, .L8024097C -/* BCD9B0 80240950 8E300084 */ lw $s0, 0x84($s1) -/* BCD9B4 80240954 0C00A67F */ jal rand_int -/* BCD9B8 80240958 24040003 */ addiu $a0, $zero, 3 -/* BCD9BC 8024095C 00021040 */ sll $v0, $v0, 1 -/* BCD9C0 80240960 3C018024 */ lui $at, 0x8024 -/* BCD9C4 80240964 00220821 */ addu $at, $at, $v0 -/* BCD9C8 80240968 8422100C */ lh $v0, 0x100c($at) -/* BCD9CC 8024096C 24040032 */ addiu $a0, $zero, 0x32 -/* BCD9D0 80240970 0C00A67F */ jal rand_int -/* BCD9D4 80240974 AE220078 */ sw $v0, 0x78($s1) -/* BCD9D8 80240978 2444001E */ addiu $a0, $v0, 0x1e -.L8024097C: -/* BCD9DC 8024097C 8E230078 */ lw $v1, 0x78($s1) -/* BCD9E0 80240980 0203102A */ slt $v0, $s0, $v1 -/* BCD9E4 80240984 10400006 */ beqz $v0, .L802409A0 -/* BCD9E8 80240988 2484FFFF */ addiu $a0, $a0, -1 -/* BCD9EC 8024098C 2610000A */ addiu $s0, $s0, 0xa -/* BCD9F0 80240990 0070102A */ slt $v0, $v1, $s0 -/* BCD9F4 80240994 5040000A */ beql $v0, $zero, .L802409C0 -/* BCD9F8 80240998 AE300084 */ sw $s0, 0x84($s1) -/* BCD9FC 8024099C 0060802D */ daddu $s0, $v1, $zero -.L802409A0: -/* BCDA00 802409A0 0070102A */ slt $v0, $v1, $s0 -/* BCDA04 802409A4 50400006 */ beql $v0, $zero, .L802409C0 -/* BCDA08 802409A8 AE300084 */ sw $s0, 0x84($s1) -/* BCDA0C 802409AC 2610FFF6 */ addiu $s0, $s0, -0xa -/* BCDA10 802409B0 0203102A */ slt $v0, $s0, $v1 -/* BCDA14 802409B4 54400001 */ bnel $v0, $zero, .L802409BC -/* BCDA18 802409B8 0060802D */ daddu $s0, $v1, $zero -.L802409BC: -/* BCDA1C 802409BC AE300084 */ sw $s0, 0x84($s1) -.L802409C0: -/* BCDA20 802409C0 AE240088 */ sw $a0, 0x88($s1) -/* BCDA24 802409C4 8FBF0018 */ lw $ra, 0x18($sp) -/* BCDA28 802409C8 8FB10014 */ lw $s1, 0x14($sp) -/* BCDA2C 802409CC 8FB00010 */ lw $s0, 0x10($sp) -/* BCDA30 802409D0 24020002 */ addiu $v0, $zero, 2 -/* BCDA34 802409D4 03E00008 */ jr $ra -/* BCDA38 802409D8 27BD0020 */ addiu $sp, $sp, 0x20 -/* BCDA3C 802409DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_802400B4_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_802400B4_BCEBF0.s deleted file mode 100644 index 7464b2bb2d..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_802400B4_BCEBF0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_BCECA4 -/* BCECA4 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BCECA8 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* BCECAC 802400BC 0080802D */ daddu $s0, $a0, $zero -/* BCECB0 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* BCECB4 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* BCECB8 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* BCECBC 802400CC 8C510000 */ lw $s1, ($v0) -/* BCECC0 802400D0 0C0B1EAF */ jal get_variable -/* BCECC4 802400D4 0220282D */ daddu $a1, $s1, $zero -/* BCECC8 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* BCECCC 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* BCECD0 802400E0 0200202D */ daddu $a0, $s0, $zero -/* BCECD4 802400E4 00431024 */ and $v0, $v0, $v1 -/* BCECD8 802400E8 00021140 */ sll $v0, $v0, 5 -/* BCECDC 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* BCECE0 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* BCECE4 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* BCECE8 802400F8 0C0B2026 */ jal set_variable -/* BCECEC 802400FC 0220282D */ daddu $a1, $s1, $zero -/* BCECF0 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* BCECF4 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* BCECF8 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* BCECFC 8024010C 24020002 */ addiu $v0, $zero, 2 -/* BCED00 80240110 03E00008 */ jr $ra -/* BCED04 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_80240118_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_80240118_BCEBF0.s deleted file mode 100644 index 026c12a841..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_80240118_BCEBF0.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_obk/obk_07/func_80240268_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_80240268_BCEBF0.s deleted file mode 100644 index fb6528e594..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_80240268_BCEBF0.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_BCEE58 -/* BCEE58 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BCEE5C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* BCEE60 80240270 0080802D */ daddu $s0, $a0, $zero -/* BCEE64 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* BCEE68 80240278 8E02000C */ lw $v0, 0xc($s0) -/* BCEE6C 8024027C 0C0B1EAF */ jal get_variable -/* BCEE70 80240280 8C450000 */ lw $a1, ($v0) -/* BCEE74 80240284 00021140 */ sll $v0, $v0, 5 -/* BCEE78 80240288 AE000084 */ sw $zero, 0x84($s0) -/* BCEE7C 8024028C 3C018008 */ lui $at, 0x8008 -/* BCEE80 80240290 00220821 */ addu $at, $at, $v0 -/* BCEE84 80240294 942278F8 */ lhu $v0, 0x78f8($at) -/* BCEE88 80240298 30420040 */ andi $v0, $v0, 0x40 -/* BCEE8C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* BCEE90 802402A0 24020001 */ addiu $v0, $zero, 1 -/* BCEE94 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* BCEE98 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* BCEE9C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* BCEEA0 802402B0 24020002 */ addiu $v0, $zero, 2 -/* BCEEA4 802402B4 03E00008 */ jr $ra -/* BCEEA8 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* BCEEAC 802402BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_802402C0_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_802402C0_BCEBF0.s deleted file mode 100644 index 50b9b85050..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_802402C0_BCEBF0.s +++ /dev/null @@ -1,7 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402C0_BCEEB0 -/* BCEEB0 802402C0 AC800074 */ sw $zero, 0x74($a0) -/* BCEEB4 802402C4 03E00008 */ jr $ra -/* BCEEB8 802402C8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_80240454_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_80240454_BCEBF0.s deleted file mode 100644 index 77b39b51a0..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_80240454_BCEBF0.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240454_BCF044 -/* BCF044 80240454 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BCF048 80240458 AFB10014 */ sw $s1, 0x14($sp) -/* BCF04C 8024045C 0080882D */ daddu $s1, $a0, $zero -/* BCF050 80240460 AFBF0018 */ sw $ra, 0x18($sp) -/* BCF054 80240464 AFB00010 */ sw $s0, 0x10($sp) -/* BCF058 80240468 8E240088 */ lw $a0, 0x88($s1) -/* BCF05C 8024046C 1480000B */ bnez $a0, .L8024049C -/* BCF060 80240470 8E300084 */ lw $s0, 0x84($s1) -/* BCF064 80240474 0C00A67F */ jal rand_int -/* BCF068 80240478 24040003 */ addiu $a0, $zero, 3 -/* BCF06C 8024047C 00021040 */ sll $v0, $v0, 1 -/* BCF070 80240480 3C018024 */ lui $at, 0x8024 -/* BCF074 80240484 00220821 */ addu $at, $at, $v0 -/* BCF078 80240488 8422292C */ lh $v0, 0x292c($at) -/* BCF07C 8024048C 24040032 */ addiu $a0, $zero, 0x32 -/* BCF080 80240490 0C00A67F */ jal rand_int -/* BCF084 80240494 AE220078 */ sw $v0, 0x78($s1) -/* BCF088 80240498 2444001E */ addiu $a0, $v0, 0x1e -.L8024049C: -/* BCF08C 8024049C 8E230078 */ lw $v1, 0x78($s1) -/* BCF090 802404A0 0203102A */ slt $v0, $s0, $v1 -/* BCF094 802404A4 10400006 */ beqz $v0, .L802404C0 -/* BCF098 802404A8 2484FFFF */ addiu $a0, $a0, -1 -/* BCF09C 802404AC 2610000A */ addiu $s0, $s0, 0xa -/* BCF0A0 802404B0 0070102A */ slt $v0, $v1, $s0 -/* BCF0A4 802404B4 5040000A */ beql $v0, $zero, .L802404E0 -/* BCF0A8 802404B8 AE300084 */ sw $s0, 0x84($s1) -/* BCF0AC 802404BC 0060802D */ daddu $s0, $v1, $zero -.L802404C0: -/* BCF0B0 802404C0 0070102A */ slt $v0, $v1, $s0 -/* BCF0B4 802404C4 50400006 */ beql $v0, $zero, .L802404E0 -/* BCF0B8 802404C8 AE300084 */ sw $s0, 0x84($s1) -/* BCF0BC 802404CC 2610FFF6 */ addiu $s0, $s0, -0xa -/* BCF0C0 802404D0 0203102A */ slt $v0, $s0, $v1 -/* BCF0C4 802404D4 54400001 */ bnel $v0, $zero, .L802404DC -/* BCF0C8 802404D8 0060802D */ daddu $s0, $v1, $zero -.L802404DC: -/* BCF0CC 802404DC AE300084 */ sw $s0, 0x84($s1) -.L802404E0: -/* BCF0D0 802404E0 AE240088 */ sw $a0, 0x88($s1) -/* BCF0D4 802404E4 8FBF0018 */ lw $ra, 0x18($sp) -/* BCF0D8 802404E8 8FB10014 */ lw $s1, 0x14($sp) -/* BCF0DC 802404EC 8FB00010 */ lw $s0, 0x10($sp) -/* BCF0E0 802404F0 24020002 */ addiu $v0, $zero, 2 -/* BCF0E4 802404F4 03E00008 */ jr $ra -/* BCF0E8 802404F8 27BD0020 */ addiu $sp, $sp, 0x20 -/* BCF0EC 802404FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_80240500_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_80240500_BCEBF0.s deleted file mode 100644 index 89dc2956fe..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_80240500_BCEBF0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_BCF0F0 -/* BCF0F0 80240500 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BCF0F4 80240504 AFB00010 */ sw $s0, 0x10($sp) -/* BCF0F8 80240508 0080802D */ daddu $s0, $a0, $zero -/* BCF0FC 8024050C AFBF0014 */ sw $ra, 0x14($sp) -/* BCF100 80240510 0C00AB39 */ jal heap_malloc -/* BCF104 80240514 240401E0 */ addiu $a0, $zero, 0x1e0 -/* BCF108 80240518 0200202D */ daddu $a0, $s0, $zero -/* BCF10C 8024051C 3C05FD05 */ lui $a1, 0xfd05 -/* BCF110 80240520 34A50F86 */ ori $a1, $a1, 0xf86 -/* BCF114 80240524 0C0B2026 */ jal set_variable -/* BCF118 80240528 0040302D */ daddu $a2, $v0, $zero -/* BCF11C 8024052C 8FBF0014 */ lw $ra, 0x14($sp) -/* BCF120 80240530 8FB00010 */ lw $s0, 0x10($sp) -/* BCF124 80240534 24020002 */ addiu $v0, $zero, 2 -/* BCF128 80240538 03E00008 */ jr $ra -/* BCF12C 8024053C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_80240540_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_80240540_BCEBF0.s deleted file mode 100644 index 86249ef96f..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_80240540_BCEBF0.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240540_BCF130 -/* BCF130 80240540 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BCF134 80240544 3C05FD05 */ lui $a1, 0xfd05 -/* BCF138 80240548 34A50F86 */ ori $a1, $a1, 0xf86 -/* BCF13C 8024054C AFBF0010 */ sw $ra, 0x10($sp) -/* BCF140 80240550 0C0B1EAF */ jal get_variable -/* BCF144 80240554 0000202D */ daddu $a0, $zero, $zero -/* BCF148 80240558 8FBF0010 */ lw $ra, 0x10($sp) -/* BCF14C 8024055C 03E00008 */ jr $ra -/* BCF150 80240560 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_80240564_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_80240564_BCEBF0.s deleted file mode 100644 index 400f0ecc97..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_80240564_BCEBF0.s +++ /dev/null @@ -1,323 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240564_BCF154 -/* BCF154 80240564 27BDFF98 */ addiu $sp, $sp, -0x68 -/* BCF158 80240568 AFBE0060 */ sw $fp, 0x60($sp) -/* BCF15C 8024056C 00C0F02D */ daddu $fp, $a2, $zero -/* BCF160 80240570 AFBF0064 */ sw $ra, 0x64($sp) -/* BCF164 80240574 AFB7005C */ sw $s7, 0x5c($sp) -/* BCF168 80240578 AFB60058 */ sw $s6, 0x58($sp) -/* BCF16C 8024057C AFB50054 */ sw $s5, 0x54($sp) -/* BCF170 80240580 AFB40050 */ sw $s4, 0x50($sp) -/* BCF174 80240584 AFB3004C */ sw $s3, 0x4c($sp) -/* BCF178 80240588 AFB20048 */ sw $s2, 0x48($sp) -/* BCF17C 8024058C AFB10044 */ sw $s1, 0x44($sp) -/* BCF180 80240590 AFB00040 */ sw $s0, 0x40($sp) -/* BCF184 80240594 AFA40068 */ sw $a0, 0x68($sp) -/* BCF188 80240598 0C090150 */ jal func_80240540 -/* BCF18C 8024059C AFA5006C */ sw $a1, 0x6c($sp) -/* BCF190 802405A0 8FAB0068 */ lw $t3, 0x68($sp) -/* BCF194 802405A4 0040A82D */ daddu $s5, $v0, $zero -/* BCF198 802405A8 256BFFE4 */ addiu $t3, $t3, -0x1c -/* BCF19C 802405AC AFAB0068 */ sw $t3, 0x68($sp) -/* BCF1A0 802405B0 8FAB006C */ lw $t3, 0x6c($sp) -/* BCF1A4 802405B4 8EA30028 */ lw $v1, 0x28($s5) -/* BCF1A8 802405B8 256BFFFC */ addiu $t3, $t3, -4 -/* BCF1AC 802405BC 00031080 */ sll $v0, $v1, 2 -/* BCF1B0 802405C0 02A21021 */ addu $v0, $s5, $v0 -/* BCF1B4 802405C4 AFAB006C */ sw $t3, 0x6c($sp) -/* BCF1B8 802405C8 8C420010 */ lw $v0, 0x10($v0) -/* BCF1BC 802405CC 07C10002 */ bgez $fp, .L802405D8 -/* BCF1C0 802405D0 AFA20020 */ sw $v0, 0x20($sp) -/* BCF1C4 802405D4 0000F02D */ daddu $fp, $zero, $zero -.L802405D8: -/* BCF1C8 802405D8 0000802D */ daddu $s0, $zero, $zero -/* BCF1CC 802405DC 18600021 */ blez $v1, .L80240664 -/* BCF1D0 802405E0 0200902D */ daddu $s2, $s0, $zero -/* BCF1D4 802405E4 0060302D */ daddu $a2, $v1, $zero -/* BCF1D8 802405E8 26440001 */ addiu $a0, $s2, 1 -.L802405EC: -/* BCF1DC 802405EC 00041080 */ sll $v0, $a0, 2 -/* BCF1E0 802405F0 02A21021 */ addu $v0, $s5, $v0 -/* BCF1E4 802405F4 8C450010 */ lw $a1, 0x10($v0) -/* BCF1E8 802405F8 03C5102A */ slt $v0, $fp, $a1 -/* BCF1EC 802405FC 54400001 */ bnel $v0, $zero, .L80240604 -/* BCF1F0 80240600 03C0282D */ daddu $a1, $fp, $zero -.L80240604: -/* BCF1F4 80240604 00051900 */ sll $v1, $a1, 4 -/* BCF1F8 80240608 00651823 */ subu $v1, $v1, $a1 -/* BCF1FC 8024060C 8FAB0020 */ lw $t3, 0x20($sp) -/* BCF200 80240610 00031880 */ sll $v1, $v1, 2 -/* BCF204 80240614 15600002 */ bnez $t3, .L80240620 -/* BCF208 80240618 006B001A */ div $zero, $v1, $t3 -/* BCF20C 8024061C 0007000D */ break 7 -.L80240620: -/* BCF210 80240620 2401FFFF */ addiu $at, $zero, -1 -/* BCF214 80240624 15610004 */ bne $t3, $at, .L80240638 -/* BCF218 80240628 3C018000 */ lui $at, 0x8000 -/* BCF21C 8024062C 14610002 */ bne $v1, $at, .L80240638 -/* BCF220 80240630 00000000 */ nop -/* BCF224 80240634 0006000D */ break 6 -.L80240638: -/* BCF228 80240638 00001812 */ mflo $v1 -/* BCF22C 8024063C 00031040 */ sll $v0, $v1, 1 -/* BCF230 80240640 00431021 */ addu $v0, $v0, $v1 -/* BCF234 80240644 000210C0 */ sll $v0, $v0, 3 -/* BCF238 80240648 00431021 */ addu $v0, $v0, $v1 -/* BCF23C 8024064C 13C50005 */ beq $fp, $a1, .L80240664 -/* BCF240 80240650 00028080 */ sll $s0, $v0, 2 -/* BCF244 80240654 0080902D */ daddu $s2, $a0, $zero -/* BCF248 80240658 0246102A */ slt $v0, $s2, $a2 -/* BCF24C 8024065C 1440FFE3 */ bnez $v0, .L802405EC -/* BCF250 80240660 26440001 */ addiu $a0, $s2, 1 -.L80240664: -/* BCF254 80240664 8EA40008 */ lw $a0, 8($s5) -/* BCF258 80240668 8EA30000 */ lw $v1, ($s5) -/* BCF25C 8024066C 02041023 */ subu $v0, $s0, $a0 -/* BCF260 80240670 14600002 */ bnez $v1, .L8024067C -/* BCF264 80240674 0043001A */ div $zero, $v0, $v1 -/* BCF268 80240678 0007000D */ break 7 -.L8024067C: -/* BCF26C 8024067C 2401FFFF */ addiu $at, $zero, -1 -/* BCF270 80240680 14610004 */ bne $v1, $at, .L80240694 -/* BCF274 80240684 3C018000 */ lui $at, 0x8000 -/* BCF278 80240688 14410002 */ bne $v0, $at, .L80240694 -/* BCF27C 8024068C 00000000 */ nop -/* BCF280 80240690 0006000D */ break 6 -.L80240694: -/* BCF284 80240694 00001012 */ mflo $v0 -/* BCF288 80240698 0000A02D */ daddu $s4, $zero, $zero -/* BCF28C 8024069C 0280902D */ daddu $s2, $s4, $zero -/* BCF290 802406A0 8EA30028 */ lw $v1, 0x28($s5) -/* BCF294 802406A4 00822021 */ addu $a0, $a0, $v0 -/* BCF298 802406A8 18600055 */ blez $v1, .L80240800 -/* BCF29C 802406AC AEA40008 */ sw $a0, 8($s5) -/* BCF2A0 802406B0 8FAB006C */ lw $t3, 0x6c($sp) -/* BCF2A4 802406B4 000B1400 */ sll $v0, $t3, 0x10 -/* BCF2A8 802406B8 00021403 */ sra $v0, $v0, 0x10 -/* BCF2AC 802406BC AFA20028 */ sw $v0, 0x28($sp) -/* BCF2B0 802406C0 25620005 */ addiu $v0, $t3, 5 -/* BCF2B4 802406C4 00021400 */ sll $v0, $v0, 0x10 -/* BCF2B8 802406C8 00021403 */ sra $v0, $v0, 0x10 -/* BCF2BC 802406CC AFA2002C */ sw $v0, 0x2c($sp) -.L802406D0: -/* BCF2C0 802406D0 264B0001 */ addiu $t3, $s2, 1 -/* BCF2C4 802406D4 000B1080 */ sll $v0, $t3, 2 -/* BCF2C8 802406D8 02A21021 */ addu $v0, $s5, $v0 -/* BCF2CC 802406DC AFAB0024 */ sw $t3, 0x24($sp) -/* BCF2D0 802406E0 8C450010 */ lw $a1, 0x10($v0) -/* BCF2D4 802406E4 8FAB0020 */ lw $t3, 0x20($sp) -/* BCF2D8 802406E8 00051900 */ sll $v1, $a1, 4 -/* BCF2DC 802406EC 00651823 */ subu $v1, $v1, $a1 -/* BCF2E0 802406F0 00031880 */ sll $v1, $v1, 2 -/* BCF2E4 802406F4 15600002 */ bnez $t3, .L80240700 -/* BCF2E8 802406F8 006B001A */ div $zero, $v1, $t3 -/* BCF2EC 802406FC 0007000D */ break 7 -.L80240700: -/* BCF2F0 80240700 2401FFFF */ addiu $at, $zero, -1 -/* BCF2F4 80240704 15610004 */ bne $t3, $at, .L80240718 -/* BCF2F8 80240708 3C018000 */ lui $at, 0x8000 -/* BCF2FC 8024070C 14610002 */ bne $v1, $at, .L80240718 -/* BCF300 80240710 00000000 */ nop -/* BCF304 80240714 0006000D */ break 6 -.L80240718: -/* BCF308 80240718 00001812 */ mflo $v1 -/* BCF30C 8024071C 8FA7002C */ lw $a3, 0x2c($sp) -/* BCF310 80240720 00121040 */ sll $v0, $s2, 1 -/* BCF314 80240724 00529821 */ addu $s3, $v0, $s2 -/* BCF318 80240728 26770001 */ addiu $s7, $s3, 1 -/* BCF31C 8024072C 26760002 */ addiu $s6, $s3, 2 -/* BCF320 80240730 8FAB0068 */ lw $t3, 0x68($sp) -/* BCF324 80240734 8FA50028 */ lw $a1, 0x28($sp) -/* BCF328 80240738 01743021 */ addu $a2, $t3, $s4 -/* BCF32C 8024073C 00062400 */ sll $a0, $a2, 0x10 -/* BCF330 80240740 00042403 */ sra $a0, $a0, 0x10 -/* BCF334 80240744 3C0B8024 */ lui $t3, 0x8024 -/* BCF338 80240748 256B30A0 */ addiu $t3, $t3, 0x30a0 -/* BCF33C 8024074C 02EB1021 */ addu $v0, $s7, $t3 -/* BCF340 80240750 904A0000 */ lbu $t2, ($v0) -/* BCF344 80240754 02CB1021 */ addu $v0, $s6, $t3 -/* BCF348 80240758 90490000 */ lbu $t1, ($v0) -/* BCF34C 8024075C 026B1021 */ addu $v0, $s3, $t3 -/* BCF350 80240760 90420000 */ lbu $v0, ($v0) -/* BCF354 80240764 240B00FF */ addiu $t3, $zero, 0xff -/* BCF358 80240768 AFAB001C */ sw $t3, 0x1c($sp) -/* BCF35C 8024076C AFA20010 */ sw $v0, 0x10($sp) -/* BCF360 80240770 AFAA0014 */ sw $t2, 0x14($sp) -/* BCF364 80240774 AFA90018 */ sw $t1, 0x18($sp) -/* BCF368 80240778 00748023 */ subu $s0, $v1, $s4 -/* BCF36C 8024077C 00D03021 */ addu $a2, $a2, $s0 -/* BCF370 80240780 00063400 */ sll $a2, $a2, 0x10 -/* BCF374 80240784 00068C03 */ sra $s1, $a2, 0x10 -/* BCF378 80240788 0C00AAB1 */ jal func_8002AAC4 -/* BCF37C 8024078C 0220302D */ daddu $a2, $s1, $zero -/* BCF380 80240790 8EA20028 */ lw $v0, 0x28($s5) -/* BCF384 80240794 2442FFFF */ addiu $v0, $v0, -1 -/* BCF388 80240798 0242102A */ slt $v0, $s2, $v0 -/* BCF38C 8024079C 10400017 */ beqz $v0, .L802407FC -/* BCF390 802407A0 0220202D */ daddu $a0, $s1, $zero -/* BCF394 802407A4 0080302D */ daddu $a2, $a0, $zero -/* BCF398 802407A8 3C0B8024 */ lui $t3, 0x8024 -/* BCF39C 802407AC 256B30C0 */ addiu $t3, $t3, 0x30c0 -/* BCF3A0 802407B0 02EB1021 */ addu $v0, $s7, $t3 -/* BCF3A4 802407B4 904A0000 */ lbu $t2, ($v0) -/* BCF3A8 802407B8 02CB1021 */ addu $v0, $s6, $t3 -/* BCF3AC 802407BC 90490000 */ lbu $t1, ($v0) -/* BCF3B0 802407C0 026B1021 */ addu $v0, $s3, $t3 -/* BCF3B4 802407C4 8FA50028 */ lw $a1, 0x28($sp) -/* BCF3B8 802407C8 8FA7002C */ lw $a3, 0x2c($sp) -/* BCF3BC 802407CC 90420000 */ lbu $v0, ($v0) -/* BCF3C0 802407D0 240B00FF */ addiu $t3, $zero, 0xff -/* BCF3C4 802407D4 AFAB001C */ sw $t3, 0x1c($sp) -/* BCF3C8 802407D8 AFA20010 */ sw $v0, 0x10($sp) -/* BCF3CC 802407DC AFAA0014 */ sw $t2, 0x14($sp) -/* BCF3D0 802407E0 0C00AAB1 */ jal func_8002AAC4 -/* BCF3D4 802407E4 AFA90018 */ sw $t1, 0x18($sp) -/* BCF3D8 802407E8 8EA20028 */ lw $v0, 0x28($s5) -/* BCF3DC 802407EC 8FB20024 */ lw $s2, 0x24($sp) -/* BCF3E0 802407F0 0242102A */ slt $v0, $s2, $v0 -/* BCF3E4 802407F4 1440FFB6 */ bnez $v0, .L802406D0 -/* BCF3E8 802407F8 0290A021 */ addu $s4, $s4, $s0 -.L802407FC: -/* BCF3EC 802407FC 0000A02D */ daddu $s4, $zero, $zero -.L80240800: -/* BCF3F0 80240800 8EA20028 */ lw $v0, 0x28($s5) -/* BCF3F4 80240804 18400076 */ blez $v0, .L802409E0 -/* BCF3F8 80240808 0280902D */ daddu $s2, $s4, $zero -/* BCF3FC 8024080C 24160002 */ addiu $s6, $zero, 2 -/* BCF400 80240810 24130001 */ addiu $s3, $zero, 1 -/* BCF404 80240814 8FAB006C */ lw $t3, 0x6c($sp) -/* BCF408 80240818 3C178024 */ lui $s7, 0x8024 -/* BCF40C 8024081C 26F730B0 */ addiu $s7, $s7, 0x30b0 -/* BCF410 80240820 000B1400 */ sll $v0, $t3, 0x10 -/* BCF414 80240824 00021403 */ sra $v0, $v0, 0x10 -/* BCF418 80240828 AFA20030 */ sw $v0, 0x30($sp) -/* BCF41C 8024082C 25620005 */ addiu $v0, $t3, 5 -/* BCF420 80240830 00021400 */ sll $v0, $v0, 0x10 -/* BCF424 80240834 00021403 */ sra $v0, $v0, 0x10 -/* BCF428 80240838 3C0B8024 */ lui $t3, 0x8024 -/* BCF42C 8024083C 256B30C0 */ addiu $t3, $t3, 0x30c0 -/* BCF430 80240840 AFAB0038 */ sw $t3, 0x38($sp) -/* BCF434 80240844 240B0004 */ addiu $t3, $zero, 4 -/* BCF438 80240848 AFA20034 */ sw $v0, 0x34($sp) -/* BCF43C 8024084C AFAB003C */ sw $t3, 0x3c($sp) -.L80240850: -/* BCF440 80240850 3C0B8024 */ lui $t3, 0x8024 -/* BCF444 80240854 256B30B0 */ addiu $t3, $t3, 0x30b0 -/* BCF448 80240858 026B1021 */ addu $v0, $s3, $t3 -/* BCF44C 8024085C 904A0000 */ lbu $t2, ($v0) -/* BCF450 80240860 8FAB003C */ lw $t3, 0x3c($sp) -/* BCF454 80240864 92E80000 */ lbu $t0, ($s7) -/* BCF458 80240868 02AB1021 */ addu $v0, $s5, $t3 -/* BCF45C 8024086C 3C0B8024 */ lui $t3, 0x8024 -/* BCF460 80240870 256B30B0 */ addiu $t3, $t3, 0x30b0 -/* BCF464 80240874 8C450010 */ lw $a1, 0x10($v0) -/* BCF468 80240878 02CB1021 */ addu $v0, $s6, $t3 -/* BCF46C 8024087C 90490000 */ lbu $t1, ($v0) -/* BCF470 80240880 03C5102A */ slt $v0, $fp, $a1 -/* BCF474 80240884 54400001 */ bnel $v0, $zero, .L8024088C -/* BCF478 80240888 03C0282D */ daddu $a1, $fp, $zero -.L8024088C: -/* BCF47C 8024088C 00051900 */ sll $v1, $a1, 4 -/* BCF480 80240890 00651823 */ subu $v1, $v1, $a1 -/* BCF484 80240894 8FAB0020 */ lw $t3, 0x20($sp) -/* BCF488 80240898 00031880 */ sll $v1, $v1, 2 -/* BCF48C 8024089C 15600002 */ bnez $t3, .L802408A8 -/* BCF490 802408A0 006B001A */ div $zero, $v1, $t3 -/* BCF494 802408A4 0007000D */ break 7 -.L802408A8: -/* BCF498 802408A8 2401FFFF */ addiu $at, $zero, -1 -/* BCF49C 802408AC 15610004 */ bne $t3, $at, .L802408C0 -/* BCF4A0 802408B0 3C018000 */ lui $at, 0x8000 -/* BCF4A4 802408B4 14610002 */ bne $v1, $at, .L802408C0 -/* BCF4A8 802408B8 00000000 */ nop -/* BCF4AC 802408BC 0006000D */ break 6 -.L802408C0: -/* BCF4B0 802408C0 00001812 */ mflo $v1 -/* BCF4B4 802408C4 8EA40008 */ lw $a0, 8($s5) -/* BCF4B8 802408C8 3C0251EB */ lui $v0, 0x51eb -/* BCF4BC 802408CC 3442851F */ ori $v0, $v0, 0x851f -/* BCF4C0 802408D0 00820018 */ mult $a0, $v0 -/* BCF4C4 802408D4 000427C3 */ sra $a0, $a0, 0x1f -/* BCF4C8 802408D8 00006010 */ mfhi $t4 -/* BCF4CC 802408DC 000C1143 */ sra $v0, $t4, 5 -/* BCF4D0 802408E0 00441023 */ subu $v0, $v0, $a0 -/* BCF4D4 802408E4 00548023 */ subu $s0, $v0, $s4 -/* BCF4D8 802408E8 0600003D */ bltz $s0, .L802409E0 -/* BCF4DC 802408EC 00748823 */ subu $s1, $v1, $s4 -/* BCF4E0 802408F0 52200007 */ beql $s1, $zero, .L80240910 -/* BCF4E4 802408F4 0200882D */ daddu $s1, $s0, $zero -/* BCF4E8 802408F8 14BE0003 */ bne $a1, $fp, .L80240908 -/* BCF4EC 802408FC 0230102A */ slt $v0, $s1, $s0 -/* BCF4F0 80240900 08090244 */ j .L80240910 -/* BCF4F4 80240904 0200882D */ daddu $s1, $s0, $zero -.L80240908: -/* BCF4F8 80240908 54400001 */ bnel $v0, $zero, .L80240910 -/* BCF4FC 8024090C 0220802D */ daddu $s0, $s1, $zero -.L80240910: -/* BCF500 80240910 8FAB0068 */ lw $t3, 0x68($sp) -/* BCF504 80240914 8FA50030 */ lw $a1, 0x30($sp) -/* BCF508 80240918 8FA70034 */ lw $a3, 0x34($sp) -/* BCF50C 8024091C AFA80010 */ sw $t0, 0x10($sp) -/* BCF510 80240920 AFAA0014 */ sw $t2, 0x14($sp) -/* BCF514 80240924 AFA90018 */ sw $t1, 0x18($sp) -/* BCF518 80240928 01741021 */ addu $v0, $t3, $s4 -/* BCF51C 8024092C 00022400 */ sll $a0, $v0, 0x10 -/* BCF520 80240930 00042403 */ sra $a0, $a0, 0x10 -/* BCF524 80240934 00501021 */ addu $v0, $v0, $s0 -/* BCF528 80240938 00021400 */ sll $v0, $v0, 0x10 -/* BCF52C 8024093C 00028403 */ sra $s0, $v0, 0x10 -/* BCF530 80240940 0200302D */ daddu $a2, $s0, $zero -/* BCF534 80240944 240B00FF */ addiu $t3, $zero, 0xff -/* BCF538 80240948 0C00AAB1 */ jal func_8002AAC4 -/* BCF53C 8024094C AFAB001C */ sw $t3, 0x1c($sp) -/* BCF540 80240950 8EA20028 */ lw $v0, 0x28($s5) -/* BCF544 80240954 2442FFFF */ addiu $v0, $v0, -1 -/* BCF548 80240958 0242102A */ slt $v0, $s2, $v0 -/* BCF54C 8024095C 10400020 */ beqz $v0, .L802409E0 -/* BCF550 80240960 0200202D */ daddu $a0, $s0, $zero -/* BCF554 80240964 0080302D */ daddu $a2, $a0, $zero -/* BCF558 80240968 0291A021 */ addu $s4, $s4, $s1 -/* BCF55C 8024096C 3C0B8024 */ lui $t3, 0x8024 -/* BCF560 80240970 256B30C0 */ addiu $t3, $t3, 0x30c0 -/* BCF564 80240974 02CB4021 */ addu $t0, $s6, $t3 -/* BCF568 80240978 26D60003 */ addiu $s6, $s6, 3 -/* BCF56C 8024097C 026B1021 */ addu $v0, $s3, $t3 -/* BCF570 80240980 26730003 */ addiu $s3, $s3, 3 -/* BCF574 80240984 26F70003 */ addiu $s7, $s7, 3 -/* BCF578 80240988 8FAB0038 */ lw $t3, 0x38($sp) -/* BCF57C 8024098C 8FA50030 */ lw $a1, 0x30($sp) -/* BCF580 80240990 91630000 */ lbu $v1, ($t3) -/* BCF584 80240994 256B0003 */ addiu $t3, $t3, 3 -/* BCF588 80240998 AFAB0038 */ sw $t3, 0x38($sp) -/* BCF58C 8024099C 8FAB003C */ lw $t3, 0x3c($sp) -/* BCF590 802409A0 8FA70034 */ lw $a3, 0x34($sp) -/* BCF594 802409A4 256B0004 */ addiu $t3, $t3, 4 -/* BCF598 802409A8 AFAB003C */ sw $t3, 0x3c($sp) -/* BCF59C 802409AC 904A0000 */ lbu $t2, ($v0) -/* BCF5A0 802409B0 91090000 */ lbu $t1, ($t0) -/* BCF5A4 802409B4 240B00FF */ addiu $t3, $zero, 0xff -/* BCF5A8 802409B8 AFAB001C */ sw $t3, 0x1c($sp) -/* BCF5AC 802409BC AFA30010 */ sw $v1, 0x10($sp) -/* BCF5B0 802409C0 AFAA0014 */ sw $t2, 0x14($sp) -/* BCF5B4 802409C4 0C00AAB1 */ jal func_8002AAC4 -/* BCF5B8 802409C8 AFA90018 */ sw $t1, 0x18($sp) -/* BCF5BC 802409CC 8EA20028 */ lw $v0, 0x28($s5) -/* BCF5C0 802409D0 26520001 */ addiu $s2, $s2, 1 -/* BCF5C4 802409D4 0242102A */ slt $v0, $s2, $v0 -/* BCF5C8 802409D8 1440FF9D */ bnez $v0, .L80240850 -/* BCF5CC 802409DC 00000000 */ nop -.L802409E0: -/* BCF5D0 802409E0 8FBF0064 */ lw $ra, 0x64($sp) -/* BCF5D4 802409E4 8FBE0060 */ lw $fp, 0x60($sp) -/* BCF5D8 802409E8 8FB7005C */ lw $s7, 0x5c($sp) -/* BCF5DC 802409EC 8FB60058 */ lw $s6, 0x58($sp) -/* BCF5E0 802409F0 8FB50054 */ lw $s5, 0x54($sp) -/* BCF5E4 802409F4 8FB40050 */ lw $s4, 0x50($sp) -/* BCF5E8 802409F8 8FB3004C */ lw $s3, 0x4c($sp) -/* BCF5EC 802409FC 8FB20048 */ lw $s2, 0x48($sp) -/* BCF5F0 80240A00 8FB10044 */ lw $s1, 0x44($sp) -/* BCF5F4 80240A04 8FB00040 */ lw $s0, 0x40($sp) -/* BCF5F8 80240A08 03E00008 */ jr $ra -/* BCF5FC 80240A0C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_80240A6C_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_80240A6C_BCEBF0.s deleted file mode 100644 index 7b570bc322..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_80240A6C_BCEBF0.s +++ /dev/null @@ -1,311 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_BCF65C -/* BCF65C 80240A6C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BCF660 80240A70 AFBF001C */ sw $ra, 0x1c($sp) -/* BCF664 80240A74 AFB20018 */ sw $s2, 0x18($sp) -/* BCF668 80240A78 AFB10014 */ sw $s1, 0x14($sp) -/* BCF66C 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* BCF670 80240A80 0C090150 */ jal func_80240540 -/* BCF674 80240A84 F7B40020 */ sdc1 $f20, 0x20($sp) -/* BCF678 80240A88 0040882D */ daddu $s1, $v0, $zero -/* BCF67C 80240A8C 8E2301C0 */ lw $v1, 0x1c0($s1) -/* BCF680 80240A90 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* BCF684 80240A94 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* BCF688 80240A98 00031880 */ sll $v1, $v1, 2 -/* BCF68C 80240A9C 8C420010 */ lw $v0, 0x10($v0) -/* BCF690 80240AA0 02231821 */ addu $v1, $s1, $v1 -/* BCF694 80240AA4 30428000 */ andi $v0, $v0, 0x8000 -/* BCF698 80240AA8 AC620058 */ sw $v0, 0x58($v1) -/* BCF69C 80240AAC 8E2201C0 */ lw $v0, 0x1c0($s1) -/* BCF6A0 80240AB0 24420001 */ addiu $v0, $v0, 1 -/* BCF6A4 80240AB4 AE2201C0 */ sw $v0, 0x1c0($s1) -/* BCF6A8 80240AB8 2842005A */ slti $v0, $v0, 0x5a -/* BCF6AC 80240ABC 50400001 */ beql $v0, $zero, .L80240AC4 -/* BCF6B0 80240AC0 AE2001C0 */ sw $zero, 0x1c0($s1) -.L80240AC4: -/* BCF6B4 80240AC4 8E230030 */ lw $v1, 0x30($s1) -/* BCF6B8 80240AC8 24120001 */ addiu $s2, $zero, 1 -/* BCF6BC 80240ACC 10720023 */ beq $v1, $s2, .L80240B5C -/* BCF6C0 80240AD0 28620002 */ slti $v0, $v1, 2 -/* BCF6C4 80240AD4 50400005 */ beql $v0, $zero, .L80240AEC -/* BCF6C8 80240AD8 2402000A */ addiu $v0, $zero, 0xa -/* BCF6CC 80240ADC 10600009 */ beqz $v1, .L80240B04 -/* BCF6D0 80240AE0 240500FF */ addiu $a1, $zero, 0xff -/* BCF6D4 80240AE4 080903B7 */ j .L80240EDC -/* BCF6D8 80240AE8 00000000 */ nop -.L80240AEC: -/* BCF6DC 80240AEC 10620033 */ beq $v1, $v0, .L80240BBC -/* BCF6E0 80240AF0 2402000B */ addiu $v0, $zero, 0xb -/* BCF6E4 80240AF4 10620038 */ beq $v1, $v0, .L80240BD8 -/* BCF6E8 80240AF8 00000000 */ nop -/* BCF6EC 80240AFC 080903B7 */ j .L80240EDC -/* BCF6F0 80240B00 00000000 */ nop -.L80240B04: -/* BCF6F4 80240B04 8E30003C */ lw $s0, 0x3c($s1) -/* BCF6F8 80240B08 0C0513AC */ jal icon_set_opacity -/* BCF6FC 80240B0C 0200202D */ daddu $a0, $s0, $zero -/* BCF700 80240B10 0200202D */ daddu $a0, $s0, $zero -/* BCF704 80240B14 0C05128B */ jal clear_icon_flags -/* BCF708 80240B18 24050002 */ addiu $a1, $zero, 2 -/* BCF70C 80240B1C 8E300040 */ lw $s0, 0x40($s1) -/* BCF710 80240B20 240500FF */ addiu $a1, $zero, 0xff -/* BCF714 80240B24 0C0513AC */ jal icon_set_opacity -/* BCF718 80240B28 0200202D */ daddu $a0, $s0, $zero -/* BCF71C 80240B2C 0200202D */ daddu $a0, $s0, $zero -/* BCF720 80240B30 0C05128B */ jal clear_icon_flags -/* BCF724 80240B34 24050002 */ addiu $a1, $zero, 2 -/* BCF728 80240B38 8E300044 */ lw $s0, 0x44($s1) -/* BCF72C 80240B3C 240500FF */ addiu $a1, $zero, 0xff -/* BCF730 80240B40 0C0513AC */ jal icon_set_opacity -/* BCF734 80240B44 0200202D */ daddu $a0, $s0, $zero -/* BCF738 80240B48 0200202D */ daddu $a0, $s0, $zero -/* BCF73C 80240B4C 0C05128B */ jal clear_icon_flags -/* BCF740 80240B50 24050002 */ addiu $a1, $zero, 2 -/* BCF744 80240B54 080903B7 */ j .L80240EDC -/* BCF748 80240B58 AE320030 */ sw $s2, 0x30($s1) -.L80240B5C: -/* BCF74C 80240B5C 8E220034 */ lw $v0, 0x34($s1) -/* BCF750 80240B60 24420014 */ addiu $v0, $v0, 0x14 -/* BCF754 80240B64 AE220034 */ sw $v0, 0x34($s1) -/* BCF758 80240B68 28420033 */ slti $v0, $v0, 0x33 -/* BCF75C 80240B6C 14400002 */ bnez $v0, .L80240B78 -/* BCF760 80240B70 24020032 */ addiu $v0, $zero, 0x32 -/* BCF764 80240B74 AE220034 */ sw $v0, 0x34($s1) -.L80240B78: -/* BCF768 80240B78 8E24003C */ lw $a0, 0x3c($s1) -/* BCF76C 80240B7C 8E250034 */ lw $a1, 0x34($s1) -/* BCF770 80240B80 0C051261 */ jal set_icon_render_pos -/* BCF774 80240B84 8E260038 */ lw $a2, 0x38($s1) -/* BCF778 80240B88 8E240040 */ lw $a0, 0x40($s1) -/* BCF77C 80240B8C 8E260038 */ lw $a2, 0x38($s1) -/* BCF780 80240B90 8E250034 */ lw $a1, 0x34($s1) -/* BCF784 80240B94 0C051261 */ jal set_icon_render_pos -/* BCF788 80240B98 24C6001C */ addiu $a2, $a2, 0x1c -/* BCF78C 80240B9C 8E240044 */ lw $a0, 0x44($s1) -/* BCF790 80240BA0 8E250034 */ lw $a1, 0x34($s1) -/* BCF794 80240BA4 8E260038 */ lw $a2, 0x38($s1) -/* BCF798 80240BA8 24A50002 */ addiu $a1, $a1, 2 -/* BCF79C 80240BAC 0C051261 */ jal set_icon_render_pos -/* BCF7A0 80240BB0 24C6000E */ addiu $a2, $a2, 0xe -/* BCF7A4 80240BB4 080903B7 */ j .L80240EDC -/* BCF7A8 80240BB8 00000000 */ nop -.L80240BBC: -/* BCF7AC 80240BBC 8E24003C */ lw $a0, 0x3c($s1) -/* BCF7B0 80240BC0 3C058011 */ lui $a1, 0x8011 -/* BCF7B4 80240BC4 24A58C34 */ addiu $a1, $a1, -0x73cc -/* BCF7B8 80240BC8 0C0511FF */ jal set_menu_icon_script -/* BCF7BC 80240BCC 00000000 */ nop -/* BCF7C0 80240BD0 2402000B */ addiu $v0, $zero, 0xb -/* BCF7C4 80240BD4 AE220030 */ sw $v0, 0x30($s1) -.L80240BD8: -/* BCF7C8 80240BD8 8E2301C0 */ lw $v1, 0x1c0($s1) -/* BCF7CC 80240BDC 2405005A */ addiu $a1, $zero, 0x5a -/* BCF7D0 80240BE0 2463FFA6 */ addiu $v1, $v1, -0x5a -/* BCF7D4 80240BE4 04610002 */ bgez $v1, .L80240BF0 -/* BCF7D8 80240BE8 AE200004 */ sw $zero, 4($s1) -/* BCF7DC 80240BEC 00651821 */ addu $v1, $v1, $a1 -.L80240BF0: -/* BCF7E0 80240BF0 0000802D */ daddu $s0, $zero, $zero -/* BCF7E4 80240BF4 0200202D */ daddu $a0, $s0, $zero -.L80240BF8: -/* BCF7E8 80240BF8 2862005A */ slti $v0, $v1, 0x5a -/* BCF7EC 80240BFC 50400001 */ beql $v0, $zero, .L80240C04 -/* BCF7F0 80240C00 2463FFA6 */ addiu $v1, $v1, -0x5a -.L80240C04: -/* BCF7F4 80240C04 00031080 */ sll $v0, $v1, 2 -/* BCF7F8 80240C08 02221021 */ addu $v0, $s1, $v0 -/* BCF7FC 80240C0C 8C420058 */ lw $v0, 0x58($v0) -/* BCF800 80240C10 54400001 */ bnel $v0, $zero, .L80240C18 -/* BCF804 80240C14 26100001 */ addiu $s0, $s0, 1 -.L80240C18: -/* BCF808 80240C18 24840001 */ addiu $a0, $a0, 1 -/* BCF80C 80240C1C 0085102A */ slt $v0, $a0, $a1 -/* BCF810 80240C20 1440FFF5 */ bnez $v0, .L80240BF8 -/* BCF814 80240C24 24630001 */ addiu $v1, $v1, 1 -/* BCF818 80240C28 0000202D */ daddu $a0, $zero, $zero -/* BCF81C 80240C2C 3C05FD05 */ lui $a1, 0xfd05 -/* BCF820 80240C30 34A50F87 */ ori $a1, $a1, 0xf87 -/* BCF824 80240C34 00103140 */ sll $a2, $s0, 5 -/* BCF828 80240C38 00D03023 */ subu $a2, $a2, $s0 -/* BCF82C 80240C3C 00063080 */ sll $a2, $a2, 2 -/* BCF830 80240C40 00D03021 */ addu $a2, $a2, $s0 -/* BCF834 80240C44 0C0B2026 */ jal set_variable -/* BCF838 80240C48 000630C0 */ sll $a2, $a2, 3 -/* BCF83C 80240C4C 3C032E8B */ lui $v1, 0x2e8b -/* BCF840 80240C50 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* BCF844 80240C54 00101040 */ sll $v0, $s0, 1 -/* BCF848 80240C58 00501021 */ addu $v0, $v0, $s0 -/* BCF84C 80240C5C 000210C0 */ sll $v0, $v0, 3 -/* BCF850 80240C60 00501021 */ addu $v0, $v0, $s0 -/* BCF854 80240C64 00021080 */ sll $v0, $v0, 2 -/* BCF858 80240C68 00430018 */ mult $v0, $v1 -/* BCF85C 80240C6C 000217C3 */ sra $v0, $v0, 0x1f -/* BCF860 80240C70 00003810 */ mfhi $a3 -/* BCF864 80240C74 00071883 */ sra $v1, $a3, 2 -/* BCF868 80240C78 00621823 */ subu $v1, $v1, $v0 -/* BCF86C 80240C7C 04610002 */ bgez $v1, .L80240C88 -/* BCF870 80240C80 AE230004 */ sw $v1, 4($s1) -/* BCF874 80240C84 AE200004 */ sw $zero, 4($s1) -.L80240C88: -/* BCF878 80240C88 8E220004 */ lw $v0, 4($s1) -/* BCF87C 80240C8C 28420065 */ slti $v0, $v0, 0x65 -/* BCF880 80240C90 14400004 */ bnez $v0, .L80240CA4 -/* BCF884 80240C94 3C028888 */ lui $v0, 0x8888 -/* BCF888 80240C98 24020064 */ addiu $v0, $zero, 0x64 -/* BCF88C 80240C9C AE220004 */ sw $v0, 4($s1) -/* BCF890 80240CA0 3C028888 */ lui $v0, 0x8888 -.L80240CA4: -/* BCF894 80240CA4 8E230008 */ lw $v1, 8($s1) -/* BCF898 80240CA8 34428889 */ ori $v0, $v0, 0x8889 -/* BCF89C 80240CAC 00620018 */ mult $v1, $v0 -/* BCF8A0 80240CB0 00003810 */ mfhi $a3 -/* BCF8A4 80240CB4 00E31021 */ addu $v0, $a3, $v1 -/* BCF8A8 80240CB8 00021143 */ sra $v0, $v0, 5 -/* BCF8AC 80240CBC 00031FC3 */ sra $v1, $v1, 0x1f -/* BCF8B0 80240CC0 00438023 */ subu $s0, $v0, $v1 -/* BCF8B4 80240CC4 2A020033 */ slti $v0, $s0, 0x33 -/* BCF8B8 80240CC8 10400021 */ beqz $v0, .L80240D50 -/* BCF8BC 80240CCC 00101840 */ sll $v1, $s0, 1 -/* BCF8C0 80240CD0 3C0451EB */ lui $a0, 0x51eb -/* BCF8C4 80240CD4 3484851F */ ori $a0, $a0, 0x851f -/* BCF8C8 80240CD8 00701821 */ addu $v1, $v1, $s0 -/* BCF8CC 80240CDC 00031100 */ sll $v0, $v1, 4 -/* BCF8D0 80240CE0 00431023 */ subu $v0, $v0, $v1 -/* BCF8D4 80240CE4 00021040 */ sll $v0, $v0, 1 -/* BCF8D8 80240CE8 00440018 */ mult $v0, $a0 -/* BCF8DC 80240CEC 000217C3 */ sra $v0, $v0, 0x1f -/* BCF8E0 80240CF0 3C0140C9 */ lui $at, 0x40c9 -/* BCF8E4 80240CF4 34210FD0 */ ori $at, $at, 0xfd0 -/* BCF8E8 80240CF8 44810000 */ mtc1 $at, $f0 -/* BCF8EC 80240CFC 00003810 */ mfhi $a3 -/* BCF8F0 80240D00 00071903 */ sra $v1, $a3, 4 -/* BCF8F4 80240D04 00621823 */ subu $v1, $v1, $v0 -/* BCF8F8 80240D08 44836000 */ mtc1 $v1, $f12 -/* BCF8FC 80240D0C 00000000 */ nop -/* BCF900 80240D10 46806320 */ cvt.s.w $f12, $f12 -/* BCF904 80240D14 46006302 */ mul.s $f12, $f12, $f0 -/* BCF908 80240D18 00000000 */ nop -/* BCF90C 80240D1C 3C0143B4 */ lui $at, 0x43b4 -/* BCF910 80240D20 44810000 */ mtc1 $at, $f0 -/* BCF914 80240D24 0C00A85B */ jal sin_rad -/* BCF918 80240D28 46006303 */ div.s $f12, $f12, $f0 -/* BCF91C 80240D2C 3C014248 */ lui $at, 0x4248 -/* BCF920 80240D30 44811000 */ mtc1 $at, $f2 -/* BCF924 80240D34 00000000 */ nop -/* BCF928 80240D38 46020002 */ mul.s $f0, $f0, $f2 -/* BCF92C 80240D3C 00000000 */ nop -/* BCF930 80240D40 4600018D */ trunc.w.s $f6, $f0 -/* BCF934 80240D44 44103000 */ mfc1 $s0, $f6 -/* BCF938 80240D48 0809037D */ j .L80240DF4 -/* BCF93C 80240D4C 24020064 */ addiu $v0, $zero, 0x64 -.L80240D50: -/* BCF940 80240D50 3C0451EB */ lui $a0, 0x51eb -/* BCF944 80240D54 3484851F */ ori $a0, $a0, 0x851f -/* BCF948 80240D58 2602FFCE */ addiu $v0, $s0, -0x32 -/* BCF94C 80240D5C 00021840 */ sll $v1, $v0, 1 -/* BCF950 80240D60 00621821 */ addu $v1, $v1, $v0 -/* BCF954 80240D64 00031100 */ sll $v0, $v1, 4 -/* BCF958 80240D68 00431023 */ subu $v0, $v0, $v1 -/* BCF95C 80240D6C 00021040 */ sll $v0, $v0, 1 -/* BCF960 80240D70 00440018 */ mult $v0, $a0 -/* BCF964 80240D74 000217C3 */ sra $v0, $v0, 0x1f -/* BCF968 80240D78 3C0140C9 */ lui $at, 0x40c9 -/* BCF96C 80240D7C 34210FD0 */ ori $at, $at, 0xfd0 -/* BCF970 80240D80 44810000 */ mtc1 $at, $f0 -/* BCF974 80240D84 00003810 */ mfhi $a3 -/* BCF978 80240D88 00071903 */ sra $v1, $a3, 4 -/* BCF97C 80240D8C 00621823 */ subu $v1, $v1, $v0 -/* BCF980 80240D90 2463005A */ addiu $v1, $v1, 0x5a -/* BCF984 80240D94 44836000 */ mtc1 $v1, $f12 -/* BCF988 80240D98 00000000 */ nop -/* BCF98C 80240D9C 46806320 */ cvt.s.w $f12, $f12 -/* BCF990 80240DA0 46006302 */ mul.s $f12, $f12, $f0 -/* BCF994 80240DA4 00000000 */ nop -/* BCF998 80240DA8 3C0143B4 */ lui $at, 0x43b4 -/* BCF99C 80240DAC 44810000 */ mtc1 $at, $f0 -/* BCF9A0 80240DB0 0C00A85B */ jal sin_rad -/* BCF9A4 80240DB4 46006303 */ div.s $f12, $f12, $f0 -/* BCF9A8 80240DB8 3C013FF0 */ lui $at, 0x3ff0 -/* BCF9AC 80240DBC 44811800 */ mtc1 $at, $f3 -/* BCF9B0 80240DC0 44801000 */ mtc1 $zero, $f2 -/* BCF9B4 80240DC4 46000021 */ cvt.d.s $f0, $f0 -/* BCF9B8 80240DC8 46201081 */ sub.d $f2, $f2, $f0 -/* BCF9BC 80240DCC 3C014049 */ lui $at, 0x4049 -/* BCF9C0 80240DD0 44810800 */ mtc1 $at, $f1 -/* BCF9C4 80240DD4 44800000 */ mtc1 $zero, $f0 -/* BCF9C8 80240DD8 00000000 */ nop -/* BCF9CC 80240DDC 46201082 */ mul.d $f2, $f2, $f0 -/* BCF9D0 80240DE0 00000000 */ nop -/* BCF9D4 80240DE4 46201080 */ add.d $f2, $f2, $f0 -/* BCF9D8 80240DE8 4620118D */ trunc.w.d $f6, $f2 -/* BCF9DC 80240DEC 44103000 */ mfc1 $s0, $f6 -/* BCF9E0 80240DF0 24020064 */ addiu $v0, $zero, 0x64 -.L80240DF4: -/* BCF9E4 80240DF4 00501023 */ subu $v0, $v0, $s0 -/* BCF9E8 80240DF8 3C013FD0 */ lui $at, 0x3fd0 -/* BCF9EC 80240DFC 44811800 */ mtc1 $at, $f3 -/* BCF9F0 80240E00 44801000 */ mtc1 $zero, $f2 -/* BCF9F4 80240E04 44820000 */ mtc1 $v0, $f0 -/* BCF9F8 80240E08 00000000 */ nop -/* BCF9FC 80240E0C 46800021 */ cvt.d.w $f0, $f0 -/* BCFA00 80240E10 46220002 */ mul.d $f0, $f0, $f2 -/* BCFA04 80240E14 00000000 */ nop -/* BCFA08 80240E18 44901000 */ mtc1 $s0, $f2 -/* BCFA0C 80240E1C 00000000 */ nop -/* BCFA10 80240E20 468010A1 */ cvt.d.w $f2, $f2 -/* BCFA14 80240E24 46221080 */ add.d $f2, $f2, $f2 -/* BCFA18 80240E28 3C014059 */ lui $at, 0x4059 -/* BCFA1C 80240E2C 44812800 */ mtc1 $at, $f5 -/* BCFA20 80240E30 44802000 */ mtc1 $zero, $f4 -/* BCFA24 80240E34 00000000 */ nop -/* BCFA28 80240E38 46241083 */ div.d $f2, $f2, $f4 -/* BCFA2C 80240E3C 46240003 */ div.d $f0, $f0, $f4 -/* BCFA30 80240E40 46220000 */ add.d $f0, $f0, $f2 -/* BCFA34 80240E44 8E24000C */ lw $a0, 0xc($s1) -/* BCFA38 80240E48 46200020 */ cvt.s.d $f0, $f0 -/* BCFA3C 80240E4C 44050000 */ mfc1 $a1, $f0 -/* BCFA40 80240E50 0C01574E */ jal func_80055D38 -/* BCFA44 80240E54 AE2501C4 */ sw $a1, 0x1c4($s1) -/* BCFA48 80240E58 8E24004C */ lw $a0, 0x4c($s1) -/* BCFA4C 80240E5C 0C0B11EA */ jal get_script_by_id -/* BCFA50 80240E60 00000000 */ nop -/* BCFA54 80240E64 C62201C4 */ lwc1 $f2, 0x1c4($s1) -/* BCFA58 80240E68 3C014040 */ lui $at, 0x4040 -/* BCFA5C 80240E6C 44810000 */ mtc1 $at, $f0 -/* BCFA60 80240E70 00000000 */ nop -/* BCFA64 80240E74 46001082 */ mul.s $f2, $f2, $f0 -/* BCFA68 80240E78 00000000 */ nop -/* BCFA6C 80240E7C 44051000 */ mfc1 $a1, $f2 -/* BCFA70 80240E80 0C0B1078 */ jal set_script_timescale -/* BCFA74 80240E84 0040202D */ daddu $a0, $v0, $zero -/* BCFA78 80240E88 8E240050 */ lw $a0, 0x50($s1) -/* BCFA7C 80240E8C 0C0B11EA */ jal get_script_by_id -/* BCFA80 80240E90 00000000 */ nop -/* BCFA84 80240E94 C62001C4 */ lwc1 $f0, 0x1c4($s1) -/* BCFA88 80240E98 3C0140A0 */ lui $at, 0x40a0 -/* BCFA8C 80240E9C 4481A000 */ mtc1 $at, $f20 -/* BCFA90 80240EA0 00000000 */ nop -/* BCFA94 80240EA4 46140002 */ mul.s $f0, $f0, $f20 -/* BCFA98 80240EA8 00000000 */ nop -/* BCFA9C 80240EAC 44050000 */ mfc1 $a1, $f0 -/* BCFAA0 80240EB0 0C0B1078 */ jal set_script_timescale -/* BCFAA4 80240EB4 0040202D */ daddu $a0, $v0, $zero -/* BCFAA8 80240EB8 8E240054 */ lw $a0, 0x54($s1) -/* BCFAAC 80240EBC 0C0B11EA */ jal get_script_by_id -/* BCFAB0 80240EC0 00000000 */ nop -/* BCFAB4 80240EC4 C62001C4 */ lwc1 $f0, 0x1c4($s1) -/* BCFAB8 80240EC8 46140002 */ mul.s $f0, $f0, $f20 -/* BCFABC 80240ECC 00000000 */ nop -/* BCFAC0 80240ED0 44050000 */ mfc1 $a1, $f0 -/* BCFAC4 80240ED4 0C0B1078 */ jal set_script_timescale -/* BCFAC8 80240ED8 0040202D */ daddu $a0, $v0, $zero -.L80240EDC: -/* BCFACC 80240EDC 8FBF001C */ lw $ra, 0x1c($sp) -/* BCFAD0 80240EE0 8FB20018 */ lw $s2, 0x18($sp) -/* BCFAD4 80240EE4 8FB10014 */ lw $s1, 0x14($sp) -/* BCFAD8 80240EE8 8FB00010 */ lw $s0, 0x10($sp) -/* BCFADC 80240EEC D7B40020 */ ldc1 $f20, 0x20($sp) -/* BCFAE0 80240EF0 03E00008 */ jr $ra -/* BCFAE4 80240EF4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_80240EF8_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_80240EF8_BCEBF0.s deleted file mode 100644 index 6d39c4feca..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_80240EF8_BCEBF0.s +++ /dev/null @@ -1,118 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EF8_BCFAE8 -/* BCFAE8 80240EF8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BCFAEC 80240EFC AFB10014 */ sw $s1, 0x14($sp) -/* BCFAF0 80240F00 AFBF0018 */ sw $ra, 0x18($sp) -/* BCFAF4 80240F04 AFB00010 */ sw $s0, 0x10($sp) -/* BCFAF8 80240F08 F7B40020 */ sdc1 $f20, 0x20($sp) -/* BCFAFC 80240F0C 0C090150 */ jal func_80240540 -/* BCFB00 80240F10 0080882D */ daddu $s1, $a0, $zero -/* BCFB04 80240F14 3C041062 */ lui $a0, 0x1062 -/* BCFB08 80240F18 8E230084 */ lw $v1, 0x84($s1) -/* BCFB0C 80240F1C 34844DD3 */ ori $a0, $a0, 0x4dd3 -/* BCFB10 80240F20 00640018 */ mult $v1, $a0 -/* BCFB14 80240F24 3C0551EB */ lui $a1, 0x51eb -/* BCFB18 80240F28 34A5851F */ ori $a1, $a1, 0x851f -/* BCFB1C 80240F2C 00031FC3 */ sra $v1, $v1, 0x1f -/* BCFB20 80240F30 00003010 */ mfhi $a2 -/* BCFB24 80240F34 00062183 */ sra $a0, $a2, 6 -/* BCFB28 80240F38 00831823 */ subu $v1, $a0, $v1 -/* BCFB2C 80240F3C 00032040 */ sll $a0, $v1, 1 -/* BCFB30 80240F40 00832021 */ addu $a0, $a0, $v1 -/* BCFB34 80240F44 00041900 */ sll $v1, $a0, 4 -/* BCFB38 80240F48 00641823 */ subu $v1, $v1, $a0 -/* BCFB3C 80240F4C 00031840 */ sll $v1, $v1, 1 -/* BCFB40 80240F50 00650018 */ mult $v1, $a1 -/* BCFB44 80240F54 3C0140C9 */ lui $at, 0x40c9 -/* BCFB48 80240F58 34210FD0 */ ori $at, $at, 0xfd0 -/* BCFB4C 80240F5C 44810000 */ mtc1 $at, $f0 -/* BCFB50 80240F60 00031FC3 */ sra $v1, $v1, 0x1f -/* BCFB54 80240F64 00003010 */ mfhi $a2 -/* BCFB58 80240F68 00062103 */ sra $a0, $a2, 4 -/* BCFB5C 80240F6C 00832023 */ subu $a0, $a0, $v1 -/* BCFB60 80240F70 44846000 */ mtc1 $a0, $f12 -/* BCFB64 80240F74 00000000 */ nop -/* BCFB68 80240F78 46806320 */ cvt.s.w $f12, $f12 -/* BCFB6C 80240F7C 46006302 */ mul.s $f12, $f12, $f0 -/* BCFB70 80240F80 00000000 */ nop -/* BCFB74 80240F84 3C0143B4 */ lui $at, 0x43b4 -/* BCFB78 80240F88 44810000 */ mtc1 $at, $f0 -/* BCFB7C 80240F8C 0040802D */ daddu $s0, $v0, $zero -/* BCFB80 80240F90 0C00A85B */ jal sin_rad -/* BCFB84 80240F94 46006303 */ div.s $f12, $f12, $f0 -/* BCFB88 80240F98 3C014248 */ lui $at, 0x4248 -/* BCFB8C 80240F9C 44811000 */ mtc1 $at, $f2 -/* BCFB90 80240FA0 00000000 */ nop -/* BCFB94 80240FA4 46020002 */ mul.s $f0, $f0, $f2 -/* BCFB98 80240FA8 00000000 */ nop -/* BCFB9C 80240FAC 24020064 */ addiu $v0, $zero, 0x64 -/* BCFBA0 80240FB0 3C013FD0 */ lui $at, 0x3fd0 -/* BCFBA4 80240FB4 44811800 */ mtc1 $at, $f3 -/* BCFBA8 80240FB8 44801000 */ mtc1 $zero, $f2 -/* BCFBAC 80240FBC 4600018D */ trunc.w.s $f6, $f0 -/* BCFBB0 80240FC0 44033000 */ mfc1 $v1, $f6 -/* BCFBB4 80240FC4 00000000 */ nop -/* BCFBB8 80240FC8 00431023 */ subu $v0, $v0, $v1 -/* BCFBBC 80240FCC 44820000 */ mtc1 $v0, $f0 -/* BCFBC0 80240FD0 00000000 */ nop -/* BCFBC4 80240FD4 46800021 */ cvt.d.w $f0, $f0 -/* BCFBC8 80240FD8 46220002 */ mul.d $f0, $f0, $f2 -/* BCFBCC 80240FDC 00000000 */ nop -/* BCFBD0 80240FE0 44831000 */ mtc1 $v1, $f2 -/* BCFBD4 80240FE4 00000000 */ nop -/* BCFBD8 80240FE8 468010A1 */ cvt.d.w $f2, $f2 -/* BCFBDC 80240FEC 46221080 */ add.d $f2, $f2, $f2 -/* BCFBE0 80240FF0 3C014059 */ lui $at, 0x4059 -/* BCFBE4 80240FF4 44812800 */ mtc1 $at, $f5 -/* BCFBE8 80240FF8 44802000 */ mtc1 $zero, $f4 -/* BCFBEC 80240FFC 00000000 */ nop -/* BCFBF0 80241000 46241083 */ div.d $f2, $f2, $f4 -/* BCFBF4 80241004 46240003 */ div.d $f0, $f0, $f4 -/* BCFBF8 80241008 46220000 */ add.d $f0, $f0, $f2 -/* BCFBFC 8024100C 8E04000C */ lw $a0, 0xc($s0) -/* BCFC00 80241010 46200020 */ cvt.s.d $f0, $f0 -/* BCFC04 80241014 44050000 */ mfc1 $a1, $f0 -/* BCFC08 80241018 0C01574E */ jal func_80055D38 -/* BCFC0C 8024101C AE0501C4 */ sw $a1, 0x1c4($s0) -/* BCFC10 80241020 8E04004C */ lw $a0, 0x4c($s0) -/* BCFC14 80241024 0C0B11EA */ jal get_script_by_id -/* BCFC18 80241028 00000000 */ nop -/* BCFC1C 8024102C C60201C4 */ lwc1 $f2, 0x1c4($s0) -/* BCFC20 80241030 3C014040 */ lui $at, 0x4040 -/* BCFC24 80241034 44810000 */ mtc1 $at, $f0 -/* BCFC28 80241038 00000000 */ nop -/* BCFC2C 8024103C 46001082 */ mul.s $f2, $f2, $f0 -/* BCFC30 80241040 00000000 */ nop -/* BCFC34 80241044 44051000 */ mfc1 $a1, $f2 -/* BCFC38 80241048 0C0B1078 */ jal set_script_timescale -/* BCFC3C 8024104C 0220202D */ daddu $a0, $s1, $zero -/* BCFC40 80241050 8E040050 */ lw $a0, 0x50($s0) -/* BCFC44 80241054 0C0B11EA */ jal get_script_by_id -/* BCFC48 80241058 00000000 */ nop -/* BCFC4C 8024105C C60001C4 */ lwc1 $f0, 0x1c4($s0) -/* BCFC50 80241060 3C0140A0 */ lui $at, 0x40a0 -/* BCFC54 80241064 4481A000 */ mtc1 $at, $f20 -/* BCFC58 80241068 00000000 */ nop -/* BCFC5C 8024106C 46140002 */ mul.s $f0, $f0, $f20 -/* BCFC60 80241070 00000000 */ nop -/* BCFC64 80241074 44050000 */ mfc1 $a1, $f0 -/* BCFC68 80241078 0C0B1078 */ jal set_script_timescale -/* BCFC6C 8024107C 0220202D */ daddu $a0, $s1, $zero -/* BCFC70 80241080 8E040054 */ lw $a0, 0x54($s0) -/* BCFC74 80241084 0C0B11EA */ jal get_script_by_id -/* BCFC78 80241088 00000000 */ nop -/* BCFC7C 8024108C C60001C4 */ lwc1 $f0, 0x1c4($s0) -/* BCFC80 80241090 46140002 */ mul.s $f0, $f0, $f20 -/* BCFC84 80241094 00000000 */ nop -/* BCFC88 80241098 44050000 */ mfc1 $a1, $f0 -/* BCFC8C 8024109C 0C0B1078 */ jal set_script_timescale -/* BCFC90 802410A0 0220202D */ daddu $a0, $s1, $zero -/* BCFC94 802410A4 8FBF0018 */ lw $ra, 0x18($sp) -/* BCFC98 802410A8 8FB10014 */ lw $s1, 0x14($sp) -/* BCFC9C 802410AC 8FB00010 */ lw $s0, 0x10($sp) -/* BCFCA0 802410B0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* BCFCA4 802410B4 24020002 */ addiu $v0, $zero, 2 -/* BCFCA8 802410B8 03E00008 */ jr $ra -/* BCFCAC 802410BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_80241130_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_80241130_BCEBF0.s deleted file mode 100644 index 0b64b3d04d..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_80241130_BCEBF0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241130_BCFD20 -/* BCFD20 80241130 0000302D */ daddu $a2, $zero, $zero -/* BCFD24 80241134 3C058024 */ lui $a1, 0x8024 -/* BCFD28 80241138 24A53090 */ addiu $a1, $a1, 0x3090 -.L8024113C: -/* BCFD2C 8024113C 8CA30000 */ lw $v1, ($a1) -/* BCFD30 80241140 50600006 */ beql $v1, $zero, .L8024115C -/* BCFD34 80241144 2406FFFF */ addiu $a2, $zero, -1 -/* BCFD38 80241148 8C820084 */ lw $v0, 0x84($a0) -/* BCFD3C 8024114C 10620003 */ beq $v1, $v0, .L8024115C -/* BCFD40 80241150 24A50004 */ addiu $a1, $a1, 4 -/* BCFD44 80241154 0809044F */ j .L8024113C -/* BCFD48 80241158 24C60001 */ addiu $a2, $a2, 1 -.L8024115C: -/* BCFD4C 8024115C AC860084 */ sw $a2, 0x84($a0) -/* BCFD50 80241160 03E00008 */ jr $ra -/* BCFD54 80241164 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_80241168_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_80241168_BCEBF0.s deleted file mode 100644 index 45e6a0755c..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_80241168_BCEBF0.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241168_BCFD58 -/* BCFD58 80241168 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BCFD5C 8024116C AFBF0018 */ sw $ra, 0x18($sp) -/* BCFD60 80241170 AFB10014 */ sw $s1, 0x14($sp) -/* BCFD64 80241174 0C090150 */ jal func_80240540 -/* BCFD68 80241178 AFB00010 */ sw $s0, 0x10($sp) -/* BCFD6C 8024117C 3C048024 */ lui $a0, 0x8024 -/* BCFD70 80241180 24840A6C */ addiu $a0, $a0, 0xa6c -/* BCFD74 80241184 3C06800A */ lui $a2, %hi(D_8009A650) -/* BCFD78 80241188 24C6A650 */ addiu $a2, $a2, %lo(D_8009A650) -/* BCFD7C 8024118C 3C058024 */ lui $a1, 0x8024 -/* BCFD80 80241190 24A510C0 */ addiu $a1, $a1, 0x10c0 -/* BCFD84 80241194 8CC30000 */ lw $v1, ($a2) -/* BCFD88 80241198 0040882D */ daddu $s1, $v0, $zero -/* BCFD8C 8024119C 34630010 */ ori $v1, $v1, 0x10 -/* BCFD90 802411A0 0C048C8F */ jal bind_dynamic_entity_7 -/* BCFD94 802411A4 ACC30000 */ sw $v1, ($a2) -/* BCFD98 802411A8 24040059 */ addiu $a0, $zero, 0x59 -/* BCFD9C 802411AC 26230164 */ addiu $v1, $s1, 0x164 -/* BCFDA0 802411B0 AE22002C */ sw $v0, 0x2c($s1) -/* BCFDA4 802411B4 24020014 */ addiu $v0, $zero, 0x14 -/* BCFDA8 802411B8 AE220014 */ sw $v0, 0x14($s1) -/* BCFDAC 802411BC 24020028 */ addiu $v0, $zero, 0x28 -/* BCFDB0 802411C0 AE220018 */ sw $v0, 0x18($s1) -/* BCFDB4 802411C4 2402003C */ addiu $v0, $zero, 0x3c -/* BCFDB8 802411C8 AE22001C */ sw $v0, 0x1c($s1) -/* BCFDBC 802411CC 24020050 */ addiu $v0, $zero, 0x50 -/* BCFDC0 802411D0 AE220020 */ sw $v0, 0x20($s1) -/* BCFDC4 802411D4 24020064 */ addiu $v0, $zero, 0x64 -/* BCFDC8 802411D8 AE220024 */ sw $v0, 0x24($s1) -/* BCFDCC 802411DC 24020005 */ addiu $v0, $zero, 5 -/* BCFDD0 802411E0 AE200030 */ sw $zero, 0x30($s1) -/* BCFDD4 802411E4 AE200004 */ sw $zero, 4($s1) -/* BCFDD8 802411E8 AE200008 */ sw $zero, 8($s1) -/* BCFDDC 802411EC AE200010 */ sw $zero, 0x10($s1) -/* BCFDE0 802411F0 AE220028 */ sw $v0, 0x28($s1) -.L802411F4: -/* BCFDE4 802411F4 AC600058 */ sw $zero, 0x58($v1) -/* BCFDE8 802411F8 2484FFFF */ addiu $a0, $a0, -1 -/* BCFDEC 802411FC 0481FFFD */ bgez $a0, .L802411F4 -/* BCFDF0 80241200 2463FFFC */ addiu $v1, $v1, -4 -/* BCFDF4 80241204 3C048011 */ lui $a0, 0x8011 -/* BCFDF8 80241208 24848B28 */ addiu $a0, $a0, -0x74d8 -/* BCFDFC 8024120C 3C013F80 */ lui $at, 0x3f80 -/* BCFE00 80241210 44810000 */ mtc1 $at, $f0 -/* BCFE04 80241214 2402FFD0 */ addiu $v0, $zero, -0x30 -/* BCFE08 80241218 AE220034 */ sw $v0, 0x34($s1) -/* BCFE0C 8024121C 24020040 */ addiu $v0, $zero, 0x40 -/* BCFE10 80241220 AE2001C0 */ sw $zero, 0x1c0($s1) -/* BCFE14 80241224 AE2001C8 */ sw $zero, 0x1c8($s1) -/* BCFE18 80241228 AE2001CC */ sw $zero, 0x1cc($s1) -/* BCFE1C 8024122C AE220038 */ sw $v0, 0x38($s1) -/* BCFE20 80241230 E62001C4 */ swc1 $f0, 0x1c4($s1) -/* BCFE24 80241234 0C050529 */ jal create_icon -/* BCFE28 80241238 E62001D0 */ swc1 $f0, 0x1d0($s1) -/* BCFE2C 8024123C 0040802D */ daddu $s0, $v0, $zero -/* BCFE30 80241240 8E250034 */ lw $a1, 0x34($s1) -/* BCFE34 80241244 8E260038 */ lw $a2, 0x38($s1) -/* BCFE38 80241248 0200202D */ daddu $a0, $s0, $zero -/* BCFE3C 8024124C 0C051261 */ jal set_icon_render_pos -/* BCFE40 80241250 AE30003C */ sw $s0, 0x3c($s1) -/* BCFE44 80241254 0200202D */ daddu $a0, $s0, $zero -/* BCFE48 80241258 0C051277 */ jal func_801449DC -/* BCFE4C 8024125C 0000282D */ daddu $a1, $zero, $zero -/* BCFE50 80241260 0200202D */ daddu $a0, $s0, $zero -/* BCFE54 80241264 0C051280 */ jal set_icon_flags -/* BCFE58 80241268 24050082 */ addiu $a1, $zero, 0x82 -/* BCFE5C 8024126C 3C048011 */ lui $a0, 0x8011 -/* BCFE60 80241270 24848AFC */ addiu $a0, $a0, -0x7504 -/* BCFE64 80241274 0C050529 */ jal create_icon -/* BCFE68 80241278 00000000 */ nop -/* BCFE6C 8024127C 0040802D */ daddu $s0, $v0, $zero -/* BCFE70 80241280 8E250034 */ lw $a1, 0x34($s1) -/* BCFE74 80241284 8E260038 */ lw $a2, 0x38($s1) -/* BCFE78 80241288 0200202D */ daddu $a0, $s0, $zero -/* BCFE7C 8024128C AE300040 */ sw $s0, 0x40($s1) -/* BCFE80 80241290 0C051261 */ jal set_icon_render_pos -/* BCFE84 80241294 24C6001C */ addiu $a2, $a2, 0x1c -/* BCFE88 80241298 0200202D */ daddu $a0, $s0, $zero -/* BCFE8C 8024129C 0C051277 */ jal func_801449DC -/* BCFE90 802412A0 0000282D */ daddu $a1, $zero, $zero -/* BCFE94 802412A4 0200202D */ daddu $a0, $s0, $zero -/* BCFE98 802412A8 0C051280 */ jal set_icon_flags -/* BCFE9C 802412AC 24050082 */ addiu $a1, $zero, 0x82 -/* BCFEA0 802412B0 3C048011 */ lui $a0, 0x8011 -/* BCFEA4 802412B4 24849244 */ addiu $a0, $a0, -0x6dbc -/* BCFEA8 802412B8 0C050529 */ jal create_icon -/* BCFEAC 802412BC 00000000 */ nop -/* BCFEB0 802412C0 0040802D */ daddu $s0, $v0, $zero -/* BCFEB4 802412C4 8E250034 */ lw $a1, 0x34($s1) -/* BCFEB8 802412C8 8E260038 */ lw $a2, 0x38($s1) -/* BCFEBC 802412CC 0200202D */ daddu $a0, $s0, $zero -/* BCFEC0 802412D0 AE300044 */ sw $s0, 0x44($s1) -/* BCFEC4 802412D4 0C051261 */ jal set_icon_render_pos -/* BCFEC8 802412D8 24C6001C */ addiu $a2, $a2, 0x1c -/* BCFECC 802412DC 0200202D */ daddu $a0, $s0, $zero -/* BCFED0 802412E0 0C051277 */ jal func_801449DC -/* BCFED4 802412E4 0000282D */ daddu $a1, $zero, $zero -/* BCFED8 802412E8 0200202D */ daddu $a0, $s0, $zero -/* BCFEDC 802412EC 0C051280 */ jal set_icon_flags -/* BCFEE0 802412F0 24050082 */ addiu $a1, $zero, 0x82 -/* BCFEE4 802412F4 8FBF0018 */ lw $ra, 0x18($sp) -/* BCFEE8 802412F8 8FB10014 */ lw $s1, 0x14($sp) -/* BCFEEC 802412FC 8FB00010 */ lw $s0, 0x10($sp) -/* BCFEF0 80241300 24020002 */ addiu $v0, $zero, 2 -/* BCFEF4 80241304 03E00008 */ jr $ra -/* BCFEF8 80241308 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_8024130C_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_8024130C_BCEBF0.s deleted file mode 100644 index 1c566f2fde..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_8024130C_BCEBF0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024130C_BCFEFC -/* BCFEFC 8024130C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BCFF00 80241310 3C05F5DE */ lui $a1, 0xf5de -/* BCFF04 80241314 AFBF0018 */ sw $ra, 0x18($sp) -/* BCFF08 80241318 0C0B1EAF */ jal get_variable -/* BCFF0C 8024131C 34A50236 */ ori $a1, $a1, 0x236 -/* BCFF10 80241320 0000202D */ daddu $a0, $zero, $zero -/* BCFF14 80241324 24030008 */ addiu $v1, $zero, 8 -/* BCFF18 80241328 00021080 */ sll $v0, $v0, 2 -/* BCFF1C 8024132C 0080302D */ daddu $a2, $a0, $zero -/* BCFF20 80241330 AFA30010 */ sw $v1, 0x10($sp) -/* BCFF24 80241334 3C058024 */ lui $a1, 0x8024 -/* BCFF28 80241338 00A22821 */ addu $a1, $a1, $v0 -/* BCFF2C 8024133C 8CA53098 */ lw $a1, 0x3098($a1) -/* BCFF30 80241340 0C052A46 */ jal set_music_track -/* BCFF34 80241344 240701F4 */ addiu $a3, $zero, 0x1f4 -/* BCFF38 80241348 8FBF0018 */ lw $ra, 0x18($sp) -/* BCFF3C 8024134C 24020002 */ addiu $v0, $zero, 2 -/* BCFF40 80241350 03E00008 */ jr $ra -/* BCFF44 80241354 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_802413D0_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_802413D0_BCEBF0.s deleted file mode 100644 index 9bbced4fe3..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_802413D0_BCEBF0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413D0_BCFFC0 -/* BCFFC0 802413D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BCFFC4 802413D4 AFBF0014 */ sw $ra, 0x14($sp) -/* BCFFC8 802413D8 0C090150 */ jal func_80240540 -/* BCFFCC 802413DC AFB00010 */ sw $s0, 0x10($sp) -/* BCFFD0 802413E0 0040802D */ daddu $s0, $v0, $zero -/* BCFFD4 802413E4 2402FFFF */ addiu $v0, $zero, -1 -/* BCFFD8 802413E8 3C05800A */ lui $a1, %hi(D_8009A650) -/* BCFFDC 802413EC 24A5A650 */ addiu $a1, $a1, %lo(D_8009A650) -/* BCFFE0 802413F0 2403FFEF */ addiu $v1, $zero, -0x11 -/* BCFFE4 802413F4 AE020030 */ sw $v0, 0x30($s0) -/* BCFFE8 802413F8 8CA20000 */ lw $v0, ($a1) -/* BCFFEC 802413FC 8E04003C */ lw $a0, 0x3c($s0) -/* BCFFF0 80241400 00431024 */ and $v0, $v0, $v1 -/* BCFFF4 80241404 0C05123D */ jal free_icon -/* BCFFF8 80241408 ACA20000 */ sw $v0, ($a1) -/* BCFFFC 8024140C 8E040040 */ lw $a0, 0x40($s0) -/* BD0000 80241410 0C05123D */ jal free_icon -/* BD0004 80241414 00000000 */ nop -/* BD0008 80241418 0C05123D */ jal free_icon -/* BD000C 8024141C 8E040044 */ lw $a0, 0x44($s0) -/* BD0010 80241420 0C048D70 */ jal func_801235C0 -/* BD0014 80241424 8E04002C */ lw $a0, 0x2c($s0) -/* BD0018 80241428 8FBF0014 */ lw $ra, 0x14($sp) -/* BD001C 8024142C 8FB00010 */ lw $s0, 0x10($sp) -/* BD0020 80241430 24020002 */ addiu $v0, $zero, 2 -/* BD0024 80241434 03E00008 */ jr $ra -/* BD0028 80241438 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_8024146C_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_8024146C_BCEBF0.s deleted file mode 100644 index d6e5151f1b..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_8024146C_BCEBF0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024146C_BD005C -/* BD005C 8024146C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BD0060 80241470 AFB10014 */ sw $s1, 0x14($sp) -/* BD0064 80241474 0080882D */ daddu $s1, $a0, $zero -/* BD0068 80241478 AFBF0018 */ sw $ra, 0x18($sp) -/* BD006C 8024147C 0C090150 */ jal func_80240540 -/* BD0070 80241480 AFB00010 */ sw $s0, 0x10($sp) -/* BD0074 80241484 3C05FE36 */ lui $a1, 0xfe36 -/* BD0078 80241488 34A53C82 */ ori $a1, $a1, 0x3c82 -/* BD007C 8024148C 0040802D */ daddu $s0, $v0, $zero -/* BD0080 80241490 0C0B210B */ jal get_float_variable -/* BD0084 80241494 0220202D */ daddu $a0, $s1, $zero -/* BD0088 80241498 E60001D0 */ swc1 $f0, 0x1d0($s0) -/* BD008C 8024149C 8FBF0018 */ lw $ra, 0x18($sp) -/* BD0090 802414A0 8FB10014 */ lw $s1, 0x14($sp) -/* BD0094 802414A4 8FB00010 */ lw $s0, 0x10($sp) -/* BD0098 802414A8 24020002 */ addiu $v0, $zero, 2 -/* BD009C 802414AC 03E00008 */ jr $ra -/* BD00A0 802414B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_802414B4_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_802414B4_BCEBF0.s deleted file mode 100644 index e3bbaab933..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_802414B4_BCEBF0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414B4_BD00A4 -/* BD00A4 802414B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BD00A8 802414B8 AFB00010 */ sw $s0, 0x10($sp) -/* BD00AC 802414BC 0080802D */ daddu $s0, $a0, $zero -/* BD00B0 802414C0 AFBF0018 */ sw $ra, 0x18($sp) -/* BD00B4 802414C4 0C090150 */ jal func_80240540 -/* BD00B8 802414C8 AFB10014 */ sw $s1, 0x14($sp) -/* BD00BC 802414CC 0200202D */ daddu $a0, $s0, $zero -/* BD00C0 802414D0 3C05FE36 */ lui $a1, 0xfe36 -/* BD00C4 802414D4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BD00C8 802414D8 0C0B210B */ jal get_float_variable -/* BD00CC 802414DC 0040882D */ daddu $s1, $v0, $zero -/* BD00D0 802414E0 0C00A6C9 */ jal clamp_angle -/* BD00D4 802414E4 46000306 */ mov.s $f12, $f0 -/* BD00D8 802414E8 0200202D */ daddu $a0, $s0, $zero -/* BD00DC 802414EC 3C05FE36 */ lui $a1, 0xfe36 -/* BD00E0 802414F0 44060000 */ mfc1 $a2, $f0 -/* BD00E4 802414F4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BD00E8 802414F8 0C0B2190 */ jal set_float_variable -/* BD00EC 802414FC AE2601C8 */ sw $a2, 0x1c8($s1) -/* BD00F0 80241500 8FBF0018 */ lw $ra, 0x18($sp) -/* BD00F4 80241504 8FB10014 */ lw $s1, 0x14($sp) -/* BD00F8 80241508 8FB00010 */ lw $s0, 0x10($sp) -/* BD00FC 8024150C 24020002 */ addiu $v0, $zero, 2 -/* BD0100 80241510 03E00008 */ jr $ra -/* BD0104 80241514 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_802415F4_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_802415F4_BCEBF0.s deleted file mode 100644 index bd1ab9d23b..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_802415F4_BCEBF0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415F4_BD01E4 -/* BD01E4 802415F4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BD01E8 802415F8 AFB00010 */ sw $s0, 0x10($sp) -/* BD01EC 802415FC AFBF0014 */ sw $ra, 0x14($sp) -/* BD01F0 80241600 0C090150 */ jal func_80240540 -/* BD01F4 80241604 0080802D */ daddu $s0, $a0, $zero -/* BD01F8 80241608 3C05FE36 */ lui $a1, 0xfe36 -/* BD01FC 8024160C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BD0200 80241610 8C4601CC */ lw $a2, 0x1cc($v0) -/* BD0204 80241614 0C0B2190 */ jal set_float_variable -/* BD0208 80241618 0200202D */ daddu $a0, $s0, $zero -/* BD020C 8024161C 8FBF0014 */ lw $ra, 0x14($sp) -/* BD0210 80241620 8FB00010 */ lw $s0, 0x10($sp) -/* BD0214 80241624 24020002 */ addiu $v0, $zero, 2 -/* BD0218 80241628 03E00008 */ jr $ra -/* BD021C 8024162C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_80241630_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_80241630_BCEBF0.s deleted file mode 100644 index 1ef24fc21f..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_80241630_BCEBF0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241630_BD0220 -/* BD0220 80241630 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BD0224 80241634 AFB00010 */ sw $s0, 0x10($sp) -/* BD0228 80241638 0080802D */ daddu $s0, $a0, $zero -/* BD022C 8024163C 3C05FE36 */ lui $a1, 0xfe36 -/* BD0230 80241640 AFBF0014 */ sw $ra, 0x14($sp) -/* BD0234 80241644 0C0B210B */ jal get_float_variable -/* BD0238 80241648 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BD023C 8024164C 0200202D */ daddu $a0, $s0, $zero -/* BD0240 80241650 3C05FE36 */ lui $a1, 0xfe36 -/* BD0244 80241654 44060000 */ mfc1 $a2, $f0 -/* BD0248 80241658 0C0B2190 */ jal set_float_variable -/* BD024C 8024165C 34A53C81 */ ori $a1, $a1, 0x3c81 -/* BD0250 80241660 8FBF0014 */ lw $ra, 0x14($sp) -/* BD0254 80241664 8FB00010 */ lw $s0, 0x10($sp) -/* BD0258 80241668 24020002 */ addiu $v0, $zero, 2 -/* BD025C 8024166C 03E00008 */ jr $ra -/* BD0260 80241670 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_80241674_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_80241674_BCEBF0.s deleted file mode 100644 index 281b05b3ae..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_80241674_BCEBF0.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241674_BD0264 -/* BD0264 80241674 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BD0268 80241678 AFB00010 */ sw $s0, 0x10($sp) -/* BD026C 8024167C 0080802D */ daddu $s0, $a0, $zero -/* BD0270 80241680 3C05FE36 */ lui $a1, 0xfe36 -/* BD0274 80241684 AFBF0014 */ sw $ra, 0x14($sp) -/* BD0278 80241688 F7B40018 */ sdc1 $f20, 0x18($sp) -/* BD027C 8024168C 0C0B210B */ jal get_float_variable -/* BD0280 80241690 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BD0284 80241694 0200202D */ daddu $a0, $s0, $zero -/* BD0288 80241698 3C05FE36 */ lui $a1, 0xfe36 -/* BD028C 8024169C 34A53C81 */ ori $a1, $a1, 0x3c81 -/* BD0290 802416A0 0C0B210B */ jal get_float_variable -/* BD0294 802416A4 46000506 */ mov.s $f20, $f0 -/* BD0298 802416A8 3C013F80 */ lui $at, 0x3f80 -/* BD029C 802416AC 44811000 */ mtc1 $at, $f2 -/* BD02A0 802416B0 00000000 */ nop -/* BD02A4 802416B4 4602003E */ c.le.s $f0, $f2 -/* BD02A8 802416B8 00000000 */ nop -/* BD02AC 802416BC 45020008 */ bc1fl .L802416E0 -/* BD02B0 802416C0 AE00008C */ sw $zero, 0x8c($s0) -/* BD02B4 802416C4 4614103E */ c.le.s $f2, $f20 -/* BD02B8 802416C8 00000000 */ nop -/* BD02BC 802416CC 45000003 */ bc1f .L802416DC -/* BD02C0 802416D0 24020001 */ addiu $v0, $zero, 1 -/* BD02C4 802416D4 080905B8 */ j .L802416E0 -/* BD02C8 802416D8 AE02008C */ sw $v0, 0x8c($s0) -.L802416DC: -/* BD02CC 802416DC AE00008C */ sw $zero, 0x8c($s0) -.L802416E0: -/* BD02D0 802416E0 8FBF0014 */ lw $ra, 0x14($sp) -/* BD02D4 802416E4 8FB00010 */ lw $s0, 0x10($sp) -/* BD02D8 802416E8 D7B40018 */ ldc1 $f20, 0x18($sp) -/* BD02DC 802416EC 24020002 */ addiu $v0, $zero, 2 -/* BD02E0 802416F0 03E00008 */ jr $ra -/* BD02E4 802416F4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_802416F8_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_802416F8_BCEBF0.s deleted file mode 100644 index 320b0fc815..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_802416F8_BCEBF0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416F8_BD02E8 -/* BD02E8 802416F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BD02EC 802416FC AFB00010 */ sw $s0, 0x10($sp) -/* BD02F0 80241700 0080802D */ daddu $s0, $a0, $zero -/* BD02F4 80241704 3C05FE36 */ lui $a1, 0xfe36 -/* BD02F8 80241708 AFBF0014 */ sw $ra, 0x14($sp) -/* BD02FC 8024170C F7B40018 */ sdc1 $f20, 0x18($sp) -/* BD0300 80241710 0C0B210B */ jal get_float_variable -/* BD0304 80241714 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BD0308 80241718 0200202D */ daddu $a0, $s0, $zero -/* BD030C 8024171C 3C05FE36 */ lui $a1, 0xfe36 -/* BD0310 80241720 34A53C81 */ ori $a1, $a1, 0x3c81 -/* BD0314 80241724 0C0B210B */ jal get_float_variable -/* BD0318 80241728 46000506 */ mov.s $f20, $f0 -/* BD031C 8024172C 3C0143B4 */ lui $at, 0x43b4 -/* BD0320 80241730 44811000 */ mtc1 $at, $f2 -/* BD0324 80241734 00000000 */ nop -/* BD0328 80241738 4602003E */ c.le.s $f0, $f2 -/* BD032C 8024173C 00000000 */ nop -/* BD0330 80241740 4502000B */ bc1fl .L80241770 -/* BD0334 80241744 AE00008C */ sw $zero, 0x8c($s0) -/* BD0338 80241748 3C0142C8 */ lui $at, 0x42c8 -/* BD033C 8024174C 44810000 */ mtc1 $at, $f0 -/* BD0340 80241750 00000000 */ nop -/* BD0344 80241754 4600A03E */ c.le.s $f20, $f0 -/* BD0348 80241758 00000000 */ nop -/* BD034C 8024175C 45000003 */ bc1f .L8024176C -/* BD0350 80241760 24020001 */ addiu $v0, $zero, 1 -/* BD0354 80241764 080905DC */ j .L80241770 -/* BD0358 80241768 AE02008C */ sw $v0, 0x8c($s0) -.L8024176C: -/* BD035C 8024176C AE00008C */ sw $zero, 0x8c($s0) -.L80241770: -/* BD0360 80241770 8FBF0014 */ lw $ra, 0x14($sp) -/* BD0364 80241774 8FB00010 */ lw $s0, 0x10($sp) -/* BD0368 80241778 D7B40018 */ ldc1 $f20, 0x18($sp) -/* BD036C 8024177C 24020002 */ addiu $v0, $zero, 2 -/* BD0370 80241780 03E00008 */ jr $ra -/* BD0374 80241784 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_80241788_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_80241788_BCEBF0.s deleted file mode 100644 index b427cf1884..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_80241788_BCEBF0.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241788_BD0378 -/* BD0378 80241788 03E00008 */ jr $ra -/* BD037C 8024178C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_80241790_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_80241790_BCEBF0.s deleted file mode 100644 index 2ad4199aed..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_80241790_BCEBF0.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241790_BD0380 -/* BD0380 80241790 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BD0384 80241794 AFB00010 */ sw $s0, 0x10($sp) -/* BD0388 80241798 AFBF0014 */ sw $ra, 0x14($sp) -/* BD038C 8024179C 0C090150 */ jal func_80240540 -/* BD0390 802417A0 0080802D */ daddu $s0, $a0, $zero -/* BD0394 802417A4 0040282D */ daddu $a1, $v0, $zero -/* BD0398 802417A8 8CA20004 */ lw $v0, 4($a1) -/* BD039C 802417AC 2442FFCE */ addiu $v0, $v0, -0x32 -/* BD03A0 802417B0 04410002 */ bgez $v0, .L802417BC -/* BD03A4 802417B4 0040202D */ daddu $a0, $v0, $zero -/* BD03A8 802417B8 00042023 */ negu $a0, $a0 -.L802417BC: -/* BD03AC 802417BC 2882000A */ slti $v0, $a0, 0xa -/* BD03B0 802417C0 14400016 */ bnez $v0, .L8024181C -/* BD03B4 802417C4 00041823 */ negu $v1, $a0 -/* BD03B8 802417C8 00031080 */ sll $v0, $v1, 2 -.L802417CC: -/* BD03BC 802417CC 00431021 */ addu $v0, $v0, $v1 -/* BD03C0 802417D0 00022040 */ sll $a0, $v0, 1 -/* BD03C4 802417D4 8CA201D4 */ lw $v0, 0x1d4($a1) -/* BD03C8 802417D8 8CA30004 */ lw $v1, 4($a1) -/* BD03CC 802417DC 00441021 */ addu $v0, $v0, $a0 -/* BD03D0 802417E0 10600003 */ beqz $v1, .L802417F0 -/* BD03D4 802417E4 ACA201D4 */ sw $v0, 0x1d4($a1) -/* BD03D8 802417E8 24020001 */ addiu $v0, $zero, 1 -/* BD03DC 802417EC A0A201DC */ sb $v0, 0x1dc($a1) -.L802417F0: -/* BD03E0 802417F0 80A301DC */ lb $v1, 0x1dc($a1) -/* BD03E4 802417F4 24020001 */ addiu $v0, $zero, 1 -/* BD03E8 802417F8 1462000E */ bne $v1, $v0, .L80241834 -/* BD03EC 802417FC 00000000 */ nop -/* BD03F0 80241800 8CA20004 */ lw $v0, 4($a1) -/* BD03F4 80241804 5C40000B */ bgtzl $v0, .L80241834 -/* BD03F8 80241808 ACA001D8 */ sw $zero, 0x1d8($a1) -/* BD03FC 8024180C 8CA201D8 */ lw $v0, 0x1d8($a1) -/* BD0400 80241810 24420001 */ addiu $v0, $v0, 1 -/* BD0404 80241814 0809060D */ j .L80241834 -/* BD0408 80241818 ACA201D8 */ sw $v0, 0x1d8($a1) -.L8024181C: -/* BD040C 8024181C 2403000A */ addiu $v1, $zero, 0xa -/* BD0410 80241820 00641823 */ subu $v1, $v1, $a0 -/* BD0414 80241824 00031040 */ sll $v0, $v1, 1 -/* BD0418 80241828 00431021 */ addu $v0, $v0, $v1 -/* BD041C 8024182C 080905F3 */ j .L802417CC -/* BD0420 80241830 000210C0 */ sll $v0, $v0, 3 -.L80241834: -/* BD0424 80241834 8CA201D4 */ lw $v0, 0x1d4($a1) -/* BD0428 80241838 28422711 */ slti $v0, $v0, 0x2711 -/* BD042C 8024183C 14400002 */ bnez $v0, .L80241848 -/* BD0430 80241840 24022710 */ addiu $v0, $zero, 0x2710 -/* BD0434 80241844 ACA201D4 */ sw $v0, 0x1d4($a1) -.L80241848: -/* BD0438 80241848 8CA201D4 */ lw $v0, 0x1d4($a1) -/* BD043C 8024184C 04420001 */ bltzl $v0, .L80241854 -/* BD0440 80241850 ACA001D4 */ sw $zero, 0x1d4($a1) -.L80241854: -/* BD0444 80241854 AE000084 */ sw $zero, 0x84($s0) -/* BD0448 80241858 8CA201D8 */ lw $v0, 0x1d8($a1) -/* BD044C 8024185C 2842002E */ slti $v0, $v0, 0x2e -/* BD0450 80241860 10400007 */ beqz $v0, .L80241880 -/* BD0454 80241864 24020001 */ addiu $v0, $zero, 1 -/* BD0458 80241868 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* BD045C 8024186C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* BD0460 80241870 8C420010 */ lw $v0, 0x10($v0) -/* BD0464 80241874 30424000 */ andi $v0, $v0, 0x4000 -/* BD0468 80241878 10400002 */ beqz $v0, .L80241884 -/* BD046C 8024187C 24020001 */ addiu $v0, $zero, 1 -.L80241880: -/* BD0470 80241880 AE020084 */ sw $v0, 0x84($s0) -.L80241884: -/* BD0474 80241884 24020002 */ addiu $v0, $zero, 2 -/* BD0478 80241888 8FBF0014 */ lw $ra, 0x14($sp) -/* BD047C 8024188C 8FB00010 */ lw $s0, 0x10($sp) -/* BD0480 80241890 03E00008 */ jr $ra -/* BD0484 80241894 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_07/func_80241898_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/func_80241898_BCEBF0.s deleted file mode 100644 index 036c8c7209..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/func_80241898_BCEBF0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241898_BD0488 -/* BD0488 80241898 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BD048C 8024189C AFB00010 */ sw $s0, 0x10($sp) -/* BD0490 802418A0 AFBF0014 */ sw $ra, 0x14($sp) -/* BD0494 802418A4 0C090150 */ jal func_80240540 -/* BD0498 802418A8 0080802D */ daddu $s0, $a0, $zero -/* BD049C 802418AC 0040182D */ daddu $v1, $v0, $zero -/* BD04A0 802418B0 AC6001D4 */ sw $zero, 0x1d4($v1) -/* BD04A4 802418B4 AC6001D8 */ sw $zero, 0x1d8($v1) -/* BD04A8 802418B8 A06001DC */ sb $zero, 0x1dc($v1) -/* BD04AC 802418BC AC600004 */ sw $zero, 4($v1) -/* BD04B0 802418C0 AC600030 */ sw $zero, 0x30($v1) -/* BD04B4 802418C4 AE0000AC */ sw $zero, 0xac($s0) -/* BD04B8 802418C8 AE0000B0 */ sw $zero, 0xb0($s0) -/* BD04BC 802418CC 8FBF0014 */ lw $ra, 0x14($sp) -/* BD04C0 802418D0 8FB00010 */ lw $s0, 0x10($sp) -/* BD04C4 802418D4 24020002 */ addiu $v0, $zero, 2 -/* BD04C8 802418D8 03E00008 */ jr $ra -/* BD04CC 802418DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_08/func_802403DC_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/func_802403DC_BD3870.s deleted file mode 100644 index 304dea5507..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/func_802403DC_BD3870.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403DC_BD3C4C -/* BD3C4C 802403DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BD3C50 802403E0 AFB3001C */ sw $s3, 0x1c($sp) -/* BD3C54 802403E4 0080982D */ daddu $s3, $a0, $zero -/* BD3C58 802403E8 AFBF0020 */ sw $ra, 0x20($sp) -/* BD3C5C 802403EC AFB20018 */ sw $s2, 0x18($sp) -/* BD3C60 802403F0 AFB10014 */ sw $s1, 0x14($sp) -/* BD3C64 802403F4 AFB00010 */ sw $s0, 0x10($sp) -/* BD3C68 802403F8 8E70000C */ lw $s0, 0xc($s3) -/* BD3C6C 802403FC 8E050000 */ lw $a1, ($s0) -/* BD3C70 80240400 0C0B1EAF */ jal get_variable -/* BD3C74 80240404 26100004 */ addiu $s0, $s0, 4 -/* BD3C78 80240408 0260202D */ daddu $a0, $s3, $zero -/* BD3C7C 8024040C 8E050000 */ lw $a1, ($s0) -/* BD3C80 80240410 0C0B1EAF */ jal get_variable -/* BD3C84 80240414 0040902D */ daddu $s2, $v0, $zero -/* BD3C88 80240418 2404003C */ addiu $a0, $zero, 0x3c -/* BD3C8C 8024041C 0C00AB39 */ jal heap_malloc -/* BD3C90 80240420 0040882D */ daddu $s1, $v0, $zero -/* BD3C94 80240424 0040802D */ daddu $s0, $v0, $zero -/* BD3C98 80240428 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* BD3C9C 8024042C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* BD3CA0 80240430 AE120008 */ sw $s2, 8($s0) -/* BD3CA4 80240434 AE11000C */ sw $s1, 0xc($s0) -/* BD3CA8 80240438 846200B0 */ lh $v0, 0xb0($v1) -/* BD3CAC 8024043C 44820000 */ mtc1 $v0, $f0 -/* BD3CB0 80240440 00000000 */ nop -/* BD3CB4 80240444 46800020 */ cvt.s.w $f0, $f0 -/* BD3CB8 80240448 E6000034 */ swc1 $f0, 0x34($s0) -/* BD3CBC 8024044C 846200B2 */ lh $v0, 0xb2($v1) -/* BD3CC0 80240450 44820000 */ mtc1 $v0, $f0 -/* BD3CC4 80240454 00000000 */ nop -/* BD3CC8 80240458 46800020 */ cvt.s.w $f0, $f0 -/* BD3CCC 8024045C E6000038 */ swc1 $f0, 0x38($s0) -/* BD3CD0 80240460 C4600028 */ lwc1 $f0, 0x28($v1) -/* BD3CD4 80240464 E6000010 */ swc1 $f0, 0x10($s0) -/* BD3CD8 80240468 C460002C */ lwc1 $f0, 0x2c($v1) -/* BD3CDC 8024046C E6000014 */ swc1 $f0, 0x14($s0) -/* BD3CE0 80240470 C4620030 */ lwc1 $f2, 0x30($v1) -/* BD3CE4 80240474 3C013F36 */ lui $at, 0x3f36 -/* BD3CE8 80240478 3421DB6E */ ori $at, $at, 0xdb6e -/* BD3CEC 8024047C 44810000 */ mtc1 $at, $f0 -/* BD3CF0 80240480 24040001 */ addiu $a0, $zero, 1 -/* BD3CF4 80240484 AE00001C */ sw $zero, 0x1c($s0) -/* BD3CF8 80240488 AE000020 */ sw $zero, 0x20($s0) -/* BD3CFC 8024048C AE000024 */ sw $zero, 0x24($s0) -/* BD3D00 80240490 E6000028 */ swc1 $f0, 0x28($s0) -/* BD3D04 80240494 E600002C */ swc1 $f0, 0x2c($s0) -/* BD3D08 80240498 E6000030 */ swc1 $f0, 0x30($s0) -/* BD3D0C 8024049C 0C04E9C1 */ jal func_8013A704 -/* BD3D10 802404A0 E6020018 */ swc1 $f2, 0x18($s0) -/* BD3D14 802404A4 0000202D */ daddu $a0, $zero, $zero -/* BD3D18 802404A8 3C058024 */ lui $a1, 0x8024 -/* BD3D1C 802404AC 24A50000 */ addiu $a1, $a1, 0 -/* BD3D20 802404B0 0C048C56 */ jal bind_dynamic_entity_3 -/* BD3D24 802404B4 AE020000 */ sw $v0, ($s0) -/* BD3D28 802404B8 0260202D */ daddu $a0, $s3, $zero -/* BD3D2C 802404BC 3C05FD05 */ lui $a1, 0xfd05 -/* BD3D30 802404C0 34A50F8A */ ori $a1, $a1, 0xf8a -/* BD3D34 802404C4 0200302D */ daddu $a2, $s0, $zero -/* BD3D38 802404C8 0C0B2026 */ jal set_variable -/* BD3D3C 802404CC AE020004 */ sw $v0, 4($s0) -/* BD3D40 802404D0 8FBF0020 */ lw $ra, 0x20($sp) -/* BD3D44 802404D4 8FB3001C */ lw $s3, 0x1c($sp) -/* BD3D48 802404D8 8FB20018 */ lw $s2, 0x18($sp) -/* BD3D4C 802404DC 8FB10014 */ lw $s1, 0x14($sp) -/* BD3D50 802404E0 8FB00010 */ lw $s0, 0x10($sp) -/* BD3D54 802404E4 24020002 */ addiu $v0, $zero, 2 -/* BD3D58 802404E8 03E00008 */ jr $ra -/* BD3D5C 802404EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_obk/obk_08/func_8024055C_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/func_8024055C_BD3870.s deleted file mode 100644 index 0f52d61953..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/func_8024055C_BD3870.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024055C_BD3DCC -/* BD3DCC 8024055C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BD3DD0 80240560 AFB10014 */ sw $s1, 0x14($sp) -/* BD3DD4 80240564 0080882D */ daddu $s1, $a0, $zero -/* BD3DD8 80240568 AFBF001C */ sw $ra, 0x1c($sp) -/* BD3DDC 8024056C AFB20018 */ sw $s2, 0x18($sp) -/* BD3DE0 80240570 AFB00010 */ sw $s0, 0x10($sp) -/* BD3DE4 80240574 8E30000C */ lw $s0, 0xc($s1) -/* BD3DE8 80240578 8E050000 */ lw $a1, ($s0) -/* BD3DEC 8024057C 0C0B210B */ jal get_float_variable -/* BD3DF0 80240580 26100004 */ addiu $s0, $s0, 4 -/* BD3DF4 80240584 8E050000 */ lw $a1, ($s0) -/* BD3DF8 80240588 26100004 */ addiu $s0, $s0, 4 -/* BD3DFC 8024058C 4600008D */ trunc.w.s $f2, $f0 -/* BD3E00 80240590 44121000 */ mfc1 $s2, $f2 -/* BD3E04 80240594 0C0B210B */ jal get_float_variable -/* BD3E08 80240598 0220202D */ daddu $a0, $s1, $zero -/* BD3E0C 8024059C 0220202D */ daddu $a0, $s1, $zero -/* BD3E10 802405A0 8E050000 */ lw $a1, ($s0) -/* BD3E14 802405A4 4600008D */ trunc.w.s $f2, $f0 -/* BD3E18 802405A8 44111000 */ mfc1 $s1, $f2 -/* BD3E1C 802405AC 0C0B210B */ jal get_float_variable -/* BD3E20 802405B0 00000000 */ nop -/* BD3E24 802405B4 0000202D */ daddu $a0, $zero, $zero -/* BD3E28 802405B8 3C05FD05 */ lui $a1, 0xfd05 -/* BD3E2C 802405BC 4600008D */ trunc.w.s $f2, $f0 -/* BD3E30 802405C0 44101000 */ mfc1 $s0, $f2 -/* BD3E34 802405C4 0C0B1EAF */ jal get_variable -/* BD3E38 802405C8 34A50F8A */ ori $a1, $a1, 0xf8a -/* BD3E3C 802405CC 0040182D */ daddu $v1, $v0, $zero -/* BD3E40 802405D0 44920000 */ mtc1 $s2, $f0 -/* BD3E44 802405D4 00000000 */ nop -/* BD3E48 802405D8 46800020 */ cvt.s.w $f0, $f0 -/* BD3E4C 802405DC E4600010 */ swc1 $f0, 0x10($v1) -/* BD3E50 802405E0 44910000 */ mtc1 $s1, $f0 -/* BD3E54 802405E4 00000000 */ nop -/* BD3E58 802405E8 46800020 */ cvt.s.w $f0, $f0 -/* BD3E5C 802405EC E4600014 */ swc1 $f0, 0x14($v1) -/* BD3E60 802405F0 44900000 */ mtc1 $s0, $f0 -/* BD3E64 802405F4 00000000 */ nop -/* BD3E68 802405F8 46800020 */ cvt.s.w $f0, $f0 -/* BD3E6C 802405FC E4600018 */ swc1 $f0, 0x18($v1) -/* BD3E70 80240600 8FBF001C */ lw $ra, 0x1c($sp) -/* BD3E74 80240604 8FB20018 */ lw $s2, 0x18($sp) -/* BD3E78 80240608 8FB10014 */ lw $s1, 0x14($sp) -/* BD3E7C 8024060C 8FB00010 */ lw $s0, 0x10($sp) -/* BD3E80 80240610 24020002 */ addiu $v0, $zero, 2 -/* BD3E84 80240614 03E00008 */ jr $ra -/* BD3E88 80240618 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_08/func_8024061C_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/func_8024061C_BD3870.s deleted file mode 100644 index 04b0067644..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/func_8024061C_BD3870.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_BD3E8C -/* BD3E8C 8024061C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BD3E90 80240620 AFB10014 */ sw $s1, 0x14($sp) -/* BD3E94 80240624 0080882D */ daddu $s1, $a0, $zero -/* BD3E98 80240628 AFBF001C */ sw $ra, 0x1c($sp) -/* BD3E9C 8024062C AFB20018 */ sw $s2, 0x18($sp) -/* BD3EA0 80240630 AFB00010 */ sw $s0, 0x10($sp) -/* BD3EA4 80240634 8E30000C */ lw $s0, 0xc($s1) -/* BD3EA8 80240638 8E050000 */ lw $a1, ($s0) -/* BD3EAC 8024063C 0C0B210B */ jal get_float_variable -/* BD3EB0 80240640 26100004 */ addiu $s0, $s0, 4 -/* BD3EB4 80240644 8E050000 */ lw $a1, ($s0) -/* BD3EB8 80240648 26100004 */ addiu $s0, $s0, 4 -/* BD3EBC 8024064C 4600008D */ trunc.w.s $f2, $f0 -/* BD3EC0 80240650 44121000 */ mfc1 $s2, $f2 -/* BD3EC4 80240654 0C0B210B */ jal get_float_variable -/* BD3EC8 80240658 0220202D */ daddu $a0, $s1, $zero -/* BD3ECC 8024065C 0220202D */ daddu $a0, $s1, $zero -/* BD3ED0 80240660 8E050000 */ lw $a1, ($s0) -/* BD3ED4 80240664 4600008D */ trunc.w.s $f2, $f0 -/* BD3ED8 80240668 44111000 */ mfc1 $s1, $f2 -/* BD3EDC 8024066C 0C0B210B */ jal get_float_variable -/* BD3EE0 80240670 00000000 */ nop -/* BD3EE4 80240674 0000202D */ daddu $a0, $zero, $zero -/* BD3EE8 80240678 3C05FD05 */ lui $a1, 0xfd05 -/* BD3EEC 8024067C 4600008D */ trunc.w.s $f2, $f0 -/* BD3EF0 80240680 44101000 */ mfc1 $s0, $f2 -/* BD3EF4 80240684 0C0B1EAF */ jal get_variable -/* BD3EF8 80240688 34A50F8A */ ori $a1, $a1, 0xf8a -/* BD3EFC 8024068C 0040182D */ daddu $v1, $v0, $zero -/* BD3F00 80240690 44920000 */ mtc1 $s2, $f0 -/* BD3F04 80240694 00000000 */ nop -/* BD3F08 80240698 46800020 */ cvt.s.w $f0, $f0 -/* BD3F0C 8024069C E460001C */ swc1 $f0, 0x1c($v1) -/* BD3F10 802406A0 44910000 */ mtc1 $s1, $f0 -/* BD3F14 802406A4 00000000 */ nop -/* BD3F18 802406A8 46800020 */ cvt.s.w $f0, $f0 -/* BD3F1C 802406AC E4600020 */ swc1 $f0, 0x20($v1) -/* BD3F20 802406B0 44900000 */ mtc1 $s0, $f0 -/* BD3F24 802406B4 00000000 */ nop -/* BD3F28 802406B8 46800020 */ cvt.s.w $f0, $f0 -/* BD3F2C 802406BC E4600024 */ swc1 $f0, 0x24($v1) -/* BD3F30 802406C0 8FBF001C */ lw $ra, 0x1c($sp) -/* BD3F34 802406C4 8FB20018 */ lw $s2, 0x18($sp) -/* BD3F38 802406C8 8FB10014 */ lw $s1, 0x14($sp) -/* BD3F3C 802406CC 8FB00010 */ lw $s0, 0x10($sp) -/* BD3F40 802406D0 24020002 */ addiu $v0, $zero, 2 -/* BD3F44 802406D4 03E00008 */ jr $ra -/* BD3F48 802406D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_08/func_802406DC_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/func_802406DC_BD3870.s deleted file mode 100644 index cee953ab69..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/func_802406DC_BD3870.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406DC_BD3F4C -/* BD3F4C 802406DC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BD3F50 802406E0 AFB10014 */ sw $s1, 0x14($sp) -/* BD3F54 802406E4 0080882D */ daddu $s1, $a0, $zero -/* BD3F58 802406E8 AFBF001C */ sw $ra, 0x1c($sp) -/* BD3F5C 802406EC AFB20018 */ sw $s2, 0x18($sp) -/* BD3F60 802406F0 AFB00010 */ sw $s0, 0x10($sp) -/* BD3F64 802406F4 8E30000C */ lw $s0, 0xc($s1) -/* BD3F68 802406F8 8E050000 */ lw $a1, ($s0) -/* BD3F6C 802406FC 0C0B210B */ jal get_float_variable -/* BD3F70 80240700 26100004 */ addiu $s0, $s0, 4 -/* BD3F74 80240704 8E050000 */ lw $a1, ($s0) -/* BD3F78 80240708 26100004 */ addiu $s0, $s0, 4 -/* BD3F7C 8024070C 4600008D */ trunc.w.s $f2, $f0 -/* BD3F80 80240710 44121000 */ mfc1 $s2, $f2 -/* BD3F84 80240714 0C0B210B */ jal get_float_variable -/* BD3F88 80240718 0220202D */ daddu $a0, $s1, $zero -/* BD3F8C 8024071C 0220202D */ daddu $a0, $s1, $zero -/* BD3F90 80240720 8E050000 */ lw $a1, ($s0) -/* BD3F94 80240724 4600008D */ trunc.w.s $f2, $f0 -/* BD3F98 80240728 44111000 */ mfc1 $s1, $f2 -/* BD3F9C 8024072C 0C0B210B */ jal get_float_variable -/* BD3FA0 80240730 00000000 */ nop -/* BD3FA4 80240734 0000202D */ daddu $a0, $zero, $zero -/* BD3FA8 80240738 3C05FD05 */ lui $a1, 0xfd05 -/* BD3FAC 8024073C 4600008D */ trunc.w.s $f2, $f0 -/* BD3FB0 80240740 44101000 */ mfc1 $s0, $f2 -/* BD3FB4 80240744 0C0B1EAF */ jal get_variable -/* BD3FB8 80240748 34A50F8A */ ori $a1, $a1, 0xf8a -/* BD3FBC 8024074C 0040182D */ daddu $v1, $v0, $zero -/* BD3FC0 80240750 44920000 */ mtc1 $s2, $f0 -/* BD3FC4 80240754 00000000 */ nop -/* BD3FC8 80240758 46800020 */ cvt.s.w $f0, $f0 -/* BD3FCC 8024075C E4600028 */ swc1 $f0, 0x28($v1) -/* BD3FD0 80240760 44910000 */ mtc1 $s1, $f0 -/* BD3FD4 80240764 00000000 */ nop -/* BD3FD8 80240768 46800020 */ cvt.s.w $f0, $f0 -/* BD3FDC 8024076C E460002C */ swc1 $f0, 0x2c($v1) -/* BD3FE0 80240770 44900000 */ mtc1 $s0, $f0 -/* BD3FE4 80240774 00000000 */ nop -/* BD3FE8 80240778 46800020 */ cvt.s.w $f0, $f0 -/* BD3FEC 8024077C E4600030 */ swc1 $f0, 0x30($v1) -/* BD3FF0 80240780 8FBF001C */ lw $ra, 0x1c($sp) -/* BD3FF4 80240784 8FB20018 */ lw $s2, 0x18($sp) -/* BD3FF8 80240788 8FB10014 */ lw $s1, 0x14($sp) -/* BD3FFC 8024078C 8FB00010 */ lw $s0, 0x10($sp) -/* BD4000 80240790 24020002 */ addiu $v0, $zero, 2 -/* BD4004 80240794 03E00008 */ jr $ra -/* BD4008 80240798 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_08/func_80240840_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/func_80240840_BD3870.s deleted file mode 100644 index a0bc6fd368..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/func_80240840_BD3870.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240840_BD40B0 -/* BD40B0 80240840 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BD40B4 80240844 AFBF0010 */ sw $ra, 0x10($sp) -/* BD40B8 80240848 8C82000C */ lw $v0, 0xc($a0) -/* BD40BC 8024084C 0C0B1EAF */ jal get_variable -/* BD40C0 80240850 8C450000 */ lw $a1, ($v0) -/* BD40C4 80240854 24040064 */ addiu $a0, $zero, 0x64 -/* BD40C8 80240858 0C00A3C2 */ jal start_rumble -/* BD40CC 8024085C 3045FFFF */ andi $a1, $v0, 0xffff -/* BD40D0 80240860 8FBF0010 */ lw $ra, 0x10($sp) -/* BD40D4 80240864 24020002 */ addiu $v0, $zero, 2 -/* BD40D8 80240868 03E00008 */ jr $ra -/* BD40DC 8024086C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_08/func_802408A0_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/func_802408A0_BD3870.s deleted file mode 100644 index ca7a2abd1e..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/func_802408A0_BD3870.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A0_BD4110 -/* BD4110 802408A0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BD4114 802408A4 AFB10014 */ sw $s1, 0x14($sp) -/* BD4118 802408A8 0080882D */ daddu $s1, $a0, $zero -/* BD411C 802408AC AFBF0018 */ sw $ra, 0x18($sp) -/* BD4120 802408B0 AFB00010 */ sw $s0, 0x10($sp) -/* BD4124 802408B4 0C00EABB */ jal get_npc_unsafe -/* BD4128 802408B8 8E24014C */ lw $a0, 0x14c($s1) -/* BD412C 802408BC 24040004 */ addiu $a0, $zero, 4 -/* BD4130 802408C0 0C00AB39 */ jal heap_malloc -/* BD4134 802408C4 0040802D */ daddu $s0, $v0, $zero -/* BD4138 802408C8 3C0142FA */ lui $at, 0x42fa -/* BD413C 802408CC 44810000 */ mtc1 $at, $f0 -/* BD4140 802408D0 3C01C45A */ lui $at, 0xc45a -/* BD4144 802408D4 3421C000 */ ori $at, $at, 0xc000 -/* BD4148 802408D8 44811000 */ mtc1 $at, $f2 -/* BD414C 802408DC 0040182D */ daddu $v1, $v0, $zero -/* BD4150 802408E0 AE030020 */ sw $v1, 0x20($s0) -/* BD4154 802408E4 AC600000 */ sw $zero, ($v1) -/* BD4158 802408E8 2403003C */ addiu $v1, $zero, 0x3c -/* BD415C 802408EC AE00000C */ sw $zero, 0xc($s0) -/* BD4160 802408F0 AE000038 */ sw $zero, 0x38($s0) -/* BD4164 802408F4 AE000040 */ sw $zero, 0x40($s0) -/* BD4168 802408F8 A603008E */ sh $v1, 0x8e($s0) -/* BD416C 802408FC E6000010 */ swc1 $f0, 0x10($s0) -/* BD4170 80240900 E602003C */ swc1 $f2, 0x3c($s0) -/* BD4174 80240904 AE200074 */ sw $zero, 0x74($s1) -/* BD4178 80240908 8FBF0018 */ lw $ra, 0x18($sp) -/* BD417C 8024090C 8FB10014 */ lw $s1, 0x14($sp) -/* BD4180 80240910 8FB00010 */ lw $s0, 0x10($sp) -/* BD4184 80240914 24020002 */ addiu $v0, $zero, 2 -/* BD4188 80240918 03E00008 */ jr $ra -/* BD418C 8024091C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_08/func_80240920_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/func_80240920_BD3870.s deleted file mode 100644 index 96e5a071f9..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/func_80240920_BD3870.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240920_BD4190 -/* BD4190 80240920 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BD4194 80240924 AFB00020 */ sw $s0, 0x20($sp) -/* BD4198 80240928 0080802D */ daddu $s0, $a0, $zero -/* BD419C 8024092C AFBF0024 */ sw $ra, 0x24($sp) -/* BD41A0 80240930 C602000C */ lwc1 $f2, 0xc($s0) -/* BD41A4 80240934 3C0143AA */ lui $at, 0x43aa -/* BD41A8 80240938 44810000 */ mtc1 $at, $f0 -/* BD41AC 8024093C 00000000 */ nop -/* BD41B0 80240940 4602003C */ c.lt.s $f0, $f2 -/* BD41B4 80240944 00000000 */ nop -/* BD41B8 80240948 45010008 */ bc1t .L8024096C -/* BD41BC 8024094C 0200202D */ daddu $a0, $s0, $zero -/* BD41C0 80240950 3C0141A0 */ lui $at, 0x41a0 -/* BD41C4 80240954 44810000 */ mtc1 $at, $f0 -/* BD41C8 80240958 00000000 */ nop -/* BD41CC 8024095C 4600103C */ c.lt.s $f2, $f0 -/* BD41D0 80240960 00000000 */ nop -/* BD41D4 80240964 4500000E */ bc1f .L802409A0 -/* BD41D8 80240968 24020016 */ addiu $v0, $zero, 0x16 -.L8024096C: -/* BD41DC 8024096C 0000282D */ daddu $a1, $zero, $zero -/* BD41E0 80240970 00A0302D */ daddu $a2, $a1, $zero -/* BD41E4 80240974 2402000D */ addiu $v0, $zero, 0xd -/* BD41E8 80240978 A08200AA */ sb $v0, 0xaa($a0) -/* BD41EC 8024097C A48000A2 */ sh $zero, 0xa2($a0) -/* BD41F0 80240980 AFA00010 */ sw $zero, 0x10($sp) -/* BD41F4 80240984 AFA00014 */ sw $zero, 0x14($sp) -/* BD41F8 80240988 948200A2 */ lhu $v0, 0xa2($a0) -/* BD41FC 8024098C 00A0382D */ daddu $a3, $a1, $zero -/* BD4200 80240990 0C00F589 */ jal func_8003D624 -/* BD4204 80240994 AFA20018 */ sw $v0, 0x18($sp) -/* BD4208 80240998 08090276 */ j .L802409D8 -/* BD420C 8024099C 00000000 */ nop -.L802409A0: -/* BD4210 802409A0 A20200AA */ sb $v0, 0xaa($s0) -/* BD4214 802409A4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BD4218 802409A8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BD421C 802409AC 0200202D */ daddu $a0, $s0, $zero -/* BD4220 802409B0 9046000E */ lbu $a2, 0xe($v0) -/* BD4224 802409B4 24050007 */ addiu $a1, $zero, 7 -/* BD4228 802409B8 AFA00010 */ sw $zero, 0x10($sp) -/* BD422C 802409BC AFA00014 */ sw $zero, 0x14($sp) -/* BD4230 802409C0 960200A2 */ lhu $v0, 0xa2($s0) -/* BD4234 802409C4 0000382D */ daddu $a3, $zero, $zero -/* BD4238 802409C8 0C00F589 */ jal func_8003D624 -/* BD423C 802409CC AFA20018 */ sw $v0, 0x18($sp) -/* BD4240 802409D0 240200FF */ addiu $v0, $zero, 0xff -/* BD4244 802409D4 A602009A */ sh $v0, 0x9a($s0) -.L802409D8: -/* BD4248 802409D8 8FBF0024 */ lw $ra, 0x24($sp) -/* BD424C 802409DC 8FB00020 */ lw $s0, 0x20($sp) -/* BD4250 802409E0 03E00008 */ jr $ra -/* BD4254 802409E4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_obk/obk_08/func_80240A7C_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/func_80240A7C_BD3870.s deleted file mode 100644 index c8ac712707..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/func_80240A7C_BD3870.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A7C_BD42EC -/* BD42EC 80240A7C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BD42F0 80240A80 AFBF0010 */ sw $ra, 0x10($sp) -/* BD42F4 80240A84 0C00EABB */ jal get_npc_unsafe -/* BD42F8 80240A88 24040001 */ addiu $a0, $zero, 1 -/* BD42FC 80240A8C 24040002 */ addiu $a0, $zero, 2 -/* BD4300 80240A90 0C00EABB */ jal get_npc_unsafe -/* BD4304 80240A94 A44000A2 */ sh $zero, 0xa2($v0) -/* BD4308 80240A98 24040003 */ addiu $a0, $zero, 3 -/* BD430C 80240A9C 0C00EABB */ jal get_npc_unsafe -/* BD4310 80240AA0 A44000A2 */ sh $zero, 0xa2($v0) -/* BD4314 80240AA4 24040004 */ addiu $a0, $zero, 4 -/* BD4318 80240AA8 0C00EABB */ jal get_npc_unsafe -/* BD431C 80240AAC A44000A2 */ sh $zero, 0xa2($v0) -/* BD4320 80240AB0 24040005 */ addiu $a0, $zero, 5 -/* BD4324 80240AB4 0C00EABB */ jal get_npc_unsafe -/* BD4328 80240AB8 A44000A2 */ sh $zero, 0xa2($v0) -/* BD432C 80240ABC 24040006 */ addiu $a0, $zero, 6 -/* BD4330 80240AC0 0C00EABB */ jal get_npc_unsafe -/* BD4334 80240AC4 A44000A2 */ sh $zero, 0xa2($v0) -/* BD4338 80240AC8 24040007 */ addiu $a0, $zero, 7 -/* BD433C 80240ACC 0C00EABB */ jal get_npc_unsafe -/* BD4340 80240AD0 A44000A2 */ sh $zero, 0xa2($v0) -/* BD4344 80240AD4 24040008 */ addiu $a0, $zero, 8 -/* BD4348 80240AD8 0C00EABB */ jal get_npc_unsafe -/* BD434C 80240ADC A44000A2 */ sh $zero, 0xa2($v0) -/* BD4350 80240AE0 A44000A2 */ sh $zero, 0xa2($v0) -/* BD4354 80240AE4 8FBF0010 */ lw $ra, 0x10($sp) -/* BD4358 80240AE8 03E00008 */ jr $ra -/* BD435C 80240AEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_08/func_80240AF0_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/func_80240AF0_BD3870.s deleted file mode 100644 index fbeab54130..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/func_80240AF0_BD3870.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AF0_BD4360 -/* BD4360 80240AF0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BD4364 80240AF4 AFB10014 */ sw $s1, 0x14($sp) -/* BD4368 80240AF8 0080882D */ daddu $s1, $a0, $zero -/* BD436C 80240AFC AFBF001C */ sw $ra, 0x1c($sp) -/* BD4370 80240B00 AFB20018 */ sw $s2, 0x18($sp) -/* BD4374 80240B04 AFB00010 */ sw $s0, 0x10($sp) -/* BD4378 80240B08 0C00EABB */ jal get_npc_unsafe -/* BD437C 80240B0C 8E24014C */ lw $a0, 0x14c($s1) -/* BD4380 80240B10 0040802D */ daddu $s0, $v0, $zero -/* BD4384 80240B14 8E230074 */ lw $v1, 0x74($s1) -/* BD4388 80240B18 8E120020 */ lw $s2, 0x20($s0) -/* BD438C 80240B1C 2C62000E */ sltiu $v0, $v1, 0xe -/* BD4390 80240B20 10400058 */ beqz $v0, .L80240C84 -/* BD4394 80240B24 00031080 */ sll $v0, $v1, 2 -/* BD4398 80240B28 3C018024 */ lui $at, 0x8024 -/* BD439C 80240B2C 00220821 */ addu $at, $at, $v0 -/* BD43A0 80240B30 8C226EC8 */ lw $v0, 0x6ec8($at) -/* BD43A4 80240B34 00400008 */ jr $v0 -/* BD43A8 80240B38 00000000 */ nop -/* BD43AC 80240B3C 0220202D */ daddu $a0, $s1, $zero -/* BD43B0 80240B40 3C05F971 */ lui $a1, 0xf971 -/* BD43B4 80240B44 0C0B1EAF */ jal get_variable -/* BD43B8 80240B48 34A58888 */ ori $a1, $a1, 0x8888 -/* BD43BC 80240B4C 0040182D */ daddu $v1, $v0, $zero -/* BD43C0 80240B50 24020001 */ addiu $v0, $zero, 1 -/* BD43C4 80240B54 1462004B */ bne $v1, $v0, .L80240C84 -/* BD43C8 80240B58 2402000A */ addiu $v0, $zero, 0xa -/* BD43CC 80240B5C 08090320 */ j .L80240C80 -/* BD43D0 80240B60 AE430000 */ sw $v1, ($s2) -/* BD43D4 80240B64 C600000C */ lwc1 $f0, 0xc($s0) -/* BD43D8 80240B68 3C014000 */ lui $at, 0x4000 -/* BD43DC 80240B6C 44816000 */ mtc1 $at, $f12 -/* BD43E0 80240B70 0C00A6C9 */ jal clamp_angle -/* BD43E4 80240B74 460C0300 */ add.s $f12, $f0, $f12 -/* BD43E8 80240B78 9602008E */ lhu $v0, 0x8e($s0) -/* BD43EC 80240B7C E600000C */ swc1 $f0, 0xc($s0) -/* BD43F0 80240B80 2442FFFF */ addiu $v0, $v0, -1 -/* BD43F4 80240B84 A602008E */ sh $v0, 0x8e($s0) -/* BD43F8 80240B88 00021400 */ sll $v0, $v0, 0x10 -/* BD43FC 80240B8C 1440003D */ bnez $v0, .L80240C84 -/* BD4400 80240B90 2402000B */ addiu $v0, $zero, 0xb -/* BD4404 80240B94 08090321 */ j .L80240C84 -/* BD4408 80240B98 AE220074 */ sw $v0, 0x74($s1) -/* BD440C 80240B9C C602003C */ lwc1 $f2, 0x3c($s0) -/* BD4410 80240BA0 3C01C466 */ lui $at, 0xc466 -/* BD4414 80240BA4 44810000 */ mtc1 $at, $f0 -/* BD4418 80240BA8 00000000 */ nop -/* BD441C 80240BAC 4600103E */ c.le.s $f2, $f0 -/* BD4420 80240BB0 00000000 */ nop -/* BD4424 80240BB4 45000003 */ bc1f .L80240BC4 -/* BD4428 80240BB8 00000000 */ nop -/* BD442C 80240BBC 0C09027A */ jal func_802409E8 -/* BD4430 80240BC0 00000000 */ nop -.L80240BC4: -/* BD4434 80240BC4 C600000C */ lwc1 $f0, 0xc($s0) -/* BD4438 80240BC8 3C014000 */ lui $at, 0x4000 -/* BD443C 80240BCC 44816000 */ mtc1 $at, $f12 -/* BD4440 80240BD0 0C00A6C9 */ jal clamp_angle -/* BD4444 80240BD4 460C0300 */ add.s $f12, $f0, $f12 -/* BD4448 80240BD8 C604003C */ lwc1 $f4, 0x3c($s0) -/* BD444C 80240BDC 3C013F00 */ lui $at, 0x3f00 -/* BD4450 80240BE0 44811000 */ mtc1 $at, $f2 -/* BD4454 80240BE4 00000000 */ nop -/* BD4458 80240BE8 46022101 */ sub.s $f4, $f4, $f2 -/* BD445C 80240BEC 3C01C477 */ lui $at, 0xc477 -/* BD4460 80240BF0 44811000 */ mtc1 $at, $f2 -/* BD4464 80240BF4 E600000C */ swc1 $f0, 0xc($s0) -/* BD4468 80240BF8 4602203E */ c.le.s $f4, $f2 -/* BD446C 80240BFC 00000000 */ nop -/* BD4470 80240C00 45000020 */ bc1f .L80240C84 -/* BD4474 80240C04 E604003C */ swc1 $f4, 0x3c($s0) -/* BD4478 80240C08 0220202D */ daddu $a0, $s1, $zero -/* BD447C 80240C0C 3C05FD05 */ lui $a1, 0xfd05 -/* BD4480 80240C10 34A50F81 */ ori $a1, $a1, 0xf81 -/* BD4484 80240C14 0C0B2026 */ jal set_variable -/* BD4488 80240C18 24060001 */ addiu $a2, $zero, 1 -/* BD448C 80240C1C 0C09029F */ jal func_80240A7C -/* BD4490 80240C20 00000000 */ nop -/* BD4494 80240C24 08090320 */ j .L80240C80 -/* BD4498 80240C28 2402000C */ addiu $v0, $zero, 0xc -/* BD449C 80240C2C 0220202D */ daddu $a0, $s1, $zero -/* BD44A0 80240C30 3C05FD05 */ lui $a1, 0xfd05 -/* BD44A4 80240C34 0C0B1EAF */ jal get_variable -/* BD44A8 80240C38 34A50F82 */ ori $a1, $a1, 0xf82 -/* BD44AC 80240C3C 24030001 */ addiu $v1, $zero, 1 -/* BD44B0 80240C40 14430002 */ bne $v0, $v1, .L80240C4C -/* BD44B4 80240C44 2402000D */ addiu $v0, $zero, 0xd -/* BD44B8 80240C48 AE220074 */ sw $v0, 0x74($s1) -.L80240C4C: -/* BD44BC 80240C4C C600000C */ lwc1 $f0, 0xc($s0) -/* BD44C0 80240C50 3C014000 */ lui $at, 0x4000 -/* BD44C4 80240C54 44816000 */ mtc1 $at, $f12 -/* BD44C8 80240C58 0C00A6C9 */ jal clamp_angle -/* BD44CC 80240C5C 460C0300 */ add.s $f12, $f0, $f12 -/* BD44D0 80240C60 08090321 */ j .L80240C84 -/* BD44D4 80240C64 E600000C */ swc1 $f0, 0xc($s0) -/* BD44D8 80240C68 0220202D */ daddu $a0, $s1, $zero -/* BD44DC 80240C6C 3C05FD05 */ lui $a1, 0xfd05 -/* BD44E0 80240C70 0C0B1EAF */ jal get_variable -/* BD44E4 80240C74 34A50F82 */ ori $a1, $a1, 0xf82 -/* BD44E8 80240C78 14400002 */ bnez $v0, .L80240C84 -/* BD44EC 80240C7C 2402000C */ addiu $v0, $zero, 0xc -.L80240C80: -/* BD44F0 80240C80 AE220074 */ sw $v0, 0x74($s1) -.L80240C84: -/* BD44F4 80240C84 8FBF001C */ lw $ra, 0x1c($sp) -/* BD44F8 80240C88 8FB20018 */ lw $s2, 0x18($sp) -/* BD44FC 80240C8C 8FB10014 */ lw $s1, 0x14($sp) -/* BD4500 80240C90 8FB00010 */ lw $s0, 0x10($sp) -/* BD4504 80240C94 24020002 */ addiu $v0, $zero, 2 -/* BD4508 80240C98 03E00008 */ jr $ra -/* BD450C 80240C9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_08/func_80240CA0_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/func_80240CA0_BD3870.s deleted file mode 100644 index e1d25b3672..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/func_80240CA0_BD3870.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CA0_BD4510 -/* BD4510 80240CA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BD4514 80240CA4 AFB10014 */ sw $s1, 0x14($sp) -/* BD4518 80240CA8 0080882D */ daddu $s1, $a0, $zero -/* BD451C 80240CAC AFBF0018 */ sw $ra, 0x18($sp) -/* BD4520 80240CB0 AFB00010 */ sw $s0, 0x10($sp) -/* BD4524 80240CB4 0C00EABB */ jal get_npc_unsafe -/* BD4528 80240CB8 8E24014C */ lw $a0, 0x14c($s1) -/* BD452C 80240CBC 0000202D */ daddu $a0, $zero, $zero -/* BD4530 80240CC0 0C00EABB */ jal get_npc_unsafe -/* BD4534 80240CC4 0040802D */ daddu $s0, $v0, $zero -/* BD4538 80240CC8 AE020020 */ sw $v0, 0x20($s0) -/* BD453C 80240CCC 8E23014C */ lw $v1, 0x14c($s1) -/* BD4540 80240CD0 00032040 */ sll $a0, $v1, 1 -/* BD4544 80240CD4 00832021 */ addu $a0, $a0, $v1 -/* BD4548 80240CD8 00041900 */ sll $v1, $a0, 4 -/* BD454C 80240CDC 00641823 */ subu $v1, $v1, $a0 -/* BD4550 80240CE0 AE230078 */ sw $v1, 0x78($s1) -/* BD4554 80240CE4 8E030000 */ lw $v1, ($s0) -/* BD4558 80240CE8 3C040004 */ lui $a0, 4 -/* BD455C 80240CEC 00641825 */ or $v1, $v1, $a0 -/* BD4560 80240CF0 AE030000 */ sw $v1, ($s0) -/* BD4564 80240CF4 AE200074 */ sw $zero, 0x74($s1) -/* BD4568 80240CF8 8FBF0018 */ lw $ra, 0x18($sp) -/* BD456C 80240CFC 8FB10014 */ lw $s1, 0x14($sp) -/* BD4570 80240D00 8FB00010 */ lw $s0, 0x10($sp) -/* BD4574 80240D04 24020002 */ addiu $v0, $zero, 2 -/* BD4578 80240D08 03E00008 */ jr $ra -/* BD457C 80240D0C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_08/func_80240D10_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/func_80240D10_BD3870.s deleted file mode 100644 index 71b4087edd..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/func_80240D10_BD3870.s +++ /dev/null @@ -1,185 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D10_BD4580 -/* BD4580 80240D10 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* BD4584 80240D14 AFB20020 */ sw $s2, 0x20($sp) -/* BD4588 80240D18 0080902D */ daddu $s2, $a0, $zero -/* BD458C 80240D1C AFBF0028 */ sw $ra, 0x28($sp) -/* BD4590 80240D20 AFB30024 */ sw $s3, 0x24($sp) -/* BD4594 80240D24 AFB1001C */ sw $s1, 0x1c($sp) -/* BD4598 80240D28 AFB00018 */ sw $s0, 0x18($sp) -/* BD459C 80240D2C F7B40030 */ sdc1 $f20, 0x30($sp) -/* BD45A0 80240D30 0C00EABB */ jal get_npc_unsafe -/* BD45A4 80240D34 8E44014C */ lw $a0, 0x14c($s2) -/* BD45A8 80240D38 0040802D */ daddu $s0, $v0, $zero -/* BD45AC 80240D3C 8E430074 */ lw $v1, 0x74($s2) -/* BD45B0 80240D40 8E110020 */ lw $s1, 0x20($s0) -/* BD45B4 80240D44 2C62000E */ sltiu $v0, $v1, 0xe -/* BD45B8 80240D48 8E330020 */ lw $s3, 0x20($s1) -/* BD45BC 80240D4C 10400099 */ beqz $v0, .L80240FB4 -/* BD45C0 80240D50 00031080 */ sll $v0, $v1, 2 -/* BD45C4 80240D54 3C018024 */ lui $at, 0x8024 -/* BD45C8 80240D58 00220821 */ addu $at, $at, $v0 -/* BD45CC 80240D5C 8C226F00 */ lw $v0, 0x6f00($at) -/* BD45D0 80240D60 00400008 */ jr $v0 -/* BD45D4 80240D64 00000000 */ nop -/* BD45D8 80240D68 C620000C */ lwc1 $f0, 0xc($s1) -/* BD45DC 80240D6C C64C0078 */ lwc1 $f12, 0x78($s2) -/* BD45E0 80240D70 46806320 */ cvt.s.w $f12, $f12 -/* BD45E4 80240D74 0C00A6C9 */ jal clamp_angle -/* BD45E8 80240D78 46006300 */ add.s $f12, $f12, $f0 -/* BD45EC 80240D7C E600000C */ swc1 $f0, 0xc($s0) -/* BD45F0 80240D80 8E630000 */ lw $v1, ($s3) -/* BD45F4 80240D84 24020001 */ addiu $v0, $zero, 1 -/* BD45F8 80240D88 1462008A */ bne $v1, $v0, .L80240FB4 -/* BD45FC 80240D8C 24040014 */ addiu $a0, $zero, 0x14 -/* BD4600 80240D90 0C00A67F */ jal rand_int -/* BD4604 80240D94 AE430074 */ sw $v1, 0x74($s2) -/* BD4608 80240D98 2442000A */ addiu $v0, $v0, 0xa -/* BD460C 80240D9C 080903ED */ j .L80240FB4 -/* BD4610 80240DA0 A602008E */ sh $v0, 0x8e($s0) -/* BD4614 80240DA4 C620000C */ lwc1 $f0, 0xc($s1) -/* BD4618 80240DA8 C64C0078 */ lwc1 $f12, 0x78($s2) -/* BD461C 80240DAC 46806320 */ cvt.s.w $f12, $f12 -/* BD4620 80240DB0 0C00A6C9 */ jal clamp_angle -/* BD4624 80240DB4 46006300 */ add.s $f12, $f12, $f0 -/* BD4628 80240DB8 9602008E */ lhu $v0, 0x8e($s0) -/* BD462C 80240DBC E600000C */ swc1 $f0, 0xc($s0) -/* BD4630 80240DC0 2442FFFF */ addiu $v0, $v0, -1 -/* BD4634 80240DC4 A602008E */ sh $v0, 0x8e($s0) -/* BD4638 80240DC8 00021400 */ sll $v0, $v0, 0x10 -/* BD463C 80240DCC 14400079 */ bnez $v0, .L80240FB4 -/* BD4640 80240DD0 3C04B000 */ lui $a0, 0xb000 -/* BD4644 80240DD4 C6000040 */ lwc1 $f0, 0x40($s0) -/* BD4648 80240DD8 3484000F */ ori $a0, $a0, 0xf -/* BD464C 80240DDC E7A00010 */ swc1 $f0, 0x10($sp) -/* BD4650 80240DE0 8E060038 */ lw $a2, 0x38($s0) -/* BD4654 80240DE4 8E07003C */ lw $a3, 0x3c($s0) -/* BD4658 80240DE8 0C052757 */ jal play_sound_at_position -/* BD465C 80240DEC 0000282D */ daddu $a1, $zero, $zero -/* BD4660 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* BD4664 80240DF4 AE420074 */ sw $v0, 0x74($s2) -/* BD4668 80240DF8 C6000038 */ lwc1 $f0, 0x38($s0) -/* BD466C 80240DFC C602003C */ lwc1 $f2, 0x3c($s0) -/* BD4670 80240E00 C6040040 */ lwc1 $f4, 0x40($s0) -/* BD4674 80240E04 A600008E */ sh $zero, 0x8e($s0) -/* BD4678 80240E08 E6000060 */ swc1 $f0, 0x60($s0) -/* BD467C 80240E0C E6020064 */ swc1 $f2, 0x64($s0) -/* BD4680 80240E10 080903ED */ j .L80240FB4 -/* BD4684 80240E14 E6040068 */ swc1 $f4, 0x68($s0) -/* BD4688 80240E18 C620000C */ lwc1 $f0, 0xc($s1) -/* BD468C 80240E1C C64C0078 */ lwc1 $f12, 0x78($s2) -/* BD4690 80240E20 46806320 */ cvt.s.w $f12, $f12 -/* BD4694 80240E24 0C00A6C9 */ jal clamp_angle -/* BD4698 80240E28 46006300 */ add.s $f12, $f12, $f0 -/* BD469C 80240E2C 46000506 */ mov.s $f20, $f0 -/* BD46A0 80240E30 4406A000 */ mfc1 $a2, $f20 -/* BD46A4 80240E34 00000000 */ nop -/* BD46A8 80240E38 AE06000C */ sw $a2, 0xc($s0) -/* BD46AC 80240E3C C6200038 */ lwc1 $f0, 0x38($s1) -/* BD46B0 80240E40 E6000038 */ swc1 $f0, 0x38($s0) -/* BD46B4 80240E44 C6200040 */ lwc1 $f0, 0x40($s1) -/* BD46B8 80240E48 E6000040 */ swc1 $f0, 0x40($s0) -/* BD46BC 80240E4C 8E250010 */ lw $a1, 0x10($s1) -/* BD46C0 80240E50 0C00EA95 */ jal npc_move_heading -/* BD46C4 80240E54 0200202D */ daddu $a0, $s0, $zero -/* BD46C8 80240E58 8602008E */ lh $v0, 0x8e($s0) -/* BD46CC 80240E5C 3C014220 */ lui $at, 0x4220 -/* BD46D0 80240E60 44817000 */ mtc1 $at, $f14 -/* BD46D4 80240E64 44820000 */ mtc1 $v0, $f0 -/* BD46D8 80240E68 00000000 */ nop -/* BD46DC 80240E6C 46800020 */ cvt.s.w $f0, $f0 -/* BD46E0 80240E70 46007001 */ sub.s $f0, $f14, $f0 -/* BD46E4 80240E74 460E0003 */ div.s $f0, $f0, $f14 -/* BD46E8 80240E78 46000002 */ mul.s $f0, $f0, $f0 -/* BD46EC 80240E7C 00000000 */ nop -/* BD46F0 80240E80 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BD46F4 80240E84 C6060060 */ lwc1 $f6, 0x60($s0) -/* BD46F8 80240E88 46066181 */ sub.s $f6, $f12, $f6 -/* BD46FC 80240E8C 46003182 */ mul.s $f6, $f6, $f0 -/* BD4700 80240E90 00000000 */ nop -/* BD4704 80240E94 C60A0040 */ lwc1 $f10, 0x40($s0) -/* BD4708 80240E98 C6080068 */ lwc1 $f8, 0x68($s0) -/* BD470C 80240E9C C624003C */ lwc1 $f4, 0x3c($s1) -/* BD4710 80240EA0 46085201 */ sub.s $f8, $f10, $f8 -/* BD4714 80240EA4 3C01447A */ lui $at, 0x447a -/* BD4718 80240EA8 44811000 */ mtc1 $at, $f2 -/* BD471C 80240EAC 00000000 */ nop -/* BD4720 80240EB0 46022100 */ add.s $f4, $f4, $f2 -/* BD4724 80240EB4 46004202 */ mul.s $f8, $f8, $f0 -/* BD4728 80240EB8 00000000 */ nop -/* BD472C 80240EBC E604003C */ swc1 $f4, 0x3c($s0) -/* BD4730 80240EC0 46002006 */ mov.s $f0, $f4 -/* BD4734 80240EC4 C6040064 */ lwc1 $f4, 0x64($s0) -/* BD4738 80240EC8 46040001 */ sub.s $f0, $f0, $f4 -/* BD473C 80240ECC 44821000 */ mtc1 $v0, $f2 -/* BD4740 80240ED0 00000000 */ nop -/* BD4744 80240ED4 468010A0 */ cvt.s.w $f2, $f2 -/* BD4748 80240ED8 46020002 */ mul.s $f0, $f0, $f2 -/* BD474C 80240EDC 00000000 */ nop -/* BD4750 80240EE0 9602008E */ lhu $v0, 0x8e($s0) -/* BD4754 80240EE4 24030028 */ addiu $v1, $zero, 0x28 -/* BD4758 80240EE8 24420001 */ addiu $v0, $v0, 1 -/* BD475C 80240EEC 46066301 */ sub.s $f12, $f12, $f6 -/* BD4760 80240EF0 A602008E */ sh $v0, 0x8e($s0) -/* BD4764 80240EF4 00021400 */ sll $v0, $v0, 0x10 -/* BD4768 80240EF8 46085281 */ sub.s $f10, $f10, $f8 -/* BD476C 80240EFC 00021403 */ sra $v0, $v0, 0x10 -/* BD4770 80240F00 460E0003 */ div.s $f0, $f0, $f14 -/* BD4774 80240F04 46040000 */ add.s $f0, $f0, $f4 -/* BD4778 80240F08 E60C0038 */ swc1 $f12, 0x38($s0) -/* BD477C 80240F0C E60A0040 */ swc1 $f10, 0x40($s0) -/* BD4780 80240F10 14430028 */ bne $v0, $v1, .L80240FB4 -/* BD4784 80240F14 E600003C */ swc1 $f0, 0x3c($s0) -/* BD4788 80240F18 080903EC */ j .L80240FB0 -/* BD478C 80240F1C 2402000A */ addiu $v0, $zero, 0xa -/* BD4790 80240F20 C620000C */ lwc1 $f0, 0xc($s1) -/* BD4794 80240F24 C64C0078 */ lwc1 $f12, 0x78($s2) -/* BD4798 80240F28 46806320 */ cvt.s.w $f12, $f12 -/* BD479C 80240F2C 0C00A6C9 */ jal clamp_angle -/* BD47A0 80240F30 46006300 */ add.s $f12, $f12, $f0 -/* BD47A4 80240F34 46000506 */ mov.s $f20, $f0 -/* BD47A8 80240F38 0240202D */ daddu $a0, $s2, $zero -/* BD47AC 80240F3C 3C05FD05 */ lui $a1, 0xfd05 -/* BD47B0 80240F40 34A50F82 */ ori $a1, $a1, 0xf82 -/* BD47B4 80240F44 0C0B1EAF */ jal get_variable -/* BD47B8 80240F48 E614000C */ swc1 $f20, 0xc($s0) -/* BD47BC 80240F4C 24030001 */ addiu $v1, $zero, 1 -/* BD47C0 80240F50 14430002 */ bne $v0, $v1, .L80240F5C -/* BD47C4 80240F54 2402000D */ addiu $v0, $zero, 0xd -/* BD47C8 80240F58 AE420074 */ sw $v0, 0x74($s2) -.L80240F5C: -/* BD47CC 80240F5C C6200038 */ lwc1 $f0, 0x38($s1) -/* BD47D0 80240F60 4406A000 */ mfc1 $a2, $f20 -/* BD47D4 80240F64 E6000038 */ swc1 $f0, 0x38($s0) -/* BD47D8 80240F68 C6200040 */ lwc1 $f0, 0x40($s1) -/* BD47DC 80240F6C E6000040 */ swc1 $f0, 0x40($s0) -/* BD47E0 80240F70 8E250010 */ lw $a1, 0x10($s1) -/* BD47E4 80240F74 0C00EA95 */ jal npc_move_heading -/* BD47E8 80240F78 0200202D */ daddu $a0, $s0, $zero -/* BD47EC 80240F7C C620003C */ lwc1 $f0, 0x3c($s1) -/* BD47F0 80240F80 3C01447A */ lui $at, 0x447a -/* BD47F4 80240F84 44811000 */ mtc1 $at, $f2 -/* BD47F8 80240F88 00000000 */ nop -/* BD47FC 80240F8C 46020000 */ add.s $f0, $f0, $f2 -/* BD4800 80240F90 080903ED */ j .L80240FB4 -/* BD4804 80240F94 E600003C */ swc1 $f0, 0x3c($s0) -/* BD4808 80240F98 0240202D */ daddu $a0, $s2, $zero -/* BD480C 80240F9C 3C05FD05 */ lui $a1, 0xfd05 -/* BD4810 80240FA0 0C0B1EAF */ jal get_variable -/* BD4814 80240FA4 34A50F82 */ ori $a1, $a1, 0xf82 -/* BD4818 80240FA8 14400002 */ bnez $v0, .L80240FB4 -/* BD481C 80240FAC 2402000A */ addiu $v0, $zero, 0xa -.L80240FB0: -/* BD4820 80240FB0 AE420074 */ sw $v0, 0x74($s2) -.L80240FB4: -/* BD4824 80240FB4 8FBF0028 */ lw $ra, 0x28($sp) -/* BD4828 80240FB8 8FB30024 */ lw $s3, 0x24($sp) -/* BD482C 80240FBC 8FB20020 */ lw $s2, 0x20($sp) -/* BD4830 80240FC0 8FB1001C */ lw $s1, 0x1c($sp) -/* BD4834 80240FC4 8FB00018 */ lw $s0, 0x18($sp) -/* BD4838 80240FC8 D7B40030 */ ldc1 $f20, 0x30($sp) -/* BD483C 80240FCC 24020002 */ addiu $v0, $zero, 2 -/* BD4840 80240FD0 03E00008 */ jr $ra -/* BD4844 80240FD4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_obk/obk_08/func_80240FE4_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/func_80240FE4_BD3870.s deleted file mode 100644 index 8aa6cc50af..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/func_80240FE4_BD3870.s +++ /dev/null @@ -1,109 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FE4_BD4854 -/* BD4854 80240FE4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BD4858 80240FE8 AFB10014 */ sw $s1, 0x14($sp) -/* BD485C 80240FEC 0080882D */ daddu $s1, $a0, $zero -/* BD4860 80240FF0 AFBF0018 */ sw $ra, 0x18($sp) -/* BD4864 80240FF4 AFB00010 */ sw $s0, 0x10($sp) -/* BD4868 80240FF8 0C00EAD2 */ jal get_npc_safe -/* BD486C 80240FFC 8E24014C */ lw $a0, 0x14c($s1) -/* BD4870 80241000 0040802D */ daddu $s0, $v0, $zero -/* BD4874 80241004 8E230074 */ lw $v1, 0x74($s1) -/* BD4878 80241008 24020001 */ addiu $v0, $zero, 1 -/* BD487C 8024100C 10620036 */ beq $v1, $v0, .L802410E8 -/* BD4880 80241010 28620002 */ slti $v0, $v1, 2 -/* BD4884 80241014 10400005 */ beqz $v0, .L8024102C -/* BD4888 80241018 24020002 */ addiu $v0, $zero, 2 -/* BD488C 8024101C 10600007 */ beqz $v1, .L8024103C -/* BD4890 80241020 00000000 */ nop -/* BD4894 80241024 08090455 */ j .L80241154 -/* BD4898 80241028 00000000 */ nop -.L8024102C: -/* BD489C 8024102C 10620036 */ beq $v1, $v0, .L80241108 -/* BD48A0 80241030 00000000 */ nop -/* BD48A4 80241034 08090455 */ j .L80241154 -/* BD48A8 80241038 00000000 */ nop -.L8024103C: -/* BD48AC 8024103C 0C00A67F */ jal rand_int -/* BD48B0 80241040 240400B4 */ addiu $a0, $zero, 0xb4 -/* BD48B4 80241044 24040032 */ addiu $a0, $zero, 0x32 -/* BD48B8 80241048 3C01C3D7 */ lui $at, 0xc3d7 -/* BD48BC 8024104C 44810000 */ mtc1 $at, $f0 -/* BD48C0 80241050 2442001E */ addiu $v0, $v0, 0x1e -/* BD48C4 80241054 A602008E */ sh $v0, 0x8e($s0) -/* BD48C8 80241058 0C00A67F */ jal rand_int -/* BD48CC 8024105C E6000040 */ swc1 $f0, 0x40($s0) -/* BD48D0 80241060 3C014220 */ lui $at, 0x4220 -/* BD48D4 80241064 44811000 */ mtc1 $at, $f2 -/* BD48D8 80241068 44820000 */ mtc1 $v0, $f0 -/* BD48DC 8024106C 00000000 */ nop -/* BD48E0 80241070 46800020 */ cvt.s.w $f0, $f0 -/* BD48E4 80241074 46020000 */ add.s $f0, $f0, $f2 -/* BD48E8 80241078 0C00A64D */ jal func_80029934 -/* BD48EC 8024107C E600003C */ swc1 $f0, 0x3c($s0) -/* BD48F0 80241080 46000000 */ add.s $f0, $f0, $f0 -/* BD48F4 80241084 3C014000 */ lui $at, 0x4000 -/* BD48F8 80241088 44811000 */ mtc1 $at, $f2 -/* BD48FC 8024108C 00000000 */ nop -/* BD4900 80241090 46020000 */ add.s $f0, $f0, $f2 -/* BD4904 80241094 24040064 */ addiu $a0, $zero, 0x64 -/* BD4908 80241098 0C00A67F */ jal rand_int -/* BD490C 8024109C E6000018 */ swc1 $f0, 0x18($s0) -/* BD4910 802410A0 28420032 */ slti $v0, $v0, 0x32 -/* BD4914 802410A4 10400007 */ beqz $v0, .L802410C4 -/* BD4918 802410A8 00000000 */ nop -/* BD491C 802410AC 3C014387 */ lui $at, 0x4387 -/* BD4920 802410B0 44810000 */ mtc1 $at, $f0 -/* BD4924 802410B4 00000000 */ nop -/* BD4928 802410B8 E6000038 */ swc1 $f0, 0x38($s0) -/* BD492C 802410BC 08090437 */ j .L802410DC -/* BD4930 802410C0 E600000C */ swc1 $f0, 0xc($s0) -.L802410C4: -/* BD4934 802410C4 3C01C387 */ lui $at, 0xc387 -/* BD4938 802410C8 44810000 */ mtc1 $at, $f0 -/* BD493C 802410CC 3C0142B4 */ lui $at, 0x42b4 -/* BD4940 802410D0 44811000 */ mtc1 $at, $f2 -/* BD4944 802410D4 E6000038 */ swc1 $f0, 0x38($s0) -/* BD4948 802410D8 E602000C */ swc1 $f2, 0xc($s0) -.L802410DC: -/* BD494C 802410DC 24020001 */ addiu $v0, $zero, 1 -/* BD4950 802410E0 08090455 */ j .L80241154 -/* BD4954 802410E4 AE220074 */ sw $v0, 0x74($s1) -.L802410E8: -/* BD4958 802410E8 9602008E */ lhu $v0, 0x8e($s0) -/* BD495C 802410EC 2442FFFF */ addiu $v0, $v0, -1 -/* BD4960 802410F0 A602008E */ sh $v0, 0x8e($s0) -/* BD4964 802410F4 00021400 */ sll $v0, $v0, 0x10 -/* BD4968 802410F8 14400016 */ bnez $v0, .L80241154 -/* BD496C 802410FC 24020002 */ addiu $v0, $zero, 2 -/* BD4970 80241100 08090455 */ j .L80241154 -/* BD4974 80241104 AE220074 */ sw $v0, 0x74($s1) -.L80241108: -/* BD4978 80241108 8E050018 */ lw $a1, 0x18($s0) -/* BD497C 8024110C 8E06000C */ lw $a2, 0xc($s0) -/* BD4980 80241110 0C00EA95 */ jal npc_move_heading -/* BD4984 80241114 0200202D */ daddu $a0, $s0, $zero -/* BD4988 80241118 C6020038 */ lwc1 $f2, 0x38($s0) -/* BD498C 8024111C 3C01C38C */ lui $at, 0xc38c -/* BD4990 80241120 44810000 */ mtc1 $at, $f0 -/* BD4994 80241124 00000000 */ nop -/* BD4998 80241128 4600103C */ c.lt.s $f2, $f0 -/* BD499C 8024112C 00000000 */ nop -/* BD49A0 80241130 45030008 */ bc1tl .L80241154 -/* BD49A4 80241134 AE200074 */ sw $zero, 0x74($s1) -/* BD49A8 80241138 3C01438C */ lui $at, 0x438c -/* BD49AC 8024113C 44810000 */ mtc1 $at, $f0 -/* BD49B0 80241140 00000000 */ nop -/* BD49B4 80241144 4602003C */ c.lt.s $f0, $f2 -/* BD49B8 80241148 00000000 */ nop -/* BD49BC 8024114C 45030001 */ bc1tl .L80241154 -/* BD49C0 80241150 AE200074 */ sw $zero, 0x74($s1) -.L80241154: -/* BD49C4 80241154 8FBF0018 */ lw $ra, 0x18($sp) -/* BD49C8 80241158 8FB10014 */ lw $s1, 0x14($sp) -/* BD49CC 8024115C 8FB00010 */ lw $s0, 0x10($sp) -/* BD49D0 80241160 24020002 */ addiu $v0, $zero, 2 -/* BD49D4 80241164 03E00008 */ jr $ra -/* BD49D8 80241168 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_08/func_8024116C_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/func_8024116C_BD3870.s deleted file mode 100644 index e0013fc035..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/func_8024116C_BD3870.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024116C_BD49DC -/* BD49DC 8024116C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BD49E0 80241170 AFB10014 */ sw $s1, 0x14($sp) -/* BD49E4 80241174 0080882D */ daddu $s1, $a0, $zero -/* BD49E8 80241178 AFBF0018 */ sw $ra, 0x18($sp) -/* BD49EC 8024117C AFB00010 */ sw $s0, 0x10($sp) -/* BD49F0 80241180 8E240088 */ lw $a0, 0x88($s1) -/* BD49F4 80241184 1480000B */ bnez $a0, .L802411B4 -/* BD49F8 80241188 8E300084 */ lw $s0, 0x84($s1) -/* BD49FC 8024118C 0C00A67F */ jal rand_int -/* BD4A00 80241190 24040003 */ addiu $a0, $zero, 3 -/* BD4A04 80241194 00021040 */ sll $v0, $v0, 1 -/* BD4A08 80241198 3C018024 */ lui $at, 0x8024 -/* BD4A0C 8024119C 00220821 */ addu $at, $at, $v0 -/* BD4A10 802411A0 84224FEC */ lh $v0, 0x4fec($at) -/* BD4A14 802411A4 24040032 */ addiu $a0, $zero, 0x32 -/* BD4A18 802411A8 0C00A67F */ jal rand_int -/* BD4A1C 802411AC AE220078 */ sw $v0, 0x78($s1) -/* BD4A20 802411B0 2444001E */ addiu $a0, $v0, 0x1e -.L802411B4: -/* BD4A24 802411B4 8E230078 */ lw $v1, 0x78($s1) -/* BD4A28 802411B8 0203102A */ slt $v0, $s0, $v1 -/* BD4A2C 802411BC 10400006 */ beqz $v0, .L802411D8 -/* BD4A30 802411C0 2484FFFF */ addiu $a0, $a0, -1 -/* BD4A34 802411C4 2610000A */ addiu $s0, $s0, 0xa -/* BD4A38 802411C8 0070102A */ slt $v0, $v1, $s0 -/* BD4A3C 802411CC 5040000A */ beql $v0, $zero, .L802411F8 -/* BD4A40 802411D0 AE300084 */ sw $s0, 0x84($s1) -/* BD4A44 802411D4 0060802D */ daddu $s0, $v1, $zero -.L802411D8: -/* BD4A48 802411D8 0070102A */ slt $v0, $v1, $s0 -/* BD4A4C 802411DC 50400006 */ beql $v0, $zero, .L802411F8 -/* BD4A50 802411E0 AE300084 */ sw $s0, 0x84($s1) -/* BD4A54 802411E4 2610FFF6 */ addiu $s0, $s0, -0xa -/* BD4A58 802411E8 0203102A */ slt $v0, $s0, $v1 -/* BD4A5C 802411EC 54400001 */ bnel $v0, $zero, .L802411F4 -/* BD4A60 802411F0 0060802D */ daddu $s0, $v1, $zero -.L802411F4: -/* BD4A64 802411F4 AE300084 */ sw $s0, 0x84($s1) -.L802411F8: -/* BD4A68 802411F8 AE240088 */ sw $a0, 0x88($s1) -/* BD4A6C 802411FC 8FBF0018 */ lw $ra, 0x18($sp) -/* BD4A70 80241200 8FB10014 */ lw $s1, 0x14($sp) -/* BD4A74 80241204 8FB00010 */ lw $s0, 0x10($sp) -/* BD4A78 80241208 24020002 */ addiu $v0, $zero, 2 -/* BD4A7C 8024120C 03E00008 */ jr $ra -/* BD4A80 80241210 27BD0020 */ addiu $sp, $sp, 0x20 -/* BD4A84 80241214 00000000 */ nop -/* BD4A88 80241218 00000000 */ nop -/* BD4A8C 8024121C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_08/func_802412BC_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/func_802412BC_BD3870.s deleted file mode 100644 index 912d61d045..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/func_802412BC_BD3870.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412BC_BD4B2C -/* BD4B2C 802412BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BD4B30 802412C0 AFB00010 */ sw $s0, 0x10($sp) -/* BD4B34 802412C4 0080802D */ daddu $s0, $a0, $zero -/* BD4B38 802412C8 AFBF0014 */ sw $ra, 0x14($sp) -/* BD4B3C 802412CC 8E020084 */ lw $v0, 0x84($s0) -/* BD4B40 802412D0 2442FFFE */ addiu $v0, $v0, -2 -/* BD4B44 802412D4 44826000 */ mtc1 $v0, $f12 -/* BD4B48 802412D8 00000000 */ nop -/* BD4B4C 802412DC 0C00A6C9 */ jal clamp_angle -/* BD4B50 802412E0 46806320 */ cvt.s.w $f12, $f12 -/* BD4B54 802412E4 4600008D */ trunc.w.s $f2, $f0 -/* BD4B58 802412E8 E6020084 */ swc1 $f2, 0x84($s0) -/* BD4B5C 802412EC 8FBF0014 */ lw $ra, 0x14($sp) -/* BD4B60 802412F0 8FB00010 */ lw $s0, 0x10($sp) -/* BD4B64 802412F4 24020002 */ addiu $v0, $zero, 2 -/* BD4B68 802412F8 03E00008 */ jr $ra -/* BD4B6C 802412FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_08/func_80241300_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/func_80241300_BD3870.s deleted file mode 100644 index cb0a7e7eb9..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/func_80241300_BD3870.s +++ /dev/null @@ -1,226 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241300_BD4B70 -/* BD4B70 80241300 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BD4B74 80241304 AFB20020 */ sw $s2, 0x20($sp) -/* BD4B78 80241308 0080902D */ daddu $s2, $a0, $zero -/* BD4B7C 8024130C 24040001 */ addiu $a0, $zero, 1 -/* BD4B80 80241310 AFBF003C */ sw $ra, 0x3c($sp) -/* BD4B84 80241314 AFBE0038 */ sw $fp, 0x38($sp) -/* BD4B88 80241318 AFB70034 */ sw $s7, 0x34($sp) -/* BD4B8C 8024131C AFB60030 */ sw $s6, 0x30($sp) -/* BD4B90 80241320 AFB5002C */ sw $s5, 0x2c($sp) -/* BD4B94 80241324 AFB40028 */ sw $s4, 0x28($sp) -/* BD4B98 80241328 AFB30024 */ sw $s3, 0x24($sp) -/* BD4B9C 8024132C AFB1001C */ sw $s1, 0x1c($sp) -/* BD4BA0 80241330 0C00EABB */ jal get_npc_unsafe -/* BD4BA4 80241334 AFB00018 */ sw $s0, 0x18($sp) -/* BD4BA8 80241338 24040002 */ addiu $a0, $zero, 2 -/* BD4BAC 8024133C 0C00EABB */ jal get_npc_unsafe -/* BD4BB0 80241340 0040802D */ daddu $s0, $v0, $zero -/* BD4BB4 80241344 24040003 */ addiu $a0, $zero, 3 -/* BD4BB8 80241348 0C00EABB */ jal get_npc_unsafe -/* BD4BBC 8024134C 0040982D */ daddu $s3, $v0, $zero -/* BD4BC0 80241350 24040004 */ addiu $a0, $zero, 4 -/* BD4BC4 80241354 0C00EABB */ jal get_npc_unsafe -/* BD4BC8 80241358 0040A02D */ daddu $s4, $v0, $zero -/* BD4BCC 8024135C 24040005 */ addiu $a0, $zero, 5 -/* BD4BD0 80241360 0C00EABB */ jal get_npc_unsafe -/* BD4BD4 80241364 0040A82D */ daddu $s5, $v0, $zero -/* BD4BD8 80241368 24040006 */ addiu $a0, $zero, 6 -/* BD4BDC 8024136C 0C00EABB */ jal get_npc_unsafe -/* BD4BE0 80241370 0040B02D */ daddu $s6, $v0, $zero -/* BD4BE4 80241374 24040007 */ addiu $a0, $zero, 7 -/* BD4BE8 80241378 0C00EABB */ jal get_npc_unsafe -/* BD4BEC 8024137C 0040B82D */ daddu $s7, $v0, $zero -/* BD4BF0 80241380 24040008 */ addiu $a0, $zero, 8 -/* BD4BF4 80241384 0C00EABB */ jal get_npc_unsafe -/* BD4BF8 80241388 0040F02D */ daddu $fp, $v0, $zero -/* BD4BFC 8024138C 0240202D */ daddu $a0, $s2, $zero -/* BD4C00 80241390 3C05FD05 */ lui $a1, 0xfd05 -/* BD4C04 80241394 34A50F83 */ ori $a1, $a1, 0xf83 -/* BD4C08 80241398 0000302D */ daddu $a2, $zero, $zero -/* BD4C0C 8024139C AE400088 */ sw $zero, 0x88($s2) -/* BD4C10 802413A0 0C0B2026 */ jal set_variable -/* BD4C14 802413A4 AFA20010 */ sw $v0, 0x10($sp) -/* BD4C18 802413A8 8E430084 */ lw $v1, 0x84($s2) -/* BD4C1C 802413AC C602000C */ lwc1 $f2, 0xc($s0) -/* BD4C20 802413B0 2462FFE9 */ addiu $v0, $v1, -0x17 -/* BD4C24 802413B4 44820000 */ mtc1 $v0, $f0 -/* BD4C28 802413B8 00000000 */ nop -/* BD4C2C 802413BC 46800020 */ cvt.s.w $f0, $f0 -/* BD4C30 802413C0 4600103E */ c.le.s $f2, $f0 -/* BD4C34 802413C4 00000000 */ nop -/* BD4C38 802413C8 4500000C */ bc1f .L802413FC -/* BD4C3C 802413CC 0000882D */ daddu $s1, $zero, $zero -/* BD4C40 802413D0 2462FFE5 */ addiu $v0, $v1, -0x1b -/* BD4C44 802413D4 44820000 */ mtc1 $v0, $f0 -/* BD4C48 802413D8 00000000 */ nop -/* BD4C4C 802413DC 46800020 */ cvt.s.w $f0, $f0 -/* BD4C50 802413E0 4602003E */ c.le.s $f0, $f2 -/* BD4C54 802413E4 00000000 */ nop -/* BD4C58 802413E8 45000004 */ bc1f .L802413FC -/* BD4C5C 802413EC 24020001 */ addiu $v0, $zero, 1 -/* BD4C60 802413F0 AE420088 */ sw $v0, 0x88($s2) -/* BD4C64 802413F4 0040882D */ daddu $s1, $v0, $zero -/* BD4C68 802413F8 8E430084 */ lw $v1, 0x84($s2) -.L802413FC: -/* BD4C6C 802413FC C662000C */ lwc1 $f2, 0xc($s3) -/* BD4C70 80241400 2462FFE9 */ addiu $v0, $v1, -0x17 -/* BD4C74 80241404 44820000 */ mtc1 $v0, $f0 -/* BD4C78 80241408 00000000 */ nop -/* BD4C7C 8024140C 46800020 */ cvt.s.w $f0, $f0 -/* BD4C80 80241410 4600103E */ c.le.s $f2, $f0 -/* BD4C84 80241414 00000000 */ nop -/* BD4C88 80241418 4500000A */ bc1f .L80241444 -/* BD4C8C 8024141C 2462FFE5 */ addiu $v0, $v1, -0x1b -/* BD4C90 80241420 44820000 */ mtc1 $v0, $f0 -/* BD4C94 80241424 00000000 */ nop -/* BD4C98 80241428 46800020 */ cvt.s.w $f0, $f0 -/* BD4C9C 8024142C 4602003E */ c.le.s $f0, $f2 -/* BD4CA0 80241430 00000000 */ nop -/* BD4CA4 80241434 45000003 */ bc1f .L80241444 -/* BD4CA8 80241438 24020001 */ addiu $v0, $zero, 1 -/* BD4CAC 8024143C AE420088 */ sw $v0, 0x88($s2) -/* BD4CB0 80241440 24110002 */ addiu $s1, $zero, 2 -.L80241444: -/* BD4CB4 80241444 8E430084 */ lw $v1, 0x84($s2) -/* BD4CB8 80241448 C682000C */ lwc1 $f2, 0xc($s4) -/* BD4CBC 8024144C 2462FFE9 */ addiu $v0, $v1, -0x17 -/* BD4CC0 80241450 44820000 */ mtc1 $v0, $f0 -/* BD4CC4 80241454 00000000 */ nop -/* BD4CC8 80241458 46800020 */ cvt.s.w $f0, $f0 -/* BD4CCC 8024145C 4600103E */ c.le.s $f2, $f0 -/* BD4CD0 80241460 00000000 */ nop -/* BD4CD4 80241464 4500000B */ bc1f .L80241494 -/* BD4CD8 80241468 2462FFE5 */ addiu $v0, $v1, -0x1b -/* BD4CDC 8024146C 44820000 */ mtc1 $v0, $f0 -/* BD4CE0 80241470 00000000 */ nop -/* BD4CE4 80241474 46800020 */ cvt.s.w $f0, $f0 -/* BD4CE8 80241478 4602003E */ c.le.s $f0, $f2 -/* BD4CEC 8024147C 00000000 */ nop -/* BD4CF0 80241480 45000004 */ bc1f .L80241494 -/* BD4CF4 80241484 24020001 */ addiu $v0, $zero, 1 -/* BD4CF8 80241488 AE420088 */ sw $v0, 0x88($s2) -/* BD4CFC 8024148C 24110003 */ addiu $s1, $zero, 3 -/* BD4D00 80241490 8E430084 */ lw $v1, 0x84($s2) -.L80241494: -/* BD4D04 80241494 C6A2000C */ lwc1 $f2, 0xc($s5) -/* BD4D08 80241498 2462FFE9 */ addiu $v0, $v1, -0x17 -/* BD4D0C 8024149C 44820000 */ mtc1 $v0, $f0 -/* BD4D10 802414A0 00000000 */ nop -/* BD4D14 802414A4 46800020 */ cvt.s.w $f0, $f0 -/* BD4D18 802414A8 4600103E */ c.le.s $f2, $f0 -/* BD4D1C 802414AC 00000000 */ nop -/* BD4D20 802414B0 4500000A */ bc1f .L802414DC -/* BD4D24 802414B4 2462FFE5 */ addiu $v0, $v1, -0x1b -/* BD4D28 802414B8 44820000 */ mtc1 $v0, $f0 -/* BD4D2C 802414BC 00000000 */ nop -/* BD4D30 802414C0 46800020 */ cvt.s.w $f0, $f0 -/* BD4D34 802414C4 4602003E */ c.le.s $f0, $f2 -/* BD4D38 802414C8 00000000 */ nop -/* BD4D3C 802414CC 45000003 */ bc1f .L802414DC -/* BD4D40 802414D0 24020001 */ addiu $v0, $zero, 1 -/* BD4D44 802414D4 AE420088 */ sw $v0, 0x88($s2) -/* BD4D48 802414D8 24110004 */ addiu $s1, $zero, 4 -.L802414DC: -/* BD4D4C 802414DC 8E430084 */ lw $v1, 0x84($s2) -/* BD4D50 802414E0 C6C2000C */ lwc1 $f2, 0xc($s6) -/* BD4D54 802414E4 2462FFE9 */ addiu $v0, $v1, -0x17 -/* BD4D58 802414E8 44820000 */ mtc1 $v0, $f0 -/* BD4D5C 802414EC 00000000 */ nop -/* BD4D60 802414F0 46800020 */ cvt.s.w $f0, $f0 -/* BD4D64 802414F4 4600103E */ c.le.s $f2, $f0 -/* BD4D68 802414F8 00000000 */ nop -/* BD4D6C 802414FC 4500000B */ bc1f .L8024152C -/* BD4D70 80241500 2462FFE5 */ addiu $v0, $v1, -0x1b -/* BD4D74 80241504 44820000 */ mtc1 $v0, $f0 -/* BD4D78 80241508 00000000 */ nop -/* BD4D7C 8024150C 46800020 */ cvt.s.w $f0, $f0 -/* BD4D80 80241510 4602003E */ c.le.s $f0, $f2 -/* BD4D84 80241514 00000000 */ nop -/* BD4D88 80241518 45000004 */ bc1f .L8024152C -/* BD4D8C 8024151C 24020001 */ addiu $v0, $zero, 1 -/* BD4D90 80241520 AE420088 */ sw $v0, 0x88($s2) -/* BD4D94 80241524 24110005 */ addiu $s1, $zero, 5 -/* BD4D98 80241528 8E430084 */ lw $v1, 0x84($s2) -.L8024152C: -/* BD4D9C 8024152C C6E2000C */ lwc1 $f2, 0xc($s7) -/* BD4DA0 80241530 2462FFE9 */ addiu $v0, $v1, -0x17 -/* BD4DA4 80241534 44820000 */ mtc1 $v0, $f0 -/* BD4DA8 80241538 00000000 */ nop -/* BD4DAC 8024153C 46800020 */ cvt.s.w $f0, $f0 -/* BD4DB0 80241540 4600103E */ c.le.s $f2, $f0 -/* BD4DB4 80241544 00000000 */ nop -/* BD4DB8 80241548 4500000A */ bc1f .L80241574 -/* BD4DBC 8024154C 2462FFE5 */ addiu $v0, $v1, -0x1b -/* BD4DC0 80241550 44820000 */ mtc1 $v0, $f0 -/* BD4DC4 80241554 00000000 */ nop -/* BD4DC8 80241558 46800020 */ cvt.s.w $f0, $f0 -/* BD4DCC 8024155C 4602003E */ c.le.s $f0, $f2 -/* BD4DD0 80241560 00000000 */ nop -/* BD4DD4 80241564 45000003 */ bc1f .L80241574 -/* BD4DD8 80241568 24020001 */ addiu $v0, $zero, 1 -/* BD4DDC 8024156C AE420088 */ sw $v0, 0x88($s2) -/* BD4DE0 80241570 24110006 */ addiu $s1, $zero, 6 -.L80241574: -/* BD4DE4 80241574 8E430084 */ lw $v1, 0x84($s2) -/* BD4DE8 80241578 C7C2000C */ lwc1 $f2, 0xc($fp) -/* BD4DEC 8024157C 2462FFE9 */ addiu $v0, $v1, -0x17 -/* BD4DF0 80241580 44820000 */ mtc1 $v0, $f0 -/* BD4DF4 80241584 00000000 */ nop -/* BD4DF8 80241588 46800020 */ cvt.s.w $f0, $f0 -/* BD4DFC 8024158C 4600103E */ c.le.s $f2, $f0 -/* BD4E00 80241590 00000000 */ nop -/* BD4E04 80241594 4500000B */ bc1f .L802415C4 -/* BD4E08 80241598 2462FFE5 */ addiu $v0, $v1, -0x1b -/* BD4E0C 8024159C 44820000 */ mtc1 $v0, $f0 -/* BD4E10 802415A0 00000000 */ nop -/* BD4E14 802415A4 46800020 */ cvt.s.w $f0, $f0 -/* BD4E18 802415A8 4602003E */ c.le.s $f0, $f2 -/* BD4E1C 802415AC 00000000 */ nop -/* BD4E20 802415B0 45000004 */ bc1f .L802415C4 -/* BD4E24 802415B4 24020001 */ addiu $v0, $zero, 1 -/* BD4E28 802415B8 AE420088 */ sw $v0, 0x88($s2) -/* BD4E2C 802415BC 24110007 */ addiu $s1, $zero, 7 -/* BD4E30 802415C0 8E430084 */ lw $v1, 0x84($s2) -.L802415C4: -/* BD4E34 802415C4 8FA70010 */ lw $a3, 0x10($sp) -/* BD4E38 802415C8 2462FFE9 */ addiu $v0, $v1, -0x17 -/* BD4E3C 802415CC C4E2000C */ lwc1 $f2, 0xc($a3) -/* BD4E40 802415D0 44820000 */ mtc1 $v0, $f0 -/* BD4E44 802415D4 00000000 */ nop -/* BD4E48 802415D8 46800020 */ cvt.s.w $f0, $f0 -/* BD4E4C 802415DC 4600103E */ c.le.s $f2, $f0 -/* BD4E50 802415E0 00000000 */ nop -/* BD4E54 802415E4 4500000A */ bc1f .L80241610 -/* BD4E58 802415E8 2462FFE5 */ addiu $v0, $v1, -0x1b -/* BD4E5C 802415EC 44820000 */ mtc1 $v0, $f0 -/* BD4E60 802415F0 00000000 */ nop -/* BD4E64 802415F4 46800020 */ cvt.s.w $f0, $f0 -/* BD4E68 802415F8 4602003E */ c.le.s $f0, $f2 -/* BD4E6C 802415FC 00000000 */ nop -/* BD4E70 80241600 45000003 */ bc1f .L80241610 -/* BD4E74 80241604 24020001 */ addiu $v0, $zero, 1 -/* BD4E78 80241608 AE420088 */ sw $v0, 0x88($s2) -/* BD4E7C 8024160C 24110008 */ addiu $s1, $zero, 8 -.L80241610: -/* BD4E80 80241610 0240202D */ daddu $a0, $s2, $zero -/* BD4E84 80241614 3C05FD05 */ lui $a1, 0xfd05 -/* BD4E88 80241618 34A50F83 */ ori $a1, $a1, 0xf83 -/* BD4E8C 8024161C 0C0B2026 */ jal set_variable -/* BD4E90 80241620 0220302D */ daddu $a2, $s1, $zero -/* BD4E94 80241624 8FBF003C */ lw $ra, 0x3c($sp) -/* BD4E98 80241628 8FBE0038 */ lw $fp, 0x38($sp) -/* BD4E9C 8024162C 8FB70034 */ lw $s7, 0x34($sp) -/* BD4EA0 80241630 8FB60030 */ lw $s6, 0x30($sp) -/* BD4EA4 80241634 8FB5002C */ lw $s5, 0x2c($sp) -/* BD4EA8 80241638 8FB40028 */ lw $s4, 0x28($sp) -/* BD4EAC 8024163C 8FB30024 */ lw $s3, 0x24($sp) -/* BD4EB0 80241640 8FB20020 */ lw $s2, 0x20($sp) -/* BD4EB4 80241644 8FB1001C */ lw $s1, 0x1c($sp) -/* BD4EB8 80241648 8FB00018 */ lw $s0, 0x18($sp) -/* BD4EBC 8024164C 24020002 */ addiu $v0, $zero, 2 -/* BD4EC0 80241650 03E00008 */ jr $ra -/* BD4EC4 80241654 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_obk/obk_08/func_80241658_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/func_80241658_BD3870.s deleted file mode 100644 index 01cf027d42..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/func_80241658_BD3870.s +++ /dev/null @@ -1,90 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241658_BD4EC8 -/* BD4EC8 80241658 27BDFC98 */ addiu $sp, $sp, -0x368 -/* BD4ECC 8024165C AFB20358 */ sw $s2, 0x358($sp) -/* BD4ED0 80241660 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* BD4ED4 80241664 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* BD4ED8 80241668 AFBF035C */ sw $ra, 0x35c($sp) -/* BD4EDC 8024166C AFB10354 */ sw $s1, 0x354($sp) -/* BD4EE0 80241670 AFB00350 */ sw $s0, 0x350($sp) -/* BD4EE4 80241674 F7B40360 */ sdc1 $f20, 0x360($sp) -/* BD4EE8 80241678 C64C0028 */ lwc1 $f12, 0x28($s2) -/* BD4EEC 8024167C 4480A000 */ mtc1 $zero, $f20 -/* BD4EF0 80241680 C64E0030 */ lwc1 $f14, 0x30($s2) -/* BD4EF4 80241684 4406A000 */ mfc1 $a2, $f20 -/* BD4EF8 80241688 4407A000 */ mfc1 $a3, $f20 -/* BD4EFC 8024168C 0C00A7B5 */ jal dist2D -/* BD4F00 80241690 0080802D */ daddu $s0, $a0, $zero -/* BD4F04 80241694 24020001 */ addiu $v0, $zero, 1 -/* BD4F08 80241698 46000106 */ mov.s $f4, $f0 -/* BD4F0C 8024169C 3C0142B4 */ lui $at, 0x42b4 -/* BD4F10 802416A0 44811000 */ mtc1 $at, $f2 -/* BD4F14 802416A4 00000000 */ nop -/* BD4F18 802416A8 4604103C */ c.lt.s $f2, $f4 -/* BD4F1C 802416AC 00000000 */ nop -/* BD4F20 802416B0 45010002 */ bc1t .L802416BC -/* BD4F24 802416B4 0240882D */ daddu $s1, $s2, $zero -/* BD4F28 802416B8 0000102D */ daddu $v0, $zero, $zero -.L802416BC: -/* BD4F2C 802416BC 3C014316 */ lui $at, 0x4316 -/* BD4F30 802416C0 44810000 */ mtc1 $at, $f0 -/* BD4F34 802416C4 00000000 */ nop -/* BD4F38 802416C8 4600203C */ c.lt.s $f4, $f0 -/* BD4F3C 802416CC 00000000 */ nop -/* BD4F40 802416D0 45010002 */ bc1t .L802416DC -/* BD4F44 802416D4 24030001 */ addiu $v1, $zero, 1 -/* BD4F48 802416D8 0000182D */ daddu $v1, $zero, $zero -.L802416DC: -/* BD4F4C 802416DC 00431025 */ or $v0, $v0, $v1 -/* BD4F50 802416E0 1040001C */ beqz $v0, .L80241754 -/* BD4F54 802416E4 00000000 */ nop -/* BD4F58 802416E8 C64C0028 */ lwc1 $f12, 0x28($s2) -/* BD4F5C 802416EC C64E0030 */ lwc1 $f14, 0x30($s2) -/* BD4F60 802416F0 4406A000 */ mfc1 $a2, $f20 -/* BD4F64 802416F4 4407A000 */ mfc1 $a3, $f20 -/* BD4F68 802416F8 0C00A720 */ jal atan2 -/* BD4F6C 802416FC 00000000 */ nop -/* BD4F70 80241700 3C014334 */ lui $at, 0x4334 -/* BD4F74 80241704 44811000 */ mtc1 $at, $f2 -/* BD4F78 80241708 00000000 */ nop -/* BD4F7C 8024170C 46020000 */ add.s $f0, $f0, $f2 -/* BD4F80 80241710 3C0542A0 */ lui $a1, 0x42a0 -/* BD4F84 80241714 44060000 */ mfc1 $a2, $f0 -/* BD4F88 80241718 27A40010 */ addiu $a0, $sp, 0x10 -/* BD4F8C 8024171C E7B40048 */ swc1 $f20, 0x48($sp) -/* BD4F90 80241720 E7B4004C */ swc1 $f20, 0x4c($sp) -/* BD4F94 80241724 0C00EA95 */ jal npc_move_heading -/* BD4F98 80241728 E7B40050 */ swc1 $f20, 0x50($sp) -/* BD4F9C 8024172C C7A00048 */ lwc1 $f0, 0x48($sp) -/* BD4FA0 80241730 4600018D */ trunc.w.s $f6, $f0 -/* BD4FA4 80241734 E6060084 */ swc1 $f6, 0x84($s0) -/* BD4FA8 80241738 C7A0004C */ lwc1 $f0, 0x4c($sp) -/* BD4FAC 8024173C 4600018D */ trunc.w.s $f6, $f0 -/* BD4FB0 80241740 E6060088 */ swc1 $f6, 0x88($s0) -/* BD4FB4 80241744 C7A00050 */ lwc1 $f0, 0x50($sp) -/* BD4FB8 80241748 24020001 */ addiu $v0, $zero, 1 -/* BD4FBC 8024174C 080905DD */ j .L80241774 -/* BD4FC0 80241750 AE020090 */ sw $v0, 0x90($s0) -.L80241754: -/* BD4FC4 80241754 C6200028 */ lwc1 $f0, 0x28($s1) -/* BD4FC8 80241758 4600018D */ trunc.w.s $f6, $f0 -/* BD4FCC 8024175C E6060084 */ swc1 $f6, 0x84($s0) -/* BD4FD0 80241760 C620002C */ lwc1 $f0, 0x2c($s1) -/* BD4FD4 80241764 4600018D */ trunc.w.s $f6, $f0 -/* BD4FD8 80241768 E6060088 */ swc1 $f6, 0x88($s0) -/* BD4FDC 8024176C C6200030 */ lwc1 $f0, 0x30($s1) -/* BD4FE0 80241770 AE000090 */ sw $zero, 0x90($s0) -.L80241774: -/* BD4FE4 80241774 4600018D */ trunc.w.s $f6, $f0 -/* BD4FE8 80241778 E606008C */ swc1 $f6, 0x8c($s0) -/* BD4FEC 8024177C 8FBF035C */ lw $ra, 0x35c($sp) -/* BD4FF0 80241780 8FB20358 */ lw $s2, 0x358($sp) -/* BD4FF4 80241784 8FB10354 */ lw $s1, 0x354($sp) -/* BD4FF8 80241788 8FB00350 */ lw $s0, 0x350($sp) -/* BD4FFC 8024178C D7B40360 */ ldc1 $f20, 0x360($sp) -/* BD5000 80241790 24020002 */ addiu $v0, $zero, 2 -/* BD5004 80241794 03E00008 */ jr $ra -/* BD5008 80241798 27BD0368 */ addiu $sp, $sp, 0x368 -/* BD500C 8024179C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_09/func_80240248_BDA7B0.s b/asm/nonmatchings/world/area_obk/obk_09/func_80240248_BDA7B0.s deleted file mode 100644 index dcc2306df1..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_09/func_80240248_BDA7B0.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240248_BDA9F8 -/* BDA9F8 80240248 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BDA9FC 8024024C 0080102D */ daddu $v0, $a0, $zero -/* BDAA00 80240250 AFBF001C */ sw $ra, 0x1c($sp) -/* BDAA04 80240254 AFB20018 */ sw $s2, 0x18($sp) -/* BDAA08 80240258 AFB10014 */ sw $s1, 0x14($sp) -/* BDAA0C 8024025C AFB00010 */ sw $s0, 0x10($sp) -/* BDAA10 80240260 8C44014C */ lw $a0, 0x14c($v0) -/* BDAA14 80240264 0C00EAD2 */ jal get_npc_safe -/* BDAA18 80240268 8C500060 */ lw $s0, 0x60($v0) -/* BDAA1C 8024026C 8E040018 */ lw $a0, 0x18($s0) -/* BDAA20 80240270 0C044181 */ jal get_shadow_by_index -/* BDAA24 80240274 0040882D */ daddu $s1, $v0, $zero -/* BDAA28 80240278 C6200038 */ lwc1 $f0, 0x38($s1) -/* BDAA2C 8024027C 3C014000 */ lui $at, 0x4000 -/* BDAA30 80240280 44811000 */ mtc1 $at, $f2 -/* BDAA34 80240284 00000000 */ nop -/* BDAA38 80240288 46020001 */ sub.s $f0, $f0, $f2 -/* BDAA3C 8024028C 3C014140 */ lui $at, 0x4140 -/* BDAA40 80240290 44811000 */ mtc1 $at, $f2 -/* BDAA44 80240294 E6000000 */ swc1 $f0, ($s0) -/* BDAA48 80240298 C620003C */ lwc1 $f0, 0x3c($s1) -/* BDAA4C 8024029C 46020000 */ add.s $f0, $f0, $f2 -/* BDAA50 802402A0 3C0141F0 */ lui $at, 0x41f0 -/* BDAA54 802402A4 44811000 */ mtc1 $at, $f2 -/* BDAA58 802402A8 E6000004 */ swc1 $f0, 4($s0) -/* BDAA5C 802402AC C6200040 */ lwc1 $f0, 0x40($s1) -/* BDAA60 802402B0 8E12001C */ lw $s2, 0x1c($s0) -/* BDAA64 802402B4 46020001 */ sub.s $f0, $f0, $f2 -/* BDAA68 802402B8 3C0140D3 */ lui $at, 0x40d3 -/* BDAA6C 802402BC 34213333 */ ori $at, $at, 0x3333 -/* BDAA70 802402C0 44816000 */ mtc1 $at, $f12 -/* BDAA74 802402C4 E6000008 */ swc1 $f0, 8($s0) -/* BDAA78 802402C8 8E43000C */ lw $v1, 0xc($s2) -/* BDAA7C 802402CC C6000000 */ lwc1 $f0, ($s0) -/* BDAA80 802402D0 E4600004 */ swc1 $f0, 4($v1) -/* BDAA84 802402D4 8E43000C */ lw $v1, 0xc($s2) -/* BDAA88 802402D8 C6000004 */ lwc1 $f0, 4($s0) -/* BDAA8C 802402DC E4600008 */ swc1 $f0, 8($v1) -/* BDAA90 802402E0 8E43000C */ lw $v1, 0xc($s2) -/* BDAA94 802402E4 C6000008 */ lwc1 $f0, 8($s0) -/* BDAA98 802402E8 E460000C */ swc1 $f0, 0xc($v1) -/* BDAA9C 802402EC C6000010 */ lwc1 $f0, 0x10($s0) -/* BDAAA0 802402F0 460C0300 */ add.s $f12, $f0, $f12 -/* BDAAA4 802402F4 0C00A6C9 */ jal clamp_angle -/* BDAAA8 802402F8 0040882D */ daddu $s1, $v0, $zero -/* BDAAAC 802402FC E6000010 */ swc1 $f0, 0x10($s0) -/* BDAAB0 80240300 8E42000C */ lw $v0, 0xc($s2) -/* BDAAB4 80240304 3C014220 */ lui $at, 0x4220 -/* BDAAB8 80240308 44811000 */ mtc1 $at, $f2 -/* BDAABC 8024030C E4400024 */ swc1 $f0, 0x24($v0) -/* BDAAC0 80240310 C6000000 */ lwc1 $f0, ($s0) -/* BDAAC4 80240314 E6200010 */ swc1 $f0, 0x10($s1) -/* BDAAC8 80240318 C6000004 */ lwc1 $f0, 4($s0) -/* BDAACC 8024031C 46020001 */ sub.s $f0, $f0, $f2 -/* BDAAD0 80240320 E6200014 */ swc1 $f0, 0x14($s1) -/* BDAAD4 80240324 C6000008 */ lwc1 $f0, 8($s0) -/* BDAAD8 80240328 E6200018 */ swc1 $f0, 0x18($s1) -/* BDAADC 8024032C 8FBF001C */ lw $ra, 0x1c($sp) -/* BDAAE0 80240330 8FB20018 */ lw $s2, 0x18($sp) -/* BDAAE4 80240334 8FB10014 */ lw $s1, 0x14($sp) -/* BDAAE8 80240338 8FB00010 */ lw $s0, 0x10($sp) -/* BDAAEC 8024033C 0000102D */ daddu $v0, $zero, $zero -/* BDAAF0 80240340 03E00008 */ jr $ra -/* BDAAF4 80240344 27BD0020 */ addiu $sp, $sp, 0x20 -/* BDAAF8 80240348 00000000 */ nop -/* BDAAFC 8024034C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_09/func_80240350_BDA7B0.s b/asm/nonmatchings/world/area_obk/obk_09/func_80240350_BDA7B0.s deleted file mode 100644 index 51e9267d93..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_09/func_80240350_BDA7B0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240350_BDAB00 -/* BDAB00 80240350 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BDAB04 80240354 3C048024 */ lui $a0, 0x8024 -/* BDAB08 80240358 248429E8 */ addiu $a0, $a0, 0x29e8 -/* BDAB0C 8024035C 27A50010 */ addiu $a1, $sp, 0x10 -/* BDAB10 80240360 AFBF0020 */ sw $ra, 0x20($sp) -/* BDAB14 80240364 AFB1001C */ sw $s1, 0x1c($sp) -/* BDAB18 80240368 0C016B3A */ jal load_asset_by_name -/* BDAB1C 8024036C AFB00018 */ sw $s0, 0x18($sp) -/* BDAB20 80240370 0040802D */ daddu $s0, $v0, $zero -/* BDAB24 80240374 0200202D */ daddu $a0, $s0, $zero -/* BDAB28 80240378 3C118024 */ lui $s1, 0x8024 -/* BDAB2C 8024037C 26312A00 */ addiu $s1, $s1, 0x2a00 -/* BDAB30 80240380 0C01BB7C */ jal decode_yay0 -/* BDAB34 80240384 0220282D */ daddu $a1, $s1, $zero -/* BDAB38 80240388 0C00AB1E */ jal general_heap_free -/* BDAB3C 8024038C 0200202D */ daddu $a0, $s0, $zero -/* BDAB40 80240390 3C048024 */ lui $a0, 0x8024 -/* BDAB44 80240394 24846990 */ addiu $a0, $a0, 0x6990 -/* BDAB48 80240398 3C028024 */ lui $v0, 0x8024 -/* BDAB4C 8024039C 24422C00 */ addiu $v0, $v0, 0x2c00 -/* BDAB50 802403A0 AC820000 */ sw $v0, ($a0) -/* BDAB54 802403A4 24020096 */ addiu $v0, $zero, 0x96 -/* BDAB58 802403A8 A4820008 */ sh $v0, 8($a0) -/* BDAB5C 802403AC 24020069 */ addiu $v0, $zero, 0x69 -/* BDAB60 802403B0 A482000A */ sh $v0, 0xa($a0) -/* BDAB64 802403B4 24020002 */ addiu $v0, $zero, 2 -/* BDAB68 802403B8 AC82000C */ sw $v0, 0xc($a0) -/* BDAB6C 802403BC 24020001 */ addiu $v0, $zero, 1 -/* BDAB70 802403C0 AC910004 */ sw $s1, 4($a0) -/* BDAB74 802403C4 0C0496CB */ jal set_message_images -/* BDAB78 802403C8 AC820010 */ sw $v0, 0x10($a0) -/* BDAB7C 802403CC 8FBF0020 */ lw $ra, 0x20($sp) -/* BDAB80 802403D0 8FB1001C */ lw $s1, 0x1c($sp) -/* BDAB84 802403D4 8FB00018 */ lw $s0, 0x18($sp) -/* BDAB88 802403D8 24020002 */ addiu $v0, $zero, 2 -/* BDAB8C 802403DC 03E00008 */ jr $ra -/* BDAB90 802403E0 27BD0028 */ addiu $sp, $sp, 0x28 -/* BDAB94 802403E4 00000000 */ nop -/* BDAB98 802403E8 00000000 */ nop -/* BDAB9C 802403EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_09/func_802403F0_BDA7B0.s b/asm/nonmatchings/world/area_obk/obk_09/func_802403F0_BDA7B0.s deleted file mode 100644 index 2f8bf55db9..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_09/func_802403F0_BDA7B0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F0_BDABA0 -/* BDABA0 802403F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BDABA4 802403F4 AFBF0010 */ sw $ra, 0x10($sp) -/* BDABA8 802403F8 0C04C3D6 */ jal get_item_entity -/* BDABAC 802403FC 8C840084 */ lw $a0, 0x84($a0) -/* BDABB0 80240400 3C013F19 */ lui $at, 0x3f19 -/* BDABB4 80240404 3421999A */ ori $at, $at, 0x999a -/* BDABB8 80240408 44810000 */ mtc1 $at, $f0 -/* BDABBC 8024040C 00000000 */ nop -/* BDABC0 80240410 E4400030 */ swc1 $f0, 0x30($v0) -/* BDABC4 80240414 8FBF0010 */ lw $ra, 0x10($sp) -/* BDABC8 80240418 24020002 */ addiu $v0, $zero, 2 -/* BDABCC 8024041C 03E00008 */ jr $ra -/* BDABD0 80240420 27BD0018 */ addiu $sp, $sp, 0x18 -/* BDABD4 80240424 00000000 */ nop -/* BDABD8 80240428 00000000 */ nop -/* BDABDC 8024042C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_01/func_80240260_D9AEF0.s b/asm/nonmatchings/world/area_omo/omo_01/func_80240260_D9AEF0.s deleted file mode 100644 index 37cdae4b7b..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_01/func_80240260_D9AEF0.s +++ /dev/null @@ -1,401 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240260_D9B150 -/* D9B150 80240260 27BDFF68 */ addiu $sp, $sp, -0x98 -/* D9B154 80240264 AFB60060 */ sw $s6, 0x60($sp) -/* D9B158 80240268 0080B02D */ daddu $s6, $a0, $zero -/* D9B15C 8024026C AFBF0064 */ sw $ra, 0x64($sp) -/* D9B160 80240270 AFB5005C */ sw $s5, 0x5c($sp) -/* D9B164 80240274 AFB40058 */ sw $s4, 0x58($sp) -/* D9B168 80240278 AFB30054 */ sw $s3, 0x54($sp) -/* D9B16C 8024027C AFB20050 */ sw $s2, 0x50($sp) -/* D9B170 80240280 AFB1004C */ sw $s1, 0x4c($sp) -/* D9B174 80240284 AFB00048 */ sw $s0, 0x48($sp) -/* D9B178 80240288 F7BE0090 */ sdc1 $f30, 0x90($sp) -/* D9B17C 8024028C F7BC0088 */ sdc1 $f28, 0x88($sp) -/* D9B180 80240290 F7BA0080 */ sdc1 $f26, 0x80($sp) -/* D9B184 80240294 F7B80078 */ sdc1 $f24, 0x78($sp) -/* D9B188 80240298 F7B60070 */ sdc1 $f22, 0x70($sp) -/* D9B18C 8024029C F7B40068 */ sdc1 $f20, 0x68($sp) -/* D9B190 802402A0 8ED20148 */ lw $s2, 0x148($s6) -/* D9B194 802402A4 00A0882D */ daddu $s1, $a1, $zero -/* D9B198 802402A8 86440008 */ lh $a0, 8($s2) -/* D9B19C 802402AC 0C00EABB */ jal get_npc_unsafe -/* D9B1A0 802402B0 00C0A82D */ daddu $s5, $a2, $zero -/* D9B1A4 802402B4 8E240020 */ lw $a0, 0x20($s1) -/* D9B1A8 802402B8 0040802D */ daddu $s0, $v0, $zero -/* D9B1AC 802402BC 00041FC2 */ srl $v1, $a0, 0x1f -/* D9B1B0 802402C0 00832021 */ addu $a0, $a0, $v1 -/* D9B1B4 802402C4 00042043 */ sra $a0, $a0, 1 -/* D9B1B8 802402C8 0C00A67F */ jal rand_int -/* D9B1BC 802402CC 24840001 */ addiu $a0, $a0, 1 -/* D9B1C0 802402D0 8E230020 */ lw $v1, 0x20($s1) -/* D9B1C4 802402D4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9B1C8 802402D8 000327C2 */ srl $a0, $v1, 0x1f -/* D9B1CC 802402DC 00641821 */ addu $v1, $v1, $a0 -/* D9B1D0 802402E0 00031843 */ sra $v1, $v1, 1 -/* D9B1D4 802402E4 00621821 */ addu $v1, $v1, $v0 -/* D9B1D8 802402E8 A603008E */ sh $v1, 0x8e($s0) -/* D9B1DC 802402EC 8E4200CC */ lw $v0, 0xcc($s2) -/* D9B1E0 802402F0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9B1E4 802402F4 8C42000C */ lw $v0, 0xc($v0) -/* D9B1E8 802402F8 AE020028 */ sw $v0, 0x28($s0) -/* D9B1EC 802402FC C6200018 */ lwc1 $f0, 0x18($s1) -/* D9B1F0 80240300 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D9B1F4 80240304 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D9B1F8 80240308 E6000018 */ swc1 $f0, 0x18($s0) -/* D9B1FC 8024030C 8C460028 */ lw $a2, 0x28($v0) -/* D9B200 80240310 8C470030 */ lw $a3, 0x30($v0) -/* D9B204 80240314 0C00A720 */ jal atan2 -/* D9B208 80240318 0000982D */ daddu $s3, $zero, $zero -/* D9B20C 8024031C 3C014334 */ lui $at, 0x4334 -/* D9B210 80240320 44816000 */ mtc1 $at, $f12 -/* D9B214 80240324 0C00A6C9 */ jal clamp_angle -/* D9B218 80240328 460C0300 */ add.s $f12, $f0, $f12 -/* D9B21C 8024032C 46000506 */ mov.s $f20, $f0 -/* D9B220 80240330 C60C000C */ lwc1 $f12, 0xc($s0) -/* D9B224 80240334 0C00A70A */ jal get_clamped_angle_diff -/* D9B228 80240338 4600A386 */ mov.s $f14, $f20 -/* D9B22C 8024033C 46000086 */ mov.s $f2, $f0 -/* D9B230 80240340 8E22001C */ lw $v0, 0x1c($s1) -/* D9B234 80240344 46001005 */ abs.s $f0, $f2 -/* D9B238 80240348 44822000 */ mtc1 $v0, $f4 -/* D9B23C 8024034C 00000000 */ nop -/* D9B240 80240350 46802120 */ cvt.s.w $f4, $f4 -/* D9B244 80240354 4600203C */ c.lt.s $f4, $f0 -/* D9B248 80240358 00000000 */ nop -/* D9B24C 8024035C 4500000D */ bc1f .L80240394 -/* D9B250 80240360 00000000 */ nop -/* D9B254 80240364 44800000 */ mtc1 $zero, $f0 -/* D9B258 80240368 C614000C */ lwc1 $f20, 0xc($s0) -/* D9B25C 8024036C 4600103C */ c.lt.s $f2, $f0 -/* D9B260 80240370 00000000 */ nop -/* D9B264 80240374 45000006 */ bc1f .L80240390 -/* D9B268 80240378 00021023 */ negu $v0, $v0 -/* D9B26C 8024037C 44820000 */ mtc1 $v0, $f0 -/* D9B270 80240380 00000000 */ nop -/* D9B274 80240384 46800020 */ cvt.s.w $f0, $f0 -/* D9B278 80240388 080900E5 */ j .L80240394 -/* D9B27C 8024038C 4600A500 */ add.s $f20, $f20, $f0 -.L80240390: -/* D9B280 80240390 4604A500 */ add.s $f20, $f20, $f4 -.L80240394: -/* D9B284 80240394 0C00A6C9 */ jal clamp_angle -/* D9B288 80240398 4600A306 */ mov.s $f12, $f20 -/* D9B28C 8024039C 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* D9B290 802403A0 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* D9B294 802403A4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9B298 802403A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9B29C 802403AC 8E820000 */ lw $v0, ($s4) -/* D9B2A0 802403B0 C602003C */ lwc1 $f2, 0x3c($s0) -/* D9B2A4 802403B4 E600000C */ swc1 $f0, 0xc($s0) -/* D9B2A8 802403B8 46006006 */ mov.s $f0, $f12 -/* D9B2AC 802403BC 8C460028 */ lw $a2, 0x28($v0) -/* D9B2B0 802403C0 8C470030 */ lw $a3, 0x30($v0) -/* D9B2B4 802403C4 46007106 */ mov.s $f4, $f14 -/* D9B2B8 802403C8 E7A00020 */ swc1 $f0, 0x20($sp) -/* D9B2BC 802403CC E7A20024 */ swc1 $f2, 0x24($sp) -/* D9B2C0 802403D0 0C00A720 */ jal atan2 -/* D9B2C4 802403D4 E7A40028 */ swc1 $f4, 0x28($sp) -/* D9B2C8 802403D8 3C014334 */ lui $at, 0x4334 -/* D9B2CC 802403DC 44816000 */ mtc1 $at, $f12 -/* D9B2D0 802403E0 0C00A6C9 */ jal clamp_angle -/* D9B2D4 802403E4 460C0300 */ add.s $f12, $f0, $f12 -/* D9B2D8 802403E8 C6020018 */ lwc1 $f2, 0x18($s0) -/* D9B2DC 802403EC 3C014012 */ lui $at, 0x4012 -/* D9B2E0 802403F0 4481E800 */ mtc1 $at, $f29 -/* D9B2E4 802403F4 4480E000 */ mtc1 $zero, $f28 -/* D9B2E8 802403F8 460010A1 */ cvt.d.s $f2, $f2 -/* D9B2EC 802403FC 463C1082 */ mul.d $f2, $f2, $f28 -/* D9B2F0 80240400 00000000 */ nop -/* D9B2F4 80240404 46000506 */ mov.s $f20, $f0 -/* D9B2F8 80240408 27A50020 */ addiu $a1, $sp, 0x20 -/* D9B2FC 8024040C 27A60024 */ addiu $a2, $sp, 0x24 -/* D9B300 80240410 27A70028 */ addiu $a3, $sp, 0x28 -/* D9B304 80240414 E7B40014 */ swc1 $f20, 0x14($sp) -/* D9B308 80240418 462010A0 */ cvt.s.d $f2, $f2 -/* D9B30C 8024041C E7A20010 */ swc1 $f2, 0x10($sp) -/* D9B310 80240420 860200A8 */ lh $v0, 0xa8($s0) -/* D9B314 80240424 4480B000 */ mtc1 $zero, $f22 -/* D9B318 80240428 44820000 */ mtc1 $v0, $f0 -/* D9B31C 8024042C 00000000 */ nop -/* D9B320 80240430 46800020 */ cvt.s.w $f0, $f0 -/* D9B324 80240434 E7A00018 */ swc1 $f0, 0x18($sp) -/* D9B328 80240438 860200A6 */ lh $v0, 0xa6($s0) -/* D9B32C 8024043C 4600B606 */ mov.s $f24, $f22 -/* D9B330 80240440 44820000 */ mtc1 $v0, $f0 -/* D9B334 80240444 00000000 */ nop -/* D9B338 80240448 46800020 */ cvt.s.w $f0, $f0 -/* D9B33C 8024044C E7A0001C */ swc1 $f0, 0x1c($sp) -/* D9B340 80240450 8E040080 */ lw $a0, 0x80($s0) -/* D9B344 80240454 0C03773B */ jal func_800DDCEC -/* D9B348 80240458 4600C686 */ mov.s $f26, $f24 -/* D9B34C 8024045C 104000E1 */ beqz $v0, .L802407E4 -/* D9B350 80240460 00000000 */ nop -/* D9B354 80240464 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9B358 80240468 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9B35C 8024046C 8FA60020 */ lw $a2, 0x20($sp) -/* D9B360 80240470 0C00A7B5 */ jal dist2D -/* D9B364 80240474 8FA70028 */ lw $a3, 0x28($sp) -/* D9B368 80240478 46000586 */ mov.s $f22, $f0 -/* D9B36C 8024047C C6020038 */ lwc1 $f2, 0x38($s0) -/* D9B370 80240480 C604003C */ lwc1 $f4, 0x3c($s0) -/* D9B374 80240484 3C01420C */ lui $at, 0x420c -/* D9B378 80240488 4481F000 */ mtc1 $at, $f30 -/* D9B37C 8024048C C6000040 */ lwc1 $f0, 0x40($s0) -/* D9B380 80240490 461EA300 */ add.s $f12, $f20, $f30 -/* D9B384 80240494 E7A2002C */ swc1 $f2, 0x2c($sp) -/* D9B388 80240498 E7A40030 */ swc1 $f4, 0x30($sp) -/* D9B38C 8024049C 0C00A6C9 */ jal clamp_angle -/* D9B390 802404A0 E7A00034 */ swc1 $f0, 0x34($sp) -/* D9B394 802404A4 C6020018 */ lwc1 $f2, 0x18($s0) -/* D9B398 802404A8 460010A1 */ cvt.d.s $f2, $f2 -/* D9B39C 802404AC 463C1082 */ mul.d $f2, $f2, $f28 -/* D9B3A0 802404B0 00000000 */ nop -/* D9B3A4 802404B4 E7A00014 */ swc1 $f0, 0x14($sp) -/* D9B3A8 802404B8 462010A0 */ cvt.s.d $f2, $f2 -/* D9B3AC 802404BC E7A20010 */ swc1 $f2, 0x10($sp) -/* D9B3B0 802404C0 860200A8 */ lh $v0, 0xa8($s0) -/* D9B3B4 802404C4 27A5002C */ addiu $a1, $sp, 0x2c -/* D9B3B8 802404C8 44820000 */ mtc1 $v0, $f0 -/* D9B3BC 802404CC 00000000 */ nop -/* D9B3C0 802404D0 46800020 */ cvt.s.w $f0, $f0 -/* D9B3C4 802404D4 E7A00018 */ swc1 $f0, 0x18($sp) -/* D9B3C8 802404D8 860200A6 */ lh $v0, 0xa6($s0) -/* D9B3CC 802404DC 27A60030 */ addiu $a2, $sp, 0x30 -/* D9B3D0 802404E0 44820000 */ mtc1 $v0, $f0 -/* D9B3D4 802404E4 00000000 */ nop -/* D9B3D8 802404E8 46800020 */ cvt.s.w $f0, $f0 -/* D9B3DC 802404EC E7A0001C */ swc1 $f0, 0x1c($sp) -/* D9B3E0 802404F0 8E040080 */ lw $a0, 0x80($s0) -/* D9B3E4 802404F4 0C03773B */ jal func_800DDCEC -/* D9B3E8 802404F8 27A70034 */ addiu $a3, $sp, 0x34 -/* D9B3EC 802404FC 10400007 */ beqz $v0, .L8024051C -/* D9B3F0 80240500 00000000 */ nop -/* D9B3F4 80240504 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9B3F8 80240508 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9B3FC 8024050C 8FA6002C */ lw $a2, 0x2c($sp) -/* D9B400 80240510 0C00A7B5 */ jal dist2D -/* D9B404 80240514 8FA70034 */ lw $a3, 0x34($sp) -/* D9B408 80240518 46000606 */ mov.s $f24, $f0 -.L8024051C: -/* D9B40C 8024051C C6000038 */ lwc1 $f0, 0x38($s0) -/* D9B410 80240520 C602003C */ lwc1 $f2, 0x3c($s0) -/* D9B414 80240524 C6040040 */ lwc1 $f4, 0x40($s0) -/* D9B418 80240528 461EA301 */ sub.s $f12, $f20, $f30 -/* D9B41C 8024052C E7A00038 */ swc1 $f0, 0x38($sp) -/* D9B420 80240530 E7A2003C */ swc1 $f2, 0x3c($sp) -/* D9B424 80240534 0C00A6C9 */ jal clamp_angle -/* D9B428 80240538 E7A40040 */ swc1 $f4, 0x40($sp) -/* D9B42C 8024053C C6020018 */ lwc1 $f2, 0x18($s0) -/* D9B430 80240540 460010A1 */ cvt.d.s $f2, $f2 -/* D9B434 80240544 463C1082 */ mul.d $f2, $f2, $f28 -/* D9B438 80240548 00000000 */ nop -/* D9B43C 8024054C E7A00014 */ swc1 $f0, 0x14($sp) -/* D9B440 80240550 462010A0 */ cvt.s.d $f2, $f2 -/* D9B444 80240554 E7A20010 */ swc1 $f2, 0x10($sp) -/* D9B448 80240558 860200A8 */ lh $v0, 0xa8($s0) -/* D9B44C 8024055C 27A50038 */ addiu $a1, $sp, 0x38 -/* D9B450 80240560 44820000 */ mtc1 $v0, $f0 -/* D9B454 80240564 00000000 */ nop -/* D9B458 80240568 46800020 */ cvt.s.w $f0, $f0 -/* D9B45C 8024056C E7A00018 */ swc1 $f0, 0x18($sp) -/* D9B460 80240570 860200A6 */ lh $v0, 0xa6($s0) -/* D9B464 80240574 27A6003C */ addiu $a2, $sp, 0x3c -/* D9B468 80240578 44820000 */ mtc1 $v0, $f0 -/* D9B46C 8024057C 00000000 */ nop -/* D9B470 80240580 46800020 */ cvt.s.w $f0, $f0 -/* D9B474 80240584 E7A0001C */ swc1 $f0, 0x1c($sp) -/* D9B478 80240588 8E040080 */ lw $a0, 0x80($s0) -/* D9B47C 8024058C 0C03773B */ jal func_800DDCEC -/* D9B480 80240590 27A70040 */ addiu $a3, $sp, 0x40 -/* D9B484 80240594 10400007 */ beqz $v0, .L802405B4 -/* D9B488 80240598 00000000 */ nop -/* D9B48C 8024059C C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9B490 802405A0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9B494 802405A4 8FA60038 */ lw $a2, 0x38($sp) -/* D9B498 802405A8 0C00A7B5 */ jal dist2D -/* D9B49C 802405AC 8FA70040 */ lw $a3, 0x40($sp) -/* D9B4A0 802405B0 46000686 */ mov.s $f26, $f0 -.L802405B4: -/* D9B4A4 802405B4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9B4A8 802405B8 8E820000 */ lw $v0, ($s4) -/* D9B4AC 802405BC C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9B4B0 802405C0 8C460028 */ lw $a2, 0x28($v0) -/* D9B4B4 802405C4 0C00A7B5 */ jal dist2D -/* D9B4B8 802405C8 8C470030 */ lw $a3, 0x30($v0) -/* D9B4BC 802405CC C6000018 */ lwc1 $f0, 0x18($s0) -/* D9B4C0 802405D0 3C013FF8 */ lui $at, 0x3ff8 -/* D9B4C4 802405D4 44811800 */ mtc1 $at, $f3 -/* D9B4C8 802405D8 44801000 */ mtc1 $zero, $f2 -/* D9B4CC 802405DC 46000021 */ cvt.d.s $f0, $f0 -/* D9B4D0 802405E0 46220082 */ mul.d $f2, $f0, $f2 -/* D9B4D4 802405E4 00000000 */ nop -/* D9B4D8 802405E8 4600B021 */ cvt.d.s $f0, $f22 -/* D9B4DC 802405EC 4622003C */ c.lt.d $f0, $f2 -/* D9B4E0 802405F0 00000000 */ nop -/* D9B4E4 802405F4 45000012 */ bc1f .L80240640 -/* D9B4E8 802405F8 00000000 */ nop -/* D9B4EC 802405FC 4600C021 */ cvt.d.s $f0, $f24 -/* D9B4F0 80240600 4622003C */ c.lt.d $f0, $f2 -/* D9B4F4 80240604 00000000 */ nop -/* D9B4F8 80240608 4500000D */ bc1f .L80240640 -/* D9B4FC 8024060C 00000000 */ nop -/* D9B500 80240610 4600D021 */ cvt.d.s $f0, $f26 -/* D9B504 80240614 4622003C */ c.lt.d $f0, $f2 -/* D9B508 80240618 00000000 */ nop -/* D9B50C 8024061C 45000008 */ bc1f .L80240640 -/* D9B510 80240620 02A0202D */ daddu $a0, $s5, $zero -/* D9B514 80240624 AFA00010 */ sw $zero, 0x10($sp) -/* D9B518 80240628 8E26000C */ lw $a2, 0xc($s1) -/* D9B51C 8024062C 8E270010 */ lw $a3, 0x10($s1) -/* D9B520 80240630 0C01242D */ jal func_800490B4 -/* D9B524 80240634 0240282D */ daddu $a1, $s2, $zero -/* D9B528 80240638 54400001 */ bnel $v0, $zero, .L80240640 -/* D9B52C 8024063C 24130001 */ addiu $s3, $zero, 1 -.L80240640: -/* D9B530 80240640 1660006A */ bnez $s3, .L802407EC -/* D9B534 80240644 2402000A */ addiu $v0, $zero, 0xa -/* D9B538 80240648 4616C03C */ c.lt.s $f24, $f22 -/* D9B53C 8024064C 00000000 */ nop -/* D9B540 80240650 4500000C */ bc1f .L80240684 -/* D9B544 80240654 00000000 */ nop -/* D9B548 80240658 4618D03C */ c.lt.s $f26, $f24 -/* D9B54C 8024065C 00000000 */ nop -/* D9B550 80240660 45000006 */ bc1f .L8024067C -/* D9B554 80240664 00000000 */ nop -/* D9B558 80240668 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9B55C 8024066C C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9B560 80240670 8FA60020 */ lw $a2, 0x20($sp) -/* D9B564 80240674 080901DA */ j .L80240768 -/* D9B568 80240678 8FA70028 */ lw $a3, 0x28($sp) -.L8024067C: -/* D9B56C 8024067C 4616C03C */ c.lt.s $f24, $f22 -/* D9B570 80240680 00000000 */ nop -.L80240684: -/* D9B574 80240684 4500000A */ bc1f .L802406B0 -/* D9B578 80240688 00000000 */ nop -/* D9B57C 8024068C 461AC03C */ c.lt.s $f24, $f26 -/* D9B580 80240690 00000000 */ nop -/* D9B584 80240694 45000006 */ bc1f .L802406B0 -/* D9B588 80240698 00000000 */ nop -/* D9B58C 8024069C C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9B590 802406A0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9B594 802406A4 8FA60020 */ lw $a2, 0x20($sp) -/* D9B598 802406A8 080901DA */ j .L80240768 -/* D9B59C 802406AC 8FA70028 */ lw $a3, 0x28($sp) -.L802406B0: -/* D9B5A0 802406B0 4618B03C */ c.lt.s $f22, $f24 -/* D9B5A4 802406B4 00000000 */ nop -/* D9B5A8 802406B8 4500000A */ bc1f .L802406E4 -/* D9B5AC 802406BC 00000000 */ nop -/* D9B5B0 802406C0 4616D03C */ c.lt.s $f26, $f22 -/* D9B5B4 802406C4 00000000 */ nop -/* D9B5B8 802406C8 45000006 */ bc1f .L802406E4 -/* D9B5BC 802406CC 00000000 */ nop -/* D9B5C0 802406D0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9B5C4 802406D4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9B5C8 802406D8 8FA6002C */ lw $a2, 0x2c($sp) -/* D9B5CC 802406DC 080901DA */ j .L80240768 -/* D9B5D0 802406E0 8FA70034 */ lw $a3, 0x34($sp) -.L802406E4: -/* D9B5D4 802406E4 4618D03C */ c.lt.s $f26, $f24 -/* D9B5D8 802406E8 00000000 */ nop -/* D9B5DC 802406EC 4500000A */ bc1f .L80240718 -/* D9B5E0 802406F0 00000000 */ nop -/* D9B5E4 802406F4 461AB03C */ c.lt.s $f22, $f26 -/* D9B5E8 802406F8 00000000 */ nop -/* D9B5EC 802406FC 45000008 */ bc1f .L80240720 -/* D9B5F0 80240700 00000000 */ nop -/* D9B5F4 80240704 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9B5F8 80240708 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9B5FC 8024070C 8FA6002C */ lw $a2, 0x2c($sp) -/* D9B600 80240710 080901DA */ j .L80240768 -/* D9B604 80240714 8FA70034 */ lw $a3, 0x34($sp) -.L80240718: -/* D9B608 80240718 461AB03C */ c.lt.s $f22, $f26 -/* D9B60C 8024071C 00000000 */ nop -.L80240720: -/* D9B610 80240720 45000005 */ bc1f .L80240738 -/* D9B614 80240724 00000000 */ nop -/* D9B618 80240728 4616C03C */ c.lt.s $f24, $f22 -/* D9B61C 8024072C 00000000 */ nop -/* D9B620 80240730 45010009 */ bc1t .L80240758 -/* D9B624 80240734 00000000 */ nop -.L80240738: -/* D9B628 80240738 461AC03C */ c.lt.s $f24, $f26 -/* D9B62C 8024073C 00000000 */ nop -/* D9B630 80240740 4500000C */ bc1f .L80240774 -/* D9B634 80240744 00000000 */ nop -/* D9B638 80240748 4618B03C */ c.lt.s $f22, $f24 -/* D9B63C 8024074C 00000000 */ nop -/* D9B640 80240750 45000008 */ bc1f .L80240774 -/* D9B644 80240754 00000000 */ nop -.L80240758: -/* D9B648 80240758 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9B64C 8024075C C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9B650 80240760 8FA60038 */ lw $a2, 0x38($sp) -/* D9B654 80240764 8FA70040 */ lw $a3, 0x40($sp) -.L80240768: -/* D9B658 80240768 0C00A720 */ jal atan2 -/* D9B65C 8024076C 00000000 */ nop -/* D9B660 80240770 46000506 */ mov.s $f20, $f0 -.L80240774: -/* D9B664 80240774 C60C000C */ lwc1 $f12, 0xc($s0) -/* D9B668 80240778 0C00A70A */ jal get_clamped_angle_diff -/* D9B66C 8024077C 4600A386 */ mov.s $f14, $f20 -/* D9B670 80240780 46000086 */ mov.s $f2, $f0 -/* D9B674 80240784 8E22001C */ lw $v0, 0x1c($s1) -/* D9B678 80240788 46001005 */ abs.s $f0, $f2 -/* D9B67C 8024078C 44822000 */ mtc1 $v0, $f4 -/* D9B680 80240790 00000000 */ nop -/* D9B684 80240794 46802120 */ cvt.s.w $f4, $f4 -/* D9B688 80240798 4600203C */ c.lt.s $f4, $f0 -/* D9B68C 8024079C 00000000 */ nop -/* D9B690 802407A0 4500000D */ bc1f .L802407D8 -/* D9B694 802407A4 00000000 */ nop -/* D9B698 802407A8 44800000 */ mtc1 $zero, $f0 -/* D9B69C 802407AC C614000C */ lwc1 $f20, 0xc($s0) -/* D9B6A0 802407B0 4600103C */ c.lt.s $f2, $f0 -/* D9B6A4 802407B4 00000000 */ nop -/* D9B6A8 802407B8 45000006 */ bc1f .L802407D4 -/* D9B6AC 802407BC 00021023 */ negu $v0, $v0 -/* D9B6B0 802407C0 44820000 */ mtc1 $v0, $f0 -/* D9B6B4 802407C4 00000000 */ nop -/* D9B6B8 802407C8 46800020 */ cvt.s.w $f0, $f0 -/* D9B6BC 802407CC 080901F6 */ j .L802407D8 -/* D9B6C0 802407D0 4600A500 */ add.s $f20, $f20, $f0 -.L802407D4: -/* D9B6C4 802407D4 4604A500 */ add.s $f20, $f20, $f4 -.L802407D8: -/* D9B6C8 802407D8 0C00A6C9 */ jal clamp_angle -/* D9B6CC 802407DC 4600A306 */ mov.s $f12, $f20 -/* D9B6D0 802407E0 E600000C */ swc1 $f0, 0xc($s0) -.L802407E4: -/* D9B6D4 802407E4 12600005 */ beqz $s3, .L802407FC -/* D9B6D8 802407E8 2402000A */ addiu $v0, $zero, 0xa -.L802407EC: -/* D9B6DC 802407EC A602008E */ sh $v0, 0x8e($s0) -/* D9B6E0 802407F0 8E4200CC */ lw $v0, 0xcc($s2) -/* D9B6E4 802407F4 8C420020 */ lw $v0, 0x20($v0) -/* D9B6E8 802407F8 AE020028 */ sw $v0, 0x28($s0) -.L802407FC: -/* D9B6EC 802407FC 2402000D */ addiu $v0, $zero, 0xd -/* D9B6F0 80240800 AEC20070 */ sw $v0, 0x70($s6) -/* D9B6F4 80240804 8FBF0064 */ lw $ra, 0x64($sp) -/* D9B6F8 80240808 8FB60060 */ lw $s6, 0x60($sp) -/* D9B6FC 8024080C 8FB5005C */ lw $s5, 0x5c($sp) -/* D9B700 80240810 8FB40058 */ lw $s4, 0x58($sp) -/* D9B704 80240814 8FB30054 */ lw $s3, 0x54($sp) -/* D9B708 80240818 8FB20050 */ lw $s2, 0x50($sp) -/* D9B70C 8024081C 8FB1004C */ lw $s1, 0x4c($sp) -/* D9B710 80240820 8FB00048 */ lw $s0, 0x48($sp) -/* D9B714 80240824 D7BE0090 */ ldc1 $f30, 0x90($sp) -/* D9B718 80240828 D7BC0088 */ ldc1 $f28, 0x88($sp) -/* D9B71C 8024082C D7BA0080 */ ldc1 $f26, 0x80($sp) -/* D9B720 80240830 D7B80078 */ ldc1 $f24, 0x78($sp) -/* D9B724 80240834 D7B60070 */ ldc1 $f22, 0x70($sp) -/* D9B728 80240838 D7B40068 */ ldc1 $f20, 0x68($sp) -/* D9B72C 8024083C 03E00008 */ jr $ra -/* D9B730 80240840 27BD0098 */ addiu $sp, $sp, 0x98 diff --git a/asm/nonmatchings/world/area_omo/omo_01/func_80240844_D9AEF0.s b/asm/nonmatchings/world/area_omo/omo_01/func_80240844_D9AEF0.s deleted file mode 100644 index 5fa58c4ab3..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_01/func_80240844_D9AEF0.s +++ /dev/null @@ -1,100 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240844_D9B734 -/* D9B734 80240844 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D9B738 80240848 AFB3003C */ sw $s3, 0x3c($sp) -/* D9B73C 8024084C 0080982D */ daddu $s3, $a0, $zero -/* D9B740 80240850 AFBF0040 */ sw $ra, 0x40($sp) -/* D9B744 80240854 AFB20038 */ sw $s2, 0x38($sp) -/* D9B748 80240858 AFB10034 */ sw $s1, 0x34($sp) -/* D9B74C 8024085C AFB00030 */ sw $s0, 0x30($sp) -/* D9B750 80240860 8E720148 */ lw $s2, 0x148($s3) -/* D9B754 80240864 00A0882D */ daddu $s1, $a1, $zero -/* D9B758 80240868 86440008 */ lh $a0, 8($s2) -/* D9B75C 8024086C 0C00EABB */ jal get_npc_unsafe -/* D9B760 80240870 00C0802D */ daddu $s0, $a2, $zero -/* D9B764 80240874 0200202D */ daddu $a0, $s0, $zero -/* D9B768 80240878 0240282D */ daddu $a1, $s2, $zero -/* D9B76C 8024087C 24030001 */ addiu $v1, $zero, 1 -/* D9B770 80240880 AFA30010 */ sw $v1, 0x10($sp) -/* D9B774 80240884 8E260024 */ lw $a2, 0x24($s1) -/* D9B778 80240888 8E270028 */ lw $a3, 0x28($s1) -/* D9B77C 8024088C 0C01242D */ jal func_800490B4 -/* D9B780 80240890 0040802D */ daddu $s0, $v0, $zero -/* D9B784 80240894 1440001D */ bnez $v0, .L8024090C -/* D9B788 80240898 24040002 */ addiu $a0, $zero, 2 -/* D9B78C 8024089C 0200282D */ daddu $a1, $s0, $zero -/* D9B790 802408A0 0000302D */ daddu $a2, $zero, $zero -/* D9B794 802408A4 860300A8 */ lh $v1, 0xa8($s0) -/* D9B798 802408A8 3C013F80 */ lui $at, 0x3f80 -/* D9B79C 802408AC 44810000 */ mtc1 $at, $f0 -/* D9B7A0 802408B0 3C014000 */ lui $at, 0x4000 -/* D9B7A4 802408B4 44811000 */ mtc1 $at, $f2 -/* D9B7A8 802408B8 3C01C1A0 */ lui $at, 0xc1a0 -/* D9B7AC 802408BC 44812000 */ mtc1 $at, $f4 -/* D9B7B0 802408C0 2402000F */ addiu $v0, $zero, 0xf -/* D9B7B4 802408C4 AFA2001C */ sw $v0, 0x1c($sp) -/* D9B7B8 802408C8 44833000 */ mtc1 $v1, $f6 -/* D9B7BC 802408CC 00000000 */ nop -/* D9B7C0 802408D0 468031A0 */ cvt.s.w $f6, $f6 -/* D9B7C4 802408D4 44073000 */ mfc1 $a3, $f6 -/* D9B7C8 802408D8 27A20028 */ addiu $v0, $sp, 0x28 -/* D9B7CC 802408DC AFA20020 */ sw $v0, 0x20($sp) -/* D9B7D0 802408E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D9B7D4 802408E4 E7A20014 */ swc1 $f2, 0x14($sp) -/* D9B7D8 802408E8 0C01BFA4 */ jal fx_emote -/* D9B7DC 802408EC E7A40018 */ swc1 $f4, 0x18($sp) -/* D9B7E0 802408F0 8E4200CC */ lw $v0, 0xcc($s2) -/* D9B7E4 802408F4 8C430000 */ lw $v1, ($v0) -/* D9B7E8 802408F8 24020019 */ addiu $v0, $zero, 0x19 -/* D9B7EC 802408FC A602008E */ sh $v0, 0x8e($s0) -/* D9B7F0 80240900 2402000E */ addiu $v0, $zero, 0xe -/* D9B7F4 80240904 08090262 */ j .L80240988 -/* D9B7F8 80240908 AE030028 */ sw $v1, 0x28($s0) -.L8024090C: -/* D9B7FC 8024090C 8E4200CC */ lw $v0, 0xcc($s2) -/* D9B800 80240910 8E030028 */ lw $v1, 0x28($s0) -/* D9B804 80240914 8C420020 */ lw $v0, 0x20($v0) -/* D9B808 80240918 10620014 */ beq $v1, $v0, .L8024096C -/* D9B80C 8024091C 00000000 */ nop -/* D9B810 80240920 C6000018 */ lwc1 $f0, 0x18($s0) -/* D9B814 80240924 3C014010 */ lui $at, 0x4010 -/* D9B818 80240928 44811800 */ mtc1 $at, $f3 -/* D9B81C 8024092C 44801000 */ mtc1 $zero, $f2 -/* D9B820 80240930 46000021 */ cvt.d.s $f0, $f0 -/* D9B824 80240934 4622003C */ c.lt.d $f0, $f2 -/* D9B828 80240938 00000000 */ nop -/* D9B82C 8024093C 45000003 */ bc1f .L8024094C -/* D9B830 80240940 0000282D */ daddu $a1, $zero, $zero -/* D9B834 80240944 08090255 */ j .L80240954 -/* D9B838 80240948 0200202D */ daddu $a0, $s0, $zero -.L8024094C: -/* D9B83C 8024094C 0200202D */ daddu $a0, $s0, $zero -/* D9B840 80240950 24050001 */ addiu $a1, $zero, 1 -.L80240954: -/* D9B844 80240954 0C00F598 */ jal func_8003D660 -/* D9B848 80240958 00000000 */ nop -/* D9B84C 8024095C 8E050018 */ lw $a1, 0x18($s0) -/* D9B850 80240960 8E06000C */ lw $a2, 0xc($s0) -/* D9B854 80240964 0C00EA95 */ jal npc_move_heading -/* D9B858 80240968 0200202D */ daddu $a0, $s0, $zero -.L8024096C: -/* D9B85C 8024096C 8602008E */ lh $v0, 0x8e($s0) -/* D9B860 80240970 9603008E */ lhu $v1, 0x8e($s0) -/* D9B864 80240974 18400003 */ blez $v0, .L80240984 -/* D9B868 80240978 2462FFFF */ addiu $v0, $v1, -1 -/* D9B86C 8024097C 08090263 */ j .L8024098C -/* D9B870 80240980 A602008E */ sh $v0, 0x8e($s0) -.L80240984: -/* D9B874 80240984 2402000C */ addiu $v0, $zero, 0xc -.L80240988: -/* D9B878 80240988 AE620070 */ sw $v0, 0x70($s3) -.L8024098C: -/* D9B87C 8024098C 8FBF0040 */ lw $ra, 0x40($sp) -/* D9B880 80240990 8FB3003C */ lw $s3, 0x3c($sp) -/* D9B884 80240994 8FB20038 */ lw $s2, 0x38($sp) -/* D9B888 80240998 8FB10034 */ lw $s1, 0x34($sp) -/* D9B88C 8024099C 8FB00030 */ lw $s0, 0x30($sp) -/* D9B890 802409A0 03E00008 */ jr $ra -/* D9B894 802409A4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_01/func_802409A8_D9AEF0.s b/asm/nonmatchings/world/area_omo/omo_01/func_802409A8_D9AEF0.s deleted file mode 100644 index 595552c349..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_01/func_802409A8_D9AEF0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409A8_D9B898 -/* D9B898 802409A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9B89C 802409AC AFB00010 */ sw $s0, 0x10($sp) -/* D9B8A0 802409B0 0080802D */ daddu $s0, $a0, $zero -/* D9B8A4 802409B4 AFBF0014 */ sw $ra, 0x14($sp) -/* D9B8A8 802409B8 8E020148 */ lw $v0, 0x148($s0) -/* D9B8AC 802409BC 0C00EABB */ jal get_npc_unsafe -/* D9B8B0 802409C0 84440008 */ lh $a0, 8($v0) -/* D9B8B4 802409C4 9443008E */ lhu $v1, 0x8e($v0) -/* D9B8B8 802409C8 2463FFFF */ addiu $v1, $v1, -1 -/* D9B8BC 802409CC A443008E */ sh $v1, 0x8e($v0) -/* D9B8C0 802409D0 00031C00 */ sll $v1, $v1, 0x10 -/* D9B8C4 802409D4 50600001 */ beql $v1, $zero, .L802409DC -/* D9B8C8 802409D8 AE000070 */ sw $zero, 0x70($s0) -.L802409DC: -/* D9B8CC 802409DC 8FBF0014 */ lw $ra, 0x14($sp) -/* D9B8D0 802409E0 8FB00010 */ lw $s0, 0x10($sp) -/* D9B8D4 802409E4 03E00008 */ jr $ra -/* D9B8D8 802409E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_01/func_802409EC_D9AEF0.s b/asm/nonmatchings/world/area_omo/omo_01/func_802409EC_D9AEF0.s deleted file mode 100644 index d9dbb0db5d..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_01/func_802409EC_D9AEF0.s +++ /dev/null @@ -1,154 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409EC_D9B8DC -/* D9B8DC 802409EC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D9B8E0 802409F0 AFB40040 */ sw $s4, 0x40($sp) -/* D9B8E4 802409F4 0080A02D */ daddu $s4, $a0, $zero -/* D9B8E8 802409F8 AFBF0048 */ sw $ra, 0x48($sp) -/* D9B8EC 802409FC AFB50044 */ sw $s5, 0x44($sp) -/* D9B8F0 80240A00 AFB3003C */ sw $s3, 0x3c($sp) -/* D9B8F4 80240A04 AFB20038 */ sw $s2, 0x38($sp) -/* D9B8F8 80240A08 AFB10034 */ sw $s1, 0x34($sp) -/* D9B8FC 80240A0C AFB00030 */ sw $s0, 0x30($sp) -/* D9B900 80240A10 8E910148 */ lw $s1, 0x148($s4) -/* D9B904 80240A14 86240008 */ lh $a0, 8($s1) -/* D9B908 80240A18 0C00EABB */ jal get_npc_unsafe -/* D9B90C 80240A1C 00A0802D */ daddu $s0, $a1, $zero -/* D9B910 80240A20 8E83000C */ lw $v1, 0xc($s4) -/* D9B914 80240A24 0280202D */ daddu $a0, $s4, $zero -/* D9B918 80240A28 8C650000 */ lw $a1, ($v1) -/* D9B91C 80240A2C 0C0B1EAF */ jal get_variable -/* D9B920 80240A30 0040A82D */ daddu $s5, $v0, $zero -/* D9B924 80240A34 AFA00010 */ sw $zero, 0x10($sp) -/* D9B928 80240A38 8E2300D0 */ lw $v1, 0xd0($s1) -/* D9B92C 80240A3C 8C630030 */ lw $v1, 0x30($v1) -/* D9B930 80240A40 AFA30014 */ sw $v1, 0x14($sp) -/* D9B934 80240A44 8E2300D0 */ lw $v1, 0xd0($s1) -/* D9B938 80240A48 8C63001C */ lw $v1, 0x1c($v1) -/* D9B93C 80240A4C AFA30018 */ sw $v1, 0x18($sp) -/* D9B940 80240A50 8E2300D0 */ lw $v1, 0xd0($s1) -/* D9B944 80240A54 8C630024 */ lw $v1, 0x24($v1) -/* D9B948 80240A58 AFA3001C */ sw $v1, 0x1c($sp) -/* D9B94C 80240A5C 8E2300D0 */ lw $v1, 0xd0($s1) -/* D9B950 80240A60 8C630028 */ lw $v1, 0x28($v1) -/* D9B954 80240A64 27B30010 */ addiu $s3, $sp, 0x10 -/* D9B958 80240A68 AFA30020 */ sw $v1, 0x20($sp) -/* D9B95C 80240A6C 8E2300D0 */ lw $v1, 0xd0($s1) -/* D9B960 80240A70 3C0142C8 */ lui $at, 0x42c8 -/* D9B964 80240A74 44810000 */ mtc1 $at, $f0 -/* D9B968 80240A78 8C63002C */ lw $v1, 0x2c($v1) -/* D9B96C 80240A7C 0040902D */ daddu $s2, $v0, $zero -/* D9B970 80240A80 E7A00028 */ swc1 $f0, 0x28($sp) -/* D9B974 80240A84 A7A0002C */ sh $zero, 0x2c($sp) -/* D9B978 80240A88 16000005 */ bnez $s0, .L80240AA0 -/* D9B97C 80240A8C AFA30024 */ sw $v1, 0x24($sp) -/* D9B980 80240A90 8E2200B0 */ lw $v0, 0xb0($s1) -/* D9B984 80240A94 30420004 */ andi $v0, $v0, 4 -/* D9B988 80240A98 1040001F */ beqz $v0, .L80240B18 -/* D9B98C 80240A9C 00000000 */ nop -.L80240AA0: -/* D9B990 80240AA0 2404F7FF */ addiu $a0, $zero, -0x801 -/* D9B994 80240AA4 AE800070 */ sw $zero, 0x70($s4) -/* D9B998 80240AA8 A6A0008E */ sh $zero, 0x8e($s5) -/* D9B99C 80240AAC 8E2200CC */ lw $v0, 0xcc($s1) -/* D9B9A0 80240AB0 8EA30000 */ lw $v1, ($s5) -/* D9B9A4 80240AB4 8C420000 */ lw $v0, ($v0) -/* D9B9A8 80240AB8 00641824 */ and $v1, $v1, $a0 -/* D9B9AC 80240ABC AEA30000 */ sw $v1, ($s5) -/* D9B9B0 80240AC0 AEA20028 */ sw $v0, 0x28($s5) -/* D9B9B4 80240AC4 8E2200D0 */ lw $v0, 0xd0($s1) -/* D9B9B8 80240AC8 8C420034 */ lw $v0, 0x34($v0) -/* D9B9BC 80240ACC 54400005 */ bnel $v0, $zero, .L80240AE4 -/* D9B9C0 80240AD0 2402FDFF */ addiu $v0, $zero, -0x201 -/* D9B9C4 80240AD4 34620200 */ ori $v0, $v1, 0x200 -/* D9B9C8 80240AD8 2403FFF7 */ addiu $v1, $zero, -9 -/* D9B9CC 80240ADC 080902BB */ j .L80240AEC -/* D9B9D0 80240AE0 00431024 */ and $v0, $v0, $v1 -.L80240AE4: -/* D9B9D4 80240AE4 00621024 */ and $v0, $v1, $v0 -/* D9B9D8 80240AE8 34420008 */ ori $v0, $v0, 8 -.L80240AEC: -/* D9B9DC 80240AEC AEA20000 */ sw $v0, ($s5) -/* D9B9E0 80240AF0 8E2200B0 */ lw $v0, 0xb0($s1) -/* D9B9E4 80240AF4 30420004 */ andi $v0, $v0, 4 -/* D9B9E8 80240AF8 10400007 */ beqz $v0, .L80240B18 -/* D9B9EC 80240AFC 24020063 */ addiu $v0, $zero, 0x63 -/* D9B9F0 80240B00 AE820070 */ sw $v0, 0x70($s4) -/* D9B9F4 80240B04 AE800074 */ sw $zero, 0x74($s4) -/* D9B9F8 80240B08 8E2200B0 */ lw $v0, 0xb0($s1) -/* D9B9FC 80240B0C 2403FFFB */ addiu $v1, $zero, -5 -/* D9BA00 80240B10 00431024 */ and $v0, $v0, $v1 -/* D9BA04 80240B14 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240B18: -/* D9BA08 80240B18 8E830070 */ lw $v1, 0x70($s4) -/* D9BA0C 80240B1C 2C620064 */ sltiu $v0, $v1, 0x64 -/* D9BA10 80240B20 10400036 */ beqz $v0, .L80240BFC -/* D9BA14 80240B24 00031080 */ sll $v0, $v1, 2 -/* D9BA18 80240B28 3C018024 */ lui $at, 0x8024 -/* D9BA1C 80240B2C 00220821 */ addu $at, $at, $v0 -/* D9BA20 80240B30 8C222448 */ lw $v0, 0x2448($at) -/* D9BA24 80240B34 00400008 */ jr $v0 -/* D9BA28 80240B38 00000000 */ nop -/* D9BA2C 80240B3C 0280202D */ daddu $a0, $s4, $zero -/* D9BA30 80240B40 0240282D */ daddu $a1, $s2, $zero -/* D9BA34 80240B44 0C012568 */ jal func_800495A0 -/* D9BA38 80240B48 0260302D */ daddu $a2, $s3, $zero -/* D9BA3C 80240B4C 0280202D */ daddu $a0, $s4, $zero -/* D9BA40 80240B50 0240282D */ daddu $a1, $s2, $zero -/* D9BA44 80240B54 0C0125AE */ jal func_800496B8 -/* D9BA48 80240B58 0260302D */ daddu $a2, $s3, $zero -/* D9BA4C 80240B5C 080902FF */ j .L80240BFC -/* D9BA50 80240B60 00000000 */ nop -/* D9BA54 80240B64 0280202D */ daddu $a0, $s4, $zero -/* D9BA58 80240B68 0240282D */ daddu $a1, $s2, $zero -/* D9BA5C 80240B6C 0C0126D1 */ jal func_80049B44 -/* D9BA60 80240B70 0260302D */ daddu $a2, $s3, $zero -/* D9BA64 80240B74 0280202D */ daddu $a0, $s4, $zero -/* D9BA68 80240B78 0240282D */ daddu $a1, $s2, $zero -/* D9BA6C 80240B7C 0C012701 */ jal func_80049C04 -/* D9BA70 80240B80 0260302D */ daddu $a2, $s3, $zero -/* D9BA74 80240B84 080902FF */ j .L80240BFC -/* D9BA78 80240B88 00000000 */ nop -/* D9BA7C 80240B8C 0280202D */ daddu $a0, $s4, $zero -/* D9BA80 80240B90 0240282D */ daddu $a1, $s2, $zero -/* D9BA84 80240B94 0C01278F */ jal func_80049E3C -/* D9BA88 80240B98 0260302D */ daddu $a2, $s3, $zero -/* D9BA8C 80240B9C 0280202D */ daddu $a0, $s4, $zero -/* D9BA90 80240BA0 0240282D */ daddu $a1, $s2, $zero -/* D9BA94 80240BA4 0C0127B3 */ jal func_80049ECC -/* D9BA98 80240BA8 0260302D */ daddu $a2, $s3, $zero -/* D9BA9C 80240BAC 080902FF */ j .L80240BFC -/* D9BAA0 80240BB0 00000000 */ nop -/* D9BAA4 80240BB4 0280202D */ daddu $a0, $s4, $zero -/* D9BAA8 80240BB8 0240282D */ daddu $a1, $s2, $zero -/* D9BAAC 80240BBC 0C090098 */ jal func_80240260 -/* D9BAB0 80240BC0 0260302D */ daddu $a2, $s3, $zero -/* D9BAB4 80240BC4 0280202D */ daddu $a0, $s4, $zero -/* D9BAB8 80240BC8 0240282D */ daddu $a1, $s2, $zero -/* D9BABC 80240BCC 0C090211 */ jal func_80240844 -/* D9BAC0 80240BD0 0260302D */ daddu $a2, $s3, $zero -/* D9BAC4 80240BD4 080902FF */ j .L80240BFC -/* D9BAC8 80240BD8 00000000 */ nop -/* D9BACC 80240BDC 0280202D */ daddu $a0, $s4, $zero -/* D9BAD0 80240BE0 0240282D */ daddu $a1, $s2, $zero -/* D9BAD4 80240BE4 0C09026A */ jal func_802409A8 -/* D9BAD8 80240BE8 0260302D */ daddu $a2, $s3, $zero -/* D9BADC 80240BEC 080902FF */ j .L80240BFC -/* D9BAE0 80240BF0 00000000 */ nop -/* D9BAE4 80240BF4 0C0129CF */ jal func_8004A73C -/* D9BAE8 80240BF8 0280202D */ daddu $a0, $s4, $zero -.L80240BFC: -/* D9BAEC 80240BFC 8FBF0048 */ lw $ra, 0x48($sp) -/* D9BAF0 80240C00 8FB50044 */ lw $s5, 0x44($sp) -/* D9BAF4 80240C04 8FB40040 */ lw $s4, 0x40($sp) -/* D9BAF8 80240C08 8FB3003C */ lw $s3, 0x3c($sp) -/* D9BAFC 80240C0C 8FB20038 */ lw $s2, 0x38($sp) -/* D9BB00 80240C10 8FB10034 */ lw $s1, 0x34($sp) -/* D9BB04 80240C14 8FB00030 */ lw $s0, 0x30($sp) -/* D9BB08 80240C18 0000102D */ daddu $v0, $zero, $zero -/* D9BB0C 80240C1C 03E00008 */ jr $ra -/* D9BB10 80240C20 27BD0050 */ addiu $sp, $sp, 0x50 -/* D9BB14 80240C24 00000000 */ nop -/* D9BB18 80240C28 00000000 */ nop -/* D9BB1C 80240C2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_8024001C_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_8024001C_D9D4D0.s deleted file mode 100644 index 0b30e39460..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_8024001C_D9D4D0.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_D9D4EC -/* D9D4EC 8024001C 3C03800B */ lui $v1, %hi(gCameras) -/* D9D4F0 80240020 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* D9D4F4 80240024 94620002 */ lhu $v0, 2($v1) -/* D9D4F8 80240028 34420001 */ ori $v0, $v0, 1 -/* D9D4FC 8024002C A4620002 */ sh $v0, 2($v1) -/* D9D500 80240030 03E00008 */ jr $ra -/* D9D504 80240034 24020002 */ addiu $v0, $zero, 2 -/* D9D508 80240038 00000000 */ nop -/* D9D50C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_80240040_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_80240040_D9D4D0.s deleted file mode 100644 index 51070da404..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_80240040_D9D4D0.s +++ /dev/null @@ -1,170 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_D9D510 -/* D9D510 80240040 27BDFF30 */ addiu $sp, $sp, -0xd0 -/* D9D514 80240044 AFB600B0 */ sw $s6, 0xb0($sp) -/* D9D518 80240048 AFBF00B4 */ sw $ra, 0xb4($sp) -/* D9D51C 8024004C AFB500AC */ sw $s5, 0xac($sp) -/* D9D520 80240050 AFB400A8 */ sw $s4, 0xa8($sp) -/* D9D524 80240054 AFB300A4 */ sw $s3, 0xa4($sp) -/* D9D528 80240058 AFB200A0 */ sw $s2, 0xa0($sp) -/* D9D52C 8024005C AFB1009C */ sw $s1, 0x9c($sp) -/* D9D530 80240060 AFB00098 */ sw $s0, 0x98($sp) -/* D9D534 80240064 F7B800C8 */ sdc1 $f24, 0xc8($sp) -/* D9D538 80240068 F7B600C0 */ sdc1 $f22, 0xc0($sp) -/* D9D53C 8024006C F7B400B8 */ sdc1 $f20, 0xb8($sp) -/* D9D540 80240070 10A0001E */ beqz $a1, .L802400EC -/* D9D544 80240074 0080B02D */ daddu $s6, $a0, $zero -/* D9D548 80240078 0C00AB39 */ jal heap_malloc -/* D9D54C 8024007C 24040030 */ addiu $a0, $zero, 0x30 -/* D9D550 80240080 0040982D */ daddu $s3, $v0, $zero -/* D9D554 80240084 0000A02D */ daddu $s4, $zero, $zero -/* D9D558 80240088 26700008 */ addiu $s0, $s3, 8 -/* D9D55C 8024008C 3C014060 */ lui $at, 0x4060 -/* D9D560 80240090 4481A000 */ mtc1 $at, $f20 -/* D9D564 80240094 3C128024 */ lui $s2, 0x8024 -/* D9D568 80240098 265234F8 */ addiu $s2, $s2, 0x34f8 -/* D9D56C 8024009C AED30070 */ sw $s3, 0x70($s6) -.L802400A0: -/* D9D570 802400A0 8E440000 */ lw $a0, ($s2) -/* D9D574 802400A4 26520004 */ addiu $s2, $s2, 4 -/* D9D578 802400A8 0C046C04 */ jal get_model_list_index_from_tree_index -/* D9D57C 802400AC AE04000C */ sw $a0, 0xc($s0) -/* D9D580 802400B0 0C046B4C */ jal get_model_from_list_index -/* D9D584 802400B4 0040202D */ daddu $a0, $v0, $zero -/* D9D588 802400B8 0040882D */ daddu $s1, $v0, $zero -/* D9D58C 802400BC 26940001 */ addiu $s4, $s4, 1 -/* D9D590 802400C0 C6200098 */ lwc1 $f0, 0x98($s1) -/* D9D594 802400C4 2E820002 */ sltiu $v0, $s4, 2 -/* D9D598 802400C8 E6600000 */ swc1 $f0, ($s3) -/* D9D59C 802400CC C62000A0 */ lwc1 $f0, 0xa0($s1) -/* D9D5A0 802400D0 26730018 */ addiu $s3, $s3, 0x18 -/* D9D5A4 802400D4 E6140004 */ swc1 $f20, 4($s0) -/* D9D5A8 802400D8 AE000008 */ sw $zero, 8($s0) -/* D9D5AC 802400DC AE000000 */ sw $zero, ($s0) -/* D9D5B0 802400E0 E600FFFC */ swc1 $f0, -4($s0) -/* D9D5B4 802400E4 1440FFEE */ bnez $v0, .L802400A0 -/* D9D5B8 802400E8 26100018 */ addiu $s0, $s0, 0x18 -.L802400EC: -/* D9D5BC 802400EC 0000A02D */ daddu $s4, $zero, $zero -/* D9D5C0 802400F0 27B50058 */ addiu $s5, $sp, 0x58 -/* D9D5C4 802400F4 8ED30070 */ lw $s3, 0x70($s6) -/* D9D5C8 802400F8 4480B000 */ mtc1 $zero, $f22 -/* D9D5CC 802400FC 26720004 */ addiu $s2, $s3, 4 -.L80240100: -/* D9D5D0 80240100 C64C000C */ lwc1 $f12, 0xc($s2) -/* D9D5D4 80240104 C6400008 */ lwc1 $f0, 8($s2) -/* D9D5D8 80240108 46006300 */ add.s $f12, $f12, $f0 -/* D9D5DC 8024010C 0C00A6C9 */ jal clamp_angle -/* D9D5E0 80240110 E64C000C */ swc1 $f12, 0xc($s2) -/* D9D5E4 80240114 3C014048 */ lui $at, 0x4048 -/* D9D5E8 80240118 3421F5C3 */ ori $at, $at, 0xf5c3 -/* D9D5EC 8024011C 44816000 */ mtc1 $at, $f12 -/* D9D5F0 80240120 00000000 */ nop -/* D9D5F4 80240124 460C0302 */ mul.s $f12, $f0, $f12 -/* D9D5F8 80240128 00000000 */ nop -/* D9D5FC 8024012C 3C014334 */ lui $at, 0x4334 -/* D9D600 80240130 44811000 */ mtc1 $at, $f2 -/* D9D604 80240134 E640000C */ swc1 $f0, 0xc($s2) -/* D9D608 80240138 0C00A85B */ jal sin_rad -/* D9D60C 8024013C 46026303 */ div.s $f12, $f12, $f2 -/* D9D610 80240140 3C0141A0 */ lui $at, 0x41a0 -/* D9D614 80240144 44811000 */ mtc1 $at, $f2 -/* D9D618 80240148 00000000 */ nop -/* D9D61C 8024014C 46020502 */ mul.s $f20, $f0, $f2 -/* D9D620 80240150 00000000 */ nop -/* D9D624 80240154 4614A082 */ mul.s $f2, $f20, $f20 -/* D9D628 80240158 00000000 */ nop -/* D9D62C 8024015C 3C0142B4 */ lui $at, 0x42b4 -/* D9D630 80240160 44810000 */ mtc1 $at, $f0 -/* D9D634 80240164 1680001C */ bnez $s4, .L802401D8 -/* D9D638 80240168 46001603 */ div.s $f24, $f2, $f0 -/* D9D63C 8024016C C6400004 */ lwc1 $f0, 4($s2) -/* D9D640 80240170 4600B03E */ c.le.s $f22, $f0 -/* D9D644 80240174 00000000 */ nop -/* D9D648 80240178 45000005 */ bc1f .L80240190 -/* D9D64C 8024017C 00000000 */ nop -/* D9D650 80240180 4616A03C */ c.lt.s $f20, $f22 -/* D9D654 80240184 00000000 */ nop -/* D9D658 80240188 4501000A */ bc1t .L802401B4 -/* D9D65C 8024018C 240401D6 */ addiu $a0, $zero, 0x1d6 -.L80240190: -/* D9D660 80240190 4616003C */ c.lt.s $f0, $f22 -/* D9D664 80240194 00000000 */ nop -/* D9D668 80240198 4502000F */ bc1fl .L802401D8 -/* D9D66C 8024019C E6540004 */ swc1 $f20, 4($s2) -/* D9D670 802401A0 4614B03E */ c.le.s $f22, $f20 -/* D9D674 802401A4 00000000 */ nop -/* D9D678 802401A8 4502000B */ bc1fl .L802401D8 -/* D9D67C 802401AC E6540004 */ swc1 $f20, 4($s2) -/* D9D680 802401B0 240401D6 */ addiu $a0, $zero, 0x1d6 -.L802401B4: -/* D9D684 802401B4 0000282D */ daddu $a1, $zero, $zero -/* D9D688 802401B8 3C06C430 */ lui $a2, 0xc430 -/* D9D68C 802401BC 34C68000 */ ori $a2, $a2, 0x8000 -/* D9D690 802401C0 3C0142CC */ lui $at, 0x42cc -/* D9D694 802401C4 44810000 */ mtc1 $at, $f0 -/* D9D698 802401C8 0000382D */ daddu $a3, $zero, $zero -/* D9D69C 802401CC 0C052757 */ jal play_sound_at_position -/* D9D6A0 802401D0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D9D6A4 802401D4 E6540004 */ swc1 $f20, 4($s2) -.L802401D8: -/* D9D6A8 802401D8 8E440010 */ lw $a0, 0x10($s2) -/* D9D6AC 802401DC 0C046C04 */ jal get_model_list_index_from_tree_index -/* D9D6B0 802401E0 26940001 */ addiu $s4, $s4, 1 -/* D9D6B4 802401E4 0C046B4C */ jal get_model_from_list_index -/* D9D6B8 802401E8 0040202D */ daddu $a0, $v0, $zero -/* D9D6BC 802401EC 0040882D */ daddu $s1, $v0, $zero -/* D9D6C0 802401F0 96220000 */ lhu $v0, ($s1) -/* D9D6C4 802401F4 4406B000 */ mfc1 $a2, $f22 -/* D9D6C8 802401F8 34421400 */ ori $v0, $v0, 0x1400 -/* D9D6CC 802401FC A6220000 */ sh $v0, ($s1) -/* D9D6D0 80240200 C6600000 */ lwc1 $f0, ($s3) -/* D9D6D4 80240204 C6420000 */ lwc1 $f2, ($s2) -/* D9D6D8 80240208 46000007 */ neg.s $f0, $f0 -/* D9D6DC 8024020C 46001087 */ neg.s $f2, $f2 -/* D9D6E0 80240210 44050000 */ mfc1 $a1, $f0 -/* D9D6E4 80240214 44071000 */ mfc1 $a3, $f2 -/* D9D6E8 80240218 0C019E40 */ jal guTranslateF -/* D9D6EC 8024021C 27A40018 */ addiu $a0, $sp, 0x18 -/* D9D6F0 80240220 4405A000 */ mfc1 $a1, $f20 -/* D9D6F4 80240224 4406B000 */ mfc1 $a2, $f22 -/* D9D6F8 80240228 4407B000 */ mfc1 $a3, $f22 -/* D9D6FC 8024022C 3C013F80 */ lui $at, 0x3f80 -/* D9D700 80240230 44810000 */ mtc1 $at, $f0 -/* D9D704 80240234 02A0202D */ daddu $a0, $s5, $zero -/* D9D708 80240238 0C019EC8 */ jal guRotateF -/* D9D70C 8024023C E7A00010 */ swc1 $f0, 0x10($sp) -/* D9D710 80240240 27A40018 */ addiu $a0, $sp, 0x18 -/* D9D714 80240244 02A0282D */ daddu $a1, $s5, $zero -/* D9D718 80240248 26300058 */ addiu $s0, $s1, 0x58 -/* D9D71C 8024024C 0C019D80 */ jal guMtxCatF -/* D9D720 80240250 0200302D */ daddu $a2, $s0, $zero -/* D9D724 80240254 27A40018 */ addiu $a0, $sp, 0x18 -/* D9D728 80240258 8E470000 */ lw $a3, ($s2) -/* D9D72C 8024025C 26520018 */ addiu $s2, $s2, 0x18 -/* D9D730 80240260 8E650000 */ lw $a1, ($s3) -/* D9D734 80240264 4406C000 */ mfc1 $a2, $f24 -/* D9D738 80240268 0C019E40 */ jal guTranslateF -/* D9D73C 8024026C 26730018 */ addiu $s3, $s3, 0x18 -/* D9D740 80240270 0200202D */ daddu $a0, $s0, $zero -/* D9D744 80240274 27A50018 */ addiu $a1, $sp, 0x18 -/* D9D748 80240278 0C019D80 */ jal guMtxCatF -/* D9D74C 8024027C 0080302D */ daddu $a2, $a0, $zero -/* D9D750 80240280 2E820002 */ sltiu $v0, $s4, 2 -/* D9D754 80240284 1440FF9E */ bnez $v0, .L80240100 -/* D9D758 80240288 0000102D */ daddu $v0, $zero, $zero -/* D9D75C 8024028C 8FBF00B4 */ lw $ra, 0xb4($sp) -/* D9D760 80240290 8FB600B0 */ lw $s6, 0xb0($sp) -/* D9D764 80240294 8FB500AC */ lw $s5, 0xac($sp) -/* D9D768 80240298 8FB400A8 */ lw $s4, 0xa8($sp) -/* D9D76C 8024029C 8FB300A4 */ lw $s3, 0xa4($sp) -/* D9D770 802402A0 8FB200A0 */ lw $s2, 0xa0($sp) -/* D9D774 802402A4 8FB1009C */ lw $s1, 0x9c($sp) -/* D9D778 802402A8 8FB00098 */ lw $s0, 0x98($sp) -/* D9D77C 802402AC D7B800C8 */ ldc1 $f24, 0xc8($sp) -/* D9D780 802402B0 D7B600C0 */ ldc1 $f22, 0xc0($sp) -/* D9D784 802402B4 D7B400B8 */ ldc1 $f20, 0xb8($sp) -/* D9D788 802402B8 03E00008 */ jr $ra -/* D9D78C 802402BC 27BD00D0 */ addiu $sp, $sp, 0xd0 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_802402C0_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_802402C0_D9D4D0.s deleted file mode 100644 index e24a724b87..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_802402C0_D9D4D0.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402C0_D9D790 -/* D9D790 802402C0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D9D794 802402C4 AFB5002C */ sw $s5, 0x2c($sp) -/* D9D798 802402C8 00A0A82D */ daddu $s5, $a1, $zero -/* D9D79C 802402CC AFB40028 */ sw $s4, 0x28($sp) -/* D9D7A0 802402D0 0080A02D */ daddu $s4, $a0, $zero -/* D9D7A4 802402D4 AFBF0034 */ sw $ra, 0x34($sp) -/* D9D7A8 802402D8 AFB60030 */ sw $s6, 0x30($sp) -/* D9D7AC 802402DC AFB30024 */ sw $s3, 0x24($sp) -/* D9D7B0 802402E0 AFB20020 */ sw $s2, 0x20($sp) -/* D9D7B4 802402E4 AFB1001C */ sw $s1, 0x1c($sp) -/* D9D7B8 802402E8 AFB00018 */ sw $s0, 0x18($sp) -/* D9D7BC 802402EC F7B80048 */ sdc1 $f24, 0x48($sp) -/* D9D7C0 802402F0 F7B60040 */ sdc1 $f22, 0x40($sp) -/* D9D7C4 802402F4 F7B40038 */ sdc1 $f20, 0x38($sp) -.L802402F8: -/* D9D7C8 802402F8 240200DE */ addiu $v0, $zero, 0xde -/* D9D7CC 802402FC 8E920000 */ lw $s2, ($s4) -/* D9D7D0 80240300 8E930004 */ lw $s3, 4($s4) -/* D9D7D4 80240304 0012B602 */ srl $s6, $s2, 0x18 -/* D9D7D8 80240308 32D000FF */ andi $s0, $s6, 0xff -/* D9D7DC 8024030C 16020005 */ bne $s0, $v0, .L80240324 -/* D9D7E0 80240310 24020001 */ addiu $v0, $zero, 1 -/* D9D7E4 80240314 0260202D */ daddu $a0, $s3, $zero -/* D9D7E8 80240318 0C0900B0 */ jal func_802402C0 -/* D9D7EC 8024031C 02A0282D */ daddu $a1, $s5, $zero -/* D9D7F0 80240320 24020001 */ addiu $v0, $zero, 1 -.L80240324: -/* D9D7F4 80240324 16020036 */ bne $s0, $v0, .L80240400 -/* D9D7F8 80240328 240200DF */ addiu $v0, $zero, 0xdf -/* D9D7FC 8024032C 0000882D */ daddu $s1, $zero, $zero -/* D9D800 80240330 2402FFFF */ addiu $v0, $zero, -1 -/* D9D804 80240334 AEA20000 */ sw $v0, ($s5) -/* D9D808 80240338 00121302 */ srl $v0, $s2, 0xc -/* D9D80C 8024033C 4480A000 */ mtc1 $zero, $f20 -/* D9D810 80240340 305200FF */ andi $s2, $v0, 0xff -/* D9D814 80240344 4600A606 */ mov.s $f24, $f20 -/* D9D818 80240348 1240002C */ beqz $s2, .L802403FC -/* D9D81C 8024034C 4600A586 */ mov.s $f22, $f20 -/* D9D820 80240350 0260802D */ daddu $s0, $s3, $zero -.L80240354: -/* D9D824 80240354 86020000 */ lh $v0, ($s0) -/* D9D828 80240358 44822000 */ mtc1 $v0, $f4 -/* D9D82C 8024035C 00000000 */ nop -/* D9D830 80240360 46802120 */ cvt.s.w $f4, $f4 -/* D9D834 80240364 46162101 */ sub.s $f4, $f4, $f22 -/* D9D838 80240368 46042102 */ mul.s $f4, $f4, $f4 -/* D9D83C 8024036C 00000000 */ nop -/* D9D840 80240370 86020002 */ lh $v0, 2($s0) -/* D9D844 80240374 44821000 */ mtc1 $v0, $f2 -/* D9D848 80240378 00000000 */ nop -/* D9D84C 8024037C 468010A0 */ cvt.s.w $f2, $f2 -/* D9D850 80240380 46181081 */ sub.s $f2, $f2, $f24 -/* D9D854 80240384 46021082 */ mul.s $f2, $f2, $f2 -/* D9D858 80240388 00000000 */ nop -/* D9D85C 8024038C 86020004 */ lh $v0, 4($s0) -/* D9D860 80240390 44820000 */ mtc1 $v0, $f0 -/* D9D864 80240394 00000000 */ nop -/* D9D868 80240398 46800020 */ cvt.s.w $f0, $f0 -/* D9D86C 8024039C 46140001 */ sub.s $f0, $f0, $f20 -/* D9D870 802403A0 46000002 */ mul.s $f0, $f0, $f0 -/* D9D874 802403A4 00000000 */ nop -/* D9D878 802403A8 46022100 */ add.s $f4, $f4, $f2 -/* D9D87C 802403AC 46002300 */ add.s $f12, $f4, $f0 -/* D9D880 802403B0 46006084 */ sqrt.s $f2, $f12 -/* D9D884 802403B4 46021032 */ c.eq.s $f2, $f2 -/* D9D888 802403B8 00000000 */ nop -/* D9D88C 802403BC 45010004 */ bc1t .L802403D0 -/* D9D890 802403C0 00000000 */ nop -/* D9D894 802403C4 0C0187BC */ jal sqrtf -/* D9D898 802403C8 00000000 */ nop -/* D9D89C 802403CC 46000086 */ mov.s $f2, $f0 -.L802403D0: -/* D9D8A0 802403D0 C6A00000 */ lwc1 $f0, ($s5) -/* D9D8A4 802403D4 46800020 */ cvt.s.w $f0, $f0 -/* D9D8A8 802403D8 4602003C */ c.lt.s $f0, $f2 -/* D9D8AC 802403DC 00000000 */ nop -/* D9D8B0 802403E0 45000003 */ bc1f .L802403F0 -/* D9D8B4 802403E4 26310001 */ addiu $s1, $s1, 1 -/* D9D8B8 802403E8 4600118D */ trunc.w.s $f6, $f2 -/* D9D8BC 802403EC E6A60000 */ swc1 $f6, ($s5) -.L802403F0: -/* D9D8C0 802403F0 0232102A */ slt $v0, $s1, $s2 -/* D9D8C4 802403F4 1440FFD7 */ bnez $v0, .L80240354 -/* D9D8C8 802403F8 26100010 */ addiu $s0, $s0, 0x10 -.L802403FC: -/* D9D8CC 802403FC 240200DF */ addiu $v0, $zero, 0xdf -.L80240400: -/* D9D8D0 80240400 16C2FFBD */ bne $s6, $v0, .L802402F8 -/* D9D8D4 80240404 26940008 */ addiu $s4, $s4, 8 -/* D9D8D8 80240408 8FBF0034 */ lw $ra, 0x34($sp) -/* D9D8DC 8024040C 8FB60030 */ lw $s6, 0x30($sp) -/* D9D8E0 80240410 8FB5002C */ lw $s5, 0x2c($sp) -/* D9D8E4 80240414 8FB40028 */ lw $s4, 0x28($sp) -/* D9D8E8 80240418 8FB30024 */ lw $s3, 0x24($sp) -/* D9D8EC 8024041C 8FB20020 */ lw $s2, 0x20($sp) -/* D9D8F0 80240420 8FB1001C */ lw $s1, 0x1c($sp) -/* D9D8F4 80240424 8FB00018 */ lw $s0, 0x18($sp) -/* D9D8F8 80240428 D7B80048 */ ldc1 $f24, 0x48($sp) -/* D9D8FC 8024042C D7B60040 */ ldc1 $f22, 0x40($sp) -/* D9D900 80240430 D7B40038 */ ldc1 $f20, 0x38($sp) -/* D9D904 80240434 03E00008 */ jr $ra -/* D9D908 80240438 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_8024043C_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_8024043C_D9D4D0.s deleted file mode 100644 index 52ad8db29b..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_8024043C_D9D4D0.s +++ /dev/null @@ -1,349 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024043C_D9D90C -/* D9D90C 8024043C 27BDFEB0 */ addiu $sp, $sp, -0x150 -/* D9D910 80240440 AFB70134 */ sw $s7, 0x134($sp) -/* D9D914 80240444 AFBF013C */ sw $ra, 0x13c($sp) -/* D9D918 80240448 AFBE0138 */ sw $fp, 0x138($sp) -/* D9D91C 8024044C AFB60130 */ sw $s6, 0x130($sp) -/* D9D920 80240450 AFB5012C */ sw $s5, 0x12c($sp) -/* D9D924 80240454 AFB40128 */ sw $s4, 0x128($sp) -/* D9D928 80240458 AFB30124 */ sw $s3, 0x124($sp) -/* D9D92C 8024045C AFB20120 */ sw $s2, 0x120($sp) -/* D9D930 80240460 AFB1011C */ sw $s1, 0x11c($sp) -/* D9D934 80240464 AFB00118 */ sw $s0, 0x118($sp) -/* D9D938 80240468 F7B60148 */ sdc1 $f22, 0x148($sp) -/* D9D93C 8024046C F7B40140 */ sdc1 $f20, 0x140($sp) -/* D9D940 80240470 10A0007E */ beqz $a1, .L8024066C -/* D9D944 80240474 0080B82D */ daddu $s7, $a0, $zero -/* D9D948 80240478 0C00AB39 */ jal heap_malloc -/* D9D94C 8024047C 24040690 */ addiu $a0, $zero, 0x690 -/* D9D950 80240480 0000982D */ daddu $s3, $zero, $zero -/* D9D954 80240484 AEE20070 */ sw $v0, 0x70($s7) -/* D9D958 80240488 0040882D */ daddu $s1, $v0, $zero -/* D9D95C 8024048C 3C148024 */ lui $s4, 0x8024 -/* D9D960 80240490 26943580 */ addiu $s4, $s4, 0x3580 -/* D9D964 80240494 3C014120 */ lui $at, 0x4120 -/* D9D968 80240498 4481A000 */ mtc1 $at, $f20 -/* D9D96C 8024049C 26300088 */ addiu $s0, $s1, 0x88 -/* D9D970 802404A0 AEE00074 */ sw $zero, 0x74($s7) -.L802404A4: -/* D9D974 802404A4 8E820000 */ lw $v0, ($s4) -/* D9D978 802404A8 AE02FFB8 */ sw $v0, -0x48($s0) -/* D9D97C 802404AC 0040202D */ daddu $a0, $v0, $zero -/* D9D980 802404B0 00131080 */ sll $v0, $s3, 2 -/* D9D984 802404B4 3C018024 */ lui $at, 0x8024 -/* D9D988 802404B8 00220821 */ addu $at, $at, $v0 -/* D9D98C 802404BC 8C2235B0 */ lw $v0, 0x35b0($at) -/* D9D990 802404C0 0C046C04 */ jal get_model_list_index_from_tree_index -/* D9D994 802404C4 AE02FFBC */ sw $v0, -0x44($s0) -/* D9D998 802404C8 0C046B4C */ jal get_model_from_list_index -/* D9D99C 802404CC 0040202D */ daddu $a0, $v0, $zero -/* D9D9A0 802404D0 0040902D */ daddu $s2, $v0, $zero -/* D9D9A4 802404D4 AE200000 */ sw $zero, ($s1) -/* D9D9A8 802404D8 C6400098 */ lwc1 $f0, 0x98($s2) -/* D9D9AC 802404DC E600FF7C */ swc1 $f0, -0x84($s0) -/* D9D9B0 802404E0 C640009C */ lwc1 $f0, 0x9c($s2) -/* D9D9B4 802404E4 E600FF80 */ swc1 $f0, -0x80($s0) -/* D9D9B8 802404E8 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* D9D9BC 802404EC C602FF80 */ lwc1 $f2, -0x80($s0) -/* D9D9C0 802404F0 E600FF84 */ swc1 $f0, -0x7c($s0) -/* D9D9C4 802404F4 C600FF7C */ lwc1 $f0, -0x84($s0) -/* D9D9C8 802404F8 C604FF84 */ lwc1 $f4, -0x7c($s0) -/* D9D9CC 802404FC 24040014 */ addiu $a0, $zero, 0x14 -/* D9D9D0 80240500 AE00FF94 */ sw $zero, -0x6c($s0) -/* D9D9D4 80240504 AE00FF98 */ sw $zero, -0x68($s0) -/* D9D9D8 80240508 AE00FF9C */ sw $zero, -0x64($s0) -/* D9D9DC 8024050C E602FF8C */ swc1 $f2, -0x74($s0) -/* D9D9E0 80240510 E600FF88 */ swc1 $f0, -0x78($s0) -/* D9D9E4 80240514 0C00A67F */ jal rand_int -/* D9D9E8 80240518 E604FF90 */ swc1 $f4, -0x70($s0) -/* D9D9EC 8024051C 24040014 */ addiu $a0, $zero, 0x14 -/* D9D9F0 80240520 2442FFF6 */ addiu $v0, $v0, -0xa -/* D9D9F4 80240524 44820000 */ mtc1 $v0, $f0 -/* D9D9F8 80240528 00000000 */ nop -/* D9D9FC 8024052C 46800020 */ cvt.s.w $f0, $f0 -/* D9DA00 80240530 0C00A67F */ jal rand_int -/* D9DA04 80240534 E600FFA0 */ swc1 $f0, -0x60($s0) -/* D9DA08 80240538 24040014 */ addiu $a0, $zero, 0x14 -/* D9DA0C 8024053C 2442FFF6 */ addiu $v0, $v0, -0xa -/* D9DA10 80240540 44820000 */ mtc1 $v0, $f0 -/* D9DA14 80240544 00000000 */ nop -/* D9DA18 80240548 46800020 */ cvt.s.w $f0, $f0 -/* D9DA1C 8024054C 0C00A67F */ jal rand_int -/* D9DA20 80240550 E600FFA4 */ swc1 $f0, -0x5c($s0) -/* D9DA24 80240554 24040028 */ addiu $a0, $zero, 0x28 -/* D9DA28 80240558 2442FFF6 */ addiu $v0, $v0, -0xa -/* D9DA2C 8024055C 44820000 */ mtc1 $v0, $f0 -/* D9DA30 80240560 00000000 */ nop -/* D9DA34 80240564 46800020 */ cvt.s.w $f0, $f0 -/* D9DA38 80240568 0C00A67F */ jal rand_int -/* D9DA3C 8024056C E600FFA8 */ swc1 $f0, -0x58($s0) -/* D9DA40 80240570 3C0142C8 */ lui $at, 0x42c8 -/* D9DA44 80240574 44811000 */ mtc1 $at, $f2 -/* D9DA48 80240578 44820000 */ mtc1 $v0, $f0 -/* D9DA4C 8024057C 00000000 */ nop -/* D9DA50 80240580 46800020 */ cvt.s.w $f0, $f0 -/* D9DA54 80240584 46020000 */ add.s $f0, $f0, $f2 -/* D9DA58 80240588 2404001E */ addiu $a0, $zero, 0x1e -/* D9DA5C 8024058C 46140003 */ div.s $f0, $f0, $f20 -/* D9DA60 80240590 0C00A67F */ jal rand_int -/* D9DA64 80240594 E600FFAC */ swc1 $f0, -0x54($s0) -/* D9DA68 80240598 3C014270 */ lui $at, 0x4270 -/* D9DA6C 8024059C 44811000 */ mtc1 $at, $f2 -/* D9DA70 802405A0 44820000 */ mtc1 $v0, $f0 -/* D9DA74 802405A4 00000000 */ nop -/* D9DA78 802405A8 46800020 */ cvt.s.w $f0, $f0 -/* D9DA7C 802405AC 46020000 */ add.s $f0, $f0, $f2 -/* D9DA80 802405B0 24040064 */ addiu $a0, $zero, 0x64 -/* D9DA84 802405B4 46140003 */ div.s $f0, $f0, $f20 -/* D9DA88 802405B8 0C00A67F */ jal rand_int -/* D9DA8C 802405BC E600FFB0 */ swc1 $f0, -0x50($s0) -/* D9DA90 802405C0 00021FC2 */ srl $v1, $v0, 0x1f -/* D9DA94 802405C4 00431821 */ addu $v1, $v0, $v1 -/* D9DA98 802405C8 00031843 */ sra $v1, $v1, 1 -/* D9DA9C 802405CC 00031840 */ sll $v1, $v1, 1 -/* D9DAA0 802405D0 00431023 */ subu $v0, $v0, $v1 -/* D9DAA4 802405D4 3C014334 */ lui $at, 0x4334 -/* D9DAA8 802405D8 44811000 */ mtc1 $at, $f2 -/* D9DAAC 802405DC 44820000 */ mtc1 $v0, $f0 -/* D9DAB0 802405E0 00000000 */ nop -/* D9DAB4 802405E4 46800020 */ cvt.s.w $f0, $f0 -/* D9DAB8 802405E8 46020002 */ mul.s $f0, $f0, $f2 -/* D9DABC 802405EC 00000000 */ nop -/* D9DAC0 802405F0 3C0142B4 */ lui $at, 0x42b4 -/* D9DAC4 802405F4 44811000 */ mtc1 $at, $f2 -/* D9DAC8 802405F8 00000000 */ nop -/* D9DACC 802405FC 46020000 */ add.s $f0, $f0, $f2 -/* D9DAD0 80240600 E600FFB4 */ swc1 $f0, -0x4c($s0) -/* D9DAD4 80240604 8E420008 */ lw $v0, 8($s2) -/* D9DAD8 80240608 8C420004 */ lw $v0, 4($v0) -/* D9DADC 8024060C 8C440000 */ lw $a0, ($v0) -/* D9DAE0 80240610 0C0900B0 */ jal func_802402C0 -/* D9DAE4 80240614 0200282D */ daddu $a1, $s0, $zero -/* D9DAE8 80240618 0000302D */ daddu $a2, $zero, $zero -/* D9DAEC 8024061C 0000282D */ daddu $a1, $zero, $zero -.L80240620: -/* D9DAF0 80240620 00062100 */ sll $a0, $a2, 4 -.L80240624: -/* D9DAF4 80240624 02241821 */ addu $v1, $s1, $a0 -/* D9DAF8 80240628 02441021 */ addu $v0, $s2, $a0 -/* D9DAFC 8024062C 24840004 */ addiu $a0, $a0, 4 -/* D9DB00 80240630 24A50001 */ addiu $a1, $a1, 1 -/* D9DB04 80240634 C4400058 */ lwc1 $f0, 0x58($v0) -/* D9DB08 80240638 28A20004 */ slti $v0, $a1, 4 -/* D9DB0C 8024063C 1440FFF9 */ bnez $v0, .L80240624 -/* D9DB10 80240640 E4600048 */ swc1 $f0, 0x48($v1) -/* D9DB14 80240644 24C60001 */ addiu $a2, $a2, 1 -/* D9DB18 80240648 28C20004 */ slti $v0, $a2, 4 -/* D9DB1C 8024064C 1440FFF4 */ bnez $v0, .L80240620 -/* D9DB20 80240650 0000282D */ daddu $a1, $zero, $zero -/* D9DB24 80240654 26940004 */ addiu $s4, $s4, 4 -/* D9DB28 80240658 26730001 */ addiu $s3, $s3, 1 -/* D9DB2C 8024065C 2610008C */ addiu $s0, $s0, 0x8c -/* D9DB30 80240660 2E62000C */ sltiu $v0, $s3, 0xc -/* D9DB34 80240664 1440FF8F */ bnez $v0, .L802404A4 -/* D9DB38 80240668 2631008C */ addiu $s1, $s1, 0x8c -.L8024066C: -/* D9DB3C 8024066C 0000982D */ daddu $s3, $zero, $zero -/* D9DB40 80240670 241E0064 */ addiu $fp, $zero, 0x64 -/* D9DB44 80240674 27B50058 */ addiu $s5, $sp, 0x58 -/* D9DB48 80240678 27B40098 */ addiu $s4, $sp, 0x98 -/* D9DB4C 8024067C 27B600D8 */ addiu $s6, $sp, 0xd8 -/* D9DB50 80240680 8EF10070 */ lw $s1, 0x70($s7) -/* D9DB54 80240684 4480A000 */ mtc1 $zero, $f20 -/* D9DB58 80240688 3C013F80 */ lui $at, 0x3f80 -/* D9DB5C 8024068C 4481B000 */ mtc1 $at, $f22 -/* D9DB60 80240690 26300024 */ addiu $s0, $s1, 0x24 -.L80240694: -/* D9DB64 80240694 0C046C04 */ jal get_model_list_index_from_tree_index -/* D9DB68 80240698 8E04001C */ lw $a0, 0x1c($s0) -/* D9DB6C 8024069C 0C046B4C */ jal get_model_from_list_index -/* D9DB70 802406A0 0040202D */ daddu $a0, $v0, $zero -/* D9DB74 802406A4 8E230000 */ lw $v1, ($s1) -/* D9DB78 802406A8 107E0036 */ beq $v1, $fp, .L80240784 -/* D9DB7C 802406AC 0040902D */ daddu $s2, $v0, $zero -/* D9DB80 802406B0 28620065 */ slti $v0, $v1, 0x65 -/* D9DB84 802406B4 1040003C */ beqz $v0, .L802407A8 -/* D9DB88 802406B8 0000302D */ daddu $a2, $zero, $zero -/* D9DB8C 802406BC 1460003B */ bnez $v1, .L802407AC -/* D9DB90 802406C0 0000282D */ daddu $a1, $zero, $zero -/* D9DB94 802406C4 26240004 */ addiu $a0, $s1, 4 -/* D9DB98 802406C8 8E060014 */ lw $a2, 0x14($s0) -/* D9DB9C 802406CC 8E070018 */ lw $a3, 0x18($s0) -/* D9DBA0 802406D0 0C00A7E7 */ jal add_vec2D_polar -/* D9DBA4 802406D4 2625000C */ addiu $a1, $s1, 0xc -/* D9DBA8 802406D8 C6020010 */ lwc1 $f2, 0x10($s0) -/* D9DBAC 802406DC 3C013F4C */ lui $at, 0x3f4c -/* D9DBB0 802406E0 3421CCCD */ ori $at, $at, 0xcccd -/* D9DBB4 802406E4 44810000 */ mtc1 $at, $f0 -/* D9DBB8 802406E8 00000000 */ nop -/* D9DBBC 802406EC 46001081 */ sub.s $f2, $f2, $f0 -/* D9DBC0 802406F0 C600FFE4 */ lwc1 $f0, -0x1c($s0) -/* D9DBC4 802406F4 E6020010 */ swc1 $f2, 0x10($s0) -/* D9DBC8 802406F8 46020080 */ add.s $f2, $f0, $f2 -/* D9DBCC 802406FC C6000010 */ lwc1 $f0, 0x10($s0) -/* D9DBD0 80240700 4614003E */ c.le.s $f0, $f20 -/* D9DBD4 80240704 00000000 */ nop -/* D9DBD8 80240708 45000026 */ bc1f .L802407A4 -/* D9DBDC 8024070C E602FFE4 */ swc1 $f2, -0x1c($s0) -/* D9DBE0 80240710 C6040064 */ lwc1 $f4, 0x64($s0) -/* D9DBE4 80240714 46802120 */ cvt.s.w $f4, $f4 -/* D9DBE8 80240718 4604103C */ c.lt.s $f2, $f4 -/* D9DBEC 8024071C 00000000 */ nop -/* D9DBF0 80240720 45000020 */ bc1f .L802407A4 -/* D9DBF4 80240724 46000086 */ mov.s $f2, $f0 -/* D9DBF8 80240728 3C01BF33 */ lui $at, 0xbf33 -/* D9DBFC 8024072C 34213333 */ ori $at, $at, 0x3333 -/* D9DC00 80240730 44810000 */ mtc1 $at, $f0 -/* D9DC04 80240734 00000000 */ nop -/* D9DC08 80240738 46001082 */ mul.s $f2, $f2, $f0 -/* D9DC0C 8024073C 00000000 */ nop -/* D9DC10 80240740 E604FFE4 */ swc1 $f4, -0x1c($s0) -/* D9DC14 80240744 4616103C */ c.lt.s $f2, $f22 -/* D9DC18 80240748 00000000 */ nop -/* D9DC1C 8024074C 45000005 */ bc1f .L80240764 -/* D9DC20 80240750 E6020010 */ swc1 $f2, 0x10($s0) -/* D9DC24 80240754 AE3E0000 */ sw $fp, ($s1) -/* D9DC28 80240758 E6140004 */ swc1 $f20, 4($s0) -/* D9DC2C 8024075C E6140008 */ swc1 $f20, 8($s0) -/* D9DC30 80240760 E614000C */ swc1 $f20, 0xc($s0) -.L80240764: -/* D9DC34 80240764 32620001 */ andi $v0, $s3, 1 -/* D9DC38 80240768 1040000E */ beqz $v0, .L802407A4 -/* D9DC3C 8024076C 0000202D */ daddu $a0, $zero, $zero -/* D9DC40 80240770 0080282D */ daddu $a1, $a0, $zero -/* D9DC44 80240774 0C0B2D5B */ jal exec_ShakeCam1 -/* D9DC48 80240778 24060001 */ addiu $a2, $zero, 1 -/* D9DC4C 8024077C 080901EA */ j .L802407A8 -/* D9DC50 80240780 0000302D */ daddu $a2, $zero, $zero -.L80240784: -/* D9DC54 80240784 86040022 */ lh $a0, 0x22($s0) -/* D9DC58 80240788 0C016E89 */ jal update_collider_transform -/* D9DC5C 8024078C 00000000 */ nop -/* D9DC60 80240790 8EE20074 */ lw $v0, 0x74($s7) -/* D9DC64 80240794 24420001 */ addiu $v0, $v0, 1 -/* D9DC68 80240798 AEE20074 */ sw $v0, 0x74($s7) -/* D9DC6C 8024079C 24020065 */ addiu $v0, $zero, 0x65 -/* D9DC70 802407A0 AE220000 */ sw $v0, ($s1) -.L802407A4: -/* D9DC74 802407A4 0000302D */ daddu $a2, $zero, $zero -.L802407A8: -/* D9DC78 802407A8 0000282D */ daddu $a1, $zero, $zero -.L802407AC: -/* D9DC7C 802407AC 00062100 */ sll $a0, $a2, 4 -.L802407B0: -/* D9DC80 802407B0 02441821 */ addu $v1, $s2, $a0 -/* D9DC84 802407B4 02241021 */ addu $v0, $s1, $a0 -/* D9DC88 802407B8 24840004 */ addiu $a0, $a0, 4 -/* D9DC8C 802407BC 24A50001 */ addiu $a1, $a1, 1 -/* D9DC90 802407C0 C4400048 */ lwc1 $f0, 0x48($v0) -/* D9DC94 802407C4 28A20004 */ slti $v0, $a1, 4 -/* D9DC98 802407C8 1440FFF9 */ bnez $v0, .L802407B0 -/* D9DC9C 802407CC E4600058 */ swc1 $f0, 0x58($v1) -/* D9DCA0 802407D0 24C60001 */ addiu $a2, $a2, 1 -/* D9DCA4 802407D4 28C20004 */ slti $v0, $a2, 4 -/* D9DCA8 802407D8 1440FFF4 */ bnez $v0, .L802407AC -/* D9DCAC 802407DC 0000282D */ daddu $a1, $zero, $zero -/* D9DCB0 802407E0 96420000 */ lhu $v0, ($s2) -/* D9DCB4 802407E4 34421400 */ ori $v0, $v0, 0x1400 -/* D9DCB8 802407E8 A6420000 */ sh $v0, ($s2) -/* D9DCBC 802407EC C602FFE0 */ lwc1 $f2, -0x20($s0) -/* D9DCC0 802407F0 C600FFEC */ lwc1 $f0, -0x14($s0) -/* D9DCC4 802407F4 46001081 */ sub.s $f2, $f2, $f0 -/* D9DCC8 802407F8 C600FFF0 */ lwc1 $f0, -0x10($s0) -/* D9DCCC 802407FC 44051000 */ mfc1 $a1, $f2 -/* D9DCD0 80240800 C602FFE4 */ lwc1 $f2, -0x1c($s0) -/* D9DCD4 80240804 46001081 */ sub.s $f2, $f2, $f0 -/* D9DCD8 80240808 C600FFF4 */ lwc1 $f0, -0xc($s0) -/* D9DCDC 8024080C 44061000 */ mfc1 $a2, $f2 -/* D9DCE0 80240810 C602FFE8 */ lwc1 $f2, -0x18($s0) -/* D9DCE4 80240814 46001081 */ sub.s $f2, $f2, $f0 -/* D9DCE8 80240818 44071000 */ mfc1 $a3, $f2 -/* D9DCEC 8024081C 0C019E40 */ jal guTranslateF -/* D9DCF0 80240820 27A40018 */ addiu $a0, $sp, 0x18 -/* D9DCF4 80240824 C602FFF8 */ lwc1 $f2, -8($s0) -/* D9DCF8 80240828 C6000004 */ lwc1 $f0, 4($s0) -/* D9DCFC 8024082C C604FFFC */ lwc1 $f4, -4($s0) -/* D9DD00 80240830 46001080 */ add.s $f2, $f2, $f0 -/* D9DD04 80240834 C6000008 */ lwc1 $f0, 8($s0) -/* D9DD08 80240838 46002100 */ add.s $f4, $f4, $f0 -/* D9DD0C 8024083C C6000000 */ lwc1 $f0, ($s0) -/* D9DD10 80240840 E602FFF8 */ swc1 $f2, -8($s0) -/* D9DD14 80240844 C602000C */ lwc1 $f2, 0xc($s0) -/* D9DD18 80240848 C60CFFF8 */ lwc1 $f12, -8($s0) -/* D9DD1C 8024084C 46020000 */ add.s $f0, $f0, $f2 -/* D9DD20 80240850 E604FFFC */ swc1 $f4, -4($s0) -/* D9DD24 80240854 0C00A6C9 */ jal clamp_angle -/* D9DD28 80240858 E6000000 */ swc1 $f0, ($s0) -/* D9DD2C 8024085C C60CFFFC */ lwc1 $f12, -4($s0) -/* D9DD30 80240860 26730001 */ addiu $s3, $s3, 1 -/* D9DD34 80240864 0C00A6C9 */ jal clamp_angle -/* D9DD38 80240868 E600FFF8 */ swc1 $f0, -8($s0) -/* D9DD3C 8024086C C60C0000 */ lwc1 $f12, ($s0) -/* D9DD40 80240870 2631008C */ addiu $s1, $s1, 0x8c -/* D9DD44 80240874 0C00A6C9 */ jal clamp_angle -/* D9DD48 80240878 E600FFFC */ swc1 $f0, -4($s0) -/* D9DD4C 8024087C E6000000 */ swc1 $f0, ($s0) -/* D9DD50 80240880 E7B40010 */ swc1 $f20, 0x10($sp) -/* D9DD54 80240884 8E05FFF8 */ lw $a1, -8($s0) -/* D9DD58 80240888 4406B000 */ mfc1 $a2, $f22 -/* D9DD5C 8024088C 4407A000 */ mfc1 $a3, $f20 -/* D9DD60 80240890 0C019EC8 */ jal guRotateF -/* D9DD64 80240894 02A0202D */ daddu $a0, $s5, $zero -/* D9DD68 80240898 E7B40010 */ swc1 $f20, 0x10($sp) -/* D9DD6C 8024089C 8E05FFFC */ lw $a1, -4($s0) -/* D9DD70 802408A0 4406A000 */ mfc1 $a2, $f20 -/* D9DD74 802408A4 4407B000 */ mfc1 $a3, $f22 -/* D9DD78 802408A8 0C019EC8 */ jal guRotateF -/* D9DD7C 802408AC 0280202D */ daddu $a0, $s4, $zero -/* D9DD80 802408B0 02C0202D */ daddu $a0, $s6, $zero -/* D9DD84 802408B4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D9DD88 802408B8 8E050000 */ lw $a1, ($s0) -/* D9DD8C 802408BC 4406A000 */ mfc1 $a2, $f20 -/* D9DD90 802408C0 4407A000 */ mfc1 $a3, $f20 -/* D9DD94 802408C4 0C019EC8 */ jal guRotateF -/* D9DD98 802408C8 2610008C */ addiu $s0, $s0, 0x8c -/* D9DD9C 802408CC 02C0202D */ daddu $a0, $s6, $zero -/* D9DDA0 802408D0 02A0282D */ daddu $a1, $s5, $zero -/* D9DDA4 802408D4 0C019D80 */ jal guMtxCatF -/* D9DDA8 802408D8 02A0302D */ daddu $a2, $s5, $zero -/* D9DDAC 802408DC 02A0202D */ daddu $a0, $s5, $zero -/* D9DDB0 802408E0 0280282D */ daddu $a1, $s4, $zero -/* D9DDB4 802408E4 0C019D80 */ jal guMtxCatF -/* D9DDB8 802408E8 0280302D */ daddu $a2, $s4, $zero -/* D9DDBC 802408EC 0280202D */ daddu $a0, $s4, $zero -/* D9DDC0 802408F0 27A50018 */ addiu $a1, $sp, 0x18 -/* D9DDC4 802408F4 0C019D80 */ jal guMtxCatF -/* D9DDC8 802408F8 00A0302D */ daddu $a2, $a1, $zero -/* D9DDCC 802408FC 26440058 */ addiu $a0, $s2, 0x58 -/* D9DDD0 80240900 27A50018 */ addiu $a1, $sp, 0x18 -/* D9DDD4 80240904 0C019D80 */ jal guMtxCatF -/* D9DDD8 80240908 0080302D */ daddu $a2, $a0, $zero -/* D9DDDC 8024090C 2E62000C */ sltiu $v0, $s3, 0xc -/* D9DDE0 80240910 1440FF60 */ bnez $v0, .L80240694 -/* D9DDE4 80240914 00000000 */ nop -/* D9DDE8 80240918 8EE20074 */ lw $v0, 0x74($s7) -/* D9DDEC 8024091C 2C42000C */ sltiu $v0, $v0, 0xc -/* D9DDF0 80240920 14400005 */ bnez $v0, .L80240938 -/* D9DDF4 80240924 0000102D */ daddu $v0, $zero, $zero -/* D9DDF8 80240928 8EE40070 */ lw $a0, 0x70($s7) -/* D9DDFC 8024092C 0C00AB4B */ jal heap_free -/* D9DE00 80240930 00000000 */ nop -/* D9DE04 80240934 24020002 */ addiu $v0, $zero, 2 -.L80240938: -/* D9DE08 80240938 8FBF013C */ lw $ra, 0x13c($sp) -/* D9DE0C 8024093C 8FBE0138 */ lw $fp, 0x138($sp) -/* D9DE10 80240940 8FB70134 */ lw $s7, 0x134($sp) -/* D9DE14 80240944 8FB60130 */ lw $s6, 0x130($sp) -/* D9DE18 80240948 8FB5012C */ lw $s5, 0x12c($sp) -/* D9DE1C 8024094C 8FB40128 */ lw $s4, 0x128($sp) -/* D9DE20 80240950 8FB30124 */ lw $s3, 0x124($sp) -/* D9DE24 80240954 8FB20120 */ lw $s2, 0x120($sp) -/* D9DE28 80240958 8FB1011C */ lw $s1, 0x11c($sp) -/* D9DE2C 8024095C 8FB00118 */ lw $s0, 0x118($sp) -/* D9DE30 80240960 D7B60148 */ ldc1 $f22, 0x148($sp) -/* D9DE34 80240964 D7B40140 */ ldc1 $f20, 0x140($sp) -/* D9DE38 80240968 03E00008 */ jr $ra -/* D9DE3C 8024096C 27BD0150 */ addiu $sp, $sp, 0x150 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_80240970_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_80240970_D9D4D0.s deleted file mode 100644 index 0e6bb69349..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_80240970_D9D4D0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240970_D9DE40 -/* D9DE40 80240970 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D9DE44 80240974 AFB10014 */ sw $s1, 0x14($sp) -/* D9DE48 80240978 0080882D */ daddu $s1, $a0, $zero -/* D9DE4C 8024097C AFBF0018 */ sw $ra, 0x18($sp) -/* D9DE50 80240980 AFB00010 */ sw $s0, 0x10($sp) -/* D9DE54 80240984 8E300148 */ lw $s0, 0x148($s1) -/* D9DE58 80240988 0C00EABB */ jal get_npc_unsafe -/* D9DE5C 8024098C 86040008 */ lh $a0, 8($s0) -/* D9DE60 80240990 C4400018 */ lwc1 $f0, 0x18($v0) -/* D9DE64 80240994 3C018024 */ lui $at, 0x8024 -/* D9DE68 80240998 D4227870 */ ldc1 $f2, 0x7870($at) -/* D9DE6C 8024099C 46000021 */ cvt.d.s $f0, $f0 -/* D9DE70 802409A0 46220002 */ mul.d $f0, $f0, $f2 -/* D9DE74 802409A4 00000000 */ nop -/* D9DE78 802409A8 46200020 */ cvt.s.d $f0, $f0 -/* D9DE7C 802409AC E4400018 */ swc1 $f0, 0x18($v0) -/* D9DE80 802409B0 8E0300CC */ lw $v1, 0xcc($s0) -/* D9DE84 802409B4 8C640030 */ lw $a0, 0x30($v1) -/* D9DE88 802409B8 24030005 */ addiu $v1, $zero, 5 -/* D9DE8C 802409BC A443008E */ sh $v1, 0x8e($v0) -/* D9DE90 802409C0 AC440028 */ sw $a0, 0x28($v0) -/* D9DE94 802409C4 2402000F */ addiu $v0, $zero, 0xf -/* D9DE98 802409C8 AE220070 */ sw $v0, 0x70($s1) -/* D9DE9C 802409CC 8FBF0018 */ lw $ra, 0x18($sp) -/* D9DEA0 802409D0 8FB10014 */ lw $s1, 0x14($sp) -/* D9DEA4 802409D4 8FB00010 */ lw $s0, 0x10($sp) -/* D9DEA8 802409D8 03E00008 */ jr $ra -/* D9DEAC 802409DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_802409E0_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_802409E0_D9D4D0.s deleted file mode 100644 index 8d36cfe3aa..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_802409E0_D9D4D0.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409E0_D9DEB0 -/* D9DEB0 802409E0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D9DEB4 802409E4 AFB20028 */ sw $s2, 0x28($sp) -/* D9DEB8 802409E8 0080902D */ daddu $s2, $a0, $zero -/* D9DEBC 802409EC AFBF002C */ sw $ra, 0x2c($sp) -/* D9DEC0 802409F0 AFB10024 */ sw $s1, 0x24($sp) -/* D9DEC4 802409F4 AFB00020 */ sw $s0, 0x20($sp) -/* D9DEC8 802409F8 8E510148 */ lw $s1, 0x148($s2) -/* D9DECC 802409FC 0C00EABB */ jal get_npc_unsafe -/* D9DED0 80240A00 86240008 */ lh $a0, 8($s1) -/* D9DED4 80240A04 0040802D */ daddu $s0, $v0, $zero -/* D9DED8 80240A08 0200202D */ daddu $a0, $s0, $zero -/* D9DEDC 80240A0C C600000C */ lwc1 $f0, 0xc($s0) -/* D9DEE0 80240A10 27A60018 */ addiu $a2, $sp, 0x18 -/* D9DEE4 80240A14 E7A00018 */ swc1 $f0, 0x18($sp) -/* D9DEE8 80240A18 AFA00010 */ sw $zero, 0x10($sp) -/* D9DEEC 80240A1C AFA00014 */ sw $zero, 0x14($sp) -/* D9DEF0 80240A20 8E050018 */ lw $a1, 0x18($s0) -/* D9DEF4 80240A24 0C0129E1 */ jal func_8004A784 -/* D9DEF8 80240A28 0000382D */ daddu $a3, $zero, $zero -/* D9DEFC 80240A2C 14400005 */ bnez $v0, .L80240A44 -/* D9DF00 80240A30 00000000 */ nop -/* D9DF04 80240A34 8E050018 */ lw $a1, 0x18($s0) -/* D9DF08 80240A38 8E06000C */ lw $a2, 0xc($s0) -/* D9DF0C 80240A3C 0C00EA95 */ jal npc_move_heading -/* D9DF10 80240A40 0200202D */ daddu $a0, $s0, $zero -.L80240A44: -/* D9DF14 80240A44 9602008E */ lhu $v0, 0x8e($s0) -/* D9DF18 80240A48 2442FFFF */ addiu $v0, $v0, -1 -/* D9DF1C 80240A4C A602008E */ sh $v0, 0x8e($s0) -/* D9DF20 80240A50 00021400 */ sll $v0, $v0, 0x10 -/* D9DF24 80240A54 14400010 */ bnez $v0, .L80240A98 -/* D9DF28 80240A58 00000000 */ nop -/* D9DF2C 80240A5C C6000018 */ lwc1 $f0, 0x18($s0) -/* D9DF30 80240A60 3C018024 */ lui $at, 0x8024 -/* D9DF34 80240A64 D4227878 */ ldc1 $f2, 0x7878($at) -/* D9DF38 80240A68 46000021 */ cvt.d.s $f0, $f0 -/* D9DF3C 80240A6C 46220002 */ mul.d $f0, $f0, $f2 -/* D9DF40 80240A70 00000000 */ nop -/* D9DF44 80240A74 46200020 */ cvt.s.d $f0, $f0 -/* D9DF48 80240A78 E6000018 */ swc1 $f0, 0x18($s0) -/* D9DF4C 80240A7C 8E2200CC */ lw $v0, 0xcc($s1) -/* D9DF50 80240A80 8C43002C */ lw $v1, 0x2c($v0) -/* D9DF54 80240A84 2402000A */ addiu $v0, $zero, 0xa -/* D9DF58 80240A88 A602008E */ sh $v0, 0x8e($s0) -/* D9DF5C 80240A8C 24020010 */ addiu $v0, $zero, 0x10 -/* D9DF60 80240A90 AE030028 */ sw $v1, 0x28($s0) -/* D9DF64 80240A94 AE420070 */ sw $v0, 0x70($s2) -.L80240A98: -/* D9DF68 80240A98 8FBF002C */ lw $ra, 0x2c($sp) -/* D9DF6C 80240A9C 8FB20028 */ lw $s2, 0x28($sp) -/* D9DF70 80240AA0 8FB10024 */ lw $s1, 0x24($sp) -/* D9DF74 80240AA4 8FB00020 */ lw $s0, 0x20($sp) -/* D9DF78 80240AA8 03E00008 */ jr $ra -/* D9DF7C 80240AAC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_80240AB0_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_80240AB0_D9D4D0.s deleted file mode 100644 index f87b308775..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_80240AB0_D9D4D0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AB0_D9DF80 -/* D9DF80 80240AB0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D9DF84 80240AB4 AFB10024 */ sw $s1, 0x24($sp) -/* D9DF88 80240AB8 0080882D */ daddu $s1, $a0, $zero -/* D9DF8C 80240ABC AFBF0028 */ sw $ra, 0x28($sp) -/* D9DF90 80240AC0 AFB00020 */ sw $s0, 0x20($sp) -/* D9DF94 80240AC4 8E220148 */ lw $v0, 0x148($s1) -/* D9DF98 80240AC8 0C00EABB */ jal get_npc_unsafe -/* D9DF9C 80240ACC 84440008 */ lh $a0, 8($v0) -/* D9DFA0 80240AD0 0040802D */ daddu $s0, $v0, $zero -/* D9DFA4 80240AD4 0200202D */ daddu $a0, $s0, $zero -/* D9DFA8 80240AD8 C600000C */ lwc1 $f0, 0xc($s0) -/* D9DFAC 80240ADC 27A60018 */ addiu $a2, $sp, 0x18 -/* D9DFB0 80240AE0 E7A00018 */ swc1 $f0, 0x18($sp) -/* D9DFB4 80240AE4 AFA00010 */ sw $zero, 0x10($sp) -/* D9DFB8 80240AE8 AFA00014 */ sw $zero, 0x14($sp) -/* D9DFBC 80240AEC 8E050018 */ lw $a1, 0x18($s0) -/* D9DFC0 80240AF0 0C0129E1 */ jal func_8004A784 -/* D9DFC4 80240AF4 0000382D */ daddu $a3, $zero, $zero -/* D9DFC8 80240AF8 14400005 */ bnez $v0, .L80240B10 -/* D9DFCC 80240AFC 00000000 */ nop -/* D9DFD0 80240B00 8E050018 */ lw $a1, 0x18($s0) -/* D9DFD4 80240B04 8E06000C */ lw $a2, 0xc($s0) -/* D9DFD8 80240B08 0C00EA95 */ jal npc_move_heading -/* D9DFDC 80240B0C 0200202D */ daddu $a0, $s0, $zero -.L80240B10: -/* D9DFE0 80240B10 9602008E */ lhu $v0, 0x8e($s0) -/* D9DFE4 80240B14 2442FFFF */ addiu $v0, $v0, -1 -/* D9DFE8 80240B18 A602008E */ sh $v0, 0x8e($s0) -/* D9DFEC 80240B1C 00021400 */ sll $v0, $v0, 0x10 -/* D9DFF0 80240B20 14400004 */ bnez $v0, .L80240B34 -/* D9DFF4 80240B24 2402001E */ addiu $v0, $zero, 0x1e -/* D9DFF8 80240B28 A602008E */ sh $v0, 0x8e($s0) -/* D9DFFC 80240B2C 24020011 */ addiu $v0, $zero, 0x11 -/* D9E000 80240B30 AE220070 */ sw $v0, 0x70($s1) -.L80240B34: -/* D9E004 80240B34 8FBF0028 */ lw $ra, 0x28($sp) -/* D9E008 80240B38 8FB10024 */ lw $s1, 0x24($sp) -/* D9E00C 80240B3C 8FB00020 */ lw $s0, 0x20($sp) -/* D9E010 80240B40 03E00008 */ jr $ra -/* D9E014 80240B44 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_80240B48_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_80240B48_D9D4D0.s deleted file mode 100644 index 2d35775d65..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_80240B48_D9D4D0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B48_D9E018 -/* D9E018 80240B48 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D9E01C 80240B4C AFB10014 */ sw $s1, 0x14($sp) -/* D9E020 80240B50 0080882D */ daddu $s1, $a0, $zero -/* D9E024 80240B54 AFBF0018 */ sw $ra, 0x18($sp) -/* D9E028 80240B58 AFB00010 */ sw $s0, 0x10($sp) -/* D9E02C 80240B5C 8E300148 */ lw $s0, 0x148($s1) -/* D9E030 80240B60 0C00EABB */ jal get_npc_unsafe -/* D9E034 80240B64 86040008 */ lh $a0, 8($s0) -/* D9E038 80240B68 0040182D */ daddu $v1, $v0, $zero -/* D9E03C 80240B6C 9462008E */ lhu $v0, 0x8e($v1) -/* D9E040 80240B70 2442FFFF */ addiu $v0, $v0, -1 -/* D9E044 80240B74 A462008E */ sh $v0, 0x8e($v1) -/* D9E048 80240B78 00021400 */ sll $v0, $v0, 0x10 -/* D9E04C 80240B7C 14400005 */ bnez $v0, .L80240B94 -/* D9E050 80240B80 00000000 */ nop -/* D9E054 80240B84 8E0200CC */ lw $v0, 0xcc($s0) -/* D9E058 80240B88 8C420000 */ lw $v0, ($v0) -/* D9E05C 80240B8C AC620028 */ sw $v0, 0x28($v1) -/* D9E060 80240B90 AE200070 */ sw $zero, 0x70($s1) -.L80240B94: -/* D9E064 80240B94 8FBF0018 */ lw $ra, 0x18($sp) -/* D9E068 80240B98 8FB10014 */ lw $s1, 0x14($sp) -/* D9E06C 80240B9C 8FB00010 */ lw $s0, 0x10($sp) -/* D9E070 80240BA0 03E00008 */ jr $ra -/* D9E074 80240BA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_80240BA8_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_80240BA8_D9D4D0.s deleted file mode 100644 index 17d694e9d4..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_80240BA8_D9D4D0.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BA8_D9E078 -/* D9E078 80240BA8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* D9E07C 80240BAC AFB30054 */ sw $s3, 0x54($sp) -/* D9E080 80240BB0 0080982D */ daddu $s3, $a0, $zero -/* D9E084 80240BB4 AFBF0060 */ sw $ra, 0x60($sp) -/* D9E088 80240BB8 AFB5005C */ sw $s5, 0x5c($sp) -/* D9E08C 80240BBC AFB40058 */ sw $s4, 0x58($sp) -/* D9E090 80240BC0 AFB20050 */ sw $s2, 0x50($sp) -/* D9E094 80240BC4 AFB1004C */ sw $s1, 0x4c($sp) -/* D9E098 80240BC8 AFB00048 */ sw $s0, 0x48($sp) -/* D9E09C 80240BCC 8E710148 */ lw $s1, 0x148($s3) -/* D9E0A0 80240BD0 86240008 */ lh $a0, 8($s1) -/* D9E0A4 80240BD4 0C00EABB */ jal get_npc_unsafe -/* D9E0A8 80240BD8 00A0802D */ daddu $s0, $a1, $zero -/* D9E0AC 80240BDC 8E63000C */ lw $v1, 0xc($s3) -/* D9E0B0 80240BE0 0260202D */ daddu $a0, $s3, $zero -/* D9E0B4 80240BE4 8C650000 */ lw $a1, ($v1) -/* D9E0B8 80240BE8 0C0B1EAF */ jal get_variable -/* D9E0BC 80240BEC 0040902D */ daddu $s2, $v0, $zero -/* D9E0C0 80240BF0 AFA00018 */ sw $zero, 0x18($sp) -/* D9E0C4 80240BF4 8E2300D0 */ lw $v1, 0xd0($s1) -/* D9E0C8 80240BF8 8C630030 */ lw $v1, 0x30($v1) -/* D9E0CC 80240BFC AFA3001C */ sw $v1, 0x1c($sp) -/* D9E0D0 80240C00 8E2300D0 */ lw $v1, 0xd0($s1) -/* D9E0D4 80240C04 8C63001C */ lw $v1, 0x1c($v1) -/* D9E0D8 80240C08 AFA30020 */ sw $v1, 0x20($sp) -/* D9E0DC 80240C0C 8E2300D0 */ lw $v1, 0xd0($s1) -/* D9E0E0 80240C10 8C630024 */ lw $v1, 0x24($v1) -/* D9E0E4 80240C14 AFA30024 */ sw $v1, 0x24($sp) -/* D9E0E8 80240C18 8E2300D0 */ lw $v1, 0xd0($s1) -/* D9E0EC 80240C1C 8C630028 */ lw $v1, 0x28($v1) -/* D9E0F0 80240C20 27B50018 */ addiu $s5, $sp, 0x18 -/* D9E0F4 80240C24 AFA30028 */ sw $v1, 0x28($sp) -/* D9E0F8 80240C28 8E2300D0 */ lw $v1, 0xd0($s1) -/* D9E0FC 80240C2C 3C014282 */ lui $at, 0x4282 -/* D9E100 80240C30 44810000 */ mtc1 $at, $f0 -/* D9E104 80240C34 8C63002C */ lw $v1, 0x2c($v1) -/* D9E108 80240C38 0040A02D */ daddu $s4, $v0, $zero -/* D9E10C 80240C3C E7A00030 */ swc1 $f0, 0x30($sp) -/* D9E110 80240C40 A7A00034 */ sh $zero, 0x34($sp) -/* D9E114 80240C44 16000005 */ bnez $s0, .L80240C5C -/* D9E118 80240C48 AFA3002C */ sw $v1, 0x2c($sp) -/* D9E11C 80240C4C 8E2200B0 */ lw $v0, 0xb0($s1) -/* D9E120 80240C50 30420004 */ andi $v0, $v0, 4 -/* D9E124 80240C54 10400044 */ beqz $v0, .L80240D68 -/* D9E128 80240C58 00000000 */ nop -.L80240C5C: -/* D9E12C 80240C5C 2404F7FF */ addiu $a0, $zero, -0x801 -/* D9E130 80240C60 AE600070 */ sw $zero, 0x70($s3) -/* D9E134 80240C64 A640008E */ sh $zero, 0x8e($s2) -/* D9E138 80240C68 8E2200CC */ lw $v0, 0xcc($s1) -/* D9E13C 80240C6C 8E430000 */ lw $v1, ($s2) -/* D9E140 80240C70 8C420000 */ lw $v0, ($v0) -/* D9E144 80240C74 00641824 */ and $v1, $v1, $a0 -/* D9E148 80240C78 AE430000 */ sw $v1, ($s2) -/* D9E14C 80240C7C AE420028 */ sw $v0, 0x28($s2) -/* D9E150 80240C80 8E2200D0 */ lw $v0, 0xd0($s1) -/* D9E154 80240C84 8C420034 */ lw $v0, 0x34($v0) -/* D9E158 80240C88 54400005 */ bnel $v0, $zero, .L80240CA0 -/* D9E15C 80240C8C 2402FDFF */ addiu $v0, $zero, -0x201 -/* D9E160 80240C90 34620200 */ ori $v0, $v1, 0x200 -/* D9E164 80240C94 2403FFF7 */ addiu $v1, $zero, -9 -/* D9E168 80240C98 0809032A */ j .L80240CA8 -/* D9E16C 80240C9C 00431024 */ and $v0, $v0, $v1 -.L80240CA0: -/* D9E170 80240CA0 00621024 */ and $v0, $v1, $v0 -/* D9E174 80240CA4 34420008 */ ori $v0, $v0, 8 -.L80240CA8: -/* D9E178 80240CA8 AE420000 */ sw $v0, ($s2) -/* D9E17C 80240CAC 8E2200B0 */ lw $v0, 0xb0($s1) -/* D9E180 80240CB0 30420004 */ andi $v0, $v0, 4 -/* D9E184 80240CB4 10400004 */ beqz $v0, .L80240CC8 -/* D9E188 80240CB8 24020063 */ addiu $v0, $zero, 0x63 -/* D9E18C 80240CBC AE620070 */ sw $v0, 0x70($s3) -/* D9E190 80240CC0 08090338 */ j .L80240CE0 -/* D9E194 80240CC4 AE600074 */ sw $zero, 0x74($s3) -.L80240CC8: -/* D9E198 80240CC8 8E220000 */ lw $v0, ($s1) -/* D9E19C 80240CCC 3C034000 */ lui $v1, 0x4000 -/* D9E1A0 80240CD0 00431024 */ and $v0, $v0, $v1 -/* D9E1A4 80240CD4 10400002 */ beqz $v0, .L80240CE0 -/* D9E1A8 80240CD8 2402000C */ addiu $v0, $zero, 0xc -/* D9E1AC 80240CDC AE620070 */ sw $v0, 0x70($s3) -.L80240CE0: -/* D9E1B0 80240CE0 3C06BFFF */ lui $a2, 0xbfff -/* D9E1B4 80240CE4 34C6FFFF */ ori $a2, $a2, 0xffff -/* D9E1B8 80240CE8 27A50038 */ addiu $a1, $sp, 0x38 -/* D9E1BC 80240CEC 2404FFFB */ addiu $a0, $zero, -5 -/* D9E1C0 80240CF0 8E2200B0 */ lw $v0, 0xb0($s1) -/* D9E1C4 80240CF4 8E230000 */ lw $v1, ($s1) -/* D9E1C8 80240CF8 3C0142C8 */ lui $at, 0x42c8 -/* D9E1CC 80240CFC 44810000 */ mtc1 $at, $f0 -/* D9E1D0 80240D00 00441024 */ and $v0, $v0, $a0 -/* D9E1D4 80240D04 00661824 */ and $v1, $v1, $a2 -/* D9E1D8 80240D08 AE2200B0 */ sw $v0, 0xb0($s1) -/* D9E1DC 80240D0C AE230000 */ sw $v1, ($s1) -/* D9E1E0 80240D10 864200A8 */ lh $v0, 0xa8($s2) -/* D9E1E4 80240D14 27A70040 */ addiu $a3, $sp, 0x40 -/* D9E1E8 80240D18 E7A00044 */ swc1 $f0, 0x44($sp) -/* D9E1EC 80240D1C C6460038 */ lwc1 $f6, 0x38($s2) -/* D9E1F0 80240D20 C640003C */ lwc1 $f0, 0x3c($s2) -/* D9E1F4 80240D24 C6420040 */ lwc1 $f2, 0x40($s2) -/* D9E1F8 80240D28 44822000 */ mtc1 $v0, $f4 -/* D9E1FC 80240D2C 00000000 */ nop -/* D9E200 80240D30 46802120 */ cvt.s.w $f4, $f4 -/* D9E204 80240D34 27A20044 */ addiu $v0, $sp, 0x44 -/* D9E208 80240D38 46040000 */ add.s $f0, $f0, $f4 -/* D9E20C 80240D3C E7A60038 */ swc1 $f6, 0x38($sp) -/* D9E210 80240D40 E7A20040 */ swc1 $f2, 0x40($sp) -/* D9E214 80240D44 E7A0003C */ swc1 $f0, 0x3c($sp) -/* D9E218 80240D48 AFA20010 */ sw $v0, 0x10($sp) -/* D9E21C 80240D4C 8E440080 */ lw $a0, 0x80($s2) -/* D9E220 80240D50 0C0372DF */ jal func_800DCB7C -/* D9E224 80240D54 27A6003C */ addiu $a2, $sp, 0x3c -/* D9E228 80240D58 10400003 */ beqz $v0, .L80240D68 -/* D9E22C 80240D5C 00000000 */ nop -/* D9E230 80240D60 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* D9E234 80240D64 E640003C */ swc1 $f0, 0x3c($s2) -.L80240D68: -/* D9E238 80240D68 8E630070 */ lw $v1, 0x70($s3) -/* D9E23C 80240D6C 2C620064 */ sltiu $v0, $v1, 0x64 -/* D9E240 80240D70 10400050 */ beqz $v0, .L80240EB4 -/* D9E244 80240D74 00031080 */ sll $v0, $v1, 2 -/* D9E248 80240D78 3C018024 */ lui $at, 0x8024 -/* D9E24C 80240D7C 00220821 */ addu $at, $at, $v0 -/* D9E250 80240D80 8C227880 */ lw $v0, 0x7880($at) -/* D9E254 80240D84 00400008 */ jr $v0 -/* D9E258 80240D88 00000000 */ nop -/* D9E25C 80240D8C 0260202D */ daddu $a0, $s3, $zero -/* D9E260 80240D90 0280282D */ daddu $a1, $s4, $zero -/* D9E264 80240D94 0C012568 */ jal func_800495A0 -/* D9E268 80240D98 02A0302D */ daddu $a2, $s5, $zero -/* D9E26C 80240D9C 0260202D */ daddu $a0, $s3, $zero -/* D9E270 80240DA0 0280282D */ daddu $a1, $s4, $zero -/* D9E274 80240DA4 0C0125AE */ jal func_800496B8 -/* D9E278 80240DA8 02A0302D */ daddu $a2, $s5, $zero -/* D9E27C 80240DAC 080903AD */ j .L80240EB4 -/* D9E280 80240DB0 00000000 */ nop -/* D9E284 80240DB4 0260202D */ daddu $a0, $s3, $zero -/* D9E288 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* D9E28C 80240DBC 0C0126D1 */ jal func_80049B44 -/* D9E290 80240DC0 02A0302D */ daddu $a2, $s5, $zero -/* D9E294 80240DC4 0260202D */ daddu $a0, $s3, $zero -/* D9E298 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* D9E29C 80240DCC 0C012701 */ jal func_80049C04 -/* D9E2A0 80240DD0 02A0302D */ daddu $a2, $s5, $zero -/* D9E2A4 80240DD4 080903AD */ j .L80240EB4 -/* D9E2A8 80240DD8 00000000 */ nop -/* D9E2AC 80240DDC 0260202D */ daddu $a0, $s3, $zero -/* D9E2B0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* D9E2B4 80240DE4 0C01278F */ jal func_80049E3C -/* D9E2B8 80240DE8 02A0302D */ daddu $a2, $s5, $zero -/* D9E2BC 80240DEC 0260202D */ daddu $a0, $s3, $zero -/* D9E2C0 80240DF0 0280282D */ daddu $a1, $s4, $zero -/* D9E2C4 80240DF4 0C0127B3 */ jal func_80049ECC -/* D9E2C8 80240DF8 02A0302D */ daddu $a2, $s5, $zero -/* D9E2CC 80240DFC 080903AD */ j .L80240EB4 -/* D9E2D0 80240E00 00000000 */ nop -/* D9E2D4 80240E04 0260202D */ daddu $a0, $s3, $zero -/* D9E2D8 80240E08 0280282D */ daddu $a1, $s4, $zero -/* D9E2DC 80240E0C 0C0127DF */ jal func_80049F7C -/* D9E2E0 80240E10 02A0302D */ daddu $a2, $s5, $zero -/* D9E2E4 80240E14 0260202D */ daddu $a0, $s3, $zero -/* D9E2E8 80240E18 0280282D */ daddu $a1, $s4, $zero -/* D9E2EC 80240E1C 0C012849 */ jal func_8004A124 -/* D9E2F0 80240E20 02A0302D */ daddu $a2, $s5, $zero -/* D9E2F4 80240E24 8E630070 */ lw $v1, 0x70($s3) -/* D9E2F8 80240E28 2402000E */ addiu $v0, $zero, 0xe -/* D9E2FC 80240E2C 14620021 */ bne $v1, $v0, .L80240EB4 -/* D9E300 80240E30 00000000 */ nop -/* D9E304 80240E34 0260202D */ daddu $a0, $s3, $zero -/* D9E308 80240E38 0280282D */ daddu $a1, $s4, $zero -/* D9E30C 80240E3C 0C09025C */ jal func_80240970 -/* D9E310 80240E40 02A0302D */ daddu $a2, $s5, $zero -/* D9E314 80240E44 8E630070 */ lw $v1, 0x70($s3) -/* D9E318 80240E48 2402000F */ addiu $v0, $zero, 0xf -/* D9E31C 80240E4C 14620019 */ bne $v1, $v0, .L80240EB4 -/* D9E320 80240E50 00000000 */ nop -/* D9E324 80240E54 0260202D */ daddu $a0, $s3, $zero -/* D9E328 80240E58 0280282D */ daddu $a1, $s4, $zero -/* D9E32C 80240E5C 0C090278 */ jal func_802409E0 -/* D9E330 80240E60 02A0302D */ daddu $a2, $s5, $zero -/* D9E334 80240E64 8E630070 */ lw $v1, 0x70($s3) -/* D9E338 80240E68 24020010 */ addiu $v0, $zero, 0x10 -/* D9E33C 80240E6C 14620011 */ bne $v1, $v0, .L80240EB4 -/* D9E340 80240E70 00000000 */ nop -/* D9E344 80240E74 0260202D */ daddu $a0, $s3, $zero -/* D9E348 80240E78 0280282D */ daddu $a1, $s4, $zero -/* D9E34C 80240E7C 0C0902AC */ jal func_80240AB0 -/* D9E350 80240E80 02A0302D */ daddu $a2, $s5, $zero -/* D9E354 80240E84 8E630070 */ lw $v1, 0x70($s3) -/* D9E358 80240E88 24020011 */ addiu $v0, $zero, 0x11 -/* D9E35C 80240E8C 14620009 */ bne $v1, $v0, .L80240EB4 -/* D9E360 80240E90 00000000 */ nop -/* D9E364 80240E94 0260202D */ daddu $a0, $s3, $zero -/* D9E368 80240E98 0280282D */ daddu $a1, $s4, $zero -/* D9E36C 80240E9C 0C0902D2 */ jal func_80240B48 -/* D9E370 80240EA0 02A0302D */ daddu $a2, $s5, $zero -/* D9E374 80240EA4 080903AD */ j .L80240EB4 -/* D9E378 80240EA8 00000000 */ nop -/* D9E37C 80240EAC 0C0129CF */ jal func_8004A73C -/* D9E380 80240EB0 0260202D */ daddu $a0, $s3, $zero -.L80240EB4: -/* D9E384 80240EB4 8FBF0060 */ lw $ra, 0x60($sp) -/* D9E388 80240EB8 8FB5005C */ lw $s5, 0x5c($sp) -/* D9E38C 80240EBC 8FB40058 */ lw $s4, 0x58($sp) -/* D9E390 80240EC0 8FB30054 */ lw $s3, 0x54($sp) -/* D9E394 80240EC4 8FB20050 */ lw $s2, 0x50($sp) -/* D9E398 80240EC8 8FB1004C */ lw $s1, 0x4c($sp) -/* D9E39C 80240ECC 8FB00048 */ lw $s0, 0x48($sp) -/* D9E3A0 80240ED0 0000102D */ daddu $v0, $zero, $zero -/* D9E3A4 80240ED4 03E00008 */ jr $ra -/* D9E3A8 80240ED8 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_80240F90_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_80240F90_D9D4D0.s deleted file mode 100644 index 3939df37cd..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_80240F90_D9D4D0.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F90_D9E460 -/* D9E460 80240F90 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D9E464 80240F94 AFB40040 */ sw $s4, 0x40($sp) -/* D9E468 80240F98 0080A02D */ daddu $s4, $a0, $zero -/* D9E46C 80240F9C AFBF0044 */ sw $ra, 0x44($sp) -/* D9E470 80240FA0 AFB3003C */ sw $s3, 0x3c($sp) -/* D9E474 80240FA4 AFB20038 */ sw $s2, 0x38($sp) -/* D9E478 80240FA8 AFB10034 */ sw $s1, 0x34($sp) -/* D9E47C 80240FAC AFB00030 */ sw $s0, 0x30($sp) -/* D9E480 80240FB0 8E920148 */ lw $s2, 0x148($s4) -/* D9E484 80240FB4 00A0802D */ daddu $s0, $a1, $zero -/* D9E488 80240FB8 86440008 */ lh $a0, 8($s2) -/* D9E48C 80240FBC 0C00EABB */ jal get_npc_unsafe -/* D9E490 80240FC0 00C0982D */ daddu $s3, $a2, $zero -/* D9E494 80240FC4 8E030008 */ lw $v1, 8($s0) -/* D9E498 80240FC8 04600031 */ bltz $v1, .L80241090 -/* D9E49C 80240FCC 0040882D */ daddu $s1, $v0, $zero -/* D9E4A0 80240FD0 0260202D */ daddu $a0, $s3, $zero -/* D9E4A4 80240FD4 AFA00010 */ sw $zero, 0x10($sp) -/* D9E4A8 80240FD8 8E060018 */ lw $a2, 0x18($s0) -/* D9E4AC 80240FDC 8E07001C */ lw $a3, 0x1c($s0) -/* D9E4B0 80240FE0 0C01242D */ jal func_800490B4 -/* D9E4B4 80240FE4 0240282D */ daddu $a1, $s2, $zero -/* D9E4B8 80240FE8 10400029 */ beqz $v0, .L80241090 -/* D9E4BC 80240FEC 0000202D */ daddu $a0, $zero, $zero -/* D9E4C0 80240FF0 0220282D */ daddu $a1, $s1, $zero -/* D9E4C4 80240FF4 0000302D */ daddu $a2, $zero, $zero -/* D9E4C8 80240FF8 862300A8 */ lh $v1, 0xa8($s1) -/* D9E4CC 80240FFC 3C013F80 */ lui $at, 0x3f80 -/* D9E4D0 80241000 44810000 */ mtc1 $at, $f0 -/* D9E4D4 80241004 3C014000 */ lui $at, 0x4000 -/* D9E4D8 80241008 44811000 */ mtc1 $at, $f2 -/* D9E4DC 8024100C 3C01C1A0 */ lui $at, 0xc1a0 -/* D9E4E0 80241010 44812000 */ mtc1 $at, $f4 -/* D9E4E4 80241014 2402000F */ addiu $v0, $zero, 0xf -/* D9E4E8 80241018 AFA2001C */ sw $v0, 0x1c($sp) -/* D9E4EC 8024101C 44833000 */ mtc1 $v1, $f6 -/* D9E4F0 80241020 00000000 */ nop -/* D9E4F4 80241024 468031A0 */ cvt.s.w $f6, $f6 -/* D9E4F8 80241028 44073000 */ mfc1 $a3, $f6 -/* D9E4FC 8024102C 27A20028 */ addiu $v0, $sp, 0x28 -/* D9E500 80241030 AFA20020 */ sw $v0, 0x20($sp) -/* D9E504 80241034 E7A00010 */ swc1 $f0, 0x10($sp) -/* D9E508 80241038 E7A20014 */ swc1 $f2, 0x14($sp) -/* D9E50C 8024103C 0C01BFA4 */ jal fx_emote -/* D9E510 80241040 E7A40018 */ swc1 $f4, 0x18($sp) -/* D9E514 80241044 0220202D */ daddu $a0, $s1, $zero -/* D9E518 80241048 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D9E51C 8024104C 0C012530 */ jal func_800494C0 -/* D9E520 80241050 3C060020 */ lui $a2, 0x20 -/* D9E524 80241054 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D9E528 80241058 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D9E52C 8024105C C62C0038 */ lwc1 $f12, 0x38($s1) -/* D9E530 80241060 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D9E534 80241064 8C460028 */ lw $a2, 0x28($v0) -/* D9E538 80241068 0C00A720 */ jal atan2 -/* D9E53C 8024106C 8C470030 */ lw $a3, 0x30($v0) -/* D9E540 80241070 E620000C */ swc1 $f0, 0xc($s1) -/* D9E544 80241074 8E420018 */ lw $v0, 0x18($s2) -/* D9E548 80241078 9442002A */ lhu $v0, 0x2a($v0) -/* D9E54C 8024107C 30420001 */ andi $v0, $v0, 1 -/* D9E550 80241080 14400002 */ bnez $v0, .L8024108C -/* D9E554 80241084 2402000A */ addiu $v0, $zero, 0xa -/* D9E558 80241088 2402000C */ addiu $v0, $zero, 0xc -.L8024108C: -/* D9E55C 8024108C AE820070 */ sw $v0, 0x70($s4) -.L80241090: -/* D9E560 80241090 8FBF0044 */ lw $ra, 0x44($sp) -/* D9E564 80241094 8FB40040 */ lw $s4, 0x40($sp) -/* D9E568 80241098 8FB3003C */ lw $s3, 0x3c($sp) -/* D9E56C 8024109C 8FB20038 */ lw $s2, 0x38($sp) -/* D9E570 802410A0 8FB10034 */ lw $s1, 0x34($sp) -/* D9E574 802410A4 8FB00030 */ lw $s0, 0x30($sp) -/* D9E578 802410A8 03E00008 */ jr $ra -/* D9E57C 802410AC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_802410B0_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_802410B0_D9D4D0.s deleted file mode 100644 index 074d71a1d0..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_802410B0_D9D4D0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410B0_D9E580 -/* D9E580 802410B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9E584 802410B4 AFB00010 */ sw $s0, 0x10($sp) -/* D9E588 802410B8 0080802D */ daddu $s0, $a0, $zero -/* D9E58C 802410BC AFBF0014 */ sw $ra, 0x14($sp) -/* D9E590 802410C0 8E020148 */ lw $v0, 0x148($s0) -/* D9E594 802410C4 0C00EABB */ jal get_npc_unsafe -/* D9E598 802410C8 84440008 */ lh $a0, 8($v0) -/* D9E59C 802410CC 3C014120 */ lui $at, 0x4120 -/* D9E5A0 802410D0 44810000 */ mtc1 $at, $f0 -/* D9E5A4 802410D4 3C014000 */ lui $at, 0x4000 -/* D9E5A8 802410D8 44811000 */ mtc1 $at, $f2 -/* D9E5AC 802410DC 8C430000 */ lw $v1, ($v0) -/* D9E5B0 802410E0 C444003C */ lwc1 $f4, 0x3c($v0) -/* D9E5B4 802410E4 34630800 */ ori $v1, $v1, 0x800 -/* D9E5B8 802410E8 E440001C */ swc1 $f0, 0x1c($v0) -/* D9E5BC 802410EC E4420014 */ swc1 $f2, 0x14($v0) -/* D9E5C0 802410F0 E4440064 */ swc1 $f4, 0x64($v0) -/* D9E5C4 802410F4 AC430000 */ sw $v1, ($v0) -/* D9E5C8 802410F8 2402000B */ addiu $v0, $zero, 0xb -/* D9E5CC 802410FC AE020070 */ sw $v0, 0x70($s0) -/* D9E5D0 80241100 8FBF0014 */ lw $ra, 0x14($sp) -/* D9E5D4 80241104 8FB00010 */ lw $s0, 0x10($sp) -/* D9E5D8 80241108 03E00008 */ jr $ra -/* D9E5DC 8024110C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_80241188_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_80241188_D9D4D0.s deleted file mode 100644 index 5ac68e92c7..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_80241188_D9D4D0.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241188_D9E658 -/* D9E658 80241188 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D9E65C 8024118C AFB3001C */ sw $s3, 0x1c($sp) -/* D9E660 80241190 0080982D */ daddu $s3, $a0, $zero -/* D9E664 80241194 AFBF0020 */ sw $ra, 0x20($sp) -/* D9E668 80241198 AFB20018 */ sw $s2, 0x18($sp) -/* D9E66C 8024119C AFB10014 */ sw $s1, 0x14($sp) -/* D9E670 802411A0 AFB00010 */ sw $s0, 0x10($sp) -/* D9E674 802411A4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* D9E678 802411A8 8E710148 */ lw $s1, 0x148($s3) -/* D9E67C 802411AC 86240008 */ lh $a0, 8($s1) -/* D9E680 802411B0 0C00EABB */ jal get_npc_unsafe -/* D9E684 802411B4 00A0802D */ daddu $s0, $a1, $zero -/* D9E688 802411B8 8E040014 */ lw $a0, 0x14($s0) -/* D9E68C 802411BC 0040902D */ daddu $s2, $v0, $zero -/* D9E690 802411C0 00041FC2 */ srl $v1, $a0, 0x1f -/* D9E694 802411C4 00832021 */ addu $a0, $a0, $v1 -/* D9E698 802411C8 00042043 */ sra $a0, $a0, 1 -/* D9E69C 802411CC 0C00A67F */ jal rand_int -/* D9E6A0 802411D0 24840001 */ addiu $a0, $a0, 1 -/* D9E6A4 802411D4 8E030014 */ lw $v1, 0x14($s0) -/* D9E6A8 802411D8 C64C0038 */ lwc1 $f12, 0x38($s2) -/* D9E6AC 802411DC 000327C2 */ srl $a0, $v1, 0x1f -/* D9E6B0 802411E0 00641821 */ addu $v1, $v1, $a0 -/* D9E6B4 802411E4 00031843 */ sra $v1, $v1, 1 -/* D9E6B8 802411E8 00621821 */ addu $v1, $v1, $v0 -/* D9E6BC 802411EC A643008E */ sh $v1, 0x8e($s2) -/* D9E6C0 802411F0 8E2200CC */ lw $v0, 0xcc($s1) -/* D9E6C4 802411F4 C64E0040 */ lwc1 $f14, 0x40($s2) -/* D9E6C8 802411F8 8C42000C */ lw $v0, 0xc($v0) -/* D9E6CC 802411FC AE420028 */ sw $v0, 0x28($s2) -/* D9E6D0 80241200 C600000C */ lwc1 $f0, 0xc($s0) -/* D9E6D4 80241204 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D9E6D8 80241208 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D9E6DC 8024120C E6400018 */ swc1 $f0, 0x18($s2) -/* D9E6E0 80241210 8C460028 */ lw $a2, 0x28($v0) -/* D9E6E4 80241214 0C00A720 */ jal atan2 -/* D9E6E8 80241218 8C470030 */ lw $a3, 0x30($v0) -/* D9E6EC 8024121C 46000506 */ mov.s $f20, $f0 -/* D9E6F0 80241220 C64C000C */ lwc1 $f12, 0xc($s2) -/* D9E6F4 80241224 0C00A70A */ jal get_clamped_angle_diff -/* D9E6F8 80241228 4600A386 */ mov.s $f14, $f20 -/* D9E6FC 8024122C 46000086 */ mov.s $f2, $f0 -/* D9E700 80241230 8E020010 */ lw $v0, 0x10($s0) -/* D9E704 80241234 46001005 */ abs.s $f0, $f2 -/* D9E708 80241238 44822000 */ mtc1 $v0, $f4 -/* D9E70C 8024123C 00000000 */ nop -/* D9E710 80241240 46802120 */ cvt.s.w $f4, $f4 -/* D9E714 80241244 4600203C */ c.lt.s $f4, $f0 -/* D9E718 80241248 00000000 */ nop -/* D9E71C 8024124C 4500000D */ bc1f .L80241284 -/* D9E720 80241250 00000000 */ nop -/* D9E724 80241254 44800000 */ mtc1 $zero, $f0 -/* D9E728 80241258 C654000C */ lwc1 $f20, 0xc($s2) -/* D9E72C 8024125C 4600103C */ c.lt.s $f2, $f0 -/* D9E730 80241260 00000000 */ nop -/* D9E734 80241264 45000006 */ bc1f .L80241280 -/* D9E738 80241268 00021023 */ negu $v0, $v0 -/* D9E73C 8024126C 44820000 */ mtc1 $v0, $f0 -/* D9E740 80241270 00000000 */ nop -/* D9E744 80241274 46800020 */ cvt.s.w $f0, $f0 -/* D9E748 80241278 080904A1 */ j .L80241284 -/* D9E74C 8024127C 4600A500 */ add.s $f20, $f20, $f0 -.L80241280: -/* D9E750 80241280 4604A500 */ add.s $f20, $f20, $f4 -.L80241284: -/* D9E754 80241284 0C00A6C9 */ jal clamp_angle -/* D9E758 80241288 4600A306 */ mov.s $f12, $f20 -/* D9E75C 8024128C 2402000D */ addiu $v0, $zero, 0xd -/* D9E760 80241290 E640000C */ swc1 $f0, 0xc($s2) -/* D9E764 80241294 AE620070 */ sw $v0, 0x70($s3) -/* D9E768 80241298 8FBF0020 */ lw $ra, 0x20($sp) -/* D9E76C 8024129C 8FB3001C */ lw $s3, 0x1c($sp) -/* D9E770 802412A0 8FB20018 */ lw $s2, 0x18($sp) -/* D9E774 802412A4 8FB10014 */ lw $s1, 0x14($sp) -/* D9E778 802412A8 8FB00010 */ lw $s0, 0x10($sp) -/* D9E77C 802412AC D7B40028 */ ldc1 $f20, 0x28($sp) -/* D9E780 802412B0 03E00008 */ jr $ra -/* D9E784 802412B4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_802412B8_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_802412B8_D9D4D0.s deleted file mode 100644 index 423691a376..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_802412B8_D9D4D0.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412B8_D9E788 -/* D9E788 802412B8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D9E78C 802412BC AFB3003C */ sw $s3, 0x3c($sp) -/* D9E790 802412C0 0080982D */ daddu $s3, $a0, $zero -/* D9E794 802412C4 AFBF0040 */ sw $ra, 0x40($sp) -/* D9E798 802412C8 AFB20038 */ sw $s2, 0x38($sp) -/* D9E79C 802412CC AFB10034 */ sw $s1, 0x34($sp) -/* D9E7A0 802412D0 AFB00030 */ sw $s0, 0x30($sp) -/* D9E7A4 802412D4 8E720148 */ lw $s2, 0x148($s3) -/* D9E7A8 802412D8 00A0882D */ daddu $s1, $a1, $zero -/* D9E7AC 802412DC 86440008 */ lh $a0, 8($s2) -/* D9E7B0 802412E0 0C00EABB */ jal get_npc_unsafe -/* D9E7B4 802412E4 00C0802D */ daddu $s0, $a2, $zero -/* D9E7B8 802412E8 0200202D */ daddu $a0, $s0, $zero -/* D9E7BC 802412EC 0240282D */ daddu $a1, $s2, $zero -/* D9E7C0 802412F0 24030001 */ addiu $v1, $zero, 1 -/* D9E7C4 802412F4 AFA30010 */ sw $v1, 0x10($sp) -/* D9E7C8 802412F8 8E260018 */ lw $a2, 0x18($s1) -/* D9E7CC 802412FC 8E27001C */ lw $a3, 0x1c($s1) -/* D9E7D0 80241300 0C01242D */ jal func_800490B4 -/* D9E7D4 80241304 0040802D */ daddu $s0, $v0, $zero -/* D9E7D8 80241308 1440001D */ bnez $v0, .L80241380 -/* D9E7DC 8024130C 24040002 */ addiu $a0, $zero, 2 -/* D9E7E0 80241310 0200282D */ daddu $a1, $s0, $zero -/* D9E7E4 80241314 0000302D */ daddu $a2, $zero, $zero -/* D9E7E8 80241318 860300A8 */ lh $v1, 0xa8($s0) -/* D9E7EC 8024131C 3C013F80 */ lui $at, 0x3f80 -/* D9E7F0 80241320 44810000 */ mtc1 $at, $f0 -/* D9E7F4 80241324 3C014000 */ lui $at, 0x4000 -/* D9E7F8 80241328 44811000 */ mtc1 $at, $f2 -/* D9E7FC 8024132C 3C01C1A0 */ lui $at, 0xc1a0 -/* D9E800 80241330 44812000 */ mtc1 $at, $f4 -/* D9E804 80241334 2402000F */ addiu $v0, $zero, 0xf -/* D9E808 80241338 AFA2001C */ sw $v0, 0x1c($sp) -/* D9E80C 8024133C 44833000 */ mtc1 $v1, $f6 -/* D9E810 80241340 00000000 */ nop -/* D9E814 80241344 468031A0 */ cvt.s.w $f6, $f6 -/* D9E818 80241348 44073000 */ mfc1 $a3, $f6 -/* D9E81C 8024134C 27A20028 */ addiu $v0, $sp, 0x28 -/* D9E820 80241350 AFA20020 */ sw $v0, 0x20($sp) -/* D9E824 80241354 E7A00010 */ swc1 $f0, 0x10($sp) -/* D9E828 80241358 E7A20014 */ swc1 $f2, 0x14($sp) -/* D9E82C 8024135C 0C01BFA4 */ jal fx_emote -/* D9E830 80241360 E7A40018 */ swc1 $f4, 0x18($sp) -/* D9E834 80241364 8E4200CC */ lw $v0, 0xcc($s2) -/* D9E838 80241368 8C430000 */ lw $v1, ($v0) -/* D9E83C 8024136C 24020019 */ addiu $v0, $zero, 0x19 -/* D9E840 80241370 A602008E */ sh $v0, 0x8e($s0) -/* D9E844 80241374 2402000E */ addiu $v0, $zero, 0xe -/* D9E848 80241378 080904ED */ j .L802413B4 -/* D9E84C 8024137C AE030028 */ sw $v1, 0x28($s0) -.L80241380: -/* D9E850 80241380 8E050018 */ lw $a1, 0x18($s0) -/* D9E854 80241384 8E06000C */ lw $a2, 0xc($s0) -/* D9E858 80241388 0C00EA95 */ jal npc_move_heading -/* D9E85C 8024138C 0200202D */ daddu $a0, $s0, $zero -/* D9E860 80241390 0200202D */ daddu $a0, $s0, $zero -/* D9E864 80241394 0C00F598 */ jal func_8003D660 -/* D9E868 80241398 24050001 */ addiu $a1, $zero, 1 -/* D9E86C 8024139C 9602008E */ lhu $v0, 0x8e($s0) -/* D9E870 802413A0 2442FFFF */ addiu $v0, $v0, -1 -/* D9E874 802413A4 A602008E */ sh $v0, 0x8e($s0) -/* D9E878 802413A8 00021400 */ sll $v0, $v0, 0x10 -/* D9E87C 802413AC 14400002 */ bnez $v0, .L802413B8 -/* D9E880 802413B0 2402000C */ addiu $v0, $zero, 0xc -.L802413B4: -/* D9E884 802413B4 AE620070 */ sw $v0, 0x70($s3) -.L802413B8: -/* D9E888 802413B8 8FBF0040 */ lw $ra, 0x40($sp) -/* D9E88C 802413BC 8FB3003C */ lw $s3, 0x3c($sp) -/* D9E890 802413C0 8FB20038 */ lw $s2, 0x38($sp) -/* D9E894 802413C4 8FB10034 */ lw $s1, 0x34($sp) -/* D9E898 802413C8 8FB00030 */ lw $s0, 0x30($sp) -/* D9E89C 802413CC 03E00008 */ jr $ra -/* D9E8A0 802413D0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_802413D4_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_802413D4_D9D4D0.s deleted file mode 100644 index df3cb5f006..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_802413D4_D9D4D0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413D4_D9E8A4 -/* D9E8A4 802413D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9E8A8 802413D8 AFB00010 */ sw $s0, 0x10($sp) -/* D9E8AC 802413DC 0080802D */ daddu $s0, $a0, $zero -/* D9E8B0 802413E0 AFBF0014 */ sw $ra, 0x14($sp) -/* D9E8B4 802413E4 8E020148 */ lw $v0, 0x148($s0) -/* D9E8B8 802413E8 0C00EABB */ jal get_npc_unsafe -/* D9E8BC 802413EC 84440008 */ lh $a0, 8($v0) -/* D9E8C0 802413F0 9443008E */ lhu $v1, 0x8e($v0) -/* D9E8C4 802413F4 2463FFFF */ addiu $v1, $v1, -1 -/* D9E8C8 802413F8 A443008E */ sh $v1, 0x8e($v0) -/* D9E8CC 802413FC 00031C00 */ sll $v1, $v1, 0x10 -/* D9E8D0 80241400 14600002 */ bnez $v1, .L8024140C -/* D9E8D4 80241404 2402000F */ addiu $v0, $zero, 0xf -/* D9E8D8 80241408 AE020070 */ sw $v0, 0x70($s0) -.L8024140C: -/* D9E8DC 8024140C 8FBF0014 */ lw $ra, 0x14($sp) -/* D9E8E0 80241410 8FB00010 */ lw $s0, 0x10($sp) -/* D9E8E4 80241414 03E00008 */ jr $ra -/* D9E8E8 80241418 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_8024141C_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_8024141C_D9D4D0.s deleted file mode 100644 index 5959714936..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_8024141C_D9D4D0.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024141C_D9E8EC -/* D9E8EC 8024141C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D9E8F0 80241420 AFB10014 */ sw $s1, 0x14($sp) -/* D9E8F4 80241424 0080882D */ daddu $s1, $a0, $zero -/* D9E8F8 80241428 AFBF001C */ sw $ra, 0x1c($sp) -/* D9E8FC 8024142C AFB20018 */ sw $s2, 0x18($sp) -/* D9E900 80241430 AFB00010 */ sw $s0, 0x10($sp) -/* D9E904 80241434 8E300148 */ lw $s0, 0x148($s1) -/* D9E908 80241438 86040008 */ lh $a0, 8($s0) -/* D9E90C 8024143C 0C00EABB */ jal get_npc_unsafe -/* D9E910 80241440 00A0902D */ daddu $s2, $a1, $zero -/* D9E914 80241444 8E0300CC */ lw $v1, 0xcc($s0) -/* D9E918 80241448 8C630004 */ lw $v1, 4($v1) -/* D9E91C 8024144C 0040202D */ daddu $a0, $v0, $zero -/* D9E920 80241450 AC830028 */ sw $v1, 0x28($a0) -/* D9E924 80241454 8E0200D0 */ lw $v0, 0xd0($s0) -/* D9E928 80241458 8C420014 */ lw $v0, 0x14($v0) -/* D9E92C 8024145C 04410009 */ bgez $v0, .L80241484 -/* D9E930 80241460 00000000 */ nop -/* D9E934 80241464 C640000C */ lwc1 $f0, 0xc($s2) -/* D9E938 80241468 3C018024 */ lui $at, 0x8024 -/* D9E93C 8024146C D4227A18 */ ldc1 $f2, 0x7a18($at) -/* D9E940 80241470 46000021 */ cvt.d.s $f0, $f0 -/* D9E944 80241474 46220002 */ mul.d $f0, $f0, $f2 -/* D9E948 80241478 00000000 */ nop -/* D9E94C 8024147C 08090528 */ j .L802414A0 -/* D9E950 80241480 46200020 */ cvt.s.d $f0, $f0 -.L80241484: -/* D9E954 80241484 3C018024 */ lui $at, 0x8024 -/* D9E958 80241488 D4227A20 */ ldc1 $f2, 0x7a20($at) -/* D9E95C 8024148C 44820000 */ mtc1 $v0, $f0 -/* D9E960 80241490 00000000 */ nop -/* D9E964 80241494 46800021 */ cvt.d.w $f0, $f0 -/* D9E968 80241498 46220003 */ div.d $f0, $f0, $f2 -/* D9E96C 8024149C 46200020 */ cvt.s.d $f0, $f0 -.L802414A0: -/* D9E970 802414A0 E4800018 */ swc1 $f0, 0x18($a0) -/* D9E974 802414A4 24020010 */ addiu $v0, $zero, 0x10 -/* D9E978 802414A8 AE200074 */ sw $zero, 0x74($s1) -/* D9E97C 802414AC AE220070 */ sw $v0, 0x70($s1) -/* D9E980 802414B0 8FBF001C */ lw $ra, 0x1c($sp) -/* D9E984 802414B4 8FB20018 */ lw $s2, 0x18($sp) -/* D9E988 802414B8 8FB10014 */ lw $s1, 0x14($sp) -/* D9E98C 802414BC 8FB00010 */ lw $s0, 0x10($sp) -/* D9E990 802414C0 03E00008 */ jr $ra -/* D9E994 802414C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_802414C8_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_802414C8_D9D4D0.s deleted file mode 100644 index c6f89a1db8..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_802414C8_D9D4D0.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414C8_D9E998 -/* D9E998 802414C8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D9E99C 802414CC AFB3003C */ sw $s3, 0x3c($sp) -/* D9E9A0 802414D0 0080982D */ daddu $s3, $a0, $zero -/* D9E9A4 802414D4 AFBF0044 */ sw $ra, 0x44($sp) -/* D9E9A8 802414D8 AFB40040 */ sw $s4, 0x40($sp) -/* D9E9AC 802414DC AFB20038 */ sw $s2, 0x38($sp) -/* D9E9B0 802414E0 AFB10034 */ sw $s1, 0x34($sp) -/* D9E9B4 802414E4 AFB00030 */ sw $s0, 0x30($sp) -/* D9E9B8 802414E8 8E710148 */ lw $s1, 0x148($s3) -/* D9E9BC 802414EC 00A0902D */ daddu $s2, $a1, $zero -/* D9E9C0 802414F0 86240008 */ lh $a0, 8($s1) -/* D9E9C4 802414F4 0C00EABB */ jal get_npc_unsafe -/* D9E9C8 802414F8 00C0A02D */ daddu $s4, $a2, $zero -/* D9E9CC 802414FC 8E430008 */ lw $v1, 8($s2) -/* D9E9D0 80241500 0460003B */ bltz $v1, .L802415F0 -/* D9E9D4 80241504 0040802D */ daddu $s0, $v0, $zero -/* D9E9D8 80241508 8E620074 */ lw $v0, 0x74($s3) -/* D9E9DC 8024150C 1C400037 */ bgtz $v0, .L802415EC -/* D9E9E0 80241510 2442FFFF */ addiu $v0, $v0, -1 -/* D9E9E4 80241514 0280202D */ daddu $a0, $s4, $zero -/* D9E9E8 80241518 AE630074 */ sw $v1, 0x74($s3) -/* D9E9EC 8024151C AFA00010 */ sw $zero, 0x10($sp) -/* D9E9F0 80241520 8E460018 */ lw $a2, 0x18($s2) -/* D9E9F4 80241524 8E47001C */ lw $a3, 0x1c($s2) -/* D9E9F8 80241528 0C01242D */ jal func_800490B4 -/* D9E9FC 8024152C 0220282D */ daddu $a1, $s1, $zero -/* D9EA00 80241530 1040002C */ beqz $v0, .L802415E4 -/* D9EA04 80241534 0000202D */ daddu $a0, $zero, $zero -/* D9EA08 80241538 0200282D */ daddu $a1, $s0, $zero -/* D9EA0C 8024153C 0000302D */ daddu $a2, $zero, $zero -/* D9EA10 80241540 860300A8 */ lh $v1, 0xa8($s0) -/* D9EA14 80241544 3C013F80 */ lui $at, 0x3f80 -/* D9EA18 80241548 44810000 */ mtc1 $at, $f0 -/* D9EA1C 8024154C 3C014000 */ lui $at, 0x4000 -/* D9EA20 80241550 44811000 */ mtc1 $at, $f2 -/* D9EA24 80241554 3C01C1A0 */ lui $at, 0xc1a0 -/* D9EA28 80241558 44812000 */ mtc1 $at, $f4 -/* D9EA2C 8024155C 2402000F */ addiu $v0, $zero, 0xf -/* D9EA30 80241560 AFA2001C */ sw $v0, 0x1c($sp) -/* D9EA34 80241564 44833000 */ mtc1 $v1, $f6 -/* D9EA38 80241568 00000000 */ nop -/* D9EA3C 8024156C 468031A0 */ cvt.s.w $f6, $f6 -/* D9EA40 80241570 44073000 */ mfc1 $a3, $f6 -/* D9EA44 80241574 27A20028 */ addiu $v0, $sp, 0x28 -/* D9EA48 80241578 AFA20020 */ sw $v0, 0x20($sp) -/* D9EA4C 8024157C E7A00010 */ swc1 $f0, 0x10($sp) -/* D9EA50 80241580 E7A20014 */ swc1 $f2, 0x14($sp) -/* D9EA54 80241584 0C01BFA4 */ jal fx_emote -/* D9EA58 80241588 E7A40018 */ swc1 $f4, 0x18($sp) -/* D9EA5C 8024158C 0200202D */ daddu $a0, $s0, $zero -/* D9EA60 80241590 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D9EA64 80241594 0C012530 */ jal func_800494C0 -/* D9EA68 80241598 3C060020 */ lui $a2, 0x20 -/* D9EA6C 8024159C C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9EA70 802415A0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D9EA74 802415A4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D9EA78 802415A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9EA7C 802415AC 8C460028 */ lw $a2, 0x28($v0) -/* D9EA80 802415B0 0C00A720 */ jal atan2 -/* D9EA84 802415B4 8C470030 */ lw $a3, 0x30($v0) -/* D9EA88 802415B8 E600000C */ swc1 $f0, 0xc($s0) -/* D9EA8C 802415BC 8E220018 */ lw $v0, 0x18($s1) -/* D9EA90 802415C0 9442002A */ lhu $v0, 0x2a($v0) -/* D9EA94 802415C4 30420001 */ andi $v0, $v0, 1 -/* D9EA98 802415C8 10400003 */ beqz $v0, .L802415D8 -/* D9EA9C 802415CC 2402000A */ addiu $v0, $zero, 0xa -/* D9EAA0 802415D0 080905AC */ j .L802416B0 -/* D9EAA4 802415D4 AE620070 */ sw $v0, 0x70($s3) -.L802415D8: -/* D9EAA8 802415D8 2402000C */ addiu $v0, $zero, 0xc -/* D9EAAC 802415DC 080905AC */ j .L802416B0 -/* D9EAB0 802415E0 AE620070 */ sw $v0, 0x70($s3) -.L802415E4: -/* D9EAB4 802415E4 8E620074 */ lw $v0, 0x74($s3) -/* D9EAB8 802415E8 2442FFFF */ addiu $v0, $v0, -1 -.L802415EC: -/* D9EABC 802415EC AE620074 */ sw $v0, 0x74($s3) -.L802415F0: -/* D9EAC0 802415F0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9EAC4 802415F4 8E2200D0 */ lw $v0, 0xd0($s1) -/* D9EAC8 802415F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9EACC 802415FC C4460000 */ lwc1 $f6, ($v0) -/* D9EAD0 80241600 468031A0 */ cvt.s.w $f6, $f6 -/* D9EAD4 80241604 44063000 */ mfc1 $a2, $f6 -/* D9EAD8 80241608 C4460008 */ lwc1 $f6, 8($v0) -/* D9EADC 8024160C 468031A0 */ cvt.s.w $f6, $f6 -/* D9EAE0 80241610 44073000 */ mfc1 $a3, $f6 -/* D9EAE4 80241614 0C00A7B5 */ jal dist2D -/* D9EAE8 80241618 00000000 */ nop -/* D9EAEC 8024161C C6020018 */ lwc1 $f2, 0x18($s0) -/* D9EAF0 80241620 4602003C */ c.lt.s $f0, $f2 -/* D9EAF4 80241624 00000000 */ nop -/* D9EAF8 80241628 4500000E */ bc1f .L80241664 -/* D9EAFC 8024162C 00000000 */ nop -/* D9EB00 80241630 8E2200D0 */ lw $v0, 0xd0($s1) -/* D9EB04 80241634 C4400000 */ lwc1 $f0, ($v0) -/* D9EB08 80241638 46800020 */ cvt.s.w $f0, $f0 -/* D9EB0C 8024163C E6000038 */ swc1 $f0, 0x38($s0) -/* D9EB10 80241640 8E2200D0 */ lw $v0, 0xd0($s1) -/* D9EB14 80241644 C4400008 */ lwc1 $f0, 8($v0) -/* D9EB18 80241648 46800020 */ cvt.s.w $f0, $f0 -/* D9EB1C 8024164C E6000040 */ swc1 $f0, 0x40($s0) -/* D9EB20 80241650 8E2200D0 */ lw $v0, 0xd0($s1) -/* D9EB24 80241654 C440000C */ lwc1 $f0, 0xc($v0) -/* D9EB28 80241658 46800020 */ cvt.s.w $f0, $f0 -/* D9EB2C 8024165C E600000C */ swc1 $f0, 0xc($s0) -/* D9EB30 80241660 AE600070 */ sw $zero, 0x70($s3) -.L80241664: -/* D9EB34 80241664 8602008C */ lh $v0, 0x8c($s0) -/* D9EB38 80241668 14400011 */ bnez $v0, .L802416B0 -/* D9EB3C 8024166C 00000000 */ nop -/* D9EB40 80241670 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9EB44 80241674 8E2200D0 */ lw $v0, 0xd0($s1) -/* D9EB48 80241678 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9EB4C 8024167C C4460000 */ lwc1 $f6, ($v0) -/* D9EB50 80241680 468031A0 */ cvt.s.w $f6, $f6 -/* D9EB54 80241684 44063000 */ mfc1 $a2, $f6 -/* D9EB58 80241688 C4460008 */ lwc1 $f6, 8($v0) -/* D9EB5C 8024168C 468031A0 */ cvt.s.w $f6, $f6 -/* D9EB60 80241690 44073000 */ mfc1 $a3, $f6 -/* D9EB64 80241694 0C00A720 */ jal atan2 -/* D9EB68 80241698 00000000 */ nop -/* D9EB6C 8024169C 8E050018 */ lw $a1, 0x18($s0) -/* D9EB70 802416A0 44060000 */ mfc1 $a2, $f0 -/* D9EB74 802416A4 0200202D */ daddu $a0, $s0, $zero -/* D9EB78 802416A8 0C00EA95 */ jal npc_move_heading -/* D9EB7C 802416AC AC86000C */ sw $a2, 0xc($a0) -.L802416B0: -/* D9EB80 802416B0 8FBF0044 */ lw $ra, 0x44($sp) -/* D9EB84 802416B4 8FB40040 */ lw $s4, 0x40($sp) -/* D9EB88 802416B8 8FB3003C */ lw $s3, 0x3c($sp) -/* D9EB8C 802416BC 8FB20038 */ lw $s2, 0x38($sp) -/* D9EB90 802416C0 8FB10034 */ lw $s1, 0x34($sp) -/* D9EB94 802416C4 8FB00030 */ lw $s0, 0x30($sp) -/* D9EB98 802416C8 03E00008 */ jr $ra -/* D9EB9C 802416CC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_802416D0_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_802416D0_D9D4D0.s deleted file mode 100644 index 0c732b2580..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_802416D0_D9D4D0.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416D0_D9EBA0 -/* D9EBA0 802416D0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D9EBA4 802416D4 AFB40040 */ sw $s4, 0x40($sp) -/* D9EBA8 802416D8 0080A02D */ daddu $s4, $a0, $zero -/* D9EBAC 802416DC AFBF0048 */ sw $ra, 0x48($sp) -/* D9EBB0 802416E0 AFB50044 */ sw $s5, 0x44($sp) -/* D9EBB4 802416E4 AFB3003C */ sw $s3, 0x3c($sp) -/* D9EBB8 802416E8 AFB20038 */ sw $s2, 0x38($sp) -/* D9EBBC 802416EC AFB10034 */ sw $s1, 0x34($sp) -/* D9EBC0 802416F0 AFB00030 */ sw $s0, 0x30($sp) -/* D9EBC4 802416F4 8E920148 */ lw $s2, 0x148($s4) -/* D9EBC8 802416F8 86440008 */ lh $a0, 8($s2) -/* D9EBCC 802416FC 8E90000C */ lw $s0, 0xc($s4) -/* D9EBD0 80241700 0C00EABB */ jal get_npc_unsafe -/* D9EBD4 80241704 00A0882D */ daddu $s1, $a1, $zero -/* D9EBD8 80241708 0280202D */ daddu $a0, $s4, $zero -/* D9EBDC 8024170C 8E050000 */ lw $a1, ($s0) -/* D9EBE0 80241710 0C0B1EAF */ jal get_variable -/* D9EBE4 80241714 0040802D */ daddu $s0, $v0, $zero -/* D9EBE8 80241718 AFA00010 */ sw $zero, 0x10($sp) -/* D9EBEC 8024171C 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9EBF0 80241720 8C630030 */ lw $v1, 0x30($v1) -/* D9EBF4 80241724 AFA30014 */ sw $v1, 0x14($sp) -/* D9EBF8 80241728 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9EBFC 8024172C 8C63001C */ lw $v1, 0x1c($v1) -/* D9EC00 80241730 AFA30018 */ sw $v1, 0x18($sp) -/* D9EC04 80241734 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9EC08 80241738 8C630024 */ lw $v1, 0x24($v1) -/* D9EC0C 8024173C AFA3001C */ sw $v1, 0x1c($sp) -/* D9EC10 80241740 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9EC14 80241744 8C630028 */ lw $v1, 0x28($v1) -/* D9EC18 80241748 27B50010 */ addiu $s5, $sp, 0x10 -/* D9EC1C 8024174C AFA30020 */ sw $v1, 0x20($sp) -/* D9EC20 80241750 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9EC24 80241754 3C014282 */ lui $at, 0x4282 -/* D9EC28 80241758 44810000 */ mtc1 $at, $f0 -/* D9EC2C 8024175C 8C63002C */ lw $v1, 0x2c($v1) -/* D9EC30 80241760 0040982D */ daddu $s3, $v0, $zero -/* D9EC34 80241764 E7A00028 */ swc1 $f0, 0x28($sp) -/* D9EC38 80241768 A7A0002C */ sh $zero, 0x2c($sp) -/* D9EC3C 8024176C 16200005 */ bnez $s1, .L80241784 -/* D9EC40 80241770 AFA30024 */ sw $v1, 0x24($sp) -/* D9EC44 80241774 8E4200B0 */ lw $v0, 0xb0($s2) -/* D9EC48 80241778 30420004 */ andi $v0, $v0, 4 -/* D9EC4C 8024177C 1040002F */ beqz $v0, .L8024183C -/* D9EC50 80241780 00000000 */ nop -.L80241784: -/* D9EC54 80241784 AE800070 */ sw $zero, 0x70($s4) -/* D9EC58 80241788 C600000C */ lwc1 $f0, 0xc($s0) -/* D9EC5C 8024178C A600008E */ sh $zero, 0x8e($s0) -/* D9EC60 80241790 8E4200CC */ lw $v0, 0xcc($s2) -/* D9EC64 80241794 4600008D */ trunc.w.s $f2, $f0 -/* D9EC68 80241798 E642006C */ swc1 $f2, 0x6c($s2) -/* D9EC6C 8024179C 8C420000 */ lw $v0, ($v0) -/* D9EC70 802417A0 8E030000 */ lw $v1, ($s0) -/* D9EC74 802417A4 AE020028 */ sw $v0, 0x28($s0) -/* D9EC78 802417A8 2402F7FF */ addiu $v0, $zero, -0x801 -/* D9EC7C 802417AC 00621824 */ and $v1, $v1, $v0 -/* D9EC80 802417B0 AE030000 */ sw $v1, ($s0) -/* D9EC84 802417B4 8E4200D0 */ lw $v0, 0xd0($s2) -/* D9EC88 802417B8 8C420034 */ lw $v0, 0x34($v0) -/* D9EC8C 802417BC 54400005 */ bnel $v0, $zero, .L802417D4 -/* D9EC90 802417C0 2402FDFF */ addiu $v0, $zero, -0x201 -/* D9EC94 802417C4 34620200 */ ori $v0, $v1, 0x200 -/* D9EC98 802417C8 2403FFF7 */ addiu $v1, $zero, -9 -/* D9EC9C 802417CC 080905F7 */ j .L802417DC -/* D9ECA0 802417D0 00431024 */ and $v0, $v0, $v1 -.L802417D4: -/* D9ECA4 802417D4 00621024 */ and $v0, $v1, $v0 -/* D9ECA8 802417D8 34420008 */ ori $v0, $v0, 8 -.L802417DC: -/* D9ECAC 802417DC AE020000 */ sw $v0, ($s0) -/* D9ECB0 802417E0 8E4200B0 */ lw $v0, 0xb0($s2) -/* D9ECB4 802417E4 30420004 */ andi $v0, $v0, 4 -/* D9ECB8 802417E8 10400009 */ beqz $v0, .L80241810 -/* D9ECBC 802417EC 24020063 */ addiu $v0, $zero, 0x63 -/* D9ECC0 802417F0 AE820070 */ sw $v0, 0x70($s4) -/* D9ECC4 802417F4 2402000F */ addiu $v0, $zero, 0xf -/* D9ECC8 802417F8 AE820074 */ sw $v0, 0x74($s4) -/* D9ECCC 802417FC 8E4200B0 */ lw $v0, 0xb0($s2) -/* D9ECD0 80241800 2403FFFB */ addiu $v1, $zero, -5 -/* D9ECD4 80241804 00431024 */ and $v0, $v0, $v1 -/* D9ECD8 80241808 0809060F */ j .L8024183C -/* D9ECDC 8024180C AE4200B0 */ sw $v0, 0xb0($s2) -.L80241810: -/* D9ECE0 80241810 8E420000 */ lw $v0, ($s2) -/* D9ECE4 80241814 3C034000 */ lui $v1, 0x4000 -/* D9ECE8 80241818 00431024 */ and $v0, $v0, $v1 -/* D9ECEC 8024181C 10400007 */ beqz $v0, .L8024183C -/* D9ECF0 80241820 3C03BFFF */ lui $v1, 0xbfff -/* D9ECF4 80241824 2402000C */ addiu $v0, $zero, 0xc -/* D9ECF8 80241828 AE820070 */ sw $v0, 0x70($s4) -/* D9ECFC 8024182C 8E420000 */ lw $v0, ($s2) -/* D9ED00 80241830 3463FFFF */ ori $v1, $v1, 0xffff -/* D9ED04 80241834 00431024 */ and $v0, $v0, $v1 -/* D9ED08 80241838 AE420000 */ sw $v0, ($s2) -.L8024183C: -/* D9ED0C 8024183C 8E830070 */ lw $v1, 0x70($s4) -/* D9ED10 80241840 2C620064 */ sltiu $v0, $v1, 0x64 -/* D9ED14 80241844 10400036 */ beqz $v0, .L80241920 -/* D9ED18 80241848 00031080 */ sll $v0, $v1, 2 -/* D9ED1C 8024184C 3C018024 */ lui $at, 0x8024 -/* D9ED20 80241850 00220821 */ addu $at, $at, $v0 -/* D9ED24 80241854 8C227A28 */ lw $v0, 0x7a28($at) -/* D9ED28 80241858 00400008 */ jr $v0 -/* D9ED2C 8024185C 00000000 */ nop -/* D9ED30 80241860 0280202D */ daddu $a0, $s4, $zero -/* D9ED34 80241864 0260282D */ daddu $a1, $s3, $zero -/* D9ED38 80241868 0C0903B7 */ jal func_80240EDC -/* D9ED3C 8024186C 02A0302D */ daddu $a2, $s5, $zero -/* D9ED40 80241870 0280202D */ daddu $a0, $s4, $zero -/* D9ED44 80241874 0260282D */ daddu $a1, $s3, $zero -/* D9ED48 80241878 0C0903E4 */ jal func_80240F90 -/* D9ED4C 8024187C 02A0302D */ daddu $a2, $s5, $zero -/* D9ED50 80241880 08090648 */ j .L80241920 -/* D9ED54 80241884 00000000 */ nop -/* D9ED58 80241888 0280202D */ daddu $a0, $s4, $zero -/* D9ED5C 8024188C 0260282D */ daddu $a1, $s3, $zero -/* D9ED60 80241890 0C09042C */ jal func_802410B0 -/* D9ED64 80241894 02A0302D */ daddu $a2, $s5, $zero -/* D9ED68 80241898 0280202D */ daddu $a0, $s4, $zero -/* D9ED6C 8024189C 0260282D */ daddu $a1, $s3, $zero -/* D9ED70 802418A0 0C090444 */ jal func_80241110 -/* D9ED74 802418A4 02A0302D */ daddu $a2, $s5, $zero -/* D9ED78 802418A8 08090648 */ j .L80241920 -/* D9ED7C 802418AC 00000000 */ nop -/* D9ED80 802418B0 0280202D */ daddu $a0, $s4, $zero -/* D9ED84 802418B4 0260282D */ daddu $a1, $s3, $zero -/* D9ED88 802418B8 0C090462 */ jal func_80241188 -/* D9ED8C 802418BC 02A0302D */ daddu $a2, $s5, $zero -/* D9ED90 802418C0 0280202D */ daddu $a0, $s4, $zero -/* D9ED94 802418C4 0260282D */ daddu $a1, $s3, $zero -/* D9ED98 802418C8 0C0904AE */ jal func_802412B8 -/* D9ED9C 802418CC 02A0302D */ daddu $a2, $s5, $zero -/* D9EDA0 802418D0 08090648 */ j .L80241920 -/* D9EDA4 802418D4 00000000 */ nop -/* D9EDA8 802418D8 0280202D */ daddu $a0, $s4, $zero -/* D9EDAC 802418DC 0260282D */ daddu $a1, $s3, $zero -/* D9EDB0 802418E0 0C0904F5 */ jal func_802413D4 -/* D9EDB4 802418E4 02A0302D */ daddu $a2, $s5, $zero -/* D9EDB8 802418E8 08090648 */ j .L80241920 -/* D9EDBC 802418EC 00000000 */ nop -/* D9EDC0 802418F0 0280202D */ daddu $a0, $s4, $zero -/* D9EDC4 802418F4 0260282D */ daddu $a1, $s3, $zero -/* D9EDC8 802418F8 0C090507 */ jal func_8024141C -/* D9EDCC 802418FC 02A0302D */ daddu $a2, $s5, $zero -/* D9EDD0 80241900 0280202D */ daddu $a0, $s4, $zero -/* D9EDD4 80241904 0260282D */ daddu $a1, $s3, $zero -/* D9EDD8 80241908 0C090532 */ jal func_802414C8 -/* D9EDDC 8024190C 02A0302D */ daddu $a2, $s5, $zero -/* D9EDE0 80241910 08090648 */ j .L80241920 -/* D9EDE4 80241914 00000000 */ nop -/* D9EDE8 80241918 0C0129CF */ jal func_8004A73C -/* D9EDEC 8024191C 0280202D */ daddu $a0, $s4, $zero -.L80241920: -/* D9EDF0 80241920 8FBF0048 */ lw $ra, 0x48($sp) -/* D9EDF4 80241924 8FB50044 */ lw $s5, 0x44($sp) -/* D9EDF8 80241928 8FB40040 */ lw $s4, 0x40($sp) -/* D9EDFC 8024192C 8FB3003C */ lw $s3, 0x3c($sp) -/* D9EE00 80241930 8FB20038 */ lw $s2, 0x38($sp) -/* D9EE04 80241934 8FB10034 */ lw $s1, 0x34($sp) -/* D9EE08 80241938 8FB00030 */ lw $s0, 0x30($sp) -/* D9EE0C 8024193C 0000102D */ daddu $v0, $zero, $zero -/* D9EE10 80241940 03E00008 */ jr $ra -/* D9EE14 80241944 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_80241948_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_80241948_D9D4D0.s deleted file mode 100644 index 55cfde6609..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_80241948_D9D4D0.s +++ /dev/null @@ -1,134 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241948_D9EE18 -/* D9EE18 80241948 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D9EE1C 8024194C AFB10014 */ sw $s1, 0x14($sp) -/* D9EE20 80241950 0080882D */ daddu $s1, $a0, $zero -/* D9EE24 80241954 3C05800B */ lui $a1, %hi(gCameras) -/* D9EE28 80241958 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* D9EE2C 8024195C AFBF0020 */ sw $ra, 0x20($sp) -/* D9EE30 80241960 AFB3001C */ sw $s3, 0x1c($sp) -/* D9EE34 80241964 AFB20018 */ sw $s2, 0x18($sp) -/* D9EE38 80241968 AFB00010 */ sw $s0, 0x10($sp) -/* D9EE3C 8024196C F7B40028 */ sdc1 $f20, 0x28($sp) -/* D9EE40 80241970 8E330148 */ lw $s3, 0x148($s1) -/* D9EE44 80241974 3C03800A */ lui $v1, 0x800a -/* D9EE48 80241978 8463A634 */ lh $v1, -0x59cc($v1) -/* D9EE4C 8024197C 8E30000C */ lw $s0, 0xc($s1) -/* D9EE50 80241980 00031080 */ sll $v0, $v1, 2 -/* D9EE54 80241984 00431021 */ addu $v0, $v0, $v1 -/* D9EE58 80241988 00021080 */ sll $v0, $v0, 2 -/* D9EE5C 8024198C 00431023 */ subu $v0, $v0, $v1 -/* D9EE60 80241990 000218C0 */ sll $v1, $v0, 3 -/* D9EE64 80241994 00431021 */ addu $v0, $v0, $v1 -/* D9EE68 80241998 000210C0 */ sll $v0, $v0, 3 -/* D9EE6C 8024199C 86640008 */ lh $a0, 8($s3) -/* D9EE70 802419A0 0C00EABB */ jal get_npc_unsafe -/* D9EE74 802419A4 00459021 */ addu $s2, $v0, $a1 -/* D9EE78 802419A8 0220202D */ daddu $a0, $s1, $zero -/* D9EE7C 802419AC 8E050000 */ lw $a1, ($s0) -/* D9EE80 802419B0 0C0B1EAF */ jal get_variable -/* D9EE84 802419B4 0040802D */ daddu $s0, $v0, $zero -/* D9EE88 802419B8 0260202D */ daddu $a0, $s3, $zero -/* D9EE8C 802419BC 8C460024 */ lw $a2, 0x24($v0) -/* D9EE90 802419C0 8C470028 */ lw $a3, 0x28($v0) -/* D9EE94 802419C4 0C0124FB */ jal func_800493EC -/* D9EE98 802419C8 0000282D */ daddu $a1, $zero, $zero -/* D9EE9C 802419CC 10400052 */ beqz $v0, .L80241B18 -/* D9EEA0 802419D0 2402FFFF */ addiu $v0, $zero, -1 -/* D9EEA4 802419D4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* D9EEA8 802419D8 C60E000C */ lwc1 $f14, 0xc($s0) -/* D9EEAC 802419DC 3C014387 */ lui $at, 0x4387 -/* D9EEB0 802419E0 4481A000 */ mtc1 $at, $f20 -/* D9EEB4 802419E4 0C00A70A */ jal get_clamped_angle_diff -/* D9EEB8 802419E8 00000000 */ nop -/* D9EEBC 802419EC 0C00A6C9 */ jal clamp_angle -/* D9EEC0 802419F0 46000306 */ mov.s $f12, $f0 -/* D9EEC4 802419F4 3C018024 */ lui $at, 0x8024 -/* D9EEC8 802419F8 D4227BB8 */ ldc1 $f2, 0x7bb8($at) -/* D9EECC 802419FC 46000021 */ cvt.d.s $f0, $f0 -/* D9EED0 80241A00 4622003C */ c.lt.d $f0, $f2 -/* D9EED4 80241A04 00000000 */ nop -/* D9EED8 80241A08 45000003 */ bc1f .L80241A18 -/* D9EEDC 80241A0C 00000000 */ nop -/* D9EEE0 80241A10 3C0142B4 */ lui $at, 0x42b4 -/* D9EEE4 80241A14 4481A000 */ mtc1 $at, $f20 -.L80241A18: -/* D9EEE8 80241A18 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* D9EEEC 80241A1C 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* D9EEF0 80241A20 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9EEF4 80241A24 8E220000 */ lw $v0, ($s1) -/* D9EEF8 80241A28 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9EEFC 80241A2C 8C460028 */ lw $a2, 0x28($v0) -/* D9EF00 80241A30 0C00A720 */ jal atan2 -/* D9EF04 80241A34 8C470030 */ lw $a3, 0x30($v0) -/* D9EF08 80241A38 4600A306 */ mov.s $f12, $f20 -/* D9EF0C 80241A3C 0C00A70A */ jal get_clamped_angle_diff -/* D9EF10 80241A40 46000386 */ mov.s $f14, $f0 -/* D9EF14 80241A44 46000005 */ abs.s $f0, $f0 -/* D9EF18 80241A48 3C018024 */ lui $at, 0x8024 -/* D9EF1C 80241A4C D4227BC0 */ ldc1 $f2, 0x7bc0($at) -/* D9EF20 80241A50 46000021 */ cvt.d.s $f0, $f0 -/* D9EF24 80241A54 4620103C */ c.lt.d $f2, $f0 -/* D9EF28 80241A58 00000000 */ nop -/* D9EF2C 80241A5C 4501002E */ bc1t .L80241B18 -/* D9EF30 80241A60 2402FFFF */ addiu $v0, $zero, -1 -/* D9EF34 80241A64 8E220000 */ lw $v0, ($s1) -/* D9EF38 80241A68 C600003C */ lwc1 $f0, 0x3c($s0) -/* D9EF3C 80241A6C C442002C */ lwc1 $f2, 0x2c($v0) -/* D9EF40 80241A70 860200A8 */ lh $v0, 0xa8($s0) -/* D9EF44 80241A74 46020001 */ sub.s $f0, $f0, $f2 -/* D9EF48 80241A78 44821000 */ mtc1 $v0, $f2 -/* D9EF4C 80241A7C 00000000 */ nop -/* D9EF50 80241A80 468010A1 */ cvt.d.w $f2, $f2 -/* D9EF54 80241A84 46221080 */ add.d $f2, $f2, $f2 -/* D9EF58 80241A88 46000005 */ abs.s $f0, $f0 -/* D9EF5C 80241A8C 46000021 */ cvt.d.s $f0, $f0 -/* D9EF60 80241A90 4620103E */ c.le.d $f2, $f0 -/* D9EF64 80241A94 00000000 */ nop -/* D9EF68 80241A98 4501001F */ bc1t .L80241B18 -/* D9EF6C 80241A9C 2402FFFF */ addiu $v0, $zero, -1 -/* D9EF70 80241AA0 3C038011 */ lui $v1, 0x8011 -/* D9EF74 80241AA4 8063EBB3 */ lb $v1, -0x144d($v1) -/* D9EF78 80241AA8 24020009 */ addiu $v0, $zero, 9 -/* D9EF7C 80241AAC 10620019 */ beq $v1, $v0, .L80241B14 -/* D9EF80 80241AB0 24020007 */ addiu $v0, $zero, 7 -/* D9EF84 80241AB4 14620005 */ bne $v1, $v0, .L80241ACC -/* D9EF88 80241AB8 2402FFFF */ addiu $v0, $zero, -1 -/* D9EF8C 80241ABC 080906C6 */ j .L80241B18 -/* D9EF90 80241AC0 00000000 */ nop -.L80241AC4: -/* D9EF94 80241AC4 080906C6 */ j .L80241B18 -/* D9EF98 80241AC8 0240102D */ daddu $v0, $s2, $zero -.L80241ACC: -/* D9EF9C 80241ACC 8E620078 */ lw $v0, 0x78($s3) -/* D9EFA0 80241AD0 18400010 */ blez $v0, .L80241B14 -/* D9EFA4 80241AD4 0000882D */ daddu $s1, $zero, $zero -.L80241AD8: -/* D9EFA8 80241AD8 86620008 */ lh $v0, 8($s3) -/* D9EFAC 80241ADC 00511021 */ addu $v0, $v0, $s1 -/* D9EFB0 80241AE0 24520001 */ addiu $s2, $v0, 1 -/* D9EFB4 80241AE4 0C00FB3A */ jal get_enemy -/* D9EFB8 80241AE8 0240202D */ daddu $a0, $s2, $zero -/* D9EFBC 80241AEC 0240202D */ daddu $a0, $s2, $zero -/* D9EFC0 80241AF0 0C00EABB */ jal get_npc_unsafe -/* D9EFC4 80241AF4 0040802D */ daddu $s0, $v0, $zero -/* D9EFC8 80241AF8 8E02006C */ lw $v0, 0x6c($s0) -/* D9EFCC 80241AFC 1040FFF1 */ beqz $v0, .L80241AC4 -/* D9EFD0 80241B00 26310001 */ addiu $s1, $s1, 1 -/* D9EFD4 80241B04 8E620078 */ lw $v0, 0x78($s3) -/* D9EFD8 80241B08 0222102A */ slt $v0, $s1, $v0 -/* D9EFDC 80241B0C 1440FFF2 */ bnez $v0, .L80241AD8 -/* D9EFE0 80241B10 00000000 */ nop -.L80241B14: -/* D9EFE4 80241B14 2402FFFF */ addiu $v0, $zero, -1 -.L80241B18: -/* D9EFE8 80241B18 8FBF0020 */ lw $ra, 0x20($sp) -/* D9EFEC 80241B1C 8FB3001C */ lw $s3, 0x1c($sp) -/* D9EFF0 80241B20 8FB20018 */ lw $s2, 0x18($sp) -/* D9EFF4 80241B24 8FB10014 */ lw $s1, 0x14($sp) -/* D9EFF8 80241B28 8FB00010 */ lw $s0, 0x10($sp) -/* D9EFFC 80241B2C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D9F000 80241B30 03E00008 */ jr $ra -/* D9F004 80241B34 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_80241B38_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_80241B38_D9D4D0.s deleted file mode 100644 index 08a531abb9..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_80241B38_D9D4D0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B38_D9F008 -/* D9F008 80241B38 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D9F00C 80241B3C AFB20038 */ sw $s2, 0x38($sp) -/* D9F010 80241B40 0080902D */ daddu $s2, $a0, $zero -/* D9F014 80241B44 AFB00030 */ sw $s0, 0x30($sp) -/* D9F018 80241B48 AFBF003C */ sw $ra, 0x3c($sp) -/* D9F01C 80241B4C AFB10034 */ sw $s1, 0x34($sp) -/* D9F020 80241B50 F7B60048 */ sdc1 $f22, 0x48($sp) -/* D9F024 80241B54 F7B40040 */ sdc1 $f20, 0x40($sp) -/* D9F028 80241B58 8E510148 */ lw $s1, 0x148($s2) -/* D9F02C 80241B5C 4485A000 */ mtc1 $a1, $f20 -/* D9F030 80241B60 86240008 */ lh $a0, 8($s1) -/* D9F034 80241B64 4486B000 */ mtc1 $a2, $f22 -/* D9F038 80241B68 0C00EABB */ jal get_npc_unsafe -/* D9F03C 80241B6C 00E0802D */ daddu $s0, $a3, $zero -/* D9F040 80241B70 0200202D */ daddu $a0, $s0, $zero -/* D9F044 80241B74 0220282D */ daddu $a1, $s1, $zero -/* D9F048 80241B78 24030001 */ addiu $v1, $zero, 1 -/* D9F04C 80241B7C 4406A000 */ mfc1 $a2, $f20 -/* D9F050 80241B80 4407B000 */ mfc1 $a3, $f22 -/* D9F054 80241B84 0040802D */ daddu $s0, $v0, $zero -/* D9F058 80241B88 0C01242D */ jal func_800490B4 -/* D9F05C 80241B8C AFA30010 */ sw $v1, 0x10($sp) -/* D9F060 80241B90 1440001D */ bnez $v0, .L80241C08 -/* D9F064 80241B94 24040002 */ addiu $a0, $zero, 2 -/* D9F068 80241B98 0200282D */ daddu $a1, $s0, $zero -/* D9F06C 80241B9C 0000302D */ daddu $a2, $zero, $zero -/* D9F070 80241BA0 860300A8 */ lh $v1, 0xa8($s0) -/* D9F074 80241BA4 3C013F80 */ lui $at, 0x3f80 -/* D9F078 80241BA8 44810000 */ mtc1 $at, $f0 -/* D9F07C 80241BAC 3C014000 */ lui $at, 0x4000 -/* D9F080 80241BB0 44811000 */ mtc1 $at, $f2 -/* D9F084 80241BB4 3C01C1A0 */ lui $at, 0xc1a0 -/* D9F088 80241BB8 44812000 */ mtc1 $at, $f4 -/* D9F08C 80241BBC 2402000F */ addiu $v0, $zero, 0xf -/* D9F090 80241BC0 AFA2001C */ sw $v0, 0x1c($sp) -/* D9F094 80241BC4 44833000 */ mtc1 $v1, $f6 -/* D9F098 80241BC8 00000000 */ nop -/* D9F09C 80241BCC 468031A0 */ cvt.s.w $f6, $f6 -/* D9F0A0 80241BD0 44073000 */ mfc1 $a3, $f6 -/* D9F0A4 80241BD4 27A20028 */ addiu $v0, $sp, 0x28 -/* D9F0A8 80241BD8 AFA20020 */ sw $v0, 0x20($sp) -/* D9F0AC 80241BDC E7A00010 */ swc1 $f0, 0x10($sp) -/* D9F0B0 80241BE0 E7A20014 */ swc1 $f2, 0x14($sp) -/* D9F0B4 80241BE4 0C01BFA4 */ jal fx_emote -/* D9F0B8 80241BE8 E7A40018 */ swc1 $f4, 0x18($sp) -/* D9F0BC 80241BEC 8E2200CC */ lw $v0, 0xcc($s1) -/* D9F0C0 80241BF0 8C430000 */ lw $v1, ($v0) -/* D9F0C4 80241BF4 24020014 */ addiu $v0, $zero, 0x14 -/* D9F0C8 80241BF8 A602008E */ sh $v0, 0x8e($s0) -/* D9F0CC 80241BFC 24020021 */ addiu $v0, $zero, 0x21 -/* D9F0D0 80241C00 08090716 */ j .L80241C58 -/* D9F0D4 80241C04 AE030028 */ sw $v1, 0x28($s0) -.L80241C08: -/* D9F0D8 80241C08 0C090652 */ jal func_80241948 -/* D9F0DC 80241C0C 0240202D */ daddu $a0, $s2, $zero -/* D9F0E0 80241C10 0040202D */ daddu $a0, $v0, $zero -/* D9F0E4 80241C14 2402FFFF */ addiu $v0, $zero, -1 -/* D9F0E8 80241C18 10820010 */ beq $a0, $v0, .L80241C5C -/* D9F0EC 80241C1C 00000000 */ nop -/* D9F0F0 80241C20 0C00FB3A */ jal get_enemy -/* D9F0F4 80241C24 00000000 */ nop -/* D9F0F8 80241C28 8C42006C */ lw $v0, 0x6c($v0) -/* D9F0FC 80241C2C 1440000B */ bnez $v0, .L80241C5C -/* D9F100 80241C30 00000000 */ nop -/* D9F104 80241C34 8602008C */ lh $v0, 0x8c($s0) -/* D9F108 80241C38 14400008 */ bnez $v0, .L80241C5C -/* D9F10C 80241C3C 00000000 */ nop -/* D9F110 80241C40 8E2200CC */ lw $v0, 0xcc($s1) -/* D9F114 80241C44 8C420020 */ lw $v0, 0x20($v0) -/* D9F118 80241C48 AE020028 */ sw $v0, 0x28($s0) -/* D9F11C 80241C4C 96220072 */ lhu $v0, 0x72($s1) -/* D9F120 80241C50 A602008E */ sh $v0, 0x8e($s0) -/* D9F124 80241C54 2402001E */ addiu $v0, $zero, 0x1e -.L80241C58: -/* D9F128 80241C58 AE420070 */ sw $v0, 0x70($s2) -.L80241C5C: -/* D9F12C 80241C5C 8FBF003C */ lw $ra, 0x3c($sp) -/* D9F130 80241C60 8FB20038 */ lw $s2, 0x38($sp) -/* D9F134 80241C64 8FB10034 */ lw $s1, 0x34($sp) -/* D9F138 80241C68 8FB00030 */ lw $s0, 0x30($sp) -/* D9F13C 80241C6C D7B60048 */ ldc1 $f22, 0x48($sp) -/* D9F140 80241C70 D7B40040 */ ldc1 $f20, 0x40($sp) -/* D9F144 80241C74 03E00008 */ jr $ra -/* D9F148 80241C78 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_80241C7C_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_80241C7C_D9D4D0.s deleted file mode 100644 index 960f258344..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_80241C7C_D9D4D0.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C7C_D9F14C -/* D9F14C 80241C7C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D9F150 80241C80 AFB20038 */ sw $s2, 0x38($sp) -/* D9F154 80241C84 0080902D */ daddu $s2, $a0, $zero -/* D9F158 80241C88 AFBF003C */ sw $ra, 0x3c($sp) -/* D9F15C 80241C8C AFB10034 */ sw $s1, 0x34($sp) -/* D9F160 80241C90 AFB00030 */ sw $s0, 0x30($sp) -/* D9F164 80241C94 8E510148 */ lw $s1, 0x148($s2) -/* D9F168 80241C98 0C00EABB */ jal get_npc_unsafe -/* D9F16C 80241C9C 86240008 */ lh $a0, 8($s1) -/* D9F170 80241CA0 0040802D */ daddu $s0, $v0, $zero -/* D9F174 80241CA4 9602008E */ lhu $v0, 0x8e($s0) -/* D9F178 80241CA8 2442FFFF */ addiu $v0, $v0, -1 -/* D9F17C 80241CAC A602008E */ sh $v0, 0x8e($s0) -/* D9F180 80241CB0 00021400 */ sll $v0, $v0, 0x10 -/* D9F184 80241CB4 1C40002B */ bgtz $v0, .L80241D64 -/* D9F188 80241CB8 00000000 */ nop -/* D9F18C 80241CBC 0C090652 */ jal func_80241948 -/* D9F190 80241CC0 0240202D */ daddu $a0, $s2, $zero -/* D9F194 80241CC4 0040202D */ daddu $a0, $v0, $zero -/* D9F198 80241CC8 0481001A */ bgez $a0, .L80241D34 -/* D9F19C 80241CCC 2402000F */ addiu $v0, $zero, 0xf -/* D9F1A0 80241CD0 24040002 */ addiu $a0, $zero, 2 -/* D9F1A4 80241CD4 860300A8 */ lh $v1, 0xa8($s0) -/* D9F1A8 80241CD8 AFA2001C */ sw $v0, 0x1c($sp) -/* D9F1AC 80241CDC 27A20028 */ addiu $v0, $sp, 0x28 -/* D9F1B0 80241CE0 0200282D */ daddu $a1, $s0, $zero -/* D9F1B4 80241CE4 3C013F80 */ lui $at, 0x3f80 -/* D9F1B8 80241CE8 44810000 */ mtc1 $at, $f0 -/* D9F1BC 80241CEC 3C014000 */ lui $at, 0x4000 -/* D9F1C0 80241CF0 44811000 */ mtc1 $at, $f2 -/* D9F1C4 80241CF4 3C01C1A0 */ lui $at, 0xc1a0 -/* D9F1C8 80241CF8 44812000 */ mtc1 $at, $f4 -/* D9F1CC 80241CFC 44833000 */ mtc1 $v1, $f6 -/* D9F1D0 80241D00 00000000 */ nop -/* D9F1D4 80241D04 468031A0 */ cvt.s.w $f6, $f6 -/* D9F1D8 80241D08 44073000 */ mfc1 $a3, $f6 -/* D9F1DC 80241D0C 0000302D */ daddu $a2, $zero, $zero -/* D9F1E0 80241D10 AFA20020 */ sw $v0, 0x20($sp) -/* D9F1E4 80241D14 E7A00010 */ swc1 $f0, 0x10($sp) -/* D9F1E8 80241D18 E7A20014 */ swc1 $f2, 0x14($sp) -/* D9F1EC 80241D1C 0C01BFA4 */ jal fx_emote -/* D9F1F0 80241D20 E7A40018 */ swc1 $f4, 0x18($sp) -/* D9F1F4 80241D24 8E2200CC */ lw $v0, 0xcc($s1) -/* D9F1F8 80241D28 8C420000 */ lw $v0, ($v0) -/* D9F1FC 80241D2C 08090755 */ j .L80241D54 -/* D9F200 80241D30 AE020028 */ sw $v0, 0x28($s0) -.L80241D34: -/* D9F204 80241D34 8E2200CC */ lw $v0, 0xcc($s1) -/* D9F208 80241D38 8C420024 */ lw $v0, 0x24($v0) -/* D9F20C 80241D3C 0C00FB3A */ jal get_enemy -/* D9F210 80241D40 AE020028 */ sw $v0, 0x28($s0) -/* D9F214 80241D44 86240008 */ lh $a0, 8($s1) -/* D9F218 80241D48 24030001 */ addiu $v1, $zero, 1 -/* D9F21C 80241D4C AC43006C */ sw $v1, 0x6c($v0) -/* D9F220 80241D50 AC44007C */ sw $a0, 0x7c($v0) -.L80241D54: -/* D9F224 80241D54 96220076 */ lhu $v0, 0x76($s1) -/* D9F228 80241D58 A602008E */ sh $v0, 0x8e($s0) -/* D9F22C 80241D5C 24020021 */ addiu $v0, $zero, 0x21 -/* D9F230 80241D60 AE420070 */ sw $v0, 0x70($s2) -.L80241D64: -/* D9F234 80241D64 8FBF003C */ lw $ra, 0x3c($sp) -/* D9F238 80241D68 8FB20038 */ lw $s2, 0x38($sp) -/* D9F23C 80241D6C 8FB10034 */ lw $s1, 0x34($sp) -/* D9F240 80241D70 8FB00030 */ lw $s0, 0x30($sp) -/* D9F244 80241D74 03E00008 */ jr $ra -/* D9F248 80241D78 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_80241D7C_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_80241D7C_D9D4D0.s deleted file mode 100644 index e21409c4d8..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_80241D7C_D9D4D0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D7C_D9F24C -/* D9F24C 80241D7C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D9F250 80241D80 AFB10014 */ sw $s1, 0x14($sp) -/* D9F254 80241D84 0080882D */ daddu $s1, $a0, $zero -/* D9F258 80241D88 AFBF0018 */ sw $ra, 0x18($sp) -/* D9F25C 80241D8C AFB00010 */ sw $s0, 0x10($sp) -/* D9F260 80241D90 8E300148 */ lw $s0, 0x148($s1) -/* D9F264 80241D94 0C00EABB */ jal get_npc_unsafe -/* D9F268 80241D98 86040008 */ lh $a0, 8($s0) -/* D9F26C 80241D9C 96030076 */ lhu $v1, 0x76($s0) -/* D9F270 80241DA0 A443008E */ sh $v1, 0x8e($v0) -/* D9F274 80241DA4 24020021 */ addiu $v0, $zero, 0x21 -/* D9F278 80241DA8 AE220070 */ sw $v0, 0x70($s1) -/* D9F27C 80241DAC 8FBF0018 */ lw $ra, 0x18($sp) -/* D9F280 80241DB0 8FB10014 */ lw $s1, 0x14($sp) -/* D9F284 80241DB4 8FB00010 */ lw $s0, 0x10($sp) -/* D9F288 80241DB8 03E00008 */ jr $ra -/* D9F28C 80241DBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_02/func_80241DC0_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/func_80241DC0_D9D4D0.s deleted file mode 100644 index d18cad6ff8..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/func_80241DC0_D9D4D0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DC0_D9F290 -/* D9F290 80241DC0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D9F294 80241DC4 AFB3001C */ sw $s3, 0x1c($sp) -/* D9F298 80241DC8 0080982D */ daddu $s3, $a0, $zero -/* D9F29C 80241DCC AFBF0020 */ sw $ra, 0x20($sp) -/* D9F2A0 80241DD0 AFB20018 */ sw $s2, 0x18($sp) -/* D9F2A4 80241DD4 AFB10014 */ sw $s1, 0x14($sp) -/* D9F2A8 80241DD8 AFB00010 */ sw $s0, 0x10($sp) -/* D9F2AC 80241DDC 8E720148 */ lw $s2, 0x148($s3) -/* D9F2B0 80241DE0 0C00EABB */ jal get_npc_unsafe -/* D9F2B4 80241DE4 86440008 */ lh $a0, 8($s2) -/* D9F2B8 80241DE8 86440008 */ lh $a0, 8($s2) -/* D9F2BC 80241DEC 0040882D */ daddu $s1, $v0, $zero -/* D9F2C0 80241DF0 0C00FB3A */ jal get_enemy -/* D9F2C4 80241DF4 24840001 */ addiu $a0, $a0, 1 -/* D9F2C8 80241DF8 0040802D */ daddu $s0, $v0, $zero -/* D9F2CC 80241DFC 0C00EABB */ jal get_npc_unsafe -/* D9F2D0 80241E00 86040008 */ lh $a0, 8($s0) -/* D9F2D4 80241E04 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D9F2D8 80241E08 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D9F2DC 80241E0C 8C460038 */ lw $a2, 0x38($v0) -/* D9F2E0 80241E10 0C00A720 */ jal atan2 -/* D9F2E4 80241E14 8C470040 */ lw $a3, 0x40($v0) -/* D9F2E8 80241E18 E620000C */ swc1 $f0, 0xc($s1) -/* D9F2EC 80241E1C 8E02006C */ lw $v0, 0x6c($s0) -/* D9F2F0 80241E20 14400008 */ bnez $v0, .L80241E44 -/* D9F2F4 80241E24 00000000 */ nop -/* D9F2F8 80241E28 8E4200CC */ lw $v0, 0xcc($s2) -/* D9F2FC 80241E2C 8C420000 */ lw $v0, ($v0) -/* D9F300 80241E30 AE220028 */ sw $v0, 0x28($s1) -/* D9F304 80241E34 96420076 */ lhu $v0, 0x76($s2) -/* D9F308 80241E38 A622008E */ sh $v0, 0x8e($s1) -/* D9F30C 80241E3C 24020021 */ addiu $v0, $zero, 0x21 -/* D9F310 80241E40 AE620070 */ sw $v0, 0x70($s3) -.L80241E44: -/* D9F314 80241E44 8FBF0020 */ lw $ra, 0x20($sp) -/* D9F318 80241E48 8FB3001C */ lw $s3, 0x1c($sp) -/* D9F31C 80241E4C 8FB20018 */ lw $s2, 0x18($sp) -/* D9F320 80241E50 8FB10014 */ lw $s1, 0x14($sp) -/* D9F324 80241E54 8FB00010 */ lw $s0, 0x10($sp) -/* D9F328 80241E58 03E00008 */ jr $ra -/* D9F32C 80241E5C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_03/func_80240020_DA5240.s b/asm/nonmatchings/world/area_omo/omo_03/func_80240020_DA5240.s deleted file mode 100644 index 54c04b44c0..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_03/func_80240020_DA5240.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_DA5260 -/* DA5260 80240020 3C03800B */ lui $v1, %hi(gCameras) -/* DA5264 80240024 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DA5268 80240028 94620002 */ lhu $v0, 2($v1) -/* DA526C 8024002C 3042FFFE */ andi $v0, $v0, 0xfffe -/* DA5270 80240030 A4620002 */ sh $v0, 2($v1) -/* DA5274 80240034 03E00008 */ jr $ra -/* DA5278 80240038 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_03/func_8024003C_DA5240.s b/asm/nonmatchings/world/area_omo/omo_03/func_8024003C_DA5240.s deleted file mode 100644 index 77d423aa37..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_03/func_8024003C_DA5240.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024003C_DA527C -/* DA527C 8024003C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DA5280 80240040 AFB10014 */ sw $s1, 0x14($sp) -/* DA5284 80240044 0080882D */ daddu $s1, $a0, $zero -/* DA5288 80240048 AFBF001C */ sw $ra, 0x1c($sp) -/* DA528C 8024004C AFB20018 */ sw $s2, 0x18($sp) -/* DA5290 80240050 AFB00010 */ sw $s0, 0x10($sp) -/* DA5294 80240054 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DA5298 80240058 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DA529C 8024005C F7B40020 */ sdc1 $f20, 0x20($sp) -/* DA52A0 80240060 8E30000C */ lw $s0, 0xc($s1) -/* DA52A4 80240064 8E120000 */ lw $s2, ($s0) -/* DA52A8 80240068 26100004 */ addiu $s0, $s0, 4 -/* DA52AC 8024006C 8E050000 */ lw $a1, ($s0) -/* DA52B0 80240070 0C0B210B */ jal get_float_variable -/* DA52B4 80240074 26100004 */ addiu $s0, $s0, 4 -/* DA52B8 80240078 8E050000 */ lw $a1, ($s0) -/* DA52BC 8024007C 26100004 */ addiu $s0, $s0, 4 -/* DA52C0 80240080 0220202D */ daddu $a0, $s1, $zero -/* DA52C4 80240084 0C0B210B */ jal get_float_variable -/* DA52C8 80240088 46000606 */ mov.s $f24, $f0 -/* DA52CC 8024008C 8E050000 */ lw $a1, ($s0) -/* DA52D0 80240090 26100004 */ addiu $s0, $s0, 4 -/* DA52D4 80240094 0220202D */ daddu $a0, $s1, $zero -/* DA52D8 80240098 0C0B210B */ jal get_float_variable -/* DA52DC 8024009C 46000586 */ mov.s $f22, $f0 -/* DA52E0 802400A0 0220202D */ daddu $a0, $s1, $zero -/* DA52E4 802400A4 8E050000 */ lw $a1, ($s0) -/* DA52E8 802400A8 0C0B210B */ jal get_float_variable -/* DA52EC 802400AC 46000506 */ mov.s $f20, $f0 -/* DA52F0 802400B0 4600C306 */ mov.s $f12, $f24 -/* DA52F4 802400B4 4406A000 */ mfc1 $a2, $f20 -/* DA52F8 802400B8 44070000 */ mfc1 $a3, $f0 -/* DA52FC 802400BC 0C00A720 */ jal atan2 -/* DA5300 802400C0 4600B386 */ mov.s $f14, $f22 -/* DA5304 802400C4 0C00A6C9 */ jal clamp_angle -/* DA5308 802400C8 46000306 */ mov.s $f12, $f0 -/* DA530C 802400CC 0220202D */ daddu $a0, $s1, $zero -/* DA5310 802400D0 44060000 */ mfc1 $a2, $f0 -/* DA5314 802400D4 0C0B2190 */ jal set_float_variable -/* DA5318 802400D8 0240282D */ daddu $a1, $s2, $zero -/* DA531C 802400DC 8FBF001C */ lw $ra, 0x1c($sp) -/* DA5320 802400E0 8FB20018 */ lw $s2, 0x18($sp) -/* DA5324 802400E4 8FB10014 */ lw $s1, 0x14($sp) -/* DA5328 802400E8 8FB00010 */ lw $s0, 0x10($sp) -/* DA532C 802400EC D7B80030 */ ldc1 $f24, 0x30($sp) -/* DA5330 802400F0 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DA5334 802400F4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DA5338 802400F8 24020002 */ addiu $v0, $zero, 2 -/* DA533C 802400FC 03E00008 */ jr $ra -/* DA5340 80240100 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_03/func_80240104_DA5240.s b/asm/nonmatchings/world/area_omo/omo_03/func_80240104_DA5240.s deleted file mode 100644 index 933b9094ca..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_03/func_80240104_DA5240.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240104_DA5344 -/* DA5344 80240104 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DA5348 80240108 AFB10014 */ sw $s1, 0x14($sp) -/* DA534C 8024010C 0080882D */ daddu $s1, $a0, $zero -/* DA5350 80240110 AFBF0018 */ sw $ra, 0x18($sp) -/* DA5354 80240114 AFB00010 */ sw $s0, 0x10($sp) -/* DA5358 80240118 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DA535C 8024011C 8E30000C */ lw $s0, 0xc($s1) -/* DA5360 80240120 8E050000 */ lw $a1, ($s0) -/* DA5364 80240124 0C0B210B */ jal get_float_variable -/* DA5368 80240128 26100004 */ addiu $s0, $s0, 4 -/* DA536C 8024012C 8E050000 */ lw $a1, ($s0) -/* DA5370 80240130 26100004 */ addiu $s0, $s0, 4 -/* DA5374 80240134 0220202D */ daddu $a0, $s1, $zero -/* DA5378 80240138 0C0B210B */ jal get_float_variable -/* DA537C 8024013C 46000506 */ mov.s $f20, $f0 -/* DA5380 80240140 4614003C */ c.lt.s $f0, $f20 -/* DA5384 80240144 00000000 */ nop -/* DA5388 80240148 45000004 */ bc1f .L8024015C -/* DA538C 8024014C 0220202D */ daddu $a0, $s1, $zero -/* DA5390 80240150 8E050000 */ lw $a1, ($s0) -/* DA5394 80240154 08090059 */ j .L80240164 -/* DA5398 80240158 24060001 */ addiu $a2, $zero, 1 -.L8024015C: -/* DA539C 8024015C 8E050000 */ lw $a1, ($s0) -/* DA53A0 80240160 0000302D */ daddu $a2, $zero, $zero -.L80240164: -/* DA53A4 80240164 0C0B2026 */ jal set_variable -/* DA53A8 80240168 00000000 */ nop -/* DA53AC 8024016C 8FBF0018 */ lw $ra, 0x18($sp) -/* DA53B0 80240170 8FB10014 */ lw $s1, 0x14($sp) -/* DA53B4 80240174 8FB00010 */ lw $s0, 0x10($sp) -/* DA53B8 80240178 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DA53BC 8024017C 24020002 */ addiu $v0, $zero, 2 -/* DA53C0 80240180 03E00008 */ jr $ra -/* DA53C4 80240184 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_03/func_802402B0_DA5240.s b/asm/nonmatchings/world/area_omo/omo_03/func_802402B0_DA5240.s deleted file mode 100644 index 9181dc6b8a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_03/func_802402B0_DA5240.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402B0_DA54F0 -/* DA54F0 802402B0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DA54F4 802402B4 AFB10014 */ sw $s1, 0x14($sp) -/* DA54F8 802402B8 0080882D */ daddu $s1, $a0, $zero -/* DA54FC 802402BC AFBF001C */ sw $ra, 0x1c($sp) -/* DA5500 802402C0 AFB20018 */ sw $s2, 0x18($sp) -/* DA5504 802402C4 AFB00010 */ sw $s0, 0x10($sp) -/* DA5508 802402C8 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* DA550C 802402CC F7B80030 */ sdc1 $f24, 0x30($sp) -/* DA5510 802402D0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DA5514 802402D4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DA5518 802402D8 8E30000C */ lw $s0, 0xc($s1) -/* DA551C 802402DC 8E050000 */ lw $a1, ($s0) -/* DA5520 802402E0 0C0B1EAF */ jal get_variable -/* DA5524 802402E4 26100004 */ addiu $s0, $s0, 4 -/* DA5528 802402E8 8E050000 */ lw $a1, ($s0) -/* DA552C 802402EC 26100004 */ addiu $s0, $s0, 4 -/* DA5530 802402F0 0220202D */ daddu $a0, $s1, $zero -/* DA5534 802402F4 0C0B210B */ jal get_float_variable -/* DA5538 802402F8 0040902D */ daddu $s2, $v0, $zero -/* DA553C 802402FC 8E050000 */ lw $a1, ($s0) -/* DA5540 80240300 26100004 */ addiu $s0, $s0, 4 -/* DA5544 80240304 0220202D */ daddu $a0, $s1, $zero -/* DA5548 80240308 0C0B210B */ jal get_float_variable -/* DA554C 8024030C 46000686 */ mov.s $f26, $f0 -/* DA5550 80240310 8E050000 */ lw $a1, ($s0) -/* DA5554 80240314 26100004 */ addiu $s0, $s0, 4 -/* DA5558 80240318 0220202D */ daddu $a0, $s1, $zero -/* DA555C 8024031C 0C0B210B */ jal get_float_variable -/* DA5560 80240320 46000606 */ mov.s $f24, $f0 -/* DA5564 80240324 0220202D */ daddu $a0, $s1, $zero -/* DA5568 80240328 8E050000 */ lw $a1, ($s0) -/* DA556C 8024032C 0C0B210B */ jal get_float_variable -/* DA5570 80240330 46000506 */ mov.s $f20, $f0 -/* DA5574 80240334 0240202D */ daddu $a0, $s2, $zero -/* DA5578 80240338 0C00EAD2 */ jal get_npc_safe -/* DA557C 8024033C 46000586 */ mov.s $f22, $f0 -/* DA5580 80240340 0040202D */ daddu $a0, $v0, $zero -/* DA5584 80240344 E49A0038 */ swc1 $f26, 0x38($a0) -/* DA5588 80240348 4600D006 */ mov.s $f0, $f26 -/* DA558C 8024034C E498003C */ swc1 $f24, 0x3c($a0) -/* DA5590 80240350 4600C086 */ mov.s $f2, $f24 -/* DA5594 80240354 E4940040 */ swc1 $f20, 0x40($a0) -/* DA5598 80240358 4600A106 */ mov.s $f4, $f20 -/* DA559C 8024035C 8C830000 */ lw $v1, ($a0) -/* DA55A0 80240360 3C050001 */ lui $a1, 1 -/* DA55A4 80240364 E496000C */ swc1 $f22, 0xc($a0) -/* DA55A8 80240368 E480006C */ swc1 $f0, 0x6c($a0) -/* DA55AC 8024036C E4820070 */ swc1 $f2, 0x70($a0) -/* DA55B0 80240370 E4840074 */ swc1 $f4, 0x74($a0) -/* DA55B4 80240374 00651825 */ or $v1, $v1, $a1 -/* DA55B8 80240378 AC830000 */ sw $v1, ($a0) -/* DA55BC 8024037C 8FBF001C */ lw $ra, 0x1c($sp) -/* DA55C0 80240380 8FB20018 */ lw $s2, 0x18($sp) -/* DA55C4 80240384 8FB10014 */ lw $s1, 0x14($sp) -/* DA55C8 80240388 8FB00010 */ lw $s0, 0x10($sp) -/* DA55CC 8024038C D7BA0038 */ ldc1 $f26, 0x38($sp) -/* DA55D0 80240390 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DA55D4 80240394 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DA55D8 80240398 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DA55DC 8024039C 24020002 */ addiu $v0, $zero, 2 -/* DA55E0 802403A0 03E00008 */ jr $ra -/* DA55E4 802403A4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_omo/omo_03/func_802403A8_DA5240.s b/asm/nonmatchings/world/area_omo/omo_03/func_802403A8_DA5240.s deleted file mode 100644 index 87f7dc6387..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_03/func_802403A8_DA5240.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403A8_DA55E8 -/* DA55E8 802403A8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DA55EC 802403AC AFB20018 */ sw $s2, 0x18($sp) -/* DA55F0 802403B0 0080902D */ daddu $s2, $a0, $zero -/* DA55F4 802403B4 AFBF0028 */ sw $ra, 0x28($sp) -/* DA55F8 802403B8 AFB50024 */ sw $s5, 0x24($sp) -/* DA55FC 802403BC AFB40020 */ sw $s4, 0x20($sp) -/* DA5600 802403C0 AFB3001C */ sw $s3, 0x1c($sp) -/* DA5604 802403C4 AFB10014 */ sw $s1, 0x14($sp) -/* DA5608 802403C8 AFB00010 */ sw $s0, 0x10($sp) -/* DA560C 802403CC F7B80040 */ sdc1 $f24, 0x40($sp) -/* DA5610 802403D0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* DA5614 802403D4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* DA5618 802403D8 8E50000C */ lw $s0, 0xc($s2) -/* DA561C 802403DC 8E140000 */ lw $s4, ($s0) -/* DA5620 802403E0 26100004 */ addiu $s0, $s0, 4 -/* DA5624 802403E4 0C0B1EAF */ jal get_variable -/* DA5628 802403E8 0280282D */ daddu $a1, $s4, $zero -/* DA562C 802403EC 0040982D */ daddu $s3, $v0, $zero -/* DA5630 802403F0 8E150000 */ lw $s5, ($s0) -/* DA5634 802403F4 26100004 */ addiu $s0, $s0, 4 -/* DA5638 802403F8 8E050000 */ lw $a1, ($s0) -/* DA563C 802403FC 26100004 */ addiu $s0, $s0, 4 -/* DA5640 80240400 0C0B210B */ jal get_float_variable -/* DA5644 80240404 0240202D */ daddu $a0, $s2, $zero -/* DA5648 80240408 8E050000 */ lw $a1, ($s0) -/* DA564C 8024040C 26100004 */ addiu $s0, $s0, 4 -/* DA5650 80240410 0240202D */ daddu $a0, $s2, $zero -/* DA5654 80240414 0C0B210B */ jal get_float_variable -/* DA5658 80240418 46000606 */ mov.s $f24, $f0 -/* DA565C 8024041C 8E050000 */ lw $a1, ($s0) -/* DA5660 80240420 26100004 */ addiu $s0, $s0, 4 -/* DA5664 80240424 0240202D */ daddu $a0, $s2, $zero -/* DA5668 80240428 0C0B1EAF */ jal get_variable -/* DA566C 8024042C 46000506 */ mov.s $f20, $f0 -/* DA5670 80240430 8E050000 */ lw $a1, ($s0) -/* DA5674 80240434 26100004 */ addiu $s0, $s0, 4 -/* DA5678 80240438 0240202D */ daddu $a0, $s2, $zero -/* DA567C 8024043C 0C0B1EAF */ jal get_variable -/* DA5680 80240440 0040882D */ daddu $s1, $v0, $zero -/* DA5684 80240444 0240202D */ daddu $a0, $s2, $zero -/* DA5688 80240448 8E050000 */ lw $a1, ($s0) -/* DA568C 8024044C 0C0B210B */ jal get_float_variable -/* DA5690 80240450 0040802D */ daddu $s0, $v0, $zero -/* DA5694 80240454 3C014334 */ lui $at, 0x4334 -/* DA5698 80240458 44811000 */ mtc1 $at, $f2 -/* DA569C 8024045C 3C014049 */ lui $at, 0x4049 -/* DA56A0 80240460 34210FD8 */ ori $at, $at, 0xfd8 -/* DA56A4 80240464 44812000 */ mtc1 $at, $f4 -/* DA56A8 80240468 46020003 */ div.s $f0, $f0, $f2 -/* DA56AC 8024046C 46040582 */ mul.s $f22, $f0, $f4 -/* DA56B0 80240470 00000000 */ nop -/* DA56B4 80240474 4618A501 */ sub.s $f20, $f20, $f24 -/* DA56B8 80240478 3C013F00 */ lui $at, 0x3f00 -/* DA56BC 8024047C 44810000 */ mtc1 $at, $f0 -/* DA56C0 80240480 00000000 */ nop -/* DA56C4 80240484 4600A502 */ mul.s $f20, $f20, $f0 -/* DA56C8 80240488 00000000 */ nop -/* DA56CC 8024048C 12000007 */ beqz $s0, .L802404AC -/* DA56D0 80240490 0233102A */ slt $v0, $s1, $s3 -/* DA56D4 80240494 10400005 */ beqz $v0, .L802404AC -/* DA56D8 80240498 0240202D */ daddu $a0, $s2, $zero -/* DA56DC 8024049C 0220982D */ daddu $s3, $s1, $zero -/* DA56E0 802404A0 0280282D */ daddu $a1, $s4, $zero -/* DA56E4 802404A4 0C0B2026 */ jal set_variable -/* DA56E8 802404A8 0220302D */ daddu $a2, $s1, $zero -.L802404AC: -/* DA56EC 802404AC 3C014049 */ lui $at, 0x4049 -/* DA56F0 802404B0 34210FD8 */ ori $at, $at, 0xfd8 -/* DA56F4 802404B4 44810000 */ mtc1 $at, $f0 -/* DA56F8 802404B8 44936000 */ mtc1 $s3, $f12 -/* DA56FC 802404BC 00000000 */ nop -/* DA5700 802404C0 46806320 */ cvt.s.w $f12, $f12 -/* DA5704 802404C4 46006302 */ mul.s $f12, $f12, $f0 -/* DA5708 802404C8 00000000 */ nop -/* DA570C 802404CC 44910000 */ mtc1 $s1, $f0 -/* DA5710 802404D0 00000000 */ nop -/* DA5714 802404D4 46800020 */ cvt.s.w $f0, $f0 -/* DA5718 802404D8 46006303 */ div.s $f12, $f12, $f0 -/* DA571C 802404DC 0C00A874 */ jal cos_rad -/* DA5720 802404E0 46166300 */ add.s $f12, $f12, $f22 -/* DA5724 802404E4 4600A002 */ mul.s $f0, $f20, $f0 -/* DA5728 802404E8 00000000 */ nop -/* DA572C 802404EC 4614C080 */ add.s $f2, $f24, $f20 -/* DA5730 802404F0 46001081 */ sub.s $f2, $f2, $f0 -/* DA5734 802404F4 0240202D */ daddu $a0, $s2, $zero -/* DA5738 802404F8 44061000 */ mfc1 $a2, $f2 -/* DA573C 802404FC 0C0B2190 */ jal set_float_variable -/* DA5740 80240500 02A0282D */ daddu $a1, $s5, $zero -/* DA5744 80240504 8FBF0028 */ lw $ra, 0x28($sp) -/* DA5748 80240508 8FB50024 */ lw $s5, 0x24($sp) -/* DA574C 8024050C 8FB40020 */ lw $s4, 0x20($sp) -/* DA5750 80240510 8FB3001C */ lw $s3, 0x1c($sp) -/* DA5754 80240514 8FB20018 */ lw $s2, 0x18($sp) -/* DA5758 80240518 8FB10014 */ lw $s1, 0x14($sp) -/* DA575C 8024051C 8FB00010 */ lw $s0, 0x10($sp) -/* DA5760 80240520 D7B80040 */ ldc1 $f24, 0x40($sp) -/* DA5764 80240524 D7B60038 */ ldc1 $f22, 0x38($sp) -/* DA5768 80240528 D7B40030 */ ldc1 $f20, 0x30($sp) -/* DA576C 8024052C 24020002 */ addiu $v0, $zero, 2 -/* DA5770 80240530 03E00008 */ jr $ra -/* DA5774 80240534 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_03/func_802406A0_DA5240.s b/asm/nonmatchings/world/area_omo/omo_03/func_802406A0_DA5240.s deleted file mode 100644 index c22f77ce6a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_03/func_802406A0_DA5240.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A0_DA58E0 -/* DA58E0 802406A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DA58E4 802406A4 AFB00010 */ sw $s0, 0x10($sp) -/* DA58E8 802406A8 0080802D */ daddu $s0, $a0, $zero -/* DA58EC 802406AC 10A00005 */ beqz $a1, .L802406C4 -/* DA58F0 802406B0 AFBF0014 */ sw $ra, 0x14($sp) -/* DA58F4 802406B4 AE000070 */ sw $zero, 0x70($s0) -/* DA58F8 802406B8 AE000074 */ sw $zero, 0x74($s0) -/* DA58FC 802406BC AE000078 */ sw $zero, 0x78($s0) -/* DA5900 802406C0 AE00007C */ sw $zero, 0x7c($s0) -.L802406C4: -/* DA5904 802406C4 8E020070 */ lw $v0, 0x70($s0) -/* DA5908 802406C8 1440000E */ bnez $v0, .L80240704 -/* DA590C 802406CC 00000000 */ nop -/* DA5910 802406D0 8E0300A8 */ lw $v1, 0xa8($s0) -/* DA5914 802406D4 8E020088 */ lw $v0, 0x88($s0) -/* DA5918 802406D8 00621821 */ addu $v1, $v1, $v0 -/* DA591C 802406DC 04610004 */ bgez $v1, .L802406F0 -/* DA5920 802406E0 AE0300A8 */ sw $v1, 0xa8($s0) -/* DA5924 802406E4 3C020002 */ lui $v0, 2 -/* DA5928 802406E8 080901C0 */ j .L80240700 -/* DA592C 802406EC 00621021 */ addu $v0, $v1, $v0 -.L802406F0: -/* DA5930 802406F0 3C040002 */ lui $a0, 2 -/* DA5934 802406F4 0083102A */ slt $v0, $a0, $v1 -/* DA5938 802406F8 10400002 */ beqz $v0, .L80240704 -/* DA593C 802406FC 00641023 */ subu $v0, $v1, $a0 -.L80240700: -/* DA5940 80240700 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240704: -/* DA5944 80240704 8E020074 */ lw $v0, 0x74($s0) -/* DA5948 80240708 1440000E */ bnez $v0, .L80240744 -/* DA594C 8024070C 00000000 */ nop -/* DA5950 80240710 8E0300AC */ lw $v1, 0xac($s0) -/* DA5954 80240714 8E02008C */ lw $v0, 0x8c($s0) -/* DA5958 80240718 00621821 */ addu $v1, $v1, $v0 -/* DA595C 8024071C 04610004 */ bgez $v1, .L80240730 -/* DA5960 80240720 AE0300AC */ sw $v1, 0xac($s0) -/* DA5964 80240724 3C020002 */ lui $v0, 2 -/* DA5968 80240728 080901D0 */ j .L80240740 -/* DA596C 8024072C 00621021 */ addu $v0, $v1, $v0 -.L80240730: -/* DA5970 80240730 3C040002 */ lui $a0, 2 -/* DA5974 80240734 0083102A */ slt $v0, $a0, $v1 -/* DA5978 80240738 10400002 */ beqz $v0, .L80240744 -/* DA597C 8024073C 00641023 */ subu $v0, $v1, $a0 -.L80240740: -/* DA5980 80240740 AE0200AC */ sw $v0, 0xac($s0) -.L80240744: -/* DA5984 80240744 8E020078 */ lw $v0, 0x78($s0) -/* DA5988 80240748 1440000E */ bnez $v0, .L80240784 -/* DA598C 8024074C 00000000 */ nop -/* DA5990 80240750 8E0300B0 */ lw $v1, 0xb0($s0) -/* DA5994 80240754 8E020090 */ lw $v0, 0x90($s0) -/* DA5998 80240758 00621821 */ addu $v1, $v1, $v0 -/* DA599C 8024075C 04610004 */ bgez $v1, .L80240770 -/* DA59A0 80240760 AE0300B0 */ sw $v1, 0xb0($s0) -/* DA59A4 80240764 3C020002 */ lui $v0, 2 -/* DA59A8 80240768 080901E0 */ j .L80240780 -/* DA59AC 8024076C 00621021 */ addu $v0, $v1, $v0 -.L80240770: -/* DA59B0 80240770 3C040002 */ lui $a0, 2 -/* DA59B4 80240774 0083102A */ slt $v0, $a0, $v1 -/* DA59B8 80240778 10400002 */ beqz $v0, .L80240784 -/* DA59BC 8024077C 00641023 */ subu $v0, $v1, $a0 -.L80240780: -/* DA59C0 80240780 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240784: -/* DA59C4 80240784 8E02007C */ lw $v0, 0x7c($s0) -/* DA59C8 80240788 1440000E */ bnez $v0, .L802407C4 -/* DA59CC 8024078C 00000000 */ nop -/* DA59D0 80240790 8E0300B4 */ lw $v1, 0xb4($s0) -/* DA59D4 80240794 8E020094 */ lw $v0, 0x94($s0) -/* DA59D8 80240798 00621821 */ addu $v1, $v1, $v0 -/* DA59DC 8024079C 04610004 */ bgez $v1, .L802407B0 -/* DA59E0 802407A0 AE0300B4 */ sw $v1, 0xb4($s0) -/* DA59E4 802407A4 3C020002 */ lui $v0, 2 -/* DA59E8 802407A8 080901F0 */ j .L802407C0 -/* DA59EC 802407AC 00621021 */ addu $v0, $v1, $v0 -.L802407B0: -/* DA59F0 802407B0 3C040002 */ lui $a0, 2 -/* DA59F4 802407B4 0083102A */ slt $v0, $a0, $v1 -/* DA59F8 802407B8 10400002 */ beqz $v0, .L802407C4 -/* DA59FC 802407BC 00641023 */ subu $v0, $v1, $a0 -.L802407C0: -/* DA5A00 802407C0 AE0200B4 */ sw $v0, 0xb4($s0) -.L802407C4: -/* DA5A04 802407C4 8E040084 */ lw $a0, 0x84($s0) -/* DA5A08 802407C8 0C046F07 */ jal set_main_pan_u -/* DA5A0C 802407CC 8E0500A8 */ lw $a1, 0xa8($s0) -/* DA5A10 802407D0 8E040084 */ lw $a0, 0x84($s0) -/* DA5A14 802407D4 0C046F0D */ jal set_main_pan_v -/* DA5A18 802407D8 8E0500AC */ lw $a1, 0xac($s0) -/* DA5A1C 802407DC 8E040084 */ lw $a0, 0x84($s0) -/* DA5A20 802407E0 0C046F13 */ jal set_aux_pan_u -/* DA5A24 802407E4 8E0500B0 */ lw $a1, 0xb0($s0) -/* DA5A28 802407E8 8E040084 */ lw $a0, 0x84($s0) -/* DA5A2C 802407EC 0C046F19 */ jal set_aux_pan_v -/* DA5A30 802407F0 8E0500B4 */ lw $a1, 0xb4($s0) -/* DA5A34 802407F4 8E020070 */ lw $v0, 0x70($s0) -/* DA5A38 802407F8 8E030078 */ lw $v1, 0x78($s0) -/* DA5A3C 802407FC 8E040098 */ lw $a0, 0x98($s0) -/* DA5A40 80240800 24420001 */ addiu $v0, $v0, 1 -/* DA5A44 80240804 AE020070 */ sw $v0, 0x70($s0) -/* DA5A48 80240808 8E020074 */ lw $v0, 0x74($s0) -/* DA5A4C 8024080C 24630001 */ addiu $v1, $v1, 1 -/* DA5A50 80240810 AE030078 */ sw $v1, 0x78($s0) -/* DA5A54 80240814 8E030070 */ lw $v1, 0x70($s0) -/* DA5A58 80240818 24420001 */ addiu $v0, $v0, 1 -/* DA5A5C 8024081C AE020074 */ sw $v0, 0x74($s0) -/* DA5A60 80240820 8E02007C */ lw $v0, 0x7c($s0) -/* DA5A64 80240824 0064182A */ slt $v1, $v1, $a0 -/* DA5A68 80240828 24420001 */ addiu $v0, $v0, 1 -/* DA5A6C 8024082C 14600002 */ bnez $v1, .L80240838 -/* DA5A70 80240830 AE02007C */ sw $v0, 0x7c($s0) -/* DA5A74 80240834 AE000070 */ sw $zero, 0x70($s0) -.L80240838: -/* DA5A78 80240838 8E020074 */ lw $v0, 0x74($s0) -/* DA5A7C 8024083C 8E03009C */ lw $v1, 0x9c($s0) -/* DA5A80 80240840 0043102A */ slt $v0, $v0, $v1 -/* DA5A84 80240844 50400001 */ beql $v0, $zero, .L8024084C -/* DA5A88 80240848 AE000074 */ sw $zero, 0x74($s0) -.L8024084C: -/* DA5A8C 8024084C 8E020078 */ lw $v0, 0x78($s0) -/* DA5A90 80240850 8E0300A0 */ lw $v1, 0xa0($s0) -/* DA5A94 80240854 0043102A */ slt $v0, $v0, $v1 -/* DA5A98 80240858 50400001 */ beql $v0, $zero, .L80240860 -/* DA5A9C 8024085C AE000078 */ sw $zero, 0x78($s0) -.L80240860: -/* DA5AA0 80240860 8E02007C */ lw $v0, 0x7c($s0) -/* DA5AA4 80240864 8E0300A4 */ lw $v1, 0xa4($s0) -/* DA5AA8 80240868 0043102A */ slt $v0, $v0, $v1 -/* DA5AAC 8024086C 50400001 */ beql $v0, $zero, .L80240874 -/* DA5AB0 80240870 AE00007C */ sw $zero, 0x7c($s0) -.L80240874: -/* DA5AB4 80240874 8FBF0014 */ lw $ra, 0x14($sp) -/* DA5AB8 80240878 8FB00010 */ lw $s0, 0x10($sp) -/* DA5ABC 8024087C 0000102D */ daddu $v0, $zero, $zero -/* DA5AC0 80240880 03E00008 */ jr $ra -/* DA5AC4 80240884 27BD0018 */ addiu $sp, $sp, 0x18 -/* DA5AC8 80240888 00000000 */ nop -/* DA5ACC 8024088C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_802400B4_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_802400B4_DAD400.s deleted file mode 100644 index e75a7c3a6a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_802400B4_DAD400.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_DAD4B4 -/* DAD4B4 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DAD4B8 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* DAD4BC 802400BC 0080802D */ daddu $s0, $a0, $zero -/* DAD4C0 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* DAD4C4 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* DAD4C8 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* DAD4CC 802400CC 8C510000 */ lw $s1, ($v0) -/* DAD4D0 802400D0 0C0B1EAF */ jal get_variable -/* DAD4D4 802400D4 0220282D */ daddu $a1, $s1, $zero -/* DAD4D8 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* DAD4DC 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* DAD4E0 802400E0 0200202D */ daddu $a0, $s0, $zero -/* DAD4E4 802400E4 00431024 */ and $v0, $v0, $v1 -/* DAD4E8 802400E8 00021140 */ sll $v0, $v0, 5 -/* DAD4EC 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* DAD4F0 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* DAD4F4 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* DAD4F8 802400F8 0C0B2026 */ jal set_variable -/* DAD4FC 802400FC 0220282D */ daddu $a1, $s1, $zero -/* DAD500 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* DAD504 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* DAD508 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* DAD50C 8024010C 24020002 */ addiu $v0, $zero, 2 -/* DAD510 80240110 03E00008 */ jr $ra -/* DAD514 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_80240118_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_80240118_DAD400.s deleted file mode 100644 index f1c252bc88..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_80240118_DAD400.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_04/func_80240268_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_80240268_DAD400.s deleted file mode 100644 index e2264a6465..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_80240268_DAD400.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_DAD668 -/* DAD668 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DAD66C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* DAD670 80240270 0080802D */ daddu $s0, $a0, $zero -/* DAD674 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* DAD678 80240278 8E02000C */ lw $v0, 0xc($s0) -/* DAD67C 8024027C 0C0B1EAF */ jal get_variable -/* DAD680 80240280 8C450000 */ lw $a1, ($v0) -/* DAD684 80240284 00021140 */ sll $v0, $v0, 5 -/* DAD688 80240288 AE000084 */ sw $zero, 0x84($s0) -/* DAD68C 8024028C 3C018008 */ lui $at, 0x8008 -/* DAD690 80240290 00220821 */ addu $at, $at, $v0 -/* DAD694 80240294 942278F8 */ lhu $v0, 0x78f8($at) -/* DAD698 80240298 30420040 */ andi $v0, $v0, 0x40 -/* DAD69C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* DAD6A0 802402A0 24020001 */ addiu $v0, $zero, 1 -/* DAD6A4 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* DAD6A8 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* DAD6AC 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* DAD6B0 802402B0 24020002 */ addiu $v0, $zero, 2 -/* DAD6B4 802402B4 03E00008 */ jr $ra -/* DAD6B8 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_802402BC_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_802402BC_DAD400.s deleted file mode 100644 index ac128cb628..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_802402BC_DAD400.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402BC_DAD6BC -/* DAD6BC 802402BC 3C03800B */ lui $v1, %hi(gCameras) -/* DAD6C0 802402C0 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DAD6C4 802402C4 94620002 */ lhu $v0, 2($v1) -/* DAD6C8 802402C8 3042FFFE */ andi $v0, $v0, 0xfffe -/* DAD6CC 802402CC A4620002 */ sh $v0, 2($v1) -/* DAD6D0 802402D0 03E00008 */ jr $ra -/* DAD6D4 802402D4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_802402D8_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_802402D8_DAD400.s deleted file mode 100644 index 097155a3cd..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_802402D8_DAD400.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402D8_DAD6D8 -/* DAD6D8 802402D8 3C03800B */ lui $v1, %hi(gCameras) -/* DAD6DC 802402DC 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DAD6E0 802402E0 94620002 */ lhu $v0, 2($v1) -/* DAD6E4 802402E4 34420001 */ ori $v0, $v0, 1 -/* DAD6E8 802402E8 A4620002 */ sh $v0, 2($v1) -/* DAD6EC 802402EC 03E00008 */ jr $ra -/* DAD6F0 802402F0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_802402F4_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_802402F4_DAD400.s deleted file mode 100644 index 87c113b275..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_802402F4_DAD400.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F4_DAD6F4 -/* DAD6F4 802402F4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DAD6F8 802402F8 AFB00010 */ sw $s0, 0x10($sp) -/* DAD6FC 802402FC 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* DAD700 80240300 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* DAD704 80240304 AFBF0018 */ sw $ra, 0x18($sp) -/* DAD708 80240308 AFB10014 */ sw $s1, 0x14($sp) -/* DAD70C 8024030C F7B60028 */ sdc1 $f22, 0x28($sp) -/* DAD710 80240310 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DAD714 80240314 C60C0080 */ lwc1 $f12, 0x80($s0) -/* DAD718 80240318 0C00A8BB */ jal sin_deg -/* DAD71C 8024031C 0080882D */ daddu $s1, $a0, $zero -/* DAD720 80240320 C6140054 */ lwc1 $f20, 0x54($s0) -/* DAD724 80240324 3C0140A0 */ lui $at, 0x40a0 -/* DAD728 80240328 4481B000 */ mtc1 $at, $f22 -/* DAD72C 8024032C 00000000 */ nop -/* DAD730 80240330 4616A502 */ mul.s $f20, $f20, $f22 -/* DAD734 80240334 00000000 */ nop -/* DAD738 80240338 C60C0080 */ lwc1 $f12, 0x80($s0) -/* DAD73C 8024033C 4600A502 */ mul.s $f20, $f20, $f0 -/* DAD740 80240340 0C00A8D4 */ jal cos_deg -/* DAD744 80240344 00000000 */ nop -/* DAD748 80240348 C6040054 */ lwc1 $f4, 0x54($s0) -/* DAD74C 8024034C 46162102 */ mul.s $f4, $f4, $f22 -/* DAD750 80240350 00000000 */ nop -/* DAD754 80240354 C6020028 */ lwc1 $f2, 0x28($s0) -/* DAD758 80240358 46141080 */ add.s $f2, $f2, $f20 -/* DAD75C 8024035C 46000007 */ neg.s $f0, $f0 -/* DAD760 80240360 46002102 */ mul.s $f4, $f4, $f0 -/* DAD764 80240364 00000000 */ nop -/* DAD768 80240368 4600118D */ trunc.w.s $f6, $f2 -/* DAD76C 8024036C E6260084 */ swc1 $f6, 0x84($s1) -/* DAD770 80240370 C6000030 */ lwc1 $f0, 0x30($s0) -/* DAD774 80240374 46040000 */ add.s $f0, $f0, $f4 -/* DAD778 80240378 4600018D */ trunc.w.s $f6, $f0 -/* DAD77C 8024037C E6260088 */ swc1 $f6, 0x88($s1) -/* DAD780 80240380 8FBF0018 */ lw $ra, 0x18($sp) -/* DAD784 80240384 8FB10014 */ lw $s1, 0x14($sp) -/* DAD788 80240388 8FB00010 */ lw $s0, 0x10($sp) -/* DAD78C 8024038C D7B60028 */ ldc1 $f22, 0x28($sp) -/* DAD790 80240390 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DAD794 80240394 24020002 */ addiu $v0, $zero, 2 -/* DAD798 80240398 03E00008 */ jr $ra -/* DAD79C 8024039C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_802403A0_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_802403A0_DAD400.s deleted file mode 100644 index aa4358c41e..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_802403A0_DAD400.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403A0_DAD7A0 -/* DAD7A0 802403A0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DAD7A4 802403A4 AFB3002C */ sw $s3, 0x2c($sp) -/* DAD7A8 802403A8 0080982D */ daddu $s3, $a0, $zero -/* DAD7AC 802403AC AFBF0030 */ sw $ra, 0x30($sp) -/* DAD7B0 802403B0 AFB20028 */ sw $s2, 0x28($sp) -/* DAD7B4 802403B4 AFB10024 */ sw $s1, 0x24($sp) -/* DAD7B8 802403B8 AFB00020 */ sw $s0, 0x20($sp) -/* DAD7BC 802403BC 8E710148 */ lw $s1, 0x148($s3) -/* DAD7C0 802403C0 86240008 */ lh $a0, 8($s1) -/* DAD7C4 802403C4 0C00EABB */ jal get_npc_unsafe -/* DAD7C8 802403C8 00A0902D */ daddu $s2, $a1, $zero -/* DAD7CC 802403CC 8E440004 */ lw $a0, 4($s2) -/* DAD7D0 802403D0 0040802D */ daddu $s0, $v0, $zero -/* DAD7D4 802403D4 00041FC2 */ srl $v1, $a0, 0x1f -/* DAD7D8 802403D8 00832021 */ addu $a0, $a0, $v1 -/* DAD7DC 802403DC 00042043 */ sra $a0, $a0, 1 -/* DAD7E0 802403E0 0C00A67F */ jal rand_int -/* DAD7E4 802403E4 24840001 */ addiu $a0, $a0, 1 -/* DAD7E8 802403E8 8E430004 */ lw $v1, 4($s2) -/* DAD7EC 802403EC 000327C2 */ srl $a0, $v1, 0x1f -/* DAD7F0 802403F0 00641821 */ addu $v1, $v1, $a0 -/* DAD7F4 802403F4 00031843 */ sra $v1, $v1, 1 -/* DAD7F8 802403F8 00621821 */ addu $v1, $v1, $v0 -/* DAD7FC 802403FC A603008E */ sh $v1, 0x8e($s0) -/* DAD800 80240400 8E2300D0 */ lw $v1, 0xd0($s1) -/* DAD804 80240404 C6000040 */ lwc1 $f0, 0x40($s0) -/* DAD808 80240408 C4640000 */ lwc1 $f4, ($v1) -/* DAD80C 8024040C 46802120 */ cvt.s.w $f4, $f4 -/* DAD810 80240410 C4620008 */ lwc1 $f2, 8($v1) -/* DAD814 80240414 468010A0 */ cvt.s.w $f2, $f2 -/* DAD818 80240418 E7A00010 */ swc1 $f0, 0x10($sp) -/* DAD81C 8024041C 8E2200D0 */ lw $v0, 0xd0($s1) -/* DAD820 80240420 44061000 */ mfc1 $a2, $f2 -/* DAD824 80240424 C440000C */ lwc1 $f0, 0xc($v0) -/* DAD828 80240428 46800020 */ cvt.s.w $f0, $f0 -/* DAD82C 8024042C E7A00014 */ swc1 $f0, 0x14($sp) -/* DAD830 80240430 8E2200D0 */ lw $v0, 0xd0($s1) -/* DAD834 80240434 44052000 */ mfc1 $a1, $f4 -/* DAD838 80240438 C4400010 */ lwc1 $f0, 0x10($v0) -/* DAD83C 8024043C 46800020 */ cvt.s.w $f0, $f0 -/* DAD840 80240440 E7A00018 */ swc1 $f0, 0x18($sp) -/* DAD844 80240444 8C640018 */ lw $a0, 0x18($v1) -/* DAD848 80240448 0C0123F5 */ jal is_point_within_region -/* DAD84C 8024044C 8E070038 */ lw $a3, 0x38($s0) -/* DAD850 80240450 1040000E */ beqz $v0, .L8024048C -/* DAD854 80240454 00000000 */ nop -/* DAD858 80240458 8E2200D0 */ lw $v0, 0xd0($s1) -/* DAD85C 8024045C C60C0038 */ lwc1 $f12, 0x38($s0) -/* DAD860 80240460 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DAD864 80240464 C4460000 */ lwc1 $f6, ($v0) -/* DAD868 80240468 468031A0 */ cvt.s.w $f6, $f6 -/* DAD86C 8024046C 44063000 */ mfc1 $a2, $f6 -/* DAD870 80240470 C4460008 */ lwc1 $f6, 8($v0) -/* DAD874 80240474 468031A0 */ cvt.s.w $f6, $f6 -/* DAD878 80240478 44073000 */ mfc1 $a3, $f6 -/* DAD87C 8024047C 0C00A720 */ jal atan2 -/* DAD880 80240480 00000000 */ nop -/* DAD884 80240484 0809012F */ j .L802404BC -/* DAD888 80240488 E600000C */ swc1 $f0, 0xc($s0) -.L8024048C: -/* DAD88C 8024048C 0C00A67F */ jal rand_int -/* DAD890 80240490 2404003C */ addiu $a0, $zero, 0x3c -/* DAD894 80240494 C60C000C */ lwc1 $f12, 0xc($s0) -/* DAD898 80240498 44820000 */ mtc1 $v0, $f0 -/* DAD89C 8024049C 00000000 */ nop -/* DAD8A0 802404A0 46800020 */ cvt.s.w $f0, $f0 -/* DAD8A4 802404A4 46006300 */ add.s $f12, $f12, $f0 -/* DAD8A8 802404A8 3C0141F0 */ lui $at, 0x41f0 -/* DAD8AC 802404AC 44810000 */ mtc1 $at, $f0 -/* DAD8B0 802404B0 0C00A6C9 */ jal clamp_angle -/* DAD8B4 802404B4 46006301 */ sub.s $f12, $f12, $f0 -/* DAD8B8 802404B8 E600000C */ swc1 $f0, 0xc($s0) -.L802404BC: -/* DAD8BC 802404BC 8E2200CC */ lw $v0, 0xcc($s1) -/* DAD8C0 802404C0 8C420004 */ lw $v0, 4($v0) -/* DAD8C4 802404C4 AE020028 */ sw $v0, 0x28($s0) -/* DAD8C8 802404C8 AE600074 */ sw $zero, 0x74($s3) -/* DAD8CC 802404CC 8E2200D0 */ lw $v0, 0xd0($s1) -/* DAD8D0 802404D0 8C420014 */ lw $v0, 0x14($v0) -/* DAD8D4 802404D4 04410004 */ bgez $v0, .L802404E8 -/* DAD8D8 802404D8 00000000 */ nop -/* DAD8DC 802404DC C6400000 */ lwc1 $f0, ($s2) -/* DAD8E0 802404E0 08090142 */ j .L80240508 -/* DAD8E4 802404E4 E6000018 */ swc1 $f0, 0x18($s0) -.L802404E8: -/* DAD8E8 802404E8 3C018024 */ lui $at, 0x8024 -/* DAD8EC 802404EC D4224CB0 */ ldc1 $f2, 0x4cb0($at) -/* DAD8F0 802404F0 44820000 */ mtc1 $v0, $f0 -/* DAD8F4 802404F4 00000000 */ nop -/* DAD8F8 802404F8 46800021 */ cvt.d.w $f0, $f0 -/* DAD8FC 802404FC 46220003 */ div.d $f0, $f0, $f2 -/* DAD900 80240500 46200020 */ cvt.s.d $f0, $f0 -/* DAD904 80240504 E6000018 */ swc1 $f0, 0x18($s0) -.L80240508: -/* DAD908 80240508 C600003C */ lwc1 $f0, 0x3c($s0) -/* DAD90C 8024050C 3C014059 */ lui $at, 0x4059 -/* DAD910 80240510 44811800 */ mtc1 $at, $f3 -/* DAD914 80240514 44801000 */ mtc1 $zero, $f2 -/* DAD918 80240518 46000021 */ cvt.d.s $f0, $f0 -/* DAD91C 8024051C 46220002 */ mul.d $f0, $f0, $f2 -/* DAD920 80240520 00000000 */ nop -/* DAD924 80240524 24020001 */ addiu $v0, $zero, 1 -/* DAD928 80240528 4620018D */ trunc.w.d $f6, $f0 -/* DAD92C 8024052C E626007C */ swc1 $f6, 0x7c($s1) -/* DAD930 80240530 AE620070 */ sw $v0, 0x70($s3) -/* DAD934 80240534 8FBF0030 */ lw $ra, 0x30($sp) -/* DAD938 80240538 8FB3002C */ lw $s3, 0x2c($sp) -/* DAD93C 8024053C 8FB20028 */ lw $s2, 0x28($sp) -/* DAD940 80240540 8FB10024 */ lw $s1, 0x24($sp) -/* DAD944 80240544 8FB00020 */ lw $s0, 0x20($sp) -/* DAD948 80240548 03E00008 */ jr $ra -/* DAD94C 8024054C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_80240550_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_80240550_DAD400.s deleted file mode 100644 index 64cb38929c..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_80240550_DAD400.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240550_DAD950 -/* DAD950 80240550 27BDFF80 */ addiu $sp, $sp, -0x80 -/* DAD954 80240554 AFB3004C */ sw $s3, 0x4c($sp) -/* DAD958 80240558 0080982D */ daddu $s3, $a0, $zero -/* DAD95C 8024055C AFBF0058 */ sw $ra, 0x58($sp) -/* DAD960 80240560 AFB50054 */ sw $s5, 0x54($sp) -/* DAD964 80240564 AFB40050 */ sw $s4, 0x50($sp) -/* DAD968 80240568 AFB20048 */ sw $s2, 0x48($sp) -/* DAD96C 8024056C AFB10044 */ sw $s1, 0x44($sp) -/* DAD970 80240570 AFB00040 */ sw $s0, 0x40($sp) -/* DAD974 80240574 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* DAD978 80240578 F7B80070 */ sdc1 $f24, 0x70($sp) -/* DAD97C 8024057C F7B60068 */ sdc1 $f22, 0x68($sp) -/* DAD980 80240580 F7B40060 */ sdc1 $f20, 0x60($sp) -/* DAD984 80240584 8E710148 */ lw $s1, 0x148($s3) -/* DAD988 80240588 00A0902D */ daddu $s2, $a1, $zero -/* DAD98C 8024058C 86240008 */ lh $a0, 8($s1) -/* DAD990 80240590 0C00EABB */ jal get_npc_unsafe -/* DAD994 80240594 00C0A82D */ daddu $s5, $a2, $zero -/* DAD998 80240598 0040802D */ daddu $s0, $v0, $zero -/* DAD99C 8024059C 0000A02D */ daddu $s4, $zero, $zero -/* DAD9A0 802405A0 C624007C */ lwc1 $f4, 0x7c($s1) -/* DAD9A4 802405A4 46802120 */ cvt.s.w $f4, $f4 -/* DAD9A8 802405A8 C6220088 */ lwc1 $f2, 0x88($s1) -/* DAD9AC 802405AC 468010A0 */ cvt.s.w $f2, $f2 -/* DAD9B0 802405B0 460010A1 */ cvt.d.s $f2, $f2 -/* DAD9B4 802405B4 46002121 */ cvt.d.s $f4, $f4 -/* DAD9B8 802405B8 C600003C */ lwc1 $f0, 0x3c($s0) -/* DAD9BC 802405BC 3C014059 */ lui $at, 0x4059 -/* DAD9C0 802405C0 44813800 */ mtc1 $at, $f7 -/* DAD9C4 802405C4 44803000 */ mtc1 $zero, $f6 -/* DAD9C8 802405C8 46000021 */ cvt.d.s $f0, $f0 -/* DAD9CC 802405CC 46260002 */ mul.d $f0, $f0, $f6 -/* DAD9D0 802405D0 00000000 */ nop -/* DAD9D4 802405D4 24020001 */ addiu $v0, $zero, 1 -/* DAD9D8 802405D8 8E24006C */ lw $a0, 0x6c($s1) -/* DAD9DC 802405DC 46261083 */ div.d $f2, $f2, $f6 -/* DAD9E0 802405E0 462010A0 */ cvt.s.d $f2, $f2 -/* DAD9E4 802405E4 46262103 */ div.d $f4, $f4, $f6 -/* DAD9E8 802405E8 46202520 */ cvt.s.d $f20, $f4 -/* DAD9EC 802405EC 30830011 */ andi $v1, $a0, 0x11 -/* DAD9F0 802405F0 4620020D */ trunc.w.d $f8, $f0 -/* DAD9F4 802405F4 E628007C */ swc1 $f8, 0x7c($s1) -/* DAD9F8 802405F8 C6200078 */ lwc1 $f0, 0x78($s1) -/* DAD9FC 802405FC 46800020 */ cvt.s.w $f0, $f0 -/* DADA00 80240600 46000021 */ cvt.d.s $f0, $f0 -/* DADA04 80240604 46260003 */ div.d $f0, $f0, $f6 -/* DADA08 80240608 462006A0 */ cvt.s.d $f26, $f0 -/* DADA0C 8024060C C6200070 */ lwc1 $f0, 0x70($s1) -/* DADA10 80240610 46800020 */ cvt.s.w $f0, $f0 -/* DADA14 80240614 46000021 */ cvt.d.s $f0, $f0 -/* DADA18 80240618 46260003 */ div.d $f0, $f0, $f6 -/* DADA1C 8024061C 462005A0 */ cvt.s.d $f22, $f0 -/* DADA20 80240620 14620025 */ bne $v1, $v0, .L802406B8 -/* DADA24 80240624 4602D600 */ add.s $f24, $f26, $f2 -/* DADA28 80240628 8E020000 */ lw $v0, ($s0) -/* DADA2C 8024062C 30420008 */ andi $v0, $v0, 8 -/* DADA30 80240630 10400009 */ beqz $v0, .L80240658 -/* DADA34 80240634 27A50028 */ addiu $a1, $sp, 0x28 -/* DADA38 80240638 C600003C */ lwc1 $f0, 0x3c($s0) -/* DADA3C 8024063C 4600C001 */ sub.s $f0, $f24, $f0 -/* DADA40 80240640 4600B03C */ c.lt.s $f22, $f0 -/* DADA44 80240644 00000000 */ nop -/* DADA48 80240648 4500001B */ bc1f .L802406B8 -/* DADA4C 8024064C 34820010 */ ori $v0, $a0, 0x10 -/* DADA50 80240650 080901AE */ j .L802406B8 -/* DADA54 80240654 AE22006C */ sw $v0, 0x6c($s1) -.L80240658: -/* DADA58 80240658 27A6002C */ addiu $a2, $sp, 0x2c -/* DADA5C 8024065C C6000038 */ lwc1 $f0, 0x38($s0) -/* DADA60 80240660 C602003C */ lwc1 $f2, 0x3c($s0) -/* DADA64 80240664 C6040040 */ lwc1 $f4, 0x40($s0) -/* DADA68 80240668 3C01447A */ lui $at, 0x447a -/* DADA6C 8024066C 44813000 */ mtc1 $at, $f6 -/* DADA70 80240670 27A20034 */ addiu $v0, $sp, 0x34 -/* DADA74 80240674 E7A00028 */ swc1 $f0, 0x28($sp) -/* DADA78 80240678 E7A2002C */ swc1 $f2, 0x2c($sp) -/* DADA7C 8024067C E7A40030 */ swc1 $f4, 0x30($sp) -/* DADA80 80240680 E7A60034 */ swc1 $f6, 0x34($sp) -/* DADA84 80240684 AFA20010 */ sw $v0, 0x10($sp) -/* DADA88 80240688 8E040080 */ lw $a0, 0x80($s0) -/* DADA8C 8024068C 0C0372DF */ jal func_800DCB7C -/* DADA90 80240690 27A70030 */ addiu $a3, $sp, 0x30 -/* DADA94 80240694 C7A00034 */ lwc1 $f0, 0x34($sp) -/* DADA98 80240698 4600D001 */ sub.s $f0, $f26, $f0 -/* DADA9C 8024069C 4600B03C */ c.lt.s $f22, $f0 -/* DADAA0 802406A0 00000000 */ nop -/* DADAA4 802406A4 45000004 */ bc1f .L802406B8 -/* DADAA8 802406A8 00000000 */ nop -/* DADAAC 802406AC 8E22006C */ lw $v0, 0x6c($s1) -/* DADAB0 802406B0 34420010 */ ori $v0, $v0, 0x10 -/* DADAB4 802406B4 AE22006C */ sw $v0, 0x6c($s1) -.L802406B8: -/* DADAB8 802406B8 8E22006C */ lw $v0, 0x6c($s1) -/* DADABC 802406BC 24030011 */ addiu $v1, $zero, 0x11 -/* DADAC0 802406C0 30420011 */ andi $v0, $v0, 0x11 -/* DADAC4 802406C4 14430039 */ bne $v0, $v1, .L802407AC -/* DADAC8 802406C8 00000000 */ nop -/* DADACC 802406CC 8E020000 */ lw $v0, ($s0) -/* DADAD0 802406D0 30420008 */ andi $v0, $v0, 8 -/* DADAD4 802406D4 1040000A */ beqz $v0, .L80240700 -/* DADAD8 802406D8 4600C106 */ mov.s $f4, $f24 -/* DADADC 802406DC 4614C081 */ sub.s $f2, $f24, $f20 -/* DADAE0 802406E0 3C018024 */ lui $at, 0x8024 -/* DADAE4 802406E4 D4204CB8 */ ldc1 $f0, 0x4cb8($at) -/* DADAE8 802406E8 460010A1 */ cvt.d.s $f2, $f2 -/* DADAEC 802406EC 46201082 */ mul.d $f2, $f2, $f0 -/* DADAF0 802406F0 00000000 */ nop -/* DADAF4 802406F4 4600A021 */ cvt.d.s $f0, $f20 -/* DADAF8 802406F8 080901D9 */ j .L80240764 -/* DADAFC 802406FC 46220000 */ add.d $f0, $f0, $f2 -.L80240700: -/* DADB00 80240700 27A50028 */ addiu $a1, $sp, 0x28 -/* DADB04 80240704 27A6002C */ addiu $a2, $sp, 0x2c -/* DADB08 80240708 C6000038 */ lwc1 $f0, 0x38($s0) -/* DADB0C 8024070C C6020040 */ lwc1 $f2, 0x40($s0) -/* DADB10 80240710 3C01447A */ lui $at, 0x447a -/* DADB14 80240714 44812000 */ mtc1 $at, $f4 -/* DADB18 80240718 27A20034 */ addiu $v0, $sp, 0x34 -/* DADB1C 8024071C E7B4002C */ swc1 $f20, 0x2c($sp) -/* DADB20 80240720 E7A00028 */ swc1 $f0, 0x28($sp) -/* DADB24 80240724 E7A20030 */ swc1 $f2, 0x30($sp) -/* DADB28 80240728 E7A40034 */ swc1 $f4, 0x34($sp) -/* DADB2C 8024072C AFA20010 */ sw $v0, 0x10($sp) -/* DADB30 80240730 8E040080 */ lw $a0, 0x80($s0) -/* DADB34 80240734 0C0372DF */ jal func_800DCB7C -/* DADB38 80240738 27A70030 */ addiu $a3, $sp, 0x30 -/* DADB3C 8024073C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* DADB40 80240740 461A2100 */ add.s $f4, $f4, $f26 -/* DADB44 80240744 46142081 */ sub.s $f2, $f4, $f20 -/* DADB48 80240748 3C018024 */ lui $at, 0x8024 -/* DADB4C 8024074C D4204CC0 */ ldc1 $f0, 0x4cc0($at) -/* DADB50 80240750 460010A1 */ cvt.d.s $f2, $f2 -/* DADB54 80240754 46201082 */ mul.d $f2, $f2, $f0 -/* DADB58 80240758 00000000 */ nop -/* DADB5C 8024075C 4600A021 */ cvt.d.s $f0, $f20 -/* DADB60 80240760 46220000 */ add.d $f0, $f0, $f2 -.L80240764: -/* DADB64 80240764 46200020 */ cvt.s.d $f0, $f0 -/* DADB68 80240768 E600003C */ swc1 $f0, 0x3c($s0) -/* DADB6C 8024076C C600003C */ lwc1 $f0, 0x3c($s0) -/* DADB70 80240770 46002001 */ sub.s $f0, $f4, $f0 -/* DADB74 80240774 3C013FF0 */ lui $at, 0x3ff0 -/* DADB78 80240778 44811800 */ mtc1 $at, $f3 -/* DADB7C 8024077C 44801000 */ mtc1 $zero, $f2 -/* DADB80 80240780 46000005 */ abs.s $f0, $f0 -/* DADB84 80240784 46000021 */ cvt.d.s $f0, $f0 -/* DADB88 80240788 4622003C */ c.lt.d $f0, $f2 -/* DADB8C 8024078C 00000000 */ nop -/* DADB90 80240790 45000036 */ bc1f .L8024086C -/* DADB94 80240794 2403FFEF */ addiu $v1, $zero, -0x11 -/* DADB98 80240798 E604003C */ swc1 $f4, 0x3c($s0) -/* DADB9C 8024079C 8E22006C */ lw $v0, 0x6c($s1) -/* DADBA0 802407A0 00431024 */ and $v0, $v0, $v1 -/* DADBA4 802407A4 0809021B */ j .L8024086C -/* DADBA8 802407A8 AE22006C */ sw $v0, 0x6c($s1) -.L802407AC: -/* DADBAC 802407AC 8E220070 */ lw $v0, 0x70($s1) -/* DADBB0 802407B0 1840002E */ blez $v0, .L8024086C -/* DADBB4 802407B4 00000000 */ nop -/* DADBB8 802407B8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* DADBBC 802407BC 0C00A8BB */ jal sin_deg -/* DADBC0 802407C0 46806320 */ cvt.s.w $f12, $f12 -/* DADBC4 802407C4 8E020000 */ lw $v0, ($s0) -/* DADBC8 802407C8 30420008 */ andi $v0, $v0, 8 -/* DADBCC 802407CC 10400003 */ beqz $v0, .L802407DC -/* DADBD0 802407D0 46000506 */ mov.s $f20, $f0 -/* DADBD4 802407D4 08090207 */ j .L8024081C -/* DADBD8 802407D8 0000102D */ daddu $v0, $zero, $zero -.L802407DC: -/* DADBDC 802407DC 27A50028 */ addiu $a1, $sp, 0x28 -/* DADBE0 802407E0 27A6002C */ addiu $a2, $sp, 0x2c -/* DADBE4 802407E4 C6000038 */ lwc1 $f0, 0x38($s0) -/* DADBE8 802407E8 C602003C */ lwc1 $f2, 0x3c($s0) -/* DADBEC 802407EC C6040040 */ lwc1 $f4, 0x40($s0) -/* DADBF0 802407F0 3C01447A */ lui $at, 0x447a -/* DADBF4 802407F4 44813000 */ mtc1 $at, $f6 -/* DADBF8 802407F8 27A20034 */ addiu $v0, $sp, 0x34 -/* DADBFC 802407FC E7A00028 */ swc1 $f0, 0x28($sp) -/* DADC00 80240800 E7A2002C */ swc1 $f2, 0x2c($sp) -/* DADC04 80240804 E7A40030 */ swc1 $f4, 0x30($sp) -/* DADC08 80240808 E7A60034 */ swc1 $f6, 0x34($sp) -/* DADC0C 8024080C AFA20010 */ sw $v0, 0x10($sp) -/* DADC10 80240810 8E040080 */ lw $a0, 0x80($s0) -/* DADC14 80240814 0C0372DF */ jal func_800DCB7C -/* DADC18 80240818 27A70030 */ addiu $a3, $sp, 0x30 -.L8024081C: -/* DADC1C 8024081C 10400007 */ beqz $v0, .L8024083C -/* DADC20 80240820 00000000 */ nop -/* DADC24 80240824 4616A082 */ mul.s $f2, $f20, $f22 -/* DADC28 80240828 00000000 */ nop -/* DADC2C 8024082C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DADC30 80240830 461A0000 */ add.s $f0, $f0, $f26 -/* DADC34 80240834 08090212 */ j .L80240848 -/* DADC38 80240838 46020000 */ add.s $f0, $f0, $f2 -.L8024083C: -/* DADC3C 8024083C 4616A002 */ mul.s $f0, $f20, $f22 -/* DADC40 80240840 00000000 */ nop -/* DADC44 80240844 4600C000 */ add.s $f0, $f24, $f0 -.L80240848: -/* DADC48 80240848 E600003C */ swc1 $f0, 0x3c($s0) -/* DADC4C 8024084C 8E220074 */ lw $v0, 0x74($s1) -/* DADC50 80240850 2442000A */ addiu $v0, $v0, 0xa -/* DADC54 80240854 44826000 */ mtc1 $v0, $f12 -/* DADC58 80240858 00000000 */ nop -/* DADC5C 8024085C 0C00A6C9 */ jal clamp_angle -/* DADC60 80240860 46806320 */ cvt.s.w $f12, $f12 -/* DADC64 80240864 4600020D */ trunc.w.s $f8, $f0 -/* DADC68 80240868 E6280074 */ swc1 $f8, 0x74($s1) -.L8024086C: -/* DADC6C 8024086C 8E220090 */ lw $v0, 0x90($s1) -/* DADC70 80240870 1C40004A */ bgtz $v0, .L8024099C -/* DADC74 80240874 2442FFFF */ addiu $v0, $v0, -1 -/* DADC78 80240878 8E430014 */ lw $v1, 0x14($s2) -/* DADC7C 8024087C 04600048 */ bltz $v1, .L802409A0 -/* DADC80 80240880 00000000 */ nop -/* DADC84 80240884 8E620074 */ lw $v0, 0x74($s3) -/* DADC88 80240888 1C400042 */ bgtz $v0, .L80240994 -/* DADC8C 8024088C 2442FFFF */ addiu $v0, $v0, -1 -/* DADC90 80240890 AE630074 */ sw $v1, 0x74($s3) -/* DADC94 80240894 860200A8 */ lh $v0, 0xa8($s0) -/* DADC98 80240898 C602003C */ lwc1 $f2, 0x3c($s0) -/* DADC9C 8024089C 44820000 */ mtc1 $v0, $f0 -/* DADCA0 802408A0 00000000 */ nop -/* DADCA4 802408A4 46800020 */ cvt.s.w $f0, $f0 -/* DADCA8 802408A8 46001080 */ add.s $f2, $f2, $f0 -/* DADCAC 802408AC 3C014024 */ lui $at, 0x4024 -/* DADCB0 802408B0 44810800 */ mtc1 $at, $f1 -/* DADCB4 802408B4 44800000 */ mtc1 $zero, $f0 -/* DADCB8 802408B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DADCBC 802408BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DADCC0 802408C0 460010A1 */ cvt.d.s $f2, $f2 -/* DADCC4 802408C4 46201080 */ add.d $f2, $f2, $f0 -/* DADCC8 802408C8 C440002C */ lwc1 $f0, 0x2c($v0) -/* DADCCC 802408CC 46000021 */ cvt.d.s $f0, $f0 -/* DADCD0 802408D0 4622003C */ c.lt.d $f0, $f2 -/* DADCD4 802408D4 00000000 */ nop -/* DADCD8 802408D8 4500002C */ bc1f .L8024098C -/* DADCDC 802408DC 02A0202D */ daddu $a0, $s5, $zero -/* DADCE0 802408E0 AFA00010 */ sw $zero, 0x10($sp) -/* DADCE4 802408E4 8E46000C */ lw $a2, 0xc($s2) -/* DADCE8 802408E8 8E470010 */ lw $a3, 0x10($s2) -/* DADCEC 802408EC 0C01242D */ jal func_800490B4 -/* DADCF0 802408F0 0220282D */ daddu $a1, $s1, $zero -/* DADCF4 802408F4 10400025 */ beqz $v0, .L8024098C -/* DADCF8 802408F8 0000202D */ daddu $a0, $zero, $zero -/* DADCFC 802408FC 0200282D */ daddu $a1, $s0, $zero -/* DADD00 80240900 0000302D */ daddu $a2, $zero, $zero -/* DADD04 80240904 2412000C */ addiu $s2, $zero, 0xc -/* DADD08 80240908 860300A8 */ lh $v1, 0xa8($s0) -/* DADD0C 8024090C 3C013F80 */ lui $at, 0x3f80 -/* DADD10 80240910 44810000 */ mtc1 $at, $f0 -/* DADD14 80240914 3C014000 */ lui $at, 0x4000 -/* DADD18 80240918 44811000 */ mtc1 $at, $f2 -/* DADD1C 8024091C 3C01C1A0 */ lui $at, 0xc1a0 -/* DADD20 80240920 44812000 */ mtc1 $at, $f4 -/* DADD24 80240924 44834000 */ mtc1 $v1, $f8 -/* DADD28 80240928 00000000 */ nop -/* DADD2C 8024092C 46804220 */ cvt.s.w $f8, $f8 -/* DADD30 80240930 44074000 */ mfc1 $a3, $f8 -/* DADD34 80240934 27A20038 */ addiu $v0, $sp, 0x38 -/* DADD38 80240938 AFB2001C */ sw $s2, 0x1c($sp) -/* DADD3C 8024093C AFA20020 */ sw $v0, 0x20($sp) -/* DADD40 80240940 E7A00010 */ swc1 $f0, 0x10($sp) -/* DADD44 80240944 E7A20014 */ swc1 $f2, 0x14($sp) -/* DADD48 80240948 0C01BFA4 */ jal fx_emote -/* DADD4C 8024094C E7A40018 */ swc1 $f4, 0x18($sp) -/* DADD50 80240950 0200202D */ daddu $a0, $s0, $zero -/* DADD54 80240954 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DADD58 80240958 C480003C */ lwc1 $f0, 0x3c($a0) -/* DADD5C 8024095C 3C060020 */ lui $a2, 0x20 -/* DADD60 80240960 0C012530 */ jal func_800494C0 -/* DADD64 80240964 E4800064 */ swc1 $f0, 0x64($a0) -/* DADD68 80240968 8E220018 */ lw $v0, 0x18($s1) -/* DADD6C 8024096C 9442002A */ lhu $v0, 0x2a($v0) -/* DADD70 80240970 30420001 */ andi $v0, $v0, 1 -/* DADD74 80240974 10400003 */ beqz $v0, .L80240984 -/* DADD78 80240978 2402000A */ addiu $v0, $zero, 0xa -/* DADD7C 8024097C 080902D1 */ j .L80240B44 -/* DADD80 80240980 AE620070 */ sw $v0, 0x70($s3) -.L80240984: -/* DADD84 80240984 080902D1 */ j .L80240B44 -/* DADD88 80240988 AE720070 */ sw $s2, 0x70($s3) -.L8024098C: -/* DADD8C 8024098C 8E620074 */ lw $v0, 0x74($s3) -/* DADD90 80240990 2442FFFF */ addiu $v0, $v0, -1 -.L80240994: -/* DADD94 80240994 08090268 */ j .L802409A0 -/* DADD98 80240998 AE620074 */ sw $v0, 0x74($s3) -.L8024099C: -/* DADD9C 8024099C AE220090 */ sw $v0, 0x90($s1) -.L802409A0: -/* DADDA0 802409A0 8E2300D0 */ lw $v1, 0xd0($s1) -/* DADDA4 802409A4 C6000040 */ lwc1 $f0, 0x40($s0) -/* DADDA8 802409A8 C4620000 */ lwc1 $f2, ($v1) -/* DADDAC 802409AC 468010A0 */ cvt.s.w $f2, $f2 -/* DADDB0 802409B0 C4640008 */ lwc1 $f4, 8($v1) -/* DADDB4 802409B4 46802120 */ cvt.s.w $f4, $f4 -/* DADDB8 802409B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* DADDBC 802409BC 8E2200D0 */ lw $v0, 0xd0($s1) -/* DADDC0 802409C0 44051000 */ mfc1 $a1, $f2 -/* DADDC4 802409C4 C440000C */ lwc1 $f0, 0xc($v0) -/* DADDC8 802409C8 46800020 */ cvt.s.w $f0, $f0 -/* DADDCC 802409CC E7A00014 */ swc1 $f0, 0x14($sp) -/* DADDD0 802409D0 8E2200D0 */ lw $v0, 0xd0($s1) -/* DADDD4 802409D4 44062000 */ mfc1 $a2, $f4 -/* DADDD8 802409D8 C4400010 */ lwc1 $f0, 0x10($v0) -/* DADDDC 802409DC 46800020 */ cvt.s.w $f0, $f0 -/* DADDE0 802409E0 E7A00018 */ swc1 $f0, 0x18($sp) -/* DADDE4 802409E4 8C640018 */ lw $a0, 0x18($v1) -/* DADDE8 802409E8 0C0123F5 */ jal is_point_within_region -/* DADDEC 802409EC 8E070038 */ lw $a3, 0x38($s0) -/* DADDF0 802409F0 1040001A */ beqz $v0, .L80240A5C -/* DADDF4 802409F4 00000000 */ nop -/* DADDF8 802409F8 8E060038 */ lw $a2, 0x38($s0) -/* DADDFC 802409FC 8E2200D0 */ lw $v0, 0xd0($s1) -/* DADE00 80240A00 8E070040 */ lw $a3, 0x40($s0) -/* DADE04 80240A04 C44C0000 */ lwc1 $f12, ($v0) -/* DADE08 80240A08 46806320 */ cvt.s.w $f12, $f12 -/* DADE0C 80240A0C C44E0008 */ lwc1 $f14, 8($v0) -/* DADE10 80240A10 0C00A7B5 */ jal dist2D -/* DADE14 80240A14 468073A0 */ cvt.s.w $f14, $f14 -/* DADE18 80240A18 C6020018 */ lwc1 $f2, 0x18($s0) -/* DADE1C 80240A1C 4600103C */ c.lt.s $f2, $f0 -/* DADE20 80240A20 00000000 */ nop -/* DADE24 80240A24 4500000D */ bc1f .L80240A5C -/* DADE28 80240A28 E7A00034 */ swc1 $f0, 0x34($sp) -/* DADE2C 80240A2C C60C0038 */ lwc1 $f12, 0x38($s0) -/* DADE30 80240A30 8E2200D0 */ lw $v0, 0xd0($s1) -/* DADE34 80240A34 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DADE38 80240A38 C4480000 */ lwc1 $f8, ($v0) -/* DADE3C 80240A3C 46804220 */ cvt.s.w $f8, $f8 -/* DADE40 80240A40 44064000 */ mfc1 $a2, $f8 -/* DADE44 80240A44 C4480008 */ lwc1 $f8, 8($v0) -/* DADE48 80240A48 46804220 */ cvt.s.w $f8, $f8 -/* DADE4C 80240A4C 44074000 */ mfc1 $a3, $f8 -/* DADE50 80240A50 0C00A720 */ jal atan2 -/* DADE54 80240A54 24140001 */ addiu $s4, $zero, 1 -/* DADE58 80240A58 E600000C */ swc1 $f0, 0xc($s0) -.L80240A5C: -/* DADE5C 80240A5C 8E2200D0 */ lw $v0, 0xd0($s1) -/* DADE60 80240A60 8C43000C */ lw $v1, 0xc($v0) -/* DADE64 80240A64 8C420010 */ lw $v0, 0x10($v0) -/* DADE68 80240A68 00621825 */ or $v1, $v1, $v0 -/* DADE6C 80240A6C 00741825 */ or $v1, $v1, $s4 -/* DADE70 80240A70 10600008 */ beqz $v1, .L80240A94 -/* DADE74 80240A74 00000000 */ nop -/* DADE78 80240A78 8602008C */ lh $v0, 0x8c($s0) -/* DADE7C 80240A7C 14400031 */ bnez $v0, .L80240B44 -/* DADE80 80240A80 00000000 */ nop -/* DADE84 80240A84 8E050018 */ lw $a1, 0x18($s0) -/* DADE88 80240A88 8E06000C */ lw $a2, 0xc($s0) -/* DADE8C 80240A8C 0C00EA95 */ jal npc_move_heading -/* DADE90 80240A90 0200202D */ daddu $a0, $s0, $zero -.L80240A94: -/* DADE94 80240A94 C600003C */ lwc1 $f0, 0x3c($s0) -/* DADE98 80240A98 3C014059 */ lui $at, 0x4059 -/* DADE9C 80240A9C 44811800 */ mtc1 $at, $f3 -/* DADEA0 80240AA0 44801000 */ mtc1 $zero, $f2 -/* DADEA4 80240AA4 46000021 */ cvt.d.s $f0, $f0 -/* DADEA8 80240AA8 46220002 */ mul.d $f0, $f0, $f2 -/* DADEAC 80240AAC 00000000 */ nop -/* DADEB0 80240AB0 4620020D */ trunc.w.d $f8, $f0 -/* DADEB4 80240AB4 E628007C */ swc1 $f8, 0x7c($s1) -/* DADEB8 80240AB8 8E420004 */ lw $v0, 4($s2) -/* DADEBC 80240ABC 18400021 */ blez $v0, .L80240B44 -/* DADEC0 80240AC0 00000000 */ nop -/* DADEC4 80240AC4 8602008E */ lh $v0, 0x8e($s0) -/* DADEC8 80240AC8 9603008E */ lhu $v1, 0x8e($s0) -/* DADECC 80240ACC 18400005 */ blez $v0, .L80240AE4 -/* DADED0 80240AD0 2462FFFF */ addiu $v0, $v1, -1 -/* DADED4 80240AD4 A602008E */ sh $v0, 0x8e($s0) -/* DADED8 80240AD8 00021400 */ sll $v0, $v0, 0x10 -/* DADEDC 80240ADC 1C400019 */ bgtz $v0, .L80240B44 -/* DADEE0 80240AE0 00000000 */ nop -.L80240AE4: -/* DADEE4 80240AE4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DADEE8 80240AE8 24020002 */ addiu $v0, $zero, 2 -/* DADEEC 80240AEC 0C00A67F */ jal rand_int -/* DADEF0 80240AF0 AE620070 */ sw $v0, 0x70($s3) -/* DADEF4 80240AF4 3C035555 */ lui $v1, 0x5555 -/* DADEF8 80240AF8 34635556 */ ori $v1, $v1, 0x5556 -/* DADEFC 80240AFC 00430018 */ mult $v0, $v1 -/* DADF00 80240B00 000227C3 */ sra $a0, $v0, 0x1f -/* DADF04 80240B04 00004010 */ mfhi $t0 -/* DADF08 80240B08 01042023 */ subu $a0, $t0, $a0 -/* DADF0C 80240B0C 00041840 */ sll $v1, $a0, 1 -/* DADF10 80240B10 00641821 */ addu $v1, $v1, $a0 -/* DADF14 80240B14 00431023 */ subu $v0, $v0, $v1 -/* DADF18 80240B18 24430002 */ addiu $v1, $v0, 2 -/* DADF1C 80240B1C AE630074 */ sw $v1, 0x74($s3) -/* DADF20 80240B20 8E42002C */ lw $v0, 0x2c($s2) -/* DADF24 80240B24 58400007 */ blezl $v0, .L80240B44 -/* DADF28 80240B28 AE600070 */ sw $zero, 0x70($s3) -/* DADF2C 80240B2C 8E420008 */ lw $v0, 8($s2) -/* DADF30 80240B30 18400003 */ blez $v0, .L80240B40 -/* DADF34 80240B34 28620003 */ slti $v0, $v1, 3 -/* DADF38 80240B38 10400002 */ beqz $v0, .L80240B44 -/* DADF3C 80240B3C 00000000 */ nop -.L80240B40: -/* DADF40 80240B40 AE600070 */ sw $zero, 0x70($s3) -.L80240B44: -/* DADF44 80240B44 8FBF0058 */ lw $ra, 0x58($sp) -/* DADF48 80240B48 8FB50054 */ lw $s5, 0x54($sp) -/* DADF4C 80240B4C 8FB40050 */ lw $s4, 0x50($sp) -/* DADF50 80240B50 8FB3004C */ lw $s3, 0x4c($sp) -/* DADF54 80240B54 8FB20048 */ lw $s2, 0x48($sp) -/* DADF58 80240B58 8FB10044 */ lw $s1, 0x44($sp) -/* DADF5C 80240B5C 8FB00040 */ lw $s0, 0x40($sp) -/* DADF60 80240B60 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* DADF64 80240B64 D7B80070 */ ldc1 $f24, 0x70($sp) -/* DADF68 80240B68 D7B60068 */ ldc1 $f22, 0x68($sp) -/* DADF6C 80240B6C D7B40060 */ ldc1 $f20, 0x60($sp) -/* DADF70 80240B70 03E00008 */ jr $ra -/* DADF74 80240B74 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_80240B78_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_80240B78_DAD400.s deleted file mode 100644 index 7a4d79f352..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_80240B78_DAD400.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B78_DADF78 -/* DADF78 80240B78 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DADF7C 80240B7C AFB3001C */ sw $s3, 0x1c($sp) -/* DADF80 80240B80 0080982D */ daddu $s3, $a0, $zero -/* DADF84 80240B84 AFBF0020 */ sw $ra, 0x20($sp) -/* DADF88 80240B88 AFB20018 */ sw $s2, 0x18($sp) -/* DADF8C 80240B8C AFB10014 */ sw $s1, 0x14($sp) -/* DADF90 80240B90 AFB00010 */ sw $s0, 0x10($sp) -/* DADF94 80240B94 8E720148 */ lw $s2, 0x148($s3) -/* DADF98 80240B98 86440008 */ lh $a0, 8($s2) -/* DADF9C 80240B9C 0C00EABB */ jal get_npc_unsafe -/* DADFA0 80240BA0 00A0882D */ daddu $s1, $a1, $zero -/* DADFA4 80240BA4 8E240008 */ lw $a0, 8($s1) -/* DADFA8 80240BA8 0040802D */ daddu $s0, $v0, $zero -/* DADFAC 80240BAC 00041FC2 */ srl $v1, $a0, 0x1f -/* DADFB0 80240BB0 00832021 */ addu $a0, $a0, $v1 -/* DADFB4 80240BB4 00042043 */ sra $a0, $a0, 1 -/* DADFB8 80240BB8 0C00A67F */ jal rand_int -/* DADFBC 80240BBC 24840001 */ addiu $a0, $a0, 1 -/* DADFC0 80240BC0 8E230008 */ lw $v1, 8($s1) -/* DADFC4 80240BC4 240400B4 */ addiu $a0, $zero, 0xb4 -/* DADFC8 80240BC8 00032FC2 */ srl $a1, $v1, 0x1f -/* DADFCC 80240BCC 00651821 */ addu $v1, $v1, $a1 -/* DADFD0 80240BD0 00031843 */ sra $v1, $v1, 1 -/* DADFD4 80240BD4 00621821 */ addu $v1, $v1, $v0 -/* DADFD8 80240BD8 0C00A67F */ jal rand_int -/* DADFDC 80240BDC A603008E */ sh $v1, 0x8e($s0) -/* DADFE0 80240BE0 C60C000C */ lwc1 $f12, 0xc($s0) -/* DADFE4 80240BE4 44820000 */ mtc1 $v0, $f0 -/* DADFE8 80240BE8 00000000 */ nop -/* DADFEC 80240BEC 46800020 */ cvt.s.w $f0, $f0 -/* DADFF0 80240BF0 46006300 */ add.s $f12, $f12, $f0 -/* DADFF4 80240BF4 3C0142B4 */ lui $at, 0x42b4 -/* DADFF8 80240BF8 44810000 */ mtc1 $at, $f0 -/* DADFFC 80240BFC 0C00A6C9 */ jal clamp_angle -/* DAE000 80240C00 46006301 */ sub.s $f12, $f12, $f0 -/* DAE004 80240C04 E600000C */ swc1 $f0, 0xc($s0) -/* DAE008 80240C08 8E4200CC */ lw $v0, 0xcc($s2) -/* DAE00C 80240C0C 8C420000 */ lw $v0, ($v0) -/* DAE010 80240C10 AE020028 */ sw $v0, 0x28($s0) -/* DAE014 80240C14 24020003 */ addiu $v0, $zero, 3 -/* DAE018 80240C18 AE620070 */ sw $v0, 0x70($s3) -/* DAE01C 80240C1C 8FBF0020 */ lw $ra, 0x20($sp) -/* DAE020 80240C20 8FB3001C */ lw $s3, 0x1c($sp) -/* DAE024 80240C24 8FB20018 */ lw $s2, 0x18($sp) -/* DAE028 80240C28 8FB10014 */ lw $s1, 0x14($sp) -/* DAE02C 80240C2C 8FB00010 */ lw $s0, 0x10($sp) -/* DAE030 80240C30 03E00008 */ jr $ra -/* DAE034 80240C34 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_80240C38_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_80240C38_DAD400.s deleted file mode 100644 index 1a52fd6338..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_80240C38_DAD400.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C38_DAE038 -/* DAE038 80240C38 27BDFF88 */ addiu $sp, $sp, -0x78 -/* DAE03C 80240C3C AFB3004C */ sw $s3, 0x4c($sp) -/* DAE040 80240C40 0080982D */ daddu $s3, $a0, $zero -/* DAE044 80240C44 AFBF0054 */ sw $ra, 0x54($sp) -/* DAE048 80240C48 AFB40050 */ sw $s4, 0x50($sp) -/* DAE04C 80240C4C AFB20048 */ sw $s2, 0x48($sp) -/* DAE050 80240C50 AFB10044 */ sw $s1, 0x44($sp) -/* DAE054 80240C54 AFB00040 */ sw $s0, 0x40($sp) -/* DAE058 80240C58 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* DAE05C 80240C5C F7B80068 */ sdc1 $f24, 0x68($sp) -/* DAE060 80240C60 F7B60060 */ sdc1 $f22, 0x60($sp) -/* DAE064 80240C64 F7B40058 */ sdc1 $f20, 0x58($sp) -/* DAE068 80240C68 8E710148 */ lw $s1, 0x148($s3) -/* DAE06C 80240C6C 00A0902D */ daddu $s2, $a1, $zero -/* DAE070 80240C70 86240008 */ lh $a0, 8($s1) -/* DAE074 80240C74 0C00EABB */ jal get_npc_unsafe -/* DAE078 80240C78 00C0A02D */ daddu $s4, $a2, $zero -/* DAE07C 80240C7C 0040802D */ daddu $s0, $v0, $zero -/* DAE080 80240C80 C6200078 */ lwc1 $f0, 0x78($s1) -/* DAE084 80240C84 46800020 */ cvt.s.w $f0, $f0 -/* DAE088 80240C88 46000021 */ cvt.d.s $f0, $f0 -/* DAE08C 80240C8C 3C014059 */ lui $at, 0x4059 -/* DAE090 80240C90 44811800 */ mtc1 $at, $f3 -/* DAE094 80240C94 44801000 */ mtc1 $zero, $f2 -/* DAE098 80240C98 8602008E */ lh $v0, 0x8e($s0) -/* DAE09C 80240C9C 9603008E */ lhu $v1, 0x8e($s0) -/* DAE0A0 80240CA0 46220003 */ div.d $f0, $f0, $f2 -/* DAE0A4 80240CA4 46200620 */ cvt.s.d $f24, $f0 -/* DAE0A8 80240CA8 C6200088 */ lwc1 $f0, 0x88($s1) -/* DAE0AC 80240CAC 46800020 */ cvt.s.w $f0, $f0 -/* DAE0B0 80240CB0 46000021 */ cvt.d.s $f0, $f0 -/* DAE0B4 80240CB4 46220003 */ div.d $f0, $f0, $f2 -/* DAE0B8 80240CB8 46200020 */ cvt.s.d $f0, $f0 -/* DAE0BC 80240CBC 18400003 */ blez $v0, .L80240CCC -/* DAE0C0 80240CC0 4600C680 */ add.s $f26, $f24, $f0 -/* DAE0C4 80240CC4 2462FFFF */ addiu $v0, $v1, -1 -/* DAE0C8 80240CC8 A602008E */ sh $v0, 0x8e($s0) -.L80240CCC: -/* DAE0CC 80240CCC 8E220070 */ lw $v0, 0x70($s1) -/* DAE0D0 80240CD0 18400034 */ blez $v0, .L80240DA4 -/* DAE0D4 80240CD4 00000000 */ nop -/* DAE0D8 80240CD8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* DAE0DC 80240CDC 46806320 */ cvt.s.w $f12, $f12 -/* DAE0E0 80240CE0 44820000 */ mtc1 $v0, $f0 -/* DAE0E4 80240CE4 00000000 */ nop -/* DAE0E8 80240CE8 46800020 */ cvt.s.w $f0, $f0 -/* DAE0EC 80240CEC 46000021 */ cvt.d.s $f0, $f0 -/* DAE0F0 80240CF0 46220003 */ div.d $f0, $f0, $f2 -/* DAE0F4 80240CF4 0C00A8BB */ jal sin_deg -/* DAE0F8 80240CF8 462005A0 */ cvt.s.d $f22, $f0 -/* DAE0FC 80240CFC 8E020000 */ lw $v0, ($s0) -/* DAE100 80240D00 30420008 */ andi $v0, $v0, 8 -/* DAE104 80240D04 10400003 */ beqz $v0, .L80240D14 -/* DAE108 80240D08 46000506 */ mov.s $f20, $f0 -/* DAE10C 80240D0C 08090355 */ j .L80240D54 -/* DAE110 80240D10 0000102D */ daddu $v0, $zero, $zero -.L80240D14: -/* DAE114 80240D14 27A50028 */ addiu $a1, $sp, 0x28 -/* DAE118 80240D18 27A6002C */ addiu $a2, $sp, 0x2c -/* DAE11C 80240D1C C6000038 */ lwc1 $f0, 0x38($s0) -/* DAE120 80240D20 C602003C */ lwc1 $f2, 0x3c($s0) -/* DAE124 80240D24 C6040040 */ lwc1 $f4, 0x40($s0) -/* DAE128 80240D28 3C01447A */ lui $at, 0x447a -/* DAE12C 80240D2C 44813000 */ mtc1 $at, $f6 -/* DAE130 80240D30 27A20034 */ addiu $v0, $sp, 0x34 -/* DAE134 80240D34 E7A00028 */ swc1 $f0, 0x28($sp) -/* DAE138 80240D38 E7A2002C */ swc1 $f2, 0x2c($sp) -/* DAE13C 80240D3C E7A40030 */ swc1 $f4, 0x30($sp) -/* DAE140 80240D40 E7A60034 */ swc1 $f6, 0x34($sp) -/* DAE144 80240D44 AFA20010 */ sw $v0, 0x10($sp) -/* DAE148 80240D48 8E040080 */ lw $a0, 0x80($s0) -/* DAE14C 80240D4C 0C0372DF */ jal func_800DCB7C -/* DAE150 80240D50 27A70030 */ addiu $a3, $sp, 0x30 -.L80240D54: -/* DAE154 80240D54 10400007 */ beqz $v0, .L80240D74 -/* DAE158 80240D58 00000000 */ nop -/* DAE15C 80240D5C 4616A082 */ mul.s $f2, $f20, $f22 -/* DAE160 80240D60 00000000 */ nop -/* DAE164 80240D64 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DAE168 80240D68 46180000 */ add.s $f0, $f0, $f24 -/* DAE16C 80240D6C 08090360 */ j .L80240D80 -/* DAE170 80240D70 46020000 */ add.s $f0, $f0, $f2 -.L80240D74: -/* DAE174 80240D74 4616A002 */ mul.s $f0, $f20, $f22 -/* DAE178 80240D78 00000000 */ nop -/* DAE17C 80240D7C 4600D000 */ add.s $f0, $f26, $f0 -.L80240D80: -/* DAE180 80240D80 E600003C */ swc1 $f0, 0x3c($s0) -/* DAE184 80240D84 8E220074 */ lw $v0, 0x74($s1) -/* DAE188 80240D88 2442000A */ addiu $v0, $v0, 0xa -/* DAE18C 80240D8C 44826000 */ mtc1 $v0, $f12 -/* DAE190 80240D90 00000000 */ nop -/* DAE194 80240D94 0C00A6C9 */ jal clamp_angle -/* DAE198 80240D98 46806320 */ cvt.s.w $f12, $f12 -/* DAE19C 80240D9C 4600020D */ trunc.w.s $f8, $f0 -/* DAE1A0 80240DA0 E6280074 */ swc1 $f8, 0x74($s1) -.L80240DA4: -/* DAE1A4 80240DA4 8E220090 */ lw $v0, 0x90($s1) -/* DAE1A8 80240DA8 1C400040 */ bgtz $v0, .L80240EAC -/* DAE1AC 80240DAC 2442FFFF */ addiu $v0, $v0, -1 -/* DAE1B0 80240DB0 860200A8 */ lh $v0, 0xa8($s0) -/* DAE1B4 80240DB4 C600003C */ lwc1 $f0, 0x3c($s0) -/* DAE1B8 80240DB8 44821000 */ mtc1 $v0, $f2 -/* DAE1BC 80240DBC 00000000 */ nop -/* DAE1C0 80240DC0 468010A0 */ cvt.s.w $f2, $f2 -/* DAE1C4 80240DC4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DAE1C8 80240DC8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DAE1CC 80240DCC 46020000 */ add.s $f0, $f0, $f2 -/* DAE1D0 80240DD0 3C014024 */ lui $at, 0x4024 -/* DAE1D4 80240DD4 44812800 */ mtc1 $at, $f5 -/* DAE1D8 80240DD8 44802000 */ mtc1 $zero, $f4 -/* DAE1DC 80240DDC C442002C */ lwc1 $f2, 0x2c($v0) -/* DAE1E0 80240DE0 46000021 */ cvt.d.s $f0, $f0 -/* DAE1E4 80240DE4 46240000 */ add.d $f0, $f0, $f4 -/* DAE1E8 80240DE8 460010A1 */ cvt.d.s $f2, $f2 -/* DAE1EC 80240DEC 4620103C */ c.lt.d $f2, $f0 -/* DAE1F0 80240DF0 00000000 */ nop -/* DAE1F4 80240DF4 4500002E */ bc1f .L80240EB0 -/* DAE1F8 80240DF8 0280202D */ daddu $a0, $s4, $zero -/* DAE1FC 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* DAE200 80240E00 AFA20010 */ sw $v0, 0x10($sp) -/* DAE204 80240E04 8E460024 */ lw $a2, 0x24($s2) -/* DAE208 80240E08 8E470028 */ lw $a3, 0x28($s2) -/* DAE20C 80240E0C 0C01242D */ jal func_800490B4 -/* DAE210 80240E10 0220282D */ daddu $a1, $s1, $zero -/* DAE214 80240E14 10400026 */ beqz $v0, .L80240EB0 -/* DAE218 80240E18 0000202D */ daddu $a0, $zero, $zero -/* DAE21C 80240E1C 0200282D */ daddu $a1, $s0, $zero -/* DAE220 80240E20 0000302D */ daddu $a2, $zero, $zero -/* DAE224 80240E24 2412000C */ addiu $s2, $zero, 0xc -/* DAE228 80240E28 860300A8 */ lh $v1, 0xa8($s0) -/* DAE22C 80240E2C 3C013F80 */ lui $at, 0x3f80 -/* DAE230 80240E30 44810000 */ mtc1 $at, $f0 -/* DAE234 80240E34 3C014000 */ lui $at, 0x4000 -/* DAE238 80240E38 44811000 */ mtc1 $at, $f2 -/* DAE23C 80240E3C 3C01C1A0 */ lui $at, 0xc1a0 -/* DAE240 80240E40 44812000 */ mtc1 $at, $f4 -/* DAE244 80240E44 44834000 */ mtc1 $v1, $f8 -/* DAE248 80240E48 00000000 */ nop -/* DAE24C 80240E4C 46804220 */ cvt.s.w $f8, $f8 -/* DAE250 80240E50 44074000 */ mfc1 $a3, $f8 -/* DAE254 80240E54 27A20038 */ addiu $v0, $sp, 0x38 -/* DAE258 80240E58 AFB2001C */ sw $s2, 0x1c($sp) -/* DAE25C 80240E5C AFA20020 */ sw $v0, 0x20($sp) -/* DAE260 80240E60 E7A00010 */ swc1 $f0, 0x10($sp) -/* DAE264 80240E64 E7A20014 */ swc1 $f2, 0x14($sp) -/* DAE268 80240E68 0C01BFA4 */ jal fx_emote -/* DAE26C 80240E6C E7A40018 */ swc1 $f4, 0x18($sp) -/* DAE270 80240E70 0200202D */ daddu $a0, $s0, $zero -/* DAE274 80240E74 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DAE278 80240E78 C480003C */ lwc1 $f0, 0x3c($a0) -/* DAE27C 80240E7C 3C060020 */ lui $a2, 0x20 -/* DAE280 80240E80 0C012530 */ jal func_800494C0 -/* DAE284 80240E84 E4800064 */ swc1 $f0, 0x64($a0) -/* DAE288 80240E88 8E220018 */ lw $v0, 0x18($s1) -/* DAE28C 80240E8C 9442002A */ lhu $v0, 0x2a($v0) -/* DAE290 80240E90 30420001 */ andi $v0, $v0, 1 -/* DAE294 80240E94 10400003 */ beqz $v0, .L80240EA4 -/* DAE298 80240E98 2402000A */ addiu $v0, $zero, 0xa -/* DAE29C 80240E9C 080903D3 */ j .L80240F4C -/* DAE2A0 80240EA0 AE620070 */ sw $v0, 0x70($s3) -.L80240EA4: -/* DAE2A4 80240EA4 080903D3 */ j .L80240F4C -/* DAE2A8 80240EA8 AE720070 */ sw $s2, 0x70($s3) -.L80240EAC: -/* DAE2AC 80240EAC AE220090 */ sw $v0, 0x90($s1) -.L80240EB0: -/* DAE2B0 80240EB0 8602008C */ lh $v0, 0x8c($s0) -/* DAE2B4 80240EB4 14400025 */ bnez $v0, .L80240F4C -/* DAE2B8 80240EB8 00000000 */ nop -/* DAE2BC 80240EBC 8602008E */ lh $v0, 0x8e($s0) -/* DAE2C0 80240EC0 1C400022 */ bgtz $v0, .L80240F4C -/* DAE2C4 80240EC4 00000000 */ nop -/* DAE2C8 80240EC8 8E620074 */ lw $v0, 0x74($s3) -/* DAE2CC 80240ECC 2442FFFF */ addiu $v0, $v0, -1 -/* DAE2D0 80240ED0 1840001D */ blez $v0, .L80240F48 -/* DAE2D4 80240ED4 AE620074 */ sw $v0, 0x74($s3) -/* DAE2D8 80240ED8 8E220018 */ lw $v0, 0x18($s1) -/* DAE2DC 80240EDC 9442002A */ lhu $v0, 0x2a($v0) -/* DAE2E0 80240EE0 30420010 */ andi $v0, $v0, 0x10 -/* DAE2E4 80240EE4 14400007 */ bnez $v0, .L80240F04 -/* DAE2E8 80240EE8 00000000 */ nop -/* DAE2EC 80240EEC C600000C */ lwc1 $f0, 0xc($s0) -/* DAE2F0 80240EF0 3C014334 */ lui $at, 0x4334 -/* DAE2F4 80240EF4 44816000 */ mtc1 $at, $f12 -/* DAE2F8 80240EF8 0C00A6C9 */ jal clamp_angle -/* DAE2FC 80240EFC 460C0300 */ add.s $f12, $f0, $f12 -/* DAE300 80240F00 E600000C */ swc1 $f0, 0xc($s0) -.L80240F04: -/* DAE304 80240F04 0C00A67F */ jal rand_int -/* DAE308 80240F08 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DAE30C 80240F0C 3C032E8B */ lui $v1, 0x2e8b -/* DAE310 80240F10 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* DAE314 80240F14 00430018 */ mult $v0, $v1 -/* DAE318 80240F18 00021FC3 */ sra $v1, $v0, 0x1f -/* DAE31C 80240F1C 00004010 */ mfhi $t0 -/* DAE320 80240F20 00082043 */ sra $a0, $t0, 1 -/* DAE324 80240F24 00832023 */ subu $a0, $a0, $v1 -/* DAE328 80240F28 00041840 */ sll $v1, $a0, 1 -/* DAE32C 80240F2C 00641821 */ addu $v1, $v1, $a0 -/* DAE330 80240F30 00031880 */ sll $v1, $v1, 2 -/* DAE334 80240F34 00641823 */ subu $v1, $v1, $a0 -/* DAE338 80240F38 00431023 */ subu $v0, $v0, $v1 -/* DAE33C 80240F3C 24420005 */ addiu $v0, $v0, 5 -/* DAE340 80240F40 080903D3 */ j .L80240F4C -/* DAE344 80240F44 A602008E */ sh $v0, 0x8e($s0) -.L80240F48: -/* DAE348 80240F48 AE600070 */ sw $zero, 0x70($s3) -.L80240F4C: -/* DAE34C 80240F4C 8FBF0054 */ lw $ra, 0x54($sp) -/* DAE350 80240F50 8FB40050 */ lw $s4, 0x50($sp) -/* DAE354 80240F54 8FB3004C */ lw $s3, 0x4c($sp) -/* DAE358 80240F58 8FB20048 */ lw $s2, 0x48($sp) -/* DAE35C 80240F5C 8FB10044 */ lw $s1, 0x44($sp) -/* DAE360 80240F60 8FB00040 */ lw $s0, 0x40($sp) -/* DAE364 80240F64 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* DAE368 80240F68 D7B80068 */ ldc1 $f24, 0x68($sp) -/* DAE36C 80240F6C D7B60060 */ ldc1 $f22, 0x60($sp) -/* DAE370 80240F70 D7B40058 */ ldc1 $f20, 0x58($sp) -/* DAE374 80240F74 03E00008 */ jr $ra -/* DAE378 80240F78 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_80240F7C_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_80240F7C_DAD400.s deleted file mode 100644 index e0ca506950..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_80240F7C_DAD400.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F7C_DAE37C -/* DAE37C 80240F7C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DAE380 80240F80 AFB20018 */ sw $s2, 0x18($sp) -/* DAE384 80240F84 0080902D */ daddu $s2, $a0, $zero -/* DAE388 80240F88 AFBF001C */ sw $ra, 0x1c($sp) -/* DAE38C 80240F8C AFB10014 */ sw $s1, 0x14($sp) -/* DAE390 80240F90 AFB00010 */ sw $s0, 0x10($sp) -/* DAE394 80240F94 8E510148 */ lw $s1, 0x148($s2) -/* DAE398 80240F98 0C00EABB */ jal get_npc_unsafe -/* DAE39C 80240F9C 86240008 */ lh $a0, 8($s1) -/* DAE3A0 80240FA0 0040802D */ daddu $s0, $v0, $zero -/* DAE3A4 80240FA4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DAE3A8 80240FA8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DAE3AC 80240FAC C60C0038 */ lwc1 $f12, 0x38($s0) -/* DAE3B0 80240FB0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DAE3B4 80240FB4 A600008E */ sh $zero, 0x8e($s0) -/* DAE3B8 80240FB8 8C460028 */ lw $a2, 0x28($v0) -/* DAE3BC 80240FBC 0C00A720 */ jal atan2 -/* DAE3C0 80240FC0 8C470030 */ lw $a3, 0x30($v0) -/* DAE3C4 80240FC4 E600000C */ swc1 $f0, 0xc($s0) -/* DAE3C8 80240FC8 8E2200CC */ lw $v0, 0xcc($s1) -/* DAE3CC 80240FCC 8C420020 */ lw $v0, 0x20($v0) -/* DAE3D0 80240FD0 AE020028 */ sw $v0, 0x28($s0) -/* DAE3D4 80240FD4 2402000B */ addiu $v0, $zero, 0xb -/* DAE3D8 80240FD8 AE420070 */ sw $v0, 0x70($s2) -/* DAE3DC 80240FDC 8FBF001C */ lw $ra, 0x1c($sp) -/* DAE3E0 80240FE0 8FB20018 */ lw $s2, 0x18($sp) -/* DAE3E4 80240FE4 8FB10014 */ lw $s1, 0x14($sp) -/* DAE3E8 80240FE8 8FB00010 */ lw $s0, 0x10($sp) -/* DAE3EC 80240FEC 03E00008 */ jr $ra -/* DAE3F0 80240FF0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_80241060_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_80241060_DAD400.s deleted file mode 100644 index 3b21595d86..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_80241060_DAD400.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241060_DAE460 -/* DAE460 80241060 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DAE464 80241064 AFB3001C */ sw $s3, 0x1c($sp) -/* DAE468 80241068 0080982D */ daddu $s3, $a0, $zero -/* DAE46C 8024106C AFBF0020 */ sw $ra, 0x20($sp) -/* DAE470 80241070 AFB20018 */ sw $s2, 0x18($sp) -/* DAE474 80241074 AFB10014 */ sw $s1, 0x14($sp) -/* DAE478 80241078 AFB00010 */ sw $s0, 0x10($sp) -/* DAE47C 8024107C 8E720148 */ lw $s2, 0x148($s3) -/* DAE480 80241080 86440008 */ lh $a0, 8($s2) -/* DAE484 80241084 0C00EABB */ jal get_npc_unsafe -/* DAE488 80241088 00A0802D */ daddu $s0, $a1, $zero -/* DAE48C 8024108C 0040882D */ daddu $s1, $v0, $zero -/* DAE490 80241090 C6420080 */ lwc1 $f2, 0x80($s2) -/* DAE494 80241094 468010A0 */ cvt.s.w $f2, $f2 -/* DAE498 80241098 460010A1 */ cvt.d.s $f2, $f2 -/* DAE49C 8024109C C6400084 */ lwc1 $f0, 0x84($s2) -/* DAE4A0 802410A0 46800020 */ cvt.s.w $f0, $f0 -/* DAE4A4 802410A4 46000021 */ cvt.d.s $f0, $f0 -/* DAE4A8 802410A8 3C014059 */ lui $at, 0x4059 -/* DAE4AC 802410AC 44812800 */ mtc1 $at, $f5 -/* DAE4B0 802410B0 44802000 */ mtc1 $zero, $f4 -/* DAE4B4 802410B4 8E4200CC */ lw $v0, 0xcc($s2) -/* DAE4B8 802410B8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* DAE4BC 802410BC C62E0040 */ lwc1 $f14, 0x40($s1) -/* DAE4C0 802410C0 46241083 */ div.d $f2, $f2, $f4 -/* DAE4C4 802410C4 462010A0 */ cvt.s.d $f2, $f2 -/* DAE4C8 802410C8 46240003 */ div.d $f0, $f0, $f4 -/* DAE4CC 802410CC 8C420020 */ lw $v0, 0x20($v0) -/* DAE4D0 802410D0 46200020 */ cvt.s.d $f0, $f0 -/* DAE4D4 802410D4 E622001C */ swc1 $f2, 0x1c($s1) -/* DAE4D8 802410D8 E6200014 */ swc1 $f0, 0x14($s1) -/* DAE4DC 802410DC AE220028 */ sw $v0, 0x28($s1) -/* DAE4E0 802410E0 C6000018 */ lwc1 $f0, 0x18($s0) -/* DAE4E4 802410E4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DAE4E8 802410E8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DAE4EC 802410EC E6200018 */ swc1 $f0, 0x18($s1) -/* DAE4F0 802410F0 8C460028 */ lw $a2, 0x28($v0) -/* DAE4F4 802410F4 0C00A720 */ jal atan2 -/* DAE4F8 802410F8 8C470030 */ lw $a3, 0x30($v0) -/* DAE4FC 802410FC E620000C */ swc1 $f0, 0xc($s1) -/* DAE500 80241100 8E420018 */ lw $v0, 0x18($s2) -/* DAE504 80241104 AE400074 */ sw $zero, 0x74($s2) -/* DAE508 80241108 9442002A */ lhu $v0, 0x2a($v0) -/* DAE50C 8024110C 30420002 */ andi $v0, $v0, 2 -/* DAE510 80241110 10400005 */ beqz $v0, .L80241128 -/* DAE514 80241114 24020003 */ addiu $v0, $zero, 3 -/* DAE518 80241118 A622008E */ sh $v0, 0x8e($s1) -/* DAE51C 8024111C 2402000D */ addiu $v0, $zero, 0xd -/* DAE520 80241120 0809045E */ j .L80241178 -/* DAE524 80241124 AE620070 */ sw $v0, 0x70($s3) -.L80241128: -/* DAE528 80241128 24030001 */ addiu $v1, $zero, 1 -/* DAE52C 8024112C 2402000E */ addiu $v0, $zero, 0xe -/* DAE530 80241130 A623008E */ sh $v1, 0x8e($s1) -/* DAE534 80241134 AE620070 */ sw $v0, 0x70($s3) -/* DAE538 80241138 C6200038 */ lwc1 $f0, 0x38($s1) -/* DAE53C 8024113C 4600018D */ trunc.w.s $f6, $f0 -/* DAE540 80241140 44023000 */ mfc1 $v0, $f6 -/* DAE544 80241144 00000000 */ nop -/* DAE548 80241148 A6420010 */ sh $v0, 0x10($s2) -/* DAE54C 8024114C C620003C */ lwc1 $f0, 0x3c($s1) -/* DAE550 80241150 4600018D */ trunc.w.s $f6, $f0 -/* DAE554 80241154 44023000 */ mfc1 $v0, $f6 -/* DAE558 80241158 00000000 */ nop -/* DAE55C 8024115C A6420012 */ sh $v0, 0x12($s2) -/* DAE560 80241160 C6200040 */ lwc1 $f0, 0x40($s1) -/* DAE564 80241164 A2430007 */ sb $v1, 7($s2) -/* DAE568 80241168 4600018D */ trunc.w.s $f6, $f0 -/* DAE56C 8024116C 44023000 */ mfc1 $v0, $f6 -/* DAE570 80241170 00000000 */ nop -/* DAE574 80241174 A6420014 */ sh $v0, 0x14($s2) -.L80241178: -/* DAE578 80241178 8FBF0020 */ lw $ra, 0x20($sp) -/* DAE57C 8024117C 8FB3001C */ lw $s3, 0x1c($sp) -/* DAE580 80241180 8FB20018 */ lw $s2, 0x18($sp) -/* DAE584 80241184 8FB10014 */ lw $s1, 0x14($sp) -/* DAE588 80241188 8FB00010 */ lw $s0, 0x10($sp) -/* DAE58C 8024118C 03E00008 */ jr $ra -/* DAE590 80241190 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_80241194_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_80241194_DAD400.s deleted file mode 100644 index d6c96ab42a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_80241194_DAD400.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241194_DAE594 -/* DAE594 80241194 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DAE598 80241198 AFB00010 */ sw $s0, 0x10($sp) -/* DAE59C 8024119C 0080802D */ daddu $s0, $a0, $zero -/* DAE5A0 802411A0 AFBF0014 */ sw $ra, 0x14($sp) -/* DAE5A4 802411A4 8E020148 */ lw $v0, 0x148($s0) -/* DAE5A8 802411A8 0C00EABB */ jal get_npc_unsafe -/* DAE5AC 802411AC 84440008 */ lh $a0, 8($v0) -/* DAE5B0 802411B0 0040202D */ daddu $a0, $v0, $zero -/* DAE5B4 802411B4 8482008E */ lh $v0, 0x8e($a0) -/* DAE5B8 802411B8 9483008E */ lhu $v1, 0x8e($a0) -/* DAE5BC 802411BC 18400005 */ blez $v0, .L802411D4 -/* DAE5C0 802411C0 2462FFFF */ addiu $v0, $v1, -1 -/* DAE5C4 802411C4 A482008E */ sh $v0, 0x8e($a0) -/* DAE5C8 802411C8 00021400 */ sll $v0, $v0, 0x10 -/* DAE5CC 802411CC 1C400006 */ bgtz $v0, .L802411E8 -/* DAE5D0 802411D0 00000000 */ nop -.L802411D4: -/* DAE5D4 802411D4 8482008C */ lh $v0, 0x8c($a0) -/* DAE5D8 802411D8 14400003 */ bnez $v0, .L802411E8 -/* DAE5DC 802411DC 2402000E */ addiu $v0, $zero, 0xe -/* DAE5E0 802411E0 A480008E */ sh $zero, 0x8e($a0) -/* DAE5E4 802411E4 AE020070 */ sw $v0, 0x70($s0) -.L802411E8: -/* DAE5E8 802411E8 8FBF0014 */ lw $ra, 0x14($sp) -/* DAE5EC 802411EC 8FB00010 */ lw $s0, 0x10($sp) -/* DAE5F0 802411F0 03E00008 */ jr $ra -/* DAE5F4 802411F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_802411F8_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_802411F8_DAD400.s deleted file mode 100644 index 9fd9a2dd04..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_802411F8_DAD400.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411F8_DAE5F8 -/* DAE5F8 802411F8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DAE5FC 802411FC AFB20030 */ sw $s2, 0x30($sp) -/* DAE600 80241200 0080902D */ daddu $s2, $a0, $zero -/* DAE604 80241204 AFBF0038 */ sw $ra, 0x38($sp) -/* DAE608 80241208 AFB30034 */ sw $s3, 0x34($sp) -/* DAE60C 8024120C AFB1002C */ sw $s1, 0x2c($sp) -/* DAE610 80241210 AFB00028 */ sw $s0, 0x28($sp) -/* DAE614 80241214 F7B60048 */ sdc1 $f22, 0x48($sp) -/* DAE618 80241218 F7B40040 */ sdc1 $f20, 0x40($sp) -/* DAE61C 8024121C 8E510148 */ lw $s1, 0x148($s2) -/* DAE620 80241220 86240008 */ lh $a0, 8($s1) -/* DAE624 80241224 0C00EABB */ jal get_npc_unsafe -/* DAE628 80241228 00A0982D */ daddu $s3, $a1, $zero -/* DAE62C 8024122C 0040802D */ daddu $s0, $v0, $zero -/* DAE630 80241230 0200202D */ daddu $a0, $s0, $zero -/* DAE634 80241234 C6220088 */ lwc1 $f2, 0x88($s1) -/* DAE638 80241238 468010A0 */ cvt.s.w $f2, $f2 -/* DAE63C 8024123C 460010A1 */ cvt.d.s $f2, $f2 -/* DAE640 80241240 C604001C */ lwc1 $f4, 0x1c($s0) -/* DAE644 80241244 C6000014 */ lwc1 $f0, 0x14($s0) -/* DAE648 80241248 8E050018 */ lw $a1, 0x18($s0) -/* DAE64C 8024124C 46002100 */ add.s $f4, $f4, $f0 -/* DAE650 80241250 8E06000C */ lw $a2, 0xc($s0) -/* DAE654 80241254 C6200078 */ lwc1 $f0, 0x78($s1) -/* DAE658 80241258 46800020 */ cvt.s.w $f0, $f0 -/* DAE65C 8024125C E604001C */ swc1 $f4, 0x1c($s0) -/* DAE660 80241260 3C014059 */ lui $at, 0x4059 -/* DAE664 80241264 44812800 */ mtc1 $at, $f5 -/* DAE668 80241268 44802000 */ mtc1 $zero, $f4 -/* DAE66C 8024126C 46000021 */ cvt.d.s $f0, $f0 -/* DAE670 80241270 46240003 */ div.d $f0, $f0, $f4 -/* DAE674 80241274 46200520 */ cvt.s.d $f20, $f0 -/* DAE678 80241278 46241083 */ div.d $f2, $f2, $f4 -/* DAE67C 8024127C 0C00EA95 */ jal npc_move_heading -/* DAE680 80241280 462015A0 */ cvt.s.d $f22, $f2 -/* DAE684 80241284 C604001C */ lwc1 $f4, 0x1c($s0) -/* DAE688 80241288 44801000 */ mtc1 $zero, $f2 -/* DAE68C 8024128C 44801800 */ mtc1 $zero, $f3 -/* DAE690 80241290 46002021 */ cvt.d.s $f0, $f4 -/* DAE694 80241294 4620103E */ c.le.d $f2, $f0 -/* DAE698 80241298 00000000 */ nop -/* DAE69C 8024129C 45000030 */ bc1f .L80241360 -/* DAE6A0 802412A0 00000000 */ nop -/* DAE6A4 802412A4 C600003C */ lwc1 $f0, 0x3c($s0) -/* DAE6A8 802412A8 46040000 */ add.s $f0, $f0, $f4 -/* DAE6AC 802412AC E600003C */ swc1 $f0, 0x3c($s0) -/* DAE6B0 802412B0 8E2200CC */ lw $v0, 0xcc($s1) -/* DAE6B4 802412B4 8C420024 */ lw $v0, 0x24($v0) -/* DAE6B8 802412B8 AE020028 */ sw $v0, 0x28($s0) -/* DAE6BC 802412BC A2200007 */ sb $zero, 7($s1) -/* DAE6C0 802412C0 8E020000 */ lw $v0, ($s0) -/* DAE6C4 802412C4 30420008 */ andi $v0, $v0, 8 -/* DAE6C8 802412C8 14400011 */ bnez $v0, .L80241310 -/* DAE6CC 802412CC 0000102D */ daddu $v0, $zero, $zero -/* DAE6D0 802412D0 27A50018 */ addiu $a1, $sp, 0x18 -/* DAE6D4 802412D4 27A6001C */ addiu $a2, $sp, 0x1c -/* DAE6D8 802412D8 C6000038 */ lwc1 $f0, 0x38($s0) -/* DAE6DC 802412DC C602003C */ lwc1 $f2, 0x3c($s0) -/* DAE6E0 802412E0 C6040040 */ lwc1 $f4, 0x40($s0) -/* DAE6E4 802412E4 3C01447A */ lui $at, 0x447a -/* DAE6E8 802412E8 44813000 */ mtc1 $at, $f6 -/* DAE6EC 802412EC 27A20024 */ addiu $v0, $sp, 0x24 -/* DAE6F0 802412F0 E7A00018 */ swc1 $f0, 0x18($sp) -/* DAE6F4 802412F4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* DAE6F8 802412F8 E7A40020 */ swc1 $f4, 0x20($sp) -/* DAE6FC 802412FC E7A60024 */ swc1 $f6, 0x24($sp) -/* DAE700 80241300 AFA20010 */ sw $v0, 0x10($sp) -/* DAE704 80241304 8E040080 */ lw $a0, 0x80($s0) -/* DAE708 80241308 0C0372DF */ jal func_800DCB7C -/* DAE70C 8024130C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241310: -/* DAE710 80241310 1040000B */ beqz $v0, .L80241340 -/* DAE714 80241314 00000000 */ nop -/* DAE718 80241318 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DAE71C 8024131C 46140080 */ add.s $f2, $f0, $f20 -/* DAE720 80241320 C600003C */ lwc1 $f0, 0x3c($s0) -/* DAE724 80241324 4600103E */ c.le.s $f2, $f0 -/* DAE728 80241328 00000000 */ nop -/* DAE72C 8024132C 4500008D */ bc1f .L80241564 -/* DAE730 80241330 00000000 */ nop -/* DAE734 80241334 E602003C */ swc1 $f2, 0x3c($s0) -/* DAE738 80241338 08090559 */ j .L80241564 -/* DAE73C 8024133C AE400070 */ sw $zero, 0x70($s2) -.L80241340: -/* DAE740 80241340 C602003C */ lwc1 $f2, 0x3c($s0) -/* DAE744 80241344 C6000064 */ lwc1 $f0, 0x64($s0) -/* DAE748 80241348 4602003E */ c.le.s $f0, $f2 -/* DAE74C 8024134C 00000000 */ nop -/* DAE750 80241350 45030084 */ bc1tl .L80241564 -/* DAE754 80241354 AE400070 */ sw $zero, 0x70($s2) -/* DAE758 80241358 08090559 */ j .L80241564 -/* DAE75C 8024135C 00000000 */ nop -.L80241360: -/* DAE760 80241360 4622003C */ c.lt.d $f0, $f2 -/* DAE764 80241364 00000000 */ nop -/* DAE768 80241368 4500007E */ bc1f .L80241564 -/* DAE76C 8024136C 00000000 */ nop -/* DAE770 80241370 9602008E */ lhu $v0, 0x8e($s0) -/* DAE774 80241374 24420001 */ addiu $v0, $v0, 1 -/* DAE778 80241378 A602008E */ sh $v0, 0x8e($s0) -/* DAE77C 8024137C 00021400 */ sll $v0, $v0, 0x10 -/* DAE780 80241380 8E630020 */ lw $v1, 0x20($s3) -/* DAE784 80241384 00021403 */ sra $v0, $v0, 0x10 -/* DAE788 80241388 0043102A */ slt $v0, $v0, $v1 -/* DAE78C 8024138C 14400026 */ bnez $v0, .L80241428 -/* DAE790 80241390 00000000 */ nop -/* DAE794 80241394 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DAE798 80241398 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DAE79C 8024139C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DAE7A0 802413A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DAE7A4 802413A4 A600008E */ sh $zero, 0x8e($s0) -/* DAE7A8 802413A8 8C460028 */ lw $a2, 0x28($v0) -/* DAE7AC 802413AC 0C00A720 */ jal atan2 -/* DAE7B0 802413B0 8C470030 */ lw $a3, 0x30($v0) -/* DAE7B4 802413B4 46000506 */ mov.s $f20, $f0 -/* DAE7B8 802413B8 C60C000C */ lwc1 $f12, 0xc($s0) -/* DAE7BC 802413BC 0C00A70A */ jal get_clamped_angle_diff -/* DAE7C0 802413C0 4600A386 */ mov.s $f14, $f20 -/* DAE7C4 802413C4 46000086 */ mov.s $f2, $f0 -/* DAE7C8 802413C8 8E62001C */ lw $v0, 0x1c($s3) -/* DAE7CC 802413CC 46001005 */ abs.s $f0, $f2 -/* DAE7D0 802413D0 44822000 */ mtc1 $v0, $f4 -/* DAE7D4 802413D4 00000000 */ nop -/* DAE7D8 802413D8 46802120 */ cvt.s.w $f4, $f4 -/* DAE7DC 802413DC 4600203C */ c.lt.s $f4, $f0 -/* DAE7E0 802413E0 00000000 */ nop -/* DAE7E4 802413E4 4500000D */ bc1f .L8024141C -/* DAE7E8 802413E8 00000000 */ nop -/* DAE7EC 802413EC 44800000 */ mtc1 $zero, $f0 -/* DAE7F0 802413F0 C614000C */ lwc1 $f20, 0xc($s0) -/* DAE7F4 802413F4 4600103C */ c.lt.s $f2, $f0 -/* DAE7F8 802413F8 00000000 */ nop -/* DAE7FC 802413FC 45000006 */ bc1f .L80241418 -/* DAE800 80241400 00021023 */ negu $v0, $v0 -/* DAE804 80241404 44820000 */ mtc1 $v0, $f0 -/* DAE808 80241408 00000000 */ nop -/* DAE80C 8024140C 46800020 */ cvt.s.w $f0, $f0 -/* DAE810 80241410 08090507 */ j .L8024141C -/* DAE814 80241414 4600A500 */ add.s $f20, $f20, $f0 -.L80241418: -/* DAE818 80241418 4604A500 */ add.s $f20, $f20, $f4 -.L8024141C: -/* DAE81C 8024141C 0C00A6C9 */ jal clamp_angle -/* DAE820 80241420 4600A306 */ mov.s $f12, $f20 -/* DAE824 80241424 E600000C */ swc1 $f0, 0xc($s0) -.L80241428: -/* DAE828 80241428 8E020000 */ lw $v0, ($s0) -/* DAE82C 8024142C 30420008 */ andi $v0, $v0, 8 -/* DAE830 80241430 1040000A */ beqz $v0, .L8024145C -/* DAE834 80241434 27A50018 */ addiu $a1, $sp, 0x18 -/* DAE838 80241438 C602003C */ lwc1 $f2, 0x3c($s0) -/* DAE83C 8024143C C600001C */ lwc1 $f0, 0x1c($s0) -/* DAE840 80241440 46001080 */ add.s $f2, $f2, $f0 -/* DAE844 80241444 4616103C */ c.lt.s $f2, $f22 -/* DAE848 80241448 00000000 */ nop -/* DAE84C 8024144C 45020045 */ bc1fl .L80241564 -/* DAE850 80241450 E602003C */ swc1 $f2, 0x3c($s0) -/* DAE854 80241454 08090558 */ j .L80241560 -/* DAE858 80241458 E616003C */ swc1 $f22, 0x3c($s0) -.L8024145C: -/* DAE85C 8024145C C6000038 */ lwc1 $f0, 0x38($s0) -/* DAE860 80241460 27A6001C */ addiu $a2, $sp, 0x1c -/* DAE864 80241464 E7A00018 */ swc1 $f0, 0x18($sp) -/* DAE868 80241468 860200A8 */ lh $v0, 0xa8($s0) -/* DAE86C 8024146C C600001C */ lwc1 $f0, 0x1c($s0) -/* DAE870 80241470 C604003C */ lwc1 $f4, 0x3c($s0) -/* DAE874 80241474 44821000 */ mtc1 $v0, $f2 -/* DAE878 80241478 00000000 */ nop -/* DAE87C 8024147C 468010A0 */ cvt.s.w $f2, $f2 -/* DAE880 80241480 46000005 */ abs.s $f0, $f0 -/* DAE884 80241484 46020000 */ add.s $f0, $f0, $f2 -/* DAE888 80241488 C6060040 */ lwc1 $f6, 0x40($s0) -/* DAE88C 8024148C 27A20024 */ addiu $v0, $sp, 0x24 -/* DAE890 80241490 46022100 */ add.s $f4, $f4, $f2 -/* DAE894 80241494 3C014024 */ lui $at, 0x4024 -/* DAE898 80241498 44811800 */ mtc1 $at, $f3 -/* DAE89C 8024149C 44801000 */ mtc1 $zero, $f2 -/* DAE8A0 802414A0 46000021 */ cvt.d.s $f0, $f0 -/* DAE8A4 802414A4 46220000 */ add.d $f0, $f0, $f2 -/* DAE8A8 802414A8 E7A60020 */ swc1 $f6, 0x20($sp) -/* DAE8AC 802414AC E7A4001C */ swc1 $f4, 0x1c($sp) -/* DAE8B0 802414B0 46200020 */ cvt.s.d $f0, $f0 -/* DAE8B4 802414B4 E7A00024 */ swc1 $f0, 0x24($sp) -/* DAE8B8 802414B8 AFA20010 */ sw $v0, 0x10($sp) -/* DAE8BC 802414BC 8E040080 */ lw $a0, 0x80($s0) -/* DAE8C0 802414C0 0C0372DF */ jal func_800DCB7C -/* DAE8C4 802414C4 27A70020 */ addiu $a3, $sp, 0x20 -/* DAE8C8 802414C8 10400015 */ beqz $v0, .L80241520 -/* DAE8CC 802414CC 00000000 */ nop -/* DAE8D0 802414D0 860200A8 */ lh $v0, 0xa8($s0) -/* DAE8D4 802414D4 C604001C */ lwc1 $f4, 0x1c($s0) -/* DAE8D8 802414D8 44820000 */ mtc1 $v0, $f0 -/* DAE8DC 802414DC 00000000 */ nop -/* DAE8E0 802414E0 46800020 */ cvt.s.w $f0, $f0 -/* DAE8E4 802414E4 46002085 */ abs.s $f2, $f4 -/* DAE8E8 802414E8 46020000 */ add.s $f0, $f0, $f2 -/* DAE8EC 802414EC C7A20024 */ lwc1 $f2, 0x24($sp) -/* DAE8F0 802414F0 4600103E */ c.le.s $f2, $f0 -/* DAE8F4 802414F4 00000000 */ nop -/* DAE8F8 802414F8 45000005 */ bc1f .L80241510 -/* DAE8FC 802414FC 00000000 */ nop -/* DAE900 80241500 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DAE904 80241504 AE00001C */ sw $zero, 0x1c($s0) -/* DAE908 80241508 08090559 */ j .L80241564 -/* DAE90C 8024150C E600003C */ swc1 $f0, 0x3c($s0) -.L80241510: -/* DAE910 80241510 C600003C */ lwc1 $f0, 0x3c($s0) -/* DAE914 80241514 46040000 */ add.s $f0, $f0, $f4 -/* DAE918 80241518 08090559 */ j .L80241564 -/* DAE91C 8024151C E600003C */ swc1 $f0, 0x3c($s0) -.L80241520: -/* DAE920 80241520 C606003C */ lwc1 $f6, 0x3c($s0) -/* DAE924 80241524 860200A8 */ lh $v0, 0xa8($s0) -/* DAE928 80241528 46163081 */ sub.s $f2, $f6, $f22 -/* DAE92C 8024152C 44820000 */ mtc1 $v0, $f0 -/* DAE930 80241530 00000000 */ nop -/* DAE934 80241534 46800020 */ cvt.s.w $f0, $f0 -/* DAE938 80241538 46001080 */ add.s $f2, $f2, $f0 -/* DAE93C 8024153C C604001C */ lwc1 $f4, 0x1c($s0) -/* DAE940 80241540 46002005 */ abs.s $f0, $f4 -/* DAE944 80241544 4602003C */ c.lt.s $f0, $f2 -/* DAE948 80241548 00000000 */ nop -/* DAE94C 8024154C 45020005 */ bc1fl .L80241564 -/* DAE950 80241550 AE00001C */ sw $zero, 0x1c($s0) -/* DAE954 80241554 46043000 */ add.s $f0, $f6, $f4 -/* DAE958 80241558 08090559 */ j .L80241564 -/* DAE95C 8024155C E600003C */ swc1 $f0, 0x3c($s0) -.L80241560: -/* DAE960 80241560 AE00001C */ sw $zero, 0x1c($s0) -.L80241564: -/* DAE964 80241564 8FBF0038 */ lw $ra, 0x38($sp) -/* DAE968 80241568 8FB30034 */ lw $s3, 0x34($sp) -/* DAE96C 8024156C 8FB20030 */ lw $s2, 0x30($sp) -/* DAE970 80241570 8FB1002C */ lw $s1, 0x2c($sp) -/* DAE974 80241574 8FB00028 */ lw $s0, 0x28($sp) -/* DAE978 80241578 D7B60048 */ ldc1 $f22, 0x48($sp) -/* DAE97C 8024157C D7B40040 */ ldc1 $f20, 0x40($sp) -/* DAE980 80241580 03E00008 */ jr $ra -/* DAE984 80241584 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_80241588_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_80241588_DAD400.s deleted file mode 100644 index 0c4ff321be..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_80241588_DAD400.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241588_DAE988 -/* DAE988 80241588 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DAE98C 8024158C AFB00028 */ sw $s0, 0x28($sp) -/* DAE990 80241590 00A0802D */ daddu $s0, $a1, $zero -/* DAE994 80241594 AFB1002C */ sw $s1, 0x2c($sp) -/* DAE998 80241598 00C0882D */ daddu $s1, $a2, $zero -/* DAE99C 8024159C AFBF0034 */ sw $ra, 0x34($sp) -/* DAE9A0 802415A0 AFB20030 */ sw $s2, 0x30($sp) -/* DAE9A4 802415A4 AE200070 */ sw $zero, 0x70($s1) -/* DAE9A8 802415A8 8C830000 */ lw $v1, ($a0) -/* DAE9AC 802415AC 2402FDFF */ addiu $v0, $zero, -0x201 -/* DAE9B0 802415B0 A480008E */ sh $zero, 0x8e($a0) -/* DAE9B4 802415B4 00621824 */ and $v1, $v1, $v0 -/* DAE9B8 802415B8 34650800 */ ori $a1, $v1, 0x800 -/* DAE9BC 802415BC AC850000 */ sw $a1, ($a0) -/* DAE9C0 802415C0 8E0200D0 */ lw $v0, 0xd0($s0) -/* DAE9C4 802415C4 8C420034 */ lw $v0, 0x34($v0) -/* DAE9C8 802415C8 10400003 */ beqz $v0, .L802415D8 -/* DAE9CC 802415CC 00E0902D */ daddu $s2, $a3, $zero -/* DAE9D0 802415D0 08090578 */ j .L802415E0 -/* DAE9D4 802415D4 34620808 */ ori $v0, $v1, 0x808 -.L802415D8: -/* DAE9D8 802415D8 2402FFF7 */ addiu $v0, $zero, -9 -/* DAE9DC 802415DC 00A21024 */ and $v0, $a1, $v0 -.L802415E0: -/* DAE9E0 802415E0 AC820000 */ sw $v0, ($a0) -/* DAE9E4 802415E4 27A20024 */ addiu $v0, $sp, 0x24 -/* DAE9E8 802415E8 27A50018 */ addiu $a1, $sp, 0x18 -/* DAE9EC 802415EC C4800038 */ lwc1 $f0, 0x38($a0) -/* DAE9F0 802415F0 C482003C */ lwc1 $f2, 0x3c($a0) -/* DAE9F4 802415F4 C4840040 */ lwc1 $f4, 0x40($a0) -/* DAE9F8 802415F8 3C01447A */ lui $at, 0x447a -/* DAE9FC 802415FC 44813000 */ mtc1 $at, $f6 -/* DAEA00 80241600 27A6001C */ addiu $a2, $sp, 0x1c -/* DAEA04 80241604 E7A00018 */ swc1 $f0, 0x18($sp) -/* DAEA08 80241608 E7A2001C */ swc1 $f2, 0x1c($sp) -/* DAEA0C 8024160C E7A40020 */ swc1 $f4, 0x20($sp) -/* DAEA10 80241610 E7A60024 */ swc1 $f6, 0x24($sp) -/* DAEA14 80241614 AFA20010 */ sw $v0, 0x10($sp) -/* DAEA18 80241618 8C840080 */ lw $a0, 0x80($a0) -/* DAEA1C 8024161C 0C0372DF */ jal func_800DCB7C -/* DAEA20 80241620 27A70020 */ addiu $a3, $sp, 0x20 -/* DAEA24 80241624 C7A20024 */ lwc1 $f2, 0x24($sp) -/* DAEA28 80241628 3C014059 */ lui $at, 0x4059 -/* DAEA2C 8024162C 44812800 */ mtc1 $at, $f5 -/* DAEA30 80241630 44802000 */ mtc1 $zero, $f4 -/* DAEA34 80241634 460010A1 */ cvt.d.s $f2, $f2 -/* DAEA38 80241638 46241082 */ mul.d $f2, $f2, $f4 -/* DAEA3C 8024163C 00000000 */ nop -/* DAEA40 80241640 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DAEA44 80241644 46000021 */ cvt.d.s $f0, $f0 -/* DAEA48 80241648 46240002 */ mul.d $f0, $f0, $f4 -/* DAEA4C 8024164C 00000000 */ nop -/* DAEA50 80241650 3C013FE0 */ lui $at, 0x3fe0 -/* DAEA54 80241654 44812800 */ mtc1 $at, $f5 -/* DAEA58 80241658 44802000 */ mtc1 $zero, $f4 -/* DAEA5C 8024165C 00000000 */ nop -/* DAEA60 80241660 46241080 */ add.d $f2, $f2, $f4 -/* DAEA64 80241664 AE000074 */ sw $zero, 0x74($s0) -/* DAEA68 80241668 46240000 */ add.d $f0, $f0, $f4 -/* DAEA6C 8024166C AE000090 */ sw $zero, 0x90($s0) -/* DAEA70 80241670 4620120D */ trunc.w.d $f8, $f2 -/* DAEA74 80241674 E6080078 */ swc1 $f8, 0x78($s0) -/* DAEA78 80241678 4620020D */ trunc.w.d $f8, $f0 -/* DAEA7C 8024167C E6080088 */ swc1 $f8, 0x88($s0) -/* DAEA80 80241680 8E420014 */ lw $v0, 0x14($s2) -/* DAEA84 80241684 AE220074 */ sw $v0, 0x74($s1) -/* DAEA88 80241688 8E0200B0 */ lw $v0, 0xb0($s0) -/* DAEA8C 8024168C 34420010 */ ori $v0, $v0, 0x10 -/* DAEA90 80241690 AE0200B0 */ sw $v0, 0xb0($s0) -/* DAEA94 80241694 8FBF0034 */ lw $ra, 0x34($sp) -/* DAEA98 80241698 8FB20030 */ lw $s2, 0x30($sp) -/* DAEA9C 8024169C 8FB1002C */ lw $s1, 0x2c($sp) -/* DAEAA0 802416A0 8FB00028 */ lw $s0, 0x28($sp) -/* DAEAA4 802416A4 03E00008 */ jr $ra -/* DAEAA8 802416A8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_80241898_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_80241898_DAD400.s deleted file mode 100644 index b56d58032a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_80241898_DAD400.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241898_DAEC98 -/* DAEC98 80241898 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DAEC9C 8024189C AFB10014 */ sw $s1, 0x14($sp) -/* DAECA0 802418A0 0080882D */ daddu $s1, $a0, $zero -/* DAECA4 802418A4 AFBF0018 */ sw $ra, 0x18($sp) -/* DAECA8 802418A8 AFB00010 */ sw $s0, 0x10($sp) -/* DAECAC 802418AC 8E300148 */ lw $s0, 0x148($s1) -/* DAECB0 802418B0 0C00EABB */ jal get_npc_unsafe -/* DAECB4 802418B4 86040008 */ lh $a0, 8($s0) -/* DAECB8 802418B8 C4400018 */ lwc1 $f0, 0x18($v0) -/* DAECBC 802418BC 3C018024 */ lui $at, 0x8024 -/* DAECC0 802418C0 D4224D08 */ ldc1 $f2, 0x4d08($at) -/* DAECC4 802418C4 46000021 */ cvt.d.s $f0, $f0 -/* DAECC8 802418C8 46220002 */ mul.d $f0, $f0, $f2 -/* DAECCC 802418CC 00000000 */ nop -/* DAECD0 802418D0 46200020 */ cvt.s.d $f0, $f0 -/* DAECD4 802418D4 E4400018 */ swc1 $f0, 0x18($v0) -/* DAECD8 802418D8 8E0300CC */ lw $v1, 0xcc($s0) -/* DAECDC 802418DC 8C640030 */ lw $a0, 0x30($v1) -/* DAECE0 802418E0 24030005 */ addiu $v1, $zero, 5 -/* DAECE4 802418E4 A443008E */ sh $v1, 0x8e($v0) -/* DAECE8 802418E8 AC440028 */ sw $a0, 0x28($v0) -/* DAECEC 802418EC 2402000F */ addiu $v0, $zero, 0xf -/* DAECF0 802418F0 AE220070 */ sw $v0, 0x70($s1) -/* DAECF4 802418F4 8FBF0018 */ lw $ra, 0x18($sp) -/* DAECF8 802418F8 8FB10014 */ lw $s1, 0x14($sp) -/* DAECFC 802418FC 8FB00010 */ lw $s0, 0x10($sp) -/* DAED00 80241900 03E00008 */ jr $ra -/* DAED04 80241904 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_802419D8_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_802419D8_DAD400.s deleted file mode 100644 index 658eb49c1b..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_802419D8_DAD400.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419D8_DAEDD8 -/* DAEDD8 802419D8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DAEDDC 802419DC AFB10024 */ sw $s1, 0x24($sp) -/* DAEDE0 802419E0 0080882D */ daddu $s1, $a0, $zero -/* DAEDE4 802419E4 AFBF0028 */ sw $ra, 0x28($sp) -/* DAEDE8 802419E8 AFB00020 */ sw $s0, 0x20($sp) -/* DAEDEC 802419EC 8E220148 */ lw $v0, 0x148($s1) -/* DAEDF0 802419F0 0C00EABB */ jal get_npc_unsafe -/* DAEDF4 802419F4 84440008 */ lh $a0, 8($v0) -/* DAEDF8 802419F8 0040802D */ daddu $s0, $v0, $zero -/* DAEDFC 802419FC 0200202D */ daddu $a0, $s0, $zero -/* DAEE00 80241A00 C600000C */ lwc1 $f0, 0xc($s0) -/* DAEE04 80241A04 27A60018 */ addiu $a2, $sp, 0x18 -/* DAEE08 80241A08 E7A00018 */ swc1 $f0, 0x18($sp) -/* DAEE0C 80241A0C AFA00010 */ sw $zero, 0x10($sp) -/* DAEE10 80241A10 AFA00014 */ sw $zero, 0x14($sp) -/* DAEE14 80241A14 8E050018 */ lw $a1, 0x18($s0) -/* DAEE18 80241A18 0C0129E1 */ jal func_8004A784 -/* DAEE1C 80241A1C 0000382D */ daddu $a3, $zero, $zero -/* DAEE20 80241A20 14400005 */ bnez $v0, .L80241A38 -/* DAEE24 80241A24 00000000 */ nop -/* DAEE28 80241A28 8E050018 */ lw $a1, 0x18($s0) -/* DAEE2C 80241A2C 8E06000C */ lw $a2, 0xc($s0) -/* DAEE30 80241A30 0C00EA95 */ jal npc_move_heading -/* DAEE34 80241A34 0200202D */ daddu $a0, $s0, $zero -.L80241A38: -/* DAEE38 80241A38 9602008E */ lhu $v0, 0x8e($s0) -/* DAEE3C 80241A3C 2442FFFF */ addiu $v0, $v0, -1 -/* DAEE40 80241A40 A602008E */ sh $v0, 0x8e($s0) -/* DAEE44 80241A44 00021400 */ sll $v0, $v0, 0x10 -/* DAEE48 80241A48 14400004 */ bnez $v0, .L80241A5C -/* DAEE4C 80241A4C 2402001E */ addiu $v0, $zero, 0x1e -/* DAEE50 80241A50 A602008E */ sh $v0, 0x8e($s0) -/* DAEE54 80241A54 24020011 */ addiu $v0, $zero, 0x11 -/* DAEE58 80241A58 AE220070 */ sw $v0, 0x70($s1) -.L80241A5C: -/* DAEE5C 80241A5C 8FBF0028 */ lw $ra, 0x28($sp) -/* DAEE60 80241A60 8FB10024 */ lw $s1, 0x24($sp) -/* DAEE64 80241A64 8FB00020 */ lw $s0, 0x20($sp) -/* DAEE68 80241A68 03E00008 */ jr $ra -/* DAEE6C 80241A6C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_80241AD0_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_80241AD0_DAD400.s deleted file mode 100644 index fc0646ac05..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_80241AD0_DAD400.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AD0_DAEED0 -/* DAEED0 80241AD0 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DAEED4 80241AD4 AFB30054 */ sw $s3, 0x54($sp) -/* DAEED8 80241AD8 0080982D */ daddu $s3, $a0, $zero -/* DAEEDC 80241ADC AFBF0060 */ sw $ra, 0x60($sp) -/* DAEEE0 80241AE0 AFB5005C */ sw $s5, 0x5c($sp) -/* DAEEE4 80241AE4 AFB40058 */ sw $s4, 0x58($sp) -/* DAEEE8 80241AE8 AFB20050 */ sw $s2, 0x50($sp) -/* DAEEEC 80241AEC AFB1004C */ sw $s1, 0x4c($sp) -/* DAEEF0 80241AF0 AFB00048 */ sw $s0, 0x48($sp) -/* DAEEF4 80241AF4 8E710148 */ lw $s1, 0x148($s3) -/* DAEEF8 80241AF8 86240008 */ lh $a0, 8($s1) -/* DAEEFC 80241AFC 0C00EABB */ jal get_npc_unsafe -/* DAEF00 80241B00 00A0802D */ daddu $s0, $a1, $zero -/* DAEF04 80241B04 8E63000C */ lw $v1, 0xc($s3) -/* DAEF08 80241B08 0260202D */ daddu $a0, $s3, $zero -/* DAEF0C 80241B0C 8C650000 */ lw $a1, ($v1) -/* DAEF10 80241B10 0C0B1EAF */ jal get_variable -/* DAEF14 80241B14 0040902D */ daddu $s2, $v0, $zero -/* DAEF18 80241B18 AFA00018 */ sw $zero, 0x18($sp) -/* DAEF1C 80241B1C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DAEF20 80241B20 8C630030 */ lw $v1, 0x30($v1) -/* DAEF24 80241B24 AFA3001C */ sw $v1, 0x1c($sp) -/* DAEF28 80241B28 8E2300D0 */ lw $v1, 0xd0($s1) -/* DAEF2C 80241B2C 8C63001C */ lw $v1, 0x1c($v1) -/* DAEF30 80241B30 AFA30020 */ sw $v1, 0x20($sp) -/* DAEF34 80241B34 8E2300D0 */ lw $v1, 0xd0($s1) -/* DAEF38 80241B38 8C630024 */ lw $v1, 0x24($v1) -/* DAEF3C 80241B3C AFA30024 */ sw $v1, 0x24($sp) -/* DAEF40 80241B40 8E2300D0 */ lw $v1, 0xd0($s1) -/* DAEF44 80241B44 8C630028 */ lw $v1, 0x28($v1) -/* DAEF48 80241B48 27B50018 */ addiu $s5, $sp, 0x18 -/* DAEF4C 80241B4C AFA30028 */ sw $v1, 0x28($sp) -/* DAEF50 80241B50 8E2300D0 */ lw $v1, 0xd0($s1) -/* DAEF54 80241B54 3C014282 */ lui $at, 0x4282 -/* DAEF58 80241B58 44810000 */ mtc1 $at, $f0 -/* DAEF5C 80241B5C 8C63002C */ lw $v1, 0x2c($v1) -/* DAEF60 80241B60 0040A02D */ daddu $s4, $v0, $zero -/* DAEF64 80241B64 E7A00030 */ swc1 $f0, 0x30($sp) -/* DAEF68 80241B68 A7A00034 */ sh $zero, 0x34($sp) -/* DAEF6C 80241B6C 16000005 */ bnez $s0, .L80241B84 -/* DAEF70 80241B70 AFA3002C */ sw $v1, 0x2c($sp) -/* DAEF74 80241B74 8E2200B0 */ lw $v0, 0xb0($s1) -/* DAEF78 80241B78 30420004 */ andi $v0, $v0, 4 -/* DAEF7C 80241B7C 10400044 */ beqz $v0, .L80241C90 -/* DAEF80 80241B80 00000000 */ nop -.L80241B84: -/* DAEF84 80241B84 2404F7FF */ addiu $a0, $zero, -0x801 -/* DAEF88 80241B88 AE600070 */ sw $zero, 0x70($s3) -/* DAEF8C 80241B8C A640008E */ sh $zero, 0x8e($s2) -/* DAEF90 80241B90 8E2200CC */ lw $v0, 0xcc($s1) -/* DAEF94 80241B94 8E430000 */ lw $v1, ($s2) -/* DAEF98 80241B98 8C420000 */ lw $v0, ($v0) -/* DAEF9C 80241B9C 00641824 */ and $v1, $v1, $a0 -/* DAEFA0 80241BA0 AE430000 */ sw $v1, ($s2) -/* DAEFA4 80241BA4 AE420028 */ sw $v0, 0x28($s2) -/* DAEFA8 80241BA8 8E2200D0 */ lw $v0, 0xd0($s1) -/* DAEFAC 80241BAC 8C420034 */ lw $v0, 0x34($v0) -/* DAEFB0 80241BB0 54400005 */ bnel $v0, $zero, .L80241BC8 -/* DAEFB4 80241BB4 2402FDFF */ addiu $v0, $zero, -0x201 -/* DAEFB8 80241BB8 34620200 */ ori $v0, $v1, 0x200 -/* DAEFBC 80241BBC 2403FFF7 */ addiu $v1, $zero, -9 -/* DAEFC0 80241BC0 080906F4 */ j .L80241BD0 -/* DAEFC4 80241BC4 00431024 */ and $v0, $v0, $v1 -.L80241BC8: -/* DAEFC8 80241BC8 00621024 */ and $v0, $v1, $v0 -/* DAEFCC 80241BCC 34420008 */ ori $v0, $v0, 8 -.L80241BD0: -/* DAEFD0 80241BD0 AE420000 */ sw $v0, ($s2) -/* DAEFD4 80241BD4 8E2200B0 */ lw $v0, 0xb0($s1) -/* DAEFD8 80241BD8 30420004 */ andi $v0, $v0, 4 -/* DAEFDC 80241BDC 10400004 */ beqz $v0, .L80241BF0 -/* DAEFE0 80241BE0 24020063 */ addiu $v0, $zero, 0x63 -/* DAEFE4 80241BE4 AE620070 */ sw $v0, 0x70($s3) -/* DAEFE8 80241BE8 08090702 */ j .L80241C08 -/* DAEFEC 80241BEC AE600074 */ sw $zero, 0x74($s3) -.L80241BF0: -/* DAEFF0 80241BF0 8E220000 */ lw $v0, ($s1) -/* DAEFF4 80241BF4 3C034000 */ lui $v1, 0x4000 -/* DAEFF8 80241BF8 00431024 */ and $v0, $v0, $v1 -/* DAEFFC 80241BFC 10400002 */ beqz $v0, .L80241C08 -/* DAF000 80241C00 2402000C */ addiu $v0, $zero, 0xc -/* DAF004 80241C04 AE620070 */ sw $v0, 0x70($s3) -.L80241C08: -/* DAF008 80241C08 3C06BFFF */ lui $a2, 0xbfff -/* DAF00C 80241C0C 34C6FFFF */ ori $a2, $a2, 0xffff -/* DAF010 80241C10 27A50038 */ addiu $a1, $sp, 0x38 -/* DAF014 80241C14 2404FFFB */ addiu $a0, $zero, -5 -/* DAF018 80241C18 8E2200B0 */ lw $v0, 0xb0($s1) -/* DAF01C 80241C1C 8E230000 */ lw $v1, ($s1) -/* DAF020 80241C20 3C0142C8 */ lui $at, 0x42c8 -/* DAF024 80241C24 44810000 */ mtc1 $at, $f0 -/* DAF028 80241C28 00441024 */ and $v0, $v0, $a0 -/* DAF02C 80241C2C 00661824 */ and $v1, $v1, $a2 -/* DAF030 80241C30 AE2200B0 */ sw $v0, 0xb0($s1) -/* DAF034 80241C34 AE230000 */ sw $v1, ($s1) -/* DAF038 80241C38 864200A8 */ lh $v0, 0xa8($s2) -/* DAF03C 80241C3C 27A70040 */ addiu $a3, $sp, 0x40 -/* DAF040 80241C40 E7A00044 */ swc1 $f0, 0x44($sp) -/* DAF044 80241C44 C6460038 */ lwc1 $f6, 0x38($s2) -/* DAF048 80241C48 C640003C */ lwc1 $f0, 0x3c($s2) -/* DAF04C 80241C4C C6420040 */ lwc1 $f2, 0x40($s2) -/* DAF050 80241C50 44822000 */ mtc1 $v0, $f4 -/* DAF054 80241C54 00000000 */ nop -/* DAF058 80241C58 46802120 */ cvt.s.w $f4, $f4 -/* DAF05C 80241C5C 27A20044 */ addiu $v0, $sp, 0x44 -/* DAF060 80241C60 46040000 */ add.s $f0, $f0, $f4 -/* DAF064 80241C64 E7A60038 */ swc1 $f6, 0x38($sp) -/* DAF068 80241C68 E7A20040 */ swc1 $f2, 0x40($sp) -/* DAF06C 80241C6C E7A0003C */ swc1 $f0, 0x3c($sp) -/* DAF070 80241C70 AFA20010 */ sw $v0, 0x10($sp) -/* DAF074 80241C74 8E440080 */ lw $a0, 0x80($s2) -/* DAF078 80241C78 0C0372DF */ jal func_800DCB7C -/* DAF07C 80241C7C 27A6003C */ addiu $a2, $sp, 0x3c -/* DAF080 80241C80 10400003 */ beqz $v0, .L80241C90 -/* DAF084 80241C84 00000000 */ nop -/* DAF088 80241C88 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DAF08C 80241C8C E640003C */ swc1 $f0, 0x3c($s2) -.L80241C90: -/* DAF090 80241C90 8E630070 */ lw $v1, 0x70($s3) -/* DAF094 80241C94 2C620064 */ sltiu $v0, $v1, 0x64 -/* DAF098 80241C98 10400050 */ beqz $v0, .L80241DDC -/* DAF09C 80241C9C 00031080 */ sll $v0, $v1, 2 -/* DAF0A0 80241CA0 3C018024 */ lui $at, 0x8024 -/* DAF0A4 80241CA4 00220821 */ addu $at, $at, $v0 -/* DAF0A8 80241CA8 8C224D18 */ lw $v0, 0x4d18($at) -/* DAF0AC 80241CAC 00400008 */ jr $v0 -/* DAF0B0 80241CB0 00000000 */ nop -/* DAF0B4 80241CB4 0260202D */ daddu $a0, $s3, $zero -/* DAF0B8 80241CB8 0280282D */ daddu $a1, $s4, $zero -/* DAF0BC 80241CBC 0C012568 */ jal func_800495A0 -/* DAF0C0 80241CC0 02A0302D */ daddu $a2, $s5, $zero -/* DAF0C4 80241CC4 0260202D */ daddu $a0, $s3, $zero -/* DAF0C8 80241CC8 0280282D */ daddu $a1, $s4, $zero -/* DAF0CC 80241CCC 0C0125AE */ jal func_800496B8 -/* DAF0D0 80241CD0 02A0302D */ daddu $a2, $s5, $zero -/* DAF0D4 80241CD4 08090777 */ j .L80241DDC -/* DAF0D8 80241CD8 00000000 */ nop -/* DAF0DC 80241CDC 0260202D */ daddu $a0, $s3, $zero -/* DAF0E0 80241CE0 0280282D */ daddu $a1, $s4, $zero -/* DAF0E4 80241CE4 0C0126D1 */ jal func_80049B44 -/* DAF0E8 80241CE8 02A0302D */ daddu $a2, $s5, $zero -/* DAF0EC 80241CEC 0260202D */ daddu $a0, $s3, $zero -/* DAF0F0 80241CF0 0280282D */ daddu $a1, $s4, $zero -/* DAF0F4 80241CF4 0C012701 */ jal func_80049C04 -/* DAF0F8 80241CF8 02A0302D */ daddu $a2, $s5, $zero -/* DAF0FC 80241CFC 08090777 */ j .L80241DDC -/* DAF100 80241D00 00000000 */ nop -/* DAF104 80241D04 0260202D */ daddu $a0, $s3, $zero -/* DAF108 80241D08 0280282D */ daddu $a1, $s4, $zero -/* DAF10C 80241D0C 0C01278F */ jal func_80049E3C -/* DAF110 80241D10 02A0302D */ daddu $a2, $s5, $zero -/* DAF114 80241D14 0260202D */ daddu $a0, $s3, $zero -/* DAF118 80241D18 0280282D */ daddu $a1, $s4, $zero -/* DAF11C 80241D1C 0C0127B3 */ jal func_80049ECC -/* DAF120 80241D20 02A0302D */ daddu $a2, $s5, $zero -/* DAF124 80241D24 08090777 */ j .L80241DDC -/* DAF128 80241D28 00000000 */ nop -/* DAF12C 80241D2C 0260202D */ daddu $a0, $s3, $zero -/* DAF130 80241D30 0280282D */ daddu $a1, $s4, $zero -/* DAF134 80241D34 0C0127DF */ jal func_80049F7C -/* DAF138 80241D38 02A0302D */ daddu $a2, $s5, $zero -/* DAF13C 80241D3C 0260202D */ daddu $a0, $s3, $zero -/* DAF140 80241D40 0280282D */ daddu $a1, $s4, $zero -/* DAF144 80241D44 0C012849 */ jal func_8004A124 -/* DAF148 80241D48 02A0302D */ daddu $a2, $s5, $zero -/* DAF14C 80241D4C 8E630070 */ lw $v1, 0x70($s3) -/* DAF150 80241D50 2402000E */ addiu $v0, $zero, 0xe -/* DAF154 80241D54 14620021 */ bne $v1, $v0, .L80241DDC -/* DAF158 80241D58 00000000 */ nop -/* DAF15C 80241D5C 0260202D */ daddu $a0, $s3, $zero -/* DAF160 80241D60 0280282D */ daddu $a1, $s4, $zero -/* DAF164 80241D64 0C090626 */ jal func_80241898 -/* DAF168 80241D68 02A0302D */ daddu $a2, $s5, $zero -/* DAF16C 80241D6C 8E630070 */ lw $v1, 0x70($s3) -/* DAF170 80241D70 2402000F */ addiu $v0, $zero, 0xf -/* DAF174 80241D74 14620019 */ bne $v1, $v0, .L80241DDC -/* DAF178 80241D78 00000000 */ nop -/* DAF17C 80241D7C 0260202D */ daddu $a0, $s3, $zero -/* DAF180 80241D80 0280282D */ daddu $a1, $s4, $zero -/* DAF184 80241D84 0C090642 */ jal func_80241908 -/* DAF188 80241D88 02A0302D */ daddu $a2, $s5, $zero -/* DAF18C 80241D8C 8E630070 */ lw $v1, 0x70($s3) -/* DAF190 80241D90 24020010 */ addiu $v0, $zero, 0x10 -/* DAF194 80241D94 14620011 */ bne $v1, $v0, .L80241DDC -/* DAF198 80241D98 00000000 */ nop -/* DAF19C 80241D9C 0260202D */ daddu $a0, $s3, $zero -/* DAF1A0 80241DA0 0280282D */ daddu $a1, $s4, $zero -/* DAF1A4 80241DA4 0C090676 */ jal func_802419D8 -/* DAF1A8 80241DA8 02A0302D */ daddu $a2, $s5, $zero -/* DAF1AC 80241DAC 8E630070 */ lw $v1, 0x70($s3) -/* DAF1B0 80241DB0 24020011 */ addiu $v0, $zero, 0x11 -/* DAF1B4 80241DB4 14620009 */ bne $v1, $v0, .L80241DDC -/* DAF1B8 80241DB8 00000000 */ nop -/* DAF1BC 80241DBC 0260202D */ daddu $a0, $s3, $zero -/* DAF1C0 80241DC0 0280282D */ daddu $a1, $s4, $zero -/* DAF1C4 80241DC4 0C09069C */ jal func_80241A70 -/* DAF1C8 80241DC8 02A0302D */ daddu $a2, $s5, $zero -/* DAF1CC 80241DCC 08090777 */ j .L80241DDC -/* DAF1D0 80241DD0 00000000 */ nop -/* DAF1D4 80241DD4 0C0129CF */ jal func_8004A73C -/* DAF1D8 80241DD8 0260202D */ daddu $a0, $s3, $zero -.L80241DDC: -/* DAF1DC 80241DDC 8FBF0060 */ lw $ra, 0x60($sp) -/* DAF1E0 80241DE0 8FB5005C */ lw $s5, 0x5c($sp) -/* DAF1E4 80241DE4 8FB40058 */ lw $s4, 0x58($sp) -/* DAF1E8 80241DE8 8FB30054 */ lw $s3, 0x54($sp) -/* DAF1EC 80241DEC 8FB20050 */ lw $s2, 0x50($sp) -/* DAF1F0 80241DF0 8FB1004C */ lw $s1, 0x4c($sp) -/* DAF1F4 80241DF4 8FB00048 */ lw $s0, 0x48($sp) -/* DAF1F8 80241DF8 0000102D */ daddu $v0, $zero, $zero -/* DAF1FC 80241DFC 03E00008 */ jr $ra -/* DAF200 80241E00 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_80241E04_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_80241E04_DAD400.s deleted file mode 100644 index 67c47ed8ac..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_80241E04_DAD400.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E04_DAF204 -/* DAF204 80241E04 3C03800B */ lui $v1, %hi(gCameras) -/* DAF208 80241E08 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DAF20C 80241E0C 94620000 */ lhu $v0, ($v1) -/* DAF210 80241E10 34421000 */ ori $v0, $v0, 0x1000 -/* DAF214 80241E14 A4620000 */ sh $v0, ($v1) -/* DAF218 80241E18 03E00008 */ jr $ra -/* DAF21C 80241E1C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_04/func_80241E40_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/func_80241E40_DAD400.s deleted file mode 100644 index 67f6cd186f..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/func_80241E40_DAD400.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E40_DAF240 -/* DAF240 80241E40 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DAF244 80241E44 AFB10014 */ sw $s1, 0x14($sp) -/* DAF248 80241E48 0080882D */ daddu $s1, $a0, $zero -/* DAF24C 80241E4C AFBF001C */ sw $ra, 0x1c($sp) -/* DAF250 80241E50 AFB20018 */ sw $s2, 0x18($sp) -/* DAF254 80241E54 AFB00010 */ sw $s0, 0x10($sp) -/* DAF258 80241E58 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DAF25C 80241E5C F7B40020 */ sdc1 $f20, 0x20($sp) -/* DAF260 80241E60 0C00EABB */ jal get_npc_unsafe -/* DAF264 80241E64 24040002 */ addiu $a0, $zero, 2 -/* DAF268 80241E68 0040802D */ daddu $s0, $v0, $zero -/* DAF26C 80241E6C 3C12800B */ lui $s2, %hi(gCameras) -/* DAF270 80241E70 26521D80 */ addiu $s2, $s2, %lo(gCameras) -/* DAF274 80241E74 C60C000C */ lwc1 $f12, 0xc($s0) -/* DAF278 80241E78 C640006C */ lwc1 $f0, 0x6c($s2) -/* DAF27C 80241E7C 46006300 */ add.s $f12, $f12, $f0 -/* DAF280 80241E80 3C014334 */ lui $at, 0x4334 -/* DAF284 80241E84 4481A000 */ mtc1 $at, $f20 -/* DAF288 80241E88 3C014220 */ lui $at, 0x4220 -/* DAF28C 80241E8C 4481B000 */ mtc1 $at, $f22 -/* DAF290 80241E90 0C00A8BB */ jal sin_deg -/* DAF294 80241E94 46146300 */ add.s $f12, $f12, $f20 -/* DAF298 80241E98 46160002 */ mul.s $f0, $f0, $f22 -/* DAF29C 80241E9C 00000000 */ nop -/* DAF2A0 80241EA0 C6020038 */ lwc1 $f2, 0x38($s0) -/* DAF2A4 80241EA4 46001080 */ add.s $f2, $f2, $f0 -/* DAF2A8 80241EA8 4600110D */ trunc.w.s $f4, $f2 -/* DAF2AC 80241EAC E6240084 */ swc1 $f4, 0x84($s1) -/* DAF2B0 80241EB0 C600003C */ lwc1 $f0, 0x3c($s0) -/* DAF2B4 80241EB4 3C014100 */ lui $at, 0x4100 -/* DAF2B8 80241EB8 44811000 */ mtc1 $at, $f2 -/* DAF2BC 80241EBC 00000000 */ nop -/* DAF2C0 80241EC0 46020000 */ add.s $f0, $f0, $f2 -/* DAF2C4 80241EC4 4600010D */ trunc.w.s $f4, $f0 -/* DAF2C8 80241EC8 E6240088 */ swc1 $f4, 0x88($s1) -/* DAF2CC 80241ECC C60C000C */ lwc1 $f12, 0xc($s0) -/* DAF2D0 80241ED0 C640006C */ lwc1 $f0, 0x6c($s2) -/* DAF2D4 80241ED4 46006300 */ add.s $f12, $f12, $f0 -/* DAF2D8 80241ED8 0C00A8D4 */ jal cos_deg -/* DAF2DC 80241EDC 46146300 */ add.s $f12, $f12, $f20 -/* DAF2E0 80241EE0 46160002 */ mul.s $f0, $f0, $f22 -/* DAF2E4 80241EE4 00000000 */ nop -/* DAF2E8 80241EE8 C6020040 */ lwc1 $f2, 0x40($s0) -/* DAF2EC 80241EEC 46001081 */ sub.s $f2, $f2, $f0 -/* DAF2F0 80241EF0 4600110D */ trunc.w.s $f4, $f2 -/* DAF2F4 80241EF4 E624008C */ swc1 $f4, 0x8c($s1) -/* DAF2F8 80241EF8 8FBF001C */ lw $ra, 0x1c($sp) -/* DAF2FC 80241EFC 8FB20018 */ lw $s2, 0x18($sp) -/* DAF300 80241F00 8FB10014 */ lw $s1, 0x14($sp) -/* DAF304 80241F04 8FB00010 */ lw $s0, 0x10($sp) -/* DAF308 80241F08 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DAF30C 80241F0C D7B40020 */ ldc1 $f20, 0x20($sp) -/* DAF310 80241F10 24020002 */ addiu $v0, $zero, 2 -/* DAF314 80241F14 03E00008 */ jr $ra -/* DAF318 80241F18 27BD0030 */ addiu $sp, $sp, 0x30 -/* DAF31C 80241F1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_05/func_80240070_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/func_80240070_DB22C0.s deleted file mode 100644 index 6beca31790..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/func_80240070_DB22C0.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_DB2330 -/* DB2330 80240070 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DB2334 80240074 AFB20028 */ sw $s2, 0x28($sp) -/* DB2338 80240078 0080902D */ daddu $s2, $a0, $zero -/* DB233C 8024007C AFBF002C */ sw $ra, 0x2c($sp) -/* DB2340 80240080 AFB10024 */ sw $s1, 0x24($sp) -/* DB2344 80240084 AFB00020 */ sw $s0, 0x20($sp) -/* DB2348 80240088 8E510148 */ lw $s1, 0x148($s2) -/* DB234C 8024008C 0C00EABB */ jal get_npc_unsafe -/* DB2350 80240090 86240008 */ lh $a0, 8($s1) -/* DB2354 80240094 0040802D */ daddu $s0, $v0, $zero -/* DB2358 80240098 0200202D */ daddu $a0, $s0, $zero -/* DB235C 8024009C C600000C */ lwc1 $f0, 0xc($s0) -/* DB2360 802400A0 27A60018 */ addiu $a2, $sp, 0x18 -/* DB2364 802400A4 E7A00018 */ swc1 $f0, 0x18($sp) -/* DB2368 802400A8 AFA00010 */ sw $zero, 0x10($sp) -/* DB236C 802400AC AFA00014 */ sw $zero, 0x14($sp) -/* DB2370 802400B0 8E050018 */ lw $a1, 0x18($s0) -/* DB2374 802400B4 0C0129E1 */ jal func_8004A784 -/* DB2378 802400B8 0000382D */ daddu $a3, $zero, $zero -/* DB237C 802400BC 14400005 */ bnez $v0, .L802400D4 -/* DB2380 802400C0 00000000 */ nop -/* DB2384 802400C4 8E050018 */ lw $a1, 0x18($s0) -/* DB2388 802400C8 8E06000C */ lw $a2, 0xc($s0) -/* DB238C 802400CC 0C00EA95 */ jal npc_move_heading -/* DB2390 802400D0 0200202D */ daddu $a0, $s0, $zero -.L802400D4: -/* DB2394 802400D4 9602008E */ lhu $v0, 0x8e($s0) -/* DB2398 802400D8 2442FFFF */ addiu $v0, $v0, -1 -/* DB239C 802400DC A602008E */ sh $v0, 0x8e($s0) -/* DB23A0 802400E0 00021400 */ sll $v0, $v0, 0x10 -/* DB23A4 802400E4 14400010 */ bnez $v0, .L80240128 -/* DB23A8 802400E8 00000000 */ nop -/* DB23AC 802400EC C6000018 */ lwc1 $f0, 0x18($s0) -/* DB23B0 802400F0 3C018024 */ lui $at, 0x8024 -/* DB23B4 802400F4 D42252B8 */ ldc1 $f2, 0x52b8($at) -/* DB23B8 802400F8 46000021 */ cvt.d.s $f0, $f0 -/* DB23BC 802400FC 46220002 */ mul.d $f0, $f0, $f2 -/* DB23C0 80240100 00000000 */ nop -/* DB23C4 80240104 46200020 */ cvt.s.d $f0, $f0 -/* DB23C8 80240108 E6000018 */ swc1 $f0, 0x18($s0) -/* DB23CC 8024010C 8E2200CC */ lw $v0, 0xcc($s1) -/* DB23D0 80240110 8C43002C */ lw $v1, 0x2c($v0) -/* DB23D4 80240114 2402000A */ addiu $v0, $zero, 0xa -/* DB23D8 80240118 A602008E */ sh $v0, 0x8e($s0) -/* DB23DC 8024011C 24020010 */ addiu $v0, $zero, 0x10 -/* DB23E0 80240120 AE030028 */ sw $v1, 0x28($s0) -/* DB23E4 80240124 AE420070 */ sw $v0, 0x70($s2) -.L80240128: -/* DB23E8 80240128 8FBF002C */ lw $ra, 0x2c($sp) -/* DB23EC 8024012C 8FB20028 */ lw $s2, 0x28($sp) -/* DB23F0 80240130 8FB10024 */ lw $s1, 0x24($sp) -/* DB23F4 80240134 8FB00020 */ lw $s0, 0x20($sp) -/* DB23F8 80240138 03E00008 */ jr $ra -/* DB23FC 8024013C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_05/func_80240140_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/func_80240140_DB22C0.s deleted file mode 100644 index b4c42432c4..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/func_80240140_DB22C0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240140_DB2400 -/* DB2400 80240140 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DB2404 80240144 AFB10024 */ sw $s1, 0x24($sp) -/* DB2408 80240148 0080882D */ daddu $s1, $a0, $zero -/* DB240C 8024014C AFBF0028 */ sw $ra, 0x28($sp) -/* DB2410 80240150 AFB00020 */ sw $s0, 0x20($sp) -/* DB2414 80240154 8E220148 */ lw $v0, 0x148($s1) -/* DB2418 80240158 0C00EABB */ jal get_npc_unsafe -/* DB241C 8024015C 84440008 */ lh $a0, 8($v0) -/* DB2420 80240160 0040802D */ daddu $s0, $v0, $zero -/* DB2424 80240164 0200202D */ daddu $a0, $s0, $zero -/* DB2428 80240168 C600000C */ lwc1 $f0, 0xc($s0) -/* DB242C 8024016C 27A60018 */ addiu $a2, $sp, 0x18 -/* DB2430 80240170 E7A00018 */ swc1 $f0, 0x18($sp) -/* DB2434 80240174 AFA00010 */ sw $zero, 0x10($sp) -/* DB2438 80240178 AFA00014 */ sw $zero, 0x14($sp) -/* DB243C 8024017C 8E050018 */ lw $a1, 0x18($s0) -/* DB2440 80240180 0C0129E1 */ jal func_8004A784 -/* DB2444 80240184 0000382D */ daddu $a3, $zero, $zero -/* DB2448 80240188 14400005 */ bnez $v0, .L802401A0 -/* DB244C 8024018C 00000000 */ nop -/* DB2450 80240190 8E050018 */ lw $a1, 0x18($s0) -/* DB2454 80240194 8E06000C */ lw $a2, 0xc($s0) -/* DB2458 80240198 0C00EA95 */ jal npc_move_heading -/* DB245C 8024019C 0200202D */ daddu $a0, $s0, $zero -.L802401A0: -/* DB2460 802401A0 9602008E */ lhu $v0, 0x8e($s0) -/* DB2464 802401A4 2442FFFF */ addiu $v0, $v0, -1 -/* DB2468 802401A8 A602008E */ sh $v0, 0x8e($s0) -/* DB246C 802401AC 00021400 */ sll $v0, $v0, 0x10 -/* DB2470 802401B0 14400004 */ bnez $v0, .L802401C4 -/* DB2474 802401B4 2402001E */ addiu $v0, $zero, 0x1e -/* DB2478 802401B8 A602008E */ sh $v0, 0x8e($s0) -/* DB247C 802401BC 24020011 */ addiu $v0, $zero, 0x11 -/* DB2480 802401C0 AE220070 */ sw $v0, 0x70($s1) -.L802401C4: -/* DB2484 802401C4 8FBF0028 */ lw $ra, 0x28($sp) -/* DB2488 802401C8 8FB10024 */ lw $s1, 0x24($sp) -/* DB248C 802401CC 8FB00020 */ lw $s0, 0x20($sp) -/* DB2490 802401D0 03E00008 */ jr $ra -/* DB2494 802401D4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_05/func_80240238_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/func_80240238_DB22C0.s deleted file mode 100644 index 09d44e4bbe..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/func_80240238_DB22C0.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240238_DB24F8 -/* DB24F8 80240238 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DB24FC 8024023C AFB30054 */ sw $s3, 0x54($sp) -/* DB2500 80240240 0080982D */ daddu $s3, $a0, $zero -/* DB2504 80240244 AFBF0060 */ sw $ra, 0x60($sp) -/* DB2508 80240248 AFB5005C */ sw $s5, 0x5c($sp) -/* DB250C 8024024C AFB40058 */ sw $s4, 0x58($sp) -/* DB2510 80240250 AFB20050 */ sw $s2, 0x50($sp) -/* DB2514 80240254 AFB1004C */ sw $s1, 0x4c($sp) -/* DB2518 80240258 AFB00048 */ sw $s0, 0x48($sp) -/* DB251C 8024025C 8E710148 */ lw $s1, 0x148($s3) -/* DB2520 80240260 86240008 */ lh $a0, 8($s1) -/* DB2524 80240264 0C00EABB */ jal get_npc_unsafe -/* DB2528 80240268 00A0802D */ daddu $s0, $a1, $zero -/* DB252C 8024026C 8E63000C */ lw $v1, 0xc($s3) -/* DB2530 80240270 0260202D */ daddu $a0, $s3, $zero -/* DB2534 80240274 8C650000 */ lw $a1, ($v1) -/* DB2538 80240278 0C0B1EAF */ jal get_variable -/* DB253C 8024027C 0040902D */ daddu $s2, $v0, $zero -/* DB2540 80240280 AFA00018 */ sw $zero, 0x18($sp) -/* DB2544 80240284 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2548 80240288 8C630030 */ lw $v1, 0x30($v1) -/* DB254C 8024028C AFA3001C */ sw $v1, 0x1c($sp) -/* DB2550 80240290 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2554 80240294 8C63001C */ lw $v1, 0x1c($v1) -/* DB2558 80240298 AFA30020 */ sw $v1, 0x20($sp) -/* DB255C 8024029C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2560 802402A0 8C630024 */ lw $v1, 0x24($v1) -/* DB2564 802402A4 AFA30024 */ sw $v1, 0x24($sp) -/* DB2568 802402A8 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB256C 802402AC 8C630028 */ lw $v1, 0x28($v1) -/* DB2570 802402B0 27B50018 */ addiu $s5, $sp, 0x18 -/* DB2574 802402B4 AFA30028 */ sw $v1, 0x28($sp) -/* DB2578 802402B8 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB257C 802402BC 3C014282 */ lui $at, 0x4282 -/* DB2580 802402C0 44810000 */ mtc1 $at, $f0 -/* DB2584 802402C4 8C63002C */ lw $v1, 0x2c($v1) -/* DB2588 802402C8 0040A02D */ daddu $s4, $v0, $zero -/* DB258C 802402CC E7A00030 */ swc1 $f0, 0x30($sp) -/* DB2590 802402D0 A7A00034 */ sh $zero, 0x34($sp) -/* DB2594 802402D4 16000005 */ bnez $s0, .L802402EC -/* DB2598 802402D8 AFA3002C */ sw $v1, 0x2c($sp) -/* DB259C 802402DC 8E2200B0 */ lw $v0, 0xb0($s1) -/* DB25A0 802402E0 30420004 */ andi $v0, $v0, 4 -/* DB25A4 802402E4 10400044 */ beqz $v0, .L802403F8 -/* DB25A8 802402E8 00000000 */ nop -.L802402EC: -/* DB25AC 802402EC 2404F7FF */ addiu $a0, $zero, -0x801 -/* DB25B0 802402F0 AE600070 */ sw $zero, 0x70($s3) -/* DB25B4 802402F4 A640008E */ sh $zero, 0x8e($s2) -/* DB25B8 802402F8 8E2200CC */ lw $v0, 0xcc($s1) -/* DB25BC 802402FC 8E430000 */ lw $v1, ($s2) -/* DB25C0 80240300 8C420000 */ lw $v0, ($v0) -/* DB25C4 80240304 00641824 */ and $v1, $v1, $a0 -/* DB25C8 80240308 AE430000 */ sw $v1, ($s2) -/* DB25CC 8024030C AE420028 */ sw $v0, 0x28($s2) -/* DB25D0 80240310 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB25D4 80240314 8C420034 */ lw $v0, 0x34($v0) -/* DB25D8 80240318 54400005 */ bnel $v0, $zero, .L80240330 -/* DB25DC 8024031C 2402FDFF */ addiu $v0, $zero, -0x201 -/* DB25E0 80240320 34620200 */ ori $v0, $v1, 0x200 -/* DB25E4 80240324 2403FFF7 */ addiu $v1, $zero, -9 -/* DB25E8 80240328 080900CE */ j .L80240338 -/* DB25EC 8024032C 00431024 */ and $v0, $v0, $v1 -.L80240330: -/* DB25F0 80240330 00621024 */ and $v0, $v1, $v0 -/* DB25F4 80240334 34420008 */ ori $v0, $v0, 8 -.L80240338: -/* DB25F8 80240338 AE420000 */ sw $v0, ($s2) -/* DB25FC 8024033C 8E2200B0 */ lw $v0, 0xb0($s1) -/* DB2600 80240340 30420004 */ andi $v0, $v0, 4 -/* DB2604 80240344 10400004 */ beqz $v0, .L80240358 -/* DB2608 80240348 24020063 */ addiu $v0, $zero, 0x63 -/* DB260C 8024034C AE620070 */ sw $v0, 0x70($s3) -/* DB2610 80240350 080900DC */ j .L80240370 -/* DB2614 80240354 AE600074 */ sw $zero, 0x74($s3) -.L80240358: -/* DB2618 80240358 8E220000 */ lw $v0, ($s1) -/* DB261C 8024035C 3C034000 */ lui $v1, 0x4000 -/* DB2620 80240360 00431024 */ and $v0, $v0, $v1 -/* DB2624 80240364 10400002 */ beqz $v0, .L80240370 -/* DB2628 80240368 2402000C */ addiu $v0, $zero, 0xc -/* DB262C 8024036C AE620070 */ sw $v0, 0x70($s3) -.L80240370: -/* DB2630 80240370 3C06BFFF */ lui $a2, 0xbfff -/* DB2634 80240374 34C6FFFF */ ori $a2, $a2, 0xffff -/* DB2638 80240378 27A50038 */ addiu $a1, $sp, 0x38 -/* DB263C 8024037C 2404FFFB */ addiu $a0, $zero, -5 -/* DB2640 80240380 8E2200B0 */ lw $v0, 0xb0($s1) -/* DB2644 80240384 8E230000 */ lw $v1, ($s1) -/* DB2648 80240388 3C0142C8 */ lui $at, 0x42c8 -/* DB264C 8024038C 44810000 */ mtc1 $at, $f0 -/* DB2650 80240390 00441024 */ and $v0, $v0, $a0 -/* DB2654 80240394 00661824 */ and $v1, $v1, $a2 -/* DB2658 80240398 AE2200B0 */ sw $v0, 0xb0($s1) -/* DB265C 8024039C AE230000 */ sw $v1, ($s1) -/* DB2660 802403A0 864200A8 */ lh $v0, 0xa8($s2) -/* DB2664 802403A4 27A70040 */ addiu $a3, $sp, 0x40 -/* DB2668 802403A8 E7A00044 */ swc1 $f0, 0x44($sp) -/* DB266C 802403AC C6460038 */ lwc1 $f6, 0x38($s2) -/* DB2670 802403B0 C640003C */ lwc1 $f0, 0x3c($s2) -/* DB2674 802403B4 C6420040 */ lwc1 $f2, 0x40($s2) -/* DB2678 802403B8 44822000 */ mtc1 $v0, $f4 -/* DB267C 802403BC 00000000 */ nop -/* DB2680 802403C0 46802120 */ cvt.s.w $f4, $f4 -/* DB2684 802403C4 27A20044 */ addiu $v0, $sp, 0x44 -/* DB2688 802403C8 46040000 */ add.s $f0, $f0, $f4 -/* DB268C 802403CC E7A60038 */ swc1 $f6, 0x38($sp) -/* DB2690 802403D0 E7A20040 */ swc1 $f2, 0x40($sp) -/* DB2694 802403D4 E7A0003C */ swc1 $f0, 0x3c($sp) -/* DB2698 802403D8 AFA20010 */ sw $v0, 0x10($sp) -/* DB269C 802403DC 8E440080 */ lw $a0, 0x80($s2) -/* DB26A0 802403E0 0C0372DF */ jal func_800DCB7C -/* DB26A4 802403E4 27A6003C */ addiu $a2, $sp, 0x3c -/* DB26A8 802403E8 10400003 */ beqz $v0, .L802403F8 -/* DB26AC 802403EC 00000000 */ nop -/* DB26B0 802403F0 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DB26B4 802403F4 E640003C */ swc1 $f0, 0x3c($s2) -.L802403F8: -/* DB26B8 802403F8 8E630070 */ lw $v1, 0x70($s3) -/* DB26BC 802403FC 2C620064 */ sltiu $v0, $v1, 0x64 -/* DB26C0 80240400 10400050 */ beqz $v0, .L80240544 -/* DB26C4 80240404 00031080 */ sll $v0, $v1, 2 -/* DB26C8 80240408 3C018024 */ lui $at, 0x8024 -/* DB26CC 8024040C 00220821 */ addu $at, $at, $v0 -/* DB26D0 80240410 8C2252C0 */ lw $v0, 0x52c0($at) -/* DB26D4 80240414 00400008 */ jr $v0 -/* DB26D8 80240418 00000000 */ nop -/* DB26DC 8024041C 0260202D */ daddu $a0, $s3, $zero -/* DB26E0 80240420 0280282D */ daddu $a1, $s4, $zero -/* DB26E4 80240424 0C012568 */ jal func_800495A0 -/* DB26E8 80240428 02A0302D */ daddu $a2, $s5, $zero -/* DB26EC 8024042C 0260202D */ daddu $a0, $s3, $zero -/* DB26F0 80240430 0280282D */ daddu $a1, $s4, $zero -/* DB26F4 80240434 0C0125AE */ jal func_800496B8 -/* DB26F8 80240438 02A0302D */ daddu $a2, $s5, $zero -/* DB26FC 8024043C 08090151 */ j .L80240544 -/* DB2700 80240440 00000000 */ nop -/* DB2704 80240444 0260202D */ daddu $a0, $s3, $zero -/* DB2708 80240448 0280282D */ daddu $a1, $s4, $zero -/* DB270C 8024044C 0C0126D1 */ jal func_80049B44 -/* DB2710 80240450 02A0302D */ daddu $a2, $s5, $zero -/* DB2714 80240454 0260202D */ daddu $a0, $s3, $zero -/* DB2718 80240458 0280282D */ daddu $a1, $s4, $zero -/* DB271C 8024045C 0C012701 */ jal func_80049C04 -/* DB2720 80240460 02A0302D */ daddu $a2, $s5, $zero -/* DB2724 80240464 08090151 */ j .L80240544 -/* DB2728 80240468 00000000 */ nop -/* DB272C 8024046C 0260202D */ daddu $a0, $s3, $zero -/* DB2730 80240470 0280282D */ daddu $a1, $s4, $zero -/* DB2734 80240474 0C01278F */ jal func_80049E3C -/* DB2738 80240478 02A0302D */ daddu $a2, $s5, $zero -/* DB273C 8024047C 0260202D */ daddu $a0, $s3, $zero -/* DB2740 80240480 0280282D */ daddu $a1, $s4, $zero -/* DB2744 80240484 0C0127B3 */ jal func_80049ECC -/* DB2748 80240488 02A0302D */ daddu $a2, $s5, $zero -/* DB274C 8024048C 08090151 */ j .L80240544 -/* DB2750 80240490 00000000 */ nop -/* DB2754 80240494 0260202D */ daddu $a0, $s3, $zero -/* DB2758 80240498 0280282D */ daddu $a1, $s4, $zero -/* DB275C 8024049C 0C0127DF */ jal func_80049F7C -/* DB2760 802404A0 02A0302D */ daddu $a2, $s5, $zero -/* DB2764 802404A4 0260202D */ daddu $a0, $s3, $zero -/* DB2768 802404A8 0280282D */ daddu $a1, $s4, $zero -/* DB276C 802404AC 0C012849 */ jal func_8004A124 -/* DB2770 802404B0 02A0302D */ daddu $a2, $s5, $zero -/* DB2774 802404B4 8E630070 */ lw $v1, 0x70($s3) -/* DB2778 802404B8 2402000E */ addiu $v0, $zero, 0xe -/* DB277C 802404BC 14620021 */ bne $v1, $v0, .L80240544 -/* DB2780 802404C0 00000000 */ nop -/* DB2784 802404C4 0260202D */ daddu $a0, $s3, $zero -/* DB2788 802404C8 0280282D */ daddu $a1, $s4, $zero -/* DB278C 802404CC 0C090000 */ jal func_80240000 -/* DB2790 802404D0 02A0302D */ daddu $a2, $s5, $zero -/* DB2794 802404D4 8E630070 */ lw $v1, 0x70($s3) -/* DB2798 802404D8 2402000F */ addiu $v0, $zero, 0xf -/* DB279C 802404DC 14620019 */ bne $v1, $v0, .L80240544 -/* DB27A0 802404E0 00000000 */ nop -/* DB27A4 802404E4 0260202D */ daddu $a0, $s3, $zero -/* DB27A8 802404E8 0280282D */ daddu $a1, $s4, $zero -/* DB27AC 802404EC 0C09001C */ jal func_80240070 -/* DB27B0 802404F0 02A0302D */ daddu $a2, $s5, $zero -/* DB27B4 802404F4 8E630070 */ lw $v1, 0x70($s3) -/* DB27B8 802404F8 24020010 */ addiu $v0, $zero, 0x10 -/* DB27BC 802404FC 14620011 */ bne $v1, $v0, .L80240544 -/* DB27C0 80240500 00000000 */ nop -/* DB27C4 80240504 0260202D */ daddu $a0, $s3, $zero -/* DB27C8 80240508 0280282D */ daddu $a1, $s4, $zero -/* DB27CC 8024050C 0C090050 */ jal func_80240140 -/* DB27D0 80240510 02A0302D */ daddu $a2, $s5, $zero -/* DB27D4 80240514 8E630070 */ lw $v1, 0x70($s3) -/* DB27D8 80240518 24020011 */ addiu $v0, $zero, 0x11 -/* DB27DC 8024051C 14620009 */ bne $v1, $v0, .L80240544 -/* DB27E0 80240520 00000000 */ nop -/* DB27E4 80240524 0260202D */ daddu $a0, $s3, $zero -/* DB27E8 80240528 0280282D */ daddu $a1, $s4, $zero -/* DB27EC 8024052C 0C090076 */ jal func_802401D8 -/* DB27F0 80240530 02A0302D */ daddu $a2, $s5, $zero -/* DB27F4 80240534 08090151 */ j .L80240544 -/* DB27F8 80240538 00000000 */ nop -/* DB27FC 8024053C 0C0129CF */ jal func_8004A73C -/* DB2800 80240540 0260202D */ daddu $a0, $s3, $zero -.L80240544: -/* DB2804 80240544 8FBF0060 */ lw $ra, 0x60($sp) -/* DB2808 80240548 8FB5005C */ lw $s5, 0x5c($sp) -/* DB280C 8024054C 8FB40058 */ lw $s4, 0x58($sp) -/* DB2810 80240550 8FB30054 */ lw $s3, 0x54($sp) -/* DB2814 80240554 8FB20050 */ lw $s2, 0x50($sp) -/* DB2818 80240558 8FB1004C */ lw $s1, 0x4c($sp) -/* DB281C 8024055C 8FB00048 */ lw $s0, 0x48($sp) -/* DB2820 80240560 0000102D */ daddu $v0, $zero, $zero -/* DB2824 80240564 03E00008 */ jr $ra -/* DB2828 80240568 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_omo/omo_05/func_8024056C_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/func_8024056C_DB22C0.s deleted file mode 100644 index b78041d0b6..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/func_8024056C_DB22C0.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024056C_DB282C -/* DB282C 8024056C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB2830 80240570 AFB10014 */ sw $s1, 0x14($sp) -/* DB2834 80240574 0080882D */ daddu $s1, $a0, $zero -/* DB2838 80240578 AFBF0018 */ sw $ra, 0x18($sp) -/* DB283C 8024057C AFB00010 */ sw $s0, 0x10($sp) -/* DB2840 80240580 8E300148 */ lw $s0, 0x148($s1) -/* DB2844 80240584 0C00EABB */ jal get_npc_unsafe -/* DB2848 80240588 86040008 */ lh $a0, 8($s0) -/* DB284C 8024058C 3C054387 */ lui $a1, 0x4387 -/* DB2850 80240590 0040202D */ daddu $a0, $v0, $zero -/* DB2854 80240594 0C00ECD0 */ jal set_npc_yaw -/* DB2858 80240598 A480008E */ sh $zero, 0x8e($a0) -/* DB285C 8024059C 24020003 */ addiu $v0, $zero, 3 -/* DB2860 802405A0 AE00006C */ sw $zero, 0x6c($s0) -/* DB2864 802405A4 AE220070 */ sw $v0, 0x70($s1) -/* DB2868 802405A8 8FBF0018 */ lw $ra, 0x18($sp) -/* DB286C 802405AC 8FB10014 */ lw $s1, 0x14($sp) -/* DB2870 802405B0 8FB00010 */ lw $s0, 0x10($sp) -/* DB2874 802405B4 03E00008 */ jr $ra -/* DB2878 802405B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_05/func_802405BC_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/func_802405BC_DB22C0.s deleted file mode 100644 index d487ef88b2..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/func_802405BC_DB22C0.s +++ /dev/null @@ -1,132 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405BC_DB287C -/* DB287C 802405BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB2880 802405C0 AFB20018 */ sw $s2, 0x18($sp) -/* DB2884 802405C4 0080902D */ daddu $s2, $a0, $zero -/* DB2888 802405C8 AFBF001C */ sw $ra, 0x1c($sp) -/* DB288C 802405CC AFB10014 */ sw $s1, 0x14($sp) -/* DB2890 802405D0 AFB00010 */ sw $s0, 0x10($sp) -/* DB2894 802405D4 8E500148 */ lw $s0, 0x148($s2) -/* DB2898 802405D8 0C00EABB */ jal get_npc_unsafe -/* DB289C 802405DC 86040008 */ lh $a0, 8($s0) -/* DB28A0 802405E0 8E03006C */ lw $v1, 0x6c($s0) -/* DB28A4 802405E4 24060001 */ addiu $a2, $zero, 1 -/* DB28A8 802405E8 10660016 */ beq $v1, $a2, .L80240644 -/* DB28AC 802405EC 0040882D */ daddu $s1, $v0, $zero -/* DB28B0 802405F0 28620002 */ slti $v0, $v1, 2 -/* DB28B4 802405F4 50400005 */ beql $v0, $zero, .L8024060C -/* DB28B8 802405F8 24020002 */ addiu $v0, $zero, 2 -/* DB28BC 802405FC 10600009 */ beqz $v1, .L80240624 -/* DB28C0 80240600 3C02003C */ lui $v0, 0x3c -/* DB28C4 80240604 080901D4 */ j .L80240750 -/* DB28C8 80240608 24020004 */ addiu $v0, $zero, 4 -.L8024060C: -/* DB28CC 8024060C 10620030 */ beq $v1, $v0, .L802406D0 -/* DB28D0 80240610 24020003 */ addiu $v0, $zero, 3 -/* DB28D4 80240614 10620034 */ beq $v1, $v0, .L802406E8 -/* DB28D8 80240618 00000000 */ nop -/* DB28DC 8024061C 080901D2 */ j .L80240748 -/* DB28E0 80240620 00000000 */ nop -.L80240624: -/* DB28E4 80240624 3442000C */ ori $v0, $v0, 0xc -/* DB28E8 80240628 3C054387 */ lui $a1, 0x4387 -/* DB28EC 8024062C 0220202D */ daddu $a0, $s1, $zero -/* DB28F0 80240630 AE06006C */ sw $a2, 0x6c($s0) -/* DB28F4 80240634 AE000070 */ sw $zero, 0x70($s0) -/* DB28F8 80240638 0C00ECD0 */ jal set_npc_yaw -/* DB28FC 8024063C AE220028 */ sw $v0, 0x28($s1) -/* DB2900 80240640 AE200048 */ sw $zero, 0x48($s1) -.L80240644: -/* DB2904 80240644 8E030070 */ lw $v1, 0x70($s0) -/* DB2908 80240648 04610002 */ bgez $v1, .L80240654 -/* DB290C 8024064C 0060102D */ daddu $v0, $v1, $zero -/* DB2910 80240650 2462000F */ addiu $v0, $v1, 0xf -.L80240654: -/* DB2914 80240654 00022103 */ sra $a0, $v0, 4 -/* DB2918 80240658 00041100 */ sll $v0, $a0, 4 -/* DB291C 8024065C 00622023 */ subu $a0, $v1, $v0 -/* DB2920 80240660 28820004 */ slti $v0, $a0, 4 -/* DB2924 80240664 10400003 */ beqz $v0, .L80240674 -/* DB2928 80240668 3C02003C */ lui $v0, 0x3c -/* DB292C 8024066C 080901AB */ j .L802406AC -/* DB2930 80240670 3442000C */ ori $v0, $v0, 0xc -.L80240674: -/* DB2934 80240674 28820008 */ slti $v0, $a0, 8 -/* DB2938 80240678 10400003 */ beqz $v0, .L80240688 -/* DB293C 8024067C 3C02003C */ lui $v0, 0x3c -/* DB2940 80240680 080901AB */ j .L802406AC -/* DB2944 80240684 3442000B */ ori $v0, $v0, 0xb -.L80240688: -/* DB2948 80240688 2882000C */ slti $v0, $a0, 0xc -/* DB294C 8024068C 10400003 */ beqz $v0, .L8024069C -/* DB2950 80240690 3C02003C */ lui $v0, 0x3c -/* DB2954 80240694 080901AB */ j .L802406AC -/* DB2958 80240698 3442000C */ ori $v0, $v0, 0xc -.L8024069C: -/* DB295C 8024069C 28820010 */ slti $v0, $a0, 0x10 -/* DB2960 802406A0 10400003 */ beqz $v0, .L802406B0 -/* DB2964 802406A4 3C02003C */ lui $v0, 0x3c -/* DB2968 802406A8 3442000D */ ori $v0, $v0, 0xd -.L802406AC: -/* DB296C 802406AC AE220028 */ sw $v0, 0x28($s1) -.L802406B0: -/* DB2970 802406B0 8E020070 */ lw $v0, 0x70($s0) -/* DB2974 802406B4 24420001 */ addiu $v0, $v0, 1 -/* DB2978 802406B8 AE020070 */ sw $v0, 0x70($s0) -/* DB297C 802406BC 28420041 */ slti $v0, $v0, 0x41 -/* DB2980 802406C0 14400021 */ bnez $v0, .L80240748 -/* DB2984 802406C4 24020002 */ addiu $v0, $zero, 2 -/* DB2988 802406C8 080901D2 */ j .L80240748 -/* DB298C 802406CC AE02006C */ sw $v0, 0x6c($s0) -.L802406D0: -/* DB2990 802406D0 3C03003C */ lui $v1, 0x3c -/* DB2994 802406D4 3463000C */ ori $v1, $v1, 0xc -/* DB2998 802406D8 AE02006C */ sw $v0, 0x6c($s0) -/* DB299C 802406DC AE000070 */ sw $zero, 0x70($s0) -/* DB29A0 802406E0 AE200048 */ sw $zero, 0x48($s1) -/* DB29A4 802406E4 AE230028 */ sw $v1, 0x28($s1) -.L802406E8: -/* DB29A8 802406E8 C6200048 */ lwc1 $f0, 0x48($s1) -/* DB29AC 802406EC 3C018024 */ lui $at, 0x8024 -/* DB29B0 802406F0 D4225450 */ ldc1 $f2, 0x5450($at) -/* DB29B4 802406F4 46000021 */ cvt.d.s $f0, $f0 -/* DB29B8 802406F8 46220000 */ add.d $f0, $f0, $f2 -/* DB29BC 802406FC 3C018024 */ lui $at, 0x8024 -/* DB29C0 80240700 D4225458 */ ldc1 $f2, 0x5458($at) -/* DB29C4 80240704 46200020 */ cvt.s.d $f0, $f0 -/* DB29C8 80240708 E6200048 */ swc1 $f0, 0x48($s1) -/* DB29CC 8024070C 46000021 */ cvt.d.s $f0, $f0 -/* DB29D0 80240710 4620103C */ c.lt.d $f2, $f0 -/* DB29D4 80240714 00000000 */ nop -/* DB29D8 80240718 45000004 */ bc1f .L8024072C -/* DB29DC 8024071C 00000000 */ nop -/* DB29E0 80240720 46220001 */ sub.d $f0, $f0, $f2 -/* DB29E4 80240724 46200020 */ cvt.s.d $f0, $f0 -/* DB29E8 80240728 E6200048 */ swc1 $f0, 0x48($s1) -.L8024072C: -/* DB29EC 8024072C 8E020070 */ lw $v0, 0x70($s0) -/* DB29F0 80240730 24420001 */ addiu $v0, $v0, 1 -/* DB29F4 80240734 AE020070 */ sw $v0, 0x70($s0) -/* DB29F8 80240738 2842002E */ slti $v0, $v0, 0x2e -/* DB29FC 8024073C 14400002 */ bnez $v0, .L80240748 -/* DB2A00 80240740 24020004 */ addiu $v0, $zero, 4 -/* DB2A04 80240744 AE02006C */ sw $v0, 0x6c($s0) -.L80240748: -/* DB2A08 80240748 8E03006C */ lw $v1, 0x6c($s0) -/* DB2A0C 8024074C 24020004 */ addiu $v0, $zero, 4 -.L80240750: -/* DB2A10 80240750 14620005 */ bne $v1, $v0, .L80240768 -/* DB2A14 80240754 0220202D */ daddu $a0, $s1, $zero -/* DB2A18 80240758 3C054387 */ lui $a1, 0x4387 -/* DB2A1C 8024075C 0C00ECD0 */ jal set_npc_yaw -/* DB2A20 80240760 AC800048 */ sw $zero, 0x48($a0) -/* DB2A24 80240764 AE400070 */ sw $zero, 0x70($s2) -.L80240768: -/* DB2A28 80240768 8FBF001C */ lw $ra, 0x1c($sp) -/* DB2A2C 8024076C 8FB20018 */ lw $s2, 0x18($sp) -/* DB2A30 80240770 8FB10014 */ lw $s1, 0x14($sp) -/* DB2A34 80240774 8FB00010 */ lw $s0, 0x10($sp) -/* DB2A38 80240778 03E00008 */ jr $ra -/* DB2A3C 8024077C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_05/func_80240780_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/func_80240780_DB22C0.s deleted file mode 100644 index d89adcdcac..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/func_80240780_DB22C0.s +++ /dev/null @@ -1,192 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240780_DB2A40 -/* DB2A40 80240780 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DB2A44 80240784 AFB30054 */ sw $s3, 0x54($sp) -/* DB2A48 80240788 0080982D */ daddu $s3, $a0, $zero -/* DB2A4C 8024078C AFBF0060 */ sw $ra, 0x60($sp) -/* DB2A50 80240790 AFB5005C */ sw $s5, 0x5c($sp) -/* DB2A54 80240794 AFB40058 */ sw $s4, 0x58($sp) -/* DB2A58 80240798 AFB20050 */ sw $s2, 0x50($sp) -/* DB2A5C 8024079C AFB1004C */ sw $s1, 0x4c($sp) -/* DB2A60 802407A0 AFB00048 */ sw $s0, 0x48($sp) -/* DB2A64 802407A4 8E710148 */ lw $s1, 0x148($s3) -/* DB2A68 802407A8 86240008 */ lh $a0, 8($s1) -/* DB2A6C 802407AC 0C00EABB */ jal get_npc_unsafe -/* DB2A70 802407B0 00A0802D */ daddu $s0, $a1, $zero -/* DB2A74 802407B4 8E63000C */ lw $v1, 0xc($s3) -/* DB2A78 802407B8 0260202D */ daddu $a0, $s3, $zero -/* DB2A7C 802407BC 8C650000 */ lw $a1, ($v1) -/* DB2A80 802407C0 0C0B1EAF */ jal get_variable -/* DB2A84 802407C4 0040902D */ daddu $s2, $v0, $zero -/* DB2A88 802407C8 AFA00018 */ sw $zero, 0x18($sp) -/* DB2A8C 802407CC 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2A90 802407D0 8C630030 */ lw $v1, 0x30($v1) -/* DB2A94 802407D4 AFA3001C */ sw $v1, 0x1c($sp) -/* DB2A98 802407D8 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2A9C 802407DC 8C63001C */ lw $v1, 0x1c($v1) -/* DB2AA0 802407E0 AFA30020 */ sw $v1, 0x20($sp) -/* DB2AA4 802407E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2AA8 802407E8 8C630024 */ lw $v1, 0x24($v1) -/* DB2AAC 802407EC AFA30024 */ sw $v1, 0x24($sp) -/* DB2AB0 802407F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2AB4 802407F4 8C630028 */ lw $v1, 0x28($v1) -/* DB2AB8 802407F8 27B50018 */ addiu $s5, $sp, 0x18 -/* DB2ABC 802407FC AFA30028 */ sw $v1, 0x28($sp) -/* DB2AC0 80240800 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2AC4 80240804 3C014282 */ lui $at, 0x4282 -/* DB2AC8 80240808 44810000 */ mtc1 $at, $f0 -/* DB2ACC 8024080C 8C63002C */ lw $v1, 0x2c($v1) -/* DB2AD0 80240810 0040A02D */ daddu $s4, $v0, $zero -/* DB2AD4 80240814 E7A00030 */ swc1 $f0, 0x30($sp) -/* DB2AD8 80240818 A7A00034 */ sh $zero, 0x34($sp) -/* DB2ADC 8024081C 16000005 */ bnez $s0, .L80240834 -/* DB2AE0 80240820 AFA3002C */ sw $v1, 0x2c($sp) -/* DB2AE4 80240824 8E2200B0 */ lw $v0, 0xb0($s1) -/* DB2AE8 80240828 30420004 */ andi $v0, $v0, 4 -/* DB2AEC 8024082C 10400044 */ beqz $v0, .L80240940 -/* DB2AF0 80240830 00000000 */ nop -.L80240834: -/* DB2AF4 80240834 2404F7FF */ addiu $a0, $zero, -0x801 -/* DB2AF8 80240838 AE600070 */ sw $zero, 0x70($s3) -/* DB2AFC 8024083C A640008E */ sh $zero, 0x8e($s2) -/* DB2B00 80240840 8E2200CC */ lw $v0, 0xcc($s1) -/* DB2B04 80240844 8E430000 */ lw $v1, ($s2) -/* DB2B08 80240848 8C420000 */ lw $v0, ($v0) -/* DB2B0C 8024084C 00641824 */ and $v1, $v1, $a0 -/* DB2B10 80240850 AE430000 */ sw $v1, ($s2) -/* DB2B14 80240854 AE420028 */ sw $v0, 0x28($s2) -/* DB2B18 80240858 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB2B1C 8024085C 8C420034 */ lw $v0, 0x34($v0) -/* DB2B20 80240860 54400005 */ bnel $v0, $zero, .L80240878 -/* DB2B24 80240864 2402FDFF */ addiu $v0, $zero, -0x201 -/* DB2B28 80240868 34620200 */ ori $v0, $v1, 0x200 -/* DB2B2C 8024086C 2403FFF7 */ addiu $v1, $zero, -9 -/* DB2B30 80240870 08090220 */ j .L80240880 -/* DB2B34 80240874 00431024 */ and $v0, $v0, $v1 -.L80240878: -/* DB2B38 80240878 00621024 */ and $v0, $v1, $v0 -/* DB2B3C 8024087C 34420008 */ ori $v0, $v0, 8 -.L80240880: -/* DB2B40 80240880 AE420000 */ sw $v0, ($s2) -/* DB2B44 80240884 8E2200B0 */ lw $v0, 0xb0($s1) -/* DB2B48 80240888 30420004 */ andi $v0, $v0, 4 -/* DB2B4C 8024088C 10400004 */ beqz $v0, .L802408A0 -/* DB2B50 80240890 24020063 */ addiu $v0, $zero, 0x63 -/* DB2B54 80240894 AE620070 */ sw $v0, 0x70($s3) -/* DB2B58 80240898 0809022E */ j .L802408B8 -/* DB2B5C 8024089C AE600074 */ sw $zero, 0x74($s3) -.L802408A0: -/* DB2B60 802408A0 8E220000 */ lw $v0, ($s1) -/* DB2B64 802408A4 3C034000 */ lui $v1, 0x4000 -/* DB2B68 802408A8 00431024 */ and $v0, $v0, $v1 -/* DB2B6C 802408AC 10400002 */ beqz $v0, .L802408B8 -/* DB2B70 802408B0 2402000C */ addiu $v0, $zero, 0xc -/* DB2B74 802408B4 AE620070 */ sw $v0, 0x70($s3) -.L802408B8: -/* DB2B78 802408B8 3C06BFFF */ lui $a2, 0xbfff -/* DB2B7C 802408BC 34C6FFFF */ ori $a2, $a2, 0xffff -/* DB2B80 802408C0 27A50038 */ addiu $a1, $sp, 0x38 -/* DB2B84 802408C4 2404FFFB */ addiu $a0, $zero, -5 -/* DB2B88 802408C8 8E2200B0 */ lw $v0, 0xb0($s1) -/* DB2B8C 802408CC 8E230000 */ lw $v1, ($s1) -/* DB2B90 802408D0 3C0142C8 */ lui $at, 0x42c8 -/* DB2B94 802408D4 44810000 */ mtc1 $at, $f0 -/* DB2B98 802408D8 00441024 */ and $v0, $v0, $a0 -/* DB2B9C 802408DC 00661824 */ and $v1, $v1, $a2 -/* DB2BA0 802408E0 AE2200B0 */ sw $v0, 0xb0($s1) -/* DB2BA4 802408E4 AE230000 */ sw $v1, ($s1) -/* DB2BA8 802408E8 864200A8 */ lh $v0, 0xa8($s2) -/* DB2BAC 802408EC 27A70040 */ addiu $a3, $sp, 0x40 -/* DB2BB0 802408F0 E7A00044 */ swc1 $f0, 0x44($sp) -/* DB2BB4 802408F4 C6460038 */ lwc1 $f6, 0x38($s2) -/* DB2BB8 802408F8 C640003C */ lwc1 $f0, 0x3c($s2) -/* DB2BBC 802408FC C6420040 */ lwc1 $f2, 0x40($s2) -/* DB2BC0 80240900 44822000 */ mtc1 $v0, $f4 -/* DB2BC4 80240904 00000000 */ nop -/* DB2BC8 80240908 46802120 */ cvt.s.w $f4, $f4 -/* DB2BCC 8024090C 27A20044 */ addiu $v0, $sp, 0x44 -/* DB2BD0 80240910 46040000 */ add.s $f0, $f0, $f4 -/* DB2BD4 80240914 E7A60038 */ swc1 $f6, 0x38($sp) -/* DB2BD8 80240918 E7A20040 */ swc1 $f2, 0x40($sp) -/* DB2BDC 8024091C E7A0003C */ swc1 $f0, 0x3c($sp) -/* DB2BE0 80240920 AFA20010 */ sw $v0, 0x10($sp) -/* DB2BE4 80240924 8E440080 */ lw $a0, 0x80($s2) -/* DB2BE8 80240928 0C0372DF */ jal func_800DCB7C -/* DB2BEC 8024092C 27A6003C */ addiu $a2, $sp, 0x3c -/* DB2BF0 80240930 10400003 */ beqz $v0, .L80240940 -/* DB2BF4 80240934 00000000 */ nop -/* DB2BF8 80240938 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DB2BFC 8024093C E640003C */ swc1 $f0, 0x3c($s2) -.L80240940: -/* DB2C00 80240940 8E630070 */ lw $v1, 0x70($s3) -/* DB2C04 80240944 2C620064 */ sltiu $v0, $v1, 0x64 -/* DB2C08 80240948 10400038 */ beqz $v0, .L80240A2C -/* DB2C0C 8024094C 00031080 */ sll $v0, $v1, 2 -/* DB2C10 80240950 3C018024 */ lui $at, 0x8024 -/* DB2C14 80240954 00220821 */ addu $at, $at, $v0 -/* DB2C18 80240958 8C225460 */ lw $v0, 0x5460($at) -/* DB2C1C 8024095C 00400008 */ jr $v0 -/* DB2C20 80240960 00000000 */ nop -/* DB2C24 80240964 0260202D */ daddu $a0, $s3, $zero -/* DB2C28 80240968 0280282D */ daddu $a1, $s4, $zero -/* DB2C2C 8024096C 0C012568 */ jal func_800495A0 -/* DB2C30 80240970 02A0302D */ daddu $a2, $s5, $zero -/* DB2C34 80240974 0260202D */ daddu $a0, $s3, $zero -/* DB2C38 80240978 0280282D */ daddu $a1, $s4, $zero -/* DB2C3C 8024097C 0C0125AE */ jal func_800496B8 -/* DB2C40 80240980 02A0302D */ daddu $a2, $s5, $zero -/* DB2C44 80240984 0809028B */ j .L80240A2C -/* DB2C48 80240988 00000000 */ nop -/* DB2C4C 8024098C 0260202D */ daddu $a0, $s3, $zero -/* DB2C50 80240990 0280282D */ daddu $a1, $s4, $zero -/* DB2C54 80240994 0C09015B */ jal func_8024056C -/* DB2C58 80240998 02A0302D */ daddu $a2, $s5, $zero -/* DB2C5C 8024099C 0260202D */ daddu $a0, $s3, $zero -/* DB2C60 802409A0 0280282D */ daddu $a1, $s4, $zero -/* DB2C64 802409A4 0C09016F */ jal func_802405BC -/* DB2C68 802409A8 02A0302D */ daddu $a2, $s5, $zero -/* DB2C6C 802409AC 0809028B */ j .L80240A2C -/* DB2C70 802409B0 00000000 */ nop -/* DB2C74 802409B4 0260202D */ daddu $a0, $s3, $zero -/* DB2C78 802409B8 0280282D */ daddu $a1, $s4, $zero -/* DB2C7C 802409BC 0C01278F */ jal func_80049E3C -/* DB2C80 802409C0 02A0302D */ daddu $a2, $s5, $zero -/* DB2C84 802409C4 0260202D */ daddu $a0, $s3, $zero -/* DB2C88 802409C8 0280282D */ daddu $a1, $s4, $zero -/* DB2C8C 802409CC 0C0127B3 */ jal func_80049ECC -/* DB2C90 802409D0 02A0302D */ daddu $a2, $s5, $zero -/* DB2C94 802409D4 0809028B */ j .L80240A2C -/* DB2C98 802409D8 00000000 */ nop -/* DB2C9C 802409DC 0260202D */ daddu $a0, $s3, $zero -/* DB2CA0 802409E0 0280282D */ daddu $a1, $s4, $zero -/* DB2CA4 802409E4 0C0127DF */ jal func_80049F7C -/* DB2CA8 802409E8 02A0302D */ daddu $a2, $s5, $zero -/* DB2CAC 802409EC 0260202D */ daddu $a0, $s3, $zero -/* DB2CB0 802409F0 0280282D */ daddu $a1, $s4, $zero -/* DB2CB4 802409F4 0C012849 */ jal func_8004A124 -/* DB2CB8 802409F8 02A0302D */ daddu $a2, $s5, $zero -/* DB2CBC 802409FC 8E630070 */ lw $v1, 0x70($s3) -/* DB2CC0 80240A00 2402000E */ addiu $v0, $zero, 0xe -/* DB2CC4 80240A04 14620009 */ bne $v1, $v0, .L80240A2C -/* DB2CC8 80240A08 00000000 */ nop -/* DB2CCC 80240A0C 0260202D */ daddu $a0, $s3, $zero -/* DB2CD0 80240A10 0280282D */ daddu $a1, $s4, $zero -/* DB2CD4 80240A14 0C0128FA */ jal func_8004A3E8 -/* DB2CD8 80240A18 02A0302D */ daddu $a2, $s5, $zero -/* DB2CDC 80240A1C 0809028B */ j .L80240A2C -/* DB2CE0 80240A20 00000000 */ nop -/* DB2CE4 80240A24 0C0129CF */ jal func_8004A73C -/* DB2CE8 80240A28 0260202D */ daddu $a0, $s3, $zero -.L80240A2C: -/* DB2CEC 80240A2C 8FBF0060 */ lw $ra, 0x60($sp) -/* DB2CF0 80240A30 8FB5005C */ lw $s5, 0x5c($sp) -/* DB2CF4 80240A34 8FB40058 */ lw $s4, 0x58($sp) -/* DB2CF8 80240A38 8FB30054 */ lw $s3, 0x54($sp) -/* DB2CFC 80240A3C 8FB20050 */ lw $s2, 0x50($sp) -/* DB2D00 80240A40 8FB1004C */ lw $s1, 0x4c($sp) -/* DB2D04 80240A44 8FB00048 */ lw $s0, 0x48($sp) -/* DB2D08 80240A48 0000102D */ daddu $v0, $zero, $zero -/* DB2D0C 80240A4C 03E00008 */ jr $ra -/* DB2D10 80240A50 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_omo/omo_05/func_80240A54_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/func_80240A54_DB22C0.s deleted file mode 100644 index f3f724b1e7..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/func_80240A54_DB22C0.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A54_DB2D14 -/* DB2D14 80240A54 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DB2D18 80240A58 AFB3002C */ sw $s3, 0x2c($sp) -/* DB2D1C 80240A5C 0080982D */ daddu $s3, $a0, $zero -/* DB2D20 80240A60 AFBF0030 */ sw $ra, 0x30($sp) -/* DB2D24 80240A64 AFB20028 */ sw $s2, 0x28($sp) -/* DB2D28 80240A68 AFB10024 */ sw $s1, 0x24($sp) -/* DB2D2C 80240A6C AFB00020 */ sw $s0, 0x20($sp) -/* DB2D30 80240A70 8E710148 */ lw $s1, 0x148($s3) -/* DB2D34 80240A74 86240008 */ lh $a0, 8($s1) -/* DB2D38 80240A78 0C00EABB */ jal get_npc_unsafe -/* DB2D3C 80240A7C 00A0902D */ daddu $s2, $a1, $zero -/* DB2D40 80240A80 8E440004 */ lw $a0, 4($s2) -/* DB2D44 80240A84 0040802D */ daddu $s0, $v0, $zero -/* DB2D48 80240A88 00041FC2 */ srl $v1, $a0, 0x1f -/* DB2D4C 80240A8C 00832021 */ addu $a0, $a0, $v1 -/* DB2D50 80240A90 00042043 */ sra $a0, $a0, 1 -/* DB2D54 80240A94 0C00A67F */ jal rand_int -/* DB2D58 80240A98 24840001 */ addiu $a0, $a0, 1 -/* DB2D5C 80240A9C 8E430004 */ lw $v1, 4($s2) -/* DB2D60 80240AA0 000327C2 */ srl $a0, $v1, 0x1f -/* DB2D64 80240AA4 00641821 */ addu $v1, $v1, $a0 -/* DB2D68 80240AA8 00031843 */ sra $v1, $v1, 1 -/* DB2D6C 80240AAC 00621821 */ addu $v1, $v1, $v0 -/* DB2D70 80240AB0 A603008E */ sh $v1, 0x8e($s0) -/* DB2D74 80240AB4 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2D78 80240AB8 C6000040 */ lwc1 $f0, 0x40($s0) -/* DB2D7C 80240ABC C4640000 */ lwc1 $f4, ($v1) -/* DB2D80 80240AC0 46802120 */ cvt.s.w $f4, $f4 -/* DB2D84 80240AC4 C4620008 */ lwc1 $f2, 8($v1) -/* DB2D88 80240AC8 468010A0 */ cvt.s.w $f2, $f2 -/* DB2D8C 80240ACC E7A00010 */ swc1 $f0, 0x10($sp) -/* DB2D90 80240AD0 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB2D94 80240AD4 44061000 */ mfc1 $a2, $f2 -/* DB2D98 80240AD8 C440000C */ lwc1 $f0, 0xc($v0) -/* DB2D9C 80240ADC 46800020 */ cvt.s.w $f0, $f0 -/* DB2DA0 80240AE0 E7A00014 */ swc1 $f0, 0x14($sp) -/* DB2DA4 80240AE4 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB2DA8 80240AE8 44052000 */ mfc1 $a1, $f4 -/* DB2DAC 80240AEC C4400010 */ lwc1 $f0, 0x10($v0) -/* DB2DB0 80240AF0 46800020 */ cvt.s.w $f0, $f0 -/* DB2DB4 80240AF4 E7A00018 */ swc1 $f0, 0x18($sp) -/* DB2DB8 80240AF8 8C640018 */ lw $a0, 0x18($v1) -/* DB2DBC 80240AFC 0C0123F5 */ jal is_point_within_region -/* DB2DC0 80240B00 8E070038 */ lw $a3, 0x38($s0) -/* DB2DC4 80240B04 1040000E */ beqz $v0, .L80240B40 -/* DB2DC8 80240B08 00000000 */ nop -/* DB2DCC 80240B0C 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB2DD0 80240B10 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DB2DD4 80240B14 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DB2DD8 80240B18 C4460000 */ lwc1 $f6, ($v0) -/* DB2DDC 80240B1C 468031A0 */ cvt.s.w $f6, $f6 -/* DB2DE0 80240B20 44063000 */ mfc1 $a2, $f6 -/* DB2DE4 80240B24 C4460008 */ lwc1 $f6, 8($v0) -/* DB2DE8 80240B28 468031A0 */ cvt.s.w $f6, $f6 -/* DB2DEC 80240B2C 44073000 */ mfc1 $a3, $f6 -/* DB2DF0 80240B30 0C00A720 */ jal atan2 -/* DB2DF4 80240B34 00000000 */ nop -/* DB2DF8 80240B38 080902DC */ j .L80240B70 -/* DB2DFC 80240B3C E600000C */ swc1 $f0, 0xc($s0) -.L80240B40: -/* DB2E00 80240B40 0C00A67F */ jal rand_int -/* DB2E04 80240B44 2404003C */ addiu $a0, $zero, 0x3c -/* DB2E08 80240B48 C60C000C */ lwc1 $f12, 0xc($s0) -/* DB2E0C 80240B4C 44820000 */ mtc1 $v0, $f0 -/* DB2E10 80240B50 00000000 */ nop -/* DB2E14 80240B54 46800020 */ cvt.s.w $f0, $f0 -/* DB2E18 80240B58 46006300 */ add.s $f12, $f12, $f0 -/* DB2E1C 80240B5C 3C0141F0 */ lui $at, 0x41f0 -/* DB2E20 80240B60 44810000 */ mtc1 $at, $f0 -/* DB2E24 80240B64 0C00A6C9 */ jal clamp_angle -/* DB2E28 80240B68 46006301 */ sub.s $f12, $f12, $f0 -/* DB2E2C 80240B6C E600000C */ swc1 $f0, 0xc($s0) -.L80240B70: -/* DB2E30 80240B70 8E2200CC */ lw $v0, 0xcc($s1) -/* DB2E34 80240B74 8C420004 */ lw $v0, 4($v0) -/* DB2E38 80240B78 AE020028 */ sw $v0, 0x28($s0) -/* DB2E3C 80240B7C AE600074 */ sw $zero, 0x74($s3) -/* DB2E40 80240B80 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB2E44 80240B84 8C420014 */ lw $v0, 0x14($v0) -/* DB2E48 80240B88 04410004 */ bgez $v0, .L80240B9C -/* DB2E4C 80240B8C 00000000 */ nop -/* DB2E50 80240B90 C6400000 */ lwc1 $f0, ($s2) -/* DB2E54 80240B94 080902EF */ j .L80240BBC -/* DB2E58 80240B98 E6000018 */ swc1 $f0, 0x18($s0) -.L80240B9C: -/* DB2E5C 80240B9C 3C018024 */ lui $at, 0x8024 -/* DB2E60 80240BA0 D42255F0 */ ldc1 $f2, 0x55f0($at) -/* DB2E64 80240BA4 44820000 */ mtc1 $v0, $f0 -/* DB2E68 80240BA8 00000000 */ nop -/* DB2E6C 80240BAC 46800021 */ cvt.d.w $f0, $f0 -/* DB2E70 80240BB0 46220003 */ div.d $f0, $f0, $f2 -/* DB2E74 80240BB4 46200020 */ cvt.s.d $f0, $f0 -/* DB2E78 80240BB8 E6000018 */ swc1 $f0, 0x18($s0) -.L80240BBC: -/* DB2E7C 80240BBC C600003C */ lwc1 $f0, 0x3c($s0) -/* DB2E80 80240BC0 3C014059 */ lui $at, 0x4059 -/* DB2E84 80240BC4 44811800 */ mtc1 $at, $f3 -/* DB2E88 80240BC8 44801000 */ mtc1 $zero, $f2 -/* DB2E8C 80240BCC 46000021 */ cvt.d.s $f0, $f0 -/* DB2E90 80240BD0 46220002 */ mul.d $f0, $f0, $f2 -/* DB2E94 80240BD4 00000000 */ nop -/* DB2E98 80240BD8 24020001 */ addiu $v0, $zero, 1 -/* DB2E9C 80240BDC 4620018D */ trunc.w.d $f6, $f0 -/* DB2EA0 80240BE0 E626007C */ swc1 $f6, 0x7c($s1) -/* DB2EA4 80240BE4 AE620070 */ sw $v0, 0x70($s3) -/* DB2EA8 80240BE8 8FBF0030 */ lw $ra, 0x30($sp) -/* DB2EAC 80240BEC 8FB3002C */ lw $s3, 0x2c($sp) -/* DB2EB0 80240BF0 8FB20028 */ lw $s2, 0x28($sp) -/* DB2EB4 80240BF4 8FB10024 */ lw $s1, 0x24($sp) -/* DB2EB8 80240BF8 8FB00020 */ lw $s0, 0x20($sp) -/* DB2EBC 80240BFC 03E00008 */ jr $ra -/* DB2EC0 80240C00 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_05/func_8024122C_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/func_8024122C_DB22C0.s deleted file mode 100644 index 7b754499ce..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/func_8024122C_DB22C0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024122C_DB34EC -/* DB34EC 8024122C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DB34F0 80241230 AFB3001C */ sw $s3, 0x1c($sp) -/* DB34F4 80241234 0080982D */ daddu $s3, $a0, $zero -/* DB34F8 80241238 AFBF0020 */ sw $ra, 0x20($sp) -/* DB34FC 8024123C AFB20018 */ sw $s2, 0x18($sp) -/* DB3500 80241240 AFB10014 */ sw $s1, 0x14($sp) -/* DB3504 80241244 AFB00010 */ sw $s0, 0x10($sp) -/* DB3508 80241248 8E720148 */ lw $s2, 0x148($s3) -/* DB350C 8024124C 86440008 */ lh $a0, 8($s2) -/* DB3510 80241250 0C00EABB */ jal get_npc_unsafe -/* DB3514 80241254 00A0882D */ daddu $s1, $a1, $zero -/* DB3518 80241258 8E240008 */ lw $a0, 8($s1) -/* DB351C 8024125C 0040802D */ daddu $s0, $v0, $zero -/* DB3520 80241260 00041FC2 */ srl $v1, $a0, 0x1f -/* DB3524 80241264 00832021 */ addu $a0, $a0, $v1 -/* DB3528 80241268 00042043 */ sra $a0, $a0, 1 -/* DB352C 8024126C 0C00A67F */ jal rand_int -/* DB3530 80241270 24840001 */ addiu $a0, $a0, 1 -/* DB3534 80241274 8E230008 */ lw $v1, 8($s1) -/* DB3538 80241278 240400B4 */ addiu $a0, $zero, 0xb4 -/* DB353C 8024127C 00032FC2 */ srl $a1, $v1, 0x1f -/* DB3540 80241280 00651821 */ addu $v1, $v1, $a1 -/* DB3544 80241284 00031843 */ sra $v1, $v1, 1 -/* DB3548 80241288 00621821 */ addu $v1, $v1, $v0 -/* DB354C 8024128C 0C00A67F */ jal rand_int -/* DB3550 80241290 A603008E */ sh $v1, 0x8e($s0) -/* DB3554 80241294 C60C000C */ lwc1 $f12, 0xc($s0) -/* DB3558 80241298 44820000 */ mtc1 $v0, $f0 -/* DB355C 8024129C 00000000 */ nop -/* DB3560 802412A0 46800020 */ cvt.s.w $f0, $f0 -/* DB3564 802412A4 46006300 */ add.s $f12, $f12, $f0 -/* DB3568 802412A8 3C0142B4 */ lui $at, 0x42b4 -/* DB356C 802412AC 44810000 */ mtc1 $at, $f0 -/* DB3570 802412B0 0C00A6C9 */ jal clamp_angle -/* DB3574 802412B4 46006301 */ sub.s $f12, $f12, $f0 -/* DB3578 802412B8 E600000C */ swc1 $f0, 0xc($s0) -/* DB357C 802412BC 8E4200CC */ lw $v0, 0xcc($s2) -/* DB3580 802412C0 8C420000 */ lw $v0, ($v0) -/* DB3584 802412C4 AE020028 */ sw $v0, 0x28($s0) -/* DB3588 802412C8 24020003 */ addiu $v0, $zero, 3 -/* DB358C 802412CC AE620070 */ sw $v0, 0x70($s3) -/* DB3590 802412D0 8FBF0020 */ lw $ra, 0x20($sp) -/* DB3594 802412D4 8FB3001C */ lw $s3, 0x1c($sp) -/* DB3598 802412D8 8FB20018 */ lw $s2, 0x18($sp) -/* DB359C 802412DC 8FB10014 */ lw $s1, 0x14($sp) -/* DB35A0 802412E0 8FB00010 */ lw $s0, 0x10($sp) -/* DB35A4 802412E4 03E00008 */ jr $ra -/* DB35A8 802412E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_05/func_802412EC_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/func_802412EC_DB22C0.s deleted file mode 100644 index 2032f85b74..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/func_802412EC_DB22C0.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412EC_DB35AC -/* DB35AC 802412EC 27BDFF88 */ addiu $sp, $sp, -0x78 -/* DB35B0 802412F0 AFB3004C */ sw $s3, 0x4c($sp) -/* DB35B4 802412F4 0080982D */ daddu $s3, $a0, $zero -/* DB35B8 802412F8 AFBF0054 */ sw $ra, 0x54($sp) -/* DB35BC 802412FC AFB40050 */ sw $s4, 0x50($sp) -/* DB35C0 80241300 AFB20048 */ sw $s2, 0x48($sp) -/* DB35C4 80241304 AFB10044 */ sw $s1, 0x44($sp) -/* DB35C8 80241308 AFB00040 */ sw $s0, 0x40($sp) -/* DB35CC 8024130C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* DB35D0 80241310 F7B80068 */ sdc1 $f24, 0x68($sp) -/* DB35D4 80241314 F7B60060 */ sdc1 $f22, 0x60($sp) -/* DB35D8 80241318 F7B40058 */ sdc1 $f20, 0x58($sp) -/* DB35DC 8024131C 8E710148 */ lw $s1, 0x148($s3) -/* DB35E0 80241320 00A0902D */ daddu $s2, $a1, $zero -/* DB35E4 80241324 86240008 */ lh $a0, 8($s1) -/* DB35E8 80241328 0C00EABB */ jal get_npc_unsafe -/* DB35EC 8024132C 00C0A02D */ daddu $s4, $a2, $zero -/* DB35F0 80241330 0040802D */ daddu $s0, $v0, $zero -/* DB35F4 80241334 C6200078 */ lwc1 $f0, 0x78($s1) -/* DB35F8 80241338 46800020 */ cvt.s.w $f0, $f0 -/* DB35FC 8024133C 46000021 */ cvt.d.s $f0, $f0 -/* DB3600 80241340 3C014059 */ lui $at, 0x4059 -/* DB3604 80241344 44811800 */ mtc1 $at, $f3 -/* DB3608 80241348 44801000 */ mtc1 $zero, $f2 -/* DB360C 8024134C 8602008E */ lh $v0, 0x8e($s0) -/* DB3610 80241350 9603008E */ lhu $v1, 0x8e($s0) -/* DB3614 80241354 46220003 */ div.d $f0, $f0, $f2 -/* DB3618 80241358 46200620 */ cvt.s.d $f24, $f0 -/* DB361C 8024135C C6200088 */ lwc1 $f0, 0x88($s1) -/* DB3620 80241360 46800020 */ cvt.s.w $f0, $f0 -/* DB3624 80241364 46000021 */ cvt.d.s $f0, $f0 -/* DB3628 80241368 46220003 */ div.d $f0, $f0, $f2 -/* DB362C 8024136C 46200020 */ cvt.s.d $f0, $f0 -/* DB3630 80241370 18400003 */ blez $v0, .L80241380 -/* DB3634 80241374 4600C680 */ add.s $f26, $f24, $f0 -/* DB3638 80241378 2462FFFF */ addiu $v0, $v1, -1 -/* DB363C 8024137C A602008E */ sh $v0, 0x8e($s0) -.L80241380: -/* DB3640 80241380 8E220070 */ lw $v0, 0x70($s1) -/* DB3644 80241384 18400034 */ blez $v0, .L80241458 -/* DB3648 80241388 00000000 */ nop -/* DB364C 8024138C C62C0074 */ lwc1 $f12, 0x74($s1) -/* DB3650 80241390 46806320 */ cvt.s.w $f12, $f12 -/* DB3654 80241394 44820000 */ mtc1 $v0, $f0 -/* DB3658 80241398 00000000 */ nop -/* DB365C 8024139C 46800020 */ cvt.s.w $f0, $f0 -/* DB3660 802413A0 46000021 */ cvt.d.s $f0, $f0 -/* DB3664 802413A4 46220003 */ div.d $f0, $f0, $f2 -/* DB3668 802413A8 0C00A8BB */ jal sin_deg -/* DB366C 802413AC 462005A0 */ cvt.s.d $f22, $f0 -/* DB3670 802413B0 8E020000 */ lw $v0, ($s0) -/* DB3674 802413B4 30420008 */ andi $v0, $v0, 8 -/* DB3678 802413B8 10400003 */ beqz $v0, .L802413C8 -/* DB367C 802413BC 46000506 */ mov.s $f20, $f0 -/* DB3680 802413C0 08090502 */ j .L80241408 -/* DB3684 802413C4 0000102D */ daddu $v0, $zero, $zero -.L802413C8: -/* DB3688 802413C8 27A50028 */ addiu $a1, $sp, 0x28 -/* DB368C 802413CC 27A6002C */ addiu $a2, $sp, 0x2c -/* DB3690 802413D0 C6000038 */ lwc1 $f0, 0x38($s0) -/* DB3694 802413D4 C602003C */ lwc1 $f2, 0x3c($s0) -/* DB3698 802413D8 C6040040 */ lwc1 $f4, 0x40($s0) -/* DB369C 802413DC 3C01447A */ lui $at, 0x447a -/* DB36A0 802413E0 44813000 */ mtc1 $at, $f6 -/* DB36A4 802413E4 27A20034 */ addiu $v0, $sp, 0x34 -/* DB36A8 802413E8 E7A00028 */ swc1 $f0, 0x28($sp) -/* DB36AC 802413EC E7A2002C */ swc1 $f2, 0x2c($sp) -/* DB36B0 802413F0 E7A40030 */ swc1 $f4, 0x30($sp) -/* DB36B4 802413F4 E7A60034 */ swc1 $f6, 0x34($sp) -/* DB36B8 802413F8 AFA20010 */ sw $v0, 0x10($sp) -/* DB36BC 802413FC 8E040080 */ lw $a0, 0x80($s0) -/* DB36C0 80241400 0C0372DF */ jal func_800DCB7C -/* DB36C4 80241404 27A70030 */ addiu $a3, $sp, 0x30 -.L80241408: -/* DB36C8 80241408 10400007 */ beqz $v0, .L80241428 -/* DB36CC 8024140C 00000000 */ nop -/* DB36D0 80241410 4616A082 */ mul.s $f2, $f20, $f22 -/* DB36D4 80241414 00000000 */ nop -/* DB36D8 80241418 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DB36DC 8024141C 46180000 */ add.s $f0, $f0, $f24 -/* DB36E0 80241420 0809050D */ j .L80241434 -/* DB36E4 80241424 46020000 */ add.s $f0, $f0, $f2 -.L80241428: -/* DB36E8 80241428 4616A002 */ mul.s $f0, $f20, $f22 -/* DB36EC 8024142C 00000000 */ nop -/* DB36F0 80241430 4600D000 */ add.s $f0, $f26, $f0 -.L80241434: -/* DB36F4 80241434 E600003C */ swc1 $f0, 0x3c($s0) -/* DB36F8 80241438 8E220074 */ lw $v0, 0x74($s1) -/* DB36FC 8024143C 2442000A */ addiu $v0, $v0, 0xa -/* DB3700 80241440 44826000 */ mtc1 $v0, $f12 -/* DB3704 80241444 00000000 */ nop -/* DB3708 80241448 0C00A6C9 */ jal clamp_angle -/* DB370C 8024144C 46806320 */ cvt.s.w $f12, $f12 -/* DB3710 80241450 4600020D */ trunc.w.s $f8, $f0 -/* DB3714 80241454 E6280074 */ swc1 $f8, 0x74($s1) -.L80241458: -/* DB3718 80241458 8E220090 */ lw $v0, 0x90($s1) -/* DB371C 8024145C 1C400040 */ bgtz $v0, .L80241560 -/* DB3720 80241460 2442FFFF */ addiu $v0, $v0, -1 -/* DB3724 80241464 860200A8 */ lh $v0, 0xa8($s0) -/* DB3728 80241468 C600003C */ lwc1 $f0, 0x3c($s0) -/* DB372C 8024146C 44821000 */ mtc1 $v0, $f2 -/* DB3730 80241470 00000000 */ nop -/* DB3734 80241474 468010A0 */ cvt.s.w $f2, $f2 -/* DB3738 80241478 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DB373C 8024147C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DB3740 80241480 46020000 */ add.s $f0, $f0, $f2 -/* DB3744 80241484 3C014024 */ lui $at, 0x4024 -/* DB3748 80241488 44812800 */ mtc1 $at, $f5 -/* DB374C 8024148C 44802000 */ mtc1 $zero, $f4 -/* DB3750 80241490 C442002C */ lwc1 $f2, 0x2c($v0) -/* DB3754 80241494 46000021 */ cvt.d.s $f0, $f0 -/* DB3758 80241498 46240000 */ add.d $f0, $f0, $f4 -/* DB375C 8024149C 460010A1 */ cvt.d.s $f2, $f2 -/* DB3760 802414A0 4620103C */ c.lt.d $f2, $f0 -/* DB3764 802414A4 00000000 */ nop -/* DB3768 802414A8 4500002E */ bc1f .L80241564 -/* DB376C 802414AC 0280202D */ daddu $a0, $s4, $zero -/* DB3770 802414B0 24020001 */ addiu $v0, $zero, 1 -/* DB3774 802414B4 AFA20010 */ sw $v0, 0x10($sp) -/* DB3778 802414B8 8E460024 */ lw $a2, 0x24($s2) -/* DB377C 802414BC 8E470028 */ lw $a3, 0x28($s2) -/* DB3780 802414C0 0C01242D */ jal func_800490B4 -/* DB3784 802414C4 0220282D */ daddu $a1, $s1, $zero -/* DB3788 802414C8 10400026 */ beqz $v0, .L80241564 -/* DB378C 802414CC 0000202D */ daddu $a0, $zero, $zero -/* DB3790 802414D0 0200282D */ daddu $a1, $s0, $zero -/* DB3794 802414D4 0000302D */ daddu $a2, $zero, $zero -/* DB3798 802414D8 2412000C */ addiu $s2, $zero, 0xc -/* DB379C 802414DC 860300A8 */ lh $v1, 0xa8($s0) -/* DB37A0 802414E0 3C013F80 */ lui $at, 0x3f80 -/* DB37A4 802414E4 44810000 */ mtc1 $at, $f0 -/* DB37A8 802414E8 3C014000 */ lui $at, 0x4000 -/* DB37AC 802414EC 44811000 */ mtc1 $at, $f2 -/* DB37B0 802414F0 3C01C1A0 */ lui $at, 0xc1a0 -/* DB37B4 802414F4 44812000 */ mtc1 $at, $f4 -/* DB37B8 802414F8 44834000 */ mtc1 $v1, $f8 -/* DB37BC 802414FC 00000000 */ nop -/* DB37C0 80241500 46804220 */ cvt.s.w $f8, $f8 -/* DB37C4 80241504 44074000 */ mfc1 $a3, $f8 -/* DB37C8 80241508 27A20038 */ addiu $v0, $sp, 0x38 -/* DB37CC 8024150C AFB2001C */ sw $s2, 0x1c($sp) -/* DB37D0 80241510 AFA20020 */ sw $v0, 0x20($sp) -/* DB37D4 80241514 E7A00010 */ swc1 $f0, 0x10($sp) -/* DB37D8 80241518 E7A20014 */ swc1 $f2, 0x14($sp) -/* DB37DC 8024151C 0C01BFA4 */ jal fx_emote -/* DB37E0 80241520 E7A40018 */ swc1 $f4, 0x18($sp) -/* DB37E4 80241524 0200202D */ daddu $a0, $s0, $zero -/* DB37E8 80241528 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DB37EC 8024152C C480003C */ lwc1 $f0, 0x3c($a0) -/* DB37F0 80241530 3C060020 */ lui $a2, 0x20 -/* DB37F4 80241534 0C012530 */ jal func_800494C0 -/* DB37F8 80241538 E4800064 */ swc1 $f0, 0x64($a0) -/* DB37FC 8024153C 8E220018 */ lw $v0, 0x18($s1) -/* DB3800 80241540 9442002A */ lhu $v0, 0x2a($v0) -/* DB3804 80241544 30420001 */ andi $v0, $v0, 1 -/* DB3808 80241548 10400003 */ beqz $v0, .L80241558 -/* DB380C 8024154C 2402000A */ addiu $v0, $zero, 0xa -/* DB3810 80241550 08090580 */ j .L80241600 -/* DB3814 80241554 AE620070 */ sw $v0, 0x70($s3) -.L80241558: -/* DB3818 80241558 08090580 */ j .L80241600 -/* DB381C 8024155C AE720070 */ sw $s2, 0x70($s3) -.L80241560: -/* DB3820 80241560 AE220090 */ sw $v0, 0x90($s1) -.L80241564: -/* DB3824 80241564 8602008C */ lh $v0, 0x8c($s0) -/* DB3828 80241568 14400025 */ bnez $v0, .L80241600 -/* DB382C 8024156C 00000000 */ nop -/* DB3830 80241570 8602008E */ lh $v0, 0x8e($s0) -/* DB3834 80241574 1C400022 */ bgtz $v0, .L80241600 -/* DB3838 80241578 00000000 */ nop -/* DB383C 8024157C 8E620074 */ lw $v0, 0x74($s3) -/* DB3840 80241580 2442FFFF */ addiu $v0, $v0, -1 -/* DB3844 80241584 1840001D */ blez $v0, .L802415FC -/* DB3848 80241588 AE620074 */ sw $v0, 0x74($s3) -/* DB384C 8024158C 8E220018 */ lw $v0, 0x18($s1) -/* DB3850 80241590 9442002A */ lhu $v0, 0x2a($v0) -/* DB3854 80241594 30420010 */ andi $v0, $v0, 0x10 -/* DB3858 80241598 14400007 */ bnez $v0, .L802415B8 -/* DB385C 8024159C 00000000 */ nop -/* DB3860 802415A0 C600000C */ lwc1 $f0, 0xc($s0) -/* DB3864 802415A4 3C014334 */ lui $at, 0x4334 -/* DB3868 802415A8 44816000 */ mtc1 $at, $f12 -/* DB386C 802415AC 0C00A6C9 */ jal clamp_angle -/* DB3870 802415B0 460C0300 */ add.s $f12, $f0, $f12 -/* DB3874 802415B4 E600000C */ swc1 $f0, 0xc($s0) -.L802415B8: -/* DB3878 802415B8 0C00A67F */ jal rand_int -/* DB387C 802415BC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DB3880 802415C0 3C032E8B */ lui $v1, 0x2e8b -/* DB3884 802415C4 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* DB3888 802415C8 00430018 */ mult $v0, $v1 -/* DB388C 802415CC 00021FC3 */ sra $v1, $v0, 0x1f -/* DB3890 802415D0 00004010 */ mfhi $t0 -/* DB3894 802415D4 00082043 */ sra $a0, $t0, 1 -/* DB3898 802415D8 00832023 */ subu $a0, $a0, $v1 -/* DB389C 802415DC 00041840 */ sll $v1, $a0, 1 -/* DB38A0 802415E0 00641821 */ addu $v1, $v1, $a0 -/* DB38A4 802415E4 00031880 */ sll $v1, $v1, 2 -/* DB38A8 802415E8 00641823 */ subu $v1, $v1, $a0 -/* DB38AC 802415EC 00431023 */ subu $v0, $v0, $v1 -/* DB38B0 802415F0 24420005 */ addiu $v0, $v0, 5 -/* DB38B4 802415F4 08090580 */ j .L80241600 -/* DB38B8 802415F8 A602008E */ sh $v0, 0x8e($s0) -.L802415FC: -/* DB38BC 802415FC AE600070 */ sw $zero, 0x70($s3) -.L80241600: -/* DB38C0 80241600 8FBF0054 */ lw $ra, 0x54($sp) -/* DB38C4 80241604 8FB40050 */ lw $s4, 0x50($sp) -/* DB38C8 80241608 8FB3004C */ lw $s3, 0x4c($sp) -/* DB38CC 8024160C 8FB20048 */ lw $s2, 0x48($sp) -/* DB38D0 80241610 8FB10044 */ lw $s1, 0x44($sp) -/* DB38D4 80241614 8FB00040 */ lw $s0, 0x40($sp) -/* DB38D8 80241618 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* DB38DC 8024161C D7B80068 */ ldc1 $f24, 0x68($sp) -/* DB38E0 80241620 D7B60060 */ ldc1 $f22, 0x60($sp) -/* DB38E4 80241624 D7B40058 */ ldc1 $f20, 0x58($sp) -/* DB38E8 80241628 03E00008 */ jr $ra -/* DB38EC 8024162C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_omo/omo_05/func_80241630_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/func_80241630_DB22C0.s deleted file mode 100644 index 88a042ca01..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/func_80241630_DB22C0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241630_DB38F0 -/* DB38F0 80241630 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB38F4 80241634 AFB20018 */ sw $s2, 0x18($sp) -/* DB38F8 80241638 0080902D */ daddu $s2, $a0, $zero -/* DB38FC 8024163C AFBF001C */ sw $ra, 0x1c($sp) -/* DB3900 80241640 AFB10014 */ sw $s1, 0x14($sp) -/* DB3904 80241644 AFB00010 */ sw $s0, 0x10($sp) -/* DB3908 80241648 8E510148 */ lw $s1, 0x148($s2) -/* DB390C 8024164C 0C00EABB */ jal get_npc_unsafe -/* DB3910 80241650 86240008 */ lh $a0, 8($s1) -/* DB3914 80241654 0040802D */ daddu $s0, $v0, $zero -/* DB3918 80241658 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DB391C 8024165C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DB3920 80241660 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DB3924 80241664 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DB3928 80241668 A600008E */ sh $zero, 0x8e($s0) -/* DB392C 8024166C 8C460028 */ lw $a2, 0x28($v0) -/* DB3930 80241670 0C00A720 */ jal atan2 -/* DB3934 80241674 8C470030 */ lw $a3, 0x30($v0) -/* DB3938 80241678 E600000C */ swc1 $f0, 0xc($s0) -/* DB393C 8024167C 8E2200CC */ lw $v0, 0xcc($s1) -/* DB3940 80241680 8C420020 */ lw $v0, 0x20($v0) -/* DB3944 80241684 AE020028 */ sw $v0, 0x28($s0) -/* DB3948 80241688 2402000B */ addiu $v0, $zero, 0xb -/* DB394C 8024168C AE420070 */ sw $v0, 0x70($s2) -/* DB3950 80241690 8FBF001C */ lw $ra, 0x1c($sp) -/* DB3954 80241694 8FB20018 */ lw $s2, 0x18($sp) -/* DB3958 80241698 8FB10014 */ lw $s1, 0x14($sp) -/* DB395C 8024169C 8FB00010 */ lw $s0, 0x10($sp) -/* DB3960 802416A0 03E00008 */ jr $ra -/* DB3964 802416A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_05/func_80241848_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/func_80241848_DB22C0.s deleted file mode 100644 index fcd81f6694..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/func_80241848_DB22C0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241848_DB3B08 -/* DB3B08 80241848 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DB3B0C 8024184C AFB00010 */ sw $s0, 0x10($sp) -/* DB3B10 80241850 0080802D */ daddu $s0, $a0, $zero -/* DB3B14 80241854 AFBF0014 */ sw $ra, 0x14($sp) -/* DB3B18 80241858 8E020148 */ lw $v0, 0x148($s0) -/* DB3B1C 8024185C 0C00EABB */ jal get_npc_unsafe -/* DB3B20 80241860 84440008 */ lh $a0, 8($v0) -/* DB3B24 80241864 0040202D */ daddu $a0, $v0, $zero -/* DB3B28 80241868 8482008E */ lh $v0, 0x8e($a0) -/* DB3B2C 8024186C 9483008E */ lhu $v1, 0x8e($a0) -/* DB3B30 80241870 18400005 */ blez $v0, .L80241888 -/* DB3B34 80241874 2462FFFF */ addiu $v0, $v1, -1 -/* DB3B38 80241878 A482008E */ sh $v0, 0x8e($a0) -/* DB3B3C 8024187C 00021400 */ sll $v0, $v0, 0x10 -/* DB3B40 80241880 1C400006 */ bgtz $v0, .L8024189C -/* DB3B44 80241884 00000000 */ nop -.L80241888: -/* DB3B48 80241888 8482008C */ lh $v0, 0x8c($a0) -/* DB3B4C 8024188C 14400003 */ bnez $v0, .L8024189C -/* DB3B50 80241890 2402000E */ addiu $v0, $zero, 0xe -/* DB3B54 80241894 A480008E */ sh $zero, 0x8e($a0) -/* DB3B58 80241898 AE020070 */ sw $v0, 0x70($s0) -.L8024189C: -/* DB3B5C 8024189C 8FBF0014 */ lw $ra, 0x14($sp) -/* DB3B60 802418A0 8FB00010 */ lw $s0, 0x10($sp) -/* DB3B64 802418A4 03E00008 */ jr $ra -/* DB3B68 802418A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_05/func_802418AC_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/func_802418AC_DB22C0.s deleted file mode 100644 index 828c9d1eeb..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/func_802418AC_DB22C0.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418AC_DB3B6C -/* DB3B6C 802418AC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DB3B70 802418B0 AFB20030 */ sw $s2, 0x30($sp) -/* DB3B74 802418B4 0080902D */ daddu $s2, $a0, $zero -/* DB3B78 802418B8 AFBF0038 */ sw $ra, 0x38($sp) -/* DB3B7C 802418BC AFB30034 */ sw $s3, 0x34($sp) -/* DB3B80 802418C0 AFB1002C */ sw $s1, 0x2c($sp) -/* DB3B84 802418C4 AFB00028 */ sw $s0, 0x28($sp) -/* DB3B88 802418C8 F7B60048 */ sdc1 $f22, 0x48($sp) -/* DB3B8C 802418CC F7B40040 */ sdc1 $f20, 0x40($sp) -/* DB3B90 802418D0 8E510148 */ lw $s1, 0x148($s2) -/* DB3B94 802418D4 86240008 */ lh $a0, 8($s1) -/* DB3B98 802418D8 0C00EABB */ jal get_npc_unsafe -/* DB3B9C 802418DC 00A0982D */ daddu $s3, $a1, $zero -/* DB3BA0 802418E0 0040802D */ daddu $s0, $v0, $zero -/* DB3BA4 802418E4 0200202D */ daddu $a0, $s0, $zero -/* DB3BA8 802418E8 C6220088 */ lwc1 $f2, 0x88($s1) -/* DB3BAC 802418EC 468010A0 */ cvt.s.w $f2, $f2 -/* DB3BB0 802418F0 460010A1 */ cvt.d.s $f2, $f2 -/* DB3BB4 802418F4 C604001C */ lwc1 $f4, 0x1c($s0) -/* DB3BB8 802418F8 C6000014 */ lwc1 $f0, 0x14($s0) -/* DB3BBC 802418FC 8E050018 */ lw $a1, 0x18($s0) -/* DB3BC0 80241900 46002100 */ add.s $f4, $f4, $f0 -/* DB3BC4 80241904 8E06000C */ lw $a2, 0xc($s0) -/* DB3BC8 80241908 C6200078 */ lwc1 $f0, 0x78($s1) -/* DB3BCC 8024190C 46800020 */ cvt.s.w $f0, $f0 -/* DB3BD0 80241910 E604001C */ swc1 $f4, 0x1c($s0) -/* DB3BD4 80241914 3C014059 */ lui $at, 0x4059 -/* DB3BD8 80241918 44812800 */ mtc1 $at, $f5 -/* DB3BDC 8024191C 44802000 */ mtc1 $zero, $f4 -/* DB3BE0 80241920 46000021 */ cvt.d.s $f0, $f0 -/* DB3BE4 80241924 46240003 */ div.d $f0, $f0, $f4 -/* DB3BE8 80241928 46200520 */ cvt.s.d $f20, $f0 -/* DB3BEC 8024192C 46241083 */ div.d $f2, $f2, $f4 -/* DB3BF0 80241930 0C00EA95 */ jal npc_move_heading -/* DB3BF4 80241934 462015A0 */ cvt.s.d $f22, $f2 -/* DB3BF8 80241938 C604001C */ lwc1 $f4, 0x1c($s0) -/* DB3BFC 8024193C 44801000 */ mtc1 $zero, $f2 -/* DB3C00 80241940 44801800 */ mtc1 $zero, $f3 -/* DB3C04 80241944 46002021 */ cvt.d.s $f0, $f4 -/* DB3C08 80241948 4620103E */ c.le.d $f2, $f0 -/* DB3C0C 8024194C 00000000 */ nop -/* DB3C10 80241950 45000030 */ bc1f .L80241A14 -/* DB3C14 80241954 00000000 */ nop -/* DB3C18 80241958 C600003C */ lwc1 $f0, 0x3c($s0) -/* DB3C1C 8024195C 46040000 */ add.s $f0, $f0, $f4 -/* DB3C20 80241960 E600003C */ swc1 $f0, 0x3c($s0) -/* DB3C24 80241964 8E2200CC */ lw $v0, 0xcc($s1) -/* DB3C28 80241968 8C420024 */ lw $v0, 0x24($v0) -/* DB3C2C 8024196C AE020028 */ sw $v0, 0x28($s0) -/* DB3C30 80241970 A2200007 */ sb $zero, 7($s1) -/* DB3C34 80241974 8E020000 */ lw $v0, ($s0) -/* DB3C38 80241978 30420008 */ andi $v0, $v0, 8 -/* DB3C3C 8024197C 14400011 */ bnez $v0, .L802419C4 -/* DB3C40 80241980 0000102D */ daddu $v0, $zero, $zero -/* DB3C44 80241984 27A50018 */ addiu $a1, $sp, 0x18 -/* DB3C48 80241988 27A6001C */ addiu $a2, $sp, 0x1c -/* DB3C4C 8024198C C6000038 */ lwc1 $f0, 0x38($s0) -/* DB3C50 80241990 C602003C */ lwc1 $f2, 0x3c($s0) -/* DB3C54 80241994 C6040040 */ lwc1 $f4, 0x40($s0) -/* DB3C58 80241998 3C01447A */ lui $at, 0x447a -/* DB3C5C 8024199C 44813000 */ mtc1 $at, $f6 -/* DB3C60 802419A0 27A20024 */ addiu $v0, $sp, 0x24 -/* DB3C64 802419A4 E7A00018 */ swc1 $f0, 0x18($sp) -/* DB3C68 802419A8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* DB3C6C 802419AC E7A40020 */ swc1 $f4, 0x20($sp) -/* DB3C70 802419B0 E7A60024 */ swc1 $f6, 0x24($sp) -/* DB3C74 802419B4 AFA20010 */ sw $v0, 0x10($sp) -/* DB3C78 802419B8 8E040080 */ lw $a0, 0x80($s0) -/* DB3C7C 802419BC 0C0372DF */ jal func_800DCB7C -/* DB3C80 802419C0 27A70020 */ addiu $a3, $sp, 0x20 -.L802419C4: -/* DB3C84 802419C4 1040000B */ beqz $v0, .L802419F4 -/* DB3C88 802419C8 00000000 */ nop -/* DB3C8C 802419CC C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DB3C90 802419D0 46140080 */ add.s $f2, $f0, $f20 -/* DB3C94 802419D4 C600003C */ lwc1 $f0, 0x3c($s0) -/* DB3C98 802419D8 4600103E */ c.le.s $f2, $f0 -/* DB3C9C 802419DC 00000000 */ nop -/* DB3CA0 802419E0 4500008D */ bc1f .L80241C18 -/* DB3CA4 802419E4 00000000 */ nop -/* DB3CA8 802419E8 E602003C */ swc1 $f2, 0x3c($s0) -/* DB3CAC 802419EC 08090706 */ j .L80241C18 -/* DB3CB0 802419F0 AE400070 */ sw $zero, 0x70($s2) -.L802419F4: -/* DB3CB4 802419F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* DB3CB8 802419F8 C6000064 */ lwc1 $f0, 0x64($s0) -/* DB3CBC 802419FC 4602003E */ c.le.s $f0, $f2 -/* DB3CC0 80241A00 00000000 */ nop -/* DB3CC4 80241A04 45030084 */ bc1tl .L80241C18 -/* DB3CC8 80241A08 AE400070 */ sw $zero, 0x70($s2) -/* DB3CCC 80241A0C 08090706 */ j .L80241C18 -/* DB3CD0 80241A10 00000000 */ nop -.L80241A14: -/* DB3CD4 80241A14 4622003C */ c.lt.d $f0, $f2 -/* DB3CD8 80241A18 00000000 */ nop -/* DB3CDC 80241A1C 4500007E */ bc1f .L80241C18 -/* DB3CE0 80241A20 00000000 */ nop -/* DB3CE4 80241A24 9602008E */ lhu $v0, 0x8e($s0) -/* DB3CE8 80241A28 24420001 */ addiu $v0, $v0, 1 -/* DB3CEC 80241A2C A602008E */ sh $v0, 0x8e($s0) -/* DB3CF0 80241A30 00021400 */ sll $v0, $v0, 0x10 -/* DB3CF4 80241A34 8E630020 */ lw $v1, 0x20($s3) -/* DB3CF8 80241A38 00021403 */ sra $v0, $v0, 0x10 -/* DB3CFC 80241A3C 0043102A */ slt $v0, $v0, $v1 -/* DB3D00 80241A40 14400026 */ bnez $v0, .L80241ADC -/* DB3D04 80241A44 00000000 */ nop -/* DB3D08 80241A48 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DB3D0C 80241A4C C60E0040 */ lwc1 $f14, 0x40($s0) -/* DB3D10 80241A50 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DB3D14 80241A54 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DB3D18 80241A58 A600008E */ sh $zero, 0x8e($s0) -/* DB3D1C 80241A5C 8C460028 */ lw $a2, 0x28($v0) -/* DB3D20 80241A60 0C00A720 */ jal atan2 -/* DB3D24 80241A64 8C470030 */ lw $a3, 0x30($v0) -/* DB3D28 80241A68 46000506 */ mov.s $f20, $f0 -/* DB3D2C 80241A6C C60C000C */ lwc1 $f12, 0xc($s0) -/* DB3D30 80241A70 0C00A70A */ jal get_clamped_angle_diff -/* DB3D34 80241A74 4600A386 */ mov.s $f14, $f20 -/* DB3D38 80241A78 46000086 */ mov.s $f2, $f0 -/* DB3D3C 80241A7C 8E62001C */ lw $v0, 0x1c($s3) -/* DB3D40 80241A80 46001005 */ abs.s $f0, $f2 -/* DB3D44 80241A84 44822000 */ mtc1 $v0, $f4 -/* DB3D48 80241A88 00000000 */ nop -/* DB3D4C 80241A8C 46802120 */ cvt.s.w $f4, $f4 -/* DB3D50 80241A90 4600203C */ c.lt.s $f4, $f0 -/* DB3D54 80241A94 00000000 */ nop -/* DB3D58 80241A98 4500000D */ bc1f .L80241AD0 -/* DB3D5C 80241A9C 00000000 */ nop -/* DB3D60 80241AA0 44800000 */ mtc1 $zero, $f0 -/* DB3D64 80241AA4 C614000C */ lwc1 $f20, 0xc($s0) -/* DB3D68 80241AA8 4600103C */ c.lt.s $f2, $f0 -/* DB3D6C 80241AAC 00000000 */ nop -/* DB3D70 80241AB0 45000006 */ bc1f .L80241ACC -/* DB3D74 80241AB4 00021023 */ negu $v0, $v0 -/* DB3D78 80241AB8 44820000 */ mtc1 $v0, $f0 -/* DB3D7C 80241ABC 00000000 */ nop -/* DB3D80 80241AC0 46800020 */ cvt.s.w $f0, $f0 -/* DB3D84 80241AC4 080906B4 */ j .L80241AD0 -/* DB3D88 80241AC8 4600A500 */ add.s $f20, $f20, $f0 -.L80241ACC: -/* DB3D8C 80241ACC 4604A500 */ add.s $f20, $f20, $f4 -.L80241AD0: -/* DB3D90 80241AD0 0C00A6C9 */ jal clamp_angle -/* DB3D94 80241AD4 4600A306 */ mov.s $f12, $f20 -/* DB3D98 80241AD8 E600000C */ swc1 $f0, 0xc($s0) -.L80241ADC: -/* DB3D9C 80241ADC 8E020000 */ lw $v0, ($s0) -/* DB3DA0 80241AE0 30420008 */ andi $v0, $v0, 8 -/* DB3DA4 80241AE4 1040000A */ beqz $v0, .L80241B10 -/* DB3DA8 80241AE8 27A50018 */ addiu $a1, $sp, 0x18 -/* DB3DAC 80241AEC C602003C */ lwc1 $f2, 0x3c($s0) -/* DB3DB0 80241AF0 C600001C */ lwc1 $f0, 0x1c($s0) -/* DB3DB4 80241AF4 46001080 */ add.s $f2, $f2, $f0 -/* DB3DB8 80241AF8 4616103C */ c.lt.s $f2, $f22 -/* DB3DBC 80241AFC 00000000 */ nop -/* DB3DC0 80241B00 45020045 */ bc1fl .L80241C18 -/* DB3DC4 80241B04 E602003C */ swc1 $f2, 0x3c($s0) -/* DB3DC8 80241B08 08090705 */ j .L80241C14 -/* DB3DCC 80241B0C E616003C */ swc1 $f22, 0x3c($s0) -.L80241B10: -/* DB3DD0 80241B10 C6000038 */ lwc1 $f0, 0x38($s0) -/* DB3DD4 80241B14 27A6001C */ addiu $a2, $sp, 0x1c -/* DB3DD8 80241B18 E7A00018 */ swc1 $f0, 0x18($sp) -/* DB3DDC 80241B1C 860200A8 */ lh $v0, 0xa8($s0) -/* DB3DE0 80241B20 C600001C */ lwc1 $f0, 0x1c($s0) -/* DB3DE4 80241B24 C604003C */ lwc1 $f4, 0x3c($s0) -/* DB3DE8 80241B28 44821000 */ mtc1 $v0, $f2 -/* DB3DEC 80241B2C 00000000 */ nop -/* DB3DF0 80241B30 468010A0 */ cvt.s.w $f2, $f2 -/* DB3DF4 80241B34 46000005 */ abs.s $f0, $f0 -/* DB3DF8 80241B38 46020000 */ add.s $f0, $f0, $f2 -/* DB3DFC 80241B3C C6060040 */ lwc1 $f6, 0x40($s0) -/* DB3E00 80241B40 27A20024 */ addiu $v0, $sp, 0x24 -/* DB3E04 80241B44 46022100 */ add.s $f4, $f4, $f2 -/* DB3E08 80241B48 3C014024 */ lui $at, 0x4024 -/* DB3E0C 80241B4C 44811800 */ mtc1 $at, $f3 -/* DB3E10 80241B50 44801000 */ mtc1 $zero, $f2 -/* DB3E14 80241B54 46000021 */ cvt.d.s $f0, $f0 -/* DB3E18 80241B58 46220000 */ add.d $f0, $f0, $f2 -/* DB3E1C 80241B5C E7A60020 */ swc1 $f6, 0x20($sp) -/* DB3E20 80241B60 E7A4001C */ swc1 $f4, 0x1c($sp) -/* DB3E24 80241B64 46200020 */ cvt.s.d $f0, $f0 -/* DB3E28 80241B68 E7A00024 */ swc1 $f0, 0x24($sp) -/* DB3E2C 80241B6C AFA20010 */ sw $v0, 0x10($sp) -/* DB3E30 80241B70 8E040080 */ lw $a0, 0x80($s0) -/* DB3E34 80241B74 0C0372DF */ jal func_800DCB7C -/* DB3E38 80241B78 27A70020 */ addiu $a3, $sp, 0x20 -/* DB3E3C 80241B7C 10400015 */ beqz $v0, .L80241BD4 -/* DB3E40 80241B80 00000000 */ nop -/* DB3E44 80241B84 860200A8 */ lh $v0, 0xa8($s0) -/* DB3E48 80241B88 C604001C */ lwc1 $f4, 0x1c($s0) -/* DB3E4C 80241B8C 44820000 */ mtc1 $v0, $f0 -/* DB3E50 80241B90 00000000 */ nop -/* DB3E54 80241B94 46800020 */ cvt.s.w $f0, $f0 -/* DB3E58 80241B98 46002085 */ abs.s $f2, $f4 -/* DB3E5C 80241B9C 46020000 */ add.s $f0, $f0, $f2 -/* DB3E60 80241BA0 C7A20024 */ lwc1 $f2, 0x24($sp) -/* DB3E64 80241BA4 4600103E */ c.le.s $f2, $f0 -/* DB3E68 80241BA8 00000000 */ nop -/* DB3E6C 80241BAC 45000005 */ bc1f .L80241BC4 -/* DB3E70 80241BB0 00000000 */ nop -/* DB3E74 80241BB4 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DB3E78 80241BB8 AE00001C */ sw $zero, 0x1c($s0) -/* DB3E7C 80241BBC 08090706 */ j .L80241C18 -/* DB3E80 80241BC0 E600003C */ swc1 $f0, 0x3c($s0) -.L80241BC4: -/* DB3E84 80241BC4 C600003C */ lwc1 $f0, 0x3c($s0) -/* DB3E88 80241BC8 46040000 */ add.s $f0, $f0, $f4 -/* DB3E8C 80241BCC 08090706 */ j .L80241C18 -/* DB3E90 80241BD0 E600003C */ swc1 $f0, 0x3c($s0) -.L80241BD4: -/* DB3E94 80241BD4 C606003C */ lwc1 $f6, 0x3c($s0) -/* DB3E98 80241BD8 860200A8 */ lh $v0, 0xa8($s0) -/* DB3E9C 80241BDC 46163081 */ sub.s $f2, $f6, $f22 -/* DB3EA0 80241BE0 44820000 */ mtc1 $v0, $f0 -/* DB3EA4 80241BE4 00000000 */ nop -/* DB3EA8 80241BE8 46800020 */ cvt.s.w $f0, $f0 -/* DB3EAC 80241BEC 46001080 */ add.s $f2, $f2, $f0 -/* DB3EB0 80241BF0 C604001C */ lwc1 $f4, 0x1c($s0) -/* DB3EB4 80241BF4 46002005 */ abs.s $f0, $f4 -/* DB3EB8 80241BF8 4602003C */ c.lt.s $f0, $f2 -/* DB3EBC 80241BFC 00000000 */ nop -/* DB3EC0 80241C00 45020005 */ bc1fl .L80241C18 -/* DB3EC4 80241C04 AE00001C */ sw $zero, 0x1c($s0) -/* DB3EC8 80241C08 46043000 */ add.s $f0, $f6, $f4 -/* DB3ECC 80241C0C 08090706 */ j .L80241C18 -/* DB3ED0 80241C10 E600003C */ swc1 $f0, 0x3c($s0) -.L80241C14: -/* DB3ED4 80241C14 AE00001C */ sw $zero, 0x1c($s0) -.L80241C18: -/* DB3ED8 80241C18 8FBF0038 */ lw $ra, 0x38($sp) -/* DB3EDC 80241C1C 8FB30034 */ lw $s3, 0x34($sp) -/* DB3EE0 80241C20 8FB20030 */ lw $s2, 0x30($sp) -/* DB3EE4 80241C24 8FB1002C */ lw $s1, 0x2c($sp) -/* DB3EE8 80241C28 8FB00028 */ lw $s0, 0x28($sp) -/* DB3EEC 80241C2C D7B60048 */ ldc1 $f22, 0x48($sp) -/* DB3EF0 80241C30 D7B40040 */ ldc1 $f20, 0x40($sp) -/* DB3EF4 80241C34 03E00008 */ jr $ra -/* DB3EF8 80241C38 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_05/func_80241D60_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/func_80241D60_DB22C0.s deleted file mode 100644 index eee440545e..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/func_80241D60_DB22C0.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D60_DB4020 -/* DB4020 80241D60 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DB4024 80241D64 AFB40040 */ sw $s4, 0x40($sp) -/* DB4028 80241D68 0080A02D */ daddu $s4, $a0, $zero -/* DB402C 80241D6C AFBF0048 */ sw $ra, 0x48($sp) -/* DB4030 80241D70 AFB50044 */ sw $s5, 0x44($sp) -/* DB4034 80241D74 AFB3003C */ sw $s3, 0x3c($sp) -/* DB4038 80241D78 AFB20038 */ sw $s2, 0x38($sp) -/* DB403C 80241D7C AFB10034 */ sw $s1, 0x34($sp) -/* DB4040 80241D80 AFB00030 */ sw $s0, 0x30($sp) -/* DB4044 80241D84 8E920148 */ lw $s2, 0x148($s4) -/* DB4048 80241D88 86440008 */ lh $a0, 8($s2) -/* DB404C 80241D8C 8E90000C */ lw $s0, 0xc($s4) -/* DB4050 80241D90 0C00EABB */ jal get_npc_unsafe -/* DB4054 80241D94 00A0882D */ daddu $s1, $a1, $zero -/* DB4058 80241D98 0280202D */ daddu $a0, $s4, $zero -/* DB405C 80241D9C 8E050000 */ lw $a1, ($s0) -/* DB4060 80241DA0 0C0B1EAF */ jal get_variable -/* DB4064 80241DA4 0040A82D */ daddu $s5, $v0, $zero -/* DB4068 80241DA8 AFA00010 */ sw $zero, 0x10($sp) -/* DB406C 80241DAC 8E4300D0 */ lw $v1, 0xd0($s2) -/* DB4070 80241DB0 8C630030 */ lw $v1, 0x30($v1) -/* DB4074 80241DB4 AFA30014 */ sw $v1, 0x14($sp) -/* DB4078 80241DB8 8E4300D0 */ lw $v1, 0xd0($s2) -/* DB407C 80241DBC 8C63001C */ lw $v1, 0x1c($v1) -/* DB4080 80241DC0 AFA30018 */ sw $v1, 0x18($sp) -/* DB4084 80241DC4 8E4300D0 */ lw $v1, 0xd0($s2) -/* DB4088 80241DC8 8C630024 */ lw $v1, 0x24($v1) -/* DB408C 80241DCC AFA3001C */ sw $v1, 0x1c($sp) -/* DB4090 80241DD0 8E4300D0 */ lw $v1, 0xd0($s2) -/* DB4094 80241DD4 8C630028 */ lw $v1, 0x28($v1) -/* DB4098 80241DD8 27B30010 */ addiu $s3, $sp, 0x10 -/* DB409C 80241DDC AFA30020 */ sw $v1, 0x20($sp) -/* DB40A0 80241DE0 8E4300D0 */ lw $v1, 0xd0($s2) -/* DB40A4 80241DE4 3C0142F0 */ lui $at, 0x42f0 -/* DB40A8 80241DE8 44810000 */ mtc1 $at, $f0 -/* DB40AC 80241DEC 8C63002C */ lw $v1, 0x2c($v1) -/* DB40B0 80241DF0 0040802D */ daddu $s0, $v0, $zero -/* DB40B4 80241DF4 E7A00028 */ swc1 $f0, 0x28($sp) -/* DB40B8 80241DF8 A7A0002C */ sh $zero, 0x2c($sp) -/* DB40BC 80241DFC 12200006 */ beqz $s1, .L80241E18 -/* DB40C0 80241E00 AFA30024 */ sw $v1, 0x24($sp) -/* DB40C4 80241E04 02A0202D */ daddu $a0, $s5, $zero -/* DB40C8 80241E08 0240282D */ daddu $a1, $s2, $zero -/* DB40CC 80241E0C 0280302D */ daddu $a2, $s4, $zero -/* DB40D0 80241E10 0C09070F */ jal func_80241C3C -/* DB40D4 80241E14 0200382D */ daddu $a3, $s0, $zero -.L80241E18: -/* DB40D8 80241E18 2402FFFE */ addiu $v0, $zero, -2 -/* DB40DC 80241E1C A2A200AB */ sb $v0, 0xab($s5) -/* DB40E0 80241E20 8E4300B0 */ lw $v1, 0xb0($s2) -/* DB40E4 80241E24 30620004 */ andi $v0, $v1, 4 -/* DB40E8 80241E28 10400007 */ beqz $v0, .L80241E48 -/* DB40EC 80241E2C 00000000 */ nop -/* DB40F0 80241E30 824200B4 */ lb $v0, 0xb4($s2) -/* DB40F4 80241E34 1440003C */ bnez $v0, .L80241F28 -/* DB40F8 80241E38 0000102D */ daddu $v0, $zero, $zero -/* DB40FC 80241E3C 2402FFFB */ addiu $v0, $zero, -5 -/* DB4100 80241E40 00621024 */ and $v0, $v1, $v0 -/* DB4104 80241E44 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241E48: -/* DB4108 80241E48 8E830070 */ lw $v1, 0x70($s4) -/* DB410C 80241E4C 2C62000F */ sltiu $v0, $v1, 0xf -/* DB4110 80241E50 10400034 */ beqz $v0, .L80241F24 -/* DB4114 80241E54 00031080 */ sll $v0, $v1, 2 -/* DB4118 80241E58 3C018024 */ lui $at, 0x8024 -/* DB411C 80241E5C 00220821 */ addu $at, $at, $v0 -/* DB4120 80241E60 8C225608 */ lw $v0, 0x5608($at) -/* DB4124 80241E64 00400008 */ jr $v0 -/* DB4128 80241E68 00000000 */ nop -/* DB412C 80241E6C 0280202D */ daddu $a0, $s4, $zero -/* DB4130 80241E70 0200282D */ daddu $a1, $s0, $zero -/* DB4134 80241E74 0C090295 */ jal func_80240A54 -/* DB4138 80241E78 0260302D */ daddu $a2, $s3, $zero -/* DB413C 80241E7C 0280202D */ daddu $a0, $s4, $zero -/* DB4140 80241E80 0200282D */ daddu $a1, $s0, $zero -/* DB4144 80241E84 0C090301 */ jal func_80240C04 -/* DB4148 80241E88 0260302D */ daddu $a2, $s3, $zero -/* DB414C 80241E8C 080907CA */ j .L80241F28 -/* DB4150 80241E90 0000102D */ daddu $v0, $zero, $zero -/* DB4154 80241E94 0280202D */ daddu $a0, $s4, $zero -/* DB4158 80241E98 0200282D */ daddu $a1, $s0, $zero -/* DB415C 80241E9C 0C09048B */ jal func_8024122C -/* DB4160 80241EA0 0260302D */ daddu $a2, $s3, $zero -/* DB4164 80241EA4 0280202D */ daddu $a0, $s4, $zero -/* DB4168 80241EA8 0200282D */ daddu $a1, $s0, $zero -/* DB416C 80241EAC 0C0904BB */ jal func_802412EC -/* DB4170 80241EB0 0260302D */ daddu $a2, $s3, $zero -/* DB4174 80241EB4 080907CA */ j .L80241F28 -/* DB4178 80241EB8 0000102D */ daddu $v0, $zero, $zero -/* DB417C 80241EBC 0280202D */ daddu $a0, $s4, $zero -/* DB4180 80241EC0 0200282D */ daddu $a1, $s0, $zero -/* DB4184 80241EC4 0C09058C */ jal func_80241630 -/* DB4188 80241EC8 0260302D */ daddu $a2, $s3, $zero -/* DB418C 80241ECC 0280202D */ daddu $a0, $s4, $zero -/* DB4190 80241ED0 0200282D */ daddu $a1, $s0, $zero -/* DB4194 80241ED4 0C0905AA */ jal func_802416A8 -/* DB4198 80241ED8 0260302D */ daddu $a2, $s3, $zero -/* DB419C 80241EDC 080907CA */ j .L80241F28 -/* DB41A0 80241EE0 0000102D */ daddu $v0, $zero, $zero -/* DB41A4 80241EE4 0280202D */ daddu $a0, $s4, $zero -/* DB41A8 80241EE8 0200282D */ daddu $a1, $s0, $zero -/* DB41AC 80241EEC 0C0905C5 */ jal func_80241714 -/* DB41B0 80241EF0 0260302D */ daddu $a2, $s3, $zero -/* DB41B4 80241EF4 080907CA */ j .L80241F28 -/* DB41B8 80241EF8 0000102D */ daddu $v0, $zero, $zero -/* DB41BC 80241EFC 0280202D */ daddu $a0, $s4, $zero -/* DB41C0 80241F00 0200282D */ daddu $a1, $s0, $zero -/* DB41C4 80241F04 0C090612 */ jal func_80241848 -/* DB41C8 80241F08 0260302D */ daddu $a2, $s3, $zero -/* DB41CC 80241F0C 080907CA */ j .L80241F28 -/* DB41D0 80241F10 0000102D */ daddu $v0, $zero, $zero -/* DB41D4 80241F14 0280202D */ daddu $a0, $s4, $zero -/* DB41D8 80241F18 0200282D */ daddu $a1, $s0, $zero -/* DB41DC 80241F1C 0C09062B */ jal func_802418AC -/* DB41E0 80241F20 0260302D */ daddu $a2, $s3, $zero -.L80241F24: -/* DB41E4 80241F24 0000102D */ daddu $v0, $zero, $zero -.L80241F28: -/* DB41E8 80241F28 8FBF0048 */ lw $ra, 0x48($sp) -/* DB41EC 80241F2C 8FB50044 */ lw $s5, 0x44($sp) -/* DB41F0 80241F30 8FB40040 */ lw $s4, 0x40($sp) -/* DB41F4 80241F34 8FB3003C */ lw $s3, 0x3c($sp) -/* DB41F8 80241F38 8FB20038 */ lw $s2, 0x38($sp) -/* DB41FC 80241F3C 8FB10034 */ lw $s1, 0x34($sp) -/* DB4200 80241F40 8FB00030 */ lw $s0, 0x30($sp) -/* DB4204 80241F44 03E00008 */ jr $ra -/* DB4208 80241F48 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_05/func_80241F4C_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/func_80241F4C_DB22C0.s deleted file mode 100644 index 3f90a1584d..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/func_80241F4C_DB22C0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F4C_DB420C -/* DB420C 80241F4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB4210 80241F50 AFB10014 */ sw $s1, 0x14($sp) -/* DB4214 80241F54 0080882D */ daddu $s1, $a0, $zero -/* DB4218 80241F58 AFBF0018 */ sw $ra, 0x18($sp) -/* DB421C 80241F5C AFB00010 */ sw $s0, 0x10($sp) -/* DB4220 80241F60 8E30000C */ lw $s0, 0xc($s1) -/* DB4224 80241F64 8E050000 */ lw $a1, ($s0) -/* DB4228 80241F68 0C0B1EAF */ jal get_variable -/* DB422C 80241F6C 26100004 */ addiu $s0, $s0, 4 -/* DB4230 80241F70 0C00EAD2 */ jal get_npc_safe -/* DB4234 80241F74 0040202D */ daddu $a0, $v0, $zero -/* DB4238 80241F78 10400005 */ beqz $v0, .L80241F90 -/* DB423C 80241F7C 00000000 */ nop -/* DB4240 80241F80 8E050000 */ lw $a1, ($s0) -/* DB4244 80241F84 844600A8 */ lh $a2, 0xa8($v0) -/* DB4248 80241F88 0C0B2026 */ jal set_variable -/* DB424C 80241F8C 0220202D */ daddu $a0, $s1, $zero -.L80241F90: -/* DB4250 80241F90 8FBF0018 */ lw $ra, 0x18($sp) -/* DB4254 80241F94 8FB10014 */ lw $s1, 0x14($sp) -/* DB4258 80241F98 8FB00010 */ lw $s0, 0x10($sp) -/* DB425C 80241F9C 24020002 */ addiu $v0, $zero, 2 -/* DB4260 80241FA0 03E00008 */ jr $ra -/* DB4264 80241FA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_05/func_80242178_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/func_80242178_DB22C0.s deleted file mode 100644 index af0da2a422..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/func_80242178_DB22C0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242178_DB4438 -/* DB4438 80242178 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DB443C 8024217C AFBF0010 */ sw $ra, 0x10($sp) -/* DB4440 80242180 10A00003 */ beqz $a1, .L80242190 -/* DB4444 80242184 8C86000C */ lw $a2, 0xc($a0) -/* DB4448 80242188 3C018024 */ lui $at, 0x8024 -/* DB444C 8024218C AC203098 */ sw $zero, 0x3098($at) -.L80242190: -/* DB4450 80242190 3C038024 */ lui $v1, 0x8024 -/* DB4454 80242194 24633098 */ addiu $v1, $v1, 0x3098 -/* DB4458 80242198 8C620000 */ lw $v0, ($v1) -/* DB445C 8024219C 54400003 */ bnel $v0, $zero, .L802421AC -/* DB4460 802421A0 AC600000 */ sw $zero, ($v1) -/* DB4464 802421A4 08090870 */ j .L802421C0 -/* DB4468 802421A8 0000102D */ daddu $v0, $zero, $zero -.L802421AC: -/* DB446C 802421AC 8CC50000 */ lw $a1, ($a2) -/* DB4470 802421B0 3C068024 */ lui $a2, 0x8024 -/* DB4474 802421B4 0C0B2026 */ jal set_variable -/* DB4478 802421B8 8CC6309C */ lw $a2, 0x309c($a2) -/* DB447C 802421BC 24020002 */ addiu $v0, $zero, 2 -.L802421C0: -/* DB4480 802421C0 8FBF0010 */ lw $ra, 0x10($sp) -/* DB4484 802421C4 03E00008 */ jr $ra -/* DB4488 802421C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_05/func_802421CC_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/func_802421CC_DB22C0.s deleted file mode 100644 index d349e23bdf..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/func_802421CC_DB22C0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421CC_DB448C -/* DB448C 802421CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DB4490 802421D0 AFBF0010 */ sw $ra, 0x10($sp) -/* DB4494 802421D4 8C82000C */ lw $v0, 0xc($a0) -/* DB4498 802421D8 0C0B1EAF */ jal get_variable -/* DB449C 802421DC 8C450000 */ lw $a1, ($v0) -/* DB44A0 802421E0 3C018024 */ lui $at, 0x8024 -/* DB44A4 802421E4 AC22309C */ sw $v0, 0x309c($at) -/* DB44A8 802421E8 24020002 */ addiu $v0, $zero, 2 -/* DB44AC 802421EC 8FBF0010 */ lw $ra, 0x10($sp) -/* DB44B0 802421F0 24030001 */ addiu $v1, $zero, 1 -/* DB44B4 802421F4 3C018024 */ lui $at, 0x8024 -/* DB44B8 802421F8 AC233098 */ sw $v1, 0x3098($at) -/* DB44BC 802421FC 03E00008 */ jr $ra -/* DB44C0 80242200 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_05/func_802422A0_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/func_802422A0_DB22C0.s deleted file mode 100644 index 44d1324dfb..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/func_802422A0_DB22C0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422A0_DB4560 -/* DB4560 802422A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DB4564 802422A4 AFB00010 */ sw $s0, 0x10($sp) -/* DB4568 802422A8 0080802D */ daddu $s0, $a0, $zero -/* DB456C 802422AC AFBF0014 */ sw $ra, 0x14($sp) -/* DB4570 802422B0 8E02000C */ lw $v0, 0xc($s0) -/* DB4574 802422B4 0C0B1EAF */ jal get_variable -/* DB4578 802422B8 8C450000 */ lw $a1, ($v0) -/* DB457C 802422BC 0040202D */ daddu $a0, $v0, $zero -/* DB4580 802422C0 3C038008 */ lui $v1, %hi(gItemTable) -/* DB4584 802422C4 246378E0 */ addiu $v1, $v1, %lo(gItemTable) -/* DB4588 802422C8 00041140 */ sll $v0, $a0, 5 -/* DB458C 802422CC 00431821 */ addu $v1, $v0, $v1 -/* DB4590 802422D0 240200C1 */ addiu $v0, $zero, 0xc1 -/* DB4594 802422D4 10820005 */ beq $a0, $v0, .L802422EC -/* DB4598 802422D8 240200D2 */ addiu $v0, $zero, 0xd2 -/* DB459C 802422DC 10820003 */ beq $a0, $v0, .L802422EC -/* DB45A0 802422E0 240200B7 */ addiu $v0, $zero, 0xb7 -/* DB45A4 802422E4 14820004 */ bne $a0, $v0, .L802422F8 -/* DB45A8 802422E8 00000000 */ nop -.L802422EC: -/* DB45AC 802422EC 24020002 */ addiu $v0, $zero, 2 -/* DB45B0 802422F0 080908C5 */ j .L80242314 -/* DB45B4 802422F4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802422F8: -/* DB45B8 802422F8 94620018 */ lhu $v0, 0x18($v1) -/* DB45BC 802422FC 30420080 */ andi $v0, $v0, 0x80 -/* DB45C0 80242300 10400003 */ beqz $v0, .L80242310 -/* DB45C4 80242304 24020001 */ addiu $v0, $zero, 1 -/* DB45C8 80242308 080908C5 */ j .L80242314 -/* DB45CC 8024230C AE0200A8 */ sw $v0, 0xa8($s0) -.L80242310: -/* DB45D0 80242310 AE0000A8 */ sw $zero, 0xa8($s0) -.L80242314: -/* DB45D4 80242314 8FBF0014 */ lw $ra, 0x14($sp) -/* DB45D8 80242318 8FB00010 */ lw $s0, 0x10($sp) -/* DB45DC 8024231C 24020002 */ addiu $v0, $zero, 2 -/* DB45E0 80242320 03E00008 */ jr $ra -/* DB45E4 80242324 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_06/func_8024001C_DB7910.s b/asm/nonmatchings/world/area_omo/omo_06/func_8024001C_DB7910.s deleted file mode 100644 index 97f8e37d2f..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/func_8024001C_DB7910.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_DB792C -/* DB792C 8024001C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DB7930 80240020 AFB10014 */ sw $s1, 0x14($sp) -/* DB7934 80240024 0080882D */ daddu $s1, $a0, $zero -/* DB7938 80240028 AFBF001C */ sw $ra, 0x1c($sp) -/* DB793C 8024002C AFB20018 */ sw $s2, 0x18($sp) -/* DB7940 80240030 AFB00010 */ sw $s0, 0x10($sp) -/* DB7944 80240034 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DB7948 80240038 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DB794C 8024003C F7B40020 */ sdc1 $f20, 0x20($sp) -/* DB7950 80240040 8E30000C */ lw $s0, 0xc($s1) -/* DB7954 80240044 8E120000 */ lw $s2, ($s0) -/* DB7958 80240048 26100004 */ addiu $s0, $s0, 4 -/* DB795C 8024004C 8E050000 */ lw $a1, ($s0) -/* DB7960 80240050 0C0B210B */ jal get_float_variable -/* DB7964 80240054 26100004 */ addiu $s0, $s0, 4 -/* DB7968 80240058 8E050000 */ lw $a1, ($s0) -/* DB796C 8024005C 26100004 */ addiu $s0, $s0, 4 -/* DB7970 80240060 0220202D */ daddu $a0, $s1, $zero -/* DB7974 80240064 0C0B210B */ jal get_float_variable -/* DB7978 80240068 46000606 */ mov.s $f24, $f0 -/* DB797C 8024006C 8E050000 */ lw $a1, ($s0) -/* DB7980 80240070 26100004 */ addiu $s0, $s0, 4 -/* DB7984 80240074 0220202D */ daddu $a0, $s1, $zero -/* DB7988 80240078 0C0B210B */ jal get_float_variable -/* DB798C 8024007C 46000586 */ mov.s $f22, $f0 -/* DB7990 80240080 0220202D */ daddu $a0, $s1, $zero -/* DB7994 80240084 8E050000 */ lw $a1, ($s0) -/* DB7998 80240088 0C0B210B */ jal get_float_variable -/* DB799C 8024008C 46000506 */ mov.s $f20, $f0 -/* DB79A0 80240090 4600C306 */ mov.s $f12, $f24 -/* DB79A4 80240094 4406A000 */ mfc1 $a2, $f20 -/* DB79A8 80240098 44070000 */ mfc1 $a3, $f0 -/* DB79AC 8024009C 0C00A720 */ jal atan2 -/* DB79B0 802400A0 4600B386 */ mov.s $f14, $f22 -/* DB79B4 802400A4 0C00A6C9 */ jal clamp_angle -/* DB79B8 802400A8 46000306 */ mov.s $f12, $f0 -/* DB79BC 802400AC 0220202D */ daddu $a0, $s1, $zero -/* DB79C0 802400B0 44060000 */ mfc1 $a2, $f0 -/* DB79C4 802400B4 0C0B2190 */ jal set_float_variable -/* DB79C8 802400B8 0240282D */ daddu $a1, $s2, $zero -/* DB79CC 802400BC 8FBF001C */ lw $ra, 0x1c($sp) -/* DB79D0 802400C0 8FB20018 */ lw $s2, 0x18($sp) -/* DB79D4 802400C4 8FB10014 */ lw $s1, 0x14($sp) -/* DB79D8 802400C8 8FB00010 */ lw $s0, 0x10($sp) -/* DB79DC 802400CC D7B80030 */ ldc1 $f24, 0x30($sp) -/* DB79E0 802400D0 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DB79E4 802400D4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DB79E8 802400D8 24020002 */ addiu $v0, $zero, 2 -/* DB79EC 802400DC 03E00008 */ jr $ra -/* DB79F0 802400E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_06/func_802400E4_DB7910.s b/asm/nonmatchings/world/area_omo/omo_06/func_802400E4_DB7910.s deleted file mode 100644 index beafa91894..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/func_802400E4_DB7910.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E4_DB79F4 -/* DB79F4 802400E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DB79F8 802400E8 AFB10014 */ sw $s1, 0x14($sp) -/* DB79FC 802400EC 0080882D */ daddu $s1, $a0, $zero -/* DB7A00 802400F0 AFBF0018 */ sw $ra, 0x18($sp) -/* DB7A04 802400F4 AFB00010 */ sw $s0, 0x10($sp) -/* DB7A08 802400F8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DB7A0C 802400FC 8E30000C */ lw $s0, 0xc($s1) -/* DB7A10 80240100 8E050000 */ lw $a1, ($s0) -/* DB7A14 80240104 0C0B210B */ jal get_float_variable -/* DB7A18 80240108 26100004 */ addiu $s0, $s0, 4 -/* DB7A1C 8024010C 8E050000 */ lw $a1, ($s0) -/* DB7A20 80240110 26100004 */ addiu $s0, $s0, 4 -/* DB7A24 80240114 0220202D */ daddu $a0, $s1, $zero -/* DB7A28 80240118 0C0B210B */ jal get_float_variable -/* DB7A2C 8024011C 46000506 */ mov.s $f20, $f0 -/* DB7A30 80240120 4614003C */ c.lt.s $f0, $f20 -/* DB7A34 80240124 00000000 */ nop -/* DB7A38 80240128 45000004 */ bc1f .L8024013C -/* DB7A3C 8024012C 0220202D */ daddu $a0, $s1, $zero -/* DB7A40 80240130 8E050000 */ lw $a1, ($s0) -/* DB7A44 80240134 08090051 */ j .L80240144 -/* DB7A48 80240138 24060001 */ addiu $a2, $zero, 1 -.L8024013C: -/* DB7A4C 8024013C 8E050000 */ lw $a1, ($s0) -/* DB7A50 80240140 0000302D */ daddu $a2, $zero, $zero -.L80240144: -/* DB7A54 80240144 0C0B2026 */ jal set_variable -/* DB7A58 80240148 00000000 */ nop -/* DB7A5C 8024014C 8FBF0018 */ lw $ra, 0x18($sp) -/* DB7A60 80240150 8FB10014 */ lw $s1, 0x14($sp) -/* DB7A64 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* DB7A68 80240158 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DB7A6C 8024015C 24020002 */ addiu $v0, $zero, 2 -/* DB7A70 80240160 03E00008 */ jr $ra -/* DB7A74 80240164 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_06/func_80240290_DB7910.s b/asm/nonmatchings/world/area_omo/omo_06/func_80240290_DB7910.s deleted file mode 100644 index 6441b2079c..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/func_80240290_DB7910.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240290_DB7BA0 -/* DB7BA0 80240290 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DB7BA4 80240294 AFB10014 */ sw $s1, 0x14($sp) -/* DB7BA8 80240298 0080882D */ daddu $s1, $a0, $zero -/* DB7BAC 8024029C AFBF001C */ sw $ra, 0x1c($sp) -/* DB7BB0 802402A0 AFB20018 */ sw $s2, 0x18($sp) -/* DB7BB4 802402A4 AFB00010 */ sw $s0, 0x10($sp) -/* DB7BB8 802402A8 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* DB7BBC 802402AC F7B80030 */ sdc1 $f24, 0x30($sp) -/* DB7BC0 802402B0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DB7BC4 802402B4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DB7BC8 802402B8 8E30000C */ lw $s0, 0xc($s1) -/* DB7BCC 802402BC 8E050000 */ lw $a1, ($s0) -/* DB7BD0 802402C0 0C0B1EAF */ jal get_variable -/* DB7BD4 802402C4 26100004 */ addiu $s0, $s0, 4 -/* DB7BD8 802402C8 8E050000 */ lw $a1, ($s0) -/* DB7BDC 802402CC 26100004 */ addiu $s0, $s0, 4 -/* DB7BE0 802402D0 0220202D */ daddu $a0, $s1, $zero -/* DB7BE4 802402D4 0C0B210B */ jal get_float_variable -/* DB7BE8 802402D8 0040902D */ daddu $s2, $v0, $zero -/* DB7BEC 802402DC 8E050000 */ lw $a1, ($s0) -/* DB7BF0 802402E0 26100004 */ addiu $s0, $s0, 4 -/* DB7BF4 802402E4 0220202D */ daddu $a0, $s1, $zero -/* DB7BF8 802402E8 0C0B210B */ jal get_float_variable -/* DB7BFC 802402EC 46000686 */ mov.s $f26, $f0 -/* DB7C00 802402F0 8E050000 */ lw $a1, ($s0) -/* DB7C04 802402F4 26100004 */ addiu $s0, $s0, 4 -/* DB7C08 802402F8 0220202D */ daddu $a0, $s1, $zero -/* DB7C0C 802402FC 0C0B210B */ jal get_float_variable -/* DB7C10 80240300 46000606 */ mov.s $f24, $f0 -/* DB7C14 80240304 0220202D */ daddu $a0, $s1, $zero -/* DB7C18 80240308 8E050000 */ lw $a1, ($s0) -/* DB7C1C 8024030C 0C0B210B */ jal get_float_variable -/* DB7C20 80240310 46000506 */ mov.s $f20, $f0 -/* DB7C24 80240314 0240202D */ daddu $a0, $s2, $zero -/* DB7C28 80240318 0C00EAD2 */ jal get_npc_safe -/* DB7C2C 8024031C 46000586 */ mov.s $f22, $f0 -/* DB7C30 80240320 0040202D */ daddu $a0, $v0, $zero -/* DB7C34 80240324 E49A0038 */ swc1 $f26, 0x38($a0) -/* DB7C38 80240328 4600D006 */ mov.s $f0, $f26 -/* DB7C3C 8024032C E498003C */ swc1 $f24, 0x3c($a0) -/* DB7C40 80240330 4600C086 */ mov.s $f2, $f24 -/* DB7C44 80240334 E4940040 */ swc1 $f20, 0x40($a0) -/* DB7C48 80240338 4600A106 */ mov.s $f4, $f20 -/* DB7C4C 8024033C 8C830000 */ lw $v1, ($a0) -/* DB7C50 80240340 3C050001 */ lui $a1, 1 -/* DB7C54 80240344 E496000C */ swc1 $f22, 0xc($a0) -/* DB7C58 80240348 E480006C */ swc1 $f0, 0x6c($a0) -/* DB7C5C 8024034C E4820070 */ swc1 $f2, 0x70($a0) -/* DB7C60 80240350 E4840074 */ swc1 $f4, 0x74($a0) -/* DB7C64 80240354 00651825 */ or $v1, $v1, $a1 -/* DB7C68 80240358 AC830000 */ sw $v1, ($a0) -/* DB7C6C 8024035C 8FBF001C */ lw $ra, 0x1c($sp) -/* DB7C70 80240360 8FB20018 */ lw $s2, 0x18($sp) -/* DB7C74 80240364 8FB10014 */ lw $s1, 0x14($sp) -/* DB7C78 80240368 8FB00010 */ lw $s0, 0x10($sp) -/* DB7C7C 8024036C D7BA0038 */ ldc1 $f26, 0x38($sp) -/* DB7C80 80240370 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DB7C84 80240374 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DB7C88 80240378 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DB7C8C 8024037C 24020002 */ addiu $v0, $zero, 2 -/* DB7C90 80240380 03E00008 */ jr $ra -/* DB7C94 80240384 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_omo/omo_06/func_80240388_DB7910.s b/asm/nonmatchings/world/area_omo/omo_06/func_80240388_DB7910.s deleted file mode 100644 index 202bd0e10a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/func_80240388_DB7910.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240388_DB7C98 -/* DB7C98 80240388 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DB7C9C 8024038C AFB20018 */ sw $s2, 0x18($sp) -/* DB7CA0 80240390 0080902D */ daddu $s2, $a0, $zero -/* DB7CA4 80240394 AFBF0028 */ sw $ra, 0x28($sp) -/* DB7CA8 80240398 AFB50024 */ sw $s5, 0x24($sp) -/* DB7CAC 8024039C AFB40020 */ sw $s4, 0x20($sp) -/* DB7CB0 802403A0 AFB3001C */ sw $s3, 0x1c($sp) -/* DB7CB4 802403A4 AFB10014 */ sw $s1, 0x14($sp) -/* DB7CB8 802403A8 AFB00010 */ sw $s0, 0x10($sp) -/* DB7CBC 802403AC F7B80040 */ sdc1 $f24, 0x40($sp) -/* DB7CC0 802403B0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* DB7CC4 802403B4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* DB7CC8 802403B8 8E50000C */ lw $s0, 0xc($s2) -/* DB7CCC 802403BC 8E140000 */ lw $s4, ($s0) -/* DB7CD0 802403C0 26100004 */ addiu $s0, $s0, 4 -/* DB7CD4 802403C4 0C0B1EAF */ jal get_variable -/* DB7CD8 802403C8 0280282D */ daddu $a1, $s4, $zero -/* DB7CDC 802403CC 0040982D */ daddu $s3, $v0, $zero -/* DB7CE0 802403D0 8E150000 */ lw $s5, ($s0) -/* DB7CE4 802403D4 26100004 */ addiu $s0, $s0, 4 -/* DB7CE8 802403D8 8E050000 */ lw $a1, ($s0) -/* DB7CEC 802403DC 26100004 */ addiu $s0, $s0, 4 -/* DB7CF0 802403E0 0C0B210B */ jal get_float_variable -/* DB7CF4 802403E4 0240202D */ daddu $a0, $s2, $zero -/* DB7CF8 802403E8 8E050000 */ lw $a1, ($s0) -/* DB7CFC 802403EC 26100004 */ addiu $s0, $s0, 4 -/* DB7D00 802403F0 0240202D */ daddu $a0, $s2, $zero -/* DB7D04 802403F4 0C0B210B */ jal get_float_variable -/* DB7D08 802403F8 46000606 */ mov.s $f24, $f0 -/* DB7D0C 802403FC 8E050000 */ lw $a1, ($s0) -/* DB7D10 80240400 26100004 */ addiu $s0, $s0, 4 -/* DB7D14 80240404 0240202D */ daddu $a0, $s2, $zero -/* DB7D18 80240408 0C0B1EAF */ jal get_variable -/* DB7D1C 8024040C 46000506 */ mov.s $f20, $f0 -/* DB7D20 80240410 8E050000 */ lw $a1, ($s0) -/* DB7D24 80240414 26100004 */ addiu $s0, $s0, 4 -/* DB7D28 80240418 0240202D */ daddu $a0, $s2, $zero -/* DB7D2C 8024041C 0C0B1EAF */ jal get_variable -/* DB7D30 80240420 0040882D */ daddu $s1, $v0, $zero -/* DB7D34 80240424 0240202D */ daddu $a0, $s2, $zero -/* DB7D38 80240428 8E050000 */ lw $a1, ($s0) -/* DB7D3C 8024042C 0C0B210B */ jal get_float_variable -/* DB7D40 80240430 0040802D */ daddu $s0, $v0, $zero -/* DB7D44 80240434 3C014334 */ lui $at, 0x4334 -/* DB7D48 80240438 44811000 */ mtc1 $at, $f2 -/* DB7D4C 8024043C 3C014049 */ lui $at, 0x4049 -/* DB7D50 80240440 34210FD8 */ ori $at, $at, 0xfd8 -/* DB7D54 80240444 44812000 */ mtc1 $at, $f4 -/* DB7D58 80240448 46020003 */ div.s $f0, $f0, $f2 -/* DB7D5C 8024044C 46040582 */ mul.s $f22, $f0, $f4 -/* DB7D60 80240450 00000000 */ nop -/* DB7D64 80240454 4618A501 */ sub.s $f20, $f20, $f24 -/* DB7D68 80240458 3C013F00 */ lui $at, 0x3f00 -/* DB7D6C 8024045C 44810000 */ mtc1 $at, $f0 -/* DB7D70 80240460 00000000 */ nop -/* DB7D74 80240464 4600A502 */ mul.s $f20, $f20, $f0 -/* DB7D78 80240468 00000000 */ nop -/* DB7D7C 8024046C 12000007 */ beqz $s0, .L8024048C -/* DB7D80 80240470 0233102A */ slt $v0, $s1, $s3 -/* DB7D84 80240474 10400005 */ beqz $v0, .L8024048C -/* DB7D88 80240478 0240202D */ daddu $a0, $s2, $zero -/* DB7D8C 8024047C 0220982D */ daddu $s3, $s1, $zero -/* DB7D90 80240480 0280282D */ daddu $a1, $s4, $zero -/* DB7D94 80240484 0C0B2026 */ jal set_variable -/* DB7D98 80240488 0220302D */ daddu $a2, $s1, $zero -.L8024048C: -/* DB7D9C 8024048C 3C014049 */ lui $at, 0x4049 -/* DB7DA0 80240490 34210FD8 */ ori $at, $at, 0xfd8 -/* DB7DA4 80240494 44810000 */ mtc1 $at, $f0 -/* DB7DA8 80240498 44936000 */ mtc1 $s3, $f12 -/* DB7DAC 8024049C 00000000 */ nop -/* DB7DB0 802404A0 46806320 */ cvt.s.w $f12, $f12 -/* DB7DB4 802404A4 46006302 */ mul.s $f12, $f12, $f0 -/* DB7DB8 802404A8 00000000 */ nop -/* DB7DBC 802404AC 44910000 */ mtc1 $s1, $f0 -/* DB7DC0 802404B0 00000000 */ nop -/* DB7DC4 802404B4 46800020 */ cvt.s.w $f0, $f0 -/* DB7DC8 802404B8 46006303 */ div.s $f12, $f12, $f0 -/* DB7DCC 802404BC 0C00A874 */ jal cos_rad -/* DB7DD0 802404C0 46166300 */ add.s $f12, $f12, $f22 -/* DB7DD4 802404C4 4600A002 */ mul.s $f0, $f20, $f0 -/* DB7DD8 802404C8 00000000 */ nop -/* DB7DDC 802404CC 4614C080 */ add.s $f2, $f24, $f20 -/* DB7DE0 802404D0 46001081 */ sub.s $f2, $f2, $f0 -/* DB7DE4 802404D4 0240202D */ daddu $a0, $s2, $zero -/* DB7DE8 802404D8 44061000 */ mfc1 $a2, $f2 -/* DB7DEC 802404DC 0C0B2190 */ jal set_float_variable -/* DB7DF0 802404E0 02A0282D */ daddu $a1, $s5, $zero -/* DB7DF4 802404E4 8FBF0028 */ lw $ra, 0x28($sp) -/* DB7DF8 802404E8 8FB50024 */ lw $s5, 0x24($sp) -/* DB7DFC 802404EC 8FB40020 */ lw $s4, 0x20($sp) -/* DB7E00 802404F0 8FB3001C */ lw $s3, 0x1c($sp) -/* DB7E04 802404F4 8FB20018 */ lw $s2, 0x18($sp) -/* DB7E08 802404F8 8FB10014 */ lw $s1, 0x14($sp) -/* DB7E0C 802404FC 8FB00010 */ lw $s0, 0x10($sp) -/* DB7E10 80240500 D7B80040 */ ldc1 $f24, 0x40($sp) -/* DB7E14 80240504 D7B60038 */ ldc1 $f22, 0x38($sp) -/* DB7E18 80240508 D7B40030 */ ldc1 $f20, 0x30($sp) -/* DB7E1C 8024050C 24020002 */ addiu $v0, $zero, 2 -/* DB7E20 80240510 03E00008 */ jr $ra -/* DB7E24 80240514 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_06/func_80240518_DB7910.s b/asm/nonmatchings/world/area_omo/omo_06/func_80240518_DB7910.s deleted file mode 100644 index 973249b01f..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/func_80240518_DB7910.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240518_DB7E28 -/* DB7E28 80240518 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* DB7E2C 8024051C 2463419C */ addiu $v1, $v1, %lo(gGameStatusPtr) -/* DB7E30 80240520 8C620000 */ lw $v0, ($v1) -/* DB7E34 80240524 AC800084 */ sw $zero, 0x84($a0) -/* DB7E38 80240528 8C420010 */ lw $v0, 0x10($v0) -/* DB7E3C 8024052C 30428000 */ andi $v0, $v0, 0x8000 -/* DB7E40 80240530 10400002 */ beqz $v0, .L8024053C -/* DB7E44 80240534 24020001 */ addiu $v0, $zero, 1 -/* DB7E48 80240538 AC820084 */ sw $v0, 0x84($a0) -.L8024053C: -/* DB7E4C 8024053C 8C620000 */ lw $v0, ($v1) -/* DB7E50 80240540 8C420010 */ lw $v0, 0x10($v0) -/* DB7E54 80240544 30424000 */ andi $v0, $v0, 0x4000 -/* DB7E58 80240548 10400002 */ beqz $v0, .L80240554 -/* DB7E5C 8024054C 24020001 */ addiu $v0, $zero, 1 -/* DB7E60 80240550 AC820084 */ sw $v0, 0x84($a0) -.L80240554: -/* DB7E64 80240554 03E00008 */ jr $ra -/* DB7E68 80240558 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_06/func_8024055C_DB7910.s b/asm/nonmatchings/world/area_omo/omo_06/func_8024055C_DB7910.s deleted file mode 100644 index b955128c66..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/func_8024055C_DB7910.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024055C_DB7E6C -/* DB7E6C 8024055C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DB7E70 80240560 AFB00010 */ sw $s0, 0x10($sp) -/* DB7E74 80240564 0080802D */ daddu $s0, $a0, $zero -/* DB7E78 80240568 AFBF0014 */ sw $ra, 0x14($sp) -/* DB7E7C 8024056C 8E0300A8 */ lw $v1, 0xa8($s0) -/* DB7E80 80240570 8E020088 */ lw $v0, 0x88($s0) -/* DB7E84 80240574 00621821 */ addu $v1, $v1, $v0 -/* DB7E88 80240578 04610004 */ bgez $v1, .L8024058C -/* DB7E8C 8024057C AE0300A8 */ sw $v1, 0xa8($s0) -/* DB7E90 80240580 3C020002 */ lui $v0, 2 -/* DB7E94 80240584 08090167 */ j .L8024059C -/* DB7E98 80240588 00621021 */ addu $v0, $v1, $v0 -.L8024058C: -/* DB7E9C 8024058C 3C040002 */ lui $a0, 2 -/* DB7EA0 80240590 0083102A */ slt $v0, $a0, $v1 -/* DB7EA4 80240594 10400002 */ beqz $v0, .L802405A0 -/* DB7EA8 80240598 00641023 */ subu $v0, $v1, $a0 -.L8024059C: -/* DB7EAC 8024059C AE0200A8 */ sw $v0, 0xa8($s0) -.L802405A0: -/* DB7EB0 802405A0 8E0300AC */ lw $v1, 0xac($s0) -/* DB7EB4 802405A4 8E02008C */ lw $v0, 0x8c($s0) -/* DB7EB8 802405A8 00621821 */ addu $v1, $v1, $v0 -/* DB7EBC 802405AC 04610004 */ bgez $v1, .L802405C0 -/* DB7EC0 802405B0 AE0300AC */ sw $v1, 0xac($s0) -/* DB7EC4 802405B4 3C020002 */ lui $v0, 2 -/* DB7EC8 802405B8 08090174 */ j .L802405D0 -/* DB7ECC 802405BC 00621021 */ addu $v0, $v1, $v0 -.L802405C0: -/* DB7ED0 802405C0 3C040002 */ lui $a0, 2 -/* DB7ED4 802405C4 0083102A */ slt $v0, $a0, $v1 -/* DB7ED8 802405C8 10400002 */ beqz $v0, .L802405D4 -/* DB7EDC 802405CC 00641023 */ subu $v0, $v1, $a0 -.L802405D0: -/* DB7EE0 802405D0 AE0200AC */ sw $v0, 0xac($s0) -.L802405D4: -/* DB7EE4 802405D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* DB7EE8 802405D8 8E020090 */ lw $v0, 0x90($s0) -/* DB7EEC 802405DC 00621821 */ addu $v1, $v1, $v0 -/* DB7EF0 802405E0 04610004 */ bgez $v1, .L802405F4 -/* DB7EF4 802405E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* DB7EF8 802405E8 3C020002 */ lui $v0, 2 -/* DB7EFC 802405EC 08090181 */ j .L80240604 -/* DB7F00 802405F0 00621021 */ addu $v0, $v1, $v0 -.L802405F4: -/* DB7F04 802405F4 3C040002 */ lui $a0, 2 -/* DB7F08 802405F8 0083102A */ slt $v0, $a0, $v1 -/* DB7F0C 802405FC 10400002 */ beqz $v0, .L80240608 -/* DB7F10 80240600 00641023 */ subu $v0, $v1, $a0 -.L80240604: -/* DB7F14 80240604 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240608: -/* DB7F18 80240608 8E0300B4 */ lw $v1, 0xb4($s0) -/* DB7F1C 8024060C 8E020094 */ lw $v0, 0x94($s0) -/* DB7F20 80240610 00621821 */ addu $v1, $v1, $v0 -/* DB7F24 80240614 04610004 */ bgez $v1, .L80240628 -/* DB7F28 80240618 AE0300B4 */ sw $v1, 0xb4($s0) -/* DB7F2C 8024061C 3C020002 */ lui $v0, 2 -/* DB7F30 80240620 0809018E */ j .L80240638 -/* DB7F34 80240624 00621021 */ addu $v0, $v1, $v0 -.L80240628: -/* DB7F38 80240628 3C040002 */ lui $a0, 2 -/* DB7F3C 8024062C 0083102A */ slt $v0, $a0, $v1 -/* DB7F40 80240630 10400002 */ beqz $v0, .L8024063C -/* DB7F44 80240634 00641023 */ subu $v0, $v1, $a0 -.L80240638: -/* DB7F48 80240638 AE0200B4 */ sw $v0, 0xb4($s0) -.L8024063C: -/* DB7F4C 8024063C 8E040084 */ lw $a0, 0x84($s0) -/* DB7F50 80240640 0C046F07 */ jal set_main_pan_u -/* DB7F54 80240644 8E0500A8 */ lw $a1, 0xa8($s0) -/* DB7F58 80240648 8E040084 */ lw $a0, 0x84($s0) -/* DB7F5C 8024064C 0C046F0D */ jal set_main_pan_v -/* DB7F60 80240650 8E0500AC */ lw $a1, 0xac($s0) -/* DB7F64 80240654 8E040084 */ lw $a0, 0x84($s0) -/* DB7F68 80240658 0C046F13 */ jal set_aux_pan_u -/* DB7F6C 8024065C 8E0500B0 */ lw $a1, 0xb0($s0) -/* DB7F70 80240660 8E040084 */ lw $a0, 0x84($s0) -/* DB7F74 80240664 0C046F19 */ jal set_aux_pan_v -/* DB7F78 80240668 8E0500B4 */ lw $a1, 0xb4($s0) -/* DB7F7C 8024066C 8FBF0014 */ lw $ra, 0x14($sp) -/* DB7F80 80240670 8FB00010 */ lw $s0, 0x10($sp) -/* DB7F84 80240674 0000102D */ daddu $v0, $zero, $zero -/* DB7F88 80240678 03E00008 */ jr $ra -/* DB7F8C 8024067C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_06/func_80240680_DB7910.s b/asm/nonmatchings/world/area_omo/omo_06/func_80240680_DB7910.s deleted file mode 100644 index 4c7b5ba975..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/func_80240680_DB7910.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240680_DB7F90 -/* DB7F90 80240680 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DB7F94 80240684 AFB00010 */ sw $s0, 0x10($sp) -/* DB7F98 80240688 0080802D */ daddu $s0, $a0, $zero -/* DB7F9C 8024068C 10A00005 */ beqz $a1, .L802406A4 -/* DB7FA0 80240690 AFBF0014 */ sw $ra, 0x14($sp) -/* DB7FA4 80240694 AE000070 */ sw $zero, 0x70($s0) -/* DB7FA8 80240698 AE000074 */ sw $zero, 0x74($s0) -/* DB7FAC 8024069C AE000078 */ sw $zero, 0x78($s0) -/* DB7FB0 802406A0 AE00007C */ sw $zero, 0x7c($s0) -.L802406A4: -/* DB7FB4 802406A4 8E020070 */ lw $v0, 0x70($s0) -/* DB7FB8 802406A8 1440000E */ bnez $v0, .L802406E4 -/* DB7FBC 802406AC 00000000 */ nop -/* DB7FC0 802406B0 8E0300A8 */ lw $v1, 0xa8($s0) -/* DB7FC4 802406B4 8E020088 */ lw $v0, 0x88($s0) -/* DB7FC8 802406B8 00621821 */ addu $v1, $v1, $v0 -/* DB7FCC 802406BC 04610004 */ bgez $v1, .L802406D0 -/* DB7FD0 802406C0 AE0300A8 */ sw $v1, 0xa8($s0) -/* DB7FD4 802406C4 3C020002 */ lui $v0, 2 -/* DB7FD8 802406C8 080901B8 */ j .L802406E0 -/* DB7FDC 802406CC 00621021 */ addu $v0, $v1, $v0 -.L802406D0: -/* DB7FE0 802406D0 3C040002 */ lui $a0, 2 -/* DB7FE4 802406D4 0083102A */ slt $v0, $a0, $v1 -/* DB7FE8 802406D8 10400002 */ beqz $v0, .L802406E4 -/* DB7FEC 802406DC 00641023 */ subu $v0, $v1, $a0 -.L802406E0: -/* DB7FF0 802406E0 AE0200A8 */ sw $v0, 0xa8($s0) -.L802406E4: -/* DB7FF4 802406E4 8E020074 */ lw $v0, 0x74($s0) -/* DB7FF8 802406E8 1440000E */ bnez $v0, .L80240724 -/* DB7FFC 802406EC 00000000 */ nop -/* DB8000 802406F0 8E0300AC */ lw $v1, 0xac($s0) -/* DB8004 802406F4 8E02008C */ lw $v0, 0x8c($s0) -/* DB8008 802406F8 00621821 */ addu $v1, $v1, $v0 -/* DB800C 802406FC 04610004 */ bgez $v1, .L80240710 -/* DB8010 80240700 AE0300AC */ sw $v1, 0xac($s0) -/* DB8014 80240704 3C020002 */ lui $v0, 2 -/* DB8018 80240708 080901C8 */ j .L80240720 -/* DB801C 8024070C 00621021 */ addu $v0, $v1, $v0 -.L80240710: -/* DB8020 80240710 3C040002 */ lui $a0, 2 -/* DB8024 80240714 0083102A */ slt $v0, $a0, $v1 -/* DB8028 80240718 10400002 */ beqz $v0, .L80240724 -/* DB802C 8024071C 00641023 */ subu $v0, $v1, $a0 -.L80240720: -/* DB8030 80240720 AE0200AC */ sw $v0, 0xac($s0) -.L80240724: -/* DB8034 80240724 8E020078 */ lw $v0, 0x78($s0) -/* DB8038 80240728 1440000E */ bnez $v0, .L80240764 -/* DB803C 8024072C 00000000 */ nop -/* DB8040 80240730 8E0300B0 */ lw $v1, 0xb0($s0) -/* DB8044 80240734 8E020090 */ lw $v0, 0x90($s0) -/* DB8048 80240738 00621821 */ addu $v1, $v1, $v0 -/* DB804C 8024073C 04610004 */ bgez $v1, .L80240750 -/* DB8050 80240740 AE0300B0 */ sw $v1, 0xb0($s0) -/* DB8054 80240744 3C020002 */ lui $v0, 2 -/* DB8058 80240748 080901D8 */ j .L80240760 -/* DB805C 8024074C 00621021 */ addu $v0, $v1, $v0 -.L80240750: -/* DB8060 80240750 3C040002 */ lui $a0, 2 -/* DB8064 80240754 0083102A */ slt $v0, $a0, $v1 -/* DB8068 80240758 10400002 */ beqz $v0, .L80240764 -/* DB806C 8024075C 00641023 */ subu $v0, $v1, $a0 -.L80240760: -/* DB8070 80240760 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240764: -/* DB8074 80240764 8E02007C */ lw $v0, 0x7c($s0) -/* DB8078 80240768 1440000E */ bnez $v0, .L802407A4 -/* DB807C 8024076C 00000000 */ nop -/* DB8080 80240770 8E0300B4 */ lw $v1, 0xb4($s0) -/* DB8084 80240774 8E020094 */ lw $v0, 0x94($s0) -/* DB8088 80240778 00621821 */ addu $v1, $v1, $v0 -/* DB808C 8024077C 04610004 */ bgez $v1, .L80240790 -/* DB8090 80240780 AE0300B4 */ sw $v1, 0xb4($s0) -/* DB8094 80240784 3C020002 */ lui $v0, 2 -/* DB8098 80240788 080901E8 */ j .L802407A0 -/* DB809C 8024078C 00621021 */ addu $v0, $v1, $v0 -.L80240790: -/* DB80A0 80240790 3C040002 */ lui $a0, 2 -/* DB80A4 80240794 0083102A */ slt $v0, $a0, $v1 -/* DB80A8 80240798 10400002 */ beqz $v0, .L802407A4 -/* DB80AC 8024079C 00641023 */ subu $v0, $v1, $a0 -.L802407A0: -/* DB80B0 802407A0 AE0200B4 */ sw $v0, 0xb4($s0) -.L802407A4: -/* DB80B4 802407A4 8E040084 */ lw $a0, 0x84($s0) -/* DB80B8 802407A8 0C046F07 */ jal set_main_pan_u -/* DB80BC 802407AC 8E0500A8 */ lw $a1, 0xa8($s0) -/* DB80C0 802407B0 8E040084 */ lw $a0, 0x84($s0) -/* DB80C4 802407B4 0C046F0D */ jal set_main_pan_v -/* DB80C8 802407B8 8E0500AC */ lw $a1, 0xac($s0) -/* DB80CC 802407BC 8E040084 */ lw $a0, 0x84($s0) -/* DB80D0 802407C0 0C046F13 */ jal set_aux_pan_u -/* DB80D4 802407C4 8E0500B0 */ lw $a1, 0xb0($s0) -/* DB80D8 802407C8 8E040084 */ lw $a0, 0x84($s0) -/* DB80DC 802407CC 0C046F19 */ jal set_aux_pan_v -/* DB80E0 802407D0 8E0500B4 */ lw $a1, 0xb4($s0) -/* DB80E4 802407D4 8E020070 */ lw $v0, 0x70($s0) -/* DB80E8 802407D8 8E030078 */ lw $v1, 0x78($s0) -/* DB80EC 802407DC 8E040098 */ lw $a0, 0x98($s0) -/* DB80F0 802407E0 24420001 */ addiu $v0, $v0, 1 -/* DB80F4 802407E4 AE020070 */ sw $v0, 0x70($s0) -/* DB80F8 802407E8 8E020074 */ lw $v0, 0x74($s0) -/* DB80FC 802407EC 24630001 */ addiu $v1, $v1, 1 -/* DB8100 802407F0 AE030078 */ sw $v1, 0x78($s0) -/* DB8104 802407F4 8E030070 */ lw $v1, 0x70($s0) -/* DB8108 802407F8 24420001 */ addiu $v0, $v0, 1 -/* DB810C 802407FC AE020074 */ sw $v0, 0x74($s0) -/* DB8110 80240800 8E02007C */ lw $v0, 0x7c($s0) -/* DB8114 80240804 0064182A */ slt $v1, $v1, $a0 -/* DB8118 80240808 24420001 */ addiu $v0, $v0, 1 -/* DB811C 8024080C 14600002 */ bnez $v1, .L80240818 -/* DB8120 80240810 AE02007C */ sw $v0, 0x7c($s0) -/* DB8124 80240814 AE000070 */ sw $zero, 0x70($s0) -.L80240818: -/* DB8128 80240818 8E020074 */ lw $v0, 0x74($s0) -/* DB812C 8024081C 8E03009C */ lw $v1, 0x9c($s0) -/* DB8130 80240820 0043102A */ slt $v0, $v0, $v1 -/* DB8134 80240824 50400001 */ beql $v0, $zero, .L8024082C -/* DB8138 80240828 AE000074 */ sw $zero, 0x74($s0) -.L8024082C: -/* DB813C 8024082C 8E020078 */ lw $v0, 0x78($s0) -/* DB8140 80240830 8E0300A0 */ lw $v1, 0xa0($s0) -/* DB8144 80240834 0043102A */ slt $v0, $v0, $v1 -/* DB8148 80240838 50400001 */ beql $v0, $zero, .L80240840 -/* DB814C 8024083C AE000078 */ sw $zero, 0x78($s0) -.L80240840: -/* DB8150 80240840 8E02007C */ lw $v0, 0x7c($s0) -/* DB8154 80240844 8E0300A4 */ lw $v1, 0xa4($s0) -/* DB8158 80240848 0043102A */ slt $v0, $v0, $v1 -/* DB815C 8024084C 50400001 */ beql $v0, $zero, .L80240854 -/* DB8160 80240850 AE00007C */ sw $zero, 0x7c($s0) -.L80240854: -/* DB8164 80240854 8FBF0014 */ lw $ra, 0x14($sp) -/* DB8168 80240858 8FB00010 */ lw $s0, 0x10($sp) -/* DB816C 8024085C 0000102D */ daddu $v0, $zero, $zero -/* DB8170 80240860 03E00008 */ jr $ra -/* DB8174 80240864 27BD0018 */ addiu $sp, $sp, 0x18 -/* DB8178 80240868 00000000 */ nop -/* DB817C 8024086C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_06/func_80240870_DB7910.s b/asm/nonmatchings/world/area_omo/omo_06/func_80240870_DB7910.s deleted file mode 100644 index 6a5810ba31..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/func_80240870_DB7910.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_DB8180 -/* DB8180 80240870 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB8184 80240874 AFB00010 */ sw $s0, 0x10($sp) -/* DB8188 80240878 3C108024 */ lui $s0, 0x8024 -/* DB818C 8024087C 261056C0 */ addiu $s0, $s0, 0x56c0 -/* DB8190 80240880 AFBF0018 */ sw $ra, 0x18($sp) -/* DB8194 80240884 AFB10014 */ sw $s1, 0x14($sp) -/* DB8198 80240888 8E020000 */ lw $v0, ($s0) -/* DB819C 8024088C 14400010 */ bnez $v0, .L802408D0 -/* DB81A0 80240890 0080882D */ daddu $s1, $a0, $zero -/* DB81A4 80240894 0C00AB39 */ jal heap_malloc -/* DB81A8 80240898 24040040 */ addiu $a0, $zero, 0x40 -/* DB81AC 8024089C AE020000 */ sw $v0, ($s0) -/* DB81B0 802408A0 0000182D */ daddu $v1, $zero, $zero -/* DB81B4 802408A4 0040282D */ daddu $a1, $v0, $zero -/* DB81B8 802408A8 0220202D */ daddu $a0, $s1, $zero -.L802408AC: -/* DB81BC 802408AC 8C820084 */ lw $v0, 0x84($a0) -/* DB81C0 802408B0 24840004 */ addiu $a0, $a0, 4 -/* DB81C4 802408B4 24630001 */ addiu $v1, $v1, 1 -/* DB81C8 802408B8 ACA20000 */ sw $v0, ($a1) -/* DB81CC 802408BC 28620010 */ slti $v0, $v1, 0x10 -/* DB81D0 802408C0 1440FFFA */ bnez $v0, .L802408AC -/* DB81D4 802408C4 24A50004 */ addiu $a1, $a1, 4 -/* DB81D8 802408C8 08090243 */ j .L8024090C -/* DB81DC 802408CC 00000000 */ nop -.L802408D0: -/* DB81E0 802408D0 0000182D */ daddu $v1, $zero, $zero -/* DB81E4 802408D4 0040282D */ daddu $a1, $v0, $zero -/* DB81E8 802408D8 0220202D */ daddu $a0, $s1, $zero -.L802408DC: -/* DB81EC 802408DC 8CA20000 */ lw $v0, ($a1) -/* DB81F0 802408E0 24A50004 */ addiu $a1, $a1, 4 -/* DB81F4 802408E4 24630001 */ addiu $v1, $v1, 1 -/* DB81F8 802408E8 AC820084 */ sw $v0, 0x84($a0) -/* DB81FC 802408EC 28620010 */ slti $v0, $v1, 0x10 -/* DB8200 802408F0 1440FFFA */ bnez $v0, .L802408DC -/* DB8204 802408F4 24840004 */ addiu $a0, $a0, 4 -/* DB8208 802408F8 3C108024 */ lui $s0, 0x8024 -/* DB820C 802408FC 261056C0 */ addiu $s0, $s0, 0x56c0 -/* DB8210 80240900 0C00AB4B */ jal heap_free -/* DB8214 80240904 8E040000 */ lw $a0, ($s0) -/* DB8218 80240908 AE000000 */ sw $zero, ($s0) -.L8024090C: -/* DB821C 8024090C 8FBF0018 */ lw $ra, 0x18($sp) -/* DB8220 80240910 8FB10014 */ lw $s1, 0x14($sp) -/* DB8224 80240914 8FB00010 */ lw $s0, 0x10($sp) -/* DB8228 80240918 24020002 */ addiu $v0, $zero, 2 -/* DB822C 8024091C 03E00008 */ jr $ra -/* DB8230 80240920 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_06/func_80240924_DB7910.s b/asm/nonmatchings/world/area_omo/omo_06/func_80240924_DB7910.s deleted file mode 100644 index 7ca91911cc..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/func_80240924_DB7910.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240924_DB8234 -/* DB8234 80240924 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB8238 80240928 AFB00010 */ sw $s0, 0x10($sp) -/* DB823C 8024092C 0080802D */ daddu $s0, $a0, $zero -/* DB8240 80240930 AFBF0018 */ sw $ra, 0x18($sp) -/* DB8244 80240934 AFB10014 */ sw $s1, 0x14($sp) -/* DB8248 80240938 8E02000C */ lw $v0, 0xc($s0) -/* DB824C 8024093C 8C510000 */ lw $s1, ($v0) -/* DB8250 80240940 0C0B1EAF */ jal get_variable -/* DB8254 80240944 0220282D */ daddu $a1, $s1, $zero -/* DB8258 80240948 3C03FFF0 */ lui $v1, 0xfff0 -/* DB825C 8024094C 3463FFFF */ ori $v1, $v1, 0xffff -/* DB8260 80240950 0200202D */ daddu $a0, $s0, $zero -/* DB8264 80240954 00431024 */ and $v0, $v0, $v1 -/* DB8268 80240958 00021140 */ sll $v0, $v0, 5 -/* DB826C 8024095C 3C068008 */ lui $a2, %hi(gItemTable) -/* DB8270 80240960 00C23021 */ addu $a2, $a2, $v0 -/* DB8274 80240964 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* DB8278 80240968 0C0B2026 */ jal set_variable -/* DB827C 8024096C 0220282D */ daddu $a1, $s1, $zero -/* DB8280 80240970 8FBF0018 */ lw $ra, 0x18($sp) -/* DB8284 80240974 8FB10014 */ lw $s1, 0x14($sp) -/* DB8288 80240978 8FB00010 */ lw $s0, 0x10($sp) -/* DB828C 8024097C 24020002 */ addiu $v0, $zero, 2 -/* DB8290 80240980 03E00008 */ jr $ra -/* DB8294 80240984 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80240070_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80240070_DBD2B0.s deleted file mode 100644 index 3b73233f56..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80240070_DBD2B0.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_DBD320 -/* DBD320 80240070 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DBD324 80240074 AFB20028 */ sw $s2, 0x28($sp) -/* DBD328 80240078 0080902D */ daddu $s2, $a0, $zero -/* DBD32C 8024007C AFBF002C */ sw $ra, 0x2c($sp) -/* DBD330 80240080 AFB10024 */ sw $s1, 0x24($sp) -/* DBD334 80240084 AFB00020 */ sw $s0, 0x20($sp) -/* DBD338 80240088 8E510148 */ lw $s1, 0x148($s2) -/* DBD33C 8024008C 0C00EABB */ jal get_npc_unsafe -/* DBD340 80240090 86240008 */ lh $a0, 8($s1) -/* DBD344 80240094 0040802D */ daddu $s0, $v0, $zero -/* DBD348 80240098 0200202D */ daddu $a0, $s0, $zero -/* DBD34C 8024009C C600000C */ lwc1 $f0, 0xc($s0) -/* DBD350 802400A0 27A60018 */ addiu $a2, $sp, 0x18 -/* DBD354 802400A4 E7A00018 */ swc1 $f0, 0x18($sp) -/* DBD358 802400A8 AFA00010 */ sw $zero, 0x10($sp) -/* DBD35C 802400AC AFA00014 */ sw $zero, 0x14($sp) -/* DBD360 802400B0 8E050018 */ lw $a1, 0x18($s0) -/* DBD364 802400B4 0C0129E1 */ jal func_8004A784 -/* DBD368 802400B8 0000382D */ daddu $a3, $zero, $zero -/* DBD36C 802400BC 14400005 */ bnez $v0, .L802400D4 -/* DBD370 802400C0 00000000 */ nop -/* DBD374 802400C4 8E050018 */ lw $a1, 0x18($s0) -/* DBD378 802400C8 8E06000C */ lw $a2, 0xc($s0) -/* DBD37C 802400CC 0C00EA95 */ jal npc_move_heading -/* DBD380 802400D0 0200202D */ daddu $a0, $s0, $zero -.L802400D4: -/* DBD384 802400D4 9602008E */ lhu $v0, 0x8e($s0) -/* DBD388 802400D8 2442FFFF */ addiu $v0, $v0, -1 -/* DBD38C 802400DC A602008E */ sh $v0, 0x8e($s0) -/* DBD390 802400E0 00021400 */ sll $v0, $v0, 0x10 -/* DBD394 802400E4 14400010 */ bnez $v0, .L80240128 -/* DBD398 802400E8 00000000 */ nop -/* DBD39C 802400EC C6000018 */ lwc1 $f0, 0x18($s0) -/* DBD3A0 802400F0 3C018024 */ lui $at, 0x8024 -/* DBD3A4 802400F4 D4226BD8 */ ldc1 $f2, 0x6bd8($at) -/* DBD3A8 802400F8 46000021 */ cvt.d.s $f0, $f0 -/* DBD3AC 802400FC 46220002 */ mul.d $f0, $f0, $f2 -/* DBD3B0 80240100 00000000 */ nop -/* DBD3B4 80240104 46200020 */ cvt.s.d $f0, $f0 -/* DBD3B8 80240108 E6000018 */ swc1 $f0, 0x18($s0) -/* DBD3BC 8024010C 8E2200CC */ lw $v0, 0xcc($s1) -/* DBD3C0 80240110 8C43002C */ lw $v1, 0x2c($v0) -/* DBD3C4 80240114 2402000A */ addiu $v0, $zero, 0xa -/* DBD3C8 80240118 A602008E */ sh $v0, 0x8e($s0) -/* DBD3CC 8024011C 24020010 */ addiu $v0, $zero, 0x10 -/* DBD3D0 80240120 AE030028 */ sw $v1, 0x28($s0) -/* DBD3D4 80240124 AE420070 */ sw $v0, 0x70($s2) -.L80240128: -/* DBD3D8 80240128 8FBF002C */ lw $ra, 0x2c($sp) -/* DBD3DC 8024012C 8FB20028 */ lw $s2, 0x28($sp) -/* DBD3E0 80240130 8FB10024 */ lw $s1, 0x24($sp) -/* DBD3E4 80240134 8FB00020 */ lw $s0, 0x20($sp) -/* DBD3E8 80240138 03E00008 */ jr $ra -/* DBD3EC 8024013C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80240140_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80240140_DBD2B0.s deleted file mode 100644 index 3f1ed7e10b..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80240140_DBD2B0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240140_DBD3F0 -/* DBD3F0 80240140 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DBD3F4 80240144 AFB10024 */ sw $s1, 0x24($sp) -/* DBD3F8 80240148 0080882D */ daddu $s1, $a0, $zero -/* DBD3FC 8024014C AFBF0028 */ sw $ra, 0x28($sp) -/* DBD400 80240150 AFB00020 */ sw $s0, 0x20($sp) -/* DBD404 80240154 8E220148 */ lw $v0, 0x148($s1) -/* DBD408 80240158 0C00EABB */ jal get_npc_unsafe -/* DBD40C 8024015C 84440008 */ lh $a0, 8($v0) -/* DBD410 80240160 0040802D */ daddu $s0, $v0, $zero -/* DBD414 80240164 0200202D */ daddu $a0, $s0, $zero -/* DBD418 80240168 C600000C */ lwc1 $f0, 0xc($s0) -/* DBD41C 8024016C 27A60018 */ addiu $a2, $sp, 0x18 -/* DBD420 80240170 E7A00018 */ swc1 $f0, 0x18($sp) -/* DBD424 80240174 AFA00010 */ sw $zero, 0x10($sp) -/* DBD428 80240178 AFA00014 */ sw $zero, 0x14($sp) -/* DBD42C 8024017C 8E050018 */ lw $a1, 0x18($s0) -/* DBD430 80240180 0C0129E1 */ jal func_8004A784 -/* DBD434 80240184 0000382D */ daddu $a3, $zero, $zero -/* DBD438 80240188 14400005 */ bnez $v0, .L802401A0 -/* DBD43C 8024018C 00000000 */ nop -/* DBD440 80240190 8E050018 */ lw $a1, 0x18($s0) -/* DBD444 80240194 8E06000C */ lw $a2, 0xc($s0) -/* DBD448 80240198 0C00EA95 */ jal npc_move_heading -/* DBD44C 8024019C 0200202D */ daddu $a0, $s0, $zero -.L802401A0: -/* DBD450 802401A0 9602008E */ lhu $v0, 0x8e($s0) -/* DBD454 802401A4 2442FFFF */ addiu $v0, $v0, -1 -/* DBD458 802401A8 A602008E */ sh $v0, 0x8e($s0) -/* DBD45C 802401AC 00021400 */ sll $v0, $v0, 0x10 -/* DBD460 802401B0 14400004 */ bnez $v0, .L802401C4 -/* DBD464 802401B4 2402001E */ addiu $v0, $zero, 0x1e -/* DBD468 802401B8 A602008E */ sh $v0, 0x8e($s0) -/* DBD46C 802401BC 24020011 */ addiu $v0, $zero, 0x11 -/* DBD470 802401C0 AE220070 */ sw $v0, 0x70($s1) -.L802401C4: -/* DBD474 802401C4 8FBF0028 */ lw $ra, 0x28($sp) -/* DBD478 802401C8 8FB10024 */ lw $s1, 0x24($sp) -/* DBD47C 802401CC 8FB00020 */ lw $s0, 0x20($sp) -/* DBD480 802401D0 03E00008 */ jr $ra -/* DBD484 802401D4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_802401D8_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_802401D8_DBD2B0.s deleted file mode 100644 index 01e7c6a7c9..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_802401D8_DBD2B0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D8_DBD488 -/* DBD488 802401D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBD48C 802401DC AFB10014 */ sw $s1, 0x14($sp) -/* DBD490 802401E0 0080882D */ daddu $s1, $a0, $zero -/* DBD494 802401E4 AFBF0018 */ sw $ra, 0x18($sp) -/* DBD498 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* DBD49C 802401EC 8E300148 */ lw $s0, 0x148($s1) -/* DBD4A0 802401F0 0C00EABB */ jal get_npc_unsafe -/* DBD4A4 802401F4 86040008 */ lh $a0, 8($s0) -/* DBD4A8 802401F8 0040182D */ daddu $v1, $v0, $zero -/* DBD4AC 802401FC 9462008E */ lhu $v0, 0x8e($v1) -/* DBD4B0 80240200 2442FFFF */ addiu $v0, $v0, -1 -/* DBD4B4 80240204 A462008E */ sh $v0, 0x8e($v1) -/* DBD4B8 80240208 00021400 */ sll $v0, $v0, 0x10 -/* DBD4BC 8024020C 14400005 */ bnez $v0, .L80240224 -/* DBD4C0 80240210 00000000 */ nop -/* DBD4C4 80240214 8E0200CC */ lw $v0, 0xcc($s0) -/* DBD4C8 80240218 8C420000 */ lw $v0, ($v0) -/* DBD4CC 8024021C AC620028 */ sw $v0, 0x28($v1) -/* DBD4D0 80240220 AE200070 */ sw $zero, 0x70($s1) -.L80240224: -/* DBD4D4 80240224 8FBF0018 */ lw $ra, 0x18($sp) -/* DBD4D8 80240228 8FB10014 */ lw $s1, 0x14($sp) -/* DBD4DC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* DBD4E0 80240230 03E00008 */ jr $ra -/* DBD4E4 80240234 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80240238_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80240238_DBD2B0.s deleted file mode 100644 index a5021c4f6e..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80240238_DBD2B0.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240238_DBD4E8 -/* DBD4E8 80240238 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DBD4EC 8024023C AFB30054 */ sw $s3, 0x54($sp) -/* DBD4F0 80240240 0080982D */ daddu $s3, $a0, $zero -/* DBD4F4 80240244 AFBF0060 */ sw $ra, 0x60($sp) -/* DBD4F8 80240248 AFB5005C */ sw $s5, 0x5c($sp) -/* DBD4FC 8024024C AFB40058 */ sw $s4, 0x58($sp) -/* DBD500 80240250 AFB20050 */ sw $s2, 0x50($sp) -/* DBD504 80240254 AFB1004C */ sw $s1, 0x4c($sp) -/* DBD508 80240258 AFB00048 */ sw $s0, 0x48($sp) -/* DBD50C 8024025C 8E710148 */ lw $s1, 0x148($s3) -/* DBD510 80240260 86240008 */ lh $a0, 8($s1) -/* DBD514 80240264 0C00EABB */ jal get_npc_unsafe -/* DBD518 80240268 00A0802D */ daddu $s0, $a1, $zero -/* DBD51C 8024026C 8E63000C */ lw $v1, 0xc($s3) -/* DBD520 80240270 0260202D */ daddu $a0, $s3, $zero -/* DBD524 80240274 8C650000 */ lw $a1, ($v1) -/* DBD528 80240278 0C0B1EAF */ jal get_variable -/* DBD52C 8024027C 0040902D */ daddu $s2, $v0, $zero -/* DBD530 80240280 AFA00018 */ sw $zero, 0x18($sp) -/* DBD534 80240284 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBD538 80240288 8C630030 */ lw $v1, 0x30($v1) -/* DBD53C 8024028C AFA3001C */ sw $v1, 0x1c($sp) -/* DBD540 80240290 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBD544 80240294 8C63001C */ lw $v1, 0x1c($v1) -/* DBD548 80240298 AFA30020 */ sw $v1, 0x20($sp) -/* DBD54C 8024029C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBD550 802402A0 8C630024 */ lw $v1, 0x24($v1) -/* DBD554 802402A4 AFA30024 */ sw $v1, 0x24($sp) -/* DBD558 802402A8 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBD55C 802402AC 8C630028 */ lw $v1, 0x28($v1) -/* DBD560 802402B0 27B50018 */ addiu $s5, $sp, 0x18 -/* DBD564 802402B4 AFA30028 */ sw $v1, 0x28($sp) -/* DBD568 802402B8 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBD56C 802402BC 3C014282 */ lui $at, 0x4282 -/* DBD570 802402C0 44810000 */ mtc1 $at, $f0 -/* DBD574 802402C4 8C63002C */ lw $v1, 0x2c($v1) -/* DBD578 802402C8 0040A02D */ daddu $s4, $v0, $zero -/* DBD57C 802402CC E7A00030 */ swc1 $f0, 0x30($sp) -/* DBD580 802402D0 A7A00034 */ sh $zero, 0x34($sp) -/* DBD584 802402D4 16000005 */ bnez $s0, .L802402EC -/* DBD588 802402D8 AFA3002C */ sw $v1, 0x2c($sp) -/* DBD58C 802402DC 8E2200B0 */ lw $v0, 0xb0($s1) -/* DBD590 802402E0 30420004 */ andi $v0, $v0, 4 -/* DBD594 802402E4 10400044 */ beqz $v0, .L802403F8 -/* DBD598 802402E8 00000000 */ nop -.L802402EC: -/* DBD59C 802402EC 2404F7FF */ addiu $a0, $zero, -0x801 -/* DBD5A0 802402F0 AE600070 */ sw $zero, 0x70($s3) -/* DBD5A4 802402F4 A640008E */ sh $zero, 0x8e($s2) -/* DBD5A8 802402F8 8E2200CC */ lw $v0, 0xcc($s1) -/* DBD5AC 802402FC 8E430000 */ lw $v1, ($s2) -/* DBD5B0 80240300 8C420000 */ lw $v0, ($v0) -/* DBD5B4 80240304 00641824 */ and $v1, $v1, $a0 -/* DBD5B8 80240308 AE430000 */ sw $v1, ($s2) -/* DBD5BC 8024030C AE420028 */ sw $v0, 0x28($s2) -/* DBD5C0 80240310 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBD5C4 80240314 8C420034 */ lw $v0, 0x34($v0) -/* DBD5C8 80240318 54400005 */ bnel $v0, $zero, .L80240330 -/* DBD5CC 8024031C 2402FDFF */ addiu $v0, $zero, -0x201 -/* DBD5D0 80240320 34620200 */ ori $v0, $v1, 0x200 -/* DBD5D4 80240324 2403FFF7 */ addiu $v1, $zero, -9 -/* DBD5D8 80240328 080900CE */ j .L80240338 -/* DBD5DC 8024032C 00431024 */ and $v0, $v0, $v1 -.L80240330: -/* DBD5E0 80240330 00621024 */ and $v0, $v1, $v0 -/* DBD5E4 80240334 34420008 */ ori $v0, $v0, 8 -.L80240338: -/* DBD5E8 80240338 AE420000 */ sw $v0, ($s2) -/* DBD5EC 8024033C 8E2200B0 */ lw $v0, 0xb0($s1) -/* DBD5F0 80240340 30420004 */ andi $v0, $v0, 4 -/* DBD5F4 80240344 10400004 */ beqz $v0, .L80240358 -/* DBD5F8 80240348 24020063 */ addiu $v0, $zero, 0x63 -/* DBD5FC 8024034C AE620070 */ sw $v0, 0x70($s3) -/* DBD600 80240350 080900DC */ j .L80240370 -/* DBD604 80240354 AE600074 */ sw $zero, 0x74($s3) -.L80240358: -/* DBD608 80240358 8E220000 */ lw $v0, ($s1) -/* DBD60C 8024035C 3C034000 */ lui $v1, 0x4000 -/* DBD610 80240360 00431024 */ and $v0, $v0, $v1 -/* DBD614 80240364 10400002 */ beqz $v0, .L80240370 -/* DBD618 80240368 2402000C */ addiu $v0, $zero, 0xc -/* DBD61C 8024036C AE620070 */ sw $v0, 0x70($s3) -.L80240370: -/* DBD620 80240370 3C06BFFF */ lui $a2, 0xbfff -/* DBD624 80240374 34C6FFFF */ ori $a2, $a2, 0xffff -/* DBD628 80240378 27A50038 */ addiu $a1, $sp, 0x38 -/* DBD62C 8024037C 2404FFFB */ addiu $a0, $zero, -5 -/* DBD630 80240380 8E2200B0 */ lw $v0, 0xb0($s1) -/* DBD634 80240384 8E230000 */ lw $v1, ($s1) -/* DBD638 80240388 3C0142C8 */ lui $at, 0x42c8 -/* DBD63C 8024038C 44810000 */ mtc1 $at, $f0 -/* DBD640 80240390 00441024 */ and $v0, $v0, $a0 -/* DBD644 80240394 00661824 */ and $v1, $v1, $a2 -/* DBD648 80240398 AE2200B0 */ sw $v0, 0xb0($s1) -/* DBD64C 8024039C AE230000 */ sw $v1, ($s1) -/* DBD650 802403A0 864200A8 */ lh $v0, 0xa8($s2) -/* DBD654 802403A4 27A70040 */ addiu $a3, $sp, 0x40 -/* DBD658 802403A8 E7A00044 */ swc1 $f0, 0x44($sp) -/* DBD65C 802403AC C6460038 */ lwc1 $f6, 0x38($s2) -/* DBD660 802403B0 C640003C */ lwc1 $f0, 0x3c($s2) -/* DBD664 802403B4 C6420040 */ lwc1 $f2, 0x40($s2) -/* DBD668 802403B8 44822000 */ mtc1 $v0, $f4 -/* DBD66C 802403BC 00000000 */ nop -/* DBD670 802403C0 46802120 */ cvt.s.w $f4, $f4 -/* DBD674 802403C4 27A20044 */ addiu $v0, $sp, 0x44 -/* DBD678 802403C8 46040000 */ add.s $f0, $f0, $f4 -/* DBD67C 802403CC E7A60038 */ swc1 $f6, 0x38($sp) -/* DBD680 802403D0 E7A20040 */ swc1 $f2, 0x40($sp) -/* DBD684 802403D4 E7A0003C */ swc1 $f0, 0x3c($sp) -/* DBD688 802403D8 AFA20010 */ sw $v0, 0x10($sp) -/* DBD68C 802403DC 8E440080 */ lw $a0, 0x80($s2) -/* DBD690 802403E0 0C0372DF */ jal func_800DCB7C -/* DBD694 802403E4 27A6003C */ addiu $a2, $sp, 0x3c -/* DBD698 802403E8 10400003 */ beqz $v0, .L802403F8 -/* DBD69C 802403EC 00000000 */ nop -/* DBD6A0 802403F0 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DBD6A4 802403F4 E640003C */ swc1 $f0, 0x3c($s2) -.L802403F8: -/* DBD6A8 802403F8 8E630070 */ lw $v1, 0x70($s3) -/* DBD6AC 802403FC 2C620064 */ sltiu $v0, $v1, 0x64 -/* DBD6B0 80240400 10400050 */ beqz $v0, .L80240544 -/* DBD6B4 80240404 00031080 */ sll $v0, $v1, 2 -/* DBD6B8 80240408 3C018024 */ lui $at, 0x8024 -/* DBD6BC 8024040C 00220821 */ addu $at, $at, $v0 -/* DBD6C0 80240410 8C226BE0 */ lw $v0, 0x6be0($at) -/* DBD6C4 80240414 00400008 */ jr $v0 -/* DBD6C8 80240418 00000000 */ nop -/* DBD6CC 8024041C 0260202D */ daddu $a0, $s3, $zero -/* DBD6D0 80240420 0280282D */ daddu $a1, $s4, $zero -/* DBD6D4 80240424 0C012568 */ jal func_800495A0 -/* DBD6D8 80240428 02A0302D */ daddu $a2, $s5, $zero -/* DBD6DC 8024042C 0260202D */ daddu $a0, $s3, $zero -/* DBD6E0 80240430 0280282D */ daddu $a1, $s4, $zero -/* DBD6E4 80240434 0C0125AE */ jal func_800496B8 -/* DBD6E8 80240438 02A0302D */ daddu $a2, $s5, $zero -/* DBD6EC 8024043C 08090151 */ j .L80240544 -/* DBD6F0 80240440 00000000 */ nop -/* DBD6F4 80240444 0260202D */ daddu $a0, $s3, $zero -/* DBD6F8 80240448 0280282D */ daddu $a1, $s4, $zero -/* DBD6FC 8024044C 0C0126D1 */ jal func_80049B44 -/* DBD700 80240450 02A0302D */ daddu $a2, $s5, $zero -/* DBD704 80240454 0260202D */ daddu $a0, $s3, $zero -/* DBD708 80240458 0280282D */ daddu $a1, $s4, $zero -/* DBD70C 8024045C 0C012701 */ jal func_80049C04 -/* DBD710 80240460 02A0302D */ daddu $a2, $s5, $zero -/* DBD714 80240464 08090151 */ j .L80240544 -/* DBD718 80240468 00000000 */ nop -/* DBD71C 8024046C 0260202D */ daddu $a0, $s3, $zero -/* DBD720 80240470 0280282D */ daddu $a1, $s4, $zero -/* DBD724 80240474 0C01278F */ jal func_80049E3C -/* DBD728 80240478 02A0302D */ daddu $a2, $s5, $zero -/* DBD72C 8024047C 0260202D */ daddu $a0, $s3, $zero -/* DBD730 80240480 0280282D */ daddu $a1, $s4, $zero -/* DBD734 80240484 0C0127B3 */ jal func_80049ECC -/* DBD738 80240488 02A0302D */ daddu $a2, $s5, $zero -/* DBD73C 8024048C 08090151 */ j .L80240544 -/* DBD740 80240490 00000000 */ nop -/* DBD744 80240494 0260202D */ daddu $a0, $s3, $zero -/* DBD748 80240498 0280282D */ daddu $a1, $s4, $zero -/* DBD74C 8024049C 0C0127DF */ jal func_80049F7C -/* DBD750 802404A0 02A0302D */ daddu $a2, $s5, $zero -/* DBD754 802404A4 0260202D */ daddu $a0, $s3, $zero -/* DBD758 802404A8 0280282D */ daddu $a1, $s4, $zero -/* DBD75C 802404AC 0C012849 */ jal func_8004A124 -/* DBD760 802404B0 02A0302D */ daddu $a2, $s5, $zero -/* DBD764 802404B4 8E630070 */ lw $v1, 0x70($s3) -/* DBD768 802404B8 2402000E */ addiu $v0, $zero, 0xe -/* DBD76C 802404BC 14620021 */ bne $v1, $v0, .L80240544 -/* DBD770 802404C0 00000000 */ nop -/* DBD774 802404C4 0260202D */ daddu $a0, $s3, $zero -/* DBD778 802404C8 0280282D */ daddu $a1, $s4, $zero -/* DBD77C 802404CC 0C090000 */ jal func_80240000 -/* DBD780 802404D0 02A0302D */ daddu $a2, $s5, $zero -/* DBD784 802404D4 8E630070 */ lw $v1, 0x70($s3) -/* DBD788 802404D8 2402000F */ addiu $v0, $zero, 0xf -/* DBD78C 802404DC 14620019 */ bne $v1, $v0, .L80240544 -/* DBD790 802404E0 00000000 */ nop -/* DBD794 802404E4 0260202D */ daddu $a0, $s3, $zero -/* DBD798 802404E8 0280282D */ daddu $a1, $s4, $zero -/* DBD79C 802404EC 0C09001C */ jal func_80240070 -/* DBD7A0 802404F0 02A0302D */ daddu $a2, $s5, $zero -/* DBD7A4 802404F4 8E630070 */ lw $v1, 0x70($s3) -/* DBD7A8 802404F8 24020010 */ addiu $v0, $zero, 0x10 -/* DBD7AC 802404FC 14620011 */ bne $v1, $v0, .L80240544 -/* DBD7B0 80240500 00000000 */ nop -/* DBD7B4 80240504 0260202D */ daddu $a0, $s3, $zero -/* DBD7B8 80240508 0280282D */ daddu $a1, $s4, $zero -/* DBD7BC 8024050C 0C090050 */ jal func_80240140 -/* DBD7C0 80240510 02A0302D */ daddu $a2, $s5, $zero -/* DBD7C4 80240514 8E630070 */ lw $v1, 0x70($s3) -/* DBD7C8 80240518 24020011 */ addiu $v0, $zero, 0x11 -/* DBD7CC 8024051C 14620009 */ bne $v1, $v0, .L80240544 -/* DBD7D0 80240520 00000000 */ nop -/* DBD7D4 80240524 0260202D */ daddu $a0, $s3, $zero -/* DBD7D8 80240528 0280282D */ daddu $a1, $s4, $zero -/* DBD7DC 8024052C 0C090076 */ jal func_802401D8 -/* DBD7E0 80240530 02A0302D */ daddu $a2, $s5, $zero -/* DBD7E4 80240534 08090151 */ j .L80240544 -/* DBD7E8 80240538 00000000 */ nop -/* DBD7EC 8024053C 0C0129CF */ jal func_8004A73C -/* DBD7F0 80240540 0260202D */ daddu $a0, $s3, $zero -.L80240544: -/* DBD7F4 80240544 8FBF0060 */ lw $ra, 0x60($sp) -/* DBD7F8 80240548 8FB5005C */ lw $s5, 0x5c($sp) -/* DBD7FC 8024054C 8FB40058 */ lw $s4, 0x58($sp) -/* DBD800 80240550 8FB30054 */ lw $s3, 0x54($sp) -/* DBD804 80240554 8FB20050 */ lw $s2, 0x50($sp) -/* DBD808 80240558 8FB1004C */ lw $s1, 0x4c($sp) -/* DBD80C 8024055C 8FB00048 */ lw $s0, 0x48($sp) -/* DBD810 80240560 0000102D */ daddu $v0, $zero, $zero -/* DBD814 80240564 03E00008 */ jr $ra -/* DBD818 80240568 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_8024056C_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_8024056C_DBD2B0.s deleted file mode 100644 index a484db9067..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_8024056C_DBD2B0.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024056C_DBD81C -/* DBD81C 8024056C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DBD820 80240570 AFB50024 */ sw $s5, 0x24($sp) -/* DBD824 80240574 0080A82D */ daddu $s5, $a0, $zero -/* DBD828 80240578 AFBF002C */ sw $ra, 0x2c($sp) -/* DBD82C 8024057C AFB60028 */ sw $s6, 0x28($sp) -/* DBD830 80240580 AFB40020 */ sw $s4, 0x20($sp) -/* DBD834 80240584 AFB3001C */ sw $s3, 0x1c($sp) -/* DBD838 80240588 AFB20018 */ sw $s2, 0x18($sp) -/* DBD83C 8024058C AFB10014 */ sw $s1, 0x14($sp) -/* DBD840 80240590 AFB00010 */ sw $s0, 0x10($sp) -/* DBD844 80240594 F7B80040 */ sdc1 $f24, 0x40($sp) -/* DBD848 80240598 F7B60038 */ sdc1 $f22, 0x38($sp) -/* DBD84C 8024059C F7B40030 */ sdc1 $f20, 0x30($sp) -/* DBD850 802405A0 8EB30148 */ lw $s3, 0x148($s5) -/* DBD854 802405A4 86640008 */ lh $a0, 8($s3) -/* DBD858 802405A8 0C00EABB */ jal get_npc_unsafe -/* DBD85C 802405AC 00A0B02D */ daddu $s6, $a1, $zero -/* DBD860 802405B0 0040A02D */ daddu $s4, $v0, $zero -/* DBD864 802405B4 AEA00074 */ sw $zero, 0x74($s5) -/* DBD868 802405B8 C6980038 */ lwc1 $f24, 0x38($s4) -/* DBD86C 802405BC C6960040 */ lwc1 $f22, 0x40($s4) -/* DBD870 802405C0 0000902D */ daddu $s2, $zero, $zero -/* DBD874 802405C4 AEA00078 */ sw $zero, 0x78($s5) -/* DBD878 802405C8 8E6300D0 */ lw $v1, 0xd0($s3) -/* DBD87C 802405CC 8C620000 */ lw $v0, ($v1) -/* DBD880 802405D0 3C0146FF */ lui $at, 0x46ff -/* DBD884 802405D4 3421FE00 */ ori $at, $at, 0xfe00 -/* DBD888 802405D8 4481A000 */ mtc1 $at, $f20 -/* DBD88C 802405DC 18400018 */ blez $v0, .L80240640 -/* DBD890 802405E0 0240802D */ daddu $s0, $s2, $zero -/* DBD894 802405E4 0240882D */ daddu $s1, $s2, $zero -.L802405E8: -/* DBD898 802405E8 02231021 */ addu $v0, $s1, $v1 -/* DBD89C 802405EC 4600C306 */ mov.s $f12, $f24 -/* DBD8A0 802405F0 C4440004 */ lwc1 $f4, 4($v0) -/* DBD8A4 802405F4 46802120 */ cvt.s.w $f4, $f4 -/* DBD8A8 802405F8 44062000 */ mfc1 $a2, $f4 -/* DBD8AC 802405FC C444000C */ lwc1 $f4, 0xc($v0) -/* DBD8B0 80240600 46802120 */ cvt.s.w $f4, $f4 -/* DBD8B4 80240604 44072000 */ mfc1 $a3, $f4 -/* DBD8B8 80240608 0C00A7B5 */ jal dist2D -/* DBD8BC 8024060C 4600B386 */ mov.s $f14, $f22 -/* DBD8C0 80240610 4614003C */ c.lt.s $f0, $f20 -/* DBD8C4 80240614 00000000 */ nop -/* DBD8C8 80240618 45000003 */ bc1f .L80240628 -/* DBD8CC 8024061C 2631000C */ addiu $s1, $s1, 0xc -/* DBD8D0 80240620 46000506 */ mov.s $f20, $f0 -/* DBD8D4 80240624 AEB20078 */ sw $s2, 0x78($s5) -.L80240628: -/* DBD8D8 80240628 8E6300D0 */ lw $v1, 0xd0($s3) -/* DBD8DC 8024062C 26100001 */ addiu $s0, $s0, 1 -/* DBD8E0 80240630 8C620000 */ lw $v0, ($v1) -/* DBD8E4 80240634 0202102A */ slt $v0, $s0, $v0 -/* DBD8E8 80240638 1440FFEB */ bnez $v0, .L802405E8 -/* DBD8EC 8024063C 26520001 */ addiu $s2, $s2, 1 -.L80240640: -/* DBD8F0 80240640 8E6200CC */ lw $v0, 0xcc($s3) -/* DBD8F4 80240644 8C420004 */ lw $v0, 4($v0) -/* DBD8F8 80240648 AE820028 */ sw $v0, 0x28($s4) -/* DBD8FC 8024064C 8E6200D0 */ lw $v0, 0xd0($s3) -/* DBD900 80240650 8C42007C */ lw $v0, 0x7c($v0) -/* DBD904 80240654 04410004 */ bgez $v0, .L80240668 -/* DBD908 80240658 00000000 */ nop -/* DBD90C 8024065C C6C00000 */ lwc1 $f0, ($s6) -/* DBD910 80240660 080901A2 */ j .L80240688 -/* DBD914 80240664 E6800018 */ swc1 $f0, 0x18($s4) -.L80240668: -/* DBD918 80240668 3C018024 */ lui $at, 0x8024 -/* DBD91C 8024066C D4226D70 */ ldc1 $f2, 0x6d70($at) -/* DBD920 80240670 44820000 */ mtc1 $v0, $f0 -/* DBD924 80240674 00000000 */ nop -/* DBD928 80240678 46800021 */ cvt.d.w $f0, $f0 -/* DBD92C 8024067C 46220003 */ div.d $f0, $f0, $f2 -/* DBD930 80240680 46200020 */ cvt.s.d $f0, $f0 -/* DBD934 80240684 E6800018 */ swc1 $f0, 0x18($s4) -.L80240688: -/* DBD938 80240688 24020001 */ addiu $v0, $zero, 1 -/* DBD93C 8024068C AEA20070 */ sw $v0, 0x70($s5) -/* DBD940 80240690 8FBF002C */ lw $ra, 0x2c($sp) -/* DBD944 80240694 8FB60028 */ lw $s6, 0x28($sp) -/* DBD948 80240698 8FB50024 */ lw $s5, 0x24($sp) -/* DBD94C 8024069C 8FB40020 */ lw $s4, 0x20($sp) -/* DBD950 802406A0 8FB3001C */ lw $s3, 0x1c($sp) -/* DBD954 802406A4 8FB20018 */ lw $s2, 0x18($sp) -/* DBD958 802406A8 8FB10014 */ lw $s1, 0x14($sp) -/* DBD95C 802406AC 8FB00010 */ lw $s0, 0x10($sp) -/* DBD960 802406B0 D7B80040 */ ldc1 $f24, 0x40($sp) -/* DBD964 802406B4 D7B60038 */ ldc1 $f22, 0x38($sp) -/* DBD968 802406B8 D7B40030 */ ldc1 $f20, 0x30($sp) -/* DBD96C 802406BC 03E00008 */ jr $ra -/* DBD970 802406C0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_802406C4_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_802406C4_DBD2B0.s deleted file mode 100644 index e9a963d341..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_802406C4_DBD2B0.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406C4_DBD974 -/* DBD974 802406C4 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* DBD978 802406C8 AFB20038 */ sw $s2, 0x38($sp) -/* DBD97C 802406CC 0080902D */ daddu $s2, $a0, $zero -/* DBD980 802406D0 AFBF0044 */ sw $ra, 0x44($sp) -/* DBD984 802406D4 AFB40040 */ sw $s4, 0x40($sp) -/* DBD988 802406D8 AFB3003C */ sw $s3, 0x3c($sp) -/* DBD98C 802406DC AFB10034 */ sw $s1, 0x34($sp) -/* DBD990 802406E0 AFB00030 */ sw $s0, 0x30($sp) -/* DBD994 802406E4 F7B60050 */ sdc1 $f22, 0x50($sp) -/* DBD998 802406E8 F7B40048 */ sdc1 $f20, 0x48($sp) -/* DBD99C 802406EC 8E510148 */ lw $s1, 0x148($s2) -/* DBD9A0 802406F0 00A0982D */ daddu $s3, $a1, $zero -/* DBD9A4 802406F4 86240008 */ lh $a0, 8($s1) -/* DBD9A8 802406F8 0C00EABB */ jal get_npc_unsafe -/* DBD9AC 802406FC 00C0A02D */ daddu $s4, $a2, $zero -/* DBD9B0 80240700 8E630014 */ lw $v1, 0x14($s3) -/* DBD9B4 80240704 04600030 */ bltz $v1, .L802407C8 -/* DBD9B8 80240708 0040802D */ daddu $s0, $v0, $zero -/* DBD9BC 8024070C 8E420074 */ lw $v0, 0x74($s2) -/* DBD9C0 80240710 1C40002C */ bgtz $v0, .L802407C4 -/* DBD9C4 80240714 2442FFFF */ addiu $v0, $v0, -1 -/* DBD9C8 80240718 0280202D */ daddu $a0, $s4, $zero -/* DBD9CC 8024071C AE430074 */ sw $v1, 0x74($s2) -/* DBD9D0 80240720 AFA00010 */ sw $zero, 0x10($sp) -/* DBD9D4 80240724 8E66000C */ lw $a2, 0xc($s3) -/* DBD9D8 80240728 8E670010 */ lw $a3, 0x10($s3) -/* DBD9DC 8024072C 0C01242D */ jal func_800490B4 -/* DBD9E0 80240730 0220282D */ daddu $a1, $s1, $zero -/* DBD9E4 80240734 10400021 */ beqz $v0, .L802407BC -/* DBD9E8 80240738 0000202D */ daddu $a0, $zero, $zero -/* DBD9EC 8024073C 0200282D */ daddu $a1, $s0, $zero -/* DBD9F0 80240740 0000302D */ daddu $a2, $zero, $zero -/* DBD9F4 80240744 860300A8 */ lh $v1, 0xa8($s0) -/* DBD9F8 80240748 3C013F80 */ lui $at, 0x3f80 -/* DBD9FC 8024074C 44810000 */ mtc1 $at, $f0 -/* DBDA00 80240750 3C014000 */ lui $at, 0x4000 -/* DBDA04 80240754 44811000 */ mtc1 $at, $f2 -/* DBDA08 80240758 3C01C1A0 */ lui $at, 0xc1a0 -/* DBDA0C 8024075C 44812000 */ mtc1 $at, $f4 -/* DBDA10 80240760 2402000F */ addiu $v0, $zero, 0xf -/* DBDA14 80240764 AFA2001C */ sw $v0, 0x1c($sp) -/* DBDA18 80240768 44833000 */ mtc1 $v1, $f6 -/* DBDA1C 8024076C 00000000 */ nop -/* DBDA20 80240770 468031A0 */ cvt.s.w $f6, $f6 -/* DBDA24 80240774 44073000 */ mfc1 $a3, $f6 -/* DBDA28 80240778 27A20028 */ addiu $v0, $sp, 0x28 -/* DBDA2C 8024077C AFA20020 */ sw $v0, 0x20($sp) -/* DBDA30 80240780 E7A00010 */ swc1 $f0, 0x10($sp) -/* DBDA34 80240784 E7A20014 */ swc1 $f2, 0x14($sp) -/* DBDA38 80240788 0C01BFA4 */ jal fx_emote -/* DBDA3C 8024078C E7A40018 */ swc1 $f4, 0x18($sp) -/* DBDA40 80240790 0200202D */ daddu $a0, $s0, $zero -/* DBDA44 80240794 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DBDA48 80240798 0C012530 */ jal func_800494C0 -/* DBDA4C 8024079C 3C060020 */ lui $a2, 0x20 -/* DBDA50 802407A0 8E220018 */ lw $v0, 0x18($s1) -/* DBDA54 802407A4 9442002A */ lhu $v0, 0x2a($v0) -/* DBDA58 802407A8 30420001 */ andi $v0, $v0, 1 -/* DBDA5C 802407AC 14400064 */ bnez $v0, .L80240940 -/* DBDA60 802407B0 2402000A */ addiu $v0, $zero, 0xa -/* DBDA64 802407B4 08090250 */ j .L80240940 -/* DBDA68 802407B8 2402000C */ addiu $v0, $zero, 0xc -.L802407BC: -/* DBDA6C 802407BC 8E420074 */ lw $v0, 0x74($s2) -/* DBDA70 802407C0 2442FFFF */ addiu $v0, $v0, -1 -.L802407C4: -/* DBDA74 802407C4 AE420074 */ sw $v0, 0x74($s2) -.L802407C8: -/* DBDA78 802407C8 8602008C */ lh $v0, 0x8c($s0) -/* DBDA7C 802407CC 1440005D */ bnez $v0, .L80240944 -/* DBDA80 802407D0 00000000 */ nop -/* DBDA84 802407D4 C6000018 */ lwc1 $f0, 0x18($s0) -/* DBDA88 802407D8 3C014010 */ lui $at, 0x4010 -/* DBDA8C 802407DC 44811800 */ mtc1 $at, $f3 -/* DBDA90 802407E0 44801000 */ mtc1 $zero, $f2 -/* DBDA94 802407E4 46000021 */ cvt.d.s $f0, $f0 -/* DBDA98 802407E8 4622003C */ c.lt.d $f0, $f2 -/* DBDA9C 802407EC 00000000 */ nop -/* DBDAA0 802407F0 45000003 */ bc1f .L80240800 -/* DBDAA4 802407F4 0200202D */ daddu $a0, $s0, $zero -/* DBDAA8 802407F8 08090201 */ j .L80240804 -/* DBDAAC 802407FC 0000282D */ daddu $a1, $zero, $zero -.L80240800: -/* DBDAB0 80240800 24050001 */ addiu $a1, $zero, 1 -.L80240804: -/* DBDAB4 80240804 0C00F598 */ jal func_8003D660 -/* DBDAB8 80240808 00000000 */ nop -/* DBDABC 8024080C C60C0038 */ lwc1 $f12, 0x38($s0) -/* DBDAC0 80240810 8E430078 */ lw $v1, 0x78($s2) -/* DBDAC4 80240814 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DBDAC8 80240818 00031040 */ sll $v0, $v1, 1 -/* DBDACC 8024081C 00431021 */ addu $v0, $v0, $v1 -/* DBDAD0 80240820 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBDAD4 80240824 00021080 */ sll $v0, $v0, 2 -/* DBDAD8 80240828 00431021 */ addu $v0, $v0, $v1 -/* DBDADC 8024082C C4560004 */ lwc1 $f22, 4($v0) -/* DBDAE0 80240830 4680B5A0 */ cvt.s.w $f22, $f22 -/* DBDAE4 80240834 C454000C */ lwc1 $f20, 0xc($v0) -/* DBDAE8 80240838 4680A520 */ cvt.s.w $f20, $f20 -/* DBDAEC 8024083C 4406B000 */ mfc1 $a2, $f22 -/* DBDAF0 80240840 4407A000 */ mfc1 $a3, $f20 -/* DBDAF4 80240844 0C00A720 */ jal atan2 -/* DBDAF8 80240848 00000000 */ nop -/* DBDAFC 8024084C 8E050018 */ lw $a1, 0x18($s0) -/* DBDB00 80240850 44060000 */ mfc1 $a2, $f0 -/* DBDB04 80240854 0200202D */ daddu $a0, $s0, $zero -/* DBDB08 80240858 0C00EA95 */ jal npc_move_heading -/* DBDB0C 8024085C AE06000C */ sw $a2, 0xc($s0) -/* DBDB10 80240860 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DBDB14 80240864 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DBDB18 80240868 4406B000 */ mfc1 $a2, $f22 -/* DBDB1C 8024086C 4407A000 */ mfc1 $a3, $f20 -/* DBDB20 80240870 0C00A7B5 */ jal dist2D -/* DBDB24 80240874 00000000 */ nop -/* DBDB28 80240878 C6020018 */ lwc1 $f2, 0x18($s0) -/* DBDB2C 8024087C 4602003E */ c.le.s $f0, $f2 -/* DBDB30 80240880 00000000 */ nop -/* DBDB34 80240884 4500002F */ bc1f .L80240944 -/* DBDB38 80240888 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DBDB3C 8024088C 24020002 */ addiu $v0, $zero, 2 -/* DBDB40 80240890 0C00A67F */ jal rand_int -/* DBDB44 80240894 AE420070 */ sw $v0, 0x70($s2) -/* DBDB48 80240898 3C035555 */ lui $v1, 0x5555 -/* DBDB4C 8024089C 34635556 */ ori $v1, $v1, 0x5556 -/* DBDB50 802408A0 00430018 */ mult $v0, $v1 -/* DBDB54 802408A4 000227C3 */ sra $a0, $v0, 0x1f -/* DBDB58 802408A8 00004010 */ mfhi $t0 -/* DBDB5C 802408AC 01042023 */ subu $a0, $t0, $a0 -/* DBDB60 802408B0 00041840 */ sll $v1, $a0, 1 -/* DBDB64 802408B4 00641821 */ addu $v1, $v1, $a0 -/* DBDB68 802408B8 00431023 */ subu $v0, $v0, $v1 -/* DBDB6C 802408BC 24430002 */ addiu $v1, $v0, 2 -/* DBDB70 802408C0 AE430074 */ sw $v1, 0x74($s2) -/* DBDB74 802408C4 8E62002C */ lw $v0, 0x2c($s3) -/* DBDB78 802408C8 18400009 */ blez $v0, .L802408F0 -/* DBDB7C 802408CC 24020004 */ addiu $v0, $zero, 4 -/* DBDB80 802408D0 8E620004 */ lw $v0, 4($s3) -/* DBDB84 802408D4 18400006 */ blez $v0, .L802408F0 -/* DBDB88 802408D8 24020004 */ addiu $v0, $zero, 4 -/* DBDB8C 802408DC 8E620008 */ lw $v0, 8($s3) -/* DBDB90 802408E0 18400003 */ blez $v0, .L802408F0 -/* DBDB94 802408E4 24020004 */ addiu $v0, $zero, 4 -/* DBDB98 802408E8 14600002 */ bnez $v1, .L802408F4 -/* DBDB9C 802408EC 00000000 */ nop -.L802408F0: -/* DBDBA0 802408F0 AE420070 */ sw $v0, 0x70($s2) -.L802408F4: -/* DBDBA4 802408F4 0C00A67F */ jal rand_int -/* DBDBA8 802408F8 24042710 */ addiu $a0, $zero, 0x2710 -/* DBDBAC 802408FC 3C0351EB */ lui $v1, 0x51eb -/* DBDBB0 80240900 3463851F */ ori $v1, $v1, 0x851f -/* DBDBB4 80240904 00430018 */ mult $v0, $v1 -/* DBDBB8 80240908 00021FC3 */ sra $v1, $v0, 0x1f -/* DBDBBC 8024090C 00004010 */ mfhi $t0 -/* DBDBC0 80240910 00082143 */ sra $a0, $t0, 5 -/* DBDBC4 80240914 00832023 */ subu $a0, $a0, $v1 -/* DBDBC8 80240918 00041840 */ sll $v1, $a0, 1 -/* DBDBCC 8024091C 00641821 */ addu $v1, $v1, $a0 -/* DBDBD0 80240920 000318C0 */ sll $v1, $v1, 3 -/* DBDBD4 80240924 00641821 */ addu $v1, $v1, $a0 -/* DBDBD8 80240928 00031880 */ sll $v1, $v1, 2 -/* DBDBDC 8024092C 8E640004 */ lw $a0, 4($s3) -/* DBDBE0 80240930 00431023 */ subu $v0, $v0, $v1 -/* DBDBE4 80240934 0044102A */ slt $v0, $v0, $a0 -/* DBDBE8 80240938 10400002 */ beqz $v0, .L80240944 -/* DBDBEC 8024093C 24020004 */ addiu $v0, $zero, 4 -.L80240940: -/* DBDBF0 80240940 AE420070 */ sw $v0, 0x70($s2) -.L80240944: -/* DBDBF4 80240944 8FBF0044 */ lw $ra, 0x44($sp) -/* DBDBF8 80240948 8FB40040 */ lw $s4, 0x40($sp) -/* DBDBFC 8024094C 8FB3003C */ lw $s3, 0x3c($sp) -/* DBDC00 80240950 8FB20038 */ lw $s2, 0x38($sp) -/* DBDC04 80240954 8FB10034 */ lw $s1, 0x34($sp) -/* DBDC08 80240958 8FB00030 */ lw $s0, 0x30($sp) -/* DBDC0C 8024095C D7B60050 */ ldc1 $f22, 0x50($sp) -/* DBDC10 80240960 D7B40048 */ ldc1 $f20, 0x48($sp) -/* DBDC14 80240964 03E00008 */ jr $ra -/* DBDC18 80240968 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80240A2C_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80240A2C_DBD2B0.s deleted file mode 100644 index 4bd8d784b1..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80240A2C_DBD2B0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A2C_DBDCDC -/* DBDCDC 80240A2C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DBDCE0 80240A30 AFB40040 */ sw $s4, 0x40($sp) -/* DBDCE4 80240A34 0080A02D */ daddu $s4, $a0, $zero -/* DBDCE8 80240A38 AFBF0044 */ sw $ra, 0x44($sp) -/* DBDCEC 80240A3C AFB3003C */ sw $s3, 0x3c($sp) -/* DBDCF0 80240A40 AFB20038 */ sw $s2, 0x38($sp) -/* DBDCF4 80240A44 AFB10034 */ sw $s1, 0x34($sp) -/* DBDCF8 80240A48 AFB00030 */ sw $s0, 0x30($sp) -/* DBDCFC 80240A4C 8E910148 */ lw $s1, 0x148($s4) -/* DBDD00 80240A50 00A0902D */ daddu $s2, $a1, $zero -/* DBDD04 80240A54 86240008 */ lh $a0, 8($s1) -/* DBDD08 80240A58 0C00EABB */ jal get_npc_unsafe -/* DBDD0C 80240A5C 00C0982D */ daddu $s3, $a2, $zero -/* DBDD10 80240A60 8E430014 */ lw $v1, 0x14($s2) -/* DBDD14 80240A64 04600031 */ bltz $v1, .L80240B2C -/* DBDD18 80240A68 0040802D */ daddu $s0, $v0, $zero -/* DBDD1C 80240A6C 0260202D */ daddu $a0, $s3, $zero -/* DBDD20 80240A70 AFA00010 */ sw $zero, 0x10($sp) -/* DBDD24 80240A74 8E460024 */ lw $a2, 0x24($s2) -/* DBDD28 80240A78 8E470028 */ lw $a3, 0x28($s2) -/* DBDD2C 80240A7C 0C01242D */ jal func_800490B4 -/* DBDD30 80240A80 0220282D */ daddu $a1, $s1, $zero -/* DBDD34 80240A84 10400029 */ beqz $v0, .L80240B2C -/* DBDD38 80240A88 0000202D */ daddu $a0, $zero, $zero -/* DBDD3C 80240A8C 0200282D */ daddu $a1, $s0, $zero -/* DBDD40 80240A90 0000302D */ daddu $a2, $zero, $zero -/* DBDD44 80240A94 860300A8 */ lh $v1, 0xa8($s0) -/* DBDD48 80240A98 3C013F80 */ lui $at, 0x3f80 -/* DBDD4C 80240A9C 44810000 */ mtc1 $at, $f0 -/* DBDD50 80240AA0 3C014000 */ lui $at, 0x4000 -/* DBDD54 80240AA4 44811000 */ mtc1 $at, $f2 -/* DBDD58 80240AA8 3C01C1A0 */ lui $at, 0xc1a0 -/* DBDD5C 80240AAC 44812000 */ mtc1 $at, $f4 -/* DBDD60 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* DBDD64 80240AB4 AFA2001C */ sw $v0, 0x1c($sp) -/* DBDD68 80240AB8 44833000 */ mtc1 $v1, $f6 -/* DBDD6C 80240ABC 00000000 */ nop -/* DBDD70 80240AC0 468031A0 */ cvt.s.w $f6, $f6 -/* DBDD74 80240AC4 44073000 */ mfc1 $a3, $f6 -/* DBDD78 80240AC8 27A20028 */ addiu $v0, $sp, 0x28 -/* DBDD7C 80240ACC AFA20020 */ sw $v0, 0x20($sp) -/* DBDD80 80240AD0 E7A00010 */ swc1 $f0, 0x10($sp) -/* DBDD84 80240AD4 E7A20014 */ swc1 $f2, 0x14($sp) -/* DBDD88 80240AD8 0C01BFA4 */ jal fx_emote -/* DBDD8C 80240ADC E7A40018 */ swc1 $f4, 0x18($sp) -/* DBDD90 80240AE0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DBDD94 80240AE4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DBDD98 80240AE8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DBDD9C 80240AEC C60E0040 */ lwc1 $f14, 0x40($s0) -/* DBDDA0 80240AF0 8C460028 */ lw $a2, 0x28($v0) -/* DBDDA4 80240AF4 0C00A720 */ jal atan2 -/* DBDDA8 80240AF8 8C470030 */ lw $a3, 0x30($v0) -/* DBDDAC 80240AFC 0200202D */ daddu $a0, $s0, $zero -/* DBDDB0 80240B00 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DBDDB4 80240B04 3C060020 */ lui $a2, 0x20 -/* DBDDB8 80240B08 0C012530 */ jal func_800494C0 -/* DBDDBC 80240B0C E480000C */ swc1 $f0, 0xc($a0) -/* DBDDC0 80240B10 8E220018 */ lw $v0, 0x18($s1) -/* DBDDC4 80240B14 9442002A */ lhu $v0, 0x2a($v0) -/* DBDDC8 80240B18 30420001 */ andi $v0, $v0, 1 -/* DBDDCC 80240B1C 14400029 */ bnez $v0, .L80240BC4 -/* DBDDD0 80240B20 2402000A */ addiu $v0, $zero, 0xa -/* DBDDD4 80240B24 080902F1 */ j .L80240BC4 -/* DBDDD8 80240B28 2402000C */ addiu $v0, $zero, 0xc -.L80240B2C: -/* DBDDDC 80240B2C 8602008C */ lh $v0, 0x8c($s0) -/* DBDDE0 80240B30 14400025 */ bnez $v0, .L80240BC8 -/* DBDDE4 80240B34 00000000 */ nop -/* DBDDE8 80240B38 9602008E */ lhu $v0, 0x8e($s0) -/* DBDDEC 80240B3C 2442FFFF */ addiu $v0, $v0, -1 -/* DBDDF0 80240B40 A602008E */ sh $v0, 0x8e($s0) -/* DBDDF4 80240B44 00021400 */ sll $v0, $v0, 0x10 -/* DBDDF8 80240B48 1440001F */ bnez $v0, .L80240BC8 -/* DBDDFC 80240B4C 00000000 */ nop -/* DBDE00 80240B50 8E820074 */ lw $v0, 0x74($s4) -/* DBDE04 80240B54 2442FFFF */ addiu $v0, $v0, -1 -/* DBDE08 80240B58 10400019 */ beqz $v0, .L80240BC0 -/* DBDE0C 80240B5C AE820074 */ sw $v0, 0x74($s4) -/* DBDE10 80240B60 8E220018 */ lw $v0, 0x18($s1) -/* DBDE14 80240B64 9442002A */ lhu $v0, 0x2a($v0) -/* DBDE18 80240B68 30420010 */ andi $v0, $v0, 0x10 -/* DBDE1C 80240B6C 14400007 */ bnez $v0, .L80240B8C -/* DBDE20 80240B70 00000000 */ nop -/* DBDE24 80240B74 C600000C */ lwc1 $f0, 0xc($s0) -/* DBDE28 80240B78 3C014334 */ lui $at, 0x4334 -/* DBDE2C 80240B7C 44816000 */ mtc1 $at, $f12 -/* DBDE30 80240B80 0C00A6C9 */ jal clamp_angle -/* DBDE34 80240B84 460C0300 */ add.s $f12, $f0, $f12 -/* DBDE38 80240B88 E600000C */ swc1 $f0, 0xc($s0) -.L80240B8C: -/* DBDE3C 80240B8C 8E440008 */ lw $a0, 8($s2) -/* DBDE40 80240B90 000417C2 */ srl $v0, $a0, 0x1f -/* DBDE44 80240B94 00822021 */ addu $a0, $a0, $v0 -/* DBDE48 80240B98 00042043 */ sra $a0, $a0, 1 -/* DBDE4C 80240B9C 0C00A67F */ jal rand_int -/* DBDE50 80240BA0 24840001 */ addiu $a0, $a0, 1 -/* DBDE54 80240BA4 8E430008 */ lw $v1, 8($s2) -/* DBDE58 80240BA8 000327C2 */ srl $a0, $v1, 0x1f -/* DBDE5C 80240BAC 00641821 */ addu $v1, $v1, $a0 -/* DBDE60 80240BB0 00031843 */ sra $v1, $v1, 1 -/* DBDE64 80240BB4 00621821 */ addu $v1, $v1, $v0 -/* DBDE68 80240BB8 080902F2 */ j .L80240BC8 -/* DBDE6C 80240BBC A603008E */ sh $v1, 0x8e($s0) -.L80240BC0: -/* DBDE70 80240BC0 24020004 */ addiu $v0, $zero, 4 -.L80240BC4: -/* DBDE74 80240BC4 AE820070 */ sw $v0, 0x70($s4) -.L80240BC8: -/* DBDE78 80240BC8 8FBF0044 */ lw $ra, 0x44($sp) -/* DBDE7C 80240BCC 8FB40040 */ lw $s4, 0x40($sp) -/* DBDE80 80240BD0 8FB3003C */ lw $s3, 0x3c($sp) -/* DBDE84 80240BD4 8FB20038 */ lw $s2, 0x38($sp) -/* DBDE88 80240BD8 8FB10034 */ lw $s1, 0x34($sp) -/* DBDE8C 80240BDC 8FB00030 */ lw $s0, 0x30($sp) -/* DBDE90 80240BE0 03E00008 */ jr $ra -/* DBDE94 80240BE4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80240BE8_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80240BE8_DBD2B0.s deleted file mode 100644 index 6142fbc12e..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80240BE8_DBD2B0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BE8_DBDE98 -/* DBDE98 80240BE8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBDE9C 80240BEC AFB10014 */ sw $s1, 0x14($sp) -/* DBDEA0 80240BF0 0080882D */ daddu $s1, $a0, $zero -/* DBDEA4 80240BF4 AFBF001C */ sw $ra, 0x1c($sp) -/* DBDEA8 80240BF8 AFB20018 */ sw $s2, 0x18($sp) -/* DBDEAC 80240BFC AFB00010 */ sw $s0, 0x10($sp) -/* DBDEB0 80240C00 8E300148 */ lw $s0, 0x148($s1) -/* DBDEB4 80240C04 86040008 */ lh $a0, 8($s0) -/* DBDEB8 80240C08 0C00EABB */ jal get_npc_unsafe -/* DBDEBC 80240C0C 00A0902D */ daddu $s2, $a1, $zero -/* DBDEC0 80240C10 8E230078 */ lw $v1, 0x78($s1) -/* DBDEC4 80240C14 24630001 */ addiu $v1, $v1, 1 -/* DBDEC8 80240C18 AE230078 */ sw $v1, 0x78($s1) -/* DBDECC 80240C1C 8E0400D0 */ lw $a0, 0xd0($s0) -/* DBDED0 80240C20 8C840000 */ lw $a0, ($a0) -/* DBDED4 80240C24 0064182A */ slt $v1, $v1, $a0 -/* DBDED8 80240C28 14600002 */ bnez $v1, .L80240C34 -/* DBDEDC 80240C2C 0040282D */ daddu $a1, $v0, $zero -/* DBDEE0 80240C30 AE200078 */ sw $zero, 0x78($s1) -.L80240C34: -/* DBDEE4 80240C34 8E0200CC */ lw $v0, 0xcc($s0) -/* DBDEE8 80240C38 8C420004 */ lw $v0, 4($v0) -/* DBDEEC 80240C3C ACA20028 */ sw $v0, 0x28($a1) -/* DBDEF0 80240C40 8E0200D0 */ lw $v0, 0xd0($s0) -/* DBDEF4 80240C44 8C42007C */ lw $v0, 0x7c($v0) -/* DBDEF8 80240C48 04410004 */ bgez $v0, .L80240C5C -/* DBDEFC 80240C4C 00000000 */ nop -/* DBDF00 80240C50 C6400000 */ lwc1 $f0, ($s2) -/* DBDF04 80240C54 0809031F */ j .L80240C7C -/* DBDF08 80240C58 E4A00018 */ swc1 $f0, 0x18($a1) -.L80240C5C: -/* DBDF0C 80240C5C 3C018024 */ lui $at, 0x8024 -/* DBDF10 80240C60 D4226D78 */ ldc1 $f2, 0x6d78($at) -/* DBDF14 80240C64 44820000 */ mtc1 $v0, $f0 -/* DBDF18 80240C68 00000000 */ nop -/* DBDF1C 80240C6C 46800021 */ cvt.d.w $f0, $f0 -/* DBDF20 80240C70 46220003 */ div.d $f0, $f0, $f2 -/* DBDF24 80240C74 46200020 */ cvt.s.d $f0, $f0 -/* DBDF28 80240C78 E4A00018 */ swc1 $f0, 0x18($a1) -.L80240C7C: -/* DBDF2C 80240C7C 24020001 */ addiu $v0, $zero, 1 -/* DBDF30 80240C80 AE220070 */ sw $v0, 0x70($s1) -/* DBDF34 80240C84 8FBF001C */ lw $ra, 0x1c($sp) -/* DBDF38 80240C88 8FB20018 */ lw $s2, 0x18($sp) -/* DBDF3C 80240C8C 8FB10014 */ lw $s1, 0x14($sp) -/* DBDF40 80240C90 8FB00010 */ lw $s0, 0x10($sp) -/* DBDF44 80240C94 03E00008 */ jr $ra -/* DBDF48 80240C98 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80240C9C_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80240C9C_DBD2B0.s deleted file mode 100644 index 1eff6f705c..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80240C9C_DBD2B0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C9C_DBDF4C -/* DBDF4C 80240C9C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBDF50 80240CA0 AFB10014 */ sw $s1, 0x14($sp) -/* DBDF54 80240CA4 0080882D */ daddu $s1, $a0, $zero -/* DBDF58 80240CA8 AFBF0018 */ sw $ra, 0x18($sp) -/* DBDF5C 80240CAC AFB00010 */ sw $s0, 0x10($sp) -/* DBDF60 80240CB0 8E300148 */ lw $s0, 0x148($s1) -/* DBDF64 80240CB4 0C00EABB */ jal get_npc_unsafe -/* DBDF68 80240CB8 86040008 */ lh $a0, 8($s0) -/* DBDF6C 80240CBC 8E0300CC */ lw $v1, 0xcc($s0) -/* DBDF70 80240CC0 3C014120 */ lui $at, 0x4120 -/* DBDF74 80240CC4 44812000 */ mtc1 $at, $f4 -/* DBDF78 80240CC8 3C014000 */ lui $at, 0x4000 -/* DBDF7C 80240CCC 44810000 */ mtc1 $at, $f0 -/* DBDF80 80240CD0 C442003C */ lwc1 $f2, 0x3c($v0) -/* DBDF84 80240CD4 8C640010 */ lw $a0, 0x10($v1) -/* DBDF88 80240CD8 8C430000 */ lw $v1, ($v0) -/* DBDF8C 80240CDC E444001C */ swc1 $f4, 0x1c($v0) -/* DBDF90 80240CE0 E4400014 */ swc1 $f0, 0x14($v0) -/* DBDF94 80240CE4 E4420064 */ swc1 $f2, 0x64($v0) -/* DBDF98 80240CE8 34630800 */ ori $v1, $v1, 0x800 -/* DBDF9C 80240CEC AC430000 */ sw $v1, ($v0) -/* DBDFA0 80240CF0 AC440028 */ sw $a0, 0x28($v0) -/* DBDFA4 80240CF4 2402000B */ addiu $v0, $zero, 0xb -/* DBDFA8 80240CF8 AE220070 */ sw $v0, 0x70($s1) -/* DBDFAC 80240CFC 8FBF0018 */ lw $ra, 0x18($sp) -/* DBDFB0 80240D00 8FB10014 */ lw $s1, 0x14($sp) -/* DBDFB4 80240D04 8FB00010 */ lw $s0, 0x10($sp) -/* DBDFB8 80240D08 03E00008 */ jr $ra -/* DBDFBC 80240D0C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80240D10_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80240D10_DBD2B0.s deleted file mode 100644 index 1849f71c97..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80240D10_DBD2B0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D10_DBDFC0 -/* DBDFC0 80240D10 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DBDFC4 80240D14 AFB00010 */ sw $s0, 0x10($sp) -/* DBDFC8 80240D18 0080802D */ daddu $s0, $a0, $zero -/* DBDFCC 80240D1C AFBF0014 */ sw $ra, 0x14($sp) -/* DBDFD0 80240D20 8E020148 */ lw $v0, 0x148($s0) -/* DBDFD4 80240D24 0C00EABB */ jal get_npc_unsafe -/* DBDFD8 80240D28 84440008 */ lh $a0, 8($v0) -/* DBDFDC 80240D2C 0040202D */ daddu $a0, $v0, $zero -/* DBDFE0 80240D30 C482003C */ lwc1 $f2, 0x3c($a0) -/* DBDFE4 80240D34 C480001C */ lwc1 $f0, 0x1c($a0) -/* DBDFE8 80240D38 46001080 */ add.s $f2, $f2, $f0 -/* DBDFEC 80240D3C C4840014 */ lwc1 $f4, 0x14($a0) -/* DBDFF0 80240D40 46040001 */ sub.s $f0, $f0, $f4 -/* DBDFF4 80240D44 C4840064 */ lwc1 $f4, 0x64($a0) -/* DBDFF8 80240D48 4602203C */ c.lt.s $f4, $f2 -/* DBDFFC 80240D4C E482003C */ swc1 $f2, 0x3c($a0) -/* DBE000 80240D50 45010009 */ bc1t .L80240D78 -/* DBE004 80240D54 E480001C */ swc1 $f0, 0x1c($a0) -/* DBE008 80240D58 8C820000 */ lw $v0, ($a0) -/* DBE00C 80240D5C 2403F7FF */ addiu $v1, $zero, -0x801 -/* DBE010 80240D60 E484003C */ swc1 $f4, 0x3c($a0) -/* DBE014 80240D64 AC80001C */ sw $zero, 0x1c($a0) -/* DBE018 80240D68 00431024 */ and $v0, $v0, $v1 -/* DBE01C 80240D6C AC820000 */ sw $v0, ($a0) -/* DBE020 80240D70 2402000C */ addiu $v0, $zero, 0xc -/* DBE024 80240D74 AE020070 */ sw $v0, 0x70($s0) -.L80240D78: -/* DBE028 80240D78 8FBF0014 */ lw $ra, 0x14($sp) -/* DBE02C 80240D7C 8FB00010 */ lw $s0, 0x10($sp) -/* DBE030 80240D80 03E00008 */ jr $ra -/* DBE034 80240D84 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80240D88_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80240D88_DBD2B0.s deleted file mode 100644 index 19ff28e3ea..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80240D88_DBD2B0.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D88_DBE038 -/* DBE038 80240D88 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DBE03C 80240D8C AFB3001C */ sw $s3, 0x1c($sp) -/* DBE040 80240D90 0080982D */ daddu $s3, $a0, $zero -/* DBE044 80240D94 AFBF0020 */ sw $ra, 0x20($sp) -/* DBE048 80240D98 AFB20018 */ sw $s2, 0x18($sp) -/* DBE04C 80240D9C AFB10014 */ sw $s1, 0x14($sp) -/* DBE050 80240DA0 AFB00010 */ sw $s0, 0x10($sp) -/* DBE054 80240DA4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* DBE058 80240DA8 8E710148 */ lw $s1, 0x148($s3) -/* DBE05C 80240DAC 86240008 */ lh $a0, 8($s1) -/* DBE060 80240DB0 0C00EABB */ jal get_npc_unsafe -/* DBE064 80240DB4 00A0802D */ daddu $s0, $a1, $zero -/* DBE068 80240DB8 8E040020 */ lw $a0, 0x20($s0) -/* DBE06C 80240DBC 0040902D */ daddu $s2, $v0, $zero -/* DBE070 80240DC0 00041FC2 */ srl $v1, $a0, 0x1f -/* DBE074 80240DC4 00832021 */ addu $a0, $a0, $v1 -/* DBE078 80240DC8 00042043 */ sra $a0, $a0, 1 -/* DBE07C 80240DCC 0C00A67F */ jal rand_int -/* DBE080 80240DD0 24840001 */ addiu $a0, $a0, 1 -/* DBE084 80240DD4 8E030020 */ lw $v1, 0x20($s0) -/* DBE088 80240DD8 C64C0038 */ lwc1 $f12, 0x38($s2) -/* DBE08C 80240DDC 000327C2 */ srl $a0, $v1, 0x1f -/* DBE090 80240DE0 00641821 */ addu $v1, $v1, $a0 -/* DBE094 80240DE4 00031843 */ sra $v1, $v1, 1 -/* DBE098 80240DE8 00621821 */ addu $v1, $v1, $v0 -/* DBE09C 80240DEC A643008E */ sh $v1, 0x8e($s2) -/* DBE0A0 80240DF0 8E2200CC */ lw $v0, 0xcc($s1) -/* DBE0A4 80240DF4 C64E0040 */ lwc1 $f14, 0x40($s2) -/* DBE0A8 80240DF8 8C42000C */ lw $v0, 0xc($v0) -/* DBE0AC 80240DFC AE420028 */ sw $v0, 0x28($s2) -/* DBE0B0 80240E00 C6000018 */ lwc1 $f0, 0x18($s0) -/* DBE0B4 80240E04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DBE0B8 80240E08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DBE0BC 80240E0C E6400018 */ swc1 $f0, 0x18($s2) -/* DBE0C0 80240E10 8C460028 */ lw $a2, 0x28($v0) -/* DBE0C4 80240E14 0C00A720 */ jal atan2 -/* DBE0C8 80240E18 8C470030 */ lw $a3, 0x30($v0) -/* DBE0CC 80240E1C 46000506 */ mov.s $f20, $f0 -/* DBE0D0 80240E20 C64C000C */ lwc1 $f12, 0xc($s2) -/* DBE0D4 80240E24 0C00A70A */ jal get_clamped_angle_diff -/* DBE0D8 80240E28 4600A386 */ mov.s $f14, $f20 -/* DBE0DC 80240E2C 46000086 */ mov.s $f2, $f0 -/* DBE0E0 80240E30 8E02001C */ lw $v0, 0x1c($s0) -/* DBE0E4 80240E34 46001005 */ abs.s $f0, $f2 -/* DBE0E8 80240E38 44822000 */ mtc1 $v0, $f4 -/* DBE0EC 80240E3C 00000000 */ nop -/* DBE0F0 80240E40 46802120 */ cvt.s.w $f4, $f4 -/* DBE0F4 80240E44 4600203C */ c.lt.s $f4, $f0 -/* DBE0F8 80240E48 00000000 */ nop -/* DBE0FC 80240E4C 4500000D */ bc1f .L80240E84 -/* DBE100 80240E50 00000000 */ nop -/* DBE104 80240E54 44800000 */ mtc1 $zero, $f0 -/* DBE108 80240E58 C654000C */ lwc1 $f20, 0xc($s2) -/* DBE10C 80240E5C 4600103C */ c.lt.s $f2, $f0 -/* DBE110 80240E60 00000000 */ nop -/* DBE114 80240E64 45000006 */ bc1f .L80240E80 -/* DBE118 80240E68 00021023 */ negu $v0, $v0 -/* DBE11C 80240E6C 44820000 */ mtc1 $v0, $f0 -/* DBE120 80240E70 00000000 */ nop -/* DBE124 80240E74 46800020 */ cvt.s.w $f0, $f0 -/* DBE128 80240E78 080903A1 */ j .L80240E84 -/* DBE12C 80240E7C 4600A500 */ add.s $f20, $f20, $f0 -.L80240E80: -/* DBE130 80240E80 4604A500 */ add.s $f20, $f20, $f4 -.L80240E84: -/* DBE134 80240E84 0C00A6C9 */ jal clamp_angle -/* DBE138 80240E88 4600A306 */ mov.s $f12, $f20 -/* DBE13C 80240E8C 2402000D */ addiu $v0, $zero, 0xd -/* DBE140 80240E90 E640000C */ swc1 $f0, 0xc($s2) -/* DBE144 80240E94 AE620070 */ sw $v0, 0x70($s3) -/* DBE148 80240E98 8FBF0020 */ lw $ra, 0x20($sp) -/* DBE14C 80240E9C 8FB3001C */ lw $s3, 0x1c($sp) -/* DBE150 80240EA0 8FB20018 */ lw $s2, 0x18($sp) -/* DBE154 80240EA4 8FB10014 */ lw $s1, 0x14($sp) -/* DBE158 80240EA8 8FB00010 */ lw $s0, 0x10($sp) -/* DBE15C 80240EAC D7B40028 */ ldc1 $f20, 0x28($sp) -/* DBE160 80240EB0 03E00008 */ jr $ra -/* DBE164 80240EB4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80240EB8_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80240EB8_DBD2B0.s deleted file mode 100644 index c096b0f6af..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80240EB8_DBD2B0.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_DBE168 -/* DBE168 80240EB8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DBE16C 80240EBC AFB3003C */ sw $s3, 0x3c($sp) -/* DBE170 80240EC0 0080982D */ daddu $s3, $a0, $zero -/* DBE174 80240EC4 AFBF0040 */ sw $ra, 0x40($sp) -/* DBE178 80240EC8 AFB20038 */ sw $s2, 0x38($sp) -/* DBE17C 80240ECC AFB10034 */ sw $s1, 0x34($sp) -/* DBE180 80240ED0 AFB00030 */ sw $s0, 0x30($sp) -/* DBE184 80240ED4 8E720148 */ lw $s2, 0x148($s3) -/* DBE188 80240ED8 00A0882D */ daddu $s1, $a1, $zero -/* DBE18C 80240EDC 86440008 */ lh $a0, 8($s2) -/* DBE190 80240EE0 0C00EABB */ jal get_npc_unsafe -/* DBE194 80240EE4 00C0802D */ daddu $s0, $a2, $zero -/* DBE198 80240EE8 0200202D */ daddu $a0, $s0, $zero -/* DBE19C 80240EEC 0240282D */ daddu $a1, $s2, $zero -/* DBE1A0 80240EF0 24030001 */ addiu $v1, $zero, 1 -/* DBE1A4 80240EF4 AFA30010 */ sw $v1, 0x10($sp) -/* DBE1A8 80240EF8 8E260024 */ lw $a2, 0x24($s1) -/* DBE1AC 80240EFC 8E270028 */ lw $a3, 0x28($s1) -/* DBE1B0 80240F00 0C01242D */ jal func_800490B4 -/* DBE1B4 80240F04 0040802D */ daddu $s0, $v0, $zero -/* DBE1B8 80240F08 1440001E */ bnez $v0, .L80240F84 -/* DBE1BC 80240F0C 0200202D */ daddu $a0, $s0, $zero -/* DBE1C0 80240F10 24040002 */ addiu $a0, $zero, 2 -/* DBE1C4 80240F14 0200282D */ daddu $a1, $s0, $zero -/* DBE1C8 80240F18 0000302D */ daddu $a2, $zero, $zero -/* DBE1CC 80240F1C 860300A8 */ lh $v1, 0xa8($s0) -/* DBE1D0 80240F20 3C013F80 */ lui $at, 0x3f80 -/* DBE1D4 80240F24 44810000 */ mtc1 $at, $f0 -/* DBE1D8 80240F28 3C014000 */ lui $at, 0x4000 -/* DBE1DC 80240F2C 44811000 */ mtc1 $at, $f2 -/* DBE1E0 80240F30 3C01C1A0 */ lui $at, 0xc1a0 -/* DBE1E4 80240F34 44812000 */ mtc1 $at, $f4 -/* DBE1E8 80240F38 2402000F */ addiu $v0, $zero, 0xf -/* DBE1EC 80240F3C AFA2001C */ sw $v0, 0x1c($sp) -/* DBE1F0 80240F40 44833000 */ mtc1 $v1, $f6 -/* DBE1F4 80240F44 00000000 */ nop -/* DBE1F8 80240F48 468031A0 */ cvt.s.w $f6, $f6 -/* DBE1FC 80240F4C 44073000 */ mfc1 $a3, $f6 -/* DBE200 80240F50 27A20028 */ addiu $v0, $sp, 0x28 -/* DBE204 80240F54 AFA20020 */ sw $v0, 0x20($sp) -/* DBE208 80240F58 E7A00010 */ swc1 $f0, 0x10($sp) -/* DBE20C 80240F5C E7A20014 */ swc1 $f2, 0x14($sp) -/* DBE210 80240F60 0C01BFA4 */ jal fx_emote -/* DBE214 80240F64 E7A40018 */ swc1 $f4, 0x18($sp) -/* DBE218 80240F68 8E4200CC */ lw $v0, 0xcc($s2) -/* DBE21C 80240F6C 8C430000 */ lw $v1, ($v0) -/* DBE220 80240F70 24020019 */ addiu $v0, $zero, 0x19 -/* DBE224 80240F74 A602008E */ sh $v0, 0x8e($s0) -/* DBE228 80240F78 2402000E */ addiu $v0, $zero, 0xe -/* DBE22C 80240F7C 080903EE */ j .L80240FB8 -/* DBE230 80240F80 AE030028 */ sw $v1, 0x28($s0) -.L80240F84: -/* DBE234 80240F84 0C00F598 */ jal func_8003D660 -/* DBE238 80240F88 24050001 */ addiu $a1, $zero, 1 -/* DBE23C 80240F8C 8E050018 */ lw $a1, 0x18($s0) -/* DBE240 80240F90 8E06000C */ lw $a2, 0xc($s0) -/* DBE244 80240F94 0C00EA95 */ jal npc_move_heading -/* DBE248 80240F98 0200202D */ daddu $a0, $s0, $zero -/* DBE24C 80240F9C 8602008E */ lh $v0, 0x8e($s0) -/* DBE250 80240FA0 9603008E */ lhu $v1, 0x8e($s0) -/* DBE254 80240FA4 18400003 */ blez $v0, .L80240FB4 -/* DBE258 80240FA8 2462FFFF */ addiu $v0, $v1, -1 -/* DBE25C 80240FAC 080903EF */ j .L80240FBC -/* DBE260 80240FB0 A602008E */ sh $v0, 0x8e($s0) -.L80240FB4: -/* DBE264 80240FB4 2402000C */ addiu $v0, $zero, 0xc -.L80240FB8: -/* DBE268 80240FB8 AE620070 */ sw $v0, 0x70($s3) -.L80240FBC: -/* DBE26C 80240FBC 8FBF0040 */ lw $ra, 0x40($sp) -/* DBE270 80240FC0 8FB3003C */ lw $s3, 0x3c($sp) -/* DBE274 80240FC4 8FB20038 */ lw $s2, 0x38($sp) -/* DBE278 80240FC8 8FB10034 */ lw $s1, 0x34($sp) -/* DBE27C 80240FCC 8FB00030 */ lw $s0, 0x30($sp) -/* DBE280 80240FD0 03E00008 */ jr $ra -/* DBE284 80240FD4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80240FD8_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80240FD8_DBD2B0.s deleted file mode 100644 index 7881b30db3..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80240FD8_DBD2B0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD8_DBE288 -/* DBE288 80240FD8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBE28C 80240FDC AFB10014 */ sw $s1, 0x14($sp) -/* DBE290 80240FE0 0080882D */ daddu $s1, $a0, $zero -/* DBE294 80240FE4 AFBF0018 */ sw $ra, 0x18($sp) -/* DBE298 80240FE8 AFB00010 */ sw $s0, 0x10($sp) -/* DBE29C 80240FEC 8E300148 */ lw $s0, 0x148($s1) -/* DBE2A0 80240FF0 0C00EABB */ jal get_npc_unsafe -/* DBE2A4 80240FF4 86040008 */ lh $a0, 8($s0) -/* DBE2A8 80240FF8 9443008E */ lhu $v1, 0x8e($v0) -/* DBE2AC 80240FFC 2463FFFF */ addiu $v1, $v1, -1 -/* DBE2B0 80241000 A443008E */ sh $v1, 0x8e($v0) -/* DBE2B4 80241004 00031C00 */ sll $v1, $v1, 0x10 -/* DBE2B8 80241008 14600008 */ bnez $v1, .L8024102C -/* DBE2BC 8024100C 00000000 */ nop -/* DBE2C0 80241010 8E0200B0 */ lw $v0, 0xb0($s0) -/* DBE2C4 80241014 30420080 */ andi $v0, $v0, 0x80 -/* DBE2C8 80241018 10400003 */ beqz $v0, .L80241028 -/* DBE2CC 8024101C 2402000F */ addiu $v0, $zero, 0xf -/* DBE2D0 80241020 0809040B */ j .L8024102C -/* DBE2D4 80241024 AE220070 */ sw $v0, 0x70($s1) -.L80241028: -/* DBE2D8 80241028 AE200070 */ sw $zero, 0x70($s1) -.L8024102C: -/* DBE2DC 8024102C 8FBF0018 */ lw $ra, 0x18($sp) -/* DBE2E0 80241030 8FB10014 */ lw $s1, 0x14($sp) -/* DBE2E4 80241034 8FB00010 */ lw $s0, 0x10($sp) -/* DBE2E8 80241038 03E00008 */ jr $ra -/* DBE2EC 8024103C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80241040_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80241040_DBD2B0.s deleted file mode 100644 index 73899a8ed5..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80241040_DBD2B0.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241040_DBE2F0 -/* DBE2F0 80241040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBE2F4 80241044 AFB10014 */ sw $s1, 0x14($sp) -/* DBE2F8 80241048 0080882D */ daddu $s1, $a0, $zero -/* DBE2FC 8024104C AFBF001C */ sw $ra, 0x1c($sp) -/* DBE300 80241050 AFB20018 */ sw $s2, 0x18($sp) -/* DBE304 80241054 AFB00010 */ sw $s0, 0x10($sp) -/* DBE308 80241058 8E300148 */ lw $s0, 0x148($s1) -/* DBE30C 8024105C 86040008 */ lh $a0, 8($s0) -/* DBE310 80241060 0C00EABB */ jal get_npc_unsafe -/* DBE314 80241064 00A0902D */ daddu $s2, $a1, $zero -/* DBE318 80241068 8E0300D0 */ lw $v1, 0xd0($s0) -/* DBE31C 8024106C 8E240078 */ lw $a0, 0x78($s1) -/* DBE320 80241070 8C630000 */ lw $v1, ($v1) -/* DBE324 80241074 0083182A */ slt $v1, $a0, $v1 -/* DBE328 80241078 10600013 */ beqz $v1, .L802410C8 -/* DBE32C 8024107C 0040302D */ daddu $a2, $v0, $zero -/* DBE330 80241080 00041040 */ sll $v0, $a0, 1 -/* DBE334 80241084 00441021 */ addu $v0, $v0, $a0 -/* DBE338 80241088 00022880 */ sll $a1, $v0, 2 -.L8024108C: -/* DBE33C 8024108C 8E0300D0 */ lw $v1, 0xd0($s0) -/* DBE340 80241090 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* DBE344 80241094 00A31021 */ addu $v0, $a1, $v1 -/* DBE348 80241098 C4400008 */ lwc1 $f0, 8($v0) -/* DBE34C 8024109C 46800020 */ cvt.s.w $f0, $f0 -/* DBE350 802410A0 4602003E */ c.le.s $f0, $f2 -/* DBE354 802410A4 00000000 */ nop -/* DBE358 802410A8 45020003 */ bc1fl .L802410B8 -/* DBE35C 802410AC 24840001 */ addiu $a0, $a0, 1 -/* DBE360 802410B0 08090432 */ j .L802410C8 -/* DBE364 802410B4 AE240078 */ sw $a0, 0x78($s1) -.L802410B8: -/* DBE368 802410B8 8C620000 */ lw $v0, ($v1) -/* DBE36C 802410BC 0082102A */ slt $v0, $a0, $v0 -/* DBE370 802410C0 1440FFF2 */ bnez $v0, .L8024108C -/* DBE374 802410C4 24A5000C */ addiu $a1, $a1, 0xc -.L802410C8: -/* DBE378 802410C8 C6400000 */ lwc1 $f0, ($s2) -/* DBE37C 802410CC E4C00018 */ swc1 $f0, 0x18($a2) -/* DBE380 802410D0 8E0200CC */ lw $v0, 0xcc($s0) -/* DBE384 802410D4 8C420004 */ lw $v0, 4($v0) -/* DBE388 802410D8 ACC20028 */ sw $v0, 0x28($a2) -/* DBE38C 802410DC 24020001 */ addiu $v0, $zero, 1 -/* DBE390 802410E0 AE200074 */ sw $zero, 0x74($s1) -/* DBE394 802410E4 AE220070 */ sw $v0, 0x70($s1) -/* DBE398 802410E8 8FBF001C */ lw $ra, 0x1c($sp) -/* DBE39C 802410EC 8FB20018 */ lw $s2, 0x18($sp) -/* DBE3A0 802410F0 8FB10014 */ lw $s1, 0x14($sp) -/* DBE3A4 802410F4 8FB00010 */ lw $s0, 0x10($sp) -/* DBE3A8 802410F8 03E00008 */ jr $ra -/* DBE3AC 802410FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_802413FC_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_802413FC_DBD2B0.s deleted file mode 100644 index 6b2abcdd55..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_802413FC_DBD2B0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413FC_DBE6AC -/* DBE6AC 802413FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBE6B0 80241400 AFB10014 */ sw $s1, 0x14($sp) -/* DBE6B4 80241404 0080882D */ daddu $s1, $a0, $zero -/* DBE6B8 80241408 AFBF0018 */ sw $ra, 0x18($sp) -/* DBE6BC 8024140C AFB00010 */ sw $s0, 0x10($sp) -/* DBE6C0 80241410 8E300148 */ lw $s0, 0x148($s1) -/* DBE6C4 80241414 0C00EABB */ jal get_npc_unsafe -/* DBE6C8 80241418 86040008 */ lh $a0, 8($s0) -/* DBE6CC 8024141C C4400018 */ lwc1 $f0, 0x18($v0) -/* DBE6D0 80241420 3C018024 */ lui $at, 0x8024 -/* DBE6D4 80241424 D4226F10 */ ldc1 $f2, 0x6f10($at) -/* DBE6D8 80241428 46000021 */ cvt.d.s $f0, $f0 -/* DBE6DC 8024142C 46220002 */ mul.d $f0, $f0, $f2 -/* DBE6E0 80241430 00000000 */ nop -/* DBE6E4 80241434 46200020 */ cvt.s.d $f0, $f0 -/* DBE6E8 80241438 E4400018 */ swc1 $f0, 0x18($v0) -/* DBE6EC 8024143C 8E0300CC */ lw $v1, 0xcc($s0) -/* DBE6F0 80241440 8C640030 */ lw $a0, 0x30($v1) -/* DBE6F4 80241444 24030005 */ addiu $v1, $zero, 5 -/* DBE6F8 80241448 A443008E */ sh $v1, 0x8e($v0) -/* DBE6FC 8024144C AC440028 */ sw $a0, 0x28($v0) -/* DBE700 80241450 2402000F */ addiu $v0, $zero, 0xf -/* DBE704 80241454 AE220070 */ sw $v0, 0x70($s1) -/* DBE708 80241458 8FBF0018 */ lw $ra, 0x18($sp) -/* DBE70C 8024145C 8FB10014 */ lw $s1, 0x14($sp) -/* DBE710 80241460 8FB00010 */ lw $s0, 0x10($sp) -/* DBE714 80241464 03E00008 */ jr $ra -/* DBE718 80241468 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_8024146C_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_8024146C_DBD2B0.s deleted file mode 100644 index 329348ba6c..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_8024146C_DBD2B0.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024146C_DBE71C -/* DBE71C 8024146C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DBE720 80241470 AFB20028 */ sw $s2, 0x28($sp) -/* DBE724 80241474 0080902D */ daddu $s2, $a0, $zero -/* DBE728 80241478 AFBF002C */ sw $ra, 0x2c($sp) -/* DBE72C 8024147C AFB10024 */ sw $s1, 0x24($sp) -/* DBE730 80241480 AFB00020 */ sw $s0, 0x20($sp) -/* DBE734 80241484 8E510148 */ lw $s1, 0x148($s2) -/* DBE738 80241488 0C00EABB */ jal get_npc_unsafe -/* DBE73C 8024148C 86240008 */ lh $a0, 8($s1) -/* DBE740 80241490 0040802D */ daddu $s0, $v0, $zero -/* DBE744 80241494 0200202D */ daddu $a0, $s0, $zero -/* DBE748 80241498 C600000C */ lwc1 $f0, 0xc($s0) -/* DBE74C 8024149C 27A60018 */ addiu $a2, $sp, 0x18 -/* DBE750 802414A0 E7A00018 */ swc1 $f0, 0x18($sp) -/* DBE754 802414A4 AFA00010 */ sw $zero, 0x10($sp) -/* DBE758 802414A8 AFA00014 */ sw $zero, 0x14($sp) -/* DBE75C 802414AC 8E050018 */ lw $a1, 0x18($s0) -/* DBE760 802414B0 0C0129E1 */ jal func_8004A784 -/* DBE764 802414B4 0000382D */ daddu $a3, $zero, $zero -/* DBE768 802414B8 14400005 */ bnez $v0, .L802414D0 -/* DBE76C 802414BC 00000000 */ nop -/* DBE770 802414C0 8E050018 */ lw $a1, 0x18($s0) -/* DBE774 802414C4 8E06000C */ lw $a2, 0xc($s0) -/* DBE778 802414C8 0C00EA95 */ jal npc_move_heading -/* DBE77C 802414CC 0200202D */ daddu $a0, $s0, $zero -.L802414D0: -/* DBE780 802414D0 9602008E */ lhu $v0, 0x8e($s0) -/* DBE784 802414D4 2442FFFF */ addiu $v0, $v0, -1 -/* DBE788 802414D8 A602008E */ sh $v0, 0x8e($s0) -/* DBE78C 802414DC 00021400 */ sll $v0, $v0, 0x10 -/* DBE790 802414E0 14400010 */ bnez $v0, .L80241524 -/* DBE794 802414E4 00000000 */ nop -/* DBE798 802414E8 C6000018 */ lwc1 $f0, 0x18($s0) -/* DBE79C 802414EC 3C018024 */ lui $at, 0x8024 -/* DBE7A0 802414F0 D4226F18 */ ldc1 $f2, 0x6f18($at) -/* DBE7A4 802414F4 46000021 */ cvt.d.s $f0, $f0 -/* DBE7A8 802414F8 46220002 */ mul.d $f0, $f0, $f2 -/* DBE7AC 802414FC 00000000 */ nop -/* DBE7B0 80241500 46200020 */ cvt.s.d $f0, $f0 -/* DBE7B4 80241504 E6000018 */ swc1 $f0, 0x18($s0) -/* DBE7B8 80241508 8E2200CC */ lw $v0, 0xcc($s1) -/* DBE7BC 8024150C 8C43002C */ lw $v1, 0x2c($v0) -/* DBE7C0 80241510 2402000A */ addiu $v0, $zero, 0xa -/* DBE7C4 80241514 A602008E */ sh $v0, 0x8e($s0) -/* DBE7C8 80241518 24020010 */ addiu $v0, $zero, 0x10 -/* DBE7CC 8024151C AE030028 */ sw $v1, 0x28($s0) -/* DBE7D0 80241520 AE420070 */ sw $v0, 0x70($s2) -.L80241524: -/* DBE7D4 80241524 8FBF002C */ lw $ra, 0x2c($sp) -/* DBE7D8 80241528 8FB20028 */ lw $s2, 0x28($sp) -/* DBE7DC 8024152C 8FB10024 */ lw $s1, 0x24($sp) -/* DBE7E0 80241530 8FB00020 */ lw $s0, 0x20($sp) -/* DBE7E4 80241534 03E00008 */ jr $ra -/* DBE7E8 80241538 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_802415D4_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_802415D4_DBD2B0.s deleted file mode 100644 index 2528bcfcc6..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_802415D4_DBD2B0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415D4_DBE884 -/* DBE884 802415D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBE888 802415D8 AFB10014 */ sw $s1, 0x14($sp) -/* DBE88C 802415DC 0080882D */ daddu $s1, $a0, $zero -/* DBE890 802415E0 AFBF0018 */ sw $ra, 0x18($sp) -/* DBE894 802415E4 AFB00010 */ sw $s0, 0x10($sp) -/* DBE898 802415E8 8E300148 */ lw $s0, 0x148($s1) -/* DBE89C 802415EC 0C00EABB */ jal get_npc_unsafe -/* DBE8A0 802415F0 86040008 */ lh $a0, 8($s0) -/* DBE8A4 802415F4 0040182D */ daddu $v1, $v0, $zero -/* DBE8A8 802415F8 9462008E */ lhu $v0, 0x8e($v1) -/* DBE8AC 802415FC 2442FFFF */ addiu $v0, $v0, -1 -/* DBE8B0 80241600 A462008E */ sh $v0, 0x8e($v1) -/* DBE8B4 80241604 00021400 */ sll $v0, $v0, 0x10 -/* DBE8B8 80241608 14400005 */ bnez $v0, .L80241620 -/* DBE8BC 8024160C 00000000 */ nop -/* DBE8C0 80241610 8E0200CC */ lw $v0, 0xcc($s0) -/* DBE8C4 80241614 8C420000 */ lw $v0, ($v0) -/* DBE8C8 80241618 AC620028 */ sw $v0, 0x28($v1) -/* DBE8CC 8024161C AE200070 */ sw $zero, 0x70($s1) -.L80241620: -/* DBE8D0 80241620 8FBF0018 */ lw $ra, 0x18($sp) -/* DBE8D4 80241624 8FB10014 */ lw $s1, 0x14($sp) -/* DBE8D8 80241628 8FB00010 */ lw $s0, 0x10($sp) -/* DBE8DC 8024162C 03E00008 */ jr $ra -/* DBE8E0 80241630 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80241634_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80241634_DBD2B0.s deleted file mode 100644 index edf5d217f3..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80241634_DBD2B0.s +++ /dev/null @@ -1,220 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241634_DBE8E4 -/* DBE8E4 80241634 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DBE8E8 80241638 AFB30054 */ sw $s3, 0x54($sp) -/* DBE8EC 8024163C 0080982D */ daddu $s3, $a0, $zero -/* DBE8F0 80241640 AFBF0060 */ sw $ra, 0x60($sp) -/* DBE8F4 80241644 AFB5005C */ sw $s5, 0x5c($sp) -/* DBE8F8 80241648 AFB40058 */ sw $s4, 0x58($sp) -/* DBE8FC 8024164C AFB20050 */ sw $s2, 0x50($sp) -/* DBE900 80241650 AFB1004C */ sw $s1, 0x4c($sp) -/* DBE904 80241654 AFB00048 */ sw $s0, 0x48($sp) -/* DBE908 80241658 8E710148 */ lw $s1, 0x148($s3) -/* DBE90C 8024165C 86240008 */ lh $a0, 8($s1) -/* DBE910 80241660 0C00EABB */ jal get_npc_unsafe -/* DBE914 80241664 00A0802D */ daddu $s0, $a1, $zero -/* DBE918 80241668 8E63000C */ lw $v1, 0xc($s3) -/* DBE91C 8024166C 0260202D */ daddu $a0, $s3, $zero -/* DBE920 80241670 8C650000 */ lw $a1, ($v1) -/* DBE924 80241674 0C0B1EAF */ jal get_variable -/* DBE928 80241678 0040902D */ daddu $s2, $v0, $zero -/* DBE92C 8024167C AFA00018 */ sw $zero, 0x18($sp) -/* DBE930 80241680 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBE934 80241684 8C630094 */ lw $v1, 0x94($v1) -/* DBE938 80241688 AFA3001C */ sw $v1, 0x1c($sp) -/* DBE93C 8024168C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBE940 80241690 8C630080 */ lw $v1, 0x80($v1) -/* DBE944 80241694 AFA30020 */ sw $v1, 0x20($sp) -/* DBE948 80241698 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBE94C 8024169C 8C630088 */ lw $v1, 0x88($v1) -/* DBE950 802416A0 AFA30024 */ sw $v1, 0x24($sp) -/* DBE954 802416A4 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBE958 802416A8 8C63008C */ lw $v1, 0x8c($v1) -/* DBE95C 802416AC 27B50018 */ addiu $s5, $sp, 0x18 -/* DBE960 802416B0 AFA30028 */ sw $v1, 0x28($sp) -/* DBE964 802416B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBE968 802416B8 3C014282 */ lui $at, 0x4282 -/* DBE96C 802416BC 44810000 */ mtc1 $at, $f0 -/* DBE970 802416C0 8C630090 */ lw $v1, 0x90($v1) -/* DBE974 802416C4 0040A02D */ daddu $s4, $v0, $zero -/* DBE978 802416C8 E7A00030 */ swc1 $f0, 0x30($sp) -/* DBE97C 802416CC A7A00034 */ sh $zero, 0x34($sp) -/* DBE980 802416D0 16000005 */ bnez $s0, .L802416E8 -/* DBE984 802416D4 AFA3002C */ sw $v1, 0x2c($sp) -/* DBE988 802416D8 8E2200B0 */ lw $v0, 0xb0($s1) -/* DBE98C 802416DC 30420004 */ andi $v0, $v0, 4 -/* DBE990 802416E0 10400044 */ beqz $v0, .L802417F4 -/* DBE994 802416E4 00000000 */ nop -.L802416E8: -/* DBE998 802416E8 2404F7FF */ addiu $a0, $zero, -0x801 -/* DBE99C 802416EC AE600070 */ sw $zero, 0x70($s3) -/* DBE9A0 802416F0 A640008E */ sh $zero, 0x8e($s2) -/* DBE9A4 802416F4 8E2200CC */ lw $v0, 0xcc($s1) -/* DBE9A8 802416F8 8E430000 */ lw $v1, ($s2) -/* DBE9AC 802416FC 8C420000 */ lw $v0, ($v0) -/* DBE9B0 80241700 00641824 */ and $v1, $v1, $a0 -/* DBE9B4 80241704 AE430000 */ sw $v1, ($s2) -/* DBE9B8 80241708 AE420028 */ sw $v0, 0x28($s2) -/* DBE9BC 8024170C 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBE9C0 80241710 8C420098 */ lw $v0, 0x98($v0) -/* DBE9C4 80241714 54400005 */ bnel $v0, $zero, .L8024172C -/* DBE9C8 80241718 2402FDFF */ addiu $v0, $zero, -0x201 -/* DBE9CC 8024171C 34620200 */ ori $v0, $v1, 0x200 -/* DBE9D0 80241720 2403FFF7 */ addiu $v1, $zero, -9 -/* DBE9D4 80241724 080905CD */ j .L80241734 -/* DBE9D8 80241728 00431024 */ and $v0, $v0, $v1 -.L8024172C: -/* DBE9DC 8024172C 00621024 */ and $v0, $v1, $v0 -/* DBE9E0 80241730 34420008 */ ori $v0, $v0, 8 -.L80241734: -/* DBE9E4 80241734 AE420000 */ sw $v0, ($s2) -/* DBE9E8 80241738 8E2200B0 */ lw $v0, 0xb0($s1) -/* DBE9EC 8024173C 30420004 */ andi $v0, $v0, 4 -/* DBE9F0 80241740 10400008 */ beqz $v0, .L80241764 -/* DBE9F4 80241744 24020063 */ addiu $v0, $zero, 0x63 -/* DBE9F8 80241748 AE620070 */ sw $v0, 0x70($s3) -/* DBE9FC 8024174C AE600074 */ sw $zero, 0x74($s3) -/* DBEA00 80241750 8E2200B0 */ lw $v0, 0xb0($s1) -/* DBEA04 80241754 2403FFFB */ addiu $v1, $zero, -5 -/* DBEA08 80241758 00431024 */ and $v0, $v0, $v1 -/* DBEA0C 8024175C 080905E4 */ j .L80241790 -/* DBEA10 80241760 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241764: -/* DBEA14 80241764 8E220000 */ lw $v0, ($s1) -/* DBEA18 80241768 3C034000 */ lui $v1, 0x4000 -/* DBEA1C 8024176C 00431024 */ and $v0, $v0, $v1 -/* DBEA20 80241770 10400007 */ beqz $v0, .L80241790 -/* DBEA24 80241774 3C03BFFF */ lui $v1, 0xbfff -/* DBEA28 80241778 2402000C */ addiu $v0, $zero, 0xc -/* DBEA2C 8024177C AE620070 */ sw $v0, 0x70($s3) -/* DBEA30 80241780 8E220000 */ lw $v0, ($s1) -/* DBEA34 80241784 3463FFFF */ ori $v1, $v1, 0xffff -/* DBEA38 80241788 00431024 */ and $v0, $v0, $v1 -/* DBEA3C 8024178C AE220000 */ sw $v0, ($s1) -.L80241790: -/* DBEA40 80241790 27A50038 */ addiu $a1, $sp, 0x38 -/* DBEA44 80241794 27A6003C */ addiu $a2, $sp, 0x3c -/* DBEA48 80241798 C6400038 */ lwc1 $f0, 0x38($s2) -/* DBEA4C 8024179C 864200A8 */ lh $v0, 0xa8($s2) -/* DBEA50 802417A0 3C0142C8 */ lui $at, 0x42c8 -/* DBEA54 802417A4 44812000 */ mtc1 $at, $f4 -/* DBEA58 802417A8 44823000 */ mtc1 $v0, $f6 -/* DBEA5C 802417AC 00000000 */ nop -/* DBEA60 802417B0 468031A0 */ cvt.s.w $f6, $f6 -/* DBEA64 802417B4 27A20044 */ addiu $v0, $sp, 0x44 -/* DBEA68 802417B8 E7A00038 */ swc1 $f0, 0x38($sp) -/* DBEA6C 802417BC C640003C */ lwc1 $f0, 0x3c($s2) -/* DBEA70 802417C0 C6420040 */ lwc1 $f2, 0x40($s2) -/* DBEA74 802417C4 46060000 */ add.s $f0, $f0, $f6 -/* DBEA78 802417C8 E7A40044 */ swc1 $f4, 0x44($sp) -/* DBEA7C 802417CC E7A20040 */ swc1 $f2, 0x40($sp) -/* DBEA80 802417D0 E7A0003C */ swc1 $f0, 0x3c($sp) -/* DBEA84 802417D4 AFA20010 */ sw $v0, 0x10($sp) -/* DBEA88 802417D8 8E440080 */ lw $a0, 0x80($s2) -/* DBEA8C 802417DC 0C0372DF */ jal func_800DCB7C -/* DBEA90 802417E0 27A70040 */ addiu $a3, $sp, 0x40 -/* DBEA94 802417E4 10400003 */ beqz $v0, .L802417F4 -/* DBEA98 802417E8 00000000 */ nop -/* DBEA9C 802417EC C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DBEAA0 802417F0 E640003C */ swc1 $f0, 0x3c($s2) -.L802417F4: -/* DBEAA4 802417F4 8E630070 */ lw $v1, 0x70($s3) -/* DBEAA8 802417F8 2C620064 */ sltiu $v0, $v1, 0x64 -/* DBEAAC 802417FC 10400054 */ beqz $v0, .L80241950 -/* DBEAB0 80241800 00031080 */ sll $v0, $v1, 2 -/* DBEAB4 80241804 3C018024 */ lui $at, 0x8024 -/* DBEAB8 80241808 00220821 */ addu $at, $at, $v0 -/* DBEABC 8024180C 8C226F20 */ lw $v0, 0x6f20($at) -/* DBEAC0 80241810 00400008 */ jr $v0 -/* DBEAC4 80241814 00000000 */ nop -/* DBEAC8 80241818 0260202D */ daddu $a0, $s3, $zero -/* DBEACC 8024181C 0280282D */ daddu $a1, $s4, $zero -/* DBEAD0 80241820 0C09015B */ jal func_8024056C -/* DBEAD4 80241824 02A0302D */ daddu $a2, $s5, $zero -/* DBEAD8 80241828 0260202D */ daddu $a0, $s3, $zero -/* DBEADC 8024182C 0280282D */ daddu $a1, $s4, $zero -/* DBEAE0 80241830 0C0901B1 */ jal func_802406C4 -/* DBEAE4 80241834 02A0302D */ daddu $a2, $s5, $zero -/* DBEAE8 80241838 08090654 */ j .L80241950 -/* DBEAEC 8024183C 00000000 */ nop -/* DBEAF0 80241840 0260202D */ daddu $a0, $s3, $zero -/* DBEAF4 80241844 0280282D */ daddu $a1, $s4, $zero -/* DBEAF8 80241848 0C09025B */ jal func_8024096C -/* DBEAFC 8024184C 02A0302D */ daddu $a2, $s5, $zero -/* DBEB00 80241850 0260202D */ daddu $a0, $s3, $zero -/* DBEB04 80241854 0280282D */ daddu $a1, $s4, $zero -/* DBEB08 80241858 0C09028B */ jal func_80240A2C -/* DBEB0C 8024185C 02A0302D */ daddu $a2, $s5, $zero -/* DBEB10 80241860 08090654 */ j .L80241950 -/* DBEB14 80241864 00000000 */ nop -/* DBEB18 80241868 0260202D */ daddu $a0, $s3, $zero -/* DBEB1C 8024186C 0280282D */ daddu $a1, $s4, $zero -/* DBEB20 80241870 0C0902FA */ jal func_80240BE8 -/* DBEB24 80241874 02A0302D */ daddu $a2, $s5, $zero -/* DBEB28 80241878 08090654 */ j .L80241950 -/* DBEB2C 8024187C 00000000 */ nop -/* DBEB30 80241880 0260202D */ daddu $a0, $s3, $zero -/* DBEB34 80241884 0280282D */ daddu $a1, $s4, $zero -/* DBEB38 80241888 0C090327 */ jal func_80240C9C -/* DBEB3C 8024188C 02A0302D */ daddu $a2, $s5, $zero -/* DBEB40 80241890 0260202D */ daddu $a0, $s3, $zero -/* DBEB44 80241894 0280282D */ daddu $a1, $s4, $zero -/* DBEB48 80241898 0C090344 */ jal func_80240D10 -/* DBEB4C 8024189C 02A0302D */ daddu $a2, $s5, $zero -/* DBEB50 802418A0 08090654 */ j .L80241950 -/* DBEB54 802418A4 00000000 */ nop -/* DBEB58 802418A8 0260202D */ daddu $a0, $s3, $zero -/* DBEB5C 802418AC 0280282D */ daddu $a1, $s4, $zero -/* DBEB60 802418B0 0C090362 */ jal func_80240D88 -/* DBEB64 802418B4 02A0302D */ daddu $a2, $s5, $zero -/* DBEB68 802418B8 0260202D */ daddu $a0, $s3, $zero -/* DBEB6C 802418BC 0280282D */ daddu $a1, $s4, $zero -/* DBEB70 802418C0 0C0903AE */ jal func_80240EB8 -/* DBEB74 802418C4 02A0302D */ daddu $a2, $s5, $zero -/* DBEB78 802418C8 08090654 */ j .L80241950 -/* DBEB7C 802418CC 00000000 */ nop -/* DBEB80 802418D0 0260202D */ daddu $a0, $s3, $zero -/* DBEB84 802418D4 0280282D */ daddu $a1, $s4, $zero -/* DBEB88 802418D8 0C0904FF */ jal func_802413FC -/* DBEB8C 802418DC 02A0302D */ daddu $a2, $s5, $zero -/* DBEB90 802418E0 8E630070 */ lw $v1, 0x70($s3) -/* DBEB94 802418E4 2402000F */ addiu $v0, $zero, 0xf -/* DBEB98 802418E8 14620019 */ bne $v1, $v0, .L80241950 -/* DBEB9C 802418EC 00000000 */ nop -/* DBEBA0 802418F0 0260202D */ daddu $a0, $s3, $zero -/* DBEBA4 802418F4 0280282D */ daddu $a1, $s4, $zero -/* DBEBA8 802418F8 0C09051B */ jal func_8024146C -/* DBEBAC 802418FC 02A0302D */ daddu $a2, $s5, $zero -/* DBEBB0 80241900 8E630070 */ lw $v1, 0x70($s3) -/* DBEBB4 80241904 24020010 */ addiu $v0, $zero, 0x10 -/* DBEBB8 80241908 14620011 */ bne $v1, $v0, .L80241950 -/* DBEBBC 8024190C 00000000 */ nop -/* DBEBC0 80241910 0260202D */ daddu $a0, $s3, $zero -/* DBEBC4 80241914 0280282D */ daddu $a1, $s4, $zero -/* DBEBC8 80241918 0C09054F */ jal func_8024153C -/* DBEBCC 8024191C 02A0302D */ daddu $a2, $s5, $zero -/* DBEBD0 80241920 8E630070 */ lw $v1, 0x70($s3) -/* DBEBD4 80241924 24020011 */ addiu $v0, $zero, 0x11 -/* DBEBD8 80241928 14620009 */ bne $v1, $v0, .L80241950 -/* DBEBDC 8024192C 00000000 */ nop -/* DBEBE0 80241930 0260202D */ daddu $a0, $s3, $zero -/* DBEBE4 80241934 0280282D */ daddu $a1, $s4, $zero -/* DBEBE8 80241938 0C090575 */ jal func_802415D4 -/* DBEBEC 8024193C 02A0302D */ daddu $a2, $s5, $zero -/* DBEBF0 80241940 08090654 */ j .L80241950 -/* DBEBF4 80241944 00000000 */ nop -/* DBEBF8 80241948 0C0129CF */ jal func_8004A73C -/* DBEBFC 8024194C 0260202D */ daddu $a0, $s3, $zero -.L80241950: -/* DBEC00 80241950 8FBF0060 */ lw $ra, 0x60($sp) -/* DBEC04 80241954 8FB5005C */ lw $s5, 0x5c($sp) -/* DBEC08 80241958 8FB40058 */ lw $s4, 0x58($sp) -/* DBEC0C 8024195C 8FB30054 */ lw $s3, 0x54($sp) -/* DBEC10 80241960 8FB20050 */ lw $s2, 0x50($sp) -/* DBEC14 80241964 8FB1004C */ lw $s1, 0x4c($sp) -/* DBEC18 80241968 8FB00048 */ lw $s0, 0x48($sp) -/* DBEC1C 8024196C 0000102D */ daddu $v0, $zero, $zero -/* DBEC20 80241970 03E00008 */ jr $ra -/* DBEC24 80241974 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80241978_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80241978_DBD2B0.s deleted file mode 100644 index 14e7841027..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80241978_DBD2B0.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241978_DBEC28 -/* DBEC28 80241978 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DBEC2C 8024197C AFB3002C */ sw $s3, 0x2c($sp) -/* DBEC30 80241980 0080982D */ daddu $s3, $a0, $zero -/* DBEC34 80241984 AFBF0030 */ sw $ra, 0x30($sp) -/* DBEC38 80241988 AFB20028 */ sw $s2, 0x28($sp) -/* DBEC3C 8024198C AFB10024 */ sw $s1, 0x24($sp) -/* DBEC40 80241990 AFB00020 */ sw $s0, 0x20($sp) -/* DBEC44 80241994 8E710148 */ lw $s1, 0x148($s3) -/* DBEC48 80241998 86240008 */ lh $a0, 8($s1) -/* DBEC4C 8024199C 0C00EABB */ jal get_npc_unsafe -/* DBEC50 802419A0 00A0902D */ daddu $s2, $a1, $zero -/* DBEC54 802419A4 8E440004 */ lw $a0, 4($s2) -/* DBEC58 802419A8 0040802D */ daddu $s0, $v0, $zero -/* DBEC5C 802419AC 00041FC2 */ srl $v1, $a0, 0x1f -/* DBEC60 802419B0 00832021 */ addu $a0, $a0, $v1 -/* DBEC64 802419B4 00042043 */ sra $a0, $a0, 1 -/* DBEC68 802419B8 0C00A67F */ jal rand_int -/* DBEC6C 802419BC 24840001 */ addiu $a0, $a0, 1 -/* DBEC70 802419C0 8E430004 */ lw $v1, 4($s2) -/* DBEC74 802419C4 000327C2 */ srl $a0, $v1, 0x1f -/* DBEC78 802419C8 00641821 */ addu $v1, $v1, $a0 -/* DBEC7C 802419CC 00031843 */ sra $v1, $v1, 1 -/* DBEC80 802419D0 00621821 */ addu $v1, $v1, $v0 -/* DBEC84 802419D4 A603008E */ sh $v1, 0x8e($s0) -/* DBEC88 802419D8 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBEC8C 802419DC C6000040 */ lwc1 $f0, 0x40($s0) -/* DBEC90 802419E0 C4640000 */ lwc1 $f4, ($v1) -/* DBEC94 802419E4 46802120 */ cvt.s.w $f4, $f4 -/* DBEC98 802419E8 C4620008 */ lwc1 $f2, 8($v1) -/* DBEC9C 802419EC 468010A0 */ cvt.s.w $f2, $f2 -/* DBECA0 802419F0 E7A00010 */ swc1 $f0, 0x10($sp) -/* DBECA4 802419F4 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBECA8 802419F8 44061000 */ mfc1 $a2, $f2 -/* DBECAC 802419FC C440000C */ lwc1 $f0, 0xc($v0) -/* DBECB0 80241A00 46800020 */ cvt.s.w $f0, $f0 -/* DBECB4 80241A04 E7A00014 */ swc1 $f0, 0x14($sp) -/* DBECB8 80241A08 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBECBC 80241A0C 44052000 */ mfc1 $a1, $f4 -/* DBECC0 80241A10 C4400010 */ lwc1 $f0, 0x10($v0) -/* DBECC4 80241A14 46800020 */ cvt.s.w $f0, $f0 -/* DBECC8 80241A18 E7A00018 */ swc1 $f0, 0x18($sp) -/* DBECCC 80241A1C 8C640018 */ lw $a0, 0x18($v1) -/* DBECD0 80241A20 0C0123F5 */ jal is_point_within_region -/* DBECD4 80241A24 8E070038 */ lw $a3, 0x38($s0) -/* DBECD8 80241A28 1040000E */ beqz $v0, .L80241A64 -/* DBECDC 80241A2C 00000000 */ nop -/* DBECE0 80241A30 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBECE4 80241A34 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DBECE8 80241A38 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DBECEC 80241A3C C4460000 */ lwc1 $f6, ($v0) -/* DBECF0 80241A40 468031A0 */ cvt.s.w $f6, $f6 -/* DBECF4 80241A44 44063000 */ mfc1 $a2, $f6 -/* DBECF8 80241A48 C4460008 */ lwc1 $f6, 8($v0) -/* DBECFC 80241A4C 468031A0 */ cvt.s.w $f6, $f6 -/* DBED00 80241A50 44073000 */ mfc1 $a3, $f6 -/* DBED04 80241A54 0C00A720 */ jal atan2 -/* DBED08 80241A58 00000000 */ nop -/* DBED0C 80241A5C 080906A5 */ j .L80241A94 -/* DBED10 80241A60 E600000C */ swc1 $f0, 0xc($s0) -.L80241A64: -/* DBED14 80241A64 0C00A67F */ jal rand_int -/* DBED18 80241A68 2404003C */ addiu $a0, $zero, 0x3c -/* DBED1C 80241A6C C60C000C */ lwc1 $f12, 0xc($s0) -/* DBED20 80241A70 44820000 */ mtc1 $v0, $f0 -/* DBED24 80241A74 00000000 */ nop -/* DBED28 80241A78 46800020 */ cvt.s.w $f0, $f0 -/* DBED2C 80241A7C 46006300 */ add.s $f12, $f12, $f0 -/* DBED30 80241A80 3C0141F0 */ lui $at, 0x41f0 -/* DBED34 80241A84 44810000 */ mtc1 $at, $f0 -/* DBED38 80241A88 0C00A6C9 */ jal clamp_angle -/* DBED3C 80241A8C 46006301 */ sub.s $f12, $f12, $f0 -/* DBED40 80241A90 E600000C */ swc1 $f0, 0xc($s0) -.L80241A94: -/* DBED44 80241A94 8E2200CC */ lw $v0, 0xcc($s1) -/* DBED48 80241A98 8C420004 */ lw $v0, 4($v0) -/* DBED4C 80241A9C AE020028 */ sw $v0, 0x28($s0) -/* DBED50 80241AA0 AE600074 */ sw $zero, 0x74($s3) -/* DBED54 80241AA4 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBED58 80241AA8 8C420014 */ lw $v0, 0x14($v0) -/* DBED5C 80241AAC 04410004 */ bgez $v0, .L80241AC0 -/* DBED60 80241AB0 00000000 */ nop -/* DBED64 80241AB4 C6400000 */ lwc1 $f0, ($s2) -/* DBED68 80241AB8 080906B8 */ j .L80241AE0 -/* DBED6C 80241ABC E6000018 */ swc1 $f0, 0x18($s0) -.L80241AC0: -/* DBED70 80241AC0 3C018024 */ lui $at, 0x8024 -/* DBED74 80241AC4 D42270B0 */ ldc1 $f2, 0x70b0($at) -/* DBED78 80241AC8 44820000 */ mtc1 $v0, $f0 -/* DBED7C 80241ACC 00000000 */ nop -/* DBED80 80241AD0 46800021 */ cvt.d.w $f0, $f0 -/* DBED84 80241AD4 46220003 */ div.d $f0, $f0, $f2 -/* DBED88 80241AD8 46200020 */ cvt.s.d $f0, $f0 -/* DBED8C 80241ADC E6000018 */ swc1 $f0, 0x18($s0) -.L80241AE0: -/* DBED90 80241AE0 C600003C */ lwc1 $f0, 0x3c($s0) -/* DBED94 80241AE4 3C014059 */ lui $at, 0x4059 -/* DBED98 80241AE8 44811800 */ mtc1 $at, $f3 -/* DBED9C 80241AEC 44801000 */ mtc1 $zero, $f2 -/* DBEDA0 80241AF0 46000021 */ cvt.d.s $f0, $f0 -/* DBEDA4 80241AF4 46220002 */ mul.d $f0, $f0, $f2 -/* DBEDA8 80241AF8 00000000 */ nop -/* DBEDAC 80241AFC 24020001 */ addiu $v0, $zero, 1 -/* DBEDB0 80241B00 4620018D */ trunc.w.d $f6, $f0 -/* DBEDB4 80241B04 E626007C */ swc1 $f6, 0x7c($s1) -/* DBEDB8 80241B08 AE620070 */ sw $v0, 0x70($s3) -/* DBEDBC 80241B0C 8FBF0030 */ lw $ra, 0x30($sp) -/* DBEDC0 80241B10 8FB3002C */ lw $s3, 0x2c($sp) -/* DBEDC4 80241B14 8FB20028 */ lw $s2, 0x28($sp) -/* DBEDC8 80241B18 8FB10024 */ lw $s1, 0x24($sp) -/* DBEDCC 80241B1C 8FB00020 */ lw $s0, 0x20($sp) -/* DBEDD0 80241B20 03E00008 */ jr $ra -/* DBEDD4 80241B24 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80241B28_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80241B28_DBD2B0.s deleted file mode 100644 index 871cfcfb2a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80241B28_DBD2B0.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B28_DBEDD8 -/* DBEDD8 80241B28 27BDFF80 */ addiu $sp, $sp, -0x80 -/* DBEDDC 80241B2C AFB3004C */ sw $s3, 0x4c($sp) -/* DBEDE0 80241B30 0080982D */ daddu $s3, $a0, $zero -/* DBEDE4 80241B34 AFBF0058 */ sw $ra, 0x58($sp) -/* DBEDE8 80241B38 AFB50054 */ sw $s5, 0x54($sp) -/* DBEDEC 80241B3C AFB40050 */ sw $s4, 0x50($sp) -/* DBEDF0 80241B40 AFB20048 */ sw $s2, 0x48($sp) -/* DBEDF4 80241B44 AFB10044 */ sw $s1, 0x44($sp) -/* DBEDF8 80241B48 AFB00040 */ sw $s0, 0x40($sp) -/* DBEDFC 80241B4C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* DBEE00 80241B50 F7B80070 */ sdc1 $f24, 0x70($sp) -/* DBEE04 80241B54 F7B60068 */ sdc1 $f22, 0x68($sp) -/* DBEE08 80241B58 F7B40060 */ sdc1 $f20, 0x60($sp) -/* DBEE0C 80241B5C 8E710148 */ lw $s1, 0x148($s3) -/* DBEE10 80241B60 00A0902D */ daddu $s2, $a1, $zero -/* DBEE14 80241B64 86240008 */ lh $a0, 8($s1) -/* DBEE18 80241B68 0C00EABB */ jal get_npc_unsafe -/* DBEE1C 80241B6C 00C0A82D */ daddu $s5, $a2, $zero -/* DBEE20 80241B70 0040802D */ daddu $s0, $v0, $zero -/* DBEE24 80241B74 0000A02D */ daddu $s4, $zero, $zero -/* DBEE28 80241B78 C624007C */ lwc1 $f4, 0x7c($s1) -/* DBEE2C 80241B7C 46802120 */ cvt.s.w $f4, $f4 -/* DBEE30 80241B80 C6220088 */ lwc1 $f2, 0x88($s1) -/* DBEE34 80241B84 468010A0 */ cvt.s.w $f2, $f2 -/* DBEE38 80241B88 460010A1 */ cvt.d.s $f2, $f2 -/* DBEE3C 80241B8C 46002121 */ cvt.d.s $f4, $f4 -/* DBEE40 80241B90 C600003C */ lwc1 $f0, 0x3c($s0) -/* DBEE44 80241B94 3C014059 */ lui $at, 0x4059 -/* DBEE48 80241B98 44813800 */ mtc1 $at, $f7 -/* DBEE4C 80241B9C 44803000 */ mtc1 $zero, $f6 -/* DBEE50 80241BA0 46000021 */ cvt.d.s $f0, $f0 -/* DBEE54 80241BA4 46260002 */ mul.d $f0, $f0, $f6 -/* DBEE58 80241BA8 00000000 */ nop -/* DBEE5C 80241BAC 24020001 */ addiu $v0, $zero, 1 -/* DBEE60 80241BB0 8E24006C */ lw $a0, 0x6c($s1) -/* DBEE64 80241BB4 46261083 */ div.d $f2, $f2, $f6 -/* DBEE68 80241BB8 462010A0 */ cvt.s.d $f2, $f2 -/* DBEE6C 80241BBC 46262103 */ div.d $f4, $f4, $f6 -/* DBEE70 80241BC0 46202520 */ cvt.s.d $f20, $f4 -/* DBEE74 80241BC4 30830011 */ andi $v1, $a0, 0x11 -/* DBEE78 80241BC8 4620020D */ trunc.w.d $f8, $f0 -/* DBEE7C 80241BCC E628007C */ swc1 $f8, 0x7c($s1) -/* DBEE80 80241BD0 C6200078 */ lwc1 $f0, 0x78($s1) -/* DBEE84 80241BD4 46800020 */ cvt.s.w $f0, $f0 -/* DBEE88 80241BD8 46000021 */ cvt.d.s $f0, $f0 -/* DBEE8C 80241BDC 46260003 */ div.d $f0, $f0, $f6 -/* DBEE90 80241BE0 462006A0 */ cvt.s.d $f26, $f0 -/* DBEE94 80241BE4 C6200070 */ lwc1 $f0, 0x70($s1) -/* DBEE98 80241BE8 46800020 */ cvt.s.w $f0, $f0 -/* DBEE9C 80241BEC 46000021 */ cvt.d.s $f0, $f0 -/* DBEEA0 80241BF0 46260003 */ div.d $f0, $f0, $f6 -/* DBEEA4 80241BF4 462005A0 */ cvt.s.d $f22, $f0 -/* DBEEA8 80241BF8 14620025 */ bne $v1, $v0, .L80241C90 -/* DBEEAC 80241BFC 4602D600 */ add.s $f24, $f26, $f2 -/* DBEEB0 80241C00 8E020000 */ lw $v0, ($s0) -/* DBEEB4 80241C04 30420008 */ andi $v0, $v0, 8 -/* DBEEB8 80241C08 10400009 */ beqz $v0, .L80241C30 -/* DBEEBC 80241C0C 27A50028 */ addiu $a1, $sp, 0x28 -/* DBEEC0 80241C10 C600003C */ lwc1 $f0, 0x3c($s0) -/* DBEEC4 80241C14 4600C001 */ sub.s $f0, $f24, $f0 -/* DBEEC8 80241C18 4600B03C */ c.lt.s $f22, $f0 -/* DBEECC 80241C1C 00000000 */ nop -/* DBEED0 80241C20 4500001B */ bc1f .L80241C90 -/* DBEED4 80241C24 34820010 */ ori $v0, $a0, 0x10 -/* DBEED8 80241C28 08090724 */ j .L80241C90 -/* DBEEDC 80241C2C AE22006C */ sw $v0, 0x6c($s1) -.L80241C30: -/* DBEEE0 80241C30 27A6002C */ addiu $a2, $sp, 0x2c -/* DBEEE4 80241C34 C6000038 */ lwc1 $f0, 0x38($s0) -/* DBEEE8 80241C38 C602003C */ lwc1 $f2, 0x3c($s0) -/* DBEEEC 80241C3C C6040040 */ lwc1 $f4, 0x40($s0) -/* DBEEF0 80241C40 3C01447A */ lui $at, 0x447a -/* DBEEF4 80241C44 44813000 */ mtc1 $at, $f6 -/* DBEEF8 80241C48 27A20034 */ addiu $v0, $sp, 0x34 -/* DBEEFC 80241C4C E7A00028 */ swc1 $f0, 0x28($sp) -/* DBEF00 80241C50 E7A2002C */ swc1 $f2, 0x2c($sp) -/* DBEF04 80241C54 E7A40030 */ swc1 $f4, 0x30($sp) -/* DBEF08 80241C58 E7A60034 */ swc1 $f6, 0x34($sp) -/* DBEF0C 80241C5C AFA20010 */ sw $v0, 0x10($sp) -/* DBEF10 80241C60 8E040080 */ lw $a0, 0x80($s0) -/* DBEF14 80241C64 0C0372DF */ jal func_800DCB7C -/* DBEF18 80241C68 27A70030 */ addiu $a3, $sp, 0x30 -/* DBEF1C 80241C6C C7A00034 */ lwc1 $f0, 0x34($sp) -/* DBEF20 80241C70 4600D001 */ sub.s $f0, $f26, $f0 -/* DBEF24 80241C74 4600B03C */ c.lt.s $f22, $f0 -/* DBEF28 80241C78 00000000 */ nop -/* DBEF2C 80241C7C 45000004 */ bc1f .L80241C90 -/* DBEF30 80241C80 00000000 */ nop -/* DBEF34 80241C84 8E22006C */ lw $v0, 0x6c($s1) -/* DBEF38 80241C88 34420010 */ ori $v0, $v0, 0x10 -/* DBEF3C 80241C8C AE22006C */ sw $v0, 0x6c($s1) -.L80241C90: -/* DBEF40 80241C90 8E22006C */ lw $v0, 0x6c($s1) -/* DBEF44 80241C94 24030011 */ addiu $v1, $zero, 0x11 -/* DBEF48 80241C98 30420011 */ andi $v0, $v0, 0x11 -/* DBEF4C 80241C9C 14430039 */ bne $v0, $v1, .L80241D84 -/* DBEF50 80241CA0 00000000 */ nop -/* DBEF54 80241CA4 8E020000 */ lw $v0, ($s0) -/* DBEF58 80241CA8 30420008 */ andi $v0, $v0, 8 -/* DBEF5C 80241CAC 1040000A */ beqz $v0, .L80241CD8 -/* DBEF60 80241CB0 4600C106 */ mov.s $f4, $f24 -/* DBEF64 80241CB4 4614C081 */ sub.s $f2, $f24, $f20 -/* DBEF68 80241CB8 3C018024 */ lui $at, 0x8024 -/* DBEF6C 80241CBC D42070B8 */ ldc1 $f0, 0x70b8($at) -/* DBEF70 80241CC0 460010A1 */ cvt.d.s $f2, $f2 -/* DBEF74 80241CC4 46201082 */ mul.d $f2, $f2, $f0 -/* DBEF78 80241CC8 00000000 */ nop -/* DBEF7C 80241CCC 4600A021 */ cvt.d.s $f0, $f20 -/* DBEF80 80241CD0 0809074F */ j .L80241D3C -/* DBEF84 80241CD4 46220000 */ add.d $f0, $f0, $f2 -.L80241CD8: -/* DBEF88 80241CD8 27A50028 */ addiu $a1, $sp, 0x28 -/* DBEF8C 80241CDC 27A6002C */ addiu $a2, $sp, 0x2c -/* DBEF90 80241CE0 C6000038 */ lwc1 $f0, 0x38($s0) -/* DBEF94 80241CE4 C6020040 */ lwc1 $f2, 0x40($s0) -/* DBEF98 80241CE8 3C01447A */ lui $at, 0x447a -/* DBEF9C 80241CEC 44812000 */ mtc1 $at, $f4 -/* DBEFA0 80241CF0 27A20034 */ addiu $v0, $sp, 0x34 -/* DBEFA4 80241CF4 E7B4002C */ swc1 $f20, 0x2c($sp) -/* DBEFA8 80241CF8 E7A00028 */ swc1 $f0, 0x28($sp) -/* DBEFAC 80241CFC E7A20030 */ swc1 $f2, 0x30($sp) -/* DBEFB0 80241D00 E7A40034 */ swc1 $f4, 0x34($sp) -/* DBEFB4 80241D04 AFA20010 */ sw $v0, 0x10($sp) -/* DBEFB8 80241D08 8E040080 */ lw $a0, 0x80($s0) -/* DBEFBC 80241D0C 0C0372DF */ jal func_800DCB7C -/* DBEFC0 80241D10 27A70030 */ addiu $a3, $sp, 0x30 -/* DBEFC4 80241D14 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* DBEFC8 80241D18 461A2100 */ add.s $f4, $f4, $f26 -/* DBEFCC 80241D1C 46142081 */ sub.s $f2, $f4, $f20 -/* DBEFD0 80241D20 3C018024 */ lui $at, 0x8024 -/* DBEFD4 80241D24 D42070C0 */ ldc1 $f0, 0x70c0($at) -/* DBEFD8 80241D28 460010A1 */ cvt.d.s $f2, $f2 -/* DBEFDC 80241D2C 46201082 */ mul.d $f2, $f2, $f0 -/* DBEFE0 80241D30 00000000 */ nop -/* DBEFE4 80241D34 4600A021 */ cvt.d.s $f0, $f20 -/* DBEFE8 80241D38 46220000 */ add.d $f0, $f0, $f2 -.L80241D3C: -/* DBEFEC 80241D3C 46200020 */ cvt.s.d $f0, $f0 -/* DBEFF0 80241D40 E600003C */ swc1 $f0, 0x3c($s0) -/* DBEFF4 80241D44 C600003C */ lwc1 $f0, 0x3c($s0) -/* DBEFF8 80241D48 46002001 */ sub.s $f0, $f4, $f0 -/* DBEFFC 80241D4C 3C013FF0 */ lui $at, 0x3ff0 -/* DBF000 80241D50 44811800 */ mtc1 $at, $f3 -/* DBF004 80241D54 44801000 */ mtc1 $zero, $f2 -/* DBF008 80241D58 46000005 */ abs.s $f0, $f0 -/* DBF00C 80241D5C 46000021 */ cvt.d.s $f0, $f0 -/* DBF010 80241D60 4622003C */ c.lt.d $f0, $f2 -/* DBF014 80241D64 00000000 */ nop -/* DBF018 80241D68 45000036 */ bc1f .L80241E44 -/* DBF01C 80241D6C 2403FFEF */ addiu $v1, $zero, -0x11 -/* DBF020 80241D70 E604003C */ swc1 $f4, 0x3c($s0) -/* DBF024 80241D74 8E22006C */ lw $v0, 0x6c($s1) -/* DBF028 80241D78 00431024 */ and $v0, $v0, $v1 -/* DBF02C 80241D7C 08090791 */ j .L80241E44 -/* DBF030 80241D80 AE22006C */ sw $v0, 0x6c($s1) -.L80241D84: -/* DBF034 80241D84 8E220070 */ lw $v0, 0x70($s1) -/* DBF038 80241D88 1840002E */ blez $v0, .L80241E44 -/* DBF03C 80241D8C 00000000 */ nop -/* DBF040 80241D90 C62C0074 */ lwc1 $f12, 0x74($s1) -/* DBF044 80241D94 0C00A8BB */ jal sin_deg -/* DBF048 80241D98 46806320 */ cvt.s.w $f12, $f12 -/* DBF04C 80241D9C 8E020000 */ lw $v0, ($s0) -/* DBF050 80241DA0 30420008 */ andi $v0, $v0, 8 -/* DBF054 80241DA4 10400003 */ beqz $v0, .L80241DB4 -/* DBF058 80241DA8 46000506 */ mov.s $f20, $f0 -/* DBF05C 80241DAC 0809077D */ j .L80241DF4 -/* DBF060 80241DB0 0000102D */ daddu $v0, $zero, $zero -.L80241DB4: -/* DBF064 80241DB4 27A50028 */ addiu $a1, $sp, 0x28 -/* DBF068 80241DB8 27A6002C */ addiu $a2, $sp, 0x2c -/* DBF06C 80241DBC C6000038 */ lwc1 $f0, 0x38($s0) -/* DBF070 80241DC0 C602003C */ lwc1 $f2, 0x3c($s0) -/* DBF074 80241DC4 C6040040 */ lwc1 $f4, 0x40($s0) -/* DBF078 80241DC8 3C01447A */ lui $at, 0x447a -/* DBF07C 80241DCC 44813000 */ mtc1 $at, $f6 -/* DBF080 80241DD0 27A20034 */ addiu $v0, $sp, 0x34 -/* DBF084 80241DD4 E7A00028 */ swc1 $f0, 0x28($sp) -/* DBF088 80241DD8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* DBF08C 80241DDC E7A40030 */ swc1 $f4, 0x30($sp) -/* DBF090 80241DE0 E7A60034 */ swc1 $f6, 0x34($sp) -/* DBF094 80241DE4 AFA20010 */ sw $v0, 0x10($sp) -/* DBF098 80241DE8 8E040080 */ lw $a0, 0x80($s0) -/* DBF09C 80241DEC 0C0372DF */ jal func_800DCB7C -/* DBF0A0 80241DF0 27A70030 */ addiu $a3, $sp, 0x30 -.L80241DF4: -/* DBF0A4 80241DF4 10400007 */ beqz $v0, .L80241E14 -/* DBF0A8 80241DF8 00000000 */ nop -/* DBF0AC 80241DFC 4616A082 */ mul.s $f2, $f20, $f22 -/* DBF0B0 80241E00 00000000 */ nop -/* DBF0B4 80241E04 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DBF0B8 80241E08 461A0000 */ add.s $f0, $f0, $f26 -/* DBF0BC 80241E0C 08090788 */ j .L80241E20 -/* DBF0C0 80241E10 46020000 */ add.s $f0, $f0, $f2 -.L80241E14: -/* DBF0C4 80241E14 4616A002 */ mul.s $f0, $f20, $f22 -/* DBF0C8 80241E18 00000000 */ nop -/* DBF0CC 80241E1C 4600C000 */ add.s $f0, $f24, $f0 -.L80241E20: -/* DBF0D0 80241E20 E600003C */ swc1 $f0, 0x3c($s0) -/* DBF0D4 80241E24 8E220074 */ lw $v0, 0x74($s1) -/* DBF0D8 80241E28 2442000A */ addiu $v0, $v0, 0xa -/* DBF0DC 80241E2C 44826000 */ mtc1 $v0, $f12 -/* DBF0E0 80241E30 00000000 */ nop -/* DBF0E4 80241E34 0C00A6C9 */ jal clamp_angle -/* DBF0E8 80241E38 46806320 */ cvt.s.w $f12, $f12 -/* DBF0EC 80241E3C 4600020D */ trunc.w.s $f8, $f0 -/* DBF0F0 80241E40 E6280074 */ swc1 $f8, 0x74($s1) -.L80241E44: -/* DBF0F4 80241E44 8E220090 */ lw $v0, 0x90($s1) -/* DBF0F8 80241E48 1C40004A */ bgtz $v0, .L80241F74 -/* DBF0FC 80241E4C 2442FFFF */ addiu $v0, $v0, -1 -/* DBF100 80241E50 8E430014 */ lw $v1, 0x14($s2) -/* DBF104 80241E54 04600048 */ bltz $v1, .L80241F78 -/* DBF108 80241E58 00000000 */ nop -/* DBF10C 80241E5C 8E620074 */ lw $v0, 0x74($s3) -/* DBF110 80241E60 1C400042 */ bgtz $v0, .L80241F6C -/* DBF114 80241E64 2442FFFF */ addiu $v0, $v0, -1 -/* DBF118 80241E68 AE630074 */ sw $v1, 0x74($s3) -/* DBF11C 80241E6C 860200A8 */ lh $v0, 0xa8($s0) -/* DBF120 80241E70 C602003C */ lwc1 $f2, 0x3c($s0) -/* DBF124 80241E74 44820000 */ mtc1 $v0, $f0 -/* DBF128 80241E78 00000000 */ nop -/* DBF12C 80241E7C 46800020 */ cvt.s.w $f0, $f0 -/* DBF130 80241E80 46001080 */ add.s $f2, $f2, $f0 -/* DBF134 80241E84 3C014024 */ lui $at, 0x4024 -/* DBF138 80241E88 44810800 */ mtc1 $at, $f1 -/* DBF13C 80241E8C 44800000 */ mtc1 $zero, $f0 -/* DBF140 80241E90 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DBF144 80241E94 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DBF148 80241E98 460010A1 */ cvt.d.s $f2, $f2 -/* DBF14C 80241E9C 46201080 */ add.d $f2, $f2, $f0 -/* DBF150 80241EA0 C440002C */ lwc1 $f0, 0x2c($v0) -/* DBF154 80241EA4 46000021 */ cvt.d.s $f0, $f0 -/* DBF158 80241EA8 4622003C */ c.lt.d $f0, $f2 -/* DBF15C 80241EAC 00000000 */ nop -/* DBF160 80241EB0 4500002C */ bc1f .L80241F64 -/* DBF164 80241EB4 02A0202D */ daddu $a0, $s5, $zero -/* DBF168 80241EB8 AFA00010 */ sw $zero, 0x10($sp) -/* DBF16C 80241EBC 8E46000C */ lw $a2, 0xc($s2) -/* DBF170 80241EC0 8E470010 */ lw $a3, 0x10($s2) -/* DBF174 80241EC4 0C01242D */ jal func_800490B4 -/* DBF178 80241EC8 0220282D */ daddu $a1, $s1, $zero -/* DBF17C 80241ECC 10400025 */ beqz $v0, .L80241F64 -/* DBF180 80241ED0 0000202D */ daddu $a0, $zero, $zero -/* DBF184 80241ED4 0200282D */ daddu $a1, $s0, $zero -/* DBF188 80241ED8 0000302D */ daddu $a2, $zero, $zero -/* DBF18C 80241EDC 2412000C */ addiu $s2, $zero, 0xc -/* DBF190 80241EE0 860300A8 */ lh $v1, 0xa8($s0) -/* DBF194 80241EE4 3C013F80 */ lui $at, 0x3f80 -/* DBF198 80241EE8 44810000 */ mtc1 $at, $f0 -/* DBF19C 80241EEC 3C014000 */ lui $at, 0x4000 -/* DBF1A0 80241EF0 44811000 */ mtc1 $at, $f2 -/* DBF1A4 80241EF4 3C01C1A0 */ lui $at, 0xc1a0 -/* DBF1A8 80241EF8 44812000 */ mtc1 $at, $f4 -/* DBF1AC 80241EFC 44834000 */ mtc1 $v1, $f8 -/* DBF1B0 80241F00 00000000 */ nop -/* DBF1B4 80241F04 46804220 */ cvt.s.w $f8, $f8 -/* DBF1B8 80241F08 44074000 */ mfc1 $a3, $f8 -/* DBF1BC 80241F0C 27A20038 */ addiu $v0, $sp, 0x38 -/* DBF1C0 80241F10 AFB2001C */ sw $s2, 0x1c($sp) -/* DBF1C4 80241F14 AFA20020 */ sw $v0, 0x20($sp) -/* DBF1C8 80241F18 E7A00010 */ swc1 $f0, 0x10($sp) -/* DBF1CC 80241F1C E7A20014 */ swc1 $f2, 0x14($sp) -/* DBF1D0 80241F20 0C01BFA4 */ jal fx_emote -/* DBF1D4 80241F24 E7A40018 */ swc1 $f4, 0x18($sp) -/* DBF1D8 80241F28 0200202D */ daddu $a0, $s0, $zero -/* DBF1DC 80241F2C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DBF1E0 80241F30 C480003C */ lwc1 $f0, 0x3c($a0) -/* DBF1E4 80241F34 3C060020 */ lui $a2, 0x20 -/* DBF1E8 80241F38 0C012530 */ jal func_800494C0 -/* DBF1EC 80241F3C E4800064 */ swc1 $f0, 0x64($a0) -/* DBF1F0 80241F40 8E220018 */ lw $v0, 0x18($s1) -/* DBF1F4 80241F44 9442002A */ lhu $v0, 0x2a($v0) -/* DBF1F8 80241F48 30420001 */ andi $v0, $v0, 1 -/* DBF1FC 80241F4C 10400003 */ beqz $v0, .L80241F5C -/* DBF200 80241F50 2402000A */ addiu $v0, $zero, 0xa -/* DBF204 80241F54 08090847 */ j .L8024211C -/* DBF208 80241F58 AE620070 */ sw $v0, 0x70($s3) -.L80241F5C: -/* DBF20C 80241F5C 08090847 */ j .L8024211C -/* DBF210 80241F60 AE720070 */ sw $s2, 0x70($s3) -.L80241F64: -/* DBF214 80241F64 8E620074 */ lw $v0, 0x74($s3) -/* DBF218 80241F68 2442FFFF */ addiu $v0, $v0, -1 -.L80241F6C: -/* DBF21C 80241F6C 080907DE */ j .L80241F78 -/* DBF220 80241F70 AE620074 */ sw $v0, 0x74($s3) -.L80241F74: -/* DBF224 80241F74 AE220090 */ sw $v0, 0x90($s1) -.L80241F78: -/* DBF228 80241F78 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBF22C 80241F7C C6000040 */ lwc1 $f0, 0x40($s0) -/* DBF230 80241F80 C4620000 */ lwc1 $f2, ($v1) -/* DBF234 80241F84 468010A0 */ cvt.s.w $f2, $f2 -/* DBF238 80241F88 C4640008 */ lwc1 $f4, 8($v1) -/* DBF23C 80241F8C 46802120 */ cvt.s.w $f4, $f4 -/* DBF240 80241F90 E7A00010 */ swc1 $f0, 0x10($sp) -/* DBF244 80241F94 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBF248 80241F98 44051000 */ mfc1 $a1, $f2 -/* DBF24C 80241F9C C440000C */ lwc1 $f0, 0xc($v0) -/* DBF250 80241FA0 46800020 */ cvt.s.w $f0, $f0 -/* DBF254 80241FA4 E7A00014 */ swc1 $f0, 0x14($sp) -/* DBF258 80241FA8 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBF25C 80241FAC 44062000 */ mfc1 $a2, $f4 -/* DBF260 80241FB0 C4400010 */ lwc1 $f0, 0x10($v0) -/* DBF264 80241FB4 46800020 */ cvt.s.w $f0, $f0 -/* DBF268 80241FB8 E7A00018 */ swc1 $f0, 0x18($sp) -/* DBF26C 80241FBC 8C640018 */ lw $a0, 0x18($v1) -/* DBF270 80241FC0 0C0123F5 */ jal is_point_within_region -/* DBF274 80241FC4 8E070038 */ lw $a3, 0x38($s0) -/* DBF278 80241FC8 1040001A */ beqz $v0, .L80242034 -/* DBF27C 80241FCC 00000000 */ nop -/* DBF280 80241FD0 8E060038 */ lw $a2, 0x38($s0) -/* DBF284 80241FD4 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBF288 80241FD8 8E070040 */ lw $a3, 0x40($s0) -/* DBF28C 80241FDC C44C0000 */ lwc1 $f12, ($v0) -/* DBF290 80241FE0 46806320 */ cvt.s.w $f12, $f12 -/* DBF294 80241FE4 C44E0008 */ lwc1 $f14, 8($v0) -/* DBF298 80241FE8 0C00A7B5 */ jal dist2D -/* DBF29C 80241FEC 468073A0 */ cvt.s.w $f14, $f14 -/* DBF2A0 80241FF0 C6020018 */ lwc1 $f2, 0x18($s0) -/* DBF2A4 80241FF4 4600103C */ c.lt.s $f2, $f0 -/* DBF2A8 80241FF8 00000000 */ nop -/* DBF2AC 80241FFC 4500000D */ bc1f .L80242034 -/* DBF2B0 80242000 E7A00034 */ swc1 $f0, 0x34($sp) -/* DBF2B4 80242004 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DBF2B8 80242008 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBF2BC 8024200C C60E0040 */ lwc1 $f14, 0x40($s0) -/* DBF2C0 80242010 C4480000 */ lwc1 $f8, ($v0) -/* DBF2C4 80242014 46804220 */ cvt.s.w $f8, $f8 -/* DBF2C8 80242018 44064000 */ mfc1 $a2, $f8 -/* DBF2CC 8024201C C4480008 */ lwc1 $f8, 8($v0) -/* DBF2D0 80242020 46804220 */ cvt.s.w $f8, $f8 -/* DBF2D4 80242024 44074000 */ mfc1 $a3, $f8 -/* DBF2D8 80242028 0C00A720 */ jal atan2 -/* DBF2DC 8024202C 24140001 */ addiu $s4, $zero, 1 -/* DBF2E0 80242030 E600000C */ swc1 $f0, 0xc($s0) -.L80242034: -/* DBF2E4 80242034 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBF2E8 80242038 8C43000C */ lw $v1, 0xc($v0) -/* DBF2EC 8024203C 8C420010 */ lw $v0, 0x10($v0) -/* DBF2F0 80242040 00621825 */ or $v1, $v1, $v0 -/* DBF2F4 80242044 00741825 */ or $v1, $v1, $s4 -/* DBF2F8 80242048 10600008 */ beqz $v1, .L8024206C -/* DBF2FC 8024204C 00000000 */ nop -/* DBF300 80242050 8602008C */ lh $v0, 0x8c($s0) -/* DBF304 80242054 14400031 */ bnez $v0, .L8024211C -/* DBF308 80242058 00000000 */ nop -/* DBF30C 8024205C 8E050018 */ lw $a1, 0x18($s0) -/* DBF310 80242060 8E06000C */ lw $a2, 0xc($s0) -/* DBF314 80242064 0C00EA95 */ jal npc_move_heading -/* DBF318 80242068 0200202D */ daddu $a0, $s0, $zero -.L8024206C: -/* DBF31C 8024206C C600003C */ lwc1 $f0, 0x3c($s0) -/* DBF320 80242070 3C014059 */ lui $at, 0x4059 -/* DBF324 80242074 44811800 */ mtc1 $at, $f3 -/* DBF328 80242078 44801000 */ mtc1 $zero, $f2 -/* DBF32C 8024207C 46000021 */ cvt.d.s $f0, $f0 -/* DBF330 80242080 46220002 */ mul.d $f0, $f0, $f2 -/* DBF334 80242084 00000000 */ nop -/* DBF338 80242088 4620020D */ trunc.w.d $f8, $f0 -/* DBF33C 8024208C E628007C */ swc1 $f8, 0x7c($s1) -/* DBF340 80242090 8E420004 */ lw $v0, 4($s2) -/* DBF344 80242094 18400021 */ blez $v0, .L8024211C -/* DBF348 80242098 00000000 */ nop -/* DBF34C 8024209C 8602008E */ lh $v0, 0x8e($s0) -/* DBF350 802420A0 9603008E */ lhu $v1, 0x8e($s0) -/* DBF354 802420A4 18400005 */ blez $v0, .L802420BC -/* DBF358 802420A8 2462FFFF */ addiu $v0, $v1, -1 -/* DBF35C 802420AC A602008E */ sh $v0, 0x8e($s0) -/* DBF360 802420B0 00021400 */ sll $v0, $v0, 0x10 -/* DBF364 802420B4 1C400019 */ bgtz $v0, .L8024211C -/* DBF368 802420B8 00000000 */ nop -.L802420BC: -/* DBF36C 802420BC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DBF370 802420C0 24020002 */ addiu $v0, $zero, 2 -/* DBF374 802420C4 0C00A67F */ jal rand_int -/* DBF378 802420C8 AE620070 */ sw $v0, 0x70($s3) -/* DBF37C 802420CC 3C035555 */ lui $v1, 0x5555 -/* DBF380 802420D0 34635556 */ ori $v1, $v1, 0x5556 -/* DBF384 802420D4 00430018 */ mult $v0, $v1 -/* DBF388 802420D8 000227C3 */ sra $a0, $v0, 0x1f -/* DBF38C 802420DC 00004010 */ mfhi $t0 -/* DBF390 802420E0 01042023 */ subu $a0, $t0, $a0 -/* DBF394 802420E4 00041840 */ sll $v1, $a0, 1 -/* DBF398 802420E8 00641821 */ addu $v1, $v1, $a0 -/* DBF39C 802420EC 00431023 */ subu $v0, $v0, $v1 -/* DBF3A0 802420F0 24430002 */ addiu $v1, $v0, 2 -/* DBF3A4 802420F4 AE630074 */ sw $v1, 0x74($s3) -/* DBF3A8 802420F8 8E42002C */ lw $v0, 0x2c($s2) -/* DBF3AC 802420FC 58400007 */ blezl $v0, .L8024211C -/* DBF3B0 80242100 AE600070 */ sw $zero, 0x70($s3) -/* DBF3B4 80242104 8E420008 */ lw $v0, 8($s2) -/* DBF3B8 80242108 18400003 */ blez $v0, .L80242118 -/* DBF3BC 8024210C 28620003 */ slti $v0, $v1, 3 -/* DBF3C0 80242110 10400002 */ beqz $v0, .L8024211C -/* DBF3C4 80242114 00000000 */ nop -.L80242118: -/* DBF3C8 80242118 AE600070 */ sw $zero, 0x70($s3) -.L8024211C: -/* DBF3CC 8024211C 8FBF0058 */ lw $ra, 0x58($sp) -/* DBF3D0 80242120 8FB50054 */ lw $s5, 0x54($sp) -/* DBF3D4 80242124 8FB40050 */ lw $s4, 0x50($sp) -/* DBF3D8 80242128 8FB3004C */ lw $s3, 0x4c($sp) -/* DBF3DC 8024212C 8FB20048 */ lw $s2, 0x48($sp) -/* DBF3E0 80242130 8FB10044 */ lw $s1, 0x44($sp) -/* DBF3E4 80242134 8FB00040 */ lw $s0, 0x40($sp) -/* DBF3E8 80242138 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* DBF3EC 8024213C D7B80070 */ ldc1 $f24, 0x70($sp) -/* DBF3F0 80242140 D7B60068 */ ldc1 $f22, 0x68($sp) -/* DBF3F4 80242144 D7B40060 */ ldc1 $f20, 0x60($sp) -/* DBF3F8 80242148 03E00008 */ jr $ra -/* DBF3FC 8024214C 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80242150_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80242150_DBD2B0.s deleted file mode 100644 index 381687dded..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80242150_DBD2B0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242150_DBF400 -/* DBF400 80242150 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DBF404 80242154 AFB3001C */ sw $s3, 0x1c($sp) -/* DBF408 80242158 0080982D */ daddu $s3, $a0, $zero -/* DBF40C 8024215C AFBF0020 */ sw $ra, 0x20($sp) -/* DBF410 80242160 AFB20018 */ sw $s2, 0x18($sp) -/* DBF414 80242164 AFB10014 */ sw $s1, 0x14($sp) -/* DBF418 80242168 AFB00010 */ sw $s0, 0x10($sp) -/* DBF41C 8024216C 8E720148 */ lw $s2, 0x148($s3) -/* DBF420 80242170 86440008 */ lh $a0, 8($s2) -/* DBF424 80242174 0C00EABB */ jal get_npc_unsafe -/* DBF428 80242178 00A0882D */ daddu $s1, $a1, $zero -/* DBF42C 8024217C 8E240008 */ lw $a0, 8($s1) -/* DBF430 80242180 0040802D */ daddu $s0, $v0, $zero -/* DBF434 80242184 00041FC2 */ srl $v1, $a0, 0x1f -/* DBF438 80242188 00832021 */ addu $a0, $a0, $v1 -/* DBF43C 8024218C 00042043 */ sra $a0, $a0, 1 -/* DBF440 80242190 0C00A67F */ jal rand_int -/* DBF444 80242194 24840001 */ addiu $a0, $a0, 1 -/* DBF448 80242198 8E230008 */ lw $v1, 8($s1) -/* DBF44C 8024219C 240400B4 */ addiu $a0, $zero, 0xb4 -/* DBF450 802421A0 00032FC2 */ srl $a1, $v1, 0x1f -/* DBF454 802421A4 00651821 */ addu $v1, $v1, $a1 -/* DBF458 802421A8 00031843 */ sra $v1, $v1, 1 -/* DBF45C 802421AC 00621821 */ addu $v1, $v1, $v0 -/* DBF460 802421B0 0C00A67F */ jal rand_int -/* DBF464 802421B4 A603008E */ sh $v1, 0x8e($s0) -/* DBF468 802421B8 C60C000C */ lwc1 $f12, 0xc($s0) -/* DBF46C 802421BC 44820000 */ mtc1 $v0, $f0 -/* DBF470 802421C0 00000000 */ nop -/* DBF474 802421C4 46800020 */ cvt.s.w $f0, $f0 -/* DBF478 802421C8 46006300 */ add.s $f12, $f12, $f0 -/* DBF47C 802421CC 3C0142B4 */ lui $at, 0x42b4 -/* DBF480 802421D0 44810000 */ mtc1 $at, $f0 -/* DBF484 802421D4 0C00A6C9 */ jal clamp_angle -/* DBF488 802421D8 46006301 */ sub.s $f12, $f12, $f0 -/* DBF48C 802421DC E600000C */ swc1 $f0, 0xc($s0) -/* DBF490 802421E0 8E4200CC */ lw $v0, 0xcc($s2) -/* DBF494 802421E4 8C420000 */ lw $v0, ($v0) -/* DBF498 802421E8 AE020028 */ sw $v0, 0x28($s0) -/* DBF49C 802421EC 24020003 */ addiu $v0, $zero, 3 -/* DBF4A0 802421F0 AE620070 */ sw $v0, 0x70($s3) -/* DBF4A4 802421F4 8FBF0020 */ lw $ra, 0x20($sp) -/* DBF4A8 802421F8 8FB3001C */ lw $s3, 0x1c($sp) -/* DBF4AC 802421FC 8FB20018 */ lw $s2, 0x18($sp) -/* DBF4B0 80242200 8FB10014 */ lw $s1, 0x14($sp) -/* DBF4B4 80242204 8FB00010 */ lw $s0, 0x10($sp) -/* DBF4B8 80242208 03E00008 */ jr $ra -/* DBF4BC 8024220C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80242554_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80242554_DBD2B0.s deleted file mode 100644 index ac8ad9505e..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80242554_DBD2B0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242554_DBF804 -/* DBF804 80242554 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBF808 80242558 AFB20018 */ sw $s2, 0x18($sp) -/* DBF80C 8024255C 0080902D */ daddu $s2, $a0, $zero -/* DBF810 80242560 AFBF001C */ sw $ra, 0x1c($sp) -/* DBF814 80242564 AFB10014 */ sw $s1, 0x14($sp) -/* DBF818 80242568 AFB00010 */ sw $s0, 0x10($sp) -/* DBF81C 8024256C 8E510148 */ lw $s1, 0x148($s2) -/* DBF820 80242570 0C00EABB */ jal get_npc_unsafe -/* DBF824 80242574 86240008 */ lh $a0, 8($s1) -/* DBF828 80242578 0040802D */ daddu $s0, $v0, $zero -/* DBF82C 8024257C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DBF830 80242580 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DBF834 80242584 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DBF838 80242588 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DBF83C 8024258C A600008E */ sh $zero, 0x8e($s0) -/* DBF840 80242590 8C460028 */ lw $a2, 0x28($v0) -/* DBF844 80242594 0C00A720 */ jal atan2 -/* DBF848 80242598 8C470030 */ lw $a3, 0x30($v0) -/* DBF84C 8024259C E600000C */ swc1 $f0, 0xc($s0) -/* DBF850 802425A0 8E2200CC */ lw $v0, 0xcc($s1) -/* DBF854 802425A4 8C420020 */ lw $v0, 0x20($v0) -/* DBF858 802425A8 AE020028 */ sw $v0, 0x28($s0) -/* DBF85C 802425AC 2402000B */ addiu $v0, $zero, 0xb -/* DBF860 802425B0 AE420070 */ sw $v0, 0x70($s2) -/* DBF864 802425B4 8FBF001C */ lw $ra, 0x1c($sp) -/* DBF868 802425B8 8FB20018 */ lw $s2, 0x18($sp) -/* DBF86C 802425BC 8FB10014 */ lw $s1, 0x14($sp) -/* DBF870 802425C0 8FB00010 */ lw $s0, 0x10($sp) -/* DBF874 802425C4 03E00008 */ jr $ra -/* DBF878 802425C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_802427D0_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_802427D0_DBD2B0.s deleted file mode 100644 index f672b197b8..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_802427D0_DBD2B0.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427D0_DBFA80 -/* DBFA80 802427D0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DBFA84 802427D4 AFB20030 */ sw $s2, 0x30($sp) -/* DBFA88 802427D8 0080902D */ daddu $s2, $a0, $zero -/* DBFA8C 802427DC AFBF0038 */ sw $ra, 0x38($sp) -/* DBFA90 802427E0 AFB30034 */ sw $s3, 0x34($sp) -/* DBFA94 802427E4 AFB1002C */ sw $s1, 0x2c($sp) -/* DBFA98 802427E8 AFB00028 */ sw $s0, 0x28($sp) -/* DBFA9C 802427EC F7B60048 */ sdc1 $f22, 0x48($sp) -/* DBFAA0 802427F0 F7B40040 */ sdc1 $f20, 0x40($sp) -/* DBFAA4 802427F4 8E510148 */ lw $s1, 0x148($s2) -/* DBFAA8 802427F8 86240008 */ lh $a0, 8($s1) -/* DBFAAC 802427FC 0C00EABB */ jal get_npc_unsafe -/* DBFAB0 80242800 00A0982D */ daddu $s3, $a1, $zero -/* DBFAB4 80242804 0040802D */ daddu $s0, $v0, $zero -/* DBFAB8 80242808 0200202D */ daddu $a0, $s0, $zero -/* DBFABC 8024280C C6220088 */ lwc1 $f2, 0x88($s1) -/* DBFAC0 80242810 468010A0 */ cvt.s.w $f2, $f2 -/* DBFAC4 80242814 460010A1 */ cvt.d.s $f2, $f2 -/* DBFAC8 80242818 C604001C */ lwc1 $f4, 0x1c($s0) -/* DBFACC 8024281C C6000014 */ lwc1 $f0, 0x14($s0) -/* DBFAD0 80242820 8E050018 */ lw $a1, 0x18($s0) -/* DBFAD4 80242824 46002100 */ add.s $f4, $f4, $f0 -/* DBFAD8 80242828 8E06000C */ lw $a2, 0xc($s0) -/* DBFADC 8024282C C6200078 */ lwc1 $f0, 0x78($s1) -/* DBFAE0 80242830 46800020 */ cvt.s.w $f0, $f0 -/* DBFAE4 80242834 E604001C */ swc1 $f4, 0x1c($s0) -/* DBFAE8 80242838 3C014059 */ lui $at, 0x4059 -/* DBFAEC 8024283C 44812800 */ mtc1 $at, $f5 -/* DBFAF0 80242840 44802000 */ mtc1 $zero, $f4 -/* DBFAF4 80242844 46000021 */ cvt.d.s $f0, $f0 -/* DBFAF8 80242848 46240003 */ div.d $f0, $f0, $f4 -/* DBFAFC 8024284C 46200520 */ cvt.s.d $f20, $f0 -/* DBFB00 80242850 46241083 */ div.d $f2, $f2, $f4 -/* DBFB04 80242854 0C00EA95 */ jal npc_move_heading -/* DBFB08 80242858 462015A0 */ cvt.s.d $f22, $f2 -/* DBFB0C 8024285C C604001C */ lwc1 $f4, 0x1c($s0) -/* DBFB10 80242860 44801000 */ mtc1 $zero, $f2 -/* DBFB14 80242864 44801800 */ mtc1 $zero, $f3 -/* DBFB18 80242868 46002021 */ cvt.d.s $f0, $f4 -/* DBFB1C 8024286C 4620103E */ c.le.d $f2, $f0 -/* DBFB20 80242870 00000000 */ nop -/* DBFB24 80242874 45000030 */ bc1f .L80242938 -/* DBFB28 80242878 00000000 */ nop -/* DBFB2C 8024287C C600003C */ lwc1 $f0, 0x3c($s0) -/* DBFB30 80242880 46040000 */ add.s $f0, $f0, $f4 -/* DBFB34 80242884 E600003C */ swc1 $f0, 0x3c($s0) -/* DBFB38 80242888 8E2200CC */ lw $v0, 0xcc($s1) -/* DBFB3C 8024288C 8C420024 */ lw $v0, 0x24($v0) -/* DBFB40 80242890 AE020028 */ sw $v0, 0x28($s0) -/* DBFB44 80242894 A2200007 */ sb $zero, 7($s1) -/* DBFB48 80242898 8E020000 */ lw $v0, ($s0) -/* DBFB4C 8024289C 30420008 */ andi $v0, $v0, 8 -/* DBFB50 802428A0 14400011 */ bnez $v0, .L802428E8 -/* DBFB54 802428A4 0000102D */ daddu $v0, $zero, $zero -/* DBFB58 802428A8 27A50018 */ addiu $a1, $sp, 0x18 -/* DBFB5C 802428AC 27A6001C */ addiu $a2, $sp, 0x1c -/* DBFB60 802428B0 C6000038 */ lwc1 $f0, 0x38($s0) -/* DBFB64 802428B4 C602003C */ lwc1 $f2, 0x3c($s0) -/* DBFB68 802428B8 C6040040 */ lwc1 $f4, 0x40($s0) -/* DBFB6C 802428BC 3C01447A */ lui $at, 0x447a -/* DBFB70 802428C0 44813000 */ mtc1 $at, $f6 -/* DBFB74 802428C4 27A20024 */ addiu $v0, $sp, 0x24 -/* DBFB78 802428C8 E7A00018 */ swc1 $f0, 0x18($sp) -/* DBFB7C 802428CC E7A2001C */ swc1 $f2, 0x1c($sp) -/* DBFB80 802428D0 E7A40020 */ swc1 $f4, 0x20($sp) -/* DBFB84 802428D4 E7A60024 */ swc1 $f6, 0x24($sp) -/* DBFB88 802428D8 AFA20010 */ sw $v0, 0x10($sp) -/* DBFB8C 802428DC 8E040080 */ lw $a0, 0x80($s0) -/* DBFB90 802428E0 0C0372DF */ jal func_800DCB7C -/* DBFB94 802428E4 27A70020 */ addiu $a3, $sp, 0x20 -.L802428E8: -/* DBFB98 802428E8 1040000B */ beqz $v0, .L80242918 -/* DBFB9C 802428EC 00000000 */ nop -/* DBFBA0 802428F0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DBFBA4 802428F4 46140080 */ add.s $f2, $f0, $f20 -/* DBFBA8 802428F8 C600003C */ lwc1 $f0, 0x3c($s0) -/* DBFBAC 802428FC 4600103E */ c.le.s $f2, $f0 -/* DBFBB0 80242900 00000000 */ nop -/* DBFBB4 80242904 4500008D */ bc1f .L80242B3C -/* DBFBB8 80242908 00000000 */ nop -/* DBFBBC 8024290C E602003C */ swc1 $f2, 0x3c($s0) -/* DBFBC0 80242910 08090ACF */ j .L80242B3C -/* DBFBC4 80242914 AE400070 */ sw $zero, 0x70($s2) -.L80242918: -/* DBFBC8 80242918 C602003C */ lwc1 $f2, 0x3c($s0) -/* DBFBCC 8024291C C6000064 */ lwc1 $f0, 0x64($s0) -/* DBFBD0 80242920 4602003E */ c.le.s $f0, $f2 -/* DBFBD4 80242924 00000000 */ nop -/* DBFBD8 80242928 45030084 */ bc1tl .L80242B3C -/* DBFBDC 8024292C AE400070 */ sw $zero, 0x70($s2) -/* DBFBE0 80242930 08090ACF */ j .L80242B3C -/* DBFBE4 80242934 00000000 */ nop -.L80242938: -/* DBFBE8 80242938 4622003C */ c.lt.d $f0, $f2 -/* DBFBEC 8024293C 00000000 */ nop -/* DBFBF0 80242940 4500007E */ bc1f .L80242B3C -/* DBFBF4 80242944 00000000 */ nop -/* DBFBF8 80242948 9602008E */ lhu $v0, 0x8e($s0) -/* DBFBFC 8024294C 24420001 */ addiu $v0, $v0, 1 -/* DBFC00 80242950 A602008E */ sh $v0, 0x8e($s0) -/* DBFC04 80242954 00021400 */ sll $v0, $v0, 0x10 -/* DBFC08 80242958 8E630020 */ lw $v1, 0x20($s3) -/* DBFC0C 8024295C 00021403 */ sra $v0, $v0, 0x10 -/* DBFC10 80242960 0043102A */ slt $v0, $v0, $v1 -/* DBFC14 80242964 14400026 */ bnez $v0, .L80242A00 -/* DBFC18 80242968 00000000 */ nop -/* DBFC1C 8024296C C60C0038 */ lwc1 $f12, 0x38($s0) -/* DBFC20 80242970 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DBFC24 80242974 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DBFC28 80242978 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DBFC2C 8024297C A600008E */ sh $zero, 0x8e($s0) -/* DBFC30 80242980 8C460028 */ lw $a2, 0x28($v0) -/* DBFC34 80242984 0C00A720 */ jal atan2 -/* DBFC38 80242988 8C470030 */ lw $a3, 0x30($v0) -/* DBFC3C 8024298C 46000506 */ mov.s $f20, $f0 -/* DBFC40 80242990 C60C000C */ lwc1 $f12, 0xc($s0) -/* DBFC44 80242994 0C00A70A */ jal get_clamped_angle_diff -/* DBFC48 80242998 4600A386 */ mov.s $f14, $f20 -/* DBFC4C 8024299C 46000086 */ mov.s $f2, $f0 -/* DBFC50 802429A0 8E62001C */ lw $v0, 0x1c($s3) -/* DBFC54 802429A4 46001005 */ abs.s $f0, $f2 -/* DBFC58 802429A8 44822000 */ mtc1 $v0, $f4 -/* DBFC5C 802429AC 00000000 */ nop -/* DBFC60 802429B0 46802120 */ cvt.s.w $f4, $f4 -/* DBFC64 802429B4 4600203C */ c.lt.s $f4, $f0 -/* DBFC68 802429B8 00000000 */ nop -/* DBFC6C 802429BC 4500000D */ bc1f .L802429F4 -/* DBFC70 802429C0 00000000 */ nop -/* DBFC74 802429C4 44800000 */ mtc1 $zero, $f0 -/* DBFC78 802429C8 C614000C */ lwc1 $f20, 0xc($s0) -/* DBFC7C 802429CC 4600103C */ c.lt.s $f2, $f0 -/* DBFC80 802429D0 00000000 */ nop -/* DBFC84 802429D4 45000006 */ bc1f .L802429F0 -/* DBFC88 802429D8 00021023 */ negu $v0, $v0 -/* DBFC8C 802429DC 44820000 */ mtc1 $v0, $f0 -/* DBFC90 802429E0 00000000 */ nop -/* DBFC94 802429E4 46800020 */ cvt.s.w $f0, $f0 -/* DBFC98 802429E8 08090A7D */ j .L802429F4 -/* DBFC9C 802429EC 4600A500 */ add.s $f20, $f20, $f0 -.L802429F0: -/* DBFCA0 802429F0 4604A500 */ add.s $f20, $f20, $f4 -.L802429F4: -/* DBFCA4 802429F4 0C00A6C9 */ jal clamp_angle -/* DBFCA8 802429F8 4600A306 */ mov.s $f12, $f20 -/* DBFCAC 802429FC E600000C */ swc1 $f0, 0xc($s0) -.L80242A00: -/* DBFCB0 80242A00 8E020000 */ lw $v0, ($s0) -/* DBFCB4 80242A04 30420008 */ andi $v0, $v0, 8 -/* DBFCB8 80242A08 1040000A */ beqz $v0, .L80242A34 -/* DBFCBC 80242A0C 27A50018 */ addiu $a1, $sp, 0x18 -/* DBFCC0 80242A10 C602003C */ lwc1 $f2, 0x3c($s0) -/* DBFCC4 80242A14 C600001C */ lwc1 $f0, 0x1c($s0) -/* DBFCC8 80242A18 46001080 */ add.s $f2, $f2, $f0 -/* DBFCCC 80242A1C 4616103C */ c.lt.s $f2, $f22 -/* DBFCD0 80242A20 00000000 */ nop -/* DBFCD4 80242A24 45020045 */ bc1fl .L80242B3C -/* DBFCD8 80242A28 E602003C */ swc1 $f2, 0x3c($s0) -/* DBFCDC 80242A2C 08090ACE */ j .L80242B38 -/* DBFCE0 80242A30 E616003C */ swc1 $f22, 0x3c($s0) -.L80242A34: -/* DBFCE4 80242A34 C6000038 */ lwc1 $f0, 0x38($s0) -/* DBFCE8 80242A38 27A6001C */ addiu $a2, $sp, 0x1c -/* DBFCEC 80242A3C E7A00018 */ swc1 $f0, 0x18($sp) -/* DBFCF0 80242A40 860200A8 */ lh $v0, 0xa8($s0) -/* DBFCF4 80242A44 C600001C */ lwc1 $f0, 0x1c($s0) -/* DBFCF8 80242A48 C604003C */ lwc1 $f4, 0x3c($s0) -/* DBFCFC 80242A4C 44821000 */ mtc1 $v0, $f2 -/* DBFD00 80242A50 00000000 */ nop -/* DBFD04 80242A54 468010A0 */ cvt.s.w $f2, $f2 -/* DBFD08 80242A58 46000005 */ abs.s $f0, $f0 -/* DBFD0C 80242A5C 46020000 */ add.s $f0, $f0, $f2 -/* DBFD10 80242A60 C6060040 */ lwc1 $f6, 0x40($s0) -/* DBFD14 80242A64 27A20024 */ addiu $v0, $sp, 0x24 -/* DBFD18 80242A68 46022100 */ add.s $f4, $f4, $f2 -/* DBFD1C 80242A6C 3C014024 */ lui $at, 0x4024 -/* DBFD20 80242A70 44811800 */ mtc1 $at, $f3 -/* DBFD24 80242A74 44801000 */ mtc1 $zero, $f2 -/* DBFD28 80242A78 46000021 */ cvt.d.s $f0, $f0 -/* DBFD2C 80242A7C 46220000 */ add.d $f0, $f0, $f2 -/* DBFD30 80242A80 E7A60020 */ swc1 $f6, 0x20($sp) -/* DBFD34 80242A84 E7A4001C */ swc1 $f4, 0x1c($sp) -/* DBFD38 80242A88 46200020 */ cvt.s.d $f0, $f0 -/* DBFD3C 80242A8C E7A00024 */ swc1 $f0, 0x24($sp) -/* DBFD40 80242A90 AFA20010 */ sw $v0, 0x10($sp) -/* DBFD44 80242A94 8E040080 */ lw $a0, 0x80($s0) -/* DBFD48 80242A98 0C0372DF */ jal func_800DCB7C -/* DBFD4C 80242A9C 27A70020 */ addiu $a3, $sp, 0x20 -/* DBFD50 80242AA0 10400015 */ beqz $v0, .L80242AF8 -/* DBFD54 80242AA4 00000000 */ nop -/* DBFD58 80242AA8 860200A8 */ lh $v0, 0xa8($s0) -/* DBFD5C 80242AAC C604001C */ lwc1 $f4, 0x1c($s0) -/* DBFD60 80242AB0 44820000 */ mtc1 $v0, $f0 -/* DBFD64 80242AB4 00000000 */ nop -/* DBFD68 80242AB8 46800020 */ cvt.s.w $f0, $f0 -/* DBFD6C 80242ABC 46002085 */ abs.s $f2, $f4 -/* DBFD70 80242AC0 46020000 */ add.s $f0, $f0, $f2 -/* DBFD74 80242AC4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* DBFD78 80242AC8 4600103E */ c.le.s $f2, $f0 -/* DBFD7C 80242ACC 00000000 */ nop -/* DBFD80 80242AD0 45000005 */ bc1f .L80242AE8 -/* DBFD84 80242AD4 00000000 */ nop -/* DBFD88 80242AD8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DBFD8C 80242ADC AE00001C */ sw $zero, 0x1c($s0) -/* DBFD90 80242AE0 08090ACF */ j .L80242B3C -/* DBFD94 80242AE4 E600003C */ swc1 $f0, 0x3c($s0) -.L80242AE8: -/* DBFD98 80242AE8 C600003C */ lwc1 $f0, 0x3c($s0) -/* DBFD9C 80242AEC 46040000 */ add.s $f0, $f0, $f4 -/* DBFDA0 80242AF0 08090ACF */ j .L80242B3C -/* DBFDA4 80242AF4 E600003C */ swc1 $f0, 0x3c($s0) -.L80242AF8: -/* DBFDA8 80242AF8 C606003C */ lwc1 $f6, 0x3c($s0) -/* DBFDAC 80242AFC 860200A8 */ lh $v0, 0xa8($s0) -/* DBFDB0 80242B00 46163081 */ sub.s $f2, $f6, $f22 -/* DBFDB4 80242B04 44820000 */ mtc1 $v0, $f0 -/* DBFDB8 80242B08 00000000 */ nop -/* DBFDBC 80242B0C 46800020 */ cvt.s.w $f0, $f0 -/* DBFDC0 80242B10 46001080 */ add.s $f2, $f2, $f0 -/* DBFDC4 80242B14 C604001C */ lwc1 $f4, 0x1c($s0) -/* DBFDC8 80242B18 46002005 */ abs.s $f0, $f4 -/* DBFDCC 80242B1C 4602003C */ c.lt.s $f0, $f2 -/* DBFDD0 80242B20 00000000 */ nop -/* DBFDD4 80242B24 45020005 */ bc1fl .L80242B3C -/* DBFDD8 80242B28 AE00001C */ sw $zero, 0x1c($s0) -/* DBFDDC 80242B2C 46043000 */ add.s $f0, $f6, $f4 -/* DBFDE0 80242B30 08090ACF */ j .L80242B3C -/* DBFDE4 80242B34 E600003C */ swc1 $f0, 0x3c($s0) -.L80242B38: -/* DBFDE8 80242B38 AE00001C */ sw $zero, 0x1c($s0) -.L80242B3C: -/* DBFDEC 80242B3C 8FBF0038 */ lw $ra, 0x38($sp) -/* DBFDF0 80242B40 8FB30034 */ lw $s3, 0x34($sp) -/* DBFDF4 80242B44 8FB20030 */ lw $s2, 0x30($sp) -/* DBFDF8 80242B48 8FB1002C */ lw $s1, 0x2c($sp) -/* DBFDFC 80242B4C 8FB00028 */ lw $s0, 0x28($sp) -/* DBFE00 80242B50 D7B60048 */ ldc1 $f22, 0x48($sp) -/* DBFE04 80242B54 D7B40040 */ ldc1 $f20, 0x40($sp) -/* DBFE08 80242B58 03E00008 */ jr $ra -/* DBFE0C 80242B5C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80242C84_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80242C84_DBD2B0.s deleted file mode 100644 index 72362ae6a1..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80242C84_DBD2B0.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C84_DBFF34 -/* DBFF34 80242C84 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DBFF38 80242C88 AFB40040 */ sw $s4, 0x40($sp) -/* DBFF3C 80242C8C 0080A02D */ daddu $s4, $a0, $zero -/* DBFF40 80242C90 AFBF0048 */ sw $ra, 0x48($sp) -/* DBFF44 80242C94 AFB50044 */ sw $s5, 0x44($sp) -/* DBFF48 80242C98 AFB3003C */ sw $s3, 0x3c($sp) -/* DBFF4C 80242C9C AFB20038 */ sw $s2, 0x38($sp) -/* DBFF50 80242CA0 AFB10034 */ sw $s1, 0x34($sp) -/* DBFF54 80242CA4 AFB00030 */ sw $s0, 0x30($sp) -/* DBFF58 80242CA8 8E920148 */ lw $s2, 0x148($s4) -/* DBFF5C 80242CAC 86440008 */ lh $a0, 8($s2) -/* DBFF60 80242CB0 8E90000C */ lw $s0, 0xc($s4) -/* DBFF64 80242CB4 0C00EABB */ jal get_npc_unsafe -/* DBFF68 80242CB8 00A0882D */ daddu $s1, $a1, $zero -/* DBFF6C 80242CBC 0280202D */ daddu $a0, $s4, $zero -/* DBFF70 80242CC0 8E050000 */ lw $a1, ($s0) -/* DBFF74 80242CC4 0C0B1EAF */ jal get_variable -/* DBFF78 80242CC8 0040A82D */ daddu $s5, $v0, $zero -/* DBFF7C 80242CCC AFA00010 */ sw $zero, 0x10($sp) -/* DBFF80 80242CD0 8E4300D0 */ lw $v1, 0xd0($s2) -/* DBFF84 80242CD4 8C630030 */ lw $v1, 0x30($v1) -/* DBFF88 80242CD8 AFA30014 */ sw $v1, 0x14($sp) -/* DBFF8C 80242CDC 8E4300D0 */ lw $v1, 0xd0($s2) -/* DBFF90 80242CE0 8C63001C */ lw $v1, 0x1c($v1) -/* DBFF94 80242CE4 AFA30018 */ sw $v1, 0x18($sp) -/* DBFF98 80242CE8 8E4300D0 */ lw $v1, 0xd0($s2) -/* DBFF9C 80242CEC 8C630024 */ lw $v1, 0x24($v1) -/* DBFFA0 80242CF0 AFA3001C */ sw $v1, 0x1c($sp) -/* DBFFA4 80242CF4 8E4300D0 */ lw $v1, 0xd0($s2) -/* DBFFA8 80242CF8 8C630028 */ lw $v1, 0x28($v1) -/* DBFFAC 80242CFC 27B30010 */ addiu $s3, $sp, 0x10 -/* DBFFB0 80242D00 AFA30020 */ sw $v1, 0x20($sp) -/* DBFFB4 80242D04 8E4300D0 */ lw $v1, 0xd0($s2) -/* DBFFB8 80242D08 3C0142F0 */ lui $at, 0x42f0 -/* DBFFBC 80242D0C 44810000 */ mtc1 $at, $f0 -/* DBFFC0 80242D10 8C63002C */ lw $v1, 0x2c($v1) -/* DBFFC4 80242D14 0040802D */ daddu $s0, $v0, $zero -/* DBFFC8 80242D18 E7A00028 */ swc1 $f0, 0x28($sp) -/* DBFFCC 80242D1C A7A0002C */ sh $zero, 0x2c($sp) -/* DBFFD0 80242D20 12200006 */ beqz $s1, .L80242D3C -/* DBFFD4 80242D24 AFA30024 */ sw $v1, 0x24($sp) -/* DBFFD8 80242D28 02A0202D */ daddu $a0, $s5, $zero -/* DBFFDC 80242D2C 0240282D */ daddu $a1, $s2, $zero -/* DBFFE0 80242D30 0280302D */ daddu $a2, $s4, $zero -/* DBFFE4 80242D34 0C090AD8 */ jal func_80242B60 -/* DBFFE8 80242D38 0200382D */ daddu $a3, $s0, $zero -.L80242D3C: -/* DBFFEC 80242D3C 2402FFFE */ addiu $v0, $zero, -2 -/* DBFFF0 80242D40 A2A200AB */ sb $v0, 0xab($s5) -/* DBFFF4 80242D44 8E4300B0 */ lw $v1, 0xb0($s2) -/* DBFFF8 80242D48 30620004 */ andi $v0, $v1, 4 -/* DBFFFC 80242D4C 10400007 */ beqz $v0, .L80242D6C -/* DC0000 80242D50 00000000 */ nop -/* DC0004 80242D54 824200B4 */ lb $v0, 0xb4($s2) -/* DC0008 80242D58 1440003C */ bnez $v0, .L80242E4C -/* DC000C 80242D5C 0000102D */ daddu $v0, $zero, $zero -/* DC0010 80242D60 2402FFFB */ addiu $v0, $zero, -5 -/* DC0014 80242D64 00621024 */ and $v0, $v1, $v0 -/* DC0018 80242D68 AE4200B0 */ sw $v0, 0xb0($s2) -.L80242D6C: -/* DC001C 80242D6C 8E830070 */ lw $v1, 0x70($s4) -/* DC0020 80242D70 2C62000F */ sltiu $v0, $v1, 0xf -/* DC0024 80242D74 10400034 */ beqz $v0, .L80242E48 -/* DC0028 80242D78 00031080 */ sll $v0, $v1, 2 -/* DC002C 80242D7C 3C018024 */ lui $at, 0x8024 -/* DC0030 80242D80 00220821 */ addu $at, $at, $v0 -/* DC0034 80242D84 8C2270C8 */ lw $v0, 0x70c8($at) -/* DC0038 80242D88 00400008 */ jr $v0 -/* DC003C 80242D8C 00000000 */ nop -/* DC0040 80242D90 0280202D */ daddu $a0, $s4, $zero -/* DC0044 80242D94 0200282D */ daddu $a1, $s0, $zero -/* DC0048 80242D98 0C09065E */ jal func_80241978 -/* DC004C 80242D9C 0260302D */ daddu $a2, $s3, $zero -/* DC0050 80242DA0 0280202D */ daddu $a0, $s4, $zero -/* DC0054 80242DA4 0200282D */ daddu $a1, $s0, $zero -/* DC0058 80242DA8 0C0906CA */ jal func_80241B28 -/* DC005C 80242DAC 0260302D */ daddu $a2, $s3, $zero -/* DC0060 80242DB0 08090B93 */ j .L80242E4C -/* DC0064 80242DB4 0000102D */ daddu $v0, $zero, $zero -/* DC0068 80242DB8 0280202D */ daddu $a0, $s4, $zero -/* DC006C 80242DBC 0200282D */ daddu $a1, $s0, $zero -/* DC0070 80242DC0 0C090854 */ jal func_80242150 -/* DC0074 80242DC4 0260302D */ daddu $a2, $s3, $zero -/* DC0078 80242DC8 0280202D */ daddu $a0, $s4, $zero -/* DC007C 80242DCC 0200282D */ daddu $a1, $s0, $zero -/* DC0080 80242DD0 0C090884 */ jal func_80242210 -/* DC0084 80242DD4 0260302D */ daddu $a2, $s3, $zero -/* DC0088 80242DD8 08090B93 */ j .L80242E4C -/* DC008C 80242DDC 0000102D */ daddu $v0, $zero, $zero -/* DC0090 80242DE0 0280202D */ daddu $a0, $s4, $zero -/* DC0094 80242DE4 0200282D */ daddu $a1, $s0, $zero -/* DC0098 80242DE8 0C090955 */ jal func_80242554 -/* DC009C 80242DEC 0260302D */ daddu $a2, $s3, $zero -/* DC00A0 80242DF0 0280202D */ daddu $a0, $s4, $zero -/* DC00A4 80242DF4 0200282D */ daddu $a1, $s0, $zero -/* DC00A8 80242DF8 0C090973 */ jal func_802425CC -/* DC00AC 80242DFC 0260302D */ daddu $a2, $s3, $zero -/* DC00B0 80242E00 08090B93 */ j .L80242E4C -/* DC00B4 80242E04 0000102D */ daddu $v0, $zero, $zero -/* DC00B8 80242E08 0280202D */ daddu $a0, $s4, $zero -/* DC00BC 80242E0C 0200282D */ daddu $a1, $s0, $zero -/* DC00C0 80242E10 0C09098E */ jal func_80242638 -/* DC00C4 80242E14 0260302D */ daddu $a2, $s3, $zero -/* DC00C8 80242E18 08090B93 */ j .L80242E4C -/* DC00CC 80242E1C 0000102D */ daddu $v0, $zero, $zero -/* DC00D0 80242E20 0280202D */ daddu $a0, $s4, $zero -/* DC00D4 80242E24 0200282D */ daddu $a1, $s0, $zero -/* DC00D8 80242E28 0C0909DB */ jal func_8024276C -/* DC00DC 80242E2C 0260302D */ daddu $a2, $s3, $zero -/* DC00E0 80242E30 08090B93 */ j .L80242E4C -/* DC00E4 80242E34 0000102D */ daddu $v0, $zero, $zero -/* DC00E8 80242E38 0280202D */ daddu $a0, $s4, $zero -/* DC00EC 80242E3C 0200282D */ daddu $a1, $s0, $zero -/* DC00F0 80242E40 0C0909F4 */ jal func_802427D0 -/* DC00F4 80242E44 0260302D */ daddu $a2, $s3, $zero -.L80242E48: -/* DC00F8 80242E48 0000102D */ daddu $v0, $zero, $zero -.L80242E4C: -/* DC00FC 80242E4C 8FBF0048 */ lw $ra, 0x48($sp) -/* DC0100 80242E50 8FB50044 */ lw $s5, 0x44($sp) -/* DC0104 80242E54 8FB40040 */ lw $s4, 0x40($sp) -/* DC0108 80242E58 8FB3003C */ lw $s3, 0x3c($sp) -/* DC010C 80242E5C 8FB20038 */ lw $s2, 0x38($sp) -/* DC0110 80242E60 8FB10034 */ lw $s1, 0x34($sp) -/* DC0114 80242E64 8FB00030 */ lw $s0, 0x30($sp) -/* DC0118 80242E68 03E00008 */ jr $ra -/* DC011C 80242E6C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80242EA8_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80242EA8_DBD2B0.s deleted file mode 100644 index 83a14db9f0..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80242EA8_DBD2B0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242EA8_DC0158 -/* DC0158 80242EA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DC015C 80242EAC AFB20018 */ sw $s2, 0x18($sp) -/* DC0160 80242EB0 0080902D */ daddu $s2, $a0, $zero -/* DC0164 80242EB4 AFB10014 */ sw $s1, 0x14($sp) -/* DC0168 80242EB8 3C11F971 */ lui $s1, 0xf971 -/* DC016C 80242EBC AFBF001C */ sw $ra, 0x1c($sp) -/* DC0170 80242EC0 AFB00010 */ sw $s0, 0x10($sp) -/* DC0174 80242EC4 8E50000C */ lw $s0, 0xc($s2) -/* DC0178 80242EC8 36318887 */ ori $s1, $s1, 0x8887 -/* DC017C 80242ECC 8E050000 */ lw $a1, ($s0) -/* DC0180 80242ED0 0C0B1EAF */ jal get_variable -/* DC0184 80242ED4 26100004 */ addiu $s0, $s0, 4 -/* DC0188 80242ED8 00518821 */ addu $s1, $v0, $s1 -/* DC018C 80242EDC 8E050000 */ lw $a1, ($s0) -/* DC0190 80242EE0 0C0B1EAF */ jal get_variable -/* DC0194 80242EE4 0240202D */ daddu $a0, $s2, $zero -/* DC0198 80242EE8 0240202D */ daddu $a0, $s2, $zero -/* DC019C 80242EEC 0220282D */ daddu $a1, $s1, $zero -/* DC01A0 80242EF0 0C0B2026 */ jal set_variable -/* DC01A4 80242EF4 0040302D */ daddu $a2, $v0, $zero -/* DC01A8 80242EF8 8FBF001C */ lw $ra, 0x1c($sp) -/* DC01AC 80242EFC 8FB20018 */ lw $s2, 0x18($sp) -/* DC01B0 80242F00 8FB10014 */ lw $s1, 0x14($sp) -/* DC01B4 80242F04 8FB00010 */ lw $s0, 0x10($sp) -/* DC01B8 80242F08 24020002 */ addiu $v0, $zero, 2 -/* DC01BC 80242F0C 03E00008 */ jr $ra -/* DC01C0 80242F10 27BD0020 */ addiu $sp, $sp, 0x20 -/* DC01C4 80242F14 00000000 */ nop -/* DC01C8 80242F18 00000000 */ nop -/* DC01CC 80242F1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80242FD4_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80242FD4_DBD2B0.s deleted file mode 100644 index b8e40cf1b2..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80242FD4_DBD2B0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FD4_DC0284 -/* DC0284 80242FD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DC0288 80242FD8 AFB00010 */ sw $s0, 0x10($sp) -/* DC028C 80242FDC 0080802D */ daddu $s0, $a0, $zero -/* DC0290 80242FE0 AFBF0018 */ sw $ra, 0x18($sp) -/* DC0294 80242FE4 AFB10014 */ sw $s1, 0x14($sp) -/* DC0298 80242FE8 8E02000C */ lw $v0, 0xc($s0) -/* DC029C 80242FEC 8C510000 */ lw $s1, ($v0) -/* DC02A0 80242FF0 0C0B1EAF */ jal get_variable -/* DC02A4 80242FF4 0220282D */ daddu $a1, $s1, $zero -/* DC02A8 80242FF8 3C03FFF0 */ lui $v1, 0xfff0 -/* DC02AC 80242FFC 3463FFFF */ ori $v1, $v1, 0xffff -/* DC02B0 80243000 0200202D */ daddu $a0, $s0, $zero -/* DC02B4 80243004 00431024 */ and $v0, $v0, $v1 -/* DC02B8 80243008 00021140 */ sll $v0, $v0, 5 -/* DC02BC 8024300C 3C068008 */ lui $a2, %hi(gItemTable) -/* DC02C0 80243010 00C23021 */ addu $a2, $a2, $v0 -/* DC02C4 80243014 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* DC02C8 80243018 0C0B2026 */ jal set_variable -/* DC02CC 8024301C 0220282D */ daddu $a1, $s1, $zero -/* DC02D0 80243020 8FBF0018 */ lw $ra, 0x18($sp) -/* DC02D4 80243024 8FB10014 */ lw $s1, 0x14($sp) -/* DC02D8 80243028 8FB00010 */ lw $s0, 0x10($sp) -/* DC02DC 8024302C 24020002 */ addiu $v0, $zero, 2 -/* DC02E0 80243030 03E00008 */ jr $ra -/* DC02E4 80243034 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/func_80243188_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/func_80243188_DBD2B0.s deleted file mode 100644 index 51243395a4..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/func_80243188_DBD2B0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243188_DC0438 -/* DC0438 80243188 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DC043C 8024318C AFB00010 */ sw $s0, 0x10($sp) -/* DC0440 80243190 0080802D */ daddu $s0, $a0, $zero -/* DC0444 80243194 AFBF0014 */ sw $ra, 0x14($sp) -/* DC0448 80243198 8E02000C */ lw $v0, 0xc($s0) -/* DC044C 8024319C 0C0B1EAF */ jal get_variable -/* DC0450 802431A0 8C450000 */ lw $a1, ($v0) -/* DC0454 802431A4 00021140 */ sll $v0, $v0, 5 -/* DC0458 802431A8 AE000084 */ sw $zero, 0x84($s0) -/* DC045C 802431AC 3C018008 */ lui $at, 0x8008 -/* DC0460 802431B0 00220821 */ addu $at, $at, $v0 -/* DC0464 802431B4 942278F8 */ lhu $v0, 0x78f8($at) -/* DC0468 802431B8 30420040 */ andi $v0, $v0, 0x40 -/* DC046C 802431BC 10400002 */ beqz $v0, .L802431C8 -/* DC0470 802431C0 24020001 */ addiu $v0, $zero, 1 -/* DC0474 802431C4 AE020084 */ sw $v0, 0x84($s0) -.L802431C8: -/* DC0478 802431C8 8FBF0014 */ lw $ra, 0x14($sp) -/* DC047C 802431CC 8FB00010 */ lw $s0, 0x10($sp) -/* DC0480 802431D0 24020002 */ addiu $v0, $zero, 2 -/* DC0484 802431D4 03E00008 */ jr $ra -/* DC0488 802431D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_08/func_8024001C_DC43D0.s b/asm/nonmatchings/world/area_omo/omo_08/func_8024001C_DC43D0.s deleted file mode 100644 index 5e2e3eabff..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/func_8024001C_DC43D0.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_DC43EC -/* DC43EC 8024001C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DC43F0 80240020 AFB10014 */ sw $s1, 0x14($sp) -/* DC43F4 80240024 0080882D */ daddu $s1, $a0, $zero -/* DC43F8 80240028 AFBF001C */ sw $ra, 0x1c($sp) -/* DC43FC 8024002C AFB20018 */ sw $s2, 0x18($sp) -/* DC4400 80240030 AFB00010 */ sw $s0, 0x10($sp) -/* DC4404 80240034 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DC4408 80240038 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DC440C 8024003C F7B40020 */ sdc1 $f20, 0x20($sp) -/* DC4410 80240040 8E30000C */ lw $s0, 0xc($s1) -/* DC4414 80240044 8E120000 */ lw $s2, ($s0) -/* DC4418 80240048 26100004 */ addiu $s0, $s0, 4 -/* DC441C 8024004C 8E050000 */ lw $a1, ($s0) -/* DC4420 80240050 0C0B210B */ jal get_float_variable -/* DC4424 80240054 26100004 */ addiu $s0, $s0, 4 -/* DC4428 80240058 8E050000 */ lw $a1, ($s0) -/* DC442C 8024005C 26100004 */ addiu $s0, $s0, 4 -/* DC4430 80240060 0220202D */ daddu $a0, $s1, $zero -/* DC4434 80240064 0C0B210B */ jal get_float_variable -/* DC4438 80240068 46000606 */ mov.s $f24, $f0 -/* DC443C 8024006C 8E050000 */ lw $a1, ($s0) -/* DC4440 80240070 26100004 */ addiu $s0, $s0, 4 -/* DC4444 80240074 0220202D */ daddu $a0, $s1, $zero -/* DC4448 80240078 0C0B210B */ jal get_float_variable -/* DC444C 8024007C 46000586 */ mov.s $f22, $f0 -/* DC4450 80240080 0220202D */ daddu $a0, $s1, $zero -/* DC4454 80240084 8E050000 */ lw $a1, ($s0) -/* DC4458 80240088 0C0B210B */ jal get_float_variable -/* DC445C 8024008C 46000506 */ mov.s $f20, $f0 -/* DC4460 80240090 4600C306 */ mov.s $f12, $f24 -/* DC4464 80240094 4406A000 */ mfc1 $a2, $f20 -/* DC4468 80240098 44070000 */ mfc1 $a3, $f0 -/* DC446C 8024009C 0C00A720 */ jal atan2 -/* DC4470 802400A0 4600B386 */ mov.s $f14, $f22 -/* DC4474 802400A4 0C00A6C9 */ jal clamp_angle -/* DC4478 802400A8 46000306 */ mov.s $f12, $f0 -/* DC447C 802400AC 0220202D */ daddu $a0, $s1, $zero -/* DC4480 802400B0 44060000 */ mfc1 $a2, $f0 -/* DC4484 802400B4 0C0B2190 */ jal set_float_variable -/* DC4488 802400B8 0240282D */ daddu $a1, $s2, $zero -/* DC448C 802400BC 8FBF001C */ lw $ra, 0x1c($sp) -/* DC4490 802400C0 8FB20018 */ lw $s2, 0x18($sp) -/* DC4494 802400C4 8FB10014 */ lw $s1, 0x14($sp) -/* DC4498 802400C8 8FB00010 */ lw $s0, 0x10($sp) -/* DC449C 802400CC D7B80030 */ ldc1 $f24, 0x30($sp) -/* DC44A0 802400D0 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DC44A4 802400D4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DC44A8 802400D8 24020002 */ addiu $v0, $zero, 2 -/* DC44AC 802400DC 03E00008 */ jr $ra -/* DC44B0 802400E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_08/func_802400E4_DC43D0.s b/asm/nonmatchings/world/area_omo/omo_08/func_802400E4_DC43D0.s deleted file mode 100644 index de55606d8a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/func_802400E4_DC43D0.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E4_DC44B4 -/* DC44B4 802400E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DC44B8 802400E8 AFB10014 */ sw $s1, 0x14($sp) -/* DC44BC 802400EC 0080882D */ daddu $s1, $a0, $zero -/* DC44C0 802400F0 AFBF0018 */ sw $ra, 0x18($sp) -/* DC44C4 802400F4 AFB00010 */ sw $s0, 0x10($sp) -/* DC44C8 802400F8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DC44CC 802400FC 8E30000C */ lw $s0, 0xc($s1) -/* DC44D0 80240100 8E050000 */ lw $a1, ($s0) -/* DC44D4 80240104 0C0B210B */ jal get_float_variable -/* DC44D8 80240108 26100004 */ addiu $s0, $s0, 4 -/* DC44DC 8024010C 8E050000 */ lw $a1, ($s0) -/* DC44E0 80240110 26100004 */ addiu $s0, $s0, 4 -/* DC44E4 80240114 0220202D */ daddu $a0, $s1, $zero -/* DC44E8 80240118 0C0B210B */ jal get_float_variable -/* DC44EC 8024011C 46000506 */ mov.s $f20, $f0 -/* DC44F0 80240120 4614003C */ c.lt.s $f0, $f20 -/* DC44F4 80240124 00000000 */ nop -/* DC44F8 80240128 45000004 */ bc1f .L8024013C -/* DC44FC 8024012C 0220202D */ daddu $a0, $s1, $zero -/* DC4500 80240130 8E050000 */ lw $a1, ($s0) -/* DC4504 80240134 08090051 */ j .L80240144 -/* DC4508 80240138 24060001 */ addiu $a2, $zero, 1 -.L8024013C: -/* DC450C 8024013C 8E050000 */ lw $a1, ($s0) -/* DC4510 80240140 0000302D */ daddu $a2, $zero, $zero -.L80240144: -/* DC4514 80240144 0C0B2026 */ jal set_variable -/* DC4518 80240148 00000000 */ nop -/* DC451C 8024014C 8FBF0018 */ lw $ra, 0x18($sp) -/* DC4520 80240150 8FB10014 */ lw $s1, 0x14($sp) -/* DC4524 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* DC4528 80240158 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DC452C 8024015C 24020002 */ addiu $v0, $zero, 2 -/* DC4530 80240160 03E00008 */ jr $ra -/* DC4534 80240164 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_08/func_80240168_DC43D0.s b/asm/nonmatchings/world/area_omo/omo_08/func_80240168_DC43D0.s deleted file mode 100644 index dbc83e7efb..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/func_80240168_DC43D0.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240168_DC4538 -/* DC4538 80240168 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DC453C 8024016C AFB20018 */ sw $s2, 0x18($sp) -/* DC4540 80240170 0080902D */ daddu $s2, $a0, $zero -/* DC4544 80240174 AFBF001C */ sw $ra, 0x1c($sp) -/* DC4548 80240178 AFB10014 */ sw $s1, 0x14($sp) -/* DC454C 8024017C AFB00010 */ sw $s0, 0x10($sp) -/* DC4550 80240180 8E50000C */ lw $s0, 0xc($s2) -/* DC4554 80240184 8E050000 */ lw $a1, ($s0) -/* DC4558 80240188 0C0B1EAF */ jal get_variable -/* DC455C 8024018C 26100004 */ addiu $s0, $s0, 4 -/* DC4560 80240190 8E050000 */ lw $a1, ($s0) -/* DC4564 80240194 26100004 */ addiu $s0, $s0, 4 -/* DC4568 80240198 0240202D */ daddu $a0, $s2, $zero -/* DC456C 8024019C 0C0B1EAF */ jal get_variable -/* DC4570 802401A0 0040882D */ daddu $s1, $v0, $zero -/* DC4574 802401A4 0240202D */ daddu $a0, $s2, $zero -/* DC4578 802401A8 8E050000 */ lw $a1, ($s0) -/* DC457C 802401AC 0C0B1EAF */ jal get_variable -/* DC4580 802401B0 0040802D */ daddu $s0, $v0, $zero -/* DC4584 802401B4 02020018 */ mult $s0, $v0 -/* DC4588 802401B8 24020002 */ addiu $v0, $zero, 2 -/* DC458C 802401BC 8E430138 */ lw $v1, 0x138($s2) -/* DC4590 802401C0 00003012 */ mflo $a2 -/* DC4594 802401C4 02268821 */ addu $s1, $s1, $a2 -/* DC4598 802401C8 00518804 */ sllv $s1, $s1, $v0 -/* DC459C 802401CC 00711821 */ addu $v1, $v1, $s1 -/* DC45A0 802401D0 AE430138 */ sw $v1, 0x138($s2) -/* DC45A4 802401D4 8FBF001C */ lw $ra, 0x1c($sp) -/* DC45A8 802401D8 8FB20018 */ lw $s2, 0x18($sp) -/* DC45AC 802401DC 8FB10014 */ lw $s1, 0x14($sp) -/* DC45B0 802401E0 8FB00010 */ lw $s0, 0x10($sp) -/* DC45B4 802401E4 03E00008 */ jr $ra -/* DC45B8 802401E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_08/func_802401EC_DC43D0.s b/asm/nonmatchings/world/area_omo/omo_08/func_802401EC_DC43D0.s deleted file mode 100644 index 7f70f3faf7..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/func_802401EC_DC43D0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401EC_DC45BC -/* DC45BC 802401EC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DC45C0 802401F0 AFB10014 */ sw $s1, 0x14($sp) -/* DC45C4 802401F4 0080882D */ daddu $s1, $a0, $zero -/* DC45C8 802401F8 AFBF0018 */ sw $ra, 0x18($sp) -/* DC45CC 802401FC AFB00010 */ sw $s0, 0x10($sp) -/* DC45D0 80240200 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DC45D4 80240204 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DC45D8 80240208 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DC45DC 8024020C 8E30000C */ lw $s0, 0xc($s1) -/* DC45E0 80240210 8E050000 */ lw $a1, ($s0) -/* DC45E4 80240214 0C0B210B */ jal get_float_variable -/* DC45E8 80240218 26100004 */ addiu $s0, $s0, 4 -/* DC45EC 8024021C 8E050000 */ lw $a1, ($s0) -/* DC45F0 80240220 26100004 */ addiu $s0, $s0, 4 -/* DC45F4 80240224 0220202D */ daddu $a0, $s1, $zero -/* DC45F8 80240228 0C0B210B */ jal get_float_variable -/* DC45FC 8024022C 46000606 */ mov.s $f24, $f0 -/* DC4600 80240230 8E050000 */ lw $a1, ($s0) -/* DC4604 80240234 26100004 */ addiu $s0, $s0, 4 -/* DC4608 80240238 0220202D */ daddu $a0, $s1, $zero -/* DC460C 8024023C 0C0B210B */ jal get_float_variable -/* DC4610 80240240 46000586 */ mov.s $f22, $f0 -/* DC4614 80240244 0220202D */ daddu $a0, $s1, $zero -/* DC4618 80240248 8E050000 */ lw $a1, ($s0) -/* DC461C 8024024C 0C0B210B */ jal get_float_variable -/* DC4620 80240250 46000506 */ mov.s $f20, $f0 -/* DC4624 80240254 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* DC4628 80240258 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* DC462C 8024025C E4580028 */ swc1 $f24, 0x28($v0) -/* DC4630 80240260 E456002C */ swc1 $f22, 0x2c($v0) -/* DC4634 80240264 E4540030 */ swc1 $f20, 0x30($v0) -/* DC4638 80240268 E4400080 */ swc1 $f0, 0x80($v0) -/* DC463C 8024026C 8FBF0018 */ lw $ra, 0x18($sp) -/* DC4640 80240270 8FB10014 */ lw $s1, 0x14($sp) -/* DC4644 80240274 8FB00010 */ lw $s0, 0x10($sp) -/* DC4648 80240278 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DC464C 8024027C D7B60028 */ ldc1 $f22, 0x28($sp) -/* DC4650 80240280 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DC4654 80240284 24020002 */ addiu $v0, $zero, 2 -/* DC4658 80240288 03E00008 */ jr $ra -/* DC465C 8024028C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_08/func_80240290_DC43D0.s b/asm/nonmatchings/world/area_omo/omo_08/func_80240290_DC43D0.s deleted file mode 100644 index 82722b05b1..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/func_80240290_DC43D0.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240290_DC4660 -/* DC4660 80240290 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DC4664 80240294 AFB10014 */ sw $s1, 0x14($sp) -/* DC4668 80240298 0080882D */ daddu $s1, $a0, $zero -/* DC466C 8024029C AFBF001C */ sw $ra, 0x1c($sp) -/* DC4670 802402A0 AFB20018 */ sw $s2, 0x18($sp) -/* DC4674 802402A4 AFB00010 */ sw $s0, 0x10($sp) -/* DC4678 802402A8 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* DC467C 802402AC F7B80030 */ sdc1 $f24, 0x30($sp) -/* DC4680 802402B0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DC4684 802402B4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DC4688 802402B8 8E30000C */ lw $s0, 0xc($s1) -/* DC468C 802402BC 8E050000 */ lw $a1, ($s0) -/* DC4690 802402C0 0C0B1EAF */ jal get_variable -/* DC4694 802402C4 26100004 */ addiu $s0, $s0, 4 -/* DC4698 802402C8 8E050000 */ lw $a1, ($s0) -/* DC469C 802402CC 26100004 */ addiu $s0, $s0, 4 -/* DC46A0 802402D0 0220202D */ daddu $a0, $s1, $zero -/* DC46A4 802402D4 0C0B210B */ jal get_float_variable -/* DC46A8 802402D8 0040902D */ daddu $s2, $v0, $zero -/* DC46AC 802402DC 8E050000 */ lw $a1, ($s0) -/* DC46B0 802402E0 26100004 */ addiu $s0, $s0, 4 -/* DC46B4 802402E4 0220202D */ daddu $a0, $s1, $zero -/* DC46B8 802402E8 0C0B210B */ jal get_float_variable -/* DC46BC 802402EC 46000686 */ mov.s $f26, $f0 -/* DC46C0 802402F0 8E050000 */ lw $a1, ($s0) -/* DC46C4 802402F4 26100004 */ addiu $s0, $s0, 4 -/* DC46C8 802402F8 0220202D */ daddu $a0, $s1, $zero -/* DC46CC 802402FC 0C0B210B */ jal get_float_variable -/* DC46D0 80240300 46000606 */ mov.s $f24, $f0 -/* DC46D4 80240304 0220202D */ daddu $a0, $s1, $zero -/* DC46D8 80240308 8E050000 */ lw $a1, ($s0) -/* DC46DC 8024030C 0C0B210B */ jal get_float_variable -/* DC46E0 80240310 46000506 */ mov.s $f20, $f0 -/* DC46E4 80240314 0240202D */ daddu $a0, $s2, $zero -/* DC46E8 80240318 0C00EAD2 */ jal get_npc_safe -/* DC46EC 8024031C 46000586 */ mov.s $f22, $f0 -/* DC46F0 80240320 0040202D */ daddu $a0, $v0, $zero -/* DC46F4 80240324 E49A0038 */ swc1 $f26, 0x38($a0) -/* DC46F8 80240328 4600D006 */ mov.s $f0, $f26 -/* DC46FC 8024032C E498003C */ swc1 $f24, 0x3c($a0) -/* DC4700 80240330 4600C086 */ mov.s $f2, $f24 -/* DC4704 80240334 E4940040 */ swc1 $f20, 0x40($a0) -/* DC4708 80240338 4600A106 */ mov.s $f4, $f20 -/* DC470C 8024033C 8C830000 */ lw $v1, ($a0) -/* DC4710 80240340 3C050001 */ lui $a1, 1 -/* DC4714 80240344 E496000C */ swc1 $f22, 0xc($a0) -/* DC4718 80240348 E480006C */ swc1 $f0, 0x6c($a0) -/* DC471C 8024034C E4820070 */ swc1 $f2, 0x70($a0) -/* DC4720 80240350 E4840074 */ swc1 $f4, 0x74($a0) -/* DC4724 80240354 00651825 */ or $v1, $v1, $a1 -/* DC4728 80240358 AC830000 */ sw $v1, ($a0) -/* DC472C 8024035C 8FBF001C */ lw $ra, 0x1c($sp) -/* DC4730 80240360 8FB20018 */ lw $s2, 0x18($sp) -/* DC4734 80240364 8FB10014 */ lw $s1, 0x14($sp) -/* DC4738 80240368 8FB00010 */ lw $s0, 0x10($sp) -/* DC473C 8024036C D7BA0038 */ ldc1 $f26, 0x38($sp) -/* DC4740 80240370 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DC4744 80240374 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DC4748 80240378 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DC474C 8024037C 24020002 */ addiu $v0, $zero, 2 -/* DC4750 80240380 03E00008 */ jr $ra -/* DC4754 80240384 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_omo/omo_08/func_80240388_DC43D0.s b/asm/nonmatchings/world/area_omo/omo_08/func_80240388_DC43D0.s deleted file mode 100644 index a13f095845..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/func_80240388_DC43D0.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240388_DC4758 -/* DC4758 80240388 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DC475C 8024038C AFB20018 */ sw $s2, 0x18($sp) -/* DC4760 80240390 0080902D */ daddu $s2, $a0, $zero -/* DC4764 80240394 AFBF0028 */ sw $ra, 0x28($sp) -/* DC4768 80240398 AFB50024 */ sw $s5, 0x24($sp) -/* DC476C 8024039C AFB40020 */ sw $s4, 0x20($sp) -/* DC4770 802403A0 AFB3001C */ sw $s3, 0x1c($sp) -/* DC4774 802403A4 AFB10014 */ sw $s1, 0x14($sp) -/* DC4778 802403A8 AFB00010 */ sw $s0, 0x10($sp) -/* DC477C 802403AC F7B80040 */ sdc1 $f24, 0x40($sp) -/* DC4780 802403B0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* DC4784 802403B4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* DC4788 802403B8 8E50000C */ lw $s0, 0xc($s2) -/* DC478C 802403BC 8E140000 */ lw $s4, ($s0) -/* DC4790 802403C0 26100004 */ addiu $s0, $s0, 4 -/* DC4794 802403C4 0C0B1EAF */ jal get_variable -/* DC4798 802403C8 0280282D */ daddu $a1, $s4, $zero -/* DC479C 802403CC 0040982D */ daddu $s3, $v0, $zero -/* DC47A0 802403D0 8E150000 */ lw $s5, ($s0) -/* DC47A4 802403D4 26100004 */ addiu $s0, $s0, 4 -/* DC47A8 802403D8 8E050000 */ lw $a1, ($s0) -/* DC47AC 802403DC 26100004 */ addiu $s0, $s0, 4 -/* DC47B0 802403E0 0C0B210B */ jal get_float_variable -/* DC47B4 802403E4 0240202D */ daddu $a0, $s2, $zero -/* DC47B8 802403E8 8E050000 */ lw $a1, ($s0) -/* DC47BC 802403EC 26100004 */ addiu $s0, $s0, 4 -/* DC47C0 802403F0 0240202D */ daddu $a0, $s2, $zero -/* DC47C4 802403F4 0C0B210B */ jal get_float_variable -/* DC47C8 802403F8 46000606 */ mov.s $f24, $f0 -/* DC47CC 802403FC 8E050000 */ lw $a1, ($s0) -/* DC47D0 80240400 26100004 */ addiu $s0, $s0, 4 -/* DC47D4 80240404 0240202D */ daddu $a0, $s2, $zero -/* DC47D8 80240408 0C0B1EAF */ jal get_variable -/* DC47DC 8024040C 46000506 */ mov.s $f20, $f0 -/* DC47E0 80240410 8E050000 */ lw $a1, ($s0) -/* DC47E4 80240414 26100004 */ addiu $s0, $s0, 4 -/* DC47E8 80240418 0240202D */ daddu $a0, $s2, $zero -/* DC47EC 8024041C 0C0B1EAF */ jal get_variable -/* DC47F0 80240420 0040882D */ daddu $s1, $v0, $zero -/* DC47F4 80240424 0240202D */ daddu $a0, $s2, $zero -/* DC47F8 80240428 8E050000 */ lw $a1, ($s0) -/* DC47FC 8024042C 0C0B210B */ jal get_float_variable -/* DC4800 80240430 0040802D */ daddu $s0, $v0, $zero -/* DC4804 80240434 3C014334 */ lui $at, 0x4334 -/* DC4808 80240438 44811000 */ mtc1 $at, $f2 -/* DC480C 8024043C 3C014049 */ lui $at, 0x4049 -/* DC4810 80240440 34210FD8 */ ori $at, $at, 0xfd8 -/* DC4814 80240444 44812000 */ mtc1 $at, $f4 -/* DC4818 80240448 46020003 */ div.s $f0, $f0, $f2 -/* DC481C 8024044C 46040582 */ mul.s $f22, $f0, $f4 -/* DC4820 80240450 00000000 */ nop -/* DC4824 80240454 4618A501 */ sub.s $f20, $f20, $f24 -/* DC4828 80240458 3C013F00 */ lui $at, 0x3f00 -/* DC482C 8024045C 44810000 */ mtc1 $at, $f0 -/* DC4830 80240460 00000000 */ nop -/* DC4834 80240464 4600A502 */ mul.s $f20, $f20, $f0 -/* DC4838 80240468 00000000 */ nop -/* DC483C 8024046C 12000007 */ beqz $s0, .L8024048C -/* DC4840 80240470 0233102A */ slt $v0, $s1, $s3 -/* DC4844 80240474 10400005 */ beqz $v0, .L8024048C -/* DC4848 80240478 0240202D */ daddu $a0, $s2, $zero -/* DC484C 8024047C 0220982D */ daddu $s3, $s1, $zero -/* DC4850 80240480 0280282D */ daddu $a1, $s4, $zero -/* DC4854 80240484 0C0B2026 */ jal set_variable -/* DC4858 80240488 0220302D */ daddu $a2, $s1, $zero -.L8024048C: -/* DC485C 8024048C 3C014049 */ lui $at, 0x4049 -/* DC4860 80240490 34210FD8 */ ori $at, $at, 0xfd8 -/* DC4864 80240494 44810000 */ mtc1 $at, $f0 -/* DC4868 80240498 44936000 */ mtc1 $s3, $f12 -/* DC486C 8024049C 00000000 */ nop -/* DC4870 802404A0 46806320 */ cvt.s.w $f12, $f12 -/* DC4874 802404A4 46006302 */ mul.s $f12, $f12, $f0 -/* DC4878 802404A8 00000000 */ nop -/* DC487C 802404AC 44910000 */ mtc1 $s1, $f0 -/* DC4880 802404B0 00000000 */ nop -/* DC4884 802404B4 46800020 */ cvt.s.w $f0, $f0 -/* DC4888 802404B8 46006303 */ div.s $f12, $f12, $f0 -/* DC488C 802404BC 0C00A874 */ jal cos_rad -/* DC4890 802404C0 46166300 */ add.s $f12, $f12, $f22 -/* DC4894 802404C4 4600A002 */ mul.s $f0, $f20, $f0 -/* DC4898 802404C8 00000000 */ nop -/* DC489C 802404CC 4614C080 */ add.s $f2, $f24, $f20 -/* DC48A0 802404D0 46001081 */ sub.s $f2, $f2, $f0 -/* DC48A4 802404D4 0240202D */ daddu $a0, $s2, $zero -/* DC48A8 802404D8 44061000 */ mfc1 $a2, $f2 -/* DC48AC 802404DC 0C0B2190 */ jal set_float_variable -/* DC48B0 802404E0 02A0282D */ daddu $a1, $s5, $zero -/* DC48B4 802404E4 8FBF0028 */ lw $ra, 0x28($sp) -/* DC48B8 802404E8 8FB50024 */ lw $s5, 0x24($sp) -/* DC48BC 802404EC 8FB40020 */ lw $s4, 0x20($sp) -/* DC48C0 802404F0 8FB3001C */ lw $s3, 0x1c($sp) -/* DC48C4 802404F4 8FB20018 */ lw $s2, 0x18($sp) -/* DC48C8 802404F8 8FB10014 */ lw $s1, 0x14($sp) -/* DC48CC 802404FC 8FB00010 */ lw $s0, 0x10($sp) -/* DC48D0 80240500 D7B80040 */ ldc1 $f24, 0x40($sp) -/* DC48D4 80240504 D7B60038 */ ldc1 $f22, 0x38($sp) -/* DC48D8 80240508 D7B40030 */ ldc1 $f20, 0x30($sp) -/* DC48DC 8024050C 24020002 */ addiu $v0, $zero, 2 -/* DC48E0 80240510 03E00008 */ jr $ra -/* DC48E4 80240514 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_08/func_80240518_DC43D0.s b/asm/nonmatchings/world/area_omo/omo_08/func_80240518_DC43D0.s deleted file mode 100644 index 6674da5a2a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/func_80240518_DC43D0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240518_DC48E8 -/* DC48E8 80240518 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* DC48EC 8024051C 2463419C */ addiu $v1, $v1, %lo(gGameStatusPtr) -/* DC48F0 80240520 8C620000 */ lw $v0, ($v1) -/* DC48F4 80240524 AC800084 */ sw $zero, 0x84($a0) -/* DC48F8 80240528 8C420010 */ lw $v0, 0x10($v0) -/* DC48FC 8024052C 30428000 */ andi $v0, $v0, 0x8000 -/* DC4900 80240530 10400002 */ beqz $v0, .L8024053C -/* DC4904 80240534 24020001 */ addiu $v0, $zero, 1 -/* DC4908 80240538 AC820084 */ sw $v0, 0x84($a0) -.L8024053C: -/* DC490C 8024053C 8C620000 */ lw $v0, ($v1) -/* DC4910 80240540 8C420010 */ lw $v0, 0x10($v0) -/* DC4914 80240544 30424000 */ andi $v0, $v0, 0x4000 -/* DC4918 80240548 10400002 */ beqz $v0, .L80240554 -/* DC491C 8024054C 24020001 */ addiu $v0, $zero, 1 -/* DC4920 80240550 AC820084 */ sw $v0, 0x84($a0) -.L80240554: -/* DC4924 80240554 03E00008 */ jr $ra -/* DC4928 80240558 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_08/func_8024055C_DC43D0.s b/asm/nonmatchings/world/area_omo/omo_08/func_8024055C_DC43D0.s deleted file mode 100644 index dfa431a01e..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/func_8024055C_DC43D0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024055C_DC492C -/* DC492C 8024055C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DC4930 80240560 AFB00010 */ sw $s0, 0x10($sp) -/* DC4934 80240564 0080802D */ daddu $s0, $a0, $zero -/* DC4938 80240568 AFBF0014 */ sw $ra, 0x14($sp) -/* DC493C 8024056C 8E0300A8 */ lw $v1, 0xa8($s0) -/* DC4940 80240570 8E020088 */ lw $v0, 0x88($s0) -/* DC4944 80240574 00621821 */ addu $v1, $v1, $v0 -/* DC4948 80240578 04610004 */ bgez $v1, .L8024058C -/* DC494C 8024057C AE0300A8 */ sw $v1, 0xa8($s0) -/* DC4950 80240580 3C020002 */ lui $v0, 2 -/* DC4954 80240584 08090167 */ j .L8024059C -/* DC4958 80240588 00621021 */ addu $v0, $v1, $v0 -.L8024058C: -/* DC495C 8024058C 3C040002 */ lui $a0, 2 -/* DC4960 80240590 0083102A */ slt $v0, $a0, $v1 -/* DC4964 80240594 10400002 */ beqz $v0, .L802405A0 -/* DC4968 80240598 00641023 */ subu $v0, $v1, $a0 -.L8024059C: -/* DC496C 8024059C AE0200A8 */ sw $v0, 0xa8($s0) -.L802405A0: -/* DC4970 802405A0 8E0300AC */ lw $v1, 0xac($s0) -/* DC4974 802405A4 8E02008C */ lw $v0, 0x8c($s0) -/* DC4978 802405A8 00621821 */ addu $v1, $v1, $v0 -/* DC497C 802405AC 04610004 */ bgez $v1, .L802405C0 -/* DC4980 802405B0 AE0300AC */ sw $v1, 0xac($s0) -/* DC4984 802405B4 3C020002 */ lui $v0, 2 -/* DC4988 802405B8 08090174 */ j .L802405D0 -/* DC498C 802405BC 00621021 */ addu $v0, $v1, $v0 -.L802405C0: -/* DC4990 802405C0 3C040002 */ lui $a0, 2 -/* DC4994 802405C4 0083102A */ slt $v0, $a0, $v1 -/* DC4998 802405C8 10400002 */ beqz $v0, .L802405D4 -/* DC499C 802405CC 00641023 */ subu $v0, $v1, $a0 -.L802405D0: -/* DC49A0 802405D0 AE0200AC */ sw $v0, 0xac($s0) -.L802405D4: -/* DC49A4 802405D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* DC49A8 802405D8 8E020090 */ lw $v0, 0x90($s0) -/* DC49AC 802405DC 00621821 */ addu $v1, $v1, $v0 -/* DC49B0 802405E0 04610004 */ bgez $v1, .L802405F4 -/* DC49B4 802405E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* DC49B8 802405E8 3C020002 */ lui $v0, 2 -/* DC49BC 802405EC 08090181 */ j .L80240604 -/* DC49C0 802405F0 00621021 */ addu $v0, $v1, $v0 -.L802405F4: -/* DC49C4 802405F4 3C040002 */ lui $a0, 2 -/* DC49C8 802405F8 0083102A */ slt $v0, $a0, $v1 -/* DC49CC 802405FC 10400002 */ beqz $v0, .L80240608 -/* DC49D0 80240600 00641023 */ subu $v0, $v1, $a0 -.L80240604: -/* DC49D4 80240604 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240608: -/* DC49D8 80240608 8E0300B4 */ lw $v1, 0xb4($s0) -/* DC49DC 8024060C 8E020094 */ lw $v0, 0x94($s0) -/* DC49E0 80240610 00621821 */ addu $v1, $v1, $v0 -/* DC49E4 80240614 04610004 */ bgez $v1, .L80240628 -/* DC49E8 80240618 AE0300B4 */ sw $v1, 0xb4($s0) -/* DC49EC 8024061C 3C020002 */ lui $v0, 2 -/* DC49F0 80240620 0809018E */ j .L80240638 -/* DC49F4 80240624 00621021 */ addu $v0, $v1, $v0 -.L80240628: -/* DC49F8 80240628 3C040002 */ lui $a0, 2 -/* DC49FC 8024062C 0083102A */ slt $v0, $a0, $v1 -/* DC4A00 80240630 10400002 */ beqz $v0, .L8024063C -/* DC4A04 80240634 00641023 */ subu $v0, $v1, $a0 -.L80240638: -/* DC4A08 80240638 AE0200B4 */ sw $v0, 0xb4($s0) -.L8024063C: -/* DC4A0C 8024063C 8E040084 */ lw $a0, 0x84($s0) -/* DC4A10 80240640 0C046F07 */ jal set_main_pan_u -/* DC4A14 80240644 8E0500A8 */ lw $a1, 0xa8($s0) -/* DC4A18 80240648 8E040084 */ lw $a0, 0x84($s0) -/* DC4A1C 8024064C 0C046F0D */ jal set_main_pan_v -/* DC4A20 80240650 8E0500AC */ lw $a1, 0xac($s0) -/* DC4A24 80240654 8E040084 */ lw $a0, 0x84($s0) -/* DC4A28 80240658 0C046F13 */ jal set_aux_pan_u -/* DC4A2C 8024065C 8E0500B0 */ lw $a1, 0xb0($s0) -/* DC4A30 80240660 8E040084 */ lw $a0, 0x84($s0) -/* DC4A34 80240664 0C046F19 */ jal set_aux_pan_v -/* DC4A38 80240668 8E0500B4 */ lw $a1, 0xb4($s0) -/* DC4A3C 8024066C 8FBF0014 */ lw $ra, 0x14($sp) -/* DC4A40 80240670 8FB00010 */ lw $s0, 0x10($sp) -/* DC4A44 80240674 0000102D */ daddu $v0, $zero, $zero -/* DC4A48 80240678 03E00008 */ jr $ra -/* DC4A4C 8024067C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_08/func_80240680_DC43D0.s b/asm/nonmatchings/world/area_omo/omo_08/func_80240680_DC43D0.s deleted file mode 100644 index 82b86152e4..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/func_80240680_DC43D0.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240680_DC4A50 -/* DC4A50 80240680 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DC4A54 80240684 AFB00010 */ sw $s0, 0x10($sp) -/* DC4A58 80240688 0080802D */ daddu $s0, $a0, $zero -/* DC4A5C 8024068C 10A00005 */ beqz $a1, .L802406A4 -/* DC4A60 80240690 AFBF0014 */ sw $ra, 0x14($sp) -/* DC4A64 80240694 AE000070 */ sw $zero, 0x70($s0) -/* DC4A68 80240698 AE000074 */ sw $zero, 0x74($s0) -/* DC4A6C 8024069C AE000078 */ sw $zero, 0x78($s0) -/* DC4A70 802406A0 AE00007C */ sw $zero, 0x7c($s0) -.L802406A4: -/* DC4A74 802406A4 8E020070 */ lw $v0, 0x70($s0) -/* DC4A78 802406A8 1440000E */ bnez $v0, .L802406E4 -/* DC4A7C 802406AC 00000000 */ nop -/* DC4A80 802406B0 8E0300A8 */ lw $v1, 0xa8($s0) -/* DC4A84 802406B4 8E020088 */ lw $v0, 0x88($s0) -/* DC4A88 802406B8 00621821 */ addu $v1, $v1, $v0 -/* DC4A8C 802406BC 04610004 */ bgez $v1, .L802406D0 -/* DC4A90 802406C0 AE0300A8 */ sw $v1, 0xa8($s0) -/* DC4A94 802406C4 3C020002 */ lui $v0, 2 -/* DC4A98 802406C8 080901B8 */ j .L802406E0 -/* DC4A9C 802406CC 00621021 */ addu $v0, $v1, $v0 -.L802406D0: -/* DC4AA0 802406D0 3C040002 */ lui $a0, 2 -/* DC4AA4 802406D4 0083102A */ slt $v0, $a0, $v1 -/* DC4AA8 802406D8 10400002 */ beqz $v0, .L802406E4 -/* DC4AAC 802406DC 00641023 */ subu $v0, $v1, $a0 -.L802406E0: -/* DC4AB0 802406E0 AE0200A8 */ sw $v0, 0xa8($s0) -.L802406E4: -/* DC4AB4 802406E4 8E020074 */ lw $v0, 0x74($s0) -/* DC4AB8 802406E8 1440000E */ bnez $v0, .L80240724 -/* DC4ABC 802406EC 00000000 */ nop -/* DC4AC0 802406F0 8E0300AC */ lw $v1, 0xac($s0) -/* DC4AC4 802406F4 8E02008C */ lw $v0, 0x8c($s0) -/* DC4AC8 802406F8 00621821 */ addu $v1, $v1, $v0 -/* DC4ACC 802406FC 04610004 */ bgez $v1, .L80240710 -/* DC4AD0 80240700 AE0300AC */ sw $v1, 0xac($s0) -/* DC4AD4 80240704 3C020002 */ lui $v0, 2 -/* DC4AD8 80240708 080901C8 */ j .L80240720 -/* DC4ADC 8024070C 00621021 */ addu $v0, $v1, $v0 -.L80240710: -/* DC4AE0 80240710 3C040002 */ lui $a0, 2 -/* DC4AE4 80240714 0083102A */ slt $v0, $a0, $v1 -/* DC4AE8 80240718 10400002 */ beqz $v0, .L80240724 -/* DC4AEC 8024071C 00641023 */ subu $v0, $v1, $a0 -.L80240720: -/* DC4AF0 80240720 AE0200AC */ sw $v0, 0xac($s0) -.L80240724: -/* DC4AF4 80240724 8E020078 */ lw $v0, 0x78($s0) -/* DC4AF8 80240728 1440000E */ bnez $v0, .L80240764 -/* DC4AFC 8024072C 00000000 */ nop -/* DC4B00 80240730 8E0300B0 */ lw $v1, 0xb0($s0) -/* DC4B04 80240734 8E020090 */ lw $v0, 0x90($s0) -/* DC4B08 80240738 00621821 */ addu $v1, $v1, $v0 -/* DC4B0C 8024073C 04610004 */ bgez $v1, .L80240750 -/* DC4B10 80240740 AE0300B0 */ sw $v1, 0xb0($s0) -/* DC4B14 80240744 3C020002 */ lui $v0, 2 -/* DC4B18 80240748 080901D8 */ j .L80240760 -/* DC4B1C 8024074C 00621021 */ addu $v0, $v1, $v0 -.L80240750: -/* DC4B20 80240750 3C040002 */ lui $a0, 2 -/* DC4B24 80240754 0083102A */ slt $v0, $a0, $v1 -/* DC4B28 80240758 10400002 */ beqz $v0, .L80240764 -/* DC4B2C 8024075C 00641023 */ subu $v0, $v1, $a0 -.L80240760: -/* DC4B30 80240760 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240764: -/* DC4B34 80240764 8E02007C */ lw $v0, 0x7c($s0) -/* DC4B38 80240768 1440000E */ bnez $v0, .L802407A4 -/* DC4B3C 8024076C 00000000 */ nop -/* DC4B40 80240770 8E0300B4 */ lw $v1, 0xb4($s0) -/* DC4B44 80240774 8E020094 */ lw $v0, 0x94($s0) -/* DC4B48 80240778 00621821 */ addu $v1, $v1, $v0 -/* DC4B4C 8024077C 04610004 */ bgez $v1, .L80240790 -/* DC4B50 80240780 AE0300B4 */ sw $v1, 0xb4($s0) -/* DC4B54 80240784 3C020002 */ lui $v0, 2 -/* DC4B58 80240788 080901E8 */ j .L802407A0 -/* DC4B5C 8024078C 00621021 */ addu $v0, $v1, $v0 -.L80240790: -/* DC4B60 80240790 3C040002 */ lui $a0, 2 -/* DC4B64 80240794 0083102A */ slt $v0, $a0, $v1 -/* DC4B68 80240798 10400002 */ beqz $v0, .L802407A4 -/* DC4B6C 8024079C 00641023 */ subu $v0, $v1, $a0 -.L802407A0: -/* DC4B70 802407A0 AE0200B4 */ sw $v0, 0xb4($s0) -.L802407A4: -/* DC4B74 802407A4 8E040084 */ lw $a0, 0x84($s0) -/* DC4B78 802407A8 0C046F07 */ jal set_main_pan_u -/* DC4B7C 802407AC 8E0500A8 */ lw $a1, 0xa8($s0) -/* DC4B80 802407B0 8E040084 */ lw $a0, 0x84($s0) -/* DC4B84 802407B4 0C046F0D */ jal set_main_pan_v -/* DC4B88 802407B8 8E0500AC */ lw $a1, 0xac($s0) -/* DC4B8C 802407BC 8E040084 */ lw $a0, 0x84($s0) -/* DC4B90 802407C0 0C046F13 */ jal set_aux_pan_u -/* DC4B94 802407C4 8E0500B0 */ lw $a1, 0xb0($s0) -/* DC4B98 802407C8 8E040084 */ lw $a0, 0x84($s0) -/* DC4B9C 802407CC 0C046F19 */ jal set_aux_pan_v -/* DC4BA0 802407D0 8E0500B4 */ lw $a1, 0xb4($s0) -/* DC4BA4 802407D4 8E020070 */ lw $v0, 0x70($s0) -/* DC4BA8 802407D8 8E030078 */ lw $v1, 0x78($s0) -/* DC4BAC 802407DC 8E040098 */ lw $a0, 0x98($s0) -/* DC4BB0 802407E0 24420001 */ addiu $v0, $v0, 1 -/* DC4BB4 802407E4 AE020070 */ sw $v0, 0x70($s0) -/* DC4BB8 802407E8 8E020074 */ lw $v0, 0x74($s0) -/* DC4BBC 802407EC 24630001 */ addiu $v1, $v1, 1 -/* DC4BC0 802407F0 AE030078 */ sw $v1, 0x78($s0) -/* DC4BC4 802407F4 8E030070 */ lw $v1, 0x70($s0) -/* DC4BC8 802407F8 24420001 */ addiu $v0, $v0, 1 -/* DC4BCC 802407FC AE020074 */ sw $v0, 0x74($s0) -/* DC4BD0 80240800 8E02007C */ lw $v0, 0x7c($s0) -/* DC4BD4 80240804 0064182A */ slt $v1, $v1, $a0 -/* DC4BD8 80240808 24420001 */ addiu $v0, $v0, 1 -/* DC4BDC 8024080C 14600002 */ bnez $v1, .L80240818 -/* DC4BE0 80240810 AE02007C */ sw $v0, 0x7c($s0) -/* DC4BE4 80240814 AE000070 */ sw $zero, 0x70($s0) -.L80240818: -/* DC4BE8 80240818 8E020074 */ lw $v0, 0x74($s0) -/* DC4BEC 8024081C 8E03009C */ lw $v1, 0x9c($s0) -/* DC4BF0 80240820 0043102A */ slt $v0, $v0, $v1 -/* DC4BF4 80240824 50400001 */ beql $v0, $zero, .L8024082C -/* DC4BF8 80240828 AE000074 */ sw $zero, 0x74($s0) -.L8024082C: -/* DC4BFC 8024082C 8E020078 */ lw $v0, 0x78($s0) -/* DC4C00 80240830 8E0300A0 */ lw $v1, 0xa0($s0) -/* DC4C04 80240834 0043102A */ slt $v0, $v0, $v1 -/* DC4C08 80240838 50400001 */ beql $v0, $zero, .L80240840 -/* DC4C0C 8024083C AE000078 */ sw $zero, 0x78($s0) -.L80240840: -/* DC4C10 80240840 8E02007C */ lw $v0, 0x7c($s0) -/* DC4C14 80240844 8E0300A4 */ lw $v1, 0xa4($s0) -/* DC4C18 80240848 0043102A */ slt $v0, $v0, $v1 -/* DC4C1C 8024084C 50400001 */ beql $v0, $zero, .L80240854 -/* DC4C20 80240850 AE00007C */ sw $zero, 0x7c($s0) -.L80240854: -/* DC4C24 80240854 8FBF0014 */ lw $ra, 0x14($sp) -/* DC4C28 80240858 8FB00010 */ lw $s0, 0x10($sp) -/* DC4C2C 8024085C 0000102D */ daddu $v0, $zero, $zero -/* DC4C30 80240860 03E00008 */ jr $ra -/* DC4C34 80240864 27BD0018 */ addiu $sp, $sp, 0x18 -/* DC4C38 80240868 00000000 */ nop -/* DC4C3C 8024086C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_08/func_80240870_DC43D0.s b/asm/nonmatchings/world/area_omo/omo_08/func_80240870_DC43D0.s deleted file mode 100644 index e52bb688a8..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/func_80240870_DC43D0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_DC4C40 -/* DC4C40 80240870 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DC4C44 80240874 AFB10014 */ sw $s1, 0x14($sp) -/* DC4C48 80240878 0080882D */ daddu $s1, $a0, $zero -/* DC4C4C 8024087C AFBF0018 */ sw $ra, 0x18($sp) -/* DC4C50 80240880 AFB00010 */ sw $s0, 0x10($sp) -/* DC4C54 80240884 8E300148 */ lw $s0, 0x148($s1) -/* DC4C58 80240888 0C00EABB */ jal get_npc_unsafe -/* DC4C5C 8024088C 86040008 */ lh $a0, 8($s0) -/* DC4C60 80240890 C4400018 */ lwc1 $f0, 0x18($v0) -/* DC4C64 80240894 3C018025 */ lui $at, 0x8025 -/* DC4C68 80240898 D4228760 */ ldc1 $f2, -0x78a0($at) -/* DC4C6C 8024089C 46000021 */ cvt.d.s $f0, $f0 -/* DC4C70 802408A0 46220002 */ mul.d $f0, $f0, $f2 -/* DC4C74 802408A4 00000000 */ nop -/* DC4C78 802408A8 46200020 */ cvt.s.d $f0, $f0 -/* DC4C7C 802408AC E4400018 */ swc1 $f0, 0x18($v0) -/* DC4C80 802408B0 8E0300CC */ lw $v1, 0xcc($s0) -/* DC4C84 802408B4 8C640030 */ lw $a0, 0x30($v1) -/* DC4C88 802408B8 24030005 */ addiu $v1, $zero, 5 -/* DC4C8C 802408BC A443008E */ sh $v1, 0x8e($v0) -/* DC4C90 802408C0 AC440028 */ sw $a0, 0x28($v0) -/* DC4C94 802408C4 2402000F */ addiu $v0, $zero, 0xf -/* DC4C98 802408C8 AE220070 */ sw $v0, 0x70($s1) -/* DC4C9C 802408CC 8FBF0018 */ lw $ra, 0x18($sp) -/* DC4CA0 802408D0 8FB10014 */ lw $s1, 0x14($sp) -/* DC4CA4 802408D4 8FB00010 */ lw $s0, 0x10($sp) -/* DC4CA8 802408D8 03E00008 */ jr $ra -/* DC4CAC 802408DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_08/func_802408E0_DC43D0.s b/asm/nonmatchings/world/area_omo/omo_08/func_802408E0_DC43D0.s deleted file mode 100644 index 64b6862132..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/func_802408E0_DC43D0.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408E0_DC4CB0 -/* DC4CB0 802408E0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DC4CB4 802408E4 AFB20028 */ sw $s2, 0x28($sp) -/* DC4CB8 802408E8 0080902D */ daddu $s2, $a0, $zero -/* DC4CBC 802408EC AFBF002C */ sw $ra, 0x2c($sp) -/* DC4CC0 802408F0 AFB10024 */ sw $s1, 0x24($sp) -/* DC4CC4 802408F4 AFB00020 */ sw $s0, 0x20($sp) -/* DC4CC8 802408F8 8E510148 */ lw $s1, 0x148($s2) -/* DC4CCC 802408FC 0C00EABB */ jal get_npc_unsafe -/* DC4CD0 80240900 86240008 */ lh $a0, 8($s1) -/* DC4CD4 80240904 0040802D */ daddu $s0, $v0, $zero -/* DC4CD8 80240908 0200202D */ daddu $a0, $s0, $zero -/* DC4CDC 8024090C C600000C */ lwc1 $f0, 0xc($s0) -/* DC4CE0 80240910 27A60018 */ addiu $a2, $sp, 0x18 -/* DC4CE4 80240914 E7A00018 */ swc1 $f0, 0x18($sp) -/* DC4CE8 80240918 AFA00010 */ sw $zero, 0x10($sp) -/* DC4CEC 8024091C AFA00014 */ sw $zero, 0x14($sp) -/* DC4CF0 80240920 8E050018 */ lw $a1, 0x18($s0) -/* DC4CF4 80240924 0C0129E1 */ jal func_8004A784 -/* DC4CF8 80240928 0000382D */ daddu $a3, $zero, $zero -/* DC4CFC 8024092C 14400005 */ bnez $v0, .L80240944 -/* DC4D00 80240930 00000000 */ nop -/* DC4D04 80240934 8E050018 */ lw $a1, 0x18($s0) -/* DC4D08 80240938 8E06000C */ lw $a2, 0xc($s0) -/* DC4D0C 8024093C 0C00EA95 */ jal npc_move_heading -/* DC4D10 80240940 0200202D */ daddu $a0, $s0, $zero -.L80240944: -/* DC4D14 80240944 9602008E */ lhu $v0, 0x8e($s0) -/* DC4D18 80240948 2442FFFF */ addiu $v0, $v0, -1 -/* DC4D1C 8024094C A602008E */ sh $v0, 0x8e($s0) -/* DC4D20 80240950 00021400 */ sll $v0, $v0, 0x10 -/* DC4D24 80240954 14400010 */ bnez $v0, .L80240998 -/* DC4D28 80240958 00000000 */ nop -/* DC4D2C 8024095C C6000018 */ lwc1 $f0, 0x18($s0) -/* DC4D30 80240960 3C018025 */ lui $at, 0x8025 -/* DC4D34 80240964 D4228768 */ ldc1 $f2, -0x7898($at) -/* DC4D38 80240968 46000021 */ cvt.d.s $f0, $f0 -/* DC4D3C 8024096C 46220002 */ mul.d $f0, $f0, $f2 -/* DC4D40 80240970 00000000 */ nop -/* DC4D44 80240974 46200020 */ cvt.s.d $f0, $f0 -/* DC4D48 80240978 E6000018 */ swc1 $f0, 0x18($s0) -/* DC4D4C 8024097C 8E2200CC */ lw $v0, 0xcc($s1) -/* DC4D50 80240980 8C43002C */ lw $v1, 0x2c($v0) -/* DC4D54 80240984 2402000A */ addiu $v0, $zero, 0xa -/* DC4D58 80240988 A602008E */ sh $v0, 0x8e($s0) -/* DC4D5C 8024098C 24020010 */ addiu $v0, $zero, 0x10 -/* DC4D60 80240990 AE030028 */ sw $v1, 0x28($s0) -/* DC4D64 80240994 AE420070 */ sw $v0, 0x70($s2) -.L80240998: -/* DC4D68 80240998 8FBF002C */ lw $ra, 0x2c($sp) -/* DC4D6C 8024099C 8FB20028 */ lw $s2, 0x28($sp) -/* DC4D70 802409A0 8FB10024 */ lw $s1, 0x24($sp) -/* DC4D74 802409A4 8FB00020 */ lw $s0, 0x20($sp) -/* DC4D78 802409A8 03E00008 */ jr $ra -/* DC4D7C 802409AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_08/func_802409B0_DC43D0.s b/asm/nonmatchings/world/area_omo/omo_08/func_802409B0_DC43D0.s deleted file mode 100644 index 63b486d60c..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/func_802409B0_DC43D0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409B0_DC4D80 -/* DC4D80 802409B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DC4D84 802409B4 AFB10024 */ sw $s1, 0x24($sp) -/* DC4D88 802409B8 0080882D */ daddu $s1, $a0, $zero -/* DC4D8C 802409BC AFBF0028 */ sw $ra, 0x28($sp) -/* DC4D90 802409C0 AFB00020 */ sw $s0, 0x20($sp) -/* DC4D94 802409C4 8E220148 */ lw $v0, 0x148($s1) -/* DC4D98 802409C8 0C00EABB */ jal get_npc_unsafe -/* DC4D9C 802409CC 84440008 */ lh $a0, 8($v0) -/* DC4DA0 802409D0 0040802D */ daddu $s0, $v0, $zero -/* DC4DA4 802409D4 0200202D */ daddu $a0, $s0, $zero -/* DC4DA8 802409D8 C600000C */ lwc1 $f0, 0xc($s0) -/* DC4DAC 802409DC 27A60018 */ addiu $a2, $sp, 0x18 -/* DC4DB0 802409E0 E7A00018 */ swc1 $f0, 0x18($sp) -/* DC4DB4 802409E4 AFA00010 */ sw $zero, 0x10($sp) -/* DC4DB8 802409E8 AFA00014 */ sw $zero, 0x14($sp) -/* DC4DBC 802409EC 8E050018 */ lw $a1, 0x18($s0) -/* DC4DC0 802409F0 0C0129E1 */ jal func_8004A784 -/* DC4DC4 802409F4 0000382D */ daddu $a3, $zero, $zero -/* DC4DC8 802409F8 14400005 */ bnez $v0, .L80240A10 -/* DC4DCC 802409FC 00000000 */ nop -/* DC4DD0 80240A00 8E050018 */ lw $a1, 0x18($s0) -/* DC4DD4 80240A04 8E06000C */ lw $a2, 0xc($s0) -/* DC4DD8 80240A08 0C00EA95 */ jal npc_move_heading -/* DC4DDC 80240A0C 0200202D */ daddu $a0, $s0, $zero -.L80240A10: -/* DC4DE0 80240A10 9602008E */ lhu $v0, 0x8e($s0) -/* DC4DE4 80240A14 2442FFFF */ addiu $v0, $v0, -1 -/* DC4DE8 80240A18 A602008E */ sh $v0, 0x8e($s0) -/* DC4DEC 80240A1C 00021400 */ sll $v0, $v0, 0x10 -/* DC4DF0 80240A20 14400004 */ bnez $v0, .L80240A34 -/* DC4DF4 80240A24 2402001E */ addiu $v0, $zero, 0x1e -/* DC4DF8 80240A28 A602008E */ sh $v0, 0x8e($s0) -/* DC4DFC 80240A2C 24020011 */ addiu $v0, $zero, 0x11 -/* DC4E00 80240A30 AE220070 */ sw $v0, 0x70($s1) -.L80240A34: -/* DC4E04 80240A34 8FBF0028 */ lw $ra, 0x28($sp) -/* DC4E08 80240A38 8FB10024 */ lw $s1, 0x24($sp) -/* DC4E0C 80240A3C 8FB00020 */ lw $s0, 0x20($sp) -/* DC4E10 80240A40 03E00008 */ jr $ra -/* DC4E14 80240A44 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_08/func_80240A48_DC43D0.s b/asm/nonmatchings/world/area_omo/omo_08/func_80240A48_DC43D0.s deleted file mode 100644 index 65f8ee34fc..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/func_80240A48_DC43D0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A48_DC4E18 -/* DC4E18 80240A48 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DC4E1C 80240A4C AFB10014 */ sw $s1, 0x14($sp) -/* DC4E20 80240A50 0080882D */ daddu $s1, $a0, $zero -/* DC4E24 80240A54 AFBF0018 */ sw $ra, 0x18($sp) -/* DC4E28 80240A58 AFB00010 */ sw $s0, 0x10($sp) -/* DC4E2C 80240A5C 8E300148 */ lw $s0, 0x148($s1) -/* DC4E30 80240A60 0C00EABB */ jal get_npc_unsafe -/* DC4E34 80240A64 86040008 */ lh $a0, 8($s0) -/* DC4E38 80240A68 0040182D */ daddu $v1, $v0, $zero -/* DC4E3C 80240A6C 9462008E */ lhu $v0, 0x8e($v1) -/* DC4E40 80240A70 2442FFFF */ addiu $v0, $v0, -1 -/* DC4E44 80240A74 A462008E */ sh $v0, 0x8e($v1) -/* DC4E48 80240A78 00021400 */ sll $v0, $v0, 0x10 -/* DC4E4C 80240A7C 14400005 */ bnez $v0, .L80240A94 -/* DC4E50 80240A80 00000000 */ nop -/* DC4E54 80240A84 8E0200CC */ lw $v0, 0xcc($s0) -/* DC4E58 80240A88 8C420000 */ lw $v0, ($v0) -/* DC4E5C 80240A8C AC620028 */ sw $v0, 0x28($v1) -/* DC4E60 80240A90 AE200070 */ sw $zero, 0x70($s1) -.L80240A94: -/* DC4E64 80240A94 8FBF0018 */ lw $ra, 0x18($sp) -/* DC4E68 80240A98 8FB10014 */ lw $s1, 0x14($sp) -/* DC4E6C 80240A9C 8FB00010 */ lw $s0, 0x10($sp) -/* DC4E70 80240AA0 03E00008 */ jr $ra -/* DC4E74 80240AA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_08/func_80240AA8_DC43D0.s b/asm/nonmatchings/world/area_omo/omo_08/func_80240AA8_DC43D0.s deleted file mode 100644 index 12171aec8a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/func_80240AA8_DC43D0.s +++ /dev/null @@ -1,217 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AA8_DC4E78 -/* DC4E78 80240AA8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DC4E7C 80240AAC AFB30054 */ sw $s3, 0x54($sp) -/* DC4E80 80240AB0 0080982D */ daddu $s3, $a0, $zero -/* DC4E84 80240AB4 AFBF0060 */ sw $ra, 0x60($sp) -/* DC4E88 80240AB8 AFB5005C */ sw $s5, 0x5c($sp) -/* DC4E8C 80240ABC AFB40058 */ sw $s4, 0x58($sp) -/* DC4E90 80240AC0 AFB20050 */ sw $s2, 0x50($sp) -/* DC4E94 80240AC4 AFB1004C */ sw $s1, 0x4c($sp) -/* DC4E98 80240AC8 AFB00048 */ sw $s0, 0x48($sp) -/* DC4E9C 80240ACC 8E710148 */ lw $s1, 0x148($s3) -/* DC4EA0 80240AD0 86240008 */ lh $a0, 8($s1) -/* DC4EA4 80240AD4 0C00EABB */ jal get_npc_unsafe -/* DC4EA8 80240AD8 00A0802D */ daddu $s0, $a1, $zero -/* DC4EAC 80240ADC 8E63000C */ lw $v1, 0xc($s3) -/* DC4EB0 80240AE0 0260202D */ daddu $a0, $s3, $zero -/* DC4EB4 80240AE4 8C650000 */ lw $a1, ($v1) -/* DC4EB8 80240AE8 0C0B1EAF */ jal get_variable -/* DC4EBC 80240AEC 0040902D */ daddu $s2, $v0, $zero -/* DC4EC0 80240AF0 AFA00018 */ sw $zero, 0x18($sp) -/* DC4EC4 80240AF4 8E2300D0 */ lw $v1, 0xd0($s1) -/* DC4EC8 80240AF8 8C630030 */ lw $v1, 0x30($v1) -/* DC4ECC 80240AFC AFA3001C */ sw $v1, 0x1c($sp) -/* DC4ED0 80240B00 8E2300D0 */ lw $v1, 0xd0($s1) -/* DC4ED4 80240B04 8C63001C */ lw $v1, 0x1c($v1) -/* DC4ED8 80240B08 AFA30020 */ sw $v1, 0x20($sp) -/* DC4EDC 80240B0C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DC4EE0 80240B10 8C630024 */ lw $v1, 0x24($v1) -/* DC4EE4 80240B14 AFA30024 */ sw $v1, 0x24($sp) -/* DC4EE8 80240B18 8E2300D0 */ lw $v1, 0xd0($s1) -/* DC4EEC 80240B1C 8C630028 */ lw $v1, 0x28($v1) -/* DC4EF0 80240B20 27B50018 */ addiu $s5, $sp, 0x18 -/* DC4EF4 80240B24 AFA30028 */ sw $v1, 0x28($sp) -/* DC4EF8 80240B28 8E2300D0 */ lw $v1, 0xd0($s1) -/* DC4EFC 80240B2C 3C014282 */ lui $at, 0x4282 -/* DC4F00 80240B30 44810000 */ mtc1 $at, $f0 -/* DC4F04 80240B34 8C63002C */ lw $v1, 0x2c($v1) -/* DC4F08 80240B38 0040A02D */ daddu $s4, $v0, $zero -/* DC4F0C 80240B3C E7A00030 */ swc1 $f0, 0x30($sp) -/* DC4F10 80240B40 A7A00034 */ sh $zero, 0x34($sp) -/* DC4F14 80240B44 16000005 */ bnez $s0, .L80240B5C -/* DC4F18 80240B48 AFA3002C */ sw $v1, 0x2c($sp) -/* DC4F1C 80240B4C 8E2200B0 */ lw $v0, 0xb0($s1) -/* DC4F20 80240B50 30420004 */ andi $v0, $v0, 4 -/* DC4F24 80240B54 10400044 */ beqz $v0, .L80240C68 -/* DC4F28 80240B58 00000000 */ nop -.L80240B5C: -/* DC4F2C 80240B5C 2404F7FF */ addiu $a0, $zero, -0x801 -/* DC4F30 80240B60 AE600070 */ sw $zero, 0x70($s3) -/* DC4F34 80240B64 A640008E */ sh $zero, 0x8e($s2) -/* DC4F38 80240B68 8E2200CC */ lw $v0, 0xcc($s1) -/* DC4F3C 80240B6C 8E430000 */ lw $v1, ($s2) -/* DC4F40 80240B70 8C420000 */ lw $v0, ($v0) -/* DC4F44 80240B74 00641824 */ and $v1, $v1, $a0 -/* DC4F48 80240B78 AE430000 */ sw $v1, ($s2) -/* DC4F4C 80240B7C AE420028 */ sw $v0, 0x28($s2) -/* DC4F50 80240B80 8E2200D0 */ lw $v0, 0xd0($s1) -/* DC4F54 80240B84 8C420034 */ lw $v0, 0x34($v0) -/* DC4F58 80240B88 54400005 */ bnel $v0, $zero, .L80240BA0 -/* DC4F5C 80240B8C 2402FDFF */ addiu $v0, $zero, -0x201 -/* DC4F60 80240B90 34620200 */ ori $v0, $v1, 0x200 -/* DC4F64 80240B94 2403FFF7 */ addiu $v1, $zero, -9 -/* DC4F68 80240B98 080902EA */ j .L80240BA8 -/* DC4F6C 80240B9C 00431024 */ and $v0, $v0, $v1 -.L80240BA0: -/* DC4F70 80240BA0 00621024 */ and $v0, $v1, $v0 -/* DC4F74 80240BA4 34420008 */ ori $v0, $v0, 8 -.L80240BA8: -/* DC4F78 80240BA8 AE420000 */ sw $v0, ($s2) -/* DC4F7C 80240BAC 8E2200B0 */ lw $v0, 0xb0($s1) -/* DC4F80 80240BB0 30420004 */ andi $v0, $v0, 4 -/* DC4F84 80240BB4 10400004 */ beqz $v0, .L80240BC8 -/* DC4F88 80240BB8 24020063 */ addiu $v0, $zero, 0x63 -/* DC4F8C 80240BBC AE620070 */ sw $v0, 0x70($s3) -/* DC4F90 80240BC0 080902F8 */ j .L80240BE0 -/* DC4F94 80240BC4 AE600074 */ sw $zero, 0x74($s3) -.L80240BC8: -/* DC4F98 80240BC8 8E220000 */ lw $v0, ($s1) -/* DC4F9C 80240BCC 3C034000 */ lui $v1, 0x4000 -/* DC4FA0 80240BD0 00431024 */ and $v0, $v0, $v1 -/* DC4FA4 80240BD4 10400002 */ beqz $v0, .L80240BE0 -/* DC4FA8 80240BD8 2402000C */ addiu $v0, $zero, 0xc -/* DC4FAC 80240BDC AE620070 */ sw $v0, 0x70($s3) -.L80240BE0: -/* DC4FB0 80240BE0 3C06BFFF */ lui $a2, 0xbfff -/* DC4FB4 80240BE4 34C6FFFF */ ori $a2, $a2, 0xffff -/* DC4FB8 80240BE8 27A50038 */ addiu $a1, $sp, 0x38 -/* DC4FBC 80240BEC 2404FFFB */ addiu $a0, $zero, -5 -/* DC4FC0 80240BF0 8E2200B0 */ lw $v0, 0xb0($s1) -/* DC4FC4 80240BF4 8E230000 */ lw $v1, ($s1) -/* DC4FC8 80240BF8 3C0142C8 */ lui $at, 0x42c8 -/* DC4FCC 80240BFC 44810000 */ mtc1 $at, $f0 -/* DC4FD0 80240C00 00441024 */ and $v0, $v0, $a0 -/* DC4FD4 80240C04 00661824 */ and $v1, $v1, $a2 -/* DC4FD8 80240C08 AE2200B0 */ sw $v0, 0xb0($s1) -/* DC4FDC 80240C0C AE230000 */ sw $v1, ($s1) -/* DC4FE0 80240C10 864200A8 */ lh $v0, 0xa8($s2) -/* DC4FE4 80240C14 27A70040 */ addiu $a3, $sp, 0x40 -/* DC4FE8 80240C18 E7A00044 */ swc1 $f0, 0x44($sp) -/* DC4FEC 80240C1C C6460038 */ lwc1 $f6, 0x38($s2) -/* DC4FF0 80240C20 C640003C */ lwc1 $f0, 0x3c($s2) -/* DC4FF4 80240C24 C6420040 */ lwc1 $f2, 0x40($s2) -/* DC4FF8 80240C28 44822000 */ mtc1 $v0, $f4 -/* DC4FFC 80240C2C 00000000 */ nop -/* DC5000 80240C30 46802120 */ cvt.s.w $f4, $f4 -/* DC5004 80240C34 27A20044 */ addiu $v0, $sp, 0x44 -/* DC5008 80240C38 46040000 */ add.s $f0, $f0, $f4 -/* DC500C 80240C3C E7A60038 */ swc1 $f6, 0x38($sp) -/* DC5010 80240C40 E7A20040 */ swc1 $f2, 0x40($sp) -/* DC5014 80240C44 E7A0003C */ swc1 $f0, 0x3c($sp) -/* DC5018 80240C48 AFA20010 */ sw $v0, 0x10($sp) -/* DC501C 80240C4C 8E440080 */ lw $a0, 0x80($s2) -/* DC5020 80240C50 0C0372DF */ jal func_800DCB7C -/* DC5024 80240C54 27A6003C */ addiu $a2, $sp, 0x3c -/* DC5028 80240C58 10400003 */ beqz $v0, .L80240C68 -/* DC502C 80240C5C 00000000 */ nop -/* DC5030 80240C60 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DC5034 80240C64 E640003C */ swc1 $f0, 0x3c($s2) -.L80240C68: -/* DC5038 80240C68 8E630070 */ lw $v1, 0x70($s3) -/* DC503C 80240C6C 2C620064 */ sltiu $v0, $v1, 0x64 -/* DC5040 80240C70 10400050 */ beqz $v0, .L80240DB4 -/* DC5044 80240C74 00031080 */ sll $v0, $v1, 2 -/* DC5048 80240C78 3C018025 */ lui $at, 0x8025 -/* DC504C 80240C7C 00220821 */ addu $at, $at, $v0 -/* DC5050 80240C80 8C228770 */ lw $v0, -0x7890($at) -/* DC5054 80240C84 00400008 */ jr $v0 -/* DC5058 80240C88 00000000 */ nop -/* DC505C 80240C8C 0260202D */ daddu $a0, $s3, $zero -/* DC5060 80240C90 0280282D */ daddu $a1, $s4, $zero -/* DC5064 80240C94 0C012568 */ jal func_800495A0 -/* DC5068 80240C98 02A0302D */ daddu $a2, $s5, $zero -/* DC506C 80240C9C 0260202D */ daddu $a0, $s3, $zero -/* DC5070 80240CA0 0280282D */ daddu $a1, $s4, $zero -/* DC5074 80240CA4 0C0125AE */ jal func_800496B8 -/* DC5078 80240CA8 02A0302D */ daddu $a2, $s5, $zero -/* DC507C 80240CAC 0809036D */ j .L80240DB4 -/* DC5080 80240CB0 00000000 */ nop -/* DC5084 80240CB4 0260202D */ daddu $a0, $s3, $zero -/* DC5088 80240CB8 0280282D */ daddu $a1, $s4, $zero -/* DC508C 80240CBC 0C0126D1 */ jal func_80049B44 -/* DC5090 80240CC0 02A0302D */ daddu $a2, $s5, $zero -/* DC5094 80240CC4 0260202D */ daddu $a0, $s3, $zero -/* DC5098 80240CC8 0280282D */ daddu $a1, $s4, $zero -/* DC509C 80240CCC 0C012701 */ jal func_80049C04 -/* DC50A0 80240CD0 02A0302D */ daddu $a2, $s5, $zero -/* DC50A4 80240CD4 0809036D */ j .L80240DB4 -/* DC50A8 80240CD8 00000000 */ nop -/* DC50AC 80240CDC 0260202D */ daddu $a0, $s3, $zero -/* DC50B0 80240CE0 0280282D */ daddu $a1, $s4, $zero -/* DC50B4 80240CE4 0C01278F */ jal func_80049E3C -/* DC50B8 80240CE8 02A0302D */ daddu $a2, $s5, $zero -/* DC50BC 80240CEC 0260202D */ daddu $a0, $s3, $zero -/* DC50C0 80240CF0 0280282D */ daddu $a1, $s4, $zero -/* DC50C4 80240CF4 0C0127B3 */ jal func_80049ECC -/* DC50C8 80240CF8 02A0302D */ daddu $a2, $s5, $zero -/* DC50CC 80240CFC 0809036D */ j .L80240DB4 -/* DC50D0 80240D00 00000000 */ nop -/* DC50D4 80240D04 0260202D */ daddu $a0, $s3, $zero -/* DC50D8 80240D08 0280282D */ daddu $a1, $s4, $zero -/* DC50DC 80240D0C 0C0127DF */ jal func_80049F7C -/* DC50E0 80240D10 02A0302D */ daddu $a2, $s5, $zero -/* DC50E4 80240D14 0260202D */ daddu $a0, $s3, $zero -/* DC50E8 80240D18 0280282D */ daddu $a1, $s4, $zero -/* DC50EC 80240D1C 0C012849 */ jal func_8004A124 -/* DC50F0 80240D20 02A0302D */ daddu $a2, $s5, $zero -/* DC50F4 80240D24 8E630070 */ lw $v1, 0x70($s3) -/* DC50F8 80240D28 2402000E */ addiu $v0, $zero, 0xe -/* DC50FC 80240D2C 14620021 */ bne $v1, $v0, .L80240DB4 -/* DC5100 80240D30 00000000 */ nop -/* DC5104 80240D34 0260202D */ daddu $a0, $s3, $zero -/* DC5108 80240D38 0280282D */ daddu $a1, $s4, $zero -/* DC510C 80240D3C 0C09021C */ jal func_80240870 -/* DC5110 80240D40 02A0302D */ daddu $a2, $s5, $zero -/* DC5114 80240D44 8E630070 */ lw $v1, 0x70($s3) -/* DC5118 80240D48 2402000F */ addiu $v0, $zero, 0xf -/* DC511C 80240D4C 14620019 */ bne $v1, $v0, .L80240DB4 -/* DC5120 80240D50 00000000 */ nop -/* DC5124 80240D54 0260202D */ daddu $a0, $s3, $zero -/* DC5128 80240D58 0280282D */ daddu $a1, $s4, $zero -/* DC512C 80240D5C 0C090238 */ jal func_802408E0 -/* DC5130 80240D60 02A0302D */ daddu $a2, $s5, $zero -/* DC5134 80240D64 8E630070 */ lw $v1, 0x70($s3) -/* DC5138 80240D68 24020010 */ addiu $v0, $zero, 0x10 -/* DC513C 80240D6C 14620011 */ bne $v1, $v0, .L80240DB4 -/* DC5140 80240D70 00000000 */ nop -/* DC5144 80240D74 0260202D */ daddu $a0, $s3, $zero -/* DC5148 80240D78 0280282D */ daddu $a1, $s4, $zero -/* DC514C 80240D7C 0C09026C */ jal func_802409B0 -/* DC5150 80240D80 02A0302D */ daddu $a2, $s5, $zero -/* DC5154 80240D84 8E630070 */ lw $v1, 0x70($s3) -/* DC5158 80240D88 24020011 */ addiu $v0, $zero, 0x11 -/* DC515C 80240D8C 14620009 */ bne $v1, $v0, .L80240DB4 -/* DC5160 80240D90 00000000 */ nop -/* DC5164 80240D94 0260202D */ daddu $a0, $s3, $zero -/* DC5168 80240D98 0280282D */ daddu $a1, $s4, $zero -/* DC516C 80240D9C 0C090292 */ jal func_80240A48 -/* DC5170 80240DA0 02A0302D */ daddu $a2, $s5, $zero -/* DC5174 80240DA4 0809036D */ j .L80240DB4 -/* DC5178 80240DA8 00000000 */ nop -/* DC517C 80240DAC 0C0129CF */ jal func_8004A73C -/* DC5180 80240DB0 0260202D */ daddu $a0, $s3, $zero -.L80240DB4: -/* DC5184 80240DB4 8FBF0060 */ lw $ra, 0x60($sp) -/* DC5188 80240DB8 8FB5005C */ lw $s5, 0x5c($sp) -/* DC518C 80240DBC 8FB40058 */ lw $s4, 0x58($sp) -/* DC5190 80240DC0 8FB30054 */ lw $s3, 0x54($sp) -/* DC5194 80240DC4 8FB20050 */ lw $s2, 0x50($sp) -/* DC5198 80240DC8 8FB1004C */ lw $s1, 0x4c($sp) -/* DC519C 80240DCC 8FB00048 */ lw $s0, 0x48($sp) -/* DC51A0 80240DD0 0000102D */ daddu $v0, $zero, $zero -/* DC51A4 80240DD4 03E00008 */ jr $ra -/* DC51A8 80240DD8 27BD0068 */ addiu $sp, $sp, 0x68 -/* DC51AC 80240DDC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_80240054_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_80240054_DCCCD0.s deleted file mode 100644 index e5347ace0a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_80240054_DCCCD0.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054_DCCD24 -/* DCCD24 80240054 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DCCD28 80240058 AFBF0010 */ sw $ra, 0x10($sp) -/* DCCD2C 8024005C 0C090000 */ jal func_80240000 -/* DCCD30 80240060 00000000 */ nop -/* DCCD34 80240064 2C420001 */ sltiu $v0, $v0, 1 -/* DCCD38 80240068 8FBF0010 */ lw $ra, 0x10($sp) -/* DCCD3C 8024006C 00021040 */ sll $v0, $v0, 1 -/* DCCD40 80240070 03E00008 */ jr $ra -/* DCCD44 80240074 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_802402D0_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_802402D0_DCCCD0.s deleted file mode 100644 index cd66a49ac9..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_802402D0_DCCCD0.s +++ /dev/null @@ -1,169 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402D0_DCCFA0 -/* DCCFA0 802402D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DCCFA4 802402D4 AFB20028 */ sw $s2, 0x28($sp) -/* DCCFA8 802402D8 0080902D */ daddu $s2, $a0, $zero -/* DCCFAC 802402DC AFBF002C */ sw $ra, 0x2c($sp) -/* DCCFB0 802402E0 AFB10024 */ sw $s1, 0x24($sp) -/* DCCFB4 802402E4 AFB00020 */ sw $s0, 0x20($sp) -/* DCCFB8 802402E8 8E50000C */ lw $s0, 0xc($s2) -/* DCCFBC 802402EC 8E050000 */ lw $a1, ($s0) -/* DCCFC0 802402F0 0C0B1EAF */ jal get_variable -/* DCCFC4 802402F4 26100004 */ addiu $s0, $s0, 4 -/* DCCFC8 802402F8 8E050000 */ lw $a1, ($s0) -/* DCCFCC 802402FC 26100004 */ addiu $s0, $s0, 4 -/* DCCFD0 80240300 0240202D */ daddu $a0, $s2, $zero -/* DCCFD4 80240304 0C0B1EAF */ jal get_variable -/* DCCFD8 80240308 0040882D */ daddu $s1, $v0, $zero -/* DCCFDC 8024030C 0240202D */ daddu $a0, $s2, $zero -/* DCCFE0 80240310 8E050000 */ lw $a1, ($s0) -/* DCCFE4 80240314 0C0B1EAF */ jal get_variable -/* DCCFE8 80240318 0040802D */ daddu $s0, $v0, $zero -/* DCCFEC 8024031C 0040282D */ daddu $a1, $v0, $zero -/* DCCFF0 80240320 2402FFFF */ addiu $v0, $zero, -1 -/* DCCFF4 80240324 1222001A */ beq $s1, $v0, .L80240390 -/* DCCFF8 80240328 3C04B60B */ lui $a0, 0xb60b -/* DCCFFC 8024032C 348460B7 */ ori $a0, $a0, 0x60b7 -/* DCD000 80240330 02240018 */ mult $s1, $a0 -/* DCD004 80240334 001117C3 */ sra $v0, $s1, 0x1f -/* DCD008 80240338 00005810 */ mfhi $t3 -/* DCD00C 8024033C 01711821 */ addu $v1, $t3, $s1 -/* DCD010 80240340 00031A03 */ sra $v1, $v1, 8 -/* DCD014 80240344 00621823 */ subu $v1, $v1, $v0 -/* DCD018 80240348 00031040 */ sll $v0, $v1, 1 -/* DCD01C 8024034C 00431021 */ addu $v0, $v0, $v1 -/* DCD020 80240350 00021900 */ sll $v1, $v0, 4 -/* DCD024 80240354 00621823 */ subu $v1, $v1, $v0 -/* DCD028 80240358 000318C0 */ sll $v1, $v1, 3 -/* DCD02C 8024035C 02231823 */ subu $v1, $s1, $v1 -/* DCD030 80240360 00640018 */ mult $v1, $a0 -/* DCD034 80240364 00005810 */ mfhi $t3 -/* DCD038 80240368 01631021 */ addu $v0, $t3, $v1 -/* DCD03C 8024036C 00021143 */ sra $v0, $v0, 5 -/* DCD040 80240370 00031FC3 */ sra $v1, $v1, 0x1f -/* DCD044 80240374 00431023 */ subu $v0, $v0, $v1 -/* DCD048 80240378 00021080 */ sll $v0, $v0, 2 -/* DCD04C 8024037C 3C018024 */ lui $at, 0x8024 -/* DCD050 80240380 00220821 */ addu $at, $at, $v0 -/* DCD054 80240384 8C2251AC */ lw $v0, 0x51ac($at) -/* DCD058 80240388 080900E5 */ j .L80240394 -/* DCD05C 8024038C AFA20010 */ sw $v0, 0x10($sp) -.L80240390: -/* DCD060 80240390 AFA00010 */ sw $zero, 0x10($sp) -.L80240394: -/* DCD064 80240394 2402FFFF */ addiu $v0, $zero, -1 -/* DCD068 80240398 1202001B */ beq $s0, $v0, .L80240408 -/* DCD06C 8024039C 3C04B60B */ lui $a0, 0xb60b -/* DCD070 802403A0 348460B7 */ ori $a0, $a0, 0x60b7 -/* DCD074 802403A4 02040018 */ mult $s0, $a0 -/* DCD078 802403A8 001017C3 */ sra $v0, $s0, 0x1f -/* DCD07C 802403AC 00005810 */ mfhi $t3 -/* DCD080 802403B0 01701821 */ addu $v1, $t3, $s0 -/* DCD084 802403B4 00031A03 */ sra $v1, $v1, 8 -/* DCD088 802403B8 00621823 */ subu $v1, $v1, $v0 -/* DCD08C 802403BC 00031040 */ sll $v0, $v1, 1 -/* DCD090 802403C0 00431021 */ addu $v0, $v0, $v1 -/* DCD094 802403C4 00021900 */ sll $v1, $v0, 4 -/* DCD098 802403C8 00621823 */ subu $v1, $v1, $v0 -/* DCD09C 802403CC 000318C0 */ sll $v1, $v1, 3 -/* DCD0A0 802403D0 02031823 */ subu $v1, $s0, $v1 -/* DCD0A4 802403D4 00640018 */ mult $v1, $a0 -/* DCD0A8 802403D8 00005810 */ mfhi $t3 -/* DCD0AC 802403DC 01631021 */ addu $v0, $t3, $v1 -/* DCD0B0 802403E0 00021143 */ sra $v0, $v0, 5 -/* DCD0B4 802403E4 00031FC3 */ sra $v1, $v1, 0x1f -/* DCD0B8 802403E8 00431023 */ subu $v0, $v0, $v1 -/* DCD0BC 802403EC 24420008 */ addiu $v0, $v0, 8 -/* DCD0C0 802403F0 00021080 */ sll $v0, $v0, 2 -/* DCD0C4 802403F4 3C018024 */ lui $at, 0x8024 -/* DCD0C8 802403F8 00220821 */ addu $at, $at, $v0 -/* DCD0CC 802403FC 8C2251AC */ lw $v0, 0x51ac($at) -/* DCD0D0 80240400 08090103 */ j .L8024040C -/* DCD0D4 80240404 AFA20014 */ sw $v0, 0x14($sp) -.L80240408: -/* DCD0D8 80240408 AFA00014 */ sw $zero, 0x14($sp) -.L8024040C: -/* DCD0DC 8024040C 2402FFFF */ addiu $v0, $zero, -1 -/* DCD0E0 80240410 10A2001B */ beq $a1, $v0, .L80240480 -/* DCD0E4 80240414 3C04B60B */ lui $a0, 0xb60b -/* DCD0E8 80240418 348460B7 */ ori $a0, $a0, 0x60b7 -/* DCD0EC 8024041C 00A40018 */ mult $a1, $a0 -/* DCD0F0 80240420 000517C3 */ sra $v0, $a1, 0x1f -/* DCD0F4 80240424 00005810 */ mfhi $t3 -/* DCD0F8 80240428 01651821 */ addu $v1, $t3, $a1 -/* DCD0FC 8024042C 00031A03 */ sra $v1, $v1, 8 -/* DCD100 80240430 00621823 */ subu $v1, $v1, $v0 -/* DCD104 80240434 00031040 */ sll $v0, $v1, 1 -/* DCD108 80240438 00431021 */ addu $v0, $v0, $v1 -/* DCD10C 8024043C 00021900 */ sll $v1, $v0, 4 -/* DCD110 80240440 00621823 */ subu $v1, $v1, $v0 -/* DCD114 80240444 000318C0 */ sll $v1, $v1, 3 -/* DCD118 80240448 00A31823 */ subu $v1, $a1, $v1 -/* DCD11C 8024044C 00640018 */ mult $v1, $a0 -/* DCD120 80240450 00005810 */ mfhi $t3 -/* DCD124 80240454 01631021 */ addu $v0, $t3, $v1 -/* DCD128 80240458 00021143 */ sra $v0, $v0, 5 -/* DCD12C 8024045C 00031FC3 */ sra $v1, $v1, 0x1f -/* DCD130 80240460 00431023 */ subu $v0, $v0, $v1 -/* DCD134 80240464 24420010 */ addiu $v0, $v0, 0x10 -/* DCD138 80240468 00021080 */ sll $v0, $v0, 2 -/* DCD13C 8024046C 3C018024 */ lui $at, 0x8024 -/* DCD140 80240470 00220821 */ addu $at, $at, $v0 -/* DCD144 80240474 8C2251AC */ lw $v0, 0x51ac($at) -/* DCD148 80240478 08090121 */ j .L80240484 -/* DCD14C 8024047C AFA20018 */ sw $v0, 0x18($sp) -.L80240480: -/* DCD150 80240480 AFA00018 */ sw $zero, 0x18($sp) -.L80240484: -/* DCD154 80240484 0000482D */ daddu $t1, $zero, $zero -/* DCD158 80240488 27A80010 */ addiu $t0, $sp, 0x10 -/* DCD15C 8024048C 0100502D */ daddu $t2, $t0, $zero -.L80240490: -/* DCD160 80240490 24060001 */ addiu $a2, $zero, 1 -/* DCD164 80240494 0100382D */ daddu $a3, $t0, $zero -/* DCD168 80240498 25450004 */ addiu $a1, $t2, 4 -.L8024049C: -/* DCD16C 8024049C 8CE40000 */ lw $a0, ($a3) -/* DCD170 802404A0 8CA30000 */ lw $v1, ($a1) -/* DCD174 802404A4 0064102A */ slt $v0, $v1, $a0 -/* DCD178 802404A8 10400003 */ beqz $v0, .L802404B8 -/* DCD17C 802404AC 24C60001 */ addiu $a2, $a2, 1 -/* DCD180 802404B0 ACE30000 */ sw $v1, ($a3) -/* DCD184 802404B4 ACA40000 */ sw $a0, ($a1) -.L802404B8: -/* DCD188 802404B8 28C20003 */ slti $v0, $a2, 3 -/* DCD18C 802404BC 1440FFF7 */ bnez $v0, .L8024049C -/* DCD190 802404C0 24A50004 */ addiu $a1, $a1, 4 -/* DCD194 802404C4 25290001 */ addiu $t1, $t1, 1 -/* DCD198 802404C8 29220002 */ slti $v0, $t1, 2 -/* DCD19C 802404CC 1440FFF0 */ bnez $v0, .L80240490 -/* DCD1A0 802404D0 25080004 */ addiu $t0, $t0, 4 -/* DCD1A4 802404D4 8FA30014 */ lw $v1, 0x14($sp) -/* DCD1A8 802404D8 8FA20010 */ lw $v0, 0x10($sp) -/* DCD1AC 802404DC 14620007 */ bne $v1, $v0, .L802404FC -/* DCD1B0 802404E0 00000000 */ nop -/* DCD1B4 802404E4 8FA20018 */ lw $v0, 0x18($sp) -/* DCD1B8 802404E8 14620008 */ bne $v1, $v0, .L8024050C -/* DCD1BC 802404EC 24020002 */ addiu $v0, $zero, 2 -/* DCD1C0 802404F0 24020003 */ addiu $v0, $zero, 3 -/* DCD1C4 802404F4 08090144 */ j .L80240510 -/* DCD1C8 802404F8 AE4200AC */ sw $v0, 0xac($s2) -.L802404FC: -/* DCD1CC 802404FC 8FA20018 */ lw $v0, 0x18($sp) -/* DCD1D0 80240500 54620003 */ bnel $v1, $v0, .L80240510 -/* DCD1D4 80240504 AE4000AC */ sw $zero, 0xac($s2) -/* DCD1D8 80240508 24020002 */ addiu $v0, $zero, 2 -.L8024050C: -/* DCD1DC 8024050C AE4200AC */ sw $v0, 0xac($s2) -.L80240510: -/* DCD1E0 80240510 8FA30014 */ lw $v1, 0x14($sp) -/* DCD1E4 80240514 AE4300B0 */ sw $v1, 0xb0($s2) -/* DCD1E8 80240518 8FBF002C */ lw $ra, 0x2c($sp) -/* DCD1EC 8024051C 8FB20028 */ lw $s2, 0x28($sp) -/* DCD1F0 80240520 8FB10024 */ lw $s1, 0x24($sp) -/* DCD1F4 80240524 8FB00020 */ lw $s0, 0x20($sp) -/* DCD1F8 80240528 24020002 */ addiu $v0, $zero, 2 -/* DCD1FC 8024052C 03E00008 */ jr $ra -/* DCD200 80240530 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_80240534_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_80240534_DCCCD0.s deleted file mode 100644 index 6decb04292..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_80240534_DCCCD0.s +++ /dev/null @@ -1,114 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240534_DCD204 -/* DCD204 80240534 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DCD208 80240538 AFB40040 */ sw $s4, 0x40($sp) -/* DCD20C 8024053C AFBF0044 */ sw $ra, 0x44($sp) -/* DCD210 80240540 AFB3003C */ sw $s3, 0x3c($sp) -/* DCD214 80240544 AFB20038 */ sw $s2, 0x38($sp) -/* DCD218 80240548 AFB10034 */ sw $s1, 0x34($sp) -/* DCD21C 8024054C AFB00030 */ sw $s0, 0x30($sp) -/* DCD220 80240550 F7B40048 */ sdc1 $f20, 0x48($sp) -/* DCD224 80240554 10A0001B */ beqz $a1, .L802405C4 -/* DCD228 80240558 0080A02D */ daddu $s4, $a0, $zero -/* DCD22C 8024055C 0C00AB39 */ jal heap_malloc -/* DCD230 80240560 24040010 */ addiu $a0, $zero, 0x10 -/* DCD234 80240564 0000902D */ daddu $s2, $zero, $zero -/* DCD238 80240568 0040802D */ daddu $s0, $v0, $zero -/* DCD23C 8024056C 3C0142C8 */ lui $at, 0x42c8 -/* DCD240 80240570 4481A000 */ mtc1 $at, $f20 -/* DCD244 80240574 3C118024 */ lui $s1, 0x8024 -/* DCD248 80240578 2631636C */ addiu $s1, $s1, 0x636c -/* DCD24C 8024057C AE900070 */ sw $s0, 0x70($s4) -.L80240580: -/* DCD250 80240580 8E240000 */ lw $a0, ($s1) -/* DCD254 80240584 0C046C04 */ jal get_model_list_index_from_tree_index -/* DCD258 80240588 26310004 */ addiu $s1, $s1, 4 -/* DCD25C 8024058C 0C046B4C */ jal get_model_from_list_index -/* DCD260 80240590 0040202D */ daddu $a0, $v0, $zero -/* DCD264 80240594 C440009C */ lwc1 $f0, 0x9c($v0) -/* DCD268 80240598 26520001 */ addiu $s2, $s2, 1 -/* DCD26C 8024059C 46140001 */ sub.s $f0, $f0, $f20 -/* DCD270 802405A0 8C450098 */ lw $a1, 0x98($v0) -/* DCD274 802405A4 8C4700A0 */ lw $a3, 0xa0($v0) -/* DCD278 802405A8 44060000 */ mfc1 $a2, $f0 -/* DCD27C 802405AC 0C044898 */ jal create_shadow_type -/* DCD280 802405B0 24040001 */ addiu $a0, $zero, 1 -/* DCD284 802405B4 AE020000 */ sw $v0, ($s0) -/* DCD288 802405B8 2E420004 */ sltiu $v0, $s2, 4 -/* DCD28C 802405BC 1440FFF0 */ bnez $v0, .L80240580 -/* DCD290 802405C0 26100004 */ addiu $s0, $s0, 4 -.L802405C4: -/* DCD294 802405C4 0000902D */ daddu $s2, $zero, $zero -/* DCD298 802405C8 3C138024 */ lui $s3, 0x8024 -/* DCD29C 802405CC 2673636C */ addiu $s3, $s3, 0x636c -/* DCD2A0 802405D0 3C013FA6 */ lui $at, 0x3fa6 -/* DCD2A4 802405D4 34216666 */ ori $at, $at, 0x6666 -/* DCD2A8 802405D8 4481A000 */ mtc1 $at, $f20 -/* DCD2AC 802405DC 8E910070 */ lw $s1, 0x70($s4) -.L802405E0: -/* DCD2B0 802405E0 8E240000 */ lw $a0, ($s1) -/* DCD2B4 802405E4 26310004 */ addiu $s1, $s1, 4 -/* DCD2B8 802405E8 0C044181 */ jal get_shadow_by_index -/* DCD2BC 802405EC 26520001 */ addiu $s2, $s2, 1 -/* DCD2C0 802405F0 8E640000 */ lw $a0, ($s3) -/* DCD2C4 802405F4 0C046C04 */ jal get_model_list_index_from_tree_index -/* DCD2C8 802405F8 0040802D */ daddu $s0, $v0, $zero -/* DCD2CC 802405FC 0C046B4C */ jal get_model_from_list_index -/* DCD2D0 80240600 0040202D */ daddu $a0, $v0, $zero -/* DCD2D4 80240604 27A40018 */ addiu $a0, $sp, 0x18 -/* DCD2D8 80240608 27A5001C */ addiu $a1, $sp, 0x1c -/* DCD2DC 8024060C 27A60020 */ addiu $a2, $sp, 0x20 -/* DCD2E0 80240610 27A70024 */ addiu $a3, $sp, 0x24 -/* DCD2E4 80240614 C4400098 */ lwc1 $f0, 0x98($v0) -/* DCD2E8 80240618 C442009C */ lwc1 $f2, 0x9c($v0) -/* DCD2EC 8024061C C44400A0 */ lwc1 $f4, 0xa0($v0) -/* DCD2F0 80240620 3C01447A */ lui $at, 0x447a -/* DCD2F4 80240624 44813000 */ mtc1 $at, $f6 -/* DCD2F8 80240628 27A20028 */ addiu $v0, $sp, 0x28 -/* DCD2FC 8024062C E7A00018 */ swc1 $f0, 0x18($sp) -/* DCD300 80240630 E7A2001C */ swc1 $f2, 0x1c($sp) -/* DCD304 80240634 E7A40020 */ swc1 $f4, 0x20($sp) -/* DCD308 80240638 E7A6002C */ swc1 $f6, 0x2c($sp) -/* DCD30C 8024063C AFA20010 */ sw $v0, 0x10($sp) -/* DCD310 80240640 27A2002C */ addiu $v0, $sp, 0x2c -/* DCD314 80240644 0C04497A */ jal func_801125E8 -/* DCD318 80240648 AFA20014 */ sw $v0, 0x14($sp) -/* DCD31C 8024064C 8FA5002C */ lw $a1, 0x2c($sp) -/* DCD320 80240650 0C044A17 */ jal set_standard_shadow_scale -/* DCD324 80240654 0200202D */ daddu $a0, $s0, $zero -/* DCD328 80240658 26730004 */ addiu $s3, $s3, 4 -/* DCD32C 8024065C C7A00018 */ lwc1 $f0, 0x18($sp) -/* DCD330 80240660 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* DCD334 80240664 C604001C */ lwc1 $f4, 0x1c($s0) -/* DCD338 80240668 2E420004 */ sltiu $v0, $s2, 4 -/* DCD33C 8024066C AE00002C */ sw $zero, 0x2c($s0) -/* DCD340 80240670 46142102 */ mul.s $f4, $f4, $f20 -/* DCD344 80240674 00000000 */ nop -/* DCD348 80240678 E6000010 */ swc1 $f0, 0x10($s0) -/* DCD34C 8024067C E6020014 */ swc1 $f2, 0x14($s0) -/* DCD350 80240680 C7A60020 */ lwc1 $f6, 0x20($sp) -/* DCD354 80240684 C7A80024 */ lwc1 $f8, 0x24($sp) -/* DCD358 80240688 C6000024 */ lwc1 $f0, 0x24($s0) -/* DCD35C 8024068C C7A20028 */ lwc1 $f2, 0x28($sp) -/* DCD360 80240690 46140002 */ mul.s $f0, $f0, $f20 -/* DCD364 80240694 00000000 */ nop -/* DCD368 80240698 E6060018 */ swc1 $f6, 0x18($s0) -/* DCD36C 8024069C E6080028 */ swc1 $f8, 0x28($s0) -/* DCD370 802406A0 E6020030 */ swc1 $f2, 0x30($s0) -/* DCD374 802406A4 E604001C */ swc1 $f4, 0x1c($s0) -/* DCD378 802406A8 1440FFCD */ bnez $v0, .L802405E0 -/* DCD37C 802406AC E6000024 */ swc1 $f0, 0x24($s0) -/* DCD380 802406B0 8FBF0044 */ lw $ra, 0x44($sp) -/* DCD384 802406B4 8FB40040 */ lw $s4, 0x40($sp) -/* DCD388 802406B8 8FB3003C */ lw $s3, 0x3c($sp) -/* DCD38C 802406BC 8FB20038 */ lw $s2, 0x38($sp) -/* DCD390 802406C0 8FB10034 */ lw $s1, 0x34($sp) -/* DCD394 802406C4 8FB00030 */ lw $s0, 0x30($sp) -/* DCD398 802406C8 D7B40048 */ ldc1 $f20, 0x48($sp) -/* DCD39C 802406CC 0000102D */ daddu $v0, $zero, $zero -/* DCD3A0 802406D0 03E00008 */ jr $ra -/* DCD3A4 802406D4 27BD0050 */ addiu $sp, $sp, 0x50 -/* DCD3A8 802406D8 00000000 */ nop -/* DCD3AC 802406DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_802406E0_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_802406E0_DCCCD0.s deleted file mode 100644 index 18bd2e0e53..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_802406E0_DCCCD0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406E0_DCD3B0 -/* DCD3B0 802406E0 3C018011 */ lui $at, 0x8011 -/* DCD3B4 802406E4 C422EFF0 */ lwc1 $f2, -0x1010($at) -/* DCD3B8 802406E8 3C014454 */ lui $at, 0x4454 -/* DCD3BC 802406EC 34218000 */ ori $at, $at, 0x8000 -/* DCD3C0 802406F0 44810000 */ mtc1 $at, $f0 -/* DCD3C4 802406F4 00000000 */ nop -/* DCD3C8 802406F8 4600103C */ c.lt.s $f2, $f0 -/* DCD3CC 802406FC 00000000 */ nop -/* DCD3D0 80240700 45010002 */ bc1t .L8024070C -/* DCD3D4 80240704 0000102D */ daddu $v0, $zero, $zero -/* DCD3D8 80240708 24020002 */ addiu $v0, $zero, 2 -.L8024070C: -/* DCD3DC 8024070C 03E00008 */ jr $ra -/* DCD3E0 80240710 00000000 */ nop -/* DCD3E4 80240714 00000000 */ nop -/* DCD3E8 80240718 00000000 */ nop -/* DCD3EC 8024071C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_80240720_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_80240720_DCCCD0.s deleted file mode 100644 index f069f0c45a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_80240720_DCCCD0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240720_DCD3F0 -/* DCD3F0 80240720 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCD3F4 80240724 AFB00010 */ sw $s0, 0x10($sp) -/* DCD3F8 80240728 3C108024 */ lui $s0, 0x8024 -/* DCD3FC 8024072C 26107010 */ addiu $s0, $s0, 0x7010 -/* DCD400 80240730 AFBF0018 */ sw $ra, 0x18($sp) -/* DCD404 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* DCD408 80240738 8E020000 */ lw $v0, ($s0) -/* DCD40C 8024073C 14400010 */ bnez $v0, .L80240780 -/* DCD410 80240740 0080882D */ daddu $s1, $a0, $zero -/* DCD414 80240744 0C00AB39 */ jal heap_malloc -/* DCD418 80240748 24040040 */ addiu $a0, $zero, 0x40 -/* DCD41C 8024074C AE020000 */ sw $v0, ($s0) -/* DCD420 80240750 0000182D */ daddu $v1, $zero, $zero -/* DCD424 80240754 0040282D */ daddu $a1, $v0, $zero -/* DCD428 80240758 0220202D */ daddu $a0, $s1, $zero -.L8024075C: -/* DCD42C 8024075C 8C820084 */ lw $v0, 0x84($a0) -/* DCD430 80240760 24840004 */ addiu $a0, $a0, 4 -/* DCD434 80240764 24630001 */ addiu $v1, $v1, 1 -/* DCD438 80240768 ACA20000 */ sw $v0, ($a1) -/* DCD43C 8024076C 28620010 */ slti $v0, $v1, 0x10 -/* DCD440 80240770 1440FFFA */ bnez $v0, .L8024075C -/* DCD444 80240774 24A50004 */ addiu $a1, $a1, 4 -/* DCD448 80240778 080901EF */ j .L802407BC -/* DCD44C 8024077C 00000000 */ nop -.L80240780: -/* DCD450 80240780 0000182D */ daddu $v1, $zero, $zero -/* DCD454 80240784 0040282D */ daddu $a1, $v0, $zero -/* DCD458 80240788 0220202D */ daddu $a0, $s1, $zero -.L8024078C: -/* DCD45C 8024078C 8CA20000 */ lw $v0, ($a1) -/* DCD460 80240790 24A50004 */ addiu $a1, $a1, 4 -/* DCD464 80240794 24630001 */ addiu $v1, $v1, 1 -/* DCD468 80240798 AC820084 */ sw $v0, 0x84($a0) -/* DCD46C 8024079C 28620010 */ slti $v0, $v1, 0x10 -/* DCD470 802407A0 1440FFFA */ bnez $v0, .L8024078C -/* DCD474 802407A4 24840004 */ addiu $a0, $a0, 4 -/* DCD478 802407A8 3C108024 */ lui $s0, 0x8024 -/* DCD47C 802407AC 26107010 */ addiu $s0, $s0, 0x7010 -/* DCD480 802407B0 0C00AB4B */ jal heap_free -/* DCD484 802407B4 8E040000 */ lw $a0, ($s0) -/* DCD488 802407B8 AE000000 */ sw $zero, ($s0) -.L802407BC: -/* DCD48C 802407BC 8FBF0018 */ lw $ra, 0x18($sp) -/* DCD490 802407C0 8FB10014 */ lw $s1, 0x14($sp) -/* DCD494 802407C4 8FB00010 */ lw $s0, 0x10($sp) -/* DCD498 802407C8 24020002 */ addiu $v0, $zero, 2 -/* DCD49C 802407CC 03E00008 */ jr $ra -/* DCD4A0 802407D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_802407D4_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_802407D4_DCCCD0.s deleted file mode 100644 index d38dcf2fd1..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_802407D4_DCCCD0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D4_DCD4A4 -/* DCD4A4 802407D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCD4A8 802407D8 AFB00010 */ sw $s0, 0x10($sp) -/* DCD4AC 802407DC 0080802D */ daddu $s0, $a0, $zero -/* DCD4B0 802407E0 AFBF0018 */ sw $ra, 0x18($sp) -/* DCD4B4 802407E4 AFB10014 */ sw $s1, 0x14($sp) -/* DCD4B8 802407E8 8E02000C */ lw $v0, 0xc($s0) -/* DCD4BC 802407EC 8C510000 */ lw $s1, ($v0) -/* DCD4C0 802407F0 0C0B1EAF */ jal get_variable -/* DCD4C4 802407F4 0220282D */ daddu $a1, $s1, $zero -/* DCD4C8 802407F8 3C03FFF0 */ lui $v1, 0xfff0 -/* DCD4CC 802407FC 3463FFFF */ ori $v1, $v1, 0xffff -/* DCD4D0 80240800 0200202D */ daddu $a0, $s0, $zero -/* DCD4D4 80240804 00431024 */ and $v0, $v0, $v1 -/* DCD4D8 80240808 00021140 */ sll $v0, $v0, 5 -/* DCD4DC 8024080C 3C068008 */ lui $a2, %hi(gItemTable) -/* DCD4E0 80240810 00C23021 */ addu $a2, $a2, $v0 -/* DCD4E4 80240814 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* DCD4E8 80240818 0C0B2026 */ jal set_variable -/* DCD4EC 8024081C 0220282D */ daddu $a1, $s1, $zero -/* DCD4F0 80240820 8FBF0018 */ lw $ra, 0x18($sp) -/* DCD4F4 80240824 8FB10014 */ lw $s1, 0x14($sp) -/* DCD4F8 80240828 8FB00010 */ lw $s0, 0x10($sp) -/* DCD4FC 8024082C 24020002 */ addiu $v0, $zero, 2 -/* DCD500 80240830 03E00008 */ jr $ra -/* DCD504 80240834 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_80240988_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_80240988_DCCCD0.s deleted file mode 100644 index e9c4ce0398..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_80240988_DCCCD0.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240988_DCD658 -/* DCD658 80240988 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DCD65C 8024098C AFB00010 */ sw $s0, 0x10($sp) -/* DCD660 80240990 0080802D */ daddu $s0, $a0, $zero -/* DCD664 80240994 AFBF0014 */ sw $ra, 0x14($sp) -/* DCD668 80240998 8E02000C */ lw $v0, 0xc($s0) -/* DCD66C 8024099C 0C0B1EAF */ jal get_variable -/* DCD670 802409A0 8C450000 */ lw $a1, ($v0) -/* DCD674 802409A4 00021140 */ sll $v0, $v0, 5 -/* DCD678 802409A8 AE000084 */ sw $zero, 0x84($s0) -/* DCD67C 802409AC 3C018008 */ lui $at, 0x8008 -/* DCD680 802409B0 00220821 */ addu $at, $at, $v0 -/* DCD684 802409B4 942278F8 */ lhu $v0, 0x78f8($at) -/* DCD688 802409B8 30420040 */ andi $v0, $v0, 0x40 -/* DCD68C 802409BC 10400002 */ beqz $v0, .L802409C8 -/* DCD690 802409C0 24020001 */ addiu $v0, $zero, 1 -/* DCD694 802409C4 AE020084 */ sw $v0, 0x84($s0) -.L802409C8: -/* DCD698 802409C8 8FBF0014 */ lw $ra, 0x14($sp) -/* DCD69C 802409CC 8FB00010 */ lw $s0, 0x10($sp) -/* DCD6A0 802409D0 24020002 */ addiu $v0, $zero, 2 -/* DCD6A4 802409D4 03E00008 */ jr $ra -/* DCD6A8 802409D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* DCD6AC 802409DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_802409E0_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_802409E0_DCCCD0.s deleted file mode 100644 index ae6db069fe..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_802409E0_DCCCD0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409E0_DCD6B0 -/* DCD6B0 802409E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCD6B4 802409E4 AFB10014 */ sw $s1, 0x14($sp) -/* DCD6B8 802409E8 0080882D */ daddu $s1, $a0, $zero -/* DCD6BC 802409EC AFBF0018 */ sw $ra, 0x18($sp) -/* DCD6C0 802409F0 AFB00010 */ sw $s0, 0x10($sp) -/* DCD6C4 802409F4 8E300148 */ lw $s0, 0x148($s1) -/* DCD6C8 802409F8 0C00EABB */ jal get_npc_unsafe -/* DCD6CC 802409FC 86040008 */ lh $a0, 8($s0) -/* DCD6D0 80240A00 C4400018 */ lwc1 $f0, 0x18($v0) -/* DCD6D4 80240A04 3C018025 */ lui $at, 0x8025 -/* DCD6D8 80240A08 D422A630 */ ldc1 $f2, -0x59d0($at) -/* DCD6DC 80240A0C 46000021 */ cvt.d.s $f0, $f0 -/* DCD6E0 80240A10 46220002 */ mul.d $f0, $f0, $f2 -/* DCD6E4 80240A14 00000000 */ nop -/* DCD6E8 80240A18 46200020 */ cvt.s.d $f0, $f0 -/* DCD6EC 80240A1C E4400018 */ swc1 $f0, 0x18($v0) -/* DCD6F0 80240A20 8E0300CC */ lw $v1, 0xcc($s0) -/* DCD6F4 80240A24 8C640030 */ lw $a0, 0x30($v1) -/* DCD6F8 80240A28 24030005 */ addiu $v1, $zero, 5 -/* DCD6FC 80240A2C A443008E */ sh $v1, 0x8e($v0) -/* DCD700 80240A30 AC440028 */ sw $a0, 0x28($v0) -/* DCD704 80240A34 2402000F */ addiu $v0, $zero, 0xf -/* DCD708 80240A38 AE220070 */ sw $v0, 0x70($s1) -/* DCD70C 80240A3C 8FBF0018 */ lw $ra, 0x18($sp) -/* DCD710 80240A40 8FB10014 */ lw $s1, 0x14($sp) -/* DCD714 80240A44 8FB00010 */ lw $s0, 0x10($sp) -/* DCD718 80240A48 03E00008 */ jr $ra -/* DCD71C 80240A4C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_80240A50_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_80240A50_DCCCD0.s deleted file mode 100644 index 04ee6a33c0..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_80240A50_DCCCD0.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A50_DCD720 -/* DCD720 80240A50 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DCD724 80240A54 AFB20028 */ sw $s2, 0x28($sp) -/* DCD728 80240A58 0080902D */ daddu $s2, $a0, $zero -/* DCD72C 80240A5C AFBF002C */ sw $ra, 0x2c($sp) -/* DCD730 80240A60 AFB10024 */ sw $s1, 0x24($sp) -/* DCD734 80240A64 AFB00020 */ sw $s0, 0x20($sp) -/* DCD738 80240A68 8E510148 */ lw $s1, 0x148($s2) -/* DCD73C 80240A6C 0C00EABB */ jal get_npc_unsafe -/* DCD740 80240A70 86240008 */ lh $a0, 8($s1) -/* DCD744 80240A74 0040802D */ daddu $s0, $v0, $zero -/* DCD748 80240A78 0200202D */ daddu $a0, $s0, $zero -/* DCD74C 80240A7C C600000C */ lwc1 $f0, 0xc($s0) -/* DCD750 80240A80 27A60018 */ addiu $a2, $sp, 0x18 -/* DCD754 80240A84 E7A00018 */ swc1 $f0, 0x18($sp) -/* DCD758 80240A88 AFA00010 */ sw $zero, 0x10($sp) -/* DCD75C 80240A8C AFA00014 */ sw $zero, 0x14($sp) -/* DCD760 80240A90 8E050018 */ lw $a1, 0x18($s0) -/* DCD764 80240A94 0C0129E1 */ jal func_8004A784 -/* DCD768 80240A98 0000382D */ daddu $a3, $zero, $zero -/* DCD76C 80240A9C 14400005 */ bnez $v0, .L80240AB4 -/* DCD770 80240AA0 00000000 */ nop -/* DCD774 80240AA4 8E050018 */ lw $a1, 0x18($s0) -/* DCD778 80240AA8 8E06000C */ lw $a2, 0xc($s0) -/* DCD77C 80240AAC 0C00EA95 */ jal npc_move_heading -/* DCD780 80240AB0 0200202D */ daddu $a0, $s0, $zero -.L80240AB4: -/* DCD784 80240AB4 9602008E */ lhu $v0, 0x8e($s0) -/* DCD788 80240AB8 2442FFFF */ addiu $v0, $v0, -1 -/* DCD78C 80240ABC A602008E */ sh $v0, 0x8e($s0) -/* DCD790 80240AC0 00021400 */ sll $v0, $v0, 0x10 -/* DCD794 80240AC4 14400010 */ bnez $v0, .L80240B08 -/* DCD798 80240AC8 00000000 */ nop -/* DCD79C 80240ACC C6000018 */ lwc1 $f0, 0x18($s0) -/* DCD7A0 80240AD0 3C018025 */ lui $at, 0x8025 -/* DCD7A4 80240AD4 D422A638 */ ldc1 $f2, -0x59c8($at) -/* DCD7A8 80240AD8 46000021 */ cvt.d.s $f0, $f0 -/* DCD7AC 80240ADC 46220002 */ mul.d $f0, $f0, $f2 -/* DCD7B0 80240AE0 00000000 */ nop -/* DCD7B4 80240AE4 46200020 */ cvt.s.d $f0, $f0 -/* DCD7B8 80240AE8 E6000018 */ swc1 $f0, 0x18($s0) -/* DCD7BC 80240AEC 8E2200CC */ lw $v0, 0xcc($s1) -/* DCD7C0 80240AF0 8C43002C */ lw $v1, 0x2c($v0) -/* DCD7C4 80240AF4 2402000A */ addiu $v0, $zero, 0xa -/* DCD7C8 80240AF8 A602008E */ sh $v0, 0x8e($s0) -/* DCD7CC 80240AFC 24020010 */ addiu $v0, $zero, 0x10 -/* DCD7D0 80240B00 AE030028 */ sw $v1, 0x28($s0) -/* DCD7D4 80240B04 AE420070 */ sw $v0, 0x70($s2) -.L80240B08: -/* DCD7D8 80240B08 8FBF002C */ lw $ra, 0x2c($sp) -/* DCD7DC 80240B0C 8FB20028 */ lw $s2, 0x28($sp) -/* DCD7E0 80240B10 8FB10024 */ lw $s1, 0x24($sp) -/* DCD7E4 80240B14 8FB00020 */ lw $s0, 0x20($sp) -/* DCD7E8 80240B18 03E00008 */ jr $ra -/* DCD7EC 80240B1C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_80240B20_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_80240B20_DCCCD0.s deleted file mode 100644 index 89beaa3e66..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_80240B20_DCCCD0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B20_DCD7F0 -/* DCD7F0 80240B20 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DCD7F4 80240B24 AFB10024 */ sw $s1, 0x24($sp) -/* DCD7F8 80240B28 0080882D */ daddu $s1, $a0, $zero -/* DCD7FC 80240B2C AFBF0028 */ sw $ra, 0x28($sp) -/* DCD800 80240B30 AFB00020 */ sw $s0, 0x20($sp) -/* DCD804 80240B34 8E220148 */ lw $v0, 0x148($s1) -/* DCD808 80240B38 0C00EABB */ jal get_npc_unsafe -/* DCD80C 80240B3C 84440008 */ lh $a0, 8($v0) -/* DCD810 80240B40 0040802D */ daddu $s0, $v0, $zero -/* DCD814 80240B44 0200202D */ daddu $a0, $s0, $zero -/* DCD818 80240B48 C600000C */ lwc1 $f0, 0xc($s0) -/* DCD81C 80240B4C 27A60018 */ addiu $a2, $sp, 0x18 -/* DCD820 80240B50 E7A00018 */ swc1 $f0, 0x18($sp) -/* DCD824 80240B54 AFA00010 */ sw $zero, 0x10($sp) -/* DCD828 80240B58 AFA00014 */ sw $zero, 0x14($sp) -/* DCD82C 80240B5C 8E050018 */ lw $a1, 0x18($s0) -/* DCD830 80240B60 0C0129E1 */ jal func_8004A784 -/* DCD834 80240B64 0000382D */ daddu $a3, $zero, $zero -/* DCD838 80240B68 14400005 */ bnez $v0, .L80240B80 -/* DCD83C 80240B6C 00000000 */ nop -/* DCD840 80240B70 8E050018 */ lw $a1, 0x18($s0) -/* DCD844 80240B74 8E06000C */ lw $a2, 0xc($s0) -/* DCD848 80240B78 0C00EA95 */ jal npc_move_heading -/* DCD84C 80240B7C 0200202D */ daddu $a0, $s0, $zero -.L80240B80: -/* DCD850 80240B80 9602008E */ lhu $v0, 0x8e($s0) -/* DCD854 80240B84 2442FFFF */ addiu $v0, $v0, -1 -/* DCD858 80240B88 A602008E */ sh $v0, 0x8e($s0) -/* DCD85C 80240B8C 00021400 */ sll $v0, $v0, 0x10 -/* DCD860 80240B90 14400004 */ bnez $v0, .L80240BA4 -/* DCD864 80240B94 2402001E */ addiu $v0, $zero, 0x1e -/* DCD868 80240B98 A602008E */ sh $v0, 0x8e($s0) -/* DCD86C 80240B9C 24020011 */ addiu $v0, $zero, 0x11 -/* DCD870 80240BA0 AE220070 */ sw $v0, 0x70($s1) -.L80240BA4: -/* DCD874 80240BA4 8FBF0028 */ lw $ra, 0x28($sp) -/* DCD878 80240BA8 8FB10024 */ lw $s1, 0x24($sp) -/* DCD87C 80240BAC 8FB00020 */ lw $s0, 0x20($sp) -/* DCD880 80240BB0 03E00008 */ jr $ra -/* DCD884 80240BB4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_80240BB8_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_80240BB8_DCCCD0.s deleted file mode 100644 index 5d6b4f0ad6..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_80240BB8_DCCCD0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BB8_DCD888 -/* DCD888 80240BB8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCD88C 80240BBC AFB10014 */ sw $s1, 0x14($sp) -/* DCD890 80240BC0 0080882D */ daddu $s1, $a0, $zero -/* DCD894 80240BC4 AFBF0018 */ sw $ra, 0x18($sp) -/* DCD898 80240BC8 AFB00010 */ sw $s0, 0x10($sp) -/* DCD89C 80240BCC 8E300148 */ lw $s0, 0x148($s1) -/* DCD8A0 80240BD0 0C00EABB */ jal get_npc_unsafe -/* DCD8A4 80240BD4 86040008 */ lh $a0, 8($s0) -/* DCD8A8 80240BD8 0040182D */ daddu $v1, $v0, $zero -/* DCD8AC 80240BDC 9462008E */ lhu $v0, 0x8e($v1) -/* DCD8B0 80240BE0 2442FFFF */ addiu $v0, $v0, -1 -/* DCD8B4 80240BE4 A462008E */ sh $v0, 0x8e($v1) -/* DCD8B8 80240BE8 00021400 */ sll $v0, $v0, 0x10 -/* DCD8BC 80240BEC 14400005 */ bnez $v0, .L80240C04 -/* DCD8C0 80240BF0 00000000 */ nop -/* DCD8C4 80240BF4 8E0200CC */ lw $v0, 0xcc($s0) -/* DCD8C8 80240BF8 8C420000 */ lw $v0, ($v0) -/* DCD8CC 80240BFC AC620028 */ sw $v0, 0x28($v1) -/* DCD8D0 80240C00 AE200070 */ sw $zero, 0x70($s1) -.L80240C04: -/* DCD8D4 80240C04 8FBF0018 */ lw $ra, 0x18($sp) -/* DCD8D8 80240C08 8FB10014 */ lw $s1, 0x14($sp) -/* DCD8DC 80240C0C 8FB00010 */ lw $s0, 0x10($sp) -/* DCD8E0 80240C10 03E00008 */ jr $ra -/* DCD8E4 80240C14 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_80240C18_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_80240C18_DCCCD0.s deleted file mode 100644 index 8400190707..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_80240C18_DCCCD0.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C18_DCD8E8 -/* DCD8E8 80240C18 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DCD8EC 80240C1C AFB30054 */ sw $s3, 0x54($sp) -/* DCD8F0 80240C20 0080982D */ daddu $s3, $a0, $zero -/* DCD8F4 80240C24 AFBF0060 */ sw $ra, 0x60($sp) -/* DCD8F8 80240C28 AFB5005C */ sw $s5, 0x5c($sp) -/* DCD8FC 80240C2C AFB40058 */ sw $s4, 0x58($sp) -/* DCD900 80240C30 AFB20050 */ sw $s2, 0x50($sp) -/* DCD904 80240C34 AFB1004C */ sw $s1, 0x4c($sp) -/* DCD908 80240C38 AFB00048 */ sw $s0, 0x48($sp) -/* DCD90C 80240C3C 8E710148 */ lw $s1, 0x148($s3) -/* DCD910 80240C40 86240008 */ lh $a0, 8($s1) -/* DCD914 80240C44 0C00EABB */ jal get_npc_unsafe -/* DCD918 80240C48 00A0802D */ daddu $s0, $a1, $zero -/* DCD91C 80240C4C 8E63000C */ lw $v1, 0xc($s3) -/* DCD920 80240C50 0260202D */ daddu $a0, $s3, $zero -/* DCD924 80240C54 8C650000 */ lw $a1, ($v1) -/* DCD928 80240C58 0C0B1EAF */ jal get_variable -/* DCD92C 80240C5C 0040902D */ daddu $s2, $v0, $zero -/* DCD930 80240C60 AFA00018 */ sw $zero, 0x18($sp) -/* DCD934 80240C64 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCD938 80240C68 8C630030 */ lw $v1, 0x30($v1) -/* DCD93C 80240C6C AFA3001C */ sw $v1, 0x1c($sp) -/* DCD940 80240C70 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCD944 80240C74 8C63001C */ lw $v1, 0x1c($v1) -/* DCD948 80240C78 AFA30020 */ sw $v1, 0x20($sp) -/* DCD94C 80240C7C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCD950 80240C80 8C630024 */ lw $v1, 0x24($v1) -/* DCD954 80240C84 AFA30024 */ sw $v1, 0x24($sp) -/* DCD958 80240C88 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCD95C 80240C8C 8C630028 */ lw $v1, 0x28($v1) -/* DCD960 80240C90 27B50018 */ addiu $s5, $sp, 0x18 -/* DCD964 80240C94 AFA30028 */ sw $v1, 0x28($sp) -/* DCD968 80240C98 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCD96C 80240C9C 3C014282 */ lui $at, 0x4282 -/* DCD970 80240CA0 44810000 */ mtc1 $at, $f0 -/* DCD974 80240CA4 8C63002C */ lw $v1, 0x2c($v1) -/* DCD978 80240CA8 0040A02D */ daddu $s4, $v0, $zero -/* DCD97C 80240CAC E7A00030 */ swc1 $f0, 0x30($sp) -/* DCD980 80240CB0 A7A00034 */ sh $zero, 0x34($sp) -/* DCD984 80240CB4 16000005 */ bnez $s0, .L80240CCC -/* DCD988 80240CB8 AFA3002C */ sw $v1, 0x2c($sp) -/* DCD98C 80240CBC 8E2200B0 */ lw $v0, 0xb0($s1) -/* DCD990 80240CC0 30420004 */ andi $v0, $v0, 4 -/* DCD994 80240CC4 10400044 */ beqz $v0, .L80240DD8 -/* DCD998 80240CC8 00000000 */ nop -.L80240CCC: -/* DCD99C 80240CCC 2404F7FF */ addiu $a0, $zero, -0x801 -/* DCD9A0 80240CD0 AE600070 */ sw $zero, 0x70($s3) -/* DCD9A4 80240CD4 A640008E */ sh $zero, 0x8e($s2) -/* DCD9A8 80240CD8 8E2200CC */ lw $v0, 0xcc($s1) -/* DCD9AC 80240CDC 8E430000 */ lw $v1, ($s2) -/* DCD9B0 80240CE0 8C420000 */ lw $v0, ($v0) -/* DCD9B4 80240CE4 00641824 */ and $v1, $v1, $a0 -/* DCD9B8 80240CE8 AE430000 */ sw $v1, ($s2) -/* DCD9BC 80240CEC AE420028 */ sw $v0, 0x28($s2) -/* DCD9C0 80240CF0 8E2200D0 */ lw $v0, 0xd0($s1) -/* DCD9C4 80240CF4 8C420034 */ lw $v0, 0x34($v0) -/* DCD9C8 80240CF8 54400005 */ bnel $v0, $zero, .L80240D10 -/* DCD9CC 80240CFC 2402FDFF */ addiu $v0, $zero, -0x201 -/* DCD9D0 80240D00 34620200 */ ori $v0, $v1, 0x200 -/* DCD9D4 80240D04 2403FFF7 */ addiu $v1, $zero, -9 -/* DCD9D8 80240D08 08090346 */ j .L80240D18 -/* DCD9DC 80240D0C 00431024 */ and $v0, $v0, $v1 -.L80240D10: -/* DCD9E0 80240D10 00621024 */ and $v0, $v1, $v0 -/* DCD9E4 80240D14 34420008 */ ori $v0, $v0, 8 -.L80240D18: -/* DCD9E8 80240D18 AE420000 */ sw $v0, ($s2) -/* DCD9EC 80240D1C 8E2200B0 */ lw $v0, 0xb0($s1) -/* DCD9F0 80240D20 30420004 */ andi $v0, $v0, 4 -/* DCD9F4 80240D24 10400004 */ beqz $v0, .L80240D38 -/* DCD9F8 80240D28 24020063 */ addiu $v0, $zero, 0x63 -/* DCD9FC 80240D2C AE620070 */ sw $v0, 0x70($s3) -/* DCDA00 80240D30 08090354 */ j .L80240D50 -/* DCDA04 80240D34 AE600074 */ sw $zero, 0x74($s3) -.L80240D38: -/* DCDA08 80240D38 8E220000 */ lw $v0, ($s1) -/* DCDA0C 80240D3C 3C034000 */ lui $v1, 0x4000 -/* DCDA10 80240D40 00431024 */ and $v0, $v0, $v1 -/* DCDA14 80240D44 10400002 */ beqz $v0, .L80240D50 -/* DCDA18 80240D48 2402000C */ addiu $v0, $zero, 0xc -/* DCDA1C 80240D4C AE620070 */ sw $v0, 0x70($s3) -.L80240D50: -/* DCDA20 80240D50 3C06BFFF */ lui $a2, 0xbfff -/* DCDA24 80240D54 34C6FFFF */ ori $a2, $a2, 0xffff -/* DCDA28 80240D58 27A50038 */ addiu $a1, $sp, 0x38 -/* DCDA2C 80240D5C 2404FFFB */ addiu $a0, $zero, -5 -/* DCDA30 80240D60 8E2200B0 */ lw $v0, 0xb0($s1) -/* DCDA34 80240D64 8E230000 */ lw $v1, ($s1) -/* DCDA38 80240D68 3C0142C8 */ lui $at, 0x42c8 -/* DCDA3C 80240D6C 44810000 */ mtc1 $at, $f0 -/* DCDA40 80240D70 00441024 */ and $v0, $v0, $a0 -/* DCDA44 80240D74 00661824 */ and $v1, $v1, $a2 -/* DCDA48 80240D78 AE2200B0 */ sw $v0, 0xb0($s1) -/* DCDA4C 80240D7C AE230000 */ sw $v1, ($s1) -/* DCDA50 80240D80 864200A8 */ lh $v0, 0xa8($s2) -/* DCDA54 80240D84 27A70040 */ addiu $a3, $sp, 0x40 -/* DCDA58 80240D88 E7A00044 */ swc1 $f0, 0x44($sp) -/* DCDA5C 80240D8C C6460038 */ lwc1 $f6, 0x38($s2) -/* DCDA60 80240D90 C640003C */ lwc1 $f0, 0x3c($s2) -/* DCDA64 80240D94 C6420040 */ lwc1 $f2, 0x40($s2) -/* DCDA68 80240D98 44822000 */ mtc1 $v0, $f4 -/* DCDA6C 80240D9C 00000000 */ nop -/* DCDA70 80240DA0 46802120 */ cvt.s.w $f4, $f4 -/* DCDA74 80240DA4 27A20044 */ addiu $v0, $sp, 0x44 -/* DCDA78 80240DA8 46040000 */ add.s $f0, $f0, $f4 -/* DCDA7C 80240DAC E7A60038 */ swc1 $f6, 0x38($sp) -/* DCDA80 80240DB0 E7A20040 */ swc1 $f2, 0x40($sp) -/* DCDA84 80240DB4 E7A0003C */ swc1 $f0, 0x3c($sp) -/* DCDA88 80240DB8 AFA20010 */ sw $v0, 0x10($sp) -/* DCDA8C 80240DBC 8E440080 */ lw $a0, 0x80($s2) -/* DCDA90 80240DC0 0C0372DF */ jal func_800DCB7C -/* DCDA94 80240DC4 27A6003C */ addiu $a2, $sp, 0x3c -/* DCDA98 80240DC8 10400003 */ beqz $v0, .L80240DD8 -/* DCDA9C 80240DCC 00000000 */ nop -/* DCDAA0 80240DD0 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DCDAA4 80240DD4 E640003C */ swc1 $f0, 0x3c($s2) -.L80240DD8: -/* DCDAA8 80240DD8 8E630070 */ lw $v1, 0x70($s3) -/* DCDAAC 80240DDC 2C620064 */ sltiu $v0, $v1, 0x64 -/* DCDAB0 80240DE0 10400050 */ beqz $v0, .L80240F24 -/* DCDAB4 80240DE4 00031080 */ sll $v0, $v1, 2 -/* DCDAB8 80240DE8 3C018025 */ lui $at, 0x8025 -/* DCDABC 80240DEC 00220821 */ addu $at, $at, $v0 -/* DCDAC0 80240DF0 8C22A640 */ lw $v0, -0x59c0($at) -/* DCDAC4 80240DF4 00400008 */ jr $v0 -/* DCDAC8 80240DF8 00000000 */ nop -/* DCDACC 80240DFC 0260202D */ daddu $a0, $s3, $zero -/* DCDAD0 80240E00 0280282D */ daddu $a1, $s4, $zero -/* DCDAD4 80240E04 0C012568 */ jal func_800495A0 -/* DCDAD8 80240E08 02A0302D */ daddu $a2, $s5, $zero -/* DCDADC 80240E0C 0260202D */ daddu $a0, $s3, $zero -/* DCDAE0 80240E10 0280282D */ daddu $a1, $s4, $zero -/* DCDAE4 80240E14 0C0125AE */ jal func_800496B8 -/* DCDAE8 80240E18 02A0302D */ daddu $a2, $s5, $zero -/* DCDAEC 80240E1C 080903C9 */ j .L80240F24 -/* DCDAF0 80240E20 00000000 */ nop -/* DCDAF4 80240E24 0260202D */ daddu $a0, $s3, $zero -/* DCDAF8 80240E28 0280282D */ daddu $a1, $s4, $zero -/* DCDAFC 80240E2C 0C0126D1 */ jal func_80049B44 -/* DCDB00 80240E30 02A0302D */ daddu $a2, $s5, $zero -/* DCDB04 80240E34 0260202D */ daddu $a0, $s3, $zero -/* DCDB08 80240E38 0280282D */ daddu $a1, $s4, $zero -/* DCDB0C 80240E3C 0C012701 */ jal func_80049C04 -/* DCDB10 80240E40 02A0302D */ daddu $a2, $s5, $zero -/* DCDB14 80240E44 080903C9 */ j .L80240F24 -/* DCDB18 80240E48 00000000 */ nop -/* DCDB1C 80240E4C 0260202D */ daddu $a0, $s3, $zero -/* DCDB20 80240E50 0280282D */ daddu $a1, $s4, $zero -/* DCDB24 80240E54 0C01278F */ jal func_80049E3C -/* DCDB28 80240E58 02A0302D */ daddu $a2, $s5, $zero -/* DCDB2C 80240E5C 0260202D */ daddu $a0, $s3, $zero -/* DCDB30 80240E60 0280282D */ daddu $a1, $s4, $zero -/* DCDB34 80240E64 0C0127B3 */ jal func_80049ECC -/* DCDB38 80240E68 02A0302D */ daddu $a2, $s5, $zero -/* DCDB3C 80240E6C 080903C9 */ j .L80240F24 -/* DCDB40 80240E70 00000000 */ nop -/* DCDB44 80240E74 0260202D */ daddu $a0, $s3, $zero -/* DCDB48 80240E78 0280282D */ daddu $a1, $s4, $zero -/* DCDB4C 80240E7C 0C0127DF */ jal func_80049F7C -/* DCDB50 80240E80 02A0302D */ daddu $a2, $s5, $zero -/* DCDB54 80240E84 0260202D */ daddu $a0, $s3, $zero -/* DCDB58 80240E88 0280282D */ daddu $a1, $s4, $zero -/* DCDB5C 80240E8C 0C012849 */ jal func_8004A124 -/* DCDB60 80240E90 02A0302D */ daddu $a2, $s5, $zero -/* DCDB64 80240E94 8E630070 */ lw $v1, 0x70($s3) -/* DCDB68 80240E98 2402000E */ addiu $v0, $zero, 0xe -/* DCDB6C 80240E9C 14620021 */ bne $v1, $v0, .L80240F24 -/* DCDB70 80240EA0 00000000 */ nop -/* DCDB74 80240EA4 0260202D */ daddu $a0, $s3, $zero -/* DCDB78 80240EA8 0280282D */ daddu $a1, $s4, $zero -/* DCDB7C 80240EAC 0C090278 */ jal func_802409E0 -/* DCDB80 80240EB0 02A0302D */ daddu $a2, $s5, $zero -/* DCDB84 80240EB4 8E630070 */ lw $v1, 0x70($s3) -/* DCDB88 80240EB8 2402000F */ addiu $v0, $zero, 0xf -/* DCDB8C 80240EBC 14620019 */ bne $v1, $v0, .L80240F24 -/* DCDB90 80240EC0 00000000 */ nop -/* DCDB94 80240EC4 0260202D */ daddu $a0, $s3, $zero -/* DCDB98 80240EC8 0280282D */ daddu $a1, $s4, $zero -/* DCDB9C 80240ECC 0C090294 */ jal func_80240A50 -/* DCDBA0 80240ED0 02A0302D */ daddu $a2, $s5, $zero -/* DCDBA4 80240ED4 8E630070 */ lw $v1, 0x70($s3) -/* DCDBA8 80240ED8 24020010 */ addiu $v0, $zero, 0x10 -/* DCDBAC 80240EDC 14620011 */ bne $v1, $v0, .L80240F24 -/* DCDBB0 80240EE0 00000000 */ nop -/* DCDBB4 80240EE4 0260202D */ daddu $a0, $s3, $zero -/* DCDBB8 80240EE8 0280282D */ daddu $a1, $s4, $zero -/* DCDBBC 80240EEC 0C0902C8 */ jal func_80240B20 -/* DCDBC0 80240EF0 02A0302D */ daddu $a2, $s5, $zero -/* DCDBC4 80240EF4 8E630070 */ lw $v1, 0x70($s3) -/* DCDBC8 80240EF8 24020011 */ addiu $v0, $zero, 0x11 -/* DCDBCC 80240EFC 14620009 */ bne $v1, $v0, .L80240F24 -/* DCDBD0 80240F00 00000000 */ nop -/* DCDBD4 80240F04 0260202D */ daddu $a0, $s3, $zero -/* DCDBD8 80240F08 0280282D */ daddu $a1, $s4, $zero -/* DCDBDC 80240F0C 0C0902EE */ jal func_80240BB8 -/* DCDBE0 80240F10 02A0302D */ daddu $a2, $s5, $zero -/* DCDBE4 80240F14 080903C9 */ j .L80240F24 -/* DCDBE8 80240F18 00000000 */ nop -/* DCDBEC 80240F1C 0C0129CF */ jal func_8004A73C -/* DCDBF0 80240F20 0260202D */ daddu $a0, $s3, $zero -.L80240F24: -/* DCDBF4 80240F24 8FBF0060 */ lw $ra, 0x60($sp) -/* DCDBF8 80240F28 8FB5005C */ lw $s5, 0x5c($sp) -/* DCDBFC 80240F2C 8FB40058 */ lw $s4, 0x58($sp) -/* DCDC00 80240F30 8FB30054 */ lw $s3, 0x54($sp) -/* DCDC04 80240F34 8FB20050 */ lw $s2, 0x50($sp) -/* DCDC08 80240F38 8FB1004C */ lw $s1, 0x4c($sp) -/* DCDC0C 80240F3C 8FB00048 */ lw $s0, 0x48($sp) -/* DCDC10 80240F40 0000102D */ daddu $v0, $zero, $zero -/* DCDC14 80240F44 03E00008 */ jr $ra -/* DCDC18 80240F48 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_80240F4C_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_80240F4C_DCCCD0.s deleted file mode 100644 index 39c0d13c44..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_80240F4C_DCCCD0.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F4C_DCDC1C -/* DCDC1C 80240F4C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DCDC20 80240F50 AFB50024 */ sw $s5, 0x24($sp) -/* DCDC24 80240F54 0080A82D */ daddu $s5, $a0, $zero -/* DCDC28 80240F58 AFBF002C */ sw $ra, 0x2c($sp) -/* DCDC2C 80240F5C AFB60028 */ sw $s6, 0x28($sp) -/* DCDC30 80240F60 AFB40020 */ sw $s4, 0x20($sp) -/* DCDC34 80240F64 AFB3001C */ sw $s3, 0x1c($sp) -/* DCDC38 80240F68 AFB20018 */ sw $s2, 0x18($sp) -/* DCDC3C 80240F6C AFB10014 */ sw $s1, 0x14($sp) -/* DCDC40 80240F70 AFB00010 */ sw $s0, 0x10($sp) -/* DCDC44 80240F74 F7B80040 */ sdc1 $f24, 0x40($sp) -/* DCDC48 80240F78 F7B60038 */ sdc1 $f22, 0x38($sp) -/* DCDC4C 80240F7C F7B40030 */ sdc1 $f20, 0x30($sp) -/* DCDC50 80240F80 8EB30148 */ lw $s3, 0x148($s5) -/* DCDC54 80240F84 86640008 */ lh $a0, 8($s3) -/* DCDC58 80240F88 0C00EABB */ jal get_npc_unsafe -/* DCDC5C 80240F8C 00A0B02D */ daddu $s6, $a1, $zero -/* DCDC60 80240F90 0040A02D */ daddu $s4, $v0, $zero -/* DCDC64 80240F94 AEA00074 */ sw $zero, 0x74($s5) -/* DCDC68 80240F98 C6980038 */ lwc1 $f24, 0x38($s4) -/* DCDC6C 80240F9C C6960040 */ lwc1 $f22, 0x40($s4) -/* DCDC70 80240FA0 0000902D */ daddu $s2, $zero, $zero -/* DCDC74 80240FA4 AEA00078 */ sw $zero, 0x78($s5) -/* DCDC78 80240FA8 8E6300D0 */ lw $v1, 0xd0($s3) -/* DCDC7C 80240FAC 8C620000 */ lw $v0, ($v1) -/* DCDC80 80240FB0 3C0146FF */ lui $at, 0x46ff -/* DCDC84 80240FB4 3421FE00 */ ori $at, $at, 0xfe00 -/* DCDC88 80240FB8 4481A000 */ mtc1 $at, $f20 -/* DCDC8C 80240FBC 18400018 */ blez $v0, .L80241020 -/* DCDC90 80240FC0 0240802D */ daddu $s0, $s2, $zero -/* DCDC94 80240FC4 0240882D */ daddu $s1, $s2, $zero -.L80240FC8: -/* DCDC98 80240FC8 02231021 */ addu $v0, $s1, $v1 -/* DCDC9C 80240FCC 4600C306 */ mov.s $f12, $f24 -/* DCDCA0 80240FD0 C4440004 */ lwc1 $f4, 4($v0) -/* DCDCA4 80240FD4 46802120 */ cvt.s.w $f4, $f4 -/* DCDCA8 80240FD8 44062000 */ mfc1 $a2, $f4 -/* DCDCAC 80240FDC C444000C */ lwc1 $f4, 0xc($v0) -/* DCDCB0 80240FE0 46802120 */ cvt.s.w $f4, $f4 -/* DCDCB4 80240FE4 44072000 */ mfc1 $a3, $f4 -/* DCDCB8 80240FE8 0C00A7B5 */ jal dist2D -/* DCDCBC 80240FEC 4600B386 */ mov.s $f14, $f22 -/* DCDCC0 80240FF0 4614003C */ c.lt.s $f0, $f20 -/* DCDCC4 80240FF4 00000000 */ nop -/* DCDCC8 80240FF8 45000003 */ bc1f .L80241008 -/* DCDCCC 80240FFC 2631000C */ addiu $s1, $s1, 0xc -/* DCDCD0 80241000 46000506 */ mov.s $f20, $f0 -/* DCDCD4 80241004 AEB20078 */ sw $s2, 0x78($s5) -.L80241008: -/* DCDCD8 80241008 8E6300D0 */ lw $v1, 0xd0($s3) -/* DCDCDC 8024100C 26100001 */ addiu $s0, $s0, 1 -/* DCDCE0 80241010 8C620000 */ lw $v0, ($v1) -/* DCDCE4 80241014 0202102A */ slt $v0, $s0, $v0 -/* DCDCE8 80241018 1440FFEB */ bnez $v0, .L80240FC8 -/* DCDCEC 8024101C 26520001 */ addiu $s2, $s2, 1 -.L80241020: -/* DCDCF0 80241020 8E6200CC */ lw $v0, 0xcc($s3) -/* DCDCF4 80241024 8C420004 */ lw $v0, 4($v0) -/* DCDCF8 80241028 AE820028 */ sw $v0, 0x28($s4) -/* DCDCFC 8024102C 8E6200D0 */ lw $v0, 0xd0($s3) -/* DCDD00 80241030 8C42007C */ lw $v0, 0x7c($v0) -/* DCDD04 80241034 04410004 */ bgez $v0, .L80241048 -/* DCDD08 80241038 00000000 */ nop -/* DCDD0C 8024103C C6C00000 */ lwc1 $f0, ($s6) -/* DCDD10 80241040 0809041A */ j .L80241068 -/* DCDD14 80241044 E6800018 */ swc1 $f0, 0x18($s4) -.L80241048: -/* DCDD18 80241048 3C018025 */ lui $at, 0x8025 -/* DCDD1C 8024104C D422A7D0 */ ldc1 $f2, -0x5830($at) -/* DCDD20 80241050 44820000 */ mtc1 $v0, $f0 -/* DCDD24 80241054 00000000 */ nop -/* DCDD28 80241058 46800021 */ cvt.d.w $f0, $f0 -/* DCDD2C 8024105C 46220003 */ div.d $f0, $f0, $f2 -/* DCDD30 80241060 46200020 */ cvt.s.d $f0, $f0 -/* DCDD34 80241064 E6800018 */ swc1 $f0, 0x18($s4) -.L80241068: -/* DCDD38 80241068 24020001 */ addiu $v0, $zero, 1 -/* DCDD3C 8024106C AEA20070 */ sw $v0, 0x70($s5) -/* DCDD40 80241070 8FBF002C */ lw $ra, 0x2c($sp) -/* DCDD44 80241074 8FB60028 */ lw $s6, 0x28($sp) -/* DCDD48 80241078 8FB50024 */ lw $s5, 0x24($sp) -/* DCDD4C 8024107C 8FB40020 */ lw $s4, 0x20($sp) -/* DCDD50 80241080 8FB3001C */ lw $s3, 0x1c($sp) -/* DCDD54 80241084 8FB20018 */ lw $s2, 0x18($sp) -/* DCDD58 80241088 8FB10014 */ lw $s1, 0x14($sp) -/* DCDD5C 8024108C 8FB00010 */ lw $s0, 0x10($sp) -/* DCDD60 80241090 D7B80040 */ ldc1 $f24, 0x40($sp) -/* DCDD64 80241094 D7B60038 */ ldc1 $f22, 0x38($sp) -/* DCDD68 80241098 D7B40030 */ ldc1 $f20, 0x30($sp) -/* DCDD6C 8024109C 03E00008 */ jr $ra -/* DCDD70 802410A0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_802410A4_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_802410A4_DCCCD0.s deleted file mode 100644 index 801922e841..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_802410A4_DCCCD0.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410A4_DCDD74 -/* DCDD74 802410A4 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* DCDD78 802410A8 AFB20038 */ sw $s2, 0x38($sp) -/* DCDD7C 802410AC 0080902D */ daddu $s2, $a0, $zero -/* DCDD80 802410B0 AFBF0044 */ sw $ra, 0x44($sp) -/* DCDD84 802410B4 AFB40040 */ sw $s4, 0x40($sp) -/* DCDD88 802410B8 AFB3003C */ sw $s3, 0x3c($sp) -/* DCDD8C 802410BC AFB10034 */ sw $s1, 0x34($sp) -/* DCDD90 802410C0 AFB00030 */ sw $s0, 0x30($sp) -/* DCDD94 802410C4 F7B60050 */ sdc1 $f22, 0x50($sp) -/* DCDD98 802410C8 F7B40048 */ sdc1 $f20, 0x48($sp) -/* DCDD9C 802410CC 8E510148 */ lw $s1, 0x148($s2) -/* DCDDA0 802410D0 00A0982D */ daddu $s3, $a1, $zero -/* DCDDA4 802410D4 86240008 */ lh $a0, 8($s1) -/* DCDDA8 802410D8 0C00EABB */ jal get_npc_unsafe -/* DCDDAC 802410DC 00C0A02D */ daddu $s4, $a2, $zero -/* DCDDB0 802410E0 8E630014 */ lw $v1, 0x14($s3) -/* DCDDB4 802410E4 04600030 */ bltz $v1, .L802411A8 -/* DCDDB8 802410E8 0040802D */ daddu $s0, $v0, $zero -/* DCDDBC 802410EC 8E420074 */ lw $v0, 0x74($s2) -/* DCDDC0 802410F0 1C40002C */ bgtz $v0, .L802411A4 -/* DCDDC4 802410F4 2442FFFF */ addiu $v0, $v0, -1 -/* DCDDC8 802410F8 0280202D */ daddu $a0, $s4, $zero -/* DCDDCC 802410FC AE430074 */ sw $v1, 0x74($s2) -/* DCDDD0 80241100 AFA00010 */ sw $zero, 0x10($sp) -/* DCDDD4 80241104 8E66000C */ lw $a2, 0xc($s3) -/* DCDDD8 80241108 8E670010 */ lw $a3, 0x10($s3) -/* DCDDDC 8024110C 0C01242D */ jal func_800490B4 -/* DCDDE0 80241110 0220282D */ daddu $a1, $s1, $zero -/* DCDDE4 80241114 10400021 */ beqz $v0, .L8024119C -/* DCDDE8 80241118 0000202D */ daddu $a0, $zero, $zero -/* DCDDEC 8024111C 0200282D */ daddu $a1, $s0, $zero -/* DCDDF0 80241120 0000302D */ daddu $a2, $zero, $zero -/* DCDDF4 80241124 860300A8 */ lh $v1, 0xa8($s0) -/* DCDDF8 80241128 3C013F80 */ lui $at, 0x3f80 -/* DCDDFC 8024112C 44810000 */ mtc1 $at, $f0 -/* DCDE00 80241130 3C014000 */ lui $at, 0x4000 -/* DCDE04 80241134 44811000 */ mtc1 $at, $f2 -/* DCDE08 80241138 3C01C1A0 */ lui $at, 0xc1a0 -/* DCDE0C 8024113C 44812000 */ mtc1 $at, $f4 -/* DCDE10 80241140 2402000F */ addiu $v0, $zero, 0xf -/* DCDE14 80241144 AFA2001C */ sw $v0, 0x1c($sp) -/* DCDE18 80241148 44833000 */ mtc1 $v1, $f6 -/* DCDE1C 8024114C 00000000 */ nop -/* DCDE20 80241150 468031A0 */ cvt.s.w $f6, $f6 -/* DCDE24 80241154 44073000 */ mfc1 $a3, $f6 -/* DCDE28 80241158 27A20028 */ addiu $v0, $sp, 0x28 -/* DCDE2C 8024115C AFA20020 */ sw $v0, 0x20($sp) -/* DCDE30 80241160 E7A00010 */ swc1 $f0, 0x10($sp) -/* DCDE34 80241164 E7A20014 */ swc1 $f2, 0x14($sp) -/* DCDE38 80241168 0C01BFA4 */ jal fx_emote -/* DCDE3C 8024116C E7A40018 */ swc1 $f4, 0x18($sp) -/* DCDE40 80241170 0200202D */ daddu $a0, $s0, $zero -/* DCDE44 80241174 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DCDE48 80241178 0C012530 */ jal func_800494C0 -/* DCDE4C 8024117C 3C060020 */ lui $a2, 0x20 -/* DCDE50 80241180 8E220018 */ lw $v0, 0x18($s1) -/* DCDE54 80241184 9442002A */ lhu $v0, 0x2a($v0) -/* DCDE58 80241188 30420001 */ andi $v0, $v0, 1 -/* DCDE5C 8024118C 14400064 */ bnez $v0, .L80241320 -/* DCDE60 80241190 2402000A */ addiu $v0, $zero, 0xa -/* DCDE64 80241194 080904C8 */ j .L80241320 -/* DCDE68 80241198 2402000C */ addiu $v0, $zero, 0xc -.L8024119C: -/* DCDE6C 8024119C 8E420074 */ lw $v0, 0x74($s2) -/* DCDE70 802411A0 2442FFFF */ addiu $v0, $v0, -1 -.L802411A4: -/* DCDE74 802411A4 AE420074 */ sw $v0, 0x74($s2) -.L802411A8: -/* DCDE78 802411A8 8602008C */ lh $v0, 0x8c($s0) -/* DCDE7C 802411AC 1440005D */ bnez $v0, .L80241324 -/* DCDE80 802411B0 00000000 */ nop -/* DCDE84 802411B4 C6000018 */ lwc1 $f0, 0x18($s0) -/* DCDE88 802411B8 3C014010 */ lui $at, 0x4010 -/* DCDE8C 802411BC 44811800 */ mtc1 $at, $f3 -/* DCDE90 802411C0 44801000 */ mtc1 $zero, $f2 -/* DCDE94 802411C4 46000021 */ cvt.d.s $f0, $f0 -/* DCDE98 802411C8 4622003C */ c.lt.d $f0, $f2 -/* DCDE9C 802411CC 00000000 */ nop -/* DCDEA0 802411D0 45000003 */ bc1f .L802411E0 -/* DCDEA4 802411D4 0200202D */ daddu $a0, $s0, $zero -/* DCDEA8 802411D8 08090479 */ j .L802411E4 -/* DCDEAC 802411DC 0000282D */ daddu $a1, $zero, $zero -.L802411E0: -/* DCDEB0 802411E0 24050001 */ addiu $a1, $zero, 1 -.L802411E4: -/* DCDEB4 802411E4 0C00F598 */ jal func_8003D660 -/* DCDEB8 802411E8 00000000 */ nop -/* DCDEBC 802411EC C60C0038 */ lwc1 $f12, 0x38($s0) -/* DCDEC0 802411F0 8E430078 */ lw $v1, 0x78($s2) -/* DCDEC4 802411F4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DCDEC8 802411F8 00031040 */ sll $v0, $v1, 1 -/* DCDECC 802411FC 00431021 */ addu $v0, $v0, $v1 -/* DCDED0 80241200 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCDED4 80241204 00021080 */ sll $v0, $v0, 2 -/* DCDED8 80241208 00431021 */ addu $v0, $v0, $v1 -/* DCDEDC 8024120C C4560004 */ lwc1 $f22, 4($v0) -/* DCDEE0 80241210 4680B5A0 */ cvt.s.w $f22, $f22 -/* DCDEE4 80241214 C454000C */ lwc1 $f20, 0xc($v0) -/* DCDEE8 80241218 4680A520 */ cvt.s.w $f20, $f20 -/* DCDEEC 8024121C 4406B000 */ mfc1 $a2, $f22 -/* DCDEF0 80241220 4407A000 */ mfc1 $a3, $f20 -/* DCDEF4 80241224 0C00A720 */ jal atan2 -/* DCDEF8 80241228 00000000 */ nop -/* DCDEFC 8024122C 8E050018 */ lw $a1, 0x18($s0) -/* DCDF00 80241230 44060000 */ mfc1 $a2, $f0 -/* DCDF04 80241234 0200202D */ daddu $a0, $s0, $zero -/* DCDF08 80241238 0C00EA95 */ jal npc_move_heading -/* DCDF0C 8024123C AE06000C */ sw $a2, 0xc($s0) -/* DCDF10 80241240 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DCDF14 80241244 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DCDF18 80241248 4406B000 */ mfc1 $a2, $f22 -/* DCDF1C 8024124C 4407A000 */ mfc1 $a3, $f20 -/* DCDF20 80241250 0C00A7B5 */ jal dist2D -/* DCDF24 80241254 00000000 */ nop -/* DCDF28 80241258 C6020018 */ lwc1 $f2, 0x18($s0) -/* DCDF2C 8024125C 4602003E */ c.le.s $f0, $f2 -/* DCDF30 80241260 00000000 */ nop -/* DCDF34 80241264 4500002F */ bc1f .L80241324 -/* DCDF38 80241268 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DCDF3C 8024126C 24020002 */ addiu $v0, $zero, 2 -/* DCDF40 80241270 0C00A67F */ jal rand_int -/* DCDF44 80241274 AE420070 */ sw $v0, 0x70($s2) -/* DCDF48 80241278 3C035555 */ lui $v1, 0x5555 -/* DCDF4C 8024127C 34635556 */ ori $v1, $v1, 0x5556 -/* DCDF50 80241280 00430018 */ mult $v0, $v1 -/* DCDF54 80241284 000227C3 */ sra $a0, $v0, 0x1f -/* DCDF58 80241288 00004010 */ mfhi $t0 -/* DCDF5C 8024128C 01042023 */ subu $a0, $t0, $a0 -/* DCDF60 80241290 00041840 */ sll $v1, $a0, 1 -/* DCDF64 80241294 00641821 */ addu $v1, $v1, $a0 -/* DCDF68 80241298 00431023 */ subu $v0, $v0, $v1 -/* DCDF6C 8024129C 24430002 */ addiu $v1, $v0, 2 -/* DCDF70 802412A0 AE430074 */ sw $v1, 0x74($s2) -/* DCDF74 802412A4 8E62002C */ lw $v0, 0x2c($s3) -/* DCDF78 802412A8 18400009 */ blez $v0, .L802412D0 -/* DCDF7C 802412AC 24020004 */ addiu $v0, $zero, 4 -/* DCDF80 802412B0 8E620004 */ lw $v0, 4($s3) -/* DCDF84 802412B4 18400006 */ blez $v0, .L802412D0 -/* DCDF88 802412B8 24020004 */ addiu $v0, $zero, 4 -/* DCDF8C 802412BC 8E620008 */ lw $v0, 8($s3) -/* DCDF90 802412C0 18400003 */ blez $v0, .L802412D0 -/* DCDF94 802412C4 24020004 */ addiu $v0, $zero, 4 -/* DCDF98 802412C8 14600002 */ bnez $v1, .L802412D4 -/* DCDF9C 802412CC 00000000 */ nop -.L802412D0: -/* DCDFA0 802412D0 AE420070 */ sw $v0, 0x70($s2) -.L802412D4: -/* DCDFA4 802412D4 0C00A67F */ jal rand_int -/* DCDFA8 802412D8 24042710 */ addiu $a0, $zero, 0x2710 -/* DCDFAC 802412DC 3C0351EB */ lui $v1, 0x51eb -/* DCDFB0 802412E0 3463851F */ ori $v1, $v1, 0x851f -/* DCDFB4 802412E4 00430018 */ mult $v0, $v1 -/* DCDFB8 802412E8 00021FC3 */ sra $v1, $v0, 0x1f -/* DCDFBC 802412EC 00004010 */ mfhi $t0 -/* DCDFC0 802412F0 00082143 */ sra $a0, $t0, 5 -/* DCDFC4 802412F4 00832023 */ subu $a0, $a0, $v1 -/* DCDFC8 802412F8 00041840 */ sll $v1, $a0, 1 -/* DCDFCC 802412FC 00641821 */ addu $v1, $v1, $a0 -/* DCDFD0 80241300 000318C0 */ sll $v1, $v1, 3 -/* DCDFD4 80241304 00641821 */ addu $v1, $v1, $a0 -/* DCDFD8 80241308 00031880 */ sll $v1, $v1, 2 -/* DCDFDC 8024130C 8E640004 */ lw $a0, 4($s3) -/* DCDFE0 80241310 00431023 */ subu $v0, $v0, $v1 -/* DCDFE4 80241314 0044102A */ slt $v0, $v0, $a0 -/* DCDFE8 80241318 10400002 */ beqz $v0, .L80241324 -/* DCDFEC 8024131C 24020004 */ addiu $v0, $zero, 4 -.L80241320: -/* DCDFF0 80241320 AE420070 */ sw $v0, 0x70($s2) -.L80241324: -/* DCDFF4 80241324 8FBF0044 */ lw $ra, 0x44($sp) -/* DCDFF8 80241328 8FB40040 */ lw $s4, 0x40($sp) -/* DCDFFC 8024132C 8FB3003C */ lw $s3, 0x3c($sp) -/* DCE000 80241330 8FB20038 */ lw $s2, 0x38($sp) -/* DCE004 80241334 8FB10034 */ lw $s1, 0x34($sp) -/* DCE008 80241338 8FB00030 */ lw $s0, 0x30($sp) -/* DCE00C 8024133C D7B60050 */ ldc1 $f22, 0x50($sp) -/* DCE010 80241340 D7B40048 */ ldc1 $f20, 0x48($sp) -/* DCE014 80241344 03E00008 */ jr $ra -/* DCE018 80241348 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_8024134C_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_8024134C_DCCCD0.s deleted file mode 100644 index 3c6d2aba76..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_8024134C_DCCCD0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024134C_DCE01C -/* DCE01C 8024134C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DCE020 80241350 AFB3001C */ sw $s3, 0x1c($sp) -/* DCE024 80241354 0080982D */ daddu $s3, $a0, $zero -/* DCE028 80241358 AFBF0020 */ sw $ra, 0x20($sp) -/* DCE02C 8024135C AFB20018 */ sw $s2, 0x18($sp) -/* DCE030 80241360 AFB10014 */ sw $s1, 0x14($sp) -/* DCE034 80241364 AFB00010 */ sw $s0, 0x10($sp) -/* DCE038 80241368 8E720148 */ lw $s2, 0x148($s3) -/* DCE03C 8024136C 86440008 */ lh $a0, 8($s2) -/* DCE040 80241370 0C00EABB */ jal get_npc_unsafe -/* DCE044 80241374 00A0882D */ daddu $s1, $a1, $zero -/* DCE048 80241378 8E240008 */ lw $a0, 8($s1) -/* DCE04C 8024137C 0040802D */ daddu $s0, $v0, $zero -/* DCE050 80241380 00041FC2 */ srl $v1, $a0, 0x1f -/* DCE054 80241384 00832021 */ addu $a0, $a0, $v1 -/* DCE058 80241388 00042043 */ sra $a0, $a0, 1 -/* DCE05C 8024138C 0C00A67F */ jal rand_int -/* DCE060 80241390 24840001 */ addiu $a0, $a0, 1 -/* DCE064 80241394 8E230008 */ lw $v1, 8($s1) -/* DCE068 80241398 240400B4 */ addiu $a0, $zero, 0xb4 -/* DCE06C 8024139C 00032FC2 */ srl $a1, $v1, 0x1f -/* DCE070 802413A0 00651821 */ addu $v1, $v1, $a1 -/* DCE074 802413A4 00031843 */ sra $v1, $v1, 1 -/* DCE078 802413A8 00621821 */ addu $v1, $v1, $v0 -/* DCE07C 802413AC 0C00A67F */ jal rand_int -/* DCE080 802413B0 A603008E */ sh $v1, 0x8e($s0) -/* DCE084 802413B4 C60C000C */ lwc1 $f12, 0xc($s0) -/* DCE088 802413B8 44820000 */ mtc1 $v0, $f0 -/* DCE08C 802413BC 00000000 */ nop -/* DCE090 802413C0 46800020 */ cvt.s.w $f0, $f0 -/* DCE094 802413C4 46006300 */ add.s $f12, $f12, $f0 -/* DCE098 802413C8 3C0142B4 */ lui $at, 0x42b4 -/* DCE09C 802413CC 44810000 */ mtc1 $at, $f0 -/* DCE0A0 802413D0 0C00A6C9 */ jal clamp_angle -/* DCE0A4 802413D4 46006301 */ sub.s $f12, $f12, $f0 -/* DCE0A8 802413D8 E600000C */ swc1 $f0, 0xc($s0) -/* DCE0AC 802413DC 8E4200CC */ lw $v0, 0xcc($s2) -/* DCE0B0 802413E0 8C420000 */ lw $v0, ($v0) -/* DCE0B4 802413E4 AE020028 */ sw $v0, 0x28($s0) -/* DCE0B8 802413E8 24020003 */ addiu $v0, $zero, 3 -/* DCE0BC 802413EC AE620070 */ sw $v0, 0x70($s3) -/* DCE0C0 802413F0 8FBF0020 */ lw $ra, 0x20($sp) -/* DCE0C4 802413F4 8FB3001C */ lw $s3, 0x1c($sp) -/* DCE0C8 802413F8 8FB20018 */ lw $s2, 0x18($sp) -/* DCE0CC 802413FC 8FB10014 */ lw $s1, 0x14($sp) -/* DCE0D0 80241400 8FB00010 */ lw $s0, 0x10($sp) -/* DCE0D4 80241404 03E00008 */ jr $ra -/* DCE0D8 80241408 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_8024140C_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_8024140C_DCCCD0.s deleted file mode 100644 index 282de444a0..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_8024140C_DCCCD0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024140C_DCE0DC -/* DCE0DC 8024140C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DCE0E0 80241410 AFB40040 */ sw $s4, 0x40($sp) -/* DCE0E4 80241414 0080A02D */ daddu $s4, $a0, $zero -/* DCE0E8 80241418 AFBF0044 */ sw $ra, 0x44($sp) -/* DCE0EC 8024141C AFB3003C */ sw $s3, 0x3c($sp) -/* DCE0F0 80241420 AFB20038 */ sw $s2, 0x38($sp) -/* DCE0F4 80241424 AFB10034 */ sw $s1, 0x34($sp) -/* DCE0F8 80241428 AFB00030 */ sw $s0, 0x30($sp) -/* DCE0FC 8024142C 8E910148 */ lw $s1, 0x148($s4) -/* DCE100 80241430 00A0902D */ daddu $s2, $a1, $zero -/* DCE104 80241434 86240008 */ lh $a0, 8($s1) -/* DCE108 80241438 0C00EABB */ jal get_npc_unsafe -/* DCE10C 8024143C 00C0982D */ daddu $s3, $a2, $zero -/* DCE110 80241440 8E430014 */ lw $v1, 0x14($s2) -/* DCE114 80241444 04600031 */ bltz $v1, .L8024150C -/* DCE118 80241448 0040802D */ daddu $s0, $v0, $zero -/* DCE11C 8024144C 0260202D */ daddu $a0, $s3, $zero -/* DCE120 80241450 AFA00010 */ sw $zero, 0x10($sp) -/* DCE124 80241454 8E460024 */ lw $a2, 0x24($s2) -/* DCE128 80241458 8E470028 */ lw $a3, 0x28($s2) -/* DCE12C 8024145C 0C01242D */ jal func_800490B4 -/* DCE130 80241460 0220282D */ daddu $a1, $s1, $zero -/* DCE134 80241464 10400029 */ beqz $v0, .L8024150C -/* DCE138 80241468 0000202D */ daddu $a0, $zero, $zero -/* DCE13C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* DCE140 80241470 0000302D */ daddu $a2, $zero, $zero -/* DCE144 80241474 860300A8 */ lh $v1, 0xa8($s0) -/* DCE148 80241478 3C013F80 */ lui $at, 0x3f80 -/* DCE14C 8024147C 44810000 */ mtc1 $at, $f0 -/* DCE150 80241480 3C014000 */ lui $at, 0x4000 -/* DCE154 80241484 44811000 */ mtc1 $at, $f2 -/* DCE158 80241488 3C01C1A0 */ lui $at, 0xc1a0 -/* DCE15C 8024148C 44812000 */ mtc1 $at, $f4 -/* DCE160 80241490 2402000F */ addiu $v0, $zero, 0xf -/* DCE164 80241494 AFA2001C */ sw $v0, 0x1c($sp) -/* DCE168 80241498 44833000 */ mtc1 $v1, $f6 -/* DCE16C 8024149C 00000000 */ nop -/* DCE170 802414A0 468031A0 */ cvt.s.w $f6, $f6 -/* DCE174 802414A4 44073000 */ mfc1 $a3, $f6 -/* DCE178 802414A8 27A20028 */ addiu $v0, $sp, 0x28 -/* DCE17C 802414AC AFA20020 */ sw $v0, 0x20($sp) -/* DCE180 802414B0 E7A00010 */ swc1 $f0, 0x10($sp) -/* DCE184 802414B4 E7A20014 */ swc1 $f2, 0x14($sp) -/* DCE188 802414B8 0C01BFA4 */ jal fx_emote -/* DCE18C 802414BC E7A40018 */ swc1 $f4, 0x18($sp) -/* DCE190 802414C0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DCE194 802414C4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DCE198 802414C8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DCE19C 802414CC C60E0040 */ lwc1 $f14, 0x40($s0) -/* DCE1A0 802414D0 8C460028 */ lw $a2, 0x28($v0) -/* DCE1A4 802414D4 0C00A720 */ jal atan2 -/* DCE1A8 802414D8 8C470030 */ lw $a3, 0x30($v0) -/* DCE1AC 802414DC 0200202D */ daddu $a0, $s0, $zero -/* DCE1B0 802414E0 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DCE1B4 802414E4 3C060020 */ lui $a2, 0x20 -/* DCE1B8 802414E8 0C012530 */ jal func_800494C0 -/* DCE1BC 802414EC E480000C */ swc1 $f0, 0xc($a0) -/* DCE1C0 802414F0 8E220018 */ lw $v0, 0x18($s1) -/* DCE1C4 802414F4 9442002A */ lhu $v0, 0x2a($v0) -/* DCE1C8 802414F8 30420001 */ andi $v0, $v0, 1 -/* DCE1CC 802414FC 14400029 */ bnez $v0, .L802415A4 -/* DCE1D0 80241500 2402000A */ addiu $v0, $zero, 0xa -/* DCE1D4 80241504 08090569 */ j .L802415A4 -/* DCE1D8 80241508 2402000C */ addiu $v0, $zero, 0xc -.L8024150C: -/* DCE1DC 8024150C 8602008C */ lh $v0, 0x8c($s0) -/* DCE1E0 80241510 14400025 */ bnez $v0, .L802415A8 -/* DCE1E4 80241514 00000000 */ nop -/* DCE1E8 80241518 9602008E */ lhu $v0, 0x8e($s0) -/* DCE1EC 8024151C 2442FFFF */ addiu $v0, $v0, -1 -/* DCE1F0 80241520 A602008E */ sh $v0, 0x8e($s0) -/* DCE1F4 80241524 00021400 */ sll $v0, $v0, 0x10 -/* DCE1F8 80241528 1440001F */ bnez $v0, .L802415A8 -/* DCE1FC 8024152C 00000000 */ nop -/* DCE200 80241530 8E820074 */ lw $v0, 0x74($s4) -/* DCE204 80241534 2442FFFF */ addiu $v0, $v0, -1 -/* DCE208 80241538 10400019 */ beqz $v0, .L802415A0 -/* DCE20C 8024153C AE820074 */ sw $v0, 0x74($s4) -/* DCE210 80241540 8E220018 */ lw $v0, 0x18($s1) -/* DCE214 80241544 9442002A */ lhu $v0, 0x2a($v0) -/* DCE218 80241548 30420010 */ andi $v0, $v0, 0x10 -/* DCE21C 8024154C 14400007 */ bnez $v0, .L8024156C -/* DCE220 80241550 00000000 */ nop -/* DCE224 80241554 C600000C */ lwc1 $f0, 0xc($s0) -/* DCE228 80241558 3C014334 */ lui $at, 0x4334 -/* DCE22C 8024155C 44816000 */ mtc1 $at, $f12 -/* DCE230 80241560 0C00A6C9 */ jal clamp_angle -/* DCE234 80241564 460C0300 */ add.s $f12, $f0, $f12 -/* DCE238 80241568 E600000C */ swc1 $f0, 0xc($s0) -.L8024156C: -/* DCE23C 8024156C 8E440008 */ lw $a0, 8($s2) -/* DCE240 80241570 000417C2 */ srl $v0, $a0, 0x1f -/* DCE244 80241574 00822021 */ addu $a0, $a0, $v0 -/* DCE248 80241578 00042043 */ sra $a0, $a0, 1 -/* DCE24C 8024157C 0C00A67F */ jal rand_int -/* DCE250 80241580 24840001 */ addiu $a0, $a0, 1 -/* DCE254 80241584 8E430008 */ lw $v1, 8($s2) -/* DCE258 80241588 000327C2 */ srl $a0, $v1, 0x1f -/* DCE25C 8024158C 00641821 */ addu $v1, $v1, $a0 -/* DCE260 80241590 00031843 */ sra $v1, $v1, 1 -/* DCE264 80241594 00621821 */ addu $v1, $v1, $v0 -/* DCE268 80241598 0809056A */ j .L802415A8 -/* DCE26C 8024159C A603008E */ sh $v1, 0x8e($s0) -.L802415A0: -/* DCE270 802415A0 24020004 */ addiu $v0, $zero, 4 -.L802415A4: -/* DCE274 802415A4 AE820070 */ sw $v0, 0x70($s4) -.L802415A8: -/* DCE278 802415A8 8FBF0044 */ lw $ra, 0x44($sp) -/* DCE27C 802415AC 8FB40040 */ lw $s4, 0x40($sp) -/* DCE280 802415B0 8FB3003C */ lw $s3, 0x3c($sp) -/* DCE284 802415B4 8FB20038 */ lw $s2, 0x38($sp) -/* DCE288 802415B8 8FB10034 */ lw $s1, 0x34($sp) -/* DCE28C 802415BC 8FB00030 */ lw $s0, 0x30($sp) -/* DCE290 802415C0 03E00008 */ jr $ra -/* DCE294 802415C4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_802415C8_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_802415C8_DCCCD0.s deleted file mode 100644 index fd9088f6ac..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_802415C8_DCCCD0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415C8_DCE298 -/* DCE298 802415C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCE29C 802415CC AFB10014 */ sw $s1, 0x14($sp) -/* DCE2A0 802415D0 0080882D */ daddu $s1, $a0, $zero -/* DCE2A4 802415D4 AFBF001C */ sw $ra, 0x1c($sp) -/* DCE2A8 802415D8 AFB20018 */ sw $s2, 0x18($sp) -/* DCE2AC 802415DC AFB00010 */ sw $s0, 0x10($sp) -/* DCE2B0 802415E0 8E300148 */ lw $s0, 0x148($s1) -/* DCE2B4 802415E4 86040008 */ lh $a0, 8($s0) -/* DCE2B8 802415E8 0C00EABB */ jal get_npc_unsafe -/* DCE2BC 802415EC 00A0902D */ daddu $s2, $a1, $zero -/* DCE2C0 802415F0 8E230078 */ lw $v1, 0x78($s1) -/* DCE2C4 802415F4 24630001 */ addiu $v1, $v1, 1 -/* DCE2C8 802415F8 AE230078 */ sw $v1, 0x78($s1) -/* DCE2CC 802415FC 8E0400D0 */ lw $a0, 0xd0($s0) -/* DCE2D0 80241600 8C840000 */ lw $a0, ($a0) -/* DCE2D4 80241604 0064182A */ slt $v1, $v1, $a0 -/* DCE2D8 80241608 14600002 */ bnez $v1, .L80241614 -/* DCE2DC 8024160C 0040282D */ daddu $a1, $v0, $zero -/* DCE2E0 80241610 AE200078 */ sw $zero, 0x78($s1) -.L80241614: -/* DCE2E4 80241614 8E0200CC */ lw $v0, 0xcc($s0) -/* DCE2E8 80241618 8C420004 */ lw $v0, 4($v0) -/* DCE2EC 8024161C ACA20028 */ sw $v0, 0x28($a1) -/* DCE2F0 80241620 8E0200D0 */ lw $v0, 0xd0($s0) -/* DCE2F4 80241624 8C42007C */ lw $v0, 0x7c($v0) -/* DCE2F8 80241628 04410004 */ bgez $v0, .L8024163C -/* DCE2FC 8024162C 00000000 */ nop -/* DCE300 80241630 C6400000 */ lwc1 $f0, ($s2) -/* DCE304 80241634 08090597 */ j .L8024165C -/* DCE308 80241638 E4A00018 */ swc1 $f0, 0x18($a1) -.L8024163C: -/* DCE30C 8024163C 3C018025 */ lui $at, 0x8025 -/* DCE310 80241640 D422A7D8 */ ldc1 $f2, -0x5828($at) -/* DCE314 80241644 44820000 */ mtc1 $v0, $f0 -/* DCE318 80241648 00000000 */ nop -/* DCE31C 8024164C 46800021 */ cvt.d.w $f0, $f0 -/* DCE320 80241650 46220003 */ div.d $f0, $f0, $f2 -/* DCE324 80241654 46200020 */ cvt.s.d $f0, $f0 -/* DCE328 80241658 E4A00018 */ swc1 $f0, 0x18($a1) -.L8024165C: -/* DCE32C 8024165C 24020001 */ addiu $v0, $zero, 1 -/* DCE330 80241660 AE220070 */ sw $v0, 0x70($s1) -/* DCE334 80241664 8FBF001C */ lw $ra, 0x1c($sp) -/* DCE338 80241668 8FB20018 */ lw $s2, 0x18($sp) -/* DCE33C 8024166C 8FB10014 */ lw $s1, 0x14($sp) -/* DCE340 80241670 8FB00010 */ lw $s0, 0x10($sp) -/* DCE344 80241674 03E00008 */ jr $ra -/* DCE348 80241678 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_802416F0_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_802416F0_DCCCD0.s deleted file mode 100644 index 780b5437b9..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_802416F0_DCCCD0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416F0_DCE3C0 -/* DCE3C0 802416F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DCE3C4 802416F4 AFB00010 */ sw $s0, 0x10($sp) -/* DCE3C8 802416F8 0080802D */ daddu $s0, $a0, $zero -/* DCE3CC 802416FC AFBF0014 */ sw $ra, 0x14($sp) -/* DCE3D0 80241700 8E020148 */ lw $v0, 0x148($s0) -/* DCE3D4 80241704 0C00EABB */ jal get_npc_unsafe -/* DCE3D8 80241708 84440008 */ lh $a0, 8($v0) -/* DCE3DC 8024170C 0040202D */ daddu $a0, $v0, $zero -/* DCE3E0 80241710 C482003C */ lwc1 $f2, 0x3c($a0) -/* DCE3E4 80241714 C480001C */ lwc1 $f0, 0x1c($a0) -/* DCE3E8 80241718 46001080 */ add.s $f2, $f2, $f0 -/* DCE3EC 8024171C C4840014 */ lwc1 $f4, 0x14($a0) -/* DCE3F0 80241720 46040001 */ sub.s $f0, $f0, $f4 -/* DCE3F4 80241724 C4840064 */ lwc1 $f4, 0x64($a0) -/* DCE3F8 80241728 4602203C */ c.lt.s $f4, $f2 -/* DCE3FC 8024172C E482003C */ swc1 $f2, 0x3c($a0) -/* DCE400 80241730 45010009 */ bc1t .L80241758 -/* DCE404 80241734 E480001C */ swc1 $f0, 0x1c($a0) -/* DCE408 80241738 8C820000 */ lw $v0, ($a0) -/* DCE40C 8024173C 2403F7FF */ addiu $v1, $zero, -0x801 -/* DCE410 80241740 E484003C */ swc1 $f4, 0x3c($a0) -/* DCE414 80241744 AC80001C */ sw $zero, 0x1c($a0) -/* DCE418 80241748 00431024 */ and $v0, $v0, $v1 -/* DCE41C 8024174C AC820000 */ sw $v0, ($a0) -/* DCE420 80241750 2402000C */ addiu $v0, $zero, 0xc -/* DCE424 80241754 AE020070 */ sw $v0, 0x70($s0) -.L80241758: -/* DCE428 80241758 8FBF0014 */ lw $ra, 0x14($sp) -/* DCE42C 8024175C 8FB00010 */ lw $s0, 0x10($sp) -/* DCE430 80241760 03E00008 */ jr $ra -/* DCE434 80241764 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_80241898_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_80241898_DCCCD0.s deleted file mode 100644 index 0742549116..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_80241898_DCCCD0.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241898_DCE568 -/* DCE568 80241898 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DCE56C 8024189C AFB3003C */ sw $s3, 0x3c($sp) -/* DCE570 802418A0 0080982D */ daddu $s3, $a0, $zero -/* DCE574 802418A4 AFBF0040 */ sw $ra, 0x40($sp) -/* DCE578 802418A8 AFB20038 */ sw $s2, 0x38($sp) -/* DCE57C 802418AC AFB10034 */ sw $s1, 0x34($sp) -/* DCE580 802418B0 AFB00030 */ sw $s0, 0x30($sp) -/* DCE584 802418B4 8E720148 */ lw $s2, 0x148($s3) -/* DCE588 802418B8 00A0882D */ daddu $s1, $a1, $zero -/* DCE58C 802418BC 86440008 */ lh $a0, 8($s2) -/* DCE590 802418C0 0C00EABB */ jal get_npc_unsafe -/* DCE594 802418C4 00C0802D */ daddu $s0, $a2, $zero -/* DCE598 802418C8 0200202D */ daddu $a0, $s0, $zero -/* DCE59C 802418CC 0240282D */ daddu $a1, $s2, $zero -/* DCE5A0 802418D0 24030001 */ addiu $v1, $zero, 1 -/* DCE5A4 802418D4 AFA30010 */ sw $v1, 0x10($sp) -/* DCE5A8 802418D8 8E260024 */ lw $a2, 0x24($s1) -/* DCE5AC 802418DC 8E270028 */ lw $a3, 0x28($s1) -/* DCE5B0 802418E0 0C01242D */ jal func_800490B4 -/* DCE5B4 802418E4 0040802D */ daddu $s0, $v0, $zero -/* DCE5B8 802418E8 1440001E */ bnez $v0, .L80241964 -/* DCE5BC 802418EC 0200202D */ daddu $a0, $s0, $zero -/* DCE5C0 802418F0 24040002 */ addiu $a0, $zero, 2 -/* DCE5C4 802418F4 0200282D */ daddu $a1, $s0, $zero -/* DCE5C8 802418F8 0000302D */ daddu $a2, $zero, $zero -/* DCE5CC 802418FC 860300A8 */ lh $v1, 0xa8($s0) -/* DCE5D0 80241900 3C013F80 */ lui $at, 0x3f80 -/* DCE5D4 80241904 44810000 */ mtc1 $at, $f0 -/* DCE5D8 80241908 3C014000 */ lui $at, 0x4000 -/* DCE5DC 8024190C 44811000 */ mtc1 $at, $f2 -/* DCE5E0 80241910 3C01C1A0 */ lui $at, 0xc1a0 -/* DCE5E4 80241914 44812000 */ mtc1 $at, $f4 -/* DCE5E8 80241918 2402000F */ addiu $v0, $zero, 0xf -/* DCE5EC 8024191C AFA2001C */ sw $v0, 0x1c($sp) -/* DCE5F0 80241920 44833000 */ mtc1 $v1, $f6 -/* DCE5F4 80241924 00000000 */ nop -/* DCE5F8 80241928 468031A0 */ cvt.s.w $f6, $f6 -/* DCE5FC 8024192C 44073000 */ mfc1 $a3, $f6 -/* DCE600 80241930 27A20028 */ addiu $v0, $sp, 0x28 -/* DCE604 80241934 AFA20020 */ sw $v0, 0x20($sp) -/* DCE608 80241938 E7A00010 */ swc1 $f0, 0x10($sp) -/* DCE60C 8024193C E7A20014 */ swc1 $f2, 0x14($sp) -/* DCE610 80241940 0C01BFA4 */ jal fx_emote -/* DCE614 80241944 E7A40018 */ swc1 $f4, 0x18($sp) -/* DCE618 80241948 8E4200CC */ lw $v0, 0xcc($s2) -/* DCE61C 8024194C 8C430000 */ lw $v1, ($v0) -/* DCE620 80241950 24020019 */ addiu $v0, $zero, 0x19 -/* DCE624 80241954 A602008E */ sh $v0, 0x8e($s0) -/* DCE628 80241958 2402000E */ addiu $v0, $zero, 0xe -/* DCE62C 8024195C 08090666 */ j .L80241998 -/* DCE630 80241960 AE030028 */ sw $v1, 0x28($s0) -.L80241964: -/* DCE634 80241964 0C00F598 */ jal func_8003D660 -/* DCE638 80241968 24050001 */ addiu $a1, $zero, 1 -/* DCE63C 8024196C 8E050018 */ lw $a1, 0x18($s0) -/* DCE640 80241970 8E06000C */ lw $a2, 0xc($s0) -/* DCE644 80241974 0C00EA95 */ jal npc_move_heading -/* DCE648 80241978 0200202D */ daddu $a0, $s0, $zero -/* DCE64C 8024197C 8602008E */ lh $v0, 0x8e($s0) -/* DCE650 80241980 9603008E */ lhu $v1, 0x8e($s0) -/* DCE654 80241984 18400003 */ blez $v0, .L80241994 -/* DCE658 80241988 2462FFFF */ addiu $v0, $v1, -1 -/* DCE65C 8024198C 08090667 */ j .L8024199C -/* DCE660 80241990 A602008E */ sh $v0, 0x8e($s0) -.L80241994: -/* DCE664 80241994 2402000C */ addiu $v0, $zero, 0xc -.L80241998: -/* DCE668 80241998 AE620070 */ sw $v0, 0x70($s3) -.L8024199C: -/* DCE66C 8024199C 8FBF0040 */ lw $ra, 0x40($sp) -/* DCE670 802419A0 8FB3003C */ lw $s3, 0x3c($sp) -/* DCE674 802419A4 8FB20038 */ lw $s2, 0x38($sp) -/* DCE678 802419A8 8FB10034 */ lw $s1, 0x34($sp) -/* DCE67C 802419AC 8FB00030 */ lw $s0, 0x30($sp) -/* DCE680 802419B0 03E00008 */ jr $ra -/* DCE684 802419B4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_80241AE0_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_80241AE0_DCCCD0.s deleted file mode 100644 index 2ca6d935d5..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_80241AE0_DCCCD0.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AE0_DCE7B0 -/* DCE7B0 80241AE0 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DCE7B4 80241AE4 AFB40058 */ sw $s4, 0x58($sp) -/* DCE7B8 80241AE8 0080A02D */ daddu $s4, $a0, $zero -/* DCE7BC 80241AEC AFBF0060 */ sw $ra, 0x60($sp) -/* DCE7C0 80241AF0 AFB5005C */ sw $s5, 0x5c($sp) -/* DCE7C4 80241AF4 AFB30054 */ sw $s3, 0x54($sp) -/* DCE7C8 80241AF8 AFB20050 */ sw $s2, 0x50($sp) -/* DCE7CC 80241AFC AFB1004C */ sw $s1, 0x4c($sp) -/* DCE7D0 80241B00 AFB00048 */ sw $s0, 0x48($sp) -/* DCE7D4 80241B04 8E910148 */ lw $s1, 0x148($s4) -/* DCE7D8 80241B08 86240008 */ lh $a0, 8($s1) -/* DCE7DC 80241B0C 0C00EABB */ jal get_npc_unsafe -/* DCE7E0 80241B10 00A0802D */ daddu $s0, $a1, $zero -/* DCE7E4 80241B14 8E83000C */ lw $v1, 0xc($s4) -/* DCE7E8 80241B18 0280202D */ daddu $a0, $s4, $zero -/* DCE7EC 80241B1C 8C650000 */ lw $a1, ($v1) -/* DCE7F0 80241B20 0C0B1EAF */ jal get_variable -/* DCE7F4 80241B24 0040902D */ daddu $s2, $v0, $zero -/* DCE7F8 80241B28 AFA00018 */ sw $zero, 0x18($sp) -/* DCE7FC 80241B2C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCE800 80241B30 8C630094 */ lw $v1, 0x94($v1) -/* DCE804 80241B34 AFA3001C */ sw $v1, 0x1c($sp) -/* DCE808 80241B38 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCE80C 80241B3C 8C630080 */ lw $v1, 0x80($v1) -/* DCE810 80241B40 AFA30020 */ sw $v1, 0x20($sp) -/* DCE814 80241B44 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCE818 80241B48 8C630088 */ lw $v1, 0x88($v1) -/* DCE81C 80241B4C AFA30024 */ sw $v1, 0x24($sp) -/* DCE820 80241B50 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCE824 80241B54 8C63008C */ lw $v1, 0x8c($v1) -/* DCE828 80241B58 27B50018 */ addiu $s5, $sp, 0x18 -/* DCE82C 80241B5C AFA30028 */ sw $v1, 0x28($sp) -/* DCE830 80241B60 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCE834 80241B64 3C014282 */ lui $at, 0x4282 -/* DCE838 80241B68 44810000 */ mtc1 $at, $f0 -/* DCE83C 80241B6C 8C630090 */ lw $v1, 0x90($v1) -/* DCE840 80241B70 0040982D */ daddu $s3, $v0, $zero -/* DCE844 80241B74 E7A00030 */ swc1 $f0, 0x30($sp) -/* DCE848 80241B78 A7A00034 */ sh $zero, 0x34($sp) -/* DCE84C 80241B7C 16000005 */ bnez $s0, .L80241B94 -/* DCE850 80241B80 AFA3002C */ sw $v1, 0x2c($sp) -/* DCE854 80241B84 8E2200B0 */ lw $v0, 0xb0($s1) -/* DCE858 80241B88 30420004 */ andi $v0, $v0, 4 -/* DCE85C 80241B8C 10400044 */ beqz $v0, .L80241CA0 -/* DCE860 80241B90 00000000 */ nop -.L80241B94: -/* DCE864 80241B94 2404F7FF */ addiu $a0, $zero, -0x801 -/* DCE868 80241B98 AE800070 */ sw $zero, 0x70($s4) -/* DCE86C 80241B9C A640008E */ sh $zero, 0x8e($s2) -/* DCE870 80241BA0 8E2200CC */ lw $v0, 0xcc($s1) -/* DCE874 80241BA4 8E430000 */ lw $v1, ($s2) -/* DCE878 80241BA8 8C420000 */ lw $v0, ($v0) -/* DCE87C 80241BAC 00641824 */ and $v1, $v1, $a0 -/* DCE880 80241BB0 AE430000 */ sw $v1, ($s2) -/* DCE884 80241BB4 AE420028 */ sw $v0, 0x28($s2) -/* DCE888 80241BB8 8E2200D0 */ lw $v0, 0xd0($s1) -/* DCE88C 80241BBC 8C420098 */ lw $v0, 0x98($v0) -/* DCE890 80241BC0 54400005 */ bnel $v0, $zero, .L80241BD8 -/* DCE894 80241BC4 2402FDFF */ addiu $v0, $zero, -0x201 -/* DCE898 80241BC8 34620200 */ ori $v0, $v1, 0x200 -/* DCE89C 80241BCC 2403FFF7 */ addiu $v1, $zero, -9 -/* DCE8A0 80241BD0 080906F8 */ j .L80241BE0 -/* DCE8A4 80241BD4 00431024 */ and $v0, $v0, $v1 -.L80241BD8: -/* DCE8A8 80241BD8 00621024 */ and $v0, $v1, $v0 -/* DCE8AC 80241BDC 34420008 */ ori $v0, $v0, 8 -.L80241BE0: -/* DCE8B0 80241BE0 AE420000 */ sw $v0, ($s2) -/* DCE8B4 80241BE4 8E2200B0 */ lw $v0, 0xb0($s1) -/* DCE8B8 80241BE8 30420004 */ andi $v0, $v0, 4 -/* DCE8BC 80241BEC 10400008 */ beqz $v0, .L80241C10 -/* DCE8C0 80241BF0 24020063 */ addiu $v0, $zero, 0x63 -/* DCE8C4 80241BF4 AE820070 */ sw $v0, 0x70($s4) -/* DCE8C8 80241BF8 AE800074 */ sw $zero, 0x74($s4) -/* DCE8CC 80241BFC 8E2200B0 */ lw $v0, 0xb0($s1) -/* DCE8D0 80241C00 2403FFFB */ addiu $v1, $zero, -5 -/* DCE8D4 80241C04 00431024 */ and $v0, $v0, $v1 -/* DCE8D8 80241C08 0809070F */ j .L80241C3C -/* DCE8DC 80241C0C AE2200B0 */ sw $v0, 0xb0($s1) -.L80241C10: -/* DCE8E0 80241C10 8E220000 */ lw $v0, ($s1) -/* DCE8E4 80241C14 3C034000 */ lui $v1, 0x4000 -/* DCE8E8 80241C18 00431024 */ and $v0, $v0, $v1 -/* DCE8EC 80241C1C 10400007 */ beqz $v0, .L80241C3C -/* DCE8F0 80241C20 3C03BFFF */ lui $v1, 0xbfff -/* DCE8F4 80241C24 2402000C */ addiu $v0, $zero, 0xc -/* DCE8F8 80241C28 AE820070 */ sw $v0, 0x70($s4) -/* DCE8FC 80241C2C 8E220000 */ lw $v0, ($s1) -/* DCE900 80241C30 3463FFFF */ ori $v1, $v1, 0xffff -/* DCE904 80241C34 00431024 */ and $v0, $v0, $v1 -/* DCE908 80241C38 AE220000 */ sw $v0, ($s1) -.L80241C3C: -/* DCE90C 80241C3C 27A50038 */ addiu $a1, $sp, 0x38 -/* DCE910 80241C40 27A6003C */ addiu $a2, $sp, 0x3c -/* DCE914 80241C44 C6400038 */ lwc1 $f0, 0x38($s2) -/* DCE918 80241C48 864200A8 */ lh $v0, 0xa8($s2) -/* DCE91C 80241C4C 3C0142C8 */ lui $at, 0x42c8 -/* DCE920 80241C50 44812000 */ mtc1 $at, $f4 -/* DCE924 80241C54 44823000 */ mtc1 $v0, $f6 -/* DCE928 80241C58 00000000 */ nop -/* DCE92C 80241C5C 468031A0 */ cvt.s.w $f6, $f6 -/* DCE930 80241C60 27A20044 */ addiu $v0, $sp, 0x44 -/* DCE934 80241C64 E7A00038 */ swc1 $f0, 0x38($sp) -/* DCE938 80241C68 C640003C */ lwc1 $f0, 0x3c($s2) -/* DCE93C 80241C6C C6420040 */ lwc1 $f2, 0x40($s2) -/* DCE940 80241C70 46060000 */ add.s $f0, $f0, $f6 -/* DCE944 80241C74 E7A40044 */ swc1 $f4, 0x44($sp) -/* DCE948 80241C78 E7A20040 */ swc1 $f2, 0x40($sp) -/* DCE94C 80241C7C E7A0003C */ swc1 $f0, 0x3c($sp) -/* DCE950 80241C80 AFA20010 */ sw $v0, 0x10($sp) -/* DCE954 80241C84 8E440080 */ lw $a0, 0x80($s2) -/* DCE958 80241C88 0C0372DF */ jal func_800DCB7C -/* DCE95C 80241C8C 27A70040 */ addiu $a3, $sp, 0x40 -/* DCE960 80241C90 10400003 */ beqz $v0, .L80241CA0 -/* DCE964 80241C94 00000000 */ nop -/* DCE968 80241C98 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DCE96C 80241C9C E640003C */ swc1 $f0, 0x3c($s2) -.L80241CA0: -/* DCE970 80241CA0 8E830070 */ lw $v1, 0x70($s4) -/* DCE974 80241CA4 2C620064 */ sltiu $v0, $v1, 0x64 -/* DCE978 80241CA8 10400042 */ beqz $v0, .L80241DB4 -/* DCE97C 80241CAC 00031080 */ sll $v0, $v1, 2 -/* DCE980 80241CB0 3C018025 */ lui $at, 0x8025 -/* DCE984 80241CB4 00220821 */ addu $at, $at, $v0 -/* DCE988 80241CB8 8C22A7E0 */ lw $v0, -0x5820($at) -/* DCE98C 80241CBC 00400008 */ jr $v0 -/* DCE990 80241CC0 00000000 */ nop -/* DCE994 80241CC4 0280202D */ daddu $a0, $s4, $zero -/* DCE998 80241CC8 0260282D */ daddu $a1, $s3, $zero -/* DCE99C 80241CCC 0C0903D3 */ jal func_80240F4C -/* DCE9A0 80241CD0 02A0302D */ daddu $a2, $s5, $zero -/* DCE9A4 80241CD4 0280202D */ daddu $a0, $s4, $zero -/* DCE9A8 80241CD8 0260282D */ daddu $a1, $s3, $zero -/* DCE9AC 80241CDC 0C090429 */ jal func_802410A4 -/* DCE9B0 80241CE0 02A0302D */ daddu $a2, $s5, $zero -/* DCE9B4 80241CE4 0809076D */ j .L80241DB4 -/* DCE9B8 80241CE8 00000000 */ nop -/* DCE9BC 80241CEC 0280202D */ daddu $a0, $s4, $zero -/* DCE9C0 80241CF0 0260282D */ daddu $a1, $s3, $zero -/* DCE9C4 80241CF4 0C0904D3 */ jal func_8024134C -/* DCE9C8 80241CF8 02A0302D */ daddu $a2, $s5, $zero -/* DCE9CC 80241CFC 0280202D */ daddu $a0, $s4, $zero -/* DCE9D0 80241D00 0260282D */ daddu $a1, $s3, $zero -/* DCE9D4 80241D04 0C090503 */ jal func_8024140C -/* DCE9D8 80241D08 02A0302D */ daddu $a2, $s5, $zero -/* DCE9DC 80241D0C 0809076D */ j .L80241DB4 -/* DCE9E0 80241D10 00000000 */ nop -/* DCE9E4 80241D14 0280202D */ daddu $a0, $s4, $zero -/* DCE9E8 80241D18 0260282D */ daddu $a1, $s3, $zero -/* DCE9EC 80241D1C 0C090572 */ jal func_802415C8 -/* DCE9F0 80241D20 02A0302D */ daddu $a2, $s5, $zero -/* DCE9F4 80241D24 0809076D */ j .L80241DB4 -/* DCE9F8 80241D28 00000000 */ nop -/* DCE9FC 80241D2C 0280202D */ daddu $a0, $s4, $zero -/* DCEA00 80241D30 0260282D */ daddu $a1, $s3, $zero -/* DCEA04 80241D34 0C09059F */ jal func_8024167C -/* DCEA08 80241D38 02A0302D */ daddu $a2, $s5, $zero -/* DCEA0C 80241D3C 0280202D */ daddu $a0, $s4, $zero -/* DCEA10 80241D40 0260282D */ daddu $a1, $s3, $zero -/* DCEA14 80241D44 0C0905BC */ jal func_802416F0 -/* DCEA18 80241D48 02A0302D */ daddu $a2, $s5, $zero -/* DCEA1C 80241D4C 0809076D */ j .L80241DB4 -/* DCEA20 80241D50 00000000 */ nop -/* DCEA24 80241D54 0280202D */ daddu $a0, $s4, $zero -/* DCEA28 80241D58 0260282D */ daddu $a1, $s3, $zero -/* DCEA2C 80241D5C 0C0905DA */ jal func_80241768 -/* DCEA30 80241D60 02A0302D */ daddu $a2, $s5, $zero -/* DCEA34 80241D64 0280202D */ daddu $a0, $s4, $zero -/* DCEA38 80241D68 0260282D */ daddu $a1, $s3, $zero -/* DCEA3C 80241D6C 0C090626 */ jal func_80241898 -/* DCEA40 80241D70 02A0302D */ daddu $a2, $s5, $zero -/* DCEA44 80241D74 0809076D */ j .L80241DB4 -/* DCEA48 80241D78 00000000 */ nop -/* DCEA4C 80241D7C 0280202D */ daddu $a0, $s4, $zero -/* DCEA50 80241D80 0260282D */ daddu $a1, $s3, $zero -/* DCEA54 80241D84 0C09066E */ jal func_802419B8 -/* DCEA58 80241D88 02A0302D */ daddu $a2, $s5, $zero -/* DCEA5C 80241D8C 0809076D */ j .L80241DB4 -/* DCEA60 80241D90 00000000 */ nop -/* DCEA64 80241D94 0280202D */ daddu $a0, $s4, $zero -/* DCEA68 80241D98 0260282D */ daddu $a1, $s3, $zero -/* DCEA6C 80241D9C 0C090688 */ jal func_80241A20 -/* DCEA70 80241DA0 02A0302D */ daddu $a2, $s5, $zero -/* DCEA74 80241DA4 0809076D */ j .L80241DB4 -/* DCEA78 80241DA8 00000000 */ nop -/* DCEA7C 80241DAC 0C0129CF */ jal func_8004A73C -/* DCEA80 80241DB0 0280202D */ daddu $a0, $s4, $zero -.L80241DB4: -/* DCEA84 80241DB4 8FBF0060 */ lw $ra, 0x60($sp) -/* DCEA88 80241DB8 8FB5005C */ lw $s5, 0x5c($sp) -/* DCEA8C 80241DBC 8FB40058 */ lw $s4, 0x58($sp) -/* DCEA90 80241DC0 8FB30054 */ lw $s3, 0x54($sp) -/* DCEA94 80241DC4 8FB20050 */ lw $s2, 0x50($sp) -/* DCEA98 80241DC8 8FB1004C */ lw $s1, 0x4c($sp) -/* DCEA9C 80241DCC 8FB00048 */ lw $s0, 0x48($sp) -/* DCEAA0 80241DD0 0000102D */ daddu $v0, $zero, $zero -/* DCEAA4 80241DD4 03E00008 */ jr $ra -/* DCEAA8 80241DD8 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_80241FB4_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_80241FB4_DCCCD0.s deleted file mode 100644 index fdd8226889..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_80241FB4_DCCCD0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FB4_DCEC84 -/* DCEC84 80241FB4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCEC88 80241FB8 AFB10014 */ sw $s1, 0x14($sp) -/* DCEC8C 80241FBC 0080882D */ daddu $s1, $a0, $zero -/* DCEC90 80241FC0 AFBF0018 */ sw $ra, 0x18($sp) -/* DCEC94 80241FC4 AFB00010 */ sw $s0, 0x10($sp) -/* DCEC98 80241FC8 8E300148 */ lw $s0, 0x148($s1) -/* DCEC9C 80241FCC 0C00EABB */ jal get_npc_unsafe -/* DCECA0 80241FD0 86040008 */ lh $a0, 8($s0) -/* DCECA4 80241FD4 0040182D */ daddu $v1, $v0, $zero -/* DCECA8 80241FD8 9462008E */ lhu $v0, 0x8e($v1) -/* DCECAC 80241FDC 2442FFFF */ addiu $v0, $v0, -1 -/* DCECB0 80241FE0 A462008E */ sh $v0, 0x8e($v1) -/* DCECB4 80241FE4 00021400 */ sll $v0, $v0, 0x10 -/* DCECB8 80241FE8 14400005 */ bnez $v0, .L80242000 -/* DCECBC 80241FEC 00000000 */ nop -/* DCECC0 80241FF0 8E0200CC */ lw $v0, 0xcc($s0) -/* DCECC4 80241FF4 8C420000 */ lw $v0, ($v0) -/* DCECC8 80241FF8 AC620028 */ sw $v0, 0x28($v1) -/* DCECCC 80241FFC AE200070 */ sw $zero, 0x70($s1) -.L80242000: -/* DCECD0 80242000 8FBF0018 */ lw $ra, 0x18($sp) -/* DCECD4 80242004 8FB10014 */ lw $s1, 0x14($sp) -/* DCECD8 80242008 8FB00010 */ lw $s0, 0x10($sp) -/* DCECDC 8024200C 03E00008 */ jr $ra -/* DCECE0 80242010 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_80242014_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_80242014_DCCCD0.s deleted file mode 100644 index 494aca8e34..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_80242014_DCCCD0.s +++ /dev/null @@ -1,220 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242014_DCECE4 -/* DCECE4 80242014 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DCECE8 80242018 AFB30054 */ sw $s3, 0x54($sp) -/* DCECEC 8024201C 0080982D */ daddu $s3, $a0, $zero -/* DCECF0 80242020 AFBF0060 */ sw $ra, 0x60($sp) -/* DCECF4 80242024 AFB5005C */ sw $s5, 0x5c($sp) -/* DCECF8 80242028 AFB40058 */ sw $s4, 0x58($sp) -/* DCECFC 8024202C AFB20050 */ sw $s2, 0x50($sp) -/* DCED00 80242030 AFB1004C */ sw $s1, 0x4c($sp) -/* DCED04 80242034 AFB00048 */ sw $s0, 0x48($sp) -/* DCED08 80242038 8E710148 */ lw $s1, 0x148($s3) -/* DCED0C 8024203C 86240008 */ lh $a0, 8($s1) -/* DCED10 80242040 0C00EABB */ jal get_npc_unsafe -/* DCED14 80242044 00A0802D */ daddu $s0, $a1, $zero -/* DCED18 80242048 8E63000C */ lw $v1, 0xc($s3) -/* DCED1C 8024204C 0260202D */ daddu $a0, $s3, $zero -/* DCED20 80242050 8C650000 */ lw $a1, ($v1) -/* DCED24 80242054 0C0B1EAF */ jal get_variable -/* DCED28 80242058 0040902D */ daddu $s2, $v0, $zero -/* DCED2C 8024205C AFA00018 */ sw $zero, 0x18($sp) -/* DCED30 80242060 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCED34 80242064 8C630094 */ lw $v1, 0x94($v1) -/* DCED38 80242068 AFA3001C */ sw $v1, 0x1c($sp) -/* DCED3C 8024206C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCED40 80242070 8C630080 */ lw $v1, 0x80($v1) -/* DCED44 80242074 AFA30020 */ sw $v1, 0x20($sp) -/* DCED48 80242078 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCED4C 8024207C 8C630088 */ lw $v1, 0x88($v1) -/* DCED50 80242080 AFA30024 */ sw $v1, 0x24($sp) -/* DCED54 80242084 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCED58 80242088 8C63008C */ lw $v1, 0x8c($v1) -/* DCED5C 8024208C 27B50018 */ addiu $s5, $sp, 0x18 -/* DCED60 80242090 AFA30028 */ sw $v1, 0x28($sp) -/* DCED64 80242094 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCED68 80242098 3C014282 */ lui $at, 0x4282 -/* DCED6C 8024209C 44810000 */ mtc1 $at, $f0 -/* DCED70 802420A0 8C630090 */ lw $v1, 0x90($v1) -/* DCED74 802420A4 0040A02D */ daddu $s4, $v0, $zero -/* DCED78 802420A8 E7A00030 */ swc1 $f0, 0x30($sp) -/* DCED7C 802420AC A7A00034 */ sh $zero, 0x34($sp) -/* DCED80 802420B0 16000005 */ bnez $s0, .L802420C8 -/* DCED84 802420B4 AFA3002C */ sw $v1, 0x2c($sp) -/* DCED88 802420B8 8E2200B0 */ lw $v0, 0xb0($s1) -/* DCED8C 802420BC 30420004 */ andi $v0, $v0, 4 -/* DCED90 802420C0 10400044 */ beqz $v0, .L802421D4 -/* DCED94 802420C4 00000000 */ nop -.L802420C8: -/* DCED98 802420C8 2404F7FF */ addiu $a0, $zero, -0x801 -/* DCED9C 802420CC AE600070 */ sw $zero, 0x70($s3) -/* DCEDA0 802420D0 A640008E */ sh $zero, 0x8e($s2) -/* DCEDA4 802420D4 8E2200CC */ lw $v0, 0xcc($s1) -/* DCEDA8 802420D8 8E430000 */ lw $v1, ($s2) -/* DCEDAC 802420DC 8C420000 */ lw $v0, ($v0) -/* DCEDB0 802420E0 00641824 */ and $v1, $v1, $a0 -/* DCEDB4 802420E4 AE430000 */ sw $v1, ($s2) -/* DCEDB8 802420E8 AE420028 */ sw $v0, 0x28($s2) -/* DCEDBC 802420EC 8E2200D0 */ lw $v0, 0xd0($s1) -/* DCEDC0 802420F0 8C420098 */ lw $v0, 0x98($v0) -/* DCEDC4 802420F4 54400005 */ bnel $v0, $zero, .L8024210C -/* DCEDC8 802420F8 2402FDFF */ addiu $v0, $zero, -0x201 -/* DCEDCC 802420FC 34620200 */ ori $v0, $v1, 0x200 -/* DCEDD0 80242100 2403FFF7 */ addiu $v1, $zero, -9 -/* DCEDD4 80242104 08090845 */ j .L80242114 -/* DCEDD8 80242108 00431024 */ and $v0, $v0, $v1 -.L8024210C: -/* DCEDDC 8024210C 00621024 */ and $v0, $v1, $v0 -/* DCEDE0 80242110 34420008 */ ori $v0, $v0, 8 -.L80242114: -/* DCEDE4 80242114 AE420000 */ sw $v0, ($s2) -/* DCEDE8 80242118 8E2200B0 */ lw $v0, 0xb0($s1) -/* DCEDEC 8024211C 30420004 */ andi $v0, $v0, 4 -/* DCEDF0 80242120 10400008 */ beqz $v0, .L80242144 -/* DCEDF4 80242124 24020063 */ addiu $v0, $zero, 0x63 -/* DCEDF8 80242128 AE620070 */ sw $v0, 0x70($s3) -/* DCEDFC 8024212C AE600074 */ sw $zero, 0x74($s3) -/* DCEE00 80242130 8E2200B0 */ lw $v0, 0xb0($s1) -/* DCEE04 80242134 2403FFFB */ addiu $v1, $zero, -5 -/* DCEE08 80242138 00431024 */ and $v0, $v0, $v1 -/* DCEE0C 8024213C 0809085C */ j .L80242170 -/* DCEE10 80242140 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242144: -/* DCEE14 80242144 8E220000 */ lw $v0, ($s1) -/* DCEE18 80242148 3C034000 */ lui $v1, 0x4000 -/* DCEE1C 8024214C 00431024 */ and $v0, $v0, $v1 -/* DCEE20 80242150 10400007 */ beqz $v0, .L80242170 -/* DCEE24 80242154 3C03BFFF */ lui $v1, 0xbfff -/* DCEE28 80242158 2402000C */ addiu $v0, $zero, 0xc -/* DCEE2C 8024215C AE620070 */ sw $v0, 0x70($s3) -/* DCEE30 80242160 8E220000 */ lw $v0, ($s1) -/* DCEE34 80242164 3463FFFF */ ori $v1, $v1, 0xffff -/* DCEE38 80242168 00431024 */ and $v0, $v0, $v1 -/* DCEE3C 8024216C AE220000 */ sw $v0, ($s1) -.L80242170: -/* DCEE40 80242170 27A50038 */ addiu $a1, $sp, 0x38 -/* DCEE44 80242174 27A6003C */ addiu $a2, $sp, 0x3c -/* DCEE48 80242178 C6400038 */ lwc1 $f0, 0x38($s2) -/* DCEE4C 8024217C 864200A8 */ lh $v0, 0xa8($s2) -/* DCEE50 80242180 3C0142C8 */ lui $at, 0x42c8 -/* DCEE54 80242184 44812000 */ mtc1 $at, $f4 -/* DCEE58 80242188 44823000 */ mtc1 $v0, $f6 -/* DCEE5C 8024218C 00000000 */ nop -/* DCEE60 80242190 468031A0 */ cvt.s.w $f6, $f6 -/* DCEE64 80242194 27A20044 */ addiu $v0, $sp, 0x44 -/* DCEE68 80242198 E7A00038 */ swc1 $f0, 0x38($sp) -/* DCEE6C 8024219C C640003C */ lwc1 $f0, 0x3c($s2) -/* DCEE70 802421A0 C6420040 */ lwc1 $f2, 0x40($s2) -/* DCEE74 802421A4 46060000 */ add.s $f0, $f0, $f6 -/* DCEE78 802421A8 E7A40044 */ swc1 $f4, 0x44($sp) -/* DCEE7C 802421AC E7A20040 */ swc1 $f2, 0x40($sp) -/* DCEE80 802421B0 E7A0003C */ swc1 $f0, 0x3c($sp) -/* DCEE84 802421B4 AFA20010 */ sw $v0, 0x10($sp) -/* DCEE88 802421B8 8E440080 */ lw $a0, 0x80($s2) -/* DCEE8C 802421BC 0C0372DF */ jal func_800DCB7C -/* DCEE90 802421C0 27A70040 */ addiu $a3, $sp, 0x40 -/* DCEE94 802421C4 10400003 */ beqz $v0, .L802421D4 -/* DCEE98 802421C8 00000000 */ nop -/* DCEE9C 802421CC C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DCEEA0 802421D0 E640003C */ swc1 $f0, 0x3c($s2) -.L802421D4: -/* DCEEA4 802421D4 8E630070 */ lw $v1, 0x70($s3) -/* DCEEA8 802421D8 2C620064 */ sltiu $v0, $v1, 0x64 -/* DCEEAC 802421DC 10400054 */ beqz $v0, .L80242330 -/* DCEEB0 802421E0 00031080 */ sll $v0, $v1, 2 -/* DCEEB4 802421E4 3C018025 */ lui $at, 0x8025 -/* DCEEB8 802421E8 00220821 */ addu $at, $at, $v0 -/* DCEEBC 802421EC 8C22A980 */ lw $v0, -0x5680($at) -/* DCEEC0 802421F0 00400008 */ jr $v0 -/* DCEEC4 802421F4 00000000 */ nop -/* DCEEC8 802421F8 0260202D */ daddu $a0, $s3, $zero -/* DCEECC 802421FC 0280282D */ daddu $a1, $s4, $zero -/* DCEED0 80242200 0C0903D3 */ jal func_80240F4C -/* DCEED4 80242204 02A0302D */ daddu $a2, $s5, $zero -/* DCEED8 80242208 0260202D */ daddu $a0, $s3, $zero -/* DCEEDC 8024220C 0280282D */ daddu $a1, $s4, $zero -/* DCEEE0 80242210 0C090429 */ jal func_802410A4 -/* DCEEE4 80242214 02A0302D */ daddu $a2, $s5, $zero -/* DCEEE8 80242218 080908CC */ j .L80242330 -/* DCEEEC 8024221C 00000000 */ nop -/* DCEEF0 80242220 0260202D */ daddu $a0, $s3, $zero -/* DCEEF4 80242224 0280282D */ daddu $a1, $s4, $zero -/* DCEEF8 80242228 0C0904D3 */ jal func_8024134C -/* DCEEFC 8024222C 02A0302D */ daddu $a2, $s5, $zero -/* DCEF00 80242230 0260202D */ daddu $a0, $s3, $zero -/* DCEF04 80242234 0280282D */ daddu $a1, $s4, $zero -/* DCEF08 80242238 0C090503 */ jal func_8024140C -/* DCEF0C 8024223C 02A0302D */ daddu $a2, $s5, $zero -/* DCEF10 80242240 080908CC */ j .L80242330 -/* DCEF14 80242244 00000000 */ nop -/* DCEF18 80242248 0260202D */ daddu $a0, $s3, $zero -/* DCEF1C 8024224C 0280282D */ daddu $a1, $s4, $zero -/* DCEF20 80242250 0C090572 */ jal func_802415C8 -/* DCEF24 80242254 02A0302D */ daddu $a2, $s5, $zero -/* DCEF28 80242258 080908CC */ j .L80242330 -/* DCEF2C 8024225C 00000000 */ nop -/* DCEF30 80242260 0260202D */ daddu $a0, $s3, $zero -/* DCEF34 80242264 0280282D */ daddu $a1, $s4, $zero -/* DCEF38 80242268 0C09059F */ jal func_8024167C -/* DCEF3C 8024226C 02A0302D */ daddu $a2, $s5, $zero -/* DCEF40 80242270 0260202D */ daddu $a0, $s3, $zero -/* DCEF44 80242274 0280282D */ daddu $a1, $s4, $zero -/* DCEF48 80242278 0C0905BC */ jal func_802416F0 -/* DCEF4C 8024227C 02A0302D */ daddu $a2, $s5, $zero -/* DCEF50 80242280 080908CC */ j .L80242330 -/* DCEF54 80242284 00000000 */ nop -/* DCEF58 80242288 0260202D */ daddu $a0, $s3, $zero -/* DCEF5C 8024228C 0280282D */ daddu $a1, $s4, $zero -/* DCEF60 80242290 0C0905DA */ jal func_80241768 -/* DCEF64 80242294 02A0302D */ daddu $a2, $s5, $zero -/* DCEF68 80242298 0260202D */ daddu $a0, $s3, $zero -/* DCEF6C 8024229C 0280282D */ daddu $a1, $s4, $zero -/* DCEF70 802422A0 0C090626 */ jal func_80241898 -/* DCEF74 802422A4 02A0302D */ daddu $a2, $s5, $zero -/* DCEF78 802422A8 080908CC */ j .L80242330 -/* DCEF7C 802422AC 00000000 */ nop -/* DCEF80 802422B0 0260202D */ daddu $a0, $s3, $zero -/* DCEF84 802422B4 0280282D */ daddu $a1, $s4, $zero -/* DCEF88 802422B8 0C090777 */ jal func_80241DDC -/* DCEF8C 802422BC 02A0302D */ daddu $a2, $s5, $zero -/* DCEF90 802422C0 8E630070 */ lw $v1, 0x70($s3) -/* DCEF94 802422C4 2402000F */ addiu $v0, $zero, 0xf -/* DCEF98 802422C8 14620019 */ bne $v1, $v0, .L80242330 -/* DCEF9C 802422CC 00000000 */ nop -/* DCEFA0 802422D0 0260202D */ daddu $a0, $s3, $zero -/* DCEFA4 802422D4 0280282D */ daddu $a1, $s4, $zero -/* DCEFA8 802422D8 0C090793 */ jal func_80241E4C -/* DCEFAC 802422DC 02A0302D */ daddu $a2, $s5, $zero -/* DCEFB0 802422E0 8E630070 */ lw $v1, 0x70($s3) -/* DCEFB4 802422E4 24020010 */ addiu $v0, $zero, 0x10 -/* DCEFB8 802422E8 14620011 */ bne $v1, $v0, .L80242330 -/* DCEFBC 802422EC 00000000 */ nop -/* DCEFC0 802422F0 0260202D */ daddu $a0, $s3, $zero -/* DCEFC4 802422F4 0280282D */ daddu $a1, $s4, $zero -/* DCEFC8 802422F8 0C0907C7 */ jal func_80241F1C -/* DCEFCC 802422FC 02A0302D */ daddu $a2, $s5, $zero -/* DCEFD0 80242300 8E630070 */ lw $v1, 0x70($s3) -/* DCEFD4 80242304 24020011 */ addiu $v0, $zero, 0x11 -/* DCEFD8 80242308 14620009 */ bne $v1, $v0, .L80242330 -/* DCEFDC 8024230C 00000000 */ nop -/* DCEFE0 80242310 0260202D */ daddu $a0, $s3, $zero -/* DCEFE4 80242314 0280282D */ daddu $a1, $s4, $zero -/* DCEFE8 80242318 0C0907ED */ jal func_80241FB4 -/* DCEFEC 8024231C 02A0302D */ daddu $a2, $s5, $zero -/* DCEFF0 80242320 080908CC */ j .L80242330 -/* DCEFF4 80242324 00000000 */ nop -/* DCEFF8 80242328 0C0129CF */ jal func_8004A73C -/* DCEFFC 8024232C 0260202D */ daddu $a0, $s3, $zero -.L80242330: -/* DCF000 80242330 8FBF0060 */ lw $ra, 0x60($sp) -/* DCF004 80242334 8FB5005C */ lw $s5, 0x5c($sp) -/* DCF008 80242338 8FB40058 */ lw $s4, 0x58($sp) -/* DCF00C 8024233C 8FB30054 */ lw $s3, 0x54($sp) -/* DCF010 80242340 8FB20050 */ lw $s2, 0x50($sp) -/* DCF014 80242344 8FB1004C */ lw $s1, 0x4c($sp) -/* DCF018 80242348 8FB00048 */ lw $s0, 0x48($sp) -/* DCF01C 8024234C 0000102D */ daddu $v0, $zero, $zero -/* DCF020 80242350 03E00008 */ jr $ra -/* DCF024 80242354 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_8024268C_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_8024268C_DCCCD0.s deleted file mode 100644 index 5017ca7072..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_8024268C_DCCCD0.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024268C_DCF35C -/* DCF35C 8024268C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DCF360 80242690 AFB20038 */ sw $s2, 0x38($sp) -/* DCF364 80242694 0080902D */ daddu $s2, $a0, $zero -/* DCF368 80242698 AFBF003C */ sw $ra, 0x3c($sp) -/* DCF36C 8024269C AFB10034 */ sw $s1, 0x34($sp) -/* DCF370 802426A0 AFB00030 */ sw $s0, 0x30($sp) -/* DCF374 802426A4 8E510148 */ lw $s1, 0x148($s2) -/* DCF378 802426A8 0C00EABB */ jal get_npc_unsafe -/* DCF37C 802426AC 86240008 */ lh $a0, 8($s1) -/* DCF380 802426B0 0040802D */ daddu $s0, $v0, $zero -/* DCF384 802426B4 9602008E */ lhu $v0, 0x8e($s0) -/* DCF388 802426B8 2442FFFF */ addiu $v0, $v0, -1 -/* DCF38C 802426BC A602008E */ sh $v0, 0x8e($s0) -/* DCF390 802426C0 00021400 */ sll $v0, $v0, 0x10 -/* DCF394 802426C4 1C40002B */ bgtz $v0, .L80242774 -/* DCF398 802426C8 00000000 */ nop -/* DCF39C 802426CC 0C0908D6 */ jal func_80242358 -/* DCF3A0 802426D0 0240202D */ daddu $a0, $s2, $zero -/* DCF3A4 802426D4 0040202D */ daddu $a0, $v0, $zero -/* DCF3A8 802426D8 0481001A */ bgez $a0, .L80242744 -/* DCF3AC 802426DC 2402000F */ addiu $v0, $zero, 0xf -/* DCF3B0 802426E0 24040002 */ addiu $a0, $zero, 2 -/* DCF3B4 802426E4 860300A8 */ lh $v1, 0xa8($s0) -/* DCF3B8 802426E8 AFA2001C */ sw $v0, 0x1c($sp) -/* DCF3BC 802426EC 27A20028 */ addiu $v0, $sp, 0x28 -/* DCF3C0 802426F0 0200282D */ daddu $a1, $s0, $zero -/* DCF3C4 802426F4 3C013F80 */ lui $at, 0x3f80 -/* DCF3C8 802426F8 44810000 */ mtc1 $at, $f0 -/* DCF3CC 802426FC 3C014000 */ lui $at, 0x4000 -/* DCF3D0 80242700 44811000 */ mtc1 $at, $f2 -/* DCF3D4 80242704 3C01C1A0 */ lui $at, 0xc1a0 -/* DCF3D8 80242708 44812000 */ mtc1 $at, $f4 -/* DCF3DC 8024270C 44833000 */ mtc1 $v1, $f6 -/* DCF3E0 80242710 00000000 */ nop -/* DCF3E4 80242714 468031A0 */ cvt.s.w $f6, $f6 -/* DCF3E8 80242718 44073000 */ mfc1 $a3, $f6 -/* DCF3EC 8024271C 0000302D */ daddu $a2, $zero, $zero -/* DCF3F0 80242720 AFA20020 */ sw $v0, 0x20($sp) -/* DCF3F4 80242724 E7A00010 */ swc1 $f0, 0x10($sp) -/* DCF3F8 80242728 E7A20014 */ swc1 $f2, 0x14($sp) -/* DCF3FC 8024272C 0C01BFA4 */ jal fx_emote -/* DCF400 80242730 E7A40018 */ swc1 $f4, 0x18($sp) -/* DCF404 80242734 8E2200CC */ lw $v0, 0xcc($s1) -/* DCF408 80242738 8C420000 */ lw $v0, ($v0) -/* DCF40C 8024273C 080909D9 */ j .L80242764 -/* DCF410 80242740 AE020028 */ sw $v0, 0x28($s0) -.L80242744: -/* DCF414 80242744 8E2200CC */ lw $v0, 0xcc($s1) -/* DCF418 80242748 8C420024 */ lw $v0, 0x24($v0) -/* DCF41C 8024274C 0C00FB3A */ jal get_enemy -/* DCF420 80242750 AE020028 */ sw $v0, 0x28($s0) -/* DCF424 80242754 86240008 */ lh $a0, 8($s1) -/* DCF428 80242758 24030001 */ addiu $v1, $zero, 1 -/* DCF42C 8024275C AC43006C */ sw $v1, 0x6c($v0) -/* DCF430 80242760 AC44007C */ sw $a0, 0x7c($v0) -.L80242764: -/* DCF434 80242764 96220076 */ lhu $v0, 0x76($s1) -/* DCF438 80242768 A602008E */ sh $v0, 0x8e($s0) -/* DCF43C 8024276C 24020021 */ addiu $v0, $zero, 0x21 -/* DCF440 80242770 AE420070 */ sw $v0, 0x70($s2) -.L80242774: -/* DCF444 80242774 8FBF003C */ lw $ra, 0x3c($sp) -/* DCF448 80242778 8FB20038 */ lw $s2, 0x38($sp) -/* DCF44C 8024277C 8FB10034 */ lw $s1, 0x34($sp) -/* DCF450 80242780 8FB00030 */ lw $s0, 0x30($sp) -/* DCF454 80242784 03E00008 */ jr $ra -/* DCF458 80242788 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_802427D0_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_802427D0_DCCCD0.s deleted file mode 100644 index ff3970d572..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_802427D0_DCCCD0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427D0_DCF4A0 -/* DCF4A0 802427D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DCF4A4 802427D4 AFB3001C */ sw $s3, 0x1c($sp) -/* DCF4A8 802427D8 0080982D */ daddu $s3, $a0, $zero -/* DCF4AC 802427DC AFBF0020 */ sw $ra, 0x20($sp) -/* DCF4B0 802427E0 AFB20018 */ sw $s2, 0x18($sp) -/* DCF4B4 802427E4 AFB10014 */ sw $s1, 0x14($sp) -/* DCF4B8 802427E8 AFB00010 */ sw $s0, 0x10($sp) -/* DCF4BC 802427EC 8E720148 */ lw $s2, 0x148($s3) -/* DCF4C0 802427F0 0C00EABB */ jal get_npc_unsafe -/* DCF4C4 802427F4 86440008 */ lh $a0, 8($s2) -/* DCF4C8 802427F8 86440008 */ lh $a0, 8($s2) -/* DCF4CC 802427FC 0040882D */ daddu $s1, $v0, $zero -/* DCF4D0 80242800 0C00FB3A */ jal get_enemy -/* DCF4D4 80242804 24840001 */ addiu $a0, $a0, 1 -/* DCF4D8 80242808 0040802D */ daddu $s0, $v0, $zero -/* DCF4DC 8024280C 0C00EABB */ jal get_npc_unsafe -/* DCF4E0 80242810 86040008 */ lh $a0, 8($s0) -/* DCF4E4 80242814 C62C0038 */ lwc1 $f12, 0x38($s1) -/* DCF4E8 80242818 C62E0040 */ lwc1 $f14, 0x40($s1) -/* DCF4EC 8024281C 8C460038 */ lw $a2, 0x38($v0) -/* DCF4F0 80242820 0C00A720 */ jal atan2 -/* DCF4F4 80242824 8C470040 */ lw $a3, 0x40($v0) -/* DCF4F8 80242828 E620000C */ swc1 $f0, 0xc($s1) -/* DCF4FC 8024282C 8E02006C */ lw $v0, 0x6c($s0) -/* DCF500 80242830 14400008 */ bnez $v0, .L80242854 -/* DCF504 80242834 00000000 */ nop -/* DCF508 80242838 8E4200CC */ lw $v0, 0xcc($s2) -/* DCF50C 8024283C 8C420000 */ lw $v0, ($v0) -/* DCF510 80242840 AE220028 */ sw $v0, 0x28($s1) -/* DCF514 80242844 96420076 */ lhu $v0, 0x76($s2) -/* DCF518 80242848 A622008E */ sh $v0, 0x8e($s1) -/* DCF51C 8024284C 24020021 */ addiu $v0, $zero, 0x21 -/* DCF520 80242850 AE620070 */ sw $v0, 0x70($s3) -.L80242854: -/* DCF524 80242854 8FBF0020 */ lw $ra, 0x20($sp) -/* DCF528 80242858 8FB3001C */ lw $s3, 0x1c($sp) -/* DCF52C 8024285C 8FB20018 */ lw $s2, 0x18($sp) -/* DCF530 80242860 8FB10014 */ lw $s1, 0x14($sp) -/* DCF534 80242864 8FB00010 */ lw $s0, 0x10($sp) -/* DCF538 80242868 03E00008 */ jr $ra -/* DCF53C 8024286C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_09/func_80242870_DCCCD0.s b/asm/nonmatchings/world/area_omo/omo_09/func_80242870_DCCCD0.s deleted file mode 100644 index f4a2ff9f4a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/func_80242870_DCCCD0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242870_DCF540 -/* DCF540 80242870 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DCF544 80242874 AFB00010 */ sw $s0, 0x10($sp) -/* DCF548 80242878 0080802D */ daddu $s0, $a0, $zero -/* DCF54C 8024287C AFBF0014 */ sw $ra, 0x14($sp) -/* DCF550 80242880 8E020148 */ lw $v0, 0x148($s0) -/* DCF554 80242884 0C00EABB */ jal get_npc_unsafe -/* DCF558 80242888 84440008 */ lh $a0, 8($v0) -/* DCF55C 8024288C 9443008E */ lhu $v1, 0x8e($v0) -/* DCF560 80242890 2463FFFF */ addiu $v1, $v1, -1 -/* DCF564 80242894 A443008E */ sh $v1, 0x8e($v0) -/* DCF568 80242898 00031C00 */ sll $v1, $v1, 0x10 -/* DCF56C 8024289C 58600001 */ blezl $v1, .L802428A4 -/* DCF570 802428A0 AE000070 */ sw $zero, 0x70($s0) -.L802428A4: -/* DCF574 802428A4 8FBF0014 */ lw $ra, 0x14($sp) -/* DCF578 802428A8 8FB00010 */ lw $s0, 0x10($sp) -/* DCF57C 802428AC 03E00008 */ jr $ra -/* DCF580 802428B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_10/func_8024001C_DD79B0.s b/asm/nonmatchings/world/area_omo/omo_10/func_8024001C_DD79B0.s deleted file mode 100644 index eb28898969..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_10/func_8024001C_DD79B0.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_DD79CC -/* DD79CC 8024001C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DD79D0 80240020 AFB10014 */ sw $s1, 0x14($sp) -/* DD79D4 80240024 0080882D */ daddu $s1, $a0, $zero -/* DD79D8 80240028 AFBF001C */ sw $ra, 0x1c($sp) -/* DD79DC 8024002C AFB20018 */ sw $s2, 0x18($sp) -/* DD79E0 80240030 AFB00010 */ sw $s0, 0x10($sp) -/* DD79E4 80240034 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DD79E8 80240038 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DD79EC 8024003C F7B40020 */ sdc1 $f20, 0x20($sp) -/* DD79F0 80240040 8E30000C */ lw $s0, 0xc($s1) -/* DD79F4 80240044 8E120000 */ lw $s2, ($s0) -/* DD79F8 80240048 26100004 */ addiu $s0, $s0, 4 -/* DD79FC 8024004C 8E050000 */ lw $a1, ($s0) -/* DD7A00 80240050 0C0B210B */ jal get_float_variable -/* DD7A04 80240054 26100004 */ addiu $s0, $s0, 4 -/* DD7A08 80240058 8E050000 */ lw $a1, ($s0) -/* DD7A0C 8024005C 26100004 */ addiu $s0, $s0, 4 -/* DD7A10 80240060 0220202D */ daddu $a0, $s1, $zero -/* DD7A14 80240064 0C0B210B */ jal get_float_variable -/* DD7A18 80240068 46000606 */ mov.s $f24, $f0 -/* DD7A1C 8024006C 8E050000 */ lw $a1, ($s0) -/* DD7A20 80240070 26100004 */ addiu $s0, $s0, 4 -/* DD7A24 80240074 0220202D */ daddu $a0, $s1, $zero -/* DD7A28 80240078 0C0B210B */ jal get_float_variable -/* DD7A2C 8024007C 46000586 */ mov.s $f22, $f0 -/* DD7A30 80240080 0220202D */ daddu $a0, $s1, $zero -/* DD7A34 80240084 8E050000 */ lw $a1, ($s0) -/* DD7A38 80240088 0C0B210B */ jal get_float_variable -/* DD7A3C 8024008C 46000506 */ mov.s $f20, $f0 -/* DD7A40 80240090 4600C306 */ mov.s $f12, $f24 -/* DD7A44 80240094 4406A000 */ mfc1 $a2, $f20 -/* DD7A48 80240098 44070000 */ mfc1 $a3, $f0 -/* DD7A4C 8024009C 0C00A720 */ jal atan2 -/* DD7A50 802400A0 4600B386 */ mov.s $f14, $f22 -/* DD7A54 802400A4 0C00A6C9 */ jal clamp_angle -/* DD7A58 802400A8 46000306 */ mov.s $f12, $f0 -/* DD7A5C 802400AC 0220202D */ daddu $a0, $s1, $zero -/* DD7A60 802400B0 44060000 */ mfc1 $a2, $f0 -/* DD7A64 802400B4 0C0B2190 */ jal set_float_variable -/* DD7A68 802400B8 0240282D */ daddu $a1, $s2, $zero -/* DD7A6C 802400BC 8FBF001C */ lw $ra, 0x1c($sp) -/* DD7A70 802400C0 8FB20018 */ lw $s2, 0x18($sp) -/* DD7A74 802400C4 8FB10014 */ lw $s1, 0x14($sp) -/* DD7A78 802400C8 8FB00010 */ lw $s0, 0x10($sp) -/* DD7A7C 802400CC D7B80030 */ ldc1 $f24, 0x30($sp) -/* DD7A80 802400D0 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DD7A84 802400D4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DD7A88 802400D8 24020002 */ addiu $v0, $zero, 2 -/* DD7A8C 802400DC 03E00008 */ jr $ra -/* DD7A90 802400E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_10/func_802400E4_DD79B0.s b/asm/nonmatchings/world/area_omo/omo_10/func_802400E4_DD79B0.s deleted file mode 100644 index 78b68dbe33..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_10/func_802400E4_DD79B0.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E4_DD7A94 -/* DD7A94 802400E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DD7A98 802400E8 AFB10014 */ sw $s1, 0x14($sp) -/* DD7A9C 802400EC 0080882D */ daddu $s1, $a0, $zero -/* DD7AA0 802400F0 AFBF0018 */ sw $ra, 0x18($sp) -/* DD7AA4 802400F4 AFB00010 */ sw $s0, 0x10($sp) -/* DD7AA8 802400F8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DD7AAC 802400FC 8E30000C */ lw $s0, 0xc($s1) -/* DD7AB0 80240100 8E050000 */ lw $a1, ($s0) -/* DD7AB4 80240104 0C0B210B */ jal get_float_variable -/* DD7AB8 80240108 26100004 */ addiu $s0, $s0, 4 -/* DD7ABC 8024010C 8E050000 */ lw $a1, ($s0) -/* DD7AC0 80240110 26100004 */ addiu $s0, $s0, 4 -/* DD7AC4 80240114 0220202D */ daddu $a0, $s1, $zero -/* DD7AC8 80240118 0C0B210B */ jal get_float_variable -/* DD7ACC 8024011C 46000506 */ mov.s $f20, $f0 -/* DD7AD0 80240120 4614003C */ c.lt.s $f0, $f20 -/* DD7AD4 80240124 00000000 */ nop -/* DD7AD8 80240128 45000004 */ bc1f .L8024013C -/* DD7ADC 8024012C 0220202D */ daddu $a0, $s1, $zero -/* DD7AE0 80240130 8E050000 */ lw $a1, ($s0) -/* DD7AE4 80240134 08090051 */ j .L80240144 -/* DD7AE8 80240138 24060001 */ addiu $a2, $zero, 1 -.L8024013C: -/* DD7AEC 8024013C 8E050000 */ lw $a1, ($s0) -/* DD7AF0 80240140 0000302D */ daddu $a2, $zero, $zero -.L80240144: -/* DD7AF4 80240144 0C0B2026 */ jal set_variable -/* DD7AF8 80240148 00000000 */ nop -/* DD7AFC 8024014C 8FBF0018 */ lw $ra, 0x18($sp) -/* DD7B00 80240150 8FB10014 */ lw $s1, 0x14($sp) -/* DD7B04 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* DD7B08 80240158 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DD7B0C 8024015C 24020002 */ addiu $v0, $zero, 2 -/* DD7B10 80240160 03E00008 */ jr $ra -/* DD7B14 80240164 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_10/func_80240168_DD79B0.s b/asm/nonmatchings/world/area_omo/omo_10/func_80240168_DD79B0.s deleted file mode 100644 index 12e1133fbb..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_10/func_80240168_DD79B0.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240168_DD7B18 -/* DD7B18 80240168 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DD7B1C 8024016C AFB20018 */ sw $s2, 0x18($sp) -/* DD7B20 80240170 0080902D */ daddu $s2, $a0, $zero -/* DD7B24 80240174 AFBF001C */ sw $ra, 0x1c($sp) -/* DD7B28 80240178 AFB10014 */ sw $s1, 0x14($sp) -/* DD7B2C 8024017C AFB00010 */ sw $s0, 0x10($sp) -/* DD7B30 80240180 8E50000C */ lw $s0, 0xc($s2) -/* DD7B34 80240184 8E050000 */ lw $a1, ($s0) -/* DD7B38 80240188 0C0B1EAF */ jal get_variable -/* DD7B3C 8024018C 26100004 */ addiu $s0, $s0, 4 -/* DD7B40 80240190 8E050000 */ lw $a1, ($s0) -/* DD7B44 80240194 26100004 */ addiu $s0, $s0, 4 -/* DD7B48 80240198 0240202D */ daddu $a0, $s2, $zero -/* DD7B4C 8024019C 0C0B1EAF */ jal get_variable -/* DD7B50 802401A0 0040882D */ daddu $s1, $v0, $zero -/* DD7B54 802401A4 0240202D */ daddu $a0, $s2, $zero -/* DD7B58 802401A8 8E050000 */ lw $a1, ($s0) -/* DD7B5C 802401AC 0C0B1EAF */ jal get_variable -/* DD7B60 802401B0 0040802D */ daddu $s0, $v0, $zero -/* DD7B64 802401B4 02020018 */ mult $s0, $v0 -/* DD7B68 802401B8 24020002 */ addiu $v0, $zero, 2 -/* DD7B6C 802401BC 8E430138 */ lw $v1, 0x138($s2) -/* DD7B70 802401C0 00003012 */ mflo $a2 -/* DD7B74 802401C4 02268821 */ addu $s1, $s1, $a2 -/* DD7B78 802401C8 00518804 */ sllv $s1, $s1, $v0 -/* DD7B7C 802401CC 00711821 */ addu $v1, $v1, $s1 -/* DD7B80 802401D0 AE430138 */ sw $v1, 0x138($s2) -/* DD7B84 802401D4 8FBF001C */ lw $ra, 0x1c($sp) -/* DD7B88 802401D8 8FB20018 */ lw $s2, 0x18($sp) -/* DD7B8C 802401DC 8FB10014 */ lw $s1, 0x14($sp) -/* DD7B90 802401E0 8FB00010 */ lw $s0, 0x10($sp) -/* DD7B94 802401E4 03E00008 */ jr $ra -/* DD7B98 802401E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_10/func_802401EC_DD79B0.s b/asm/nonmatchings/world/area_omo/omo_10/func_802401EC_DD79B0.s deleted file mode 100644 index 2359a68412..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_10/func_802401EC_DD79B0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401EC_DD7B9C -/* DD7B9C 802401EC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DD7BA0 802401F0 AFB10014 */ sw $s1, 0x14($sp) -/* DD7BA4 802401F4 0080882D */ daddu $s1, $a0, $zero -/* DD7BA8 802401F8 AFBF0018 */ sw $ra, 0x18($sp) -/* DD7BAC 802401FC AFB00010 */ sw $s0, 0x10($sp) -/* DD7BB0 80240200 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DD7BB4 80240204 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DD7BB8 80240208 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DD7BBC 8024020C 8E30000C */ lw $s0, 0xc($s1) -/* DD7BC0 80240210 8E050000 */ lw $a1, ($s0) -/* DD7BC4 80240214 0C0B210B */ jal get_float_variable -/* DD7BC8 80240218 26100004 */ addiu $s0, $s0, 4 -/* DD7BCC 8024021C 8E050000 */ lw $a1, ($s0) -/* DD7BD0 80240220 26100004 */ addiu $s0, $s0, 4 -/* DD7BD4 80240224 0220202D */ daddu $a0, $s1, $zero -/* DD7BD8 80240228 0C0B210B */ jal get_float_variable -/* DD7BDC 8024022C 46000606 */ mov.s $f24, $f0 -/* DD7BE0 80240230 8E050000 */ lw $a1, ($s0) -/* DD7BE4 80240234 26100004 */ addiu $s0, $s0, 4 -/* DD7BE8 80240238 0220202D */ daddu $a0, $s1, $zero -/* DD7BEC 8024023C 0C0B210B */ jal get_float_variable -/* DD7BF0 80240240 46000586 */ mov.s $f22, $f0 -/* DD7BF4 80240244 0220202D */ daddu $a0, $s1, $zero -/* DD7BF8 80240248 8E050000 */ lw $a1, ($s0) -/* DD7BFC 8024024C 0C0B210B */ jal get_float_variable -/* DD7C00 80240250 46000506 */ mov.s $f20, $f0 -/* DD7C04 80240254 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* DD7C08 80240258 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* DD7C0C 8024025C E4580028 */ swc1 $f24, 0x28($v0) -/* DD7C10 80240260 E456002C */ swc1 $f22, 0x2c($v0) -/* DD7C14 80240264 E4540030 */ swc1 $f20, 0x30($v0) -/* DD7C18 80240268 E4400080 */ swc1 $f0, 0x80($v0) -/* DD7C1C 8024026C 8FBF0018 */ lw $ra, 0x18($sp) -/* DD7C20 80240270 8FB10014 */ lw $s1, 0x14($sp) -/* DD7C24 80240274 8FB00010 */ lw $s0, 0x10($sp) -/* DD7C28 80240278 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DD7C2C 8024027C D7B60028 */ ldc1 $f22, 0x28($sp) -/* DD7C30 80240280 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DD7C34 80240284 24020002 */ addiu $v0, $zero, 2 -/* DD7C38 80240288 03E00008 */ jr $ra -/* DD7C3C 8024028C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_10/func_80240290_DD79B0.s b/asm/nonmatchings/world/area_omo/omo_10/func_80240290_DD79B0.s deleted file mode 100644 index 3e5d0d0803..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_10/func_80240290_DD79B0.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240290_DD7C40 -/* DD7C40 80240290 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DD7C44 80240294 AFB10014 */ sw $s1, 0x14($sp) -/* DD7C48 80240298 0080882D */ daddu $s1, $a0, $zero -/* DD7C4C 8024029C AFBF001C */ sw $ra, 0x1c($sp) -/* DD7C50 802402A0 AFB20018 */ sw $s2, 0x18($sp) -/* DD7C54 802402A4 AFB00010 */ sw $s0, 0x10($sp) -/* DD7C58 802402A8 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* DD7C5C 802402AC F7B80030 */ sdc1 $f24, 0x30($sp) -/* DD7C60 802402B0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DD7C64 802402B4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DD7C68 802402B8 8E30000C */ lw $s0, 0xc($s1) -/* DD7C6C 802402BC 8E050000 */ lw $a1, ($s0) -/* DD7C70 802402C0 0C0B1EAF */ jal get_variable -/* DD7C74 802402C4 26100004 */ addiu $s0, $s0, 4 -/* DD7C78 802402C8 8E050000 */ lw $a1, ($s0) -/* DD7C7C 802402CC 26100004 */ addiu $s0, $s0, 4 -/* DD7C80 802402D0 0220202D */ daddu $a0, $s1, $zero -/* DD7C84 802402D4 0C0B210B */ jal get_float_variable -/* DD7C88 802402D8 0040902D */ daddu $s2, $v0, $zero -/* DD7C8C 802402DC 8E050000 */ lw $a1, ($s0) -/* DD7C90 802402E0 26100004 */ addiu $s0, $s0, 4 -/* DD7C94 802402E4 0220202D */ daddu $a0, $s1, $zero -/* DD7C98 802402E8 0C0B210B */ jal get_float_variable -/* DD7C9C 802402EC 46000686 */ mov.s $f26, $f0 -/* DD7CA0 802402F0 8E050000 */ lw $a1, ($s0) -/* DD7CA4 802402F4 26100004 */ addiu $s0, $s0, 4 -/* DD7CA8 802402F8 0220202D */ daddu $a0, $s1, $zero -/* DD7CAC 802402FC 0C0B210B */ jal get_float_variable -/* DD7CB0 80240300 46000606 */ mov.s $f24, $f0 -/* DD7CB4 80240304 0220202D */ daddu $a0, $s1, $zero -/* DD7CB8 80240308 8E050000 */ lw $a1, ($s0) -/* DD7CBC 8024030C 0C0B210B */ jal get_float_variable -/* DD7CC0 80240310 46000506 */ mov.s $f20, $f0 -/* DD7CC4 80240314 0240202D */ daddu $a0, $s2, $zero -/* DD7CC8 80240318 0C00EAD2 */ jal get_npc_safe -/* DD7CCC 8024031C 46000586 */ mov.s $f22, $f0 -/* DD7CD0 80240320 0040202D */ daddu $a0, $v0, $zero -/* DD7CD4 80240324 E49A0038 */ swc1 $f26, 0x38($a0) -/* DD7CD8 80240328 4600D006 */ mov.s $f0, $f26 -/* DD7CDC 8024032C E498003C */ swc1 $f24, 0x3c($a0) -/* DD7CE0 80240330 4600C086 */ mov.s $f2, $f24 -/* DD7CE4 80240334 E4940040 */ swc1 $f20, 0x40($a0) -/* DD7CE8 80240338 4600A106 */ mov.s $f4, $f20 -/* DD7CEC 8024033C 8C830000 */ lw $v1, ($a0) -/* DD7CF0 80240340 3C050001 */ lui $a1, 1 -/* DD7CF4 80240344 E496000C */ swc1 $f22, 0xc($a0) -/* DD7CF8 80240348 E480006C */ swc1 $f0, 0x6c($a0) -/* DD7CFC 8024034C E4820070 */ swc1 $f2, 0x70($a0) -/* DD7D00 80240350 E4840074 */ swc1 $f4, 0x74($a0) -/* DD7D04 80240354 00651825 */ or $v1, $v1, $a1 -/* DD7D08 80240358 AC830000 */ sw $v1, ($a0) -/* DD7D0C 8024035C 8FBF001C */ lw $ra, 0x1c($sp) -/* DD7D10 80240360 8FB20018 */ lw $s2, 0x18($sp) -/* DD7D14 80240364 8FB10014 */ lw $s1, 0x14($sp) -/* DD7D18 80240368 8FB00010 */ lw $s0, 0x10($sp) -/* DD7D1C 8024036C D7BA0038 */ ldc1 $f26, 0x38($sp) -/* DD7D20 80240370 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DD7D24 80240374 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DD7D28 80240378 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DD7D2C 8024037C 24020002 */ addiu $v0, $zero, 2 -/* DD7D30 80240380 03E00008 */ jr $ra -/* DD7D34 80240384 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_omo/omo_10/func_80240388_DD79B0.s b/asm/nonmatchings/world/area_omo/omo_10/func_80240388_DD79B0.s deleted file mode 100644 index 71c513ed52..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_10/func_80240388_DD79B0.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240388_DD7D38 -/* DD7D38 80240388 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DD7D3C 8024038C AFB20018 */ sw $s2, 0x18($sp) -/* DD7D40 80240390 0080902D */ daddu $s2, $a0, $zero -/* DD7D44 80240394 AFBF0028 */ sw $ra, 0x28($sp) -/* DD7D48 80240398 AFB50024 */ sw $s5, 0x24($sp) -/* DD7D4C 8024039C AFB40020 */ sw $s4, 0x20($sp) -/* DD7D50 802403A0 AFB3001C */ sw $s3, 0x1c($sp) -/* DD7D54 802403A4 AFB10014 */ sw $s1, 0x14($sp) -/* DD7D58 802403A8 AFB00010 */ sw $s0, 0x10($sp) -/* DD7D5C 802403AC F7B80040 */ sdc1 $f24, 0x40($sp) -/* DD7D60 802403B0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* DD7D64 802403B4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* DD7D68 802403B8 8E50000C */ lw $s0, 0xc($s2) -/* DD7D6C 802403BC 8E140000 */ lw $s4, ($s0) -/* DD7D70 802403C0 26100004 */ addiu $s0, $s0, 4 -/* DD7D74 802403C4 0C0B1EAF */ jal get_variable -/* DD7D78 802403C8 0280282D */ daddu $a1, $s4, $zero -/* DD7D7C 802403CC 0040982D */ daddu $s3, $v0, $zero -/* DD7D80 802403D0 8E150000 */ lw $s5, ($s0) -/* DD7D84 802403D4 26100004 */ addiu $s0, $s0, 4 -/* DD7D88 802403D8 8E050000 */ lw $a1, ($s0) -/* DD7D8C 802403DC 26100004 */ addiu $s0, $s0, 4 -/* DD7D90 802403E0 0C0B210B */ jal get_float_variable -/* DD7D94 802403E4 0240202D */ daddu $a0, $s2, $zero -/* DD7D98 802403E8 8E050000 */ lw $a1, ($s0) -/* DD7D9C 802403EC 26100004 */ addiu $s0, $s0, 4 -/* DD7DA0 802403F0 0240202D */ daddu $a0, $s2, $zero -/* DD7DA4 802403F4 0C0B210B */ jal get_float_variable -/* DD7DA8 802403F8 46000606 */ mov.s $f24, $f0 -/* DD7DAC 802403FC 8E050000 */ lw $a1, ($s0) -/* DD7DB0 80240400 26100004 */ addiu $s0, $s0, 4 -/* DD7DB4 80240404 0240202D */ daddu $a0, $s2, $zero -/* DD7DB8 80240408 0C0B1EAF */ jal get_variable -/* DD7DBC 8024040C 46000506 */ mov.s $f20, $f0 -/* DD7DC0 80240410 8E050000 */ lw $a1, ($s0) -/* DD7DC4 80240414 26100004 */ addiu $s0, $s0, 4 -/* DD7DC8 80240418 0240202D */ daddu $a0, $s2, $zero -/* DD7DCC 8024041C 0C0B1EAF */ jal get_variable -/* DD7DD0 80240420 0040882D */ daddu $s1, $v0, $zero -/* DD7DD4 80240424 0240202D */ daddu $a0, $s2, $zero -/* DD7DD8 80240428 8E050000 */ lw $a1, ($s0) -/* DD7DDC 8024042C 0C0B210B */ jal get_float_variable -/* DD7DE0 80240430 0040802D */ daddu $s0, $v0, $zero -/* DD7DE4 80240434 3C014334 */ lui $at, 0x4334 -/* DD7DE8 80240438 44811000 */ mtc1 $at, $f2 -/* DD7DEC 8024043C 3C014049 */ lui $at, 0x4049 -/* DD7DF0 80240440 34210FD8 */ ori $at, $at, 0xfd8 -/* DD7DF4 80240444 44812000 */ mtc1 $at, $f4 -/* DD7DF8 80240448 46020003 */ div.s $f0, $f0, $f2 -/* DD7DFC 8024044C 46040582 */ mul.s $f22, $f0, $f4 -/* DD7E00 80240450 00000000 */ nop -/* DD7E04 80240454 4618A501 */ sub.s $f20, $f20, $f24 -/* DD7E08 80240458 3C013F00 */ lui $at, 0x3f00 -/* DD7E0C 8024045C 44810000 */ mtc1 $at, $f0 -/* DD7E10 80240460 00000000 */ nop -/* DD7E14 80240464 4600A502 */ mul.s $f20, $f20, $f0 -/* DD7E18 80240468 00000000 */ nop -/* DD7E1C 8024046C 12000007 */ beqz $s0, .L8024048C -/* DD7E20 80240470 0233102A */ slt $v0, $s1, $s3 -/* DD7E24 80240474 10400005 */ beqz $v0, .L8024048C -/* DD7E28 80240478 0240202D */ daddu $a0, $s2, $zero -/* DD7E2C 8024047C 0220982D */ daddu $s3, $s1, $zero -/* DD7E30 80240480 0280282D */ daddu $a1, $s4, $zero -/* DD7E34 80240484 0C0B2026 */ jal set_variable -/* DD7E38 80240488 0220302D */ daddu $a2, $s1, $zero -.L8024048C: -/* DD7E3C 8024048C 3C014049 */ lui $at, 0x4049 -/* DD7E40 80240490 34210FD8 */ ori $at, $at, 0xfd8 -/* DD7E44 80240494 44810000 */ mtc1 $at, $f0 -/* DD7E48 80240498 44936000 */ mtc1 $s3, $f12 -/* DD7E4C 8024049C 00000000 */ nop -/* DD7E50 802404A0 46806320 */ cvt.s.w $f12, $f12 -/* DD7E54 802404A4 46006302 */ mul.s $f12, $f12, $f0 -/* DD7E58 802404A8 00000000 */ nop -/* DD7E5C 802404AC 44910000 */ mtc1 $s1, $f0 -/* DD7E60 802404B0 00000000 */ nop -/* DD7E64 802404B4 46800020 */ cvt.s.w $f0, $f0 -/* DD7E68 802404B8 46006303 */ div.s $f12, $f12, $f0 -/* DD7E6C 802404BC 0C00A874 */ jal cos_rad -/* DD7E70 802404C0 46166300 */ add.s $f12, $f12, $f22 -/* DD7E74 802404C4 4600A002 */ mul.s $f0, $f20, $f0 -/* DD7E78 802404C8 00000000 */ nop -/* DD7E7C 802404CC 4614C080 */ add.s $f2, $f24, $f20 -/* DD7E80 802404D0 46001081 */ sub.s $f2, $f2, $f0 -/* DD7E84 802404D4 0240202D */ daddu $a0, $s2, $zero -/* DD7E88 802404D8 44061000 */ mfc1 $a2, $f2 -/* DD7E8C 802404DC 0C0B2190 */ jal set_float_variable -/* DD7E90 802404E0 02A0282D */ daddu $a1, $s5, $zero -/* DD7E94 802404E4 8FBF0028 */ lw $ra, 0x28($sp) -/* DD7E98 802404E8 8FB50024 */ lw $s5, 0x24($sp) -/* DD7E9C 802404EC 8FB40020 */ lw $s4, 0x20($sp) -/* DD7EA0 802404F0 8FB3001C */ lw $s3, 0x1c($sp) -/* DD7EA4 802404F4 8FB20018 */ lw $s2, 0x18($sp) -/* DD7EA8 802404F8 8FB10014 */ lw $s1, 0x14($sp) -/* DD7EAC 802404FC 8FB00010 */ lw $s0, 0x10($sp) -/* DD7EB0 80240500 D7B80040 */ ldc1 $f24, 0x40($sp) -/* DD7EB4 80240504 D7B60038 */ ldc1 $f22, 0x38($sp) -/* DD7EB8 80240508 D7B40030 */ ldc1 $f20, 0x30($sp) -/* DD7EBC 8024050C 24020002 */ addiu $v0, $zero, 2 -/* DD7EC0 80240510 03E00008 */ jr $ra -/* DD7EC4 80240514 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_10/func_80240518_DD79B0.s b/asm/nonmatchings/world/area_omo/omo_10/func_80240518_DD79B0.s deleted file mode 100644 index d3eb9dac2a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_10/func_80240518_DD79B0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240518_DD7EC8 -/* DD7EC8 80240518 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* DD7ECC 8024051C 2463419C */ addiu $v1, $v1, %lo(gGameStatusPtr) -/* DD7ED0 80240520 8C620000 */ lw $v0, ($v1) -/* DD7ED4 80240524 AC800084 */ sw $zero, 0x84($a0) -/* DD7ED8 80240528 8C420010 */ lw $v0, 0x10($v0) -/* DD7EDC 8024052C 30428000 */ andi $v0, $v0, 0x8000 -/* DD7EE0 80240530 10400002 */ beqz $v0, .L8024053C -/* DD7EE4 80240534 24020001 */ addiu $v0, $zero, 1 -/* DD7EE8 80240538 AC820084 */ sw $v0, 0x84($a0) -.L8024053C: -/* DD7EEC 8024053C 8C620000 */ lw $v0, ($v1) -/* DD7EF0 80240540 8C420010 */ lw $v0, 0x10($v0) -/* DD7EF4 80240544 30424000 */ andi $v0, $v0, 0x4000 -/* DD7EF8 80240548 10400002 */ beqz $v0, .L80240554 -/* DD7EFC 8024054C 24020001 */ addiu $v0, $zero, 1 -/* DD7F00 80240550 AC820084 */ sw $v0, 0x84($a0) -.L80240554: -/* DD7F04 80240554 03E00008 */ jr $ra -/* DD7F08 80240558 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_10/func_8024055C_DD79B0.s b/asm/nonmatchings/world/area_omo/omo_10/func_8024055C_DD79B0.s deleted file mode 100644 index 281a1d0c30..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_10/func_8024055C_DD79B0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024055C_DD7F0C -/* DD7F0C 8024055C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DD7F10 80240560 AFB00010 */ sw $s0, 0x10($sp) -/* DD7F14 80240564 0080802D */ daddu $s0, $a0, $zero -/* DD7F18 80240568 AFBF0014 */ sw $ra, 0x14($sp) -/* DD7F1C 8024056C 8E0300A8 */ lw $v1, 0xa8($s0) -/* DD7F20 80240570 8E020088 */ lw $v0, 0x88($s0) -/* DD7F24 80240574 00621821 */ addu $v1, $v1, $v0 -/* DD7F28 80240578 04610004 */ bgez $v1, .L8024058C -/* DD7F2C 8024057C AE0300A8 */ sw $v1, 0xa8($s0) -/* DD7F30 80240580 3C020002 */ lui $v0, 2 -/* DD7F34 80240584 08090167 */ j .L8024059C -/* DD7F38 80240588 00621021 */ addu $v0, $v1, $v0 -.L8024058C: -/* DD7F3C 8024058C 3C040002 */ lui $a0, 2 -/* DD7F40 80240590 0083102A */ slt $v0, $a0, $v1 -/* DD7F44 80240594 10400002 */ beqz $v0, .L802405A0 -/* DD7F48 80240598 00641023 */ subu $v0, $v1, $a0 -.L8024059C: -/* DD7F4C 8024059C AE0200A8 */ sw $v0, 0xa8($s0) -.L802405A0: -/* DD7F50 802405A0 8E0300AC */ lw $v1, 0xac($s0) -/* DD7F54 802405A4 8E02008C */ lw $v0, 0x8c($s0) -/* DD7F58 802405A8 00621821 */ addu $v1, $v1, $v0 -/* DD7F5C 802405AC 04610004 */ bgez $v1, .L802405C0 -/* DD7F60 802405B0 AE0300AC */ sw $v1, 0xac($s0) -/* DD7F64 802405B4 3C020002 */ lui $v0, 2 -/* DD7F68 802405B8 08090174 */ j .L802405D0 -/* DD7F6C 802405BC 00621021 */ addu $v0, $v1, $v0 -.L802405C0: -/* DD7F70 802405C0 3C040002 */ lui $a0, 2 -/* DD7F74 802405C4 0083102A */ slt $v0, $a0, $v1 -/* DD7F78 802405C8 10400002 */ beqz $v0, .L802405D4 -/* DD7F7C 802405CC 00641023 */ subu $v0, $v1, $a0 -.L802405D0: -/* DD7F80 802405D0 AE0200AC */ sw $v0, 0xac($s0) -.L802405D4: -/* DD7F84 802405D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* DD7F88 802405D8 8E020090 */ lw $v0, 0x90($s0) -/* DD7F8C 802405DC 00621821 */ addu $v1, $v1, $v0 -/* DD7F90 802405E0 04610004 */ bgez $v1, .L802405F4 -/* DD7F94 802405E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* DD7F98 802405E8 3C020002 */ lui $v0, 2 -/* DD7F9C 802405EC 08090181 */ j .L80240604 -/* DD7FA0 802405F0 00621021 */ addu $v0, $v1, $v0 -.L802405F4: -/* DD7FA4 802405F4 3C040002 */ lui $a0, 2 -/* DD7FA8 802405F8 0083102A */ slt $v0, $a0, $v1 -/* DD7FAC 802405FC 10400002 */ beqz $v0, .L80240608 -/* DD7FB0 80240600 00641023 */ subu $v0, $v1, $a0 -.L80240604: -/* DD7FB4 80240604 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240608: -/* DD7FB8 80240608 8E0300B4 */ lw $v1, 0xb4($s0) -/* DD7FBC 8024060C 8E020094 */ lw $v0, 0x94($s0) -/* DD7FC0 80240610 00621821 */ addu $v1, $v1, $v0 -/* DD7FC4 80240614 04610004 */ bgez $v1, .L80240628 -/* DD7FC8 80240618 AE0300B4 */ sw $v1, 0xb4($s0) -/* DD7FCC 8024061C 3C020002 */ lui $v0, 2 -/* DD7FD0 80240620 0809018E */ j .L80240638 -/* DD7FD4 80240624 00621021 */ addu $v0, $v1, $v0 -.L80240628: -/* DD7FD8 80240628 3C040002 */ lui $a0, 2 -/* DD7FDC 8024062C 0083102A */ slt $v0, $a0, $v1 -/* DD7FE0 80240630 10400002 */ beqz $v0, .L8024063C -/* DD7FE4 80240634 00641023 */ subu $v0, $v1, $a0 -.L80240638: -/* DD7FE8 80240638 AE0200B4 */ sw $v0, 0xb4($s0) -.L8024063C: -/* DD7FEC 8024063C 8E040084 */ lw $a0, 0x84($s0) -/* DD7FF0 80240640 0C046F07 */ jal set_main_pan_u -/* DD7FF4 80240644 8E0500A8 */ lw $a1, 0xa8($s0) -/* DD7FF8 80240648 8E040084 */ lw $a0, 0x84($s0) -/* DD7FFC 8024064C 0C046F0D */ jal set_main_pan_v -/* DD8000 80240650 8E0500AC */ lw $a1, 0xac($s0) -/* DD8004 80240654 8E040084 */ lw $a0, 0x84($s0) -/* DD8008 80240658 0C046F13 */ jal set_aux_pan_u -/* DD800C 8024065C 8E0500B0 */ lw $a1, 0xb0($s0) -/* DD8010 80240660 8E040084 */ lw $a0, 0x84($s0) -/* DD8014 80240664 0C046F19 */ jal set_aux_pan_v -/* DD8018 80240668 8E0500B4 */ lw $a1, 0xb4($s0) -/* DD801C 8024066C 8FBF0014 */ lw $ra, 0x14($sp) -/* DD8020 80240670 8FB00010 */ lw $s0, 0x10($sp) -/* DD8024 80240674 0000102D */ daddu $v0, $zero, $zero -/* DD8028 80240678 03E00008 */ jr $ra -/* DD802C 8024067C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_10/func_80240680_DD79B0.s b/asm/nonmatchings/world/area_omo/omo_10/func_80240680_DD79B0.s deleted file mode 100644 index 37c4f2a1ae..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_10/func_80240680_DD79B0.s +++ /dev/null @@ -1,145 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240680_DD8030 -/* DD8030 80240680 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DD8034 80240684 AFB00010 */ sw $s0, 0x10($sp) -/* DD8038 80240688 0080802D */ daddu $s0, $a0, $zero -/* DD803C 8024068C 10A00005 */ beqz $a1, .L802406A4 -/* DD8040 80240690 AFBF0014 */ sw $ra, 0x14($sp) -/* DD8044 80240694 AE000070 */ sw $zero, 0x70($s0) -/* DD8048 80240698 AE000074 */ sw $zero, 0x74($s0) -/* DD804C 8024069C AE000078 */ sw $zero, 0x78($s0) -/* DD8050 802406A0 AE00007C */ sw $zero, 0x7c($s0) -.L802406A4: -/* DD8054 802406A4 8E020070 */ lw $v0, 0x70($s0) -/* DD8058 802406A8 1440000E */ bnez $v0, .L802406E4 -/* DD805C 802406AC 00000000 */ nop -/* DD8060 802406B0 8E0300A8 */ lw $v1, 0xa8($s0) -/* DD8064 802406B4 8E020088 */ lw $v0, 0x88($s0) -/* DD8068 802406B8 00621821 */ addu $v1, $v1, $v0 -/* DD806C 802406BC 04610004 */ bgez $v1, .L802406D0 -/* DD8070 802406C0 AE0300A8 */ sw $v1, 0xa8($s0) -/* DD8074 802406C4 3C020002 */ lui $v0, 2 -/* DD8078 802406C8 080901B8 */ j .L802406E0 -/* DD807C 802406CC 00621021 */ addu $v0, $v1, $v0 -.L802406D0: -/* DD8080 802406D0 3C040002 */ lui $a0, 2 -/* DD8084 802406D4 0083102A */ slt $v0, $a0, $v1 -/* DD8088 802406D8 10400002 */ beqz $v0, .L802406E4 -/* DD808C 802406DC 00641023 */ subu $v0, $v1, $a0 -.L802406E0: -/* DD8090 802406E0 AE0200A8 */ sw $v0, 0xa8($s0) -.L802406E4: -/* DD8094 802406E4 8E020074 */ lw $v0, 0x74($s0) -/* DD8098 802406E8 1440000E */ bnez $v0, .L80240724 -/* DD809C 802406EC 00000000 */ nop -/* DD80A0 802406F0 8E0300AC */ lw $v1, 0xac($s0) -/* DD80A4 802406F4 8E02008C */ lw $v0, 0x8c($s0) -/* DD80A8 802406F8 00621821 */ addu $v1, $v1, $v0 -/* DD80AC 802406FC 04610004 */ bgez $v1, .L80240710 -/* DD80B0 80240700 AE0300AC */ sw $v1, 0xac($s0) -/* DD80B4 80240704 3C020002 */ lui $v0, 2 -/* DD80B8 80240708 080901C8 */ j .L80240720 -/* DD80BC 8024070C 00621021 */ addu $v0, $v1, $v0 -.L80240710: -/* DD80C0 80240710 3C040002 */ lui $a0, 2 -/* DD80C4 80240714 0083102A */ slt $v0, $a0, $v1 -/* DD80C8 80240718 10400002 */ beqz $v0, .L80240724 -/* DD80CC 8024071C 00641023 */ subu $v0, $v1, $a0 -.L80240720: -/* DD80D0 80240720 AE0200AC */ sw $v0, 0xac($s0) -.L80240724: -/* DD80D4 80240724 8E020078 */ lw $v0, 0x78($s0) -/* DD80D8 80240728 1440000E */ bnez $v0, .L80240764 -/* DD80DC 8024072C 00000000 */ nop -/* DD80E0 80240730 8E0300B0 */ lw $v1, 0xb0($s0) -/* DD80E4 80240734 8E020090 */ lw $v0, 0x90($s0) -/* DD80E8 80240738 00621821 */ addu $v1, $v1, $v0 -/* DD80EC 8024073C 04610004 */ bgez $v1, .L80240750 -/* DD80F0 80240740 AE0300B0 */ sw $v1, 0xb0($s0) -/* DD80F4 80240744 3C020002 */ lui $v0, 2 -/* DD80F8 80240748 080901D8 */ j .L80240760 -/* DD80FC 8024074C 00621021 */ addu $v0, $v1, $v0 -.L80240750: -/* DD8100 80240750 3C040002 */ lui $a0, 2 -/* DD8104 80240754 0083102A */ slt $v0, $a0, $v1 -/* DD8108 80240758 10400002 */ beqz $v0, .L80240764 -/* DD810C 8024075C 00641023 */ subu $v0, $v1, $a0 -.L80240760: -/* DD8110 80240760 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240764: -/* DD8114 80240764 8E02007C */ lw $v0, 0x7c($s0) -/* DD8118 80240768 1440000E */ bnez $v0, .L802407A4 -/* DD811C 8024076C 00000000 */ nop -/* DD8120 80240770 8E0300B4 */ lw $v1, 0xb4($s0) -/* DD8124 80240774 8E020094 */ lw $v0, 0x94($s0) -/* DD8128 80240778 00621821 */ addu $v1, $v1, $v0 -/* DD812C 8024077C 04610004 */ bgez $v1, .L80240790 -/* DD8130 80240780 AE0300B4 */ sw $v1, 0xb4($s0) -/* DD8134 80240784 3C020002 */ lui $v0, 2 -/* DD8138 80240788 080901E8 */ j .L802407A0 -/* DD813C 8024078C 00621021 */ addu $v0, $v1, $v0 -.L80240790: -/* DD8140 80240790 3C040002 */ lui $a0, 2 -/* DD8144 80240794 0083102A */ slt $v0, $a0, $v1 -/* DD8148 80240798 10400002 */ beqz $v0, .L802407A4 -/* DD814C 8024079C 00641023 */ subu $v0, $v1, $a0 -.L802407A0: -/* DD8150 802407A0 AE0200B4 */ sw $v0, 0xb4($s0) -.L802407A4: -/* DD8154 802407A4 8E040084 */ lw $a0, 0x84($s0) -/* DD8158 802407A8 0C046F07 */ jal set_main_pan_u -/* DD815C 802407AC 8E0500A8 */ lw $a1, 0xa8($s0) -/* DD8160 802407B0 8E040084 */ lw $a0, 0x84($s0) -/* DD8164 802407B4 0C046F0D */ jal set_main_pan_v -/* DD8168 802407B8 8E0500AC */ lw $a1, 0xac($s0) -/* DD816C 802407BC 8E040084 */ lw $a0, 0x84($s0) -/* DD8170 802407C0 0C046F13 */ jal set_aux_pan_u -/* DD8174 802407C4 8E0500B0 */ lw $a1, 0xb0($s0) -/* DD8178 802407C8 8E040084 */ lw $a0, 0x84($s0) -/* DD817C 802407CC 0C046F19 */ jal set_aux_pan_v -/* DD8180 802407D0 8E0500B4 */ lw $a1, 0xb4($s0) -/* DD8184 802407D4 8E020070 */ lw $v0, 0x70($s0) -/* DD8188 802407D8 8E030078 */ lw $v1, 0x78($s0) -/* DD818C 802407DC 8E040098 */ lw $a0, 0x98($s0) -/* DD8190 802407E0 24420001 */ addiu $v0, $v0, 1 -/* DD8194 802407E4 AE020070 */ sw $v0, 0x70($s0) -/* DD8198 802407E8 8E020074 */ lw $v0, 0x74($s0) -/* DD819C 802407EC 24630001 */ addiu $v1, $v1, 1 -/* DD81A0 802407F0 AE030078 */ sw $v1, 0x78($s0) -/* DD81A4 802407F4 8E030070 */ lw $v1, 0x70($s0) -/* DD81A8 802407F8 24420001 */ addiu $v0, $v0, 1 -/* DD81AC 802407FC AE020074 */ sw $v0, 0x74($s0) -/* DD81B0 80240800 8E02007C */ lw $v0, 0x7c($s0) -/* DD81B4 80240804 0064182A */ slt $v1, $v1, $a0 -/* DD81B8 80240808 24420001 */ addiu $v0, $v0, 1 -/* DD81BC 8024080C 14600002 */ bnez $v1, .L80240818 -/* DD81C0 80240810 AE02007C */ sw $v0, 0x7c($s0) -/* DD81C4 80240814 AE000070 */ sw $zero, 0x70($s0) -.L80240818: -/* DD81C8 80240818 8E020074 */ lw $v0, 0x74($s0) -/* DD81CC 8024081C 8E03009C */ lw $v1, 0x9c($s0) -/* DD81D0 80240820 0043102A */ slt $v0, $v0, $v1 -/* DD81D4 80240824 50400001 */ beql $v0, $zero, .L8024082C -/* DD81D8 80240828 AE000074 */ sw $zero, 0x74($s0) -.L8024082C: -/* DD81DC 8024082C 8E020078 */ lw $v0, 0x78($s0) -/* DD81E0 80240830 8E0300A0 */ lw $v1, 0xa0($s0) -/* DD81E4 80240834 0043102A */ slt $v0, $v0, $v1 -/* DD81E8 80240838 50400001 */ beql $v0, $zero, .L80240840 -/* DD81EC 8024083C AE000078 */ sw $zero, 0x78($s0) -.L80240840: -/* DD81F0 80240840 8E02007C */ lw $v0, 0x7c($s0) -/* DD81F4 80240844 8E0300A4 */ lw $v1, 0xa4($s0) -/* DD81F8 80240848 0043102A */ slt $v0, $v0, $v1 -/* DD81FC 8024084C 50400001 */ beql $v0, $zero, .L80240854 -/* DD8200 80240850 AE00007C */ sw $zero, 0x7c($s0) -.L80240854: -/* DD8204 80240854 8FBF0014 */ lw $ra, 0x14($sp) -/* DD8208 80240858 8FB00010 */ lw $s0, 0x10($sp) -/* DD820C 8024085C 0000102D */ daddu $v0, $zero, $zero -/* DD8210 80240860 03E00008 */ jr $ra -/* DD8214 80240864 27BD0018 */ addiu $sp, $sp, 0x18 -/* DD8218 80240868 00000000 */ nop -/* DD821C 8024086C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_11/func_802401A0_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/func_802401A0_DDC830.s deleted file mode 100644 index b584074f61..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/func_802401A0_DDC830.s +++ /dev/null @@ -1,401 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401A0_DDC9D0 -/* DDC9D0 802401A0 27BDFE90 */ addiu $sp, $sp, -0x170 -/* DDC9D4 802401A4 AFB00138 */ sw $s0, 0x138($sp) -/* DDC9D8 802401A8 00A0802D */ daddu $s0, $a1, $zero -/* DDC9DC 802401AC AFA40170 */ sw $a0, 0x170($sp) -/* DDC9E0 802401B0 AFBF015C */ sw $ra, 0x15c($sp) -/* DDC9E4 802401B4 AFBE0158 */ sw $fp, 0x158($sp) -/* DDC9E8 802401B8 AFB70154 */ sw $s7, 0x154($sp) -/* DDC9EC 802401BC AFB60150 */ sw $s6, 0x150($sp) -/* DDC9F0 802401C0 AFB5014C */ sw $s5, 0x14c($sp) -/* DDC9F4 802401C4 AFB40148 */ sw $s4, 0x148($sp) -/* DDC9F8 802401C8 AFB30144 */ sw $s3, 0x144($sp) -/* DDC9FC 802401CC AFB20140 */ sw $s2, 0x140($sp) -/* DDCA00 802401D0 AFB1013C */ sw $s1, 0x13c($sp) -/* DDCA04 802401D4 F7B60168 */ sdc1 $f22, 0x168($sp) -/* DDCA08 802401D8 F7B40160 */ sdc1 $f20, 0x160($sp) -/* DDCA0C 802401DC 0C00EABB */ jal get_npc_unsafe -/* DDCA10 802401E0 2404FFFC */ addiu $a0, $zero, -4 -/* DDCA14 802401E4 2404004A */ addiu $a0, $zero, 0x4a -/* DDCA18 802401E8 0C046C04 */ jal get_model_list_index_from_tree_index -/* DDCA1C 802401EC 0040B02D */ daddu $s6, $v0, $zero -/* DDCA20 802401F0 0C046B4C */ jal get_model_from_list_index -/* DDCA24 802401F4 0040202D */ daddu $a0, $v0, $zero -/* DDCA28 802401F8 2404003F */ addiu $a0, $zero, 0x3f -/* DDCA2C 802401FC 0C046C04 */ jal get_model_list_index_from_tree_index -/* DDCA30 80240200 0040B82D */ daddu $s7, $v0, $zero -/* DDCA34 80240204 0C046B4C */ jal get_model_from_list_index -/* DDCA38 80240208 0040202D */ daddu $a0, $v0, $zero -/* DDCA3C 8024020C 3C1E8011 */ lui $fp, %hi(gPlayerStatus) -/* DDCA40 80240210 27DEEFC8 */ addiu $fp, $fp, %lo(gPlayerStatus) -/* DDCA44 80240214 1200005F */ beqz $s0, .L80240394 -/* DDCA48 80240218 AFA2012C */ sw $v0, 0x12c($sp) -/* DDCA4C 8024021C 3C048000 */ lui $a0, 0x8000 -/* DDCA50 80240220 34840016 */ ori $a0, $a0, 0x16 -/* DDCA54 80240224 0000282D */ daddu $a1, $zero, $zero -/* DDCA58 80240228 00A0982D */ daddu $s3, $a1, $zero -/* DDCA5C 8024022C 24150004 */ addiu $s5, $zero, 4 -/* DDCA60 80240230 3C06439D */ lui $a2, 0x439d -/* DDCA64 80240234 34C68000 */ ori $a2, $a2, 0x8000 -/* DDCA68 80240238 3C0742FA */ lui $a3, 0x42fa -/* DDCA6C 8024023C 3C01C2C8 */ lui $at, 0xc2c8 -/* DDCA70 80240240 44810000 */ mtc1 $at, $f0 -/* DDCA74 80240244 3C148024 */ lui $s4, 0x8024 -/* DDCA78 80240248 26941760 */ addiu $s4, $s4, 0x1760 -/* DDCA7C 8024024C 0C052757 */ jal play_sound_at_position -/* DDCA80 80240250 E7A00010 */ swc1 $f0, 0x10($sp) -/* DDCA84 80240254 0C00AB39 */ jal heap_malloc -/* DDCA88 80240258 24040210 */ addiu $a0, $zero, 0x210 -/* DDCA8C 8024025C 0040902D */ daddu $s2, $v0, $zero -/* DDCA90 80240260 8FA90170 */ lw $t1, 0x170($sp) -/* DDCA94 80240264 26510008 */ addiu $s1, $s2, 8 -/* DDCA98 80240268 AD320070 */ sw $s2, 0x70($t1) -/* DDCA9C 8024026C AD200074 */ sw $zero, 0x74($t1) -.L80240270: -/* DDCAA0 80240270 0C046C04 */ jal get_model_list_index_from_tree_index -/* DDCAA4 80240274 8E840000 */ lw $a0, ($s4) -/* DDCAA8 80240278 0C046B4C */ jal get_model_from_list_index -/* DDCAAC 8024027C 0040202D */ daddu $a0, $v0, $zero -/* DDCAB0 80240280 0040802D */ daddu $s0, $v0, $zero -/* DDCAB4 80240284 C6060098 */ lwc1 $f6, 0x98($s0) -/* DDCAB8 80240288 C6E00098 */ lwc1 $f0, 0x98($s7) -/* DDCABC 8024028C 46003181 */ sub.s $f6, $f6, $f0 -/* DDCAC0 80240290 E6460000 */ swc1 $f6, ($s2) -/* DDCAC4 80240294 C604009C */ lwc1 $f4, 0x9c($s0) -/* DDCAC8 80240298 C6E0009C */ lwc1 $f0, 0x9c($s7) -/* DDCACC 8024029C 46002101 */ sub.s $f4, $f4, $f0 -/* DDCAD0 802402A0 E624FFFC */ swc1 $f4, -4($s1) -/* DDCAD4 802402A4 C60000A0 */ lwc1 $f0, 0xa0($s0) -/* DDCAD8 802402A8 C6E200A0 */ lwc1 $f2, 0xa0($s7) -/* DDCADC 802402AC 0000302D */ daddu $a2, $zero, $zero -/* DDCAE0 802402B0 46020001 */ sub.s $f0, $f0, $f2 -/* DDCAE4 802402B4 E7A60120 */ swc1 $f6, 0x120($sp) -/* DDCAE8 802402B8 E7A40124 */ swc1 $f4, 0x124($sp) -/* DDCAEC 802402BC E6200000 */ swc1 $f0, ($s1) -/* DDCAF0 802402C0 E7A00128 */ swc1 $f0, 0x128($sp) -/* DDCAF4 802402C4 0000282D */ daddu $a1, $zero, $zero -.L802402C8: -/* DDCAF8 802402C8 00062100 */ sll $a0, $a2, 4 -.L802402CC: -/* DDCAFC 802402CC 02441821 */ addu $v1, $s2, $a0 -/* DDCB00 802402D0 02041021 */ addu $v0, $s0, $a0 -/* DDCB04 802402D4 24840004 */ addiu $a0, $a0, 4 -/* DDCB08 802402D8 24A50001 */ addiu $a1, $a1, 1 -/* DDCB0C 802402DC C4400058 */ lwc1 $f0, 0x58($v0) -/* DDCB10 802402E0 28A20004 */ slti $v0, $a1, 4 -/* DDCB14 802402E4 1440FFF9 */ bnez $v0, .L802402CC -/* DDCB18 802402E8 E4600018 */ swc1 $f0, 0x18($v1) -/* DDCB1C 802402EC 24C60001 */ addiu $a2, $a2, 1 -/* DDCB20 802402F0 28C20004 */ slti $v0, $a2, 4 -/* DDCB24 802402F4 1440FFF4 */ bnez $v0, .L802402C8 -/* DDCB28 802402F8 0000282D */ daddu $a1, $zero, $zero -/* DDCB2C 802402FC 26310058 */ addiu $s1, $s1, 0x58 -/* DDCB30 80240300 3C098024 */ lui $t1, 0x8024 -/* DDCB34 80240304 25291760 */ addiu $t1, $t1, 0x1760 -/* DDCB38 80240308 02A91021 */ addu $v0, $s5, $t1 -/* DDCB3C 8024030C 8C440000 */ lw $a0, ($v0) -/* DDCB40 80240310 0C046C04 */ jal get_model_list_index_from_tree_index -/* DDCB44 80240314 26520058 */ addiu $s2, $s2, 0x58 -/* DDCB48 80240318 0C046B4C */ jal get_model_from_list_index -/* DDCB4C 8024031C 0040202D */ daddu $a0, $v0, $zero -/* DDCB50 80240320 0040802D */ daddu $s0, $v0, $zero -/* DDCB54 80240324 C7A00120 */ lwc1 $f0, 0x120($sp) -/* DDCB58 80240328 C7A20124 */ lwc1 $f2, 0x124($sp) -/* DDCB5C 8024032C C7A40128 */ lwc1 $f4, 0x128($sp) -/* DDCB60 80240330 0000302D */ daddu $a2, $zero, $zero -/* DDCB64 80240334 E6400000 */ swc1 $f0, ($s2) -/* DDCB68 80240338 E622FFFC */ swc1 $f2, -4($s1) -/* DDCB6C 8024033C E6240000 */ swc1 $f4, ($s1) -/* DDCB70 80240340 0000282D */ daddu $a1, $zero, $zero -.L80240344: -/* DDCB74 80240344 00062100 */ sll $a0, $a2, 4 -.L80240348: -/* DDCB78 80240348 02441821 */ addu $v1, $s2, $a0 -/* DDCB7C 8024034C 02041021 */ addu $v0, $s0, $a0 -/* DDCB80 80240350 24840004 */ addiu $a0, $a0, 4 -/* DDCB84 80240354 24A50001 */ addiu $a1, $a1, 1 -/* DDCB88 80240358 C4400058 */ lwc1 $f0, 0x58($v0) -/* DDCB8C 8024035C 28A20004 */ slti $v0, $a1, 4 -/* DDCB90 80240360 1440FFF9 */ bnez $v0, .L80240348 -/* DDCB94 80240364 E4600018 */ swc1 $f0, 0x18($v1) -/* DDCB98 80240368 24C60001 */ addiu $a2, $a2, 1 -/* DDCB9C 8024036C 28C20004 */ slti $v0, $a2, 4 -/* DDCBA0 80240370 1440FFF4 */ bnez $v0, .L80240344 -/* DDCBA4 80240374 0000282D */ daddu $a1, $zero, $zero -/* DDCBA8 80240378 26310058 */ addiu $s1, $s1, 0x58 -/* DDCBAC 8024037C 26520058 */ addiu $s2, $s2, 0x58 -/* DDCBB0 80240380 26B50008 */ addiu $s5, $s5, 8 -/* DDCBB4 80240384 26730002 */ addiu $s3, $s3, 2 -/* DDCBB8 80240388 2E620006 */ sltiu $v0, $s3, 6 -/* DDCBBC 8024038C 1440FFB8 */ bnez $v0, .L80240270 -/* DDCBC0 80240390 26940008 */ addiu $s4, $s4, 8 -.L80240394: -/* DDCBC4 80240394 27B500A0 */ addiu $s5, $sp, 0xa0 -/* DDCBC8 80240398 27B40060 */ addiu $s4, $sp, 0x60 -/* DDCBCC 8024039C 27A900E0 */ addiu $t1, $sp, 0xe0 -/* DDCBD0 802403A0 AFA90130 */ sw $t1, 0x130($sp) -/* DDCBD4 802403A4 8FA90170 */ lw $t1, 0x170($sp) -/* DDCBD8 802403A8 4480A000 */ mtc1 $zero, $f20 -/* DDCBDC 802403AC 3C138024 */ lui $s3, 0x8024 -/* DDCBE0 802403B0 26731778 */ addiu $s3, $s3, 0x1778 -/* DDCBE4 802403B4 AFA00134 */ sw $zero, 0x134($sp) -/* DDCBE8 802403B8 8D320070 */ lw $s2, 0x70($t1) -/* DDCBEC 802403BC 3C013F80 */ lui $at, 0x3f80 -/* DDCBF0 802403C0 4481B000 */ mtc1 $at, $f22 -/* DDCBF4 802403C4 26510014 */ addiu $s1, $s2, 0x14 -.L802403C8: -/* DDCBF8 802403C8 8FA90134 */ lw $t1, 0x134($sp) -/* DDCBFC 802403CC 3C048024 */ lui $a0, 0x8024 -/* DDCC00 802403D0 00892021 */ addu $a0, $a0, $t1 -/* DDCC04 802403D4 0C046C04 */ jal get_model_list_index_from_tree_index -/* DDCC08 802403D8 8C841760 */ lw $a0, 0x1760($a0) -/* DDCC0C 802403DC 0C046B4C */ jal get_model_from_list_index -/* DDCC10 802403E0 0040202D */ daddu $a0, $v0, $zero -/* DDCC14 802403E4 0040802D */ daddu $s0, $v0, $zero -/* DDCC18 802403E8 0000302D */ daddu $a2, $zero, $zero -/* DDCC1C 802403EC 0000282D */ daddu $a1, $zero, $zero -.L802403F0: -/* DDCC20 802403F0 00062100 */ sll $a0, $a2, 4 -.L802403F4: -/* DDCC24 802403F4 02041821 */ addu $v1, $s0, $a0 -/* DDCC28 802403F8 02441021 */ addu $v0, $s2, $a0 -/* DDCC2C 802403FC 24840004 */ addiu $a0, $a0, 4 -/* DDCC30 80240400 24A50001 */ addiu $a1, $a1, 1 -/* DDCC34 80240404 C4400018 */ lwc1 $f0, 0x18($v0) -/* DDCC38 80240408 28A20004 */ slti $v0, $a1, 4 -/* DDCC3C 8024040C 1440FFF9 */ bnez $v0, .L802403F4 -/* DDCC40 80240410 E4600058 */ swc1 $f0, 0x58($v1) -/* DDCC44 80240414 24C60001 */ addiu $a2, $a2, 1 -/* DDCC48 80240418 28C20004 */ slti $v0, $a2, 4 -/* DDCC4C 8024041C 1440FFF4 */ bnez $v0, .L802403F0 -/* DDCC50 80240420 0000282D */ daddu $a1, $zero, $zero -/* DDCC54 80240424 96020000 */ lhu $v0, ($s0) -/* DDCC58 80240428 34421400 */ ori $v0, $v0, 0x1400 -/* DDCC5C 8024042C A6020000 */ sh $v0, ($s0) -/* DDCC60 80240430 8E450000 */ lw $a1, ($s2) -/* DDCC64 80240434 8E26FFF0 */ lw $a2, -0x10($s1) -/* DDCC68 80240438 8E27FFF4 */ lw $a3, -0xc($s1) -/* DDCC6C 8024043C 0C019E40 */ jal guTranslateF -/* DDCC70 80240440 27A40020 */ addiu $a0, $sp, 0x20 -/* DDCC74 80240444 8FA90170 */ lw $t1, 0x170($sp) -/* DDCC78 80240448 4406A000 */ mfc1 $a2, $f20 -/* DDCC7C 8024044C 4407A000 */ mfc1 $a3, $f20 -/* DDCC80 80240450 C5200074 */ lwc1 $f0, 0x74($t1) -/* DDCC84 80240454 46800020 */ cvt.s.w $f0, $f0 -/* DDCC88 80240458 44050000 */ mfc1 $a1, $f0 -/* DDCC8C 8024045C 02A0202D */ daddu $a0, $s5, $zero -/* DDCC90 80240460 0C019EC8 */ jal guRotateF -/* DDCC94 80240464 E7B60010 */ swc1 $f22, 0x10($sp) -/* DDCC98 80240468 C6400000 */ lwc1 $f0, ($s2) -/* DDCC9C 8024046C C622FFF4 */ lwc1 $f2, -0xc($s1) -/* DDCCA0 80240470 46000007 */ neg.s $f0, $f0 -/* DDCCA4 80240474 46001087 */ neg.s $f2, $f2 -/* DDCCA8 80240478 44050000 */ mfc1 $a1, $f0 -/* DDCCAC 8024047C C620FFF0 */ lwc1 $f0, -0x10($s1) -/* DDCCB0 80240480 44071000 */ mfc1 $a3, $f2 -/* DDCCB4 80240484 46000007 */ neg.s $f0, $f0 -/* DDCCB8 80240488 44060000 */ mfc1 $a2, $f0 -/* DDCCBC 8024048C 0C019E40 */ jal guTranslateF -/* DDCCC0 80240490 0280202D */ daddu $a0, $s4, $zero -/* DDCCC4 80240494 4406A000 */ mfc1 $a2, $f20 -/* DDCCC8 80240498 8FA90170 */ lw $t1, 0x170($sp) -/* DDCCCC 8024049C 4407A000 */ mfc1 $a3, $f20 -/* DDCCD0 802404A0 8D220074 */ lw $v0, 0x74($t1) -/* DDCCD4 802404A4 8FA40130 */ lw $a0, 0x130($sp) -/* DDCCD8 802404A8 00021023 */ negu $v0, $v0 -/* DDCCDC 802404AC 44824000 */ mtc1 $v0, $f8 -/* DDCCE0 802404B0 00000000 */ nop -/* DDCCE4 802404B4 46804220 */ cvt.s.w $f8, $f8 -/* DDCCE8 802404B8 44054000 */ mfc1 $a1, $f8 -/* DDCCEC 802404BC 0C019EC8 */ jal guRotateF -/* DDCCF0 802404C0 E7B60010 */ swc1 $f22, 0x10($sp) -/* DDCCF4 802404C4 27A40020 */ addiu $a0, $sp, 0x20 -/* DDCCF8 802404C8 02A0282D */ daddu $a1, $s5, $zero -/* DDCCFC 802404CC 0C019D80 */ jal guMtxCatF -/* DDCD00 802404D0 02A0302D */ daddu $a2, $s5, $zero -/* DDCD04 802404D4 02A0202D */ daddu $a0, $s5, $zero -/* DDCD08 802404D8 0280282D */ daddu $a1, $s4, $zero -/* DDCD0C 802404DC 0C019D80 */ jal guMtxCatF -/* DDCD10 802404E0 0280302D */ daddu $a2, $s4, $zero -/* DDCD14 802404E4 0280282D */ daddu $a1, $s4, $zero -/* DDCD18 802404E8 8FA40130 */ lw $a0, 0x130($sp) -/* DDCD1C 802404EC 0C019D80 */ jal guMtxCatF -/* DDCD20 802404F0 0280302D */ daddu $a2, $s4, $zero -/* DDCD24 802404F4 26100058 */ addiu $s0, $s0, 0x58 -/* DDCD28 802404F8 0200202D */ daddu $a0, $s0, $zero -/* DDCD2C 802404FC 0280282D */ daddu $a1, $s4, $zero -/* DDCD30 80240500 0C019D80 */ jal guMtxCatF -/* DDCD34 80240504 0200302D */ daddu $a2, $s0, $zero -/* DDCD38 80240508 86640002 */ lh $a0, 2($s3) -/* DDCD3C 8024050C 0C016E89 */ jal update_collider_transform -/* DDCD40 80240510 00000000 */ nop -/* DDCD44 80240514 0200202D */ daddu $a0, $s0, $zero -/* DDCD48 80240518 4405A000 */ mfc1 $a1, $f20 -/* DDCD4C 8024051C 4406A000 */ mfc1 $a2, $f20 -/* DDCD50 80240520 4407A000 */ mfc1 $a3, $f20 -/* DDCD54 80240524 27A20120 */ addiu $v0, $sp, 0x120 -/* DDCD58 80240528 AFA20010 */ sw $v0, 0x10($sp) -/* DDCD5C 8024052C 27A20124 */ addiu $v0, $sp, 0x124 -/* DDCD60 80240530 AFA20014 */ sw $v0, 0x14($sp) -/* DDCD64 80240534 27A20128 */ addiu $v0, $sp, 0x128 -/* DDCD68 80240538 0C019E9C */ jal guMtxXFMF -/* DDCD6C 8024053C AFA20018 */ sw $v0, 0x18($sp) -/* DDCD70 80240540 3C028016 */ lui $v0, 0x8016 -/* DDCD74 80240544 8442A552 */ lh $v0, -0x5aae($v0) -/* DDCD78 80240548 8E630000 */ lw $v1, ($s3) -/* DDCD7C 8024054C 10430005 */ beq $v0, $v1, .L80240564 -/* DDCD80 80240550 00000000 */ nop -/* DDCD84 80240554 3C028016 */ lui $v0, 0x8016 -/* DDCD88 80240558 8442A554 */ lh $v0, -0x5aac($v0) -/* DDCD8C 8024055C 1443000D */ bne $v0, $v1, .L80240594 -/* DDCD90 80240560 00000000 */ nop -.L80240564: -/* DDCD94 80240564 C7A00120 */ lwc1 $f0, 0x120($sp) -/* DDCD98 80240568 C622FFF8 */ lwc1 $f2, -8($s1) -/* DDCD9C 8024056C 46020001 */ sub.s $f0, $f0, $f2 -/* DDCDA0 80240570 E7C0001C */ swc1 $f0, 0x1c($fp) -/* DDCDA4 80240574 C7A00124 */ lwc1 $f0, 0x124($sp) -/* DDCDA8 80240578 C622FFFC */ lwc1 $f2, -4($s1) -/* DDCDAC 8024057C 46020001 */ sub.s $f0, $f0, $f2 -/* DDCDB0 80240580 E7C00020 */ swc1 $f0, 0x20($fp) -/* DDCDB4 80240584 C7A00128 */ lwc1 $f0, 0x128($sp) -/* DDCDB8 80240588 C6220000 */ lwc1 $f2, ($s1) -/* DDCDBC 8024058C 46020001 */ sub.s $f0, $f0, $f2 -/* DDCDC0 80240590 E7C00024 */ swc1 $f0, 0x24($fp) -.L80240594: -/* DDCDC4 80240594 86C30084 */ lh $v1, 0x84($s6) -/* DDCDC8 80240598 8E620000 */ lw $v0, ($s3) -/* DDCDCC 8024059C 14620013 */ bne $v1, $v0, .L802405EC -/* DDCDD0 802405A0 26730004 */ addiu $s3, $s3, 4 -/* DDCDD4 802405A4 C7A20120 */ lwc1 $f2, 0x120($sp) -/* DDCDD8 802405A8 C620FFF8 */ lwc1 $f0, -8($s1) -/* DDCDDC 802405AC 46001081 */ sub.s $f2, $f2, $f0 -/* DDCDE0 802405B0 C6C00038 */ lwc1 $f0, 0x38($s6) -/* DDCDE4 802405B4 46020000 */ add.s $f0, $f0, $f2 -/* DDCDE8 802405B8 E6C00038 */ swc1 $f0, 0x38($s6) -/* DDCDEC 802405BC C7A20124 */ lwc1 $f2, 0x124($sp) -/* DDCDF0 802405C0 C620FFFC */ lwc1 $f0, -4($s1) -/* DDCDF4 802405C4 46001081 */ sub.s $f2, $f2, $f0 -/* DDCDF8 802405C8 C6C0003C */ lwc1 $f0, 0x3c($s6) -/* DDCDFC 802405CC 46020000 */ add.s $f0, $f0, $f2 -/* DDCE00 802405D0 E6C0003C */ swc1 $f0, 0x3c($s6) -/* DDCE04 802405D4 C7A20128 */ lwc1 $f2, 0x128($sp) -/* DDCE08 802405D8 C6200000 */ lwc1 $f0, ($s1) -/* DDCE0C 802405DC 46001081 */ sub.s $f2, $f2, $f0 -/* DDCE10 802405E0 C6C00040 */ lwc1 $f0, 0x40($s6) -/* DDCE14 802405E4 46020000 */ add.s $f0, $f0, $f2 -/* DDCE18 802405E8 E6C00040 */ swc1 $f0, 0x40($s6) -.L802405EC: -/* DDCE1C 802405EC 26520058 */ addiu $s2, $s2, 0x58 -/* DDCE20 802405F0 8FA90134 */ lw $t1, 0x134($sp) -/* DDCE24 802405F4 C7A00120 */ lwc1 $f0, 0x120($sp) -/* DDCE28 802405F8 C7A20124 */ lwc1 $f2, 0x124($sp) -/* DDCE2C 802405FC C7A40128 */ lwc1 $f4, 0x128($sp) -/* DDCE30 80240600 25290004 */ addiu $t1, $t1, 4 -/* DDCE34 80240604 AFA90134 */ sw $t1, 0x134($sp) -/* DDCE38 80240608 E620FFF8 */ swc1 $f0, -8($s1) -/* DDCE3C 8024060C E622FFFC */ swc1 $f2, -4($s1) -/* DDCE40 80240610 E6240000 */ swc1 $f4, ($s1) -/* DDCE44 80240614 3C098024 */ lui $t1, 0x8024 -/* DDCE48 80240618 25291778 */ addiu $t1, $t1, 0x1778 -/* DDCE4C 8024061C 25220018 */ addiu $v0, $t1, 0x18 -/* DDCE50 80240620 0262102B */ sltu $v0, $s3, $v0 -/* DDCE54 80240624 1440FF68 */ bnez $v0, .L802403C8 -/* DDCE58 80240628 26310058 */ addiu $s1, $s1, 0x58 -/* DDCE5C 8024062C 8FA90170 */ lw $t1, 0x170($sp) -/* DDCE60 80240630 4480A000 */ mtc1 $zero, $f20 -/* DDCE64 80240634 3C013F80 */ lui $at, 0x3f80 -/* DDCE68 80240638 4481B000 */ mtc1 $at, $f22 -/* DDCE6C 8024063C C5200074 */ lwc1 $f0, 0x74($t1) -/* DDCE70 80240640 46800020 */ cvt.s.w $f0, $f0 -/* DDCE74 80240644 44050000 */ mfc1 $a1, $f0 -/* DDCE78 80240648 4406A000 */ mfc1 $a2, $f20 -/* DDCE7C 8024064C 4407A000 */ mfc1 $a3, $f20 -/* DDCE80 80240650 26E40058 */ addiu $a0, $s7, 0x58 -/* DDCE84 80240654 0C019EC8 */ jal guRotateF -/* DDCE88 80240658 E7B60010 */ swc1 $f22, 0x10($sp) -/* DDCE8C 8024065C 96E20000 */ lhu $v0, ($s7) -/* DDCE90 80240660 24040032 */ addiu $a0, $zero, 0x32 -/* DDCE94 80240664 34421400 */ ori $v0, $v0, 0x1400 -/* DDCE98 80240668 0C016E89 */ jal update_collider_transform -/* DDCE9C 8024066C A6E20000 */ sh $v0, ($s7) -/* DDCEA0 80240670 8FA90170 */ lw $t1, 0x170($sp) -/* DDCEA4 80240674 4406A000 */ mfc1 $a2, $f20 -/* DDCEA8 80240678 C5200074 */ lwc1 $f0, 0x74($t1) -/* DDCEAC 8024067C 46800020 */ cvt.s.w $f0, $f0 -/* DDCEB0 80240680 44050000 */ mfc1 $a1, $f0 -/* DDCEB4 80240684 8FA9012C */ lw $t1, 0x12c($sp) -/* DDCEB8 80240688 00C0382D */ daddu $a3, $a2, $zero -/* DDCEBC 8024068C E7B60010 */ swc1 $f22, 0x10($sp) -/* DDCEC0 80240690 0C019EC8 */ jal guRotateF -/* DDCEC4 80240694 25240058 */ addiu $a0, $t1, 0x58 -/* DDCEC8 80240698 8FA9012C */ lw $t1, 0x12c($sp) -/* DDCECC 8024069C 0000982D */ daddu $s3, $zero, $zero -/* DDCED0 802406A0 95220000 */ lhu $v0, ($t1) -/* DDCED4 802406A4 24040027 */ addiu $a0, $zero, 0x27 -/* DDCED8 802406A8 34421400 */ ori $v0, $v0, 0x1400 -/* DDCEDC 802406AC 0C016E89 */ jal update_collider_transform -/* DDCEE0 802406B0 A5220000 */ sh $v0, ($t1) -/* DDCEE4 802406B4 0260202D */ daddu $a0, $s3, $zero -/* DDCEE8 802406B8 3C05800B */ lui $a1, %hi(gCameras) -/* DDCEEC 802406BC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* DDCEF0 802406C0 2408000E */ addiu $t0, $zero, 0xe -/* DDCEF4 802406C4 24070010 */ addiu $a3, $zero, 0x10 -/* DDCEF8 802406C8 3C038024 */ lui $v1, 0x8024 -/* DDCEFC 802406CC 24631778 */ addiu $v1, $v1, 0x1778 -/* DDCF00 802406D0 3C068016 */ lui $a2, 0x8016 -/* DDCF04 802406D4 84C6A552 */ lh $a2, -0x5aae($a2) -.L802406D8: -/* DDCF08 802406D8 8C620000 */ lw $v0, ($v1) -/* DDCF0C 802406DC 54C20012 */ bnel $a2, $v0, .L80240728 -/* DDCF10 802406E0 26730001 */ addiu $s3, $s3, 1 -/* DDCF14 802406E4 8FC20000 */ lw $v0, ($fp) -/* DDCF18 802406E8 30421000 */ andi $v0, $v0, 0x1000 -/* DDCF1C 802406EC 10400007 */ beqz $v0, .L8024070C -/* DDCF20 802406F0 00000000 */ nop -/* DDCF24 802406F4 C7C00028 */ lwc1 $f0, 0x28($fp) -/* DDCF28 802406F8 C7C2002C */ lwc1 $f2, 0x2c($fp) -/* DDCF2C 802406FC C7C40030 */ lwc1 $f4, 0x30($fp) -/* DDCF30 80240700 E4A00060 */ swc1 $f0, 0x60($a1) -/* DDCF34 80240704 E4A20064 */ swc1 $f2, 0x64($a1) -/* DDCF38 80240708 E4A40068 */ swc1 $f4, 0x68($a1) -.L8024070C: -/* DDCF3C 8024070C 83C200B4 */ lb $v0, 0xb4($fp) -/* DDCF40 80240710 50480004 */ beql $v0, $t0, .L80240724 -/* DDCF44 80240714 24040001 */ addiu $a0, $zero, 1 -/* DDCF48 80240718 54470003 */ bnel $v0, $a3, .L80240728 -/* DDCF4C 8024071C 26730001 */ addiu $s3, $s3, 1 -/* DDCF50 80240720 24040001 */ addiu $a0, $zero, 1 -.L80240724: -/* DDCF54 80240724 26730001 */ addiu $s3, $s3, 1 -.L80240728: -/* DDCF58 80240728 2E620006 */ sltiu $v0, $s3, 6 -/* DDCF5C 8024072C 1440FFEA */ bnez $v0, .L802406D8 -/* DDCF60 80240730 24630004 */ addiu $v1, $v1, 4 -/* DDCF64 80240734 14800005 */ bnez $a0, .L8024074C -/* DDCF68 80240738 00000000 */ nop -/* DDCF6C 8024073C 8FA90170 */ lw $t1, 0x170($sp) -/* DDCF70 80240740 8D220074 */ lw $v0, 0x74($t1) -/* DDCF74 80240744 2442FFFF */ addiu $v0, $v0, -1 -/* DDCF78 80240748 AD220074 */ sw $v0, 0x74($t1) -.L8024074C: -/* DDCF7C 8024074C 8FBF015C */ lw $ra, 0x15c($sp) -/* DDCF80 80240750 8FBE0158 */ lw $fp, 0x158($sp) -/* DDCF84 80240754 8FB70154 */ lw $s7, 0x154($sp) -/* DDCF88 80240758 8FB60150 */ lw $s6, 0x150($sp) -/* DDCF8C 8024075C 8FB5014C */ lw $s5, 0x14c($sp) -/* DDCF90 80240760 8FB40148 */ lw $s4, 0x148($sp) -/* DDCF94 80240764 8FB30144 */ lw $s3, 0x144($sp) -/* DDCF98 80240768 8FB20140 */ lw $s2, 0x140($sp) -/* DDCF9C 8024076C 8FB1013C */ lw $s1, 0x13c($sp) -/* DDCFA0 80240770 8FB00138 */ lw $s0, 0x138($sp) -/* DDCFA4 80240774 D7B60168 */ ldc1 $f22, 0x168($sp) -/* DDCFA8 80240778 D7B40160 */ ldc1 $f20, 0x160($sp) -/* DDCFAC 8024077C 0000102D */ daddu $v0, $zero, $zero -/* DDCFB0 80240780 03E00008 */ jr $ra -/* DDCFB4 80240784 27BD0170 */ addiu $sp, $sp, 0x170 -/* DDCFB8 80240788 00000000 */ nop -/* DDCFBC 8024078C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_11/func_80240790_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/func_80240790_DDC830.s deleted file mode 100644 index 0e94d02b2d..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/func_80240790_DDC830.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240790_DDCFC0 -/* DDCFC0 80240790 3C03800A */ lui $v1, %hi(D_8009A650) -/* DDCFC4 80240794 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* DDCFC8 80240798 8C620000 */ lw $v0, ($v1) -/* DDCFCC 8024079C 34420040 */ ori $v0, $v0, 0x40 -/* DDCFD0 802407A0 AC620000 */ sw $v0, ($v1) -/* DDCFD4 802407A4 03E00008 */ jr $ra -/* DDCFD8 802407A8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_11/func_802407AC_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/func_802407AC_DDC830.s deleted file mode 100644 index 6d82ebaa95..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/func_802407AC_DDC830.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407AC_DDCFDC -/* DDCFDC 802407AC 3C02800A */ lui $v0, %hi(D_8009A650) -/* DDCFE0 802407B0 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* DDCFE4 802407B4 8C430000 */ lw $v1, ($v0) -/* DDCFE8 802407B8 2404FFBF */ addiu $a0, $zero, -0x41 -/* DDCFEC 802407BC 00641824 */ and $v1, $v1, $a0 -/* DDCFF0 802407C0 AC430000 */ sw $v1, ($v0) -/* DDCFF4 802407C4 03E00008 */ jr $ra -/* DDCFF8 802407C8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_11/func_802407CC_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/func_802407CC_DDC830.s deleted file mode 100644 index fa8b677244..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/func_802407CC_DDC830.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407CC_DDCFFC -/* DDCFFC 802407CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DDD000 802407D0 AFBF0010 */ sw $ra, 0x10($sp) -/* DDD004 802407D4 8C82000C */ lw $v0, 0xc($a0) -/* DDD008 802407D8 0C0B1EAF */ jal get_variable -/* DDD00C 802407DC 8C450000 */ lw $a1, ($v0) -/* DDD010 802407E0 0C0B95A4 */ jal func_802E5690 -/* DDD014 802407E4 0040202D */ daddu $a0, $v0, $zero -/* DDD018 802407E8 8FBF0010 */ lw $ra, 0x10($sp) -/* DDD01C 802407EC 24020002 */ addiu $v0, $zero, 2 -/* DDD020 802407F0 03E00008 */ jr $ra -/* DDD024 802407F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_11/func_802408B0_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/func_802408B0_DDC830.s deleted file mode 100644 index e7f9f32c77..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/func_802408B0_DDC830.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408B0_DDD0E0 -/* DDD0E0 802408B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DDD0E4 802408B4 AFB3001C */ sw $s3, 0x1c($sp) -/* DDD0E8 802408B8 0080982D */ daddu $s3, $a0, $zero -/* DDD0EC 802408BC AFB00010 */ sw $s0, 0x10($sp) -/* DDD0F0 802408C0 24100001 */ addiu $s0, $zero, 1 -/* DDD0F4 802408C4 AFB40020 */ sw $s4, 0x20($sp) -/* DDD0F8 802408C8 2414FFFF */ addiu $s4, $zero, -1 -/* DDD0FC 802408CC AFB50024 */ sw $s5, 0x24($sp) -/* DDD100 802408D0 0200A82D */ daddu $s5, $s0, $zero -/* DDD104 802408D4 AFB10014 */ sw $s1, 0x14($sp) -/* DDD108 802408D8 3C118011 */ lui $s1, 0x8011 -/* DDD10C 802408DC 2631F298 */ addiu $s1, $s1, -0xd68 -/* DDD110 802408E0 AFBF0028 */ sw $ra, 0x28($sp) -/* DDD114 802408E4 AFB20018 */ sw $s2, 0x18($sp) -/* DDD118 802408E8 8E6200B4 */ lw $v0, 0xb4($s3) -/* DDD11C 802408EC 0280182D */ daddu $v1, $s4, $zero -/* DDD120 802408F0 AE630084 */ sw $v1, 0x84($s3) -/* DDD124 802408F4 00021027 */ nor $v0, $zero, $v0 -/* DDD128 802408F8 000217C2 */ srl $v0, $v0, 0x1f -/* DDD12C 802408FC 00029400 */ sll $s2, $v0, 0x10 -.L80240900: -/* DDD130 80240900 92220014 */ lbu $v0, 0x14($s1) -/* DDD134 80240904 50400008 */ beql $v0, $zero, .L80240928 -/* DDD138 80240908 26100001 */ addiu $s0, $s0, 1 -/* DDD13C 8024090C 0200202D */ daddu $a0, $s0, $zero -/* DDD140 80240910 0C090219 */ jal func_80240864 -/* DDD144 80240914 00122C03 */ sra $a1, $s2, 0x10 -/* DDD148 80240918 10540003 */ beq $v0, $s4, .L80240928 -/* DDD14C 8024091C 26100001 */ addiu $s0, $s0, 1 -/* DDD150 80240920 0809024D */ j .L80240934 -/* DDD154 80240924 AE750084 */ sw $s5, 0x84($s3) -.L80240928: -/* DDD158 80240928 2A02000C */ slti $v0, $s0, 0xc -/* DDD15C 8024092C 1440FFF4 */ bnez $v0, .L80240900 -/* DDD160 80240930 26310008 */ addiu $s1, $s1, 8 -.L80240934: -/* DDD164 80240934 8FBF0028 */ lw $ra, 0x28($sp) -/* DDD168 80240938 8FB50024 */ lw $s5, 0x24($sp) -/* DDD16C 8024093C 8FB40020 */ lw $s4, 0x20($sp) -/* DDD170 80240940 8FB3001C */ lw $s3, 0x1c($sp) -/* DDD174 80240944 8FB20018 */ lw $s2, 0x18($sp) -/* DDD178 80240948 8FB10014 */ lw $s1, 0x14($sp) -/* DDD17C 8024094C 8FB00010 */ lw $s0, 0x10($sp) -/* DDD180 80240950 24020002 */ addiu $v0, $zero, 2 -/* DDD184 80240954 03E00008 */ jr $ra -/* DDD188 80240958 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_11/func_8024095C_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/func_8024095C_DDC830.s deleted file mode 100644 index 7d9b73a34e..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/func_8024095C_DDC830.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024095C_DDD18C -/* DDD18C 8024095C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DDD190 80240960 AFB5002C */ sw $s5, 0x2c($sp) -/* DDD194 80240964 0080A82D */ daddu $s5, $a0, $zero -/* DDD198 80240968 AFBE0038 */ sw $fp, 0x38($sp) -/* DDD19C 8024096C 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* DDD1A0 80240970 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* DDD1A4 80240974 AFBF003C */ sw $ra, 0x3c($sp) -/* DDD1A8 80240978 AFB70034 */ sw $s7, 0x34($sp) -/* DDD1AC 8024097C AFB60030 */ sw $s6, 0x30($sp) -/* DDD1B0 80240980 AFB40028 */ sw $s4, 0x28($sp) -/* DDD1B4 80240984 AFB30024 */ sw $s3, 0x24($sp) -/* DDD1B8 80240988 AFB20020 */ sw $s2, 0x20($sp) -/* DDD1BC 8024098C AFB1001C */ sw $s1, 0x1c($sp) -/* DDD1C0 80240990 10A0004F */ beqz $a1, .L80240AD0 -/* DDD1C4 80240994 AFB00018 */ sw $s0, 0x18($sp) -/* DDD1C8 80240998 0C00AB39 */ jal heap_malloc -/* DDD1CC 8024099C 24040330 */ addiu $a0, $zero, 0x330 -/* DDD1D0 802409A0 0040982D */ daddu $s3, $v0, $zero -/* DDD1D4 802409A4 0000B02D */ daddu $s6, $zero, $zero -/* DDD1D8 802409A8 02C0902D */ daddu $s2, $s6, $zero -/* DDD1DC 802409AC 3C148024 */ lui $s4, 0x8024 -/* DDD1E0 802409B0 26941E48 */ addiu $s4, $s4, 0x1e48 -/* DDD1E4 802409B4 0260882D */ daddu $s1, $s3, $zero -/* DDD1E8 802409B8 8EA200B4 */ lw $v0, 0xb4($s5) -/* DDD1EC 802409BC 3C038024 */ lui $v1, 0x8024 -/* DDD1F0 802409C0 24631E40 */ addiu $v1, $v1, 0x1e40 -/* DDD1F4 802409C4 AEB30078 */ sw $s3, 0x78($s5) -/* DDD1F8 802409C8 00021027 */ nor $v0, $zero, $v0 -/* DDD1FC 802409CC 0002BFC2 */ srl $s7, $v0, 0x1f -/* DDD200 802409D0 00171080 */ sll $v0, $s7, 2 -/* DDD204 802409D4 00431021 */ addu $v0, $v0, $v1 -/* DDD208 802409D8 AFA20010 */ sw $v0, 0x10($sp) -.L802409DC: -/* DDD20C 802409DC 86900000 */ lh $s0, ($s4) -/* DDD210 802409E0 001010C0 */ sll $v0, $s0, 3 -/* DDD214 802409E4 03C21021 */ addu $v0, $fp, $v0 -/* DDD218 802409E8 90420014 */ lbu $v0, 0x14($v0) -/* DDD21C 802409EC 5040002E */ beql $v0, $zero, .L80240AA8 -/* DDD220 802409F0 26520001 */ addiu $s2, $s2, 1 -/* DDD224 802409F4 00101100 */ sll $v0, $s0, 4 -/* DDD228 802409F8 3C068009 */ lui $a2, 0x8009 -/* DDD22C 802409FC 24C6EF20 */ addiu $a2, $a2, -0x10e0 -/* DDD230 80240A00 00461021 */ addu $v0, $v0, $a2 -/* DDD234 80240A04 0200202D */ daddu $a0, $s0, $zero -/* DDD238 80240A08 AE300108 */ sw $s0, 0x108($s1) -/* DDD23C 80240A0C 8C420000 */ lw $v0, ($v0) -/* DDD240 80240A10 02E0282D */ daddu $a1, $s7, $zero -/* DDD244 80240A14 0C090219 */ jal func_80240864 -/* DDD248 80240A18 AE220084 */ sw $v0, 0x84($s1) -/* DDD24C 80240A1C 0040202D */ daddu $a0, $v0, $zero -/* DDD250 80240A20 04800011 */ bltz $a0, .L80240A68 -/* DDD254 80240A24 00101080 */ sll $v0, $s0, 2 -/* DDD258 80240A28 3C06800F */ lui $a2, 0x800f -/* DDD25C 80240A2C 24C67F00 */ addiu $a2, $a2, 0x7f00 -/* DDD260 80240A30 00461021 */ addu $v0, $v0, $a2 -/* DDD264 80240A34 8C430000 */ lw $v1, ($v0) -/* DDD268 80240A38 24020001 */ addiu $v0, $zero, 1 -/* DDD26C 80240A3C AE22018C */ sw $v0, 0x18c($s1) -/* DDD270 80240A40 00041080 */ sll $v0, $a0, 2 -/* DDD274 80240A44 3C068024 */ lui $a2, 0x8024 -/* DDD278 80240A48 24C61E58 */ addiu $a2, $a2, 0x1e58 -/* DDD27C 80240A4C AE230000 */ sw $v1, ($s1) -/* DDD280 80240A50 001218C0 */ sll $v1, $s2, 3 -/* DDD284 80240A54 00431021 */ addu $v0, $v0, $v1 -/* DDD288 80240A58 00461021 */ addu $v0, $v0, $a2 -/* DDD28C 80240A5C 8C420000 */ lw $v0, ($v0) -/* DDD290 80240A60 080902A3 */ j .L80240A8C -/* DDD294 80240A64 AE220294 */ sw $v0, 0x294($s1) -.L80240A68: -/* DDD298 80240A68 3C06800F */ lui $a2, 0x800f -/* DDD29C 80240A6C 24C67F40 */ addiu $a2, $a2, 0x7f40 -/* DDD2A0 80240A70 00461021 */ addu $v0, $v0, $a2 -/* DDD2A4 80240A74 8C420000 */ lw $v0, ($v0) -/* DDD2A8 80240A78 AE20018C */ sw $zero, 0x18c($s1) -/* DDD2AC 80240A7C AE220000 */ sw $v0, ($s1) -/* DDD2B0 80240A80 8FA60010 */ lw $a2, 0x10($sp) -/* DDD2B4 80240A84 8CC20000 */ lw $v0, ($a2) -/* DDD2B8 80240A88 AE220294 */ sw $v0, 0x294($s1) -.L80240A8C: -/* DDD2BC 80240A8C 001010C0 */ sll $v0, $s0, 3 -/* DDD2C0 80240A90 03C21021 */ addu $v0, $fp, $v0 -/* DDD2C4 80240A94 80420015 */ lb $v0, 0x15($v0) -/* DDD2C8 80240A98 26D60001 */ addiu $s6, $s6, 1 -/* DDD2CC 80240A9C AE220210 */ sw $v0, 0x210($s1) -/* DDD2D0 80240AA0 26310004 */ addiu $s1, $s1, 4 -/* DDD2D4 80240AA4 26520001 */ addiu $s2, $s2, 1 -.L80240AA8: -/* DDD2D8 80240AA8 2A420008 */ slti $v0, $s2, 8 -/* DDD2DC 80240AAC 1440FFCB */ bnez $v0, .L802409DC -/* DDD2E0 80240AB0 26940002 */ addiu $s4, $s4, 2 -/* DDD2E4 80240AB4 0260202D */ daddu $a0, $s3, $zero -/* DDD2E8 80240AB8 24020004 */ addiu $v0, $zero, 4 -/* DDD2EC 80240ABC AC820318 */ sw $v0, 0x318($a0) -/* DDD2F0 80240AC0 AC960324 */ sw $s6, 0x324($a0) -/* DDD2F4 80240AC4 0C03D390 */ jal func_800F4E40 -/* DDD2F8 80240AC8 AC800328 */ sw $zero, 0x328($a0) -/* DDD2FC 80240ACC AEA00070 */ sw $zero, 0x70($s5) -.L80240AD0: -/* DDD300 80240AD0 8EA20070 */ lw $v0, 0x70($s5) -/* DDD304 80240AD4 8EB30078 */ lw $s3, 0x78($s5) -/* DDD308 80240AD8 14400008 */ bnez $v0, .L80240AFC -/* DDD30C 80240ADC 24420001 */ addiu $v0, $v0, 1 -/* DDD310 80240AE0 8662032C */ lh $v0, 0x32c($s3) -/* DDD314 80240AE4 10400009 */ beqz $v0, .L80240B0C -/* DDD318 80240AE8 AEA20074 */ sw $v0, 0x74($s5) -/* DDD31C 80240AEC 0C03C4EC */ jal func_800F13B0 -/* DDD320 80240AF0 00000000 */ nop -/* DDD324 80240AF4 8EA20070 */ lw $v0, 0x70($s5) -/* DDD328 80240AF8 24420001 */ addiu $v0, $v0, 1 -.L80240AFC: -/* DDD32C 80240AFC AEA20070 */ sw $v0, 0x70($s5) -/* DDD330 80240B00 2842000F */ slti $v0, $v0, 0xf -/* DDD334 80240B04 10400003 */ beqz $v0, .L80240B14 -/* DDD338 80240B08 00000000 */ nop -.L80240B0C: -/* DDD33C 80240B0C 080902DF */ j .L80240B7C -/* DDD340 80240B10 0000102D */ daddu $v0, $zero, $zero -.L80240B14: -/* DDD344 80240B14 0C03C54E */ jal func_800F1538 -/* DDD348 80240B18 00000000 */ nop -/* DDD34C 80240B1C 8EA30074 */ lw $v1, 0x74($s5) -/* DDD350 80240B20 240200FF */ addiu $v0, $zero, 0xff -/* DDD354 80240B24 10620010 */ beq $v1, $v0, .L80240B68 -/* DDD358 80240B28 2462FFFF */ addiu $v0, $v1, -1 -/* DDD35C 80240B2C 00021080 */ sll $v0, $v0, 2 -/* DDD360 80240B30 02621021 */ addu $v0, $s3, $v0 -/* DDD364 80240B34 8C420108 */ lw $v0, 0x108($v0) -/* DDD368 80240B38 00021100 */ sll $v0, $v0, 4 -/* DDD36C 80240B3C 3C038009 */ lui $v1, 0x8009 -/* DDD370 80240B40 00621821 */ addu $v1, $v1, $v0 -/* DDD374 80240B44 8C63EF20 */ lw $v1, -0x10e0($v1) -/* DDD378 80240B48 8EA20074 */ lw $v0, 0x74($s5) -/* DDD37C 80240B4C 2442FFFF */ addiu $v0, $v0, -1 -/* DDD380 80240B50 00021080 */ sll $v0, $v0, 2 -/* DDD384 80240B54 02621021 */ addu $v0, $s3, $v0 -/* DDD388 80240B58 AEA30084 */ sw $v1, 0x84($s5) -/* DDD38C 80240B5C 8C420108 */ lw $v0, 0x108($v0) -/* DDD390 80240B60 080902DC */ j .L80240B70 -/* DDD394 80240B64 AEA20088 */ sw $v0, 0x88($s5) -.L80240B68: -/* DDD398 80240B68 2402FFFF */ addiu $v0, $zero, -1 -/* DDD39C 80240B6C AEA20084 */ sw $v0, 0x84($s5) -.L80240B70: -/* DDD3A0 80240B70 0C00AB4B */ jal heap_free -/* DDD3A4 80240B74 8EA40078 */ lw $a0, 0x78($s5) -/* DDD3A8 80240B78 24020002 */ addiu $v0, $zero, 2 -.L80240B7C: -/* DDD3AC 80240B7C 8FBF003C */ lw $ra, 0x3c($sp) -/* DDD3B0 80240B80 8FBE0038 */ lw $fp, 0x38($sp) -/* DDD3B4 80240B84 8FB70034 */ lw $s7, 0x34($sp) -/* DDD3B8 80240B88 8FB60030 */ lw $s6, 0x30($sp) -/* DDD3BC 80240B8C 8FB5002C */ lw $s5, 0x2c($sp) -/* DDD3C0 80240B90 8FB40028 */ lw $s4, 0x28($sp) -/* DDD3C4 80240B94 8FB30024 */ lw $s3, 0x24($sp) -/* DDD3C8 80240B98 8FB20020 */ lw $s2, 0x20($sp) -/* DDD3CC 80240B9C 8FB1001C */ lw $s1, 0x1c($sp) -/* DDD3D0 80240BA0 8FB00018 */ lw $s0, 0x18($sp) -/* DDD3D4 80240BA4 03E00008 */ jr $ra -/* DDD3D8 80240BA8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_omo/omo_11/func_80240BAC_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/func_80240BAC_DDC830.s deleted file mode 100644 index 35ccd8450c..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/func_80240BAC_DDC830.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BAC_DDD3DC -/* DDD3DC 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DDD3E0 80240BB0 AFBF0010 */ sw $ra, 0x10($sp) -/* DDD3E4 80240BB4 8C82000C */ lw $v0, 0xc($a0) -/* DDD3E8 80240BB8 0C0B1EAF */ jal get_variable -/* DDD3EC 80240BBC 8C450000 */ lw $a1, ($v0) -/* DDD3F0 80240BC0 0C03AC5A */ jal func_800EB168 -/* DDD3F4 80240BC4 0040202D */ daddu $a0, $v0, $zero -/* DDD3F8 80240BC8 8FBF0010 */ lw $ra, 0x10($sp) -/* DDD3FC 80240BCC 24020002 */ addiu $v0, $zero, 2 -/* DDD400 80240BD0 03E00008 */ jr $ra -/* DDD404 80240BD4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_11/func_80240BD8_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/func_80240BD8_DDC830.s deleted file mode 100644 index 9f71ad3c2a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/func_80240BD8_DDC830.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BD8_DDD408 -/* DDD408 80240BD8 3C028011 */ lui $v0, 0x8011 -/* DDD40C 80240BDC 8042F2A2 */ lb $v0, -0xd5e($v0) -/* DDD410 80240BE0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DDD414 80240BE4 AFBF0010 */ sw $ra, 0x10($sp) -/* DDD418 80240BE8 00021100 */ sll $v0, $v0, 4 -/* DDD41C 80240BEC 3C048009 */ lui $a0, 0x8009 -/* DDD420 80240BF0 00822021 */ addu $a0, $a0, $v0 -/* DDD424 80240BF4 8C84EF20 */ lw $a0, -0x10e0($a0) -/* DDD428 80240BF8 0C0496CF */ jal set_message_string -/* DDD42C 80240BFC 0000282D */ daddu $a1, $zero, $zero -/* DDD430 80240C00 8FBF0010 */ lw $ra, 0x10($sp) -/* DDD434 80240C04 24020002 */ addiu $v0, $zero, 2 -/* DDD438 80240C08 03E00008 */ jr $ra -/* DDD43C 80240C0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_11/func_80240C10_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/func_80240C10_DDC830.s deleted file mode 100644 index 7b1ec1fbfa..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/func_80240C10_DDC830.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C10_DDD440 -/* DDD440 80240C10 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DDD444 80240C14 AFB1001C */ sw $s1, 0x1c($sp) -/* DDD448 80240C18 0080882D */ daddu $s1, $a0, $zero -/* DDD44C 80240C1C AFBF0020 */ sw $ra, 0x20($sp) -/* DDD450 80240C20 AFB00018 */ sw $s0, 0x18($sp) -/* DDD454 80240C24 8E30000C */ lw $s0, 0xc($s1) -/* DDD458 80240C28 8E050000 */ lw $a1, ($s0) -/* DDD45C 80240C2C 0C0B1EAF */ jal get_variable -/* DDD460 80240C30 26100004 */ addiu $s0, $s0, 4 -/* DDD464 80240C34 0C04417A */ jal get_entity_by_index -/* DDD468 80240C38 0040202D */ daddu $a0, $v0, $zero -/* DDD46C 80240C3C 8E100000 */ lw $s0, ($s0) -/* DDD470 80240C40 C444004C */ lwc1 $f4, 0x4c($v0) -/* DDD474 80240C44 3C014148 */ lui $at, 0x4148 -/* DDD478 80240C48 44810000 */ mtc1 $at, $f0 -/* DDD47C 80240C4C 3C013F33 */ lui $at, 0x3f33 -/* DDD480 80240C50 34213333 */ ori $at, $at, 0x3333 -/* DDD484 80240C54 44811000 */ mtc1 $at, $f2 -/* DDD488 80240C58 AFA00014 */ sw $zero, 0x14($sp) -/* DDD48C 80240C5C 46002100 */ add.s $f4, $f4, $f0 -/* DDD490 80240C60 E7A20010 */ swc1 $f2, 0x10($sp) -/* DDD494 80240C64 8C450048 */ lw $a1, 0x48($v0) -/* DDD498 80240C68 8C470050 */ lw $a3, 0x50($v0) -/* DDD49C 80240C6C 44062000 */ mfc1 $a2, $f4 -/* DDD4A0 80240C70 0C01C5D4 */ jal func_80071750 -/* DDD4A4 80240C74 0000202D */ daddu $a0, $zero, $zero -/* DDD4A8 80240C78 0220202D */ daddu $a0, $s1, $zero -/* DDD4AC 80240C7C 0200282D */ daddu $a1, $s0, $zero -/* DDD4B0 80240C80 0C0B2026 */ jal set_variable -/* DDD4B4 80240C84 0040302D */ daddu $a2, $v0, $zero -/* DDD4B8 80240C88 8FBF0020 */ lw $ra, 0x20($sp) -/* DDD4BC 80240C8C 8FB1001C */ lw $s1, 0x1c($sp) -/* DDD4C0 80240C90 8FB00018 */ lw $s0, 0x18($sp) -/* DDD4C4 80240C94 24020002 */ addiu $v0, $zero, 2 -/* DDD4C8 80240C98 03E00008 */ jr $ra -/* DDD4CC 80240C9C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_11/func_80240CA0_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/func_80240CA0_DDC830.s deleted file mode 100644 index 57a6b47dee..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/func_80240CA0_DDC830.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CA0_DDD4D0 -/* DDD4D0 80240CA0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DDD4D4 80240CA4 AFBF0010 */ sw $ra, 0x10($sp) -/* DDD4D8 80240CA8 8C82000C */ lw $v0, 0xc($a0) -/* DDD4DC 80240CAC 0C0B1EAF */ jal get_variable -/* DDD4E0 80240CB0 8C450000 */ lw $a1, ($v0) -/* DDD4E4 80240CB4 0040202D */ daddu $a0, $v0, $zero -/* DDD4E8 80240CB8 8C830000 */ lw $v1, ($a0) -/* DDD4EC 80240CBC 34630010 */ ori $v1, $v1, 0x10 -/* DDD4F0 80240CC0 AC830000 */ sw $v1, ($a0) -/* DDD4F4 80240CC4 8FBF0010 */ lw $ra, 0x10($sp) -/* DDD4F8 80240CC8 24020002 */ addiu $v0, $zero, 2 -/* DDD4FC 80240CCC 03E00008 */ jr $ra -/* DDD500 80240CD0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_11/func_80240CD4_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/func_80240CD4_DDC830.s deleted file mode 100644 index 66337b265a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/func_80240CD4_DDC830.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CD4_DDD504 -/* DDD504 80240CD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DDD508 80240CD8 AFBF0018 */ sw $ra, 0x18($sp) -/* DDD50C 80240CDC 8C82000C */ lw $v0, 0xc($a0) -/* DDD510 80240CE0 0C0B1EAF */ jal get_variable -/* DDD514 80240CE4 8C450000 */ lw $a1, ($v0) -/* DDD518 80240CE8 0C04417A */ jal get_entity_by_index -/* DDD51C 80240CEC 0040202D */ daddu $a0, $v0, $zero -/* DDD520 80240CF0 3C013F80 */ lui $at, 0x3f80 -/* DDD524 80240CF4 44810000 */ mtc1 $at, $f0 -/* DDD528 80240CF8 C442004C */ lwc1 $f2, 0x4c($v0) -/* DDD52C 80240CFC E7A00010 */ swc1 $f0, 0x10($sp) -/* DDD530 80240D00 3C014148 */ lui $at, 0x4148 -/* DDD534 80240D04 44810000 */ mtc1 $at, $f0 -/* DDD538 80240D08 2403004B */ addiu $v1, $zero, 0x4b -/* DDD53C 80240D0C AFA30014 */ sw $v1, 0x14($sp) -/* DDD540 80240D10 46001080 */ add.s $f2, $f2, $f0 -/* DDD544 80240D14 8C450048 */ lw $a1, 0x48($v0) -/* DDD548 80240D18 8C470050 */ lw $a3, 0x50($v0) -/* DDD54C 80240D1C 44061000 */ mfc1 $a2, $f2 -/* DDD550 80240D20 0C01C2EC */ jal func_80070BB0 -/* DDD554 80240D24 24040004 */ addiu $a0, $zero, 4 -/* DDD558 80240D28 8FBF0018 */ lw $ra, 0x18($sp) -/* DDD55C 80240D2C 24020002 */ addiu $v0, $zero, 2 -/* DDD560 80240D30 03E00008 */ jr $ra -/* DDD564 80240D34 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_11/func_80240D38_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/func_80240D38_DDC830.s deleted file mode 100644 index eaf9871e80..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/func_80240D38_DDC830.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D38_DDD568 -/* DDD568 80240D38 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DDD56C 80240D3C AFBF0018 */ sw $ra, 0x18($sp) -/* DDD570 80240D40 0C00EAD2 */ jal get_npc_safe -/* DDD574 80240D44 2404FFFC */ addiu $a0, $zero, -4 -/* DDD578 80240D48 C444003C */ lwc1 $f4, 0x3c($v0) -/* DDD57C 80240D4C 3C014148 */ lui $at, 0x4148 -/* DDD580 80240D50 44811000 */ mtc1 $at, $f2 -/* DDD584 80240D54 3C013F80 */ lui $at, 0x3f80 -/* DDD588 80240D58 44810000 */ mtc1 $at, $f0 -/* DDD58C 80240D5C 2403001E */ addiu $v1, $zero, 0x1e -/* DDD590 80240D60 AFA30014 */ sw $v1, 0x14($sp) -/* DDD594 80240D64 46022100 */ add.s $f4, $f4, $f2 -/* DDD598 80240D68 E7A00010 */ swc1 $f0, 0x10($sp) -/* DDD59C 80240D6C 8C450038 */ lw $a1, 0x38($v0) -/* DDD5A0 80240D70 8C470040 */ lw $a3, 0x40($v0) -/* DDD5A4 80240D74 44062000 */ mfc1 $a2, $f4 -/* DDD5A8 80240D78 0C01C2EC */ jal func_80070BB0 -/* DDD5AC 80240D7C 24040009 */ addiu $a0, $zero, 9 -/* DDD5B0 80240D80 8FBF0018 */ lw $ra, 0x18($sp) -/* DDD5B4 80240D84 24020002 */ addiu $v0, $zero, 2 -/* DDD5B8 80240D88 03E00008 */ jr $ra -/* DDD5BC 80240D8C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_11/func_80240D90_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/func_80240D90_DDC830.s deleted file mode 100644 index 0ae7d1fffa..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/func_80240D90_DDC830.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D90_DDD5C0 -/* DDD5C0 80240D90 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* DDD5C4 80240D94 AFB60040 */ sw $s6, 0x40($sp) -/* DDD5C8 80240D98 0080B02D */ daddu $s6, $a0, $zero -/* DDD5CC 80240D9C AFB00028 */ sw $s0, 0x28($sp) -/* DDD5D0 80240DA0 00A0802D */ daddu $s0, $a1, $zero -/* DDD5D4 80240DA4 AFBF0044 */ sw $ra, 0x44($sp) -/* DDD5D8 80240DA8 AFB5003C */ sw $s5, 0x3c($sp) -/* DDD5DC 80240DAC AFB40038 */ sw $s4, 0x38($sp) -/* DDD5E0 80240DB0 AFB30034 */ sw $s3, 0x34($sp) -/* DDD5E4 80240DB4 AFB20030 */ sw $s2, 0x30($sp) -/* DDD5E8 80240DB8 AFB1002C */ sw $s1, 0x2c($sp) -/* DDD5EC 80240DBC F7B80058 */ sdc1 $f24, 0x58($sp) -/* DDD5F0 80240DC0 F7B60050 */ sdc1 $f22, 0x50($sp) -/* DDD5F4 80240DC4 F7B40048 */ sdc1 $f20, 0x48($sp) -/* DDD5F8 80240DC8 8ED3000C */ lw $s3, 0xc($s6) -/* DDD5FC 80240DCC 0C00EAD2 */ jal get_npc_safe -/* DDD600 80240DD0 2404FFFC */ addiu $a0, $zero, -4 -/* DDD604 80240DD4 27A50018 */ addiu $a1, $sp, 0x18 -/* DDD608 80240DD8 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* DDD60C 80240DDC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* DDD610 80240DE0 27A6001C */ addiu $a2, $sp, 0x1c -/* DDD614 80240DE4 00041880 */ sll $v1, $a0, 2 -/* DDD618 80240DE8 00641821 */ addu $v1, $v1, $a0 -/* DDD61C 80240DEC 00031880 */ sll $v1, $v1, 2 -/* DDD620 80240DF0 00641823 */ subu $v1, $v1, $a0 -/* DDD624 80240DF4 000320C0 */ sll $a0, $v1, 3 -/* DDD628 80240DF8 00641821 */ addu $v1, $v1, $a0 -/* DDD62C 80240DFC 000318C0 */ sll $v1, $v1, 3 -/* DDD630 80240E00 3C01800B */ lui $at, 0x800b -/* DDD634 80240E04 00230821 */ addu $at, $at, $v1 -/* DDD638 80240E08 C42C1DEC */ lwc1 $f12, 0x1dec($at) -/* DDD63C 80240E0C 0C00A88D */ jal sin_cos_deg -/* DDD640 80240E10 0040A82D */ daddu $s5, $v0, $zero -/* DDD644 80240E14 1200005D */ beqz $s0, .L80240F8C -/* DDD648 80240E18 00000000 */ nop -/* DDD64C 80240E1C 0C00AB0A */ jal general_heap_malloc -/* DDD650 80240E20 24040068 */ addiu $a0, $zero, 0x68 -/* DDD654 80240E24 0040902D */ daddu $s2, $v0, $zero -/* DDD658 80240E28 02C0202D */ daddu $a0, $s6, $zero -/* DDD65C 80240E2C 0000882D */ daddu $s1, $zero, $zero -/* DDD660 80240E30 2414FFFF */ addiu $s4, $zero, -1 -/* DDD664 80240E34 AED20060 */ sw $s2, 0x60($s6) -/* DDD668 80240E38 8E650000 */ lw $a1, ($s3) -/* DDD66C 80240E3C 3C014148 */ lui $at, 0x4148 -/* DDD670 80240E40 4481C000 */ mtc1 $at, $f24 -/* DDD674 80240E44 3C013F80 */ lui $at, 0x3f80 -/* DDD678 80240E48 4481B000 */ mtc1 $at, $f22 -/* DDD67C 80240E4C 4480A000 */ mtc1 $zero, $f20 -/* DDD680 80240E50 0C0B1EAF */ jal get_variable -/* DDD684 80240E54 0240802D */ daddu $s0, $s2, $zero -/* DDD688 80240E58 0C04417A */ jal get_entity_by_index -/* DDD68C 80240E5C 0040202D */ daddu $a0, $v0, $zero -/* DDD690 80240E60 AE42005C */ sw $v0, 0x5c($s2) -.L80240E64: -/* DDD694 80240E64 8E42005C */ lw $v0, 0x5c($s2) -/* DDD698 80240E68 C440004C */ lwc1 $f0, 0x4c($v0) -/* DDD69C 80240E6C 0000202D */ daddu $a0, $zero, $zero -/* DDD6A0 80240E70 E7B60010 */ swc1 $f22, 0x10($sp) -/* DDD6A4 80240E74 AFB40014 */ sw $s4, 0x14($sp) -/* DDD6A8 80240E78 46180000 */ add.s $f0, $f0, $f24 -/* DDD6AC 80240E7C 8C450048 */ lw $a1, 0x48($v0) -/* DDD6B0 80240E80 8C470050 */ lw $a3, 0x50($v0) -/* DDD6B4 80240E84 44060000 */ mfc1 $a2, $f0 -/* DDD6B8 80240E88 0C01C5BC */ jal func_800716F0 -/* DDD6BC 80240E8C 26310001 */ addiu $s1, $s1, 1 -/* DDD6C0 80240E90 AE020008 */ sw $v0, 8($s0) -/* DDD6C4 80240E94 E614002C */ swc1 $f20, 0x2c($s0) -/* DDD6C8 80240E98 E6140020 */ swc1 $f20, 0x20($s0) -/* DDD6CC 80240E9C E6140014 */ swc1 $f20, 0x14($s0) -/* DDD6D0 80240EA0 E6140050 */ swc1 $f20, 0x50($s0) -/* DDD6D4 80240EA4 E6140044 */ swc1 $f20, 0x44($s0) -/* DDD6D8 80240EA8 E6140038 */ swc1 $f20, 0x38($s0) -/* DDD6DC 80240EAC 2A220003 */ slti $v0, $s1, 3 -/* DDD6E0 80240EB0 1440FFEC */ bnez $v0, .L80240E64 -/* DDD6E4 80240EB4 26100004 */ addiu $s0, $s0, 4 -/* DDD6E8 80240EB8 0000882D */ daddu $s1, $zero, $zero -/* DDD6EC 80240EBC 0240802D */ daddu $s0, $s2, $zero -/* DDD6F0 80240EC0 3C148024 */ lui $s4, 0x8024 -/* DDD6F4 80240EC4 26941E98 */ addiu $s4, $s4, 0x1e98 -/* DDD6F8 80240EC8 3C014248 */ lui $at, 0x4248 -/* DDD6FC 80240ECC 4481A000 */ mtc1 $at, $f20 -/* DDD700 80240ED0 24130044 */ addiu $s3, $zero, 0x44 -/* DDD704 80240ED4 AE400000 */ sw $zero, ($s2) -/* DDD708 80240ED8 AE400004 */ sw $zero, 4($s2) -/* DDD70C 80240EDC AE400060 */ sw $zero, 0x60($s2) -/* DDD710 80240EE0 AE400064 */ sw $zero, 0x64($s2) -.L80240EE4: -/* DDD714 80240EE4 27A40020 */ addiu $a0, $sp, 0x20 -/* DDD718 80240EE8 4406A000 */ mfc1 $a2, $f20 -/* DDD71C 80240EEC 8E870000 */ lw $a3, ($s4) -/* DDD720 80240EF0 02532821 */ addu $a1, $s2, $s3 -/* DDD724 80240EF4 0C00A7E7 */ jal add_vec2D_polar -/* DDD728 80240EF8 AFA00020 */ sw $zero, 0x20($sp) -/* DDD72C 80240EFC C7A2001C */ lwc1 $f2, 0x1c($sp) -/* DDD730 80240F00 C7A40020 */ lwc1 $f4, 0x20($sp) -/* DDD734 80240F04 46041082 */ mul.s $f2, $f2, $f4 -/* DDD738 80240F08 00000000 */ nop -/* DDD73C 80240F0C C7A00018 */ lwc1 $f0, 0x18($sp) -/* DDD740 80240F10 46040002 */ mul.s $f0, $f0, $f4 -/* DDD744 80240F14 00000000 */ nop -/* DDD748 80240F18 E6020038 */ swc1 $f2, 0x38($s0) -/* DDD74C 80240F1C E6000050 */ swc1 $f0, 0x50($s0) -/* DDD750 80240F20 8E42005C */ lw $v0, 0x5c($s2) -/* DDD754 80240F24 C6000038 */ lwc1 $f0, 0x38($s0) -/* DDD758 80240F28 C4420048 */ lwc1 $f2, 0x48($v0) -/* DDD75C 80240F2C 46001080 */ add.s $f2, $f2, $f0 -/* DDD760 80240F30 C6A00038 */ lwc1 $f0, 0x38($s5) -/* DDD764 80240F34 46020001 */ sub.s $f0, $f0, $f2 -/* DDD768 80240F38 E6000038 */ swc1 $f0, 0x38($s0) -/* DDD76C 80240F3C 8E42005C */ lw $v0, 0x5c($s2) -/* DDD770 80240F40 C6000044 */ lwc1 $f0, 0x44($s0) -/* DDD774 80240F44 C442004C */ lwc1 $f2, 0x4c($v0) -/* DDD778 80240F48 46001080 */ add.s $f2, $f2, $f0 -/* DDD77C 80240F4C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* DDD780 80240F50 46020001 */ sub.s $f0, $f0, $f2 -/* DDD784 80240F54 E6000044 */ swc1 $f0, 0x44($s0) -/* DDD788 80240F58 8E42005C */ lw $v0, 0x5c($s2) -/* DDD78C 80240F5C C6000050 */ lwc1 $f0, 0x50($s0) -/* DDD790 80240F60 C4420050 */ lwc1 $f2, 0x50($v0) -/* DDD794 80240F64 26940004 */ addiu $s4, $s4, 4 -/* DDD798 80240F68 46001080 */ add.s $f2, $f2, $f0 -/* DDD79C 80240F6C C6A00040 */ lwc1 $f0, 0x40($s5) -/* DDD7A0 80240F70 26730004 */ addiu $s3, $s3, 4 -/* DDD7A4 80240F74 46020001 */ sub.s $f0, $f0, $f2 -/* DDD7A8 80240F78 26310001 */ addiu $s1, $s1, 1 -/* DDD7AC 80240F7C 2A220003 */ slti $v0, $s1, 3 -/* DDD7B0 80240F80 E6000050 */ swc1 $f0, 0x50($s0) -/* DDD7B4 80240F84 1440FFD7 */ bnez $v0, .L80240EE4 -/* DDD7B8 80240F88 26100004 */ addiu $s0, $s0, 4 -.L80240F8C: -/* DDD7BC 80240F8C 8ED20060 */ lw $s2, 0x60($s6) -/* DDD7C0 80240F90 8E430000 */ lw $v1, ($s2) -/* DDD7C4 80240F94 24020001 */ addiu $v0, $zero, 1 -/* DDD7C8 80240F98 10620038 */ beq $v1, $v0, .L8024107C -/* DDD7CC 80240F9C 28620002 */ slti $v0, $v1, 2 -/* DDD7D0 80240FA0 50400005 */ beql $v0, $zero, .L80240FB8 -/* DDD7D4 80240FA4 24020002 */ addiu $v0, $zero, 2 -/* DDD7D8 80240FA8 10600007 */ beqz $v1, .L80240FC8 -/* DDD7DC 80240FAC 24040005 */ addiu $a0, $zero, 5 -/* DDD7E0 80240FB0 08090458 */ j .L80241160 -/* DDD7E4 80240FB4 00000000 */ nop -.L80240FB8: -/* DDD7E8 80240FB8 10620058 */ beq $v1, $v0, .L8024111C -/* DDD7EC 80240FBC 00000000 */ nop -/* DDD7F0 80240FC0 08090458 */ j .L80241160 -/* DDD7F4 80240FC4 00000000 */ nop -.L80240FC8: -/* DDD7F8 80240FC8 0000882D */ daddu $s1, $zero, $zero -/* DDD7FC 80240FCC 3C148024 */ lui $s4, 0x8024 -/* DDD800 80240FD0 26941E98 */ addiu $s4, $s4, 0x1e98 -/* DDD804 80240FD4 24130020 */ addiu $s3, $zero, 0x20 -/* DDD808 80240FD8 3C064248 */ lui $a2, 0x4248 -/* DDD80C 80240FDC 44800000 */ mtc1 $zero, $f0 -/* DDD810 80240FE0 24020014 */ addiu $v0, $zero, 0x14 -/* DDD814 80240FE4 AFA20010 */ sw $v0, 0x10($sp) -/* DDD818 80240FE8 44050000 */ mfc1 $a1, $f0 -/* DDD81C 80240FEC 8E470060 */ lw $a3, 0x60($s2) -/* DDD820 80240FF0 4485B000 */ mtc1 $a1, $f22 -/* DDD824 80240FF4 0C00A8ED */ jal update_lerp -/* DDD828 80240FF8 0240802D */ daddu $s0, $s2, $zero -/* DDD82C 80240FFC 46000506 */ mov.s $f20, $f0 -.L80241000: -/* DDD830 80241000 4406A000 */ mfc1 $a2, $f20 -/* DDD834 80241004 27A40020 */ addiu $a0, $sp, 0x20 -/* DDD838 80241008 E6160020 */ swc1 $f22, 0x20($s0) -/* DDD83C 8024100C 8E870000 */ lw $a3, ($s4) -/* DDD840 80241010 02532821 */ addu $a1, $s2, $s3 -/* DDD844 80241014 0C00A7E7 */ jal add_vec2D_polar -/* DDD848 80241018 E7B60020 */ swc1 $f22, 0x20($sp) -/* DDD84C 8024101C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* DDD850 80241020 C7A00020 */ lwc1 $f0, 0x20($sp) -/* DDD854 80241024 46002102 */ mul.s $f4, $f4, $f0 -/* DDD858 80241028 00000000 */ nop -/* DDD85C 8024102C C7A20018 */ lwc1 $f2, 0x18($sp) -/* DDD860 80241030 26940004 */ addiu $s4, $s4, 4 -/* DDD864 80241034 46001082 */ mul.s $f2, $f2, $f0 -/* DDD868 80241038 00000000 */ nop -/* DDD86C 8024103C 26730004 */ addiu $s3, $s3, 4 -/* DDD870 80241040 26310001 */ addiu $s1, $s1, 1 -/* DDD874 80241044 2A220003 */ slti $v0, $s1, 3 -/* DDD878 80241048 E6040014 */ swc1 $f4, 0x14($s0) -/* DDD87C 8024104C E602002C */ swc1 $f2, 0x2c($s0) -/* DDD880 80241050 1440FFEB */ bnez $v0, .L80241000 -/* DDD884 80241054 26100004 */ addiu $s0, $s0, 4 -/* DDD888 80241058 8E420060 */ lw $v0, 0x60($s2) -/* DDD88C 8024105C 24420001 */ addiu $v0, $v0, 1 -/* DDD890 80241060 AE420060 */ sw $v0, 0x60($s2) -/* DDD894 80241064 28420015 */ slti $v0, $v0, 0x15 -/* DDD898 80241068 1440003D */ bnez $v0, .L80241160 -/* DDD89C 8024106C 24020001 */ addiu $v0, $zero, 1 -/* DDD8A0 80241070 AE420000 */ sw $v0, ($s2) -/* DDD8A4 80241074 08090458 */ j .L80241160 -/* DDD8A8 80241078 AE400060 */ sw $zero, 0x60($s2) -.L8024107C: -/* DDD8AC 8024107C 0000882D */ daddu $s1, $zero, $zero -/* DDD8B0 80241080 3C148024 */ lui $s4, 0x8024 -/* DDD8B4 80241084 26941E98 */ addiu $s4, $s4, 0x1e98 -/* DDD8B8 80241088 24130020 */ addiu $s3, $zero, 0x20 -/* DDD8BC 8024108C 0240802D */ daddu $s0, $s2, $zero -/* DDD8C0 80241090 3C014248 */ lui $at, 0x4248 -/* DDD8C4 80241094 4481A000 */ mtc1 $at, $f20 -/* DDD8C8 80241098 4480B000 */ mtc1 $zero, $f22 -.L8024109C: -/* DDD8CC 8024109C 4406A000 */ mfc1 $a2, $f20 -/* DDD8D0 802410A0 27A40020 */ addiu $a0, $sp, 0x20 -/* DDD8D4 802410A4 E6160020 */ swc1 $f22, 0x20($s0) -/* DDD8D8 802410A8 8E870000 */ lw $a3, ($s4) -/* DDD8DC 802410AC 02532821 */ addu $a1, $s2, $s3 -/* DDD8E0 802410B0 0C00A7E7 */ jal add_vec2D_polar -/* DDD8E4 802410B4 E7B60020 */ swc1 $f22, 0x20($sp) -/* DDD8E8 802410B8 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* DDD8EC 802410BC C7A00020 */ lwc1 $f0, 0x20($sp) -/* DDD8F0 802410C0 46002102 */ mul.s $f4, $f4, $f0 -/* DDD8F4 802410C4 00000000 */ nop -/* DDD8F8 802410C8 C7A20018 */ lwc1 $f2, 0x18($sp) -/* DDD8FC 802410CC 26940004 */ addiu $s4, $s4, 4 -/* DDD900 802410D0 46001082 */ mul.s $f2, $f2, $f0 -/* DDD904 802410D4 00000000 */ nop -/* DDD908 802410D8 26730004 */ addiu $s3, $s3, 4 -/* DDD90C 802410DC 26310001 */ addiu $s1, $s1, 1 -/* DDD910 802410E0 2A220003 */ slti $v0, $s1, 3 -/* DDD914 802410E4 E6040014 */ swc1 $f4, 0x14($s0) -/* DDD918 802410E8 E602002C */ swc1 $f2, 0x2c($s0) -/* DDD91C 802410EC 1440FFEB */ bnez $v0, .L8024109C -/* DDD920 802410F0 26100004 */ addiu $s0, $s0, 4 -/* DDD924 802410F4 8E420060 */ lw $v0, 0x60($s2) -/* DDD928 802410F8 24420001 */ addiu $v0, $v0, 1 -/* DDD92C 802410FC AE420060 */ sw $v0, 0x60($s2) -/* DDD930 80241100 28420010 */ slti $v0, $v0, 0x10 -/* DDD934 80241104 14400016 */ bnez $v0, .L80241160 -/* DDD938 80241108 2402000F */ addiu $v0, $zero, 0xf -/* DDD93C 8024110C AE420060 */ sw $v0, 0x60($s2) -/* DDD940 80241110 24020002 */ addiu $v0, $zero, 2 -/* DDD944 80241114 08090458 */ j .L80241160 -/* DDD948 80241118 AE420000 */ sw $v0, ($s2) -.L8024111C: -/* DDD94C 8024111C 8E420060 */ lw $v0, 0x60($s2) -/* DDD950 80241120 24420001 */ addiu $v0, $v0, 1 -/* DDD954 80241124 AE420060 */ sw $v0, 0x60($s2) -/* DDD958 80241128 2842001F */ slti $v0, $v0, 0x1f -/* DDD95C 8024112C 1440000C */ bnez $v0, .L80241160 -/* DDD960 80241130 0000882D */ daddu $s1, $zero, $zero -/* DDD964 80241134 0240282D */ daddu $a1, $s2, $zero -.L80241138: -/* DDD968 80241138 8CA20008 */ lw $v0, 8($a1) -/* DDD96C 8024113C 8C430000 */ lw $v1, ($v0) -/* DDD970 80241140 26310001 */ addiu $s1, $s1, 1 -/* DDD974 80241144 34630010 */ ori $v1, $v1, 0x10 -/* DDD978 80241148 AC430000 */ sw $v1, ($v0) -/* DDD97C 8024114C 2A220003 */ slti $v0, $s1, 3 -/* DDD980 80241150 1440FFF9 */ bnez $v0, .L80241138 -/* DDD984 80241154 24A50004 */ addiu $a1, $a1, 4 -/* DDD988 80241158 080904A5 */ j .L80241294 -/* DDD98C 8024115C 24020002 */ addiu $v0, $zero, 2 -.L80241160: -/* DDD990 80241160 8E430004 */ lw $v1, 4($s2) -/* DDD994 80241164 10600005 */ beqz $v1, .L8024117C -/* DDD998 80241168 24020001 */ addiu $v0, $zero, 1 -/* DDD99C 8024116C 1062000B */ beq $v1, $v0, .L8024119C -/* DDD9A0 80241170 0000882D */ daddu $s1, $zero, $zero -/* DDD9A4 80241174 08090494 */ j .L80241250 -/* DDD9A8 80241178 0240282D */ daddu $a1, $s2, $zero -.L8024117C: -/* DDD9AC 8024117C 8E420064 */ lw $v0, 0x64($s2) -/* DDD9B0 80241180 24420001 */ addiu $v0, $v0, 1 -/* DDD9B4 80241184 AE420064 */ sw $v0, 0x64($s2) -/* DDD9B8 80241188 28420010 */ slti $v0, $v0, 0x10 -/* DDD9BC 8024118C 1440002F */ bnez $v0, .L8024124C -/* DDD9C0 80241190 0000882D */ daddu $s1, $zero, $zero -/* DDD9C4 80241194 08090490 */ j .L80241240 -/* DDD9C8 80241198 24020001 */ addiu $v0, $zero, 1 -.L8024119C: -/* DDD9CC 8024119C 4480A000 */ mtc1 $zero, $f20 -/* DDD9D0 802411A0 24130014 */ addiu $s3, $zero, 0x14 -/* DDD9D4 802411A4 0240802D */ daddu $s0, $s2, $zero -.L802411A8: -/* DDD9D8 802411A8 4405A000 */ mfc1 $a1, $f20 -/* DDD9DC 802411AC AFB30010 */ sw $s3, 0x10($sp) -/* DDD9E0 802411B0 8E060038 */ lw $a2, 0x38($s0) -/* DDD9E4 802411B4 8E470064 */ lw $a3, 0x64($s2) -/* DDD9E8 802411B8 0C00A8ED */ jal update_lerp -/* DDD9EC 802411BC 24040001 */ addiu $a0, $zero, 1 -/* DDD9F0 802411C0 C6020014 */ lwc1 $f2, 0x14($s0) -/* DDD9F4 802411C4 46001080 */ add.s $f2, $f2, $f0 -/* DDD9F8 802411C8 4405A000 */ mfc1 $a1, $f20 -/* DDD9FC 802411CC E6020014 */ swc1 $f2, 0x14($s0) -/* DDDA00 802411D0 AFB30010 */ sw $s3, 0x10($sp) -/* DDDA04 802411D4 8E060044 */ lw $a2, 0x44($s0) -/* DDDA08 802411D8 8E470064 */ lw $a3, 0x64($s2) -/* DDDA0C 802411DC 0C00A8ED */ jal update_lerp -/* DDDA10 802411E0 24040001 */ addiu $a0, $zero, 1 -/* DDDA14 802411E4 C6020020 */ lwc1 $f2, 0x20($s0) -/* DDDA18 802411E8 46001080 */ add.s $f2, $f2, $f0 -/* DDDA1C 802411EC 4405A000 */ mfc1 $a1, $f20 -/* DDDA20 802411F0 E6020020 */ swc1 $f2, 0x20($s0) -/* DDDA24 802411F4 AFB30010 */ sw $s3, 0x10($sp) -/* DDDA28 802411F8 8E060050 */ lw $a2, 0x50($s0) -/* DDDA2C 802411FC 8E470064 */ lw $a3, 0x64($s2) -/* DDDA30 80241200 0C00A8ED */ jal update_lerp -/* DDDA34 80241204 24040001 */ addiu $a0, $zero, 1 -/* DDDA38 80241208 C602002C */ lwc1 $f2, 0x2c($s0) -/* DDDA3C 8024120C 46001080 */ add.s $f2, $f2, $f0 -/* DDDA40 80241210 26310001 */ addiu $s1, $s1, 1 -/* DDDA44 80241214 2A220003 */ slti $v0, $s1, 3 -/* DDDA48 80241218 E602002C */ swc1 $f2, 0x2c($s0) -/* DDDA4C 8024121C 1440FFE2 */ bnez $v0, .L802411A8 -/* DDDA50 80241220 26100004 */ addiu $s0, $s0, 4 -/* DDDA54 80241224 8E420064 */ lw $v0, 0x64($s2) -/* DDDA58 80241228 24420001 */ addiu $v0, $v0, 1 -/* DDDA5C 8024122C AE420064 */ sw $v0, 0x64($s2) -/* DDDA60 80241230 28420015 */ slti $v0, $v0, 0x15 -/* DDDA64 80241234 14400005 */ bnez $v0, .L8024124C -/* DDDA68 80241238 0000882D */ daddu $s1, $zero, $zero -/* DDDA6C 8024123C 24020002 */ addiu $v0, $zero, 2 -.L80241240: -/* DDDA70 80241240 AE420004 */ sw $v0, 4($s2) -/* DDDA74 80241244 AE400064 */ sw $zero, 0x64($s2) -/* DDDA78 80241248 0000882D */ daddu $s1, $zero, $zero -.L8024124C: -/* DDDA7C 8024124C 0240282D */ daddu $a1, $s2, $zero -.L80241250: -/* DDDA80 80241250 8CA20008 */ lw $v0, 8($a1) -/* DDDA84 80241254 C4A00014 */ lwc1 $f0, 0x14($a1) -/* DDDA88 80241258 8C42000C */ lw $v0, 0xc($v0) -/* DDDA8C 8024125C E4400010 */ swc1 $f0, 0x10($v0) -/* DDDA90 80241260 8CA20008 */ lw $v0, 8($a1) -/* DDDA94 80241264 C4A00020 */ lwc1 $f0, 0x20($a1) -/* DDDA98 80241268 8C42000C */ lw $v0, 0xc($v0) -/* DDDA9C 8024126C 26310001 */ addiu $s1, $s1, 1 -/* DDDAA0 80241270 E4400014 */ swc1 $f0, 0x14($v0) -/* DDDAA4 80241274 8CA20008 */ lw $v0, 8($a1) -/* DDDAA8 80241278 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* DDDAAC 8024127C 8C42000C */ lw $v0, 0xc($v0) -/* DDDAB0 80241280 E4400018 */ swc1 $f0, 0x18($v0) -/* DDDAB4 80241284 2A220003 */ slti $v0, $s1, 3 -/* DDDAB8 80241288 1440FFF1 */ bnez $v0, .L80241250 -/* DDDABC 8024128C 24A50004 */ addiu $a1, $a1, 4 -/* DDDAC0 80241290 0000102D */ daddu $v0, $zero, $zero -.L80241294: -/* DDDAC4 80241294 8FBF0044 */ lw $ra, 0x44($sp) -/* DDDAC8 80241298 8FB60040 */ lw $s6, 0x40($sp) -/* DDDACC 8024129C 8FB5003C */ lw $s5, 0x3c($sp) -/* DDDAD0 802412A0 8FB40038 */ lw $s4, 0x38($sp) -/* DDDAD4 802412A4 8FB30034 */ lw $s3, 0x34($sp) -/* DDDAD8 802412A8 8FB20030 */ lw $s2, 0x30($sp) -/* DDDADC 802412AC 8FB1002C */ lw $s1, 0x2c($sp) -/* DDDAE0 802412B0 8FB00028 */ lw $s0, 0x28($sp) -/* DDDAE4 802412B4 D7B80058 */ ldc1 $f24, 0x58($sp) -/* DDDAE8 802412B8 D7B60050 */ ldc1 $f22, 0x50($sp) -/* DDDAEC 802412BC D7B40048 */ ldc1 $f20, 0x48($sp) -/* DDDAF0 802412C0 03E00008 */ jr $ra -/* DDDAF4 802412C4 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_omo/omo_11/func_802412C8_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/func_802412C8_DDC830.s deleted file mode 100644 index 808a7efbbb..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/func_802412C8_DDC830.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412C8_DDDAF8 -/* DDDAF8 802412C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DDDAFC 802412CC AFB10014 */ sw $s1, 0x14($sp) -/* DDDB00 802412D0 0080882D */ daddu $s1, $a0, $zero -/* DDDB04 802412D4 AFB20018 */ sw $s2, 0x18($sp) -/* DDDB08 802412D8 AFBF001C */ sw $ra, 0x1c($sp) -/* DDDB0C 802412DC AFB00010 */ sw $s0, 0x10($sp) -/* DDDB10 802412E0 8E30000C */ lw $s0, 0xc($s1) -/* DDDB14 802412E4 10A00010 */ beqz $a1, .L80241328 -/* DDDB18 802412E8 0000902D */ daddu $s2, $zero, $zero -/* DDDB1C 802412EC 8E050000 */ lw $a1, ($s0) -/* DDDB20 802412F0 0C0B1EAF */ jal get_variable -/* DDDB24 802412F4 26100004 */ addiu $s0, $s0, 4 -/* DDDB28 802412F8 AE220084 */ sw $v0, 0x84($s1) -/* DDDB2C 802412FC 8E050000 */ lw $a1, ($s0) -/* DDDB30 80241300 0C0B1EAF */ jal get_variable -/* DDDB34 80241304 0220202D */ daddu $a0, $s1, $zero -/* DDDB38 80241308 0240202D */ daddu $a0, $s2, $zero -/* DDDB3C 8024130C 240500D0 */ addiu $a1, $zero, 0xd0 -/* DDDB40 80241310 00A0302D */ daddu $a2, $a1, $zero -/* DDDB44 80241314 00A0382D */ daddu $a3, $a1, $zero -/* DDDB48 80241318 AE220088 */ sw $v0, 0x88($s1) -/* DDDB4C 8024131C AE200070 */ sw $zero, 0x70($s1) -/* DDDB50 80241320 0C04DF84 */ jal func_80137E10 -/* DDDB54 80241324 AE200074 */ sw $zero, 0x74($s1) -.L80241328: -/* DDDB58 80241328 8E230070 */ lw $v1, 0x70($s1) -/* DDDB5C 8024132C 24040001 */ addiu $a0, $zero, 1 -/* DDDB60 80241330 10640019 */ beq $v1, $a0, .L80241398 -/* DDDB64 80241334 28620002 */ slti $v0, $v1, 2 -/* DDDB68 80241338 10400005 */ beqz $v0, .L80241350 -/* DDDB6C 8024133C 24020002 */ addiu $v0, $zero, 2 -/* DDDB70 80241340 10600007 */ beqz $v1, .L80241360 -/* DDDB74 80241344 240500FF */ addiu $a1, $zero, 0xff -/* DDDB78 80241348 080904F6 */ j .L802413D8 -/* DDDB7C 8024134C 00000000 */ nop -.L80241350: -/* DDDB80 80241350 10620019 */ beq $v1, $v0, .L802413B8 -/* DDDB84 80241354 00000000 */ nop -/* DDDB88 80241358 080904F6 */ j .L802413D8 -/* DDDB8C 8024135C 00000000 */ nop -.L80241360: -/* DDDB90 80241360 8E220074 */ lw $v0, 0x74($s1) -/* DDDB94 80241364 14450004 */ bne $v0, $a1, .L80241378 -/* DDDB98 80241368 00000000 */ nop -/* DDDB9C 8024136C AE240070 */ sw $a0, 0x70($s1) -/* DDDBA0 80241370 AE200078 */ sw $zero, 0x78($s1) -/* DDDBA4 80241374 8E220074 */ lw $v0, 0x74($s1) -.L80241378: -/* DDDBA8 80241378 8E230084 */ lw $v1, 0x84($s1) -/* DDDBAC 8024137C 00431021 */ addu $v0, $v0, $v1 -/* DDDBB0 80241380 AE220074 */ sw $v0, 0x74($s1) -/* DDDBB4 80241384 28420100 */ slti $v0, $v0, 0x100 -/* DDDBB8 80241388 50400013 */ beql $v0, $zero, .L802413D8 -/* DDDBBC 8024138C AE250074 */ sw $a1, 0x74($s1) -/* DDDBC0 80241390 080904F6 */ j .L802413D8 -/* DDDBC4 80241394 00000000 */ nop -.L80241398: -/* DDDBC8 80241398 8E220078 */ lw $v0, 0x78($s1) -/* DDDBCC 8024139C 24420001 */ addiu $v0, $v0, 1 -/* DDDBD0 802413A0 AE220078 */ sw $v0, 0x78($s1) -/* DDDBD4 802413A4 28420002 */ slti $v0, $v0, 2 -/* DDDBD8 802413A8 1440000B */ bnez $v0, .L802413D8 -/* DDDBDC 802413AC 24020002 */ addiu $v0, $zero, 2 -/* DDDBE0 802413B0 080904F6 */ j .L802413D8 -/* DDDBE4 802413B4 AE220070 */ sw $v0, 0x70($s1) -.L802413B8: -/* DDDBE8 802413B8 8E230074 */ lw $v1, 0x74($s1) -/* DDDBEC 802413BC 50600001 */ beql $v1, $zero, .L802413C4 -/* DDDBF0 802413C0 24120001 */ addiu $s2, $zero, 1 -.L802413C4: -/* DDDBF4 802413C4 8E220088 */ lw $v0, 0x88($s1) -/* DDDBF8 802413C8 00621023 */ subu $v0, $v1, $v0 -/* DDDBFC 802413CC 04410002 */ bgez $v0, .L802413D8 -/* DDDC00 802413D0 AE220074 */ sw $v0, 0x74($s1) -/* DDDC04 802413D4 AE200074 */ sw $zero, 0x74($s1) -.L802413D8: -/* DDDC08 802413D8 C6200074 */ lwc1 $f0, 0x74($s1) -/* DDDC0C 802413DC 46800020 */ cvt.s.w $f0, $f0 -/* DDDC10 802413E0 44050000 */ mfc1 $a1, $f0 -/* DDDC14 802413E4 0C04DF62 */ jal func_80137D88 -/* DDDC18 802413E8 24040001 */ addiu $a0, $zero, 1 -/* DDDC1C 802413EC 0240102D */ daddu $v0, $s2, $zero -/* DDDC20 802413F0 8FBF001C */ lw $ra, 0x1c($sp) -/* DDDC24 802413F4 8FB20018 */ lw $s2, 0x18($sp) -/* DDDC28 802413F8 8FB10014 */ lw $s1, 0x14($sp) -/* DDDC2C 802413FC 8FB00010 */ lw $s0, 0x10($sp) -/* DDDC30 80241400 03E00008 */ jr $ra -/* DDDC34 80241404 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_11/func_80241450_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/func_80241450_DDC830.s deleted file mode 100644 index fa49c6c1e0..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/func_80241450_DDC830.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241450_DDDC80 -/* DDDC80 80241450 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DDDC84 80241454 AFBF0018 */ sw $ra, 0x18($sp) -/* DDDC88 80241458 0C00EAD2 */ jal get_npc_safe -/* DDDC8C 8024145C 2404FFFC */ addiu $a0, $zero, -4 -/* DDDC90 80241460 3C0141F0 */ lui $at, 0x41f0 -/* DDDC94 80241464 44810000 */ mtc1 $at, $f0 -/* DDDC98 80241468 C442003C */ lwc1 $f2, 0x3c($v0) -/* DDDC9C 8024146C 46001080 */ add.s $f2, $f2, $f0 -/* DDDCA0 80241470 E7A00010 */ swc1 $f0, 0x10($sp) -/* DDDCA4 80241474 8C450038 */ lw $a1, 0x38($v0) -/* DDDCA8 80241478 8C470040 */ lw $a3, 0x40($v0) -/* DDDCAC 8024147C 44061000 */ mfc1 $a2, $f2 -/* DDDCB0 80241480 0C01BFBC */ jal func_8006FEF0 -/* DDDCB4 80241484 24040004 */ addiu $a0, $zero, 4 -/* DDDCB8 80241488 8FBF0018 */ lw $ra, 0x18($sp) -/* DDDCBC 8024148C 24020002 */ addiu $v0, $zero, 2 -/* DDDCC0 80241490 03E00008 */ jr $ra -/* DDDCC4 80241494 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_12/func_80240184_DDF310.s b/asm/nonmatchings/world/area_omo/omo_12/func_80240184_DDF310.s deleted file mode 100644 index 08fcdd7c9d..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_12/func_80240184_DDF310.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240184_DDF494 -/* DDF494 80240184 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DDF498 80240188 AFB00018 */ sw $s0, 0x18($sp) -/* DDF49C 8024018C 0080802D */ daddu $s0, $a0, $zero -/* DDF4A0 80240190 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* DDF4A4 80240194 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* DDF4A8 80240198 AFB1001C */ sw $s1, 0x1c($sp) -/* DDF4AC 8024019C 3C118011 */ lui $s1, %hi(gPlayerData) -/* DDF4B0 802401A0 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) -/* DDF4B4 802401A4 AFB20020 */ sw $s2, 0x20($sp) -/* DDF4B8 802401A8 0220902D */ daddu $s2, $s1, $zero -/* DDF4BC 802401AC 10A00004 */ beqz $a1, .L802401C0 -/* DDF4C0 802401B0 AFBF0024 */ sw $ra, 0x24($sp) -/* DDF4C4 802401B4 240200FF */ addiu $v0, $zero, 0xff -/* DDF4C8 802401B8 AE020070 */ sw $v0, 0x70($s0) -/* DDF4CC 802401BC AE000074 */ sw $zero, 0x74($s0) -.L802401C0: -/* DDF4D0 802401C0 24040001 */ addiu $a0, $zero, 1 -/* DDF4D4 802401C4 C460002C */ lwc1 $f0, 0x2c($v1) -/* DDF4D8 802401C8 3C014100 */ lui $at, 0x4100 -/* DDF4DC 802401CC 44811000 */ mtc1 $at, $f2 -/* DDF4E0 802401D0 00000000 */ nop -/* DDF4E4 802401D4 46020000 */ add.s $f0, $f0, $f2 -/* DDF4E8 802401D8 C4620030 */ lwc1 $f2, 0x30($v1) -/* DDF4EC 802401DC C4640028 */ lwc1 $f4, 0x28($v1) -/* DDF4F0 802401E0 4600118D */ trunc.w.s $f6, $f2 -/* DDF4F4 802401E4 E7A60010 */ swc1 $f6, 0x10($sp) -/* DDF4F8 802401E8 4600218D */ trunc.w.s $f6, $f4 -/* DDF4FC 802401EC 44063000 */ mfc1 $a2, $f6 -/* DDF500 802401F0 4600018D */ trunc.w.s $f6, $f0 -/* DDF504 802401F4 44073000 */ mfc1 $a3, $f6 -/* DDF508 802401F8 0C04DFB0 */ jal func_80137EC0 -/* DDF50C 802401FC 0080282D */ daddu $a1, $a0, $zero -/* DDF510 80240200 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* DDF514 80240204 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* DDF518 80240208 10400012 */ beqz $v0, .L80240254 -/* DDF51C 8024020C 24020006 */ addiu $v0, $zero, 6 -/* DDF520 80240210 82230012 */ lb $v1, 0x12($s1) -/* DDF524 80240214 14620022 */ bne $v1, $v0, .L802402A0 -/* DDF528 80240218 00000000 */ nop -/* DDF52C 8024021C 8E020074 */ lw $v0, 0x74($s0) -/* DDF530 80240220 14400004 */ bnez $v0, .L80240234 -/* DDF534 80240224 24020001 */ addiu $v0, $zero, 1 -/* DDF538 80240228 AE020074 */ sw $v0, 0x74($s0) -/* DDF53C 8024022C 0C05272D */ jal play_sound -/* DDF540 80240230 24042011 */ addiu $a0, $zero, 0x2011 -.L80240234: -/* DDF544 80240234 8E020070 */ lw $v0, 0x70($s0) -/* DDF548 80240238 2442FFF8 */ addiu $v0, $v0, -8 -/* DDF54C 8024023C AE020070 */ sw $v0, 0x70($s0) -/* DDF550 80240240 2842005A */ slti $v0, $v0, 0x5a -/* DDF554 80240244 10400016 */ beqz $v0, .L802402A0 -/* DDF558 80240248 2402005A */ addiu $v0, $zero, 0x5a -/* DDF55C 8024024C 080900A8 */ j .L802402A0 -/* DDF560 80240250 AE020070 */ sw $v0, 0x70($s0) -.L80240254: -/* DDF564 80240254 82430012 */ lb $v1, 0x12($s2) -/* DDF568 80240258 14620010 */ bne $v1, $v0, .L8024029C -/* DDF56C 8024025C 240200FF */ addiu $v0, $zero, 0xff -/* DDF570 80240260 8E020074 */ lw $v0, 0x74($s0) -/* DDF574 80240264 10400007 */ beqz $v0, .L80240284 -/* DDF578 80240268 00000000 */ nop -/* DDF57C 8024026C 8E020070 */ lw $v0, 0x70($s0) -/* DDF580 80240270 284200FF */ slti $v0, $v0, 0xff -/* DDF584 80240274 10400003 */ beqz $v0, .L80240284 -/* DDF588 80240278 AE000074 */ sw $zero, 0x74($s0) -/* DDF58C 8024027C 0C05272D */ jal play_sound -/* DDF590 80240280 24042012 */ addiu $a0, $zero, 0x2012 -.L80240284: -/* DDF594 80240284 8E020070 */ lw $v0, 0x70($s0) -/* DDF598 80240288 24420008 */ addiu $v0, $v0, 8 -/* DDF59C 8024028C AE020070 */ sw $v0, 0x70($s0) -/* DDF5A0 80240290 284200FF */ slti $v0, $v0, 0xff -/* DDF5A4 80240294 14400002 */ bnez $v0, .L802402A0 -/* DDF5A8 80240298 240200FF */ addiu $v0, $zero, 0xff -.L8024029C: -/* DDF5AC 8024029C AE020070 */ sw $v0, 0x70($s0) -.L802402A0: -/* DDF5B0 802402A0 C6060070 */ lwc1 $f6, 0x70($s0) -/* DDF5B4 802402A4 468031A0 */ cvt.s.w $f6, $f6 -/* DDF5B8 802402A8 44053000 */ mfc1 $a1, $f6 -/* DDF5BC 802402AC 0C04E035 */ jal func_801380D4 -/* DDF5C0 802402B0 24040001 */ addiu $a0, $zero, 1 -/* DDF5C4 802402B4 3C05437F */ lui $a1, 0x437f -/* DDF5C8 802402B8 0C04DF69 */ jal func_80137DA4 -/* DDF5CC 802402BC 2404000B */ addiu $a0, $zero, 0xb -/* DDF5D0 802402C0 8FBF0024 */ lw $ra, 0x24($sp) -/* DDF5D4 802402C4 8FB20020 */ lw $s2, 0x20($sp) -/* DDF5D8 802402C8 8FB1001C */ lw $s1, 0x1c($sp) -/* DDF5DC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* DDF5E0 802402D0 0000102D */ daddu $v0, $zero, $zero -/* DDF5E4 802402D4 03E00008 */ jr $ra -/* DDF5E8 802402D8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_12/func_802402F8_DDF310.s b/asm/nonmatchings/world/area_omo/omo_12/func_802402F8_DDF310.s deleted file mode 100644 index 576ddf255f..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_12/func_802402F8_DDF310.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F8_DDF608 -/* DDF608 802402F8 3C03800B */ lui $v1, %hi(gCameras) -/* DDF60C 802402FC 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DDF610 80240300 94620000 */ lhu $v0, ($v1) -/* DDF614 80240304 3042EFFF */ andi $v0, $v0, 0xefff -/* DDF618 80240308 A4620000 */ sh $v0, ($v1) -/* DDF61C 8024030C 03E00008 */ jr $ra -/* DDF620 80240310 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_12/func_80240314_DDF310.s b/asm/nonmatchings/world/area_omo/omo_12/func_80240314_DDF310.s deleted file mode 100644 index acd4c48ef5..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_12/func_80240314_DDF310.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240314_DDF624 -/* DDF624 80240314 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DDF628 80240318 AFB1001C */ sw $s1, 0x1c($sp) -/* DDF62C 8024031C 0080882D */ daddu $s1, $a0, $zero -/* DDF630 80240320 AFBF0028 */ sw $ra, 0x28($sp) -/* DDF634 80240324 AFB30024 */ sw $s3, 0x24($sp) -/* DDF638 80240328 AFB20020 */ sw $s2, 0x20($sp) -/* DDF63C 8024032C AFB00018 */ sw $s0, 0x18($sp) -/* DDF640 80240330 8E30000C */ lw $s0, 0xc($s1) -/* DDF644 80240334 8E050000 */ lw $a1, ($s0) -/* DDF648 80240338 0C0B1EAF */ jal get_variable -/* DDF64C 8024033C 26100004 */ addiu $s0, $s0, 4 -/* DDF650 80240340 8E050000 */ lw $a1, ($s0) -/* DDF654 80240344 26100004 */ addiu $s0, $s0, 4 -/* DDF658 80240348 0220202D */ daddu $a0, $s1, $zero -/* DDF65C 8024034C 0C0B1EAF */ jal get_variable -/* DDF660 80240350 0040982D */ daddu $s3, $v0, $zero -/* DDF664 80240354 8E050000 */ lw $a1, ($s0) -/* DDF668 80240358 26100004 */ addiu $s0, $s0, 4 -/* DDF66C 8024035C 0220202D */ daddu $a0, $s1, $zero -/* DDF670 80240360 0C0B1EAF */ jal get_variable -/* DDF674 80240364 0040902D */ daddu $s2, $v0, $zero -/* DDF678 80240368 0220202D */ daddu $a0, $s1, $zero -/* DDF67C 8024036C 8E050000 */ lw $a1, ($s0) -/* DDF680 80240370 0C0B1EAF */ jal get_variable -/* DDF684 80240374 0040802D */ daddu $s0, $v0, $zero -/* DDF688 80240378 24040001 */ addiu $a0, $zero, 1 -/* DDF68C 8024037C 0080282D */ daddu $a1, $a0, $zero -/* DDF690 80240380 AFB00010 */ sw $s0, 0x10($sp) -/* DDF694 80240384 0040802D */ daddu $s0, $v0, $zero -/* DDF698 80240388 0260302D */ daddu $a2, $s3, $zero -/* DDF69C 8024038C 0C04DFB0 */ jal func_80137EC0 -/* DDF6A0 80240390 0240382D */ daddu $a3, $s2, $zero -/* DDF6A4 80240394 44900000 */ mtc1 $s0, $f0 -/* DDF6A8 80240398 00000000 */ nop -/* DDF6AC 8024039C 46800020 */ cvt.s.w $f0, $f0 -/* DDF6B0 802403A0 44050000 */ mfc1 $a1, $f0 -/* DDF6B4 802403A4 0C04E035 */ jal func_801380D4 -/* DDF6B8 802403A8 24040001 */ addiu $a0, $zero, 1 -/* DDF6BC 802403AC 3C05437F */ lui $a1, 0x437f -/* DDF6C0 802403B0 0C04DF69 */ jal func_80137DA4 -/* DDF6C4 802403B4 2404000B */ addiu $a0, $zero, 0xb -/* DDF6C8 802403B8 8FBF0028 */ lw $ra, 0x28($sp) -/* DDF6CC 802403BC 8FB30024 */ lw $s3, 0x24($sp) -/* DDF6D0 802403C0 8FB20020 */ lw $s2, 0x20($sp) -/* DDF6D4 802403C4 8FB1001C */ lw $s1, 0x1c($sp) -/* DDF6D8 802403C8 8FB00018 */ lw $s0, 0x18($sp) -/* DDF6DC 802403CC 24020002 */ addiu $v0, $zero, 2 -/* DDF6E0 802403D0 03E00008 */ jr $ra -/* DDF6E4 802403D4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_12/func_802403D8_DDF310.s b/asm/nonmatchings/world/area_omo/omo_12/func_802403D8_DDF310.s deleted file mode 100644 index db0ee250fa..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_12/func_802403D8_DDF310.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403D8_DDF6E8 -/* DDF6E8 802403D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DDF6EC 802403DC F7B40018 */ sdc1 $f20, 0x18($sp) -/* DDF6F0 802403E0 4480A000 */ mtc1 $zero, $f20 -/* DDF6F4 802403E4 00000000 */ nop -/* DDF6F8 802403E8 4405A000 */ mfc1 $a1, $f20 -/* DDF6FC 802403EC AFBF0010 */ sw $ra, 0x10($sp) -/* DDF700 802403F0 0C04E035 */ jal func_801380D4 -/* DDF704 802403F4 24040001 */ addiu $a0, $zero, 1 -/* DDF708 802403F8 4405A000 */ mfc1 $a1, $f20 -/* DDF70C 802403FC 0C04DF69 */ jal func_80137DA4 -/* DDF710 80240400 2404000B */ addiu $a0, $zero, 0xb -/* DDF714 80240404 8FBF0010 */ lw $ra, 0x10($sp) -/* DDF718 80240408 D7B40018 */ ldc1 $f20, 0x18($sp) -/* DDF71C 8024040C 24020002 */ addiu $v0, $zero, 2 -/* DDF720 80240410 03E00008 */ jr $ra -/* DDF724 80240414 27BD0020 */ addiu $sp, $sp, 0x20 -/* DDF728 80240418 00000000 */ nop -/* DDF72C 8024041C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_12/func_80240420_DDF310.s b/asm/nonmatchings/world/area_omo/omo_12/func_80240420_DDF310.s deleted file mode 100644 index 37e799e8e3..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_12/func_80240420_DDF310.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240420_DDF730 -/* DDF730 80240420 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DDF734 80240424 3C048024 */ lui $a0, 0x8024 -/* DDF738 80240428 24843168 */ addiu $a0, $a0, 0x3168 -/* DDF73C 8024042C 27A50010 */ addiu $a1, $sp, 0x10 -/* DDF740 80240430 AFBF0020 */ sw $ra, 0x20($sp) -/* DDF744 80240434 AFB1001C */ sw $s1, 0x1c($sp) -/* DDF748 80240438 0C016B3A */ jal load_asset_by_name -/* DDF74C 8024043C AFB00018 */ sw $s0, 0x18($sp) -/* DDF750 80240440 0040802D */ daddu $s0, $v0, $zero -/* DDF754 80240444 0200202D */ daddu $a0, $s0, $zero -/* DDF758 80240448 3C118024 */ lui $s1, 0x8024 -/* DDF75C 8024044C 26313190 */ addiu $s1, $s1, 0x3190 -/* DDF760 80240450 0C01BB7C */ jal decode_yay0 -/* DDF764 80240454 0220282D */ daddu $a1, $s1, $zero -/* DDF768 80240458 0C00AB1E */ jal general_heap_free -/* DDF76C 8024045C 0200202D */ daddu $a0, $s0, $zero -/* DDF770 80240460 3C048024 */ lui $a0, 0x8024 -/* DDF774 80240464 24847120 */ addiu $a0, $a0, 0x7120 -/* DDF778 80240468 3C028024 */ lui $v0, 0x8024 -/* DDF77C 8024046C 24423390 */ addiu $v0, $v0, 0x3390 -/* DDF780 80240470 AC820000 */ sw $v0, ($a0) -/* DDF784 80240474 24020096 */ addiu $v0, $zero, 0x96 -/* DDF788 80240478 A4820008 */ sh $v0, 8($a0) -/* DDF78C 8024047C 24020069 */ addiu $v0, $zero, 0x69 -/* DDF790 80240480 A482000A */ sh $v0, 0xa($a0) -/* DDF794 80240484 24020002 */ addiu $v0, $zero, 2 -/* DDF798 80240488 AC82000C */ sw $v0, 0xc($a0) -/* DDF79C 8024048C 24020001 */ addiu $v0, $zero, 1 -/* DDF7A0 80240490 AC910004 */ sw $s1, 4($a0) -/* DDF7A4 80240494 0C0496CB */ jal set_message_images -/* DDF7A8 80240498 AC820010 */ sw $v0, 0x10($a0) -/* DDF7AC 8024049C 8FBF0020 */ lw $ra, 0x20($sp) -/* DDF7B0 802404A0 8FB1001C */ lw $s1, 0x1c($sp) -/* DDF7B4 802404A4 8FB00018 */ lw $s0, 0x18($sp) -/* DDF7B8 802404A8 24020002 */ addiu $v0, $zero, 2 -/* DDF7BC 802404AC 03E00008 */ jr $ra -/* DDF7C0 802404B0 27BD0028 */ addiu $sp, $sp, 0x28 -/* DDF7C4 802404B4 00000000 */ nop -/* DDF7C8 802404B8 00000000 */ nop -/* DDF7CC 802404BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_13/func_80240280_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/func_80240280_DE2490.s deleted file mode 100644 index 12d76c5d94..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/func_80240280_DE2490.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240280_DE2710 -/* DE2710 80240280 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE2714 80240284 AFB10014 */ sw $s1, 0x14($sp) -/* DE2718 80240288 0080882D */ daddu $s1, $a0, $zero -/* DE271C 8024028C AFBF0018 */ sw $ra, 0x18($sp) -/* DE2720 80240290 AFB00010 */ sw $s0, 0x10($sp) -/* DE2724 80240294 8E300148 */ lw $s0, 0x148($s1) -/* DE2728 80240298 0C00EABB */ jal get_npc_unsafe -/* DE272C 8024029C 86040008 */ lh $a0, 8($s0) -/* DE2730 802402A0 C4400018 */ lwc1 $f0, 0x18($v0) -/* DE2734 802402A4 3C018024 */ lui $at, 0x8024 -/* DE2738 802402A8 D4222EE0 */ ldc1 $f2, 0x2ee0($at) -/* DE273C 802402AC 46000021 */ cvt.d.s $f0, $f0 -/* DE2740 802402B0 46220002 */ mul.d $f0, $f0, $f2 -/* DE2744 802402B4 00000000 */ nop -/* DE2748 802402B8 46200020 */ cvt.s.d $f0, $f0 -/* DE274C 802402BC E4400018 */ swc1 $f0, 0x18($v0) -/* DE2750 802402C0 8E0300CC */ lw $v1, 0xcc($s0) -/* DE2754 802402C4 8C640030 */ lw $a0, 0x30($v1) -/* DE2758 802402C8 24030005 */ addiu $v1, $zero, 5 -/* DE275C 802402CC A443008E */ sh $v1, 0x8e($v0) -/* DE2760 802402D0 AC440028 */ sw $a0, 0x28($v0) -/* DE2764 802402D4 2402000F */ addiu $v0, $zero, 0xf -/* DE2768 802402D8 AE220070 */ sw $v0, 0x70($s1) -/* DE276C 802402DC 8FBF0018 */ lw $ra, 0x18($sp) -/* DE2770 802402E0 8FB10014 */ lw $s1, 0x14($sp) -/* DE2774 802402E4 8FB00010 */ lw $s0, 0x10($sp) -/* DE2778 802402E8 03E00008 */ jr $ra -/* DE277C 802402EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_13/func_802402F0_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/func_802402F0_DE2490.s deleted file mode 100644 index ca9119cb42..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/func_802402F0_DE2490.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_DE2780 -/* DE2780 802402F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DE2784 802402F4 AFB20028 */ sw $s2, 0x28($sp) -/* DE2788 802402F8 0080902D */ daddu $s2, $a0, $zero -/* DE278C 802402FC AFBF002C */ sw $ra, 0x2c($sp) -/* DE2790 80240300 AFB10024 */ sw $s1, 0x24($sp) -/* DE2794 80240304 AFB00020 */ sw $s0, 0x20($sp) -/* DE2798 80240308 8E510148 */ lw $s1, 0x148($s2) -/* DE279C 8024030C 0C00EABB */ jal get_npc_unsafe -/* DE27A0 80240310 86240008 */ lh $a0, 8($s1) -/* DE27A4 80240314 0040802D */ daddu $s0, $v0, $zero -/* DE27A8 80240318 0200202D */ daddu $a0, $s0, $zero -/* DE27AC 8024031C C600000C */ lwc1 $f0, 0xc($s0) -/* DE27B0 80240320 27A60018 */ addiu $a2, $sp, 0x18 -/* DE27B4 80240324 E7A00018 */ swc1 $f0, 0x18($sp) -/* DE27B8 80240328 AFA00010 */ sw $zero, 0x10($sp) -/* DE27BC 8024032C AFA00014 */ sw $zero, 0x14($sp) -/* DE27C0 80240330 8E050018 */ lw $a1, 0x18($s0) -/* DE27C4 80240334 0C0129E1 */ jal func_8004A784 -/* DE27C8 80240338 0000382D */ daddu $a3, $zero, $zero -/* DE27CC 8024033C 14400005 */ bnez $v0, .L80240354 -/* DE27D0 80240340 00000000 */ nop -/* DE27D4 80240344 8E050018 */ lw $a1, 0x18($s0) -/* DE27D8 80240348 8E06000C */ lw $a2, 0xc($s0) -/* DE27DC 8024034C 0C00EA95 */ jal npc_move_heading -/* DE27E0 80240350 0200202D */ daddu $a0, $s0, $zero -.L80240354: -/* DE27E4 80240354 9602008E */ lhu $v0, 0x8e($s0) -/* DE27E8 80240358 2442FFFF */ addiu $v0, $v0, -1 -/* DE27EC 8024035C A602008E */ sh $v0, 0x8e($s0) -/* DE27F0 80240360 00021400 */ sll $v0, $v0, 0x10 -/* DE27F4 80240364 14400010 */ bnez $v0, .L802403A8 -/* DE27F8 80240368 00000000 */ nop -/* DE27FC 8024036C C6000018 */ lwc1 $f0, 0x18($s0) -/* DE2800 80240370 3C018024 */ lui $at, 0x8024 -/* DE2804 80240374 D4222EE8 */ ldc1 $f2, 0x2ee8($at) -/* DE2808 80240378 46000021 */ cvt.d.s $f0, $f0 -/* DE280C 8024037C 46220002 */ mul.d $f0, $f0, $f2 -/* DE2810 80240380 00000000 */ nop -/* DE2814 80240384 46200020 */ cvt.s.d $f0, $f0 -/* DE2818 80240388 E6000018 */ swc1 $f0, 0x18($s0) -/* DE281C 8024038C 8E2200CC */ lw $v0, 0xcc($s1) -/* DE2820 80240390 8C43002C */ lw $v1, 0x2c($v0) -/* DE2824 80240394 2402000A */ addiu $v0, $zero, 0xa -/* DE2828 80240398 A602008E */ sh $v0, 0x8e($s0) -/* DE282C 8024039C 24020010 */ addiu $v0, $zero, 0x10 -/* DE2830 802403A0 AE030028 */ sw $v1, 0x28($s0) -/* DE2834 802403A4 AE420070 */ sw $v0, 0x70($s2) -.L802403A8: -/* DE2838 802403A8 8FBF002C */ lw $ra, 0x2c($sp) -/* DE283C 802403AC 8FB20028 */ lw $s2, 0x28($sp) -/* DE2840 802403B0 8FB10024 */ lw $s1, 0x24($sp) -/* DE2844 802403B4 8FB00020 */ lw $s0, 0x20($sp) -/* DE2848 802403B8 03E00008 */ jr $ra -/* DE284C 802403BC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_13/func_802403C0_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/func_802403C0_DE2490.s deleted file mode 100644 index c000908942..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/func_802403C0_DE2490.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C0_DE2850 -/* DE2850 802403C0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DE2854 802403C4 AFB10024 */ sw $s1, 0x24($sp) -/* DE2858 802403C8 0080882D */ daddu $s1, $a0, $zero -/* DE285C 802403CC AFBF0028 */ sw $ra, 0x28($sp) -/* DE2860 802403D0 AFB00020 */ sw $s0, 0x20($sp) -/* DE2864 802403D4 8E220148 */ lw $v0, 0x148($s1) -/* DE2868 802403D8 0C00EABB */ jal get_npc_unsafe -/* DE286C 802403DC 84440008 */ lh $a0, 8($v0) -/* DE2870 802403E0 0040802D */ daddu $s0, $v0, $zero -/* DE2874 802403E4 0200202D */ daddu $a0, $s0, $zero -/* DE2878 802403E8 C600000C */ lwc1 $f0, 0xc($s0) -/* DE287C 802403EC 27A60018 */ addiu $a2, $sp, 0x18 -/* DE2880 802403F0 E7A00018 */ swc1 $f0, 0x18($sp) -/* DE2884 802403F4 AFA00010 */ sw $zero, 0x10($sp) -/* DE2888 802403F8 AFA00014 */ sw $zero, 0x14($sp) -/* DE288C 802403FC 8E050018 */ lw $a1, 0x18($s0) -/* DE2890 80240400 0C0129E1 */ jal func_8004A784 -/* DE2894 80240404 0000382D */ daddu $a3, $zero, $zero -/* DE2898 80240408 14400005 */ bnez $v0, .L80240420 -/* DE289C 8024040C 00000000 */ nop -/* DE28A0 80240410 8E050018 */ lw $a1, 0x18($s0) -/* DE28A4 80240414 8E06000C */ lw $a2, 0xc($s0) -/* DE28A8 80240418 0C00EA95 */ jal npc_move_heading -/* DE28AC 8024041C 0200202D */ daddu $a0, $s0, $zero -.L80240420: -/* DE28B0 80240420 9602008E */ lhu $v0, 0x8e($s0) -/* DE28B4 80240424 2442FFFF */ addiu $v0, $v0, -1 -/* DE28B8 80240428 A602008E */ sh $v0, 0x8e($s0) -/* DE28BC 8024042C 00021400 */ sll $v0, $v0, 0x10 -/* DE28C0 80240430 14400004 */ bnez $v0, .L80240444 -/* DE28C4 80240434 2402001E */ addiu $v0, $zero, 0x1e -/* DE28C8 80240438 A602008E */ sh $v0, 0x8e($s0) -/* DE28CC 8024043C 24020011 */ addiu $v0, $zero, 0x11 -/* DE28D0 80240440 AE220070 */ sw $v0, 0x70($s1) -.L80240444: -/* DE28D4 80240444 8FBF0028 */ lw $ra, 0x28($sp) -/* DE28D8 80240448 8FB10024 */ lw $s1, 0x24($sp) -/* DE28DC 8024044C 8FB00020 */ lw $s0, 0x20($sp) -/* DE28E0 80240450 03E00008 */ jr $ra -/* DE28E4 80240454 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_13/func_80240458_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/func_80240458_DE2490.s deleted file mode 100644 index 25f8166c9e..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/func_80240458_DE2490.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240458_DE28E8 -/* DE28E8 80240458 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE28EC 8024045C AFB10014 */ sw $s1, 0x14($sp) -/* DE28F0 80240460 0080882D */ daddu $s1, $a0, $zero -/* DE28F4 80240464 AFBF0018 */ sw $ra, 0x18($sp) -/* DE28F8 80240468 AFB00010 */ sw $s0, 0x10($sp) -/* DE28FC 8024046C 8E300148 */ lw $s0, 0x148($s1) -/* DE2900 80240470 0C00EABB */ jal get_npc_unsafe -/* DE2904 80240474 86040008 */ lh $a0, 8($s0) -/* DE2908 80240478 0040182D */ daddu $v1, $v0, $zero -/* DE290C 8024047C 9462008E */ lhu $v0, 0x8e($v1) -/* DE2910 80240480 2442FFFF */ addiu $v0, $v0, -1 -/* DE2914 80240484 A462008E */ sh $v0, 0x8e($v1) -/* DE2918 80240488 00021400 */ sll $v0, $v0, 0x10 -/* DE291C 8024048C 14400005 */ bnez $v0, .L802404A4 -/* DE2920 80240490 00000000 */ nop -/* DE2924 80240494 8E0200CC */ lw $v0, 0xcc($s0) -/* DE2928 80240498 8C420000 */ lw $v0, ($v0) -/* DE292C 8024049C AC620028 */ sw $v0, 0x28($v1) -/* DE2930 802404A0 AE200070 */ sw $zero, 0x70($s1) -.L802404A4: -/* DE2934 802404A4 8FBF0018 */ lw $ra, 0x18($sp) -/* DE2938 802404A8 8FB10014 */ lw $s1, 0x14($sp) -/* DE293C 802404AC 8FB00010 */ lw $s0, 0x10($sp) -/* DE2940 802404B0 03E00008 */ jr $ra -/* DE2944 802404B4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_13/func_802404B8_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/func_802404B8_DE2490.s deleted file mode 100644 index 0fee1a947a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/func_802404B8_DE2490.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404B8_DE2948 -/* DE2948 802404B8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DE294C 802404BC AFB30054 */ sw $s3, 0x54($sp) -/* DE2950 802404C0 0080982D */ daddu $s3, $a0, $zero -/* DE2954 802404C4 AFBF0060 */ sw $ra, 0x60($sp) -/* DE2958 802404C8 AFB5005C */ sw $s5, 0x5c($sp) -/* DE295C 802404CC AFB40058 */ sw $s4, 0x58($sp) -/* DE2960 802404D0 AFB20050 */ sw $s2, 0x50($sp) -/* DE2964 802404D4 AFB1004C */ sw $s1, 0x4c($sp) -/* DE2968 802404D8 AFB00048 */ sw $s0, 0x48($sp) -/* DE296C 802404DC 8E710148 */ lw $s1, 0x148($s3) -/* DE2970 802404E0 86240008 */ lh $a0, 8($s1) -/* DE2974 802404E4 0C00EABB */ jal get_npc_unsafe -/* DE2978 802404E8 00A0802D */ daddu $s0, $a1, $zero -/* DE297C 802404EC 8E63000C */ lw $v1, 0xc($s3) -/* DE2980 802404F0 0260202D */ daddu $a0, $s3, $zero -/* DE2984 802404F4 8C650000 */ lw $a1, ($v1) -/* DE2988 802404F8 0C0B1EAF */ jal get_variable -/* DE298C 802404FC 0040902D */ daddu $s2, $v0, $zero -/* DE2990 80240500 AFA00018 */ sw $zero, 0x18($sp) -/* DE2994 80240504 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE2998 80240508 8C630030 */ lw $v1, 0x30($v1) -/* DE299C 8024050C AFA3001C */ sw $v1, 0x1c($sp) -/* DE29A0 80240510 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE29A4 80240514 8C63001C */ lw $v1, 0x1c($v1) -/* DE29A8 80240518 AFA30020 */ sw $v1, 0x20($sp) -/* DE29AC 8024051C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE29B0 80240520 8C630024 */ lw $v1, 0x24($v1) -/* DE29B4 80240524 AFA30024 */ sw $v1, 0x24($sp) -/* DE29B8 80240528 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE29BC 8024052C 8C630028 */ lw $v1, 0x28($v1) -/* DE29C0 80240530 27B50018 */ addiu $s5, $sp, 0x18 -/* DE29C4 80240534 AFA30028 */ sw $v1, 0x28($sp) -/* DE29C8 80240538 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE29CC 8024053C 3C014282 */ lui $at, 0x4282 -/* DE29D0 80240540 44810000 */ mtc1 $at, $f0 -/* DE29D4 80240544 8C63002C */ lw $v1, 0x2c($v1) -/* DE29D8 80240548 0040A02D */ daddu $s4, $v0, $zero -/* DE29DC 8024054C E7A00030 */ swc1 $f0, 0x30($sp) -/* DE29E0 80240550 A7A00034 */ sh $zero, 0x34($sp) -/* DE29E4 80240554 16000005 */ bnez $s0, .L8024056C -/* DE29E8 80240558 AFA3002C */ sw $v1, 0x2c($sp) -/* DE29EC 8024055C 8E2200B0 */ lw $v0, 0xb0($s1) -/* DE29F0 80240560 30420004 */ andi $v0, $v0, 4 -/* DE29F4 80240564 10400044 */ beqz $v0, .L80240678 -/* DE29F8 80240568 00000000 */ nop -.L8024056C: -/* DE29FC 8024056C 2404F7FF */ addiu $a0, $zero, -0x801 -/* DE2A00 80240570 AE600070 */ sw $zero, 0x70($s3) -/* DE2A04 80240574 A640008E */ sh $zero, 0x8e($s2) -/* DE2A08 80240578 8E2200CC */ lw $v0, 0xcc($s1) -/* DE2A0C 8024057C 8E430000 */ lw $v1, ($s2) -/* DE2A10 80240580 8C420000 */ lw $v0, ($v0) -/* DE2A14 80240584 00641824 */ and $v1, $v1, $a0 -/* DE2A18 80240588 AE430000 */ sw $v1, ($s2) -/* DE2A1C 8024058C AE420028 */ sw $v0, 0x28($s2) -/* DE2A20 80240590 8E2200D0 */ lw $v0, 0xd0($s1) -/* DE2A24 80240594 8C420034 */ lw $v0, 0x34($v0) -/* DE2A28 80240598 54400005 */ bnel $v0, $zero, .L802405B0 -/* DE2A2C 8024059C 2402FDFF */ addiu $v0, $zero, -0x201 -/* DE2A30 802405A0 34620200 */ ori $v0, $v1, 0x200 -/* DE2A34 802405A4 2403FFF7 */ addiu $v1, $zero, -9 -/* DE2A38 802405A8 0809016E */ j .L802405B8 -/* DE2A3C 802405AC 00431024 */ and $v0, $v0, $v1 -.L802405B0: -/* DE2A40 802405B0 00621024 */ and $v0, $v1, $v0 -/* DE2A44 802405B4 34420008 */ ori $v0, $v0, 8 -.L802405B8: -/* DE2A48 802405B8 AE420000 */ sw $v0, ($s2) -/* DE2A4C 802405BC 8E2200B0 */ lw $v0, 0xb0($s1) -/* DE2A50 802405C0 30420004 */ andi $v0, $v0, 4 -/* DE2A54 802405C4 10400004 */ beqz $v0, .L802405D8 -/* DE2A58 802405C8 24020063 */ addiu $v0, $zero, 0x63 -/* DE2A5C 802405CC AE620070 */ sw $v0, 0x70($s3) -/* DE2A60 802405D0 0809017C */ j .L802405F0 -/* DE2A64 802405D4 AE600074 */ sw $zero, 0x74($s3) -.L802405D8: -/* DE2A68 802405D8 8E220000 */ lw $v0, ($s1) -/* DE2A6C 802405DC 3C034000 */ lui $v1, 0x4000 -/* DE2A70 802405E0 00431024 */ and $v0, $v0, $v1 -/* DE2A74 802405E4 10400002 */ beqz $v0, .L802405F0 -/* DE2A78 802405E8 2402000C */ addiu $v0, $zero, 0xc -/* DE2A7C 802405EC AE620070 */ sw $v0, 0x70($s3) -.L802405F0: -/* DE2A80 802405F0 3C06BFFF */ lui $a2, 0xbfff -/* DE2A84 802405F4 34C6FFFF */ ori $a2, $a2, 0xffff -/* DE2A88 802405F8 27A50038 */ addiu $a1, $sp, 0x38 -/* DE2A8C 802405FC 2404FFFB */ addiu $a0, $zero, -5 -/* DE2A90 80240600 8E2200B0 */ lw $v0, 0xb0($s1) -/* DE2A94 80240604 8E230000 */ lw $v1, ($s1) -/* DE2A98 80240608 3C0142C8 */ lui $at, 0x42c8 -/* DE2A9C 8024060C 44810000 */ mtc1 $at, $f0 -/* DE2AA0 80240610 00441024 */ and $v0, $v0, $a0 -/* DE2AA4 80240614 00661824 */ and $v1, $v1, $a2 -/* DE2AA8 80240618 AE2200B0 */ sw $v0, 0xb0($s1) -/* DE2AAC 8024061C AE230000 */ sw $v1, ($s1) -/* DE2AB0 80240620 864200A8 */ lh $v0, 0xa8($s2) -/* DE2AB4 80240624 27A70040 */ addiu $a3, $sp, 0x40 -/* DE2AB8 80240628 E7A00044 */ swc1 $f0, 0x44($sp) -/* DE2ABC 8024062C C6460038 */ lwc1 $f6, 0x38($s2) -/* DE2AC0 80240630 C640003C */ lwc1 $f0, 0x3c($s2) -/* DE2AC4 80240634 C6420040 */ lwc1 $f2, 0x40($s2) -/* DE2AC8 80240638 44822000 */ mtc1 $v0, $f4 -/* DE2ACC 8024063C 00000000 */ nop -/* DE2AD0 80240640 46802120 */ cvt.s.w $f4, $f4 -/* DE2AD4 80240644 27A20044 */ addiu $v0, $sp, 0x44 -/* DE2AD8 80240648 46040000 */ add.s $f0, $f0, $f4 -/* DE2ADC 8024064C E7A60038 */ swc1 $f6, 0x38($sp) -/* DE2AE0 80240650 E7A20040 */ swc1 $f2, 0x40($sp) -/* DE2AE4 80240654 E7A0003C */ swc1 $f0, 0x3c($sp) -/* DE2AE8 80240658 AFA20010 */ sw $v0, 0x10($sp) -/* DE2AEC 8024065C 8E440080 */ lw $a0, 0x80($s2) -/* DE2AF0 80240660 0C0372DF */ jal func_800DCB7C -/* DE2AF4 80240664 27A6003C */ addiu $a2, $sp, 0x3c -/* DE2AF8 80240668 10400003 */ beqz $v0, .L80240678 -/* DE2AFC 8024066C 00000000 */ nop -/* DE2B00 80240670 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DE2B04 80240674 E640003C */ swc1 $f0, 0x3c($s2) -.L80240678: -/* DE2B08 80240678 8E630070 */ lw $v1, 0x70($s3) -/* DE2B0C 8024067C 2C620064 */ sltiu $v0, $v1, 0x64 -/* DE2B10 80240680 10400050 */ beqz $v0, .L802407C4 -/* DE2B14 80240684 00031080 */ sll $v0, $v1, 2 -/* DE2B18 80240688 3C018024 */ lui $at, 0x8024 -/* DE2B1C 8024068C 00220821 */ addu $at, $at, $v0 -/* DE2B20 80240690 8C222EF0 */ lw $v0, 0x2ef0($at) -/* DE2B24 80240694 00400008 */ jr $v0 -/* DE2B28 80240698 00000000 */ nop -/* DE2B2C 8024069C 0260202D */ daddu $a0, $s3, $zero -/* DE2B30 802406A0 0280282D */ daddu $a1, $s4, $zero -/* DE2B34 802406A4 0C012568 */ jal func_800495A0 -/* DE2B38 802406A8 02A0302D */ daddu $a2, $s5, $zero -/* DE2B3C 802406AC 0260202D */ daddu $a0, $s3, $zero -/* DE2B40 802406B0 0280282D */ daddu $a1, $s4, $zero -/* DE2B44 802406B4 0C0125AE */ jal func_800496B8 -/* DE2B48 802406B8 02A0302D */ daddu $a2, $s5, $zero -/* DE2B4C 802406BC 080901F1 */ j .L802407C4 -/* DE2B50 802406C0 00000000 */ nop -/* DE2B54 802406C4 0260202D */ daddu $a0, $s3, $zero -/* DE2B58 802406C8 0280282D */ daddu $a1, $s4, $zero -/* DE2B5C 802406CC 0C0126D1 */ jal func_80049B44 -/* DE2B60 802406D0 02A0302D */ daddu $a2, $s5, $zero -/* DE2B64 802406D4 0260202D */ daddu $a0, $s3, $zero -/* DE2B68 802406D8 0280282D */ daddu $a1, $s4, $zero -/* DE2B6C 802406DC 0C012701 */ jal func_80049C04 -/* DE2B70 802406E0 02A0302D */ daddu $a2, $s5, $zero -/* DE2B74 802406E4 080901F1 */ j .L802407C4 -/* DE2B78 802406E8 00000000 */ nop -/* DE2B7C 802406EC 0260202D */ daddu $a0, $s3, $zero -/* DE2B80 802406F0 0280282D */ daddu $a1, $s4, $zero -/* DE2B84 802406F4 0C01278F */ jal func_80049E3C -/* DE2B88 802406F8 02A0302D */ daddu $a2, $s5, $zero -/* DE2B8C 802406FC 0260202D */ daddu $a0, $s3, $zero -/* DE2B90 80240700 0280282D */ daddu $a1, $s4, $zero -/* DE2B94 80240704 0C0127B3 */ jal func_80049ECC -/* DE2B98 80240708 02A0302D */ daddu $a2, $s5, $zero -/* DE2B9C 8024070C 080901F1 */ j .L802407C4 -/* DE2BA0 80240710 00000000 */ nop -/* DE2BA4 80240714 0260202D */ daddu $a0, $s3, $zero -/* DE2BA8 80240718 0280282D */ daddu $a1, $s4, $zero -/* DE2BAC 8024071C 0C0127DF */ jal func_80049F7C -/* DE2BB0 80240720 02A0302D */ daddu $a2, $s5, $zero -/* DE2BB4 80240724 0260202D */ daddu $a0, $s3, $zero -/* DE2BB8 80240728 0280282D */ daddu $a1, $s4, $zero -/* DE2BBC 8024072C 0C012849 */ jal func_8004A124 -/* DE2BC0 80240730 02A0302D */ daddu $a2, $s5, $zero -/* DE2BC4 80240734 8E630070 */ lw $v1, 0x70($s3) -/* DE2BC8 80240738 2402000E */ addiu $v0, $zero, 0xe -/* DE2BCC 8024073C 14620021 */ bne $v1, $v0, .L802407C4 -/* DE2BD0 80240740 00000000 */ nop -/* DE2BD4 80240744 0260202D */ daddu $a0, $s3, $zero -/* DE2BD8 80240748 0280282D */ daddu $a1, $s4, $zero -/* DE2BDC 8024074C 0C0900A0 */ jal func_80240280 -/* DE2BE0 80240750 02A0302D */ daddu $a2, $s5, $zero -/* DE2BE4 80240754 8E630070 */ lw $v1, 0x70($s3) -/* DE2BE8 80240758 2402000F */ addiu $v0, $zero, 0xf -/* DE2BEC 8024075C 14620019 */ bne $v1, $v0, .L802407C4 -/* DE2BF0 80240760 00000000 */ nop -/* DE2BF4 80240764 0260202D */ daddu $a0, $s3, $zero -/* DE2BF8 80240768 0280282D */ daddu $a1, $s4, $zero -/* DE2BFC 8024076C 0C0900BC */ jal func_802402F0 -/* DE2C00 80240770 02A0302D */ daddu $a2, $s5, $zero -/* DE2C04 80240774 8E630070 */ lw $v1, 0x70($s3) -/* DE2C08 80240778 24020010 */ addiu $v0, $zero, 0x10 -/* DE2C0C 8024077C 14620011 */ bne $v1, $v0, .L802407C4 -/* DE2C10 80240780 00000000 */ nop -/* DE2C14 80240784 0260202D */ daddu $a0, $s3, $zero -/* DE2C18 80240788 0280282D */ daddu $a1, $s4, $zero -/* DE2C1C 8024078C 0C0900F0 */ jal func_802403C0 -/* DE2C20 80240790 02A0302D */ daddu $a2, $s5, $zero -/* DE2C24 80240794 8E630070 */ lw $v1, 0x70($s3) -/* DE2C28 80240798 24020011 */ addiu $v0, $zero, 0x11 -/* DE2C2C 8024079C 14620009 */ bne $v1, $v0, .L802407C4 -/* DE2C30 802407A0 00000000 */ nop -/* DE2C34 802407A4 0260202D */ daddu $a0, $s3, $zero -/* DE2C38 802407A8 0280282D */ daddu $a1, $s4, $zero -/* DE2C3C 802407AC 0C090116 */ jal func_80240458 -/* DE2C40 802407B0 02A0302D */ daddu $a2, $s5, $zero -/* DE2C44 802407B4 080901F1 */ j .L802407C4 -/* DE2C48 802407B8 00000000 */ nop -/* DE2C4C 802407BC 0C0129CF */ jal func_8004A73C -/* DE2C50 802407C0 0260202D */ daddu $a0, $s3, $zero -.L802407C4: -/* DE2C54 802407C4 8FBF0060 */ lw $ra, 0x60($sp) -/* DE2C58 802407C8 8FB5005C */ lw $s5, 0x5c($sp) -/* DE2C5C 802407CC 8FB40058 */ lw $s4, 0x58($sp) -/* DE2C60 802407D0 8FB30054 */ lw $s3, 0x54($sp) -/* DE2C64 802407D4 8FB20050 */ lw $s2, 0x50($sp) -/* DE2C68 802407D8 8FB1004C */ lw $s1, 0x4c($sp) -/* DE2C6C 802407DC 8FB00048 */ lw $s0, 0x48($sp) -/* DE2C70 802407E0 0000102D */ daddu $v0, $zero, $zero -/* DE2C74 802407E4 03E00008 */ jr $ra -/* DE2C78 802407E8 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_omo/omo_13/func_8024083C_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/func_8024083C_DE2490.s deleted file mode 100644 index 99d60fc244..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/func_8024083C_DE2490.s +++ /dev/null @@ -1,132 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024083C_DE2CCC -/* DE2CCC 8024083C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE2CD0 80240840 AFB20018 */ sw $s2, 0x18($sp) -/* DE2CD4 80240844 0080902D */ daddu $s2, $a0, $zero -/* DE2CD8 80240848 AFBF001C */ sw $ra, 0x1c($sp) -/* DE2CDC 8024084C AFB10014 */ sw $s1, 0x14($sp) -/* DE2CE0 80240850 AFB00010 */ sw $s0, 0x10($sp) -/* DE2CE4 80240854 8E500148 */ lw $s0, 0x148($s2) -/* DE2CE8 80240858 0C00EABB */ jal get_npc_unsafe -/* DE2CEC 8024085C 86040008 */ lh $a0, 8($s0) -/* DE2CF0 80240860 8E03006C */ lw $v1, 0x6c($s0) -/* DE2CF4 80240864 24060001 */ addiu $a2, $zero, 1 -/* DE2CF8 80240868 10660016 */ beq $v1, $a2, .L802408C4 -/* DE2CFC 8024086C 0040882D */ daddu $s1, $v0, $zero -/* DE2D00 80240870 28620002 */ slti $v0, $v1, 2 -/* DE2D04 80240874 50400005 */ beql $v0, $zero, .L8024088C -/* DE2D08 80240878 24020002 */ addiu $v0, $zero, 2 -/* DE2D0C 8024087C 10600009 */ beqz $v1, .L802408A4 -/* DE2D10 80240880 3C02003C */ lui $v0, 0x3c -/* DE2D14 80240884 08090274 */ j .L802409D0 -/* DE2D18 80240888 24020004 */ addiu $v0, $zero, 4 -.L8024088C: -/* DE2D1C 8024088C 10620030 */ beq $v1, $v0, .L80240950 -/* DE2D20 80240890 24020003 */ addiu $v0, $zero, 3 -/* DE2D24 80240894 10620034 */ beq $v1, $v0, .L80240968 -/* DE2D28 80240898 00000000 */ nop -/* DE2D2C 8024089C 08090272 */ j .L802409C8 -/* DE2D30 802408A0 00000000 */ nop -.L802408A4: -/* DE2D34 802408A4 3442000C */ ori $v0, $v0, 0xc -/* DE2D38 802408A8 3C054387 */ lui $a1, 0x4387 -/* DE2D3C 802408AC 0220202D */ daddu $a0, $s1, $zero -/* DE2D40 802408B0 AE06006C */ sw $a2, 0x6c($s0) -/* DE2D44 802408B4 AE000070 */ sw $zero, 0x70($s0) -/* DE2D48 802408B8 0C00ECD0 */ jal set_npc_yaw -/* DE2D4C 802408BC AE220028 */ sw $v0, 0x28($s1) -/* DE2D50 802408C0 AE200048 */ sw $zero, 0x48($s1) -.L802408C4: -/* DE2D54 802408C4 8E030070 */ lw $v1, 0x70($s0) -/* DE2D58 802408C8 04610002 */ bgez $v1, .L802408D4 -/* DE2D5C 802408CC 0060102D */ daddu $v0, $v1, $zero -/* DE2D60 802408D0 2462000F */ addiu $v0, $v1, 0xf -.L802408D4: -/* DE2D64 802408D4 00022103 */ sra $a0, $v0, 4 -/* DE2D68 802408D8 00041100 */ sll $v0, $a0, 4 -/* DE2D6C 802408DC 00622023 */ subu $a0, $v1, $v0 -/* DE2D70 802408E0 28820004 */ slti $v0, $a0, 4 -/* DE2D74 802408E4 10400003 */ beqz $v0, .L802408F4 -/* DE2D78 802408E8 3C02003C */ lui $v0, 0x3c -/* DE2D7C 802408EC 0809024B */ j .L8024092C -/* DE2D80 802408F0 3442000C */ ori $v0, $v0, 0xc -.L802408F4: -/* DE2D84 802408F4 28820008 */ slti $v0, $a0, 8 -/* DE2D88 802408F8 10400003 */ beqz $v0, .L80240908 -/* DE2D8C 802408FC 3C02003C */ lui $v0, 0x3c -/* DE2D90 80240900 0809024B */ j .L8024092C -/* DE2D94 80240904 3442000B */ ori $v0, $v0, 0xb -.L80240908: -/* DE2D98 80240908 2882000C */ slti $v0, $a0, 0xc -/* DE2D9C 8024090C 10400003 */ beqz $v0, .L8024091C -/* DE2DA0 80240910 3C02003C */ lui $v0, 0x3c -/* DE2DA4 80240914 0809024B */ j .L8024092C -/* DE2DA8 80240918 3442000C */ ori $v0, $v0, 0xc -.L8024091C: -/* DE2DAC 8024091C 28820010 */ slti $v0, $a0, 0x10 -/* DE2DB0 80240920 10400003 */ beqz $v0, .L80240930 -/* DE2DB4 80240924 3C02003C */ lui $v0, 0x3c -/* DE2DB8 80240928 3442000D */ ori $v0, $v0, 0xd -.L8024092C: -/* DE2DBC 8024092C AE220028 */ sw $v0, 0x28($s1) -.L80240930: -/* DE2DC0 80240930 8E020070 */ lw $v0, 0x70($s0) -/* DE2DC4 80240934 24420001 */ addiu $v0, $v0, 1 -/* DE2DC8 80240938 AE020070 */ sw $v0, 0x70($s0) -/* DE2DCC 8024093C 28420041 */ slti $v0, $v0, 0x41 -/* DE2DD0 80240940 14400021 */ bnez $v0, .L802409C8 -/* DE2DD4 80240944 24020002 */ addiu $v0, $zero, 2 -/* DE2DD8 80240948 08090272 */ j .L802409C8 -/* DE2DDC 8024094C AE02006C */ sw $v0, 0x6c($s0) -.L80240950: -/* DE2DE0 80240950 3C03003C */ lui $v1, 0x3c -/* DE2DE4 80240954 3463000C */ ori $v1, $v1, 0xc -/* DE2DE8 80240958 AE02006C */ sw $v0, 0x6c($s0) -/* DE2DEC 8024095C AE000070 */ sw $zero, 0x70($s0) -/* DE2DF0 80240960 AE200048 */ sw $zero, 0x48($s1) -/* DE2DF4 80240964 AE230028 */ sw $v1, 0x28($s1) -.L80240968: -/* DE2DF8 80240968 C6200048 */ lwc1 $f0, 0x48($s1) -/* DE2DFC 8024096C 3C018024 */ lui $at, 0x8024 -/* DE2E00 80240970 D4223080 */ ldc1 $f2, 0x3080($at) -/* DE2E04 80240974 46000021 */ cvt.d.s $f0, $f0 -/* DE2E08 80240978 46220000 */ add.d $f0, $f0, $f2 -/* DE2E0C 8024097C 3C018024 */ lui $at, 0x8024 -/* DE2E10 80240980 D4223088 */ ldc1 $f2, 0x3088($at) -/* DE2E14 80240984 46200020 */ cvt.s.d $f0, $f0 -/* DE2E18 80240988 E6200048 */ swc1 $f0, 0x48($s1) -/* DE2E1C 8024098C 46000021 */ cvt.d.s $f0, $f0 -/* DE2E20 80240990 4620103C */ c.lt.d $f2, $f0 -/* DE2E24 80240994 00000000 */ nop -/* DE2E28 80240998 45000004 */ bc1f .L802409AC -/* DE2E2C 8024099C 00000000 */ nop -/* DE2E30 802409A0 46220001 */ sub.d $f0, $f0, $f2 -/* DE2E34 802409A4 46200020 */ cvt.s.d $f0, $f0 -/* DE2E38 802409A8 E6200048 */ swc1 $f0, 0x48($s1) -.L802409AC: -/* DE2E3C 802409AC 8E020070 */ lw $v0, 0x70($s0) -/* DE2E40 802409B0 24420001 */ addiu $v0, $v0, 1 -/* DE2E44 802409B4 AE020070 */ sw $v0, 0x70($s0) -/* DE2E48 802409B8 2842002E */ slti $v0, $v0, 0x2e -/* DE2E4C 802409BC 14400002 */ bnez $v0, .L802409C8 -/* DE2E50 802409C0 24020004 */ addiu $v0, $zero, 4 -/* DE2E54 802409C4 AE02006C */ sw $v0, 0x6c($s0) -.L802409C8: -/* DE2E58 802409C8 8E03006C */ lw $v1, 0x6c($s0) -/* DE2E5C 802409CC 24020004 */ addiu $v0, $zero, 4 -.L802409D0: -/* DE2E60 802409D0 14620005 */ bne $v1, $v0, .L802409E8 -/* DE2E64 802409D4 0220202D */ daddu $a0, $s1, $zero -/* DE2E68 802409D8 3C054387 */ lui $a1, 0x4387 -/* DE2E6C 802409DC 0C00ECD0 */ jal set_npc_yaw -/* DE2E70 802409E0 AC800048 */ sw $zero, 0x48($a0) -/* DE2E74 802409E4 AE400070 */ sw $zero, 0x70($s2) -.L802409E8: -/* DE2E78 802409E8 8FBF001C */ lw $ra, 0x1c($sp) -/* DE2E7C 802409EC 8FB20018 */ lw $s2, 0x18($sp) -/* DE2E80 802409F0 8FB10014 */ lw $s1, 0x14($sp) -/* DE2E84 802409F4 8FB00010 */ lw $s0, 0x10($sp) -/* DE2E88 802409F8 03E00008 */ jr $ra -/* DE2E8C 802409FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_13/func_80240A00_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/func_80240A00_DE2490.s deleted file mode 100644 index a74fc6ddb2..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/func_80240A00_DE2490.s +++ /dev/null @@ -1,192 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A00_DE2E90 -/* DE2E90 80240A00 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DE2E94 80240A04 AFB30054 */ sw $s3, 0x54($sp) -/* DE2E98 80240A08 0080982D */ daddu $s3, $a0, $zero -/* DE2E9C 80240A0C AFBF0060 */ sw $ra, 0x60($sp) -/* DE2EA0 80240A10 AFB5005C */ sw $s5, 0x5c($sp) -/* DE2EA4 80240A14 AFB40058 */ sw $s4, 0x58($sp) -/* DE2EA8 80240A18 AFB20050 */ sw $s2, 0x50($sp) -/* DE2EAC 80240A1C AFB1004C */ sw $s1, 0x4c($sp) -/* DE2EB0 80240A20 AFB00048 */ sw $s0, 0x48($sp) -/* DE2EB4 80240A24 8E710148 */ lw $s1, 0x148($s3) -/* DE2EB8 80240A28 86240008 */ lh $a0, 8($s1) -/* DE2EBC 80240A2C 0C00EABB */ jal get_npc_unsafe -/* DE2EC0 80240A30 00A0802D */ daddu $s0, $a1, $zero -/* DE2EC4 80240A34 8E63000C */ lw $v1, 0xc($s3) -/* DE2EC8 80240A38 0260202D */ daddu $a0, $s3, $zero -/* DE2ECC 80240A3C 8C650000 */ lw $a1, ($v1) -/* DE2ED0 80240A40 0C0B1EAF */ jal get_variable -/* DE2ED4 80240A44 0040902D */ daddu $s2, $v0, $zero -/* DE2ED8 80240A48 AFA00018 */ sw $zero, 0x18($sp) -/* DE2EDC 80240A4C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE2EE0 80240A50 8C630030 */ lw $v1, 0x30($v1) -/* DE2EE4 80240A54 AFA3001C */ sw $v1, 0x1c($sp) -/* DE2EE8 80240A58 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE2EEC 80240A5C 8C63001C */ lw $v1, 0x1c($v1) -/* DE2EF0 80240A60 AFA30020 */ sw $v1, 0x20($sp) -/* DE2EF4 80240A64 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE2EF8 80240A68 8C630024 */ lw $v1, 0x24($v1) -/* DE2EFC 80240A6C AFA30024 */ sw $v1, 0x24($sp) -/* DE2F00 80240A70 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE2F04 80240A74 8C630028 */ lw $v1, 0x28($v1) -/* DE2F08 80240A78 27B50018 */ addiu $s5, $sp, 0x18 -/* DE2F0C 80240A7C AFA30028 */ sw $v1, 0x28($sp) -/* DE2F10 80240A80 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE2F14 80240A84 3C014282 */ lui $at, 0x4282 -/* DE2F18 80240A88 44810000 */ mtc1 $at, $f0 -/* DE2F1C 80240A8C 8C63002C */ lw $v1, 0x2c($v1) -/* DE2F20 80240A90 0040A02D */ daddu $s4, $v0, $zero -/* DE2F24 80240A94 E7A00030 */ swc1 $f0, 0x30($sp) -/* DE2F28 80240A98 A7A00034 */ sh $zero, 0x34($sp) -/* DE2F2C 80240A9C 16000005 */ bnez $s0, .L80240AB4 -/* DE2F30 80240AA0 AFA3002C */ sw $v1, 0x2c($sp) -/* DE2F34 80240AA4 8E2200B0 */ lw $v0, 0xb0($s1) -/* DE2F38 80240AA8 30420004 */ andi $v0, $v0, 4 -/* DE2F3C 80240AAC 10400044 */ beqz $v0, .L80240BC0 -/* DE2F40 80240AB0 00000000 */ nop -.L80240AB4: -/* DE2F44 80240AB4 2404F7FF */ addiu $a0, $zero, -0x801 -/* DE2F48 80240AB8 AE600070 */ sw $zero, 0x70($s3) -/* DE2F4C 80240ABC A640008E */ sh $zero, 0x8e($s2) -/* DE2F50 80240AC0 8E2200CC */ lw $v0, 0xcc($s1) -/* DE2F54 80240AC4 8E430000 */ lw $v1, ($s2) -/* DE2F58 80240AC8 8C420000 */ lw $v0, ($v0) -/* DE2F5C 80240ACC 00641824 */ and $v1, $v1, $a0 -/* DE2F60 80240AD0 AE430000 */ sw $v1, ($s2) -/* DE2F64 80240AD4 AE420028 */ sw $v0, 0x28($s2) -/* DE2F68 80240AD8 8E2200D0 */ lw $v0, 0xd0($s1) -/* DE2F6C 80240ADC 8C420034 */ lw $v0, 0x34($v0) -/* DE2F70 80240AE0 54400005 */ bnel $v0, $zero, .L80240AF8 -/* DE2F74 80240AE4 2402FDFF */ addiu $v0, $zero, -0x201 -/* DE2F78 80240AE8 34620200 */ ori $v0, $v1, 0x200 -/* DE2F7C 80240AEC 2403FFF7 */ addiu $v1, $zero, -9 -/* DE2F80 80240AF0 080902C0 */ j .L80240B00 -/* DE2F84 80240AF4 00431024 */ and $v0, $v0, $v1 -.L80240AF8: -/* DE2F88 80240AF8 00621024 */ and $v0, $v1, $v0 -/* DE2F8C 80240AFC 34420008 */ ori $v0, $v0, 8 -.L80240B00: -/* DE2F90 80240B00 AE420000 */ sw $v0, ($s2) -/* DE2F94 80240B04 8E2200B0 */ lw $v0, 0xb0($s1) -/* DE2F98 80240B08 30420004 */ andi $v0, $v0, 4 -/* DE2F9C 80240B0C 10400004 */ beqz $v0, .L80240B20 -/* DE2FA0 80240B10 24020063 */ addiu $v0, $zero, 0x63 -/* DE2FA4 80240B14 AE620070 */ sw $v0, 0x70($s3) -/* DE2FA8 80240B18 080902CE */ j .L80240B38 -/* DE2FAC 80240B1C AE600074 */ sw $zero, 0x74($s3) -.L80240B20: -/* DE2FB0 80240B20 8E220000 */ lw $v0, ($s1) -/* DE2FB4 80240B24 3C034000 */ lui $v1, 0x4000 -/* DE2FB8 80240B28 00431024 */ and $v0, $v0, $v1 -/* DE2FBC 80240B2C 10400002 */ beqz $v0, .L80240B38 -/* DE2FC0 80240B30 2402000C */ addiu $v0, $zero, 0xc -/* DE2FC4 80240B34 AE620070 */ sw $v0, 0x70($s3) -.L80240B38: -/* DE2FC8 80240B38 3C06BFFF */ lui $a2, 0xbfff -/* DE2FCC 80240B3C 34C6FFFF */ ori $a2, $a2, 0xffff -/* DE2FD0 80240B40 27A50038 */ addiu $a1, $sp, 0x38 -/* DE2FD4 80240B44 2404FFFB */ addiu $a0, $zero, -5 -/* DE2FD8 80240B48 8E2200B0 */ lw $v0, 0xb0($s1) -/* DE2FDC 80240B4C 8E230000 */ lw $v1, ($s1) -/* DE2FE0 80240B50 3C0142C8 */ lui $at, 0x42c8 -/* DE2FE4 80240B54 44810000 */ mtc1 $at, $f0 -/* DE2FE8 80240B58 00441024 */ and $v0, $v0, $a0 -/* DE2FEC 80240B5C 00661824 */ and $v1, $v1, $a2 -/* DE2FF0 80240B60 AE2200B0 */ sw $v0, 0xb0($s1) -/* DE2FF4 80240B64 AE230000 */ sw $v1, ($s1) -/* DE2FF8 80240B68 864200A8 */ lh $v0, 0xa8($s2) -/* DE2FFC 80240B6C 27A70040 */ addiu $a3, $sp, 0x40 -/* DE3000 80240B70 E7A00044 */ swc1 $f0, 0x44($sp) -/* DE3004 80240B74 C6460038 */ lwc1 $f6, 0x38($s2) -/* DE3008 80240B78 C640003C */ lwc1 $f0, 0x3c($s2) -/* DE300C 80240B7C C6420040 */ lwc1 $f2, 0x40($s2) -/* DE3010 80240B80 44822000 */ mtc1 $v0, $f4 -/* DE3014 80240B84 00000000 */ nop -/* DE3018 80240B88 46802120 */ cvt.s.w $f4, $f4 -/* DE301C 80240B8C 27A20044 */ addiu $v0, $sp, 0x44 -/* DE3020 80240B90 46040000 */ add.s $f0, $f0, $f4 -/* DE3024 80240B94 E7A60038 */ swc1 $f6, 0x38($sp) -/* DE3028 80240B98 E7A20040 */ swc1 $f2, 0x40($sp) -/* DE302C 80240B9C E7A0003C */ swc1 $f0, 0x3c($sp) -/* DE3030 80240BA0 AFA20010 */ sw $v0, 0x10($sp) -/* DE3034 80240BA4 8E440080 */ lw $a0, 0x80($s2) -/* DE3038 80240BA8 0C0372DF */ jal func_800DCB7C -/* DE303C 80240BAC 27A6003C */ addiu $a2, $sp, 0x3c -/* DE3040 80240BB0 10400003 */ beqz $v0, .L80240BC0 -/* DE3044 80240BB4 00000000 */ nop -/* DE3048 80240BB8 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DE304C 80240BBC E640003C */ swc1 $f0, 0x3c($s2) -.L80240BC0: -/* DE3050 80240BC0 8E630070 */ lw $v1, 0x70($s3) -/* DE3054 80240BC4 2C620064 */ sltiu $v0, $v1, 0x64 -/* DE3058 80240BC8 10400038 */ beqz $v0, .L80240CAC -/* DE305C 80240BCC 00031080 */ sll $v0, $v1, 2 -/* DE3060 80240BD0 3C018024 */ lui $at, 0x8024 -/* DE3064 80240BD4 00220821 */ addu $at, $at, $v0 -/* DE3068 80240BD8 8C223090 */ lw $v0, 0x3090($at) -/* DE306C 80240BDC 00400008 */ jr $v0 -/* DE3070 80240BE0 00000000 */ nop -/* DE3074 80240BE4 0260202D */ daddu $a0, $s3, $zero -/* DE3078 80240BE8 0280282D */ daddu $a1, $s4, $zero -/* DE307C 80240BEC 0C012568 */ jal func_800495A0 -/* DE3080 80240BF0 02A0302D */ daddu $a2, $s5, $zero -/* DE3084 80240BF4 0260202D */ daddu $a0, $s3, $zero -/* DE3088 80240BF8 0280282D */ daddu $a1, $s4, $zero -/* DE308C 80240BFC 0C0125AE */ jal func_800496B8 -/* DE3090 80240C00 02A0302D */ daddu $a2, $s5, $zero -/* DE3094 80240C04 0809032B */ j .L80240CAC -/* DE3098 80240C08 00000000 */ nop -/* DE309C 80240C0C 0260202D */ daddu $a0, $s3, $zero -/* DE30A0 80240C10 0280282D */ daddu $a1, $s4, $zero -/* DE30A4 80240C14 0C0901FB */ jal func_802407EC -/* DE30A8 80240C18 02A0302D */ daddu $a2, $s5, $zero -/* DE30AC 80240C1C 0260202D */ daddu $a0, $s3, $zero -/* DE30B0 80240C20 0280282D */ daddu $a1, $s4, $zero -/* DE30B4 80240C24 0C09020F */ jal func_8024083C -/* DE30B8 80240C28 02A0302D */ daddu $a2, $s5, $zero -/* DE30BC 80240C2C 0809032B */ j .L80240CAC -/* DE30C0 80240C30 00000000 */ nop -/* DE30C4 80240C34 0260202D */ daddu $a0, $s3, $zero -/* DE30C8 80240C38 0280282D */ daddu $a1, $s4, $zero -/* DE30CC 80240C3C 0C01278F */ jal func_80049E3C -/* DE30D0 80240C40 02A0302D */ daddu $a2, $s5, $zero -/* DE30D4 80240C44 0260202D */ daddu $a0, $s3, $zero -/* DE30D8 80240C48 0280282D */ daddu $a1, $s4, $zero -/* DE30DC 80240C4C 0C0127B3 */ jal func_80049ECC -/* DE30E0 80240C50 02A0302D */ daddu $a2, $s5, $zero -/* DE30E4 80240C54 0809032B */ j .L80240CAC -/* DE30E8 80240C58 00000000 */ nop -/* DE30EC 80240C5C 0260202D */ daddu $a0, $s3, $zero -/* DE30F0 80240C60 0280282D */ daddu $a1, $s4, $zero -/* DE30F4 80240C64 0C0127DF */ jal func_80049F7C -/* DE30F8 80240C68 02A0302D */ daddu $a2, $s5, $zero -/* DE30FC 80240C6C 0260202D */ daddu $a0, $s3, $zero -/* DE3100 80240C70 0280282D */ daddu $a1, $s4, $zero -/* DE3104 80240C74 0C012849 */ jal func_8004A124 -/* DE3108 80240C78 02A0302D */ daddu $a2, $s5, $zero -/* DE310C 80240C7C 8E630070 */ lw $v1, 0x70($s3) -/* DE3110 80240C80 2402000E */ addiu $v0, $zero, 0xe -/* DE3114 80240C84 14620009 */ bne $v1, $v0, .L80240CAC -/* DE3118 80240C88 00000000 */ nop -/* DE311C 80240C8C 0260202D */ daddu $a0, $s3, $zero -/* DE3120 80240C90 0280282D */ daddu $a1, $s4, $zero -/* DE3124 80240C94 0C0128FA */ jal func_8004A3E8 -/* DE3128 80240C98 02A0302D */ daddu $a2, $s5, $zero -/* DE312C 80240C9C 0809032B */ j .L80240CAC -/* DE3130 80240CA0 00000000 */ nop -/* DE3134 80240CA4 0C0129CF */ jal func_8004A73C -/* DE3138 80240CA8 0260202D */ daddu $a0, $s3, $zero -.L80240CAC: -/* DE313C 80240CAC 8FBF0060 */ lw $ra, 0x60($sp) -/* DE3140 80240CB0 8FB5005C */ lw $s5, 0x5c($sp) -/* DE3144 80240CB4 8FB40058 */ lw $s4, 0x58($sp) -/* DE3148 80240CB8 8FB30054 */ lw $s3, 0x54($sp) -/* DE314C 80240CBC 8FB20050 */ lw $s2, 0x50($sp) -/* DE3150 80240CC0 8FB1004C */ lw $s1, 0x4c($sp) -/* DE3154 80240CC4 8FB00048 */ lw $s0, 0x48($sp) -/* DE3158 80240CC8 0000102D */ daddu $v0, $zero, $zero -/* DE315C 80240CCC 03E00008 */ jr $ra -/* DE3160 80240CD0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_omo/omo_13/func_80240CD4_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/func_80240CD4_DE2490.s deleted file mode 100644 index eb1fd6ba6c..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/func_80240CD4_DE2490.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CD4_DE3164 -/* DE3164 80240CD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE3168 80240CD8 AFB10014 */ sw $s1, 0x14($sp) -/* DE316C 80240CDC 0080882D */ daddu $s1, $a0, $zero -/* DE3170 80240CE0 AFBF0018 */ sw $ra, 0x18($sp) -/* DE3174 80240CE4 AFB00010 */ sw $s0, 0x10($sp) -/* DE3178 80240CE8 8E30000C */ lw $s0, 0xc($s1) -/* DE317C 80240CEC 8E050000 */ lw $a1, ($s0) -/* DE3180 80240CF0 0C0B1EAF */ jal get_variable -/* DE3184 80240CF4 26100004 */ addiu $s0, $s0, 4 -/* DE3188 80240CF8 0C00EAD2 */ jal get_npc_safe -/* DE318C 80240CFC 0040202D */ daddu $a0, $v0, $zero -/* DE3190 80240D00 10400005 */ beqz $v0, .L80240D18 -/* DE3194 80240D04 00000000 */ nop -/* DE3198 80240D08 8E050000 */ lw $a1, ($s0) -/* DE319C 80240D0C 844600A8 */ lh $a2, 0xa8($v0) -/* DE31A0 80240D10 0C0B2026 */ jal set_variable -/* DE31A4 80240D14 0220202D */ daddu $a0, $s1, $zero -.L80240D18: -/* DE31A8 80240D18 8FBF0018 */ lw $ra, 0x18($sp) -/* DE31AC 80240D1C 8FB10014 */ lw $s1, 0x14($sp) -/* DE31B0 80240D20 8FB00010 */ lw $s0, 0x10($sp) -/* DE31B4 80240D24 24020002 */ addiu $v0, $zero, 2 -/* DE31B8 80240D28 03E00008 */ jr $ra -/* DE31BC 80240D2C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_13/func_80240D30_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/func_80240D30_DE2490.s deleted file mode 100644 index a39e1dc133..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/func_80240D30_DE2490.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D30_DE31C0 -/* DE31C0 80240D30 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DE31C4 80240D34 AFB10014 */ sw $s1, 0x14($sp) -/* DE31C8 80240D38 0080882D */ daddu $s1, $a0, $zero -/* DE31CC 80240D3C AFBF0024 */ sw $ra, 0x24($sp) -/* DE31D0 80240D40 AFB40020 */ sw $s4, 0x20($sp) -/* DE31D4 80240D44 AFB3001C */ sw $s3, 0x1c($sp) -/* DE31D8 80240D48 AFB20018 */ sw $s2, 0x18($sp) -/* DE31DC 80240D4C AFB00010 */ sw $s0, 0x10($sp) -/* DE31E0 80240D50 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* DE31E4 80240D54 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* DE31E8 80240D58 F7B80038 */ sdc1 $f24, 0x38($sp) -/* DE31EC 80240D5C F7B60030 */ sdc1 $f22, 0x30($sp) -/* DE31F0 80240D60 F7B40028 */ sdc1 $f20, 0x28($sp) -/* DE31F4 80240D64 8E30000C */ lw $s0, 0xc($s1) -/* DE31F8 80240D68 8E130000 */ lw $s3, ($s0) -/* DE31FC 80240D6C 26100004 */ addiu $s0, $s0, 4 -/* DE3200 80240D70 0C0B1EAF */ jal get_variable -/* DE3204 80240D74 0260282D */ daddu $a1, $s3, $zero -/* DE3208 80240D78 4482E000 */ mtc1 $v0, $f28 -/* DE320C 80240D7C 00000000 */ nop -/* DE3210 80240D80 4680E720 */ cvt.s.w $f28, $f28 -/* DE3214 80240D84 8E140000 */ lw $s4, ($s0) -/* DE3218 80240D88 26100004 */ addiu $s0, $s0, 4 -/* DE321C 80240D8C 0220202D */ daddu $a0, $s1, $zero -/* DE3220 80240D90 0C0B1EAF */ jal get_variable -/* DE3224 80240D94 0280282D */ daddu $a1, $s4, $zero -/* DE3228 80240D98 4482D000 */ mtc1 $v0, $f26 -/* DE322C 80240D9C 00000000 */ nop -/* DE3230 80240DA0 4680D6A0 */ cvt.s.w $f26, $f26 -/* DE3234 80240DA4 8E100000 */ lw $s0, ($s0) -/* DE3238 80240DA8 0220202D */ daddu $a0, $s1, $zero -/* DE323C 80240DAC 0C0B1EAF */ jal get_variable -/* DE3240 80240DB0 0200282D */ daddu $a1, $s0, $zero -/* DE3244 80240DB4 4482C000 */ mtc1 $v0, $f24 -/* DE3248 80240DB8 00000000 */ nop -/* DE324C 80240DBC 4680C620 */ cvt.s.w $f24, $f24 -/* DE3250 80240DC0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* DE3254 80240DC4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* DE3258 80240DC8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* DE325C 80240DCC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* DE3260 80240DD0 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* DE3264 80240DD4 44800000 */ mtc1 $zero, $f0 -/* DE3268 80240DD8 00031080 */ sll $v0, $v1, 2 -/* DE326C 80240DDC 00431021 */ addu $v0, $v0, $v1 -/* DE3270 80240DE0 00021080 */ sll $v0, $v0, 2 -/* DE3274 80240DE4 00431023 */ subu $v0, $v0, $v1 -/* DE3278 80240DE8 000218C0 */ sll $v1, $v0, 3 -/* DE327C 80240DEC 00431021 */ addu $v0, $v0, $v1 -/* DE3280 80240DF0 000210C0 */ sll $v0, $v0, 3 -/* DE3284 80240DF4 46001032 */ c.eq.s $f2, $f0 -/* DE3288 80240DF8 3C01800B */ lui $at, 0x800b -/* DE328C 80240DFC 00220821 */ addu $at, $at, $v0 -/* DE3290 80240E00 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* DE3294 80240E04 45000005 */ bc1f .L80240E1C -/* DE3298 80240E08 00000000 */ nop -/* DE329C 80240E0C 3C0142C8 */ lui $at, 0x42c8 -/* DE32A0 80240E10 44810000 */ mtc1 $at, $f0 -/* DE32A4 80240E14 0809038B */ j .L80240E2C -/* DE32A8 80240E18 4600B581 */ sub.s $f22, $f22, $f0 -.L80240E1C: -/* DE32AC 80240E1C 3C0142C8 */ lui $at, 0x42c8 -/* DE32B0 80240E20 44810000 */ mtc1 $at, $f0 -/* DE32B4 80240E24 00000000 */ nop -/* DE32B8 80240E28 4600B580 */ add.s $f22, $f22, $f0 -.L80240E2C: -/* DE32BC 80240E2C 0C00A6C9 */ jal clamp_angle -/* DE32C0 80240E30 4600B306 */ mov.s $f12, $f22 -/* DE32C4 80240E34 46000586 */ mov.s $f22, $f0 -/* DE32C8 80240E38 3C014170 */ lui $at, 0x4170 -/* DE32CC 80240E3C 4481A000 */ mtc1 $at, $f20 -/* DE32D0 80240E40 0C00A8BB */ jal sin_deg -/* DE32D4 80240E44 4600B306 */ mov.s $f12, $f22 -/* DE32D8 80240E48 46140002 */ mul.s $f0, $f0, $f20 -/* DE32DC 80240E4C 00000000 */ nop -/* DE32E0 80240E50 864200B0 */ lh $v0, 0xb0($s2) -/* DE32E4 80240E54 3C013F00 */ lui $at, 0x3f00 -/* DE32E8 80240E58 44812000 */ mtc1 $at, $f4 -/* DE32EC 80240E5C 44821000 */ mtc1 $v0, $f2 -/* DE32F0 80240E60 00000000 */ nop -/* DE32F4 80240E64 468010A0 */ cvt.s.w $f2, $f2 -/* DE32F8 80240E68 46041082 */ mul.s $f2, $f2, $f4 -/* DE32FC 80240E6C 00000000 */ nop -/* DE3300 80240E70 4600E700 */ add.s $f28, $f28, $f0 -/* DE3304 80240E74 4602D680 */ add.s $f26, $f26, $f2 -/* DE3308 80240E78 0C00A8D4 */ jal cos_deg -/* DE330C 80240E7C 4600B306 */ mov.s $f12, $f22 -/* DE3310 80240E80 46140002 */ mul.s $f0, $f0, $f20 -/* DE3314 80240E84 00000000 */ nop -/* DE3318 80240E88 0220202D */ daddu $a0, $s1, $zero -/* DE331C 80240E8C 0260282D */ daddu $a1, $s3, $zero -/* DE3320 80240E90 4600E18D */ trunc.w.s $f6, $f28 -/* DE3324 80240E94 44063000 */ mfc1 $a2, $f6 -/* DE3328 80240E98 0C0B2026 */ jal set_variable -/* DE332C 80240E9C 4600C601 */ sub.s $f24, $f24, $f0 -/* DE3330 80240EA0 0220202D */ daddu $a0, $s1, $zero -/* DE3334 80240EA4 4600D18D */ trunc.w.s $f6, $f26 -/* DE3338 80240EA8 44063000 */ mfc1 $a2, $f6 -/* DE333C 80240EAC 0C0B2026 */ jal set_variable -/* DE3340 80240EB0 0280282D */ daddu $a1, $s4, $zero -/* DE3344 80240EB4 0220202D */ daddu $a0, $s1, $zero -/* DE3348 80240EB8 4600C18D */ trunc.w.s $f6, $f24 -/* DE334C 80240EBC 44063000 */ mfc1 $a2, $f6 -/* DE3350 80240EC0 0C0B2026 */ jal set_variable -/* DE3354 80240EC4 0200282D */ daddu $a1, $s0, $zero -/* DE3358 80240EC8 8FBF0024 */ lw $ra, 0x24($sp) -/* DE335C 80240ECC 8FB40020 */ lw $s4, 0x20($sp) -/* DE3360 80240ED0 8FB3001C */ lw $s3, 0x1c($sp) -/* DE3364 80240ED4 8FB20018 */ lw $s2, 0x18($sp) -/* DE3368 80240ED8 8FB10014 */ lw $s1, 0x14($sp) -/* DE336C 80240EDC 8FB00010 */ lw $s0, 0x10($sp) -/* DE3370 80240EE0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* DE3374 80240EE4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* DE3378 80240EE8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* DE337C 80240EEC D7B60030 */ ldc1 $f22, 0x30($sp) -/* DE3380 80240EF0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* DE3384 80240EF4 24020002 */ addiu $v0, $zero, 2 -/* DE3388 80240EF8 03E00008 */ jr $ra -/* DE338C 80240EFC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_13/func_80240F00_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/func_80240F00_DE2490.s deleted file mode 100644 index 40805a9a08..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/func_80240F00_DE2490.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F00_DE3390 -/* DE3390 80240F00 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DE3394 80240F04 AFBF0010 */ sw $ra, 0x10($sp) -/* DE3398 80240F08 10A00003 */ beqz $a1, .L80240F18 -/* DE339C 80240F0C 8C86000C */ lw $a2, 0xc($a0) -/* DE33A0 80240F10 3C018024 */ lui $at, 0x8024 -/* DE33A4 80240F14 AC201C04 */ sw $zero, 0x1c04($at) -.L80240F18: -/* DE33A8 80240F18 3C038024 */ lui $v1, 0x8024 -/* DE33AC 80240F1C 24631C04 */ addiu $v1, $v1, 0x1c04 -/* DE33B0 80240F20 8C620000 */ lw $v0, ($v1) -/* DE33B4 80240F24 54400003 */ bnel $v0, $zero, .L80240F34 -/* DE33B8 80240F28 AC600000 */ sw $zero, ($v1) -/* DE33BC 80240F2C 080903D2 */ j .L80240F48 -/* DE33C0 80240F30 0000102D */ daddu $v0, $zero, $zero -.L80240F34: -/* DE33C4 80240F34 8CC50000 */ lw $a1, ($a2) -/* DE33C8 80240F38 3C068024 */ lui $a2, 0x8024 -/* DE33CC 80240F3C 0C0B2026 */ jal set_variable -/* DE33D0 80240F40 8CC61C08 */ lw $a2, 0x1c08($a2) -/* DE33D4 80240F44 24020002 */ addiu $v0, $zero, 2 -.L80240F48: -/* DE33D8 80240F48 8FBF0010 */ lw $ra, 0x10($sp) -/* DE33DC 80240F4C 03E00008 */ jr $ra -/* DE33E0 80240F50 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_13/func_80240F54_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/func_80240F54_DE2490.s deleted file mode 100644 index 676bbab251..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/func_80240F54_DE2490.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F54_DE33E4 -/* DE33E4 80240F54 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DE33E8 80240F58 AFBF0010 */ sw $ra, 0x10($sp) -/* DE33EC 80240F5C 8C82000C */ lw $v0, 0xc($a0) -/* DE33F0 80240F60 0C0B1EAF */ jal get_variable -/* DE33F4 80240F64 8C450000 */ lw $a1, ($v0) -/* DE33F8 80240F68 3C018024 */ lui $at, 0x8024 -/* DE33FC 80240F6C AC221C08 */ sw $v0, 0x1c08($at) -/* DE3400 80240F70 24020002 */ addiu $v0, $zero, 2 -/* DE3404 80240F74 8FBF0010 */ lw $ra, 0x10($sp) -/* DE3408 80240F78 24030001 */ addiu $v1, $zero, 1 -/* DE340C 80240F7C 3C018024 */ lui $at, 0x8024 -/* DE3410 80240F80 AC231C04 */ sw $v1, 0x1c04($at) -/* DE3414 80240F84 03E00008 */ jr $ra -/* DE3418 80240F88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_13/func_80240F8C_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/func_80240F8C_DE2490.s deleted file mode 100644 index 8a7e5a9adf..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/func_80240F8C_DE2490.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F8C_DE341C -/* DE341C 80240F8C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DE3420 80240F90 AFBF0010 */ sw $ra, 0x10($sp) -/* DE3424 80240F94 8C82000C */ lw $v0, 0xc($a0) -/* DE3428 80240F98 0C0B1EAF */ jal get_variable -/* DE342C 80240F9C 8C450000 */ lw $a1, ($v0) -/* DE3430 80240FA0 0040182D */ daddu $v1, $v0, $zero -/* DE3434 80240FA4 10600012 */ beqz $v1, .L80240FF0 -/* DE3438 80240FA8 0000202D */ daddu $a0, $zero, $zero -/* DE343C 80240FAC 8C620000 */ lw $v0, ($v1) -/* DE3440 80240FB0 5040000A */ beql $v0, $zero, .L80240FDC -/* DE3444 80240FB4 00041080 */ sll $v0, $a0, 2 -/* DE3448 80240FB8 3C058024 */ lui $a1, 0x8024 -/* DE344C 80240FBC 24A53220 */ addiu $a1, $a1, 0x3220 -.L80240FC0: -/* DE3450 80240FC0 24630004 */ addiu $v1, $v1, 4 -/* DE3454 80240FC4 24840001 */ addiu $a0, $a0, 1 -/* DE3458 80240FC8 ACA20000 */ sw $v0, ($a1) -/* DE345C 80240FCC 8C620000 */ lw $v0, ($v1) -/* DE3460 80240FD0 1440FFFB */ bnez $v0, .L80240FC0 -/* DE3464 80240FD4 24A50004 */ addiu $a1, $a1, 4 -/* DE3468 80240FD8 00041080 */ sll $v0, $a0, 2 -.L80240FDC: -/* DE346C 80240FDC 3C018024 */ lui $at, 0x8024 -/* DE3470 80240FE0 00220821 */ addu $at, $at, $v0 -/* DE3474 80240FE4 AC203220 */ sw $zero, 0x3220($at) -/* DE3478 80240FE8 08090406 */ j .L80241018 -/* DE347C 80240FEC 00000000 */ nop -.L80240FF0: -/* DE3480 80240FF0 3C038024 */ lui $v1, 0x8024 -/* DE3484 80240FF4 24633220 */ addiu $v1, $v1, 0x3220 -/* DE3488 80240FF8 0060282D */ daddu $a1, $v1, $zero -.L80240FFC: -/* DE348C 80240FFC 24820080 */ addiu $v0, $a0, 0x80 -/* DE3490 80241000 AC620000 */ sw $v0, ($v1) -/* DE3494 80241004 24630004 */ addiu $v1, $v1, 4 -/* DE3498 80241008 24840001 */ addiu $a0, $a0, 1 -/* DE349C 8024100C 2882005B */ slti $v0, $a0, 0x5b -/* DE34A0 80241010 1440FFFA */ bnez $v0, .L80240FFC -/* DE34A4 80241014 ACA0016C */ sw $zero, 0x16c($a1) -.L80241018: -/* DE34A8 80241018 8FBF0010 */ lw $ra, 0x10($sp) -/* DE34AC 8024101C 24020002 */ addiu $v0, $zero, 2 -/* DE34B0 80241020 03E00008 */ jr $ra -/* DE34B4 80241024 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_13/func_80241230_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/func_80241230_DE2490.s deleted file mode 100644 index 9cdcb9c990..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/func_80241230_DE2490.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241230_DE36C0 -/* DE36C0 80241230 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE36C4 80241234 AFB00010 */ sw $s0, 0x10($sp) -/* DE36C8 80241238 3C108024 */ lui $s0, 0x8024 -/* DE36CC 8024123C 26102C70 */ addiu $s0, $s0, 0x2c70 -/* DE36D0 80241240 AFBF0018 */ sw $ra, 0x18($sp) -/* DE36D4 80241244 AFB10014 */ sw $s1, 0x14($sp) -/* DE36D8 80241248 8E020000 */ lw $v0, ($s0) -/* DE36DC 8024124C 14400010 */ bnez $v0, .L80241290 -/* DE36E0 80241250 0080882D */ daddu $s1, $a0, $zero -/* DE36E4 80241254 0C00AB39 */ jal heap_malloc -/* DE36E8 80241258 24040040 */ addiu $a0, $zero, 0x40 -/* DE36EC 8024125C AE020000 */ sw $v0, ($s0) -/* DE36F0 80241260 0000182D */ daddu $v1, $zero, $zero -/* DE36F4 80241264 0040282D */ daddu $a1, $v0, $zero -/* DE36F8 80241268 0220202D */ daddu $a0, $s1, $zero -.L8024126C: -/* DE36FC 8024126C 8C820084 */ lw $v0, 0x84($a0) -/* DE3700 80241270 24840004 */ addiu $a0, $a0, 4 -/* DE3704 80241274 24630001 */ addiu $v1, $v1, 1 -/* DE3708 80241278 ACA20000 */ sw $v0, ($a1) -/* DE370C 8024127C 28620010 */ slti $v0, $v1, 0x10 -/* DE3710 80241280 1440FFFA */ bnez $v0, .L8024126C -/* DE3714 80241284 24A50004 */ addiu $a1, $a1, 4 -/* DE3718 80241288 080904B3 */ j .L802412CC -/* DE371C 8024128C 00000000 */ nop -.L80241290: -/* DE3720 80241290 0000182D */ daddu $v1, $zero, $zero -/* DE3724 80241294 0040282D */ daddu $a1, $v0, $zero -/* DE3728 80241298 0220202D */ daddu $a0, $s1, $zero -.L8024129C: -/* DE372C 8024129C 8CA20000 */ lw $v0, ($a1) -/* DE3730 802412A0 24A50004 */ addiu $a1, $a1, 4 -/* DE3734 802412A4 24630001 */ addiu $v1, $v1, 1 -/* DE3738 802412A8 AC820084 */ sw $v0, 0x84($a0) -/* DE373C 802412AC 28620010 */ slti $v0, $v1, 0x10 -/* DE3740 802412B0 1440FFFA */ bnez $v0, .L8024129C -/* DE3744 802412B4 24840004 */ addiu $a0, $a0, 4 -/* DE3748 802412B8 3C108024 */ lui $s0, 0x8024 -/* DE374C 802412BC 26102C70 */ addiu $s0, $s0, 0x2c70 -/* DE3750 802412C0 0C00AB4B */ jal heap_free -/* DE3754 802412C4 8E040000 */ lw $a0, ($s0) -/* DE3758 802412C8 AE000000 */ sw $zero, ($s0) -.L802412CC: -/* DE375C 802412CC 8FBF0018 */ lw $ra, 0x18($sp) -/* DE3760 802412D0 8FB10014 */ lw $s1, 0x14($sp) -/* DE3764 802412D4 8FB00010 */ lw $s0, 0x10($sp) -/* DE3768 802412D8 24020002 */ addiu $v0, $zero, 2 -/* DE376C 802412DC 03E00008 */ jr $ra -/* DE3770 802412E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_13/func_802412E4_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/func_802412E4_DE2490.s deleted file mode 100644 index 3c5a9e07b8..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/func_802412E4_DE2490.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412E4_DE3774 -/* DE3774 802412E4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE3778 802412E8 AFB00010 */ sw $s0, 0x10($sp) -/* DE377C 802412EC 0080802D */ daddu $s0, $a0, $zero -/* DE3780 802412F0 AFBF0018 */ sw $ra, 0x18($sp) -/* DE3784 802412F4 AFB10014 */ sw $s1, 0x14($sp) -/* DE3788 802412F8 8E02000C */ lw $v0, 0xc($s0) -/* DE378C 802412FC 8C510000 */ lw $s1, ($v0) -/* DE3790 80241300 0C0B1EAF */ jal get_variable -/* DE3794 80241304 0220282D */ daddu $a1, $s1, $zero -/* DE3798 80241308 3C03FFF0 */ lui $v1, 0xfff0 -/* DE379C 8024130C 3463FFFF */ ori $v1, $v1, 0xffff -/* DE37A0 80241310 0200202D */ daddu $a0, $s0, $zero -/* DE37A4 80241314 00431024 */ and $v0, $v0, $v1 -/* DE37A8 80241318 00021140 */ sll $v0, $v0, 5 -/* DE37AC 8024131C 3C068008 */ lui $a2, %hi(gItemTable) -/* DE37B0 80241320 00C23021 */ addu $a2, $a2, $v0 -/* DE37B4 80241324 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* DE37B8 80241328 0C0B2026 */ jal set_variable -/* DE37BC 8024132C 0220282D */ daddu $a1, $s1, $zero -/* DE37C0 80241330 8FBF0018 */ lw $ra, 0x18($sp) -/* DE37C4 80241334 8FB10014 */ lw $s1, 0x14($sp) -/* DE37C8 80241338 8FB00010 */ lw $s0, 0x10($sp) -/* DE37CC 8024133C 24020002 */ addiu $v0, $zero, 2 -/* DE37D0 80241340 03E00008 */ jr $ra -/* DE37D4 80241344 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_13/func_80241498_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/func_80241498_DE2490.s deleted file mode 100644 index 68d5a009a2..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/func_80241498_DE2490.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241498_DE3928 -/* DE3928 80241498 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DE392C 8024149C AFB00010 */ sw $s0, 0x10($sp) -/* DE3930 802414A0 0080802D */ daddu $s0, $a0, $zero -/* DE3934 802414A4 AFBF0014 */ sw $ra, 0x14($sp) -/* DE3938 802414A8 8E02000C */ lw $v0, 0xc($s0) -/* DE393C 802414AC 0C0B1EAF */ jal get_variable -/* DE3940 802414B0 8C450000 */ lw $a1, ($v0) -/* DE3944 802414B4 00021140 */ sll $v0, $v0, 5 -/* DE3948 802414B8 AE000084 */ sw $zero, 0x84($s0) -/* DE394C 802414BC 3C018008 */ lui $at, 0x8008 -/* DE3950 802414C0 00220821 */ addu $at, $at, $v0 -/* DE3954 802414C4 942278F8 */ lhu $v0, 0x78f8($at) -/* DE3958 802414C8 30420040 */ andi $v0, $v0, 0x40 -/* DE395C 802414CC 10400002 */ beqz $v0, .L802414D8 -/* DE3960 802414D0 24020001 */ addiu $v0, $zero, 1 -/* DE3964 802414D4 AE020084 */ sw $v0, 0x84($s0) -.L802414D8: -/* DE3968 802414D8 8FBF0014 */ lw $ra, 0x14($sp) -/* DE396C 802414DC 8FB00010 */ lw $s0, 0x10($sp) -/* DE3970 802414E0 24020002 */ addiu $v0, $zero, 2 -/* DE3974 802414E4 03E00008 */ jr $ra -/* DE3978 802414E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* DE397C 802414EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_14/func_80240160_DE56B0.s b/asm/nonmatchings/world/area_omo/omo_14/func_80240160_DE56B0.s deleted file mode 100644 index cff77bf79d..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_14/func_80240160_DE56B0.s +++ /dev/null @@ -1,178 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240160_DE5810 -/* DE5810 80240160 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DE5814 80240164 AFB20018 */ sw $s2, 0x18($sp) -/* DE5818 80240168 0080902D */ daddu $s2, $a0, $zero -/* DE581C 8024016C AFBF001C */ sw $ra, 0x1c($sp) -/* DE5820 80240170 AFB10014 */ sw $s1, 0x14($sp) -/* DE5824 80240174 AFB00010 */ sw $s0, 0x10($sp) -/* DE5828 80240178 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DE582C 8024017C F7B60028 */ sdc1 $f22, 0x28($sp) -/* DE5830 80240180 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DE5834 80240184 8E420148 */ lw $v0, 0x148($s2) -/* DE5838 80240188 0C00EABB */ jal get_npc_unsafe -/* DE583C 8024018C 84440008 */ lh $a0, 8($v0) -/* DE5840 80240190 0040802D */ daddu $s0, $v0, $zero -/* DE5844 80240194 820200A4 */ lb $v0, 0xa4($s0) -/* DE5848 80240198 3C0143B4 */ lui $at, 0x43b4 -/* DE584C 8024019C 4481A000 */ mtc1 $at, $f20 -/* DE5850 802401A0 44826000 */ mtc1 $v0, $f12 -/* DE5854 802401A4 00000000 */ nop -/* DE5858 802401A8 46806320 */ cvt.s.w $f12, $f12 -/* DE585C 802401AC 46146302 */ mul.s $f12, $f12, $f20 -/* DE5860 802401B0 00000000 */ nop -/* DE5864 802401B4 3C014120 */ lui $at, 0x4120 -/* DE5868 802401B8 4481B000 */ mtc1 $at, $f22 -/* DE586C 802401BC 0C00A8BB */ jal sin_deg -/* DE5870 802401C0 46166303 */ div.s $f12, $f12, $f22 -/* DE5874 802401C4 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* DE5878 802401C8 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* DE587C 802401CC 862200B2 */ lh $v0, 0xb2($s1) -/* DE5880 802401D0 860300A6 */ lh $v1, 0xa6($s0) -/* DE5884 802401D4 3C013F00 */ lui $at, 0x3f00 -/* DE5888 802401D8 4481C000 */ mtc1 $at, $f24 -/* DE588C 802401DC 00431021 */ addu $v0, $v0, $v1 -/* DE5890 802401E0 44821000 */ mtc1 $v0, $f2 -/* DE5894 802401E4 00000000 */ nop -/* DE5898 802401E8 468010A0 */ cvt.s.w $f2, $f2 -/* DE589C 802401EC 46181082 */ mul.s $f2, $f2, $f24 -/* DE58A0 802401F0 00000000 */ nop -/* DE58A4 802401F4 820200A4 */ lb $v0, 0xa4($s0) -/* DE58A8 802401F8 44826000 */ mtc1 $v0, $f12 -/* DE58AC 802401FC 00000000 */ nop -/* DE58B0 80240200 46806320 */ cvt.s.w $f12, $f12 -/* DE58B4 80240204 46146302 */ mul.s $f12, $f12, $f20 -/* DE58B8 80240208 00000000 */ nop -/* DE58BC 8024020C 46001082 */ mul.s $f2, $f2, $f0 -/* DE58C0 80240210 00000000 */ nop -/* DE58C4 80240214 C6200028 */ lwc1 $f0, 0x28($s1) -/* DE58C8 80240218 46166303 */ div.s $f12, $f12, $f22 -/* DE58CC 8024021C 0C00A8D4 */ jal cos_deg -/* DE58D0 80240220 46020580 */ add.s $f22, $f0, $f2 -/* DE58D4 80240224 862200B2 */ lh $v0, 0xb2($s1) -/* DE58D8 80240228 860300A6 */ lh $v1, 0xa6($s0) -/* DE58DC 8024022C 00431021 */ addu $v0, $v0, $v1 -/* DE58E0 80240230 44821000 */ mtc1 $v0, $f2 -/* DE58E4 80240234 00000000 */ nop -/* DE58E8 80240238 468010A0 */ cvt.s.w $f2, $f2 -/* DE58EC 8024023C 46181082 */ mul.s $f2, $f2, $f24 -/* DE58F0 80240240 00000000 */ nop -/* DE58F4 80240244 46001082 */ mul.s $f2, $f2, $f0 -/* DE58F8 80240248 00000000 */ nop -/* DE58FC 8024024C C6200030 */ lwc1 $f0, 0x30($s1) -/* DE5900 80240250 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DE5904 80240254 46020501 */ sub.s $f20, $f0, $f2 -/* DE5908 80240258 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DE590C 8024025C 4406B000 */ mfc1 $a2, $f22 -/* DE5910 80240260 4407A000 */ mfc1 $a3, $f20 -/* DE5914 80240264 0C00A7B5 */ jal dist2D -/* DE5918 80240268 00000000 */ nop -/* DE591C 8024026C C6020018 */ lwc1 $f2, 0x18($s0) -/* DE5920 80240270 46000606 */ mov.s $f24, $f0 -/* DE5924 80240274 4618103C */ c.lt.s $f2, $f24 -/* DE5928 80240278 00000000 */ nop -/* DE592C 8024027C 45000033 */ bc1f .L8024034C -/* DE5930 80240280 00000000 */ nop -/* DE5934 80240284 8E020000 */ lw $v0, ($s0) -/* DE5938 80240288 30422000 */ andi $v0, $v0, 0x2000 -/* DE593C 8024028C 10400022 */ beqz $v0, .L80240318 -/* DE5940 80240290 00000000 */ nop -/* DE5944 80240294 C602000C */ lwc1 $f2, 0xc($s0) -/* DE5948 80240298 3C014334 */ lui $at, 0x4334 -/* DE594C 8024029C 44810000 */ mtc1 $at, $f0 -/* DE5950 802402A0 00000000 */ nop -/* DE5954 802402A4 4600103C */ c.lt.s $f2, $f0 -/* DE5958 802402A8 00000000 */ nop -/* DE595C 802402AC 4500000D */ bc1f .L802402E4 -/* DE5960 802402B0 00000000 */ nop -/* DE5964 802402B4 C6020040 */ lwc1 $f2, 0x40($s0) -/* DE5968 802402B8 44800000 */ mtc1 $zero, $f0 -/* DE596C 802402BC 3C014307 */ lui $at, 0x4307 -/* DE5970 802402C0 44812000 */ mtc1 $at, $f4 -/* DE5974 802402C4 4602003C */ c.lt.s $f0, $f2 -/* DE5978 802402C8 00000000 */ nop -/* DE597C 802402CC 45020019 */ bc1fl .L80240334 -/* DE5980 802402D0 E604000C */ swc1 $f4, 0xc($s0) -/* DE5984 802402D4 3C014234 */ lui $at, 0x4234 -/* DE5988 802402D8 44812000 */ mtc1 $at, $f4 -/* DE598C 802402DC 080900CD */ j .L80240334 -/* DE5990 802402E0 E604000C */ swc1 $f4, 0xc($s0) -.L802402E4: -/* DE5994 802402E4 C6020040 */ lwc1 $f2, 0x40($s0) -/* DE5998 802402E8 44800000 */ mtc1 $zero, $f0 -/* DE599C 802402EC 3C014361 */ lui $at, 0x4361 -/* DE59A0 802402F0 44812000 */ mtc1 $at, $f4 -/* DE59A4 802402F4 4602003C */ c.lt.s $f0, $f2 -/* DE59A8 802402F8 00000000 */ nop -/* DE59AC 802402FC 4502000D */ bc1fl .L80240334 -/* DE59B0 80240300 E604000C */ swc1 $f4, 0xc($s0) -/* DE59B4 80240304 3C01439D */ lui $at, 0x439d -/* DE59B8 80240308 34218000 */ ori $at, $at, 0x8000 -/* DE59BC 8024030C 44812000 */ mtc1 $at, $f4 -/* DE59C0 80240310 080900CD */ j .L80240334 -/* DE59C4 80240314 E604000C */ swc1 $f4, 0xc($s0) -.L80240318: -/* DE59C8 80240318 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DE59CC 8024031C C60E0040 */ lwc1 $f14, 0x40($s0) -/* DE59D0 80240320 4406B000 */ mfc1 $a2, $f22 -/* DE59D4 80240324 4407A000 */ mfc1 $a3, $f20 -/* DE59D8 80240328 0C00A720 */ jal atan2 -/* DE59DC 8024032C 00000000 */ nop -/* DE59E0 80240330 E600000C */ swc1 $f0, 0xc($s0) -.L80240334: -/* DE59E4 80240334 8E06000C */ lw $a2, 0xc($s0) -/* DE59E8 80240338 8E050018 */ lw $a1, 0x18($s0) -/* DE59EC 8024033C 0C00EA95 */ jal npc_move_heading -/* DE59F0 80240340 0200202D */ daddu $a0, $s0, $zero -/* DE59F4 80240344 080900D9 */ j .L80240364 -/* DE59F8 80240348 00000000 */ nop -.L8024034C: -/* DE59FC 8024034C C60C0038 */ lwc1 $f12, 0x38($s0) -/* DE5A00 80240350 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DE5A04 80240354 8E260028 */ lw $a2, 0x28($s1) -/* DE5A08 80240358 0C00A720 */ jal atan2 -/* DE5A0C 8024035C 8E270030 */ lw $a3, 0x30($s1) -/* DE5A10 80240360 E600000C */ swc1 $f0, 0xc($s0) -.L80240364: -/* DE5A14 80240364 C64200B0 */ lwc1 $f2, 0xb0($s2) -/* DE5A18 80240368 C6200028 */ lwc1 $f0, 0x28($s1) -/* DE5A1C 8024036C 46001032 */ c.eq.s $f2, $f0 -/* DE5A20 80240370 00000000 */ nop -/* DE5A24 80240374 45020013 */ bc1fl .L802403C4 -/* DE5A28 80240378 E64000B0 */ swc1 $f0, 0xb0($s2) -/* DE5A2C 8024037C C64200B8 */ lwc1 $f2, 0xb8($s2) -/* DE5A30 80240380 C6200030 */ lwc1 $f0, 0x30($s1) -/* DE5A34 80240384 46001032 */ c.eq.s $f2, $f0 -/* DE5A38 80240388 00000000 */ nop -/* DE5A3C 8024038C 4500000B */ bc1f .L802403BC -/* DE5A40 80240390 00000000 */ nop -/* DE5A44 80240394 3C0141A0 */ lui $at, 0x41a0 -/* DE5A48 80240398 44810000 */ mtc1 $at, $f0 -/* DE5A4C 8024039C 00000000 */ nop -/* DE5A50 802403A0 4600C03C */ c.lt.s $f24, $f0 -/* DE5A54 802403A4 00000000 */ nop -/* DE5A58 802403A8 45020004 */ bc1fl .L802403BC -/* DE5A5C 802403AC AE4000BC */ sw $zero, 0xbc($s2) -/* DE5A60 802403B0 8E4200BC */ lw $v0, 0xbc($s2) -/* DE5A64 802403B4 24420001 */ addiu $v0, $v0, 1 -/* DE5A68 802403B8 AE4200BC */ sw $v0, 0xbc($s2) -.L802403BC: -/* DE5A6C 802403BC C6200028 */ lwc1 $f0, 0x28($s1) -/* DE5A70 802403C0 E64000B0 */ swc1 $f0, 0xb0($s2) -.L802403C4: -/* DE5A74 802403C4 C620002C */ lwc1 $f0, 0x2c($s1) -/* DE5A78 802403C8 E64000B4 */ swc1 $f0, 0xb4($s2) -/* DE5A7C 802403CC C6200030 */ lwc1 $f0, 0x30($s1) -/* DE5A80 802403D0 E64000B8 */ swc1 $f0, 0xb8($s2) -/* DE5A84 802403D4 8FBF001C */ lw $ra, 0x1c($sp) -/* DE5A88 802403D8 8FB20018 */ lw $s2, 0x18($sp) -/* DE5A8C 802403DC 8FB10014 */ lw $s1, 0x14($sp) -/* DE5A90 802403E0 8FB00010 */ lw $s0, 0x10($sp) -/* DE5A94 802403E4 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DE5A98 802403E8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DE5A9C 802403EC D7B40020 */ ldc1 $f20, 0x20($sp) -/* DE5AA0 802403F0 24020002 */ addiu $v0, $zero, 2 -/* DE5AA4 802403F4 03E00008 */ jr $ra -/* DE5AA8 802403F8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_14/func_802403FC_DE56B0.s b/asm/nonmatchings/world/area_omo/omo_14/func_802403FC_DE56B0.s deleted file mode 100644 index a325417f8a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_14/func_802403FC_DE56B0.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403FC_DE5AAC -/* DE5AAC 802403FC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DE5AB0 80240400 AFB10014 */ sw $s1, 0x14($sp) -/* DE5AB4 80240404 0080882D */ daddu $s1, $a0, $zero -/* DE5AB8 80240408 AFBF001C */ sw $ra, 0x1c($sp) -/* DE5ABC 8024040C AFB20018 */ sw $s2, 0x18($sp) -/* DE5AC0 80240410 AFB00010 */ sw $s0, 0x10($sp) -/* DE5AC4 80240414 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DE5AC8 80240418 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DE5ACC 8024041C 8E220148 */ lw $v0, 0x148($s1) -/* DE5AD0 80240420 84440008 */ lh $a0, 8($v0) -/* DE5AD4 80240424 0C00EABB */ jal get_npc_unsafe -/* DE5AD8 80240428 8E30000C */ lw $s0, 0xc($s1) -/* DE5ADC 8024042C 8E050000 */ lw $a1, ($s0) -/* DE5AE0 80240430 26100004 */ addiu $s0, $s0, 4 -/* DE5AE4 80240434 0220202D */ daddu $a0, $s1, $zero -/* DE5AE8 80240438 0C0B210B */ jal get_float_variable -/* DE5AEC 8024043C 0040902D */ daddu $s2, $v0, $zero -/* DE5AF0 80240440 0220202D */ daddu $a0, $s1, $zero -/* DE5AF4 80240444 8E050000 */ lw $a1, ($s0) -/* DE5AF8 80240448 0C0B210B */ jal get_float_variable -/* DE5AFC 8024044C 46000586 */ mov.s $f22, $f0 -/* DE5B00 80240450 46000506 */ mov.s $f20, $f0 -/* DE5B04 80240454 C64C0038 */ lwc1 $f12, 0x38($s2) -/* DE5B08 80240458 C64E0040 */ lwc1 $f14, 0x40($s2) -/* DE5B0C 8024045C 4406B000 */ mfc1 $a2, $f22 -/* DE5B10 80240460 4407A000 */ mfc1 $a3, $f20 -/* DE5B14 80240464 0C00A7B5 */ jal dist2D -/* DE5B18 80240468 00000000 */ nop -/* DE5B1C 8024046C C6420018 */ lwc1 $f2, 0x18($s2) -/* DE5B20 80240470 4600103C */ c.lt.s $f2, $f0 -/* DE5B24 80240474 00000000 */ nop -/* DE5B28 80240478 45000031 */ bc1f .L80240540 -/* DE5B2C 8024047C 00000000 */ nop -/* DE5B30 80240480 8E420000 */ lw $v0, ($s2) -/* DE5B34 80240484 30422000 */ andi $v0, $v0, 0x2000 -/* DE5B38 80240488 10400022 */ beqz $v0, .L80240514 -/* DE5B3C 8024048C 00000000 */ nop -/* DE5B40 80240490 C642000C */ lwc1 $f2, 0xc($s2) -/* DE5B44 80240494 3C014334 */ lui $at, 0x4334 -/* DE5B48 80240498 44810000 */ mtc1 $at, $f0 -/* DE5B4C 8024049C 00000000 */ nop -/* DE5B50 802404A0 4600103C */ c.lt.s $f2, $f0 -/* DE5B54 802404A4 00000000 */ nop -/* DE5B58 802404A8 4500000D */ bc1f .L802404E0 -/* DE5B5C 802404AC 00000000 */ nop -/* DE5B60 802404B0 C6420040 */ lwc1 $f2, 0x40($s2) -/* DE5B64 802404B4 44800000 */ mtc1 $zero, $f0 -/* DE5B68 802404B8 3C014307 */ lui $at, 0x4307 -/* DE5B6C 802404BC 44812000 */ mtc1 $at, $f4 -/* DE5B70 802404C0 4602003C */ c.lt.s $f0, $f2 -/* DE5B74 802404C4 00000000 */ nop -/* DE5B78 802404C8 45020019 */ bc1fl .L80240530 -/* DE5B7C 802404CC E644000C */ swc1 $f4, 0xc($s2) -/* DE5B80 802404D0 3C014234 */ lui $at, 0x4234 -/* DE5B84 802404D4 44812000 */ mtc1 $at, $f4 -/* DE5B88 802404D8 0809014C */ j .L80240530 -/* DE5B8C 802404DC E644000C */ swc1 $f4, 0xc($s2) -.L802404E0: -/* DE5B90 802404E0 C6420040 */ lwc1 $f2, 0x40($s2) -/* DE5B94 802404E4 44800000 */ mtc1 $zero, $f0 -/* DE5B98 802404E8 3C014361 */ lui $at, 0x4361 -/* DE5B9C 802404EC 44812000 */ mtc1 $at, $f4 -/* DE5BA0 802404F0 4602003C */ c.lt.s $f0, $f2 -/* DE5BA4 802404F4 00000000 */ nop -/* DE5BA8 802404F8 4502000D */ bc1fl .L80240530 -/* DE5BAC 802404FC E644000C */ swc1 $f4, 0xc($s2) -/* DE5BB0 80240500 3C01439D */ lui $at, 0x439d -/* DE5BB4 80240504 34218000 */ ori $at, $at, 0x8000 -/* DE5BB8 80240508 44812000 */ mtc1 $at, $f4 -/* DE5BBC 8024050C 0809014C */ j .L80240530 -/* DE5BC0 80240510 E644000C */ swc1 $f4, 0xc($s2) -.L80240514: -/* DE5BC4 80240514 C64C0038 */ lwc1 $f12, 0x38($s2) -/* DE5BC8 80240518 C64E0040 */ lwc1 $f14, 0x40($s2) -/* DE5BCC 8024051C 4406B000 */ mfc1 $a2, $f22 -/* DE5BD0 80240520 4407A000 */ mfc1 $a3, $f20 -/* DE5BD4 80240524 0C00A720 */ jal atan2 -/* DE5BD8 80240528 00000000 */ nop -/* DE5BDC 8024052C E640000C */ swc1 $f0, 0xc($s2) -.L80240530: -/* DE5BE0 80240530 8E450018 */ lw $a1, 0x18($s2) -/* DE5BE4 80240534 8E46000C */ lw $a2, 0xc($s2) -/* DE5BE8 80240538 0C00EA95 */ jal npc_move_heading -/* DE5BEC 8024053C 0240202D */ daddu $a0, $s2, $zero -.L80240540: -/* DE5BF0 80240540 8FBF001C */ lw $ra, 0x1c($sp) -/* DE5BF4 80240544 8FB20018 */ lw $s2, 0x18($sp) -/* DE5BF8 80240548 8FB10014 */ lw $s1, 0x14($sp) -/* DE5BFC 8024054C 8FB00010 */ lw $s0, 0x10($sp) -/* DE5C00 80240550 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DE5C04 80240554 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DE5C08 80240558 24020002 */ addiu $v0, $zero, 2 -/* DE5C0C 8024055C 03E00008 */ jr $ra -/* DE5C10 80240560 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_14/func_80240564_DE56B0.s b/asm/nonmatchings/world/area_omo/omo_14/func_80240564_DE56B0.s deleted file mode 100644 index 46be91c2e0..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_14/func_80240564_DE56B0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240564_DE5C14 -/* DE5C14 80240564 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* DE5C18 80240568 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* DE5C1C 8024056C 80620000 */ lb $v0, ($v1) -/* DE5C20 80240570 10400004 */ beqz $v0, .L80240584 -/* DE5C24 80240574 2402FFFF */ addiu $v0, $zero, -1 -/* DE5C28 80240578 80620003 */ lb $v0, 3($v1) -/* DE5C2C 8024057C 08090162 */ j .L80240588 -/* DE5C30 80240580 AC8200A8 */ sw $v0, 0xa8($a0) -.L80240584: -/* DE5C34 80240584 AC8200A8 */ sw $v0, 0xa8($a0) -.L80240588: -/* DE5C38 80240588 03E00008 */ jr $ra -/* DE5C3C 8024058C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_14/func_80240590_DE56B0.s b/asm/nonmatchings/world/area_omo/omo_14/func_80240590_DE56B0.s deleted file mode 100644 index 1e9fa5dab2..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_14/func_80240590_DE56B0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240590_DE5C40 -/* DE5C40 80240590 3C038011 */ lui $v1, 0x8011 -/* DE5C44 80240594 8063EBB3 */ lb $v1, -0x144d($v1) -/* DE5C48 80240598 24020006 */ addiu $v0, $zero, 6 -/* DE5C4C 8024059C 54620003 */ bnel $v1, $v0, .L802405AC -/* DE5C50 802405A0 AC800088 */ sw $zero, 0x88($a0) -/* DE5C54 802405A4 24020001 */ addiu $v0, $zero, 1 -/* DE5C58 802405A8 AC820088 */ sw $v0, 0x88($a0) -.L802405AC: -/* DE5C5C 802405AC 03E00008 */ jr $ra -/* DE5C60 802405B0 24020002 */ addiu $v0, $zero, 2 -/* DE5C64 802405B4 00000000 */ nop -/* DE5C68 802405B8 00000000 */ nop -/* DE5C6C 802405BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_15/func_8024004C_DE8770.s b/asm/nonmatchings/world/area_omo/omo_15/func_8024004C_DE8770.s deleted file mode 100644 index 25d4183147..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_15/func_8024004C_DE8770.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024004C_DE87BC -/* DE87BC 8024004C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DE87C0 80240050 AFB20020 */ sw $s2, 0x20($sp) -/* DE87C4 80240054 0080902D */ daddu $s2, $a0, $zero -/* DE87C8 80240058 AFBF0024 */ sw $ra, 0x24($sp) -/* DE87CC 8024005C AFB1001C */ sw $s1, 0x1c($sp) -/* DE87D0 80240060 AFB00018 */ sw $s0, 0x18($sp) -/* DE87D4 80240064 10A0004A */ beqz $a1, .L80240190 -/* DE87D8 80240068 8E51000C */ lw $s1, 0xc($s2) -/* DE87DC 8024006C 0C00AB39 */ jal heap_malloc -/* DE87E0 80240070 24040058 */ addiu $a0, $zero, 0x58 -/* DE87E4 80240074 0000202D */ daddu $a0, $zero, $zero -/* DE87E8 80240078 3C05FD05 */ lui $a1, 0xfd05 -/* DE87EC 8024007C 34A50F81 */ ori $a1, $a1, 0xf81 -/* DE87F0 80240080 0040802D */ daddu $s0, $v0, $zero -/* DE87F4 80240084 0200302D */ daddu $a2, $s0, $zero -/* DE87F8 80240088 0C0B2026 */ jal set_variable -/* DE87FC 8024008C AE500084 */ sw $s0, 0x84($s2) -/* DE8800 80240090 8E250000 */ lw $a1, ($s1) -/* DE8804 80240094 26310004 */ addiu $s1, $s1, 4 -/* DE8808 80240098 0C0B1EAF */ jal get_variable -/* DE880C 8024009C 0240202D */ daddu $a0, $s2, $zero -/* DE8810 802400A0 AE020038 */ sw $v0, 0x38($s0) -/* DE8814 802400A4 8E250000 */ lw $a1, ($s1) -/* DE8818 802400A8 26310004 */ addiu $s1, $s1, 4 -/* DE881C 802400AC 0C0B1EAF */ jal get_variable -/* DE8820 802400B0 0240202D */ daddu $a0, $s2, $zero -/* DE8824 802400B4 AE02003C */ sw $v0, 0x3c($s0) -/* DE8828 802400B8 8E250000 */ lw $a1, ($s1) -/* DE882C 802400BC 26310004 */ addiu $s1, $s1, 4 -/* DE8830 802400C0 0C0B210B */ jal get_float_variable -/* DE8834 802400C4 0240202D */ daddu $a0, $s2, $zero -/* DE8838 802400C8 E600000C */ swc1 $f0, 0xc($s0) -/* DE883C 802400CC 8E250000 */ lw $a1, ($s1) -/* DE8840 802400D0 26310004 */ addiu $s1, $s1, 4 -/* DE8844 802400D4 0C0B210B */ jal get_float_variable -/* DE8848 802400D8 0240202D */ daddu $a0, $s2, $zero -/* DE884C 802400DC E6000010 */ swc1 $f0, 0x10($s0) -/* DE8850 802400E0 8E250000 */ lw $a1, ($s1) -/* DE8854 802400E4 26310004 */ addiu $s1, $s1, 4 -/* DE8858 802400E8 0C0B210B */ jal get_float_variable -/* DE885C 802400EC 0240202D */ daddu $a0, $s2, $zero -/* DE8860 802400F0 E6000014 */ swc1 $f0, 0x14($s0) -/* DE8864 802400F4 8E250000 */ lw $a1, ($s1) -/* DE8868 802400F8 26310004 */ addiu $s1, $s1, 4 -/* DE886C 802400FC 0C0B210B */ jal get_float_variable -/* DE8870 80240100 0240202D */ daddu $a0, $s2, $zero -/* DE8874 80240104 E6000018 */ swc1 $f0, 0x18($s0) -/* DE8878 80240108 8E250000 */ lw $a1, ($s1) -/* DE887C 8024010C 26310004 */ addiu $s1, $s1, 4 -/* DE8880 80240110 0C0B210B */ jal get_float_variable -/* DE8884 80240114 0240202D */ daddu $a0, $s2, $zero -/* DE8888 80240118 E600001C */ swc1 $f0, 0x1c($s0) -/* DE888C 8024011C 8E250000 */ lw $a1, ($s1) -/* DE8890 80240120 26310004 */ addiu $s1, $s1, 4 -/* DE8894 80240124 0C0B210B */ jal get_float_variable -/* DE8898 80240128 0240202D */ daddu $a0, $s2, $zero -/* DE889C 8024012C E6000020 */ swc1 $f0, 0x20($s0) -/* DE88A0 80240130 8E250000 */ lw $a1, ($s1) -/* DE88A4 80240134 26310004 */ addiu $s1, $s1, 4 -/* DE88A8 80240138 0C0B210B */ jal get_float_variable -/* DE88AC 8024013C 0240202D */ daddu $a0, $s2, $zero -/* DE88B0 80240140 E6000024 */ swc1 $f0, 0x24($s0) -/* DE88B4 80240144 8E250000 */ lw $a1, ($s1) -/* DE88B8 80240148 0C0B210B */ jal get_float_variable -/* DE88BC 8024014C 0240202D */ daddu $a0, $s2, $zero -/* DE88C0 80240150 3C013F80 */ lui $at, 0x3f80 -/* DE88C4 80240154 44811000 */ mtc1 $at, $f2 -/* DE88C8 80240158 E6000028 */ swc1 $f0, 0x28($s0) -/* DE88CC 8024015C AFA00014 */ sw $zero, 0x14($sp) -/* DE88D0 80240160 E7A20010 */ swc1 $f2, 0x10($sp) -/* DE88D4 80240164 8E05000C */ lw $a1, 0xc($s0) -/* DE88D8 80240168 8E060010 */ lw $a2, 0x10($s0) -/* DE88DC 8024016C 8E070014 */ lw $a3, 0x14($s0) -/* DE88E0 80240170 0C01CA6C */ jal func_800729B0 -/* DE88E4 80240174 24040002 */ addiu $a0, $zero, 2 -/* DE88E8 80240178 AE020050 */ sw $v0, 0x50($s0) -/* DE88EC 8024017C A600004E */ sh $zero, 0x4e($s0) -/* DE88F0 80240180 A6000048 */ sh $zero, 0x48($s0) -/* DE88F4 80240184 A600004A */ sh $zero, 0x4a($s0) -/* DE88F8 80240188 A6000044 */ sh $zero, 0x44($s0) -/* DE88FC 8024018C A6000046 */ sh $zero, 0x46($s0) -.L80240190: -/* DE8900 80240190 8FBF0024 */ lw $ra, 0x24($sp) -/* DE8904 80240194 8FB20020 */ lw $s2, 0x20($sp) -/* DE8908 80240198 8FB1001C */ lw $s1, 0x1c($sp) -/* DE890C 8024019C 8FB00018 */ lw $s0, 0x18($sp) -/* DE8910 802401A0 24020002 */ addiu $v0, $zero, 2 -/* DE8914 802401A4 03E00008 */ jr $ra -/* DE8918 802401A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_15/func_802401AC_DE8770.s b/asm/nonmatchings/world/area_omo/omo_15/func_802401AC_DE8770.s deleted file mode 100644 index e7fc18fcdb..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_15/func_802401AC_DE8770.s +++ /dev/null @@ -1,272 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401AC_DE891C -/* DE891C 802401AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DE8920 802401B0 AFBF0020 */ sw $ra, 0x20($sp) -/* DE8924 802401B4 AFB1001C */ sw $s1, 0x1c($sp) -/* DE8928 802401B8 AFB00018 */ sw $s0, 0x18($sp) -/* DE892C 802401BC 8C910084 */ lw $s1, 0x84($a0) -/* DE8930 802401C0 86230044 */ lh $v1, 0x44($s1) -/* DE8934 802401C4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* DE8938 802401C8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* DE893C 802401CC 2C620005 */ sltiu $v0, $v1, 5 -/* DE8940 802401D0 1040008A */ beqz $v0, .L802403FC -/* DE8944 802401D4 00031080 */ sll $v0, $v1, 2 -/* DE8948 802401D8 3C018024 */ lui $at, 0x8024 -/* DE894C 802401DC 00220821 */ addu $at, $at, $v0 -/* DE8950 802401E0 8C223730 */ lw $v0, 0x3730($at) -/* DE8954 802401E4 00400008 */ jr $v0 -/* DE8958 802401E8 00000000 */ nop -/* DE895C 802401EC 8E22003C */ lw $v0, 0x3c($s1) -/* DE8960 802401F0 86270046 */ lh $a3, 0x46($s1) -/* DE8964 802401F4 AFA20010 */ sw $v0, 0x10($sp) -/* DE8968 802401F8 8E250010 */ lw $a1, 0x10($s1) -/* DE896C 802401FC 8E26001C */ lw $a2, 0x1c($s1) -/* DE8970 80240200 0C00A8ED */ jal update_lerp -/* DE8974 80240204 24040005 */ addiu $a0, $zero, 5 -/* DE8978 80240208 86270046 */ lh $a3, 0x46($s1) -/* DE897C 8024020C 8E22003C */ lw $v0, 0x3c($s1) -/* DE8980 80240210 E6200004 */ swc1 $f0, 4($s1) -/* DE8984 80240214 AFA20010 */ sw $v0, 0x10($sp) -/* DE8988 80240218 8E25000C */ lw $a1, 0xc($s1) -/* DE898C 8024021C 8E260018 */ lw $a2, 0x18($s1) -/* DE8990 80240220 0C00A8ED */ jal update_lerp -/* DE8994 80240224 0000202D */ daddu $a0, $zero, $zero -/* DE8998 80240228 86270046 */ lh $a3, 0x46($s1) -/* DE899C 8024022C 8E22003C */ lw $v0, 0x3c($s1) -/* DE89A0 80240230 E6200000 */ swc1 $f0, ($s1) -/* DE89A4 80240234 AFA20010 */ sw $v0, 0x10($sp) -/* DE89A8 80240238 8E250014 */ lw $a1, 0x14($s1) -/* DE89AC 8024023C 8E260020 */ lw $a2, 0x20($s1) -/* DE89B0 80240240 0C00A8ED */ jal update_lerp -/* DE89B4 80240244 0000202D */ daddu $a0, $zero, $zero -/* DE89B8 80240248 8E220050 */ lw $v0, 0x50($s1) -/* DE89BC 8024024C E6200008 */ swc1 $f0, 8($s1) -/* DE89C0 80240250 C6200000 */ lwc1 $f0, ($s1) -/* DE89C4 80240254 8C42000C */ lw $v0, 0xc($v0) -/* DE89C8 80240258 E4400008 */ swc1 $f0, 8($v0) -/* DE89CC 8024025C 8E220050 */ lw $v0, 0x50($s1) -/* DE89D0 80240260 C6200004 */ lwc1 $f0, 4($s1) -/* DE89D4 80240264 8C42000C */ lw $v0, 0xc($v0) -/* DE89D8 80240268 E440000C */ swc1 $f0, 0xc($v0) -/* DE89DC 8024026C 8E220050 */ lw $v0, 0x50($s1) -/* DE89E0 80240270 C6200008 */ lwc1 $f0, 8($s1) -/* DE89E4 80240274 8C42000C */ lw $v0, 0xc($v0) -/* DE89E8 80240278 E4400010 */ swc1 $f0, 0x10($v0) -/* DE89EC 8024027C 96220046 */ lhu $v0, 0x46($s1) -/* DE89F0 80240280 8E23003C */ lw $v1, 0x3c($s1) -/* DE89F4 80240284 24420001 */ addiu $v0, $v0, 1 -/* DE89F8 80240288 A6220046 */ sh $v0, 0x46($s1) -/* DE89FC 8024028C 00021400 */ sll $v0, $v0, 0x10 -/* DE8A00 80240290 00021403 */ sra $v0, $v0, 0x10 -/* DE8A04 80240294 0043102A */ slt $v0, $v0, $v1 -/* DE8A08 80240298 14400058 */ bnez $v0, .L802403FC -/* DE8A0C 8024029C 24020001 */ addiu $v0, $zero, 1 -/* DE8A10 802402A0 A6220044 */ sh $v0, 0x44($s1) -/* DE8A14 802402A4 080900FF */ j .L802403FC -/* DE8A18 802402A8 A6200046 */ sh $zero, 0x46($s1) -/* DE8A1C 802402AC 96220046 */ lhu $v0, 0x46($s1) -/* DE8A20 802402B0 24420001 */ addiu $v0, $v0, 1 -/* DE8A24 802402B4 A6220046 */ sh $v0, 0x46($s1) -/* DE8A28 802402B8 00021400 */ sll $v0, $v0, 0x10 -/* DE8A2C 802402BC 00021403 */ sra $v0, $v0, 0x10 -/* DE8A30 802402C0 2842003C */ slti $v0, $v0, 0x3c -/* DE8A34 802402C4 1440004D */ bnez $v0, .L802403FC -/* DE8A38 802402C8 24020002 */ addiu $v0, $zero, 2 -/* DE8A3C 802402CC 8E230050 */ lw $v1, 0x50($s1) -/* DE8A40 802402D0 A6220044 */ sh $v0, 0x44($s1) -/* DE8A44 802402D4 A6200046 */ sh $zero, 0x46($s1) -/* DE8A48 802402D8 8C63000C */ lw $v1, 0xc($v1) -/* DE8A4C 802402DC 24020001 */ addiu $v0, $zero, 1 -/* DE8A50 802402E0 AC620070 */ sw $v0, 0x70($v1) -/* DE8A54 802402E4 8E220050 */ lw $v0, 0x50($s1) -/* DE8A58 802402E8 8C42000C */ lw $v0, 0xc($v0) -/* DE8A5C 802402EC 080900FF */ j .L802403FC -/* DE8A60 802402F0 AC400074 */ sw $zero, 0x74($v0) -/* DE8A64 802402F4 96220046 */ lhu $v0, 0x46($s1) -/* DE8A68 802402F8 24420001 */ addiu $v0, $v0, 1 -/* DE8A6C 802402FC A6220046 */ sh $v0, 0x46($s1) -/* DE8A70 80240300 00021400 */ sll $v0, $v0, 0x10 -/* DE8A74 80240304 00021403 */ sra $v0, $v0, 0x10 -/* DE8A78 80240308 2842003C */ slti $v0, $v0, 0x3c -/* DE8A7C 8024030C 1440003B */ bnez $v0, .L802403FC -/* DE8A80 80240310 00000000 */ nop -/* DE8A84 80240314 3C013F80 */ lui $at, 0x3f80 -/* DE8A88 80240318 44810000 */ mtc1 $at, $f0 -/* DE8A8C 8024031C AFA00014 */ sw $zero, 0x14($sp) -/* DE8A90 80240320 E7A00010 */ swc1 $f0, 0x10($sp) -/* DE8A94 80240324 8E250018 */ lw $a1, 0x18($s1) -/* DE8A98 80240328 8E26001C */ lw $a2, 0x1c($s1) -/* DE8A9C 8024032C 8E270020 */ lw $a3, 0x20($s1) -/* DE8AA0 80240330 0C01C9AC */ jal func_800726B0 -/* DE8AA4 80240334 24040001 */ addiu $a0, $zero, 1 -/* DE8AA8 80240338 AE220054 */ sw $v0, 0x54($s1) -/* DE8AAC 8024033C 8C43000C */ lw $v1, 0xc($v0) -/* DE8AB0 80240340 9222003B */ lbu $v0, 0x3b($s1) -/* DE8AB4 80240344 A0620034 */ sb $v0, 0x34($v1) -/* DE8AB8 80240348 8E220054 */ lw $v0, 0x54($s1) -/* DE8ABC 8024034C 8C42000C */ lw $v0, 0xc($v0) -/* DE8AC0 80240350 AC400020 */ sw $zero, 0x20($v0) -/* DE8AC4 80240354 8E250018 */ lw $a1, 0x18($s1) -/* DE8AC8 80240358 8E260028 */ lw $a2, 0x28($s1) -/* DE8ACC 8024035C 8E270020 */ lw $a3, 0x20($s1) -/* DE8AD0 80240360 0C044898 */ jal create_shadow_type -/* DE8AD4 80240364 0000202D */ daddu $a0, $zero, $zero -/* DE8AD8 80240368 3C014210 */ lui $at, 0x4210 -/* DE8ADC 8024036C 44810000 */ mtc1 $at, $f0 -/* DE8AE0 80240370 AE220040 */ sw $v0, 0x40($s1) -/* DE8AE4 80240374 24020003 */ addiu $v0, $zero, 3 -/* DE8AE8 80240378 A6220044 */ sh $v0, 0x44($s1) -/* DE8AEC 8024037C 24020001 */ addiu $v0, $zero, 1 -/* DE8AF0 80240380 A6200046 */ sh $zero, 0x46($s1) -/* DE8AF4 80240384 AE20002C */ sw $zero, 0x2c($s1) -/* DE8AF8 80240388 A6220048 */ sh $v0, 0x48($s1) -/* DE8AFC 8024038C 080900FF */ j .L802403FC -/* DE8B00 80240390 E6200030 */ swc1 $f0, 0x30($s1) -/* DE8B04 80240394 0000202D */ daddu $a0, $zero, $zero -/* DE8B08 80240398 3C054210 */ lui $a1, 0x4210 -/* DE8B0C 8024039C 3C064198 */ lui $a2, 0x4198 -/* DE8B10 802403A0 86270046 */ lh $a3, 0x46($s1) -/* DE8B14 802403A4 24020078 */ addiu $v0, $zero, 0x78 -/* DE8B18 802403A8 0C00A8ED */ jal update_lerp -/* DE8B1C 802403AC AFA20010 */ sw $v0, 0x10($sp) -/* DE8B20 802403B0 96220046 */ lhu $v0, 0x46($s1) -/* DE8B24 802403B4 E6200030 */ swc1 $f0, 0x30($s1) -/* DE8B28 802403B8 24420001 */ addiu $v0, $v0, 1 -/* DE8B2C 802403BC A6220046 */ sh $v0, 0x46($s1) -/* DE8B30 802403C0 00021400 */ sll $v0, $v0, 0x10 -/* DE8B34 802403C4 00021403 */ sra $v0, $v0, 0x10 -/* DE8B38 802403C8 28420078 */ slti $v0, $v0, 0x78 -/* DE8B3C 802403CC 1440000B */ bnez $v0, .L802403FC -/* DE8B40 802403D0 24030001 */ addiu $v1, $zero, 1 -/* DE8B44 802403D4 C620002C */ lwc1 $f0, 0x2c($s1) -/* DE8B48 802403D8 24020002 */ addiu $v0, $zero, 2 -/* DE8B4C 802403DC A6220048 */ sh $v0, 0x48($s1) -/* DE8B50 802403E0 24020004 */ addiu $v0, $zero, 4 -/* DE8B54 802403E4 A620004C */ sh $zero, 0x4c($s1) -/* DE8B58 802403E8 A623004A */ sh $v1, 0x4a($s1) -/* DE8B5C 802403EC A623004E */ sh $v1, 0x4e($s1) -/* DE8B60 802403F0 A6220044 */ sh $v0, 0x44($s1) -/* DE8B64 802403F4 A6200046 */ sh $zero, 0x46($s1) -/* DE8B68 802403F8 E6200034 */ swc1 $f0, 0x34($s1) -.L802403FC: -/* DE8B6C 802403FC 8623004A */ lh $v1, 0x4a($s1) -/* DE8B70 80240400 24020001 */ addiu $v0, $zero, 1 -/* DE8B74 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* DE8B78 80240408 24020002 */ addiu $v0, $zero, 2 -/* DE8B7C 8024040C 1062001E */ beq $v1, $v0, .L80240488 -/* DE8B80 80240410 00000000 */ nop -/* DE8B84 80240414 0809014C */ j .L80240530 -/* DE8B88 80240418 00000000 */ nop -.L8024041C: -/* DE8B8C 8024041C 8627004C */ lh $a3, 0x4c($s1) -/* DE8B90 80240420 24100078 */ addiu $s0, $zero, 0x78 -/* DE8B94 80240424 AFB00010 */ sw $s0, 0x10($sp) -/* DE8B98 80240428 8E250034 */ lw $a1, 0x34($s1) -/* DE8B9C 8024042C 3C0644B4 */ lui $a2, 0x44b4 -/* DE8BA0 80240430 0C00A8ED */ jal update_lerp -/* DE8BA4 80240434 24040004 */ addiu $a0, $zero, 4 -/* DE8BA8 80240438 8627004C */ lh $a3, 0x4c($s1) -/* DE8BAC 8024043C E620002C */ swc1 $f0, 0x2c($s1) -/* DE8BB0 80240440 AFB00010 */ sw $s0, 0x10($sp) -/* DE8BB4 80240444 8E25001C */ lw $a1, 0x1c($s1) -/* DE8BB8 80240448 8E260024 */ lw $a2, 0x24($s1) -/* DE8BBC 8024044C 0C00A8ED */ jal update_lerp -/* DE8BC0 80240450 2404000A */ addiu $a0, $zero, 0xa -/* DE8BC4 80240454 9622004C */ lhu $v0, 0x4c($s1) -/* DE8BC8 80240458 E6200004 */ swc1 $f0, 4($s1) -/* DE8BCC 8024045C 24420001 */ addiu $v0, $v0, 1 -/* DE8BD0 80240460 A622004C */ sh $v0, 0x4c($s1) -/* DE8BD4 80240464 00021400 */ sll $v0, $v0, 0x10 -/* DE8BD8 80240468 00021403 */ sra $v0, $v0, 0x10 -/* DE8BDC 8024046C 0050102A */ slt $v0, $v0, $s0 -/* DE8BE0 80240470 1440002F */ bnez $v0, .L80240530 -/* DE8BE4 80240474 2402010E */ addiu $v0, $zero, 0x10e -/* DE8BE8 80240478 A622004C */ sh $v0, 0x4c($s1) -/* DE8BEC 8024047C 24020002 */ addiu $v0, $zero, 2 -/* DE8BF0 80240480 0809014B */ j .L8024052C -/* DE8BF4 80240484 A622004A */ sh $v0, 0x4a($s1) -.L80240488: -/* DE8BF8 80240488 8622004C */ lh $v0, 0x4c($s1) -/* DE8BFC 8024048C 44826000 */ mtc1 $v0, $f12 -/* DE8C00 80240490 00000000 */ nop -/* DE8C04 80240494 0C00A8BB */ jal sin_deg -/* DE8C08 80240498 46806320 */ cvt.s.w $f12, $f12 -/* DE8C0C 8024049C 3C013F80 */ lui $at, 0x3f80 -/* DE8C10 802404A0 44811000 */ mtc1 $at, $f2 -/* DE8C14 802404A4 00000000 */ nop -/* DE8C18 802404A8 46020000 */ add.s $f0, $f0, $f2 -/* DE8C1C 802404AC 46000000 */ add.s $f0, $f0, $f0 -/* DE8C20 802404B0 C6220024 */ lwc1 $f2, 0x24($s1) -/* DE8C24 802404B4 8622004C */ lh $v0, 0x4c($s1) -/* DE8C28 802404B8 46001080 */ add.s $f2, $f2, $f0 -/* DE8C2C 802404BC 24420008 */ addiu $v0, $v0, 8 -/* DE8C30 802404C0 44826000 */ mtc1 $v0, $f12 -/* DE8C34 802404C4 00000000 */ nop -/* DE8C38 802404C8 46806320 */ cvt.s.w $f12, $f12 -/* DE8C3C 802404CC 0C00A6C9 */ jal clamp_angle -/* DE8C40 802404D0 E6220004 */ swc1 $f2, 4($s1) -/* DE8C44 802404D4 4600010D */ trunc.w.s $f4, $f0 -/* DE8C48 802404D8 44022000 */ mfc1 $v0, $f4 -/* DE8C4C 802404DC C6200004 */ lwc1 $f0, 4($s1) -/* DE8C50 802404E0 A622004C */ sh $v0, 0x4c($s1) -/* DE8C54 802404E4 C60C0028 */ lwc1 $f12, 0x28($s0) -/* DE8C58 802404E8 8E060030 */ lw $a2, 0x30($s0) -/* DE8C5C 802404EC 3C0141A0 */ lui $at, 0x41a0 -/* DE8C60 802404F0 44817000 */ mtc1 $at, $f14 -/* DE8C64 802404F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* DE8C68 802404F8 C602002C */ lwc1 $f2, 0x2c($s0) -/* DE8C6C 802404FC C6200008 */ lwc1 $f0, 8($s1) -/* DE8C70 80240500 E7A00014 */ swc1 $f0, 0x14($sp) -/* DE8C74 80240504 8E270000 */ lw $a3, ($s1) -/* DE8C78 80240508 0C00A7CB */ jal dist3D -/* DE8C7C 8024050C 460E1380 */ add.s $f14, $f2, $f14 -/* DE8C80 80240510 3C0141F0 */ lui $at, 0x41f0 -/* DE8C84 80240514 44811000 */ mtc1 $at, $f2 -/* DE8C88 80240518 00000000 */ nop -/* DE8C8C 8024051C 4600103C */ c.lt.s $f2, $f0 -/* DE8C90 80240520 00000000 */ nop -/* DE8C94 80240524 45010002 */ bc1t .L80240530 -/* DE8C98 80240528 24020003 */ addiu $v0, $zero, 3 -.L8024052C: -/* DE8C9C 8024052C A622004E */ sh $v0, 0x4e($s1) -.L80240530: -/* DE8CA0 80240530 86230048 */ lh $v1, 0x48($s1) -/* DE8CA4 80240534 24020001 */ addiu $v0, $zero, 1 -/* DE8CA8 80240538 10620005 */ beq $v1, $v0, .L80240550 -/* DE8CAC 8024053C 24020002 */ addiu $v0, $zero, 2 -/* DE8CB0 80240540 10620008 */ beq $v1, $v0, .L80240564 -/* DE8CB4 80240544 00000000 */ nop -/* DE8CB8 80240548 08090169 */ j .L802405A4 -/* DE8CBC 8024054C 00000000 */ nop -.L80240550: -/* DE8CC0 80240550 C620002C */ lwc1 $f0, 0x2c($s1) -/* DE8CC4 80240554 C62C0030 */ lwc1 $f12, 0x30($s1) -/* DE8CC8 80240558 0C00A6C9 */ jal clamp_angle -/* DE8CCC 8024055C 460C0300 */ add.s $f12, $f0, $f12 -/* DE8CD0 80240560 E620002C */ swc1 $f0, 0x2c($s1) -.L80240564: -/* DE8CD4 80240564 8E220054 */ lw $v0, 0x54($s1) -/* DE8CD8 80240568 C620002C */ lwc1 $f0, 0x2c($s1) -/* DE8CDC 8024056C 8C42000C */ lw $v0, 0xc($v0) -/* DE8CE0 80240570 E4400024 */ swc1 $f0, 0x24($v0) -/* DE8CE4 80240574 8E220054 */ lw $v0, 0x54($s1) -/* DE8CE8 80240578 C6200018 */ lwc1 $f0, 0x18($s1) -/* DE8CEC 8024057C 8C42000C */ lw $v0, 0xc($v0) -/* DE8CF0 80240580 E4400004 */ swc1 $f0, 4($v0) -/* DE8CF4 80240584 8E220054 */ lw $v0, 0x54($s1) -/* DE8CF8 80240588 C6200004 */ lwc1 $f0, 4($s1) -/* DE8CFC 8024058C 8C42000C */ lw $v0, 0xc($v0) -/* DE8D00 80240590 E4400008 */ swc1 $f0, 8($v0) -/* DE8D04 80240594 8E220054 */ lw $v0, 0x54($s1) -/* DE8D08 80240598 C6200020 */ lwc1 $f0, 0x20($s1) -/* DE8D0C 8024059C 8C42000C */ lw $v0, 0xc($v0) -/* DE8D10 802405A0 E440000C */ swc1 $f0, 0xc($v0) -.L802405A4: -/* DE8D14 802405A4 8FBF0020 */ lw $ra, 0x20($sp) -/* DE8D18 802405A8 8FB1001C */ lw $s1, 0x1c($sp) -/* DE8D1C 802405AC 8FB00018 */ lw $s0, 0x18($sp) -/* DE8D20 802405B0 0000102D */ daddu $v0, $zero, $zero -/* DE8D24 802405B4 03E00008 */ jr $ra -/* DE8D28 802405B8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_15/func_802405BC_DE8770.s b/asm/nonmatchings/world/area_omo/omo_15/func_802405BC_DE8770.s deleted file mode 100644 index 6831e54147..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_15/func_802405BC_DE8770.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405BC_DE8D2C -/* DE8D2C 802405BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DE8D30 802405C0 AFB00010 */ sw $s0, 0x10($sp) -/* DE8D34 802405C4 0080802D */ daddu $s0, $a0, $zero -/* DE8D38 802405C8 AFBF0014 */ sw $ra, 0x14($sp) -/* DE8D3C 802405CC 8E02000C */ lw $v0, 0xc($s0) -/* DE8D40 802405D0 0C0B1EAF */ jal get_variable -/* DE8D44 802405D4 8C450000 */ lw $a1, ($v0) -/* DE8D48 802405D8 8E030084 */ lw $v1, 0x84($s0) -/* DE8D4C 802405DC 8FBF0014 */ lw $ra, 0x14($sp) -/* DE8D50 802405E0 8463004E */ lh $v1, 0x4e($v1) -/* DE8D54 802405E4 8FB00010 */ lw $s0, 0x10($sp) -/* DE8D58 802405E8 00621826 */ xor $v1, $v1, $v0 -/* DE8D5C 802405EC 2C630001 */ sltiu $v1, $v1, 1 -/* DE8D60 802405F0 00031040 */ sll $v0, $v1, 1 -/* DE8D64 802405F4 03E00008 */ jr $ra -/* DE8D68 802405F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_15/func_802405FC_DE8770.s b/asm/nonmatchings/world/area_omo/omo_15/func_802405FC_DE8770.s deleted file mode 100644 index caa1110d11..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_15/func_802405FC_DE8770.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405FC_DE8D6C -/* DE8D6C 802405FC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DE8D70 80240600 AFB20020 */ sw $s2, 0x20($sp) -/* DE8D74 80240604 0080902D */ daddu $s2, $a0, $zero -/* DE8D78 80240608 AFBF0024 */ sw $ra, 0x24($sp) -/* DE8D7C 8024060C AFB1001C */ sw $s1, 0x1c($sp) -/* DE8D80 80240610 AFB00018 */ sw $s0, 0x18($sp) -/* DE8D84 80240614 10A00035 */ beqz $a1, .L802406EC -/* DE8D88 80240618 8E51000C */ lw $s1, 0xc($s2) -/* DE8D8C 8024061C 0C00AB39 */ jal heap_malloc -/* DE8D90 80240620 24040058 */ addiu $a0, $zero, 0x58 -/* DE8D94 80240624 0040802D */ daddu $s0, $v0, $zero -/* DE8D98 80240628 AE500084 */ sw $s0, 0x84($s2) -/* DE8D9C 8024062C 8E250000 */ lw $a1, ($s1) -/* DE8DA0 80240630 26310004 */ addiu $s1, $s1, 4 -/* DE8DA4 80240634 0C0B1EAF */ jal get_variable -/* DE8DA8 80240638 0240202D */ daddu $a0, $s2, $zero -/* DE8DAC 8024063C AE020038 */ sw $v0, 0x38($s0) -/* DE8DB0 80240640 8E250000 */ lw $a1, ($s1) -/* DE8DB4 80240644 26310004 */ addiu $s1, $s1, 4 -/* DE8DB8 80240648 0C0B210B */ jal get_float_variable -/* DE8DBC 8024064C 0240202D */ daddu $a0, $s2, $zero -/* DE8DC0 80240650 E6000018 */ swc1 $f0, 0x18($s0) -/* DE8DC4 80240654 8E250000 */ lw $a1, ($s1) -/* DE8DC8 80240658 26310004 */ addiu $s1, $s1, 4 -/* DE8DCC 8024065C 0C0B210B */ jal get_float_variable -/* DE8DD0 80240660 0240202D */ daddu $a0, $s2, $zero -/* DE8DD4 80240664 E6000024 */ swc1 $f0, 0x24($s0) -/* DE8DD8 80240668 8E250000 */ lw $a1, ($s1) -/* DE8DDC 8024066C 26310004 */ addiu $s1, $s1, 4 -/* DE8DE0 80240670 0C0B210B */ jal get_float_variable -/* DE8DE4 80240674 0240202D */ daddu $a0, $s2, $zero -/* DE8DE8 80240678 E6000020 */ swc1 $f0, 0x20($s0) -/* DE8DEC 8024067C 8E250000 */ lw $a1, ($s1) -/* DE8DF0 80240680 0C0B210B */ jal get_float_variable -/* DE8DF4 80240684 0240202D */ daddu $a0, $s2, $zero -/* DE8DF8 80240688 3C013F80 */ lui $at, 0x3f80 -/* DE8DFC 8024068C 44811000 */ mtc1 $at, $f2 -/* DE8E00 80240690 E6000028 */ swc1 $f0, 0x28($s0) -/* DE8E04 80240694 AFA00014 */ sw $zero, 0x14($sp) -/* DE8E08 80240698 E7A20010 */ swc1 $f2, 0x10($sp) -/* DE8E0C 8024069C 8E050018 */ lw $a1, 0x18($s0) -/* DE8E10 802406A0 8E060024 */ lw $a2, 0x24($s0) -/* DE8E14 802406A4 8E070020 */ lw $a3, 0x20($s0) -/* DE8E18 802406A8 0C01C9AC */ jal func_800726B0 -/* DE8E1C 802406AC 24040001 */ addiu $a0, $zero, 1 -/* DE8E20 802406B0 AE020054 */ sw $v0, 0x54($s0) -/* DE8E24 802406B4 8C43000C */ lw $v1, 0xc($v0) -/* DE8E28 802406B8 9202003B */ lbu $v0, 0x3b($s0) -/* DE8E2C 802406BC A0620034 */ sb $v0, 0x34($v1) -/* DE8E30 802406C0 8E020054 */ lw $v0, 0x54($s0) -/* DE8E34 802406C4 8C42000C */ lw $v0, 0xc($v0) -/* DE8E38 802406C8 AC400020 */ sw $zero, 0x20($v0) -/* DE8E3C 802406CC 8E050018 */ lw $a1, 0x18($s0) -/* DE8E40 802406D0 8E060028 */ lw $a2, 0x28($s0) -/* DE8E44 802406D4 8E070020 */ lw $a3, 0x20($s0) -/* DE8E48 802406D8 0C044898 */ jal create_shadow_type -/* DE8E4C 802406DC 0000202D */ daddu $a0, $zero, $zero -/* DE8E50 802406E0 AE020040 */ sw $v0, 0x40($s0) -/* DE8E54 802406E4 2402010E */ addiu $v0, $zero, 0x10e -/* DE8E58 802406E8 A602004C */ sh $v0, 0x4c($s0) -.L802406EC: -/* DE8E5C 802406EC 8FBF0024 */ lw $ra, 0x24($sp) -/* DE8E60 802406F0 8FB20020 */ lw $s2, 0x20($sp) -/* DE8E64 802406F4 8FB1001C */ lw $s1, 0x1c($sp) -/* DE8E68 802406F8 8FB00018 */ lw $s0, 0x18($sp) -/* DE8E6C 802406FC 24020002 */ addiu $v0, $zero, 2 -/* DE8E70 80240700 03E00008 */ jr $ra -/* DE8E74 80240704 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_15/func_80240708_DE8770.s b/asm/nonmatchings/world/area_omo/omo_15/func_80240708_DE8770.s deleted file mode 100644 index cb02d5837a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_15/func_80240708_DE8770.s +++ /dev/null @@ -1,67 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240708_DE8E78 -/* DE8E78 80240708 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DE8E7C 8024070C AFBF0014 */ sw $ra, 0x14($sp) -/* DE8E80 80240710 AFB00010 */ sw $s0, 0x10($sp) -/* DE8E84 80240714 8C900084 */ lw $s0, 0x84($a0) -/* DE8E88 80240718 8602004C */ lh $v0, 0x4c($s0) -/* DE8E8C 8024071C 44826000 */ mtc1 $v0, $f12 -/* DE8E90 80240720 00000000 */ nop -/* DE8E94 80240724 0C00A8BB */ jal sin_deg -/* DE8E98 80240728 46806320 */ cvt.s.w $f12, $f12 -/* DE8E9C 8024072C 3C013F80 */ lui $at, 0x3f80 -/* DE8EA0 80240730 44811000 */ mtc1 $at, $f2 -/* DE8EA4 80240734 00000000 */ nop -/* DE8EA8 80240738 46020000 */ add.s $f0, $f0, $f2 -/* DE8EAC 8024073C 46000000 */ add.s $f0, $f0, $f0 -/* DE8EB0 80240740 C6020024 */ lwc1 $f2, 0x24($s0) -/* DE8EB4 80240744 8602004C */ lh $v0, 0x4c($s0) -/* DE8EB8 80240748 46001080 */ add.s $f2, $f2, $f0 -/* DE8EBC 8024074C 24420008 */ addiu $v0, $v0, 8 -/* DE8EC0 80240750 44826000 */ mtc1 $v0, $f12 -/* DE8EC4 80240754 00000000 */ nop -/* DE8EC8 80240758 46806320 */ cvt.s.w $f12, $f12 -/* DE8ECC 8024075C 0C00A6C9 */ jal clamp_angle -/* DE8ED0 80240760 E6020004 */ swc1 $f2, 4($s0) -/* DE8ED4 80240764 4600010D */ trunc.w.s $f4, $f0 -/* DE8ED8 80240768 44022000 */ mfc1 $v0, $f4 -/* DE8EDC 8024076C 00000000 */ nop -/* DE8EE0 80240770 A602004C */ sh $v0, 0x4c($s0) -/* DE8EE4 80240774 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* DE8EE8 80240778 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* DE8EEC 8024077C C44C0028 */ lwc1 $f12, 0x28($v0) -/* DE8EF0 80240780 C44E0030 */ lwc1 $f14, 0x30($v0) -/* DE8EF4 80240784 8E060018 */ lw $a2, 0x18($s0) -/* DE8EF8 80240788 0C00A7B5 */ jal dist2D -/* DE8EFC 8024078C 8E070020 */ lw $a3, 0x20($s0) -/* DE8F00 80240790 3C0141F0 */ lui $at, 0x41f0 -/* DE8F04 80240794 44811000 */ mtc1 $at, $f2 -/* DE8F08 80240798 00000000 */ nop -/* DE8F0C 8024079C 4602003E */ c.le.s $f0, $f2 -/* DE8F10 802407A0 00000000 */ nop -/* DE8F14 802407A4 45000002 */ bc1f .L802407B0 -/* DE8F18 802407A8 24020003 */ addiu $v0, $zero, 3 -/* DE8F1C 802407AC A602004E */ sh $v0, 0x4e($s0) -.L802407B0: -/* DE8F20 802407B0 8E020054 */ lw $v0, 0x54($s0) -/* DE8F24 802407B4 C6000018 */ lwc1 $f0, 0x18($s0) -/* DE8F28 802407B8 8C42000C */ lw $v0, 0xc($v0) -/* DE8F2C 802407BC E4400004 */ swc1 $f0, 4($v0) -/* DE8F30 802407C0 8E020054 */ lw $v0, 0x54($s0) -/* DE8F34 802407C4 C6000004 */ lwc1 $f0, 4($s0) -/* DE8F38 802407C8 8C42000C */ lw $v0, 0xc($v0) -/* DE8F3C 802407CC E4400008 */ swc1 $f0, 8($v0) -/* DE8F40 802407D0 8E020054 */ lw $v0, 0x54($s0) -/* DE8F44 802407D4 C6000020 */ lwc1 $f0, 0x20($s0) -/* DE8F48 802407D8 8C42000C */ lw $v0, 0xc($v0) -/* DE8F4C 802407DC E440000C */ swc1 $f0, 0xc($v0) -/* DE8F50 802407E0 8FBF0014 */ lw $ra, 0x14($sp) -/* DE8F54 802407E4 8FB00010 */ lw $s0, 0x10($sp) -/* DE8F58 802407E8 0000102D */ daddu $v0, $zero, $zero -/* DE8F5C 802407EC 03E00008 */ jr $ra -/* DE8F60 802407F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* DE8F64 802407F4 00000000 */ nop -/* DE8F68 802407F8 00000000 */ nop -/* DE8F6C 802407FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_16/func_8024001C_DEBED0.s b/asm/nonmatchings/world/area_omo/omo_16/func_8024001C_DEBED0.s deleted file mode 100644 index 162e98e558..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_16/func_8024001C_DEBED0.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_DEBEEC -/* DEBEEC 8024001C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DEBEF0 80240020 AFB10014 */ sw $s1, 0x14($sp) -/* DEBEF4 80240024 0080882D */ daddu $s1, $a0, $zero -/* DEBEF8 80240028 AFBF001C */ sw $ra, 0x1c($sp) -/* DEBEFC 8024002C AFB20018 */ sw $s2, 0x18($sp) -/* DEBF00 80240030 AFB00010 */ sw $s0, 0x10($sp) -/* DEBF04 80240034 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DEBF08 80240038 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DEBF0C 8024003C F7B40020 */ sdc1 $f20, 0x20($sp) -/* DEBF10 80240040 8E30000C */ lw $s0, 0xc($s1) -/* DEBF14 80240044 8E120000 */ lw $s2, ($s0) -/* DEBF18 80240048 26100004 */ addiu $s0, $s0, 4 -/* DEBF1C 8024004C 8E050000 */ lw $a1, ($s0) -/* DEBF20 80240050 0C0B210B */ jal get_float_variable -/* DEBF24 80240054 26100004 */ addiu $s0, $s0, 4 -/* DEBF28 80240058 8E050000 */ lw $a1, ($s0) -/* DEBF2C 8024005C 26100004 */ addiu $s0, $s0, 4 -/* DEBF30 80240060 0220202D */ daddu $a0, $s1, $zero -/* DEBF34 80240064 0C0B210B */ jal get_float_variable -/* DEBF38 80240068 46000606 */ mov.s $f24, $f0 -/* DEBF3C 8024006C 8E050000 */ lw $a1, ($s0) -/* DEBF40 80240070 26100004 */ addiu $s0, $s0, 4 -/* DEBF44 80240074 0220202D */ daddu $a0, $s1, $zero -/* DEBF48 80240078 0C0B210B */ jal get_float_variable -/* DEBF4C 8024007C 46000586 */ mov.s $f22, $f0 -/* DEBF50 80240080 0220202D */ daddu $a0, $s1, $zero -/* DEBF54 80240084 8E050000 */ lw $a1, ($s0) -/* DEBF58 80240088 0C0B210B */ jal get_float_variable -/* DEBF5C 8024008C 46000506 */ mov.s $f20, $f0 -/* DEBF60 80240090 4600C306 */ mov.s $f12, $f24 -/* DEBF64 80240094 4406A000 */ mfc1 $a2, $f20 -/* DEBF68 80240098 44070000 */ mfc1 $a3, $f0 -/* DEBF6C 8024009C 0C00A720 */ jal atan2 -/* DEBF70 802400A0 4600B386 */ mov.s $f14, $f22 -/* DEBF74 802400A4 0C00A6C9 */ jal clamp_angle -/* DEBF78 802400A8 46000306 */ mov.s $f12, $f0 -/* DEBF7C 802400AC 0220202D */ daddu $a0, $s1, $zero -/* DEBF80 802400B0 44060000 */ mfc1 $a2, $f0 -/* DEBF84 802400B4 0C0B2190 */ jal set_float_variable -/* DEBF88 802400B8 0240282D */ daddu $a1, $s2, $zero -/* DEBF8C 802400BC 8FBF001C */ lw $ra, 0x1c($sp) -/* DEBF90 802400C0 8FB20018 */ lw $s2, 0x18($sp) -/* DEBF94 802400C4 8FB10014 */ lw $s1, 0x14($sp) -/* DEBF98 802400C8 8FB00010 */ lw $s0, 0x10($sp) -/* DEBF9C 802400CC D7B80030 */ ldc1 $f24, 0x30($sp) -/* DEBFA0 802400D0 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DEBFA4 802400D4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DEBFA8 802400D8 24020002 */ addiu $v0, $zero, 2 -/* DEBFAC 802400DC 03E00008 */ jr $ra -/* DEBFB0 802400E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_16/func_802400E4_DEBED0.s b/asm/nonmatchings/world/area_omo/omo_16/func_802400E4_DEBED0.s deleted file mode 100644 index a82bea874c..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_16/func_802400E4_DEBED0.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E4_DEBFB4 -/* DEBFB4 802400E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DEBFB8 802400E8 AFB10014 */ sw $s1, 0x14($sp) -/* DEBFBC 802400EC 0080882D */ daddu $s1, $a0, $zero -/* DEBFC0 802400F0 AFBF0018 */ sw $ra, 0x18($sp) -/* DEBFC4 802400F4 AFB00010 */ sw $s0, 0x10($sp) -/* DEBFC8 802400F8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DEBFCC 802400FC 8E30000C */ lw $s0, 0xc($s1) -/* DEBFD0 80240100 8E050000 */ lw $a1, ($s0) -/* DEBFD4 80240104 0C0B210B */ jal get_float_variable -/* DEBFD8 80240108 26100004 */ addiu $s0, $s0, 4 -/* DEBFDC 8024010C 8E050000 */ lw $a1, ($s0) -/* DEBFE0 80240110 26100004 */ addiu $s0, $s0, 4 -/* DEBFE4 80240114 0220202D */ daddu $a0, $s1, $zero -/* DEBFE8 80240118 0C0B210B */ jal get_float_variable -/* DEBFEC 8024011C 46000506 */ mov.s $f20, $f0 -/* DEBFF0 80240120 4614003C */ c.lt.s $f0, $f20 -/* DEBFF4 80240124 00000000 */ nop -/* DEBFF8 80240128 45000004 */ bc1f .L8024013C -/* DEBFFC 8024012C 0220202D */ daddu $a0, $s1, $zero -/* DEC000 80240130 8E050000 */ lw $a1, ($s0) -/* DEC004 80240134 08090051 */ j .L80240144 -/* DEC008 80240138 24060001 */ addiu $a2, $zero, 1 -.L8024013C: -/* DEC00C 8024013C 8E050000 */ lw $a1, ($s0) -/* DEC010 80240140 0000302D */ daddu $a2, $zero, $zero -.L80240144: -/* DEC014 80240144 0C0B2026 */ jal set_variable -/* DEC018 80240148 00000000 */ nop -/* DEC01C 8024014C 8FBF0018 */ lw $ra, 0x18($sp) -/* DEC020 80240150 8FB10014 */ lw $s1, 0x14($sp) -/* DEC024 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* DEC028 80240158 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DEC02C 8024015C 24020002 */ addiu $v0, $zero, 2 -/* DEC030 80240160 03E00008 */ jr $ra -/* DEC034 80240164 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_16/func_80240168_DEBED0.s b/asm/nonmatchings/world/area_omo/omo_16/func_80240168_DEBED0.s deleted file mode 100644 index f62f03e18b..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_16/func_80240168_DEBED0.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240168_DEC038 -/* DEC038 80240168 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DEC03C 8024016C AFB20018 */ sw $s2, 0x18($sp) -/* DEC040 80240170 0080902D */ daddu $s2, $a0, $zero -/* DEC044 80240174 AFBF001C */ sw $ra, 0x1c($sp) -/* DEC048 80240178 AFB10014 */ sw $s1, 0x14($sp) -/* DEC04C 8024017C AFB00010 */ sw $s0, 0x10($sp) -/* DEC050 80240180 8E50000C */ lw $s0, 0xc($s2) -/* DEC054 80240184 8E050000 */ lw $a1, ($s0) -/* DEC058 80240188 0C0B1EAF */ jal get_variable -/* DEC05C 8024018C 26100004 */ addiu $s0, $s0, 4 -/* DEC060 80240190 8E050000 */ lw $a1, ($s0) -/* DEC064 80240194 26100004 */ addiu $s0, $s0, 4 -/* DEC068 80240198 0240202D */ daddu $a0, $s2, $zero -/* DEC06C 8024019C 0C0B1EAF */ jal get_variable -/* DEC070 802401A0 0040882D */ daddu $s1, $v0, $zero -/* DEC074 802401A4 0240202D */ daddu $a0, $s2, $zero -/* DEC078 802401A8 8E050000 */ lw $a1, ($s0) -/* DEC07C 802401AC 0C0B1EAF */ jal get_variable -/* DEC080 802401B0 0040802D */ daddu $s0, $v0, $zero -/* DEC084 802401B4 02020018 */ mult $s0, $v0 -/* DEC088 802401B8 24020002 */ addiu $v0, $zero, 2 -/* DEC08C 802401BC 8E430138 */ lw $v1, 0x138($s2) -/* DEC090 802401C0 00003012 */ mflo $a2 -/* DEC094 802401C4 02268821 */ addu $s1, $s1, $a2 -/* DEC098 802401C8 00518804 */ sllv $s1, $s1, $v0 -/* DEC09C 802401CC 00711821 */ addu $v1, $v1, $s1 -/* DEC0A0 802401D0 AE430138 */ sw $v1, 0x138($s2) -/* DEC0A4 802401D4 8FBF001C */ lw $ra, 0x1c($sp) -/* DEC0A8 802401D8 8FB20018 */ lw $s2, 0x18($sp) -/* DEC0AC 802401DC 8FB10014 */ lw $s1, 0x14($sp) -/* DEC0B0 802401E0 8FB00010 */ lw $s0, 0x10($sp) -/* DEC0B4 802401E4 03E00008 */ jr $ra -/* DEC0B8 802401E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_16/func_802401EC_DEBED0.s b/asm/nonmatchings/world/area_omo/omo_16/func_802401EC_DEBED0.s deleted file mode 100644 index 4c2a9ec315..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_16/func_802401EC_DEBED0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401EC_DEC0BC -/* DEC0BC 802401EC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DEC0C0 802401F0 AFB10014 */ sw $s1, 0x14($sp) -/* DEC0C4 802401F4 0080882D */ daddu $s1, $a0, $zero -/* DEC0C8 802401F8 AFBF0018 */ sw $ra, 0x18($sp) -/* DEC0CC 802401FC AFB00010 */ sw $s0, 0x10($sp) -/* DEC0D0 80240200 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DEC0D4 80240204 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DEC0D8 80240208 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DEC0DC 8024020C 8E30000C */ lw $s0, 0xc($s1) -/* DEC0E0 80240210 8E050000 */ lw $a1, ($s0) -/* DEC0E4 80240214 0C0B210B */ jal get_float_variable -/* DEC0E8 80240218 26100004 */ addiu $s0, $s0, 4 -/* DEC0EC 8024021C 8E050000 */ lw $a1, ($s0) -/* DEC0F0 80240220 26100004 */ addiu $s0, $s0, 4 -/* DEC0F4 80240224 0220202D */ daddu $a0, $s1, $zero -/* DEC0F8 80240228 0C0B210B */ jal get_float_variable -/* DEC0FC 8024022C 46000606 */ mov.s $f24, $f0 -/* DEC100 80240230 8E050000 */ lw $a1, ($s0) -/* DEC104 80240234 26100004 */ addiu $s0, $s0, 4 -/* DEC108 80240238 0220202D */ daddu $a0, $s1, $zero -/* DEC10C 8024023C 0C0B210B */ jal get_float_variable -/* DEC110 80240240 46000586 */ mov.s $f22, $f0 -/* DEC114 80240244 0220202D */ daddu $a0, $s1, $zero -/* DEC118 80240248 8E050000 */ lw $a1, ($s0) -/* DEC11C 8024024C 0C0B210B */ jal get_float_variable -/* DEC120 80240250 46000506 */ mov.s $f20, $f0 -/* DEC124 80240254 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* DEC128 80240258 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* DEC12C 8024025C E4580028 */ swc1 $f24, 0x28($v0) -/* DEC130 80240260 E456002C */ swc1 $f22, 0x2c($v0) -/* DEC134 80240264 E4540030 */ swc1 $f20, 0x30($v0) -/* DEC138 80240268 E4400080 */ swc1 $f0, 0x80($v0) -/* DEC13C 8024026C 8FBF0018 */ lw $ra, 0x18($sp) -/* DEC140 80240270 8FB10014 */ lw $s1, 0x14($sp) -/* DEC144 80240274 8FB00010 */ lw $s0, 0x10($sp) -/* DEC148 80240278 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DEC14C 8024027C D7B60028 */ ldc1 $f22, 0x28($sp) -/* DEC150 80240280 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DEC154 80240284 24020002 */ addiu $v0, $zero, 2 -/* DEC158 80240288 03E00008 */ jr $ra -/* DEC15C 8024028C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_16/func_80240290_DEBED0.s b/asm/nonmatchings/world/area_omo/omo_16/func_80240290_DEBED0.s deleted file mode 100644 index f29f06eddd..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_16/func_80240290_DEBED0.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240290_DEC160 -/* DEC160 80240290 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DEC164 80240294 AFB10014 */ sw $s1, 0x14($sp) -/* DEC168 80240298 0080882D */ daddu $s1, $a0, $zero -/* DEC16C 8024029C AFBF001C */ sw $ra, 0x1c($sp) -/* DEC170 802402A0 AFB20018 */ sw $s2, 0x18($sp) -/* DEC174 802402A4 AFB00010 */ sw $s0, 0x10($sp) -/* DEC178 802402A8 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* DEC17C 802402AC F7B80030 */ sdc1 $f24, 0x30($sp) -/* DEC180 802402B0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DEC184 802402B4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DEC188 802402B8 8E30000C */ lw $s0, 0xc($s1) -/* DEC18C 802402BC 8E050000 */ lw $a1, ($s0) -/* DEC190 802402C0 0C0B1EAF */ jal get_variable -/* DEC194 802402C4 26100004 */ addiu $s0, $s0, 4 -/* DEC198 802402C8 8E050000 */ lw $a1, ($s0) -/* DEC19C 802402CC 26100004 */ addiu $s0, $s0, 4 -/* DEC1A0 802402D0 0220202D */ daddu $a0, $s1, $zero -/* DEC1A4 802402D4 0C0B210B */ jal get_float_variable -/* DEC1A8 802402D8 0040902D */ daddu $s2, $v0, $zero -/* DEC1AC 802402DC 8E050000 */ lw $a1, ($s0) -/* DEC1B0 802402E0 26100004 */ addiu $s0, $s0, 4 -/* DEC1B4 802402E4 0220202D */ daddu $a0, $s1, $zero -/* DEC1B8 802402E8 0C0B210B */ jal get_float_variable -/* DEC1BC 802402EC 46000686 */ mov.s $f26, $f0 -/* DEC1C0 802402F0 8E050000 */ lw $a1, ($s0) -/* DEC1C4 802402F4 26100004 */ addiu $s0, $s0, 4 -/* DEC1C8 802402F8 0220202D */ daddu $a0, $s1, $zero -/* DEC1CC 802402FC 0C0B210B */ jal get_float_variable -/* DEC1D0 80240300 46000606 */ mov.s $f24, $f0 -/* DEC1D4 80240304 0220202D */ daddu $a0, $s1, $zero -/* DEC1D8 80240308 8E050000 */ lw $a1, ($s0) -/* DEC1DC 8024030C 0C0B210B */ jal get_float_variable -/* DEC1E0 80240310 46000506 */ mov.s $f20, $f0 -/* DEC1E4 80240314 0240202D */ daddu $a0, $s2, $zero -/* DEC1E8 80240318 0C00EAD2 */ jal get_npc_safe -/* DEC1EC 8024031C 46000586 */ mov.s $f22, $f0 -/* DEC1F0 80240320 0040202D */ daddu $a0, $v0, $zero -/* DEC1F4 80240324 E49A0038 */ swc1 $f26, 0x38($a0) -/* DEC1F8 80240328 4600D006 */ mov.s $f0, $f26 -/* DEC1FC 8024032C E498003C */ swc1 $f24, 0x3c($a0) -/* DEC200 80240330 4600C086 */ mov.s $f2, $f24 -/* DEC204 80240334 E4940040 */ swc1 $f20, 0x40($a0) -/* DEC208 80240338 4600A106 */ mov.s $f4, $f20 -/* DEC20C 8024033C 8C830000 */ lw $v1, ($a0) -/* DEC210 80240340 3C050001 */ lui $a1, 1 -/* DEC214 80240344 E496000C */ swc1 $f22, 0xc($a0) -/* DEC218 80240348 E480006C */ swc1 $f0, 0x6c($a0) -/* DEC21C 8024034C E4820070 */ swc1 $f2, 0x70($a0) -/* DEC220 80240350 E4840074 */ swc1 $f4, 0x74($a0) -/* DEC224 80240354 00651825 */ or $v1, $v1, $a1 -/* DEC228 80240358 AC830000 */ sw $v1, ($a0) -/* DEC22C 8024035C 8FBF001C */ lw $ra, 0x1c($sp) -/* DEC230 80240360 8FB20018 */ lw $s2, 0x18($sp) -/* DEC234 80240364 8FB10014 */ lw $s1, 0x14($sp) -/* DEC238 80240368 8FB00010 */ lw $s0, 0x10($sp) -/* DEC23C 8024036C D7BA0038 */ ldc1 $f26, 0x38($sp) -/* DEC240 80240370 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DEC244 80240374 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DEC248 80240378 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DEC24C 8024037C 24020002 */ addiu $v0, $zero, 2 -/* DEC250 80240380 03E00008 */ jr $ra -/* DEC254 80240384 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_omo/omo_16/func_80240388_DEBED0.s b/asm/nonmatchings/world/area_omo/omo_16/func_80240388_DEBED0.s deleted file mode 100644 index 9b76b2a61b..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_16/func_80240388_DEBED0.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240388_DEC258 -/* DEC258 80240388 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DEC25C 8024038C AFB20018 */ sw $s2, 0x18($sp) -/* DEC260 80240390 0080902D */ daddu $s2, $a0, $zero -/* DEC264 80240394 AFBF0028 */ sw $ra, 0x28($sp) -/* DEC268 80240398 AFB50024 */ sw $s5, 0x24($sp) -/* DEC26C 8024039C AFB40020 */ sw $s4, 0x20($sp) -/* DEC270 802403A0 AFB3001C */ sw $s3, 0x1c($sp) -/* DEC274 802403A4 AFB10014 */ sw $s1, 0x14($sp) -/* DEC278 802403A8 AFB00010 */ sw $s0, 0x10($sp) -/* DEC27C 802403AC F7B80040 */ sdc1 $f24, 0x40($sp) -/* DEC280 802403B0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* DEC284 802403B4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* DEC288 802403B8 8E50000C */ lw $s0, 0xc($s2) -/* DEC28C 802403BC 8E140000 */ lw $s4, ($s0) -/* DEC290 802403C0 26100004 */ addiu $s0, $s0, 4 -/* DEC294 802403C4 0C0B1EAF */ jal get_variable -/* DEC298 802403C8 0280282D */ daddu $a1, $s4, $zero -/* DEC29C 802403CC 0040982D */ daddu $s3, $v0, $zero -/* DEC2A0 802403D0 8E150000 */ lw $s5, ($s0) -/* DEC2A4 802403D4 26100004 */ addiu $s0, $s0, 4 -/* DEC2A8 802403D8 8E050000 */ lw $a1, ($s0) -/* DEC2AC 802403DC 26100004 */ addiu $s0, $s0, 4 -/* DEC2B0 802403E0 0C0B210B */ jal get_float_variable -/* DEC2B4 802403E4 0240202D */ daddu $a0, $s2, $zero -/* DEC2B8 802403E8 8E050000 */ lw $a1, ($s0) -/* DEC2BC 802403EC 26100004 */ addiu $s0, $s0, 4 -/* DEC2C0 802403F0 0240202D */ daddu $a0, $s2, $zero -/* DEC2C4 802403F4 0C0B210B */ jal get_float_variable -/* DEC2C8 802403F8 46000606 */ mov.s $f24, $f0 -/* DEC2CC 802403FC 8E050000 */ lw $a1, ($s0) -/* DEC2D0 80240400 26100004 */ addiu $s0, $s0, 4 -/* DEC2D4 80240404 0240202D */ daddu $a0, $s2, $zero -/* DEC2D8 80240408 0C0B1EAF */ jal get_variable -/* DEC2DC 8024040C 46000506 */ mov.s $f20, $f0 -/* DEC2E0 80240410 8E050000 */ lw $a1, ($s0) -/* DEC2E4 80240414 26100004 */ addiu $s0, $s0, 4 -/* DEC2E8 80240418 0240202D */ daddu $a0, $s2, $zero -/* DEC2EC 8024041C 0C0B1EAF */ jal get_variable -/* DEC2F0 80240420 0040882D */ daddu $s1, $v0, $zero -/* DEC2F4 80240424 0240202D */ daddu $a0, $s2, $zero -/* DEC2F8 80240428 8E050000 */ lw $a1, ($s0) -/* DEC2FC 8024042C 0C0B210B */ jal get_float_variable -/* DEC300 80240430 0040802D */ daddu $s0, $v0, $zero -/* DEC304 80240434 3C014334 */ lui $at, 0x4334 -/* DEC308 80240438 44811000 */ mtc1 $at, $f2 -/* DEC30C 8024043C 3C014049 */ lui $at, 0x4049 -/* DEC310 80240440 34210FD8 */ ori $at, $at, 0xfd8 -/* DEC314 80240444 44812000 */ mtc1 $at, $f4 -/* DEC318 80240448 46020003 */ div.s $f0, $f0, $f2 -/* DEC31C 8024044C 46040582 */ mul.s $f22, $f0, $f4 -/* DEC320 80240450 00000000 */ nop -/* DEC324 80240454 4618A501 */ sub.s $f20, $f20, $f24 -/* DEC328 80240458 3C013F00 */ lui $at, 0x3f00 -/* DEC32C 8024045C 44810000 */ mtc1 $at, $f0 -/* DEC330 80240460 00000000 */ nop -/* DEC334 80240464 4600A502 */ mul.s $f20, $f20, $f0 -/* DEC338 80240468 00000000 */ nop -/* DEC33C 8024046C 12000007 */ beqz $s0, .L8024048C -/* DEC340 80240470 0233102A */ slt $v0, $s1, $s3 -/* DEC344 80240474 10400005 */ beqz $v0, .L8024048C -/* DEC348 80240478 0240202D */ daddu $a0, $s2, $zero -/* DEC34C 8024047C 0220982D */ daddu $s3, $s1, $zero -/* DEC350 80240480 0280282D */ daddu $a1, $s4, $zero -/* DEC354 80240484 0C0B2026 */ jal set_variable -/* DEC358 80240488 0220302D */ daddu $a2, $s1, $zero -.L8024048C: -/* DEC35C 8024048C 3C014049 */ lui $at, 0x4049 -/* DEC360 80240490 34210FD8 */ ori $at, $at, 0xfd8 -/* DEC364 80240494 44810000 */ mtc1 $at, $f0 -/* DEC368 80240498 44936000 */ mtc1 $s3, $f12 -/* DEC36C 8024049C 00000000 */ nop -/* DEC370 802404A0 46806320 */ cvt.s.w $f12, $f12 -/* DEC374 802404A4 46006302 */ mul.s $f12, $f12, $f0 -/* DEC378 802404A8 00000000 */ nop -/* DEC37C 802404AC 44910000 */ mtc1 $s1, $f0 -/* DEC380 802404B0 00000000 */ nop -/* DEC384 802404B4 46800020 */ cvt.s.w $f0, $f0 -/* DEC388 802404B8 46006303 */ div.s $f12, $f12, $f0 -/* DEC38C 802404BC 0C00A874 */ jal cos_rad -/* DEC390 802404C0 46166300 */ add.s $f12, $f12, $f22 -/* DEC394 802404C4 4600A002 */ mul.s $f0, $f20, $f0 -/* DEC398 802404C8 00000000 */ nop -/* DEC39C 802404CC 4614C080 */ add.s $f2, $f24, $f20 -/* DEC3A0 802404D0 46001081 */ sub.s $f2, $f2, $f0 -/* DEC3A4 802404D4 0240202D */ daddu $a0, $s2, $zero -/* DEC3A8 802404D8 44061000 */ mfc1 $a2, $f2 -/* DEC3AC 802404DC 0C0B2190 */ jal set_float_variable -/* DEC3B0 802404E0 02A0282D */ daddu $a1, $s5, $zero -/* DEC3B4 802404E4 8FBF0028 */ lw $ra, 0x28($sp) -/* DEC3B8 802404E8 8FB50024 */ lw $s5, 0x24($sp) -/* DEC3BC 802404EC 8FB40020 */ lw $s4, 0x20($sp) -/* DEC3C0 802404F0 8FB3001C */ lw $s3, 0x1c($sp) -/* DEC3C4 802404F4 8FB20018 */ lw $s2, 0x18($sp) -/* DEC3C8 802404F8 8FB10014 */ lw $s1, 0x14($sp) -/* DEC3CC 802404FC 8FB00010 */ lw $s0, 0x10($sp) -/* DEC3D0 80240500 D7B80040 */ ldc1 $f24, 0x40($sp) -/* DEC3D4 80240504 D7B60038 */ ldc1 $f22, 0x38($sp) -/* DEC3D8 80240508 D7B40030 */ ldc1 $f20, 0x30($sp) -/* DEC3DC 8024050C 24020002 */ addiu $v0, $zero, 2 -/* DEC3E0 80240510 03E00008 */ jr $ra -/* DEC3E4 80240514 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_16/func_80240518_DEBED0.s b/asm/nonmatchings/world/area_omo/omo_16/func_80240518_DEBED0.s deleted file mode 100644 index 6a2b39fcb9..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_16/func_80240518_DEBED0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240518_DEC3E8 -/* DEC3E8 80240518 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* DEC3EC 8024051C 2463419C */ addiu $v1, $v1, %lo(gGameStatusPtr) -/* DEC3F0 80240520 8C620000 */ lw $v0, ($v1) -/* DEC3F4 80240524 AC800084 */ sw $zero, 0x84($a0) -/* DEC3F8 80240528 8C420010 */ lw $v0, 0x10($v0) -/* DEC3FC 8024052C 30428000 */ andi $v0, $v0, 0x8000 -/* DEC400 80240530 10400002 */ beqz $v0, .L8024053C -/* DEC404 80240534 24020001 */ addiu $v0, $zero, 1 -/* DEC408 80240538 AC820084 */ sw $v0, 0x84($a0) -.L8024053C: -/* DEC40C 8024053C 8C620000 */ lw $v0, ($v1) -/* DEC410 80240540 8C420010 */ lw $v0, 0x10($v0) -/* DEC414 80240544 30424000 */ andi $v0, $v0, 0x4000 -/* DEC418 80240548 10400002 */ beqz $v0, .L80240554 -/* DEC41C 8024054C 24020001 */ addiu $v0, $zero, 1 -/* DEC420 80240550 AC820084 */ sw $v0, 0x84($a0) -.L80240554: -/* DEC424 80240554 03E00008 */ jr $ra -/* DEC428 80240558 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_16/func_8024055C_DEBED0.s b/asm/nonmatchings/world/area_omo/omo_16/func_8024055C_DEBED0.s deleted file mode 100644 index cec356480a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_16/func_8024055C_DEBED0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024055C_DEC42C -/* DEC42C 8024055C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DEC430 80240560 AFB00010 */ sw $s0, 0x10($sp) -/* DEC434 80240564 0080802D */ daddu $s0, $a0, $zero -/* DEC438 80240568 3C05FD05 */ lui $a1, 0xfd05 -/* DEC43C 8024056C AFBF0014 */ sw $ra, 0x14($sp) -/* DEC440 80240570 0C0B210B */ jal get_float_variable -/* DEC444 80240574 34A50F8B */ ori $a1, $a1, 0xf8b -/* DEC448 80240578 46000106 */ mov.s $f4, $f0 -/* DEC44C 8024057C 3C0144FA */ lui $at, 0x44fa -/* DEC450 80240580 44811000 */ mtc1 $at, $f2 -/* DEC454 80240584 46002005 */ abs.s $f0, $f4 -/* DEC458 80240588 4602003C */ c.lt.s $f0, $f2 -/* DEC45C 8024058C 00000000 */ nop -/* DEC460 80240590 4500000D */ bc1f .L802405C8 -/* DEC464 80240594 AE000084 */ sw $zero, 0x84($s0) -/* DEC468 80240598 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* DEC46C 8024059C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* DEC470 802405A0 8C420010 */ lw $v0, 0x10($v0) -/* DEC474 802405A4 30428000 */ andi $v0, $v0, 0x8000 -/* DEC478 802405A8 10400007 */ beqz $v0, .L802405C8 -/* DEC47C 802405AC 24020001 */ addiu $v0, $zero, 1 -/* DEC480 802405B0 AE020084 */ sw $v0, 0x84($s0) -/* DEC484 802405B4 3C0144FA */ lui $at, 0x44fa -/* DEC488 802405B8 44811000 */ mtc1 $at, $f2 -/* DEC48C 802405BC 46002005 */ abs.s $f0, $f4 -/* DEC490 802405C0 4602003C */ c.lt.s $f0, $f2 -/* DEC494 802405C4 00000000 */ nop -.L802405C8: -/* DEC498 802405C8 45000008 */ bc1f .L802405EC -/* DEC49C 802405CC 00000000 */ nop -/* DEC4A0 802405D0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* DEC4A4 802405D4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* DEC4A8 802405D8 8C420010 */ lw $v0, 0x10($v0) -/* DEC4AC 802405DC 30424000 */ andi $v0, $v0, 0x4000 -/* DEC4B0 802405E0 10400002 */ beqz $v0, .L802405EC -/* DEC4B4 802405E4 24020001 */ addiu $v0, $zero, 1 -/* DEC4B8 802405E8 AE020084 */ sw $v0, 0x84($s0) -.L802405EC: -/* DEC4BC 802405EC 8FBF0014 */ lw $ra, 0x14($sp) -/* DEC4C0 802405F0 8FB00010 */ lw $s0, 0x10($sp) -/* DEC4C4 802405F4 24020002 */ addiu $v0, $zero, 2 -/* DEC4C8 802405F8 03E00008 */ jr $ra -/* DEC4CC 802405FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_8024001C_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_8024001C_DEEEA0.s deleted file mode 100644 index 6072dcf683..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_8024001C_DEEEA0.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_DEEEBC -/* DEEEBC 8024001C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DEEEC0 80240020 AFB10014 */ sw $s1, 0x14($sp) -/* DEEEC4 80240024 0080882D */ daddu $s1, $a0, $zero -/* DEEEC8 80240028 AFBF001C */ sw $ra, 0x1c($sp) -/* DEEECC 8024002C AFB20018 */ sw $s2, 0x18($sp) -/* DEEED0 80240030 AFB00010 */ sw $s0, 0x10($sp) -/* DEEED4 80240034 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DEEED8 80240038 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DEEEDC 8024003C F7B40020 */ sdc1 $f20, 0x20($sp) -/* DEEEE0 80240040 8E30000C */ lw $s0, 0xc($s1) -/* DEEEE4 80240044 8E120000 */ lw $s2, ($s0) -/* DEEEE8 80240048 26100004 */ addiu $s0, $s0, 4 -/* DEEEEC 8024004C 8E050000 */ lw $a1, ($s0) -/* DEEEF0 80240050 0C0B210B */ jal get_float_variable -/* DEEEF4 80240054 26100004 */ addiu $s0, $s0, 4 -/* DEEEF8 80240058 8E050000 */ lw $a1, ($s0) -/* DEEEFC 8024005C 26100004 */ addiu $s0, $s0, 4 -/* DEEF00 80240060 0220202D */ daddu $a0, $s1, $zero -/* DEEF04 80240064 0C0B210B */ jal get_float_variable -/* DEEF08 80240068 46000606 */ mov.s $f24, $f0 -/* DEEF0C 8024006C 8E050000 */ lw $a1, ($s0) -/* DEEF10 80240070 26100004 */ addiu $s0, $s0, 4 -/* DEEF14 80240074 0220202D */ daddu $a0, $s1, $zero -/* DEEF18 80240078 0C0B210B */ jal get_float_variable -/* DEEF1C 8024007C 46000586 */ mov.s $f22, $f0 -/* DEEF20 80240080 0220202D */ daddu $a0, $s1, $zero -/* DEEF24 80240084 8E050000 */ lw $a1, ($s0) -/* DEEF28 80240088 0C0B210B */ jal get_float_variable -/* DEEF2C 8024008C 46000506 */ mov.s $f20, $f0 -/* DEEF30 80240090 4600C306 */ mov.s $f12, $f24 -/* DEEF34 80240094 4406A000 */ mfc1 $a2, $f20 -/* DEEF38 80240098 44070000 */ mfc1 $a3, $f0 -/* DEEF3C 8024009C 0C00A720 */ jal atan2 -/* DEEF40 802400A0 4600B386 */ mov.s $f14, $f22 -/* DEEF44 802400A4 0C00A6C9 */ jal clamp_angle -/* DEEF48 802400A8 46000306 */ mov.s $f12, $f0 -/* DEEF4C 802400AC 0220202D */ daddu $a0, $s1, $zero -/* DEEF50 802400B0 44060000 */ mfc1 $a2, $f0 -/* DEEF54 802400B4 0C0B2190 */ jal set_float_variable -/* DEEF58 802400B8 0240282D */ daddu $a1, $s2, $zero -/* DEEF5C 802400BC 8FBF001C */ lw $ra, 0x1c($sp) -/* DEEF60 802400C0 8FB20018 */ lw $s2, 0x18($sp) -/* DEEF64 802400C4 8FB10014 */ lw $s1, 0x14($sp) -/* DEEF68 802400C8 8FB00010 */ lw $s0, 0x10($sp) -/* DEEF6C 802400CC D7B80030 */ ldc1 $f24, 0x30($sp) -/* DEEF70 802400D0 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DEEF74 802400D4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DEEF78 802400D8 24020002 */ addiu $v0, $zero, 2 -/* DEEF7C 802400DC 03E00008 */ jr $ra -/* DEEF80 802400E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_802400E4_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_802400E4_DEEEA0.s deleted file mode 100644 index e3285a0b24..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_802400E4_DEEEA0.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E4_DEEF84 -/* DEEF84 802400E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DEEF88 802400E8 AFB10014 */ sw $s1, 0x14($sp) -/* DEEF8C 802400EC 0080882D */ daddu $s1, $a0, $zero -/* DEEF90 802400F0 AFBF0018 */ sw $ra, 0x18($sp) -/* DEEF94 802400F4 AFB00010 */ sw $s0, 0x10($sp) -/* DEEF98 802400F8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DEEF9C 802400FC 8E30000C */ lw $s0, 0xc($s1) -/* DEEFA0 80240100 8E050000 */ lw $a1, ($s0) -/* DEEFA4 80240104 0C0B210B */ jal get_float_variable -/* DEEFA8 80240108 26100004 */ addiu $s0, $s0, 4 -/* DEEFAC 8024010C 8E050000 */ lw $a1, ($s0) -/* DEEFB0 80240110 26100004 */ addiu $s0, $s0, 4 -/* DEEFB4 80240114 0220202D */ daddu $a0, $s1, $zero -/* DEEFB8 80240118 0C0B210B */ jal get_float_variable -/* DEEFBC 8024011C 46000506 */ mov.s $f20, $f0 -/* DEEFC0 80240120 4614003C */ c.lt.s $f0, $f20 -/* DEEFC4 80240124 00000000 */ nop -/* DEEFC8 80240128 45000004 */ bc1f .L8024013C -/* DEEFCC 8024012C 0220202D */ daddu $a0, $s1, $zero -/* DEEFD0 80240130 8E050000 */ lw $a1, ($s0) -/* DEEFD4 80240134 08090051 */ j .L80240144 -/* DEEFD8 80240138 24060001 */ addiu $a2, $zero, 1 -.L8024013C: -/* DEEFDC 8024013C 8E050000 */ lw $a1, ($s0) -/* DEEFE0 80240140 0000302D */ daddu $a2, $zero, $zero -.L80240144: -/* DEEFE4 80240144 0C0B2026 */ jal set_variable -/* DEEFE8 80240148 00000000 */ nop -/* DEEFEC 8024014C 8FBF0018 */ lw $ra, 0x18($sp) -/* DEEFF0 80240150 8FB10014 */ lw $s1, 0x14($sp) -/* DEEFF4 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* DEEFF8 80240158 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DEEFFC 8024015C 24020002 */ addiu $v0, $zero, 2 -/* DEF000 80240160 03E00008 */ jr $ra -/* DEF004 80240164 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_80240168_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_80240168_DEEEA0.s deleted file mode 100644 index 399e9c2585..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_80240168_DEEEA0.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240168_DEF008 -/* DEF008 80240168 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DEF00C 8024016C AFB20018 */ sw $s2, 0x18($sp) -/* DEF010 80240170 0080902D */ daddu $s2, $a0, $zero -/* DEF014 80240174 AFBF001C */ sw $ra, 0x1c($sp) -/* DEF018 80240178 AFB10014 */ sw $s1, 0x14($sp) -/* DEF01C 8024017C AFB00010 */ sw $s0, 0x10($sp) -/* DEF020 80240180 8E50000C */ lw $s0, 0xc($s2) -/* DEF024 80240184 8E050000 */ lw $a1, ($s0) -/* DEF028 80240188 0C0B1EAF */ jal get_variable -/* DEF02C 8024018C 26100004 */ addiu $s0, $s0, 4 -/* DEF030 80240190 8E050000 */ lw $a1, ($s0) -/* DEF034 80240194 26100004 */ addiu $s0, $s0, 4 -/* DEF038 80240198 0240202D */ daddu $a0, $s2, $zero -/* DEF03C 8024019C 0C0B1EAF */ jal get_variable -/* DEF040 802401A0 0040882D */ daddu $s1, $v0, $zero -/* DEF044 802401A4 0240202D */ daddu $a0, $s2, $zero -/* DEF048 802401A8 8E050000 */ lw $a1, ($s0) -/* DEF04C 802401AC 0C0B1EAF */ jal get_variable -/* DEF050 802401B0 0040802D */ daddu $s0, $v0, $zero -/* DEF054 802401B4 02020018 */ mult $s0, $v0 -/* DEF058 802401B8 24020002 */ addiu $v0, $zero, 2 -/* DEF05C 802401BC 8E430138 */ lw $v1, 0x138($s2) -/* DEF060 802401C0 00003012 */ mflo $a2 -/* DEF064 802401C4 02268821 */ addu $s1, $s1, $a2 -/* DEF068 802401C8 00518804 */ sllv $s1, $s1, $v0 -/* DEF06C 802401CC 00711821 */ addu $v1, $v1, $s1 -/* DEF070 802401D0 AE430138 */ sw $v1, 0x138($s2) -/* DEF074 802401D4 8FBF001C */ lw $ra, 0x1c($sp) -/* DEF078 802401D8 8FB20018 */ lw $s2, 0x18($sp) -/* DEF07C 802401DC 8FB10014 */ lw $s1, 0x14($sp) -/* DEF080 802401E0 8FB00010 */ lw $s0, 0x10($sp) -/* DEF084 802401E4 03E00008 */ jr $ra -/* DEF088 802401E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_802401EC_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_802401EC_DEEEA0.s deleted file mode 100644 index 83a0e44d7d..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_802401EC_DEEEA0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401EC_DEF08C -/* DEF08C 802401EC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DEF090 802401F0 AFB10014 */ sw $s1, 0x14($sp) -/* DEF094 802401F4 0080882D */ daddu $s1, $a0, $zero -/* DEF098 802401F8 AFBF0018 */ sw $ra, 0x18($sp) -/* DEF09C 802401FC AFB00010 */ sw $s0, 0x10($sp) -/* DEF0A0 80240200 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DEF0A4 80240204 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DEF0A8 80240208 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DEF0AC 8024020C 8E30000C */ lw $s0, 0xc($s1) -/* DEF0B0 80240210 8E050000 */ lw $a1, ($s0) -/* DEF0B4 80240214 0C0B210B */ jal get_float_variable -/* DEF0B8 80240218 26100004 */ addiu $s0, $s0, 4 -/* DEF0BC 8024021C 8E050000 */ lw $a1, ($s0) -/* DEF0C0 80240220 26100004 */ addiu $s0, $s0, 4 -/* DEF0C4 80240224 0220202D */ daddu $a0, $s1, $zero -/* DEF0C8 80240228 0C0B210B */ jal get_float_variable -/* DEF0CC 8024022C 46000606 */ mov.s $f24, $f0 -/* DEF0D0 80240230 8E050000 */ lw $a1, ($s0) -/* DEF0D4 80240234 26100004 */ addiu $s0, $s0, 4 -/* DEF0D8 80240238 0220202D */ daddu $a0, $s1, $zero -/* DEF0DC 8024023C 0C0B210B */ jal get_float_variable -/* DEF0E0 80240240 46000586 */ mov.s $f22, $f0 -/* DEF0E4 80240244 0220202D */ daddu $a0, $s1, $zero -/* DEF0E8 80240248 8E050000 */ lw $a1, ($s0) -/* DEF0EC 8024024C 0C0B210B */ jal get_float_variable -/* DEF0F0 80240250 46000506 */ mov.s $f20, $f0 -/* DEF0F4 80240254 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* DEF0F8 80240258 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* DEF0FC 8024025C E4580028 */ swc1 $f24, 0x28($v0) -/* DEF100 80240260 E456002C */ swc1 $f22, 0x2c($v0) -/* DEF104 80240264 E4540030 */ swc1 $f20, 0x30($v0) -/* DEF108 80240268 E4400080 */ swc1 $f0, 0x80($v0) -/* DEF10C 8024026C 8FBF0018 */ lw $ra, 0x18($sp) -/* DEF110 80240270 8FB10014 */ lw $s1, 0x14($sp) -/* DEF114 80240274 8FB00010 */ lw $s0, 0x10($sp) -/* DEF118 80240278 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DEF11C 8024027C D7B60028 */ ldc1 $f22, 0x28($sp) -/* DEF120 80240280 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DEF124 80240284 24020002 */ addiu $v0, $zero, 2 -/* DEF128 80240288 03E00008 */ jr $ra -/* DEF12C 8024028C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_80240290_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_80240290_DEEEA0.s deleted file mode 100644 index ae71e380ae..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_80240290_DEEEA0.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240290_DEF130 -/* DEF130 80240290 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DEF134 80240294 AFB10014 */ sw $s1, 0x14($sp) -/* DEF138 80240298 0080882D */ daddu $s1, $a0, $zero -/* DEF13C 8024029C AFBF001C */ sw $ra, 0x1c($sp) -/* DEF140 802402A0 AFB20018 */ sw $s2, 0x18($sp) -/* DEF144 802402A4 AFB00010 */ sw $s0, 0x10($sp) -/* DEF148 802402A8 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* DEF14C 802402AC F7B80030 */ sdc1 $f24, 0x30($sp) -/* DEF150 802402B0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DEF154 802402B4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DEF158 802402B8 8E30000C */ lw $s0, 0xc($s1) -/* DEF15C 802402BC 8E050000 */ lw $a1, ($s0) -/* DEF160 802402C0 0C0B1EAF */ jal get_variable -/* DEF164 802402C4 26100004 */ addiu $s0, $s0, 4 -/* DEF168 802402C8 8E050000 */ lw $a1, ($s0) -/* DEF16C 802402CC 26100004 */ addiu $s0, $s0, 4 -/* DEF170 802402D0 0220202D */ daddu $a0, $s1, $zero -/* DEF174 802402D4 0C0B210B */ jal get_float_variable -/* DEF178 802402D8 0040902D */ daddu $s2, $v0, $zero -/* DEF17C 802402DC 8E050000 */ lw $a1, ($s0) -/* DEF180 802402E0 26100004 */ addiu $s0, $s0, 4 -/* DEF184 802402E4 0220202D */ daddu $a0, $s1, $zero -/* DEF188 802402E8 0C0B210B */ jal get_float_variable -/* DEF18C 802402EC 46000686 */ mov.s $f26, $f0 -/* DEF190 802402F0 8E050000 */ lw $a1, ($s0) -/* DEF194 802402F4 26100004 */ addiu $s0, $s0, 4 -/* DEF198 802402F8 0220202D */ daddu $a0, $s1, $zero -/* DEF19C 802402FC 0C0B210B */ jal get_float_variable -/* DEF1A0 80240300 46000606 */ mov.s $f24, $f0 -/* DEF1A4 80240304 0220202D */ daddu $a0, $s1, $zero -/* DEF1A8 80240308 8E050000 */ lw $a1, ($s0) -/* DEF1AC 8024030C 0C0B210B */ jal get_float_variable -/* DEF1B0 80240310 46000506 */ mov.s $f20, $f0 -/* DEF1B4 80240314 0240202D */ daddu $a0, $s2, $zero -/* DEF1B8 80240318 0C00EAD2 */ jal get_npc_safe -/* DEF1BC 8024031C 46000586 */ mov.s $f22, $f0 -/* DEF1C0 80240320 0040202D */ daddu $a0, $v0, $zero -/* DEF1C4 80240324 E49A0038 */ swc1 $f26, 0x38($a0) -/* DEF1C8 80240328 4600D006 */ mov.s $f0, $f26 -/* DEF1CC 8024032C E498003C */ swc1 $f24, 0x3c($a0) -/* DEF1D0 80240330 4600C086 */ mov.s $f2, $f24 -/* DEF1D4 80240334 E4940040 */ swc1 $f20, 0x40($a0) -/* DEF1D8 80240338 4600A106 */ mov.s $f4, $f20 -/* DEF1DC 8024033C 8C830000 */ lw $v1, ($a0) -/* DEF1E0 80240340 3C050001 */ lui $a1, 1 -/* DEF1E4 80240344 E496000C */ swc1 $f22, 0xc($a0) -/* DEF1E8 80240348 E480006C */ swc1 $f0, 0x6c($a0) -/* DEF1EC 8024034C E4820070 */ swc1 $f2, 0x70($a0) -/* DEF1F0 80240350 E4840074 */ swc1 $f4, 0x74($a0) -/* DEF1F4 80240354 00651825 */ or $v1, $v1, $a1 -/* DEF1F8 80240358 AC830000 */ sw $v1, ($a0) -/* DEF1FC 8024035C 8FBF001C */ lw $ra, 0x1c($sp) -/* DEF200 80240360 8FB20018 */ lw $s2, 0x18($sp) -/* DEF204 80240364 8FB10014 */ lw $s1, 0x14($sp) -/* DEF208 80240368 8FB00010 */ lw $s0, 0x10($sp) -/* DEF20C 8024036C D7BA0038 */ ldc1 $f26, 0x38($sp) -/* DEF210 80240370 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DEF214 80240374 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DEF218 80240378 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DEF21C 8024037C 24020002 */ addiu $v0, $zero, 2 -/* DEF220 80240380 03E00008 */ jr $ra -/* DEF224 80240384 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_80240388_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_80240388_DEEEA0.s deleted file mode 100644 index 0cc9f85d87..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_80240388_DEEEA0.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240388_DEF228 -/* DEF228 80240388 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DEF22C 8024038C AFB20018 */ sw $s2, 0x18($sp) -/* DEF230 80240390 0080902D */ daddu $s2, $a0, $zero -/* DEF234 80240394 AFBF0028 */ sw $ra, 0x28($sp) -/* DEF238 80240398 AFB50024 */ sw $s5, 0x24($sp) -/* DEF23C 8024039C AFB40020 */ sw $s4, 0x20($sp) -/* DEF240 802403A0 AFB3001C */ sw $s3, 0x1c($sp) -/* DEF244 802403A4 AFB10014 */ sw $s1, 0x14($sp) -/* DEF248 802403A8 AFB00010 */ sw $s0, 0x10($sp) -/* DEF24C 802403AC F7B80040 */ sdc1 $f24, 0x40($sp) -/* DEF250 802403B0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* DEF254 802403B4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* DEF258 802403B8 8E50000C */ lw $s0, 0xc($s2) -/* DEF25C 802403BC 8E140000 */ lw $s4, ($s0) -/* DEF260 802403C0 26100004 */ addiu $s0, $s0, 4 -/* DEF264 802403C4 0C0B1EAF */ jal get_variable -/* DEF268 802403C8 0280282D */ daddu $a1, $s4, $zero -/* DEF26C 802403CC 0040982D */ daddu $s3, $v0, $zero -/* DEF270 802403D0 8E150000 */ lw $s5, ($s0) -/* DEF274 802403D4 26100004 */ addiu $s0, $s0, 4 -/* DEF278 802403D8 8E050000 */ lw $a1, ($s0) -/* DEF27C 802403DC 26100004 */ addiu $s0, $s0, 4 -/* DEF280 802403E0 0C0B210B */ jal get_float_variable -/* DEF284 802403E4 0240202D */ daddu $a0, $s2, $zero -/* DEF288 802403E8 8E050000 */ lw $a1, ($s0) -/* DEF28C 802403EC 26100004 */ addiu $s0, $s0, 4 -/* DEF290 802403F0 0240202D */ daddu $a0, $s2, $zero -/* DEF294 802403F4 0C0B210B */ jal get_float_variable -/* DEF298 802403F8 46000606 */ mov.s $f24, $f0 -/* DEF29C 802403FC 8E050000 */ lw $a1, ($s0) -/* DEF2A0 80240400 26100004 */ addiu $s0, $s0, 4 -/* DEF2A4 80240404 0240202D */ daddu $a0, $s2, $zero -/* DEF2A8 80240408 0C0B1EAF */ jal get_variable -/* DEF2AC 8024040C 46000506 */ mov.s $f20, $f0 -/* DEF2B0 80240410 8E050000 */ lw $a1, ($s0) -/* DEF2B4 80240414 26100004 */ addiu $s0, $s0, 4 -/* DEF2B8 80240418 0240202D */ daddu $a0, $s2, $zero -/* DEF2BC 8024041C 0C0B1EAF */ jal get_variable -/* DEF2C0 80240420 0040882D */ daddu $s1, $v0, $zero -/* DEF2C4 80240424 0240202D */ daddu $a0, $s2, $zero -/* DEF2C8 80240428 8E050000 */ lw $a1, ($s0) -/* DEF2CC 8024042C 0C0B210B */ jal get_float_variable -/* DEF2D0 80240430 0040802D */ daddu $s0, $v0, $zero -/* DEF2D4 80240434 3C014334 */ lui $at, 0x4334 -/* DEF2D8 80240438 44811000 */ mtc1 $at, $f2 -/* DEF2DC 8024043C 3C014049 */ lui $at, 0x4049 -/* DEF2E0 80240440 34210FD8 */ ori $at, $at, 0xfd8 -/* DEF2E4 80240444 44812000 */ mtc1 $at, $f4 -/* DEF2E8 80240448 46020003 */ div.s $f0, $f0, $f2 -/* DEF2EC 8024044C 46040582 */ mul.s $f22, $f0, $f4 -/* DEF2F0 80240450 00000000 */ nop -/* DEF2F4 80240454 4618A501 */ sub.s $f20, $f20, $f24 -/* DEF2F8 80240458 3C013F00 */ lui $at, 0x3f00 -/* DEF2FC 8024045C 44810000 */ mtc1 $at, $f0 -/* DEF300 80240460 00000000 */ nop -/* DEF304 80240464 4600A502 */ mul.s $f20, $f20, $f0 -/* DEF308 80240468 00000000 */ nop -/* DEF30C 8024046C 12000007 */ beqz $s0, .L8024048C -/* DEF310 80240470 0233102A */ slt $v0, $s1, $s3 -/* DEF314 80240474 10400005 */ beqz $v0, .L8024048C -/* DEF318 80240478 0240202D */ daddu $a0, $s2, $zero -/* DEF31C 8024047C 0220982D */ daddu $s3, $s1, $zero -/* DEF320 80240480 0280282D */ daddu $a1, $s4, $zero -/* DEF324 80240484 0C0B2026 */ jal set_variable -/* DEF328 80240488 0220302D */ daddu $a2, $s1, $zero -.L8024048C: -/* DEF32C 8024048C 3C014049 */ lui $at, 0x4049 -/* DEF330 80240490 34210FD8 */ ori $at, $at, 0xfd8 -/* DEF334 80240494 44810000 */ mtc1 $at, $f0 -/* DEF338 80240498 44936000 */ mtc1 $s3, $f12 -/* DEF33C 8024049C 00000000 */ nop -/* DEF340 802404A0 46806320 */ cvt.s.w $f12, $f12 -/* DEF344 802404A4 46006302 */ mul.s $f12, $f12, $f0 -/* DEF348 802404A8 00000000 */ nop -/* DEF34C 802404AC 44910000 */ mtc1 $s1, $f0 -/* DEF350 802404B0 00000000 */ nop -/* DEF354 802404B4 46800020 */ cvt.s.w $f0, $f0 -/* DEF358 802404B8 46006303 */ div.s $f12, $f12, $f0 -/* DEF35C 802404BC 0C00A874 */ jal cos_rad -/* DEF360 802404C0 46166300 */ add.s $f12, $f12, $f22 -/* DEF364 802404C4 4600A002 */ mul.s $f0, $f20, $f0 -/* DEF368 802404C8 00000000 */ nop -/* DEF36C 802404CC 4614C080 */ add.s $f2, $f24, $f20 -/* DEF370 802404D0 46001081 */ sub.s $f2, $f2, $f0 -/* DEF374 802404D4 0240202D */ daddu $a0, $s2, $zero -/* DEF378 802404D8 44061000 */ mfc1 $a2, $f2 -/* DEF37C 802404DC 0C0B2190 */ jal set_float_variable -/* DEF380 802404E0 02A0282D */ daddu $a1, $s5, $zero -/* DEF384 802404E4 8FBF0028 */ lw $ra, 0x28($sp) -/* DEF388 802404E8 8FB50024 */ lw $s5, 0x24($sp) -/* DEF38C 802404EC 8FB40020 */ lw $s4, 0x20($sp) -/* DEF390 802404F0 8FB3001C */ lw $s3, 0x1c($sp) -/* DEF394 802404F4 8FB20018 */ lw $s2, 0x18($sp) -/* DEF398 802404F8 8FB10014 */ lw $s1, 0x14($sp) -/* DEF39C 802404FC 8FB00010 */ lw $s0, 0x10($sp) -/* DEF3A0 80240500 D7B80040 */ ldc1 $f24, 0x40($sp) -/* DEF3A4 80240504 D7B60038 */ ldc1 $f22, 0x38($sp) -/* DEF3A8 80240508 D7B40030 */ ldc1 $f20, 0x30($sp) -/* DEF3AC 8024050C 24020002 */ addiu $v0, $zero, 2 -/* DEF3B0 80240510 03E00008 */ jr $ra -/* DEF3B4 80240514 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_80240518_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_80240518_DEEEA0.s deleted file mode 100644 index d2f2b60bc7..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_80240518_DEEEA0.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240518_DEF3B8 -/* DEF3B8 80240518 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* DEF3BC 8024051C 2463419C */ addiu $v1, $v1, %lo(gGameStatusPtr) -/* DEF3C0 80240520 8C620000 */ lw $v0, ($v1) -/* DEF3C4 80240524 AC800084 */ sw $zero, 0x84($a0) -/* DEF3C8 80240528 8C420010 */ lw $v0, 0x10($v0) -/* DEF3CC 8024052C 30428000 */ andi $v0, $v0, 0x8000 -/* DEF3D0 80240530 10400002 */ beqz $v0, .L8024053C -/* DEF3D4 80240534 24020001 */ addiu $v0, $zero, 1 -/* DEF3D8 80240538 AC820084 */ sw $v0, 0x84($a0) -.L8024053C: -/* DEF3DC 8024053C 8C620000 */ lw $v0, ($v1) -/* DEF3E0 80240540 8C420010 */ lw $v0, 0x10($v0) -/* DEF3E4 80240544 30424000 */ andi $v0, $v0, 0x4000 -/* DEF3E8 80240548 10400002 */ beqz $v0, .L80240554 -/* DEF3EC 8024054C 24020001 */ addiu $v0, $zero, 1 -/* DEF3F0 80240550 AC820084 */ sw $v0, 0x84($a0) -.L80240554: -/* DEF3F4 80240554 03E00008 */ jr $ra -/* DEF3F8 80240558 24020002 */ addiu $v0, $zero, 2 -/* DEF3FC 8024055C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_80240560_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_80240560_DEEEA0.s deleted file mode 100644 index ebb44522bd..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_80240560_DEEEA0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240560_DEF400 -/* DEF400 80240560 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DEF404 80240564 AFB10014 */ sw $s1, 0x14($sp) -/* DEF408 80240568 0080882D */ daddu $s1, $a0, $zero -/* DEF40C 8024056C AFBF0018 */ sw $ra, 0x18($sp) -/* DEF410 80240570 AFB00010 */ sw $s0, 0x10($sp) -/* DEF414 80240574 8E300148 */ lw $s0, 0x148($s1) -/* DEF418 80240578 0C00EABB */ jal get_npc_unsafe -/* DEF41C 8024057C 86040008 */ lh $a0, 8($s0) -/* DEF420 80240580 C4400018 */ lwc1 $f0, 0x18($v0) -/* DEF424 80240584 3C018024 */ lui $at, 0x8024 -/* DEF428 80240588 D4227610 */ ldc1 $f2, 0x7610($at) -/* DEF42C 8024058C 46000021 */ cvt.d.s $f0, $f0 -/* DEF430 80240590 46220002 */ mul.d $f0, $f0, $f2 -/* DEF434 80240594 00000000 */ nop -/* DEF438 80240598 46200020 */ cvt.s.d $f0, $f0 -/* DEF43C 8024059C E4400018 */ swc1 $f0, 0x18($v0) -/* DEF440 802405A0 8E0300CC */ lw $v1, 0xcc($s0) -/* DEF444 802405A4 8C640030 */ lw $a0, 0x30($v1) -/* DEF448 802405A8 24030005 */ addiu $v1, $zero, 5 -/* DEF44C 802405AC A443008E */ sh $v1, 0x8e($v0) -/* DEF450 802405B0 AC440028 */ sw $a0, 0x28($v0) -/* DEF454 802405B4 2402000F */ addiu $v0, $zero, 0xf -/* DEF458 802405B8 AE220070 */ sw $v0, 0x70($s1) -/* DEF45C 802405BC 8FBF0018 */ lw $ra, 0x18($sp) -/* DEF460 802405C0 8FB10014 */ lw $s1, 0x14($sp) -/* DEF464 802405C4 8FB00010 */ lw $s0, 0x10($sp) -/* DEF468 802405C8 03E00008 */ jr $ra -/* DEF46C 802405CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_802405D0_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_802405D0_DEEEA0.s deleted file mode 100644 index 00e73dc128..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_802405D0_DEEEA0.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405D0_DEF470 -/* DEF470 802405D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DEF474 802405D4 AFB20028 */ sw $s2, 0x28($sp) -/* DEF478 802405D8 0080902D */ daddu $s2, $a0, $zero -/* DEF47C 802405DC AFBF002C */ sw $ra, 0x2c($sp) -/* DEF480 802405E0 AFB10024 */ sw $s1, 0x24($sp) -/* DEF484 802405E4 AFB00020 */ sw $s0, 0x20($sp) -/* DEF488 802405E8 8E510148 */ lw $s1, 0x148($s2) -/* DEF48C 802405EC 0C00EABB */ jal get_npc_unsafe -/* DEF490 802405F0 86240008 */ lh $a0, 8($s1) -/* DEF494 802405F4 0040802D */ daddu $s0, $v0, $zero -/* DEF498 802405F8 0200202D */ daddu $a0, $s0, $zero -/* DEF49C 802405FC C600000C */ lwc1 $f0, 0xc($s0) -/* DEF4A0 80240600 27A60018 */ addiu $a2, $sp, 0x18 -/* DEF4A4 80240604 E7A00018 */ swc1 $f0, 0x18($sp) -/* DEF4A8 80240608 AFA00010 */ sw $zero, 0x10($sp) -/* DEF4AC 8024060C AFA00014 */ sw $zero, 0x14($sp) -/* DEF4B0 80240610 8E050018 */ lw $a1, 0x18($s0) -/* DEF4B4 80240614 0C0129E1 */ jal func_8004A784 -/* DEF4B8 80240618 0000382D */ daddu $a3, $zero, $zero -/* DEF4BC 8024061C 14400005 */ bnez $v0, .L80240634 -/* DEF4C0 80240620 00000000 */ nop -/* DEF4C4 80240624 8E050018 */ lw $a1, 0x18($s0) -/* DEF4C8 80240628 8E06000C */ lw $a2, 0xc($s0) -/* DEF4CC 8024062C 0C00EA95 */ jal npc_move_heading -/* DEF4D0 80240630 0200202D */ daddu $a0, $s0, $zero -.L80240634: -/* DEF4D4 80240634 9602008E */ lhu $v0, 0x8e($s0) -/* DEF4D8 80240638 2442FFFF */ addiu $v0, $v0, -1 -/* DEF4DC 8024063C A602008E */ sh $v0, 0x8e($s0) -/* DEF4E0 80240640 00021400 */ sll $v0, $v0, 0x10 -/* DEF4E4 80240644 14400010 */ bnez $v0, .L80240688 -/* DEF4E8 80240648 00000000 */ nop -/* DEF4EC 8024064C C6000018 */ lwc1 $f0, 0x18($s0) -/* DEF4F0 80240650 3C018024 */ lui $at, 0x8024 -/* DEF4F4 80240654 D4227618 */ ldc1 $f2, 0x7618($at) -/* DEF4F8 80240658 46000021 */ cvt.d.s $f0, $f0 -/* DEF4FC 8024065C 46220002 */ mul.d $f0, $f0, $f2 -/* DEF500 80240660 00000000 */ nop -/* DEF504 80240664 46200020 */ cvt.s.d $f0, $f0 -/* DEF508 80240668 E6000018 */ swc1 $f0, 0x18($s0) -/* DEF50C 8024066C 8E2200CC */ lw $v0, 0xcc($s1) -/* DEF510 80240670 8C43002C */ lw $v1, 0x2c($v0) -/* DEF514 80240674 2402000A */ addiu $v0, $zero, 0xa -/* DEF518 80240678 A602008E */ sh $v0, 0x8e($s0) -/* DEF51C 8024067C 24020010 */ addiu $v0, $zero, 0x10 -/* DEF520 80240680 AE030028 */ sw $v1, 0x28($s0) -/* DEF524 80240684 AE420070 */ sw $v0, 0x70($s2) -.L80240688: -/* DEF528 80240688 8FBF002C */ lw $ra, 0x2c($sp) -/* DEF52C 8024068C 8FB20028 */ lw $s2, 0x28($sp) -/* DEF530 80240690 8FB10024 */ lw $s1, 0x24($sp) -/* DEF534 80240694 8FB00020 */ lw $s0, 0x20($sp) -/* DEF538 80240698 03E00008 */ jr $ra -/* DEF53C 8024069C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_802406A0_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_802406A0_DEEEA0.s deleted file mode 100644 index f58e98c8cc..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_802406A0_DEEEA0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A0_DEF540 -/* DEF540 802406A0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DEF544 802406A4 AFB10024 */ sw $s1, 0x24($sp) -/* DEF548 802406A8 0080882D */ daddu $s1, $a0, $zero -/* DEF54C 802406AC AFBF0028 */ sw $ra, 0x28($sp) -/* DEF550 802406B0 AFB00020 */ sw $s0, 0x20($sp) -/* DEF554 802406B4 8E220148 */ lw $v0, 0x148($s1) -/* DEF558 802406B8 0C00EABB */ jal get_npc_unsafe -/* DEF55C 802406BC 84440008 */ lh $a0, 8($v0) -/* DEF560 802406C0 0040802D */ daddu $s0, $v0, $zero -/* DEF564 802406C4 0200202D */ daddu $a0, $s0, $zero -/* DEF568 802406C8 C600000C */ lwc1 $f0, 0xc($s0) -/* DEF56C 802406CC 27A60018 */ addiu $a2, $sp, 0x18 -/* DEF570 802406D0 E7A00018 */ swc1 $f0, 0x18($sp) -/* DEF574 802406D4 AFA00010 */ sw $zero, 0x10($sp) -/* DEF578 802406D8 AFA00014 */ sw $zero, 0x14($sp) -/* DEF57C 802406DC 8E050018 */ lw $a1, 0x18($s0) -/* DEF580 802406E0 0C0129E1 */ jal func_8004A784 -/* DEF584 802406E4 0000382D */ daddu $a3, $zero, $zero -/* DEF588 802406E8 14400005 */ bnez $v0, .L80240700 -/* DEF58C 802406EC 00000000 */ nop -/* DEF590 802406F0 8E050018 */ lw $a1, 0x18($s0) -/* DEF594 802406F4 8E06000C */ lw $a2, 0xc($s0) -/* DEF598 802406F8 0C00EA95 */ jal npc_move_heading -/* DEF59C 802406FC 0200202D */ daddu $a0, $s0, $zero -.L80240700: -/* DEF5A0 80240700 9602008E */ lhu $v0, 0x8e($s0) -/* DEF5A4 80240704 2442FFFF */ addiu $v0, $v0, -1 -/* DEF5A8 80240708 A602008E */ sh $v0, 0x8e($s0) -/* DEF5AC 8024070C 00021400 */ sll $v0, $v0, 0x10 -/* DEF5B0 80240710 14400004 */ bnez $v0, .L80240724 -/* DEF5B4 80240714 2402001E */ addiu $v0, $zero, 0x1e -/* DEF5B8 80240718 A602008E */ sh $v0, 0x8e($s0) -/* DEF5BC 8024071C 24020011 */ addiu $v0, $zero, 0x11 -/* DEF5C0 80240720 AE220070 */ sw $v0, 0x70($s1) -.L80240724: -/* DEF5C4 80240724 8FBF0028 */ lw $ra, 0x28($sp) -/* DEF5C8 80240728 8FB10024 */ lw $s1, 0x24($sp) -/* DEF5CC 8024072C 8FB00020 */ lw $s0, 0x20($sp) -/* DEF5D0 80240730 03E00008 */ jr $ra -/* DEF5D4 80240734 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_80240738_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_80240738_DEEEA0.s deleted file mode 100644 index 4ced21c61f..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_80240738_DEEEA0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240738_DEF5D8 -/* DEF5D8 80240738 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DEF5DC 8024073C AFB10014 */ sw $s1, 0x14($sp) -/* DEF5E0 80240740 0080882D */ daddu $s1, $a0, $zero -/* DEF5E4 80240744 AFBF0018 */ sw $ra, 0x18($sp) -/* DEF5E8 80240748 AFB00010 */ sw $s0, 0x10($sp) -/* DEF5EC 8024074C 8E300148 */ lw $s0, 0x148($s1) -/* DEF5F0 80240750 0C00EABB */ jal get_npc_unsafe -/* DEF5F4 80240754 86040008 */ lh $a0, 8($s0) -/* DEF5F8 80240758 0040182D */ daddu $v1, $v0, $zero -/* DEF5FC 8024075C 9462008E */ lhu $v0, 0x8e($v1) -/* DEF600 80240760 2442FFFF */ addiu $v0, $v0, -1 -/* DEF604 80240764 A462008E */ sh $v0, 0x8e($v1) -/* DEF608 80240768 00021400 */ sll $v0, $v0, 0x10 -/* DEF60C 8024076C 14400005 */ bnez $v0, .L80240784 -/* DEF610 80240770 00000000 */ nop -/* DEF614 80240774 8E0200CC */ lw $v0, 0xcc($s0) -/* DEF618 80240778 8C420000 */ lw $v0, ($v0) -/* DEF61C 8024077C AC620028 */ sw $v0, 0x28($v1) -/* DEF620 80240780 AE200070 */ sw $zero, 0x70($s1) -.L80240784: -/* DEF624 80240784 8FBF0018 */ lw $ra, 0x18($sp) -/* DEF628 80240788 8FB10014 */ lw $s1, 0x14($sp) -/* DEF62C 8024078C 8FB00010 */ lw $s0, 0x10($sp) -/* DEF630 80240790 03E00008 */ jr $ra -/* DEF634 80240794 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_80240798_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_80240798_DEEEA0.s deleted file mode 100644 index 9059cae0af..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_80240798_DEEEA0.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240798_DEF638 -/* DEF638 80240798 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DEF63C 8024079C AFB30054 */ sw $s3, 0x54($sp) -/* DEF640 802407A0 0080982D */ daddu $s3, $a0, $zero -/* DEF644 802407A4 AFBF0060 */ sw $ra, 0x60($sp) -/* DEF648 802407A8 AFB5005C */ sw $s5, 0x5c($sp) -/* DEF64C 802407AC AFB40058 */ sw $s4, 0x58($sp) -/* DEF650 802407B0 AFB20050 */ sw $s2, 0x50($sp) -/* DEF654 802407B4 AFB1004C */ sw $s1, 0x4c($sp) -/* DEF658 802407B8 AFB00048 */ sw $s0, 0x48($sp) -/* DEF65C 802407BC 8E710148 */ lw $s1, 0x148($s3) -/* DEF660 802407C0 86240008 */ lh $a0, 8($s1) -/* DEF664 802407C4 0C00EABB */ jal get_npc_unsafe -/* DEF668 802407C8 00A0802D */ daddu $s0, $a1, $zero -/* DEF66C 802407CC 8E63000C */ lw $v1, 0xc($s3) -/* DEF670 802407D0 0260202D */ daddu $a0, $s3, $zero -/* DEF674 802407D4 8C650000 */ lw $a1, ($v1) -/* DEF678 802407D8 0C0B1EAF */ jal get_variable -/* DEF67C 802407DC 0040902D */ daddu $s2, $v0, $zero -/* DEF680 802407E0 AFA00018 */ sw $zero, 0x18($sp) -/* DEF684 802407E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEF688 802407E8 8C630030 */ lw $v1, 0x30($v1) -/* DEF68C 802407EC AFA3001C */ sw $v1, 0x1c($sp) -/* DEF690 802407F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEF694 802407F4 8C63001C */ lw $v1, 0x1c($v1) -/* DEF698 802407F8 AFA30020 */ sw $v1, 0x20($sp) -/* DEF69C 802407FC 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEF6A0 80240800 8C630024 */ lw $v1, 0x24($v1) -/* DEF6A4 80240804 AFA30024 */ sw $v1, 0x24($sp) -/* DEF6A8 80240808 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEF6AC 8024080C 8C630028 */ lw $v1, 0x28($v1) -/* DEF6B0 80240810 27B50018 */ addiu $s5, $sp, 0x18 -/* DEF6B4 80240814 AFA30028 */ sw $v1, 0x28($sp) -/* DEF6B8 80240818 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEF6BC 8024081C 3C014282 */ lui $at, 0x4282 -/* DEF6C0 80240820 44810000 */ mtc1 $at, $f0 -/* DEF6C4 80240824 8C63002C */ lw $v1, 0x2c($v1) -/* DEF6C8 80240828 0040A02D */ daddu $s4, $v0, $zero -/* DEF6CC 8024082C E7A00030 */ swc1 $f0, 0x30($sp) -/* DEF6D0 80240830 A7A00034 */ sh $zero, 0x34($sp) -/* DEF6D4 80240834 16000005 */ bnez $s0, .L8024084C -/* DEF6D8 80240838 AFA3002C */ sw $v1, 0x2c($sp) -/* DEF6DC 8024083C 8E2200B0 */ lw $v0, 0xb0($s1) -/* DEF6E0 80240840 30420004 */ andi $v0, $v0, 4 -/* DEF6E4 80240844 10400044 */ beqz $v0, .L80240958 -/* DEF6E8 80240848 00000000 */ nop -.L8024084C: -/* DEF6EC 8024084C 2404F7FF */ addiu $a0, $zero, -0x801 -/* DEF6F0 80240850 AE600070 */ sw $zero, 0x70($s3) -/* DEF6F4 80240854 A640008E */ sh $zero, 0x8e($s2) -/* DEF6F8 80240858 8E2200CC */ lw $v0, 0xcc($s1) -/* DEF6FC 8024085C 8E430000 */ lw $v1, ($s2) -/* DEF700 80240860 8C420000 */ lw $v0, ($v0) -/* DEF704 80240864 00641824 */ and $v1, $v1, $a0 -/* DEF708 80240868 AE430000 */ sw $v1, ($s2) -/* DEF70C 8024086C AE420028 */ sw $v0, 0x28($s2) -/* DEF710 80240870 8E2200D0 */ lw $v0, 0xd0($s1) -/* DEF714 80240874 8C420034 */ lw $v0, 0x34($v0) -/* DEF718 80240878 54400005 */ bnel $v0, $zero, .L80240890 -/* DEF71C 8024087C 2402FDFF */ addiu $v0, $zero, -0x201 -/* DEF720 80240880 34620200 */ ori $v0, $v1, 0x200 -/* DEF724 80240884 2403FFF7 */ addiu $v1, $zero, -9 -/* DEF728 80240888 08090226 */ j .L80240898 -/* DEF72C 8024088C 00431024 */ and $v0, $v0, $v1 -.L80240890: -/* DEF730 80240890 00621024 */ and $v0, $v1, $v0 -/* DEF734 80240894 34420008 */ ori $v0, $v0, 8 -.L80240898: -/* DEF738 80240898 AE420000 */ sw $v0, ($s2) -/* DEF73C 8024089C 8E2200B0 */ lw $v0, 0xb0($s1) -/* DEF740 802408A0 30420004 */ andi $v0, $v0, 4 -/* DEF744 802408A4 10400004 */ beqz $v0, .L802408B8 -/* DEF748 802408A8 24020063 */ addiu $v0, $zero, 0x63 -/* DEF74C 802408AC AE620070 */ sw $v0, 0x70($s3) -/* DEF750 802408B0 08090234 */ j .L802408D0 -/* DEF754 802408B4 AE600074 */ sw $zero, 0x74($s3) -.L802408B8: -/* DEF758 802408B8 8E220000 */ lw $v0, ($s1) -/* DEF75C 802408BC 3C034000 */ lui $v1, 0x4000 -/* DEF760 802408C0 00431024 */ and $v0, $v0, $v1 -/* DEF764 802408C4 10400002 */ beqz $v0, .L802408D0 -/* DEF768 802408C8 2402000C */ addiu $v0, $zero, 0xc -/* DEF76C 802408CC AE620070 */ sw $v0, 0x70($s3) -.L802408D0: -/* DEF770 802408D0 3C06BFFF */ lui $a2, 0xbfff -/* DEF774 802408D4 34C6FFFF */ ori $a2, $a2, 0xffff -/* DEF778 802408D8 27A50038 */ addiu $a1, $sp, 0x38 -/* DEF77C 802408DC 2404FFFB */ addiu $a0, $zero, -5 -/* DEF780 802408E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* DEF784 802408E4 8E230000 */ lw $v1, ($s1) -/* DEF788 802408E8 3C0142C8 */ lui $at, 0x42c8 -/* DEF78C 802408EC 44810000 */ mtc1 $at, $f0 -/* DEF790 802408F0 00441024 */ and $v0, $v0, $a0 -/* DEF794 802408F4 00661824 */ and $v1, $v1, $a2 -/* DEF798 802408F8 AE2200B0 */ sw $v0, 0xb0($s1) -/* DEF79C 802408FC AE230000 */ sw $v1, ($s1) -/* DEF7A0 80240900 864200A8 */ lh $v0, 0xa8($s2) -/* DEF7A4 80240904 27A70040 */ addiu $a3, $sp, 0x40 -/* DEF7A8 80240908 E7A00044 */ swc1 $f0, 0x44($sp) -/* DEF7AC 8024090C C6460038 */ lwc1 $f6, 0x38($s2) -/* DEF7B0 80240910 C640003C */ lwc1 $f0, 0x3c($s2) -/* DEF7B4 80240914 C6420040 */ lwc1 $f2, 0x40($s2) -/* DEF7B8 80240918 44822000 */ mtc1 $v0, $f4 -/* DEF7BC 8024091C 00000000 */ nop -/* DEF7C0 80240920 46802120 */ cvt.s.w $f4, $f4 -/* DEF7C4 80240924 27A20044 */ addiu $v0, $sp, 0x44 -/* DEF7C8 80240928 46040000 */ add.s $f0, $f0, $f4 -/* DEF7CC 8024092C E7A60038 */ swc1 $f6, 0x38($sp) -/* DEF7D0 80240930 E7A20040 */ swc1 $f2, 0x40($sp) -/* DEF7D4 80240934 E7A0003C */ swc1 $f0, 0x3c($sp) -/* DEF7D8 80240938 AFA20010 */ sw $v0, 0x10($sp) -/* DEF7DC 8024093C 8E440080 */ lw $a0, 0x80($s2) -/* DEF7E0 80240940 0C0372DF */ jal func_800DCB7C -/* DEF7E4 80240944 27A6003C */ addiu $a2, $sp, 0x3c -/* DEF7E8 80240948 10400003 */ beqz $v0, .L80240958 -/* DEF7EC 8024094C 00000000 */ nop -/* DEF7F0 80240950 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DEF7F4 80240954 E640003C */ swc1 $f0, 0x3c($s2) -.L80240958: -/* DEF7F8 80240958 8E630070 */ lw $v1, 0x70($s3) -/* DEF7FC 8024095C 2C620064 */ sltiu $v0, $v1, 0x64 -/* DEF800 80240960 10400050 */ beqz $v0, .L80240AA4 -/* DEF804 80240964 00031080 */ sll $v0, $v1, 2 -/* DEF808 80240968 3C018024 */ lui $at, 0x8024 -/* DEF80C 8024096C 00220821 */ addu $at, $at, $v0 -/* DEF810 80240970 8C227620 */ lw $v0, 0x7620($at) -/* DEF814 80240974 00400008 */ jr $v0 -/* DEF818 80240978 00000000 */ nop -/* DEF81C 8024097C 0260202D */ daddu $a0, $s3, $zero -/* DEF820 80240980 0280282D */ daddu $a1, $s4, $zero -/* DEF824 80240984 0C012568 */ jal func_800495A0 -/* DEF828 80240988 02A0302D */ daddu $a2, $s5, $zero -/* DEF82C 8024098C 0260202D */ daddu $a0, $s3, $zero -/* DEF830 80240990 0280282D */ daddu $a1, $s4, $zero -/* DEF834 80240994 0C0125AE */ jal func_800496B8 -/* DEF838 80240998 02A0302D */ daddu $a2, $s5, $zero -/* DEF83C 8024099C 080902A9 */ j .L80240AA4 -/* DEF840 802409A0 00000000 */ nop -/* DEF844 802409A4 0260202D */ daddu $a0, $s3, $zero -/* DEF848 802409A8 0280282D */ daddu $a1, $s4, $zero -/* DEF84C 802409AC 0C0126D1 */ jal func_80049B44 -/* DEF850 802409B0 02A0302D */ daddu $a2, $s5, $zero -/* DEF854 802409B4 0260202D */ daddu $a0, $s3, $zero -/* DEF858 802409B8 0280282D */ daddu $a1, $s4, $zero -/* DEF85C 802409BC 0C012701 */ jal func_80049C04 -/* DEF860 802409C0 02A0302D */ daddu $a2, $s5, $zero -/* DEF864 802409C4 080902A9 */ j .L80240AA4 -/* DEF868 802409C8 00000000 */ nop -/* DEF86C 802409CC 0260202D */ daddu $a0, $s3, $zero -/* DEF870 802409D0 0280282D */ daddu $a1, $s4, $zero -/* DEF874 802409D4 0C01278F */ jal func_80049E3C -/* DEF878 802409D8 02A0302D */ daddu $a2, $s5, $zero -/* DEF87C 802409DC 0260202D */ daddu $a0, $s3, $zero -/* DEF880 802409E0 0280282D */ daddu $a1, $s4, $zero -/* DEF884 802409E4 0C0127B3 */ jal func_80049ECC -/* DEF888 802409E8 02A0302D */ daddu $a2, $s5, $zero -/* DEF88C 802409EC 080902A9 */ j .L80240AA4 -/* DEF890 802409F0 00000000 */ nop -/* DEF894 802409F4 0260202D */ daddu $a0, $s3, $zero -/* DEF898 802409F8 0280282D */ daddu $a1, $s4, $zero -/* DEF89C 802409FC 0C0127DF */ jal func_80049F7C -/* DEF8A0 80240A00 02A0302D */ daddu $a2, $s5, $zero -/* DEF8A4 80240A04 0260202D */ daddu $a0, $s3, $zero -/* DEF8A8 80240A08 0280282D */ daddu $a1, $s4, $zero -/* DEF8AC 80240A0C 0C012849 */ jal func_8004A124 -/* DEF8B0 80240A10 02A0302D */ daddu $a2, $s5, $zero -/* DEF8B4 80240A14 8E630070 */ lw $v1, 0x70($s3) -/* DEF8B8 80240A18 2402000E */ addiu $v0, $zero, 0xe -/* DEF8BC 80240A1C 14620021 */ bne $v1, $v0, .L80240AA4 -/* DEF8C0 80240A20 00000000 */ nop -/* DEF8C4 80240A24 0260202D */ daddu $a0, $s3, $zero -/* DEF8C8 80240A28 0280282D */ daddu $a1, $s4, $zero -/* DEF8CC 80240A2C 0C090158 */ jal func_80240560 -/* DEF8D0 80240A30 02A0302D */ daddu $a2, $s5, $zero -/* DEF8D4 80240A34 8E630070 */ lw $v1, 0x70($s3) -/* DEF8D8 80240A38 2402000F */ addiu $v0, $zero, 0xf -/* DEF8DC 80240A3C 14620019 */ bne $v1, $v0, .L80240AA4 -/* DEF8E0 80240A40 00000000 */ nop -/* DEF8E4 80240A44 0260202D */ daddu $a0, $s3, $zero -/* DEF8E8 80240A48 0280282D */ daddu $a1, $s4, $zero -/* DEF8EC 80240A4C 0C090174 */ jal func_802405D0 -/* DEF8F0 80240A50 02A0302D */ daddu $a2, $s5, $zero -/* DEF8F4 80240A54 8E630070 */ lw $v1, 0x70($s3) -/* DEF8F8 80240A58 24020010 */ addiu $v0, $zero, 0x10 -/* DEF8FC 80240A5C 14620011 */ bne $v1, $v0, .L80240AA4 -/* DEF900 80240A60 00000000 */ nop -/* DEF904 80240A64 0260202D */ daddu $a0, $s3, $zero -/* DEF908 80240A68 0280282D */ daddu $a1, $s4, $zero -/* DEF90C 80240A6C 0C0901A8 */ jal func_802406A0 -/* DEF910 80240A70 02A0302D */ daddu $a2, $s5, $zero -/* DEF914 80240A74 8E630070 */ lw $v1, 0x70($s3) -/* DEF918 80240A78 24020011 */ addiu $v0, $zero, 0x11 -/* DEF91C 80240A7C 14620009 */ bne $v1, $v0, .L80240AA4 -/* DEF920 80240A80 00000000 */ nop -/* DEF924 80240A84 0260202D */ daddu $a0, $s3, $zero -/* DEF928 80240A88 0280282D */ daddu $a1, $s4, $zero -/* DEF92C 80240A8C 0C0901CE */ jal func_80240738 -/* DEF930 80240A90 02A0302D */ daddu $a2, $s5, $zero -/* DEF934 80240A94 080902A9 */ j .L80240AA4 -/* DEF938 80240A98 00000000 */ nop -/* DEF93C 80240A9C 0C0129CF */ jal func_8004A73C -/* DEF940 80240AA0 0260202D */ daddu $a0, $s3, $zero -.L80240AA4: -/* DEF944 80240AA4 8FBF0060 */ lw $ra, 0x60($sp) -/* DEF948 80240AA8 8FB5005C */ lw $s5, 0x5c($sp) -/* DEF94C 80240AAC 8FB40058 */ lw $s4, 0x58($sp) -/* DEF950 80240AB0 8FB30054 */ lw $s3, 0x54($sp) -/* DEF954 80240AB4 8FB20050 */ lw $s2, 0x50($sp) -/* DEF958 80240AB8 8FB1004C */ lw $s1, 0x4c($sp) -/* DEF95C 80240ABC 8FB00048 */ lw $s0, 0x48($sp) -/* DEF960 80240AC0 0000102D */ daddu $v0, $zero, $zero -/* DEF964 80240AC4 03E00008 */ jr $ra -/* DEF968 80240AC8 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_80240ACC_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_80240ACC_DEEEA0.s deleted file mode 100644 index 883d515bca..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_80240ACC_DEEEA0.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ACC_DEF96C -/* DEF96C 80240ACC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DEF970 80240AD0 AFB10014 */ sw $s1, 0x14($sp) -/* DEF974 80240AD4 0080882D */ daddu $s1, $a0, $zero -/* DEF978 80240AD8 AFBF0018 */ sw $ra, 0x18($sp) -/* DEF97C 80240ADC AFB00010 */ sw $s0, 0x10($sp) -/* DEF980 80240AE0 8E300148 */ lw $s0, 0x148($s1) -/* DEF984 80240AE4 0C00EABB */ jal get_npc_unsafe -/* DEF988 80240AE8 86040008 */ lh $a0, 8($s0) -/* DEF98C 80240AEC 3C054387 */ lui $a1, 0x4387 -/* DEF990 80240AF0 0040202D */ daddu $a0, $v0, $zero -/* DEF994 80240AF4 0C00ECD0 */ jal set_npc_yaw -/* DEF998 80240AF8 A480008E */ sh $zero, 0x8e($a0) -/* DEF99C 80240AFC 24020003 */ addiu $v0, $zero, 3 -/* DEF9A0 80240B00 AE00006C */ sw $zero, 0x6c($s0) -/* DEF9A4 80240B04 AE220070 */ sw $v0, 0x70($s1) -/* DEF9A8 80240B08 8FBF0018 */ lw $ra, 0x18($sp) -/* DEF9AC 80240B0C 8FB10014 */ lw $s1, 0x14($sp) -/* DEF9B0 80240B10 8FB00010 */ lw $s0, 0x10($sp) -/* DEF9B4 80240B14 03E00008 */ jr $ra -/* DEF9B8 80240B18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_80240B1C_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_80240B1C_DEEEA0.s deleted file mode 100644 index c34dd13362..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_80240B1C_DEEEA0.s +++ /dev/null @@ -1,132 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B1C_DEF9BC -/* DEF9BC 80240B1C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DEF9C0 80240B20 AFB20018 */ sw $s2, 0x18($sp) -/* DEF9C4 80240B24 0080902D */ daddu $s2, $a0, $zero -/* DEF9C8 80240B28 AFBF001C */ sw $ra, 0x1c($sp) -/* DEF9CC 80240B2C AFB10014 */ sw $s1, 0x14($sp) -/* DEF9D0 80240B30 AFB00010 */ sw $s0, 0x10($sp) -/* DEF9D4 80240B34 8E500148 */ lw $s0, 0x148($s2) -/* DEF9D8 80240B38 0C00EABB */ jal get_npc_unsafe -/* DEF9DC 80240B3C 86040008 */ lh $a0, 8($s0) -/* DEF9E0 80240B40 8E03006C */ lw $v1, 0x6c($s0) -/* DEF9E4 80240B44 24060001 */ addiu $a2, $zero, 1 -/* DEF9E8 80240B48 10660016 */ beq $v1, $a2, .L80240BA4 -/* DEF9EC 80240B4C 0040882D */ daddu $s1, $v0, $zero -/* DEF9F0 80240B50 28620002 */ slti $v0, $v1, 2 -/* DEF9F4 80240B54 50400005 */ beql $v0, $zero, .L80240B6C -/* DEF9F8 80240B58 24020002 */ addiu $v0, $zero, 2 -/* DEF9FC 80240B5C 10600009 */ beqz $v1, .L80240B84 -/* DEFA00 80240B60 3C02003C */ lui $v0, 0x3c -/* DEFA04 80240B64 0809032C */ j .L80240CB0 -/* DEFA08 80240B68 24020004 */ addiu $v0, $zero, 4 -.L80240B6C: -/* DEFA0C 80240B6C 10620030 */ beq $v1, $v0, .L80240C30 -/* DEFA10 80240B70 24020003 */ addiu $v0, $zero, 3 -/* DEFA14 80240B74 10620034 */ beq $v1, $v0, .L80240C48 -/* DEFA18 80240B78 00000000 */ nop -/* DEFA1C 80240B7C 0809032A */ j .L80240CA8 -/* DEFA20 80240B80 00000000 */ nop -.L80240B84: -/* DEFA24 80240B84 3442000C */ ori $v0, $v0, 0xc -/* DEFA28 80240B88 3C054387 */ lui $a1, 0x4387 -/* DEFA2C 80240B8C 0220202D */ daddu $a0, $s1, $zero -/* DEFA30 80240B90 AE06006C */ sw $a2, 0x6c($s0) -/* DEFA34 80240B94 AE000070 */ sw $zero, 0x70($s0) -/* DEFA38 80240B98 0C00ECD0 */ jal set_npc_yaw -/* DEFA3C 80240B9C AE220028 */ sw $v0, 0x28($s1) -/* DEFA40 80240BA0 AE200048 */ sw $zero, 0x48($s1) -.L80240BA4: -/* DEFA44 80240BA4 8E030070 */ lw $v1, 0x70($s0) -/* DEFA48 80240BA8 04610002 */ bgez $v1, .L80240BB4 -/* DEFA4C 80240BAC 0060102D */ daddu $v0, $v1, $zero -/* DEFA50 80240BB0 2462000F */ addiu $v0, $v1, 0xf -.L80240BB4: -/* DEFA54 80240BB4 00022103 */ sra $a0, $v0, 4 -/* DEFA58 80240BB8 00041100 */ sll $v0, $a0, 4 -/* DEFA5C 80240BBC 00622023 */ subu $a0, $v1, $v0 -/* DEFA60 80240BC0 28820004 */ slti $v0, $a0, 4 -/* DEFA64 80240BC4 10400003 */ beqz $v0, .L80240BD4 -/* DEFA68 80240BC8 3C02003C */ lui $v0, 0x3c -/* DEFA6C 80240BCC 08090303 */ j .L80240C0C -/* DEFA70 80240BD0 3442000C */ ori $v0, $v0, 0xc -.L80240BD4: -/* DEFA74 80240BD4 28820008 */ slti $v0, $a0, 8 -/* DEFA78 80240BD8 10400003 */ beqz $v0, .L80240BE8 -/* DEFA7C 80240BDC 3C02003C */ lui $v0, 0x3c -/* DEFA80 80240BE0 08090303 */ j .L80240C0C -/* DEFA84 80240BE4 3442000B */ ori $v0, $v0, 0xb -.L80240BE8: -/* DEFA88 80240BE8 2882000C */ slti $v0, $a0, 0xc -/* DEFA8C 80240BEC 10400003 */ beqz $v0, .L80240BFC -/* DEFA90 80240BF0 3C02003C */ lui $v0, 0x3c -/* DEFA94 80240BF4 08090303 */ j .L80240C0C -/* DEFA98 80240BF8 3442000C */ ori $v0, $v0, 0xc -.L80240BFC: -/* DEFA9C 80240BFC 28820010 */ slti $v0, $a0, 0x10 -/* DEFAA0 80240C00 10400003 */ beqz $v0, .L80240C10 -/* DEFAA4 80240C04 3C02003C */ lui $v0, 0x3c -/* DEFAA8 80240C08 3442000D */ ori $v0, $v0, 0xd -.L80240C0C: -/* DEFAAC 80240C0C AE220028 */ sw $v0, 0x28($s1) -.L80240C10: -/* DEFAB0 80240C10 8E020070 */ lw $v0, 0x70($s0) -/* DEFAB4 80240C14 24420001 */ addiu $v0, $v0, 1 -/* DEFAB8 80240C18 AE020070 */ sw $v0, 0x70($s0) -/* DEFABC 80240C1C 28420041 */ slti $v0, $v0, 0x41 -/* DEFAC0 80240C20 14400021 */ bnez $v0, .L80240CA8 -/* DEFAC4 80240C24 24020002 */ addiu $v0, $zero, 2 -/* DEFAC8 80240C28 0809032A */ j .L80240CA8 -/* DEFACC 80240C2C AE02006C */ sw $v0, 0x6c($s0) -.L80240C30: -/* DEFAD0 80240C30 3C03003C */ lui $v1, 0x3c -/* DEFAD4 80240C34 3463000C */ ori $v1, $v1, 0xc -/* DEFAD8 80240C38 AE02006C */ sw $v0, 0x6c($s0) -/* DEFADC 80240C3C AE000070 */ sw $zero, 0x70($s0) -/* DEFAE0 80240C40 AE200048 */ sw $zero, 0x48($s1) -/* DEFAE4 80240C44 AE230028 */ sw $v1, 0x28($s1) -.L80240C48: -/* DEFAE8 80240C48 C6200048 */ lwc1 $f0, 0x48($s1) -/* DEFAEC 80240C4C 3C018024 */ lui $at, 0x8024 -/* DEFAF0 80240C50 D42277B0 */ ldc1 $f2, 0x77b0($at) -/* DEFAF4 80240C54 46000021 */ cvt.d.s $f0, $f0 -/* DEFAF8 80240C58 46220000 */ add.d $f0, $f0, $f2 -/* DEFAFC 80240C5C 3C018024 */ lui $at, 0x8024 -/* DEFB00 80240C60 D42277B8 */ ldc1 $f2, 0x77b8($at) -/* DEFB04 80240C64 46200020 */ cvt.s.d $f0, $f0 -/* DEFB08 80240C68 E6200048 */ swc1 $f0, 0x48($s1) -/* DEFB0C 80240C6C 46000021 */ cvt.d.s $f0, $f0 -/* DEFB10 80240C70 4620103C */ c.lt.d $f2, $f0 -/* DEFB14 80240C74 00000000 */ nop -/* DEFB18 80240C78 45000004 */ bc1f .L80240C8C -/* DEFB1C 80240C7C 00000000 */ nop -/* DEFB20 80240C80 46220001 */ sub.d $f0, $f0, $f2 -/* DEFB24 80240C84 46200020 */ cvt.s.d $f0, $f0 -/* DEFB28 80240C88 E6200048 */ swc1 $f0, 0x48($s1) -.L80240C8C: -/* DEFB2C 80240C8C 8E020070 */ lw $v0, 0x70($s0) -/* DEFB30 80240C90 24420001 */ addiu $v0, $v0, 1 -/* DEFB34 80240C94 AE020070 */ sw $v0, 0x70($s0) -/* DEFB38 80240C98 2842002E */ slti $v0, $v0, 0x2e -/* DEFB3C 80240C9C 14400002 */ bnez $v0, .L80240CA8 -/* DEFB40 80240CA0 24020004 */ addiu $v0, $zero, 4 -/* DEFB44 80240CA4 AE02006C */ sw $v0, 0x6c($s0) -.L80240CA8: -/* DEFB48 80240CA8 8E03006C */ lw $v1, 0x6c($s0) -/* DEFB4C 80240CAC 24020004 */ addiu $v0, $zero, 4 -.L80240CB0: -/* DEFB50 80240CB0 14620005 */ bne $v1, $v0, .L80240CC8 -/* DEFB54 80240CB4 0220202D */ daddu $a0, $s1, $zero -/* DEFB58 80240CB8 3C054387 */ lui $a1, 0x4387 -/* DEFB5C 80240CBC 0C00ECD0 */ jal set_npc_yaw -/* DEFB60 80240CC0 AC800048 */ sw $zero, 0x48($a0) -/* DEFB64 80240CC4 AE400070 */ sw $zero, 0x70($s2) -.L80240CC8: -/* DEFB68 80240CC8 8FBF001C */ lw $ra, 0x1c($sp) -/* DEFB6C 80240CCC 8FB20018 */ lw $s2, 0x18($sp) -/* DEFB70 80240CD0 8FB10014 */ lw $s1, 0x14($sp) -/* DEFB74 80240CD4 8FB00010 */ lw $s0, 0x10($sp) -/* DEFB78 80240CD8 03E00008 */ jr $ra -/* DEFB7C 80240CDC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_80240FB4_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_80240FB4_DEEEA0.s deleted file mode 100644 index 78d38fe3ab..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_80240FB4_DEEEA0.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FB4_DEFE54 -/* DEFE54 80240FB4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DEFE58 80240FB8 AFB3002C */ sw $s3, 0x2c($sp) -/* DEFE5C 80240FBC 0080982D */ daddu $s3, $a0, $zero -/* DEFE60 80240FC0 AFBF0030 */ sw $ra, 0x30($sp) -/* DEFE64 80240FC4 AFB20028 */ sw $s2, 0x28($sp) -/* DEFE68 80240FC8 AFB10024 */ sw $s1, 0x24($sp) -/* DEFE6C 80240FCC AFB00020 */ sw $s0, 0x20($sp) -/* DEFE70 80240FD0 8E710148 */ lw $s1, 0x148($s3) -/* DEFE74 80240FD4 86240008 */ lh $a0, 8($s1) -/* DEFE78 80240FD8 0C00EABB */ jal get_npc_unsafe -/* DEFE7C 80240FDC 00A0902D */ daddu $s2, $a1, $zero -/* DEFE80 80240FE0 8E440004 */ lw $a0, 4($s2) -/* DEFE84 80240FE4 0040802D */ daddu $s0, $v0, $zero -/* DEFE88 80240FE8 00041FC2 */ srl $v1, $a0, 0x1f -/* DEFE8C 80240FEC 00832021 */ addu $a0, $a0, $v1 -/* DEFE90 80240FF0 00042043 */ sra $a0, $a0, 1 -/* DEFE94 80240FF4 0C00A67F */ jal rand_int -/* DEFE98 80240FF8 24840001 */ addiu $a0, $a0, 1 -/* DEFE9C 80240FFC 8E430004 */ lw $v1, 4($s2) -/* DEFEA0 80241000 000327C2 */ srl $a0, $v1, 0x1f -/* DEFEA4 80241004 00641821 */ addu $v1, $v1, $a0 -/* DEFEA8 80241008 00031843 */ sra $v1, $v1, 1 -/* DEFEAC 8024100C 00621821 */ addu $v1, $v1, $v0 -/* DEFEB0 80241010 A603008E */ sh $v1, 0x8e($s0) -/* DEFEB4 80241014 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEFEB8 80241018 C6000040 */ lwc1 $f0, 0x40($s0) -/* DEFEBC 8024101C C4640000 */ lwc1 $f4, ($v1) -/* DEFEC0 80241020 46802120 */ cvt.s.w $f4, $f4 -/* DEFEC4 80241024 C4620008 */ lwc1 $f2, 8($v1) -/* DEFEC8 80241028 468010A0 */ cvt.s.w $f2, $f2 -/* DEFECC 8024102C E7A00010 */ swc1 $f0, 0x10($sp) -/* DEFED0 80241030 8E2200D0 */ lw $v0, 0xd0($s1) -/* DEFED4 80241034 44061000 */ mfc1 $a2, $f2 -/* DEFED8 80241038 C440000C */ lwc1 $f0, 0xc($v0) -/* DEFEDC 8024103C 46800020 */ cvt.s.w $f0, $f0 -/* DEFEE0 80241040 E7A00014 */ swc1 $f0, 0x14($sp) -/* DEFEE4 80241044 8E2200D0 */ lw $v0, 0xd0($s1) -/* DEFEE8 80241048 44052000 */ mfc1 $a1, $f4 -/* DEFEEC 8024104C C4400010 */ lwc1 $f0, 0x10($v0) -/* DEFEF0 80241050 46800020 */ cvt.s.w $f0, $f0 -/* DEFEF4 80241054 E7A00018 */ swc1 $f0, 0x18($sp) -/* DEFEF8 80241058 8C640018 */ lw $a0, 0x18($v1) -/* DEFEFC 8024105C 0C0123F5 */ jal is_point_within_region -/* DEFF00 80241060 8E070038 */ lw $a3, 0x38($s0) -/* DEFF04 80241064 1040000E */ beqz $v0, .L802410A0 -/* DEFF08 80241068 00000000 */ nop -/* DEFF0C 8024106C 8E2200D0 */ lw $v0, 0xd0($s1) -/* DEFF10 80241070 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DEFF14 80241074 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DEFF18 80241078 C4460000 */ lwc1 $f6, ($v0) -/* DEFF1C 8024107C 468031A0 */ cvt.s.w $f6, $f6 -/* DEFF20 80241080 44063000 */ mfc1 $a2, $f6 -/* DEFF24 80241084 C4460008 */ lwc1 $f6, 8($v0) -/* DEFF28 80241088 468031A0 */ cvt.s.w $f6, $f6 -/* DEFF2C 8024108C 44073000 */ mfc1 $a3, $f6 -/* DEFF30 80241090 0C00A720 */ jal atan2 -/* DEFF34 80241094 00000000 */ nop -/* DEFF38 80241098 08090434 */ j .L802410D0 -/* DEFF3C 8024109C E600000C */ swc1 $f0, 0xc($s0) -.L802410A0: -/* DEFF40 802410A0 0C00A67F */ jal rand_int -/* DEFF44 802410A4 2404003C */ addiu $a0, $zero, 0x3c -/* DEFF48 802410A8 C60C000C */ lwc1 $f12, 0xc($s0) -/* DEFF4C 802410AC 44820000 */ mtc1 $v0, $f0 -/* DEFF50 802410B0 00000000 */ nop -/* DEFF54 802410B4 46800020 */ cvt.s.w $f0, $f0 -/* DEFF58 802410B8 46006300 */ add.s $f12, $f12, $f0 -/* DEFF5C 802410BC 3C0141F0 */ lui $at, 0x41f0 -/* DEFF60 802410C0 44810000 */ mtc1 $at, $f0 -/* DEFF64 802410C4 0C00A6C9 */ jal clamp_angle -/* DEFF68 802410C8 46006301 */ sub.s $f12, $f12, $f0 -/* DEFF6C 802410CC E600000C */ swc1 $f0, 0xc($s0) -.L802410D0: -/* DEFF70 802410D0 8E2200CC */ lw $v0, 0xcc($s1) -/* DEFF74 802410D4 8C420004 */ lw $v0, 4($v0) -/* DEFF78 802410D8 AE020028 */ sw $v0, 0x28($s0) -/* DEFF7C 802410DC AE600074 */ sw $zero, 0x74($s3) -/* DEFF80 802410E0 8E2200D0 */ lw $v0, 0xd0($s1) -/* DEFF84 802410E4 8C420014 */ lw $v0, 0x14($v0) -/* DEFF88 802410E8 04410004 */ bgez $v0, .L802410FC -/* DEFF8C 802410EC 00000000 */ nop -/* DEFF90 802410F0 C6400000 */ lwc1 $f0, ($s2) -/* DEFF94 802410F4 08090447 */ j .L8024111C -/* DEFF98 802410F8 E6000018 */ swc1 $f0, 0x18($s0) -.L802410FC: -/* DEFF9C 802410FC 3C018024 */ lui $at, 0x8024 -/* DEFFA0 80241100 D4227950 */ ldc1 $f2, 0x7950($at) -/* DEFFA4 80241104 44820000 */ mtc1 $v0, $f0 -/* DEFFA8 80241108 00000000 */ nop -/* DEFFAC 8024110C 46800021 */ cvt.d.w $f0, $f0 -/* DEFFB0 80241110 46220003 */ div.d $f0, $f0, $f2 -/* DEFFB4 80241114 46200020 */ cvt.s.d $f0, $f0 -/* DEFFB8 80241118 E6000018 */ swc1 $f0, 0x18($s0) -.L8024111C: -/* DEFFBC 8024111C C600003C */ lwc1 $f0, 0x3c($s0) -/* DEFFC0 80241120 3C014059 */ lui $at, 0x4059 -/* DEFFC4 80241124 44811800 */ mtc1 $at, $f3 -/* DEFFC8 80241128 44801000 */ mtc1 $zero, $f2 -/* DEFFCC 8024112C 46000021 */ cvt.d.s $f0, $f0 -/* DEFFD0 80241130 46220002 */ mul.d $f0, $f0, $f2 -/* DEFFD4 80241134 00000000 */ nop -/* DEFFD8 80241138 24020001 */ addiu $v0, $zero, 1 -/* DEFFDC 8024113C 4620018D */ trunc.w.d $f6, $f0 -/* DEFFE0 80241140 E626007C */ swc1 $f6, 0x7c($s1) -/* DEFFE4 80241144 AE620070 */ sw $v0, 0x70($s3) -/* DEFFE8 80241148 8FBF0030 */ lw $ra, 0x30($sp) -/* DEFFEC 8024114C 8FB3002C */ lw $s3, 0x2c($sp) -/* DEFFF0 80241150 8FB20028 */ lw $s2, 0x28($sp) -/* DEFFF4 80241154 8FB10024 */ lw $s1, 0x24($sp) -/* DEFFF8 80241158 8FB00020 */ lw $s0, 0x20($sp) -/* DEFFFC 8024115C 03E00008 */ jr $ra -/* DF0000 80241160 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_80241B90_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_80241B90_DEEEA0.s deleted file mode 100644 index 914f2a3bf2..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_80241B90_DEEEA0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B90_DF0A30 -/* DF0A30 80241B90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DF0A34 80241B94 AFB20018 */ sw $s2, 0x18($sp) -/* DF0A38 80241B98 0080902D */ daddu $s2, $a0, $zero -/* DF0A3C 80241B9C AFBF001C */ sw $ra, 0x1c($sp) -/* DF0A40 80241BA0 AFB10014 */ sw $s1, 0x14($sp) -/* DF0A44 80241BA4 AFB00010 */ sw $s0, 0x10($sp) -/* DF0A48 80241BA8 8E510148 */ lw $s1, 0x148($s2) -/* DF0A4C 80241BAC 0C00EABB */ jal get_npc_unsafe -/* DF0A50 80241BB0 86240008 */ lh $a0, 8($s1) -/* DF0A54 80241BB4 0040802D */ daddu $s0, $v0, $zero -/* DF0A58 80241BB8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DF0A5C 80241BBC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DF0A60 80241BC0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DF0A64 80241BC4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DF0A68 80241BC8 A600008E */ sh $zero, 0x8e($s0) -/* DF0A6C 80241BCC 8C460028 */ lw $a2, 0x28($v0) -/* DF0A70 80241BD0 0C00A720 */ jal atan2 -/* DF0A74 80241BD4 8C470030 */ lw $a3, 0x30($v0) -/* DF0A78 80241BD8 E600000C */ swc1 $f0, 0xc($s0) -/* DF0A7C 80241BDC 8E2200CC */ lw $v0, 0xcc($s1) -/* DF0A80 80241BE0 8C420020 */ lw $v0, 0x20($v0) -/* DF0A84 80241BE4 AE020028 */ sw $v0, 0x28($s0) -/* DF0A88 80241BE8 2402000B */ addiu $v0, $zero, 0xb -/* DF0A8C 80241BEC AE420070 */ sw $v0, 0x70($s2) -/* DF0A90 80241BF0 8FBF001C */ lw $ra, 0x1c($sp) -/* DF0A94 80241BF4 8FB20018 */ lw $s2, 0x18($sp) -/* DF0A98 80241BF8 8FB10014 */ lw $s1, 0x14($sp) -/* DF0A9C 80241BFC 8FB00010 */ lw $s0, 0x10($sp) -/* DF0AA0 80241C00 03E00008 */ jr $ra -/* DF0AA4 80241C04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_80241C74_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_80241C74_DEEEA0.s deleted file mode 100644 index 454ddb2bd9..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_80241C74_DEEEA0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C74_DF0B14 -/* DF0B14 80241C74 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DF0B18 80241C78 AFB3001C */ sw $s3, 0x1c($sp) -/* DF0B1C 80241C7C 0080982D */ daddu $s3, $a0, $zero -/* DF0B20 80241C80 AFBF0020 */ sw $ra, 0x20($sp) -/* DF0B24 80241C84 AFB20018 */ sw $s2, 0x18($sp) -/* DF0B28 80241C88 AFB10014 */ sw $s1, 0x14($sp) -/* DF0B2C 80241C8C AFB00010 */ sw $s0, 0x10($sp) -/* DF0B30 80241C90 8E720148 */ lw $s2, 0x148($s3) -/* DF0B34 80241C94 86440008 */ lh $a0, 8($s2) -/* DF0B38 80241C98 0C00EABB */ jal get_npc_unsafe -/* DF0B3C 80241C9C 00A0802D */ daddu $s0, $a1, $zero -/* DF0B40 80241CA0 0040882D */ daddu $s1, $v0, $zero -/* DF0B44 80241CA4 C6420080 */ lwc1 $f2, 0x80($s2) -/* DF0B48 80241CA8 468010A0 */ cvt.s.w $f2, $f2 -/* DF0B4C 80241CAC 460010A1 */ cvt.d.s $f2, $f2 -/* DF0B50 80241CB0 C6400084 */ lwc1 $f0, 0x84($s2) -/* DF0B54 80241CB4 46800020 */ cvt.s.w $f0, $f0 -/* DF0B58 80241CB8 46000021 */ cvt.d.s $f0, $f0 -/* DF0B5C 80241CBC 3C014059 */ lui $at, 0x4059 -/* DF0B60 80241CC0 44812800 */ mtc1 $at, $f5 -/* DF0B64 80241CC4 44802000 */ mtc1 $zero, $f4 -/* DF0B68 80241CC8 8E4200CC */ lw $v0, 0xcc($s2) -/* DF0B6C 80241CCC C62C0038 */ lwc1 $f12, 0x38($s1) -/* DF0B70 80241CD0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* DF0B74 80241CD4 46241083 */ div.d $f2, $f2, $f4 -/* DF0B78 80241CD8 462010A0 */ cvt.s.d $f2, $f2 -/* DF0B7C 80241CDC 46240003 */ div.d $f0, $f0, $f4 -/* DF0B80 80241CE0 8C420020 */ lw $v0, 0x20($v0) -/* DF0B84 80241CE4 46200020 */ cvt.s.d $f0, $f0 -/* DF0B88 80241CE8 E622001C */ swc1 $f2, 0x1c($s1) -/* DF0B8C 80241CEC E6200014 */ swc1 $f0, 0x14($s1) -/* DF0B90 80241CF0 AE220028 */ sw $v0, 0x28($s1) -/* DF0B94 80241CF4 C6000018 */ lwc1 $f0, 0x18($s0) -/* DF0B98 80241CF8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DF0B9C 80241CFC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DF0BA0 80241D00 E6200018 */ swc1 $f0, 0x18($s1) -/* DF0BA4 80241D04 8C460028 */ lw $a2, 0x28($v0) -/* DF0BA8 80241D08 0C00A720 */ jal atan2 -/* DF0BAC 80241D0C 8C470030 */ lw $a3, 0x30($v0) -/* DF0BB0 80241D10 E620000C */ swc1 $f0, 0xc($s1) -/* DF0BB4 80241D14 8E420018 */ lw $v0, 0x18($s2) -/* DF0BB8 80241D18 AE400074 */ sw $zero, 0x74($s2) -/* DF0BBC 80241D1C 9442002A */ lhu $v0, 0x2a($v0) -/* DF0BC0 80241D20 30420002 */ andi $v0, $v0, 2 -/* DF0BC4 80241D24 10400005 */ beqz $v0, .L80241D3C -/* DF0BC8 80241D28 24020003 */ addiu $v0, $zero, 3 -/* DF0BCC 80241D2C A622008E */ sh $v0, 0x8e($s1) -/* DF0BD0 80241D30 2402000D */ addiu $v0, $zero, 0xd -/* DF0BD4 80241D34 08090763 */ j .L80241D8C -/* DF0BD8 80241D38 AE620070 */ sw $v0, 0x70($s3) -.L80241D3C: -/* DF0BDC 80241D3C 24030001 */ addiu $v1, $zero, 1 -/* DF0BE0 80241D40 2402000E */ addiu $v0, $zero, 0xe -/* DF0BE4 80241D44 A623008E */ sh $v1, 0x8e($s1) -/* DF0BE8 80241D48 AE620070 */ sw $v0, 0x70($s3) -/* DF0BEC 80241D4C C6200038 */ lwc1 $f0, 0x38($s1) -/* DF0BF0 80241D50 4600018D */ trunc.w.s $f6, $f0 -/* DF0BF4 80241D54 44023000 */ mfc1 $v0, $f6 -/* DF0BF8 80241D58 00000000 */ nop -/* DF0BFC 80241D5C A6420010 */ sh $v0, 0x10($s2) -/* DF0C00 80241D60 C620003C */ lwc1 $f0, 0x3c($s1) -/* DF0C04 80241D64 4600018D */ trunc.w.s $f6, $f0 -/* DF0C08 80241D68 44023000 */ mfc1 $v0, $f6 -/* DF0C0C 80241D6C 00000000 */ nop -/* DF0C10 80241D70 A6420012 */ sh $v0, 0x12($s2) -/* DF0C14 80241D74 C6200040 */ lwc1 $f0, 0x40($s1) -/* DF0C18 80241D78 A2430007 */ sb $v1, 7($s2) -/* DF0C1C 80241D7C 4600018D */ trunc.w.s $f6, $f0 -/* DF0C20 80241D80 44023000 */ mfc1 $v0, $f6 -/* DF0C24 80241D84 00000000 */ nop -/* DF0C28 80241D88 A6420014 */ sh $v0, 0x14($s2) -.L80241D8C: -/* DF0C2C 80241D8C 8FBF0020 */ lw $ra, 0x20($sp) -/* DF0C30 80241D90 8FB3001C */ lw $s3, 0x1c($sp) -/* DF0C34 80241D94 8FB20018 */ lw $s2, 0x18($sp) -/* DF0C38 80241D98 8FB10014 */ lw $s1, 0x14($sp) -/* DF0C3C 80241D9C 8FB00010 */ lw $s0, 0x10($sp) -/* DF0C40 80241DA0 03E00008 */ jr $ra -/* DF0C44 80241DA4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_80241DA8_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_80241DA8_DEEEA0.s deleted file mode 100644 index df26fc4af7..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_80241DA8_DEEEA0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DA8_DF0C48 -/* DF0C48 80241DA8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF0C4C 80241DAC AFB00010 */ sw $s0, 0x10($sp) -/* DF0C50 80241DB0 0080802D */ daddu $s0, $a0, $zero -/* DF0C54 80241DB4 AFBF0014 */ sw $ra, 0x14($sp) -/* DF0C58 80241DB8 8E020148 */ lw $v0, 0x148($s0) -/* DF0C5C 80241DBC 0C00EABB */ jal get_npc_unsafe -/* DF0C60 80241DC0 84440008 */ lh $a0, 8($v0) -/* DF0C64 80241DC4 0040202D */ daddu $a0, $v0, $zero -/* DF0C68 80241DC8 8482008E */ lh $v0, 0x8e($a0) -/* DF0C6C 80241DCC 9483008E */ lhu $v1, 0x8e($a0) -/* DF0C70 80241DD0 18400005 */ blez $v0, .L80241DE8 -/* DF0C74 80241DD4 2462FFFF */ addiu $v0, $v1, -1 -/* DF0C78 80241DD8 A482008E */ sh $v0, 0x8e($a0) -/* DF0C7C 80241DDC 00021400 */ sll $v0, $v0, 0x10 -/* DF0C80 80241DE0 1C400006 */ bgtz $v0, .L80241DFC -/* DF0C84 80241DE4 00000000 */ nop -.L80241DE8: -/* DF0C88 80241DE8 8482008C */ lh $v0, 0x8c($a0) -/* DF0C8C 80241DEC 14400003 */ bnez $v0, .L80241DFC -/* DF0C90 80241DF0 2402000E */ addiu $v0, $zero, 0xe -/* DF0C94 80241DF4 A480008E */ sh $zero, 0x8e($a0) -/* DF0C98 80241DF8 AE020070 */ sw $v0, 0x70($s0) -.L80241DFC: -/* DF0C9C 80241DFC 8FBF0014 */ lw $ra, 0x14($sp) -/* DF0CA0 80241E00 8FB00010 */ lw $s0, 0x10($sp) -/* DF0CA4 80241E04 03E00008 */ jr $ra -/* DF0CA8 80241E08 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_8024219C_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_8024219C_DEEEA0.s deleted file mode 100644 index 6164bc46ee..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_8024219C_DEEEA0.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024219C_DF103C -/* DF103C 8024219C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DF1040 802421A0 AFB00028 */ sw $s0, 0x28($sp) -/* DF1044 802421A4 00A0802D */ daddu $s0, $a1, $zero -/* DF1048 802421A8 AFB1002C */ sw $s1, 0x2c($sp) -/* DF104C 802421AC 00C0882D */ daddu $s1, $a2, $zero -/* DF1050 802421B0 AFBF0034 */ sw $ra, 0x34($sp) -/* DF1054 802421B4 AFB20030 */ sw $s2, 0x30($sp) -/* DF1058 802421B8 AE200070 */ sw $zero, 0x70($s1) -/* DF105C 802421BC 8C830000 */ lw $v1, ($a0) -/* DF1060 802421C0 2402FDFF */ addiu $v0, $zero, -0x201 -/* DF1064 802421C4 A480008E */ sh $zero, 0x8e($a0) -/* DF1068 802421C8 00621824 */ and $v1, $v1, $v0 -/* DF106C 802421CC 34650800 */ ori $a1, $v1, 0x800 -/* DF1070 802421D0 AC850000 */ sw $a1, ($a0) -/* DF1074 802421D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* DF1078 802421D8 8C420034 */ lw $v0, 0x34($v0) -/* DF107C 802421DC 10400003 */ beqz $v0, .L802421EC -/* DF1080 802421E0 00E0902D */ daddu $s2, $a3, $zero -/* DF1084 802421E4 0809087D */ j .L802421F4 -/* DF1088 802421E8 34620808 */ ori $v0, $v1, 0x808 -.L802421EC: -/* DF108C 802421EC 2402FFF7 */ addiu $v0, $zero, -9 -/* DF1090 802421F0 00A21024 */ and $v0, $a1, $v0 -.L802421F4: -/* DF1094 802421F4 AC820000 */ sw $v0, ($a0) -/* DF1098 802421F8 27A20024 */ addiu $v0, $sp, 0x24 -/* DF109C 802421FC 27A50018 */ addiu $a1, $sp, 0x18 -/* DF10A0 80242200 C4800038 */ lwc1 $f0, 0x38($a0) -/* DF10A4 80242204 C482003C */ lwc1 $f2, 0x3c($a0) -/* DF10A8 80242208 C4840040 */ lwc1 $f4, 0x40($a0) -/* DF10AC 8024220C 3C01447A */ lui $at, 0x447a -/* DF10B0 80242210 44813000 */ mtc1 $at, $f6 -/* DF10B4 80242214 27A6001C */ addiu $a2, $sp, 0x1c -/* DF10B8 80242218 E7A00018 */ swc1 $f0, 0x18($sp) -/* DF10BC 8024221C E7A2001C */ swc1 $f2, 0x1c($sp) -/* DF10C0 80242220 E7A40020 */ swc1 $f4, 0x20($sp) -/* DF10C4 80242224 E7A60024 */ swc1 $f6, 0x24($sp) -/* DF10C8 80242228 AFA20010 */ sw $v0, 0x10($sp) -/* DF10CC 8024222C 8C840080 */ lw $a0, 0x80($a0) -/* DF10D0 80242230 0C0372DF */ jal func_800DCB7C -/* DF10D4 80242234 27A70020 */ addiu $a3, $sp, 0x20 -/* DF10D8 80242238 C7A20024 */ lwc1 $f2, 0x24($sp) -/* DF10DC 8024223C 3C014059 */ lui $at, 0x4059 -/* DF10E0 80242240 44812800 */ mtc1 $at, $f5 -/* DF10E4 80242244 44802000 */ mtc1 $zero, $f4 -/* DF10E8 80242248 460010A1 */ cvt.d.s $f2, $f2 -/* DF10EC 8024224C 46241082 */ mul.d $f2, $f2, $f4 -/* DF10F0 80242250 00000000 */ nop -/* DF10F4 80242254 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DF10F8 80242258 46000021 */ cvt.d.s $f0, $f0 -/* DF10FC 8024225C 46240002 */ mul.d $f0, $f0, $f4 -/* DF1100 80242260 00000000 */ nop -/* DF1104 80242264 3C013FE0 */ lui $at, 0x3fe0 -/* DF1108 80242268 44812800 */ mtc1 $at, $f5 -/* DF110C 8024226C 44802000 */ mtc1 $zero, $f4 -/* DF1110 80242270 00000000 */ nop -/* DF1114 80242274 46241080 */ add.d $f2, $f2, $f4 -/* DF1118 80242278 AE000074 */ sw $zero, 0x74($s0) -/* DF111C 8024227C 46240000 */ add.d $f0, $f0, $f4 -/* DF1120 80242280 AE000090 */ sw $zero, 0x90($s0) -/* DF1124 80242284 4620120D */ trunc.w.d $f8, $f2 -/* DF1128 80242288 E6080078 */ swc1 $f8, 0x78($s0) -/* DF112C 8024228C 4620020D */ trunc.w.d $f8, $f0 -/* DF1130 80242290 E6080088 */ swc1 $f8, 0x88($s0) -/* DF1134 80242294 8E420014 */ lw $v0, 0x14($s2) -/* DF1138 80242298 AE220074 */ sw $v0, 0x74($s1) -/* DF113C 8024229C 8E0200B0 */ lw $v0, 0xb0($s0) -/* DF1140 802422A0 34420010 */ ori $v0, $v0, 0x10 -/* DF1144 802422A4 AE0200B0 */ sw $v0, 0xb0($s0) -/* DF1148 802422A8 8FBF0034 */ lw $ra, 0x34($sp) -/* DF114C 802422AC 8FB20030 */ lw $s2, 0x30($sp) -/* DF1150 802422B0 8FB1002C */ lw $s1, 0x2c($sp) -/* DF1154 802422B4 8FB00028 */ lw $s0, 0x28($sp) -/* DF1158 802422B8 03E00008 */ jr $ra -/* DF115C 802422BC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_802422C0_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_802422C0_DEEEA0.s deleted file mode 100644 index 959ae116e6..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_802422C0_DEEEA0.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422C0_DF1160 -/* DF1160 802422C0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DF1164 802422C4 AFB40040 */ sw $s4, 0x40($sp) -/* DF1168 802422C8 0080A02D */ daddu $s4, $a0, $zero -/* DF116C 802422CC AFBF0048 */ sw $ra, 0x48($sp) -/* DF1170 802422D0 AFB50044 */ sw $s5, 0x44($sp) -/* DF1174 802422D4 AFB3003C */ sw $s3, 0x3c($sp) -/* DF1178 802422D8 AFB20038 */ sw $s2, 0x38($sp) -/* DF117C 802422DC AFB10034 */ sw $s1, 0x34($sp) -/* DF1180 802422E0 AFB00030 */ sw $s0, 0x30($sp) -/* DF1184 802422E4 8E920148 */ lw $s2, 0x148($s4) -/* DF1188 802422E8 86440008 */ lh $a0, 8($s2) -/* DF118C 802422EC 8E90000C */ lw $s0, 0xc($s4) -/* DF1190 802422F0 0C00EABB */ jal get_npc_unsafe -/* DF1194 802422F4 00A0882D */ daddu $s1, $a1, $zero -/* DF1198 802422F8 0280202D */ daddu $a0, $s4, $zero -/* DF119C 802422FC 8E050000 */ lw $a1, ($s0) -/* DF11A0 80242300 0C0B1EAF */ jal get_variable -/* DF11A4 80242304 0040A82D */ daddu $s5, $v0, $zero -/* DF11A8 80242308 AFA00010 */ sw $zero, 0x10($sp) -/* DF11AC 8024230C 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF11B0 80242310 8C630030 */ lw $v1, 0x30($v1) -/* DF11B4 80242314 AFA30014 */ sw $v1, 0x14($sp) -/* DF11B8 80242318 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF11BC 8024231C 8C63001C */ lw $v1, 0x1c($v1) -/* DF11C0 80242320 AFA30018 */ sw $v1, 0x18($sp) -/* DF11C4 80242324 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF11C8 80242328 8C630024 */ lw $v1, 0x24($v1) -/* DF11CC 8024232C AFA3001C */ sw $v1, 0x1c($sp) -/* DF11D0 80242330 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF11D4 80242334 8C630028 */ lw $v1, 0x28($v1) -/* DF11D8 80242338 27B30010 */ addiu $s3, $sp, 0x10 -/* DF11DC 8024233C AFA30020 */ sw $v1, 0x20($sp) -/* DF11E0 80242340 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF11E4 80242344 3C0142F0 */ lui $at, 0x42f0 -/* DF11E8 80242348 44810000 */ mtc1 $at, $f0 -/* DF11EC 8024234C 8C63002C */ lw $v1, 0x2c($v1) -/* DF11F0 80242350 0040802D */ daddu $s0, $v0, $zero -/* DF11F4 80242354 E7A00028 */ swc1 $f0, 0x28($sp) -/* DF11F8 80242358 A7A0002C */ sh $zero, 0x2c($sp) -/* DF11FC 8024235C 12200006 */ beqz $s1, .L80242378 -/* DF1200 80242360 AFA30024 */ sw $v1, 0x24($sp) -/* DF1204 80242364 02A0202D */ daddu $a0, $s5, $zero -/* DF1208 80242368 0240282D */ daddu $a1, $s2, $zero -/* DF120C 8024236C 0280302D */ daddu $a2, $s4, $zero -/* DF1210 80242370 0C090867 */ jal func_8024219C -/* DF1214 80242374 0200382D */ daddu $a3, $s0, $zero -.L80242378: -/* DF1218 80242378 2402FFFE */ addiu $v0, $zero, -2 -/* DF121C 8024237C A2A200AB */ sb $v0, 0xab($s5) -/* DF1220 80242380 8E4300B0 */ lw $v1, 0xb0($s2) -/* DF1224 80242384 30620004 */ andi $v0, $v1, 4 -/* DF1228 80242388 10400007 */ beqz $v0, .L802423A8 -/* DF122C 8024238C 00000000 */ nop -/* DF1230 80242390 824200B4 */ lb $v0, 0xb4($s2) -/* DF1234 80242394 1440003C */ bnez $v0, .L80242488 -/* DF1238 80242398 0000102D */ daddu $v0, $zero, $zero -/* DF123C 8024239C 2402FFFB */ addiu $v0, $zero, -5 -/* DF1240 802423A0 00621024 */ and $v0, $v1, $v0 -/* DF1244 802423A4 AE4200B0 */ sw $v0, 0xb0($s2) -.L802423A8: -/* DF1248 802423A8 8E830070 */ lw $v1, 0x70($s4) -/* DF124C 802423AC 2C62000F */ sltiu $v0, $v1, 0xf -/* DF1250 802423B0 10400034 */ beqz $v0, .L80242484 -/* DF1254 802423B4 00031080 */ sll $v0, $v1, 2 -/* DF1258 802423B8 3C018024 */ lui $at, 0x8024 -/* DF125C 802423BC 00220821 */ addu $at, $at, $v0 -/* DF1260 802423C0 8C227968 */ lw $v0, 0x7968($at) -/* DF1264 802423C4 00400008 */ jr $v0 -/* DF1268 802423C8 00000000 */ nop -/* DF126C 802423CC 0280202D */ daddu $a0, $s4, $zero -/* DF1270 802423D0 0200282D */ daddu $a1, $s0, $zero -/* DF1274 802423D4 0C0903ED */ jal func_80240FB4 -/* DF1278 802423D8 0260302D */ daddu $a2, $s3, $zero -/* DF127C 802423DC 0280202D */ daddu $a0, $s4, $zero -/* DF1280 802423E0 0200282D */ daddu $a1, $s0, $zero -/* DF1284 802423E4 0C090459 */ jal func_80241164 -/* DF1288 802423E8 0260302D */ daddu $a2, $s3, $zero -/* DF128C 802423EC 08090922 */ j .L80242488 -/* DF1290 802423F0 0000102D */ daddu $v0, $zero, $zero -/* DF1294 802423F4 0280202D */ daddu $a0, $s4, $zero -/* DF1298 802423F8 0200282D */ daddu $a1, $s0, $zero -/* DF129C 802423FC 0C0905E3 */ jal func_8024178C -/* DF12A0 80242400 0260302D */ daddu $a2, $s3, $zero -/* DF12A4 80242404 0280202D */ daddu $a0, $s4, $zero -/* DF12A8 80242408 0200282D */ daddu $a1, $s0, $zero -/* DF12AC 8024240C 0C090613 */ jal func_8024184C -/* DF12B0 80242410 0260302D */ daddu $a2, $s3, $zero -/* DF12B4 80242414 08090922 */ j .L80242488 -/* DF12B8 80242418 0000102D */ daddu $v0, $zero, $zero -/* DF12BC 8024241C 0280202D */ daddu $a0, $s4, $zero -/* DF12C0 80242420 0200282D */ daddu $a1, $s0, $zero -/* DF12C4 80242424 0C0906E4 */ jal func_80241B90 -/* DF12C8 80242428 0260302D */ daddu $a2, $s3, $zero -/* DF12CC 8024242C 0280202D */ daddu $a0, $s4, $zero -/* DF12D0 80242430 0200282D */ daddu $a1, $s0, $zero -/* DF12D4 80242434 0C090702 */ jal func_80241C08 -/* DF12D8 80242438 0260302D */ daddu $a2, $s3, $zero -/* DF12DC 8024243C 08090922 */ j .L80242488 -/* DF12E0 80242440 0000102D */ daddu $v0, $zero, $zero -/* DF12E4 80242444 0280202D */ daddu $a0, $s4, $zero -/* DF12E8 80242448 0200282D */ daddu $a1, $s0, $zero -/* DF12EC 8024244C 0C09071D */ jal func_80241C74 -/* DF12F0 80242450 0260302D */ daddu $a2, $s3, $zero -/* DF12F4 80242454 08090922 */ j .L80242488 -/* DF12F8 80242458 0000102D */ daddu $v0, $zero, $zero -/* DF12FC 8024245C 0280202D */ daddu $a0, $s4, $zero -/* DF1300 80242460 0200282D */ daddu $a1, $s0, $zero -/* DF1304 80242464 0C09076A */ jal func_80241DA8 -/* DF1308 80242468 0260302D */ daddu $a2, $s3, $zero -/* DF130C 8024246C 08090922 */ j .L80242488 -/* DF1310 80242470 0000102D */ daddu $v0, $zero, $zero -/* DF1314 80242474 0280202D */ daddu $a0, $s4, $zero -/* DF1318 80242478 0200282D */ daddu $a1, $s0, $zero -/* DF131C 8024247C 0C090783 */ jal func_80241E0C -/* DF1320 80242480 0260302D */ daddu $a2, $s3, $zero -.L80242484: -/* DF1324 80242484 0000102D */ daddu $v0, $zero, $zero -.L80242488: -/* DF1328 80242488 8FBF0048 */ lw $ra, 0x48($sp) -/* DF132C 8024248C 8FB50044 */ lw $s5, 0x44($sp) -/* DF1330 80242490 8FB40040 */ lw $s4, 0x40($sp) -/* DF1334 80242494 8FB3003C */ lw $s3, 0x3c($sp) -/* DF1338 80242498 8FB20038 */ lw $s2, 0x38($sp) -/* DF133C 8024249C 8FB10034 */ lw $s1, 0x34($sp) -/* DF1340 802424A0 8FB00030 */ lw $s0, 0x30($sp) -/* DF1344 802424A4 03E00008 */ jr $ra -/* DF1348 802424A8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_802428E0_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_802428E0_DEEEA0.s deleted file mode 100644 index a163fa1c95..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_802428E0_DEEEA0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428E0_DF1780 -/* DF1780 802428E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DF1784 802428E4 AFB10014 */ sw $s1, 0x14($sp) -/* DF1788 802428E8 0080882D */ daddu $s1, $a0, $zero -/* DF178C 802428EC AFBF0018 */ sw $ra, 0x18($sp) -/* DF1790 802428F0 AFB00010 */ sw $s0, 0x10($sp) -/* DF1794 802428F4 8E300148 */ lw $s0, 0x148($s1) -/* DF1798 802428F8 0C00EABB */ jal get_npc_unsafe -/* DF179C 802428FC 86040008 */ lh $a0, 8($s0) -/* DF17A0 80242900 96030076 */ lhu $v1, 0x76($s0) -/* DF17A4 80242904 A443008E */ sh $v1, 0x8e($v0) -/* DF17A8 80242908 24020021 */ addiu $v0, $zero, 0x21 -/* DF17AC 8024290C AE220070 */ sw $v0, 0x70($s1) -/* DF17B0 80242910 8FBF0018 */ lw $ra, 0x18($sp) -/* DF17B4 80242914 8FB10014 */ lw $s1, 0x14($sp) -/* DF17B8 80242918 8FB00010 */ lw $s0, 0x10($sp) -/* DF17BC 8024291C 03E00008 */ jr $ra -/* DF17C0 80242920 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_802429C4_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_802429C4_DEEEA0.s deleted file mode 100644 index efe9ee4654..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_802429C4_DEEEA0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802429C4_DF1864 -/* DF1864 802429C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF1868 802429C8 AFB00010 */ sw $s0, 0x10($sp) -/* DF186C 802429CC 0080802D */ daddu $s0, $a0, $zero -/* DF1870 802429D0 AFBF0014 */ sw $ra, 0x14($sp) -/* DF1874 802429D4 8E020148 */ lw $v0, 0x148($s0) -/* DF1878 802429D8 0C00EABB */ jal get_npc_unsafe -/* DF187C 802429DC 84440008 */ lh $a0, 8($v0) -/* DF1880 802429E0 9443008E */ lhu $v1, 0x8e($v0) -/* DF1884 802429E4 2463FFFF */ addiu $v1, $v1, -1 -/* DF1888 802429E8 A443008E */ sh $v1, 0x8e($v0) -/* DF188C 802429EC 00031C00 */ sll $v1, $v1, 0x10 -/* DF1890 802429F0 58600001 */ blezl $v1, .L802429F8 -/* DF1894 802429F4 AE000070 */ sw $zero, 0x70($s0) -.L802429F8: -/* DF1898 802429F8 8FBF0014 */ lw $ra, 0x14($sp) -/* DF189C 802429FC 8FB00010 */ lw $s0, 0x10($sp) -/* DF18A0 80242A00 03E00008 */ jr $ra -/* DF18A4 80242A04 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_17/func_80242A08_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/func_80242A08_DEEEA0.s deleted file mode 100644 index 836888dd5d..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/func_80242A08_DEEEA0.s +++ /dev/null @@ -1,354 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A08_DF18A8 -/* DF18A8 80242A08 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* DF18AC 80242A0C AFB7004C */ sw $s7, 0x4c($sp) -/* DF18B0 80242A10 0080B82D */ daddu $s7, $a0, $zero -/* DF18B4 80242A14 AFB10034 */ sw $s1, 0x34($sp) -/* DF18B8 80242A18 00A0882D */ daddu $s1, $a1, $zero -/* DF18BC 80242A1C AFBF0050 */ sw $ra, 0x50($sp) -/* DF18C0 80242A20 AFB60048 */ sw $s6, 0x48($sp) -/* DF18C4 80242A24 AFB50044 */ sw $s5, 0x44($sp) -/* DF18C8 80242A28 AFB40040 */ sw $s4, 0x40($sp) -/* DF18CC 80242A2C AFB3003C */ sw $s3, 0x3c($sp) -/* DF18D0 80242A30 AFB20038 */ sw $s2, 0x38($sp) -/* DF18D4 80242A34 AFB00030 */ sw $s0, 0x30($sp) -/* DF18D8 80242A38 8EF30148 */ lw $s3, 0x148($s7) -/* DF18DC 80242A3C 86640008 */ lh $a0, 8($s3) -/* DF18E0 80242A40 8EF0000C */ lw $s0, 0xc($s7) -/* DF18E4 80242A44 0C00FB5A */ jal get_enemy_safe -/* DF18E8 80242A48 0000B02D */ daddu $s6, $zero, $zero -/* DF18EC 80242A4C 10400131 */ beqz $v0, .L80242F14 -/* DF18F0 80242A50 24020005 */ addiu $v0, $zero, 5 -/* DF18F4 80242A54 8E63006C */ lw $v1, 0x6c($s3) -/* DF18F8 80242A58 1062012F */ beq $v1, $v0, .L80242F18 -/* DF18FC 80242A5C 0000102D */ daddu $v0, $zero, $zero -/* DF1900 80242A60 8E050000 */ lw $a1, ($s0) -/* DF1904 80242A64 0C0B1EAF */ jal get_variable -/* DF1908 80242A68 02E0202D */ daddu $a0, $s7, $zero -/* DF190C 80242A6C 86640008 */ lh $a0, 8($s3) -/* DF1910 80242A70 0C00EABB */ jal get_npc_unsafe -/* DF1914 80242A74 0040A82D */ daddu $s5, $v0, $zero -/* DF1918 80242A78 8E630070 */ lw $v1, 0x70($s3) -/* DF191C 80242A7C 30630002 */ andi $v1, $v1, 2 -/* DF1920 80242A80 10600008 */ beqz $v1, .L80242AA4 -/* DF1924 80242A84 0040902D */ daddu $s2, $v0, $zero -/* DF1928 80242A88 964200A8 */ lhu $v0, 0xa8($s2) -/* DF192C 80242A8C 00021400 */ sll $v0, $v0, 0x10 -/* DF1930 80242A90 00021C03 */ sra $v1, $v0, 0x10 -/* DF1934 80242A94 000217C2 */ srl $v0, $v0, 0x1f -/* DF1938 80242A98 00621821 */ addu $v1, $v1, $v0 -/* DF193C 80242A9C 00031843 */ sra $v1, $v1, 1 -/* DF1940 80242AA0 A24300AB */ sb $v1, 0xab($s2) -.L80242AA4: -/* DF1944 80242AA4 16200005 */ bnez $s1, .L80242ABC -/* DF1948 80242AA8 3C030004 */ lui $v1, 4 -/* DF194C 80242AAC 8E6200B0 */ lw $v0, 0xb0($s3) -/* DF1950 80242AB0 30420004 */ andi $v0, $v0, 4 -/* DF1954 80242AB4 10400019 */ beqz $v0, .L80242B1C -/* DF1958 80242AB8 00000000 */ nop -.L80242ABC: -/* DF195C 80242ABC 34630102 */ ori $v1, $v1, 0x102 -/* DF1960 80242AC0 AEE00070 */ sw $zero, 0x70($s7) -/* DF1964 80242AC4 8E420000 */ lw $v0, ($s2) -/* DF1968 80242AC8 0240202D */ daddu $a0, $s2, $zero -/* DF196C 80242ACC A640008E */ sh $zero, 0x8e($s2) -/* DF1970 80242AD0 00431025 */ or $v0, $v0, $v1 -/* DF1974 80242AD4 0C00EAFF */ jal disable_npc_shadow -/* DF1978 80242AD8 AE420000 */ sw $v0, ($s2) -/* DF197C 80242ADC 3C041F30 */ lui $a0, 0x1f30 -/* DF1980 80242AE0 8E420000 */ lw $v0, ($s2) -/* DF1984 80242AE4 2403F7FF */ addiu $v1, $zero, -0x801 -/* DF1988 80242AE8 00431024 */ and $v0, $v0, $v1 -/* DF198C 80242AEC AE420000 */ sw $v0, ($s2) -/* DF1990 80242AF0 8E620000 */ lw $v0, ($s3) -/* DF1994 80242AF4 8E6300B0 */ lw $v1, 0xb0($s3) -/* DF1998 80242AF8 34840040 */ ori $a0, $a0, 0x40 -/* DF199C 80242AFC AE60006C */ sw $zero, 0x6c($s3) -/* DF19A0 80242B00 00441025 */ or $v0, $v0, $a0 -/* DF19A4 80242B04 AE620000 */ sw $v0, ($s3) -/* DF19A8 80242B08 30620004 */ andi $v0, $v1, 4 -/* DF19AC 80242B0C 10400003 */ beqz $v0, .L80242B1C -/* DF19B0 80242B10 2402FFFB */ addiu $v0, $zero, -5 -/* DF19B4 80242B14 00621024 */ and $v0, $v1, $v0 -/* DF19B8 80242B18 AE6200B0 */ sw $v0, 0xb0($s3) -.L80242B1C: -/* DF19BC 80242B1C 8EE30070 */ lw $v1, 0x70($s7) -/* DF19C0 80242B20 24100001 */ addiu $s0, $zero, 1 -/* DF19C4 80242B24 10700012 */ beq $v1, $s0, .L80242B70 -/* DF19C8 80242B28 28620002 */ slti $v0, $v1, 2 -/* DF19CC 80242B2C 10400005 */ beqz $v0, .L80242B44 -/* DF19D0 80242B30 24020002 */ addiu $v0, $zero, 2 -/* DF19D4 80242B34 10600007 */ beqz $v1, .L80242B54 -/* DF19D8 80242B38 0000102D */ daddu $v0, $zero, $zero -/* DF19DC 80242B3C 08090BC6 */ j .L80242F18 -/* DF19E0 80242B40 00000000 */ nop -.L80242B44: -/* DF19E4 80242B44 1062005B */ beq $v1, $v0, .L80242CB4 -/* DF19E8 80242B48 0000102D */ daddu $v0, $zero, $zero -/* DF19EC 80242B4C 08090BC6 */ j .L80242F18 -/* DF19F0 80242B50 00000000 */ nop -.L80242B54: -/* DF19F4 80242B54 8E420000 */ lw $v0, ($s2) -/* DF19F8 80242B58 0240202D */ daddu $a0, $s2, $zero -/* DF19FC 80242B5C 34420002 */ ori $v0, $v0, 2 -/* DF1A00 80242B60 0C00EAFF */ jal disable_npc_shadow -/* DF1A04 80242B64 AE420000 */ sw $v0, ($s2) -/* DF1A08 80242B68 AE60006C */ sw $zero, 0x6c($s3) -/* DF1A0C 80242B6C AEF00070 */ sw $s0, 0x70($s7) -.L80242B70: -/* DF1A10 80242B70 8E74006C */ lw $s4, 0x6c($s3) -/* DF1A14 80242B74 24020001 */ addiu $v0, $zero, 1 -/* DF1A18 80242B78 168200E7 */ bne $s4, $v0, .L80242F18 -/* DF1A1C 80242B7C 0000102D */ daddu $v0, $zero, $zero -/* DF1A20 80242B80 8E64007C */ lw $a0, 0x7c($s3) -/* DF1A24 80242B84 24110002 */ addiu $s1, $zero, 2 -/* DF1A28 80242B88 0C00EABB */ jal get_npc_unsafe -/* DF1A2C 80242B8C AE71006C */ sw $s1, 0x6c($s3) -/* DF1A30 80242B90 0040802D */ daddu $s0, $v0, $zero -/* DF1A34 80242B94 C6000038 */ lwc1 $f0, 0x38($s0) -/* DF1A38 80242B98 E6400038 */ swc1 $f0, 0x38($s2) -/* DF1A3C 80242B9C C6000040 */ lwc1 $f0, 0x40($s0) -/* DF1A40 80242BA0 E6400040 */ swc1 $f0, 0x40($s2) -/* DF1A44 80242BA4 C6020034 */ lwc1 $f2, 0x34($s0) -/* DF1A48 80242BA8 3C014387 */ lui $at, 0x4387 -/* DF1A4C 80242BAC 44810000 */ mtc1 $at, $f0 -/* DF1A50 80242BB0 26440038 */ addiu $a0, $s2, 0x38 -/* DF1A54 80242BB4 46020001 */ sub.s $f0, $f0, $f2 -/* DF1A58 80242BB8 C6680078 */ lwc1 $f8, 0x78($s3) -/* DF1A5C 80242BBC 46804220 */ cvt.s.w $f8, $f8 -/* DF1A60 80242BC0 44064000 */ mfc1 $a2, $f8 -/* DF1A64 80242BC4 44070000 */ mfc1 $a3, $f0 -/* DF1A68 80242BC8 0C00A7E7 */ jal add_vec2D_polar -/* DF1A6C 80242BCC 26450040 */ addiu $a1, $s2, 0x40 -/* DF1A70 80242BD0 C600003C */ lwc1 $f0, 0x3c($s0) -/* DF1A74 80242BD4 C6620074 */ lwc1 $f2, 0x74($s3) -/* DF1A78 80242BD8 468010A0 */ cvt.s.w $f2, $f2 -/* DF1A7C 80242BDC 46020000 */ add.s $f0, $f0, $f2 -/* DF1A80 80242BE0 E640003C */ swc1 $f0, 0x3c($s2) -/* DF1A84 80242BE4 A2740007 */ sb $s4, 7($s3) -/* DF1A88 80242BE8 C6400038 */ lwc1 $f0, 0x38($s2) -/* DF1A8C 80242BEC 4600020D */ trunc.w.s $f8, $f0 -/* DF1A90 80242BF0 44024000 */ mfc1 $v0, $f8 -/* DF1A94 80242BF4 00000000 */ nop -/* DF1A98 80242BF8 A6620010 */ sh $v0, 0x10($s3) -/* DF1A9C 80242BFC C640003C */ lwc1 $f0, 0x3c($s2) -/* DF1AA0 80242C00 4600020D */ trunc.w.s $f8, $f0 -/* DF1AA4 80242C04 44024000 */ mfc1 $v0, $f8 -/* DF1AA8 80242C08 00000000 */ nop -/* DF1AAC 80242C0C A6620012 */ sh $v0, 0x12($s3) -/* DF1AB0 80242C10 C6400040 */ lwc1 $f0, 0x40($s2) -/* DF1AB4 80242C14 4600020D */ trunc.w.s $f8, $f0 -/* DF1AB8 80242C18 44024000 */ mfc1 $v0, $f8 -/* DF1ABC 80242C1C 00000000 */ nop -/* DF1AC0 80242C20 A6620014 */ sh $v0, 0x14($s3) -/* DF1AC4 80242C24 AE400044 */ sw $zero, 0x44($s2) -/* DF1AC8 80242C28 AE400048 */ sw $zero, 0x48($s2) -/* DF1ACC 80242C2C AE40004C */ sw $zero, 0x4c($s2) -/* DF1AD0 80242C30 C6A00000 */ lwc1 $f0, ($s5) -/* DF1AD4 80242C34 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DF1AD8 80242C38 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DF1ADC 80242C3C C64C0038 */ lwc1 $f12, 0x38($s2) -/* DF1AE0 80242C40 C64E0040 */ lwc1 $f14, 0x40($s2) -/* DF1AE4 80242C44 E6400018 */ swc1 $f0, 0x18($s2) -/* DF1AE8 80242C48 8C460028 */ lw $a2, 0x28($v0) -/* DF1AEC 80242C4C 0C00A720 */ jal atan2 -/* DF1AF0 80242C50 8C470030 */ lw $a3, 0x30($v0) -/* DF1AF4 80242C54 E640000C */ swc1 $f0, 0xc($s2) -/* DF1AF8 80242C58 C6A0000C */ lwc1 $f0, 0xc($s5) -/* DF1AFC 80242C5C 8E420000 */ lw $v0, ($s2) -/* DF1B00 80242C60 0240202D */ daddu $a0, $s2, $zero -/* DF1B04 80242C64 E640001C */ swc1 $f0, 0x1c($s2) -/* DF1B08 80242C68 C6A00010 */ lwc1 $f0, 0x10($s5) -/* DF1B0C 80242C6C 2403FFFD */ addiu $v1, $zero, -3 -/* DF1B10 80242C70 E6400014 */ swc1 $f0, 0x14($s2) -/* DF1B14 80242C74 C600003C */ lwc1 $f0, 0x3c($s0) -/* DF1B18 80242C78 00431024 */ and $v0, $v0, $v1 -/* DF1B1C 80242C7C AE420000 */ sw $v0, ($s2) -/* DF1B20 80242C80 0C00EAE8 */ jal enable_npc_shadow -/* DF1B24 80242C84 E6400064 */ swc1 $f0, 0x64($s2) -/* DF1B28 80242C88 8E420000 */ lw $v0, ($s2) -/* DF1B2C 80242C8C 3C03E0FF */ lui $v1, 0xe0ff -/* DF1B30 80242C90 34420800 */ ori $v0, $v0, 0x800 -/* DF1B34 80242C94 AE420000 */ sw $v0, ($s2) -/* DF1B38 80242C98 8E620000 */ lw $v0, ($s3) -/* DF1B3C 80242C9C 3463FFFF */ ori $v1, $v1, 0xffff -/* DF1B40 80242CA0 00431024 */ and $v0, $v0, $v1 -/* DF1B44 80242CA4 AE620000 */ sw $v0, ($s3) -/* DF1B48 80242CA8 2402005A */ addiu $v0, $zero, 0x5a -/* DF1B4C 80242CAC A642008E */ sh $v0, 0x8e($s2) -/* DF1B50 80242CB0 AEF10070 */ sw $s1, 0x70($s7) -.L80242CB4: -/* DF1B54 80242CB4 0000202D */ daddu $a0, $zero, $zero -/* DF1B58 80242CB8 27B00020 */ addiu $s0, $sp, 0x20 -/* DF1B5C 80242CBC 864200A8 */ lh $v0, 0xa8($s2) -/* DF1B60 80242CC0 3C013FE0 */ lui $at, 0x3fe0 -/* DF1B64 80242CC4 44810800 */ mtc1 $at, $f1 -/* DF1B68 80242CC8 44800000 */ mtc1 $zero, $f0 -/* DF1B6C 80242CCC 44821000 */ mtc1 $v0, $f2 -/* DF1B70 80242CD0 00000000 */ nop -/* DF1B74 80242CD4 468010A1 */ cvt.d.w $f2, $f2 -/* DF1B78 80242CD8 46201082 */ mul.d $f2, $f2, $f0 -/* DF1B7C 80242CDC 00000000 */ nop -/* DF1B80 80242CE0 0200282D */ daddu $a1, $s0, $zero -/* DF1B84 80242CE4 C6440038 */ lwc1 $f4, 0x38($s2) -/* DF1B88 80242CE8 C640003C */ lwc1 $f0, 0x3c($s2) -/* DF1B8C 80242CEC 27B10024 */ addiu $s1, $sp, 0x24 -/* DF1B90 80242CF0 E7A40020 */ swc1 $f4, 0x20($sp) -/* DF1B94 80242CF4 C6440040 */ lwc1 $f4, 0x40($s2) -/* DF1B98 80242CF8 46000021 */ cvt.d.s $f0, $f0 -/* DF1B9C 80242CFC 46220000 */ add.d $f0, $f0, $f2 -/* DF1BA0 80242D00 E7A40028 */ swc1 $f4, 0x28($sp) -/* DF1BA4 80242D04 C6420018 */ lwc1 $f2, 0x18($s2) -/* DF1BA8 80242D08 46200020 */ cvt.s.d $f0, $f0 -/* DF1BAC 80242D0C E7A00024 */ swc1 $f0, 0x24($sp) -/* DF1BB0 80242D10 E7A20010 */ swc1 $f2, 0x10($sp) -/* DF1BB4 80242D14 C640000C */ lwc1 $f0, 0xc($s2) -/* DF1BB8 80242D18 0220302D */ daddu $a2, $s1, $zero -/* DF1BBC 80242D1C E7A00014 */ swc1 $f0, 0x14($sp) -/* DF1BC0 80242D20 864200A6 */ lh $v0, 0xa6($s2) -/* DF1BC4 80242D24 27B40028 */ addiu $s4, $sp, 0x28 -/* DF1BC8 80242D28 44820000 */ mtc1 $v0, $f0 -/* DF1BCC 80242D2C 00000000 */ nop -/* DF1BD0 80242D30 46800020 */ cvt.s.w $f0, $f0 -/* DF1BD4 80242D34 E7A00018 */ swc1 $f0, 0x18($sp) -/* DF1BD8 80242D38 864200A8 */ lh $v0, 0xa8($s2) -/* DF1BDC 80242D3C 0280382D */ daddu $a3, $s4, $zero -/* DF1BE0 80242D40 44820000 */ mtc1 $v0, $f0 -/* DF1BE4 80242D44 00000000 */ nop -/* DF1BE8 80242D48 46800020 */ cvt.s.w $f0, $f0 -/* DF1BEC 80242D4C 0C0376B9 */ jal func_800DDAE4 -/* DF1BF0 80242D50 E7A0001C */ swc1 $f0, 0x1c($sp) -/* DF1BF4 80242D54 54400001 */ bnel $v0, $zero, .L80242D5C -/* DF1BF8 80242D58 24160001 */ addiu $s6, $zero, 1 -.L80242D5C: -/* DF1BFC 80242D5C 0200282D */ daddu $a1, $s0, $zero -/* DF1C00 80242D60 0220302D */ daddu $a2, $s1, $zero -/* DF1C04 80242D64 C6400038 */ lwc1 $f0, 0x38($s2) -/* DF1C08 80242D68 C642003C */ lwc1 $f2, 0x3c($s2) -/* DF1C0C 80242D6C C6440040 */ lwc1 $f4, 0x40($s2) -/* DF1C10 80242D70 3C01447A */ lui $at, 0x447a -/* DF1C14 80242D74 44813000 */ mtc1 $at, $f6 -/* DF1C18 80242D78 27A2002C */ addiu $v0, $sp, 0x2c -/* DF1C1C 80242D7C E7A00020 */ swc1 $f0, 0x20($sp) -/* DF1C20 80242D80 E7A20024 */ swc1 $f2, 0x24($sp) -/* DF1C24 80242D84 E7A40028 */ swc1 $f4, 0x28($sp) -/* DF1C28 80242D88 E7A6002C */ swc1 $f6, 0x2c($sp) -/* DF1C2C 80242D8C AFA20010 */ sw $v0, 0x10($sp) -/* DF1C30 80242D90 8E440080 */ lw $a0, 0x80($s2) -/* DF1C34 80242D94 0C0372DF */ jal func_800DCB7C -/* DF1C38 80242D98 0280382D */ daddu $a3, $s4, $zero -/* DF1C3C 80242D9C 10400019 */ beqz $v0, .L80242E04 -/* DF1C40 80242DA0 00000000 */ nop -/* DF1C44 80242DA4 C640001C */ lwc1 $f0, 0x1c($s2) -/* DF1C48 80242DA8 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* DF1C4C 80242DAC 46000005 */ abs.s $f0, $f0 -/* DF1C50 80242DB0 4600103C */ c.lt.s $f2, $f0 -/* DF1C54 80242DB4 00000000 */ nop -/* DF1C58 80242DB8 45000012 */ bc1f .L80242E04 -/* DF1C5C 80242DBC 00000000 */ nop -/* DF1C60 80242DC0 C7A40024 */ lwc1 $f4, 0x24($sp) -/* DF1C64 80242DC4 C6400064 */ lwc1 $f0, 0x64($s2) -/* DF1C68 80242DC8 46002001 */ sub.s $f0, $f4, $f0 -/* DF1C6C 80242DCC 3C014034 */ lui $at, 0x4034 -/* DF1C70 80242DD0 44811800 */ mtc1 $at, $f3 -/* DF1C74 80242DD4 44801000 */ mtc1 $zero, $f2 -/* DF1C78 80242DD8 46000005 */ abs.s $f0, $f0 -/* DF1C7C 80242DDC 46000021 */ cvt.d.s $f0, $f0 -/* DF1C80 80242DE0 4622003C */ c.lt.d $f0, $f2 -/* DF1C84 80242DE4 00000000 */ nop -/* DF1C88 80242DE8 45000006 */ bc1f .L80242E04 -/* DF1C8C 80242DEC 0240202D */ daddu $a0, $s2, $zero -/* DF1C90 80242DF0 8E450018 */ lw $a1, 0x18($s2) -/* DF1C94 80242DF4 8E46000C */ lw $a2, 0xc($s2) -/* DF1C98 80242DF8 2416000A */ addiu $s6, $zero, 0xa -/* DF1C9C 80242DFC 0C00EA95 */ jal npc_move_heading -/* DF1CA0 80242E00 E644003C */ swc1 $f4, 0x3c($s2) -.L80242E04: -/* DF1CA4 80242E04 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DF1CA8 80242E08 3C013FF0 */ lui $at, 0x3ff0 -/* DF1CAC 80242E0C 44811800 */ mtc1 $at, $f3 -/* DF1CB0 80242E10 44801000 */ mtc1 $zero, $f2 -/* DF1CB4 80242E14 46000021 */ cvt.d.s $f0, $f0 -/* DF1CB8 80242E18 4622003C */ c.lt.d $f0, $f2 -/* DF1CBC 80242E1C 00000000 */ nop -/* DF1CC0 80242E20 45030001 */ bc1tl .L80242E28 -/* DF1CC4 80242E24 2416000B */ addiu $s6, $zero, 0xb -.L80242E28: -/* DF1CC8 80242E28 9642008E */ lhu $v0, 0x8e($s2) -/* DF1CCC 80242E2C 2442FFFF */ addiu $v0, $v0, -1 -/* DF1CD0 80242E30 A642008E */ sh $v0, 0x8e($s2) -/* DF1CD4 80242E34 00021400 */ sll $v0, $v0, 0x10 -/* DF1CD8 80242E38 58400001 */ blezl $v0, .L80242E40 -/* DF1CDC 80242E3C 24160014 */ addiu $s6, $zero, 0x14 -.L80242E40: -/* DF1CE0 80242E40 56C00019 */ bnel $s6, $zero, .L80242EA8 -/* DF1CE4 80242E44 AFA00010 */ sw $zero, 0x10($sp) -/* DF1CE8 80242E48 8E620070 */ lw $v0, 0x70($s3) -/* DF1CEC 80242E4C 30420001 */ andi $v0, $v0, 1 -/* DF1CF0 80242E50 10400009 */ beqz $v0, .L80242E78 -/* DF1CF4 80242E54 00000000 */ nop -/* DF1CF8 80242E58 C640004C */ lwc1 $f0, 0x4c($s2) -/* DF1CFC 80242E5C 3C014044 */ lui $at, 0x4044 -/* DF1D00 80242E60 44811800 */ mtc1 $at, $f3 -/* DF1D04 80242E64 44801000 */ mtc1 $zero, $f2 -/* DF1D08 80242E68 46000021 */ cvt.d.s $f0, $f0 -/* DF1D0C 80242E6C 46220000 */ add.d $f0, $f0, $f2 -/* DF1D10 80242E70 46200020 */ cvt.s.d $f0, $f0 -/* DF1D14 80242E74 E640004C */ swc1 $f0, 0x4c($s2) -.L80242E78: -/* DF1D18 80242E78 8E450018 */ lw $a1, 0x18($s2) -/* DF1D1C 80242E7C 8E46000C */ lw $a2, 0xc($s2) -/* DF1D20 80242E80 0C00EA95 */ jal npc_move_heading -/* DF1D24 80242E84 0240202D */ daddu $a0, $s2, $zero -/* DF1D28 80242E88 C644003C */ lwc1 $f4, 0x3c($s2) -/* DF1D2C 80242E8C C640001C */ lwc1 $f0, 0x1c($s2) -/* DF1D30 80242E90 46002100 */ add.s $f4, $f4, $f0 -/* DF1D34 80242E94 C6420014 */ lwc1 $f2, 0x14($s2) -/* DF1D38 80242E98 46020001 */ sub.s $f0, $f0, $f2 -/* DF1D3C 80242E9C E644003C */ swc1 $f4, 0x3c($s2) -/* DF1D40 80242EA0 08090BC5 */ j .L80242F14 -/* DF1D44 80242EA4 E640001C */ swc1 $f0, 0x1c($s2) -.L80242EA8: -/* DF1D48 80242EA8 AFA00014 */ sw $zero, 0x14($sp) -/* DF1D4C 80242EAC 8E450038 */ lw $a1, 0x38($s2) -/* DF1D50 80242EB0 8E46003C */ lw $a2, 0x3c($s2) -/* DF1D54 80242EB4 8E470040 */ lw $a3, 0x40($s2) -/* DF1D58 80242EB8 0C01BECC */ jal fx_walk_normal -/* DF1D5C 80242EBC 24040002 */ addiu $a0, $zero, 2 -/* DF1D60 80242EC0 3C01C47A */ lui $at, 0xc47a -/* DF1D64 80242EC4 44810000 */ mtc1 $at, $f0 -/* DF1D68 80242EC8 AE60006C */ sw $zero, 0x6c($s3) -/* DF1D6C 80242ECC 8E420000 */ lw $v0, ($s2) -/* DF1D70 80242ED0 0240202D */ daddu $a0, $s2, $zero -/* DF1D74 80242ED4 AE400038 */ sw $zero, 0x38($s2) -/* DF1D78 80242ED8 AE400040 */ sw $zero, 0x40($s2) -/* DF1D7C 80242EDC AE40001C */ sw $zero, 0x1c($s2) -/* DF1D80 80242EE0 34420002 */ ori $v0, $v0, 2 -/* DF1D84 80242EE4 E640003C */ swc1 $f0, 0x3c($s2) -/* DF1D88 80242EE8 0C00EAFF */ jal disable_npc_shadow -/* DF1D8C 80242EEC AE420000 */ sw $v0, ($s2) -/* DF1D90 80242EF0 8E420000 */ lw $v0, ($s2) -/* DF1D94 80242EF4 2403F7FF */ addiu $v1, $zero, -0x801 -/* DF1D98 80242EF8 00431024 */ and $v0, $v0, $v1 -/* DF1D9C 80242EFC AE420000 */ sw $v0, ($s2) -/* DF1DA0 80242F00 8E620000 */ lw $v0, ($s3) -/* DF1DA4 80242F04 3C031F00 */ lui $v1, 0x1f00 -/* DF1DA8 80242F08 00431025 */ or $v0, $v0, $v1 -/* DF1DAC 80242F0C AE620000 */ sw $v0, ($s3) -/* DF1DB0 80242F10 AEE00070 */ sw $zero, 0x70($s7) -.L80242F14: -/* DF1DB4 80242F14 0000102D */ daddu $v0, $zero, $zero -.L80242F18: -/* DF1DB8 80242F18 8FBF0050 */ lw $ra, 0x50($sp) -/* DF1DBC 80242F1C 8FB7004C */ lw $s7, 0x4c($sp) -/* DF1DC0 80242F20 8FB60048 */ lw $s6, 0x48($sp) -/* DF1DC4 80242F24 8FB50044 */ lw $s5, 0x44($sp) -/* DF1DC8 80242F28 8FB40040 */ lw $s4, 0x40($sp) -/* DF1DCC 80242F2C 8FB3003C */ lw $s3, 0x3c($sp) -/* DF1DD0 80242F30 8FB20038 */ lw $s2, 0x38($sp) -/* DF1DD4 80242F34 8FB10034 */ lw $s1, 0x34($sp) -/* DF1DD8 80242F38 8FB00030 */ lw $s0, 0x30($sp) -/* DF1DDC 80242F3C 03E00008 */ jr $ra -/* DF1DE0 80242F40 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_osr/osr_00/func_80240124_AAC830.s b/asm/nonmatchings/world/area_osr/osr_00/func_80240124_AAC830.s deleted file mode 100644 index 5d8c1852fe..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_00/func_80240124_AAC830.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_AAC954 -/* AAC954 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AAC958 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* AAC95C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* AAC960 80240130 10A00005 */ beqz $a1, .L80240148 -/* AAC964 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* AAC968 80240138 AE000070 */ sw $zero, 0x70($s0) -/* AAC96C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* AAC970 80240140 AE000078 */ sw $zero, 0x78($s0) -/* AAC974 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* AAC978 80240148 8E020070 */ lw $v0, 0x70($s0) -/* AAC97C 8024014C 1440000E */ bnez $v0, .L80240188 -/* AAC980 80240150 00000000 */ nop -/* AAC984 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* AAC988 80240158 8E020088 */ lw $v0, 0x88($s0) -/* AAC98C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* AAC990 80240160 04610004 */ bgez $v1, .L80240174 -/* AAC994 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* AAC998 80240168 3C020002 */ lui $v0, 2 -/* AAC99C 8024016C 08090061 */ j .L80240184 -/* AAC9A0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* AAC9A4 80240174 3C040002 */ lui $a0, 2 -/* AAC9A8 80240178 0083102A */ slt $v0, $a0, $v1 -/* AAC9AC 8024017C 10400002 */ beqz $v0, .L80240188 -/* AAC9B0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* AAC9B4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* AAC9B8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* AAC9BC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* AAC9C0 80240190 00000000 */ nop -/* AAC9C4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* AAC9C8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* AAC9CC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* AAC9D0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* AAC9D4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* AAC9D8 802401A8 3C020002 */ lui $v0, 2 -/* AAC9DC 802401AC 08090071 */ j .L802401C4 -/* AAC9E0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* AAC9E4 802401B4 3C040002 */ lui $a0, 2 -/* AAC9E8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* AAC9EC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* AAC9F0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* AAC9F4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* AAC9F8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* AAC9FC 802401CC 1440000E */ bnez $v0, .L80240208 -/* AACA00 802401D0 00000000 */ nop -/* AACA04 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* AACA08 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* AACA0C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* AACA10 802401E0 04610004 */ bgez $v1, .L802401F4 -/* AACA14 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* AACA18 802401E8 3C020002 */ lui $v0, 2 -/* AACA1C 802401EC 08090081 */ j .L80240204 -/* AACA20 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* AACA24 802401F4 3C040002 */ lui $a0, 2 -/* AACA28 802401F8 0083102A */ slt $v0, $a0, $v1 -/* AACA2C 802401FC 10400002 */ beqz $v0, .L80240208 -/* AACA30 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* AACA34 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* AACA38 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* AACA3C 8024020C 1440000E */ bnez $v0, .L80240248 -/* AACA40 80240210 00000000 */ nop -/* AACA44 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* AACA48 80240218 8E020094 */ lw $v0, 0x94($s0) -/* AACA4C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* AACA50 80240220 04610004 */ bgez $v1, .L80240234 -/* AACA54 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* AACA58 80240228 3C020002 */ lui $v0, 2 -/* AACA5C 8024022C 08090091 */ j .L80240244 -/* AACA60 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* AACA64 80240234 3C040002 */ lui $a0, 2 -/* AACA68 80240238 0083102A */ slt $v0, $a0, $v1 -/* AACA6C 8024023C 10400002 */ beqz $v0, .L80240248 -/* AACA70 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* AACA74 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* AACA78 80240248 8E040084 */ lw $a0, 0x84($s0) -/* AACA7C 8024024C 0C046F07 */ jal set_main_pan_u -/* AACA80 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* AACA84 80240254 8E040084 */ lw $a0, 0x84($s0) -/* AACA88 80240258 0C046F0D */ jal set_main_pan_v -/* AACA8C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* AACA90 80240260 8E040084 */ lw $a0, 0x84($s0) -/* AACA94 80240264 0C046F13 */ jal set_aux_pan_u -/* AACA98 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* AACA9C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* AACAA0 80240270 0C046F19 */ jal set_aux_pan_v -/* AACAA4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* AACAA8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* AACAAC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* AACAB0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* AACAB4 80240284 24420001 */ addiu $v0, $v0, 1 -/* AACAB8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* AACABC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* AACAC0 80240290 24630001 */ addiu $v1, $v1, 1 -/* AACAC4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* AACAC8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* AACACC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* AACAD0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* AACAD4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* AACAD8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* AACADC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* AACAE0 802402B0 14600002 */ bnez $v1, .L802402BC -/* AACAE4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* AACAE8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* AACAEC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* AACAF0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* AACAF4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* AACAF8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* AACAFC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* AACB00 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* AACB04 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* AACB08 802402D8 0043102A */ slt $v0, $v0, $v1 -/* AACB0C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* AACB10 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* AACB14 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* AACB18 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* AACB1C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* AACB20 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* AACB24 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* AACB28 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* AACB2C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* AACB30 80240300 0000102D */ daddu $v0, $zero, $zero -/* AACB34 80240304 03E00008 */ jr $ra -/* AACB38 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_osr/osr_00/func_8024030C_AAC830.s b/asm/nonmatchings/world/area_osr/osr_00/func_8024030C_AAC830.s deleted file mode 100644 index dca9b5d173..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_00/func_8024030C_AAC830.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_AACB3C -/* AACB3C 8024030C 44800000 */ mtc1 $zero, $f0 -/* AACB40 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AACB44 80240314 44050000 */ mfc1 $a1, $f0 -/* AACB48 80240318 24040001 */ addiu $a0, $zero, 1 -/* AACB4C 8024031C AFBF0018 */ sw $ra, 0x18($sp) -/* AACB50 80240320 AFA00014 */ sw $zero, 0x14($sp) -/* AACB54 80240324 E7A00010 */ swc1 $f0, 0x10($sp) -/* AACB58 80240328 00A0302D */ daddu $a2, $a1, $zero -/* AACB5C 8024032C 0C01CA54 */ jal func_80072950 -/* AACB60 80240330 00A0382D */ daddu $a3, $a1, $zero -/* AACB64 80240334 8FBF0018 */ lw $ra, 0x18($sp) -/* AACB68 80240338 24020002 */ addiu $v0, $zero, 2 -/* AACB6C 8024033C 03E00008 */ jr $ra -/* AACB70 80240340 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_osr/osr_00/func_80240344_AAC830.s b/asm/nonmatchings/world/area_osr/osr_00/func_80240344_AAC830.s deleted file mode 100644 index 572361ed0d..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_00/func_80240344_AAC830.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240344_AACB74 -/* AACB74 80240344 44800000 */ mtc1 $zero, $f0 -/* AACB78 80240348 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AACB7C 8024034C 44050000 */ mfc1 $a1, $f0 -/* AACB80 80240350 0000202D */ daddu $a0, $zero, $zero -/* AACB84 80240354 AFBF0018 */ sw $ra, 0x18($sp) -/* AACB88 80240358 AFA00014 */ sw $zero, 0x14($sp) -/* AACB8C 8024035C E7A00010 */ swc1 $f0, 0x10($sp) -/* AACB90 80240360 00A0302D */ daddu $a2, $a1, $zero -/* AACB94 80240364 0C01CA54 */ jal func_80072950 -/* AACB98 80240368 00A0382D */ daddu $a3, $a1, $zero -/* AACB9C 8024036C 8FBF0018 */ lw $ra, 0x18($sp) -/* AACBA0 80240370 24020002 */ addiu $v0, $zero, 2 -/* AACBA4 80240374 03E00008 */ jr $ra -/* AACBA8 80240378 27BD0020 */ addiu $sp, $sp, 0x20 -/* AACBAC 8024037C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_00/func_80240380_AAC830.s b/asm/nonmatchings/world/area_osr/osr_00/func_80240380_AAC830.s deleted file mode 100644 index c42ee6b77e..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_00/func_80240380_AAC830.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240380_AACBB0 -/* AACBB0 80240380 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AACBB4 80240384 AFB10014 */ sw $s1, 0x14($sp) -/* AACBB8 80240388 0080882D */ daddu $s1, $a0, $zero -/* AACBBC 8024038C AFBF001C */ sw $ra, 0x1c($sp) -/* AACBC0 80240390 AFB20018 */ sw $s2, 0x18($sp) -/* AACBC4 80240394 AFB00010 */ sw $s0, 0x10($sp) -/* AACBC8 80240398 8E30000C */ lw $s0, 0xc($s1) -/* AACBCC 8024039C 8E050000 */ lw $a1, ($s0) -/* AACBD0 802403A0 0C0B1EAF */ jal get_variable -/* AACBD4 802403A4 26100004 */ addiu $s0, $s0, 4 -/* AACBD8 802403A8 8E050000 */ lw $a1, ($s0) -/* AACBDC 802403AC 26100004 */ addiu $s0, $s0, 4 -/* AACBE0 802403B0 0220202D */ daddu $a0, $s1, $zero -/* AACBE4 802403B4 0C0B1EAF */ jal get_variable -/* AACBE8 802403B8 0040902D */ daddu $s2, $v0, $zero -/* AACBEC 802403BC 0220202D */ daddu $a0, $s1, $zero -/* AACBF0 802403C0 8E050000 */ lw $a1, ($s0) -/* AACBF4 802403C4 0C0B1EAF */ jal get_variable -/* AACBF8 802403C8 0040802D */ daddu $s0, $v0, $zero -/* AACBFC 802403CC 0040882D */ daddu $s1, $v0, $zero -/* AACC00 802403D0 2402FFFF */ addiu $v0, $zero, -1 -/* AACC04 802403D4 16020005 */ bne $s0, $v0, .L802403EC -/* AACC08 802403D8 24020001 */ addiu $v0, $zero, 1 -/* AACC0C 802403DC 0C04760B */ jal func_8011D82C -/* AACC10 802403E0 0220202D */ daddu $a0, $s1, $zero -/* AACC14 802403E4 08090123 */ j .L8024048C -/* AACC18 802403E8 24020002 */ addiu $v0, $zero, 2 -.L802403EC: -/* AACC1C 802403EC 12420018 */ beq $s2, $v0, .L80240450 -/* AACC20 802403F0 2A420002 */ slti $v0, $s2, 2 -/* AACC24 802403F4 10400005 */ beqz $v0, .L8024040C -/* AACC28 802403F8 24020002 */ addiu $v0, $zero, 2 -/* AACC2C 802403FC 12400007 */ beqz $s2, .L8024041C -/* AACC30 80240400 3412FFFF */ ori $s2, $zero, 0xffff -/* AACC34 80240404 08090123 */ j .L8024048C -/* AACC38 80240408 00000000 */ nop -.L8024040C: -/* AACC3C 8024040C 1242001B */ beq $s2, $v0, .L8024047C -/* AACC40 80240410 24020002 */ addiu $v0, $zero, 2 -/* AACC44 80240414 08090123 */ j .L8024048C -/* AACC48 80240418 00000000 */ nop -.L8024041C: -/* AACC4C 8024041C 8E040000 */ lw $a0, ($s0) -/* AACC50 80240420 1092001A */ beq $a0, $s2, .L8024048C -/* AACC54 80240424 24020002 */ addiu $v0, $zero, 2 -/* AACC58 80240428 0C046C04 */ jal get_model_list_index_from_tree_index -/* AACC5C 8024042C 26100004 */ addiu $s0, $s0, 4 -/* AACC60 80240430 0C046B4C */ jal get_model_from_list_index -/* AACC64 80240434 0040202D */ daddu $a0, $v0, $zero -/* AACC68 80240438 0040202D */ daddu $a0, $v0, $zero -/* AACC6C 8024043C 2405FFFF */ addiu $a1, $zero, -1 -/* AACC70 80240440 0C046F1F */ jal func_8011BC7C -/* AACC74 80240444 0220302D */ daddu $a2, $s1, $zero -/* AACC78 80240448 08090107 */ j .L8024041C -/* AACC7C 8024044C 00000000 */ nop -.L80240450: -/* AACC80 80240450 3412FFFF */ ori $s2, $zero, 0xffff -.L80240454: -/* AACC84 80240454 8E020000 */ lw $v0, ($s0) -/* AACC88 80240458 1052000B */ beq $v0, $s2, .L80240488 -/* AACC8C 8024045C 2405FFFF */ addiu $a1, $zero, -1 -/* AACC90 80240460 96040002 */ lhu $a0, 2($s0) -/* AACC94 80240464 0220302D */ daddu $a2, $s1, $zero -/* AACC98 80240468 26100004 */ addiu $s0, $s0, 4 -/* AACC9C 8024046C 0C046E54 */ jal func_8011B950 -/* AACCA0 80240470 0000382D */ daddu $a3, $zero, $zero -/* AACCA4 80240474 08090115 */ j .L80240454 -/* AACCA8 80240478 00000000 */ nop -.L8024047C: -/* AACCAC 8024047C 3C028015 */ lui $v0, 0x8015 -/* AACCB0 80240480 8C4212F0 */ lw $v0, 0x12f0($v0) -/* AACCB4 80240484 A0510000 */ sb $s1, ($v0) -.L80240488: -/* AACCB8 80240488 24020002 */ addiu $v0, $zero, 2 -.L8024048C: -/* AACCBC 8024048C 8FBF001C */ lw $ra, 0x1c($sp) -/* AACCC0 80240490 8FB20018 */ lw $s2, 0x18($sp) -/* AACCC4 80240494 8FB10014 */ lw $s1, 0x14($sp) -/* AACCC8 80240498 8FB00010 */ lw $s0, 0x10($sp) -/* AACCCC 8024049C 03E00008 */ jr $ra -/* AACCD0 802404A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_osr/osr_00/func_802404A4_AAC830.s b/asm/nonmatchings/world/area_osr/osr_00/func_802404A4_AAC830.s deleted file mode 100644 index 92f361781f..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_00/func_802404A4_AAC830.s +++ /dev/null @@ -1,126 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404A4_AACCD4 -/* AACCD4 802404A4 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* AACCD8 802404A8 AFB10034 */ sw $s1, 0x34($sp) -/* AACCDC 802404AC 0080882D */ daddu $s1, $a0, $zero -/* AACCE0 802404B0 AFBF0054 */ sw $ra, 0x54($sp) -/* AACCE4 802404B4 AFBE0050 */ sw $fp, 0x50($sp) -/* AACCE8 802404B8 AFB7004C */ sw $s7, 0x4c($sp) -/* AACCEC 802404BC AFB60048 */ sw $s6, 0x48($sp) -/* AACCF0 802404C0 AFB50044 */ sw $s5, 0x44($sp) -/* AACCF4 802404C4 AFB40040 */ sw $s4, 0x40($sp) -/* AACCF8 802404C8 AFB3003C */ sw $s3, 0x3c($sp) -/* AACCFC 802404CC AFB20038 */ sw $s2, 0x38($sp) -/* AACD00 802404D0 AFB00030 */ sw $s0, 0x30($sp) -/* AACD04 802404D4 8E30000C */ lw $s0, 0xc($s1) -/* AACD08 802404D8 8E050000 */ lw $a1, ($s0) -/* AACD0C 802404DC 0C0B1EAF */ jal get_variable -/* AACD10 802404E0 26100004 */ addiu $s0, $s0, 4 -/* AACD14 802404E4 8E050000 */ lw $a1, ($s0) -/* AACD18 802404E8 26100004 */ addiu $s0, $s0, 4 -/* AACD1C 802404EC 0220202D */ daddu $a0, $s1, $zero -/* AACD20 802404F0 0C0B1EAF */ jal get_variable -/* AACD24 802404F4 0040982D */ daddu $s3, $v0, $zero -/* AACD28 802404F8 8E050000 */ lw $a1, ($s0) -/* AACD2C 802404FC 26100004 */ addiu $s0, $s0, 4 -/* AACD30 80240500 0220202D */ daddu $a0, $s1, $zero -/* AACD34 80240504 0C0B1EAF */ jal get_variable -/* AACD38 80240508 0040B02D */ daddu $s6, $v0, $zero -/* AACD3C 8024050C 8E050000 */ lw $a1, ($s0) -/* AACD40 80240510 26100004 */ addiu $s0, $s0, 4 -/* AACD44 80240514 0220202D */ daddu $a0, $s1, $zero -/* AACD48 80240518 0C0B1EAF */ jal get_variable -/* AACD4C 8024051C 0040A82D */ daddu $s5, $v0, $zero -/* AACD50 80240520 8E050000 */ lw $a1, ($s0) -/* AACD54 80240524 26100004 */ addiu $s0, $s0, 4 -/* AACD58 80240528 0220202D */ daddu $a0, $s1, $zero -/* AACD5C 8024052C 0C0B1EAF */ jal get_variable -/* AACD60 80240530 0040A02D */ daddu $s4, $v0, $zero -/* AACD64 80240534 8E050000 */ lw $a1, ($s0) -/* AACD68 80240538 26100004 */ addiu $s0, $s0, 4 -/* AACD6C 8024053C 0220202D */ daddu $a0, $s1, $zero -/* AACD70 80240540 0C0B1EAF */ jal get_variable -/* AACD74 80240544 0040902D */ daddu $s2, $v0, $zero -/* AACD78 80240548 8E050000 */ lw $a1, ($s0) -/* AACD7C 8024054C 26100004 */ addiu $s0, $s0, 4 -/* AACD80 80240550 0220202D */ daddu $a0, $s1, $zero -/* AACD84 80240554 0C0B1EAF */ jal get_variable -/* AACD88 80240558 AFA20028 */ sw $v0, 0x28($sp) -/* AACD8C 8024055C 8E050000 */ lw $a1, ($s0) -/* AACD90 80240560 26100004 */ addiu $s0, $s0, 4 -/* AACD94 80240564 0220202D */ daddu $a0, $s1, $zero -/* AACD98 80240568 0C0B1EAF */ jal get_variable -/* AACD9C 8024056C 0040F02D */ daddu $fp, $v0, $zero -/* AACDA0 80240570 8E050000 */ lw $a1, ($s0) -/* AACDA4 80240574 26100004 */ addiu $s0, $s0, 4 -/* AACDA8 80240578 0220202D */ daddu $a0, $s1, $zero -/* AACDAC 8024057C 0C0B1EAF */ jal get_variable -/* AACDB0 80240580 0040B82D */ daddu $s7, $v0, $zero -/* AACDB4 80240584 0220202D */ daddu $a0, $s1, $zero -/* AACDB8 80240588 8E050000 */ lw $a1, ($s0) -/* AACDBC 8024058C 0C0B1EAF */ jal get_variable -/* AACDC0 80240590 0040802D */ daddu $s0, $v0, $zero -/* AACDC4 80240594 0040182D */ daddu $v1, $v0, $zero -/* AACDC8 80240598 24020002 */ addiu $v0, $zero, 2 -/* AACDCC 8024059C 12620012 */ beq $s3, $v0, .L802405E8 -/* AACDD0 802405A0 2A620003 */ slti $v0, $s3, 3 -/* AACDD4 802405A4 10400005 */ beqz $v0, .L802405BC -/* AACDD8 802405A8 24020001 */ addiu $v0, $zero, 1 -/* AACDDC 802405AC 12620008 */ beq $s3, $v0, .L802405D0 -/* AACDE0 802405B0 32C400FF */ andi $a0, $s6, 0xff -/* AACDE4 802405B4 08090191 */ j .L80240644 -/* AACDE8 802405B8 00000000 */ nop -.L802405BC: -/* AACDEC 802405BC 24020003 */ addiu $v0, $zero, 3 -/* AACDF0 802405C0 12620018 */ beq $s3, $v0, .L80240624 -/* AACDF4 802405C4 32C400FF */ andi $a0, $s6, 0xff -/* AACDF8 802405C8 08090191 */ j .L80240644 -/* AACDFC 802405CC 00000000 */ nop -.L802405D0: -/* AACE00 802405D0 32A500FF */ andi $a1, $s5, 0xff -/* AACE04 802405D4 328600FF */ andi $a2, $s4, 0xff -/* AACE08 802405D8 0C046F97 */ jal set_background_color_blend -/* AACE0C 802405DC 324700FF */ andi $a3, $s2, 0xff -/* AACE10 802405E0 08090191 */ j .L80240644 -/* AACE14 802405E4 00000000 */ nop -.L802405E8: -/* AACE18 802405E8 32C400FF */ andi $a0, $s6, 0xff -/* AACE1C 802405EC 32A500FF */ andi $a1, $s5, 0xff -/* AACE20 802405F0 328600FF */ andi $a2, $s4, 0xff -/* AACE24 802405F4 324700FF */ andi $a3, $s2, 0xff -/* AACE28 802405F8 93A2002B */ lbu $v0, 0x2b($sp) -/* AACE2C 802405FC AFB0001C */ sw $s0, 0x1c($sp) -/* AACE30 80240600 AFA30020 */ sw $v1, 0x20($sp) -/* AACE34 80240604 AFA20010 */ sw $v0, 0x10($sp) -/* AACE38 80240608 33C200FF */ andi $v0, $fp, 0xff -/* AACE3C 8024060C AFA20014 */ sw $v0, 0x14($sp) -/* AACE40 80240610 32E200FF */ andi $v0, $s7, 0xff -/* AACE44 80240614 0C046FAD */ jal func_8011BEB4 -/* AACE48 80240618 AFA20018 */ sw $v0, 0x18($sp) -/* AACE4C 8024061C 08090191 */ j .L80240644 -/* AACE50 80240620 00000000 */ nop -.L80240624: -/* AACE54 80240624 32A500FF */ andi $a1, $s5, 0xff -/* AACE58 80240628 328600FF */ andi $a2, $s4, 0xff -/* AACE5C 8024062C 324700FF */ andi $a3, $s2, 0xff -/* AACE60 80240630 93A2002B */ lbu $v0, 0x2b($sp) -/* AACE64 80240634 AFA20010 */ sw $v0, 0x10($sp) -/* AACE68 80240638 33C200FF */ andi $v0, $fp, 0xff -/* AACE6C 8024063C 0C046FE6 */ jal func_8011BF98 -/* AACE70 80240640 AFA20014 */ sw $v0, 0x14($sp) -.L80240644: -/* AACE74 80240644 8FBF0054 */ lw $ra, 0x54($sp) -/* AACE78 80240648 8FBE0050 */ lw $fp, 0x50($sp) -/* AACE7C 8024064C 8FB7004C */ lw $s7, 0x4c($sp) -/* AACE80 80240650 8FB60048 */ lw $s6, 0x48($sp) -/* AACE84 80240654 8FB50044 */ lw $s5, 0x44($sp) -/* AACE88 80240658 8FB40040 */ lw $s4, 0x40($sp) -/* AACE8C 8024065C 8FB3003C */ lw $s3, 0x3c($sp) -/* AACE90 80240660 8FB20038 */ lw $s2, 0x38($sp) -/* AACE94 80240664 8FB10034 */ lw $s1, 0x34($sp) -/* AACE98 80240668 8FB00030 */ lw $s0, 0x30($sp) -/* AACE9C 8024066C 24020002 */ addiu $v0, $zero, 2 -/* AACEA0 80240670 03E00008 */ jr $ra -/* AACEA4 80240674 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_osr/osr_00/func_80240678_AAC830.s b/asm/nonmatchings/world/area_osr/osr_00/func_80240678_AAC830.s deleted file mode 100644 index d7c49b73d2..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_00/func_80240678_AAC830.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240678_AACEA8 -/* AACEA8 80240678 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AACEAC 8024067C AFBF0018 */ sw $ra, 0x18($sp) -/* AACEB0 80240680 8C82000C */ lw $v0, 0xc($a0) -/* AACEB4 80240684 8C440000 */ lw $a0, ($v0) -/* AACEB8 80240688 24420004 */ addiu $v0, $v0, 4 -/* AACEBC 8024068C 8C450000 */ lw $a1, ($v0) -/* AACEC0 80240690 24420004 */ addiu $v0, $v0, 4 -/* AACEC4 80240694 8C460000 */ lw $a2, ($v0) -/* AACEC8 80240698 24420004 */ addiu $v0, $v0, 4 -/* AACECC 8024069C 8C470000 */ lw $a3, ($v0) -/* AACED0 802406A0 24420004 */ addiu $v0, $v0, 4 -/* AACED4 802406A4 8C430000 */ lw $v1, ($v0) -/* AACED8 802406A8 8C420004 */ lw $v0, 4($v0) -/* AACEDC 802406AC 306300FF */ andi $v1, $v1, 0xff -/* AACEE0 802406B0 304200FF */ andi $v0, $v0, 0xff -/* AACEE4 802406B4 308400FF */ andi $a0, $a0, 0xff -/* AACEE8 802406B8 30A500FF */ andi $a1, $a1, 0xff -/* AACEEC 802406BC 30C600FF */ andi $a2, $a2, 0xff -/* AACEF0 802406C0 30E700FF */ andi $a3, $a3, 0xff -/* AACEF4 802406C4 AFA30010 */ sw $v1, 0x10($sp) -/* AACEF8 802406C8 0C046FE6 */ jal func_8011BF98 -/* AACEFC 802406CC AFA20014 */ sw $v0, 0x14($sp) -/* AACF00 802406D0 8FBF0018 */ lw $ra, 0x18($sp) -/* AACF04 802406D4 24020002 */ addiu $v0, $zero, 2 -/* AACF08 802406D8 03E00008 */ jr $ra -/* AACF0C 802406DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_osr/osr_00/func_802406E0_AAC830.s b/asm/nonmatchings/world/area_osr/osr_00/func_802406E0_AAC830.s deleted file mode 100644 index 5efde2859c..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_00/func_802406E0_AAC830.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406E0_AACF10 -/* AACF10 802406E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AACF14 802406E4 AFB00010 */ sw $s0, 0x10($sp) -/* AACF18 802406E8 3C100011 */ lui $s0, 0x11 -/* AACF1C 802406EC 2610F1B0 */ addiu $s0, $s0, -0xe50 -/* AACF20 802406F0 3C040000 */ lui $a0, 0 -/* AACF24 802406F4 24847308 */ addiu $a0, $a0, 0x7308 -/* AACF28 802406F8 02042021 */ addu $a0, $s0, $a0 -/* AACF2C 802406FC 24853D86 */ addiu $a1, $a0, 0x3d86 -/* AACF30 80240700 AFB10014 */ sw $s1, 0x14($sp) -/* AACF34 80240704 3C118024 */ lui $s1, 0x8024 -/* AACF38 80240708 263137C0 */ addiu $s1, $s1, 0x37c0 -/* AACF3C 8024070C AFBF0018 */ sw $ra, 0x18($sp) -/* AACF40 80240710 0C00A5CF */ jal dma_copy -/* AACF44 80240714 0220302D */ daddu $a2, $s1, $zero -/* AACF48 80240718 3C020001 */ lui $v0, 1 -/* AACF4C 8024071C 2442B090 */ addiu $v0, $v0, -0x4f70 -/* AACF50 80240720 02028021 */ addu $s0, $s0, $v0 -/* AACF54 80240724 0200202D */ daddu $a0, $s0, $zero -/* AACF58 80240728 24850200 */ addiu $a1, $a0, 0x200 -/* AACF5C 8024072C 3C108024 */ lui $s0, 0x8024 -/* AACF60 80240730 26107548 */ addiu $s0, $s0, 0x7548 -/* AACF64 80240734 0C00A5CF */ jal dma_copy -/* AACF68 80240738 0200302D */ daddu $a2, $s0, $zero -/* AACF6C 8024073C 3C048024 */ lui $a0, 0x8024 -/* AACF70 80240740 24847750 */ addiu $a0, $a0, 0x7750 -/* AACF74 80240744 24020096 */ addiu $v0, $zero, 0x96 -/* AACF78 80240748 A4820008 */ sh $v0, 8($a0) -/* AACF7C 8024074C 24020069 */ addiu $v0, $zero, 0x69 -/* AACF80 80240750 A482000A */ sh $v0, 0xa($a0) -/* AACF84 80240754 24020002 */ addiu $v0, $zero, 2 -/* AACF88 80240758 AC82000C */ sw $v0, 0xc($a0) -/* AACF8C 8024075C 24020001 */ addiu $v0, $zero, 1 -/* AACF90 80240760 AC910000 */ sw $s1, ($a0) -/* AACF94 80240764 AC900004 */ sw $s0, 4($a0) -/* AACF98 80240768 0C0496CB */ jal set_message_images -/* AACF9C 8024076C AC820010 */ sw $v0, 0x10($a0) -/* AACFA0 80240770 8FBF0018 */ lw $ra, 0x18($sp) -/* AACFA4 80240774 8FB10014 */ lw $s1, 0x14($sp) -/* AACFA8 80240778 8FB00010 */ lw $s0, 0x10($sp) -/* AACFAC 8024077C 24020002 */ addiu $v0, $zero, 2 -/* AACFB0 80240780 03E00008 */ jr $ra -/* AACFB4 80240784 27BD0020 */ addiu $sp, $sp, 0x20 -/* AACFB8 80240788 00000000 */ nop -/* AACFBC 8024078C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_01/func_80240050_AAFFF0.s b/asm/nonmatchings/world/area_osr/osr_01/func_80240050_AAFFF0.s deleted file mode 100644 index 8d565d9196..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/func_80240050_AAFFF0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_AB0040 -/* AB0040 80240050 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB0044 80240054 AFB00010 */ sw $s0, 0x10($sp) -/* AB0048 80240058 0080802D */ daddu $s0, $a0, $zero -/* AB004C 8024005C AFBF0014 */ sw $ra, 0x14($sp) -/* AB0050 80240060 8E0300A8 */ lw $v1, 0xa8($s0) -/* AB0054 80240064 8E020088 */ lw $v0, 0x88($s0) -/* AB0058 80240068 00621821 */ addu $v1, $v1, $v0 -/* AB005C 8024006C 04610004 */ bgez $v1, .L80240080 -/* AB0060 80240070 AE0300A8 */ sw $v1, 0xa8($s0) -/* AB0064 80240074 3C020002 */ lui $v0, 2 -/* AB0068 80240078 08090024 */ j .L80240090 -/* AB006C 8024007C 00621021 */ addu $v0, $v1, $v0 -.L80240080: -/* AB0070 80240080 3C040002 */ lui $a0, 2 -/* AB0074 80240084 0083102A */ slt $v0, $a0, $v1 -/* AB0078 80240088 10400002 */ beqz $v0, .L80240094 -/* AB007C 8024008C 00641023 */ subu $v0, $v1, $a0 -.L80240090: -/* AB0080 80240090 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240094: -/* AB0084 80240094 8E0300AC */ lw $v1, 0xac($s0) -/* AB0088 80240098 8E02008C */ lw $v0, 0x8c($s0) -/* AB008C 8024009C 00621821 */ addu $v1, $v1, $v0 -/* AB0090 802400A0 04610004 */ bgez $v1, .L802400B4 -/* AB0094 802400A4 AE0300AC */ sw $v1, 0xac($s0) -/* AB0098 802400A8 3C020002 */ lui $v0, 2 -/* AB009C 802400AC 08090031 */ j .L802400C4 -/* AB00A0 802400B0 00621021 */ addu $v0, $v1, $v0 -.L802400B4: -/* AB00A4 802400B4 3C040002 */ lui $a0, 2 -/* AB00A8 802400B8 0083102A */ slt $v0, $a0, $v1 -/* AB00AC 802400BC 10400002 */ beqz $v0, .L802400C8 -/* AB00B0 802400C0 00641023 */ subu $v0, $v1, $a0 -.L802400C4: -/* AB00B4 802400C4 AE0200AC */ sw $v0, 0xac($s0) -.L802400C8: -/* AB00B8 802400C8 8E0300B0 */ lw $v1, 0xb0($s0) -/* AB00BC 802400CC 8E020090 */ lw $v0, 0x90($s0) -/* AB00C0 802400D0 00621821 */ addu $v1, $v1, $v0 -/* AB00C4 802400D4 04610004 */ bgez $v1, .L802400E8 -/* AB00C8 802400D8 AE0300B0 */ sw $v1, 0xb0($s0) -/* AB00CC 802400DC 3C020002 */ lui $v0, 2 -/* AB00D0 802400E0 0809003E */ j .L802400F8 -/* AB00D4 802400E4 00621021 */ addu $v0, $v1, $v0 -.L802400E8: -/* AB00D8 802400E8 3C040002 */ lui $a0, 2 -/* AB00DC 802400EC 0083102A */ slt $v0, $a0, $v1 -/* AB00E0 802400F0 10400002 */ beqz $v0, .L802400FC -/* AB00E4 802400F4 00641023 */ subu $v0, $v1, $a0 -.L802400F8: -/* AB00E8 802400F8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400FC: -/* AB00EC 802400FC 8E0300B4 */ lw $v1, 0xb4($s0) -/* AB00F0 80240100 8E020094 */ lw $v0, 0x94($s0) -/* AB00F4 80240104 00621821 */ addu $v1, $v1, $v0 -/* AB00F8 80240108 04610004 */ bgez $v1, .L8024011C -/* AB00FC 8024010C AE0300B4 */ sw $v1, 0xb4($s0) -/* AB0100 80240110 3C020002 */ lui $v0, 2 -/* AB0104 80240114 0809004B */ j .L8024012C -/* AB0108 80240118 00621021 */ addu $v0, $v1, $v0 -.L8024011C: -/* AB010C 8024011C 3C040002 */ lui $a0, 2 -/* AB0110 80240120 0083102A */ slt $v0, $a0, $v1 -/* AB0114 80240124 10400002 */ beqz $v0, .L80240130 -/* AB0118 80240128 00641023 */ subu $v0, $v1, $a0 -.L8024012C: -/* AB011C 8024012C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240130: -/* AB0120 80240130 8E040084 */ lw $a0, 0x84($s0) -/* AB0124 80240134 0C046F07 */ jal set_main_pan_u -/* AB0128 80240138 8E0500A8 */ lw $a1, 0xa8($s0) -/* AB012C 8024013C 8E040084 */ lw $a0, 0x84($s0) -/* AB0130 80240140 0C046F0D */ jal set_main_pan_v -/* AB0134 80240144 8E0500AC */ lw $a1, 0xac($s0) -/* AB0138 80240148 8E040084 */ lw $a0, 0x84($s0) -/* AB013C 8024014C 0C046F13 */ jal set_aux_pan_u -/* AB0140 80240150 8E0500B0 */ lw $a1, 0xb0($s0) -/* AB0144 80240154 8E040084 */ lw $a0, 0x84($s0) -/* AB0148 80240158 0C046F19 */ jal set_aux_pan_v -/* AB014C 8024015C 8E0500B4 */ lw $a1, 0xb4($s0) -/* AB0150 80240160 8FBF0014 */ lw $ra, 0x14($sp) -/* AB0154 80240164 8FB00010 */ lw $s0, 0x10($sp) -/* AB0158 80240168 0000102D */ daddu $v0, $zero, $zero -/* AB015C 8024016C 03E00008 */ jr $ra -/* AB0160 80240170 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_osr/osr_01/func_80240174_AAFFF0.s b/asm/nonmatchings/world/area_osr/osr_01/func_80240174_AAFFF0.s deleted file mode 100644 index dc61b3de3c..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/func_80240174_AAFFF0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240174_AB0164 -/* AB0164 80240174 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB0168 80240178 AFB00010 */ sw $s0, 0x10($sp) -/* AB016C 8024017C 0080802D */ daddu $s0, $a0, $zero -/* AB0170 80240180 10A00005 */ beqz $a1, .L80240198 -/* AB0174 80240184 AFBF0014 */ sw $ra, 0x14($sp) -/* AB0178 80240188 AE000070 */ sw $zero, 0x70($s0) -/* AB017C 8024018C AE000074 */ sw $zero, 0x74($s0) -/* AB0180 80240190 AE000078 */ sw $zero, 0x78($s0) -/* AB0184 80240194 AE00007C */ sw $zero, 0x7c($s0) -.L80240198: -/* AB0188 80240198 8E020070 */ lw $v0, 0x70($s0) -/* AB018C 8024019C 1440000E */ bnez $v0, .L802401D8 -/* AB0190 802401A0 00000000 */ nop -/* AB0194 802401A4 8E0300A8 */ lw $v1, 0xa8($s0) -/* AB0198 802401A8 8E020088 */ lw $v0, 0x88($s0) -/* AB019C 802401AC 00621821 */ addu $v1, $v1, $v0 -/* AB01A0 802401B0 04610004 */ bgez $v1, .L802401C4 -/* AB01A4 802401B4 AE0300A8 */ sw $v1, 0xa8($s0) -/* AB01A8 802401B8 3C020002 */ lui $v0, 2 -/* AB01AC 802401BC 08090075 */ j .L802401D4 -/* AB01B0 802401C0 00621021 */ addu $v0, $v1, $v0 -.L802401C4: -/* AB01B4 802401C4 3C040002 */ lui $a0, 2 -/* AB01B8 802401C8 0083102A */ slt $v0, $a0, $v1 -/* AB01BC 802401CC 10400002 */ beqz $v0, .L802401D8 -/* AB01C0 802401D0 00641023 */ subu $v0, $v1, $a0 -.L802401D4: -/* AB01C4 802401D4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401D8: -/* AB01C8 802401D8 8E020074 */ lw $v0, 0x74($s0) -/* AB01CC 802401DC 1440000E */ bnez $v0, .L80240218 -/* AB01D0 802401E0 00000000 */ nop -/* AB01D4 802401E4 8E0300AC */ lw $v1, 0xac($s0) -/* AB01D8 802401E8 8E02008C */ lw $v0, 0x8c($s0) -/* AB01DC 802401EC 00621821 */ addu $v1, $v1, $v0 -/* AB01E0 802401F0 04610004 */ bgez $v1, .L80240204 -/* AB01E4 802401F4 AE0300AC */ sw $v1, 0xac($s0) -/* AB01E8 802401F8 3C020002 */ lui $v0, 2 -/* AB01EC 802401FC 08090085 */ j .L80240214 -/* AB01F0 80240200 00621021 */ addu $v0, $v1, $v0 -.L80240204: -/* AB01F4 80240204 3C040002 */ lui $a0, 2 -/* AB01F8 80240208 0083102A */ slt $v0, $a0, $v1 -/* AB01FC 8024020C 10400002 */ beqz $v0, .L80240218 -/* AB0200 80240210 00641023 */ subu $v0, $v1, $a0 -.L80240214: -/* AB0204 80240214 AE0200AC */ sw $v0, 0xac($s0) -.L80240218: -/* AB0208 80240218 8E020078 */ lw $v0, 0x78($s0) -/* AB020C 8024021C 1440000E */ bnez $v0, .L80240258 -/* AB0210 80240220 00000000 */ nop -/* AB0214 80240224 8E0300B0 */ lw $v1, 0xb0($s0) -/* AB0218 80240228 8E020090 */ lw $v0, 0x90($s0) -/* AB021C 8024022C 00621821 */ addu $v1, $v1, $v0 -/* AB0220 80240230 04610004 */ bgez $v1, .L80240244 -/* AB0224 80240234 AE0300B0 */ sw $v1, 0xb0($s0) -/* AB0228 80240238 3C020002 */ lui $v0, 2 -/* AB022C 8024023C 08090095 */ j .L80240254 -/* AB0230 80240240 00621021 */ addu $v0, $v1, $v0 -.L80240244: -/* AB0234 80240244 3C040002 */ lui $a0, 2 -/* AB0238 80240248 0083102A */ slt $v0, $a0, $v1 -/* AB023C 8024024C 10400002 */ beqz $v0, .L80240258 -/* AB0240 80240250 00641023 */ subu $v0, $v1, $a0 -.L80240254: -/* AB0244 80240254 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240258: -/* AB0248 80240258 8E02007C */ lw $v0, 0x7c($s0) -/* AB024C 8024025C 1440000E */ bnez $v0, .L80240298 -/* AB0250 80240260 00000000 */ nop -/* AB0254 80240264 8E0300B4 */ lw $v1, 0xb4($s0) -/* AB0258 80240268 8E020094 */ lw $v0, 0x94($s0) -/* AB025C 8024026C 00621821 */ addu $v1, $v1, $v0 -/* AB0260 80240270 04610004 */ bgez $v1, .L80240284 -/* AB0264 80240274 AE0300B4 */ sw $v1, 0xb4($s0) -/* AB0268 80240278 3C020002 */ lui $v0, 2 -/* AB026C 8024027C 080900A5 */ j .L80240294 -/* AB0270 80240280 00621021 */ addu $v0, $v1, $v0 -.L80240284: -/* AB0274 80240284 3C040002 */ lui $a0, 2 -/* AB0278 80240288 0083102A */ slt $v0, $a0, $v1 -/* AB027C 8024028C 10400002 */ beqz $v0, .L80240298 -/* AB0280 80240290 00641023 */ subu $v0, $v1, $a0 -.L80240294: -/* AB0284 80240294 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240298: -/* AB0288 80240298 8E040084 */ lw $a0, 0x84($s0) -/* AB028C 8024029C 0C046F07 */ jal set_main_pan_u -/* AB0290 802402A0 8E0500A8 */ lw $a1, 0xa8($s0) -/* AB0294 802402A4 8E040084 */ lw $a0, 0x84($s0) -/* AB0298 802402A8 0C046F0D */ jal set_main_pan_v -/* AB029C 802402AC 8E0500AC */ lw $a1, 0xac($s0) -/* AB02A0 802402B0 8E040084 */ lw $a0, 0x84($s0) -/* AB02A4 802402B4 0C046F13 */ jal set_aux_pan_u -/* AB02A8 802402B8 8E0500B0 */ lw $a1, 0xb0($s0) -/* AB02AC 802402BC 8E040084 */ lw $a0, 0x84($s0) -/* AB02B0 802402C0 0C046F19 */ jal set_aux_pan_v -/* AB02B4 802402C4 8E0500B4 */ lw $a1, 0xb4($s0) -/* AB02B8 802402C8 8E020070 */ lw $v0, 0x70($s0) -/* AB02BC 802402CC 8E030078 */ lw $v1, 0x78($s0) -/* AB02C0 802402D0 8E040098 */ lw $a0, 0x98($s0) -/* AB02C4 802402D4 24420001 */ addiu $v0, $v0, 1 -/* AB02C8 802402D8 AE020070 */ sw $v0, 0x70($s0) -/* AB02CC 802402DC 8E020074 */ lw $v0, 0x74($s0) -/* AB02D0 802402E0 24630001 */ addiu $v1, $v1, 1 -/* AB02D4 802402E4 AE030078 */ sw $v1, 0x78($s0) -/* AB02D8 802402E8 8E030070 */ lw $v1, 0x70($s0) -/* AB02DC 802402EC 24420001 */ addiu $v0, $v0, 1 -/* AB02E0 802402F0 AE020074 */ sw $v0, 0x74($s0) -/* AB02E4 802402F4 8E02007C */ lw $v0, 0x7c($s0) -/* AB02E8 802402F8 0064182A */ slt $v1, $v1, $a0 -/* AB02EC 802402FC 24420001 */ addiu $v0, $v0, 1 -/* AB02F0 80240300 14600002 */ bnez $v1, .L8024030C -/* AB02F4 80240304 AE02007C */ sw $v0, 0x7c($s0) -/* AB02F8 80240308 AE000070 */ sw $zero, 0x70($s0) -.L8024030C: -/* AB02FC 8024030C 8E020074 */ lw $v0, 0x74($s0) -/* AB0300 80240310 8E03009C */ lw $v1, 0x9c($s0) -/* AB0304 80240314 0043102A */ slt $v0, $v0, $v1 -/* AB0308 80240318 50400001 */ beql $v0, $zero, .L80240320 -/* AB030C 8024031C AE000074 */ sw $zero, 0x74($s0) -.L80240320: -/* AB0310 80240320 8E020078 */ lw $v0, 0x78($s0) -/* AB0314 80240324 8E0300A0 */ lw $v1, 0xa0($s0) -/* AB0318 80240328 0043102A */ slt $v0, $v0, $v1 -/* AB031C 8024032C 50400001 */ beql $v0, $zero, .L80240334 -/* AB0320 80240330 AE000078 */ sw $zero, 0x78($s0) -.L80240334: -/* AB0324 80240334 8E02007C */ lw $v0, 0x7c($s0) -/* AB0328 80240338 8E0300A4 */ lw $v1, 0xa4($s0) -/* AB032C 8024033C 0043102A */ slt $v0, $v0, $v1 -/* AB0330 80240340 50400001 */ beql $v0, $zero, .L80240348 -/* AB0334 80240344 AE00007C */ sw $zero, 0x7c($s0) -.L80240348: -/* AB0338 80240348 8FBF0014 */ lw $ra, 0x14($sp) -/* AB033C 8024034C 8FB00010 */ lw $s0, 0x10($sp) -/* AB0340 80240350 0000102D */ daddu $v0, $zero, $zero -/* AB0344 80240354 03E00008 */ jr $ra -/* AB0348 80240358 27BD0018 */ addiu $sp, $sp, 0x18 -/* AB034C 8024035C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_01/func_80240360_AAFFF0.s b/asm/nonmatchings/world/area_osr/osr_01/func_80240360_AAFFF0.s deleted file mode 100644 index e6085bde07..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/func_80240360_AAFFF0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240360_AB0350 -/* AB0350 80240360 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AB0354 80240364 AFB00010 */ sw $s0, 0x10($sp) -/* AB0358 80240368 3C108024 */ lui $s0, 0x8024 -/* AB035C 8024036C 261011B8 */ addiu $s0, $s0, 0x11b8 -/* AB0360 80240370 AFBF0018 */ sw $ra, 0x18($sp) -/* AB0364 80240374 AFB10014 */ sw $s1, 0x14($sp) -/* AB0368 80240378 8E020000 */ lw $v0, ($s0) -/* AB036C 8024037C 14400010 */ bnez $v0, .L802403C0 -/* AB0370 80240380 0080882D */ daddu $s1, $a0, $zero -/* AB0374 80240384 0C00AB39 */ jal heap_malloc -/* AB0378 80240388 24040040 */ addiu $a0, $zero, 0x40 -/* AB037C 8024038C AE020000 */ sw $v0, ($s0) -/* AB0380 80240390 0000182D */ daddu $v1, $zero, $zero -/* AB0384 80240394 0040282D */ daddu $a1, $v0, $zero -/* AB0388 80240398 0220202D */ daddu $a0, $s1, $zero -.L8024039C: -/* AB038C 8024039C 8C820084 */ lw $v0, 0x84($a0) -/* AB0390 802403A0 24840004 */ addiu $a0, $a0, 4 -/* AB0394 802403A4 24630001 */ addiu $v1, $v1, 1 -/* AB0398 802403A8 ACA20000 */ sw $v0, ($a1) -/* AB039C 802403AC 28620010 */ slti $v0, $v1, 0x10 -/* AB03A0 802403B0 1440FFFA */ bnez $v0, .L8024039C -/* AB03A4 802403B4 24A50004 */ addiu $a1, $a1, 4 -/* AB03A8 802403B8 080900FF */ j .L802403FC -/* AB03AC 802403BC 00000000 */ nop -.L802403C0: -/* AB03B0 802403C0 0000182D */ daddu $v1, $zero, $zero -/* AB03B4 802403C4 0040282D */ daddu $a1, $v0, $zero -/* AB03B8 802403C8 0220202D */ daddu $a0, $s1, $zero -.L802403CC: -/* AB03BC 802403CC 8CA20000 */ lw $v0, ($a1) -/* AB03C0 802403D0 24A50004 */ addiu $a1, $a1, 4 -/* AB03C4 802403D4 24630001 */ addiu $v1, $v1, 1 -/* AB03C8 802403D8 AC820084 */ sw $v0, 0x84($a0) -/* AB03CC 802403DC 28620010 */ slti $v0, $v1, 0x10 -/* AB03D0 802403E0 1440FFFA */ bnez $v0, .L802403CC -/* AB03D4 802403E4 24840004 */ addiu $a0, $a0, 4 -/* AB03D8 802403E8 3C108024 */ lui $s0, 0x8024 -/* AB03DC 802403EC 261011B8 */ addiu $s0, $s0, 0x11b8 -/* AB03E0 802403F0 0C00AB4B */ jal heap_free -/* AB03E4 802403F4 8E040000 */ lw $a0, ($s0) -/* AB03E8 802403F8 AE000000 */ sw $zero, ($s0) -.L802403FC: -/* AB03EC 802403FC 8FBF0018 */ lw $ra, 0x18($sp) -/* AB03F0 80240400 8FB10014 */ lw $s1, 0x14($sp) -/* AB03F4 80240404 8FB00010 */ lw $s0, 0x10($sp) -/* AB03F8 80240408 24020002 */ addiu $v0, $zero, 2 -/* AB03FC 8024040C 03E00008 */ jr $ra -/* AB0400 80240410 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_osr/osr_01/func_80240414_AAFFF0.s b/asm/nonmatchings/world/area_osr/osr_01/func_80240414_AAFFF0.s deleted file mode 100644 index 29784db7b7..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/func_80240414_AAFFF0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240414_AB0404 -/* AB0404 80240414 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AB0408 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* AB040C 8024041C 0080802D */ daddu $s0, $a0, $zero -/* AB0410 80240420 AFBF0018 */ sw $ra, 0x18($sp) -/* AB0414 80240424 AFB10014 */ sw $s1, 0x14($sp) -/* AB0418 80240428 8E02000C */ lw $v0, 0xc($s0) -/* AB041C 8024042C 8C510000 */ lw $s1, ($v0) -/* AB0420 80240430 0C0B1EAF */ jal get_variable -/* AB0424 80240434 0220282D */ daddu $a1, $s1, $zero -/* AB0428 80240438 3C03FFF0 */ lui $v1, 0xfff0 -/* AB042C 8024043C 3463FFFF */ ori $v1, $v1, 0xffff -/* AB0430 80240440 0200202D */ daddu $a0, $s0, $zero -/* AB0434 80240444 00431024 */ and $v0, $v0, $v1 -/* AB0438 80240448 00021140 */ sll $v0, $v0, 5 -/* AB043C 8024044C 3C068008 */ lui $a2, %hi(gItemTable) -/* AB0440 80240450 00C23021 */ addu $a2, $a2, $v0 -/* AB0444 80240454 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* AB0448 80240458 0C0B2026 */ jal set_variable -/* AB044C 8024045C 0220282D */ daddu $a1, $s1, $zero -/* AB0450 80240460 8FBF0018 */ lw $ra, 0x18($sp) -/* AB0454 80240464 8FB10014 */ lw $s1, 0x14($sp) -/* AB0458 80240468 8FB00010 */ lw $s0, 0x10($sp) -/* AB045C 8024046C 24020002 */ addiu $v0, $zero, 2 -/* AB0460 80240470 03E00008 */ jr $ra -/* AB0464 80240474 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_osr/osr_01/func_80240478_AAFFF0.s b/asm/nonmatchings/world/area_osr/osr_01/func_80240478_AAFFF0.s deleted file mode 100644 index 165b6c3604..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/func_80240478_AAFFF0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240478_AB0468 -/* AB0468 80240478 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AB046C 8024047C AFB10014 */ sw $s1, 0x14($sp) -/* AB0470 80240480 0080882D */ daddu $s1, $a0, $zero -/* AB0474 80240484 AFBF0018 */ sw $ra, 0x18($sp) -/* AB0478 80240488 AFB00010 */ sw $s0, 0x10($sp) -/* AB047C 8024048C 8E30000C */ lw $s0, 0xc($s1) -/* AB0480 80240490 8E050000 */ lw $a1, ($s0) -/* AB0484 80240494 0C0B1EAF */ jal get_variable -/* AB0488 80240498 26100004 */ addiu $s0, $s0, 4 -/* AB048C 8024049C 0C00EAD2 */ jal get_npc_safe -/* AB0490 802404A0 0040202D */ daddu $a0, $v0, $zero -/* AB0494 802404A4 10400005 */ beqz $v0, .L802404BC -/* AB0498 802404A8 00000000 */ nop -/* AB049C 802404AC 8E050000 */ lw $a1, ($s0) -/* AB04A0 802404B0 844600A8 */ lh $a2, 0xa8($v0) -/* AB04A4 802404B4 0C0B2026 */ jal set_variable -/* AB04A8 802404B8 0220202D */ daddu $a0, $s1, $zero -.L802404BC: -/* AB04AC 802404BC 8FBF0018 */ lw $ra, 0x18($sp) -/* AB04B0 802404C0 8FB10014 */ lw $s1, 0x14($sp) -/* AB04B4 802404C4 8FB00010 */ lw $s0, 0x10($sp) -/* AB04B8 802404C8 24020002 */ addiu $v0, $zero, 2 -/* AB04BC 802404CC 03E00008 */ jr $ra -/* AB04C0 802404D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_osr/osr_01/func_802404D4_AAFFF0.s b/asm/nonmatchings/world/area_osr/osr_01/func_802404D4_AAFFF0.s deleted file mode 100644 index 6d12ca68f5..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/func_802404D4_AAFFF0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404D4_AB04C4 -/* AB04C4 802404D4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* AB04C8 802404D8 AFB10014 */ sw $s1, 0x14($sp) -/* AB04CC 802404DC 0080882D */ daddu $s1, $a0, $zero -/* AB04D0 802404E0 AFBF0024 */ sw $ra, 0x24($sp) -/* AB04D4 802404E4 AFB40020 */ sw $s4, 0x20($sp) -/* AB04D8 802404E8 AFB3001C */ sw $s3, 0x1c($sp) -/* AB04DC 802404EC AFB20018 */ sw $s2, 0x18($sp) -/* AB04E0 802404F0 AFB00010 */ sw $s0, 0x10($sp) -/* AB04E4 802404F4 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* AB04E8 802404F8 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* AB04EC 802404FC F7B80038 */ sdc1 $f24, 0x38($sp) -/* AB04F0 80240500 F7B60030 */ sdc1 $f22, 0x30($sp) -/* AB04F4 80240504 F7B40028 */ sdc1 $f20, 0x28($sp) -/* AB04F8 80240508 8E30000C */ lw $s0, 0xc($s1) -/* AB04FC 8024050C 8E130000 */ lw $s3, ($s0) -/* AB0500 80240510 26100004 */ addiu $s0, $s0, 4 -/* AB0504 80240514 0C0B1EAF */ jal get_variable -/* AB0508 80240518 0260282D */ daddu $a1, $s3, $zero -/* AB050C 8024051C 4482E000 */ mtc1 $v0, $f28 -/* AB0510 80240520 00000000 */ nop -/* AB0514 80240524 4680E720 */ cvt.s.w $f28, $f28 -/* AB0518 80240528 8E140000 */ lw $s4, ($s0) -/* AB051C 8024052C 26100004 */ addiu $s0, $s0, 4 -/* AB0520 80240530 0220202D */ daddu $a0, $s1, $zero -/* AB0524 80240534 0C0B1EAF */ jal get_variable -/* AB0528 80240538 0280282D */ daddu $a1, $s4, $zero -/* AB052C 8024053C 4482D000 */ mtc1 $v0, $f26 -/* AB0530 80240540 00000000 */ nop -/* AB0534 80240544 4680D6A0 */ cvt.s.w $f26, $f26 -/* AB0538 80240548 8E100000 */ lw $s0, ($s0) -/* AB053C 8024054C 0220202D */ daddu $a0, $s1, $zero -/* AB0540 80240550 0C0B1EAF */ jal get_variable -/* AB0544 80240554 0200282D */ daddu $a1, $s0, $zero -/* AB0548 80240558 4482C000 */ mtc1 $v0, $f24 -/* AB054C 8024055C 00000000 */ nop -/* AB0550 80240560 4680C620 */ cvt.s.w $f24, $f24 -/* AB0554 80240564 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* AB0558 80240568 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* AB055C 8024056C 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* AB0560 80240570 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* AB0564 80240574 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* AB0568 80240578 44800000 */ mtc1 $zero, $f0 -/* AB056C 8024057C 00031080 */ sll $v0, $v1, 2 -/* AB0570 80240580 00431021 */ addu $v0, $v0, $v1 -/* AB0574 80240584 00021080 */ sll $v0, $v0, 2 -/* AB0578 80240588 00431023 */ subu $v0, $v0, $v1 -/* AB057C 8024058C 000218C0 */ sll $v1, $v0, 3 -/* AB0580 80240590 00431021 */ addu $v0, $v0, $v1 -/* AB0584 80240594 000210C0 */ sll $v0, $v0, 3 -/* AB0588 80240598 46001032 */ c.eq.s $f2, $f0 -/* AB058C 8024059C 3C01800B */ lui $at, 0x800b -/* AB0590 802405A0 00220821 */ addu $at, $at, $v0 -/* AB0594 802405A4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* AB0598 802405A8 45000005 */ bc1f .L802405C0 -/* AB059C 802405AC 00000000 */ nop -/* AB05A0 802405B0 3C0142C8 */ lui $at, 0x42c8 -/* AB05A4 802405B4 44810000 */ mtc1 $at, $f0 -/* AB05A8 802405B8 08090174 */ j .L802405D0 -/* AB05AC 802405BC 4600B581 */ sub.s $f22, $f22, $f0 -.L802405C0: -/* AB05B0 802405C0 3C0142C8 */ lui $at, 0x42c8 -/* AB05B4 802405C4 44810000 */ mtc1 $at, $f0 -/* AB05B8 802405C8 00000000 */ nop -/* AB05BC 802405CC 4600B580 */ add.s $f22, $f22, $f0 -.L802405D0: -/* AB05C0 802405D0 0C00A6C9 */ jal clamp_angle -/* AB05C4 802405D4 4600B306 */ mov.s $f12, $f22 -/* AB05C8 802405D8 46000586 */ mov.s $f22, $f0 -/* AB05CC 802405DC 3C014170 */ lui $at, 0x4170 -/* AB05D0 802405E0 4481A000 */ mtc1 $at, $f20 -/* AB05D4 802405E4 0C00A8BB */ jal sin_deg -/* AB05D8 802405E8 4600B306 */ mov.s $f12, $f22 -/* AB05DC 802405EC 46140002 */ mul.s $f0, $f0, $f20 -/* AB05E0 802405F0 00000000 */ nop -/* AB05E4 802405F4 864200B0 */ lh $v0, 0xb0($s2) -/* AB05E8 802405F8 3C013F00 */ lui $at, 0x3f00 -/* AB05EC 802405FC 44812000 */ mtc1 $at, $f4 -/* AB05F0 80240600 44821000 */ mtc1 $v0, $f2 -/* AB05F4 80240604 00000000 */ nop -/* AB05F8 80240608 468010A0 */ cvt.s.w $f2, $f2 -/* AB05FC 8024060C 46041082 */ mul.s $f2, $f2, $f4 -/* AB0600 80240610 00000000 */ nop -/* AB0604 80240614 4600E700 */ add.s $f28, $f28, $f0 -/* AB0608 80240618 4602D680 */ add.s $f26, $f26, $f2 -/* AB060C 8024061C 0C00A8D4 */ jal cos_deg -/* AB0610 80240620 4600B306 */ mov.s $f12, $f22 -/* AB0614 80240624 46140002 */ mul.s $f0, $f0, $f20 -/* AB0618 80240628 00000000 */ nop -/* AB061C 8024062C 0220202D */ daddu $a0, $s1, $zero -/* AB0620 80240630 0260282D */ daddu $a1, $s3, $zero -/* AB0624 80240634 4600E18D */ trunc.w.s $f6, $f28 -/* AB0628 80240638 44063000 */ mfc1 $a2, $f6 -/* AB062C 8024063C 0C0B2026 */ jal set_variable -/* AB0630 80240640 4600C601 */ sub.s $f24, $f24, $f0 -/* AB0634 80240644 0220202D */ daddu $a0, $s1, $zero -/* AB0638 80240648 4600D18D */ trunc.w.s $f6, $f26 -/* AB063C 8024064C 44063000 */ mfc1 $a2, $f6 -/* AB0640 80240650 0C0B2026 */ jal set_variable -/* AB0644 80240654 0280282D */ daddu $a1, $s4, $zero -/* AB0648 80240658 0220202D */ daddu $a0, $s1, $zero -/* AB064C 8024065C 4600C18D */ trunc.w.s $f6, $f24 -/* AB0650 80240660 44063000 */ mfc1 $a2, $f6 -/* AB0654 80240664 0C0B2026 */ jal set_variable -/* AB0658 80240668 0200282D */ daddu $a1, $s0, $zero -/* AB065C 8024066C 8FBF0024 */ lw $ra, 0x24($sp) -/* AB0660 80240670 8FB40020 */ lw $s4, 0x20($sp) -/* AB0664 80240674 8FB3001C */ lw $s3, 0x1c($sp) -/* AB0668 80240678 8FB20018 */ lw $s2, 0x18($sp) -/* AB066C 8024067C 8FB10014 */ lw $s1, 0x14($sp) -/* AB0670 80240680 8FB00010 */ lw $s0, 0x10($sp) -/* AB0674 80240684 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* AB0678 80240688 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* AB067C 8024068C D7B80038 */ ldc1 $f24, 0x38($sp) -/* AB0680 80240690 D7B60030 */ ldc1 $f22, 0x30($sp) -/* AB0684 80240694 D7B40028 */ ldc1 $f20, 0x28($sp) -/* AB0688 80240698 24020002 */ addiu $v0, $zero, 2 -/* AB068C 8024069C 03E00008 */ jr $ra -/* AB0690 802406A0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_osr/osr_01/func_802406A4_AAFFF0.s b/asm/nonmatchings/world/area_osr/osr_01/func_802406A4_AAFFF0.s deleted file mode 100644 index b3e193aa3e..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/func_802406A4_AAFFF0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A4_AB0694 -/* AB0694 802406A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB0698 802406A8 AFBF0010 */ sw $ra, 0x10($sp) -/* AB069C 802406AC 10A00003 */ beqz $a1, .L802406BC -/* AB06A0 802406B0 8C86000C */ lw $a2, 0xc($a0) -/* AB06A4 802406B4 3C018024 */ lui $at, 0x8024 -/* AB06A8 802406B8 AC20121C */ sw $zero, 0x121c($at) -.L802406BC: -/* AB06AC 802406BC 3C038024 */ lui $v1, 0x8024 -/* AB06B0 802406C0 2463121C */ addiu $v1, $v1, 0x121c -/* AB06B4 802406C4 8C620000 */ lw $v0, ($v1) -/* AB06B8 802406C8 54400003 */ bnel $v0, $zero, .L802406D8 -/* AB06BC 802406CC AC600000 */ sw $zero, ($v1) -/* AB06C0 802406D0 080901BB */ j .L802406EC -/* AB06C4 802406D4 0000102D */ daddu $v0, $zero, $zero -.L802406D8: -/* AB06C8 802406D8 8CC50000 */ lw $a1, ($a2) -/* AB06CC 802406DC 3C068024 */ lui $a2, 0x8024 -/* AB06D0 802406E0 0C0B2026 */ jal set_variable -/* AB06D4 802406E4 8CC61220 */ lw $a2, 0x1220($a2) -/* AB06D8 802406E8 24020002 */ addiu $v0, $zero, 2 -.L802406EC: -/* AB06DC 802406EC 8FBF0010 */ lw $ra, 0x10($sp) -/* AB06E0 802406F0 03E00008 */ jr $ra -/* AB06E4 802406F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_osr/osr_01/func_80240730_AAFFF0.s b/asm/nonmatchings/world/area_osr/osr_01/func_80240730_AAFFF0.s deleted file mode 100644 index c7c6f7414a..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/func_80240730_AAFFF0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_AB0720 -/* AB0720 80240730 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB0724 80240734 AFBF0010 */ sw $ra, 0x10($sp) -/* AB0728 80240738 8C82000C */ lw $v0, 0xc($a0) -/* AB072C 8024073C 0C0B1EAF */ jal get_variable -/* AB0730 80240740 8C450000 */ lw $a1, ($v0) -/* AB0734 80240744 0040182D */ daddu $v1, $v0, $zero -/* AB0738 80240748 10600012 */ beqz $v1, .L80240794 -/* AB073C 8024074C 0000202D */ daddu $a0, $zero, $zero -/* AB0740 80240750 8C620000 */ lw $v0, ($v1) -/* AB0744 80240754 5040000A */ beql $v0, $zero, .L80240780 -/* AB0748 80240758 00041080 */ sll $v0, $a0, 2 -/* AB074C 8024075C 3C058024 */ lui $a1, 0x8024 -/* AB0750 80240760 24A52180 */ addiu $a1, $a1, 0x2180 -.L80240764: -/* AB0754 80240764 24630004 */ addiu $v1, $v1, 4 -/* AB0758 80240768 24840001 */ addiu $a0, $a0, 1 -/* AB075C 8024076C ACA20000 */ sw $v0, ($a1) -/* AB0760 80240770 8C620000 */ lw $v0, ($v1) -/* AB0764 80240774 1440FFFB */ bnez $v0, .L80240764 -/* AB0768 80240778 24A50004 */ addiu $a1, $a1, 4 -/* AB076C 8024077C 00041080 */ sll $v0, $a0, 2 -.L80240780: -/* AB0770 80240780 3C018024 */ lui $at, 0x8024 -/* AB0774 80240784 00220821 */ addu $at, $at, $v0 -/* AB0778 80240788 AC202180 */ sw $zero, 0x2180($at) -/* AB077C 8024078C 080901EF */ j .L802407BC -/* AB0780 80240790 00000000 */ nop -.L80240794: -/* AB0784 80240794 3C038024 */ lui $v1, 0x8024 -/* AB0788 80240798 24632180 */ addiu $v1, $v1, 0x2180 -/* AB078C 8024079C 0060282D */ daddu $a1, $v1, $zero -.L802407A0: -/* AB0790 802407A0 24820010 */ addiu $v0, $a0, 0x10 -/* AB0794 802407A4 AC620000 */ sw $v0, ($v1) -/* AB0798 802407A8 24630004 */ addiu $v1, $v1, 4 -/* AB079C 802407AC 24840001 */ addiu $a0, $a0, 1 -/* AB07A0 802407B0 28820070 */ slti $v0, $a0, 0x70 -/* AB07A4 802407B4 1440FFFA */ bnez $v0, .L802407A0 -/* AB07A8 802407B8 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802407BC: -/* AB07AC 802407BC 8FBF0010 */ lw $ra, 0x10($sp) -/* AB07B0 802407C0 24020002 */ addiu $v0, $zero, 2 -/* AB07B4 802407C4 03E00008 */ jr $ra -/* AB07B8 802407C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_osr/osr_01/func_802407CC_AAFFF0.s b/asm/nonmatchings/world/area_osr/osr_01/func_802407CC_AAFFF0.s deleted file mode 100644 index 23a7a36d5d..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/func_802407CC_AAFFF0.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407CC_AB07BC -/* AB07BC 802407CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AB07C0 802407D0 AFB10014 */ sw $s1, 0x14($sp) -/* AB07C4 802407D4 0080882D */ daddu $s1, $a0, $zero -/* AB07C8 802407D8 AFBF0018 */ sw $ra, 0x18($sp) -/* AB07CC 802407DC AFB00010 */ sw $s0, 0x10($sp) -/* AB07D0 802407E0 8E30000C */ lw $s0, 0xc($s1) -/* AB07D4 802407E4 8E050000 */ lw $a1, ($s0) -/* AB07D8 802407E8 0C0B1EAF */ jal get_variable -/* AB07DC 802407EC 26100004 */ addiu $s0, $s0, 4 -/* AB07E0 802407F0 AE22008C */ sw $v0, 0x8c($s1) -/* AB07E4 802407F4 8E050000 */ lw $a1, ($s0) -/* AB07E8 802407F8 26100004 */ addiu $s0, $s0, 4 -/* AB07EC 802407FC 0C0B1EAF */ jal get_variable -/* AB07F0 80240800 0220202D */ daddu $a0, $s1, $zero -/* AB07F4 80240804 AE220090 */ sw $v0, 0x90($s1) -/* AB07F8 80240808 8E050000 */ lw $a1, ($s0) -/* AB07FC 8024080C 26100004 */ addiu $s0, $s0, 4 -/* AB0800 80240810 0C0B1EAF */ jal get_variable -/* AB0804 80240814 0220202D */ daddu $a0, $s1, $zero -/* AB0808 80240818 AE220094 */ sw $v0, 0x94($s1) -/* AB080C 8024081C 8E050000 */ lw $a1, ($s0) -/* AB0810 80240820 26100004 */ addiu $s0, $s0, 4 -/* AB0814 80240824 0C0B1EAF */ jal get_variable -/* AB0818 80240828 0220202D */ daddu $a0, $s1, $zero -/* AB081C 8024082C AE220098 */ sw $v0, 0x98($s1) -/* AB0820 80240830 8E050000 */ lw $a1, ($s0) -/* AB0824 80240834 26100004 */ addiu $s0, $s0, 4 -/* AB0828 80240838 0C0B1EAF */ jal get_variable -/* AB082C 8024083C 0220202D */ daddu $a0, $s1, $zero -/* AB0830 80240840 AE22009C */ sw $v0, 0x9c($s1) -/* AB0834 80240844 8E050000 */ lw $a1, ($s0) -/* AB0838 80240848 26100004 */ addiu $s0, $s0, 4 -/* AB083C 8024084C 0C0B1EAF */ jal get_variable -/* AB0840 80240850 0220202D */ daddu $a0, $s1, $zero -/* AB0844 80240854 AE2200A0 */ sw $v0, 0xa0($s1) -/* AB0848 80240858 8E050000 */ lw $a1, ($s0) -/* AB084C 8024085C 26100004 */ addiu $s0, $s0, 4 -/* AB0850 80240860 0C0B1EAF */ jal get_variable -/* AB0854 80240864 0220202D */ daddu $a0, $s1, $zero -/* AB0858 80240868 AE2200A4 */ sw $v0, 0xa4($s1) -/* AB085C 8024086C 8E050000 */ lw $a1, ($s0) -/* AB0860 80240870 26100004 */ addiu $s0, $s0, 4 -/* AB0864 80240874 0C0B1EAF */ jal get_variable -/* AB0868 80240878 0220202D */ daddu $a0, $s1, $zero -/* AB086C 8024087C AE2200A8 */ sw $v0, 0xa8($s1) -/* AB0870 80240880 8E050000 */ lw $a1, ($s0) -/* AB0874 80240884 26100004 */ addiu $s0, $s0, 4 -/* AB0878 80240888 0C0B1EAF */ jal get_variable -/* AB087C 8024088C 0220202D */ daddu $a0, $s1, $zero -/* AB0880 80240890 AE2200AC */ sw $v0, 0xac($s1) -/* AB0884 80240894 8E050000 */ lw $a1, ($s0) -/* AB0888 80240898 0C0B1EAF */ jal get_variable -/* AB088C 8024089C 0220202D */ daddu $a0, $s1, $zero -/* AB0890 802408A0 AE2200B0 */ sw $v0, 0xb0($s1) -/* AB0894 802408A4 8FBF0018 */ lw $ra, 0x18($sp) -/* AB0898 802408A8 8FB10014 */ lw $s1, 0x14($sp) -/* AB089C 802408AC 8FB00010 */ lw $s0, 0x10($sp) -/* AB08A0 802408B0 24020002 */ addiu $v0, $zero, 2 -/* AB08A4 802408B4 03E00008 */ jr $ra -/* AB08A8 802408B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_osr/osr_01/func_80240A48_AAFFF0.s b/asm/nonmatchings/world/area_osr/osr_01/func_80240A48_AAFFF0.s deleted file mode 100644 index 3eb7eb5412..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/func_80240A48_AAFFF0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A48_AB0A38 -/* AB0A38 80240A48 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB0A3C 80240A4C AFB00010 */ sw $s0, 0x10($sp) -/* AB0A40 80240A50 0080802D */ daddu $s0, $a0, $zero -/* AB0A44 80240A54 AFBF0014 */ sw $ra, 0x14($sp) -/* AB0A48 80240A58 0C00EABB */ jal get_npc_unsafe -/* AB0A4C 80240A5C 8E04008C */ lw $a0, 0x8c($s0) -/* AB0A50 80240A60 0040282D */ daddu $a1, $v0, $zero -/* AB0A54 80240A64 8E040094 */ lw $a0, 0x94($s0) -/* AB0A58 80240A68 8CA30028 */ lw $v1, 0x28($a1) -/* AB0A5C 80240A6C ACA40028 */ sw $a0, 0x28($a1) -/* AB0A60 80240A70 8FBF0014 */ lw $ra, 0x14($sp) -/* AB0A64 80240A74 8FB00010 */ lw $s0, 0x10($sp) -/* AB0A68 80240A78 24020002 */ addiu $v0, $zero, 2 -/* AB0A6C 80240A7C 3C018024 */ lui $at, 0x8024 -/* AB0A70 80240A80 AC232344 */ sw $v1, 0x2344($at) -/* AB0A74 80240A84 03E00008 */ jr $ra -/* AB0A78 80240A88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_osr/osr_01/func_80240A8C_AAFFF0.s b/asm/nonmatchings/world/area_osr/osr_01/func_80240A8C_AAFFF0.s deleted file mode 100644 index 89f13a180c..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/func_80240A8C_AAFFF0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A8C_AB0A7C -/* AB0A7C 80240A8C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB0A80 80240A90 AFBF0010 */ sw $ra, 0x10($sp) -/* AB0A84 80240A94 0C00EABB */ jal get_npc_unsafe -/* AB0A88 80240A98 8C84008C */ lw $a0, 0x8c($a0) -/* AB0A8C 80240A9C 3C038024 */ lui $v1, 0x8024 -/* AB0A90 80240AA0 8C632344 */ lw $v1, 0x2344($v1) -/* AB0A94 80240AA4 AC430028 */ sw $v1, 0x28($v0) -/* AB0A98 80240AA8 8FBF0010 */ lw $ra, 0x10($sp) -/* AB0A9C 80240AAC 24020002 */ addiu $v0, $zero, 2 -/* AB0AA0 80240AB0 03E00008 */ jr $ra -/* AB0AA4 80240AB4 27BD0018 */ addiu $sp, $sp, 0x18 -/* AB0AA8 80240AB8 00000000 */ nop -/* AB0AAC 80240ABC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_02/func_80240020_AB2170.s b/asm/nonmatchings/world/area_osr/osr_02/func_80240020_AB2170.s deleted file mode 100644 index c5260c8342..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_02/func_80240020_AB2170.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_AB2190 -/* AB2190 80240020 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB2194 80240024 AFBF0010 */ sw $ra, 0x10($sp) -/* AB2198 80240028 8C82000C */ lw $v0, 0xc($a0) -/* AB219C 8024002C 0C0B210B */ jal get_float_variable -/* AB21A0 80240030 8C450000 */ lw $a1, ($v0) -/* AB21A4 80240034 8FBF0010 */ lw $ra, 0x10($sp) -/* AB21A8 80240038 4600008D */ trunc.w.s $f2, $f0 -/* AB21AC 8024003C 44021000 */ mfc1 $v0, $f2 -/* AB21B0 80240040 00000000 */ nop -/* AB21B4 80240044 3C018011 */ lui $at, 0x8011 -/* AB21B8 80240048 A022EFD5 */ sb $v0, -0x102b($at) -/* AB21BC 8024004C 24020002 */ addiu $v0, $zero, 2 -/* AB21C0 80240050 03E00008 */ jr $ra -/* AB21C4 80240054 27BD0018 */ addiu $sp, $sp, 0x18 -/* AB21C8 80240058 00000000 */ nop -/* AB21CC 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_02/func_80240060_AB2170.s b/asm/nonmatchings/world/area_osr/osr_02/func_80240060_AB2170.s deleted file mode 100644 index 2c1e88684c..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_02/func_80240060_AB2170.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240060_AB21D0 -/* AB21D0 80240060 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AB21D4 80240064 AFB10014 */ sw $s1, 0x14($sp) -/* AB21D8 80240068 0080882D */ daddu $s1, $a0, $zero -/* AB21DC 8024006C AFBF0018 */ sw $ra, 0x18($sp) -/* AB21E0 80240070 10A0000C */ beqz $a1, .L802400A4 -/* AB21E4 80240074 AFB00010 */ sw $s0, 0x10($sp) -/* AB21E8 80240078 8E24014C */ lw $a0, 0x14c($s1) -/* AB21EC 8024007C 0C00EAD2 */ jal get_npc_safe -/* AB21F0 80240080 AE200074 */ sw $zero, 0x74($s1) -/* AB21F4 80240084 8E23014C */ lw $v1, 0x14c($s1) -/* AB21F8 80240088 AE220078 */ sw $v0, 0x78($s1) -/* AB21FC 8024008C 2463FFFE */ addiu $v1, $v1, -2 -/* AB2200 80240090 00031840 */ sll $v1, $v1, 1 -/* AB2204 80240094 3C028024 */ lui $v0, 0x8024 -/* AB2208 80240098 00431021 */ addu $v0, $v0, $v1 -/* AB220C 8024009C 8442253C */ lh $v0, 0x253c($v0) -/* AB2210 802400A0 AE22007C */ sw $v0, 0x7c($s1) -.L802400A4: -/* AB2214 802400A4 8E22007C */ lw $v0, 0x7c($s1) -/* AB2218 802400A8 14400015 */ bnez $v0, .L80240100 -/* AB221C 802400AC 2442FFFF */ addiu $v0, $v0, -1 -/* AB2220 802400B0 C62C0074 */ lwc1 $f12, 0x74($s1) -/* AB2224 802400B4 0C00A8BB */ jal sin_deg -/* AB2228 802400B8 8E300078 */ lw $s0, 0x78($s1) -/* AB222C 802400BC 3C013FC0 */ lui $at, 0x3fc0 -/* AB2230 802400C0 44811000 */ mtc1 $at, $f2 -/* AB2234 802400C4 00000000 */ nop -/* AB2238 802400C8 46020002 */ mul.s $f0, $f0, $f2 -/* AB223C 802400CC 00000000 */ nop -/* AB2240 802400D0 3C014190 */ lui $at, 0x4190 -/* AB2244 802400D4 44816000 */ mtc1 $at, $f12 -/* AB2248 802400D8 4600010D */ trunc.w.s $f4, $f0 -/* AB224C 802400DC 44022000 */ mfc1 $v0, $f4 -/* AB2250 802400E0 00000000 */ nop -/* AB2254 802400E4 A20200AB */ sb $v0, 0xab($s0) -/* AB2258 802400E8 C6200074 */ lwc1 $f0, 0x74($s1) -/* AB225C 802400EC 0C00A6C9 */ jal clamp_angle -/* AB2260 802400F0 460C0300 */ add.s $f12, $f0, $f12 -/* AB2264 802400F4 0000102D */ daddu $v0, $zero, $zero -/* AB2268 802400F8 08090042 */ j .L80240108 -/* AB226C 802400FC E6200074 */ swc1 $f0, 0x74($s1) -.L80240100: -/* AB2270 80240100 AE22007C */ sw $v0, 0x7c($s1) -/* AB2274 80240104 0000102D */ daddu $v0, $zero, $zero -.L80240108: -/* AB2278 80240108 8FBF0018 */ lw $ra, 0x18($sp) -/* AB227C 8024010C 8FB10014 */ lw $s1, 0x14($sp) -/* AB2280 80240110 8FB00010 */ lw $s0, 0x10($sp) -/* AB2284 80240114 03E00008 */ jr $ra -/* AB2288 80240118 27BD0020 */ addiu $sp, $sp, 0x20 -/* AB228C 8024011C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_02/func_80240120_AB2170.s b/asm/nonmatchings/world/area_osr/osr_02/func_80240120_AB2170.s deleted file mode 100644 index ffdeabcd3f..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_02/func_80240120_AB2170.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240120_AB2290 -/* AB2290 80240120 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB2294 80240124 AFBF0010 */ sw $ra, 0x10($sp) -/* AB2298 80240128 8C82000C */ lw $v0, 0xc($a0) -/* AB229C 8024012C 3C068011 */ lui $a2, 0x8011 -/* AB22A0 80240130 80C6EFD4 */ lb $a2, -0x102c($a2) -/* AB22A4 80240134 0C0B2026 */ jal set_variable -/* AB22A8 80240138 8C450000 */ lw $a1, ($v0) -/* AB22AC 8024013C 8FBF0010 */ lw $ra, 0x10($sp) -/* AB22B0 80240140 24020002 */ addiu $v0, $zero, 2 -/* AB22B4 80240144 03E00008 */ jr $ra -/* AB22B8 80240148 27BD0018 */ addiu $sp, $sp, 0x18 -/* AB22BC 8024014C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_03/func_80240020_AB6290.s b/asm/nonmatchings/world/area_osr/osr_03/func_80240020_AB6290.s deleted file mode 100644 index 2364053851..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_03/func_80240020_AB6290.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_AB62B0 -/* AB62B0 80240020 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AB62B4 80240024 AFB00010 */ sw $s0, 0x10($sp) -/* AB62B8 80240028 0080802D */ daddu $s0, $a0, $zero -/* AB62BC 8024002C AFBF0018 */ sw $ra, 0x18($sp) -/* AB62C0 80240030 AFB10014 */ sw $s1, 0x14($sp) -/* AB62C4 80240034 8E11000C */ lw $s1, 0xc($s0) -/* AB62C8 80240038 0C0B1EAF */ jal get_variable -/* AB62CC 8024003C 8E250000 */ lw $a1, ($s1) -/* AB62D0 80240040 44826000 */ mtc1 $v0, $f12 -/* AB62D4 80240044 00000000 */ nop -/* AB62D8 80240048 0C00A8BB */ jal sin_deg -/* AB62DC 8024004C 46806320 */ cvt.s.w $f12, $f12 -/* AB62E0 80240050 3C0141A0 */ lui $at, 0x41a0 -/* AB62E4 80240054 44811000 */ mtc1 $at, $f2 -/* AB62E8 80240058 00000000 */ nop -/* AB62EC 8024005C 46020002 */ mul.s $f0, $f0, $f2 -/* AB62F0 80240060 00000000 */ nop -/* AB62F4 80240064 8E250000 */ lw $a1, ($s1) -/* AB62F8 80240068 4600010D */ trunc.w.s $f4, $f0 -/* AB62FC 8024006C 44062000 */ mfc1 $a2, $f4 -/* AB6300 80240070 0C0B2026 */ jal set_variable -/* AB6304 80240074 0200202D */ daddu $a0, $s0, $zero -/* AB6308 80240078 8FBF0018 */ lw $ra, 0x18($sp) -/* AB630C 8024007C 8FB10014 */ lw $s1, 0x14($sp) -/* AB6310 80240080 8FB00010 */ lw $s0, 0x10($sp) -/* AB6314 80240084 24020002 */ addiu $v0, $zero, 2 -/* AB6318 80240088 03E00008 */ jr $ra -/* AB631C 8024008C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_osr/osr_03/func_802401A0_AB6290.s b/asm/nonmatchings/world/area_osr/osr_03/func_802401A0_AB6290.s deleted file mode 100644 index ec3bc058c7..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_03/func_802401A0_AB6290.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401A0_AB6430 -/* AB6430 802401A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB6434 802401A4 AFB00010 */ sw $s0, 0x10($sp) -/* AB6438 802401A8 0080802D */ daddu $s0, $a0, $zero -/* AB643C 802401AC 10A00003 */ beqz $a1, .L802401BC -/* AB6440 802401B0 AFBF0014 */ sw $ra, 0x14($sp) -/* AB6444 802401B4 AE000074 */ sw $zero, 0x74($s0) -/* AB6448 802401B8 AE000078 */ sw $zero, 0x78($s0) -.L802401BC: -/* AB644C 802401BC 8E030078 */ lw $v1, 0x78($s0) -/* AB6450 802401C0 10600005 */ beqz $v1, .L802401D8 -/* AB6454 802401C4 24020001 */ addiu $v0, $zero, 1 -/* AB6458 802401C8 1062001A */ beq $v1, $v0, .L80240234 -/* AB645C 802401CC 0000102D */ daddu $v0, $zero, $zero -/* AB6460 802401D0 080900A0 */ j .L80240280 -/* AB6464 802401D4 00000000 */ nop -.L802401D8: -/* AB6468 802401D8 0000202D */ daddu $a0, $zero, $zero -/* AB646C 802401DC 240500D0 */ addiu $a1, $zero, 0xd0 -/* AB6470 802401E0 00A0302D */ daddu $a2, $a1, $zero -/* AB6474 802401E4 0C04DF84 */ jal func_80137E10 -/* AB6478 802401E8 00A0382D */ daddu $a3, $a1, $zero -/* AB647C 802401EC C6000074 */ lwc1 $f0, 0x74($s0) -/* AB6480 802401F0 46800020 */ cvt.s.w $f0, $f0 -/* AB6484 802401F4 44050000 */ mfc1 $a1, $f0 -/* AB6488 802401F8 0C04DF62 */ jal func_80137D88 -/* AB648C 802401FC 24040001 */ addiu $a0, $zero, 1 -/* AB6490 80240200 8E020074 */ lw $v0, 0x74($s0) -/* AB6494 80240204 240300FF */ addiu $v1, $zero, 0xff -/* AB6498 80240208 14430004 */ bne $v0, $v1, .L8024021C -/* AB649C 8024020C 24420040 */ addiu $v0, $v0, 0x40 -/* AB64A0 80240210 24020001 */ addiu $v0, $zero, 1 -/* AB64A4 80240214 0809009F */ j .L8024027C -/* AB64A8 80240218 AE020078 */ sw $v0, 0x78($s0) -.L8024021C: -/* AB64AC 8024021C AE020074 */ sw $v0, 0x74($s0) -/* AB64B0 80240220 28420100 */ slti $v0, $v0, 0x100 -/* AB64B4 80240224 50400015 */ beql $v0, $zero, .L8024027C -/* AB64B8 80240228 AE030074 */ sw $v1, 0x74($s0) -/* AB64BC 8024022C 080900A0 */ j .L80240280 -/* AB64C0 80240230 0000102D */ daddu $v0, $zero, $zero -.L80240234: -/* AB64C4 80240234 0000202D */ daddu $a0, $zero, $zero -/* AB64C8 80240238 240500D0 */ addiu $a1, $zero, 0xd0 -/* AB64CC 8024023C 00A0302D */ daddu $a2, $a1, $zero -/* AB64D0 80240240 0C04DF84 */ jal func_80137E10 -/* AB64D4 80240244 00A0382D */ daddu $a3, $a1, $zero -/* AB64D8 80240248 C6000074 */ lwc1 $f0, 0x74($s0) -/* AB64DC 8024024C 46800020 */ cvt.s.w $f0, $f0 -/* AB64E0 80240250 44050000 */ mfc1 $a1, $f0 -/* AB64E4 80240254 0C04DF62 */ jal func_80137D88 -/* AB64E8 80240258 24040001 */ addiu $a0, $zero, 1 -/* AB64EC 8024025C 8E020074 */ lw $v0, 0x74($s0) -/* AB64F0 80240260 14400003 */ bnez $v0, .L80240270 -/* AB64F4 80240264 2442FFC0 */ addiu $v0, $v0, -0x40 -/* AB64F8 80240268 080900A0 */ j .L80240280 -/* AB64FC 8024026C 24020002 */ addiu $v0, $zero, 2 -.L80240270: -/* AB6500 80240270 1C400002 */ bgtz $v0, .L8024027C -/* AB6504 80240274 AE020074 */ sw $v0, 0x74($s0) -/* AB6508 80240278 AE000074 */ sw $zero, 0x74($s0) -.L8024027C: -/* AB650C 8024027C 0000102D */ daddu $v0, $zero, $zero -.L80240280: -/* AB6510 80240280 8FBF0014 */ lw $ra, 0x14($sp) -/* AB6514 80240284 8FB00010 */ lw $s0, 0x10($sp) -/* AB6518 80240288 03E00008 */ jr $ra -/* AB651C 8024028C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_osr/osr_03/func_80240290_AB6290.s b/asm/nonmatchings/world/area_osr/osr_03/func_80240290_AB6290.s deleted file mode 100644 index 03bab18d20..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_03/func_80240290_AB6290.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240290_AB6520 -/* AB6520 80240290 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AB6524 80240294 AFB10014 */ sw $s1, 0x14($sp) -/* AB6528 80240298 0080882D */ daddu $s1, $a0, $zero -/* AB652C 8024029C AFBF0018 */ sw $ra, 0x18($sp) -/* AB6530 802402A0 AFB00010 */ sw $s0, 0x10($sp) -/* AB6534 802402A4 10A0002A */ beqz $a1, .L80240350 -/* AB6538 802402A8 8E30000C */ lw $s0, 0xc($s1) -/* AB653C 802402AC 8E050000 */ lw $a1, ($s0) -/* AB6540 802402B0 0C0B1EAF */ jal get_variable -/* AB6544 802402B4 26100004 */ addiu $s0, $s0, 4 -/* AB6548 802402B8 0220202D */ daddu $a0, $s1, $zero -/* AB654C 802402BC 8E050000 */ lw $a1, ($s0) -/* AB6550 802402C0 0C0B210B */ jal get_float_variable -/* AB6554 802402C4 0040802D */ daddu $s0, $v0, $zero -/* AB6558 802402C8 46000000 */ add.s $f0, $f0, $f0 -/* AB655C 802402CC 3C014120 */ lui $at, 0x4120 -/* AB6560 802402D0 44812000 */ mtc1 $at, $f4 -/* AB6564 802402D4 00000000 */ nop -/* AB6568 802402D8 4600203C */ c.lt.s $f4, $f0 -/* AB656C 802402DC 00000000 */ nop -/* AB6570 802402E0 45000002 */ bc1f .L802402EC -/* AB6574 802402E4 AE300070 */ sw $s0, 0x70($s1) -/* AB6578 802402E8 46002006 */ mov.s $f0, $f4 -.L802402EC: -/* AB657C 802402EC 3C014380 */ lui $at, 0x4380 -/* AB6580 802402F0 44811000 */ mtc1 $at, $f2 -/* AB6584 802402F4 46040003 */ div.s $f0, $f0, $f4 -/* AB6588 802402F8 46020002 */ mul.s $f0, $f0, $f2 -/* AB658C 802402FC 00000000 */ nop -/* AB6590 80240300 3C014F00 */ lui $at, 0x4f00 -/* AB6594 80240304 44811000 */ mtc1 $at, $f2 -/* AB6598 80240308 00000000 */ nop -/* AB659C 8024030C 4600103E */ c.le.s $f2, $f0 -/* AB65A0 80240310 00000000 */ nop -/* AB65A4 80240314 45030005 */ bc1tl .L8024032C -/* AB65A8 80240318 46020001 */ sub.s $f0, $f0, $f2 -/* AB65AC 8024031C 4600018D */ trunc.w.s $f6, $f0 -/* AB65B0 80240320 44043000 */ mfc1 $a0, $f6 -/* AB65B4 80240324 080900D1 */ j .L80240344 -/* AB65B8 80240328 308400FF */ andi $a0, $a0, 0xff -.L8024032C: -/* AB65BC 8024032C 3C028000 */ lui $v0, 0x8000 -/* AB65C0 80240330 4600018D */ trunc.w.s $f6, $f0 -/* AB65C4 80240334 44043000 */ mfc1 $a0, $f6 -/* AB65C8 80240338 00000000 */ nop -/* AB65CC 8024033C 00822025 */ or $a0, $a0, $v0 -/* AB65D0 80240340 308400FF */ andi $a0, $a0, 0xff -.L80240344: -/* AB65D4 80240344 3205FFFF */ andi $a1, $s0, 0xffff -/* AB65D8 80240348 0C00A3C2 */ jal start_rumble -/* AB65DC 8024034C 00052840 */ sll $a1, $a1, 1 -.L80240350: -/* AB65E0 80240350 8E230070 */ lw $v1, 0x70($s1) -/* AB65E4 80240354 2463FFFF */ addiu $v1, $v1, -1 -/* AB65E8 80240358 AE230070 */ sw $v1, 0x70($s1) -/* AB65EC 8024035C 8FBF0018 */ lw $ra, 0x18($sp) -/* AB65F0 80240360 8FB10014 */ lw $s1, 0x14($sp) -/* AB65F4 80240364 8FB00010 */ lw $s0, 0x10($sp) -/* AB65F8 80240368 2C620001 */ sltiu $v0, $v1, 1 -/* AB65FC 8024036C 03E00008 */ jr $ra -/* AB6600 80240370 27BD0020 */ addiu $sp, $sp, 0x20 -/* AB6604 80240374 00000000 */ nop -/* AB6608 80240378 00000000 */ nop -/* AB660C 8024037C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_04/func_80240050_AB92B0.s b/asm/nonmatchings/world/area_osr/osr_04/func_80240050_AB92B0.s deleted file mode 100644 index 7248db451f..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_04/func_80240050_AB92B0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_AB9300 -/* AB9300 80240050 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AB9304 80240054 AFB00010 */ sw $s0, 0x10($sp) -/* AB9308 80240058 0080802D */ daddu $s0, $a0, $zero -/* AB930C 8024005C AFBF0018 */ sw $ra, 0x18($sp) -/* AB9310 80240060 AFB10014 */ sw $s1, 0x14($sp) -/* AB9314 80240064 8E11000C */ lw $s1, 0xc($s0) -/* AB9318 80240068 0C0B1EAF */ jal get_variable -/* AB931C 8024006C 8E250000 */ lw $a1, ($s1) -/* AB9320 80240070 44826000 */ mtc1 $v0, $f12 -/* AB9324 80240074 00000000 */ nop -/* AB9328 80240078 0C00A8BB */ jal sin_deg -/* AB932C 8024007C 46806320 */ cvt.s.w $f12, $f12 -/* AB9330 80240080 3C0141A0 */ lui $at, 0x41a0 -/* AB9334 80240084 44811000 */ mtc1 $at, $f2 -/* AB9338 80240088 00000000 */ nop -/* AB933C 8024008C 46020002 */ mul.s $f0, $f0, $f2 -/* AB9340 80240090 00000000 */ nop -/* AB9344 80240094 8E250000 */ lw $a1, ($s1) -/* AB9348 80240098 4600010D */ trunc.w.s $f4, $f0 -/* AB934C 8024009C 44062000 */ mfc1 $a2, $f4 -/* AB9350 802400A0 0C0B2026 */ jal set_variable -/* AB9354 802400A4 0200202D */ daddu $a0, $s0, $zero -/* AB9358 802400A8 8FBF0018 */ lw $ra, 0x18($sp) -/* AB935C 802400AC 8FB10014 */ lw $s1, 0x14($sp) -/* AB9360 802400B0 8FB00010 */ lw $s0, 0x10($sp) -/* AB9364 802400B4 24020002 */ addiu $v0, $zero, 2 -/* AB9368 802400B8 03E00008 */ jr $ra -/* AB936C 802400BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_80240020_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_80240020_D4D040.s deleted file mode 100644 index 342a1ce077..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_80240020_D4D040.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D4D060 -/* D4D060 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D4D064 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D4D068 80240028 00822024 */ and $a0, $a0, $v0 -/* D4D06C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D4D070 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D4D074 80240034 00821821 */ addu $v1, $a0, $v0 -/* D4D078 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D4D07C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D4D080 80240040 30620001 */ andi $v0, $v1, 1 -/* D4D084 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D4D088 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D4D08C 8024004C 03E00008 */ jr $ra -/* D4D090 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_802400EC_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_802400EC_D4D040.s deleted file mode 100644 index 58783d587a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_802400EC_D4D040.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_D4D12C -/* D4D12C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4D130 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* D4D134 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D4D138 802400F8 3C058024 */ lui $a1, 0x8024 -/* D4D13C 802400FC 24A50128 */ addiu $a1, $a1, 0x128 -/* D4D140 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* D4D144 80240104 0C048C56 */ jal bind_dynamic_entity_3 -/* D4D148 80240108 0000202D */ daddu $a0, $zero, $zero -/* D4D14C 8024010C 8E03013C */ lw $v1, 0x13c($s0) -/* D4D150 80240110 AC620000 */ sw $v0, ($v1) -/* D4D154 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* D4D158 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* D4D15C 8024011C 24020002 */ addiu $v0, $zero, 2 -/* D4D160 80240120 03E00008 */ jr $ra -/* D4D164 80240124 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_802402F0_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_802402F0_D4D040.s deleted file mode 100644 index 57bcb04abe..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_802402F0_D4D040.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D4D330 -/* D4D330 802402F0 3C03800A */ lui $v1, 0x800a -/* D4D334 802402F4 8463A634 */ lh $v1, -0x59cc($v1) -/* D4D338 802402F8 3C07BF80 */ lui $a3, 0xbf80 -/* D4D33C 802402FC 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D4D340 80240300 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D4D344 80240304 4480A000 */ mtc1 $zero, $f20 -/* D4D348 80240308 AFB1011C */ sw $s1, 0x11c($sp) -/* D4D34C 8024030C 0080882D */ daddu $s1, $a0, $zero -/* D4D350 80240310 AFB00118 */ sw $s0, 0x118($sp) -/* D4D354 80240314 27B00098 */ addiu $s0, $sp, 0x98 -/* D4D358 80240318 AFBF0120 */ sw $ra, 0x120($sp) -/* D4D35C 8024031C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D4D360 80240320 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D4D364 80240324 00031080 */ sll $v0, $v1, 2 -/* D4D368 80240328 00431021 */ addu $v0, $v0, $v1 -/* D4D36C 8024032C 00021080 */ sll $v0, $v0, 2 -/* D4D370 80240330 00431023 */ subu $v0, $v0, $v1 -/* D4D374 80240334 000218C0 */ sll $v1, $v0, 3 -/* D4D378 80240338 00431021 */ addu $v0, $v0, $v1 -/* D4D37C 8024033C 000210C0 */ sll $v0, $v0, 3 -/* D4D380 80240340 3C01800B */ lui $at, 0x800b -/* D4D384 80240344 00220821 */ addu $at, $at, $v0 -/* D4D388 80240348 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D4D38C 8024034C 4406A000 */ mfc1 $a2, $f20 -/* D4D390 80240350 4600B587 */ neg.s $f22, $f22 -/* D4D394 80240354 4405B000 */ mfc1 $a1, $f22 -/* D4D398 80240358 0200202D */ daddu $a0, $s0, $zero -/* D4D39C 8024035C 0C019EC8 */ jal guRotateF -/* D4D3A0 80240360 E7B40010 */ swc1 $f20, 0x10($sp) -/* D4D3A4 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D4D3A8 80240368 0C00A6C9 */ jal clamp_angle -/* D4D3AC 8024036C 00000000 */ nop -/* D4D3B0 80240370 44050000 */ mfc1 $a1, $f0 -/* D4D3B4 80240374 4406A000 */ mfc1 $a2, $f20 -/* D4D3B8 80240378 4407A000 */ mfc1 $a3, $f20 -/* D4D3BC 8024037C 3C013F80 */ lui $at, 0x3f80 -/* D4D3C0 80240380 4481C000 */ mtc1 $at, $f24 -/* D4D3C4 80240384 27A40018 */ addiu $a0, $sp, 0x18 -/* D4D3C8 80240388 0C019EC8 */ jal guRotateF -/* D4D3CC 8024038C E7B80010 */ swc1 $f24, 0x10($sp) -/* D4D3D0 80240390 0200202D */ daddu $a0, $s0, $zero -/* D4D3D4 80240394 27A50018 */ addiu $a1, $sp, 0x18 -/* D4D3D8 80240398 0C019D80 */ jal guMtxCatF -/* D4D3DC 8024039C 00A0302D */ daddu $a2, $a1, $zero -/* D4D3E0 802403A0 4405B000 */ mfc1 $a1, $f22 -/* D4D3E4 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D4D3E8 802403A8 4407C000 */ mfc1 $a3, $f24 -/* D4D3EC 802403AC 0200202D */ daddu $a0, $s0, $zero -/* D4D3F0 802403B0 0C019EC8 */ jal guRotateF -/* D4D3F4 802403B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D4D3F8 802403B8 27A40018 */ addiu $a0, $sp, 0x18 -/* D4D3FC 802403BC 0200282D */ daddu $a1, $s0, $zero -/* D4D400 802403C0 0C019D80 */ jal guMtxCatF -/* D4D404 802403C4 0080302D */ daddu $a2, $a0, $zero -/* D4D408 802403C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D4D40C 802403CC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D4D410 802403D0 4406A000 */ mfc1 $a2, $f20 -/* D4D414 802403D4 4407C000 */ mfc1 $a3, $f24 -/* D4D418 802403D8 0C019EC8 */ jal guRotateF -/* D4D41C 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D4D420 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* D4D424 802403E4 0200282D */ daddu $a1, $s0, $zero -/* D4D428 802403E8 0C019D80 */ jal guMtxCatF -/* D4D42C 802403EC 0080302D */ daddu $a2, $a0, $zero -/* D4D430 802403F0 3C013F36 */ lui $at, 0x3f36 -/* D4D434 802403F4 3421DB6E */ ori $at, $at, 0xdb6e -/* D4D438 802403F8 44810000 */ mtc1 $at, $f0 -/* D4D43C 802403FC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D4D440 80240400 44050000 */ mfc1 $a1, $f0 -/* D4D444 80240404 0200202D */ daddu $a0, $s0, $zero -/* D4D448 80240408 00A0302D */ daddu $a2, $a1, $zero -/* D4D44C 8024040C 0C019DF0 */ jal guScaleF -/* D4D450 80240410 00A0382D */ daddu $a3, $a1, $zero -/* D4D454 80240414 27A40018 */ addiu $a0, $sp, 0x18 -/* D4D458 80240418 0200282D */ daddu $a1, $s0, $zero -/* D4D45C 8024041C 0C019D80 */ jal guMtxCatF -/* D4D460 80240420 0080302D */ daddu $a2, $a0, $zero -/* D4D464 80240424 27B00058 */ addiu $s0, $sp, 0x58 -/* D4D468 80240428 C6200030 */ lwc1 $f0, 0x30($s1) -/* D4D46C 8024042C 3C014040 */ lui $at, 0x4040 -/* D4D470 80240430 44811000 */ mtc1 $at, $f2 -/* D4D474 80240434 46000007 */ neg.s $f0, $f0 -/* D4D478 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* D4D47C 8024043C 8E250028 */ lw $a1, 0x28($s1) -/* D4D480 80240440 8E26002C */ lw $a2, 0x2c($s1) -/* D4D484 80240444 44070000 */ mfc1 $a3, $f0 -/* D4D488 80240448 0C019E40 */ jal guTranslateF -/* D4D48C 8024044C 0200202D */ daddu $a0, $s0, $zero -/* D4D490 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* D4D494 80240454 0200282D */ daddu $a1, $s0, $zero -/* D4D498 80240458 0C019D80 */ jal guMtxCatF -/* D4D49C 8024045C 0080302D */ daddu $a2, $a0, $zero -/* D4D4A0 80240460 24040002 */ addiu $a0, $zero, 2 -/* D4D4A4 80240464 0000282D */ daddu $a1, $zero, $zero -/* D4D4A8 80240468 00A0302D */ daddu $a2, $a1, $zero -/* D4D4AC 8024046C 00A0382D */ daddu $a3, $a1, $zero -/* D4D4B0 80240470 27A20018 */ addiu $v0, $sp, 0x18 -/* D4D4B4 80240474 0C0B7710 */ jal render_sprite -/* D4D4B8 80240478 AFA20010 */ sw $v0, 0x10($sp) -/* D4D4BC 8024047C 8FBF0120 */ lw $ra, 0x120($sp) -/* D4D4C0 80240480 8FB1011C */ lw $s1, 0x11c($sp) -/* D4D4C4 80240484 8FB00118 */ lw $s0, 0x118($sp) -/* D4D4C8 80240488 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D4D4CC 8024048C D7B60130 */ ldc1 $f22, 0x130($sp) -/* D4D4D0 80240490 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D4D4D4 80240494 03E00008 */ jr $ra -/* D4D4D8 80240498 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_8024049C_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_8024049C_D4D040.s deleted file mode 100644 index 83a51d1099..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_8024049C_D4D040.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_D4D4DC -/* D4D4DC 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4D4E0 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* D4D4E4 802404A4 0080802D */ daddu $s0, $a0, $zero -/* D4D4E8 802404A8 AFBF0014 */ sw $ra, 0x14($sp) -/* D4D4EC 802404AC 8E020084 */ lw $v0, 0x84($s0) -/* D4D4F0 802404B0 0440000E */ bltz $v0, .L802404EC -/* D4D4F4 802404B4 28420002 */ slti $v0, $v0, 2 -/* D4D4F8 802404B8 1040000C */ beqz $v0, .L802404EC -/* D4D4FC 802404BC 00000000 */ nop -/* D4D500 802404C0 3C058024 */ lui $a1, 0x8024 -/* D4D504 802404C4 24A50500 */ addiu $a1, $a1, 0x500 -/* D4D508 802404C8 0C048C56 */ jal bind_dynamic_entity_3 -/* D4D50C 802404CC 0000202D */ daddu $a0, $zero, $zero -/* D4D510 802404D0 8E03013C */ lw $v1, 0x13c($s0) -/* D4D514 802404D4 AC620000 */ sw $v0, ($v1) -/* D4D518 802404D8 3C03800A */ lui $v1, %hi(D_8009A650) -/* D4D51C 802404DC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D4D520 802404E0 8C620000 */ lw $v0, ($v1) -/* D4D524 802404E4 34420080 */ ori $v0, $v0, 0x80 -/* D4D528 802404E8 AC620000 */ sw $v0, ($v1) -.L802404EC: -/* D4D52C 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* D4D530 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* D4D534 802404F4 24020002 */ addiu $v0, $zero, 2 -/* D4D538 802404F8 03E00008 */ jr $ra -/* D4D53C 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_80240500_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_80240500_D4D040.s deleted file mode 100644 index 3de97791b5..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_80240500_D4D040.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_D4D540 -/* D4D540 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D4D544 80240504 AFB00040 */ sw $s0, 0x40($sp) -/* D4D548 80240508 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D4D54C 8024050C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D4D550 80240510 AFB10044 */ sw $s1, 0x44($sp) -/* D4D554 80240514 AFBF004C */ sw $ra, 0x4c($sp) -/* D4D558 80240518 AFB20048 */ sw $s2, 0x48($sp) -/* D4D55C 8024051C 8E020000 */ lw $v0, ($s0) -/* D4D560 80240520 821200BE */ lb $s2, 0xbe($s0) -/* D4D564 80240524 30420001 */ andi $v0, $v0, 1 -/* D4D568 80240528 10400052 */ beqz $v0, .L80240674 -/* D4D56C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 -/* D4D570 80240530 8E0400CC */ lw $a0, 0xcc($s0) -/* D4D574 80240534 0C044181 */ jal get_shadow_by_index -/* D4D578 80240538 00000000 */ nop -/* D4D57C 8024053C 0C048B77 */ jal func_80122DDC -/* D4D580 80240540 84440008 */ lh $a0, 8($v0) -/* D4D584 80240544 8E050028 */ lw $a1, 0x28($s0) -/* D4D588 80240548 8E070030 */ lw $a3, 0x30($s0) -/* D4D58C 8024054C 27A20030 */ addiu $v0, $sp, 0x30 -/* D4D590 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* D4D594 80240554 27A20034 */ addiu $v0, $sp, 0x34 -/* D4D598 80240558 AFA20014 */ sw $v0, 0x14($sp) -/* D4D59C 8024055C 27A20038 */ addiu $v0, $sp, 0x38 -/* D4D5A0 80240560 AFA20018 */ sw $v0, 0x18($sp) -/* D4D5A4 80240564 C600002C */ lwc1 $f0, 0x2c($s0) -/* D4D5A8 80240568 3C04800A */ lui $a0, 0x800a -/* D4D5AC 8024056C 8484A634 */ lh $a0, -0x59cc($a0) -/* D4D5B0 80240570 46000007 */ neg.s $f0, $f0 -/* D4D5B4 80240574 44060000 */ mfc1 $a2, $f0 -/* D4D5B8 80240578 0C00B94E */ jal get_screen_coords -/* D4D5BC 8024057C 00000000 */ nop -/* D4D5C0 80240580 8E0500A4 */ lw $a1, 0xa4($s0) -/* D4D5C4 80240584 3C063F80 */ lui $a2, 0x3f80 -/* D4D5C8 80240588 0C0B76A3 */ jal func_802DDA8C -/* D4D5CC 8024058C 24040001 */ addiu $a0, $zero, 1 -/* D4D5D0 80240590 8E020000 */ lw $v0, ($s0) -/* D4D5D4 80240594 3C030002 */ lui $v1, 2 -/* D4D5D8 80240598 00431024 */ and $v0, $v0, $v1 -/* D4D5DC 8024059C 54400022 */ bnel $v0, $zero, .L80240628 -/* D4D5E0 802405A0 24120011 */ addiu $s2, $zero, 0x11 -/* D4D5E4 802405A4 9203000E */ lbu $v1, 0xe($s0) -/* D4D5E8 802405A8 3C02802E */ lui $v0, 0x802e -/* D4D5EC 802405AC 90429D71 */ lbu $v0, -0x628f($v0) -/* D4D5F0 802405B0 10620018 */ beq $v1, $v0, .L80240614 -/* D4D5F4 802405B4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D4D5F8 802405B8 1040000B */ beqz $v0, .L802405E8 -/* D4D5FC 802405BC 24120011 */ addiu $s2, $zero, 0x11 -/* D4D600 802405C0 24040001 */ addiu $a0, $zero, 1 -/* D4D604 802405C4 2405FFFF */ addiu $a1, $zero, -1 -/* D4D608 802405C8 24060007 */ addiu $a2, $zero, 7 -/* D4D60C 802405CC 0060102D */ daddu $v0, $v1, $zero -/* D4D610 802405D0 0000382D */ daddu $a3, $zero, $zero -/* D4D614 802405D4 AFA00010 */ sw $zero, 0x10($sp) -/* D4D618 802405D8 AFA00014 */ sw $zero, 0x14($sp) -/* D4D61C 802405DC AFA0001C */ sw $zero, 0x1c($sp) -/* D4D620 802405E0 08090183 */ j .L8024060C -/* D4D624 802405E4 AFA20018 */ sw $v0, 0x18($sp) -.L802405E8: -/* D4D628 802405E8 2412000D */ addiu $s2, $zero, 0xd -/* D4D62C 802405EC 24040001 */ addiu $a0, $zero, 1 -/* D4D630 802405F0 2405FFFF */ addiu $a1, $zero, -1 -/* D4D634 802405F4 0000302D */ daddu $a2, $zero, $zero -/* D4D638 802405F8 00C0382D */ daddu $a3, $a2, $zero -/* D4D63C 802405FC AFA00010 */ sw $zero, 0x10($sp) -/* D4D640 80240600 AFA00014 */ sw $zero, 0x14($sp) -/* D4D644 80240604 AFA00018 */ sw $zero, 0x18($sp) -/* D4D648 80240608 AFA0001C */ sw $zero, 0x1c($sp) -.L8024060C: -/* D4D64C 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D4D650 80240610 00000000 */ nop -.L80240614: -/* D4D654 80240614 9202000E */ lbu $v0, 0xe($s0) -/* D4D658 80240618 3C01802E */ lui $at, 0x802e -/* D4D65C 8024061C A0229D71 */ sb $v0, -0x628f($at) -/* D4D660 80240620 0809018C */ j .L80240630 -/* D4D664 80240624 00000000 */ nop -.L80240628: -/* D4D668 80240628 3C01802E */ lui $at, 0x802e -/* D4D66C 8024062C A0209D71 */ sb $zero, -0x628f($at) -.L80240630: -/* D4D670 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D4D674 80240634 3C048024 */ lui $a0, 0x8024 -/* D4D678 80240638 24840870 */ addiu $a0, $a0, 0x870 -/* D4D67C 8024063C AE320000 */ sw $s2, ($s1) -/* D4D680 80240640 AE300008 */ sw $s0, 8($s1) -/* D4D684 80240644 00021023 */ negu $v0, $v0 -/* D4D688 80240648 AE220004 */ sw $v0, 4($s1) -/* D4D68C 8024064C 8E020000 */ lw $v0, ($s0) -/* D4D690 80240650 3C030002 */ lui $v1, 2 -/* D4D694 80240654 00431024 */ and $v0, $v0, $v1 -/* D4D698 80240658 54400004 */ bnel $v0, $zero, .L8024066C -/* D4D69C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D4D6A0 80240660 3C048024 */ lui $a0, 0x8024 -/* D4D6A4 80240664 2484068C */ addiu $a0, $a0, 0x68c -/* D4D6A8 80240668 AE24000C */ sw $a0, 0xc($s1) -.L8024066C: -/* D4D6AC 8024066C 0C047644 */ jal queue_render_task -/* D4D6B0 80240670 0220202D */ daddu $a0, $s1, $zero -.L80240674: -/* D4D6B4 80240674 8FBF004C */ lw $ra, 0x4c($sp) -/* D4D6B8 80240678 8FB20048 */ lw $s2, 0x48($sp) -/* D4D6BC 8024067C 8FB10044 */ lw $s1, 0x44($sp) -/* D4D6C0 80240680 8FB00040 */ lw $s0, 0x40($sp) -/* D4D6C4 80240684 03E00008 */ jr $ra -/* D4D6C8 80240688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_8024068C_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_8024068C_D4D040.s deleted file mode 100644 index ba73f068f2..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_8024068C_D4D040.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_D4D6CC -/* D4D6CC 8024068C 3C03800A */ lui $v1, 0x800a -/* D4D6D0 80240690 8463A634 */ lh $v1, -0x59cc($v1) -/* D4D6D4 80240694 3C07BF80 */ lui $a3, 0xbf80 -/* D4D6D8 80240698 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D4D6DC 8024069C F7B40128 */ sdc1 $f20, 0x128($sp) -/* D4D6E0 802406A0 4480A000 */ mtc1 $zero, $f20 -/* D4D6E4 802406A4 AFB1011C */ sw $s1, 0x11c($sp) -/* D4D6E8 802406A8 0080882D */ daddu $s1, $a0, $zero -/* D4D6EC 802406AC AFB00118 */ sw $s0, 0x118($sp) -/* D4D6F0 802406B0 27B00098 */ addiu $s0, $sp, 0x98 -/* D4D6F4 802406B4 AFBF0120 */ sw $ra, 0x120($sp) -/* D4D6F8 802406B8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D4D6FC 802406BC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D4D700 802406C0 00031080 */ sll $v0, $v1, 2 -/* D4D704 802406C4 00431021 */ addu $v0, $v0, $v1 -/* D4D708 802406C8 00021080 */ sll $v0, $v0, 2 -/* D4D70C 802406CC 00431023 */ subu $v0, $v0, $v1 -/* D4D710 802406D0 000218C0 */ sll $v1, $v0, 3 -/* D4D714 802406D4 00431021 */ addu $v0, $v0, $v1 -/* D4D718 802406D8 000210C0 */ sll $v0, $v0, 3 -/* D4D71C 802406DC 3C01800B */ lui $at, 0x800b -/* D4D720 802406E0 00220821 */ addu $at, $at, $v0 -/* D4D724 802406E4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D4D728 802406E8 4406A000 */ mfc1 $a2, $f20 -/* D4D72C 802406EC 4600B587 */ neg.s $f22, $f22 -/* D4D730 802406F0 4405B000 */ mfc1 $a1, $f22 -/* D4D734 802406F4 0200202D */ daddu $a0, $s0, $zero -/* D4D738 802406F8 0C019EC8 */ jal guRotateF -/* D4D73C 802406FC E7B40010 */ swc1 $f20, 0x10($sp) -/* D4D740 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D4D744 80240704 0C00A6C9 */ jal clamp_angle -/* D4D748 80240708 00000000 */ nop -/* D4D74C 8024070C 44050000 */ mfc1 $a1, $f0 -/* D4D750 80240710 4406A000 */ mfc1 $a2, $f20 -/* D4D754 80240714 4407A000 */ mfc1 $a3, $f20 -/* D4D758 80240718 3C013F80 */ lui $at, 0x3f80 -/* D4D75C 8024071C 4481C000 */ mtc1 $at, $f24 -/* D4D760 80240720 27A40018 */ addiu $a0, $sp, 0x18 -/* D4D764 80240724 0C019EC8 */ jal guRotateF -/* D4D768 80240728 E7B80010 */ swc1 $f24, 0x10($sp) -/* D4D76C 8024072C 0200202D */ daddu $a0, $s0, $zero -/* D4D770 80240730 27A50018 */ addiu $a1, $sp, 0x18 -/* D4D774 80240734 0C019D80 */ jal guMtxCatF -/* D4D778 80240738 00A0302D */ daddu $a2, $a1, $zero -/* D4D77C 8024073C 4405B000 */ mfc1 $a1, $f22 -/* D4D780 80240740 4406A000 */ mfc1 $a2, $f20 -/* D4D784 80240744 4407C000 */ mfc1 $a3, $f24 -/* D4D788 80240748 0200202D */ daddu $a0, $s0, $zero -/* D4D78C 8024074C 0C019EC8 */ jal guRotateF -/* D4D790 80240750 E7B40010 */ swc1 $f20, 0x10($sp) -/* D4D794 80240754 27A40018 */ addiu $a0, $sp, 0x18 -/* D4D798 80240758 0200282D */ daddu $a1, $s0, $zero -/* D4D79C 8024075C 0C019D80 */ jal guMtxCatF -/* D4D7A0 80240760 0080302D */ daddu $a2, $a0, $zero -/* D4D7A4 80240764 E7B40010 */ swc1 $f20, 0x10($sp) -/* D4D7A8 80240768 8E2500A8 */ lw $a1, 0xa8($s1) -/* D4D7AC 8024076C 4406A000 */ mfc1 $a2, $f20 -/* D4D7B0 80240770 4407C000 */ mfc1 $a3, $f24 -/* D4D7B4 80240774 0C019EC8 */ jal guRotateF -/* D4D7B8 80240778 0200202D */ daddu $a0, $s0, $zero -/* D4D7BC 8024077C 27A40018 */ addiu $a0, $sp, 0x18 -/* D4D7C0 80240780 0200282D */ daddu $a1, $s0, $zero -/* D4D7C4 80240784 0C019D80 */ jal guMtxCatF -/* D4D7C8 80240788 0080302D */ daddu $a2, $a0, $zero -/* D4D7CC 8024078C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D4D7D0 80240790 3C013F36 */ lui $at, 0x3f36 -/* D4D7D4 80240794 3421DB6E */ ori $at, $at, 0xdb6e -/* D4D7D8 80240798 44810000 */ mtc1 $at, $f0 -/* D4D7DC 8024079C 0200202D */ daddu $a0, $s0, $zero -/* D4D7E0 802407A0 44050000 */ mfc1 $a1, $f0 -/* D4D7E4 802407A4 3C06BF36 */ lui $a2, 0xbf36 -/* D4D7E8 802407A8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D4D7EC 802407AC 0C019DF0 */ jal guScaleF -/* D4D7F0 802407B0 00A0382D */ daddu $a3, $a1, $zero -/* D4D7F4 802407B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D4D7F8 802407B8 0200282D */ daddu $a1, $s0, $zero -/* D4D7FC 802407BC 0C019D80 */ jal guMtxCatF -/* D4D800 802407C0 0080302D */ daddu $a2, $a0, $zero -/* D4D804 802407C4 27B00058 */ addiu $s0, $sp, 0x58 -/* D4D808 802407C8 8E250028 */ lw $a1, 0x28($s1) -/* D4D80C 802407CC C620002C */ lwc1 $f0, 0x2c($s1) -/* D4D810 802407D0 8E270030 */ lw $a3, 0x30($s1) -/* D4D814 802407D4 46000007 */ neg.s $f0, $f0 -/* D4D818 802407D8 44060000 */ mfc1 $a2, $f0 -/* D4D81C 802407DC 0C019E40 */ jal guTranslateF -/* D4D820 802407E0 0200202D */ daddu $a0, $s0, $zero -/* D4D824 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D4D828 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D4D82C 802407EC 0C019D80 */ jal guMtxCatF -/* D4D830 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D4D834 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D4D838 802407F8 3C0142B4 */ lui $at, 0x42b4 -/* D4D83C 802407FC 44810000 */ mtc1 $at, $f0 -/* D4D840 80240800 00000000 */ nop -/* D4D844 80240804 4602003E */ c.le.s $f0, $f2 -/* D4D848 80240808 00000000 */ nop -/* D4D84C 8024080C 4500000A */ bc1f .L80240838 -/* D4D850 80240810 24040001 */ addiu $a0, $zero, 1 -/* D4D854 80240814 3C014387 */ lui $at, 0x4387 -/* D4D858 80240818 44810000 */ mtc1 $at, $f0 -/* D4D85C 8024081C 00000000 */ nop -/* D4D860 80240820 4600103C */ c.lt.s $f2, $f0 -/* D4D864 80240824 00000000 */ nop -/* D4D868 80240828 45000004 */ bc1f .L8024083C -/* D4D86C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 -/* D4D870 80240830 3C041000 */ lui $a0, 0x1000 -/* D4D874 80240834 34840001 */ ori $a0, $a0, 1 -.L80240838: -/* D4D878 80240838 27A20018 */ addiu $v0, $sp, 0x18 -.L8024083C: -/* D4D87C 8024083C 0000282D */ daddu $a1, $zero, $zero -/* D4D880 80240840 00A0302D */ daddu $a2, $a1, $zero -/* D4D884 80240844 00A0382D */ daddu $a3, $a1, $zero -/* D4D888 80240848 0C0B7710 */ jal render_sprite -/* D4D88C 8024084C AFA20010 */ sw $v0, 0x10($sp) -/* D4D890 80240850 8FBF0120 */ lw $ra, 0x120($sp) -/* D4D894 80240854 8FB1011C */ lw $s1, 0x11c($sp) -/* D4D898 80240858 8FB00118 */ lw $s0, 0x118($sp) -/* D4D89C 8024085C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D4D8A0 80240860 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D4D8A4 80240864 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D4D8A8 80240868 03E00008 */ jr $ra -/* D4D8AC 8024086C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_80240870_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_80240870_D4D040.s deleted file mode 100644 index 8f3047be97..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_80240870_D4D040.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_D4D8B0 -/* D4D8B0 80240870 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D4D8B4 80240874 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D4D8B8 80240878 4480B000 */ mtc1 $zero, $f22 -/* D4D8BC 8024087C AFB10134 */ sw $s1, 0x134($sp) -/* D4D8C0 80240880 0080882D */ daddu $s1, $a0, $zero -/* D4D8C4 80240884 AFB3013C */ sw $s3, 0x13c($sp) -/* D4D8C8 80240888 0000982D */ daddu $s3, $zero, $zero -/* D4D8CC 8024088C AFB60148 */ sw $s6, 0x148($sp) -/* D4D8D0 80240890 3C16800B */ lui $s6, %hi(gCameras) -/* D4D8D4 80240894 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D4D8D8 80240898 AFB50144 */ sw $s5, 0x144($sp) -/* D4D8DC 8024089C 241500FF */ addiu $s5, $zero, 0xff -/* D4D8E0 802408A0 AFB00130 */ sw $s0, 0x130($sp) -/* D4D8E4 802408A4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D4D8E8 802408A8 AFB20138 */ sw $s2, 0x138($sp) -/* D4D8EC 802408AC 27B20060 */ addiu $s2, $sp, 0x60 -/* D4D8F0 802408B0 AFB40140 */ sw $s4, 0x140($sp) -/* D4D8F4 802408B4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D4D8F8 802408B8 AFBF014C */ sw $ra, 0x14c($sp) -/* D4D8FC 802408BC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D4D900 802408C0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D4D904 802408C4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D4D908 802408C8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D4D90C 802408CC F7B40150 */ sdc1 $f20, 0x150($sp) -.L802408D0: -/* D4D910 802408D0 3C03800A */ lui $v1, 0x800a -/* D4D914 802408D4 8463A634 */ lh $v1, -0x59cc($v1) -/* D4D918 802408D8 00031080 */ sll $v0, $v1, 2 -/* D4D91C 802408DC 00431021 */ addu $v0, $v0, $v1 -/* D4D920 802408E0 00021080 */ sll $v0, $v0, 2 -/* D4D924 802408E4 00431023 */ subu $v0, $v0, $v1 -/* D4D928 802408E8 000218C0 */ sll $v1, $v0, 3 -/* D4D92C 802408EC 00431021 */ addu $v0, $v0, $v1 -/* D4D930 802408F0 000210C0 */ sll $v0, $v0, 3 -/* D4D934 802408F4 00561021 */ addu $v0, $v0, $s6 -/* D4D938 802408F8 C440006C */ lwc1 $f0, 0x6c($v0) -/* D4D93C 802408FC 16600065 */ bnez $s3, .L80240A94 -/* D4D940 80240900 46000507 */ neg.s $f20, $f0 -/* D4D944 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D4D948 80240908 3C0142B4 */ lui $at, 0x42b4 -/* D4D94C 8024090C 44810000 */ mtc1 $at, $f0 -/* D4D950 80240910 00000000 */ nop -/* D4D954 80240914 4602003C */ c.lt.s $f0, $f2 -/* D4D958 80240918 00000000 */ nop -/* D4D95C 8024091C 4500000A */ bc1f .L80240948 -/* D4D960 80240920 00000000 */ nop -/* D4D964 80240924 3C014334 */ lui $at, 0x4334 -/* D4D968 80240928 44812000 */ mtc1 $at, $f4 -/* D4D96C 8024092C 00000000 */ nop -/* D4D970 80240930 4604103E */ c.le.s $f2, $f4 -/* D4D974 80240934 00000000 */ nop -/* D4D978 80240938 45000003 */ bc1f .L80240948 -/* D4D97C 8024093C 00000000 */ nop -/* D4D980 80240940 08090276 */ j .L802409D8 -/* D4D984 80240944 46022501 */ sub.s $f20, $f4, $f2 -.L80240948: -/* D4D988 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D4D98C 8024094C 3C014334 */ lui $at, 0x4334 -/* D4D990 80240950 44812000 */ mtc1 $at, $f4 -/* D4D994 80240954 00000000 */ nop -/* D4D998 80240958 4600203C */ c.lt.s $f4, $f0 -/* D4D99C 8024095C 00000000 */ nop -/* D4D9A0 80240960 4500000C */ bc1f .L80240994 -/* D4D9A4 80240964 00000000 */ nop -/* D4D9A8 80240968 3C014387 */ lui $at, 0x4387 -/* D4D9AC 8024096C 44812000 */ mtc1 $at, $f4 -/* D4D9B0 80240970 00000000 */ nop -/* D4D9B4 80240974 4604003E */ c.le.s $f0, $f4 -/* D4D9B8 80240978 00000000 */ nop -/* D4D9BC 8024097C 45000008 */ bc1f .L802409A0 -/* D4D9C0 80240980 00000000 */ nop -/* D4D9C4 80240984 3C014334 */ lui $at, 0x4334 -/* D4D9C8 80240988 44812000 */ mtc1 $at, $f4 -/* D4D9CC 8024098C 08090276 */ j .L802409D8 -/* D4D9D0 80240990 46040501 */ sub.s $f20, $f0, $f4 -.L80240994: -/* D4D9D4 80240994 3C014387 */ lui $at, 0x4387 -/* D4D9D8 80240998 44812000 */ mtc1 $at, $f4 -/* D4D9DC 8024099C 00000000 */ nop -.L802409A0: -/* D4D9E0 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D4D9E4 802409A4 00000000 */ nop -/* D4D9E8 802409A8 4500000A */ bc1f .L802409D4 -/* D4D9EC 802409AC 00000000 */ nop -/* D4D9F0 802409B0 3C0143B4 */ lui $at, 0x43b4 -/* D4D9F4 802409B4 44811000 */ mtc1 $at, $f2 -/* D4D9F8 802409B8 00000000 */ nop -/* D4D9FC 802409BC 4602003E */ c.le.s $f0, $f2 -/* D4DA00 802409C0 00000000 */ nop -/* D4DA04 802409C4 45000003 */ bc1f .L802409D4 -/* D4DA08 802409C8 00000000 */ nop -/* D4DA0C 802409CC 08090276 */ j .L802409D8 -/* D4DA10 802409D0 46001501 */ sub.s $f20, $f2, $f0 -.L802409D4: -/* D4DA14 802409D4 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L802409D8: -/* D4DA18 802409D8 3C0141C8 */ lui $at, 0x41c8 -/* D4DA1C 802409DC 44810000 */ mtc1 $at, $f0 -/* D4DA20 802409E0 00000000 */ nop -/* D4DA24 802409E4 4600A003 */ div.s $f0, $f20, $f0 -/* D4DA28 802409E8 4600010D */ trunc.w.s $f4, $f0 -/* D4DA2C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D4DA30 802409F0 00000000 */ nop -/* D4DA34 802409F4 00071100 */ sll $v0, $a3, 4 -/* D4DA38 802409F8 00471023 */ subu $v0, $v0, $a3 -/* D4DA3C 802409FC 00021080 */ sll $v0, $v0, 2 -/* D4DA40 80240A00 02A23823 */ subu $a3, $s5, $v0 -/* D4DA44 80240A04 28E20064 */ slti $v0, $a3, 0x64 -/* D4DA48 80240A08 54400001 */ bnel $v0, $zero, .L80240A10 -/* D4DA4C 80240A0C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A10: -/* D4DA50 80240A10 24040001 */ addiu $a0, $zero, 1 -/* D4DA54 80240A14 2405FFFF */ addiu $a1, $zero, -1 -/* D4DA58 80240A18 24060006 */ addiu $a2, $zero, 6 -/* D4DA5C 80240A1C AFA70010 */ sw $a3, 0x10($sp) -/* D4DA60 80240A20 AFA70014 */ sw $a3, 0x14($sp) -/* D4DA64 80240A24 AFB50018 */ sw $s5, 0x18($sp) -/* D4DA68 80240A28 0C0B77B9 */ jal func_802DDEE4 -/* D4DA6C 80240A2C AFA0001C */ sw $zero, 0x1c($sp) -/* D4DA70 80240A30 4405A000 */ mfc1 $a1, $f20 -/* D4DA74 80240A34 4406B000 */ mfc1 $a2, $f22 -/* D4DA78 80240A38 3C07BF80 */ lui $a3, 0xbf80 -/* D4DA7C 80240A3C 0200202D */ daddu $a0, $s0, $zero -/* D4DA80 80240A40 0C019EC8 */ jal guRotateF -/* D4DA84 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D4DA88 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D4DA8C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D4DA90 80240A50 00000000 */ nop -/* D4DA94 80240A54 44050000 */ mfc1 $a1, $f0 -/* D4DA98 80240A58 4406B000 */ mfc1 $a2, $f22 -/* D4DA9C 80240A5C 4407B000 */ mfc1 $a3, $f22 -/* D4DAA0 80240A60 3C013F80 */ lui $at, 0x3f80 -/* D4DAA4 80240A64 44812000 */ mtc1 $at, $f4 -/* D4DAA8 80240A68 27A40020 */ addiu $a0, $sp, 0x20 -/* D4DAAC 80240A6C 0C019EC8 */ jal guRotateF -/* D4DAB0 80240A70 E7A40010 */ swc1 $f4, 0x10($sp) -/* D4DAB4 80240A74 0200202D */ daddu $a0, $s0, $zero -/* D4DAB8 80240A78 27A50020 */ addiu $a1, $sp, 0x20 -/* D4DABC 80240A7C 0C019D80 */ jal guMtxCatF -/* D4DAC0 80240A80 00A0302D */ daddu $a2, $a1, $zero -/* D4DAC4 80240A84 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D4DAC8 80240A88 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D4DACC 80240A8C 080902D6 */ j .L80240B58 -/* D4DAD0 80240A90 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240A94: -/* D4DAD4 80240A94 0260202D */ daddu $a0, $s3, $zero -/* D4DAD8 80240A98 27A50120 */ addiu $a1, $sp, 0x120 -/* D4DADC 80240A9C 27A60124 */ addiu $a2, $sp, 0x124 -/* D4DAE0 80240AA0 0C03964E */ jal func_800E5938 -/* D4DAE4 80240AA4 27A70128 */ addiu $a3, $sp, 0x128 -/* D4DAE8 80240AA8 8FA60124 */ lw $a2, 0x124($sp) -/* D4DAEC 80240AAC 3C028000 */ lui $v0, 0x8000 -/* D4DAF0 80240AB0 14C20004 */ bne $a2, $v0, .L80240AC4 -/* D4DAF4 80240AB4 46000606 */ mov.s $f24, $f0 -/* D4DAF8 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D4DAFC 80240ABC 080902B5 */ j .L80240AD4 -/* D4DB00 80240AC0 24040001 */ addiu $a0, $zero, 1 -.L80240AC4: -/* D4DB04 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D4DB08 80240AC8 00000000 */ nop -/* D4DB0C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D4DB10 80240AD0 24040001 */ addiu $a0, $zero, 1 -.L80240AD4: -/* D4DB14 80240AD4 2405FFFF */ addiu $a1, $zero, -1 -/* D4DB18 80240AD8 24060007 */ addiu $a2, $zero, 7 -/* D4DB1C 80240ADC 0000382D */ daddu $a3, $zero, $zero -/* D4DB20 80240AE0 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D4DB24 80240AE4 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D4DB28 80240AE8 24020040 */ addiu $v0, $zero, 0x40 -/* D4DB2C 80240AEC AFA00010 */ sw $zero, 0x10($sp) -/* D4DB30 80240AF0 AFA00014 */ sw $zero, 0x14($sp) -/* D4DB34 80240AF4 AFA20018 */ sw $v0, 0x18($sp) -/* D4DB38 80240AF8 0C0B77B9 */ jal func_802DDEE4 -/* D4DB3C 80240AFC AFA0001C */ sw $zero, 0x1c($sp) -/* D4DB40 80240B00 4405A000 */ mfc1 $a1, $f20 -/* D4DB44 80240B04 4406B000 */ mfc1 $a2, $f22 -/* D4DB48 80240B08 3C07BF80 */ lui $a3, 0xbf80 -/* D4DB4C 80240B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* D4DB50 80240B10 0C019EC8 */ jal guRotateF -/* D4DB54 80240B14 E7B60010 */ swc1 $f22, 0x10($sp) -/* D4DB58 80240B18 4405A000 */ mfc1 $a1, $f20 -/* D4DB5C 80240B1C 4406B000 */ mfc1 $a2, $f22 -/* D4DB60 80240B20 3C07BF80 */ lui $a3, 0xbf80 -/* D4DB64 80240B24 0200202D */ daddu $a0, $s0, $zero -/* D4DB68 80240B28 0C019EC8 */ jal guRotateF -/* D4DB6C 80240B2C E7B60010 */ swc1 $f22, 0x10($sp) -/* D4DB70 80240B30 4405C000 */ mfc1 $a1, $f24 -/* D4DB74 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D4DB78 80240B38 3C073F80 */ lui $a3, 0x3f80 -/* D4DB7C 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D4DB80 80240B40 0C019EC8 */ jal guRotateF -/* D4DB84 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D4DB88 80240B48 0200202D */ daddu $a0, $s0, $zero -/* D4DB8C 80240B4C 27A50020 */ addiu $a1, $sp, 0x20 -/* D4DB90 80240B50 0C019D80 */ jal guMtxCatF -/* D4DB94 80240B54 00A0302D */ daddu $a2, $a1, $zero -.L80240B58: -/* D4DB98 80240B58 862200B0 */ lh $v0, 0xb0($s1) -/* D4DB9C 80240B5C 3C013F00 */ lui $at, 0x3f00 -/* D4DBA0 80240B60 44812000 */ mtc1 $at, $f4 -/* D4DBA4 80240B64 00021023 */ negu $v0, $v0 -/* D4DBA8 80240B68 44820000 */ mtc1 $v0, $f0 -/* D4DBAC 80240B6C 00000000 */ nop -/* D4DBB0 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* D4DBB4 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D4DBB8 80240B78 00000000 */ nop -/* D4DBBC 80240B7C 4405B000 */ mfc1 $a1, $f22 -/* D4DBC0 80240B80 4407B000 */ mfc1 $a3, $f22 -/* D4DBC4 80240B84 44062000 */ mfc1 $a2, $f4 -/* D4DBC8 80240B88 0C019E40 */ jal guTranslateF -/* D4DBCC 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* D4DBD0 80240B90 0240202D */ daddu $a0, $s2, $zero -/* D4DBD4 80240B94 27A50020 */ addiu $a1, $sp, 0x20 -/* D4DBD8 80240B98 0C019D80 */ jal guMtxCatF -/* D4DBDC 80240B9C 00A0302D */ daddu $a2, $a1, $zero -/* D4DBE0 80240BA0 4405A000 */ mfc1 $a1, $f20 -/* D4DBE4 80240BA4 4406B000 */ mfc1 $a2, $f22 -/* D4DBE8 80240BA8 3C073F80 */ lui $a3, 0x3f80 -/* D4DBEC 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* D4DBF0 80240BB0 0C019EC8 */ jal guRotateF -/* D4DBF4 80240BB4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D4DBF8 80240BB8 27A40020 */ addiu $a0, $sp, 0x20 -/* D4DBFC 80240BBC 0200282D */ daddu $a1, $s0, $zero -/* D4DC00 80240BC0 0C019D80 */ jal guMtxCatF -/* D4DC04 80240BC4 0080302D */ daddu $a2, $a0, $zero -/* D4DC08 80240BC8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D4DC0C 80240BCC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D4DC10 80240BD0 4406B000 */ mfc1 $a2, $f22 -/* D4DC14 80240BD4 3C073F80 */ lui $a3, 0x3f80 -/* D4DC18 80240BD8 0C019EC8 */ jal guRotateF -/* D4DC1C 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D4DC20 80240BE0 27A40020 */ addiu $a0, $sp, 0x20 -/* D4DC24 80240BE4 0200282D */ daddu $a1, $s0, $zero -/* D4DC28 80240BE8 0C019D80 */ jal guMtxCatF -/* D4DC2C 80240BEC 0080302D */ daddu $a2, $a0, $zero -/* D4DC30 80240BF0 862200B0 */ lh $v0, 0xb0($s1) -/* D4DC34 80240BF4 3C013F00 */ lui $at, 0x3f00 -/* D4DC38 80240BF8 44812000 */ mtc1 $at, $f4 -/* D4DC3C 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D4DC40 80240C00 00000000 */ nop -/* D4DC44 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* D4DC48 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D4DC4C 80240C0C 00000000 */ nop -/* D4DC50 80240C10 4405B000 */ mfc1 $a1, $f22 -/* D4DC54 80240C14 4407B000 */ mfc1 $a3, $f22 -/* D4DC58 80240C18 44062000 */ mfc1 $a2, $f4 -/* D4DC5C 80240C1C 0C019E40 */ jal guTranslateF -/* D4DC60 80240C20 0240202D */ daddu $a0, $s2, $zero -/* D4DC64 80240C24 27A40020 */ addiu $a0, $sp, 0x20 -/* D4DC68 80240C28 0240282D */ daddu $a1, $s2, $zero -/* D4DC6C 80240C2C 0C019D80 */ jal guMtxCatF -/* D4DC70 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D4DC74 80240C34 3C013F36 */ lui $at, 0x3f36 -/* D4DC78 80240C38 3421DB6E */ ori $at, $at, 0xdb6e -/* D4DC7C 80240C3C 44810000 */ mtc1 $at, $f0 -/* D4DC80 80240C40 0280202D */ daddu $a0, $s4, $zero -/* D4DC84 80240C44 44050000 */ mfc1 $a1, $f0 -/* D4DC88 80240C48 3C06BF36 */ lui $a2, 0xbf36 -/* D4DC8C 80240C4C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D4DC90 80240C50 0C019DF0 */ jal guScaleF -/* D4DC94 80240C54 00A0382D */ daddu $a3, $a1, $zero -/* D4DC98 80240C58 27A40020 */ addiu $a0, $sp, 0x20 -/* D4DC9C 80240C5C 0280282D */ daddu $a1, $s4, $zero -/* D4DCA0 80240C60 0C019D80 */ jal guMtxCatF -/* D4DCA4 80240C64 0080302D */ daddu $a2, $a0, $zero -/* D4DCA8 80240C68 4600D687 */ neg.s $f26, $f26 -/* D4DCAC 80240C6C 4405F000 */ mfc1 $a1, $f30 -/* D4DCB0 80240C70 4407E000 */ mfc1 $a3, $f28 -/* D4DCB4 80240C74 4406D000 */ mfc1 $a2, $f26 -/* D4DCB8 80240C78 0C019E40 */ jal guTranslateF -/* D4DCBC 80240C7C 0240202D */ daddu $a0, $s2, $zero -/* D4DCC0 80240C80 27A40020 */ addiu $a0, $sp, 0x20 -/* D4DCC4 80240C84 0240282D */ daddu $a1, $s2, $zero -/* D4DCC8 80240C88 0C019D80 */ jal guMtxCatF -/* D4DCCC 80240C8C 0080302D */ daddu $a2, $a0, $zero -/* D4DCD0 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D4DCD4 80240C94 3C0142B4 */ lui $at, 0x42b4 -/* D4DCD8 80240C98 44810000 */ mtc1 $at, $f0 -/* D4DCDC 80240C9C 00000000 */ nop -/* D4DCE0 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D4DCE4 80240CA4 00000000 */ nop -/* D4DCE8 80240CA8 4500000A */ bc1f .L80240CD4 -/* D4DCEC 80240CAC 24040001 */ addiu $a0, $zero, 1 -/* D4DCF0 80240CB0 3C014387 */ lui $at, 0x4387 -/* D4DCF4 80240CB4 44812000 */ mtc1 $at, $f4 -/* D4DCF8 80240CB8 00000000 */ nop -/* D4DCFC 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D4DD00 80240CC0 00000000 */ nop -/* D4DD04 80240CC4 45000004 */ bc1f .L80240CD8 -/* D4DD08 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 -/* D4DD0C 80240CCC 3C041000 */ lui $a0, 0x1000 -/* D4DD10 80240CD0 34840001 */ ori $a0, $a0, 1 -.L80240CD4: -/* D4DD14 80240CD4 27A20020 */ addiu $v0, $sp, 0x20 -.L80240CD8: -/* D4DD18 80240CD8 AFA20010 */ sw $v0, 0x10($sp) -/* D4DD1C 80240CDC 0000282D */ daddu $a1, $zero, $zero -/* D4DD20 80240CE0 00A0302D */ daddu $a2, $a1, $zero -/* D4DD24 80240CE4 0C0B7710 */ jal render_sprite -/* D4DD28 80240CE8 00A0382D */ daddu $a3, $a1, $zero -/* D4DD2C 80240CEC 26730001 */ addiu $s3, $s3, 1 -/* D4DD30 80240CF0 2A620002 */ slti $v0, $s3, 2 -/* D4DD34 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D4DD38 80240CF8 00000000 */ nop -/* D4DD3C 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) -/* D4DD40 80240D00 8FB60148 */ lw $s6, 0x148($sp) -/* D4DD44 80240D04 8FB50144 */ lw $s5, 0x144($sp) -/* D4DD48 80240D08 8FB40140 */ lw $s4, 0x140($sp) -/* D4DD4C 80240D0C 8FB3013C */ lw $s3, 0x13c($sp) -/* D4DD50 80240D10 8FB20138 */ lw $s2, 0x138($sp) -/* D4DD54 80240D14 8FB10134 */ lw $s1, 0x134($sp) -/* D4DD58 80240D18 8FB00130 */ lw $s0, 0x130($sp) -/* D4DD5C 80240D1C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D4DD60 80240D20 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D4DD64 80240D24 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D4DD68 80240D28 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D4DD6C 80240D2C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D4DD70 80240D30 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D4DD74 80240D34 03E00008 */ jr $ra -/* D4DD78 80240D38 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_80240D3C_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_80240D3C_D4D040.s deleted file mode 100644 index 97e521b0bd..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_80240D3C_D4D040.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_D4DD7C -/* D4DD7C 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4DD80 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D4DD84 80240D44 0080802D */ daddu $s0, $a0, $zero -/* D4DD88 80240D48 AFBF0014 */ sw $ra, 0x14($sp) -/* D4DD8C 80240D4C 8E020088 */ lw $v0, 0x88($s0) -/* D4DD90 80240D50 14400017 */ bnez $v0, .L80240DB0 -/* D4DD94 80240D54 24020001 */ addiu $v0, $zero, 1 -/* D4DD98 80240D58 8E030084 */ lw $v1, 0x84($s0) -/* D4DD9C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D4DDA0 80240D60 00000000 */ nop -/* D4DDA4 80240D64 28620002 */ slti $v0, $v1, 2 -/* D4DDA8 80240D68 50400005 */ beql $v0, $zero, .L80240D80 -/* D4DDAC 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* D4DDB0 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D4DDB4 80240D74 00000000 */ nop -/* D4DDB8 80240D78 08090378 */ j .L80240DE0 -/* D4DDBC 80240D7C 00000000 */ nop -.L80240D80: -/* D4DDC0 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D4DDC4 80240D84 00000000 */ nop -/* D4DDC8 80240D88 08090378 */ j .L80240DE0 -/* D4DDCC 80240D8C 00000000 */ nop -.L80240D90: -/* D4DDD0 80240D90 3C048024 */ lui $a0, 0x8024 -/* D4DDD4 80240D94 24840E84 */ addiu $a0, $a0, 0xe84 -/* D4DDD8 80240D98 08090374 */ j .L80240DD0 -/* D4DDDC 80240D9C 00000000 */ nop -.L80240DA0: -/* D4DDE0 80240DA0 3C048024 */ lui $a0, 0x8024 -/* D4DDE4 80240DA4 24840EEC */ addiu $a0, $a0, 0xeec -/* D4DDE8 80240DA8 08090374 */ j .L80240DD0 -/* D4DDEC 80240DAC 00000000 */ nop -.L80240DB0: -/* D4DDF0 80240DB0 8E020084 */ lw $v0, 0x84($s0) -/* D4DDF4 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D4DDF8 80240DB8 00000000 */ nop -/* D4DDFC 80240DBC 28420002 */ slti $v0, $v0, 2 -/* D4DE00 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D4DE04 80240DC4 00000000 */ nop -.L80240DC8: -/* D4DE08 80240DC8 3C048024 */ lui $a0, 0x8024 -/* D4DE0C 80240DCC 24840EB8 */ addiu $a0, $a0, 0xeb8 -.L80240DD0: -/* D4DE10 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 -/* D4DE14 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* D4DE18 80240DD8 8E03013C */ lw $v1, 0x13c($s0) -/* D4DE1C 80240DDC AC620004 */ sw $v0, 4($v1) -.L80240DE0: -/* D4DE20 80240DE0 0C00EAD2 */ jal get_npc_safe -/* D4DE24 80240DE4 2404FFFC */ addiu $a0, $zero, -4 -/* D4DE28 80240DE8 0040282D */ daddu $a1, $v0, $zero -/* D4DE2C 80240DEC 10A00021 */ beqz $a1, .L80240E74 -/* D4DE30 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* D4DE34 80240DF4 8E020088 */ lw $v0, 0x88($s0) -/* D4DE38 80240DF8 14400014 */ bnez $v0, .L80240E4C -/* D4DE3C 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* D4DE40 80240E00 8E040084 */ lw $a0, 0x84($s0) -/* D4DE44 80240E04 10820016 */ beq $a0, $v0, .L80240E60 -/* D4DE48 80240E08 28820002 */ slti $v0, $a0, 2 -/* D4DE4C 80240E0C 10400005 */ beqz $v0, .L80240E24 -/* D4DE50 80240E10 24020002 */ addiu $v0, $zero, 2 -/* D4DE54 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D4DE58 80240E18 00000000 */ nop -/* D4DE5C 80240E1C 0809039D */ j .L80240E74 -/* D4DE60 80240E20 00000000 */ nop -.L80240E24: -/* D4DE64 80240E24 10820006 */ beq $a0, $v0, .L80240E40 -/* D4DE68 80240E28 24020002 */ addiu $v0, $zero, 2 -/* D4DE6C 80240E2C 0809039D */ j .L80240E74 -/* D4DE70 80240E30 00000000 */ nop -.L80240E34: -/* D4DE74 80240E34 8CA20000 */ lw $v0, ($a1) -/* D4DE78 80240E38 0809039A */ j .L80240E68 -/* D4DE7C 80240E3C 3C03000A */ lui $v1, 0xa -.L80240E40: -/* D4DE80 80240E40 8CA20000 */ lw $v0, ($a1) -/* D4DE84 80240E44 0809039A */ j .L80240E68 -/* D4DE88 80240E48 3C030002 */ lui $v1, 2 -.L80240E4C: -/* D4DE8C 80240E4C 8E020084 */ lw $v0, 0x84($s0) -/* D4DE90 80240E50 04400007 */ bltz $v0, .L80240E70 -/* D4DE94 80240E54 28420002 */ slti $v0, $v0, 2 -/* D4DE98 80240E58 10400006 */ beqz $v0, .L80240E74 -/* D4DE9C 80240E5C 24020002 */ addiu $v0, $zero, 2 -.L80240E60: -/* D4DEA0 80240E60 8CA20000 */ lw $v0, ($a1) -/* D4DEA4 80240E64 3C030008 */ lui $v1, 8 -.L80240E68: -/* D4DEA8 80240E68 00431025 */ or $v0, $v0, $v1 -/* D4DEAC 80240E6C ACA20000 */ sw $v0, ($a1) -.L80240E70: -/* D4DEB0 80240E70 24020002 */ addiu $v0, $zero, 2 -.L80240E74: -/* D4DEB4 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* D4DEB8 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* D4DEBC 80240E7C 03E00008 */ jr $ra -/* D4DEC0 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_80240E84_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_80240E84_D4D040.s deleted file mode 100644 index 8dfb5b4304..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_80240E84_D4D040.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D4DEC4 -/* D4DEC4 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4DEC8 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D4DECC 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D4DED0 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D4DED4 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D4DED8 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D4DEDC 80240E9C 3C03000A */ lui $v1, 0xa -/* D4DEE0 80240EA0 8C820000 */ lw $v0, ($a0) -/* D4DEE4 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D4DEE8 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D4DEEC 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D4DEF0 80240EB0 03E00008 */ jr $ra -/* D4DEF4 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_80240EB8_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_80240EB8_D4D040.s deleted file mode 100644 index d608d9f555..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_80240EB8_D4D040.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D4DEF8 -/* D4DEF8 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4DEFC 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D4DF00 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D4DF04 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D4DF08 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D4DF0C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D4DF10 80240ED0 3C030008 */ lui $v1, 8 -/* D4DF14 80240ED4 8C820000 */ lw $v0, ($a0) -/* D4DF18 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D4DF1C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D4DF20 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D4DF24 80240EE4 03E00008 */ jr $ra -/* D4DF28 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_80240EEC_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_80240EEC_D4D040.s deleted file mode 100644 index 9f0b8b9186..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_80240EEC_D4D040.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D4DF2C -/* D4DF2C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4DF30 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D4DF34 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D4DF38 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D4DF3C 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D4DF40 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D4DF44 80240F04 3C030002 */ lui $v1, 2 -/* D4DF48 80240F08 8C820000 */ lw $v0, ($a0) -/* D4DF4C 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D4DF50 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D4DF54 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D4DF58 80240F18 03E00008 */ jr $ra -/* D4DF5C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_80240F20_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_80240F20_D4D040.s deleted file mode 100644 index 4f001ffbba..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_80240F20_D4D040.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D4DF60 -/* D4DF60 80240F20 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4DF64 80240F24 240403D4 */ addiu $a0, $zero, 0x3d4 -/* D4DF68 80240F28 AFBF0010 */ sw $ra, 0x10($sp) -/* D4DF6C 80240F2C 0C046EDD */ jal set_world_fog_dist -/* D4DF70 80240F30 240503E8 */ addiu $a1, $zero, 0x3e8 -/* D4DF74 80240F34 2404000F */ addiu $a0, $zero, 0xf -/* D4DF78 80240F38 24050005 */ addiu $a1, $zero, 5 -/* D4DF7C 80240F3C 24060037 */ addiu $a2, $zero, 0x37 -/* D4DF80 80240F40 0C046EE2 */ jal set_world_fog_color -/* D4DF84 80240F44 240700FF */ addiu $a3, $zero, 0xff -/* D4DF88 80240F48 0C046ED4 */ jal enable_world_fog -/* D4DF8C 80240F4C 00000000 */ nop -/* D4DF90 80240F50 8FBF0010 */ lw $ra, 0x10($sp) -/* D4DF94 80240F54 24020002 */ addiu $v0, $zero, 2 -/* D4DF98 80240F58 03E00008 */ jr $ra -/* D4DF9C 80240F5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_80240F60_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_80240F60_D4D040.s deleted file mode 100644 index 5fed9861e1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_80240F60_D4D040.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F60_D4DFA0 -/* D4DFA0 80240F60 3C02800A */ lui $v0, %hi(D_8009A650) -/* D4DFA4 80240F64 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* D4DFA8 80240F68 8C430000 */ lw $v1, ($v0) -/* D4DFAC 80240F6C 2404FF7F */ addiu $a0, $zero, -0x81 -/* D4DFB0 80240F70 00641824 */ and $v1, $v1, $a0 -/* D4DFB4 80240F74 AC430000 */ sw $v1, ($v0) -/* D4DFB8 80240F78 03E00008 */ jr $ra -/* D4DFBC 80240F7C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_80240F80_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_80240F80_D4D040.s deleted file mode 100644 index 752c034f9e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_80240F80_D4D040.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F80_D4DFC0 -/* D4DFC0 80240F80 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D4DFC4 80240F84 AFB10014 */ sw $s1, 0x14($sp) -/* D4DFC8 80240F88 0080882D */ daddu $s1, $a0, $zero -/* D4DFCC 80240F8C AFBF0018 */ sw $ra, 0x18($sp) -/* D4DFD0 80240F90 AFB00010 */ sw $s0, 0x10($sp) -/* D4DFD4 80240F94 8E30000C */ lw $s0, 0xc($s1) -/* D4DFD8 80240F98 8E050000 */ lw $a1, ($s0) -/* D4DFDC 80240F9C 0C0B1EAF */ jal get_variable -/* D4DFE0 80240FA0 26100004 */ addiu $s0, $s0, 4 -/* D4DFE4 80240FA4 0C00EAD2 */ jal get_npc_safe -/* D4DFE8 80240FA8 0040202D */ daddu $a0, $v0, $zero -/* D4DFEC 80240FAC 10400005 */ beqz $v0, .L80240FC4 -/* D4DFF0 80240FB0 00000000 */ nop -/* D4DFF4 80240FB4 8E050000 */ lw $a1, ($s0) -/* D4DFF8 80240FB8 844600A8 */ lh $a2, 0xa8($v0) -/* D4DFFC 80240FBC 0C0B2026 */ jal set_variable -/* D4E000 80240FC0 0220202D */ daddu $a0, $s1, $zero -.L80240FC4: -/* D4E004 80240FC4 8FBF0018 */ lw $ra, 0x18($sp) -/* D4E008 80240FC8 8FB10014 */ lw $s1, 0x14($sp) -/* D4E00C 80240FCC 8FB00010 */ lw $s0, 0x10($sp) -/* D4E010 80240FD0 24020002 */ addiu $v0, $zero, 2 -/* D4E014 80240FD4 03E00008 */ jr $ra -/* D4E018 80240FD8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_80240FDC_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_80240FDC_D4D040.s deleted file mode 100644 index f753860e65..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_80240FDC_D4D040.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FDC_D4E01C -/* D4E01C 80240FDC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D4E020 80240FE0 AFB10014 */ sw $s1, 0x14($sp) -/* D4E024 80240FE4 0080882D */ daddu $s1, $a0, $zero -/* D4E028 80240FE8 AFBF0024 */ sw $ra, 0x24($sp) -/* D4E02C 80240FEC AFB40020 */ sw $s4, 0x20($sp) -/* D4E030 80240FF0 AFB3001C */ sw $s3, 0x1c($sp) -/* D4E034 80240FF4 AFB20018 */ sw $s2, 0x18($sp) -/* D4E038 80240FF8 AFB00010 */ sw $s0, 0x10($sp) -/* D4E03C 80240FFC F7BC0048 */ sdc1 $f28, 0x48($sp) -/* D4E040 80241000 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* D4E044 80241004 F7B80038 */ sdc1 $f24, 0x38($sp) -/* D4E048 80241008 F7B60030 */ sdc1 $f22, 0x30($sp) -/* D4E04C 8024100C F7B40028 */ sdc1 $f20, 0x28($sp) -/* D4E050 80241010 8E30000C */ lw $s0, 0xc($s1) -/* D4E054 80241014 8E130000 */ lw $s3, ($s0) -/* D4E058 80241018 26100004 */ addiu $s0, $s0, 4 -/* D4E05C 8024101C 0C0B1EAF */ jal get_variable -/* D4E060 80241020 0260282D */ daddu $a1, $s3, $zero -/* D4E064 80241024 4482E000 */ mtc1 $v0, $f28 -/* D4E068 80241028 00000000 */ nop -/* D4E06C 8024102C 4680E720 */ cvt.s.w $f28, $f28 -/* D4E070 80241030 8E140000 */ lw $s4, ($s0) -/* D4E074 80241034 26100004 */ addiu $s0, $s0, 4 -/* D4E078 80241038 0220202D */ daddu $a0, $s1, $zero -/* D4E07C 8024103C 0C0B1EAF */ jal get_variable -/* D4E080 80241040 0280282D */ daddu $a1, $s4, $zero -/* D4E084 80241044 4482D000 */ mtc1 $v0, $f26 -/* D4E088 80241048 00000000 */ nop -/* D4E08C 8024104C 4680D6A0 */ cvt.s.w $f26, $f26 -/* D4E090 80241050 8E100000 */ lw $s0, ($s0) -/* D4E094 80241054 0220202D */ daddu $a0, $s1, $zero -/* D4E098 80241058 0C0B1EAF */ jal get_variable -/* D4E09C 8024105C 0200282D */ daddu $a1, $s0, $zero -/* D4E0A0 80241060 4482C000 */ mtc1 $v0, $f24 -/* D4E0A4 80241064 00000000 */ nop -/* D4E0A8 80241068 4680C620 */ cvt.s.w $f24, $f24 -/* D4E0AC 8024106C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* D4E0B0 80241070 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* D4E0B4 80241074 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D4E0B8 80241078 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D4E0BC 8024107C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* D4E0C0 80241080 44800000 */ mtc1 $zero, $f0 -/* D4E0C4 80241084 00031080 */ sll $v0, $v1, 2 -/* D4E0C8 80241088 00431021 */ addu $v0, $v0, $v1 -/* D4E0CC 8024108C 00021080 */ sll $v0, $v0, 2 -/* D4E0D0 80241090 00431023 */ subu $v0, $v0, $v1 -/* D4E0D4 80241094 000218C0 */ sll $v1, $v0, 3 -/* D4E0D8 80241098 00431021 */ addu $v0, $v0, $v1 -/* D4E0DC 8024109C 000210C0 */ sll $v0, $v0, 3 -/* D4E0E0 802410A0 46001032 */ c.eq.s $f2, $f0 -/* D4E0E4 802410A4 3C01800B */ lui $at, 0x800b -/* D4E0E8 802410A8 00220821 */ addu $at, $at, $v0 -/* D4E0EC 802410AC C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D4E0F0 802410B0 45000005 */ bc1f .L802410C8 -/* D4E0F4 802410B4 00000000 */ nop -/* D4E0F8 802410B8 3C0142C8 */ lui $at, 0x42c8 -/* D4E0FC 802410BC 44810000 */ mtc1 $at, $f0 -/* D4E100 802410C0 08090436 */ j .L802410D8 -/* D4E104 802410C4 4600B581 */ sub.s $f22, $f22, $f0 -.L802410C8: -/* D4E108 802410C8 3C0142C8 */ lui $at, 0x42c8 -/* D4E10C 802410CC 44810000 */ mtc1 $at, $f0 -/* D4E110 802410D0 00000000 */ nop -/* D4E114 802410D4 4600B580 */ add.s $f22, $f22, $f0 -.L802410D8: -/* D4E118 802410D8 0C00A6C9 */ jal clamp_angle -/* D4E11C 802410DC 4600B306 */ mov.s $f12, $f22 -/* D4E120 802410E0 46000586 */ mov.s $f22, $f0 -/* D4E124 802410E4 3C014170 */ lui $at, 0x4170 -/* D4E128 802410E8 4481A000 */ mtc1 $at, $f20 -/* D4E12C 802410EC 0C00A8BB */ jal sin_deg -/* D4E130 802410F0 4600B306 */ mov.s $f12, $f22 -/* D4E134 802410F4 46140002 */ mul.s $f0, $f0, $f20 -/* D4E138 802410F8 00000000 */ nop -/* D4E13C 802410FC 864200B0 */ lh $v0, 0xb0($s2) -/* D4E140 80241100 3C013F00 */ lui $at, 0x3f00 -/* D4E144 80241104 44812000 */ mtc1 $at, $f4 -/* D4E148 80241108 44821000 */ mtc1 $v0, $f2 -/* D4E14C 8024110C 00000000 */ nop -/* D4E150 80241110 468010A0 */ cvt.s.w $f2, $f2 -/* D4E154 80241114 46041082 */ mul.s $f2, $f2, $f4 -/* D4E158 80241118 00000000 */ nop -/* D4E15C 8024111C 4600E700 */ add.s $f28, $f28, $f0 -/* D4E160 80241120 4602D680 */ add.s $f26, $f26, $f2 -/* D4E164 80241124 0C00A8D4 */ jal cos_deg -/* D4E168 80241128 4600B306 */ mov.s $f12, $f22 -/* D4E16C 8024112C 46140002 */ mul.s $f0, $f0, $f20 -/* D4E170 80241130 00000000 */ nop -/* D4E174 80241134 0220202D */ daddu $a0, $s1, $zero -/* D4E178 80241138 0260282D */ daddu $a1, $s3, $zero -/* D4E17C 8024113C 4600E18D */ trunc.w.s $f6, $f28 -/* D4E180 80241140 44063000 */ mfc1 $a2, $f6 -/* D4E184 80241144 0C0B2026 */ jal set_variable -/* D4E188 80241148 4600C601 */ sub.s $f24, $f24, $f0 -/* D4E18C 8024114C 0220202D */ daddu $a0, $s1, $zero -/* D4E190 80241150 4600D18D */ trunc.w.s $f6, $f26 -/* D4E194 80241154 44063000 */ mfc1 $a2, $f6 -/* D4E198 80241158 0C0B2026 */ jal set_variable -/* D4E19C 8024115C 0280282D */ daddu $a1, $s4, $zero -/* D4E1A0 80241160 0220202D */ daddu $a0, $s1, $zero -/* D4E1A4 80241164 4600C18D */ trunc.w.s $f6, $f24 -/* D4E1A8 80241168 44063000 */ mfc1 $a2, $f6 -/* D4E1AC 8024116C 0C0B2026 */ jal set_variable -/* D4E1B0 80241170 0200282D */ daddu $a1, $s0, $zero -/* D4E1B4 80241174 8FBF0024 */ lw $ra, 0x24($sp) -/* D4E1B8 80241178 8FB40020 */ lw $s4, 0x20($sp) -/* D4E1BC 8024117C 8FB3001C */ lw $s3, 0x1c($sp) -/* D4E1C0 80241180 8FB20018 */ lw $s2, 0x18($sp) -/* D4E1C4 80241184 8FB10014 */ lw $s1, 0x14($sp) -/* D4E1C8 80241188 8FB00010 */ lw $s0, 0x10($sp) -/* D4E1CC 8024118C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* D4E1D0 80241190 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* D4E1D4 80241194 D7B80038 */ ldc1 $f24, 0x38($sp) -/* D4E1D8 80241198 D7B60030 */ ldc1 $f22, 0x30($sp) -/* D4E1DC 8024119C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D4E1E0 802411A0 24020002 */ addiu $v0, $zero, 2 -/* D4E1E4 802411A4 03E00008 */ jr $ra -/* D4E1E8 802411A8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_802411AC_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_802411AC_D4D040.s deleted file mode 100644 index 23ce0179e8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_802411AC_D4D040.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411AC_D4E1EC -/* D4E1EC 802411AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4E1F0 802411B0 AFBF0010 */ sw $ra, 0x10($sp) -/* D4E1F4 802411B4 10A00003 */ beqz $a1, .L802411C4 -/* D4E1F8 802411B8 8C86000C */ lw $a2, 0xc($a0) -/* D4E1FC 802411BC 3C018024 */ lui $at, 0x8024 -/* D4E200 802411C0 AC201F94 */ sw $zero, 0x1f94($at) -.L802411C4: -/* D4E204 802411C4 3C038024 */ lui $v1, 0x8024 -/* D4E208 802411C8 24631F94 */ addiu $v1, $v1, 0x1f94 -/* D4E20C 802411CC 8C620000 */ lw $v0, ($v1) -/* D4E210 802411D0 54400003 */ bnel $v0, $zero, .L802411E0 -/* D4E214 802411D4 AC600000 */ sw $zero, ($v1) -/* D4E218 802411D8 0809047D */ j .L802411F4 -/* D4E21C 802411DC 0000102D */ daddu $v0, $zero, $zero -.L802411E0: -/* D4E220 802411E0 8CC50000 */ lw $a1, ($a2) -/* D4E224 802411E4 3C068024 */ lui $a2, 0x8024 -/* D4E228 802411E8 0C0B2026 */ jal set_variable -/* D4E22C 802411EC 8CC61F98 */ lw $a2, 0x1f98($a2) -/* D4E230 802411F0 24020002 */ addiu $v0, $zero, 2 -.L802411F4: -/* D4E234 802411F4 8FBF0010 */ lw $ra, 0x10($sp) -/* D4E238 802411F8 03E00008 */ jr $ra -/* D4E23C 802411FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_80241200_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_80241200_D4D040.s deleted file mode 100644 index 75f0a5335e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_80241200_D4D040.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241200_D4E240 -/* D4E240 80241200 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4E244 80241204 AFBF0010 */ sw $ra, 0x10($sp) -/* D4E248 80241208 8C82000C */ lw $v0, 0xc($a0) -/* D4E24C 8024120C 0C0B1EAF */ jal get_variable -/* D4E250 80241210 8C450000 */ lw $a1, ($v0) -/* D4E254 80241214 3C018024 */ lui $at, 0x8024 -/* D4E258 80241218 AC221F98 */ sw $v0, 0x1f98($at) -/* D4E25C 8024121C 24020002 */ addiu $v0, $zero, 2 -/* D4E260 80241220 8FBF0010 */ lw $ra, 0x10($sp) -/* D4E264 80241224 24030001 */ addiu $v1, $zero, 1 -/* D4E268 80241228 3C018024 */ lui $at, 0x8024 -/* D4E26C 8024122C AC231F94 */ sw $v1, 0x1f94($at) -/* D4E270 80241230 03E00008 */ jr $ra -/* D4E274 80241234 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_802412D4_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_802412D4_D4D040.s deleted file mode 100644 index 37f33b126f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_802412D4_D4D040.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412D4_D4E314 -/* D4E314 802412D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4E318 802412D8 AFBF0010 */ sw $ra, 0x10($sp) -/* D4E31C 802412DC 8C82000C */ lw $v0, 0xc($a0) -/* D4E320 802412E0 0C0B1EAF */ jal get_variable -/* D4E324 802412E4 8C450000 */ lw $a1, ($v0) -/* D4E328 802412E8 0040182D */ daddu $v1, $v0, $zero -/* D4E32C 802412EC 10600012 */ beqz $v1, .L80241338 -/* D4E330 802412F0 0000202D */ daddu $a0, $zero, $zero -/* D4E334 802412F4 8C620000 */ lw $v0, ($v1) -/* D4E338 802412F8 5040000A */ beql $v0, $zero, .L80241324 -/* D4E33C 802412FC 00041080 */ sll $v0, $a0, 2 -/* D4E340 80241300 3C058024 */ lui $a1, 0x8024 -/* D4E344 80241304 24A53178 */ addiu $a1, $a1, 0x3178 -.L80241308: -/* D4E348 80241308 24630004 */ addiu $v1, $v1, 4 -/* D4E34C 8024130C 24840001 */ addiu $a0, $a0, 1 -/* D4E350 80241310 ACA20000 */ sw $v0, ($a1) -/* D4E354 80241314 8C620000 */ lw $v0, ($v1) -/* D4E358 80241318 1440FFFB */ bnez $v0, .L80241308 -/* D4E35C 8024131C 24A50004 */ addiu $a1, $a1, 4 -/* D4E360 80241320 00041080 */ sll $v0, $a0, 2 -.L80241324: -/* D4E364 80241324 3C018024 */ lui $at, 0x8024 -/* D4E368 80241328 00220821 */ addu $at, $at, $v0 -/* D4E36C 8024132C AC203178 */ sw $zero, 0x3178($at) -/* D4E370 80241330 080904D8 */ j .L80241360 -/* D4E374 80241334 00000000 */ nop -.L80241338: -/* D4E378 80241338 3C038024 */ lui $v1, 0x8024 -/* D4E37C 8024133C 24633178 */ addiu $v1, $v1, 0x3178 -/* D4E380 80241340 0060282D */ daddu $a1, $v1, $zero -.L80241344: -/* D4E384 80241344 24820080 */ addiu $v0, $a0, 0x80 -/* D4E388 80241348 AC620000 */ sw $v0, ($v1) -/* D4E38C 8024134C 24630004 */ addiu $v1, $v1, 4 -/* D4E390 80241350 24840001 */ addiu $a0, $a0, 1 -/* D4E394 80241354 2882005B */ slti $v0, $a0, 0x5b -/* D4E398 80241358 1440FFFA */ bnez $v0, .L80241344 -/* D4E39C 8024135C ACA0016C */ sw $zero, 0x16c($a1) -.L80241360: -/* D4E3A0 80241360 8FBF0010 */ lw $ra, 0x10($sp) -/* D4E3A4 80241364 24020002 */ addiu $v0, $zero, 2 -/* D4E3A8 80241368 03E00008 */ jr $ra -/* D4E3AC 8024136C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_01/func_80241370_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/func_80241370_D4D040.s deleted file mode 100644 index 34664a18e4..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/func_80241370_D4D040.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241370_D4E3B0 -/* D4E3B0 80241370 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4E3B4 80241374 AFBF0010 */ sw $ra, 0x10($sp) -/* D4E3B8 80241378 0C03A876 */ jal set_max_SP -/* D4E3BC 8024137C 24040007 */ addiu $a0, $zero, 7 -/* D4E3C0 80241380 3C028011 */ lui $v0, %hi(gPlayerData) -/* D4E3C4 80241384 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* D4E3C8 80241388 90430003 */ lbu $v1, 3($v0) -/* D4E3CC 8024138C 90440006 */ lbu $a0, 6($v0) -/* D4E3D0 80241390 A0430002 */ sb $v1, 2($v0) -/* D4E3D4 80241394 0C03A6DB */ jal sync_status_menu -/* D4E3D8 80241398 A0440005 */ sb $a0, 5($v0) -/* D4E3DC 8024139C 8FBF0010 */ lw $ra, 0x10($sp) -/* D4E3E0 802413A0 24020002 */ addiu $v0, $zero, 2 -/* D4E3E4 802413A4 03E00008 */ jr $ra -/* D4E3E8 802413A8 27BD0018 */ addiu $sp, $sp, 0x18 -/* D4E3EC 802413AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_80240020_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_80240020_D4FFF0.s deleted file mode 100644 index ac9a1f7dfa..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_80240020_D4FFF0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D50010 -/* D50010 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D50014 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D50018 80240028 00822024 */ and $a0, $a0, $v0 -/* D5001C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D50020 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D50024 80240034 00821821 */ addu $v1, $a0, $v0 -/* D50028 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D5002C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D50030 80240040 30620001 */ andi $v0, $v1, 1 -/* D50034 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D50038 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D5003C 8024004C 03E00008 */ jr $ra -/* D50040 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_80240054_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_80240054_D4FFF0.s deleted file mode 100644 index de3a5b073d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_80240054_D4FFF0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054_D50044 -/* D50044 80240054 00041403 */ sra $v0, $a0, 0x10 -/* D50048 80240058 304300FF */ andi $v1, $v0, 0xff -/* D5004C 8024005C 24020006 */ addiu $v0, $zero, 6 -/* D50050 80240060 10620015 */ beq $v1, $v0, .L802400B8 -/* D50054 80240064 28620007 */ slti $v0, $v1, 7 -/* D50058 80240068 10400005 */ beqz $v0, .L80240080 -/* D5005C 8024006C 24020001 */ addiu $v0, $zero, 1 -/* D50060 80240070 1062000A */ beq $v1, $v0, .L8024009C -/* D50064 80240074 3C020100 */ lui $v0, 0x100 -/* D50068 80240078 03E00008 */ jr $ra -/* D5006C 8024007C 00821025 */ or $v0, $a0, $v0 -.L80240080: -/* D50070 80240080 2862000A */ slti $v0, $v1, 0xa -/* D50074 80240084 10400016 */ beqz $v0, .L802400E0 -/* D50078 80240088 28620008 */ slti $v0, $v1, 8 -/* D5007C 8024008C 14400015 */ bnez $v0, .L802400E4 -/* D50080 80240090 3C020100 */ lui $v0, 0x100 -/* D50084 80240094 03E00008 */ jr $ra -/* D50088 80240098 0080102D */ daddu $v0, $a0, $zero -.L8024009C: -/* D5008C 8024009C 3C020001 */ lui $v0, 1 -/* D50090 802400A0 3442000C */ ori $v0, $v0, 0xc -/* D50094 802400A4 0044102A */ slt $v0, $v0, $a0 -/* D50098 802400A8 1040000E */ beqz $v0, .L802400E4 -/* D5009C 802400AC 3C020100 */ lui $v0, 0x100 -.L802400B0: -/* D500A0 802400B0 03E00008 */ jr $ra -/* D500A4 802400B4 0080102D */ daddu $v0, $a0, $zero -.L802400B8: -/* D500A8 802400B8 3C02FFF9 */ lui $v0, 0xfff9 -/* D500AC 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D500B0 802400C0 00821821 */ addu $v1, $a0, $v0 -/* D500B4 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D500B8 802400C8 10400005 */ beqz $v0, .L802400E0 -/* D500BC 802400CC 30620001 */ andi $v0, $v1, 1 -/* D500C0 802400D0 1440FFF7 */ bnez $v0, .L802400B0 -/* D500C4 802400D4 24820001 */ addiu $v0, $a0, 1 -/* D500C8 802400D8 03E00008 */ jr $ra -/* D500CC 802400DC 00000000 */ nop -.L802400E0: -/* D500D0 802400E0 3C020100 */ lui $v0, 0x100 -.L802400E4: -/* D500D4 802400E4 03E00008 */ jr $ra -/* D500D8 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_802400EC_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_802400EC_D4FFF0.s deleted file mode 100644 index 438f8ca4a4..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_802400EC_D4FFF0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_D500DC -/* D500DC 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D500E0 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* D500E4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D500E8 802400F8 3C058024 */ lui $a1, 0x8024 -/* D500EC 802400FC 24A50128 */ addiu $a1, $a1, 0x128 -/* D500F0 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* D500F4 80240104 0C048C56 */ jal bind_dynamic_entity_3 -/* D500F8 80240108 0000202D */ daddu $a0, $zero, $zero -/* D500FC 8024010C 8E03013C */ lw $v1, 0x13c($s0) -/* D50100 80240110 AC620000 */ sw $v0, ($v1) -/* D50104 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* D50108 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* D5010C 8024011C 24020002 */ addiu $v0, $zero, 2 -/* D50110 80240120 03E00008 */ jr $ra -/* D50114 80240124 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_80240128_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_80240128_D4FFF0.s deleted file mode 100644 index c0f934b1ac..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_80240128_D4FFF0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240128_D50118 -/* D50118 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D5011C 8024012C AFB00040 */ sw $s0, 0x40($sp) -/* D50120 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D50124 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D50128 80240138 AFB20048 */ sw $s2, 0x48($sp) -/* D5012C 8024013C AFBF004C */ sw $ra, 0x4c($sp) -/* D50130 80240140 AFB10044 */ sw $s1, 0x44($sp) -/* D50134 80240144 8E020000 */ lw $v0, ($s0) -/* D50138 80240148 821100BE */ lb $s1, 0xbe($s0) -/* D5013C 8024014C 30420001 */ andi $v0, $v0, 1 -/* D50140 80240150 10400061 */ beqz $v0, .L802402D8 -/* D50144 80240154 27B20020 */ addiu $s2, $sp, 0x20 -/* D50148 80240158 8E0400CC */ lw $a0, 0xcc($s0) -/* D5014C 8024015C 0C044181 */ jal get_shadow_by_index -/* D50150 80240160 00000000 */ nop -/* D50154 80240164 0C048B77 */ jal func_80122DDC -/* D50158 80240168 84440008 */ lh $a0, 8($v0) -/* D5015C 8024016C 8C430000 */ lw $v1, ($v0) -/* D50160 80240170 34630200 */ ori $v1, $v1, 0x200 -/* D50164 80240174 AC430000 */ sw $v1, ($v0) -/* D50168 80240178 8E050028 */ lw $a1, 0x28($s0) -/* D5016C 8024017C 8E06002C */ lw $a2, 0x2c($s0) -/* D50170 80240180 27A20030 */ addiu $v0, $sp, 0x30 -/* D50174 80240184 AFA20010 */ sw $v0, 0x10($sp) -/* D50178 80240188 27A20034 */ addiu $v0, $sp, 0x34 -/* D5017C 8024018C AFA20014 */ sw $v0, 0x14($sp) -/* D50180 80240190 C6000030 */ lwc1 $f0, 0x30($s0) -/* D50184 80240194 3C04800A */ lui $a0, 0x800a -/* D50188 80240198 8484A634 */ lh $a0, -0x59cc($a0) -/* D5018C 8024019C 46000007 */ neg.s $f0, $f0 -/* D50190 802401A0 44070000 */ mfc1 $a3, $f0 -/* D50194 802401A4 27A20038 */ addiu $v0, $sp, 0x38 -/* D50198 802401A8 0C00B94E */ jal get_screen_coords -/* D5019C 802401AC AFA20018 */ sw $v0, 0x18($sp) -/* D501A0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D501A4 802401B4 0C090008 */ jal func_80240020 -/* D501A8 802401B8 00000000 */ nop -/* D501AC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) -/* D501B0 802401C0 3C014307 */ lui $at, 0x4307 -/* D501B4 802401C4 44810000 */ mtc1 $at, $f0 -/* D501B8 802401C8 00000000 */ nop -/* D501BC 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D501C0 802401D0 00000000 */ nop -/* D501C4 802401D4 4500000B */ bc1f .L80240204 -/* D501C8 802401D8 24040002 */ addiu $a0, $zero, 2 -/* D501CC 802401DC 3C014361 */ lui $at, 0x4361 -/* D501D0 802401E0 44810000 */ mtc1 $at, $f0 -/* D501D4 802401E4 00000000 */ nop -/* D501D8 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D501DC 802401EC 00000000 */ nop -/* D501E0 802401F0 45000004 */ bc1f .L80240204 -/* D501E4 802401F4 00000000 */ nop -/* D501E8 802401F8 0C090015 */ jal func_80240054 -/* D501EC 802401FC 0040202D */ daddu $a0, $v0, $zero -/* D501F0 80240200 24040002 */ addiu $a0, $zero, 2 -.L80240204: -/* D501F4 80240204 3C063F80 */ lui $a2, 0x3f80 -/* D501F8 80240208 0C0B76A3 */ jal func_802DDA8C -/* D501FC 8024020C 0040282D */ daddu $a1, $v0, $zero -/* D50200 80240210 8E020000 */ lw $v0, ($s0) -/* D50204 80240214 3C030002 */ lui $v1, 2 -/* D50208 80240218 00431024 */ and $v0, $v0, $v1 -/* D5020C 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 -/* D50210 80240220 24110011 */ addiu $s1, $zero, 0x11 -/* D50214 80240224 9203000E */ lbu $v1, 0xe($s0) -/* D50218 80240228 3C02802E */ lui $v0, 0x802e -/* D5021C 8024022C 90429D70 */ lbu $v0, -0x6290($v0) -/* D50220 80240230 10620018 */ beq $v1, $v0, .L80240294 -/* D50224 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D50228 80240238 1040000B */ beqz $v0, .L80240268 -/* D5022C 8024023C 24110011 */ addiu $s1, $zero, 0x11 -/* D50230 80240240 24040002 */ addiu $a0, $zero, 2 -/* D50234 80240244 2405FFFF */ addiu $a1, $zero, -1 -/* D50238 80240248 24060007 */ addiu $a2, $zero, 7 -/* D5023C 8024024C 0060102D */ daddu $v0, $v1, $zero -/* D50240 80240250 0000382D */ daddu $a3, $zero, $zero -/* D50244 80240254 AFA00010 */ sw $zero, 0x10($sp) -/* D50248 80240258 AFA00014 */ sw $zero, 0x14($sp) -/* D5024C 8024025C AFA0001C */ sw $zero, 0x1c($sp) -/* D50250 80240260 080900A3 */ j .L8024028C -/* D50254 80240264 AFA20018 */ sw $v0, 0x18($sp) -.L80240268: -/* D50258 80240268 2411000D */ addiu $s1, $zero, 0xd -/* D5025C 8024026C 24040002 */ addiu $a0, $zero, 2 -/* D50260 80240270 2405FFFF */ addiu $a1, $zero, -1 -/* D50264 80240274 0000302D */ daddu $a2, $zero, $zero -/* D50268 80240278 00C0382D */ daddu $a3, $a2, $zero -/* D5026C 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* D50270 80240280 AFA00014 */ sw $zero, 0x14($sp) -/* D50274 80240284 AFA00018 */ sw $zero, 0x18($sp) -/* D50278 80240288 AFA0001C */ sw $zero, 0x1c($sp) -.L8024028C: -/* D5027C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D50280 80240290 00000000 */ nop -.L80240294: -/* D50284 80240294 9202000E */ lbu $v0, 0xe($s0) -/* D50288 80240298 3C01802E */ lui $at, 0x802e -/* D5028C 8024029C A0229D70 */ sb $v0, -0x6290($at) -/* D50290 802402A0 080900AD */ j .L802402B4 -/* D50294 802402A4 0240202D */ daddu $a0, $s2, $zero -.L802402A8: -/* D50298 802402A8 3C01802E */ lui $at, 0x802e -/* D5029C 802402AC A0209D70 */ sb $zero, -0x6290($at) -/* D502A0 802402B0 0240202D */ daddu $a0, $s2, $zero -.L802402B4: -/* D502A4 802402B4 AC910000 */ sw $s1, ($a0) -/* D502A8 802402B8 AC900008 */ sw $s0, 8($a0) -/* D502AC 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D502B0 802402C0 3C038024 */ lui $v1, 0x8024 -/* D502B4 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 -/* D502B8 802402C8 AC83000C */ sw $v1, 0xc($a0) -/* D502BC 802402CC 00021023 */ negu $v0, $v0 -/* D502C0 802402D0 0C047644 */ jal queue_render_task -/* D502C4 802402D4 AC820004 */ sw $v0, 4($a0) -.L802402D8: -/* D502C8 802402D8 8FBF004C */ lw $ra, 0x4c($sp) -/* D502CC 802402DC 8FB20048 */ lw $s2, 0x48($sp) -/* D502D0 802402E0 8FB10044 */ lw $s1, 0x44($sp) -/* D502D4 802402E4 8FB00040 */ lw $s0, 0x40($sp) -/* D502D8 802402E8 03E00008 */ jr $ra -/* D502DC 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_802402F0_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_802402F0_D4FFF0.s deleted file mode 100644 index 4c33402cb9..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_802402F0_D4FFF0.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D502E0 -/* D502E0 802402F0 3C03800A */ lui $v1, 0x800a -/* D502E4 802402F4 8463A634 */ lh $v1, -0x59cc($v1) -/* D502E8 802402F8 3C07BF80 */ lui $a3, 0xbf80 -/* D502EC 802402FC 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D502F0 80240300 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D502F4 80240304 4480A000 */ mtc1 $zero, $f20 -/* D502F8 80240308 AFB1011C */ sw $s1, 0x11c($sp) -/* D502FC 8024030C 0080882D */ daddu $s1, $a0, $zero -/* D50300 80240310 AFB00118 */ sw $s0, 0x118($sp) -/* D50304 80240314 27B00098 */ addiu $s0, $sp, 0x98 -/* D50308 80240318 AFBF0120 */ sw $ra, 0x120($sp) -/* D5030C 8024031C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D50310 80240320 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D50314 80240324 00031080 */ sll $v0, $v1, 2 -/* D50318 80240328 00431021 */ addu $v0, $v0, $v1 -/* D5031C 8024032C 00021080 */ sll $v0, $v0, 2 -/* D50320 80240330 00431023 */ subu $v0, $v0, $v1 -/* D50324 80240334 000218C0 */ sll $v1, $v0, 3 -/* D50328 80240338 00431021 */ addu $v0, $v0, $v1 -/* D5032C 8024033C 000210C0 */ sll $v0, $v0, 3 -/* D50330 80240340 3C01800B */ lui $at, 0x800b -/* D50334 80240344 00220821 */ addu $at, $at, $v0 -/* D50338 80240348 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D5033C 8024034C 4406A000 */ mfc1 $a2, $f20 -/* D50340 80240350 4600B587 */ neg.s $f22, $f22 -/* D50344 80240354 4405B000 */ mfc1 $a1, $f22 -/* D50348 80240358 0200202D */ daddu $a0, $s0, $zero -/* D5034C 8024035C 0C019EC8 */ jal guRotateF -/* D50350 80240360 E7B40010 */ swc1 $f20, 0x10($sp) -/* D50354 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D50358 80240368 0C00A6C9 */ jal clamp_angle -/* D5035C 8024036C 00000000 */ nop -/* D50360 80240370 44050000 */ mfc1 $a1, $f0 -/* D50364 80240374 4406A000 */ mfc1 $a2, $f20 -/* D50368 80240378 4407A000 */ mfc1 $a3, $f20 -/* D5036C 8024037C 3C013F80 */ lui $at, 0x3f80 -/* D50370 80240380 4481C000 */ mtc1 $at, $f24 -/* D50374 80240384 27A40018 */ addiu $a0, $sp, 0x18 -/* D50378 80240388 0C019EC8 */ jal guRotateF -/* D5037C 8024038C E7B80010 */ swc1 $f24, 0x10($sp) -/* D50380 80240390 0200202D */ daddu $a0, $s0, $zero -/* D50384 80240394 27A50018 */ addiu $a1, $sp, 0x18 -/* D50388 80240398 0C019D80 */ jal guMtxCatF -/* D5038C 8024039C 00A0302D */ daddu $a2, $a1, $zero -/* D50390 802403A0 4405B000 */ mfc1 $a1, $f22 -/* D50394 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D50398 802403A8 4407C000 */ mfc1 $a3, $f24 -/* D5039C 802403AC 0200202D */ daddu $a0, $s0, $zero -/* D503A0 802403B0 0C019EC8 */ jal guRotateF -/* D503A4 802403B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D503A8 802403B8 27A40018 */ addiu $a0, $sp, 0x18 -/* D503AC 802403BC 0200282D */ daddu $a1, $s0, $zero -/* D503B0 802403C0 0C019D80 */ jal guMtxCatF -/* D503B4 802403C4 0080302D */ daddu $a2, $a0, $zero -/* D503B8 802403C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D503BC 802403CC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D503C0 802403D0 4406A000 */ mfc1 $a2, $f20 -/* D503C4 802403D4 4407C000 */ mfc1 $a3, $f24 -/* D503C8 802403D8 0C019EC8 */ jal guRotateF -/* D503CC 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D503D0 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* D503D4 802403E4 0200282D */ daddu $a1, $s0, $zero -/* D503D8 802403E8 0C019D80 */ jal guMtxCatF -/* D503DC 802403EC 0080302D */ daddu $a2, $a0, $zero -/* D503E0 802403F0 3C013F36 */ lui $at, 0x3f36 -/* D503E4 802403F4 3421DB6E */ ori $at, $at, 0xdb6e -/* D503E8 802403F8 44810000 */ mtc1 $at, $f0 -/* D503EC 802403FC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D503F0 80240400 44050000 */ mfc1 $a1, $f0 -/* D503F4 80240404 0200202D */ daddu $a0, $s0, $zero -/* D503F8 80240408 00A0302D */ daddu $a2, $a1, $zero -/* D503FC 8024040C 0C019DF0 */ jal guScaleF -/* D50400 80240410 00A0382D */ daddu $a3, $a1, $zero -/* D50404 80240414 27A40018 */ addiu $a0, $sp, 0x18 -/* D50408 80240418 0200282D */ daddu $a1, $s0, $zero -/* D5040C 8024041C 0C019D80 */ jal guMtxCatF -/* D50410 80240420 0080302D */ daddu $a2, $a0, $zero -/* D50414 80240424 27B00058 */ addiu $s0, $sp, 0x58 -/* D50418 80240428 C6200030 */ lwc1 $f0, 0x30($s1) -/* D5041C 8024042C 3C014040 */ lui $at, 0x4040 -/* D50420 80240430 44811000 */ mtc1 $at, $f2 -/* D50424 80240434 46000007 */ neg.s $f0, $f0 -/* D50428 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* D5042C 8024043C 8E250028 */ lw $a1, 0x28($s1) -/* D50430 80240440 8E26002C */ lw $a2, 0x2c($s1) -/* D50434 80240444 44070000 */ mfc1 $a3, $f0 -/* D50438 80240448 0C019E40 */ jal guTranslateF -/* D5043C 8024044C 0200202D */ daddu $a0, $s0, $zero -/* D50440 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* D50444 80240454 0200282D */ daddu $a1, $s0, $zero -/* D50448 80240458 0C019D80 */ jal guMtxCatF -/* D5044C 8024045C 0080302D */ daddu $a2, $a0, $zero -/* D50450 80240460 24040002 */ addiu $a0, $zero, 2 -/* D50454 80240464 0000282D */ daddu $a1, $zero, $zero -/* D50458 80240468 00A0302D */ daddu $a2, $a1, $zero -/* D5045C 8024046C 00A0382D */ daddu $a3, $a1, $zero -/* D50460 80240470 27A20018 */ addiu $v0, $sp, 0x18 -/* D50464 80240474 0C0B7710 */ jal render_sprite -/* D50468 80240478 AFA20010 */ sw $v0, 0x10($sp) -/* D5046C 8024047C 8FBF0120 */ lw $ra, 0x120($sp) -/* D50470 80240480 8FB1011C */ lw $s1, 0x11c($sp) -/* D50474 80240484 8FB00118 */ lw $s0, 0x118($sp) -/* D50478 80240488 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D5047C 8024048C D7B60130 */ ldc1 $f22, 0x130($sp) -/* D50480 80240490 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D50484 80240494 03E00008 */ jr $ra -/* D50488 80240498 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_8024049C_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_8024049C_D4FFF0.s deleted file mode 100644 index fd7c9411a8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_8024049C_D4FFF0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_D5048C -/* D5048C 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D50490 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* D50494 802404A4 0080802D */ daddu $s0, $a0, $zero -/* D50498 802404A8 AFBF0014 */ sw $ra, 0x14($sp) -/* D5049C 802404AC 8E020084 */ lw $v0, 0x84($s0) -/* D504A0 802404B0 0440000E */ bltz $v0, .L802404EC -/* D504A4 802404B4 28420002 */ slti $v0, $v0, 2 -/* D504A8 802404B8 1040000C */ beqz $v0, .L802404EC -/* D504AC 802404BC 00000000 */ nop -/* D504B0 802404C0 3C058024 */ lui $a1, 0x8024 -/* D504B4 802404C4 24A50500 */ addiu $a1, $a1, 0x500 -/* D504B8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 -/* D504BC 802404CC 0000202D */ daddu $a0, $zero, $zero -/* D504C0 802404D0 8E03013C */ lw $v1, 0x13c($s0) -/* D504C4 802404D4 AC620000 */ sw $v0, ($v1) -/* D504C8 802404D8 3C03800A */ lui $v1, %hi(D_8009A650) -/* D504CC 802404DC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D504D0 802404E0 8C620000 */ lw $v0, ($v1) -/* D504D4 802404E4 34420080 */ ori $v0, $v0, 0x80 -/* D504D8 802404E8 AC620000 */ sw $v0, ($v1) -.L802404EC: -/* D504DC 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* D504E0 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* D504E4 802404F4 24020002 */ addiu $v0, $zero, 2 -/* D504E8 802404F8 03E00008 */ jr $ra -/* D504EC 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_80240500_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_80240500_D4FFF0.s deleted file mode 100644 index 67ee85999b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_80240500_D4FFF0.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_D504F0 -/* D504F0 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D504F4 80240504 AFB00040 */ sw $s0, 0x40($sp) -/* D504F8 80240508 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D504FC 8024050C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D50500 80240510 AFB10044 */ sw $s1, 0x44($sp) -/* D50504 80240514 AFBF004C */ sw $ra, 0x4c($sp) -/* D50508 80240518 AFB20048 */ sw $s2, 0x48($sp) -/* D5050C 8024051C 8E020000 */ lw $v0, ($s0) -/* D50510 80240520 821200BE */ lb $s2, 0xbe($s0) -/* D50514 80240524 30420001 */ andi $v0, $v0, 1 -/* D50518 80240528 10400052 */ beqz $v0, .L80240674 -/* D5051C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 -/* D50520 80240530 8E0400CC */ lw $a0, 0xcc($s0) -/* D50524 80240534 0C044181 */ jal get_shadow_by_index -/* D50528 80240538 00000000 */ nop -/* D5052C 8024053C 0C048B77 */ jal func_80122DDC -/* D50530 80240540 84440008 */ lh $a0, 8($v0) -/* D50534 80240544 8E050028 */ lw $a1, 0x28($s0) -/* D50538 80240548 8E070030 */ lw $a3, 0x30($s0) -/* D5053C 8024054C 27A20030 */ addiu $v0, $sp, 0x30 -/* D50540 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* D50544 80240554 27A20034 */ addiu $v0, $sp, 0x34 -/* D50548 80240558 AFA20014 */ sw $v0, 0x14($sp) -/* D5054C 8024055C 27A20038 */ addiu $v0, $sp, 0x38 -/* D50550 80240560 AFA20018 */ sw $v0, 0x18($sp) -/* D50554 80240564 C600002C */ lwc1 $f0, 0x2c($s0) -/* D50558 80240568 3C04800A */ lui $a0, 0x800a -/* D5055C 8024056C 8484A634 */ lh $a0, -0x59cc($a0) -/* D50560 80240570 46000007 */ neg.s $f0, $f0 -/* D50564 80240574 44060000 */ mfc1 $a2, $f0 -/* D50568 80240578 0C00B94E */ jal get_screen_coords -/* D5056C 8024057C 00000000 */ nop -/* D50570 80240580 8E0500A4 */ lw $a1, 0xa4($s0) -/* D50574 80240584 3C063F80 */ lui $a2, 0x3f80 -/* D50578 80240588 0C0B76A3 */ jal func_802DDA8C -/* D5057C 8024058C 24040001 */ addiu $a0, $zero, 1 -/* D50580 80240590 8E020000 */ lw $v0, ($s0) -/* D50584 80240594 3C030002 */ lui $v1, 2 -/* D50588 80240598 00431024 */ and $v0, $v0, $v1 -/* D5058C 8024059C 54400022 */ bnel $v0, $zero, .L80240628 -/* D50590 802405A0 24120011 */ addiu $s2, $zero, 0x11 -/* D50594 802405A4 9203000E */ lbu $v1, 0xe($s0) -/* D50598 802405A8 3C02802E */ lui $v0, 0x802e -/* D5059C 802405AC 90429D71 */ lbu $v0, -0x628f($v0) -/* D505A0 802405B0 10620018 */ beq $v1, $v0, .L80240614 -/* D505A4 802405B4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D505A8 802405B8 1040000B */ beqz $v0, .L802405E8 -/* D505AC 802405BC 24120011 */ addiu $s2, $zero, 0x11 -/* D505B0 802405C0 24040001 */ addiu $a0, $zero, 1 -/* D505B4 802405C4 2405FFFF */ addiu $a1, $zero, -1 -/* D505B8 802405C8 24060007 */ addiu $a2, $zero, 7 -/* D505BC 802405CC 0060102D */ daddu $v0, $v1, $zero -/* D505C0 802405D0 0000382D */ daddu $a3, $zero, $zero -/* D505C4 802405D4 AFA00010 */ sw $zero, 0x10($sp) -/* D505C8 802405D8 AFA00014 */ sw $zero, 0x14($sp) -/* D505CC 802405DC AFA0001C */ sw $zero, 0x1c($sp) -/* D505D0 802405E0 08090183 */ j .L8024060C -/* D505D4 802405E4 AFA20018 */ sw $v0, 0x18($sp) -.L802405E8: -/* D505D8 802405E8 2412000D */ addiu $s2, $zero, 0xd -/* D505DC 802405EC 24040001 */ addiu $a0, $zero, 1 -/* D505E0 802405F0 2405FFFF */ addiu $a1, $zero, -1 -/* D505E4 802405F4 0000302D */ daddu $a2, $zero, $zero -/* D505E8 802405F8 00C0382D */ daddu $a3, $a2, $zero -/* D505EC 802405FC AFA00010 */ sw $zero, 0x10($sp) -/* D505F0 80240600 AFA00014 */ sw $zero, 0x14($sp) -/* D505F4 80240604 AFA00018 */ sw $zero, 0x18($sp) -/* D505F8 80240608 AFA0001C */ sw $zero, 0x1c($sp) -.L8024060C: -/* D505FC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D50600 80240610 00000000 */ nop -.L80240614: -/* D50604 80240614 9202000E */ lbu $v0, 0xe($s0) -/* D50608 80240618 3C01802E */ lui $at, 0x802e -/* D5060C 8024061C A0229D71 */ sb $v0, -0x628f($at) -/* D50610 80240620 0809018C */ j .L80240630 -/* D50614 80240624 00000000 */ nop -.L80240628: -/* D50618 80240628 3C01802E */ lui $at, 0x802e -/* D5061C 8024062C A0209D71 */ sb $zero, -0x628f($at) -.L80240630: -/* D50620 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D50624 80240634 3C048024 */ lui $a0, 0x8024 -/* D50628 80240638 24840870 */ addiu $a0, $a0, 0x870 -/* D5062C 8024063C AE320000 */ sw $s2, ($s1) -/* D50630 80240640 AE300008 */ sw $s0, 8($s1) -/* D50634 80240644 00021023 */ negu $v0, $v0 -/* D50638 80240648 AE220004 */ sw $v0, 4($s1) -/* D5063C 8024064C 8E020000 */ lw $v0, ($s0) -/* D50640 80240650 3C030002 */ lui $v1, 2 -/* D50644 80240654 00431024 */ and $v0, $v0, $v1 -/* D50648 80240658 54400004 */ bnel $v0, $zero, .L8024066C -/* D5064C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D50650 80240660 3C048024 */ lui $a0, 0x8024 -/* D50654 80240664 2484068C */ addiu $a0, $a0, 0x68c -/* D50658 80240668 AE24000C */ sw $a0, 0xc($s1) -.L8024066C: -/* D5065C 8024066C 0C047644 */ jal queue_render_task -/* D50660 80240670 0220202D */ daddu $a0, $s1, $zero -.L80240674: -/* D50664 80240674 8FBF004C */ lw $ra, 0x4c($sp) -/* D50668 80240678 8FB20048 */ lw $s2, 0x48($sp) -/* D5066C 8024067C 8FB10044 */ lw $s1, 0x44($sp) -/* D50670 80240680 8FB00040 */ lw $s0, 0x40($sp) -/* D50674 80240684 03E00008 */ jr $ra -/* D50678 80240688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_8024068C_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_8024068C_D4FFF0.s deleted file mode 100644 index f9d5f1c2be..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_8024068C_D4FFF0.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_D5067C -/* D5067C 8024068C 3C03800A */ lui $v1, 0x800a -/* D50680 80240690 8463A634 */ lh $v1, -0x59cc($v1) -/* D50684 80240694 3C07BF80 */ lui $a3, 0xbf80 -/* D50688 80240698 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D5068C 8024069C F7B40128 */ sdc1 $f20, 0x128($sp) -/* D50690 802406A0 4480A000 */ mtc1 $zero, $f20 -/* D50694 802406A4 AFB1011C */ sw $s1, 0x11c($sp) -/* D50698 802406A8 0080882D */ daddu $s1, $a0, $zero -/* D5069C 802406AC AFB00118 */ sw $s0, 0x118($sp) -/* D506A0 802406B0 27B00098 */ addiu $s0, $sp, 0x98 -/* D506A4 802406B4 AFBF0120 */ sw $ra, 0x120($sp) -/* D506A8 802406B8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D506AC 802406BC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D506B0 802406C0 00031080 */ sll $v0, $v1, 2 -/* D506B4 802406C4 00431021 */ addu $v0, $v0, $v1 -/* D506B8 802406C8 00021080 */ sll $v0, $v0, 2 -/* D506BC 802406CC 00431023 */ subu $v0, $v0, $v1 -/* D506C0 802406D0 000218C0 */ sll $v1, $v0, 3 -/* D506C4 802406D4 00431021 */ addu $v0, $v0, $v1 -/* D506C8 802406D8 000210C0 */ sll $v0, $v0, 3 -/* D506CC 802406DC 3C01800B */ lui $at, 0x800b -/* D506D0 802406E0 00220821 */ addu $at, $at, $v0 -/* D506D4 802406E4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D506D8 802406E8 4406A000 */ mfc1 $a2, $f20 -/* D506DC 802406EC 4600B587 */ neg.s $f22, $f22 -/* D506E0 802406F0 4405B000 */ mfc1 $a1, $f22 -/* D506E4 802406F4 0200202D */ daddu $a0, $s0, $zero -/* D506E8 802406F8 0C019EC8 */ jal guRotateF -/* D506EC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) -/* D506F0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D506F4 80240704 0C00A6C9 */ jal clamp_angle -/* D506F8 80240708 00000000 */ nop -/* D506FC 8024070C 44050000 */ mfc1 $a1, $f0 -/* D50700 80240710 4406A000 */ mfc1 $a2, $f20 -/* D50704 80240714 4407A000 */ mfc1 $a3, $f20 -/* D50708 80240718 3C013F80 */ lui $at, 0x3f80 -/* D5070C 8024071C 4481C000 */ mtc1 $at, $f24 -/* D50710 80240720 27A40018 */ addiu $a0, $sp, 0x18 -/* D50714 80240724 0C019EC8 */ jal guRotateF -/* D50718 80240728 E7B80010 */ swc1 $f24, 0x10($sp) -/* D5071C 8024072C 0200202D */ daddu $a0, $s0, $zero -/* D50720 80240730 27A50018 */ addiu $a1, $sp, 0x18 -/* D50724 80240734 0C019D80 */ jal guMtxCatF -/* D50728 80240738 00A0302D */ daddu $a2, $a1, $zero -/* D5072C 8024073C 4405B000 */ mfc1 $a1, $f22 -/* D50730 80240740 4406A000 */ mfc1 $a2, $f20 -/* D50734 80240744 4407C000 */ mfc1 $a3, $f24 -/* D50738 80240748 0200202D */ daddu $a0, $s0, $zero -/* D5073C 8024074C 0C019EC8 */ jal guRotateF -/* D50740 80240750 E7B40010 */ swc1 $f20, 0x10($sp) -/* D50744 80240754 27A40018 */ addiu $a0, $sp, 0x18 -/* D50748 80240758 0200282D */ daddu $a1, $s0, $zero -/* D5074C 8024075C 0C019D80 */ jal guMtxCatF -/* D50750 80240760 0080302D */ daddu $a2, $a0, $zero -/* D50754 80240764 E7B40010 */ swc1 $f20, 0x10($sp) -/* D50758 80240768 8E2500A8 */ lw $a1, 0xa8($s1) -/* D5075C 8024076C 4406A000 */ mfc1 $a2, $f20 -/* D50760 80240770 4407C000 */ mfc1 $a3, $f24 -/* D50764 80240774 0C019EC8 */ jal guRotateF -/* D50768 80240778 0200202D */ daddu $a0, $s0, $zero -/* D5076C 8024077C 27A40018 */ addiu $a0, $sp, 0x18 -/* D50770 80240780 0200282D */ daddu $a1, $s0, $zero -/* D50774 80240784 0C019D80 */ jal guMtxCatF -/* D50778 80240788 0080302D */ daddu $a2, $a0, $zero -/* D5077C 8024078C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D50780 80240790 3C013F36 */ lui $at, 0x3f36 -/* D50784 80240794 3421DB6E */ ori $at, $at, 0xdb6e -/* D50788 80240798 44810000 */ mtc1 $at, $f0 -/* D5078C 8024079C 0200202D */ daddu $a0, $s0, $zero -/* D50790 802407A0 44050000 */ mfc1 $a1, $f0 -/* D50794 802407A4 3C06BF36 */ lui $a2, 0xbf36 -/* D50798 802407A8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D5079C 802407AC 0C019DF0 */ jal guScaleF -/* D507A0 802407B0 00A0382D */ daddu $a3, $a1, $zero -/* D507A4 802407B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D507A8 802407B8 0200282D */ daddu $a1, $s0, $zero -/* D507AC 802407BC 0C019D80 */ jal guMtxCatF -/* D507B0 802407C0 0080302D */ daddu $a2, $a0, $zero -/* D507B4 802407C4 27B00058 */ addiu $s0, $sp, 0x58 -/* D507B8 802407C8 8E250028 */ lw $a1, 0x28($s1) -/* D507BC 802407CC C620002C */ lwc1 $f0, 0x2c($s1) -/* D507C0 802407D0 8E270030 */ lw $a3, 0x30($s1) -/* D507C4 802407D4 46000007 */ neg.s $f0, $f0 -/* D507C8 802407D8 44060000 */ mfc1 $a2, $f0 -/* D507CC 802407DC 0C019E40 */ jal guTranslateF -/* D507D0 802407E0 0200202D */ daddu $a0, $s0, $zero -/* D507D4 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D507D8 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D507DC 802407EC 0C019D80 */ jal guMtxCatF -/* D507E0 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D507E4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D507E8 802407F8 3C0142B4 */ lui $at, 0x42b4 -/* D507EC 802407FC 44810000 */ mtc1 $at, $f0 -/* D507F0 80240800 00000000 */ nop -/* D507F4 80240804 4602003E */ c.le.s $f0, $f2 -/* D507F8 80240808 00000000 */ nop -/* D507FC 8024080C 4500000A */ bc1f .L80240838 -/* D50800 80240810 24040001 */ addiu $a0, $zero, 1 -/* D50804 80240814 3C014387 */ lui $at, 0x4387 -/* D50808 80240818 44810000 */ mtc1 $at, $f0 -/* D5080C 8024081C 00000000 */ nop -/* D50810 80240820 4600103C */ c.lt.s $f2, $f0 -/* D50814 80240824 00000000 */ nop -/* D50818 80240828 45000004 */ bc1f .L8024083C -/* D5081C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 -/* D50820 80240830 3C041000 */ lui $a0, 0x1000 -/* D50824 80240834 34840001 */ ori $a0, $a0, 1 -.L80240838: -/* D50828 80240838 27A20018 */ addiu $v0, $sp, 0x18 -.L8024083C: -/* D5082C 8024083C 0000282D */ daddu $a1, $zero, $zero -/* D50830 80240840 00A0302D */ daddu $a2, $a1, $zero -/* D50834 80240844 00A0382D */ daddu $a3, $a1, $zero -/* D50838 80240848 0C0B7710 */ jal render_sprite -/* D5083C 8024084C AFA20010 */ sw $v0, 0x10($sp) -/* D50840 80240850 8FBF0120 */ lw $ra, 0x120($sp) -/* D50844 80240854 8FB1011C */ lw $s1, 0x11c($sp) -/* D50848 80240858 8FB00118 */ lw $s0, 0x118($sp) -/* D5084C 8024085C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D50850 80240860 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D50854 80240864 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D50858 80240868 03E00008 */ jr $ra -/* D5085C 8024086C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_80240870_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_80240870_D4FFF0.s deleted file mode 100644 index 2f6c1b9877..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_80240870_D4FFF0.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_D50860 -/* D50860 80240870 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D50864 80240874 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D50868 80240878 4480B000 */ mtc1 $zero, $f22 -/* D5086C 8024087C AFB10134 */ sw $s1, 0x134($sp) -/* D50870 80240880 0080882D */ daddu $s1, $a0, $zero -/* D50874 80240884 AFB3013C */ sw $s3, 0x13c($sp) -/* D50878 80240888 0000982D */ daddu $s3, $zero, $zero -/* D5087C 8024088C AFB60148 */ sw $s6, 0x148($sp) -/* D50880 80240890 3C16800B */ lui $s6, %hi(gCameras) -/* D50884 80240894 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D50888 80240898 AFB50144 */ sw $s5, 0x144($sp) -/* D5088C 8024089C 241500FF */ addiu $s5, $zero, 0xff -/* D50890 802408A0 AFB00130 */ sw $s0, 0x130($sp) -/* D50894 802408A4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D50898 802408A8 AFB20138 */ sw $s2, 0x138($sp) -/* D5089C 802408AC 27B20060 */ addiu $s2, $sp, 0x60 -/* D508A0 802408B0 AFB40140 */ sw $s4, 0x140($sp) -/* D508A4 802408B4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D508A8 802408B8 AFBF014C */ sw $ra, 0x14c($sp) -/* D508AC 802408BC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D508B0 802408C0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D508B4 802408C4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D508B8 802408C8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D508BC 802408CC F7B40150 */ sdc1 $f20, 0x150($sp) -.L802408D0: -/* D508C0 802408D0 3C03800A */ lui $v1, 0x800a -/* D508C4 802408D4 8463A634 */ lh $v1, -0x59cc($v1) -/* D508C8 802408D8 00031080 */ sll $v0, $v1, 2 -/* D508CC 802408DC 00431021 */ addu $v0, $v0, $v1 -/* D508D0 802408E0 00021080 */ sll $v0, $v0, 2 -/* D508D4 802408E4 00431023 */ subu $v0, $v0, $v1 -/* D508D8 802408E8 000218C0 */ sll $v1, $v0, 3 -/* D508DC 802408EC 00431021 */ addu $v0, $v0, $v1 -/* D508E0 802408F0 000210C0 */ sll $v0, $v0, 3 -/* D508E4 802408F4 00561021 */ addu $v0, $v0, $s6 -/* D508E8 802408F8 C440006C */ lwc1 $f0, 0x6c($v0) -/* D508EC 802408FC 16600065 */ bnez $s3, .L80240A94 -/* D508F0 80240900 46000507 */ neg.s $f20, $f0 -/* D508F4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D508F8 80240908 3C0142B4 */ lui $at, 0x42b4 -/* D508FC 8024090C 44810000 */ mtc1 $at, $f0 -/* D50900 80240910 00000000 */ nop -/* D50904 80240914 4602003C */ c.lt.s $f0, $f2 -/* D50908 80240918 00000000 */ nop -/* D5090C 8024091C 4500000A */ bc1f .L80240948 -/* D50910 80240920 00000000 */ nop -/* D50914 80240924 3C014334 */ lui $at, 0x4334 -/* D50918 80240928 44812000 */ mtc1 $at, $f4 -/* D5091C 8024092C 00000000 */ nop -/* D50920 80240930 4604103E */ c.le.s $f2, $f4 -/* D50924 80240934 00000000 */ nop -/* D50928 80240938 45000003 */ bc1f .L80240948 -/* D5092C 8024093C 00000000 */ nop -/* D50930 80240940 08090276 */ j .L802409D8 -/* D50934 80240944 46022501 */ sub.s $f20, $f4, $f2 -.L80240948: -/* D50938 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D5093C 8024094C 3C014334 */ lui $at, 0x4334 -/* D50940 80240950 44812000 */ mtc1 $at, $f4 -/* D50944 80240954 00000000 */ nop -/* D50948 80240958 4600203C */ c.lt.s $f4, $f0 -/* D5094C 8024095C 00000000 */ nop -/* D50950 80240960 4500000C */ bc1f .L80240994 -/* D50954 80240964 00000000 */ nop -/* D50958 80240968 3C014387 */ lui $at, 0x4387 -/* D5095C 8024096C 44812000 */ mtc1 $at, $f4 -/* D50960 80240970 00000000 */ nop -/* D50964 80240974 4604003E */ c.le.s $f0, $f4 -/* D50968 80240978 00000000 */ nop -/* D5096C 8024097C 45000008 */ bc1f .L802409A0 -/* D50970 80240980 00000000 */ nop -/* D50974 80240984 3C014334 */ lui $at, 0x4334 -/* D50978 80240988 44812000 */ mtc1 $at, $f4 -/* D5097C 8024098C 08090276 */ j .L802409D8 -/* D50980 80240990 46040501 */ sub.s $f20, $f0, $f4 -.L80240994: -/* D50984 80240994 3C014387 */ lui $at, 0x4387 -/* D50988 80240998 44812000 */ mtc1 $at, $f4 -/* D5098C 8024099C 00000000 */ nop -.L802409A0: -/* D50990 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D50994 802409A4 00000000 */ nop -/* D50998 802409A8 4500000A */ bc1f .L802409D4 -/* D5099C 802409AC 00000000 */ nop -/* D509A0 802409B0 3C0143B4 */ lui $at, 0x43b4 -/* D509A4 802409B4 44811000 */ mtc1 $at, $f2 -/* D509A8 802409B8 00000000 */ nop -/* D509AC 802409BC 4602003E */ c.le.s $f0, $f2 -/* D509B0 802409C0 00000000 */ nop -/* D509B4 802409C4 45000003 */ bc1f .L802409D4 -/* D509B8 802409C8 00000000 */ nop -/* D509BC 802409CC 08090276 */ j .L802409D8 -/* D509C0 802409D0 46001501 */ sub.s $f20, $f2, $f0 -.L802409D4: -/* D509C4 802409D4 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L802409D8: -/* D509C8 802409D8 3C0141C8 */ lui $at, 0x41c8 -/* D509CC 802409DC 44810000 */ mtc1 $at, $f0 -/* D509D0 802409E0 00000000 */ nop -/* D509D4 802409E4 4600A003 */ div.s $f0, $f20, $f0 -/* D509D8 802409E8 4600010D */ trunc.w.s $f4, $f0 -/* D509DC 802409EC 44072000 */ mfc1 $a3, $f4 -/* D509E0 802409F0 00000000 */ nop -/* D509E4 802409F4 00071100 */ sll $v0, $a3, 4 -/* D509E8 802409F8 00471023 */ subu $v0, $v0, $a3 -/* D509EC 802409FC 00021080 */ sll $v0, $v0, 2 -/* D509F0 80240A00 02A23823 */ subu $a3, $s5, $v0 -/* D509F4 80240A04 28E20064 */ slti $v0, $a3, 0x64 -/* D509F8 80240A08 54400001 */ bnel $v0, $zero, .L80240A10 -/* D509FC 80240A0C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A10: -/* D50A00 80240A10 24040001 */ addiu $a0, $zero, 1 -/* D50A04 80240A14 2405FFFF */ addiu $a1, $zero, -1 -/* D50A08 80240A18 24060006 */ addiu $a2, $zero, 6 -/* D50A0C 80240A1C AFA70010 */ sw $a3, 0x10($sp) -/* D50A10 80240A20 AFA70014 */ sw $a3, 0x14($sp) -/* D50A14 80240A24 AFB50018 */ sw $s5, 0x18($sp) -/* D50A18 80240A28 0C0B77B9 */ jal func_802DDEE4 -/* D50A1C 80240A2C AFA0001C */ sw $zero, 0x1c($sp) -/* D50A20 80240A30 4405A000 */ mfc1 $a1, $f20 -/* D50A24 80240A34 4406B000 */ mfc1 $a2, $f22 -/* D50A28 80240A38 3C07BF80 */ lui $a3, 0xbf80 -/* D50A2C 80240A3C 0200202D */ daddu $a0, $s0, $zero -/* D50A30 80240A40 0C019EC8 */ jal guRotateF -/* D50A34 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D50A38 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D50A3C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D50A40 80240A50 00000000 */ nop -/* D50A44 80240A54 44050000 */ mfc1 $a1, $f0 -/* D50A48 80240A58 4406B000 */ mfc1 $a2, $f22 -/* D50A4C 80240A5C 4407B000 */ mfc1 $a3, $f22 -/* D50A50 80240A60 3C013F80 */ lui $at, 0x3f80 -/* D50A54 80240A64 44812000 */ mtc1 $at, $f4 -/* D50A58 80240A68 27A40020 */ addiu $a0, $sp, 0x20 -/* D50A5C 80240A6C 0C019EC8 */ jal guRotateF -/* D50A60 80240A70 E7A40010 */ swc1 $f4, 0x10($sp) -/* D50A64 80240A74 0200202D */ daddu $a0, $s0, $zero -/* D50A68 80240A78 27A50020 */ addiu $a1, $sp, 0x20 -/* D50A6C 80240A7C 0C019D80 */ jal guMtxCatF -/* D50A70 80240A80 00A0302D */ daddu $a2, $a1, $zero -/* D50A74 80240A84 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D50A78 80240A88 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D50A7C 80240A8C 080902D6 */ j .L80240B58 -/* D50A80 80240A90 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240A94: -/* D50A84 80240A94 0260202D */ daddu $a0, $s3, $zero -/* D50A88 80240A98 27A50120 */ addiu $a1, $sp, 0x120 -/* D50A8C 80240A9C 27A60124 */ addiu $a2, $sp, 0x124 -/* D50A90 80240AA0 0C03964E */ jal func_800E5938 -/* D50A94 80240AA4 27A70128 */ addiu $a3, $sp, 0x128 -/* D50A98 80240AA8 8FA60124 */ lw $a2, 0x124($sp) -/* D50A9C 80240AAC 3C028000 */ lui $v0, 0x8000 -/* D50AA0 80240AB0 14C20004 */ bne $a2, $v0, .L80240AC4 -/* D50AA4 80240AB4 46000606 */ mov.s $f24, $f0 -/* D50AA8 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D50AAC 80240ABC 080902B5 */ j .L80240AD4 -/* D50AB0 80240AC0 24040001 */ addiu $a0, $zero, 1 -.L80240AC4: -/* D50AB4 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D50AB8 80240AC8 00000000 */ nop -/* D50ABC 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D50AC0 80240AD0 24040001 */ addiu $a0, $zero, 1 -.L80240AD4: -/* D50AC4 80240AD4 2405FFFF */ addiu $a1, $zero, -1 -/* D50AC8 80240AD8 24060007 */ addiu $a2, $zero, 7 -/* D50ACC 80240ADC 0000382D */ daddu $a3, $zero, $zero -/* D50AD0 80240AE0 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D50AD4 80240AE4 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D50AD8 80240AE8 24020040 */ addiu $v0, $zero, 0x40 -/* D50ADC 80240AEC AFA00010 */ sw $zero, 0x10($sp) -/* D50AE0 80240AF0 AFA00014 */ sw $zero, 0x14($sp) -/* D50AE4 80240AF4 AFA20018 */ sw $v0, 0x18($sp) -/* D50AE8 80240AF8 0C0B77B9 */ jal func_802DDEE4 -/* D50AEC 80240AFC AFA0001C */ sw $zero, 0x1c($sp) -/* D50AF0 80240B00 4405A000 */ mfc1 $a1, $f20 -/* D50AF4 80240B04 4406B000 */ mfc1 $a2, $f22 -/* D50AF8 80240B08 3C07BF80 */ lui $a3, 0xbf80 -/* D50AFC 80240B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* D50B00 80240B10 0C019EC8 */ jal guRotateF -/* D50B04 80240B14 E7B60010 */ swc1 $f22, 0x10($sp) -/* D50B08 80240B18 4405A000 */ mfc1 $a1, $f20 -/* D50B0C 80240B1C 4406B000 */ mfc1 $a2, $f22 -/* D50B10 80240B20 3C07BF80 */ lui $a3, 0xbf80 -/* D50B14 80240B24 0200202D */ daddu $a0, $s0, $zero -/* D50B18 80240B28 0C019EC8 */ jal guRotateF -/* D50B1C 80240B2C E7B60010 */ swc1 $f22, 0x10($sp) -/* D50B20 80240B30 4405C000 */ mfc1 $a1, $f24 -/* D50B24 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D50B28 80240B38 3C073F80 */ lui $a3, 0x3f80 -/* D50B2C 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D50B30 80240B40 0C019EC8 */ jal guRotateF -/* D50B34 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D50B38 80240B48 0200202D */ daddu $a0, $s0, $zero -/* D50B3C 80240B4C 27A50020 */ addiu $a1, $sp, 0x20 -/* D50B40 80240B50 0C019D80 */ jal guMtxCatF -/* D50B44 80240B54 00A0302D */ daddu $a2, $a1, $zero -.L80240B58: -/* D50B48 80240B58 862200B0 */ lh $v0, 0xb0($s1) -/* D50B4C 80240B5C 3C013F00 */ lui $at, 0x3f00 -/* D50B50 80240B60 44812000 */ mtc1 $at, $f4 -/* D50B54 80240B64 00021023 */ negu $v0, $v0 -/* D50B58 80240B68 44820000 */ mtc1 $v0, $f0 -/* D50B5C 80240B6C 00000000 */ nop -/* D50B60 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* D50B64 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D50B68 80240B78 00000000 */ nop -/* D50B6C 80240B7C 4405B000 */ mfc1 $a1, $f22 -/* D50B70 80240B80 4407B000 */ mfc1 $a3, $f22 -/* D50B74 80240B84 44062000 */ mfc1 $a2, $f4 -/* D50B78 80240B88 0C019E40 */ jal guTranslateF -/* D50B7C 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* D50B80 80240B90 0240202D */ daddu $a0, $s2, $zero -/* D50B84 80240B94 27A50020 */ addiu $a1, $sp, 0x20 -/* D50B88 80240B98 0C019D80 */ jal guMtxCatF -/* D50B8C 80240B9C 00A0302D */ daddu $a2, $a1, $zero -/* D50B90 80240BA0 4405A000 */ mfc1 $a1, $f20 -/* D50B94 80240BA4 4406B000 */ mfc1 $a2, $f22 -/* D50B98 80240BA8 3C073F80 */ lui $a3, 0x3f80 -/* D50B9C 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* D50BA0 80240BB0 0C019EC8 */ jal guRotateF -/* D50BA4 80240BB4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D50BA8 80240BB8 27A40020 */ addiu $a0, $sp, 0x20 -/* D50BAC 80240BBC 0200282D */ daddu $a1, $s0, $zero -/* D50BB0 80240BC0 0C019D80 */ jal guMtxCatF -/* D50BB4 80240BC4 0080302D */ daddu $a2, $a0, $zero -/* D50BB8 80240BC8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D50BBC 80240BCC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D50BC0 80240BD0 4406B000 */ mfc1 $a2, $f22 -/* D50BC4 80240BD4 3C073F80 */ lui $a3, 0x3f80 -/* D50BC8 80240BD8 0C019EC8 */ jal guRotateF -/* D50BCC 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D50BD0 80240BE0 27A40020 */ addiu $a0, $sp, 0x20 -/* D50BD4 80240BE4 0200282D */ daddu $a1, $s0, $zero -/* D50BD8 80240BE8 0C019D80 */ jal guMtxCatF -/* D50BDC 80240BEC 0080302D */ daddu $a2, $a0, $zero -/* D50BE0 80240BF0 862200B0 */ lh $v0, 0xb0($s1) -/* D50BE4 80240BF4 3C013F00 */ lui $at, 0x3f00 -/* D50BE8 80240BF8 44812000 */ mtc1 $at, $f4 -/* D50BEC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D50BF0 80240C00 00000000 */ nop -/* D50BF4 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* D50BF8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D50BFC 80240C0C 00000000 */ nop -/* D50C00 80240C10 4405B000 */ mfc1 $a1, $f22 -/* D50C04 80240C14 4407B000 */ mfc1 $a3, $f22 -/* D50C08 80240C18 44062000 */ mfc1 $a2, $f4 -/* D50C0C 80240C1C 0C019E40 */ jal guTranslateF -/* D50C10 80240C20 0240202D */ daddu $a0, $s2, $zero -/* D50C14 80240C24 27A40020 */ addiu $a0, $sp, 0x20 -/* D50C18 80240C28 0240282D */ daddu $a1, $s2, $zero -/* D50C1C 80240C2C 0C019D80 */ jal guMtxCatF -/* D50C20 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D50C24 80240C34 3C013F36 */ lui $at, 0x3f36 -/* D50C28 80240C38 3421DB6E */ ori $at, $at, 0xdb6e -/* D50C2C 80240C3C 44810000 */ mtc1 $at, $f0 -/* D50C30 80240C40 0280202D */ daddu $a0, $s4, $zero -/* D50C34 80240C44 44050000 */ mfc1 $a1, $f0 -/* D50C38 80240C48 3C06BF36 */ lui $a2, 0xbf36 -/* D50C3C 80240C4C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D50C40 80240C50 0C019DF0 */ jal guScaleF -/* D50C44 80240C54 00A0382D */ daddu $a3, $a1, $zero -/* D50C48 80240C58 27A40020 */ addiu $a0, $sp, 0x20 -/* D50C4C 80240C5C 0280282D */ daddu $a1, $s4, $zero -/* D50C50 80240C60 0C019D80 */ jal guMtxCatF -/* D50C54 80240C64 0080302D */ daddu $a2, $a0, $zero -/* D50C58 80240C68 4600D687 */ neg.s $f26, $f26 -/* D50C5C 80240C6C 4405F000 */ mfc1 $a1, $f30 -/* D50C60 80240C70 4407E000 */ mfc1 $a3, $f28 -/* D50C64 80240C74 4406D000 */ mfc1 $a2, $f26 -/* D50C68 80240C78 0C019E40 */ jal guTranslateF -/* D50C6C 80240C7C 0240202D */ daddu $a0, $s2, $zero -/* D50C70 80240C80 27A40020 */ addiu $a0, $sp, 0x20 -/* D50C74 80240C84 0240282D */ daddu $a1, $s2, $zero -/* D50C78 80240C88 0C019D80 */ jal guMtxCatF -/* D50C7C 80240C8C 0080302D */ daddu $a2, $a0, $zero -/* D50C80 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D50C84 80240C94 3C0142B4 */ lui $at, 0x42b4 -/* D50C88 80240C98 44810000 */ mtc1 $at, $f0 -/* D50C8C 80240C9C 00000000 */ nop -/* D50C90 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D50C94 80240CA4 00000000 */ nop -/* D50C98 80240CA8 4500000A */ bc1f .L80240CD4 -/* D50C9C 80240CAC 24040001 */ addiu $a0, $zero, 1 -/* D50CA0 80240CB0 3C014387 */ lui $at, 0x4387 -/* D50CA4 80240CB4 44812000 */ mtc1 $at, $f4 -/* D50CA8 80240CB8 00000000 */ nop -/* D50CAC 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D50CB0 80240CC0 00000000 */ nop -/* D50CB4 80240CC4 45000004 */ bc1f .L80240CD8 -/* D50CB8 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 -/* D50CBC 80240CCC 3C041000 */ lui $a0, 0x1000 -/* D50CC0 80240CD0 34840001 */ ori $a0, $a0, 1 -.L80240CD4: -/* D50CC4 80240CD4 27A20020 */ addiu $v0, $sp, 0x20 -.L80240CD8: -/* D50CC8 80240CD8 AFA20010 */ sw $v0, 0x10($sp) -/* D50CCC 80240CDC 0000282D */ daddu $a1, $zero, $zero -/* D50CD0 80240CE0 00A0302D */ daddu $a2, $a1, $zero -/* D50CD4 80240CE4 0C0B7710 */ jal render_sprite -/* D50CD8 80240CE8 00A0382D */ daddu $a3, $a1, $zero -/* D50CDC 80240CEC 26730001 */ addiu $s3, $s3, 1 -/* D50CE0 80240CF0 2A620002 */ slti $v0, $s3, 2 -/* D50CE4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D50CE8 80240CF8 00000000 */ nop -/* D50CEC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) -/* D50CF0 80240D00 8FB60148 */ lw $s6, 0x148($sp) -/* D50CF4 80240D04 8FB50144 */ lw $s5, 0x144($sp) -/* D50CF8 80240D08 8FB40140 */ lw $s4, 0x140($sp) -/* D50CFC 80240D0C 8FB3013C */ lw $s3, 0x13c($sp) -/* D50D00 80240D10 8FB20138 */ lw $s2, 0x138($sp) -/* D50D04 80240D14 8FB10134 */ lw $s1, 0x134($sp) -/* D50D08 80240D18 8FB00130 */ lw $s0, 0x130($sp) -/* D50D0C 80240D1C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D50D10 80240D20 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D50D14 80240D24 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D50D18 80240D28 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D50D1C 80240D2C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D50D20 80240D30 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D50D24 80240D34 03E00008 */ jr $ra -/* D50D28 80240D38 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_80240D3C_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_80240D3C_D4FFF0.s deleted file mode 100644 index cf30699561..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_80240D3C_D4FFF0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_D50D2C -/* D50D2C 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D50D30 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D50D34 80240D44 0080802D */ daddu $s0, $a0, $zero -/* D50D38 80240D48 AFBF0014 */ sw $ra, 0x14($sp) -/* D50D3C 80240D4C 8E020088 */ lw $v0, 0x88($s0) -/* D50D40 80240D50 14400017 */ bnez $v0, .L80240DB0 -/* D50D44 80240D54 24020001 */ addiu $v0, $zero, 1 -/* D50D48 80240D58 8E030084 */ lw $v1, 0x84($s0) -/* D50D4C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D50D50 80240D60 00000000 */ nop -/* D50D54 80240D64 28620002 */ slti $v0, $v1, 2 -/* D50D58 80240D68 50400005 */ beql $v0, $zero, .L80240D80 -/* D50D5C 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* D50D60 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D50D64 80240D74 00000000 */ nop -/* D50D68 80240D78 08090378 */ j .L80240DE0 -/* D50D6C 80240D7C 00000000 */ nop -.L80240D80: -/* D50D70 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D50D74 80240D84 00000000 */ nop -/* D50D78 80240D88 08090378 */ j .L80240DE0 -/* D50D7C 80240D8C 00000000 */ nop -.L80240D90: -/* D50D80 80240D90 3C048024 */ lui $a0, 0x8024 -/* D50D84 80240D94 24840E84 */ addiu $a0, $a0, 0xe84 -/* D50D88 80240D98 08090374 */ j .L80240DD0 -/* D50D8C 80240D9C 00000000 */ nop -.L80240DA0: -/* D50D90 80240DA0 3C048024 */ lui $a0, 0x8024 -/* D50D94 80240DA4 24840EEC */ addiu $a0, $a0, 0xeec -/* D50D98 80240DA8 08090374 */ j .L80240DD0 -/* D50D9C 80240DAC 00000000 */ nop -.L80240DB0: -/* D50DA0 80240DB0 8E020084 */ lw $v0, 0x84($s0) -/* D50DA4 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D50DA8 80240DB8 00000000 */ nop -/* D50DAC 80240DBC 28420002 */ slti $v0, $v0, 2 -/* D50DB0 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D50DB4 80240DC4 00000000 */ nop -.L80240DC8: -/* D50DB8 80240DC8 3C048024 */ lui $a0, 0x8024 -/* D50DBC 80240DCC 24840EB8 */ addiu $a0, $a0, 0xeb8 -.L80240DD0: -/* D50DC0 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 -/* D50DC4 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* D50DC8 80240DD8 8E03013C */ lw $v1, 0x13c($s0) -/* D50DCC 80240DDC AC620004 */ sw $v0, 4($v1) -.L80240DE0: -/* D50DD0 80240DE0 0C00EAD2 */ jal get_npc_safe -/* D50DD4 80240DE4 2404FFFC */ addiu $a0, $zero, -4 -/* D50DD8 80240DE8 0040282D */ daddu $a1, $v0, $zero -/* D50DDC 80240DEC 10A00021 */ beqz $a1, .L80240E74 -/* D50DE0 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* D50DE4 80240DF4 8E020088 */ lw $v0, 0x88($s0) -/* D50DE8 80240DF8 14400014 */ bnez $v0, .L80240E4C -/* D50DEC 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* D50DF0 80240E00 8E040084 */ lw $a0, 0x84($s0) -/* D50DF4 80240E04 10820016 */ beq $a0, $v0, .L80240E60 -/* D50DF8 80240E08 28820002 */ slti $v0, $a0, 2 -/* D50DFC 80240E0C 10400005 */ beqz $v0, .L80240E24 -/* D50E00 80240E10 24020002 */ addiu $v0, $zero, 2 -/* D50E04 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D50E08 80240E18 00000000 */ nop -/* D50E0C 80240E1C 0809039D */ j .L80240E74 -/* D50E10 80240E20 00000000 */ nop -.L80240E24: -/* D50E14 80240E24 10820006 */ beq $a0, $v0, .L80240E40 -/* D50E18 80240E28 24020002 */ addiu $v0, $zero, 2 -/* D50E1C 80240E2C 0809039D */ j .L80240E74 -/* D50E20 80240E30 00000000 */ nop -.L80240E34: -/* D50E24 80240E34 8CA20000 */ lw $v0, ($a1) -/* D50E28 80240E38 0809039A */ j .L80240E68 -/* D50E2C 80240E3C 3C03000A */ lui $v1, 0xa -.L80240E40: -/* D50E30 80240E40 8CA20000 */ lw $v0, ($a1) -/* D50E34 80240E44 0809039A */ j .L80240E68 -/* D50E38 80240E48 3C030002 */ lui $v1, 2 -.L80240E4C: -/* D50E3C 80240E4C 8E020084 */ lw $v0, 0x84($s0) -/* D50E40 80240E50 04400007 */ bltz $v0, .L80240E70 -/* D50E44 80240E54 28420002 */ slti $v0, $v0, 2 -/* D50E48 80240E58 10400006 */ beqz $v0, .L80240E74 -/* D50E4C 80240E5C 24020002 */ addiu $v0, $zero, 2 -.L80240E60: -/* D50E50 80240E60 8CA20000 */ lw $v0, ($a1) -/* D50E54 80240E64 3C030008 */ lui $v1, 8 -.L80240E68: -/* D50E58 80240E68 00431025 */ or $v0, $v0, $v1 -/* D50E5C 80240E6C ACA20000 */ sw $v0, ($a1) -.L80240E70: -/* D50E60 80240E70 24020002 */ addiu $v0, $zero, 2 -.L80240E74: -/* D50E64 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* D50E68 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* D50E6C 80240E7C 03E00008 */ jr $ra -/* D50E70 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_80240E84_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_80240E84_D4FFF0.s deleted file mode 100644 index 427114b978..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_80240E84_D4FFF0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D50E74 -/* D50E74 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D50E78 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D50E7C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D50E80 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D50E84 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D50E88 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D50E8C 80240E9C 3C03000A */ lui $v1, 0xa -/* D50E90 80240EA0 8C820000 */ lw $v0, ($a0) -/* D50E94 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D50E98 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D50E9C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D50EA0 80240EB0 03E00008 */ jr $ra -/* D50EA4 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_80240EB8_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_80240EB8_D4FFF0.s deleted file mode 100644 index 0edde74182..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_80240EB8_D4FFF0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D50EA8 -/* D50EA8 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D50EAC 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D50EB0 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D50EB4 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D50EB8 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D50EBC 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D50EC0 80240ED0 3C030008 */ lui $v1, 8 -/* D50EC4 80240ED4 8C820000 */ lw $v0, ($a0) -/* D50EC8 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D50ECC 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D50ED0 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D50ED4 80240EE4 03E00008 */ jr $ra -/* D50ED8 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_80240EEC_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_80240EEC_D4FFF0.s deleted file mode 100644 index eff97502c0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_80240EEC_D4FFF0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D50EDC -/* D50EDC 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D50EE0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D50EE4 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D50EE8 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D50EEC 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D50EF0 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D50EF4 80240F04 3C030002 */ lui $v1, 2 -/* D50EF8 80240F08 8C820000 */ lw $v0, ($a0) -/* D50EFC 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D50F00 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D50F04 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D50F08 80240F18 03E00008 */ jr $ra -/* D50F0C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_80240F20_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_80240F20_D4FFF0.s deleted file mode 100644 index b7b7babdbc..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_80240F20_D4FFF0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D50F10 -/* D50F10 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D50F14 80240F24 AFB10014 */ sw $s1, 0x14($sp) -/* D50F18 80240F28 0080882D */ daddu $s1, $a0, $zero -/* D50F1C 80240F2C AFBF0018 */ sw $ra, 0x18($sp) -/* D50F20 80240F30 AFB00010 */ sw $s0, 0x10($sp) -/* D50F24 80240F34 8E30000C */ lw $s0, 0xc($s1) -/* D50F28 80240F38 8E050000 */ lw $a1, ($s0) -/* D50F2C 80240F3C 0C0B1EAF */ jal get_variable -/* D50F30 80240F40 26100004 */ addiu $s0, $s0, 4 -/* D50F34 80240F44 0C00EAD2 */ jal get_npc_safe -/* D50F38 80240F48 0040202D */ daddu $a0, $v0, $zero -/* D50F3C 80240F4C 10400005 */ beqz $v0, .L80240F64 -/* D50F40 80240F50 00000000 */ nop -/* D50F44 80240F54 8E050000 */ lw $a1, ($s0) -/* D50F48 80240F58 844600A8 */ lh $a2, 0xa8($v0) -/* D50F4C 80240F5C 0C0B2026 */ jal set_variable -/* D50F50 80240F60 0220202D */ daddu $a0, $s1, $zero -.L80240F64: -/* D50F54 80240F64 8FBF0018 */ lw $ra, 0x18($sp) -/* D50F58 80240F68 8FB10014 */ lw $s1, 0x14($sp) -/* D50F5C 80240F6C 8FB00010 */ lw $s0, 0x10($sp) -/* D50F60 80240F70 24020002 */ addiu $v0, $zero, 2 -/* D50F64 80240F74 03E00008 */ jr $ra -/* D50F68 80240F78 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_80240F7C_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_80240F7C_D4FFF0.s deleted file mode 100644 index 93e80c3516..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_80240F7C_D4FFF0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F7C_D50F6C -/* D50F6C 80240F7C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D50F70 80240F80 AFB10014 */ sw $s1, 0x14($sp) -/* D50F74 80240F84 0080882D */ daddu $s1, $a0, $zero -/* D50F78 80240F88 AFBF0024 */ sw $ra, 0x24($sp) -/* D50F7C 80240F8C AFB40020 */ sw $s4, 0x20($sp) -/* D50F80 80240F90 AFB3001C */ sw $s3, 0x1c($sp) -/* D50F84 80240F94 AFB20018 */ sw $s2, 0x18($sp) -/* D50F88 80240F98 AFB00010 */ sw $s0, 0x10($sp) -/* D50F8C 80240F9C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* D50F90 80240FA0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* D50F94 80240FA4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* D50F98 80240FA8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* D50F9C 80240FAC F7B40028 */ sdc1 $f20, 0x28($sp) -/* D50FA0 80240FB0 8E30000C */ lw $s0, 0xc($s1) -/* D50FA4 80240FB4 8E130000 */ lw $s3, ($s0) -/* D50FA8 80240FB8 26100004 */ addiu $s0, $s0, 4 -/* D50FAC 80240FBC 0C0B1EAF */ jal get_variable -/* D50FB0 80240FC0 0260282D */ daddu $a1, $s3, $zero -/* D50FB4 80240FC4 4482E000 */ mtc1 $v0, $f28 -/* D50FB8 80240FC8 00000000 */ nop -/* D50FBC 80240FCC 4680E720 */ cvt.s.w $f28, $f28 -/* D50FC0 80240FD0 8E140000 */ lw $s4, ($s0) -/* D50FC4 80240FD4 26100004 */ addiu $s0, $s0, 4 -/* D50FC8 80240FD8 0220202D */ daddu $a0, $s1, $zero -/* D50FCC 80240FDC 0C0B1EAF */ jal get_variable -/* D50FD0 80240FE0 0280282D */ daddu $a1, $s4, $zero -/* D50FD4 80240FE4 4482D000 */ mtc1 $v0, $f26 -/* D50FD8 80240FE8 00000000 */ nop -/* D50FDC 80240FEC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D50FE0 80240FF0 8E100000 */ lw $s0, ($s0) -/* D50FE4 80240FF4 0220202D */ daddu $a0, $s1, $zero -/* D50FE8 80240FF8 0C0B1EAF */ jal get_variable -/* D50FEC 80240FFC 0200282D */ daddu $a1, $s0, $zero -/* D50FF0 80241000 4482C000 */ mtc1 $v0, $f24 -/* D50FF4 80241004 00000000 */ nop -/* D50FF8 80241008 4680C620 */ cvt.s.w $f24, $f24 -/* D50FFC 8024100C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* D51000 80241010 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* D51004 80241014 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D51008 80241018 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D5100C 8024101C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* D51010 80241020 44800000 */ mtc1 $zero, $f0 -/* D51014 80241024 00031080 */ sll $v0, $v1, 2 -/* D51018 80241028 00431021 */ addu $v0, $v0, $v1 -/* D5101C 8024102C 00021080 */ sll $v0, $v0, 2 -/* D51020 80241030 00431023 */ subu $v0, $v0, $v1 -/* D51024 80241034 000218C0 */ sll $v1, $v0, 3 -/* D51028 80241038 00431021 */ addu $v0, $v0, $v1 -/* D5102C 8024103C 000210C0 */ sll $v0, $v0, 3 -/* D51030 80241040 46001032 */ c.eq.s $f2, $f0 -/* D51034 80241044 3C01800B */ lui $at, 0x800b -/* D51038 80241048 00220821 */ addu $at, $at, $v0 -/* D5103C 8024104C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D51040 80241050 45000005 */ bc1f .L80241068 -/* D51044 80241054 00000000 */ nop -/* D51048 80241058 3C0142C8 */ lui $at, 0x42c8 -/* D5104C 8024105C 44810000 */ mtc1 $at, $f0 -/* D51050 80241060 0809041E */ j .L80241078 -/* D51054 80241064 4600B581 */ sub.s $f22, $f22, $f0 -.L80241068: -/* D51058 80241068 3C0142C8 */ lui $at, 0x42c8 -/* D5105C 8024106C 44810000 */ mtc1 $at, $f0 -/* D51060 80241070 00000000 */ nop -/* D51064 80241074 4600B580 */ add.s $f22, $f22, $f0 -.L80241078: -/* D51068 80241078 0C00A6C9 */ jal clamp_angle -/* D5106C 8024107C 4600B306 */ mov.s $f12, $f22 -/* D51070 80241080 46000586 */ mov.s $f22, $f0 -/* D51074 80241084 3C014170 */ lui $at, 0x4170 -/* D51078 80241088 4481A000 */ mtc1 $at, $f20 -/* D5107C 8024108C 0C00A8BB */ jal sin_deg -/* D51080 80241090 4600B306 */ mov.s $f12, $f22 -/* D51084 80241094 46140002 */ mul.s $f0, $f0, $f20 -/* D51088 80241098 00000000 */ nop -/* D5108C 8024109C 864200B0 */ lh $v0, 0xb0($s2) -/* D51090 802410A0 3C013F00 */ lui $at, 0x3f00 -/* D51094 802410A4 44812000 */ mtc1 $at, $f4 -/* D51098 802410A8 44821000 */ mtc1 $v0, $f2 -/* D5109C 802410AC 00000000 */ nop -/* D510A0 802410B0 468010A0 */ cvt.s.w $f2, $f2 -/* D510A4 802410B4 46041082 */ mul.s $f2, $f2, $f4 -/* D510A8 802410B8 00000000 */ nop -/* D510AC 802410BC 4600E700 */ add.s $f28, $f28, $f0 -/* D510B0 802410C0 4602D680 */ add.s $f26, $f26, $f2 -/* D510B4 802410C4 0C00A8D4 */ jal cos_deg -/* D510B8 802410C8 4600B306 */ mov.s $f12, $f22 -/* D510BC 802410CC 46140002 */ mul.s $f0, $f0, $f20 -/* D510C0 802410D0 00000000 */ nop -/* D510C4 802410D4 0220202D */ daddu $a0, $s1, $zero -/* D510C8 802410D8 0260282D */ daddu $a1, $s3, $zero -/* D510CC 802410DC 4600E18D */ trunc.w.s $f6, $f28 -/* D510D0 802410E0 44063000 */ mfc1 $a2, $f6 -/* D510D4 802410E4 0C0B2026 */ jal set_variable -/* D510D8 802410E8 4600C601 */ sub.s $f24, $f24, $f0 -/* D510DC 802410EC 0220202D */ daddu $a0, $s1, $zero -/* D510E0 802410F0 4600D18D */ trunc.w.s $f6, $f26 -/* D510E4 802410F4 44063000 */ mfc1 $a2, $f6 -/* D510E8 802410F8 0C0B2026 */ jal set_variable -/* D510EC 802410FC 0280282D */ daddu $a1, $s4, $zero -/* D510F0 80241100 0220202D */ daddu $a0, $s1, $zero -/* D510F4 80241104 4600C18D */ trunc.w.s $f6, $f24 -/* D510F8 80241108 44063000 */ mfc1 $a2, $f6 -/* D510FC 8024110C 0C0B2026 */ jal set_variable -/* D51100 80241110 0200282D */ daddu $a1, $s0, $zero -/* D51104 80241114 8FBF0024 */ lw $ra, 0x24($sp) -/* D51108 80241118 8FB40020 */ lw $s4, 0x20($sp) -/* D5110C 8024111C 8FB3001C */ lw $s3, 0x1c($sp) -/* D51110 80241120 8FB20018 */ lw $s2, 0x18($sp) -/* D51114 80241124 8FB10014 */ lw $s1, 0x14($sp) -/* D51118 80241128 8FB00010 */ lw $s0, 0x10($sp) -/* D5111C 8024112C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* D51120 80241130 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* D51124 80241134 D7B80038 */ ldc1 $f24, 0x38($sp) -/* D51128 80241138 D7B60030 */ ldc1 $f22, 0x30($sp) -/* D5112C 8024113C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D51130 80241140 24020002 */ addiu $v0, $zero, 2 -/* D51134 80241144 03E00008 */ jr $ra -/* D51138 80241148 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_8024114C_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_8024114C_D4FFF0.s deleted file mode 100644 index cc938450c9..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_8024114C_D4FFF0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024114C_D5113C -/* D5113C 8024114C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D51140 80241150 AFBF0010 */ sw $ra, 0x10($sp) -/* D51144 80241154 10A00003 */ beqz $a1, .L80241164 -/* D51148 80241158 8C86000C */ lw $a2, 0xc($a0) -/* D5114C 8024115C 3C018024 */ lui $at, 0x8024 -/* D51150 80241160 AC202ACC */ sw $zero, 0x2acc($at) -.L80241164: -/* D51154 80241164 3C038024 */ lui $v1, 0x8024 -/* D51158 80241168 24632ACC */ addiu $v1, $v1, 0x2acc -/* D5115C 8024116C 8C620000 */ lw $v0, ($v1) -/* D51160 80241170 54400003 */ bnel $v0, $zero, .L80241180 -/* D51164 80241174 AC600000 */ sw $zero, ($v1) -/* D51168 80241178 08090465 */ j .L80241194 -/* D5116C 8024117C 0000102D */ daddu $v0, $zero, $zero -.L80241180: -/* D51170 80241180 8CC50000 */ lw $a1, ($a2) -/* D51174 80241184 3C068024 */ lui $a2, 0x8024 -/* D51178 80241188 0C0B2026 */ jal set_variable -/* D5117C 8024118C 8CC62AD0 */ lw $a2, 0x2ad0($a2) -/* D51180 80241190 24020002 */ addiu $v0, $zero, 2 -.L80241194: -/* D51184 80241194 8FBF0010 */ lw $ra, 0x10($sp) -/* D51188 80241198 03E00008 */ jr $ra -/* D5118C 8024119C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_802411A0_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_802411A0_D4FFF0.s deleted file mode 100644 index 14b66f6b98..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_802411A0_D4FFF0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411A0_D51190 -/* D51190 802411A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D51194 802411A4 AFBF0010 */ sw $ra, 0x10($sp) -/* D51198 802411A8 8C82000C */ lw $v0, 0xc($a0) -/* D5119C 802411AC 0C0B1EAF */ jal get_variable -/* D511A0 802411B0 8C450000 */ lw $a1, ($v0) -/* D511A4 802411B4 3C018024 */ lui $at, 0x8024 -/* D511A8 802411B8 AC222AD0 */ sw $v0, 0x2ad0($at) -/* D511AC 802411BC 24020002 */ addiu $v0, $zero, 2 -/* D511B0 802411C0 8FBF0010 */ lw $ra, 0x10($sp) -/* D511B4 802411C4 24030001 */ addiu $v1, $zero, 1 -/* D511B8 802411C8 3C018024 */ lui $at, 0x8024 -/* D511BC 802411CC AC232ACC */ sw $v1, 0x2acc($at) -/* D511C0 802411D0 03E00008 */ jr $ra -/* D511C4 802411D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_802411D8_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_802411D8_D4FFF0.s deleted file mode 100644 index ebee9ed0ac..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_802411D8_D4FFF0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411D8_D511C8 -/* D511C8 802411D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D511CC 802411DC AFBF0010 */ sw $ra, 0x10($sp) -/* D511D0 802411E0 8C82000C */ lw $v0, 0xc($a0) -/* D511D4 802411E4 0C0B1EAF */ jal get_variable -/* D511D8 802411E8 8C450000 */ lw $a1, ($v0) -/* D511DC 802411EC 0040182D */ daddu $v1, $v0, $zero -/* D511E0 802411F0 10600012 */ beqz $v1, .L8024123C -/* D511E4 802411F4 0000202D */ daddu $a0, $zero, $zero -/* D511E8 802411F8 8C620000 */ lw $v0, ($v1) -/* D511EC 802411FC 5040000A */ beql $v0, $zero, .L80241228 -/* D511F0 80241200 00041080 */ sll $v0, $a0, 2 -/* D511F4 80241204 3C058024 */ lui $a1, 0x8024 -/* D511F8 80241208 24A53CC0 */ addiu $a1, $a1, 0x3cc0 -.L8024120C: -/* D511FC 8024120C 24630004 */ addiu $v1, $v1, 4 -/* D51200 80241210 24840001 */ addiu $a0, $a0, 1 -/* D51204 80241214 ACA20000 */ sw $v0, ($a1) -/* D51208 80241218 8C620000 */ lw $v0, ($v1) -/* D5120C 8024121C 1440FFFB */ bnez $v0, .L8024120C -/* D51210 80241220 24A50004 */ addiu $a1, $a1, 4 -/* D51214 80241224 00041080 */ sll $v0, $a0, 2 -.L80241228: -/* D51218 80241228 3C018024 */ lui $at, 0x8024 -/* D5121C 8024122C 00220821 */ addu $at, $at, $v0 -/* D51220 80241230 AC203CC0 */ sw $zero, 0x3cc0($at) -/* D51224 80241234 08090499 */ j .L80241264 -/* D51228 80241238 00000000 */ nop -.L8024123C: -/* D5122C 8024123C 3C038024 */ lui $v1, 0x8024 -/* D51230 80241240 24633CC0 */ addiu $v1, $v1, 0x3cc0 -/* D51234 80241244 0060282D */ daddu $a1, $v1, $zero -.L80241248: -/* D51238 80241248 24820010 */ addiu $v0, $a0, 0x10 -/* D5123C 8024124C AC620000 */ sw $v0, ($v1) -/* D51240 80241250 24630004 */ addiu $v1, $v1, 4 -/* D51244 80241254 24840001 */ addiu $a0, $a0, 1 -/* D51248 80241258 28820070 */ slti $v0, $a0, 0x70 -/* D5124C 8024125C 1440FFFA */ bnez $v0, .L80241248 -/* D51250 80241260 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241264: -/* D51254 80241264 8FBF0010 */ lw $ra, 0x10($sp) -/* D51258 80241268 24020002 */ addiu $v0, $zero, 2 -/* D5125C 8024126C 03E00008 */ jr $ra -/* D51260 80241270 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_80241274_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_80241274_D4FFF0.s deleted file mode 100644 index af3d1d79f8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_80241274_D4FFF0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241274_D51264 -/* D51264 80241274 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D51268 80241278 AFBF0010 */ sw $ra, 0x10($sp) -/* D5126C 8024127C 8C82000C */ lw $v0, 0xc($a0) -/* D51270 80241280 0C0B1EAF */ jal get_variable -/* D51274 80241284 8C450000 */ lw $a1, ($v0) -/* D51278 80241288 0040182D */ daddu $v1, $v0, $zero -/* D5127C 8024128C 10600012 */ beqz $v1, .L802412D8 -/* D51280 80241290 0000202D */ daddu $a0, $zero, $zero -/* D51284 80241294 8C620000 */ lw $v0, ($v1) -/* D51288 80241298 5040000A */ beql $v0, $zero, .L802412C4 -/* D5128C 8024129C 00041080 */ sll $v0, $a0, 2 -/* D51290 802412A0 3C058024 */ lui $a1, 0x8024 -/* D51294 802412A4 24A53E88 */ addiu $a1, $a1, 0x3e88 -.L802412A8: -/* D51298 802412A8 24630004 */ addiu $v1, $v1, 4 -/* D5129C 802412AC 24840001 */ addiu $a0, $a0, 1 -/* D512A0 802412B0 ACA20000 */ sw $v0, ($a1) -/* D512A4 802412B4 8C620000 */ lw $v0, ($v1) -/* D512A8 802412B8 1440FFFB */ bnez $v0, .L802412A8 -/* D512AC 802412BC 24A50004 */ addiu $a1, $a1, 4 -/* D512B0 802412C0 00041080 */ sll $v0, $a0, 2 -.L802412C4: -/* D512B4 802412C4 3C018024 */ lui $at, 0x8024 -/* D512B8 802412C8 00220821 */ addu $at, $at, $v0 -/* D512BC 802412CC AC203E88 */ sw $zero, 0x3e88($at) -/* D512C0 802412D0 080904C0 */ j .L80241300 -/* D512C4 802412D4 00000000 */ nop -.L802412D8: -/* D512C8 802412D8 3C038024 */ lui $v1, 0x8024 -/* D512CC 802412DC 24633E88 */ addiu $v1, $v1, 0x3e88 -/* D512D0 802412E0 0060282D */ daddu $a1, $v1, $zero -.L802412E4: -/* D512D4 802412E4 24820080 */ addiu $v0, $a0, 0x80 -/* D512D8 802412E8 AC620000 */ sw $v0, ($v1) -/* D512DC 802412EC 24630004 */ addiu $v1, $v1, 4 -/* D512E0 802412F0 24840001 */ addiu $a0, $a0, 1 -/* D512E4 802412F4 2882005B */ slti $v0, $a0, 0x5b -/* D512E8 802412F8 1440FFFA */ bnez $v0, .L802412E4 -/* D512EC 802412FC ACA0016C */ sw $zero, 0x16c($a1) -.L80241300: -/* D512F0 80241300 8FBF0010 */ lw $ra, 0x10($sp) -/* D512F4 80241304 24020002 */ addiu $v0, $zero, 2 -/* D512F8 80241308 03E00008 */ jr $ra -/* D512FC 8024130C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_80241478_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_80241478_D4FFF0.s deleted file mode 100644 index 4d3ddeccf2..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_80241478_D4FFF0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241478_D51468 -/* D51468 80241478 AC800084 */ sw $zero, 0x84($a0) -/* D5146C 8024147C 3C038011 */ lui $v1, %hi(gPlayerActionState) -/* D51470 80241480 8063F07C */ lb $v1, %lo(gPlayerActionState)($v1) -/* D51474 80241484 2402000E */ addiu $v0, $zero, 0xe -/* D51478 80241488 10620004 */ beq $v1, $v0, .L8024149C -/* D5147C 8024148C 24020001 */ addiu $v0, $zero, 1 -/* D51480 80241490 24020010 */ addiu $v0, $zero, 0x10 -/* D51484 80241494 14620002 */ bne $v1, $v0, .L802414A0 -/* D51488 80241498 24020001 */ addiu $v0, $zero, 1 -.L8024149C: -/* D5148C 8024149C AC820084 */ sw $v0, 0x84($a0) -.L802414A0: -/* D51490 802414A0 03E00008 */ jr $ra -/* D51494 802414A4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_802414A8_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_802414A8_D4FFF0.s deleted file mode 100644 index 7de4d29365..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_802414A8_D4FFF0.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414A8_D51498 -/* D51498 802414A8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D5149C 802414AC AFB10014 */ sw $s1, 0x14($sp) -/* D514A0 802414B0 0080882D */ daddu $s1, $a0, $zero -/* D514A4 802414B4 AFBF001C */ sw $ra, 0x1c($sp) -/* D514A8 802414B8 AFB20018 */ sw $s2, 0x18($sp) -/* D514AC 802414BC AFB00010 */ sw $s0, 0x10($sp) -/* D514B0 802414C0 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* D514B4 802414C4 F7B80030 */ sdc1 $f24, 0x30($sp) -/* D514B8 802414C8 F7B60028 */ sdc1 $f22, 0x28($sp) -/* D514BC 802414CC F7B40020 */ sdc1 $f20, 0x20($sp) -/* D514C0 802414D0 8E30000C */ lw $s0, 0xc($s1) -/* D514C4 802414D4 8E050000 */ lw $a1, ($s0) -/* D514C8 802414D8 0C0B1EAF */ jal get_variable -/* D514CC 802414DC 26100004 */ addiu $s0, $s0, 4 -/* D514D0 802414E0 8E050000 */ lw $a1, ($s0) -/* D514D4 802414E4 26100004 */ addiu $s0, $s0, 4 -/* D514D8 802414E8 0220202D */ daddu $a0, $s1, $zero -/* D514DC 802414EC 0C0B210B */ jal get_float_variable -/* D514E0 802414F0 0040902D */ daddu $s2, $v0, $zero -/* D514E4 802414F4 8E050000 */ lw $a1, ($s0) -/* D514E8 802414F8 26100004 */ addiu $s0, $s0, 4 -/* D514EC 802414FC 0220202D */ daddu $a0, $s1, $zero -/* D514F0 80241500 0C0B210B */ jal get_float_variable -/* D514F4 80241504 46000686 */ mov.s $f26, $f0 -/* D514F8 80241508 0220202D */ daddu $a0, $s1, $zero -/* D514FC 8024150C 8E050000 */ lw $a1, ($s0) -/* D51500 80241510 0C0B210B */ jal get_float_variable -/* D51504 80241514 46000606 */ mov.s $f24, $f0 -/* D51508 80241518 0220202D */ daddu $a0, $s1, $zero -/* D5150C 8024151C 3C05FD05 */ lui $a1, 0xfd05 -/* D51510 80241520 34A50F80 */ ori $a1, $a1, 0xf80 -/* D51514 80241524 0C0B210B */ jal get_float_variable -/* D51518 80241528 46000586 */ mov.s $f22, $f0 -/* D5151C 8024152C 2402FFFF */ addiu $v0, $zero, -1 -/* D51520 80241530 1242000A */ beq $s2, $v0, .L8024155C -/* D51524 80241534 46000506 */ mov.s $f20, $f0 -/* D51528 80241538 0C04417A */ jal get_entity_by_index -/* D5152C 8024153C 0240202D */ daddu $a0, $s2, $zero -/* D51530 80241540 0040182D */ daddu $v1, $v0, $zero -/* D51534 80241544 24020002 */ addiu $v0, $zero, 2 -/* D51538 80241548 4614C000 */ add.s $f0, $f24, $f20 -/* D5153C 8024154C E47A0048 */ swc1 $f26, 0x48($v1) -/* D51540 80241550 E4760050 */ swc1 $f22, 0x50($v1) -/* D51544 80241554 08090558 */ j .L80241560 -/* D51548 80241558 E460004C */ swc1 $f0, 0x4c($v1) -.L8024155C: -/* D5154C 8024155C 24020002 */ addiu $v0, $zero, 2 -.L80241560: -/* D51550 80241560 8FBF001C */ lw $ra, 0x1c($sp) -/* D51554 80241564 8FB20018 */ lw $s2, 0x18($sp) -/* D51558 80241568 8FB10014 */ lw $s1, 0x14($sp) -/* D5155C 8024156C 8FB00010 */ lw $s0, 0x10($sp) -/* D51560 80241570 D7BA0038 */ ldc1 $f26, 0x38($sp) -/* D51564 80241574 D7B80030 */ ldc1 $f24, 0x30($sp) -/* D51568 80241578 D7B60028 */ ldc1 $f22, 0x28($sp) -/* D5156C 8024157C D7B40020 */ ldc1 $f20, 0x20($sp) -/* D51570 80241580 03E00008 */ jr $ra -/* D51574 80241584 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_pra/pra_02/func_80241588_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/func_80241588_D4FFF0.s deleted file mode 100644 index 626acf2d49..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/func_80241588_D4FFF0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241588_D51578 -/* D51578 80241588 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D5157C 8024158C AFBF0010 */ sw $ra, 0x10($sp) -/* D51580 80241590 0C04417A */ jal get_entity_by_index -/* D51584 80241594 8C840084 */ lw $a0, 0x84($a0) -/* D51588 80241598 0040182D */ daddu $v1, $v0, $zero -/* D5158C 8024159C 8C640000 */ lw $a0, ($v1) -/* D51590 802415A0 3C050010 */ lui $a1, 0x10 -/* D51594 802415A4 00852025 */ or $a0, $a0, $a1 -/* D51598 802415A8 AC640000 */ sw $a0, ($v1) -/* D5159C 802415AC 8FBF0010 */ lw $ra, 0x10($sp) -/* D515A0 802415B0 24020002 */ addiu $v0, $zero, 2 -/* D515A4 802415B4 03E00008 */ jr $ra -/* D515A8 802415B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_03/func_80240020_D53CB0.s b/asm/nonmatchings/world/area_pra/pra_03/func_80240020_D53CB0.s deleted file mode 100644 index 0c78e6470f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_03/func_80240020_D53CB0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D53CD0 -/* D53CD0 80240020 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* D53CD4 80240024 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* D53CD8 80240028 C4620080 */ lwc1 $f2, 0x80($v1) -/* D53CDC 8024002C 44800000 */ mtc1 $zero, $f0 -/* D53CE0 80240030 00000000 */ nop -/* D53CE4 80240034 4602003E */ c.le.s $f0, $f2 -/* D53CE8 80240038 00000000 */ nop -/* D53CEC 8024003C 4500000A */ bc1f .L80240068 -/* D53CF0 80240040 00000000 */ nop -/* D53CF4 80240044 3C014334 */ lui $at, 0x4334 -/* D53CF8 80240048 44810000 */ mtc1 $at, $f0 -/* D53CFC 8024004C 00000000 */ nop -/* D53D00 80240050 4600103C */ c.lt.s $f2, $f0 -/* D53D04 80240054 00000000 */ nop -/* D53D08 80240058 45000006 */ bc1f .L80240074 -/* D53D0C 8024005C 24020096 */ addiu $v0, $zero, 0x96 -/* D53D10 80240060 AC820084 */ sw $v0, 0x84($a0) -/* D53D14 80240064 C4620080 */ lwc1 $f2, 0x80($v1) -.L80240068: -/* D53D18 80240068 3C014334 */ lui $at, 0x4334 -/* D53D1C 8024006C 44810000 */ mtc1 $at, $f0 -/* D53D20 80240070 00000000 */ nop -.L80240074: -/* D53D24 80240074 4602003E */ c.le.s $f0, $f2 -/* D53D28 80240078 00000000 */ nop -/* D53D2C 8024007C 45000009 */ bc1f .L802400A4 -/* D53D30 80240080 00000000 */ nop -/* D53D34 80240084 3C0143B4 */ lui $at, 0x43b4 -/* D53D38 80240088 44810000 */ mtc1 $at, $f0 -/* D53D3C 8024008C 00000000 */ nop -/* D53D40 80240090 4600103C */ c.lt.s $f2, $f0 -/* D53D44 80240094 00000000 */ nop -/* D53D48 80240098 45000002 */ bc1f .L802400A4 -/* D53D4C 8024009C 2402005F */ addiu $v0, $zero, 0x5f -/* D53D50 802400A0 AC820084 */ sw $v0, 0x84($a0) -.L802400A4: -/* D53D54 802400A4 03E00008 */ jr $ra -/* D53D58 802400A8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_pra/pra_03/func_802400AC_D53CB0.s b/asm/nonmatchings/world/area_pra/pra_03/func_802400AC_D53CB0.s deleted file mode 100644 index 50c7ab2780..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_03/func_802400AC_D53CB0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400AC_D53D5C -/* D53D5C 802400AC 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* D53D60 802400B0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* D53D64 802400B4 C4620080 */ lwc1 $f2, 0x80($v1) -/* D53D68 802400B8 44800000 */ mtc1 $zero, $f0 -/* D53D6C 802400BC 00000000 */ nop -/* D53D70 802400C0 4602003E */ c.le.s $f0, $f2 -/* D53D74 802400C4 00000000 */ nop -/* D53D78 802400C8 4500000A */ bc1f .L802400F4 -/* D53D7C 802400CC 00000000 */ nop -/* D53D80 802400D0 3C014334 */ lui $at, 0x4334 -/* D53D84 802400D4 44810000 */ mtc1 $at, $f0 -/* D53D88 802400D8 00000000 */ nop -/* D53D8C 802400DC 4600103C */ c.lt.s $f2, $f0 -/* D53D90 802400E0 00000000 */ nop -/* D53D94 802400E4 45000006 */ bc1f .L80240100 -/* D53D98 802400E8 240200A5 */ addiu $v0, $zero, 0xa5 -/* D53D9C 802400EC AC820084 */ sw $v0, 0x84($a0) -/* D53DA0 802400F0 C4620080 */ lwc1 $f2, 0x80($v1) -.L802400F4: -/* D53DA4 802400F4 3C014334 */ lui $at, 0x4334 -/* D53DA8 802400F8 44810000 */ mtc1 $at, $f0 -/* D53DAC 802400FC 00000000 */ nop -.L80240100: -/* D53DB0 80240100 4602003E */ c.le.s $f0, $f2 -/* D53DB4 80240104 00000000 */ nop -/* D53DB8 80240108 45000009 */ bc1f .L80240130 -/* D53DBC 8024010C 00000000 */ nop -/* D53DC0 80240110 3C0143B4 */ lui $at, 0x43b4 -/* D53DC4 80240114 44810000 */ mtc1 $at, $f0 -/* D53DC8 80240118 00000000 */ nop -/* D53DCC 8024011C 4600103C */ c.lt.s $f2, $f0 -/* D53DD0 80240120 00000000 */ nop -/* D53DD4 80240124 45000002 */ bc1f .L80240130 -/* D53DD8 80240128 24020046 */ addiu $v0, $zero, 0x46 -/* D53DDC 8024012C AC820084 */ sw $v0, 0x84($a0) -.L80240130: -/* D53DE0 80240130 03E00008 */ jr $ra -/* D53DE4 80240134 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_pra/pra_04/func_80240020_D54690.s b/asm/nonmatchings/world/area_pra/pra_04/func_80240020_D54690.s deleted file mode 100644 index 1eae79d463..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_04/func_80240020_D54690.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D546B0 -/* D546B0 80240020 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* D546B4 80240024 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* D546B8 80240028 C4620080 */ lwc1 $f2, 0x80($v1) -/* D546BC 8024002C 44800000 */ mtc1 $zero, $f0 -/* D546C0 80240030 00000000 */ nop -/* D546C4 80240034 4602003E */ c.le.s $f0, $f2 -/* D546C8 80240038 00000000 */ nop -/* D546CC 8024003C 4500000A */ bc1f .L80240068 -/* D546D0 80240040 00000000 */ nop -/* D546D4 80240044 3C014334 */ lui $at, 0x4334 -/* D546D8 80240048 44810000 */ mtc1 $at, $f0 -/* D546DC 8024004C 00000000 */ nop -/* D546E0 80240050 4600103C */ c.lt.s $f2, $f0 -/* D546E4 80240054 00000000 */ nop -/* D546E8 80240058 45000006 */ bc1f .L80240074 -/* D546EC 8024005C 24020096 */ addiu $v0, $zero, 0x96 -/* D546F0 80240060 AC820084 */ sw $v0, 0x84($a0) -/* D546F4 80240064 C4620080 */ lwc1 $f2, 0x80($v1) -.L80240068: -/* D546F8 80240068 3C014334 */ lui $at, 0x4334 -/* D546FC 8024006C 44810000 */ mtc1 $at, $f0 -/* D54700 80240070 00000000 */ nop -.L80240074: -/* D54704 80240074 4602003E */ c.le.s $f0, $f2 -/* D54708 80240078 00000000 */ nop -/* D5470C 8024007C 45000009 */ bc1f .L802400A4 -/* D54710 80240080 00000000 */ nop -/* D54714 80240084 3C0143B4 */ lui $at, 0x43b4 -/* D54718 80240088 44810000 */ mtc1 $at, $f0 -/* D5471C 8024008C 00000000 */ nop -/* D54720 80240090 4600103C */ c.lt.s $f2, $f0 -/* D54724 80240094 00000000 */ nop -/* D54728 80240098 45000002 */ bc1f .L802400A4 -/* D5472C 8024009C 2402005F */ addiu $v0, $zero, 0x5f -/* D54730 802400A0 AC820084 */ sw $v0, 0x84($a0) -.L802400A4: -/* D54734 802400A4 03E00008 */ jr $ra -/* D54738 802400A8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_pra/pra_04/func_802400AC_D54690.s b/asm/nonmatchings/world/area_pra/pra_04/func_802400AC_D54690.s deleted file mode 100644 index 178d25acc0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_04/func_802400AC_D54690.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400AC_D5473C -/* D5473C 802400AC 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* D54740 802400B0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* D54744 802400B4 C4620080 */ lwc1 $f2, 0x80($v1) -/* D54748 802400B8 44800000 */ mtc1 $zero, $f0 -/* D5474C 802400BC 00000000 */ nop -/* D54750 802400C0 4602003E */ c.le.s $f0, $f2 -/* D54754 802400C4 00000000 */ nop -/* D54758 802400C8 4500000A */ bc1f .L802400F4 -/* D5475C 802400CC 00000000 */ nop -/* D54760 802400D0 3C014334 */ lui $at, 0x4334 -/* D54764 802400D4 44810000 */ mtc1 $at, $f0 -/* D54768 802400D8 00000000 */ nop -/* D5476C 802400DC 4600103C */ c.lt.s $f2, $f0 -/* D54770 802400E0 00000000 */ nop -/* D54774 802400E4 45000006 */ bc1f .L80240100 -/* D54778 802400E8 240200A5 */ addiu $v0, $zero, 0xa5 -/* D5477C 802400EC AC820084 */ sw $v0, 0x84($a0) -/* D54780 802400F0 C4620080 */ lwc1 $f2, 0x80($v1) -.L802400F4: -/* D54784 802400F4 3C014334 */ lui $at, 0x4334 -/* D54788 802400F8 44810000 */ mtc1 $at, $f0 -/* D5478C 802400FC 00000000 */ nop -.L80240100: -/* D54790 80240100 4602003E */ c.le.s $f0, $f2 -/* D54794 80240104 00000000 */ nop -/* D54798 80240108 45000009 */ bc1f .L80240130 -/* D5479C 8024010C 00000000 */ nop -/* D547A0 80240110 3C0143B4 */ lui $at, 0x43b4 -/* D547A4 80240114 44810000 */ mtc1 $at, $f0 -/* D547A8 80240118 00000000 */ nop -/* D547AC 8024011C 4600103C */ c.lt.s $f2, $f0 -/* D547B0 80240120 00000000 */ nop -/* D547B4 80240124 45000002 */ bc1f .L80240130 -/* D547B8 80240128 24020046 */ addiu $v0, $zero, 0x46 -/* D547BC 8024012C AC820084 */ sw $v0, 0x84($a0) -.L80240130: -/* D547C0 80240130 03E00008 */ jr $ra -/* D547C4 80240134 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_pra/pra_04/func_80240138_D54690.s b/asm/nonmatchings/world/area_pra/pra_04/func_80240138_D54690.s deleted file mode 100644 index 5c89d76a2e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_04/func_80240138_D54690.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240138_D547C8 -/* D547C8 80240138 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D547CC 8024013C AFB10014 */ sw $s1, 0x14($sp) -/* D547D0 80240140 0080882D */ daddu $s1, $a0, $zero -/* D547D4 80240144 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* D547D8 80240148 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* D547DC 8024014C AFBF0018 */ sw $ra, 0x18($sp) -/* D547E0 80240150 AFB00010 */ sw $s0, 0x10($sp) -/* D547E4 80240154 84430018 */ lh $v1, 0x18($v0) -/* D547E8 80240158 14600005 */ bnez $v1, .L80240170 -/* D547EC 8024015C 0040802D */ daddu $s0, $v0, $zero -/* D547F0 80240160 3C05FD05 */ lui $a1, 0xfd05 -/* D547F4 80240164 34A50F80 */ ori $a1, $a1, 0xf80 -/* D547F8 80240168 0C0B2026 */ jal set_variable -/* D547FC 8024016C 0000302D */ daddu $a2, $zero, $zero -.L80240170: -/* D54800 80240170 86030018 */ lh $v1, 0x18($s0) -/* D54804 80240174 2402FF38 */ addiu $v0, $zero, -0xc8 -/* D54808 80240178 14620005 */ bne $v1, $v0, .L80240190 -/* D5480C 8024017C 0220202D */ daddu $a0, $s1, $zero -/* D54810 80240180 3C05FD05 */ lui $a1, 0xfd05 -/* D54814 80240184 34A50F80 */ ori $a1, $a1, 0xf80 -/* D54818 80240188 0C0B2026 */ jal set_variable -/* D5481C 8024018C 24060001 */ addiu $a2, $zero, 1 -.L80240190: -/* D54820 80240190 8FBF0018 */ lw $ra, 0x18($sp) -/* D54824 80240194 8FB10014 */ lw $s1, 0x14($sp) -/* D54828 80240198 8FB00010 */ lw $s0, 0x10($sp) -/* D5482C 8024019C 0000102D */ daddu $v0, $zero, $zero -/* D54830 802401A0 03E00008 */ jr $ra -/* D54834 802401A4 27BD0020 */ addiu $sp, $sp, 0x20 -/* D54838 802401A8 00000000 */ nop -/* D5483C 802401AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_04/func_802401B0_D54690.s b/asm/nonmatchings/world/area_pra/pra_04/func_802401B0_D54690.s deleted file mode 100644 index f3cf635e8e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_04/func_802401B0_D54690.s +++ /dev/null @@ -1,508 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_D54840 -/* D54840 802401B0 27BDFF88 */ addiu $sp, $sp, -0x78 -/* D54844 802401B4 AFB3005C */ sw $s3, 0x5c($sp) -/* D54848 802401B8 0080982D */ daddu $s3, $a0, $zero -/* D5484C 802401BC AFBF006C */ sw $ra, 0x6c($sp) -/* D54850 802401C0 AFB60068 */ sw $s6, 0x68($sp) -/* D54854 802401C4 AFB50064 */ sw $s5, 0x64($sp) -/* D54858 802401C8 AFB40060 */ sw $s4, 0x60($sp) -/* D5485C 802401CC AFB20058 */ sw $s2, 0x58($sp) -/* D54860 802401D0 AFB10054 */ sw $s1, 0x54($sp) -/* D54864 802401D4 AFB00050 */ sw $s0, 0x50($sp) -/* D54868 802401D8 F7B40070 */ sdc1 $f20, 0x70($sp) -/* D5486C 802401DC 8E720148 */ lw $s2, 0x148($s3) -/* D54870 802401E0 86440008 */ lh $a0, 8($s2) -/* D54874 802401E4 0C00EABB */ jal get_npc_unsafe -/* D54878 802401E8 00A0802D */ daddu $s0, $a1, $zero -/* D5487C 802401EC 8E63000C */ lw $v1, 0xc($s3) -/* D54880 802401F0 0260202D */ daddu $a0, $s3, $zero -/* D54884 802401F4 8C650000 */ lw $a1, ($v1) -/* D54888 802401F8 0C0B1EAF */ jal get_variable -/* D5488C 802401FC 0040882D */ daddu $s1, $v0, $zero -/* D54890 80240200 AFA00020 */ sw $zero, 0x20($sp) -/* D54894 80240204 8E4300D0 */ lw $v1, 0xd0($s2) -/* D54898 80240208 8C630030 */ lw $v1, 0x30($v1) -/* D5489C 8024020C AFA30024 */ sw $v1, 0x24($sp) -/* D548A0 80240210 8E4300D0 */ lw $v1, 0xd0($s2) -/* D548A4 80240214 8C63001C */ lw $v1, 0x1c($v1) -/* D548A8 80240218 AFA30028 */ sw $v1, 0x28($sp) -/* D548AC 8024021C 8E4300D0 */ lw $v1, 0xd0($s2) -/* D548B0 80240220 8C630024 */ lw $v1, 0x24($v1) -/* D548B4 80240224 AFA3002C */ sw $v1, 0x2c($sp) -/* D548B8 80240228 8E4300D0 */ lw $v1, 0xd0($s2) -/* D548BC 8024022C 3C158011 */ lui $s5, %hi(gPlayerStatus) -/* D548C0 80240230 26B5EFC8 */ addiu $s5, $s5, %lo(gPlayerStatus) -/* D548C4 80240234 8C630028 */ lw $v1, 0x28($v1) -/* D548C8 80240238 27B60020 */ addiu $s6, $sp, 0x20 -/* D548CC 8024023C AFA30030 */ sw $v1, 0x30($sp) -/* D548D0 80240240 8E4300D0 */ lw $v1, 0xd0($s2) -/* D548D4 80240244 3C0143FA */ lui $at, 0x43fa -/* D548D8 80240248 44810000 */ mtc1 $at, $f0 -/* D548DC 8024024C 8C63002C */ lw $v1, 0x2c($v1) -/* D548E0 80240250 0040A02D */ daddu $s4, $v0, $zero -/* D548E4 80240254 E7A00038 */ swc1 $f0, 0x38($sp) -/* D548E8 80240258 A7A0003C */ sh $zero, 0x3c($sp) -/* D548EC 8024025C 12000019 */ beqz $s0, .L802402C4 -/* D548F0 80240260 AFA30034 */ sw $v1, 0x34($sp) -/* D548F4 80240264 27A50040 */ addiu $a1, $sp, 0x40 -/* D548F8 80240268 27A60044 */ addiu $a2, $sp, 0x44 -/* D548FC 8024026C AE600070 */ sw $zero, 0x70($s3) -/* D54900 80240270 A620008E */ sh $zero, 0x8e($s1) -/* D54904 80240274 8E4200B0 */ lw $v0, 0xb0($s2) -/* D54908 80240278 3C01447A */ lui $at, 0x447a -/* D5490C 8024027C 44810000 */ mtc1 $at, $f0 -/* D54910 80240280 34420010 */ ori $v0, $v0, 0x10 -/* D54914 80240284 AE4200B0 */ sw $v0, 0xb0($s2) -/* D54918 80240288 C6220038 */ lwc1 $f2, 0x38($s1) -/* D5491C 8024028C C624003C */ lwc1 $f4, 0x3c($s1) -/* D54920 80240290 C6260040 */ lwc1 $f6, 0x40($s1) -/* D54924 80240294 27A2004C */ addiu $v0, $sp, 0x4c -/* D54928 80240298 E7A0004C */ swc1 $f0, 0x4c($sp) -/* D5492C 8024029C E7A20040 */ swc1 $f2, 0x40($sp) -/* D54930 802402A0 E7A40044 */ swc1 $f4, 0x44($sp) -/* D54934 802402A4 E7A60048 */ swc1 $f6, 0x48($sp) -/* D54938 802402A8 AFA20010 */ sw $v0, 0x10($sp) -/* D5493C 802402AC 8E240080 */ lw $a0, 0x80($s1) -/* D54940 802402B0 0C0372DF */ jal func_800DCB7C -/* D54944 802402B4 27A70048 */ addiu $a3, $sp, 0x48 -/* D54948 802402B8 C7A00044 */ lwc1 $f0, 0x44($sp) -/* D5494C 802402BC 4600028D */ trunc.w.s $f10, $f0 -/* D54950 802402C0 E64A0070 */ swc1 $f10, 0x70($s2) -.L802402C4: -/* D54954 802402C4 8E4300B0 */ lw $v1, 0xb0($s2) -/* D54958 802402C8 30620004 */ andi $v0, $v1, 4 -/* D5495C 802402CC 10400007 */ beqz $v0, .L802402EC -/* D54960 802402D0 00000000 */ nop -/* D54964 802402D4 824200B4 */ lb $v0, 0xb4($s2) -/* D54968 802402D8 1440018D */ bnez $v0, .L80240910 -/* D5496C 802402DC 0000102D */ daddu $v0, $zero, $zero -/* D54970 802402E0 2402FFFB */ addiu $v0, $zero, -5 -/* D54974 802402E4 00621024 */ and $v0, $v1, $v0 -/* D54978 802402E8 AE4200B0 */ sw $v0, 0xb0($s2) -.L802402EC: -/* D5497C 802402EC 8E630070 */ lw $v1, 0x70($s3) -/* D54980 802402F0 2C620010 */ sltiu $v0, $v1, 0x10 -/* D54984 802402F4 10400185 */ beqz $v0, .L8024090C -/* D54988 802402F8 00031080 */ sll $v0, $v1, 2 -/* D5498C 802402FC 3C018024 */ lui $at, 0x8024 -/* D54990 80240300 00220821 */ addu $at, $at, $v0 -/* D54994 80240304 8C2214D0 */ lw $v0, 0x14d0($at) -/* D54998 80240308 00400008 */ jr $v0 -/* D5499C 8024030C 00000000 */ nop -/* D549A0 80240310 8E4200CC */ lw $v0, 0xcc($s2) -/* D549A4 80240314 922300A9 */ lbu $v1, 0xa9($s1) -/* D549A8 80240318 8C440000 */ lw $a0, ($v0) -/* D549AC 8024031C 8E220000 */ lw $v0, ($s1) -/* D549B0 80240320 A22300AB */ sb $v1, 0xab($s1) -/* D549B4 80240324 34420080 */ ori $v0, $v0, 0x80 -/* D549B8 80240328 AE220000 */ sw $v0, ($s1) -/* D549BC 8024032C 24020001 */ addiu $v0, $zero, 1 -/* D549C0 80240330 AE240028 */ sw $a0, 0x28($s1) -/* D549C4 80240334 AE600074 */ sw $zero, 0x74($s3) -/* D549C8 80240338 AE620070 */ sw $v0, 0x70($s3) -/* D549CC 8024033C 8E830014 */ lw $v1, 0x14($s4) -/* D549D0 80240340 04600015 */ bltz $v1, .L80240398 -/* D549D4 80240344 00000000 */ nop -/* D549D8 80240348 8E620074 */ lw $v0, 0x74($s3) -/* D549DC 8024034C 1C400011 */ bgtz $v0, .L80240394 -/* D549E0 80240350 2442FFFF */ addiu $v0, $v0, -1 -/* D549E4 80240354 02C0202D */ daddu $a0, $s6, $zero -/* D549E8 80240358 AE630074 */ sw $v1, 0x74($s3) -/* D549EC 8024035C AFA00010 */ sw $zero, 0x10($sp) -/* D549F0 80240360 8E86000C */ lw $a2, 0xc($s4) -/* D549F4 80240364 8E870010 */ lw $a3, 0x10($s4) -/* D549F8 80240368 0C01242D */ jal func_800490B4 -/* D549FC 8024036C 0240282D */ daddu $a1, $s2, $zero -/* D54A00 80240370 10400006 */ beqz $v0, .L8024038C -/* D54A04 80240374 0220202D */ daddu $a0, $s1, $zero -/* D54A08 80240378 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D54A0C 8024037C 0C012530 */ jal func_800494C0 -/* D54A10 80240380 3C060020 */ lui $a2, 0x20 -/* D54A14 80240384 2402000A */ addiu $v0, $zero, 0xa -/* D54A18 80240388 AE620070 */ sw $v0, 0x70($s3) -.L8024038C: -/* D54A1C 8024038C 8E620074 */ lw $v0, 0x74($s3) -/* D54A20 80240390 2442FFFF */ addiu $v0, $v0, -1 -.L80240394: -/* D54A24 80240394 AE620074 */ sw $v0, 0x74($s3) -.L80240398: -/* D54A28 80240398 8E630070 */ lw $v1, 0x70($s3) -/* D54A2C 8024039C 2402000A */ addiu $v0, $zero, 0xa -/* D54A30 802403A0 1462015B */ bne $v1, $v0, .L80240910 -/* D54A34 802403A4 0000102D */ daddu $v0, $zero, $zero -/* D54A38 802403A8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D54A3C 802403AC 8E4200CC */ lw $v0, 0xcc($s2) -/* D54A40 802403B0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D54A44 802403B4 8C42000C */ lw $v0, 0xc($v0) -/* D54A48 802403B8 AE220028 */ sw $v0, 0x28($s1) -/* D54A4C 802403BC 8EA60028 */ lw $a2, 0x28($s5) -/* D54A50 802403C0 0C00A720 */ jal atan2 -/* D54A54 802403C4 8EA70030 */ lw $a3, 0x30($s5) -/* D54A58 802403C8 3C013FA6 */ lui $at, 0x3fa6 -/* D54A5C 802403CC 34216666 */ ori $at, $at, 0x6666 -/* D54A60 802403D0 44811000 */ mtc1 $at, $f2 -/* D54A64 802403D4 27A50040 */ addiu $a1, $sp, 0x40 -/* D54A68 802403D8 E6200010 */ swc1 $f0, 0x10($s1) -/* D54A6C 802403DC C6200038 */ lwc1 $f0, 0x38($s1) -/* D54A70 802403E0 C6240040 */ lwc1 $f4, 0x40($s1) -/* D54A74 802403E4 3C01447A */ lui $at, 0x447a -/* D54A78 802403E8 44813000 */ mtc1 $at, $f6 -/* D54A7C 802403EC 27A60044 */ addiu $a2, $sp, 0x44 -/* D54A80 802403F0 AE20001C */ sw $zero, 0x1c($s1) -/* D54A84 802403F4 E6220014 */ swc1 $f2, 0x14($s1) -/* D54A88 802403F8 C6880000 */ lwc1 $f8, ($s4) -/* D54A8C 802403FC C622003C */ lwc1 $f2, 0x3c($s1) -/* D54A90 80240400 27A2004C */ addiu $v0, $sp, 0x4c -/* D54A94 80240404 E7A00040 */ swc1 $f0, 0x40($sp) -/* D54A98 80240408 E7A40048 */ swc1 $f4, 0x48($sp) -/* D54A9C 8024040C E7A6004C */ swc1 $f6, 0x4c($sp) -/* D54AA0 80240410 E7A20044 */ swc1 $f2, 0x44($sp) -/* D54AA4 80240414 E6280018 */ swc1 $f8, 0x18($s1) -/* D54AA8 80240418 AFA20010 */ sw $v0, 0x10($sp) -/* D54AAC 8024041C 8E240080 */ lw $a0, 0x80($s1) -/* D54AB0 80240420 0C0372DF */ jal func_800DCB7C -/* D54AB4 80240424 27A70048 */ addiu $a3, $sp, 0x48 -/* D54AB8 80240428 10400010 */ beqz $v0, .L8024046C -/* D54ABC 8024042C 00000000 */ nop -/* D54AC0 80240430 C620003C */ lwc1 $f0, 0x3c($s1) -/* D54AC4 80240434 C6440070 */ lwc1 $f4, 0x70($s2) -/* D54AC8 80240438 46802120 */ cvt.s.w $f4, $f4 -/* D54ACC 8024043C 46040001 */ sub.s $f0, $f0, $f4 -/* D54AD0 80240440 3C018024 */ lui $at, 0x8024 -/* D54AD4 80240444 D4221510 */ ldc1 $f2, 0x1510($at) -/* D54AD8 80240448 46000021 */ cvt.d.s $f0, $f0 -/* D54ADC 8024044C 46220002 */ mul.d $f0, $f0, $f2 -/* D54AE0 80240450 00000000 */ nop -/* D54AE4 80240454 460020A1 */ cvt.d.s $f2, $f4 -/* D54AE8 80240458 46201080 */ add.d $f2, $f2, $f0 -/* D54AEC 8024045C E7A40044 */ swc1 $f4, 0x44($sp) -/* D54AF0 80240460 462010A0 */ cvt.s.d $f2, $f2 -/* D54AF4 80240464 08090127 */ j .L8024049C -/* D54AF8 80240468 E6220064 */ swc1 $f2, 0x64($s1) -.L8024046C: -/* D54AFC 8024046C C6A0002C */ lwc1 $f0, 0x2c($s5) -/* D54B00 80240470 C622003C */ lwc1 $f2, 0x3c($s1) -/* D54B04 80240474 46001081 */ sub.s $f2, $f2, $f0 -/* D54B08 80240478 3C018024 */ lui $at, 0x8024 -/* D54B0C 8024047C D4241518 */ ldc1 $f4, 0x1518($at) -/* D54B10 80240480 460010A1 */ cvt.d.s $f2, $f2 -/* D54B14 80240484 46241082 */ mul.d $f2, $f2, $f4 -/* D54B18 80240488 00000000 */ nop -/* D54B1C 8024048C 46000021 */ cvt.d.s $f0, $f0 -/* D54B20 80240490 46220000 */ add.d $f0, $f0, $f2 -/* D54B24 80240494 46200020 */ cvt.s.d $f0, $f0 -/* D54B28 80240498 E6200064 */ swc1 $f0, 0x64($s1) -.L8024049C: -/* D54B2C 8024049C C620003C */ lwc1 $f0, 0x3c($s1) -/* D54B30 802404A0 2402000B */ addiu $v0, $zero, 0xb -/* D54B34 802404A4 E6200068 */ swc1 $f0, 0x68($s1) -/* D54B38 802404A8 AE620070 */ sw $v0, 0x70($s3) -/* D54B3C 802404AC C6200018 */ lwc1 $f0, 0x18($s1) -/* D54B40 802404B0 44801000 */ mtc1 $zero, $f2 -/* D54B44 802404B4 44801800 */ mtc1 $zero, $f3 -/* D54B48 802404B8 46000021 */ cvt.d.s $f0, $f0 -/* D54B4C 802404BC 4620103C */ c.lt.d $f2, $f0 -/* D54B50 802404C0 00000000 */ nop -/* D54B54 802404C4 45000025 */ bc1f .L8024055C -/* D54B58 802404C8 27A50040 */ addiu $a1, $sp, 0x40 -/* D54B5C 802404CC C6200038 */ lwc1 $f0, 0x38($s1) -/* D54B60 802404D0 C622003C */ lwc1 $f2, 0x3c($s1) -/* D54B64 802404D4 C6240040 */ lwc1 $f4, 0x40($s1) -/* D54B68 802404D8 C6260018 */ lwc1 $f6, 0x18($s1) -/* D54B6C 802404DC E7A00040 */ swc1 $f0, 0x40($sp) -/* D54B70 802404E0 E7A20044 */ swc1 $f2, 0x44($sp) -/* D54B74 802404E4 E7A40048 */ swc1 $f4, 0x48($sp) -/* D54B78 802404E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* D54B7C 802404EC C620000C */ lwc1 $f0, 0xc($s1) -/* D54B80 802404F0 E7A00014 */ swc1 $f0, 0x14($sp) -/* D54B84 802404F4 862200A8 */ lh $v0, 0xa8($s1) -/* D54B88 802404F8 44820000 */ mtc1 $v0, $f0 -/* D54B8C 802404FC 00000000 */ nop -/* D54B90 80240500 46800020 */ cvt.s.w $f0, $f0 -/* D54B94 80240504 E7A00018 */ swc1 $f0, 0x18($sp) -/* D54B98 80240508 862200A6 */ lh $v0, 0xa6($s1) -/* D54B9C 8024050C 27A60044 */ addiu $a2, $sp, 0x44 -/* D54BA0 80240510 44820000 */ mtc1 $v0, $f0 -/* D54BA4 80240514 00000000 */ nop -/* D54BA8 80240518 46800020 */ cvt.s.w $f0, $f0 -/* D54BAC 8024051C E7A0001C */ swc1 $f0, 0x1c($sp) -/* D54BB0 80240520 8E240080 */ lw $a0, 0x80($s1) -/* D54BB4 80240524 0C037711 */ jal func_800DDC44 -/* D54BB8 80240528 27A70048 */ addiu $a3, $sp, 0x48 -/* D54BBC 8024052C 54400001 */ bnel $v0, $zero, .L80240534 -/* D54BC0 80240530 AE200018 */ sw $zero, 0x18($s1) -.L80240534: -/* D54BC4 80240534 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D54BC8 80240538 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D54BCC 8024053C 8EA60028 */ lw $a2, 0x28($s5) -/* D54BD0 80240540 0C00A720 */ jal atan2 -/* D54BD4 80240544 8EA70030 */ lw $a3, 0x30($s5) -/* D54BD8 80240548 8E250018 */ lw $a1, 0x18($s1) -/* D54BDC 8024054C 44060000 */ mfc1 $a2, $f0 -/* D54BE0 80240550 0220202D */ daddu $a0, $s1, $zero -/* D54BE4 80240554 0C00EA95 */ jal npc_move_heading -/* D54BE8 80240558 AE26000C */ sw $a2, 0xc($s1) -.L8024055C: -/* D54BEC 8024055C C620001C */ lwc1 $f0, 0x1c($s1) -/* D54BF0 80240560 C6220014 */ lwc1 $f2, 0x14($s1) -/* D54BF4 80240564 46020001 */ sub.s $f0, $f0, $f2 -/* D54BF8 80240568 C622003C */ lwc1 $f2, 0x3c($s1) -/* D54BFC 8024056C C6240064 */ lwc1 $f4, 0x64($s1) -/* D54C00 80240570 46001080 */ add.s $f2, $f2, $f0 -/* D54C04 80240574 E620001C */ swc1 $f0, 0x1c($s1) -/* D54C08 80240578 4604103C */ c.lt.s $f2, $f4 -/* D54C0C 8024057C 00000000 */ nop -/* D54C10 80240580 450000E2 */ bc1f .L8024090C -/* D54C14 80240584 E622003C */ swc1 $f2, 0x3c($s1) -/* D54C18 80240588 2402000C */ addiu $v0, $zero, 0xc -/* D54C1C 8024058C E624003C */ swc1 $f4, 0x3c($s1) -/* D54C20 80240590 AE620070 */ sw $v0, 0x70($s3) -/* D54C24 80240594 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D54C28 80240598 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D54C2C 8024059C 8EA60028 */ lw $a2, 0x28($s5) -/* D54C30 802405A0 0C00A7B5 */ jal dist2D -/* D54C34 802405A4 8EA70030 */ lw $a3, 0x30($s5) -/* D54C38 802405A8 3C014270 */ lui $at, 0x4270 -/* D54C3C 802405AC 44811000 */ mtc1 $at, $f2 -/* D54C40 802405B0 00000000 */ nop -/* D54C44 802405B4 4602003C */ c.lt.s $f0, $f2 -/* D54C48 802405B8 00000000 */ nop -/* D54C4C 802405BC 45000002 */ bc1f .L802405C8 -/* D54C50 802405C0 E6200010 */ swc1 $f0, 0x10($s1) -/* D54C54 802405C4 E6220010 */ swc1 $f2, 0x10($s1) -.L802405C8: -/* D54C58 802405C8 C6860018 */ lwc1 $f6, 0x18($s4) -/* D54C5C 802405CC C6400070 */ lwc1 $f0, 0x70($s2) -/* D54C60 802405D0 46800020 */ cvt.s.w $f0, $f0 -/* D54C64 802405D4 E7A00044 */ swc1 $f0, 0x44($sp) -/* D54C68 802405D8 46000021 */ cvt.d.s $f0, $f0 -/* D54C6C 802405DC C6240010 */ lwc1 $f4, 0x10($s1) -/* D54C70 802405E0 3C014024 */ lui $at, 0x4024 -/* D54C74 802405E4 44811800 */ mtc1 $at, $f3 -/* D54C78 802405E8 44801000 */ mtc1 $zero, $f2 -/* D54C7C 802405EC 46062103 */ div.s $f4, $f4, $f6 -/* D54C80 802405F0 46220000 */ add.d $f0, $f0, $f2 -/* D54C84 802405F4 C622003C */ lwc1 $f2, 0x3c($s1) -/* D54C88 802405F8 4600228D */ trunc.w.s $f10, $f4 -/* D54C8C 802405FC 44025000 */ mfc1 $v0, $f10 -/* D54C90 80240600 00000000 */ nop -/* D54C94 80240604 A622008E */ sh $v0, 0x8e($s1) -/* D54C98 80240608 460010A1 */ cvt.d.s $f2, $f2 -/* D54C9C 8024060C 46220001 */ sub.d $f0, $f0, $f2 -/* D54CA0 80240610 00021400 */ sll $v0, $v0, 0x10 -/* D54CA4 80240614 E6260018 */ swc1 $f6, 0x18($s1) -/* D54CA8 80240618 14400003 */ bnez $v0, .L80240628 -/* D54CAC 8024061C 46200120 */ cvt.s.d $f4, $f0 -/* D54CB0 80240620 24020001 */ addiu $v0, $zero, 1 -/* D54CB4 80240624 A622008E */ sh $v0, 0x8e($s1) -.L80240628: -/* D54CB8 80240628 8622008E */ lh $v0, 0x8e($s1) -/* D54CBC 8024062C C620001C */ lwc1 $f0, 0x1c($s1) -/* D54CC0 80240630 44821000 */ mtc1 $v0, $f2 -/* D54CC4 80240634 00000000 */ nop -/* D54CC8 80240638 468010A0 */ cvt.s.w $f2, $f2 -/* D54CCC 8024063C 46000007 */ neg.s $f0, $f0 -/* D54CD0 80240640 46020002 */ mul.s $f0, $f0, $f2 -/* D54CD4 80240644 00000000 */ nop -/* D54CD8 80240648 00420018 */ mult $v0, $v0 -/* D54CDC 8024064C 8E230000 */ lw $v1, ($s1) -/* D54CE0 80240650 46040000 */ add.s $f0, $f0, $f4 -/* D54CE4 80240654 A22000AB */ sb $zero, 0xab($s1) -/* D54CE8 80240658 2402FF7F */ addiu $v0, $zero, -0x81 -/* D54CEC 8024065C 00004012 */ mflo $t0 -/* D54CF0 80240660 00621824 */ and $v1, $v1, $v0 -/* D54CF4 80240664 24020005 */ addiu $v0, $zero, 5 -/* D54CF8 80240668 46000000 */ add.s $f0, $f0, $f0 -/* D54CFC 8024066C AE230000 */ sw $v1, ($s1) -/* D54D00 80240670 44881000 */ mtc1 $t0, $f2 -/* D54D04 80240674 00000000 */ nop -/* D54D08 80240678 468010A0 */ cvt.s.w $f2, $f2 -/* D54D0C 8024067C 46000007 */ neg.s $f0, $f0 -/* D54D10 80240680 46020003 */ div.s $f0, $f0, $f2 -/* D54D14 80240684 46000005 */ abs.s $f0, $f0 -/* D54D18 80240688 46000007 */ neg.s $f0, $f0 -/* D54D1C 8024068C E6200014 */ swc1 $f0, 0x14($s1) -/* D54D20 80240690 AE42006C */ sw $v0, 0x6c($s2) -/* D54D24 80240694 2402000D */ addiu $v0, $zero, 0xd -/* D54D28 80240698 A620008E */ sh $zero, 0x8e($s1) -/* D54D2C 8024069C AE620070 */ sw $v0, 0x70($s3) -/* D54D30 802406A0 C620001C */ lwc1 $f0, 0x1c($s1) -/* D54D34 802406A4 C6220014 */ lwc1 $f2, 0x14($s1) -/* D54D38 802406A8 46020001 */ sub.s $f0, $f0, $f2 -/* D54D3C 802406AC 4480A000 */ mtc1 $zero, $f20 -/* D54D40 802406B0 00000000 */ nop -/* D54D44 802406B4 4614003C */ c.lt.s $f0, $f20 -/* D54D48 802406B8 00000000 */ nop -/* D54D4C 802406BC 45000012 */ bc1f .L80240708 -/* D54D50 802406C0 E620001C */ swc1 $f0, 0x1c($s1) -/* D54D54 802406C4 27A50040 */ addiu $a1, $sp, 0x40 -/* D54D58 802406C8 27A60044 */ addiu $a2, $sp, 0x44 -/* D54D5C 802406CC 27A2004C */ addiu $v0, $sp, 0x4c -/* D54D60 802406D0 C6220038 */ lwc1 $f2, 0x38($s1) -/* D54D64 802406D4 C624003C */ lwc1 $f4, 0x3c($s1) -/* D54D68 802406D8 C6260040 */ lwc1 $f6, 0x40($s1) -/* D54D6C 802406DC 46000007 */ neg.s $f0, $f0 -/* D54D70 802406E0 E7A0004C */ swc1 $f0, 0x4c($sp) -/* D54D74 802406E4 E7A20040 */ swc1 $f2, 0x40($sp) -/* D54D78 802406E8 E7A40044 */ swc1 $f4, 0x44($sp) -/* D54D7C 802406EC E7A60048 */ swc1 $f6, 0x48($sp) -/* D54D80 802406F0 AFA20010 */ sw $v0, 0x10($sp) -/* D54D84 802406F4 8E240080 */ lw $a0, 0x80($s1) -/* D54D88 802406F8 0C0372DF */ jal func_800DCB7C -/* D54D8C 802406FC 27A70048 */ addiu $a3, $sp, 0x48 -/* D54D90 80240700 54400001 */ bnel $v0, $zero, .L80240708 -/* D54D94 80240704 E634001C */ swc1 $f20, 0x1c($s1) -.L80240708: -/* D54D98 80240708 C624003C */ lwc1 $f4, 0x3c($s1) -/* D54D9C 8024070C C620001C */ lwc1 $f0, 0x1c($s1) -/* D54DA0 80240710 46002100 */ add.s $f4, $f4, $f0 -/* D54DA4 80240714 C6200018 */ lwc1 $f0, 0x18($s1) -/* D54DA8 80240718 44801000 */ mtc1 $zero, $f2 -/* D54DAC 8024071C 44801800 */ mtc1 $zero, $f3 -/* D54DB0 80240720 46000021 */ cvt.d.s $f0, $f0 -/* D54DB4 80240724 4620103C */ c.lt.d $f2, $f0 -/* D54DB8 80240728 00000000 */ nop -/* D54DBC 8024072C 45000057 */ bc1f .L8024088C -/* D54DC0 80240730 E624003C */ swc1 $f4, 0x3c($s1) -/* D54DC4 80240734 46002086 */ mov.s $f2, $f4 -/* D54DC8 80240738 C6200038 */ lwc1 $f0, 0x38($s1) -/* D54DCC 8024073C C6240040 */ lwc1 $f4, 0x40($s1) -/* D54DD0 80240740 C6260018 */ lwc1 $f6, 0x18($s1) -/* D54DD4 80240744 E7A20044 */ swc1 $f2, 0x44($sp) -/* D54DD8 80240748 E7A00040 */ swc1 $f0, 0x40($sp) -/* D54DDC 8024074C E7A40048 */ swc1 $f4, 0x48($sp) -/* D54DE0 80240750 E7A60010 */ swc1 $f6, 0x10($sp) -/* D54DE4 80240754 C620000C */ lwc1 $f0, 0xc($s1) -/* D54DE8 80240758 E7A00014 */ swc1 $f0, 0x14($sp) -/* D54DEC 8024075C 862200A8 */ lh $v0, 0xa8($s1) -/* D54DF0 80240760 27A50040 */ addiu $a1, $sp, 0x40 -/* D54DF4 80240764 44820000 */ mtc1 $v0, $f0 -/* D54DF8 80240768 00000000 */ nop -/* D54DFC 8024076C 46800020 */ cvt.s.w $f0, $f0 -/* D54E00 80240770 E7A00018 */ swc1 $f0, 0x18($sp) -/* D54E04 80240774 862200A6 */ lh $v0, 0xa6($s1) -/* D54E08 80240778 27A60044 */ addiu $a2, $sp, 0x44 -/* D54E0C 8024077C 44820000 */ mtc1 $v0, $f0 -/* D54E10 80240780 00000000 */ nop -/* D54E14 80240784 46800020 */ cvt.s.w $f0, $f0 -/* D54E18 80240788 E7A0001C */ swc1 $f0, 0x1c($sp) -/* D54E1C 8024078C 8E240080 */ lw $a0, 0x80($s1) -/* D54E20 80240790 0C037711 */ jal func_800DDC44 -/* D54E24 80240794 27A70048 */ addiu $a3, $sp, 0x48 -/* D54E28 80240798 10400003 */ beqz $v0, .L802407A8 -/* D54E2C 8024079C 00000000 */ nop -/* D54E30 802407A0 0809021F */ j .L8024087C -/* D54E34 802407A4 AE200018 */ sw $zero, 0x18($s1) -.L802407A8: -/* D54E38 802407A8 C620001C */ lwc1 $f0, 0x1c($s1) -/* D54E3C 802407AC 3C01C004 */ lui $at, 0xc004 -/* D54E40 802407B0 44811800 */ mtc1 $at, $f3 -/* D54E44 802407B4 44801000 */ mtc1 $zero, $f2 -/* D54E48 802407B8 46000021 */ cvt.d.s $f0, $f0 -/* D54E4C 802407BC 4622003C */ c.lt.d $f0, $f2 -/* D54E50 802407C0 00000000 */ nop -/* D54E54 802407C4 4500002D */ bc1f .L8024087C -/* D54E58 802407C8 00000000 */ nop -/* D54E5C 802407CC 9622008E */ lhu $v0, 0x8e($s1) -/* D54E60 802407D0 24420001 */ addiu $v0, $v0, 1 -/* D54E64 802407D4 A622008E */ sh $v0, 0x8e($s1) -/* D54E68 802407D8 00021400 */ sll $v0, $v0, 0x10 -/* D54E6C 802407DC 8E830020 */ lw $v1, 0x20($s4) -/* D54E70 802407E0 00021403 */ sra $v0, $v0, 0x10 -/* D54E74 802407E4 0043102A */ slt $v0, $v0, $v1 -/* D54E78 802407E8 14400024 */ bnez $v0, .L8024087C -/* D54E7C 802407EC 00000000 */ nop -/* D54E80 802407F0 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D54E84 802407F4 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D54E88 802407F8 8EA60028 */ lw $a2, 0x28($s5) -/* D54E8C 802407FC 0C00A720 */ jal atan2 -/* D54E90 80240800 8EA70030 */ lw $a3, 0x30($s5) -/* D54E94 80240804 46000506 */ mov.s $f20, $f0 -/* D54E98 80240808 C62C000C */ lwc1 $f12, 0xc($s1) -/* D54E9C 8024080C 0C00A70A */ jal get_clamped_angle_diff -/* D54EA0 80240810 4600A386 */ mov.s $f14, $f20 -/* D54EA4 80240814 46000086 */ mov.s $f2, $f0 -/* D54EA8 80240818 8E82001C */ lw $v0, 0x1c($s4) -/* D54EAC 8024081C 46001005 */ abs.s $f0, $f2 -/* D54EB0 80240820 44822000 */ mtc1 $v0, $f4 -/* D54EB4 80240824 00000000 */ nop -/* D54EB8 80240828 46802120 */ cvt.s.w $f4, $f4 -/* D54EBC 8024082C 4600203C */ c.lt.s $f4, $f0 -/* D54EC0 80240830 00000000 */ nop -/* D54EC4 80240834 4500000D */ bc1f .L8024086C -/* D54EC8 80240838 00000000 */ nop -/* D54ECC 8024083C 44800000 */ mtc1 $zero, $f0 -/* D54ED0 80240840 C634000C */ lwc1 $f20, 0xc($s1) -/* D54ED4 80240844 4600103C */ c.lt.s $f2, $f0 -/* D54ED8 80240848 00000000 */ nop -/* D54EDC 8024084C 45000006 */ bc1f .L80240868 -/* D54EE0 80240850 00021023 */ negu $v0, $v0 -/* D54EE4 80240854 44820000 */ mtc1 $v0, $f0 -/* D54EE8 80240858 00000000 */ nop -/* D54EEC 8024085C 46800020 */ cvt.s.w $f0, $f0 -/* D54EF0 80240860 0809021B */ j .L8024086C -/* D54EF4 80240864 4600A500 */ add.s $f20, $f20, $f0 -.L80240868: -/* D54EF8 80240868 4604A500 */ add.s $f20, $f20, $f4 -.L8024086C: -/* D54EFC 8024086C 0C00A6C9 */ jal clamp_angle -/* D54F00 80240870 4600A306 */ mov.s $f12, $f20 -/* D54F04 80240874 E620000C */ swc1 $f0, 0xc($s1) -/* D54F08 80240878 A620008E */ sh $zero, 0x8e($s1) -.L8024087C: -/* D54F0C 8024087C 8E250018 */ lw $a1, 0x18($s1) -/* D54F10 80240880 8E26000C */ lw $a2, 0xc($s1) -/* D54F14 80240884 0C00EA95 */ jal npc_move_heading -/* D54F18 80240888 0220202D */ daddu $a0, $s1, $zero -.L8024088C: -/* D54F1C 8024088C 8E42006C */ lw $v0, 0x6c($s2) -/* D54F20 80240890 2442FFFF */ addiu $v0, $v0, -1 -/* D54F24 80240894 1C400003 */ bgtz $v0, .L802408A4 -/* D54F28 80240898 AE42006C */ sw $v0, 0x6c($s2) -/* D54F2C 8024089C 24020005 */ addiu $v0, $zero, 5 -/* D54F30 802408A0 AE42006C */ sw $v0, 0x6c($s2) -.L802408A4: -/* D54F34 802408A4 C620003C */ lwc1 $f0, 0x3c($s1) -/* D54F38 802408A8 C6220068 */ lwc1 $f2, 0x68($s1) -/* D54F3C 802408AC 4600103C */ c.lt.s $f2, $f0 -/* D54F40 802408B0 00000000 */ nop -/* D54F44 802408B4 45000015 */ bc1f .L8024090C -/* D54F48 802408B8 2402000E */ addiu $v0, $zero, 0xe -/* D54F4C 802408BC E622003C */ swc1 $f2, 0x3c($s1) -/* D54F50 802408C0 AE620070 */ sw $v0, 0x70($s3) -/* D54F54 802408C4 8E4200CC */ lw $v0, 0xcc($s2) -/* D54F58 802408C8 922300A9 */ lbu $v1, 0xa9($s1) -/* D54F5C 802408CC 8C440020 */ lw $a0, 0x20($v0) -/* D54F60 802408D0 8E220000 */ lw $v0, ($s1) -/* D54F64 802408D4 A22300AB */ sb $v1, 0xab($s1) -/* D54F68 802408D8 34420080 */ ori $v0, $v0, 0x80 -/* D54F6C 802408DC AE220000 */ sw $v0, ($s1) -/* D54F70 802408E0 2402000F */ addiu $v0, $zero, 0xf -/* D54F74 802408E4 A622008E */ sh $v0, 0x8e($s1) -/* D54F78 802408E8 2402000F */ addiu $v0, $zero, 0xf -/* D54F7C 802408EC AE240028 */ sw $a0, 0x28($s1) -/* D54F80 802408F0 AE620070 */ sw $v0, 0x70($s3) -/* D54F84 802408F4 9622008E */ lhu $v0, 0x8e($s1) -/* D54F88 802408F8 2442FFFF */ addiu $v0, $v0, -1 -/* D54F8C 802408FC A622008E */ sh $v0, 0x8e($s1) -/* D54F90 80240900 00021400 */ sll $v0, $v0, 0x10 -/* D54F94 80240904 58400001 */ blezl $v0, .L8024090C -/* D54F98 80240908 AE600070 */ sw $zero, 0x70($s3) -.L8024090C: -/* D54F9C 8024090C 0000102D */ daddu $v0, $zero, $zero -.L80240910: -/* D54FA0 80240910 8FBF006C */ lw $ra, 0x6c($sp) -/* D54FA4 80240914 8FB60068 */ lw $s6, 0x68($sp) -/* D54FA8 80240918 8FB50064 */ lw $s5, 0x64($sp) -/* D54FAC 8024091C 8FB40060 */ lw $s4, 0x60($sp) -/* D54FB0 80240920 8FB3005C */ lw $s3, 0x5c($sp) -/* D54FB4 80240924 8FB20058 */ lw $s2, 0x58($sp) -/* D54FB8 80240928 8FB10054 */ lw $s1, 0x54($sp) -/* D54FBC 8024092C 8FB00050 */ lw $s0, 0x50($sp) -/* D54FC0 80240930 D7B40070 */ ldc1 $f20, 0x70($sp) -/* D54FC4 80240934 03E00008 */ jr $ra -/* D54FC8 80240938 27BD0078 */ addiu $sp, $sp, 0x78 -/* D54FCC 8024093C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_05/func_80240020_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/func_80240020_D55BB0.s deleted file mode 100644 index e48eeca155..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/func_80240020_D55BB0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D55BD0 -/* D55BD0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D55BD4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D55BD8 80240028 00822024 */ and $a0, $a0, $v0 -/* D55BDC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D55BE0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D55BE4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D55BE8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D55BEC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D55BF0 80240040 30620001 */ andi $v0, $v1, 1 -/* D55BF4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D55BF8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D55BFC 8024004C 03E00008 */ jr $ra -/* D55C00 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_05/func_80240054_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/func_80240054_D55BB0.s deleted file mode 100644 index ee1423f334..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/func_80240054_D55BB0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054_D55C04 -/* D55C04 80240054 00041403 */ sra $v0, $a0, 0x10 -/* D55C08 80240058 304300FF */ andi $v1, $v0, 0xff -/* D55C0C 8024005C 24020006 */ addiu $v0, $zero, 6 -/* D55C10 80240060 10620015 */ beq $v1, $v0, .L802400B8 -/* D55C14 80240064 28620007 */ slti $v0, $v1, 7 -/* D55C18 80240068 10400005 */ beqz $v0, .L80240080 -/* D55C1C 8024006C 24020001 */ addiu $v0, $zero, 1 -/* D55C20 80240070 1062000A */ beq $v1, $v0, .L8024009C -/* D55C24 80240074 3C020100 */ lui $v0, 0x100 -/* D55C28 80240078 03E00008 */ jr $ra -/* D55C2C 8024007C 00821025 */ or $v0, $a0, $v0 -.L80240080: -/* D55C30 80240080 2862000A */ slti $v0, $v1, 0xa -/* D55C34 80240084 10400016 */ beqz $v0, .L802400E0 -/* D55C38 80240088 28620008 */ slti $v0, $v1, 8 -/* D55C3C 8024008C 14400015 */ bnez $v0, .L802400E4 -/* D55C40 80240090 3C020100 */ lui $v0, 0x100 -/* D55C44 80240094 03E00008 */ jr $ra -/* D55C48 80240098 0080102D */ daddu $v0, $a0, $zero -.L8024009C: -/* D55C4C 8024009C 3C020001 */ lui $v0, 1 -/* D55C50 802400A0 3442000C */ ori $v0, $v0, 0xc -/* D55C54 802400A4 0044102A */ slt $v0, $v0, $a0 -/* D55C58 802400A8 1040000E */ beqz $v0, .L802400E4 -/* D55C5C 802400AC 3C020100 */ lui $v0, 0x100 -.L802400B0: -/* D55C60 802400B0 03E00008 */ jr $ra -/* D55C64 802400B4 0080102D */ daddu $v0, $a0, $zero -.L802400B8: -/* D55C68 802400B8 3C02FFF9 */ lui $v0, 0xfff9 -/* D55C6C 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D55C70 802400C0 00821821 */ addu $v1, $a0, $v0 -/* D55C74 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D55C78 802400C8 10400005 */ beqz $v0, .L802400E0 -/* D55C7C 802400CC 30620001 */ andi $v0, $v1, 1 -/* D55C80 802400D0 1440FFF7 */ bnez $v0, .L802400B0 -/* D55C84 802400D4 24820001 */ addiu $v0, $a0, 1 -/* D55C88 802400D8 03E00008 */ jr $ra -/* D55C8C 802400DC 00000000 */ nop -.L802400E0: -/* D55C90 802400E0 3C020100 */ lui $v0, 0x100 -.L802400E4: -/* D55C94 802400E4 03E00008 */ jr $ra -/* D55C98 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_05/func_802400EC_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/func_802400EC_D55BB0.s deleted file mode 100644 index 97acd58af9..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/func_802400EC_D55BB0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_D55C9C -/* D55C9C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D55CA0 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* D55CA4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D55CA8 802400F8 3C058024 */ lui $a1, 0x8024 -/* D55CAC 802400FC 24A50128 */ addiu $a1, $a1, 0x128 -/* D55CB0 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* D55CB4 80240104 0C048C56 */ jal bind_dynamic_entity_3 -/* D55CB8 80240108 0000202D */ daddu $a0, $zero, $zero -/* D55CBC 8024010C 8E03013C */ lw $v1, 0x13c($s0) -/* D55CC0 80240110 AC620000 */ sw $v0, ($v1) -/* D55CC4 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* D55CC8 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* D55CCC 8024011C 24020002 */ addiu $v0, $zero, 2 -/* D55CD0 80240120 03E00008 */ jr $ra -/* D55CD4 80240124 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_05/func_80240128_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/func_80240128_D55BB0.s deleted file mode 100644 index 27908897fd..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/func_80240128_D55BB0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240128_D55CD8 -/* D55CD8 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D55CDC 8024012C AFB00040 */ sw $s0, 0x40($sp) -/* D55CE0 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D55CE4 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D55CE8 80240138 AFB20048 */ sw $s2, 0x48($sp) -/* D55CEC 8024013C AFBF004C */ sw $ra, 0x4c($sp) -/* D55CF0 80240140 AFB10044 */ sw $s1, 0x44($sp) -/* D55CF4 80240144 8E020000 */ lw $v0, ($s0) -/* D55CF8 80240148 821100BE */ lb $s1, 0xbe($s0) -/* D55CFC 8024014C 30420001 */ andi $v0, $v0, 1 -/* D55D00 80240150 10400061 */ beqz $v0, .L802402D8 -/* D55D04 80240154 27B20020 */ addiu $s2, $sp, 0x20 -/* D55D08 80240158 8E0400CC */ lw $a0, 0xcc($s0) -/* D55D0C 8024015C 0C044181 */ jal get_shadow_by_index -/* D55D10 80240160 00000000 */ nop -/* D55D14 80240164 0C048B77 */ jal func_80122DDC -/* D55D18 80240168 84440008 */ lh $a0, 8($v0) -/* D55D1C 8024016C 8C430000 */ lw $v1, ($v0) -/* D55D20 80240170 34630200 */ ori $v1, $v1, 0x200 -/* D55D24 80240174 AC430000 */ sw $v1, ($v0) -/* D55D28 80240178 8E050028 */ lw $a1, 0x28($s0) -/* D55D2C 8024017C 8E06002C */ lw $a2, 0x2c($s0) -/* D55D30 80240180 27A20030 */ addiu $v0, $sp, 0x30 -/* D55D34 80240184 AFA20010 */ sw $v0, 0x10($sp) -/* D55D38 80240188 27A20034 */ addiu $v0, $sp, 0x34 -/* D55D3C 8024018C AFA20014 */ sw $v0, 0x14($sp) -/* D55D40 80240190 C6000030 */ lwc1 $f0, 0x30($s0) -/* D55D44 80240194 3C04800A */ lui $a0, 0x800a -/* D55D48 80240198 8484A634 */ lh $a0, -0x59cc($a0) -/* D55D4C 8024019C 46000007 */ neg.s $f0, $f0 -/* D55D50 802401A0 44070000 */ mfc1 $a3, $f0 -/* D55D54 802401A4 27A20038 */ addiu $v0, $sp, 0x38 -/* D55D58 802401A8 0C00B94E */ jal get_screen_coords -/* D55D5C 802401AC AFA20018 */ sw $v0, 0x18($sp) -/* D55D60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D55D64 802401B4 0C090008 */ jal func_80240020 -/* D55D68 802401B8 00000000 */ nop -/* D55D6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) -/* D55D70 802401C0 3C014307 */ lui $at, 0x4307 -/* D55D74 802401C4 44810000 */ mtc1 $at, $f0 -/* D55D78 802401C8 00000000 */ nop -/* D55D7C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D55D80 802401D0 00000000 */ nop -/* D55D84 802401D4 4500000B */ bc1f .L80240204 -/* D55D88 802401D8 24040002 */ addiu $a0, $zero, 2 -/* D55D8C 802401DC 3C014361 */ lui $at, 0x4361 -/* D55D90 802401E0 44810000 */ mtc1 $at, $f0 -/* D55D94 802401E4 00000000 */ nop -/* D55D98 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D55D9C 802401EC 00000000 */ nop -/* D55DA0 802401F0 45000004 */ bc1f .L80240204 -/* D55DA4 802401F4 00000000 */ nop -/* D55DA8 802401F8 0C090015 */ jal func_80240054 -/* D55DAC 802401FC 0040202D */ daddu $a0, $v0, $zero -/* D55DB0 80240200 24040002 */ addiu $a0, $zero, 2 -.L80240204: -/* D55DB4 80240204 3C063F80 */ lui $a2, 0x3f80 -/* D55DB8 80240208 0C0B76A3 */ jal func_802DDA8C -/* D55DBC 8024020C 0040282D */ daddu $a1, $v0, $zero -/* D55DC0 80240210 8E020000 */ lw $v0, ($s0) -/* D55DC4 80240214 3C030002 */ lui $v1, 2 -/* D55DC8 80240218 00431024 */ and $v0, $v0, $v1 -/* D55DCC 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 -/* D55DD0 80240220 24110011 */ addiu $s1, $zero, 0x11 -/* D55DD4 80240224 9203000E */ lbu $v1, 0xe($s0) -/* D55DD8 80240228 3C02802E */ lui $v0, 0x802e -/* D55DDC 8024022C 90429D70 */ lbu $v0, -0x6290($v0) -/* D55DE0 80240230 10620018 */ beq $v1, $v0, .L80240294 -/* D55DE4 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D55DE8 80240238 1040000B */ beqz $v0, .L80240268 -/* D55DEC 8024023C 24110011 */ addiu $s1, $zero, 0x11 -/* D55DF0 80240240 24040002 */ addiu $a0, $zero, 2 -/* D55DF4 80240244 2405FFFF */ addiu $a1, $zero, -1 -/* D55DF8 80240248 24060007 */ addiu $a2, $zero, 7 -/* D55DFC 8024024C 0060102D */ daddu $v0, $v1, $zero -/* D55E00 80240250 0000382D */ daddu $a3, $zero, $zero -/* D55E04 80240254 AFA00010 */ sw $zero, 0x10($sp) -/* D55E08 80240258 AFA00014 */ sw $zero, 0x14($sp) -/* D55E0C 8024025C AFA0001C */ sw $zero, 0x1c($sp) -/* D55E10 80240260 080900A3 */ j .L8024028C -/* D55E14 80240264 AFA20018 */ sw $v0, 0x18($sp) -.L80240268: -/* D55E18 80240268 2411000D */ addiu $s1, $zero, 0xd -/* D55E1C 8024026C 24040002 */ addiu $a0, $zero, 2 -/* D55E20 80240270 2405FFFF */ addiu $a1, $zero, -1 -/* D55E24 80240274 0000302D */ daddu $a2, $zero, $zero -/* D55E28 80240278 00C0382D */ daddu $a3, $a2, $zero -/* D55E2C 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* D55E30 80240280 AFA00014 */ sw $zero, 0x14($sp) -/* D55E34 80240284 AFA00018 */ sw $zero, 0x18($sp) -/* D55E38 80240288 AFA0001C */ sw $zero, 0x1c($sp) -.L8024028C: -/* D55E3C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D55E40 80240290 00000000 */ nop -.L80240294: -/* D55E44 80240294 9202000E */ lbu $v0, 0xe($s0) -/* D55E48 80240298 3C01802E */ lui $at, 0x802e -/* D55E4C 8024029C A0229D70 */ sb $v0, -0x6290($at) -/* D55E50 802402A0 080900AD */ j .L802402B4 -/* D55E54 802402A4 0240202D */ daddu $a0, $s2, $zero -.L802402A8: -/* D55E58 802402A8 3C01802E */ lui $at, 0x802e -/* D55E5C 802402AC A0209D70 */ sb $zero, -0x6290($at) -/* D55E60 802402B0 0240202D */ daddu $a0, $s2, $zero -.L802402B4: -/* D55E64 802402B4 AC910000 */ sw $s1, ($a0) -/* D55E68 802402B8 AC900008 */ sw $s0, 8($a0) -/* D55E6C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D55E70 802402C0 3C038024 */ lui $v1, 0x8024 -/* D55E74 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 -/* D55E78 802402C8 AC83000C */ sw $v1, 0xc($a0) -/* D55E7C 802402CC 00021023 */ negu $v0, $v0 -/* D55E80 802402D0 0C047644 */ jal queue_render_task -/* D55E84 802402D4 AC820004 */ sw $v0, 4($a0) -.L802402D8: -/* D55E88 802402D8 8FBF004C */ lw $ra, 0x4c($sp) -/* D55E8C 802402DC 8FB20048 */ lw $s2, 0x48($sp) -/* D55E90 802402E0 8FB10044 */ lw $s1, 0x44($sp) -/* D55E94 802402E4 8FB00040 */ lw $s0, 0x40($sp) -/* D55E98 802402E8 03E00008 */ jr $ra -/* D55E9C 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_05/func_802402F0_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/func_802402F0_D55BB0.s deleted file mode 100644 index 24994ffb19..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/func_802402F0_D55BB0.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D55EA0 -/* D55EA0 802402F0 3C03800A */ lui $v1, 0x800a -/* D55EA4 802402F4 8463A634 */ lh $v1, -0x59cc($v1) -/* D55EA8 802402F8 3C07BF80 */ lui $a3, 0xbf80 -/* D55EAC 802402FC 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D55EB0 80240300 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D55EB4 80240304 4480A000 */ mtc1 $zero, $f20 -/* D55EB8 80240308 AFB1011C */ sw $s1, 0x11c($sp) -/* D55EBC 8024030C 0080882D */ daddu $s1, $a0, $zero -/* D55EC0 80240310 AFB00118 */ sw $s0, 0x118($sp) -/* D55EC4 80240314 27B00098 */ addiu $s0, $sp, 0x98 -/* D55EC8 80240318 AFBF0120 */ sw $ra, 0x120($sp) -/* D55ECC 8024031C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D55ED0 80240320 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D55ED4 80240324 00031080 */ sll $v0, $v1, 2 -/* D55ED8 80240328 00431021 */ addu $v0, $v0, $v1 -/* D55EDC 8024032C 00021080 */ sll $v0, $v0, 2 -/* D55EE0 80240330 00431023 */ subu $v0, $v0, $v1 -/* D55EE4 80240334 000218C0 */ sll $v1, $v0, 3 -/* D55EE8 80240338 00431021 */ addu $v0, $v0, $v1 -/* D55EEC 8024033C 000210C0 */ sll $v0, $v0, 3 -/* D55EF0 80240340 3C01800B */ lui $at, 0x800b -/* D55EF4 80240344 00220821 */ addu $at, $at, $v0 -/* D55EF8 80240348 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D55EFC 8024034C 4406A000 */ mfc1 $a2, $f20 -/* D55F00 80240350 4600B587 */ neg.s $f22, $f22 -/* D55F04 80240354 4405B000 */ mfc1 $a1, $f22 -/* D55F08 80240358 0200202D */ daddu $a0, $s0, $zero -/* D55F0C 8024035C 0C019EC8 */ jal guRotateF -/* D55F10 80240360 E7B40010 */ swc1 $f20, 0x10($sp) -/* D55F14 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D55F18 80240368 0C00A6C9 */ jal clamp_angle -/* D55F1C 8024036C 00000000 */ nop -/* D55F20 80240370 44050000 */ mfc1 $a1, $f0 -/* D55F24 80240374 4406A000 */ mfc1 $a2, $f20 -/* D55F28 80240378 4407A000 */ mfc1 $a3, $f20 -/* D55F2C 8024037C 3C013F80 */ lui $at, 0x3f80 -/* D55F30 80240380 4481C000 */ mtc1 $at, $f24 -/* D55F34 80240384 27A40018 */ addiu $a0, $sp, 0x18 -/* D55F38 80240388 0C019EC8 */ jal guRotateF -/* D55F3C 8024038C E7B80010 */ swc1 $f24, 0x10($sp) -/* D55F40 80240390 0200202D */ daddu $a0, $s0, $zero -/* D55F44 80240394 27A50018 */ addiu $a1, $sp, 0x18 -/* D55F48 80240398 0C019D80 */ jal guMtxCatF -/* D55F4C 8024039C 00A0302D */ daddu $a2, $a1, $zero -/* D55F50 802403A0 4405B000 */ mfc1 $a1, $f22 -/* D55F54 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D55F58 802403A8 4407C000 */ mfc1 $a3, $f24 -/* D55F5C 802403AC 0200202D */ daddu $a0, $s0, $zero -/* D55F60 802403B0 0C019EC8 */ jal guRotateF -/* D55F64 802403B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D55F68 802403B8 27A40018 */ addiu $a0, $sp, 0x18 -/* D55F6C 802403BC 0200282D */ daddu $a1, $s0, $zero -/* D55F70 802403C0 0C019D80 */ jal guMtxCatF -/* D55F74 802403C4 0080302D */ daddu $a2, $a0, $zero -/* D55F78 802403C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D55F7C 802403CC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D55F80 802403D0 4406A000 */ mfc1 $a2, $f20 -/* D55F84 802403D4 4407C000 */ mfc1 $a3, $f24 -/* D55F88 802403D8 0C019EC8 */ jal guRotateF -/* D55F8C 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D55F90 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* D55F94 802403E4 0200282D */ daddu $a1, $s0, $zero -/* D55F98 802403E8 0C019D80 */ jal guMtxCatF -/* D55F9C 802403EC 0080302D */ daddu $a2, $a0, $zero -/* D55FA0 802403F0 3C013F36 */ lui $at, 0x3f36 -/* D55FA4 802403F4 3421DB6E */ ori $at, $at, 0xdb6e -/* D55FA8 802403F8 44810000 */ mtc1 $at, $f0 -/* D55FAC 802403FC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D55FB0 80240400 44050000 */ mfc1 $a1, $f0 -/* D55FB4 80240404 0200202D */ daddu $a0, $s0, $zero -/* D55FB8 80240408 00A0302D */ daddu $a2, $a1, $zero -/* D55FBC 8024040C 0C019DF0 */ jal guScaleF -/* D55FC0 80240410 00A0382D */ daddu $a3, $a1, $zero -/* D55FC4 80240414 27A40018 */ addiu $a0, $sp, 0x18 -/* D55FC8 80240418 0200282D */ daddu $a1, $s0, $zero -/* D55FCC 8024041C 0C019D80 */ jal guMtxCatF -/* D55FD0 80240420 0080302D */ daddu $a2, $a0, $zero -/* D55FD4 80240424 27B00058 */ addiu $s0, $sp, 0x58 -/* D55FD8 80240428 C6200030 */ lwc1 $f0, 0x30($s1) -/* D55FDC 8024042C 3C014040 */ lui $at, 0x4040 -/* D55FE0 80240430 44811000 */ mtc1 $at, $f2 -/* D55FE4 80240434 46000007 */ neg.s $f0, $f0 -/* D55FE8 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* D55FEC 8024043C 8E250028 */ lw $a1, 0x28($s1) -/* D55FF0 80240440 8E26002C */ lw $a2, 0x2c($s1) -/* D55FF4 80240444 44070000 */ mfc1 $a3, $f0 -/* D55FF8 80240448 0C019E40 */ jal guTranslateF -/* D55FFC 8024044C 0200202D */ daddu $a0, $s0, $zero -/* D56000 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* D56004 80240454 0200282D */ daddu $a1, $s0, $zero -/* D56008 80240458 0C019D80 */ jal guMtxCatF -/* D5600C 8024045C 0080302D */ daddu $a2, $a0, $zero -/* D56010 80240460 24040002 */ addiu $a0, $zero, 2 -/* D56014 80240464 0000282D */ daddu $a1, $zero, $zero -/* D56018 80240468 00A0302D */ daddu $a2, $a1, $zero -/* D5601C 8024046C 00A0382D */ daddu $a3, $a1, $zero -/* D56020 80240470 27A20018 */ addiu $v0, $sp, 0x18 -/* D56024 80240474 0C0B7710 */ jal render_sprite -/* D56028 80240478 AFA20010 */ sw $v0, 0x10($sp) -/* D5602C 8024047C 8FBF0120 */ lw $ra, 0x120($sp) -/* D56030 80240480 8FB1011C */ lw $s1, 0x11c($sp) -/* D56034 80240484 8FB00118 */ lw $s0, 0x118($sp) -/* D56038 80240488 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D5603C 8024048C D7B60130 */ ldc1 $f22, 0x130($sp) -/* D56040 80240490 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D56044 80240494 03E00008 */ jr $ra -/* D56048 80240498 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_05/func_8024049C_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/func_8024049C_D55BB0.s deleted file mode 100644 index a769b9aef7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/func_8024049C_D55BB0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_D5604C -/* D5604C 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D56050 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* D56054 802404A4 0080802D */ daddu $s0, $a0, $zero -/* D56058 802404A8 AFBF0014 */ sw $ra, 0x14($sp) -/* D5605C 802404AC 8E020084 */ lw $v0, 0x84($s0) -/* D56060 802404B0 0440000E */ bltz $v0, .L802404EC -/* D56064 802404B4 28420002 */ slti $v0, $v0, 2 -/* D56068 802404B8 1040000C */ beqz $v0, .L802404EC -/* D5606C 802404BC 00000000 */ nop -/* D56070 802404C0 3C058024 */ lui $a1, 0x8024 -/* D56074 802404C4 24A50500 */ addiu $a1, $a1, 0x500 -/* D56078 802404C8 0C048C56 */ jal bind_dynamic_entity_3 -/* D5607C 802404CC 0000202D */ daddu $a0, $zero, $zero -/* D56080 802404D0 8E03013C */ lw $v1, 0x13c($s0) -/* D56084 802404D4 AC620000 */ sw $v0, ($v1) -/* D56088 802404D8 3C03800A */ lui $v1, %hi(D_8009A650) -/* D5608C 802404DC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D56090 802404E0 8C620000 */ lw $v0, ($v1) -/* D56094 802404E4 34420080 */ ori $v0, $v0, 0x80 -/* D56098 802404E8 AC620000 */ sw $v0, ($v1) -.L802404EC: -/* D5609C 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* D560A0 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* D560A4 802404F4 24020002 */ addiu $v0, $zero, 2 -/* D560A8 802404F8 03E00008 */ jr $ra -/* D560AC 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_05/func_80240500_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/func_80240500_D55BB0.s deleted file mode 100644 index 1428bfe572..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/func_80240500_D55BB0.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_D560B0 -/* D560B0 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D560B4 80240504 AFB00040 */ sw $s0, 0x40($sp) -/* D560B8 80240508 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D560BC 8024050C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D560C0 80240510 AFB10044 */ sw $s1, 0x44($sp) -/* D560C4 80240514 AFBF004C */ sw $ra, 0x4c($sp) -/* D560C8 80240518 AFB20048 */ sw $s2, 0x48($sp) -/* D560CC 8024051C 8E020000 */ lw $v0, ($s0) -/* D560D0 80240520 821200BE */ lb $s2, 0xbe($s0) -/* D560D4 80240524 30420001 */ andi $v0, $v0, 1 -/* D560D8 80240528 10400052 */ beqz $v0, .L80240674 -/* D560DC 8024052C 27B10020 */ addiu $s1, $sp, 0x20 -/* D560E0 80240530 8E0400CC */ lw $a0, 0xcc($s0) -/* D560E4 80240534 0C044181 */ jal get_shadow_by_index -/* D560E8 80240538 00000000 */ nop -/* D560EC 8024053C 0C048B77 */ jal func_80122DDC -/* D560F0 80240540 84440008 */ lh $a0, 8($v0) -/* D560F4 80240544 8E050028 */ lw $a1, 0x28($s0) -/* D560F8 80240548 8E070030 */ lw $a3, 0x30($s0) -/* D560FC 8024054C 27A20030 */ addiu $v0, $sp, 0x30 -/* D56100 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* D56104 80240554 27A20034 */ addiu $v0, $sp, 0x34 -/* D56108 80240558 AFA20014 */ sw $v0, 0x14($sp) -/* D5610C 8024055C 27A20038 */ addiu $v0, $sp, 0x38 -/* D56110 80240560 AFA20018 */ sw $v0, 0x18($sp) -/* D56114 80240564 C600002C */ lwc1 $f0, 0x2c($s0) -/* D56118 80240568 3C04800A */ lui $a0, 0x800a -/* D5611C 8024056C 8484A634 */ lh $a0, -0x59cc($a0) -/* D56120 80240570 46000007 */ neg.s $f0, $f0 -/* D56124 80240574 44060000 */ mfc1 $a2, $f0 -/* D56128 80240578 0C00B94E */ jal get_screen_coords -/* D5612C 8024057C 00000000 */ nop -/* D56130 80240580 8E0500A4 */ lw $a1, 0xa4($s0) -/* D56134 80240584 3C063F80 */ lui $a2, 0x3f80 -/* D56138 80240588 0C0B76A3 */ jal func_802DDA8C -/* D5613C 8024058C 24040001 */ addiu $a0, $zero, 1 -/* D56140 80240590 8E020000 */ lw $v0, ($s0) -/* D56144 80240594 3C030002 */ lui $v1, 2 -/* D56148 80240598 00431024 */ and $v0, $v0, $v1 -/* D5614C 8024059C 54400022 */ bnel $v0, $zero, .L80240628 -/* D56150 802405A0 24120011 */ addiu $s2, $zero, 0x11 -/* D56154 802405A4 9203000E */ lbu $v1, 0xe($s0) -/* D56158 802405A8 3C02802E */ lui $v0, 0x802e -/* D5615C 802405AC 90429D71 */ lbu $v0, -0x628f($v0) -/* D56160 802405B0 10620018 */ beq $v1, $v0, .L80240614 -/* D56164 802405B4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D56168 802405B8 1040000B */ beqz $v0, .L802405E8 -/* D5616C 802405BC 24120011 */ addiu $s2, $zero, 0x11 -/* D56170 802405C0 24040001 */ addiu $a0, $zero, 1 -/* D56174 802405C4 2405FFFF */ addiu $a1, $zero, -1 -/* D56178 802405C8 24060007 */ addiu $a2, $zero, 7 -/* D5617C 802405CC 0060102D */ daddu $v0, $v1, $zero -/* D56180 802405D0 0000382D */ daddu $a3, $zero, $zero -/* D56184 802405D4 AFA00010 */ sw $zero, 0x10($sp) -/* D56188 802405D8 AFA00014 */ sw $zero, 0x14($sp) -/* D5618C 802405DC AFA0001C */ sw $zero, 0x1c($sp) -/* D56190 802405E0 08090183 */ j .L8024060C -/* D56194 802405E4 AFA20018 */ sw $v0, 0x18($sp) -.L802405E8: -/* D56198 802405E8 2412000D */ addiu $s2, $zero, 0xd -/* D5619C 802405EC 24040001 */ addiu $a0, $zero, 1 -/* D561A0 802405F0 2405FFFF */ addiu $a1, $zero, -1 -/* D561A4 802405F4 0000302D */ daddu $a2, $zero, $zero -/* D561A8 802405F8 00C0382D */ daddu $a3, $a2, $zero -/* D561AC 802405FC AFA00010 */ sw $zero, 0x10($sp) -/* D561B0 80240600 AFA00014 */ sw $zero, 0x14($sp) -/* D561B4 80240604 AFA00018 */ sw $zero, 0x18($sp) -/* D561B8 80240608 AFA0001C */ sw $zero, 0x1c($sp) -.L8024060C: -/* D561BC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D561C0 80240610 00000000 */ nop -.L80240614: -/* D561C4 80240614 9202000E */ lbu $v0, 0xe($s0) -/* D561C8 80240618 3C01802E */ lui $at, 0x802e -/* D561CC 8024061C A0229D71 */ sb $v0, -0x628f($at) -/* D561D0 80240620 0809018C */ j .L80240630 -/* D561D4 80240624 00000000 */ nop -.L80240628: -/* D561D8 80240628 3C01802E */ lui $at, 0x802e -/* D561DC 8024062C A0209D71 */ sb $zero, -0x628f($at) -.L80240630: -/* D561E0 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D561E4 80240634 3C048024 */ lui $a0, 0x8024 -/* D561E8 80240638 24840870 */ addiu $a0, $a0, 0x870 -/* D561EC 8024063C AE320000 */ sw $s2, ($s1) -/* D561F0 80240640 AE300008 */ sw $s0, 8($s1) -/* D561F4 80240644 00021023 */ negu $v0, $v0 -/* D561F8 80240648 AE220004 */ sw $v0, 4($s1) -/* D561FC 8024064C 8E020000 */ lw $v0, ($s0) -/* D56200 80240650 3C030002 */ lui $v1, 2 -/* D56204 80240654 00431024 */ and $v0, $v0, $v1 -/* D56208 80240658 54400004 */ bnel $v0, $zero, .L8024066C -/* D5620C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D56210 80240660 3C048024 */ lui $a0, 0x8024 -/* D56214 80240664 2484068C */ addiu $a0, $a0, 0x68c -/* D56218 80240668 AE24000C */ sw $a0, 0xc($s1) -.L8024066C: -/* D5621C 8024066C 0C047644 */ jal queue_render_task -/* D56220 80240670 0220202D */ daddu $a0, $s1, $zero -.L80240674: -/* D56224 80240674 8FBF004C */ lw $ra, 0x4c($sp) -/* D56228 80240678 8FB20048 */ lw $s2, 0x48($sp) -/* D5622C 8024067C 8FB10044 */ lw $s1, 0x44($sp) -/* D56230 80240680 8FB00040 */ lw $s0, 0x40($sp) -/* D56234 80240684 03E00008 */ jr $ra -/* D56238 80240688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_05/func_8024068C_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/func_8024068C_D55BB0.s deleted file mode 100644 index 84a0167208..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/func_8024068C_D55BB0.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_D5623C -/* D5623C 8024068C 3C03800A */ lui $v1, 0x800a -/* D56240 80240690 8463A634 */ lh $v1, -0x59cc($v1) -/* D56244 80240694 3C07BF80 */ lui $a3, 0xbf80 -/* D56248 80240698 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D5624C 8024069C F7B40128 */ sdc1 $f20, 0x128($sp) -/* D56250 802406A0 4480A000 */ mtc1 $zero, $f20 -/* D56254 802406A4 AFB1011C */ sw $s1, 0x11c($sp) -/* D56258 802406A8 0080882D */ daddu $s1, $a0, $zero -/* D5625C 802406AC AFB00118 */ sw $s0, 0x118($sp) -/* D56260 802406B0 27B00098 */ addiu $s0, $sp, 0x98 -/* D56264 802406B4 AFBF0120 */ sw $ra, 0x120($sp) -/* D56268 802406B8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D5626C 802406BC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D56270 802406C0 00031080 */ sll $v0, $v1, 2 -/* D56274 802406C4 00431021 */ addu $v0, $v0, $v1 -/* D56278 802406C8 00021080 */ sll $v0, $v0, 2 -/* D5627C 802406CC 00431023 */ subu $v0, $v0, $v1 -/* D56280 802406D0 000218C0 */ sll $v1, $v0, 3 -/* D56284 802406D4 00431021 */ addu $v0, $v0, $v1 -/* D56288 802406D8 000210C0 */ sll $v0, $v0, 3 -/* D5628C 802406DC 3C01800B */ lui $at, 0x800b -/* D56290 802406E0 00220821 */ addu $at, $at, $v0 -/* D56294 802406E4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D56298 802406E8 4406A000 */ mfc1 $a2, $f20 -/* D5629C 802406EC 4600B587 */ neg.s $f22, $f22 -/* D562A0 802406F0 4405B000 */ mfc1 $a1, $f22 -/* D562A4 802406F4 0200202D */ daddu $a0, $s0, $zero -/* D562A8 802406F8 0C019EC8 */ jal guRotateF -/* D562AC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) -/* D562B0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D562B4 80240704 0C00A6C9 */ jal clamp_angle -/* D562B8 80240708 00000000 */ nop -/* D562BC 8024070C 44050000 */ mfc1 $a1, $f0 -/* D562C0 80240710 4406A000 */ mfc1 $a2, $f20 -/* D562C4 80240714 4407A000 */ mfc1 $a3, $f20 -/* D562C8 80240718 3C013F80 */ lui $at, 0x3f80 -/* D562CC 8024071C 4481C000 */ mtc1 $at, $f24 -/* D562D0 80240720 27A40018 */ addiu $a0, $sp, 0x18 -/* D562D4 80240724 0C019EC8 */ jal guRotateF -/* D562D8 80240728 E7B80010 */ swc1 $f24, 0x10($sp) -/* D562DC 8024072C 0200202D */ daddu $a0, $s0, $zero -/* D562E0 80240730 27A50018 */ addiu $a1, $sp, 0x18 -/* D562E4 80240734 0C019D80 */ jal guMtxCatF -/* D562E8 80240738 00A0302D */ daddu $a2, $a1, $zero -/* D562EC 8024073C 4405B000 */ mfc1 $a1, $f22 -/* D562F0 80240740 4406A000 */ mfc1 $a2, $f20 -/* D562F4 80240744 4407C000 */ mfc1 $a3, $f24 -/* D562F8 80240748 0200202D */ daddu $a0, $s0, $zero -/* D562FC 8024074C 0C019EC8 */ jal guRotateF -/* D56300 80240750 E7B40010 */ swc1 $f20, 0x10($sp) -/* D56304 80240754 27A40018 */ addiu $a0, $sp, 0x18 -/* D56308 80240758 0200282D */ daddu $a1, $s0, $zero -/* D5630C 8024075C 0C019D80 */ jal guMtxCatF -/* D56310 80240760 0080302D */ daddu $a2, $a0, $zero -/* D56314 80240764 E7B40010 */ swc1 $f20, 0x10($sp) -/* D56318 80240768 8E2500A8 */ lw $a1, 0xa8($s1) -/* D5631C 8024076C 4406A000 */ mfc1 $a2, $f20 -/* D56320 80240770 4407C000 */ mfc1 $a3, $f24 -/* D56324 80240774 0C019EC8 */ jal guRotateF -/* D56328 80240778 0200202D */ daddu $a0, $s0, $zero -/* D5632C 8024077C 27A40018 */ addiu $a0, $sp, 0x18 -/* D56330 80240780 0200282D */ daddu $a1, $s0, $zero -/* D56334 80240784 0C019D80 */ jal guMtxCatF -/* D56338 80240788 0080302D */ daddu $a2, $a0, $zero -/* D5633C 8024078C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D56340 80240790 3C013F36 */ lui $at, 0x3f36 -/* D56344 80240794 3421DB6E */ ori $at, $at, 0xdb6e -/* D56348 80240798 44810000 */ mtc1 $at, $f0 -/* D5634C 8024079C 0200202D */ daddu $a0, $s0, $zero -/* D56350 802407A0 44050000 */ mfc1 $a1, $f0 -/* D56354 802407A4 3C06BF36 */ lui $a2, 0xbf36 -/* D56358 802407A8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D5635C 802407AC 0C019DF0 */ jal guScaleF -/* D56360 802407B0 00A0382D */ daddu $a3, $a1, $zero -/* D56364 802407B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D56368 802407B8 0200282D */ daddu $a1, $s0, $zero -/* D5636C 802407BC 0C019D80 */ jal guMtxCatF -/* D56370 802407C0 0080302D */ daddu $a2, $a0, $zero -/* D56374 802407C4 27B00058 */ addiu $s0, $sp, 0x58 -/* D56378 802407C8 8E250028 */ lw $a1, 0x28($s1) -/* D5637C 802407CC C620002C */ lwc1 $f0, 0x2c($s1) -/* D56380 802407D0 8E270030 */ lw $a3, 0x30($s1) -/* D56384 802407D4 46000007 */ neg.s $f0, $f0 -/* D56388 802407D8 44060000 */ mfc1 $a2, $f0 -/* D5638C 802407DC 0C019E40 */ jal guTranslateF -/* D56390 802407E0 0200202D */ daddu $a0, $s0, $zero -/* D56394 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D56398 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D5639C 802407EC 0C019D80 */ jal guMtxCatF -/* D563A0 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D563A4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D563A8 802407F8 3C0142B4 */ lui $at, 0x42b4 -/* D563AC 802407FC 44810000 */ mtc1 $at, $f0 -/* D563B0 80240800 00000000 */ nop -/* D563B4 80240804 4602003E */ c.le.s $f0, $f2 -/* D563B8 80240808 00000000 */ nop -/* D563BC 8024080C 4500000A */ bc1f .L80240838 -/* D563C0 80240810 24040001 */ addiu $a0, $zero, 1 -/* D563C4 80240814 3C014387 */ lui $at, 0x4387 -/* D563C8 80240818 44810000 */ mtc1 $at, $f0 -/* D563CC 8024081C 00000000 */ nop -/* D563D0 80240820 4600103C */ c.lt.s $f2, $f0 -/* D563D4 80240824 00000000 */ nop -/* D563D8 80240828 45000004 */ bc1f .L8024083C -/* D563DC 8024082C 27A20018 */ addiu $v0, $sp, 0x18 -/* D563E0 80240830 3C041000 */ lui $a0, 0x1000 -/* D563E4 80240834 34840001 */ ori $a0, $a0, 1 -.L80240838: -/* D563E8 80240838 27A20018 */ addiu $v0, $sp, 0x18 -.L8024083C: -/* D563EC 8024083C 0000282D */ daddu $a1, $zero, $zero -/* D563F0 80240840 00A0302D */ daddu $a2, $a1, $zero -/* D563F4 80240844 00A0382D */ daddu $a3, $a1, $zero -/* D563F8 80240848 0C0B7710 */ jal render_sprite -/* D563FC 8024084C AFA20010 */ sw $v0, 0x10($sp) -/* D56400 80240850 8FBF0120 */ lw $ra, 0x120($sp) -/* D56404 80240854 8FB1011C */ lw $s1, 0x11c($sp) -/* D56408 80240858 8FB00118 */ lw $s0, 0x118($sp) -/* D5640C 8024085C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D56410 80240860 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D56414 80240864 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D56418 80240868 03E00008 */ jr $ra -/* D5641C 8024086C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_05/func_80240870_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/func_80240870_D55BB0.s deleted file mode 100644 index 1c242f75a3..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/func_80240870_D55BB0.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_D56420 -/* D56420 80240870 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D56424 80240874 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D56428 80240878 4480B000 */ mtc1 $zero, $f22 -/* D5642C 8024087C AFB10134 */ sw $s1, 0x134($sp) -/* D56430 80240880 0080882D */ daddu $s1, $a0, $zero -/* D56434 80240884 AFB3013C */ sw $s3, 0x13c($sp) -/* D56438 80240888 0000982D */ daddu $s3, $zero, $zero -/* D5643C 8024088C AFB60148 */ sw $s6, 0x148($sp) -/* D56440 80240890 3C16800B */ lui $s6, %hi(gCameras) -/* D56444 80240894 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D56448 80240898 AFB50144 */ sw $s5, 0x144($sp) -/* D5644C 8024089C 241500FF */ addiu $s5, $zero, 0xff -/* D56450 802408A0 AFB00130 */ sw $s0, 0x130($sp) -/* D56454 802408A4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D56458 802408A8 AFB20138 */ sw $s2, 0x138($sp) -/* D5645C 802408AC 27B20060 */ addiu $s2, $sp, 0x60 -/* D56460 802408B0 AFB40140 */ sw $s4, 0x140($sp) -/* D56464 802408B4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D56468 802408B8 AFBF014C */ sw $ra, 0x14c($sp) -/* D5646C 802408BC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D56470 802408C0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D56474 802408C4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D56478 802408C8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D5647C 802408CC F7B40150 */ sdc1 $f20, 0x150($sp) -.L802408D0: -/* D56480 802408D0 3C03800A */ lui $v1, 0x800a -/* D56484 802408D4 8463A634 */ lh $v1, -0x59cc($v1) -/* D56488 802408D8 00031080 */ sll $v0, $v1, 2 -/* D5648C 802408DC 00431021 */ addu $v0, $v0, $v1 -/* D56490 802408E0 00021080 */ sll $v0, $v0, 2 -/* D56494 802408E4 00431023 */ subu $v0, $v0, $v1 -/* D56498 802408E8 000218C0 */ sll $v1, $v0, 3 -/* D5649C 802408EC 00431021 */ addu $v0, $v0, $v1 -/* D564A0 802408F0 000210C0 */ sll $v0, $v0, 3 -/* D564A4 802408F4 00561021 */ addu $v0, $v0, $s6 -/* D564A8 802408F8 C440006C */ lwc1 $f0, 0x6c($v0) -/* D564AC 802408FC 16600065 */ bnez $s3, .L80240A94 -/* D564B0 80240900 46000507 */ neg.s $f20, $f0 -/* D564B4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D564B8 80240908 3C0142B4 */ lui $at, 0x42b4 -/* D564BC 8024090C 44810000 */ mtc1 $at, $f0 -/* D564C0 80240910 00000000 */ nop -/* D564C4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D564C8 80240918 00000000 */ nop -/* D564CC 8024091C 4500000A */ bc1f .L80240948 -/* D564D0 80240920 00000000 */ nop -/* D564D4 80240924 3C014334 */ lui $at, 0x4334 -/* D564D8 80240928 44812000 */ mtc1 $at, $f4 -/* D564DC 8024092C 00000000 */ nop -/* D564E0 80240930 4604103E */ c.le.s $f2, $f4 -/* D564E4 80240934 00000000 */ nop -/* D564E8 80240938 45000003 */ bc1f .L80240948 -/* D564EC 8024093C 00000000 */ nop -/* D564F0 80240940 08090276 */ j .L802409D8 -/* D564F4 80240944 46022501 */ sub.s $f20, $f4, $f2 -.L80240948: -/* D564F8 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D564FC 8024094C 3C014334 */ lui $at, 0x4334 -/* D56500 80240950 44812000 */ mtc1 $at, $f4 -/* D56504 80240954 00000000 */ nop -/* D56508 80240958 4600203C */ c.lt.s $f4, $f0 -/* D5650C 8024095C 00000000 */ nop -/* D56510 80240960 4500000C */ bc1f .L80240994 -/* D56514 80240964 00000000 */ nop -/* D56518 80240968 3C014387 */ lui $at, 0x4387 -/* D5651C 8024096C 44812000 */ mtc1 $at, $f4 -/* D56520 80240970 00000000 */ nop -/* D56524 80240974 4604003E */ c.le.s $f0, $f4 -/* D56528 80240978 00000000 */ nop -/* D5652C 8024097C 45000008 */ bc1f .L802409A0 -/* D56530 80240980 00000000 */ nop -/* D56534 80240984 3C014334 */ lui $at, 0x4334 -/* D56538 80240988 44812000 */ mtc1 $at, $f4 -/* D5653C 8024098C 08090276 */ j .L802409D8 -/* D56540 80240990 46040501 */ sub.s $f20, $f0, $f4 -.L80240994: -/* D56544 80240994 3C014387 */ lui $at, 0x4387 -/* D56548 80240998 44812000 */ mtc1 $at, $f4 -/* D5654C 8024099C 00000000 */ nop -.L802409A0: -/* D56550 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D56554 802409A4 00000000 */ nop -/* D56558 802409A8 4500000A */ bc1f .L802409D4 -/* D5655C 802409AC 00000000 */ nop -/* D56560 802409B0 3C0143B4 */ lui $at, 0x43b4 -/* D56564 802409B4 44811000 */ mtc1 $at, $f2 -/* D56568 802409B8 00000000 */ nop -/* D5656C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D56570 802409C0 00000000 */ nop -/* D56574 802409C4 45000003 */ bc1f .L802409D4 -/* D56578 802409C8 00000000 */ nop -/* D5657C 802409CC 08090276 */ j .L802409D8 -/* D56580 802409D0 46001501 */ sub.s $f20, $f2, $f0 -.L802409D4: -/* D56584 802409D4 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L802409D8: -/* D56588 802409D8 3C0141C8 */ lui $at, 0x41c8 -/* D5658C 802409DC 44810000 */ mtc1 $at, $f0 -/* D56590 802409E0 00000000 */ nop -/* D56594 802409E4 4600A003 */ div.s $f0, $f20, $f0 -/* D56598 802409E8 4600010D */ trunc.w.s $f4, $f0 -/* D5659C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D565A0 802409F0 00000000 */ nop -/* D565A4 802409F4 00071100 */ sll $v0, $a3, 4 -/* D565A8 802409F8 00471023 */ subu $v0, $v0, $a3 -/* D565AC 802409FC 00021080 */ sll $v0, $v0, 2 -/* D565B0 80240A00 02A23823 */ subu $a3, $s5, $v0 -/* D565B4 80240A04 28E20064 */ slti $v0, $a3, 0x64 -/* D565B8 80240A08 54400001 */ bnel $v0, $zero, .L80240A10 -/* D565BC 80240A0C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A10: -/* D565C0 80240A10 24040001 */ addiu $a0, $zero, 1 -/* D565C4 80240A14 2405FFFF */ addiu $a1, $zero, -1 -/* D565C8 80240A18 24060006 */ addiu $a2, $zero, 6 -/* D565CC 80240A1C AFA70010 */ sw $a3, 0x10($sp) -/* D565D0 80240A20 AFA70014 */ sw $a3, 0x14($sp) -/* D565D4 80240A24 AFB50018 */ sw $s5, 0x18($sp) -/* D565D8 80240A28 0C0B77B9 */ jal func_802DDEE4 -/* D565DC 80240A2C AFA0001C */ sw $zero, 0x1c($sp) -/* D565E0 80240A30 4405A000 */ mfc1 $a1, $f20 -/* D565E4 80240A34 4406B000 */ mfc1 $a2, $f22 -/* D565E8 80240A38 3C07BF80 */ lui $a3, 0xbf80 -/* D565EC 80240A3C 0200202D */ daddu $a0, $s0, $zero -/* D565F0 80240A40 0C019EC8 */ jal guRotateF -/* D565F4 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D565F8 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D565FC 80240A4C 0C00A6C9 */ jal clamp_angle -/* D56600 80240A50 00000000 */ nop -/* D56604 80240A54 44050000 */ mfc1 $a1, $f0 -/* D56608 80240A58 4406B000 */ mfc1 $a2, $f22 -/* D5660C 80240A5C 4407B000 */ mfc1 $a3, $f22 -/* D56610 80240A60 3C013F80 */ lui $at, 0x3f80 -/* D56614 80240A64 44812000 */ mtc1 $at, $f4 -/* D56618 80240A68 27A40020 */ addiu $a0, $sp, 0x20 -/* D5661C 80240A6C 0C019EC8 */ jal guRotateF -/* D56620 80240A70 E7A40010 */ swc1 $f4, 0x10($sp) -/* D56624 80240A74 0200202D */ daddu $a0, $s0, $zero -/* D56628 80240A78 27A50020 */ addiu $a1, $sp, 0x20 -/* D5662C 80240A7C 0C019D80 */ jal guMtxCatF -/* D56630 80240A80 00A0302D */ daddu $a2, $a1, $zero -/* D56634 80240A84 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D56638 80240A88 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D5663C 80240A8C 080902D6 */ j .L80240B58 -/* D56640 80240A90 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240A94: -/* D56644 80240A94 0260202D */ daddu $a0, $s3, $zero -/* D56648 80240A98 27A50120 */ addiu $a1, $sp, 0x120 -/* D5664C 80240A9C 27A60124 */ addiu $a2, $sp, 0x124 -/* D56650 80240AA0 0C03964E */ jal func_800E5938 -/* D56654 80240AA4 27A70128 */ addiu $a3, $sp, 0x128 -/* D56658 80240AA8 8FA60124 */ lw $a2, 0x124($sp) -/* D5665C 80240AAC 3C028000 */ lui $v0, 0x8000 -/* D56660 80240AB0 14C20004 */ bne $a2, $v0, .L80240AC4 -/* D56664 80240AB4 46000606 */ mov.s $f24, $f0 -/* D56668 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D5666C 80240ABC 080902B5 */ j .L80240AD4 -/* D56670 80240AC0 24040001 */ addiu $a0, $zero, 1 -.L80240AC4: -/* D56674 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D56678 80240AC8 00000000 */ nop -/* D5667C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D56680 80240AD0 24040001 */ addiu $a0, $zero, 1 -.L80240AD4: -/* D56684 80240AD4 2405FFFF */ addiu $a1, $zero, -1 -/* D56688 80240AD8 24060007 */ addiu $a2, $zero, 7 -/* D5668C 80240ADC 0000382D */ daddu $a3, $zero, $zero -/* D56690 80240AE0 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D56694 80240AE4 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D56698 80240AE8 24020040 */ addiu $v0, $zero, 0x40 -/* D5669C 80240AEC AFA00010 */ sw $zero, 0x10($sp) -/* D566A0 80240AF0 AFA00014 */ sw $zero, 0x14($sp) -/* D566A4 80240AF4 AFA20018 */ sw $v0, 0x18($sp) -/* D566A8 80240AF8 0C0B77B9 */ jal func_802DDEE4 -/* D566AC 80240AFC AFA0001C */ sw $zero, 0x1c($sp) -/* D566B0 80240B00 4405A000 */ mfc1 $a1, $f20 -/* D566B4 80240B04 4406B000 */ mfc1 $a2, $f22 -/* D566B8 80240B08 3C07BF80 */ lui $a3, 0xbf80 -/* D566BC 80240B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* D566C0 80240B10 0C019EC8 */ jal guRotateF -/* D566C4 80240B14 E7B60010 */ swc1 $f22, 0x10($sp) -/* D566C8 80240B18 4405A000 */ mfc1 $a1, $f20 -/* D566CC 80240B1C 4406B000 */ mfc1 $a2, $f22 -/* D566D0 80240B20 3C07BF80 */ lui $a3, 0xbf80 -/* D566D4 80240B24 0200202D */ daddu $a0, $s0, $zero -/* D566D8 80240B28 0C019EC8 */ jal guRotateF -/* D566DC 80240B2C E7B60010 */ swc1 $f22, 0x10($sp) -/* D566E0 80240B30 4405C000 */ mfc1 $a1, $f24 -/* D566E4 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D566E8 80240B38 3C073F80 */ lui $a3, 0x3f80 -/* D566EC 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D566F0 80240B40 0C019EC8 */ jal guRotateF -/* D566F4 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D566F8 80240B48 0200202D */ daddu $a0, $s0, $zero -/* D566FC 80240B4C 27A50020 */ addiu $a1, $sp, 0x20 -/* D56700 80240B50 0C019D80 */ jal guMtxCatF -/* D56704 80240B54 00A0302D */ daddu $a2, $a1, $zero -.L80240B58: -/* D56708 80240B58 862200B0 */ lh $v0, 0xb0($s1) -/* D5670C 80240B5C 3C013F00 */ lui $at, 0x3f00 -/* D56710 80240B60 44812000 */ mtc1 $at, $f4 -/* D56714 80240B64 00021023 */ negu $v0, $v0 -/* D56718 80240B68 44820000 */ mtc1 $v0, $f0 -/* D5671C 80240B6C 00000000 */ nop -/* D56720 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* D56724 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D56728 80240B78 00000000 */ nop -/* D5672C 80240B7C 4405B000 */ mfc1 $a1, $f22 -/* D56730 80240B80 4407B000 */ mfc1 $a3, $f22 -/* D56734 80240B84 44062000 */ mfc1 $a2, $f4 -/* D56738 80240B88 0C019E40 */ jal guTranslateF -/* D5673C 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* D56740 80240B90 0240202D */ daddu $a0, $s2, $zero -/* D56744 80240B94 27A50020 */ addiu $a1, $sp, 0x20 -/* D56748 80240B98 0C019D80 */ jal guMtxCatF -/* D5674C 80240B9C 00A0302D */ daddu $a2, $a1, $zero -/* D56750 80240BA0 4405A000 */ mfc1 $a1, $f20 -/* D56754 80240BA4 4406B000 */ mfc1 $a2, $f22 -/* D56758 80240BA8 3C073F80 */ lui $a3, 0x3f80 -/* D5675C 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* D56760 80240BB0 0C019EC8 */ jal guRotateF -/* D56764 80240BB4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D56768 80240BB8 27A40020 */ addiu $a0, $sp, 0x20 -/* D5676C 80240BBC 0200282D */ daddu $a1, $s0, $zero -/* D56770 80240BC0 0C019D80 */ jal guMtxCatF -/* D56774 80240BC4 0080302D */ daddu $a2, $a0, $zero -/* D56778 80240BC8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D5677C 80240BCC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D56780 80240BD0 4406B000 */ mfc1 $a2, $f22 -/* D56784 80240BD4 3C073F80 */ lui $a3, 0x3f80 -/* D56788 80240BD8 0C019EC8 */ jal guRotateF -/* D5678C 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D56790 80240BE0 27A40020 */ addiu $a0, $sp, 0x20 -/* D56794 80240BE4 0200282D */ daddu $a1, $s0, $zero -/* D56798 80240BE8 0C019D80 */ jal guMtxCatF -/* D5679C 80240BEC 0080302D */ daddu $a2, $a0, $zero -/* D567A0 80240BF0 862200B0 */ lh $v0, 0xb0($s1) -/* D567A4 80240BF4 3C013F00 */ lui $at, 0x3f00 -/* D567A8 80240BF8 44812000 */ mtc1 $at, $f4 -/* D567AC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D567B0 80240C00 00000000 */ nop -/* D567B4 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* D567B8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D567BC 80240C0C 00000000 */ nop -/* D567C0 80240C10 4405B000 */ mfc1 $a1, $f22 -/* D567C4 80240C14 4407B000 */ mfc1 $a3, $f22 -/* D567C8 80240C18 44062000 */ mfc1 $a2, $f4 -/* D567CC 80240C1C 0C019E40 */ jal guTranslateF -/* D567D0 80240C20 0240202D */ daddu $a0, $s2, $zero -/* D567D4 80240C24 27A40020 */ addiu $a0, $sp, 0x20 -/* D567D8 80240C28 0240282D */ daddu $a1, $s2, $zero -/* D567DC 80240C2C 0C019D80 */ jal guMtxCatF -/* D567E0 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D567E4 80240C34 3C013F36 */ lui $at, 0x3f36 -/* D567E8 80240C38 3421DB6E */ ori $at, $at, 0xdb6e -/* D567EC 80240C3C 44810000 */ mtc1 $at, $f0 -/* D567F0 80240C40 0280202D */ daddu $a0, $s4, $zero -/* D567F4 80240C44 44050000 */ mfc1 $a1, $f0 -/* D567F8 80240C48 3C06BF36 */ lui $a2, 0xbf36 -/* D567FC 80240C4C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D56800 80240C50 0C019DF0 */ jal guScaleF -/* D56804 80240C54 00A0382D */ daddu $a3, $a1, $zero -/* D56808 80240C58 27A40020 */ addiu $a0, $sp, 0x20 -/* D5680C 80240C5C 0280282D */ daddu $a1, $s4, $zero -/* D56810 80240C60 0C019D80 */ jal guMtxCatF -/* D56814 80240C64 0080302D */ daddu $a2, $a0, $zero -/* D56818 80240C68 4600D687 */ neg.s $f26, $f26 -/* D5681C 80240C6C 4405F000 */ mfc1 $a1, $f30 -/* D56820 80240C70 4407E000 */ mfc1 $a3, $f28 -/* D56824 80240C74 4406D000 */ mfc1 $a2, $f26 -/* D56828 80240C78 0C019E40 */ jal guTranslateF -/* D5682C 80240C7C 0240202D */ daddu $a0, $s2, $zero -/* D56830 80240C80 27A40020 */ addiu $a0, $sp, 0x20 -/* D56834 80240C84 0240282D */ daddu $a1, $s2, $zero -/* D56838 80240C88 0C019D80 */ jal guMtxCatF -/* D5683C 80240C8C 0080302D */ daddu $a2, $a0, $zero -/* D56840 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D56844 80240C94 3C0142B4 */ lui $at, 0x42b4 -/* D56848 80240C98 44810000 */ mtc1 $at, $f0 -/* D5684C 80240C9C 00000000 */ nop -/* D56850 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D56854 80240CA4 00000000 */ nop -/* D56858 80240CA8 4500000A */ bc1f .L80240CD4 -/* D5685C 80240CAC 24040001 */ addiu $a0, $zero, 1 -/* D56860 80240CB0 3C014387 */ lui $at, 0x4387 -/* D56864 80240CB4 44812000 */ mtc1 $at, $f4 -/* D56868 80240CB8 00000000 */ nop -/* D5686C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D56870 80240CC0 00000000 */ nop -/* D56874 80240CC4 45000004 */ bc1f .L80240CD8 -/* D56878 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 -/* D5687C 80240CCC 3C041000 */ lui $a0, 0x1000 -/* D56880 80240CD0 34840001 */ ori $a0, $a0, 1 -.L80240CD4: -/* D56884 80240CD4 27A20020 */ addiu $v0, $sp, 0x20 -.L80240CD8: -/* D56888 80240CD8 AFA20010 */ sw $v0, 0x10($sp) -/* D5688C 80240CDC 0000282D */ daddu $a1, $zero, $zero -/* D56890 80240CE0 00A0302D */ daddu $a2, $a1, $zero -/* D56894 80240CE4 0C0B7710 */ jal render_sprite -/* D56898 80240CE8 00A0382D */ daddu $a3, $a1, $zero -/* D5689C 80240CEC 26730001 */ addiu $s3, $s3, 1 -/* D568A0 80240CF0 2A620002 */ slti $v0, $s3, 2 -/* D568A4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D568A8 80240CF8 00000000 */ nop -/* D568AC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) -/* D568B0 80240D00 8FB60148 */ lw $s6, 0x148($sp) -/* D568B4 80240D04 8FB50144 */ lw $s5, 0x144($sp) -/* D568B8 80240D08 8FB40140 */ lw $s4, 0x140($sp) -/* D568BC 80240D0C 8FB3013C */ lw $s3, 0x13c($sp) -/* D568C0 80240D10 8FB20138 */ lw $s2, 0x138($sp) -/* D568C4 80240D14 8FB10134 */ lw $s1, 0x134($sp) -/* D568C8 80240D18 8FB00130 */ lw $s0, 0x130($sp) -/* D568CC 80240D1C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D568D0 80240D20 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D568D4 80240D24 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D568D8 80240D28 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D568DC 80240D2C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D568E0 80240D30 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D568E4 80240D34 03E00008 */ jr $ra -/* D568E8 80240D38 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_05/func_80240D3C_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/func_80240D3C_D55BB0.s deleted file mode 100644 index 81e0896504..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/func_80240D3C_D55BB0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_D568EC -/* D568EC 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D568F0 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D568F4 80240D44 0080802D */ daddu $s0, $a0, $zero -/* D568F8 80240D48 AFBF0014 */ sw $ra, 0x14($sp) -/* D568FC 80240D4C 8E020088 */ lw $v0, 0x88($s0) -/* D56900 80240D50 14400017 */ bnez $v0, .L80240DB0 -/* D56904 80240D54 24020001 */ addiu $v0, $zero, 1 -/* D56908 80240D58 8E030084 */ lw $v1, 0x84($s0) -/* D5690C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D56910 80240D60 00000000 */ nop -/* D56914 80240D64 28620002 */ slti $v0, $v1, 2 -/* D56918 80240D68 50400005 */ beql $v0, $zero, .L80240D80 -/* D5691C 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* D56920 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D56924 80240D74 00000000 */ nop -/* D56928 80240D78 08090378 */ j .L80240DE0 -/* D5692C 80240D7C 00000000 */ nop -.L80240D80: -/* D56930 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D56934 80240D84 00000000 */ nop -/* D56938 80240D88 08090378 */ j .L80240DE0 -/* D5693C 80240D8C 00000000 */ nop -.L80240D90: -/* D56940 80240D90 3C048024 */ lui $a0, 0x8024 -/* D56944 80240D94 24840E84 */ addiu $a0, $a0, 0xe84 -/* D56948 80240D98 08090374 */ j .L80240DD0 -/* D5694C 80240D9C 00000000 */ nop -.L80240DA0: -/* D56950 80240DA0 3C048024 */ lui $a0, 0x8024 -/* D56954 80240DA4 24840EEC */ addiu $a0, $a0, 0xeec -/* D56958 80240DA8 08090374 */ j .L80240DD0 -/* D5695C 80240DAC 00000000 */ nop -.L80240DB0: -/* D56960 80240DB0 8E020084 */ lw $v0, 0x84($s0) -/* D56964 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D56968 80240DB8 00000000 */ nop -/* D5696C 80240DBC 28420002 */ slti $v0, $v0, 2 -/* D56970 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D56974 80240DC4 00000000 */ nop -.L80240DC8: -/* D56978 80240DC8 3C048024 */ lui $a0, 0x8024 -/* D5697C 80240DCC 24840EB8 */ addiu $a0, $a0, 0xeb8 -.L80240DD0: -/* D56980 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 -/* D56984 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* D56988 80240DD8 8E03013C */ lw $v1, 0x13c($s0) -/* D5698C 80240DDC AC620004 */ sw $v0, 4($v1) -.L80240DE0: -/* D56990 80240DE0 0C00EAD2 */ jal get_npc_safe -/* D56994 80240DE4 2404FFFC */ addiu $a0, $zero, -4 -/* D56998 80240DE8 0040282D */ daddu $a1, $v0, $zero -/* D5699C 80240DEC 10A00021 */ beqz $a1, .L80240E74 -/* D569A0 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* D569A4 80240DF4 8E020088 */ lw $v0, 0x88($s0) -/* D569A8 80240DF8 14400014 */ bnez $v0, .L80240E4C -/* D569AC 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* D569B0 80240E00 8E040084 */ lw $a0, 0x84($s0) -/* D569B4 80240E04 10820016 */ beq $a0, $v0, .L80240E60 -/* D569B8 80240E08 28820002 */ slti $v0, $a0, 2 -/* D569BC 80240E0C 10400005 */ beqz $v0, .L80240E24 -/* D569C0 80240E10 24020002 */ addiu $v0, $zero, 2 -/* D569C4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D569C8 80240E18 00000000 */ nop -/* D569CC 80240E1C 0809039D */ j .L80240E74 -/* D569D0 80240E20 00000000 */ nop -.L80240E24: -/* D569D4 80240E24 10820006 */ beq $a0, $v0, .L80240E40 -/* D569D8 80240E28 24020002 */ addiu $v0, $zero, 2 -/* D569DC 80240E2C 0809039D */ j .L80240E74 -/* D569E0 80240E30 00000000 */ nop -.L80240E34: -/* D569E4 80240E34 8CA20000 */ lw $v0, ($a1) -/* D569E8 80240E38 0809039A */ j .L80240E68 -/* D569EC 80240E3C 3C03000A */ lui $v1, 0xa -.L80240E40: -/* D569F0 80240E40 8CA20000 */ lw $v0, ($a1) -/* D569F4 80240E44 0809039A */ j .L80240E68 -/* D569F8 80240E48 3C030002 */ lui $v1, 2 -.L80240E4C: -/* D569FC 80240E4C 8E020084 */ lw $v0, 0x84($s0) -/* D56A00 80240E50 04400007 */ bltz $v0, .L80240E70 -/* D56A04 80240E54 28420002 */ slti $v0, $v0, 2 -/* D56A08 80240E58 10400006 */ beqz $v0, .L80240E74 -/* D56A0C 80240E5C 24020002 */ addiu $v0, $zero, 2 -.L80240E60: -/* D56A10 80240E60 8CA20000 */ lw $v0, ($a1) -/* D56A14 80240E64 3C030008 */ lui $v1, 8 -.L80240E68: -/* D56A18 80240E68 00431025 */ or $v0, $v0, $v1 -/* D56A1C 80240E6C ACA20000 */ sw $v0, ($a1) -.L80240E70: -/* D56A20 80240E70 24020002 */ addiu $v0, $zero, 2 -.L80240E74: -/* D56A24 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* D56A28 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* D56A2C 80240E7C 03E00008 */ jr $ra -/* D56A30 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_05/func_80240E84_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/func_80240E84_D55BB0.s deleted file mode 100644 index 47cd3c7dab..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/func_80240E84_D55BB0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D56A34 -/* D56A34 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D56A38 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D56A3C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D56A40 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D56A44 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D56A48 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D56A4C 80240E9C 3C03000A */ lui $v1, 0xa -/* D56A50 80240EA0 8C820000 */ lw $v0, ($a0) -/* D56A54 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D56A58 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D56A5C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D56A60 80240EB0 03E00008 */ jr $ra -/* D56A64 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_05/func_80240EB8_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/func_80240EB8_D55BB0.s deleted file mode 100644 index c42acfe516..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/func_80240EB8_D55BB0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D56A68 -/* D56A68 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D56A6C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D56A70 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D56A74 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D56A78 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D56A7C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D56A80 80240ED0 3C030008 */ lui $v1, 8 -/* D56A84 80240ED4 8C820000 */ lw $v0, ($a0) -/* D56A88 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D56A8C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D56A90 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D56A94 80240EE4 03E00008 */ jr $ra -/* D56A98 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_05/func_80240EEC_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/func_80240EEC_D55BB0.s deleted file mode 100644 index 85a5c63b6c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/func_80240EEC_D55BB0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D56A9C -/* D56A9C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D56AA0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D56AA4 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D56AA8 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D56AAC 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D56AB0 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D56AB4 80240F04 3C030002 */ lui $v1, 2 -/* D56AB8 80240F08 8C820000 */ lw $v0, ($a0) -/* D56ABC 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D56AC0 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D56AC4 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D56AC8 80240F18 03E00008 */ jr $ra -/* D56ACC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_05/func_80240F20_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/func_80240F20_D55BB0.s deleted file mode 100644 index 8c9f17584f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/func_80240F20_D55BB0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D56AD0 -/* D56AD0 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D56AD4 80240F24 AFB00010 */ sw $s0, 0x10($sp) -/* D56AD8 80240F28 3C108024 */ lui $s0, 0x8024 -/* D56ADC 80240F2C 26101680 */ addiu $s0, $s0, 0x1680 -/* D56AE0 80240F30 AFBF0018 */ sw $ra, 0x18($sp) -/* D56AE4 80240F34 AFB10014 */ sw $s1, 0x14($sp) -/* D56AE8 80240F38 8E020000 */ lw $v0, ($s0) -/* D56AEC 80240F3C 14400010 */ bnez $v0, .L80240F80 -/* D56AF0 80240F40 0080882D */ daddu $s1, $a0, $zero -/* D56AF4 80240F44 0C00AB39 */ jal heap_malloc -/* D56AF8 80240F48 24040040 */ addiu $a0, $zero, 0x40 -/* D56AFC 80240F4C AE020000 */ sw $v0, ($s0) -/* D56B00 80240F50 0000182D */ daddu $v1, $zero, $zero -/* D56B04 80240F54 0040282D */ daddu $a1, $v0, $zero -/* D56B08 80240F58 0220202D */ daddu $a0, $s1, $zero -.L80240F5C: -/* D56B0C 80240F5C 8C820084 */ lw $v0, 0x84($a0) -/* D56B10 80240F60 24840004 */ addiu $a0, $a0, 4 -/* D56B14 80240F64 24630001 */ addiu $v1, $v1, 1 -/* D56B18 80240F68 ACA20000 */ sw $v0, ($a1) -/* D56B1C 80240F6C 28620010 */ slti $v0, $v1, 0x10 -/* D56B20 80240F70 1440FFFA */ bnez $v0, .L80240F5C -/* D56B24 80240F74 24A50004 */ addiu $a1, $a1, 4 -/* D56B28 80240F78 080903EF */ j .L80240FBC -/* D56B2C 80240F7C 00000000 */ nop -.L80240F80: -/* D56B30 80240F80 0000182D */ daddu $v1, $zero, $zero -/* D56B34 80240F84 0040282D */ daddu $a1, $v0, $zero -/* D56B38 80240F88 0220202D */ daddu $a0, $s1, $zero -.L80240F8C: -/* D56B3C 80240F8C 8CA20000 */ lw $v0, ($a1) -/* D56B40 80240F90 24A50004 */ addiu $a1, $a1, 4 -/* D56B44 80240F94 24630001 */ addiu $v1, $v1, 1 -/* D56B48 80240F98 AC820084 */ sw $v0, 0x84($a0) -/* D56B4C 80240F9C 28620010 */ slti $v0, $v1, 0x10 -/* D56B50 80240FA0 1440FFFA */ bnez $v0, .L80240F8C -/* D56B54 80240FA4 24840004 */ addiu $a0, $a0, 4 -/* D56B58 80240FA8 3C108024 */ lui $s0, 0x8024 -/* D56B5C 80240FAC 26101680 */ addiu $s0, $s0, 0x1680 -/* D56B60 80240FB0 0C00AB4B */ jal heap_free -/* D56B64 80240FB4 8E040000 */ lw $a0, ($s0) -/* D56B68 80240FB8 AE000000 */ sw $zero, ($s0) -.L80240FBC: -/* D56B6C 80240FBC 8FBF0018 */ lw $ra, 0x18($sp) -/* D56B70 80240FC0 8FB10014 */ lw $s1, 0x14($sp) -/* D56B74 80240FC4 8FB00010 */ lw $s0, 0x10($sp) -/* D56B78 80240FC8 24020002 */ addiu $v0, $zero, 2 -/* D56B7C 80240FCC 03E00008 */ jr $ra -/* D56B80 80240FD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_05/func_80240FD4_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/func_80240FD4_D55BB0.s deleted file mode 100644 index 5688f46237..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/func_80240FD4_D55BB0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD4_D56B84 -/* D56B84 80240FD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D56B88 80240FD8 AFB00010 */ sw $s0, 0x10($sp) -/* D56B8C 80240FDC 0080802D */ daddu $s0, $a0, $zero -/* D56B90 80240FE0 AFBF0018 */ sw $ra, 0x18($sp) -/* D56B94 80240FE4 AFB10014 */ sw $s1, 0x14($sp) -/* D56B98 80240FE8 8E02000C */ lw $v0, 0xc($s0) -/* D56B9C 80240FEC 8C510000 */ lw $s1, ($v0) -/* D56BA0 80240FF0 0C0B1EAF */ jal get_variable -/* D56BA4 80240FF4 0220282D */ daddu $a1, $s1, $zero -/* D56BA8 80240FF8 3C03FFF0 */ lui $v1, 0xfff0 -/* D56BAC 80240FFC 3463FFFF */ ori $v1, $v1, 0xffff -/* D56BB0 80241000 0200202D */ daddu $a0, $s0, $zero -/* D56BB4 80241004 00431024 */ and $v0, $v0, $v1 -/* D56BB8 80241008 00021140 */ sll $v0, $v0, 5 -/* D56BBC 8024100C 3C068008 */ lui $a2, %hi(gItemTable) -/* D56BC0 80241010 00C23021 */ addu $a2, $a2, $v0 -/* D56BC4 80241014 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D56BC8 80241018 0C0B2026 */ jal set_variable -/* D56BCC 8024101C 0220282D */ daddu $a1, $s1, $zero -/* D56BD0 80241020 8FBF0018 */ lw $ra, 0x18($sp) -/* D56BD4 80241024 8FB10014 */ lw $s1, 0x14($sp) -/* D56BD8 80241028 8FB00010 */ lw $s0, 0x10($sp) -/* D56BDC 8024102C 24020002 */ addiu $v0, $zero, 2 -/* D56BE0 80241030 03E00008 */ jr $ra -/* D56BE4 80241034 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_05/func_80241038_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/func_80241038_D55BB0.s deleted file mode 100644 index b357bf6367..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/func_80241038_D55BB0.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_06/func_80240050_D57430.s b/asm/nonmatchings/world/area_pra/pra_06/func_80240050_D57430.s deleted file mode 100644 index a0539a2faf..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/func_80240050_D57430.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D57480 -/* D57480 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D57484 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D57488 80240058 00822024 */ and $a0, $a0, $v0 -/* D5748C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D57490 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D57494 80240064 00821821 */ addu $v1, $a0, $v0 -/* D57498 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D5749C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D574A0 80240070 30620001 */ andi $v0, $v1, 1 -/* D574A4 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D574A8 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D574AC 8024007C 03E00008 */ jr $ra -/* D574B0 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_06/func_8024011C_D57430.s b/asm/nonmatchings/world/area_pra/pra_06/func_8024011C_D57430.s deleted file mode 100644 index 673d8b0aa6..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/func_8024011C_D57430.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024011C_D5754C -/* D5754C 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D57550 80240120 AFB00010 */ sw $s0, 0x10($sp) -/* D57554 80240124 0080802D */ daddu $s0, $a0, $zero -/* D57558 80240128 3C058024 */ lui $a1, 0x8024 -/* D5755C 8024012C 24A50158 */ addiu $a1, $a1, 0x158 -/* D57560 80240130 AFBF0014 */ sw $ra, 0x14($sp) -/* D57564 80240134 0C048C56 */ jal bind_dynamic_entity_3 -/* D57568 80240138 0000202D */ daddu $a0, $zero, $zero -/* D5756C 8024013C 8E03013C */ lw $v1, 0x13c($s0) -/* D57570 80240140 AC620000 */ sw $v0, ($v1) -/* D57574 80240144 8FBF0014 */ lw $ra, 0x14($sp) -/* D57578 80240148 8FB00010 */ lw $s0, 0x10($sp) -/* D5757C 8024014C 24020002 */ addiu $v0, $zero, 2 -/* D57580 80240150 03E00008 */ jr $ra -/* D57584 80240154 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_06/func_80240158_D57430.s b/asm/nonmatchings/world/area_pra/pra_06/func_80240158_D57430.s deleted file mode 100644 index 3ecc24c17b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/func_80240158_D57430.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_D57588 -/* D57588 80240158 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D5758C 8024015C AFB00040 */ sw $s0, 0x40($sp) -/* D57590 80240160 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D57594 80240164 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D57598 80240168 AFB20048 */ sw $s2, 0x48($sp) -/* D5759C 8024016C AFBF004C */ sw $ra, 0x4c($sp) -/* D575A0 80240170 AFB10044 */ sw $s1, 0x44($sp) -/* D575A4 80240174 8E020000 */ lw $v0, ($s0) -/* D575A8 80240178 821100BE */ lb $s1, 0xbe($s0) -/* D575AC 8024017C 30420001 */ andi $v0, $v0, 1 -/* D575B0 80240180 10400061 */ beqz $v0, .L80240308 -/* D575B4 80240184 27B20020 */ addiu $s2, $sp, 0x20 -/* D575B8 80240188 8E0400CC */ lw $a0, 0xcc($s0) -/* D575BC 8024018C 0C044181 */ jal get_shadow_by_index -/* D575C0 80240190 00000000 */ nop -/* D575C4 80240194 0C048B77 */ jal func_80122DDC -/* D575C8 80240198 84440008 */ lh $a0, 8($v0) -/* D575CC 8024019C 8C430000 */ lw $v1, ($v0) -/* D575D0 802401A0 34630200 */ ori $v1, $v1, 0x200 -/* D575D4 802401A4 AC430000 */ sw $v1, ($v0) -/* D575D8 802401A8 8E050028 */ lw $a1, 0x28($s0) -/* D575DC 802401AC 8E06002C */ lw $a2, 0x2c($s0) -/* D575E0 802401B0 27A20030 */ addiu $v0, $sp, 0x30 -/* D575E4 802401B4 AFA20010 */ sw $v0, 0x10($sp) -/* D575E8 802401B8 27A20034 */ addiu $v0, $sp, 0x34 -/* D575EC 802401BC AFA20014 */ sw $v0, 0x14($sp) -/* D575F0 802401C0 C6000030 */ lwc1 $f0, 0x30($s0) -/* D575F4 802401C4 3C04800A */ lui $a0, 0x800a -/* D575F8 802401C8 8484A634 */ lh $a0, -0x59cc($a0) -/* D575FC 802401CC 46000007 */ neg.s $f0, $f0 -/* D57600 802401D0 44070000 */ mfc1 $a3, $f0 -/* D57604 802401D4 27A20038 */ addiu $v0, $sp, 0x38 -/* D57608 802401D8 0C00B94E */ jal get_screen_coords -/* D5760C 802401DC AFA20018 */ sw $v0, 0x18($sp) -/* D57610 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D57614 802401E4 0C090014 */ jal func_80240050 -/* D57618 802401E8 00000000 */ nop -/* D5761C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) -/* D57620 802401F0 3C014307 */ lui $at, 0x4307 -/* D57624 802401F4 44810000 */ mtc1 $at, $f0 -/* D57628 802401F8 00000000 */ nop -/* D5762C 802401FC 4602003C */ c.lt.s $f0, $f2 -/* D57630 80240200 00000000 */ nop -/* D57634 80240204 4500000B */ bc1f .L80240234 -/* D57638 80240208 24040002 */ addiu $a0, $zero, 2 -/* D5763C 8024020C 3C014361 */ lui $at, 0x4361 -/* D57640 80240210 44810000 */ mtc1 $at, $f0 -/* D57644 80240214 00000000 */ nop -/* D57648 80240218 4600103C */ c.lt.s $f2, $f0 -/* D5764C 8024021C 00000000 */ nop -/* D57650 80240220 45000004 */ bc1f .L80240234 -/* D57654 80240224 00000000 */ nop -/* D57658 80240228 0C090021 */ jal func_80240084 -/* D5765C 8024022C 0040202D */ daddu $a0, $v0, $zero -/* D57660 80240230 24040002 */ addiu $a0, $zero, 2 -.L80240234: -/* D57664 80240234 3C063F80 */ lui $a2, 0x3f80 -/* D57668 80240238 0C0B76A3 */ jal func_802DDA8C -/* D5766C 8024023C 0040282D */ daddu $a1, $v0, $zero -/* D57670 80240240 8E020000 */ lw $v0, ($s0) -/* D57674 80240244 3C030002 */ lui $v1, 2 -/* D57678 80240248 00431024 */ and $v0, $v0, $v1 -/* D5767C 8024024C 54400022 */ bnel $v0, $zero, .L802402D8 -/* D57680 80240250 24110011 */ addiu $s1, $zero, 0x11 -/* D57684 80240254 9203000E */ lbu $v1, 0xe($s0) -/* D57688 80240258 3C02802E */ lui $v0, 0x802e -/* D5768C 8024025C 90429D70 */ lbu $v0, -0x6290($v0) -/* D57690 80240260 10620018 */ beq $v1, $v0, .L802402C4 -/* D57694 80240264 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D57698 80240268 1040000B */ beqz $v0, .L80240298 -/* D5769C 8024026C 24110011 */ addiu $s1, $zero, 0x11 -/* D576A0 80240270 24040002 */ addiu $a0, $zero, 2 -/* D576A4 80240274 2405FFFF */ addiu $a1, $zero, -1 -/* D576A8 80240278 24060007 */ addiu $a2, $zero, 7 -/* D576AC 8024027C 0060102D */ daddu $v0, $v1, $zero -/* D576B0 80240280 0000382D */ daddu $a3, $zero, $zero -/* D576B4 80240284 AFA00010 */ sw $zero, 0x10($sp) -/* D576B8 80240288 AFA00014 */ sw $zero, 0x14($sp) -/* D576BC 8024028C AFA0001C */ sw $zero, 0x1c($sp) -/* D576C0 80240290 080900AF */ j .L802402BC -/* D576C4 80240294 AFA20018 */ sw $v0, 0x18($sp) -.L80240298: -/* D576C8 80240298 2411000D */ addiu $s1, $zero, 0xd -/* D576CC 8024029C 24040002 */ addiu $a0, $zero, 2 -/* D576D0 802402A0 2405FFFF */ addiu $a1, $zero, -1 -/* D576D4 802402A4 0000302D */ daddu $a2, $zero, $zero -/* D576D8 802402A8 00C0382D */ daddu $a3, $a2, $zero -/* D576DC 802402AC AFA00010 */ sw $zero, 0x10($sp) -/* D576E0 802402B0 AFA00014 */ sw $zero, 0x14($sp) -/* D576E4 802402B4 AFA00018 */ sw $zero, 0x18($sp) -/* D576E8 802402B8 AFA0001C */ sw $zero, 0x1c($sp) -.L802402BC: -/* D576EC 802402BC 0C0B77B9 */ jal func_802DDEE4 -/* D576F0 802402C0 00000000 */ nop -.L802402C4: -/* D576F4 802402C4 9202000E */ lbu $v0, 0xe($s0) -/* D576F8 802402C8 3C01802E */ lui $at, 0x802e -/* D576FC 802402CC A0229D70 */ sb $v0, -0x6290($at) -/* D57700 802402D0 080900B9 */ j .L802402E4 -/* D57704 802402D4 0240202D */ daddu $a0, $s2, $zero -.L802402D8: -/* D57708 802402D8 3C01802E */ lui $at, 0x802e -/* D5770C 802402DC A0209D70 */ sb $zero, -0x6290($at) -/* D57710 802402E0 0240202D */ daddu $a0, $s2, $zero -.L802402E4: -/* D57714 802402E4 AC910000 */ sw $s1, ($a0) -/* D57718 802402E8 AC900008 */ sw $s0, 8($a0) -/* D5771C 802402EC 8FA20038 */ lw $v0, 0x38($sp) -/* D57720 802402F0 3C038024 */ lui $v1, 0x8024 -/* D57724 802402F4 24630320 */ addiu $v1, $v1, 0x320 -/* D57728 802402F8 AC83000C */ sw $v1, 0xc($a0) -/* D5772C 802402FC 00021023 */ negu $v0, $v0 -/* D57730 80240300 0C047644 */ jal queue_render_task -/* D57734 80240304 AC820004 */ sw $v0, 4($a0) -.L80240308: -/* D57738 80240308 8FBF004C */ lw $ra, 0x4c($sp) -/* D5773C 8024030C 8FB20048 */ lw $s2, 0x48($sp) -/* D57740 80240310 8FB10044 */ lw $s1, 0x44($sp) -/* D57744 80240314 8FB00040 */ lw $s0, 0x40($sp) -/* D57748 80240318 03E00008 */ jr $ra -/* D5774C 8024031C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_06/func_80240320_D57430.s b/asm/nonmatchings/world/area_pra/pra_06/func_80240320_D57430.s deleted file mode 100644 index 693a422519..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/func_80240320_D57430.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240320_D57750 -/* D57750 80240320 3C03800A */ lui $v1, 0x800a -/* D57754 80240324 8463A634 */ lh $v1, -0x59cc($v1) -/* D57758 80240328 3C07BF80 */ lui $a3, 0xbf80 -/* D5775C 8024032C 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D57760 80240330 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D57764 80240334 4480A000 */ mtc1 $zero, $f20 -/* D57768 80240338 AFB1011C */ sw $s1, 0x11c($sp) -/* D5776C 8024033C 0080882D */ daddu $s1, $a0, $zero -/* D57770 80240340 AFB00118 */ sw $s0, 0x118($sp) -/* D57774 80240344 27B00098 */ addiu $s0, $sp, 0x98 -/* D57778 80240348 AFBF0120 */ sw $ra, 0x120($sp) -/* D5777C 8024034C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D57780 80240350 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D57784 80240354 00031080 */ sll $v0, $v1, 2 -/* D57788 80240358 00431021 */ addu $v0, $v0, $v1 -/* D5778C 8024035C 00021080 */ sll $v0, $v0, 2 -/* D57790 80240360 00431023 */ subu $v0, $v0, $v1 -/* D57794 80240364 000218C0 */ sll $v1, $v0, 3 -/* D57798 80240368 00431021 */ addu $v0, $v0, $v1 -/* D5779C 8024036C 000210C0 */ sll $v0, $v0, 3 -/* D577A0 80240370 3C01800B */ lui $at, 0x800b -/* D577A4 80240374 00220821 */ addu $at, $at, $v0 -/* D577A8 80240378 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D577AC 8024037C 4406A000 */ mfc1 $a2, $f20 -/* D577B0 80240380 4600B587 */ neg.s $f22, $f22 -/* D577B4 80240384 4405B000 */ mfc1 $a1, $f22 -/* D577B8 80240388 0200202D */ daddu $a0, $s0, $zero -/* D577BC 8024038C 0C019EC8 */ jal guRotateF -/* D577C0 80240390 E7B40010 */ swc1 $f20, 0x10($sp) -/* D577C4 80240394 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D577C8 80240398 0C00A6C9 */ jal clamp_angle -/* D577CC 8024039C 00000000 */ nop -/* D577D0 802403A0 44050000 */ mfc1 $a1, $f0 -/* D577D4 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D577D8 802403A8 4407A000 */ mfc1 $a3, $f20 -/* D577DC 802403AC 3C013F80 */ lui $at, 0x3f80 -/* D577E0 802403B0 4481C000 */ mtc1 $at, $f24 -/* D577E4 802403B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D577E8 802403B8 0C019EC8 */ jal guRotateF -/* D577EC 802403BC E7B80010 */ swc1 $f24, 0x10($sp) -/* D577F0 802403C0 0200202D */ daddu $a0, $s0, $zero -/* D577F4 802403C4 27A50018 */ addiu $a1, $sp, 0x18 -/* D577F8 802403C8 0C019D80 */ jal guMtxCatF -/* D577FC 802403CC 00A0302D */ daddu $a2, $a1, $zero -/* D57800 802403D0 4405B000 */ mfc1 $a1, $f22 -/* D57804 802403D4 4406A000 */ mfc1 $a2, $f20 -/* D57808 802403D8 4407C000 */ mfc1 $a3, $f24 -/* D5780C 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D57810 802403E0 0C019EC8 */ jal guRotateF -/* D57814 802403E4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D57818 802403E8 27A40018 */ addiu $a0, $sp, 0x18 -/* D5781C 802403EC 0200282D */ daddu $a1, $s0, $zero -/* D57820 802403F0 0C019D80 */ jal guMtxCatF -/* D57824 802403F4 0080302D */ daddu $a2, $a0, $zero -/* D57828 802403F8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D5782C 802403FC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D57830 80240400 4406A000 */ mfc1 $a2, $f20 -/* D57834 80240404 4407C000 */ mfc1 $a3, $f24 -/* D57838 80240408 0C019EC8 */ jal guRotateF -/* D5783C 8024040C 0200202D */ daddu $a0, $s0, $zero -/* D57840 80240410 27A40018 */ addiu $a0, $sp, 0x18 -/* D57844 80240414 0200282D */ daddu $a1, $s0, $zero -/* D57848 80240418 0C019D80 */ jal guMtxCatF -/* D5784C 8024041C 0080302D */ daddu $a2, $a0, $zero -/* D57850 80240420 3C013F36 */ lui $at, 0x3f36 -/* D57854 80240424 3421DB6E */ ori $at, $at, 0xdb6e -/* D57858 80240428 44810000 */ mtc1 $at, $f0 -/* D5785C 8024042C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D57860 80240430 44050000 */ mfc1 $a1, $f0 -/* D57864 80240434 0200202D */ daddu $a0, $s0, $zero -/* D57868 80240438 00A0302D */ daddu $a2, $a1, $zero -/* D5786C 8024043C 0C019DF0 */ jal guScaleF -/* D57870 80240440 00A0382D */ daddu $a3, $a1, $zero -/* D57874 80240444 27A40018 */ addiu $a0, $sp, 0x18 -/* D57878 80240448 0200282D */ daddu $a1, $s0, $zero -/* D5787C 8024044C 0C019D80 */ jal guMtxCatF -/* D57880 80240450 0080302D */ daddu $a2, $a0, $zero -/* D57884 80240454 27B00058 */ addiu $s0, $sp, 0x58 -/* D57888 80240458 C6200030 */ lwc1 $f0, 0x30($s1) -/* D5788C 8024045C 3C014040 */ lui $at, 0x4040 -/* D57890 80240460 44811000 */ mtc1 $at, $f2 -/* D57894 80240464 46000007 */ neg.s $f0, $f0 -/* D57898 80240468 46020001 */ sub.s $f0, $f0, $f2 -/* D5789C 8024046C 8E250028 */ lw $a1, 0x28($s1) -/* D578A0 80240470 8E26002C */ lw $a2, 0x2c($s1) -/* D578A4 80240474 44070000 */ mfc1 $a3, $f0 -/* D578A8 80240478 0C019E40 */ jal guTranslateF -/* D578AC 8024047C 0200202D */ daddu $a0, $s0, $zero -/* D578B0 80240480 27A40018 */ addiu $a0, $sp, 0x18 -/* D578B4 80240484 0200282D */ daddu $a1, $s0, $zero -/* D578B8 80240488 0C019D80 */ jal guMtxCatF -/* D578BC 8024048C 0080302D */ daddu $a2, $a0, $zero -/* D578C0 80240490 24040002 */ addiu $a0, $zero, 2 -/* D578C4 80240494 0000282D */ daddu $a1, $zero, $zero -/* D578C8 80240498 00A0302D */ daddu $a2, $a1, $zero -/* D578CC 8024049C 00A0382D */ daddu $a3, $a1, $zero -/* D578D0 802404A0 27A20018 */ addiu $v0, $sp, 0x18 -/* D578D4 802404A4 0C0B7710 */ jal render_sprite -/* D578D8 802404A8 AFA20010 */ sw $v0, 0x10($sp) -/* D578DC 802404AC 8FBF0120 */ lw $ra, 0x120($sp) -/* D578E0 802404B0 8FB1011C */ lw $s1, 0x11c($sp) -/* D578E4 802404B4 8FB00118 */ lw $s0, 0x118($sp) -/* D578E8 802404B8 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D578EC 802404BC D7B60130 */ ldc1 $f22, 0x130($sp) -/* D578F0 802404C0 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D578F4 802404C4 03E00008 */ jr $ra -/* D578F8 802404C8 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_06/func_802404CC_D57430.s b/asm/nonmatchings/world/area_pra/pra_06/func_802404CC_D57430.s deleted file mode 100644 index a0c0ec47dc..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/func_802404CC_D57430.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404CC_D578FC -/* D578FC 802404CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D57900 802404D0 AFB00010 */ sw $s0, 0x10($sp) -/* D57904 802404D4 0080802D */ daddu $s0, $a0, $zero -/* D57908 802404D8 AFBF0014 */ sw $ra, 0x14($sp) -/* D5790C 802404DC 8E020084 */ lw $v0, 0x84($s0) -/* D57910 802404E0 0440000E */ bltz $v0, .L8024051C -/* D57914 802404E4 28420002 */ slti $v0, $v0, 2 -/* D57918 802404E8 1040000C */ beqz $v0, .L8024051C -/* D5791C 802404EC 00000000 */ nop -/* D57920 802404F0 3C058024 */ lui $a1, 0x8024 -/* D57924 802404F4 24A50530 */ addiu $a1, $a1, 0x530 -/* D57928 802404F8 0C048C56 */ jal bind_dynamic_entity_3 -/* D5792C 802404FC 0000202D */ daddu $a0, $zero, $zero -/* D57930 80240500 8E03013C */ lw $v1, 0x13c($s0) -/* D57934 80240504 AC620000 */ sw $v0, ($v1) -/* D57938 80240508 3C03800A */ lui $v1, %hi(D_8009A650) -/* D5793C 8024050C 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D57940 80240510 8C620000 */ lw $v0, ($v1) -/* D57944 80240514 34420080 */ ori $v0, $v0, 0x80 -/* D57948 80240518 AC620000 */ sw $v0, ($v1) -.L8024051C: -/* D5794C 8024051C 8FBF0014 */ lw $ra, 0x14($sp) -/* D57950 80240520 8FB00010 */ lw $s0, 0x10($sp) -/* D57954 80240524 24020002 */ addiu $v0, $zero, 2 -/* D57958 80240528 03E00008 */ jr $ra -/* D5795C 8024052C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_06/func_80240530_D57430.s b/asm/nonmatchings/world/area_pra/pra_06/func_80240530_D57430.s deleted file mode 100644 index dbadf9de89..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/func_80240530_D57430.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240530_D57960 -/* D57960 80240530 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D57964 80240534 AFB00040 */ sw $s0, 0x40($sp) -/* D57968 80240538 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D5796C 8024053C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D57970 80240540 AFB10044 */ sw $s1, 0x44($sp) -/* D57974 80240544 AFBF004C */ sw $ra, 0x4c($sp) -/* D57978 80240548 AFB20048 */ sw $s2, 0x48($sp) -/* D5797C 8024054C 8E020000 */ lw $v0, ($s0) -/* D57980 80240550 821200BE */ lb $s2, 0xbe($s0) -/* D57984 80240554 30420001 */ andi $v0, $v0, 1 -/* D57988 80240558 10400052 */ beqz $v0, .L802406A4 -/* D5798C 8024055C 27B10020 */ addiu $s1, $sp, 0x20 -/* D57990 80240560 8E0400CC */ lw $a0, 0xcc($s0) -/* D57994 80240564 0C044181 */ jal get_shadow_by_index -/* D57998 80240568 00000000 */ nop -/* D5799C 8024056C 0C048B77 */ jal func_80122DDC -/* D579A0 80240570 84440008 */ lh $a0, 8($v0) -/* D579A4 80240574 8E050028 */ lw $a1, 0x28($s0) -/* D579A8 80240578 8E070030 */ lw $a3, 0x30($s0) -/* D579AC 8024057C 27A20030 */ addiu $v0, $sp, 0x30 -/* D579B0 80240580 AFA20010 */ sw $v0, 0x10($sp) -/* D579B4 80240584 27A20034 */ addiu $v0, $sp, 0x34 -/* D579B8 80240588 AFA20014 */ sw $v0, 0x14($sp) -/* D579BC 8024058C 27A20038 */ addiu $v0, $sp, 0x38 -/* D579C0 80240590 AFA20018 */ sw $v0, 0x18($sp) -/* D579C4 80240594 C600002C */ lwc1 $f0, 0x2c($s0) -/* D579C8 80240598 3C04800A */ lui $a0, 0x800a -/* D579CC 8024059C 8484A634 */ lh $a0, -0x59cc($a0) -/* D579D0 802405A0 46000007 */ neg.s $f0, $f0 -/* D579D4 802405A4 44060000 */ mfc1 $a2, $f0 -/* D579D8 802405A8 0C00B94E */ jal get_screen_coords -/* D579DC 802405AC 00000000 */ nop -/* D579E0 802405B0 8E0500A4 */ lw $a1, 0xa4($s0) -/* D579E4 802405B4 3C063F80 */ lui $a2, 0x3f80 -/* D579E8 802405B8 0C0B76A3 */ jal func_802DDA8C -/* D579EC 802405BC 24040001 */ addiu $a0, $zero, 1 -/* D579F0 802405C0 8E020000 */ lw $v0, ($s0) -/* D579F4 802405C4 3C030002 */ lui $v1, 2 -/* D579F8 802405C8 00431024 */ and $v0, $v0, $v1 -/* D579FC 802405CC 54400022 */ bnel $v0, $zero, .L80240658 -/* D57A00 802405D0 24120011 */ addiu $s2, $zero, 0x11 -/* D57A04 802405D4 9203000E */ lbu $v1, 0xe($s0) -/* D57A08 802405D8 3C02802E */ lui $v0, 0x802e -/* D57A0C 802405DC 90429D71 */ lbu $v0, -0x628f($v0) -/* D57A10 802405E0 10620018 */ beq $v1, $v0, .L80240644 -/* D57A14 802405E4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D57A18 802405E8 1040000B */ beqz $v0, .L80240618 -/* D57A1C 802405EC 24120011 */ addiu $s2, $zero, 0x11 -/* D57A20 802405F0 24040001 */ addiu $a0, $zero, 1 -/* D57A24 802405F4 2405FFFF */ addiu $a1, $zero, -1 -/* D57A28 802405F8 24060007 */ addiu $a2, $zero, 7 -/* D57A2C 802405FC 0060102D */ daddu $v0, $v1, $zero -/* D57A30 80240600 0000382D */ daddu $a3, $zero, $zero -/* D57A34 80240604 AFA00010 */ sw $zero, 0x10($sp) -/* D57A38 80240608 AFA00014 */ sw $zero, 0x14($sp) -/* D57A3C 8024060C AFA0001C */ sw $zero, 0x1c($sp) -/* D57A40 80240610 0809018F */ j .L8024063C -/* D57A44 80240614 AFA20018 */ sw $v0, 0x18($sp) -.L80240618: -/* D57A48 80240618 2412000D */ addiu $s2, $zero, 0xd -/* D57A4C 8024061C 24040001 */ addiu $a0, $zero, 1 -/* D57A50 80240620 2405FFFF */ addiu $a1, $zero, -1 -/* D57A54 80240624 0000302D */ daddu $a2, $zero, $zero -/* D57A58 80240628 00C0382D */ daddu $a3, $a2, $zero -/* D57A5C 8024062C AFA00010 */ sw $zero, 0x10($sp) -/* D57A60 80240630 AFA00014 */ sw $zero, 0x14($sp) -/* D57A64 80240634 AFA00018 */ sw $zero, 0x18($sp) -/* D57A68 80240638 AFA0001C */ sw $zero, 0x1c($sp) -.L8024063C: -/* D57A6C 8024063C 0C0B77B9 */ jal func_802DDEE4 -/* D57A70 80240640 00000000 */ nop -.L80240644: -/* D57A74 80240644 9202000E */ lbu $v0, 0xe($s0) -/* D57A78 80240648 3C01802E */ lui $at, 0x802e -/* D57A7C 8024064C A0229D71 */ sb $v0, -0x628f($at) -/* D57A80 80240650 08090198 */ j .L80240660 -/* D57A84 80240654 00000000 */ nop -.L80240658: -/* D57A88 80240658 3C01802E */ lui $at, 0x802e -/* D57A8C 8024065C A0209D71 */ sb $zero, -0x628f($at) -.L80240660: -/* D57A90 80240660 8FA20038 */ lw $v0, 0x38($sp) -/* D57A94 80240664 3C048024 */ lui $a0, 0x8024 -/* D57A98 80240668 248408A0 */ addiu $a0, $a0, 0x8a0 -/* D57A9C 8024066C AE320000 */ sw $s2, ($s1) -/* D57AA0 80240670 AE300008 */ sw $s0, 8($s1) -/* D57AA4 80240674 00021023 */ negu $v0, $v0 -/* D57AA8 80240678 AE220004 */ sw $v0, 4($s1) -/* D57AAC 8024067C 8E020000 */ lw $v0, ($s0) -/* D57AB0 80240680 3C030002 */ lui $v1, 2 -/* D57AB4 80240684 00431024 */ and $v0, $v0, $v1 -/* D57AB8 80240688 54400004 */ bnel $v0, $zero, .L8024069C -/* D57ABC 8024068C AE24000C */ sw $a0, 0xc($s1) -/* D57AC0 80240690 3C048024 */ lui $a0, 0x8024 -/* D57AC4 80240694 248406BC */ addiu $a0, $a0, 0x6bc -/* D57AC8 80240698 AE24000C */ sw $a0, 0xc($s1) -.L8024069C: -/* D57ACC 8024069C 0C047644 */ jal queue_render_task -/* D57AD0 802406A0 0220202D */ daddu $a0, $s1, $zero -.L802406A4: -/* D57AD4 802406A4 8FBF004C */ lw $ra, 0x4c($sp) -/* D57AD8 802406A8 8FB20048 */ lw $s2, 0x48($sp) -/* D57ADC 802406AC 8FB10044 */ lw $s1, 0x44($sp) -/* D57AE0 802406B0 8FB00040 */ lw $s0, 0x40($sp) -/* D57AE4 802406B4 03E00008 */ jr $ra -/* D57AE8 802406B8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_06/func_802406BC_D57430.s b/asm/nonmatchings/world/area_pra/pra_06/func_802406BC_D57430.s deleted file mode 100644 index 4b31282e74..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/func_802406BC_D57430.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406BC_D57AEC -/* D57AEC 802406BC 3C03800A */ lui $v1, 0x800a -/* D57AF0 802406C0 8463A634 */ lh $v1, -0x59cc($v1) -/* D57AF4 802406C4 3C07BF80 */ lui $a3, 0xbf80 -/* D57AF8 802406C8 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D57AFC 802406CC F7B40128 */ sdc1 $f20, 0x128($sp) -/* D57B00 802406D0 4480A000 */ mtc1 $zero, $f20 -/* D57B04 802406D4 AFB1011C */ sw $s1, 0x11c($sp) -/* D57B08 802406D8 0080882D */ daddu $s1, $a0, $zero -/* D57B0C 802406DC AFB00118 */ sw $s0, 0x118($sp) -/* D57B10 802406E0 27B00098 */ addiu $s0, $sp, 0x98 -/* D57B14 802406E4 AFBF0120 */ sw $ra, 0x120($sp) -/* D57B18 802406E8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D57B1C 802406EC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D57B20 802406F0 00031080 */ sll $v0, $v1, 2 -/* D57B24 802406F4 00431021 */ addu $v0, $v0, $v1 -/* D57B28 802406F8 00021080 */ sll $v0, $v0, 2 -/* D57B2C 802406FC 00431023 */ subu $v0, $v0, $v1 -/* D57B30 80240700 000218C0 */ sll $v1, $v0, 3 -/* D57B34 80240704 00431021 */ addu $v0, $v0, $v1 -/* D57B38 80240708 000210C0 */ sll $v0, $v0, 3 -/* D57B3C 8024070C 3C01800B */ lui $at, 0x800b -/* D57B40 80240710 00220821 */ addu $at, $at, $v0 -/* D57B44 80240714 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D57B48 80240718 4406A000 */ mfc1 $a2, $f20 -/* D57B4C 8024071C 4600B587 */ neg.s $f22, $f22 -/* D57B50 80240720 4405B000 */ mfc1 $a1, $f22 -/* D57B54 80240724 0200202D */ daddu $a0, $s0, $zero -/* D57B58 80240728 0C019EC8 */ jal guRotateF -/* D57B5C 8024072C E7B40010 */ swc1 $f20, 0x10($sp) -/* D57B60 80240730 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D57B64 80240734 0C00A6C9 */ jal clamp_angle -/* D57B68 80240738 00000000 */ nop -/* D57B6C 8024073C 44050000 */ mfc1 $a1, $f0 -/* D57B70 80240740 4406A000 */ mfc1 $a2, $f20 -/* D57B74 80240744 4407A000 */ mfc1 $a3, $f20 -/* D57B78 80240748 3C013F80 */ lui $at, 0x3f80 -/* D57B7C 8024074C 4481C000 */ mtc1 $at, $f24 -/* D57B80 80240750 27A40018 */ addiu $a0, $sp, 0x18 -/* D57B84 80240754 0C019EC8 */ jal guRotateF -/* D57B88 80240758 E7B80010 */ swc1 $f24, 0x10($sp) -/* D57B8C 8024075C 0200202D */ daddu $a0, $s0, $zero -/* D57B90 80240760 27A50018 */ addiu $a1, $sp, 0x18 -/* D57B94 80240764 0C019D80 */ jal guMtxCatF -/* D57B98 80240768 00A0302D */ daddu $a2, $a1, $zero -/* D57B9C 8024076C 4405B000 */ mfc1 $a1, $f22 -/* D57BA0 80240770 4406A000 */ mfc1 $a2, $f20 -/* D57BA4 80240774 4407C000 */ mfc1 $a3, $f24 -/* D57BA8 80240778 0200202D */ daddu $a0, $s0, $zero -/* D57BAC 8024077C 0C019EC8 */ jal guRotateF -/* D57BB0 80240780 E7B40010 */ swc1 $f20, 0x10($sp) -/* D57BB4 80240784 27A40018 */ addiu $a0, $sp, 0x18 -/* D57BB8 80240788 0200282D */ daddu $a1, $s0, $zero -/* D57BBC 8024078C 0C019D80 */ jal guMtxCatF -/* D57BC0 80240790 0080302D */ daddu $a2, $a0, $zero -/* D57BC4 80240794 E7B40010 */ swc1 $f20, 0x10($sp) -/* D57BC8 80240798 8E2500A8 */ lw $a1, 0xa8($s1) -/* D57BCC 8024079C 4406A000 */ mfc1 $a2, $f20 -/* D57BD0 802407A0 4407C000 */ mfc1 $a3, $f24 -/* D57BD4 802407A4 0C019EC8 */ jal guRotateF -/* D57BD8 802407A8 0200202D */ daddu $a0, $s0, $zero -/* D57BDC 802407AC 27A40018 */ addiu $a0, $sp, 0x18 -/* D57BE0 802407B0 0200282D */ daddu $a1, $s0, $zero -/* D57BE4 802407B4 0C019D80 */ jal guMtxCatF -/* D57BE8 802407B8 0080302D */ daddu $a2, $a0, $zero -/* D57BEC 802407BC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D57BF0 802407C0 3C013F36 */ lui $at, 0x3f36 -/* D57BF4 802407C4 3421DB6E */ ori $at, $at, 0xdb6e -/* D57BF8 802407C8 44810000 */ mtc1 $at, $f0 -/* D57BFC 802407CC 0200202D */ daddu $a0, $s0, $zero -/* D57C00 802407D0 44050000 */ mfc1 $a1, $f0 -/* D57C04 802407D4 3C06BF36 */ lui $a2, 0xbf36 -/* D57C08 802407D8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D57C0C 802407DC 0C019DF0 */ jal guScaleF -/* D57C10 802407E0 00A0382D */ daddu $a3, $a1, $zero -/* D57C14 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D57C18 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D57C1C 802407EC 0C019D80 */ jal guMtxCatF -/* D57C20 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D57C24 802407F4 27B00058 */ addiu $s0, $sp, 0x58 -/* D57C28 802407F8 8E250028 */ lw $a1, 0x28($s1) -/* D57C2C 802407FC C620002C */ lwc1 $f0, 0x2c($s1) -/* D57C30 80240800 8E270030 */ lw $a3, 0x30($s1) -/* D57C34 80240804 46000007 */ neg.s $f0, $f0 -/* D57C38 80240808 44060000 */ mfc1 $a2, $f0 -/* D57C3C 8024080C 0C019E40 */ jal guTranslateF -/* D57C40 80240810 0200202D */ daddu $a0, $s0, $zero -/* D57C44 80240814 27A40018 */ addiu $a0, $sp, 0x18 -/* D57C48 80240818 0200282D */ daddu $a1, $s0, $zero -/* D57C4C 8024081C 0C019D80 */ jal guMtxCatF -/* D57C50 80240820 0080302D */ daddu $a2, $a0, $zero -/* D57C54 80240824 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D57C58 80240828 3C0142B4 */ lui $at, 0x42b4 -/* D57C5C 8024082C 44810000 */ mtc1 $at, $f0 -/* D57C60 80240830 00000000 */ nop -/* D57C64 80240834 4602003E */ c.le.s $f0, $f2 -/* D57C68 80240838 00000000 */ nop -/* D57C6C 8024083C 4500000A */ bc1f .L80240868 -/* D57C70 80240840 24040001 */ addiu $a0, $zero, 1 -/* D57C74 80240844 3C014387 */ lui $at, 0x4387 -/* D57C78 80240848 44810000 */ mtc1 $at, $f0 -/* D57C7C 8024084C 00000000 */ nop -/* D57C80 80240850 4600103C */ c.lt.s $f2, $f0 -/* D57C84 80240854 00000000 */ nop -/* D57C88 80240858 45000004 */ bc1f .L8024086C -/* D57C8C 8024085C 27A20018 */ addiu $v0, $sp, 0x18 -/* D57C90 80240860 3C041000 */ lui $a0, 0x1000 -/* D57C94 80240864 34840001 */ ori $a0, $a0, 1 -.L80240868: -/* D57C98 80240868 27A20018 */ addiu $v0, $sp, 0x18 -.L8024086C: -/* D57C9C 8024086C 0000282D */ daddu $a1, $zero, $zero -/* D57CA0 80240870 00A0302D */ daddu $a2, $a1, $zero -/* D57CA4 80240874 00A0382D */ daddu $a3, $a1, $zero -/* D57CA8 80240878 0C0B7710 */ jal render_sprite -/* D57CAC 8024087C AFA20010 */ sw $v0, 0x10($sp) -/* D57CB0 80240880 8FBF0120 */ lw $ra, 0x120($sp) -/* D57CB4 80240884 8FB1011C */ lw $s1, 0x11c($sp) -/* D57CB8 80240888 8FB00118 */ lw $s0, 0x118($sp) -/* D57CBC 8024088C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D57CC0 80240890 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D57CC4 80240894 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D57CC8 80240898 03E00008 */ jr $ra -/* D57CCC 8024089C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_06/func_802408A0_D57430.s b/asm/nonmatchings/world/area_pra/pra_06/func_802408A0_D57430.s deleted file mode 100644 index f793ebd9a2..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/func_802408A0_D57430.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A0_D57CD0 -/* D57CD0 802408A0 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D57CD4 802408A4 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D57CD8 802408A8 4480B000 */ mtc1 $zero, $f22 -/* D57CDC 802408AC AFB10134 */ sw $s1, 0x134($sp) -/* D57CE0 802408B0 0080882D */ daddu $s1, $a0, $zero -/* D57CE4 802408B4 AFB3013C */ sw $s3, 0x13c($sp) -/* D57CE8 802408B8 0000982D */ daddu $s3, $zero, $zero -/* D57CEC 802408BC AFB60148 */ sw $s6, 0x148($sp) -/* D57CF0 802408C0 3C16800B */ lui $s6, %hi(gCameras) -/* D57CF4 802408C4 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D57CF8 802408C8 AFB50144 */ sw $s5, 0x144($sp) -/* D57CFC 802408CC 241500FF */ addiu $s5, $zero, 0xff -/* D57D00 802408D0 AFB00130 */ sw $s0, 0x130($sp) -/* D57D04 802408D4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D57D08 802408D8 AFB20138 */ sw $s2, 0x138($sp) -/* D57D0C 802408DC 27B20060 */ addiu $s2, $sp, 0x60 -/* D57D10 802408E0 AFB40140 */ sw $s4, 0x140($sp) -/* D57D14 802408E4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D57D18 802408E8 AFBF014C */ sw $ra, 0x14c($sp) -/* D57D1C 802408EC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D57D20 802408F0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D57D24 802408F4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D57D28 802408F8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D57D2C 802408FC F7B40150 */ sdc1 $f20, 0x150($sp) -.L80240900: -/* D57D30 80240900 3C03800A */ lui $v1, 0x800a -/* D57D34 80240904 8463A634 */ lh $v1, -0x59cc($v1) -/* D57D38 80240908 00031080 */ sll $v0, $v1, 2 -/* D57D3C 8024090C 00431021 */ addu $v0, $v0, $v1 -/* D57D40 80240910 00021080 */ sll $v0, $v0, 2 -/* D57D44 80240914 00431023 */ subu $v0, $v0, $v1 -/* D57D48 80240918 000218C0 */ sll $v1, $v0, 3 -/* D57D4C 8024091C 00431021 */ addu $v0, $v0, $v1 -/* D57D50 80240920 000210C0 */ sll $v0, $v0, 3 -/* D57D54 80240924 00561021 */ addu $v0, $v0, $s6 -/* D57D58 80240928 C440006C */ lwc1 $f0, 0x6c($v0) -/* D57D5C 8024092C 16600065 */ bnez $s3, .L80240AC4 -/* D57D60 80240930 46000507 */ neg.s $f20, $f0 -/* D57D64 80240934 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D57D68 80240938 3C0142B4 */ lui $at, 0x42b4 -/* D57D6C 8024093C 44810000 */ mtc1 $at, $f0 -/* D57D70 80240940 00000000 */ nop -/* D57D74 80240944 4602003C */ c.lt.s $f0, $f2 -/* D57D78 80240948 00000000 */ nop -/* D57D7C 8024094C 4500000A */ bc1f .L80240978 -/* D57D80 80240950 00000000 */ nop -/* D57D84 80240954 3C014334 */ lui $at, 0x4334 -/* D57D88 80240958 44812000 */ mtc1 $at, $f4 -/* D57D8C 8024095C 00000000 */ nop -/* D57D90 80240960 4604103E */ c.le.s $f2, $f4 -/* D57D94 80240964 00000000 */ nop -/* D57D98 80240968 45000003 */ bc1f .L80240978 -/* D57D9C 8024096C 00000000 */ nop -/* D57DA0 80240970 08090282 */ j .L80240A08 -/* D57DA4 80240974 46022501 */ sub.s $f20, $f4, $f2 -.L80240978: -/* D57DA8 80240978 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D57DAC 8024097C 3C014334 */ lui $at, 0x4334 -/* D57DB0 80240980 44812000 */ mtc1 $at, $f4 -/* D57DB4 80240984 00000000 */ nop -/* D57DB8 80240988 4600203C */ c.lt.s $f4, $f0 -/* D57DBC 8024098C 00000000 */ nop -/* D57DC0 80240990 4500000C */ bc1f .L802409C4 -/* D57DC4 80240994 00000000 */ nop -/* D57DC8 80240998 3C014387 */ lui $at, 0x4387 -/* D57DCC 8024099C 44812000 */ mtc1 $at, $f4 -/* D57DD0 802409A0 00000000 */ nop -/* D57DD4 802409A4 4604003E */ c.le.s $f0, $f4 -/* D57DD8 802409A8 00000000 */ nop -/* D57DDC 802409AC 45000008 */ bc1f .L802409D0 -/* D57DE0 802409B0 00000000 */ nop -/* D57DE4 802409B4 3C014334 */ lui $at, 0x4334 -/* D57DE8 802409B8 44812000 */ mtc1 $at, $f4 -/* D57DEC 802409BC 08090282 */ j .L80240A08 -/* D57DF0 802409C0 46040501 */ sub.s $f20, $f0, $f4 -.L802409C4: -/* D57DF4 802409C4 3C014387 */ lui $at, 0x4387 -/* D57DF8 802409C8 44812000 */ mtc1 $at, $f4 -/* D57DFC 802409CC 00000000 */ nop -.L802409D0: -/* D57E00 802409D0 4600203C */ c.lt.s $f4, $f0 -/* D57E04 802409D4 00000000 */ nop -/* D57E08 802409D8 4500000A */ bc1f .L80240A04 -/* D57E0C 802409DC 00000000 */ nop -/* D57E10 802409E0 3C0143B4 */ lui $at, 0x43b4 -/* D57E14 802409E4 44811000 */ mtc1 $at, $f2 -/* D57E18 802409E8 00000000 */ nop -/* D57E1C 802409EC 4602003E */ c.le.s $f0, $f2 -/* D57E20 802409F0 00000000 */ nop -/* D57E24 802409F4 45000003 */ bc1f .L80240A04 -/* D57E28 802409F8 00000000 */ nop -/* D57E2C 802409FC 08090282 */ j .L80240A08 -/* D57E30 80240A00 46001501 */ sub.s $f20, $f2, $f0 -.L80240A04: -/* D57E34 80240A04 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L80240A08: -/* D57E38 80240A08 3C0141C8 */ lui $at, 0x41c8 -/* D57E3C 80240A0C 44810000 */ mtc1 $at, $f0 -/* D57E40 80240A10 00000000 */ nop -/* D57E44 80240A14 4600A003 */ div.s $f0, $f20, $f0 -/* D57E48 80240A18 4600010D */ trunc.w.s $f4, $f0 -/* D57E4C 80240A1C 44072000 */ mfc1 $a3, $f4 -/* D57E50 80240A20 00000000 */ nop -/* D57E54 80240A24 00071100 */ sll $v0, $a3, 4 -/* D57E58 80240A28 00471023 */ subu $v0, $v0, $a3 -/* D57E5C 80240A2C 00021080 */ sll $v0, $v0, 2 -/* D57E60 80240A30 02A23823 */ subu $a3, $s5, $v0 -/* D57E64 80240A34 28E20064 */ slti $v0, $a3, 0x64 -/* D57E68 80240A38 54400001 */ bnel $v0, $zero, .L80240A40 -/* D57E6C 80240A3C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A40: -/* D57E70 80240A40 24040001 */ addiu $a0, $zero, 1 -/* D57E74 80240A44 2405FFFF */ addiu $a1, $zero, -1 -/* D57E78 80240A48 24060006 */ addiu $a2, $zero, 6 -/* D57E7C 80240A4C AFA70010 */ sw $a3, 0x10($sp) -/* D57E80 80240A50 AFA70014 */ sw $a3, 0x14($sp) -/* D57E84 80240A54 AFB50018 */ sw $s5, 0x18($sp) -/* D57E88 80240A58 0C0B77B9 */ jal func_802DDEE4 -/* D57E8C 80240A5C AFA0001C */ sw $zero, 0x1c($sp) -/* D57E90 80240A60 4405A000 */ mfc1 $a1, $f20 -/* D57E94 80240A64 4406B000 */ mfc1 $a2, $f22 -/* D57E98 80240A68 3C07BF80 */ lui $a3, 0xbf80 -/* D57E9C 80240A6C 0200202D */ daddu $a0, $s0, $zero -/* D57EA0 80240A70 0C019EC8 */ jal guRotateF -/* D57EA4 80240A74 E7B60010 */ swc1 $f22, 0x10($sp) -/* D57EA8 80240A78 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D57EAC 80240A7C 0C00A6C9 */ jal clamp_angle -/* D57EB0 80240A80 00000000 */ nop -/* D57EB4 80240A84 44050000 */ mfc1 $a1, $f0 -/* D57EB8 80240A88 4406B000 */ mfc1 $a2, $f22 -/* D57EBC 80240A8C 4407B000 */ mfc1 $a3, $f22 -/* D57EC0 80240A90 3C013F80 */ lui $at, 0x3f80 -/* D57EC4 80240A94 44812000 */ mtc1 $at, $f4 -/* D57EC8 80240A98 27A40020 */ addiu $a0, $sp, 0x20 -/* D57ECC 80240A9C 0C019EC8 */ jal guRotateF -/* D57ED0 80240AA0 E7A40010 */ swc1 $f4, 0x10($sp) -/* D57ED4 80240AA4 0200202D */ daddu $a0, $s0, $zero -/* D57ED8 80240AA8 27A50020 */ addiu $a1, $sp, 0x20 -/* D57EDC 80240AAC 0C019D80 */ jal guMtxCatF -/* D57EE0 80240AB0 00A0302D */ daddu $a2, $a1, $zero -/* D57EE4 80240AB4 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D57EE8 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D57EEC 80240ABC 080902E2 */ j .L80240B88 -/* D57EF0 80240AC0 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240AC4: -/* D57EF4 80240AC4 0260202D */ daddu $a0, $s3, $zero -/* D57EF8 80240AC8 27A50120 */ addiu $a1, $sp, 0x120 -/* D57EFC 80240ACC 27A60124 */ addiu $a2, $sp, 0x124 -/* D57F00 80240AD0 0C03964E */ jal func_800E5938 -/* D57F04 80240AD4 27A70128 */ addiu $a3, $sp, 0x128 -/* D57F08 80240AD8 8FA60124 */ lw $a2, 0x124($sp) -/* D57F0C 80240ADC 3C028000 */ lui $v0, 0x8000 -/* D57F10 80240AE0 14C20004 */ bne $a2, $v0, .L80240AF4 -/* D57F14 80240AE4 46000606 */ mov.s $f24, $f0 -/* D57F18 80240AE8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D57F1C 80240AEC 080902C1 */ j .L80240B04 -/* D57F20 80240AF0 24040001 */ addiu $a0, $zero, 1 -.L80240AF4: -/* D57F24 80240AF4 4486D000 */ mtc1 $a2, $f26 -/* D57F28 80240AF8 00000000 */ nop -/* D57F2C 80240AFC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D57F30 80240B00 24040001 */ addiu $a0, $zero, 1 -.L80240B04: -/* D57F34 80240B04 2405FFFF */ addiu $a1, $zero, -1 -/* D57F38 80240B08 24060007 */ addiu $a2, $zero, 7 -/* D57F3C 80240B0C 0000382D */ daddu $a3, $zero, $zero -/* D57F40 80240B10 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D57F44 80240B14 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D57F48 80240B18 24020040 */ addiu $v0, $zero, 0x40 -/* D57F4C 80240B1C AFA00010 */ sw $zero, 0x10($sp) -/* D57F50 80240B20 AFA00014 */ sw $zero, 0x14($sp) -/* D57F54 80240B24 AFA20018 */ sw $v0, 0x18($sp) -/* D57F58 80240B28 0C0B77B9 */ jal func_802DDEE4 -/* D57F5C 80240B2C AFA0001C */ sw $zero, 0x1c($sp) -/* D57F60 80240B30 4405A000 */ mfc1 $a1, $f20 -/* D57F64 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D57F68 80240B38 3C07BF80 */ lui $a3, 0xbf80 -/* D57F6C 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D57F70 80240B40 0C019EC8 */ jal guRotateF -/* D57F74 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D57F78 80240B48 4405A000 */ mfc1 $a1, $f20 -/* D57F7C 80240B4C 4406B000 */ mfc1 $a2, $f22 -/* D57F80 80240B50 3C07BF80 */ lui $a3, 0xbf80 -/* D57F84 80240B54 0200202D */ daddu $a0, $s0, $zero -/* D57F88 80240B58 0C019EC8 */ jal guRotateF -/* D57F8C 80240B5C E7B60010 */ swc1 $f22, 0x10($sp) -/* D57F90 80240B60 4405C000 */ mfc1 $a1, $f24 -/* D57F94 80240B64 4406B000 */ mfc1 $a2, $f22 -/* D57F98 80240B68 3C073F80 */ lui $a3, 0x3f80 -/* D57F9C 80240B6C 27A40020 */ addiu $a0, $sp, 0x20 -/* D57FA0 80240B70 0C019EC8 */ jal guRotateF -/* D57FA4 80240B74 E7B60010 */ swc1 $f22, 0x10($sp) -/* D57FA8 80240B78 0200202D */ daddu $a0, $s0, $zero -/* D57FAC 80240B7C 27A50020 */ addiu $a1, $sp, 0x20 -/* D57FB0 80240B80 0C019D80 */ jal guMtxCatF -/* D57FB4 80240B84 00A0302D */ daddu $a2, $a1, $zero -.L80240B88: -/* D57FB8 80240B88 862200B0 */ lh $v0, 0xb0($s1) -/* D57FBC 80240B8C 3C013F00 */ lui $at, 0x3f00 -/* D57FC0 80240B90 44812000 */ mtc1 $at, $f4 -/* D57FC4 80240B94 00021023 */ negu $v0, $v0 -/* D57FC8 80240B98 44820000 */ mtc1 $v0, $f0 -/* D57FCC 80240B9C 00000000 */ nop -/* D57FD0 80240BA0 46800020 */ cvt.s.w $f0, $f0 -/* D57FD4 80240BA4 46040102 */ mul.s $f4, $f0, $f4 -/* D57FD8 80240BA8 00000000 */ nop -/* D57FDC 80240BAC 4405B000 */ mfc1 $a1, $f22 -/* D57FE0 80240BB0 4407B000 */ mfc1 $a3, $f22 -/* D57FE4 80240BB4 44062000 */ mfc1 $a2, $f4 -/* D57FE8 80240BB8 0C019E40 */ jal guTranslateF -/* D57FEC 80240BBC 0240202D */ daddu $a0, $s2, $zero -/* D57FF0 80240BC0 0240202D */ daddu $a0, $s2, $zero -/* D57FF4 80240BC4 27A50020 */ addiu $a1, $sp, 0x20 -/* D57FF8 80240BC8 0C019D80 */ jal guMtxCatF -/* D57FFC 80240BCC 00A0302D */ daddu $a2, $a1, $zero -/* D58000 80240BD0 4405A000 */ mfc1 $a1, $f20 -/* D58004 80240BD4 4406B000 */ mfc1 $a2, $f22 -/* D58008 80240BD8 3C073F80 */ lui $a3, 0x3f80 -/* D5800C 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D58010 80240BE0 0C019EC8 */ jal guRotateF -/* D58014 80240BE4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D58018 80240BE8 27A40020 */ addiu $a0, $sp, 0x20 -/* D5801C 80240BEC 0200282D */ daddu $a1, $s0, $zero -/* D58020 80240BF0 0C019D80 */ jal guMtxCatF -/* D58024 80240BF4 0080302D */ daddu $a2, $a0, $zero -/* D58028 80240BF8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D5802C 80240BFC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D58030 80240C00 4406B000 */ mfc1 $a2, $f22 -/* D58034 80240C04 3C073F80 */ lui $a3, 0x3f80 -/* D58038 80240C08 0C019EC8 */ jal guRotateF -/* D5803C 80240C0C 0200202D */ daddu $a0, $s0, $zero -/* D58040 80240C10 27A40020 */ addiu $a0, $sp, 0x20 -/* D58044 80240C14 0200282D */ daddu $a1, $s0, $zero -/* D58048 80240C18 0C019D80 */ jal guMtxCatF -/* D5804C 80240C1C 0080302D */ daddu $a2, $a0, $zero -/* D58050 80240C20 862200B0 */ lh $v0, 0xb0($s1) -/* D58054 80240C24 3C013F00 */ lui $at, 0x3f00 -/* D58058 80240C28 44812000 */ mtc1 $at, $f4 -/* D5805C 80240C2C 44820000 */ mtc1 $v0, $f0 -/* D58060 80240C30 00000000 */ nop -/* D58064 80240C34 46800020 */ cvt.s.w $f0, $f0 -/* D58068 80240C38 46040102 */ mul.s $f4, $f0, $f4 -/* D5806C 80240C3C 00000000 */ nop -/* D58070 80240C40 4405B000 */ mfc1 $a1, $f22 -/* D58074 80240C44 4407B000 */ mfc1 $a3, $f22 -/* D58078 80240C48 44062000 */ mfc1 $a2, $f4 -/* D5807C 80240C4C 0C019E40 */ jal guTranslateF -/* D58080 80240C50 0240202D */ daddu $a0, $s2, $zero -/* D58084 80240C54 27A40020 */ addiu $a0, $sp, 0x20 -/* D58088 80240C58 0240282D */ daddu $a1, $s2, $zero -/* D5808C 80240C5C 0C019D80 */ jal guMtxCatF -/* D58090 80240C60 0080302D */ daddu $a2, $a0, $zero -/* D58094 80240C64 3C013F36 */ lui $at, 0x3f36 -/* D58098 80240C68 3421DB6E */ ori $at, $at, 0xdb6e -/* D5809C 80240C6C 44810000 */ mtc1 $at, $f0 -/* D580A0 80240C70 0280202D */ daddu $a0, $s4, $zero -/* D580A4 80240C74 44050000 */ mfc1 $a1, $f0 -/* D580A8 80240C78 3C06BF36 */ lui $a2, 0xbf36 -/* D580AC 80240C7C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D580B0 80240C80 0C019DF0 */ jal guScaleF -/* D580B4 80240C84 00A0382D */ daddu $a3, $a1, $zero -/* D580B8 80240C88 27A40020 */ addiu $a0, $sp, 0x20 -/* D580BC 80240C8C 0280282D */ daddu $a1, $s4, $zero -/* D580C0 80240C90 0C019D80 */ jal guMtxCatF -/* D580C4 80240C94 0080302D */ daddu $a2, $a0, $zero -/* D580C8 80240C98 4600D687 */ neg.s $f26, $f26 -/* D580CC 80240C9C 4405F000 */ mfc1 $a1, $f30 -/* D580D0 80240CA0 4407E000 */ mfc1 $a3, $f28 -/* D580D4 80240CA4 4406D000 */ mfc1 $a2, $f26 -/* D580D8 80240CA8 0C019E40 */ jal guTranslateF -/* D580DC 80240CAC 0240202D */ daddu $a0, $s2, $zero -/* D580E0 80240CB0 27A40020 */ addiu $a0, $sp, 0x20 -/* D580E4 80240CB4 0240282D */ daddu $a1, $s2, $zero -/* D580E8 80240CB8 0C019D80 */ jal guMtxCatF -/* D580EC 80240CBC 0080302D */ daddu $a2, $a0, $zero -/* D580F0 80240CC0 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D580F4 80240CC4 3C0142B4 */ lui $at, 0x42b4 -/* D580F8 80240CC8 44810000 */ mtc1 $at, $f0 -/* D580FC 80240CCC 00000000 */ nop -/* D58100 80240CD0 4602003E */ c.le.s $f0, $f2 -/* D58104 80240CD4 00000000 */ nop -/* D58108 80240CD8 4500000A */ bc1f .L80240D04 -/* D5810C 80240CDC 24040001 */ addiu $a0, $zero, 1 -/* D58110 80240CE0 3C014387 */ lui $at, 0x4387 -/* D58114 80240CE4 44812000 */ mtc1 $at, $f4 -/* D58118 80240CE8 00000000 */ nop -/* D5811C 80240CEC 4604103C */ c.lt.s $f2, $f4 -/* D58120 80240CF0 00000000 */ nop -/* D58124 80240CF4 45000004 */ bc1f .L80240D08 -/* D58128 80240CF8 27A20020 */ addiu $v0, $sp, 0x20 -/* D5812C 80240CFC 3C041000 */ lui $a0, 0x1000 -/* D58130 80240D00 34840001 */ ori $a0, $a0, 1 -.L80240D04: -/* D58134 80240D04 27A20020 */ addiu $v0, $sp, 0x20 -.L80240D08: -/* D58138 80240D08 AFA20010 */ sw $v0, 0x10($sp) -/* D5813C 80240D0C 0000282D */ daddu $a1, $zero, $zero -/* D58140 80240D10 00A0302D */ daddu $a2, $a1, $zero -/* D58144 80240D14 0C0B7710 */ jal render_sprite -/* D58148 80240D18 00A0382D */ daddu $a3, $a1, $zero -/* D5814C 80240D1C 26730001 */ addiu $s3, $s3, 1 -/* D58150 80240D20 2A620002 */ slti $v0, $s3, 2 -/* D58154 80240D24 1440FEF6 */ bnez $v0, .L80240900 -/* D58158 80240D28 00000000 */ nop -/* D5815C 80240D2C 8FBF014C */ lw $ra, 0x14c($sp) -/* D58160 80240D30 8FB60148 */ lw $s6, 0x148($sp) -/* D58164 80240D34 8FB50144 */ lw $s5, 0x144($sp) -/* D58168 80240D38 8FB40140 */ lw $s4, 0x140($sp) -/* D5816C 80240D3C 8FB3013C */ lw $s3, 0x13c($sp) -/* D58170 80240D40 8FB20138 */ lw $s2, 0x138($sp) -/* D58174 80240D44 8FB10134 */ lw $s1, 0x134($sp) -/* D58178 80240D48 8FB00130 */ lw $s0, 0x130($sp) -/* D5817C 80240D4C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D58180 80240D50 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D58184 80240D54 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D58188 80240D58 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D5818C 80240D5C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D58190 80240D60 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D58194 80240D64 03E00008 */ jr $ra -/* D58198 80240D68 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_06/func_80240D6C_D57430.s b/asm/nonmatchings/world/area_pra/pra_06/func_80240D6C_D57430.s deleted file mode 100644 index 0fef7a95b6..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/func_80240D6C_D57430.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D6C_D5819C -/* D5819C 80240D6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D581A0 80240D70 AFB00010 */ sw $s0, 0x10($sp) -/* D581A4 80240D74 0080802D */ daddu $s0, $a0, $zero -/* D581A8 80240D78 AFBF0014 */ sw $ra, 0x14($sp) -/* D581AC 80240D7C 8E020088 */ lw $v0, 0x88($s0) -/* D581B0 80240D80 14400017 */ bnez $v0, .L80240DE0 -/* D581B4 80240D84 24020001 */ addiu $v0, $zero, 1 -/* D581B8 80240D88 8E030084 */ lw $v1, 0x84($s0) -/* D581BC 80240D8C 1062001A */ beq $v1, $v0, .L80240DF8 -/* D581C0 80240D90 00000000 */ nop -/* D581C4 80240D94 28620002 */ slti $v0, $v1, 2 -/* D581C8 80240D98 50400005 */ beql $v0, $zero, .L80240DB0 -/* D581CC 80240D9C 24020002 */ addiu $v0, $zero, 2 -/* D581D0 80240DA0 10600007 */ beqz $v1, .L80240DC0 -/* D581D4 80240DA4 00000000 */ nop -/* D581D8 80240DA8 08090384 */ j .L80240E10 -/* D581DC 80240DAC 00000000 */ nop -.L80240DB0: -/* D581E0 80240DB0 10620007 */ beq $v1, $v0, .L80240DD0 -/* D581E4 80240DB4 00000000 */ nop -/* D581E8 80240DB8 08090384 */ j .L80240E10 -/* D581EC 80240DBC 00000000 */ nop -.L80240DC0: -/* D581F0 80240DC0 3C048024 */ lui $a0, 0x8024 -/* D581F4 80240DC4 24840EB4 */ addiu $a0, $a0, 0xeb4 -/* D581F8 80240DC8 08090380 */ j .L80240E00 -/* D581FC 80240DCC 00000000 */ nop -.L80240DD0: -/* D58200 80240DD0 3C048024 */ lui $a0, 0x8024 -/* D58204 80240DD4 24840F1C */ addiu $a0, $a0, 0xf1c -/* D58208 80240DD8 08090380 */ j .L80240E00 -/* D5820C 80240DDC 00000000 */ nop -.L80240DE0: -/* D58210 80240DE0 8E020084 */ lw $v0, 0x84($s0) -/* D58214 80240DE4 0440000A */ bltz $v0, .L80240E10 -/* D58218 80240DE8 00000000 */ nop -/* D5821C 80240DEC 28420002 */ slti $v0, $v0, 2 -/* D58220 80240DF0 10400007 */ beqz $v0, .L80240E10 -/* D58224 80240DF4 00000000 */ nop -.L80240DF8: -/* D58228 80240DF8 3C048024 */ lui $a0, 0x8024 -/* D5822C 80240DFC 24840EE8 */ addiu $a0, $a0, 0xee8 -.L80240E00: -/* D58230 80240E00 0C048C56 */ jal bind_dynamic_entity_3 -/* D58234 80240E04 0000282D */ daddu $a1, $zero, $zero -/* D58238 80240E08 8E03013C */ lw $v1, 0x13c($s0) -/* D5823C 80240E0C AC620004 */ sw $v0, 4($v1) -.L80240E10: -/* D58240 80240E10 0C00EAD2 */ jal get_npc_safe -/* D58244 80240E14 2404FFFC */ addiu $a0, $zero, -4 -/* D58248 80240E18 0040282D */ daddu $a1, $v0, $zero -/* D5824C 80240E1C 10A00021 */ beqz $a1, .L80240EA4 -/* D58250 80240E20 24020002 */ addiu $v0, $zero, 2 -/* D58254 80240E24 8E020088 */ lw $v0, 0x88($s0) -/* D58258 80240E28 14400014 */ bnez $v0, .L80240E7C -/* D5825C 80240E2C 24020001 */ addiu $v0, $zero, 1 -/* D58260 80240E30 8E040084 */ lw $a0, 0x84($s0) -/* D58264 80240E34 10820016 */ beq $a0, $v0, .L80240E90 -/* D58268 80240E38 28820002 */ slti $v0, $a0, 2 -/* D5826C 80240E3C 10400005 */ beqz $v0, .L80240E54 -/* D58270 80240E40 24020002 */ addiu $v0, $zero, 2 -/* D58274 80240E44 10800007 */ beqz $a0, .L80240E64 -/* D58278 80240E48 00000000 */ nop -/* D5827C 80240E4C 080903A9 */ j .L80240EA4 -/* D58280 80240E50 00000000 */ nop -.L80240E54: -/* D58284 80240E54 10820006 */ beq $a0, $v0, .L80240E70 -/* D58288 80240E58 24020002 */ addiu $v0, $zero, 2 -/* D5828C 80240E5C 080903A9 */ j .L80240EA4 -/* D58290 80240E60 00000000 */ nop -.L80240E64: -/* D58294 80240E64 8CA20000 */ lw $v0, ($a1) -/* D58298 80240E68 080903A6 */ j .L80240E98 -/* D5829C 80240E6C 3C03000A */ lui $v1, 0xa -.L80240E70: -/* D582A0 80240E70 8CA20000 */ lw $v0, ($a1) -/* D582A4 80240E74 080903A6 */ j .L80240E98 -/* D582A8 80240E78 3C030002 */ lui $v1, 2 -.L80240E7C: -/* D582AC 80240E7C 8E020084 */ lw $v0, 0x84($s0) -/* D582B0 80240E80 04400007 */ bltz $v0, .L80240EA0 -/* D582B4 80240E84 28420002 */ slti $v0, $v0, 2 -/* D582B8 80240E88 10400006 */ beqz $v0, .L80240EA4 -/* D582BC 80240E8C 24020002 */ addiu $v0, $zero, 2 -.L80240E90: -/* D582C0 80240E90 8CA20000 */ lw $v0, ($a1) -/* D582C4 80240E94 3C030008 */ lui $v1, 8 -.L80240E98: -/* D582C8 80240E98 00431025 */ or $v0, $v0, $v1 -/* D582CC 80240E9C ACA20000 */ sw $v0, ($a1) -.L80240EA0: -/* D582D0 80240EA0 24020002 */ addiu $v0, $zero, 2 -.L80240EA4: -/* D582D4 80240EA4 8FBF0014 */ lw $ra, 0x14($sp) -/* D582D8 80240EA8 8FB00010 */ lw $s0, 0x10($sp) -/* D582DC 80240EAC 03E00008 */ jr $ra -/* D582E0 80240EB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_06/func_80240EB4_D57430.s b/asm/nonmatchings/world/area_pra/pra_06/func_80240EB4_D57430.s deleted file mode 100644 index 624c7161a3..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/func_80240EB4_D57430.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_D582E4 -/* D582E4 80240EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D582E8 80240EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D582EC 80240EBC 0C00EAD2 */ jal get_npc_safe -/* D582F0 80240EC0 2404FFFC */ addiu $a0, $zero, -4 -/* D582F4 80240EC4 0040202D */ daddu $a0, $v0, $zero -/* D582F8 80240EC8 10800004 */ beqz $a0, .L80240EDC -/* D582FC 80240ECC 3C03000A */ lui $v1, 0xa -/* D58300 80240ED0 8C820000 */ lw $v0, ($a0) -/* D58304 80240ED4 00431025 */ or $v0, $v0, $v1 -/* D58308 80240ED8 AC820000 */ sw $v0, ($a0) -.L80240EDC: -/* D5830C 80240EDC 8FBF0010 */ lw $ra, 0x10($sp) -/* D58310 80240EE0 03E00008 */ jr $ra -/* D58314 80240EE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_80240020_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_80240020_D58890.s deleted file mode 100644 index 03dffc4dcc..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_80240020_D58890.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D588B0 -/* D588B0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D588B4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D588B8 80240028 00822024 */ and $a0, $a0, $v0 -/* D588BC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D588C0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D588C4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D588C8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D588CC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D588D0 80240040 30620001 */ andi $v0, $v1, 1 -/* D588D4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D588D8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D588DC 8024004C 03E00008 */ jr $ra -/* D588E0 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_80240054_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_80240054_D58890.s deleted file mode 100644 index a11dae4324..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_80240054_D58890.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054_D588E4 -/* D588E4 80240054 00041403 */ sra $v0, $a0, 0x10 -/* D588E8 80240058 304300FF */ andi $v1, $v0, 0xff -/* D588EC 8024005C 24020006 */ addiu $v0, $zero, 6 -/* D588F0 80240060 10620015 */ beq $v1, $v0, .L802400B8 -/* D588F4 80240064 28620007 */ slti $v0, $v1, 7 -/* D588F8 80240068 10400005 */ beqz $v0, .L80240080 -/* D588FC 8024006C 24020001 */ addiu $v0, $zero, 1 -/* D58900 80240070 1062000A */ beq $v1, $v0, .L8024009C -/* D58904 80240074 3C020100 */ lui $v0, 0x100 -/* D58908 80240078 03E00008 */ jr $ra -/* D5890C 8024007C 00821025 */ or $v0, $a0, $v0 -.L80240080: -/* D58910 80240080 2862000A */ slti $v0, $v1, 0xa -/* D58914 80240084 10400016 */ beqz $v0, .L802400E0 -/* D58918 80240088 28620008 */ slti $v0, $v1, 8 -/* D5891C 8024008C 14400015 */ bnez $v0, .L802400E4 -/* D58920 80240090 3C020100 */ lui $v0, 0x100 -/* D58924 80240094 03E00008 */ jr $ra -/* D58928 80240098 0080102D */ daddu $v0, $a0, $zero -.L8024009C: -/* D5892C 8024009C 3C020001 */ lui $v0, 1 -/* D58930 802400A0 3442000C */ ori $v0, $v0, 0xc -/* D58934 802400A4 0044102A */ slt $v0, $v0, $a0 -/* D58938 802400A8 1040000E */ beqz $v0, .L802400E4 -/* D5893C 802400AC 3C020100 */ lui $v0, 0x100 -.L802400B0: -/* D58940 802400B0 03E00008 */ jr $ra -/* D58944 802400B4 0080102D */ daddu $v0, $a0, $zero -.L802400B8: -/* D58948 802400B8 3C02FFF9 */ lui $v0, 0xfff9 -/* D5894C 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D58950 802400C0 00821821 */ addu $v1, $a0, $v0 -/* D58954 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D58958 802400C8 10400005 */ beqz $v0, .L802400E0 -/* D5895C 802400CC 30620001 */ andi $v0, $v1, 1 -/* D58960 802400D0 1440FFF7 */ bnez $v0, .L802400B0 -/* D58964 802400D4 24820001 */ addiu $v0, $a0, 1 -/* D58968 802400D8 03E00008 */ jr $ra -/* D5896C 802400DC 00000000 */ nop -.L802400E0: -/* D58970 802400E0 3C020100 */ lui $v0, 0x100 -.L802400E4: -/* D58974 802400E4 03E00008 */ jr $ra -/* D58978 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_802400EC_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_802400EC_D58890.s deleted file mode 100644 index 46756d7d45..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_802400EC_D58890.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_D5897C -/* D5897C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D58980 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* D58984 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D58988 802400F8 3C058024 */ lui $a1, 0x8024 -/* D5898C 802400FC 24A50128 */ addiu $a1, $a1, 0x128 -/* D58990 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* D58994 80240104 0C048C56 */ jal bind_dynamic_entity_3 -/* D58998 80240108 0000202D */ daddu $a0, $zero, $zero -/* D5899C 8024010C 8E03013C */ lw $v1, 0x13c($s0) -/* D589A0 80240110 AC620000 */ sw $v0, ($v1) -/* D589A4 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* D589A8 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* D589AC 8024011C 24020002 */ addiu $v0, $zero, 2 -/* D589B0 80240120 03E00008 */ jr $ra -/* D589B4 80240124 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_80240128_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_80240128_D58890.s deleted file mode 100644 index 4facca2231..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_80240128_D58890.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240128_D589B8 -/* D589B8 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D589BC 8024012C AFB00040 */ sw $s0, 0x40($sp) -/* D589C0 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D589C4 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D589C8 80240138 AFB20048 */ sw $s2, 0x48($sp) -/* D589CC 8024013C AFBF004C */ sw $ra, 0x4c($sp) -/* D589D0 80240140 AFB10044 */ sw $s1, 0x44($sp) -/* D589D4 80240144 8E020000 */ lw $v0, ($s0) -/* D589D8 80240148 821100BE */ lb $s1, 0xbe($s0) -/* D589DC 8024014C 30420001 */ andi $v0, $v0, 1 -/* D589E0 80240150 10400061 */ beqz $v0, .L802402D8 -/* D589E4 80240154 27B20020 */ addiu $s2, $sp, 0x20 -/* D589E8 80240158 8E0400CC */ lw $a0, 0xcc($s0) -/* D589EC 8024015C 0C044181 */ jal get_shadow_by_index -/* D589F0 80240160 00000000 */ nop -/* D589F4 80240164 0C048B77 */ jal func_80122DDC -/* D589F8 80240168 84440008 */ lh $a0, 8($v0) -/* D589FC 8024016C 8C430000 */ lw $v1, ($v0) -/* D58A00 80240170 34630200 */ ori $v1, $v1, 0x200 -/* D58A04 80240174 AC430000 */ sw $v1, ($v0) -/* D58A08 80240178 8E050028 */ lw $a1, 0x28($s0) -/* D58A0C 8024017C 8E06002C */ lw $a2, 0x2c($s0) -/* D58A10 80240180 27A20030 */ addiu $v0, $sp, 0x30 -/* D58A14 80240184 AFA20010 */ sw $v0, 0x10($sp) -/* D58A18 80240188 27A20034 */ addiu $v0, $sp, 0x34 -/* D58A1C 8024018C AFA20014 */ sw $v0, 0x14($sp) -/* D58A20 80240190 C6000030 */ lwc1 $f0, 0x30($s0) -/* D58A24 80240194 3C04800A */ lui $a0, 0x800a -/* D58A28 80240198 8484A634 */ lh $a0, -0x59cc($a0) -/* D58A2C 8024019C 46000007 */ neg.s $f0, $f0 -/* D58A30 802401A0 44070000 */ mfc1 $a3, $f0 -/* D58A34 802401A4 27A20038 */ addiu $v0, $sp, 0x38 -/* D58A38 802401A8 0C00B94E */ jal get_screen_coords -/* D58A3C 802401AC AFA20018 */ sw $v0, 0x18($sp) -/* D58A40 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D58A44 802401B4 0C090008 */ jal func_80240020 -/* D58A48 802401B8 00000000 */ nop -/* D58A4C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) -/* D58A50 802401C0 3C014307 */ lui $at, 0x4307 -/* D58A54 802401C4 44810000 */ mtc1 $at, $f0 -/* D58A58 802401C8 00000000 */ nop -/* D58A5C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D58A60 802401D0 00000000 */ nop -/* D58A64 802401D4 4500000B */ bc1f .L80240204 -/* D58A68 802401D8 24040002 */ addiu $a0, $zero, 2 -/* D58A6C 802401DC 3C014361 */ lui $at, 0x4361 -/* D58A70 802401E0 44810000 */ mtc1 $at, $f0 -/* D58A74 802401E4 00000000 */ nop -/* D58A78 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D58A7C 802401EC 00000000 */ nop -/* D58A80 802401F0 45000004 */ bc1f .L80240204 -/* D58A84 802401F4 00000000 */ nop -/* D58A88 802401F8 0C090015 */ jal func_80240054 -/* D58A8C 802401FC 0040202D */ daddu $a0, $v0, $zero -/* D58A90 80240200 24040002 */ addiu $a0, $zero, 2 -.L80240204: -/* D58A94 80240204 3C063F80 */ lui $a2, 0x3f80 -/* D58A98 80240208 0C0B76A3 */ jal func_802DDA8C -/* D58A9C 8024020C 0040282D */ daddu $a1, $v0, $zero -/* D58AA0 80240210 8E020000 */ lw $v0, ($s0) -/* D58AA4 80240214 3C030002 */ lui $v1, 2 -/* D58AA8 80240218 00431024 */ and $v0, $v0, $v1 -/* D58AAC 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 -/* D58AB0 80240220 24110011 */ addiu $s1, $zero, 0x11 -/* D58AB4 80240224 9203000E */ lbu $v1, 0xe($s0) -/* D58AB8 80240228 3C02802E */ lui $v0, 0x802e -/* D58ABC 8024022C 90429D70 */ lbu $v0, -0x6290($v0) -/* D58AC0 80240230 10620018 */ beq $v1, $v0, .L80240294 -/* D58AC4 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D58AC8 80240238 1040000B */ beqz $v0, .L80240268 -/* D58ACC 8024023C 24110011 */ addiu $s1, $zero, 0x11 -/* D58AD0 80240240 24040002 */ addiu $a0, $zero, 2 -/* D58AD4 80240244 2405FFFF */ addiu $a1, $zero, -1 -/* D58AD8 80240248 24060007 */ addiu $a2, $zero, 7 -/* D58ADC 8024024C 0060102D */ daddu $v0, $v1, $zero -/* D58AE0 80240250 0000382D */ daddu $a3, $zero, $zero -/* D58AE4 80240254 AFA00010 */ sw $zero, 0x10($sp) -/* D58AE8 80240258 AFA00014 */ sw $zero, 0x14($sp) -/* D58AEC 8024025C AFA0001C */ sw $zero, 0x1c($sp) -/* D58AF0 80240260 080900A3 */ j .L8024028C -/* D58AF4 80240264 AFA20018 */ sw $v0, 0x18($sp) -.L80240268: -/* D58AF8 80240268 2411000D */ addiu $s1, $zero, 0xd -/* D58AFC 8024026C 24040002 */ addiu $a0, $zero, 2 -/* D58B00 80240270 2405FFFF */ addiu $a1, $zero, -1 -/* D58B04 80240274 0000302D */ daddu $a2, $zero, $zero -/* D58B08 80240278 00C0382D */ daddu $a3, $a2, $zero -/* D58B0C 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* D58B10 80240280 AFA00014 */ sw $zero, 0x14($sp) -/* D58B14 80240284 AFA00018 */ sw $zero, 0x18($sp) -/* D58B18 80240288 AFA0001C */ sw $zero, 0x1c($sp) -.L8024028C: -/* D58B1C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D58B20 80240290 00000000 */ nop -.L80240294: -/* D58B24 80240294 9202000E */ lbu $v0, 0xe($s0) -/* D58B28 80240298 3C01802E */ lui $at, 0x802e -/* D58B2C 8024029C A0229D70 */ sb $v0, -0x6290($at) -/* D58B30 802402A0 080900AD */ j .L802402B4 -/* D58B34 802402A4 0240202D */ daddu $a0, $s2, $zero -.L802402A8: -/* D58B38 802402A8 3C01802E */ lui $at, 0x802e -/* D58B3C 802402AC A0209D70 */ sb $zero, -0x6290($at) -/* D58B40 802402B0 0240202D */ daddu $a0, $s2, $zero -.L802402B4: -/* D58B44 802402B4 AC910000 */ sw $s1, ($a0) -/* D58B48 802402B8 AC900008 */ sw $s0, 8($a0) -/* D58B4C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D58B50 802402C0 3C038024 */ lui $v1, 0x8024 -/* D58B54 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 -/* D58B58 802402C8 AC83000C */ sw $v1, 0xc($a0) -/* D58B5C 802402CC 00021023 */ negu $v0, $v0 -/* D58B60 802402D0 0C047644 */ jal queue_render_task -/* D58B64 802402D4 AC820004 */ sw $v0, 4($a0) -.L802402D8: -/* D58B68 802402D8 8FBF004C */ lw $ra, 0x4c($sp) -/* D58B6C 802402DC 8FB20048 */ lw $s2, 0x48($sp) -/* D58B70 802402E0 8FB10044 */ lw $s1, 0x44($sp) -/* D58B74 802402E4 8FB00040 */ lw $s0, 0x40($sp) -/* D58B78 802402E8 03E00008 */ jr $ra -/* D58B7C 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_802402F0_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_802402F0_D58890.s deleted file mode 100644 index 1bc0c7b517..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_802402F0_D58890.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D58B80 -/* D58B80 802402F0 3C03800A */ lui $v1, 0x800a -/* D58B84 802402F4 8463A634 */ lh $v1, -0x59cc($v1) -/* D58B88 802402F8 3C07BF80 */ lui $a3, 0xbf80 -/* D58B8C 802402FC 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D58B90 80240300 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D58B94 80240304 4480A000 */ mtc1 $zero, $f20 -/* D58B98 80240308 AFB1011C */ sw $s1, 0x11c($sp) -/* D58B9C 8024030C 0080882D */ daddu $s1, $a0, $zero -/* D58BA0 80240310 AFB00118 */ sw $s0, 0x118($sp) -/* D58BA4 80240314 27B00098 */ addiu $s0, $sp, 0x98 -/* D58BA8 80240318 AFBF0120 */ sw $ra, 0x120($sp) -/* D58BAC 8024031C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D58BB0 80240320 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D58BB4 80240324 00031080 */ sll $v0, $v1, 2 -/* D58BB8 80240328 00431021 */ addu $v0, $v0, $v1 -/* D58BBC 8024032C 00021080 */ sll $v0, $v0, 2 -/* D58BC0 80240330 00431023 */ subu $v0, $v0, $v1 -/* D58BC4 80240334 000218C0 */ sll $v1, $v0, 3 -/* D58BC8 80240338 00431021 */ addu $v0, $v0, $v1 -/* D58BCC 8024033C 000210C0 */ sll $v0, $v0, 3 -/* D58BD0 80240340 3C01800B */ lui $at, 0x800b -/* D58BD4 80240344 00220821 */ addu $at, $at, $v0 -/* D58BD8 80240348 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D58BDC 8024034C 4406A000 */ mfc1 $a2, $f20 -/* D58BE0 80240350 4600B587 */ neg.s $f22, $f22 -/* D58BE4 80240354 4405B000 */ mfc1 $a1, $f22 -/* D58BE8 80240358 0200202D */ daddu $a0, $s0, $zero -/* D58BEC 8024035C 0C019EC8 */ jal guRotateF -/* D58BF0 80240360 E7B40010 */ swc1 $f20, 0x10($sp) -/* D58BF4 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D58BF8 80240368 0C00A6C9 */ jal clamp_angle -/* D58BFC 8024036C 00000000 */ nop -/* D58C00 80240370 44050000 */ mfc1 $a1, $f0 -/* D58C04 80240374 4406A000 */ mfc1 $a2, $f20 -/* D58C08 80240378 4407A000 */ mfc1 $a3, $f20 -/* D58C0C 8024037C 3C013F80 */ lui $at, 0x3f80 -/* D58C10 80240380 4481C000 */ mtc1 $at, $f24 -/* D58C14 80240384 27A40018 */ addiu $a0, $sp, 0x18 -/* D58C18 80240388 0C019EC8 */ jal guRotateF -/* D58C1C 8024038C E7B80010 */ swc1 $f24, 0x10($sp) -/* D58C20 80240390 0200202D */ daddu $a0, $s0, $zero -/* D58C24 80240394 27A50018 */ addiu $a1, $sp, 0x18 -/* D58C28 80240398 0C019D80 */ jal guMtxCatF -/* D58C2C 8024039C 00A0302D */ daddu $a2, $a1, $zero -/* D58C30 802403A0 4405B000 */ mfc1 $a1, $f22 -/* D58C34 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D58C38 802403A8 4407C000 */ mfc1 $a3, $f24 -/* D58C3C 802403AC 0200202D */ daddu $a0, $s0, $zero -/* D58C40 802403B0 0C019EC8 */ jal guRotateF -/* D58C44 802403B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D58C48 802403B8 27A40018 */ addiu $a0, $sp, 0x18 -/* D58C4C 802403BC 0200282D */ daddu $a1, $s0, $zero -/* D58C50 802403C0 0C019D80 */ jal guMtxCatF -/* D58C54 802403C4 0080302D */ daddu $a2, $a0, $zero -/* D58C58 802403C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D58C5C 802403CC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D58C60 802403D0 4406A000 */ mfc1 $a2, $f20 -/* D58C64 802403D4 4407C000 */ mfc1 $a3, $f24 -/* D58C68 802403D8 0C019EC8 */ jal guRotateF -/* D58C6C 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D58C70 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* D58C74 802403E4 0200282D */ daddu $a1, $s0, $zero -/* D58C78 802403E8 0C019D80 */ jal guMtxCatF -/* D58C7C 802403EC 0080302D */ daddu $a2, $a0, $zero -/* D58C80 802403F0 3C013F36 */ lui $at, 0x3f36 -/* D58C84 802403F4 3421DB6E */ ori $at, $at, 0xdb6e -/* D58C88 802403F8 44810000 */ mtc1 $at, $f0 -/* D58C8C 802403FC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D58C90 80240400 44050000 */ mfc1 $a1, $f0 -/* D58C94 80240404 0200202D */ daddu $a0, $s0, $zero -/* D58C98 80240408 00A0302D */ daddu $a2, $a1, $zero -/* D58C9C 8024040C 0C019DF0 */ jal guScaleF -/* D58CA0 80240410 00A0382D */ daddu $a3, $a1, $zero -/* D58CA4 80240414 27A40018 */ addiu $a0, $sp, 0x18 -/* D58CA8 80240418 0200282D */ daddu $a1, $s0, $zero -/* D58CAC 8024041C 0C019D80 */ jal guMtxCatF -/* D58CB0 80240420 0080302D */ daddu $a2, $a0, $zero -/* D58CB4 80240424 27B00058 */ addiu $s0, $sp, 0x58 -/* D58CB8 80240428 C6200030 */ lwc1 $f0, 0x30($s1) -/* D58CBC 8024042C 3C014040 */ lui $at, 0x4040 -/* D58CC0 80240430 44811000 */ mtc1 $at, $f2 -/* D58CC4 80240434 46000007 */ neg.s $f0, $f0 -/* D58CC8 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* D58CCC 8024043C 8E250028 */ lw $a1, 0x28($s1) -/* D58CD0 80240440 8E26002C */ lw $a2, 0x2c($s1) -/* D58CD4 80240444 44070000 */ mfc1 $a3, $f0 -/* D58CD8 80240448 0C019E40 */ jal guTranslateF -/* D58CDC 8024044C 0200202D */ daddu $a0, $s0, $zero -/* D58CE0 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* D58CE4 80240454 0200282D */ daddu $a1, $s0, $zero -/* D58CE8 80240458 0C019D80 */ jal guMtxCatF -/* D58CEC 8024045C 0080302D */ daddu $a2, $a0, $zero -/* D58CF0 80240460 24040002 */ addiu $a0, $zero, 2 -/* D58CF4 80240464 0000282D */ daddu $a1, $zero, $zero -/* D58CF8 80240468 00A0302D */ daddu $a2, $a1, $zero -/* D58CFC 8024046C 00A0382D */ daddu $a3, $a1, $zero -/* D58D00 80240470 27A20018 */ addiu $v0, $sp, 0x18 -/* D58D04 80240474 0C0B7710 */ jal render_sprite -/* D58D08 80240478 AFA20010 */ sw $v0, 0x10($sp) -/* D58D0C 8024047C 8FBF0120 */ lw $ra, 0x120($sp) -/* D58D10 80240480 8FB1011C */ lw $s1, 0x11c($sp) -/* D58D14 80240484 8FB00118 */ lw $s0, 0x118($sp) -/* D58D18 80240488 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D58D1C 8024048C D7B60130 */ ldc1 $f22, 0x130($sp) -/* D58D20 80240490 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D58D24 80240494 03E00008 */ jr $ra -/* D58D28 80240498 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_8024049C_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_8024049C_D58890.s deleted file mode 100644 index 643cbbe92b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_8024049C_D58890.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_D58D2C -/* D58D2C 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D58D30 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* D58D34 802404A4 0080802D */ daddu $s0, $a0, $zero -/* D58D38 802404A8 AFBF0014 */ sw $ra, 0x14($sp) -/* D58D3C 802404AC 8E020084 */ lw $v0, 0x84($s0) -/* D58D40 802404B0 0440000E */ bltz $v0, .L802404EC -/* D58D44 802404B4 28420002 */ slti $v0, $v0, 2 -/* D58D48 802404B8 1040000C */ beqz $v0, .L802404EC -/* D58D4C 802404BC 00000000 */ nop -/* D58D50 802404C0 3C058024 */ lui $a1, 0x8024 -/* D58D54 802404C4 24A50500 */ addiu $a1, $a1, 0x500 -/* D58D58 802404C8 0C048C56 */ jal bind_dynamic_entity_3 -/* D58D5C 802404CC 0000202D */ daddu $a0, $zero, $zero -/* D58D60 802404D0 8E03013C */ lw $v1, 0x13c($s0) -/* D58D64 802404D4 AC620000 */ sw $v0, ($v1) -/* D58D68 802404D8 3C03800A */ lui $v1, %hi(D_8009A650) -/* D58D6C 802404DC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D58D70 802404E0 8C620000 */ lw $v0, ($v1) -/* D58D74 802404E4 34420080 */ ori $v0, $v0, 0x80 -/* D58D78 802404E8 AC620000 */ sw $v0, ($v1) -.L802404EC: -/* D58D7C 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* D58D80 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* D58D84 802404F4 24020002 */ addiu $v0, $zero, 2 -/* D58D88 802404F8 03E00008 */ jr $ra -/* D58D8C 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_80240500_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_80240500_D58890.s deleted file mode 100644 index 7cd05385bc..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_80240500_D58890.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_D58D90 -/* D58D90 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D58D94 80240504 AFB00040 */ sw $s0, 0x40($sp) -/* D58D98 80240508 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D58D9C 8024050C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D58DA0 80240510 AFB10044 */ sw $s1, 0x44($sp) -/* D58DA4 80240514 AFBF004C */ sw $ra, 0x4c($sp) -/* D58DA8 80240518 AFB20048 */ sw $s2, 0x48($sp) -/* D58DAC 8024051C 8E020000 */ lw $v0, ($s0) -/* D58DB0 80240520 821200BE */ lb $s2, 0xbe($s0) -/* D58DB4 80240524 30420001 */ andi $v0, $v0, 1 -/* D58DB8 80240528 10400052 */ beqz $v0, .L80240674 -/* D58DBC 8024052C 27B10020 */ addiu $s1, $sp, 0x20 -/* D58DC0 80240530 8E0400CC */ lw $a0, 0xcc($s0) -/* D58DC4 80240534 0C044181 */ jal get_shadow_by_index -/* D58DC8 80240538 00000000 */ nop -/* D58DCC 8024053C 0C048B77 */ jal func_80122DDC -/* D58DD0 80240540 84440008 */ lh $a0, 8($v0) -/* D58DD4 80240544 8E050028 */ lw $a1, 0x28($s0) -/* D58DD8 80240548 8E070030 */ lw $a3, 0x30($s0) -/* D58DDC 8024054C 27A20030 */ addiu $v0, $sp, 0x30 -/* D58DE0 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* D58DE4 80240554 27A20034 */ addiu $v0, $sp, 0x34 -/* D58DE8 80240558 AFA20014 */ sw $v0, 0x14($sp) -/* D58DEC 8024055C 27A20038 */ addiu $v0, $sp, 0x38 -/* D58DF0 80240560 AFA20018 */ sw $v0, 0x18($sp) -/* D58DF4 80240564 C600002C */ lwc1 $f0, 0x2c($s0) -/* D58DF8 80240568 3C04800A */ lui $a0, 0x800a -/* D58DFC 8024056C 8484A634 */ lh $a0, -0x59cc($a0) -/* D58E00 80240570 46000007 */ neg.s $f0, $f0 -/* D58E04 80240574 44060000 */ mfc1 $a2, $f0 -/* D58E08 80240578 0C00B94E */ jal get_screen_coords -/* D58E0C 8024057C 00000000 */ nop -/* D58E10 80240580 8E0500A4 */ lw $a1, 0xa4($s0) -/* D58E14 80240584 3C063F80 */ lui $a2, 0x3f80 -/* D58E18 80240588 0C0B76A3 */ jal func_802DDA8C -/* D58E1C 8024058C 24040001 */ addiu $a0, $zero, 1 -/* D58E20 80240590 8E020000 */ lw $v0, ($s0) -/* D58E24 80240594 3C030002 */ lui $v1, 2 -/* D58E28 80240598 00431024 */ and $v0, $v0, $v1 -/* D58E2C 8024059C 54400022 */ bnel $v0, $zero, .L80240628 -/* D58E30 802405A0 24120011 */ addiu $s2, $zero, 0x11 -/* D58E34 802405A4 9203000E */ lbu $v1, 0xe($s0) -/* D58E38 802405A8 3C02802E */ lui $v0, 0x802e -/* D58E3C 802405AC 90429D71 */ lbu $v0, -0x628f($v0) -/* D58E40 802405B0 10620018 */ beq $v1, $v0, .L80240614 -/* D58E44 802405B4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D58E48 802405B8 1040000B */ beqz $v0, .L802405E8 -/* D58E4C 802405BC 24120011 */ addiu $s2, $zero, 0x11 -/* D58E50 802405C0 24040001 */ addiu $a0, $zero, 1 -/* D58E54 802405C4 2405FFFF */ addiu $a1, $zero, -1 -/* D58E58 802405C8 24060007 */ addiu $a2, $zero, 7 -/* D58E5C 802405CC 0060102D */ daddu $v0, $v1, $zero -/* D58E60 802405D0 0000382D */ daddu $a3, $zero, $zero -/* D58E64 802405D4 AFA00010 */ sw $zero, 0x10($sp) -/* D58E68 802405D8 AFA00014 */ sw $zero, 0x14($sp) -/* D58E6C 802405DC AFA0001C */ sw $zero, 0x1c($sp) -/* D58E70 802405E0 08090183 */ j .L8024060C -/* D58E74 802405E4 AFA20018 */ sw $v0, 0x18($sp) -.L802405E8: -/* D58E78 802405E8 2412000D */ addiu $s2, $zero, 0xd -/* D58E7C 802405EC 24040001 */ addiu $a0, $zero, 1 -/* D58E80 802405F0 2405FFFF */ addiu $a1, $zero, -1 -/* D58E84 802405F4 0000302D */ daddu $a2, $zero, $zero -/* D58E88 802405F8 00C0382D */ daddu $a3, $a2, $zero -/* D58E8C 802405FC AFA00010 */ sw $zero, 0x10($sp) -/* D58E90 80240600 AFA00014 */ sw $zero, 0x14($sp) -/* D58E94 80240604 AFA00018 */ sw $zero, 0x18($sp) -/* D58E98 80240608 AFA0001C */ sw $zero, 0x1c($sp) -.L8024060C: -/* D58E9C 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D58EA0 80240610 00000000 */ nop -.L80240614: -/* D58EA4 80240614 9202000E */ lbu $v0, 0xe($s0) -/* D58EA8 80240618 3C01802E */ lui $at, 0x802e -/* D58EAC 8024061C A0229D71 */ sb $v0, -0x628f($at) -/* D58EB0 80240620 0809018C */ j .L80240630 -/* D58EB4 80240624 00000000 */ nop -.L80240628: -/* D58EB8 80240628 3C01802E */ lui $at, 0x802e -/* D58EBC 8024062C A0209D71 */ sb $zero, -0x628f($at) -.L80240630: -/* D58EC0 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D58EC4 80240634 3C048024 */ lui $a0, 0x8024 -/* D58EC8 80240638 24840870 */ addiu $a0, $a0, 0x870 -/* D58ECC 8024063C AE320000 */ sw $s2, ($s1) -/* D58ED0 80240640 AE300008 */ sw $s0, 8($s1) -/* D58ED4 80240644 00021023 */ negu $v0, $v0 -/* D58ED8 80240648 AE220004 */ sw $v0, 4($s1) -/* D58EDC 8024064C 8E020000 */ lw $v0, ($s0) -/* D58EE0 80240650 3C030002 */ lui $v1, 2 -/* D58EE4 80240654 00431024 */ and $v0, $v0, $v1 -/* D58EE8 80240658 54400004 */ bnel $v0, $zero, .L8024066C -/* D58EEC 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D58EF0 80240660 3C048024 */ lui $a0, 0x8024 -/* D58EF4 80240664 2484068C */ addiu $a0, $a0, 0x68c -/* D58EF8 80240668 AE24000C */ sw $a0, 0xc($s1) -.L8024066C: -/* D58EFC 8024066C 0C047644 */ jal queue_render_task -/* D58F00 80240670 0220202D */ daddu $a0, $s1, $zero -.L80240674: -/* D58F04 80240674 8FBF004C */ lw $ra, 0x4c($sp) -/* D58F08 80240678 8FB20048 */ lw $s2, 0x48($sp) -/* D58F0C 8024067C 8FB10044 */ lw $s1, 0x44($sp) -/* D58F10 80240680 8FB00040 */ lw $s0, 0x40($sp) -/* D58F14 80240684 03E00008 */ jr $ra -/* D58F18 80240688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_8024068C_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_8024068C_D58890.s deleted file mode 100644 index 9f97564348..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_8024068C_D58890.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_D58F1C -/* D58F1C 8024068C 3C03800A */ lui $v1, 0x800a -/* D58F20 80240690 8463A634 */ lh $v1, -0x59cc($v1) -/* D58F24 80240694 3C07BF80 */ lui $a3, 0xbf80 -/* D58F28 80240698 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D58F2C 8024069C F7B40128 */ sdc1 $f20, 0x128($sp) -/* D58F30 802406A0 4480A000 */ mtc1 $zero, $f20 -/* D58F34 802406A4 AFB1011C */ sw $s1, 0x11c($sp) -/* D58F38 802406A8 0080882D */ daddu $s1, $a0, $zero -/* D58F3C 802406AC AFB00118 */ sw $s0, 0x118($sp) -/* D58F40 802406B0 27B00098 */ addiu $s0, $sp, 0x98 -/* D58F44 802406B4 AFBF0120 */ sw $ra, 0x120($sp) -/* D58F48 802406B8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D58F4C 802406BC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D58F50 802406C0 00031080 */ sll $v0, $v1, 2 -/* D58F54 802406C4 00431021 */ addu $v0, $v0, $v1 -/* D58F58 802406C8 00021080 */ sll $v0, $v0, 2 -/* D58F5C 802406CC 00431023 */ subu $v0, $v0, $v1 -/* D58F60 802406D0 000218C0 */ sll $v1, $v0, 3 -/* D58F64 802406D4 00431021 */ addu $v0, $v0, $v1 -/* D58F68 802406D8 000210C0 */ sll $v0, $v0, 3 -/* D58F6C 802406DC 3C01800B */ lui $at, 0x800b -/* D58F70 802406E0 00220821 */ addu $at, $at, $v0 -/* D58F74 802406E4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D58F78 802406E8 4406A000 */ mfc1 $a2, $f20 -/* D58F7C 802406EC 4600B587 */ neg.s $f22, $f22 -/* D58F80 802406F0 4405B000 */ mfc1 $a1, $f22 -/* D58F84 802406F4 0200202D */ daddu $a0, $s0, $zero -/* D58F88 802406F8 0C019EC8 */ jal guRotateF -/* D58F8C 802406FC E7B40010 */ swc1 $f20, 0x10($sp) -/* D58F90 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D58F94 80240704 0C00A6C9 */ jal clamp_angle -/* D58F98 80240708 00000000 */ nop -/* D58F9C 8024070C 44050000 */ mfc1 $a1, $f0 -/* D58FA0 80240710 4406A000 */ mfc1 $a2, $f20 -/* D58FA4 80240714 4407A000 */ mfc1 $a3, $f20 -/* D58FA8 80240718 3C013F80 */ lui $at, 0x3f80 -/* D58FAC 8024071C 4481C000 */ mtc1 $at, $f24 -/* D58FB0 80240720 27A40018 */ addiu $a0, $sp, 0x18 -/* D58FB4 80240724 0C019EC8 */ jal guRotateF -/* D58FB8 80240728 E7B80010 */ swc1 $f24, 0x10($sp) -/* D58FBC 8024072C 0200202D */ daddu $a0, $s0, $zero -/* D58FC0 80240730 27A50018 */ addiu $a1, $sp, 0x18 -/* D58FC4 80240734 0C019D80 */ jal guMtxCatF -/* D58FC8 80240738 00A0302D */ daddu $a2, $a1, $zero -/* D58FCC 8024073C 4405B000 */ mfc1 $a1, $f22 -/* D58FD0 80240740 4406A000 */ mfc1 $a2, $f20 -/* D58FD4 80240744 4407C000 */ mfc1 $a3, $f24 -/* D58FD8 80240748 0200202D */ daddu $a0, $s0, $zero -/* D58FDC 8024074C 0C019EC8 */ jal guRotateF -/* D58FE0 80240750 E7B40010 */ swc1 $f20, 0x10($sp) -/* D58FE4 80240754 27A40018 */ addiu $a0, $sp, 0x18 -/* D58FE8 80240758 0200282D */ daddu $a1, $s0, $zero -/* D58FEC 8024075C 0C019D80 */ jal guMtxCatF -/* D58FF0 80240760 0080302D */ daddu $a2, $a0, $zero -/* D58FF4 80240764 E7B40010 */ swc1 $f20, 0x10($sp) -/* D58FF8 80240768 8E2500A8 */ lw $a1, 0xa8($s1) -/* D58FFC 8024076C 4406A000 */ mfc1 $a2, $f20 -/* D59000 80240770 4407C000 */ mfc1 $a3, $f24 -/* D59004 80240774 0C019EC8 */ jal guRotateF -/* D59008 80240778 0200202D */ daddu $a0, $s0, $zero -/* D5900C 8024077C 27A40018 */ addiu $a0, $sp, 0x18 -/* D59010 80240780 0200282D */ daddu $a1, $s0, $zero -/* D59014 80240784 0C019D80 */ jal guMtxCatF -/* D59018 80240788 0080302D */ daddu $a2, $a0, $zero -/* D5901C 8024078C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D59020 80240790 3C013F36 */ lui $at, 0x3f36 -/* D59024 80240794 3421DB6E */ ori $at, $at, 0xdb6e -/* D59028 80240798 44810000 */ mtc1 $at, $f0 -/* D5902C 8024079C 0200202D */ daddu $a0, $s0, $zero -/* D59030 802407A0 44050000 */ mfc1 $a1, $f0 -/* D59034 802407A4 3C06BF36 */ lui $a2, 0xbf36 -/* D59038 802407A8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D5903C 802407AC 0C019DF0 */ jal guScaleF -/* D59040 802407B0 00A0382D */ daddu $a3, $a1, $zero -/* D59044 802407B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D59048 802407B8 0200282D */ daddu $a1, $s0, $zero -/* D5904C 802407BC 0C019D80 */ jal guMtxCatF -/* D59050 802407C0 0080302D */ daddu $a2, $a0, $zero -/* D59054 802407C4 27B00058 */ addiu $s0, $sp, 0x58 -/* D59058 802407C8 8E250028 */ lw $a1, 0x28($s1) -/* D5905C 802407CC C620002C */ lwc1 $f0, 0x2c($s1) -/* D59060 802407D0 8E270030 */ lw $a3, 0x30($s1) -/* D59064 802407D4 46000007 */ neg.s $f0, $f0 -/* D59068 802407D8 44060000 */ mfc1 $a2, $f0 -/* D5906C 802407DC 0C019E40 */ jal guTranslateF -/* D59070 802407E0 0200202D */ daddu $a0, $s0, $zero -/* D59074 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D59078 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D5907C 802407EC 0C019D80 */ jal guMtxCatF -/* D59080 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D59084 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D59088 802407F8 3C0142B4 */ lui $at, 0x42b4 -/* D5908C 802407FC 44810000 */ mtc1 $at, $f0 -/* D59090 80240800 00000000 */ nop -/* D59094 80240804 4602003E */ c.le.s $f0, $f2 -/* D59098 80240808 00000000 */ nop -/* D5909C 8024080C 4500000A */ bc1f .L80240838 -/* D590A0 80240810 24040001 */ addiu $a0, $zero, 1 -/* D590A4 80240814 3C014387 */ lui $at, 0x4387 -/* D590A8 80240818 44810000 */ mtc1 $at, $f0 -/* D590AC 8024081C 00000000 */ nop -/* D590B0 80240820 4600103C */ c.lt.s $f2, $f0 -/* D590B4 80240824 00000000 */ nop -/* D590B8 80240828 45000004 */ bc1f .L8024083C -/* D590BC 8024082C 27A20018 */ addiu $v0, $sp, 0x18 -/* D590C0 80240830 3C041000 */ lui $a0, 0x1000 -/* D590C4 80240834 34840001 */ ori $a0, $a0, 1 -.L80240838: -/* D590C8 80240838 27A20018 */ addiu $v0, $sp, 0x18 -.L8024083C: -/* D590CC 8024083C 0000282D */ daddu $a1, $zero, $zero -/* D590D0 80240840 00A0302D */ daddu $a2, $a1, $zero -/* D590D4 80240844 00A0382D */ daddu $a3, $a1, $zero -/* D590D8 80240848 0C0B7710 */ jal render_sprite -/* D590DC 8024084C AFA20010 */ sw $v0, 0x10($sp) -/* D590E0 80240850 8FBF0120 */ lw $ra, 0x120($sp) -/* D590E4 80240854 8FB1011C */ lw $s1, 0x11c($sp) -/* D590E8 80240858 8FB00118 */ lw $s0, 0x118($sp) -/* D590EC 8024085C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D590F0 80240860 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D590F4 80240864 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D590F8 80240868 03E00008 */ jr $ra -/* D590FC 8024086C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_80240870_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_80240870_D58890.s deleted file mode 100644 index d775ed23e3..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_80240870_D58890.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_D59100 -/* D59100 80240870 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D59104 80240874 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D59108 80240878 4480B000 */ mtc1 $zero, $f22 -/* D5910C 8024087C AFB10134 */ sw $s1, 0x134($sp) -/* D59110 80240880 0080882D */ daddu $s1, $a0, $zero -/* D59114 80240884 AFB3013C */ sw $s3, 0x13c($sp) -/* D59118 80240888 0000982D */ daddu $s3, $zero, $zero -/* D5911C 8024088C AFB60148 */ sw $s6, 0x148($sp) -/* D59120 80240890 3C16800B */ lui $s6, %hi(gCameras) -/* D59124 80240894 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D59128 80240898 AFB50144 */ sw $s5, 0x144($sp) -/* D5912C 8024089C 241500FF */ addiu $s5, $zero, 0xff -/* D59130 802408A0 AFB00130 */ sw $s0, 0x130($sp) -/* D59134 802408A4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D59138 802408A8 AFB20138 */ sw $s2, 0x138($sp) -/* D5913C 802408AC 27B20060 */ addiu $s2, $sp, 0x60 -/* D59140 802408B0 AFB40140 */ sw $s4, 0x140($sp) -/* D59144 802408B4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D59148 802408B8 AFBF014C */ sw $ra, 0x14c($sp) -/* D5914C 802408BC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D59150 802408C0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D59154 802408C4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D59158 802408C8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D5915C 802408CC F7B40150 */ sdc1 $f20, 0x150($sp) -.L802408D0: -/* D59160 802408D0 3C03800A */ lui $v1, 0x800a -/* D59164 802408D4 8463A634 */ lh $v1, -0x59cc($v1) -/* D59168 802408D8 00031080 */ sll $v0, $v1, 2 -/* D5916C 802408DC 00431021 */ addu $v0, $v0, $v1 -/* D59170 802408E0 00021080 */ sll $v0, $v0, 2 -/* D59174 802408E4 00431023 */ subu $v0, $v0, $v1 -/* D59178 802408E8 000218C0 */ sll $v1, $v0, 3 -/* D5917C 802408EC 00431021 */ addu $v0, $v0, $v1 -/* D59180 802408F0 000210C0 */ sll $v0, $v0, 3 -/* D59184 802408F4 00561021 */ addu $v0, $v0, $s6 -/* D59188 802408F8 C440006C */ lwc1 $f0, 0x6c($v0) -/* D5918C 802408FC 16600065 */ bnez $s3, .L80240A94 -/* D59190 80240900 46000507 */ neg.s $f20, $f0 -/* D59194 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D59198 80240908 3C0142B4 */ lui $at, 0x42b4 -/* D5919C 8024090C 44810000 */ mtc1 $at, $f0 -/* D591A0 80240910 00000000 */ nop -/* D591A4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D591A8 80240918 00000000 */ nop -/* D591AC 8024091C 4500000A */ bc1f .L80240948 -/* D591B0 80240920 00000000 */ nop -/* D591B4 80240924 3C014334 */ lui $at, 0x4334 -/* D591B8 80240928 44812000 */ mtc1 $at, $f4 -/* D591BC 8024092C 00000000 */ nop -/* D591C0 80240930 4604103E */ c.le.s $f2, $f4 -/* D591C4 80240934 00000000 */ nop -/* D591C8 80240938 45000003 */ bc1f .L80240948 -/* D591CC 8024093C 00000000 */ nop -/* D591D0 80240940 08090276 */ j .L802409D8 -/* D591D4 80240944 46022501 */ sub.s $f20, $f4, $f2 -.L80240948: -/* D591D8 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D591DC 8024094C 3C014334 */ lui $at, 0x4334 -/* D591E0 80240950 44812000 */ mtc1 $at, $f4 -/* D591E4 80240954 00000000 */ nop -/* D591E8 80240958 4600203C */ c.lt.s $f4, $f0 -/* D591EC 8024095C 00000000 */ nop -/* D591F0 80240960 4500000C */ bc1f .L80240994 -/* D591F4 80240964 00000000 */ nop -/* D591F8 80240968 3C014387 */ lui $at, 0x4387 -/* D591FC 8024096C 44812000 */ mtc1 $at, $f4 -/* D59200 80240970 00000000 */ nop -/* D59204 80240974 4604003E */ c.le.s $f0, $f4 -/* D59208 80240978 00000000 */ nop -/* D5920C 8024097C 45000008 */ bc1f .L802409A0 -/* D59210 80240980 00000000 */ nop -/* D59214 80240984 3C014334 */ lui $at, 0x4334 -/* D59218 80240988 44812000 */ mtc1 $at, $f4 -/* D5921C 8024098C 08090276 */ j .L802409D8 -/* D59220 80240990 46040501 */ sub.s $f20, $f0, $f4 -.L80240994: -/* D59224 80240994 3C014387 */ lui $at, 0x4387 -/* D59228 80240998 44812000 */ mtc1 $at, $f4 -/* D5922C 8024099C 00000000 */ nop -.L802409A0: -/* D59230 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D59234 802409A4 00000000 */ nop -/* D59238 802409A8 4500000A */ bc1f .L802409D4 -/* D5923C 802409AC 00000000 */ nop -/* D59240 802409B0 3C0143B4 */ lui $at, 0x43b4 -/* D59244 802409B4 44811000 */ mtc1 $at, $f2 -/* D59248 802409B8 00000000 */ nop -/* D5924C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D59250 802409C0 00000000 */ nop -/* D59254 802409C4 45000003 */ bc1f .L802409D4 -/* D59258 802409C8 00000000 */ nop -/* D5925C 802409CC 08090276 */ j .L802409D8 -/* D59260 802409D0 46001501 */ sub.s $f20, $f2, $f0 -.L802409D4: -/* D59264 802409D4 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L802409D8: -/* D59268 802409D8 3C0141C8 */ lui $at, 0x41c8 -/* D5926C 802409DC 44810000 */ mtc1 $at, $f0 -/* D59270 802409E0 00000000 */ nop -/* D59274 802409E4 4600A003 */ div.s $f0, $f20, $f0 -/* D59278 802409E8 4600010D */ trunc.w.s $f4, $f0 -/* D5927C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D59280 802409F0 00000000 */ nop -/* D59284 802409F4 00071100 */ sll $v0, $a3, 4 -/* D59288 802409F8 00471023 */ subu $v0, $v0, $a3 -/* D5928C 802409FC 00021080 */ sll $v0, $v0, 2 -/* D59290 80240A00 02A23823 */ subu $a3, $s5, $v0 -/* D59294 80240A04 28E20064 */ slti $v0, $a3, 0x64 -/* D59298 80240A08 54400001 */ bnel $v0, $zero, .L80240A10 -/* D5929C 80240A0C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A10: -/* D592A0 80240A10 24040001 */ addiu $a0, $zero, 1 -/* D592A4 80240A14 2405FFFF */ addiu $a1, $zero, -1 -/* D592A8 80240A18 24060006 */ addiu $a2, $zero, 6 -/* D592AC 80240A1C AFA70010 */ sw $a3, 0x10($sp) -/* D592B0 80240A20 AFA70014 */ sw $a3, 0x14($sp) -/* D592B4 80240A24 AFB50018 */ sw $s5, 0x18($sp) -/* D592B8 80240A28 0C0B77B9 */ jal func_802DDEE4 -/* D592BC 80240A2C AFA0001C */ sw $zero, 0x1c($sp) -/* D592C0 80240A30 4405A000 */ mfc1 $a1, $f20 -/* D592C4 80240A34 4406B000 */ mfc1 $a2, $f22 -/* D592C8 80240A38 3C07BF80 */ lui $a3, 0xbf80 -/* D592CC 80240A3C 0200202D */ daddu $a0, $s0, $zero -/* D592D0 80240A40 0C019EC8 */ jal guRotateF -/* D592D4 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D592D8 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D592DC 80240A4C 0C00A6C9 */ jal clamp_angle -/* D592E0 80240A50 00000000 */ nop -/* D592E4 80240A54 44050000 */ mfc1 $a1, $f0 -/* D592E8 80240A58 4406B000 */ mfc1 $a2, $f22 -/* D592EC 80240A5C 4407B000 */ mfc1 $a3, $f22 -/* D592F0 80240A60 3C013F80 */ lui $at, 0x3f80 -/* D592F4 80240A64 44812000 */ mtc1 $at, $f4 -/* D592F8 80240A68 27A40020 */ addiu $a0, $sp, 0x20 -/* D592FC 80240A6C 0C019EC8 */ jal guRotateF -/* D59300 80240A70 E7A40010 */ swc1 $f4, 0x10($sp) -/* D59304 80240A74 0200202D */ daddu $a0, $s0, $zero -/* D59308 80240A78 27A50020 */ addiu $a1, $sp, 0x20 -/* D5930C 80240A7C 0C019D80 */ jal guMtxCatF -/* D59310 80240A80 00A0302D */ daddu $a2, $a1, $zero -/* D59314 80240A84 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D59318 80240A88 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D5931C 80240A8C 080902D6 */ j .L80240B58 -/* D59320 80240A90 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240A94: -/* D59324 80240A94 0260202D */ daddu $a0, $s3, $zero -/* D59328 80240A98 27A50120 */ addiu $a1, $sp, 0x120 -/* D5932C 80240A9C 27A60124 */ addiu $a2, $sp, 0x124 -/* D59330 80240AA0 0C03964E */ jal func_800E5938 -/* D59334 80240AA4 27A70128 */ addiu $a3, $sp, 0x128 -/* D59338 80240AA8 8FA60124 */ lw $a2, 0x124($sp) -/* D5933C 80240AAC 3C028000 */ lui $v0, 0x8000 -/* D59340 80240AB0 14C20004 */ bne $a2, $v0, .L80240AC4 -/* D59344 80240AB4 46000606 */ mov.s $f24, $f0 -/* D59348 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D5934C 80240ABC 080902B5 */ j .L80240AD4 -/* D59350 80240AC0 24040001 */ addiu $a0, $zero, 1 -.L80240AC4: -/* D59354 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D59358 80240AC8 00000000 */ nop -/* D5935C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D59360 80240AD0 24040001 */ addiu $a0, $zero, 1 -.L80240AD4: -/* D59364 80240AD4 2405FFFF */ addiu $a1, $zero, -1 -/* D59368 80240AD8 24060007 */ addiu $a2, $zero, 7 -/* D5936C 80240ADC 0000382D */ daddu $a3, $zero, $zero -/* D59370 80240AE0 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D59374 80240AE4 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D59378 80240AE8 24020040 */ addiu $v0, $zero, 0x40 -/* D5937C 80240AEC AFA00010 */ sw $zero, 0x10($sp) -/* D59380 80240AF0 AFA00014 */ sw $zero, 0x14($sp) -/* D59384 80240AF4 AFA20018 */ sw $v0, 0x18($sp) -/* D59388 80240AF8 0C0B77B9 */ jal func_802DDEE4 -/* D5938C 80240AFC AFA0001C */ sw $zero, 0x1c($sp) -/* D59390 80240B00 4405A000 */ mfc1 $a1, $f20 -/* D59394 80240B04 4406B000 */ mfc1 $a2, $f22 -/* D59398 80240B08 3C07BF80 */ lui $a3, 0xbf80 -/* D5939C 80240B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* D593A0 80240B10 0C019EC8 */ jal guRotateF -/* D593A4 80240B14 E7B60010 */ swc1 $f22, 0x10($sp) -/* D593A8 80240B18 4405A000 */ mfc1 $a1, $f20 -/* D593AC 80240B1C 4406B000 */ mfc1 $a2, $f22 -/* D593B0 80240B20 3C07BF80 */ lui $a3, 0xbf80 -/* D593B4 80240B24 0200202D */ daddu $a0, $s0, $zero -/* D593B8 80240B28 0C019EC8 */ jal guRotateF -/* D593BC 80240B2C E7B60010 */ swc1 $f22, 0x10($sp) -/* D593C0 80240B30 4405C000 */ mfc1 $a1, $f24 -/* D593C4 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D593C8 80240B38 3C073F80 */ lui $a3, 0x3f80 -/* D593CC 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D593D0 80240B40 0C019EC8 */ jal guRotateF -/* D593D4 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D593D8 80240B48 0200202D */ daddu $a0, $s0, $zero -/* D593DC 80240B4C 27A50020 */ addiu $a1, $sp, 0x20 -/* D593E0 80240B50 0C019D80 */ jal guMtxCatF -/* D593E4 80240B54 00A0302D */ daddu $a2, $a1, $zero -.L80240B58: -/* D593E8 80240B58 862200B0 */ lh $v0, 0xb0($s1) -/* D593EC 80240B5C 3C013F00 */ lui $at, 0x3f00 -/* D593F0 80240B60 44812000 */ mtc1 $at, $f4 -/* D593F4 80240B64 00021023 */ negu $v0, $v0 -/* D593F8 80240B68 44820000 */ mtc1 $v0, $f0 -/* D593FC 80240B6C 00000000 */ nop -/* D59400 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* D59404 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D59408 80240B78 00000000 */ nop -/* D5940C 80240B7C 4405B000 */ mfc1 $a1, $f22 -/* D59410 80240B80 4407B000 */ mfc1 $a3, $f22 -/* D59414 80240B84 44062000 */ mfc1 $a2, $f4 -/* D59418 80240B88 0C019E40 */ jal guTranslateF -/* D5941C 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* D59420 80240B90 0240202D */ daddu $a0, $s2, $zero -/* D59424 80240B94 27A50020 */ addiu $a1, $sp, 0x20 -/* D59428 80240B98 0C019D80 */ jal guMtxCatF -/* D5942C 80240B9C 00A0302D */ daddu $a2, $a1, $zero -/* D59430 80240BA0 4405A000 */ mfc1 $a1, $f20 -/* D59434 80240BA4 4406B000 */ mfc1 $a2, $f22 -/* D59438 80240BA8 3C073F80 */ lui $a3, 0x3f80 -/* D5943C 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* D59440 80240BB0 0C019EC8 */ jal guRotateF -/* D59444 80240BB4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D59448 80240BB8 27A40020 */ addiu $a0, $sp, 0x20 -/* D5944C 80240BBC 0200282D */ daddu $a1, $s0, $zero -/* D59450 80240BC0 0C019D80 */ jal guMtxCatF -/* D59454 80240BC4 0080302D */ daddu $a2, $a0, $zero -/* D59458 80240BC8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D5945C 80240BCC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D59460 80240BD0 4406B000 */ mfc1 $a2, $f22 -/* D59464 80240BD4 3C073F80 */ lui $a3, 0x3f80 -/* D59468 80240BD8 0C019EC8 */ jal guRotateF -/* D5946C 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D59470 80240BE0 27A40020 */ addiu $a0, $sp, 0x20 -/* D59474 80240BE4 0200282D */ daddu $a1, $s0, $zero -/* D59478 80240BE8 0C019D80 */ jal guMtxCatF -/* D5947C 80240BEC 0080302D */ daddu $a2, $a0, $zero -/* D59480 80240BF0 862200B0 */ lh $v0, 0xb0($s1) -/* D59484 80240BF4 3C013F00 */ lui $at, 0x3f00 -/* D59488 80240BF8 44812000 */ mtc1 $at, $f4 -/* D5948C 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D59490 80240C00 00000000 */ nop -/* D59494 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* D59498 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D5949C 80240C0C 00000000 */ nop -/* D594A0 80240C10 4405B000 */ mfc1 $a1, $f22 -/* D594A4 80240C14 4407B000 */ mfc1 $a3, $f22 -/* D594A8 80240C18 44062000 */ mfc1 $a2, $f4 -/* D594AC 80240C1C 0C019E40 */ jal guTranslateF -/* D594B0 80240C20 0240202D */ daddu $a0, $s2, $zero -/* D594B4 80240C24 27A40020 */ addiu $a0, $sp, 0x20 -/* D594B8 80240C28 0240282D */ daddu $a1, $s2, $zero -/* D594BC 80240C2C 0C019D80 */ jal guMtxCatF -/* D594C0 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D594C4 80240C34 3C013F36 */ lui $at, 0x3f36 -/* D594C8 80240C38 3421DB6E */ ori $at, $at, 0xdb6e -/* D594CC 80240C3C 44810000 */ mtc1 $at, $f0 -/* D594D0 80240C40 0280202D */ daddu $a0, $s4, $zero -/* D594D4 80240C44 44050000 */ mfc1 $a1, $f0 -/* D594D8 80240C48 3C06BF36 */ lui $a2, 0xbf36 -/* D594DC 80240C4C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D594E0 80240C50 0C019DF0 */ jal guScaleF -/* D594E4 80240C54 00A0382D */ daddu $a3, $a1, $zero -/* D594E8 80240C58 27A40020 */ addiu $a0, $sp, 0x20 -/* D594EC 80240C5C 0280282D */ daddu $a1, $s4, $zero -/* D594F0 80240C60 0C019D80 */ jal guMtxCatF -/* D594F4 80240C64 0080302D */ daddu $a2, $a0, $zero -/* D594F8 80240C68 4600D687 */ neg.s $f26, $f26 -/* D594FC 80240C6C 4405F000 */ mfc1 $a1, $f30 -/* D59500 80240C70 4407E000 */ mfc1 $a3, $f28 -/* D59504 80240C74 4406D000 */ mfc1 $a2, $f26 -/* D59508 80240C78 0C019E40 */ jal guTranslateF -/* D5950C 80240C7C 0240202D */ daddu $a0, $s2, $zero -/* D59510 80240C80 27A40020 */ addiu $a0, $sp, 0x20 -/* D59514 80240C84 0240282D */ daddu $a1, $s2, $zero -/* D59518 80240C88 0C019D80 */ jal guMtxCatF -/* D5951C 80240C8C 0080302D */ daddu $a2, $a0, $zero -/* D59520 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D59524 80240C94 3C0142B4 */ lui $at, 0x42b4 -/* D59528 80240C98 44810000 */ mtc1 $at, $f0 -/* D5952C 80240C9C 00000000 */ nop -/* D59530 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D59534 80240CA4 00000000 */ nop -/* D59538 80240CA8 4500000A */ bc1f .L80240CD4 -/* D5953C 80240CAC 24040001 */ addiu $a0, $zero, 1 -/* D59540 80240CB0 3C014387 */ lui $at, 0x4387 -/* D59544 80240CB4 44812000 */ mtc1 $at, $f4 -/* D59548 80240CB8 00000000 */ nop -/* D5954C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D59550 80240CC0 00000000 */ nop -/* D59554 80240CC4 45000004 */ bc1f .L80240CD8 -/* D59558 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 -/* D5955C 80240CCC 3C041000 */ lui $a0, 0x1000 -/* D59560 80240CD0 34840001 */ ori $a0, $a0, 1 -.L80240CD4: -/* D59564 80240CD4 27A20020 */ addiu $v0, $sp, 0x20 -.L80240CD8: -/* D59568 80240CD8 AFA20010 */ sw $v0, 0x10($sp) -/* D5956C 80240CDC 0000282D */ daddu $a1, $zero, $zero -/* D59570 80240CE0 00A0302D */ daddu $a2, $a1, $zero -/* D59574 80240CE4 0C0B7710 */ jal render_sprite -/* D59578 80240CE8 00A0382D */ daddu $a3, $a1, $zero -/* D5957C 80240CEC 26730001 */ addiu $s3, $s3, 1 -/* D59580 80240CF0 2A620002 */ slti $v0, $s3, 2 -/* D59584 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D59588 80240CF8 00000000 */ nop -/* D5958C 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) -/* D59590 80240D00 8FB60148 */ lw $s6, 0x148($sp) -/* D59594 80240D04 8FB50144 */ lw $s5, 0x144($sp) -/* D59598 80240D08 8FB40140 */ lw $s4, 0x140($sp) -/* D5959C 80240D0C 8FB3013C */ lw $s3, 0x13c($sp) -/* D595A0 80240D10 8FB20138 */ lw $s2, 0x138($sp) -/* D595A4 80240D14 8FB10134 */ lw $s1, 0x134($sp) -/* D595A8 80240D18 8FB00130 */ lw $s0, 0x130($sp) -/* D595AC 80240D1C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D595B0 80240D20 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D595B4 80240D24 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D595B8 80240D28 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D595BC 80240D2C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D595C0 80240D30 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D595C4 80240D34 03E00008 */ jr $ra -/* D595C8 80240D38 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_80240D3C_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_80240D3C_D58890.s deleted file mode 100644 index a29a878a5b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_80240D3C_D58890.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_D595CC -/* D595CC 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D595D0 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D595D4 80240D44 0080802D */ daddu $s0, $a0, $zero -/* D595D8 80240D48 AFBF0014 */ sw $ra, 0x14($sp) -/* D595DC 80240D4C 8E020088 */ lw $v0, 0x88($s0) -/* D595E0 80240D50 14400017 */ bnez $v0, .L80240DB0 -/* D595E4 80240D54 24020001 */ addiu $v0, $zero, 1 -/* D595E8 80240D58 8E030084 */ lw $v1, 0x84($s0) -/* D595EC 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D595F0 80240D60 00000000 */ nop -/* D595F4 80240D64 28620002 */ slti $v0, $v1, 2 -/* D595F8 80240D68 50400005 */ beql $v0, $zero, .L80240D80 -/* D595FC 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* D59600 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D59604 80240D74 00000000 */ nop -/* D59608 80240D78 08090378 */ j .L80240DE0 -/* D5960C 80240D7C 00000000 */ nop -.L80240D80: -/* D59610 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D59614 80240D84 00000000 */ nop -/* D59618 80240D88 08090378 */ j .L80240DE0 -/* D5961C 80240D8C 00000000 */ nop -.L80240D90: -/* D59620 80240D90 3C048024 */ lui $a0, 0x8024 -/* D59624 80240D94 24840E84 */ addiu $a0, $a0, 0xe84 -/* D59628 80240D98 08090374 */ j .L80240DD0 -/* D5962C 80240D9C 00000000 */ nop -.L80240DA0: -/* D59630 80240DA0 3C048024 */ lui $a0, 0x8024 -/* D59634 80240DA4 24840EEC */ addiu $a0, $a0, 0xeec -/* D59638 80240DA8 08090374 */ j .L80240DD0 -/* D5963C 80240DAC 00000000 */ nop -.L80240DB0: -/* D59640 80240DB0 8E020084 */ lw $v0, 0x84($s0) -/* D59644 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D59648 80240DB8 00000000 */ nop -/* D5964C 80240DBC 28420002 */ slti $v0, $v0, 2 -/* D59650 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D59654 80240DC4 00000000 */ nop -.L80240DC8: -/* D59658 80240DC8 3C048024 */ lui $a0, 0x8024 -/* D5965C 80240DCC 24840EB8 */ addiu $a0, $a0, 0xeb8 -.L80240DD0: -/* D59660 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 -/* D59664 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* D59668 80240DD8 8E03013C */ lw $v1, 0x13c($s0) -/* D5966C 80240DDC AC620004 */ sw $v0, 4($v1) -.L80240DE0: -/* D59670 80240DE0 0C00EAD2 */ jal get_npc_safe -/* D59674 80240DE4 2404FFFC */ addiu $a0, $zero, -4 -/* D59678 80240DE8 0040282D */ daddu $a1, $v0, $zero -/* D5967C 80240DEC 10A00021 */ beqz $a1, .L80240E74 -/* D59680 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* D59684 80240DF4 8E020088 */ lw $v0, 0x88($s0) -/* D59688 80240DF8 14400014 */ bnez $v0, .L80240E4C -/* D5968C 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* D59690 80240E00 8E040084 */ lw $a0, 0x84($s0) -/* D59694 80240E04 10820016 */ beq $a0, $v0, .L80240E60 -/* D59698 80240E08 28820002 */ slti $v0, $a0, 2 -/* D5969C 80240E0C 10400005 */ beqz $v0, .L80240E24 -/* D596A0 80240E10 24020002 */ addiu $v0, $zero, 2 -/* D596A4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D596A8 80240E18 00000000 */ nop -/* D596AC 80240E1C 0809039D */ j .L80240E74 -/* D596B0 80240E20 00000000 */ nop -.L80240E24: -/* D596B4 80240E24 10820006 */ beq $a0, $v0, .L80240E40 -/* D596B8 80240E28 24020002 */ addiu $v0, $zero, 2 -/* D596BC 80240E2C 0809039D */ j .L80240E74 -/* D596C0 80240E30 00000000 */ nop -.L80240E34: -/* D596C4 80240E34 8CA20000 */ lw $v0, ($a1) -/* D596C8 80240E38 0809039A */ j .L80240E68 -/* D596CC 80240E3C 3C03000A */ lui $v1, 0xa -.L80240E40: -/* D596D0 80240E40 8CA20000 */ lw $v0, ($a1) -/* D596D4 80240E44 0809039A */ j .L80240E68 -/* D596D8 80240E48 3C030002 */ lui $v1, 2 -.L80240E4C: -/* D596DC 80240E4C 8E020084 */ lw $v0, 0x84($s0) -/* D596E0 80240E50 04400007 */ bltz $v0, .L80240E70 -/* D596E4 80240E54 28420002 */ slti $v0, $v0, 2 -/* D596E8 80240E58 10400006 */ beqz $v0, .L80240E74 -/* D596EC 80240E5C 24020002 */ addiu $v0, $zero, 2 -.L80240E60: -/* D596F0 80240E60 8CA20000 */ lw $v0, ($a1) -/* D596F4 80240E64 3C030008 */ lui $v1, 8 -.L80240E68: -/* D596F8 80240E68 00431025 */ or $v0, $v0, $v1 -/* D596FC 80240E6C ACA20000 */ sw $v0, ($a1) -.L80240E70: -/* D59700 80240E70 24020002 */ addiu $v0, $zero, 2 -.L80240E74: -/* D59704 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* D59708 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* D5970C 80240E7C 03E00008 */ jr $ra -/* D59710 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_80240E84_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_80240E84_D58890.s deleted file mode 100644 index ac98ae42b0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_80240E84_D58890.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D59714 -/* D59714 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D59718 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D5971C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D59720 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D59724 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D59728 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D5972C 80240E9C 3C03000A */ lui $v1, 0xa -/* D59730 80240EA0 8C820000 */ lw $v0, ($a0) -/* D59734 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D59738 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D5973C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D59740 80240EB0 03E00008 */ jr $ra -/* D59744 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_80240EB8_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_80240EB8_D58890.s deleted file mode 100644 index 3fe8b0982e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_80240EB8_D58890.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D59748 -/* D59748 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D5974C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D59750 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D59754 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D59758 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D5975C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D59760 80240ED0 3C030008 */ lui $v1, 8 -/* D59764 80240ED4 8C820000 */ lw $v0, ($a0) -/* D59768 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D5976C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D59770 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D59774 80240EE4 03E00008 */ jr $ra -/* D59778 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_80240EEC_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_80240EEC_D58890.s deleted file mode 100644 index 86de1d3b40..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_80240EEC_D58890.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D5977C -/* D5977C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D59780 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D59784 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D59788 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D5978C 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D59790 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D59794 80240F04 3C030002 */ lui $v1, 2 -/* D59798 80240F08 8C820000 */ lw $v0, ($a0) -/* D5979C 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D597A0 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D597A4 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D597A8 80240F18 03E00008 */ jr $ra -/* D597AC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_80240F20_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_80240F20_D58890.s deleted file mode 100644 index d757b9fdf4..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_80240F20_D58890.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D597B0 -/* D597B0 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D597B4 80240F24 AFB10014 */ sw $s1, 0x14($sp) -/* D597B8 80240F28 0080882D */ daddu $s1, $a0, $zero -/* D597BC 80240F2C AFBF0018 */ sw $ra, 0x18($sp) -/* D597C0 80240F30 AFB00010 */ sw $s0, 0x10($sp) -/* D597C4 80240F34 8E30000C */ lw $s0, 0xc($s1) -/* D597C8 80240F38 8E050000 */ lw $a1, ($s0) -/* D597CC 80240F3C 0C0B1EAF */ jal get_variable -/* D597D0 80240F40 26100004 */ addiu $s0, $s0, 4 -/* D597D4 80240F44 0C00EAD2 */ jal get_npc_safe -/* D597D8 80240F48 0040202D */ daddu $a0, $v0, $zero -/* D597DC 80240F4C 10400005 */ beqz $v0, .L80240F64 -/* D597E0 80240F50 00000000 */ nop -/* D597E4 80240F54 8E050000 */ lw $a1, ($s0) -/* D597E8 80240F58 844600A8 */ lh $a2, 0xa8($v0) -/* D597EC 80240F5C 0C0B2026 */ jal set_variable -/* D597F0 80240F60 0220202D */ daddu $a0, $s1, $zero -.L80240F64: -/* D597F4 80240F64 8FBF0018 */ lw $ra, 0x18($sp) -/* D597F8 80240F68 8FB10014 */ lw $s1, 0x14($sp) -/* D597FC 80240F6C 8FB00010 */ lw $s0, 0x10($sp) -/* D59800 80240F70 24020002 */ addiu $v0, $zero, 2 -/* D59804 80240F74 03E00008 */ jr $ra -/* D59808 80240F78 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_80240F7C_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_80240F7C_D58890.s deleted file mode 100644 index e7bfb81610..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_80240F7C_D58890.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F7C_D5980C -/* D5980C 80240F7C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D59810 80240F80 AFB10014 */ sw $s1, 0x14($sp) -/* D59814 80240F84 0080882D */ daddu $s1, $a0, $zero -/* D59818 80240F88 AFBF0024 */ sw $ra, 0x24($sp) -/* D5981C 80240F8C AFB40020 */ sw $s4, 0x20($sp) -/* D59820 80240F90 AFB3001C */ sw $s3, 0x1c($sp) -/* D59824 80240F94 AFB20018 */ sw $s2, 0x18($sp) -/* D59828 80240F98 AFB00010 */ sw $s0, 0x10($sp) -/* D5982C 80240F9C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* D59830 80240FA0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* D59834 80240FA4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* D59838 80240FA8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* D5983C 80240FAC F7B40028 */ sdc1 $f20, 0x28($sp) -/* D59840 80240FB0 8E30000C */ lw $s0, 0xc($s1) -/* D59844 80240FB4 8E130000 */ lw $s3, ($s0) -/* D59848 80240FB8 26100004 */ addiu $s0, $s0, 4 -/* D5984C 80240FBC 0C0B1EAF */ jal get_variable -/* D59850 80240FC0 0260282D */ daddu $a1, $s3, $zero -/* D59854 80240FC4 4482E000 */ mtc1 $v0, $f28 -/* D59858 80240FC8 00000000 */ nop -/* D5985C 80240FCC 4680E720 */ cvt.s.w $f28, $f28 -/* D59860 80240FD0 8E140000 */ lw $s4, ($s0) -/* D59864 80240FD4 26100004 */ addiu $s0, $s0, 4 -/* D59868 80240FD8 0220202D */ daddu $a0, $s1, $zero -/* D5986C 80240FDC 0C0B1EAF */ jal get_variable -/* D59870 80240FE0 0280282D */ daddu $a1, $s4, $zero -/* D59874 80240FE4 4482D000 */ mtc1 $v0, $f26 -/* D59878 80240FE8 00000000 */ nop -/* D5987C 80240FEC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D59880 80240FF0 8E100000 */ lw $s0, ($s0) -/* D59884 80240FF4 0220202D */ daddu $a0, $s1, $zero -/* D59888 80240FF8 0C0B1EAF */ jal get_variable -/* D5988C 80240FFC 0200282D */ daddu $a1, $s0, $zero -/* D59890 80241000 4482C000 */ mtc1 $v0, $f24 -/* D59894 80241004 00000000 */ nop -/* D59898 80241008 4680C620 */ cvt.s.w $f24, $f24 -/* D5989C 8024100C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* D598A0 80241010 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* D598A4 80241014 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D598A8 80241018 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D598AC 8024101C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* D598B0 80241020 44800000 */ mtc1 $zero, $f0 -/* D598B4 80241024 00031080 */ sll $v0, $v1, 2 -/* D598B8 80241028 00431021 */ addu $v0, $v0, $v1 -/* D598BC 8024102C 00021080 */ sll $v0, $v0, 2 -/* D598C0 80241030 00431023 */ subu $v0, $v0, $v1 -/* D598C4 80241034 000218C0 */ sll $v1, $v0, 3 -/* D598C8 80241038 00431021 */ addu $v0, $v0, $v1 -/* D598CC 8024103C 000210C0 */ sll $v0, $v0, 3 -/* D598D0 80241040 46001032 */ c.eq.s $f2, $f0 -/* D598D4 80241044 3C01800B */ lui $at, 0x800b -/* D598D8 80241048 00220821 */ addu $at, $at, $v0 -/* D598DC 8024104C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D598E0 80241050 45000005 */ bc1f .L80241068 -/* D598E4 80241054 00000000 */ nop -/* D598E8 80241058 3C0142C8 */ lui $at, 0x42c8 -/* D598EC 8024105C 44810000 */ mtc1 $at, $f0 -/* D598F0 80241060 0809041E */ j .L80241078 -/* D598F4 80241064 4600B581 */ sub.s $f22, $f22, $f0 -.L80241068: -/* D598F8 80241068 3C0142C8 */ lui $at, 0x42c8 -/* D598FC 8024106C 44810000 */ mtc1 $at, $f0 -/* D59900 80241070 00000000 */ nop -/* D59904 80241074 4600B580 */ add.s $f22, $f22, $f0 -.L80241078: -/* D59908 80241078 0C00A6C9 */ jal clamp_angle -/* D5990C 8024107C 4600B306 */ mov.s $f12, $f22 -/* D59910 80241080 46000586 */ mov.s $f22, $f0 -/* D59914 80241084 3C014170 */ lui $at, 0x4170 -/* D59918 80241088 4481A000 */ mtc1 $at, $f20 -/* D5991C 8024108C 0C00A8BB */ jal sin_deg -/* D59920 80241090 4600B306 */ mov.s $f12, $f22 -/* D59924 80241094 46140002 */ mul.s $f0, $f0, $f20 -/* D59928 80241098 00000000 */ nop -/* D5992C 8024109C 864200B0 */ lh $v0, 0xb0($s2) -/* D59930 802410A0 3C013F00 */ lui $at, 0x3f00 -/* D59934 802410A4 44812000 */ mtc1 $at, $f4 -/* D59938 802410A8 44821000 */ mtc1 $v0, $f2 -/* D5993C 802410AC 00000000 */ nop -/* D59940 802410B0 468010A0 */ cvt.s.w $f2, $f2 -/* D59944 802410B4 46041082 */ mul.s $f2, $f2, $f4 -/* D59948 802410B8 00000000 */ nop -/* D5994C 802410BC 4600E700 */ add.s $f28, $f28, $f0 -/* D59950 802410C0 4602D680 */ add.s $f26, $f26, $f2 -/* D59954 802410C4 0C00A8D4 */ jal cos_deg -/* D59958 802410C8 4600B306 */ mov.s $f12, $f22 -/* D5995C 802410CC 46140002 */ mul.s $f0, $f0, $f20 -/* D59960 802410D0 00000000 */ nop -/* D59964 802410D4 0220202D */ daddu $a0, $s1, $zero -/* D59968 802410D8 0260282D */ daddu $a1, $s3, $zero -/* D5996C 802410DC 4600E18D */ trunc.w.s $f6, $f28 -/* D59970 802410E0 44063000 */ mfc1 $a2, $f6 -/* D59974 802410E4 0C0B2026 */ jal set_variable -/* D59978 802410E8 4600C601 */ sub.s $f24, $f24, $f0 -/* D5997C 802410EC 0220202D */ daddu $a0, $s1, $zero -/* D59980 802410F0 4600D18D */ trunc.w.s $f6, $f26 -/* D59984 802410F4 44063000 */ mfc1 $a2, $f6 -/* D59988 802410F8 0C0B2026 */ jal set_variable -/* D5998C 802410FC 0280282D */ daddu $a1, $s4, $zero -/* D59990 80241100 0220202D */ daddu $a0, $s1, $zero -/* D59994 80241104 4600C18D */ trunc.w.s $f6, $f24 -/* D59998 80241108 44063000 */ mfc1 $a2, $f6 -/* D5999C 8024110C 0C0B2026 */ jal set_variable -/* D599A0 80241110 0200282D */ daddu $a1, $s0, $zero -/* D599A4 80241114 8FBF0024 */ lw $ra, 0x24($sp) -/* D599A8 80241118 8FB40020 */ lw $s4, 0x20($sp) -/* D599AC 8024111C 8FB3001C */ lw $s3, 0x1c($sp) -/* D599B0 80241120 8FB20018 */ lw $s2, 0x18($sp) -/* D599B4 80241124 8FB10014 */ lw $s1, 0x14($sp) -/* D599B8 80241128 8FB00010 */ lw $s0, 0x10($sp) -/* D599BC 8024112C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* D599C0 80241130 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* D599C4 80241134 D7B80038 */ ldc1 $f24, 0x38($sp) -/* D599C8 80241138 D7B60030 */ ldc1 $f22, 0x30($sp) -/* D599CC 8024113C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D599D0 80241140 24020002 */ addiu $v0, $zero, 2 -/* D599D4 80241144 03E00008 */ jr $ra -/* D599D8 80241148 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_8024114C_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_8024114C_D58890.s deleted file mode 100644 index f40362ae2b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_8024114C_D58890.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024114C_D599DC -/* D599DC 8024114C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D599E0 80241150 AFBF0010 */ sw $ra, 0x10($sp) -/* D599E4 80241154 10A00003 */ beqz $a1, .L80241164 -/* D599E8 80241158 8C86000C */ lw $a2, 0xc($a0) -/* D599EC 8024115C 3C018024 */ lui $at, 0x8024 -/* D599F0 80241160 AC201D98 */ sw $zero, 0x1d98($at) -.L80241164: -/* D599F4 80241164 3C038024 */ lui $v1, 0x8024 -/* D599F8 80241168 24631D98 */ addiu $v1, $v1, 0x1d98 -/* D599FC 8024116C 8C620000 */ lw $v0, ($v1) -/* D59A00 80241170 54400003 */ bnel $v0, $zero, .L80241180 -/* D59A04 80241174 AC600000 */ sw $zero, ($v1) -/* D59A08 80241178 08090465 */ j .L80241194 -/* D59A0C 8024117C 0000102D */ daddu $v0, $zero, $zero -.L80241180: -/* D59A10 80241180 8CC50000 */ lw $a1, ($a2) -/* D59A14 80241184 3C068024 */ lui $a2, 0x8024 -/* D59A18 80241188 0C0B2026 */ jal set_variable -/* D59A1C 8024118C 8CC61D9C */ lw $a2, 0x1d9c($a2) -/* D59A20 80241190 24020002 */ addiu $v0, $zero, 2 -.L80241194: -/* D59A24 80241194 8FBF0010 */ lw $ra, 0x10($sp) -/* D59A28 80241198 03E00008 */ jr $ra -/* D59A2C 8024119C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_802411A0_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_802411A0_D58890.s deleted file mode 100644 index d5016f54fe..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_802411A0_D58890.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411A0_D59A30 -/* D59A30 802411A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D59A34 802411A4 AFBF0010 */ sw $ra, 0x10($sp) -/* D59A38 802411A8 8C82000C */ lw $v0, 0xc($a0) -/* D59A3C 802411AC 0C0B1EAF */ jal get_variable -/* D59A40 802411B0 8C450000 */ lw $a1, ($v0) -/* D59A44 802411B4 3C018024 */ lui $at, 0x8024 -/* D59A48 802411B8 AC221D9C */ sw $v0, 0x1d9c($at) -/* D59A4C 802411BC 24020002 */ addiu $v0, $zero, 2 -/* D59A50 802411C0 8FBF0010 */ lw $ra, 0x10($sp) -/* D59A54 802411C4 24030001 */ addiu $v1, $zero, 1 -/* D59A58 802411C8 3C018024 */ lui $at, 0x8024 -/* D59A5C 802411CC AC231D98 */ sw $v1, 0x1d98($at) -/* D59A60 802411D0 03E00008 */ jr $ra -/* D59A64 802411D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_802411D8_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_802411D8_D58890.s deleted file mode 100644 index a11428f82b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_802411D8_D58890.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411D8_D59A68 -/* D59A68 802411D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D59A6C 802411DC AFBF0010 */ sw $ra, 0x10($sp) -/* D59A70 802411E0 8C82000C */ lw $v0, 0xc($a0) -/* D59A74 802411E4 0C0B1EAF */ jal get_variable -/* D59A78 802411E8 8C450000 */ lw $a1, ($v0) -/* D59A7C 802411EC 0040182D */ daddu $v1, $v0, $zero -/* D59A80 802411F0 10600012 */ beqz $v1, .L8024123C -/* D59A84 802411F4 0000202D */ daddu $a0, $zero, $zero -/* D59A88 802411F8 8C620000 */ lw $v0, ($v1) -/* D59A8C 802411FC 5040000A */ beql $v0, $zero, .L80241228 -/* D59A90 80241200 00041080 */ sll $v0, $a0, 2 -/* D59A94 80241204 3C058024 */ lui $a1, 0x8024 -/* D59A98 80241208 24A56A20 */ addiu $a1, $a1, 0x6a20 -.L8024120C: -/* D59A9C 8024120C 24630004 */ addiu $v1, $v1, 4 -/* D59AA0 80241210 24840001 */ addiu $a0, $a0, 1 -/* D59AA4 80241214 ACA20000 */ sw $v0, ($a1) -/* D59AA8 80241218 8C620000 */ lw $v0, ($v1) -/* D59AAC 8024121C 1440FFFB */ bnez $v0, .L8024120C -/* D59AB0 80241220 24A50004 */ addiu $a1, $a1, 4 -/* D59AB4 80241224 00041080 */ sll $v0, $a0, 2 -.L80241228: -/* D59AB8 80241228 3C018024 */ lui $at, 0x8024 -/* D59ABC 8024122C 00220821 */ addu $at, $at, $v0 -/* D59AC0 80241230 AC206A20 */ sw $zero, 0x6a20($at) -/* D59AC4 80241234 08090499 */ j .L80241264 -/* D59AC8 80241238 00000000 */ nop -.L8024123C: -/* D59ACC 8024123C 3C038024 */ lui $v1, 0x8024 -/* D59AD0 80241240 24636A20 */ addiu $v1, $v1, 0x6a20 -/* D59AD4 80241244 0060282D */ daddu $a1, $v1, $zero -.L80241248: -/* D59AD8 80241248 24820010 */ addiu $v0, $a0, 0x10 -/* D59ADC 8024124C AC620000 */ sw $v0, ($v1) -/* D59AE0 80241250 24630004 */ addiu $v1, $v1, 4 -/* D59AE4 80241254 24840001 */ addiu $a0, $a0, 1 -/* D59AE8 80241258 28820070 */ slti $v0, $a0, 0x70 -/* D59AEC 8024125C 1440FFFA */ bnez $v0, .L80241248 -/* D59AF0 80241260 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241264: -/* D59AF4 80241264 8FBF0010 */ lw $ra, 0x10($sp) -/* D59AF8 80241268 24020002 */ addiu $v0, $zero, 2 -/* D59AFC 8024126C 03E00008 */ jr $ra -/* D59B00 80241270 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_80241274_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_80241274_D58890.s deleted file mode 100644 index 8f53f196ea..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_80241274_D58890.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241274_D59B04 -/* D59B04 80241274 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D59B08 80241278 AFBF0010 */ sw $ra, 0x10($sp) -/* D59B0C 8024127C 8C82000C */ lw $v0, 0xc($a0) -/* D59B10 80241280 0C0B1EAF */ jal get_variable -/* D59B14 80241284 8C450000 */ lw $a1, ($v0) -/* D59B18 80241288 0040182D */ daddu $v1, $v0, $zero -/* D59B1C 8024128C 10600012 */ beqz $v1, .L802412D8 -/* D59B20 80241290 0000202D */ daddu $a0, $zero, $zero -/* D59B24 80241294 8C620000 */ lw $v0, ($v1) -/* D59B28 80241298 5040000A */ beql $v0, $zero, .L802412C4 -/* D59B2C 8024129C 00041080 */ sll $v0, $a0, 2 -/* D59B30 802412A0 3C058024 */ lui $a1, 0x8024 -/* D59B34 802412A4 24A56BE8 */ addiu $a1, $a1, 0x6be8 -.L802412A8: -/* D59B38 802412A8 24630004 */ addiu $v1, $v1, 4 -/* D59B3C 802412AC 24840001 */ addiu $a0, $a0, 1 -/* D59B40 802412B0 ACA20000 */ sw $v0, ($a1) -/* D59B44 802412B4 8C620000 */ lw $v0, ($v1) -/* D59B48 802412B8 1440FFFB */ bnez $v0, .L802412A8 -/* D59B4C 802412BC 24A50004 */ addiu $a1, $a1, 4 -/* D59B50 802412C0 00041080 */ sll $v0, $a0, 2 -.L802412C4: -/* D59B54 802412C4 3C018024 */ lui $at, 0x8024 -/* D59B58 802412C8 00220821 */ addu $at, $at, $v0 -/* D59B5C 802412CC AC206BE8 */ sw $zero, 0x6be8($at) -/* D59B60 802412D0 080904C0 */ j .L80241300 -/* D59B64 802412D4 00000000 */ nop -.L802412D8: -/* D59B68 802412D8 3C038024 */ lui $v1, 0x8024 -/* D59B6C 802412DC 24636BE8 */ addiu $v1, $v1, 0x6be8 -/* D59B70 802412E0 0060282D */ daddu $a1, $v1, $zero -.L802412E4: -/* D59B74 802412E4 24820080 */ addiu $v0, $a0, 0x80 -/* D59B78 802412E8 AC620000 */ sw $v0, ($v1) -/* D59B7C 802412EC 24630004 */ addiu $v1, $v1, 4 -/* D59B80 802412F0 24840001 */ addiu $a0, $a0, 1 -/* D59B84 802412F4 2882005B */ slti $v0, $a0, 0x5b -/* D59B88 802412F8 1440FFFA */ bnez $v0, .L802412E4 -/* D59B8C 802412FC ACA0016C */ sw $zero, 0x16c($a1) -.L80241300: -/* D59B90 80241300 8FBF0010 */ lw $ra, 0x10($sp) -/* D59B94 80241304 24020002 */ addiu $v0, $zero, 2 -/* D59B98 80241308 03E00008 */ jr $ra -/* D59B9C 8024130C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_80241310_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_80241310_D58890.s deleted file mode 100644 index c7727aea0a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_80241310_D58890.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241310_D59BA0 -/* D59BA0 80241310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D59BA4 80241314 AFB10014 */ sw $s1, 0x14($sp) -/* D59BA8 80241318 0080882D */ daddu $s1, $a0, $zero -/* D59BAC 8024131C AFBF001C */ sw $ra, 0x1c($sp) -/* D59BB0 80241320 AFB20018 */ sw $s2, 0x18($sp) -/* D59BB4 80241324 AFB00010 */ sw $s0, 0x10($sp) -/* D59BB8 80241328 8E30000C */ lw $s0, 0xc($s1) -/* D59BBC 8024132C 8E050000 */ lw $a1, ($s0) -/* D59BC0 80241330 0C0B1EAF */ jal get_variable -/* D59BC4 80241334 26100004 */ addiu $s0, $s0, 4 -/* D59BC8 80241338 8E050000 */ lw $a1, ($s0) -/* D59BCC 8024133C 26100004 */ addiu $s0, $s0, 4 -/* D59BD0 80241340 0220202D */ daddu $a0, $s1, $zero -/* D59BD4 80241344 0C0B1EAF */ jal get_variable -/* D59BD8 80241348 0040902D */ daddu $s2, $v0, $zero -/* D59BDC 8024134C 0220202D */ daddu $a0, $s1, $zero -/* D59BE0 80241350 8E050000 */ lw $a1, ($s0) -/* D59BE4 80241354 0C0B1EAF */ jal get_variable -/* D59BE8 80241358 0040802D */ daddu $s0, $v0, $zero -/* D59BEC 8024135C 44926000 */ mtc1 $s2, $f12 -/* D59BF0 80241360 00000000 */ nop -/* D59BF4 80241364 46806320 */ cvt.s.w $f12, $f12 -/* D59BF8 80241368 44820000 */ mtc1 $v0, $f0 -/* D59BFC 8024136C 00000000 */ nop -/* D59C00 80241370 46800020 */ cvt.s.w $f0, $f0 -/* D59C04 80241374 44060000 */ mfc1 $a2, $f0 -/* D59C08 80241378 44907000 */ mtc1 $s0, $f14 -/* D59C0C 8024137C 00000000 */ nop -/* D59C10 80241380 0C01BE3C */ jal func_8006F8F0 -/* D59C14 80241384 468073A0 */ cvt.s.w $f14, $f14 -/* D59C18 80241388 8FBF001C */ lw $ra, 0x1c($sp) -/* D59C1C 8024138C 8FB20018 */ lw $s2, 0x18($sp) -/* D59C20 80241390 8FB10014 */ lw $s1, 0x14($sp) -/* D59C24 80241394 8FB00010 */ lw $s0, 0x10($sp) -/* D59C28 80241398 24020002 */ addiu $v0, $zero, 2 -/* D59C2C 8024139C 03E00008 */ jr $ra -/* D59C30 802413A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_802413A4_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_802413A4_D58890.s deleted file mode 100644 index 756b865802..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_802413A4_D58890.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413A4_D59C34 -/* D59C34 802413A4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D59C38 802413A8 AFB20018 */ sw $s2, 0x18($sp) -/* D59C3C 802413AC 0080902D */ daddu $s2, $a0, $zero -/* D59C40 802413B0 AFBF0024 */ sw $ra, 0x24($sp) -/* D59C44 802413B4 AFB40020 */ sw $s4, 0x20($sp) -/* D59C48 802413B8 AFB3001C */ sw $s3, 0x1c($sp) -/* D59C4C 802413BC AFB10014 */ sw $s1, 0x14($sp) -/* D59C50 802413C0 AFB00010 */ sw $s0, 0x10($sp) -/* D59C54 802413C4 8E50000C */ lw $s0, 0xc($s2) -/* D59C58 802413C8 8E530148 */ lw $s3, 0x148($s2) -/* D59C5C 802413CC 8E050000 */ lw $a1, ($s0) -/* D59C60 802413D0 0C0B1EAF */ jal get_variable -/* D59C64 802413D4 26100004 */ addiu $s0, $s0, 4 -/* D59C68 802413D8 2C510001 */ sltiu $s1, $v0, 1 -/* D59C6C 802413DC 8E050000 */ lw $a1, ($s0) -/* D59C70 802413E0 26100004 */ addiu $s0, $s0, 4 -/* D59C74 802413E4 3C14800B */ lui $s4, %hi(gCurrentEncounter) -/* D59C78 802413E8 26940F10 */ addiu $s4, $s4, %lo(gCurrentEncounter) -/* D59C7C 802413EC 0C0B1EAF */ jal get_variable -/* D59C80 802413F0 0240202D */ daddu $a0, $s2, $zero -/* D59C84 802413F4 50400001 */ beql $v0, $zero, .L802413FC -/* D59C88 802413F8 26310001 */ addiu $s1, $s1, 1 -.L802413FC: -/* D59C8C 802413FC 8E050000 */ lw $a1, ($s0) -/* D59C90 80241400 26100004 */ addiu $s0, $s0, 4 -/* D59C94 80241404 0C0B1EAF */ jal get_variable -/* D59C98 80241408 0240202D */ daddu $a0, $s2, $zero -/* D59C9C 8024140C 50400001 */ beql $v0, $zero, .L80241414 -/* D59CA0 80241410 26310001 */ addiu $s1, $s1, 1 -.L80241414: -/* D59CA4 80241414 8E050000 */ lw $a1, ($s0) -/* D59CA8 80241418 0C0B1EAF */ jal get_variable -/* D59CAC 8024141C 0240202D */ daddu $a0, $s2, $zero -/* D59CB0 80241420 50400001 */ beql $v0, $zero, .L80241428 -/* D59CB4 80241424 26310001 */ addiu $s1, $s1, 1 -.L80241428: -/* D59CB8 80241428 24020002 */ addiu $v0, $zero, 2 -/* D59CBC 8024142C 12220016 */ beq $s1, $v0, .L80241488 -/* D59CC0 80241430 00000000 */ nop -/* D59CC4 80241434 2A220003 */ slti $v0, $s1, 3 -/* D59CC8 80241438 10400005 */ beqz $v0, .L80241450 -/* D59CCC 8024143C 24020001 */ addiu $v0, $zero, 1 -/* D59CD0 80241440 1222000B */ beq $s1, $v0, .L80241470 -/* D59CD4 80241444 00000000 */ nop -/* D59CD8 80241448 08090534 */ j .L802414D0 -/* D59CDC 8024144C 00000000 */ nop -.L80241450: -/* D59CE0 80241450 24020003 */ addiu $v0, $zero, 3 -/* D59CE4 80241454 12220012 */ beq $s1, $v0, .L802414A0 -/* D59CE8 80241458 00000000 */ nop -/* D59CEC 8024145C 24020004 */ addiu $v0, $zero, 4 -/* D59CF0 80241460 12220015 */ beq $s1, $v0, .L802414B8 -/* D59CF4 80241464 00000000 */ nop -/* D59CF8 80241468 08090534 */ j .L802414D0 -/* D59CFC 8024146C 00000000 */ nop -.L80241470: -/* D59D00 80241470 82620004 */ lb $v0, 4($s3) -/* D59D04 80241474 00021080 */ sll $v0, $v0, 2 -/* D59D08 80241478 00541021 */ addu $v0, $v0, $s4 -/* D59D0C 8024147C 8C430028 */ lw $v1, 0x28($v0) -/* D59D10 80241480 08090533 */ j .L802414CC -/* D59D14 80241484 24022101 */ addiu $v0, $zero, 0x2101 -.L80241488: -/* D59D18 80241488 82620004 */ lb $v0, 4($s3) -/* D59D1C 8024148C 00021080 */ sll $v0, $v0, 2 -/* D59D20 80241490 00541021 */ addu $v0, $v0, $s4 -/* D59D24 80241494 8C430028 */ lw $v1, 0x28($v0) -/* D59D28 80241498 08090533 */ j .L802414CC -/* D59D2C 8024149C 24022102 */ addiu $v0, $zero, 0x2102 -.L802414A0: -/* D59D30 802414A0 82620004 */ lb $v0, 4($s3) -/* D59D34 802414A4 00021080 */ sll $v0, $v0, 2 -/* D59D38 802414A8 00541021 */ addu $v0, $v0, $s4 -/* D59D3C 802414AC 8C430028 */ lw $v1, 0x28($v0) -/* D59D40 802414B0 08090533 */ j .L802414CC -/* D59D44 802414B4 24022103 */ addiu $v0, $zero, 0x2103 -.L802414B8: -/* D59D48 802414B8 82620004 */ lb $v0, 4($s3) -/* D59D4C 802414BC 00021080 */ sll $v0, $v0, 2 -/* D59D50 802414C0 00541021 */ addu $v0, $v0, $s4 -/* D59D54 802414C4 8C430028 */ lw $v1, 0x28($v0) -/* D59D58 802414C8 24022104 */ addiu $v0, $zero, 0x2104 -.L802414CC: -/* D59D5C 802414CC A4620044 */ sh $v0, 0x44($v1) -.L802414D0: -/* D59D60 802414D0 8FBF0024 */ lw $ra, 0x24($sp) -/* D59D64 802414D4 8FB40020 */ lw $s4, 0x20($sp) -/* D59D68 802414D8 8FB3001C */ lw $s3, 0x1c($sp) -/* D59D6C 802414DC 8FB20018 */ lw $s2, 0x18($sp) -/* D59D70 802414E0 8FB10014 */ lw $s1, 0x14($sp) -/* D59D74 802414E4 8FB00010 */ lw $s0, 0x10($sp) -/* D59D78 802414E8 24020002 */ addiu $v0, $zero, 2 -/* D59D7C 802414EC 03E00008 */ jr $ra -/* D59D80 802414F0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_802414F4_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_802414F4_D58890.s deleted file mode 100644 index b1cfcce43c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_802414F4_D58890.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414F4_D59D84 -/* D59D84 802414F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D59D88 802414F8 AFB10014 */ sw $s1, 0x14($sp) -/* D59D8C 802414FC 0080882D */ daddu $s1, $a0, $zero -/* D59D90 80241500 AFB00010 */ sw $s0, 0x10($sp) -/* D59D94 80241504 00A0802D */ daddu $s0, $a1, $zero -/* D59D98 80241508 AFBF0018 */ sw $ra, 0x18($sp) -/* D59D9C 8024150C 0C0B36B0 */ jal resolve_npc -/* D59DA0 80241510 8E250084 */ lw $a1, 0x84($s1) -/* D59DA4 80241514 12000012 */ beqz $s0, .L80241560 -/* D59DA8 80241518 0040202D */ daddu $a0, $v0, $zero -/* D59DAC 8024151C 3C020003 */ lui $v0, 3 -/* D59DB0 80241520 34420011 */ ori $v0, $v0, 0x11 -/* D59DB4 80241524 3C013F4C */ lui $at, 0x3f4c -/* D59DB8 80241528 3421CCCD */ ori $at, $at, 0xcccd -/* D59DBC 8024152C 44811000 */ mtc1 $at, $f2 -/* D59DC0 80241530 C6200088 */ lwc1 $f0, 0x88($s1) -/* D59DC4 80241534 46800020 */ cvt.s.w $f0, $f0 -/* D59DC8 80241538 E4800038 */ swc1 $f0, 0x38($a0) -/* D59DCC 8024153C C620008C */ lwc1 $f0, 0x8c($s1) -/* D59DD0 80241540 46800020 */ cvt.s.w $f0, $f0 -/* D59DD4 80241544 E480003C */ swc1 $f0, 0x3c($a0) -/* D59DD8 80241548 C6200090 */ lwc1 $f0, 0x90($s1) -/* D59DDC 8024154C 46800020 */ cvt.s.w $f0, $f0 -/* D59DE0 80241550 E4800040 */ swc1 $f0, 0x40($a0) -/* D59DE4 80241554 AC80001C */ sw $zero, 0x1c($a0) -/* D59DE8 80241558 AC820028 */ sw $v0, 0x28($a0) -/* D59DEC 8024155C E4820014 */ swc1 $f2, 0x14($a0) -.L80241560: -/* D59DF0 80241560 C486004C */ lwc1 $f6, 0x4c($a0) -/* D59DF4 80241564 3C01421C */ lui $at, 0x421c -/* D59DF8 80241568 44810000 */ mtc1 $at, $f0 -/* D59DFC 8024156C C482003C */ lwc1 $f2, 0x3c($a0) -/* D59E00 80241570 46003181 */ sub.s $f6, $f6, $f0 -/* D59E04 80241574 C480001C */ lwc1 $f0, 0x1c($a0) -/* D59E08 80241578 C4840044 */ lwc1 $f4, 0x44($a0) -/* D59E0C 8024157C 46001081 */ sub.s $f2, $f2, $f0 -/* D59E10 80241580 3C014204 */ lui $at, 0x4204 -/* D59E14 80241584 44810000 */ mtc1 $at, $f0 -/* D59E18 80241588 44805000 */ mtc1 $zero, $f10 -/* D59E1C 8024158C 46002101 */ sub.s $f4, $f4, $f0 -/* D59E20 80241590 C480001C */ lwc1 $f0, 0x1c($a0) -/* D59E24 80241594 E482003C */ swc1 $f2, 0x3c($a0) -/* D59E28 80241598 C4820014 */ lwc1 $f2, 0x14($a0) -/* D59E2C 8024159C C488003C */ lwc1 $f8, 0x3c($a0) -/* D59E30 802415A0 46020000 */ add.s $f0, $f0, $f2 -/* D59E34 802415A4 E486004C */ swc1 $f6, 0x4c($a0) -/* D59E38 802415A8 460A403E */ c.le.s $f8, $f10 -/* D59E3C 802415AC E4840044 */ swc1 $f4, 0x44($a0) -/* D59E40 802415B0 45010003 */ bc1t .L802415C0 -/* D59E44 802415B4 E480001C */ swc1 $f0, 0x1c($a0) -/* D59E48 802415B8 08090579 */ j .L802415E4 -/* D59E4C 802415BC 0000102D */ daddu $v0, $zero, $zero -.L802415C0: -/* D59E50 802415C0 3C030003 */ lui $v1, 3 -/* D59E54 802415C4 34630003 */ ori $v1, $v1, 3 -/* D59E58 802415C8 24020002 */ addiu $v0, $zero, 2 -/* D59E5C 802415CC E48A003C */ swc1 $f10, 0x3c($a0) -/* D59E60 802415D0 E48A004C */ swc1 $f10, 0x4c($a0) -/* D59E64 802415D4 E48A0044 */ swc1 $f10, 0x44($a0) -/* D59E68 802415D8 E48A001C */ swc1 $f10, 0x1c($a0) -/* D59E6C 802415DC E48A0014 */ swc1 $f10, 0x14($a0) -/* D59E70 802415E0 AC830028 */ sw $v1, 0x28($a0) -.L802415E4: -/* D59E74 802415E4 8FBF0018 */ lw $ra, 0x18($sp) -/* D59E78 802415E8 8FB10014 */ lw $s1, 0x14($sp) -/* D59E7C 802415EC 8FB00010 */ lw $s0, 0x10($sp) -/* D59E80 802415F0 03E00008 */ jr $ra -/* D59E84 802415F4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_09/func_802415F8_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/func_802415F8_D58890.s deleted file mode 100644 index d23039571a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/func_802415F8_D58890.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415F8_D59E88 -/* D59E88 802415F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D59E8C 802415FC AFB00010 */ sw $s0, 0x10($sp) -/* D59E90 80241600 0080802D */ daddu $s0, $a0, $zero -/* D59E94 80241604 AFBF0014 */ sw $ra, 0x14($sp) -/* D59E98 80241608 0C0B36B0 */ jal resolve_npc -/* D59E9C 8024160C 8E050090 */ lw $a1, 0x90($s0) -/* D59EA0 80241610 0200202D */ daddu $a0, $s0, $zero -/* D59EA4 80241614 8C850094 */ lw $a1, 0x94($a0) -/* D59EA8 80241618 0C0B36B0 */ jal resolve_npc -/* D59EAC 8024161C 0040802D */ daddu $s0, $v0, $zero -/* D59EB0 80241620 944300A6 */ lhu $v1, 0xa6($v0) -/* D59EB4 80241624 A60300A6 */ sh $v1, 0xa6($s0) -/* D59EB8 80241628 944300A8 */ lhu $v1, 0xa8($v0) -/* D59EBC 8024162C A60300A8 */ sh $v1, 0xa8($s0) -/* D59EC0 80241630 8FBF0014 */ lw $ra, 0x14($sp) -/* D59EC4 80241634 8FB00010 */ lw $s0, 0x10($sp) -/* D59EC8 80241638 24020002 */ addiu $v0, $zero, 2 -/* D59ECC 8024163C 03E00008 */ jr $ra -/* D59ED0 80241640 27BD0018 */ addiu $sp, $sp, 0x18 -/* D59ED4 80241644 00000000 */ nop -/* D59ED8 80241648 00000000 */ nop -/* D59EDC 8024164C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_10/func_80240020_D5F2B0.s b/asm/nonmatchings/world/area_pra/pra_10/func_80240020_D5F2B0.s deleted file mode 100644 index 17a1407d74..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/func_80240020_D5F2B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D5F2D0 -/* D5F2D0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D5F2D4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D5F2D8 80240028 00822024 */ and $a0, $a0, $v0 -/* D5F2DC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D5F2E0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D5F2E4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D5F2E8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D5F2EC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D5F2F0 80240040 30620001 */ andi $v0, $v1, 1 -/* D5F2F4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D5F2F8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D5F2FC 8024004C 03E00008 */ jr $ra -/* D5F300 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_10/func_80240054_D5F2B0.s b/asm/nonmatchings/world/area_pra/pra_10/func_80240054_D5F2B0.s deleted file mode 100644 index 40236f8130..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/func_80240054_D5F2B0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054_D5F304 -/* D5F304 80240054 00041403 */ sra $v0, $a0, 0x10 -/* D5F308 80240058 304300FF */ andi $v1, $v0, 0xff -/* D5F30C 8024005C 24020006 */ addiu $v0, $zero, 6 -/* D5F310 80240060 10620015 */ beq $v1, $v0, .L802400B8 -/* D5F314 80240064 28620007 */ slti $v0, $v1, 7 -/* D5F318 80240068 10400005 */ beqz $v0, .L80240080 -/* D5F31C 8024006C 24020001 */ addiu $v0, $zero, 1 -/* D5F320 80240070 1062000A */ beq $v1, $v0, .L8024009C -/* D5F324 80240074 3C020100 */ lui $v0, 0x100 -/* D5F328 80240078 03E00008 */ jr $ra -/* D5F32C 8024007C 00821025 */ or $v0, $a0, $v0 -.L80240080: -/* D5F330 80240080 2862000A */ slti $v0, $v1, 0xa -/* D5F334 80240084 10400016 */ beqz $v0, .L802400E0 -/* D5F338 80240088 28620008 */ slti $v0, $v1, 8 -/* D5F33C 8024008C 14400015 */ bnez $v0, .L802400E4 -/* D5F340 80240090 3C020100 */ lui $v0, 0x100 -/* D5F344 80240094 03E00008 */ jr $ra -/* D5F348 80240098 0080102D */ daddu $v0, $a0, $zero -.L8024009C: -/* D5F34C 8024009C 3C020001 */ lui $v0, 1 -/* D5F350 802400A0 3442000C */ ori $v0, $v0, 0xc -/* D5F354 802400A4 0044102A */ slt $v0, $v0, $a0 -/* D5F358 802400A8 1040000E */ beqz $v0, .L802400E4 -/* D5F35C 802400AC 3C020100 */ lui $v0, 0x100 -.L802400B0: -/* D5F360 802400B0 03E00008 */ jr $ra -/* D5F364 802400B4 0080102D */ daddu $v0, $a0, $zero -.L802400B8: -/* D5F368 802400B8 3C02FFF9 */ lui $v0, 0xfff9 -/* D5F36C 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D5F370 802400C0 00821821 */ addu $v1, $a0, $v0 -/* D5F374 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D5F378 802400C8 10400005 */ beqz $v0, .L802400E0 -/* D5F37C 802400CC 30620001 */ andi $v0, $v1, 1 -/* D5F380 802400D0 1440FFF7 */ bnez $v0, .L802400B0 -/* D5F384 802400D4 24820001 */ addiu $v0, $a0, 1 -/* D5F388 802400D8 03E00008 */ jr $ra -/* D5F38C 802400DC 00000000 */ nop -.L802400E0: -/* D5F390 802400E0 3C020100 */ lui $v0, 0x100 -.L802400E4: -/* D5F394 802400E4 03E00008 */ jr $ra -/* D5F398 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_10/func_802400EC_D5F2B0.s b/asm/nonmatchings/world/area_pra/pra_10/func_802400EC_D5F2B0.s deleted file mode 100644 index 6783e0d425..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/func_802400EC_D5F2B0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_D5F39C -/* D5F39C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D5F3A0 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* D5F3A4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D5F3A8 802400F8 3C058024 */ lui $a1, 0x8024 -/* D5F3AC 802400FC 24A50128 */ addiu $a1, $a1, 0x128 -/* D5F3B0 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* D5F3B4 80240104 0C048C56 */ jal bind_dynamic_entity_3 -/* D5F3B8 80240108 0000202D */ daddu $a0, $zero, $zero -/* D5F3BC 8024010C 8E03013C */ lw $v1, 0x13c($s0) -/* D5F3C0 80240110 AC620000 */ sw $v0, ($v1) -/* D5F3C4 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* D5F3C8 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* D5F3CC 8024011C 24020002 */ addiu $v0, $zero, 2 -/* D5F3D0 80240120 03E00008 */ jr $ra -/* D5F3D4 80240124 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_10/func_80240128_D5F2B0.s b/asm/nonmatchings/world/area_pra/pra_10/func_80240128_D5F2B0.s deleted file mode 100644 index 80a45abdfe..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/func_80240128_D5F2B0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240128_D5F3D8 -/* D5F3D8 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D5F3DC 8024012C AFB00040 */ sw $s0, 0x40($sp) -/* D5F3E0 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D5F3E4 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D5F3E8 80240138 AFB20048 */ sw $s2, 0x48($sp) -/* D5F3EC 8024013C AFBF004C */ sw $ra, 0x4c($sp) -/* D5F3F0 80240140 AFB10044 */ sw $s1, 0x44($sp) -/* D5F3F4 80240144 8E020000 */ lw $v0, ($s0) -/* D5F3F8 80240148 821100BE */ lb $s1, 0xbe($s0) -/* D5F3FC 8024014C 30420001 */ andi $v0, $v0, 1 -/* D5F400 80240150 10400061 */ beqz $v0, .L802402D8 -/* D5F404 80240154 27B20020 */ addiu $s2, $sp, 0x20 -/* D5F408 80240158 8E0400CC */ lw $a0, 0xcc($s0) -/* D5F40C 8024015C 0C044181 */ jal get_shadow_by_index -/* D5F410 80240160 00000000 */ nop -/* D5F414 80240164 0C048B77 */ jal func_80122DDC -/* D5F418 80240168 84440008 */ lh $a0, 8($v0) -/* D5F41C 8024016C 8C430000 */ lw $v1, ($v0) -/* D5F420 80240170 34630200 */ ori $v1, $v1, 0x200 -/* D5F424 80240174 AC430000 */ sw $v1, ($v0) -/* D5F428 80240178 8E050028 */ lw $a1, 0x28($s0) -/* D5F42C 8024017C 8E06002C */ lw $a2, 0x2c($s0) -/* D5F430 80240180 27A20030 */ addiu $v0, $sp, 0x30 -/* D5F434 80240184 AFA20010 */ sw $v0, 0x10($sp) -/* D5F438 80240188 27A20034 */ addiu $v0, $sp, 0x34 -/* D5F43C 8024018C AFA20014 */ sw $v0, 0x14($sp) -/* D5F440 80240190 C6000030 */ lwc1 $f0, 0x30($s0) -/* D5F444 80240194 3C04800A */ lui $a0, 0x800a -/* D5F448 80240198 8484A634 */ lh $a0, -0x59cc($a0) -/* D5F44C 8024019C 46000007 */ neg.s $f0, $f0 -/* D5F450 802401A0 44070000 */ mfc1 $a3, $f0 -/* D5F454 802401A4 27A20038 */ addiu $v0, $sp, 0x38 -/* D5F458 802401A8 0C00B94E */ jal get_screen_coords -/* D5F45C 802401AC AFA20018 */ sw $v0, 0x18($sp) -/* D5F460 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D5F464 802401B4 0C090008 */ jal func_80240020 -/* D5F468 802401B8 00000000 */ nop -/* D5F46C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) -/* D5F470 802401C0 3C014307 */ lui $at, 0x4307 -/* D5F474 802401C4 44810000 */ mtc1 $at, $f0 -/* D5F478 802401C8 00000000 */ nop -/* D5F47C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D5F480 802401D0 00000000 */ nop -/* D5F484 802401D4 4500000B */ bc1f .L80240204 -/* D5F488 802401D8 24040002 */ addiu $a0, $zero, 2 -/* D5F48C 802401DC 3C014361 */ lui $at, 0x4361 -/* D5F490 802401E0 44810000 */ mtc1 $at, $f0 -/* D5F494 802401E4 00000000 */ nop -/* D5F498 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D5F49C 802401EC 00000000 */ nop -/* D5F4A0 802401F0 45000004 */ bc1f .L80240204 -/* D5F4A4 802401F4 00000000 */ nop -/* D5F4A8 802401F8 0C090015 */ jal func_80240054 -/* D5F4AC 802401FC 0040202D */ daddu $a0, $v0, $zero -/* D5F4B0 80240200 24040002 */ addiu $a0, $zero, 2 -.L80240204: -/* D5F4B4 80240204 3C063F80 */ lui $a2, 0x3f80 -/* D5F4B8 80240208 0C0B76A3 */ jal func_802DDA8C -/* D5F4BC 8024020C 0040282D */ daddu $a1, $v0, $zero -/* D5F4C0 80240210 8E020000 */ lw $v0, ($s0) -/* D5F4C4 80240214 3C030002 */ lui $v1, 2 -/* D5F4C8 80240218 00431024 */ and $v0, $v0, $v1 -/* D5F4CC 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 -/* D5F4D0 80240220 24110011 */ addiu $s1, $zero, 0x11 -/* D5F4D4 80240224 9203000E */ lbu $v1, 0xe($s0) -/* D5F4D8 80240228 3C02802E */ lui $v0, 0x802e -/* D5F4DC 8024022C 90429D70 */ lbu $v0, -0x6290($v0) -/* D5F4E0 80240230 10620018 */ beq $v1, $v0, .L80240294 -/* D5F4E4 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D5F4E8 80240238 1040000B */ beqz $v0, .L80240268 -/* D5F4EC 8024023C 24110011 */ addiu $s1, $zero, 0x11 -/* D5F4F0 80240240 24040002 */ addiu $a0, $zero, 2 -/* D5F4F4 80240244 2405FFFF */ addiu $a1, $zero, -1 -/* D5F4F8 80240248 24060007 */ addiu $a2, $zero, 7 -/* D5F4FC 8024024C 0060102D */ daddu $v0, $v1, $zero -/* D5F500 80240250 0000382D */ daddu $a3, $zero, $zero -/* D5F504 80240254 AFA00010 */ sw $zero, 0x10($sp) -/* D5F508 80240258 AFA00014 */ sw $zero, 0x14($sp) -/* D5F50C 8024025C AFA0001C */ sw $zero, 0x1c($sp) -/* D5F510 80240260 080900A3 */ j .L8024028C -/* D5F514 80240264 AFA20018 */ sw $v0, 0x18($sp) -.L80240268: -/* D5F518 80240268 2411000D */ addiu $s1, $zero, 0xd -/* D5F51C 8024026C 24040002 */ addiu $a0, $zero, 2 -/* D5F520 80240270 2405FFFF */ addiu $a1, $zero, -1 -/* D5F524 80240274 0000302D */ daddu $a2, $zero, $zero -/* D5F528 80240278 00C0382D */ daddu $a3, $a2, $zero -/* D5F52C 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* D5F530 80240280 AFA00014 */ sw $zero, 0x14($sp) -/* D5F534 80240284 AFA00018 */ sw $zero, 0x18($sp) -/* D5F538 80240288 AFA0001C */ sw $zero, 0x1c($sp) -.L8024028C: -/* D5F53C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D5F540 80240290 00000000 */ nop -.L80240294: -/* D5F544 80240294 9202000E */ lbu $v0, 0xe($s0) -/* D5F548 80240298 3C01802E */ lui $at, 0x802e -/* D5F54C 8024029C A0229D70 */ sb $v0, -0x6290($at) -/* D5F550 802402A0 080900AD */ j .L802402B4 -/* D5F554 802402A4 0240202D */ daddu $a0, $s2, $zero -.L802402A8: -/* D5F558 802402A8 3C01802E */ lui $at, 0x802e -/* D5F55C 802402AC A0209D70 */ sb $zero, -0x6290($at) -/* D5F560 802402B0 0240202D */ daddu $a0, $s2, $zero -.L802402B4: -/* D5F564 802402B4 AC910000 */ sw $s1, ($a0) -/* D5F568 802402B8 AC900008 */ sw $s0, 8($a0) -/* D5F56C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D5F570 802402C0 3C038024 */ lui $v1, 0x8024 -/* D5F574 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 -/* D5F578 802402C8 AC83000C */ sw $v1, 0xc($a0) -/* D5F57C 802402CC 00021023 */ negu $v0, $v0 -/* D5F580 802402D0 0C047644 */ jal queue_render_task -/* D5F584 802402D4 AC820004 */ sw $v0, 4($a0) -.L802402D8: -/* D5F588 802402D8 8FBF004C */ lw $ra, 0x4c($sp) -/* D5F58C 802402DC 8FB20048 */ lw $s2, 0x48($sp) -/* D5F590 802402E0 8FB10044 */ lw $s1, 0x44($sp) -/* D5F594 802402E4 8FB00040 */ lw $s0, 0x40($sp) -/* D5F598 802402E8 03E00008 */ jr $ra -/* D5F59C 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_10/func_802402F0_D5F2B0.s b/asm/nonmatchings/world/area_pra/pra_10/func_802402F0_D5F2B0.s deleted file mode 100644 index 3965020246..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/func_802402F0_D5F2B0.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D5F5A0 -/* D5F5A0 802402F0 3C03800A */ lui $v1, 0x800a -/* D5F5A4 802402F4 8463A634 */ lh $v1, -0x59cc($v1) -/* D5F5A8 802402F8 3C07BF80 */ lui $a3, 0xbf80 -/* D5F5AC 802402FC 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D5F5B0 80240300 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D5F5B4 80240304 4480A000 */ mtc1 $zero, $f20 -/* D5F5B8 80240308 AFB1011C */ sw $s1, 0x11c($sp) -/* D5F5BC 8024030C 0080882D */ daddu $s1, $a0, $zero -/* D5F5C0 80240310 AFB00118 */ sw $s0, 0x118($sp) -/* D5F5C4 80240314 27B00098 */ addiu $s0, $sp, 0x98 -/* D5F5C8 80240318 AFBF0120 */ sw $ra, 0x120($sp) -/* D5F5CC 8024031C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D5F5D0 80240320 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D5F5D4 80240324 00031080 */ sll $v0, $v1, 2 -/* D5F5D8 80240328 00431021 */ addu $v0, $v0, $v1 -/* D5F5DC 8024032C 00021080 */ sll $v0, $v0, 2 -/* D5F5E0 80240330 00431023 */ subu $v0, $v0, $v1 -/* D5F5E4 80240334 000218C0 */ sll $v1, $v0, 3 -/* D5F5E8 80240338 00431021 */ addu $v0, $v0, $v1 -/* D5F5EC 8024033C 000210C0 */ sll $v0, $v0, 3 -/* D5F5F0 80240340 3C01800B */ lui $at, 0x800b -/* D5F5F4 80240344 00220821 */ addu $at, $at, $v0 -/* D5F5F8 80240348 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D5F5FC 8024034C 4406A000 */ mfc1 $a2, $f20 -/* D5F600 80240350 4600B587 */ neg.s $f22, $f22 -/* D5F604 80240354 4405B000 */ mfc1 $a1, $f22 -/* D5F608 80240358 0200202D */ daddu $a0, $s0, $zero -/* D5F60C 8024035C 0C019EC8 */ jal guRotateF -/* D5F610 80240360 E7B40010 */ swc1 $f20, 0x10($sp) -/* D5F614 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D5F618 80240368 0C00A6C9 */ jal clamp_angle -/* D5F61C 8024036C 00000000 */ nop -/* D5F620 80240370 44050000 */ mfc1 $a1, $f0 -/* D5F624 80240374 4406A000 */ mfc1 $a2, $f20 -/* D5F628 80240378 4407A000 */ mfc1 $a3, $f20 -/* D5F62C 8024037C 3C013F80 */ lui $at, 0x3f80 -/* D5F630 80240380 4481C000 */ mtc1 $at, $f24 -/* D5F634 80240384 27A40018 */ addiu $a0, $sp, 0x18 -/* D5F638 80240388 0C019EC8 */ jal guRotateF -/* D5F63C 8024038C E7B80010 */ swc1 $f24, 0x10($sp) -/* D5F640 80240390 0200202D */ daddu $a0, $s0, $zero -/* D5F644 80240394 27A50018 */ addiu $a1, $sp, 0x18 -/* D5F648 80240398 0C019D80 */ jal guMtxCatF -/* D5F64C 8024039C 00A0302D */ daddu $a2, $a1, $zero -/* D5F650 802403A0 4405B000 */ mfc1 $a1, $f22 -/* D5F654 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D5F658 802403A8 4407C000 */ mfc1 $a3, $f24 -/* D5F65C 802403AC 0200202D */ daddu $a0, $s0, $zero -/* D5F660 802403B0 0C019EC8 */ jal guRotateF -/* D5F664 802403B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D5F668 802403B8 27A40018 */ addiu $a0, $sp, 0x18 -/* D5F66C 802403BC 0200282D */ daddu $a1, $s0, $zero -/* D5F670 802403C0 0C019D80 */ jal guMtxCatF -/* D5F674 802403C4 0080302D */ daddu $a2, $a0, $zero -/* D5F678 802403C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D5F67C 802403CC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D5F680 802403D0 4406A000 */ mfc1 $a2, $f20 -/* D5F684 802403D4 4407C000 */ mfc1 $a3, $f24 -/* D5F688 802403D8 0C019EC8 */ jal guRotateF -/* D5F68C 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D5F690 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* D5F694 802403E4 0200282D */ daddu $a1, $s0, $zero -/* D5F698 802403E8 0C019D80 */ jal guMtxCatF -/* D5F69C 802403EC 0080302D */ daddu $a2, $a0, $zero -/* D5F6A0 802403F0 3C013F36 */ lui $at, 0x3f36 -/* D5F6A4 802403F4 3421DB6E */ ori $at, $at, 0xdb6e -/* D5F6A8 802403F8 44810000 */ mtc1 $at, $f0 -/* D5F6AC 802403FC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D5F6B0 80240400 44050000 */ mfc1 $a1, $f0 -/* D5F6B4 80240404 0200202D */ daddu $a0, $s0, $zero -/* D5F6B8 80240408 00A0302D */ daddu $a2, $a1, $zero -/* D5F6BC 8024040C 0C019DF0 */ jal guScaleF -/* D5F6C0 80240410 00A0382D */ daddu $a3, $a1, $zero -/* D5F6C4 80240414 27A40018 */ addiu $a0, $sp, 0x18 -/* D5F6C8 80240418 0200282D */ daddu $a1, $s0, $zero -/* D5F6CC 8024041C 0C019D80 */ jal guMtxCatF -/* D5F6D0 80240420 0080302D */ daddu $a2, $a0, $zero -/* D5F6D4 80240424 27B00058 */ addiu $s0, $sp, 0x58 -/* D5F6D8 80240428 C6200030 */ lwc1 $f0, 0x30($s1) -/* D5F6DC 8024042C 3C014040 */ lui $at, 0x4040 -/* D5F6E0 80240430 44811000 */ mtc1 $at, $f2 -/* D5F6E4 80240434 46000007 */ neg.s $f0, $f0 -/* D5F6E8 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* D5F6EC 8024043C 8E250028 */ lw $a1, 0x28($s1) -/* D5F6F0 80240440 8E26002C */ lw $a2, 0x2c($s1) -/* D5F6F4 80240444 44070000 */ mfc1 $a3, $f0 -/* D5F6F8 80240448 0C019E40 */ jal guTranslateF -/* D5F6FC 8024044C 0200202D */ daddu $a0, $s0, $zero -/* D5F700 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* D5F704 80240454 0200282D */ daddu $a1, $s0, $zero -/* D5F708 80240458 0C019D80 */ jal guMtxCatF -/* D5F70C 8024045C 0080302D */ daddu $a2, $a0, $zero -/* D5F710 80240460 24040002 */ addiu $a0, $zero, 2 -/* D5F714 80240464 0000282D */ daddu $a1, $zero, $zero -/* D5F718 80240468 00A0302D */ daddu $a2, $a1, $zero -/* D5F71C 8024046C 00A0382D */ daddu $a3, $a1, $zero -/* D5F720 80240470 27A20018 */ addiu $v0, $sp, 0x18 -/* D5F724 80240474 0C0B7710 */ jal render_sprite -/* D5F728 80240478 AFA20010 */ sw $v0, 0x10($sp) -/* D5F72C 8024047C 8FBF0120 */ lw $ra, 0x120($sp) -/* D5F730 80240480 8FB1011C */ lw $s1, 0x11c($sp) -/* D5F734 80240484 8FB00118 */ lw $s0, 0x118($sp) -/* D5F738 80240488 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D5F73C 8024048C D7B60130 */ ldc1 $f22, 0x130($sp) -/* D5F740 80240490 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D5F744 80240494 03E00008 */ jr $ra -/* D5F748 80240498 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_10/func_8024049C_D5F2B0.s b/asm/nonmatchings/world/area_pra/pra_10/func_8024049C_D5F2B0.s deleted file mode 100644 index d67a1d17f4..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/func_8024049C_D5F2B0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_D5F74C -/* D5F74C 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D5F750 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* D5F754 802404A4 0080802D */ daddu $s0, $a0, $zero -/* D5F758 802404A8 AFBF0014 */ sw $ra, 0x14($sp) -/* D5F75C 802404AC 8E020084 */ lw $v0, 0x84($s0) -/* D5F760 802404B0 0440000E */ bltz $v0, .L802404EC -/* D5F764 802404B4 28420002 */ slti $v0, $v0, 2 -/* D5F768 802404B8 1040000C */ beqz $v0, .L802404EC -/* D5F76C 802404BC 00000000 */ nop -/* D5F770 802404C0 3C058024 */ lui $a1, 0x8024 -/* D5F774 802404C4 24A50500 */ addiu $a1, $a1, 0x500 -/* D5F778 802404C8 0C048C56 */ jal bind_dynamic_entity_3 -/* D5F77C 802404CC 0000202D */ daddu $a0, $zero, $zero -/* D5F780 802404D0 8E03013C */ lw $v1, 0x13c($s0) -/* D5F784 802404D4 AC620000 */ sw $v0, ($v1) -/* D5F788 802404D8 3C03800A */ lui $v1, %hi(D_8009A650) -/* D5F78C 802404DC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D5F790 802404E0 8C620000 */ lw $v0, ($v1) -/* D5F794 802404E4 34420080 */ ori $v0, $v0, 0x80 -/* D5F798 802404E8 AC620000 */ sw $v0, ($v1) -.L802404EC: -/* D5F79C 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* D5F7A0 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* D5F7A4 802404F4 24020002 */ addiu $v0, $zero, 2 -/* D5F7A8 802404F8 03E00008 */ jr $ra -/* D5F7AC 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_10/func_80240500_D5F2B0.s b/asm/nonmatchings/world/area_pra/pra_10/func_80240500_D5F2B0.s deleted file mode 100644 index fc3e983c46..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/func_80240500_D5F2B0.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_D5F7B0 -/* D5F7B0 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D5F7B4 80240504 AFB00040 */ sw $s0, 0x40($sp) -/* D5F7B8 80240508 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D5F7BC 8024050C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D5F7C0 80240510 AFB10044 */ sw $s1, 0x44($sp) -/* D5F7C4 80240514 AFBF004C */ sw $ra, 0x4c($sp) -/* D5F7C8 80240518 AFB20048 */ sw $s2, 0x48($sp) -/* D5F7CC 8024051C 8E020000 */ lw $v0, ($s0) -/* D5F7D0 80240520 821200BE */ lb $s2, 0xbe($s0) -/* D5F7D4 80240524 30420001 */ andi $v0, $v0, 1 -/* D5F7D8 80240528 10400052 */ beqz $v0, .L80240674 -/* D5F7DC 8024052C 27B10020 */ addiu $s1, $sp, 0x20 -/* D5F7E0 80240530 8E0400CC */ lw $a0, 0xcc($s0) -/* D5F7E4 80240534 0C044181 */ jal get_shadow_by_index -/* D5F7E8 80240538 00000000 */ nop -/* D5F7EC 8024053C 0C048B77 */ jal func_80122DDC -/* D5F7F0 80240540 84440008 */ lh $a0, 8($v0) -/* D5F7F4 80240544 8E050028 */ lw $a1, 0x28($s0) -/* D5F7F8 80240548 8E070030 */ lw $a3, 0x30($s0) -/* D5F7FC 8024054C 27A20030 */ addiu $v0, $sp, 0x30 -/* D5F800 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* D5F804 80240554 27A20034 */ addiu $v0, $sp, 0x34 -/* D5F808 80240558 AFA20014 */ sw $v0, 0x14($sp) -/* D5F80C 8024055C 27A20038 */ addiu $v0, $sp, 0x38 -/* D5F810 80240560 AFA20018 */ sw $v0, 0x18($sp) -/* D5F814 80240564 C600002C */ lwc1 $f0, 0x2c($s0) -/* D5F818 80240568 3C04800A */ lui $a0, 0x800a -/* D5F81C 8024056C 8484A634 */ lh $a0, -0x59cc($a0) -/* D5F820 80240570 46000007 */ neg.s $f0, $f0 -/* D5F824 80240574 44060000 */ mfc1 $a2, $f0 -/* D5F828 80240578 0C00B94E */ jal get_screen_coords -/* D5F82C 8024057C 00000000 */ nop -/* D5F830 80240580 8E0500A4 */ lw $a1, 0xa4($s0) -/* D5F834 80240584 3C063F80 */ lui $a2, 0x3f80 -/* D5F838 80240588 0C0B76A3 */ jal func_802DDA8C -/* D5F83C 8024058C 24040001 */ addiu $a0, $zero, 1 -/* D5F840 80240590 8E020000 */ lw $v0, ($s0) -/* D5F844 80240594 3C030002 */ lui $v1, 2 -/* D5F848 80240598 00431024 */ and $v0, $v0, $v1 -/* D5F84C 8024059C 54400022 */ bnel $v0, $zero, .L80240628 -/* D5F850 802405A0 24120011 */ addiu $s2, $zero, 0x11 -/* D5F854 802405A4 9203000E */ lbu $v1, 0xe($s0) -/* D5F858 802405A8 3C02802E */ lui $v0, 0x802e -/* D5F85C 802405AC 90429D71 */ lbu $v0, -0x628f($v0) -/* D5F860 802405B0 10620018 */ beq $v1, $v0, .L80240614 -/* D5F864 802405B4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D5F868 802405B8 1040000B */ beqz $v0, .L802405E8 -/* D5F86C 802405BC 24120011 */ addiu $s2, $zero, 0x11 -/* D5F870 802405C0 24040001 */ addiu $a0, $zero, 1 -/* D5F874 802405C4 2405FFFF */ addiu $a1, $zero, -1 -/* D5F878 802405C8 24060007 */ addiu $a2, $zero, 7 -/* D5F87C 802405CC 0060102D */ daddu $v0, $v1, $zero -/* D5F880 802405D0 0000382D */ daddu $a3, $zero, $zero -/* D5F884 802405D4 AFA00010 */ sw $zero, 0x10($sp) -/* D5F888 802405D8 AFA00014 */ sw $zero, 0x14($sp) -/* D5F88C 802405DC AFA0001C */ sw $zero, 0x1c($sp) -/* D5F890 802405E0 08090183 */ j .L8024060C -/* D5F894 802405E4 AFA20018 */ sw $v0, 0x18($sp) -.L802405E8: -/* D5F898 802405E8 2412000D */ addiu $s2, $zero, 0xd -/* D5F89C 802405EC 24040001 */ addiu $a0, $zero, 1 -/* D5F8A0 802405F0 2405FFFF */ addiu $a1, $zero, -1 -/* D5F8A4 802405F4 0000302D */ daddu $a2, $zero, $zero -/* D5F8A8 802405F8 00C0382D */ daddu $a3, $a2, $zero -/* D5F8AC 802405FC AFA00010 */ sw $zero, 0x10($sp) -/* D5F8B0 80240600 AFA00014 */ sw $zero, 0x14($sp) -/* D5F8B4 80240604 AFA00018 */ sw $zero, 0x18($sp) -/* D5F8B8 80240608 AFA0001C */ sw $zero, 0x1c($sp) -.L8024060C: -/* D5F8BC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D5F8C0 80240610 00000000 */ nop -.L80240614: -/* D5F8C4 80240614 9202000E */ lbu $v0, 0xe($s0) -/* D5F8C8 80240618 3C01802E */ lui $at, 0x802e -/* D5F8CC 8024061C A0229D71 */ sb $v0, -0x628f($at) -/* D5F8D0 80240620 0809018C */ j .L80240630 -/* D5F8D4 80240624 00000000 */ nop -.L80240628: -/* D5F8D8 80240628 3C01802E */ lui $at, 0x802e -/* D5F8DC 8024062C A0209D71 */ sb $zero, -0x628f($at) -.L80240630: -/* D5F8E0 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D5F8E4 80240634 3C048024 */ lui $a0, 0x8024 -/* D5F8E8 80240638 24840870 */ addiu $a0, $a0, 0x870 -/* D5F8EC 8024063C AE320000 */ sw $s2, ($s1) -/* D5F8F0 80240640 AE300008 */ sw $s0, 8($s1) -/* D5F8F4 80240644 00021023 */ negu $v0, $v0 -/* D5F8F8 80240648 AE220004 */ sw $v0, 4($s1) -/* D5F8FC 8024064C 8E020000 */ lw $v0, ($s0) -/* D5F900 80240650 3C030002 */ lui $v1, 2 -/* D5F904 80240654 00431024 */ and $v0, $v0, $v1 -/* D5F908 80240658 54400004 */ bnel $v0, $zero, .L8024066C -/* D5F90C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D5F910 80240660 3C048024 */ lui $a0, 0x8024 -/* D5F914 80240664 2484068C */ addiu $a0, $a0, 0x68c -/* D5F918 80240668 AE24000C */ sw $a0, 0xc($s1) -.L8024066C: -/* D5F91C 8024066C 0C047644 */ jal queue_render_task -/* D5F920 80240670 0220202D */ daddu $a0, $s1, $zero -.L80240674: -/* D5F924 80240674 8FBF004C */ lw $ra, 0x4c($sp) -/* D5F928 80240678 8FB20048 */ lw $s2, 0x48($sp) -/* D5F92C 8024067C 8FB10044 */ lw $s1, 0x44($sp) -/* D5F930 80240680 8FB00040 */ lw $s0, 0x40($sp) -/* D5F934 80240684 03E00008 */ jr $ra -/* D5F938 80240688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_10/func_8024068C_D5F2B0.s b/asm/nonmatchings/world/area_pra/pra_10/func_8024068C_D5F2B0.s deleted file mode 100644 index dbd730943b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/func_8024068C_D5F2B0.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_D5F93C -/* D5F93C 8024068C 3C03800A */ lui $v1, 0x800a -/* D5F940 80240690 8463A634 */ lh $v1, -0x59cc($v1) -/* D5F944 80240694 3C07BF80 */ lui $a3, 0xbf80 -/* D5F948 80240698 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D5F94C 8024069C F7B40128 */ sdc1 $f20, 0x128($sp) -/* D5F950 802406A0 4480A000 */ mtc1 $zero, $f20 -/* D5F954 802406A4 AFB1011C */ sw $s1, 0x11c($sp) -/* D5F958 802406A8 0080882D */ daddu $s1, $a0, $zero -/* D5F95C 802406AC AFB00118 */ sw $s0, 0x118($sp) -/* D5F960 802406B0 27B00098 */ addiu $s0, $sp, 0x98 -/* D5F964 802406B4 AFBF0120 */ sw $ra, 0x120($sp) -/* D5F968 802406B8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D5F96C 802406BC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D5F970 802406C0 00031080 */ sll $v0, $v1, 2 -/* D5F974 802406C4 00431021 */ addu $v0, $v0, $v1 -/* D5F978 802406C8 00021080 */ sll $v0, $v0, 2 -/* D5F97C 802406CC 00431023 */ subu $v0, $v0, $v1 -/* D5F980 802406D0 000218C0 */ sll $v1, $v0, 3 -/* D5F984 802406D4 00431021 */ addu $v0, $v0, $v1 -/* D5F988 802406D8 000210C0 */ sll $v0, $v0, 3 -/* D5F98C 802406DC 3C01800B */ lui $at, 0x800b -/* D5F990 802406E0 00220821 */ addu $at, $at, $v0 -/* D5F994 802406E4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D5F998 802406E8 4406A000 */ mfc1 $a2, $f20 -/* D5F99C 802406EC 4600B587 */ neg.s $f22, $f22 -/* D5F9A0 802406F0 4405B000 */ mfc1 $a1, $f22 -/* D5F9A4 802406F4 0200202D */ daddu $a0, $s0, $zero -/* D5F9A8 802406F8 0C019EC8 */ jal guRotateF -/* D5F9AC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) -/* D5F9B0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D5F9B4 80240704 0C00A6C9 */ jal clamp_angle -/* D5F9B8 80240708 00000000 */ nop -/* D5F9BC 8024070C 44050000 */ mfc1 $a1, $f0 -/* D5F9C0 80240710 4406A000 */ mfc1 $a2, $f20 -/* D5F9C4 80240714 4407A000 */ mfc1 $a3, $f20 -/* D5F9C8 80240718 3C013F80 */ lui $at, 0x3f80 -/* D5F9CC 8024071C 4481C000 */ mtc1 $at, $f24 -/* D5F9D0 80240720 27A40018 */ addiu $a0, $sp, 0x18 -/* D5F9D4 80240724 0C019EC8 */ jal guRotateF -/* D5F9D8 80240728 E7B80010 */ swc1 $f24, 0x10($sp) -/* D5F9DC 8024072C 0200202D */ daddu $a0, $s0, $zero -/* D5F9E0 80240730 27A50018 */ addiu $a1, $sp, 0x18 -/* D5F9E4 80240734 0C019D80 */ jal guMtxCatF -/* D5F9E8 80240738 00A0302D */ daddu $a2, $a1, $zero -/* D5F9EC 8024073C 4405B000 */ mfc1 $a1, $f22 -/* D5F9F0 80240740 4406A000 */ mfc1 $a2, $f20 -/* D5F9F4 80240744 4407C000 */ mfc1 $a3, $f24 -/* D5F9F8 80240748 0200202D */ daddu $a0, $s0, $zero -/* D5F9FC 8024074C 0C019EC8 */ jal guRotateF -/* D5FA00 80240750 E7B40010 */ swc1 $f20, 0x10($sp) -/* D5FA04 80240754 27A40018 */ addiu $a0, $sp, 0x18 -/* D5FA08 80240758 0200282D */ daddu $a1, $s0, $zero -/* D5FA0C 8024075C 0C019D80 */ jal guMtxCatF -/* D5FA10 80240760 0080302D */ daddu $a2, $a0, $zero -/* D5FA14 80240764 E7B40010 */ swc1 $f20, 0x10($sp) -/* D5FA18 80240768 8E2500A8 */ lw $a1, 0xa8($s1) -/* D5FA1C 8024076C 4406A000 */ mfc1 $a2, $f20 -/* D5FA20 80240770 4407C000 */ mfc1 $a3, $f24 -/* D5FA24 80240774 0C019EC8 */ jal guRotateF -/* D5FA28 80240778 0200202D */ daddu $a0, $s0, $zero -/* D5FA2C 8024077C 27A40018 */ addiu $a0, $sp, 0x18 -/* D5FA30 80240780 0200282D */ daddu $a1, $s0, $zero -/* D5FA34 80240784 0C019D80 */ jal guMtxCatF -/* D5FA38 80240788 0080302D */ daddu $a2, $a0, $zero -/* D5FA3C 8024078C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D5FA40 80240790 3C013F36 */ lui $at, 0x3f36 -/* D5FA44 80240794 3421DB6E */ ori $at, $at, 0xdb6e -/* D5FA48 80240798 44810000 */ mtc1 $at, $f0 -/* D5FA4C 8024079C 0200202D */ daddu $a0, $s0, $zero -/* D5FA50 802407A0 44050000 */ mfc1 $a1, $f0 -/* D5FA54 802407A4 3C06BF36 */ lui $a2, 0xbf36 -/* D5FA58 802407A8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D5FA5C 802407AC 0C019DF0 */ jal guScaleF -/* D5FA60 802407B0 00A0382D */ daddu $a3, $a1, $zero -/* D5FA64 802407B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D5FA68 802407B8 0200282D */ daddu $a1, $s0, $zero -/* D5FA6C 802407BC 0C019D80 */ jal guMtxCatF -/* D5FA70 802407C0 0080302D */ daddu $a2, $a0, $zero -/* D5FA74 802407C4 27B00058 */ addiu $s0, $sp, 0x58 -/* D5FA78 802407C8 8E250028 */ lw $a1, 0x28($s1) -/* D5FA7C 802407CC C620002C */ lwc1 $f0, 0x2c($s1) -/* D5FA80 802407D0 8E270030 */ lw $a3, 0x30($s1) -/* D5FA84 802407D4 46000007 */ neg.s $f0, $f0 -/* D5FA88 802407D8 44060000 */ mfc1 $a2, $f0 -/* D5FA8C 802407DC 0C019E40 */ jal guTranslateF -/* D5FA90 802407E0 0200202D */ daddu $a0, $s0, $zero -/* D5FA94 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D5FA98 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D5FA9C 802407EC 0C019D80 */ jal guMtxCatF -/* D5FAA0 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D5FAA4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D5FAA8 802407F8 3C0142B4 */ lui $at, 0x42b4 -/* D5FAAC 802407FC 44810000 */ mtc1 $at, $f0 -/* D5FAB0 80240800 00000000 */ nop -/* D5FAB4 80240804 4602003E */ c.le.s $f0, $f2 -/* D5FAB8 80240808 00000000 */ nop -/* D5FABC 8024080C 4500000A */ bc1f .L80240838 -/* D5FAC0 80240810 24040001 */ addiu $a0, $zero, 1 -/* D5FAC4 80240814 3C014387 */ lui $at, 0x4387 -/* D5FAC8 80240818 44810000 */ mtc1 $at, $f0 -/* D5FACC 8024081C 00000000 */ nop -/* D5FAD0 80240820 4600103C */ c.lt.s $f2, $f0 -/* D5FAD4 80240824 00000000 */ nop -/* D5FAD8 80240828 45000004 */ bc1f .L8024083C -/* D5FADC 8024082C 27A20018 */ addiu $v0, $sp, 0x18 -/* D5FAE0 80240830 3C041000 */ lui $a0, 0x1000 -/* D5FAE4 80240834 34840001 */ ori $a0, $a0, 1 -.L80240838: -/* D5FAE8 80240838 27A20018 */ addiu $v0, $sp, 0x18 -.L8024083C: -/* D5FAEC 8024083C 0000282D */ daddu $a1, $zero, $zero -/* D5FAF0 80240840 00A0302D */ daddu $a2, $a1, $zero -/* D5FAF4 80240844 00A0382D */ daddu $a3, $a1, $zero -/* D5FAF8 80240848 0C0B7710 */ jal render_sprite -/* D5FAFC 8024084C AFA20010 */ sw $v0, 0x10($sp) -/* D5FB00 80240850 8FBF0120 */ lw $ra, 0x120($sp) -/* D5FB04 80240854 8FB1011C */ lw $s1, 0x11c($sp) -/* D5FB08 80240858 8FB00118 */ lw $s0, 0x118($sp) -/* D5FB0C 8024085C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D5FB10 80240860 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D5FB14 80240864 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D5FB18 80240868 03E00008 */ jr $ra -/* D5FB1C 8024086C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_10/func_80240870_D5F2B0.s b/asm/nonmatchings/world/area_pra/pra_10/func_80240870_D5F2B0.s deleted file mode 100644 index a48e1107be..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/func_80240870_D5F2B0.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_D5FB20 -/* D5FB20 80240870 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D5FB24 80240874 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D5FB28 80240878 4480B000 */ mtc1 $zero, $f22 -/* D5FB2C 8024087C AFB10134 */ sw $s1, 0x134($sp) -/* D5FB30 80240880 0080882D */ daddu $s1, $a0, $zero -/* D5FB34 80240884 AFB3013C */ sw $s3, 0x13c($sp) -/* D5FB38 80240888 0000982D */ daddu $s3, $zero, $zero -/* D5FB3C 8024088C AFB60148 */ sw $s6, 0x148($sp) -/* D5FB40 80240890 3C16800B */ lui $s6, %hi(gCameras) -/* D5FB44 80240894 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D5FB48 80240898 AFB50144 */ sw $s5, 0x144($sp) -/* D5FB4C 8024089C 241500FF */ addiu $s5, $zero, 0xff -/* D5FB50 802408A0 AFB00130 */ sw $s0, 0x130($sp) -/* D5FB54 802408A4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D5FB58 802408A8 AFB20138 */ sw $s2, 0x138($sp) -/* D5FB5C 802408AC 27B20060 */ addiu $s2, $sp, 0x60 -/* D5FB60 802408B0 AFB40140 */ sw $s4, 0x140($sp) -/* D5FB64 802408B4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D5FB68 802408B8 AFBF014C */ sw $ra, 0x14c($sp) -/* D5FB6C 802408BC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D5FB70 802408C0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D5FB74 802408C4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D5FB78 802408C8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D5FB7C 802408CC F7B40150 */ sdc1 $f20, 0x150($sp) -.L802408D0: -/* D5FB80 802408D0 3C03800A */ lui $v1, 0x800a -/* D5FB84 802408D4 8463A634 */ lh $v1, -0x59cc($v1) -/* D5FB88 802408D8 00031080 */ sll $v0, $v1, 2 -/* D5FB8C 802408DC 00431021 */ addu $v0, $v0, $v1 -/* D5FB90 802408E0 00021080 */ sll $v0, $v0, 2 -/* D5FB94 802408E4 00431023 */ subu $v0, $v0, $v1 -/* D5FB98 802408E8 000218C0 */ sll $v1, $v0, 3 -/* D5FB9C 802408EC 00431021 */ addu $v0, $v0, $v1 -/* D5FBA0 802408F0 000210C0 */ sll $v0, $v0, 3 -/* D5FBA4 802408F4 00561021 */ addu $v0, $v0, $s6 -/* D5FBA8 802408F8 C440006C */ lwc1 $f0, 0x6c($v0) -/* D5FBAC 802408FC 16600065 */ bnez $s3, .L80240A94 -/* D5FBB0 80240900 46000507 */ neg.s $f20, $f0 -/* D5FBB4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D5FBB8 80240908 3C0142B4 */ lui $at, 0x42b4 -/* D5FBBC 8024090C 44810000 */ mtc1 $at, $f0 -/* D5FBC0 80240910 00000000 */ nop -/* D5FBC4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D5FBC8 80240918 00000000 */ nop -/* D5FBCC 8024091C 4500000A */ bc1f .L80240948 -/* D5FBD0 80240920 00000000 */ nop -/* D5FBD4 80240924 3C014334 */ lui $at, 0x4334 -/* D5FBD8 80240928 44812000 */ mtc1 $at, $f4 -/* D5FBDC 8024092C 00000000 */ nop -/* D5FBE0 80240930 4604103E */ c.le.s $f2, $f4 -/* D5FBE4 80240934 00000000 */ nop -/* D5FBE8 80240938 45000003 */ bc1f .L80240948 -/* D5FBEC 8024093C 00000000 */ nop -/* D5FBF0 80240940 08090276 */ j .L802409D8 -/* D5FBF4 80240944 46022501 */ sub.s $f20, $f4, $f2 -.L80240948: -/* D5FBF8 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D5FBFC 8024094C 3C014334 */ lui $at, 0x4334 -/* D5FC00 80240950 44812000 */ mtc1 $at, $f4 -/* D5FC04 80240954 00000000 */ nop -/* D5FC08 80240958 4600203C */ c.lt.s $f4, $f0 -/* D5FC0C 8024095C 00000000 */ nop -/* D5FC10 80240960 4500000C */ bc1f .L80240994 -/* D5FC14 80240964 00000000 */ nop -/* D5FC18 80240968 3C014387 */ lui $at, 0x4387 -/* D5FC1C 8024096C 44812000 */ mtc1 $at, $f4 -/* D5FC20 80240970 00000000 */ nop -/* D5FC24 80240974 4604003E */ c.le.s $f0, $f4 -/* D5FC28 80240978 00000000 */ nop -/* D5FC2C 8024097C 45000008 */ bc1f .L802409A0 -/* D5FC30 80240980 00000000 */ nop -/* D5FC34 80240984 3C014334 */ lui $at, 0x4334 -/* D5FC38 80240988 44812000 */ mtc1 $at, $f4 -/* D5FC3C 8024098C 08090276 */ j .L802409D8 -/* D5FC40 80240990 46040501 */ sub.s $f20, $f0, $f4 -.L80240994: -/* D5FC44 80240994 3C014387 */ lui $at, 0x4387 -/* D5FC48 80240998 44812000 */ mtc1 $at, $f4 -/* D5FC4C 8024099C 00000000 */ nop -.L802409A0: -/* D5FC50 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D5FC54 802409A4 00000000 */ nop -/* D5FC58 802409A8 4500000A */ bc1f .L802409D4 -/* D5FC5C 802409AC 00000000 */ nop -/* D5FC60 802409B0 3C0143B4 */ lui $at, 0x43b4 -/* D5FC64 802409B4 44811000 */ mtc1 $at, $f2 -/* D5FC68 802409B8 00000000 */ nop -/* D5FC6C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D5FC70 802409C0 00000000 */ nop -/* D5FC74 802409C4 45000003 */ bc1f .L802409D4 -/* D5FC78 802409C8 00000000 */ nop -/* D5FC7C 802409CC 08090276 */ j .L802409D8 -/* D5FC80 802409D0 46001501 */ sub.s $f20, $f2, $f0 -.L802409D4: -/* D5FC84 802409D4 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L802409D8: -/* D5FC88 802409D8 3C0141C8 */ lui $at, 0x41c8 -/* D5FC8C 802409DC 44810000 */ mtc1 $at, $f0 -/* D5FC90 802409E0 00000000 */ nop -/* D5FC94 802409E4 4600A003 */ div.s $f0, $f20, $f0 -/* D5FC98 802409E8 4600010D */ trunc.w.s $f4, $f0 -/* D5FC9C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D5FCA0 802409F0 00000000 */ nop -/* D5FCA4 802409F4 00071100 */ sll $v0, $a3, 4 -/* D5FCA8 802409F8 00471023 */ subu $v0, $v0, $a3 -/* D5FCAC 802409FC 00021080 */ sll $v0, $v0, 2 -/* D5FCB0 80240A00 02A23823 */ subu $a3, $s5, $v0 -/* D5FCB4 80240A04 28E20064 */ slti $v0, $a3, 0x64 -/* D5FCB8 80240A08 54400001 */ bnel $v0, $zero, .L80240A10 -/* D5FCBC 80240A0C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A10: -/* D5FCC0 80240A10 24040001 */ addiu $a0, $zero, 1 -/* D5FCC4 80240A14 2405FFFF */ addiu $a1, $zero, -1 -/* D5FCC8 80240A18 24060006 */ addiu $a2, $zero, 6 -/* D5FCCC 80240A1C AFA70010 */ sw $a3, 0x10($sp) -/* D5FCD0 80240A20 AFA70014 */ sw $a3, 0x14($sp) -/* D5FCD4 80240A24 AFB50018 */ sw $s5, 0x18($sp) -/* D5FCD8 80240A28 0C0B77B9 */ jal func_802DDEE4 -/* D5FCDC 80240A2C AFA0001C */ sw $zero, 0x1c($sp) -/* D5FCE0 80240A30 4405A000 */ mfc1 $a1, $f20 -/* D5FCE4 80240A34 4406B000 */ mfc1 $a2, $f22 -/* D5FCE8 80240A38 3C07BF80 */ lui $a3, 0xbf80 -/* D5FCEC 80240A3C 0200202D */ daddu $a0, $s0, $zero -/* D5FCF0 80240A40 0C019EC8 */ jal guRotateF -/* D5FCF4 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D5FCF8 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D5FCFC 80240A4C 0C00A6C9 */ jal clamp_angle -/* D5FD00 80240A50 00000000 */ nop -/* D5FD04 80240A54 44050000 */ mfc1 $a1, $f0 -/* D5FD08 80240A58 4406B000 */ mfc1 $a2, $f22 -/* D5FD0C 80240A5C 4407B000 */ mfc1 $a3, $f22 -/* D5FD10 80240A60 3C013F80 */ lui $at, 0x3f80 -/* D5FD14 80240A64 44812000 */ mtc1 $at, $f4 -/* D5FD18 80240A68 27A40020 */ addiu $a0, $sp, 0x20 -/* D5FD1C 80240A6C 0C019EC8 */ jal guRotateF -/* D5FD20 80240A70 E7A40010 */ swc1 $f4, 0x10($sp) -/* D5FD24 80240A74 0200202D */ daddu $a0, $s0, $zero -/* D5FD28 80240A78 27A50020 */ addiu $a1, $sp, 0x20 -/* D5FD2C 80240A7C 0C019D80 */ jal guMtxCatF -/* D5FD30 80240A80 00A0302D */ daddu $a2, $a1, $zero -/* D5FD34 80240A84 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D5FD38 80240A88 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D5FD3C 80240A8C 080902D6 */ j .L80240B58 -/* D5FD40 80240A90 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240A94: -/* D5FD44 80240A94 0260202D */ daddu $a0, $s3, $zero -/* D5FD48 80240A98 27A50120 */ addiu $a1, $sp, 0x120 -/* D5FD4C 80240A9C 27A60124 */ addiu $a2, $sp, 0x124 -/* D5FD50 80240AA0 0C03964E */ jal func_800E5938 -/* D5FD54 80240AA4 27A70128 */ addiu $a3, $sp, 0x128 -/* D5FD58 80240AA8 8FA60124 */ lw $a2, 0x124($sp) -/* D5FD5C 80240AAC 3C028000 */ lui $v0, 0x8000 -/* D5FD60 80240AB0 14C20004 */ bne $a2, $v0, .L80240AC4 -/* D5FD64 80240AB4 46000606 */ mov.s $f24, $f0 -/* D5FD68 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D5FD6C 80240ABC 080902B5 */ j .L80240AD4 -/* D5FD70 80240AC0 24040001 */ addiu $a0, $zero, 1 -.L80240AC4: -/* D5FD74 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D5FD78 80240AC8 00000000 */ nop -/* D5FD7C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D5FD80 80240AD0 24040001 */ addiu $a0, $zero, 1 -.L80240AD4: -/* D5FD84 80240AD4 2405FFFF */ addiu $a1, $zero, -1 -/* D5FD88 80240AD8 24060007 */ addiu $a2, $zero, 7 -/* D5FD8C 80240ADC 0000382D */ daddu $a3, $zero, $zero -/* D5FD90 80240AE0 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D5FD94 80240AE4 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D5FD98 80240AE8 24020040 */ addiu $v0, $zero, 0x40 -/* D5FD9C 80240AEC AFA00010 */ sw $zero, 0x10($sp) -/* D5FDA0 80240AF0 AFA00014 */ sw $zero, 0x14($sp) -/* D5FDA4 80240AF4 AFA20018 */ sw $v0, 0x18($sp) -/* D5FDA8 80240AF8 0C0B77B9 */ jal func_802DDEE4 -/* D5FDAC 80240AFC AFA0001C */ sw $zero, 0x1c($sp) -/* D5FDB0 80240B00 4405A000 */ mfc1 $a1, $f20 -/* D5FDB4 80240B04 4406B000 */ mfc1 $a2, $f22 -/* D5FDB8 80240B08 3C07BF80 */ lui $a3, 0xbf80 -/* D5FDBC 80240B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* D5FDC0 80240B10 0C019EC8 */ jal guRotateF -/* D5FDC4 80240B14 E7B60010 */ swc1 $f22, 0x10($sp) -/* D5FDC8 80240B18 4405A000 */ mfc1 $a1, $f20 -/* D5FDCC 80240B1C 4406B000 */ mfc1 $a2, $f22 -/* D5FDD0 80240B20 3C07BF80 */ lui $a3, 0xbf80 -/* D5FDD4 80240B24 0200202D */ daddu $a0, $s0, $zero -/* D5FDD8 80240B28 0C019EC8 */ jal guRotateF -/* D5FDDC 80240B2C E7B60010 */ swc1 $f22, 0x10($sp) -/* D5FDE0 80240B30 4405C000 */ mfc1 $a1, $f24 -/* D5FDE4 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D5FDE8 80240B38 3C073F80 */ lui $a3, 0x3f80 -/* D5FDEC 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D5FDF0 80240B40 0C019EC8 */ jal guRotateF -/* D5FDF4 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D5FDF8 80240B48 0200202D */ daddu $a0, $s0, $zero -/* D5FDFC 80240B4C 27A50020 */ addiu $a1, $sp, 0x20 -/* D5FE00 80240B50 0C019D80 */ jal guMtxCatF -/* D5FE04 80240B54 00A0302D */ daddu $a2, $a1, $zero -.L80240B58: -/* D5FE08 80240B58 862200B0 */ lh $v0, 0xb0($s1) -/* D5FE0C 80240B5C 3C013F00 */ lui $at, 0x3f00 -/* D5FE10 80240B60 44812000 */ mtc1 $at, $f4 -/* D5FE14 80240B64 00021023 */ negu $v0, $v0 -/* D5FE18 80240B68 44820000 */ mtc1 $v0, $f0 -/* D5FE1C 80240B6C 00000000 */ nop -/* D5FE20 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* D5FE24 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D5FE28 80240B78 00000000 */ nop -/* D5FE2C 80240B7C 4405B000 */ mfc1 $a1, $f22 -/* D5FE30 80240B80 4407B000 */ mfc1 $a3, $f22 -/* D5FE34 80240B84 44062000 */ mfc1 $a2, $f4 -/* D5FE38 80240B88 0C019E40 */ jal guTranslateF -/* D5FE3C 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* D5FE40 80240B90 0240202D */ daddu $a0, $s2, $zero -/* D5FE44 80240B94 27A50020 */ addiu $a1, $sp, 0x20 -/* D5FE48 80240B98 0C019D80 */ jal guMtxCatF -/* D5FE4C 80240B9C 00A0302D */ daddu $a2, $a1, $zero -/* D5FE50 80240BA0 4405A000 */ mfc1 $a1, $f20 -/* D5FE54 80240BA4 4406B000 */ mfc1 $a2, $f22 -/* D5FE58 80240BA8 3C073F80 */ lui $a3, 0x3f80 -/* D5FE5C 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* D5FE60 80240BB0 0C019EC8 */ jal guRotateF -/* D5FE64 80240BB4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D5FE68 80240BB8 27A40020 */ addiu $a0, $sp, 0x20 -/* D5FE6C 80240BBC 0200282D */ daddu $a1, $s0, $zero -/* D5FE70 80240BC0 0C019D80 */ jal guMtxCatF -/* D5FE74 80240BC4 0080302D */ daddu $a2, $a0, $zero -/* D5FE78 80240BC8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D5FE7C 80240BCC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D5FE80 80240BD0 4406B000 */ mfc1 $a2, $f22 -/* D5FE84 80240BD4 3C073F80 */ lui $a3, 0x3f80 -/* D5FE88 80240BD8 0C019EC8 */ jal guRotateF -/* D5FE8C 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D5FE90 80240BE0 27A40020 */ addiu $a0, $sp, 0x20 -/* D5FE94 80240BE4 0200282D */ daddu $a1, $s0, $zero -/* D5FE98 80240BE8 0C019D80 */ jal guMtxCatF -/* D5FE9C 80240BEC 0080302D */ daddu $a2, $a0, $zero -/* D5FEA0 80240BF0 862200B0 */ lh $v0, 0xb0($s1) -/* D5FEA4 80240BF4 3C013F00 */ lui $at, 0x3f00 -/* D5FEA8 80240BF8 44812000 */ mtc1 $at, $f4 -/* D5FEAC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D5FEB0 80240C00 00000000 */ nop -/* D5FEB4 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* D5FEB8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D5FEBC 80240C0C 00000000 */ nop -/* D5FEC0 80240C10 4405B000 */ mfc1 $a1, $f22 -/* D5FEC4 80240C14 4407B000 */ mfc1 $a3, $f22 -/* D5FEC8 80240C18 44062000 */ mfc1 $a2, $f4 -/* D5FECC 80240C1C 0C019E40 */ jal guTranslateF -/* D5FED0 80240C20 0240202D */ daddu $a0, $s2, $zero -/* D5FED4 80240C24 27A40020 */ addiu $a0, $sp, 0x20 -/* D5FED8 80240C28 0240282D */ daddu $a1, $s2, $zero -/* D5FEDC 80240C2C 0C019D80 */ jal guMtxCatF -/* D5FEE0 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D5FEE4 80240C34 3C013F36 */ lui $at, 0x3f36 -/* D5FEE8 80240C38 3421DB6E */ ori $at, $at, 0xdb6e -/* D5FEEC 80240C3C 44810000 */ mtc1 $at, $f0 -/* D5FEF0 80240C40 0280202D */ daddu $a0, $s4, $zero -/* D5FEF4 80240C44 44050000 */ mfc1 $a1, $f0 -/* D5FEF8 80240C48 3C06BF36 */ lui $a2, 0xbf36 -/* D5FEFC 80240C4C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D5FF00 80240C50 0C019DF0 */ jal guScaleF -/* D5FF04 80240C54 00A0382D */ daddu $a3, $a1, $zero -/* D5FF08 80240C58 27A40020 */ addiu $a0, $sp, 0x20 -/* D5FF0C 80240C5C 0280282D */ daddu $a1, $s4, $zero -/* D5FF10 80240C60 0C019D80 */ jal guMtxCatF -/* D5FF14 80240C64 0080302D */ daddu $a2, $a0, $zero -/* D5FF18 80240C68 4600D687 */ neg.s $f26, $f26 -/* D5FF1C 80240C6C 4405F000 */ mfc1 $a1, $f30 -/* D5FF20 80240C70 4407E000 */ mfc1 $a3, $f28 -/* D5FF24 80240C74 4406D000 */ mfc1 $a2, $f26 -/* D5FF28 80240C78 0C019E40 */ jal guTranslateF -/* D5FF2C 80240C7C 0240202D */ daddu $a0, $s2, $zero -/* D5FF30 80240C80 27A40020 */ addiu $a0, $sp, 0x20 -/* D5FF34 80240C84 0240282D */ daddu $a1, $s2, $zero -/* D5FF38 80240C88 0C019D80 */ jal guMtxCatF -/* D5FF3C 80240C8C 0080302D */ daddu $a2, $a0, $zero -/* D5FF40 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D5FF44 80240C94 3C0142B4 */ lui $at, 0x42b4 -/* D5FF48 80240C98 44810000 */ mtc1 $at, $f0 -/* D5FF4C 80240C9C 00000000 */ nop -/* D5FF50 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D5FF54 80240CA4 00000000 */ nop -/* D5FF58 80240CA8 4500000A */ bc1f .L80240CD4 -/* D5FF5C 80240CAC 24040001 */ addiu $a0, $zero, 1 -/* D5FF60 80240CB0 3C014387 */ lui $at, 0x4387 -/* D5FF64 80240CB4 44812000 */ mtc1 $at, $f4 -/* D5FF68 80240CB8 00000000 */ nop -/* D5FF6C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D5FF70 80240CC0 00000000 */ nop -/* D5FF74 80240CC4 45000004 */ bc1f .L80240CD8 -/* D5FF78 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 -/* D5FF7C 80240CCC 3C041000 */ lui $a0, 0x1000 -/* D5FF80 80240CD0 34840001 */ ori $a0, $a0, 1 -.L80240CD4: -/* D5FF84 80240CD4 27A20020 */ addiu $v0, $sp, 0x20 -.L80240CD8: -/* D5FF88 80240CD8 AFA20010 */ sw $v0, 0x10($sp) -/* D5FF8C 80240CDC 0000282D */ daddu $a1, $zero, $zero -/* D5FF90 80240CE0 00A0302D */ daddu $a2, $a1, $zero -/* D5FF94 80240CE4 0C0B7710 */ jal render_sprite -/* D5FF98 80240CE8 00A0382D */ daddu $a3, $a1, $zero -/* D5FF9C 80240CEC 26730001 */ addiu $s3, $s3, 1 -/* D5FFA0 80240CF0 2A620002 */ slti $v0, $s3, 2 -/* D5FFA4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D5FFA8 80240CF8 00000000 */ nop -/* D5FFAC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) -/* D5FFB0 80240D00 8FB60148 */ lw $s6, 0x148($sp) -/* D5FFB4 80240D04 8FB50144 */ lw $s5, 0x144($sp) -/* D5FFB8 80240D08 8FB40140 */ lw $s4, 0x140($sp) -/* D5FFBC 80240D0C 8FB3013C */ lw $s3, 0x13c($sp) -/* D5FFC0 80240D10 8FB20138 */ lw $s2, 0x138($sp) -/* D5FFC4 80240D14 8FB10134 */ lw $s1, 0x134($sp) -/* D5FFC8 80240D18 8FB00130 */ lw $s0, 0x130($sp) -/* D5FFCC 80240D1C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D5FFD0 80240D20 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D5FFD4 80240D24 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D5FFD8 80240D28 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D5FFDC 80240D2C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D5FFE0 80240D30 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D5FFE4 80240D34 03E00008 */ jr $ra -/* D5FFE8 80240D38 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_10/func_80240D3C_D5F2B0.s b/asm/nonmatchings/world/area_pra/pra_10/func_80240D3C_D5F2B0.s deleted file mode 100644 index b5d8fda19a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/func_80240D3C_D5F2B0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_D5FFEC -/* D5FFEC 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D5FFF0 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D5FFF4 80240D44 0080802D */ daddu $s0, $a0, $zero -/* D5FFF8 80240D48 AFBF0014 */ sw $ra, 0x14($sp) -/* D5FFFC 80240D4C 8E020088 */ lw $v0, 0x88($s0) -/* D60000 80240D50 14400017 */ bnez $v0, .L80240DB0 -/* D60004 80240D54 24020001 */ addiu $v0, $zero, 1 -/* D60008 80240D58 8E030084 */ lw $v1, 0x84($s0) -/* D6000C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D60010 80240D60 00000000 */ nop -/* D60014 80240D64 28620002 */ slti $v0, $v1, 2 -/* D60018 80240D68 50400005 */ beql $v0, $zero, .L80240D80 -/* D6001C 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* D60020 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D60024 80240D74 00000000 */ nop -/* D60028 80240D78 08090378 */ j .L80240DE0 -/* D6002C 80240D7C 00000000 */ nop -.L80240D80: -/* D60030 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D60034 80240D84 00000000 */ nop -/* D60038 80240D88 08090378 */ j .L80240DE0 -/* D6003C 80240D8C 00000000 */ nop -.L80240D90: -/* D60040 80240D90 3C048024 */ lui $a0, 0x8024 -/* D60044 80240D94 24840E84 */ addiu $a0, $a0, 0xe84 -/* D60048 80240D98 08090374 */ j .L80240DD0 -/* D6004C 80240D9C 00000000 */ nop -.L80240DA0: -/* D60050 80240DA0 3C048024 */ lui $a0, 0x8024 -/* D60054 80240DA4 24840EEC */ addiu $a0, $a0, 0xeec -/* D60058 80240DA8 08090374 */ j .L80240DD0 -/* D6005C 80240DAC 00000000 */ nop -.L80240DB0: -/* D60060 80240DB0 8E020084 */ lw $v0, 0x84($s0) -/* D60064 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D60068 80240DB8 00000000 */ nop -/* D6006C 80240DBC 28420002 */ slti $v0, $v0, 2 -/* D60070 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D60074 80240DC4 00000000 */ nop -.L80240DC8: -/* D60078 80240DC8 3C048024 */ lui $a0, 0x8024 -/* D6007C 80240DCC 24840EB8 */ addiu $a0, $a0, 0xeb8 -.L80240DD0: -/* D60080 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 -/* D60084 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* D60088 80240DD8 8E03013C */ lw $v1, 0x13c($s0) -/* D6008C 80240DDC AC620004 */ sw $v0, 4($v1) -.L80240DE0: -/* D60090 80240DE0 0C00EAD2 */ jal get_npc_safe -/* D60094 80240DE4 2404FFFC */ addiu $a0, $zero, -4 -/* D60098 80240DE8 0040282D */ daddu $a1, $v0, $zero -/* D6009C 80240DEC 10A00021 */ beqz $a1, .L80240E74 -/* D600A0 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* D600A4 80240DF4 8E020088 */ lw $v0, 0x88($s0) -/* D600A8 80240DF8 14400014 */ bnez $v0, .L80240E4C -/* D600AC 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* D600B0 80240E00 8E040084 */ lw $a0, 0x84($s0) -/* D600B4 80240E04 10820016 */ beq $a0, $v0, .L80240E60 -/* D600B8 80240E08 28820002 */ slti $v0, $a0, 2 -/* D600BC 80240E0C 10400005 */ beqz $v0, .L80240E24 -/* D600C0 80240E10 24020002 */ addiu $v0, $zero, 2 -/* D600C4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D600C8 80240E18 00000000 */ nop -/* D600CC 80240E1C 0809039D */ j .L80240E74 -/* D600D0 80240E20 00000000 */ nop -.L80240E24: -/* D600D4 80240E24 10820006 */ beq $a0, $v0, .L80240E40 -/* D600D8 80240E28 24020002 */ addiu $v0, $zero, 2 -/* D600DC 80240E2C 0809039D */ j .L80240E74 -/* D600E0 80240E30 00000000 */ nop -.L80240E34: -/* D600E4 80240E34 8CA20000 */ lw $v0, ($a1) -/* D600E8 80240E38 0809039A */ j .L80240E68 -/* D600EC 80240E3C 3C03000A */ lui $v1, 0xa -.L80240E40: -/* D600F0 80240E40 8CA20000 */ lw $v0, ($a1) -/* D600F4 80240E44 0809039A */ j .L80240E68 -/* D600F8 80240E48 3C030002 */ lui $v1, 2 -.L80240E4C: -/* D600FC 80240E4C 8E020084 */ lw $v0, 0x84($s0) -/* D60100 80240E50 04400007 */ bltz $v0, .L80240E70 -/* D60104 80240E54 28420002 */ slti $v0, $v0, 2 -/* D60108 80240E58 10400006 */ beqz $v0, .L80240E74 -/* D6010C 80240E5C 24020002 */ addiu $v0, $zero, 2 -.L80240E60: -/* D60110 80240E60 8CA20000 */ lw $v0, ($a1) -/* D60114 80240E64 3C030008 */ lui $v1, 8 -.L80240E68: -/* D60118 80240E68 00431025 */ or $v0, $v0, $v1 -/* D6011C 80240E6C ACA20000 */ sw $v0, ($a1) -.L80240E70: -/* D60120 80240E70 24020002 */ addiu $v0, $zero, 2 -.L80240E74: -/* D60124 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* D60128 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* D6012C 80240E7C 03E00008 */ jr $ra -/* D60130 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_10/func_80240E84_D5F2B0.s b/asm/nonmatchings/world/area_pra/pra_10/func_80240E84_D5F2B0.s deleted file mode 100644 index 4d9220e219..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/func_80240E84_D5F2B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D60134 -/* D60134 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D60138 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D6013C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D60140 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D60144 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D60148 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D6014C 80240E9C 3C03000A */ lui $v1, 0xa -/* D60150 80240EA0 8C820000 */ lw $v0, ($a0) -/* D60154 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D60158 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D6015C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D60160 80240EB0 03E00008 */ jr $ra -/* D60164 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_10/func_80240EB8_D5F2B0.s b/asm/nonmatchings/world/area_pra/pra_10/func_80240EB8_D5F2B0.s deleted file mode 100644 index 111c1decf6..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/func_80240EB8_D5F2B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D60168 -/* D60168 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6016C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D60170 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D60174 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D60178 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D6017C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D60180 80240ED0 3C030008 */ lui $v1, 8 -/* D60184 80240ED4 8C820000 */ lw $v0, ($a0) -/* D60188 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D6018C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D60190 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D60194 80240EE4 03E00008 */ jr $ra -/* D60198 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_10/func_80240EEC_D5F2B0.s b/asm/nonmatchings/world/area_pra/pra_10/func_80240EEC_D5F2B0.s deleted file mode 100644 index a85393256a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/func_80240EEC_D5F2B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D6019C -/* D6019C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D601A0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D601A4 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D601A8 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D601AC 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D601B0 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D601B4 80240F04 3C030002 */ lui $v1, 2 -/* D601B8 80240F08 8C820000 */ lw $v0, ($a0) -/* D601BC 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D601C0 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D601C4 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D601C8 80240F18 03E00008 */ jr $ra -/* D601CC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_10/func_80240F20_D5F2B0.s b/asm/nonmatchings/world/area_pra/pra_10/func_80240F20_D5F2B0.s deleted file mode 100644 index 686ecfa028..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/func_80240F20_D5F2B0.s +++ /dev/null @@ -1,508 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D601D0 -/* D601D0 80240F20 27BDFF88 */ addiu $sp, $sp, -0x78 -/* D601D4 80240F24 AFB3005C */ sw $s3, 0x5c($sp) -/* D601D8 80240F28 0080982D */ daddu $s3, $a0, $zero -/* D601DC 80240F2C AFBF006C */ sw $ra, 0x6c($sp) -/* D601E0 80240F30 AFB60068 */ sw $s6, 0x68($sp) -/* D601E4 80240F34 AFB50064 */ sw $s5, 0x64($sp) -/* D601E8 80240F38 AFB40060 */ sw $s4, 0x60($sp) -/* D601EC 80240F3C AFB20058 */ sw $s2, 0x58($sp) -/* D601F0 80240F40 AFB10054 */ sw $s1, 0x54($sp) -/* D601F4 80240F44 AFB00050 */ sw $s0, 0x50($sp) -/* D601F8 80240F48 F7B40070 */ sdc1 $f20, 0x70($sp) -/* D601FC 80240F4C 8E720148 */ lw $s2, 0x148($s3) -/* D60200 80240F50 86440008 */ lh $a0, 8($s2) -/* D60204 80240F54 0C00EABB */ jal get_npc_unsafe -/* D60208 80240F58 00A0802D */ daddu $s0, $a1, $zero -/* D6020C 80240F5C 8E63000C */ lw $v1, 0xc($s3) -/* D60210 80240F60 0260202D */ daddu $a0, $s3, $zero -/* D60214 80240F64 8C650000 */ lw $a1, ($v1) -/* D60218 80240F68 0C0B1EAF */ jal get_variable -/* D6021C 80240F6C 0040882D */ daddu $s1, $v0, $zero -/* D60220 80240F70 AFA00020 */ sw $zero, 0x20($sp) -/* D60224 80240F74 8E4300D0 */ lw $v1, 0xd0($s2) -/* D60228 80240F78 8C630030 */ lw $v1, 0x30($v1) -/* D6022C 80240F7C AFA30024 */ sw $v1, 0x24($sp) -/* D60230 80240F80 8E4300D0 */ lw $v1, 0xd0($s2) -/* D60234 80240F84 8C63001C */ lw $v1, 0x1c($v1) -/* D60238 80240F88 AFA30028 */ sw $v1, 0x28($sp) -/* D6023C 80240F8C 8E4300D0 */ lw $v1, 0xd0($s2) -/* D60240 80240F90 8C630024 */ lw $v1, 0x24($v1) -/* D60244 80240F94 AFA3002C */ sw $v1, 0x2c($sp) -/* D60248 80240F98 8E4300D0 */ lw $v1, 0xd0($s2) -/* D6024C 80240F9C 3C158011 */ lui $s5, %hi(gPlayerStatus) -/* D60250 80240FA0 26B5EFC8 */ addiu $s5, $s5, %lo(gPlayerStatus) -/* D60254 80240FA4 8C630028 */ lw $v1, 0x28($v1) -/* D60258 80240FA8 27B60020 */ addiu $s6, $sp, 0x20 -/* D6025C 80240FAC AFA30030 */ sw $v1, 0x30($sp) -/* D60260 80240FB0 8E4300D0 */ lw $v1, 0xd0($s2) -/* D60264 80240FB4 3C0143FA */ lui $at, 0x43fa -/* D60268 80240FB8 44810000 */ mtc1 $at, $f0 -/* D6026C 80240FBC 8C63002C */ lw $v1, 0x2c($v1) -/* D60270 80240FC0 0040A02D */ daddu $s4, $v0, $zero -/* D60274 80240FC4 E7A00038 */ swc1 $f0, 0x38($sp) -/* D60278 80240FC8 A7A0003C */ sh $zero, 0x3c($sp) -/* D6027C 80240FCC 12000019 */ beqz $s0, .L80241034 -/* D60280 80240FD0 AFA30034 */ sw $v1, 0x34($sp) -/* D60284 80240FD4 27A50040 */ addiu $a1, $sp, 0x40 -/* D60288 80240FD8 27A60044 */ addiu $a2, $sp, 0x44 -/* D6028C 80240FDC AE600070 */ sw $zero, 0x70($s3) -/* D60290 80240FE0 A620008E */ sh $zero, 0x8e($s1) -/* D60294 80240FE4 8E4200B0 */ lw $v0, 0xb0($s2) -/* D60298 80240FE8 3C01447A */ lui $at, 0x447a -/* D6029C 80240FEC 44810000 */ mtc1 $at, $f0 -/* D602A0 80240FF0 34420010 */ ori $v0, $v0, 0x10 -/* D602A4 80240FF4 AE4200B0 */ sw $v0, 0xb0($s2) -/* D602A8 80240FF8 C6220038 */ lwc1 $f2, 0x38($s1) -/* D602AC 80240FFC C624003C */ lwc1 $f4, 0x3c($s1) -/* D602B0 80241000 C6260040 */ lwc1 $f6, 0x40($s1) -/* D602B4 80241004 27A2004C */ addiu $v0, $sp, 0x4c -/* D602B8 80241008 E7A0004C */ swc1 $f0, 0x4c($sp) -/* D602BC 8024100C E7A20040 */ swc1 $f2, 0x40($sp) -/* D602C0 80241010 E7A40044 */ swc1 $f4, 0x44($sp) -/* D602C4 80241014 E7A60048 */ swc1 $f6, 0x48($sp) -/* D602C8 80241018 AFA20010 */ sw $v0, 0x10($sp) -/* D602CC 8024101C 8E240080 */ lw $a0, 0x80($s1) -/* D602D0 80241020 0C0372DF */ jal func_800DCB7C -/* D602D4 80241024 27A70048 */ addiu $a3, $sp, 0x48 -/* D602D8 80241028 C7A00044 */ lwc1 $f0, 0x44($sp) -/* D602DC 8024102C 4600028D */ trunc.w.s $f10, $f0 -/* D602E0 80241030 E64A0070 */ swc1 $f10, 0x70($s2) -.L80241034: -/* D602E4 80241034 8E4300B0 */ lw $v1, 0xb0($s2) -/* D602E8 80241038 30620004 */ andi $v0, $v1, 4 -/* D602EC 8024103C 10400007 */ beqz $v0, .L8024105C -/* D602F0 80241040 00000000 */ nop -/* D602F4 80241044 824200B4 */ lb $v0, 0xb4($s2) -/* D602F8 80241048 1440018D */ bnez $v0, .L80241680 -/* D602FC 8024104C 0000102D */ daddu $v0, $zero, $zero -/* D60300 80241050 2402FFFB */ addiu $v0, $zero, -5 -/* D60304 80241054 00621024 */ and $v0, $v1, $v0 -/* D60308 80241058 AE4200B0 */ sw $v0, 0xb0($s2) -.L8024105C: -/* D6030C 8024105C 8E630070 */ lw $v1, 0x70($s3) -/* D60310 80241060 2C620010 */ sltiu $v0, $v1, 0x10 -/* D60314 80241064 10400185 */ beqz $v0, .L8024167C -/* D60318 80241068 00031080 */ sll $v0, $v1, 2 -/* D6031C 8024106C 3C018024 */ lui $at, 0x8024 -/* D60320 80241070 00220821 */ addu $at, $at, $v0 -/* D60324 80241074 8C222200 */ lw $v0, 0x2200($at) -/* D60328 80241078 00400008 */ jr $v0 -/* D6032C 8024107C 00000000 */ nop -/* D60330 80241080 8E4200CC */ lw $v0, 0xcc($s2) -/* D60334 80241084 922300A9 */ lbu $v1, 0xa9($s1) -/* D60338 80241088 8C440000 */ lw $a0, ($v0) -/* D6033C 8024108C 8E220000 */ lw $v0, ($s1) -/* D60340 80241090 A22300AB */ sb $v1, 0xab($s1) -/* D60344 80241094 34420080 */ ori $v0, $v0, 0x80 -/* D60348 80241098 AE220000 */ sw $v0, ($s1) -/* D6034C 8024109C 24020001 */ addiu $v0, $zero, 1 -/* D60350 802410A0 AE240028 */ sw $a0, 0x28($s1) -/* D60354 802410A4 AE600074 */ sw $zero, 0x74($s3) -/* D60358 802410A8 AE620070 */ sw $v0, 0x70($s3) -/* D6035C 802410AC 8E830014 */ lw $v1, 0x14($s4) -/* D60360 802410B0 04600015 */ bltz $v1, .L80241108 -/* D60364 802410B4 00000000 */ nop -/* D60368 802410B8 8E620074 */ lw $v0, 0x74($s3) -/* D6036C 802410BC 1C400011 */ bgtz $v0, .L80241104 -/* D60370 802410C0 2442FFFF */ addiu $v0, $v0, -1 -/* D60374 802410C4 02C0202D */ daddu $a0, $s6, $zero -/* D60378 802410C8 AE630074 */ sw $v1, 0x74($s3) -/* D6037C 802410CC AFA00010 */ sw $zero, 0x10($sp) -/* D60380 802410D0 8E86000C */ lw $a2, 0xc($s4) -/* D60384 802410D4 8E870010 */ lw $a3, 0x10($s4) -/* D60388 802410D8 0C01242D */ jal func_800490B4 -/* D6038C 802410DC 0240282D */ daddu $a1, $s2, $zero -/* D60390 802410E0 10400006 */ beqz $v0, .L802410FC -/* D60394 802410E4 0220202D */ daddu $a0, $s1, $zero -/* D60398 802410E8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D6039C 802410EC 0C012530 */ jal func_800494C0 -/* D603A0 802410F0 3C060020 */ lui $a2, 0x20 -/* D603A4 802410F4 2402000A */ addiu $v0, $zero, 0xa -/* D603A8 802410F8 AE620070 */ sw $v0, 0x70($s3) -.L802410FC: -/* D603AC 802410FC 8E620074 */ lw $v0, 0x74($s3) -/* D603B0 80241100 2442FFFF */ addiu $v0, $v0, -1 -.L80241104: -/* D603B4 80241104 AE620074 */ sw $v0, 0x74($s3) -.L80241108: -/* D603B8 80241108 8E630070 */ lw $v1, 0x70($s3) -/* D603BC 8024110C 2402000A */ addiu $v0, $zero, 0xa -/* D603C0 80241110 1462015B */ bne $v1, $v0, .L80241680 -/* D603C4 80241114 0000102D */ daddu $v0, $zero, $zero -/* D603C8 80241118 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D603CC 8024111C 8E4200CC */ lw $v0, 0xcc($s2) -/* D603D0 80241120 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D603D4 80241124 8C42000C */ lw $v0, 0xc($v0) -/* D603D8 80241128 AE220028 */ sw $v0, 0x28($s1) -/* D603DC 8024112C 8EA60028 */ lw $a2, 0x28($s5) -/* D603E0 80241130 0C00A720 */ jal atan2 -/* D603E4 80241134 8EA70030 */ lw $a3, 0x30($s5) -/* D603E8 80241138 3C013FA6 */ lui $at, 0x3fa6 -/* D603EC 8024113C 34216666 */ ori $at, $at, 0x6666 -/* D603F0 80241140 44811000 */ mtc1 $at, $f2 -/* D603F4 80241144 27A50040 */ addiu $a1, $sp, 0x40 -/* D603F8 80241148 E6200010 */ swc1 $f0, 0x10($s1) -/* D603FC 8024114C C6200038 */ lwc1 $f0, 0x38($s1) -/* D60400 80241150 C6240040 */ lwc1 $f4, 0x40($s1) -/* D60404 80241154 3C01447A */ lui $at, 0x447a -/* D60408 80241158 44813000 */ mtc1 $at, $f6 -/* D6040C 8024115C 27A60044 */ addiu $a2, $sp, 0x44 -/* D60410 80241160 AE20001C */ sw $zero, 0x1c($s1) -/* D60414 80241164 E6220014 */ swc1 $f2, 0x14($s1) -/* D60418 80241168 C6880000 */ lwc1 $f8, ($s4) -/* D6041C 8024116C C622003C */ lwc1 $f2, 0x3c($s1) -/* D60420 80241170 27A2004C */ addiu $v0, $sp, 0x4c -/* D60424 80241174 E7A00040 */ swc1 $f0, 0x40($sp) -/* D60428 80241178 E7A40048 */ swc1 $f4, 0x48($sp) -/* D6042C 8024117C E7A6004C */ swc1 $f6, 0x4c($sp) -/* D60430 80241180 E7A20044 */ swc1 $f2, 0x44($sp) -/* D60434 80241184 E6280018 */ swc1 $f8, 0x18($s1) -/* D60438 80241188 AFA20010 */ sw $v0, 0x10($sp) -/* D6043C 8024118C 8E240080 */ lw $a0, 0x80($s1) -/* D60440 80241190 0C0372DF */ jal func_800DCB7C -/* D60444 80241194 27A70048 */ addiu $a3, $sp, 0x48 -/* D60448 80241198 10400010 */ beqz $v0, .L802411DC -/* D6044C 8024119C 00000000 */ nop -/* D60450 802411A0 C620003C */ lwc1 $f0, 0x3c($s1) -/* D60454 802411A4 C6440070 */ lwc1 $f4, 0x70($s2) -/* D60458 802411A8 46802120 */ cvt.s.w $f4, $f4 -/* D6045C 802411AC 46040001 */ sub.s $f0, $f0, $f4 -/* D60460 802411B0 3C018024 */ lui $at, 0x8024 -/* D60464 802411B4 D4222240 */ ldc1 $f2, 0x2240($at) -/* D60468 802411B8 46000021 */ cvt.d.s $f0, $f0 -/* D6046C 802411BC 46220002 */ mul.d $f0, $f0, $f2 -/* D60470 802411C0 00000000 */ nop -/* D60474 802411C4 460020A1 */ cvt.d.s $f2, $f4 -/* D60478 802411C8 46201080 */ add.d $f2, $f2, $f0 -/* D6047C 802411CC E7A40044 */ swc1 $f4, 0x44($sp) -/* D60480 802411D0 462010A0 */ cvt.s.d $f2, $f2 -/* D60484 802411D4 08090483 */ j .L8024120C -/* D60488 802411D8 E6220064 */ swc1 $f2, 0x64($s1) -.L802411DC: -/* D6048C 802411DC C6A0002C */ lwc1 $f0, 0x2c($s5) -/* D60490 802411E0 C622003C */ lwc1 $f2, 0x3c($s1) -/* D60494 802411E4 46001081 */ sub.s $f2, $f2, $f0 -/* D60498 802411E8 3C018024 */ lui $at, 0x8024 -/* D6049C 802411EC D4242248 */ ldc1 $f4, 0x2248($at) -/* D604A0 802411F0 460010A1 */ cvt.d.s $f2, $f2 -/* D604A4 802411F4 46241082 */ mul.d $f2, $f2, $f4 -/* D604A8 802411F8 00000000 */ nop -/* D604AC 802411FC 46000021 */ cvt.d.s $f0, $f0 -/* D604B0 80241200 46220000 */ add.d $f0, $f0, $f2 -/* D604B4 80241204 46200020 */ cvt.s.d $f0, $f0 -/* D604B8 80241208 E6200064 */ swc1 $f0, 0x64($s1) -.L8024120C: -/* D604BC 8024120C C620003C */ lwc1 $f0, 0x3c($s1) -/* D604C0 80241210 2402000B */ addiu $v0, $zero, 0xb -/* D604C4 80241214 E6200068 */ swc1 $f0, 0x68($s1) -/* D604C8 80241218 AE620070 */ sw $v0, 0x70($s3) -/* D604CC 8024121C C6200018 */ lwc1 $f0, 0x18($s1) -/* D604D0 80241220 44801000 */ mtc1 $zero, $f2 -/* D604D4 80241224 44801800 */ mtc1 $zero, $f3 -/* D604D8 80241228 46000021 */ cvt.d.s $f0, $f0 -/* D604DC 8024122C 4620103C */ c.lt.d $f2, $f0 -/* D604E0 80241230 00000000 */ nop -/* D604E4 80241234 45000025 */ bc1f .L802412CC -/* D604E8 80241238 27A50040 */ addiu $a1, $sp, 0x40 -/* D604EC 8024123C C6200038 */ lwc1 $f0, 0x38($s1) -/* D604F0 80241240 C622003C */ lwc1 $f2, 0x3c($s1) -/* D604F4 80241244 C6240040 */ lwc1 $f4, 0x40($s1) -/* D604F8 80241248 C6260018 */ lwc1 $f6, 0x18($s1) -/* D604FC 8024124C E7A00040 */ swc1 $f0, 0x40($sp) -/* D60500 80241250 E7A20044 */ swc1 $f2, 0x44($sp) -/* D60504 80241254 E7A40048 */ swc1 $f4, 0x48($sp) -/* D60508 80241258 E7A60010 */ swc1 $f6, 0x10($sp) -/* D6050C 8024125C C620000C */ lwc1 $f0, 0xc($s1) -/* D60510 80241260 E7A00014 */ swc1 $f0, 0x14($sp) -/* D60514 80241264 862200A8 */ lh $v0, 0xa8($s1) -/* D60518 80241268 44820000 */ mtc1 $v0, $f0 -/* D6051C 8024126C 00000000 */ nop -/* D60520 80241270 46800020 */ cvt.s.w $f0, $f0 -/* D60524 80241274 E7A00018 */ swc1 $f0, 0x18($sp) -/* D60528 80241278 862200A6 */ lh $v0, 0xa6($s1) -/* D6052C 8024127C 27A60044 */ addiu $a2, $sp, 0x44 -/* D60530 80241280 44820000 */ mtc1 $v0, $f0 -/* D60534 80241284 00000000 */ nop -/* D60538 80241288 46800020 */ cvt.s.w $f0, $f0 -/* D6053C 8024128C E7A0001C */ swc1 $f0, 0x1c($sp) -/* D60540 80241290 8E240080 */ lw $a0, 0x80($s1) -/* D60544 80241294 0C037711 */ jal func_800DDC44 -/* D60548 80241298 27A70048 */ addiu $a3, $sp, 0x48 -/* D6054C 8024129C 54400001 */ bnel $v0, $zero, .L802412A4 -/* D60550 802412A0 AE200018 */ sw $zero, 0x18($s1) -.L802412A4: -/* D60554 802412A4 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D60558 802412A8 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D6055C 802412AC 8EA60028 */ lw $a2, 0x28($s5) -/* D60560 802412B0 0C00A720 */ jal atan2 -/* D60564 802412B4 8EA70030 */ lw $a3, 0x30($s5) -/* D60568 802412B8 8E250018 */ lw $a1, 0x18($s1) -/* D6056C 802412BC 44060000 */ mfc1 $a2, $f0 -/* D60570 802412C0 0220202D */ daddu $a0, $s1, $zero -/* D60574 802412C4 0C00EA95 */ jal npc_move_heading -/* D60578 802412C8 AE26000C */ sw $a2, 0xc($s1) -.L802412CC: -/* D6057C 802412CC C620001C */ lwc1 $f0, 0x1c($s1) -/* D60580 802412D0 C6220014 */ lwc1 $f2, 0x14($s1) -/* D60584 802412D4 46020001 */ sub.s $f0, $f0, $f2 -/* D60588 802412D8 C622003C */ lwc1 $f2, 0x3c($s1) -/* D6058C 802412DC C6240064 */ lwc1 $f4, 0x64($s1) -/* D60590 802412E0 46001080 */ add.s $f2, $f2, $f0 -/* D60594 802412E4 E620001C */ swc1 $f0, 0x1c($s1) -/* D60598 802412E8 4604103C */ c.lt.s $f2, $f4 -/* D6059C 802412EC 00000000 */ nop -/* D605A0 802412F0 450000E2 */ bc1f .L8024167C -/* D605A4 802412F4 E622003C */ swc1 $f2, 0x3c($s1) -/* D605A8 802412F8 2402000C */ addiu $v0, $zero, 0xc -/* D605AC 802412FC E624003C */ swc1 $f4, 0x3c($s1) -/* D605B0 80241300 AE620070 */ sw $v0, 0x70($s3) -/* D605B4 80241304 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D605B8 80241308 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D605BC 8024130C 8EA60028 */ lw $a2, 0x28($s5) -/* D605C0 80241310 0C00A7B5 */ jal dist2D -/* D605C4 80241314 8EA70030 */ lw $a3, 0x30($s5) -/* D605C8 80241318 3C014270 */ lui $at, 0x4270 -/* D605CC 8024131C 44811000 */ mtc1 $at, $f2 -/* D605D0 80241320 00000000 */ nop -/* D605D4 80241324 4602003C */ c.lt.s $f0, $f2 -/* D605D8 80241328 00000000 */ nop -/* D605DC 8024132C 45000002 */ bc1f .L80241338 -/* D605E0 80241330 E6200010 */ swc1 $f0, 0x10($s1) -/* D605E4 80241334 E6220010 */ swc1 $f2, 0x10($s1) -.L80241338: -/* D605E8 80241338 C6860018 */ lwc1 $f6, 0x18($s4) -/* D605EC 8024133C C6400070 */ lwc1 $f0, 0x70($s2) -/* D605F0 80241340 46800020 */ cvt.s.w $f0, $f0 -/* D605F4 80241344 E7A00044 */ swc1 $f0, 0x44($sp) -/* D605F8 80241348 46000021 */ cvt.d.s $f0, $f0 -/* D605FC 8024134C C6240010 */ lwc1 $f4, 0x10($s1) -/* D60600 80241350 3C014024 */ lui $at, 0x4024 -/* D60604 80241354 44811800 */ mtc1 $at, $f3 -/* D60608 80241358 44801000 */ mtc1 $zero, $f2 -/* D6060C 8024135C 46062103 */ div.s $f4, $f4, $f6 -/* D60610 80241360 46220000 */ add.d $f0, $f0, $f2 -/* D60614 80241364 C622003C */ lwc1 $f2, 0x3c($s1) -/* D60618 80241368 4600228D */ trunc.w.s $f10, $f4 -/* D6061C 8024136C 44025000 */ mfc1 $v0, $f10 -/* D60620 80241370 00000000 */ nop -/* D60624 80241374 A622008E */ sh $v0, 0x8e($s1) -/* D60628 80241378 460010A1 */ cvt.d.s $f2, $f2 -/* D6062C 8024137C 46220001 */ sub.d $f0, $f0, $f2 -/* D60630 80241380 00021400 */ sll $v0, $v0, 0x10 -/* D60634 80241384 E6260018 */ swc1 $f6, 0x18($s1) -/* D60638 80241388 14400003 */ bnez $v0, .L80241398 -/* D6063C 8024138C 46200120 */ cvt.s.d $f4, $f0 -/* D60640 80241390 24020001 */ addiu $v0, $zero, 1 -/* D60644 80241394 A622008E */ sh $v0, 0x8e($s1) -.L80241398: -/* D60648 80241398 8622008E */ lh $v0, 0x8e($s1) -/* D6064C 8024139C C620001C */ lwc1 $f0, 0x1c($s1) -/* D60650 802413A0 44821000 */ mtc1 $v0, $f2 -/* D60654 802413A4 00000000 */ nop -/* D60658 802413A8 468010A0 */ cvt.s.w $f2, $f2 -/* D6065C 802413AC 46000007 */ neg.s $f0, $f0 -/* D60660 802413B0 46020002 */ mul.s $f0, $f0, $f2 -/* D60664 802413B4 00000000 */ nop -/* D60668 802413B8 00420018 */ mult $v0, $v0 -/* D6066C 802413BC 8E230000 */ lw $v1, ($s1) -/* D60670 802413C0 46040000 */ add.s $f0, $f0, $f4 -/* D60674 802413C4 A22000AB */ sb $zero, 0xab($s1) -/* D60678 802413C8 2402FF7F */ addiu $v0, $zero, -0x81 -/* D6067C 802413CC 00004012 */ mflo $t0 -/* D60680 802413D0 00621824 */ and $v1, $v1, $v0 -/* D60684 802413D4 24020005 */ addiu $v0, $zero, 5 -/* D60688 802413D8 46000000 */ add.s $f0, $f0, $f0 -/* D6068C 802413DC AE230000 */ sw $v1, ($s1) -/* D60690 802413E0 44881000 */ mtc1 $t0, $f2 -/* D60694 802413E4 00000000 */ nop -/* D60698 802413E8 468010A0 */ cvt.s.w $f2, $f2 -/* D6069C 802413EC 46000007 */ neg.s $f0, $f0 -/* D606A0 802413F0 46020003 */ div.s $f0, $f0, $f2 -/* D606A4 802413F4 46000005 */ abs.s $f0, $f0 -/* D606A8 802413F8 46000007 */ neg.s $f0, $f0 -/* D606AC 802413FC E6200014 */ swc1 $f0, 0x14($s1) -/* D606B0 80241400 AE42006C */ sw $v0, 0x6c($s2) -/* D606B4 80241404 2402000D */ addiu $v0, $zero, 0xd -/* D606B8 80241408 A620008E */ sh $zero, 0x8e($s1) -/* D606BC 8024140C AE620070 */ sw $v0, 0x70($s3) -/* D606C0 80241410 C620001C */ lwc1 $f0, 0x1c($s1) -/* D606C4 80241414 C6220014 */ lwc1 $f2, 0x14($s1) -/* D606C8 80241418 46020001 */ sub.s $f0, $f0, $f2 -/* D606CC 8024141C 4480A000 */ mtc1 $zero, $f20 -/* D606D0 80241420 00000000 */ nop -/* D606D4 80241424 4614003C */ c.lt.s $f0, $f20 -/* D606D8 80241428 00000000 */ nop -/* D606DC 8024142C 45000012 */ bc1f .L80241478 -/* D606E0 80241430 E620001C */ swc1 $f0, 0x1c($s1) -/* D606E4 80241434 27A50040 */ addiu $a1, $sp, 0x40 -/* D606E8 80241438 27A60044 */ addiu $a2, $sp, 0x44 -/* D606EC 8024143C 27A2004C */ addiu $v0, $sp, 0x4c -/* D606F0 80241440 C6220038 */ lwc1 $f2, 0x38($s1) -/* D606F4 80241444 C624003C */ lwc1 $f4, 0x3c($s1) -/* D606F8 80241448 C6260040 */ lwc1 $f6, 0x40($s1) -/* D606FC 8024144C 46000007 */ neg.s $f0, $f0 -/* D60700 80241450 E7A0004C */ swc1 $f0, 0x4c($sp) -/* D60704 80241454 E7A20040 */ swc1 $f2, 0x40($sp) -/* D60708 80241458 E7A40044 */ swc1 $f4, 0x44($sp) -/* D6070C 8024145C E7A60048 */ swc1 $f6, 0x48($sp) -/* D60710 80241460 AFA20010 */ sw $v0, 0x10($sp) -/* D60714 80241464 8E240080 */ lw $a0, 0x80($s1) -/* D60718 80241468 0C0372DF */ jal func_800DCB7C -/* D6071C 8024146C 27A70048 */ addiu $a3, $sp, 0x48 -/* D60720 80241470 54400001 */ bnel $v0, $zero, .L80241478 -/* D60724 80241474 E634001C */ swc1 $f20, 0x1c($s1) -.L80241478: -/* D60728 80241478 C624003C */ lwc1 $f4, 0x3c($s1) -/* D6072C 8024147C C620001C */ lwc1 $f0, 0x1c($s1) -/* D60730 80241480 46002100 */ add.s $f4, $f4, $f0 -/* D60734 80241484 C6200018 */ lwc1 $f0, 0x18($s1) -/* D60738 80241488 44801000 */ mtc1 $zero, $f2 -/* D6073C 8024148C 44801800 */ mtc1 $zero, $f3 -/* D60740 80241490 46000021 */ cvt.d.s $f0, $f0 -/* D60744 80241494 4620103C */ c.lt.d $f2, $f0 -/* D60748 80241498 00000000 */ nop -/* D6074C 8024149C 45000057 */ bc1f .L802415FC -/* D60750 802414A0 E624003C */ swc1 $f4, 0x3c($s1) -/* D60754 802414A4 46002086 */ mov.s $f2, $f4 -/* D60758 802414A8 C6200038 */ lwc1 $f0, 0x38($s1) -/* D6075C 802414AC C6240040 */ lwc1 $f4, 0x40($s1) -/* D60760 802414B0 C6260018 */ lwc1 $f6, 0x18($s1) -/* D60764 802414B4 E7A20044 */ swc1 $f2, 0x44($sp) -/* D60768 802414B8 E7A00040 */ swc1 $f0, 0x40($sp) -/* D6076C 802414BC E7A40048 */ swc1 $f4, 0x48($sp) -/* D60770 802414C0 E7A60010 */ swc1 $f6, 0x10($sp) -/* D60774 802414C4 C620000C */ lwc1 $f0, 0xc($s1) -/* D60778 802414C8 E7A00014 */ swc1 $f0, 0x14($sp) -/* D6077C 802414CC 862200A8 */ lh $v0, 0xa8($s1) -/* D60780 802414D0 27A50040 */ addiu $a1, $sp, 0x40 -/* D60784 802414D4 44820000 */ mtc1 $v0, $f0 -/* D60788 802414D8 00000000 */ nop -/* D6078C 802414DC 46800020 */ cvt.s.w $f0, $f0 -/* D60790 802414E0 E7A00018 */ swc1 $f0, 0x18($sp) -/* D60794 802414E4 862200A6 */ lh $v0, 0xa6($s1) -/* D60798 802414E8 27A60044 */ addiu $a2, $sp, 0x44 -/* D6079C 802414EC 44820000 */ mtc1 $v0, $f0 -/* D607A0 802414F0 00000000 */ nop -/* D607A4 802414F4 46800020 */ cvt.s.w $f0, $f0 -/* D607A8 802414F8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* D607AC 802414FC 8E240080 */ lw $a0, 0x80($s1) -/* D607B0 80241500 0C037711 */ jal func_800DDC44 -/* D607B4 80241504 27A70048 */ addiu $a3, $sp, 0x48 -/* D607B8 80241508 10400003 */ beqz $v0, .L80241518 -/* D607BC 8024150C 00000000 */ nop -/* D607C0 80241510 0809057B */ j .L802415EC -/* D607C4 80241514 AE200018 */ sw $zero, 0x18($s1) -.L80241518: -/* D607C8 80241518 C620001C */ lwc1 $f0, 0x1c($s1) -/* D607CC 8024151C 3C01C004 */ lui $at, 0xc004 -/* D607D0 80241520 44811800 */ mtc1 $at, $f3 -/* D607D4 80241524 44801000 */ mtc1 $zero, $f2 -/* D607D8 80241528 46000021 */ cvt.d.s $f0, $f0 -/* D607DC 8024152C 4622003C */ c.lt.d $f0, $f2 -/* D607E0 80241530 00000000 */ nop -/* D607E4 80241534 4500002D */ bc1f .L802415EC -/* D607E8 80241538 00000000 */ nop -/* D607EC 8024153C 9622008E */ lhu $v0, 0x8e($s1) -/* D607F0 80241540 24420001 */ addiu $v0, $v0, 1 -/* D607F4 80241544 A622008E */ sh $v0, 0x8e($s1) -/* D607F8 80241548 00021400 */ sll $v0, $v0, 0x10 -/* D607FC 8024154C 8E830020 */ lw $v1, 0x20($s4) -/* D60800 80241550 00021403 */ sra $v0, $v0, 0x10 -/* D60804 80241554 0043102A */ slt $v0, $v0, $v1 -/* D60808 80241558 14400024 */ bnez $v0, .L802415EC -/* D6080C 8024155C 00000000 */ nop -/* D60810 80241560 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D60814 80241564 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D60818 80241568 8EA60028 */ lw $a2, 0x28($s5) -/* D6081C 8024156C 0C00A720 */ jal atan2 -/* D60820 80241570 8EA70030 */ lw $a3, 0x30($s5) -/* D60824 80241574 46000506 */ mov.s $f20, $f0 -/* D60828 80241578 C62C000C */ lwc1 $f12, 0xc($s1) -/* D6082C 8024157C 0C00A70A */ jal get_clamped_angle_diff -/* D60830 80241580 4600A386 */ mov.s $f14, $f20 -/* D60834 80241584 46000086 */ mov.s $f2, $f0 -/* D60838 80241588 8E82001C */ lw $v0, 0x1c($s4) -/* D6083C 8024158C 46001005 */ abs.s $f0, $f2 -/* D60840 80241590 44822000 */ mtc1 $v0, $f4 -/* D60844 80241594 00000000 */ nop -/* D60848 80241598 46802120 */ cvt.s.w $f4, $f4 -/* D6084C 8024159C 4600203C */ c.lt.s $f4, $f0 -/* D60850 802415A0 00000000 */ nop -/* D60854 802415A4 4500000D */ bc1f .L802415DC -/* D60858 802415A8 00000000 */ nop -/* D6085C 802415AC 44800000 */ mtc1 $zero, $f0 -/* D60860 802415B0 C634000C */ lwc1 $f20, 0xc($s1) -/* D60864 802415B4 4600103C */ c.lt.s $f2, $f0 -/* D60868 802415B8 00000000 */ nop -/* D6086C 802415BC 45000006 */ bc1f .L802415D8 -/* D60870 802415C0 00021023 */ negu $v0, $v0 -/* D60874 802415C4 44820000 */ mtc1 $v0, $f0 -/* D60878 802415C8 00000000 */ nop -/* D6087C 802415CC 46800020 */ cvt.s.w $f0, $f0 -/* D60880 802415D0 08090577 */ j .L802415DC -/* D60884 802415D4 4600A500 */ add.s $f20, $f20, $f0 -.L802415D8: -/* D60888 802415D8 4604A500 */ add.s $f20, $f20, $f4 -.L802415DC: -/* D6088C 802415DC 0C00A6C9 */ jal clamp_angle -/* D60890 802415E0 4600A306 */ mov.s $f12, $f20 -/* D60894 802415E4 E620000C */ swc1 $f0, 0xc($s1) -/* D60898 802415E8 A620008E */ sh $zero, 0x8e($s1) -.L802415EC: -/* D6089C 802415EC 8E250018 */ lw $a1, 0x18($s1) -/* D608A0 802415F0 8E26000C */ lw $a2, 0xc($s1) -/* D608A4 802415F4 0C00EA95 */ jal npc_move_heading -/* D608A8 802415F8 0220202D */ daddu $a0, $s1, $zero -.L802415FC: -/* D608AC 802415FC 8E42006C */ lw $v0, 0x6c($s2) -/* D608B0 80241600 2442FFFF */ addiu $v0, $v0, -1 -/* D608B4 80241604 1C400003 */ bgtz $v0, .L80241614 -/* D608B8 80241608 AE42006C */ sw $v0, 0x6c($s2) -/* D608BC 8024160C 24020005 */ addiu $v0, $zero, 5 -/* D608C0 80241610 AE42006C */ sw $v0, 0x6c($s2) -.L80241614: -/* D608C4 80241614 C620003C */ lwc1 $f0, 0x3c($s1) -/* D608C8 80241618 C6220068 */ lwc1 $f2, 0x68($s1) -/* D608CC 8024161C 4600103C */ c.lt.s $f2, $f0 -/* D608D0 80241620 00000000 */ nop -/* D608D4 80241624 45000015 */ bc1f .L8024167C -/* D608D8 80241628 2402000E */ addiu $v0, $zero, 0xe -/* D608DC 8024162C E622003C */ swc1 $f2, 0x3c($s1) -/* D608E0 80241630 AE620070 */ sw $v0, 0x70($s3) -/* D608E4 80241634 8E4200CC */ lw $v0, 0xcc($s2) -/* D608E8 80241638 922300A9 */ lbu $v1, 0xa9($s1) -/* D608EC 8024163C 8C440020 */ lw $a0, 0x20($v0) -/* D608F0 80241640 8E220000 */ lw $v0, ($s1) -/* D608F4 80241644 A22300AB */ sb $v1, 0xab($s1) -/* D608F8 80241648 34420080 */ ori $v0, $v0, 0x80 -/* D608FC 8024164C AE220000 */ sw $v0, ($s1) -/* D60900 80241650 2402000F */ addiu $v0, $zero, 0xf -/* D60904 80241654 A622008E */ sh $v0, 0x8e($s1) -/* D60908 80241658 2402000F */ addiu $v0, $zero, 0xf -/* D6090C 8024165C AE240028 */ sw $a0, 0x28($s1) -/* D60910 80241660 AE620070 */ sw $v0, 0x70($s3) -/* D60914 80241664 9622008E */ lhu $v0, 0x8e($s1) -/* D60918 80241668 2442FFFF */ addiu $v0, $v0, -1 -/* D6091C 8024166C A622008E */ sh $v0, 0x8e($s1) -/* D60920 80241670 00021400 */ sll $v0, $v0, 0x10 -/* D60924 80241674 58400001 */ blezl $v0, .L8024167C -/* D60928 80241678 AE600070 */ sw $zero, 0x70($s3) -.L8024167C: -/* D6092C 8024167C 0000102D */ daddu $v0, $zero, $zero -.L80241680: -/* D60930 80241680 8FBF006C */ lw $ra, 0x6c($sp) -/* D60934 80241684 8FB60068 */ lw $s6, 0x68($sp) -/* D60938 80241688 8FB50064 */ lw $s5, 0x64($sp) -/* D6093C 8024168C 8FB40060 */ lw $s4, 0x60($sp) -/* D60940 80241690 8FB3005C */ lw $s3, 0x5c($sp) -/* D60944 80241694 8FB20058 */ lw $s2, 0x58($sp) -/* D60948 80241698 8FB10054 */ lw $s1, 0x54($sp) -/* D6094C 8024169C 8FB00050 */ lw $s0, 0x50($sp) -/* D60950 802416A0 D7B40070 */ ldc1 $f20, 0x70($sp) -/* D60954 802416A4 03E00008 */ jr $ra -/* D60958 802416A8 27BD0078 */ addiu $sp, $sp, 0x78 -/* D6095C 802416AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_11/func_80240020_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/func_80240020_D61500.s deleted file mode 100644 index d61d61b48e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/func_80240020_D61500.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D61520 -/* D61520 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D61524 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D61528 80240028 00822024 */ and $a0, $a0, $v0 -/* D6152C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D61530 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D61534 80240034 00821821 */ addu $v1, $a0, $v0 -/* D61538 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D6153C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D61540 80240040 30620001 */ andi $v0, $v1, 1 -/* D61544 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D61548 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D6154C 8024004C 03E00008 */ jr $ra -/* D61550 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_11/func_80240054_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/func_80240054_D61500.s deleted file mode 100644 index c50a43de6e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/func_80240054_D61500.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054_D61554 -/* D61554 80240054 00041403 */ sra $v0, $a0, 0x10 -/* D61558 80240058 304300FF */ andi $v1, $v0, 0xff -/* D6155C 8024005C 24020006 */ addiu $v0, $zero, 6 -/* D61560 80240060 10620015 */ beq $v1, $v0, .L802400B8 -/* D61564 80240064 28620007 */ slti $v0, $v1, 7 -/* D61568 80240068 10400005 */ beqz $v0, .L80240080 -/* D6156C 8024006C 24020001 */ addiu $v0, $zero, 1 -/* D61570 80240070 1062000A */ beq $v1, $v0, .L8024009C -/* D61574 80240074 3C020100 */ lui $v0, 0x100 -/* D61578 80240078 03E00008 */ jr $ra -/* D6157C 8024007C 00821025 */ or $v0, $a0, $v0 -.L80240080: -/* D61580 80240080 2862000A */ slti $v0, $v1, 0xa -/* D61584 80240084 10400016 */ beqz $v0, .L802400E0 -/* D61588 80240088 28620008 */ slti $v0, $v1, 8 -/* D6158C 8024008C 14400015 */ bnez $v0, .L802400E4 -/* D61590 80240090 3C020100 */ lui $v0, 0x100 -/* D61594 80240094 03E00008 */ jr $ra -/* D61598 80240098 0080102D */ daddu $v0, $a0, $zero -.L8024009C: -/* D6159C 8024009C 3C020001 */ lui $v0, 1 -/* D615A0 802400A0 3442000C */ ori $v0, $v0, 0xc -/* D615A4 802400A4 0044102A */ slt $v0, $v0, $a0 -/* D615A8 802400A8 1040000E */ beqz $v0, .L802400E4 -/* D615AC 802400AC 3C020100 */ lui $v0, 0x100 -.L802400B0: -/* D615B0 802400B0 03E00008 */ jr $ra -/* D615B4 802400B4 0080102D */ daddu $v0, $a0, $zero -.L802400B8: -/* D615B8 802400B8 3C02FFF9 */ lui $v0, 0xfff9 -/* D615BC 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D615C0 802400C0 00821821 */ addu $v1, $a0, $v0 -/* D615C4 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D615C8 802400C8 10400005 */ beqz $v0, .L802400E0 -/* D615CC 802400CC 30620001 */ andi $v0, $v1, 1 -/* D615D0 802400D0 1440FFF7 */ bnez $v0, .L802400B0 -/* D615D4 802400D4 24820001 */ addiu $v0, $a0, 1 -/* D615D8 802400D8 03E00008 */ jr $ra -/* D615DC 802400DC 00000000 */ nop -.L802400E0: -/* D615E0 802400E0 3C020100 */ lui $v0, 0x100 -.L802400E4: -/* D615E4 802400E4 03E00008 */ jr $ra -/* D615E8 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_11/func_802400EC_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/func_802400EC_D61500.s deleted file mode 100644 index 26aa57c14d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/func_802400EC_D61500.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_D615EC -/* D615EC 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D615F0 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* D615F4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D615F8 802400F8 3C058024 */ lui $a1, 0x8024 -/* D615FC 802400FC 24A50128 */ addiu $a1, $a1, 0x128 -/* D61600 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* D61604 80240104 0C048C56 */ jal bind_dynamic_entity_3 -/* D61608 80240108 0000202D */ daddu $a0, $zero, $zero -/* D6160C 8024010C 8E03013C */ lw $v1, 0x13c($s0) -/* D61610 80240110 AC620000 */ sw $v0, ($v1) -/* D61614 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* D61618 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* D6161C 8024011C 24020002 */ addiu $v0, $zero, 2 -/* D61620 80240120 03E00008 */ jr $ra -/* D61624 80240124 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_11/func_80240128_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/func_80240128_D61500.s deleted file mode 100644 index 3bec3962a1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/func_80240128_D61500.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240128_D61628 -/* D61628 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D6162C 8024012C AFB00040 */ sw $s0, 0x40($sp) -/* D61630 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D61634 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D61638 80240138 AFB20048 */ sw $s2, 0x48($sp) -/* D6163C 8024013C AFBF004C */ sw $ra, 0x4c($sp) -/* D61640 80240140 AFB10044 */ sw $s1, 0x44($sp) -/* D61644 80240144 8E020000 */ lw $v0, ($s0) -/* D61648 80240148 821100BE */ lb $s1, 0xbe($s0) -/* D6164C 8024014C 30420001 */ andi $v0, $v0, 1 -/* D61650 80240150 10400061 */ beqz $v0, .L802402D8 -/* D61654 80240154 27B20020 */ addiu $s2, $sp, 0x20 -/* D61658 80240158 8E0400CC */ lw $a0, 0xcc($s0) -/* D6165C 8024015C 0C044181 */ jal get_shadow_by_index -/* D61660 80240160 00000000 */ nop -/* D61664 80240164 0C048B77 */ jal func_80122DDC -/* D61668 80240168 84440008 */ lh $a0, 8($v0) -/* D6166C 8024016C 8C430000 */ lw $v1, ($v0) -/* D61670 80240170 34630200 */ ori $v1, $v1, 0x200 -/* D61674 80240174 AC430000 */ sw $v1, ($v0) -/* D61678 80240178 8E050028 */ lw $a1, 0x28($s0) -/* D6167C 8024017C 8E06002C */ lw $a2, 0x2c($s0) -/* D61680 80240180 27A20030 */ addiu $v0, $sp, 0x30 -/* D61684 80240184 AFA20010 */ sw $v0, 0x10($sp) -/* D61688 80240188 27A20034 */ addiu $v0, $sp, 0x34 -/* D6168C 8024018C AFA20014 */ sw $v0, 0x14($sp) -/* D61690 80240190 C6000030 */ lwc1 $f0, 0x30($s0) -/* D61694 80240194 3C04800A */ lui $a0, 0x800a -/* D61698 80240198 8484A634 */ lh $a0, -0x59cc($a0) -/* D6169C 8024019C 46000007 */ neg.s $f0, $f0 -/* D616A0 802401A0 44070000 */ mfc1 $a3, $f0 -/* D616A4 802401A4 27A20038 */ addiu $v0, $sp, 0x38 -/* D616A8 802401A8 0C00B94E */ jal get_screen_coords -/* D616AC 802401AC AFA20018 */ sw $v0, 0x18($sp) -/* D616B0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D616B4 802401B4 0C090008 */ jal func_80240020 -/* D616B8 802401B8 00000000 */ nop -/* D616BC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) -/* D616C0 802401C0 3C014307 */ lui $at, 0x4307 -/* D616C4 802401C4 44810000 */ mtc1 $at, $f0 -/* D616C8 802401C8 00000000 */ nop -/* D616CC 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D616D0 802401D0 00000000 */ nop -/* D616D4 802401D4 4500000B */ bc1f .L80240204 -/* D616D8 802401D8 24040002 */ addiu $a0, $zero, 2 -/* D616DC 802401DC 3C014361 */ lui $at, 0x4361 -/* D616E0 802401E0 44810000 */ mtc1 $at, $f0 -/* D616E4 802401E4 00000000 */ nop -/* D616E8 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D616EC 802401EC 00000000 */ nop -/* D616F0 802401F0 45000004 */ bc1f .L80240204 -/* D616F4 802401F4 00000000 */ nop -/* D616F8 802401F8 0C090015 */ jal func_80240054 -/* D616FC 802401FC 0040202D */ daddu $a0, $v0, $zero -/* D61700 80240200 24040002 */ addiu $a0, $zero, 2 -.L80240204: -/* D61704 80240204 3C063F80 */ lui $a2, 0x3f80 -/* D61708 80240208 0C0B76A3 */ jal func_802DDA8C -/* D6170C 8024020C 0040282D */ daddu $a1, $v0, $zero -/* D61710 80240210 8E020000 */ lw $v0, ($s0) -/* D61714 80240214 3C030002 */ lui $v1, 2 -/* D61718 80240218 00431024 */ and $v0, $v0, $v1 -/* D6171C 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 -/* D61720 80240220 24110011 */ addiu $s1, $zero, 0x11 -/* D61724 80240224 9203000E */ lbu $v1, 0xe($s0) -/* D61728 80240228 3C02802E */ lui $v0, 0x802e -/* D6172C 8024022C 90429D70 */ lbu $v0, -0x6290($v0) -/* D61730 80240230 10620018 */ beq $v1, $v0, .L80240294 -/* D61734 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D61738 80240238 1040000B */ beqz $v0, .L80240268 -/* D6173C 8024023C 24110011 */ addiu $s1, $zero, 0x11 -/* D61740 80240240 24040002 */ addiu $a0, $zero, 2 -/* D61744 80240244 2405FFFF */ addiu $a1, $zero, -1 -/* D61748 80240248 24060007 */ addiu $a2, $zero, 7 -/* D6174C 8024024C 0060102D */ daddu $v0, $v1, $zero -/* D61750 80240250 0000382D */ daddu $a3, $zero, $zero -/* D61754 80240254 AFA00010 */ sw $zero, 0x10($sp) -/* D61758 80240258 AFA00014 */ sw $zero, 0x14($sp) -/* D6175C 8024025C AFA0001C */ sw $zero, 0x1c($sp) -/* D61760 80240260 080900A3 */ j .L8024028C -/* D61764 80240264 AFA20018 */ sw $v0, 0x18($sp) -.L80240268: -/* D61768 80240268 2411000D */ addiu $s1, $zero, 0xd -/* D6176C 8024026C 24040002 */ addiu $a0, $zero, 2 -/* D61770 80240270 2405FFFF */ addiu $a1, $zero, -1 -/* D61774 80240274 0000302D */ daddu $a2, $zero, $zero -/* D61778 80240278 00C0382D */ daddu $a3, $a2, $zero -/* D6177C 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* D61780 80240280 AFA00014 */ sw $zero, 0x14($sp) -/* D61784 80240284 AFA00018 */ sw $zero, 0x18($sp) -/* D61788 80240288 AFA0001C */ sw $zero, 0x1c($sp) -.L8024028C: -/* D6178C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D61790 80240290 00000000 */ nop -.L80240294: -/* D61794 80240294 9202000E */ lbu $v0, 0xe($s0) -/* D61798 80240298 3C01802E */ lui $at, 0x802e -/* D6179C 8024029C A0229D70 */ sb $v0, -0x6290($at) -/* D617A0 802402A0 080900AD */ j .L802402B4 -/* D617A4 802402A4 0240202D */ daddu $a0, $s2, $zero -.L802402A8: -/* D617A8 802402A8 3C01802E */ lui $at, 0x802e -/* D617AC 802402AC A0209D70 */ sb $zero, -0x6290($at) -/* D617B0 802402B0 0240202D */ daddu $a0, $s2, $zero -.L802402B4: -/* D617B4 802402B4 AC910000 */ sw $s1, ($a0) -/* D617B8 802402B8 AC900008 */ sw $s0, 8($a0) -/* D617BC 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D617C0 802402C0 3C038024 */ lui $v1, 0x8024 -/* D617C4 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 -/* D617C8 802402C8 AC83000C */ sw $v1, 0xc($a0) -/* D617CC 802402CC 00021023 */ negu $v0, $v0 -/* D617D0 802402D0 0C047644 */ jal queue_render_task -/* D617D4 802402D4 AC820004 */ sw $v0, 4($a0) -.L802402D8: -/* D617D8 802402D8 8FBF004C */ lw $ra, 0x4c($sp) -/* D617DC 802402DC 8FB20048 */ lw $s2, 0x48($sp) -/* D617E0 802402E0 8FB10044 */ lw $s1, 0x44($sp) -/* D617E4 802402E4 8FB00040 */ lw $s0, 0x40($sp) -/* D617E8 802402E8 03E00008 */ jr $ra -/* D617EC 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_11/func_802402F0_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/func_802402F0_D61500.s deleted file mode 100644 index 7952f64ea0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/func_802402F0_D61500.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D617F0 -/* D617F0 802402F0 3C03800A */ lui $v1, 0x800a -/* D617F4 802402F4 8463A634 */ lh $v1, -0x59cc($v1) -/* D617F8 802402F8 3C07BF80 */ lui $a3, 0xbf80 -/* D617FC 802402FC 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D61800 80240300 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D61804 80240304 4480A000 */ mtc1 $zero, $f20 -/* D61808 80240308 AFB1011C */ sw $s1, 0x11c($sp) -/* D6180C 8024030C 0080882D */ daddu $s1, $a0, $zero -/* D61810 80240310 AFB00118 */ sw $s0, 0x118($sp) -/* D61814 80240314 27B00098 */ addiu $s0, $sp, 0x98 -/* D61818 80240318 AFBF0120 */ sw $ra, 0x120($sp) -/* D6181C 8024031C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D61820 80240320 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D61824 80240324 00031080 */ sll $v0, $v1, 2 -/* D61828 80240328 00431021 */ addu $v0, $v0, $v1 -/* D6182C 8024032C 00021080 */ sll $v0, $v0, 2 -/* D61830 80240330 00431023 */ subu $v0, $v0, $v1 -/* D61834 80240334 000218C0 */ sll $v1, $v0, 3 -/* D61838 80240338 00431021 */ addu $v0, $v0, $v1 -/* D6183C 8024033C 000210C0 */ sll $v0, $v0, 3 -/* D61840 80240340 3C01800B */ lui $at, 0x800b -/* D61844 80240344 00220821 */ addu $at, $at, $v0 -/* D61848 80240348 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D6184C 8024034C 4406A000 */ mfc1 $a2, $f20 -/* D61850 80240350 4600B587 */ neg.s $f22, $f22 -/* D61854 80240354 4405B000 */ mfc1 $a1, $f22 -/* D61858 80240358 0200202D */ daddu $a0, $s0, $zero -/* D6185C 8024035C 0C019EC8 */ jal guRotateF -/* D61860 80240360 E7B40010 */ swc1 $f20, 0x10($sp) -/* D61864 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D61868 80240368 0C00A6C9 */ jal clamp_angle -/* D6186C 8024036C 00000000 */ nop -/* D61870 80240370 44050000 */ mfc1 $a1, $f0 -/* D61874 80240374 4406A000 */ mfc1 $a2, $f20 -/* D61878 80240378 4407A000 */ mfc1 $a3, $f20 -/* D6187C 8024037C 3C013F80 */ lui $at, 0x3f80 -/* D61880 80240380 4481C000 */ mtc1 $at, $f24 -/* D61884 80240384 27A40018 */ addiu $a0, $sp, 0x18 -/* D61888 80240388 0C019EC8 */ jal guRotateF -/* D6188C 8024038C E7B80010 */ swc1 $f24, 0x10($sp) -/* D61890 80240390 0200202D */ daddu $a0, $s0, $zero -/* D61894 80240394 27A50018 */ addiu $a1, $sp, 0x18 -/* D61898 80240398 0C019D80 */ jal guMtxCatF -/* D6189C 8024039C 00A0302D */ daddu $a2, $a1, $zero -/* D618A0 802403A0 4405B000 */ mfc1 $a1, $f22 -/* D618A4 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D618A8 802403A8 4407C000 */ mfc1 $a3, $f24 -/* D618AC 802403AC 0200202D */ daddu $a0, $s0, $zero -/* D618B0 802403B0 0C019EC8 */ jal guRotateF -/* D618B4 802403B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D618B8 802403B8 27A40018 */ addiu $a0, $sp, 0x18 -/* D618BC 802403BC 0200282D */ daddu $a1, $s0, $zero -/* D618C0 802403C0 0C019D80 */ jal guMtxCatF -/* D618C4 802403C4 0080302D */ daddu $a2, $a0, $zero -/* D618C8 802403C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D618CC 802403CC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D618D0 802403D0 4406A000 */ mfc1 $a2, $f20 -/* D618D4 802403D4 4407C000 */ mfc1 $a3, $f24 -/* D618D8 802403D8 0C019EC8 */ jal guRotateF -/* D618DC 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D618E0 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* D618E4 802403E4 0200282D */ daddu $a1, $s0, $zero -/* D618E8 802403E8 0C019D80 */ jal guMtxCatF -/* D618EC 802403EC 0080302D */ daddu $a2, $a0, $zero -/* D618F0 802403F0 3C013F36 */ lui $at, 0x3f36 -/* D618F4 802403F4 3421DB6E */ ori $at, $at, 0xdb6e -/* D618F8 802403F8 44810000 */ mtc1 $at, $f0 -/* D618FC 802403FC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D61900 80240400 44050000 */ mfc1 $a1, $f0 -/* D61904 80240404 0200202D */ daddu $a0, $s0, $zero -/* D61908 80240408 00A0302D */ daddu $a2, $a1, $zero -/* D6190C 8024040C 0C019DF0 */ jal guScaleF -/* D61910 80240410 00A0382D */ daddu $a3, $a1, $zero -/* D61914 80240414 27A40018 */ addiu $a0, $sp, 0x18 -/* D61918 80240418 0200282D */ daddu $a1, $s0, $zero -/* D6191C 8024041C 0C019D80 */ jal guMtxCatF -/* D61920 80240420 0080302D */ daddu $a2, $a0, $zero -/* D61924 80240424 27B00058 */ addiu $s0, $sp, 0x58 -/* D61928 80240428 C6200030 */ lwc1 $f0, 0x30($s1) -/* D6192C 8024042C 3C014040 */ lui $at, 0x4040 -/* D61930 80240430 44811000 */ mtc1 $at, $f2 -/* D61934 80240434 46000007 */ neg.s $f0, $f0 -/* D61938 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* D6193C 8024043C 8E250028 */ lw $a1, 0x28($s1) -/* D61940 80240440 8E26002C */ lw $a2, 0x2c($s1) -/* D61944 80240444 44070000 */ mfc1 $a3, $f0 -/* D61948 80240448 0C019E40 */ jal guTranslateF -/* D6194C 8024044C 0200202D */ daddu $a0, $s0, $zero -/* D61950 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* D61954 80240454 0200282D */ daddu $a1, $s0, $zero -/* D61958 80240458 0C019D80 */ jal guMtxCatF -/* D6195C 8024045C 0080302D */ daddu $a2, $a0, $zero -/* D61960 80240460 24040002 */ addiu $a0, $zero, 2 -/* D61964 80240464 0000282D */ daddu $a1, $zero, $zero -/* D61968 80240468 00A0302D */ daddu $a2, $a1, $zero -/* D6196C 8024046C 00A0382D */ daddu $a3, $a1, $zero -/* D61970 80240470 27A20018 */ addiu $v0, $sp, 0x18 -/* D61974 80240474 0C0B7710 */ jal render_sprite -/* D61978 80240478 AFA20010 */ sw $v0, 0x10($sp) -/* D6197C 8024047C 8FBF0120 */ lw $ra, 0x120($sp) -/* D61980 80240480 8FB1011C */ lw $s1, 0x11c($sp) -/* D61984 80240484 8FB00118 */ lw $s0, 0x118($sp) -/* D61988 80240488 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D6198C 8024048C D7B60130 */ ldc1 $f22, 0x130($sp) -/* D61990 80240490 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D61994 80240494 03E00008 */ jr $ra -/* D61998 80240498 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_11/func_8024049C_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/func_8024049C_D61500.s deleted file mode 100644 index 2d6715c2bc..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/func_8024049C_D61500.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_D6199C -/* D6199C 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D619A0 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* D619A4 802404A4 0080802D */ daddu $s0, $a0, $zero -/* D619A8 802404A8 AFBF0014 */ sw $ra, 0x14($sp) -/* D619AC 802404AC 8E020084 */ lw $v0, 0x84($s0) -/* D619B0 802404B0 0440000E */ bltz $v0, .L802404EC -/* D619B4 802404B4 28420002 */ slti $v0, $v0, 2 -/* D619B8 802404B8 1040000C */ beqz $v0, .L802404EC -/* D619BC 802404BC 00000000 */ nop -/* D619C0 802404C0 3C058024 */ lui $a1, 0x8024 -/* D619C4 802404C4 24A50500 */ addiu $a1, $a1, 0x500 -/* D619C8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 -/* D619CC 802404CC 0000202D */ daddu $a0, $zero, $zero -/* D619D0 802404D0 8E03013C */ lw $v1, 0x13c($s0) -/* D619D4 802404D4 AC620000 */ sw $v0, ($v1) -/* D619D8 802404D8 3C03800A */ lui $v1, %hi(D_8009A650) -/* D619DC 802404DC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D619E0 802404E0 8C620000 */ lw $v0, ($v1) -/* D619E4 802404E4 34420080 */ ori $v0, $v0, 0x80 -/* D619E8 802404E8 AC620000 */ sw $v0, ($v1) -.L802404EC: -/* D619EC 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* D619F0 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* D619F4 802404F4 24020002 */ addiu $v0, $zero, 2 -/* D619F8 802404F8 03E00008 */ jr $ra -/* D619FC 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_11/func_80240500_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/func_80240500_D61500.s deleted file mode 100644 index b46640779a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/func_80240500_D61500.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_D61A00 -/* D61A00 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D61A04 80240504 AFB00040 */ sw $s0, 0x40($sp) -/* D61A08 80240508 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D61A0C 8024050C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D61A10 80240510 AFB10044 */ sw $s1, 0x44($sp) -/* D61A14 80240514 AFBF004C */ sw $ra, 0x4c($sp) -/* D61A18 80240518 AFB20048 */ sw $s2, 0x48($sp) -/* D61A1C 8024051C 8E020000 */ lw $v0, ($s0) -/* D61A20 80240520 821200BE */ lb $s2, 0xbe($s0) -/* D61A24 80240524 30420001 */ andi $v0, $v0, 1 -/* D61A28 80240528 10400052 */ beqz $v0, .L80240674 -/* D61A2C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 -/* D61A30 80240530 8E0400CC */ lw $a0, 0xcc($s0) -/* D61A34 80240534 0C044181 */ jal get_shadow_by_index -/* D61A38 80240538 00000000 */ nop -/* D61A3C 8024053C 0C048B77 */ jal func_80122DDC -/* D61A40 80240540 84440008 */ lh $a0, 8($v0) -/* D61A44 80240544 8E050028 */ lw $a1, 0x28($s0) -/* D61A48 80240548 8E070030 */ lw $a3, 0x30($s0) -/* D61A4C 8024054C 27A20030 */ addiu $v0, $sp, 0x30 -/* D61A50 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* D61A54 80240554 27A20034 */ addiu $v0, $sp, 0x34 -/* D61A58 80240558 AFA20014 */ sw $v0, 0x14($sp) -/* D61A5C 8024055C 27A20038 */ addiu $v0, $sp, 0x38 -/* D61A60 80240560 AFA20018 */ sw $v0, 0x18($sp) -/* D61A64 80240564 C600002C */ lwc1 $f0, 0x2c($s0) -/* D61A68 80240568 3C04800A */ lui $a0, 0x800a -/* D61A6C 8024056C 8484A634 */ lh $a0, -0x59cc($a0) -/* D61A70 80240570 46000007 */ neg.s $f0, $f0 -/* D61A74 80240574 44060000 */ mfc1 $a2, $f0 -/* D61A78 80240578 0C00B94E */ jal get_screen_coords -/* D61A7C 8024057C 00000000 */ nop -/* D61A80 80240580 8E0500A4 */ lw $a1, 0xa4($s0) -/* D61A84 80240584 3C063F80 */ lui $a2, 0x3f80 -/* D61A88 80240588 0C0B76A3 */ jal func_802DDA8C -/* D61A8C 8024058C 24040001 */ addiu $a0, $zero, 1 -/* D61A90 80240590 8E020000 */ lw $v0, ($s0) -/* D61A94 80240594 3C030002 */ lui $v1, 2 -/* D61A98 80240598 00431024 */ and $v0, $v0, $v1 -/* D61A9C 8024059C 54400022 */ bnel $v0, $zero, .L80240628 -/* D61AA0 802405A0 24120011 */ addiu $s2, $zero, 0x11 -/* D61AA4 802405A4 9203000E */ lbu $v1, 0xe($s0) -/* D61AA8 802405A8 3C02802E */ lui $v0, 0x802e -/* D61AAC 802405AC 90429D71 */ lbu $v0, -0x628f($v0) -/* D61AB0 802405B0 10620018 */ beq $v1, $v0, .L80240614 -/* D61AB4 802405B4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D61AB8 802405B8 1040000B */ beqz $v0, .L802405E8 -/* D61ABC 802405BC 24120011 */ addiu $s2, $zero, 0x11 -/* D61AC0 802405C0 24040001 */ addiu $a0, $zero, 1 -/* D61AC4 802405C4 2405FFFF */ addiu $a1, $zero, -1 -/* D61AC8 802405C8 24060007 */ addiu $a2, $zero, 7 -/* D61ACC 802405CC 0060102D */ daddu $v0, $v1, $zero -/* D61AD0 802405D0 0000382D */ daddu $a3, $zero, $zero -/* D61AD4 802405D4 AFA00010 */ sw $zero, 0x10($sp) -/* D61AD8 802405D8 AFA00014 */ sw $zero, 0x14($sp) -/* D61ADC 802405DC AFA0001C */ sw $zero, 0x1c($sp) -/* D61AE0 802405E0 08090183 */ j .L8024060C -/* D61AE4 802405E4 AFA20018 */ sw $v0, 0x18($sp) -.L802405E8: -/* D61AE8 802405E8 2412000D */ addiu $s2, $zero, 0xd -/* D61AEC 802405EC 24040001 */ addiu $a0, $zero, 1 -/* D61AF0 802405F0 2405FFFF */ addiu $a1, $zero, -1 -/* D61AF4 802405F4 0000302D */ daddu $a2, $zero, $zero -/* D61AF8 802405F8 00C0382D */ daddu $a3, $a2, $zero -/* D61AFC 802405FC AFA00010 */ sw $zero, 0x10($sp) -/* D61B00 80240600 AFA00014 */ sw $zero, 0x14($sp) -/* D61B04 80240604 AFA00018 */ sw $zero, 0x18($sp) -/* D61B08 80240608 AFA0001C */ sw $zero, 0x1c($sp) -.L8024060C: -/* D61B0C 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D61B10 80240610 00000000 */ nop -.L80240614: -/* D61B14 80240614 9202000E */ lbu $v0, 0xe($s0) -/* D61B18 80240618 3C01802E */ lui $at, 0x802e -/* D61B1C 8024061C A0229D71 */ sb $v0, -0x628f($at) -/* D61B20 80240620 0809018C */ j .L80240630 -/* D61B24 80240624 00000000 */ nop -.L80240628: -/* D61B28 80240628 3C01802E */ lui $at, 0x802e -/* D61B2C 8024062C A0209D71 */ sb $zero, -0x628f($at) -.L80240630: -/* D61B30 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D61B34 80240634 3C048024 */ lui $a0, 0x8024 -/* D61B38 80240638 24840870 */ addiu $a0, $a0, 0x870 -/* D61B3C 8024063C AE320000 */ sw $s2, ($s1) -/* D61B40 80240640 AE300008 */ sw $s0, 8($s1) -/* D61B44 80240644 00021023 */ negu $v0, $v0 -/* D61B48 80240648 AE220004 */ sw $v0, 4($s1) -/* D61B4C 8024064C 8E020000 */ lw $v0, ($s0) -/* D61B50 80240650 3C030002 */ lui $v1, 2 -/* D61B54 80240654 00431024 */ and $v0, $v0, $v1 -/* D61B58 80240658 54400004 */ bnel $v0, $zero, .L8024066C -/* D61B5C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D61B60 80240660 3C048024 */ lui $a0, 0x8024 -/* D61B64 80240664 2484068C */ addiu $a0, $a0, 0x68c -/* D61B68 80240668 AE24000C */ sw $a0, 0xc($s1) -.L8024066C: -/* D61B6C 8024066C 0C047644 */ jal queue_render_task -/* D61B70 80240670 0220202D */ daddu $a0, $s1, $zero -.L80240674: -/* D61B74 80240674 8FBF004C */ lw $ra, 0x4c($sp) -/* D61B78 80240678 8FB20048 */ lw $s2, 0x48($sp) -/* D61B7C 8024067C 8FB10044 */ lw $s1, 0x44($sp) -/* D61B80 80240680 8FB00040 */ lw $s0, 0x40($sp) -/* D61B84 80240684 03E00008 */ jr $ra -/* D61B88 80240688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_11/func_8024068C_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/func_8024068C_D61500.s deleted file mode 100644 index b903c7367e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/func_8024068C_D61500.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_D61B8C -/* D61B8C 8024068C 3C03800A */ lui $v1, 0x800a -/* D61B90 80240690 8463A634 */ lh $v1, -0x59cc($v1) -/* D61B94 80240694 3C07BF80 */ lui $a3, 0xbf80 -/* D61B98 80240698 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D61B9C 8024069C F7B40128 */ sdc1 $f20, 0x128($sp) -/* D61BA0 802406A0 4480A000 */ mtc1 $zero, $f20 -/* D61BA4 802406A4 AFB1011C */ sw $s1, 0x11c($sp) -/* D61BA8 802406A8 0080882D */ daddu $s1, $a0, $zero -/* D61BAC 802406AC AFB00118 */ sw $s0, 0x118($sp) -/* D61BB0 802406B0 27B00098 */ addiu $s0, $sp, 0x98 -/* D61BB4 802406B4 AFBF0120 */ sw $ra, 0x120($sp) -/* D61BB8 802406B8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D61BBC 802406BC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D61BC0 802406C0 00031080 */ sll $v0, $v1, 2 -/* D61BC4 802406C4 00431021 */ addu $v0, $v0, $v1 -/* D61BC8 802406C8 00021080 */ sll $v0, $v0, 2 -/* D61BCC 802406CC 00431023 */ subu $v0, $v0, $v1 -/* D61BD0 802406D0 000218C0 */ sll $v1, $v0, 3 -/* D61BD4 802406D4 00431021 */ addu $v0, $v0, $v1 -/* D61BD8 802406D8 000210C0 */ sll $v0, $v0, 3 -/* D61BDC 802406DC 3C01800B */ lui $at, 0x800b -/* D61BE0 802406E0 00220821 */ addu $at, $at, $v0 -/* D61BE4 802406E4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D61BE8 802406E8 4406A000 */ mfc1 $a2, $f20 -/* D61BEC 802406EC 4600B587 */ neg.s $f22, $f22 -/* D61BF0 802406F0 4405B000 */ mfc1 $a1, $f22 -/* D61BF4 802406F4 0200202D */ daddu $a0, $s0, $zero -/* D61BF8 802406F8 0C019EC8 */ jal guRotateF -/* D61BFC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) -/* D61C00 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D61C04 80240704 0C00A6C9 */ jal clamp_angle -/* D61C08 80240708 00000000 */ nop -/* D61C0C 8024070C 44050000 */ mfc1 $a1, $f0 -/* D61C10 80240710 4406A000 */ mfc1 $a2, $f20 -/* D61C14 80240714 4407A000 */ mfc1 $a3, $f20 -/* D61C18 80240718 3C013F80 */ lui $at, 0x3f80 -/* D61C1C 8024071C 4481C000 */ mtc1 $at, $f24 -/* D61C20 80240720 27A40018 */ addiu $a0, $sp, 0x18 -/* D61C24 80240724 0C019EC8 */ jal guRotateF -/* D61C28 80240728 E7B80010 */ swc1 $f24, 0x10($sp) -/* D61C2C 8024072C 0200202D */ daddu $a0, $s0, $zero -/* D61C30 80240730 27A50018 */ addiu $a1, $sp, 0x18 -/* D61C34 80240734 0C019D80 */ jal guMtxCatF -/* D61C38 80240738 00A0302D */ daddu $a2, $a1, $zero -/* D61C3C 8024073C 4405B000 */ mfc1 $a1, $f22 -/* D61C40 80240740 4406A000 */ mfc1 $a2, $f20 -/* D61C44 80240744 4407C000 */ mfc1 $a3, $f24 -/* D61C48 80240748 0200202D */ daddu $a0, $s0, $zero -/* D61C4C 8024074C 0C019EC8 */ jal guRotateF -/* D61C50 80240750 E7B40010 */ swc1 $f20, 0x10($sp) -/* D61C54 80240754 27A40018 */ addiu $a0, $sp, 0x18 -/* D61C58 80240758 0200282D */ daddu $a1, $s0, $zero -/* D61C5C 8024075C 0C019D80 */ jal guMtxCatF -/* D61C60 80240760 0080302D */ daddu $a2, $a0, $zero -/* D61C64 80240764 E7B40010 */ swc1 $f20, 0x10($sp) -/* D61C68 80240768 8E2500A8 */ lw $a1, 0xa8($s1) -/* D61C6C 8024076C 4406A000 */ mfc1 $a2, $f20 -/* D61C70 80240770 4407C000 */ mfc1 $a3, $f24 -/* D61C74 80240774 0C019EC8 */ jal guRotateF -/* D61C78 80240778 0200202D */ daddu $a0, $s0, $zero -/* D61C7C 8024077C 27A40018 */ addiu $a0, $sp, 0x18 -/* D61C80 80240780 0200282D */ daddu $a1, $s0, $zero -/* D61C84 80240784 0C019D80 */ jal guMtxCatF -/* D61C88 80240788 0080302D */ daddu $a2, $a0, $zero -/* D61C8C 8024078C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D61C90 80240790 3C013F36 */ lui $at, 0x3f36 -/* D61C94 80240794 3421DB6E */ ori $at, $at, 0xdb6e -/* D61C98 80240798 44810000 */ mtc1 $at, $f0 -/* D61C9C 8024079C 0200202D */ daddu $a0, $s0, $zero -/* D61CA0 802407A0 44050000 */ mfc1 $a1, $f0 -/* D61CA4 802407A4 3C06BF36 */ lui $a2, 0xbf36 -/* D61CA8 802407A8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D61CAC 802407AC 0C019DF0 */ jal guScaleF -/* D61CB0 802407B0 00A0382D */ daddu $a3, $a1, $zero -/* D61CB4 802407B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D61CB8 802407B8 0200282D */ daddu $a1, $s0, $zero -/* D61CBC 802407BC 0C019D80 */ jal guMtxCatF -/* D61CC0 802407C0 0080302D */ daddu $a2, $a0, $zero -/* D61CC4 802407C4 27B00058 */ addiu $s0, $sp, 0x58 -/* D61CC8 802407C8 8E250028 */ lw $a1, 0x28($s1) -/* D61CCC 802407CC C620002C */ lwc1 $f0, 0x2c($s1) -/* D61CD0 802407D0 8E270030 */ lw $a3, 0x30($s1) -/* D61CD4 802407D4 46000007 */ neg.s $f0, $f0 -/* D61CD8 802407D8 44060000 */ mfc1 $a2, $f0 -/* D61CDC 802407DC 0C019E40 */ jal guTranslateF -/* D61CE0 802407E0 0200202D */ daddu $a0, $s0, $zero -/* D61CE4 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D61CE8 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D61CEC 802407EC 0C019D80 */ jal guMtxCatF -/* D61CF0 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D61CF4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D61CF8 802407F8 3C0142B4 */ lui $at, 0x42b4 -/* D61CFC 802407FC 44810000 */ mtc1 $at, $f0 -/* D61D00 80240800 00000000 */ nop -/* D61D04 80240804 4602003E */ c.le.s $f0, $f2 -/* D61D08 80240808 00000000 */ nop -/* D61D0C 8024080C 4500000A */ bc1f .L80240838 -/* D61D10 80240810 24040001 */ addiu $a0, $zero, 1 -/* D61D14 80240814 3C014387 */ lui $at, 0x4387 -/* D61D18 80240818 44810000 */ mtc1 $at, $f0 -/* D61D1C 8024081C 00000000 */ nop -/* D61D20 80240820 4600103C */ c.lt.s $f2, $f0 -/* D61D24 80240824 00000000 */ nop -/* D61D28 80240828 45000004 */ bc1f .L8024083C -/* D61D2C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 -/* D61D30 80240830 3C041000 */ lui $a0, 0x1000 -/* D61D34 80240834 34840001 */ ori $a0, $a0, 1 -.L80240838: -/* D61D38 80240838 27A20018 */ addiu $v0, $sp, 0x18 -.L8024083C: -/* D61D3C 8024083C 0000282D */ daddu $a1, $zero, $zero -/* D61D40 80240840 00A0302D */ daddu $a2, $a1, $zero -/* D61D44 80240844 00A0382D */ daddu $a3, $a1, $zero -/* D61D48 80240848 0C0B7710 */ jal render_sprite -/* D61D4C 8024084C AFA20010 */ sw $v0, 0x10($sp) -/* D61D50 80240850 8FBF0120 */ lw $ra, 0x120($sp) -/* D61D54 80240854 8FB1011C */ lw $s1, 0x11c($sp) -/* D61D58 80240858 8FB00118 */ lw $s0, 0x118($sp) -/* D61D5C 8024085C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D61D60 80240860 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D61D64 80240864 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D61D68 80240868 03E00008 */ jr $ra -/* D61D6C 8024086C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_11/func_80240870_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/func_80240870_D61500.s deleted file mode 100644 index 8f786b524c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/func_80240870_D61500.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_D61D70 -/* D61D70 80240870 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D61D74 80240874 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D61D78 80240878 4480B000 */ mtc1 $zero, $f22 -/* D61D7C 8024087C AFB10134 */ sw $s1, 0x134($sp) -/* D61D80 80240880 0080882D */ daddu $s1, $a0, $zero -/* D61D84 80240884 AFB3013C */ sw $s3, 0x13c($sp) -/* D61D88 80240888 0000982D */ daddu $s3, $zero, $zero -/* D61D8C 8024088C AFB60148 */ sw $s6, 0x148($sp) -/* D61D90 80240890 3C16800B */ lui $s6, %hi(gCameras) -/* D61D94 80240894 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D61D98 80240898 AFB50144 */ sw $s5, 0x144($sp) -/* D61D9C 8024089C 241500FF */ addiu $s5, $zero, 0xff -/* D61DA0 802408A0 AFB00130 */ sw $s0, 0x130($sp) -/* D61DA4 802408A4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D61DA8 802408A8 AFB20138 */ sw $s2, 0x138($sp) -/* D61DAC 802408AC 27B20060 */ addiu $s2, $sp, 0x60 -/* D61DB0 802408B0 AFB40140 */ sw $s4, 0x140($sp) -/* D61DB4 802408B4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D61DB8 802408B8 AFBF014C */ sw $ra, 0x14c($sp) -/* D61DBC 802408BC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D61DC0 802408C0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D61DC4 802408C4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D61DC8 802408C8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D61DCC 802408CC F7B40150 */ sdc1 $f20, 0x150($sp) -.L802408D0: -/* D61DD0 802408D0 3C03800A */ lui $v1, 0x800a -/* D61DD4 802408D4 8463A634 */ lh $v1, -0x59cc($v1) -/* D61DD8 802408D8 00031080 */ sll $v0, $v1, 2 -/* D61DDC 802408DC 00431021 */ addu $v0, $v0, $v1 -/* D61DE0 802408E0 00021080 */ sll $v0, $v0, 2 -/* D61DE4 802408E4 00431023 */ subu $v0, $v0, $v1 -/* D61DE8 802408E8 000218C0 */ sll $v1, $v0, 3 -/* D61DEC 802408EC 00431021 */ addu $v0, $v0, $v1 -/* D61DF0 802408F0 000210C0 */ sll $v0, $v0, 3 -/* D61DF4 802408F4 00561021 */ addu $v0, $v0, $s6 -/* D61DF8 802408F8 C440006C */ lwc1 $f0, 0x6c($v0) -/* D61DFC 802408FC 16600065 */ bnez $s3, .L80240A94 -/* D61E00 80240900 46000507 */ neg.s $f20, $f0 -/* D61E04 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D61E08 80240908 3C0142B4 */ lui $at, 0x42b4 -/* D61E0C 8024090C 44810000 */ mtc1 $at, $f0 -/* D61E10 80240910 00000000 */ nop -/* D61E14 80240914 4602003C */ c.lt.s $f0, $f2 -/* D61E18 80240918 00000000 */ nop -/* D61E1C 8024091C 4500000A */ bc1f .L80240948 -/* D61E20 80240920 00000000 */ nop -/* D61E24 80240924 3C014334 */ lui $at, 0x4334 -/* D61E28 80240928 44812000 */ mtc1 $at, $f4 -/* D61E2C 8024092C 00000000 */ nop -/* D61E30 80240930 4604103E */ c.le.s $f2, $f4 -/* D61E34 80240934 00000000 */ nop -/* D61E38 80240938 45000003 */ bc1f .L80240948 -/* D61E3C 8024093C 00000000 */ nop -/* D61E40 80240940 08090276 */ j .L802409D8 -/* D61E44 80240944 46022501 */ sub.s $f20, $f4, $f2 -.L80240948: -/* D61E48 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D61E4C 8024094C 3C014334 */ lui $at, 0x4334 -/* D61E50 80240950 44812000 */ mtc1 $at, $f4 -/* D61E54 80240954 00000000 */ nop -/* D61E58 80240958 4600203C */ c.lt.s $f4, $f0 -/* D61E5C 8024095C 00000000 */ nop -/* D61E60 80240960 4500000C */ bc1f .L80240994 -/* D61E64 80240964 00000000 */ nop -/* D61E68 80240968 3C014387 */ lui $at, 0x4387 -/* D61E6C 8024096C 44812000 */ mtc1 $at, $f4 -/* D61E70 80240970 00000000 */ nop -/* D61E74 80240974 4604003E */ c.le.s $f0, $f4 -/* D61E78 80240978 00000000 */ nop -/* D61E7C 8024097C 45000008 */ bc1f .L802409A0 -/* D61E80 80240980 00000000 */ nop -/* D61E84 80240984 3C014334 */ lui $at, 0x4334 -/* D61E88 80240988 44812000 */ mtc1 $at, $f4 -/* D61E8C 8024098C 08090276 */ j .L802409D8 -/* D61E90 80240990 46040501 */ sub.s $f20, $f0, $f4 -.L80240994: -/* D61E94 80240994 3C014387 */ lui $at, 0x4387 -/* D61E98 80240998 44812000 */ mtc1 $at, $f4 -/* D61E9C 8024099C 00000000 */ nop -.L802409A0: -/* D61EA0 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D61EA4 802409A4 00000000 */ nop -/* D61EA8 802409A8 4500000A */ bc1f .L802409D4 -/* D61EAC 802409AC 00000000 */ nop -/* D61EB0 802409B0 3C0143B4 */ lui $at, 0x43b4 -/* D61EB4 802409B4 44811000 */ mtc1 $at, $f2 -/* D61EB8 802409B8 00000000 */ nop -/* D61EBC 802409BC 4602003E */ c.le.s $f0, $f2 -/* D61EC0 802409C0 00000000 */ nop -/* D61EC4 802409C4 45000003 */ bc1f .L802409D4 -/* D61EC8 802409C8 00000000 */ nop -/* D61ECC 802409CC 08090276 */ j .L802409D8 -/* D61ED0 802409D0 46001501 */ sub.s $f20, $f2, $f0 -.L802409D4: -/* D61ED4 802409D4 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L802409D8: -/* D61ED8 802409D8 3C0141C8 */ lui $at, 0x41c8 -/* D61EDC 802409DC 44810000 */ mtc1 $at, $f0 -/* D61EE0 802409E0 00000000 */ nop -/* D61EE4 802409E4 4600A003 */ div.s $f0, $f20, $f0 -/* D61EE8 802409E8 4600010D */ trunc.w.s $f4, $f0 -/* D61EEC 802409EC 44072000 */ mfc1 $a3, $f4 -/* D61EF0 802409F0 00000000 */ nop -/* D61EF4 802409F4 00071100 */ sll $v0, $a3, 4 -/* D61EF8 802409F8 00471023 */ subu $v0, $v0, $a3 -/* D61EFC 802409FC 00021080 */ sll $v0, $v0, 2 -/* D61F00 80240A00 02A23823 */ subu $a3, $s5, $v0 -/* D61F04 80240A04 28E20064 */ slti $v0, $a3, 0x64 -/* D61F08 80240A08 54400001 */ bnel $v0, $zero, .L80240A10 -/* D61F0C 80240A0C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A10: -/* D61F10 80240A10 24040001 */ addiu $a0, $zero, 1 -/* D61F14 80240A14 2405FFFF */ addiu $a1, $zero, -1 -/* D61F18 80240A18 24060006 */ addiu $a2, $zero, 6 -/* D61F1C 80240A1C AFA70010 */ sw $a3, 0x10($sp) -/* D61F20 80240A20 AFA70014 */ sw $a3, 0x14($sp) -/* D61F24 80240A24 AFB50018 */ sw $s5, 0x18($sp) -/* D61F28 80240A28 0C0B77B9 */ jal func_802DDEE4 -/* D61F2C 80240A2C AFA0001C */ sw $zero, 0x1c($sp) -/* D61F30 80240A30 4405A000 */ mfc1 $a1, $f20 -/* D61F34 80240A34 4406B000 */ mfc1 $a2, $f22 -/* D61F38 80240A38 3C07BF80 */ lui $a3, 0xbf80 -/* D61F3C 80240A3C 0200202D */ daddu $a0, $s0, $zero -/* D61F40 80240A40 0C019EC8 */ jal guRotateF -/* D61F44 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D61F48 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D61F4C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D61F50 80240A50 00000000 */ nop -/* D61F54 80240A54 44050000 */ mfc1 $a1, $f0 -/* D61F58 80240A58 4406B000 */ mfc1 $a2, $f22 -/* D61F5C 80240A5C 4407B000 */ mfc1 $a3, $f22 -/* D61F60 80240A60 3C013F80 */ lui $at, 0x3f80 -/* D61F64 80240A64 44812000 */ mtc1 $at, $f4 -/* D61F68 80240A68 27A40020 */ addiu $a0, $sp, 0x20 -/* D61F6C 80240A6C 0C019EC8 */ jal guRotateF -/* D61F70 80240A70 E7A40010 */ swc1 $f4, 0x10($sp) -/* D61F74 80240A74 0200202D */ daddu $a0, $s0, $zero -/* D61F78 80240A78 27A50020 */ addiu $a1, $sp, 0x20 -/* D61F7C 80240A7C 0C019D80 */ jal guMtxCatF -/* D61F80 80240A80 00A0302D */ daddu $a2, $a1, $zero -/* D61F84 80240A84 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D61F88 80240A88 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D61F8C 80240A8C 080902D6 */ j .L80240B58 -/* D61F90 80240A90 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240A94: -/* D61F94 80240A94 0260202D */ daddu $a0, $s3, $zero -/* D61F98 80240A98 27A50120 */ addiu $a1, $sp, 0x120 -/* D61F9C 80240A9C 27A60124 */ addiu $a2, $sp, 0x124 -/* D61FA0 80240AA0 0C03964E */ jal func_800E5938 -/* D61FA4 80240AA4 27A70128 */ addiu $a3, $sp, 0x128 -/* D61FA8 80240AA8 8FA60124 */ lw $a2, 0x124($sp) -/* D61FAC 80240AAC 3C028000 */ lui $v0, 0x8000 -/* D61FB0 80240AB0 14C20004 */ bne $a2, $v0, .L80240AC4 -/* D61FB4 80240AB4 46000606 */ mov.s $f24, $f0 -/* D61FB8 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D61FBC 80240ABC 080902B5 */ j .L80240AD4 -/* D61FC0 80240AC0 24040001 */ addiu $a0, $zero, 1 -.L80240AC4: -/* D61FC4 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D61FC8 80240AC8 00000000 */ nop -/* D61FCC 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D61FD0 80240AD0 24040001 */ addiu $a0, $zero, 1 -.L80240AD4: -/* D61FD4 80240AD4 2405FFFF */ addiu $a1, $zero, -1 -/* D61FD8 80240AD8 24060007 */ addiu $a2, $zero, 7 -/* D61FDC 80240ADC 0000382D */ daddu $a3, $zero, $zero -/* D61FE0 80240AE0 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D61FE4 80240AE4 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D61FE8 80240AE8 24020040 */ addiu $v0, $zero, 0x40 -/* D61FEC 80240AEC AFA00010 */ sw $zero, 0x10($sp) -/* D61FF0 80240AF0 AFA00014 */ sw $zero, 0x14($sp) -/* D61FF4 80240AF4 AFA20018 */ sw $v0, 0x18($sp) -/* D61FF8 80240AF8 0C0B77B9 */ jal func_802DDEE4 -/* D61FFC 80240AFC AFA0001C */ sw $zero, 0x1c($sp) -/* D62000 80240B00 4405A000 */ mfc1 $a1, $f20 -/* D62004 80240B04 4406B000 */ mfc1 $a2, $f22 -/* D62008 80240B08 3C07BF80 */ lui $a3, 0xbf80 -/* D6200C 80240B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* D62010 80240B10 0C019EC8 */ jal guRotateF -/* D62014 80240B14 E7B60010 */ swc1 $f22, 0x10($sp) -/* D62018 80240B18 4405A000 */ mfc1 $a1, $f20 -/* D6201C 80240B1C 4406B000 */ mfc1 $a2, $f22 -/* D62020 80240B20 3C07BF80 */ lui $a3, 0xbf80 -/* D62024 80240B24 0200202D */ daddu $a0, $s0, $zero -/* D62028 80240B28 0C019EC8 */ jal guRotateF -/* D6202C 80240B2C E7B60010 */ swc1 $f22, 0x10($sp) -/* D62030 80240B30 4405C000 */ mfc1 $a1, $f24 -/* D62034 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D62038 80240B38 3C073F80 */ lui $a3, 0x3f80 -/* D6203C 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D62040 80240B40 0C019EC8 */ jal guRotateF -/* D62044 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D62048 80240B48 0200202D */ daddu $a0, $s0, $zero -/* D6204C 80240B4C 27A50020 */ addiu $a1, $sp, 0x20 -/* D62050 80240B50 0C019D80 */ jal guMtxCatF -/* D62054 80240B54 00A0302D */ daddu $a2, $a1, $zero -.L80240B58: -/* D62058 80240B58 862200B0 */ lh $v0, 0xb0($s1) -/* D6205C 80240B5C 3C013F00 */ lui $at, 0x3f00 -/* D62060 80240B60 44812000 */ mtc1 $at, $f4 -/* D62064 80240B64 00021023 */ negu $v0, $v0 -/* D62068 80240B68 44820000 */ mtc1 $v0, $f0 -/* D6206C 80240B6C 00000000 */ nop -/* D62070 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* D62074 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D62078 80240B78 00000000 */ nop -/* D6207C 80240B7C 4405B000 */ mfc1 $a1, $f22 -/* D62080 80240B80 4407B000 */ mfc1 $a3, $f22 -/* D62084 80240B84 44062000 */ mfc1 $a2, $f4 -/* D62088 80240B88 0C019E40 */ jal guTranslateF -/* D6208C 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* D62090 80240B90 0240202D */ daddu $a0, $s2, $zero -/* D62094 80240B94 27A50020 */ addiu $a1, $sp, 0x20 -/* D62098 80240B98 0C019D80 */ jal guMtxCatF -/* D6209C 80240B9C 00A0302D */ daddu $a2, $a1, $zero -/* D620A0 80240BA0 4405A000 */ mfc1 $a1, $f20 -/* D620A4 80240BA4 4406B000 */ mfc1 $a2, $f22 -/* D620A8 80240BA8 3C073F80 */ lui $a3, 0x3f80 -/* D620AC 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* D620B0 80240BB0 0C019EC8 */ jal guRotateF -/* D620B4 80240BB4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D620B8 80240BB8 27A40020 */ addiu $a0, $sp, 0x20 -/* D620BC 80240BBC 0200282D */ daddu $a1, $s0, $zero -/* D620C0 80240BC0 0C019D80 */ jal guMtxCatF -/* D620C4 80240BC4 0080302D */ daddu $a2, $a0, $zero -/* D620C8 80240BC8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D620CC 80240BCC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D620D0 80240BD0 4406B000 */ mfc1 $a2, $f22 -/* D620D4 80240BD4 3C073F80 */ lui $a3, 0x3f80 -/* D620D8 80240BD8 0C019EC8 */ jal guRotateF -/* D620DC 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D620E0 80240BE0 27A40020 */ addiu $a0, $sp, 0x20 -/* D620E4 80240BE4 0200282D */ daddu $a1, $s0, $zero -/* D620E8 80240BE8 0C019D80 */ jal guMtxCatF -/* D620EC 80240BEC 0080302D */ daddu $a2, $a0, $zero -/* D620F0 80240BF0 862200B0 */ lh $v0, 0xb0($s1) -/* D620F4 80240BF4 3C013F00 */ lui $at, 0x3f00 -/* D620F8 80240BF8 44812000 */ mtc1 $at, $f4 -/* D620FC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D62100 80240C00 00000000 */ nop -/* D62104 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* D62108 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D6210C 80240C0C 00000000 */ nop -/* D62110 80240C10 4405B000 */ mfc1 $a1, $f22 -/* D62114 80240C14 4407B000 */ mfc1 $a3, $f22 -/* D62118 80240C18 44062000 */ mfc1 $a2, $f4 -/* D6211C 80240C1C 0C019E40 */ jal guTranslateF -/* D62120 80240C20 0240202D */ daddu $a0, $s2, $zero -/* D62124 80240C24 27A40020 */ addiu $a0, $sp, 0x20 -/* D62128 80240C28 0240282D */ daddu $a1, $s2, $zero -/* D6212C 80240C2C 0C019D80 */ jal guMtxCatF -/* D62130 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D62134 80240C34 3C013F36 */ lui $at, 0x3f36 -/* D62138 80240C38 3421DB6E */ ori $at, $at, 0xdb6e -/* D6213C 80240C3C 44810000 */ mtc1 $at, $f0 -/* D62140 80240C40 0280202D */ daddu $a0, $s4, $zero -/* D62144 80240C44 44050000 */ mfc1 $a1, $f0 -/* D62148 80240C48 3C06BF36 */ lui $a2, 0xbf36 -/* D6214C 80240C4C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D62150 80240C50 0C019DF0 */ jal guScaleF -/* D62154 80240C54 00A0382D */ daddu $a3, $a1, $zero -/* D62158 80240C58 27A40020 */ addiu $a0, $sp, 0x20 -/* D6215C 80240C5C 0280282D */ daddu $a1, $s4, $zero -/* D62160 80240C60 0C019D80 */ jal guMtxCatF -/* D62164 80240C64 0080302D */ daddu $a2, $a0, $zero -/* D62168 80240C68 4600D687 */ neg.s $f26, $f26 -/* D6216C 80240C6C 4405F000 */ mfc1 $a1, $f30 -/* D62170 80240C70 4407E000 */ mfc1 $a3, $f28 -/* D62174 80240C74 4406D000 */ mfc1 $a2, $f26 -/* D62178 80240C78 0C019E40 */ jal guTranslateF -/* D6217C 80240C7C 0240202D */ daddu $a0, $s2, $zero -/* D62180 80240C80 27A40020 */ addiu $a0, $sp, 0x20 -/* D62184 80240C84 0240282D */ daddu $a1, $s2, $zero -/* D62188 80240C88 0C019D80 */ jal guMtxCatF -/* D6218C 80240C8C 0080302D */ daddu $a2, $a0, $zero -/* D62190 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D62194 80240C94 3C0142B4 */ lui $at, 0x42b4 -/* D62198 80240C98 44810000 */ mtc1 $at, $f0 -/* D6219C 80240C9C 00000000 */ nop -/* D621A0 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D621A4 80240CA4 00000000 */ nop -/* D621A8 80240CA8 4500000A */ bc1f .L80240CD4 -/* D621AC 80240CAC 24040001 */ addiu $a0, $zero, 1 -/* D621B0 80240CB0 3C014387 */ lui $at, 0x4387 -/* D621B4 80240CB4 44812000 */ mtc1 $at, $f4 -/* D621B8 80240CB8 00000000 */ nop -/* D621BC 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D621C0 80240CC0 00000000 */ nop -/* D621C4 80240CC4 45000004 */ bc1f .L80240CD8 -/* D621C8 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 -/* D621CC 80240CCC 3C041000 */ lui $a0, 0x1000 -/* D621D0 80240CD0 34840001 */ ori $a0, $a0, 1 -.L80240CD4: -/* D621D4 80240CD4 27A20020 */ addiu $v0, $sp, 0x20 -.L80240CD8: -/* D621D8 80240CD8 AFA20010 */ sw $v0, 0x10($sp) -/* D621DC 80240CDC 0000282D */ daddu $a1, $zero, $zero -/* D621E0 80240CE0 00A0302D */ daddu $a2, $a1, $zero -/* D621E4 80240CE4 0C0B7710 */ jal render_sprite -/* D621E8 80240CE8 00A0382D */ daddu $a3, $a1, $zero -/* D621EC 80240CEC 26730001 */ addiu $s3, $s3, 1 -/* D621F0 80240CF0 2A620002 */ slti $v0, $s3, 2 -/* D621F4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D621F8 80240CF8 00000000 */ nop -/* D621FC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) -/* D62200 80240D00 8FB60148 */ lw $s6, 0x148($sp) -/* D62204 80240D04 8FB50144 */ lw $s5, 0x144($sp) -/* D62208 80240D08 8FB40140 */ lw $s4, 0x140($sp) -/* D6220C 80240D0C 8FB3013C */ lw $s3, 0x13c($sp) -/* D62210 80240D10 8FB20138 */ lw $s2, 0x138($sp) -/* D62214 80240D14 8FB10134 */ lw $s1, 0x134($sp) -/* D62218 80240D18 8FB00130 */ lw $s0, 0x130($sp) -/* D6221C 80240D1C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D62220 80240D20 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D62224 80240D24 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D62228 80240D28 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D6222C 80240D2C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D62230 80240D30 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D62234 80240D34 03E00008 */ jr $ra -/* D62238 80240D38 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_11/func_80240D3C_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/func_80240D3C_D61500.s deleted file mode 100644 index af766d8f74..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/func_80240D3C_D61500.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_D6223C -/* D6223C 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D62240 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D62244 80240D44 0080802D */ daddu $s0, $a0, $zero -/* D62248 80240D48 AFBF0014 */ sw $ra, 0x14($sp) -/* D6224C 80240D4C 8E020088 */ lw $v0, 0x88($s0) -/* D62250 80240D50 14400017 */ bnez $v0, .L80240DB0 -/* D62254 80240D54 24020001 */ addiu $v0, $zero, 1 -/* D62258 80240D58 8E030084 */ lw $v1, 0x84($s0) -/* D6225C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D62260 80240D60 00000000 */ nop -/* D62264 80240D64 28620002 */ slti $v0, $v1, 2 -/* D62268 80240D68 50400005 */ beql $v0, $zero, .L80240D80 -/* D6226C 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* D62270 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D62274 80240D74 00000000 */ nop -/* D62278 80240D78 08090378 */ j .L80240DE0 -/* D6227C 80240D7C 00000000 */ nop -.L80240D80: -/* D62280 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D62284 80240D84 00000000 */ nop -/* D62288 80240D88 08090378 */ j .L80240DE0 -/* D6228C 80240D8C 00000000 */ nop -.L80240D90: -/* D62290 80240D90 3C048024 */ lui $a0, 0x8024 -/* D62294 80240D94 24840E84 */ addiu $a0, $a0, 0xe84 -/* D62298 80240D98 08090374 */ j .L80240DD0 -/* D6229C 80240D9C 00000000 */ nop -.L80240DA0: -/* D622A0 80240DA0 3C048024 */ lui $a0, 0x8024 -/* D622A4 80240DA4 24840EEC */ addiu $a0, $a0, 0xeec -/* D622A8 80240DA8 08090374 */ j .L80240DD0 -/* D622AC 80240DAC 00000000 */ nop -.L80240DB0: -/* D622B0 80240DB0 8E020084 */ lw $v0, 0x84($s0) -/* D622B4 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D622B8 80240DB8 00000000 */ nop -/* D622BC 80240DBC 28420002 */ slti $v0, $v0, 2 -/* D622C0 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D622C4 80240DC4 00000000 */ nop -.L80240DC8: -/* D622C8 80240DC8 3C048024 */ lui $a0, 0x8024 -/* D622CC 80240DCC 24840EB8 */ addiu $a0, $a0, 0xeb8 -.L80240DD0: -/* D622D0 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 -/* D622D4 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* D622D8 80240DD8 8E03013C */ lw $v1, 0x13c($s0) -/* D622DC 80240DDC AC620004 */ sw $v0, 4($v1) -.L80240DE0: -/* D622E0 80240DE0 0C00EAD2 */ jal get_npc_safe -/* D622E4 80240DE4 2404FFFC */ addiu $a0, $zero, -4 -/* D622E8 80240DE8 0040282D */ daddu $a1, $v0, $zero -/* D622EC 80240DEC 10A00021 */ beqz $a1, .L80240E74 -/* D622F0 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* D622F4 80240DF4 8E020088 */ lw $v0, 0x88($s0) -/* D622F8 80240DF8 14400014 */ bnez $v0, .L80240E4C -/* D622FC 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* D62300 80240E00 8E040084 */ lw $a0, 0x84($s0) -/* D62304 80240E04 10820016 */ beq $a0, $v0, .L80240E60 -/* D62308 80240E08 28820002 */ slti $v0, $a0, 2 -/* D6230C 80240E0C 10400005 */ beqz $v0, .L80240E24 -/* D62310 80240E10 24020002 */ addiu $v0, $zero, 2 -/* D62314 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D62318 80240E18 00000000 */ nop -/* D6231C 80240E1C 0809039D */ j .L80240E74 -/* D62320 80240E20 00000000 */ nop -.L80240E24: -/* D62324 80240E24 10820006 */ beq $a0, $v0, .L80240E40 -/* D62328 80240E28 24020002 */ addiu $v0, $zero, 2 -/* D6232C 80240E2C 0809039D */ j .L80240E74 -/* D62330 80240E30 00000000 */ nop -.L80240E34: -/* D62334 80240E34 8CA20000 */ lw $v0, ($a1) -/* D62338 80240E38 0809039A */ j .L80240E68 -/* D6233C 80240E3C 3C03000A */ lui $v1, 0xa -.L80240E40: -/* D62340 80240E40 8CA20000 */ lw $v0, ($a1) -/* D62344 80240E44 0809039A */ j .L80240E68 -/* D62348 80240E48 3C030002 */ lui $v1, 2 -.L80240E4C: -/* D6234C 80240E4C 8E020084 */ lw $v0, 0x84($s0) -/* D62350 80240E50 04400007 */ bltz $v0, .L80240E70 -/* D62354 80240E54 28420002 */ slti $v0, $v0, 2 -/* D62358 80240E58 10400006 */ beqz $v0, .L80240E74 -/* D6235C 80240E5C 24020002 */ addiu $v0, $zero, 2 -.L80240E60: -/* D62360 80240E60 8CA20000 */ lw $v0, ($a1) -/* D62364 80240E64 3C030008 */ lui $v1, 8 -.L80240E68: -/* D62368 80240E68 00431025 */ or $v0, $v0, $v1 -/* D6236C 80240E6C ACA20000 */ sw $v0, ($a1) -.L80240E70: -/* D62370 80240E70 24020002 */ addiu $v0, $zero, 2 -.L80240E74: -/* D62374 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* D62378 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* D6237C 80240E7C 03E00008 */ jr $ra -/* D62380 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_11/func_80240E84_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/func_80240E84_D61500.s deleted file mode 100644 index 8bff1ad940..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/func_80240E84_D61500.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D62384 -/* D62384 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D62388 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D6238C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D62390 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D62394 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D62398 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D6239C 80240E9C 3C03000A */ lui $v1, 0xa -/* D623A0 80240EA0 8C820000 */ lw $v0, ($a0) -/* D623A4 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D623A8 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D623AC 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D623B0 80240EB0 03E00008 */ jr $ra -/* D623B4 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_11/func_80240EB8_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/func_80240EB8_D61500.s deleted file mode 100644 index a8347c5c70..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/func_80240EB8_D61500.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D623B8 -/* D623B8 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D623BC 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D623C0 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D623C4 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D623C8 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D623CC 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D623D0 80240ED0 3C030008 */ lui $v1, 8 -/* D623D4 80240ED4 8C820000 */ lw $v0, ($a0) -/* D623D8 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D623DC 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D623E0 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D623E4 80240EE4 03E00008 */ jr $ra -/* D623E8 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_11/func_80240EEC_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/func_80240EEC_D61500.s deleted file mode 100644 index 1ca7cb6a0d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/func_80240EEC_D61500.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D623EC -/* D623EC 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D623F0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D623F4 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D623F8 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D623FC 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D62400 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D62404 80240F04 3C030002 */ lui $v1, 2 -/* D62408 80240F08 8C820000 */ lw $v0, ($a0) -/* D6240C 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D62410 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D62414 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D62418 80240F18 03E00008 */ jr $ra -/* D6241C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_11/func_80240F20_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/func_80240F20_D61500.s deleted file mode 100644 index db83b53464..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/func_80240F20_D61500.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D62420 -/* D62420 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D62424 80240F24 AFB00010 */ sw $s0, 0x10($sp) -/* D62428 80240F28 3C108024 */ lui $s0, 0x8024 -/* D6242C 80240F2C 26101610 */ addiu $s0, $s0, 0x1610 -/* D62430 80240F30 AFBF0018 */ sw $ra, 0x18($sp) -/* D62434 80240F34 AFB10014 */ sw $s1, 0x14($sp) -/* D62438 80240F38 8E020000 */ lw $v0, ($s0) -/* D6243C 80240F3C 14400010 */ bnez $v0, .L80240F80 -/* D62440 80240F40 0080882D */ daddu $s1, $a0, $zero -/* D62444 80240F44 0C00AB39 */ jal heap_malloc -/* D62448 80240F48 24040040 */ addiu $a0, $zero, 0x40 -/* D6244C 80240F4C AE020000 */ sw $v0, ($s0) -/* D62450 80240F50 0000182D */ daddu $v1, $zero, $zero -/* D62454 80240F54 0040282D */ daddu $a1, $v0, $zero -/* D62458 80240F58 0220202D */ daddu $a0, $s1, $zero -.L80240F5C: -/* D6245C 80240F5C 8C820084 */ lw $v0, 0x84($a0) -/* D62460 80240F60 24840004 */ addiu $a0, $a0, 4 -/* D62464 80240F64 24630001 */ addiu $v1, $v1, 1 -/* D62468 80240F68 ACA20000 */ sw $v0, ($a1) -/* D6246C 80240F6C 28620010 */ slti $v0, $v1, 0x10 -/* D62470 80240F70 1440FFFA */ bnez $v0, .L80240F5C -/* D62474 80240F74 24A50004 */ addiu $a1, $a1, 4 -/* D62478 80240F78 080903EF */ j .L80240FBC -/* D6247C 80240F7C 00000000 */ nop -.L80240F80: -/* D62480 80240F80 0000182D */ daddu $v1, $zero, $zero -/* D62484 80240F84 0040282D */ daddu $a1, $v0, $zero -/* D62488 80240F88 0220202D */ daddu $a0, $s1, $zero -.L80240F8C: -/* D6248C 80240F8C 8CA20000 */ lw $v0, ($a1) -/* D62490 80240F90 24A50004 */ addiu $a1, $a1, 4 -/* D62494 80240F94 24630001 */ addiu $v1, $v1, 1 -/* D62498 80240F98 AC820084 */ sw $v0, 0x84($a0) -/* D6249C 80240F9C 28620010 */ slti $v0, $v1, 0x10 -/* D624A0 80240FA0 1440FFFA */ bnez $v0, .L80240F8C -/* D624A4 80240FA4 24840004 */ addiu $a0, $a0, 4 -/* D624A8 80240FA8 3C108024 */ lui $s0, 0x8024 -/* D624AC 80240FAC 26101610 */ addiu $s0, $s0, 0x1610 -/* D624B0 80240FB0 0C00AB4B */ jal heap_free -/* D624B4 80240FB4 8E040000 */ lw $a0, ($s0) -/* D624B8 80240FB8 AE000000 */ sw $zero, ($s0) -.L80240FBC: -/* D624BC 80240FBC 8FBF0018 */ lw $ra, 0x18($sp) -/* D624C0 80240FC0 8FB10014 */ lw $s1, 0x14($sp) -/* D624C4 80240FC4 8FB00010 */ lw $s0, 0x10($sp) -/* D624C8 80240FC8 24020002 */ addiu $v0, $zero, 2 -/* D624CC 80240FCC 03E00008 */ jr $ra -/* D624D0 80240FD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_11/func_80240FD4_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/func_80240FD4_D61500.s deleted file mode 100644 index 8b4d9e795f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/func_80240FD4_D61500.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD4_D624D4 -/* D624D4 80240FD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D624D8 80240FD8 AFB00010 */ sw $s0, 0x10($sp) -/* D624DC 80240FDC 0080802D */ daddu $s0, $a0, $zero -/* D624E0 80240FE0 AFBF0018 */ sw $ra, 0x18($sp) -/* D624E4 80240FE4 AFB10014 */ sw $s1, 0x14($sp) -/* D624E8 80240FE8 8E02000C */ lw $v0, 0xc($s0) -/* D624EC 80240FEC 8C510000 */ lw $s1, ($v0) -/* D624F0 80240FF0 0C0B1EAF */ jal get_variable -/* D624F4 80240FF4 0220282D */ daddu $a1, $s1, $zero -/* D624F8 80240FF8 3C03FFF0 */ lui $v1, 0xfff0 -/* D624FC 80240FFC 3463FFFF */ ori $v1, $v1, 0xffff -/* D62500 80241000 0200202D */ daddu $a0, $s0, $zero -/* D62504 80241004 00431024 */ and $v0, $v0, $v1 -/* D62508 80241008 00021140 */ sll $v0, $v0, 5 -/* D6250C 8024100C 3C068008 */ lui $a2, %hi(gItemTable) -/* D62510 80241010 00C23021 */ addu $a2, $a2, $v0 -/* D62514 80241014 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D62518 80241018 0C0B2026 */ jal set_variable -/* D6251C 8024101C 0220282D */ daddu $a1, $s1, $zero -/* D62520 80241020 8FBF0018 */ lw $ra, 0x18($sp) -/* D62524 80241024 8FB10014 */ lw $s1, 0x14($sp) -/* D62528 80241028 8FB00010 */ lw $s0, 0x10($sp) -/* D6252C 8024102C 24020002 */ addiu $v0, $zero, 2 -/* D62530 80241030 03E00008 */ jr $ra -/* D62534 80241034 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_11/func_80241038_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/func_80241038_D61500.s deleted file mode 100644 index 7f8fab66e1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/func_80241038_D61500.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_11/func_80241188_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/func_80241188_D61500.s deleted file mode 100644 index aee5e60fe3..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/func_80241188_D61500.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241188_D62688 -/* D62688 80241188 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6268C 8024118C AFB00010 */ sw $s0, 0x10($sp) -/* D62690 80241190 0080802D */ daddu $s0, $a0, $zero -/* D62694 80241194 AFBF0014 */ sw $ra, 0x14($sp) -/* D62698 80241198 8E02000C */ lw $v0, 0xc($s0) -/* D6269C 8024119C 0C0B1EAF */ jal get_variable -/* D626A0 802411A0 8C450000 */ lw $a1, ($v0) -/* D626A4 802411A4 00021140 */ sll $v0, $v0, 5 -/* D626A8 802411A8 AE000084 */ sw $zero, 0x84($s0) -/* D626AC 802411AC 3C018008 */ lui $at, 0x8008 -/* D626B0 802411B0 00220821 */ addu $at, $at, $v0 -/* D626B4 802411B4 942278F8 */ lhu $v0, 0x78f8($at) -/* D626B8 802411B8 30420040 */ andi $v0, $v0, 0x40 -/* D626BC 802411BC 10400002 */ beqz $v0, .L802411C8 -/* D626C0 802411C0 24020001 */ addiu $v0, $zero, 1 -/* D626C4 802411C4 AE020084 */ sw $v0, 0x84($s0) -.L802411C8: -/* D626C8 802411C8 8FBF0014 */ lw $ra, 0x14($sp) -/* D626CC 802411CC 8FB00010 */ lw $s0, 0x10($sp) -/* D626D0 802411D0 24020002 */ addiu $v0, $zero, 2 -/* D626D4 802411D4 03E00008 */ jr $ra -/* D626D8 802411D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* D626DC 802411DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_12/func_80240050_D62D10.s b/asm/nonmatchings/world/area_pra/pra_12/func_80240050_D62D10.s deleted file mode 100644 index 7b8ead6925..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/func_80240050_D62D10.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D62D60 -/* D62D60 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D62D64 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D62D68 80240058 00822024 */ and $a0, $a0, $v0 -/* D62D6C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D62D70 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D62D74 80240064 00821821 */ addu $v1, $a0, $v0 -/* D62D78 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D62D7C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D62D80 80240070 30620001 */ andi $v0, $v1, 1 -/* D62D84 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D62D88 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D62D8C 8024007C 03E00008 */ jr $ra -/* D62D90 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_12/func_80240084_D62D10.s b/asm/nonmatchings/world/area_pra/pra_12/func_80240084_D62D10.s deleted file mode 100644 index b8c94c65e4..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/func_80240084_D62D10.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240084_D62D94 -/* D62D94 80240084 00041403 */ sra $v0, $a0, 0x10 -/* D62D98 80240088 304300FF */ andi $v1, $v0, 0xff -/* D62D9C 8024008C 24020006 */ addiu $v0, $zero, 6 -/* D62DA0 80240090 10620015 */ beq $v1, $v0, .L802400E8 -/* D62DA4 80240094 28620007 */ slti $v0, $v1, 7 -/* D62DA8 80240098 10400005 */ beqz $v0, .L802400B0 -/* D62DAC 8024009C 24020001 */ addiu $v0, $zero, 1 -/* D62DB0 802400A0 1062000A */ beq $v1, $v0, .L802400CC -/* D62DB4 802400A4 3C020100 */ lui $v0, 0x100 -/* D62DB8 802400A8 03E00008 */ jr $ra -/* D62DBC 802400AC 00821025 */ or $v0, $a0, $v0 -.L802400B0: -/* D62DC0 802400B0 2862000A */ slti $v0, $v1, 0xa -/* D62DC4 802400B4 10400016 */ beqz $v0, .L80240110 -/* D62DC8 802400B8 28620008 */ slti $v0, $v1, 8 -/* D62DCC 802400BC 14400015 */ bnez $v0, .L80240114 -/* D62DD0 802400C0 3C020100 */ lui $v0, 0x100 -/* D62DD4 802400C4 03E00008 */ jr $ra -/* D62DD8 802400C8 0080102D */ daddu $v0, $a0, $zero -.L802400CC: -/* D62DDC 802400CC 3C020001 */ lui $v0, 1 -/* D62DE0 802400D0 3442000C */ ori $v0, $v0, 0xc -/* D62DE4 802400D4 0044102A */ slt $v0, $v0, $a0 -/* D62DE8 802400D8 1040000E */ beqz $v0, .L80240114 -/* D62DEC 802400DC 3C020100 */ lui $v0, 0x100 -.L802400E0: -/* D62DF0 802400E0 03E00008 */ jr $ra -/* D62DF4 802400E4 0080102D */ daddu $v0, $a0, $zero -.L802400E8: -/* D62DF8 802400E8 3C02FFF9 */ lui $v0, 0xfff9 -/* D62DFC 802400EC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D62E00 802400F0 00821821 */ addu $v1, $a0, $v0 -/* D62E04 802400F4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D62E08 802400F8 10400005 */ beqz $v0, .L80240110 -/* D62E0C 802400FC 30620001 */ andi $v0, $v1, 1 -/* D62E10 80240100 1440FFF7 */ bnez $v0, .L802400E0 -/* D62E14 80240104 24820001 */ addiu $v0, $a0, 1 -/* D62E18 80240108 03E00008 */ jr $ra -/* D62E1C 8024010C 00000000 */ nop -.L80240110: -/* D62E20 80240110 3C020100 */ lui $v0, 0x100 -.L80240114: -/* D62E24 80240114 03E00008 */ jr $ra -/* D62E28 80240118 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_12/func_8024011C_D62D10.s b/asm/nonmatchings/world/area_pra/pra_12/func_8024011C_D62D10.s deleted file mode 100644 index aa7e658b6f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/func_8024011C_D62D10.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024011C_D62E2C -/* D62E2C 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D62E30 80240120 AFB00010 */ sw $s0, 0x10($sp) -/* D62E34 80240124 0080802D */ daddu $s0, $a0, $zero -/* D62E38 80240128 3C058024 */ lui $a1, 0x8024 -/* D62E3C 8024012C 24A50158 */ addiu $a1, $a1, 0x158 -/* D62E40 80240130 AFBF0014 */ sw $ra, 0x14($sp) -/* D62E44 80240134 0C048C56 */ jal bind_dynamic_entity_3 -/* D62E48 80240138 0000202D */ daddu $a0, $zero, $zero -/* D62E4C 8024013C 8E03013C */ lw $v1, 0x13c($s0) -/* D62E50 80240140 AC620000 */ sw $v0, ($v1) -/* D62E54 80240144 8FBF0014 */ lw $ra, 0x14($sp) -/* D62E58 80240148 8FB00010 */ lw $s0, 0x10($sp) -/* D62E5C 8024014C 24020002 */ addiu $v0, $zero, 2 -/* D62E60 80240150 03E00008 */ jr $ra -/* D62E64 80240154 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_12/func_80240158_D62D10.s b/asm/nonmatchings/world/area_pra/pra_12/func_80240158_D62D10.s deleted file mode 100644 index b2e9243f49..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/func_80240158_D62D10.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_D62E68 -/* D62E68 80240158 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D62E6C 8024015C AFB00040 */ sw $s0, 0x40($sp) -/* D62E70 80240160 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D62E74 80240164 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D62E78 80240168 AFB20048 */ sw $s2, 0x48($sp) -/* D62E7C 8024016C AFBF004C */ sw $ra, 0x4c($sp) -/* D62E80 80240170 AFB10044 */ sw $s1, 0x44($sp) -/* D62E84 80240174 8E020000 */ lw $v0, ($s0) -/* D62E88 80240178 821100BE */ lb $s1, 0xbe($s0) -/* D62E8C 8024017C 30420001 */ andi $v0, $v0, 1 -/* D62E90 80240180 10400061 */ beqz $v0, .L80240308 -/* D62E94 80240184 27B20020 */ addiu $s2, $sp, 0x20 -/* D62E98 80240188 8E0400CC */ lw $a0, 0xcc($s0) -/* D62E9C 8024018C 0C044181 */ jal get_shadow_by_index -/* D62EA0 80240190 00000000 */ nop -/* D62EA4 80240194 0C048B77 */ jal func_80122DDC -/* D62EA8 80240198 84440008 */ lh $a0, 8($v0) -/* D62EAC 8024019C 8C430000 */ lw $v1, ($v0) -/* D62EB0 802401A0 34630200 */ ori $v1, $v1, 0x200 -/* D62EB4 802401A4 AC430000 */ sw $v1, ($v0) -/* D62EB8 802401A8 8E050028 */ lw $a1, 0x28($s0) -/* D62EBC 802401AC 8E06002C */ lw $a2, 0x2c($s0) -/* D62EC0 802401B0 27A20030 */ addiu $v0, $sp, 0x30 -/* D62EC4 802401B4 AFA20010 */ sw $v0, 0x10($sp) -/* D62EC8 802401B8 27A20034 */ addiu $v0, $sp, 0x34 -/* D62ECC 802401BC AFA20014 */ sw $v0, 0x14($sp) -/* D62ED0 802401C0 C6000030 */ lwc1 $f0, 0x30($s0) -/* D62ED4 802401C4 3C04800A */ lui $a0, 0x800a -/* D62ED8 802401C8 8484A634 */ lh $a0, -0x59cc($a0) -/* D62EDC 802401CC 46000007 */ neg.s $f0, $f0 -/* D62EE0 802401D0 44070000 */ mfc1 $a3, $f0 -/* D62EE4 802401D4 27A20038 */ addiu $v0, $sp, 0x38 -/* D62EE8 802401D8 0C00B94E */ jal get_screen_coords -/* D62EEC 802401DC AFA20018 */ sw $v0, 0x18($sp) -/* D62EF0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D62EF4 802401E4 0C090014 */ jal func_80240050 -/* D62EF8 802401E8 00000000 */ nop -/* D62EFC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) -/* D62F00 802401F0 3C014307 */ lui $at, 0x4307 -/* D62F04 802401F4 44810000 */ mtc1 $at, $f0 -/* D62F08 802401F8 00000000 */ nop -/* D62F0C 802401FC 4602003C */ c.lt.s $f0, $f2 -/* D62F10 80240200 00000000 */ nop -/* D62F14 80240204 4500000B */ bc1f .L80240234 -/* D62F18 80240208 24040002 */ addiu $a0, $zero, 2 -/* D62F1C 8024020C 3C014361 */ lui $at, 0x4361 -/* D62F20 80240210 44810000 */ mtc1 $at, $f0 -/* D62F24 80240214 00000000 */ nop -/* D62F28 80240218 4600103C */ c.lt.s $f2, $f0 -/* D62F2C 8024021C 00000000 */ nop -/* D62F30 80240220 45000004 */ bc1f .L80240234 -/* D62F34 80240224 00000000 */ nop -/* D62F38 80240228 0C090021 */ jal func_80240084 -/* D62F3C 8024022C 0040202D */ daddu $a0, $v0, $zero -/* D62F40 80240230 24040002 */ addiu $a0, $zero, 2 -.L80240234: -/* D62F44 80240234 3C063F80 */ lui $a2, 0x3f80 -/* D62F48 80240238 0C0B76A3 */ jal func_802DDA8C -/* D62F4C 8024023C 0040282D */ daddu $a1, $v0, $zero -/* D62F50 80240240 8E020000 */ lw $v0, ($s0) -/* D62F54 80240244 3C030002 */ lui $v1, 2 -/* D62F58 80240248 00431024 */ and $v0, $v0, $v1 -/* D62F5C 8024024C 54400022 */ bnel $v0, $zero, .L802402D8 -/* D62F60 80240250 24110011 */ addiu $s1, $zero, 0x11 -/* D62F64 80240254 9203000E */ lbu $v1, 0xe($s0) -/* D62F68 80240258 3C02802E */ lui $v0, 0x802e -/* D62F6C 8024025C 90429D70 */ lbu $v0, -0x6290($v0) -/* D62F70 80240260 10620018 */ beq $v1, $v0, .L802402C4 -/* D62F74 80240264 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D62F78 80240268 1040000B */ beqz $v0, .L80240298 -/* D62F7C 8024026C 24110011 */ addiu $s1, $zero, 0x11 -/* D62F80 80240270 24040002 */ addiu $a0, $zero, 2 -/* D62F84 80240274 2405FFFF */ addiu $a1, $zero, -1 -/* D62F88 80240278 24060007 */ addiu $a2, $zero, 7 -/* D62F8C 8024027C 0060102D */ daddu $v0, $v1, $zero -/* D62F90 80240280 0000382D */ daddu $a3, $zero, $zero -/* D62F94 80240284 AFA00010 */ sw $zero, 0x10($sp) -/* D62F98 80240288 AFA00014 */ sw $zero, 0x14($sp) -/* D62F9C 8024028C AFA0001C */ sw $zero, 0x1c($sp) -/* D62FA0 80240290 080900AF */ j .L802402BC -/* D62FA4 80240294 AFA20018 */ sw $v0, 0x18($sp) -.L80240298: -/* D62FA8 80240298 2411000D */ addiu $s1, $zero, 0xd -/* D62FAC 8024029C 24040002 */ addiu $a0, $zero, 2 -/* D62FB0 802402A0 2405FFFF */ addiu $a1, $zero, -1 -/* D62FB4 802402A4 0000302D */ daddu $a2, $zero, $zero -/* D62FB8 802402A8 00C0382D */ daddu $a3, $a2, $zero -/* D62FBC 802402AC AFA00010 */ sw $zero, 0x10($sp) -/* D62FC0 802402B0 AFA00014 */ sw $zero, 0x14($sp) -/* D62FC4 802402B4 AFA00018 */ sw $zero, 0x18($sp) -/* D62FC8 802402B8 AFA0001C */ sw $zero, 0x1c($sp) -.L802402BC: -/* D62FCC 802402BC 0C0B77B9 */ jal func_802DDEE4 -/* D62FD0 802402C0 00000000 */ nop -.L802402C4: -/* D62FD4 802402C4 9202000E */ lbu $v0, 0xe($s0) -/* D62FD8 802402C8 3C01802E */ lui $at, 0x802e -/* D62FDC 802402CC A0229D70 */ sb $v0, -0x6290($at) -/* D62FE0 802402D0 080900B9 */ j .L802402E4 -/* D62FE4 802402D4 0240202D */ daddu $a0, $s2, $zero -.L802402D8: -/* D62FE8 802402D8 3C01802E */ lui $at, 0x802e -/* D62FEC 802402DC A0209D70 */ sb $zero, -0x6290($at) -/* D62FF0 802402E0 0240202D */ daddu $a0, $s2, $zero -.L802402E4: -/* D62FF4 802402E4 AC910000 */ sw $s1, ($a0) -/* D62FF8 802402E8 AC900008 */ sw $s0, 8($a0) -/* D62FFC 802402EC 8FA20038 */ lw $v0, 0x38($sp) -/* D63000 802402F0 3C038024 */ lui $v1, 0x8024 -/* D63004 802402F4 24630320 */ addiu $v1, $v1, 0x320 -/* D63008 802402F8 AC83000C */ sw $v1, 0xc($a0) -/* D6300C 802402FC 00021023 */ negu $v0, $v0 -/* D63010 80240300 0C047644 */ jal queue_render_task -/* D63014 80240304 AC820004 */ sw $v0, 4($a0) -.L80240308: -/* D63018 80240308 8FBF004C */ lw $ra, 0x4c($sp) -/* D6301C 8024030C 8FB20048 */ lw $s2, 0x48($sp) -/* D63020 80240310 8FB10044 */ lw $s1, 0x44($sp) -/* D63024 80240314 8FB00040 */ lw $s0, 0x40($sp) -/* D63028 80240318 03E00008 */ jr $ra -/* D6302C 8024031C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_12/func_80240320_D62D10.s b/asm/nonmatchings/world/area_pra/pra_12/func_80240320_D62D10.s deleted file mode 100644 index 332bcbb344..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/func_80240320_D62D10.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240320_D63030 -/* D63030 80240320 3C03800A */ lui $v1, 0x800a -/* D63034 80240324 8463A634 */ lh $v1, -0x59cc($v1) -/* D63038 80240328 3C07BF80 */ lui $a3, 0xbf80 -/* D6303C 8024032C 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D63040 80240330 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D63044 80240334 4480A000 */ mtc1 $zero, $f20 -/* D63048 80240338 AFB1011C */ sw $s1, 0x11c($sp) -/* D6304C 8024033C 0080882D */ daddu $s1, $a0, $zero -/* D63050 80240340 AFB00118 */ sw $s0, 0x118($sp) -/* D63054 80240344 27B00098 */ addiu $s0, $sp, 0x98 -/* D63058 80240348 AFBF0120 */ sw $ra, 0x120($sp) -/* D6305C 8024034C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D63060 80240350 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D63064 80240354 00031080 */ sll $v0, $v1, 2 -/* D63068 80240358 00431021 */ addu $v0, $v0, $v1 -/* D6306C 8024035C 00021080 */ sll $v0, $v0, 2 -/* D63070 80240360 00431023 */ subu $v0, $v0, $v1 -/* D63074 80240364 000218C0 */ sll $v1, $v0, 3 -/* D63078 80240368 00431021 */ addu $v0, $v0, $v1 -/* D6307C 8024036C 000210C0 */ sll $v0, $v0, 3 -/* D63080 80240370 3C01800B */ lui $at, 0x800b -/* D63084 80240374 00220821 */ addu $at, $at, $v0 -/* D63088 80240378 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D6308C 8024037C 4406A000 */ mfc1 $a2, $f20 -/* D63090 80240380 4600B587 */ neg.s $f22, $f22 -/* D63094 80240384 4405B000 */ mfc1 $a1, $f22 -/* D63098 80240388 0200202D */ daddu $a0, $s0, $zero -/* D6309C 8024038C 0C019EC8 */ jal guRotateF -/* D630A0 80240390 E7B40010 */ swc1 $f20, 0x10($sp) -/* D630A4 80240394 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D630A8 80240398 0C00A6C9 */ jal clamp_angle -/* D630AC 8024039C 00000000 */ nop -/* D630B0 802403A0 44050000 */ mfc1 $a1, $f0 -/* D630B4 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D630B8 802403A8 4407A000 */ mfc1 $a3, $f20 -/* D630BC 802403AC 3C013F80 */ lui $at, 0x3f80 -/* D630C0 802403B0 4481C000 */ mtc1 $at, $f24 -/* D630C4 802403B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D630C8 802403B8 0C019EC8 */ jal guRotateF -/* D630CC 802403BC E7B80010 */ swc1 $f24, 0x10($sp) -/* D630D0 802403C0 0200202D */ daddu $a0, $s0, $zero -/* D630D4 802403C4 27A50018 */ addiu $a1, $sp, 0x18 -/* D630D8 802403C8 0C019D80 */ jal guMtxCatF -/* D630DC 802403CC 00A0302D */ daddu $a2, $a1, $zero -/* D630E0 802403D0 4405B000 */ mfc1 $a1, $f22 -/* D630E4 802403D4 4406A000 */ mfc1 $a2, $f20 -/* D630E8 802403D8 4407C000 */ mfc1 $a3, $f24 -/* D630EC 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D630F0 802403E0 0C019EC8 */ jal guRotateF -/* D630F4 802403E4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D630F8 802403E8 27A40018 */ addiu $a0, $sp, 0x18 -/* D630FC 802403EC 0200282D */ daddu $a1, $s0, $zero -/* D63100 802403F0 0C019D80 */ jal guMtxCatF -/* D63104 802403F4 0080302D */ daddu $a2, $a0, $zero -/* D63108 802403F8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D6310C 802403FC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D63110 80240400 4406A000 */ mfc1 $a2, $f20 -/* D63114 80240404 4407C000 */ mfc1 $a3, $f24 -/* D63118 80240408 0C019EC8 */ jal guRotateF -/* D6311C 8024040C 0200202D */ daddu $a0, $s0, $zero -/* D63120 80240410 27A40018 */ addiu $a0, $sp, 0x18 -/* D63124 80240414 0200282D */ daddu $a1, $s0, $zero -/* D63128 80240418 0C019D80 */ jal guMtxCatF -/* D6312C 8024041C 0080302D */ daddu $a2, $a0, $zero -/* D63130 80240420 3C013F36 */ lui $at, 0x3f36 -/* D63134 80240424 3421DB6E */ ori $at, $at, 0xdb6e -/* D63138 80240428 44810000 */ mtc1 $at, $f0 -/* D6313C 8024042C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D63140 80240430 44050000 */ mfc1 $a1, $f0 -/* D63144 80240434 0200202D */ daddu $a0, $s0, $zero -/* D63148 80240438 00A0302D */ daddu $a2, $a1, $zero -/* D6314C 8024043C 0C019DF0 */ jal guScaleF -/* D63150 80240440 00A0382D */ daddu $a3, $a1, $zero -/* D63154 80240444 27A40018 */ addiu $a0, $sp, 0x18 -/* D63158 80240448 0200282D */ daddu $a1, $s0, $zero -/* D6315C 8024044C 0C019D80 */ jal guMtxCatF -/* D63160 80240450 0080302D */ daddu $a2, $a0, $zero -/* D63164 80240454 27B00058 */ addiu $s0, $sp, 0x58 -/* D63168 80240458 C6200030 */ lwc1 $f0, 0x30($s1) -/* D6316C 8024045C 3C014040 */ lui $at, 0x4040 -/* D63170 80240460 44811000 */ mtc1 $at, $f2 -/* D63174 80240464 46000007 */ neg.s $f0, $f0 -/* D63178 80240468 46020001 */ sub.s $f0, $f0, $f2 -/* D6317C 8024046C 8E250028 */ lw $a1, 0x28($s1) -/* D63180 80240470 8E26002C */ lw $a2, 0x2c($s1) -/* D63184 80240474 44070000 */ mfc1 $a3, $f0 -/* D63188 80240478 0C019E40 */ jal guTranslateF -/* D6318C 8024047C 0200202D */ daddu $a0, $s0, $zero -/* D63190 80240480 27A40018 */ addiu $a0, $sp, 0x18 -/* D63194 80240484 0200282D */ daddu $a1, $s0, $zero -/* D63198 80240488 0C019D80 */ jal guMtxCatF -/* D6319C 8024048C 0080302D */ daddu $a2, $a0, $zero -/* D631A0 80240490 24040002 */ addiu $a0, $zero, 2 -/* D631A4 80240494 0000282D */ daddu $a1, $zero, $zero -/* D631A8 80240498 00A0302D */ daddu $a2, $a1, $zero -/* D631AC 8024049C 00A0382D */ daddu $a3, $a1, $zero -/* D631B0 802404A0 27A20018 */ addiu $v0, $sp, 0x18 -/* D631B4 802404A4 0C0B7710 */ jal render_sprite -/* D631B8 802404A8 AFA20010 */ sw $v0, 0x10($sp) -/* D631BC 802404AC 8FBF0120 */ lw $ra, 0x120($sp) -/* D631C0 802404B0 8FB1011C */ lw $s1, 0x11c($sp) -/* D631C4 802404B4 8FB00118 */ lw $s0, 0x118($sp) -/* D631C8 802404B8 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D631CC 802404BC D7B60130 */ ldc1 $f22, 0x130($sp) -/* D631D0 802404C0 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D631D4 802404C4 03E00008 */ jr $ra -/* D631D8 802404C8 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_12/func_802404CC_D62D10.s b/asm/nonmatchings/world/area_pra/pra_12/func_802404CC_D62D10.s deleted file mode 100644 index c55be8218c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/func_802404CC_D62D10.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404CC_D631DC -/* D631DC 802404CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D631E0 802404D0 AFB00010 */ sw $s0, 0x10($sp) -/* D631E4 802404D4 0080802D */ daddu $s0, $a0, $zero -/* D631E8 802404D8 AFBF0014 */ sw $ra, 0x14($sp) -/* D631EC 802404DC 8E020084 */ lw $v0, 0x84($s0) -/* D631F0 802404E0 0440000E */ bltz $v0, .L8024051C -/* D631F4 802404E4 28420002 */ slti $v0, $v0, 2 -/* D631F8 802404E8 1040000C */ beqz $v0, .L8024051C -/* D631FC 802404EC 00000000 */ nop -/* D63200 802404F0 3C058024 */ lui $a1, 0x8024 -/* D63204 802404F4 24A50530 */ addiu $a1, $a1, 0x530 -/* D63208 802404F8 0C048C56 */ jal bind_dynamic_entity_3 -/* D6320C 802404FC 0000202D */ daddu $a0, $zero, $zero -/* D63210 80240500 8E03013C */ lw $v1, 0x13c($s0) -/* D63214 80240504 AC620000 */ sw $v0, ($v1) -/* D63218 80240508 3C03800A */ lui $v1, %hi(D_8009A650) -/* D6321C 8024050C 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D63220 80240510 8C620000 */ lw $v0, ($v1) -/* D63224 80240514 34420080 */ ori $v0, $v0, 0x80 -/* D63228 80240518 AC620000 */ sw $v0, ($v1) -.L8024051C: -/* D6322C 8024051C 8FBF0014 */ lw $ra, 0x14($sp) -/* D63230 80240520 8FB00010 */ lw $s0, 0x10($sp) -/* D63234 80240524 24020002 */ addiu $v0, $zero, 2 -/* D63238 80240528 03E00008 */ jr $ra -/* D6323C 8024052C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_12/func_80240530_D62D10.s b/asm/nonmatchings/world/area_pra/pra_12/func_80240530_D62D10.s deleted file mode 100644 index 42f58b3db5..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/func_80240530_D62D10.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240530_D63240 -/* D63240 80240530 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D63244 80240534 AFB00040 */ sw $s0, 0x40($sp) -/* D63248 80240538 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D6324C 8024053C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D63250 80240540 AFB10044 */ sw $s1, 0x44($sp) -/* D63254 80240544 AFBF004C */ sw $ra, 0x4c($sp) -/* D63258 80240548 AFB20048 */ sw $s2, 0x48($sp) -/* D6325C 8024054C 8E020000 */ lw $v0, ($s0) -/* D63260 80240550 821200BE */ lb $s2, 0xbe($s0) -/* D63264 80240554 30420001 */ andi $v0, $v0, 1 -/* D63268 80240558 10400052 */ beqz $v0, .L802406A4 -/* D6326C 8024055C 27B10020 */ addiu $s1, $sp, 0x20 -/* D63270 80240560 8E0400CC */ lw $a0, 0xcc($s0) -/* D63274 80240564 0C044181 */ jal get_shadow_by_index -/* D63278 80240568 00000000 */ nop -/* D6327C 8024056C 0C048B77 */ jal func_80122DDC -/* D63280 80240570 84440008 */ lh $a0, 8($v0) -/* D63284 80240574 8E050028 */ lw $a1, 0x28($s0) -/* D63288 80240578 8E070030 */ lw $a3, 0x30($s0) -/* D6328C 8024057C 27A20030 */ addiu $v0, $sp, 0x30 -/* D63290 80240580 AFA20010 */ sw $v0, 0x10($sp) -/* D63294 80240584 27A20034 */ addiu $v0, $sp, 0x34 -/* D63298 80240588 AFA20014 */ sw $v0, 0x14($sp) -/* D6329C 8024058C 27A20038 */ addiu $v0, $sp, 0x38 -/* D632A0 80240590 AFA20018 */ sw $v0, 0x18($sp) -/* D632A4 80240594 C600002C */ lwc1 $f0, 0x2c($s0) -/* D632A8 80240598 3C04800A */ lui $a0, 0x800a -/* D632AC 8024059C 8484A634 */ lh $a0, -0x59cc($a0) -/* D632B0 802405A0 46000007 */ neg.s $f0, $f0 -/* D632B4 802405A4 44060000 */ mfc1 $a2, $f0 -/* D632B8 802405A8 0C00B94E */ jal get_screen_coords -/* D632BC 802405AC 00000000 */ nop -/* D632C0 802405B0 8E0500A4 */ lw $a1, 0xa4($s0) -/* D632C4 802405B4 3C063F80 */ lui $a2, 0x3f80 -/* D632C8 802405B8 0C0B76A3 */ jal func_802DDA8C -/* D632CC 802405BC 24040001 */ addiu $a0, $zero, 1 -/* D632D0 802405C0 8E020000 */ lw $v0, ($s0) -/* D632D4 802405C4 3C030002 */ lui $v1, 2 -/* D632D8 802405C8 00431024 */ and $v0, $v0, $v1 -/* D632DC 802405CC 54400022 */ bnel $v0, $zero, .L80240658 -/* D632E0 802405D0 24120011 */ addiu $s2, $zero, 0x11 -/* D632E4 802405D4 9203000E */ lbu $v1, 0xe($s0) -/* D632E8 802405D8 3C02802E */ lui $v0, 0x802e -/* D632EC 802405DC 90429D71 */ lbu $v0, -0x628f($v0) -/* D632F0 802405E0 10620018 */ beq $v1, $v0, .L80240644 -/* D632F4 802405E4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D632F8 802405E8 1040000B */ beqz $v0, .L80240618 -/* D632FC 802405EC 24120011 */ addiu $s2, $zero, 0x11 -/* D63300 802405F0 24040001 */ addiu $a0, $zero, 1 -/* D63304 802405F4 2405FFFF */ addiu $a1, $zero, -1 -/* D63308 802405F8 24060007 */ addiu $a2, $zero, 7 -/* D6330C 802405FC 0060102D */ daddu $v0, $v1, $zero -/* D63310 80240600 0000382D */ daddu $a3, $zero, $zero -/* D63314 80240604 AFA00010 */ sw $zero, 0x10($sp) -/* D63318 80240608 AFA00014 */ sw $zero, 0x14($sp) -/* D6331C 8024060C AFA0001C */ sw $zero, 0x1c($sp) -/* D63320 80240610 0809018F */ j .L8024063C -/* D63324 80240614 AFA20018 */ sw $v0, 0x18($sp) -.L80240618: -/* D63328 80240618 2412000D */ addiu $s2, $zero, 0xd -/* D6332C 8024061C 24040001 */ addiu $a0, $zero, 1 -/* D63330 80240620 2405FFFF */ addiu $a1, $zero, -1 -/* D63334 80240624 0000302D */ daddu $a2, $zero, $zero -/* D63338 80240628 00C0382D */ daddu $a3, $a2, $zero -/* D6333C 8024062C AFA00010 */ sw $zero, 0x10($sp) -/* D63340 80240630 AFA00014 */ sw $zero, 0x14($sp) -/* D63344 80240634 AFA00018 */ sw $zero, 0x18($sp) -/* D63348 80240638 AFA0001C */ sw $zero, 0x1c($sp) -.L8024063C: -/* D6334C 8024063C 0C0B77B9 */ jal func_802DDEE4 -/* D63350 80240640 00000000 */ nop -.L80240644: -/* D63354 80240644 9202000E */ lbu $v0, 0xe($s0) -/* D63358 80240648 3C01802E */ lui $at, 0x802e -/* D6335C 8024064C A0229D71 */ sb $v0, -0x628f($at) -/* D63360 80240650 08090198 */ j .L80240660 -/* D63364 80240654 00000000 */ nop -.L80240658: -/* D63368 80240658 3C01802E */ lui $at, 0x802e -/* D6336C 8024065C A0209D71 */ sb $zero, -0x628f($at) -.L80240660: -/* D63370 80240660 8FA20038 */ lw $v0, 0x38($sp) -/* D63374 80240664 3C048024 */ lui $a0, 0x8024 -/* D63378 80240668 248408A0 */ addiu $a0, $a0, 0x8a0 -/* D6337C 8024066C AE320000 */ sw $s2, ($s1) -/* D63380 80240670 AE300008 */ sw $s0, 8($s1) -/* D63384 80240674 00021023 */ negu $v0, $v0 -/* D63388 80240678 AE220004 */ sw $v0, 4($s1) -/* D6338C 8024067C 8E020000 */ lw $v0, ($s0) -/* D63390 80240680 3C030002 */ lui $v1, 2 -/* D63394 80240684 00431024 */ and $v0, $v0, $v1 -/* D63398 80240688 54400004 */ bnel $v0, $zero, .L8024069C -/* D6339C 8024068C AE24000C */ sw $a0, 0xc($s1) -/* D633A0 80240690 3C048024 */ lui $a0, 0x8024 -/* D633A4 80240694 248406BC */ addiu $a0, $a0, 0x6bc -/* D633A8 80240698 AE24000C */ sw $a0, 0xc($s1) -.L8024069C: -/* D633AC 8024069C 0C047644 */ jal queue_render_task -/* D633B0 802406A0 0220202D */ daddu $a0, $s1, $zero -.L802406A4: -/* D633B4 802406A4 8FBF004C */ lw $ra, 0x4c($sp) -/* D633B8 802406A8 8FB20048 */ lw $s2, 0x48($sp) -/* D633BC 802406AC 8FB10044 */ lw $s1, 0x44($sp) -/* D633C0 802406B0 8FB00040 */ lw $s0, 0x40($sp) -/* D633C4 802406B4 03E00008 */ jr $ra -/* D633C8 802406B8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_12/func_802406BC_D62D10.s b/asm/nonmatchings/world/area_pra/pra_12/func_802406BC_D62D10.s deleted file mode 100644 index 72033ccd60..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/func_802406BC_D62D10.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406BC_D633CC -/* D633CC 802406BC 3C03800A */ lui $v1, 0x800a -/* D633D0 802406C0 8463A634 */ lh $v1, -0x59cc($v1) -/* D633D4 802406C4 3C07BF80 */ lui $a3, 0xbf80 -/* D633D8 802406C8 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D633DC 802406CC F7B40128 */ sdc1 $f20, 0x128($sp) -/* D633E0 802406D0 4480A000 */ mtc1 $zero, $f20 -/* D633E4 802406D4 AFB1011C */ sw $s1, 0x11c($sp) -/* D633E8 802406D8 0080882D */ daddu $s1, $a0, $zero -/* D633EC 802406DC AFB00118 */ sw $s0, 0x118($sp) -/* D633F0 802406E0 27B00098 */ addiu $s0, $sp, 0x98 -/* D633F4 802406E4 AFBF0120 */ sw $ra, 0x120($sp) -/* D633F8 802406E8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D633FC 802406EC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D63400 802406F0 00031080 */ sll $v0, $v1, 2 -/* D63404 802406F4 00431021 */ addu $v0, $v0, $v1 -/* D63408 802406F8 00021080 */ sll $v0, $v0, 2 -/* D6340C 802406FC 00431023 */ subu $v0, $v0, $v1 -/* D63410 80240700 000218C0 */ sll $v1, $v0, 3 -/* D63414 80240704 00431021 */ addu $v0, $v0, $v1 -/* D63418 80240708 000210C0 */ sll $v0, $v0, 3 -/* D6341C 8024070C 3C01800B */ lui $at, 0x800b -/* D63420 80240710 00220821 */ addu $at, $at, $v0 -/* D63424 80240714 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D63428 80240718 4406A000 */ mfc1 $a2, $f20 -/* D6342C 8024071C 4600B587 */ neg.s $f22, $f22 -/* D63430 80240720 4405B000 */ mfc1 $a1, $f22 -/* D63434 80240724 0200202D */ daddu $a0, $s0, $zero -/* D63438 80240728 0C019EC8 */ jal guRotateF -/* D6343C 8024072C E7B40010 */ swc1 $f20, 0x10($sp) -/* D63440 80240730 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D63444 80240734 0C00A6C9 */ jal clamp_angle -/* D63448 80240738 00000000 */ nop -/* D6344C 8024073C 44050000 */ mfc1 $a1, $f0 -/* D63450 80240740 4406A000 */ mfc1 $a2, $f20 -/* D63454 80240744 4407A000 */ mfc1 $a3, $f20 -/* D63458 80240748 3C013F80 */ lui $at, 0x3f80 -/* D6345C 8024074C 4481C000 */ mtc1 $at, $f24 -/* D63460 80240750 27A40018 */ addiu $a0, $sp, 0x18 -/* D63464 80240754 0C019EC8 */ jal guRotateF -/* D63468 80240758 E7B80010 */ swc1 $f24, 0x10($sp) -/* D6346C 8024075C 0200202D */ daddu $a0, $s0, $zero -/* D63470 80240760 27A50018 */ addiu $a1, $sp, 0x18 -/* D63474 80240764 0C019D80 */ jal guMtxCatF -/* D63478 80240768 00A0302D */ daddu $a2, $a1, $zero -/* D6347C 8024076C 4405B000 */ mfc1 $a1, $f22 -/* D63480 80240770 4406A000 */ mfc1 $a2, $f20 -/* D63484 80240774 4407C000 */ mfc1 $a3, $f24 -/* D63488 80240778 0200202D */ daddu $a0, $s0, $zero -/* D6348C 8024077C 0C019EC8 */ jal guRotateF -/* D63490 80240780 E7B40010 */ swc1 $f20, 0x10($sp) -/* D63494 80240784 27A40018 */ addiu $a0, $sp, 0x18 -/* D63498 80240788 0200282D */ daddu $a1, $s0, $zero -/* D6349C 8024078C 0C019D80 */ jal guMtxCatF -/* D634A0 80240790 0080302D */ daddu $a2, $a0, $zero -/* D634A4 80240794 E7B40010 */ swc1 $f20, 0x10($sp) -/* D634A8 80240798 8E2500A8 */ lw $a1, 0xa8($s1) -/* D634AC 8024079C 4406A000 */ mfc1 $a2, $f20 -/* D634B0 802407A0 4407C000 */ mfc1 $a3, $f24 -/* D634B4 802407A4 0C019EC8 */ jal guRotateF -/* D634B8 802407A8 0200202D */ daddu $a0, $s0, $zero -/* D634BC 802407AC 27A40018 */ addiu $a0, $sp, 0x18 -/* D634C0 802407B0 0200282D */ daddu $a1, $s0, $zero -/* D634C4 802407B4 0C019D80 */ jal guMtxCatF -/* D634C8 802407B8 0080302D */ daddu $a2, $a0, $zero -/* D634CC 802407BC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D634D0 802407C0 3C013F36 */ lui $at, 0x3f36 -/* D634D4 802407C4 3421DB6E */ ori $at, $at, 0xdb6e -/* D634D8 802407C8 44810000 */ mtc1 $at, $f0 -/* D634DC 802407CC 0200202D */ daddu $a0, $s0, $zero -/* D634E0 802407D0 44050000 */ mfc1 $a1, $f0 -/* D634E4 802407D4 3C06BF36 */ lui $a2, 0xbf36 -/* D634E8 802407D8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D634EC 802407DC 0C019DF0 */ jal guScaleF -/* D634F0 802407E0 00A0382D */ daddu $a3, $a1, $zero -/* D634F4 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D634F8 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D634FC 802407EC 0C019D80 */ jal guMtxCatF -/* D63500 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D63504 802407F4 27B00058 */ addiu $s0, $sp, 0x58 -/* D63508 802407F8 8E250028 */ lw $a1, 0x28($s1) -/* D6350C 802407FC C620002C */ lwc1 $f0, 0x2c($s1) -/* D63510 80240800 8E270030 */ lw $a3, 0x30($s1) -/* D63514 80240804 46000007 */ neg.s $f0, $f0 -/* D63518 80240808 44060000 */ mfc1 $a2, $f0 -/* D6351C 8024080C 0C019E40 */ jal guTranslateF -/* D63520 80240810 0200202D */ daddu $a0, $s0, $zero -/* D63524 80240814 27A40018 */ addiu $a0, $sp, 0x18 -/* D63528 80240818 0200282D */ daddu $a1, $s0, $zero -/* D6352C 8024081C 0C019D80 */ jal guMtxCatF -/* D63530 80240820 0080302D */ daddu $a2, $a0, $zero -/* D63534 80240824 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D63538 80240828 3C0142B4 */ lui $at, 0x42b4 -/* D6353C 8024082C 44810000 */ mtc1 $at, $f0 -/* D63540 80240830 00000000 */ nop -/* D63544 80240834 4602003E */ c.le.s $f0, $f2 -/* D63548 80240838 00000000 */ nop -/* D6354C 8024083C 4500000A */ bc1f .L80240868 -/* D63550 80240840 24040001 */ addiu $a0, $zero, 1 -/* D63554 80240844 3C014387 */ lui $at, 0x4387 -/* D63558 80240848 44810000 */ mtc1 $at, $f0 -/* D6355C 8024084C 00000000 */ nop -/* D63560 80240850 4600103C */ c.lt.s $f2, $f0 -/* D63564 80240854 00000000 */ nop -/* D63568 80240858 45000004 */ bc1f .L8024086C -/* D6356C 8024085C 27A20018 */ addiu $v0, $sp, 0x18 -/* D63570 80240860 3C041000 */ lui $a0, 0x1000 -/* D63574 80240864 34840001 */ ori $a0, $a0, 1 -.L80240868: -/* D63578 80240868 27A20018 */ addiu $v0, $sp, 0x18 -.L8024086C: -/* D6357C 8024086C 0000282D */ daddu $a1, $zero, $zero -/* D63580 80240870 00A0302D */ daddu $a2, $a1, $zero -/* D63584 80240874 00A0382D */ daddu $a3, $a1, $zero -/* D63588 80240878 0C0B7710 */ jal render_sprite -/* D6358C 8024087C AFA20010 */ sw $v0, 0x10($sp) -/* D63590 80240880 8FBF0120 */ lw $ra, 0x120($sp) -/* D63594 80240884 8FB1011C */ lw $s1, 0x11c($sp) -/* D63598 80240888 8FB00118 */ lw $s0, 0x118($sp) -/* D6359C 8024088C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D635A0 80240890 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D635A4 80240894 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D635A8 80240898 03E00008 */ jr $ra -/* D635AC 8024089C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_12/func_802408A0_D62D10.s b/asm/nonmatchings/world/area_pra/pra_12/func_802408A0_D62D10.s deleted file mode 100644 index a25523c4ff..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/func_802408A0_D62D10.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A0_D635B0 -/* D635B0 802408A0 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D635B4 802408A4 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D635B8 802408A8 4480B000 */ mtc1 $zero, $f22 -/* D635BC 802408AC AFB10134 */ sw $s1, 0x134($sp) -/* D635C0 802408B0 0080882D */ daddu $s1, $a0, $zero -/* D635C4 802408B4 AFB3013C */ sw $s3, 0x13c($sp) -/* D635C8 802408B8 0000982D */ daddu $s3, $zero, $zero -/* D635CC 802408BC AFB60148 */ sw $s6, 0x148($sp) -/* D635D0 802408C0 3C16800B */ lui $s6, %hi(gCameras) -/* D635D4 802408C4 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D635D8 802408C8 AFB50144 */ sw $s5, 0x144($sp) -/* D635DC 802408CC 241500FF */ addiu $s5, $zero, 0xff -/* D635E0 802408D0 AFB00130 */ sw $s0, 0x130($sp) -/* D635E4 802408D4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D635E8 802408D8 AFB20138 */ sw $s2, 0x138($sp) -/* D635EC 802408DC 27B20060 */ addiu $s2, $sp, 0x60 -/* D635F0 802408E0 AFB40140 */ sw $s4, 0x140($sp) -/* D635F4 802408E4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D635F8 802408E8 AFBF014C */ sw $ra, 0x14c($sp) -/* D635FC 802408EC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D63600 802408F0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D63604 802408F4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D63608 802408F8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D6360C 802408FC F7B40150 */ sdc1 $f20, 0x150($sp) -.L80240900: -/* D63610 80240900 3C03800A */ lui $v1, 0x800a -/* D63614 80240904 8463A634 */ lh $v1, -0x59cc($v1) -/* D63618 80240908 00031080 */ sll $v0, $v1, 2 -/* D6361C 8024090C 00431021 */ addu $v0, $v0, $v1 -/* D63620 80240910 00021080 */ sll $v0, $v0, 2 -/* D63624 80240914 00431023 */ subu $v0, $v0, $v1 -/* D63628 80240918 000218C0 */ sll $v1, $v0, 3 -/* D6362C 8024091C 00431021 */ addu $v0, $v0, $v1 -/* D63630 80240920 000210C0 */ sll $v0, $v0, 3 -/* D63634 80240924 00561021 */ addu $v0, $v0, $s6 -/* D63638 80240928 C440006C */ lwc1 $f0, 0x6c($v0) -/* D6363C 8024092C 16600065 */ bnez $s3, .L80240AC4 -/* D63640 80240930 46000507 */ neg.s $f20, $f0 -/* D63644 80240934 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D63648 80240938 3C0142B4 */ lui $at, 0x42b4 -/* D6364C 8024093C 44810000 */ mtc1 $at, $f0 -/* D63650 80240940 00000000 */ nop -/* D63654 80240944 4602003C */ c.lt.s $f0, $f2 -/* D63658 80240948 00000000 */ nop -/* D6365C 8024094C 4500000A */ bc1f .L80240978 -/* D63660 80240950 00000000 */ nop -/* D63664 80240954 3C014334 */ lui $at, 0x4334 -/* D63668 80240958 44812000 */ mtc1 $at, $f4 -/* D6366C 8024095C 00000000 */ nop -/* D63670 80240960 4604103E */ c.le.s $f2, $f4 -/* D63674 80240964 00000000 */ nop -/* D63678 80240968 45000003 */ bc1f .L80240978 -/* D6367C 8024096C 00000000 */ nop -/* D63680 80240970 08090282 */ j .L80240A08 -/* D63684 80240974 46022501 */ sub.s $f20, $f4, $f2 -.L80240978: -/* D63688 80240978 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D6368C 8024097C 3C014334 */ lui $at, 0x4334 -/* D63690 80240980 44812000 */ mtc1 $at, $f4 -/* D63694 80240984 00000000 */ nop -/* D63698 80240988 4600203C */ c.lt.s $f4, $f0 -/* D6369C 8024098C 00000000 */ nop -/* D636A0 80240990 4500000C */ bc1f .L802409C4 -/* D636A4 80240994 00000000 */ nop -/* D636A8 80240998 3C014387 */ lui $at, 0x4387 -/* D636AC 8024099C 44812000 */ mtc1 $at, $f4 -/* D636B0 802409A0 00000000 */ nop -/* D636B4 802409A4 4604003E */ c.le.s $f0, $f4 -/* D636B8 802409A8 00000000 */ nop -/* D636BC 802409AC 45000008 */ bc1f .L802409D0 -/* D636C0 802409B0 00000000 */ nop -/* D636C4 802409B4 3C014334 */ lui $at, 0x4334 -/* D636C8 802409B8 44812000 */ mtc1 $at, $f4 -/* D636CC 802409BC 08090282 */ j .L80240A08 -/* D636D0 802409C0 46040501 */ sub.s $f20, $f0, $f4 -.L802409C4: -/* D636D4 802409C4 3C014387 */ lui $at, 0x4387 -/* D636D8 802409C8 44812000 */ mtc1 $at, $f4 -/* D636DC 802409CC 00000000 */ nop -.L802409D0: -/* D636E0 802409D0 4600203C */ c.lt.s $f4, $f0 -/* D636E4 802409D4 00000000 */ nop -/* D636E8 802409D8 4500000A */ bc1f .L80240A04 -/* D636EC 802409DC 00000000 */ nop -/* D636F0 802409E0 3C0143B4 */ lui $at, 0x43b4 -/* D636F4 802409E4 44811000 */ mtc1 $at, $f2 -/* D636F8 802409E8 00000000 */ nop -/* D636FC 802409EC 4602003E */ c.le.s $f0, $f2 -/* D63700 802409F0 00000000 */ nop -/* D63704 802409F4 45000003 */ bc1f .L80240A04 -/* D63708 802409F8 00000000 */ nop -/* D6370C 802409FC 08090282 */ j .L80240A08 -/* D63710 80240A00 46001501 */ sub.s $f20, $f2, $f0 -.L80240A04: -/* D63714 80240A04 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L80240A08: -/* D63718 80240A08 3C0141C8 */ lui $at, 0x41c8 -/* D6371C 80240A0C 44810000 */ mtc1 $at, $f0 -/* D63720 80240A10 00000000 */ nop -/* D63724 80240A14 4600A003 */ div.s $f0, $f20, $f0 -/* D63728 80240A18 4600010D */ trunc.w.s $f4, $f0 -/* D6372C 80240A1C 44072000 */ mfc1 $a3, $f4 -/* D63730 80240A20 00000000 */ nop -/* D63734 80240A24 00071100 */ sll $v0, $a3, 4 -/* D63738 80240A28 00471023 */ subu $v0, $v0, $a3 -/* D6373C 80240A2C 00021080 */ sll $v0, $v0, 2 -/* D63740 80240A30 02A23823 */ subu $a3, $s5, $v0 -/* D63744 80240A34 28E20064 */ slti $v0, $a3, 0x64 -/* D63748 80240A38 54400001 */ bnel $v0, $zero, .L80240A40 -/* D6374C 80240A3C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A40: -/* D63750 80240A40 24040001 */ addiu $a0, $zero, 1 -/* D63754 80240A44 2405FFFF */ addiu $a1, $zero, -1 -/* D63758 80240A48 24060006 */ addiu $a2, $zero, 6 -/* D6375C 80240A4C AFA70010 */ sw $a3, 0x10($sp) -/* D63760 80240A50 AFA70014 */ sw $a3, 0x14($sp) -/* D63764 80240A54 AFB50018 */ sw $s5, 0x18($sp) -/* D63768 80240A58 0C0B77B9 */ jal func_802DDEE4 -/* D6376C 80240A5C AFA0001C */ sw $zero, 0x1c($sp) -/* D63770 80240A60 4405A000 */ mfc1 $a1, $f20 -/* D63774 80240A64 4406B000 */ mfc1 $a2, $f22 -/* D63778 80240A68 3C07BF80 */ lui $a3, 0xbf80 -/* D6377C 80240A6C 0200202D */ daddu $a0, $s0, $zero -/* D63780 80240A70 0C019EC8 */ jal guRotateF -/* D63784 80240A74 E7B60010 */ swc1 $f22, 0x10($sp) -/* D63788 80240A78 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D6378C 80240A7C 0C00A6C9 */ jal clamp_angle -/* D63790 80240A80 00000000 */ nop -/* D63794 80240A84 44050000 */ mfc1 $a1, $f0 -/* D63798 80240A88 4406B000 */ mfc1 $a2, $f22 -/* D6379C 80240A8C 4407B000 */ mfc1 $a3, $f22 -/* D637A0 80240A90 3C013F80 */ lui $at, 0x3f80 -/* D637A4 80240A94 44812000 */ mtc1 $at, $f4 -/* D637A8 80240A98 27A40020 */ addiu $a0, $sp, 0x20 -/* D637AC 80240A9C 0C019EC8 */ jal guRotateF -/* D637B0 80240AA0 E7A40010 */ swc1 $f4, 0x10($sp) -/* D637B4 80240AA4 0200202D */ daddu $a0, $s0, $zero -/* D637B8 80240AA8 27A50020 */ addiu $a1, $sp, 0x20 -/* D637BC 80240AAC 0C019D80 */ jal guMtxCatF -/* D637C0 80240AB0 00A0302D */ daddu $a2, $a1, $zero -/* D637C4 80240AB4 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D637C8 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D637CC 80240ABC 080902E2 */ j .L80240B88 -/* D637D0 80240AC0 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240AC4: -/* D637D4 80240AC4 0260202D */ daddu $a0, $s3, $zero -/* D637D8 80240AC8 27A50120 */ addiu $a1, $sp, 0x120 -/* D637DC 80240ACC 27A60124 */ addiu $a2, $sp, 0x124 -/* D637E0 80240AD0 0C03964E */ jal func_800E5938 -/* D637E4 80240AD4 27A70128 */ addiu $a3, $sp, 0x128 -/* D637E8 80240AD8 8FA60124 */ lw $a2, 0x124($sp) -/* D637EC 80240ADC 3C028000 */ lui $v0, 0x8000 -/* D637F0 80240AE0 14C20004 */ bne $a2, $v0, .L80240AF4 -/* D637F4 80240AE4 46000606 */ mov.s $f24, $f0 -/* D637F8 80240AE8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D637FC 80240AEC 080902C1 */ j .L80240B04 -/* D63800 80240AF0 24040001 */ addiu $a0, $zero, 1 -.L80240AF4: -/* D63804 80240AF4 4486D000 */ mtc1 $a2, $f26 -/* D63808 80240AF8 00000000 */ nop -/* D6380C 80240AFC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D63810 80240B00 24040001 */ addiu $a0, $zero, 1 -.L80240B04: -/* D63814 80240B04 2405FFFF */ addiu $a1, $zero, -1 -/* D63818 80240B08 24060007 */ addiu $a2, $zero, 7 -/* D6381C 80240B0C 0000382D */ daddu $a3, $zero, $zero -/* D63820 80240B10 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D63824 80240B14 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D63828 80240B18 24020040 */ addiu $v0, $zero, 0x40 -/* D6382C 80240B1C AFA00010 */ sw $zero, 0x10($sp) -/* D63830 80240B20 AFA00014 */ sw $zero, 0x14($sp) -/* D63834 80240B24 AFA20018 */ sw $v0, 0x18($sp) -/* D63838 80240B28 0C0B77B9 */ jal func_802DDEE4 -/* D6383C 80240B2C AFA0001C */ sw $zero, 0x1c($sp) -/* D63840 80240B30 4405A000 */ mfc1 $a1, $f20 -/* D63844 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D63848 80240B38 3C07BF80 */ lui $a3, 0xbf80 -/* D6384C 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D63850 80240B40 0C019EC8 */ jal guRotateF -/* D63854 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D63858 80240B48 4405A000 */ mfc1 $a1, $f20 -/* D6385C 80240B4C 4406B000 */ mfc1 $a2, $f22 -/* D63860 80240B50 3C07BF80 */ lui $a3, 0xbf80 -/* D63864 80240B54 0200202D */ daddu $a0, $s0, $zero -/* D63868 80240B58 0C019EC8 */ jal guRotateF -/* D6386C 80240B5C E7B60010 */ swc1 $f22, 0x10($sp) -/* D63870 80240B60 4405C000 */ mfc1 $a1, $f24 -/* D63874 80240B64 4406B000 */ mfc1 $a2, $f22 -/* D63878 80240B68 3C073F80 */ lui $a3, 0x3f80 -/* D6387C 80240B6C 27A40020 */ addiu $a0, $sp, 0x20 -/* D63880 80240B70 0C019EC8 */ jal guRotateF -/* D63884 80240B74 E7B60010 */ swc1 $f22, 0x10($sp) -/* D63888 80240B78 0200202D */ daddu $a0, $s0, $zero -/* D6388C 80240B7C 27A50020 */ addiu $a1, $sp, 0x20 -/* D63890 80240B80 0C019D80 */ jal guMtxCatF -/* D63894 80240B84 00A0302D */ daddu $a2, $a1, $zero -.L80240B88: -/* D63898 80240B88 862200B0 */ lh $v0, 0xb0($s1) -/* D6389C 80240B8C 3C013F00 */ lui $at, 0x3f00 -/* D638A0 80240B90 44812000 */ mtc1 $at, $f4 -/* D638A4 80240B94 00021023 */ negu $v0, $v0 -/* D638A8 80240B98 44820000 */ mtc1 $v0, $f0 -/* D638AC 80240B9C 00000000 */ nop -/* D638B0 80240BA0 46800020 */ cvt.s.w $f0, $f0 -/* D638B4 80240BA4 46040102 */ mul.s $f4, $f0, $f4 -/* D638B8 80240BA8 00000000 */ nop -/* D638BC 80240BAC 4405B000 */ mfc1 $a1, $f22 -/* D638C0 80240BB0 4407B000 */ mfc1 $a3, $f22 -/* D638C4 80240BB4 44062000 */ mfc1 $a2, $f4 -/* D638C8 80240BB8 0C019E40 */ jal guTranslateF -/* D638CC 80240BBC 0240202D */ daddu $a0, $s2, $zero -/* D638D0 80240BC0 0240202D */ daddu $a0, $s2, $zero -/* D638D4 80240BC4 27A50020 */ addiu $a1, $sp, 0x20 -/* D638D8 80240BC8 0C019D80 */ jal guMtxCatF -/* D638DC 80240BCC 00A0302D */ daddu $a2, $a1, $zero -/* D638E0 80240BD0 4405A000 */ mfc1 $a1, $f20 -/* D638E4 80240BD4 4406B000 */ mfc1 $a2, $f22 -/* D638E8 80240BD8 3C073F80 */ lui $a3, 0x3f80 -/* D638EC 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D638F0 80240BE0 0C019EC8 */ jal guRotateF -/* D638F4 80240BE4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D638F8 80240BE8 27A40020 */ addiu $a0, $sp, 0x20 -/* D638FC 80240BEC 0200282D */ daddu $a1, $s0, $zero -/* D63900 80240BF0 0C019D80 */ jal guMtxCatF -/* D63904 80240BF4 0080302D */ daddu $a2, $a0, $zero -/* D63908 80240BF8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D6390C 80240BFC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D63910 80240C00 4406B000 */ mfc1 $a2, $f22 -/* D63914 80240C04 3C073F80 */ lui $a3, 0x3f80 -/* D63918 80240C08 0C019EC8 */ jal guRotateF -/* D6391C 80240C0C 0200202D */ daddu $a0, $s0, $zero -/* D63920 80240C10 27A40020 */ addiu $a0, $sp, 0x20 -/* D63924 80240C14 0200282D */ daddu $a1, $s0, $zero -/* D63928 80240C18 0C019D80 */ jal guMtxCatF -/* D6392C 80240C1C 0080302D */ daddu $a2, $a0, $zero -/* D63930 80240C20 862200B0 */ lh $v0, 0xb0($s1) -/* D63934 80240C24 3C013F00 */ lui $at, 0x3f00 -/* D63938 80240C28 44812000 */ mtc1 $at, $f4 -/* D6393C 80240C2C 44820000 */ mtc1 $v0, $f0 -/* D63940 80240C30 00000000 */ nop -/* D63944 80240C34 46800020 */ cvt.s.w $f0, $f0 -/* D63948 80240C38 46040102 */ mul.s $f4, $f0, $f4 -/* D6394C 80240C3C 00000000 */ nop -/* D63950 80240C40 4405B000 */ mfc1 $a1, $f22 -/* D63954 80240C44 4407B000 */ mfc1 $a3, $f22 -/* D63958 80240C48 44062000 */ mfc1 $a2, $f4 -/* D6395C 80240C4C 0C019E40 */ jal guTranslateF -/* D63960 80240C50 0240202D */ daddu $a0, $s2, $zero -/* D63964 80240C54 27A40020 */ addiu $a0, $sp, 0x20 -/* D63968 80240C58 0240282D */ daddu $a1, $s2, $zero -/* D6396C 80240C5C 0C019D80 */ jal guMtxCatF -/* D63970 80240C60 0080302D */ daddu $a2, $a0, $zero -/* D63974 80240C64 3C013F36 */ lui $at, 0x3f36 -/* D63978 80240C68 3421DB6E */ ori $at, $at, 0xdb6e -/* D6397C 80240C6C 44810000 */ mtc1 $at, $f0 -/* D63980 80240C70 0280202D */ daddu $a0, $s4, $zero -/* D63984 80240C74 44050000 */ mfc1 $a1, $f0 -/* D63988 80240C78 3C06BF36 */ lui $a2, 0xbf36 -/* D6398C 80240C7C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D63990 80240C80 0C019DF0 */ jal guScaleF -/* D63994 80240C84 00A0382D */ daddu $a3, $a1, $zero -/* D63998 80240C88 27A40020 */ addiu $a0, $sp, 0x20 -/* D6399C 80240C8C 0280282D */ daddu $a1, $s4, $zero -/* D639A0 80240C90 0C019D80 */ jal guMtxCatF -/* D639A4 80240C94 0080302D */ daddu $a2, $a0, $zero -/* D639A8 80240C98 4600D687 */ neg.s $f26, $f26 -/* D639AC 80240C9C 4405F000 */ mfc1 $a1, $f30 -/* D639B0 80240CA0 4407E000 */ mfc1 $a3, $f28 -/* D639B4 80240CA4 4406D000 */ mfc1 $a2, $f26 -/* D639B8 80240CA8 0C019E40 */ jal guTranslateF -/* D639BC 80240CAC 0240202D */ daddu $a0, $s2, $zero -/* D639C0 80240CB0 27A40020 */ addiu $a0, $sp, 0x20 -/* D639C4 80240CB4 0240282D */ daddu $a1, $s2, $zero -/* D639C8 80240CB8 0C019D80 */ jal guMtxCatF -/* D639CC 80240CBC 0080302D */ daddu $a2, $a0, $zero -/* D639D0 80240CC0 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D639D4 80240CC4 3C0142B4 */ lui $at, 0x42b4 -/* D639D8 80240CC8 44810000 */ mtc1 $at, $f0 -/* D639DC 80240CCC 00000000 */ nop -/* D639E0 80240CD0 4602003E */ c.le.s $f0, $f2 -/* D639E4 80240CD4 00000000 */ nop -/* D639E8 80240CD8 4500000A */ bc1f .L80240D04 -/* D639EC 80240CDC 24040001 */ addiu $a0, $zero, 1 -/* D639F0 80240CE0 3C014387 */ lui $at, 0x4387 -/* D639F4 80240CE4 44812000 */ mtc1 $at, $f4 -/* D639F8 80240CE8 00000000 */ nop -/* D639FC 80240CEC 4604103C */ c.lt.s $f2, $f4 -/* D63A00 80240CF0 00000000 */ nop -/* D63A04 80240CF4 45000004 */ bc1f .L80240D08 -/* D63A08 80240CF8 27A20020 */ addiu $v0, $sp, 0x20 -/* D63A0C 80240CFC 3C041000 */ lui $a0, 0x1000 -/* D63A10 80240D00 34840001 */ ori $a0, $a0, 1 -.L80240D04: -/* D63A14 80240D04 27A20020 */ addiu $v0, $sp, 0x20 -.L80240D08: -/* D63A18 80240D08 AFA20010 */ sw $v0, 0x10($sp) -/* D63A1C 80240D0C 0000282D */ daddu $a1, $zero, $zero -/* D63A20 80240D10 00A0302D */ daddu $a2, $a1, $zero -/* D63A24 80240D14 0C0B7710 */ jal render_sprite -/* D63A28 80240D18 00A0382D */ daddu $a3, $a1, $zero -/* D63A2C 80240D1C 26730001 */ addiu $s3, $s3, 1 -/* D63A30 80240D20 2A620002 */ slti $v0, $s3, 2 -/* D63A34 80240D24 1440FEF6 */ bnez $v0, .L80240900 -/* D63A38 80240D28 00000000 */ nop -/* D63A3C 80240D2C 8FBF014C */ lw $ra, 0x14c($sp) -/* D63A40 80240D30 8FB60148 */ lw $s6, 0x148($sp) -/* D63A44 80240D34 8FB50144 */ lw $s5, 0x144($sp) -/* D63A48 80240D38 8FB40140 */ lw $s4, 0x140($sp) -/* D63A4C 80240D3C 8FB3013C */ lw $s3, 0x13c($sp) -/* D63A50 80240D40 8FB20138 */ lw $s2, 0x138($sp) -/* D63A54 80240D44 8FB10134 */ lw $s1, 0x134($sp) -/* D63A58 80240D48 8FB00130 */ lw $s0, 0x130($sp) -/* D63A5C 80240D4C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D63A60 80240D50 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D63A64 80240D54 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D63A68 80240D58 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D63A6C 80240D5C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D63A70 80240D60 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D63A74 80240D64 03E00008 */ jr $ra -/* D63A78 80240D68 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_12/func_80240D6C_D62D10.s b/asm/nonmatchings/world/area_pra/pra_12/func_80240D6C_D62D10.s deleted file mode 100644 index bd4cb77bd7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/func_80240D6C_D62D10.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D6C_D63A7C -/* D63A7C 80240D6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D63A80 80240D70 AFB00010 */ sw $s0, 0x10($sp) -/* D63A84 80240D74 0080802D */ daddu $s0, $a0, $zero -/* D63A88 80240D78 AFBF0014 */ sw $ra, 0x14($sp) -/* D63A8C 80240D7C 8E020088 */ lw $v0, 0x88($s0) -/* D63A90 80240D80 14400017 */ bnez $v0, .L80240DE0 -/* D63A94 80240D84 24020001 */ addiu $v0, $zero, 1 -/* D63A98 80240D88 8E030084 */ lw $v1, 0x84($s0) -/* D63A9C 80240D8C 1062001A */ beq $v1, $v0, .L80240DF8 -/* D63AA0 80240D90 00000000 */ nop -/* D63AA4 80240D94 28620002 */ slti $v0, $v1, 2 -/* D63AA8 80240D98 50400005 */ beql $v0, $zero, .L80240DB0 -/* D63AAC 80240D9C 24020002 */ addiu $v0, $zero, 2 -/* D63AB0 80240DA0 10600007 */ beqz $v1, .L80240DC0 -/* D63AB4 80240DA4 00000000 */ nop -/* D63AB8 80240DA8 08090384 */ j .L80240E10 -/* D63ABC 80240DAC 00000000 */ nop -.L80240DB0: -/* D63AC0 80240DB0 10620007 */ beq $v1, $v0, .L80240DD0 -/* D63AC4 80240DB4 00000000 */ nop -/* D63AC8 80240DB8 08090384 */ j .L80240E10 -/* D63ACC 80240DBC 00000000 */ nop -.L80240DC0: -/* D63AD0 80240DC0 3C048024 */ lui $a0, 0x8024 -/* D63AD4 80240DC4 24840EB4 */ addiu $a0, $a0, 0xeb4 -/* D63AD8 80240DC8 08090380 */ j .L80240E00 -/* D63ADC 80240DCC 00000000 */ nop -.L80240DD0: -/* D63AE0 80240DD0 3C048024 */ lui $a0, 0x8024 -/* D63AE4 80240DD4 24840F1C */ addiu $a0, $a0, 0xf1c -/* D63AE8 80240DD8 08090380 */ j .L80240E00 -/* D63AEC 80240DDC 00000000 */ nop -.L80240DE0: -/* D63AF0 80240DE0 8E020084 */ lw $v0, 0x84($s0) -/* D63AF4 80240DE4 0440000A */ bltz $v0, .L80240E10 -/* D63AF8 80240DE8 00000000 */ nop -/* D63AFC 80240DEC 28420002 */ slti $v0, $v0, 2 -/* D63B00 80240DF0 10400007 */ beqz $v0, .L80240E10 -/* D63B04 80240DF4 00000000 */ nop -.L80240DF8: -/* D63B08 80240DF8 3C048024 */ lui $a0, 0x8024 -/* D63B0C 80240DFC 24840EE8 */ addiu $a0, $a0, 0xee8 -.L80240E00: -/* D63B10 80240E00 0C048C56 */ jal bind_dynamic_entity_3 -/* D63B14 80240E04 0000282D */ daddu $a1, $zero, $zero -/* D63B18 80240E08 8E03013C */ lw $v1, 0x13c($s0) -/* D63B1C 80240E0C AC620004 */ sw $v0, 4($v1) -.L80240E10: -/* D63B20 80240E10 0C00EAD2 */ jal get_npc_safe -/* D63B24 80240E14 2404FFFC */ addiu $a0, $zero, -4 -/* D63B28 80240E18 0040282D */ daddu $a1, $v0, $zero -/* D63B2C 80240E1C 10A00021 */ beqz $a1, .L80240EA4 -/* D63B30 80240E20 24020002 */ addiu $v0, $zero, 2 -/* D63B34 80240E24 8E020088 */ lw $v0, 0x88($s0) -/* D63B38 80240E28 14400014 */ bnez $v0, .L80240E7C -/* D63B3C 80240E2C 24020001 */ addiu $v0, $zero, 1 -/* D63B40 80240E30 8E040084 */ lw $a0, 0x84($s0) -/* D63B44 80240E34 10820016 */ beq $a0, $v0, .L80240E90 -/* D63B48 80240E38 28820002 */ slti $v0, $a0, 2 -/* D63B4C 80240E3C 10400005 */ beqz $v0, .L80240E54 -/* D63B50 80240E40 24020002 */ addiu $v0, $zero, 2 -/* D63B54 80240E44 10800007 */ beqz $a0, .L80240E64 -/* D63B58 80240E48 00000000 */ nop -/* D63B5C 80240E4C 080903A9 */ j .L80240EA4 -/* D63B60 80240E50 00000000 */ nop -.L80240E54: -/* D63B64 80240E54 10820006 */ beq $a0, $v0, .L80240E70 -/* D63B68 80240E58 24020002 */ addiu $v0, $zero, 2 -/* D63B6C 80240E5C 080903A9 */ j .L80240EA4 -/* D63B70 80240E60 00000000 */ nop -.L80240E64: -/* D63B74 80240E64 8CA20000 */ lw $v0, ($a1) -/* D63B78 80240E68 080903A6 */ j .L80240E98 -/* D63B7C 80240E6C 3C03000A */ lui $v1, 0xa -.L80240E70: -/* D63B80 80240E70 8CA20000 */ lw $v0, ($a1) -/* D63B84 80240E74 080903A6 */ j .L80240E98 -/* D63B88 80240E78 3C030002 */ lui $v1, 2 -.L80240E7C: -/* D63B8C 80240E7C 8E020084 */ lw $v0, 0x84($s0) -/* D63B90 80240E80 04400007 */ bltz $v0, .L80240EA0 -/* D63B94 80240E84 28420002 */ slti $v0, $v0, 2 -/* D63B98 80240E88 10400006 */ beqz $v0, .L80240EA4 -/* D63B9C 80240E8C 24020002 */ addiu $v0, $zero, 2 -.L80240E90: -/* D63BA0 80240E90 8CA20000 */ lw $v0, ($a1) -/* D63BA4 80240E94 3C030008 */ lui $v1, 8 -.L80240E98: -/* D63BA8 80240E98 00431025 */ or $v0, $v0, $v1 -/* D63BAC 80240E9C ACA20000 */ sw $v0, ($a1) -.L80240EA0: -/* D63BB0 80240EA0 24020002 */ addiu $v0, $zero, 2 -.L80240EA4: -/* D63BB4 80240EA4 8FBF0014 */ lw $ra, 0x14($sp) -/* D63BB8 80240EA8 8FB00010 */ lw $s0, 0x10($sp) -/* D63BBC 80240EAC 03E00008 */ jr $ra -/* D63BC0 80240EB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_12/func_80240EB4_D62D10.s b/asm/nonmatchings/world/area_pra/pra_12/func_80240EB4_D62D10.s deleted file mode 100644 index 6686656070..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/func_80240EB4_D62D10.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_D63BC4 -/* D63BC4 80240EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D63BC8 80240EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D63BCC 80240EBC 0C00EAD2 */ jal get_npc_safe -/* D63BD0 80240EC0 2404FFFC */ addiu $a0, $zero, -4 -/* D63BD4 80240EC4 0040202D */ daddu $a0, $v0, $zero -/* D63BD8 80240EC8 10800004 */ beqz $a0, .L80240EDC -/* D63BDC 80240ECC 3C03000A */ lui $v1, 0xa -/* D63BE0 80240ED0 8C820000 */ lw $v0, ($a0) -/* D63BE4 80240ED4 00431025 */ or $v0, $v0, $v1 -/* D63BE8 80240ED8 AC820000 */ sw $v0, ($a0) -.L80240EDC: -/* D63BEC 80240EDC 8FBF0010 */ lw $ra, 0x10($sp) -/* D63BF0 80240EE0 03E00008 */ jr $ra -/* D63BF4 80240EE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_12/func_80240EE8_D62D10.s b/asm/nonmatchings/world/area_pra/pra_12/func_80240EE8_D62D10.s deleted file mode 100644 index e7d256a906..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/func_80240EE8_D62D10.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE8_D63BF8 -/* D63BF8 80240EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D63BFC 80240EEC AFBF0010 */ sw $ra, 0x10($sp) -/* D63C00 80240EF0 0C00EAD2 */ jal get_npc_safe -/* D63C04 80240EF4 2404FFFC */ addiu $a0, $zero, -4 -/* D63C08 80240EF8 0040202D */ daddu $a0, $v0, $zero -/* D63C0C 80240EFC 10800004 */ beqz $a0, .L80240F10 -/* D63C10 80240F00 3C030008 */ lui $v1, 8 -/* D63C14 80240F04 8C820000 */ lw $v0, ($a0) -/* D63C18 80240F08 00431025 */ or $v0, $v0, $v1 -/* D63C1C 80240F0C AC820000 */ sw $v0, ($a0) -.L80240F10: -/* D63C20 80240F10 8FBF0010 */ lw $ra, 0x10($sp) -/* D63C24 80240F14 03E00008 */ jr $ra -/* D63C28 80240F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_12/func_80240F1C_D62D10.s b/asm/nonmatchings/world/area_pra/pra_12/func_80240F1C_D62D10.s deleted file mode 100644 index c841e08ca3..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/func_80240F1C_D62D10.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F1C_D63C2C -/* D63C2C 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D63C30 80240F20 AFBF0010 */ sw $ra, 0x10($sp) -/* D63C34 80240F24 0C00EAD2 */ jal get_npc_safe -/* D63C38 80240F28 2404FFFC */ addiu $a0, $zero, -4 -/* D63C3C 80240F2C 0040202D */ daddu $a0, $v0, $zero -/* D63C40 80240F30 10800004 */ beqz $a0, .L80240F44 -/* D63C44 80240F34 3C030002 */ lui $v1, 2 -/* D63C48 80240F38 8C820000 */ lw $v0, ($a0) -/* D63C4C 80240F3C 00431025 */ or $v0, $v0, $v1 -/* D63C50 80240F40 AC820000 */ sw $v0, ($a0) -.L80240F44: -/* D63C54 80240F44 8FBF0010 */ lw $ra, 0x10($sp) -/* D63C58 80240F48 03E00008 */ jr $ra -/* D63C5C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_12/func_80240F50_D62D10.s b/asm/nonmatchings/world/area_pra/pra_12/func_80240F50_D62D10.s deleted file mode 100644 index 2a0cf73324..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/func_80240F50_D62D10.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F50_D63C60 -/* D63C60 80240F50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D63C64 80240F54 AFB00010 */ sw $s0, 0x10($sp) -/* D63C68 80240F58 3C108024 */ lui $s0, 0x8024 -/* D63C6C 80240F5C 261016B0 */ addiu $s0, $s0, 0x16b0 -/* D63C70 80240F60 AFBF0018 */ sw $ra, 0x18($sp) -/* D63C74 80240F64 AFB10014 */ sw $s1, 0x14($sp) -/* D63C78 80240F68 8E020000 */ lw $v0, ($s0) -/* D63C7C 80240F6C 14400010 */ bnez $v0, .L80240FB0 -/* D63C80 80240F70 0080882D */ daddu $s1, $a0, $zero -/* D63C84 80240F74 0C00AB39 */ jal heap_malloc -/* D63C88 80240F78 24040040 */ addiu $a0, $zero, 0x40 -/* D63C8C 80240F7C AE020000 */ sw $v0, ($s0) -/* D63C90 80240F80 0000182D */ daddu $v1, $zero, $zero -/* D63C94 80240F84 0040282D */ daddu $a1, $v0, $zero -/* D63C98 80240F88 0220202D */ daddu $a0, $s1, $zero -.L80240F8C: -/* D63C9C 80240F8C 8C820084 */ lw $v0, 0x84($a0) -/* D63CA0 80240F90 24840004 */ addiu $a0, $a0, 4 -/* D63CA4 80240F94 24630001 */ addiu $v1, $v1, 1 -/* D63CA8 80240F98 ACA20000 */ sw $v0, ($a1) -/* D63CAC 80240F9C 28620010 */ slti $v0, $v1, 0x10 -/* D63CB0 80240FA0 1440FFFA */ bnez $v0, .L80240F8C -/* D63CB4 80240FA4 24A50004 */ addiu $a1, $a1, 4 -/* D63CB8 80240FA8 080903FB */ j .L80240FEC -/* D63CBC 80240FAC 00000000 */ nop -.L80240FB0: -/* D63CC0 80240FB0 0000182D */ daddu $v1, $zero, $zero -/* D63CC4 80240FB4 0040282D */ daddu $a1, $v0, $zero -/* D63CC8 80240FB8 0220202D */ daddu $a0, $s1, $zero -.L80240FBC: -/* D63CCC 80240FBC 8CA20000 */ lw $v0, ($a1) -/* D63CD0 80240FC0 24A50004 */ addiu $a1, $a1, 4 -/* D63CD4 80240FC4 24630001 */ addiu $v1, $v1, 1 -/* D63CD8 80240FC8 AC820084 */ sw $v0, 0x84($a0) -/* D63CDC 80240FCC 28620010 */ slti $v0, $v1, 0x10 -/* D63CE0 80240FD0 1440FFFA */ bnez $v0, .L80240FBC -/* D63CE4 80240FD4 24840004 */ addiu $a0, $a0, 4 -/* D63CE8 80240FD8 3C108024 */ lui $s0, 0x8024 -/* D63CEC 80240FDC 261016B0 */ addiu $s0, $s0, 0x16b0 -/* D63CF0 80240FE0 0C00AB4B */ jal heap_free -/* D63CF4 80240FE4 8E040000 */ lw $a0, ($s0) -/* D63CF8 80240FE8 AE000000 */ sw $zero, ($s0) -.L80240FEC: -/* D63CFC 80240FEC 8FBF0018 */ lw $ra, 0x18($sp) -/* D63D00 80240FF0 8FB10014 */ lw $s1, 0x14($sp) -/* D63D04 80240FF4 8FB00010 */ lw $s0, 0x10($sp) -/* D63D08 80240FF8 24020002 */ addiu $v0, $zero, 2 -/* D63D0C 80240FFC 03E00008 */ jr $ra -/* D63D10 80241000 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_12/func_80241068_D62D10.s b/asm/nonmatchings/world/area_pra/pra_12/func_80241068_D62D10.s deleted file mode 100644 index aec247ffb6..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/func_80241068_D62D10.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_12/func_802411B8_D62D10.s b/asm/nonmatchings/world/area_pra/pra_12/func_802411B8_D62D10.s deleted file mode 100644 index d3c4603ad4..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/func_802411B8_D62D10.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411B8_D63EC8 -/* D63EC8 802411B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D63ECC 802411BC AFB00010 */ sw $s0, 0x10($sp) -/* D63ED0 802411C0 0080802D */ daddu $s0, $a0, $zero -/* D63ED4 802411C4 AFBF0014 */ sw $ra, 0x14($sp) -/* D63ED8 802411C8 8E02000C */ lw $v0, 0xc($s0) -/* D63EDC 802411CC 0C0B1EAF */ jal get_variable -/* D63EE0 802411D0 8C450000 */ lw $a1, ($v0) -/* D63EE4 802411D4 00021140 */ sll $v0, $v0, 5 -/* D63EE8 802411D8 AE000084 */ sw $zero, 0x84($s0) -/* D63EEC 802411DC 3C018008 */ lui $at, 0x8008 -/* D63EF0 802411E0 00220821 */ addu $at, $at, $v0 -/* D63EF4 802411E4 942278F8 */ lhu $v0, 0x78f8($at) -/* D63EF8 802411E8 30420040 */ andi $v0, $v0, 0x40 -/* D63EFC 802411EC 10400002 */ beqz $v0, .L802411F8 -/* D63F00 802411F0 24020001 */ addiu $v0, $zero, 1 -/* D63F04 802411F4 AE020084 */ sw $v0, 0x84($s0) -.L802411F8: -/* D63F08 802411F8 8FBF0014 */ lw $ra, 0x14($sp) -/* D63F0C 802411FC 8FB00010 */ lw $s0, 0x10($sp) -/* D63F10 80241200 24020002 */ addiu $v0, $zero, 2 -/* D63F14 80241204 03E00008 */ jr $ra -/* D63F18 80241208 27BD0018 */ addiu $sp, $sp, 0x18 -/* D63F1C 8024120C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_80240020_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_80240020_D645E0.s deleted file mode 100644 index 0af9d2cf64..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_80240020_D645E0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D64600 -/* D64600 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D64604 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D64608 80240028 00822024 */ and $a0, $a0, $v0 -/* D6460C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D64610 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D64614 80240034 00821821 */ addu $v1, $a0, $v0 -/* D64618 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D6461C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D64620 80240040 30620001 */ andi $v0, $v1, 1 -/* D64624 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D64628 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D6462C 8024004C 03E00008 */ jr $ra -/* D64630 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_80240054_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_80240054_D645E0.s deleted file mode 100644 index e382ba846b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_80240054_D645E0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054_D64634 -/* D64634 80240054 00041403 */ sra $v0, $a0, 0x10 -/* D64638 80240058 304300FF */ andi $v1, $v0, 0xff -/* D6463C 8024005C 24020006 */ addiu $v0, $zero, 6 -/* D64640 80240060 10620015 */ beq $v1, $v0, .L802400B8 -/* D64644 80240064 28620007 */ slti $v0, $v1, 7 -/* D64648 80240068 10400005 */ beqz $v0, .L80240080 -/* D6464C 8024006C 24020001 */ addiu $v0, $zero, 1 -/* D64650 80240070 1062000A */ beq $v1, $v0, .L8024009C -/* D64654 80240074 3C020100 */ lui $v0, 0x100 -/* D64658 80240078 03E00008 */ jr $ra -/* D6465C 8024007C 00821025 */ or $v0, $a0, $v0 -.L80240080: -/* D64660 80240080 2862000A */ slti $v0, $v1, 0xa -/* D64664 80240084 10400016 */ beqz $v0, .L802400E0 -/* D64668 80240088 28620008 */ slti $v0, $v1, 8 -/* D6466C 8024008C 14400015 */ bnez $v0, .L802400E4 -/* D64670 80240090 3C020100 */ lui $v0, 0x100 -/* D64674 80240094 03E00008 */ jr $ra -/* D64678 80240098 0080102D */ daddu $v0, $a0, $zero -.L8024009C: -/* D6467C 8024009C 3C020001 */ lui $v0, 1 -/* D64680 802400A0 3442000C */ ori $v0, $v0, 0xc -/* D64684 802400A4 0044102A */ slt $v0, $v0, $a0 -/* D64688 802400A8 1040000E */ beqz $v0, .L802400E4 -/* D6468C 802400AC 3C020100 */ lui $v0, 0x100 -.L802400B0: -/* D64690 802400B0 03E00008 */ jr $ra -/* D64694 802400B4 0080102D */ daddu $v0, $a0, $zero -.L802400B8: -/* D64698 802400B8 3C02FFF9 */ lui $v0, 0xfff9 -/* D6469C 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D646A0 802400C0 00821821 */ addu $v1, $a0, $v0 -/* D646A4 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D646A8 802400C8 10400005 */ beqz $v0, .L802400E0 -/* D646AC 802400CC 30620001 */ andi $v0, $v1, 1 -/* D646B0 802400D0 1440FFF7 */ bnez $v0, .L802400B0 -/* D646B4 802400D4 24820001 */ addiu $v0, $a0, 1 -/* D646B8 802400D8 03E00008 */ jr $ra -/* D646BC 802400DC 00000000 */ nop -.L802400E0: -/* D646C0 802400E0 3C020100 */ lui $v0, 0x100 -.L802400E4: -/* D646C4 802400E4 03E00008 */ jr $ra -/* D646C8 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_802400EC_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_802400EC_D645E0.s deleted file mode 100644 index 28638884e7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_802400EC_D645E0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_D646CC -/* D646CC 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D646D0 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* D646D4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D646D8 802400F8 3C058024 */ lui $a1, 0x8024 -/* D646DC 802400FC 24A50128 */ addiu $a1, $a1, 0x128 -/* D646E0 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* D646E4 80240104 0C048C56 */ jal bind_dynamic_entity_3 -/* D646E8 80240108 0000202D */ daddu $a0, $zero, $zero -/* D646EC 8024010C 8E03013C */ lw $v1, 0x13c($s0) -/* D646F0 80240110 AC620000 */ sw $v0, ($v1) -/* D646F4 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* D646F8 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* D646FC 8024011C 24020002 */ addiu $v0, $zero, 2 -/* D64700 80240120 03E00008 */ jr $ra -/* D64704 80240124 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_80240128_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_80240128_D645E0.s deleted file mode 100644 index c20a182b1a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_80240128_D645E0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240128_D64708 -/* D64708 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D6470C 8024012C AFB00040 */ sw $s0, 0x40($sp) -/* D64710 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D64714 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D64718 80240138 AFB20048 */ sw $s2, 0x48($sp) -/* D6471C 8024013C AFBF004C */ sw $ra, 0x4c($sp) -/* D64720 80240140 AFB10044 */ sw $s1, 0x44($sp) -/* D64724 80240144 8E020000 */ lw $v0, ($s0) -/* D64728 80240148 821100BE */ lb $s1, 0xbe($s0) -/* D6472C 8024014C 30420001 */ andi $v0, $v0, 1 -/* D64730 80240150 10400061 */ beqz $v0, .L802402D8 -/* D64734 80240154 27B20020 */ addiu $s2, $sp, 0x20 -/* D64738 80240158 8E0400CC */ lw $a0, 0xcc($s0) -/* D6473C 8024015C 0C044181 */ jal get_shadow_by_index -/* D64740 80240160 00000000 */ nop -/* D64744 80240164 0C048B77 */ jal func_80122DDC -/* D64748 80240168 84440008 */ lh $a0, 8($v0) -/* D6474C 8024016C 8C430000 */ lw $v1, ($v0) -/* D64750 80240170 34630200 */ ori $v1, $v1, 0x200 -/* D64754 80240174 AC430000 */ sw $v1, ($v0) -/* D64758 80240178 8E050028 */ lw $a1, 0x28($s0) -/* D6475C 8024017C 8E06002C */ lw $a2, 0x2c($s0) -/* D64760 80240180 27A20030 */ addiu $v0, $sp, 0x30 -/* D64764 80240184 AFA20010 */ sw $v0, 0x10($sp) -/* D64768 80240188 27A20034 */ addiu $v0, $sp, 0x34 -/* D6476C 8024018C AFA20014 */ sw $v0, 0x14($sp) -/* D64770 80240190 C6000030 */ lwc1 $f0, 0x30($s0) -/* D64774 80240194 3C04800A */ lui $a0, 0x800a -/* D64778 80240198 8484A634 */ lh $a0, -0x59cc($a0) -/* D6477C 8024019C 46000007 */ neg.s $f0, $f0 -/* D64780 802401A0 44070000 */ mfc1 $a3, $f0 -/* D64784 802401A4 27A20038 */ addiu $v0, $sp, 0x38 -/* D64788 802401A8 0C00B94E */ jal get_screen_coords -/* D6478C 802401AC AFA20018 */ sw $v0, 0x18($sp) -/* D64790 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D64794 802401B4 0C090008 */ jal func_80240020 -/* D64798 802401B8 00000000 */ nop -/* D6479C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) -/* D647A0 802401C0 3C014307 */ lui $at, 0x4307 -/* D647A4 802401C4 44810000 */ mtc1 $at, $f0 -/* D647A8 802401C8 00000000 */ nop -/* D647AC 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D647B0 802401D0 00000000 */ nop -/* D647B4 802401D4 4500000B */ bc1f .L80240204 -/* D647B8 802401D8 24040002 */ addiu $a0, $zero, 2 -/* D647BC 802401DC 3C014361 */ lui $at, 0x4361 -/* D647C0 802401E0 44810000 */ mtc1 $at, $f0 -/* D647C4 802401E4 00000000 */ nop -/* D647C8 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D647CC 802401EC 00000000 */ nop -/* D647D0 802401F0 45000004 */ bc1f .L80240204 -/* D647D4 802401F4 00000000 */ nop -/* D647D8 802401F8 0C090015 */ jal func_80240054 -/* D647DC 802401FC 0040202D */ daddu $a0, $v0, $zero -/* D647E0 80240200 24040002 */ addiu $a0, $zero, 2 -.L80240204: -/* D647E4 80240204 3C063F80 */ lui $a2, 0x3f80 -/* D647E8 80240208 0C0B76A3 */ jal func_802DDA8C -/* D647EC 8024020C 0040282D */ daddu $a1, $v0, $zero -/* D647F0 80240210 8E020000 */ lw $v0, ($s0) -/* D647F4 80240214 3C030002 */ lui $v1, 2 -/* D647F8 80240218 00431024 */ and $v0, $v0, $v1 -/* D647FC 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 -/* D64800 80240220 24110011 */ addiu $s1, $zero, 0x11 -/* D64804 80240224 9203000E */ lbu $v1, 0xe($s0) -/* D64808 80240228 3C02802E */ lui $v0, 0x802e -/* D6480C 8024022C 90429D70 */ lbu $v0, -0x6290($v0) -/* D64810 80240230 10620018 */ beq $v1, $v0, .L80240294 -/* D64814 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D64818 80240238 1040000B */ beqz $v0, .L80240268 -/* D6481C 8024023C 24110011 */ addiu $s1, $zero, 0x11 -/* D64820 80240240 24040002 */ addiu $a0, $zero, 2 -/* D64824 80240244 2405FFFF */ addiu $a1, $zero, -1 -/* D64828 80240248 24060007 */ addiu $a2, $zero, 7 -/* D6482C 8024024C 0060102D */ daddu $v0, $v1, $zero -/* D64830 80240250 0000382D */ daddu $a3, $zero, $zero -/* D64834 80240254 AFA00010 */ sw $zero, 0x10($sp) -/* D64838 80240258 AFA00014 */ sw $zero, 0x14($sp) -/* D6483C 8024025C AFA0001C */ sw $zero, 0x1c($sp) -/* D64840 80240260 080900A3 */ j .L8024028C -/* D64844 80240264 AFA20018 */ sw $v0, 0x18($sp) -.L80240268: -/* D64848 80240268 2411000D */ addiu $s1, $zero, 0xd -/* D6484C 8024026C 24040002 */ addiu $a0, $zero, 2 -/* D64850 80240270 2405FFFF */ addiu $a1, $zero, -1 -/* D64854 80240274 0000302D */ daddu $a2, $zero, $zero -/* D64858 80240278 00C0382D */ daddu $a3, $a2, $zero -/* D6485C 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* D64860 80240280 AFA00014 */ sw $zero, 0x14($sp) -/* D64864 80240284 AFA00018 */ sw $zero, 0x18($sp) -/* D64868 80240288 AFA0001C */ sw $zero, 0x1c($sp) -.L8024028C: -/* D6486C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D64870 80240290 00000000 */ nop -.L80240294: -/* D64874 80240294 9202000E */ lbu $v0, 0xe($s0) -/* D64878 80240298 3C01802E */ lui $at, 0x802e -/* D6487C 8024029C A0229D70 */ sb $v0, -0x6290($at) -/* D64880 802402A0 080900AD */ j .L802402B4 -/* D64884 802402A4 0240202D */ daddu $a0, $s2, $zero -.L802402A8: -/* D64888 802402A8 3C01802E */ lui $at, 0x802e -/* D6488C 802402AC A0209D70 */ sb $zero, -0x6290($at) -/* D64890 802402B0 0240202D */ daddu $a0, $s2, $zero -.L802402B4: -/* D64894 802402B4 AC910000 */ sw $s1, ($a0) -/* D64898 802402B8 AC900008 */ sw $s0, 8($a0) -/* D6489C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D648A0 802402C0 3C038024 */ lui $v1, 0x8024 -/* D648A4 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 -/* D648A8 802402C8 AC83000C */ sw $v1, 0xc($a0) -/* D648AC 802402CC 00021023 */ negu $v0, $v0 -/* D648B0 802402D0 0C047644 */ jal queue_render_task -/* D648B4 802402D4 AC820004 */ sw $v0, 4($a0) -.L802402D8: -/* D648B8 802402D8 8FBF004C */ lw $ra, 0x4c($sp) -/* D648BC 802402DC 8FB20048 */ lw $s2, 0x48($sp) -/* D648C0 802402E0 8FB10044 */ lw $s1, 0x44($sp) -/* D648C4 802402E4 8FB00040 */ lw $s0, 0x40($sp) -/* D648C8 802402E8 03E00008 */ jr $ra -/* D648CC 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_802402F0_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_802402F0_D645E0.s deleted file mode 100644 index 14209a7254..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_802402F0_D645E0.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D648D0 -/* D648D0 802402F0 3C03800A */ lui $v1, 0x800a -/* D648D4 802402F4 8463A634 */ lh $v1, -0x59cc($v1) -/* D648D8 802402F8 3C07BF80 */ lui $a3, 0xbf80 -/* D648DC 802402FC 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D648E0 80240300 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D648E4 80240304 4480A000 */ mtc1 $zero, $f20 -/* D648E8 80240308 AFB1011C */ sw $s1, 0x11c($sp) -/* D648EC 8024030C 0080882D */ daddu $s1, $a0, $zero -/* D648F0 80240310 AFB00118 */ sw $s0, 0x118($sp) -/* D648F4 80240314 27B00098 */ addiu $s0, $sp, 0x98 -/* D648F8 80240318 AFBF0120 */ sw $ra, 0x120($sp) -/* D648FC 8024031C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D64900 80240320 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D64904 80240324 00031080 */ sll $v0, $v1, 2 -/* D64908 80240328 00431021 */ addu $v0, $v0, $v1 -/* D6490C 8024032C 00021080 */ sll $v0, $v0, 2 -/* D64910 80240330 00431023 */ subu $v0, $v0, $v1 -/* D64914 80240334 000218C0 */ sll $v1, $v0, 3 -/* D64918 80240338 00431021 */ addu $v0, $v0, $v1 -/* D6491C 8024033C 000210C0 */ sll $v0, $v0, 3 -/* D64920 80240340 3C01800B */ lui $at, 0x800b -/* D64924 80240344 00220821 */ addu $at, $at, $v0 -/* D64928 80240348 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D6492C 8024034C 4406A000 */ mfc1 $a2, $f20 -/* D64930 80240350 4600B587 */ neg.s $f22, $f22 -/* D64934 80240354 4405B000 */ mfc1 $a1, $f22 -/* D64938 80240358 0200202D */ daddu $a0, $s0, $zero -/* D6493C 8024035C 0C019EC8 */ jal guRotateF -/* D64940 80240360 E7B40010 */ swc1 $f20, 0x10($sp) -/* D64944 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D64948 80240368 0C00A6C9 */ jal clamp_angle -/* D6494C 8024036C 00000000 */ nop -/* D64950 80240370 44050000 */ mfc1 $a1, $f0 -/* D64954 80240374 4406A000 */ mfc1 $a2, $f20 -/* D64958 80240378 4407A000 */ mfc1 $a3, $f20 -/* D6495C 8024037C 3C013F80 */ lui $at, 0x3f80 -/* D64960 80240380 4481C000 */ mtc1 $at, $f24 -/* D64964 80240384 27A40018 */ addiu $a0, $sp, 0x18 -/* D64968 80240388 0C019EC8 */ jal guRotateF -/* D6496C 8024038C E7B80010 */ swc1 $f24, 0x10($sp) -/* D64970 80240390 0200202D */ daddu $a0, $s0, $zero -/* D64974 80240394 27A50018 */ addiu $a1, $sp, 0x18 -/* D64978 80240398 0C019D80 */ jal guMtxCatF -/* D6497C 8024039C 00A0302D */ daddu $a2, $a1, $zero -/* D64980 802403A0 4405B000 */ mfc1 $a1, $f22 -/* D64984 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D64988 802403A8 4407C000 */ mfc1 $a3, $f24 -/* D6498C 802403AC 0200202D */ daddu $a0, $s0, $zero -/* D64990 802403B0 0C019EC8 */ jal guRotateF -/* D64994 802403B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D64998 802403B8 27A40018 */ addiu $a0, $sp, 0x18 -/* D6499C 802403BC 0200282D */ daddu $a1, $s0, $zero -/* D649A0 802403C0 0C019D80 */ jal guMtxCatF -/* D649A4 802403C4 0080302D */ daddu $a2, $a0, $zero -/* D649A8 802403C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D649AC 802403CC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D649B0 802403D0 4406A000 */ mfc1 $a2, $f20 -/* D649B4 802403D4 4407C000 */ mfc1 $a3, $f24 -/* D649B8 802403D8 0C019EC8 */ jal guRotateF -/* D649BC 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D649C0 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* D649C4 802403E4 0200282D */ daddu $a1, $s0, $zero -/* D649C8 802403E8 0C019D80 */ jal guMtxCatF -/* D649CC 802403EC 0080302D */ daddu $a2, $a0, $zero -/* D649D0 802403F0 3C013F36 */ lui $at, 0x3f36 -/* D649D4 802403F4 3421DB6E */ ori $at, $at, 0xdb6e -/* D649D8 802403F8 44810000 */ mtc1 $at, $f0 -/* D649DC 802403FC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D649E0 80240400 44050000 */ mfc1 $a1, $f0 -/* D649E4 80240404 0200202D */ daddu $a0, $s0, $zero -/* D649E8 80240408 00A0302D */ daddu $a2, $a1, $zero -/* D649EC 8024040C 0C019DF0 */ jal guScaleF -/* D649F0 80240410 00A0382D */ daddu $a3, $a1, $zero -/* D649F4 80240414 27A40018 */ addiu $a0, $sp, 0x18 -/* D649F8 80240418 0200282D */ daddu $a1, $s0, $zero -/* D649FC 8024041C 0C019D80 */ jal guMtxCatF -/* D64A00 80240420 0080302D */ daddu $a2, $a0, $zero -/* D64A04 80240424 27B00058 */ addiu $s0, $sp, 0x58 -/* D64A08 80240428 C6200030 */ lwc1 $f0, 0x30($s1) -/* D64A0C 8024042C 3C014040 */ lui $at, 0x4040 -/* D64A10 80240430 44811000 */ mtc1 $at, $f2 -/* D64A14 80240434 46000007 */ neg.s $f0, $f0 -/* D64A18 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* D64A1C 8024043C 8E250028 */ lw $a1, 0x28($s1) -/* D64A20 80240440 8E26002C */ lw $a2, 0x2c($s1) -/* D64A24 80240444 44070000 */ mfc1 $a3, $f0 -/* D64A28 80240448 0C019E40 */ jal guTranslateF -/* D64A2C 8024044C 0200202D */ daddu $a0, $s0, $zero -/* D64A30 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* D64A34 80240454 0200282D */ daddu $a1, $s0, $zero -/* D64A38 80240458 0C019D80 */ jal guMtxCatF -/* D64A3C 8024045C 0080302D */ daddu $a2, $a0, $zero -/* D64A40 80240460 24040002 */ addiu $a0, $zero, 2 -/* D64A44 80240464 0000282D */ daddu $a1, $zero, $zero -/* D64A48 80240468 00A0302D */ daddu $a2, $a1, $zero -/* D64A4C 8024046C 00A0382D */ daddu $a3, $a1, $zero -/* D64A50 80240470 27A20018 */ addiu $v0, $sp, 0x18 -/* D64A54 80240474 0C0B7710 */ jal render_sprite -/* D64A58 80240478 AFA20010 */ sw $v0, 0x10($sp) -/* D64A5C 8024047C 8FBF0120 */ lw $ra, 0x120($sp) -/* D64A60 80240480 8FB1011C */ lw $s1, 0x11c($sp) -/* D64A64 80240484 8FB00118 */ lw $s0, 0x118($sp) -/* D64A68 80240488 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D64A6C 8024048C D7B60130 */ ldc1 $f22, 0x130($sp) -/* D64A70 80240490 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D64A74 80240494 03E00008 */ jr $ra -/* D64A78 80240498 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_8024049C_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_8024049C_D645E0.s deleted file mode 100644 index 49d3aeacf1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_8024049C_D645E0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_D64A7C -/* D64A7C 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D64A80 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* D64A84 802404A4 0080802D */ daddu $s0, $a0, $zero -/* D64A88 802404A8 AFBF0014 */ sw $ra, 0x14($sp) -/* D64A8C 802404AC 8E020084 */ lw $v0, 0x84($s0) -/* D64A90 802404B0 0440000E */ bltz $v0, .L802404EC -/* D64A94 802404B4 28420002 */ slti $v0, $v0, 2 -/* D64A98 802404B8 1040000C */ beqz $v0, .L802404EC -/* D64A9C 802404BC 00000000 */ nop -/* D64AA0 802404C0 3C058024 */ lui $a1, 0x8024 -/* D64AA4 802404C4 24A50500 */ addiu $a1, $a1, 0x500 -/* D64AA8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 -/* D64AAC 802404CC 0000202D */ daddu $a0, $zero, $zero -/* D64AB0 802404D0 8E03013C */ lw $v1, 0x13c($s0) -/* D64AB4 802404D4 AC620000 */ sw $v0, ($v1) -/* D64AB8 802404D8 3C03800A */ lui $v1, %hi(D_8009A650) -/* D64ABC 802404DC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D64AC0 802404E0 8C620000 */ lw $v0, ($v1) -/* D64AC4 802404E4 34420080 */ ori $v0, $v0, 0x80 -/* D64AC8 802404E8 AC620000 */ sw $v0, ($v1) -.L802404EC: -/* D64ACC 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* D64AD0 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* D64AD4 802404F4 24020002 */ addiu $v0, $zero, 2 -/* D64AD8 802404F8 03E00008 */ jr $ra -/* D64ADC 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_80240500_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_80240500_D645E0.s deleted file mode 100644 index f3ebfd9cfd..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_80240500_D645E0.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_D64AE0 -/* D64AE0 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D64AE4 80240504 AFB00040 */ sw $s0, 0x40($sp) -/* D64AE8 80240508 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D64AEC 8024050C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D64AF0 80240510 AFB10044 */ sw $s1, 0x44($sp) -/* D64AF4 80240514 AFBF004C */ sw $ra, 0x4c($sp) -/* D64AF8 80240518 AFB20048 */ sw $s2, 0x48($sp) -/* D64AFC 8024051C 8E020000 */ lw $v0, ($s0) -/* D64B00 80240520 821200BE */ lb $s2, 0xbe($s0) -/* D64B04 80240524 30420001 */ andi $v0, $v0, 1 -/* D64B08 80240528 10400052 */ beqz $v0, .L80240674 -/* D64B0C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 -/* D64B10 80240530 8E0400CC */ lw $a0, 0xcc($s0) -/* D64B14 80240534 0C044181 */ jal get_shadow_by_index -/* D64B18 80240538 00000000 */ nop -/* D64B1C 8024053C 0C048B77 */ jal func_80122DDC -/* D64B20 80240540 84440008 */ lh $a0, 8($v0) -/* D64B24 80240544 8E050028 */ lw $a1, 0x28($s0) -/* D64B28 80240548 8E070030 */ lw $a3, 0x30($s0) -/* D64B2C 8024054C 27A20030 */ addiu $v0, $sp, 0x30 -/* D64B30 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* D64B34 80240554 27A20034 */ addiu $v0, $sp, 0x34 -/* D64B38 80240558 AFA20014 */ sw $v0, 0x14($sp) -/* D64B3C 8024055C 27A20038 */ addiu $v0, $sp, 0x38 -/* D64B40 80240560 AFA20018 */ sw $v0, 0x18($sp) -/* D64B44 80240564 C600002C */ lwc1 $f0, 0x2c($s0) -/* D64B48 80240568 3C04800A */ lui $a0, 0x800a -/* D64B4C 8024056C 8484A634 */ lh $a0, -0x59cc($a0) -/* D64B50 80240570 46000007 */ neg.s $f0, $f0 -/* D64B54 80240574 44060000 */ mfc1 $a2, $f0 -/* D64B58 80240578 0C00B94E */ jal get_screen_coords -/* D64B5C 8024057C 00000000 */ nop -/* D64B60 80240580 8E0500A4 */ lw $a1, 0xa4($s0) -/* D64B64 80240584 3C063F80 */ lui $a2, 0x3f80 -/* D64B68 80240588 0C0B76A3 */ jal func_802DDA8C -/* D64B6C 8024058C 24040001 */ addiu $a0, $zero, 1 -/* D64B70 80240590 8E020000 */ lw $v0, ($s0) -/* D64B74 80240594 3C030002 */ lui $v1, 2 -/* D64B78 80240598 00431024 */ and $v0, $v0, $v1 -/* D64B7C 8024059C 54400022 */ bnel $v0, $zero, .L80240628 -/* D64B80 802405A0 24120011 */ addiu $s2, $zero, 0x11 -/* D64B84 802405A4 9203000E */ lbu $v1, 0xe($s0) -/* D64B88 802405A8 3C02802E */ lui $v0, 0x802e -/* D64B8C 802405AC 90429D71 */ lbu $v0, -0x628f($v0) -/* D64B90 802405B0 10620018 */ beq $v1, $v0, .L80240614 -/* D64B94 802405B4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D64B98 802405B8 1040000B */ beqz $v0, .L802405E8 -/* D64B9C 802405BC 24120011 */ addiu $s2, $zero, 0x11 -/* D64BA0 802405C0 24040001 */ addiu $a0, $zero, 1 -/* D64BA4 802405C4 2405FFFF */ addiu $a1, $zero, -1 -/* D64BA8 802405C8 24060007 */ addiu $a2, $zero, 7 -/* D64BAC 802405CC 0060102D */ daddu $v0, $v1, $zero -/* D64BB0 802405D0 0000382D */ daddu $a3, $zero, $zero -/* D64BB4 802405D4 AFA00010 */ sw $zero, 0x10($sp) -/* D64BB8 802405D8 AFA00014 */ sw $zero, 0x14($sp) -/* D64BBC 802405DC AFA0001C */ sw $zero, 0x1c($sp) -/* D64BC0 802405E0 08090183 */ j .L8024060C -/* D64BC4 802405E4 AFA20018 */ sw $v0, 0x18($sp) -.L802405E8: -/* D64BC8 802405E8 2412000D */ addiu $s2, $zero, 0xd -/* D64BCC 802405EC 24040001 */ addiu $a0, $zero, 1 -/* D64BD0 802405F0 2405FFFF */ addiu $a1, $zero, -1 -/* D64BD4 802405F4 0000302D */ daddu $a2, $zero, $zero -/* D64BD8 802405F8 00C0382D */ daddu $a3, $a2, $zero -/* D64BDC 802405FC AFA00010 */ sw $zero, 0x10($sp) -/* D64BE0 80240600 AFA00014 */ sw $zero, 0x14($sp) -/* D64BE4 80240604 AFA00018 */ sw $zero, 0x18($sp) -/* D64BE8 80240608 AFA0001C */ sw $zero, 0x1c($sp) -.L8024060C: -/* D64BEC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D64BF0 80240610 00000000 */ nop -.L80240614: -/* D64BF4 80240614 9202000E */ lbu $v0, 0xe($s0) -/* D64BF8 80240618 3C01802E */ lui $at, 0x802e -/* D64BFC 8024061C A0229D71 */ sb $v0, -0x628f($at) -/* D64C00 80240620 0809018C */ j .L80240630 -/* D64C04 80240624 00000000 */ nop -.L80240628: -/* D64C08 80240628 3C01802E */ lui $at, 0x802e -/* D64C0C 8024062C A0209D71 */ sb $zero, -0x628f($at) -.L80240630: -/* D64C10 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D64C14 80240634 3C048024 */ lui $a0, 0x8024 -/* D64C18 80240638 24840870 */ addiu $a0, $a0, 0x870 -/* D64C1C 8024063C AE320000 */ sw $s2, ($s1) -/* D64C20 80240640 AE300008 */ sw $s0, 8($s1) -/* D64C24 80240644 00021023 */ negu $v0, $v0 -/* D64C28 80240648 AE220004 */ sw $v0, 4($s1) -/* D64C2C 8024064C 8E020000 */ lw $v0, ($s0) -/* D64C30 80240650 3C030002 */ lui $v1, 2 -/* D64C34 80240654 00431024 */ and $v0, $v0, $v1 -/* D64C38 80240658 54400004 */ bnel $v0, $zero, .L8024066C -/* D64C3C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D64C40 80240660 3C048024 */ lui $a0, 0x8024 -/* D64C44 80240664 2484068C */ addiu $a0, $a0, 0x68c -/* D64C48 80240668 AE24000C */ sw $a0, 0xc($s1) -.L8024066C: -/* D64C4C 8024066C 0C047644 */ jal queue_render_task -/* D64C50 80240670 0220202D */ daddu $a0, $s1, $zero -.L80240674: -/* D64C54 80240674 8FBF004C */ lw $ra, 0x4c($sp) -/* D64C58 80240678 8FB20048 */ lw $s2, 0x48($sp) -/* D64C5C 8024067C 8FB10044 */ lw $s1, 0x44($sp) -/* D64C60 80240680 8FB00040 */ lw $s0, 0x40($sp) -/* D64C64 80240684 03E00008 */ jr $ra -/* D64C68 80240688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_8024068C_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_8024068C_D645E0.s deleted file mode 100644 index ce94fe01eb..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_8024068C_D645E0.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_D64C6C -/* D64C6C 8024068C 3C03800A */ lui $v1, 0x800a -/* D64C70 80240690 8463A634 */ lh $v1, -0x59cc($v1) -/* D64C74 80240694 3C07BF80 */ lui $a3, 0xbf80 -/* D64C78 80240698 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D64C7C 8024069C F7B40128 */ sdc1 $f20, 0x128($sp) -/* D64C80 802406A0 4480A000 */ mtc1 $zero, $f20 -/* D64C84 802406A4 AFB1011C */ sw $s1, 0x11c($sp) -/* D64C88 802406A8 0080882D */ daddu $s1, $a0, $zero -/* D64C8C 802406AC AFB00118 */ sw $s0, 0x118($sp) -/* D64C90 802406B0 27B00098 */ addiu $s0, $sp, 0x98 -/* D64C94 802406B4 AFBF0120 */ sw $ra, 0x120($sp) -/* D64C98 802406B8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D64C9C 802406BC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D64CA0 802406C0 00031080 */ sll $v0, $v1, 2 -/* D64CA4 802406C4 00431021 */ addu $v0, $v0, $v1 -/* D64CA8 802406C8 00021080 */ sll $v0, $v0, 2 -/* D64CAC 802406CC 00431023 */ subu $v0, $v0, $v1 -/* D64CB0 802406D0 000218C0 */ sll $v1, $v0, 3 -/* D64CB4 802406D4 00431021 */ addu $v0, $v0, $v1 -/* D64CB8 802406D8 000210C0 */ sll $v0, $v0, 3 -/* D64CBC 802406DC 3C01800B */ lui $at, 0x800b -/* D64CC0 802406E0 00220821 */ addu $at, $at, $v0 -/* D64CC4 802406E4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D64CC8 802406E8 4406A000 */ mfc1 $a2, $f20 -/* D64CCC 802406EC 4600B587 */ neg.s $f22, $f22 -/* D64CD0 802406F0 4405B000 */ mfc1 $a1, $f22 -/* D64CD4 802406F4 0200202D */ daddu $a0, $s0, $zero -/* D64CD8 802406F8 0C019EC8 */ jal guRotateF -/* D64CDC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) -/* D64CE0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D64CE4 80240704 0C00A6C9 */ jal clamp_angle -/* D64CE8 80240708 00000000 */ nop -/* D64CEC 8024070C 44050000 */ mfc1 $a1, $f0 -/* D64CF0 80240710 4406A000 */ mfc1 $a2, $f20 -/* D64CF4 80240714 4407A000 */ mfc1 $a3, $f20 -/* D64CF8 80240718 3C013F80 */ lui $at, 0x3f80 -/* D64CFC 8024071C 4481C000 */ mtc1 $at, $f24 -/* D64D00 80240720 27A40018 */ addiu $a0, $sp, 0x18 -/* D64D04 80240724 0C019EC8 */ jal guRotateF -/* D64D08 80240728 E7B80010 */ swc1 $f24, 0x10($sp) -/* D64D0C 8024072C 0200202D */ daddu $a0, $s0, $zero -/* D64D10 80240730 27A50018 */ addiu $a1, $sp, 0x18 -/* D64D14 80240734 0C019D80 */ jal guMtxCatF -/* D64D18 80240738 00A0302D */ daddu $a2, $a1, $zero -/* D64D1C 8024073C 4405B000 */ mfc1 $a1, $f22 -/* D64D20 80240740 4406A000 */ mfc1 $a2, $f20 -/* D64D24 80240744 4407C000 */ mfc1 $a3, $f24 -/* D64D28 80240748 0200202D */ daddu $a0, $s0, $zero -/* D64D2C 8024074C 0C019EC8 */ jal guRotateF -/* D64D30 80240750 E7B40010 */ swc1 $f20, 0x10($sp) -/* D64D34 80240754 27A40018 */ addiu $a0, $sp, 0x18 -/* D64D38 80240758 0200282D */ daddu $a1, $s0, $zero -/* D64D3C 8024075C 0C019D80 */ jal guMtxCatF -/* D64D40 80240760 0080302D */ daddu $a2, $a0, $zero -/* D64D44 80240764 E7B40010 */ swc1 $f20, 0x10($sp) -/* D64D48 80240768 8E2500A8 */ lw $a1, 0xa8($s1) -/* D64D4C 8024076C 4406A000 */ mfc1 $a2, $f20 -/* D64D50 80240770 4407C000 */ mfc1 $a3, $f24 -/* D64D54 80240774 0C019EC8 */ jal guRotateF -/* D64D58 80240778 0200202D */ daddu $a0, $s0, $zero -/* D64D5C 8024077C 27A40018 */ addiu $a0, $sp, 0x18 -/* D64D60 80240780 0200282D */ daddu $a1, $s0, $zero -/* D64D64 80240784 0C019D80 */ jal guMtxCatF -/* D64D68 80240788 0080302D */ daddu $a2, $a0, $zero -/* D64D6C 8024078C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D64D70 80240790 3C013F36 */ lui $at, 0x3f36 -/* D64D74 80240794 3421DB6E */ ori $at, $at, 0xdb6e -/* D64D78 80240798 44810000 */ mtc1 $at, $f0 -/* D64D7C 8024079C 0200202D */ daddu $a0, $s0, $zero -/* D64D80 802407A0 44050000 */ mfc1 $a1, $f0 -/* D64D84 802407A4 3C06BF36 */ lui $a2, 0xbf36 -/* D64D88 802407A8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D64D8C 802407AC 0C019DF0 */ jal guScaleF -/* D64D90 802407B0 00A0382D */ daddu $a3, $a1, $zero -/* D64D94 802407B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D64D98 802407B8 0200282D */ daddu $a1, $s0, $zero -/* D64D9C 802407BC 0C019D80 */ jal guMtxCatF -/* D64DA0 802407C0 0080302D */ daddu $a2, $a0, $zero -/* D64DA4 802407C4 27B00058 */ addiu $s0, $sp, 0x58 -/* D64DA8 802407C8 8E250028 */ lw $a1, 0x28($s1) -/* D64DAC 802407CC C620002C */ lwc1 $f0, 0x2c($s1) -/* D64DB0 802407D0 8E270030 */ lw $a3, 0x30($s1) -/* D64DB4 802407D4 46000007 */ neg.s $f0, $f0 -/* D64DB8 802407D8 44060000 */ mfc1 $a2, $f0 -/* D64DBC 802407DC 0C019E40 */ jal guTranslateF -/* D64DC0 802407E0 0200202D */ daddu $a0, $s0, $zero -/* D64DC4 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D64DC8 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D64DCC 802407EC 0C019D80 */ jal guMtxCatF -/* D64DD0 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D64DD4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D64DD8 802407F8 3C0142B4 */ lui $at, 0x42b4 -/* D64DDC 802407FC 44810000 */ mtc1 $at, $f0 -/* D64DE0 80240800 00000000 */ nop -/* D64DE4 80240804 4602003E */ c.le.s $f0, $f2 -/* D64DE8 80240808 00000000 */ nop -/* D64DEC 8024080C 4500000A */ bc1f .L80240838 -/* D64DF0 80240810 24040001 */ addiu $a0, $zero, 1 -/* D64DF4 80240814 3C014387 */ lui $at, 0x4387 -/* D64DF8 80240818 44810000 */ mtc1 $at, $f0 -/* D64DFC 8024081C 00000000 */ nop -/* D64E00 80240820 4600103C */ c.lt.s $f2, $f0 -/* D64E04 80240824 00000000 */ nop -/* D64E08 80240828 45000004 */ bc1f .L8024083C -/* D64E0C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 -/* D64E10 80240830 3C041000 */ lui $a0, 0x1000 -/* D64E14 80240834 34840001 */ ori $a0, $a0, 1 -.L80240838: -/* D64E18 80240838 27A20018 */ addiu $v0, $sp, 0x18 -.L8024083C: -/* D64E1C 8024083C 0000282D */ daddu $a1, $zero, $zero -/* D64E20 80240840 00A0302D */ daddu $a2, $a1, $zero -/* D64E24 80240844 00A0382D */ daddu $a3, $a1, $zero -/* D64E28 80240848 0C0B7710 */ jal render_sprite -/* D64E2C 8024084C AFA20010 */ sw $v0, 0x10($sp) -/* D64E30 80240850 8FBF0120 */ lw $ra, 0x120($sp) -/* D64E34 80240854 8FB1011C */ lw $s1, 0x11c($sp) -/* D64E38 80240858 8FB00118 */ lw $s0, 0x118($sp) -/* D64E3C 8024085C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D64E40 80240860 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D64E44 80240864 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D64E48 80240868 03E00008 */ jr $ra -/* D64E4C 8024086C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_80240870_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_80240870_D645E0.s deleted file mode 100644 index f32e2b4f8a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_80240870_D645E0.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_D64E50 -/* D64E50 80240870 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D64E54 80240874 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D64E58 80240878 4480B000 */ mtc1 $zero, $f22 -/* D64E5C 8024087C AFB10134 */ sw $s1, 0x134($sp) -/* D64E60 80240880 0080882D */ daddu $s1, $a0, $zero -/* D64E64 80240884 AFB3013C */ sw $s3, 0x13c($sp) -/* D64E68 80240888 0000982D */ daddu $s3, $zero, $zero -/* D64E6C 8024088C AFB60148 */ sw $s6, 0x148($sp) -/* D64E70 80240890 3C16800B */ lui $s6, %hi(gCameras) -/* D64E74 80240894 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D64E78 80240898 AFB50144 */ sw $s5, 0x144($sp) -/* D64E7C 8024089C 241500FF */ addiu $s5, $zero, 0xff -/* D64E80 802408A0 AFB00130 */ sw $s0, 0x130($sp) -/* D64E84 802408A4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D64E88 802408A8 AFB20138 */ sw $s2, 0x138($sp) -/* D64E8C 802408AC 27B20060 */ addiu $s2, $sp, 0x60 -/* D64E90 802408B0 AFB40140 */ sw $s4, 0x140($sp) -/* D64E94 802408B4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D64E98 802408B8 AFBF014C */ sw $ra, 0x14c($sp) -/* D64E9C 802408BC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D64EA0 802408C0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D64EA4 802408C4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D64EA8 802408C8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D64EAC 802408CC F7B40150 */ sdc1 $f20, 0x150($sp) -.L802408D0: -/* D64EB0 802408D0 3C03800A */ lui $v1, 0x800a -/* D64EB4 802408D4 8463A634 */ lh $v1, -0x59cc($v1) -/* D64EB8 802408D8 00031080 */ sll $v0, $v1, 2 -/* D64EBC 802408DC 00431021 */ addu $v0, $v0, $v1 -/* D64EC0 802408E0 00021080 */ sll $v0, $v0, 2 -/* D64EC4 802408E4 00431023 */ subu $v0, $v0, $v1 -/* D64EC8 802408E8 000218C0 */ sll $v1, $v0, 3 -/* D64ECC 802408EC 00431021 */ addu $v0, $v0, $v1 -/* D64ED0 802408F0 000210C0 */ sll $v0, $v0, 3 -/* D64ED4 802408F4 00561021 */ addu $v0, $v0, $s6 -/* D64ED8 802408F8 C440006C */ lwc1 $f0, 0x6c($v0) -/* D64EDC 802408FC 16600065 */ bnez $s3, .L80240A94 -/* D64EE0 80240900 46000507 */ neg.s $f20, $f0 -/* D64EE4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D64EE8 80240908 3C0142B4 */ lui $at, 0x42b4 -/* D64EEC 8024090C 44810000 */ mtc1 $at, $f0 -/* D64EF0 80240910 00000000 */ nop -/* D64EF4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D64EF8 80240918 00000000 */ nop -/* D64EFC 8024091C 4500000A */ bc1f .L80240948 -/* D64F00 80240920 00000000 */ nop -/* D64F04 80240924 3C014334 */ lui $at, 0x4334 -/* D64F08 80240928 44812000 */ mtc1 $at, $f4 -/* D64F0C 8024092C 00000000 */ nop -/* D64F10 80240930 4604103E */ c.le.s $f2, $f4 -/* D64F14 80240934 00000000 */ nop -/* D64F18 80240938 45000003 */ bc1f .L80240948 -/* D64F1C 8024093C 00000000 */ nop -/* D64F20 80240940 08090276 */ j .L802409D8 -/* D64F24 80240944 46022501 */ sub.s $f20, $f4, $f2 -.L80240948: -/* D64F28 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D64F2C 8024094C 3C014334 */ lui $at, 0x4334 -/* D64F30 80240950 44812000 */ mtc1 $at, $f4 -/* D64F34 80240954 00000000 */ nop -/* D64F38 80240958 4600203C */ c.lt.s $f4, $f0 -/* D64F3C 8024095C 00000000 */ nop -/* D64F40 80240960 4500000C */ bc1f .L80240994 -/* D64F44 80240964 00000000 */ nop -/* D64F48 80240968 3C014387 */ lui $at, 0x4387 -/* D64F4C 8024096C 44812000 */ mtc1 $at, $f4 -/* D64F50 80240970 00000000 */ nop -/* D64F54 80240974 4604003E */ c.le.s $f0, $f4 -/* D64F58 80240978 00000000 */ nop -/* D64F5C 8024097C 45000008 */ bc1f .L802409A0 -/* D64F60 80240980 00000000 */ nop -/* D64F64 80240984 3C014334 */ lui $at, 0x4334 -/* D64F68 80240988 44812000 */ mtc1 $at, $f4 -/* D64F6C 8024098C 08090276 */ j .L802409D8 -/* D64F70 80240990 46040501 */ sub.s $f20, $f0, $f4 -.L80240994: -/* D64F74 80240994 3C014387 */ lui $at, 0x4387 -/* D64F78 80240998 44812000 */ mtc1 $at, $f4 -/* D64F7C 8024099C 00000000 */ nop -.L802409A0: -/* D64F80 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D64F84 802409A4 00000000 */ nop -/* D64F88 802409A8 4500000A */ bc1f .L802409D4 -/* D64F8C 802409AC 00000000 */ nop -/* D64F90 802409B0 3C0143B4 */ lui $at, 0x43b4 -/* D64F94 802409B4 44811000 */ mtc1 $at, $f2 -/* D64F98 802409B8 00000000 */ nop -/* D64F9C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D64FA0 802409C0 00000000 */ nop -/* D64FA4 802409C4 45000003 */ bc1f .L802409D4 -/* D64FA8 802409C8 00000000 */ nop -/* D64FAC 802409CC 08090276 */ j .L802409D8 -/* D64FB0 802409D0 46001501 */ sub.s $f20, $f2, $f0 -.L802409D4: -/* D64FB4 802409D4 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L802409D8: -/* D64FB8 802409D8 3C0141C8 */ lui $at, 0x41c8 -/* D64FBC 802409DC 44810000 */ mtc1 $at, $f0 -/* D64FC0 802409E0 00000000 */ nop -/* D64FC4 802409E4 4600A003 */ div.s $f0, $f20, $f0 -/* D64FC8 802409E8 4600010D */ trunc.w.s $f4, $f0 -/* D64FCC 802409EC 44072000 */ mfc1 $a3, $f4 -/* D64FD0 802409F0 00000000 */ nop -/* D64FD4 802409F4 00071100 */ sll $v0, $a3, 4 -/* D64FD8 802409F8 00471023 */ subu $v0, $v0, $a3 -/* D64FDC 802409FC 00021080 */ sll $v0, $v0, 2 -/* D64FE0 80240A00 02A23823 */ subu $a3, $s5, $v0 -/* D64FE4 80240A04 28E20064 */ slti $v0, $a3, 0x64 -/* D64FE8 80240A08 54400001 */ bnel $v0, $zero, .L80240A10 -/* D64FEC 80240A0C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A10: -/* D64FF0 80240A10 24040001 */ addiu $a0, $zero, 1 -/* D64FF4 80240A14 2405FFFF */ addiu $a1, $zero, -1 -/* D64FF8 80240A18 24060006 */ addiu $a2, $zero, 6 -/* D64FFC 80240A1C AFA70010 */ sw $a3, 0x10($sp) -/* D65000 80240A20 AFA70014 */ sw $a3, 0x14($sp) -/* D65004 80240A24 AFB50018 */ sw $s5, 0x18($sp) -/* D65008 80240A28 0C0B77B9 */ jal func_802DDEE4 -/* D6500C 80240A2C AFA0001C */ sw $zero, 0x1c($sp) -/* D65010 80240A30 4405A000 */ mfc1 $a1, $f20 -/* D65014 80240A34 4406B000 */ mfc1 $a2, $f22 -/* D65018 80240A38 3C07BF80 */ lui $a3, 0xbf80 -/* D6501C 80240A3C 0200202D */ daddu $a0, $s0, $zero -/* D65020 80240A40 0C019EC8 */ jal guRotateF -/* D65024 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D65028 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D6502C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D65030 80240A50 00000000 */ nop -/* D65034 80240A54 44050000 */ mfc1 $a1, $f0 -/* D65038 80240A58 4406B000 */ mfc1 $a2, $f22 -/* D6503C 80240A5C 4407B000 */ mfc1 $a3, $f22 -/* D65040 80240A60 3C013F80 */ lui $at, 0x3f80 -/* D65044 80240A64 44812000 */ mtc1 $at, $f4 -/* D65048 80240A68 27A40020 */ addiu $a0, $sp, 0x20 -/* D6504C 80240A6C 0C019EC8 */ jal guRotateF -/* D65050 80240A70 E7A40010 */ swc1 $f4, 0x10($sp) -/* D65054 80240A74 0200202D */ daddu $a0, $s0, $zero -/* D65058 80240A78 27A50020 */ addiu $a1, $sp, 0x20 -/* D6505C 80240A7C 0C019D80 */ jal guMtxCatF -/* D65060 80240A80 00A0302D */ daddu $a2, $a1, $zero -/* D65064 80240A84 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D65068 80240A88 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D6506C 80240A8C 080902D6 */ j .L80240B58 -/* D65070 80240A90 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240A94: -/* D65074 80240A94 0260202D */ daddu $a0, $s3, $zero -/* D65078 80240A98 27A50120 */ addiu $a1, $sp, 0x120 -/* D6507C 80240A9C 27A60124 */ addiu $a2, $sp, 0x124 -/* D65080 80240AA0 0C03964E */ jal func_800E5938 -/* D65084 80240AA4 27A70128 */ addiu $a3, $sp, 0x128 -/* D65088 80240AA8 8FA60124 */ lw $a2, 0x124($sp) -/* D6508C 80240AAC 3C028000 */ lui $v0, 0x8000 -/* D65090 80240AB0 14C20004 */ bne $a2, $v0, .L80240AC4 -/* D65094 80240AB4 46000606 */ mov.s $f24, $f0 -/* D65098 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D6509C 80240ABC 080902B5 */ j .L80240AD4 -/* D650A0 80240AC0 24040001 */ addiu $a0, $zero, 1 -.L80240AC4: -/* D650A4 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D650A8 80240AC8 00000000 */ nop -/* D650AC 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D650B0 80240AD0 24040001 */ addiu $a0, $zero, 1 -.L80240AD4: -/* D650B4 80240AD4 2405FFFF */ addiu $a1, $zero, -1 -/* D650B8 80240AD8 24060007 */ addiu $a2, $zero, 7 -/* D650BC 80240ADC 0000382D */ daddu $a3, $zero, $zero -/* D650C0 80240AE0 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D650C4 80240AE4 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D650C8 80240AE8 24020040 */ addiu $v0, $zero, 0x40 -/* D650CC 80240AEC AFA00010 */ sw $zero, 0x10($sp) -/* D650D0 80240AF0 AFA00014 */ sw $zero, 0x14($sp) -/* D650D4 80240AF4 AFA20018 */ sw $v0, 0x18($sp) -/* D650D8 80240AF8 0C0B77B9 */ jal func_802DDEE4 -/* D650DC 80240AFC AFA0001C */ sw $zero, 0x1c($sp) -/* D650E0 80240B00 4405A000 */ mfc1 $a1, $f20 -/* D650E4 80240B04 4406B000 */ mfc1 $a2, $f22 -/* D650E8 80240B08 3C07BF80 */ lui $a3, 0xbf80 -/* D650EC 80240B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* D650F0 80240B10 0C019EC8 */ jal guRotateF -/* D650F4 80240B14 E7B60010 */ swc1 $f22, 0x10($sp) -/* D650F8 80240B18 4405A000 */ mfc1 $a1, $f20 -/* D650FC 80240B1C 4406B000 */ mfc1 $a2, $f22 -/* D65100 80240B20 3C07BF80 */ lui $a3, 0xbf80 -/* D65104 80240B24 0200202D */ daddu $a0, $s0, $zero -/* D65108 80240B28 0C019EC8 */ jal guRotateF -/* D6510C 80240B2C E7B60010 */ swc1 $f22, 0x10($sp) -/* D65110 80240B30 4405C000 */ mfc1 $a1, $f24 -/* D65114 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D65118 80240B38 3C073F80 */ lui $a3, 0x3f80 -/* D6511C 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D65120 80240B40 0C019EC8 */ jal guRotateF -/* D65124 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D65128 80240B48 0200202D */ daddu $a0, $s0, $zero -/* D6512C 80240B4C 27A50020 */ addiu $a1, $sp, 0x20 -/* D65130 80240B50 0C019D80 */ jal guMtxCatF -/* D65134 80240B54 00A0302D */ daddu $a2, $a1, $zero -.L80240B58: -/* D65138 80240B58 862200B0 */ lh $v0, 0xb0($s1) -/* D6513C 80240B5C 3C013F00 */ lui $at, 0x3f00 -/* D65140 80240B60 44812000 */ mtc1 $at, $f4 -/* D65144 80240B64 00021023 */ negu $v0, $v0 -/* D65148 80240B68 44820000 */ mtc1 $v0, $f0 -/* D6514C 80240B6C 00000000 */ nop -/* D65150 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* D65154 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D65158 80240B78 00000000 */ nop -/* D6515C 80240B7C 4405B000 */ mfc1 $a1, $f22 -/* D65160 80240B80 4407B000 */ mfc1 $a3, $f22 -/* D65164 80240B84 44062000 */ mfc1 $a2, $f4 -/* D65168 80240B88 0C019E40 */ jal guTranslateF -/* D6516C 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* D65170 80240B90 0240202D */ daddu $a0, $s2, $zero -/* D65174 80240B94 27A50020 */ addiu $a1, $sp, 0x20 -/* D65178 80240B98 0C019D80 */ jal guMtxCatF -/* D6517C 80240B9C 00A0302D */ daddu $a2, $a1, $zero -/* D65180 80240BA0 4405A000 */ mfc1 $a1, $f20 -/* D65184 80240BA4 4406B000 */ mfc1 $a2, $f22 -/* D65188 80240BA8 3C073F80 */ lui $a3, 0x3f80 -/* D6518C 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* D65190 80240BB0 0C019EC8 */ jal guRotateF -/* D65194 80240BB4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D65198 80240BB8 27A40020 */ addiu $a0, $sp, 0x20 -/* D6519C 80240BBC 0200282D */ daddu $a1, $s0, $zero -/* D651A0 80240BC0 0C019D80 */ jal guMtxCatF -/* D651A4 80240BC4 0080302D */ daddu $a2, $a0, $zero -/* D651A8 80240BC8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D651AC 80240BCC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D651B0 80240BD0 4406B000 */ mfc1 $a2, $f22 -/* D651B4 80240BD4 3C073F80 */ lui $a3, 0x3f80 -/* D651B8 80240BD8 0C019EC8 */ jal guRotateF -/* D651BC 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D651C0 80240BE0 27A40020 */ addiu $a0, $sp, 0x20 -/* D651C4 80240BE4 0200282D */ daddu $a1, $s0, $zero -/* D651C8 80240BE8 0C019D80 */ jal guMtxCatF -/* D651CC 80240BEC 0080302D */ daddu $a2, $a0, $zero -/* D651D0 80240BF0 862200B0 */ lh $v0, 0xb0($s1) -/* D651D4 80240BF4 3C013F00 */ lui $at, 0x3f00 -/* D651D8 80240BF8 44812000 */ mtc1 $at, $f4 -/* D651DC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D651E0 80240C00 00000000 */ nop -/* D651E4 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* D651E8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D651EC 80240C0C 00000000 */ nop -/* D651F0 80240C10 4405B000 */ mfc1 $a1, $f22 -/* D651F4 80240C14 4407B000 */ mfc1 $a3, $f22 -/* D651F8 80240C18 44062000 */ mfc1 $a2, $f4 -/* D651FC 80240C1C 0C019E40 */ jal guTranslateF -/* D65200 80240C20 0240202D */ daddu $a0, $s2, $zero -/* D65204 80240C24 27A40020 */ addiu $a0, $sp, 0x20 -/* D65208 80240C28 0240282D */ daddu $a1, $s2, $zero -/* D6520C 80240C2C 0C019D80 */ jal guMtxCatF -/* D65210 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D65214 80240C34 3C013F36 */ lui $at, 0x3f36 -/* D65218 80240C38 3421DB6E */ ori $at, $at, 0xdb6e -/* D6521C 80240C3C 44810000 */ mtc1 $at, $f0 -/* D65220 80240C40 0280202D */ daddu $a0, $s4, $zero -/* D65224 80240C44 44050000 */ mfc1 $a1, $f0 -/* D65228 80240C48 3C06BF36 */ lui $a2, 0xbf36 -/* D6522C 80240C4C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D65230 80240C50 0C019DF0 */ jal guScaleF -/* D65234 80240C54 00A0382D */ daddu $a3, $a1, $zero -/* D65238 80240C58 27A40020 */ addiu $a0, $sp, 0x20 -/* D6523C 80240C5C 0280282D */ daddu $a1, $s4, $zero -/* D65240 80240C60 0C019D80 */ jal guMtxCatF -/* D65244 80240C64 0080302D */ daddu $a2, $a0, $zero -/* D65248 80240C68 4600D687 */ neg.s $f26, $f26 -/* D6524C 80240C6C 4405F000 */ mfc1 $a1, $f30 -/* D65250 80240C70 4407E000 */ mfc1 $a3, $f28 -/* D65254 80240C74 4406D000 */ mfc1 $a2, $f26 -/* D65258 80240C78 0C019E40 */ jal guTranslateF -/* D6525C 80240C7C 0240202D */ daddu $a0, $s2, $zero -/* D65260 80240C80 27A40020 */ addiu $a0, $sp, 0x20 -/* D65264 80240C84 0240282D */ daddu $a1, $s2, $zero -/* D65268 80240C88 0C019D80 */ jal guMtxCatF -/* D6526C 80240C8C 0080302D */ daddu $a2, $a0, $zero -/* D65270 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D65274 80240C94 3C0142B4 */ lui $at, 0x42b4 -/* D65278 80240C98 44810000 */ mtc1 $at, $f0 -/* D6527C 80240C9C 00000000 */ nop -/* D65280 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D65284 80240CA4 00000000 */ nop -/* D65288 80240CA8 4500000A */ bc1f .L80240CD4 -/* D6528C 80240CAC 24040001 */ addiu $a0, $zero, 1 -/* D65290 80240CB0 3C014387 */ lui $at, 0x4387 -/* D65294 80240CB4 44812000 */ mtc1 $at, $f4 -/* D65298 80240CB8 00000000 */ nop -/* D6529C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D652A0 80240CC0 00000000 */ nop -/* D652A4 80240CC4 45000004 */ bc1f .L80240CD8 -/* D652A8 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 -/* D652AC 80240CCC 3C041000 */ lui $a0, 0x1000 -/* D652B0 80240CD0 34840001 */ ori $a0, $a0, 1 -.L80240CD4: -/* D652B4 80240CD4 27A20020 */ addiu $v0, $sp, 0x20 -.L80240CD8: -/* D652B8 80240CD8 AFA20010 */ sw $v0, 0x10($sp) -/* D652BC 80240CDC 0000282D */ daddu $a1, $zero, $zero -/* D652C0 80240CE0 00A0302D */ daddu $a2, $a1, $zero -/* D652C4 80240CE4 0C0B7710 */ jal render_sprite -/* D652C8 80240CE8 00A0382D */ daddu $a3, $a1, $zero -/* D652CC 80240CEC 26730001 */ addiu $s3, $s3, 1 -/* D652D0 80240CF0 2A620002 */ slti $v0, $s3, 2 -/* D652D4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D652D8 80240CF8 00000000 */ nop -/* D652DC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) -/* D652E0 80240D00 8FB60148 */ lw $s6, 0x148($sp) -/* D652E4 80240D04 8FB50144 */ lw $s5, 0x144($sp) -/* D652E8 80240D08 8FB40140 */ lw $s4, 0x140($sp) -/* D652EC 80240D0C 8FB3013C */ lw $s3, 0x13c($sp) -/* D652F0 80240D10 8FB20138 */ lw $s2, 0x138($sp) -/* D652F4 80240D14 8FB10134 */ lw $s1, 0x134($sp) -/* D652F8 80240D18 8FB00130 */ lw $s0, 0x130($sp) -/* D652FC 80240D1C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D65300 80240D20 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D65304 80240D24 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D65308 80240D28 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D6530C 80240D2C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D65310 80240D30 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D65314 80240D34 03E00008 */ jr $ra -/* D65318 80240D38 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_80240D3C_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_80240D3C_D645E0.s deleted file mode 100644 index 9b5a4b9b4c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_80240D3C_D645E0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_D6531C -/* D6531C 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D65320 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D65324 80240D44 0080802D */ daddu $s0, $a0, $zero -/* D65328 80240D48 AFBF0014 */ sw $ra, 0x14($sp) -/* D6532C 80240D4C 8E020088 */ lw $v0, 0x88($s0) -/* D65330 80240D50 14400017 */ bnez $v0, .L80240DB0 -/* D65334 80240D54 24020001 */ addiu $v0, $zero, 1 -/* D65338 80240D58 8E030084 */ lw $v1, 0x84($s0) -/* D6533C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D65340 80240D60 00000000 */ nop -/* D65344 80240D64 28620002 */ slti $v0, $v1, 2 -/* D65348 80240D68 50400005 */ beql $v0, $zero, .L80240D80 -/* D6534C 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* D65350 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D65354 80240D74 00000000 */ nop -/* D65358 80240D78 08090378 */ j .L80240DE0 -/* D6535C 80240D7C 00000000 */ nop -.L80240D80: -/* D65360 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D65364 80240D84 00000000 */ nop -/* D65368 80240D88 08090378 */ j .L80240DE0 -/* D6536C 80240D8C 00000000 */ nop -.L80240D90: -/* D65370 80240D90 3C048024 */ lui $a0, 0x8024 -/* D65374 80240D94 24840E84 */ addiu $a0, $a0, 0xe84 -/* D65378 80240D98 08090374 */ j .L80240DD0 -/* D6537C 80240D9C 00000000 */ nop -.L80240DA0: -/* D65380 80240DA0 3C048024 */ lui $a0, 0x8024 -/* D65384 80240DA4 24840EEC */ addiu $a0, $a0, 0xeec -/* D65388 80240DA8 08090374 */ j .L80240DD0 -/* D6538C 80240DAC 00000000 */ nop -.L80240DB0: -/* D65390 80240DB0 8E020084 */ lw $v0, 0x84($s0) -/* D65394 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D65398 80240DB8 00000000 */ nop -/* D6539C 80240DBC 28420002 */ slti $v0, $v0, 2 -/* D653A0 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D653A4 80240DC4 00000000 */ nop -.L80240DC8: -/* D653A8 80240DC8 3C048024 */ lui $a0, 0x8024 -/* D653AC 80240DCC 24840EB8 */ addiu $a0, $a0, 0xeb8 -.L80240DD0: -/* D653B0 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 -/* D653B4 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* D653B8 80240DD8 8E03013C */ lw $v1, 0x13c($s0) -/* D653BC 80240DDC AC620004 */ sw $v0, 4($v1) -.L80240DE0: -/* D653C0 80240DE0 0C00EAD2 */ jal get_npc_safe -/* D653C4 80240DE4 2404FFFC */ addiu $a0, $zero, -4 -/* D653C8 80240DE8 0040282D */ daddu $a1, $v0, $zero -/* D653CC 80240DEC 10A00021 */ beqz $a1, .L80240E74 -/* D653D0 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* D653D4 80240DF4 8E020088 */ lw $v0, 0x88($s0) -/* D653D8 80240DF8 14400014 */ bnez $v0, .L80240E4C -/* D653DC 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* D653E0 80240E00 8E040084 */ lw $a0, 0x84($s0) -/* D653E4 80240E04 10820016 */ beq $a0, $v0, .L80240E60 -/* D653E8 80240E08 28820002 */ slti $v0, $a0, 2 -/* D653EC 80240E0C 10400005 */ beqz $v0, .L80240E24 -/* D653F0 80240E10 24020002 */ addiu $v0, $zero, 2 -/* D653F4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D653F8 80240E18 00000000 */ nop -/* D653FC 80240E1C 0809039D */ j .L80240E74 -/* D65400 80240E20 00000000 */ nop -.L80240E24: -/* D65404 80240E24 10820006 */ beq $a0, $v0, .L80240E40 -/* D65408 80240E28 24020002 */ addiu $v0, $zero, 2 -/* D6540C 80240E2C 0809039D */ j .L80240E74 -/* D65410 80240E30 00000000 */ nop -.L80240E34: -/* D65414 80240E34 8CA20000 */ lw $v0, ($a1) -/* D65418 80240E38 0809039A */ j .L80240E68 -/* D6541C 80240E3C 3C03000A */ lui $v1, 0xa -.L80240E40: -/* D65420 80240E40 8CA20000 */ lw $v0, ($a1) -/* D65424 80240E44 0809039A */ j .L80240E68 -/* D65428 80240E48 3C030002 */ lui $v1, 2 -.L80240E4C: -/* D6542C 80240E4C 8E020084 */ lw $v0, 0x84($s0) -/* D65430 80240E50 04400007 */ bltz $v0, .L80240E70 -/* D65434 80240E54 28420002 */ slti $v0, $v0, 2 -/* D65438 80240E58 10400006 */ beqz $v0, .L80240E74 -/* D6543C 80240E5C 24020002 */ addiu $v0, $zero, 2 -.L80240E60: -/* D65440 80240E60 8CA20000 */ lw $v0, ($a1) -/* D65444 80240E64 3C030008 */ lui $v1, 8 -.L80240E68: -/* D65448 80240E68 00431025 */ or $v0, $v0, $v1 -/* D6544C 80240E6C ACA20000 */ sw $v0, ($a1) -.L80240E70: -/* D65450 80240E70 24020002 */ addiu $v0, $zero, 2 -.L80240E74: -/* D65454 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* D65458 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* D6545C 80240E7C 03E00008 */ jr $ra -/* D65460 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_80240E84_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_80240E84_D645E0.s deleted file mode 100644 index 2eb3f0b55f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_80240E84_D645E0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D65464 -/* D65464 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D65468 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D6546C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D65470 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D65474 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D65478 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D6547C 80240E9C 3C03000A */ lui $v1, 0xa -/* D65480 80240EA0 8C820000 */ lw $v0, ($a0) -/* D65484 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D65488 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D6548C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D65490 80240EB0 03E00008 */ jr $ra -/* D65494 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_80240EB8_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_80240EB8_D645E0.s deleted file mode 100644 index b4618eed55..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_80240EB8_D645E0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D65498 -/* D65498 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6549C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D654A0 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D654A4 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D654A8 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D654AC 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D654B0 80240ED0 3C030008 */ lui $v1, 8 -/* D654B4 80240ED4 8C820000 */ lw $v0, ($a0) -/* D654B8 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D654BC 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D654C0 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D654C4 80240EE4 03E00008 */ jr $ra -/* D654C8 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_80240EEC_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_80240EEC_D645E0.s deleted file mode 100644 index 9e3ff80015..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_80240EEC_D645E0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D654CC -/* D654CC 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D654D0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D654D4 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D654D8 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D654DC 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D654E0 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D654E4 80240F04 3C030002 */ lui $v1, 2 -/* D654E8 80240F08 8C820000 */ lw $v0, ($a0) -/* D654EC 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D654F0 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D654F4 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D654F8 80240F18 03E00008 */ jr $ra -/* D654FC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_80240F20_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_80240F20_D645E0.s deleted file mode 100644 index 1455eaf97b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_80240F20_D645E0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D65500 -/* D65500 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D65504 80240F24 AFB10014 */ sw $s1, 0x14($sp) -/* D65508 80240F28 0080882D */ daddu $s1, $a0, $zero -/* D6550C 80240F2C AFBF0018 */ sw $ra, 0x18($sp) -/* D65510 80240F30 AFB00010 */ sw $s0, 0x10($sp) -/* D65514 80240F34 8E30000C */ lw $s0, 0xc($s1) -/* D65518 80240F38 8E050000 */ lw $a1, ($s0) -/* D6551C 80240F3C 0C0B1EAF */ jal get_variable -/* D65520 80240F40 26100004 */ addiu $s0, $s0, 4 -/* D65524 80240F44 0C00EAD2 */ jal get_npc_safe -/* D65528 80240F48 0040202D */ daddu $a0, $v0, $zero -/* D6552C 80240F4C 10400005 */ beqz $v0, .L80240F64 -/* D65530 80240F50 00000000 */ nop -/* D65534 80240F54 8E050000 */ lw $a1, ($s0) -/* D65538 80240F58 844600A8 */ lh $a2, 0xa8($v0) -/* D6553C 80240F5C 0C0B2026 */ jal set_variable -/* D65540 80240F60 0220202D */ daddu $a0, $s1, $zero -.L80240F64: -/* D65544 80240F64 8FBF0018 */ lw $ra, 0x18($sp) -/* D65548 80240F68 8FB10014 */ lw $s1, 0x14($sp) -/* D6554C 80240F6C 8FB00010 */ lw $s0, 0x10($sp) -/* D65550 80240F70 24020002 */ addiu $v0, $zero, 2 -/* D65554 80240F74 03E00008 */ jr $ra -/* D65558 80240F78 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_80240F7C_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_80240F7C_D645E0.s deleted file mode 100644 index 3f47a5ed3c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_80240F7C_D645E0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F7C_D6555C -/* D6555C 80240F7C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D65560 80240F80 AFB10014 */ sw $s1, 0x14($sp) -/* D65564 80240F84 0080882D */ daddu $s1, $a0, $zero -/* D65568 80240F88 AFBF0024 */ sw $ra, 0x24($sp) -/* D6556C 80240F8C AFB40020 */ sw $s4, 0x20($sp) -/* D65570 80240F90 AFB3001C */ sw $s3, 0x1c($sp) -/* D65574 80240F94 AFB20018 */ sw $s2, 0x18($sp) -/* D65578 80240F98 AFB00010 */ sw $s0, 0x10($sp) -/* D6557C 80240F9C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* D65580 80240FA0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* D65584 80240FA4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* D65588 80240FA8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* D6558C 80240FAC F7B40028 */ sdc1 $f20, 0x28($sp) -/* D65590 80240FB0 8E30000C */ lw $s0, 0xc($s1) -/* D65594 80240FB4 8E130000 */ lw $s3, ($s0) -/* D65598 80240FB8 26100004 */ addiu $s0, $s0, 4 -/* D6559C 80240FBC 0C0B1EAF */ jal get_variable -/* D655A0 80240FC0 0260282D */ daddu $a1, $s3, $zero -/* D655A4 80240FC4 4482E000 */ mtc1 $v0, $f28 -/* D655A8 80240FC8 00000000 */ nop -/* D655AC 80240FCC 4680E720 */ cvt.s.w $f28, $f28 -/* D655B0 80240FD0 8E140000 */ lw $s4, ($s0) -/* D655B4 80240FD4 26100004 */ addiu $s0, $s0, 4 -/* D655B8 80240FD8 0220202D */ daddu $a0, $s1, $zero -/* D655BC 80240FDC 0C0B1EAF */ jal get_variable -/* D655C0 80240FE0 0280282D */ daddu $a1, $s4, $zero -/* D655C4 80240FE4 4482D000 */ mtc1 $v0, $f26 -/* D655C8 80240FE8 00000000 */ nop -/* D655CC 80240FEC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D655D0 80240FF0 8E100000 */ lw $s0, ($s0) -/* D655D4 80240FF4 0220202D */ daddu $a0, $s1, $zero -/* D655D8 80240FF8 0C0B1EAF */ jal get_variable -/* D655DC 80240FFC 0200282D */ daddu $a1, $s0, $zero -/* D655E0 80241000 4482C000 */ mtc1 $v0, $f24 -/* D655E4 80241004 00000000 */ nop -/* D655E8 80241008 4680C620 */ cvt.s.w $f24, $f24 -/* D655EC 8024100C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* D655F0 80241010 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* D655F4 80241014 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D655F8 80241018 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D655FC 8024101C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* D65600 80241020 44800000 */ mtc1 $zero, $f0 -/* D65604 80241024 00031080 */ sll $v0, $v1, 2 -/* D65608 80241028 00431021 */ addu $v0, $v0, $v1 -/* D6560C 8024102C 00021080 */ sll $v0, $v0, 2 -/* D65610 80241030 00431023 */ subu $v0, $v0, $v1 -/* D65614 80241034 000218C0 */ sll $v1, $v0, 3 -/* D65618 80241038 00431021 */ addu $v0, $v0, $v1 -/* D6561C 8024103C 000210C0 */ sll $v0, $v0, 3 -/* D65620 80241040 46001032 */ c.eq.s $f2, $f0 -/* D65624 80241044 3C01800B */ lui $at, 0x800b -/* D65628 80241048 00220821 */ addu $at, $at, $v0 -/* D6562C 8024104C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D65630 80241050 45000005 */ bc1f .L80241068 -/* D65634 80241054 00000000 */ nop -/* D65638 80241058 3C0142C8 */ lui $at, 0x42c8 -/* D6563C 8024105C 44810000 */ mtc1 $at, $f0 -/* D65640 80241060 0809041E */ j .L80241078 -/* D65644 80241064 4600B581 */ sub.s $f22, $f22, $f0 -.L80241068: -/* D65648 80241068 3C0142C8 */ lui $at, 0x42c8 -/* D6564C 8024106C 44810000 */ mtc1 $at, $f0 -/* D65650 80241070 00000000 */ nop -/* D65654 80241074 4600B580 */ add.s $f22, $f22, $f0 -.L80241078: -/* D65658 80241078 0C00A6C9 */ jal clamp_angle -/* D6565C 8024107C 4600B306 */ mov.s $f12, $f22 -/* D65660 80241080 46000586 */ mov.s $f22, $f0 -/* D65664 80241084 3C014170 */ lui $at, 0x4170 -/* D65668 80241088 4481A000 */ mtc1 $at, $f20 -/* D6566C 8024108C 0C00A8BB */ jal sin_deg -/* D65670 80241090 4600B306 */ mov.s $f12, $f22 -/* D65674 80241094 46140002 */ mul.s $f0, $f0, $f20 -/* D65678 80241098 00000000 */ nop -/* D6567C 8024109C 864200B0 */ lh $v0, 0xb0($s2) -/* D65680 802410A0 3C013F00 */ lui $at, 0x3f00 -/* D65684 802410A4 44812000 */ mtc1 $at, $f4 -/* D65688 802410A8 44821000 */ mtc1 $v0, $f2 -/* D6568C 802410AC 00000000 */ nop -/* D65690 802410B0 468010A0 */ cvt.s.w $f2, $f2 -/* D65694 802410B4 46041082 */ mul.s $f2, $f2, $f4 -/* D65698 802410B8 00000000 */ nop -/* D6569C 802410BC 4600E700 */ add.s $f28, $f28, $f0 -/* D656A0 802410C0 4602D680 */ add.s $f26, $f26, $f2 -/* D656A4 802410C4 0C00A8D4 */ jal cos_deg -/* D656A8 802410C8 4600B306 */ mov.s $f12, $f22 -/* D656AC 802410CC 46140002 */ mul.s $f0, $f0, $f20 -/* D656B0 802410D0 00000000 */ nop -/* D656B4 802410D4 0220202D */ daddu $a0, $s1, $zero -/* D656B8 802410D8 0260282D */ daddu $a1, $s3, $zero -/* D656BC 802410DC 4600E18D */ trunc.w.s $f6, $f28 -/* D656C0 802410E0 44063000 */ mfc1 $a2, $f6 -/* D656C4 802410E4 0C0B2026 */ jal set_variable -/* D656C8 802410E8 4600C601 */ sub.s $f24, $f24, $f0 -/* D656CC 802410EC 0220202D */ daddu $a0, $s1, $zero -/* D656D0 802410F0 4600D18D */ trunc.w.s $f6, $f26 -/* D656D4 802410F4 44063000 */ mfc1 $a2, $f6 -/* D656D8 802410F8 0C0B2026 */ jal set_variable -/* D656DC 802410FC 0280282D */ daddu $a1, $s4, $zero -/* D656E0 80241100 0220202D */ daddu $a0, $s1, $zero -/* D656E4 80241104 4600C18D */ trunc.w.s $f6, $f24 -/* D656E8 80241108 44063000 */ mfc1 $a2, $f6 -/* D656EC 8024110C 0C0B2026 */ jal set_variable -/* D656F0 80241110 0200282D */ daddu $a1, $s0, $zero -/* D656F4 80241114 8FBF0024 */ lw $ra, 0x24($sp) -/* D656F8 80241118 8FB40020 */ lw $s4, 0x20($sp) -/* D656FC 8024111C 8FB3001C */ lw $s3, 0x1c($sp) -/* D65700 80241120 8FB20018 */ lw $s2, 0x18($sp) -/* D65704 80241124 8FB10014 */ lw $s1, 0x14($sp) -/* D65708 80241128 8FB00010 */ lw $s0, 0x10($sp) -/* D6570C 8024112C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* D65710 80241130 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* D65714 80241134 D7B80038 */ ldc1 $f24, 0x38($sp) -/* D65718 80241138 D7B60030 */ ldc1 $f22, 0x30($sp) -/* D6571C 8024113C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D65720 80241140 24020002 */ addiu $v0, $zero, 2 -/* D65724 80241144 03E00008 */ jr $ra -/* D65728 80241148 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_8024114C_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_8024114C_D645E0.s deleted file mode 100644 index f914b699ac..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_8024114C_D645E0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024114C_D6572C -/* D6572C 8024114C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D65730 80241150 AFBF0010 */ sw $ra, 0x10($sp) -/* D65734 80241154 10A00003 */ beqz $a1, .L80241164 -/* D65738 80241158 8C86000C */ lw $a2, 0xc($a0) -/* D6573C 8024115C 3C018024 */ lui $at, 0x8024 -/* D65740 80241160 AC2022CC */ sw $zero, 0x22cc($at) -.L80241164: -/* D65744 80241164 3C038024 */ lui $v1, 0x8024 -/* D65748 80241168 246322CC */ addiu $v1, $v1, 0x22cc -/* D6574C 8024116C 8C620000 */ lw $v0, ($v1) -/* D65750 80241170 54400003 */ bnel $v0, $zero, .L80241180 -/* D65754 80241174 AC600000 */ sw $zero, ($v1) -/* D65758 80241178 08090465 */ j .L80241194 -/* D6575C 8024117C 0000102D */ daddu $v0, $zero, $zero -.L80241180: -/* D65760 80241180 8CC50000 */ lw $a1, ($a2) -/* D65764 80241184 3C068024 */ lui $a2, 0x8024 -/* D65768 80241188 0C0B2026 */ jal set_variable -/* D6576C 8024118C 8CC622D0 */ lw $a2, 0x22d0($a2) -/* D65770 80241190 24020002 */ addiu $v0, $zero, 2 -.L80241194: -/* D65774 80241194 8FBF0010 */ lw $ra, 0x10($sp) -/* D65778 80241198 03E00008 */ jr $ra -/* D6577C 8024119C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_802411A0_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_802411A0_D645E0.s deleted file mode 100644 index 3f99cba7da..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_802411A0_D645E0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411A0_D65780 -/* D65780 802411A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D65784 802411A4 AFBF0010 */ sw $ra, 0x10($sp) -/* D65788 802411A8 8C82000C */ lw $v0, 0xc($a0) -/* D6578C 802411AC 0C0B1EAF */ jal get_variable -/* D65790 802411B0 8C450000 */ lw $a1, ($v0) -/* D65794 802411B4 3C018024 */ lui $at, 0x8024 -/* D65798 802411B8 AC2222D0 */ sw $v0, 0x22d0($at) -/* D6579C 802411BC 24020002 */ addiu $v0, $zero, 2 -/* D657A0 802411C0 8FBF0010 */ lw $ra, 0x10($sp) -/* D657A4 802411C4 24030001 */ addiu $v1, $zero, 1 -/* D657A8 802411C8 3C018024 */ lui $at, 0x8024 -/* D657AC 802411CC AC2322CC */ sw $v1, 0x22cc($at) -/* D657B0 802411D0 03E00008 */ jr $ra -/* D657B4 802411D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_802411D8_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_802411D8_D645E0.s deleted file mode 100644 index 60ff537750..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_802411D8_D645E0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411D8_D657B8 -/* D657B8 802411D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D657BC 802411DC AFBF0010 */ sw $ra, 0x10($sp) -/* D657C0 802411E0 8C82000C */ lw $v0, 0xc($a0) -/* D657C4 802411E4 0C0B1EAF */ jal get_variable -/* D657C8 802411E8 8C450000 */ lw $a1, ($v0) -/* D657CC 802411EC 0040182D */ daddu $v1, $v0, $zero -/* D657D0 802411F0 10600012 */ beqz $v1, .L8024123C -/* D657D4 802411F4 0000202D */ daddu $a0, $zero, $zero -/* D657D8 802411F8 8C620000 */ lw $v0, ($v1) -/* D657DC 802411FC 5040000A */ beql $v0, $zero, .L80241228 -/* D657E0 80241200 00041080 */ sll $v0, $a0, 2 -/* D657E4 80241204 3C058024 */ lui $a1, 0x8024 -/* D657E8 80241208 24A53720 */ addiu $a1, $a1, 0x3720 -.L8024120C: -/* D657EC 8024120C 24630004 */ addiu $v1, $v1, 4 -/* D657F0 80241210 24840001 */ addiu $a0, $a0, 1 -/* D657F4 80241214 ACA20000 */ sw $v0, ($a1) -/* D657F8 80241218 8C620000 */ lw $v0, ($v1) -/* D657FC 8024121C 1440FFFB */ bnez $v0, .L8024120C -/* D65800 80241220 24A50004 */ addiu $a1, $a1, 4 -/* D65804 80241224 00041080 */ sll $v0, $a0, 2 -.L80241228: -/* D65808 80241228 3C018024 */ lui $at, 0x8024 -/* D6580C 8024122C 00220821 */ addu $at, $at, $v0 -/* D65810 80241230 AC203720 */ sw $zero, 0x3720($at) -/* D65814 80241234 08090499 */ j .L80241264 -/* D65818 80241238 00000000 */ nop -.L8024123C: -/* D6581C 8024123C 3C038024 */ lui $v1, 0x8024 -/* D65820 80241240 24633720 */ addiu $v1, $v1, 0x3720 -/* D65824 80241244 0060282D */ daddu $a1, $v1, $zero -.L80241248: -/* D65828 80241248 24820010 */ addiu $v0, $a0, 0x10 -/* D6582C 8024124C AC620000 */ sw $v0, ($v1) -/* D65830 80241250 24630004 */ addiu $v1, $v1, 4 -/* D65834 80241254 24840001 */ addiu $a0, $a0, 1 -/* D65838 80241258 28820070 */ slti $v0, $a0, 0x70 -/* D6583C 8024125C 1440FFFA */ bnez $v0, .L80241248 -/* D65840 80241260 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241264: -/* D65844 80241264 8FBF0010 */ lw $ra, 0x10($sp) -/* D65848 80241268 24020002 */ addiu $v0, $zero, 2 -/* D6584C 8024126C 03E00008 */ jr $ra -/* D65850 80241270 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_80241274_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_80241274_D645E0.s deleted file mode 100644 index 5c7771654c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_80241274_D645E0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241274_D65854 -/* D65854 80241274 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D65858 80241278 AFBF0010 */ sw $ra, 0x10($sp) -/* D6585C 8024127C 8C82000C */ lw $v0, 0xc($a0) -/* D65860 80241280 0C0B1EAF */ jal get_variable -/* D65864 80241284 8C450000 */ lw $a1, ($v0) -/* D65868 80241288 0040182D */ daddu $v1, $v0, $zero -/* D6586C 8024128C 10600012 */ beqz $v1, .L802412D8 -/* D65870 80241290 0000202D */ daddu $a0, $zero, $zero -/* D65874 80241294 8C620000 */ lw $v0, ($v1) -/* D65878 80241298 5040000A */ beql $v0, $zero, .L802412C4 -/* D6587C 8024129C 00041080 */ sll $v0, $a0, 2 -/* D65880 802412A0 3C058024 */ lui $a1, 0x8024 -/* D65884 802412A4 24A538E8 */ addiu $a1, $a1, 0x38e8 -.L802412A8: -/* D65888 802412A8 24630004 */ addiu $v1, $v1, 4 -/* D6588C 802412AC 24840001 */ addiu $a0, $a0, 1 -/* D65890 802412B0 ACA20000 */ sw $v0, ($a1) -/* D65894 802412B4 8C620000 */ lw $v0, ($v1) -/* D65898 802412B8 1440FFFB */ bnez $v0, .L802412A8 -/* D6589C 802412BC 24A50004 */ addiu $a1, $a1, 4 -/* D658A0 802412C0 00041080 */ sll $v0, $a0, 2 -.L802412C4: -/* D658A4 802412C4 3C018024 */ lui $at, 0x8024 -/* D658A8 802412C8 00220821 */ addu $at, $at, $v0 -/* D658AC 802412CC AC2038E8 */ sw $zero, 0x38e8($at) -/* D658B0 802412D0 080904C0 */ j .L80241300 -/* D658B4 802412D4 00000000 */ nop -.L802412D8: -/* D658B8 802412D8 3C038024 */ lui $v1, 0x8024 -/* D658BC 802412DC 246338E8 */ addiu $v1, $v1, 0x38e8 -/* D658C0 802412E0 0060282D */ daddu $a1, $v1, $zero -.L802412E4: -/* D658C4 802412E4 24820080 */ addiu $v0, $a0, 0x80 -/* D658C8 802412E8 AC620000 */ sw $v0, ($v1) -/* D658CC 802412EC 24630004 */ addiu $v1, $v1, 4 -/* D658D0 802412F0 24840001 */ addiu $a0, $a0, 1 -/* D658D4 802412F4 2882005B */ slti $v0, $a0, 0x5b -/* D658D8 802412F8 1440FFFA */ bnez $v0, .L802412E4 -/* D658DC 802412FC ACA0016C */ sw $zero, 0x16c($a1) -.L80241300: -/* D658E0 80241300 8FBF0010 */ lw $ra, 0x10($sp) -/* D658E4 80241304 24020002 */ addiu $v0, $zero, 2 -/* D658E8 80241308 03E00008 */ jr $ra -/* D658EC 8024130C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_80241310_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_80241310_D645E0.s deleted file mode 100644 index 559b25ce3f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_80241310_D645E0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241310_D658F0 -/* D658F0 80241310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D658F4 80241314 AFB10014 */ sw $s1, 0x14($sp) -/* D658F8 80241318 0080882D */ daddu $s1, $a0, $zero -/* D658FC 8024131C AFBF001C */ sw $ra, 0x1c($sp) -/* D65900 80241320 AFB20018 */ sw $s2, 0x18($sp) -/* D65904 80241324 AFB00010 */ sw $s0, 0x10($sp) -/* D65908 80241328 8E30000C */ lw $s0, 0xc($s1) -/* D6590C 8024132C 8E050000 */ lw $a1, ($s0) -/* D65910 80241330 0C0B1EAF */ jal get_variable -/* D65914 80241334 26100004 */ addiu $s0, $s0, 4 -/* D65918 80241338 8E050000 */ lw $a1, ($s0) -/* D6591C 8024133C 26100004 */ addiu $s0, $s0, 4 -/* D65920 80241340 0220202D */ daddu $a0, $s1, $zero -/* D65924 80241344 0C0B1EAF */ jal get_variable -/* D65928 80241348 0040902D */ daddu $s2, $v0, $zero -/* D6592C 8024134C 0220202D */ daddu $a0, $s1, $zero -/* D65930 80241350 8E050000 */ lw $a1, ($s0) -/* D65934 80241354 0C0B1EAF */ jal get_variable -/* D65938 80241358 0040802D */ daddu $s0, $v0, $zero -/* D6593C 8024135C 44926000 */ mtc1 $s2, $f12 -/* D65940 80241360 00000000 */ nop -/* D65944 80241364 46806320 */ cvt.s.w $f12, $f12 -/* D65948 80241368 44820000 */ mtc1 $v0, $f0 -/* D6594C 8024136C 00000000 */ nop -/* D65950 80241370 46800020 */ cvt.s.w $f0, $f0 -/* D65954 80241374 44060000 */ mfc1 $a2, $f0 -/* D65958 80241378 44907000 */ mtc1 $s0, $f14 -/* D6595C 8024137C 00000000 */ nop -/* D65960 80241380 0C01BE3C */ jal func_8006F8F0 -/* D65964 80241384 468073A0 */ cvt.s.w $f14, $f14 -/* D65968 80241388 8FBF001C */ lw $ra, 0x1c($sp) -/* D6596C 8024138C 8FB20018 */ lw $s2, 0x18($sp) -/* D65970 80241390 8FB10014 */ lw $s1, 0x14($sp) -/* D65974 80241394 8FB00010 */ lw $s0, 0x10($sp) -/* D65978 80241398 24020002 */ addiu $v0, $zero, 2 -/* D6597C 8024139C 03E00008 */ jr $ra -/* D65980 802413A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_802413A4_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_802413A4_D645E0.s deleted file mode 100644 index cb142ed165..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_802413A4_D645E0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413A4_D65984 -/* D65984 802413A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D65988 802413A8 AFBF0010 */ sw $ra, 0x10($sp) -/* D6598C 802413AC 8C82000C */ lw $v0, 0xc($a0) -/* D65990 802413B0 0C0B1EAF */ jal get_variable -/* D65994 802413B4 8C450000 */ lw $a1, ($v0) -/* D65998 802413B8 0C00EAD2 */ jal get_npc_safe -/* D6599C 802413BC 0040202D */ daddu $a0, $v0, $zero -/* D659A0 802413C0 8FBF0010 */ lw $ra, 0x10($sp) -/* D659A4 802413C4 24020002 */ addiu $v0, $zero, 2 -/* D659A8 802413C8 03E00008 */ jr $ra -/* D659AC 802413CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_802413D0_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_802413D0_D645E0.s deleted file mode 100644 index 2137587f27..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_802413D0_D645E0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413D0_D659B0 -/* D659B0 802413D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D659B4 802413D4 AFB00010 */ sw $s0, 0x10($sp) -/* D659B8 802413D8 0080802D */ daddu $s0, $a0, $zero -/* D659BC 802413DC 3C058024 */ lui $a1, 0x8024 -/* D659C0 802413E0 24A5140C */ addiu $a1, $a1, 0x140c -/* D659C4 802413E4 AFBF0014 */ sw $ra, 0x14($sp) -/* D659C8 802413E8 0C048C56 */ jal bind_dynamic_entity_3 -/* D659CC 802413EC 0000202D */ daddu $a0, $zero, $zero -/* D659D0 802413F0 8E03013C */ lw $v1, 0x13c($s0) -/* D659D4 802413F4 AC620000 */ sw $v0, ($v1) -/* D659D8 802413F8 8FBF0014 */ lw $ra, 0x14($sp) -/* D659DC 802413FC 8FB00010 */ lw $s0, 0x10($sp) -/* D659E0 80241400 24020002 */ addiu $v0, $zero, 2 -/* D659E4 80241404 03E00008 */ jr $ra -/* D659E8 80241408 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_8024140C_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_8024140C_D645E0.s deleted file mode 100644 index 05bce9a683..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_8024140C_D645E0.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024140C_D659EC -/* D659EC 8024140C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D659F0 80241410 0000202D */ daddu $a0, $zero, $zero -/* D659F4 80241414 AFBF0048 */ sw $ra, 0x48($sp) -/* D659F8 80241418 AFB10044 */ sw $s1, 0x44($sp) -/* D659FC 8024141C 0C00EAD2 */ jal get_npc_safe -/* D65A00 80241420 AFB00040 */ sw $s0, 0x40($sp) -/* D65A04 80241424 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* D65A08 80241428 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* D65A0C 8024142C 27B10020 */ addiu $s1, $sp, 0x20 -/* D65A10 80241430 8C630000 */ lw $v1, ($v1) -/* D65A14 80241434 30630001 */ andi $v1, $v1, 1 -/* D65A18 80241438 1060001B */ beqz $v1, .L802414A8 -/* D65A1C 8024143C 0040802D */ daddu $s0, $v0, $zero -/* D65A20 80241440 C6000040 */ lwc1 $f0, 0x40($s0) -/* D65A24 80241444 3C04800A */ lui $a0, 0x800a -/* D65A28 80241448 8484A634 */ lh $a0, -0x59cc($a0) -/* D65A2C 8024144C 27A20030 */ addiu $v0, $sp, 0x30 -/* D65A30 80241450 AFA20010 */ sw $v0, 0x10($sp) -/* D65A34 80241454 27A20034 */ addiu $v0, $sp, 0x34 -/* D65A38 80241458 AFA20014 */ sw $v0, 0x14($sp) -/* D65A3C 8024145C 27A20038 */ addiu $v0, $sp, 0x38 -/* D65A40 80241460 AFA20018 */ sw $v0, 0x18($sp) -/* D65A44 80241464 8E050038 */ lw $a1, 0x38($s0) -/* D65A48 80241468 8E06003C */ lw $a2, 0x3c($s0) -/* D65A4C 8024146C 46000007 */ neg.s $f0, $f0 -/* D65A50 80241470 44070000 */ mfc1 $a3, $f0 -/* D65A54 80241474 0C00B94E */ jal get_screen_coords -/* D65A58 80241478 00000000 */ nop -/* D65A5C 8024147C 0220202D */ daddu $a0, $s1, $zero -/* D65A60 80241480 820500AA */ lb $a1, 0xaa($s0) -/* D65A64 80241484 8FA30038 */ lw $v1, 0x38($sp) -/* D65A68 80241488 3C028024 */ lui $v0, 0x8024 -/* D65A6C 8024148C 244214BC */ addiu $v0, $v0, 0x14bc -/* D65A70 80241490 AFB00028 */ sw $s0, 0x28($sp) -/* D65A74 80241494 AFA2002C */ sw $v0, 0x2c($sp) -/* D65A78 80241498 00031823 */ negu $v1, $v1 -/* D65A7C 8024149C AFA50020 */ sw $a1, 0x20($sp) -/* D65A80 802414A0 0C047644 */ jal queue_render_task -/* D65A84 802414A4 AFA30024 */ sw $v1, 0x24($sp) -.L802414A8: -/* D65A88 802414A8 8FBF0048 */ lw $ra, 0x48($sp) -/* D65A8C 802414AC 8FB10044 */ lw $s1, 0x44($sp) -/* D65A90 802414B0 8FB00040 */ lw $s0, 0x40($sp) -/* D65A94 802414B4 03E00008 */ jr $ra -/* D65A98 802414B8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_13/func_802414BC_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/func_802414BC_D645E0.s deleted file mode 100644 index 3275827551..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/func_802414BC_D645E0.s +++ /dev/null @@ -1,77 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414BC_D65A9C -/* D65A9C 802414BC 27BDFED0 */ addiu $sp, $sp, -0x130 -/* D65AA0 802414C0 AFB1011C */ sw $s1, 0x11c($sp) -/* D65AA4 802414C4 AFBF0120 */ sw $ra, 0x120($sp) -/* D65AA8 802414C8 AFB00118 */ sw $s0, 0x118($sp) -/* D65AAC 802414CC F7B40128 */ sdc1 $f20, 0x128($sp) -/* D65AB0 802414D0 0C00E769 */ jal func_80039DA4 -/* D65AB4 802414D4 0080882D */ daddu $s1, $a0, $zero -/* D65AB8 802414D8 44800000 */ mtc1 $zero, $f0 -/* D65ABC 802414DC 3C03800A */ lui $v1, 0x800a -/* D65AC0 802414E0 8463A634 */ lh $v1, -0x59cc($v1) -/* D65AC4 802414E4 C6220034 */ lwc1 $f2, 0x34($s1) -/* D65AC8 802414E8 00031080 */ sll $v0, $v1, 2 -/* D65ACC 802414EC 00431021 */ addu $v0, $v0, $v1 -/* D65AD0 802414F0 00021080 */ sll $v0, $v0, 2 -/* D65AD4 802414F4 00431023 */ subu $v0, $v0, $v1 -/* D65AD8 802414F8 000218C0 */ sll $v1, $v0, 3 -/* D65ADC 802414FC 00431021 */ addu $v0, $v0, $v1 -/* D65AE0 80241500 000210C0 */ sll $v0, $v0, 3 -/* D65AE4 80241504 44060000 */ mfc1 $a2, $f0 -/* D65AE8 80241508 3C01800B */ lui $at, 0x800b -/* D65AEC 8024150C 00220821 */ addu $at, $at, $v0 -/* D65AF0 80241510 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* D65AF4 80241514 3C013F80 */ lui $at, 0x3f80 -/* D65AF8 80241518 4481A000 */ mtc1 $at, $f20 -/* D65AFC 8024151C 46001080 */ add.s $f2, $f2, $f0 -/* D65B00 80241520 4407A000 */ mfc1 $a3, $f20 -/* D65B04 80241524 44051000 */ mfc1 $a1, $f2 -/* D65B08 80241528 27A40018 */ addiu $a0, $sp, 0x18 -/* D65B0C 8024152C 0C019EC8 */ jal guRotateF -/* D65B10 80241530 AFA60010 */ sw $a2, 0x10($sp) -/* D65B14 80241534 3C013F36 */ lui $at, 0x3f36 -/* D65B18 80241538 3421DB6E */ ori $at, $at, 0xdb6e -/* D65B1C 8024153C 44810000 */ mtc1 $at, $f0 -/* D65B20 80241540 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D65B24 80241544 44050000 */ mfc1 $a1, $f0 -/* D65B28 80241548 0200202D */ daddu $a0, $s0, $zero -/* D65B2C 8024154C 00A0302D */ daddu $a2, $a1, $zero -/* D65B30 80241550 0C019DF0 */ jal guScaleF -/* D65B34 80241554 00A0382D */ daddu $a3, $a1, $zero -/* D65B38 80241558 27A40018 */ addiu $a0, $sp, 0x18 -/* D65B3C 8024155C 0200282D */ daddu $a1, $s0, $zero -/* D65B40 80241560 0C019D80 */ jal guMtxCatF -/* D65B44 80241564 0080302D */ daddu $a2, $a0, $zero -/* D65B48 80241568 27B00058 */ addiu $s0, $sp, 0x58 -/* D65B4C 8024156C 8E250038 */ lw $a1, 0x38($s1) -/* D65B50 80241570 8E26003C */ lw $a2, 0x3c($s1) -/* D65B54 80241574 8E270040 */ lw $a3, 0x40($s1) -/* D65B58 80241578 0C019E40 */ jal guTranslateF -/* D65B5C 8024157C 0200202D */ daddu $a0, $s0, $zero -/* D65B60 80241580 27A40018 */ addiu $a0, $sp, 0x18 -/* D65B64 80241584 0200282D */ daddu $a1, $s0, $zero -/* D65B68 80241588 0C019D80 */ jal guMtxCatF -/* D65B6C 8024158C 0080302D */ daddu $a2, $a0, $zero -/* D65B70 80241590 8E250028 */ lw $a1, 0x28($s1) -/* D65B74 80241594 4406A000 */ mfc1 $a2, $f20 -/* D65B78 80241598 0C0B76A3 */ jal func_802DDA8C -/* D65B7C 8024159C 24040002 */ addiu $a0, $zero, 2 -/* D65B80 802415A0 24040002 */ addiu $a0, $zero, 2 -/* D65B84 802415A4 0000282D */ daddu $a1, $zero, $zero -/* D65B88 802415A8 00A0302D */ daddu $a2, $a1, $zero -/* D65B8C 802415AC 00A0382D */ daddu $a3, $a1, $zero -/* D65B90 802415B0 27A20018 */ addiu $v0, $sp, 0x18 -/* D65B94 802415B4 0C0B7710 */ jal render_sprite -/* D65B98 802415B8 AFA20010 */ sw $v0, 0x10($sp) -/* D65B9C 802415BC 8FBF0120 */ lw $ra, 0x120($sp) -/* D65BA0 802415C0 8FB1011C */ lw $s1, 0x11c($sp) -/* D65BA4 802415C4 8FB00118 */ lw $s0, 0x118($sp) -/* D65BA8 802415C8 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D65BAC 802415CC 03E00008 */ jr $ra -/* D65BB0 802415D0 27BD0130 */ addiu $sp, $sp, 0x130 -/* D65BB4 802415D4 00000000 */ nop -/* D65BB8 802415D8 00000000 */ nop -/* D65BBC 802415DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_14/func_80240020_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/func_80240020_D67D00.s deleted file mode 100644 index 5d92775e54..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/func_80240020_D67D00.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D67D20 -/* D67D20 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D67D24 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D67D28 80240028 00822024 */ and $a0, $a0, $v0 -/* D67D2C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D67D30 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D67D34 80240034 00821821 */ addu $v1, $a0, $v0 -/* D67D38 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D67D3C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D67D40 80240040 30620001 */ andi $v0, $v1, 1 -/* D67D44 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D67D48 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D67D4C 8024004C 03E00008 */ jr $ra -/* D67D50 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_14/func_80240054_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/func_80240054_D67D00.s deleted file mode 100644 index dd64475a90..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/func_80240054_D67D00.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054_D67D54 -/* D67D54 80240054 00041403 */ sra $v0, $a0, 0x10 -/* D67D58 80240058 304300FF */ andi $v1, $v0, 0xff -/* D67D5C 8024005C 24020006 */ addiu $v0, $zero, 6 -/* D67D60 80240060 10620015 */ beq $v1, $v0, .L802400B8 -/* D67D64 80240064 28620007 */ slti $v0, $v1, 7 -/* D67D68 80240068 10400005 */ beqz $v0, .L80240080 -/* D67D6C 8024006C 24020001 */ addiu $v0, $zero, 1 -/* D67D70 80240070 1062000A */ beq $v1, $v0, .L8024009C -/* D67D74 80240074 3C020100 */ lui $v0, 0x100 -/* D67D78 80240078 03E00008 */ jr $ra -/* D67D7C 8024007C 00821025 */ or $v0, $a0, $v0 -.L80240080: -/* D67D80 80240080 2862000A */ slti $v0, $v1, 0xa -/* D67D84 80240084 10400016 */ beqz $v0, .L802400E0 -/* D67D88 80240088 28620008 */ slti $v0, $v1, 8 -/* D67D8C 8024008C 14400015 */ bnez $v0, .L802400E4 -/* D67D90 80240090 3C020100 */ lui $v0, 0x100 -/* D67D94 80240094 03E00008 */ jr $ra -/* D67D98 80240098 0080102D */ daddu $v0, $a0, $zero -.L8024009C: -/* D67D9C 8024009C 3C020001 */ lui $v0, 1 -/* D67DA0 802400A0 3442000C */ ori $v0, $v0, 0xc -/* D67DA4 802400A4 0044102A */ slt $v0, $v0, $a0 -/* D67DA8 802400A8 1040000E */ beqz $v0, .L802400E4 -/* D67DAC 802400AC 3C020100 */ lui $v0, 0x100 -.L802400B0: -/* D67DB0 802400B0 03E00008 */ jr $ra -/* D67DB4 802400B4 0080102D */ daddu $v0, $a0, $zero -.L802400B8: -/* D67DB8 802400B8 3C02FFF9 */ lui $v0, 0xfff9 -/* D67DBC 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D67DC0 802400C0 00821821 */ addu $v1, $a0, $v0 -/* D67DC4 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D67DC8 802400C8 10400005 */ beqz $v0, .L802400E0 -/* D67DCC 802400CC 30620001 */ andi $v0, $v1, 1 -/* D67DD0 802400D0 1440FFF7 */ bnez $v0, .L802400B0 -/* D67DD4 802400D4 24820001 */ addiu $v0, $a0, 1 -/* D67DD8 802400D8 03E00008 */ jr $ra -/* D67DDC 802400DC 00000000 */ nop -.L802400E0: -/* D67DE0 802400E0 3C020100 */ lui $v0, 0x100 -.L802400E4: -/* D67DE4 802400E4 03E00008 */ jr $ra -/* D67DE8 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_14/func_802400EC_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/func_802400EC_D67D00.s deleted file mode 100644 index 5708677d15..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/func_802400EC_D67D00.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_D67DEC -/* D67DEC 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D67DF0 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* D67DF4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D67DF8 802400F8 3C058024 */ lui $a1, 0x8024 -/* D67DFC 802400FC 24A50128 */ addiu $a1, $a1, 0x128 -/* D67E00 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* D67E04 80240104 0C048C56 */ jal bind_dynamic_entity_3 -/* D67E08 80240108 0000202D */ daddu $a0, $zero, $zero -/* D67E0C 8024010C 8E03013C */ lw $v1, 0x13c($s0) -/* D67E10 80240110 AC620000 */ sw $v0, ($v1) -/* D67E14 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* D67E18 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* D67E1C 8024011C 24020002 */ addiu $v0, $zero, 2 -/* D67E20 80240120 03E00008 */ jr $ra -/* D67E24 80240124 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_14/func_80240128_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/func_80240128_D67D00.s deleted file mode 100644 index f8d01a18eb..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/func_80240128_D67D00.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240128_D67E28 -/* D67E28 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D67E2C 8024012C AFB00040 */ sw $s0, 0x40($sp) -/* D67E30 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D67E34 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D67E38 80240138 AFB20048 */ sw $s2, 0x48($sp) -/* D67E3C 8024013C AFBF004C */ sw $ra, 0x4c($sp) -/* D67E40 80240140 AFB10044 */ sw $s1, 0x44($sp) -/* D67E44 80240144 8E020000 */ lw $v0, ($s0) -/* D67E48 80240148 821100BE */ lb $s1, 0xbe($s0) -/* D67E4C 8024014C 30420001 */ andi $v0, $v0, 1 -/* D67E50 80240150 10400061 */ beqz $v0, .L802402D8 -/* D67E54 80240154 27B20020 */ addiu $s2, $sp, 0x20 -/* D67E58 80240158 8E0400CC */ lw $a0, 0xcc($s0) -/* D67E5C 8024015C 0C044181 */ jal get_shadow_by_index -/* D67E60 80240160 00000000 */ nop -/* D67E64 80240164 0C048B77 */ jal func_80122DDC -/* D67E68 80240168 84440008 */ lh $a0, 8($v0) -/* D67E6C 8024016C 8C430000 */ lw $v1, ($v0) -/* D67E70 80240170 34630200 */ ori $v1, $v1, 0x200 -/* D67E74 80240174 AC430000 */ sw $v1, ($v0) -/* D67E78 80240178 8E050028 */ lw $a1, 0x28($s0) -/* D67E7C 8024017C 8E06002C */ lw $a2, 0x2c($s0) -/* D67E80 80240180 27A20030 */ addiu $v0, $sp, 0x30 -/* D67E84 80240184 AFA20010 */ sw $v0, 0x10($sp) -/* D67E88 80240188 27A20034 */ addiu $v0, $sp, 0x34 -/* D67E8C 8024018C AFA20014 */ sw $v0, 0x14($sp) -/* D67E90 80240190 C6000030 */ lwc1 $f0, 0x30($s0) -/* D67E94 80240194 3C04800A */ lui $a0, 0x800a -/* D67E98 80240198 8484A634 */ lh $a0, -0x59cc($a0) -/* D67E9C 8024019C 46000007 */ neg.s $f0, $f0 -/* D67EA0 802401A0 44070000 */ mfc1 $a3, $f0 -/* D67EA4 802401A4 27A20038 */ addiu $v0, $sp, 0x38 -/* D67EA8 802401A8 0C00B94E */ jal get_screen_coords -/* D67EAC 802401AC AFA20018 */ sw $v0, 0x18($sp) -/* D67EB0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D67EB4 802401B4 0C090008 */ jal func_80240020 -/* D67EB8 802401B8 00000000 */ nop -/* D67EBC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) -/* D67EC0 802401C0 3C014307 */ lui $at, 0x4307 -/* D67EC4 802401C4 44810000 */ mtc1 $at, $f0 -/* D67EC8 802401C8 00000000 */ nop -/* D67ECC 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D67ED0 802401D0 00000000 */ nop -/* D67ED4 802401D4 4500000B */ bc1f .L80240204 -/* D67ED8 802401D8 24040002 */ addiu $a0, $zero, 2 -/* D67EDC 802401DC 3C014361 */ lui $at, 0x4361 -/* D67EE0 802401E0 44810000 */ mtc1 $at, $f0 -/* D67EE4 802401E4 00000000 */ nop -/* D67EE8 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D67EEC 802401EC 00000000 */ nop -/* D67EF0 802401F0 45000004 */ bc1f .L80240204 -/* D67EF4 802401F4 00000000 */ nop -/* D67EF8 802401F8 0C090015 */ jal func_80240054 -/* D67EFC 802401FC 0040202D */ daddu $a0, $v0, $zero -/* D67F00 80240200 24040002 */ addiu $a0, $zero, 2 -.L80240204: -/* D67F04 80240204 3C063F80 */ lui $a2, 0x3f80 -/* D67F08 80240208 0C0B76A3 */ jal func_802DDA8C -/* D67F0C 8024020C 0040282D */ daddu $a1, $v0, $zero -/* D67F10 80240210 8E020000 */ lw $v0, ($s0) -/* D67F14 80240214 3C030002 */ lui $v1, 2 -/* D67F18 80240218 00431024 */ and $v0, $v0, $v1 -/* D67F1C 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 -/* D67F20 80240220 24110011 */ addiu $s1, $zero, 0x11 -/* D67F24 80240224 9203000E */ lbu $v1, 0xe($s0) -/* D67F28 80240228 3C02802E */ lui $v0, 0x802e -/* D67F2C 8024022C 90429D70 */ lbu $v0, -0x6290($v0) -/* D67F30 80240230 10620018 */ beq $v1, $v0, .L80240294 -/* D67F34 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D67F38 80240238 1040000B */ beqz $v0, .L80240268 -/* D67F3C 8024023C 24110011 */ addiu $s1, $zero, 0x11 -/* D67F40 80240240 24040002 */ addiu $a0, $zero, 2 -/* D67F44 80240244 2405FFFF */ addiu $a1, $zero, -1 -/* D67F48 80240248 24060007 */ addiu $a2, $zero, 7 -/* D67F4C 8024024C 0060102D */ daddu $v0, $v1, $zero -/* D67F50 80240250 0000382D */ daddu $a3, $zero, $zero -/* D67F54 80240254 AFA00010 */ sw $zero, 0x10($sp) -/* D67F58 80240258 AFA00014 */ sw $zero, 0x14($sp) -/* D67F5C 8024025C AFA0001C */ sw $zero, 0x1c($sp) -/* D67F60 80240260 080900A3 */ j .L8024028C -/* D67F64 80240264 AFA20018 */ sw $v0, 0x18($sp) -.L80240268: -/* D67F68 80240268 2411000D */ addiu $s1, $zero, 0xd -/* D67F6C 8024026C 24040002 */ addiu $a0, $zero, 2 -/* D67F70 80240270 2405FFFF */ addiu $a1, $zero, -1 -/* D67F74 80240274 0000302D */ daddu $a2, $zero, $zero -/* D67F78 80240278 00C0382D */ daddu $a3, $a2, $zero -/* D67F7C 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* D67F80 80240280 AFA00014 */ sw $zero, 0x14($sp) -/* D67F84 80240284 AFA00018 */ sw $zero, 0x18($sp) -/* D67F88 80240288 AFA0001C */ sw $zero, 0x1c($sp) -.L8024028C: -/* D67F8C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D67F90 80240290 00000000 */ nop -.L80240294: -/* D67F94 80240294 9202000E */ lbu $v0, 0xe($s0) -/* D67F98 80240298 3C01802E */ lui $at, 0x802e -/* D67F9C 8024029C A0229D70 */ sb $v0, -0x6290($at) -/* D67FA0 802402A0 080900AD */ j .L802402B4 -/* D67FA4 802402A4 0240202D */ daddu $a0, $s2, $zero -.L802402A8: -/* D67FA8 802402A8 3C01802E */ lui $at, 0x802e -/* D67FAC 802402AC A0209D70 */ sb $zero, -0x6290($at) -/* D67FB0 802402B0 0240202D */ daddu $a0, $s2, $zero -.L802402B4: -/* D67FB4 802402B4 AC910000 */ sw $s1, ($a0) -/* D67FB8 802402B8 AC900008 */ sw $s0, 8($a0) -/* D67FBC 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D67FC0 802402C0 3C038024 */ lui $v1, 0x8024 -/* D67FC4 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 -/* D67FC8 802402C8 AC83000C */ sw $v1, 0xc($a0) -/* D67FCC 802402CC 00021023 */ negu $v0, $v0 -/* D67FD0 802402D0 0C047644 */ jal queue_render_task -/* D67FD4 802402D4 AC820004 */ sw $v0, 4($a0) -.L802402D8: -/* D67FD8 802402D8 8FBF004C */ lw $ra, 0x4c($sp) -/* D67FDC 802402DC 8FB20048 */ lw $s2, 0x48($sp) -/* D67FE0 802402E0 8FB10044 */ lw $s1, 0x44($sp) -/* D67FE4 802402E4 8FB00040 */ lw $s0, 0x40($sp) -/* D67FE8 802402E8 03E00008 */ jr $ra -/* D67FEC 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_14/func_802402F0_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/func_802402F0_D67D00.s deleted file mode 100644 index 6798643cbc..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/func_802402F0_D67D00.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D67FF0 -/* D67FF0 802402F0 3C03800A */ lui $v1, 0x800a -/* D67FF4 802402F4 8463A634 */ lh $v1, -0x59cc($v1) -/* D67FF8 802402F8 3C07BF80 */ lui $a3, 0xbf80 -/* D67FFC 802402FC 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D68000 80240300 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D68004 80240304 4480A000 */ mtc1 $zero, $f20 -/* D68008 80240308 AFB1011C */ sw $s1, 0x11c($sp) -/* D6800C 8024030C 0080882D */ daddu $s1, $a0, $zero -/* D68010 80240310 AFB00118 */ sw $s0, 0x118($sp) -/* D68014 80240314 27B00098 */ addiu $s0, $sp, 0x98 -/* D68018 80240318 AFBF0120 */ sw $ra, 0x120($sp) -/* D6801C 8024031C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D68020 80240320 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D68024 80240324 00031080 */ sll $v0, $v1, 2 -/* D68028 80240328 00431021 */ addu $v0, $v0, $v1 -/* D6802C 8024032C 00021080 */ sll $v0, $v0, 2 -/* D68030 80240330 00431023 */ subu $v0, $v0, $v1 -/* D68034 80240334 000218C0 */ sll $v1, $v0, 3 -/* D68038 80240338 00431021 */ addu $v0, $v0, $v1 -/* D6803C 8024033C 000210C0 */ sll $v0, $v0, 3 -/* D68040 80240340 3C01800B */ lui $at, 0x800b -/* D68044 80240344 00220821 */ addu $at, $at, $v0 -/* D68048 80240348 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D6804C 8024034C 4406A000 */ mfc1 $a2, $f20 -/* D68050 80240350 4600B587 */ neg.s $f22, $f22 -/* D68054 80240354 4405B000 */ mfc1 $a1, $f22 -/* D68058 80240358 0200202D */ daddu $a0, $s0, $zero -/* D6805C 8024035C 0C019EC8 */ jal guRotateF -/* D68060 80240360 E7B40010 */ swc1 $f20, 0x10($sp) -/* D68064 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D68068 80240368 0C00A6C9 */ jal clamp_angle -/* D6806C 8024036C 00000000 */ nop -/* D68070 80240370 44050000 */ mfc1 $a1, $f0 -/* D68074 80240374 4406A000 */ mfc1 $a2, $f20 -/* D68078 80240378 4407A000 */ mfc1 $a3, $f20 -/* D6807C 8024037C 3C013F80 */ lui $at, 0x3f80 -/* D68080 80240380 4481C000 */ mtc1 $at, $f24 -/* D68084 80240384 27A40018 */ addiu $a0, $sp, 0x18 -/* D68088 80240388 0C019EC8 */ jal guRotateF -/* D6808C 8024038C E7B80010 */ swc1 $f24, 0x10($sp) -/* D68090 80240390 0200202D */ daddu $a0, $s0, $zero -/* D68094 80240394 27A50018 */ addiu $a1, $sp, 0x18 -/* D68098 80240398 0C019D80 */ jal guMtxCatF -/* D6809C 8024039C 00A0302D */ daddu $a2, $a1, $zero -/* D680A0 802403A0 4405B000 */ mfc1 $a1, $f22 -/* D680A4 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D680A8 802403A8 4407C000 */ mfc1 $a3, $f24 -/* D680AC 802403AC 0200202D */ daddu $a0, $s0, $zero -/* D680B0 802403B0 0C019EC8 */ jal guRotateF -/* D680B4 802403B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D680B8 802403B8 27A40018 */ addiu $a0, $sp, 0x18 -/* D680BC 802403BC 0200282D */ daddu $a1, $s0, $zero -/* D680C0 802403C0 0C019D80 */ jal guMtxCatF -/* D680C4 802403C4 0080302D */ daddu $a2, $a0, $zero -/* D680C8 802403C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D680CC 802403CC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D680D0 802403D0 4406A000 */ mfc1 $a2, $f20 -/* D680D4 802403D4 4407C000 */ mfc1 $a3, $f24 -/* D680D8 802403D8 0C019EC8 */ jal guRotateF -/* D680DC 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D680E0 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* D680E4 802403E4 0200282D */ daddu $a1, $s0, $zero -/* D680E8 802403E8 0C019D80 */ jal guMtxCatF -/* D680EC 802403EC 0080302D */ daddu $a2, $a0, $zero -/* D680F0 802403F0 3C013F36 */ lui $at, 0x3f36 -/* D680F4 802403F4 3421DB6E */ ori $at, $at, 0xdb6e -/* D680F8 802403F8 44810000 */ mtc1 $at, $f0 -/* D680FC 802403FC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D68100 80240400 44050000 */ mfc1 $a1, $f0 -/* D68104 80240404 0200202D */ daddu $a0, $s0, $zero -/* D68108 80240408 00A0302D */ daddu $a2, $a1, $zero -/* D6810C 8024040C 0C019DF0 */ jal guScaleF -/* D68110 80240410 00A0382D */ daddu $a3, $a1, $zero -/* D68114 80240414 27A40018 */ addiu $a0, $sp, 0x18 -/* D68118 80240418 0200282D */ daddu $a1, $s0, $zero -/* D6811C 8024041C 0C019D80 */ jal guMtxCatF -/* D68120 80240420 0080302D */ daddu $a2, $a0, $zero -/* D68124 80240424 27B00058 */ addiu $s0, $sp, 0x58 -/* D68128 80240428 C6200030 */ lwc1 $f0, 0x30($s1) -/* D6812C 8024042C 3C014040 */ lui $at, 0x4040 -/* D68130 80240430 44811000 */ mtc1 $at, $f2 -/* D68134 80240434 46000007 */ neg.s $f0, $f0 -/* D68138 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* D6813C 8024043C 8E250028 */ lw $a1, 0x28($s1) -/* D68140 80240440 8E26002C */ lw $a2, 0x2c($s1) -/* D68144 80240444 44070000 */ mfc1 $a3, $f0 -/* D68148 80240448 0C019E40 */ jal guTranslateF -/* D6814C 8024044C 0200202D */ daddu $a0, $s0, $zero -/* D68150 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* D68154 80240454 0200282D */ daddu $a1, $s0, $zero -/* D68158 80240458 0C019D80 */ jal guMtxCatF -/* D6815C 8024045C 0080302D */ daddu $a2, $a0, $zero -/* D68160 80240460 24040002 */ addiu $a0, $zero, 2 -/* D68164 80240464 0000282D */ daddu $a1, $zero, $zero -/* D68168 80240468 00A0302D */ daddu $a2, $a1, $zero -/* D6816C 8024046C 00A0382D */ daddu $a3, $a1, $zero -/* D68170 80240470 27A20018 */ addiu $v0, $sp, 0x18 -/* D68174 80240474 0C0B7710 */ jal render_sprite -/* D68178 80240478 AFA20010 */ sw $v0, 0x10($sp) -/* D6817C 8024047C 8FBF0120 */ lw $ra, 0x120($sp) -/* D68180 80240480 8FB1011C */ lw $s1, 0x11c($sp) -/* D68184 80240484 8FB00118 */ lw $s0, 0x118($sp) -/* D68188 80240488 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D6818C 8024048C D7B60130 */ ldc1 $f22, 0x130($sp) -/* D68190 80240490 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D68194 80240494 03E00008 */ jr $ra -/* D68198 80240498 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_14/func_8024049C_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/func_8024049C_D67D00.s deleted file mode 100644 index cbfae4df8d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/func_8024049C_D67D00.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_D6819C -/* D6819C 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D681A0 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* D681A4 802404A4 0080802D */ daddu $s0, $a0, $zero -/* D681A8 802404A8 AFBF0014 */ sw $ra, 0x14($sp) -/* D681AC 802404AC 8E020084 */ lw $v0, 0x84($s0) -/* D681B0 802404B0 0440000E */ bltz $v0, .L802404EC -/* D681B4 802404B4 28420002 */ slti $v0, $v0, 2 -/* D681B8 802404B8 1040000C */ beqz $v0, .L802404EC -/* D681BC 802404BC 00000000 */ nop -/* D681C0 802404C0 3C058024 */ lui $a1, 0x8024 -/* D681C4 802404C4 24A50500 */ addiu $a1, $a1, 0x500 -/* D681C8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 -/* D681CC 802404CC 0000202D */ daddu $a0, $zero, $zero -/* D681D0 802404D0 8E03013C */ lw $v1, 0x13c($s0) -/* D681D4 802404D4 AC620000 */ sw $v0, ($v1) -/* D681D8 802404D8 3C03800A */ lui $v1, %hi(D_8009A650) -/* D681DC 802404DC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D681E0 802404E0 8C620000 */ lw $v0, ($v1) -/* D681E4 802404E4 34420080 */ ori $v0, $v0, 0x80 -/* D681E8 802404E8 AC620000 */ sw $v0, ($v1) -.L802404EC: -/* D681EC 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* D681F0 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* D681F4 802404F4 24020002 */ addiu $v0, $zero, 2 -/* D681F8 802404F8 03E00008 */ jr $ra -/* D681FC 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_14/func_80240500_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/func_80240500_D67D00.s deleted file mode 100644 index 5c1528ee42..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/func_80240500_D67D00.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_D68200 -/* D68200 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D68204 80240504 AFB00040 */ sw $s0, 0x40($sp) -/* D68208 80240508 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D6820C 8024050C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D68210 80240510 AFB10044 */ sw $s1, 0x44($sp) -/* D68214 80240514 AFBF004C */ sw $ra, 0x4c($sp) -/* D68218 80240518 AFB20048 */ sw $s2, 0x48($sp) -/* D6821C 8024051C 8E020000 */ lw $v0, ($s0) -/* D68220 80240520 821200BE */ lb $s2, 0xbe($s0) -/* D68224 80240524 30420001 */ andi $v0, $v0, 1 -/* D68228 80240528 10400052 */ beqz $v0, .L80240674 -/* D6822C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 -/* D68230 80240530 8E0400CC */ lw $a0, 0xcc($s0) -/* D68234 80240534 0C044181 */ jal get_shadow_by_index -/* D68238 80240538 00000000 */ nop -/* D6823C 8024053C 0C048B77 */ jal func_80122DDC -/* D68240 80240540 84440008 */ lh $a0, 8($v0) -/* D68244 80240544 8E050028 */ lw $a1, 0x28($s0) -/* D68248 80240548 8E070030 */ lw $a3, 0x30($s0) -/* D6824C 8024054C 27A20030 */ addiu $v0, $sp, 0x30 -/* D68250 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* D68254 80240554 27A20034 */ addiu $v0, $sp, 0x34 -/* D68258 80240558 AFA20014 */ sw $v0, 0x14($sp) -/* D6825C 8024055C 27A20038 */ addiu $v0, $sp, 0x38 -/* D68260 80240560 AFA20018 */ sw $v0, 0x18($sp) -/* D68264 80240564 C600002C */ lwc1 $f0, 0x2c($s0) -/* D68268 80240568 3C04800A */ lui $a0, 0x800a -/* D6826C 8024056C 8484A634 */ lh $a0, -0x59cc($a0) -/* D68270 80240570 46000007 */ neg.s $f0, $f0 -/* D68274 80240574 44060000 */ mfc1 $a2, $f0 -/* D68278 80240578 0C00B94E */ jal get_screen_coords -/* D6827C 8024057C 00000000 */ nop -/* D68280 80240580 8E0500A4 */ lw $a1, 0xa4($s0) -/* D68284 80240584 3C063F80 */ lui $a2, 0x3f80 -/* D68288 80240588 0C0B76A3 */ jal func_802DDA8C -/* D6828C 8024058C 24040001 */ addiu $a0, $zero, 1 -/* D68290 80240590 8E020000 */ lw $v0, ($s0) -/* D68294 80240594 3C030002 */ lui $v1, 2 -/* D68298 80240598 00431024 */ and $v0, $v0, $v1 -/* D6829C 8024059C 54400022 */ bnel $v0, $zero, .L80240628 -/* D682A0 802405A0 24120011 */ addiu $s2, $zero, 0x11 -/* D682A4 802405A4 9203000E */ lbu $v1, 0xe($s0) -/* D682A8 802405A8 3C02802E */ lui $v0, 0x802e -/* D682AC 802405AC 90429D71 */ lbu $v0, -0x628f($v0) -/* D682B0 802405B0 10620018 */ beq $v1, $v0, .L80240614 -/* D682B4 802405B4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D682B8 802405B8 1040000B */ beqz $v0, .L802405E8 -/* D682BC 802405BC 24120011 */ addiu $s2, $zero, 0x11 -/* D682C0 802405C0 24040001 */ addiu $a0, $zero, 1 -/* D682C4 802405C4 2405FFFF */ addiu $a1, $zero, -1 -/* D682C8 802405C8 24060007 */ addiu $a2, $zero, 7 -/* D682CC 802405CC 0060102D */ daddu $v0, $v1, $zero -/* D682D0 802405D0 0000382D */ daddu $a3, $zero, $zero -/* D682D4 802405D4 AFA00010 */ sw $zero, 0x10($sp) -/* D682D8 802405D8 AFA00014 */ sw $zero, 0x14($sp) -/* D682DC 802405DC AFA0001C */ sw $zero, 0x1c($sp) -/* D682E0 802405E0 08090183 */ j .L8024060C -/* D682E4 802405E4 AFA20018 */ sw $v0, 0x18($sp) -.L802405E8: -/* D682E8 802405E8 2412000D */ addiu $s2, $zero, 0xd -/* D682EC 802405EC 24040001 */ addiu $a0, $zero, 1 -/* D682F0 802405F0 2405FFFF */ addiu $a1, $zero, -1 -/* D682F4 802405F4 0000302D */ daddu $a2, $zero, $zero -/* D682F8 802405F8 00C0382D */ daddu $a3, $a2, $zero -/* D682FC 802405FC AFA00010 */ sw $zero, 0x10($sp) -/* D68300 80240600 AFA00014 */ sw $zero, 0x14($sp) -/* D68304 80240604 AFA00018 */ sw $zero, 0x18($sp) -/* D68308 80240608 AFA0001C */ sw $zero, 0x1c($sp) -.L8024060C: -/* D6830C 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D68310 80240610 00000000 */ nop -.L80240614: -/* D68314 80240614 9202000E */ lbu $v0, 0xe($s0) -/* D68318 80240618 3C01802E */ lui $at, 0x802e -/* D6831C 8024061C A0229D71 */ sb $v0, -0x628f($at) -/* D68320 80240620 0809018C */ j .L80240630 -/* D68324 80240624 00000000 */ nop -.L80240628: -/* D68328 80240628 3C01802E */ lui $at, 0x802e -/* D6832C 8024062C A0209D71 */ sb $zero, -0x628f($at) -.L80240630: -/* D68330 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D68334 80240634 3C048024 */ lui $a0, 0x8024 -/* D68338 80240638 24840870 */ addiu $a0, $a0, 0x870 -/* D6833C 8024063C AE320000 */ sw $s2, ($s1) -/* D68340 80240640 AE300008 */ sw $s0, 8($s1) -/* D68344 80240644 00021023 */ negu $v0, $v0 -/* D68348 80240648 AE220004 */ sw $v0, 4($s1) -/* D6834C 8024064C 8E020000 */ lw $v0, ($s0) -/* D68350 80240650 3C030002 */ lui $v1, 2 -/* D68354 80240654 00431024 */ and $v0, $v0, $v1 -/* D68358 80240658 54400004 */ bnel $v0, $zero, .L8024066C -/* D6835C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D68360 80240660 3C048024 */ lui $a0, 0x8024 -/* D68364 80240664 2484068C */ addiu $a0, $a0, 0x68c -/* D68368 80240668 AE24000C */ sw $a0, 0xc($s1) -.L8024066C: -/* D6836C 8024066C 0C047644 */ jal queue_render_task -/* D68370 80240670 0220202D */ daddu $a0, $s1, $zero -.L80240674: -/* D68374 80240674 8FBF004C */ lw $ra, 0x4c($sp) -/* D68378 80240678 8FB20048 */ lw $s2, 0x48($sp) -/* D6837C 8024067C 8FB10044 */ lw $s1, 0x44($sp) -/* D68380 80240680 8FB00040 */ lw $s0, 0x40($sp) -/* D68384 80240684 03E00008 */ jr $ra -/* D68388 80240688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_14/func_8024068C_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/func_8024068C_D67D00.s deleted file mode 100644 index 0fd8e4a9fc..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/func_8024068C_D67D00.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_D6838C -/* D6838C 8024068C 3C03800A */ lui $v1, 0x800a -/* D68390 80240690 8463A634 */ lh $v1, -0x59cc($v1) -/* D68394 80240694 3C07BF80 */ lui $a3, 0xbf80 -/* D68398 80240698 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D6839C 8024069C F7B40128 */ sdc1 $f20, 0x128($sp) -/* D683A0 802406A0 4480A000 */ mtc1 $zero, $f20 -/* D683A4 802406A4 AFB1011C */ sw $s1, 0x11c($sp) -/* D683A8 802406A8 0080882D */ daddu $s1, $a0, $zero -/* D683AC 802406AC AFB00118 */ sw $s0, 0x118($sp) -/* D683B0 802406B0 27B00098 */ addiu $s0, $sp, 0x98 -/* D683B4 802406B4 AFBF0120 */ sw $ra, 0x120($sp) -/* D683B8 802406B8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D683BC 802406BC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D683C0 802406C0 00031080 */ sll $v0, $v1, 2 -/* D683C4 802406C4 00431021 */ addu $v0, $v0, $v1 -/* D683C8 802406C8 00021080 */ sll $v0, $v0, 2 -/* D683CC 802406CC 00431023 */ subu $v0, $v0, $v1 -/* D683D0 802406D0 000218C0 */ sll $v1, $v0, 3 -/* D683D4 802406D4 00431021 */ addu $v0, $v0, $v1 -/* D683D8 802406D8 000210C0 */ sll $v0, $v0, 3 -/* D683DC 802406DC 3C01800B */ lui $at, 0x800b -/* D683E0 802406E0 00220821 */ addu $at, $at, $v0 -/* D683E4 802406E4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D683E8 802406E8 4406A000 */ mfc1 $a2, $f20 -/* D683EC 802406EC 4600B587 */ neg.s $f22, $f22 -/* D683F0 802406F0 4405B000 */ mfc1 $a1, $f22 -/* D683F4 802406F4 0200202D */ daddu $a0, $s0, $zero -/* D683F8 802406F8 0C019EC8 */ jal guRotateF -/* D683FC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) -/* D68400 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D68404 80240704 0C00A6C9 */ jal clamp_angle -/* D68408 80240708 00000000 */ nop -/* D6840C 8024070C 44050000 */ mfc1 $a1, $f0 -/* D68410 80240710 4406A000 */ mfc1 $a2, $f20 -/* D68414 80240714 4407A000 */ mfc1 $a3, $f20 -/* D68418 80240718 3C013F80 */ lui $at, 0x3f80 -/* D6841C 8024071C 4481C000 */ mtc1 $at, $f24 -/* D68420 80240720 27A40018 */ addiu $a0, $sp, 0x18 -/* D68424 80240724 0C019EC8 */ jal guRotateF -/* D68428 80240728 E7B80010 */ swc1 $f24, 0x10($sp) -/* D6842C 8024072C 0200202D */ daddu $a0, $s0, $zero -/* D68430 80240730 27A50018 */ addiu $a1, $sp, 0x18 -/* D68434 80240734 0C019D80 */ jal guMtxCatF -/* D68438 80240738 00A0302D */ daddu $a2, $a1, $zero -/* D6843C 8024073C 4405B000 */ mfc1 $a1, $f22 -/* D68440 80240740 4406A000 */ mfc1 $a2, $f20 -/* D68444 80240744 4407C000 */ mfc1 $a3, $f24 -/* D68448 80240748 0200202D */ daddu $a0, $s0, $zero -/* D6844C 8024074C 0C019EC8 */ jal guRotateF -/* D68450 80240750 E7B40010 */ swc1 $f20, 0x10($sp) -/* D68454 80240754 27A40018 */ addiu $a0, $sp, 0x18 -/* D68458 80240758 0200282D */ daddu $a1, $s0, $zero -/* D6845C 8024075C 0C019D80 */ jal guMtxCatF -/* D68460 80240760 0080302D */ daddu $a2, $a0, $zero -/* D68464 80240764 E7B40010 */ swc1 $f20, 0x10($sp) -/* D68468 80240768 8E2500A8 */ lw $a1, 0xa8($s1) -/* D6846C 8024076C 4406A000 */ mfc1 $a2, $f20 -/* D68470 80240770 4407C000 */ mfc1 $a3, $f24 -/* D68474 80240774 0C019EC8 */ jal guRotateF -/* D68478 80240778 0200202D */ daddu $a0, $s0, $zero -/* D6847C 8024077C 27A40018 */ addiu $a0, $sp, 0x18 -/* D68480 80240780 0200282D */ daddu $a1, $s0, $zero -/* D68484 80240784 0C019D80 */ jal guMtxCatF -/* D68488 80240788 0080302D */ daddu $a2, $a0, $zero -/* D6848C 8024078C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D68490 80240790 3C013F36 */ lui $at, 0x3f36 -/* D68494 80240794 3421DB6E */ ori $at, $at, 0xdb6e -/* D68498 80240798 44810000 */ mtc1 $at, $f0 -/* D6849C 8024079C 0200202D */ daddu $a0, $s0, $zero -/* D684A0 802407A0 44050000 */ mfc1 $a1, $f0 -/* D684A4 802407A4 3C06BF36 */ lui $a2, 0xbf36 -/* D684A8 802407A8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D684AC 802407AC 0C019DF0 */ jal guScaleF -/* D684B0 802407B0 00A0382D */ daddu $a3, $a1, $zero -/* D684B4 802407B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D684B8 802407B8 0200282D */ daddu $a1, $s0, $zero -/* D684BC 802407BC 0C019D80 */ jal guMtxCatF -/* D684C0 802407C0 0080302D */ daddu $a2, $a0, $zero -/* D684C4 802407C4 27B00058 */ addiu $s0, $sp, 0x58 -/* D684C8 802407C8 8E250028 */ lw $a1, 0x28($s1) -/* D684CC 802407CC C620002C */ lwc1 $f0, 0x2c($s1) -/* D684D0 802407D0 8E270030 */ lw $a3, 0x30($s1) -/* D684D4 802407D4 46000007 */ neg.s $f0, $f0 -/* D684D8 802407D8 44060000 */ mfc1 $a2, $f0 -/* D684DC 802407DC 0C019E40 */ jal guTranslateF -/* D684E0 802407E0 0200202D */ daddu $a0, $s0, $zero -/* D684E4 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D684E8 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D684EC 802407EC 0C019D80 */ jal guMtxCatF -/* D684F0 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D684F4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D684F8 802407F8 3C0142B4 */ lui $at, 0x42b4 -/* D684FC 802407FC 44810000 */ mtc1 $at, $f0 -/* D68500 80240800 00000000 */ nop -/* D68504 80240804 4602003E */ c.le.s $f0, $f2 -/* D68508 80240808 00000000 */ nop -/* D6850C 8024080C 4500000A */ bc1f .L80240838 -/* D68510 80240810 24040001 */ addiu $a0, $zero, 1 -/* D68514 80240814 3C014387 */ lui $at, 0x4387 -/* D68518 80240818 44810000 */ mtc1 $at, $f0 -/* D6851C 8024081C 00000000 */ nop -/* D68520 80240820 4600103C */ c.lt.s $f2, $f0 -/* D68524 80240824 00000000 */ nop -/* D68528 80240828 45000004 */ bc1f .L8024083C -/* D6852C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 -/* D68530 80240830 3C041000 */ lui $a0, 0x1000 -/* D68534 80240834 34840001 */ ori $a0, $a0, 1 -.L80240838: -/* D68538 80240838 27A20018 */ addiu $v0, $sp, 0x18 -.L8024083C: -/* D6853C 8024083C 0000282D */ daddu $a1, $zero, $zero -/* D68540 80240840 00A0302D */ daddu $a2, $a1, $zero -/* D68544 80240844 00A0382D */ daddu $a3, $a1, $zero -/* D68548 80240848 0C0B7710 */ jal render_sprite -/* D6854C 8024084C AFA20010 */ sw $v0, 0x10($sp) -/* D68550 80240850 8FBF0120 */ lw $ra, 0x120($sp) -/* D68554 80240854 8FB1011C */ lw $s1, 0x11c($sp) -/* D68558 80240858 8FB00118 */ lw $s0, 0x118($sp) -/* D6855C 8024085C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D68560 80240860 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D68564 80240864 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D68568 80240868 03E00008 */ jr $ra -/* D6856C 8024086C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_14/func_80240870_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/func_80240870_D67D00.s deleted file mode 100644 index 95c7062cf8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/func_80240870_D67D00.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_D68570 -/* D68570 80240870 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D68574 80240874 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D68578 80240878 4480B000 */ mtc1 $zero, $f22 -/* D6857C 8024087C AFB10134 */ sw $s1, 0x134($sp) -/* D68580 80240880 0080882D */ daddu $s1, $a0, $zero -/* D68584 80240884 AFB3013C */ sw $s3, 0x13c($sp) -/* D68588 80240888 0000982D */ daddu $s3, $zero, $zero -/* D6858C 8024088C AFB60148 */ sw $s6, 0x148($sp) -/* D68590 80240890 3C16800B */ lui $s6, %hi(gCameras) -/* D68594 80240894 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D68598 80240898 AFB50144 */ sw $s5, 0x144($sp) -/* D6859C 8024089C 241500FF */ addiu $s5, $zero, 0xff -/* D685A0 802408A0 AFB00130 */ sw $s0, 0x130($sp) -/* D685A4 802408A4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D685A8 802408A8 AFB20138 */ sw $s2, 0x138($sp) -/* D685AC 802408AC 27B20060 */ addiu $s2, $sp, 0x60 -/* D685B0 802408B0 AFB40140 */ sw $s4, 0x140($sp) -/* D685B4 802408B4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D685B8 802408B8 AFBF014C */ sw $ra, 0x14c($sp) -/* D685BC 802408BC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D685C0 802408C0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D685C4 802408C4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D685C8 802408C8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D685CC 802408CC F7B40150 */ sdc1 $f20, 0x150($sp) -.L802408D0: -/* D685D0 802408D0 3C03800A */ lui $v1, 0x800a -/* D685D4 802408D4 8463A634 */ lh $v1, -0x59cc($v1) -/* D685D8 802408D8 00031080 */ sll $v0, $v1, 2 -/* D685DC 802408DC 00431021 */ addu $v0, $v0, $v1 -/* D685E0 802408E0 00021080 */ sll $v0, $v0, 2 -/* D685E4 802408E4 00431023 */ subu $v0, $v0, $v1 -/* D685E8 802408E8 000218C0 */ sll $v1, $v0, 3 -/* D685EC 802408EC 00431021 */ addu $v0, $v0, $v1 -/* D685F0 802408F0 000210C0 */ sll $v0, $v0, 3 -/* D685F4 802408F4 00561021 */ addu $v0, $v0, $s6 -/* D685F8 802408F8 C440006C */ lwc1 $f0, 0x6c($v0) -/* D685FC 802408FC 16600065 */ bnez $s3, .L80240A94 -/* D68600 80240900 46000507 */ neg.s $f20, $f0 -/* D68604 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D68608 80240908 3C0142B4 */ lui $at, 0x42b4 -/* D6860C 8024090C 44810000 */ mtc1 $at, $f0 -/* D68610 80240910 00000000 */ nop -/* D68614 80240914 4602003C */ c.lt.s $f0, $f2 -/* D68618 80240918 00000000 */ nop -/* D6861C 8024091C 4500000A */ bc1f .L80240948 -/* D68620 80240920 00000000 */ nop -/* D68624 80240924 3C014334 */ lui $at, 0x4334 -/* D68628 80240928 44812000 */ mtc1 $at, $f4 -/* D6862C 8024092C 00000000 */ nop -/* D68630 80240930 4604103E */ c.le.s $f2, $f4 -/* D68634 80240934 00000000 */ nop -/* D68638 80240938 45000003 */ bc1f .L80240948 -/* D6863C 8024093C 00000000 */ nop -/* D68640 80240940 08090276 */ j .L802409D8 -/* D68644 80240944 46022501 */ sub.s $f20, $f4, $f2 -.L80240948: -/* D68648 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D6864C 8024094C 3C014334 */ lui $at, 0x4334 -/* D68650 80240950 44812000 */ mtc1 $at, $f4 -/* D68654 80240954 00000000 */ nop -/* D68658 80240958 4600203C */ c.lt.s $f4, $f0 -/* D6865C 8024095C 00000000 */ nop -/* D68660 80240960 4500000C */ bc1f .L80240994 -/* D68664 80240964 00000000 */ nop -/* D68668 80240968 3C014387 */ lui $at, 0x4387 -/* D6866C 8024096C 44812000 */ mtc1 $at, $f4 -/* D68670 80240970 00000000 */ nop -/* D68674 80240974 4604003E */ c.le.s $f0, $f4 -/* D68678 80240978 00000000 */ nop -/* D6867C 8024097C 45000008 */ bc1f .L802409A0 -/* D68680 80240980 00000000 */ nop -/* D68684 80240984 3C014334 */ lui $at, 0x4334 -/* D68688 80240988 44812000 */ mtc1 $at, $f4 -/* D6868C 8024098C 08090276 */ j .L802409D8 -/* D68690 80240990 46040501 */ sub.s $f20, $f0, $f4 -.L80240994: -/* D68694 80240994 3C014387 */ lui $at, 0x4387 -/* D68698 80240998 44812000 */ mtc1 $at, $f4 -/* D6869C 8024099C 00000000 */ nop -.L802409A0: -/* D686A0 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D686A4 802409A4 00000000 */ nop -/* D686A8 802409A8 4500000A */ bc1f .L802409D4 -/* D686AC 802409AC 00000000 */ nop -/* D686B0 802409B0 3C0143B4 */ lui $at, 0x43b4 -/* D686B4 802409B4 44811000 */ mtc1 $at, $f2 -/* D686B8 802409B8 00000000 */ nop -/* D686BC 802409BC 4602003E */ c.le.s $f0, $f2 -/* D686C0 802409C0 00000000 */ nop -/* D686C4 802409C4 45000003 */ bc1f .L802409D4 -/* D686C8 802409C8 00000000 */ nop -/* D686CC 802409CC 08090276 */ j .L802409D8 -/* D686D0 802409D0 46001501 */ sub.s $f20, $f2, $f0 -.L802409D4: -/* D686D4 802409D4 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L802409D8: -/* D686D8 802409D8 3C0141C8 */ lui $at, 0x41c8 -/* D686DC 802409DC 44810000 */ mtc1 $at, $f0 -/* D686E0 802409E0 00000000 */ nop -/* D686E4 802409E4 4600A003 */ div.s $f0, $f20, $f0 -/* D686E8 802409E8 4600010D */ trunc.w.s $f4, $f0 -/* D686EC 802409EC 44072000 */ mfc1 $a3, $f4 -/* D686F0 802409F0 00000000 */ nop -/* D686F4 802409F4 00071100 */ sll $v0, $a3, 4 -/* D686F8 802409F8 00471023 */ subu $v0, $v0, $a3 -/* D686FC 802409FC 00021080 */ sll $v0, $v0, 2 -/* D68700 80240A00 02A23823 */ subu $a3, $s5, $v0 -/* D68704 80240A04 28E20064 */ slti $v0, $a3, 0x64 -/* D68708 80240A08 54400001 */ bnel $v0, $zero, .L80240A10 -/* D6870C 80240A0C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A10: -/* D68710 80240A10 24040001 */ addiu $a0, $zero, 1 -/* D68714 80240A14 2405FFFF */ addiu $a1, $zero, -1 -/* D68718 80240A18 24060006 */ addiu $a2, $zero, 6 -/* D6871C 80240A1C AFA70010 */ sw $a3, 0x10($sp) -/* D68720 80240A20 AFA70014 */ sw $a3, 0x14($sp) -/* D68724 80240A24 AFB50018 */ sw $s5, 0x18($sp) -/* D68728 80240A28 0C0B77B9 */ jal func_802DDEE4 -/* D6872C 80240A2C AFA0001C */ sw $zero, 0x1c($sp) -/* D68730 80240A30 4405A000 */ mfc1 $a1, $f20 -/* D68734 80240A34 4406B000 */ mfc1 $a2, $f22 -/* D68738 80240A38 3C07BF80 */ lui $a3, 0xbf80 -/* D6873C 80240A3C 0200202D */ daddu $a0, $s0, $zero -/* D68740 80240A40 0C019EC8 */ jal guRotateF -/* D68744 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D68748 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D6874C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D68750 80240A50 00000000 */ nop -/* D68754 80240A54 44050000 */ mfc1 $a1, $f0 -/* D68758 80240A58 4406B000 */ mfc1 $a2, $f22 -/* D6875C 80240A5C 4407B000 */ mfc1 $a3, $f22 -/* D68760 80240A60 3C013F80 */ lui $at, 0x3f80 -/* D68764 80240A64 44812000 */ mtc1 $at, $f4 -/* D68768 80240A68 27A40020 */ addiu $a0, $sp, 0x20 -/* D6876C 80240A6C 0C019EC8 */ jal guRotateF -/* D68770 80240A70 E7A40010 */ swc1 $f4, 0x10($sp) -/* D68774 80240A74 0200202D */ daddu $a0, $s0, $zero -/* D68778 80240A78 27A50020 */ addiu $a1, $sp, 0x20 -/* D6877C 80240A7C 0C019D80 */ jal guMtxCatF -/* D68780 80240A80 00A0302D */ daddu $a2, $a1, $zero -/* D68784 80240A84 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D68788 80240A88 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D6878C 80240A8C 080902D6 */ j .L80240B58 -/* D68790 80240A90 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240A94: -/* D68794 80240A94 0260202D */ daddu $a0, $s3, $zero -/* D68798 80240A98 27A50120 */ addiu $a1, $sp, 0x120 -/* D6879C 80240A9C 27A60124 */ addiu $a2, $sp, 0x124 -/* D687A0 80240AA0 0C03964E */ jal func_800E5938 -/* D687A4 80240AA4 27A70128 */ addiu $a3, $sp, 0x128 -/* D687A8 80240AA8 8FA60124 */ lw $a2, 0x124($sp) -/* D687AC 80240AAC 3C028000 */ lui $v0, 0x8000 -/* D687B0 80240AB0 14C20004 */ bne $a2, $v0, .L80240AC4 -/* D687B4 80240AB4 46000606 */ mov.s $f24, $f0 -/* D687B8 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D687BC 80240ABC 080902B5 */ j .L80240AD4 -/* D687C0 80240AC0 24040001 */ addiu $a0, $zero, 1 -.L80240AC4: -/* D687C4 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D687C8 80240AC8 00000000 */ nop -/* D687CC 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D687D0 80240AD0 24040001 */ addiu $a0, $zero, 1 -.L80240AD4: -/* D687D4 80240AD4 2405FFFF */ addiu $a1, $zero, -1 -/* D687D8 80240AD8 24060007 */ addiu $a2, $zero, 7 -/* D687DC 80240ADC 0000382D */ daddu $a3, $zero, $zero -/* D687E0 80240AE0 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D687E4 80240AE4 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D687E8 80240AE8 24020040 */ addiu $v0, $zero, 0x40 -/* D687EC 80240AEC AFA00010 */ sw $zero, 0x10($sp) -/* D687F0 80240AF0 AFA00014 */ sw $zero, 0x14($sp) -/* D687F4 80240AF4 AFA20018 */ sw $v0, 0x18($sp) -/* D687F8 80240AF8 0C0B77B9 */ jal func_802DDEE4 -/* D687FC 80240AFC AFA0001C */ sw $zero, 0x1c($sp) -/* D68800 80240B00 4405A000 */ mfc1 $a1, $f20 -/* D68804 80240B04 4406B000 */ mfc1 $a2, $f22 -/* D68808 80240B08 3C07BF80 */ lui $a3, 0xbf80 -/* D6880C 80240B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* D68810 80240B10 0C019EC8 */ jal guRotateF -/* D68814 80240B14 E7B60010 */ swc1 $f22, 0x10($sp) -/* D68818 80240B18 4405A000 */ mfc1 $a1, $f20 -/* D6881C 80240B1C 4406B000 */ mfc1 $a2, $f22 -/* D68820 80240B20 3C07BF80 */ lui $a3, 0xbf80 -/* D68824 80240B24 0200202D */ daddu $a0, $s0, $zero -/* D68828 80240B28 0C019EC8 */ jal guRotateF -/* D6882C 80240B2C E7B60010 */ swc1 $f22, 0x10($sp) -/* D68830 80240B30 4405C000 */ mfc1 $a1, $f24 -/* D68834 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D68838 80240B38 3C073F80 */ lui $a3, 0x3f80 -/* D6883C 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D68840 80240B40 0C019EC8 */ jal guRotateF -/* D68844 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D68848 80240B48 0200202D */ daddu $a0, $s0, $zero -/* D6884C 80240B4C 27A50020 */ addiu $a1, $sp, 0x20 -/* D68850 80240B50 0C019D80 */ jal guMtxCatF -/* D68854 80240B54 00A0302D */ daddu $a2, $a1, $zero -.L80240B58: -/* D68858 80240B58 862200B0 */ lh $v0, 0xb0($s1) -/* D6885C 80240B5C 3C013F00 */ lui $at, 0x3f00 -/* D68860 80240B60 44812000 */ mtc1 $at, $f4 -/* D68864 80240B64 00021023 */ negu $v0, $v0 -/* D68868 80240B68 44820000 */ mtc1 $v0, $f0 -/* D6886C 80240B6C 00000000 */ nop -/* D68870 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* D68874 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D68878 80240B78 00000000 */ nop -/* D6887C 80240B7C 4405B000 */ mfc1 $a1, $f22 -/* D68880 80240B80 4407B000 */ mfc1 $a3, $f22 -/* D68884 80240B84 44062000 */ mfc1 $a2, $f4 -/* D68888 80240B88 0C019E40 */ jal guTranslateF -/* D6888C 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* D68890 80240B90 0240202D */ daddu $a0, $s2, $zero -/* D68894 80240B94 27A50020 */ addiu $a1, $sp, 0x20 -/* D68898 80240B98 0C019D80 */ jal guMtxCatF -/* D6889C 80240B9C 00A0302D */ daddu $a2, $a1, $zero -/* D688A0 80240BA0 4405A000 */ mfc1 $a1, $f20 -/* D688A4 80240BA4 4406B000 */ mfc1 $a2, $f22 -/* D688A8 80240BA8 3C073F80 */ lui $a3, 0x3f80 -/* D688AC 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* D688B0 80240BB0 0C019EC8 */ jal guRotateF -/* D688B4 80240BB4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D688B8 80240BB8 27A40020 */ addiu $a0, $sp, 0x20 -/* D688BC 80240BBC 0200282D */ daddu $a1, $s0, $zero -/* D688C0 80240BC0 0C019D80 */ jal guMtxCatF -/* D688C4 80240BC4 0080302D */ daddu $a2, $a0, $zero -/* D688C8 80240BC8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D688CC 80240BCC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D688D0 80240BD0 4406B000 */ mfc1 $a2, $f22 -/* D688D4 80240BD4 3C073F80 */ lui $a3, 0x3f80 -/* D688D8 80240BD8 0C019EC8 */ jal guRotateF -/* D688DC 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D688E0 80240BE0 27A40020 */ addiu $a0, $sp, 0x20 -/* D688E4 80240BE4 0200282D */ daddu $a1, $s0, $zero -/* D688E8 80240BE8 0C019D80 */ jal guMtxCatF -/* D688EC 80240BEC 0080302D */ daddu $a2, $a0, $zero -/* D688F0 80240BF0 862200B0 */ lh $v0, 0xb0($s1) -/* D688F4 80240BF4 3C013F00 */ lui $at, 0x3f00 -/* D688F8 80240BF8 44812000 */ mtc1 $at, $f4 -/* D688FC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D68900 80240C00 00000000 */ nop -/* D68904 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* D68908 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D6890C 80240C0C 00000000 */ nop -/* D68910 80240C10 4405B000 */ mfc1 $a1, $f22 -/* D68914 80240C14 4407B000 */ mfc1 $a3, $f22 -/* D68918 80240C18 44062000 */ mfc1 $a2, $f4 -/* D6891C 80240C1C 0C019E40 */ jal guTranslateF -/* D68920 80240C20 0240202D */ daddu $a0, $s2, $zero -/* D68924 80240C24 27A40020 */ addiu $a0, $sp, 0x20 -/* D68928 80240C28 0240282D */ daddu $a1, $s2, $zero -/* D6892C 80240C2C 0C019D80 */ jal guMtxCatF -/* D68930 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D68934 80240C34 3C013F36 */ lui $at, 0x3f36 -/* D68938 80240C38 3421DB6E */ ori $at, $at, 0xdb6e -/* D6893C 80240C3C 44810000 */ mtc1 $at, $f0 -/* D68940 80240C40 0280202D */ daddu $a0, $s4, $zero -/* D68944 80240C44 44050000 */ mfc1 $a1, $f0 -/* D68948 80240C48 3C06BF36 */ lui $a2, 0xbf36 -/* D6894C 80240C4C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D68950 80240C50 0C019DF0 */ jal guScaleF -/* D68954 80240C54 00A0382D */ daddu $a3, $a1, $zero -/* D68958 80240C58 27A40020 */ addiu $a0, $sp, 0x20 -/* D6895C 80240C5C 0280282D */ daddu $a1, $s4, $zero -/* D68960 80240C60 0C019D80 */ jal guMtxCatF -/* D68964 80240C64 0080302D */ daddu $a2, $a0, $zero -/* D68968 80240C68 4600D687 */ neg.s $f26, $f26 -/* D6896C 80240C6C 4405F000 */ mfc1 $a1, $f30 -/* D68970 80240C70 4407E000 */ mfc1 $a3, $f28 -/* D68974 80240C74 4406D000 */ mfc1 $a2, $f26 -/* D68978 80240C78 0C019E40 */ jal guTranslateF -/* D6897C 80240C7C 0240202D */ daddu $a0, $s2, $zero -/* D68980 80240C80 27A40020 */ addiu $a0, $sp, 0x20 -/* D68984 80240C84 0240282D */ daddu $a1, $s2, $zero -/* D68988 80240C88 0C019D80 */ jal guMtxCatF -/* D6898C 80240C8C 0080302D */ daddu $a2, $a0, $zero -/* D68990 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D68994 80240C94 3C0142B4 */ lui $at, 0x42b4 -/* D68998 80240C98 44810000 */ mtc1 $at, $f0 -/* D6899C 80240C9C 00000000 */ nop -/* D689A0 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D689A4 80240CA4 00000000 */ nop -/* D689A8 80240CA8 4500000A */ bc1f .L80240CD4 -/* D689AC 80240CAC 24040001 */ addiu $a0, $zero, 1 -/* D689B0 80240CB0 3C014387 */ lui $at, 0x4387 -/* D689B4 80240CB4 44812000 */ mtc1 $at, $f4 -/* D689B8 80240CB8 00000000 */ nop -/* D689BC 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D689C0 80240CC0 00000000 */ nop -/* D689C4 80240CC4 45000004 */ bc1f .L80240CD8 -/* D689C8 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 -/* D689CC 80240CCC 3C041000 */ lui $a0, 0x1000 -/* D689D0 80240CD0 34840001 */ ori $a0, $a0, 1 -.L80240CD4: -/* D689D4 80240CD4 27A20020 */ addiu $v0, $sp, 0x20 -.L80240CD8: -/* D689D8 80240CD8 AFA20010 */ sw $v0, 0x10($sp) -/* D689DC 80240CDC 0000282D */ daddu $a1, $zero, $zero -/* D689E0 80240CE0 00A0302D */ daddu $a2, $a1, $zero -/* D689E4 80240CE4 0C0B7710 */ jal render_sprite -/* D689E8 80240CE8 00A0382D */ daddu $a3, $a1, $zero -/* D689EC 80240CEC 26730001 */ addiu $s3, $s3, 1 -/* D689F0 80240CF0 2A620002 */ slti $v0, $s3, 2 -/* D689F4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D689F8 80240CF8 00000000 */ nop -/* D689FC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) -/* D68A00 80240D00 8FB60148 */ lw $s6, 0x148($sp) -/* D68A04 80240D04 8FB50144 */ lw $s5, 0x144($sp) -/* D68A08 80240D08 8FB40140 */ lw $s4, 0x140($sp) -/* D68A0C 80240D0C 8FB3013C */ lw $s3, 0x13c($sp) -/* D68A10 80240D10 8FB20138 */ lw $s2, 0x138($sp) -/* D68A14 80240D14 8FB10134 */ lw $s1, 0x134($sp) -/* D68A18 80240D18 8FB00130 */ lw $s0, 0x130($sp) -/* D68A1C 80240D1C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D68A20 80240D20 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D68A24 80240D24 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D68A28 80240D28 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D68A2C 80240D2C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D68A30 80240D30 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D68A34 80240D34 03E00008 */ jr $ra -/* D68A38 80240D38 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_14/func_80240D3C_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/func_80240D3C_D67D00.s deleted file mode 100644 index 756a258996..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/func_80240D3C_D67D00.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_D68A3C -/* D68A3C 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D68A40 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D68A44 80240D44 0080802D */ daddu $s0, $a0, $zero -/* D68A48 80240D48 AFBF0014 */ sw $ra, 0x14($sp) -/* D68A4C 80240D4C 8E020088 */ lw $v0, 0x88($s0) -/* D68A50 80240D50 14400017 */ bnez $v0, .L80240DB0 -/* D68A54 80240D54 24020001 */ addiu $v0, $zero, 1 -/* D68A58 80240D58 8E030084 */ lw $v1, 0x84($s0) -/* D68A5C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D68A60 80240D60 00000000 */ nop -/* D68A64 80240D64 28620002 */ slti $v0, $v1, 2 -/* D68A68 80240D68 50400005 */ beql $v0, $zero, .L80240D80 -/* D68A6C 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* D68A70 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D68A74 80240D74 00000000 */ nop -/* D68A78 80240D78 08090378 */ j .L80240DE0 -/* D68A7C 80240D7C 00000000 */ nop -.L80240D80: -/* D68A80 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D68A84 80240D84 00000000 */ nop -/* D68A88 80240D88 08090378 */ j .L80240DE0 -/* D68A8C 80240D8C 00000000 */ nop -.L80240D90: -/* D68A90 80240D90 3C048024 */ lui $a0, 0x8024 -/* D68A94 80240D94 24840E84 */ addiu $a0, $a0, 0xe84 -/* D68A98 80240D98 08090374 */ j .L80240DD0 -/* D68A9C 80240D9C 00000000 */ nop -.L80240DA0: -/* D68AA0 80240DA0 3C048024 */ lui $a0, 0x8024 -/* D68AA4 80240DA4 24840EEC */ addiu $a0, $a0, 0xeec -/* D68AA8 80240DA8 08090374 */ j .L80240DD0 -/* D68AAC 80240DAC 00000000 */ nop -.L80240DB0: -/* D68AB0 80240DB0 8E020084 */ lw $v0, 0x84($s0) -/* D68AB4 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D68AB8 80240DB8 00000000 */ nop -/* D68ABC 80240DBC 28420002 */ slti $v0, $v0, 2 -/* D68AC0 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D68AC4 80240DC4 00000000 */ nop -.L80240DC8: -/* D68AC8 80240DC8 3C048024 */ lui $a0, 0x8024 -/* D68ACC 80240DCC 24840EB8 */ addiu $a0, $a0, 0xeb8 -.L80240DD0: -/* D68AD0 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 -/* D68AD4 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* D68AD8 80240DD8 8E03013C */ lw $v1, 0x13c($s0) -/* D68ADC 80240DDC AC620004 */ sw $v0, 4($v1) -.L80240DE0: -/* D68AE0 80240DE0 0C00EAD2 */ jal get_npc_safe -/* D68AE4 80240DE4 2404FFFC */ addiu $a0, $zero, -4 -/* D68AE8 80240DE8 0040282D */ daddu $a1, $v0, $zero -/* D68AEC 80240DEC 10A00021 */ beqz $a1, .L80240E74 -/* D68AF0 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* D68AF4 80240DF4 8E020088 */ lw $v0, 0x88($s0) -/* D68AF8 80240DF8 14400014 */ bnez $v0, .L80240E4C -/* D68AFC 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* D68B00 80240E00 8E040084 */ lw $a0, 0x84($s0) -/* D68B04 80240E04 10820016 */ beq $a0, $v0, .L80240E60 -/* D68B08 80240E08 28820002 */ slti $v0, $a0, 2 -/* D68B0C 80240E0C 10400005 */ beqz $v0, .L80240E24 -/* D68B10 80240E10 24020002 */ addiu $v0, $zero, 2 -/* D68B14 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D68B18 80240E18 00000000 */ nop -/* D68B1C 80240E1C 0809039D */ j .L80240E74 -/* D68B20 80240E20 00000000 */ nop -.L80240E24: -/* D68B24 80240E24 10820006 */ beq $a0, $v0, .L80240E40 -/* D68B28 80240E28 24020002 */ addiu $v0, $zero, 2 -/* D68B2C 80240E2C 0809039D */ j .L80240E74 -/* D68B30 80240E30 00000000 */ nop -.L80240E34: -/* D68B34 80240E34 8CA20000 */ lw $v0, ($a1) -/* D68B38 80240E38 0809039A */ j .L80240E68 -/* D68B3C 80240E3C 3C03000A */ lui $v1, 0xa -.L80240E40: -/* D68B40 80240E40 8CA20000 */ lw $v0, ($a1) -/* D68B44 80240E44 0809039A */ j .L80240E68 -/* D68B48 80240E48 3C030002 */ lui $v1, 2 -.L80240E4C: -/* D68B4C 80240E4C 8E020084 */ lw $v0, 0x84($s0) -/* D68B50 80240E50 04400007 */ bltz $v0, .L80240E70 -/* D68B54 80240E54 28420002 */ slti $v0, $v0, 2 -/* D68B58 80240E58 10400006 */ beqz $v0, .L80240E74 -/* D68B5C 80240E5C 24020002 */ addiu $v0, $zero, 2 -.L80240E60: -/* D68B60 80240E60 8CA20000 */ lw $v0, ($a1) -/* D68B64 80240E64 3C030008 */ lui $v1, 8 -.L80240E68: -/* D68B68 80240E68 00431025 */ or $v0, $v0, $v1 -/* D68B6C 80240E6C ACA20000 */ sw $v0, ($a1) -.L80240E70: -/* D68B70 80240E70 24020002 */ addiu $v0, $zero, 2 -.L80240E74: -/* D68B74 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* D68B78 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* D68B7C 80240E7C 03E00008 */ jr $ra -/* D68B80 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_14/func_80240E84_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/func_80240E84_D67D00.s deleted file mode 100644 index 7c4795fc99..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/func_80240E84_D67D00.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D68B84 -/* D68B84 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D68B88 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D68B8C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D68B90 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D68B94 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D68B98 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D68B9C 80240E9C 3C03000A */ lui $v1, 0xa -/* D68BA0 80240EA0 8C820000 */ lw $v0, ($a0) -/* D68BA4 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D68BA8 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D68BAC 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D68BB0 80240EB0 03E00008 */ jr $ra -/* D68BB4 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_14/func_80240EB8_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/func_80240EB8_D67D00.s deleted file mode 100644 index ce465a9a10..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/func_80240EB8_D67D00.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D68BB8 -/* D68BB8 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D68BBC 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D68BC0 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D68BC4 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D68BC8 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D68BCC 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D68BD0 80240ED0 3C030008 */ lui $v1, 8 -/* D68BD4 80240ED4 8C820000 */ lw $v0, ($a0) -/* D68BD8 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D68BDC 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D68BE0 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D68BE4 80240EE4 03E00008 */ jr $ra -/* D68BE8 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_14/func_80240EEC_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/func_80240EEC_D67D00.s deleted file mode 100644 index 0622fcbaac..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/func_80240EEC_D67D00.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D68BEC -/* D68BEC 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D68BF0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D68BF4 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D68BF8 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D68BFC 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D68C00 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D68C04 80240F04 3C030002 */ lui $v1, 2 -/* D68C08 80240F08 8C820000 */ lw $v0, ($a0) -/* D68C0C 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D68C10 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D68C14 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D68C18 80240F18 03E00008 */ jr $ra -/* D68C1C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_14/func_80240F20_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/func_80240F20_D67D00.s deleted file mode 100644 index e0a141a9fd..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/func_80240F20_D67D00.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D68C20 -/* D68C20 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D68C24 80240F24 AFB00010 */ sw $s0, 0x10($sp) -/* D68C28 80240F28 3C108024 */ lui $s0, 0x8024 -/* D68C2C 80240F2C 26101930 */ addiu $s0, $s0, 0x1930 -/* D68C30 80240F30 AFBF0018 */ sw $ra, 0x18($sp) -/* D68C34 80240F34 AFB10014 */ sw $s1, 0x14($sp) -/* D68C38 80240F38 8E020000 */ lw $v0, ($s0) -/* D68C3C 80240F3C 14400010 */ bnez $v0, .L80240F80 -/* D68C40 80240F40 0080882D */ daddu $s1, $a0, $zero -/* D68C44 80240F44 0C00AB39 */ jal heap_malloc -/* D68C48 80240F48 24040040 */ addiu $a0, $zero, 0x40 -/* D68C4C 80240F4C AE020000 */ sw $v0, ($s0) -/* D68C50 80240F50 0000182D */ daddu $v1, $zero, $zero -/* D68C54 80240F54 0040282D */ daddu $a1, $v0, $zero -/* D68C58 80240F58 0220202D */ daddu $a0, $s1, $zero -.L80240F5C: -/* D68C5C 80240F5C 8C820084 */ lw $v0, 0x84($a0) -/* D68C60 80240F60 24840004 */ addiu $a0, $a0, 4 -/* D68C64 80240F64 24630001 */ addiu $v1, $v1, 1 -/* D68C68 80240F68 ACA20000 */ sw $v0, ($a1) -/* D68C6C 80240F6C 28620010 */ slti $v0, $v1, 0x10 -/* D68C70 80240F70 1440FFFA */ bnez $v0, .L80240F5C -/* D68C74 80240F74 24A50004 */ addiu $a1, $a1, 4 -/* D68C78 80240F78 080903EF */ j .L80240FBC -/* D68C7C 80240F7C 00000000 */ nop -.L80240F80: -/* D68C80 80240F80 0000182D */ daddu $v1, $zero, $zero -/* D68C84 80240F84 0040282D */ daddu $a1, $v0, $zero -/* D68C88 80240F88 0220202D */ daddu $a0, $s1, $zero -.L80240F8C: -/* D68C8C 80240F8C 8CA20000 */ lw $v0, ($a1) -/* D68C90 80240F90 24A50004 */ addiu $a1, $a1, 4 -/* D68C94 80240F94 24630001 */ addiu $v1, $v1, 1 -/* D68C98 80240F98 AC820084 */ sw $v0, 0x84($a0) -/* D68C9C 80240F9C 28620010 */ slti $v0, $v1, 0x10 -/* D68CA0 80240FA0 1440FFFA */ bnez $v0, .L80240F8C -/* D68CA4 80240FA4 24840004 */ addiu $a0, $a0, 4 -/* D68CA8 80240FA8 3C108024 */ lui $s0, 0x8024 -/* D68CAC 80240FAC 26101930 */ addiu $s0, $s0, 0x1930 -/* D68CB0 80240FB0 0C00AB4B */ jal heap_free -/* D68CB4 80240FB4 8E040000 */ lw $a0, ($s0) -/* D68CB8 80240FB8 AE000000 */ sw $zero, ($s0) -.L80240FBC: -/* D68CBC 80240FBC 8FBF0018 */ lw $ra, 0x18($sp) -/* D68CC0 80240FC0 8FB10014 */ lw $s1, 0x14($sp) -/* D68CC4 80240FC4 8FB00010 */ lw $s0, 0x10($sp) -/* D68CC8 80240FC8 24020002 */ addiu $v0, $zero, 2 -/* D68CCC 80240FCC 03E00008 */ jr $ra -/* D68CD0 80240FD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_14/func_80240FD4_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/func_80240FD4_D67D00.s deleted file mode 100644 index 403c05ed54..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/func_80240FD4_D67D00.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD4_D68CD4 -/* D68CD4 80240FD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D68CD8 80240FD8 AFB00010 */ sw $s0, 0x10($sp) -/* D68CDC 80240FDC 0080802D */ daddu $s0, $a0, $zero -/* D68CE0 80240FE0 AFBF0018 */ sw $ra, 0x18($sp) -/* D68CE4 80240FE4 AFB10014 */ sw $s1, 0x14($sp) -/* D68CE8 80240FE8 8E02000C */ lw $v0, 0xc($s0) -/* D68CEC 80240FEC 8C510000 */ lw $s1, ($v0) -/* D68CF0 80240FF0 0C0B1EAF */ jal get_variable -/* D68CF4 80240FF4 0220282D */ daddu $a1, $s1, $zero -/* D68CF8 80240FF8 3C03FFF0 */ lui $v1, 0xfff0 -/* D68CFC 80240FFC 3463FFFF */ ori $v1, $v1, 0xffff -/* D68D00 80241000 0200202D */ daddu $a0, $s0, $zero -/* D68D04 80241004 00431024 */ and $v0, $v0, $v1 -/* D68D08 80241008 00021140 */ sll $v0, $v0, 5 -/* D68D0C 8024100C 3C068008 */ lui $a2, %hi(gItemTable) -/* D68D10 80241010 00C23021 */ addu $a2, $a2, $v0 -/* D68D14 80241014 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D68D18 80241018 0C0B2026 */ jal set_variable -/* D68D1C 8024101C 0220282D */ daddu $a1, $s1, $zero -/* D68D20 80241020 8FBF0018 */ lw $ra, 0x18($sp) -/* D68D24 80241024 8FB10014 */ lw $s1, 0x14($sp) -/* D68D28 80241028 8FB00010 */ lw $s0, 0x10($sp) -/* D68D2C 8024102C 24020002 */ addiu $v0, $zero, 2 -/* D68D30 80241030 03E00008 */ jr $ra -/* D68D34 80241034 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_14/func_80241038_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/func_80241038_D67D00.s deleted file mode 100644 index afe81421c0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/func_80241038_D67D00.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_14/func_80241188_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/func_80241188_D67D00.s deleted file mode 100644 index e708da90fe..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/func_80241188_D67D00.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241188_D68E88 -/* D68E88 80241188 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D68E8C 8024118C AFB00010 */ sw $s0, 0x10($sp) -/* D68E90 80241190 0080802D */ daddu $s0, $a0, $zero -/* D68E94 80241194 AFBF0014 */ sw $ra, 0x14($sp) -/* D68E98 80241198 8E02000C */ lw $v0, 0xc($s0) -/* D68E9C 8024119C 0C0B1EAF */ jal get_variable -/* D68EA0 802411A0 8C450000 */ lw $a1, ($v0) -/* D68EA4 802411A4 00021140 */ sll $v0, $v0, 5 -/* D68EA8 802411A8 AE000084 */ sw $zero, 0x84($s0) -/* D68EAC 802411AC 3C018008 */ lui $at, 0x8008 -/* D68EB0 802411B0 00220821 */ addu $at, $at, $v0 -/* D68EB4 802411B4 942278F8 */ lhu $v0, 0x78f8($at) -/* D68EB8 802411B8 30420040 */ andi $v0, $v0, 0x40 -/* D68EBC 802411BC 10400002 */ beqz $v0, .L802411C8 -/* D68EC0 802411C0 24020001 */ addiu $v0, $zero, 1 -/* D68EC4 802411C4 AE020084 */ sw $v0, 0x84($s0) -.L802411C8: -/* D68EC8 802411C8 8FBF0014 */ lw $ra, 0x14($sp) -/* D68ECC 802411CC 8FB00010 */ lw $s0, 0x10($sp) -/* D68ED0 802411D0 24020002 */ addiu $v0, $zero, 2 -/* D68ED4 802411D4 03E00008 */ jr $ra -/* D68ED8 802411D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* D68EDC 802411DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_15/func_80240020_D69810.s b/asm/nonmatchings/world/area_pra/pra_15/func_80240020_D69810.s deleted file mode 100644 index d1276f07d5..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_15/func_80240020_D69810.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D69830 -/* D69830 80240020 3C02800A */ lui $v0, %hi(D_8009A650) -/* D69834 80240024 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* D69838 80240028 8C430000 */ lw $v1, ($v0) -/* D6983C 8024002C 2404FF7F */ addiu $a0, $zero, -0x81 -/* D69840 80240030 00641824 */ and $v1, $v1, $a0 -/* D69844 80240034 AC430000 */ sw $v1, ($v0) -/* D69848 80240038 03E00008 */ jr $ra -/* D6984C 8024003C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_pra/pra_16/func_80240020_D69B20.s b/asm/nonmatchings/world/area_pra/pra_16/func_80240020_D69B20.s deleted file mode 100644 index c3047d05ab..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/func_80240020_D69B20.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D69B40 -/* D69B40 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D69B44 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D69B48 80240028 00822024 */ and $a0, $a0, $v0 -/* D69B4C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D69B50 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D69B54 80240034 00821821 */ addu $v1, $a0, $v0 -/* D69B58 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D69B5C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D69B60 80240040 30620001 */ andi $v0, $v1, 1 -/* D69B64 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D69B68 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D69B6C 8024004C 03E00008 */ jr $ra -/* D69B70 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_16/func_80240054_D69B20.s b/asm/nonmatchings/world/area_pra/pra_16/func_80240054_D69B20.s deleted file mode 100644 index fb96b73ec3..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/func_80240054_D69B20.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054_D69B74 -/* D69B74 80240054 00041403 */ sra $v0, $a0, 0x10 -/* D69B78 80240058 304300FF */ andi $v1, $v0, 0xff -/* D69B7C 8024005C 24020006 */ addiu $v0, $zero, 6 -/* D69B80 80240060 10620015 */ beq $v1, $v0, .L802400B8 -/* D69B84 80240064 28620007 */ slti $v0, $v1, 7 -/* D69B88 80240068 10400005 */ beqz $v0, .L80240080 -/* D69B8C 8024006C 24020001 */ addiu $v0, $zero, 1 -/* D69B90 80240070 1062000A */ beq $v1, $v0, .L8024009C -/* D69B94 80240074 3C020100 */ lui $v0, 0x100 -/* D69B98 80240078 03E00008 */ jr $ra -/* D69B9C 8024007C 00821025 */ or $v0, $a0, $v0 -.L80240080: -/* D69BA0 80240080 2862000A */ slti $v0, $v1, 0xa -/* D69BA4 80240084 10400016 */ beqz $v0, .L802400E0 -/* D69BA8 80240088 28620008 */ slti $v0, $v1, 8 -/* D69BAC 8024008C 14400015 */ bnez $v0, .L802400E4 -/* D69BB0 80240090 3C020100 */ lui $v0, 0x100 -/* D69BB4 80240094 03E00008 */ jr $ra -/* D69BB8 80240098 0080102D */ daddu $v0, $a0, $zero -.L8024009C: -/* D69BBC 8024009C 3C020001 */ lui $v0, 1 -/* D69BC0 802400A0 3442000C */ ori $v0, $v0, 0xc -/* D69BC4 802400A4 0044102A */ slt $v0, $v0, $a0 -/* D69BC8 802400A8 1040000E */ beqz $v0, .L802400E4 -/* D69BCC 802400AC 3C020100 */ lui $v0, 0x100 -.L802400B0: -/* D69BD0 802400B0 03E00008 */ jr $ra -/* D69BD4 802400B4 0080102D */ daddu $v0, $a0, $zero -.L802400B8: -/* D69BD8 802400B8 3C02FFF9 */ lui $v0, 0xfff9 -/* D69BDC 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D69BE0 802400C0 00821821 */ addu $v1, $a0, $v0 -/* D69BE4 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D69BE8 802400C8 10400005 */ beqz $v0, .L802400E0 -/* D69BEC 802400CC 30620001 */ andi $v0, $v1, 1 -/* D69BF0 802400D0 1440FFF7 */ bnez $v0, .L802400B0 -/* D69BF4 802400D4 24820001 */ addiu $v0, $a0, 1 -/* D69BF8 802400D8 03E00008 */ jr $ra -/* D69BFC 802400DC 00000000 */ nop -.L802400E0: -/* D69C00 802400E0 3C020100 */ lui $v0, 0x100 -.L802400E4: -/* D69C04 802400E4 03E00008 */ jr $ra -/* D69C08 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_16/func_802400EC_D69B20.s b/asm/nonmatchings/world/area_pra/pra_16/func_802400EC_D69B20.s deleted file mode 100644 index 7af4aefb96..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/func_802400EC_D69B20.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_D69C0C -/* D69C0C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D69C10 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* D69C14 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D69C18 802400F8 3C058024 */ lui $a1, 0x8024 -/* D69C1C 802400FC 24A50128 */ addiu $a1, $a1, 0x128 -/* D69C20 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* D69C24 80240104 0C048C56 */ jal bind_dynamic_entity_3 -/* D69C28 80240108 0000202D */ daddu $a0, $zero, $zero -/* D69C2C 8024010C 8E03013C */ lw $v1, 0x13c($s0) -/* D69C30 80240110 AC620000 */ sw $v0, ($v1) -/* D69C34 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* D69C38 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* D69C3C 8024011C 24020002 */ addiu $v0, $zero, 2 -/* D69C40 80240120 03E00008 */ jr $ra -/* D69C44 80240124 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_16/func_80240128_D69B20.s b/asm/nonmatchings/world/area_pra/pra_16/func_80240128_D69B20.s deleted file mode 100644 index b6fa7e0ae0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/func_80240128_D69B20.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240128_D69C48 -/* D69C48 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D69C4C 8024012C AFB00040 */ sw $s0, 0x40($sp) -/* D69C50 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D69C54 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D69C58 80240138 AFB20048 */ sw $s2, 0x48($sp) -/* D69C5C 8024013C AFBF004C */ sw $ra, 0x4c($sp) -/* D69C60 80240140 AFB10044 */ sw $s1, 0x44($sp) -/* D69C64 80240144 8E020000 */ lw $v0, ($s0) -/* D69C68 80240148 821100BE */ lb $s1, 0xbe($s0) -/* D69C6C 8024014C 30420001 */ andi $v0, $v0, 1 -/* D69C70 80240150 10400061 */ beqz $v0, .L802402D8 -/* D69C74 80240154 27B20020 */ addiu $s2, $sp, 0x20 -/* D69C78 80240158 8E0400CC */ lw $a0, 0xcc($s0) -/* D69C7C 8024015C 0C044181 */ jal get_shadow_by_index -/* D69C80 80240160 00000000 */ nop -/* D69C84 80240164 0C048B77 */ jal func_80122DDC -/* D69C88 80240168 84440008 */ lh $a0, 8($v0) -/* D69C8C 8024016C 8C430000 */ lw $v1, ($v0) -/* D69C90 80240170 34630200 */ ori $v1, $v1, 0x200 -/* D69C94 80240174 AC430000 */ sw $v1, ($v0) -/* D69C98 80240178 8E050028 */ lw $a1, 0x28($s0) -/* D69C9C 8024017C 8E06002C */ lw $a2, 0x2c($s0) -/* D69CA0 80240180 27A20030 */ addiu $v0, $sp, 0x30 -/* D69CA4 80240184 AFA20010 */ sw $v0, 0x10($sp) -/* D69CA8 80240188 27A20034 */ addiu $v0, $sp, 0x34 -/* D69CAC 8024018C AFA20014 */ sw $v0, 0x14($sp) -/* D69CB0 80240190 C6000030 */ lwc1 $f0, 0x30($s0) -/* D69CB4 80240194 3C04800A */ lui $a0, 0x800a -/* D69CB8 80240198 8484A634 */ lh $a0, -0x59cc($a0) -/* D69CBC 8024019C 46000007 */ neg.s $f0, $f0 -/* D69CC0 802401A0 44070000 */ mfc1 $a3, $f0 -/* D69CC4 802401A4 27A20038 */ addiu $v0, $sp, 0x38 -/* D69CC8 802401A8 0C00B94E */ jal get_screen_coords -/* D69CCC 802401AC AFA20018 */ sw $v0, 0x18($sp) -/* D69CD0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D69CD4 802401B4 0C090008 */ jal func_80240020 -/* D69CD8 802401B8 00000000 */ nop -/* D69CDC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) -/* D69CE0 802401C0 3C014307 */ lui $at, 0x4307 -/* D69CE4 802401C4 44810000 */ mtc1 $at, $f0 -/* D69CE8 802401C8 00000000 */ nop -/* D69CEC 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D69CF0 802401D0 00000000 */ nop -/* D69CF4 802401D4 4500000B */ bc1f .L80240204 -/* D69CF8 802401D8 24040002 */ addiu $a0, $zero, 2 -/* D69CFC 802401DC 3C014361 */ lui $at, 0x4361 -/* D69D00 802401E0 44810000 */ mtc1 $at, $f0 -/* D69D04 802401E4 00000000 */ nop -/* D69D08 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D69D0C 802401EC 00000000 */ nop -/* D69D10 802401F0 45000004 */ bc1f .L80240204 -/* D69D14 802401F4 00000000 */ nop -/* D69D18 802401F8 0C090015 */ jal func_80240054 -/* D69D1C 802401FC 0040202D */ daddu $a0, $v0, $zero -/* D69D20 80240200 24040002 */ addiu $a0, $zero, 2 -.L80240204: -/* D69D24 80240204 3C063F80 */ lui $a2, 0x3f80 -/* D69D28 80240208 0C0B76A3 */ jal func_802DDA8C -/* D69D2C 8024020C 0040282D */ daddu $a1, $v0, $zero -/* D69D30 80240210 8E020000 */ lw $v0, ($s0) -/* D69D34 80240214 3C030002 */ lui $v1, 2 -/* D69D38 80240218 00431024 */ and $v0, $v0, $v1 -/* D69D3C 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 -/* D69D40 80240220 24110011 */ addiu $s1, $zero, 0x11 -/* D69D44 80240224 9203000E */ lbu $v1, 0xe($s0) -/* D69D48 80240228 3C02802E */ lui $v0, 0x802e -/* D69D4C 8024022C 90429D70 */ lbu $v0, -0x6290($v0) -/* D69D50 80240230 10620018 */ beq $v1, $v0, .L80240294 -/* D69D54 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D69D58 80240238 1040000B */ beqz $v0, .L80240268 -/* D69D5C 8024023C 24110011 */ addiu $s1, $zero, 0x11 -/* D69D60 80240240 24040002 */ addiu $a0, $zero, 2 -/* D69D64 80240244 2405FFFF */ addiu $a1, $zero, -1 -/* D69D68 80240248 24060007 */ addiu $a2, $zero, 7 -/* D69D6C 8024024C 0060102D */ daddu $v0, $v1, $zero -/* D69D70 80240250 0000382D */ daddu $a3, $zero, $zero -/* D69D74 80240254 AFA00010 */ sw $zero, 0x10($sp) -/* D69D78 80240258 AFA00014 */ sw $zero, 0x14($sp) -/* D69D7C 8024025C AFA0001C */ sw $zero, 0x1c($sp) -/* D69D80 80240260 080900A3 */ j .L8024028C -/* D69D84 80240264 AFA20018 */ sw $v0, 0x18($sp) -.L80240268: -/* D69D88 80240268 2411000D */ addiu $s1, $zero, 0xd -/* D69D8C 8024026C 24040002 */ addiu $a0, $zero, 2 -/* D69D90 80240270 2405FFFF */ addiu $a1, $zero, -1 -/* D69D94 80240274 0000302D */ daddu $a2, $zero, $zero -/* D69D98 80240278 00C0382D */ daddu $a3, $a2, $zero -/* D69D9C 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* D69DA0 80240280 AFA00014 */ sw $zero, 0x14($sp) -/* D69DA4 80240284 AFA00018 */ sw $zero, 0x18($sp) -/* D69DA8 80240288 AFA0001C */ sw $zero, 0x1c($sp) -.L8024028C: -/* D69DAC 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D69DB0 80240290 00000000 */ nop -.L80240294: -/* D69DB4 80240294 9202000E */ lbu $v0, 0xe($s0) -/* D69DB8 80240298 3C01802E */ lui $at, 0x802e -/* D69DBC 8024029C A0229D70 */ sb $v0, -0x6290($at) -/* D69DC0 802402A0 080900AD */ j .L802402B4 -/* D69DC4 802402A4 0240202D */ daddu $a0, $s2, $zero -.L802402A8: -/* D69DC8 802402A8 3C01802E */ lui $at, 0x802e -/* D69DCC 802402AC A0209D70 */ sb $zero, -0x6290($at) -/* D69DD0 802402B0 0240202D */ daddu $a0, $s2, $zero -.L802402B4: -/* D69DD4 802402B4 AC910000 */ sw $s1, ($a0) -/* D69DD8 802402B8 AC900008 */ sw $s0, 8($a0) -/* D69DDC 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D69DE0 802402C0 3C038024 */ lui $v1, 0x8024 -/* D69DE4 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 -/* D69DE8 802402C8 AC83000C */ sw $v1, 0xc($a0) -/* D69DEC 802402CC 00021023 */ negu $v0, $v0 -/* D69DF0 802402D0 0C047644 */ jal queue_render_task -/* D69DF4 802402D4 AC820004 */ sw $v0, 4($a0) -.L802402D8: -/* D69DF8 802402D8 8FBF004C */ lw $ra, 0x4c($sp) -/* D69DFC 802402DC 8FB20048 */ lw $s2, 0x48($sp) -/* D69E00 802402E0 8FB10044 */ lw $s1, 0x44($sp) -/* D69E04 802402E4 8FB00040 */ lw $s0, 0x40($sp) -/* D69E08 802402E8 03E00008 */ jr $ra -/* D69E0C 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_16/func_802402F0_D69B20.s b/asm/nonmatchings/world/area_pra/pra_16/func_802402F0_D69B20.s deleted file mode 100644 index 0695d79439..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/func_802402F0_D69B20.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D69E10 -/* D69E10 802402F0 3C03800A */ lui $v1, 0x800a -/* D69E14 802402F4 8463A634 */ lh $v1, -0x59cc($v1) -/* D69E18 802402F8 3C07BF80 */ lui $a3, 0xbf80 -/* D69E1C 802402FC 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D69E20 80240300 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D69E24 80240304 4480A000 */ mtc1 $zero, $f20 -/* D69E28 80240308 AFB1011C */ sw $s1, 0x11c($sp) -/* D69E2C 8024030C 0080882D */ daddu $s1, $a0, $zero -/* D69E30 80240310 AFB00118 */ sw $s0, 0x118($sp) -/* D69E34 80240314 27B00098 */ addiu $s0, $sp, 0x98 -/* D69E38 80240318 AFBF0120 */ sw $ra, 0x120($sp) -/* D69E3C 8024031C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D69E40 80240320 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D69E44 80240324 00031080 */ sll $v0, $v1, 2 -/* D69E48 80240328 00431021 */ addu $v0, $v0, $v1 -/* D69E4C 8024032C 00021080 */ sll $v0, $v0, 2 -/* D69E50 80240330 00431023 */ subu $v0, $v0, $v1 -/* D69E54 80240334 000218C0 */ sll $v1, $v0, 3 -/* D69E58 80240338 00431021 */ addu $v0, $v0, $v1 -/* D69E5C 8024033C 000210C0 */ sll $v0, $v0, 3 -/* D69E60 80240340 3C01800B */ lui $at, 0x800b -/* D69E64 80240344 00220821 */ addu $at, $at, $v0 -/* D69E68 80240348 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D69E6C 8024034C 4406A000 */ mfc1 $a2, $f20 -/* D69E70 80240350 4600B587 */ neg.s $f22, $f22 -/* D69E74 80240354 4405B000 */ mfc1 $a1, $f22 -/* D69E78 80240358 0200202D */ daddu $a0, $s0, $zero -/* D69E7C 8024035C 0C019EC8 */ jal guRotateF -/* D69E80 80240360 E7B40010 */ swc1 $f20, 0x10($sp) -/* D69E84 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D69E88 80240368 0C00A6C9 */ jal clamp_angle -/* D69E8C 8024036C 00000000 */ nop -/* D69E90 80240370 44050000 */ mfc1 $a1, $f0 -/* D69E94 80240374 4406A000 */ mfc1 $a2, $f20 -/* D69E98 80240378 4407A000 */ mfc1 $a3, $f20 -/* D69E9C 8024037C 3C013F80 */ lui $at, 0x3f80 -/* D69EA0 80240380 4481C000 */ mtc1 $at, $f24 -/* D69EA4 80240384 27A40018 */ addiu $a0, $sp, 0x18 -/* D69EA8 80240388 0C019EC8 */ jal guRotateF -/* D69EAC 8024038C E7B80010 */ swc1 $f24, 0x10($sp) -/* D69EB0 80240390 0200202D */ daddu $a0, $s0, $zero -/* D69EB4 80240394 27A50018 */ addiu $a1, $sp, 0x18 -/* D69EB8 80240398 0C019D80 */ jal guMtxCatF -/* D69EBC 8024039C 00A0302D */ daddu $a2, $a1, $zero -/* D69EC0 802403A0 4405B000 */ mfc1 $a1, $f22 -/* D69EC4 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D69EC8 802403A8 4407C000 */ mfc1 $a3, $f24 -/* D69ECC 802403AC 0200202D */ daddu $a0, $s0, $zero -/* D69ED0 802403B0 0C019EC8 */ jal guRotateF -/* D69ED4 802403B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D69ED8 802403B8 27A40018 */ addiu $a0, $sp, 0x18 -/* D69EDC 802403BC 0200282D */ daddu $a1, $s0, $zero -/* D69EE0 802403C0 0C019D80 */ jal guMtxCatF -/* D69EE4 802403C4 0080302D */ daddu $a2, $a0, $zero -/* D69EE8 802403C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D69EEC 802403CC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D69EF0 802403D0 4406A000 */ mfc1 $a2, $f20 -/* D69EF4 802403D4 4407C000 */ mfc1 $a3, $f24 -/* D69EF8 802403D8 0C019EC8 */ jal guRotateF -/* D69EFC 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D69F00 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* D69F04 802403E4 0200282D */ daddu $a1, $s0, $zero -/* D69F08 802403E8 0C019D80 */ jal guMtxCatF -/* D69F0C 802403EC 0080302D */ daddu $a2, $a0, $zero -/* D69F10 802403F0 3C013F36 */ lui $at, 0x3f36 -/* D69F14 802403F4 3421DB6E */ ori $at, $at, 0xdb6e -/* D69F18 802403F8 44810000 */ mtc1 $at, $f0 -/* D69F1C 802403FC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D69F20 80240400 44050000 */ mfc1 $a1, $f0 -/* D69F24 80240404 0200202D */ daddu $a0, $s0, $zero -/* D69F28 80240408 00A0302D */ daddu $a2, $a1, $zero -/* D69F2C 8024040C 0C019DF0 */ jal guScaleF -/* D69F30 80240410 00A0382D */ daddu $a3, $a1, $zero -/* D69F34 80240414 27A40018 */ addiu $a0, $sp, 0x18 -/* D69F38 80240418 0200282D */ daddu $a1, $s0, $zero -/* D69F3C 8024041C 0C019D80 */ jal guMtxCatF -/* D69F40 80240420 0080302D */ daddu $a2, $a0, $zero -/* D69F44 80240424 27B00058 */ addiu $s0, $sp, 0x58 -/* D69F48 80240428 C6200030 */ lwc1 $f0, 0x30($s1) -/* D69F4C 8024042C 3C014040 */ lui $at, 0x4040 -/* D69F50 80240430 44811000 */ mtc1 $at, $f2 -/* D69F54 80240434 46000007 */ neg.s $f0, $f0 -/* D69F58 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* D69F5C 8024043C 8E250028 */ lw $a1, 0x28($s1) -/* D69F60 80240440 8E26002C */ lw $a2, 0x2c($s1) -/* D69F64 80240444 44070000 */ mfc1 $a3, $f0 -/* D69F68 80240448 0C019E40 */ jal guTranslateF -/* D69F6C 8024044C 0200202D */ daddu $a0, $s0, $zero -/* D69F70 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* D69F74 80240454 0200282D */ daddu $a1, $s0, $zero -/* D69F78 80240458 0C019D80 */ jal guMtxCatF -/* D69F7C 8024045C 0080302D */ daddu $a2, $a0, $zero -/* D69F80 80240460 24040002 */ addiu $a0, $zero, 2 -/* D69F84 80240464 0000282D */ daddu $a1, $zero, $zero -/* D69F88 80240468 00A0302D */ daddu $a2, $a1, $zero -/* D69F8C 8024046C 00A0382D */ daddu $a3, $a1, $zero -/* D69F90 80240470 27A20018 */ addiu $v0, $sp, 0x18 -/* D69F94 80240474 0C0B7710 */ jal render_sprite -/* D69F98 80240478 AFA20010 */ sw $v0, 0x10($sp) -/* D69F9C 8024047C 8FBF0120 */ lw $ra, 0x120($sp) -/* D69FA0 80240480 8FB1011C */ lw $s1, 0x11c($sp) -/* D69FA4 80240484 8FB00118 */ lw $s0, 0x118($sp) -/* D69FA8 80240488 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D69FAC 8024048C D7B60130 */ ldc1 $f22, 0x130($sp) -/* D69FB0 80240490 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D69FB4 80240494 03E00008 */ jr $ra -/* D69FB8 80240498 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_16/func_8024049C_D69B20.s b/asm/nonmatchings/world/area_pra/pra_16/func_8024049C_D69B20.s deleted file mode 100644 index ca61b6abe5..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/func_8024049C_D69B20.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_D69FBC -/* D69FBC 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D69FC0 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* D69FC4 802404A4 0080802D */ daddu $s0, $a0, $zero -/* D69FC8 802404A8 AFBF0014 */ sw $ra, 0x14($sp) -/* D69FCC 802404AC 8E020084 */ lw $v0, 0x84($s0) -/* D69FD0 802404B0 0440000E */ bltz $v0, .L802404EC -/* D69FD4 802404B4 28420002 */ slti $v0, $v0, 2 -/* D69FD8 802404B8 1040000C */ beqz $v0, .L802404EC -/* D69FDC 802404BC 00000000 */ nop -/* D69FE0 802404C0 3C058024 */ lui $a1, 0x8024 -/* D69FE4 802404C4 24A50500 */ addiu $a1, $a1, 0x500 -/* D69FE8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 -/* D69FEC 802404CC 0000202D */ daddu $a0, $zero, $zero -/* D69FF0 802404D0 8E03013C */ lw $v1, 0x13c($s0) -/* D69FF4 802404D4 AC620000 */ sw $v0, ($v1) -/* D69FF8 802404D8 3C03800A */ lui $v1, %hi(D_8009A650) -/* D69FFC 802404DC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D6A000 802404E0 8C620000 */ lw $v0, ($v1) -/* D6A004 802404E4 34420080 */ ori $v0, $v0, 0x80 -/* D6A008 802404E8 AC620000 */ sw $v0, ($v1) -.L802404EC: -/* D6A00C 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* D6A010 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* D6A014 802404F4 24020002 */ addiu $v0, $zero, 2 -/* D6A018 802404F8 03E00008 */ jr $ra -/* D6A01C 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_16/func_80240500_D69B20.s b/asm/nonmatchings/world/area_pra/pra_16/func_80240500_D69B20.s deleted file mode 100644 index 3feb2b1e67..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/func_80240500_D69B20.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_D6A020 -/* D6A020 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D6A024 80240504 AFB00040 */ sw $s0, 0x40($sp) -/* D6A028 80240508 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D6A02C 8024050C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D6A030 80240510 AFB10044 */ sw $s1, 0x44($sp) -/* D6A034 80240514 AFBF004C */ sw $ra, 0x4c($sp) -/* D6A038 80240518 AFB20048 */ sw $s2, 0x48($sp) -/* D6A03C 8024051C 8E020000 */ lw $v0, ($s0) -/* D6A040 80240520 821200BE */ lb $s2, 0xbe($s0) -/* D6A044 80240524 30420001 */ andi $v0, $v0, 1 -/* D6A048 80240528 10400052 */ beqz $v0, .L80240674 -/* D6A04C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 -/* D6A050 80240530 8E0400CC */ lw $a0, 0xcc($s0) -/* D6A054 80240534 0C044181 */ jal get_shadow_by_index -/* D6A058 80240538 00000000 */ nop -/* D6A05C 8024053C 0C048B77 */ jal func_80122DDC -/* D6A060 80240540 84440008 */ lh $a0, 8($v0) -/* D6A064 80240544 8E050028 */ lw $a1, 0x28($s0) -/* D6A068 80240548 8E070030 */ lw $a3, 0x30($s0) -/* D6A06C 8024054C 27A20030 */ addiu $v0, $sp, 0x30 -/* D6A070 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* D6A074 80240554 27A20034 */ addiu $v0, $sp, 0x34 -/* D6A078 80240558 AFA20014 */ sw $v0, 0x14($sp) -/* D6A07C 8024055C 27A20038 */ addiu $v0, $sp, 0x38 -/* D6A080 80240560 AFA20018 */ sw $v0, 0x18($sp) -/* D6A084 80240564 C600002C */ lwc1 $f0, 0x2c($s0) -/* D6A088 80240568 3C04800A */ lui $a0, 0x800a -/* D6A08C 8024056C 8484A634 */ lh $a0, -0x59cc($a0) -/* D6A090 80240570 46000007 */ neg.s $f0, $f0 -/* D6A094 80240574 44060000 */ mfc1 $a2, $f0 -/* D6A098 80240578 0C00B94E */ jal get_screen_coords -/* D6A09C 8024057C 00000000 */ nop -/* D6A0A0 80240580 8E0500A4 */ lw $a1, 0xa4($s0) -/* D6A0A4 80240584 3C063F80 */ lui $a2, 0x3f80 -/* D6A0A8 80240588 0C0B76A3 */ jal func_802DDA8C -/* D6A0AC 8024058C 24040001 */ addiu $a0, $zero, 1 -/* D6A0B0 80240590 8E020000 */ lw $v0, ($s0) -/* D6A0B4 80240594 3C030002 */ lui $v1, 2 -/* D6A0B8 80240598 00431024 */ and $v0, $v0, $v1 -/* D6A0BC 8024059C 54400022 */ bnel $v0, $zero, .L80240628 -/* D6A0C0 802405A0 24120011 */ addiu $s2, $zero, 0x11 -/* D6A0C4 802405A4 9203000E */ lbu $v1, 0xe($s0) -/* D6A0C8 802405A8 3C02802E */ lui $v0, 0x802e -/* D6A0CC 802405AC 90429D71 */ lbu $v0, -0x628f($v0) -/* D6A0D0 802405B0 10620018 */ beq $v1, $v0, .L80240614 -/* D6A0D4 802405B4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D6A0D8 802405B8 1040000B */ beqz $v0, .L802405E8 -/* D6A0DC 802405BC 24120011 */ addiu $s2, $zero, 0x11 -/* D6A0E0 802405C0 24040001 */ addiu $a0, $zero, 1 -/* D6A0E4 802405C4 2405FFFF */ addiu $a1, $zero, -1 -/* D6A0E8 802405C8 24060007 */ addiu $a2, $zero, 7 -/* D6A0EC 802405CC 0060102D */ daddu $v0, $v1, $zero -/* D6A0F0 802405D0 0000382D */ daddu $a3, $zero, $zero -/* D6A0F4 802405D4 AFA00010 */ sw $zero, 0x10($sp) -/* D6A0F8 802405D8 AFA00014 */ sw $zero, 0x14($sp) -/* D6A0FC 802405DC AFA0001C */ sw $zero, 0x1c($sp) -/* D6A100 802405E0 08090183 */ j .L8024060C -/* D6A104 802405E4 AFA20018 */ sw $v0, 0x18($sp) -.L802405E8: -/* D6A108 802405E8 2412000D */ addiu $s2, $zero, 0xd -/* D6A10C 802405EC 24040001 */ addiu $a0, $zero, 1 -/* D6A110 802405F0 2405FFFF */ addiu $a1, $zero, -1 -/* D6A114 802405F4 0000302D */ daddu $a2, $zero, $zero -/* D6A118 802405F8 00C0382D */ daddu $a3, $a2, $zero -/* D6A11C 802405FC AFA00010 */ sw $zero, 0x10($sp) -/* D6A120 80240600 AFA00014 */ sw $zero, 0x14($sp) -/* D6A124 80240604 AFA00018 */ sw $zero, 0x18($sp) -/* D6A128 80240608 AFA0001C */ sw $zero, 0x1c($sp) -.L8024060C: -/* D6A12C 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D6A130 80240610 00000000 */ nop -.L80240614: -/* D6A134 80240614 9202000E */ lbu $v0, 0xe($s0) -/* D6A138 80240618 3C01802E */ lui $at, 0x802e -/* D6A13C 8024061C A0229D71 */ sb $v0, -0x628f($at) -/* D6A140 80240620 0809018C */ j .L80240630 -/* D6A144 80240624 00000000 */ nop -.L80240628: -/* D6A148 80240628 3C01802E */ lui $at, 0x802e -/* D6A14C 8024062C A0209D71 */ sb $zero, -0x628f($at) -.L80240630: -/* D6A150 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D6A154 80240634 3C048024 */ lui $a0, 0x8024 -/* D6A158 80240638 24840870 */ addiu $a0, $a0, 0x870 -/* D6A15C 8024063C AE320000 */ sw $s2, ($s1) -/* D6A160 80240640 AE300008 */ sw $s0, 8($s1) -/* D6A164 80240644 00021023 */ negu $v0, $v0 -/* D6A168 80240648 AE220004 */ sw $v0, 4($s1) -/* D6A16C 8024064C 8E020000 */ lw $v0, ($s0) -/* D6A170 80240650 3C030002 */ lui $v1, 2 -/* D6A174 80240654 00431024 */ and $v0, $v0, $v1 -/* D6A178 80240658 54400004 */ bnel $v0, $zero, .L8024066C -/* D6A17C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D6A180 80240660 3C048024 */ lui $a0, 0x8024 -/* D6A184 80240664 2484068C */ addiu $a0, $a0, 0x68c -/* D6A188 80240668 AE24000C */ sw $a0, 0xc($s1) -.L8024066C: -/* D6A18C 8024066C 0C047644 */ jal queue_render_task -/* D6A190 80240670 0220202D */ daddu $a0, $s1, $zero -.L80240674: -/* D6A194 80240674 8FBF004C */ lw $ra, 0x4c($sp) -/* D6A198 80240678 8FB20048 */ lw $s2, 0x48($sp) -/* D6A19C 8024067C 8FB10044 */ lw $s1, 0x44($sp) -/* D6A1A0 80240680 8FB00040 */ lw $s0, 0x40($sp) -/* D6A1A4 80240684 03E00008 */ jr $ra -/* D6A1A8 80240688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_16/func_8024068C_D69B20.s b/asm/nonmatchings/world/area_pra/pra_16/func_8024068C_D69B20.s deleted file mode 100644 index d0f6a4290e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/func_8024068C_D69B20.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_D6A1AC -/* D6A1AC 8024068C 3C03800A */ lui $v1, 0x800a -/* D6A1B0 80240690 8463A634 */ lh $v1, -0x59cc($v1) -/* D6A1B4 80240694 3C07BF80 */ lui $a3, 0xbf80 -/* D6A1B8 80240698 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D6A1BC 8024069C F7B40128 */ sdc1 $f20, 0x128($sp) -/* D6A1C0 802406A0 4480A000 */ mtc1 $zero, $f20 -/* D6A1C4 802406A4 AFB1011C */ sw $s1, 0x11c($sp) -/* D6A1C8 802406A8 0080882D */ daddu $s1, $a0, $zero -/* D6A1CC 802406AC AFB00118 */ sw $s0, 0x118($sp) -/* D6A1D0 802406B0 27B00098 */ addiu $s0, $sp, 0x98 -/* D6A1D4 802406B4 AFBF0120 */ sw $ra, 0x120($sp) -/* D6A1D8 802406B8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D6A1DC 802406BC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D6A1E0 802406C0 00031080 */ sll $v0, $v1, 2 -/* D6A1E4 802406C4 00431021 */ addu $v0, $v0, $v1 -/* D6A1E8 802406C8 00021080 */ sll $v0, $v0, 2 -/* D6A1EC 802406CC 00431023 */ subu $v0, $v0, $v1 -/* D6A1F0 802406D0 000218C0 */ sll $v1, $v0, 3 -/* D6A1F4 802406D4 00431021 */ addu $v0, $v0, $v1 -/* D6A1F8 802406D8 000210C0 */ sll $v0, $v0, 3 -/* D6A1FC 802406DC 3C01800B */ lui $at, 0x800b -/* D6A200 802406E0 00220821 */ addu $at, $at, $v0 -/* D6A204 802406E4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D6A208 802406E8 4406A000 */ mfc1 $a2, $f20 -/* D6A20C 802406EC 4600B587 */ neg.s $f22, $f22 -/* D6A210 802406F0 4405B000 */ mfc1 $a1, $f22 -/* D6A214 802406F4 0200202D */ daddu $a0, $s0, $zero -/* D6A218 802406F8 0C019EC8 */ jal guRotateF -/* D6A21C 802406FC E7B40010 */ swc1 $f20, 0x10($sp) -/* D6A220 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D6A224 80240704 0C00A6C9 */ jal clamp_angle -/* D6A228 80240708 00000000 */ nop -/* D6A22C 8024070C 44050000 */ mfc1 $a1, $f0 -/* D6A230 80240710 4406A000 */ mfc1 $a2, $f20 -/* D6A234 80240714 4407A000 */ mfc1 $a3, $f20 -/* D6A238 80240718 3C013F80 */ lui $at, 0x3f80 -/* D6A23C 8024071C 4481C000 */ mtc1 $at, $f24 -/* D6A240 80240720 27A40018 */ addiu $a0, $sp, 0x18 -/* D6A244 80240724 0C019EC8 */ jal guRotateF -/* D6A248 80240728 E7B80010 */ swc1 $f24, 0x10($sp) -/* D6A24C 8024072C 0200202D */ daddu $a0, $s0, $zero -/* D6A250 80240730 27A50018 */ addiu $a1, $sp, 0x18 -/* D6A254 80240734 0C019D80 */ jal guMtxCatF -/* D6A258 80240738 00A0302D */ daddu $a2, $a1, $zero -/* D6A25C 8024073C 4405B000 */ mfc1 $a1, $f22 -/* D6A260 80240740 4406A000 */ mfc1 $a2, $f20 -/* D6A264 80240744 4407C000 */ mfc1 $a3, $f24 -/* D6A268 80240748 0200202D */ daddu $a0, $s0, $zero -/* D6A26C 8024074C 0C019EC8 */ jal guRotateF -/* D6A270 80240750 E7B40010 */ swc1 $f20, 0x10($sp) -/* D6A274 80240754 27A40018 */ addiu $a0, $sp, 0x18 -/* D6A278 80240758 0200282D */ daddu $a1, $s0, $zero -/* D6A27C 8024075C 0C019D80 */ jal guMtxCatF -/* D6A280 80240760 0080302D */ daddu $a2, $a0, $zero -/* D6A284 80240764 E7B40010 */ swc1 $f20, 0x10($sp) -/* D6A288 80240768 8E2500A8 */ lw $a1, 0xa8($s1) -/* D6A28C 8024076C 4406A000 */ mfc1 $a2, $f20 -/* D6A290 80240770 4407C000 */ mfc1 $a3, $f24 -/* D6A294 80240774 0C019EC8 */ jal guRotateF -/* D6A298 80240778 0200202D */ daddu $a0, $s0, $zero -/* D6A29C 8024077C 27A40018 */ addiu $a0, $sp, 0x18 -/* D6A2A0 80240780 0200282D */ daddu $a1, $s0, $zero -/* D6A2A4 80240784 0C019D80 */ jal guMtxCatF -/* D6A2A8 80240788 0080302D */ daddu $a2, $a0, $zero -/* D6A2AC 8024078C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D6A2B0 80240790 3C013F36 */ lui $at, 0x3f36 -/* D6A2B4 80240794 3421DB6E */ ori $at, $at, 0xdb6e -/* D6A2B8 80240798 44810000 */ mtc1 $at, $f0 -/* D6A2BC 8024079C 0200202D */ daddu $a0, $s0, $zero -/* D6A2C0 802407A0 44050000 */ mfc1 $a1, $f0 -/* D6A2C4 802407A4 3C06BF36 */ lui $a2, 0xbf36 -/* D6A2C8 802407A8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D6A2CC 802407AC 0C019DF0 */ jal guScaleF -/* D6A2D0 802407B0 00A0382D */ daddu $a3, $a1, $zero -/* D6A2D4 802407B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D6A2D8 802407B8 0200282D */ daddu $a1, $s0, $zero -/* D6A2DC 802407BC 0C019D80 */ jal guMtxCatF -/* D6A2E0 802407C0 0080302D */ daddu $a2, $a0, $zero -/* D6A2E4 802407C4 27B00058 */ addiu $s0, $sp, 0x58 -/* D6A2E8 802407C8 8E250028 */ lw $a1, 0x28($s1) -/* D6A2EC 802407CC C620002C */ lwc1 $f0, 0x2c($s1) -/* D6A2F0 802407D0 8E270030 */ lw $a3, 0x30($s1) -/* D6A2F4 802407D4 46000007 */ neg.s $f0, $f0 -/* D6A2F8 802407D8 44060000 */ mfc1 $a2, $f0 -/* D6A2FC 802407DC 0C019E40 */ jal guTranslateF -/* D6A300 802407E0 0200202D */ daddu $a0, $s0, $zero -/* D6A304 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D6A308 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D6A30C 802407EC 0C019D80 */ jal guMtxCatF -/* D6A310 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D6A314 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D6A318 802407F8 3C0142B4 */ lui $at, 0x42b4 -/* D6A31C 802407FC 44810000 */ mtc1 $at, $f0 -/* D6A320 80240800 00000000 */ nop -/* D6A324 80240804 4602003E */ c.le.s $f0, $f2 -/* D6A328 80240808 00000000 */ nop -/* D6A32C 8024080C 4500000A */ bc1f .L80240838 -/* D6A330 80240810 24040001 */ addiu $a0, $zero, 1 -/* D6A334 80240814 3C014387 */ lui $at, 0x4387 -/* D6A338 80240818 44810000 */ mtc1 $at, $f0 -/* D6A33C 8024081C 00000000 */ nop -/* D6A340 80240820 4600103C */ c.lt.s $f2, $f0 -/* D6A344 80240824 00000000 */ nop -/* D6A348 80240828 45000004 */ bc1f .L8024083C -/* D6A34C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 -/* D6A350 80240830 3C041000 */ lui $a0, 0x1000 -/* D6A354 80240834 34840001 */ ori $a0, $a0, 1 -.L80240838: -/* D6A358 80240838 27A20018 */ addiu $v0, $sp, 0x18 -.L8024083C: -/* D6A35C 8024083C 0000282D */ daddu $a1, $zero, $zero -/* D6A360 80240840 00A0302D */ daddu $a2, $a1, $zero -/* D6A364 80240844 00A0382D */ daddu $a3, $a1, $zero -/* D6A368 80240848 0C0B7710 */ jal render_sprite -/* D6A36C 8024084C AFA20010 */ sw $v0, 0x10($sp) -/* D6A370 80240850 8FBF0120 */ lw $ra, 0x120($sp) -/* D6A374 80240854 8FB1011C */ lw $s1, 0x11c($sp) -/* D6A378 80240858 8FB00118 */ lw $s0, 0x118($sp) -/* D6A37C 8024085C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D6A380 80240860 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D6A384 80240864 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D6A388 80240868 03E00008 */ jr $ra -/* D6A38C 8024086C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_16/func_80240870_D69B20.s b/asm/nonmatchings/world/area_pra/pra_16/func_80240870_D69B20.s deleted file mode 100644 index c0e07c2807..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/func_80240870_D69B20.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_D6A390 -/* D6A390 80240870 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D6A394 80240874 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D6A398 80240878 4480B000 */ mtc1 $zero, $f22 -/* D6A39C 8024087C AFB10134 */ sw $s1, 0x134($sp) -/* D6A3A0 80240880 0080882D */ daddu $s1, $a0, $zero -/* D6A3A4 80240884 AFB3013C */ sw $s3, 0x13c($sp) -/* D6A3A8 80240888 0000982D */ daddu $s3, $zero, $zero -/* D6A3AC 8024088C AFB60148 */ sw $s6, 0x148($sp) -/* D6A3B0 80240890 3C16800B */ lui $s6, %hi(gCameras) -/* D6A3B4 80240894 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D6A3B8 80240898 AFB50144 */ sw $s5, 0x144($sp) -/* D6A3BC 8024089C 241500FF */ addiu $s5, $zero, 0xff -/* D6A3C0 802408A0 AFB00130 */ sw $s0, 0x130($sp) -/* D6A3C4 802408A4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D6A3C8 802408A8 AFB20138 */ sw $s2, 0x138($sp) -/* D6A3CC 802408AC 27B20060 */ addiu $s2, $sp, 0x60 -/* D6A3D0 802408B0 AFB40140 */ sw $s4, 0x140($sp) -/* D6A3D4 802408B4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D6A3D8 802408B8 AFBF014C */ sw $ra, 0x14c($sp) -/* D6A3DC 802408BC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D6A3E0 802408C0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D6A3E4 802408C4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D6A3E8 802408C8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D6A3EC 802408CC F7B40150 */ sdc1 $f20, 0x150($sp) -.L802408D0: -/* D6A3F0 802408D0 3C03800A */ lui $v1, 0x800a -/* D6A3F4 802408D4 8463A634 */ lh $v1, -0x59cc($v1) -/* D6A3F8 802408D8 00031080 */ sll $v0, $v1, 2 -/* D6A3FC 802408DC 00431021 */ addu $v0, $v0, $v1 -/* D6A400 802408E0 00021080 */ sll $v0, $v0, 2 -/* D6A404 802408E4 00431023 */ subu $v0, $v0, $v1 -/* D6A408 802408E8 000218C0 */ sll $v1, $v0, 3 -/* D6A40C 802408EC 00431021 */ addu $v0, $v0, $v1 -/* D6A410 802408F0 000210C0 */ sll $v0, $v0, 3 -/* D6A414 802408F4 00561021 */ addu $v0, $v0, $s6 -/* D6A418 802408F8 C440006C */ lwc1 $f0, 0x6c($v0) -/* D6A41C 802408FC 16600065 */ bnez $s3, .L80240A94 -/* D6A420 80240900 46000507 */ neg.s $f20, $f0 -/* D6A424 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D6A428 80240908 3C0142B4 */ lui $at, 0x42b4 -/* D6A42C 8024090C 44810000 */ mtc1 $at, $f0 -/* D6A430 80240910 00000000 */ nop -/* D6A434 80240914 4602003C */ c.lt.s $f0, $f2 -/* D6A438 80240918 00000000 */ nop -/* D6A43C 8024091C 4500000A */ bc1f .L80240948 -/* D6A440 80240920 00000000 */ nop -/* D6A444 80240924 3C014334 */ lui $at, 0x4334 -/* D6A448 80240928 44812000 */ mtc1 $at, $f4 -/* D6A44C 8024092C 00000000 */ nop -/* D6A450 80240930 4604103E */ c.le.s $f2, $f4 -/* D6A454 80240934 00000000 */ nop -/* D6A458 80240938 45000003 */ bc1f .L80240948 -/* D6A45C 8024093C 00000000 */ nop -/* D6A460 80240940 08090276 */ j .L802409D8 -/* D6A464 80240944 46022501 */ sub.s $f20, $f4, $f2 -.L80240948: -/* D6A468 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D6A46C 8024094C 3C014334 */ lui $at, 0x4334 -/* D6A470 80240950 44812000 */ mtc1 $at, $f4 -/* D6A474 80240954 00000000 */ nop -/* D6A478 80240958 4600203C */ c.lt.s $f4, $f0 -/* D6A47C 8024095C 00000000 */ nop -/* D6A480 80240960 4500000C */ bc1f .L80240994 -/* D6A484 80240964 00000000 */ nop -/* D6A488 80240968 3C014387 */ lui $at, 0x4387 -/* D6A48C 8024096C 44812000 */ mtc1 $at, $f4 -/* D6A490 80240970 00000000 */ nop -/* D6A494 80240974 4604003E */ c.le.s $f0, $f4 -/* D6A498 80240978 00000000 */ nop -/* D6A49C 8024097C 45000008 */ bc1f .L802409A0 -/* D6A4A0 80240980 00000000 */ nop -/* D6A4A4 80240984 3C014334 */ lui $at, 0x4334 -/* D6A4A8 80240988 44812000 */ mtc1 $at, $f4 -/* D6A4AC 8024098C 08090276 */ j .L802409D8 -/* D6A4B0 80240990 46040501 */ sub.s $f20, $f0, $f4 -.L80240994: -/* D6A4B4 80240994 3C014387 */ lui $at, 0x4387 -/* D6A4B8 80240998 44812000 */ mtc1 $at, $f4 -/* D6A4BC 8024099C 00000000 */ nop -.L802409A0: -/* D6A4C0 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D6A4C4 802409A4 00000000 */ nop -/* D6A4C8 802409A8 4500000A */ bc1f .L802409D4 -/* D6A4CC 802409AC 00000000 */ nop -/* D6A4D0 802409B0 3C0143B4 */ lui $at, 0x43b4 -/* D6A4D4 802409B4 44811000 */ mtc1 $at, $f2 -/* D6A4D8 802409B8 00000000 */ nop -/* D6A4DC 802409BC 4602003E */ c.le.s $f0, $f2 -/* D6A4E0 802409C0 00000000 */ nop -/* D6A4E4 802409C4 45000003 */ bc1f .L802409D4 -/* D6A4E8 802409C8 00000000 */ nop -/* D6A4EC 802409CC 08090276 */ j .L802409D8 -/* D6A4F0 802409D0 46001501 */ sub.s $f20, $f2, $f0 -.L802409D4: -/* D6A4F4 802409D4 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L802409D8: -/* D6A4F8 802409D8 3C0141C8 */ lui $at, 0x41c8 -/* D6A4FC 802409DC 44810000 */ mtc1 $at, $f0 -/* D6A500 802409E0 00000000 */ nop -/* D6A504 802409E4 4600A003 */ div.s $f0, $f20, $f0 -/* D6A508 802409E8 4600010D */ trunc.w.s $f4, $f0 -/* D6A50C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D6A510 802409F0 00000000 */ nop -/* D6A514 802409F4 00071100 */ sll $v0, $a3, 4 -/* D6A518 802409F8 00471023 */ subu $v0, $v0, $a3 -/* D6A51C 802409FC 00021080 */ sll $v0, $v0, 2 -/* D6A520 80240A00 02A23823 */ subu $a3, $s5, $v0 -/* D6A524 80240A04 28E20064 */ slti $v0, $a3, 0x64 -/* D6A528 80240A08 54400001 */ bnel $v0, $zero, .L80240A10 -/* D6A52C 80240A0C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A10: -/* D6A530 80240A10 24040001 */ addiu $a0, $zero, 1 -/* D6A534 80240A14 2405FFFF */ addiu $a1, $zero, -1 -/* D6A538 80240A18 24060006 */ addiu $a2, $zero, 6 -/* D6A53C 80240A1C AFA70010 */ sw $a3, 0x10($sp) -/* D6A540 80240A20 AFA70014 */ sw $a3, 0x14($sp) -/* D6A544 80240A24 AFB50018 */ sw $s5, 0x18($sp) -/* D6A548 80240A28 0C0B77B9 */ jal func_802DDEE4 -/* D6A54C 80240A2C AFA0001C */ sw $zero, 0x1c($sp) -/* D6A550 80240A30 4405A000 */ mfc1 $a1, $f20 -/* D6A554 80240A34 4406B000 */ mfc1 $a2, $f22 -/* D6A558 80240A38 3C07BF80 */ lui $a3, 0xbf80 -/* D6A55C 80240A3C 0200202D */ daddu $a0, $s0, $zero -/* D6A560 80240A40 0C019EC8 */ jal guRotateF -/* D6A564 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D6A568 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D6A56C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D6A570 80240A50 00000000 */ nop -/* D6A574 80240A54 44050000 */ mfc1 $a1, $f0 -/* D6A578 80240A58 4406B000 */ mfc1 $a2, $f22 -/* D6A57C 80240A5C 4407B000 */ mfc1 $a3, $f22 -/* D6A580 80240A60 3C013F80 */ lui $at, 0x3f80 -/* D6A584 80240A64 44812000 */ mtc1 $at, $f4 -/* D6A588 80240A68 27A40020 */ addiu $a0, $sp, 0x20 -/* D6A58C 80240A6C 0C019EC8 */ jal guRotateF -/* D6A590 80240A70 E7A40010 */ swc1 $f4, 0x10($sp) -/* D6A594 80240A74 0200202D */ daddu $a0, $s0, $zero -/* D6A598 80240A78 27A50020 */ addiu $a1, $sp, 0x20 -/* D6A59C 80240A7C 0C019D80 */ jal guMtxCatF -/* D6A5A0 80240A80 00A0302D */ daddu $a2, $a1, $zero -/* D6A5A4 80240A84 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D6A5A8 80240A88 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D6A5AC 80240A8C 080902D6 */ j .L80240B58 -/* D6A5B0 80240A90 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240A94: -/* D6A5B4 80240A94 0260202D */ daddu $a0, $s3, $zero -/* D6A5B8 80240A98 27A50120 */ addiu $a1, $sp, 0x120 -/* D6A5BC 80240A9C 27A60124 */ addiu $a2, $sp, 0x124 -/* D6A5C0 80240AA0 0C03964E */ jal func_800E5938 -/* D6A5C4 80240AA4 27A70128 */ addiu $a3, $sp, 0x128 -/* D6A5C8 80240AA8 8FA60124 */ lw $a2, 0x124($sp) -/* D6A5CC 80240AAC 3C028000 */ lui $v0, 0x8000 -/* D6A5D0 80240AB0 14C20004 */ bne $a2, $v0, .L80240AC4 -/* D6A5D4 80240AB4 46000606 */ mov.s $f24, $f0 -/* D6A5D8 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D6A5DC 80240ABC 080902B5 */ j .L80240AD4 -/* D6A5E0 80240AC0 24040001 */ addiu $a0, $zero, 1 -.L80240AC4: -/* D6A5E4 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D6A5E8 80240AC8 00000000 */ nop -/* D6A5EC 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D6A5F0 80240AD0 24040001 */ addiu $a0, $zero, 1 -.L80240AD4: -/* D6A5F4 80240AD4 2405FFFF */ addiu $a1, $zero, -1 -/* D6A5F8 80240AD8 24060007 */ addiu $a2, $zero, 7 -/* D6A5FC 80240ADC 0000382D */ daddu $a3, $zero, $zero -/* D6A600 80240AE0 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D6A604 80240AE4 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D6A608 80240AE8 24020040 */ addiu $v0, $zero, 0x40 -/* D6A60C 80240AEC AFA00010 */ sw $zero, 0x10($sp) -/* D6A610 80240AF0 AFA00014 */ sw $zero, 0x14($sp) -/* D6A614 80240AF4 AFA20018 */ sw $v0, 0x18($sp) -/* D6A618 80240AF8 0C0B77B9 */ jal func_802DDEE4 -/* D6A61C 80240AFC AFA0001C */ sw $zero, 0x1c($sp) -/* D6A620 80240B00 4405A000 */ mfc1 $a1, $f20 -/* D6A624 80240B04 4406B000 */ mfc1 $a2, $f22 -/* D6A628 80240B08 3C07BF80 */ lui $a3, 0xbf80 -/* D6A62C 80240B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* D6A630 80240B10 0C019EC8 */ jal guRotateF -/* D6A634 80240B14 E7B60010 */ swc1 $f22, 0x10($sp) -/* D6A638 80240B18 4405A000 */ mfc1 $a1, $f20 -/* D6A63C 80240B1C 4406B000 */ mfc1 $a2, $f22 -/* D6A640 80240B20 3C07BF80 */ lui $a3, 0xbf80 -/* D6A644 80240B24 0200202D */ daddu $a0, $s0, $zero -/* D6A648 80240B28 0C019EC8 */ jal guRotateF -/* D6A64C 80240B2C E7B60010 */ swc1 $f22, 0x10($sp) -/* D6A650 80240B30 4405C000 */ mfc1 $a1, $f24 -/* D6A654 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D6A658 80240B38 3C073F80 */ lui $a3, 0x3f80 -/* D6A65C 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D6A660 80240B40 0C019EC8 */ jal guRotateF -/* D6A664 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D6A668 80240B48 0200202D */ daddu $a0, $s0, $zero -/* D6A66C 80240B4C 27A50020 */ addiu $a1, $sp, 0x20 -/* D6A670 80240B50 0C019D80 */ jal guMtxCatF -/* D6A674 80240B54 00A0302D */ daddu $a2, $a1, $zero -.L80240B58: -/* D6A678 80240B58 862200B0 */ lh $v0, 0xb0($s1) -/* D6A67C 80240B5C 3C013F00 */ lui $at, 0x3f00 -/* D6A680 80240B60 44812000 */ mtc1 $at, $f4 -/* D6A684 80240B64 00021023 */ negu $v0, $v0 -/* D6A688 80240B68 44820000 */ mtc1 $v0, $f0 -/* D6A68C 80240B6C 00000000 */ nop -/* D6A690 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* D6A694 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D6A698 80240B78 00000000 */ nop -/* D6A69C 80240B7C 4405B000 */ mfc1 $a1, $f22 -/* D6A6A0 80240B80 4407B000 */ mfc1 $a3, $f22 -/* D6A6A4 80240B84 44062000 */ mfc1 $a2, $f4 -/* D6A6A8 80240B88 0C019E40 */ jal guTranslateF -/* D6A6AC 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* D6A6B0 80240B90 0240202D */ daddu $a0, $s2, $zero -/* D6A6B4 80240B94 27A50020 */ addiu $a1, $sp, 0x20 -/* D6A6B8 80240B98 0C019D80 */ jal guMtxCatF -/* D6A6BC 80240B9C 00A0302D */ daddu $a2, $a1, $zero -/* D6A6C0 80240BA0 4405A000 */ mfc1 $a1, $f20 -/* D6A6C4 80240BA4 4406B000 */ mfc1 $a2, $f22 -/* D6A6C8 80240BA8 3C073F80 */ lui $a3, 0x3f80 -/* D6A6CC 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* D6A6D0 80240BB0 0C019EC8 */ jal guRotateF -/* D6A6D4 80240BB4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D6A6D8 80240BB8 27A40020 */ addiu $a0, $sp, 0x20 -/* D6A6DC 80240BBC 0200282D */ daddu $a1, $s0, $zero -/* D6A6E0 80240BC0 0C019D80 */ jal guMtxCatF -/* D6A6E4 80240BC4 0080302D */ daddu $a2, $a0, $zero -/* D6A6E8 80240BC8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D6A6EC 80240BCC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D6A6F0 80240BD0 4406B000 */ mfc1 $a2, $f22 -/* D6A6F4 80240BD4 3C073F80 */ lui $a3, 0x3f80 -/* D6A6F8 80240BD8 0C019EC8 */ jal guRotateF -/* D6A6FC 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D6A700 80240BE0 27A40020 */ addiu $a0, $sp, 0x20 -/* D6A704 80240BE4 0200282D */ daddu $a1, $s0, $zero -/* D6A708 80240BE8 0C019D80 */ jal guMtxCatF -/* D6A70C 80240BEC 0080302D */ daddu $a2, $a0, $zero -/* D6A710 80240BF0 862200B0 */ lh $v0, 0xb0($s1) -/* D6A714 80240BF4 3C013F00 */ lui $at, 0x3f00 -/* D6A718 80240BF8 44812000 */ mtc1 $at, $f4 -/* D6A71C 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D6A720 80240C00 00000000 */ nop -/* D6A724 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* D6A728 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D6A72C 80240C0C 00000000 */ nop -/* D6A730 80240C10 4405B000 */ mfc1 $a1, $f22 -/* D6A734 80240C14 4407B000 */ mfc1 $a3, $f22 -/* D6A738 80240C18 44062000 */ mfc1 $a2, $f4 -/* D6A73C 80240C1C 0C019E40 */ jal guTranslateF -/* D6A740 80240C20 0240202D */ daddu $a0, $s2, $zero -/* D6A744 80240C24 27A40020 */ addiu $a0, $sp, 0x20 -/* D6A748 80240C28 0240282D */ daddu $a1, $s2, $zero -/* D6A74C 80240C2C 0C019D80 */ jal guMtxCatF -/* D6A750 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D6A754 80240C34 3C013F36 */ lui $at, 0x3f36 -/* D6A758 80240C38 3421DB6E */ ori $at, $at, 0xdb6e -/* D6A75C 80240C3C 44810000 */ mtc1 $at, $f0 -/* D6A760 80240C40 0280202D */ daddu $a0, $s4, $zero -/* D6A764 80240C44 44050000 */ mfc1 $a1, $f0 -/* D6A768 80240C48 3C06BF36 */ lui $a2, 0xbf36 -/* D6A76C 80240C4C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D6A770 80240C50 0C019DF0 */ jal guScaleF -/* D6A774 80240C54 00A0382D */ daddu $a3, $a1, $zero -/* D6A778 80240C58 27A40020 */ addiu $a0, $sp, 0x20 -/* D6A77C 80240C5C 0280282D */ daddu $a1, $s4, $zero -/* D6A780 80240C60 0C019D80 */ jal guMtxCatF -/* D6A784 80240C64 0080302D */ daddu $a2, $a0, $zero -/* D6A788 80240C68 4600D687 */ neg.s $f26, $f26 -/* D6A78C 80240C6C 4405F000 */ mfc1 $a1, $f30 -/* D6A790 80240C70 4407E000 */ mfc1 $a3, $f28 -/* D6A794 80240C74 4406D000 */ mfc1 $a2, $f26 -/* D6A798 80240C78 0C019E40 */ jal guTranslateF -/* D6A79C 80240C7C 0240202D */ daddu $a0, $s2, $zero -/* D6A7A0 80240C80 27A40020 */ addiu $a0, $sp, 0x20 -/* D6A7A4 80240C84 0240282D */ daddu $a1, $s2, $zero -/* D6A7A8 80240C88 0C019D80 */ jal guMtxCatF -/* D6A7AC 80240C8C 0080302D */ daddu $a2, $a0, $zero -/* D6A7B0 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D6A7B4 80240C94 3C0142B4 */ lui $at, 0x42b4 -/* D6A7B8 80240C98 44810000 */ mtc1 $at, $f0 -/* D6A7BC 80240C9C 00000000 */ nop -/* D6A7C0 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D6A7C4 80240CA4 00000000 */ nop -/* D6A7C8 80240CA8 4500000A */ bc1f .L80240CD4 -/* D6A7CC 80240CAC 24040001 */ addiu $a0, $zero, 1 -/* D6A7D0 80240CB0 3C014387 */ lui $at, 0x4387 -/* D6A7D4 80240CB4 44812000 */ mtc1 $at, $f4 -/* D6A7D8 80240CB8 00000000 */ nop -/* D6A7DC 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D6A7E0 80240CC0 00000000 */ nop -/* D6A7E4 80240CC4 45000004 */ bc1f .L80240CD8 -/* D6A7E8 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 -/* D6A7EC 80240CCC 3C041000 */ lui $a0, 0x1000 -/* D6A7F0 80240CD0 34840001 */ ori $a0, $a0, 1 -.L80240CD4: -/* D6A7F4 80240CD4 27A20020 */ addiu $v0, $sp, 0x20 -.L80240CD8: -/* D6A7F8 80240CD8 AFA20010 */ sw $v0, 0x10($sp) -/* D6A7FC 80240CDC 0000282D */ daddu $a1, $zero, $zero -/* D6A800 80240CE0 00A0302D */ daddu $a2, $a1, $zero -/* D6A804 80240CE4 0C0B7710 */ jal render_sprite -/* D6A808 80240CE8 00A0382D */ daddu $a3, $a1, $zero -/* D6A80C 80240CEC 26730001 */ addiu $s3, $s3, 1 -/* D6A810 80240CF0 2A620002 */ slti $v0, $s3, 2 -/* D6A814 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D6A818 80240CF8 00000000 */ nop -/* D6A81C 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) -/* D6A820 80240D00 8FB60148 */ lw $s6, 0x148($sp) -/* D6A824 80240D04 8FB50144 */ lw $s5, 0x144($sp) -/* D6A828 80240D08 8FB40140 */ lw $s4, 0x140($sp) -/* D6A82C 80240D0C 8FB3013C */ lw $s3, 0x13c($sp) -/* D6A830 80240D10 8FB20138 */ lw $s2, 0x138($sp) -/* D6A834 80240D14 8FB10134 */ lw $s1, 0x134($sp) -/* D6A838 80240D18 8FB00130 */ lw $s0, 0x130($sp) -/* D6A83C 80240D1C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D6A840 80240D20 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D6A844 80240D24 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D6A848 80240D28 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D6A84C 80240D2C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D6A850 80240D30 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D6A854 80240D34 03E00008 */ jr $ra -/* D6A858 80240D38 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_16/func_80240D3C_D69B20.s b/asm/nonmatchings/world/area_pra/pra_16/func_80240D3C_D69B20.s deleted file mode 100644 index e82be80eb5..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/func_80240D3C_D69B20.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_D6A85C -/* D6A85C 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6A860 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D6A864 80240D44 0080802D */ daddu $s0, $a0, $zero -/* D6A868 80240D48 AFBF0014 */ sw $ra, 0x14($sp) -/* D6A86C 80240D4C 8E020088 */ lw $v0, 0x88($s0) -/* D6A870 80240D50 14400017 */ bnez $v0, .L80240DB0 -/* D6A874 80240D54 24020001 */ addiu $v0, $zero, 1 -/* D6A878 80240D58 8E030084 */ lw $v1, 0x84($s0) -/* D6A87C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D6A880 80240D60 00000000 */ nop -/* D6A884 80240D64 28620002 */ slti $v0, $v1, 2 -/* D6A888 80240D68 50400005 */ beql $v0, $zero, .L80240D80 -/* D6A88C 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* D6A890 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D6A894 80240D74 00000000 */ nop -/* D6A898 80240D78 08090378 */ j .L80240DE0 -/* D6A89C 80240D7C 00000000 */ nop -.L80240D80: -/* D6A8A0 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D6A8A4 80240D84 00000000 */ nop -/* D6A8A8 80240D88 08090378 */ j .L80240DE0 -/* D6A8AC 80240D8C 00000000 */ nop -.L80240D90: -/* D6A8B0 80240D90 3C048024 */ lui $a0, 0x8024 -/* D6A8B4 80240D94 24840E84 */ addiu $a0, $a0, 0xe84 -/* D6A8B8 80240D98 08090374 */ j .L80240DD0 -/* D6A8BC 80240D9C 00000000 */ nop -.L80240DA0: -/* D6A8C0 80240DA0 3C048024 */ lui $a0, 0x8024 -/* D6A8C4 80240DA4 24840EEC */ addiu $a0, $a0, 0xeec -/* D6A8C8 80240DA8 08090374 */ j .L80240DD0 -/* D6A8CC 80240DAC 00000000 */ nop -.L80240DB0: -/* D6A8D0 80240DB0 8E020084 */ lw $v0, 0x84($s0) -/* D6A8D4 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D6A8D8 80240DB8 00000000 */ nop -/* D6A8DC 80240DBC 28420002 */ slti $v0, $v0, 2 -/* D6A8E0 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D6A8E4 80240DC4 00000000 */ nop -.L80240DC8: -/* D6A8E8 80240DC8 3C048024 */ lui $a0, 0x8024 -/* D6A8EC 80240DCC 24840EB8 */ addiu $a0, $a0, 0xeb8 -.L80240DD0: -/* D6A8F0 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 -/* D6A8F4 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* D6A8F8 80240DD8 8E03013C */ lw $v1, 0x13c($s0) -/* D6A8FC 80240DDC AC620004 */ sw $v0, 4($v1) -.L80240DE0: -/* D6A900 80240DE0 0C00EAD2 */ jal get_npc_safe -/* D6A904 80240DE4 2404FFFC */ addiu $a0, $zero, -4 -/* D6A908 80240DE8 0040282D */ daddu $a1, $v0, $zero -/* D6A90C 80240DEC 10A00021 */ beqz $a1, .L80240E74 -/* D6A910 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* D6A914 80240DF4 8E020088 */ lw $v0, 0x88($s0) -/* D6A918 80240DF8 14400014 */ bnez $v0, .L80240E4C -/* D6A91C 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* D6A920 80240E00 8E040084 */ lw $a0, 0x84($s0) -/* D6A924 80240E04 10820016 */ beq $a0, $v0, .L80240E60 -/* D6A928 80240E08 28820002 */ slti $v0, $a0, 2 -/* D6A92C 80240E0C 10400005 */ beqz $v0, .L80240E24 -/* D6A930 80240E10 24020002 */ addiu $v0, $zero, 2 -/* D6A934 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D6A938 80240E18 00000000 */ nop -/* D6A93C 80240E1C 0809039D */ j .L80240E74 -/* D6A940 80240E20 00000000 */ nop -.L80240E24: -/* D6A944 80240E24 10820006 */ beq $a0, $v0, .L80240E40 -/* D6A948 80240E28 24020002 */ addiu $v0, $zero, 2 -/* D6A94C 80240E2C 0809039D */ j .L80240E74 -/* D6A950 80240E30 00000000 */ nop -.L80240E34: -/* D6A954 80240E34 8CA20000 */ lw $v0, ($a1) -/* D6A958 80240E38 0809039A */ j .L80240E68 -/* D6A95C 80240E3C 3C03000A */ lui $v1, 0xa -.L80240E40: -/* D6A960 80240E40 8CA20000 */ lw $v0, ($a1) -/* D6A964 80240E44 0809039A */ j .L80240E68 -/* D6A968 80240E48 3C030002 */ lui $v1, 2 -.L80240E4C: -/* D6A96C 80240E4C 8E020084 */ lw $v0, 0x84($s0) -/* D6A970 80240E50 04400007 */ bltz $v0, .L80240E70 -/* D6A974 80240E54 28420002 */ slti $v0, $v0, 2 -/* D6A978 80240E58 10400006 */ beqz $v0, .L80240E74 -/* D6A97C 80240E5C 24020002 */ addiu $v0, $zero, 2 -.L80240E60: -/* D6A980 80240E60 8CA20000 */ lw $v0, ($a1) -/* D6A984 80240E64 3C030008 */ lui $v1, 8 -.L80240E68: -/* D6A988 80240E68 00431025 */ or $v0, $v0, $v1 -/* D6A98C 80240E6C ACA20000 */ sw $v0, ($a1) -.L80240E70: -/* D6A990 80240E70 24020002 */ addiu $v0, $zero, 2 -.L80240E74: -/* D6A994 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* D6A998 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* D6A99C 80240E7C 03E00008 */ jr $ra -/* D6A9A0 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_16/func_80240E84_D69B20.s b/asm/nonmatchings/world/area_pra/pra_16/func_80240E84_D69B20.s deleted file mode 100644 index ef4e1d4a84..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/func_80240E84_D69B20.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D6A9A4 -/* D6A9A4 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6A9A8 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D6A9AC 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D6A9B0 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D6A9B4 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D6A9B8 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D6A9BC 80240E9C 3C03000A */ lui $v1, 0xa -/* D6A9C0 80240EA0 8C820000 */ lw $v0, ($a0) -/* D6A9C4 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D6A9C8 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D6A9CC 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D6A9D0 80240EB0 03E00008 */ jr $ra -/* D6A9D4 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_16/func_80240EB8_D69B20.s b/asm/nonmatchings/world/area_pra/pra_16/func_80240EB8_D69B20.s deleted file mode 100644 index 8f095a59f8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/func_80240EB8_D69B20.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D6A9D8 -/* D6A9D8 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6A9DC 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D6A9E0 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D6A9E4 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D6A9E8 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D6A9EC 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D6A9F0 80240ED0 3C030008 */ lui $v1, 8 -/* D6A9F4 80240ED4 8C820000 */ lw $v0, ($a0) -/* D6A9F8 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D6A9FC 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D6AA00 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D6AA04 80240EE4 03E00008 */ jr $ra -/* D6AA08 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_16/func_80240EEC_D69B20.s b/asm/nonmatchings/world/area_pra/pra_16/func_80240EEC_D69B20.s deleted file mode 100644 index dbe89d4e89..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/func_80240EEC_D69B20.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D6AA0C -/* D6AA0C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6AA10 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D6AA14 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D6AA18 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D6AA1C 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D6AA20 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D6AA24 80240F04 3C030002 */ lui $v1, 2 -/* D6AA28 80240F08 8C820000 */ lw $v0, ($a0) -/* D6AA2C 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D6AA30 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D6AA34 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D6AA38 80240F18 03E00008 */ jr $ra -/* D6AA3C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_18/func_80240020_D6B620.s b/asm/nonmatchings/world/area_pra/pra_18/func_80240020_D6B620.s deleted file mode 100644 index ae85c8a5fb..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/func_80240020_D6B620.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D6B640 -/* D6B640 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D6B644 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D6B648 80240028 00822024 */ and $a0, $a0, $v0 -/* D6B64C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D6B650 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D6B654 80240034 00821821 */ addu $v1, $a0, $v0 -/* D6B658 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D6B65C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D6B660 80240040 30620001 */ andi $v0, $v1, 1 -/* D6B664 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D6B668 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D6B66C 8024004C 03E00008 */ jr $ra -/* D6B670 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_18/func_80240054_D6B620.s b/asm/nonmatchings/world/area_pra/pra_18/func_80240054_D6B620.s deleted file mode 100644 index 2de4466724..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/func_80240054_D6B620.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054_D6B674 -/* D6B674 80240054 00041403 */ sra $v0, $a0, 0x10 -/* D6B678 80240058 304300FF */ andi $v1, $v0, 0xff -/* D6B67C 8024005C 24020006 */ addiu $v0, $zero, 6 -/* D6B680 80240060 10620015 */ beq $v1, $v0, .L802400B8 -/* D6B684 80240064 28620007 */ slti $v0, $v1, 7 -/* D6B688 80240068 10400005 */ beqz $v0, .L80240080 -/* D6B68C 8024006C 24020001 */ addiu $v0, $zero, 1 -/* D6B690 80240070 1062000A */ beq $v1, $v0, .L8024009C -/* D6B694 80240074 3C020100 */ lui $v0, 0x100 -/* D6B698 80240078 03E00008 */ jr $ra -/* D6B69C 8024007C 00821025 */ or $v0, $a0, $v0 -.L80240080: -/* D6B6A0 80240080 2862000A */ slti $v0, $v1, 0xa -/* D6B6A4 80240084 10400016 */ beqz $v0, .L802400E0 -/* D6B6A8 80240088 28620008 */ slti $v0, $v1, 8 -/* D6B6AC 8024008C 14400015 */ bnez $v0, .L802400E4 -/* D6B6B0 80240090 3C020100 */ lui $v0, 0x100 -/* D6B6B4 80240094 03E00008 */ jr $ra -/* D6B6B8 80240098 0080102D */ daddu $v0, $a0, $zero -.L8024009C: -/* D6B6BC 8024009C 3C020001 */ lui $v0, 1 -/* D6B6C0 802400A0 3442000C */ ori $v0, $v0, 0xc -/* D6B6C4 802400A4 0044102A */ slt $v0, $v0, $a0 -/* D6B6C8 802400A8 1040000E */ beqz $v0, .L802400E4 -/* D6B6CC 802400AC 3C020100 */ lui $v0, 0x100 -.L802400B0: -/* D6B6D0 802400B0 03E00008 */ jr $ra -/* D6B6D4 802400B4 0080102D */ daddu $v0, $a0, $zero -.L802400B8: -/* D6B6D8 802400B8 3C02FFF9 */ lui $v0, 0xfff9 -/* D6B6DC 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D6B6E0 802400C0 00821821 */ addu $v1, $a0, $v0 -/* D6B6E4 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D6B6E8 802400C8 10400005 */ beqz $v0, .L802400E0 -/* D6B6EC 802400CC 30620001 */ andi $v0, $v1, 1 -/* D6B6F0 802400D0 1440FFF7 */ bnez $v0, .L802400B0 -/* D6B6F4 802400D4 24820001 */ addiu $v0, $a0, 1 -/* D6B6F8 802400D8 03E00008 */ jr $ra -/* D6B6FC 802400DC 00000000 */ nop -.L802400E0: -/* D6B700 802400E0 3C020100 */ lui $v0, 0x100 -.L802400E4: -/* D6B704 802400E4 03E00008 */ jr $ra -/* D6B708 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_18/func_802400EC_D6B620.s b/asm/nonmatchings/world/area_pra/pra_18/func_802400EC_D6B620.s deleted file mode 100644 index af4638d959..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/func_802400EC_D6B620.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_D6B70C -/* D6B70C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6B710 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* D6B714 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D6B718 802400F8 3C058024 */ lui $a1, 0x8024 -/* D6B71C 802400FC 24A50128 */ addiu $a1, $a1, 0x128 -/* D6B720 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* D6B724 80240104 0C048C56 */ jal bind_dynamic_entity_3 -/* D6B728 80240108 0000202D */ daddu $a0, $zero, $zero -/* D6B72C 8024010C 8E03013C */ lw $v1, 0x13c($s0) -/* D6B730 80240110 AC620000 */ sw $v0, ($v1) -/* D6B734 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* D6B738 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* D6B73C 8024011C 24020002 */ addiu $v0, $zero, 2 -/* D6B740 80240120 03E00008 */ jr $ra -/* D6B744 80240124 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_18/func_80240128_D6B620.s b/asm/nonmatchings/world/area_pra/pra_18/func_80240128_D6B620.s deleted file mode 100644 index ffa7a52ad9..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/func_80240128_D6B620.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240128_D6B748 -/* D6B748 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D6B74C 8024012C AFB00040 */ sw $s0, 0x40($sp) -/* D6B750 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D6B754 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D6B758 80240138 AFB20048 */ sw $s2, 0x48($sp) -/* D6B75C 8024013C AFBF004C */ sw $ra, 0x4c($sp) -/* D6B760 80240140 AFB10044 */ sw $s1, 0x44($sp) -/* D6B764 80240144 8E020000 */ lw $v0, ($s0) -/* D6B768 80240148 821100BE */ lb $s1, 0xbe($s0) -/* D6B76C 8024014C 30420001 */ andi $v0, $v0, 1 -/* D6B770 80240150 10400061 */ beqz $v0, .L802402D8 -/* D6B774 80240154 27B20020 */ addiu $s2, $sp, 0x20 -/* D6B778 80240158 8E0400CC */ lw $a0, 0xcc($s0) -/* D6B77C 8024015C 0C044181 */ jal get_shadow_by_index -/* D6B780 80240160 00000000 */ nop -/* D6B784 80240164 0C048B77 */ jal func_80122DDC -/* D6B788 80240168 84440008 */ lh $a0, 8($v0) -/* D6B78C 8024016C 8C430000 */ lw $v1, ($v0) -/* D6B790 80240170 34630200 */ ori $v1, $v1, 0x200 -/* D6B794 80240174 AC430000 */ sw $v1, ($v0) -/* D6B798 80240178 8E050028 */ lw $a1, 0x28($s0) -/* D6B79C 8024017C 8E06002C */ lw $a2, 0x2c($s0) -/* D6B7A0 80240180 27A20030 */ addiu $v0, $sp, 0x30 -/* D6B7A4 80240184 AFA20010 */ sw $v0, 0x10($sp) -/* D6B7A8 80240188 27A20034 */ addiu $v0, $sp, 0x34 -/* D6B7AC 8024018C AFA20014 */ sw $v0, 0x14($sp) -/* D6B7B0 80240190 C6000030 */ lwc1 $f0, 0x30($s0) -/* D6B7B4 80240194 3C04800A */ lui $a0, 0x800a -/* D6B7B8 80240198 8484A634 */ lh $a0, -0x59cc($a0) -/* D6B7BC 8024019C 46000007 */ neg.s $f0, $f0 -/* D6B7C0 802401A0 44070000 */ mfc1 $a3, $f0 -/* D6B7C4 802401A4 27A20038 */ addiu $v0, $sp, 0x38 -/* D6B7C8 802401A8 0C00B94E */ jal get_screen_coords -/* D6B7CC 802401AC AFA20018 */ sw $v0, 0x18($sp) -/* D6B7D0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D6B7D4 802401B4 0C090008 */ jal func_80240020 -/* D6B7D8 802401B8 00000000 */ nop -/* D6B7DC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) -/* D6B7E0 802401C0 3C014307 */ lui $at, 0x4307 -/* D6B7E4 802401C4 44810000 */ mtc1 $at, $f0 -/* D6B7E8 802401C8 00000000 */ nop -/* D6B7EC 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D6B7F0 802401D0 00000000 */ nop -/* D6B7F4 802401D4 4500000B */ bc1f .L80240204 -/* D6B7F8 802401D8 24040002 */ addiu $a0, $zero, 2 -/* D6B7FC 802401DC 3C014361 */ lui $at, 0x4361 -/* D6B800 802401E0 44810000 */ mtc1 $at, $f0 -/* D6B804 802401E4 00000000 */ nop -/* D6B808 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D6B80C 802401EC 00000000 */ nop -/* D6B810 802401F0 45000004 */ bc1f .L80240204 -/* D6B814 802401F4 00000000 */ nop -/* D6B818 802401F8 0C090015 */ jal func_80240054 -/* D6B81C 802401FC 0040202D */ daddu $a0, $v0, $zero -/* D6B820 80240200 24040002 */ addiu $a0, $zero, 2 -.L80240204: -/* D6B824 80240204 3C063F80 */ lui $a2, 0x3f80 -/* D6B828 80240208 0C0B76A3 */ jal func_802DDA8C -/* D6B82C 8024020C 0040282D */ daddu $a1, $v0, $zero -/* D6B830 80240210 8E020000 */ lw $v0, ($s0) -/* D6B834 80240214 3C030002 */ lui $v1, 2 -/* D6B838 80240218 00431024 */ and $v0, $v0, $v1 -/* D6B83C 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 -/* D6B840 80240220 24110011 */ addiu $s1, $zero, 0x11 -/* D6B844 80240224 9203000E */ lbu $v1, 0xe($s0) -/* D6B848 80240228 3C02802E */ lui $v0, 0x802e -/* D6B84C 8024022C 90429D70 */ lbu $v0, -0x6290($v0) -/* D6B850 80240230 10620018 */ beq $v1, $v0, .L80240294 -/* D6B854 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D6B858 80240238 1040000B */ beqz $v0, .L80240268 -/* D6B85C 8024023C 24110011 */ addiu $s1, $zero, 0x11 -/* D6B860 80240240 24040002 */ addiu $a0, $zero, 2 -/* D6B864 80240244 2405FFFF */ addiu $a1, $zero, -1 -/* D6B868 80240248 24060007 */ addiu $a2, $zero, 7 -/* D6B86C 8024024C 0060102D */ daddu $v0, $v1, $zero -/* D6B870 80240250 0000382D */ daddu $a3, $zero, $zero -/* D6B874 80240254 AFA00010 */ sw $zero, 0x10($sp) -/* D6B878 80240258 AFA00014 */ sw $zero, 0x14($sp) -/* D6B87C 8024025C AFA0001C */ sw $zero, 0x1c($sp) -/* D6B880 80240260 080900A3 */ j .L8024028C -/* D6B884 80240264 AFA20018 */ sw $v0, 0x18($sp) -.L80240268: -/* D6B888 80240268 2411000D */ addiu $s1, $zero, 0xd -/* D6B88C 8024026C 24040002 */ addiu $a0, $zero, 2 -/* D6B890 80240270 2405FFFF */ addiu $a1, $zero, -1 -/* D6B894 80240274 0000302D */ daddu $a2, $zero, $zero -/* D6B898 80240278 00C0382D */ daddu $a3, $a2, $zero -/* D6B89C 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* D6B8A0 80240280 AFA00014 */ sw $zero, 0x14($sp) -/* D6B8A4 80240284 AFA00018 */ sw $zero, 0x18($sp) -/* D6B8A8 80240288 AFA0001C */ sw $zero, 0x1c($sp) -.L8024028C: -/* D6B8AC 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D6B8B0 80240290 00000000 */ nop -.L80240294: -/* D6B8B4 80240294 9202000E */ lbu $v0, 0xe($s0) -/* D6B8B8 80240298 3C01802E */ lui $at, 0x802e -/* D6B8BC 8024029C A0229D70 */ sb $v0, -0x6290($at) -/* D6B8C0 802402A0 080900AD */ j .L802402B4 -/* D6B8C4 802402A4 0240202D */ daddu $a0, $s2, $zero -.L802402A8: -/* D6B8C8 802402A8 3C01802E */ lui $at, 0x802e -/* D6B8CC 802402AC A0209D70 */ sb $zero, -0x6290($at) -/* D6B8D0 802402B0 0240202D */ daddu $a0, $s2, $zero -.L802402B4: -/* D6B8D4 802402B4 AC910000 */ sw $s1, ($a0) -/* D6B8D8 802402B8 AC900008 */ sw $s0, 8($a0) -/* D6B8DC 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D6B8E0 802402C0 3C038024 */ lui $v1, 0x8024 -/* D6B8E4 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 -/* D6B8E8 802402C8 AC83000C */ sw $v1, 0xc($a0) -/* D6B8EC 802402CC 00021023 */ negu $v0, $v0 -/* D6B8F0 802402D0 0C047644 */ jal queue_render_task -/* D6B8F4 802402D4 AC820004 */ sw $v0, 4($a0) -.L802402D8: -/* D6B8F8 802402D8 8FBF004C */ lw $ra, 0x4c($sp) -/* D6B8FC 802402DC 8FB20048 */ lw $s2, 0x48($sp) -/* D6B900 802402E0 8FB10044 */ lw $s1, 0x44($sp) -/* D6B904 802402E4 8FB00040 */ lw $s0, 0x40($sp) -/* D6B908 802402E8 03E00008 */ jr $ra -/* D6B90C 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_18/func_802402F0_D6B620.s b/asm/nonmatchings/world/area_pra/pra_18/func_802402F0_D6B620.s deleted file mode 100644 index e05bcd5d64..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/func_802402F0_D6B620.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D6B910 -/* D6B910 802402F0 3C03800A */ lui $v1, 0x800a -/* D6B914 802402F4 8463A634 */ lh $v1, -0x59cc($v1) -/* D6B918 802402F8 3C07BF80 */ lui $a3, 0xbf80 -/* D6B91C 802402FC 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D6B920 80240300 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D6B924 80240304 4480A000 */ mtc1 $zero, $f20 -/* D6B928 80240308 AFB1011C */ sw $s1, 0x11c($sp) -/* D6B92C 8024030C 0080882D */ daddu $s1, $a0, $zero -/* D6B930 80240310 AFB00118 */ sw $s0, 0x118($sp) -/* D6B934 80240314 27B00098 */ addiu $s0, $sp, 0x98 -/* D6B938 80240318 AFBF0120 */ sw $ra, 0x120($sp) -/* D6B93C 8024031C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D6B940 80240320 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D6B944 80240324 00031080 */ sll $v0, $v1, 2 -/* D6B948 80240328 00431021 */ addu $v0, $v0, $v1 -/* D6B94C 8024032C 00021080 */ sll $v0, $v0, 2 -/* D6B950 80240330 00431023 */ subu $v0, $v0, $v1 -/* D6B954 80240334 000218C0 */ sll $v1, $v0, 3 -/* D6B958 80240338 00431021 */ addu $v0, $v0, $v1 -/* D6B95C 8024033C 000210C0 */ sll $v0, $v0, 3 -/* D6B960 80240340 3C01800B */ lui $at, 0x800b -/* D6B964 80240344 00220821 */ addu $at, $at, $v0 -/* D6B968 80240348 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D6B96C 8024034C 4406A000 */ mfc1 $a2, $f20 -/* D6B970 80240350 4600B587 */ neg.s $f22, $f22 -/* D6B974 80240354 4405B000 */ mfc1 $a1, $f22 -/* D6B978 80240358 0200202D */ daddu $a0, $s0, $zero -/* D6B97C 8024035C 0C019EC8 */ jal guRotateF -/* D6B980 80240360 E7B40010 */ swc1 $f20, 0x10($sp) -/* D6B984 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D6B988 80240368 0C00A6C9 */ jal clamp_angle -/* D6B98C 8024036C 00000000 */ nop -/* D6B990 80240370 44050000 */ mfc1 $a1, $f0 -/* D6B994 80240374 4406A000 */ mfc1 $a2, $f20 -/* D6B998 80240378 4407A000 */ mfc1 $a3, $f20 -/* D6B99C 8024037C 3C013F80 */ lui $at, 0x3f80 -/* D6B9A0 80240380 4481C000 */ mtc1 $at, $f24 -/* D6B9A4 80240384 27A40018 */ addiu $a0, $sp, 0x18 -/* D6B9A8 80240388 0C019EC8 */ jal guRotateF -/* D6B9AC 8024038C E7B80010 */ swc1 $f24, 0x10($sp) -/* D6B9B0 80240390 0200202D */ daddu $a0, $s0, $zero -/* D6B9B4 80240394 27A50018 */ addiu $a1, $sp, 0x18 -/* D6B9B8 80240398 0C019D80 */ jal guMtxCatF -/* D6B9BC 8024039C 00A0302D */ daddu $a2, $a1, $zero -/* D6B9C0 802403A0 4405B000 */ mfc1 $a1, $f22 -/* D6B9C4 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D6B9C8 802403A8 4407C000 */ mfc1 $a3, $f24 -/* D6B9CC 802403AC 0200202D */ daddu $a0, $s0, $zero -/* D6B9D0 802403B0 0C019EC8 */ jal guRotateF -/* D6B9D4 802403B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D6B9D8 802403B8 27A40018 */ addiu $a0, $sp, 0x18 -/* D6B9DC 802403BC 0200282D */ daddu $a1, $s0, $zero -/* D6B9E0 802403C0 0C019D80 */ jal guMtxCatF -/* D6B9E4 802403C4 0080302D */ daddu $a2, $a0, $zero -/* D6B9E8 802403C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D6B9EC 802403CC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D6B9F0 802403D0 4406A000 */ mfc1 $a2, $f20 -/* D6B9F4 802403D4 4407C000 */ mfc1 $a3, $f24 -/* D6B9F8 802403D8 0C019EC8 */ jal guRotateF -/* D6B9FC 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D6BA00 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* D6BA04 802403E4 0200282D */ daddu $a1, $s0, $zero -/* D6BA08 802403E8 0C019D80 */ jal guMtxCatF -/* D6BA0C 802403EC 0080302D */ daddu $a2, $a0, $zero -/* D6BA10 802403F0 3C013F36 */ lui $at, 0x3f36 -/* D6BA14 802403F4 3421DB6E */ ori $at, $at, 0xdb6e -/* D6BA18 802403F8 44810000 */ mtc1 $at, $f0 -/* D6BA1C 802403FC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D6BA20 80240400 44050000 */ mfc1 $a1, $f0 -/* D6BA24 80240404 0200202D */ daddu $a0, $s0, $zero -/* D6BA28 80240408 00A0302D */ daddu $a2, $a1, $zero -/* D6BA2C 8024040C 0C019DF0 */ jal guScaleF -/* D6BA30 80240410 00A0382D */ daddu $a3, $a1, $zero -/* D6BA34 80240414 27A40018 */ addiu $a0, $sp, 0x18 -/* D6BA38 80240418 0200282D */ daddu $a1, $s0, $zero -/* D6BA3C 8024041C 0C019D80 */ jal guMtxCatF -/* D6BA40 80240420 0080302D */ daddu $a2, $a0, $zero -/* D6BA44 80240424 27B00058 */ addiu $s0, $sp, 0x58 -/* D6BA48 80240428 C6200030 */ lwc1 $f0, 0x30($s1) -/* D6BA4C 8024042C 3C014040 */ lui $at, 0x4040 -/* D6BA50 80240430 44811000 */ mtc1 $at, $f2 -/* D6BA54 80240434 46000007 */ neg.s $f0, $f0 -/* D6BA58 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* D6BA5C 8024043C 8E250028 */ lw $a1, 0x28($s1) -/* D6BA60 80240440 8E26002C */ lw $a2, 0x2c($s1) -/* D6BA64 80240444 44070000 */ mfc1 $a3, $f0 -/* D6BA68 80240448 0C019E40 */ jal guTranslateF -/* D6BA6C 8024044C 0200202D */ daddu $a0, $s0, $zero -/* D6BA70 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* D6BA74 80240454 0200282D */ daddu $a1, $s0, $zero -/* D6BA78 80240458 0C019D80 */ jal guMtxCatF -/* D6BA7C 8024045C 0080302D */ daddu $a2, $a0, $zero -/* D6BA80 80240460 24040002 */ addiu $a0, $zero, 2 -/* D6BA84 80240464 0000282D */ daddu $a1, $zero, $zero -/* D6BA88 80240468 00A0302D */ daddu $a2, $a1, $zero -/* D6BA8C 8024046C 00A0382D */ daddu $a3, $a1, $zero -/* D6BA90 80240470 27A20018 */ addiu $v0, $sp, 0x18 -/* D6BA94 80240474 0C0B7710 */ jal render_sprite -/* D6BA98 80240478 AFA20010 */ sw $v0, 0x10($sp) -/* D6BA9C 8024047C 8FBF0120 */ lw $ra, 0x120($sp) -/* D6BAA0 80240480 8FB1011C */ lw $s1, 0x11c($sp) -/* D6BAA4 80240484 8FB00118 */ lw $s0, 0x118($sp) -/* D6BAA8 80240488 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D6BAAC 8024048C D7B60130 */ ldc1 $f22, 0x130($sp) -/* D6BAB0 80240490 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D6BAB4 80240494 03E00008 */ jr $ra -/* D6BAB8 80240498 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_18/func_8024049C_D6B620.s b/asm/nonmatchings/world/area_pra/pra_18/func_8024049C_D6B620.s deleted file mode 100644 index ec75aa47d5..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/func_8024049C_D6B620.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_D6BABC -/* D6BABC 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6BAC0 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* D6BAC4 802404A4 0080802D */ daddu $s0, $a0, $zero -/* D6BAC8 802404A8 AFBF0014 */ sw $ra, 0x14($sp) -/* D6BACC 802404AC 8E020084 */ lw $v0, 0x84($s0) -/* D6BAD0 802404B0 0440000E */ bltz $v0, .L802404EC -/* D6BAD4 802404B4 28420002 */ slti $v0, $v0, 2 -/* D6BAD8 802404B8 1040000C */ beqz $v0, .L802404EC -/* D6BADC 802404BC 00000000 */ nop -/* D6BAE0 802404C0 3C058024 */ lui $a1, 0x8024 -/* D6BAE4 802404C4 24A50500 */ addiu $a1, $a1, 0x500 -/* D6BAE8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 -/* D6BAEC 802404CC 0000202D */ daddu $a0, $zero, $zero -/* D6BAF0 802404D0 8E03013C */ lw $v1, 0x13c($s0) -/* D6BAF4 802404D4 AC620000 */ sw $v0, ($v1) -/* D6BAF8 802404D8 3C03800A */ lui $v1, %hi(D_8009A650) -/* D6BAFC 802404DC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D6BB00 802404E0 8C620000 */ lw $v0, ($v1) -/* D6BB04 802404E4 34420080 */ ori $v0, $v0, 0x80 -/* D6BB08 802404E8 AC620000 */ sw $v0, ($v1) -.L802404EC: -/* D6BB0C 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* D6BB10 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* D6BB14 802404F4 24020002 */ addiu $v0, $zero, 2 -/* D6BB18 802404F8 03E00008 */ jr $ra -/* D6BB1C 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_18/func_80240500_D6B620.s b/asm/nonmatchings/world/area_pra/pra_18/func_80240500_D6B620.s deleted file mode 100644 index 89130d77cb..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/func_80240500_D6B620.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_D6BB20 -/* D6BB20 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D6BB24 80240504 AFB00040 */ sw $s0, 0x40($sp) -/* D6BB28 80240508 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D6BB2C 8024050C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D6BB30 80240510 AFB10044 */ sw $s1, 0x44($sp) -/* D6BB34 80240514 AFBF004C */ sw $ra, 0x4c($sp) -/* D6BB38 80240518 AFB20048 */ sw $s2, 0x48($sp) -/* D6BB3C 8024051C 8E020000 */ lw $v0, ($s0) -/* D6BB40 80240520 821200BE */ lb $s2, 0xbe($s0) -/* D6BB44 80240524 30420001 */ andi $v0, $v0, 1 -/* D6BB48 80240528 10400052 */ beqz $v0, .L80240674 -/* D6BB4C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 -/* D6BB50 80240530 8E0400CC */ lw $a0, 0xcc($s0) -/* D6BB54 80240534 0C044181 */ jal get_shadow_by_index -/* D6BB58 80240538 00000000 */ nop -/* D6BB5C 8024053C 0C048B77 */ jal func_80122DDC -/* D6BB60 80240540 84440008 */ lh $a0, 8($v0) -/* D6BB64 80240544 8E050028 */ lw $a1, 0x28($s0) -/* D6BB68 80240548 8E070030 */ lw $a3, 0x30($s0) -/* D6BB6C 8024054C 27A20030 */ addiu $v0, $sp, 0x30 -/* D6BB70 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* D6BB74 80240554 27A20034 */ addiu $v0, $sp, 0x34 -/* D6BB78 80240558 AFA20014 */ sw $v0, 0x14($sp) -/* D6BB7C 8024055C 27A20038 */ addiu $v0, $sp, 0x38 -/* D6BB80 80240560 AFA20018 */ sw $v0, 0x18($sp) -/* D6BB84 80240564 C600002C */ lwc1 $f0, 0x2c($s0) -/* D6BB88 80240568 3C04800A */ lui $a0, 0x800a -/* D6BB8C 8024056C 8484A634 */ lh $a0, -0x59cc($a0) -/* D6BB90 80240570 46000007 */ neg.s $f0, $f0 -/* D6BB94 80240574 44060000 */ mfc1 $a2, $f0 -/* D6BB98 80240578 0C00B94E */ jal get_screen_coords -/* D6BB9C 8024057C 00000000 */ nop -/* D6BBA0 80240580 8E0500A4 */ lw $a1, 0xa4($s0) -/* D6BBA4 80240584 3C063F80 */ lui $a2, 0x3f80 -/* D6BBA8 80240588 0C0B76A3 */ jal func_802DDA8C -/* D6BBAC 8024058C 24040001 */ addiu $a0, $zero, 1 -/* D6BBB0 80240590 8E020000 */ lw $v0, ($s0) -/* D6BBB4 80240594 3C030002 */ lui $v1, 2 -/* D6BBB8 80240598 00431024 */ and $v0, $v0, $v1 -/* D6BBBC 8024059C 54400022 */ bnel $v0, $zero, .L80240628 -/* D6BBC0 802405A0 24120011 */ addiu $s2, $zero, 0x11 -/* D6BBC4 802405A4 9203000E */ lbu $v1, 0xe($s0) -/* D6BBC8 802405A8 3C02802E */ lui $v0, 0x802e -/* D6BBCC 802405AC 90429D71 */ lbu $v0, -0x628f($v0) -/* D6BBD0 802405B0 10620018 */ beq $v1, $v0, .L80240614 -/* D6BBD4 802405B4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D6BBD8 802405B8 1040000B */ beqz $v0, .L802405E8 -/* D6BBDC 802405BC 24120011 */ addiu $s2, $zero, 0x11 -/* D6BBE0 802405C0 24040001 */ addiu $a0, $zero, 1 -/* D6BBE4 802405C4 2405FFFF */ addiu $a1, $zero, -1 -/* D6BBE8 802405C8 24060007 */ addiu $a2, $zero, 7 -/* D6BBEC 802405CC 0060102D */ daddu $v0, $v1, $zero -/* D6BBF0 802405D0 0000382D */ daddu $a3, $zero, $zero -/* D6BBF4 802405D4 AFA00010 */ sw $zero, 0x10($sp) -/* D6BBF8 802405D8 AFA00014 */ sw $zero, 0x14($sp) -/* D6BBFC 802405DC AFA0001C */ sw $zero, 0x1c($sp) -/* D6BC00 802405E0 08090183 */ j .L8024060C -/* D6BC04 802405E4 AFA20018 */ sw $v0, 0x18($sp) -.L802405E8: -/* D6BC08 802405E8 2412000D */ addiu $s2, $zero, 0xd -/* D6BC0C 802405EC 24040001 */ addiu $a0, $zero, 1 -/* D6BC10 802405F0 2405FFFF */ addiu $a1, $zero, -1 -/* D6BC14 802405F4 0000302D */ daddu $a2, $zero, $zero -/* D6BC18 802405F8 00C0382D */ daddu $a3, $a2, $zero -/* D6BC1C 802405FC AFA00010 */ sw $zero, 0x10($sp) -/* D6BC20 80240600 AFA00014 */ sw $zero, 0x14($sp) -/* D6BC24 80240604 AFA00018 */ sw $zero, 0x18($sp) -/* D6BC28 80240608 AFA0001C */ sw $zero, 0x1c($sp) -.L8024060C: -/* D6BC2C 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D6BC30 80240610 00000000 */ nop -.L80240614: -/* D6BC34 80240614 9202000E */ lbu $v0, 0xe($s0) -/* D6BC38 80240618 3C01802E */ lui $at, 0x802e -/* D6BC3C 8024061C A0229D71 */ sb $v0, -0x628f($at) -/* D6BC40 80240620 0809018C */ j .L80240630 -/* D6BC44 80240624 00000000 */ nop -.L80240628: -/* D6BC48 80240628 3C01802E */ lui $at, 0x802e -/* D6BC4C 8024062C A0209D71 */ sb $zero, -0x628f($at) -.L80240630: -/* D6BC50 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D6BC54 80240634 3C048024 */ lui $a0, 0x8024 -/* D6BC58 80240638 24840870 */ addiu $a0, $a0, 0x870 -/* D6BC5C 8024063C AE320000 */ sw $s2, ($s1) -/* D6BC60 80240640 AE300008 */ sw $s0, 8($s1) -/* D6BC64 80240644 00021023 */ negu $v0, $v0 -/* D6BC68 80240648 AE220004 */ sw $v0, 4($s1) -/* D6BC6C 8024064C 8E020000 */ lw $v0, ($s0) -/* D6BC70 80240650 3C030002 */ lui $v1, 2 -/* D6BC74 80240654 00431024 */ and $v0, $v0, $v1 -/* D6BC78 80240658 54400004 */ bnel $v0, $zero, .L8024066C -/* D6BC7C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D6BC80 80240660 3C048024 */ lui $a0, 0x8024 -/* D6BC84 80240664 2484068C */ addiu $a0, $a0, 0x68c -/* D6BC88 80240668 AE24000C */ sw $a0, 0xc($s1) -.L8024066C: -/* D6BC8C 8024066C 0C047644 */ jal queue_render_task -/* D6BC90 80240670 0220202D */ daddu $a0, $s1, $zero -.L80240674: -/* D6BC94 80240674 8FBF004C */ lw $ra, 0x4c($sp) -/* D6BC98 80240678 8FB20048 */ lw $s2, 0x48($sp) -/* D6BC9C 8024067C 8FB10044 */ lw $s1, 0x44($sp) -/* D6BCA0 80240680 8FB00040 */ lw $s0, 0x40($sp) -/* D6BCA4 80240684 03E00008 */ jr $ra -/* D6BCA8 80240688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_18/func_8024068C_D6B620.s b/asm/nonmatchings/world/area_pra/pra_18/func_8024068C_D6B620.s deleted file mode 100644 index 95c87cf21c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/func_8024068C_D6B620.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_D6BCAC -/* D6BCAC 8024068C 3C03800A */ lui $v1, 0x800a -/* D6BCB0 80240690 8463A634 */ lh $v1, -0x59cc($v1) -/* D6BCB4 80240694 3C07BF80 */ lui $a3, 0xbf80 -/* D6BCB8 80240698 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D6BCBC 8024069C F7B40128 */ sdc1 $f20, 0x128($sp) -/* D6BCC0 802406A0 4480A000 */ mtc1 $zero, $f20 -/* D6BCC4 802406A4 AFB1011C */ sw $s1, 0x11c($sp) -/* D6BCC8 802406A8 0080882D */ daddu $s1, $a0, $zero -/* D6BCCC 802406AC AFB00118 */ sw $s0, 0x118($sp) -/* D6BCD0 802406B0 27B00098 */ addiu $s0, $sp, 0x98 -/* D6BCD4 802406B4 AFBF0120 */ sw $ra, 0x120($sp) -/* D6BCD8 802406B8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D6BCDC 802406BC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D6BCE0 802406C0 00031080 */ sll $v0, $v1, 2 -/* D6BCE4 802406C4 00431021 */ addu $v0, $v0, $v1 -/* D6BCE8 802406C8 00021080 */ sll $v0, $v0, 2 -/* D6BCEC 802406CC 00431023 */ subu $v0, $v0, $v1 -/* D6BCF0 802406D0 000218C0 */ sll $v1, $v0, 3 -/* D6BCF4 802406D4 00431021 */ addu $v0, $v0, $v1 -/* D6BCF8 802406D8 000210C0 */ sll $v0, $v0, 3 -/* D6BCFC 802406DC 3C01800B */ lui $at, 0x800b -/* D6BD00 802406E0 00220821 */ addu $at, $at, $v0 -/* D6BD04 802406E4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D6BD08 802406E8 4406A000 */ mfc1 $a2, $f20 -/* D6BD0C 802406EC 4600B587 */ neg.s $f22, $f22 -/* D6BD10 802406F0 4405B000 */ mfc1 $a1, $f22 -/* D6BD14 802406F4 0200202D */ daddu $a0, $s0, $zero -/* D6BD18 802406F8 0C019EC8 */ jal guRotateF -/* D6BD1C 802406FC E7B40010 */ swc1 $f20, 0x10($sp) -/* D6BD20 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D6BD24 80240704 0C00A6C9 */ jal clamp_angle -/* D6BD28 80240708 00000000 */ nop -/* D6BD2C 8024070C 44050000 */ mfc1 $a1, $f0 -/* D6BD30 80240710 4406A000 */ mfc1 $a2, $f20 -/* D6BD34 80240714 4407A000 */ mfc1 $a3, $f20 -/* D6BD38 80240718 3C013F80 */ lui $at, 0x3f80 -/* D6BD3C 8024071C 4481C000 */ mtc1 $at, $f24 -/* D6BD40 80240720 27A40018 */ addiu $a0, $sp, 0x18 -/* D6BD44 80240724 0C019EC8 */ jal guRotateF -/* D6BD48 80240728 E7B80010 */ swc1 $f24, 0x10($sp) -/* D6BD4C 8024072C 0200202D */ daddu $a0, $s0, $zero -/* D6BD50 80240730 27A50018 */ addiu $a1, $sp, 0x18 -/* D6BD54 80240734 0C019D80 */ jal guMtxCatF -/* D6BD58 80240738 00A0302D */ daddu $a2, $a1, $zero -/* D6BD5C 8024073C 4405B000 */ mfc1 $a1, $f22 -/* D6BD60 80240740 4406A000 */ mfc1 $a2, $f20 -/* D6BD64 80240744 4407C000 */ mfc1 $a3, $f24 -/* D6BD68 80240748 0200202D */ daddu $a0, $s0, $zero -/* D6BD6C 8024074C 0C019EC8 */ jal guRotateF -/* D6BD70 80240750 E7B40010 */ swc1 $f20, 0x10($sp) -/* D6BD74 80240754 27A40018 */ addiu $a0, $sp, 0x18 -/* D6BD78 80240758 0200282D */ daddu $a1, $s0, $zero -/* D6BD7C 8024075C 0C019D80 */ jal guMtxCatF -/* D6BD80 80240760 0080302D */ daddu $a2, $a0, $zero -/* D6BD84 80240764 E7B40010 */ swc1 $f20, 0x10($sp) -/* D6BD88 80240768 8E2500A8 */ lw $a1, 0xa8($s1) -/* D6BD8C 8024076C 4406A000 */ mfc1 $a2, $f20 -/* D6BD90 80240770 4407C000 */ mfc1 $a3, $f24 -/* D6BD94 80240774 0C019EC8 */ jal guRotateF -/* D6BD98 80240778 0200202D */ daddu $a0, $s0, $zero -/* D6BD9C 8024077C 27A40018 */ addiu $a0, $sp, 0x18 -/* D6BDA0 80240780 0200282D */ daddu $a1, $s0, $zero -/* D6BDA4 80240784 0C019D80 */ jal guMtxCatF -/* D6BDA8 80240788 0080302D */ daddu $a2, $a0, $zero -/* D6BDAC 8024078C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D6BDB0 80240790 3C013F36 */ lui $at, 0x3f36 -/* D6BDB4 80240794 3421DB6E */ ori $at, $at, 0xdb6e -/* D6BDB8 80240798 44810000 */ mtc1 $at, $f0 -/* D6BDBC 8024079C 0200202D */ daddu $a0, $s0, $zero -/* D6BDC0 802407A0 44050000 */ mfc1 $a1, $f0 -/* D6BDC4 802407A4 3C06BF36 */ lui $a2, 0xbf36 -/* D6BDC8 802407A8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D6BDCC 802407AC 0C019DF0 */ jal guScaleF -/* D6BDD0 802407B0 00A0382D */ daddu $a3, $a1, $zero -/* D6BDD4 802407B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D6BDD8 802407B8 0200282D */ daddu $a1, $s0, $zero -/* D6BDDC 802407BC 0C019D80 */ jal guMtxCatF -/* D6BDE0 802407C0 0080302D */ daddu $a2, $a0, $zero -/* D6BDE4 802407C4 27B00058 */ addiu $s0, $sp, 0x58 -/* D6BDE8 802407C8 8E250028 */ lw $a1, 0x28($s1) -/* D6BDEC 802407CC C620002C */ lwc1 $f0, 0x2c($s1) -/* D6BDF0 802407D0 8E270030 */ lw $a3, 0x30($s1) -/* D6BDF4 802407D4 46000007 */ neg.s $f0, $f0 -/* D6BDF8 802407D8 44060000 */ mfc1 $a2, $f0 -/* D6BDFC 802407DC 0C019E40 */ jal guTranslateF -/* D6BE00 802407E0 0200202D */ daddu $a0, $s0, $zero -/* D6BE04 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D6BE08 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D6BE0C 802407EC 0C019D80 */ jal guMtxCatF -/* D6BE10 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D6BE14 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D6BE18 802407F8 3C0142B4 */ lui $at, 0x42b4 -/* D6BE1C 802407FC 44810000 */ mtc1 $at, $f0 -/* D6BE20 80240800 00000000 */ nop -/* D6BE24 80240804 4602003E */ c.le.s $f0, $f2 -/* D6BE28 80240808 00000000 */ nop -/* D6BE2C 8024080C 4500000A */ bc1f .L80240838 -/* D6BE30 80240810 24040001 */ addiu $a0, $zero, 1 -/* D6BE34 80240814 3C014387 */ lui $at, 0x4387 -/* D6BE38 80240818 44810000 */ mtc1 $at, $f0 -/* D6BE3C 8024081C 00000000 */ nop -/* D6BE40 80240820 4600103C */ c.lt.s $f2, $f0 -/* D6BE44 80240824 00000000 */ nop -/* D6BE48 80240828 45000004 */ bc1f .L8024083C -/* D6BE4C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 -/* D6BE50 80240830 3C041000 */ lui $a0, 0x1000 -/* D6BE54 80240834 34840001 */ ori $a0, $a0, 1 -.L80240838: -/* D6BE58 80240838 27A20018 */ addiu $v0, $sp, 0x18 -.L8024083C: -/* D6BE5C 8024083C 0000282D */ daddu $a1, $zero, $zero -/* D6BE60 80240840 00A0302D */ daddu $a2, $a1, $zero -/* D6BE64 80240844 00A0382D */ daddu $a3, $a1, $zero -/* D6BE68 80240848 0C0B7710 */ jal render_sprite -/* D6BE6C 8024084C AFA20010 */ sw $v0, 0x10($sp) -/* D6BE70 80240850 8FBF0120 */ lw $ra, 0x120($sp) -/* D6BE74 80240854 8FB1011C */ lw $s1, 0x11c($sp) -/* D6BE78 80240858 8FB00118 */ lw $s0, 0x118($sp) -/* D6BE7C 8024085C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D6BE80 80240860 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D6BE84 80240864 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D6BE88 80240868 03E00008 */ jr $ra -/* D6BE8C 8024086C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_18/func_80240870_D6B620.s b/asm/nonmatchings/world/area_pra/pra_18/func_80240870_D6B620.s deleted file mode 100644 index 5e14ae33eb..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/func_80240870_D6B620.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_D6BE90 -/* D6BE90 80240870 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D6BE94 80240874 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D6BE98 80240878 4480B000 */ mtc1 $zero, $f22 -/* D6BE9C 8024087C AFB10134 */ sw $s1, 0x134($sp) -/* D6BEA0 80240880 0080882D */ daddu $s1, $a0, $zero -/* D6BEA4 80240884 AFB3013C */ sw $s3, 0x13c($sp) -/* D6BEA8 80240888 0000982D */ daddu $s3, $zero, $zero -/* D6BEAC 8024088C AFB60148 */ sw $s6, 0x148($sp) -/* D6BEB0 80240890 3C16800B */ lui $s6, %hi(gCameras) -/* D6BEB4 80240894 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D6BEB8 80240898 AFB50144 */ sw $s5, 0x144($sp) -/* D6BEBC 8024089C 241500FF */ addiu $s5, $zero, 0xff -/* D6BEC0 802408A0 AFB00130 */ sw $s0, 0x130($sp) -/* D6BEC4 802408A4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D6BEC8 802408A8 AFB20138 */ sw $s2, 0x138($sp) -/* D6BECC 802408AC 27B20060 */ addiu $s2, $sp, 0x60 -/* D6BED0 802408B0 AFB40140 */ sw $s4, 0x140($sp) -/* D6BED4 802408B4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D6BED8 802408B8 AFBF014C */ sw $ra, 0x14c($sp) -/* D6BEDC 802408BC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D6BEE0 802408C0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D6BEE4 802408C4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D6BEE8 802408C8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D6BEEC 802408CC F7B40150 */ sdc1 $f20, 0x150($sp) -.L802408D0: -/* D6BEF0 802408D0 3C03800A */ lui $v1, 0x800a -/* D6BEF4 802408D4 8463A634 */ lh $v1, -0x59cc($v1) -/* D6BEF8 802408D8 00031080 */ sll $v0, $v1, 2 -/* D6BEFC 802408DC 00431021 */ addu $v0, $v0, $v1 -/* D6BF00 802408E0 00021080 */ sll $v0, $v0, 2 -/* D6BF04 802408E4 00431023 */ subu $v0, $v0, $v1 -/* D6BF08 802408E8 000218C0 */ sll $v1, $v0, 3 -/* D6BF0C 802408EC 00431021 */ addu $v0, $v0, $v1 -/* D6BF10 802408F0 000210C0 */ sll $v0, $v0, 3 -/* D6BF14 802408F4 00561021 */ addu $v0, $v0, $s6 -/* D6BF18 802408F8 C440006C */ lwc1 $f0, 0x6c($v0) -/* D6BF1C 802408FC 16600065 */ bnez $s3, .L80240A94 -/* D6BF20 80240900 46000507 */ neg.s $f20, $f0 -/* D6BF24 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D6BF28 80240908 3C0142B4 */ lui $at, 0x42b4 -/* D6BF2C 8024090C 44810000 */ mtc1 $at, $f0 -/* D6BF30 80240910 00000000 */ nop -/* D6BF34 80240914 4602003C */ c.lt.s $f0, $f2 -/* D6BF38 80240918 00000000 */ nop -/* D6BF3C 8024091C 4500000A */ bc1f .L80240948 -/* D6BF40 80240920 00000000 */ nop -/* D6BF44 80240924 3C014334 */ lui $at, 0x4334 -/* D6BF48 80240928 44812000 */ mtc1 $at, $f4 -/* D6BF4C 8024092C 00000000 */ nop -/* D6BF50 80240930 4604103E */ c.le.s $f2, $f4 -/* D6BF54 80240934 00000000 */ nop -/* D6BF58 80240938 45000003 */ bc1f .L80240948 -/* D6BF5C 8024093C 00000000 */ nop -/* D6BF60 80240940 08090276 */ j .L802409D8 -/* D6BF64 80240944 46022501 */ sub.s $f20, $f4, $f2 -.L80240948: -/* D6BF68 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D6BF6C 8024094C 3C014334 */ lui $at, 0x4334 -/* D6BF70 80240950 44812000 */ mtc1 $at, $f4 -/* D6BF74 80240954 00000000 */ nop -/* D6BF78 80240958 4600203C */ c.lt.s $f4, $f0 -/* D6BF7C 8024095C 00000000 */ nop -/* D6BF80 80240960 4500000C */ bc1f .L80240994 -/* D6BF84 80240964 00000000 */ nop -/* D6BF88 80240968 3C014387 */ lui $at, 0x4387 -/* D6BF8C 8024096C 44812000 */ mtc1 $at, $f4 -/* D6BF90 80240970 00000000 */ nop -/* D6BF94 80240974 4604003E */ c.le.s $f0, $f4 -/* D6BF98 80240978 00000000 */ nop -/* D6BF9C 8024097C 45000008 */ bc1f .L802409A0 -/* D6BFA0 80240980 00000000 */ nop -/* D6BFA4 80240984 3C014334 */ lui $at, 0x4334 -/* D6BFA8 80240988 44812000 */ mtc1 $at, $f4 -/* D6BFAC 8024098C 08090276 */ j .L802409D8 -/* D6BFB0 80240990 46040501 */ sub.s $f20, $f0, $f4 -.L80240994: -/* D6BFB4 80240994 3C014387 */ lui $at, 0x4387 -/* D6BFB8 80240998 44812000 */ mtc1 $at, $f4 -/* D6BFBC 8024099C 00000000 */ nop -.L802409A0: -/* D6BFC0 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D6BFC4 802409A4 00000000 */ nop -/* D6BFC8 802409A8 4500000A */ bc1f .L802409D4 -/* D6BFCC 802409AC 00000000 */ nop -/* D6BFD0 802409B0 3C0143B4 */ lui $at, 0x43b4 -/* D6BFD4 802409B4 44811000 */ mtc1 $at, $f2 -/* D6BFD8 802409B8 00000000 */ nop -/* D6BFDC 802409BC 4602003E */ c.le.s $f0, $f2 -/* D6BFE0 802409C0 00000000 */ nop -/* D6BFE4 802409C4 45000003 */ bc1f .L802409D4 -/* D6BFE8 802409C8 00000000 */ nop -/* D6BFEC 802409CC 08090276 */ j .L802409D8 -/* D6BFF0 802409D0 46001501 */ sub.s $f20, $f2, $f0 -.L802409D4: -/* D6BFF4 802409D4 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L802409D8: -/* D6BFF8 802409D8 3C0141C8 */ lui $at, 0x41c8 -/* D6BFFC 802409DC 44810000 */ mtc1 $at, $f0 -/* D6C000 802409E0 00000000 */ nop -/* D6C004 802409E4 4600A003 */ div.s $f0, $f20, $f0 -/* D6C008 802409E8 4600010D */ trunc.w.s $f4, $f0 -/* D6C00C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D6C010 802409F0 00000000 */ nop -/* D6C014 802409F4 00071100 */ sll $v0, $a3, 4 -/* D6C018 802409F8 00471023 */ subu $v0, $v0, $a3 -/* D6C01C 802409FC 00021080 */ sll $v0, $v0, 2 -/* D6C020 80240A00 02A23823 */ subu $a3, $s5, $v0 -/* D6C024 80240A04 28E20064 */ slti $v0, $a3, 0x64 -/* D6C028 80240A08 54400001 */ bnel $v0, $zero, .L80240A10 -/* D6C02C 80240A0C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A10: -/* D6C030 80240A10 24040001 */ addiu $a0, $zero, 1 -/* D6C034 80240A14 2405FFFF */ addiu $a1, $zero, -1 -/* D6C038 80240A18 24060006 */ addiu $a2, $zero, 6 -/* D6C03C 80240A1C AFA70010 */ sw $a3, 0x10($sp) -/* D6C040 80240A20 AFA70014 */ sw $a3, 0x14($sp) -/* D6C044 80240A24 AFB50018 */ sw $s5, 0x18($sp) -/* D6C048 80240A28 0C0B77B9 */ jal func_802DDEE4 -/* D6C04C 80240A2C AFA0001C */ sw $zero, 0x1c($sp) -/* D6C050 80240A30 4405A000 */ mfc1 $a1, $f20 -/* D6C054 80240A34 4406B000 */ mfc1 $a2, $f22 -/* D6C058 80240A38 3C07BF80 */ lui $a3, 0xbf80 -/* D6C05C 80240A3C 0200202D */ daddu $a0, $s0, $zero -/* D6C060 80240A40 0C019EC8 */ jal guRotateF -/* D6C064 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D6C068 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D6C06C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D6C070 80240A50 00000000 */ nop -/* D6C074 80240A54 44050000 */ mfc1 $a1, $f0 -/* D6C078 80240A58 4406B000 */ mfc1 $a2, $f22 -/* D6C07C 80240A5C 4407B000 */ mfc1 $a3, $f22 -/* D6C080 80240A60 3C013F80 */ lui $at, 0x3f80 -/* D6C084 80240A64 44812000 */ mtc1 $at, $f4 -/* D6C088 80240A68 27A40020 */ addiu $a0, $sp, 0x20 -/* D6C08C 80240A6C 0C019EC8 */ jal guRotateF -/* D6C090 80240A70 E7A40010 */ swc1 $f4, 0x10($sp) -/* D6C094 80240A74 0200202D */ daddu $a0, $s0, $zero -/* D6C098 80240A78 27A50020 */ addiu $a1, $sp, 0x20 -/* D6C09C 80240A7C 0C019D80 */ jal guMtxCatF -/* D6C0A0 80240A80 00A0302D */ daddu $a2, $a1, $zero -/* D6C0A4 80240A84 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D6C0A8 80240A88 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D6C0AC 80240A8C 080902D6 */ j .L80240B58 -/* D6C0B0 80240A90 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240A94: -/* D6C0B4 80240A94 0260202D */ daddu $a0, $s3, $zero -/* D6C0B8 80240A98 27A50120 */ addiu $a1, $sp, 0x120 -/* D6C0BC 80240A9C 27A60124 */ addiu $a2, $sp, 0x124 -/* D6C0C0 80240AA0 0C03964E */ jal func_800E5938 -/* D6C0C4 80240AA4 27A70128 */ addiu $a3, $sp, 0x128 -/* D6C0C8 80240AA8 8FA60124 */ lw $a2, 0x124($sp) -/* D6C0CC 80240AAC 3C028000 */ lui $v0, 0x8000 -/* D6C0D0 80240AB0 14C20004 */ bne $a2, $v0, .L80240AC4 -/* D6C0D4 80240AB4 46000606 */ mov.s $f24, $f0 -/* D6C0D8 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D6C0DC 80240ABC 080902B5 */ j .L80240AD4 -/* D6C0E0 80240AC0 24040001 */ addiu $a0, $zero, 1 -.L80240AC4: -/* D6C0E4 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D6C0E8 80240AC8 00000000 */ nop -/* D6C0EC 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D6C0F0 80240AD0 24040001 */ addiu $a0, $zero, 1 -.L80240AD4: -/* D6C0F4 80240AD4 2405FFFF */ addiu $a1, $zero, -1 -/* D6C0F8 80240AD8 24060007 */ addiu $a2, $zero, 7 -/* D6C0FC 80240ADC 0000382D */ daddu $a3, $zero, $zero -/* D6C100 80240AE0 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D6C104 80240AE4 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D6C108 80240AE8 24020040 */ addiu $v0, $zero, 0x40 -/* D6C10C 80240AEC AFA00010 */ sw $zero, 0x10($sp) -/* D6C110 80240AF0 AFA00014 */ sw $zero, 0x14($sp) -/* D6C114 80240AF4 AFA20018 */ sw $v0, 0x18($sp) -/* D6C118 80240AF8 0C0B77B9 */ jal func_802DDEE4 -/* D6C11C 80240AFC AFA0001C */ sw $zero, 0x1c($sp) -/* D6C120 80240B00 4405A000 */ mfc1 $a1, $f20 -/* D6C124 80240B04 4406B000 */ mfc1 $a2, $f22 -/* D6C128 80240B08 3C07BF80 */ lui $a3, 0xbf80 -/* D6C12C 80240B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* D6C130 80240B10 0C019EC8 */ jal guRotateF -/* D6C134 80240B14 E7B60010 */ swc1 $f22, 0x10($sp) -/* D6C138 80240B18 4405A000 */ mfc1 $a1, $f20 -/* D6C13C 80240B1C 4406B000 */ mfc1 $a2, $f22 -/* D6C140 80240B20 3C07BF80 */ lui $a3, 0xbf80 -/* D6C144 80240B24 0200202D */ daddu $a0, $s0, $zero -/* D6C148 80240B28 0C019EC8 */ jal guRotateF -/* D6C14C 80240B2C E7B60010 */ swc1 $f22, 0x10($sp) -/* D6C150 80240B30 4405C000 */ mfc1 $a1, $f24 -/* D6C154 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D6C158 80240B38 3C073F80 */ lui $a3, 0x3f80 -/* D6C15C 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D6C160 80240B40 0C019EC8 */ jal guRotateF -/* D6C164 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D6C168 80240B48 0200202D */ daddu $a0, $s0, $zero -/* D6C16C 80240B4C 27A50020 */ addiu $a1, $sp, 0x20 -/* D6C170 80240B50 0C019D80 */ jal guMtxCatF -/* D6C174 80240B54 00A0302D */ daddu $a2, $a1, $zero -.L80240B58: -/* D6C178 80240B58 862200B0 */ lh $v0, 0xb0($s1) -/* D6C17C 80240B5C 3C013F00 */ lui $at, 0x3f00 -/* D6C180 80240B60 44812000 */ mtc1 $at, $f4 -/* D6C184 80240B64 00021023 */ negu $v0, $v0 -/* D6C188 80240B68 44820000 */ mtc1 $v0, $f0 -/* D6C18C 80240B6C 00000000 */ nop -/* D6C190 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* D6C194 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D6C198 80240B78 00000000 */ nop -/* D6C19C 80240B7C 4405B000 */ mfc1 $a1, $f22 -/* D6C1A0 80240B80 4407B000 */ mfc1 $a3, $f22 -/* D6C1A4 80240B84 44062000 */ mfc1 $a2, $f4 -/* D6C1A8 80240B88 0C019E40 */ jal guTranslateF -/* D6C1AC 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* D6C1B0 80240B90 0240202D */ daddu $a0, $s2, $zero -/* D6C1B4 80240B94 27A50020 */ addiu $a1, $sp, 0x20 -/* D6C1B8 80240B98 0C019D80 */ jal guMtxCatF -/* D6C1BC 80240B9C 00A0302D */ daddu $a2, $a1, $zero -/* D6C1C0 80240BA0 4405A000 */ mfc1 $a1, $f20 -/* D6C1C4 80240BA4 4406B000 */ mfc1 $a2, $f22 -/* D6C1C8 80240BA8 3C073F80 */ lui $a3, 0x3f80 -/* D6C1CC 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* D6C1D0 80240BB0 0C019EC8 */ jal guRotateF -/* D6C1D4 80240BB4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D6C1D8 80240BB8 27A40020 */ addiu $a0, $sp, 0x20 -/* D6C1DC 80240BBC 0200282D */ daddu $a1, $s0, $zero -/* D6C1E0 80240BC0 0C019D80 */ jal guMtxCatF -/* D6C1E4 80240BC4 0080302D */ daddu $a2, $a0, $zero -/* D6C1E8 80240BC8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D6C1EC 80240BCC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D6C1F0 80240BD0 4406B000 */ mfc1 $a2, $f22 -/* D6C1F4 80240BD4 3C073F80 */ lui $a3, 0x3f80 -/* D6C1F8 80240BD8 0C019EC8 */ jal guRotateF -/* D6C1FC 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D6C200 80240BE0 27A40020 */ addiu $a0, $sp, 0x20 -/* D6C204 80240BE4 0200282D */ daddu $a1, $s0, $zero -/* D6C208 80240BE8 0C019D80 */ jal guMtxCatF -/* D6C20C 80240BEC 0080302D */ daddu $a2, $a0, $zero -/* D6C210 80240BF0 862200B0 */ lh $v0, 0xb0($s1) -/* D6C214 80240BF4 3C013F00 */ lui $at, 0x3f00 -/* D6C218 80240BF8 44812000 */ mtc1 $at, $f4 -/* D6C21C 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D6C220 80240C00 00000000 */ nop -/* D6C224 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* D6C228 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D6C22C 80240C0C 00000000 */ nop -/* D6C230 80240C10 4405B000 */ mfc1 $a1, $f22 -/* D6C234 80240C14 4407B000 */ mfc1 $a3, $f22 -/* D6C238 80240C18 44062000 */ mfc1 $a2, $f4 -/* D6C23C 80240C1C 0C019E40 */ jal guTranslateF -/* D6C240 80240C20 0240202D */ daddu $a0, $s2, $zero -/* D6C244 80240C24 27A40020 */ addiu $a0, $sp, 0x20 -/* D6C248 80240C28 0240282D */ daddu $a1, $s2, $zero -/* D6C24C 80240C2C 0C019D80 */ jal guMtxCatF -/* D6C250 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D6C254 80240C34 3C013F36 */ lui $at, 0x3f36 -/* D6C258 80240C38 3421DB6E */ ori $at, $at, 0xdb6e -/* D6C25C 80240C3C 44810000 */ mtc1 $at, $f0 -/* D6C260 80240C40 0280202D */ daddu $a0, $s4, $zero -/* D6C264 80240C44 44050000 */ mfc1 $a1, $f0 -/* D6C268 80240C48 3C06BF36 */ lui $a2, 0xbf36 -/* D6C26C 80240C4C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D6C270 80240C50 0C019DF0 */ jal guScaleF -/* D6C274 80240C54 00A0382D */ daddu $a3, $a1, $zero -/* D6C278 80240C58 27A40020 */ addiu $a0, $sp, 0x20 -/* D6C27C 80240C5C 0280282D */ daddu $a1, $s4, $zero -/* D6C280 80240C60 0C019D80 */ jal guMtxCatF -/* D6C284 80240C64 0080302D */ daddu $a2, $a0, $zero -/* D6C288 80240C68 4600D687 */ neg.s $f26, $f26 -/* D6C28C 80240C6C 4405F000 */ mfc1 $a1, $f30 -/* D6C290 80240C70 4407E000 */ mfc1 $a3, $f28 -/* D6C294 80240C74 4406D000 */ mfc1 $a2, $f26 -/* D6C298 80240C78 0C019E40 */ jal guTranslateF -/* D6C29C 80240C7C 0240202D */ daddu $a0, $s2, $zero -/* D6C2A0 80240C80 27A40020 */ addiu $a0, $sp, 0x20 -/* D6C2A4 80240C84 0240282D */ daddu $a1, $s2, $zero -/* D6C2A8 80240C88 0C019D80 */ jal guMtxCatF -/* D6C2AC 80240C8C 0080302D */ daddu $a2, $a0, $zero -/* D6C2B0 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D6C2B4 80240C94 3C0142B4 */ lui $at, 0x42b4 -/* D6C2B8 80240C98 44810000 */ mtc1 $at, $f0 -/* D6C2BC 80240C9C 00000000 */ nop -/* D6C2C0 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D6C2C4 80240CA4 00000000 */ nop -/* D6C2C8 80240CA8 4500000A */ bc1f .L80240CD4 -/* D6C2CC 80240CAC 24040001 */ addiu $a0, $zero, 1 -/* D6C2D0 80240CB0 3C014387 */ lui $at, 0x4387 -/* D6C2D4 80240CB4 44812000 */ mtc1 $at, $f4 -/* D6C2D8 80240CB8 00000000 */ nop -/* D6C2DC 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D6C2E0 80240CC0 00000000 */ nop -/* D6C2E4 80240CC4 45000004 */ bc1f .L80240CD8 -/* D6C2E8 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 -/* D6C2EC 80240CCC 3C041000 */ lui $a0, 0x1000 -/* D6C2F0 80240CD0 34840001 */ ori $a0, $a0, 1 -.L80240CD4: -/* D6C2F4 80240CD4 27A20020 */ addiu $v0, $sp, 0x20 -.L80240CD8: -/* D6C2F8 80240CD8 AFA20010 */ sw $v0, 0x10($sp) -/* D6C2FC 80240CDC 0000282D */ daddu $a1, $zero, $zero -/* D6C300 80240CE0 00A0302D */ daddu $a2, $a1, $zero -/* D6C304 80240CE4 0C0B7710 */ jal render_sprite -/* D6C308 80240CE8 00A0382D */ daddu $a3, $a1, $zero -/* D6C30C 80240CEC 26730001 */ addiu $s3, $s3, 1 -/* D6C310 80240CF0 2A620002 */ slti $v0, $s3, 2 -/* D6C314 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D6C318 80240CF8 00000000 */ nop -/* D6C31C 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) -/* D6C320 80240D00 8FB60148 */ lw $s6, 0x148($sp) -/* D6C324 80240D04 8FB50144 */ lw $s5, 0x144($sp) -/* D6C328 80240D08 8FB40140 */ lw $s4, 0x140($sp) -/* D6C32C 80240D0C 8FB3013C */ lw $s3, 0x13c($sp) -/* D6C330 80240D10 8FB20138 */ lw $s2, 0x138($sp) -/* D6C334 80240D14 8FB10134 */ lw $s1, 0x134($sp) -/* D6C338 80240D18 8FB00130 */ lw $s0, 0x130($sp) -/* D6C33C 80240D1C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D6C340 80240D20 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D6C344 80240D24 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D6C348 80240D28 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D6C34C 80240D2C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D6C350 80240D30 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D6C354 80240D34 03E00008 */ jr $ra -/* D6C358 80240D38 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_18/func_80240D3C_D6B620.s b/asm/nonmatchings/world/area_pra/pra_18/func_80240D3C_D6B620.s deleted file mode 100644 index 3f9ae22fc0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/func_80240D3C_D6B620.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_D6C35C -/* D6C35C 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6C360 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D6C364 80240D44 0080802D */ daddu $s0, $a0, $zero -/* D6C368 80240D48 AFBF0014 */ sw $ra, 0x14($sp) -/* D6C36C 80240D4C 8E020088 */ lw $v0, 0x88($s0) -/* D6C370 80240D50 14400017 */ bnez $v0, .L80240DB0 -/* D6C374 80240D54 24020001 */ addiu $v0, $zero, 1 -/* D6C378 80240D58 8E030084 */ lw $v1, 0x84($s0) -/* D6C37C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D6C380 80240D60 00000000 */ nop -/* D6C384 80240D64 28620002 */ slti $v0, $v1, 2 -/* D6C388 80240D68 50400005 */ beql $v0, $zero, .L80240D80 -/* D6C38C 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* D6C390 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D6C394 80240D74 00000000 */ nop -/* D6C398 80240D78 08090378 */ j .L80240DE0 -/* D6C39C 80240D7C 00000000 */ nop -.L80240D80: -/* D6C3A0 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D6C3A4 80240D84 00000000 */ nop -/* D6C3A8 80240D88 08090378 */ j .L80240DE0 -/* D6C3AC 80240D8C 00000000 */ nop -.L80240D90: -/* D6C3B0 80240D90 3C048024 */ lui $a0, 0x8024 -/* D6C3B4 80240D94 24840E84 */ addiu $a0, $a0, 0xe84 -/* D6C3B8 80240D98 08090374 */ j .L80240DD0 -/* D6C3BC 80240D9C 00000000 */ nop -.L80240DA0: -/* D6C3C0 80240DA0 3C048024 */ lui $a0, 0x8024 -/* D6C3C4 80240DA4 24840EEC */ addiu $a0, $a0, 0xeec -/* D6C3C8 80240DA8 08090374 */ j .L80240DD0 -/* D6C3CC 80240DAC 00000000 */ nop -.L80240DB0: -/* D6C3D0 80240DB0 8E020084 */ lw $v0, 0x84($s0) -/* D6C3D4 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D6C3D8 80240DB8 00000000 */ nop -/* D6C3DC 80240DBC 28420002 */ slti $v0, $v0, 2 -/* D6C3E0 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D6C3E4 80240DC4 00000000 */ nop -.L80240DC8: -/* D6C3E8 80240DC8 3C048024 */ lui $a0, 0x8024 -/* D6C3EC 80240DCC 24840EB8 */ addiu $a0, $a0, 0xeb8 -.L80240DD0: -/* D6C3F0 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 -/* D6C3F4 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* D6C3F8 80240DD8 8E03013C */ lw $v1, 0x13c($s0) -/* D6C3FC 80240DDC AC620004 */ sw $v0, 4($v1) -.L80240DE0: -/* D6C400 80240DE0 0C00EAD2 */ jal get_npc_safe -/* D6C404 80240DE4 2404FFFC */ addiu $a0, $zero, -4 -/* D6C408 80240DE8 0040282D */ daddu $a1, $v0, $zero -/* D6C40C 80240DEC 10A00021 */ beqz $a1, .L80240E74 -/* D6C410 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* D6C414 80240DF4 8E020088 */ lw $v0, 0x88($s0) -/* D6C418 80240DF8 14400014 */ bnez $v0, .L80240E4C -/* D6C41C 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* D6C420 80240E00 8E040084 */ lw $a0, 0x84($s0) -/* D6C424 80240E04 10820016 */ beq $a0, $v0, .L80240E60 -/* D6C428 80240E08 28820002 */ slti $v0, $a0, 2 -/* D6C42C 80240E0C 10400005 */ beqz $v0, .L80240E24 -/* D6C430 80240E10 24020002 */ addiu $v0, $zero, 2 -/* D6C434 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D6C438 80240E18 00000000 */ nop -/* D6C43C 80240E1C 0809039D */ j .L80240E74 -/* D6C440 80240E20 00000000 */ nop -.L80240E24: -/* D6C444 80240E24 10820006 */ beq $a0, $v0, .L80240E40 -/* D6C448 80240E28 24020002 */ addiu $v0, $zero, 2 -/* D6C44C 80240E2C 0809039D */ j .L80240E74 -/* D6C450 80240E30 00000000 */ nop -.L80240E34: -/* D6C454 80240E34 8CA20000 */ lw $v0, ($a1) -/* D6C458 80240E38 0809039A */ j .L80240E68 -/* D6C45C 80240E3C 3C03000A */ lui $v1, 0xa -.L80240E40: -/* D6C460 80240E40 8CA20000 */ lw $v0, ($a1) -/* D6C464 80240E44 0809039A */ j .L80240E68 -/* D6C468 80240E48 3C030002 */ lui $v1, 2 -.L80240E4C: -/* D6C46C 80240E4C 8E020084 */ lw $v0, 0x84($s0) -/* D6C470 80240E50 04400007 */ bltz $v0, .L80240E70 -/* D6C474 80240E54 28420002 */ slti $v0, $v0, 2 -/* D6C478 80240E58 10400006 */ beqz $v0, .L80240E74 -/* D6C47C 80240E5C 24020002 */ addiu $v0, $zero, 2 -.L80240E60: -/* D6C480 80240E60 8CA20000 */ lw $v0, ($a1) -/* D6C484 80240E64 3C030008 */ lui $v1, 8 -.L80240E68: -/* D6C488 80240E68 00431025 */ or $v0, $v0, $v1 -/* D6C48C 80240E6C ACA20000 */ sw $v0, ($a1) -.L80240E70: -/* D6C490 80240E70 24020002 */ addiu $v0, $zero, 2 -.L80240E74: -/* D6C494 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* D6C498 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* D6C49C 80240E7C 03E00008 */ jr $ra -/* D6C4A0 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_18/func_80240E84_D6B620.s b/asm/nonmatchings/world/area_pra/pra_18/func_80240E84_D6B620.s deleted file mode 100644 index 2ef59400c7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/func_80240E84_D6B620.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D6C4A4 -/* D6C4A4 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6C4A8 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D6C4AC 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D6C4B0 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D6C4B4 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D6C4B8 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D6C4BC 80240E9C 3C03000A */ lui $v1, 0xa -/* D6C4C0 80240EA0 8C820000 */ lw $v0, ($a0) -/* D6C4C4 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D6C4C8 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D6C4CC 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D6C4D0 80240EB0 03E00008 */ jr $ra -/* D6C4D4 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_18/func_80240EB8_D6B620.s b/asm/nonmatchings/world/area_pra/pra_18/func_80240EB8_D6B620.s deleted file mode 100644 index a913222bc8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/func_80240EB8_D6B620.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D6C4D8 -/* D6C4D8 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6C4DC 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D6C4E0 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D6C4E4 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D6C4E8 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D6C4EC 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D6C4F0 80240ED0 3C030008 */ lui $v1, 8 -/* D6C4F4 80240ED4 8C820000 */ lw $v0, ($a0) -/* D6C4F8 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D6C4FC 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D6C500 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D6C504 80240EE4 03E00008 */ jr $ra -/* D6C508 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_18/func_80240EEC_D6B620.s b/asm/nonmatchings/world/area_pra/pra_18/func_80240EEC_D6B620.s deleted file mode 100644 index 44ac3c1c06..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/func_80240EEC_D6B620.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D6C50C -/* D6C50C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6C510 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D6C514 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D6C518 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D6C51C 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D6C520 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D6C524 80240F04 3C030002 */ lui $v1, 2 -/* D6C528 80240F08 8C820000 */ lw $v0, ($a0) -/* D6C52C 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D6C530 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D6C534 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D6C538 80240F18 03E00008 */ jr $ra -/* D6C53C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_80240020_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_80240020_D6E9B0.s deleted file mode 100644 index 7189e20355..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_80240020_D6E9B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D6E9D0 -/* D6E9D0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D6E9D4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D6E9D8 80240028 00822024 */ and $a0, $a0, $v0 -/* D6E9DC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D6E9E0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D6E9E4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D6E9E8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D6E9EC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D6E9F0 80240040 30620001 */ andi $v0, $v1, 1 -/* D6E9F4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D6E9F8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D6E9FC 8024004C 03E00008 */ jr $ra -/* D6EA00 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_80240054_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_80240054_D6E9B0.s deleted file mode 100644 index fb488222a8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_80240054_D6E9B0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054_D6EA04 -/* D6EA04 80240054 00041403 */ sra $v0, $a0, 0x10 -/* D6EA08 80240058 304300FF */ andi $v1, $v0, 0xff -/* D6EA0C 8024005C 24020006 */ addiu $v0, $zero, 6 -/* D6EA10 80240060 10620015 */ beq $v1, $v0, .L802400B8 -/* D6EA14 80240064 28620007 */ slti $v0, $v1, 7 -/* D6EA18 80240068 10400005 */ beqz $v0, .L80240080 -/* D6EA1C 8024006C 24020001 */ addiu $v0, $zero, 1 -/* D6EA20 80240070 1062000A */ beq $v1, $v0, .L8024009C -/* D6EA24 80240074 3C020100 */ lui $v0, 0x100 -/* D6EA28 80240078 03E00008 */ jr $ra -/* D6EA2C 8024007C 00821025 */ or $v0, $a0, $v0 -.L80240080: -/* D6EA30 80240080 2862000A */ slti $v0, $v1, 0xa -/* D6EA34 80240084 10400016 */ beqz $v0, .L802400E0 -/* D6EA38 80240088 28620008 */ slti $v0, $v1, 8 -/* D6EA3C 8024008C 14400015 */ bnez $v0, .L802400E4 -/* D6EA40 80240090 3C020100 */ lui $v0, 0x100 -/* D6EA44 80240094 03E00008 */ jr $ra -/* D6EA48 80240098 0080102D */ daddu $v0, $a0, $zero -.L8024009C: -/* D6EA4C 8024009C 3C020001 */ lui $v0, 1 -/* D6EA50 802400A0 3442000C */ ori $v0, $v0, 0xc -/* D6EA54 802400A4 0044102A */ slt $v0, $v0, $a0 -/* D6EA58 802400A8 1040000E */ beqz $v0, .L802400E4 -/* D6EA5C 802400AC 3C020100 */ lui $v0, 0x100 -.L802400B0: -/* D6EA60 802400B0 03E00008 */ jr $ra -/* D6EA64 802400B4 0080102D */ daddu $v0, $a0, $zero -.L802400B8: -/* D6EA68 802400B8 3C02FFF9 */ lui $v0, 0xfff9 -/* D6EA6C 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D6EA70 802400C0 00821821 */ addu $v1, $a0, $v0 -/* D6EA74 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D6EA78 802400C8 10400005 */ beqz $v0, .L802400E0 -/* D6EA7C 802400CC 30620001 */ andi $v0, $v1, 1 -/* D6EA80 802400D0 1440FFF7 */ bnez $v0, .L802400B0 -/* D6EA84 802400D4 24820001 */ addiu $v0, $a0, 1 -/* D6EA88 802400D8 03E00008 */ jr $ra -/* D6EA8C 802400DC 00000000 */ nop -.L802400E0: -/* D6EA90 802400E0 3C020100 */ lui $v0, 0x100 -.L802400E4: -/* D6EA94 802400E4 03E00008 */ jr $ra -/* D6EA98 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_802400EC_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_802400EC_D6E9B0.s deleted file mode 100644 index 1557409adf..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_802400EC_D6E9B0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_D6EA9C -/* D6EA9C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6EAA0 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* D6EAA4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D6EAA8 802400F8 3C058024 */ lui $a1, 0x8024 -/* D6EAAC 802400FC 24A50128 */ addiu $a1, $a1, 0x128 -/* D6EAB0 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* D6EAB4 80240104 0C048C56 */ jal bind_dynamic_entity_3 -/* D6EAB8 80240108 0000202D */ daddu $a0, $zero, $zero -/* D6EABC 8024010C 8E03013C */ lw $v1, 0x13c($s0) -/* D6EAC0 80240110 AC620000 */ sw $v0, ($v1) -/* D6EAC4 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* D6EAC8 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* D6EACC 8024011C 24020002 */ addiu $v0, $zero, 2 -/* D6EAD0 80240120 03E00008 */ jr $ra -/* D6EAD4 80240124 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_80240128_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_80240128_D6E9B0.s deleted file mode 100644 index 064d687529..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_80240128_D6E9B0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240128_D6EAD8 -/* D6EAD8 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D6EADC 8024012C AFB00040 */ sw $s0, 0x40($sp) -/* D6EAE0 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D6EAE4 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D6EAE8 80240138 AFB20048 */ sw $s2, 0x48($sp) -/* D6EAEC 8024013C AFBF004C */ sw $ra, 0x4c($sp) -/* D6EAF0 80240140 AFB10044 */ sw $s1, 0x44($sp) -/* D6EAF4 80240144 8E020000 */ lw $v0, ($s0) -/* D6EAF8 80240148 821100BE */ lb $s1, 0xbe($s0) -/* D6EAFC 8024014C 30420001 */ andi $v0, $v0, 1 -/* D6EB00 80240150 10400061 */ beqz $v0, .L802402D8 -/* D6EB04 80240154 27B20020 */ addiu $s2, $sp, 0x20 -/* D6EB08 80240158 8E0400CC */ lw $a0, 0xcc($s0) -/* D6EB0C 8024015C 0C044181 */ jal get_shadow_by_index -/* D6EB10 80240160 00000000 */ nop -/* D6EB14 80240164 0C048B77 */ jal func_80122DDC -/* D6EB18 80240168 84440008 */ lh $a0, 8($v0) -/* D6EB1C 8024016C 8C430000 */ lw $v1, ($v0) -/* D6EB20 80240170 34630200 */ ori $v1, $v1, 0x200 -/* D6EB24 80240174 AC430000 */ sw $v1, ($v0) -/* D6EB28 80240178 8E050028 */ lw $a1, 0x28($s0) -/* D6EB2C 8024017C 8E06002C */ lw $a2, 0x2c($s0) -/* D6EB30 80240180 27A20030 */ addiu $v0, $sp, 0x30 -/* D6EB34 80240184 AFA20010 */ sw $v0, 0x10($sp) -/* D6EB38 80240188 27A20034 */ addiu $v0, $sp, 0x34 -/* D6EB3C 8024018C AFA20014 */ sw $v0, 0x14($sp) -/* D6EB40 80240190 C6000030 */ lwc1 $f0, 0x30($s0) -/* D6EB44 80240194 3C04800A */ lui $a0, 0x800a -/* D6EB48 80240198 8484A634 */ lh $a0, -0x59cc($a0) -/* D6EB4C 8024019C 46000007 */ neg.s $f0, $f0 -/* D6EB50 802401A0 44070000 */ mfc1 $a3, $f0 -/* D6EB54 802401A4 27A20038 */ addiu $v0, $sp, 0x38 -/* D6EB58 802401A8 0C00B94E */ jal get_screen_coords -/* D6EB5C 802401AC AFA20018 */ sw $v0, 0x18($sp) -/* D6EB60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D6EB64 802401B4 0C090008 */ jal func_80240020 -/* D6EB68 802401B8 00000000 */ nop -/* D6EB6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) -/* D6EB70 802401C0 3C014307 */ lui $at, 0x4307 -/* D6EB74 802401C4 44810000 */ mtc1 $at, $f0 -/* D6EB78 802401C8 00000000 */ nop -/* D6EB7C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D6EB80 802401D0 00000000 */ nop -/* D6EB84 802401D4 4500000B */ bc1f .L80240204 -/* D6EB88 802401D8 24040002 */ addiu $a0, $zero, 2 -/* D6EB8C 802401DC 3C014361 */ lui $at, 0x4361 -/* D6EB90 802401E0 44810000 */ mtc1 $at, $f0 -/* D6EB94 802401E4 00000000 */ nop -/* D6EB98 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D6EB9C 802401EC 00000000 */ nop -/* D6EBA0 802401F0 45000004 */ bc1f .L80240204 -/* D6EBA4 802401F4 00000000 */ nop -/* D6EBA8 802401F8 0C090015 */ jal func_80240054 -/* D6EBAC 802401FC 0040202D */ daddu $a0, $v0, $zero -/* D6EBB0 80240200 24040002 */ addiu $a0, $zero, 2 -.L80240204: -/* D6EBB4 80240204 3C063F80 */ lui $a2, 0x3f80 -/* D6EBB8 80240208 0C0B76A3 */ jal func_802DDA8C -/* D6EBBC 8024020C 0040282D */ daddu $a1, $v0, $zero -/* D6EBC0 80240210 8E020000 */ lw $v0, ($s0) -/* D6EBC4 80240214 3C030002 */ lui $v1, 2 -/* D6EBC8 80240218 00431024 */ and $v0, $v0, $v1 -/* D6EBCC 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 -/* D6EBD0 80240220 24110011 */ addiu $s1, $zero, 0x11 -/* D6EBD4 80240224 9203000E */ lbu $v1, 0xe($s0) -/* D6EBD8 80240228 3C02802E */ lui $v0, 0x802e -/* D6EBDC 8024022C 90429D70 */ lbu $v0, -0x6290($v0) -/* D6EBE0 80240230 10620018 */ beq $v1, $v0, .L80240294 -/* D6EBE4 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D6EBE8 80240238 1040000B */ beqz $v0, .L80240268 -/* D6EBEC 8024023C 24110011 */ addiu $s1, $zero, 0x11 -/* D6EBF0 80240240 24040002 */ addiu $a0, $zero, 2 -/* D6EBF4 80240244 2405FFFF */ addiu $a1, $zero, -1 -/* D6EBF8 80240248 24060007 */ addiu $a2, $zero, 7 -/* D6EBFC 8024024C 0060102D */ daddu $v0, $v1, $zero -/* D6EC00 80240250 0000382D */ daddu $a3, $zero, $zero -/* D6EC04 80240254 AFA00010 */ sw $zero, 0x10($sp) -/* D6EC08 80240258 AFA00014 */ sw $zero, 0x14($sp) -/* D6EC0C 8024025C AFA0001C */ sw $zero, 0x1c($sp) -/* D6EC10 80240260 080900A3 */ j .L8024028C -/* D6EC14 80240264 AFA20018 */ sw $v0, 0x18($sp) -.L80240268: -/* D6EC18 80240268 2411000D */ addiu $s1, $zero, 0xd -/* D6EC1C 8024026C 24040002 */ addiu $a0, $zero, 2 -/* D6EC20 80240270 2405FFFF */ addiu $a1, $zero, -1 -/* D6EC24 80240274 0000302D */ daddu $a2, $zero, $zero -/* D6EC28 80240278 00C0382D */ daddu $a3, $a2, $zero -/* D6EC2C 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* D6EC30 80240280 AFA00014 */ sw $zero, 0x14($sp) -/* D6EC34 80240284 AFA00018 */ sw $zero, 0x18($sp) -/* D6EC38 80240288 AFA0001C */ sw $zero, 0x1c($sp) -.L8024028C: -/* D6EC3C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D6EC40 80240290 00000000 */ nop -.L80240294: -/* D6EC44 80240294 9202000E */ lbu $v0, 0xe($s0) -/* D6EC48 80240298 3C01802E */ lui $at, 0x802e -/* D6EC4C 8024029C A0229D70 */ sb $v0, -0x6290($at) -/* D6EC50 802402A0 080900AD */ j .L802402B4 -/* D6EC54 802402A4 0240202D */ daddu $a0, $s2, $zero -.L802402A8: -/* D6EC58 802402A8 3C01802E */ lui $at, 0x802e -/* D6EC5C 802402AC A0209D70 */ sb $zero, -0x6290($at) -/* D6EC60 802402B0 0240202D */ daddu $a0, $s2, $zero -.L802402B4: -/* D6EC64 802402B4 AC910000 */ sw $s1, ($a0) -/* D6EC68 802402B8 AC900008 */ sw $s0, 8($a0) -/* D6EC6C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D6EC70 802402C0 3C038024 */ lui $v1, 0x8024 -/* D6EC74 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 -/* D6EC78 802402C8 AC83000C */ sw $v1, 0xc($a0) -/* D6EC7C 802402CC 00021023 */ negu $v0, $v0 -/* D6EC80 802402D0 0C047644 */ jal queue_render_task -/* D6EC84 802402D4 AC820004 */ sw $v0, 4($a0) -.L802402D8: -/* D6EC88 802402D8 8FBF004C */ lw $ra, 0x4c($sp) -/* D6EC8C 802402DC 8FB20048 */ lw $s2, 0x48($sp) -/* D6EC90 802402E0 8FB10044 */ lw $s1, 0x44($sp) -/* D6EC94 802402E4 8FB00040 */ lw $s0, 0x40($sp) -/* D6EC98 802402E8 03E00008 */ jr $ra -/* D6EC9C 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_802402F0_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_802402F0_D6E9B0.s deleted file mode 100644 index 8617c7837e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_802402F0_D6E9B0.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D6ECA0 -/* D6ECA0 802402F0 3C03800A */ lui $v1, 0x800a -/* D6ECA4 802402F4 8463A634 */ lh $v1, -0x59cc($v1) -/* D6ECA8 802402F8 3C07BF80 */ lui $a3, 0xbf80 -/* D6ECAC 802402FC 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D6ECB0 80240300 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D6ECB4 80240304 4480A000 */ mtc1 $zero, $f20 -/* D6ECB8 80240308 AFB1011C */ sw $s1, 0x11c($sp) -/* D6ECBC 8024030C 0080882D */ daddu $s1, $a0, $zero -/* D6ECC0 80240310 AFB00118 */ sw $s0, 0x118($sp) -/* D6ECC4 80240314 27B00098 */ addiu $s0, $sp, 0x98 -/* D6ECC8 80240318 AFBF0120 */ sw $ra, 0x120($sp) -/* D6ECCC 8024031C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D6ECD0 80240320 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D6ECD4 80240324 00031080 */ sll $v0, $v1, 2 -/* D6ECD8 80240328 00431021 */ addu $v0, $v0, $v1 -/* D6ECDC 8024032C 00021080 */ sll $v0, $v0, 2 -/* D6ECE0 80240330 00431023 */ subu $v0, $v0, $v1 -/* D6ECE4 80240334 000218C0 */ sll $v1, $v0, 3 -/* D6ECE8 80240338 00431021 */ addu $v0, $v0, $v1 -/* D6ECEC 8024033C 000210C0 */ sll $v0, $v0, 3 -/* D6ECF0 80240340 3C01800B */ lui $at, 0x800b -/* D6ECF4 80240344 00220821 */ addu $at, $at, $v0 -/* D6ECF8 80240348 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D6ECFC 8024034C 4406A000 */ mfc1 $a2, $f20 -/* D6ED00 80240350 4600B587 */ neg.s $f22, $f22 -/* D6ED04 80240354 4405B000 */ mfc1 $a1, $f22 -/* D6ED08 80240358 0200202D */ daddu $a0, $s0, $zero -/* D6ED0C 8024035C 0C019EC8 */ jal guRotateF -/* D6ED10 80240360 E7B40010 */ swc1 $f20, 0x10($sp) -/* D6ED14 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D6ED18 80240368 0C00A6C9 */ jal clamp_angle -/* D6ED1C 8024036C 00000000 */ nop -/* D6ED20 80240370 44050000 */ mfc1 $a1, $f0 -/* D6ED24 80240374 4406A000 */ mfc1 $a2, $f20 -/* D6ED28 80240378 4407A000 */ mfc1 $a3, $f20 -/* D6ED2C 8024037C 3C013F80 */ lui $at, 0x3f80 -/* D6ED30 80240380 4481C000 */ mtc1 $at, $f24 -/* D6ED34 80240384 27A40018 */ addiu $a0, $sp, 0x18 -/* D6ED38 80240388 0C019EC8 */ jal guRotateF -/* D6ED3C 8024038C E7B80010 */ swc1 $f24, 0x10($sp) -/* D6ED40 80240390 0200202D */ daddu $a0, $s0, $zero -/* D6ED44 80240394 27A50018 */ addiu $a1, $sp, 0x18 -/* D6ED48 80240398 0C019D80 */ jal guMtxCatF -/* D6ED4C 8024039C 00A0302D */ daddu $a2, $a1, $zero -/* D6ED50 802403A0 4405B000 */ mfc1 $a1, $f22 -/* D6ED54 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D6ED58 802403A8 4407C000 */ mfc1 $a3, $f24 -/* D6ED5C 802403AC 0200202D */ daddu $a0, $s0, $zero -/* D6ED60 802403B0 0C019EC8 */ jal guRotateF -/* D6ED64 802403B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D6ED68 802403B8 27A40018 */ addiu $a0, $sp, 0x18 -/* D6ED6C 802403BC 0200282D */ daddu $a1, $s0, $zero -/* D6ED70 802403C0 0C019D80 */ jal guMtxCatF -/* D6ED74 802403C4 0080302D */ daddu $a2, $a0, $zero -/* D6ED78 802403C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D6ED7C 802403CC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D6ED80 802403D0 4406A000 */ mfc1 $a2, $f20 -/* D6ED84 802403D4 4407C000 */ mfc1 $a3, $f24 -/* D6ED88 802403D8 0C019EC8 */ jal guRotateF -/* D6ED8C 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D6ED90 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* D6ED94 802403E4 0200282D */ daddu $a1, $s0, $zero -/* D6ED98 802403E8 0C019D80 */ jal guMtxCatF -/* D6ED9C 802403EC 0080302D */ daddu $a2, $a0, $zero -/* D6EDA0 802403F0 3C013F36 */ lui $at, 0x3f36 -/* D6EDA4 802403F4 3421DB6E */ ori $at, $at, 0xdb6e -/* D6EDA8 802403F8 44810000 */ mtc1 $at, $f0 -/* D6EDAC 802403FC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D6EDB0 80240400 44050000 */ mfc1 $a1, $f0 -/* D6EDB4 80240404 0200202D */ daddu $a0, $s0, $zero -/* D6EDB8 80240408 00A0302D */ daddu $a2, $a1, $zero -/* D6EDBC 8024040C 0C019DF0 */ jal guScaleF -/* D6EDC0 80240410 00A0382D */ daddu $a3, $a1, $zero -/* D6EDC4 80240414 27A40018 */ addiu $a0, $sp, 0x18 -/* D6EDC8 80240418 0200282D */ daddu $a1, $s0, $zero -/* D6EDCC 8024041C 0C019D80 */ jal guMtxCatF -/* D6EDD0 80240420 0080302D */ daddu $a2, $a0, $zero -/* D6EDD4 80240424 27B00058 */ addiu $s0, $sp, 0x58 -/* D6EDD8 80240428 C6200030 */ lwc1 $f0, 0x30($s1) -/* D6EDDC 8024042C 3C014040 */ lui $at, 0x4040 -/* D6EDE0 80240430 44811000 */ mtc1 $at, $f2 -/* D6EDE4 80240434 46000007 */ neg.s $f0, $f0 -/* D6EDE8 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* D6EDEC 8024043C 8E250028 */ lw $a1, 0x28($s1) -/* D6EDF0 80240440 8E26002C */ lw $a2, 0x2c($s1) -/* D6EDF4 80240444 44070000 */ mfc1 $a3, $f0 -/* D6EDF8 80240448 0C019E40 */ jal guTranslateF -/* D6EDFC 8024044C 0200202D */ daddu $a0, $s0, $zero -/* D6EE00 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* D6EE04 80240454 0200282D */ daddu $a1, $s0, $zero -/* D6EE08 80240458 0C019D80 */ jal guMtxCatF -/* D6EE0C 8024045C 0080302D */ daddu $a2, $a0, $zero -/* D6EE10 80240460 24040002 */ addiu $a0, $zero, 2 -/* D6EE14 80240464 0000282D */ daddu $a1, $zero, $zero -/* D6EE18 80240468 00A0302D */ daddu $a2, $a1, $zero -/* D6EE1C 8024046C 00A0382D */ daddu $a3, $a1, $zero -/* D6EE20 80240470 27A20018 */ addiu $v0, $sp, 0x18 -/* D6EE24 80240474 0C0B7710 */ jal render_sprite -/* D6EE28 80240478 AFA20010 */ sw $v0, 0x10($sp) -/* D6EE2C 8024047C 8FBF0120 */ lw $ra, 0x120($sp) -/* D6EE30 80240480 8FB1011C */ lw $s1, 0x11c($sp) -/* D6EE34 80240484 8FB00118 */ lw $s0, 0x118($sp) -/* D6EE38 80240488 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D6EE3C 8024048C D7B60130 */ ldc1 $f22, 0x130($sp) -/* D6EE40 80240490 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D6EE44 80240494 03E00008 */ jr $ra -/* D6EE48 80240498 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_8024049C_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_8024049C_D6E9B0.s deleted file mode 100644 index 9afb83ed4e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_8024049C_D6E9B0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_D6EE4C -/* D6EE4C 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6EE50 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* D6EE54 802404A4 0080802D */ daddu $s0, $a0, $zero -/* D6EE58 802404A8 AFBF0014 */ sw $ra, 0x14($sp) -/* D6EE5C 802404AC 8E020084 */ lw $v0, 0x84($s0) -/* D6EE60 802404B0 0440000E */ bltz $v0, .L802404EC -/* D6EE64 802404B4 28420002 */ slti $v0, $v0, 2 -/* D6EE68 802404B8 1040000C */ beqz $v0, .L802404EC -/* D6EE6C 802404BC 00000000 */ nop -/* D6EE70 802404C0 3C058024 */ lui $a1, 0x8024 -/* D6EE74 802404C4 24A50500 */ addiu $a1, $a1, 0x500 -/* D6EE78 802404C8 0C048C56 */ jal bind_dynamic_entity_3 -/* D6EE7C 802404CC 0000202D */ daddu $a0, $zero, $zero -/* D6EE80 802404D0 8E03013C */ lw $v1, 0x13c($s0) -/* D6EE84 802404D4 AC620000 */ sw $v0, ($v1) -/* D6EE88 802404D8 3C03800A */ lui $v1, %hi(D_8009A650) -/* D6EE8C 802404DC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D6EE90 802404E0 8C620000 */ lw $v0, ($v1) -/* D6EE94 802404E4 34420080 */ ori $v0, $v0, 0x80 -/* D6EE98 802404E8 AC620000 */ sw $v0, ($v1) -.L802404EC: -/* D6EE9C 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* D6EEA0 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* D6EEA4 802404F4 24020002 */ addiu $v0, $zero, 2 -/* D6EEA8 802404F8 03E00008 */ jr $ra -/* D6EEAC 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_80240500_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_80240500_D6E9B0.s deleted file mode 100644 index 32da49dedb..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_80240500_D6E9B0.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_D6EEB0 -/* D6EEB0 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D6EEB4 80240504 AFB00040 */ sw $s0, 0x40($sp) -/* D6EEB8 80240508 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D6EEBC 8024050C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D6EEC0 80240510 AFB10044 */ sw $s1, 0x44($sp) -/* D6EEC4 80240514 AFBF004C */ sw $ra, 0x4c($sp) -/* D6EEC8 80240518 AFB20048 */ sw $s2, 0x48($sp) -/* D6EECC 8024051C 8E020000 */ lw $v0, ($s0) -/* D6EED0 80240520 821200BE */ lb $s2, 0xbe($s0) -/* D6EED4 80240524 30420001 */ andi $v0, $v0, 1 -/* D6EED8 80240528 10400052 */ beqz $v0, .L80240674 -/* D6EEDC 8024052C 27B10020 */ addiu $s1, $sp, 0x20 -/* D6EEE0 80240530 8E0400CC */ lw $a0, 0xcc($s0) -/* D6EEE4 80240534 0C044181 */ jal get_shadow_by_index -/* D6EEE8 80240538 00000000 */ nop -/* D6EEEC 8024053C 0C048B77 */ jal func_80122DDC -/* D6EEF0 80240540 84440008 */ lh $a0, 8($v0) -/* D6EEF4 80240544 8E050028 */ lw $a1, 0x28($s0) -/* D6EEF8 80240548 8E070030 */ lw $a3, 0x30($s0) -/* D6EEFC 8024054C 27A20030 */ addiu $v0, $sp, 0x30 -/* D6EF00 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* D6EF04 80240554 27A20034 */ addiu $v0, $sp, 0x34 -/* D6EF08 80240558 AFA20014 */ sw $v0, 0x14($sp) -/* D6EF0C 8024055C 27A20038 */ addiu $v0, $sp, 0x38 -/* D6EF10 80240560 AFA20018 */ sw $v0, 0x18($sp) -/* D6EF14 80240564 C600002C */ lwc1 $f0, 0x2c($s0) -/* D6EF18 80240568 3C04800A */ lui $a0, 0x800a -/* D6EF1C 8024056C 8484A634 */ lh $a0, -0x59cc($a0) -/* D6EF20 80240570 46000007 */ neg.s $f0, $f0 -/* D6EF24 80240574 44060000 */ mfc1 $a2, $f0 -/* D6EF28 80240578 0C00B94E */ jal get_screen_coords -/* D6EF2C 8024057C 00000000 */ nop -/* D6EF30 80240580 8E0500A4 */ lw $a1, 0xa4($s0) -/* D6EF34 80240584 3C063F80 */ lui $a2, 0x3f80 -/* D6EF38 80240588 0C0B76A3 */ jal func_802DDA8C -/* D6EF3C 8024058C 24040001 */ addiu $a0, $zero, 1 -/* D6EF40 80240590 8E020000 */ lw $v0, ($s0) -/* D6EF44 80240594 3C030002 */ lui $v1, 2 -/* D6EF48 80240598 00431024 */ and $v0, $v0, $v1 -/* D6EF4C 8024059C 54400022 */ bnel $v0, $zero, .L80240628 -/* D6EF50 802405A0 24120011 */ addiu $s2, $zero, 0x11 -/* D6EF54 802405A4 9203000E */ lbu $v1, 0xe($s0) -/* D6EF58 802405A8 3C02802E */ lui $v0, 0x802e -/* D6EF5C 802405AC 90429D71 */ lbu $v0, -0x628f($v0) -/* D6EF60 802405B0 10620018 */ beq $v1, $v0, .L80240614 -/* D6EF64 802405B4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D6EF68 802405B8 1040000B */ beqz $v0, .L802405E8 -/* D6EF6C 802405BC 24120011 */ addiu $s2, $zero, 0x11 -/* D6EF70 802405C0 24040001 */ addiu $a0, $zero, 1 -/* D6EF74 802405C4 2405FFFF */ addiu $a1, $zero, -1 -/* D6EF78 802405C8 24060007 */ addiu $a2, $zero, 7 -/* D6EF7C 802405CC 0060102D */ daddu $v0, $v1, $zero -/* D6EF80 802405D0 0000382D */ daddu $a3, $zero, $zero -/* D6EF84 802405D4 AFA00010 */ sw $zero, 0x10($sp) -/* D6EF88 802405D8 AFA00014 */ sw $zero, 0x14($sp) -/* D6EF8C 802405DC AFA0001C */ sw $zero, 0x1c($sp) -/* D6EF90 802405E0 08090183 */ j .L8024060C -/* D6EF94 802405E4 AFA20018 */ sw $v0, 0x18($sp) -.L802405E8: -/* D6EF98 802405E8 2412000D */ addiu $s2, $zero, 0xd -/* D6EF9C 802405EC 24040001 */ addiu $a0, $zero, 1 -/* D6EFA0 802405F0 2405FFFF */ addiu $a1, $zero, -1 -/* D6EFA4 802405F4 0000302D */ daddu $a2, $zero, $zero -/* D6EFA8 802405F8 00C0382D */ daddu $a3, $a2, $zero -/* D6EFAC 802405FC AFA00010 */ sw $zero, 0x10($sp) -/* D6EFB0 80240600 AFA00014 */ sw $zero, 0x14($sp) -/* D6EFB4 80240604 AFA00018 */ sw $zero, 0x18($sp) -/* D6EFB8 80240608 AFA0001C */ sw $zero, 0x1c($sp) -.L8024060C: -/* D6EFBC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D6EFC0 80240610 00000000 */ nop -.L80240614: -/* D6EFC4 80240614 9202000E */ lbu $v0, 0xe($s0) -/* D6EFC8 80240618 3C01802E */ lui $at, 0x802e -/* D6EFCC 8024061C A0229D71 */ sb $v0, -0x628f($at) -/* D6EFD0 80240620 0809018C */ j .L80240630 -/* D6EFD4 80240624 00000000 */ nop -.L80240628: -/* D6EFD8 80240628 3C01802E */ lui $at, 0x802e -/* D6EFDC 8024062C A0209D71 */ sb $zero, -0x628f($at) -.L80240630: -/* D6EFE0 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D6EFE4 80240634 3C048024 */ lui $a0, 0x8024 -/* D6EFE8 80240638 24840870 */ addiu $a0, $a0, 0x870 -/* D6EFEC 8024063C AE320000 */ sw $s2, ($s1) -/* D6EFF0 80240640 AE300008 */ sw $s0, 8($s1) -/* D6EFF4 80240644 00021023 */ negu $v0, $v0 -/* D6EFF8 80240648 AE220004 */ sw $v0, 4($s1) -/* D6EFFC 8024064C 8E020000 */ lw $v0, ($s0) -/* D6F000 80240650 3C030002 */ lui $v1, 2 -/* D6F004 80240654 00431024 */ and $v0, $v0, $v1 -/* D6F008 80240658 54400004 */ bnel $v0, $zero, .L8024066C -/* D6F00C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D6F010 80240660 3C048024 */ lui $a0, 0x8024 -/* D6F014 80240664 2484068C */ addiu $a0, $a0, 0x68c -/* D6F018 80240668 AE24000C */ sw $a0, 0xc($s1) -.L8024066C: -/* D6F01C 8024066C 0C047644 */ jal queue_render_task -/* D6F020 80240670 0220202D */ daddu $a0, $s1, $zero -.L80240674: -/* D6F024 80240674 8FBF004C */ lw $ra, 0x4c($sp) -/* D6F028 80240678 8FB20048 */ lw $s2, 0x48($sp) -/* D6F02C 8024067C 8FB10044 */ lw $s1, 0x44($sp) -/* D6F030 80240680 8FB00040 */ lw $s0, 0x40($sp) -/* D6F034 80240684 03E00008 */ jr $ra -/* D6F038 80240688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_8024068C_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_8024068C_D6E9B0.s deleted file mode 100644 index 5de64a7418..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_8024068C_D6E9B0.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_D6F03C -/* D6F03C 8024068C 3C03800A */ lui $v1, 0x800a -/* D6F040 80240690 8463A634 */ lh $v1, -0x59cc($v1) -/* D6F044 80240694 3C07BF80 */ lui $a3, 0xbf80 -/* D6F048 80240698 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D6F04C 8024069C F7B40128 */ sdc1 $f20, 0x128($sp) -/* D6F050 802406A0 4480A000 */ mtc1 $zero, $f20 -/* D6F054 802406A4 AFB1011C */ sw $s1, 0x11c($sp) -/* D6F058 802406A8 0080882D */ daddu $s1, $a0, $zero -/* D6F05C 802406AC AFB00118 */ sw $s0, 0x118($sp) -/* D6F060 802406B0 27B00098 */ addiu $s0, $sp, 0x98 -/* D6F064 802406B4 AFBF0120 */ sw $ra, 0x120($sp) -/* D6F068 802406B8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D6F06C 802406BC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D6F070 802406C0 00031080 */ sll $v0, $v1, 2 -/* D6F074 802406C4 00431021 */ addu $v0, $v0, $v1 -/* D6F078 802406C8 00021080 */ sll $v0, $v0, 2 -/* D6F07C 802406CC 00431023 */ subu $v0, $v0, $v1 -/* D6F080 802406D0 000218C0 */ sll $v1, $v0, 3 -/* D6F084 802406D4 00431021 */ addu $v0, $v0, $v1 -/* D6F088 802406D8 000210C0 */ sll $v0, $v0, 3 -/* D6F08C 802406DC 3C01800B */ lui $at, 0x800b -/* D6F090 802406E0 00220821 */ addu $at, $at, $v0 -/* D6F094 802406E4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D6F098 802406E8 4406A000 */ mfc1 $a2, $f20 -/* D6F09C 802406EC 4600B587 */ neg.s $f22, $f22 -/* D6F0A0 802406F0 4405B000 */ mfc1 $a1, $f22 -/* D6F0A4 802406F4 0200202D */ daddu $a0, $s0, $zero -/* D6F0A8 802406F8 0C019EC8 */ jal guRotateF -/* D6F0AC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) -/* D6F0B0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D6F0B4 80240704 0C00A6C9 */ jal clamp_angle -/* D6F0B8 80240708 00000000 */ nop -/* D6F0BC 8024070C 44050000 */ mfc1 $a1, $f0 -/* D6F0C0 80240710 4406A000 */ mfc1 $a2, $f20 -/* D6F0C4 80240714 4407A000 */ mfc1 $a3, $f20 -/* D6F0C8 80240718 3C013F80 */ lui $at, 0x3f80 -/* D6F0CC 8024071C 4481C000 */ mtc1 $at, $f24 -/* D6F0D0 80240720 27A40018 */ addiu $a0, $sp, 0x18 -/* D6F0D4 80240724 0C019EC8 */ jal guRotateF -/* D6F0D8 80240728 E7B80010 */ swc1 $f24, 0x10($sp) -/* D6F0DC 8024072C 0200202D */ daddu $a0, $s0, $zero -/* D6F0E0 80240730 27A50018 */ addiu $a1, $sp, 0x18 -/* D6F0E4 80240734 0C019D80 */ jal guMtxCatF -/* D6F0E8 80240738 00A0302D */ daddu $a2, $a1, $zero -/* D6F0EC 8024073C 4405B000 */ mfc1 $a1, $f22 -/* D6F0F0 80240740 4406A000 */ mfc1 $a2, $f20 -/* D6F0F4 80240744 4407C000 */ mfc1 $a3, $f24 -/* D6F0F8 80240748 0200202D */ daddu $a0, $s0, $zero -/* D6F0FC 8024074C 0C019EC8 */ jal guRotateF -/* D6F100 80240750 E7B40010 */ swc1 $f20, 0x10($sp) -/* D6F104 80240754 27A40018 */ addiu $a0, $sp, 0x18 -/* D6F108 80240758 0200282D */ daddu $a1, $s0, $zero -/* D6F10C 8024075C 0C019D80 */ jal guMtxCatF -/* D6F110 80240760 0080302D */ daddu $a2, $a0, $zero -/* D6F114 80240764 E7B40010 */ swc1 $f20, 0x10($sp) -/* D6F118 80240768 8E2500A8 */ lw $a1, 0xa8($s1) -/* D6F11C 8024076C 4406A000 */ mfc1 $a2, $f20 -/* D6F120 80240770 4407C000 */ mfc1 $a3, $f24 -/* D6F124 80240774 0C019EC8 */ jal guRotateF -/* D6F128 80240778 0200202D */ daddu $a0, $s0, $zero -/* D6F12C 8024077C 27A40018 */ addiu $a0, $sp, 0x18 -/* D6F130 80240780 0200282D */ daddu $a1, $s0, $zero -/* D6F134 80240784 0C019D80 */ jal guMtxCatF -/* D6F138 80240788 0080302D */ daddu $a2, $a0, $zero -/* D6F13C 8024078C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D6F140 80240790 3C013F36 */ lui $at, 0x3f36 -/* D6F144 80240794 3421DB6E */ ori $at, $at, 0xdb6e -/* D6F148 80240798 44810000 */ mtc1 $at, $f0 -/* D6F14C 8024079C 0200202D */ daddu $a0, $s0, $zero -/* D6F150 802407A0 44050000 */ mfc1 $a1, $f0 -/* D6F154 802407A4 3C06BF36 */ lui $a2, 0xbf36 -/* D6F158 802407A8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D6F15C 802407AC 0C019DF0 */ jal guScaleF -/* D6F160 802407B0 00A0382D */ daddu $a3, $a1, $zero -/* D6F164 802407B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D6F168 802407B8 0200282D */ daddu $a1, $s0, $zero -/* D6F16C 802407BC 0C019D80 */ jal guMtxCatF -/* D6F170 802407C0 0080302D */ daddu $a2, $a0, $zero -/* D6F174 802407C4 27B00058 */ addiu $s0, $sp, 0x58 -/* D6F178 802407C8 8E250028 */ lw $a1, 0x28($s1) -/* D6F17C 802407CC C620002C */ lwc1 $f0, 0x2c($s1) -/* D6F180 802407D0 8E270030 */ lw $a3, 0x30($s1) -/* D6F184 802407D4 46000007 */ neg.s $f0, $f0 -/* D6F188 802407D8 44060000 */ mfc1 $a2, $f0 -/* D6F18C 802407DC 0C019E40 */ jal guTranslateF -/* D6F190 802407E0 0200202D */ daddu $a0, $s0, $zero -/* D6F194 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D6F198 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D6F19C 802407EC 0C019D80 */ jal guMtxCatF -/* D6F1A0 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D6F1A4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D6F1A8 802407F8 3C0142B4 */ lui $at, 0x42b4 -/* D6F1AC 802407FC 44810000 */ mtc1 $at, $f0 -/* D6F1B0 80240800 00000000 */ nop -/* D6F1B4 80240804 4602003E */ c.le.s $f0, $f2 -/* D6F1B8 80240808 00000000 */ nop -/* D6F1BC 8024080C 4500000A */ bc1f .L80240838 -/* D6F1C0 80240810 24040001 */ addiu $a0, $zero, 1 -/* D6F1C4 80240814 3C014387 */ lui $at, 0x4387 -/* D6F1C8 80240818 44810000 */ mtc1 $at, $f0 -/* D6F1CC 8024081C 00000000 */ nop -/* D6F1D0 80240820 4600103C */ c.lt.s $f2, $f0 -/* D6F1D4 80240824 00000000 */ nop -/* D6F1D8 80240828 45000004 */ bc1f .L8024083C -/* D6F1DC 8024082C 27A20018 */ addiu $v0, $sp, 0x18 -/* D6F1E0 80240830 3C041000 */ lui $a0, 0x1000 -/* D6F1E4 80240834 34840001 */ ori $a0, $a0, 1 -.L80240838: -/* D6F1E8 80240838 27A20018 */ addiu $v0, $sp, 0x18 -.L8024083C: -/* D6F1EC 8024083C 0000282D */ daddu $a1, $zero, $zero -/* D6F1F0 80240840 00A0302D */ daddu $a2, $a1, $zero -/* D6F1F4 80240844 00A0382D */ daddu $a3, $a1, $zero -/* D6F1F8 80240848 0C0B7710 */ jal render_sprite -/* D6F1FC 8024084C AFA20010 */ sw $v0, 0x10($sp) -/* D6F200 80240850 8FBF0120 */ lw $ra, 0x120($sp) -/* D6F204 80240854 8FB1011C */ lw $s1, 0x11c($sp) -/* D6F208 80240858 8FB00118 */ lw $s0, 0x118($sp) -/* D6F20C 8024085C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D6F210 80240860 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D6F214 80240864 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D6F218 80240868 03E00008 */ jr $ra -/* D6F21C 8024086C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_80240870_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_80240870_D6E9B0.s deleted file mode 100644 index 60bafe9fe0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_80240870_D6E9B0.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_D6F220 -/* D6F220 80240870 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D6F224 80240874 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D6F228 80240878 4480B000 */ mtc1 $zero, $f22 -/* D6F22C 8024087C AFB10134 */ sw $s1, 0x134($sp) -/* D6F230 80240880 0080882D */ daddu $s1, $a0, $zero -/* D6F234 80240884 AFB3013C */ sw $s3, 0x13c($sp) -/* D6F238 80240888 0000982D */ daddu $s3, $zero, $zero -/* D6F23C 8024088C AFB60148 */ sw $s6, 0x148($sp) -/* D6F240 80240890 3C16800B */ lui $s6, %hi(gCameras) -/* D6F244 80240894 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D6F248 80240898 AFB50144 */ sw $s5, 0x144($sp) -/* D6F24C 8024089C 241500FF */ addiu $s5, $zero, 0xff -/* D6F250 802408A0 AFB00130 */ sw $s0, 0x130($sp) -/* D6F254 802408A4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D6F258 802408A8 AFB20138 */ sw $s2, 0x138($sp) -/* D6F25C 802408AC 27B20060 */ addiu $s2, $sp, 0x60 -/* D6F260 802408B0 AFB40140 */ sw $s4, 0x140($sp) -/* D6F264 802408B4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D6F268 802408B8 AFBF014C */ sw $ra, 0x14c($sp) -/* D6F26C 802408BC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D6F270 802408C0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D6F274 802408C4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D6F278 802408C8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D6F27C 802408CC F7B40150 */ sdc1 $f20, 0x150($sp) -.L802408D0: -/* D6F280 802408D0 3C03800A */ lui $v1, 0x800a -/* D6F284 802408D4 8463A634 */ lh $v1, -0x59cc($v1) -/* D6F288 802408D8 00031080 */ sll $v0, $v1, 2 -/* D6F28C 802408DC 00431021 */ addu $v0, $v0, $v1 -/* D6F290 802408E0 00021080 */ sll $v0, $v0, 2 -/* D6F294 802408E4 00431023 */ subu $v0, $v0, $v1 -/* D6F298 802408E8 000218C0 */ sll $v1, $v0, 3 -/* D6F29C 802408EC 00431021 */ addu $v0, $v0, $v1 -/* D6F2A0 802408F0 000210C0 */ sll $v0, $v0, 3 -/* D6F2A4 802408F4 00561021 */ addu $v0, $v0, $s6 -/* D6F2A8 802408F8 C440006C */ lwc1 $f0, 0x6c($v0) -/* D6F2AC 802408FC 16600065 */ bnez $s3, .L80240A94 -/* D6F2B0 80240900 46000507 */ neg.s $f20, $f0 -/* D6F2B4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D6F2B8 80240908 3C0142B4 */ lui $at, 0x42b4 -/* D6F2BC 8024090C 44810000 */ mtc1 $at, $f0 -/* D6F2C0 80240910 00000000 */ nop -/* D6F2C4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D6F2C8 80240918 00000000 */ nop -/* D6F2CC 8024091C 4500000A */ bc1f .L80240948 -/* D6F2D0 80240920 00000000 */ nop -/* D6F2D4 80240924 3C014334 */ lui $at, 0x4334 -/* D6F2D8 80240928 44812000 */ mtc1 $at, $f4 -/* D6F2DC 8024092C 00000000 */ nop -/* D6F2E0 80240930 4604103E */ c.le.s $f2, $f4 -/* D6F2E4 80240934 00000000 */ nop -/* D6F2E8 80240938 45000003 */ bc1f .L80240948 -/* D6F2EC 8024093C 00000000 */ nop -/* D6F2F0 80240940 08090276 */ j .L802409D8 -/* D6F2F4 80240944 46022501 */ sub.s $f20, $f4, $f2 -.L80240948: -/* D6F2F8 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D6F2FC 8024094C 3C014334 */ lui $at, 0x4334 -/* D6F300 80240950 44812000 */ mtc1 $at, $f4 -/* D6F304 80240954 00000000 */ nop -/* D6F308 80240958 4600203C */ c.lt.s $f4, $f0 -/* D6F30C 8024095C 00000000 */ nop -/* D6F310 80240960 4500000C */ bc1f .L80240994 -/* D6F314 80240964 00000000 */ nop -/* D6F318 80240968 3C014387 */ lui $at, 0x4387 -/* D6F31C 8024096C 44812000 */ mtc1 $at, $f4 -/* D6F320 80240970 00000000 */ nop -/* D6F324 80240974 4604003E */ c.le.s $f0, $f4 -/* D6F328 80240978 00000000 */ nop -/* D6F32C 8024097C 45000008 */ bc1f .L802409A0 -/* D6F330 80240980 00000000 */ nop -/* D6F334 80240984 3C014334 */ lui $at, 0x4334 -/* D6F338 80240988 44812000 */ mtc1 $at, $f4 -/* D6F33C 8024098C 08090276 */ j .L802409D8 -/* D6F340 80240990 46040501 */ sub.s $f20, $f0, $f4 -.L80240994: -/* D6F344 80240994 3C014387 */ lui $at, 0x4387 -/* D6F348 80240998 44812000 */ mtc1 $at, $f4 -/* D6F34C 8024099C 00000000 */ nop -.L802409A0: -/* D6F350 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D6F354 802409A4 00000000 */ nop -/* D6F358 802409A8 4500000A */ bc1f .L802409D4 -/* D6F35C 802409AC 00000000 */ nop -/* D6F360 802409B0 3C0143B4 */ lui $at, 0x43b4 -/* D6F364 802409B4 44811000 */ mtc1 $at, $f2 -/* D6F368 802409B8 00000000 */ nop -/* D6F36C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D6F370 802409C0 00000000 */ nop -/* D6F374 802409C4 45000003 */ bc1f .L802409D4 -/* D6F378 802409C8 00000000 */ nop -/* D6F37C 802409CC 08090276 */ j .L802409D8 -/* D6F380 802409D0 46001501 */ sub.s $f20, $f2, $f0 -.L802409D4: -/* D6F384 802409D4 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L802409D8: -/* D6F388 802409D8 3C0141C8 */ lui $at, 0x41c8 -/* D6F38C 802409DC 44810000 */ mtc1 $at, $f0 -/* D6F390 802409E0 00000000 */ nop -/* D6F394 802409E4 4600A003 */ div.s $f0, $f20, $f0 -/* D6F398 802409E8 4600010D */ trunc.w.s $f4, $f0 -/* D6F39C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D6F3A0 802409F0 00000000 */ nop -/* D6F3A4 802409F4 00071100 */ sll $v0, $a3, 4 -/* D6F3A8 802409F8 00471023 */ subu $v0, $v0, $a3 -/* D6F3AC 802409FC 00021080 */ sll $v0, $v0, 2 -/* D6F3B0 80240A00 02A23823 */ subu $a3, $s5, $v0 -/* D6F3B4 80240A04 28E20064 */ slti $v0, $a3, 0x64 -/* D6F3B8 80240A08 54400001 */ bnel $v0, $zero, .L80240A10 -/* D6F3BC 80240A0C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A10: -/* D6F3C0 80240A10 24040001 */ addiu $a0, $zero, 1 -/* D6F3C4 80240A14 2405FFFF */ addiu $a1, $zero, -1 -/* D6F3C8 80240A18 24060006 */ addiu $a2, $zero, 6 -/* D6F3CC 80240A1C AFA70010 */ sw $a3, 0x10($sp) -/* D6F3D0 80240A20 AFA70014 */ sw $a3, 0x14($sp) -/* D6F3D4 80240A24 AFB50018 */ sw $s5, 0x18($sp) -/* D6F3D8 80240A28 0C0B77B9 */ jal func_802DDEE4 -/* D6F3DC 80240A2C AFA0001C */ sw $zero, 0x1c($sp) -/* D6F3E0 80240A30 4405A000 */ mfc1 $a1, $f20 -/* D6F3E4 80240A34 4406B000 */ mfc1 $a2, $f22 -/* D6F3E8 80240A38 3C07BF80 */ lui $a3, 0xbf80 -/* D6F3EC 80240A3C 0200202D */ daddu $a0, $s0, $zero -/* D6F3F0 80240A40 0C019EC8 */ jal guRotateF -/* D6F3F4 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D6F3F8 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D6F3FC 80240A4C 0C00A6C9 */ jal clamp_angle -/* D6F400 80240A50 00000000 */ nop -/* D6F404 80240A54 44050000 */ mfc1 $a1, $f0 -/* D6F408 80240A58 4406B000 */ mfc1 $a2, $f22 -/* D6F40C 80240A5C 4407B000 */ mfc1 $a3, $f22 -/* D6F410 80240A60 3C013F80 */ lui $at, 0x3f80 -/* D6F414 80240A64 44812000 */ mtc1 $at, $f4 -/* D6F418 80240A68 27A40020 */ addiu $a0, $sp, 0x20 -/* D6F41C 80240A6C 0C019EC8 */ jal guRotateF -/* D6F420 80240A70 E7A40010 */ swc1 $f4, 0x10($sp) -/* D6F424 80240A74 0200202D */ daddu $a0, $s0, $zero -/* D6F428 80240A78 27A50020 */ addiu $a1, $sp, 0x20 -/* D6F42C 80240A7C 0C019D80 */ jal guMtxCatF -/* D6F430 80240A80 00A0302D */ daddu $a2, $a1, $zero -/* D6F434 80240A84 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D6F438 80240A88 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D6F43C 80240A8C 080902D6 */ j .L80240B58 -/* D6F440 80240A90 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240A94: -/* D6F444 80240A94 0260202D */ daddu $a0, $s3, $zero -/* D6F448 80240A98 27A50120 */ addiu $a1, $sp, 0x120 -/* D6F44C 80240A9C 27A60124 */ addiu $a2, $sp, 0x124 -/* D6F450 80240AA0 0C03964E */ jal func_800E5938 -/* D6F454 80240AA4 27A70128 */ addiu $a3, $sp, 0x128 -/* D6F458 80240AA8 8FA60124 */ lw $a2, 0x124($sp) -/* D6F45C 80240AAC 3C028000 */ lui $v0, 0x8000 -/* D6F460 80240AB0 14C20004 */ bne $a2, $v0, .L80240AC4 -/* D6F464 80240AB4 46000606 */ mov.s $f24, $f0 -/* D6F468 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D6F46C 80240ABC 080902B5 */ j .L80240AD4 -/* D6F470 80240AC0 24040001 */ addiu $a0, $zero, 1 -.L80240AC4: -/* D6F474 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D6F478 80240AC8 00000000 */ nop -/* D6F47C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D6F480 80240AD0 24040001 */ addiu $a0, $zero, 1 -.L80240AD4: -/* D6F484 80240AD4 2405FFFF */ addiu $a1, $zero, -1 -/* D6F488 80240AD8 24060007 */ addiu $a2, $zero, 7 -/* D6F48C 80240ADC 0000382D */ daddu $a3, $zero, $zero -/* D6F490 80240AE0 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D6F494 80240AE4 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D6F498 80240AE8 24020040 */ addiu $v0, $zero, 0x40 -/* D6F49C 80240AEC AFA00010 */ sw $zero, 0x10($sp) -/* D6F4A0 80240AF0 AFA00014 */ sw $zero, 0x14($sp) -/* D6F4A4 80240AF4 AFA20018 */ sw $v0, 0x18($sp) -/* D6F4A8 80240AF8 0C0B77B9 */ jal func_802DDEE4 -/* D6F4AC 80240AFC AFA0001C */ sw $zero, 0x1c($sp) -/* D6F4B0 80240B00 4405A000 */ mfc1 $a1, $f20 -/* D6F4B4 80240B04 4406B000 */ mfc1 $a2, $f22 -/* D6F4B8 80240B08 3C07BF80 */ lui $a3, 0xbf80 -/* D6F4BC 80240B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* D6F4C0 80240B10 0C019EC8 */ jal guRotateF -/* D6F4C4 80240B14 E7B60010 */ swc1 $f22, 0x10($sp) -/* D6F4C8 80240B18 4405A000 */ mfc1 $a1, $f20 -/* D6F4CC 80240B1C 4406B000 */ mfc1 $a2, $f22 -/* D6F4D0 80240B20 3C07BF80 */ lui $a3, 0xbf80 -/* D6F4D4 80240B24 0200202D */ daddu $a0, $s0, $zero -/* D6F4D8 80240B28 0C019EC8 */ jal guRotateF -/* D6F4DC 80240B2C E7B60010 */ swc1 $f22, 0x10($sp) -/* D6F4E0 80240B30 4405C000 */ mfc1 $a1, $f24 -/* D6F4E4 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D6F4E8 80240B38 3C073F80 */ lui $a3, 0x3f80 -/* D6F4EC 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D6F4F0 80240B40 0C019EC8 */ jal guRotateF -/* D6F4F4 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D6F4F8 80240B48 0200202D */ daddu $a0, $s0, $zero -/* D6F4FC 80240B4C 27A50020 */ addiu $a1, $sp, 0x20 -/* D6F500 80240B50 0C019D80 */ jal guMtxCatF -/* D6F504 80240B54 00A0302D */ daddu $a2, $a1, $zero -.L80240B58: -/* D6F508 80240B58 862200B0 */ lh $v0, 0xb0($s1) -/* D6F50C 80240B5C 3C013F00 */ lui $at, 0x3f00 -/* D6F510 80240B60 44812000 */ mtc1 $at, $f4 -/* D6F514 80240B64 00021023 */ negu $v0, $v0 -/* D6F518 80240B68 44820000 */ mtc1 $v0, $f0 -/* D6F51C 80240B6C 00000000 */ nop -/* D6F520 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* D6F524 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D6F528 80240B78 00000000 */ nop -/* D6F52C 80240B7C 4405B000 */ mfc1 $a1, $f22 -/* D6F530 80240B80 4407B000 */ mfc1 $a3, $f22 -/* D6F534 80240B84 44062000 */ mfc1 $a2, $f4 -/* D6F538 80240B88 0C019E40 */ jal guTranslateF -/* D6F53C 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* D6F540 80240B90 0240202D */ daddu $a0, $s2, $zero -/* D6F544 80240B94 27A50020 */ addiu $a1, $sp, 0x20 -/* D6F548 80240B98 0C019D80 */ jal guMtxCatF -/* D6F54C 80240B9C 00A0302D */ daddu $a2, $a1, $zero -/* D6F550 80240BA0 4405A000 */ mfc1 $a1, $f20 -/* D6F554 80240BA4 4406B000 */ mfc1 $a2, $f22 -/* D6F558 80240BA8 3C073F80 */ lui $a3, 0x3f80 -/* D6F55C 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* D6F560 80240BB0 0C019EC8 */ jal guRotateF -/* D6F564 80240BB4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D6F568 80240BB8 27A40020 */ addiu $a0, $sp, 0x20 -/* D6F56C 80240BBC 0200282D */ daddu $a1, $s0, $zero -/* D6F570 80240BC0 0C019D80 */ jal guMtxCatF -/* D6F574 80240BC4 0080302D */ daddu $a2, $a0, $zero -/* D6F578 80240BC8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D6F57C 80240BCC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D6F580 80240BD0 4406B000 */ mfc1 $a2, $f22 -/* D6F584 80240BD4 3C073F80 */ lui $a3, 0x3f80 -/* D6F588 80240BD8 0C019EC8 */ jal guRotateF -/* D6F58C 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D6F590 80240BE0 27A40020 */ addiu $a0, $sp, 0x20 -/* D6F594 80240BE4 0200282D */ daddu $a1, $s0, $zero -/* D6F598 80240BE8 0C019D80 */ jal guMtxCatF -/* D6F59C 80240BEC 0080302D */ daddu $a2, $a0, $zero -/* D6F5A0 80240BF0 862200B0 */ lh $v0, 0xb0($s1) -/* D6F5A4 80240BF4 3C013F00 */ lui $at, 0x3f00 -/* D6F5A8 80240BF8 44812000 */ mtc1 $at, $f4 -/* D6F5AC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D6F5B0 80240C00 00000000 */ nop -/* D6F5B4 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* D6F5B8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D6F5BC 80240C0C 00000000 */ nop -/* D6F5C0 80240C10 4405B000 */ mfc1 $a1, $f22 -/* D6F5C4 80240C14 4407B000 */ mfc1 $a3, $f22 -/* D6F5C8 80240C18 44062000 */ mfc1 $a2, $f4 -/* D6F5CC 80240C1C 0C019E40 */ jal guTranslateF -/* D6F5D0 80240C20 0240202D */ daddu $a0, $s2, $zero -/* D6F5D4 80240C24 27A40020 */ addiu $a0, $sp, 0x20 -/* D6F5D8 80240C28 0240282D */ daddu $a1, $s2, $zero -/* D6F5DC 80240C2C 0C019D80 */ jal guMtxCatF -/* D6F5E0 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D6F5E4 80240C34 3C013F36 */ lui $at, 0x3f36 -/* D6F5E8 80240C38 3421DB6E */ ori $at, $at, 0xdb6e -/* D6F5EC 80240C3C 44810000 */ mtc1 $at, $f0 -/* D6F5F0 80240C40 0280202D */ daddu $a0, $s4, $zero -/* D6F5F4 80240C44 44050000 */ mfc1 $a1, $f0 -/* D6F5F8 80240C48 3C06BF36 */ lui $a2, 0xbf36 -/* D6F5FC 80240C4C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D6F600 80240C50 0C019DF0 */ jal guScaleF -/* D6F604 80240C54 00A0382D */ daddu $a3, $a1, $zero -/* D6F608 80240C58 27A40020 */ addiu $a0, $sp, 0x20 -/* D6F60C 80240C5C 0280282D */ daddu $a1, $s4, $zero -/* D6F610 80240C60 0C019D80 */ jal guMtxCatF -/* D6F614 80240C64 0080302D */ daddu $a2, $a0, $zero -/* D6F618 80240C68 4600D687 */ neg.s $f26, $f26 -/* D6F61C 80240C6C 4405F000 */ mfc1 $a1, $f30 -/* D6F620 80240C70 4407E000 */ mfc1 $a3, $f28 -/* D6F624 80240C74 4406D000 */ mfc1 $a2, $f26 -/* D6F628 80240C78 0C019E40 */ jal guTranslateF -/* D6F62C 80240C7C 0240202D */ daddu $a0, $s2, $zero -/* D6F630 80240C80 27A40020 */ addiu $a0, $sp, 0x20 -/* D6F634 80240C84 0240282D */ daddu $a1, $s2, $zero -/* D6F638 80240C88 0C019D80 */ jal guMtxCatF -/* D6F63C 80240C8C 0080302D */ daddu $a2, $a0, $zero -/* D6F640 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D6F644 80240C94 3C0142B4 */ lui $at, 0x42b4 -/* D6F648 80240C98 44810000 */ mtc1 $at, $f0 -/* D6F64C 80240C9C 00000000 */ nop -/* D6F650 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D6F654 80240CA4 00000000 */ nop -/* D6F658 80240CA8 4500000A */ bc1f .L80240CD4 -/* D6F65C 80240CAC 24040001 */ addiu $a0, $zero, 1 -/* D6F660 80240CB0 3C014387 */ lui $at, 0x4387 -/* D6F664 80240CB4 44812000 */ mtc1 $at, $f4 -/* D6F668 80240CB8 00000000 */ nop -/* D6F66C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D6F670 80240CC0 00000000 */ nop -/* D6F674 80240CC4 45000004 */ bc1f .L80240CD8 -/* D6F678 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 -/* D6F67C 80240CCC 3C041000 */ lui $a0, 0x1000 -/* D6F680 80240CD0 34840001 */ ori $a0, $a0, 1 -.L80240CD4: -/* D6F684 80240CD4 27A20020 */ addiu $v0, $sp, 0x20 -.L80240CD8: -/* D6F688 80240CD8 AFA20010 */ sw $v0, 0x10($sp) -/* D6F68C 80240CDC 0000282D */ daddu $a1, $zero, $zero -/* D6F690 80240CE0 00A0302D */ daddu $a2, $a1, $zero -/* D6F694 80240CE4 0C0B7710 */ jal render_sprite -/* D6F698 80240CE8 00A0382D */ daddu $a3, $a1, $zero -/* D6F69C 80240CEC 26730001 */ addiu $s3, $s3, 1 -/* D6F6A0 80240CF0 2A620002 */ slti $v0, $s3, 2 -/* D6F6A4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D6F6A8 80240CF8 00000000 */ nop -/* D6F6AC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) -/* D6F6B0 80240D00 8FB60148 */ lw $s6, 0x148($sp) -/* D6F6B4 80240D04 8FB50144 */ lw $s5, 0x144($sp) -/* D6F6B8 80240D08 8FB40140 */ lw $s4, 0x140($sp) -/* D6F6BC 80240D0C 8FB3013C */ lw $s3, 0x13c($sp) -/* D6F6C0 80240D10 8FB20138 */ lw $s2, 0x138($sp) -/* D6F6C4 80240D14 8FB10134 */ lw $s1, 0x134($sp) -/* D6F6C8 80240D18 8FB00130 */ lw $s0, 0x130($sp) -/* D6F6CC 80240D1C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D6F6D0 80240D20 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D6F6D4 80240D24 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D6F6D8 80240D28 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D6F6DC 80240D2C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D6F6E0 80240D30 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D6F6E4 80240D34 03E00008 */ jr $ra -/* D6F6E8 80240D38 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_80240D3C_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_80240D3C_D6E9B0.s deleted file mode 100644 index a4c1ccaee8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_80240D3C_D6E9B0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_D6F6EC -/* D6F6EC 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6F6F0 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D6F6F4 80240D44 0080802D */ daddu $s0, $a0, $zero -/* D6F6F8 80240D48 AFBF0014 */ sw $ra, 0x14($sp) -/* D6F6FC 80240D4C 8E020088 */ lw $v0, 0x88($s0) -/* D6F700 80240D50 14400017 */ bnez $v0, .L80240DB0 -/* D6F704 80240D54 24020001 */ addiu $v0, $zero, 1 -/* D6F708 80240D58 8E030084 */ lw $v1, 0x84($s0) -/* D6F70C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D6F710 80240D60 00000000 */ nop -/* D6F714 80240D64 28620002 */ slti $v0, $v1, 2 -/* D6F718 80240D68 50400005 */ beql $v0, $zero, .L80240D80 -/* D6F71C 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* D6F720 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D6F724 80240D74 00000000 */ nop -/* D6F728 80240D78 08090378 */ j .L80240DE0 -/* D6F72C 80240D7C 00000000 */ nop -.L80240D80: -/* D6F730 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D6F734 80240D84 00000000 */ nop -/* D6F738 80240D88 08090378 */ j .L80240DE0 -/* D6F73C 80240D8C 00000000 */ nop -.L80240D90: -/* D6F740 80240D90 3C048024 */ lui $a0, 0x8024 -/* D6F744 80240D94 24840E84 */ addiu $a0, $a0, 0xe84 -/* D6F748 80240D98 08090374 */ j .L80240DD0 -/* D6F74C 80240D9C 00000000 */ nop -.L80240DA0: -/* D6F750 80240DA0 3C048024 */ lui $a0, 0x8024 -/* D6F754 80240DA4 24840EEC */ addiu $a0, $a0, 0xeec -/* D6F758 80240DA8 08090374 */ j .L80240DD0 -/* D6F75C 80240DAC 00000000 */ nop -.L80240DB0: -/* D6F760 80240DB0 8E020084 */ lw $v0, 0x84($s0) -/* D6F764 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D6F768 80240DB8 00000000 */ nop -/* D6F76C 80240DBC 28420002 */ slti $v0, $v0, 2 -/* D6F770 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D6F774 80240DC4 00000000 */ nop -.L80240DC8: -/* D6F778 80240DC8 3C048024 */ lui $a0, 0x8024 -/* D6F77C 80240DCC 24840EB8 */ addiu $a0, $a0, 0xeb8 -.L80240DD0: -/* D6F780 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 -/* D6F784 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* D6F788 80240DD8 8E03013C */ lw $v1, 0x13c($s0) -/* D6F78C 80240DDC AC620004 */ sw $v0, 4($v1) -.L80240DE0: -/* D6F790 80240DE0 0C00EAD2 */ jal get_npc_safe -/* D6F794 80240DE4 2404FFFC */ addiu $a0, $zero, -4 -/* D6F798 80240DE8 0040282D */ daddu $a1, $v0, $zero -/* D6F79C 80240DEC 10A00021 */ beqz $a1, .L80240E74 -/* D6F7A0 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* D6F7A4 80240DF4 8E020088 */ lw $v0, 0x88($s0) -/* D6F7A8 80240DF8 14400014 */ bnez $v0, .L80240E4C -/* D6F7AC 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* D6F7B0 80240E00 8E040084 */ lw $a0, 0x84($s0) -/* D6F7B4 80240E04 10820016 */ beq $a0, $v0, .L80240E60 -/* D6F7B8 80240E08 28820002 */ slti $v0, $a0, 2 -/* D6F7BC 80240E0C 10400005 */ beqz $v0, .L80240E24 -/* D6F7C0 80240E10 24020002 */ addiu $v0, $zero, 2 -/* D6F7C4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D6F7C8 80240E18 00000000 */ nop -/* D6F7CC 80240E1C 0809039D */ j .L80240E74 -/* D6F7D0 80240E20 00000000 */ nop -.L80240E24: -/* D6F7D4 80240E24 10820006 */ beq $a0, $v0, .L80240E40 -/* D6F7D8 80240E28 24020002 */ addiu $v0, $zero, 2 -/* D6F7DC 80240E2C 0809039D */ j .L80240E74 -/* D6F7E0 80240E30 00000000 */ nop -.L80240E34: -/* D6F7E4 80240E34 8CA20000 */ lw $v0, ($a1) -/* D6F7E8 80240E38 0809039A */ j .L80240E68 -/* D6F7EC 80240E3C 3C03000A */ lui $v1, 0xa -.L80240E40: -/* D6F7F0 80240E40 8CA20000 */ lw $v0, ($a1) -/* D6F7F4 80240E44 0809039A */ j .L80240E68 -/* D6F7F8 80240E48 3C030002 */ lui $v1, 2 -.L80240E4C: -/* D6F7FC 80240E4C 8E020084 */ lw $v0, 0x84($s0) -/* D6F800 80240E50 04400007 */ bltz $v0, .L80240E70 -/* D6F804 80240E54 28420002 */ slti $v0, $v0, 2 -/* D6F808 80240E58 10400006 */ beqz $v0, .L80240E74 -/* D6F80C 80240E5C 24020002 */ addiu $v0, $zero, 2 -.L80240E60: -/* D6F810 80240E60 8CA20000 */ lw $v0, ($a1) -/* D6F814 80240E64 3C030008 */ lui $v1, 8 -.L80240E68: -/* D6F818 80240E68 00431025 */ or $v0, $v0, $v1 -/* D6F81C 80240E6C ACA20000 */ sw $v0, ($a1) -.L80240E70: -/* D6F820 80240E70 24020002 */ addiu $v0, $zero, 2 -.L80240E74: -/* D6F824 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* D6F828 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* D6F82C 80240E7C 03E00008 */ jr $ra -/* D6F830 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_80240E84_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_80240E84_D6E9B0.s deleted file mode 100644 index 20f27efd06..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_80240E84_D6E9B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D6F834 -/* D6F834 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6F838 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D6F83C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D6F840 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D6F844 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D6F848 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D6F84C 80240E9C 3C03000A */ lui $v1, 0xa -/* D6F850 80240EA0 8C820000 */ lw $v0, ($a0) -/* D6F854 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D6F858 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D6F85C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D6F860 80240EB0 03E00008 */ jr $ra -/* D6F864 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_80240EB8_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_80240EB8_D6E9B0.s deleted file mode 100644 index 239337dd86..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_80240EB8_D6E9B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D6F868 -/* D6F868 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6F86C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D6F870 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D6F874 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D6F878 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D6F87C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D6F880 80240ED0 3C030008 */ lui $v1, 8 -/* D6F884 80240ED4 8C820000 */ lw $v0, ($a0) -/* D6F888 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D6F88C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D6F890 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D6F894 80240EE4 03E00008 */ jr $ra -/* D6F898 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_80240EEC_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_80240EEC_D6E9B0.s deleted file mode 100644 index c99f84b5c1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_80240EEC_D6E9B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D6F89C -/* D6F89C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6F8A0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D6F8A4 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D6F8A8 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D6F8AC 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D6F8B0 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D6F8B4 80240F04 3C030002 */ lui $v1, 2 -/* D6F8B8 80240F08 8C820000 */ lw $v0, ($a0) -/* D6F8BC 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D6F8C0 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D6F8C4 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D6F8C8 80240F18 03E00008 */ jr $ra -/* D6F8CC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_80240F20_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_80240F20_D6E9B0.s deleted file mode 100644 index dfde9eb3d8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_80240F20_D6E9B0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D6F8D0 -/* D6F8D0 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D6F8D4 80240F24 AFB10014 */ sw $s1, 0x14($sp) -/* D6F8D8 80240F28 0080882D */ daddu $s1, $a0, $zero -/* D6F8DC 80240F2C AFBF0018 */ sw $ra, 0x18($sp) -/* D6F8E0 80240F30 AFB00010 */ sw $s0, 0x10($sp) -/* D6F8E4 80240F34 8E30000C */ lw $s0, 0xc($s1) -/* D6F8E8 80240F38 8E050000 */ lw $a1, ($s0) -/* D6F8EC 80240F3C 0C0B1EAF */ jal get_variable -/* D6F8F0 80240F40 26100004 */ addiu $s0, $s0, 4 -/* D6F8F4 80240F44 0C00EAD2 */ jal get_npc_safe -/* D6F8F8 80240F48 0040202D */ daddu $a0, $v0, $zero -/* D6F8FC 80240F4C 10400005 */ beqz $v0, .L80240F64 -/* D6F900 80240F50 00000000 */ nop -/* D6F904 80240F54 8E050000 */ lw $a1, ($s0) -/* D6F908 80240F58 844600A8 */ lh $a2, 0xa8($v0) -/* D6F90C 80240F5C 0C0B2026 */ jal set_variable -/* D6F910 80240F60 0220202D */ daddu $a0, $s1, $zero -.L80240F64: -/* D6F914 80240F64 8FBF0018 */ lw $ra, 0x18($sp) -/* D6F918 80240F68 8FB10014 */ lw $s1, 0x14($sp) -/* D6F91C 80240F6C 8FB00010 */ lw $s0, 0x10($sp) -/* D6F920 80240F70 24020002 */ addiu $v0, $zero, 2 -/* D6F924 80240F74 03E00008 */ jr $ra -/* D6F928 80240F78 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_80240F7C_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_80240F7C_D6E9B0.s deleted file mode 100644 index e9c2b0c0e7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_80240F7C_D6E9B0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F7C_D6F92C -/* D6F92C 80240F7C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D6F930 80240F80 AFB10014 */ sw $s1, 0x14($sp) -/* D6F934 80240F84 0080882D */ daddu $s1, $a0, $zero -/* D6F938 80240F88 AFBF0024 */ sw $ra, 0x24($sp) -/* D6F93C 80240F8C AFB40020 */ sw $s4, 0x20($sp) -/* D6F940 80240F90 AFB3001C */ sw $s3, 0x1c($sp) -/* D6F944 80240F94 AFB20018 */ sw $s2, 0x18($sp) -/* D6F948 80240F98 AFB00010 */ sw $s0, 0x10($sp) -/* D6F94C 80240F9C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* D6F950 80240FA0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* D6F954 80240FA4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* D6F958 80240FA8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* D6F95C 80240FAC F7B40028 */ sdc1 $f20, 0x28($sp) -/* D6F960 80240FB0 8E30000C */ lw $s0, 0xc($s1) -/* D6F964 80240FB4 8E130000 */ lw $s3, ($s0) -/* D6F968 80240FB8 26100004 */ addiu $s0, $s0, 4 -/* D6F96C 80240FBC 0C0B1EAF */ jal get_variable -/* D6F970 80240FC0 0260282D */ daddu $a1, $s3, $zero -/* D6F974 80240FC4 4482E000 */ mtc1 $v0, $f28 -/* D6F978 80240FC8 00000000 */ nop -/* D6F97C 80240FCC 4680E720 */ cvt.s.w $f28, $f28 -/* D6F980 80240FD0 8E140000 */ lw $s4, ($s0) -/* D6F984 80240FD4 26100004 */ addiu $s0, $s0, 4 -/* D6F988 80240FD8 0220202D */ daddu $a0, $s1, $zero -/* D6F98C 80240FDC 0C0B1EAF */ jal get_variable -/* D6F990 80240FE0 0280282D */ daddu $a1, $s4, $zero -/* D6F994 80240FE4 4482D000 */ mtc1 $v0, $f26 -/* D6F998 80240FE8 00000000 */ nop -/* D6F99C 80240FEC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D6F9A0 80240FF0 8E100000 */ lw $s0, ($s0) -/* D6F9A4 80240FF4 0220202D */ daddu $a0, $s1, $zero -/* D6F9A8 80240FF8 0C0B1EAF */ jal get_variable -/* D6F9AC 80240FFC 0200282D */ daddu $a1, $s0, $zero -/* D6F9B0 80241000 4482C000 */ mtc1 $v0, $f24 -/* D6F9B4 80241004 00000000 */ nop -/* D6F9B8 80241008 4680C620 */ cvt.s.w $f24, $f24 -/* D6F9BC 8024100C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* D6F9C0 80241010 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* D6F9C4 80241014 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D6F9C8 80241018 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D6F9CC 8024101C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* D6F9D0 80241020 44800000 */ mtc1 $zero, $f0 -/* D6F9D4 80241024 00031080 */ sll $v0, $v1, 2 -/* D6F9D8 80241028 00431021 */ addu $v0, $v0, $v1 -/* D6F9DC 8024102C 00021080 */ sll $v0, $v0, 2 -/* D6F9E0 80241030 00431023 */ subu $v0, $v0, $v1 -/* D6F9E4 80241034 000218C0 */ sll $v1, $v0, 3 -/* D6F9E8 80241038 00431021 */ addu $v0, $v0, $v1 -/* D6F9EC 8024103C 000210C0 */ sll $v0, $v0, 3 -/* D6F9F0 80241040 46001032 */ c.eq.s $f2, $f0 -/* D6F9F4 80241044 3C01800B */ lui $at, 0x800b -/* D6F9F8 80241048 00220821 */ addu $at, $at, $v0 -/* D6F9FC 8024104C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D6FA00 80241050 45000005 */ bc1f .L80241068 -/* D6FA04 80241054 00000000 */ nop -/* D6FA08 80241058 3C0142C8 */ lui $at, 0x42c8 -/* D6FA0C 8024105C 44810000 */ mtc1 $at, $f0 -/* D6FA10 80241060 0809041E */ j .L80241078 -/* D6FA14 80241064 4600B581 */ sub.s $f22, $f22, $f0 -.L80241068: -/* D6FA18 80241068 3C0142C8 */ lui $at, 0x42c8 -/* D6FA1C 8024106C 44810000 */ mtc1 $at, $f0 -/* D6FA20 80241070 00000000 */ nop -/* D6FA24 80241074 4600B580 */ add.s $f22, $f22, $f0 -.L80241078: -/* D6FA28 80241078 0C00A6C9 */ jal clamp_angle -/* D6FA2C 8024107C 4600B306 */ mov.s $f12, $f22 -/* D6FA30 80241080 46000586 */ mov.s $f22, $f0 -/* D6FA34 80241084 3C014170 */ lui $at, 0x4170 -/* D6FA38 80241088 4481A000 */ mtc1 $at, $f20 -/* D6FA3C 8024108C 0C00A8BB */ jal sin_deg -/* D6FA40 80241090 4600B306 */ mov.s $f12, $f22 -/* D6FA44 80241094 46140002 */ mul.s $f0, $f0, $f20 -/* D6FA48 80241098 00000000 */ nop -/* D6FA4C 8024109C 864200B0 */ lh $v0, 0xb0($s2) -/* D6FA50 802410A0 3C013F00 */ lui $at, 0x3f00 -/* D6FA54 802410A4 44812000 */ mtc1 $at, $f4 -/* D6FA58 802410A8 44821000 */ mtc1 $v0, $f2 -/* D6FA5C 802410AC 00000000 */ nop -/* D6FA60 802410B0 468010A0 */ cvt.s.w $f2, $f2 -/* D6FA64 802410B4 46041082 */ mul.s $f2, $f2, $f4 -/* D6FA68 802410B8 00000000 */ nop -/* D6FA6C 802410BC 4600E700 */ add.s $f28, $f28, $f0 -/* D6FA70 802410C0 4602D680 */ add.s $f26, $f26, $f2 -/* D6FA74 802410C4 0C00A8D4 */ jal cos_deg -/* D6FA78 802410C8 4600B306 */ mov.s $f12, $f22 -/* D6FA7C 802410CC 46140002 */ mul.s $f0, $f0, $f20 -/* D6FA80 802410D0 00000000 */ nop -/* D6FA84 802410D4 0220202D */ daddu $a0, $s1, $zero -/* D6FA88 802410D8 0260282D */ daddu $a1, $s3, $zero -/* D6FA8C 802410DC 4600E18D */ trunc.w.s $f6, $f28 -/* D6FA90 802410E0 44063000 */ mfc1 $a2, $f6 -/* D6FA94 802410E4 0C0B2026 */ jal set_variable -/* D6FA98 802410E8 4600C601 */ sub.s $f24, $f24, $f0 -/* D6FA9C 802410EC 0220202D */ daddu $a0, $s1, $zero -/* D6FAA0 802410F0 4600D18D */ trunc.w.s $f6, $f26 -/* D6FAA4 802410F4 44063000 */ mfc1 $a2, $f6 -/* D6FAA8 802410F8 0C0B2026 */ jal set_variable -/* D6FAAC 802410FC 0280282D */ daddu $a1, $s4, $zero -/* D6FAB0 80241100 0220202D */ daddu $a0, $s1, $zero -/* D6FAB4 80241104 4600C18D */ trunc.w.s $f6, $f24 -/* D6FAB8 80241108 44063000 */ mfc1 $a2, $f6 -/* D6FABC 8024110C 0C0B2026 */ jal set_variable -/* D6FAC0 80241110 0200282D */ daddu $a1, $s0, $zero -/* D6FAC4 80241114 8FBF0024 */ lw $ra, 0x24($sp) -/* D6FAC8 80241118 8FB40020 */ lw $s4, 0x20($sp) -/* D6FACC 8024111C 8FB3001C */ lw $s3, 0x1c($sp) -/* D6FAD0 80241120 8FB20018 */ lw $s2, 0x18($sp) -/* D6FAD4 80241124 8FB10014 */ lw $s1, 0x14($sp) -/* D6FAD8 80241128 8FB00010 */ lw $s0, 0x10($sp) -/* D6FADC 8024112C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* D6FAE0 80241130 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* D6FAE4 80241134 D7B80038 */ ldc1 $f24, 0x38($sp) -/* D6FAE8 80241138 D7B60030 */ ldc1 $f22, 0x30($sp) -/* D6FAEC 8024113C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D6FAF0 80241140 24020002 */ addiu $v0, $zero, 2 -/* D6FAF4 80241144 03E00008 */ jr $ra -/* D6FAF8 80241148 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_8024114C_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_8024114C_D6E9B0.s deleted file mode 100644 index e9b0bc30a3..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_8024114C_D6E9B0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024114C_D6FAFC -/* D6FAFC 8024114C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6FB00 80241150 AFBF0010 */ sw $ra, 0x10($sp) -/* D6FB04 80241154 10A00003 */ beqz $a1, .L80241164 -/* D6FB08 80241158 8C86000C */ lw $a2, 0xc($a0) -/* D6FB0C 8024115C 3C018024 */ lui $at, 0x8024 -/* D6FB10 80241160 AC20219C */ sw $zero, 0x219c($at) -.L80241164: -/* D6FB14 80241164 3C038024 */ lui $v1, 0x8024 -/* D6FB18 80241168 2463219C */ addiu $v1, $v1, 0x219c -/* D6FB1C 8024116C 8C620000 */ lw $v0, ($v1) -/* D6FB20 80241170 54400003 */ bnel $v0, $zero, .L80241180 -/* D6FB24 80241174 AC600000 */ sw $zero, ($v1) -/* D6FB28 80241178 08090465 */ j .L80241194 -/* D6FB2C 8024117C 0000102D */ daddu $v0, $zero, $zero -.L80241180: -/* D6FB30 80241180 8CC50000 */ lw $a1, ($a2) -/* D6FB34 80241184 3C068024 */ lui $a2, 0x8024 -/* D6FB38 80241188 0C0B2026 */ jal set_variable -/* D6FB3C 8024118C 8CC621A0 */ lw $a2, 0x21a0($a2) -/* D6FB40 80241190 24020002 */ addiu $v0, $zero, 2 -.L80241194: -/* D6FB44 80241194 8FBF0010 */ lw $ra, 0x10($sp) -/* D6FB48 80241198 03E00008 */ jr $ra -/* D6FB4C 8024119C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_802411A0_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_802411A0_D6E9B0.s deleted file mode 100644 index 87f142d597..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_802411A0_D6E9B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411A0_D6FB50 -/* D6FB50 802411A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6FB54 802411A4 AFBF0010 */ sw $ra, 0x10($sp) -/* D6FB58 802411A8 8C82000C */ lw $v0, 0xc($a0) -/* D6FB5C 802411AC 0C0B1EAF */ jal get_variable -/* D6FB60 802411B0 8C450000 */ lw $a1, ($v0) -/* D6FB64 802411B4 3C018024 */ lui $at, 0x8024 -/* D6FB68 802411B8 AC2221A0 */ sw $v0, 0x21a0($at) -/* D6FB6C 802411BC 24020002 */ addiu $v0, $zero, 2 -/* D6FB70 802411C0 8FBF0010 */ lw $ra, 0x10($sp) -/* D6FB74 802411C4 24030001 */ addiu $v1, $zero, 1 -/* D6FB78 802411C8 3C018024 */ lui $at, 0x8024 -/* D6FB7C 802411CC AC23219C */ sw $v1, 0x219c($at) -/* D6FB80 802411D0 03E00008 */ jr $ra -/* D6FB84 802411D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_802411D8_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_802411D8_D6E9B0.s deleted file mode 100644 index f5de9c37cb..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_802411D8_D6E9B0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411D8_D6FB88 -/* D6FB88 802411D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6FB8C 802411DC AFBF0010 */ sw $ra, 0x10($sp) -/* D6FB90 802411E0 8C82000C */ lw $v0, 0xc($a0) -/* D6FB94 802411E4 0C0B1EAF */ jal get_variable -/* D6FB98 802411E8 8C450000 */ lw $a1, ($v0) -/* D6FB9C 802411EC 0040182D */ daddu $v1, $v0, $zero -/* D6FBA0 802411F0 10600012 */ beqz $v1, .L8024123C -/* D6FBA4 802411F4 0000202D */ daddu $a0, $zero, $zero -/* D6FBA8 802411F8 8C620000 */ lw $v0, ($v1) -/* D6FBAC 802411FC 5040000A */ beql $v0, $zero, .L80241228 -/* D6FBB0 80241200 00041080 */ sll $v0, $a0, 2 -/* D6FBB4 80241204 3C058024 */ lui $a1, 0x8024 -/* D6FBB8 80241208 24A579F0 */ addiu $a1, $a1, 0x79f0 -.L8024120C: -/* D6FBBC 8024120C 24630004 */ addiu $v1, $v1, 4 -/* D6FBC0 80241210 24840001 */ addiu $a0, $a0, 1 -/* D6FBC4 80241214 ACA20000 */ sw $v0, ($a1) -/* D6FBC8 80241218 8C620000 */ lw $v0, ($v1) -/* D6FBCC 8024121C 1440FFFB */ bnez $v0, .L8024120C -/* D6FBD0 80241220 24A50004 */ addiu $a1, $a1, 4 -/* D6FBD4 80241224 00041080 */ sll $v0, $a0, 2 -.L80241228: -/* D6FBD8 80241228 3C018024 */ lui $at, 0x8024 -/* D6FBDC 8024122C 00220821 */ addu $at, $at, $v0 -/* D6FBE0 80241230 AC2079F0 */ sw $zero, 0x79f0($at) -/* D6FBE4 80241234 08090499 */ j .L80241264 -/* D6FBE8 80241238 00000000 */ nop -.L8024123C: -/* D6FBEC 8024123C 3C038024 */ lui $v1, 0x8024 -/* D6FBF0 80241240 246379F0 */ addiu $v1, $v1, 0x79f0 -/* D6FBF4 80241244 0060282D */ daddu $a1, $v1, $zero -.L80241248: -/* D6FBF8 80241248 24820010 */ addiu $v0, $a0, 0x10 -/* D6FBFC 8024124C AC620000 */ sw $v0, ($v1) -/* D6FC00 80241250 24630004 */ addiu $v1, $v1, 4 -/* D6FC04 80241254 24840001 */ addiu $a0, $a0, 1 -/* D6FC08 80241258 28820070 */ slti $v0, $a0, 0x70 -/* D6FC0C 8024125C 1440FFFA */ bnez $v0, .L80241248 -/* D6FC10 80241260 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241264: -/* D6FC14 80241264 8FBF0010 */ lw $ra, 0x10($sp) -/* D6FC18 80241268 24020002 */ addiu $v0, $zero, 2 -/* D6FC1C 8024126C 03E00008 */ jr $ra -/* D6FC20 80241270 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_80241274_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_80241274_D6E9B0.s deleted file mode 100644 index f370e6463e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_80241274_D6E9B0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241274_D6FC24 -/* D6FC24 80241274 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6FC28 80241278 AFBF0010 */ sw $ra, 0x10($sp) -/* D6FC2C 8024127C 8C82000C */ lw $v0, 0xc($a0) -/* D6FC30 80241280 0C0B1EAF */ jal get_variable -/* D6FC34 80241284 8C450000 */ lw $a1, ($v0) -/* D6FC38 80241288 0040182D */ daddu $v1, $v0, $zero -/* D6FC3C 8024128C 10600012 */ beqz $v1, .L802412D8 -/* D6FC40 80241290 0000202D */ daddu $a0, $zero, $zero -/* D6FC44 80241294 8C620000 */ lw $v0, ($v1) -/* D6FC48 80241298 5040000A */ beql $v0, $zero, .L802412C4 -/* D6FC4C 8024129C 00041080 */ sll $v0, $a0, 2 -/* D6FC50 802412A0 3C058024 */ lui $a1, 0x8024 -/* D6FC54 802412A4 24A57BB8 */ addiu $a1, $a1, 0x7bb8 -.L802412A8: -/* D6FC58 802412A8 24630004 */ addiu $v1, $v1, 4 -/* D6FC5C 802412AC 24840001 */ addiu $a0, $a0, 1 -/* D6FC60 802412B0 ACA20000 */ sw $v0, ($a1) -/* D6FC64 802412B4 8C620000 */ lw $v0, ($v1) -/* D6FC68 802412B8 1440FFFB */ bnez $v0, .L802412A8 -/* D6FC6C 802412BC 24A50004 */ addiu $a1, $a1, 4 -/* D6FC70 802412C0 00041080 */ sll $v0, $a0, 2 -.L802412C4: -/* D6FC74 802412C4 3C018024 */ lui $at, 0x8024 -/* D6FC78 802412C8 00220821 */ addu $at, $at, $v0 -/* D6FC7C 802412CC AC207BB8 */ sw $zero, 0x7bb8($at) -/* D6FC80 802412D0 080904C0 */ j .L80241300 -/* D6FC84 802412D4 00000000 */ nop -.L802412D8: -/* D6FC88 802412D8 3C038024 */ lui $v1, 0x8024 -/* D6FC8C 802412DC 24637BB8 */ addiu $v1, $v1, 0x7bb8 -/* D6FC90 802412E0 0060282D */ daddu $a1, $v1, $zero -.L802412E4: -/* D6FC94 802412E4 24820080 */ addiu $v0, $a0, 0x80 -/* D6FC98 802412E8 AC620000 */ sw $v0, ($v1) -/* D6FC9C 802412EC 24630004 */ addiu $v1, $v1, 4 -/* D6FCA0 802412F0 24840001 */ addiu $a0, $a0, 1 -/* D6FCA4 802412F4 2882005B */ slti $v0, $a0, 0x5b -/* D6FCA8 802412F8 1440FFFA */ bnez $v0, .L802412E4 -/* D6FCAC 802412FC ACA0016C */ sw $zero, 0x16c($a1) -.L80241300: -/* D6FCB0 80241300 8FBF0010 */ lw $ra, 0x10($sp) -/* D6FCB4 80241304 24020002 */ addiu $v0, $zero, 2 -/* D6FCB8 80241308 03E00008 */ jr $ra -/* D6FCBC 8024130C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_80241310_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_80241310_D6E9B0.s deleted file mode 100644 index 2d787fe6e8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_80241310_D6E9B0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241310_D6FCC0 -/* D6FCC0 80241310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D6FCC4 80241314 AFB10014 */ sw $s1, 0x14($sp) -/* D6FCC8 80241318 0080882D */ daddu $s1, $a0, $zero -/* D6FCCC 8024131C AFBF001C */ sw $ra, 0x1c($sp) -/* D6FCD0 80241320 AFB20018 */ sw $s2, 0x18($sp) -/* D6FCD4 80241324 AFB00010 */ sw $s0, 0x10($sp) -/* D6FCD8 80241328 8E30000C */ lw $s0, 0xc($s1) -/* D6FCDC 8024132C 8E050000 */ lw $a1, ($s0) -/* D6FCE0 80241330 0C0B1EAF */ jal get_variable -/* D6FCE4 80241334 26100004 */ addiu $s0, $s0, 4 -/* D6FCE8 80241338 8E050000 */ lw $a1, ($s0) -/* D6FCEC 8024133C 26100004 */ addiu $s0, $s0, 4 -/* D6FCF0 80241340 0220202D */ daddu $a0, $s1, $zero -/* D6FCF4 80241344 0C0B1EAF */ jal get_variable -/* D6FCF8 80241348 0040902D */ daddu $s2, $v0, $zero -/* D6FCFC 8024134C 0220202D */ daddu $a0, $s1, $zero -/* D6FD00 80241350 8E050000 */ lw $a1, ($s0) -/* D6FD04 80241354 0C0B1EAF */ jal get_variable -/* D6FD08 80241358 0040802D */ daddu $s0, $v0, $zero -/* D6FD0C 8024135C 44926000 */ mtc1 $s2, $f12 -/* D6FD10 80241360 00000000 */ nop -/* D6FD14 80241364 46806320 */ cvt.s.w $f12, $f12 -/* D6FD18 80241368 44820000 */ mtc1 $v0, $f0 -/* D6FD1C 8024136C 00000000 */ nop -/* D6FD20 80241370 46800020 */ cvt.s.w $f0, $f0 -/* D6FD24 80241374 44060000 */ mfc1 $a2, $f0 -/* D6FD28 80241378 44907000 */ mtc1 $s0, $f14 -/* D6FD2C 8024137C 00000000 */ nop -/* D6FD30 80241380 0C01BE3C */ jal func_8006F8F0 -/* D6FD34 80241384 468073A0 */ cvt.s.w $f14, $f14 -/* D6FD38 80241388 8FBF001C */ lw $ra, 0x1c($sp) -/* D6FD3C 8024138C 8FB20018 */ lw $s2, 0x18($sp) -/* D6FD40 80241390 8FB10014 */ lw $s1, 0x14($sp) -/* D6FD44 80241394 8FB00010 */ lw $s0, 0x10($sp) -/* D6FD48 80241398 24020002 */ addiu $v0, $zero, 2 -/* D6FD4C 8024139C 03E00008 */ jr $ra -/* D6FD50 802413A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_802413A4_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_802413A4_D6E9B0.s deleted file mode 100644 index 813e28f99e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_802413A4_D6E9B0.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413A4_D6FD54 -/* D6FD54 802413A4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D6FD58 802413A8 AFB20018 */ sw $s2, 0x18($sp) -/* D6FD5C 802413AC 0080902D */ daddu $s2, $a0, $zero -/* D6FD60 802413B0 AFBF0024 */ sw $ra, 0x24($sp) -/* D6FD64 802413B4 AFB40020 */ sw $s4, 0x20($sp) -/* D6FD68 802413B8 AFB3001C */ sw $s3, 0x1c($sp) -/* D6FD6C 802413BC AFB10014 */ sw $s1, 0x14($sp) -/* D6FD70 802413C0 AFB00010 */ sw $s0, 0x10($sp) -/* D6FD74 802413C4 8E50000C */ lw $s0, 0xc($s2) -/* D6FD78 802413C8 8E530148 */ lw $s3, 0x148($s2) -/* D6FD7C 802413CC 8E050000 */ lw $a1, ($s0) -/* D6FD80 802413D0 0C0B1EAF */ jal get_variable -/* D6FD84 802413D4 26100004 */ addiu $s0, $s0, 4 -/* D6FD88 802413D8 2C510001 */ sltiu $s1, $v0, 1 -/* D6FD8C 802413DC 8E050000 */ lw $a1, ($s0) -/* D6FD90 802413E0 26100004 */ addiu $s0, $s0, 4 -/* D6FD94 802413E4 3C14800B */ lui $s4, %hi(gCurrentEncounter) -/* D6FD98 802413E8 26940F10 */ addiu $s4, $s4, %lo(gCurrentEncounter) -/* D6FD9C 802413EC 0C0B1EAF */ jal get_variable -/* D6FDA0 802413F0 0240202D */ daddu $a0, $s2, $zero -/* D6FDA4 802413F4 50400001 */ beql $v0, $zero, .L802413FC -/* D6FDA8 802413F8 26310001 */ addiu $s1, $s1, 1 -.L802413FC: -/* D6FDAC 802413FC 8E050000 */ lw $a1, ($s0) -/* D6FDB0 80241400 26100004 */ addiu $s0, $s0, 4 -/* D6FDB4 80241404 0C0B1EAF */ jal get_variable -/* D6FDB8 80241408 0240202D */ daddu $a0, $s2, $zero -/* D6FDBC 8024140C 50400001 */ beql $v0, $zero, .L80241414 -/* D6FDC0 80241410 26310001 */ addiu $s1, $s1, 1 -.L80241414: -/* D6FDC4 80241414 8E050000 */ lw $a1, ($s0) -/* D6FDC8 80241418 0C0B1EAF */ jal get_variable -/* D6FDCC 8024141C 0240202D */ daddu $a0, $s2, $zero -/* D6FDD0 80241420 50400001 */ beql $v0, $zero, .L80241428 -/* D6FDD4 80241424 26310001 */ addiu $s1, $s1, 1 -.L80241428: -/* D6FDD8 80241428 24020002 */ addiu $v0, $zero, 2 -/* D6FDDC 8024142C 12220016 */ beq $s1, $v0, .L80241488 -/* D6FDE0 80241430 00000000 */ nop -/* D6FDE4 80241434 2A220003 */ slti $v0, $s1, 3 -/* D6FDE8 80241438 10400005 */ beqz $v0, .L80241450 -/* D6FDEC 8024143C 24020001 */ addiu $v0, $zero, 1 -/* D6FDF0 80241440 1222000B */ beq $s1, $v0, .L80241470 -/* D6FDF4 80241444 00000000 */ nop -/* D6FDF8 80241448 08090534 */ j .L802414D0 -/* D6FDFC 8024144C 00000000 */ nop -.L80241450: -/* D6FE00 80241450 24020003 */ addiu $v0, $zero, 3 -/* D6FE04 80241454 12220012 */ beq $s1, $v0, .L802414A0 -/* D6FE08 80241458 00000000 */ nop -/* D6FE0C 8024145C 24020004 */ addiu $v0, $zero, 4 -/* D6FE10 80241460 12220015 */ beq $s1, $v0, .L802414B8 -/* D6FE14 80241464 00000000 */ nop -/* D6FE18 80241468 08090534 */ j .L802414D0 -/* D6FE1C 8024146C 00000000 */ nop -.L80241470: -/* D6FE20 80241470 82620004 */ lb $v0, 4($s3) -/* D6FE24 80241474 00021080 */ sll $v0, $v0, 2 -/* D6FE28 80241478 00541021 */ addu $v0, $v0, $s4 -/* D6FE2C 8024147C 8C430028 */ lw $v1, 0x28($v0) -/* D6FE30 80241480 08090533 */ j .L802414CC -/* D6FE34 80241484 24022101 */ addiu $v0, $zero, 0x2101 -.L80241488: -/* D6FE38 80241488 82620004 */ lb $v0, 4($s3) -/* D6FE3C 8024148C 00021080 */ sll $v0, $v0, 2 -/* D6FE40 80241490 00541021 */ addu $v0, $v0, $s4 -/* D6FE44 80241494 8C430028 */ lw $v1, 0x28($v0) -/* D6FE48 80241498 08090533 */ j .L802414CC -/* D6FE4C 8024149C 24022102 */ addiu $v0, $zero, 0x2102 -.L802414A0: -/* D6FE50 802414A0 82620004 */ lb $v0, 4($s3) -/* D6FE54 802414A4 00021080 */ sll $v0, $v0, 2 -/* D6FE58 802414A8 00541021 */ addu $v0, $v0, $s4 -/* D6FE5C 802414AC 8C430028 */ lw $v1, 0x28($v0) -/* D6FE60 802414B0 08090533 */ j .L802414CC -/* D6FE64 802414B4 24022103 */ addiu $v0, $zero, 0x2103 -.L802414B8: -/* D6FE68 802414B8 82620004 */ lb $v0, 4($s3) -/* D6FE6C 802414BC 00021080 */ sll $v0, $v0, 2 -/* D6FE70 802414C0 00541021 */ addu $v0, $v0, $s4 -/* D6FE74 802414C4 8C430028 */ lw $v1, 0x28($v0) -/* D6FE78 802414C8 24022104 */ addiu $v0, $zero, 0x2104 -.L802414CC: -/* D6FE7C 802414CC A4620044 */ sh $v0, 0x44($v1) -.L802414D0: -/* D6FE80 802414D0 8FBF0024 */ lw $ra, 0x24($sp) -/* D6FE84 802414D4 8FB40020 */ lw $s4, 0x20($sp) -/* D6FE88 802414D8 8FB3001C */ lw $s3, 0x1c($sp) -/* D6FE8C 802414DC 8FB20018 */ lw $s2, 0x18($sp) -/* D6FE90 802414E0 8FB10014 */ lw $s1, 0x14($sp) -/* D6FE94 802414E4 8FB00010 */ lw $s0, 0x10($sp) -/* D6FE98 802414E8 24020002 */ addiu $v0, $zero, 2 -/* D6FE9C 802414EC 03E00008 */ jr $ra -/* D6FEA0 802414F0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_802414F4_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_802414F4_D6E9B0.s deleted file mode 100644 index 7140bfea31..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_802414F4_D6E9B0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414F4_D6FEA4 -/* D6FEA4 802414F4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6FEA8 802414F8 AFB00010 */ sw $s0, 0x10($sp) -/* D6FEAC 802414FC 0080802D */ daddu $s0, $a0, $zero -/* D6FEB0 80241500 3C058024 */ lui $a1, 0x8024 -/* D6FEB4 80241504 24A51530 */ addiu $a1, $a1, 0x1530 -/* D6FEB8 80241508 AFBF0014 */ sw $ra, 0x14($sp) -/* D6FEBC 8024150C 0C048C56 */ jal bind_dynamic_entity_3 -/* D6FEC0 80241510 0000202D */ daddu $a0, $zero, $zero -/* D6FEC4 80241514 8E03013C */ lw $v1, 0x13c($s0) -/* D6FEC8 80241518 AC620000 */ sw $v0, ($v1) -/* D6FECC 8024151C 8FBF0014 */ lw $ra, 0x14($sp) -/* D6FED0 80241520 8FB00010 */ lw $s0, 0x10($sp) -/* D6FED4 80241524 24020002 */ addiu $v0, $zero, 2 -/* D6FED8 80241528 03E00008 */ jr $ra -/* D6FEDC 8024152C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_80241530_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_80241530_D6E9B0.s deleted file mode 100644 index fcd3168c4f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_80241530_D6E9B0.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241530_D6FEE0 -/* D6FEE0 80241530 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D6FEE4 80241534 24040005 */ addiu $a0, $zero, 5 -/* D6FEE8 80241538 AFBF0048 */ sw $ra, 0x48($sp) -/* D6FEEC 8024153C AFB10044 */ sw $s1, 0x44($sp) -/* D6FEF0 80241540 0C00EAD2 */ jal get_npc_safe -/* D6FEF4 80241544 AFB00040 */ sw $s0, 0x40($sp) -/* D6FEF8 80241548 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* D6FEFC 8024154C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* D6FF00 80241550 27B10020 */ addiu $s1, $sp, 0x20 -/* D6FF04 80241554 8C630000 */ lw $v1, ($v1) -/* D6FF08 80241558 30630001 */ andi $v1, $v1, 1 -/* D6FF0C 8024155C 1060001B */ beqz $v1, .L802415CC -/* D6FF10 80241560 0040802D */ daddu $s0, $v0, $zero -/* D6FF14 80241564 C6000040 */ lwc1 $f0, 0x40($s0) -/* D6FF18 80241568 3C04800A */ lui $a0, 0x800a -/* D6FF1C 8024156C 8484A634 */ lh $a0, -0x59cc($a0) -/* D6FF20 80241570 27A20030 */ addiu $v0, $sp, 0x30 -/* D6FF24 80241574 AFA20010 */ sw $v0, 0x10($sp) -/* D6FF28 80241578 27A20034 */ addiu $v0, $sp, 0x34 -/* D6FF2C 8024157C AFA20014 */ sw $v0, 0x14($sp) -/* D6FF30 80241580 27A20038 */ addiu $v0, $sp, 0x38 -/* D6FF34 80241584 AFA20018 */ sw $v0, 0x18($sp) -/* D6FF38 80241588 8E050038 */ lw $a1, 0x38($s0) -/* D6FF3C 8024158C 8E06003C */ lw $a2, 0x3c($s0) -/* D6FF40 80241590 46000007 */ neg.s $f0, $f0 -/* D6FF44 80241594 44070000 */ mfc1 $a3, $f0 -/* D6FF48 80241598 0C00B94E */ jal get_screen_coords -/* D6FF4C 8024159C 00000000 */ nop -/* D6FF50 802415A0 0220202D */ daddu $a0, $s1, $zero -/* D6FF54 802415A4 820500AA */ lb $a1, 0xaa($s0) -/* D6FF58 802415A8 8FA30038 */ lw $v1, 0x38($sp) -/* D6FF5C 802415AC 3C028024 */ lui $v0, 0x8024 -/* D6FF60 802415B0 244215E0 */ addiu $v0, $v0, 0x15e0 -/* D6FF64 802415B4 AFB00028 */ sw $s0, 0x28($sp) -/* D6FF68 802415B8 AFA2002C */ sw $v0, 0x2c($sp) -/* D6FF6C 802415BC 00031823 */ negu $v1, $v1 -/* D6FF70 802415C0 AFA50020 */ sw $a1, 0x20($sp) -/* D6FF74 802415C4 0C047644 */ jal queue_render_task -/* D6FF78 802415C8 AFA30024 */ sw $v1, 0x24($sp) -.L802415CC: -/* D6FF7C 802415CC 8FBF0048 */ lw $ra, 0x48($sp) -/* D6FF80 802415D0 8FB10044 */ lw $s1, 0x44($sp) -/* D6FF84 802415D4 8FB00040 */ lw $s0, 0x40($sp) -/* D6FF88 802415D8 03E00008 */ jr $ra -/* D6FF8C 802415DC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_802415E0_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_802415E0_D6E9B0.s deleted file mode 100644 index d040e54b0f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_802415E0_D6E9B0.s +++ /dev/null @@ -1,74 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415E0_D6FF90 -/* D6FF90 802415E0 27BDFF10 */ addiu $sp, $sp, -0xf0 -/* D6FF94 802415E4 AFB100DC */ sw $s1, 0xdc($sp) -/* D6FF98 802415E8 AFBF00E0 */ sw $ra, 0xe0($sp) -/* D6FF9C 802415EC AFB000D8 */ sw $s0, 0xd8($sp) -/* D6FFA0 802415F0 F7B400E8 */ sdc1 $f20, 0xe8($sp) -/* D6FFA4 802415F4 0C00E769 */ jal func_80039DA4 -/* D6FFA8 802415F8 0080882D */ daddu $s1, $a0, $zero -/* D6FFAC 802415FC 44800000 */ mtc1 $zero, $f0 -/* D6FFB0 80241600 3C03800A */ lui $v1, 0x800a -/* D6FFB4 80241604 8463A634 */ lh $v1, -0x59cc($v1) -/* D6FFB8 80241608 C6220034 */ lwc1 $f2, 0x34($s1) -/* D6FFBC 8024160C 00031080 */ sll $v0, $v1, 2 -/* D6FFC0 80241610 00431021 */ addu $v0, $v0, $v1 -/* D6FFC4 80241614 00021080 */ sll $v0, $v0, 2 -/* D6FFC8 80241618 00431023 */ subu $v0, $v0, $v1 -/* D6FFCC 8024161C 000218C0 */ sll $v1, $v0, 3 -/* D6FFD0 80241620 00431021 */ addu $v0, $v0, $v1 -/* D6FFD4 80241624 000210C0 */ sll $v0, $v0, 3 -/* D6FFD8 80241628 44060000 */ mfc1 $a2, $f0 -/* D6FFDC 8024162C 3C01800B */ lui $at, 0x800b -/* D6FFE0 80241630 00220821 */ addu $at, $at, $v0 -/* D6FFE4 80241634 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* D6FFE8 80241638 3C013F80 */ lui $at, 0x3f80 -/* D6FFEC 8024163C 4481A000 */ mtc1 $at, $f20 -/* D6FFF0 80241640 46001080 */ add.s $f2, $f2, $f0 -/* D6FFF4 80241644 4407A000 */ mfc1 $a3, $f20 -/* D6FFF8 80241648 44051000 */ mfc1 $a1, $f2 -/* D6FFFC 8024164C 27A40018 */ addiu $a0, $sp, 0x18 -/* D70000 80241650 0C019EC8 */ jal guRotateF -/* D70004 80241654 AFA60010 */ sw $a2, 0x10($sp) -/* D70008 80241658 3C013F36 */ lui $at, 0x3f36 -/* D7000C 8024165C 3421DB6E */ ori $at, $at, 0xdb6e -/* D70010 80241660 44810000 */ mtc1 $at, $f0 -/* D70014 80241664 27B00098 */ addiu $s0, $sp, 0x98 -/* D70018 80241668 44050000 */ mfc1 $a1, $f0 -/* D7001C 8024166C 0200202D */ daddu $a0, $s0, $zero -/* D70020 80241670 00A0302D */ daddu $a2, $a1, $zero -/* D70024 80241674 0C019DF0 */ jal guScaleF -/* D70028 80241678 00A0382D */ daddu $a3, $a1, $zero -/* D7002C 8024167C 27A40018 */ addiu $a0, $sp, 0x18 -/* D70030 80241680 0200282D */ daddu $a1, $s0, $zero -/* D70034 80241684 0C019D80 */ jal guMtxCatF -/* D70038 80241688 0080302D */ daddu $a2, $a0, $zero -/* D7003C 8024168C 27B00058 */ addiu $s0, $sp, 0x58 -/* D70040 80241690 8E250038 */ lw $a1, 0x38($s1) -/* D70044 80241694 8E26003C */ lw $a2, 0x3c($s1) -/* D70048 80241698 8E270040 */ lw $a3, 0x40($s1) -/* D7004C 8024169C 0C019E40 */ jal guTranslateF -/* D70050 802416A0 0200202D */ daddu $a0, $s0, $zero -/* D70054 802416A4 27A40018 */ addiu $a0, $sp, 0x18 -/* D70058 802416A8 0200282D */ daddu $a1, $s0, $zero -/* D7005C 802416AC 0C019D80 */ jal guMtxCatF -/* D70060 802416B0 0080302D */ daddu $a2, $a0, $zero -/* D70064 802416B4 8E250028 */ lw $a1, 0x28($s1) -/* D70068 802416B8 4406A000 */ mfc1 $a2, $f20 -/* D7006C 802416BC 0C0B76A3 */ jal func_802DDA8C -/* D70070 802416C0 24040002 */ addiu $a0, $zero, 2 -/* D70074 802416C4 24040002 */ addiu $a0, $zero, 2 -/* D70078 802416C8 0000282D */ daddu $a1, $zero, $zero -/* D7007C 802416CC 00A0302D */ daddu $a2, $a1, $zero -/* D70080 802416D0 00A0382D */ daddu $a3, $a1, $zero -/* D70084 802416D4 27A20018 */ addiu $v0, $sp, 0x18 -/* D70088 802416D8 0C0B7710 */ jal render_sprite -/* D7008C 802416DC AFA20010 */ sw $v0, 0x10($sp) -/* D70090 802416E0 8FBF00E0 */ lw $ra, 0xe0($sp) -/* D70094 802416E4 8FB100DC */ lw $s1, 0xdc($sp) -/* D70098 802416E8 8FB000D8 */ lw $s0, 0xd8($sp) -/* D7009C 802416EC D7B400E8 */ ldc1 $f20, 0xe8($sp) -/* D700A0 802416F0 03E00008 */ jr $ra -/* D700A4 802416F4 27BD00F0 */ addiu $sp, $sp, 0xf0 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_802416F8_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_802416F8_D6E9B0.s deleted file mode 100644 index 1c83ef1c7b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_802416F8_D6E9B0.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416F8_D700A8 -/* D700A8 802416F8 C4800084 */ lwc1 $f0, 0x84($a0) -/* D700AC 802416FC 46800020 */ cvt.s.w $f0, $f0 -/* D700B0 80241700 3C018011 */ lui $at, 0x8011 -/* D700B4 80241704 E420F070 */ swc1 $f0, -0xf90($at) -/* D700B8 80241708 03E00008 */ jr $ra -/* D700BC 8024170C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_80241710_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_80241710_D6E9B0.s deleted file mode 100644 index e249e9e329..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_80241710_D6E9B0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241710_D700C0 -/* D700C0 80241710 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D700C4 80241714 AFB00010 */ sw $s0, 0x10($sp) -/* D700C8 80241718 0080802D */ daddu $s0, $a0, $zero -/* D700CC 8024171C AFBF0014 */ sw $ra, 0x14($sp) -/* D700D0 80241720 0C0B36B0 */ jal resolve_npc -/* D700D4 80241724 8E050090 */ lw $a1, 0x90($s0) -/* D700D8 80241728 0200202D */ daddu $a0, $s0, $zero -/* D700DC 8024172C 8C850094 */ lw $a1, 0x94($a0) -/* D700E0 80241730 0C0B36B0 */ jal resolve_npc -/* D700E4 80241734 0040802D */ daddu $s0, $v0, $zero -/* D700E8 80241738 944300A6 */ lhu $v1, 0xa6($v0) -/* D700EC 8024173C A60300A6 */ sh $v1, 0xa6($s0) -/* D700F0 80241740 944300A8 */ lhu $v1, 0xa8($v0) -/* D700F4 80241744 A60300A8 */ sh $v1, 0xa8($s0) -/* D700F8 80241748 8FBF0014 */ lw $ra, 0x14($sp) -/* D700FC 8024174C 8FB00010 */ lw $s0, 0x10($sp) -/* D70100 80241750 24020002 */ addiu $v0, $zero, 2 -/* D70104 80241754 03E00008 */ jr $ra -/* D70108 80241758 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_19/func_80241838_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/func_80241838_D6E9B0.s deleted file mode 100644 index e1de75258e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/func_80241838_D6E9B0.s +++ /dev/null @@ -1,108 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241838_D701E8 -/* D701E8 80241838 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D701EC 8024183C AFB20018 */ sw $s2, 0x18($sp) -/* D701F0 80241840 0080902D */ daddu $s2, $a0, $zero -/* D701F4 80241844 AFB00010 */ sw $s0, 0x10($sp) -/* D701F8 80241848 00A0802D */ daddu $s0, $a1, $zero -/* D701FC 8024184C AFBF0020 */ sw $ra, 0x20($sp) -/* D70200 80241850 AFB3001C */ sw $s3, 0x1c($sp) -/* D70204 80241854 AFB10014 */ sw $s1, 0x14($sp) -/* D70208 80241858 8E51000C */ lw $s1, 0xc($s2) -/* D7020C 8024185C 8E250000 */ lw $a1, ($s1) -/* D70210 80241860 0C0B1EAF */ jal get_variable -/* D70214 80241864 26310004 */ addiu $s1, $s1, 4 -/* D70218 80241868 0C00EABB */ jal get_npc_unsafe -/* D7021C 8024186C 0040202D */ daddu $a0, $v0, $zero -/* D70220 80241870 12000016 */ beqz $s0, .L802418CC -/* D70224 80241874 0040982D */ daddu $s3, $v0, $zero -/* D70228 80241878 8E250000 */ lw $a1, ($s1) -/* D7022C 8024187C 26310004 */ addiu $s1, $s1, 4 -/* D70230 80241880 0C0B1EAF */ jal get_variable -/* D70234 80241884 0240202D */ daddu $a0, $s2, $zero -/* D70238 80241888 AE4200AC */ sw $v0, 0xac($s2) -/* D7023C 8024188C 24020008 */ addiu $v0, $zero, 8 -/* D70240 80241890 AE4200B0 */ sw $v0, 0xb0($s2) -/* D70244 80241894 8E250000 */ lw $a1, ($s1) -/* D70248 80241898 0C0B1EAF */ jal get_variable -/* D7024C 8024189C 0240202D */ daddu $a0, $s2, $zero -/* D70250 802418A0 AE4200B4 */ sw $v0, 0xb4($s2) -/* D70254 802418A4 C6620038 */ lwc1 $f2, 0x38($s3) -/* D70258 802418A8 C64000AC */ lwc1 $f0, 0xac($s2) -/* D7025C 802418AC 46800020 */ cvt.s.w $f0, $f0 -/* D70260 802418B0 4600103C */ c.lt.s $f2, $f0 -/* D70264 802418B4 00000000 */ nop -/* D70268 802418B8 45000003 */ bc1f .L802418C8 -/* D7026C 802418BC 24020001 */ addiu $v0, $zero, 1 -/* D70270 802418C0 08090633 */ j .L802418CC -/* D70274 802418C4 AE4000B8 */ sw $zero, 0xb8($s2) -.L802418C8: -/* D70278 802418C8 AE4200B8 */ sw $v0, 0xb8($s2) -.L802418CC: -/* D7027C 802418CC 8E4200B8 */ lw $v0, 0xb8($s2) -/* D70280 802418D0 1440000C */ bnez $v0, .L80241904 -/* D70284 802418D4 00000000 */ nop -/* D70288 802418D8 C6620038 */ lwc1 $f2, 0x38($s3) -/* D7028C 802418DC C64000AC */ lwc1 $f0, 0xac($s2) -/* D70290 802418E0 46800020 */ cvt.s.w $f0, $f0 -/* D70294 802418E4 4602003E */ c.le.s $f0, $f2 -/* D70298 802418E8 00000000 */ nop -/* D7029C 802418EC 4503000D */ bc1tl .L80241924 -/* D702A0 802418F0 E6600038 */ swc1 $f0, 0x38($s3) -/* D702A4 802418F4 C64000B0 */ lwc1 $f0, 0xb0($s2) -/* D702A8 802418F8 46800020 */ cvt.s.w $f0, $f0 -/* D702AC 802418FC 0809064E */ j .L80241938 -/* D702B0 80241900 46001000 */ add.s $f0, $f2, $f0 -.L80241904: -/* D702B4 80241904 C6620038 */ lwc1 $f2, 0x38($s3) -/* D702B8 80241908 C64000AC */ lwc1 $f0, 0xac($s2) -/* D702BC 8024190C 46800020 */ cvt.s.w $f0, $f0 -/* D702C0 80241910 4600103E */ c.le.s $f2, $f0 -/* D702C4 80241914 00000000 */ nop -/* D702C8 80241918 45000004 */ bc1f .L8024192C -/* D702CC 8024191C 00000000 */ nop -/* D702D0 80241920 E6600038 */ swc1 $f0, 0x38($s3) -.L80241924: -/* D702D4 80241924 08090662 */ j .L80241988 -/* D702D8 80241928 24020002 */ addiu $v0, $zero, 2 -.L8024192C: -/* D702DC 8024192C C64000B0 */ lwc1 $f0, 0xb0($s2) -/* D702E0 80241930 46800020 */ cvt.s.w $f0, $f0 -/* D702E4 80241934 46001001 */ sub.s $f0, $f2, $f0 -.L80241938: -/* D702E8 80241938 E6600038 */ swc1 $f0, 0x38($s3) -/* D702EC 8024193C 8E4200B4 */ lw $v0, 0xb4($s2) -/* D702F0 80241940 14400009 */ bnez $v0, .L80241968 -/* D702F4 80241944 00000000 */ nop -/* D702F8 80241948 8E4200B0 */ lw $v0, 0xb0($s2) -/* D702FC 8024194C 24420002 */ addiu $v0, $v0, 2 -/* D70300 80241950 AE4200B0 */ sw $v0, 0xb0($s2) -/* D70304 80241954 2842000E */ slti $v0, $v0, 0xe -/* D70308 80241958 1440000B */ bnez $v0, .L80241988 -/* D7030C 8024195C 0000102D */ daddu $v0, $zero, $zero -/* D70310 80241960 08090660 */ j .L80241980 -/* D70314 80241964 2402000E */ addiu $v0, $zero, 0xe -.L80241968: -/* D70318 80241968 8E4200B0 */ lw $v0, 0xb0($s2) -/* D7031C 8024196C 2442FFFE */ addiu $v0, $v0, -2 -/* D70320 80241970 AE4200B0 */ sw $v0, 0xb0($s2) -/* D70324 80241974 28420009 */ slti $v0, $v0, 9 -/* D70328 80241978 10400002 */ beqz $v0, .L80241984 -/* D7032C 8024197C 24020008 */ addiu $v0, $zero, 8 -.L80241980: -/* D70330 80241980 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241984: -/* D70334 80241984 0000102D */ daddu $v0, $zero, $zero -.L80241988: -/* D70338 80241988 8FBF0020 */ lw $ra, 0x20($sp) -/* D7033C 8024198C 8FB3001C */ lw $s3, 0x1c($sp) -/* D70340 80241990 8FB20018 */ lw $s2, 0x18($sp) -/* D70344 80241994 8FB10014 */ lw $s1, 0x14($sp) -/* D70348 80241998 8FB00010 */ lw $s0, 0x10($sp) -/* D7034C 8024199C 03E00008 */ jr $ra -/* D70350 802419A0 27BD0028 */ addiu $sp, $sp, 0x28 -/* D70354 802419A4 00000000 */ nop -/* D70358 802419A8 00000000 */ nop -/* D7035C 802419AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_20/func_80240020_D763A0.s b/asm/nonmatchings/world/area_pra/pra_20/func_80240020_D763A0.s deleted file mode 100644 index 73aa43b4ee..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/func_80240020_D763A0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D763C0 -/* D763C0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D763C4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D763C8 80240028 00822024 */ and $a0, $a0, $v0 -/* D763CC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D763D0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D763D4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D763D8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D763DC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D763E0 80240040 30620001 */ andi $v0, $v1, 1 -/* D763E4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D763E8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D763EC 8024004C 03E00008 */ jr $ra -/* D763F0 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_20/func_80240054_D763A0.s b/asm/nonmatchings/world/area_pra/pra_20/func_80240054_D763A0.s deleted file mode 100644 index e41cc91121..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/func_80240054_D763A0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054_D763F4 -/* D763F4 80240054 00041403 */ sra $v0, $a0, 0x10 -/* D763F8 80240058 304300FF */ andi $v1, $v0, 0xff -/* D763FC 8024005C 24020006 */ addiu $v0, $zero, 6 -/* D76400 80240060 10620015 */ beq $v1, $v0, .L802400B8 -/* D76404 80240064 28620007 */ slti $v0, $v1, 7 -/* D76408 80240068 10400005 */ beqz $v0, .L80240080 -/* D7640C 8024006C 24020001 */ addiu $v0, $zero, 1 -/* D76410 80240070 1062000A */ beq $v1, $v0, .L8024009C -/* D76414 80240074 3C020100 */ lui $v0, 0x100 -/* D76418 80240078 03E00008 */ jr $ra -/* D7641C 8024007C 00821025 */ or $v0, $a0, $v0 -.L80240080: -/* D76420 80240080 2862000A */ slti $v0, $v1, 0xa -/* D76424 80240084 10400016 */ beqz $v0, .L802400E0 -/* D76428 80240088 28620008 */ slti $v0, $v1, 8 -/* D7642C 8024008C 14400015 */ bnez $v0, .L802400E4 -/* D76430 80240090 3C020100 */ lui $v0, 0x100 -/* D76434 80240094 03E00008 */ jr $ra -/* D76438 80240098 0080102D */ daddu $v0, $a0, $zero -.L8024009C: -/* D7643C 8024009C 3C020001 */ lui $v0, 1 -/* D76440 802400A0 3442000C */ ori $v0, $v0, 0xc -/* D76444 802400A4 0044102A */ slt $v0, $v0, $a0 -/* D76448 802400A8 1040000E */ beqz $v0, .L802400E4 -/* D7644C 802400AC 3C020100 */ lui $v0, 0x100 -.L802400B0: -/* D76450 802400B0 03E00008 */ jr $ra -/* D76454 802400B4 0080102D */ daddu $v0, $a0, $zero -.L802400B8: -/* D76458 802400B8 3C02FFF9 */ lui $v0, 0xfff9 -/* D7645C 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D76460 802400C0 00821821 */ addu $v1, $a0, $v0 -/* D76464 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D76468 802400C8 10400005 */ beqz $v0, .L802400E0 -/* D7646C 802400CC 30620001 */ andi $v0, $v1, 1 -/* D76470 802400D0 1440FFF7 */ bnez $v0, .L802400B0 -/* D76474 802400D4 24820001 */ addiu $v0, $a0, 1 -/* D76478 802400D8 03E00008 */ jr $ra -/* D7647C 802400DC 00000000 */ nop -.L802400E0: -/* D76480 802400E0 3C020100 */ lui $v0, 0x100 -.L802400E4: -/* D76484 802400E4 03E00008 */ jr $ra -/* D76488 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_20/func_802400EC_D763A0.s b/asm/nonmatchings/world/area_pra/pra_20/func_802400EC_D763A0.s deleted file mode 100644 index 239440b6c2..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/func_802400EC_D763A0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_D7648C -/* D7648C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D76490 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* D76494 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D76498 802400F8 3C058024 */ lui $a1, 0x8024 -/* D7649C 802400FC 24A50128 */ addiu $a1, $a1, 0x128 -/* D764A0 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* D764A4 80240104 0C048C56 */ jal bind_dynamic_entity_3 -/* D764A8 80240108 0000202D */ daddu $a0, $zero, $zero -/* D764AC 8024010C 8E03013C */ lw $v1, 0x13c($s0) -/* D764B0 80240110 AC620000 */ sw $v0, ($v1) -/* D764B4 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* D764B8 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* D764BC 8024011C 24020002 */ addiu $v0, $zero, 2 -/* D764C0 80240120 03E00008 */ jr $ra -/* D764C4 80240124 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_20/func_80240128_D763A0.s b/asm/nonmatchings/world/area_pra/pra_20/func_80240128_D763A0.s deleted file mode 100644 index 3aa7b668f9..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/func_80240128_D763A0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240128_D764C8 -/* D764C8 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D764CC 8024012C AFB00040 */ sw $s0, 0x40($sp) -/* D764D0 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D764D4 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D764D8 80240138 AFB20048 */ sw $s2, 0x48($sp) -/* D764DC 8024013C AFBF004C */ sw $ra, 0x4c($sp) -/* D764E0 80240140 AFB10044 */ sw $s1, 0x44($sp) -/* D764E4 80240144 8E020000 */ lw $v0, ($s0) -/* D764E8 80240148 821100BE */ lb $s1, 0xbe($s0) -/* D764EC 8024014C 30420001 */ andi $v0, $v0, 1 -/* D764F0 80240150 10400061 */ beqz $v0, .L802402D8 -/* D764F4 80240154 27B20020 */ addiu $s2, $sp, 0x20 -/* D764F8 80240158 8E0400CC */ lw $a0, 0xcc($s0) -/* D764FC 8024015C 0C044181 */ jal get_shadow_by_index -/* D76500 80240160 00000000 */ nop -/* D76504 80240164 0C048B77 */ jal func_80122DDC -/* D76508 80240168 84440008 */ lh $a0, 8($v0) -/* D7650C 8024016C 8C430000 */ lw $v1, ($v0) -/* D76510 80240170 34630200 */ ori $v1, $v1, 0x200 -/* D76514 80240174 AC430000 */ sw $v1, ($v0) -/* D76518 80240178 8E050028 */ lw $a1, 0x28($s0) -/* D7651C 8024017C 8E06002C */ lw $a2, 0x2c($s0) -/* D76520 80240180 27A20030 */ addiu $v0, $sp, 0x30 -/* D76524 80240184 AFA20010 */ sw $v0, 0x10($sp) -/* D76528 80240188 27A20034 */ addiu $v0, $sp, 0x34 -/* D7652C 8024018C AFA20014 */ sw $v0, 0x14($sp) -/* D76530 80240190 C6000030 */ lwc1 $f0, 0x30($s0) -/* D76534 80240194 3C04800A */ lui $a0, 0x800a -/* D76538 80240198 8484A634 */ lh $a0, -0x59cc($a0) -/* D7653C 8024019C 46000007 */ neg.s $f0, $f0 -/* D76540 802401A0 44070000 */ mfc1 $a3, $f0 -/* D76544 802401A4 27A20038 */ addiu $v0, $sp, 0x38 -/* D76548 802401A8 0C00B94E */ jal get_screen_coords -/* D7654C 802401AC AFA20018 */ sw $v0, 0x18($sp) -/* D76550 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D76554 802401B4 0C090008 */ jal func_80240020 -/* D76558 802401B8 00000000 */ nop -/* D7655C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) -/* D76560 802401C0 3C014307 */ lui $at, 0x4307 -/* D76564 802401C4 44810000 */ mtc1 $at, $f0 -/* D76568 802401C8 00000000 */ nop -/* D7656C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D76570 802401D0 00000000 */ nop -/* D76574 802401D4 4500000B */ bc1f .L80240204 -/* D76578 802401D8 24040002 */ addiu $a0, $zero, 2 -/* D7657C 802401DC 3C014361 */ lui $at, 0x4361 -/* D76580 802401E0 44810000 */ mtc1 $at, $f0 -/* D76584 802401E4 00000000 */ nop -/* D76588 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D7658C 802401EC 00000000 */ nop -/* D76590 802401F0 45000004 */ bc1f .L80240204 -/* D76594 802401F4 00000000 */ nop -/* D76598 802401F8 0C090015 */ jal func_80240054 -/* D7659C 802401FC 0040202D */ daddu $a0, $v0, $zero -/* D765A0 80240200 24040002 */ addiu $a0, $zero, 2 -.L80240204: -/* D765A4 80240204 3C063F80 */ lui $a2, 0x3f80 -/* D765A8 80240208 0C0B76A3 */ jal func_802DDA8C -/* D765AC 8024020C 0040282D */ daddu $a1, $v0, $zero -/* D765B0 80240210 8E020000 */ lw $v0, ($s0) -/* D765B4 80240214 3C030002 */ lui $v1, 2 -/* D765B8 80240218 00431024 */ and $v0, $v0, $v1 -/* D765BC 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 -/* D765C0 80240220 24110011 */ addiu $s1, $zero, 0x11 -/* D765C4 80240224 9203000E */ lbu $v1, 0xe($s0) -/* D765C8 80240228 3C02802E */ lui $v0, 0x802e -/* D765CC 8024022C 90429D70 */ lbu $v0, -0x6290($v0) -/* D765D0 80240230 10620018 */ beq $v1, $v0, .L80240294 -/* D765D4 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D765D8 80240238 1040000B */ beqz $v0, .L80240268 -/* D765DC 8024023C 24110011 */ addiu $s1, $zero, 0x11 -/* D765E0 80240240 24040002 */ addiu $a0, $zero, 2 -/* D765E4 80240244 2405FFFF */ addiu $a1, $zero, -1 -/* D765E8 80240248 24060007 */ addiu $a2, $zero, 7 -/* D765EC 8024024C 0060102D */ daddu $v0, $v1, $zero -/* D765F0 80240250 0000382D */ daddu $a3, $zero, $zero -/* D765F4 80240254 AFA00010 */ sw $zero, 0x10($sp) -/* D765F8 80240258 AFA00014 */ sw $zero, 0x14($sp) -/* D765FC 8024025C AFA0001C */ sw $zero, 0x1c($sp) -/* D76600 80240260 080900A3 */ j .L8024028C -/* D76604 80240264 AFA20018 */ sw $v0, 0x18($sp) -.L80240268: -/* D76608 80240268 2411000D */ addiu $s1, $zero, 0xd -/* D7660C 8024026C 24040002 */ addiu $a0, $zero, 2 -/* D76610 80240270 2405FFFF */ addiu $a1, $zero, -1 -/* D76614 80240274 0000302D */ daddu $a2, $zero, $zero -/* D76618 80240278 00C0382D */ daddu $a3, $a2, $zero -/* D7661C 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* D76620 80240280 AFA00014 */ sw $zero, 0x14($sp) -/* D76624 80240284 AFA00018 */ sw $zero, 0x18($sp) -/* D76628 80240288 AFA0001C */ sw $zero, 0x1c($sp) -.L8024028C: -/* D7662C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D76630 80240290 00000000 */ nop -.L80240294: -/* D76634 80240294 9202000E */ lbu $v0, 0xe($s0) -/* D76638 80240298 3C01802E */ lui $at, 0x802e -/* D7663C 8024029C A0229D70 */ sb $v0, -0x6290($at) -/* D76640 802402A0 080900AD */ j .L802402B4 -/* D76644 802402A4 0240202D */ daddu $a0, $s2, $zero -.L802402A8: -/* D76648 802402A8 3C01802E */ lui $at, 0x802e -/* D7664C 802402AC A0209D70 */ sb $zero, -0x6290($at) -/* D76650 802402B0 0240202D */ daddu $a0, $s2, $zero -.L802402B4: -/* D76654 802402B4 AC910000 */ sw $s1, ($a0) -/* D76658 802402B8 AC900008 */ sw $s0, 8($a0) -/* D7665C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D76660 802402C0 3C038024 */ lui $v1, 0x8024 -/* D76664 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 -/* D76668 802402C8 AC83000C */ sw $v1, 0xc($a0) -/* D7666C 802402CC 00021023 */ negu $v0, $v0 -/* D76670 802402D0 0C047644 */ jal queue_render_task -/* D76674 802402D4 AC820004 */ sw $v0, 4($a0) -.L802402D8: -/* D76678 802402D8 8FBF004C */ lw $ra, 0x4c($sp) -/* D7667C 802402DC 8FB20048 */ lw $s2, 0x48($sp) -/* D76680 802402E0 8FB10044 */ lw $s1, 0x44($sp) -/* D76684 802402E4 8FB00040 */ lw $s0, 0x40($sp) -/* D76688 802402E8 03E00008 */ jr $ra -/* D7668C 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_20/func_802402F0_D763A0.s b/asm/nonmatchings/world/area_pra/pra_20/func_802402F0_D763A0.s deleted file mode 100644 index ef0c889b7c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/func_802402F0_D763A0.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D76690 -/* D76690 802402F0 3C03800A */ lui $v1, 0x800a -/* D76694 802402F4 8463A634 */ lh $v1, -0x59cc($v1) -/* D76698 802402F8 3C07BF80 */ lui $a3, 0xbf80 -/* D7669C 802402FC 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D766A0 80240300 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D766A4 80240304 4480A000 */ mtc1 $zero, $f20 -/* D766A8 80240308 AFB1011C */ sw $s1, 0x11c($sp) -/* D766AC 8024030C 0080882D */ daddu $s1, $a0, $zero -/* D766B0 80240310 AFB00118 */ sw $s0, 0x118($sp) -/* D766B4 80240314 27B00098 */ addiu $s0, $sp, 0x98 -/* D766B8 80240318 AFBF0120 */ sw $ra, 0x120($sp) -/* D766BC 8024031C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D766C0 80240320 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D766C4 80240324 00031080 */ sll $v0, $v1, 2 -/* D766C8 80240328 00431021 */ addu $v0, $v0, $v1 -/* D766CC 8024032C 00021080 */ sll $v0, $v0, 2 -/* D766D0 80240330 00431023 */ subu $v0, $v0, $v1 -/* D766D4 80240334 000218C0 */ sll $v1, $v0, 3 -/* D766D8 80240338 00431021 */ addu $v0, $v0, $v1 -/* D766DC 8024033C 000210C0 */ sll $v0, $v0, 3 -/* D766E0 80240340 3C01800B */ lui $at, 0x800b -/* D766E4 80240344 00220821 */ addu $at, $at, $v0 -/* D766E8 80240348 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D766EC 8024034C 4406A000 */ mfc1 $a2, $f20 -/* D766F0 80240350 4600B587 */ neg.s $f22, $f22 -/* D766F4 80240354 4405B000 */ mfc1 $a1, $f22 -/* D766F8 80240358 0200202D */ daddu $a0, $s0, $zero -/* D766FC 8024035C 0C019EC8 */ jal guRotateF -/* D76700 80240360 E7B40010 */ swc1 $f20, 0x10($sp) -/* D76704 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D76708 80240368 0C00A6C9 */ jal clamp_angle -/* D7670C 8024036C 00000000 */ nop -/* D76710 80240370 44050000 */ mfc1 $a1, $f0 -/* D76714 80240374 4406A000 */ mfc1 $a2, $f20 -/* D76718 80240378 4407A000 */ mfc1 $a3, $f20 -/* D7671C 8024037C 3C013F80 */ lui $at, 0x3f80 -/* D76720 80240380 4481C000 */ mtc1 $at, $f24 -/* D76724 80240384 27A40018 */ addiu $a0, $sp, 0x18 -/* D76728 80240388 0C019EC8 */ jal guRotateF -/* D7672C 8024038C E7B80010 */ swc1 $f24, 0x10($sp) -/* D76730 80240390 0200202D */ daddu $a0, $s0, $zero -/* D76734 80240394 27A50018 */ addiu $a1, $sp, 0x18 -/* D76738 80240398 0C019D80 */ jal guMtxCatF -/* D7673C 8024039C 00A0302D */ daddu $a2, $a1, $zero -/* D76740 802403A0 4405B000 */ mfc1 $a1, $f22 -/* D76744 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D76748 802403A8 4407C000 */ mfc1 $a3, $f24 -/* D7674C 802403AC 0200202D */ daddu $a0, $s0, $zero -/* D76750 802403B0 0C019EC8 */ jal guRotateF -/* D76754 802403B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D76758 802403B8 27A40018 */ addiu $a0, $sp, 0x18 -/* D7675C 802403BC 0200282D */ daddu $a1, $s0, $zero -/* D76760 802403C0 0C019D80 */ jal guMtxCatF -/* D76764 802403C4 0080302D */ daddu $a2, $a0, $zero -/* D76768 802403C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D7676C 802403CC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D76770 802403D0 4406A000 */ mfc1 $a2, $f20 -/* D76774 802403D4 4407C000 */ mfc1 $a3, $f24 -/* D76778 802403D8 0C019EC8 */ jal guRotateF -/* D7677C 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D76780 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* D76784 802403E4 0200282D */ daddu $a1, $s0, $zero -/* D76788 802403E8 0C019D80 */ jal guMtxCatF -/* D7678C 802403EC 0080302D */ daddu $a2, $a0, $zero -/* D76790 802403F0 3C013F36 */ lui $at, 0x3f36 -/* D76794 802403F4 3421DB6E */ ori $at, $at, 0xdb6e -/* D76798 802403F8 44810000 */ mtc1 $at, $f0 -/* D7679C 802403FC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D767A0 80240400 44050000 */ mfc1 $a1, $f0 -/* D767A4 80240404 0200202D */ daddu $a0, $s0, $zero -/* D767A8 80240408 00A0302D */ daddu $a2, $a1, $zero -/* D767AC 8024040C 0C019DF0 */ jal guScaleF -/* D767B0 80240410 00A0382D */ daddu $a3, $a1, $zero -/* D767B4 80240414 27A40018 */ addiu $a0, $sp, 0x18 -/* D767B8 80240418 0200282D */ daddu $a1, $s0, $zero -/* D767BC 8024041C 0C019D80 */ jal guMtxCatF -/* D767C0 80240420 0080302D */ daddu $a2, $a0, $zero -/* D767C4 80240424 27B00058 */ addiu $s0, $sp, 0x58 -/* D767C8 80240428 C6200030 */ lwc1 $f0, 0x30($s1) -/* D767CC 8024042C 3C014040 */ lui $at, 0x4040 -/* D767D0 80240430 44811000 */ mtc1 $at, $f2 -/* D767D4 80240434 46000007 */ neg.s $f0, $f0 -/* D767D8 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* D767DC 8024043C 8E250028 */ lw $a1, 0x28($s1) -/* D767E0 80240440 8E26002C */ lw $a2, 0x2c($s1) -/* D767E4 80240444 44070000 */ mfc1 $a3, $f0 -/* D767E8 80240448 0C019E40 */ jal guTranslateF -/* D767EC 8024044C 0200202D */ daddu $a0, $s0, $zero -/* D767F0 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* D767F4 80240454 0200282D */ daddu $a1, $s0, $zero -/* D767F8 80240458 0C019D80 */ jal guMtxCatF -/* D767FC 8024045C 0080302D */ daddu $a2, $a0, $zero -/* D76800 80240460 24040002 */ addiu $a0, $zero, 2 -/* D76804 80240464 0000282D */ daddu $a1, $zero, $zero -/* D76808 80240468 00A0302D */ daddu $a2, $a1, $zero -/* D7680C 8024046C 00A0382D */ daddu $a3, $a1, $zero -/* D76810 80240470 27A20018 */ addiu $v0, $sp, 0x18 -/* D76814 80240474 0C0B7710 */ jal render_sprite -/* D76818 80240478 AFA20010 */ sw $v0, 0x10($sp) -/* D7681C 8024047C 8FBF0120 */ lw $ra, 0x120($sp) -/* D76820 80240480 8FB1011C */ lw $s1, 0x11c($sp) -/* D76824 80240484 8FB00118 */ lw $s0, 0x118($sp) -/* D76828 80240488 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D7682C 8024048C D7B60130 */ ldc1 $f22, 0x130($sp) -/* D76830 80240490 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D76834 80240494 03E00008 */ jr $ra -/* D76838 80240498 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_20/func_8024049C_D763A0.s b/asm/nonmatchings/world/area_pra/pra_20/func_8024049C_D763A0.s deleted file mode 100644 index 1e62c5296b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/func_8024049C_D763A0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_D7683C -/* D7683C 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D76840 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* D76844 802404A4 0080802D */ daddu $s0, $a0, $zero -/* D76848 802404A8 AFBF0014 */ sw $ra, 0x14($sp) -/* D7684C 802404AC 8E020084 */ lw $v0, 0x84($s0) -/* D76850 802404B0 0440000E */ bltz $v0, .L802404EC -/* D76854 802404B4 28420002 */ slti $v0, $v0, 2 -/* D76858 802404B8 1040000C */ beqz $v0, .L802404EC -/* D7685C 802404BC 00000000 */ nop -/* D76860 802404C0 3C058024 */ lui $a1, 0x8024 -/* D76864 802404C4 24A50500 */ addiu $a1, $a1, 0x500 -/* D76868 802404C8 0C048C56 */ jal bind_dynamic_entity_3 -/* D7686C 802404CC 0000202D */ daddu $a0, $zero, $zero -/* D76870 802404D0 8E03013C */ lw $v1, 0x13c($s0) -/* D76874 802404D4 AC620000 */ sw $v0, ($v1) -/* D76878 802404D8 3C03800A */ lui $v1, %hi(D_8009A650) -/* D7687C 802404DC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D76880 802404E0 8C620000 */ lw $v0, ($v1) -/* D76884 802404E4 34420080 */ ori $v0, $v0, 0x80 -/* D76888 802404E8 AC620000 */ sw $v0, ($v1) -.L802404EC: -/* D7688C 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* D76890 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* D76894 802404F4 24020002 */ addiu $v0, $zero, 2 -/* D76898 802404F8 03E00008 */ jr $ra -/* D7689C 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_20/func_80240500_D763A0.s b/asm/nonmatchings/world/area_pra/pra_20/func_80240500_D763A0.s deleted file mode 100644 index c4dd29303b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/func_80240500_D763A0.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_D768A0 -/* D768A0 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D768A4 80240504 AFB00040 */ sw $s0, 0x40($sp) -/* D768A8 80240508 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D768AC 8024050C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D768B0 80240510 AFB10044 */ sw $s1, 0x44($sp) -/* D768B4 80240514 AFBF004C */ sw $ra, 0x4c($sp) -/* D768B8 80240518 AFB20048 */ sw $s2, 0x48($sp) -/* D768BC 8024051C 8E020000 */ lw $v0, ($s0) -/* D768C0 80240520 821200BE */ lb $s2, 0xbe($s0) -/* D768C4 80240524 30420001 */ andi $v0, $v0, 1 -/* D768C8 80240528 10400052 */ beqz $v0, .L80240674 -/* D768CC 8024052C 27B10020 */ addiu $s1, $sp, 0x20 -/* D768D0 80240530 8E0400CC */ lw $a0, 0xcc($s0) -/* D768D4 80240534 0C044181 */ jal get_shadow_by_index -/* D768D8 80240538 00000000 */ nop -/* D768DC 8024053C 0C048B77 */ jal func_80122DDC -/* D768E0 80240540 84440008 */ lh $a0, 8($v0) -/* D768E4 80240544 8E050028 */ lw $a1, 0x28($s0) -/* D768E8 80240548 8E070030 */ lw $a3, 0x30($s0) -/* D768EC 8024054C 27A20030 */ addiu $v0, $sp, 0x30 -/* D768F0 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* D768F4 80240554 27A20034 */ addiu $v0, $sp, 0x34 -/* D768F8 80240558 AFA20014 */ sw $v0, 0x14($sp) -/* D768FC 8024055C 27A20038 */ addiu $v0, $sp, 0x38 -/* D76900 80240560 AFA20018 */ sw $v0, 0x18($sp) -/* D76904 80240564 C600002C */ lwc1 $f0, 0x2c($s0) -/* D76908 80240568 3C04800A */ lui $a0, 0x800a -/* D7690C 8024056C 8484A634 */ lh $a0, -0x59cc($a0) -/* D76910 80240570 46000007 */ neg.s $f0, $f0 -/* D76914 80240574 44060000 */ mfc1 $a2, $f0 -/* D76918 80240578 0C00B94E */ jal get_screen_coords -/* D7691C 8024057C 00000000 */ nop -/* D76920 80240580 8E0500A4 */ lw $a1, 0xa4($s0) -/* D76924 80240584 3C063F80 */ lui $a2, 0x3f80 -/* D76928 80240588 0C0B76A3 */ jal func_802DDA8C -/* D7692C 8024058C 24040001 */ addiu $a0, $zero, 1 -/* D76930 80240590 8E020000 */ lw $v0, ($s0) -/* D76934 80240594 3C030002 */ lui $v1, 2 -/* D76938 80240598 00431024 */ and $v0, $v0, $v1 -/* D7693C 8024059C 54400022 */ bnel $v0, $zero, .L80240628 -/* D76940 802405A0 24120011 */ addiu $s2, $zero, 0x11 -/* D76944 802405A4 9203000E */ lbu $v1, 0xe($s0) -/* D76948 802405A8 3C02802E */ lui $v0, 0x802e -/* D7694C 802405AC 90429D71 */ lbu $v0, -0x628f($v0) -/* D76950 802405B0 10620018 */ beq $v1, $v0, .L80240614 -/* D76954 802405B4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D76958 802405B8 1040000B */ beqz $v0, .L802405E8 -/* D7695C 802405BC 24120011 */ addiu $s2, $zero, 0x11 -/* D76960 802405C0 24040001 */ addiu $a0, $zero, 1 -/* D76964 802405C4 2405FFFF */ addiu $a1, $zero, -1 -/* D76968 802405C8 24060007 */ addiu $a2, $zero, 7 -/* D7696C 802405CC 0060102D */ daddu $v0, $v1, $zero -/* D76970 802405D0 0000382D */ daddu $a3, $zero, $zero -/* D76974 802405D4 AFA00010 */ sw $zero, 0x10($sp) -/* D76978 802405D8 AFA00014 */ sw $zero, 0x14($sp) -/* D7697C 802405DC AFA0001C */ sw $zero, 0x1c($sp) -/* D76980 802405E0 08090183 */ j .L8024060C -/* D76984 802405E4 AFA20018 */ sw $v0, 0x18($sp) -.L802405E8: -/* D76988 802405E8 2412000D */ addiu $s2, $zero, 0xd -/* D7698C 802405EC 24040001 */ addiu $a0, $zero, 1 -/* D76990 802405F0 2405FFFF */ addiu $a1, $zero, -1 -/* D76994 802405F4 0000302D */ daddu $a2, $zero, $zero -/* D76998 802405F8 00C0382D */ daddu $a3, $a2, $zero -/* D7699C 802405FC AFA00010 */ sw $zero, 0x10($sp) -/* D769A0 80240600 AFA00014 */ sw $zero, 0x14($sp) -/* D769A4 80240604 AFA00018 */ sw $zero, 0x18($sp) -/* D769A8 80240608 AFA0001C */ sw $zero, 0x1c($sp) -.L8024060C: -/* D769AC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D769B0 80240610 00000000 */ nop -.L80240614: -/* D769B4 80240614 9202000E */ lbu $v0, 0xe($s0) -/* D769B8 80240618 3C01802E */ lui $at, 0x802e -/* D769BC 8024061C A0229D71 */ sb $v0, -0x628f($at) -/* D769C0 80240620 0809018C */ j .L80240630 -/* D769C4 80240624 00000000 */ nop -.L80240628: -/* D769C8 80240628 3C01802E */ lui $at, 0x802e -/* D769CC 8024062C A0209D71 */ sb $zero, -0x628f($at) -.L80240630: -/* D769D0 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D769D4 80240634 3C048024 */ lui $a0, 0x8024 -/* D769D8 80240638 24840870 */ addiu $a0, $a0, 0x870 -/* D769DC 8024063C AE320000 */ sw $s2, ($s1) -/* D769E0 80240640 AE300008 */ sw $s0, 8($s1) -/* D769E4 80240644 00021023 */ negu $v0, $v0 -/* D769E8 80240648 AE220004 */ sw $v0, 4($s1) -/* D769EC 8024064C 8E020000 */ lw $v0, ($s0) -/* D769F0 80240650 3C030002 */ lui $v1, 2 -/* D769F4 80240654 00431024 */ and $v0, $v0, $v1 -/* D769F8 80240658 54400004 */ bnel $v0, $zero, .L8024066C -/* D769FC 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D76A00 80240660 3C048024 */ lui $a0, 0x8024 -/* D76A04 80240664 2484068C */ addiu $a0, $a0, 0x68c -/* D76A08 80240668 AE24000C */ sw $a0, 0xc($s1) -.L8024066C: -/* D76A0C 8024066C 0C047644 */ jal queue_render_task -/* D76A10 80240670 0220202D */ daddu $a0, $s1, $zero -.L80240674: -/* D76A14 80240674 8FBF004C */ lw $ra, 0x4c($sp) -/* D76A18 80240678 8FB20048 */ lw $s2, 0x48($sp) -/* D76A1C 8024067C 8FB10044 */ lw $s1, 0x44($sp) -/* D76A20 80240680 8FB00040 */ lw $s0, 0x40($sp) -/* D76A24 80240684 03E00008 */ jr $ra -/* D76A28 80240688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_20/func_8024068C_D763A0.s b/asm/nonmatchings/world/area_pra/pra_20/func_8024068C_D763A0.s deleted file mode 100644 index 5722dea5bf..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/func_8024068C_D763A0.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_D76A2C -/* D76A2C 8024068C 3C03800A */ lui $v1, 0x800a -/* D76A30 80240690 8463A634 */ lh $v1, -0x59cc($v1) -/* D76A34 80240694 3C07BF80 */ lui $a3, 0xbf80 -/* D76A38 80240698 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D76A3C 8024069C F7B40128 */ sdc1 $f20, 0x128($sp) -/* D76A40 802406A0 4480A000 */ mtc1 $zero, $f20 -/* D76A44 802406A4 AFB1011C */ sw $s1, 0x11c($sp) -/* D76A48 802406A8 0080882D */ daddu $s1, $a0, $zero -/* D76A4C 802406AC AFB00118 */ sw $s0, 0x118($sp) -/* D76A50 802406B0 27B00098 */ addiu $s0, $sp, 0x98 -/* D76A54 802406B4 AFBF0120 */ sw $ra, 0x120($sp) -/* D76A58 802406B8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D76A5C 802406BC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D76A60 802406C0 00031080 */ sll $v0, $v1, 2 -/* D76A64 802406C4 00431021 */ addu $v0, $v0, $v1 -/* D76A68 802406C8 00021080 */ sll $v0, $v0, 2 -/* D76A6C 802406CC 00431023 */ subu $v0, $v0, $v1 -/* D76A70 802406D0 000218C0 */ sll $v1, $v0, 3 -/* D76A74 802406D4 00431021 */ addu $v0, $v0, $v1 -/* D76A78 802406D8 000210C0 */ sll $v0, $v0, 3 -/* D76A7C 802406DC 3C01800B */ lui $at, 0x800b -/* D76A80 802406E0 00220821 */ addu $at, $at, $v0 -/* D76A84 802406E4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D76A88 802406E8 4406A000 */ mfc1 $a2, $f20 -/* D76A8C 802406EC 4600B587 */ neg.s $f22, $f22 -/* D76A90 802406F0 4405B000 */ mfc1 $a1, $f22 -/* D76A94 802406F4 0200202D */ daddu $a0, $s0, $zero -/* D76A98 802406F8 0C019EC8 */ jal guRotateF -/* D76A9C 802406FC E7B40010 */ swc1 $f20, 0x10($sp) -/* D76AA0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D76AA4 80240704 0C00A6C9 */ jal clamp_angle -/* D76AA8 80240708 00000000 */ nop -/* D76AAC 8024070C 44050000 */ mfc1 $a1, $f0 -/* D76AB0 80240710 4406A000 */ mfc1 $a2, $f20 -/* D76AB4 80240714 4407A000 */ mfc1 $a3, $f20 -/* D76AB8 80240718 3C013F80 */ lui $at, 0x3f80 -/* D76ABC 8024071C 4481C000 */ mtc1 $at, $f24 -/* D76AC0 80240720 27A40018 */ addiu $a0, $sp, 0x18 -/* D76AC4 80240724 0C019EC8 */ jal guRotateF -/* D76AC8 80240728 E7B80010 */ swc1 $f24, 0x10($sp) -/* D76ACC 8024072C 0200202D */ daddu $a0, $s0, $zero -/* D76AD0 80240730 27A50018 */ addiu $a1, $sp, 0x18 -/* D76AD4 80240734 0C019D80 */ jal guMtxCatF -/* D76AD8 80240738 00A0302D */ daddu $a2, $a1, $zero -/* D76ADC 8024073C 4405B000 */ mfc1 $a1, $f22 -/* D76AE0 80240740 4406A000 */ mfc1 $a2, $f20 -/* D76AE4 80240744 4407C000 */ mfc1 $a3, $f24 -/* D76AE8 80240748 0200202D */ daddu $a0, $s0, $zero -/* D76AEC 8024074C 0C019EC8 */ jal guRotateF -/* D76AF0 80240750 E7B40010 */ swc1 $f20, 0x10($sp) -/* D76AF4 80240754 27A40018 */ addiu $a0, $sp, 0x18 -/* D76AF8 80240758 0200282D */ daddu $a1, $s0, $zero -/* D76AFC 8024075C 0C019D80 */ jal guMtxCatF -/* D76B00 80240760 0080302D */ daddu $a2, $a0, $zero -/* D76B04 80240764 E7B40010 */ swc1 $f20, 0x10($sp) -/* D76B08 80240768 8E2500A8 */ lw $a1, 0xa8($s1) -/* D76B0C 8024076C 4406A000 */ mfc1 $a2, $f20 -/* D76B10 80240770 4407C000 */ mfc1 $a3, $f24 -/* D76B14 80240774 0C019EC8 */ jal guRotateF -/* D76B18 80240778 0200202D */ daddu $a0, $s0, $zero -/* D76B1C 8024077C 27A40018 */ addiu $a0, $sp, 0x18 -/* D76B20 80240780 0200282D */ daddu $a1, $s0, $zero -/* D76B24 80240784 0C019D80 */ jal guMtxCatF -/* D76B28 80240788 0080302D */ daddu $a2, $a0, $zero -/* D76B2C 8024078C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D76B30 80240790 3C013F36 */ lui $at, 0x3f36 -/* D76B34 80240794 3421DB6E */ ori $at, $at, 0xdb6e -/* D76B38 80240798 44810000 */ mtc1 $at, $f0 -/* D76B3C 8024079C 0200202D */ daddu $a0, $s0, $zero -/* D76B40 802407A0 44050000 */ mfc1 $a1, $f0 -/* D76B44 802407A4 3C06BF36 */ lui $a2, 0xbf36 -/* D76B48 802407A8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D76B4C 802407AC 0C019DF0 */ jal guScaleF -/* D76B50 802407B0 00A0382D */ daddu $a3, $a1, $zero -/* D76B54 802407B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D76B58 802407B8 0200282D */ daddu $a1, $s0, $zero -/* D76B5C 802407BC 0C019D80 */ jal guMtxCatF -/* D76B60 802407C0 0080302D */ daddu $a2, $a0, $zero -/* D76B64 802407C4 27B00058 */ addiu $s0, $sp, 0x58 -/* D76B68 802407C8 8E250028 */ lw $a1, 0x28($s1) -/* D76B6C 802407CC C620002C */ lwc1 $f0, 0x2c($s1) -/* D76B70 802407D0 8E270030 */ lw $a3, 0x30($s1) -/* D76B74 802407D4 46000007 */ neg.s $f0, $f0 -/* D76B78 802407D8 44060000 */ mfc1 $a2, $f0 -/* D76B7C 802407DC 0C019E40 */ jal guTranslateF -/* D76B80 802407E0 0200202D */ daddu $a0, $s0, $zero -/* D76B84 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D76B88 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D76B8C 802407EC 0C019D80 */ jal guMtxCatF -/* D76B90 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D76B94 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D76B98 802407F8 3C0142B4 */ lui $at, 0x42b4 -/* D76B9C 802407FC 44810000 */ mtc1 $at, $f0 -/* D76BA0 80240800 00000000 */ nop -/* D76BA4 80240804 4602003E */ c.le.s $f0, $f2 -/* D76BA8 80240808 00000000 */ nop -/* D76BAC 8024080C 4500000A */ bc1f .L80240838 -/* D76BB0 80240810 24040001 */ addiu $a0, $zero, 1 -/* D76BB4 80240814 3C014387 */ lui $at, 0x4387 -/* D76BB8 80240818 44810000 */ mtc1 $at, $f0 -/* D76BBC 8024081C 00000000 */ nop -/* D76BC0 80240820 4600103C */ c.lt.s $f2, $f0 -/* D76BC4 80240824 00000000 */ nop -/* D76BC8 80240828 45000004 */ bc1f .L8024083C -/* D76BCC 8024082C 27A20018 */ addiu $v0, $sp, 0x18 -/* D76BD0 80240830 3C041000 */ lui $a0, 0x1000 -/* D76BD4 80240834 34840001 */ ori $a0, $a0, 1 -.L80240838: -/* D76BD8 80240838 27A20018 */ addiu $v0, $sp, 0x18 -.L8024083C: -/* D76BDC 8024083C 0000282D */ daddu $a1, $zero, $zero -/* D76BE0 80240840 00A0302D */ daddu $a2, $a1, $zero -/* D76BE4 80240844 00A0382D */ daddu $a3, $a1, $zero -/* D76BE8 80240848 0C0B7710 */ jal render_sprite -/* D76BEC 8024084C AFA20010 */ sw $v0, 0x10($sp) -/* D76BF0 80240850 8FBF0120 */ lw $ra, 0x120($sp) -/* D76BF4 80240854 8FB1011C */ lw $s1, 0x11c($sp) -/* D76BF8 80240858 8FB00118 */ lw $s0, 0x118($sp) -/* D76BFC 8024085C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D76C00 80240860 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D76C04 80240864 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D76C08 80240868 03E00008 */ jr $ra -/* D76C0C 8024086C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_20/func_80240870_D763A0.s b/asm/nonmatchings/world/area_pra/pra_20/func_80240870_D763A0.s deleted file mode 100644 index 6eaf6acb1e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/func_80240870_D763A0.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_D76C10 -/* D76C10 80240870 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D76C14 80240874 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D76C18 80240878 4480B000 */ mtc1 $zero, $f22 -/* D76C1C 8024087C AFB10134 */ sw $s1, 0x134($sp) -/* D76C20 80240880 0080882D */ daddu $s1, $a0, $zero -/* D76C24 80240884 AFB3013C */ sw $s3, 0x13c($sp) -/* D76C28 80240888 0000982D */ daddu $s3, $zero, $zero -/* D76C2C 8024088C AFB60148 */ sw $s6, 0x148($sp) -/* D76C30 80240890 3C16800B */ lui $s6, %hi(gCameras) -/* D76C34 80240894 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D76C38 80240898 AFB50144 */ sw $s5, 0x144($sp) -/* D76C3C 8024089C 241500FF */ addiu $s5, $zero, 0xff -/* D76C40 802408A0 AFB00130 */ sw $s0, 0x130($sp) -/* D76C44 802408A4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D76C48 802408A8 AFB20138 */ sw $s2, 0x138($sp) -/* D76C4C 802408AC 27B20060 */ addiu $s2, $sp, 0x60 -/* D76C50 802408B0 AFB40140 */ sw $s4, 0x140($sp) -/* D76C54 802408B4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D76C58 802408B8 AFBF014C */ sw $ra, 0x14c($sp) -/* D76C5C 802408BC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D76C60 802408C0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D76C64 802408C4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D76C68 802408C8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D76C6C 802408CC F7B40150 */ sdc1 $f20, 0x150($sp) -.L802408D0: -/* D76C70 802408D0 3C03800A */ lui $v1, 0x800a -/* D76C74 802408D4 8463A634 */ lh $v1, -0x59cc($v1) -/* D76C78 802408D8 00031080 */ sll $v0, $v1, 2 -/* D76C7C 802408DC 00431021 */ addu $v0, $v0, $v1 -/* D76C80 802408E0 00021080 */ sll $v0, $v0, 2 -/* D76C84 802408E4 00431023 */ subu $v0, $v0, $v1 -/* D76C88 802408E8 000218C0 */ sll $v1, $v0, 3 -/* D76C8C 802408EC 00431021 */ addu $v0, $v0, $v1 -/* D76C90 802408F0 000210C0 */ sll $v0, $v0, 3 -/* D76C94 802408F4 00561021 */ addu $v0, $v0, $s6 -/* D76C98 802408F8 C440006C */ lwc1 $f0, 0x6c($v0) -/* D76C9C 802408FC 16600065 */ bnez $s3, .L80240A94 -/* D76CA0 80240900 46000507 */ neg.s $f20, $f0 -/* D76CA4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D76CA8 80240908 3C0142B4 */ lui $at, 0x42b4 -/* D76CAC 8024090C 44810000 */ mtc1 $at, $f0 -/* D76CB0 80240910 00000000 */ nop -/* D76CB4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D76CB8 80240918 00000000 */ nop -/* D76CBC 8024091C 4500000A */ bc1f .L80240948 -/* D76CC0 80240920 00000000 */ nop -/* D76CC4 80240924 3C014334 */ lui $at, 0x4334 -/* D76CC8 80240928 44812000 */ mtc1 $at, $f4 -/* D76CCC 8024092C 00000000 */ nop -/* D76CD0 80240930 4604103E */ c.le.s $f2, $f4 -/* D76CD4 80240934 00000000 */ nop -/* D76CD8 80240938 45000003 */ bc1f .L80240948 -/* D76CDC 8024093C 00000000 */ nop -/* D76CE0 80240940 08090276 */ j .L802409D8 -/* D76CE4 80240944 46022501 */ sub.s $f20, $f4, $f2 -.L80240948: -/* D76CE8 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D76CEC 8024094C 3C014334 */ lui $at, 0x4334 -/* D76CF0 80240950 44812000 */ mtc1 $at, $f4 -/* D76CF4 80240954 00000000 */ nop -/* D76CF8 80240958 4600203C */ c.lt.s $f4, $f0 -/* D76CFC 8024095C 00000000 */ nop -/* D76D00 80240960 4500000C */ bc1f .L80240994 -/* D76D04 80240964 00000000 */ nop -/* D76D08 80240968 3C014387 */ lui $at, 0x4387 -/* D76D0C 8024096C 44812000 */ mtc1 $at, $f4 -/* D76D10 80240970 00000000 */ nop -/* D76D14 80240974 4604003E */ c.le.s $f0, $f4 -/* D76D18 80240978 00000000 */ nop -/* D76D1C 8024097C 45000008 */ bc1f .L802409A0 -/* D76D20 80240980 00000000 */ nop -/* D76D24 80240984 3C014334 */ lui $at, 0x4334 -/* D76D28 80240988 44812000 */ mtc1 $at, $f4 -/* D76D2C 8024098C 08090276 */ j .L802409D8 -/* D76D30 80240990 46040501 */ sub.s $f20, $f0, $f4 -.L80240994: -/* D76D34 80240994 3C014387 */ lui $at, 0x4387 -/* D76D38 80240998 44812000 */ mtc1 $at, $f4 -/* D76D3C 8024099C 00000000 */ nop -.L802409A0: -/* D76D40 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D76D44 802409A4 00000000 */ nop -/* D76D48 802409A8 4500000A */ bc1f .L802409D4 -/* D76D4C 802409AC 00000000 */ nop -/* D76D50 802409B0 3C0143B4 */ lui $at, 0x43b4 -/* D76D54 802409B4 44811000 */ mtc1 $at, $f2 -/* D76D58 802409B8 00000000 */ nop -/* D76D5C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D76D60 802409C0 00000000 */ nop -/* D76D64 802409C4 45000003 */ bc1f .L802409D4 -/* D76D68 802409C8 00000000 */ nop -/* D76D6C 802409CC 08090276 */ j .L802409D8 -/* D76D70 802409D0 46001501 */ sub.s $f20, $f2, $f0 -.L802409D4: -/* D76D74 802409D4 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L802409D8: -/* D76D78 802409D8 3C0141C8 */ lui $at, 0x41c8 -/* D76D7C 802409DC 44810000 */ mtc1 $at, $f0 -/* D76D80 802409E0 00000000 */ nop -/* D76D84 802409E4 4600A003 */ div.s $f0, $f20, $f0 -/* D76D88 802409E8 4600010D */ trunc.w.s $f4, $f0 -/* D76D8C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D76D90 802409F0 00000000 */ nop -/* D76D94 802409F4 00071100 */ sll $v0, $a3, 4 -/* D76D98 802409F8 00471023 */ subu $v0, $v0, $a3 -/* D76D9C 802409FC 00021080 */ sll $v0, $v0, 2 -/* D76DA0 80240A00 02A23823 */ subu $a3, $s5, $v0 -/* D76DA4 80240A04 28E20064 */ slti $v0, $a3, 0x64 -/* D76DA8 80240A08 54400001 */ bnel $v0, $zero, .L80240A10 -/* D76DAC 80240A0C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A10: -/* D76DB0 80240A10 24040001 */ addiu $a0, $zero, 1 -/* D76DB4 80240A14 2405FFFF */ addiu $a1, $zero, -1 -/* D76DB8 80240A18 24060006 */ addiu $a2, $zero, 6 -/* D76DBC 80240A1C AFA70010 */ sw $a3, 0x10($sp) -/* D76DC0 80240A20 AFA70014 */ sw $a3, 0x14($sp) -/* D76DC4 80240A24 AFB50018 */ sw $s5, 0x18($sp) -/* D76DC8 80240A28 0C0B77B9 */ jal func_802DDEE4 -/* D76DCC 80240A2C AFA0001C */ sw $zero, 0x1c($sp) -/* D76DD0 80240A30 4405A000 */ mfc1 $a1, $f20 -/* D76DD4 80240A34 4406B000 */ mfc1 $a2, $f22 -/* D76DD8 80240A38 3C07BF80 */ lui $a3, 0xbf80 -/* D76DDC 80240A3C 0200202D */ daddu $a0, $s0, $zero -/* D76DE0 80240A40 0C019EC8 */ jal guRotateF -/* D76DE4 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D76DE8 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D76DEC 80240A4C 0C00A6C9 */ jal clamp_angle -/* D76DF0 80240A50 00000000 */ nop -/* D76DF4 80240A54 44050000 */ mfc1 $a1, $f0 -/* D76DF8 80240A58 4406B000 */ mfc1 $a2, $f22 -/* D76DFC 80240A5C 4407B000 */ mfc1 $a3, $f22 -/* D76E00 80240A60 3C013F80 */ lui $at, 0x3f80 -/* D76E04 80240A64 44812000 */ mtc1 $at, $f4 -/* D76E08 80240A68 27A40020 */ addiu $a0, $sp, 0x20 -/* D76E0C 80240A6C 0C019EC8 */ jal guRotateF -/* D76E10 80240A70 E7A40010 */ swc1 $f4, 0x10($sp) -/* D76E14 80240A74 0200202D */ daddu $a0, $s0, $zero -/* D76E18 80240A78 27A50020 */ addiu $a1, $sp, 0x20 -/* D76E1C 80240A7C 0C019D80 */ jal guMtxCatF -/* D76E20 80240A80 00A0302D */ daddu $a2, $a1, $zero -/* D76E24 80240A84 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D76E28 80240A88 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D76E2C 80240A8C 080902D6 */ j .L80240B58 -/* D76E30 80240A90 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240A94: -/* D76E34 80240A94 0260202D */ daddu $a0, $s3, $zero -/* D76E38 80240A98 27A50120 */ addiu $a1, $sp, 0x120 -/* D76E3C 80240A9C 27A60124 */ addiu $a2, $sp, 0x124 -/* D76E40 80240AA0 0C03964E */ jal func_800E5938 -/* D76E44 80240AA4 27A70128 */ addiu $a3, $sp, 0x128 -/* D76E48 80240AA8 8FA60124 */ lw $a2, 0x124($sp) -/* D76E4C 80240AAC 3C028000 */ lui $v0, 0x8000 -/* D76E50 80240AB0 14C20004 */ bne $a2, $v0, .L80240AC4 -/* D76E54 80240AB4 46000606 */ mov.s $f24, $f0 -/* D76E58 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D76E5C 80240ABC 080902B5 */ j .L80240AD4 -/* D76E60 80240AC0 24040001 */ addiu $a0, $zero, 1 -.L80240AC4: -/* D76E64 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D76E68 80240AC8 00000000 */ nop -/* D76E6C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D76E70 80240AD0 24040001 */ addiu $a0, $zero, 1 -.L80240AD4: -/* D76E74 80240AD4 2405FFFF */ addiu $a1, $zero, -1 -/* D76E78 80240AD8 24060007 */ addiu $a2, $zero, 7 -/* D76E7C 80240ADC 0000382D */ daddu $a3, $zero, $zero -/* D76E80 80240AE0 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D76E84 80240AE4 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D76E88 80240AE8 24020040 */ addiu $v0, $zero, 0x40 -/* D76E8C 80240AEC AFA00010 */ sw $zero, 0x10($sp) -/* D76E90 80240AF0 AFA00014 */ sw $zero, 0x14($sp) -/* D76E94 80240AF4 AFA20018 */ sw $v0, 0x18($sp) -/* D76E98 80240AF8 0C0B77B9 */ jal func_802DDEE4 -/* D76E9C 80240AFC AFA0001C */ sw $zero, 0x1c($sp) -/* D76EA0 80240B00 4405A000 */ mfc1 $a1, $f20 -/* D76EA4 80240B04 4406B000 */ mfc1 $a2, $f22 -/* D76EA8 80240B08 3C07BF80 */ lui $a3, 0xbf80 -/* D76EAC 80240B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* D76EB0 80240B10 0C019EC8 */ jal guRotateF -/* D76EB4 80240B14 E7B60010 */ swc1 $f22, 0x10($sp) -/* D76EB8 80240B18 4405A000 */ mfc1 $a1, $f20 -/* D76EBC 80240B1C 4406B000 */ mfc1 $a2, $f22 -/* D76EC0 80240B20 3C07BF80 */ lui $a3, 0xbf80 -/* D76EC4 80240B24 0200202D */ daddu $a0, $s0, $zero -/* D76EC8 80240B28 0C019EC8 */ jal guRotateF -/* D76ECC 80240B2C E7B60010 */ swc1 $f22, 0x10($sp) -/* D76ED0 80240B30 4405C000 */ mfc1 $a1, $f24 -/* D76ED4 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D76ED8 80240B38 3C073F80 */ lui $a3, 0x3f80 -/* D76EDC 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D76EE0 80240B40 0C019EC8 */ jal guRotateF -/* D76EE4 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D76EE8 80240B48 0200202D */ daddu $a0, $s0, $zero -/* D76EEC 80240B4C 27A50020 */ addiu $a1, $sp, 0x20 -/* D76EF0 80240B50 0C019D80 */ jal guMtxCatF -/* D76EF4 80240B54 00A0302D */ daddu $a2, $a1, $zero -.L80240B58: -/* D76EF8 80240B58 862200B0 */ lh $v0, 0xb0($s1) -/* D76EFC 80240B5C 3C013F00 */ lui $at, 0x3f00 -/* D76F00 80240B60 44812000 */ mtc1 $at, $f4 -/* D76F04 80240B64 00021023 */ negu $v0, $v0 -/* D76F08 80240B68 44820000 */ mtc1 $v0, $f0 -/* D76F0C 80240B6C 00000000 */ nop -/* D76F10 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* D76F14 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D76F18 80240B78 00000000 */ nop -/* D76F1C 80240B7C 4405B000 */ mfc1 $a1, $f22 -/* D76F20 80240B80 4407B000 */ mfc1 $a3, $f22 -/* D76F24 80240B84 44062000 */ mfc1 $a2, $f4 -/* D76F28 80240B88 0C019E40 */ jal guTranslateF -/* D76F2C 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* D76F30 80240B90 0240202D */ daddu $a0, $s2, $zero -/* D76F34 80240B94 27A50020 */ addiu $a1, $sp, 0x20 -/* D76F38 80240B98 0C019D80 */ jal guMtxCatF -/* D76F3C 80240B9C 00A0302D */ daddu $a2, $a1, $zero -/* D76F40 80240BA0 4405A000 */ mfc1 $a1, $f20 -/* D76F44 80240BA4 4406B000 */ mfc1 $a2, $f22 -/* D76F48 80240BA8 3C073F80 */ lui $a3, 0x3f80 -/* D76F4C 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* D76F50 80240BB0 0C019EC8 */ jal guRotateF -/* D76F54 80240BB4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D76F58 80240BB8 27A40020 */ addiu $a0, $sp, 0x20 -/* D76F5C 80240BBC 0200282D */ daddu $a1, $s0, $zero -/* D76F60 80240BC0 0C019D80 */ jal guMtxCatF -/* D76F64 80240BC4 0080302D */ daddu $a2, $a0, $zero -/* D76F68 80240BC8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D76F6C 80240BCC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D76F70 80240BD0 4406B000 */ mfc1 $a2, $f22 -/* D76F74 80240BD4 3C073F80 */ lui $a3, 0x3f80 -/* D76F78 80240BD8 0C019EC8 */ jal guRotateF -/* D76F7C 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D76F80 80240BE0 27A40020 */ addiu $a0, $sp, 0x20 -/* D76F84 80240BE4 0200282D */ daddu $a1, $s0, $zero -/* D76F88 80240BE8 0C019D80 */ jal guMtxCatF -/* D76F8C 80240BEC 0080302D */ daddu $a2, $a0, $zero -/* D76F90 80240BF0 862200B0 */ lh $v0, 0xb0($s1) -/* D76F94 80240BF4 3C013F00 */ lui $at, 0x3f00 -/* D76F98 80240BF8 44812000 */ mtc1 $at, $f4 -/* D76F9C 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D76FA0 80240C00 00000000 */ nop -/* D76FA4 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* D76FA8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D76FAC 80240C0C 00000000 */ nop -/* D76FB0 80240C10 4405B000 */ mfc1 $a1, $f22 -/* D76FB4 80240C14 4407B000 */ mfc1 $a3, $f22 -/* D76FB8 80240C18 44062000 */ mfc1 $a2, $f4 -/* D76FBC 80240C1C 0C019E40 */ jal guTranslateF -/* D76FC0 80240C20 0240202D */ daddu $a0, $s2, $zero -/* D76FC4 80240C24 27A40020 */ addiu $a0, $sp, 0x20 -/* D76FC8 80240C28 0240282D */ daddu $a1, $s2, $zero -/* D76FCC 80240C2C 0C019D80 */ jal guMtxCatF -/* D76FD0 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D76FD4 80240C34 3C013F36 */ lui $at, 0x3f36 -/* D76FD8 80240C38 3421DB6E */ ori $at, $at, 0xdb6e -/* D76FDC 80240C3C 44810000 */ mtc1 $at, $f0 -/* D76FE0 80240C40 0280202D */ daddu $a0, $s4, $zero -/* D76FE4 80240C44 44050000 */ mfc1 $a1, $f0 -/* D76FE8 80240C48 3C06BF36 */ lui $a2, 0xbf36 -/* D76FEC 80240C4C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D76FF0 80240C50 0C019DF0 */ jal guScaleF -/* D76FF4 80240C54 00A0382D */ daddu $a3, $a1, $zero -/* D76FF8 80240C58 27A40020 */ addiu $a0, $sp, 0x20 -/* D76FFC 80240C5C 0280282D */ daddu $a1, $s4, $zero -/* D77000 80240C60 0C019D80 */ jal guMtxCatF -/* D77004 80240C64 0080302D */ daddu $a2, $a0, $zero -/* D77008 80240C68 4600D687 */ neg.s $f26, $f26 -/* D7700C 80240C6C 4405F000 */ mfc1 $a1, $f30 -/* D77010 80240C70 4407E000 */ mfc1 $a3, $f28 -/* D77014 80240C74 4406D000 */ mfc1 $a2, $f26 -/* D77018 80240C78 0C019E40 */ jal guTranslateF -/* D7701C 80240C7C 0240202D */ daddu $a0, $s2, $zero -/* D77020 80240C80 27A40020 */ addiu $a0, $sp, 0x20 -/* D77024 80240C84 0240282D */ daddu $a1, $s2, $zero -/* D77028 80240C88 0C019D80 */ jal guMtxCatF -/* D7702C 80240C8C 0080302D */ daddu $a2, $a0, $zero -/* D77030 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D77034 80240C94 3C0142B4 */ lui $at, 0x42b4 -/* D77038 80240C98 44810000 */ mtc1 $at, $f0 -/* D7703C 80240C9C 00000000 */ nop -/* D77040 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D77044 80240CA4 00000000 */ nop -/* D77048 80240CA8 4500000A */ bc1f .L80240CD4 -/* D7704C 80240CAC 24040001 */ addiu $a0, $zero, 1 -/* D77050 80240CB0 3C014387 */ lui $at, 0x4387 -/* D77054 80240CB4 44812000 */ mtc1 $at, $f4 -/* D77058 80240CB8 00000000 */ nop -/* D7705C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D77060 80240CC0 00000000 */ nop -/* D77064 80240CC4 45000004 */ bc1f .L80240CD8 -/* D77068 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 -/* D7706C 80240CCC 3C041000 */ lui $a0, 0x1000 -/* D77070 80240CD0 34840001 */ ori $a0, $a0, 1 -.L80240CD4: -/* D77074 80240CD4 27A20020 */ addiu $v0, $sp, 0x20 -.L80240CD8: -/* D77078 80240CD8 AFA20010 */ sw $v0, 0x10($sp) -/* D7707C 80240CDC 0000282D */ daddu $a1, $zero, $zero -/* D77080 80240CE0 00A0302D */ daddu $a2, $a1, $zero -/* D77084 80240CE4 0C0B7710 */ jal render_sprite -/* D77088 80240CE8 00A0382D */ daddu $a3, $a1, $zero -/* D7708C 80240CEC 26730001 */ addiu $s3, $s3, 1 -/* D77090 80240CF0 2A620002 */ slti $v0, $s3, 2 -/* D77094 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D77098 80240CF8 00000000 */ nop -/* D7709C 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) -/* D770A0 80240D00 8FB60148 */ lw $s6, 0x148($sp) -/* D770A4 80240D04 8FB50144 */ lw $s5, 0x144($sp) -/* D770A8 80240D08 8FB40140 */ lw $s4, 0x140($sp) -/* D770AC 80240D0C 8FB3013C */ lw $s3, 0x13c($sp) -/* D770B0 80240D10 8FB20138 */ lw $s2, 0x138($sp) -/* D770B4 80240D14 8FB10134 */ lw $s1, 0x134($sp) -/* D770B8 80240D18 8FB00130 */ lw $s0, 0x130($sp) -/* D770BC 80240D1C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D770C0 80240D20 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D770C4 80240D24 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D770C8 80240D28 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D770CC 80240D2C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D770D0 80240D30 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D770D4 80240D34 03E00008 */ jr $ra -/* D770D8 80240D38 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_20/func_80240D3C_D763A0.s b/asm/nonmatchings/world/area_pra/pra_20/func_80240D3C_D763A0.s deleted file mode 100644 index 89cd213031..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/func_80240D3C_D763A0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_D770DC -/* D770DC 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D770E0 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D770E4 80240D44 0080802D */ daddu $s0, $a0, $zero -/* D770E8 80240D48 AFBF0014 */ sw $ra, 0x14($sp) -/* D770EC 80240D4C 8E020088 */ lw $v0, 0x88($s0) -/* D770F0 80240D50 14400017 */ bnez $v0, .L80240DB0 -/* D770F4 80240D54 24020001 */ addiu $v0, $zero, 1 -/* D770F8 80240D58 8E030084 */ lw $v1, 0x84($s0) -/* D770FC 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D77100 80240D60 00000000 */ nop -/* D77104 80240D64 28620002 */ slti $v0, $v1, 2 -/* D77108 80240D68 50400005 */ beql $v0, $zero, .L80240D80 -/* D7710C 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* D77110 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D77114 80240D74 00000000 */ nop -/* D77118 80240D78 08090378 */ j .L80240DE0 -/* D7711C 80240D7C 00000000 */ nop -.L80240D80: -/* D77120 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D77124 80240D84 00000000 */ nop -/* D77128 80240D88 08090378 */ j .L80240DE0 -/* D7712C 80240D8C 00000000 */ nop -.L80240D90: -/* D77130 80240D90 3C048024 */ lui $a0, 0x8024 -/* D77134 80240D94 24840E84 */ addiu $a0, $a0, 0xe84 -/* D77138 80240D98 08090374 */ j .L80240DD0 -/* D7713C 80240D9C 00000000 */ nop -.L80240DA0: -/* D77140 80240DA0 3C048024 */ lui $a0, 0x8024 -/* D77144 80240DA4 24840EEC */ addiu $a0, $a0, 0xeec -/* D77148 80240DA8 08090374 */ j .L80240DD0 -/* D7714C 80240DAC 00000000 */ nop -.L80240DB0: -/* D77150 80240DB0 8E020084 */ lw $v0, 0x84($s0) -/* D77154 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D77158 80240DB8 00000000 */ nop -/* D7715C 80240DBC 28420002 */ slti $v0, $v0, 2 -/* D77160 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D77164 80240DC4 00000000 */ nop -.L80240DC8: -/* D77168 80240DC8 3C048024 */ lui $a0, 0x8024 -/* D7716C 80240DCC 24840EB8 */ addiu $a0, $a0, 0xeb8 -.L80240DD0: -/* D77170 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 -/* D77174 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* D77178 80240DD8 8E03013C */ lw $v1, 0x13c($s0) -/* D7717C 80240DDC AC620004 */ sw $v0, 4($v1) -.L80240DE0: -/* D77180 80240DE0 0C00EAD2 */ jal get_npc_safe -/* D77184 80240DE4 2404FFFC */ addiu $a0, $zero, -4 -/* D77188 80240DE8 0040282D */ daddu $a1, $v0, $zero -/* D7718C 80240DEC 10A00021 */ beqz $a1, .L80240E74 -/* D77190 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* D77194 80240DF4 8E020088 */ lw $v0, 0x88($s0) -/* D77198 80240DF8 14400014 */ bnez $v0, .L80240E4C -/* D7719C 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* D771A0 80240E00 8E040084 */ lw $a0, 0x84($s0) -/* D771A4 80240E04 10820016 */ beq $a0, $v0, .L80240E60 -/* D771A8 80240E08 28820002 */ slti $v0, $a0, 2 -/* D771AC 80240E0C 10400005 */ beqz $v0, .L80240E24 -/* D771B0 80240E10 24020002 */ addiu $v0, $zero, 2 -/* D771B4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D771B8 80240E18 00000000 */ nop -/* D771BC 80240E1C 0809039D */ j .L80240E74 -/* D771C0 80240E20 00000000 */ nop -.L80240E24: -/* D771C4 80240E24 10820006 */ beq $a0, $v0, .L80240E40 -/* D771C8 80240E28 24020002 */ addiu $v0, $zero, 2 -/* D771CC 80240E2C 0809039D */ j .L80240E74 -/* D771D0 80240E30 00000000 */ nop -.L80240E34: -/* D771D4 80240E34 8CA20000 */ lw $v0, ($a1) -/* D771D8 80240E38 0809039A */ j .L80240E68 -/* D771DC 80240E3C 3C03000A */ lui $v1, 0xa -.L80240E40: -/* D771E0 80240E40 8CA20000 */ lw $v0, ($a1) -/* D771E4 80240E44 0809039A */ j .L80240E68 -/* D771E8 80240E48 3C030002 */ lui $v1, 2 -.L80240E4C: -/* D771EC 80240E4C 8E020084 */ lw $v0, 0x84($s0) -/* D771F0 80240E50 04400007 */ bltz $v0, .L80240E70 -/* D771F4 80240E54 28420002 */ slti $v0, $v0, 2 -/* D771F8 80240E58 10400006 */ beqz $v0, .L80240E74 -/* D771FC 80240E5C 24020002 */ addiu $v0, $zero, 2 -.L80240E60: -/* D77200 80240E60 8CA20000 */ lw $v0, ($a1) -/* D77204 80240E64 3C030008 */ lui $v1, 8 -.L80240E68: -/* D77208 80240E68 00431025 */ or $v0, $v0, $v1 -/* D7720C 80240E6C ACA20000 */ sw $v0, ($a1) -.L80240E70: -/* D77210 80240E70 24020002 */ addiu $v0, $zero, 2 -.L80240E74: -/* D77214 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* D77218 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* D7721C 80240E7C 03E00008 */ jr $ra -/* D77220 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_20/func_80240E84_D763A0.s b/asm/nonmatchings/world/area_pra/pra_20/func_80240E84_D763A0.s deleted file mode 100644 index 0d92f872a7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/func_80240E84_D763A0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D77224 -/* D77224 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D77228 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D7722C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D77230 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D77234 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D77238 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D7723C 80240E9C 3C03000A */ lui $v1, 0xa -/* D77240 80240EA0 8C820000 */ lw $v0, ($a0) -/* D77244 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D77248 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D7724C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D77250 80240EB0 03E00008 */ jr $ra -/* D77254 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_20/func_80240EB8_D763A0.s b/asm/nonmatchings/world/area_pra/pra_20/func_80240EB8_D763A0.s deleted file mode 100644 index 29bbc75b9b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/func_80240EB8_D763A0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D77258 -/* D77258 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7725C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D77260 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D77264 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D77268 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D7726C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D77270 80240ED0 3C030008 */ lui $v1, 8 -/* D77274 80240ED4 8C820000 */ lw $v0, ($a0) -/* D77278 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D7727C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D77280 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D77284 80240EE4 03E00008 */ jr $ra -/* D77288 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_20/func_80240EEC_D763A0.s b/asm/nonmatchings/world/area_pra/pra_20/func_80240EEC_D763A0.s deleted file mode 100644 index b4ab4a302b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/func_80240EEC_D763A0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D7728C -/* D7728C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D77290 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D77294 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D77298 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D7729C 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D772A0 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D772A4 80240F04 3C030002 */ lui $v1, 2 -/* D772A8 80240F08 8C820000 */ lw $v0, ($a0) -/* D772AC 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D772B0 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D772B4 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D772B8 80240F18 03E00008 */ jr $ra -/* D772BC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_21/func_80240020_D77F20.s b/asm/nonmatchings/world/area_pra/pra_21/func_80240020_D77F20.s deleted file mode 100644 index 994f1b401f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_21/func_80240020_D77F20.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D77F40 -/* D77F40 80240020 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* D77F44 80240024 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* D77F48 80240028 C4620080 */ lwc1 $f2, 0x80($v1) -/* D77F4C 8024002C 44800000 */ mtc1 $zero, $f0 -/* D77F50 80240030 00000000 */ nop -/* D77F54 80240034 4602003E */ c.le.s $f0, $f2 -/* D77F58 80240038 00000000 */ nop -/* D77F5C 8024003C 4500000A */ bc1f .L80240068 -/* D77F60 80240040 00000000 */ nop -/* D77F64 80240044 3C014334 */ lui $at, 0x4334 -/* D77F68 80240048 44810000 */ mtc1 $at, $f0 -/* D77F6C 8024004C 00000000 */ nop -/* D77F70 80240050 4600103C */ c.lt.s $f2, $f0 -/* D77F74 80240054 00000000 */ nop -/* D77F78 80240058 45000006 */ bc1f .L80240074 -/* D77F7C 8024005C 240201A9 */ addiu $v0, $zero, 0x1a9 -/* D77F80 80240060 AC820084 */ sw $v0, 0x84($a0) -/* D77F84 80240064 C4620080 */ lwc1 $f2, 0x80($v1) -.L80240068: -/* D77F88 80240068 3C014334 */ lui $at, 0x4334 -/* D77F8C 8024006C 44810000 */ mtc1 $at, $f0 -/* D77F90 80240070 00000000 */ nop -.L80240074: -/* D77F94 80240074 4602003E */ c.le.s $f0, $f2 -/* D77F98 80240078 00000000 */ nop -/* D77F9C 8024007C 45000009 */ bc1f .L802400A4 -/* D77FA0 80240080 00000000 */ nop -/* D77FA4 80240084 3C0143B4 */ lui $at, 0x43b4 -/* D77FA8 80240088 44810000 */ mtc1 $at, $f0 -/* D77FAC 8024008C 00000000 */ nop -/* D77FB0 80240090 4600103C */ c.lt.s $f2, $f0 -/* D77FB4 80240094 00000000 */ nop -/* D77FB8 80240098 45000002 */ bc1f .L802400A4 -/* D77FBC 8024009C 24020145 */ addiu $v0, $zero, 0x145 -/* D77FC0 802400A0 AC820084 */ sw $v0, 0x84($a0) -.L802400A4: -/* D77FC4 802400A4 03E00008 */ jr $ra -/* D77FC8 802400A8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_pra/pra_21/func_802400AC_D77F20.s b/asm/nonmatchings/world/area_pra/pra_21/func_802400AC_D77F20.s deleted file mode 100644 index 1a7b3060dd..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_21/func_802400AC_D77F20.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400AC_D77FCC -/* D77FCC 802400AC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D77FD0 802400B0 AFB10014 */ sw $s1, 0x14($sp) -/* D77FD4 802400B4 0080882D */ daddu $s1, $a0, $zero -/* D77FD8 802400B8 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* D77FDC 802400BC 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* D77FE0 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* D77FE4 802400C4 AFB00010 */ sw $s0, 0x10($sp) -/* D77FE8 802400C8 84430018 */ lh $v1, 0x18($v0) -/* D77FEC 802400CC 14600005 */ bnez $v1, .L802400E4 -/* D77FF0 802400D0 0040802D */ daddu $s0, $v0, $zero -/* D77FF4 802400D4 3C05FD05 */ lui $a1, 0xfd05 -/* D77FF8 802400D8 34A50F80 */ ori $a1, $a1, 0xf80 -/* D77FFC 802400DC 0C0B2026 */ jal set_variable -/* D78000 802400E0 0000302D */ daddu $a2, $zero, $zero -.L802400E4: -/* D78004 802400E4 86030018 */ lh $v1, 0x18($s0) -/* D78008 802400E8 2402FF38 */ addiu $v0, $zero, -0xc8 -/* D7800C 802400EC 14620005 */ bne $v1, $v0, .L80240104 -/* D78010 802400F0 0220202D */ daddu $a0, $s1, $zero -/* D78014 802400F4 3C05FD05 */ lui $a1, 0xfd05 -/* D78018 802400F8 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7801C 802400FC 0C0B2026 */ jal set_variable -/* D78020 80240100 24060001 */ addiu $a2, $zero, 1 -.L80240104: -/* D78024 80240104 8FBF0018 */ lw $ra, 0x18($sp) -/* D78028 80240108 8FB10014 */ lw $s1, 0x14($sp) -/* D7802C 8024010C 8FB00010 */ lw $s0, 0x10($sp) -/* D78030 80240110 0000102D */ daddu $v0, $zero, $zero -/* D78034 80240114 03E00008 */ jr $ra -/* D78038 80240118 27BD0020 */ addiu $sp, $sp, 0x20 -/* D7803C 8024011C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_22/func_80240020_D78880.s b/asm/nonmatchings/world/area_pra/pra_22/func_80240020_D78880.s deleted file mode 100644 index 1d50ec83ec..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_22/func_80240020_D78880.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D788A0 -/* D788A0 80240020 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D788A4 80240024 AFB00010 */ sw $s0, 0x10($sp) -/* D788A8 80240028 0080802D */ daddu $s0, $a0, $zero -/* D788AC 8024002C AFBF0014 */ sw $ra, 0x14($sp) -/* D788B0 80240030 8E02000C */ lw $v0, 0xc($s0) -/* D788B4 80240034 0C0B1EAF */ jal get_variable -/* D788B8 80240038 8C450000 */ lw $a1, ($v0) -/* D788BC 8024003C 0040302D */ daddu $a2, $v0, $zero -/* D788C0 80240040 3C058016 */ lui $a1, 0x8016 -/* D788C4 80240044 84A5A550 */ lh $a1, -0x5ab0($a1) -/* D788C8 80240048 3C048011 */ lui $a0, %hi(gPlayerStatus) -/* D788CC 8024004C 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) -/* D788D0 80240050 10A60004 */ beq $a1, $a2, .L80240064 -/* D788D4 80240054 24020014 */ addiu $v0, $zero, 0x14 -/* D788D8 80240058 808300B4 */ lb $v1, 0xb4($a0) -/* D788DC 8024005C 10620006 */ beq $v1, $v0, .L80240078 -/* D788E0 80240060 00000000 */ nop -.L80240064: -/* D788E4 80240064 8C820014 */ lw $v0, 0x14($a0) -/* D788E8 80240068 3C03FFFF */ lui $v1, 0xffff -/* D788EC 8024006C 00431024 */ and $v0, $v0, $v1 -/* D788F0 80240070 10400005 */ beqz $v0, .L80240088 -/* D788F4 80240074 00000000 */ nop -.L80240078: -/* D788F8 80240078 0C039769 */ jal set_action_state -/* D788FC 8024007C 0000202D */ daddu $a0, $zero, $zero -/* D78900 80240080 08090032 */ j .L802400C8 -/* D78904 80240084 AE000084 */ sw $zero, 0x84($s0) -.L80240088: -/* D78908 80240088 54A6000F */ bnel $a1, $a2, .L802400C8 -/* D7890C 8024008C AE000084 */ sw $zero, 0x84($s0) -/* D78910 80240090 808300B4 */ lb $v1, 0xb4($a0) -/* D78914 80240094 24020014 */ addiu $v0, $zero, 0x14 -/* D78918 80240098 10620005 */ beq $v1, $v0, .L802400B0 -/* D7891C 8024009C 24020001 */ addiu $v0, $zero, 1 -/* D78920 802400A0 10620003 */ beq $v1, $v0, .L802400B0 -/* D78924 802400A4 24020002 */ addiu $v0, $zero, 2 -/* D78928 802400A8 54620008 */ bnel $v1, $v0, .L802400CC -/* D7892C 802400AC AE000084 */ sw $zero, 0x84($s0) -.L802400B0: -/* D78930 802400B0 8C820004 */ lw $v0, 4($a0) -/* D78934 802400B4 30420001 */ andi $v0, $v0, 1 -/* D78938 802400B8 54400003 */ bnel $v0, $zero, .L802400C8 -/* D7893C 802400BC AE000084 */ sw $zero, 0x84($s0) -/* D78940 802400C0 24020001 */ addiu $v0, $zero, 1 -/* D78944 802400C4 AE020084 */ sw $v0, 0x84($s0) -.L802400C8: -/* D78948 802400C8 24020002 */ addiu $v0, $zero, 2 -.L802400CC: -/* D7894C 802400CC 8FBF0014 */ lw $ra, 0x14($sp) -/* D78950 802400D0 8FB00010 */ lw $s0, 0x10($sp) -/* D78954 802400D4 03E00008 */ jr $ra -/* D78958 802400D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_22/func_802400DC_D78880.s b/asm/nonmatchings/world/area_pra/pra_22/func_802400DC_D78880.s deleted file mode 100644 index 7581d52b25..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_22/func_802400DC_D78880.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_D7895C -/* D7895C 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D78960 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* D78964 802400E4 0080882D */ daddu $s1, $a0, $zero -/* D78968 802400E8 AFB00030 */ sw $s0, 0x30($sp) -/* D7896C 802400EC 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D78970 802400F0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D78974 802400F4 AFBF0038 */ sw $ra, 0x38($sp) -/* D78978 802400F8 C6200084 */ lwc1 $f0, 0x84($s1) -/* D7897C 802400FC 46800020 */ cvt.s.w $f0, $f0 -/* D78980 80240100 27A2002C */ addiu $v0, $sp, 0x2c -/* D78984 80240104 0000202D */ daddu $a0, $zero, $zero -/* D78988 80240108 27A50020 */ addiu $a1, $sp, 0x20 -/* D7898C 8024010C 27A60024 */ addiu $a2, $sp, 0x24 -/* D78990 80240110 E6000028 */ swc1 $f0, 0x28($s0) -/* D78994 80240114 E7A00020 */ swc1 $f0, 0x20($sp) -/* D78998 80240118 C600002C */ lwc1 $f0, 0x2c($s0) -/* D7899C 8024011C 3C014120 */ lui $at, 0x4120 -/* D789A0 80240120 44811000 */ mtc1 $at, $f2 -/* D789A4 80240124 C6040030 */ lwc1 $f4, 0x30($s0) -/* D789A8 80240128 3C014396 */ lui $at, 0x4396 -/* D789AC 8024012C 44813000 */ mtc1 $at, $f6 -/* D789B0 80240130 46020000 */ add.s $f0, $f0, $f2 -/* D789B4 80240134 E7A40028 */ swc1 $f4, 0x28($sp) -/* D789B8 80240138 E7A6002C */ swc1 $f6, 0x2c($sp) -/* D789BC 8024013C E7A00024 */ swc1 $f0, 0x24($sp) -/* D789C0 80240140 3C014387 */ lui $at, 0x4387 -/* D789C4 80240144 44810000 */ mtc1 $at, $f0 -/* D789C8 80240148 860300B2 */ lh $v1, 0xb2($s0) -/* D789CC 8024014C 27A70028 */ addiu $a3, $sp, 0x28 -/* D789D0 80240150 AFA20010 */ sw $v0, 0x10($sp) -/* D789D4 80240154 E7A00014 */ swc1 $f0, 0x14($sp) -/* D789D8 80240158 44830000 */ mtc1 $v1, $f0 -/* D789DC 8024015C 00000000 */ nop -/* D789E0 80240160 46800020 */ cvt.s.w $f0, $f0 -/* D789E4 80240164 0C0371DE */ jal func_800DC778 -/* D789E8 80240168 E7A00018 */ swc1 $f0, 0x18($sp) -/* D789EC 8024016C C7A00020 */ lwc1 $f0, 0x20($sp) -/* D789F0 80240170 C7A20028 */ lwc1 $f2, 0x28($sp) -/* D789F4 80240174 E6000028 */ swc1 $f0, 0x28($s0) -/* D789F8 80240178 E6020030 */ swc1 $f2, 0x30($s0) -/* D789FC 8024017C AE2000AC */ sw $zero, 0xac($s1) -/* D78A00 80240180 C602002C */ lwc1 $f2, 0x2c($s0) -/* D78A04 80240184 C7A00024 */ lwc1 $f0, 0x24($sp) -/* D78A08 80240188 46001032 */ c.eq.s $f2, $f0 -/* D78A0C 8024018C 00000000 */ nop -/* D78A10 80240190 45010009 */ bc1t .L802401B8 -/* D78A14 80240194 00000000 */ nop -/* D78A18 80240198 AE00002C */ sw $zero, 0x2c($s0) -/* D78A1C 8024019C 8E220090 */ lw $v0, 0x90($s1) -/* D78A20 802401A0 24420001 */ addiu $v0, $v0, 1 -/* D78A24 802401A4 AE220090 */ sw $v0, 0x90($s1) -/* D78A28 802401A8 2842001E */ slti $v0, $v0, 0x1e -/* D78A2C 802401AC 14400002 */ bnez $v0, .L802401B8 -/* D78A30 802401B0 24020001 */ addiu $v0, $zero, 1 -/* D78A34 802401B4 AE2200AC */ sw $v0, 0xac($s1) -.L802401B8: -/* D78A38 802401B8 8FBF0038 */ lw $ra, 0x38($sp) -/* D78A3C 802401BC 8FB10034 */ lw $s1, 0x34($sp) -/* D78A40 802401C0 8FB00030 */ lw $s0, 0x30($sp) -/* D78A44 802401C4 24020002 */ addiu $v0, $zero, 2 -/* D78A48 802401C8 03E00008 */ jr $ra -/* D78A4C 802401CC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_pra/pra_22/func_802401D0_D78880.s b/asm/nonmatchings/world/area_pra/pra_22/func_802401D0_D78880.s deleted file mode 100644 index 16feeddad4..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_22/func_802401D0_D78880.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_D78A50 -/* D78A50 802401D0 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* D78A54 802401D4 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* D78A58 802401D8 C4620080 */ lwc1 $f2, 0x80($v1) -/* D78A5C 802401DC 44800000 */ mtc1 $zero, $f0 -/* D78A60 802401E0 00000000 */ nop -/* D78A64 802401E4 4602003E */ c.le.s $f0, $f2 -/* D78A68 802401E8 00000000 */ nop -/* D78A6C 802401EC 4500000A */ bc1f .L80240218 -/* D78A70 802401F0 00000000 */ nop -/* D78A74 802401F4 3C014334 */ lui $at, 0x4334 -/* D78A78 802401F8 44810000 */ mtc1 $at, $f0 -/* D78A7C 802401FC 00000000 */ nop -/* D78A80 80240200 4600103C */ c.lt.s $f2, $f0 -/* D78A84 80240204 00000000 */ nop -/* D78A88 80240208 45000006 */ bc1f .L80240224 -/* D78A8C 8024020C 240201A9 */ addiu $v0, $zero, 0x1a9 -/* D78A90 80240210 AC820084 */ sw $v0, 0x84($a0) -/* D78A94 80240214 C4620080 */ lwc1 $f2, 0x80($v1) -.L80240218: -/* D78A98 80240218 3C014334 */ lui $at, 0x4334 -/* D78A9C 8024021C 44810000 */ mtc1 $at, $f0 -/* D78AA0 80240220 00000000 */ nop -.L80240224: -/* D78AA4 80240224 4602003E */ c.le.s $f0, $f2 -/* D78AA8 80240228 00000000 */ nop -/* D78AAC 8024022C 45000009 */ bc1f .L80240254 -/* D78AB0 80240230 00000000 */ nop -/* D78AB4 80240234 3C0143B4 */ lui $at, 0x43b4 -/* D78AB8 80240238 44810000 */ mtc1 $at, $f0 -/* D78ABC 8024023C 00000000 */ nop -/* D78AC0 80240240 4600103C */ c.lt.s $f2, $f0 -/* D78AC4 80240244 00000000 */ nop -/* D78AC8 80240248 45000002 */ bc1f .L80240254 -/* D78ACC 8024024C 24020145 */ addiu $v0, $zero, 0x145 -/* D78AD0 80240250 AC820084 */ sw $v0, 0x84($a0) -.L80240254: -/* D78AD4 80240254 03E00008 */ jr $ra -/* D78AD8 80240258 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_pra/pra_22/func_8024025C_D78880.s b/asm/nonmatchings/world/area_pra/pra_22/func_8024025C_D78880.s deleted file mode 100644 index 0ed6bad049..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_22/func_8024025C_D78880.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024025C_D78ADC -/* D78ADC 8024025C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D78AE0 80240260 AFB10014 */ sw $s1, 0x14($sp) -/* D78AE4 80240264 0080882D */ daddu $s1, $a0, $zero -/* D78AE8 80240268 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* D78AEC 8024026C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* D78AF0 80240270 AFBF0018 */ sw $ra, 0x18($sp) -/* D78AF4 80240274 AFB00010 */ sw $s0, 0x10($sp) -/* D78AF8 80240278 84430018 */ lh $v1, 0x18($v0) -/* D78AFC 8024027C 14600005 */ bnez $v1, .L80240294 -/* D78B00 80240280 0040802D */ daddu $s0, $v0, $zero -/* D78B04 80240284 3C05FD05 */ lui $a1, 0xfd05 -/* D78B08 80240288 34A50F80 */ ori $a1, $a1, 0xf80 -/* D78B0C 8024028C 0C0B2026 */ jal set_variable -/* D78B10 80240290 0000302D */ daddu $a2, $zero, $zero -.L80240294: -/* D78B14 80240294 86030018 */ lh $v1, 0x18($s0) -/* D78B18 80240298 2402FF38 */ addiu $v0, $zero, -0xc8 -/* D78B1C 8024029C 14620005 */ bne $v1, $v0, .L802402B4 -/* D78B20 802402A0 0220202D */ daddu $a0, $s1, $zero -/* D78B24 802402A4 3C05FD05 */ lui $a1, 0xfd05 -/* D78B28 802402A8 34A50F80 */ ori $a1, $a1, 0xf80 -/* D78B2C 802402AC 0C0B2026 */ jal set_variable -/* D78B30 802402B0 24060001 */ addiu $a2, $zero, 1 -.L802402B4: -/* D78B34 802402B4 8FBF0018 */ lw $ra, 0x18($sp) -/* D78B38 802402B8 8FB10014 */ lw $s1, 0x14($sp) -/* D78B3C 802402BC 8FB00010 */ lw $s0, 0x10($sp) -/* D78B40 802402C0 0000102D */ daddu $v0, $zero, $zero -/* D78B44 802402C4 03E00008 */ jr $ra -/* D78B48 802402C8 27BD0020 */ addiu $sp, $sp, 0x20 -/* D78B4C 802402CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_27/func_80240050_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/func_80240050_D799F0.s deleted file mode 100644 index 8a0f90ef96..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/func_80240050_D799F0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D79A40 -/* D79A40 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D79A44 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D79A48 80240058 00822024 */ and $a0, $a0, $v0 -/* D79A4C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D79A50 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D79A54 80240064 00821821 */ addu $v1, $a0, $v0 -/* D79A58 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D79A5C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D79A60 80240070 30620001 */ andi $v0, $v1, 1 -/* D79A64 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D79A68 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D79A6C 8024007C 03E00008 */ jr $ra -/* D79A70 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_27/func_80240084_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/func_80240084_D799F0.s deleted file mode 100644 index 19824b0e70..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/func_80240084_D799F0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240084_D79A74 -/* D79A74 80240084 00041403 */ sra $v0, $a0, 0x10 -/* D79A78 80240088 304300FF */ andi $v1, $v0, 0xff -/* D79A7C 8024008C 24020006 */ addiu $v0, $zero, 6 -/* D79A80 80240090 10620015 */ beq $v1, $v0, .L802400E8 -/* D79A84 80240094 28620007 */ slti $v0, $v1, 7 -/* D79A88 80240098 10400005 */ beqz $v0, .L802400B0 -/* D79A8C 8024009C 24020001 */ addiu $v0, $zero, 1 -/* D79A90 802400A0 1062000A */ beq $v1, $v0, .L802400CC -/* D79A94 802400A4 3C020100 */ lui $v0, 0x100 -/* D79A98 802400A8 03E00008 */ jr $ra -/* D79A9C 802400AC 00821025 */ or $v0, $a0, $v0 -.L802400B0: -/* D79AA0 802400B0 2862000A */ slti $v0, $v1, 0xa -/* D79AA4 802400B4 10400016 */ beqz $v0, .L80240110 -/* D79AA8 802400B8 28620008 */ slti $v0, $v1, 8 -/* D79AAC 802400BC 14400015 */ bnez $v0, .L80240114 -/* D79AB0 802400C0 3C020100 */ lui $v0, 0x100 -/* D79AB4 802400C4 03E00008 */ jr $ra -/* D79AB8 802400C8 0080102D */ daddu $v0, $a0, $zero -.L802400CC: -/* D79ABC 802400CC 3C020001 */ lui $v0, 1 -/* D79AC0 802400D0 3442000C */ ori $v0, $v0, 0xc -/* D79AC4 802400D4 0044102A */ slt $v0, $v0, $a0 -/* D79AC8 802400D8 1040000E */ beqz $v0, .L80240114 -/* D79ACC 802400DC 3C020100 */ lui $v0, 0x100 -.L802400E0: -/* D79AD0 802400E0 03E00008 */ jr $ra -/* D79AD4 802400E4 0080102D */ daddu $v0, $a0, $zero -.L802400E8: -/* D79AD8 802400E8 3C02FFF9 */ lui $v0, 0xfff9 -/* D79ADC 802400EC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D79AE0 802400F0 00821821 */ addu $v1, $a0, $v0 -/* D79AE4 802400F4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D79AE8 802400F8 10400005 */ beqz $v0, .L80240110 -/* D79AEC 802400FC 30620001 */ andi $v0, $v1, 1 -/* D79AF0 80240100 1440FFF7 */ bnez $v0, .L802400E0 -/* D79AF4 80240104 24820001 */ addiu $v0, $a0, 1 -/* D79AF8 80240108 03E00008 */ jr $ra -/* D79AFC 8024010C 00000000 */ nop -.L80240110: -/* D79B00 80240110 3C020100 */ lui $v0, 0x100 -.L80240114: -/* D79B04 80240114 03E00008 */ jr $ra -/* D79B08 80240118 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_27/func_8024011C_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/func_8024011C_D799F0.s deleted file mode 100644 index ced8241017..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/func_8024011C_D799F0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024011C_D79B0C -/* D79B0C 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D79B10 80240120 AFB00010 */ sw $s0, 0x10($sp) -/* D79B14 80240124 0080802D */ daddu $s0, $a0, $zero -/* D79B18 80240128 3C058024 */ lui $a1, 0x8024 -/* D79B1C 8024012C 24A50158 */ addiu $a1, $a1, 0x158 -/* D79B20 80240130 AFBF0014 */ sw $ra, 0x14($sp) -/* D79B24 80240134 0C048C56 */ jal bind_dynamic_entity_3 -/* D79B28 80240138 0000202D */ daddu $a0, $zero, $zero -/* D79B2C 8024013C 8E03013C */ lw $v1, 0x13c($s0) -/* D79B30 80240140 AC620000 */ sw $v0, ($v1) -/* D79B34 80240144 8FBF0014 */ lw $ra, 0x14($sp) -/* D79B38 80240148 8FB00010 */ lw $s0, 0x10($sp) -/* D79B3C 8024014C 24020002 */ addiu $v0, $zero, 2 -/* D79B40 80240150 03E00008 */ jr $ra -/* D79B44 80240154 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_27/func_80240158_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/func_80240158_D799F0.s deleted file mode 100644 index 405fba3273..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/func_80240158_D799F0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_D79B48 -/* D79B48 80240158 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D79B4C 8024015C AFB00040 */ sw $s0, 0x40($sp) -/* D79B50 80240160 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D79B54 80240164 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D79B58 80240168 AFB20048 */ sw $s2, 0x48($sp) -/* D79B5C 8024016C AFBF004C */ sw $ra, 0x4c($sp) -/* D79B60 80240170 AFB10044 */ sw $s1, 0x44($sp) -/* D79B64 80240174 8E020000 */ lw $v0, ($s0) -/* D79B68 80240178 821100BE */ lb $s1, 0xbe($s0) -/* D79B6C 8024017C 30420001 */ andi $v0, $v0, 1 -/* D79B70 80240180 10400061 */ beqz $v0, .L80240308 -/* D79B74 80240184 27B20020 */ addiu $s2, $sp, 0x20 -/* D79B78 80240188 8E0400CC */ lw $a0, 0xcc($s0) -/* D79B7C 8024018C 0C044181 */ jal get_shadow_by_index -/* D79B80 80240190 00000000 */ nop -/* D79B84 80240194 0C048B77 */ jal func_80122DDC -/* D79B88 80240198 84440008 */ lh $a0, 8($v0) -/* D79B8C 8024019C 8C430000 */ lw $v1, ($v0) -/* D79B90 802401A0 34630200 */ ori $v1, $v1, 0x200 -/* D79B94 802401A4 AC430000 */ sw $v1, ($v0) -/* D79B98 802401A8 8E050028 */ lw $a1, 0x28($s0) -/* D79B9C 802401AC 8E06002C */ lw $a2, 0x2c($s0) -/* D79BA0 802401B0 27A20030 */ addiu $v0, $sp, 0x30 -/* D79BA4 802401B4 AFA20010 */ sw $v0, 0x10($sp) -/* D79BA8 802401B8 27A20034 */ addiu $v0, $sp, 0x34 -/* D79BAC 802401BC AFA20014 */ sw $v0, 0x14($sp) -/* D79BB0 802401C0 C6000030 */ lwc1 $f0, 0x30($s0) -/* D79BB4 802401C4 3C04800A */ lui $a0, 0x800a -/* D79BB8 802401C8 8484A634 */ lh $a0, -0x59cc($a0) -/* D79BBC 802401CC 46000007 */ neg.s $f0, $f0 -/* D79BC0 802401D0 44070000 */ mfc1 $a3, $f0 -/* D79BC4 802401D4 27A20038 */ addiu $v0, $sp, 0x38 -/* D79BC8 802401D8 0C00B94E */ jal get_screen_coords -/* D79BCC 802401DC AFA20018 */ sw $v0, 0x18($sp) -/* D79BD0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D79BD4 802401E4 0C090014 */ jal func_80240050 -/* D79BD8 802401E8 00000000 */ nop -/* D79BDC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) -/* D79BE0 802401F0 3C014307 */ lui $at, 0x4307 -/* D79BE4 802401F4 44810000 */ mtc1 $at, $f0 -/* D79BE8 802401F8 00000000 */ nop -/* D79BEC 802401FC 4602003C */ c.lt.s $f0, $f2 -/* D79BF0 80240200 00000000 */ nop -/* D79BF4 80240204 4500000B */ bc1f .L80240234 -/* D79BF8 80240208 24040002 */ addiu $a0, $zero, 2 -/* D79BFC 8024020C 3C014361 */ lui $at, 0x4361 -/* D79C00 80240210 44810000 */ mtc1 $at, $f0 -/* D79C04 80240214 00000000 */ nop -/* D79C08 80240218 4600103C */ c.lt.s $f2, $f0 -/* D79C0C 8024021C 00000000 */ nop -/* D79C10 80240220 45000004 */ bc1f .L80240234 -/* D79C14 80240224 00000000 */ nop -/* D79C18 80240228 0C090021 */ jal func_80240084 -/* D79C1C 8024022C 0040202D */ daddu $a0, $v0, $zero -/* D79C20 80240230 24040002 */ addiu $a0, $zero, 2 -.L80240234: -/* D79C24 80240234 3C063F80 */ lui $a2, 0x3f80 -/* D79C28 80240238 0C0B76A3 */ jal func_802DDA8C -/* D79C2C 8024023C 0040282D */ daddu $a1, $v0, $zero -/* D79C30 80240240 8E020000 */ lw $v0, ($s0) -/* D79C34 80240244 3C030002 */ lui $v1, 2 -/* D79C38 80240248 00431024 */ and $v0, $v0, $v1 -/* D79C3C 8024024C 54400022 */ bnel $v0, $zero, .L802402D8 -/* D79C40 80240250 24110011 */ addiu $s1, $zero, 0x11 -/* D79C44 80240254 9203000E */ lbu $v1, 0xe($s0) -/* D79C48 80240258 3C02802E */ lui $v0, 0x802e -/* D79C4C 8024025C 90429D70 */ lbu $v0, -0x6290($v0) -/* D79C50 80240260 10620018 */ beq $v1, $v0, .L802402C4 -/* D79C54 80240264 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D79C58 80240268 1040000B */ beqz $v0, .L80240298 -/* D79C5C 8024026C 24110011 */ addiu $s1, $zero, 0x11 -/* D79C60 80240270 24040002 */ addiu $a0, $zero, 2 -/* D79C64 80240274 2405FFFF */ addiu $a1, $zero, -1 -/* D79C68 80240278 24060007 */ addiu $a2, $zero, 7 -/* D79C6C 8024027C 0060102D */ daddu $v0, $v1, $zero -/* D79C70 80240280 0000382D */ daddu $a3, $zero, $zero -/* D79C74 80240284 AFA00010 */ sw $zero, 0x10($sp) -/* D79C78 80240288 AFA00014 */ sw $zero, 0x14($sp) -/* D79C7C 8024028C AFA0001C */ sw $zero, 0x1c($sp) -/* D79C80 80240290 080900AF */ j .L802402BC -/* D79C84 80240294 AFA20018 */ sw $v0, 0x18($sp) -.L80240298: -/* D79C88 80240298 2411000D */ addiu $s1, $zero, 0xd -/* D79C8C 8024029C 24040002 */ addiu $a0, $zero, 2 -/* D79C90 802402A0 2405FFFF */ addiu $a1, $zero, -1 -/* D79C94 802402A4 0000302D */ daddu $a2, $zero, $zero -/* D79C98 802402A8 00C0382D */ daddu $a3, $a2, $zero -/* D79C9C 802402AC AFA00010 */ sw $zero, 0x10($sp) -/* D79CA0 802402B0 AFA00014 */ sw $zero, 0x14($sp) -/* D79CA4 802402B4 AFA00018 */ sw $zero, 0x18($sp) -/* D79CA8 802402B8 AFA0001C */ sw $zero, 0x1c($sp) -.L802402BC: -/* D79CAC 802402BC 0C0B77B9 */ jal func_802DDEE4 -/* D79CB0 802402C0 00000000 */ nop -.L802402C4: -/* D79CB4 802402C4 9202000E */ lbu $v0, 0xe($s0) -/* D79CB8 802402C8 3C01802E */ lui $at, 0x802e -/* D79CBC 802402CC A0229D70 */ sb $v0, -0x6290($at) -/* D79CC0 802402D0 080900B9 */ j .L802402E4 -/* D79CC4 802402D4 0240202D */ daddu $a0, $s2, $zero -.L802402D8: -/* D79CC8 802402D8 3C01802E */ lui $at, 0x802e -/* D79CCC 802402DC A0209D70 */ sb $zero, -0x6290($at) -/* D79CD0 802402E0 0240202D */ daddu $a0, $s2, $zero -.L802402E4: -/* D79CD4 802402E4 AC910000 */ sw $s1, ($a0) -/* D79CD8 802402E8 AC900008 */ sw $s0, 8($a0) -/* D79CDC 802402EC 8FA20038 */ lw $v0, 0x38($sp) -/* D79CE0 802402F0 3C038024 */ lui $v1, 0x8024 -/* D79CE4 802402F4 24630320 */ addiu $v1, $v1, 0x320 -/* D79CE8 802402F8 AC83000C */ sw $v1, 0xc($a0) -/* D79CEC 802402FC 00021023 */ negu $v0, $v0 -/* D79CF0 80240300 0C047644 */ jal queue_render_task -/* D79CF4 80240304 AC820004 */ sw $v0, 4($a0) -.L80240308: -/* D79CF8 80240308 8FBF004C */ lw $ra, 0x4c($sp) -/* D79CFC 8024030C 8FB20048 */ lw $s2, 0x48($sp) -/* D79D00 80240310 8FB10044 */ lw $s1, 0x44($sp) -/* D79D04 80240314 8FB00040 */ lw $s0, 0x40($sp) -/* D79D08 80240318 03E00008 */ jr $ra -/* D79D0C 8024031C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_27/func_80240320_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/func_80240320_D799F0.s deleted file mode 100644 index 3ae8511e66..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/func_80240320_D799F0.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240320_D79D10 -/* D79D10 80240320 3C03800A */ lui $v1, 0x800a -/* D79D14 80240324 8463A634 */ lh $v1, -0x59cc($v1) -/* D79D18 80240328 3C07BF80 */ lui $a3, 0xbf80 -/* D79D1C 8024032C 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D79D20 80240330 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D79D24 80240334 4480A000 */ mtc1 $zero, $f20 -/* D79D28 80240338 AFB1011C */ sw $s1, 0x11c($sp) -/* D79D2C 8024033C 0080882D */ daddu $s1, $a0, $zero -/* D79D30 80240340 AFB00118 */ sw $s0, 0x118($sp) -/* D79D34 80240344 27B00098 */ addiu $s0, $sp, 0x98 -/* D79D38 80240348 AFBF0120 */ sw $ra, 0x120($sp) -/* D79D3C 8024034C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D79D40 80240350 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D79D44 80240354 00031080 */ sll $v0, $v1, 2 -/* D79D48 80240358 00431021 */ addu $v0, $v0, $v1 -/* D79D4C 8024035C 00021080 */ sll $v0, $v0, 2 -/* D79D50 80240360 00431023 */ subu $v0, $v0, $v1 -/* D79D54 80240364 000218C0 */ sll $v1, $v0, 3 -/* D79D58 80240368 00431021 */ addu $v0, $v0, $v1 -/* D79D5C 8024036C 000210C0 */ sll $v0, $v0, 3 -/* D79D60 80240370 3C01800B */ lui $at, 0x800b -/* D79D64 80240374 00220821 */ addu $at, $at, $v0 -/* D79D68 80240378 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D79D6C 8024037C 4406A000 */ mfc1 $a2, $f20 -/* D79D70 80240380 4600B587 */ neg.s $f22, $f22 -/* D79D74 80240384 4405B000 */ mfc1 $a1, $f22 -/* D79D78 80240388 0200202D */ daddu $a0, $s0, $zero -/* D79D7C 8024038C 0C019EC8 */ jal guRotateF -/* D79D80 80240390 E7B40010 */ swc1 $f20, 0x10($sp) -/* D79D84 80240394 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D79D88 80240398 0C00A6C9 */ jal clamp_angle -/* D79D8C 8024039C 00000000 */ nop -/* D79D90 802403A0 44050000 */ mfc1 $a1, $f0 -/* D79D94 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D79D98 802403A8 4407A000 */ mfc1 $a3, $f20 -/* D79D9C 802403AC 3C013F80 */ lui $at, 0x3f80 -/* D79DA0 802403B0 4481C000 */ mtc1 $at, $f24 -/* D79DA4 802403B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D79DA8 802403B8 0C019EC8 */ jal guRotateF -/* D79DAC 802403BC E7B80010 */ swc1 $f24, 0x10($sp) -/* D79DB0 802403C0 0200202D */ daddu $a0, $s0, $zero -/* D79DB4 802403C4 27A50018 */ addiu $a1, $sp, 0x18 -/* D79DB8 802403C8 0C019D80 */ jal guMtxCatF -/* D79DBC 802403CC 00A0302D */ daddu $a2, $a1, $zero -/* D79DC0 802403D0 4405B000 */ mfc1 $a1, $f22 -/* D79DC4 802403D4 4406A000 */ mfc1 $a2, $f20 -/* D79DC8 802403D8 4407C000 */ mfc1 $a3, $f24 -/* D79DCC 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D79DD0 802403E0 0C019EC8 */ jal guRotateF -/* D79DD4 802403E4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D79DD8 802403E8 27A40018 */ addiu $a0, $sp, 0x18 -/* D79DDC 802403EC 0200282D */ daddu $a1, $s0, $zero -/* D79DE0 802403F0 0C019D80 */ jal guMtxCatF -/* D79DE4 802403F4 0080302D */ daddu $a2, $a0, $zero -/* D79DE8 802403F8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D79DEC 802403FC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D79DF0 80240400 4406A000 */ mfc1 $a2, $f20 -/* D79DF4 80240404 4407C000 */ mfc1 $a3, $f24 -/* D79DF8 80240408 0C019EC8 */ jal guRotateF -/* D79DFC 8024040C 0200202D */ daddu $a0, $s0, $zero -/* D79E00 80240410 27A40018 */ addiu $a0, $sp, 0x18 -/* D79E04 80240414 0200282D */ daddu $a1, $s0, $zero -/* D79E08 80240418 0C019D80 */ jal guMtxCatF -/* D79E0C 8024041C 0080302D */ daddu $a2, $a0, $zero -/* D79E10 80240420 3C013F36 */ lui $at, 0x3f36 -/* D79E14 80240424 3421DB6E */ ori $at, $at, 0xdb6e -/* D79E18 80240428 44810000 */ mtc1 $at, $f0 -/* D79E1C 8024042C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D79E20 80240430 44050000 */ mfc1 $a1, $f0 -/* D79E24 80240434 0200202D */ daddu $a0, $s0, $zero -/* D79E28 80240438 00A0302D */ daddu $a2, $a1, $zero -/* D79E2C 8024043C 0C019DF0 */ jal guScaleF -/* D79E30 80240440 00A0382D */ daddu $a3, $a1, $zero -/* D79E34 80240444 27A40018 */ addiu $a0, $sp, 0x18 -/* D79E38 80240448 0200282D */ daddu $a1, $s0, $zero -/* D79E3C 8024044C 0C019D80 */ jal guMtxCatF -/* D79E40 80240450 0080302D */ daddu $a2, $a0, $zero -/* D79E44 80240454 27B00058 */ addiu $s0, $sp, 0x58 -/* D79E48 80240458 C6200030 */ lwc1 $f0, 0x30($s1) -/* D79E4C 8024045C 3C014040 */ lui $at, 0x4040 -/* D79E50 80240460 44811000 */ mtc1 $at, $f2 -/* D79E54 80240464 46000007 */ neg.s $f0, $f0 -/* D79E58 80240468 46020001 */ sub.s $f0, $f0, $f2 -/* D79E5C 8024046C 8E250028 */ lw $a1, 0x28($s1) -/* D79E60 80240470 8E26002C */ lw $a2, 0x2c($s1) -/* D79E64 80240474 44070000 */ mfc1 $a3, $f0 -/* D79E68 80240478 0C019E40 */ jal guTranslateF -/* D79E6C 8024047C 0200202D */ daddu $a0, $s0, $zero -/* D79E70 80240480 27A40018 */ addiu $a0, $sp, 0x18 -/* D79E74 80240484 0200282D */ daddu $a1, $s0, $zero -/* D79E78 80240488 0C019D80 */ jal guMtxCatF -/* D79E7C 8024048C 0080302D */ daddu $a2, $a0, $zero -/* D79E80 80240490 24040002 */ addiu $a0, $zero, 2 -/* D79E84 80240494 0000282D */ daddu $a1, $zero, $zero -/* D79E88 80240498 00A0302D */ daddu $a2, $a1, $zero -/* D79E8C 8024049C 00A0382D */ daddu $a3, $a1, $zero -/* D79E90 802404A0 27A20018 */ addiu $v0, $sp, 0x18 -/* D79E94 802404A4 0C0B7710 */ jal render_sprite -/* D79E98 802404A8 AFA20010 */ sw $v0, 0x10($sp) -/* D79E9C 802404AC 8FBF0120 */ lw $ra, 0x120($sp) -/* D79EA0 802404B0 8FB1011C */ lw $s1, 0x11c($sp) -/* D79EA4 802404B4 8FB00118 */ lw $s0, 0x118($sp) -/* D79EA8 802404B8 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D79EAC 802404BC D7B60130 */ ldc1 $f22, 0x130($sp) -/* D79EB0 802404C0 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D79EB4 802404C4 03E00008 */ jr $ra -/* D79EB8 802404C8 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_27/func_802404CC_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/func_802404CC_D799F0.s deleted file mode 100644 index de758fb9a4..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/func_802404CC_D799F0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404CC_D79EBC -/* D79EBC 802404CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D79EC0 802404D0 AFB00010 */ sw $s0, 0x10($sp) -/* D79EC4 802404D4 0080802D */ daddu $s0, $a0, $zero -/* D79EC8 802404D8 AFBF0014 */ sw $ra, 0x14($sp) -/* D79ECC 802404DC 8E020084 */ lw $v0, 0x84($s0) -/* D79ED0 802404E0 0440000E */ bltz $v0, .L8024051C -/* D79ED4 802404E4 28420002 */ slti $v0, $v0, 2 -/* D79ED8 802404E8 1040000C */ beqz $v0, .L8024051C -/* D79EDC 802404EC 00000000 */ nop -/* D79EE0 802404F0 3C058024 */ lui $a1, 0x8024 -/* D79EE4 802404F4 24A50530 */ addiu $a1, $a1, 0x530 -/* D79EE8 802404F8 0C048C56 */ jal bind_dynamic_entity_3 -/* D79EEC 802404FC 0000202D */ daddu $a0, $zero, $zero -/* D79EF0 80240500 8E03013C */ lw $v1, 0x13c($s0) -/* D79EF4 80240504 AC620000 */ sw $v0, ($v1) -/* D79EF8 80240508 3C03800A */ lui $v1, %hi(D_8009A650) -/* D79EFC 8024050C 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D79F00 80240510 8C620000 */ lw $v0, ($v1) -/* D79F04 80240514 34420080 */ ori $v0, $v0, 0x80 -/* D79F08 80240518 AC620000 */ sw $v0, ($v1) -.L8024051C: -/* D79F0C 8024051C 8FBF0014 */ lw $ra, 0x14($sp) -/* D79F10 80240520 8FB00010 */ lw $s0, 0x10($sp) -/* D79F14 80240524 24020002 */ addiu $v0, $zero, 2 -/* D79F18 80240528 03E00008 */ jr $ra -/* D79F1C 8024052C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_27/func_80240530_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/func_80240530_D799F0.s deleted file mode 100644 index f7675aff1d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/func_80240530_D799F0.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240530_D79F20 -/* D79F20 80240530 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D79F24 80240534 AFB00040 */ sw $s0, 0x40($sp) -/* D79F28 80240538 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D79F2C 8024053C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D79F30 80240540 AFB10044 */ sw $s1, 0x44($sp) -/* D79F34 80240544 AFBF004C */ sw $ra, 0x4c($sp) -/* D79F38 80240548 AFB20048 */ sw $s2, 0x48($sp) -/* D79F3C 8024054C 8E020000 */ lw $v0, ($s0) -/* D79F40 80240550 821200BE */ lb $s2, 0xbe($s0) -/* D79F44 80240554 30420001 */ andi $v0, $v0, 1 -/* D79F48 80240558 10400052 */ beqz $v0, .L802406A4 -/* D79F4C 8024055C 27B10020 */ addiu $s1, $sp, 0x20 -/* D79F50 80240560 8E0400CC */ lw $a0, 0xcc($s0) -/* D79F54 80240564 0C044181 */ jal get_shadow_by_index -/* D79F58 80240568 00000000 */ nop -/* D79F5C 8024056C 0C048B77 */ jal func_80122DDC -/* D79F60 80240570 84440008 */ lh $a0, 8($v0) -/* D79F64 80240574 8E050028 */ lw $a1, 0x28($s0) -/* D79F68 80240578 8E070030 */ lw $a3, 0x30($s0) -/* D79F6C 8024057C 27A20030 */ addiu $v0, $sp, 0x30 -/* D79F70 80240580 AFA20010 */ sw $v0, 0x10($sp) -/* D79F74 80240584 27A20034 */ addiu $v0, $sp, 0x34 -/* D79F78 80240588 AFA20014 */ sw $v0, 0x14($sp) -/* D79F7C 8024058C 27A20038 */ addiu $v0, $sp, 0x38 -/* D79F80 80240590 AFA20018 */ sw $v0, 0x18($sp) -/* D79F84 80240594 C600002C */ lwc1 $f0, 0x2c($s0) -/* D79F88 80240598 3C04800A */ lui $a0, 0x800a -/* D79F8C 8024059C 8484A634 */ lh $a0, -0x59cc($a0) -/* D79F90 802405A0 46000007 */ neg.s $f0, $f0 -/* D79F94 802405A4 44060000 */ mfc1 $a2, $f0 -/* D79F98 802405A8 0C00B94E */ jal get_screen_coords -/* D79F9C 802405AC 00000000 */ nop -/* D79FA0 802405B0 8E0500A4 */ lw $a1, 0xa4($s0) -/* D79FA4 802405B4 3C063F80 */ lui $a2, 0x3f80 -/* D79FA8 802405B8 0C0B76A3 */ jal func_802DDA8C -/* D79FAC 802405BC 24040001 */ addiu $a0, $zero, 1 -/* D79FB0 802405C0 8E020000 */ lw $v0, ($s0) -/* D79FB4 802405C4 3C030002 */ lui $v1, 2 -/* D79FB8 802405C8 00431024 */ and $v0, $v0, $v1 -/* D79FBC 802405CC 54400022 */ bnel $v0, $zero, .L80240658 -/* D79FC0 802405D0 24120011 */ addiu $s2, $zero, 0x11 -/* D79FC4 802405D4 9203000E */ lbu $v1, 0xe($s0) -/* D79FC8 802405D8 3C02802E */ lui $v0, 0x802e -/* D79FCC 802405DC 90429D71 */ lbu $v0, -0x628f($v0) -/* D79FD0 802405E0 10620018 */ beq $v1, $v0, .L80240644 -/* D79FD4 802405E4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D79FD8 802405E8 1040000B */ beqz $v0, .L80240618 -/* D79FDC 802405EC 24120011 */ addiu $s2, $zero, 0x11 -/* D79FE0 802405F0 24040001 */ addiu $a0, $zero, 1 -/* D79FE4 802405F4 2405FFFF */ addiu $a1, $zero, -1 -/* D79FE8 802405F8 24060007 */ addiu $a2, $zero, 7 -/* D79FEC 802405FC 0060102D */ daddu $v0, $v1, $zero -/* D79FF0 80240600 0000382D */ daddu $a3, $zero, $zero -/* D79FF4 80240604 AFA00010 */ sw $zero, 0x10($sp) -/* D79FF8 80240608 AFA00014 */ sw $zero, 0x14($sp) -/* D79FFC 8024060C AFA0001C */ sw $zero, 0x1c($sp) -/* D7A000 80240610 0809018F */ j .L8024063C -/* D7A004 80240614 AFA20018 */ sw $v0, 0x18($sp) -.L80240618: -/* D7A008 80240618 2412000D */ addiu $s2, $zero, 0xd -/* D7A00C 8024061C 24040001 */ addiu $a0, $zero, 1 -/* D7A010 80240620 2405FFFF */ addiu $a1, $zero, -1 -/* D7A014 80240624 0000302D */ daddu $a2, $zero, $zero -/* D7A018 80240628 00C0382D */ daddu $a3, $a2, $zero -/* D7A01C 8024062C AFA00010 */ sw $zero, 0x10($sp) -/* D7A020 80240630 AFA00014 */ sw $zero, 0x14($sp) -/* D7A024 80240634 AFA00018 */ sw $zero, 0x18($sp) -/* D7A028 80240638 AFA0001C */ sw $zero, 0x1c($sp) -.L8024063C: -/* D7A02C 8024063C 0C0B77B9 */ jal func_802DDEE4 -/* D7A030 80240640 00000000 */ nop -.L80240644: -/* D7A034 80240644 9202000E */ lbu $v0, 0xe($s0) -/* D7A038 80240648 3C01802E */ lui $at, 0x802e -/* D7A03C 8024064C A0229D71 */ sb $v0, -0x628f($at) -/* D7A040 80240650 08090198 */ j .L80240660 -/* D7A044 80240654 00000000 */ nop -.L80240658: -/* D7A048 80240658 3C01802E */ lui $at, 0x802e -/* D7A04C 8024065C A0209D71 */ sb $zero, -0x628f($at) -.L80240660: -/* D7A050 80240660 8FA20038 */ lw $v0, 0x38($sp) -/* D7A054 80240664 3C048024 */ lui $a0, 0x8024 -/* D7A058 80240668 248408A0 */ addiu $a0, $a0, 0x8a0 -/* D7A05C 8024066C AE320000 */ sw $s2, ($s1) -/* D7A060 80240670 AE300008 */ sw $s0, 8($s1) -/* D7A064 80240674 00021023 */ negu $v0, $v0 -/* D7A068 80240678 AE220004 */ sw $v0, 4($s1) -/* D7A06C 8024067C 8E020000 */ lw $v0, ($s0) -/* D7A070 80240680 3C030002 */ lui $v1, 2 -/* D7A074 80240684 00431024 */ and $v0, $v0, $v1 -/* D7A078 80240688 54400004 */ bnel $v0, $zero, .L8024069C -/* D7A07C 8024068C AE24000C */ sw $a0, 0xc($s1) -/* D7A080 80240690 3C048024 */ lui $a0, 0x8024 -/* D7A084 80240694 248406BC */ addiu $a0, $a0, 0x6bc -/* D7A088 80240698 AE24000C */ sw $a0, 0xc($s1) -.L8024069C: -/* D7A08C 8024069C 0C047644 */ jal queue_render_task -/* D7A090 802406A0 0220202D */ daddu $a0, $s1, $zero -.L802406A4: -/* D7A094 802406A4 8FBF004C */ lw $ra, 0x4c($sp) -/* D7A098 802406A8 8FB20048 */ lw $s2, 0x48($sp) -/* D7A09C 802406AC 8FB10044 */ lw $s1, 0x44($sp) -/* D7A0A0 802406B0 8FB00040 */ lw $s0, 0x40($sp) -/* D7A0A4 802406B4 03E00008 */ jr $ra -/* D7A0A8 802406B8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_27/func_802406BC_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/func_802406BC_D799F0.s deleted file mode 100644 index 7c490021cd..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/func_802406BC_D799F0.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406BC_D7A0AC -/* D7A0AC 802406BC 3C03800A */ lui $v1, 0x800a -/* D7A0B0 802406C0 8463A634 */ lh $v1, -0x59cc($v1) -/* D7A0B4 802406C4 3C07BF80 */ lui $a3, 0xbf80 -/* D7A0B8 802406C8 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D7A0BC 802406CC F7B40128 */ sdc1 $f20, 0x128($sp) -/* D7A0C0 802406D0 4480A000 */ mtc1 $zero, $f20 -/* D7A0C4 802406D4 AFB1011C */ sw $s1, 0x11c($sp) -/* D7A0C8 802406D8 0080882D */ daddu $s1, $a0, $zero -/* D7A0CC 802406DC AFB00118 */ sw $s0, 0x118($sp) -/* D7A0D0 802406E0 27B00098 */ addiu $s0, $sp, 0x98 -/* D7A0D4 802406E4 AFBF0120 */ sw $ra, 0x120($sp) -/* D7A0D8 802406E8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D7A0DC 802406EC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D7A0E0 802406F0 00031080 */ sll $v0, $v1, 2 -/* D7A0E4 802406F4 00431021 */ addu $v0, $v0, $v1 -/* D7A0E8 802406F8 00021080 */ sll $v0, $v0, 2 -/* D7A0EC 802406FC 00431023 */ subu $v0, $v0, $v1 -/* D7A0F0 80240700 000218C0 */ sll $v1, $v0, 3 -/* D7A0F4 80240704 00431021 */ addu $v0, $v0, $v1 -/* D7A0F8 80240708 000210C0 */ sll $v0, $v0, 3 -/* D7A0FC 8024070C 3C01800B */ lui $at, 0x800b -/* D7A100 80240710 00220821 */ addu $at, $at, $v0 -/* D7A104 80240714 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D7A108 80240718 4406A000 */ mfc1 $a2, $f20 -/* D7A10C 8024071C 4600B587 */ neg.s $f22, $f22 -/* D7A110 80240720 4405B000 */ mfc1 $a1, $f22 -/* D7A114 80240724 0200202D */ daddu $a0, $s0, $zero -/* D7A118 80240728 0C019EC8 */ jal guRotateF -/* D7A11C 8024072C E7B40010 */ swc1 $f20, 0x10($sp) -/* D7A120 80240730 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D7A124 80240734 0C00A6C9 */ jal clamp_angle -/* D7A128 80240738 00000000 */ nop -/* D7A12C 8024073C 44050000 */ mfc1 $a1, $f0 -/* D7A130 80240740 4406A000 */ mfc1 $a2, $f20 -/* D7A134 80240744 4407A000 */ mfc1 $a3, $f20 -/* D7A138 80240748 3C013F80 */ lui $at, 0x3f80 -/* D7A13C 8024074C 4481C000 */ mtc1 $at, $f24 -/* D7A140 80240750 27A40018 */ addiu $a0, $sp, 0x18 -/* D7A144 80240754 0C019EC8 */ jal guRotateF -/* D7A148 80240758 E7B80010 */ swc1 $f24, 0x10($sp) -/* D7A14C 8024075C 0200202D */ daddu $a0, $s0, $zero -/* D7A150 80240760 27A50018 */ addiu $a1, $sp, 0x18 -/* D7A154 80240764 0C019D80 */ jal guMtxCatF -/* D7A158 80240768 00A0302D */ daddu $a2, $a1, $zero -/* D7A15C 8024076C 4405B000 */ mfc1 $a1, $f22 -/* D7A160 80240770 4406A000 */ mfc1 $a2, $f20 -/* D7A164 80240774 4407C000 */ mfc1 $a3, $f24 -/* D7A168 80240778 0200202D */ daddu $a0, $s0, $zero -/* D7A16C 8024077C 0C019EC8 */ jal guRotateF -/* D7A170 80240780 E7B40010 */ swc1 $f20, 0x10($sp) -/* D7A174 80240784 27A40018 */ addiu $a0, $sp, 0x18 -/* D7A178 80240788 0200282D */ daddu $a1, $s0, $zero -/* D7A17C 8024078C 0C019D80 */ jal guMtxCatF -/* D7A180 80240790 0080302D */ daddu $a2, $a0, $zero -/* D7A184 80240794 E7B40010 */ swc1 $f20, 0x10($sp) -/* D7A188 80240798 8E2500A8 */ lw $a1, 0xa8($s1) -/* D7A18C 8024079C 4406A000 */ mfc1 $a2, $f20 -/* D7A190 802407A0 4407C000 */ mfc1 $a3, $f24 -/* D7A194 802407A4 0C019EC8 */ jal guRotateF -/* D7A198 802407A8 0200202D */ daddu $a0, $s0, $zero -/* D7A19C 802407AC 27A40018 */ addiu $a0, $sp, 0x18 -/* D7A1A0 802407B0 0200282D */ daddu $a1, $s0, $zero -/* D7A1A4 802407B4 0C019D80 */ jal guMtxCatF -/* D7A1A8 802407B8 0080302D */ daddu $a2, $a0, $zero -/* D7A1AC 802407BC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D7A1B0 802407C0 3C013F36 */ lui $at, 0x3f36 -/* D7A1B4 802407C4 3421DB6E */ ori $at, $at, 0xdb6e -/* D7A1B8 802407C8 44810000 */ mtc1 $at, $f0 -/* D7A1BC 802407CC 0200202D */ daddu $a0, $s0, $zero -/* D7A1C0 802407D0 44050000 */ mfc1 $a1, $f0 -/* D7A1C4 802407D4 3C06BF36 */ lui $a2, 0xbf36 -/* D7A1C8 802407D8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D7A1CC 802407DC 0C019DF0 */ jal guScaleF -/* D7A1D0 802407E0 00A0382D */ daddu $a3, $a1, $zero -/* D7A1D4 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D7A1D8 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D7A1DC 802407EC 0C019D80 */ jal guMtxCatF -/* D7A1E0 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D7A1E4 802407F4 27B00058 */ addiu $s0, $sp, 0x58 -/* D7A1E8 802407F8 8E250028 */ lw $a1, 0x28($s1) -/* D7A1EC 802407FC C620002C */ lwc1 $f0, 0x2c($s1) -/* D7A1F0 80240800 8E270030 */ lw $a3, 0x30($s1) -/* D7A1F4 80240804 46000007 */ neg.s $f0, $f0 -/* D7A1F8 80240808 44060000 */ mfc1 $a2, $f0 -/* D7A1FC 8024080C 0C019E40 */ jal guTranslateF -/* D7A200 80240810 0200202D */ daddu $a0, $s0, $zero -/* D7A204 80240814 27A40018 */ addiu $a0, $sp, 0x18 -/* D7A208 80240818 0200282D */ daddu $a1, $s0, $zero -/* D7A20C 8024081C 0C019D80 */ jal guMtxCatF -/* D7A210 80240820 0080302D */ daddu $a2, $a0, $zero -/* D7A214 80240824 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D7A218 80240828 3C0142B4 */ lui $at, 0x42b4 -/* D7A21C 8024082C 44810000 */ mtc1 $at, $f0 -/* D7A220 80240830 00000000 */ nop -/* D7A224 80240834 4602003E */ c.le.s $f0, $f2 -/* D7A228 80240838 00000000 */ nop -/* D7A22C 8024083C 4500000A */ bc1f .L80240868 -/* D7A230 80240840 24040001 */ addiu $a0, $zero, 1 -/* D7A234 80240844 3C014387 */ lui $at, 0x4387 -/* D7A238 80240848 44810000 */ mtc1 $at, $f0 -/* D7A23C 8024084C 00000000 */ nop -/* D7A240 80240850 4600103C */ c.lt.s $f2, $f0 -/* D7A244 80240854 00000000 */ nop -/* D7A248 80240858 45000004 */ bc1f .L8024086C -/* D7A24C 8024085C 27A20018 */ addiu $v0, $sp, 0x18 -/* D7A250 80240860 3C041000 */ lui $a0, 0x1000 -/* D7A254 80240864 34840001 */ ori $a0, $a0, 1 -.L80240868: -/* D7A258 80240868 27A20018 */ addiu $v0, $sp, 0x18 -.L8024086C: -/* D7A25C 8024086C 0000282D */ daddu $a1, $zero, $zero -/* D7A260 80240870 00A0302D */ daddu $a2, $a1, $zero -/* D7A264 80240874 00A0382D */ daddu $a3, $a1, $zero -/* D7A268 80240878 0C0B7710 */ jal render_sprite -/* D7A26C 8024087C AFA20010 */ sw $v0, 0x10($sp) -/* D7A270 80240880 8FBF0120 */ lw $ra, 0x120($sp) -/* D7A274 80240884 8FB1011C */ lw $s1, 0x11c($sp) -/* D7A278 80240888 8FB00118 */ lw $s0, 0x118($sp) -/* D7A27C 8024088C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D7A280 80240890 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D7A284 80240894 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D7A288 80240898 03E00008 */ jr $ra -/* D7A28C 8024089C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_27/func_802408A0_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/func_802408A0_D799F0.s deleted file mode 100644 index 155cb7dd07..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/func_802408A0_D799F0.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A0_D7A290 -/* D7A290 802408A0 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D7A294 802408A4 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D7A298 802408A8 4480B000 */ mtc1 $zero, $f22 -/* D7A29C 802408AC AFB10134 */ sw $s1, 0x134($sp) -/* D7A2A0 802408B0 0080882D */ daddu $s1, $a0, $zero -/* D7A2A4 802408B4 AFB3013C */ sw $s3, 0x13c($sp) -/* D7A2A8 802408B8 0000982D */ daddu $s3, $zero, $zero -/* D7A2AC 802408BC AFB60148 */ sw $s6, 0x148($sp) -/* D7A2B0 802408C0 3C16800B */ lui $s6, %hi(gCameras) -/* D7A2B4 802408C4 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D7A2B8 802408C8 AFB50144 */ sw $s5, 0x144($sp) -/* D7A2BC 802408CC 241500FF */ addiu $s5, $zero, 0xff -/* D7A2C0 802408D0 AFB00130 */ sw $s0, 0x130($sp) -/* D7A2C4 802408D4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D7A2C8 802408D8 AFB20138 */ sw $s2, 0x138($sp) -/* D7A2CC 802408DC 27B20060 */ addiu $s2, $sp, 0x60 -/* D7A2D0 802408E0 AFB40140 */ sw $s4, 0x140($sp) -/* D7A2D4 802408E4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D7A2D8 802408E8 AFBF014C */ sw $ra, 0x14c($sp) -/* D7A2DC 802408EC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D7A2E0 802408F0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D7A2E4 802408F4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D7A2E8 802408F8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D7A2EC 802408FC F7B40150 */ sdc1 $f20, 0x150($sp) -.L80240900: -/* D7A2F0 80240900 3C03800A */ lui $v1, 0x800a -/* D7A2F4 80240904 8463A634 */ lh $v1, -0x59cc($v1) -/* D7A2F8 80240908 00031080 */ sll $v0, $v1, 2 -/* D7A2FC 8024090C 00431021 */ addu $v0, $v0, $v1 -/* D7A300 80240910 00021080 */ sll $v0, $v0, 2 -/* D7A304 80240914 00431023 */ subu $v0, $v0, $v1 -/* D7A308 80240918 000218C0 */ sll $v1, $v0, 3 -/* D7A30C 8024091C 00431021 */ addu $v0, $v0, $v1 -/* D7A310 80240920 000210C0 */ sll $v0, $v0, 3 -/* D7A314 80240924 00561021 */ addu $v0, $v0, $s6 -/* D7A318 80240928 C440006C */ lwc1 $f0, 0x6c($v0) -/* D7A31C 8024092C 16600065 */ bnez $s3, .L80240AC4 -/* D7A320 80240930 46000507 */ neg.s $f20, $f0 -/* D7A324 80240934 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D7A328 80240938 3C0142B4 */ lui $at, 0x42b4 -/* D7A32C 8024093C 44810000 */ mtc1 $at, $f0 -/* D7A330 80240940 00000000 */ nop -/* D7A334 80240944 4602003C */ c.lt.s $f0, $f2 -/* D7A338 80240948 00000000 */ nop -/* D7A33C 8024094C 4500000A */ bc1f .L80240978 -/* D7A340 80240950 00000000 */ nop -/* D7A344 80240954 3C014334 */ lui $at, 0x4334 -/* D7A348 80240958 44812000 */ mtc1 $at, $f4 -/* D7A34C 8024095C 00000000 */ nop -/* D7A350 80240960 4604103E */ c.le.s $f2, $f4 -/* D7A354 80240964 00000000 */ nop -/* D7A358 80240968 45000003 */ bc1f .L80240978 -/* D7A35C 8024096C 00000000 */ nop -/* D7A360 80240970 08090282 */ j .L80240A08 -/* D7A364 80240974 46022501 */ sub.s $f20, $f4, $f2 -.L80240978: -/* D7A368 80240978 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D7A36C 8024097C 3C014334 */ lui $at, 0x4334 -/* D7A370 80240980 44812000 */ mtc1 $at, $f4 -/* D7A374 80240984 00000000 */ nop -/* D7A378 80240988 4600203C */ c.lt.s $f4, $f0 -/* D7A37C 8024098C 00000000 */ nop -/* D7A380 80240990 4500000C */ bc1f .L802409C4 -/* D7A384 80240994 00000000 */ nop -/* D7A388 80240998 3C014387 */ lui $at, 0x4387 -/* D7A38C 8024099C 44812000 */ mtc1 $at, $f4 -/* D7A390 802409A0 00000000 */ nop -/* D7A394 802409A4 4604003E */ c.le.s $f0, $f4 -/* D7A398 802409A8 00000000 */ nop -/* D7A39C 802409AC 45000008 */ bc1f .L802409D0 -/* D7A3A0 802409B0 00000000 */ nop -/* D7A3A4 802409B4 3C014334 */ lui $at, 0x4334 -/* D7A3A8 802409B8 44812000 */ mtc1 $at, $f4 -/* D7A3AC 802409BC 08090282 */ j .L80240A08 -/* D7A3B0 802409C0 46040501 */ sub.s $f20, $f0, $f4 -.L802409C4: -/* D7A3B4 802409C4 3C014387 */ lui $at, 0x4387 -/* D7A3B8 802409C8 44812000 */ mtc1 $at, $f4 -/* D7A3BC 802409CC 00000000 */ nop -.L802409D0: -/* D7A3C0 802409D0 4600203C */ c.lt.s $f4, $f0 -/* D7A3C4 802409D4 00000000 */ nop -/* D7A3C8 802409D8 4500000A */ bc1f .L80240A04 -/* D7A3CC 802409DC 00000000 */ nop -/* D7A3D0 802409E0 3C0143B4 */ lui $at, 0x43b4 -/* D7A3D4 802409E4 44811000 */ mtc1 $at, $f2 -/* D7A3D8 802409E8 00000000 */ nop -/* D7A3DC 802409EC 4602003E */ c.le.s $f0, $f2 -/* D7A3E0 802409F0 00000000 */ nop -/* D7A3E4 802409F4 45000003 */ bc1f .L80240A04 -/* D7A3E8 802409F8 00000000 */ nop -/* D7A3EC 802409FC 08090282 */ j .L80240A08 -/* D7A3F0 80240A00 46001501 */ sub.s $f20, $f2, $f0 -.L80240A04: -/* D7A3F4 80240A04 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L80240A08: -/* D7A3F8 80240A08 3C0141C8 */ lui $at, 0x41c8 -/* D7A3FC 80240A0C 44810000 */ mtc1 $at, $f0 -/* D7A400 80240A10 00000000 */ nop -/* D7A404 80240A14 4600A003 */ div.s $f0, $f20, $f0 -/* D7A408 80240A18 4600010D */ trunc.w.s $f4, $f0 -/* D7A40C 80240A1C 44072000 */ mfc1 $a3, $f4 -/* D7A410 80240A20 00000000 */ nop -/* D7A414 80240A24 00071100 */ sll $v0, $a3, 4 -/* D7A418 80240A28 00471023 */ subu $v0, $v0, $a3 -/* D7A41C 80240A2C 00021080 */ sll $v0, $v0, 2 -/* D7A420 80240A30 02A23823 */ subu $a3, $s5, $v0 -/* D7A424 80240A34 28E20064 */ slti $v0, $a3, 0x64 -/* D7A428 80240A38 54400001 */ bnel $v0, $zero, .L80240A40 -/* D7A42C 80240A3C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A40: -/* D7A430 80240A40 24040001 */ addiu $a0, $zero, 1 -/* D7A434 80240A44 2405FFFF */ addiu $a1, $zero, -1 -/* D7A438 80240A48 24060006 */ addiu $a2, $zero, 6 -/* D7A43C 80240A4C AFA70010 */ sw $a3, 0x10($sp) -/* D7A440 80240A50 AFA70014 */ sw $a3, 0x14($sp) -/* D7A444 80240A54 AFB50018 */ sw $s5, 0x18($sp) -/* D7A448 80240A58 0C0B77B9 */ jal func_802DDEE4 -/* D7A44C 80240A5C AFA0001C */ sw $zero, 0x1c($sp) -/* D7A450 80240A60 4405A000 */ mfc1 $a1, $f20 -/* D7A454 80240A64 4406B000 */ mfc1 $a2, $f22 -/* D7A458 80240A68 3C07BF80 */ lui $a3, 0xbf80 -/* D7A45C 80240A6C 0200202D */ daddu $a0, $s0, $zero -/* D7A460 80240A70 0C019EC8 */ jal guRotateF -/* D7A464 80240A74 E7B60010 */ swc1 $f22, 0x10($sp) -/* D7A468 80240A78 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D7A46C 80240A7C 0C00A6C9 */ jal clamp_angle -/* D7A470 80240A80 00000000 */ nop -/* D7A474 80240A84 44050000 */ mfc1 $a1, $f0 -/* D7A478 80240A88 4406B000 */ mfc1 $a2, $f22 -/* D7A47C 80240A8C 4407B000 */ mfc1 $a3, $f22 -/* D7A480 80240A90 3C013F80 */ lui $at, 0x3f80 -/* D7A484 80240A94 44812000 */ mtc1 $at, $f4 -/* D7A488 80240A98 27A40020 */ addiu $a0, $sp, 0x20 -/* D7A48C 80240A9C 0C019EC8 */ jal guRotateF -/* D7A490 80240AA0 E7A40010 */ swc1 $f4, 0x10($sp) -/* D7A494 80240AA4 0200202D */ daddu $a0, $s0, $zero -/* D7A498 80240AA8 27A50020 */ addiu $a1, $sp, 0x20 -/* D7A49C 80240AAC 0C019D80 */ jal guMtxCatF -/* D7A4A0 80240AB0 00A0302D */ daddu $a2, $a1, $zero -/* D7A4A4 80240AB4 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D7A4A8 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D7A4AC 80240ABC 080902E2 */ j .L80240B88 -/* D7A4B0 80240AC0 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240AC4: -/* D7A4B4 80240AC4 0260202D */ daddu $a0, $s3, $zero -/* D7A4B8 80240AC8 27A50120 */ addiu $a1, $sp, 0x120 -/* D7A4BC 80240ACC 27A60124 */ addiu $a2, $sp, 0x124 -/* D7A4C0 80240AD0 0C03964E */ jal func_800E5938 -/* D7A4C4 80240AD4 27A70128 */ addiu $a3, $sp, 0x128 -/* D7A4C8 80240AD8 8FA60124 */ lw $a2, 0x124($sp) -/* D7A4CC 80240ADC 3C028000 */ lui $v0, 0x8000 -/* D7A4D0 80240AE0 14C20004 */ bne $a2, $v0, .L80240AF4 -/* D7A4D4 80240AE4 46000606 */ mov.s $f24, $f0 -/* D7A4D8 80240AE8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D7A4DC 80240AEC 080902C1 */ j .L80240B04 -/* D7A4E0 80240AF0 24040001 */ addiu $a0, $zero, 1 -.L80240AF4: -/* D7A4E4 80240AF4 4486D000 */ mtc1 $a2, $f26 -/* D7A4E8 80240AF8 00000000 */ nop -/* D7A4EC 80240AFC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D7A4F0 80240B00 24040001 */ addiu $a0, $zero, 1 -.L80240B04: -/* D7A4F4 80240B04 2405FFFF */ addiu $a1, $zero, -1 -/* D7A4F8 80240B08 24060007 */ addiu $a2, $zero, 7 -/* D7A4FC 80240B0C 0000382D */ daddu $a3, $zero, $zero -/* D7A500 80240B10 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D7A504 80240B14 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D7A508 80240B18 24020040 */ addiu $v0, $zero, 0x40 -/* D7A50C 80240B1C AFA00010 */ sw $zero, 0x10($sp) -/* D7A510 80240B20 AFA00014 */ sw $zero, 0x14($sp) -/* D7A514 80240B24 AFA20018 */ sw $v0, 0x18($sp) -/* D7A518 80240B28 0C0B77B9 */ jal func_802DDEE4 -/* D7A51C 80240B2C AFA0001C */ sw $zero, 0x1c($sp) -/* D7A520 80240B30 4405A000 */ mfc1 $a1, $f20 -/* D7A524 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D7A528 80240B38 3C07BF80 */ lui $a3, 0xbf80 -/* D7A52C 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D7A530 80240B40 0C019EC8 */ jal guRotateF -/* D7A534 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D7A538 80240B48 4405A000 */ mfc1 $a1, $f20 -/* D7A53C 80240B4C 4406B000 */ mfc1 $a2, $f22 -/* D7A540 80240B50 3C07BF80 */ lui $a3, 0xbf80 -/* D7A544 80240B54 0200202D */ daddu $a0, $s0, $zero -/* D7A548 80240B58 0C019EC8 */ jal guRotateF -/* D7A54C 80240B5C E7B60010 */ swc1 $f22, 0x10($sp) -/* D7A550 80240B60 4405C000 */ mfc1 $a1, $f24 -/* D7A554 80240B64 4406B000 */ mfc1 $a2, $f22 -/* D7A558 80240B68 3C073F80 */ lui $a3, 0x3f80 -/* D7A55C 80240B6C 27A40020 */ addiu $a0, $sp, 0x20 -/* D7A560 80240B70 0C019EC8 */ jal guRotateF -/* D7A564 80240B74 E7B60010 */ swc1 $f22, 0x10($sp) -/* D7A568 80240B78 0200202D */ daddu $a0, $s0, $zero -/* D7A56C 80240B7C 27A50020 */ addiu $a1, $sp, 0x20 -/* D7A570 80240B80 0C019D80 */ jal guMtxCatF -/* D7A574 80240B84 00A0302D */ daddu $a2, $a1, $zero -.L80240B88: -/* D7A578 80240B88 862200B0 */ lh $v0, 0xb0($s1) -/* D7A57C 80240B8C 3C013F00 */ lui $at, 0x3f00 -/* D7A580 80240B90 44812000 */ mtc1 $at, $f4 -/* D7A584 80240B94 00021023 */ negu $v0, $v0 -/* D7A588 80240B98 44820000 */ mtc1 $v0, $f0 -/* D7A58C 80240B9C 00000000 */ nop -/* D7A590 80240BA0 46800020 */ cvt.s.w $f0, $f0 -/* D7A594 80240BA4 46040102 */ mul.s $f4, $f0, $f4 -/* D7A598 80240BA8 00000000 */ nop -/* D7A59C 80240BAC 4405B000 */ mfc1 $a1, $f22 -/* D7A5A0 80240BB0 4407B000 */ mfc1 $a3, $f22 -/* D7A5A4 80240BB4 44062000 */ mfc1 $a2, $f4 -/* D7A5A8 80240BB8 0C019E40 */ jal guTranslateF -/* D7A5AC 80240BBC 0240202D */ daddu $a0, $s2, $zero -/* D7A5B0 80240BC0 0240202D */ daddu $a0, $s2, $zero -/* D7A5B4 80240BC4 27A50020 */ addiu $a1, $sp, 0x20 -/* D7A5B8 80240BC8 0C019D80 */ jal guMtxCatF -/* D7A5BC 80240BCC 00A0302D */ daddu $a2, $a1, $zero -/* D7A5C0 80240BD0 4405A000 */ mfc1 $a1, $f20 -/* D7A5C4 80240BD4 4406B000 */ mfc1 $a2, $f22 -/* D7A5C8 80240BD8 3C073F80 */ lui $a3, 0x3f80 -/* D7A5CC 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D7A5D0 80240BE0 0C019EC8 */ jal guRotateF -/* D7A5D4 80240BE4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D7A5D8 80240BE8 27A40020 */ addiu $a0, $sp, 0x20 -/* D7A5DC 80240BEC 0200282D */ daddu $a1, $s0, $zero -/* D7A5E0 80240BF0 0C019D80 */ jal guMtxCatF -/* D7A5E4 80240BF4 0080302D */ daddu $a2, $a0, $zero -/* D7A5E8 80240BF8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D7A5EC 80240BFC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D7A5F0 80240C00 4406B000 */ mfc1 $a2, $f22 -/* D7A5F4 80240C04 3C073F80 */ lui $a3, 0x3f80 -/* D7A5F8 80240C08 0C019EC8 */ jal guRotateF -/* D7A5FC 80240C0C 0200202D */ daddu $a0, $s0, $zero -/* D7A600 80240C10 27A40020 */ addiu $a0, $sp, 0x20 -/* D7A604 80240C14 0200282D */ daddu $a1, $s0, $zero -/* D7A608 80240C18 0C019D80 */ jal guMtxCatF -/* D7A60C 80240C1C 0080302D */ daddu $a2, $a0, $zero -/* D7A610 80240C20 862200B0 */ lh $v0, 0xb0($s1) -/* D7A614 80240C24 3C013F00 */ lui $at, 0x3f00 -/* D7A618 80240C28 44812000 */ mtc1 $at, $f4 -/* D7A61C 80240C2C 44820000 */ mtc1 $v0, $f0 -/* D7A620 80240C30 00000000 */ nop -/* D7A624 80240C34 46800020 */ cvt.s.w $f0, $f0 -/* D7A628 80240C38 46040102 */ mul.s $f4, $f0, $f4 -/* D7A62C 80240C3C 00000000 */ nop -/* D7A630 80240C40 4405B000 */ mfc1 $a1, $f22 -/* D7A634 80240C44 4407B000 */ mfc1 $a3, $f22 -/* D7A638 80240C48 44062000 */ mfc1 $a2, $f4 -/* D7A63C 80240C4C 0C019E40 */ jal guTranslateF -/* D7A640 80240C50 0240202D */ daddu $a0, $s2, $zero -/* D7A644 80240C54 27A40020 */ addiu $a0, $sp, 0x20 -/* D7A648 80240C58 0240282D */ daddu $a1, $s2, $zero -/* D7A64C 80240C5C 0C019D80 */ jal guMtxCatF -/* D7A650 80240C60 0080302D */ daddu $a2, $a0, $zero -/* D7A654 80240C64 3C013F36 */ lui $at, 0x3f36 -/* D7A658 80240C68 3421DB6E */ ori $at, $at, 0xdb6e -/* D7A65C 80240C6C 44810000 */ mtc1 $at, $f0 -/* D7A660 80240C70 0280202D */ daddu $a0, $s4, $zero -/* D7A664 80240C74 44050000 */ mfc1 $a1, $f0 -/* D7A668 80240C78 3C06BF36 */ lui $a2, 0xbf36 -/* D7A66C 80240C7C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D7A670 80240C80 0C019DF0 */ jal guScaleF -/* D7A674 80240C84 00A0382D */ daddu $a3, $a1, $zero -/* D7A678 80240C88 27A40020 */ addiu $a0, $sp, 0x20 -/* D7A67C 80240C8C 0280282D */ daddu $a1, $s4, $zero -/* D7A680 80240C90 0C019D80 */ jal guMtxCatF -/* D7A684 80240C94 0080302D */ daddu $a2, $a0, $zero -/* D7A688 80240C98 4600D687 */ neg.s $f26, $f26 -/* D7A68C 80240C9C 4405F000 */ mfc1 $a1, $f30 -/* D7A690 80240CA0 4407E000 */ mfc1 $a3, $f28 -/* D7A694 80240CA4 4406D000 */ mfc1 $a2, $f26 -/* D7A698 80240CA8 0C019E40 */ jal guTranslateF -/* D7A69C 80240CAC 0240202D */ daddu $a0, $s2, $zero -/* D7A6A0 80240CB0 27A40020 */ addiu $a0, $sp, 0x20 -/* D7A6A4 80240CB4 0240282D */ daddu $a1, $s2, $zero -/* D7A6A8 80240CB8 0C019D80 */ jal guMtxCatF -/* D7A6AC 80240CBC 0080302D */ daddu $a2, $a0, $zero -/* D7A6B0 80240CC0 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D7A6B4 80240CC4 3C0142B4 */ lui $at, 0x42b4 -/* D7A6B8 80240CC8 44810000 */ mtc1 $at, $f0 -/* D7A6BC 80240CCC 00000000 */ nop -/* D7A6C0 80240CD0 4602003E */ c.le.s $f0, $f2 -/* D7A6C4 80240CD4 00000000 */ nop -/* D7A6C8 80240CD8 4500000A */ bc1f .L80240D04 -/* D7A6CC 80240CDC 24040001 */ addiu $a0, $zero, 1 -/* D7A6D0 80240CE0 3C014387 */ lui $at, 0x4387 -/* D7A6D4 80240CE4 44812000 */ mtc1 $at, $f4 -/* D7A6D8 80240CE8 00000000 */ nop -/* D7A6DC 80240CEC 4604103C */ c.lt.s $f2, $f4 -/* D7A6E0 80240CF0 00000000 */ nop -/* D7A6E4 80240CF4 45000004 */ bc1f .L80240D08 -/* D7A6E8 80240CF8 27A20020 */ addiu $v0, $sp, 0x20 -/* D7A6EC 80240CFC 3C041000 */ lui $a0, 0x1000 -/* D7A6F0 80240D00 34840001 */ ori $a0, $a0, 1 -.L80240D04: -/* D7A6F4 80240D04 27A20020 */ addiu $v0, $sp, 0x20 -.L80240D08: -/* D7A6F8 80240D08 AFA20010 */ sw $v0, 0x10($sp) -/* D7A6FC 80240D0C 0000282D */ daddu $a1, $zero, $zero -/* D7A700 80240D10 00A0302D */ daddu $a2, $a1, $zero -/* D7A704 80240D14 0C0B7710 */ jal render_sprite -/* D7A708 80240D18 00A0382D */ daddu $a3, $a1, $zero -/* D7A70C 80240D1C 26730001 */ addiu $s3, $s3, 1 -/* D7A710 80240D20 2A620002 */ slti $v0, $s3, 2 -/* D7A714 80240D24 1440FEF6 */ bnez $v0, .L80240900 -/* D7A718 80240D28 00000000 */ nop -/* D7A71C 80240D2C 8FBF014C */ lw $ra, 0x14c($sp) -/* D7A720 80240D30 8FB60148 */ lw $s6, 0x148($sp) -/* D7A724 80240D34 8FB50144 */ lw $s5, 0x144($sp) -/* D7A728 80240D38 8FB40140 */ lw $s4, 0x140($sp) -/* D7A72C 80240D3C 8FB3013C */ lw $s3, 0x13c($sp) -/* D7A730 80240D40 8FB20138 */ lw $s2, 0x138($sp) -/* D7A734 80240D44 8FB10134 */ lw $s1, 0x134($sp) -/* D7A738 80240D48 8FB00130 */ lw $s0, 0x130($sp) -/* D7A73C 80240D4C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D7A740 80240D50 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D7A744 80240D54 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D7A748 80240D58 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D7A74C 80240D5C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D7A750 80240D60 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D7A754 80240D64 03E00008 */ jr $ra -/* D7A758 80240D68 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_27/func_80240D6C_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/func_80240D6C_D799F0.s deleted file mode 100644 index 743cbefcb2..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/func_80240D6C_D799F0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D6C_D7A75C -/* D7A75C 80240D6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7A760 80240D70 AFB00010 */ sw $s0, 0x10($sp) -/* D7A764 80240D74 0080802D */ daddu $s0, $a0, $zero -/* D7A768 80240D78 AFBF0014 */ sw $ra, 0x14($sp) -/* D7A76C 80240D7C 8E020088 */ lw $v0, 0x88($s0) -/* D7A770 80240D80 14400017 */ bnez $v0, .L80240DE0 -/* D7A774 80240D84 24020001 */ addiu $v0, $zero, 1 -/* D7A778 80240D88 8E030084 */ lw $v1, 0x84($s0) -/* D7A77C 80240D8C 1062001A */ beq $v1, $v0, .L80240DF8 -/* D7A780 80240D90 00000000 */ nop -/* D7A784 80240D94 28620002 */ slti $v0, $v1, 2 -/* D7A788 80240D98 50400005 */ beql $v0, $zero, .L80240DB0 -/* D7A78C 80240D9C 24020002 */ addiu $v0, $zero, 2 -/* D7A790 80240DA0 10600007 */ beqz $v1, .L80240DC0 -/* D7A794 80240DA4 00000000 */ nop -/* D7A798 80240DA8 08090384 */ j .L80240E10 -/* D7A79C 80240DAC 00000000 */ nop -.L80240DB0: -/* D7A7A0 80240DB0 10620007 */ beq $v1, $v0, .L80240DD0 -/* D7A7A4 80240DB4 00000000 */ nop -/* D7A7A8 80240DB8 08090384 */ j .L80240E10 -/* D7A7AC 80240DBC 00000000 */ nop -.L80240DC0: -/* D7A7B0 80240DC0 3C048024 */ lui $a0, 0x8024 -/* D7A7B4 80240DC4 24840EB4 */ addiu $a0, $a0, 0xeb4 -/* D7A7B8 80240DC8 08090380 */ j .L80240E00 -/* D7A7BC 80240DCC 00000000 */ nop -.L80240DD0: -/* D7A7C0 80240DD0 3C048024 */ lui $a0, 0x8024 -/* D7A7C4 80240DD4 24840F1C */ addiu $a0, $a0, 0xf1c -/* D7A7C8 80240DD8 08090380 */ j .L80240E00 -/* D7A7CC 80240DDC 00000000 */ nop -.L80240DE0: -/* D7A7D0 80240DE0 8E020084 */ lw $v0, 0x84($s0) -/* D7A7D4 80240DE4 0440000A */ bltz $v0, .L80240E10 -/* D7A7D8 80240DE8 00000000 */ nop -/* D7A7DC 80240DEC 28420002 */ slti $v0, $v0, 2 -/* D7A7E0 80240DF0 10400007 */ beqz $v0, .L80240E10 -/* D7A7E4 80240DF4 00000000 */ nop -.L80240DF8: -/* D7A7E8 80240DF8 3C048024 */ lui $a0, 0x8024 -/* D7A7EC 80240DFC 24840EE8 */ addiu $a0, $a0, 0xee8 -.L80240E00: -/* D7A7F0 80240E00 0C048C56 */ jal bind_dynamic_entity_3 -/* D7A7F4 80240E04 0000282D */ daddu $a1, $zero, $zero -/* D7A7F8 80240E08 8E03013C */ lw $v1, 0x13c($s0) -/* D7A7FC 80240E0C AC620004 */ sw $v0, 4($v1) -.L80240E10: -/* D7A800 80240E10 0C00EAD2 */ jal get_npc_safe -/* D7A804 80240E14 2404FFFC */ addiu $a0, $zero, -4 -/* D7A808 80240E18 0040282D */ daddu $a1, $v0, $zero -/* D7A80C 80240E1C 10A00021 */ beqz $a1, .L80240EA4 -/* D7A810 80240E20 24020002 */ addiu $v0, $zero, 2 -/* D7A814 80240E24 8E020088 */ lw $v0, 0x88($s0) -/* D7A818 80240E28 14400014 */ bnez $v0, .L80240E7C -/* D7A81C 80240E2C 24020001 */ addiu $v0, $zero, 1 -/* D7A820 80240E30 8E040084 */ lw $a0, 0x84($s0) -/* D7A824 80240E34 10820016 */ beq $a0, $v0, .L80240E90 -/* D7A828 80240E38 28820002 */ slti $v0, $a0, 2 -/* D7A82C 80240E3C 10400005 */ beqz $v0, .L80240E54 -/* D7A830 80240E40 24020002 */ addiu $v0, $zero, 2 -/* D7A834 80240E44 10800007 */ beqz $a0, .L80240E64 -/* D7A838 80240E48 00000000 */ nop -/* D7A83C 80240E4C 080903A9 */ j .L80240EA4 -/* D7A840 80240E50 00000000 */ nop -.L80240E54: -/* D7A844 80240E54 10820006 */ beq $a0, $v0, .L80240E70 -/* D7A848 80240E58 24020002 */ addiu $v0, $zero, 2 -/* D7A84C 80240E5C 080903A9 */ j .L80240EA4 -/* D7A850 80240E60 00000000 */ nop -.L80240E64: -/* D7A854 80240E64 8CA20000 */ lw $v0, ($a1) -/* D7A858 80240E68 080903A6 */ j .L80240E98 -/* D7A85C 80240E6C 3C03000A */ lui $v1, 0xa -.L80240E70: -/* D7A860 80240E70 8CA20000 */ lw $v0, ($a1) -/* D7A864 80240E74 080903A6 */ j .L80240E98 -/* D7A868 80240E78 3C030002 */ lui $v1, 2 -.L80240E7C: -/* D7A86C 80240E7C 8E020084 */ lw $v0, 0x84($s0) -/* D7A870 80240E80 04400007 */ bltz $v0, .L80240EA0 -/* D7A874 80240E84 28420002 */ slti $v0, $v0, 2 -/* D7A878 80240E88 10400006 */ beqz $v0, .L80240EA4 -/* D7A87C 80240E8C 24020002 */ addiu $v0, $zero, 2 -.L80240E90: -/* D7A880 80240E90 8CA20000 */ lw $v0, ($a1) -/* D7A884 80240E94 3C030008 */ lui $v1, 8 -.L80240E98: -/* D7A888 80240E98 00431025 */ or $v0, $v0, $v1 -/* D7A88C 80240E9C ACA20000 */ sw $v0, ($a1) -.L80240EA0: -/* D7A890 80240EA0 24020002 */ addiu $v0, $zero, 2 -.L80240EA4: -/* D7A894 80240EA4 8FBF0014 */ lw $ra, 0x14($sp) -/* D7A898 80240EA8 8FB00010 */ lw $s0, 0x10($sp) -/* D7A89C 80240EAC 03E00008 */ jr $ra -/* D7A8A0 80240EB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_27/func_80240EB4_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/func_80240EB4_D799F0.s deleted file mode 100644 index e01e22ac08..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/func_80240EB4_D799F0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_D7A8A4 -/* D7A8A4 80240EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7A8A8 80240EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D7A8AC 80240EBC 0C00EAD2 */ jal get_npc_safe -/* D7A8B0 80240EC0 2404FFFC */ addiu $a0, $zero, -4 -/* D7A8B4 80240EC4 0040202D */ daddu $a0, $v0, $zero -/* D7A8B8 80240EC8 10800004 */ beqz $a0, .L80240EDC -/* D7A8BC 80240ECC 3C03000A */ lui $v1, 0xa -/* D7A8C0 80240ED0 8C820000 */ lw $v0, ($a0) -/* D7A8C4 80240ED4 00431025 */ or $v0, $v0, $v1 -/* D7A8C8 80240ED8 AC820000 */ sw $v0, ($a0) -.L80240EDC: -/* D7A8CC 80240EDC 8FBF0010 */ lw $ra, 0x10($sp) -/* D7A8D0 80240EE0 03E00008 */ jr $ra -/* D7A8D4 80240EE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_27/func_80240EE8_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/func_80240EE8_D799F0.s deleted file mode 100644 index 002b084bc4..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/func_80240EE8_D799F0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE8_D7A8D8 -/* D7A8D8 80240EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7A8DC 80240EEC AFBF0010 */ sw $ra, 0x10($sp) -/* D7A8E0 80240EF0 0C00EAD2 */ jal get_npc_safe -/* D7A8E4 80240EF4 2404FFFC */ addiu $a0, $zero, -4 -/* D7A8E8 80240EF8 0040202D */ daddu $a0, $v0, $zero -/* D7A8EC 80240EFC 10800004 */ beqz $a0, .L80240F10 -/* D7A8F0 80240F00 3C030008 */ lui $v1, 8 -/* D7A8F4 80240F04 8C820000 */ lw $v0, ($a0) -/* D7A8F8 80240F08 00431025 */ or $v0, $v0, $v1 -/* D7A8FC 80240F0C AC820000 */ sw $v0, ($a0) -.L80240F10: -/* D7A900 80240F10 8FBF0010 */ lw $ra, 0x10($sp) -/* D7A904 80240F14 03E00008 */ jr $ra -/* D7A908 80240F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_27/func_80240F1C_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/func_80240F1C_D799F0.s deleted file mode 100644 index 4775e3e0fb..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/func_80240F1C_D799F0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F1C_D7A90C -/* D7A90C 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7A910 80240F20 AFBF0010 */ sw $ra, 0x10($sp) -/* D7A914 80240F24 0C00EAD2 */ jal get_npc_safe -/* D7A918 80240F28 2404FFFC */ addiu $a0, $zero, -4 -/* D7A91C 80240F2C 0040202D */ daddu $a0, $v0, $zero -/* D7A920 80240F30 10800004 */ beqz $a0, .L80240F44 -/* D7A924 80240F34 3C030002 */ lui $v1, 2 -/* D7A928 80240F38 8C820000 */ lw $v0, ($a0) -/* D7A92C 80240F3C 00431025 */ or $v0, $v0, $v1 -/* D7A930 80240F40 AC820000 */ sw $v0, ($a0) -.L80240F44: -/* D7A934 80240F44 8FBF0010 */ lw $ra, 0x10($sp) -/* D7A938 80240F48 03E00008 */ jr $ra -/* D7A93C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_27/func_80240F50_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/func_80240F50_D799F0.s deleted file mode 100644 index 6ce9b84c36..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/func_80240F50_D799F0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F50_D7A940 -/* D7A940 80240F50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7A944 80240F54 AFB00010 */ sw $s0, 0x10($sp) -/* D7A948 80240F58 3C108024 */ lui $s0, 0x8024 -/* D7A94C 80240F5C 26101690 */ addiu $s0, $s0, 0x1690 -/* D7A950 80240F60 AFBF0018 */ sw $ra, 0x18($sp) -/* D7A954 80240F64 AFB10014 */ sw $s1, 0x14($sp) -/* D7A958 80240F68 8E020000 */ lw $v0, ($s0) -/* D7A95C 80240F6C 14400010 */ bnez $v0, .L80240FB0 -/* D7A960 80240F70 0080882D */ daddu $s1, $a0, $zero -/* D7A964 80240F74 0C00AB39 */ jal heap_malloc -/* D7A968 80240F78 24040040 */ addiu $a0, $zero, 0x40 -/* D7A96C 80240F7C AE020000 */ sw $v0, ($s0) -/* D7A970 80240F80 0000182D */ daddu $v1, $zero, $zero -/* D7A974 80240F84 0040282D */ daddu $a1, $v0, $zero -/* D7A978 80240F88 0220202D */ daddu $a0, $s1, $zero -.L80240F8C: -/* D7A97C 80240F8C 8C820084 */ lw $v0, 0x84($a0) -/* D7A980 80240F90 24840004 */ addiu $a0, $a0, 4 -/* D7A984 80240F94 24630001 */ addiu $v1, $v1, 1 -/* D7A988 80240F98 ACA20000 */ sw $v0, ($a1) -/* D7A98C 80240F9C 28620010 */ slti $v0, $v1, 0x10 -/* D7A990 80240FA0 1440FFFA */ bnez $v0, .L80240F8C -/* D7A994 80240FA4 24A50004 */ addiu $a1, $a1, 4 -/* D7A998 80240FA8 080903FB */ j .L80240FEC -/* D7A99C 80240FAC 00000000 */ nop -.L80240FB0: -/* D7A9A0 80240FB0 0000182D */ daddu $v1, $zero, $zero -/* D7A9A4 80240FB4 0040282D */ daddu $a1, $v0, $zero -/* D7A9A8 80240FB8 0220202D */ daddu $a0, $s1, $zero -.L80240FBC: -/* D7A9AC 80240FBC 8CA20000 */ lw $v0, ($a1) -/* D7A9B0 80240FC0 24A50004 */ addiu $a1, $a1, 4 -/* D7A9B4 80240FC4 24630001 */ addiu $v1, $v1, 1 -/* D7A9B8 80240FC8 AC820084 */ sw $v0, 0x84($a0) -/* D7A9BC 80240FCC 28620010 */ slti $v0, $v1, 0x10 -/* D7A9C0 80240FD0 1440FFFA */ bnez $v0, .L80240FBC -/* D7A9C4 80240FD4 24840004 */ addiu $a0, $a0, 4 -/* D7A9C8 80240FD8 3C108024 */ lui $s0, 0x8024 -/* D7A9CC 80240FDC 26101690 */ addiu $s0, $s0, 0x1690 -/* D7A9D0 80240FE0 0C00AB4B */ jal heap_free -/* D7A9D4 80240FE4 8E040000 */ lw $a0, ($s0) -/* D7A9D8 80240FE8 AE000000 */ sw $zero, ($s0) -.L80240FEC: -/* D7A9DC 80240FEC 8FBF0018 */ lw $ra, 0x18($sp) -/* D7A9E0 80240FF0 8FB10014 */ lw $s1, 0x14($sp) -/* D7A9E4 80240FF4 8FB00010 */ lw $s0, 0x10($sp) -/* D7A9E8 80240FF8 24020002 */ addiu $v0, $zero, 2 -/* D7A9EC 80240FFC 03E00008 */ jr $ra -/* D7A9F0 80241000 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_27/func_80241004_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/func_80241004_D799F0.s deleted file mode 100644 index 97021b7723..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/func_80241004_D799F0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241004_D7A9F4 -/* D7A9F4 80241004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7A9F8 80241008 AFB00010 */ sw $s0, 0x10($sp) -/* D7A9FC 8024100C 0080802D */ daddu $s0, $a0, $zero -/* D7AA00 80241010 AFBF0018 */ sw $ra, 0x18($sp) -/* D7AA04 80241014 AFB10014 */ sw $s1, 0x14($sp) -/* D7AA08 80241018 8E02000C */ lw $v0, 0xc($s0) -/* D7AA0C 8024101C 8C510000 */ lw $s1, ($v0) -/* D7AA10 80241020 0C0B1EAF */ jal get_variable -/* D7AA14 80241024 0220282D */ daddu $a1, $s1, $zero -/* D7AA18 80241028 3C03FFF0 */ lui $v1, 0xfff0 -/* D7AA1C 8024102C 3463FFFF */ ori $v1, $v1, 0xffff -/* D7AA20 80241030 0200202D */ daddu $a0, $s0, $zero -/* D7AA24 80241034 00431024 */ and $v0, $v0, $v1 -/* D7AA28 80241038 00021140 */ sll $v0, $v0, 5 -/* D7AA2C 8024103C 3C068008 */ lui $a2, %hi(gItemTable) -/* D7AA30 80241040 00C23021 */ addu $a2, $a2, $v0 -/* D7AA34 80241044 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D7AA38 80241048 0C0B2026 */ jal set_variable -/* D7AA3C 8024104C 0220282D */ daddu $a1, $s1, $zero -/* D7AA40 80241050 8FBF0018 */ lw $ra, 0x18($sp) -/* D7AA44 80241054 8FB10014 */ lw $s1, 0x14($sp) -/* D7AA48 80241058 8FB00010 */ lw $s0, 0x10($sp) -/* D7AA4C 8024105C 24020002 */ addiu $v0, $zero, 2 -/* D7AA50 80241060 03E00008 */ jr $ra -/* D7AA54 80241064 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_27/func_80241068_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/func_80241068_D799F0.s deleted file mode 100644 index c783874814..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/func_80241068_D799F0.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_27/func_802411B8_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/func_802411B8_D799F0.s deleted file mode 100644 index 451146e8f9..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/func_802411B8_D799F0.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411B8_D7ABA8 -/* D7ABA8 802411B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7ABAC 802411BC AFB00010 */ sw $s0, 0x10($sp) -/* D7ABB0 802411C0 0080802D */ daddu $s0, $a0, $zero -/* D7ABB4 802411C4 AFBF0014 */ sw $ra, 0x14($sp) -/* D7ABB8 802411C8 8E02000C */ lw $v0, 0xc($s0) -/* D7ABBC 802411CC 0C0B1EAF */ jal get_variable -/* D7ABC0 802411D0 8C450000 */ lw $a1, ($v0) -/* D7ABC4 802411D4 00021140 */ sll $v0, $v0, 5 -/* D7ABC8 802411D8 AE000084 */ sw $zero, 0x84($s0) -/* D7ABCC 802411DC 3C018008 */ lui $at, 0x8008 -/* D7ABD0 802411E0 00220821 */ addu $at, $at, $v0 -/* D7ABD4 802411E4 942278F8 */ lhu $v0, 0x78f8($at) -/* D7ABD8 802411E8 30420040 */ andi $v0, $v0, 0x40 -/* D7ABDC 802411EC 10400002 */ beqz $v0, .L802411F8 -/* D7ABE0 802411F0 24020001 */ addiu $v0, $zero, 1 -/* D7ABE4 802411F4 AE020084 */ sw $v0, 0x84($s0) -.L802411F8: -/* D7ABE8 802411F8 8FBF0014 */ lw $ra, 0x14($sp) -/* D7ABEC 802411FC 8FB00010 */ lw $s0, 0x10($sp) -/* D7ABF0 80241200 24020002 */ addiu $v0, $zero, 2 -/* D7ABF4 80241204 03E00008 */ jr $ra -/* D7ABF8 80241208 27BD0018 */ addiu $sp, $sp, 0x18 -/* D7ABFC 8024120C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_28/func_80240050_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/func_80240050_D7B2A0.s deleted file mode 100644 index 433e2e7e9b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/func_80240050_D7B2A0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D7B2F0 -/* D7B2F0 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D7B2F4 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D7B2F8 80240058 00822024 */ and $a0, $a0, $v0 -/* D7B2FC 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D7B300 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D7B304 80240064 00821821 */ addu $v1, $a0, $v0 -/* D7B308 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D7B30C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D7B310 80240070 30620001 */ andi $v0, $v1, 1 -/* D7B314 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D7B318 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D7B31C 8024007C 03E00008 */ jr $ra -/* D7B320 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_28/func_80240084_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/func_80240084_D7B2A0.s deleted file mode 100644 index 7c47deeb40..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/func_80240084_D7B2A0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240084_D7B324 -/* D7B324 80240084 00041403 */ sra $v0, $a0, 0x10 -/* D7B328 80240088 304300FF */ andi $v1, $v0, 0xff -/* D7B32C 8024008C 24020006 */ addiu $v0, $zero, 6 -/* D7B330 80240090 10620015 */ beq $v1, $v0, .L802400E8 -/* D7B334 80240094 28620007 */ slti $v0, $v1, 7 -/* D7B338 80240098 10400005 */ beqz $v0, .L802400B0 -/* D7B33C 8024009C 24020001 */ addiu $v0, $zero, 1 -/* D7B340 802400A0 1062000A */ beq $v1, $v0, .L802400CC -/* D7B344 802400A4 3C020100 */ lui $v0, 0x100 -/* D7B348 802400A8 03E00008 */ jr $ra -/* D7B34C 802400AC 00821025 */ or $v0, $a0, $v0 -.L802400B0: -/* D7B350 802400B0 2862000A */ slti $v0, $v1, 0xa -/* D7B354 802400B4 10400016 */ beqz $v0, .L80240110 -/* D7B358 802400B8 28620008 */ slti $v0, $v1, 8 -/* D7B35C 802400BC 14400015 */ bnez $v0, .L80240114 -/* D7B360 802400C0 3C020100 */ lui $v0, 0x100 -/* D7B364 802400C4 03E00008 */ jr $ra -/* D7B368 802400C8 0080102D */ daddu $v0, $a0, $zero -.L802400CC: -/* D7B36C 802400CC 3C020001 */ lui $v0, 1 -/* D7B370 802400D0 3442000C */ ori $v0, $v0, 0xc -/* D7B374 802400D4 0044102A */ slt $v0, $v0, $a0 -/* D7B378 802400D8 1040000E */ beqz $v0, .L80240114 -/* D7B37C 802400DC 3C020100 */ lui $v0, 0x100 -.L802400E0: -/* D7B380 802400E0 03E00008 */ jr $ra -/* D7B384 802400E4 0080102D */ daddu $v0, $a0, $zero -.L802400E8: -/* D7B388 802400E8 3C02FFF9 */ lui $v0, 0xfff9 -/* D7B38C 802400EC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D7B390 802400F0 00821821 */ addu $v1, $a0, $v0 -/* D7B394 802400F4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D7B398 802400F8 10400005 */ beqz $v0, .L80240110 -/* D7B39C 802400FC 30620001 */ andi $v0, $v1, 1 -/* D7B3A0 80240100 1440FFF7 */ bnez $v0, .L802400E0 -/* D7B3A4 80240104 24820001 */ addiu $v0, $a0, 1 -/* D7B3A8 80240108 03E00008 */ jr $ra -/* D7B3AC 8024010C 00000000 */ nop -.L80240110: -/* D7B3B0 80240110 3C020100 */ lui $v0, 0x100 -.L80240114: -/* D7B3B4 80240114 03E00008 */ jr $ra -/* D7B3B8 80240118 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_28/func_8024011C_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/func_8024011C_D7B2A0.s deleted file mode 100644 index 2783a0532e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/func_8024011C_D7B2A0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024011C_D7B3BC -/* D7B3BC 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7B3C0 80240120 AFB00010 */ sw $s0, 0x10($sp) -/* D7B3C4 80240124 0080802D */ daddu $s0, $a0, $zero -/* D7B3C8 80240128 3C058024 */ lui $a1, 0x8024 -/* D7B3CC 8024012C 24A50158 */ addiu $a1, $a1, 0x158 -/* D7B3D0 80240130 AFBF0014 */ sw $ra, 0x14($sp) -/* D7B3D4 80240134 0C048C56 */ jal bind_dynamic_entity_3 -/* D7B3D8 80240138 0000202D */ daddu $a0, $zero, $zero -/* D7B3DC 8024013C 8E03013C */ lw $v1, 0x13c($s0) -/* D7B3E0 80240140 AC620000 */ sw $v0, ($v1) -/* D7B3E4 80240144 8FBF0014 */ lw $ra, 0x14($sp) -/* D7B3E8 80240148 8FB00010 */ lw $s0, 0x10($sp) -/* D7B3EC 8024014C 24020002 */ addiu $v0, $zero, 2 -/* D7B3F0 80240150 03E00008 */ jr $ra -/* D7B3F4 80240154 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_28/func_80240158_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/func_80240158_D7B2A0.s deleted file mode 100644 index 35a373a686..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/func_80240158_D7B2A0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_D7B3F8 -/* D7B3F8 80240158 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D7B3FC 8024015C AFB00040 */ sw $s0, 0x40($sp) -/* D7B400 80240160 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D7B404 80240164 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D7B408 80240168 AFB20048 */ sw $s2, 0x48($sp) -/* D7B40C 8024016C AFBF004C */ sw $ra, 0x4c($sp) -/* D7B410 80240170 AFB10044 */ sw $s1, 0x44($sp) -/* D7B414 80240174 8E020000 */ lw $v0, ($s0) -/* D7B418 80240178 821100BE */ lb $s1, 0xbe($s0) -/* D7B41C 8024017C 30420001 */ andi $v0, $v0, 1 -/* D7B420 80240180 10400061 */ beqz $v0, .L80240308 -/* D7B424 80240184 27B20020 */ addiu $s2, $sp, 0x20 -/* D7B428 80240188 8E0400CC */ lw $a0, 0xcc($s0) -/* D7B42C 8024018C 0C044181 */ jal get_shadow_by_index -/* D7B430 80240190 00000000 */ nop -/* D7B434 80240194 0C048B77 */ jal func_80122DDC -/* D7B438 80240198 84440008 */ lh $a0, 8($v0) -/* D7B43C 8024019C 8C430000 */ lw $v1, ($v0) -/* D7B440 802401A0 34630200 */ ori $v1, $v1, 0x200 -/* D7B444 802401A4 AC430000 */ sw $v1, ($v0) -/* D7B448 802401A8 8E050028 */ lw $a1, 0x28($s0) -/* D7B44C 802401AC 8E06002C */ lw $a2, 0x2c($s0) -/* D7B450 802401B0 27A20030 */ addiu $v0, $sp, 0x30 -/* D7B454 802401B4 AFA20010 */ sw $v0, 0x10($sp) -/* D7B458 802401B8 27A20034 */ addiu $v0, $sp, 0x34 -/* D7B45C 802401BC AFA20014 */ sw $v0, 0x14($sp) -/* D7B460 802401C0 C6000030 */ lwc1 $f0, 0x30($s0) -/* D7B464 802401C4 3C04800A */ lui $a0, 0x800a -/* D7B468 802401C8 8484A634 */ lh $a0, -0x59cc($a0) -/* D7B46C 802401CC 46000007 */ neg.s $f0, $f0 -/* D7B470 802401D0 44070000 */ mfc1 $a3, $f0 -/* D7B474 802401D4 27A20038 */ addiu $v0, $sp, 0x38 -/* D7B478 802401D8 0C00B94E */ jal get_screen_coords -/* D7B47C 802401DC AFA20018 */ sw $v0, 0x18($sp) -/* D7B480 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D7B484 802401E4 0C090014 */ jal func_80240050 -/* D7B488 802401E8 00000000 */ nop -/* D7B48C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) -/* D7B490 802401F0 3C014307 */ lui $at, 0x4307 -/* D7B494 802401F4 44810000 */ mtc1 $at, $f0 -/* D7B498 802401F8 00000000 */ nop -/* D7B49C 802401FC 4602003C */ c.lt.s $f0, $f2 -/* D7B4A0 80240200 00000000 */ nop -/* D7B4A4 80240204 4500000B */ bc1f .L80240234 -/* D7B4A8 80240208 24040002 */ addiu $a0, $zero, 2 -/* D7B4AC 8024020C 3C014361 */ lui $at, 0x4361 -/* D7B4B0 80240210 44810000 */ mtc1 $at, $f0 -/* D7B4B4 80240214 00000000 */ nop -/* D7B4B8 80240218 4600103C */ c.lt.s $f2, $f0 -/* D7B4BC 8024021C 00000000 */ nop -/* D7B4C0 80240220 45000004 */ bc1f .L80240234 -/* D7B4C4 80240224 00000000 */ nop -/* D7B4C8 80240228 0C090021 */ jal func_80240084 -/* D7B4CC 8024022C 0040202D */ daddu $a0, $v0, $zero -/* D7B4D0 80240230 24040002 */ addiu $a0, $zero, 2 -.L80240234: -/* D7B4D4 80240234 3C063F80 */ lui $a2, 0x3f80 -/* D7B4D8 80240238 0C0B76A3 */ jal func_802DDA8C -/* D7B4DC 8024023C 0040282D */ daddu $a1, $v0, $zero -/* D7B4E0 80240240 8E020000 */ lw $v0, ($s0) -/* D7B4E4 80240244 3C030002 */ lui $v1, 2 -/* D7B4E8 80240248 00431024 */ and $v0, $v0, $v1 -/* D7B4EC 8024024C 54400022 */ bnel $v0, $zero, .L802402D8 -/* D7B4F0 80240250 24110011 */ addiu $s1, $zero, 0x11 -/* D7B4F4 80240254 9203000E */ lbu $v1, 0xe($s0) -/* D7B4F8 80240258 3C02802E */ lui $v0, 0x802e -/* D7B4FC 8024025C 90429D70 */ lbu $v0, -0x6290($v0) -/* D7B500 80240260 10620018 */ beq $v1, $v0, .L802402C4 -/* D7B504 80240264 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D7B508 80240268 1040000B */ beqz $v0, .L80240298 -/* D7B50C 8024026C 24110011 */ addiu $s1, $zero, 0x11 -/* D7B510 80240270 24040002 */ addiu $a0, $zero, 2 -/* D7B514 80240274 2405FFFF */ addiu $a1, $zero, -1 -/* D7B518 80240278 24060007 */ addiu $a2, $zero, 7 -/* D7B51C 8024027C 0060102D */ daddu $v0, $v1, $zero -/* D7B520 80240280 0000382D */ daddu $a3, $zero, $zero -/* D7B524 80240284 AFA00010 */ sw $zero, 0x10($sp) -/* D7B528 80240288 AFA00014 */ sw $zero, 0x14($sp) -/* D7B52C 8024028C AFA0001C */ sw $zero, 0x1c($sp) -/* D7B530 80240290 080900AF */ j .L802402BC -/* D7B534 80240294 AFA20018 */ sw $v0, 0x18($sp) -.L80240298: -/* D7B538 80240298 2411000D */ addiu $s1, $zero, 0xd -/* D7B53C 8024029C 24040002 */ addiu $a0, $zero, 2 -/* D7B540 802402A0 2405FFFF */ addiu $a1, $zero, -1 -/* D7B544 802402A4 0000302D */ daddu $a2, $zero, $zero -/* D7B548 802402A8 00C0382D */ daddu $a3, $a2, $zero -/* D7B54C 802402AC AFA00010 */ sw $zero, 0x10($sp) -/* D7B550 802402B0 AFA00014 */ sw $zero, 0x14($sp) -/* D7B554 802402B4 AFA00018 */ sw $zero, 0x18($sp) -/* D7B558 802402B8 AFA0001C */ sw $zero, 0x1c($sp) -.L802402BC: -/* D7B55C 802402BC 0C0B77B9 */ jal func_802DDEE4 -/* D7B560 802402C0 00000000 */ nop -.L802402C4: -/* D7B564 802402C4 9202000E */ lbu $v0, 0xe($s0) -/* D7B568 802402C8 3C01802E */ lui $at, 0x802e -/* D7B56C 802402CC A0229D70 */ sb $v0, -0x6290($at) -/* D7B570 802402D0 080900B9 */ j .L802402E4 -/* D7B574 802402D4 0240202D */ daddu $a0, $s2, $zero -.L802402D8: -/* D7B578 802402D8 3C01802E */ lui $at, 0x802e -/* D7B57C 802402DC A0209D70 */ sb $zero, -0x6290($at) -/* D7B580 802402E0 0240202D */ daddu $a0, $s2, $zero -.L802402E4: -/* D7B584 802402E4 AC910000 */ sw $s1, ($a0) -/* D7B588 802402E8 AC900008 */ sw $s0, 8($a0) -/* D7B58C 802402EC 8FA20038 */ lw $v0, 0x38($sp) -/* D7B590 802402F0 3C038024 */ lui $v1, 0x8024 -/* D7B594 802402F4 24630320 */ addiu $v1, $v1, 0x320 -/* D7B598 802402F8 AC83000C */ sw $v1, 0xc($a0) -/* D7B59C 802402FC 00021023 */ negu $v0, $v0 -/* D7B5A0 80240300 0C047644 */ jal queue_render_task -/* D7B5A4 80240304 AC820004 */ sw $v0, 4($a0) -.L80240308: -/* D7B5A8 80240308 8FBF004C */ lw $ra, 0x4c($sp) -/* D7B5AC 8024030C 8FB20048 */ lw $s2, 0x48($sp) -/* D7B5B0 80240310 8FB10044 */ lw $s1, 0x44($sp) -/* D7B5B4 80240314 8FB00040 */ lw $s0, 0x40($sp) -/* D7B5B8 80240318 03E00008 */ jr $ra -/* D7B5BC 8024031C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_28/func_80240320_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/func_80240320_D7B2A0.s deleted file mode 100644 index d557abe367..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/func_80240320_D7B2A0.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240320_D7B5C0 -/* D7B5C0 80240320 3C03800A */ lui $v1, 0x800a -/* D7B5C4 80240324 8463A634 */ lh $v1, -0x59cc($v1) -/* D7B5C8 80240328 3C07BF80 */ lui $a3, 0xbf80 -/* D7B5CC 8024032C 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D7B5D0 80240330 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D7B5D4 80240334 4480A000 */ mtc1 $zero, $f20 -/* D7B5D8 80240338 AFB1011C */ sw $s1, 0x11c($sp) -/* D7B5DC 8024033C 0080882D */ daddu $s1, $a0, $zero -/* D7B5E0 80240340 AFB00118 */ sw $s0, 0x118($sp) -/* D7B5E4 80240344 27B00098 */ addiu $s0, $sp, 0x98 -/* D7B5E8 80240348 AFBF0120 */ sw $ra, 0x120($sp) -/* D7B5EC 8024034C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D7B5F0 80240350 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D7B5F4 80240354 00031080 */ sll $v0, $v1, 2 -/* D7B5F8 80240358 00431021 */ addu $v0, $v0, $v1 -/* D7B5FC 8024035C 00021080 */ sll $v0, $v0, 2 -/* D7B600 80240360 00431023 */ subu $v0, $v0, $v1 -/* D7B604 80240364 000218C0 */ sll $v1, $v0, 3 -/* D7B608 80240368 00431021 */ addu $v0, $v0, $v1 -/* D7B60C 8024036C 000210C0 */ sll $v0, $v0, 3 -/* D7B610 80240370 3C01800B */ lui $at, 0x800b -/* D7B614 80240374 00220821 */ addu $at, $at, $v0 -/* D7B618 80240378 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D7B61C 8024037C 4406A000 */ mfc1 $a2, $f20 -/* D7B620 80240380 4600B587 */ neg.s $f22, $f22 -/* D7B624 80240384 4405B000 */ mfc1 $a1, $f22 -/* D7B628 80240388 0200202D */ daddu $a0, $s0, $zero -/* D7B62C 8024038C 0C019EC8 */ jal guRotateF -/* D7B630 80240390 E7B40010 */ swc1 $f20, 0x10($sp) -/* D7B634 80240394 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D7B638 80240398 0C00A6C9 */ jal clamp_angle -/* D7B63C 8024039C 00000000 */ nop -/* D7B640 802403A0 44050000 */ mfc1 $a1, $f0 -/* D7B644 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D7B648 802403A8 4407A000 */ mfc1 $a3, $f20 -/* D7B64C 802403AC 3C013F80 */ lui $at, 0x3f80 -/* D7B650 802403B0 4481C000 */ mtc1 $at, $f24 -/* D7B654 802403B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D7B658 802403B8 0C019EC8 */ jal guRotateF -/* D7B65C 802403BC E7B80010 */ swc1 $f24, 0x10($sp) -/* D7B660 802403C0 0200202D */ daddu $a0, $s0, $zero -/* D7B664 802403C4 27A50018 */ addiu $a1, $sp, 0x18 -/* D7B668 802403C8 0C019D80 */ jal guMtxCatF -/* D7B66C 802403CC 00A0302D */ daddu $a2, $a1, $zero -/* D7B670 802403D0 4405B000 */ mfc1 $a1, $f22 -/* D7B674 802403D4 4406A000 */ mfc1 $a2, $f20 -/* D7B678 802403D8 4407C000 */ mfc1 $a3, $f24 -/* D7B67C 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D7B680 802403E0 0C019EC8 */ jal guRotateF -/* D7B684 802403E4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D7B688 802403E8 27A40018 */ addiu $a0, $sp, 0x18 -/* D7B68C 802403EC 0200282D */ daddu $a1, $s0, $zero -/* D7B690 802403F0 0C019D80 */ jal guMtxCatF -/* D7B694 802403F4 0080302D */ daddu $a2, $a0, $zero -/* D7B698 802403F8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D7B69C 802403FC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D7B6A0 80240400 4406A000 */ mfc1 $a2, $f20 -/* D7B6A4 80240404 4407C000 */ mfc1 $a3, $f24 -/* D7B6A8 80240408 0C019EC8 */ jal guRotateF -/* D7B6AC 8024040C 0200202D */ daddu $a0, $s0, $zero -/* D7B6B0 80240410 27A40018 */ addiu $a0, $sp, 0x18 -/* D7B6B4 80240414 0200282D */ daddu $a1, $s0, $zero -/* D7B6B8 80240418 0C019D80 */ jal guMtxCatF -/* D7B6BC 8024041C 0080302D */ daddu $a2, $a0, $zero -/* D7B6C0 80240420 3C013F36 */ lui $at, 0x3f36 -/* D7B6C4 80240424 3421DB6E */ ori $at, $at, 0xdb6e -/* D7B6C8 80240428 44810000 */ mtc1 $at, $f0 -/* D7B6CC 8024042C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D7B6D0 80240430 44050000 */ mfc1 $a1, $f0 -/* D7B6D4 80240434 0200202D */ daddu $a0, $s0, $zero -/* D7B6D8 80240438 00A0302D */ daddu $a2, $a1, $zero -/* D7B6DC 8024043C 0C019DF0 */ jal guScaleF -/* D7B6E0 80240440 00A0382D */ daddu $a3, $a1, $zero -/* D7B6E4 80240444 27A40018 */ addiu $a0, $sp, 0x18 -/* D7B6E8 80240448 0200282D */ daddu $a1, $s0, $zero -/* D7B6EC 8024044C 0C019D80 */ jal guMtxCatF -/* D7B6F0 80240450 0080302D */ daddu $a2, $a0, $zero -/* D7B6F4 80240454 27B00058 */ addiu $s0, $sp, 0x58 -/* D7B6F8 80240458 C6200030 */ lwc1 $f0, 0x30($s1) -/* D7B6FC 8024045C 3C014040 */ lui $at, 0x4040 -/* D7B700 80240460 44811000 */ mtc1 $at, $f2 -/* D7B704 80240464 46000007 */ neg.s $f0, $f0 -/* D7B708 80240468 46020001 */ sub.s $f0, $f0, $f2 -/* D7B70C 8024046C 8E250028 */ lw $a1, 0x28($s1) -/* D7B710 80240470 8E26002C */ lw $a2, 0x2c($s1) -/* D7B714 80240474 44070000 */ mfc1 $a3, $f0 -/* D7B718 80240478 0C019E40 */ jal guTranslateF -/* D7B71C 8024047C 0200202D */ daddu $a0, $s0, $zero -/* D7B720 80240480 27A40018 */ addiu $a0, $sp, 0x18 -/* D7B724 80240484 0200282D */ daddu $a1, $s0, $zero -/* D7B728 80240488 0C019D80 */ jal guMtxCatF -/* D7B72C 8024048C 0080302D */ daddu $a2, $a0, $zero -/* D7B730 80240490 24040002 */ addiu $a0, $zero, 2 -/* D7B734 80240494 0000282D */ daddu $a1, $zero, $zero -/* D7B738 80240498 00A0302D */ daddu $a2, $a1, $zero -/* D7B73C 8024049C 00A0382D */ daddu $a3, $a1, $zero -/* D7B740 802404A0 27A20018 */ addiu $v0, $sp, 0x18 -/* D7B744 802404A4 0C0B7710 */ jal render_sprite -/* D7B748 802404A8 AFA20010 */ sw $v0, 0x10($sp) -/* D7B74C 802404AC 8FBF0120 */ lw $ra, 0x120($sp) -/* D7B750 802404B0 8FB1011C */ lw $s1, 0x11c($sp) -/* D7B754 802404B4 8FB00118 */ lw $s0, 0x118($sp) -/* D7B758 802404B8 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D7B75C 802404BC D7B60130 */ ldc1 $f22, 0x130($sp) -/* D7B760 802404C0 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D7B764 802404C4 03E00008 */ jr $ra -/* D7B768 802404C8 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_28/func_802404CC_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/func_802404CC_D7B2A0.s deleted file mode 100644 index 586514feed..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/func_802404CC_D7B2A0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404CC_D7B76C -/* D7B76C 802404CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7B770 802404D0 AFB00010 */ sw $s0, 0x10($sp) -/* D7B774 802404D4 0080802D */ daddu $s0, $a0, $zero -/* D7B778 802404D8 AFBF0014 */ sw $ra, 0x14($sp) -/* D7B77C 802404DC 8E020084 */ lw $v0, 0x84($s0) -/* D7B780 802404E0 0440000E */ bltz $v0, .L8024051C -/* D7B784 802404E4 28420002 */ slti $v0, $v0, 2 -/* D7B788 802404E8 1040000C */ beqz $v0, .L8024051C -/* D7B78C 802404EC 00000000 */ nop -/* D7B790 802404F0 3C058024 */ lui $a1, 0x8024 -/* D7B794 802404F4 24A50530 */ addiu $a1, $a1, 0x530 -/* D7B798 802404F8 0C048C56 */ jal bind_dynamic_entity_3 -/* D7B79C 802404FC 0000202D */ daddu $a0, $zero, $zero -/* D7B7A0 80240500 8E03013C */ lw $v1, 0x13c($s0) -/* D7B7A4 80240504 AC620000 */ sw $v0, ($v1) -/* D7B7A8 80240508 3C03800A */ lui $v1, %hi(D_8009A650) -/* D7B7AC 8024050C 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D7B7B0 80240510 8C620000 */ lw $v0, ($v1) -/* D7B7B4 80240514 34420080 */ ori $v0, $v0, 0x80 -/* D7B7B8 80240518 AC620000 */ sw $v0, ($v1) -.L8024051C: -/* D7B7BC 8024051C 8FBF0014 */ lw $ra, 0x14($sp) -/* D7B7C0 80240520 8FB00010 */ lw $s0, 0x10($sp) -/* D7B7C4 80240524 24020002 */ addiu $v0, $zero, 2 -/* D7B7C8 80240528 03E00008 */ jr $ra -/* D7B7CC 8024052C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_28/func_80240530_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/func_80240530_D7B2A0.s deleted file mode 100644 index 49a6b1ce81..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/func_80240530_D7B2A0.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240530_D7B7D0 -/* D7B7D0 80240530 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D7B7D4 80240534 AFB00040 */ sw $s0, 0x40($sp) -/* D7B7D8 80240538 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D7B7DC 8024053C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D7B7E0 80240540 AFB10044 */ sw $s1, 0x44($sp) -/* D7B7E4 80240544 AFBF004C */ sw $ra, 0x4c($sp) -/* D7B7E8 80240548 AFB20048 */ sw $s2, 0x48($sp) -/* D7B7EC 8024054C 8E020000 */ lw $v0, ($s0) -/* D7B7F0 80240550 821200BE */ lb $s2, 0xbe($s0) -/* D7B7F4 80240554 30420001 */ andi $v0, $v0, 1 -/* D7B7F8 80240558 10400052 */ beqz $v0, .L802406A4 -/* D7B7FC 8024055C 27B10020 */ addiu $s1, $sp, 0x20 -/* D7B800 80240560 8E0400CC */ lw $a0, 0xcc($s0) -/* D7B804 80240564 0C044181 */ jal get_shadow_by_index -/* D7B808 80240568 00000000 */ nop -/* D7B80C 8024056C 0C048B77 */ jal func_80122DDC -/* D7B810 80240570 84440008 */ lh $a0, 8($v0) -/* D7B814 80240574 8E050028 */ lw $a1, 0x28($s0) -/* D7B818 80240578 8E070030 */ lw $a3, 0x30($s0) -/* D7B81C 8024057C 27A20030 */ addiu $v0, $sp, 0x30 -/* D7B820 80240580 AFA20010 */ sw $v0, 0x10($sp) -/* D7B824 80240584 27A20034 */ addiu $v0, $sp, 0x34 -/* D7B828 80240588 AFA20014 */ sw $v0, 0x14($sp) -/* D7B82C 8024058C 27A20038 */ addiu $v0, $sp, 0x38 -/* D7B830 80240590 AFA20018 */ sw $v0, 0x18($sp) -/* D7B834 80240594 C600002C */ lwc1 $f0, 0x2c($s0) -/* D7B838 80240598 3C04800A */ lui $a0, 0x800a -/* D7B83C 8024059C 8484A634 */ lh $a0, -0x59cc($a0) -/* D7B840 802405A0 46000007 */ neg.s $f0, $f0 -/* D7B844 802405A4 44060000 */ mfc1 $a2, $f0 -/* D7B848 802405A8 0C00B94E */ jal get_screen_coords -/* D7B84C 802405AC 00000000 */ nop -/* D7B850 802405B0 8E0500A4 */ lw $a1, 0xa4($s0) -/* D7B854 802405B4 3C063F80 */ lui $a2, 0x3f80 -/* D7B858 802405B8 0C0B76A3 */ jal func_802DDA8C -/* D7B85C 802405BC 24040001 */ addiu $a0, $zero, 1 -/* D7B860 802405C0 8E020000 */ lw $v0, ($s0) -/* D7B864 802405C4 3C030002 */ lui $v1, 2 -/* D7B868 802405C8 00431024 */ and $v0, $v0, $v1 -/* D7B86C 802405CC 54400022 */ bnel $v0, $zero, .L80240658 -/* D7B870 802405D0 24120011 */ addiu $s2, $zero, 0x11 -/* D7B874 802405D4 9203000E */ lbu $v1, 0xe($s0) -/* D7B878 802405D8 3C02802E */ lui $v0, 0x802e -/* D7B87C 802405DC 90429D71 */ lbu $v0, -0x628f($v0) -/* D7B880 802405E0 10620018 */ beq $v1, $v0, .L80240644 -/* D7B884 802405E4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D7B888 802405E8 1040000B */ beqz $v0, .L80240618 -/* D7B88C 802405EC 24120011 */ addiu $s2, $zero, 0x11 -/* D7B890 802405F0 24040001 */ addiu $a0, $zero, 1 -/* D7B894 802405F4 2405FFFF */ addiu $a1, $zero, -1 -/* D7B898 802405F8 24060007 */ addiu $a2, $zero, 7 -/* D7B89C 802405FC 0060102D */ daddu $v0, $v1, $zero -/* D7B8A0 80240600 0000382D */ daddu $a3, $zero, $zero -/* D7B8A4 80240604 AFA00010 */ sw $zero, 0x10($sp) -/* D7B8A8 80240608 AFA00014 */ sw $zero, 0x14($sp) -/* D7B8AC 8024060C AFA0001C */ sw $zero, 0x1c($sp) -/* D7B8B0 80240610 0809018F */ j .L8024063C -/* D7B8B4 80240614 AFA20018 */ sw $v0, 0x18($sp) -.L80240618: -/* D7B8B8 80240618 2412000D */ addiu $s2, $zero, 0xd -/* D7B8BC 8024061C 24040001 */ addiu $a0, $zero, 1 -/* D7B8C0 80240620 2405FFFF */ addiu $a1, $zero, -1 -/* D7B8C4 80240624 0000302D */ daddu $a2, $zero, $zero -/* D7B8C8 80240628 00C0382D */ daddu $a3, $a2, $zero -/* D7B8CC 8024062C AFA00010 */ sw $zero, 0x10($sp) -/* D7B8D0 80240630 AFA00014 */ sw $zero, 0x14($sp) -/* D7B8D4 80240634 AFA00018 */ sw $zero, 0x18($sp) -/* D7B8D8 80240638 AFA0001C */ sw $zero, 0x1c($sp) -.L8024063C: -/* D7B8DC 8024063C 0C0B77B9 */ jal func_802DDEE4 -/* D7B8E0 80240640 00000000 */ nop -.L80240644: -/* D7B8E4 80240644 9202000E */ lbu $v0, 0xe($s0) -/* D7B8E8 80240648 3C01802E */ lui $at, 0x802e -/* D7B8EC 8024064C A0229D71 */ sb $v0, -0x628f($at) -/* D7B8F0 80240650 08090198 */ j .L80240660 -/* D7B8F4 80240654 00000000 */ nop -.L80240658: -/* D7B8F8 80240658 3C01802E */ lui $at, 0x802e -/* D7B8FC 8024065C A0209D71 */ sb $zero, -0x628f($at) -.L80240660: -/* D7B900 80240660 8FA20038 */ lw $v0, 0x38($sp) -/* D7B904 80240664 3C048024 */ lui $a0, 0x8024 -/* D7B908 80240668 248408A0 */ addiu $a0, $a0, 0x8a0 -/* D7B90C 8024066C AE320000 */ sw $s2, ($s1) -/* D7B910 80240670 AE300008 */ sw $s0, 8($s1) -/* D7B914 80240674 00021023 */ negu $v0, $v0 -/* D7B918 80240678 AE220004 */ sw $v0, 4($s1) -/* D7B91C 8024067C 8E020000 */ lw $v0, ($s0) -/* D7B920 80240680 3C030002 */ lui $v1, 2 -/* D7B924 80240684 00431024 */ and $v0, $v0, $v1 -/* D7B928 80240688 54400004 */ bnel $v0, $zero, .L8024069C -/* D7B92C 8024068C AE24000C */ sw $a0, 0xc($s1) -/* D7B930 80240690 3C048024 */ lui $a0, 0x8024 -/* D7B934 80240694 248406BC */ addiu $a0, $a0, 0x6bc -/* D7B938 80240698 AE24000C */ sw $a0, 0xc($s1) -.L8024069C: -/* D7B93C 8024069C 0C047644 */ jal queue_render_task -/* D7B940 802406A0 0220202D */ daddu $a0, $s1, $zero -.L802406A4: -/* D7B944 802406A4 8FBF004C */ lw $ra, 0x4c($sp) -/* D7B948 802406A8 8FB20048 */ lw $s2, 0x48($sp) -/* D7B94C 802406AC 8FB10044 */ lw $s1, 0x44($sp) -/* D7B950 802406B0 8FB00040 */ lw $s0, 0x40($sp) -/* D7B954 802406B4 03E00008 */ jr $ra -/* D7B958 802406B8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_28/func_802406BC_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/func_802406BC_D7B2A0.s deleted file mode 100644 index f22564d240..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/func_802406BC_D7B2A0.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406BC_D7B95C -/* D7B95C 802406BC 3C03800A */ lui $v1, 0x800a -/* D7B960 802406C0 8463A634 */ lh $v1, -0x59cc($v1) -/* D7B964 802406C4 3C07BF80 */ lui $a3, 0xbf80 -/* D7B968 802406C8 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D7B96C 802406CC F7B40128 */ sdc1 $f20, 0x128($sp) -/* D7B970 802406D0 4480A000 */ mtc1 $zero, $f20 -/* D7B974 802406D4 AFB1011C */ sw $s1, 0x11c($sp) -/* D7B978 802406D8 0080882D */ daddu $s1, $a0, $zero -/* D7B97C 802406DC AFB00118 */ sw $s0, 0x118($sp) -/* D7B980 802406E0 27B00098 */ addiu $s0, $sp, 0x98 -/* D7B984 802406E4 AFBF0120 */ sw $ra, 0x120($sp) -/* D7B988 802406E8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D7B98C 802406EC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D7B990 802406F0 00031080 */ sll $v0, $v1, 2 -/* D7B994 802406F4 00431021 */ addu $v0, $v0, $v1 -/* D7B998 802406F8 00021080 */ sll $v0, $v0, 2 -/* D7B99C 802406FC 00431023 */ subu $v0, $v0, $v1 -/* D7B9A0 80240700 000218C0 */ sll $v1, $v0, 3 -/* D7B9A4 80240704 00431021 */ addu $v0, $v0, $v1 -/* D7B9A8 80240708 000210C0 */ sll $v0, $v0, 3 -/* D7B9AC 8024070C 3C01800B */ lui $at, 0x800b -/* D7B9B0 80240710 00220821 */ addu $at, $at, $v0 -/* D7B9B4 80240714 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D7B9B8 80240718 4406A000 */ mfc1 $a2, $f20 -/* D7B9BC 8024071C 4600B587 */ neg.s $f22, $f22 -/* D7B9C0 80240720 4405B000 */ mfc1 $a1, $f22 -/* D7B9C4 80240724 0200202D */ daddu $a0, $s0, $zero -/* D7B9C8 80240728 0C019EC8 */ jal guRotateF -/* D7B9CC 8024072C E7B40010 */ swc1 $f20, 0x10($sp) -/* D7B9D0 80240730 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D7B9D4 80240734 0C00A6C9 */ jal clamp_angle -/* D7B9D8 80240738 00000000 */ nop -/* D7B9DC 8024073C 44050000 */ mfc1 $a1, $f0 -/* D7B9E0 80240740 4406A000 */ mfc1 $a2, $f20 -/* D7B9E4 80240744 4407A000 */ mfc1 $a3, $f20 -/* D7B9E8 80240748 3C013F80 */ lui $at, 0x3f80 -/* D7B9EC 8024074C 4481C000 */ mtc1 $at, $f24 -/* D7B9F0 80240750 27A40018 */ addiu $a0, $sp, 0x18 -/* D7B9F4 80240754 0C019EC8 */ jal guRotateF -/* D7B9F8 80240758 E7B80010 */ swc1 $f24, 0x10($sp) -/* D7B9FC 8024075C 0200202D */ daddu $a0, $s0, $zero -/* D7BA00 80240760 27A50018 */ addiu $a1, $sp, 0x18 -/* D7BA04 80240764 0C019D80 */ jal guMtxCatF -/* D7BA08 80240768 00A0302D */ daddu $a2, $a1, $zero -/* D7BA0C 8024076C 4405B000 */ mfc1 $a1, $f22 -/* D7BA10 80240770 4406A000 */ mfc1 $a2, $f20 -/* D7BA14 80240774 4407C000 */ mfc1 $a3, $f24 -/* D7BA18 80240778 0200202D */ daddu $a0, $s0, $zero -/* D7BA1C 8024077C 0C019EC8 */ jal guRotateF -/* D7BA20 80240780 E7B40010 */ swc1 $f20, 0x10($sp) -/* D7BA24 80240784 27A40018 */ addiu $a0, $sp, 0x18 -/* D7BA28 80240788 0200282D */ daddu $a1, $s0, $zero -/* D7BA2C 8024078C 0C019D80 */ jal guMtxCatF -/* D7BA30 80240790 0080302D */ daddu $a2, $a0, $zero -/* D7BA34 80240794 E7B40010 */ swc1 $f20, 0x10($sp) -/* D7BA38 80240798 8E2500A8 */ lw $a1, 0xa8($s1) -/* D7BA3C 8024079C 4406A000 */ mfc1 $a2, $f20 -/* D7BA40 802407A0 4407C000 */ mfc1 $a3, $f24 -/* D7BA44 802407A4 0C019EC8 */ jal guRotateF -/* D7BA48 802407A8 0200202D */ daddu $a0, $s0, $zero -/* D7BA4C 802407AC 27A40018 */ addiu $a0, $sp, 0x18 -/* D7BA50 802407B0 0200282D */ daddu $a1, $s0, $zero -/* D7BA54 802407B4 0C019D80 */ jal guMtxCatF -/* D7BA58 802407B8 0080302D */ daddu $a2, $a0, $zero -/* D7BA5C 802407BC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D7BA60 802407C0 3C013F36 */ lui $at, 0x3f36 -/* D7BA64 802407C4 3421DB6E */ ori $at, $at, 0xdb6e -/* D7BA68 802407C8 44810000 */ mtc1 $at, $f0 -/* D7BA6C 802407CC 0200202D */ daddu $a0, $s0, $zero -/* D7BA70 802407D0 44050000 */ mfc1 $a1, $f0 -/* D7BA74 802407D4 3C06BF36 */ lui $a2, 0xbf36 -/* D7BA78 802407D8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D7BA7C 802407DC 0C019DF0 */ jal guScaleF -/* D7BA80 802407E0 00A0382D */ daddu $a3, $a1, $zero -/* D7BA84 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D7BA88 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D7BA8C 802407EC 0C019D80 */ jal guMtxCatF -/* D7BA90 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D7BA94 802407F4 27B00058 */ addiu $s0, $sp, 0x58 -/* D7BA98 802407F8 8E250028 */ lw $a1, 0x28($s1) -/* D7BA9C 802407FC C620002C */ lwc1 $f0, 0x2c($s1) -/* D7BAA0 80240800 8E270030 */ lw $a3, 0x30($s1) -/* D7BAA4 80240804 46000007 */ neg.s $f0, $f0 -/* D7BAA8 80240808 44060000 */ mfc1 $a2, $f0 -/* D7BAAC 8024080C 0C019E40 */ jal guTranslateF -/* D7BAB0 80240810 0200202D */ daddu $a0, $s0, $zero -/* D7BAB4 80240814 27A40018 */ addiu $a0, $sp, 0x18 -/* D7BAB8 80240818 0200282D */ daddu $a1, $s0, $zero -/* D7BABC 8024081C 0C019D80 */ jal guMtxCatF -/* D7BAC0 80240820 0080302D */ daddu $a2, $a0, $zero -/* D7BAC4 80240824 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D7BAC8 80240828 3C0142B4 */ lui $at, 0x42b4 -/* D7BACC 8024082C 44810000 */ mtc1 $at, $f0 -/* D7BAD0 80240830 00000000 */ nop -/* D7BAD4 80240834 4602003E */ c.le.s $f0, $f2 -/* D7BAD8 80240838 00000000 */ nop -/* D7BADC 8024083C 4500000A */ bc1f .L80240868 -/* D7BAE0 80240840 24040001 */ addiu $a0, $zero, 1 -/* D7BAE4 80240844 3C014387 */ lui $at, 0x4387 -/* D7BAE8 80240848 44810000 */ mtc1 $at, $f0 -/* D7BAEC 8024084C 00000000 */ nop -/* D7BAF0 80240850 4600103C */ c.lt.s $f2, $f0 -/* D7BAF4 80240854 00000000 */ nop -/* D7BAF8 80240858 45000004 */ bc1f .L8024086C -/* D7BAFC 8024085C 27A20018 */ addiu $v0, $sp, 0x18 -/* D7BB00 80240860 3C041000 */ lui $a0, 0x1000 -/* D7BB04 80240864 34840001 */ ori $a0, $a0, 1 -.L80240868: -/* D7BB08 80240868 27A20018 */ addiu $v0, $sp, 0x18 -.L8024086C: -/* D7BB0C 8024086C 0000282D */ daddu $a1, $zero, $zero -/* D7BB10 80240870 00A0302D */ daddu $a2, $a1, $zero -/* D7BB14 80240874 00A0382D */ daddu $a3, $a1, $zero -/* D7BB18 80240878 0C0B7710 */ jal render_sprite -/* D7BB1C 8024087C AFA20010 */ sw $v0, 0x10($sp) -/* D7BB20 80240880 8FBF0120 */ lw $ra, 0x120($sp) -/* D7BB24 80240884 8FB1011C */ lw $s1, 0x11c($sp) -/* D7BB28 80240888 8FB00118 */ lw $s0, 0x118($sp) -/* D7BB2C 8024088C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D7BB30 80240890 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D7BB34 80240894 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D7BB38 80240898 03E00008 */ jr $ra -/* D7BB3C 8024089C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_28/func_802408A0_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/func_802408A0_D7B2A0.s deleted file mode 100644 index 61df1ca3ff..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/func_802408A0_D7B2A0.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A0_D7BB40 -/* D7BB40 802408A0 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D7BB44 802408A4 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D7BB48 802408A8 4480B000 */ mtc1 $zero, $f22 -/* D7BB4C 802408AC AFB10134 */ sw $s1, 0x134($sp) -/* D7BB50 802408B0 0080882D */ daddu $s1, $a0, $zero -/* D7BB54 802408B4 AFB3013C */ sw $s3, 0x13c($sp) -/* D7BB58 802408B8 0000982D */ daddu $s3, $zero, $zero -/* D7BB5C 802408BC AFB60148 */ sw $s6, 0x148($sp) -/* D7BB60 802408C0 3C16800B */ lui $s6, %hi(gCameras) -/* D7BB64 802408C4 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D7BB68 802408C8 AFB50144 */ sw $s5, 0x144($sp) -/* D7BB6C 802408CC 241500FF */ addiu $s5, $zero, 0xff -/* D7BB70 802408D0 AFB00130 */ sw $s0, 0x130($sp) -/* D7BB74 802408D4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D7BB78 802408D8 AFB20138 */ sw $s2, 0x138($sp) -/* D7BB7C 802408DC 27B20060 */ addiu $s2, $sp, 0x60 -/* D7BB80 802408E0 AFB40140 */ sw $s4, 0x140($sp) -/* D7BB84 802408E4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D7BB88 802408E8 AFBF014C */ sw $ra, 0x14c($sp) -/* D7BB8C 802408EC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D7BB90 802408F0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D7BB94 802408F4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D7BB98 802408F8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D7BB9C 802408FC F7B40150 */ sdc1 $f20, 0x150($sp) -.L80240900: -/* D7BBA0 80240900 3C03800A */ lui $v1, 0x800a -/* D7BBA4 80240904 8463A634 */ lh $v1, -0x59cc($v1) -/* D7BBA8 80240908 00031080 */ sll $v0, $v1, 2 -/* D7BBAC 8024090C 00431021 */ addu $v0, $v0, $v1 -/* D7BBB0 80240910 00021080 */ sll $v0, $v0, 2 -/* D7BBB4 80240914 00431023 */ subu $v0, $v0, $v1 -/* D7BBB8 80240918 000218C0 */ sll $v1, $v0, 3 -/* D7BBBC 8024091C 00431021 */ addu $v0, $v0, $v1 -/* D7BBC0 80240920 000210C0 */ sll $v0, $v0, 3 -/* D7BBC4 80240924 00561021 */ addu $v0, $v0, $s6 -/* D7BBC8 80240928 C440006C */ lwc1 $f0, 0x6c($v0) -/* D7BBCC 8024092C 16600065 */ bnez $s3, .L80240AC4 -/* D7BBD0 80240930 46000507 */ neg.s $f20, $f0 -/* D7BBD4 80240934 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D7BBD8 80240938 3C0142B4 */ lui $at, 0x42b4 -/* D7BBDC 8024093C 44810000 */ mtc1 $at, $f0 -/* D7BBE0 80240940 00000000 */ nop -/* D7BBE4 80240944 4602003C */ c.lt.s $f0, $f2 -/* D7BBE8 80240948 00000000 */ nop -/* D7BBEC 8024094C 4500000A */ bc1f .L80240978 -/* D7BBF0 80240950 00000000 */ nop -/* D7BBF4 80240954 3C014334 */ lui $at, 0x4334 -/* D7BBF8 80240958 44812000 */ mtc1 $at, $f4 -/* D7BBFC 8024095C 00000000 */ nop -/* D7BC00 80240960 4604103E */ c.le.s $f2, $f4 -/* D7BC04 80240964 00000000 */ nop -/* D7BC08 80240968 45000003 */ bc1f .L80240978 -/* D7BC0C 8024096C 00000000 */ nop -/* D7BC10 80240970 08090282 */ j .L80240A08 -/* D7BC14 80240974 46022501 */ sub.s $f20, $f4, $f2 -.L80240978: -/* D7BC18 80240978 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D7BC1C 8024097C 3C014334 */ lui $at, 0x4334 -/* D7BC20 80240980 44812000 */ mtc1 $at, $f4 -/* D7BC24 80240984 00000000 */ nop -/* D7BC28 80240988 4600203C */ c.lt.s $f4, $f0 -/* D7BC2C 8024098C 00000000 */ nop -/* D7BC30 80240990 4500000C */ bc1f .L802409C4 -/* D7BC34 80240994 00000000 */ nop -/* D7BC38 80240998 3C014387 */ lui $at, 0x4387 -/* D7BC3C 8024099C 44812000 */ mtc1 $at, $f4 -/* D7BC40 802409A0 00000000 */ nop -/* D7BC44 802409A4 4604003E */ c.le.s $f0, $f4 -/* D7BC48 802409A8 00000000 */ nop -/* D7BC4C 802409AC 45000008 */ bc1f .L802409D0 -/* D7BC50 802409B0 00000000 */ nop -/* D7BC54 802409B4 3C014334 */ lui $at, 0x4334 -/* D7BC58 802409B8 44812000 */ mtc1 $at, $f4 -/* D7BC5C 802409BC 08090282 */ j .L80240A08 -/* D7BC60 802409C0 46040501 */ sub.s $f20, $f0, $f4 -.L802409C4: -/* D7BC64 802409C4 3C014387 */ lui $at, 0x4387 -/* D7BC68 802409C8 44812000 */ mtc1 $at, $f4 -/* D7BC6C 802409CC 00000000 */ nop -.L802409D0: -/* D7BC70 802409D0 4600203C */ c.lt.s $f4, $f0 -/* D7BC74 802409D4 00000000 */ nop -/* D7BC78 802409D8 4500000A */ bc1f .L80240A04 -/* D7BC7C 802409DC 00000000 */ nop -/* D7BC80 802409E0 3C0143B4 */ lui $at, 0x43b4 -/* D7BC84 802409E4 44811000 */ mtc1 $at, $f2 -/* D7BC88 802409E8 00000000 */ nop -/* D7BC8C 802409EC 4602003E */ c.le.s $f0, $f2 -/* D7BC90 802409F0 00000000 */ nop -/* D7BC94 802409F4 45000003 */ bc1f .L80240A04 -/* D7BC98 802409F8 00000000 */ nop -/* D7BC9C 802409FC 08090282 */ j .L80240A08 -/* D7BCA0 80240A00 46001501 */ sub.s $f20, $f2, $f0 -.L80240A04: -/* D7BCA4 80240A04 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L80240A08: -/* D7BCA8 80240A08 3C0141C8 */ lui $at, 0x41c8 -/* D7BCAC 80240A0C 44810000 */ mtc1 $at, $f0 -/* D7BCB0 80240A10 00000000 */ nop -/* D7BCB4 80240A14 4600A003 */ div.s $f0, $f20, $f0 -/* D7BCB8 80240A18 4600010D */ trunc.w.s $f4, $f0 -/* D7BCBC 80240A1C 44072000 */ mfc1 $a3, $f4 -/* D7BCC0 80240A20 00000000 */ nop -/* D7BCC4 80240A24 00071100 */ sll $v0, $a3, 4 -/* D7BCC8 80240A28 00471023 */ subu $v0, $v0, $a3 -/* D7BCCC 80240A2C 00021080 */ sll $v0, $v0, 2 -/* D7BCD0 80240A30 02A23823 */ subu $a3, $s5, $v0 -/* D7BCD4 80240A34 28E20064 */ slti $v0, $a3, 0x64 -/* D7BCD8 80240A38 54400001 */ bnel $v0, $zero, .L80240A40 -/* D7BCDC 80240A3C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A40: -/* D7BCE0 80240A40 24040001 */ addiu $a0, $zero, 1 -/* D7BCE4 80240A44 2405FFFF */ addiu $a1, $zero, -1 -/* D7BCE8 80240A48 24060006 */ addiu $a2, $zero, 6 -/* D7BCEC 80240A4C AFA70010 */ sw $a3, 0x10($sp) -/* D7BCF0 80240A50 AFA70014 */ sw $a3, 0x14($sp) -/* D7BCF4 80240A54 AFB50018 */ sw $s5, 0x18($sp) -/* D7BCF8 80240A58 0C0B77B9 */ jal func_802DDEE4 -/* D7BCFC 80240A5C AFA0001C */ sw $zero, 0x1c($sp) -/* D7BD00 80240A60 4405A000 */ mfc1 $a1, $f20 -/* D7BD04 80240A64 4406B000 */ mfc1 $a2, $f22 -/* D7BD08 80240A68 3C07BF80 */ lui $a3, 0xbf80 -/* D7BD0C 80240A6C 0200202D */ daddu $a0, $s0, $zero -/* D7BD10 80240A70 0C019EC8 */ jal guRotateF -/* D7BD14 80240A74 E7B60010 */ swc1 $f22, 0x10($sp) -/* D7BD18 80240A78 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D7BD1C 80240A7C 0C00A6C9 */ jal clamp_angle -/* D7BD20 80240A80 00000000 */ nop -/* D7BD24 80240A84 44050000 */ mfc1 $a1, $f0 -/* D7BD28 80240A88 4406B000 */ mfc1 $a2, $f22 -/* D7BD2C 80240A8C 4407B000 */ mfc1 $a3, $f22 -/* D7BD30 80240A90 3C013F80 */ lui $at, 0x3f80 -/* D7BD34 80240A94 44812000 */ mtc1 $at, $f4 -/* D7BD38 80240A98 27A40020 */ addiu $a0, $sp, 0x20 -/* D7BD3C 80240A9C 0C019EC8 */ jal guRotateF -/* D7BD40 80240AA0 E7A40010 */ swc1 $f4, 0x10($sp) -/* D7BD44 80240AA4 0200202D */ daddu $a0, $s0, $zero -/* D7BD48 80240AA8 27A50020 */ addiu $a1, $sp, 0x20 -/* D7BD4C 80240AAC 0C019D80 */ jal guMtxCatF -/* D7BD50 80240AB0 00A0302D */ daddu $a2, $a1, $zero -/* D7BD54 80240AB4 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D7BD58 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D7BD5C 80240ABC 080902E2 */ j .L80240B88 -/* D7BD60 80240AC0 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240AC4: -/* D7BD64 80240AC4 0260202D */ daddu $a0, $s3, $zero -/* D7BD68 80240AC8 27A50120 */ addiu $a1, $sp, 0x120 -/* D7BD6C 80240ACC 27A60124 */ addiu $a2, $sp, 0x124 -/* D7BD70 80240AD0 0C03964E */ jal func_800E5938 -/* D7BD74 80240AD4 27A70128 */ addiu $a3, $sp, 0x128 -/* D7BD78 80240AD8 8FA60124 */ lw $a2, 0x124($sp) -/* D7BD7C 80240ADC 3C028000 */ lui $v0, 0x8000 -/* D7BD80 80240AE0 14C20004 */ bne $a2, $v0, .L80240AF4 -/* D7BD84 80240AE4 46000606 */ mov.s $f24, $f0 -/* D7BD88 80240AE8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D7BD8C 80240AEC 080902C1 */ j .L80240B04 -/* D7BD90 80240AF0 24040001 */ addiu $a0, $zero, 1 -.L80240AF4: -/* D7BD94 80240AF4 4486D000 */ mtc1 $a2, $f26 -/* D7BD98 80240AF8 00000000 */ nop -/* D7BD9C 80240AFC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D7BDA0 80240B00 24040001 */ addiu $a0, $zero, 1 -.L80240B04: -/* D7BDA4 80240B04 2405FFFF */ addiu $a1, $zero, -1 -/* D7BDA8 80240B08 24060007 */ addiu $a2, $zero, 7 -/* D7BDAC 80240B0C 0000382D */ daddu $a3, $zero, $zero -/* D7BDB0 80240B10 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D7BDB4 80240B14 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D7BDB8 80240B18 24020040 */ addiu $v0, $zero, 0x40 -/* D7BDBC 80240B1C AFA00010 */ sw $zero, 0x10($sp) -/* D7BDC0 80240B20 AFA00014 */ sw $zero, 0x14($sp) -/* D7BDC4 80240B24 AFA20018 */ sw $v0, 0x18($sp) -/* D7BDC8 80240B28 0C0B77B9 */ jal func_802DDEE4 -/* D7BDCC 80240B2C AFA0001C */ sw $zero, 0x1c($sp) -/* D7BDD0 80240B30 4405A000 */ mfc1 $a1, $f20 -/* D7BDD4 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D7BDD8 80240B38 3C07BF80 */ lui $a3, 0xbf80 -/* D7BDDC 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D7BDE0 80240B40 0C019EC8 */ jal guRotateF -/* D7BDE4 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D7BDE8 80240B48 4405A000 */ mfc1 $a1, $f20 -/* D7BDEC 80240B4C 4406B000 */ mfc1 $a2, $f22 -/* D7BDF0 80240B50 3C07BF80 */ lui $a3, 0xbf80 -/* D7BDF4 80240B54 0200202D */ daddu $a0, $s0, $zero -/* D7BDF8 80240B58 0C019EC8 */ jal guRotateF -/* D7BDFC 80240B5C E7B60010 */ swc1 $f22, 0x10($sp) -/* D7BE00 80240B60 4405C000 */ mfc1 $a1, $f24 -/* D7BE04 80240B64 4406B000 */ mfc1 $a2, $f22 -/* D7BE08 80240B68 3C073F80 */ lui $a3, 0x3f80 -/* D7BE0C 80240B6C 27A40020 */ addiu $a0, $sp, 0x20 -/* D7BE10 80240B70 0C019EC8 */ jal guRotateF -/* D7BE14 80240B74 E7B60010 */ swc1 $f22, 0x10($sp) -/* D7BE18 80240B78 0200202D */ daddu $a0, $s0, $zero -/* D7BE1C 80240B7C 27A50020 */ addiu $a1, $sp, 0x20 -/* D7BE20 80240B80 0C019D80 */ jal guMtxCatF -/* D7BE24 80240B84 00A0302D */ daddu $a2, $a1, $zero -.L80240B88: -/* D7BE28 80240B88 862200B0 */ lh $v0, 0xb0($s1) -/* D7BE2C 80240B8C 3C013F00 */ lui $at, 0x3f00 -/* D7BE30 80240B90 44812000 */ mtc1 $at, $f4 -/* D7BE34 80240B94 00021023 */ negu $v0, $v0 -/* D7BE38 80240B98 44820000 */ mtc1 $v0, $f0 -/* D7BE3C 80240B9C 00000000 */ nop -/* D7BE40 80240BA0 46800020 */ cvt.s.w $f0, $f0 -/* D7BE44 80240BA4 46040102 */ mul.s $f4, $f0, $f4 -/* D7BE48 80240BA8 00000000 */ nop -/* D7BE4C 80240BAC 4405B000 */ mfc1 $a1, $f22 -/* D7BE50 80240BB0 4407B000 */ mfc1 $a3, $f22 -/* D7BE54 80240BB4 44062000 */ mfc1 $a2, $f4 -/* D7BE58 80240BB8 0C019E40 */ jal guTranslateF -/* D7BE5C 80240BBC 0240202D */ daddu $a0, $s2, $zero -/* D7BE60 80240BC0 0240202D */ daddu $a0, $s2, $zero -/* D7BE64 80240BC4 27A50020 */ addiu $a1, $sp, 0x20 -/* D7BE68 80240BC8 0C019D80 */ jal guMtxCatF -/* D7BE6C 80240BCC 00A0302D */ daddu $a2, $a1, $zero -/* D7BE70 80240BD0 4405A000 */ mfc1 $a1, $f20 -/* D7BE74 80240BD4 4406B000 */ mfc1 $a2, $f22 -/* D7BE78 80240BD8 3C073F80 */ lui $a3, 0x3f80 -/* D7BE7C 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D7BE80 80240BE0 0C019EC8 */ jal guRotateF -/* D7BE84 80240BE4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D7BE88 80240BE8 27A40020 */ addiu $a0, $sp, 0x20 -/* D7BE8C 80240BEC 0200282D */ daddu $a1, $s0, $zero -/* D7BE90 80240BF0 0C019D80 */ jal guMtxCatF -/* D7BE94 80240BF4 0080302D */ daddu $a2, $a0, $zero -/* D7BE98 80240BF8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D7BE9C 80240BFC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D7BEA0 80240C00 4406B000 */ mfc1 $a2, $f22 -/* D7BEA4 80240C04 3C073F80 */ lui $a3, 0x3f80 -/* D7BEA8 80240C08 0C019EC8 */ jal guRotateF -/* D7BEAC 80240C0C 0200202D */ daddu $a0, $s0, $zero -/* D7BEB0 80240C10 27A40020 */ addiu $a0, $sp, 0x20 -/* D7BEB4 80240C14 0200282D */ daddu $a1, $s0, $zero -/* D7BEB8 80240C18 0C019D80 */ jal guMtxCatF -/* D7BEBC 80240C1C 0080302D */ daddu $a2, $a0, $zero -/* D7BEC0 80240C20 862200B0 */ lh $v0, 0xb0($s1) -/* D7BEC4 80240C24 3C013F00 */ lui $at, 0x3f00 -/* D7BEC8 80240C28 44812000 */ mtc1 $at, $f4 -/* D7BECC 80240C2C 44820000 */ mtc1 $v0, $f0 -/* D7BED0 80240C30 00000000 */ nop -/* D7BED4 80240C34 46800020 */ cvt.s.w $f0, $f0 -/* D7BED8 80240C38 46040102 */ mul.s $f4, $f0, $f4 -/* D7BEDC 80240C3C 00000000 */ nop -/* D7BEE0 80240C40 4405B000 */ mfc1 $a1, $f22 -/* D7BEE4 80240C44 4407B000 */ mfc1 $a3, $f22 -/* D7BEE8 80240C48 44062000 */ mfc1 $a2, $f4 -/* D7BEEC 80240C4C 0C019E40 */ jal guTranslateF -/* D7BEF0 80240C50 0240202D */ daddu $a0, $s2, $zero -/* D7BEF4 80240C54 27A40020 */ addiu $a0, $sp, 0x20 -/* D7BEF8 80240C58 0240282D */ daddu $a1, $s2, $zero -/* D7BEFC 80240C5C 0C019D80 */ jal guMtxCatF -/* D7BF00 80240C60 0080302D */ daddu $a2, $a0, $zero -/* D7BF04 80240C64 3C013F36 */ lui $at, 0x3f36 -/* D7BF08 80240C68 3421DB6E */ ori $at, $at, 0xdb6e -/* D7BF0C 80240C6C 44810000 */ mtc1 $at, $f0 -/* D7BF10 80240C70 0280202D */ daddu $a0, $s4, $zero -/* D7BF14 80240C74 44050000 */ mfc1 $a1, $f0 -/* D7BF18 80240C78 3C06BF36 */ lui $a2, 0xbf36 -/* D7BF1C 80240C7C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D7BF20 80240C80 0C019DF0 */ jal guScaleF -/* D7BF24 80240C84 00A0382D */ daddu $a3, $a1, $zero -/* D7BF28 80240C88 27A40020 */ addiu $a0, $sp, 0x20 -/* D7BF2C 80240C8C 0280282D */ daddu $a1, $s4, $zero -/* D7BF30 80240C90 0C019D80 */ jal guMtxCatF -/* D7BF34 80240C94 0080302D */ daddu $a2, $a0, $zero -/* D7BF38 80240C98 4600D687 */ neg.s $f26, $f26 -/* D7BF3C 80240C9C 4405F000 */ mfc1 $a1, $f30 -/* D7BF40 80240CA0 4407E000 */ mfc1 $a3, $f28 -/* D7BF44 80240CA4 4406D000 */ mfc1 $a2, $f26 -/* D7BF48 80240CA8 0C019E40 */ jal guTranslateF -/* D7BF4C 80240CAC 0240202D */ daddu $a0, $s2, $zero -/* D7BF50 80240CB0 27A40020 */ addiu $a0, $sp, 0x20 -/* D7BF54 80240CB4 0240282D */ daddu $a1, $s2, $zero -/* D7BF58 80240CB8 0C019D80 */ jal guMtxCatF -/* D7BF5C 80240CBC 0080302D */ daddu $a2, $a0, $zero -/* D7BF60 80240CC0 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D7BF64 80240CC4 3C0142B4 */ lui $at, 0x42b4 -/* D7BF68 80240CC8 44810000 */ mtc1 $at, $f0 -/* D7BF6C 80240CCC 00000000 */ nop -/* D7BF70 80240CD0 4602003E */ c.le.s $f0, $f2 -/* D7BF74 80240CD4 00000000 */ nop -/* D7BF78 80240CD8 4500000A */ bc1f .L80240D04 -/* D7BF7C 80240CDC 24040001 */ addiu $a0, $zero, 1 -/* D7BF80 80240CE0 3C014387 */ lui $at, 0x4387 -/* D7BF84 80240CE4 44812000 */ mtc1 $at, $f4 -/* D7BF88 80240CE8 00000000 */ nop -/* D7BF8C 80240CEC 4604103C */ c.lt.s $f2, $f4 -/* D7BF90 80240CF0 00000000 */ nop -/* D7BF94 80240CF4 45000004 */ bc1f .L80240D08 -/* D7BF98 80240CF8 27A20020 */ addiu $v0, $sp, 0x20 -/* D7BF9C 80240CFC 3C041000 */ lui $a0, 0x1000 -/* D7BFA0 80240D00 34840001 */ ori $a0, $a0, 1 -.L80240D04: -/* D7BFA4 80240D04 27A20020 */ addiu $v0, $sp, 0x20 -.L80240D08: -/* D7BFA8 80240D08 AFA20010 */ sw $v0, 0x10($sp) -/* D7BFAC 80240D0C 0000282D */ daddu $a1, $zero, $zero -/* D7BFB0 80240D10 00A0302D */ daddu $a2, $a1, $zero -/* D7BFB4 80240D14 0C0B7710 */ jal render_sprite -/* D7BFB8 80240D18 00A0382D */ daddu $a3, $a1, $zero -/* D7BFBC 80240D1C 26730001 */ addiu $s3, $s3, 1 -/* D7BFC0 80240D20 2A620002 */ slti $v0, $s3, 2 -/* D7BFC4 80240D24 1440FEF6 */ bnez $v0, .L80240900 -/* D7BFC8 80240D28 00000000 */ nop -/* D7BFCC 80240D2C 8FBF014C */ lw $ra, 0x14c($sp) -/* D7BFD0 80240D30 8FB60148 */ lw $s6, 0x148($sp) -/* D7BFD4 80240D34 8FB50144 */ lw $s5, 0x144($sp) -/* D7BFD8 80240D38 8FB40140 */ lw $s4, 0x140($sp) -/* D7BFDC 80240D3C 8FB3013C */ lw $s3, 0x13c($sp) -/* D7BFE0 80240D40 8FB20138 */ lw $s2, 0x138($sp) -/* D7BFE4 80240D44 8FB10134 */ lw $s1, 0x134($sp) -/* D7BFE8 80240D48 8FB00130 */ lw $s0, 0x130($sp) -/* D7BFEC 80240D4C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D7BFF0 80240D50 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D7BFF4 80240D54 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D7BFF8 80240D58 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D7BFFC 80240D5C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D7C000 80240D60 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D7C004 80240D64 03E00008 */ jr $ra -/* D7C008 80240D68 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_28/func_80240D6C_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/func_80240D6C_D7B2A0.s deleted file mode 100644 index 504d8e9614..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/func_80240D6C_D7B2A0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D6C_D7C00C -/* D7C00C 80240D6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7C010 80240D70 AFB00010 */ sw $s0, 0x10($sp) -/* D7C014 80240D74 0080802D */ daddu $s0, $a0, $zero -/* D7C018 80240D78 AFBF0014 */ sw $ra, 0x14($sp) -/* D7C01C 80240D7C 8E020088 */ lw $v0, 0x88($s0) -/* D7C020 80240D80 14400017 */ bnez $v0, .L80240DE0 -/* D7C024 80240D84 24020001 */ addiu $v0, $zero, 1 -/* D7C028 80240D88 8E030084 */ lw $v1, 0x84($s0) -/* D7C02C 80240D8C 1062001A */ beq $v1, $v0, .L80240DF8 -/* D7C030 80240D90 00000000 */ nop -/* D7C034 80240D94 28620002 */ slti $v0, $v1, 2 -/* D7C038 80240D98 50400005 */ beql $v0, $zero, .L80240DB0 -/* D7C03C 80240D9C 24020002 */ addiu $v0, $zero, 2 -/* D7C040 80240DA0 10600007 */ beqz $v1, .L80240DC0 -/* D7C044 80240DA4 00000000 */ nop -/* D7C048 80240DA8 08090384 */ j .L80240E10 -/* D7C04C 80240DAC 00000000 */ nop -.L80240DB0: -/* D7C050 80240DB0 10620007 */ beq $v1, $v0, .L80240DD0 -/* D7C054 80240DB4 00000000 */ nop -/* D7C058 80240DB8 08090384 */ j .L80240E10 -/* D7C05C 80240DBC 00000000 */ nop -.L80240DC0: -/* D7C060 80240DC0 3C048024 */ lui $a0, 0x8024 -/* D7C064 80240DC4 24840EB4 */ addiu $a0, $a0, 0xeb4 -/* D7C068 80240DC8 08090380 */ j .L80240E00 -/* D7C06C 80240DCC 00000000 */ nop -.L80240DD0: -/* D7C070 80240DD0 3C048024 */ lui $a0, 0x8024 -/* D7C074 80240DD4 24840F1C */ addiu $a0, $a0, 0xf1c -/* D7C078 80240DD8 08090380 */ j .L80240E00 -/* D7C07C 80240DDC 00000000 */ nop -.L80240DE0: -/* D7C080 80240DE0 8E020084 */ lw $v0, 0x84($s0) -/* D7C084 80240DE4 0440000A */ bltz $v0, .L80240E10 -/* D7C088 80240DE8 00000000 */ nop -/* D7C08C 80240DEC 28420002 */ slti $v0, $v0, 2 -/* D7C090 80240DF0 10400007 */ beqz $v0, .L80240E10 -/* D7C094 80240DF4 00000000 */ nop -.L80240DF8: -/* D7C098 80240DF8 3C048024 */ lui $a0, 0x8024 -/* D7C09C 80240DFC 24840EE8 */ addiu $a0, $a0, 0xee8 -.L80240E00: -/* D7C0A0 80240E00 0C048C56 */ jal bind_dynamic_entity_3 -/* D7C0A4 80240E04 0000282D */ daddu $a1, $zero, $zero -/* D7C0A8 80240E08 8E03013C */ lw $v1, 0x13c($s0) -/* D7C0AC 80240E0C AC620004 */ sw $v0, 4($v1) -.L80240E10: -/* D7C0B0 80240E10 0C00EAD2 */ jal get_npc_safe -/* D7C0B4 80240E14 2404FFFC */ addiu $a0, $zero, -4 -/* D7C0B8 80240E18 0040282D */ daddu $a1, $v0, $zero -/* D7C0BC 80240E1C 10A00021 */ beqz $a1, .L80240EA4 -/* D7C0C0 80240E20 24020002 */ addiu $v0, $zero, 2 -/* D7C0C4 80240E24 8E020088 */ lw $v0, 0x88($s0) -/* D7C0C8 80240E28 14400014 */ bnez $v0, .L80240E7C -/* D7C0CC 80240E2C 24020001 */ addiu $v0, $zero, 1 -/* D7C0D0 80240E30 8E040084 */ lw $a0, 0x84($s0) -/* D7C0D4 80240E34 10820016 */ beq $a0, $v0, .L80240E90 -/* D7C0D8 80240E38 28820002 */ slti $v0, $a0, 2 -/* D7C0DC 80240E3C 10400005 */ beqz $v0, .L80240E54 -/* D7C0E0 80240E40 24020002 */ addiu $v0, $zero, 2 -/* D7C0E4 80240E44 10800007 */ beqz $a0, .L80240E64 -/* D7C0E8 80240E48 00000000 */ nop -/* D7C0EC 80240E4C 080903A9 */ j .L80240EA4 -/* D7C0F0 80240E50 00000000 */ nop -.L80240E54: -/* D7C0F4 80240E54 10820006 */ beq $a0, $v0, .L80240E70 -/* D7C0F8 80240E58 24020002 */ addiu $v0, $zero, 2 -/* D7C0FC 80240E5C 080903A9 */ j .L80240EA4 -/* D7C100 80240E60 00000000 */ nop -.L80240E64: -/* D7C104 80240E64 8CA20000 */ lw $v0, ($a1) -/* D7C108 80240E68 080903A6 */ j .L80240E98 -/* D7C10C 80240E6C 3C03000A */ lui $v1, 0xa -.L80240E70: -/* D7C110 80240E70 8CA20000 */ lw $v0, ($a1) -/* D7C114 80240E74 080903A6 */ j .L80240E98 -/* D7C118 80240E78 3C030002 */ lui $v1, 2 -.L80240E7C: -/* D7C11C 80240E7C 8E020084 */ lw $v0, 0x84($s0) -/* D7C120 80240E80 04400007 */ bltz $v0, .L80240EA0 -/* D7C124 80240E84 28420002 */ slti $v0, $v0, 2 -/* D7C128 80240E88 10400006 */ beqz $v0, .L80240EA4 -/* D7C12C 80240E8C 24020002 */ addiu $v0, $zero, 2 -.L80240E90: -/* D7C130 80240E90 8CA20000 */ lw $v0, ($a1) -/* D7C134 80240E94 3C030008 */ lui $v1, 8 -.L80240E98: -/* D7C138 80240E98 00431025 */ or $v0, $v0, $v1 -/* D7C13C 80240E9C ACA20000 */ sw $v0, ($a1) -.L80240EA0: -/* D7C140 80240EA0 24020002 */ addiu $v0, $zero, 2 -.L80240EA4: -/* D7C144 80240EA4 8FBF0014 */ lw $ra, 0x14($sp) -/* D7C148 80240EA8 8FB00010 */ lw $s0, 0x10($sp) -/* D7C14C 80240EAC 03E00008 */ jr $ra -/* D7C150 80240EB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_28/func_80240EB4_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/func_80240EB4_D7B2A0.s deleted file mode 100644 index d7855298ad..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/func_80240EB4_D7B2A0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_D7C154 -/* D7C154 80240EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7C158 80240EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D7C15C 80240EBC 0C00EAD2 */ jal get_npc_safe -/* D7C160 80240EC0 2404FFFC */ addiu $a0, $zero, -4 -/* D7C164 80240EC4 0040202D */ daddu $a0, $v0, $zero -/* D7C168 80240EC8 10800004 */ beqz $a0, .L80240EDC -/* D7C16C 80240ECC 3C03000A */ lui $v1, 0xa -/* D7C170 80240ED0 8C820000 */ lw $v0, ($a0) -/* D7C174 80240ED4 00431025 */ or $v0, $v0, $v1 -/* D7C178 80240ED8 AC820000 */ sw $v0, ($a0) -.L80240EDC: -/* D7C17C 80240EDC 8FBF0010 */ lw $ra, 0x10($sp) -/* D7C180 80240EE0 03E00008 */ jr $ra -/* D7C184 80240EE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_28/func_80240EE8_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/func_80240EE8_D7B2A0.s deleted file mode 100644 index 757f35800e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/func_80240EE8_D7B2A0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE8_D7C188 -/* D7C188 80240EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7C18C 80240EEC AFBF0010 */ sw $ra, 0x10($sp) -/* D7C190 80240EF0 0C00EAD2 */ jal get_npc_safe -/* D7C194 80240EF4 2404FFFC */ addiu $a0, $zero, -4 -/* D7C198 80240EF8 0040202D */ daddu $a0, $v0, $zero -/* D7C19C 80240EFC 10800004 */ beqz $a0, .L80240F10 -/* D7C1A0 80240F00 3C030008 */ lui $v1, 8 -/* D7C1A4 80240F04 8C820000 */ lw $v0, ($a0) -/* D7C1A8 80240F08 00431025 */ or $v0, $v0, $v1 -/* D7C1AC 80240F0C AC820000 */ sw $v0, ($a0) -.L80240F10: -/* D7C1B0 80240F10 8FBF0010 */ lw $ra, 0x10($sp) -/* D7C1B4 80240F14 03E00008 */ jr $ra -/* D7C1B8 80240F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_28/func_80240F1C_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/func_80240F1C_D7B2A0.s deleted file mode 100644 index 72a264f5c6..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/func_80240F1C_D7B2A0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F1C_D7C1BC -/* D7C1BC 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7C1C0 80240F20 AFBF0010 */ sw $ra, 0x10($sp) -/* D7C1C4 80240F24 0C00EAD2 */ jal get_npc_safe -/* D7C1C8 80240F28 2404FFFC */ addiu $a0, $zero, -4 -/* D7C1CC 80240F2C 0040202D */ daddu $a0, $v0, $zero -/* D7C1D0 80240F30 10800004 */ beqz $a0, .L80240F44 -/* D7C1D4 80240F34 3C030002 */ lui $v1, 2 -/* D7C1D8 80240F38 8C820000 */ lw $v0, ($a0) -/* D7C1DC 80240F3C 00431025 */ or $v0, $v0, $v1 -/* D7C1E0 80240F40 AC820000 */ sw $v0, ($a0) -.L80240F44: -/* D7C1E4 80240F44 8FBF0010 */ lw $ra, 0x10($sp) -/* D7C1E8 80240F48 03E00008 */ jr $ra -/* D7C1EC 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_28/func_80240F50_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/func_80240F50_D7B2A0.s deleted file mode 100644 index 7c70fb936f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/func_80240F50_D7B2A0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F50_D7C1F0 -/* D7C1F0 80240F50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7C1F4 80240F54 AFB00010 */ sw $s0, 0x10($sp) -/* D7C1F8 80240F58 3C108024 */ lui $s0, 0x8024 -/* D7C1FC 80240F5C 26101690 */ addiu $s0, $s0, 0x1690 -/* D7C200 80240F60 AFBF0018 */ sw $ra, 0x18($sp) -/* D7C204 80240F64 AFB10014 */ sw $s1, 0x14($sp) -/* D7C208 80240F68 8E020000 */ lw $v0, ($s0) -/* D7C20C 80240F6C 14400010 */ bnez $v0, .L80240FB0 -/* D7C210 80240F70 0080882D */ daddu $s1, $a0, $zero -/* D7C214 80240F74 0C00AB39 */ jal heap_malloc -/* D7C218 80240F78 24040040 */ addiu $a0, $zero, 0x40 -/* D7C21C 80240F7C AE020000 */ sw $v0, ($s0) -/* D7C220 80240F80 0000182D */ daddu $v1, $zero, $zero -/* D7C224 80240F84 0040282D */ daddu $a1, $v0, $zero -/* D7C228 80240F88 0220202D */ daddu $a0, $s1, $zero -.L80240F8C: -/* D7C22C 80240F8C 8C820084 */ lw $v0, 0x84($a0) -/* D7C230 80240F90 24840004 */ addiu $a0, $a0, 4 -/* D7C234 80240F94 24630001 */ addiu $v1, $v1, 1 -/* D7C238 80240F98 ACA20000 */ sw $v0, ($a1) -/* D7C23C 80240F9C 28620010 */ slti $v0, $v1, 0x10 -/* D7C240 80240FA0 1440FFFA */ bnez $v0, .L80240F8C -/* D7C244 80240FA4 24A50004 */ addiu $a1, $a1, 4 -/* D7C248 80240FA8 080903FB */ j .L80240FEC -/* D7C24C 80240FAC 00000000 */ nop -.L80240FB0: -/* D7C250 80240FB0 0000182D */ daddu $v1, $zero, $zero -/* D7C254 80240FB4 0040282D */ daddu $a1, $v0, $zero -/* D7C258 80240FB8 0220202D */ daddu $a0, $s1, $zero -.L80240FBC: -/* D7C25C 80240FBC 8CA20000 */ lw $v0, ($a1) -/* D7C260 80240FC0 24A50004 */ addiu $a1, $a1, 4 -/* D7C264 80240FC4 24630001 */ addiu $v1, $v1, 1 -/* D7C268 80240FC8 AC820084 */ sw $v0, 0x84($a0) -/* D7C26C 80240FCC 28620010 */ slti $v0, $v1, 0x10 -/* D7C270 80240FD0 1440FFFA */ bnez $v0, .L80240FBC -/* D7C274 80240FD4 24840004 */ addiu $a0, $a0, 4 -/* D7C278 80240FD8 3C108024 */ lui $s0, 0x8024 -/* D7C27C 80240FDC 26101690 */ addiu $s0, $s0, 0x1690 -/* D7C280 80240FE0 0C00AB4B */ jal heap_free -/* D7C284 80240FE4 8E040000 */ lw $a0, ($s0) -/* D7C288 80240FE8 AE000000 */ sw $zero, ($s0) -.L80240FEC: -/* D7C28C 80240FEC 8FBF0018 */ lw $ra, 0x18($sp) -/* D7C290 80240FF0 8FB10014 */ lw $s1, 0x14($sp) -/* D7C294 80240FF4 8FB00010 */ lw $s0, 0x10($sp) -/* D7C298 80240FF8 24020002 */ addiu $v0, $zero, 2 -/* D7C29C 80240FFC 03E00008 */ jr $ra -/* D7C2A0 80241000 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_28/func_80241004_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/func_80241004_D7B2A0.s deleted file mode 100644 index bcb6d85cc8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/func_80241004_D7B2A0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241004_D7C2A4 -/* D7C2A4 80241004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7C2A8 80241008 AFB00010 */ sw $s0, 0x10($sp) -/* D7C2AC 8024100C 0080802D */ daddu $s0, $a0, $zero -/* D7C2B0 80241010 AFBF0018 */ sw $ra, 0x18($sp) -/* D7C2B4 80241014 AFB10014 */ sw $s1, 0x14($sp) -/* D7C2B8 80241018 8E02000C */ lw $v0, 0xc($s0) -/* D7C2BC 8024101C 8C510000 */ lw $s1, ($v0) -/* D7C2C0 80241020 0C0B1EAF */ jal get_variable -/* D7C2C4 80241024 0220282D */ daddu $a1, $s1, $zero -/* D7C2C8 80241028 3C03FFF0 */ lui $v1, 0xfff0 -/* D7C2CC 8024102C 3463FFFF */ ori $v1, $v1, 0xffff -/* D7C2D0 80241030 0200202D */ daddu $a0, $s0, $zero -/* D7C2D4 80241034 00431024 */ and $v0, $v0, $v1 -/* D7C2D8 80241038 00021140 */ sll $v0, $v0, 5 -/* D7C2DC 8024103C 3C068008 */ lui $a2, %hi(gItemTable) -/* D7C2E0 80241040 00C23021 */ addu $a2, $a2, $v0 -/* D7C2E4 80241044 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D7C2E8 80241048 0C0B2026 */ jal set_variable -/* D7C2EC 8024104C 0220282D */ daddu $a1, $s1, $zero -/* D7C2F0 80241050 8FBF0018 */ lw $ra, 0x18($sp) -/* D7C2F4 80241054 8FB10014 */ lw $s1, 0x14($sp) -/* D7C2F8 80241058 8FB00010 */ lw $s0, 0x10($sp) -/* D7C2FC 8024105C 24020002 */ addiu $v0, $zero, 2 -/* D7C300 80241060 03E00008 */ jr $ra -/* D7C304 80241064 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_28/func_80241068_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/func_80241068_D7B2A0.s deleted file mode 100644 index 6fe8b6229a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/func_80241068_D7B2A0.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_28/func_802411B8_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/func_802411B8_D7B2A0.s deleted file mode 100644 index 16b5b1982b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/func_802411B8_D7B2A0.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411B8_D7C458 -/* D7C458 802411B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7C45C 802411BC AFB00010 */ sw $s0, 0x10($sp) -/* D7C460 802411C0 0080802D */ daddu $s0, $a0, $zero -/* D7C464 802411C4 AFBF0014 */ sw $ra, 0x14($sp) -/* D7C468 802411C8 8E02000C */ lw $v0, 0xc($s0) -/* D7C46C 802411CC 0C0B1EAF */ jal get_variable -/* D7C470 802411D0 8C450000 */ lw $a1, ($v0) -/* D7C474 802411D4 00021140 */ sll $v0, $v0, 5 -/* D7C478 802411D8 AE000084 */ sw $zero, 0x84($s0) -/* D7C47C 802411DC 3C018008 */ lui $at, 0x8008 -/* D7C480 802411E0 00220821 */ addu $at, $at, $v0 -/* D7C484 802411E4 942278F8 */ lhu $v0, 0x78f8($at) -/* D7C488 802411E8 30420040 */ andi $v0, $v0, 0x40 -/* D7C48C 802411EC 10400002 */ beqz $v0, .L802411F8 -/* D7C490 802411F0 24020001 */ addiu $v0, $zero, 1 -/* D7C494 802411F4 AE020084 */ sw $v0, 0x84($s0) -.L802411F8: -/* D7C498 802411F8 8FBF0014 */ lw $ra, 0x14($sp) -/* D7C49C 802411FC 8FB00010 */ lw $s0, 0x10($sp) -/* D7C4A0 80241200 24020002 */ addiu $v0, $zero, 2 -/* D7C4A4 80241204 03E00008 */ jr $ra -/* D7C4A8 80241208 27BD0018 */ addiu $sp, $sp, 0x18 -/* D7C4AC 8024120C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_29/func_80240020_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/func_80240020_D7CB50.s deleted file mode 100644 index dee5fe419a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/func_80240020_D7CB50.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D7CB70 -/* D7CB70 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D7CB74 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D7CB78 80240028 00822024 */ and $a0, $a0, $v0 -/* D7CB7C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D7CB80 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D7CB84 80240034 00821821 */ addu $v1, $a0, $v0 -/* D7CB88 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D7CB8C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D7CB90 80240040 30620001 */ andi $v0, $v1, 1 -/* D7CB94 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D7CB98 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D7CB9C 8024004C 03E00008 */ jr $ra -/* D7CBA0 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_29/func_80240054_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/func_80240054_D7CB50.s deleted file mode 100644 index dc4979427d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/func_80240054_D7CB50.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054_D7CBA4 -/* D7CBA4 80240054 00041403 */ sra $v0, $a0, 0x10 -/* D7CBA8 80240058 304300FF */ andi $v1, $v0, 0xff -/* D7CBAC 8024005C 24020006 */ addiu $v0, $zero, 6 -/* D7CBB0 80240060 10620015 */ beq $v1, $v0, .L802400B8 -/* D7CBB4 80240064 28620007 */ slti $v0, $v1, 7 -/* D7CBB8 80240068 10400005 */ beqz $v0, .L80240080 -/* D7CBBC 8024006C 24020001 */ addiu $v0, $zero, 1 -/* D7CBC0 80240070 1062000A */ beq $v1, $v0, .L8024009C -/* D7CBC4 80240074 3C020100 */ lui $v0, 0x100 -/* D7CBC8 80240078 03E00008 */ jr $ra -/* D7CBCC 8024007C 00821025 */ or $v0, $a0, $v0 -.L80240080: -/* D7CBD0 80240080 2862000A */ slti $v0, $v1, 0xa -/* D7CBD4 80240084 10400016 */ beqz $v0, .L802400E0 -/* D7CBD8 80240088 28620008 */ slti $v0, $v1, 8 -/* D7CBDC 8024008C 14400015 */ bnez $v0, .L802400E4 -/* D7CBE0 80240090 3C020100 */ lui $v0, 0x100 -/* D7CBE4 80240094 03E00008 */ jr $ra -/* D7CBE8 80240098 0080102D */ daddu $v0, $a0, $zero -.L8024009C: -/* D7CBEC 8024009C 3C020001 */ lui $v0, 1 -/* D7CBF0 802400A0 3442000C */ ori $v0, $v0, 0xc -/* D7CBF4 802400A4 0044102A */ slt $v0, $v0, $a0 -/* D7CBF8 802400A8 1040000E */ beqz $v0, .L802400E4 -/* D7CBFC 802400AC 3C020100 */ lui $v0, 0x100 -.L802400B0: -/* D7CC00 802400B0 03E00008 */ jr $ra -/* D7CC04 802400B4 0080102D */ daddu $v0, $a0, $zero -.L802400B8: -/* D7CC08 802400B8 3C02FFF9 */ lui $v0, 0xfff9 -/* D7CC0C 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D7CC10 802400C0 00821821 */ addu $v1, $a0, $v0 -/* D7CC14 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D7CC18 802400C8 10400005 */ beqz $v0, .L802400E0 -/* D7CC1C 802400CC 30620001 */ andi $v0, $v1, 1 -/* D7CC20 802400D0 1440FFF7 */ bnez $v0, .L802400B0 -/* D7CC24 802400D4 24820001 */ addiu $v0, $a0, 1 -/* D7CC28 802400D8 03E00008 */ jr $ra -/* D7CC2C 802400DC 00000000 */ nop -.L802400E0: -/* D7CC30 802400E0 3C020100 */ lui $v0, 0x100 -.L802400E4: -/* D7CC34 802400E4 03E00008 */ jr $ra -/* D7CC38 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_29/func_802400EC_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/func_802400EC_D7CB50.s deleted file mode 100644 index 3ca38f336f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/func_802400EC_D7CB50.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_D7CC3C -/* D7CC3C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7CC40 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* D7CC44 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D7CC48 802400F8 3C058024 */ lui $a1, 0x8024 -/* D7CC4C 802400FC 24A50128 */ addiu $a1, $a1, 0x128 -/* D7CC50 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* D7CC54 80240104 0C048C56 */ jal bind_dynamic_entity_3 -/* D7CC58 80240108 0000202D */ daddu $a0, $zero, $zero -/* D7CC5C 8024010C 8E03013C */ lw $v1, 0x13c($s0) -/* D7CC60 80240110 AC620000 */ sw $v0, ($v1) -/* D7CC64 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* D7CC68 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* D7CC6C 8024011C 24020002 */ addiu $v0, $zero, 2 -/* D7CC70 80240120 03E00008 */ jr $ra -/* D7CC74 80240124 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_29/func_80240128_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/func_80240128_D7CB50.s deleted file mode 100644 index 2634b59ef0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/func_80240128_D7CB50.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240128_D7CC78 -/* D7CC78 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D7CC7C 8024012C AFB00040 */ sw $s0, 0x40($sp) -/* D7CC80 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D7CC84 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D7CC88 80240138 AFB20048 */ sw $s2, 0x48($sp) -/* D7CC8C 8024013C AFBF004C */ sw $ra, 0x4c($sp) -/* D7CC90 80240140 AFB10044 */ sw $s1, 0x44($sp) -/* D7CC94 80240144 8E020000 */ lw $v0, ($s0) -/* D7CC98 80240148 821100BE */ lb $s1, 0xbe($s0) -/* D7CC9C 8024014C 30420001 */ andi $v0, $v0, 1 -/* D7CCA0 80240150 10400061 */ beqz $v0, .L802402D8 -/* D7CCA4 80240154 27B20020 */ addiu $s2, $sp, 0x20 -/* D7CCA8 80240158 8E0400CC */ lw $a0, 0xcc($s0) -/* D7CCAC 8024015C 0C044181 */ jal get_shadow_by_index -/* D7CCB0 80240160 00000000 */ nop -/* D7CCB4 80240164 0C048B77 */ jal func_80122DDC -/* D7CCB8 80240168 84440008 */ lh $a0, 8($v0) -/* D7CCBC 8024016C 8C430000 */ lw $v1, ($v0) -/* D7CCC0 80240170 34630200 */ ori $v1, $v1, 0x200 -/* D7CCC4 80240174 AC430000 */ sw $v1, ($v0) -/* D7CCC8 80240178 8E050028 */ lw $a1, 0x28($s0) -/* D7CCCC 8024017C 8E06002C */ lw $a2, 0x2c($s0) -/* D7CCD0 80240180 27A20030 */ addiu $v0, $sp, 0x30 -/* D7CCD4 80240184 AFA20010 */ sw $v0, 0x10($sp) -/* D7CCD8 80240188 27A20034 */ addiu $v0, $sp, 0x34 -/* D7CCDC 8024018C AFA20014 */ sw $v0, 0x14($sp) -/* D7CCE0 80240190 C6000030 */ lwc1 $f0, 0x30($s0) -/* D7CCE4 80240194 3C04800A */ lui $a0, 0x800a -/* D7CCE8 80240198 8484A634 */ lh $a0, -0x59cc($a0) -/* D7CCEC 8024019C 46000007 */ neg.s $f0, $f0 -/* D7CCF0 802401A0 44070000 */ mfc1 $a3, $f0 -/* D7CCF4 802401A4 27A20038 */ addiu $v0, $sp, 0x38 -/* D7CCF8 802401A8 0C00B94E */ jal get_screen_coords -/* D7CCFC 802401AC AFA20018 */ sw $v0, 0x18($sp) -/* D7CD00 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D7CD04 802401B4 0C090008 */ jal func_80240020 -/* D7CD08 802401B8 00000000 */ nop -/* D7CD0C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) -/* D7CD10 802401C0 3C014307 */ lui $at, 0x4307 -/* D7CD14 802401C4 44810000 */ mtc1 $at, $f0 -/* D7CD18 802401C8 00000000 */ nop -/* D7CD1C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D7CD20 802401D0 00000000 */ nop -/* D7CD24 802401D4 4500000B */ bc1f .L80240204 -/* D7CD28 802401D8 24040002 */ addiu $a0, $zero, 2 -/* D7CD2C 802401DC 3C014361 */ lui $at, 0x4361 -/* D7CD30 802401E0 44810000 */ mtc1 $at, $f0 -/* D7CD34 802401E4 00000000 */ nop -/* D7CD38 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D7CD3C 802401EC 00000000 */ nop -/* D7CD40 802401F0 45000004 */ bc1f .L80240204 -/* D7CD44 802401F4 00000000 */ nop -/* D7CD48 802401F8 0C090015 */ jal func_80240054 -/* D7CD4C 802401FC 0040202D */ daddu $a0, $v0, $zero -/* D7CD50 80240200 24040002 */ addiu $a0, $zero, 2 -.L80240204: -/* D7CD54 80240204 3C063F80 */ lui $a2, 0x3f80 -/* D7CD58 80240208 0C0B76A3 */ jal func_802DDA8C -/* D7CD5C 8024020C 0040282D */ daddu $a1, $v0, $zero -/* D7CD60 80240210 8E020000 */ lw $v0, ($s0) -/* D7CD64 80240214 3C030002 */ lui $v1, 2 -/* D7CD68 80240218 00431024 */ and $v0, $v0, $v1 -/* D7CD6C 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 -/* D7CD70 80240220 24110011 */ addiu $s1, $zero, 0x11 -/* D7CD74 80240224 9203000E */ lbu $v1, 0xe($s0) -/* D7CD78 80240228 3C02802E */ lui $v0, 0x802e -/* D7CD7C 8024022C 90429D70 */ lbu $v0, -0x6290($v0) -/* D7CD80 80240230 10620018 */ beq $v1, $v0, .L80240294 -/* D7CD84 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D7CD88 80240238 1040000B */ beqz $v0, .L80240268 -/* D7CD8C 8024023C 24110011 */ addiu $s1, $zero, 0x11 -/* D7CD90 80240240 24040002 */ addiu $a0, $zero, 2 -/* D7CD94 80240244 2405FFFF */ addiu $a1, $zero, -1 -/* D7CD98 80240248 24060007 */ addiu $a2, $zero, 7 -/* D7CD9C 8024024C 0060102D */ daddu $v0, $v1, $zero -/* D7CDA0 80240250 0000382D */ daddu $a3, $zero, $zero -/* D7CDA4 80240254 AFA00010 */ sw $zero, 0x10($sp) -/* D7CDA8 80240258 AFA00014 */ sw $zero, 0x14($sp) -/* D7CDAC 8024025C AFA0001C */ sw $zero, 0x1c($sp) -/* D7CDB0 80240260 080900A3 */ j .L8024028C -/* D7CDB4 80240264 AFA20018 */ sw $v0, 0x18($sp) -.L80240268: -/* D7CDB8 80240268 2411000D */ addiu $s1, $zero, 0xd -/* D7CDBC 8024026C 24040002 */ addiu $a0, $zero, 2 -/* D7CDC0 80240270 2405FFFF */ addiu $a1, $zero, -1 -/* D7CDC4 80240274 0000302D */ daddu $a2, $zero, $zero -/* D7CDC8 80240278 00C0382D */ daddu $a3, $a2, $zero -/* D7CDCC 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* D7CDD0 80240280 AFA00014 */ sw $zero, 0x14($sp) -/* D7CDD4 80240284 AFA00018 */ sw $zero, 0x18($sp) -/* D7CDD8 80240288 AFA0001C */ sw $zero, 0x1c($sp) -.L8024028C: -/* D7CDDC 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D7CDE0 80240290 00000000 */ nop -.L80240294: -/* D7CDE4 80240294 9202000E */ lbu $v0, 0xe($s0) -/* D7CDE8 80240298 3C01802E */ lui $at, 0x802e -/* D7CDEC 8024029C A0229D70 */ sb $v0, -0x6290($at) -/* D7CDF0 802402A0 080900AD */ j .L802402B4 -/* D7CDF4 802402A4 0240202D */ daddu $a0, $s2, $zero -.L802402A8: -/* D7CDF8 802402A8 3C01802E */ lui $at, 0x802e -/* D7CDFC 802402AC A0209D70 */ sb $zero, -0x6290($at) -/* D7CE00 802402B0 0240202D */ daddu $a0, $s2, $zero -.L802402B4: -/* D7CE04 802402B4 AC910000 */ sw $s1, ($a0) -/* D7CE08 802402B8 AC900008 */ sw $s0, 8($a0) -/* D7CE0C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D7CE10 802402C0 3C038024 */ lui $v1, 0x8024 -/* D7CE14 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 -/* D7CE18 802402C8 AC83000C */ sw $v1, 0xc($a0) -/* D7CE1C 802402CC 00021023 */ negu $v0, $v0 -/* D7CE20 802402D0 0C047644 */ jal queue_render_task -/* D7CE24 802402D4 AC820004 */ sw $v0, 4($a0) -.L802402D8: -/* D7CE28 802402D8 8FBF004C */ lw $ra, 0x4c($sp) -/* D7CE2C 802402DC 8FB20048 */ lw $s2, 0x48($sp) -/* D7CE30 802402E0 8FB10044 */ lw $s1, 0x44($sp) -/* D7CE34 802402E4 8FB00040 */ lw $s0, 0x40($sp) -/* D7CE38 802402E8 03E00008 */ jr $ra -/* D7CE3C 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_29/func_802402F0_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/func_802402F0_D7CB50.s deleted file mode 100644 index f53b8f903b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/func_802402F0_D7CB50.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D7CE40 -/* D7CE40 802402F0 3C03800A */ lui $v1, 0x800a -/* D7CE44 802402F4 8463A634 */ lh $v1, -0x59cc($v1) -/* D7CE48 802402F8 3C07BF80 */ lui $a3, 0xbf80 -/* D7CE4C 802402FC 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D7CE50 80240300 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D7CE54 80240304 4480A000 */ mtc1 $zero, $f20 -/* D7CE58 80240308 AFB1011C */ sw $s1, 0x11c($sp) -/* D7CE5C 8024030C 0080882D */ daddu $s1, $a0, $zero -/* D7CE60 80240310 AFB00118 */ sw $s0, 0x118($sp) -/* D7CE64 80240314 27B00098 */ addiu $s0, $sp, 0x98 -/* D7CE68 80240318 AFBF0120 */ sw $ra, 0x120($sp) -/* D7CE6C 8024031C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D7CE70 80240320 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D7CE74 80240324 00031080 */ sll $v0, $v1, 2 -/* D7CE78 80240328 00431021 */ addu $v0, $v0, $v1 -/* D7CE7C 8024032C 00021080 */ sll $v0, $v0, 2 -/* D7CE80 80240330 00431023 */ subu $v0, $v0, $v1 -/* D7CE84 80240334 000218C0 */ sll $v1, $v0, 3 -/* D7CE88 80240338 00431021 */ addu $v0, $v0, $v1 -/* D7CE8C 8024033C 000210C0 */ sll $v0, $v0, 3 -/* D7CE90 80240340 3C01800B */ lui $at, 0x800b -/* D7CE94 80240344 00220821 */ addu $at, $at, $v0 -/* D7CE98 80240348 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D7CE9C 8024034C 4406A000 */ mfc1 $a2, $f20 -/* D7CEA0 80240350 4600B587 */ neg.s $f22, $f22 -/* D7CEA4 80240354 4405B000 */ mfc1 $a1, $f22 -/* D7CEA8 80240358 0200202D */ daddu $a0, $s0, $zero -/* D7CEAC 8024035C 0C019EC8 */ jal guRotateF -/* D7CEB0 80240360 E7B40010 */ swc1 $f20, 0x10($sp) -/* D7CEB4 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D7CEB8 80240368 0C00A6C9 */ jal clamp_angle -/* D7CEBC 8024036C 00000000 */ nop -/* D7CEC0 80240370 44050000 */ mfc1 $a1, $f0 -/* D7CEC4 80240374 4406A000 */ mfc1 $a2, $f20 -/* D7CEC8 80240378 4407A000 */ mfc1 $a3, $f20 -/* D7CECC 8024037C 3C013F80 */ lui $at, 0x3f80 -/* D7CED0 80240380 4481C000 */ mtc1 $at, $f24 -/* D7CED4 80240384 27A40018 */ addiu $a0, $sp, 0x18 -/* D7CED8 80240388 0C019EC8 */ jal guRotateF -/* D7CEDC 8024038C E7B80010 */ swc1 $f24, 0x10($sp) -/* D7CEE0 80240390 0200202D */ daddu $a0, $s0, $zero -/* D7CEE4 80240394 27A50018 */ addiu $a1, $sp, 0x18 -/* D7CEE8 80240398 0C019D80 */ jal guMtxCatF -/* D7CEEC 8024039C 00A0302D */ daddu $a2, $a1, $zero -/* D7CEF0 802403A0 4405B000 */ mfc1 $a1, $f22 -/* D7CEF4 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D7CEF8 802403A8 4407C000 */ mfc1 $a3, $f24 -/* D7CEFC 802403AC 0200202D */ daddu $a0, $s0, $zero -/* D7CF00 802403B0 0C019EC8 */ jal guRotateF -/* D7CF04 802403B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D7CF08 802403B8 27A40018 */ addiu $a0, $sp, 0x18 -/* D7CF0C 802403BC 0200282D */ daddu $a1, $s0, $zero -/* D7CF10 802403C0 0C019D80 */ jal guMtxCatF -/* D7CF14 802403C4 0080302D */ daddu $a2, $a0, $zero -/* D7CF18 802403C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D7CF1C 802403CC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D7CF20 802403D0 4406A000 */ mfc1 $a2, $f20 -/* D7CF24 802403D4 4407C000 */ mfc1 $a3, $f24 -/* D7CF28 802403D8 0C019EC8 */ jal guRotateF -/* D7CF2C 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D7CF30 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* D7CF34 802403E4 0200282D */ daddu $a1, $s0, $zero -/* D7CF38 802403E8 0C019D80 */ jal guMtxCatF -/* D7CF3C 802403EC 0080302D */ daddu $a2, $a0, $zero -/* D7CF40 802403F0 3C013F36 */ lui $at, 0x3f36 -/* D7CF44 802403F4 3421DB6E */ ori $at, $at, 0xdb6e -/* D7CF48 802403F8 44810000 */ mtc1 $at, $f0 -/* D7CF4C 802403FC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D7CF50 80240400 44050000 */ mfc1 $a1, $f0 -/* D7CF54 80240404 0200202D */ daddu $a0, $s0, $zero -/* D7CF58 80240408 00A0302D */ daddu $a2, $a1, $zero -/* D7CF5C 8024040C 0C019DF0 */ jal guScaleF -/* D7CF60 80240410 00A0382D */ daddu $a3, $a1, $zero -/* D7CF64 80240414 27A40018 */ addiu $a0, $sp, 0x18 -/* D7CF68 80240418 0200282D */ daddu $a1, $s0, $zero -/* D7CF6C 8024041C 0C019D80 */ jal guMtxCatF -/* D7CF70 80240420 0080302D */ daddu $a2, $a0, $zero -/* D7CF74 80240424 27B00058 */ addiu $s0, $sp, 0x58 -/* D7CF78 80240428 C6200030 */ lwc1 $f0, 0x30($s1) -/* D7CF7C 8024042C 3C014040 */ lui $at, 0x4040 -/* D7CF80 80240430 44811000 */ mtc1 $at, $f2 -/* D7CF84 80240434 46000007 */ neg.s $f0, $f0 -/* D7CF88 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* D7CF8C 8024043C 8E250028 */ lw $a1, 0x28($s1) -/* D7CF90 80240440 8E26002C */ lw $a2, 0x2c($s1) -/* D7CF94 80240444 44070000 */ mfc1 $a3, $f0 -/* D7CF98 80240448 0C019E40 */ jal guTranslateF -/* D7CF9C 8024044C 0200202D */ daddu $a0, $s0, $zero -/* D7CFA0 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* D7CFA4 80240454 0200282D */ daddu $a1, $s0, $zero -/* D7CFA8 80240458 0C019D80 */ jal guMtxCatF -/* D7CFAC 8024045C 0080302D */ daddu $a2, $a0, $zero -/* D7CFB0 80240460 24040002 */ addiu $a0, $zero, 2 -/* D7CFB4 80240464 0000282D */ daddu $a1, $zero, $zero -/* D7CFB8 80240468 00A0302D */ daddu $a2, $a1, $zero -/* D7CFBC 8024046C 00A0382D */ daddu $a3, $a1, $zero -/* D7CFC0 80240470 27A20018 */ addiu $v0, $sp, 0x18 -/* D7CFC4 80240474 0C0B7710 */ jal render_sprite -/* D7CFC8 80240478 AFA20010 */ sw $v0, 0x10($sp) -/* D7CFCC 8024047C 8FBF0120 */ lw $ra, 0x120($sp) -/* D7CFD0 80240480 8FB1011C */ lw $s1, 0x11c($sp) -/* D7CFD4 80240484 8FB00118 */ lw $s0, 0x118($sp) -/* D7CFD8 80240488 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D7CFDC 8024048C D7B60130 */ ldc1 $f22, 0x130($sp) -/* D7CFE0 80240490 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D7CFE4 80240494 03E00008 */ jr $ra -/* D7CFE8 80240498 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_29/func_8024049C_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/func_8024049C_D7CB50.s deleted file mode 100644 index 87ca99794f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/func_8024049C_D7CB50.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_D7CFEC -/* D7CFEC 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7CFF0 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* D7CFF4 802404A4 0080802D */ daddu $s0, $a0, $zero -/* D7CFF8 802404A8 AFBF0014 */ sw $ra, 0x14($sp) -/* D7CFFC 802404AC 8E020084 */ lw $v0, 0x84($s0) -/* D7D000 802404B0 0440000E */ bltz $v0, .L802404EC -/* D7D004 802404B4 28420002 */ slti $v0, $v0, 2 -/* D7D008 802404B8 1040000C */ beqz $v0, .L802404EC -/* D7D00C 802404BC 00000000 */ nop -/* D7D010 802404C0 3C058024 */ lui $a1, 0x8024 -/* D7D014 802404C4 24A50500 */ addiu $a1, $a1, 0x500 -/* D7D018 802404C8 0C048C56 */ jal bind_dynamic_entity_3 -/* D7D01C 802404CC 0000202D */ daddu $a0, $zero, $zero -/* D7D020 802404D0 8E03013C */ lw $v1, 0x13c($s0) -/* D7D024 802404D4 AC620000 */ sw $v0, ($v1) -/* D7D028 802404D8 3C03800A */ lui $v1, %hi(D_8009A650) -/* D7D02C 802404DC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D7D030 802404E0 8C620000 */ lw $v0, ($v1) -/* D7D034 802404E4 34420080 */ ori $v0, $v0, 0x80 -/* D7D038 802404E8 AC620000 */ sw $v0, ($v1) -.L802404EC: -/* D7D03C 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* D7D040 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* D7D044 802404F4 24020002 */ addiu $v0, $zero, 2 -/* D7D048 802404F8 03E00008 */ jr $ra -/* D7D04C 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_29/func_80240500_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/func_80240500_D7CB50.s deleted file mode 100644 index 10f62d2f18..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/func_80240500_D7CB50.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_D7D050 -/* D7D050 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D7D054 80240504 AFB00040 */ sw $s0, 0x40($sp) -/* D7D058 80240508 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D7D05C 8024050C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D7D060 80240510 AFB10044 */ sw $s1, 0x44($sp) -/* D7D064 80240514 AFBF004C */ sw $ra, 0x4c($sp) -/* D7D068 80240518 AFB20048 */ sw $s2, 0x48($sp) -/* D7D06C 8024051C 8E020000 */ lw $v0, ($s0) -/* D7D070 80240520 821200BE */ lb $s2, 0xbe($s0) -/* D7D074 80240524 30420001 */ andi $v0, $v0, 1 -/* D7D078 80240528 10400052 */ beqz $v0, .L80240674 -/* D7D07C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 -/* D7D080 80240530 8E0400CC */ lw $a0, 0xcc($s0) -/* D7D084 80240534 0C044181 */ jal get_shadow_by_index -/* D7D088 80240538 00000000 */ nop -/* D7D08C 8024053C 0C048B77 */ jal func_80122DDC -/* D7D090 80240540 84440008 */ lh $a0, 8($v0) -/* D7D094 80240544 8E050028 */ lw $a1, 0x28($s0) -/* D7D098 80240548 8E070030 */ lw $a3, 0x30($s0) -/* D7D09C 8024054C 27A20030 */ addiu $v0, $sp, 0x30 -/* D7D0A0 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* D7D0A4 80240554 27A20034 */ addiu $v0, $sp, 0x34 -/* D7D0A8 80240558 AFA20014 */ sw $v0, 0x14($sp) -/* D7D0AC 8024055C 27A20038 */ addiu $v0, $sp, 0x38 -/* D7D0B0 80240560 AFA20018 */ sw $v0, 0x18($sp) -/* D7D0B4 80240564 C600002C */ lwc1 $f0, 0x2c($s0) -/* D7D0B8 80240568 3C04800A */ lui $a0, 0x800a -/* D7D0BC 8024056C 8484A634 */ lh $a0, -0x59cc($a0) -/* D7D0C0 80240570 46000007 */ neg.s $f0, $f0 -/* D7D0C4 80240574 44060000 */ mfc1 $a2, $f0 -/* D7D0C8 80240578 0C00B94E */ jal get_screen_coords -/* D7D0CC 8024057C 00000000 */ nop -/* D7D0D0 80240580 8E0500A4 */ lw $a1, 0xa4($s0) -/* D7D0D4 80240584 3C063F80 */ lui $a2, 0x3f80 -/* D7D0D8 80240588 0C0B76A3 */ jal func_802DDA8C -/* D7D0DC 8024058C 24040001 */ addiu $a0, $zero, 1 -/* D7D0E0 80240590 8E020000 */ lw $v0, ($s0) -/* D7D0E4 80240594 3C030002 */ lui $v1, 2 -/* D7D0E8 80240598 00431024 */ and $v0, $v0, $v1 -/* D7D0EC 8024059C 54400022 */ bnel $v0, $zero, .L80240628 -/* D7D0F0 802405A0 24120011 */ addiu $s2, $zero, 0x11 -/* D7D0F4 802405A4 9203000E */ lbu $v1, 0xe($s0) -/* D7D0F8 802405A8 3C02802E */ lui $v0, 0x802e -/* D7D0FC 802405AC 90429D71 */ lbu $v0, -0x628f($v0) -/* D7D100 802405B0 10620018 */ beq $v1, $v0, .L80240614 -/* D7D104 802405B4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D7D108 802405B8 1040000B */ beqz $v0, .L802405E8 -/* D7D10C 802405BC 24120011 */ addiu $s2, $zero, 0x11 -/* D7D110 802405C0 24040001 */ addiu $a0, $zero, 1 -/* D7D114 802405C4 2405FFFF */ addiu $a1, $zero, -1 -/* D7D118 802405C8 24060007 */ addiu $a2, $zero, 7 -/* D7D11C 802405CC 0060102D */ daddu $v0, $v1, $zero -/* D7D120 802405D0 0000382D */ daddu $a3, $zero, $zero -/* D7D124 802405D4 AFA00010 */ sw $zero, 0x10($sp) -/* D7D128 802405D8 AFA00014 */ sw $zero, 0x14($sp) -/* D7D12C 802405DC AFA0001C */ sw $zero, 0x1c($sp) -/* D7D130 802405E0 08090183 */ j .L8024060C -/* D7D134 802405E4 AFA20018 */ sw $v0, 0x18($sp) -.L802405E8: -/* D7D138 802405E8 2412000D */ addiu $s2, $zero, 0xd -/* D7D13C 802405EC 24040001 */ addiu $a0, $zero, 1 -/* D7D140 802405F0 2405FFFF */ addiu $a1, $zero, -1 -/* D7D144 802405F4 0000302D */ daddu $a2, $zero, $zero -/* D7D148 802405F8 00C0382D */ daddu $a3, $a2, $zero -/* D7D14C 802405FC AFA00010 */ sw $zero, 0x10($sp) -/* D7D150 80240600 AFA00014 */ sw $zero, 0x14($sp) -/* D7D154 80240604 AFA00018 */ sw $zero, 0x18($sp) -/* D7D158 80240608 AFA0001C */ sw $zero, 0x1c($sp) -.L8024060C: -/* D7D15C 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D7D160 80240610 00000000 */ nop -.L80240614: -/* D7D164 80240614 9202000E */ lbu $v0, 0xe($s0) -/* D7D168 80240618 3C01802E */ lui $at, 0x802e -/* D7D16C 8024061C A0229D71 */ sb $v0, -0x628f($at) -/* D7D170 80240620 0809018C */ j .L80240630 -/* D7D174 80240624 00000000 */ nop -.L80240628: -/* D7D178 80240628 3C01802E */ lui $at, 0x802e -/* D7D17C 8024062C A0209D71 */ sb $zero, -0x628f($at) -.L80240630: -/* D7D180 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D7D184 80240634 3C048024 */ lui $a0, 0x8024 -/* D7D188 80240638 24840870 */ addiu $a0, $a0, 0x870 -/* D7D18C 8024063C AE320000 */ sw $s2, ($s1) -/* D7D190 80240640 AE300008 */ sw $s0, 8($s1) -/* D7D194 80240644 00021023 */ negu $v0, $v0 -/* D7D198 80240648 AE220004 */ sw $v0, 4($s1) -/* D7D19C 8024064C 8E020000 */ lw $v0, ($s0) -/* D7D1A0 80240650 3C030002 */ lui $v1, 2 -/* D7D1A4 80240654 00431024 */ and $v0, $v0, $v1 -/* D7D1A8 80240658 54400004 */ bnel $v0, $zero, .L8024066C -/* D7D1AC 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D7D1B0 80240660 3C048024 */ lui $a0, 0x8024 -/* D7D1B4 80240664 2484068C */ addiu $a0, $a0, 0x68c -/* D7D1B8 80240668 AE24000C */ sw $a0, 0xc($s1) -.L8024066C: -/* D7D1BC 8024066C 0C047644 */ jal queue_render_task -/* D7D1C0 80240670 0220202D */ daddu $a0, $s1, $zero -.L80240674: -/* D7D1C4 80240674 8FBF004C */ lw $ra, 0x4c($sp) -/* D7D1C8 80240678 8FB20048 */ lw $s2, 0x48($sp) -/* D7D1CC 8024067C 8FB10044 */ lw $s1, 0x44($sp) -/* D7D1D0 80240680 8FB00040 */ lw $s0, 0x40($sp) -/* D7D1D4 80240684 03E00008 */ jr $ra -/* D7D1D8 80240688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_29/func_8024068C_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/func_8024068C_D7CB50.s deleted file mode 100644 index d35092876c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/func_8024068C_D7CB50.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_D7D1DC -/* D7D1DC 8024068C 3C03800A */ lui $v1, 0x800a -/* D7D1E0 80240690 8463A634 */ lh $v1, -0x59cc($v1) -/* D7D1E4 80240694 3C07BF80 */ lui $a3, 0xbf80 -/* D7D1E8 80240698 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D7D1EC 8024069C F7B40128 */ sdc1 $f20, 0x128($sp) -/* D7D1F0 802406A0 4480A000 */ mtc1 $zero, $f20 -/* D7D1F4 802406A4 AFB1011C */ sw $s1, 0x11c($sp) -/* D7D1F8 802406A8 0080882D */ daddu $s1, $a0, $zero -/* D7D1FC 802406AC AFB00118 */ sw $s0, 0x118($sp) -/* D7D200 802406B0 27B00098 */ addiu $s0, $sp, 0x98 -/* D7D204 802406B4 AFBF0120 */ sw $ra, 0x120($sp) -/* D7D208 802406B8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D7D20C 802406BC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D7D210 802406C0 00031080 */ sll $v0, $v1, 2 -/* D7D214 802406C4 00431021 */ addu $v0, $v0, $v1 -/* D7D218 802406C8 00021080 */ sll $v0, $v0, 2 -/* D7D21C 802406CC 00431023 */ subu $v0, $v0, $v1 -/* D7D220 802406D0 000218C0 */ sll $v1, $v0, 3 -/* D7D224 802406D4 00431021 */ addu $v0, $v0, $v1 -/* D7D228 802406D8 000210C0 */ sll $v0, $v0, 3 -/* D7D22C 802406DC 3C01800B */ lui $at, 0x800b -/* D7D230 802406E0 00220821 */ addu $at, $at, $v0 -/* D7D234 802406E4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D7D238 802406E8 4406A000 */ mfc1 $a2, $f20 -/* D7D23C 802406EC 4600B587 */ neg.s $f22, $f22 -/* D7D240 802406F0 4405B000 */ mfc1 $a1, $f22 -/* D7D244 802406F4 0200202D */ daddu $a0, $s0, $zero -/* D7D248 802406F8 0C019EC8 */ jal guRotateF -/* D7D24C 802406FC E7B40010 */ swc1 $f20, 0x10($sp) -/* D7D250 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D7D254 80240704 0C00A6C9 */ jal clamp_angle -/* D7D258 80240708 00000000 */ nop -/* D7D25C 8024070C 44050000 */ mfc1 $a1, $f0 -/* D7D260 80240710 4406A000 */ mfc1 $a2, $f20 -/* D7D264 80240714 4407A000 */ mfc1 $a3, $f20 -/* D7D268 80240718 3C013F80 */ lui $at, 0x3f80 -/* D7D26C 8024071C 4481C000 */ mtc1 $at, $f24 -/* D7D270 80240720 27A40018 */ addiu $a0, $sp, 0x18 -/* D7D274 80240724 0C019EC8 */ jal guRotateF -/* D7D278 80240728 E7B80010 */ swc1 $f24, 0x10($sp) -/* D7D27C 8024072C 0200202D */ daddu $a0, $s0, $zero -/* D7D280 80240730 27A50018 */ addiu $a1, $sp, 0x18 -/* D7D284 80240734 0C019D80 */ jal guMtxCatF -/* D7D288 80240738 00A0302D */ daddu $a2, $a1, $zero -/* D7D28C 8024073C 4405B000 */ mfc1 $a1, $f22 -/* D7D290 80240740 4406A000 */ mfc1 $a2, $f20 -/* D7D294 80240744 4407C000 */ mfc1 $a3, $f24 -/* D7D298 80240748 0200202D */ daddu $a0, $s0, $zero -/* D7D29C 8024074C 0C019EC8 */ jal guRotateF -/* D7D2A0 80240750 E7B40010 */ swc1 $f20, 0x10($sp) -/* D7D2A4 80240754 27A40018 */ addiu $a0, $sp, 0x18 -/* D7D2A8 80240758 0200282D */ daddu $a1, $s0, $zero -/* D7D2AC 8024075C 0C019D80 */ jal guMtxCatF -/* D7D2B0 80240760 0080302D */ daddu $a2, $a0, $zero -/* D7D2B4 80240764 E7B40010 */ swc1 $f20, 0x10($sp) -/* D7D2B8 80240768 8E2500A8 */ lw $a1, 0xa8($s1) -/* D7D2BC 8024076C 4406A000 */ mfc1 $a2, $f20 -/* D7D2C0 80240770 4407C000 */ mfc1 $a3, $f24 -/* D7D2C4 80240774 0C019EC8 */ jal guRotateF -/* D7D2C8 80240778 0200202D */ daddu $a0, $s0, $zero -/* D7D2CC 8024077C 27A40018 */ addiu $a0, $sp, 0x18 -/* D7D2D0 80240780 0200282D */ daddu $a1, $s0, $zero -/* D7D2D4 80240784 0C019D80 */ jal guMtxCatF -/* D7D2D8 80240788 0080302D */ daddu $a2, $a0, $zero -/* D7D2DC 8024078C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D7D2E0 80240790 3C013F36 */ lui $at, 0x3f36 -/* D7D2E4 80240794 3421DB6E */ ori $at, $at, 0xdb6e -/* D7D2E8 80240798 44810000 */ mtc1 $at, $f0 -/* D7D2EC 8024079C 0200202D */ daddu $a0, $s0, $zero -/* D7D2F0 802407A0 44050000 */ mfc1 $a1, $f0 -/* D7D2F4 802407A4 3C06BF36 */ lui $a2, 0xbf36 -/* D7D2F8 802407A8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D7D2FC 802407AC 0C019DF0 */ jal guScaleF -/* D7D300 802407B0 00A0382D */ daddu $a3, $a1, $zero -/* D7D304 802407B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D7D308 802407B8 0200282D */ daddu $a1, $s0, $zero -/* D7D30C 802407BC 0C019D80 */ jal guMtxCatF -/* D7D310 802407C0 0080302D */ daddu $a2, $a0, $zero -/* D7D314 802407C4 27B00058 */ addiu $s0, $sp, 0x58 -/* D7D318 802407C8 8E250028 */ lw $a1, 0x28($s1) -/* D7D31C 802407CC C620002C */ lwc1 $f0, 0x2c($s1) -/* D7D320 802407D0 8E270030 */ lw $a3, 0x30($s1) -/* D7D324 802407D4 46000007 */ neg.s $f0, $f0 -/* D7D328 802407D8 44060000 */ mfc1 $a2, $f0 -/* D7D32C 802407DC 0C019E40 */ jal guTranslateF -/* D7D330 802407E0 0200202D */ daddu $a0, $s0, $zero -/* D7D334 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D7D338 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D7D33C 802407EC 0C019D80 */ jal guMtxCatF -/* D7D340 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D7D344 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D7D348 802407F8 3C0142B4 */ lui $at, 0x42b4 -/* D7D34C 802407FC 44810000 */ mtc1 $at, $f0 -/* D7D350 80240800 00000000 */ nop -/* D7D354 80240804 4602003E */ c.le.s $f0, $f2 -/* D7D358 80240808 00000000 */ nop -/* D7D35C 8024080C 4500000A */ bc1f .L80240838 -/* D7D360 80240810 24040001 */ addiu $a0, $zero, 1 -/* D7D364 80240814 3C014387 */ lui $at, 0x4387 -/* D7D368 80240818 44810000 */ mtc1 $at, $f0 -/* D7D36C 8024081C 00000000 */ nop -/* D7D370 80240820 4600103C */ c.lt.s $f2, $f0 -/* D7D374 80240824 00000000 */ nop -/* D7D378 80240828 45000004 */ bc1f .L8024083C -/* D7D37C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 -/* D7D380 80240830 3C041000 */ lui $a0, 0x1000 -/* D7D384 80240834 34840001 */ ori $a0, $a0, 1 -.L80240838: -/* D7D388 80240838 27A20018 */ addiu $v0, $sp, 0x18 -.L8024083C: -/* D7D38C 8024083C 0000282D */ daddu $a1, $zero, $zero -/* D7D390 80240840 00A0302D */ daddu $a2, $a1, $zero -/* D7D394 80240844 00A0382D */ daddu $a3, $a1, $zero -/* D7D398 80240848 0C0B7710 */ jal render_sprite -/* D7D39C 8024084C AFA20010 */ sw $v0, 0x10($sp) -/* D7D3A0 80240850 8FBF0120 */ lw $ra, 0x120($sp) -/* D7D3A4 80240854 8FB1011C */ lw $s1, 0x11c($sp) -/* D7D3A8 80240858 8FB00118 */ lw $s0, 0x118($sp) -/* D7D3AC 8024085C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D7D3B0 80240860 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D7D3B4 80240864 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D7D3B8 80240868 03E00008 */ jr $ra -/* D7D3BC 8024086C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_29/func_80240870_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/func_80240870_D7CB50.s deleted file mode 100644 index d7c8dd0615..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/func_80240870_D7CB50.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_D7D3C0 -/* D7D3C0 80240870 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D7D3C4 80240874 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D7D3C8 80240878 4480B000 */ mtc1 $zero, $f22 -/* D7D3CC 8024087C AFB10134 */ sw $s1, 0x134($sp) -/* D7D3D0 80240880 0080882D */ daddu $s1, $a0, $zero -/* D7D3D4 80240884 AFB3013C */ sw $s3, 0x13c($sp) -/* D7D3D8 80240888 0000982D */ daddu $s3, $zero, $zero -/* D7D3DC 8024088C AFB60148 */ sw $s6, 0x148($sp) -/* D7D3E0 80240890 3C16800B */ lui $s6, %hi(gCameras) -/* D7D3E4 80240894 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D7D3E8 80240898 AFB50144 */ sw $s5, 0x144($sp) -/* D7D3EC 8024089C 241500FF */ addiu $s5, $zero, 0xff -/* D7D3F0 802408A0 AFB00130 */ sw $s0, 0x130($sp) -/* D7D3F4 802408A4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D7D3F8 802408A8 AFB20138 */ sw $s2, 0x138($sp) -/* D7D3FC 802408AC 27B20060 */ addiu $s2, $sp, 0x60 -/* D7D400 802408B0 AFB40140 */ sw $s4, 0x140($sp) -/* D7D404 802408B4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D7D408 802408B8 AFBF014C */ sw $ra, 0x14c($sp) -/* D7D40C 802408BC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D7D410 802408C0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D7D414 802408C4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D7D418 802408C8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D7D41C 802408CC F7B40150 */ sdc1 $f20, 0x150($sp) -.L802408D0: -/* D7D420 802408D0 3C03800A */ lui $v1, 0x800a -/* D7D424 802408D4 8463A634 */ lh $v1, -0x59cc($v1) -/* D7D428 802408D8 00031080 */ sll $v0, $v1, 2 -/* D7D42C 802408DC 00431021 */ addu $v0, $v0, $v1 -/* D7D430 802408E0 00021080 */ sll $v0, $v0, 2 -/* D7D434 802408E4 00431023 */ subu $v0, $v0, $v1 -/* D7D438 802408E8 000218C0 */ sll $v1, $v0, 3 -/* D7D43C 802408EC 00431021 */ addu $v0, $v0, $v1 -/* D7D440 802408F0 000210C0 */ sll $v0, $v0, 3 -/* D7D444 802408F4 00561021 */ addu $v0, $v0, $s6 -/* D7D448 802408F8 C440006C */ lwc1 $f0, 0x6c($v0) -/* D7D44C 802408FC 16600065 */ bnez $s3, .L80240A94 -/* D7D450 80240900 46000507 */ neg.s $f20, $f0 -/* D7D454 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D7D458 80240908 3C0142B4 */ lui $at, 0x42b4 -/* D7D45C 8024090C 44810000 */ mtc1 $at, $f0 -/* D7D460 80240910 00000000 */ nop -/* D7D464 80240914 4602003C */ c.lt.s $f0, $f2 -/* D7D468 80240918 00000000 */ nop -/* D7D46C 8024091C 4500000A */ bc1f .L80240948 -/* D7D470 80240920 00000000 */ nop -/* D7D474 80240924 3C014334 */ lui $at, 0x4334 -/* D7D478 80240928 44812000 */ mtc1 $at, $f4 -/* D7D47C 8024092C 00000000 */ nop -/* D7D480 80240930 4604103E */ c.le.s $f2, $f4 -/* D7D484 80240934 00000000 */ nop -/* D7D488 80240938 45000003 */ bc1f .L80240948 -/* D7D48C 8024093C 00000000 */ nop -/* D7D490 80240940 08090276 */ j .L802409D8 -/* D7D494 80240944 46022501 */ sub.s $f20, $f4, $f2 -.L80240948: -/* D7D498 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D7D49C 8024094C 3C014334 */ lui $at, 0x4334 -/* D7D4A0 80240950 44812000 */ mtc1 $at, $f4 -/* D7D4A4 80240954 00000000 */ nop -/* D7D4A8 80240958 4600203C */ c.lt.s $f4, $f0 -/* D7D4AC 8024095C 00000000 */ nop -/* D7D4B0 80240960 4500000C */ bc1f .L80240994 -/* D7D4B4 80240964 00000000 */ nop -/* D7D4B8 80240968 3C014387 */ lui $at, 0x4387 -/* D7D4BC 8024096C 44812000 */ mtc1 $at, $f4 -/* D7D4C0 80240970 00000000 */ nop -/* D7D4C4 80240974 4604003E */ c.le.s $f0, $f4 -/* D7D4C8 80240978 00000000 */ nop -/* D7D4CC 8024097C 45000008 */ bc1f .L802409A0 -/* D7D4D0 80240980 00000000 */ nop -/* D7D4D4 80240984 3C014334 */ lui $at, 0x4334 -/* D7D4D8 80240988 44812000 */ mtc1 $at, $f4 -/* D7D4DC 8024098C 08090276 */ j .L802409D8 -/* D7D4E0 80240990 46040501 */ sub.s $f20, $f0, $f4 -.L80240994: -/* D7D4E4 80240994 3C014387 */ lui $at, 0x4387 -/* D7D4E8 80240998 44812000 */ mtc1 $at, $f4 -/* D7D4EC 8024099C 00000000 */ nop -.L802409A0: -/* D7D4F0 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D7D4F4 802409A4 00000000 */ nop -/* D7D4F8 802409A8 4500000A */ bc1f .L802409D4 -/* D7D4FC 802409AC 00000000 */ nop -/* D7D500 802409B0 3C0143B4 */ lui $at, 0x43b4 -/* D7D504 802409B4 44811000 */ mtc1 $at, $f2 -/* D7D508 802409B8 00000000 */ nop -/* D7D50C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D7D510 802409C0 00000000 */ nop -/* D7D514 802409C4 45000003 */ bc1f .L802409D4 -/* D7D518 802409C8 00000000 */ nop -/* D7D51C 802409CC 08090276 */ j .L802409D8 -/* D7D520 802409D0 46001501 */ sub.s $f20, $f2, $f0 -.L802409D4: -/* D7D524 802409D4 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L802409D8: -/* D7D528 802409D8 3C0141C8 */ lui $at, 0x41c8 -/* D7D52C 802409DC 44810000 */ mtc1 $at, $f0 -/* D7D530 802409E0 00000000 */ nop -/* D7D534 802409E4 4600A003 */ div.s $f0, $f20, $f0 -/* D7D538 802409E8 4600010D */ trunc.w.s $f4, $f0 -/* D7D53C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D7D540 802409F0 00000000 */ nop -/* D7D544 802409F4 00071100 */ sll $v0, $a3, 4 -/* D7D548 802409F8 00471023 */ subu $v0, $v0, $a3 -/* D7D54C 802409FC 00021080 */ sll $v0, $v0, 2 -/* D7D550 80240A00 02A23823 */ subu $a3, $s5, $v0 -/* D7D554 80240A04 28E20064 */ slti $v0, $a3, 0x64 -/* D7D558 80240A08 54400001 */ bnel $v0, $zero, .L80240A10 -/* D7D55C 80240A0C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A10: -/* D7D560 80240A10 24040001 */ addiu $a0, $zero, 1 -/* D7D564 80240A14 2405FFFF */ addiu $a1, $zero, -1 -/* D7D568 80240A18 24060006 */ addiu $a2, $zero, 6 -/* D7D56C 80240A1C AFA70010 */ sw $a3, 0x10($sp) -/* D7D570 80240A20 AFA70014 */ sw $a3, 0x14($sp) -/* D7D574 80240A24 AFB50018 */ sw $s5, 0x18($sp) -/* D7D578 80240A28 0C0B77B9 */ jal func_802DDEE4 -/* D7D57C 80240A2C AFA0001C */ sw $zero, 0x1c($sp) -/* D7D580 80240A30 4405A000 */ mfc1 $a1, $f20 -/* D7D584 80240A34 4406B000 */ mfc1 $a2, $f22 -/* D7D588 80240A38 3C07BF80 */ lui $a3, 0xbf80 -/* D7D58C 80240A3C 0200202D */ daddu $a0, $s0, $zero -/* D7D590 80240A40 0C019EC8 */ jal guRotateF -/* D7D594 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D7D598 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D7D59C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D7D5A0 80240A50 00000000 */ nop -/* D7D5A4 80240A54 44050000 */ mfc1 $a1, $f0 -/* D7D5A8 80240A58 4406B000 */ mfc1 $a2, $f22 -/* D7D5AC 80240A5C 4407B000 */ mfc1 $a3, $f22 -/* D7D5B0 80240A60 3C013F80 */ lui $at, 0x3f80 -/* D7D5B4 80240A64 44812000 */ mtc1 $at, $f4 -/* D7D5B8 80240A68 27A40020 */ addiu $a0, $sp, 0x20 -/* D7D5BC 80240A6C 0C019EC8 */ jal guRotateF -/* D7D5C0 80240A70 E7A40010 */ swc1 $f4, 0x10($sp) -/* D7D5C4 80240A74 0200202D */ daddu $a0, $s0, $zero -/* D7D5C8 80240A78 27A50020 */ addiu $a1, $sp, 0x20 -/* D7D5CC 80240A7C 0C019D80 */ jal guMtxCatF -/* D7D5D0 80240A80 00A0302D */ daddu $a2, $a1, $zero -/* D7D5D4 80240A84 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D7D5D8 80240A88 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D7D5DC 80240A8C 080902D6 */ j .L80240B58 -/* D7D5E0 80240A90 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240A94: -/* D7D5E4 80240A94 0260202D */ daddu $a0, $s3, $zero -/* D7D5E8 80240A98 27A50120 */ addiu $a1, $sp, 0x120 -/* D7D5EC 80240A9C 27A60124 */ addiu $a2, $sp, 0x124 -/* D7D5F0 80240AA0 0C03964E */ jal func_800E5938 -/* D7D5F4 80240AA4 27A70128 */ addiu $a3, $sp, 0x128 -/* D7D5F8 80240AA8 8FA60124 */ lw $a2, 0x124($sp) -/* D7D5FC 80240AAC 3C028000 */ lui $v0, 0x8000 -/* D7D600 80240AB0 14C20004 */ bne $a2, $v0, .L80240AC4 -/* D7D604 80240AB4 46000606 */ mov.s $f24, $f0 -/* D7D608 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D7D60C 80240ABC 080902B5 */ j .L80240AD4 -/* D7D610 80240AC0 24040001 */ addiu $a0, $zero, 1 -.L80240AC4: -/* D7D614 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D7D618 80240AC8 00000000 */ nop -/* D7D61C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D7D620 80240AD0 24040001 */ addiu $a0, $zero, 1 -.L80240AD4: -/* D7D624 80240AD4 2405FFFF */ addiu $a1, $zero, -1 -/* D7D628 80240AD8 24060007 */ addiu $a2, $zero, 7 -/* D7D62C 80240ADC 0000382D */ daddu $a3, $zero, $zero -/* D7D630 80240AE0 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D7D634 80240AE4 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D7D638 80240AE8 24020040 */ addiu $v0, $zero, 0x40 -/* D7D63C 80240AEC AFA00010 */ sw $zero, 0x10($sp) -/* D7D640 80240AF0 AFA00014 */ sw $zero, 0x14($sp) -/* D7D644 80240AF4 AFA20018 */ sw $v0, 0x18($sp) -/* D7D648 80240AF8 0C0B77B9 */ jal func_802DDEE4 -/* D7D64C 80240AFC AFA0001C */ sw $zero, 0x1c($sp) -/* D7D650 80240B00 4405A000 */ mfc1 $a1, $f20 -/* D7D654 80240B04 4406B000 */ mfc1 $a2, $f22 -/* D7D658 80240B08 3C07BF80 */ lui $a3, 0xbf80 -/* D7D65C 80240B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* D7D660 80240B10 0C019EC8 */ jal guRotateF -/* D7D664 80240B14 E7B60010 */ swc1 $f22, 0x10($sp) -/* D7D668 80240B18 4405A000 */ mfc1 $a1, $f20 -/* D7D66C 80240B1C 4406B000 */ mfc1 $a2, $f22 -/* D7D670 80240B20 3C07BF80 */ lui $a3, 0xbf80 -/* D7D674 80240B24 0200202D */ daddu $a0, $s0, $zero -/* D7D678 80240B28 0C019EC8 */ jal guRotateF -/* D7D67C 80240B2C E7B60010 */ swc1 $f22, 0x10($sp) -/* D7D680 80240B30 4405C000 */ mfc1 $a1, $f24 -/* D7D684 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D7D688 80240B38 3C073F80 */ lui $a3, 0x3f80 -/* D7D68C 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D7D690 80240B40 0C019EC8 */ jal guRotateF -/* D7D694 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D7D698 80240B48 0200202D */ daddu $a0, $s0, $zero -/* D7D69C 80240B4C 27A50020 */ addiu $a1, $sp, 0x20 -/* D7D6A0 80240B50 0C019D80 */ jal guMtxCatF -/* D7D6A4 80240B54 00A0302D */ daddu $a2, $a1, $zero -.L80240B58: -/* D7D6A8 80240B58 862200B0 */ lh $v0, 0xb0($s1) -/* D7D6AC 80240B5C 3C013F00 */ lui $at, 0x3f00 -/* D7D6B0 80240B60 44812000 */ mtc1 $at, $f4 -/* D7D6B4 80240B64 00021023 */ negu $v0, $v0 -/* D7D6B8 80240B68 44820000 */ mtc1 $v0, $f0 -/* D7D6BC 80240B6C 00000000 */ nop -/* D7D6C0 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* D7D6C4 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D7D6C8 80240B78 00000000 */ nop -/* D7D6CC 80240B7C 4405B000 */ mfc1 $a1, $f22 -/* D7D6D0 80240B80 4407B000 */ mfc1 $a3, $f22 -/* D7D6D4 80240B84 44062000 */ mfc1 $a2, $f4 -/* D7D6D8 80240B88 0C019E40 */ jal guTranslateF -/* D7D6DC 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* D7D6E0 80240B90 0240202D */ daddu $a0, $s2, $zero -/* D7D6E4 80240B94 27A50020 */ addiu $a1, $sp, 0x20 -/* D7D6E8 80240B98 0C019D80 */ jal guMtxCatF -/* D7D6EC 80240B9C 00A0302D */ daddu $a2, $a1, $zero -/* D7D6F0 80240BA0 4405A000 */ mfc1 $a1, $f20 -/* D7D6F4 80240BA4 4406B000 */ mfc1 $a2, $f22 -/* D7D6F8 80240BA8 3C073F80 */ lui $a3, 0x3f80 -/* D7D6FC 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* D7D700 80240BB0 0C019EC8 */ jal guRotateF -/* D7D704 80240BB4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D7D708 80240BB8 27A40020 */ addiu $a0, $sp, 0x20 -/* D7D70C 80240BBC 0200282D */ daddu $a1, $s0, $zero -/* D7D710 80240BC0 0C019D80 */ jal guMtxCatF -/* D7D714 80240BC4 0080302D */ daddu $a2, $a0, $zero -/* D7D718 80240BC8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D7D71C 80240BCC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D7D720 80240BD0 4406B000 */ mfc1 $a2, $f22 -/* D7D724 80240BD4 3C073F80 */ lui $a3, 0x3f80 -/* D7D728 80240BD8 0C019EC8 */ jal guRotateF -/* D7D72C 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D7D730 80240BE0 27A40020 */ addiu $a0, $sp, 0x20 -/* D7D734 80240BE4 0200282D */ daddu $a1, $s0, $zero -/* D7D738 80240BE8 0C019D80 */ jal guMtxCatF -/* D7D73C 80240BEC 0080302D */ daddu $a2, $a0, $zero -/* D7D740 80240BF0 862200B0 */ lh $v0, 0xb0($s1) -/* D7D744 80240BF4 3C013F00 */ lui $at, 0x3f00 -/* D7D748 80240BF8 44812000 */ mtc1 $at, $f4 -/* D7D74C 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D7D750 80240C00 00000000 */ nop -/* D7D754 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* D7D758 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D7D75C 80240C0C 00000000 */ nop -/* D7D760 80240C10 4405B000 */ mfc1 $a1, $f22 -/* D7D764 80240C14 4407B000 */ mfc1 $a3, $f22 -/* D7D768 80240C18 44062000 */ mfc1 $a2, $f4 -/* D7D76C 80240C1C 0C019E40 */ jal guTranslateF -/* D7D770 80240C20 0240202D */ daddu $a0, $s2, $zero -/* D7D774 80240C24 27A40020 */ addiu $a0, $sp, 0x20 -/* D7D778 80240C28 0240282D */ daddu $a1, $s2, $zero -/* D7D77C 80240C2C 0C019D80 */ jal guMtxCatF -/* D7D780 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D7D784 80240C34 3C013F36 */ lui $at, 0x3f36 -/* D7D788 80240C38 3421DB6E */ ori $at, $at, 0xdb6e -/* D7D78C 80240C3C 44810000 */ mtc1 $at, $f0 -/* D7D790 80240C40 0280202D */ daddu $a0, $s4, $zero -/* D7D794 80240C44 44050000 */ mfc1 $a1, $f0 -/* D7D798 80240C48 3C06BF36 */ lui $a2, 0xbf36 -/* D7D79C 80240C4C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D7D7A0 80240C50 0C019DF0 */ jal guScaleF -/* D7D7A4 80240C54 00A0382D */ daddu $a3, $a1, $zero -/* D7D7A8 80240C58 27A40020 */ addiu $a0, $sp, 0x20 -/* D7D7AC 80240C5C 0280282D */ daddu $a1, $s4, $zero -/* D7D7B0 80240C60 0C019D80 */ jal guMtxCatF -/* D7D7B4 80240C64 0080302D */ daddu $a2, $a0, $zero -/* D7D7B8 80240C68 4600D687 */ neg.s $f26, $f26 -/* D7D7BC 80240C6C 4405F000 */ mfc1 $a1, $f30 -/* D7D7C0 80240C70 4407E000 */ mfc1 $a3, $f28 -/* D7D7C4 80240C74 4406D000 */ mfc1 $a2, $f26 -/* D7D7C8 80240C78 0C019E40 */ jal guTranslateF -/* D7D7CC 80240C7C 0240202D */ daddu $a0, $s2, $zero -/* D7D7D0 80240C80 27A40020 */ addiu $a0, $sp, 0x20 -/* D7D7D4 80240C84 0240282D */ daddu $a1, $s2, $zero -/* D7D7D8 80240C88 0C019D80 */ jal guMtxCatF -/* D7D7DC 80240C8C 0080302D */ daddu $a2, $a0, $zero -/* D7D7E0 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D7D7E4 80240C94 3C0142B4 */ lui $at, 0x42b4 -/* D7D7E8 80240C98 44810000 */ mtc1 $at, $f0 -/* D7D7EC 80240C9C 00000000 */ nop -/* D7D7F0 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D7D7F4 80240CA4 00000000 */ nop -/* D7D7F8 80240CA8 4500000A */ bc1f .L80240CD4 -/* D7D7FC 80240CAC 24040001 */ addiu $a0, $zero, 1 -/* D7D800 80240CB0 3C014387 */ lui $at, 0x4387 -/* D7D804 80240CB4 44812000 */ mtc1 $at, $f4 -/* D7D808 80240CB8 00000000 */ nop -/* D7D80C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D7D810 80240CC0 00000000 */ nop -/* D7D814 80240CC4 45000004 */ bc1f .L80240CD8 -/* D7D818 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 -/* D7D81C 80240CCC 3C041000 */ lui $a0, 0x1000 -/* D7D820 80240CD0 34840001 */ ori $a0, $a0, 1 -.L80240CD4: -/* D7D824 80240CD4 27A20020 */ addiu $v0, $sp, 0x20 -.L80240CD8: -/* D7D828 80240CD8 AFA20010 */ sw $v0, 0x10($sp) -/* D7D82C 80240CDC 0000282D */ daddu $a1, $zero, $zero -/* D7D830 80240CE0 00A0302D */ daddu $a2, $a1, $zero -/* D7D834 80240CE4 0C0B7710 */ jal render_sprite -/* D7D838 80240CE8 00A0382D */ daddu $a3, $a1, $zero -/* D7D83C 80240CEC 26730001 */ addiu $s3, $s3, 1 -/* D7D840 80240CF0 2A620002 */ slti $v0, $s3, 2 -/* D7D844 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D7D848 80240CF8 00000000 */ nop -/* D7D84C 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) -/* D7D850 80240D00 8FB60148 */ lw $s6, 0x148($sp) -/* D7D854 80240D04 8FB50144 */ lw $s5, 0x144($sp) -/* D7D858 80240D08 8FB40140 */ lw $s4, 0x140($sp) -/* D7D85C 80240D0C 8FB3013C */ lw $s3, 0x13c($sp) -/* D7D860 80240D10 8FB20138 */ lw $s2, 0x138($sp) -/* D7D864 80240D14 8FB10134 */ lw $s1, 0x134($sp) -/* D7D868 80240D18 8FB00130 */ lw $s0, 0x130($sp) -/* D7D86C 80240D1C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D7D870 80240D20 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D7D874 80240D24 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D7D878 80240D28 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D7D87C 80240D2C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D7D880 80240D30 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D7D884 80240D34 03E00008 */ jr $ra -/* D7D888 80240D38 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_29/func_80240D3C_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/func_80240D3C_D7CB50.s deleted file mode 100644 index 89a05915a1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/func_80240D3C_D7CB50.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_D7D88C -/* D7D88C 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7D890 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D7D894 80240D44 0080802D */ daddu $s0, $a0, $zero -/* D7D898 80240D48 AFBF0014 */ sw $ra, 0x14($sp) -/* D7D89C 80240D4C 8E020088 */ lw $v0, 0x88($s0) -/* D7D8A0 80240D50 14400017 */ bnez $v0, .L80240DB0 -/* D7D8A4 80240D54 24020001 */ addiu $v0, $zero, 1 -/* D7D8A8 80240D58 8E030084 */ lw $v1, 0x84($s0) -/* D7D8AC 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D7D8B0 80240D60 00000000 */ nop -/* D7D8B4 80240D64 28620002 */ slti $v0, $v1, 2 -/* D7D8B8 80240D68 50400005 */ beql $v0, $zero, .L80240D80 -/* D7D8BC 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* D7D8C0 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D7D8C4 80240D74 00000000 */ nop -/* D7D8C8 80240D78 08090378 */ j .L80240DE0 -/* D7D8CC 80240D7C 00000000 */ nop -.L80240D80: -/* D7D8D0 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D7D8D4 80240D84 00000000 */ nop -/* D7D8D8 80240D88 08090378 */ j .L80240DE0 -/* D7D8DC 80240D8C 00000000 */ nop -.L80240D90: -/* D7D8E0 80240D90 3C048024 */ lui $a0, 0x8024 -/* D7D8E4 80240D94 24840E84 */ addiu $a0, $a0, 0xe84 -/* D7D8E8 80240D98 08090374 */ j .L80240DD0 -/* D7D8EC 80240D9C 00000000 */ nop -.L80240DA0: -/* D7D8F0 80240DA0 3C048024 */ lui $a0, 0x8024 -/* D7D8F4 80240DA4 24840EEC */ addiu $a0, $a0, 0xeec -/* D7D8F8 80240DA8 08090374 */ j .L80240DD0 -/* D7D8FC 80240DAC 00000000 */ nop -.L80240DB0: -/* D7D900 80240DB0 8E020084 */ lw $v0, 0x84($s0) -/* D7D904 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D7D908 80240DB8 00000000 */ nop -/* D7D90C 80240DBC 28420002 */ slti $v0, $v0, 2 -/* D7D910 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D7D914 80240DC4 00000000 */ nop -.L80240DC8: -/* D7D918 80240DC8 3C048024 */ lui $a0, 0x8024 -/* D7D91C 80240DCC 24840EB8 */ addiu $a0, $a0, 0xeb8 -.L80240DD0: -/* D7D920 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 -/* D7D924 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* D7D928 80240DD8 8E03013C */ lw $v1, 0x13c($s0) -/* D7D92C 80240DDC AC620004 */ sw $v0, 4($v1) -.L80240DE0: -/* D7D930 80240DE0 0C00EAD2 */ jal get_npc_safe -/* D7D934 80240DE4 2404FFFC */ addiu $a0, $zero, -4 -/* D7D938 80240DE8 0040282D */ daddu $a1, $v0, $zero -/* D7D93C 80240DEC 10A00021 */ beqz $a1, .L80240E74 -/* D7D940 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* D7D944 80240DF4 8E020088 */ lw $v0, 0x88($s0) -/* D7D948 80240DF8 14400014 */ bnez $v0, .L80240E4C -/* D7D94C 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* D7D950 80240E00 8E040084 */ lw $a0, 0x84($s0) -/* D7D954 80240E04 10820016 */ beq $a0, $v0, .L80240E60 -/* D7D958 80240E08 28820002 */ slti $v0, $a0, 2 -/* D7D95C 80240E0C 10400005 */ beqz $v0, .L80240E24 -/* D7D960 80240E10 24020002 */ addiu $v0, $zero, 2 -/* D7D964 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D7D968 80240E18 00000000 */ nop -/* D7D96C 80240E1C 0809039D */ j .L80240E74 -/* D7D970 80240E20 00000000 */ nop -.L80240E24: -/* D7D974 80240E24 10820006 */ beq $a0, $v0, .L80240E40 -/* D7D978 80240E28 24020002 */ addiu $v0, $zero, 2 -/* D7D97C 80240E2C 0809039D */ j .L80240E74 -/* D7D980 80240E30 00000000 */ nop -.L80240E34: -/* D7D984 80240E34 8CA20000 */ lw $v0, ($a1) -/* D7D988 80240E38 0809039A */ j .L80240E68 -/* D7D98C 80240E3C 3C03000A */ lui $v1, 0xa -.L80240E40: -/* D7D990 80240E40 8CA20000 */ lw $v0, ($a1) -/* D7D994 80240E44 0809039A */ j .L80240E68 -/* D7D998 80240E48 3C030002 */ lui $v1, 2 -.L80240E4C: -/* D7D99C 80240E4C 8E020084 */ lw $v0, 0x84($s0) -/* D7D9A0 80240E50 04400007 */ bltz $v0, .L80240E70 -/* D7D9A4 80240E54 28420002 */ slti $v0, $v0, 2 -/* D7D9A8 80240E58 10400006 */ beqz $v0, .L80240E74 -/* D7D9AC 80240E5C 24020002 */ addiu $v0, $zero, 2 -.L80240E60: -/* D7D9B0 80240E60 8CA20000 */ lw $v0, ($a1) -/* D7D9B4 80240E64 3C030008 */ lui $v1, 8 -.L80240E68: -/* D7D9B8 80240E68 00431025 */ or $v0, $v0, $v1 -/* D7D9BC 80240E6C ACA20000 */ sw $v0, ($a1) -.L80240E70: -/* D7D9C0 80240E70 24020002 */ addiu $v0, $zero, 2 -.L80240E74: -/* D7D9C4 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* D7D9C8 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* D7D9CC 80240E7C 03E00008 */ jr $ra -/* D7D9D0 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_29/func_80240E84_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/func_80240E84_D7CB50.s deleted file mode 100644 index ea49f421f8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/func_80240E84_D7CB50.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D7D9D4 -/* D7D9D4 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7D9D8 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D7D9DC 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D7D9E0 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D7D9E4 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D7D9E8 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D7D9EC 80240E9C 3C03000A */ lui $v1, 0xa -/* D7D9F0 80240EA0 8C820000 */ lw $v0, ($a0) -/* D7D9F4 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D7D9F8 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D7D9FC 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D7DA00 80240EB0 03E00008 */ jr $ra -/* D7DA04 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_29/func_80240EB8_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/func_80240EB8_D7CB50.s deleted file mode 100644 index 1dd8da396c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/func_80240EB8_D7CB50.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D7DA08 -/* D7DA08 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7DA0C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D7DA10 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D7DA14 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D7DA18 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D7DA1C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D7DA20 80240ED0 3C030008 */ lui $v1, 8 -/* D7DA24 80240ED4 8C820000 */ lw $v0, ($a0) -/* D7DA28 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D7DA2C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D7DA30 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D7DA34 80240EE4 03E00008 */ jr $ra -/* D7DA38 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_29/func_80240EEC_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/func_80240EEC_D7CB50.s deleted file mode 100644 index 5fcc6c0966..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/func_80240EEC_D7CB50.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D7DA3C -/* D7DA3C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7DA40 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D7DA44 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D7DA48 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D7DA4C 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D7DA50 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D7DA54 80240F04 3C030002 */ lui $v1, 2 -/* D7DA58 80240F08 8C820000 */ lw $v0, ($a0) -/* D7DA5C 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D7DA60 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D7DA64 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D7DA68 80240F18 03E00008 */ jr $ra -/* D7DA6C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_29/func_80240F20_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/func_80240F20_D7CB50.s deleted file mode 100644 index b877f01518..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/func_80240F20_D7CB50.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D7DA70 -/* D7DA70 80240F20 8FAC0010 */ lw $t4, 0x10($sp) -/* D7DA74 80240F24 240300FF */ addiu $v1, $zero, 0xff -/* D7DA78 80240F28 0180502D */ daddu $t2, $t4, $zero -/* D7DA7C 80240F2C 29420100 */ slti $v0, $t2, 0x100 -/* D7DA80 80240F30 14400002 */ bnez $v0, .L80240F3C -/* D7DA84 80240F34 006C5823 */ subu $t3, $v1, $t4 -/* D7DA88 80240F38 0060502D */ daddu $t2, $v1, $zero -.L80240F3C: -/* D7DA8C 80240F3C 0000482D */ daddu $t1, $zero, $zero -/* D7DA90 80240F40 18E00059 */ blez $a3, .L802410A8 -/* D7DA94 80240F44 006A6823 */ subu $t5, $v1, $t2 -/* D7DA98 80240F48 3C088080 */ lui $t0, 0x8080 -/* D7DA9C 80240F4C 35088081 */ ori $t0, $t0, 0x8081 -.L80240F50: -/* D7DAA0 80240F50 84820000 */ lh $v0, ($a0) -/* D7DAA4 80240F54 004B0018 */ mult $v0, $t3 -/* D7DAA8 80240F58 00001812 */ mflo $v1 -/* D7DAAC 80240F5C 84A20000 */ lh $v0, ($a1) -/* D7DAB0 80240F60 00000000 */ nop -/* D7DAB4 80240F64 004C0018 */ mult $v0, $t4 -/* D7DAB8 80240F68 00001012 */ mflo $v0 -/* D7DABC 80240F6C 00621821 */ addu $v1, $v1, $v0 -/* D7DAC0 80240F70 00000000 */ nop -/* D7DAC4 80240F74 00680018 */ mult $v1, $t0 -/* D7DAC8 80240F78 00001010 */ mfhi $v0 -/* D7DACC 80240F7C 00431021 */ addu $v0, $v0, $v1 -/* D7DAD0 80240F80 000211C3 */ sra $v0, $v0, 7 -/* D7DAD4 80240F84 00031FC3 */ sra $v1, $v1, 0x1f -/* D7DAD8 80240F88 00431023 */ subu $v0, $v0, $v1 -/* D7DADC 80240F8C A4C20000 */ sh $v0, ($a2) -/* D7DAE0 80240F90 84820002 */ lh $v0, 2($a0) -/* D7DAE4 80240F94 004B0018 */ mult $v0, $t3 -/* D7DAE8 80240F98 00001812 */ mflo $v1 -/* D7DAEC 80240F9C 84A20002 */ lh $v0, 2($a1) -/* D7DAF0 80240FA0 00000000 */ nop -/* D7DAF4 80240FA4 004C0018 */ mult $v0, $t4 -/* D7DAF8 80240FA8 00001012 */ mflo $v0 -/* D7DAFC 80240FAC 00621821 */ addu $v1, $v1, $v0 -/* D7DB00 80240FB0 00000000 */ nop -/* D7DB04 80240FB4 00680018 */ mult $v1, $t0 -/* D7DB08 80240FB8 00001010 */ mfhi $v0 -/* D7DB0C 80240FBC 00431021 */ addu $v0, $v0, $v1 -/* D7DB10 80240FC0 000211C3 */ sra $v0, $v0, 7 -/* D7DB14 80240FC4 00031FC3 */ sra $v1, $v1, 0x1f -/* D7DB18 80240FC8 00431023 */ subu $v0, $v0, $v1 -/* D7DB1C 80240FCC A4C20002 */ sh $v0, 2($a2) -/* D7DB20 80240FD0 84820004 */ lh $v0, 4($a0) -/* D7DB24 80240FD4 004B0018 */ mult $v0, $t3 -/* D7DB28 80240FD8 00001812 */ mflo $v1 -/* D7DB2C 80240FDC 84A20004 */ lh $v0, 4($a1) -/* D7DB30 80240FE0 00000000 */ nop -/* D7DB34 80240FE4 004C0018 */ mult $v0, $t4 -/* D7DB38 80240FE8 00001012 */ mflo $v0 -/* D7DB3C 80240FEC 00621821 */ addu $v1, $v1, $v0 -/* D7DB40 80240FF0 00000000 */ nop -/* D7DB44 80240FF4 00680018 */ mult $v1, $t0 -/* D7DB48 80240FF8 00001010 */ mfhi $v0 -/* D7DB4C 80240FFC 00431021 */ addu $v0, $v0, $v1 -/* D7DB50 80241000 000211C3 */ sra $v0, $v0, 7 -/* D7DB54 80241004 00031FC3 */ sra $v1, $v1, 0x1f -/* D7DB58 80241008 00431023 */ subu $v0, $v0, $v1 -/* D7DB5C 8024100C A4C20004 */ sh $v0, 4($a2) -/* D7DB60 80241010 84820008 */ lh $v0, 8($a0) -/* D7DB64 80241014 004D0018 */ mult $v0, $t5 -/* D7DB68 80241018 00001812 */ mflo $v1 -/* D7DB6C 8024101C 84A20008 */ lh $v0, 8($a1) -/* D7DB70 80241020 00000000 */ nop -/* D7DB74 80241024 004A0018 */ mult $v0, $t2 -/* D7DB78 80241028 00001012 */ mflo $v0 -/* D7DB7C 8024102C 00621821 */ addu $v1, $v1, $v0 -/* D7DB80 80241030 00000000 */ nop -/* D7DB84 80241034 00680018 */ mult $v1, $t0 -/* D7DB88 80241038 00001010 */ mfhi $v0 -/* D7DB8C 8024103C 00431021 */ addu $v0, $v0, $v1 -/* D7DB90 80241040 000211C3 */ sra $v0, $v0, 7 -/* D7DB94 80241044 00031FC3 */ sra $v1, $v1, 0x1f -/* D7DB98 80241048 00431023 */ subu $v0, $v0, $v1 -/* D7DB9C 8024104C A4C20008 */ sh $v0, 8($a2) -/* D7DBA0 80241050 8482000A */ lh $v0, 0xa($a0) -/* D7DBA4 80241054 004D0018 */ mult $v0, $t5 -/* D7DBA8 80241058 00001812 */ mflo $v1 -/* D7DBAC 8024105C 84A2000A */ lh $v0, 0xa($a1) -/* D7DBB0 80241060 00000000 */ nop -/* D7DBB4 80241064 004A0018 */ mult $v0, $t2 -/* D7DBB8 80241068 00001012 */ mflo $v0 -/* D7DBBC 8024106C 00621821 */ addu $v1, $v1, $v0 -/* D7DBC0 80241070 00000000 */ nop -/* D7DBC4 80241074 00680018 */ mult $v1, $t0 -/* D7DBC8 80241078 25290001 */ addiu $t1, $t1, 1 -/* D7DBCC 8024107C 24840010 */ addiu $a0, $a0, 0x10 -/* D7DBD0 80241080 24A50010 */ addiu $a1, $a1, 0x10 -/* D7DBD4 80241084 00001010 */ mfhi $v0 -/* D7DBD8 80241088 00431021 */ addu $v0, $v0, $v1 -/* D7DBDC 8024108C 000211C3 */ sra $v0, $v0, 7 -/* D7DBE0 80241090 00031FC3 */ sra $v1, $v1, 0x1f -/* D7DBE4 80241094 00431023 */ subu $v0, $v0, $v1 -/* D7DBE8 80241098 A4C2000A */ sh $v0, 0xa($a2) -/* D7DBEC 8024109C 0127102A */ slt $v0, $t1, $a3 -/* D7DBF0 802410A0 1440FFAB */ bnez $v0, .L80240F50 -/* D7DBF4 802410A4 24C60010 */ addiu $a2, $a2, 0x10 -.L802410A8: -/* D7DBF8 802410A8 03E00008 */ jr $ra -/* D7DBFC 802410AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_29/func_802410B0_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/func_802410B0_D7CB50.s deleted file mode 100644 index 5eb0e1055b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/func_802410B0_D7CB50.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410B0_D7DC00 -/* D7DC00 802410B0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D7DC04 802410B4 AFB00030 */ sw $s0, 0x30($sp) -/* D7DC08 802410B8 0080802D */ daddu $s0, $a0, $zero -/* D7DC0C 802410BC 0000202D */ daddu $a0, $zero, $zero -/* D7DC10 802410C0 3C05FD05 */ lui $a1, 0xfd05 -/* D7DC14 802410C4 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7DC18 802410C8 AFBF003C */ sw $ra, 0x3c($sp) -/* D7DC1C 802410CC AFB20038 */ sw $s2, 0x38($sp) -/* D7DC20 802410D0 0C0B1EAF */ jal get_variable -/* D7DC24 802410D4 AFB10034 */ sw $s1, 0x34($sp) -/* D7DC28 802410D8 0040902D */ daddu $s2, $v0, $zero -/* D7DC2C 802410DC 2A420100 */ slti $v0, $s2, 0x100 -/* D7DC30 802410E0 10400017 */ beqz $v0, .L80241140 -/* D7DC34 802410E4 00101040 */ sll $v0, $s0, 1 -/* D7DC38 802410E8 00508821 */ addu $s1, $v0, $s0 -/* D7DC3C 802410EC 0220202D */ daddu $a0, $s1, $zero -/* D7DC40 802410F0 27A50018 */ addiu $a1, $sp, 0x18 -/* D7DC44 802410F4 27A6001C */ addiu $a2, $sp, 0x1c -/* D7DC48 802410F8 27B00020 */ addiu $s0, $sp, 0x20 -/* D7DC4C 802410FC 0C0470AC */ jal func_8011C2B0 -/* D7DC50 80241100 0200382D */ daddu $a3, $s0, $zero -/* D7DC54 80241104 26240001 */ addiu $a0, $s1, 1 -/* D7DC58 80241108 27A50024 */ addiu $a1, $sp, 0x24 -/* D7DC5C 8024110C 27A60028 */ addiu $a2, $sp, 0x28 -/* D7DC60 80241110 0C0470AC */ jal func_8011C2B0 -/* D7DC64 80241114 0200382D */ daddu $a3, $s0, $zero -/* D7DC68 80241118 8FA40024 */ lw $a0, 0x24($sp) -/* D7DC6C 8024111C 8FA50018 */ lw $a1, 0x18($sp) -/* D7DC70 80241120 8FA6001C */ lw $a2, 0x1c($sp) -/* D7DC74 80241124 8FA70020 */ lw $a3, 0x20($sp) -/* D7DC78 80241128 0C0903C8 */ jal func_80240F20 -/* D7DC7C 8024112C AFB20010 */ sw $s2, 0x10($sp) -/* D7DC80 80241130 12400022 */ beqz $s2, .L802411BC -/* D7DC84 80241134 00000000 */ nop -/* D7DC88 80241138 08090464 */ j .L80241190 -/* D7DC8C 8024113C 00000000 */ nop -.L80241140: -/* D7DC90 80241140 00108840 */ sll $s1, $s0, 1 -/* D7DC94 80241144 02308821 */ addu $s1, $s1, $s0 -/* D7DC98 80241148 0220202D */ daddu $a0, $s1, $zero -/* D7DC9C 8024114C 27A50018 */ addiu $a1, $sp, 0x18 -/* D7DCA0 80241150 27A6001C */ addiu $a2, $sp, 0x1c -/* D7DCA4 80241154 27B00020 */ addiu $s0, $sp, 0x20 -/* D7DCA8 80241158 0C0470AC */ jal func_8011C2B0 -/* D7DCAC 8024115C 0200382D */ daddu $a3, $s0, $zero -/* D7DCB0 80241160 26240002 */ addiu $a0, $s1, 2 -/* D7DCB4 80241164 27A50024 */ addiu $a1, $sp, 0x24 -/* D7DCB8 80241168 27A60028 */ addiu $a2, $sp, 0x28 -/* D7DCBC 8024116C 0C0470AC */ jal func_8011C2B0 -/* D7DCC0 80241170 0200382D */ daddu $a3, $s0, $zero -/* D7DCC4 80241174 8FA40018 */ lw $a0, 0x18($sp) -/* D7DCC8 80241178 8FA50024 */ lw $a1, 0x24($sp) -/* D7DCCC 8024117C 8FA6001C */ lw $a2, 0x1c($sp) -/* D7DCD0 80241180 8FA70020 */ lw $a3, 0x20($sp) -/* D7DCD4 80241184 2642FF00 */ addiu $v0, $s2, -0x100 -/* D7DCD8 80241188 0C0903C8 */ jal func_80240F20 -/* D7DCDC 8024118C AFA20010 */ sw $v0, 0x10($sp) -.L80241190: -/* D7DCE0 80241190 3C03800A */ lui $v1, 0x800a -/* D7DCE4 80241194 2463A66C */ addiu $v1, $v1, -0x5994 -/* D7DCE8 80241198 8C620000 */ lw $v0, ($v1) -/* D7DCEC 8024119C 0220202D */ daddu $a0, $s1, $zero -/* D7DCF0 802411A0 0040802D */ daddu $s0, $v0, $zero -/* D7DCF4 802411A4 24420008 */ addiu $v0, $v0, 8 -/* D7DCF8 802411A8 AC620000 */ sw $v0, ($v1) -/* D7DCFC 802411AC 3C02DE00 */ lui $v0, 0xde00 -/* D7DD00 802411B0 0C0470BB */ jal func_8011C2EC -/* D7DD04 802411B4 AE020000 */ sw $v0, ($s0) -/* D7DD08 802411B8 AE020004 */ sw $v0, 4($s0) -.L802411BC: -/* D7DD0C 802411BC 8FBF003C */ lw $ra, 0x3c($sp) -/* D7DD10 802411C0 8FB20038 */ lw $s2, 0x38($sp) -/* D7DD14 802411C4 8FB10034 */ lw $s1, 0x34($sp) -/* D7DD18 802411C8 8FB00030 */ lw $s0, 0x30($sp) -/* D7DD1C 802411CC 03E00008 */ jr $ra -/* D7DD20 802411D0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_pra/pra_29/func_802411D4_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/func_802411D4_D7CB50.s deleted file mode 100644 index ecf52834cd..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/func_802411D4_D7CB50.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411D4_D7DD24 -/* D7DD24 802411D4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D7DD28 802411D8 AFB1001C */ sw $s1, 0x1c($sp) -/* D7DD2C 802411DC 0080882D */ daddu $s1, $a0, $zero -/* D7DD30 802411E0 AFBF0024 */ sw $ra, 0x24($sp) -/* D7DD34 802411E4 AFB20020 */ sw $s2, 0x20($sp) -/* D7DD38 802411E8 AFB00018 */ sw $s0, 0x18($sp) -/* D7DD3C 802411EC 8E30000C */ lw $s0, 0xc($s1) -/* D7DD40 802411F0 8E050000 */ lw $a1, ($s0) -/* D7DD44 802411F4 0C0B1EAF */ jal get_variable -/* D7DD48 802411F8 26100004 */ addiu $s0, $s0, 4 -/* D7DD4C 802411FC 8E050000 */ lw $a1, ($s0) -/* D7DD50 80241200 26100004 */ addiu $s0, $s0, 4 -/* D7DD54 80241204 0220202D */ daddu $a0, $s1, $zero -/* D7DD58 80241208 0C0B1EAF */ jal get_variable -/* D7DD5C 8024120C 0040902D */ daddu $s2, $v0, $zero -/* D7DD60 80241210 0220202D */ daddu $a0, $s1, $zero -/* D7DD64 80241214 8E050000 */ lw $a1, ($s0) -/* D7DD68 80241218 0C0B1EAF */ jal get_variable -/* D7DD6C 8024121C 0040802D */ daddu $s0, $v0, $zero -/* D7DD70 80241220 44920000 */ mtc1 $s2, $f0 -/* D7DD74 80241224 00000000 */ nop -/* D7DD78 80241228 46800020 */ cvt.s.w $f0, $f0 -/* D7DD7C 8024122C 44050000 */ mfc1 $a1, $f0 -/* D7DD80 80241230 44900000 */ mtc1 $s0, $f0 -/* D7DD84 80241234 00000000 */ nop -/* D7DD88 80241238 46800020 */ cvt.s.w $f0, $f0 -/* D7DD8C 8024123C 44060000 */ mfc1 $a2, $f0 -/* D7DD90 80241240 44820000 */ mtc1 $v0, $f0 -/* D7DD94 80241244 00000000 */ nop -/* D7DD98 80241248 46800020 */ cvt.s.w $f0, $f0 -/* D7DD9C 8024124C 44070000 */ mfc1 $a3, $f0 -/* D7DDA0 80241250 0000202D */ daddu $a0, $zero, $zero -/* D7DDA4 80241254 0C01C16C */ jal func_800705B0 -/* D7DDA8 80241258 AFA00010 */ sw $zero, 0x10($sp) -/* D7DDAC 8024125C 8FBF0024 */ lw $ra, 0x24($sp) -/* D7DDB0 80241260 8FB20020 */ lw $s2, 0x20($sp) -/* D7DDB4 80241264 8FB1001C */ lw $s1, 0x1c($sp) -/* D7DDB8 80241268 8FB00018 */ lw $s0, 0x18($sp) -/* D7DDBC 8024126C 24020002 */ addiu $v0, $zero, 2 -/* D7DDC0 80241270 03E00008 */ jr $ra -/* D7DDC4 80241274 27BD0028 */ addiu $sp, $sp, 0x28 -/* D7DDC8 80241278 00000000 */ nop -/* D7DDCC 8024127C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_31/delete_actor_D7ED60.s b/asm/nonmatchings/world/area_pra/pra_31/delete_actor_D7ED60.s deleted file mode 100644 index 4b0d41a8d0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/delete_actor_D7ED60.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel delete_actor_D7F91C -/* D7F91C 80240BBC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7F920 80240BC0 AFB10014 */ sw $s1, 0x14($sp) -/* D7F924 80240BC4 0080882D */ daddu $s1, $a0, $zero -/* D7F928 80240BC8 AFBF0018 */ sw $ra, 0x18($sp) -/* D7F92C 80240BCC AFB00010 */ sw $s0, 0x10($sp) -/* D7F930 80240BD0 8E22000C */ lw $v0, 0xc($s1) -/* D7F934 80240BD4 0C0B1EAF */ jal get_variable -/* D7F938 80240BD8 8C450000 */ lw $a1, ($v0) -/* D7F93C 80240BDC 0220202D */ daddu $a0, $s1, $zero -/* D7F940 80240BE0 3C05FD05 */ lui $a1, 0xfd05 -/* D7F944 80240BE4 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7F948 80240BE8 0C0B1EAF */ jal get_variable -/* D7F94C 80240BEC 0040802D */ daddu $s0, $v0, $zero -/* D7F950 80240BF0 00101840 */ sll $v1, $s0, 1 -/* D7F954 80240BF4 00701821 */ addu $v1, $v1, $s0 -/* D7F958 80240BF8 000318C0 */ sll $v1, $v1, 3 -/* D7F95C 80240BFC 00431021 */ addu $v0, $v0, $v1 -/* D7F960 80240C00 C4400014 */ lwc1 $f0, 0x14($v0) -/* D7F964 80240C04 2402005A */ addiu $v0, $zero, 0x5a -/* D7F968 80240C08 4600008D */ trunc.w.s $f2, $f0 -/* D7F96C 80240C0C 44031000 */ mfc1 $v1, $f2 -/* D7F970 80240C10 00000000 */ nop -/* D7F974 80240C14 1062000F */ beq $v1, $v0, .L80240C54 -/* D7F978 80240C18 2862005B */ slti $v0, $v1, 0x5b -/* D7F97C 80240C1C 10400005 */ beqz $v0, .L80240C34 -/* D7F980 80240C20 240200B4 */ addiu $v0, $zero, 0xb4 -/* D7F984 80240C24 5060000C */ beql $v1, $zero, .L80240C58 -/* D7F988 80240C28 AE220084 */ sw $v0, 0x84($s1) -/* D7F98C 80240C2C 08090316 */ j .L80240C58 -/* D7F990 80240C30 00000000 */ nop -.L80240C34: -/* D7F994 80240C34 10620005 */ beq $v1, $v0, .L80240C4C -/* D7F998 80240C38 2402010E */ addiu $v0, $zero, 0x10e -/* D7F99C 80240C3C 50620006 */ beql $v1, $v0, .L80240C58 -/* D7F9A0 80240C40 AE230084 */ sw $v1, 0x84($s1) -/* D7F9A4 80240C44 08090316 */ j .L80240C58 -/* D7F9A8 80240C48 00000000 */ nop -.L80240C4C: -/* D7F9AC 80240C4C 08090316 */ j .L80240C58 -/* D7F9B0 80240C50 AE200084 */ sw $zero, 0x84($s1) -.L80240C54: -/* D7F9B4 80240C54 AE230084 */ sw $v1, 0x84($s1) -.L80240C58: -/* D7F9B8 80240C58 8FBF0018 */ lw $ra, 0x18($sp) -/* D7F9BC 80240C5C 8FB10014 */ lw $s1, 0x14($sp) -/* D7F9C0 80240C60 8FB00010 */ lw $s0, 0x10($sp) -/* D7F9C4 80240C64 24020002 */ addiu $v0, $zero, 2 -/* D7F9C8 80240C68 03E00008 */ jr $ra -/* D7F9CC 80240C6C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_31/func_80240020_D7ED60.s b/asm/nonmatchings/world/area_pra/pra_31/func_80240020_D7ED60.s deleted file mode 100644 index d03dfbb14e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/func_80240020_D7ED60.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D7ED80 -/* D7ED80 80240020 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7ED84 80240024 AFB10014 */ sw $s1, 0x14($sp) -/* D7ED88 80240028 0080882D */ daddu $s1, $a0, $zero -/* D7ED8C 8024002C AFBF0018 */ sw $ra, 0x18($sp) -/* D7ED90 80240030 AFB00010 */ sw $s0, 0x10($sp) -/* D7ED94 80240034 8E30000C */ lw $s0, 0xc($s1) -/* D7ED98 80240038 8E050000 */ lw $a1, ($s0) -/* D7ED9C 8024003C 0C0B1EAF */ jal get_variable -/* D7EDA0 80240040 26100004 */ addiu $s0, $s0, 4 -/* D7EDA4 80240044 0C00EAD2 */ jal get_npc_safe -/* D7EDA8 80240048 0040202D */ daddu $a0, $v0, $zero -/* D7EDAC 8024004C 10400005 */ beqz $v0, .L80240064 -/* D7EDB0 80240050 00000000 */ nop -/* D7EDB4 80240054 8E050000 */ lw $a1, ($s0) -/* D7EDB8 80240058 844600A8 */ lh $a2, 0xa8($v0) -/* D7EDBC 8024005C 0C0B2026 */ jal set_variable -/* D7EDC0 80240060 0220202D */ daddu $a0, $s1, $zero -.L80240064: -/* D7EDC4 80240064 8FBF0018 */ lw $ra, 0x18($sp) -/* D7EDC8 80240068 8FB10014 */ lw $s1, 0x14($sp) -/* D7EDCC 8024006C 8FB00010 */ lw $s0, 0x10($sp) -/* D7EDD0 80240070 24020002 */ addiu $v0, $zero, 2 -/* D7EDD4 80240074 03E00008 */ jr $ra -/* D7EDD8 80240078 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_31/func_8024007C_D7ED60.s b/asm/nonmatchings/world/area_pra/pra_31/func_8024007C_D7ED60.s deleted file mode 100644 index 98283a1fad..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/func_8024007C_D7ED60.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024007C_D7EDDC -/* D7EDDC 8024007C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D7EDE0 80240080 AFB10014 */ sw $s1, 0x14($sp) -/* D7EDE4 80240084 0080882D */ daddu $s1, $a0, $zero -/* D7EDE8 80240088 AFBF0024 */ sw $ra, 0x24($sp) -/* D7EDEC 8024008C AFB40020 */ sw $s4, 0x20($sp) -/* D7EDF0 80240090 AFB3001C */ sw $s3, 0x1c($sp) -/* D7EDF4 80240094 AFB20018 */ sw $s2, 0x18($sp) -/* D7EDF8 80240098 AFB00010 */ sw $s0, 0x10($sp) -/* D7EDFC 8024009C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* D7EE00 802400A0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* D7EE04 802400A4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* D7EE08 802400A8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* D7EE0C 802400AC F7B40028 */ sdc1 $f20, 0x28($sp) -/* D7EE10 802400B0 8E30000C */ lw $s0, 0xc($s1) -/* D7EE14 802400B4 8E130000 */ lw $s3, ($s0) -/* D7EE18 802400B8 26100004 */ addiu $s0, $s0, 4 -/* D7EE1C 802400BC 0C0B1EAF */ jal get_variable -/* D7EE20 802400C0 0260282D */ daddu $a1, $s3, $zero -/* D7EE24 802400C4 4482E000 */ mtc1 $v0, $f28 -/* D7EE28 802400C8 00000000 */ nop -/* D7EE2C 802400CC 4680E720 */ cvt.s.w $f28, $f28 -/* D7EE30 802400D0 8E140000 */ lw $s4, ($s0) -/* D7EE34 802400D4 26100004 */ addiu $s0, $s0, 4 -/* D7EE38 802400D8 0220202D */ daddu $a0, $s1, $zero -/* D7EE3C 802400DC 0C0B1EAF */ jal get_variable -/* D7EE40 802400E0 0280282D */ daddu $a1, $s4, $zero -/* D7EE44 802400E4 4482D000 */ mtc1 $v0, $f26 -/* D7EE48 802400E8 00000000 */ nop -/* D7EE4C 802400EC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D7EE50 802400F0 8E100000 */ lw $s0, ($s0) -/* D7EE54 802400F4 0220202D */ daddu $a0, $s1, $zero -/* D7EE58 802400F8 0C0B1EAF */ jal get_variable -/* D7EE5C 802400FC 0200282D */ daddu $a1, $s0, $zero -/* D7EE60 80240100 4482C000 */ mtc1 $v0, $f24 -/* D7EE64 80240104 00000000 */ nop -/* D7EE68 80240108 4680C620 */ cvt.s.w $f24, $f24 -/* D7EE6C 8024010C 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* D7EE70 80240110 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* D7EE74 80240114 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D7EE78 80240118 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D7EE7C 8024011C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* D7EE80 80240120 44800000 */ mtc1 $zero, $f0 -/* D7EE84 80240124 00031080 */ sll $v0, $v1, 2 -/* D7EE88 80240128 00431021 */ addu $v0, $v0, $v1 -/* D7EE8C 8024012C 00021080 */ sll $v0, $v0, 2 -/* D7EE90 80240130 00431023 */ subu $v0, $v0, $v1 -/* D7EE94 80240134 000218C0 */ sll $v1, $v0, 3 -/* D7EE98 80240138 00431021 */ addu $v0, $v0, $v1 -/* D7EE9C 8024013C 000210C0 */ sll $v0, $v0, 3 -/* D7EEA0 80240140 46001032 */ c.eq.s $f2, $f0 -/* D7EEA4 80240144 3C01800B */ lui $at, 0x800b -/* D7EEA8 80240148 00220821 */ addu $at, $at, $v0 -/* D7EEAC 8024014C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D7EEB0 80240150 45000005 */ bc1f .L80240168 -/* D7EEB4 80240154 00000000 */ nop -/* D7EEB8 80240158 3C0142C8 */ lui $at, 0x42c8 -/* D7EEBC 8024015C 44810000 */ mtc1 $at, $f0 -/* D7EEC0 80240160 0809005E */ j .L80240178 -/* D7EEC4 80240164 4600B581 */ sub.s $f22, $f22, $f0 -.L80240168: -/* D7EEC8 80240168 3C0142C8 */ lui $at, 0x42c8 -/* D7EECC 8024016C 44810000 */ mtc1 $at, $f0 -/* D7EED0 80240170 00000000 */ nop -/* D7EED4 80240174 4600B580 */ add.s $f22, $f22, $f0 -.L80240178: -/* D7EED8 80240178 0C00A6C9 */ jal clamp_angle -/* D7EEDC 8024017C 4600B306 */ mov.s $f12, $f22 -/* D7EEE0 80240180 46000586 */ mov.s $f22, $f0 -/* D7EEE4 80240184 3C014170 */ lui $at, 0x4170 -/* D7EEE8 80240188 4481A000 */ mtc1 $at, $f20 -/* D7EEEC 8024018C 0C00A8BB */ jal sin_deg -/* D7EEF0 80240190 4600B306 */ mov.s $f12, $f22 -/* D7EEF4 80240194 46140002 */ mul.s $f0, $f0, $f20 -/* D7EEF8 80240198 00000000 */ nop -/* D7EEFC 8024019C 864200B0 */ lh $v0, 0xb0($s2) -/* D7EF00 802401A0 3C013F00 */ lui $at, 0x3f00 -/* D7EF04 802401A4 44812000 */ mtc1 $at, $f4 -/* D7EF08 802401A8 44821000 */ mtc1 $v0, $f2 -/* D7EF0C 802401AC 00000000 */ nop -/* D7EF10 802401B0 468010A0 */ cvt.s.w $f2, $f2 -/* D7EF14 802401B4 46041082 */ mul.s $f2, $f2, $f4 -/* D7EF18 802401B8 00000000 */ nop -/* D7EF1C 802401BC 4600E700 */ add.s $f28, $f28, $f0 -/* D7EF20 802401C0 4602D680 */ add.s $f26, $f26, $f2 -/* D7EF24 802401C4 0C00A8D4 */ jal cos_deg -/* D7EF28 802401C8 4600B306 */ mov.s $f12, $f22 -/* D7EF2C 802401CC 46140002 */ mul.s $f0, $f0, $f20 -/* D7EF30 802401D0 00000000 */ nop -/* D7EF34 802401D4 0220202D */ daddu $a0, $s1, $zero -/* D7EF38 802401D8 0260282D */ daddu $a1, $s3, $zero -/* D7EF3C 802401DC 4600E18D */ trunc.w.s $f6, $f28 -/* D7EF40 802401E0 44063000 */ mfc1 $a2, $f6 -/* D7EF44 802401E4 0C0B2026 */ jal set_variable -/* D7EF48 802401E8 4600C601 */ sub.s $f24, $f24, $f0 -/* D7EF4C 802401EC 0220202D */ daddu $a0, $s1, $zero -/* D7EF50 802401F0 4600D18D */ trunc.w.s $f6, $f26 -/* D7EF54 802401F4 44063000 */ mfc1 $a2, $f6 -/* D7EF58 802401F8 0C0B2026 */ jal set_variable -/* D7EF5C 802401FC 0280282D */ daddu $a1, $s4, $zero -/* D7EF60 80240200 0220202D */ daddu $a0, $s1, $zero -/* D7EF64 80240204 4600C18D */ trunc.w.s $f6, $f24 -/* D7EF68 80240208 44063000 */ mfc1 $a2, $f6 -/* D7EF6C 8024020C 0C0B2026 */ jal set_variable -/* D7EF70 80240210 0200282D */ daddu $a1, $s0, $zero -/* D7EF74 80240214 8FBF0024 */ lw $ra, 0x24($sp) -/* D7EF78 80240218 8FB40020 */ lw $s4, 0x20($sp) -/* D7EF7C 8024021C 8FB3001C */ lw $s3, 0x1c($sp) -/* D7EF80 80240220 8FB20018 */ lw $s2, 0x18($sp) -/* D7EF84 80240224 8FB10014 */ lw $s1, 0x14($sp) -/* D7EF88 80240228 8FB00010 */ lw $s0, 0x10($sp) -/* D7EF8C 8024022C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* D7EF90 80240230 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* D7EF94 80240234 D7B80038 */ ldc1 $f24, 0x38($sp) -/* D7EF98 80240238 D7B60030 */ ldc1 $f22, 0x30($sp) -/* D7EF9C 8024023C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D7EFA0 80240240 24020002 */ addiu $v0, $zero, 2 -/* D7EFA4 80240244 03E00008 */ jr $ra -/* D7EFA8 80240248 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_31/func_8024024C_D7ED60.s b/asm/nonmatchings/world/area_pra/pra_31/func_8024024C_D7ED60.s deleted file mode 100644 index 20749badc0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/func_8024024C_D7ED60.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024024C_D7EFAC -/* D7EFAC 8024024C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7EFB0 80240250 AFBF0010 */ sw $ra, 0x10($sp) -/* D7EFB4 80240254 10A00003 */ beqz $a1, .L80240264 -/* D7EFB8 80240258 8C86000C */ lw $a2, 0xc($a0) -/* D7EFBC 8024025C 3C018024 */ lui $at, 0x8024 -/* D7EFC0 80240260 AC20119C */ sw $zero, 0x119c($at) -.L80240264: -/* D7EFC4 80240264 3C038024 */ lui $v1, 0x8024 -/* D7EFC8 80240268 2463119C */ addiu $v1, $v1, 0x119c -/* D7EFCC 8024026C 8C620000 */ lw $v0, ($v1) -/* D7EFD0 80240270 54400003 */ bnel $v0, $zero, .L80240280 -/* D7EFD4 80240274 AC600000 */ sw $zero, ($v1) -/* D7EFD8 80240278 080900A5 */ j .L80240294 -/* D7EFDC 8024027C 0000102D */ daddu $v0, $zero, $zero -.L80240280: -/* D7EFE0 80240280 8CC50000 */ lw $a1, ($a2) -/* D7EFE4 80240284 3C068024 */ lui $a2, 0x8024 -/* D7EFE8 80240288 0C0B2026 */ jal set_variable -/* D7EFEC 8024028C 8CC611A0 */ lw $a2, 0x11a0($a2) -/* D7EFF0 80240290 24020002 */ addiu $v0, $zero, 2 -.L80240294: -/* D7EFF4 80240294 8FBF0010 */ lw $ra, 0x10($sp) -/* D7EFF8 80240298 03E00008 */ jr $ra -/* D7EFFC 8024029C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_31/func_802402A0_D7ED60.s b/asm/nonmatchings/world/area_pra/pra_31/func_802402A0_D7ED60.s deleted file mode 100644 index c507d467c6..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/func_802402A0_D7ED60.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402A0_D7F000 -/* D7F000 802402A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7F004 802402A4 AFBF0010 */ sw $ra, 0x10($sp) -/* D7F008 802402A8 8C82000C */ lw $v0, 0xc($a0) -/* D7F00C 802402AC 0C0B1EAF */ jal get_variable -/* D7F010 802402B0 8C450000 */ lw $a1, ($v0) -/* D7F014 802402B4 3C018024 */ lui $at, 0x8024 -/* D7F018 802402B8 AC2211A0 */ sw $v0, 0x11a0($at) -/* D7F01C 802402BC 24020002 */ addiu $v0, $zero, 2 -/* D7F020 802402C0 8FBF0010 */ lw $ra, 0x10($sp) -/* D7F024 802402C4 24030001 */ addiu $v1, $zero, 1 -/* D7F028 802402C8 3C018024 */ lui $at, 0x8024 -/* D7F02C 802402CC AC23119C */ sw $v1, 0x119c($at) -/* D7F030 802402D0 03E00008 */ jr $ra -/* D7F034 802402D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_31/func_80240374_D7ED60.s b/asm/nonmatchings/world/area_pra/pra_31/func_80240374_D7ED60.s deleted file mode 100644 index 7e9cbf9b0d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/func_80240374_D7ED60.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240374_D7F0D4 -/* D7F0D4 80240374 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7F0D8 80240378 AFBF0010 */ sw $ra, 0x10($sp) -/* D7F0DC 8024037C 8C82000C */ lw $v0, 0xc($a0) -/* D7F0E0 80240380 0C0B1EAF */ jal get_variable -/* D7F0E4 80240384 8C450000 */ lw $a1, ($v0) -/* D7F0E8 80240388 0040182D */ daddu $v1, $v0, $zero -/* D7F0EC 8024038C 10600012 */ beqz $v1, .L802403D8 -/* D7F0F0 80240390 0000202D */ daddu $a0, $zero, $zero -/* D7F0F4 80240394 8C620000 */ lw $v0, ($v1) -/* D7F0F8 80240398 5040000A */ beql $v0, $zero, .L802403C4 -/* D7F0FC 8024039C 00041080 */ sll $v0, $a0, 2 -/* D7F100 802403A0 3C058024 */ lui $a1, 0x8024 -/* D7F104 802403A4 24A57E68 */ addiu $a1, $a1, 0x7e68 -.L802403A8: -/* D7F108 802403A8 24630004 */ addiu $v1, $v1, 4 -/* D7F10C 802403AC 24840001 */ addiu $a0, $a0, 1 -/* D7F110 802403B0 ACA20000 */ sw $v0, ($a1) -/* D7F114 802403B4 8C620000 */ lw $v0, ($v1) -/* D7F118 802403B8 1440FFFB */ bnez $v0, .L802403A8 -/* D7F11C 802403BC 24A50004 */ addiu $a1, $a1, 4 -/* D7F120 802403C0 00041080 */ sll $v0, $a0, 2 -.L802403C4: -/* D7F124 802403C4 3C018024 */ lui $at, 0x8024 -/* D7F128 802403C8 00220821 */ addu $at, $at, $v0 -/* D7F12C 802403CC AC207E68 */ sw $zero, 0x7e68($at) -/* D7F130 802403D0 08090100 */ j .L80240400 -/* D7F134 802403D4 00000000 */ nop -.L802403D8: -/* D7F138 802403D8 3C038024 */ lui $v1, 0x8024 -/* D7F13C 802403DC 24637E68 */ addiu $v1, $v1, 0x7e68 -/* D7F140 802403E0 0060282D */ daddu $a1, $v1, $zero -.L802403E4: -/* D7F144 802403E4 24820080 */ addiu $v0, $a0, 0x80 -/* D7F148 802403E8 AC620000 */ sw $v0, ($v1) -/* D7F14C 802403EC 24630004 */ addiu $v1, $v1, 4 -/* D7F150 802403F0 24840001 */ addiu $a0, $a0, 1 -/* D7F154 802403F4 2882005B */ slti $v0, $a0, 0x5b -/* D7F158 802403F8 1440FFFA */ bnez $v0, .L802403E4 -/* D7F15C 802403FC ACA0016C */ sw $zero, 0x16c($a1) -.L80240400: -/* D7F160 80240400 8FBF0010 */ lw $ra, 0x10($sp) -/* D7F164 80240404 24020002 */ addiu $v0, $zero, 2 -/* D7F168 80240408 03E00008 */ jr $ra -/* D7F16C 8024040C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_31/func_80240410_D7ED60.s b/asm/nonmatchings/world/area_pra/pra_31/func_80240410_D7ED60.s deleted file mode 100644 index aa7afec0dd..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/func_80240410_D7ED60.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240410_D7F170 -/* D7F170 80240410 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7F174 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* D7F178 80240418 0080802D */ daddu $s0, $a0, $zero -/* D7F17C 8024041C AFBF0014 */ sw $ra, 0x14($sp) -/* D7F180 80240420 0C00EAD2 */ jal get_npc_safe -/* D7F184 80240424 8E04014C */ lw $a0, 0x14c($s0) -/* D7F188 80240428 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* D7F18C 8024042C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* D7F190 80240430 C44C0038 */ lwc1 $f12, 0x38($v0) -/* D7F194 80240434 C44E0040 */ lwc1 $f14, 0x40($v0) -/* D7F198 80240438 8C660028 */ lw $a2, 0x28($v1) -/* D7F19C 8024043C 0C00A720 */ jal atan2 -/* D7F1A0 80240440 8C670030 */ lw $a3, 0x30($v1) -/* D7F1A4 80240444 0C00A6C9 */ jal clamp_angle -/* D7F1A8 80240448 46000306 */ mov.s $f12, $f0 -/* D7F1AC 8024044C 4600008D */ trunc.w.s $f2, $f0 -/* D7F1B0 80240450 E6020084 */ swc1 $f2, 0x84($s0) -/* D7F1B4 80240454 8FBF0014 */ lw $ra, 0x14($sp) -/* D7F1B8 80240458 8FB00010 */ lw $s0, 0x10($sp) -/* D7F1BC 8024045C 24020002 */ addiu $v0, $zero, 2 -/* D7F1C0 80240460 03E00008 */ jr $ra -/* D7F1C4 80240464 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_31/func_80240468_D7ED60.s b/asm/nonmatchings/world/area_pra/pra_31/func_80240468_D7ED60.s deleted file mode 100644 index 31ba28cb2c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/func_80240468_D7ED60.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240468_D7F1C8 -/* D7F1C8 80240468 8C820084 */ lw $v0, 0x84($a0) -/* D7F1CC 8024046C 2442005A */ addiu $v0, $v0, 0x5a -/* D7F1D0 80240470 AC82009C */ sw $v0, 0x9c($a0) -/* D7F1D4 80240474 8C820098 */ lw $v0, 0x98($a0) -/* D7F1D8 80240478 8C83009C */ lw $v1, 0x9c($a0) -/* D7F1DC 8024047C 2442005A */ addiu $v0, $v0, 0x5a -/* D7F1E0 80240480 00621823 */ subu $v1, $v1, $v0 -/* D7F1E4 80240484 04620001 */ bltzl $v1, .L8024048C -/* D7F1E8 80240488 00031823 */ negu $v1, $v1 -.L8024048C: -/* D7F1EC 8024048C AC8200A0 */ sw $v0, 0xa0($a0) -/* D7F1F0 80240490 2402010E */ addiu $v0, $zero, 0x10e -/* D7F1F4 80240494 1462000C */ bne $v1, $v0, .L802404C8 -/* D7F1F8 80240498 AC8300A4 */ sw $v1, 0xa4($a0) -/* D7F1FC 8024049C 8C85009C */ lw $a1, 0x9c($a0) -/* D7F200 802404A0 8C8300A0 */ lw $v1, 0xa0($a0) -/* D7F204 802404A4 2402005A */ addiu $v0, $zero, 0x5a -/* D7F208 802404A8 AC8200A4 */ sw $v0, 0xa4($a0) -/* D7F20C 802404AC 0065102A */ slt $v0, $v1, $a1 -/* D7F210 802404B0 50400004 */ beql $v0, $zero, .L802404C4 -/* D7F214 802404B4 2462FE98 */ addiu $v0, $v1, -0x168 -/* D7F218 802404B8 24A2FE98 */ addiu $v0, $a1, -0x168 -/* D7F21C 802404BC 08090132 */ j .L802404C8 -/* D7F220 802404C0 AC82009C */ sw $v0, 0x9c($a0) -.L802404C4: -/* D7F224 802404C4 AC8200A0 */ sw $v0, 0xa0($a0) -.L802404C8: -/* D7F228 802404C8 3C03B60B */ lui $v1, 0xb60b -/* D7F22C 802404CC 8C8200A4 */ lw $v0, 0xa4($a0) -/* D7F230 802404D0 346360B7 */ ori $v1, $v1, 0x60b7 -/* D7F234 802404D4 00430018 */ mult $v0, $v1 -/* D7F238 802404D8 00003010 */ mfhi $a2 -/* D7F23C 802404DC 00C21821 */ addu $v1, $a2, $v0 -/* D7F240 802404E0 00031983 */ sra $v1, $v1, 6 -/* D7F244 802404E4 000217C3 */ sra $v0, $v0, 0x1f -/* D7F248 802404E8 00621823 */ subu $v1, $v1, $v0 -/* D7F24C 802404EC 00031080 */ sll $v0, $v1, 2 -/* D7F250 802404F0 00431021 */ addu $v0, $v0, $v1 -/* D7F254 802404F4 00021080 */ sll $v0, $v0, 2 -/* D7F258 802404F8 AC8200A4 */ sw $v0, 0xa4($a0) -/* D7F25C 802404FC 03E00008 */ jr $ra -/* D7F260 80240500 24020002 */ addiu $v0, $zero, 2 -/* D7F264 80240504 00000000 */ nop -/* D7F268 80240508 00000000 */ nop -/* D7F26C 8024050C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_31/func_80240510_D7ED60.s b/asm/nonmatchings/world/area_pra/pra_31/func_80240510_D7ED60.s deleted file mode 100644 index e07e610937..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/func_80240510_D7ED60.s +++ /dev/null @@ -1,214 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240510_D7F270 -/* D7F270 80240510 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7F274 80240514 AFB10014 */ sw $s1, 0x14($sp) -/* D7F278 80240518 0080882D */ daddu $s1, $a0, $zero -/* D7F27C 8024051C AFBF0018 */ sw $ra, 0x18($sp) -/* D7F280 80240520 10A0006B */ beqz $a1, .L802406D0 -/* D7F284 80240524 AFB00010 */ sw $s0, 0x10($sp) -/* D7F288 80240528 0C00AB39 */ jal heap_malloc -/* D7F28C 8024052C 24040080 */ addiu $a0, $zero, 0x80 -/* D7F290 80240530 0040802D */ daddu $s0, $v0, $zero -/* D7F294 80240534 0220202D */ daddu $a0, $s1, $zero -/* D7F298 80240538 3C05FD05 */ lui $a1, 0xfd05 -/* D7F29C 8024053C 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7F2A0 80240540 0C0B2026 */ jal set_variable -/* D7F2A4 80240544 0200302D */ daddu $a2, $s0, $zero -/* D7F2A8 80240548 0220202D */ daddu $a0, $s1, $zero -/* D7F2AC 8024054C 3C05F5DE */ lui $a1, 0xf5de -/* D7F2B0 80240550 0C0B1EAF */ jal get_variable -/* D7F2B4 80240554 34A50180 */ ori $a1, $a1, 0x180 -/* D7F2B8 80240558 0040282D */ daddu $a1, $v0, $zero -/* D7F2BC 8024055C 0000382D */ daddu $a3, $zero, $zero -/* D7F2C0 80240560 00E0202D */ daddu $a0, $a3, $zero -.L80240564: -/* D7F2C4 80240564 0000302D */ daddu $a2, $zero, $zero -/* D7F2C8 80240568 0080182D */ daddu $v1, $a0, $zero -.L8024056C: -/* D7F2CC 8024056C 02031021 */ addu $v0, $s0, $v1 -/* D7F2D0 80240570 A4400048 */ sh $zero, 0x48($v0) -/* D7F2D4 80240574 24C60001 */ addiu $a2, $a2, 1 -/* D7F2D8 80240578 28C20009 */ slti $v0, $a2, 9 -/* D7F2DC 8024057C 1440FFFB */ bnez $v0, .L8024056C -/* D7F2E0 80240580 24630002 */ addiu $v1, $v1, 2 -/* D7F2E4 80240584 24E70001 */ addiu $a3, $a3, 1 -/* D7F2E8 80240588 28E20003 */ slti $v0, $a3, 3 -/* D7F2EC 8024058C 1440FFF5 */ bnez $v0, .L80240564 -/* D7F2F0 80240590 24840012 */ addiu $a0, $a0, 0x12 -/* D7F2F4 80240594 0000302D */ daddu $a2, $zero, $zero -/* D7F2F8 80240598 0200382D */ daddu $a3, $s0, $zero -/* D7F2FC 8024059C 28AA0055 */ slti $t2, $a1, 0x55 -/* D7F300 802405A0 240BFFFF */ addiu $t3, $zero, -1 -/* D7F304 802405A4 26050002 */ addiu $a1, $s0, 2 -/* D7F308 802405A8 3C098024 */ lui $t1, 0x8024 -/* D7F30C 802405AC 25292514 */ addiu $t1, $t1, 0x2514 -/* D7F310 802405B0 3C088024 */ lui $t0, 0x8024 -/* D7F314 802405B4 250824F0 */ addiu $t0, $t0, 0x24f0 -.L802405B8: -/* D7F318 802405B8 11400009 */ beqz $t2, .L802405E0 -/* D7F31C 802405BC 00000000 */ nop -/* D7F320 802405C0 95020002 */ lhu $v0, 2($t0) -/* D7F324 802405C4 A4E20000 */ sh $v0, ($a3) -/* D7F328 802405C8 95020006 */ lhu $v0, 6($t0) -/* D7F32C 802405CC A4A20000 */ sh $v0, ($a1) -/* D7F330 802405D0 C5000008 */ lwc1 $f0, 8($t0) -/* D7F334 802405D4 46800020 */ cvt.s.w $f0, $f0 -/* D7F338 802405D8 0809017F */ j .L802405FC -/* D7F33C 802405DC E4A00012 */ swc1 $f0, 0x12($a1) -.L802405E0: -/* D7F340 802405E0 95220002 */ lhu $v0, 2($t1) -/* D7F344 802405E4 A4E20000 */ sh $v0, ($a3) -/* D7F348 802405E8 95220006 */ lhu $v0, 6($t1) -/* D7F34C 802405EC A4A20000 */ sh $v0, ($a1) -/* D7F350 802405F0 C5200008 */ lwc1 $f0, 8($t1) -/* D7F354 802405F4 46800020 */ cvt.s.w $f0, $f0 -/* D7F358 802405F8 E4A00012 */ swc1 $f0, 0x12($a1) -.L802405FC: -/* D7F35C 802405FC 2529000C */ addiu $t1, $t1, 0xc -/* D7F360 80240600 2508000C */ addiu $t0, $t0, 0xc -/* D7F364 80240604 84E30000 */ lh $v1, ($a3) -/* D7F368 80240608 24C60001 */ addiu $a2, $a2, 1 -/* D7F36C 8024060C 00031040 */ sll $v0, $v1, 1 -/* D7F370 80240610 00431021 */ addu $v0, $v0, $v1 -/* D7F374 80240614 000210C0 */ sll $v0, $v0, 3 -/* D7F378 80240618 00431021 */ addu $v0, $v0, $v1 -/* D7F37C 8024061C 00021040 */ sll $v0, $v0, 1 -/* D7F380 80240620 24420032 */ addiu $v0, $v0, 0x32 -/* D7F384 80240624 84A30000 */ lh $v1, ($a1) -/* D7F388 80240628 44820000 */ mtc1 $v0, $f0 -/* D7F38C 8024062C 00000000 */ nop -/* D7F390 80240630 46800020 */ cvt.s.w $f0, $f0 -/* D7F394 80240634 E4A0000A */ swc1 $f0, 0xa($a1) -/* D7F398 80240638 E4A00002 */ swc1 $f0, 2($a1) -/* D7F39C 8024063C 00031040 */ sll $v0, $v1, 1 -/* D7F3A0 80240640 00431021 */ addu $v0, $v0, $v1 -/* D7F3A4 80240644 000210C0 */ sll $v0, $v0, 3 -/* D7F3A8 80240648 00431021 */ addu $v0, $v0, $v1 -/* D7F3AC 8024064C 00021040 */ sll $v0, $v0, 1 -/* D7F3B0 80240650 2442004B */ addiu $v0, $v0, 0x4b -/* D7F3B4 80240654 44820000 */ mtc1 $v0, $f0 -/* D7F3B8 80240658 00000000 */ nop -/* D7F3BC 8024065C 46800020 */ cvt.s.w $f0, $f0 -/* D7F3C0 80240660 E4A0000E */ swc1 $f0, 0xe($a1) -/* D7F3C4 80240664 E4A00006 */ swc1 $f0, 6($a1) -/* D7F3C8 80240668 24A50018 */ addiu $a1, $a1, 0x18 -/* D7F3CC 8024066C 84E40000 */ lh $a0, ($a3) -/* D7F3D0 80240670 000310C0 */ sll $v0, $v1, 3 -/* D7F3D4 80240674 00431021 */ addu $v0, $v0, $v1 -/* D7F3D8 80240678 00441021 */ addu $v0, $v0, $a0 -/* D7F3DC 8024067C 00021040 */ sll $v0, $v0, 1 -/* D7F3E0 80240680 02021021 */ addu $v0, $s0, $v0 -/* D7F3E4 80240684 A44B0048 */ sh $t3, 0x48($v0) -/* D7F3E8 80240688 28C20003 */ slti $v0, $a2, 3 -/* D7F3EC 8024068C 1440FFCA */ bnez $v0, .L802405B8 -/* D7F3F0 80240690 24E70018 */ addiu $a3, $a3, 0x18 -/* D7F3F4 80240694 0220202D */ daddu $a0, $s1, $zero -/* D7F3F8 80240698 3C05FD05 */ lui $a1, 0xfd05 -/* D7F3FC 8024069C 34A50F83 */ ori $a1, $a1, 0xf83 -/* D7F400 802406A0 0C0B2026 */ jal set_variable -/* D7F404 802406A4 2406010E */ addiu $a2, $zero, 0x10e -/* D7F408 802406A8 0220202D */ daddu $a0, $s1, $zero -/* D7F40C 802406AC 3C05FD05 */ lui $a1, 0xfd05 -/* D7F410 802406B0 34A50F84 */ ori $a1, $a1, 0xf84 -/* D7F414 802406B4 0C0B2026 */ jal set_variable -/* D7F418 802406B8 2406010E */ addiu $a2, $zero, 0x10e -/* D7F41C 802406BC 0220202D */ daddu $a0, $s1, $zero -/* D7F420 802406C0 3C05FD05 */ lui $a1, 0xfd05 -/* D7F424 802406C4 34A50F85 */ ori $a1, $a1, 0xf85 -/* D7F428 802406C8 0C0B2026 */ jal set_variable -/* D7F42C 802406CC 2406010E */ addiu $a2, $zero, 0x10e -.L802406D0: -/* D7F430 802406D0 0220202D */ daddu $a0, $s1, $zero -/* D7F434 802406D4 3C05FD05 */ lui $a1, 0xfd05 -/* D7F438 802406D8 0C0B1EAF */ jal get_variable -/* D7F43C 802406DC 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7F440 802406E0 0040802D */ daddu $s0, $v0, $zero -/* D7F444 802406E4 0000302D */ daddu $a2, $zero, $zero -/* D7F448 802406E8 3C013FA0 */ lui $at, 0x3fa0 -/* D7F44C 802406EC 44812000 */ mtc1 $at, $f4 -/* D7F450 802406F0 26030008 */ addiu $v1, $s0, 8 -.L802406F4: -/* D7F454 802406F4 C462FFFC */ lwc1 $f2, -4($v1) -/* D7F458 802406F8 C4600004 */ lwc1 $f0, 4($v1) -/* D7F45C 802406FC 4600103C */ c.lt.s $f2, $f0 -/* D7F460 80240700 00000000 */ nop -/* D7F464 80240704 45000005 */ bc1f .L8024071C -/* D7F468 80240708 00000000 */ nop -/* D7F46C 8024070C 46041000 */ add.s $f0, $f2, $f4 -/* D7F470 80240710 E460FFFC */ swc1 $f0, -4($v1) -/* D7F474 80240714 C462FFFC */ lwc1 $f2, -4($v1) -/* D7F478 80240718 C4600004 */ lwc1 $f0, 4($v1) -.L8024071C: -/* D7F47C 8024071C 4602003C */ c.lt.s $f0, $f2 -/* D7F480 80240720 00000000 */ nop -/* D7F484 80240724 45000003 */ bc1f .L80240734 -/* D7F488 80240728 00000000 */ nop -/* D7F48C 8024072C 46041001 */ sub.s $f0, $f2, $f4 -/* D7F490 80240730 E460FFFC */ swc1 $f0, -4($v1) -.L80240734: -/* D7F494 80240734 C4620000 */ lwc1 $f2, ($v1) -/* D7F498 80240738 C4600008 */ lwc1 $f0, 8($v1) -/* D7F49C 8024073C 4600103C */ c.lt.s $f2, $f0 -/* D7F4A0 80240740 00000000 */ nop -/* D7F4A4 80240744 45000005 */ bc1f .L8024075C -/* D7F4A8 80240748 00000000 */ nop -/* D7F4AC 8024074C 46041000 */ add.s $f0, $f2, $f4 -/* D7F4B0 80240750 E4600000 */ swc1 $f0, ($v1) -/* D7F4B4 80240754 C4620000 */ lwc1 $f2, ($v1) -/* D7F4B8 80240758 C4600008 */ lwc1 $f0, 8($v1) -.L8024075C: -/* D7F4BC 8024075C 4602003C */ c.lt.s $f0, $f2 -/* D7F4C0 80240760 00000000 */ nop -/* D7F4C4 80240764 45000003 */ bc1f .L80240774 -/* D7F4C8 80240768 24C60001 */ addiu $a2, $a2, 1 -/* D7F4CC 8024076C 46041001 */ sub.s $f0, $f2, $f4 -/* D7F4D0 80240770 E4600000 */ swc1 $f0, ($v1) -.L80240774: -/* D7F4D4 80240774 28C20003 */ slti $v0, $a2, 3 -/* D7F4D8 80240778 1440FFDE */ bnez $v0, .L802406F4 -/* D7F4DC 8024077C 24630018 */ addiu $v1, $v1, 0x18 -/* D7F4E0 80240780 0000482D */ daddu $t1, $zero, $zero -/* D7F4E4 80240784 0120382D */ daddu $a3, $t1, $zero -/* D7F4E8 80240788 3C0A8024 */ lui $t2, 0x8024 -/* D7F4EC 8024078C 254A2538 */ addiu $t2, $t2, 0x2538 -/* D7F4F0 80240790 0120402D */ daddu $t0, $t1, $zero -.L80240794: -/* D7F4F4 80240794 0000302D */ daddu $a2, $zero, $zero -/* D7F4F8 80240798 0100282D */ daddu $a1, $t0, $zero -.L8024079C: -/* D7F4FC 8024079C 02052021 */ addu $a0, $s0, $a1 -/* D7F500 802407A0 84820048 */ lh $v0, 0x48($a0) -/* D7F504 802407A4 94830048 */ lhu $v1, 0x48($a0) -/* D7F508 802407A8 18400002 */ blez $v0, .L802407B4 -/* D7F50C 802407AC 2462FFFF */ addiu $v0, $v1, -1 -/* D7F510 802407B0 A4820048 */ sh $v0, 0x48($a0) -.L802407B4: -/* D7F514 802407B4 00AA1021 */ addu $v0, $a1, $t2 -/* D7F518 802407B8 84830048 */ lh $v1, 0x48($a0) -/* D7F51C 802407BC 84420000 */ lh $v0, ($v0) -/* D7F520 802407C0 54620001 */ bnel $v1, $v0, .L802407C8 -/* D7F524 802407C4 24090001 */ addiu $t1, $zero, 1 -.L802407C8: -/* D7F528 802407C8 24C60001 */ addiu $a2, $a2, 1 -/* D7F52C 802407CC 28C20009 */ slti $v0, $a2, 9 -/* D7F530 802407D0 1440FFF2 */ bnez $v0, .L8024079C -/* D7F534 802407D4 24A50002 */ addiu $a1, $a1, 2 -/* D7F538 802407D8 24E70001 */ addiu $a3, $a3, 1 -/* D7F53C 802407DC 28E20003 */ slti $v0, $a3, 3 -/* D7F540 802407E0 1440FFEC */ bnez $v0, .L80240794 -/* D7F544 802407E4 25080012 */ addiu $t0, $t0, 0x12 -/* D7F548 802407E8 15200005 */ bnez $t1, .L80240800 -/* D7F54C 802407EC 0220202D */ daddu $a0, $s1, $zero -/* D7F550 802407F0 3C05FD05 */ lui $a1, 0xfd05 -/* D7F554 802407F4 34A50F81 */ ori $a1, $a1, 0xf81 -/* D7F558 802407F8 0C0B2026 */ jal set_variable -/* D7F55C 802407FC 24060001 */ addiu $a2, $zero, 1 -.L80240800: -/* D7F560 80240800 8FBF0018 */ lw $ra, 0x18($sp) -/* D7F564 80240804 8FB10014 */ lw $s1, 0x14($sp) -/* D7F568 80240808 8FB00010 */ lw $s0, 0x10($sp) -/* D7F56C 8024080C 0000102D */ daddu $v0, $zero, $zero -/* D7F570 80240810 03E00008 */ jr $ra -/* D7F574 80240814 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_31/func_80240818_D7ED60.s b/asm/nonmatchings/world/area_pra/pra_31/func_80240818_D7ED60.s deleted file mode 100644 index 4851090893..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/func_80240818_D7ED60.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240818_D7F578 -/* D7F578 80240818 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D7F57C 8024081C AFB10014 */ sw $s1, 0x14($sp) -/* D7F580 80240820 0080882D */ daddu $s1, $a0, $zero -/* D7F584 80240824 AFBF0018 */ sw $ra, 0x18($sp) -/* D7F588 80240828 AFB00010 */ sw $s0, 0x10($sp) -/* D7F58C 8024082C F7B40020 */ sdc1 $f20, 0x20($sp) -/* D7F590 80240830 8E30000C */ lw $s0, 0xc($s1) -/* D7F594 80240834 8E050000 */ lw $a1, ($s0) -/* D7F598 80240838 0C0B1EAF */ jal get_variable -/* D7F59C 8024083C 26100004 */ addiu $s0, $s0, 4 -/* D7F5A0 80240840 0220202D */ daddu $a0, $s1, $zero -/* D7F5A4 80240844 8E050000 */ lw $a1, ($s0) -/* D7F5A8 80240848 0C0B210B */ jal get_float_variable -/* D7F5AC 8024084C 0040802D */ daddu $s0, $v0, $zero -/* D7F5B0 80240850 0220202D */ daddu $a0, $s1, $zero -/* D7F5B4 80240854 3C05FD05 */ lui $a1, 0xfd05 -/* D7F5B8 80240858 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7F5BC 8024085C 0C0B1EAF */ jal get_variable -/* D7F5C0 80240860 46000506 */ mov.s $f20, $f0 -/* D7F5C4 80240864 00101840 */ sll $v1, $s0, 1 -/* D7F5C8 80240868 00701821 */ addu $v1, $v1, $s0 -/* D7F5CC 8024086C 000318C0 */ sll $v1, $v1, 3 -/* D7F5D0 80240870 00431821 */ addu $v1, $v0, $v1 -/* D7F5D4 80240874 E4740014 */ swc1 $f20, 0x14($v1) -/* D7F5D8 80240878 8FBF0018 */ lw $ra, 0x18($sp) -/* D7F5DC 8024087C 8FB10014 */ lw $s1, 0x14($sp) -/* D7F5E0 80240880 8FB00010 */ lw $s0, 0x10($sp) -/* D7F5E4 80240884 D7B40020 */ ldc1 $f20, 0x20($sp) -/* D7F5E8 80240888 24020002 */ addiu $v0, $zero, 2 -/* D7F5EC 8024088C 03E00008 */ jr $ra -/* D7F5F0 80240890 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_pra/pra_31/func_80240894_D7ED60.s b/asm/nonmatchings/world/area_pra/pra_31/func_80240894_D7ED60.s deleted file mode 100644 index 1f11151fdc..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/func_80240894_D7ED60.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240894_D7F5F4 -/* D7F5F4 80240894 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D7F5F8 80240898 AFB20018 */ sw $s2, 0x18($sp) -/* D7F5FC 8024089C 0080902D */ daddu $s2, $a0, $zero -/* D7F600 802408A0 AFBF0020 */ sw $ra, 0x20($sp) -/* D7F604 802408A4 AFB3001C */ sw $s3, 0x1c($sp) -/* D7F608 802408A8 AFB10014 */ sw $s1, 0x14($sp) -/* D7F60C 802408AC AFB00010 */ sw $s0, 0x10($sp) -/* D7F610 802408B0 8E42000C */ lw $v0, 0xc($s2) -/* D7F614 802408B4 0C0B1EAF */ jal get_variable -/* D7F618 802408B8 8C450000 */ lw $a1, ($v0) -/* D7F61C 802408BC 0240202D */ daddu $a0, $s2, $zero -/* D7F620 802408C0 3C05FD05 */ lui $a1, 0xfd05 -/* D7F624 802408C4 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7F628 802408C8 0C0B1EAF */ jal get_variable -/* D7F62C 802408CC 0040982D */ daddu $s3, $v0, $zero -/* D7F630 802408D0 0040302D */ daddu $a2, $v0, $zero -/* D7F634 802408D4 00131040 */ sll $v0, $s3, 1 -/* D7F638 802408D8 00531021 */ addu $v0, $v0, $s3 -/* D7F63C 802408DC 000210C0 */ sll $v0, $v0, 3 -/* D7F640 802408E0 00C21821 */ addu $v1, $a2, $v0 -/* D7F644 802408E4 AE400084 */ sw $zero, 0x84($s2) -/* D7F648 802408E8 C4600014 */ lwc1 $f0, 0x14($v1) -/* D7F64C 802408EC 2402005A */ addiu $v0, $zero, 0x5a -/* D7F650 802408F0 4600008D */ trunc.w.s $f2, $f0 -/* D7F654 802408F4 44041000 */ mfc1 $a0, $f2 -/* D7F658 802408F8 00000000 */ nop -/* D7F65C 802408FC 10820011 */ beq $a0, $v0, .L80240944 -/* D7F660 80240900 2882005B */ slti $v0, $a0, 0x5b -/* D7F664 80240904 50400005 */ beql $v0, $zero, .L8024091C -/* D7F668 80240908 240200B4 */ addiu $v0, $zero, 0xb4 -/* D7F66C 8024090C 10800009 */ beqz $a0, .L80240934 -/* D7F670 80240910 0000202D */ daddu $a0, $zero, $zero -/* D7F674 80240914 0809025E */ j .L80240978 -/* D7F678 80240918 24050001 */ addiu $a1, $zero, 1 -.L8024091C: -/* D7F67C 8024091C 1082000D */ beq $a0, $v0, .L80240954 -/* D7F680 80240920 2402010E */ addiu $v0, $zero, 0x10e -/* D7F684 80240924 1082000F */ beq $a0, $v0, .L80240964 -/* D7F688 80240928 0000202D */ daddu $a0, $zero, $zero -/* D7F68C 8024092C 0809025E */ j .L80240978 -/* D7F690 80240930 24050001 */ addiu $a1, $zero, 1 -.L80240934: -/* D7F694 80240934 84620002 */ lh $v0, 2($v1) -/* D7F698 80240938 84700000 */ lh $s0, ($v1) -/* D7F69C 8024093C 0809025C */ j .L80240970 -/* D7F6A0 80240940 2451FFFF */ addiu $s1, $v0, -1 -.L80240944: -/* D7F6A4 80240944 84620000 */ lh $v0, ($v1) -/* D7F6A8 80240948 84710002 */ lh $s1, 2($v1) -/* D7F6AC 8024094C 0809025C */ j .L80240970 -/* D7F6B0 80240950 24500001 */ addiu $s0, $v0, 1 -.L80240954: -/* D7F6B4 80240954 84620002 */ lh $v0, 2($v1) -/* D7F6B8 80240958 84700000 */ lh $s0, ($v1) -/* D7F6BC 8024095C 0809025C */ j .L80240970 -/* D7F6C0 80240960 24510001 */ addiu $s1, $v0, 1 -.L80240964: -/* D7F6C4 80240964 84620000 */ lh $v0, ($v1) -/* D7F6C8 80240968 84710002 */ lh $s1, 2($v1) -/* D7F6CC 8024096C 2450FFFF */ addiu $s0, $v0, -1 -.L80240970: -/* D7F6D0 80240970 0000202D */ daddu $a0, $zero, $zero -/* D7F6D4 80240974 24050001 */ addiu $a1, $zero, 1 -.L80240978: -/* D7F6D8 80240978 00C0182D */ daddu $v1, $a2, $zero -.L8024097C: -/* D7F6DC 8024097C 50930008 */ beql $a0, $s3, .L802409A0 -/* D7F6E0 80240980 24840001 */ addiu $a0, $a0, 1 -/* D7F6E4 80240984 84620000 */ lh $v0, ($v1) -/* D7F6E8 80240988 56020005 */ bnel $s0, $v0, .L802409A0 -/* D7F6EC 8024098C 24840001 */ addiu $a0, $a0, 1 -/* D7F6F0 80240990 84620002 */ lh $v0, 2($v1) -/* D7F6F4 80240994 52220001 */ beql $s1, $v0, .L8024099C -/* D7F6F8 80240998 AE450084 */ sw $a1, 0x84($s2) -.L8024099C: -/* D7F6FC 8024099C 24840001 */ addiu $a0, $a0, 1 -.L802409A0: -/* D7F700 802409A0 28820003 */ slti $v0, $a0, 3 -/* D7F704 802409A4 1440FFF5 */ bnez $v0, .L8024097C -/* D7F708 802409A8 24630018 */ addiu $v1, $v1, 0x18 -/* D7F70C 802409AC 06010004 */ bgez $s0, .L802409C0 -/* D7F710 802409B0 2A020009 */ slti $v0, $s0, 9 -/* D7F714 802409B4 24020001 */ addiu $v0, $zero, 1 -/* D7F718 802409B8 AE420084 */ sw $v0, 0x84($s2) -/* D7F71C 802409BC 2A020009 */ slti $v0, $s0, 9 -.L802409C0: -/* D7F720 802409C0 14400002 */ bnez $v0, .L802409CC -/* D7F724 802409C4 24020001 */ addiu $v0, $zero, 1 -/* D7F728 802409C8 AE420084 */ sw $v0, 0x84($s2) -.L802409CC: -/* D7F72C 802409CC 06210004 */ bgez $s1, .L802409E0 -/* D7F730 802409D0 2A220003 */ slti $v0, $s1, 3 -/* D7F734 802409D4 24020001 */ addiu $v0, $zero, 1 -/* D7F738 802409D8 AE420084 */ sw $v0, 0x84($s2) -/* D7F73C 802409DC 2A220003 */ slti $v0, $s1, 3 -.L802409E0: -/* D7F740 802409E0 14400002 */ bnez $v0, .L802409EC -/* D7F744 802409E4 24020001 */ addiu $v0, $zero, 1 -/* D7F748 802409E8 AE420084 */ sw $v0, 0x84($s2) -.L802409EC: -/* D7F74C 802409EC 8E430084 */ lw $v1, 0x84($s2) -/* D7F750 802409F0 24020001 */ addiu $v0, $zero, 1 -/* D7F754 802409F4 14620009 */ bne $v1, $v0, .L80240A1C -/* D7F758 802409F8 00000000 */ nop -/* D7F75C 802409FC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D7F760 80240A00 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D7F764 80240A04 804300B4 */ lb $v1, 0xb4($v0) -/* D7F768 80240A08 24020014 */ addiu $v0, $zero, 0x14 -/* D7F76C 80240A0C 14620003 */ bne $v1, $v0, .L80240A1C -/* D7F770 80240A10 00000000 */ nop -/* D7F774 80240A14 0C039769 */ jal set_action_state -/* D7F778 80240A18 0000202D */ daddu $a0, $zero, $zero -.L80240A1C: -/* D7F77C 80240A1C 8FBF0020 */ lw $ra, 0x20($sp) -/* D7F780 80240A20 8FB3001C */ lw $s3, 0x1c($sp) -/* D7F784 80240A24 8FB20018 */ lw $s2, 0x18($sp) -/* D7F788 80240A28 8FB10014 */ lw $s1, 0x14($sp) -/* D7F78C 80240A2C 8FB00010 */ lw $s0, 0x10($sp) -/* D7F790 80240A30 24020002 */ addiu $v0, $zero, 2 -/* D7F794 80240A34 03E00008 */ jr $ra -/* D7F798 80240A38 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_pra/pra_31/func_80240A3C_D7ED60.s b/asm/nonmatchings/world/area_pra/pra_31/func_80240A3C_D7ED60.s deleted file mode 100644 index 47e2f8415c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/func_80240A3C_D7ED60.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A3C_D7F79C -/* D7F79C 80240A3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7F7A0 80240A40 AFB00010 */ sw $s0, 0x10($sp) -/* D7F7A4 80240A44 0080802D */ daddu $s0, $a0, $zero -/* D7F7A8 80240A48 AFBF0014 */ sw $ra, 0x14($sp) -/* D7F7AC 80240A4C 8E02000C */ lw $v0, 0xc($s0) -/* D7F7B0 80240A50 0C0B1EAF */ jal get_variable -/* D7F7B4 80240A54 8C450000 */ lw $a1, ($v0) -/* D7F7B8 80240A58 0200202D */ daddu $a0, $s0, $zero -/* D7F7BC 80240A5C 3C05FD05 */ lui $a1, 0xfd05 -/* D7F7C0 80240A60 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7F7C4 80240A64 0C0B1EAF */ jal get_variable -/* D7F7C8 80240A68 0040802D */ daddu $s0, $v0, $zero -/* D7F7CC 80240A6C 0040302D */ daddu $a2, $v0, $zero -/* D7F7D0 80240A70 00101040 */ sll $v0, $s0, 1 -/* D7F7D4 80240A74 00501021 */ addu $v0, $v0, $s0 -/* D7F7D8 80240A78 000210C0 */ sll $v0, $v0, 3 -/* D7F7DC 80240A7C 00C22821 */ addu $a1, $a2, $v0 -/* D7F7E0 80240A80 84A30002 */ lh $v1, 2($a1) -/* D7F7E4 80240A84 84A40000 */ lh $a0, ($a1) -/* D7F7E8 80240A88 000310C0 */ sll $v0, $v1, 3 -/* D7F7EC 80240A8C 00431021 */ addu $v0, $v0, $v1 -/* D7F7F0 80240A90 00441021 */ addu $v0, $v0, $a0 -/* D7F7F4 80240A94 00021040 */ sll $v0, $v0, 1 -/* D7F7F8 80240A98 00C21021 */ addu $v0, $a2, $v0 -/* D7F7FC 80240A9C 24030014 */ addiu $v1, $zero, 0x14 -/* D7F800 80240AA0 A4430048 */ sh $v1, 0x48($v0) -/* D7F804 80240AA4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* D7F808 80240AA8 2402005A */ addiu $v0, $zero, 0x5a -/* D7F80C 80240AAC 4600008D */ trunc.w.s $f2, $f0 -/* D7F810 80240AB0 44031000 */ mfc1 $v1, $f2 -/* D7F814 80240AB4 00000000 */ nop -/* D7F818 80240AB8 10620012 */ beq $v1, $v0, .L80240B04 -/* D7F81C 80240ABC 00000000 */ nop -/* D7F820 80240AC0 2862005B */ slti $v0, $v1, 0x5b -/* D7F824 80240AC4 10400005 */ beqz $v0, .L80240ADC -/* D7F828 80240AC8 240200B4 */ addiu $v0, $zero, 0xb4 -/* D7F82C 80240ACC 10600009 */ beqz $v1, .L80240AF4 -/* D7F830 80240AD0 00000000 */ nop -/* D7F834 80240AD4 080902CB */ j .L80240B2C -/* D7F838 80240AD8 00000000 */ nop -.L80240ADC: -/* D7F83C 80240ADC 1062000C */ beq $v1, $v0, .L80240B10 -/* D7F840 80240AE0 2402010E */ addiu $v0, $zero, 0x10e -/* D7F844 80240AE4 1062000E */ beq $v1, $v0, .L80240B20 -/* D7F848 80240AE8 00000000 */ nop -/* D7F84C 80240AEC 080902CB */ j .L80240B2C -/* D7F850 80240AF0 00000000 */ nop -.L80240AF4: -/* D7F854 80240AF4 94A20002 */ lhu $v0, 2($a1) -/* D7F858 80240AF8 2442FFFF */ addiu $v0, $v0, -1 -/* D7F85C 80240AFC 080902CB */ j .L80240B2C -/* D7F860 80240B00 A4A20002 */ sh $v0, 2($a1) -.L80240B04: -/* D7F864 80240B04 94A20000 */ lhu $v0, ($a1) -/* D7F868 80240B08 080902CA */ j .L80240B28 -/* D7F86C 80240B0C 24420001 */ addiu $v0, $v0, 1 -.L80240B10: -/* D7F870 80240B10 94A20002 */ lhu $v0, 2($a1) -/* D7F874 80240B14 24420001 */ addiu $v0, $v0, 1 -/* D7F878 80240B18 080902CB */ j .L80240B2C -/* D7F87C 80240B1C A4A20002 */ sh $v0, 2($a1) -.L80240B20: -/* D7F880 80240B20 94A20000 */ lhu $v0, ($a1) -/* D7F884 80240B24 2442FFFF */ addiu $v0, $v0, -1 -.L80240B28: -/* D7F888 80240B28 A4A20000 */ sh $v0, ($a1) -.L80240B2C: -/* D7F88C 80240B2C 84A30002 */ lh $v1, 2($a1) -/* D7F890 80240B30 84A40000 */ lh $a0, ($a1) -/* D7F894 80240B34 000310C0 */ sll $v0, $v1, 3 -/* D7F898 80240B38 00431021 */ addu $v0, $v0, $v1 -/* D7F89C 80240B3C 00441021 */ addu $v0, $v0, $a0 -/* D7F8A0 80240B40 00021040 */ sll $v0, $v0, 1 -/* D7F8A4 80240B44 00C21021 */ addu $v0, $a2, $v0 -/* D7F8A8 80240B48 2403FFFF */ addiu $v1, $zero, -1 -/* D7F8AC 80240B4C A4430048 */ sh $v1, 0x48($v0) -/* D7F8B0 80240B50 84A40000 */ lh $a0, ($a1) -/* D7F8B4 80240B54 00041840 */ sll $v1, $a0, 1 -/* D7F8B8 80240B58 00641821 */ addu $v1, $v1, $a0 -/* D7F8BC 80240B5C 000318C0 */ sll $v1, $v1, 3 -/* D7F8C0 80240B60 00641821 */ addu $v1, $v1, $a0 -/* D7F8C4 80240B64 00031840 */ sll $v1, $v1, 1 -/* D7F8C8 80240B68 24630032 */ addiu $v1, $v1, 0x32 -/* D7F8CC 80240B6C 84A40002 */ lh $a0, 2($a1) -/* D7F8D0 80240B70 44830000 */ mtc1 $v1, $f0 -/* D7F8D4 80240B74 00000000 */ nop -/* D7F8D8 80240B78 46800020 */ cvt.s.w $f0, $f0 -/* D7F8DC 80240B7C E4A0000C */ swc1 $f0, 0xc($a1) -/* D7F8E0 80240B80 00041840 */ sll $v1, $a0, 1 -/* D7F8E4 80240B84 00641821 */ addu $v1, $v1, $a0 -/* D7F8E8 80240B88 000318C0 */ sll $v1, $v1, 3 -/* D7F8EC 80240B8C 00641821 */ addu $v1, $v1, $a0 -/* D7F8F0 80240B90 00031840 */ sll $v1, $v1, 1 -/* D7F8F4 80240B94 2463004B */ addiu $v1, $v1, 0x4b -/* D7F8F8 80240B98 44830000 */ mtc1 $v1, $f0 -/* D7F8FC 80240B9C 00000000 */ nop -/* D7F900 80240BA0 46800020 */ cvt.s.w $f0, $f0 -/* D7F904 80240BA4 E4A00010 */ swc1 $f0, 0x10($a1) -/* D7F908 80240BA8 8FBF0014 */ lw $ra, 0x14($sp) -/* D7F90C 80240BAC 8FB00010 */ lw $s0, 0x10($sp) -/* D7F910 80240BB0 24020002 */ addiu $v0, $zero, 2 -/* D7F914 80240BB4 03E00008 */ jr $ra -/* D7F918 80240BB8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_31/func_80240E70_D7ED60.s b/asm/nonmatchings/world/area_pra/pra_31/func_80240E70_D7ED60.s deleted file mode 100644 index 34e94550e5..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/func_80240E70_D7ED60.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E70_D7FBD0 -/* D7FBD0 80240E70 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7FBD4 80240E74 AFB10014 */ sw $s1, 0x14($sp) -/* D7FBD8 80240E78 0080882D */ daddu $s1, $a0, $zero -/* D7FBDC 80240E7C AFBF0018 */ sw $ra, 0x18($sp) -/* D7FBE0 80240E80 AFB00010 */ sw $s0, 0x10($sp) -/* D7FBE4 80240E84 8E22000C */ lw $v0, 0xc($s1) -/* D7FBE8 80240E88 0C0B1EAF */ jal get_variable -/* D7FBEC 80240E8C 8C450000 */ lw $a1, ($v0) -/* D7FBF0 80240E90 0220202D */ daddu $a0, $s1, $zero -/* D7FBF4 80240E94 3C05FD05 */ lui $a1, 0xfd05 -/* D7FBF8 80240E98 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7FBFC 80240E9C 0C0B1EAF */ jal get_variable -/* D7FC00 80240EA0 0040802D */ daddu $s0, $v0, $zero -/* D7FC04 80240EA4 0220202D */ daddu $a0, $s1, $zero -/* D7FC08 80240EA8 3C05FE36 */ lui $a1, 0xfe36 -/* D7FC0C 80240EAC 00101840 */ sll $v1, $s0, 1 -/* D7FC10 80240EB0 00701821 */ addu $v1, $v1, $s0 -/* D7FC14 80240EB4 000318C0 */ sll $v1, $v1, 3 -/* D7FC18 80240EB8 00438021 */ addu $s0, $v0, $v1 -/* D7FC1C 80240EBC 8E060004 */ lw $a2, 4($s0) -/* D7FC20 80240EC0 0C0B2190 */ jal set_float_variable -/* D7FC24 80240EC4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D7FC28 80240EC8 0220202D */ daddu $a0, $s1, $zero -/* D7FC2C 80240ECC C6000008 */ lwc1 $f0, 8($s0) -/* D7FC30 80240ED0 3C05FE36 */ lui $a1, 0xfe36 -/* D7FC34 80240ED4 46000007 */ neg.s $f0, $f0 -/* D7FC38 80240ED8 44060000 */ mfc1 $a2, $f0 -/* D7FC3C 80240EDC 0C0B2190 */ jal set_float_variable -/* D7FC40 80240EE0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* D7FC44 80240EE4 C60C0014 */ lwc1 $f12, 0x14($s0) -/* D7FC48 80240EE8 3C018024 */ lui $at, 0x8024 -/* D7FC4C 80240EEC D4207C90 */ ldc1 $f0, 0x7c90($at) -/* D7FC50 80240EF0 46006321 */ cvt.d.s $f12, $f12 -/* D7FC54 80240EF4 46206300 */ add.d $f12, $f12, $f0 -/* D7FC58 80240EF8 0C00A6C9 */ jal clamp_angle -/* D7FC5C 80240EFC 46206320 */ cvt.s.d $f12, $f12 -/* D7FC60 80240F00 0220202D */ daddu $a0, $s1, $zero -/* D7FC64 80240F04 3C05FE36 */ lui $a1, 0xfe36 -/* D7FC68 80240F08 44060000 */ mfc1 $a2, $f0 -/* D7FC6C 80240F0C 0C0B2190 */ jal set_float_variable -/* D7FC70 80240F10 34A53C82 */ ori $a1, $a1, 0x3c82 -/* D7FC74 80240F14 8FBF0018 */ lw $ra, 0x18($sp) -/* D7FC78 80240F18 8FB10014 */ lw $s1, 0x14($sp) -/* D7FC7C 80240F1C 8FB00010 */ lw $s0, 0x10($sp) -/* D7FC80 80240F20 24020002 */ addiu $v0, $zero, 2 -/* D7FC84 80240F24 03E00008 */ jr $ra -/* D7FC88 80240F28 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_31/func_80240F2C_D7ED60.s b/asm/nonmatchings/world/area_pra/pra_31/func_80240F2C_D7ED60.s deleted file mode 100644 index e0d117924b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/func_80240F2C_D7ED60.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F2C_D7FC8C -/* D7FC8C 80240F2C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7FC90 80240F30 AFB10014 */ sw $s1, 0x14($sp) -/* D7FC94 80240F34 0080882D */ daddu $s1, $a0, $zero -/* D7FC98 80240F38 AFBF0018 */ sw $ra, 0x18($sp) -/* D7FC9C 80240F3C AFB00010 */ sw $s0, 0x10($sp) -/* D7FCA0 80240F40 8E22000C */ lw $v0, 0xc($s1) -/* D7FCA4 80240F44 0C0B1EAF */ jal get_variable -/* D7FCA8 80240F48 8C450000 */ lw $a1, ($v0) -/* D7FCAC 80240F4C 0220202D */ daddu $a0, $s1, $zero -/* D7FCB0 80240F50 3C05FD05 */ lui $a1, 0xfd05 -/* D7FCB4 80240F54 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7FCB8 80240F58 0C0B1EAF */ jal get_variable -/* D7FCBC 80240F5C 0040802D */ daddu $s0, $v0, $zero -/* D7FCC0 80240F60 0220202D */ daddu $a0, $s1, $zero -/* D7FCC4 80240F64 3C05FE36 */ lui $a1, 0xfe36 -/* D7FCC8 80240F68 00101840 */ sll $v1, $s0, 1 -/* D7FCCC 80240F6C 00701821 */ addu $v1, $v1, $s0 -/* D7FCD0 80240F70 000318C0 */ sll $v1, $v1, 3 -/* D7FCD4 80240F74 00438021 */ addu $s0, $v0, $v1 -/* D7FCD8 80240F78 8E060004 */ lw $a2, 4($s0) -/* D7FCDC 80240F7C 0C0B2190 */ jal set_float_variable -/* D7FCE0 80240F80 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D7FCE4 80240F84 0220202D */ daddu $a0, $s1, $zero -/* D7FCE8 80240F88 3C05FE36 */ lui $a1, 0xfe36 -/* D7FCEC 80240F8C 8E060008 */ lw $a2, 8($s0) -/* D7FCF0 80240F90 0C0B2190 */ jal set_float_variable -/* D7FCF4 80240F94 34A53C81 */ ori $a1, $a1, 0x3c81 -/* D7FCF8 80240F98 C60C0014 */ lwc1 $f12, 0x14($s0) -/* D7FCFC 80240F9C 0C00A6C9 */ jal clamp_angle -/* D7FD00 80240FA0 00000000 */ nop -/* D7FD04 80240FA4 0220202D */ daddu $a0, $s1, $zero -/* D7FD08 80240FA8 3C05FE36 */ lui $a1, 0xfe36 -/* D7FD0C 80240FAC 44060000 */ mfc1 $a2, $f0 -/* D7FD10 80240FB0 0C0B2190 */ jal set_float_variable -/* D7FD14 80240FB4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* D7FD18 80240FB8 8FBF0018 */ lw $ra, 0x18($sp) -/* D7FD1C 80240FBC 8FB10014 */ lw $s1, 0x14($sp) -/* D7FD20 80240FC0 8FB00010 */ lw $s0, 0x10($sp) -/* D7FD24 80240FC4 24020002 */ addiu $v0, $zero, 2 -/* D7FD28 80240FC8 03E00008 */ jr $ra -/* D7FD2C 80240FCC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_31/func_80240FD0_D7ED60.s b/asm/nonmatchings/world/area_pra/pra_31/func_80240FD0_D7ED60.s deleted file mode 100644 index c7adcdd038..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/func_80240FD0_D7ED60.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD0_D7FD30 -/* D7FD30 80240FD0 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* D7FD34 80240FD4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* D7FD38 80240FD8 8C430004 */ lw $v1, 4($v0) -/* D7FD3C 80240FDC 3C040080 */ lui $a0, 0x80 -/* D7FD40 80240FE0 00641825 */ or $v1, $v1, $a0 -/* D7FD44 80240FE4 AC430004 */ sw $v1, 4($v0) -/* D7FD48 80240FE8 03E00008 */ jr $ra -/* D7FD4C 80240FEC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_pra/pra_31/func_80240FF0_D7ED60.s b/asm/nonmatchings/world/area_pra/pra_31/func_80240FF0_D7ED60.s deleted file mode 100644 index 84c73a3764..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/func_80240FF0_D7ED60.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FF0_D7FD50 -/* D7FD50 80240FF0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7FD54 80240FF4 AFB00010 */ sw $s0, 0x10($sp) -/* D7FD58 80240FF8 0080802D */ daddu $s0, $a0, $zero -/* D7FD5C 80240FFC AFBF0014 */ sw $ra, 0x14($sp) -/* D7FD60 80241000 8E02000C */ lw $v0, 0xc($s0) -/* D7FD64 80241004 0C0B1EAF */ jal get_variable -/* D7FD68 80241008 8C450000 */ lw $a1, ($v0) -/* D7FD6C 8024100C 0040302D */ daddu $a2, $v0, $zero -/* D7FD70 80241010 3C058016 */ lui $a1, 0x8016 -/* D7FD74 80241014 84A5A550 */ lh $a1, -0x5ab0($a1) -/* D7FD78 80241018 3C048011 */ lui $a0, %hi(gPlayerStatus) -/* D7FD7C 8024101C 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) -/* D7FD80 80241020 10A60004 */ beq $a1, $a2, .L80241034 -/* D7FD84 80241024 24020014 */ addiu $v0, $zero, 0x14 -/* D7FD88 80241028 808300B4 */ lb $v1, 0xb4($a0) -/* D7FD8C 8024102C 10620006 */ beq $v1, $v0, .L80241048 -/* D7FD90 80241030 00000000 */ nop -.L80241034: -/* D7FD94 80241034 8C820014 */ lw $v0, 0x14($a0) -/* D7FD98 80241038 3C03FFFF */ lui $v1, 0xffff -/* D7FD9C 8024103C 00431024 */ and $v0, $v0, $v1 -/* D7FDA0 80241040 10400005 */ beqz $v0, .L80241058 -/* D7FDA4 80241044 00000000 */ nop -.L80241048: -/* D7FDA8 80241048 0C039769 */ jal set_action_state -/* D7FDAC 8024104C 0000202D */ daddu $a0, $zero, $zero -/* D7FDB0 80241050 08090426 */ j .L80241098 -/* D7FDB4 80241054 AE000084 */ sw $zero, 0x84($s0) -.L80241058: -/* D7FDB8 80241058 54A6000F */ bnel $a1, $a2, .L80241098 -/* D7FDBC 8024105C AE000084 */ sw $zero, 0x84($s0) -/* D7FDC0 80241060 808300B4 */ lb $v1, 0xb4($a0) -/* D7FDC4 80241064 24020014 */ addiu $v0, $zero, 0x14 -/* D7FDC8 80241068 10620005 */ beq $v1, $v0, .L80241080 -/* D7FDCC 8024106C 24020001 */ addiu $v0, $zero, 1 -/* D7FDD0 80241070 10620003 */ beq $v1, $v0, .L80241080 -/* D7FDD4 80241074 24020002 */ addiu $v0, $zero, 2 -/* D7FDD8 80241078 54620008 */ bnel $v1, $v0, .L8024109C -/* D7FDDC 8024107C AE000084 */ sw $zero, 0x84($s0) -.L80241080: -/* D7FDE0 80241080 8C820004 */ lw $v0, 4($a0) -/* D7FDE4 80241084 30420001 */ andi $v0, $v0, 1 -/* D7FDE8 80241088 54400003 */ bnel $v0, $zero, .L80241098 -/* D7FDEC 8024108C AE000084 */ sw $zero, 0x84($s0) -/* D7FDF0 80241090 24020001 */ addiu $v0, $zero, 1 -/* D7FDF4 80241094 AE020084 */ sw $v0, 0x84($s0) -.L80241098: -/* D7FDF8 80241098 24020002 */ addiu $v0, $zero, 2 -.L8024109C: -/* D7FDFC 8024109C 8FBF0014 */ lw $ra, 0x14($sp) -/* D7FE00 802410A0 8FB00010 */ lw $s0, 0x10($sp) -/* D7FE04 802410A4 03E00008 */ jr $ra -/* D7FE08 802410A8 27BD0018 */ addiu $sp, $sp, 0x18 -/* D7FE0C 802410AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_32/func_80240020_D86A00.s b/asm/nonmatchings/world/area_pra/pra_32/func_80240020_D86A00.s deleted file mode 100644 index 82cc16d51f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_32/func_80240020_D86A00.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D86A20 -/* D86A20 80240020 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D86A24 80240024 AFBF001C */ sw $ra, 0x1c($sp) -/* D86A28 80240028 AFB00018 */ sw $s0, 0x18($sp) -/* D86A2C 8024002C 8C900084 */ lw $s0, 0x84($a0) -/* D86A30 80240030 C6000008 */ lwc1 $f0, 8($s0) -/* D86A34 80240034 240400A2 */ addiu $a0, $zero, 0xa2 -/* D86A38 80240038 E7A00010 */ swc1 $f0, 0x10($sp) -/* D86A3C 8024003C 8E060000 */ lw $a2, ($s0) -/* D86A40 80240040 8E070004 */ lw $a3, 4($s0) -/* D86A44 80240044 0C05267B */ jal func_801499EC -/* D86A48 80240048 0000282D */ daddu $a1, $zero, $zero -/* D86A4C 8024004C 86020044 */ lh $v0, 0x44($s0) -/* D86A50 80240050 8FBF001C */ lw $ra, 0x1c($sp) -/* D86A54 80240054 8FB00018 */ lw $s0, 0x18($sp) -/* D86A58 80240058 28420002 */ slti $v0, $v0, 2 -/* D86A5C 8024005C 38420001 */ xori $v0, $v0, 1 -/* D86A60 80240060 00021040 */ sll $v0, $v0, 1 -/* D86A64 80240064 03E00008 */ jr $ra -/* D86A68 80240068 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_32/func_8024006C_D86A00.s b/asm/nonmatchings/world/area_pra/pra_32/func_8024006C_D86A00.s deleted file mode 100644 index 3634766c0e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_32/func_8024006C_D86A00.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024006C_D86A6C -/* D86A6C 8024006C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D86A70 80240070 AFB20020 */ sw $s2, 0x20($sp) -/* D86A74 80240074 0080902D */ daddu $s2, $a0, $zero -/* D86A78 80240078 AFBF0024 */ sw $ra, 0x24($sp) -/* D86A7C 8024007C AFB1001C */ sw $s1, 0x1c($sp) -/* D86A80 80240080 AFB00018 */ sw $s0, 0x18($sp) -/* D86A84 80240084 10A0004A */ beqz $a1, .L802401B0 -/* D86A88 80240088 8E51000C */ lw $s1, 0xc($s2) -/* D86A8C 8024008C 0C00AB39 */ jal heap_malloc -/* D86A90 80240090 24040058 */ addiu $a0, $zero, 0x58 -/* D86A94 80240094 0000202D */ daddu $a0, $zero, $zero -/* D86A98 80240098 3C05FD05 */ lui $a1, 0xfd05 -/* D86A9C 8024009C 34A50F81 */ ori $a1, $a1, 0xf81 -/* D86AA0 802400A0 0040802D */ daddu $s0, $v0, $zero -/* D86AA4 802400A4 0200302D */ daddu $a2, $s0, $zero -/* D86AA8 802400A8 0C0B2026 */ jal set_variable -/* D86AAC 802400AC AE500084 */ sw $s0, 0x84($s2) -/* D86AB0 802400B0 8E250000 */ lw $a1, ($s1) -/* D86AB4 802400B4 26310004 */ addiu $s1, $s1, 4 -/* D86AB8 802400B8 0C0B1EAF */ jal get_variable -/* D86ABC 802400BC 0240202D */ daddu $a0, $s2, $zero -/* D86AC0 802400C0 AE020038 */ sw $v0, 0x38($s0) -/* D86AC4 802400C4 8E250000 */ lw $a1, ($s1) -/* D86AC8 802400C8 26310004 */ addiu $s1, $s1, 4 -/* D86ACC 802400CC 0C0B1EAF */ jal get_variable -/* D86AD0 802400D0 0240202D */ daddu $a0, $s2, $zero -/* D86AD4 802400D4 AE02003C */ sw $v0, 0x3c($s0) -/* D86AD8 802400D8 8E250000 */ lw $a1, ($s1) -/* D86ADC 802400DC 26310004 */ addiu $s1, $s1, 4 -/* D86AE0 802400E0 0C0B210B */ jal get_float_variable -/* D86AE4 802400E4 0240202D */ daddu $a0, $s2, $zero -/* D86AE8 802400E8 E600000C */ swc1 $f0, 0xc($s0) -/* D86AEC 802400EC 8E250000 */ lw $a1, ($s1) -/* D86AF0 802400F0 26310004 */ addiu $s1, $s1, 4 -/* D86AF4 802400F4 0C0B210B */ jal get_float_variable -/* D86AF8 802400F8 0240202D */ daddu $a0, $s2, $zero -/* D86AFC 802400FC E6000010 */ swc1 $f0, 0x10($s0) -/* D86B00 80240100 8E250000 */ lw $a1, ($s1) -/* D86B04 80240104 26310004 */ addiu $s1, $s1, 4 -/* D86B08 80240108 0C0B210B */ jal get_float_variable -/* D86B0C 8024010C 0240202D */ daddu $a0, $s2, $zero -/* D86B10 80240110 E6000014 */ swc1 $f0, 0x14($s0) -/* D86B14 80240114 8E250000 */ lw $a1, ($s1) -/* D86B18 80240118 26310004 */ addiu $s1, $s1, 4 -/* D86B1C 8024011C 0C0B210B */ jal get_float_variable -/* D86B20 80240120 0240202D */ daddu $a0, $s2, $zero -/* D86B24 80240124 E6000018 */ swc1 $f0, 0x18($s0) -/* D86B28 80240128 8E250000 */ lw $a1, ($s1) -/* D86B2C 8024012C 26310004 */ addiu $s1, $s1, 4 -/* D86B30 80240130 0C0B210B */ jal get_float_variable -/* D86B34 80240134 0240202D */ daddu $a0, $s2, $zero -/* D86B38 80240138 E600001C */ swc1 $f0, 0x1c($s0) -/* D86B3C 8024013C 8E250000 */ lw $a1, ($s1) -/* D86B40 80240140 26310004 */ addiu $s1, $s1, 4 -/* D86B44 80240144 0C0B210B */ jal get_float_variable -/* D86B48 80240148 0240202D */ daddu $a0, $s2, $zero -/* D86B4C 8024014C E6000020 */ swc1 $f0, 0x20($s0) -/* D86B50 80240150 8E250000 */ lw $a1, ($s1) -/* D86B54 80240154 26310004 */ addiu $s1, $s1, 4 -/* D86B58 80240158 0C0B210B */ jal get_float_variable -/* D86B5C 8024015C 0240202D */ daddu $a0, $s2, $zero -/* D86B60 80240160 E6000024 */ swc1 $f0, 0x24($s0) -/* D86B64 80240164 8E250000 */ lw $a1, ($s1) -/* D86B68 80240168 0C0B210B */ jal get_float_variable -/* D86B6C 8024016C 0240202D */ daddu $a0, $s2, $zero -/* D86B70 80240170 3C013F80 */ lui $at, 0x3f80 -/* D86B74 80240174 44811000 */ mtc1 $at, $f2 -/* D86B78 80240178 E6000028 */ swc1 $f0, 0x28($s0) -/* D86B7C 8024017C AFA00014 */ sw $zero, 0x14($sp) -/* D86B80 80240180 E7A20010 */ swc1 $f2, 0x10($sp) -/* D86B84 80240184 8E05000C */ lw $a1, 0xc($s0) -/* D86B88 80240188 8E060010 */ lw $a2, 0x10($s0) -/* D86B8C 8024018C 8E070014 */ lw $a3, 0x14($s0) -/* D86B90 80240190 0C01CA6C */ jal func_800729B0 -/* D86B94 80240194 24040002 */ addiu $a0, $zero, 2 -/* D86B98 80240198 AE020050 */ sw $v0, 0x50($s0) -/* D86B9C 8024019C A600004E */ sh $zero, 0x4e($s0) -/* D86BA0 802401A0 A6000048 */ sh $zero, 0x48($s0) -/* D86BA4 802401A4 A600004A */ sh $zero, 0x4a($s0) -/* D86BA8 802401A8 A6000044 */ sh $zero, 0x44($s0) -/* D86BAC 802401AC A6000046 */ sh $zero, 0x46($s0) -.L802401B0: -/* D86BB0 802401B0 8FBF0024 */ lw $ra, 0x24($sp) -/* D86BB4 802401B4 8FB20020 */ lw $s2, 0x20($sp) -/* D86BB8 802401B8 8FB1001C */ lw $s1, 0x1c($sp) -/* D86BBC 802401BC 8FB00018 */ lw $s0, 0x18($sp) -/* D86BC0 802401C0 24020002 */ addiu $v0, $zero, 2 -/* D86BC4 802401C4 03E00008 */ jr $ra -/* D86BC8 802401C8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_pra/pra_32/func_802401CC_D86A00.s b/asm/nonmatchings/world/area_pra/pra_32/func_802401CC_D86A00.s deleted file mode 100644 index f405afefa0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_32/func_802401CC_D86A00.s +++ /dev/null @@ -1,272 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401CC_D86BCC -/* D86BCC 802401CC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D86BD0 802401D0 AFBF0020 */ sw $ra, 0x20($sp) -/* D86BD4 802401D4 AFB1001C */ sw $s1, 0x1c($sp) -/* D86BD8 802401D8 AFB00018 */ sw $s0, 0x18($sp) -/* D86BDC 802401DC 8C910084 */ lw $s1, 0x84($a0) -/* D86BE0 802401E0 86230044 */ lh $v1, 0x44($s1) -/* D86BE4 802401E4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D86BE8 802401E8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D86BEC 802401EC 2C620005 */ sltiu $v0, $v1, 5 -/* D86BF0 802401F0 1040008A */ beqz $v0, .L8024041C -/* D86BF4 802401F4 00031080 */ sll $v0, $v1, 2 -/* D86BF8 802401F8 3C018024 */ lui $at, 0x8024 -/* D86BFC 802401FC 00220821 */ addu $at, $at, $v0 -/* D86C00 80240200 8C222CB0 */ lw $v0, 0x2cb0($at) -/* D86C04 80240204 00400008 */ jr $v0 -/* D86C08 80240208 00000000 */ nop -/* D86C0C 8024020C 8E22003C */ lw $v0, 0x3c($s1) -/* D86C10 80240210 86270046 */ lh $a3, 0x46($s1) -/* D86C14 80240214 AFA20010 */ sw $v0, 0x10($sp) -/* D86C18 80240218 8E250010 */ lw $a1, 0x10($s1) -/* D86C1C 8024021C 8E26001C */ lw $a2, 0x1c($s1) -/* D86C20 80240220 0C00A8ED */ jal update_lerp -/* D86C24 80240224 24040005 */ addiu $a0, $zero, 5 -/* D86C28 80240228 86270046 */ lh $a3, 0x46($s1) -/* D86C2C 8024022C 8E22003C */ lw $v0, 0x3c($s1) -/* D86C30 80240230 E6200004 */ swc1 $f0, 4($s1) -/* D86C34 80240234 AFA20010 */ sw $v0, 0x10($sp) -/* D86C38 80240238 8E25000C */ lw $a1, 0xc($s1) -/* D86C3C 8024023C 8E260018 */ lw $a2, 0x18($s1) -/* D86C40 80240240 0C00A8ED */ jal update_lerp -/* D86C44 80240244 0000202D */ daddu $a0, $zero, $zero -/* D86C48 80240248 86270046 */ lh $a3, 0x46($s1) -/* D86C4C 8024024C 8E22003C */ lw $v0, 0x3c($s1) -/* D86C50 80240250 E6200000 */ swc1 $f0, ($s1) -/* D86C54 80240254 AFA20010 */ sw $v0, 0x10($sp) -/* D86C58 80240258 8E250014 */ lw $a1, 0x14($s1) -/* D86C5C 8024025C 8E260020 */ lw $a2, 0x20($s1) -/* D86C60 80240260 0C00A8ED */ jal update_lerp -/* D86C64 80240264 0000202D */ daddu $a0, $zero, $zero -/* D86C68 80240268 8E220050 */ lw $v0, 0x50($s1) -/* D86C6C 8024026C E6200008 */ swc1 $f0, 8($s1) -/* D86C70 80240270 C6200000 */ lwc1 $f0, ($s1) -/* D86C74 80240274 8C42000C */ lw $v0, 0xc($v0) -/* D86C78 80240278 E4400008 */ swc1 $f0, 8($v0) -/* D86C7C 8024027C 8E220050 */ lw $v0, 0x50($s1) -/* D86C80 80240280 C6200004 */ lwc1 $f0, 4($s1) -/* D86C84 80240284 8C42000C */ lw $v0, 0xc($v0) -/* D86C88 80240288 E440000C */ swc1 $f0, 0xc($v0) -/* D86C8C 8024028C 8E220050 */ lw $v0, 0x50($s1) -/* D86C90 80240290 C6200008 */ lwc1 $f0, 8($s1) -/* D86C94 80240294 8C42000C */ lw $v0, 0xc($v0) -/* D86C98 80240298 E4400010 */ swc1 $f0, 0x10($v0) -/* D86C9C 8024029C 96220046 */ lhu $v0, 0x46($s1) -/* D86CA0 802402A0 8E23003C */ lw $v1, 0x3c($s1) -/* D86CA4 802402A4 24420001 */ addiu $v0, $v0, 1 -/* D86CA8 802402A8 A6220046 */ sh $v0, 0x46($s1) -/* D86CAC 802402AC 00021400 */ sll $v0, $v0, 0x10 -/* D86CB0 802402B0 00021403 */ sra $v0, $v0, 0x10 -/* D86CB4 802402B4 0043102A */ slt $v0, $v0, $v1 -/* D86CB8 802402B8 14400058 */ bnez $v0, .L8024041C -/* D86CBC 802402BC 24020001 */ addiu $v0, $zero, 1 -/* D86CC0 802402C0 A6220044 */ sh $v0, 0x44($s1) -/* D86CC4 802402C4 08090107 */ j .L8024041C -/* D86CC8 802402C8 A6200046 */ sh $zero, 0x46($s1) -/* D86CCC 802402CC 96220046 */ lhu $v0, 0x46($s1) -/* D86CD0 802402D0 24420001 */ addiu $v0, $v0, 1 -/* D86CD4 802402D4 A6220046 */ sh $v0, 0x46($s1) -/* D86CD8 802402D8 00021400 */ sll $v0, $v0, 0x10 -/* D86CDC 802402DC 00021403 */ sra $v0, $v0, 0x10 -/* D86CE0 802402E0 2842003C */ slti $v0, $v0, 0x3c -/* D86CE4 802402E4 1440004D */ bnez $v0, .L8024041C -/* D86CE8 802402E8 24020002 */ addiu $v0, $zero, 2 -/* D86CEC 802402EC 8E230050 */ lw $v1, 0x50($s1) -/* D86CF0 802402F0 A6220044 */ sh $v0, 0x44($s1) -/* D86CF4 802402F4 A6200046 */ sh $zero, 0x46($s1) -/* D86CF8 802402F8 8C63000C */ lw $v1, 0xc($v1) -/* D86CFC 802402FC 24020001 */ addiu $v0, $zero, 1 -/* D86D00 80240300 AC620070 */ sw $v0, 0x70($v1) -/* D86D04 80240304 8E220050 */ lw $v0, 0x50($s1) -/* D86D08 80240308 8C42000C */ lw $v0, 0xc($v0) -/* D86D0C 8024030C 08090107 */ j .L8024041C -/* D86D10 80240310 AC400074 */ sw $zero, 0x74($v0) -/* D86D14 80240314 96220046 */ lhu $v0, 0x46($s1) -/* D86D18 80240318 24420001 */ addiu $v0, $v0, 1 -/* D86D1C 8024031C A6220046 */ sh $v0, 0x46($s1) -/* D86D20 80240320 00021400 */ sll $v0, $v0, 0x10 -/* D86D24 80240324 00021403 */ sra $v0, $v0, 0x10 -/* D86D28 80240328 2842003C */ slti $v0, $v0, 0x3c -/* D86D2C 8024032C 1440003B */ bnez $v0, .L8024041C -/* D86D30 80240330 00000000 */ nop -/* D86D34 80240334 3C013F80 */ lui $at, 0x3f80 -/* D86D38 80240338 44810000 */ mtc1 $at, $f0 -/* D86D3C 8024033C AFA00014 */ sw $zero, 0x14($sp) -/* D86D40 80240340 E7A00010 */ swc1 $f0, 0x10($sp) -/* D86D44 80240344 8E250018 */ lw $a1, 0x18($s1) -/* D86D48 80240348 8E26001C */ lw $a2, 0x1c($s1) -/* D86D4C 8024034C 8E270020 */ lw $a3, 0x20($s1) -/* D86D50 80240350 0C01C9AC */ jal func_800726B0 -/* D86D54 80240354 24040001 */ addiu $a0, $zero, 1 -/* D86D58 80240358 AE220054 */ sw $v0, 0x54($s1) -/* D86D5C 8024035C 8C43000C */ lw $v1, 0xc($v0) -/* D86D60 80240360 9222003B */ lbu $v0, 0x3b($s1) -/* D86D64 80240364 A0620034 */ sb $v0, 0x34($v1) -/* D86D68 80240368 8E220054 */ lw $v0, 0x54($s1) -/* D86D6C 8024036C 8C42000C */ lw $v0, 0xc($v0) -/* D86D70 80240370 AC400020 */ sw $zero, 0x20($v0) -/* D86D74 80240374 8E250018 */ lw $a1, 0x18($s1) -/* D86D78 80240378 8E260028 */ lw $a2, 0x28($s1) -/* D86D7C 8024037C 8E270020 */ lw $a3, 0x20($s1) -/* D86D80 80240380 0C044898 */ jal create_shadow_type -/* D86D84 80240384 0000202D */ daddu $a0, $zero, $zero -/* D86D88 80240388 3C014210 */ lui $at, 0x4210 -/* D86D8C 8024038C 44810000 */ mtc1 $at, $f0 -/* D86D90 80240390 AE220040 */ sw $v0, 0x40($s1) -/* D86D94 80240394 24020003 */ addiu $v0, $zero, 3 -/* D86D98 80240398 A6220044 */ sh $v0, 0x44($s1) -/* D86D9C 8024039C 24020001 */ addiu $v0, $zero, 1 -/* D86DA0 802403A0 A6200046 */ sh $zero, 0x46($s1) -/* D86DA4 802403A4 AE20002C */ sw $zero, 0x2c($s1) -/* D86DA8 802403A8 A6220048 */ sh $v0, 0x48($s1) -/* D86DAC 802403AC 08090107 */ j .L8024041C -/* D86DB0 802403B0 E6200030 */ swc1 $f0, 0x30($s1) -/* D86DB4 802403B4 0000202D */ daddu $a0, $zero, $zero -/* D86DB8 802403B8 3C054210 */ lui $a1, 0x4210 -/* D86DBC 802403BC 3C064198 */ lui $a2, 0x4198 -/* D86DC0 802403C0 86270046 */ lh $a3, 0x46($s1) -/* D86DC4 802403C4 24020078 */ addiu $v0, $zero, 0x78 -/* D86DC8 802403C8 0C00A8ED */ jal update_lerp -/* D86DCC 802403CC AFA20010 */ sw $v0, 0x10($sp) -/* D86DD0 802403D0 96220046 */ lhu $v0, 0x46($s1) -/* D86DD4 802403D4 E6200030 */ swc1 $f0, 0x30($s1) -/* D86DD8 802403D8 24420001 */ addiu $v0, $v0, 1 -/* D86DDC 802403DC A6220046 */ sh $v0, 0x46($s1) -/* D86DE0 802403E0 00021400 */ sll $v0, $v0, 0x10 -/* D86DE4 802403E4 00021403 */ sra $v0, $v0, 0x10 -/* D86DE8 802403E8 28420078 */ slti $v0, $v0, 0x78 -/* D86DEC 802403EC 1440000B */ bnez $v0, .L8024041C -/* D86DF0 802403F0 24030001 */ addiu $v1, $zero, 1 -/* D86DF4 802403F4 C620002C */ lwc1 $f0, 0x2c($s1) -/* D86DF8 802403F8 24020002 */ addiu $v0, $zero, 2 -/* D86DFC 802403FC A6220048 */ sh $v0, 0x48($s1) -/* D86E00 80240400 24020004 */ addiu $v0, $zero, 4 -/* D86E04 80240404 A620004C */ sh $zero, 0x4c($s1) -/* D86E08 80240408 A623004A */ sh $v1, 0x4a($s1) -/* D86E0C 8024040C A623004E */ sh $v1, 0x4e($s1) -/* D86E10 80240410 A6220044 */ sh $v0, 0x44($s1) -/* D86E14 80240414 A6200046 */ sh $zero, 0x46($s1) -/* D86E18 80240418 E6200034 */ swc1 $f0, 0x34($s1) -.L8024041C: -/* D86E1C 8024041C 8623004A */ lh $v1, 0x4a($s1) -/* D86E20 80240420 24020001 */ addiu $v0, $zero, 1 -/* D86E24 80240424 10620005 */ beq $v1, $v0, .L8024043C -/* D86E28 80240428 24020002 */ addiu $v0, $zero, 2 -/* D86E2C 8024042C 1062001E */ beq $v1, $v0, .L802404A8 -/* D86E30 80240430 00000000 */ nop -/* D86E34 80240434 08090154 */ j .L80240550 -/* D86E38 80240438 00000000 */ nop -.L8024043C: -/* D86E3C 8024043C 8627004C */ lh $a3, 0x4c($s1) -/* D86E40 80240440 24100078 */ addiu $s0, $zero, 0x78 -/* D86E44 80240444 AFB00010 */ sw $s0, 0x10($sp) -/* D86E48 80240448 8E250034 */ lw $a1, 0x34($s1) -/* D86E4C 8024044C 3C0644B4 */ lui $a2, 0x44b4 -/* D86E50 80240450 0C00A8ED */ jal update_lerp -/* D86E54 80240454 24040004 */ addiu $a0, $zero, 4 -/* D86E58 80240458 8627004C */ lh $a3, 0x4c($s1) -/* D86E5C 8024045C E620002C */ swc1 $f0, 0x2c($s1) -/* D86E60 80240460 AFB00010 */ sw $s0, 0x10($sp) -/* D86E64 80240464 8E25001C */ lw $a1, 0x1c($s1) -/* D86E68 80240468 8E260024 */ lw $a2, 0x24($s1) -/* D86E6C 8024046C 0C00A8ED */ jal update_lerp -/* D86E70 80240470 2404000A */ addiu $a0, $zero, 0xa -/* D86E74 80240474 9622004C */ lhu $v0, 0x4c($s1) -/* D86E78 80240478 E6200004 */ swc1 $f0, 4($s1) -/* D86E7C 8024047C 24420001 */ addiu $v0, $v0, 1 -/* D86E80 80240480 A622004C */ sh $v0, 0x4c($s1) -/* D86E84 80240484 00021400 */ sll $v0, $v0, 0x10 -/* D86E88 80240488 00021403 */ sra $v0, $v0, 0x10 -/* D86E8C 8024048C 0050102A */ slt $v0, $v0, $s0 -/* D86E90 80240490 1440002F */ bnez $v0, .L80240550 -/* D86E94 80240494 2402010E */ addiu $v0, $zero, 0x10e -/* D86E98 80240498 A622004C */ sh $v0, 0x4c($s1) -/* D86E9C 8024049C 24020002 */ addiu $v0, $zero, 2 -/* D86EA0 802404A0 08090153 */ j .L8024054C -/* D86EA4 802404A4 A622004A */ sh $v0, 0x4a($s1) -.L802404A8: -/* D86EA8 802404A8 8622004C */ lh $v0, 0x4c($s1) -/* D86EAC 802404AC 44826000 */ mtc1 $v0, $f12 -/* D86EB0 802404B0 00000000 */ nop -/* D86EB4 802404B4 0C00A8BB */ jal sin_deg -/* D86EB8 802404B8 46806320 */ cvt.s.w $f12, $f12 -/* D86EBC 802404BC 3C013F80 */ lui $at, 0x3f80 -/* D86EC0 802404C0 44811000 */ mtc1 $at, $f2 -/* D86EC4 802404C4 00000000 */ nop -/* D86EC8 802404C8 46020000 */ add.s $f0, $f0, $f2 -/* D86ECC 802404CC 46000000 */ add.s $f0, $f0, $f0 -/* D86ED0 802404D0 C6220024 */ lwc1 $f2, 0x24($s1) -/* D86ED4 802404D4 8622004C */ lh $v0, 0x4c($s1) -/* D86ED8 802404D8 46001080 */ add.s $f2, $f2, $f0 -/* D86EDC 802404DC 24420008 */ addiu $v0, $v0, 8 -/* D86EE0 802404E0 44826000 */ mtc1 $v0, $f12 -/* D86EE4 802404E4 00000000 */ nop -/* D86EE8 802404E8 46806320 */ cvt.s.w $f12, $f12 -/* D86EEC 802404EC 0C00A6C9 */ jal clamp_angle -/* D86EF0 802404F0 E6220004 */ swc1 $f2, 4($s1) -/* D86EF4 802404F4 4600010D */ trunc.w.s $f4, $f0 -/* D86EF8 802404F8 44022000 */ mfc1 $v0, $f4 -/* D86EFC 802404FC C6200004 */ lwc1 $f0, 4($s1) -/* D86F00 80240500 A622004C */ sh $v0, 0x4c($s1) -/* D86F04 80240504 C60C0028 */ lwc1 $f12, 0x28($s0) -/* D86F08 80240508 8E060030 */ lw $a2, 0x30($s0) -/* D86F0C 8024050C 3C0141A0 */ lui $at, 0x41a0 -/* D86F10 80240510 44817000 */ mtc1 $at, $f14 -/* D86F14 80240514 E7A00010 */ swc1 $f0, 0x10($sp) -/* D86F18 80240518 C602002C */ lwc1 $f2, 0x2c($s0) -/* D86F1C 8024051C C6200008 */ lwc1 $f0, 8($s1) -/* D86F20 80240520 E7A00014 */ swc1 $f0, 0x14($sp) -/* D86F24 80240524 8E270000 */ lw $a3, ($s1) -/* D86F28 80240528 0C00A7CB */ jal dist3D -/* D86F2C 8024052C 460E1380 */ add.s $f14, $f2, $f14 -/* D86F30 80240530 3C0141F0 */ lui $at, 0x41f0 -/* D86F34 80240534 44811000 */ mtc1 $at, $f2 -/* D86F38 80240538 00000000 */ nop -/* D86F3C 8024053C 4600103C */ c.lt.s $f2, $f0 -/* D86F40 80240540 00000000 */ nop -/* D86F44 80240544 45010002 */ bc1t .L80240550 -/* D86F48 80240548 24020003 */ addiu $v0, $zero, 3 -.L8024054C: -/* D86F4C 8024054C A622004E */ sh $v0, 0x4e($s1) -.L80240550: -/* D86F50 80240550 86230048 */ lh $v1, 0x48($s1) -/* D86F54 80240554 24020001 */ addiu $v0, $zero, 1 -/* D86F58 80240558 10620005 */ beq $v1, $v0, .L80240570 -/* D86F5C 8024055C 24020002 */ addiu $v0, $zero, 2 -/* D86F60 80240560 10620008 */ beq $v1, $v0, .L80240584 -/* D86F64 80240564 00000000 */ nop -/* D86F68 80240568 08090171 */ j .L802405C4 -/* D86F6C 8024056C 00000000 */ nop -.L80240570: -/* D86F70 80240570 C620002C */ lwc1 $f0, 0x2c($s1) -/* D86F74 80240574 C62C0030 */ lwc1 $f12, 0x30($s1) -/* D86F78 80240578 0C00A6C9 */ jal clamp_angle -/* D86F7C 8024057C 460C0300 */ add.s $f12, $f0, $f12 -/* D86F80 80240580 E620002C */ swc1 $f0, 0x2c($s1) -.L80240584: -/* D86F84 80240584 8E220054 */ lw $v0, 0x54($s1) -/* D86F88 80240588 C620002C */ lwc1 $f0, 0x2c($s1) -/* D86F8C 8024058C 8C42000C */ lw $v0, 0xc($v0) -/* D86F90 80240590 E4400024 */ swc1 $f0, 0x24($v0) -/* D86F94 80240594 8E220054 */ lw $v0, 0x54($s1) -/* D86F98 80240598 C6200018 */ lwc1 $f0, 0x18($s1) -/* D86F9C 8024059C 8C42000C */ lw $v0, 0xc($v0) -/* D86FA0 802405A0 E4400004 */ swc1 $f0, 4($v0) -/* D86FA4 802405A4 8E220054 */ lw $v0, 0x54($s1) -/* D86FA8 802405A8 C6200004 */ lwc1 $f0, 4($s1) -/* D86FAC 802405AC 8C42000C */ lw $v0, 0xc($v0) -/* D86FB0 802405B0 E4400008 */ swc1 $f0, 8($v0) -/* D86FB4 802405B4 8E220054 */ lw $v0, 0x54($s1) -/* D86FB8 802405B8 C6200020 */ lwc1 $f0, 0x20($s1) -/* D86FBC 802405BC 8C42000C */ lw $v0, 0xc($v0) -/* D86FC0 802405C0 E440000C */ swc1 $f0, 0xc($v0) -.L802405C4: -/* D86FC4 802405C4 8FBF0020 */ lw $ra, 0x20($sp) -/* D86FC8 802405C8 8FB1001C */ lw $s1, 0x1c($sp) -/* D86FCC 802405CC 8FB00018 */ lw $s0, 0x18($sp) -/* D86FD0 802405D0 0000102D */ daddu $v0, $zero, $zero -/* D86FD4 802405D4 03E00008 */ jr $ra -/* D86FD8 802405D8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_pra/pra_32/func_802405DC_D86A00.s b/asm/nonmatchings/world/area_pra/pra_32/func_802405DC_D86A00.s deleted file mode 100644 index 4b137a70e8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_32/func_802405DC_D86A00.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405DC_D86FDC -/* D86FDC 802405DC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D86FE0 802405E0 AFB00010 */ sw $s0, 0x10($sp) -/* D86FE4 802405E4 0080802D */ daddu $s0, $a0, $zero -/* D86FE8 802405E8 AFBF0014 */ sw $ra, 0x14($sp) -/* D86FEC 802405EC 8E02000C */ lw $v0, 0xc($s0) -/* D86FF0 802405F0 0C0B1EAF */ jal get_variable -/* D86FF4 802405F4 8C450000 */ lw $a1, ($v0) -/* D86FF8 802405F8 8E030084 */ lw $v1, 0x84($s0) -/* D86FFC 802405FC 8FBF0014 */ lw $ra, 0x14($sp) -/* D87000 80240600 8463004E */ lh $v1, 0x4e($v1) -/* D87004 80240604 8FB00010 */ lw $s0, 0x10($sp) -/* D87008 80240608 00621826 */ xor $v1, $v1, $v0 -/* D8700C 8024060C 2C630001 */ sltiu $v1, $v1, 1 -/* D87010 80240610 00031040 */ sll $v0, $v1, 1 -/* D87014 80240614 03E00008 */ jr $ra -/* D87018 80240618 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_32/func_8024061C_D86A00.s b/asm/nonmatchings/world/area_pra/pra_32/func_8024061C_D86A00.s deleted file mode 100644 index 0f8b610075..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_32/func_8024061C_D86A00.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_D8701C -/* D8701C 8024061C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D87020 80240620 AFB20020 */ sw $s2, 0x20($sp) -/* D87024 80240624 0080902D */ daddu $s2, $a0, $zero -/* D87028 80240628 AFBF0024 */ sw $ra, 0x24($sp) -/* D8702C 8024062C AFB1001C */ sw $s1, 0x1c($sp) -/* D87030 80240630 AFB00018 */ sw $s0, 0x18($sp) -/* D87034 80240634 10A00035 */ beqz $a1, .L8024070C -/* D87038 80240638 8E51000C */ lw $s1, 0xc($s2) -/* D8703C 8024063C 0C00AB39 */ jal heap_malloc -/* D87040 80240640 24040058 */ addiu $a0, $zero, 0x58 -/* D87044 80240644 0040802D */ daddu $s0, $v0, $zero -/* D87048 80240648 AE500084 */ sw $s0, 0x84($s2) -/* D8704C 8024064C 8E250000 */ lw $a1, ($s1) -/* D87050 80240650 26310004 */ addiu $s1, $s1, 4 -/* D87054 80240654 0C0B1EAF */ jal get_variable -/* D87058 80240658 0240202D */ daddu $a0, $s2, $zero -/* D8705C 8024065C AE020038 */ sw $v0, 0x38($s0) -/* D87060 80240660 8E250000 */ lw $a1, ($s1) -/* D87064 80240664 26310004 */ addiu $s1, $s1, 4 -/* D87068 80240668 0C0B210B */ jal get_float_variable -/* D8706C 8024066C 0240202D */ daddu $a0, $s2, $zero -/* D87070 80240670 E6000018 */ swc1 $f0, 0x18($s0) -/* D87074 80240674 8E250000 */ lw $a1, ($s1) -/* D87078 80240678 26310004 */ addiu $s1, $s1, 4 -/* D8707C 8024067C 0C0B210B */ jal get_float_variable -/* D87080 80240680 0240202D */ daddu $a0, $s2, $zero -/* D87084 80240684 E6000024 */ swc1 $f0, 0x24($s0) -/* D87088 80240688 8E250000 */ lw $a1, ($s1) -/* D8708C 8024068C 26310004 */ addiu $s1, $s1, 4 -/* D87090 80240690 0C0B210B */ jal get_float_variable -/* D87094 80240694 0240202D */ daddu $a0, $s2, $zero -/* D87098 80240698 E6000020 */ swc1 $f0, 0x20($s0) -/* D8709C 8024069C 8E250000 */ lw $a1, ($s1) -/* D870A0 802406A0 0C0B210B */ jal get_float_variable -/* D870A4 802406A4 0240202D */ daddu $a0, $s2, $zero -/* D870A8 802406A8 3C013F80 */ lui $at, 0x3f80 -/* D870AC 802406AC 44811000 */ mtc1 $at, $f2 -/* D870B0 802406B0 E6000028 */ swc1 $f0, 0x28($s0) -/* D870B4 802406B4 AFA00014 */ sw $zero, 0x14($sp) -/* D870B8 802406B8 E7A20010 */ swc1 $f2, 0x10($sp) -/* D870BC 802406BC 8E050018 */ lw $a1, 0x18($s0) -/* D870C0 802406C0 8E060024 */ lw $a2, 0x24($s0) -/* D870C4 802406C4 8E070020 */ lw $a3, 0x20($s0) -/* D870C8 802406C8 0C01C9AC */ jal func_800726B0 -/* D870CC 802406CC 24040001 */ addiu $a0, $zero, 1 -/* D870D0 802406D0 AE020054 */ sw $v0, 0x54($s0) -/* D870D4 802406D4 8C43000C */ lw $v1, 0xc($v0) -/* D870D8 802406D8 9202003B */ lbu $v0, 0x3b($s0) -/* D870DC 802406DC A0620034 */ sb $v0, 0x34($v1) -/* D870E0 802406E0 8E020054 */ lw $v0, 0x54($s0) -/* D870E4 802406E4 8C42000C */ lw $v0, 0xc($v0) -/* D870E8 802406E8 AC400020 */ sw $zero, 0x20($v0) -/* D870EC 802406EC 8E050018 */ lw $a1, 0x18($s0) -/* D870F0 802406F0 8E060028 */ lw $a2, 0x28($s0) -/* D870F4 802406F4 8E070020 */ lw $a3, 0x20($s0) -/* D870F8 802406F8 0C044898 */ jal create_shadow_type -/* D870FC 802406FC 0000202D */ daddu $a0, $zero, $zero -/* D87100 80240700 AE020040 */ sw $v0, 0x40($s0) -/* D87104 80240704 2402010E */ addiu $v0, $zero, 0x10e -/* D87108 80240708 A602004C */ sh $v0, 0x4c($s0) -.L8024070C: -/* D8710C 8024070C 8FBF0024 */ lw $ra, 0x24($sp) -/* D87110 80240710 8FB20020 */ lw $s2, 0x20($sp) -/* D87114 80240714 8FB1001C */ lw $s1, 0x1c($sp) -/* D87118 80240718 8FB00018 */ lw $s0, 0x18($sp) -/* D8711C 8024071C 24020002 */ addiu $v0, $zero, 2 -/* D87120 80240720 03E00008 */ jr $ra -/* D87124 80240724 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_pra/pra_32/func_80240728_D86A00.s b/asm/nonmatchings/world/area_pra/pra_32/func_80240728_D86A00.s deleted file mode 100644 index de3b642613..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_32/func_80240728_D86A00.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240728_D87128 -/* D87128 80240728 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8712C 8024072C AFBF0014 */ sw $ra, 0x14($sp) -/* D87130 80240730 AFB00010 */ sw $s0, 0x10($sp) -/* D87134 80240734 8C900084 */ lw $s0, 0x84($a0) -/* D87138 80240738 8602004C */ lh $v0, 0x4c($s0) -/* D8713C 8024073C 44826000 */ mtc1 $v0, $f12 -/* D87140 80240740 00000000 */ nop -/* D87144 80240744 0C00A8BB */ jal sin_deg -/* D87148 80240748 46806320 */ cvt.s.w $f12, $f12 -/* D8714C 8024074C 3C013F80 */ lui $at, 0x3f80 -/* D87150 80240750 44811000 */ mtc1 $at, $f2 -/* D87154 80240754 00000000 */ nop -/* D87158 80240758 46020000 */ add.s $f0, $f0, $f2 -/* D8715C 8024075C 46000000 */ add.s $f0, $f0, $f0 -/* D87160 80240760 C6020024 */ lwc1 $f2, 0x24($s0) -/* D87164 80240764 8602004C */ lh $v0, 0x4c($s0) -/* D87168 80240768 46001080 */ add.s $f2, $f2, $f0 -/* D8716C 8024076C 24420008 */ addiu $v0, $v0, 8 -/* D87170 80240770 44826000 */ mtc1 $v0, $f12 -/* D87174 80240774 00000000 */ nop -/* D87178 80240778 46806320 */ cvt.s.w $f12, $f12 -/* D8717C 8024077C 0C00A6C9 */ jal clamp_angle -/* D87180 80240780 E6020004 */ swc1 $f2, 4($s0) -/* D87184 80240784 4600010D */ trunc.w.s $f4, $f0 -/* D87188 80240788 44022000 */ mfc1 $v0, $f4 -/* D8718C 8024078C 00000000 */ nop -/* D87190 80240790 A602004C */ sh $v0, 0x4c($s0) -/* D87194 80240794 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* D87198 80240798 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* D8719C 8024079C C44C0028 */ lwc1 $f12, 0x28($v0) -/* D871A0 802407A0 C44E0030 */ lwc1 $f14, 0x30($v0) -/* D871A4 802407A4 8E060018 */ lw $a2, 0x18($s0) -/* D871A8 802407A8 0C00A7B5 */ jal dist2D -/* D871AC 802407AC 8E070020 */ lw $a3, 0x20($s0) -/* D871B0 802407B0 3C0141F0 */ lui $at, 0x41f0 -/* D871B4 802407B4 44811000 */ mtc1 $at, $f2 -/* D871B8 802407B8 00000000 */ nop -/* D871BC 802407BC 4602003E */ c.le.s $f0, $f2 -/* D871C0 802407C0 00000000 */ nop -/* D871C4 802407C4 45000002 */ bc1f .L802407D0 -/* D871C8 802407C8 24020003 */ addiu $v0, $zero, 3 -/* D871CC 802407CC A602004E */ sh $v0, 0x4e($s0) -.L802407D0: -/* D871D0 802407D0 8E020054 */ lw $v0, 0x54($s0) -/* D871D4 802407D4 C6000018 */ lwc1 $f0, 0x18($s0) -/* D871D8 802407D8 8C42000C */ lw $v0, 0xc($v0) -/* D871DC 802407DC E4400004 */ swc1 $f0, 4($v0) -/* D871E0 802407E0 8E020054 */ lw $v0, 0x54($s0) -/* D871E4 802407E4 C6000004 */ lwc1 $f0, 4($s0) -/* D871E8 802407E8 8C42000C */ lw $v0, 0xc($v0) -/* D871EC 802407EC E4400008 */ swc1 $f0, 8($v0) -/* D871F0 802407F0 8E020054 */ lw $v0, 0x54($s0) -/* D871F4 802407F4 C6000020 */ lwc1 $f0, 0x20($s0) -/* D871F8 802407F8 8C42000C */ lw $v0, 0xc($v0) -/* D871FC 802407FC E440000C */ swc1 $f0, 0xc($v0) -/* D87200 80240800 8FBF0014 */ lw $ra, 0x14($sp) -/* D87204 80240804 8FB00010 */ lw $s0, 0x10($sp) -/* D87208 80240808 0000102D */ daddu $v0, $zero, $zero -/* D8720C 8024080C 03E00008 */ jr $ra -/* D87210 80240810 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_32/func_80240814_D86A00.s b/asm/nonmatchings/world/area_pra/pra_32/func_80240814_D86A00.s deleted file mode 100644 index e68d8b267a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_32/func_80240814_D86A00.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240814_D87214 -/* D87214 80240814 3C02800A */ lui $v0, %hi(D_8009A650) -/* D87218 80240818 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* D8721C 8024081C 8C430000 */ lw $v1, ($v0) -/* D87220 80240820 2404FF7F */ addiu $a0, $zero, -0x81 -/* D87224 80240824 00641824 */ and $v1, $v1, $a0 -/* D87228 80240828 AC430000 */ sw $v1, ($v0) -/* D8722C 8024082C 03E00008 */ jr $ra -/* D87230 80240830 24020002 */ addiu $v0, $zero, 2 -/* D87234 80240834 00000000 */ nop -/* D87238 80240838 00000000 */ nop -/* D8723C 8024083C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_33/func_80240020_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/func_80240020_D896E0.s deleted file mode 100644 index dbb7093f81..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/func_80240020_D896E0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D89700 -/* D89700 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D89704 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D89708 80240028 00822024 */ and $a0, $a0, $v0 -/* D8970C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D89710 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D89714 80240034 00821821 */ addu $v1, $a0, $v0 -/* D89718 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D8971C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D89720 80240040 30620001 */ andi $v0, $v1, 1 -/* D89724 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D89728 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D8972C 8024004C 03E00008 */ jr $ra -/* D89730 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_33/func_80240054_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/func_80240054_D896E0.s deleted file mode 100644 index 2437f0e579..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/func_80240054_D896E0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054_D89734 -/* D89734 80240054 00041403 */ sra $v0, $a0, 0x10 -/* D89738 80240058 304300FF */ andi $v1, $v0, 0xff -/* D8973C 8024005C 24020006 */ addiu $v0, $zero, 6 -/* D89740 80240060 10620015 */ beq $v1, $v0, .L802400B8 -/* D89744 80240064 28620007 */ slti $v0, $v1, 7 -/* D89748 80240068 10400005 */ beqz $v0, .L80240080 -/* D8974C 8024006C 24020001 */ addiu $v0, $zero, 1 -/* D89750 80240070 1062000A */ beq $v1, $v0, .L8024009C -/* D89754 80240074 3C020100 */ lui $v0, 0x100 -/* D89758 80240078 03E00008 */ jr $ra -/* D8975C 8024007C 00821025 */ or $v0, $a0, $v0 -.L80240080: -/* D89760 80240080 2862000A */ slti $v0, $v1, 0xa -/* D89764 80240084 10400016 */ beqz $v0, .L802400E0 -/* D89768 80240088 28620008 */ slti $v0, $v1, 8 -/* D8976C 8024008C 14400015 */ bnez $v0, .L802400E4 -/* D89770 80240090 3C020100 */ lui $v0, 0x100 -/* D89774 80240094 03E00008 */ jr $ra -/* D89778 80240098 0080102D */ daddu $v0, $a0, $zero -.L8024009C: -/* D8977C 8024009C 3C020001 */ lui $v0, 1 -/* D89780 802400A0 3442000C */ ori $v0, $v0, 0xc -/* D89784 802400A4 0044102A */ slt $v0, $v0, $a0 -/* D89788 802400A8 1040000E */ beqz $v0, .L802400E4 -/* D8978C 802400AC 3C020100 */ lui $v0, 0x100 -.L802400B0: -/* D89790 802400B0 03E00008 */ jr $ra -/* D89794 802400B4 0080102D */ daddu $v0, $a0, $zero -.L802400B8: -/* D89798 802400B8 3C02FFF9 */ lui $v0, 0xfff9 -/* D8979C 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D897A0 802400C0 00821821 */ addu $v1, $a0, $v0 -/* D897A4 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D897A8 802400C8 10400005 */ beqz $v0, .L802400E0 -/* D897AC 802400CC 30620001 */ andi $v0, $v1, 1 -/* D897B0 802400D0 1440FFF7 */ bnez $v0, .L802400B0 -/* D897B4 802400D4 24820001 */ addiu $v0, $a0, 1 -/* D897B8 802400D8 03E00008 */ jr $ra -/* D897BC 802400DC 00000000 */ nop -.L802400E0: -/* D897C0 802400E0 3C020100 */ lui $v0, 0x100 -.L802400E4: -/* D897C4 802400E4 03E00008 */ jr $ra -/* D897C8 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_33/func_802400EC_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/func_802400EC_D896E0.s deleted file mode 100644 index c6cc1a8475..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/func_802400EC_D896E0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_D897CC -/* D897CC 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D897D0 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* D897D4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D897D8 802400F8 3C058024 */ lui $a1, 0x8024 -/* D897DC 802400FC 24A50128 */ addiu $a1, $a1, 0x128 -/* D897E0 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* D897E4 80240104 0C048C56 */ jal bind_dynamic_entity_3 -/* D897E8 80240108 0000202D */ daddu $a0, $zero, $zero -/* D897EC 8024010C 8E03013C */ lw $v1, 0x13c($s0) -/* D897F0 80240110 AC620000 */ sw $v0, ($v1) -/* D897F4 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* D897F8 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* D897FC 8024011C 24020002 */ addiu $v0, $zero, 2 -/* D89800 80240120 03E00008 */ jr $ra -/* D89804 80240124 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_33/func_80240128_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/func_80240128_D896E0.s deleted file mode 100644 index b2c5aabd0a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/func_80240128_D896E0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240128_D89808 -/* D89808 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D8980C 8024012C AFB00040 */ sw $s0, 0x40($sp) -/* D89810 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D89814 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D89818 80240138 AFB20048 */ sw $s2, 0x48($sp) -/* D8981C 8024013C AFBF004C */ sw $ra, 0x4c($sp) -/* D89820 80240140 AFB10044 */ sw $s1, 0x44($sp) -/* D89824 80240144 8E020000 */ lw $v0, ($s0) -/* D89828 80240148 821100BE */ lb $s1, 0xbe($s0) -/* D8982C 8024014C 30420001 */ andi $v0, $v0, 1 -/* D89830 80240150 10400061 */ beqz $v0, .L802402D8 -/* D89834 80240154 27B20020 */ addiu $s2, $sp, 0x20 -/* D89838 80240158 8E0400CC */ lw $a0, 0xcc($s0) -/* D8983C 8024015C 0C044181 */ jal get_shadow_by_index -/* D89840 80240160 00000000 */ nop -/* D89844 80240164 0C048B77 */ jal func_80122DDC -/* D89848 80240168 84440008 */ lh $a0, 8($v0) -/* D8984C 8024016C 8C430000 */ lw $v1, ($v0) -/* D89850 80240170 34630200 */ ori $v1, $v1, 0x200 -/* D89854 80240174 AC430000 */ sw $v1, ($v0) -/* D89858 80240178 8E050028 */ lw $a1, 0x28($s0) -/* D8985C 8024017C 8E06002C */ lw $a2, 0x2c($s0) -/* D89860 80240180 27A20030 */ addiu $v0, $sp, 0x30 -/* D89864 80240184 AFA20010 */ sw $v0, 0x10($sp) -/* D89868 80240188 27A20034 */ addiu $v0, $sp, 0x34 -/* D8986C 8024018C AFA20014 */ sw $v0, 0x14($sp) -/* D89870 80240190 C6000030 */ lwc1 $f0, 0x30($s0) -/* D89874 80240194 3C04800A */ lui $a0, 0x800a -/* D89878 80240198 8484A634 */ lh $a0, -0x59cc($a0) -/* D8987C 8024019C 46000007 */ neg.s $f0, $f0 -/* D89880 802401A0 44070000 */ mfc1 $a3, $f0 -/* D89884 802401A4 27A20038 */ addiu $v0, $sp, 0x38 -/* D89888 802401A8 0C00B94E */ jal get_screen_coords -/* D8988C 802401AC AFA20018 */ sw $v0, 0x18($sp) -/* D89890 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D89894 802401B4 0C090008 */ jal func_80240020 -/* D89898 802401B8 00000000 */ nop -/* D8989C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) -/* D898A0 802401C0 3C014307 */ lui $at, 0x4307 -/* D898A4 802401C4 44810000 */ mtc1 $at, $f0 -/* D898A8 802401C8 00000000 */ nop -/* D898AC 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D898B0 802401D0 00000000 */ nop -/* D898B4 802401D4 4500000B */ bc1f .L80240204 -/* D898B8 802401D8 24040002 */ addiu $a0, $zero, 2 -/* D898BC 802401DC 3C014361 */ lui $at, 0x4361 -/* D898C0 802401E0 44810000 */ mtc1 $at, $f0 -/* D898C4 802401E4 00000000 */ nop -/* D898C8 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D898CC 802401EC 00000000 */ nop -/* D898D0 802401F0 45000004 */ bc1f .L80240204 -/* D898D4 802401F4 00000000 */ nop -/* D898D8 802401F8 0C090015 */ jal func_80240054 -/* D898DC 802401FC 0040202D */ daddu $a0, $v0, $zero -/* D898E0 80240200 24040002 */ addiu $a0, $zero, 2 -.L80240204: -/* D898E4 80240204 3C063F80 */ lui $a2, 0x3f80 -/* D898E8 80240208 0C0B76A3 */ jal func_802DDA8C -/* D898EC 8024020C 0040282D */ daddu $a1, $v0, $zero -/* D898F0 80240210 8E020000 */ lw $v0, ($s0) -/* D898F4 80240214 3C030002 */ lui $v1, 2 -/* D898F8 80240218 00431024 */ and $v0, $v0, $v1 -/* D898FC 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 -/* D89900 80240220 24110011 */ addiu $s1, $zero, 0x11 -/* D89904 80240224 9203000E */ lbu $v1, 0xe($s0) -/* D89908 80240228 3C02802E */ lui $v0, 0x802e -/* D8990C 8024022C 90429D70 */ lbu $v0, -0x6290($v0) -/* D89910 80240230 10620018 */ beq $v1, $v0, .L80240294 -/* D89914 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D89918 80240238 1040000B */ beqz $v0, .L80240268 -/* D8991C 8024023C 24110011 */ addiu $s1, $zero, 0x11 -/* D89920 80240240 24040002 */ addiu $a0, $zero, 2 -/* D89924 80240244 2405FFFF */ addiu $a1, $zero, -1 -/* D89928 80240248 24060007 */ addiu $a2, $zero, 7 -/* D8992C 8024024C 0060102D */ daddu $v0, $v1, $zero -/* D89930 80240250 0000382D */ daddu $a3, $zero, $zero -/* D89934 80240254 AFA00010 */ sw $zero, 0x10($sp) -/* D89938 80240258 AFA00014 */ sw $zero, 0x14($sp) -/* D8993C 8024025C AFA0001C */ sw $zero, 0x1c($sp) -/* D89940 80240260 080900A3 */ j .L8024028C -/* D89944 80240264 AFA20018 */ sw $v0, 0x18($sp) -.L80240268: -/* D89948 80240268 2411000D */ addiu $s1, $zero, 0xd -/* D8994C 8024026C 24040002 */ addiu $a0, $zero, 2 -/* D89950 80240270 2405FFFF */ addiu $a1, $zero, -1 -/* D89954 80240274 0000302D */ daddu $a2, $zero, $zero -/* D89958 80240278 00C0382D */ daddu $a3, $a2, $zero -/* D8995C 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* D89960 80240280 AFA00014 */ sw $zero, 0x14($sp) -/* D89964 80240284 AFA00018 */ sw $zero, 0x18($sp) -/* D89968 80240288 AFA0001C */ sw $zero, 0x1c($sp) -.L8024028C: -/* D8996C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D89970 80240290 00000000 */ nop -.L80240294: -/* D89974 80240294 9202000E */ lbu $v0, 0xe($s0) -/* D89978 80240298 3C01802E */ lui $at, 0x802e -/* D8997C 8024029C A0229D70 */ sb $v0, -0x6290($at) -/* D89980 802402A0 080900AD */ j .L802402B4 -/* D89984 802402A4 0240202D */ daddu $a0, $s2, $zero -.L802402A8: -/* D89988 802402A8 3C01802E */ lui $at, 0x802e -/* D8998C 802402AC A0209D70 */ sb $zero, -0x6290($at) -/* D89990 802402B0 0240202D */ daddu $a0, $s2, $zero -.L802402B4: -/* D89994 802402B4 AC910000 */ sw $s1, ($a0) -/* D89998 802402B8 AC900008 */ sw $s0, 8($a0) -/* D8999C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D899A0 802402C0 3C038024 */ lui $v1, 0x8024 -/* D899A4 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 -/* D899A8 802402C8 AC83000C */ sw $v1, 0xc($a0) -/* D899AC 802402CC 00021023 */ negu $v0, $v0 -/* D899B0 802402D0 0C047644 */ jal queue_render_task -/* D899B4 802402D4 AC820004 */ sw $v0, 4($a0) -.L802402D8: -/* D899B8 802402D8 8FBF004C */ lw $ra, 0x4c($sp) -/* D899BC 802402DC 8FB20048 */ lw $s2, 0x48($sp) -/* D899C0 802402E0 8FB10044 */ lw $s1, 0x44($sp) -/* D899C4 802402E4 8FB00040 */ lw $s0, 0x40($sp) -/* D899C8 802402E8 03E00008 */ jr $ra -/* D899CC 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_33/func_802402F0_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/func_802402F0_D896E0.s deleted file mode 100644 index 84f8188ccd..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/func_802402F0_D896E0.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D899D0 -/* D899D0 802402F0 3C03800A */ lui $v1, 0x800a -/* D899D4 802402F4 8463A634 */ lh $v1, -0x59cc($v1) -/* D899D8 802402F8 3C07BF80 */ lui $a3, 0xbf80 -/* D899DC 802402FC 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D899E0 80240300 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D899E4 80240304 4480A000 */ mtc1 $zero, $f20 -/* D899E8 80240308 AFB1011C */ sw $s1, 0x11c($sp) -/* D899EC 8024030C 0080882D */ daddu $s1, $a0, $zero -/* D899F0 80240310 AFB00118 */ sw $s0, 0x118($sp) -/* D899F4 80240314 27B00098 */ addiu $s0, $sp, 0x98 -/* D899F8 80240318 AFBF0120 */ sw $ra, 0x120($sp) -/* D899FC 8024031C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D89A00 80240320 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D89A04 80240324 00031080 */ sll $v0, $v1, 2 -/* D89A08 80240328 00431021 */ addu $v0, $v0, $v1 -/* D89A0C 8024032C 00021080 */ sll $v0, $v0, 2 -/* D89A10 80240330 00431023 */ subu $v0, $v0, $v1 -/* D89A14 80240334 000218C0 */ sll $v1, $v0, 3 -/* D89A18 80240338 00431021 */ addu $v0, $v0, $v1 -/* D89A1C 8024033C 000210C0 */ sll $v0, $v0, 3 -/* D89A20 80240340 3C01800B */ lui $at, 0x800b -/* D89A24 80240344 00220821 */ addu $at, $at, $v0 -/* D89A28 80240348 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D89A2C 8024034C 4406A000 */ mfc1 $a2, $f20 -/* D89A30 80240350 4600B587 */ neg.s $f22, $f22 -/* D89A34 80240354 4405B000 */ mfc1 $a1, $f22 -/* D89A38 80240358 0200202D */ daddu $a0, $s0, $zero -/* D89A3C 8024035C 0C019EC8 */ jal guRotateF -/* D89A40 80240360 E7B40010 */ swc1 $f20, 0x10($sp) -/* D89A44 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D89A48 80240368 0C00A6C9 */ jal clamp_angle -/* D89A4C 8024036C 00000000 */ nop -/* D89A50 80240370 44050000 */ mfc1 $a1, $f0 -/* D89A54 80240374 4406A000 */ mfc1 $a2, $f20 -/* D89A58 80240378 4407A000 */ mfc1 $a3, $f20 -/* D89A5C 8024037C 3C013F80 */ lui $at, 0x3f80 -/* D89A60 80240380 4481C000 */ mtc1 $at, $f24 -/* D89A64 80240384 27A40018 */ addiu $a0, $sp, 0x18 -/* D89A68 80240388 0C019EC8 */ jal guRotateF -/* D89A6C 8024038C E7B80010 */ swc1 $f24, 0x10($sp) -/* D89A70 80240390 0200202D */ daddu $a0, $s0, $zero -/* D89A74 80240394 27A50018 */ addiu $a1, $sp, 0x18 -/* D89A78 80240398 0C019D80 */ jal guMtxCatF -/* D89A7C 8024039C 00A0302D */ daddu $a2, $a1, $zero -/* D89A80 802403A0 4405B000 */ mfc1 $a1, $f22 -/* D89A84 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D89A88 802403A8 4407C000 */ mfc1 $a3, $f24 -/* D89A8C 802403AC 0200202D */ daddu $a0, $s0, $zero -/* D89A90 802403B0 0C019EC8 */ jal guRotateF -/* D89A94 802403B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D89A98 802403B8 27A40018 */ addiu $a0, $sp, 0x18 -/* D89A9C 802403BC 0200282D */ daddu $a1, $s0, $zero -/* D89AA0 802403C0 0C019D80 */ jal guMtxCatF -/* D89AA4 802403C4 0080302D */ daddu $a2, $a0, $zero -/* D89AA8 802403C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D89AAC 802403CC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D89AB0 802403D0 4406A000 */ mfc1 $a2, $f20 -/* D89AB4 802403D4 4407C000 */ mfc1 $a3, $f24 -/* D89AB8 802403D8 0C019EC8 */ jal guRotateF -/* D89ABC 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D89AC0 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* D89AC4 802403E4 0200282D */ daddu $a1, $s0, $zero -/* D89AC8 802403E8 0C019D80 */ jal guMtxCatF -/* D89ACC 802403EC 0080302D */ daddu $a2, $a0, $zero -/* D89AD0 802403F0 3C013F36 */ lui $at, 0x3f36 -/* D89AD4 802403F4 3421DB6E */ ori $at, $at, 0xdb6e -/* D89AD8 802403F8 44810000 */ mtc1 $at, $f0 -/* D89ADC 802403FC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D89AE0 80240400 44050000 */ mfc1 $a1, $f0 -/* D89AE4 80240404 0200202D */ daddu $a0, $s0, $zero -/* D89AE8 80240408 00A0302D */ daddu $a2, $a1, $zero -/* D89AEC 8024040C 0C019DF0 */ jal guScaleF -/* D89AF0 80240410 00A0382D */ daddu $a3, $a1, $zero -/* D89AF4 80240414 27A40018 */ addiu $a0, $sp, 0x18 -/* D89AF8 80240418 0200282D */ daddu $a1, $s0, $zero -/* D89AFC 8024041C 0C019D80 */ jal guMtxCatF -/* D89B00 80240420 0080302D */ daddu $a2, $a0, $zero -/* D89B04 80240424 27B00058 */ addiu $s0, $sp, 0x58 -/* D89B08 80240428 C6200030 */ lwc1 $f0, 0x30($s1) -/* D89B0C 8024042C 3C014040 */ lui $at, 0x4040 -/* D89B10 80240430 44811000 */ mtc1 $at, $f2 -/* D89B14 80240434 46000007 */ neg.s $f0, $f0 -/* D89B18 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* D89B1C 8024043C 8E250028 */ lw $a1, 0x28($s1) -/* D89B20 80240440 8E26002C */ lw $a2, 0x2c($s1) -/* D89B24 80240444 44070000 */ mfc1 $a3, $f0 -/* D89B28 80240448 0C019E40 */ jal guTranslateF -/* D89B2C 8024044C 0200202D */ daddu $a0, $s0, $zero -/* D89B30 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* D89B34 80240454 0200282D */ daddu $a1, $s0, $zero -/* D89B38 80240458 0C019D80 */ jal guMtxCatF -/* D89B3C 8024045C 0080302D */ daddu $a2, $a0, $zero -/* D89B40 80240460 24040002 */ addiu $a0, $zero, 2 -/* D89B44 80240464 0000282D */ daddu $a1, $zero, $zero -/* D89B48 80240468 00A0302D */ daddu $a2, $a1, $zero -/* D89B4C 8024046C 00A0382D */ daddu $a3, $a1, $zero -/* D89B50 80240470 27A20018 */ addiu $v0, $sp, 0x18 -/* D89B54 80240474 0C0B7710 */ jal render_sprite -/* D89B58 80240478 AFA20010 */ sw $v0, 0x10($sp) -/* D89B5C 8024047C 8FBF0120 */ lw $ra, 0x120($sp) -/* D89B60 80240480 8FB1011C */ lw $s1, 0x11c($sp) -/* D89B64 80240484 8FB00118 */ lw $s0, 0x118($sp) -/* D89B68 80240488 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D89B6C 8024048C D7B60130 */ ldc1 $f22, 0x130($sp) -/* D89B70 80240490 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D89B74 80240494 03E00008 */ jr $ra -/* D89B78 80240498 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_33/func_8024049C_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/func_8024049C_D896E0.s deleted file mode 100644 index b4bc7f4376..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/func_8024049C_D896E0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_D89B7C -/* D89B7C 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D89B80 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* D89B84 802404A4 0080802D */ daddu $s0, $a0, $zero -/* D89B88 802404A8 AFBF0014 */ sw $ra, 0x14($sp) -/* D89B8C 802404AC 8E020084 */ lw $v0, 0x84($s0) -/* D89B90 802404B0 0440000E */ bltz $v0, .L802404EC -/* D89B94 802404B4 28420002 */ slti $v0, $v0, 2 -/* D89B98 802404B8 1040000C */ beqz $v0, .L802404EC -/* D89B9C 802404BC 00000000 */ nop -/* D89BA0 802404C0 3C058024 */ lui $a1, 0x8024 -/* D89BA4 802404C4 24A50500 */ addiu $a1, $a1, 0x500 -/* D89BA8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 -/* D89BAC 802404CC 0000202D */ daddu $a0, $zero, $zero -/* D89BB0 802404D0 8E03013C */ lw $v1, 0x13c($s0) -/* D89BB4 802404D4 AC620000 */ sw $v0, ($v1) -/* D89BB8 802404D8 3C03800A */ lui $v1, %hi(D_8009A650) -/* D89BBC 802404DC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D89BC0 802404E0 8C620000 */ lw $v0, ($v1) -/* D89BC4 802404E4 34420080 */ ori $v0, $v0, 0x80 -/* D89BC8 802404E8 AC620000 */ sw $v0, ($v1) -.L802404EC: -/* D89BCC 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* D89BD0 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* D89BD4 802404F4 24020002 */ addiu $v0, $zero, 2 -/* D89BD8 802404F8 03E00008 */ jr $ra -/* D89BDC 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_33/func_80240500_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/func_80240500_D896E0.s deleted file mode 100644 index 44f3b9b3b2..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/func_80240500_D896E0.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_D89BE0 -/* D89BE0 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D89BE4 80240504 AFB00040 */ sw $s0, 0x40($sp) -/* D89BE8 80240508 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D89BEC 8024050C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D89BF0 80240510 AFB10044 */ sw $s1, 0x44($sp) -/* D89BF4 80240514 AFBF004C */ sw $ra, 0x4c($sp) -/* D89BF8 80240518 AFB20048 */ sw $s2, 0x48($sp) -/* D89BFC 8024051C 8E020000 */ lw $v0, ($s0) -/* D89C00 80240520 821200BE */ lb $s2, 0xbe($s0) -/* D89C04 80240524 30420001 */ andi $v0, $v0, 1 -/* D89C08 80240528 10400052 */ beqz $v0, .L80240674 -/* D89C0C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 -/* D89C10 80240530 8E0400CC */ lw $a0, 0xcc($s0) -/* D89C14 80240534 0C044181 */ jal get_shadow_by_index -/* D89C18 80240538 00000000 */ nop -/* D89C1C 8024053C 0C048B77 */ jal func_80122DDC -/* D89C20 80240540 84440008 */ lh $a0, 8($v0) -/* D89C24 80240544 8E050028 */ lw $a1, 0x28($s0) -/* D89C28 80240548 8E070030 */ lw $a3, 0x30($s0) -/* D89C2C 8024054C 27A20030 */ addiu $v0, $sp, 0x30 -/* D89C30 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* D89C34 80240554 27A20034 */ addiu $v0, $sp, 0x34 -/* D89C38 80240558 AFA20014 */ sw $v0, 0x14($sp) -/* D89C3C 8024055C 27A20038 */ addiu $v0, $sp, 0x38 -/* D89C40 80240560 AFA20018 */ sw $v0, 0x18($sp) -/* D89C44 80240564 C600002C */ lwc1 $f0, 0x2c($s0) -/* D89C48 80240568 3C04800A */ lui $a0, 0x800a -/* D89C4C 8024056C 8484A634 */ lh $a0, -0x59cc($a0) -/* D89C50 80240570 46000007 */ neg.s $f0, $f0 -/* D89C54 80240574 44060000 */ mfc1 $a2, $f0 -/* D89C58 80240578 0C00B94E */ jal get_screen_coords -/* D89C5C 8024057C 00000000 */ nop -/* D89C60 80240580 8E0500A4 */ lw $a1, 0xa4($s0) -/* D89C64 80240584 3C063F80 */ lui $a2, 0x3f80 -/* D89C68 80240588 0C0B76A3 */ jal func_802DDA8C -/* D89C6C 8024058C 24040001 */ addiu $a0, $zero, 1 -/* D89C70 80240590 8E020000 */ lw $v0, ($s0) -/* D89C74 80240594 3C030002 */ lui $v1, 2 -/* D89C78 80240598 00431024 */ and $v0, $v0, $v1 -/* D89C7C 8024059C 54400022 */ bnel $v0, $zero, .L80240628 -/* D89C80 802405A0 24120011 */ addiu $s2, $zero, 0x11 -/* D89C84 802405A4 9203000E */ lbu $v1, 0xe($s0) -/* D89C88 802405A8 3C02802E */ lui $v0, 0x802e -/* D89C8C 802405AC 90429D71 */ lbu $v0, -0x628f($v0) -/* D89C90 802405B0 10620018 */ beq $v1, $v0, .L80240614 -/* D89C94 802405B4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D89C98 802405B8 1040000B */ beqz $v0, .L802405E8 -/* D89C9C 802405BC 24120011 */ addiu $s2, $zero, 0x11 -/* D89CA0 802405C0 24040001 */ addiu $a0, $zero, 1 -/* D89CA4 802405C4 2405FFFF */ addiu $a1, $zero, -1 -/* D89CA8 802405C8 24060007 */ addiu $a2, $zero, 7 -/* D89CAC 802405CC 0060102D */ daddu $v0, $v1, $zero -/* D89CB0 802405D0 0000382D */ daddu $a3, $zero, $zero -/* D89CB4 802405D4 AFA00010 */ sw $zero, 0x10($sp) -/* D89CB8 802405D8 AFA00014 */ sw $zero, 0x14($sp) -/* D89CBC 802405DC AFA0001C */ sw $zero, 0x1c($sp) -/* D89CC0 802405E0 08090183 */ j .L8024060C -/* D89CC4 802405E4 AFA20018 */ sw $v0, 0x18($sp) -.L802405E8: -/* D89CC8 802405E8 2412000D */ addiu $s2, $zero, 0xd -/* D89CCC 802405EC 24040001 */ addiu $a0, $zero, 1 -/* D89CD0 802405F0 2405FFFF */ addiu $a1, $zero, -1 -/* D89CD4 802405F4 0000302D */ daddu $a2, $zero, $zero -/* D89CD8 802405F8 00C0382D */ daddu $a3, $a2, $zero -/* D89CDC 802405FC AFA00010 */ sw $zero, 0x10($sp) -/* D89CE0 80240600 AFA00014 */ sw $zero, 0x14($sp) -/* D89CE4 80240604 AFA00018 */ sw $zero, 0x18($sp) -/* D89CE8 80240608 AFA0001C */ sw $zero, 0x1c($sp) -.L8024060C: -/* D89CEC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D89CF0 80240610 00000000 */ nop -.L80240614: -/* D89CF4 80240614 9202000E */ lbu $v0, 0xe($s0) -/* D89CF8 80240618 3C01802E */ lui $at, 0x802e -/* D89CFC 8024061C A0229D71 */ sb $v0, -0x628f($at) -/* D89D00 80240620 0809018C */ j .L80240630 -/* D89D04 80240624 00000000 */ nop -.L80240628: -/* D89D08 80240628 3C01802E */ lui $at, 0x802e -/* D89D0C 8024062C A0209D71 */ sb $zero, -0x628f($at) -.L80240630: -/* D89D10 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D89D14 80240634 3C048024 */ lui $a0, 0x8024 -/* D89D18 80240638 24840870 */ addiu $a0, $a0, 0x870 -/* D89D1C 8024063C AE320000 */ sw $s2, ($s1) -/* D89D20 80240640 AE300008 */ sw $s0, 8($s1) -/* D89D24 80240644 00021023 */ negu $v0, $v0 -/* D89D28 80240648 AE220004 */ sw $v0, 4($s1) -/* D89D2C 8024064C 8E020000 */ lw $v0, ($s0) -/* D89D30 80240650 3C030002 */ lui $v1, 2 -/* D89D34 80240654 00431024 */ and $v0, $v0, $v1 -/* D89D38 80240658 54400004 */ bnel $v0, $zero, .L8024066C -/* D89D3C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D89D40 80240660 3C048024 */ lui $a0, 0x8024 -/* D89D44 80240664 2484068C */ addiu $a0, $a0, 0x68c -/* D89D48 80240668 AE24000C */ sw $a0, 0xc($s1) -.L8024066C: -/* D89D4C 8024066C 0C047644 */ jal queue_render_task -/* D89D50 80240670 0220202D */ daddu $a0, $s1, $zero -.L80240674: -/* D89D54 80240674 8FBF004C */ lw $ra, 0x4c($sp) -/* D89D58 80240678 8FB20048 */ lw $s2, 0x48($sp) -/* D89D5C 8024067C 8FB10044 */ lw $s1, 0x44($sp) -/* D89D60 80240680 8FB00040 */ lw $s0, 0x40($sp) -/* D89D64 80240684 03E00008 */ jr $ra -/* D89D68 80240688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_33/func_8024068C_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/func_8024068C_D896E0.s deleted file mode 100644 index 803f2b84f5..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/func_8024068C_D896E0.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_D89D6C -/* D89D6C 8024068C 3C03800A */ lui $v1, 0x800a -/* D89D70 80240690 8463A634 */ lh $v1, -0x59cc($v1) -/* D89D74 80240694 3C07BF80 */ lui $a3, 0xbf80 -/* D89D78 80240698 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D89D7C 8024069C F7B40128 */ sdc1 $f20, 0x128($sp) -/* D89D80 802406A0 4480A000 */ mtc1 $zero, $f20 -/* D89D84 802406A4 AFB1011C */ sw $s1, 0x11c($sp) -/* D89D88 802406A8 0080882D */ daddu $s1, $a0, $zero -/* D89D8C 802406AC AFB00118 */ sw $s0, 0x118($sp) -/* D89D90 802406B0 27B00098 */ addiu $s0, $sp, 0x98 -/* D89D94 802406B4 AFBF0120 */ sw $ra, 0x120($sp) -/* D89D98 802406B8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D89D9C 802406BC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D89DA0 802406C0 00031080 */ sll $v0, $v1, 2 -/* D89DA4 802406C4 00431021 */ addu $v0, $v0, $v1 -/* D89DA8 802406C8 00021080 */ sll $v0, $v0, 2 -/* D89DAC 802406CC 00431023 */ subu $v0, $v0, $v1 -/* D89DB0 802406D0 000218C0 */ sll $v1, $v0, 3 -/* D89DB4 802406D4 00431021 */ addu $v0, $v0, $v1 -/* D89DB8 802406D8 000210C0 */ sll $v0, $v0, 3 -/* D89DBC 802406DC 3C01800B */ lui $at, 0x800b -/* D89DC0 802406E0 00220821 */ addu $at, $at, $v0 -/* D89DC4 802406E4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D89DC8 802406E8 4406A000 */ mfc1 $a2, $f20 -/* D89DCC 802406EC 4600B587 */ neg.s $f22, $f22 -/* D89DD0 802406F0 4405B000 */ mfc1 $a1, $f22 -/* D89DD4 802406F4 0200202D */ daddu $a0, $s0, $zero -/* D89DD8 802406F8 0C019EC8 */ jal guRotateF -/* D89DDC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) -/* D89DE0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D89DE4 80240704 0C00A6C9 */ jal clamp_angle -/* D89DE8 80240708 00000000 */ nop -/* D89DEC 8024070C 44050000 */ mfc1 $a1, $f0 -/* D89DF0 80240710 4406A000 */ mfc1 $a2, $f20 -/* D89DF4 80240714 4407A000 */ mfc1 $a3, $f20 -/* D89DF8 80240718 3C013F80 */ lui $at, 0x3f80 -/* D89DFC 8024071C 4481C000 */ mtc1 $at, $f24 -/* D89E00 80240720 27A40018 */ addiu $a0, $sp, 0x18 -/* D89E04 80240724 0C019EC8 */ jal guRotateF -/* D89E08 80240728 E7B80010 */ swc1 $f24, 0x10($sp) -/* D89E0C 8024072C 0200202D */ daddu $a0, $s0, $zero -/* D89E10 80240730 27A50018 */ addiu $a1, $sp, 0x18 -/* D89E14 80240734 0C019D80 */ jal guMtxCatF -/* D89E18 80240738 00A0302D */ daddu $a2, $a1, $zero -/* D89E1C 8024073C 4405B000 */ mfc1 $a1, $f22 -/* D89E20 80240740 4406A000 */ mfc1 $a2, $f20 -/* D89E24 80240744 4407C000 */ mfc1 $a3, $f24 -/* D89E28 80240748 0200202D */ daddu $a0, $s0, $zero -/* D89E2C 8024074C 0C019EC8 */ jal guRotateF -/* D89E30 80240750 E7B40010 */ swc1 $f20, 0x10($sp) -/* D89E34 80240754 27A40018 */ addiu $a0, $sp, 0x18 -/* D89E38 80240758 0200282D */ daddu $a1, $s0, $zero -/* D89E3C 8024075C 0C019D80 */ jal guMtxCatF -/* D89E40 80240760 0080302D */ daddu $a2, $a0, $zero -/* D89E44 80240764 E7B40010 */ swc1 $f20, 0x10($sp) -/* D89E48 80240768 8E2500A8 */ lw $a1, 0xa8($s1) -/* D89E4C 8024076C 4406A000 */ mfc1 $a2, $f20 -/* D89E50 80240770 4407C000 */ mfc1 $a3, $f24 -/* D89E54 80240774 0C019EC8 */ jal guRotateF -/* D89E58 80240778 0200202D */ daddu $a0, $s0, $zero -/* D89E5C 8024077C 27A40018 */ addiu $a0, $sp, 0x18 -/* D89E60 80240780 0200282D */ daddu $a1, $s0, $zero -/* D89E64 80240784 0C019D80 */ jal guMtxCatF -/* D89E68 80240788 0080302D */ daddu $a2, $a0, $zero -/* D89E6C 8024078C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D89E70 80240790 3C013F36 */ lui $at, 0x3f36 -/* D89E74 80240794 3421DB6E */ ori $at, $at, 0xdb6e -/* D89E78 80240798 44810000 */ mtc1 $at, $f0 -/* D89E7C 8024079C 0200202D */ daddu $a0, $s0, $zero -/* D89E80 802407A0 44050000 */ mfc1 $a1, $f0 -/* D89E84 802407A4 3C06BF36 */ lui $a2, 0xbf36 -/* D89E88 802407A8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D89E8C 802407AC 0C019DF0 */ jal guScaleF -/* D89E90 802407B0 00A0382D */ daddu $a3, $a1, $zero -/* D89E94 802407B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D89E98 802407B8 0200282D */ daddu $a1, $s0, $zero -/* D89E9C 802407BC 0C019D80 */ jal guMtxCatF -/* D89EA0 802407C0 0080302D */ daddu $a2, $a0, $zero -/* D89EA4 802407C4 27B00058 */ addiu $s0, $sp, 0x58 -/* D89EA8 802407C8 8E250028 */ lw $a1, 0x28($s1) -/* D89EAC 802407CC C620002C */ lwc1 $f0, 0x2c($s1) -/* D89EB0 802407D0 8E270030 */ lw $a3, 0x30($s1) -/* D89EB4 802407D4 46000007 */ neg.s $f0, $f0 -/* D89EB8 802407D8 44060000 */ mfc1 $a2, $f0 -/* D89EBC 802407DC 0C019E40 */ jal guTranslateF -/* D89EC0 802407E0 0200202D */ daddu $a0, $s0, $zero -/* D89EC4 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D89EC8 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D89ECC 802407EC 0C019D80 */ jal guMtxCatF -/* D89ED0 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D89ED4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D89ED8 802407F8 3C0142B4 */ lui $at, 0x42b4 -/* D89EDC 802407FC 44810000 */ mtc1 $at, $f0 -/* D89EE0 80240800 00000000 */ nop -/* D89EE4 80240804 4602003E */ c.le.s $f0, $f2 -/* D89EE8 80240808 00000000 */ nop -/* D89EEC 8024080C 4500000A */ bc1f .L80240838 -/* D89EF0 80240810 24040001 */ addiu $a0, $zero, 1 -/* D89EF4 80240814 3C014387 */ lui $at, 0x4387 -/* D89EF8 80240818 44810000 */ mtc1 $at, $f0 -/* D89EFC 8024081C 00000000 */ nop -/* D89F00 80240820 4600103C */ c.lt.s $f2, $f0 -/* D89F04 80240824 00000000 */ nop -/* D89F08 80240828 45000004 */ bc1f .L8024083C -/* D89F0C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 -/* D89F10 80240830 3C041000 */ lui $a0, 0x1000 -/* D89F14 80240834 34840001 */ ori $a0, $a0, 1 -.L80240838: -/* D89F18 80240838 27A20018 */ addiu $v0, $sp, 0x18 -.L8024083C: -/* D89F1C 8024083C 0000282D */ daddu $a1, $zero, $zero -/* D89F20 80240840 00A0302D */ daddu $a2, $a1, $zero -/* D89F24 80240844 00A0382D */ daddu $a3, $a1, $zero -/* D89F28 80240848 0C0B7710 */ jal render_sprite -/* D89F2C 8024084C AFA20010 */ sw $v0, 0x10($sp) -/* D89F30 80240850 8FBF0120 */ lw $ra, 0x120($sp) -/* D89F34 80240854 8FB1011C */ lw $s1, 0x11c($sp) -/* D89F38 80240858 8FB00118 */ lw $s0, 0x118($sp) -/* D89F3C 8024085C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D89F40 80240860 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D89F44 80240864 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D89F48 80240868 03E00008 */ jr $ra -/* D89F4C 8024086C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_33/func_80240870_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/func_80240870_D896E0.s deleted file mode 100644 index f943474246..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/func_80240870_D896E0.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_D89F50 -/* D89F50 80240870 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D89F54 80240874 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D89F58 80240878 4480B000 */ mtc1 $zero, $f22 -/* D89F5C 8024087C AFB10134 */ sw $s1, 0x134($sp) -/* D89F60 80240880 0080882D */ daddu $s1, $a0, $zero -/* D89F64 80240884 AFB3013C */ sw $s3, 0x13c($sp) -/* D89F68 80240888 0000982D */ daddu $s3, $zero, $zero -/* D89F6C 8024088C AFB60148 */ sw $s6, 0x148($sp) -/* D89F70 80240890 3C16800B */ lui $s6, %hi(gCameras) -/* D89F74 80240894 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D89F78 80240898 AFB50144 */ sw $s5, 0x144($sp) -/* D89F7C 8024089C 241500FF */ addiu $s5, $zero, 0xff -/* D89F80 802408A0 AFB00130 */ sw $s0, 0x130($sp) -/* D89F84 802408A4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D89F88 802408A8 AFB20138 */ sw $s2, 0x138($sp) -/* D89F8C 802408AC 27B20060 */ addiu $s2, $sp, 0x60 -/* D89F90 802408B0 AFB40140 */ sw $s4, 0x140($sp) -/* D89F94 802408B4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D89F98 802408B8 AFBF014C */ sw $ra, 0x14c($sp) -/* D89F9C 802408BC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D89FA0 802408C0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D89FA4 802408C4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D89FA8 802408C8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D89FAC 802408CC F7B40150 */ sdc1 $f20, 0x150($sp) -.L802408D0: -/* D89FB0 802408D0 3C03800A */ lui $v1, 0x800a -/* D89FB4 802408D4 8463A634 */ lh $v1, -0x59cc($v1) -/* D89FB8 802408D8 00031080 */ sll $v0, $v1, 2 -/* D89FBC 802408DC 00431021 */ addu $v0, $v0, $v1 -/* D89FC0 802408E0 00021080 */ sll $v0, $v0, 2 -/* D89FC4 802408E4 00431023 */ subu $v0, $v0, $v1 -/* D89FC8 802408E8 000218C0 */ sll $v1, $v0, 3 -/* D89FCC 802408EC 00431021 */ addu $v0, $v0, $v1 -/* D89FD0 802408F0 000210C0 */ sll $v0, $v0, 3 -/* D89FD4 802408F4 00561021 */ addu $v0, $v0, $s6 -/* D89FD8 802408F8 C440006C */ lwc1 $f0, 0x6c($v0) -/* D89FDC 802408FC 16600065 */ bnez $s3, .L80240A94 -/* D89FE0 80240900 46000507 */ neg.s $f20, $f0 -/* D89FE4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D89FE8 80240908 3C0142B4 */ lui $at, 0x42b4 -/* D89FEC 8024090C 44810000 */ mtc1 $at, $f0 -/* D89FF0 80240910 00000000 */ nop -/* D89FF4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D89FF8 80240918 00000000 */ nop -/* D89FFC 8024091C 4500000A */ bc1f .L80240948 -/* D8A000 80240920 00000000 */ nop -/* D8A004 80240924 3C014334 */ lui $at, 0x4334 -/* D8A008 80240928 44812000 */ mtc1 $at, $f4 -/* D8A00C 8024092C 00000000 */ nop -/* D8A010 80240930 4604103E */ c.le.s $f2, $f4 -/* D8A014 80240934 00000000 */ nop -/* D8A018 80240938 45000003 */ bc1f .L80240948 -/* D8A01C 8024093C 00000000 */ nop -/* D8A020 80240940 08090276 */ j .L802409D8 -/* D8A024 80240944 46022501 */ sub.s $f20, $f4, $f2 -.L80240948: -/* D8A028 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D8A02C 8024094C 3C014334 */ lui $at, 0x4334 -/* D8A030 80240950 44812000 */ mtc1 $at, $f4 -/* D8A034 80240954 00000000 */ nop -/* D8A038 80240958 4600203C */ c.lt.s $f4, $f0 -/* D8A03C 8024095C 00000000 */ nop -/* D8A040 80240960 4500000C */ bc1f .L80240994 -/* D8A044 80240964 00000000 */ nop -/* D8A048 80240968 3C014387 */ lui $at, 0x4387 -/* D8A04C 8024096C 44812000 */ mtc1 $at, $f4 -/* D8A050 80240970 00000000 */ nop -/* D8A054 80240974 4604003E */ c.le.s $f0, $f4 -/* D8A058 80240978 00000000 */ nop -/* D8A05C 8024097C 45000008 */ bc1f .L802409A0 -/* D8A060 80240980 00000000 */ nop -/* D8A064 80240984 3C014334 */ lui $at, 0x4334 -/* D8A068 80240988 44812000 */ mtc1 $at, $f4 -/* D8A06C 8024098C 08090276 */ j .L802409D8 -/* D8A070 80240990 46040501 */ sub.s $f20, $f0, $f4 -.L80240994: -/* D8A074 80240994 3C014387 */ lui $at, 0x4387 -/* D8A078 80240998 44812000 */ mtc1 $at, $f4 -/* D8A07C 8024099C 00000000 */ nop -.L802409A0: -/* D8A080 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D8A084 802409A4 00000000 */ nop -/* D8A088 802409A8 4500000A */ bc1f .L802409D4 -/* D8A08C 802409AC 00000000 */ nop -/* D8A090 802409B0 3C0143B4 */ lui $at, 0x43b4 -/* D8A094 802409B4 44811000 */ mtc1 $at, $f2 -/* D8A098 802409B8 00000000 */ nop -/* D8A09C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D8A0A0 802409C0 00000000 */ nop -/* D8A0A4 802409C4 45000003 */ bc1f .L802409D4 -/* D8A0A8 802409C8 00000000 */ nop -/* D8A0AC 802409CC 08090276 */ j .L802409D8 -/* D8A0B0 802409D0 46001501 */ sub.s $f20, $f2, $f0 -.L802409D4: -/* D8A0B4 802409D4 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L802409D8: -/* D8A0B8 802409D8 3C0141C8 */ lui $at, 0x41c8 -/* D8A0BC 802409DC 44810000 */ mtc1 $at, $f0 -/* D8A0C0 802409E0 00000000 */ nop -/* D8A0C4 802409E4 4600A003 */ div.s $f0, $f20, $f0 -/* D8A0C8 802409E8 4600010D */ trunc.w.s $f4, $f0 -/* D8A0CC 802409EC 44072000 */ mfc1 $a3, $f4 -/* D8A0D0 802409F0 00000000 */ nop -/* D8A0D4 802409F4 00071100 */ sll $v0, $a3, 4 -/* D8A0D8 802409F8 00471023 */ subu $v0, $v0, $a3 -/* D8A0DC 802409FC 00021080 */ sll $v0, $v0, 2 -/* D8A0E0 80240A00 02A23823 */ subu $a3, $s5, $v0 -/* D8A0E4 80240A04 28E20064 */ slti $v0, $a3, 0x64 -/* D8A0E8 80240A08 54400001 */ bnel $v0, $zero, .L80240A10 -/* D8A0EC 80240A0C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A10: -/* D8A0F0 80240A10 24040001 */ addiu $a0, $zero, 1 -/* D8A0F4 80240A14 2405FFFF */ addiu $a1, $zero, -1 -/* D8A0F8 80240A18 24060006 */ addiu $a2, $zero, 6 -/* D8A0FC 80240A1C AFA70010 */ sw $a3, 0x10($sp) -/* D8A100 80240A20 AFA70014 */ sw $a3, 0x14($sp) -/* D8A104 80240A24 AFB50018 */ sw $s5, 0x18($sp) -/* D8A108 80240A28 0C0B77B9 */ jal func_802DDEE4 -/* D8A10C 80240A2C AFA0001C */ sw $zero, 0x1c($sp) -/* D8A110 80240A30 4405A000 */ mfc1 $a1, $f20 -/* D8A114 80240A34 4406B000 */ mfc1 $a2, $f22 -/* D8A118 80240A38 3C07BF80 */ lui $a3, 0xbf80 -/* D8A11C 80240A3C 0200202D */ daddu $a0, $s0, $zero -/* D8A120 80240A40 0C019EC8 */ jal guRotateF -/* D8A124 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D8A128 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D8A12C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D8A130 80240A50 00000000 */ nop -/* D8A134 80240A54 44050000 */ mfc1 $a1, $f0 -/* D8A138 80240A58 4406B000 */ mfc1 $a2, $f22 -/* D8A13C 80240A5C 4407B000 */ mfc1 $a3, $f22 -/* D8A140 80240A60 3C013F80 */ lui $at, 0x3f80 -/* D8A144 80240A64 44812000 */ mtc1 $at, $f4 -/* D8A148 80240A68 27A40020 */ addiu $a0, $sp, 0x20 -/* D8A14C 80240A6C 0C019EC8 */ jal guRotateF -/* D8A150 80240A70 E7A40010 */ swc1 $f4, 0x10($sp) -/* D8A154 80240A74 0200202D */ daddu $a0, $s0, $zero -/* D8A158 80240A78 27A50020 */ addiu $a1, $sp, 0x20 -/* D8A15C 80240A7C 0C019D80 */ jal guMtxCatF -/* D8A160 80240A80 00A0302D */ daddu $a2, $a1, $zero -/* D8A164 80240A84 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D8A168 80240A88 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D8A16C 80240A8C 080902D6 */ j .L80240B58 -/* D8A170 80240A90 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240A94: -/* D8A174 80240A94 0260202D */ daddu $a0, $s3, $zero -/* D8A178 80240A98 27A50120 */ addiu $a1, $sp, 0x120 -/* D8A17C 80240A9C 27A60124 */ addiu $a2, $sp, 0x124 -/* D8A180 80240AA0 0C03964E */ jal func_800E5938 -/* D8A184 80240AA4 27A70128 */ addiu $a3, $sp, 0x128 -/* D8A188 80240AA8 8FA60124 */ lw $a2, 0x124($sp) -/* D8A18C 80240AAC 3C028000 */ lui $v0, 0x8000 -/* D8A190 80240AB0 14C20004 */ bne $a2, $v0, .L80240AC4 -/* D8A194 80240AB4 46000606 */ mov.s $f24, $f0 -/* D8A198 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D8A19C 80240ABC 080902B5 */ j .L80240AD4 -/* D8A1A0 80240AC0 24040001 */ addiu $a0, $zero, 1 -.L80240AC4: -/* D8A1A4 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D8A1A8 80240AC8 00000000 */ nop -/* D8A1AC 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D8A1B0 80240AD0 24040001 */ addiu $a0, $zero, 1 -.L80240AD4: -/* D8A1B4 80240AD4 2405FFFF */ addiu $a1, $zero, -1 -/* D8A1B8 80240AD8 24060007 */ addiu $a2, $zero, 7 -/* D8A1BC 80240ADC 0000382D */ daddu $a3, $zero, $zero -/* D8A1C0 80240AE0 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D8A1C4 80240AE4 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D8A1C8 80240AE8 24020040 */ addiu $v0, $zero, 0x40 -/* D8A1CC 80240AEC AFA00010 */ sw $zero, 0x10($sp) -/* D8A1D0 80240AF0 AFA00014 */ sw $zero, 0x14($sp) -/* D8A1D4 80240AF4 AFA20018 */ sw $v0, 0x18($sp) -/* D8A1D8 80240AF8 0C0B77B9 */ jal func_802DDEE4 -/* D8A1DC 80240AFC AFA0001C */ sw $zero, 0x1c($sp) -/* D8A1E0 80240B00 4405A000 */ mfc1 $a1, $f20 -/* D8A1E4 80240B04 4406B000 */ mfc1 $a2, $f22 -/* D8A1E8 80240B08 3C07BF80 */ lui $a3, 0xbf80 -/* D8A1EC 80240B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* D8A1F0 80240B10 0C019EC8 */ jal guRotateF -/* D8A1F4 80240B14 E7B60010 */ swc1 $f22, 0x10($sp) -/* D8A1F8 80240B18 4405A000 */ mfc1 $a1, $f20 -/* D8A1FC 80240B1C 4406B000 */ mfc1 $a2, $f22 -/* D8A200 80240B20 3C07BF80 */ lui $a3, 0xbf80 -/* D8A204 80240B24 0200202D */ daddu $a0, $s0, $zero -/* D8A208 80240B28 0C019EC8 */ jal guRotateF -/* D8A20C 80240B2C E7B60010 */ swc1 $f22, 0x10($sp) -/* D8A210 80240B30 4405C000 */ mfc1 $a1, $f24 -/* D8A214 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D8A218 80240B38 3C073F80 */ lui $a3, 0x3f80 -/* D8A21C 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D8A220 80240B40 0C019EC8 */ jal guRotateF -/* D8A224 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D8A228 80240B48 0200202D */ daddu $a0, $s0, $zero -/* D8A22C 80240B4C 27A50020 */ addiu $a1, $sp, 0x20 -/* D8A230 80240B50 0C019D80 */ jal guMtxCatF -/* D8A234 80240B54 00A0302D */ daddu $a2, $a1, $zero -.L80240B58: -/* D8A238 80240B58 862200B0 */ lh $v0, 0xb0($s1) -/* D8A23C 80240B5C 3C013F00 */ lui $at, 0x3f00 -/* D8A240 80240B60 44812000 */ mtc1 $at, $f4 -/* D8A244 80240B64 00021023 */ negu $v0, $v0 -/* D8A248 80240B68 44820000 */ mtc1 $v0, $f0 -/* D8A24C 80240B6C 00000000 */ nop -/* D8A250 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* D8A254 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D8A258 80240B78 00000000 */ nop -/* D8A25C 80240B7C 4405B000 */ mfc1 $a1, $f22 -/* D8A260 80240B80 4407B000 */ mfc1 $a3, $f22 -/* D8A264 80240B84 44062000 */ mfc1 $a2, $f4 -/* D8A268 80240B88 0C019E40 */ jal guTranslateF -/* D8A26C 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* D8A270 80240B90 0240202D */ daddu $a0, $s2, $zero -/* D8A274 80240B94 27A50020 */ addiu $a1, $sp, 0x20 -/* D8A278 80240B98 0C019D80 */ jal guMtxCatF -/* D8A27C 80240B9C 00A0302D */ daddu $a2, $a1, $zero -/* D8A280 80240BA0 4405A000 */ mfc1 $a1, $f20 -/* D8A284 80240BA4 4406B000 */ mfc1 $a2, $f22 -/* D8A288 80240BA8 3C073F80 */ lui $a3, 0x3f80 -/* D8A28C 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* D8A290 80240BB0 0C019EC8 */ jal guRotateF -/* D8A294 80240BB4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D8A298 80240BB8 27A40020 */ addiu $a0, $sp, 0x20 -/* D8A29C 80240BBC 0200282D */ daddu $a1, $s0, $zero -/* D8A2A0 80240BC0 0C019D80 */ jal guMtxCatF -/* D8A2A4 80240BC4 0080302D */ daddu $a2, $a0, $zero -/* D8A2A8 80240BC8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D8A2AC 80240BCC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D8A2B0 80240BD0 4406B000 */ mfc1 $a2, $f22 -/* D8A2B4 80240BD4 3C073F80 */ lui $a3, 0x3f80 -/* D8A2B8 80240BD8 0C019EC8 */ jal guRotateF -/* D8A2BC 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D8A2C0 80240BE0 27A40020 */ addiu $a0, $sp, 0x20 -/* D8A2C4 80240BE4 0200282D */ daddu $a1, $s0, $zero -/* D8A2C8 80240BE8 0C019D80 */ jal guMtxCatF -/* D8A2CC 80240BEC 0080302D */ daddu $a2, $a0, $zero -/* D8A2D0 80240BF0 862200B0 */ lh $v0, 0xb0($s1) -/* D8A2D4 80240BF4 3C013F00 */ lui $at, 0x3f00 -/* D8A2D8 80240BF8 44812000 */ mtc1 $at, $f4 -/* D8A2DC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D8A2E0 80240C00 00000000 */ nop -/* D8A2E4 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* D8A2E8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D8A2EC 80240C0C 00000000 */ nop -/* D8A2F0 80240C10 4405B000 */ mfc1 $a1, $f22 -/* D8A2F4 80240C14 4407B000 */ mfc1 $a3, $f22 -/* D8A2F8 80240C18 44062000 */ mfc1 $a2, $f4 -/* D8A2FC 80240C1C 0C019E40 */ jal guTranslateF -/* D8A300 80240C20 0240202D */ daddu $a0, $s2, $zero -/* D8A304 80240C24 27A40020 */ addiu $a0, $sp, 0x20 -/* D8A308 80240C28 0240282D */ daddu $a1, $s2, $zero -/* D8A30C 80240C2C 0C019D80 */ jal guMtxCatF -/* D8A310 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D8A314 80240C34 3C013F36 */ lui $at, 0x3f36 -/* D8A318 80240C38 3421DB6E */ ori $at, $at, 0xdb6e -/* D8A31C 80240C3C 44810000 */ mtc1 $at, $f0 -/* D8A320 80240C40 0280202D */ daddu $a0, $s4, $zero -/* D8A324 80240C44 44050000 */ mfc1 $a1, $f0 -/* D8A328 80240C48 3C06BF36 */ lui $a2, 0xbf36 -/* D8A32C 80240C4C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D8A330 80240C50 0C019DF0 */ jal guScaleF -/* D8A334 80240C54 00A0382D */ daddu $a3, $a1, $zero -/* D8A338 80240C58 27A40020 */ addiu $a0, $sp, 0x20 -/* D8A33C 80240C5C 0280282D */ daddu $a1, $s4, $zero -/* D8A340 80240C60 0C019D80 */ jal guMtxCatF -/* D8A344 80240C64 0080302D */ daddu $a2, $a0, $zero -/* D8A348 80240C68 4600D687 */ neg.s $f26, $f26 -/* D8A34C 80240C6C 4405F000 */ mfc1 $a1, $f30 -/* D8A350 80240C70 4407E000 */ mfc1 $a3, $f28 -/* D8A354 80240C74 4406D000 */ mfc1 $a2, $f26 -/* D8A358 80240C78 0C019E40 */ jal guTranslateF -/* D8A35C 80240C7C 0240202D */ daddu $a0, $s2, $zero -/* D8A360 80240C80 27A40020 */ addiu $a0, $sp, 0x20 -/* D8A364 80240C84 0240282D */ daddu $a1, $s2, $zero -/* D8A368 80240C88 0C019D80 */ jal guMtxCatF -/* D8A36C 80240C8C 0080302D */ daddu $a2, $a0, $zero -/* D8A370 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D8A374 80240C94 3C0142B4 */ lui $at, 0x42b4 -/* D8A378 80240C98 44810000 */ mtc1 $at, $f0 -/* D8A37C 80240C9C 00000000 */ nop -/* D8A380 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D8A384 80240CA4 00000000 */ nop -/* D8A388 80240CA8 4500000A */ bc1f .L80240CD4 -/* D8A38C 80240CAC 24040001 */ addiu $a0, $zero, 1 -/* D8A390 80240CB0 3C014387 */ lui $at, 0x4387 -/* D8A394 80240CB4 44812000 */ mtc1 $at, $f4 -/* D8A398 80240CB8 00000000 */ nop -/* D8A39C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D8A3A0 80240CC0 00000000 */ nop -/* D8A3A4 80240CC4 45000004 */ bc1f .L80240CD8 -/* D8A3A8 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 -/* D8A3AC 80240CCC 3C041000 */ lui $a0, 0x1000 -/* D8A3B0 80240CD0 34840001 */ ori $a0, $a0, 1 -.L80240CD4: -/* D8A3B4 80240CD4 27A20020 */ addiu $v0, $sp, 0x20 -.L80240CD8: -/* D8A3B8 80240CD8 AFA20010 */ sw $v0, 0x10($sp) -/* D8A3BC 80240CDC 0000282D */ daddu $a1, $zero, $zero -/* D8A3C0 80240CE0 00A0302D */ daddu $a2, $a1, $zero -/* D8A3C4 80240CE4 0C0B7710 */ jal render_sprite -/* D8A3C8 80240CE8 00A0382D */ daddu $a3, $a1, $zero -/* D8A3CC 80240CEC 26730001 */ addiu $s3, $s3, 1 -/* D8A3D0 80240CF0 2A620002 */ slti $v0, $s3, 2 -/* D8A3D4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D8A3D8 80240CF8 00000000 */ nop -/* D8A3DC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) -/* D8A3E0 80240D00 8FB60148 */ lw $s6, 0x148($sp) -/* D8A3E4 80240D04 8FB50144 */ lw $s5, 0x144($sp) -/* D8A3E8 80240D08 8FB40140 */ lw $s4, 0x140($sp) -/* D8A3EC 80240D0C 8FB3013C */ lw $s3, 0x13c($sp) -/* D8A3F0 80240D10 8FB20138 */ lw $s2, 0x138($sp) -/* D8A3F4 80240D14 8FB10134 */ lw $s1, 0x134($sp) -/* D8A3F8 80240D18 8FB00130 */ lw $s0, 0x130($sp) -/* D8A3FC 80240D1C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D8A400 80240D20 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D8A404 80240D24 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D8A408 80240D28 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D8A40C 80240D2C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D8A410 80240D30 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D8A414 80240D34 03E00008 */ jr $ra -/* D8A418 80240D38 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_33/func_80240D3C_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/func_80240D3C_D896E0.s deleted file mode 100644 index 0d8ef694ab..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/func_80240D3C_D896E0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_D8A41C -/* D8A41C 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8A420 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D8A424 80240D44 0080802D */ daddu $s0, $a0, $zero -/* D8A428 80240D48 AFBF0014 */ sw $ra, 0x14($sp) -/* D8A42C 80240D4C 8E020088 */ lw $v0, 0x88($s0) -/* D8A430 80240D50 14400017 */ bnez $v0, .L80240DB0 -/* D8A434 80240D54 24020001 */ addiu $v0, $zero, 1 -/* D8A438 80240D58 8E030084 */ lw $v1, 0x84($s0) -/* D8A43C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D8A440 80240D60 00000000 */ nop -/* D8A444 80240D64 28620002 */ slti $v0, $v1, 2 -/* D8A448 80240D68 50400005 */ beql $v0, $zero, .L80240D80 -/* D8A44C 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* D8A450 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D8A454 80240D74 00000000 */ nop -/* D8A458 80240D78 08090378 */ j .L80240DE0 -/* D8A45C 80240D7C 00000000 */ nop -.L80240D80: -/* D8A460 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D8A464 80240D84 00000000 */ nop -/* D8A468 80240D88 08090378 */ j .L80240DE0 -/* D8A46C 80240D8C 00000000 */ nop -.L80240D90: -/* D8A470 80240D90 3C048024 */ lui $a0, 0x8024 -/* D8A474 80240D94 24840E84 */ addiu $a0, $a0, 0xe84 -/* D8A478 80240D98 08090374 */ j .L80240DD0 -/* D8A47C 80240D9C 00000000 */ nop -.L80240DA0: -/* D8A480 80240DA0 3C048024 */ lui $a0, 0x8024 -/* D8A484 80240DA4 24840EEC */ addiu $a0, $a0, 0xeec -/* D8A488 80240DA8 08090374 */ j .L80240DD0 -/* D8A48C 80240DAC 00000000 */ nop -.L80240DB0: -/* D8A490 80240DB0 8E020084 */ lw $v0, 0x84($s0) -/* D8A494 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D8A498 80240DB8 00000000 */ nop -/* D8A49C 80240DBC 28420002 */ slti $v0, $v0, 2 -/* D8A4A0 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D8A4A4 80240DC4 00000000 */ nop -.L80240DC8: -/* D8A4A8 80240DC8 3C048024 */ lui $a0, 0x8024 -/* D8A4AC 80240DCC 24840EB8 */ addiu $a0, $a0, 0xeb8 -.L80240DD0: -/* D8A4B0 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 -/* D8A4B4 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* D8A4B8 80240DD8 8E03013C */ lw $v1, 0x13c($s0) -/* D8A4BC 80240DDC AC620004 */ sw $v0, 4($v1) -.L80240DE0: -/* D8A4C0 80240DE0 0C00EAD2 */ jal get_npc_safe -/* D8A4C4 80240DE4 2404FFFC */ addiu $a0, $zero, -4 -/* D8A4C8 80240DE8 0040282D */ daddu $a1, $v0, $zero -/* D8A4CC 80240DEC 10A00021 */ beqz $a1, .L80240E74 -/* D8A4D0 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* D8A4D4 80240DF4 8E020088 */ lw $v0, 0x88($s0) -/* D8A4D8 80240DF8 14400014 */ bnez $v0, .L80240E4C -/* D8A4DC 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* D8A4E0 80240E00 8E040084 */ lw $a0, 0x84($s0) -/* D8A4E4 80240E04 10820016 */ beq $a0, $v0, .L80240E60 -/* D8A4E8 80240E08 28820002 */ slti $v0, $a0, 2 -/* D8A4EC 80240E0C 10400005 */ beqz $v0, .L80240E24 -/* D8A4F0 80240E10 24020002 */ addiu $v0, $zero, 2 -/* D8A4F4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D8A4F8 80240E18 00000000 */ nop -/* D8A4FC 80240E1C 0809039D */ j .L80240E74 -/* D8A500 80240E20 00000000 */ nop -.L80240E24: -/* D8A504 80240E24 10820006 */ beq $a0, $v0, .L80240E40 -/* D8A508 80240E28 24020002 */ addiu $v0, $zero, 2 -/* D8A50C 80240E2C 0809039D */ j .L80240E74 -/* D8A510 80240E30 00000000 */ nop -.L80240E34: -/* D8A514 80240E34 8CA20000 */ lw $v0, ($a1) -/* D8A518 80240E38 0809039A */ j .L80240E68 -/* D8A51C 80240E3C 3C03000A */ lui $v1, 0xa -.L80240E40: -/* D8A520 80240E40 8CA20000 */ lw $v0, ($a1) -/* D8A524 80240E44 0809039A */ j .L80240E68 -/* D8A528 80240E48 3C030002 */ lui $v1, 2 -.L80240E4C: -/* D8A52C 80240E4C 8E020084 */ lw $v0, 0x84($s0) -/* D8A530 80240E50 04400007 */ bltz $v0, .L80240E70 -/* D8A534 80240E54 28420002 */ slti $v0, $v0, 2 -/* D8A538 80240E58 10400006 */ beqz $v0, .L80240E74 -/* D8A53C 80240E5C 24020002 */ addiu $v0, $zero, 2 -.L80240E60: -/* D8A540 80240E60 8CA20000 */ lw $v0, ($a1) -/* D8A544 80240E64 3C030008 */ lui $v1, 8 -.L80240E68: -/* D8A548 80240E68 00431025 */ or $v0, $v0, $v1 -/* D8A54C 80240E6C ACA20000 */ sw $v0, ($a1) -.L80240E70: -/* D8A550 80240E70 24020002 */ addiu $v0, $zero, 2 -.L80240E74: -/* D8A554 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* D8A558 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* D8A55C 80240E7C 03E00008 */ jr $ra -/* D8A560 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_33/func_80240E84_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/func_80240E84_D896E0.s deleted file mode 100644 index 0ecd57a2de..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/func_80240E84_D896E0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D8A564 -/* D8A564 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8A568 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D8A56C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D8A570 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D8A574 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D8A578 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D8A57C 80240E9C 3C03000A */ lui $v1, 0xa -/* D8A580 80240EA0 8C820000 */ lw $v0, ($a0) -/* D8A584 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D8A588 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D8A58C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D8A590 80240EB0 03E00008 */ jr $ra -/* D8A594 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_33/func_80240EB8_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/func_80240EB8_D896E0.s deleted file mode 100644 index 61122c3eb9..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/func_80240EB8_D896E0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D8A598 -/* D8A598 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8A59C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D8A5A0 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D8A5A4 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D8A5A8 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D8A5AC 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D8A5B0 80240ED0 3C030008 */ lui $v1, 8 -/* D8A5B4 80240ED4 8C820000 */ lw $v0, ($a0) -/* D8A5B8 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D8A5BC 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D8A5C0 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D8A5C4 80240EE4 03E00008 */ jr $ra -/* D8A5C8 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_33/func_80240EEC_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/func_80240EEC_D896E0.s deleted file mode 100644 index 6763b73f3e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/func_80240EEC_D896E0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D8A5CC -/* D8A5CC 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8A5D0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D8A5D4 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D8A5D8 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D8A5DC 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D8A5E0 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D8A5E4 80240F04 3C030002 */ lui $v1, 2 -/* D8A5E8 80240F08 8C820000 */ lw $v0, ($a0) -/* D8A5EC 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D8A5F0 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D8A5F4 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D8A5F8 80240F18 03E00008 */ jr $ra -/* D8A5FC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_33/func_80240F20_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/func_80240F20_D896E0.s deleted file mode 100644 index 056ae74214..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/func_80240F20_D896E0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D8A600 -/* D8A600 80240F20 3C058016 */ lui $a1, 0x8016 -/* D8A604 80240F24 24A5A550 */ addiu $a1, $a1, -0x5ab0 -/* D8A608 80240F28 AC8000AC */ sw $zero, 0xac($a0) -/* D8A60C 80240F2C 84A20002 */ lh $v0, 2($a1) -/* D8A610 80240F30 2403001C */ addiu $v1, $zero, 0x1c -/* D8A614 80240F34 14430002 */ bne $v0, $v1, .L80240F40 -/* D8A618 80240F38 24020001 */ addiu $v0, $zero, 1 -/* D8A61C 80240F3C AC8200AC */ sw $v0, 0xac($a0) -.L80240F40: -/* D8A620 80240F40 84A20004 */ lh $v0, 4($a1) -/* D8A624 80240F44 14430002 */ bne $v0, $v1, .L80240F50 -/* D8A628 80240F48 24020001 */ addiu $v0, $zero, 1 -/* D8A62C 80240F4C AC8200AC */ sw $v0, 0xac($a0) -.L80240F50: -/* D8A630 80240F50 03E00008 */ jr $ra -/* D8A634 80240F54 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_pra/pra_33/func_80240F58_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/func_80240F58_D896E0.s deleted file mode 100644 index d6b78af8ae..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/func_80240F58_D896E0.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F58_D8A638 -/* D8A638 80240F58 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D8A63C 80240F5C AFB10014 */ sw $s1, 0x14($sp) -/* D8A640 80240F60 0080882D */ daddu $s1, $a0, $zero -/* D8A644 80240F64 AFB00010 */ sw $s0, 0x10($sp) -/* D8A648 80240F68 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D8A64C 80240F6C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D8A650 80240F70 AFBF0018 */ sw $ra, 0x18($sp) -/* D8A654 80240F74 F7B60028 */ sdc1 $f22, 0x28($sp) -/* D8A658 80240F78 F7B40020 */ sdc1 $f20, 0x20($sp) -/* D8A65C 80240F7C 8E060028 */ lw $a2, 0x28($s0) -/* D8A660 80240F80 8E070030 */ lw $a3, 0x30($s0) -/* D8A664 80240F84 3C014348 */ lui $at, 0x4348 -/* D8A668 80240F88 4481A000 */ mtc1 $at, $f20 -/* D8A66C 80240F8C 4480B000 */ mtc1 $zero, $f22 -/* D8A670 80240F90 4600A306 */ mov.s $f12, $f20 -/* D8A674 80240F94 0C00A7B5 */ jal dist2D -/* D8A678 80240F98 4600B386 */ mov.s $f14, $f22 -/* D8A67C 80240F9C 4600008D */ trunc.w.s $f2, $f0 -/* D8A680 80240FA0 E622009C */ swc1 $f2, 0x9c($s1) -/* D8A684 80240FA4 4600A306 */ mov.s $f12, $f20 -/* D8A688 80240FA8 8E060028 */ lw $a2, 0x28($s0) -/* D8A68C 80240FAC 8E070030 */ lw $a3, 0x30($s0) -/* D8A690 80240FB0 0C00A720 */ jal atan2 -/* D8A694 80240FB4 4600B386 */ mov.s $f14, $f22 -/* D8A698 80240FB8 4600008D */ trunc.w.s $f2, $f0 -/* D8A69C 80240FBC 44021000 */ mfc1 $v0, $f2 -/* D8A6A0 80240FC0 00000000 */ nop -/* D8A6A4 80240FC4 44826000 */ mtc1 $v0, $f12 -/* D8A6A8 80240FC8 00000000 */ nop -/* D8A6AC 80240FCC 46806320 */ cvt.s.w $f12, $f12 -/* D8A6B0 80240FD0 0C00A6C9 */ jal clamp_angle -/* D8A6B4 80240FD4 AE2200A0 */ sw $v0, 0xa0($s1) -/* D8A6B8 80240FD8 4600008D */ trunc.w.s $f2, $f0 -/* D8A6BC 80240FDC E62200A0 */ swc1 $f2, 0xa0($s1) -/* D8A6C0 80240FE0 8FBF0018 */ lw $ra, 0x18($sp) -/* D8A6C4 80240FE4 8FB10014 */ lw $s1, 0x14($sp) -/* D8A6C8 80240FE8 8FB00010 */ lw $s0, 0x10($sp) -/* D8A6CC 80240FEC D7B60028 */ ldc1 $f22, 0x28($sp) -/* D8A6D0 80240FF0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* D8A6D4 80240FF4 24020002 */ addiu $v0, $zero, 2 -/* D8A6D8 80240FF8 03E00008 */ jr $ra -/* D8A6DC 80240FFC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_pra/pra_33/func_80241000_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/func_80241000_D896E0.s deleted file mode 100644 index 6758116f29..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/func_80241000_D896E0.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241000_D8A6E0 -/* D8A6E0 80241000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8A6E4 80241004 AFB00018 */ sw $s0, 0x18($sp) -/* D8A6E8 80241008 0080802D */ daddu $s0, $a0, $zero -/* D8A6EC 8024100C AFBF001C */ sw $ra, 0x1c($sp) -/* D8A6F0 80241010 C60C00A0 */ lwc1 $f12, 0xa0($s0) -/* D8A6F4 80241014 46806320 */ cvt.s.w $f12, $f12 -/* D8A6F8 80241018 27A50010 */ addiu $a1, $sp, 0x10 -/* D8A6FC 8024101C 0C00A88D */ jal sin_cos_deg -/* D8A700 80241020 27A60014 */ addiu $a2, $sp, 0x14 -/* D8A704 80241024 C7A20010 */ lwc1 $f2, 0x10($sp) -/* D8A708 80241028 C600009C */ lwc1 $f0, 0x9c($s0) -/* D8A70C 8024102C 46800020 */ cvt.s.w $f0, $f0 -/* D8A710 80241030 46020002 */ mul.s $f0, $f0, $f2 -/* D8A714 80241034 00000000 */ nop -/* D8A718 80241038 3C014348 */ lui $at, 0x4348 -/* D8A71C 8024103C 44811000 */ mtc1 $at, $f2 -/* D8A720 80241040 00000000 */ nop -/* D8A724 80241044 46020000 */ add.s $f0, $f0, $f2 -/* D8A728 80241048 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* D8A72C 8024104C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* D8A730 80241050 E4400028 */ swc1 $f0, 0x28($v0) -/* D8A734 80241054 C7A00014 */ lwc1 $f0, 0x14($sp) -/* D8A738 80241058 C602009C */ lwc1 $f2, 0x9c($s0) -/* D8A73C 8024105C 468010A0 */ cvt.s.w $f2, $f2 -/* D8A740 80241060 46000007 */ neg.s $f0, $f0 -/* D8A744 80241064 46001082 */ mul.s $f2, $f2, $f0 -/* D8A748 80241068 00000000 */ nop -/* D8A74C 8024106C 44800000 */ mtc1 $zero, $f0 -/* D8A750 80241070 00000000 */ nop -/* D8A754 80241074 46001080 */ add.s $f2, $f2, $f0 -/* D8A758 80241078 E4420030 */ swc1 $f2, 0x30($v0) -/* D8A75C 8024107C 8FBF001C */ lw $ra, 0x1c($sp) -/* D8A760 80241080 8FB00018 */ lw $s0, 0x18($sp) -/* D8A764 80241084 24020002 */ addiu $v0, $zero, 2 -/* D8A768 80241088 03E00008 */ jr $ra -/* D8A76C 8024108C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_34/func_80240020_D8B3B0.s b/asm/nonmatchings/world/area_pra/pra_34/func_80240020_D8B3B0.s deleted file mode 100644 index bd55909e06..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/func_80240020_D8B3B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D8B3D0 -/* D8B3D0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D8B3D4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D8B3D8 80240028 00822024 */ and $a0, $a0, $v0 -/* D8B3DC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D8B3E0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D8B3E4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D8B3E8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D8B3EC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D8B3F0 80240040 30620001 */ andi $v0, $v1, 1 -/* D8B3F4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D8B3F8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D8B3FC 8024004C 03E00008 */ jr $ra -/* D8B400 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_34/func_80240054_D8B3B0.s b/asm/nonmatchings/world/area_pra/pra_34/func_80240054_D8B3B0.s deleted file mode 100644 index 4794166151..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/func_80240054_D8B3B0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054_D8B404 -/* D8B404 80240054 00041403 */ sra $v0, $a0, 0x10 -/* D8B408 80240058 304300FF */ andi $v1, $v0, 0xff -/* D8B40C 8024005C 24020006 */ addiu $v0, $zero, 6 -/* D8B410 80240060 10620015 */ beq $v1, $v0, .L802400B8 -/* D8B414 80240064 28620007 */ slti $v0, $v1, 7 -/* D8B418 80240068 10400005 */ beqz $v0, .L80240080 -/* D8B41C 8024006C 24020001 */ addiu $v0, $zero, 1 -/* D8B420 80240070 1062000A */ beq $v1, $v0, .L8024009C -/* D8B424 80240074 3C020100 */ lui $v0, 0x100 -/* D8B428 80240078 03E00008 */ jr $ra -/* D8B42C 8024007C 00821025 */ or $v0, $a0, $v0 -.L80240080: -/* D8B430 80240080 2862000A */ slti $v0, $v1, 0xa -/* D8B434 80240084 10400016 */ beqz $v0, .L802400E0 -/* D8B438 80240088 28620008 */ slti $v0, $v1, 8 -/* D8B43C 8024008C 14400015 */ bnez $v0, .L802400E4 -/* D8B440 80240090 3C020100 */ lui $v0, 0x100 -/* D8B444 80240094 03E00008 */ jr $ra -/* D8B448 80240098 0080102D */ daddu $v0, $a0, $zero -.L8024009C: -/* D8B44C 8024009C 3C020001 */ lui $v0, 1 -/* D8B450 802400A0 3442000C */ ori $v0, $v0, 0xc -/* D8B454 802400A4 0044102A */ slt $v0, $v0, $a0 -/* D8B458 802400A8 1040000E */ beqz $v0, .L802400E4 -/* D8B45C 802400AC 3C020100 */ lui $v0, 0x100 -.L802400B0: -/* D8B460 802400B0 03E00008 */ jr $ra -/* D8B464 802400B4 0080102D */ daddu $v0, $a0, $zero -.L802400B8: -/* D8B468 802400B8 3C02FFF9 */ lui $v0, 0xfff9 -/* D8B46C 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D8B470 802400C0 00821821 */ addu $v1, $a0, $v0 -/* D8B474 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D8B478 802400C8 10400005 */ beqz $v0, .L802400E0 -/* D8B47C 802400CC 30620001 */ andi $v0, $v1, 1 -/* D8B480 802400D0 1440FFF7 */ bnez $v0, .L802400B0 -/* D8B484 802400D4 24820001 */ addiu $v0, $a0, 1 -/* D8B488 802400D8 03E00008 */ jr $ra -/* D8B48C 802400DC 00000000 */ nop -.L802400E0: -/* D8B490 802400E0 3C020100 */ lui $v0, 0x100 -.L802400E4: -/* D8B494 802400E4 03E00008 */ jr $ra -/* D8B498 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_34/func_802400EC_D8B3B0.s b/asm/nonmatchings/world/area_pra/pra_34/func_802400EC_D8B3B0.s deleted file mode 100644 index 369575dc88..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/func_802400EC_D8B3B0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_D8B49C -/* D8B49C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8B4A0 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* D8B4A4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D8B4A8 802400F8 3C058024 */ lui $a1, 0x8024 -/* D8B4AC 802400FC 24A50128 */ addiu $a1, $a1, 0x128 -/* D8B4B0 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* D8B4B4 80240104 0C048C56 */ jal bind_dynamic_entity_3 -/* D8B4B8 80240108 0000202D */ daddu $a0, $zero, $zero -/* D8B4BC 8024010C 8E03013C */ lw $v1, 0x13c($s0) -/* D8B4C0 80240110 AC620000 */ sw $v0, ($v1) -/* D8B4C4 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* D8B4C8 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* D8B4CC 8024011C 24020002 */ addiu $v0, $zero, 2 -/* D8B4D0 80240120 03E00008 */ jr $ra -/* D8B4D4 80240124 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_34/func_80240128_D8B3B0.s b/asm/nonmatchings/world/area_pra/pra_34/func_80240128_D8B3B0.s deleted file mode 100644 index 6c4a52025e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/func_80240128_D8B3B0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240128_D8B4D8 -/* D8B4D8 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D8B4DC 8024012C AFB00040 */ sw $s0, 0x40($sp) -/* D8B4E0 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D8B4E4 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D8B4E8 80240138 AFB20048 */ sw $s2, 0x48($sp) -/* D8B4EC 8024013C AFBF004C */ sw $ra, 0x4c($sp) -/* D8B4F0 80240140 AFB10044 */ sw $s1, 0x44($sp) -/* D8B4F4 80240144 8E020000 */ lw $v0, ($s0) -/* D8B4F8 80240148 821100BE */ lb $s1, 0xbe($s0) -/* D8B4FC 8024014C 30420001 */ andi $v0, $v0, 1 -/* D8B500 80240150 10400061 */ beqz $v0, .L802402D8 -/* D8B504 80240154 27B20020 */ addiu $s2, $sp, 0x20 -/* D8B508 80240158 8E0400CC */ lw $a0, 0xcc($s0) -/* D8B50C 8024015C 0C044181 */ jal get_shadow_by_index -/* D8B510 80240160 00000000 */ nop -/* D8B514 80240164 0C048B77 */ jal func_80122DDC -/* D8B518 80240168 84440008 */ lh $a0, 8($v0) -/* D8B51C 8024016C 8C430000 */ lw $v1, ($v0) -/* D8B520 80240170 34630200 */ ori $v1, $v1, 0x200 -/* D8B524 80240174 AC430000 */ sw $v1, ($v0) -/* D8B528 80240178 8E050028 */ lw $a1, 0x28($s0) -/* D8B52C 8024017C 8E06002C */ lw $a2, 0x2c($s0) -/* D8B530 80240180 27A20030 */ addiu $v0, $sp, 0x30 -/* D8B534 80240184 AFA20010 */ sw $v0, 0x10($sp) -/* D8B538 80240188 27A20034 */ addiu $v0, $sp, 0x34 -/* D8B53C 8024018C AFA20014 */ sw $v0, 0x14($sp) -/* D8B540 80240190 C6000030 */ lwc1 $f0, 0x30($s0) -/* D8B544 80240194 3C04800A */ lui $a0, 0x800a -/* D8B548 80240198 8484A634 */ lh $a0, -0x59cc($a0) -/* D8B54C 8024019C 46000007 */ neg.s $f0, $f0 -/* D8B550 802401A0 44070000 */ mfc1 $a3, $f0 -/* D8B554 802401A4 27A20038 */ addiu $v0, $sp, 0x38 -/* D8B558 802401A8 0C00B94E */ jal get_screen_coords -/* D8B55C 802401AC AFA20018 */ sw $v0, 0x18($sp) -/* D8B560 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D8B564 802401B4 0C090008 */ jal func_80240020 -/* D8B568 802401B8 00000000 */ nop -/* D8B56C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) -/* D8B570 802401C0 3C014307 */ lui $at, 0x4307 -/* D8B574 802401C4 44810000 */ mtc1 $at, $f0 -/* D8B578 802401C8 00000000 */ nop -/* D8B57C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D8B580 802401D0 00000000 */ nop -/* D8B584 802401D4 4500000B */ bc1f .L80240204 -/* D8B588 802401D8 24040002 */ addiu $a0, $zero, 2 -/* D8B58C 802401DC 3C014361 */ lui $at, 0x4361 -/* D8B590 802401E0 44810000 */ mtc1 $at, $f0 -/* D8B594 802401E4 00000000 */ nop -/* D8B598 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D8B59C 802401EC 00000000 */ nop -/* D8B5A0 802401F0 45000004 */ bc1f .L80240204 -/* D8B5A4 802401F4 00000000 */ nop -/* D8B5A8 802401F8 0C090015 */ jal func_80240054 -/* D8B5AC 802401FC 0040202D */ daddu $a0, $v0, $zero -/* D8B5B0 80240200 24040002 */ addiu $a0, $zero, 2 -.L80240204: -/* D8B5B4 80240204 3C063F80 */ lui $a2, 0x3f80 -/* D8B5B8 80240208 0C0B76A3 */ jal func_802DDA8C -/* D8B5BC 8024020C 0040282D */ daddu $a1, $v0, $zero -/* D8B5C0 80240210 8E020000 */ lw $v0, ($s0) -/* D8B5C4 80240214 3C030002 */ lui $v1, 2 -/* D8B5C8 80240218 00431024 */ and $v0, $v0, $v1 -/* D8B5CC 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 -/* D8B5D0 80240220 24110011 */ addiu $s1, $zero, 0x11 -/* D8B5D4 80240224 9203000E */ lbu $v1, 0xe($s0) -/* D8B5D8 80240228 3C02802E */ lui $v0, 0x802e -/* D8B5DC 8024022C 90429D70 */ lbu $v0, -0x6290($v0) -/* D8B5E0 80240230 10620018 */ beq $v1, $v0, .L80240294 -/* D8B5E4 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D8B5E8 80240238 1040000B */ beqz $v0, .L80240268 -/* D8B5EC 8024023C 24110011 */ addiu $s1, $zero, 0x11 -/* D8B5F0 80240240 24040002 */ addiu $a0, $zero, 2 -/* D8B5F4 80240244 2405FFFF */ addiu $a1, $zero, -1 -/* D8B5F8 80240248 24060007 */ addiu $a2, $zero, 7 -/* D8B5FC 8024024C 0060102D */ daddu $v0, $v1, $zero -/* D8B600 80240250 0000382D */ daddu $a3, $zero, $zero -/* D8B604 80240254 AFA00010 */ sw $zero, 0x10($sp) -/* D8B608 80240258 AFA00014 */ sw $zero, 0x14($sp) -/* D8B60C 8024025C AFA0001C */ sw $zero, 0x1c($sp) -/* D8B610 80240260 080900A3 */ j .L8024028C -/* D8B614 80240264 AFA20018 */ sw $v0, 0x18($sp) -.L80240268: -/* D8B618 80240268 2411000D */ addiu $s1, $zero, 0xd -/* D8B61C 8024026C 24040002 */ addiu $a0, $zero, 2 -/* D8B620 80240270 2405FFFF */ addiu $a1, $zero, -1 -/* D8B624 80240274 0000302D */ daddu $a2, $zero, $zero -/* D8B628 80240278 00C0382D */ daddu $a3, $a2, $zero -/* D8B62C 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* D8B630 80240280 AFA00014 */ sw $zero, 0x14($sp) -/* D8B634 80240284 AFA00018 */ sw $zero, 0x18($sp) -/* D8B638 80240288 AFA0001C */ sw $zero, 0x1c($sp) -.L8024028C: -/* D8B63C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D8B640 80240290 00000000 */ nop -.L80240294: -/* D8B644 80240294 9202000E */ lbu $v0, 0xe($s0) -/* D8B648 80240298 3C01802E */ lui $at, 0x802e -/* D8B64C 8024029C A0229D70 */ sb $v0, -0x6290($at) -/* D8B650 802402A0 080900AD */ j .L802402B4 -/* D8B654 802402A4 0240202D */ daddu $a0, $s2, $zero -.L802402A8: -/* D8B658 802402A8 3C01802E */ lui $at, 0x802e -/* D8B65C 802402AC A0209D70 */ sb $zero, -0x6290($at) -/* D8B660 802402B0 0240202D */ daddu $a0, $s2, $zero -.L802402B4: -/* D8B664 802402B4 AC910000 */ sw $s1, ($a0) -/* D8B668 802402B8 AC900008 */ sw $s0, 8($a0) -/* D8B66C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D8B670 802402C0 3C038024 */ lui $v1, 0x8024 -/* D8B674 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 -/* D8B678 802402C8 AC83000C */ sw $v1, 0xc($a0) -/* D8B67C 802402CC 00021023 */ negu $v0, $v0 -/* D8B680 802402D0 0C047644 */ jal queue_render_task -/* D8B684 802402D4 AC820004 */ sw $v0, 4($a0) -.L802402D8: -/* D8B688 802402D8 8FBF004C */ lw $ra, 0x4c($sp) -/* D8B68C 802402DC 8FB20048 */ lw $s2, 0x48($sp) -/* D8B690 802402E0 8FB10044 */ lw $s1, 0x44($sp) -/* D8B694 802402E4 8FB00040 */ lw $s0, 0x40($sp) -/* D8B698 802402E8 03E00008 */ jr $ra -/* D8B69C 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_34/func_802402F0_D8B3B0.s b/asm/nonmatchings/world/area_pra/pra_34/func_802402F0_D8B3B0.s deleted file mode 100644 index 5950892ede..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/func_802402F0_D8B3B0.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D8B6A0 -/* D8B6A0 802402F0 3C03800A */ lui $v1, 0x800a -/* D8B6A4 802402F4 8463A634 */ lh $v1, -0x59cc($v1) -/* D8B6A8 802402F8 3C07BF80 */ lui $a3, 0xbf80 -/* D8B6AC 802402FC 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D8B6B0 80240300 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D8B6B4 80240304 4480A000 */ mtc1 $zero, $f20 -/* D8B6B8 80240308 AFB1011C */ sw $s1, 0x11c($sp) -/* D8B6BC 8024030C 0080882D */ daddu $s1, $a0, $zero -/* D8B6C0 80240310 AFB00118 */ sw $s0, 0x118($sp) -/* D8B6C4 80240314 27B00098 */ addiu $s0, $sp, 0x98 -/* D8B6C8 80240318 AFBF0120 */ sw $ra, 0x120($sp) -/* D8B6CC 8024031C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D8B6D0 80240320 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D8B6D4 80240324 00031080 */ sll $v0, $v1, 2 -/* D8B6D8 80240328 00431021 */ addu $v0, $v0, $v1 -/* D8B6DC 8024032C 00021080 */ sll $v0, $v0, 2 -/* D8B6E0 80240330 00431023 */ subu $v0, $v0, $v1 -/* D8B6E4 80240334 000218C0 */ sll $v1, $v0, 3 -/* D8B6E8 80240338 00431021 */ addu $v0, $v0, $v1 -/* D8B6EC 8024033C 000210C0 */ sll $v0, $v0, 3 -/* D8B6F0 80240340 3C01800B */ lui $at, 0x800b -/* D8B6F4 80240344 00220821 */ addu $at, $at, $v0 -/* D8B6F8 80240348 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D8B6FC 8024034C 4406A000 */ mfc1 $a2, $f20 -/* D8B700 80240350 4600B587 */ neg.s $f22, $f22 -/* D8B704 80240354 4405B000 */ mfc1 $a1, $f22 -/* D8B708 80240358 0200202D */ daddu $a0, $s0, $zero -/* D8B70C 8024035C 0C019EC8 */ jal guRotateF -/* D8B710 80240360 E7B40010 */ swc1 $f20, 0x10($sp) -/* D8B714 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D8B718 80240368 0C00A6C9 */ jal clamp_angle -/* D8B71C 8024036C 00000000 */ nop -/* D8B720 80240370 44050000 */ mfc1 $a1, $f0 -/* D8B724 80240374 4406A000 */ mfc1 $a2, $f20 -/* D8B728 80240378 4407A000 */ mfc1 $a3, $f20 -/* D8B72C 8024037C 3C013F80 */ lui $at, 0x3f80 -/* D8B730 80240380 4481C000 */ mtc1 $at, $f24 -/* D8B734 80240384 27A40018 */ addiu $a0, $sp, 0x18 -/* D8B738 80240388 0C019EC8 */ jal guRotateF -/* D8B73C 8024038C E7B80010 */ swc1 $f24, 0x10($sp) -/* D8B740 80240390 0200202D */ daddu $a0, $s0, $zero -/* D8B744 80240394 27A50018 */ addiu $a1, $sp, 0x18 -/* D8B748 80240398 0C019D80 */ jal guMtxCatF -/* D8B74C 8024039C 00A0302D */ daddu $a2, $a1, $zero -/* D8B750 802403A0 4405B000 */ mfc1 $a1, $f22 -/* D8B754 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D8B758 802403A8 4407C000 */ mfc1 $a3, $f24 -/* D8B75C 802403AC 0200202D */ daddu $a0, $s0, $zero -/* D8B760 802403B0 0C019EC8 */ jal guRotateF -/* D8B764 802403B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D8B768 802403B8 27A40018 */ addiu $a0, $sp, 0x18 -/* D8B76C 802403BC 0200282D */ daddu $a1, $s0, $zero -/* D8B770 802403C0 0C019D80 */ jal guMtxCatF -/* D8B774 802403C4 0080302D */ daddu $a2, $a0, $zero -/* D8B778 802403C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D8B77C 802403CC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D8B780 802403D0 4406A000 */ mfc1 $a2, $f20 -/* D8B784 802403D4 4407C000 */ mfc1 $a3, $f24 -/* D8B788 802403D8 0C019EC8 */ jal guRotateF -/* D8B78C 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D8B790 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* D8B794 802403E4 0200282D */ daddu $a1, $s0, $zero -/* D8B798 802403E8 0C019D80 */ jal guMtxCatF -/* D8B79C 802403EC 0080302D */ daddu $a2, $a0, $zero -/* D8B7A0 802403F0 3C013F36 */ lui $at, 0x3f36 -/* D8B7A4 802403F4 3421DB6E */ ori $at, $at, 0xdb6e -/* D8B7A8 802403F8 44810000 */ mtc1 $at, $f0 -/* D8B7AC 802403FC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D8B7B0 80240400 44050000 */ mfc1 $a1, $f0 -/* D8B7B4 80240404 0200202D */ daddu $a0, $s0, $zero -/* D8B7B8 80240408 00A0302D */ daddu $a2, $a1, $zero -/* D8B7BC 8024040C 0C019DF0 */ jal guScaleF -/* D8B7C0 80240410 00A0382D */ daddu $a3, $a1, $zero -/* D8B7C4 80240414 27A40018 */ addiu $a0, $sp, 0x18 -/* D8B7C8 80240418 0200282D */ daddu $a1, $s0, $zero -/* D8B7CC 8024041C 0C019D80 */ jal guMtxCatF -/* D8B7D0 80240420 0080302D */ daddu $a2, $a0, $zero -/* D8B7D4 80240424 27B00058 */ addiu $s0, $sp, 0x58 -/* D8B7D8 80240428 C6200030 */ lwc1 $f0, 0x30($s1) -/* D8B7DC 8024042C 3C014040 */ lui $at, 0x4040 -/* D8B7E0 80240430 44811000 */ mtc1 $at, $f2 -/* D8B7E4 80240434 46000007 */ neg.s $f0, $f0 -/* D8B7E8 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* D8B7EC 8024043C 8E250028 */ lw $a1, 0x28($s1) -/* D8B7F0 80240440 8E26002C */ lw $a2, 0x2c($s1) -/* D8B7F4 80240444 44070000 */ mfc1 $a3, $f0 -/* D8B7F8 80240448 0C019E40 */ jal guTranslateF -/* D8B7FC 8024044C 0200202D */ daddu $a0, $s0, $zero -/* D8B800 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* D8B804 80240454 0200282D */ daddu $a1, $s0, $zero -/* D8B808 80240458 0C019D80 */ jal guMtxCatF -/* D8B80C 8024045C 0080302D */ daddu $a2, $a0, $zero -/* D8B810 80240460 24040002 */ addiu $a0, $zero, 2 -/* D8B814 80240464 0000282D */ daddu $a1, $zero, $zero -/* D8B818 80240468 00A0302D */ daddu $a2, $a1, $zero -/* D8B81C 8024046C 00A0382D */ daddu $a3, $a1, $zero -/* D8B820 80240470 27A20018 */ addiu $v0, $sp, 0x18 -/* D8B824 80240474 0C0B7710 */ jal render_sprite -/* D8B828 80240478 AFA20010 */ sw $v0, 0x10($sp) -/* D8B82C 8024047C 8FBF0120 */ lw $ra, 0x120($sp) -/* D8B830 80240480 8FB1011C */ lw $s1, 0x11c($sp) -/* D8B834 80240484 8FB00118 */ lw $s0, 0x118($sp) -/* D8B838 80240488 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D8B83C 8024048C D7B60130 */ ldc1 $f22, 0x130($sp) -/* D8B840 80240490 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D8B844 80240494 03E00008 */ jr $ra -/* D8B848 80240498 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_34/func_8024049C_D8B3B0.s b/asm/nonmatchings/world/area_pra/pra_34/func_8024049C_D8B3B0.s deleted file mode 100644 index 1b217f5f03..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/func_8024049C_D8B3B0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_D8B84C -/* D8B84C 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8B850 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* D8B854 802404A4 0080802D */ daddu $s0, $a0, $zero -/* D8B858 802404A8 AFBF0014 */ sw $ra, 0x14($sp) -/* D8B85C 802404AC 8E020084 */ lw $v0, 0x84($s0) -/* D8B860 802404B0 0440000E */ bltz $v0, .L802404EC -/* D8B864 802404B4 28420002 */ slti $v0, $v0, 2 -/* D8B868 802404B8 1040000C */ beqz $v0, .L802404EC -/* D8B86C 802404BC 00000000 */ nop -/* D8B870 802404C0 3C058024 */ lui $a1, 0x8024 -/* D8B874 802404C4 24A50500 */ addiu $a1, $a1, 0x500 -/* D8B878 802404C8 0C048C56 */ jal bind_dynamic_entity_3 -/* D8B87C 802404CC 0000202D */ daddu $a0, $zero, $zero -/* D8B880 802404D0 8E03013C */ lw $v1, 0x13c($s0) -/* D8B884 802404D4 AC620000 */ sw $v0, ($v1) -/* D8B888 802404D8 3C03800A */ lui $v1, %hi(D_8009A650) -/* D8B88C 802404DC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D8B890 802404E0 8C620000 */ lw $v0, ($v1) -/* D8B894 802404E4 34420080 */ ori $v0, $v0, 0x80 -/* D8B898 802404E8 AC620000 */ sw $v0, ($v1) -.L802404EC: -/* D8B89C 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* D8B8A0 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* D8B8A4 802404F4 24020002 */ addiu $v0, $zero, 2 -/* D8B8A8 802404F8 03E00008 */ jr $ra -/* D8B8AC 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_34/func_80240500_D8B3B0.s b/asm/nonmatchings/world/area_pra/pra_34/func_80240500_D8B3B0.s deleted file mode 100644 index bc6f63c393..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/func_80240500_D8B3B0.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_D8B8B0 -/* D8B8B0 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D8B8B4 80240504 AFB00040 */ sw $s0, 0x40($sp) -/* D8B8B8 80240508 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D8B8BC 8024050C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D8B8C0 80240510 AFB10044 */ sw $s1, 0x44($sp) -/* D8B8C4 80240514 AFBF004C */ sw $ra, 0x4c($sp) -/* D8B8C8 80240518 AFB20048 */ sw $s2, 0x48($sp) -/* D8B8CC 8024051C 8E020000 */ lw $v0, ($s0) -/* D8B8D0 80240520 821200BE */ lb $s2, 0xbe($s0) -/* D8B8D4 80240524 30420001 */ andi $v0, $v0, 1 -/* D8B8D8 80240528 10400052 */ beqz $v0, .L80240674 -/* D8B8DC 8024052C 27B10020 */ addiu $s1, $sp, 0x20 -/* D8B8E0 80240530 8E0400CC */ lw $a0, 0xcc($s0) -/* D8B8E4 80240534 0C044181 */ jal get_shadow_by_index -/* D8B8E8 80240538 00000000 */ nop -/* D8B8EC 8024053C 0C048B77 */ jal func_80122DDC -/* D8B8F0 80240540 84440008 */ lh $a0, 8($v0) -/* D8B8F4 80240544 8E050028 */ lw $a1, 0x28($s0) -/* D8B8F8 80240548 8E070030 */ lw $a3, 0x30($s0) -/* D8B8FC 8024054C 27A20030 */ addiu $v0, $sp, 0x30 -/* D8B900 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* D8B904 80240554 27A20034 */ addiu $v0, $sp, 0x34 -/* D8B908 80240558 AFA20014 */ sw $v0, 0x14($sp) -/* D8B90C 8024055C 27A20038 */ addiu $v0, $sp, 0x38 -/* D8B910 80240560 AFA20018 */ sw $v0, 0x18($sp) -/* D8B914 80240564 C600002C */ lwc1 $f0, 0x2c($s0) -/* D8B918 80240568 3C04800A */ lui $a0, 0x800a -/* D8B91C 8024056C 8484A634 */ lh $a0, -0x59cc($a0) -/* D8B920 80240570 46000007 */ neg.s $f0, $f0 -/* D8B924 80240574 44060000 */ mfc1 $a2, $f0 -/* D8B928 80240578 0C00B94E */ jal get_screen_coords -/* D8B92C 8024057C 00000000 */ nop -/* D8B930 80240580 8E0500A4 */ lw $a1, 0xa4($s0) -/* D8B934 80240584 3C063F80 */ lui $a2, 0x3f80 -/* D8B938 80240588 0C0B76A3 */ jal func_802DDA8C -/* D8B93C 8024058C 24040001 */ addiu $a0, $zero, 1 -/* D8B940 80240590 8E020000 */ lw $v0, ($s0) -/* D8B944 80240594 3C030002 */ lui $v1, 2 -/* D8B948 80240598 00431024 */ and $v0, $v0, $v1 -/* D8B94C 8024059C 54400022 */ bnel $v0, $zero, .L80240628 -/* D8B950 802405A0 24120011 */ addiu $s2, $zero, 0x11 -/* D8B954 802405A4 9203000E */ lbu $v1, 0xe($s0) -/* D8B958 802405A8 3C02802E */ lui $v0, 0x802e -/* D8B95C 802405AC 90429D71 */ lbu $v0, -0x628f($v0) -/* D8B960 802405B0 10620018 */ beq $v1, $v0, .L80240614 -/* D8B964 802405B4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D8B968 802405B8 1040000B */ beqz $v0, .L802405E8 -/* D8B96C 802405BC 24120011 */ addiu $s2, $zero, 0x11 -/* D8B970 802405C0 24040001 */ addiu $a0, $zero, 1 -/* D8B974 802405C4 2405FFFF */ addiu $a1, $zero, -1 -/* D8B978 802405C8 24060007 */ addiu $a2, $zero, 7 -/* D8B97C 802405CC 0060102D */ daddu $v0, $v1, $zero -/* D8B980 802405D0 0000382D */ daddu $a3, $zero, $zero -/* D8B984 802405D4 AFA00010 */ sw $zero, 0x10($sp) -/* D8B988 802405D8 AFA00014 */ sw $zero, 0x14($sp) -/* D8B98C 802405DC AFA0001C */ sw $zero, 0x1c($sp) -/* D8B990 802405E0 08090183 */ j .L8024060C -/* D8B994 802405E4 AFA20018 */ sw $v0, 0x18($sp) -.L802405E8: -/* D8B998 802405E8 2412000D */ addiu $s2, $zero, 0xd -/* D8B99C 802405EC 24040001 */ addiu $a0, $zero, 1 -/* D8B9A0 802405F0 2405FFFF */ addiu $a1, $zero, -1 -/* D8B9A4 802405F4 0000302D */ daddu $a2, $zero, $zero -/* D8B9A8 802405F8 00C0382D */ daddu $a3, $a2, $zero -/* D8B9AC 802405FC AFA00010 */ sw $zero, 0x10($sp) -/* D8B9B0 80240600 AFA00014 */ sw $zero, 0x14($sp) -/* D8B9B4 80240604 AFA00018 */ sw $zero, 0x18($sp) -/* D8B9B8 80240608 AFA0001C */ sw $zero, 0x1c($sp) -.L8024060C: -/* D8B9BC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D8B9C0 80240610 00000000 */ nop -.L80240614: -/* D8B9C4 80240614 9202000E */ lbu $v0, 0xe($s0) -/* D8B9C8 80240618 3C01802E */ lui $at, 0x802e -/* D8B9CC 8024061C A0229D71 */ sb $v0, -0x628f($at) -/* D8B9D0 80240620 0809018C */ j .L80240630 -/* D8B9D4 80240624 00000000 */ nop -.L80240628: -/* D8B9D8 80240628 3C01802E */ lui $at, 0x802e -/* D8B9DC 8024062C A0209D71 */ sb $zero, -0x628f($at) -.L80240630: -/* D8B9E0 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D8B9E4 80240634 3C048024 */ lui $a0, 0x8024 -/* D8B9E8 80240638 24840870 */ addiu $a0, $a0, 0x870 -/* D8B9EC 8024063C AE320000 */ sw $s2, ($s1) -/* D8B9F0 80240640 AE300008 */ sw $s0, 8($s1) -/* D8B9F4 80240644 00021023 */ negu $v0, $v0 -/* D8B9F8 80240648 AE220004 */ sw $v0, 4($s1) -/* D8B9FC 8024064C 8E020000 */ lw $v0, ($s0) -/* D8BA00 80240650 3C030002 */ lui $v1, 2 -/* D8BA04 80240654 00431024 */ and $v0, $v0, $v1 -/* D8BA08 80240658 54400004 */ bnel $v0, $zero, .L8024066C -/* D8BA0C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D8BA10 80240660 3C048024 */ lui $a0, 0x8024 -/* D8BA14 80240664 2484068C */ addiu $a0, $a0, 0x68c -/* D8BA18 80240668 AE24000C */ sw $a0, 0xc($s1) -.L8024066C: -/* D8BA1C 8024066C 0C047644 */ jal queue_render_task -/* D8BA20 80240670 0220202D */ daddu $a0, $s1, $zero -.L80240674: -/* D8BA24 80240674 8FBF004C */ lw $ra, 0x4c($sp) -/* D8BA28 80240678 8FB20048 */ lw $s2, 0x48($sp) -/* D8BA2C 8024067C 8FB10044 */ lw $s1, 0x44($sp) -/* D8BA30 80240680 8FB00040 */ lw $s0, 0x40($sp) -/* D8BA34 80240684 03E00008 */ jr $ra -/* D8BA38 80240688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_34/func_8024068C_D8B3B0.s b/asm/nonmatchings/world/area_pra/pra_34/func_8024068C_D8B3B0.s deleted file mode 100644 index 45ac554b08..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/func_8024068C_D8B3B0.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_D8BA3C -/* D8BA3C 8024068C 3C03800A */ lui $v1, 0x800a -/* D8BA40 80240690 8463A634 */ lh $v1, -0x59cc($v1) -/* D8BA44 80240694 3C07BF80 */ lui $a3, 0xbf80 -/* D8BA48 80240698 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D8BA4C 8024069C F7B40128 */ sdc1 $f20, 0x128($sp) -/* D8BA50 802406A0 4480A000 */ mtc1 $zero, $f20 -/* D8BA54 802406A4 AFB1011C */ sw $s1, 0x11c($sp) -/* D8BA58 802406A8 0080882D */ daddu $s1, $a0, $zero -/* D8BA5C 802406AC AFB00118 */ sw $s0, 0x118($sp) -/* D8BA60 802406B0 27B00098 */ addiu $s0, $sp, 0x98 -/* D8BA64 802406B4 AFBF0120 */ sw $ra, 0x120($sp) -/* D8BA68 802406B8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D8BA6C 802406BC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D8BA70 802406C0 00031080 */ sll $v0, $v1, 2 -/* D8BA74 802406C4 00431021 */ addu $v0, $v0, $v1 -/* D8BA78 802406C8 00021080 */ sll $v0, $v0, 2 -/* D8BA7C 802406CC 00431023 */ subu $v0, $v0, $v1 -/* D8BA80 802406D0 000218C0 */ sll $v1, $v0, 3 -/* D8BA84 802406D4 00431021 */ addu $v0, $v0, $v1 -/* D8BA88 802406D8 000210C0 */ sll $v0, $v0, 3 -/* D8BA8C 802406DC 3C01800B */ lui $at, 0x800b -/* D8BA90 802406E0 00220821 */ addu $at, $at, $v0 -/* D8BA94 802406E4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D8BA98 802406E8 4406A000 */ mfc1 $a2, $f20 -/* D8BA9C 802406EC 4600B587 */ neg.s $f22, $f22 -/* D8BAA0 802406F0 4405B000 */ mfc1 $a1, $f22 -/* D8BAA4 802406F4 0200202D */ daddu $a0, $s0, $zero -/* D8BAA8 802406F8 0C019EC8 */ jal guRotateF -/* D8BAAC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) -/* D8BAB0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D8BAB4 80240704 0C00A6C9 */ jal clamp_angle -/* D8BAB8 80240708 00000000 */ nop -/* D8BABC 8024070C 44050000 */ mfc1 $a1, $f0 -/* D8BAC0 80240710 4406A000 */ mfc1 $a2, $f20 -/* D8BAC4 80240714 4407A000 */ mfc1 $a3, $f20 -/* D8BAC8 80240718 3C013F80 */ lui $at, 0x3f80 -/* D8BACC 8024071C 4481C000 */ mtc1 $at, $f24 -/* D8BAD0 80240720 27A40018 */ addiu $a0, $sp, 0x18 -/* D8BAD4 80240724 0C019EC8 */ jal guRotateF -/* D8BAD8 80240728 E7B80010 */ swc1 $f24, 0x10($sp) -/* D8BADC 8024072C 0200202D */ daddu $a0, $s0, $zero -/* D8BAE0 80240730 27A50018 */ addiu $a1, $sp, 0x18 -/* D8BAE4 80240734 0C019D80 */ jal guMtxCatF -/* D8BAE8 80240738 00A0302D */ daddu $a2, $a1, $zero -/* D8BAEC 8024073C 4405B000 */ mfc1 $a1, $f22 -/* D8BAF0 80240740 4406A000 */ mfc1 $a2, $f20 -/* D8BAF4 80240744 4407C000 */ mfc1 $a3, $f24 -/* D8BAF8 80240748 0200202D */ daddu $a0, $s0, $zero -/* D8BAFC 8024074C 0C019EC8 */ jal guRotateF -/* D8BB00 80240750 E7B40010 */ swc1 $f20, 0x10($sp) -/* D8BB04 80240754 27A40018 */ addiu $a0, $sp, 0x18 -/* D8BB08 80240758 0200282D */ daddu $a1, $s0, $zero -/* D8BB0C 8024075C 0C019D80 */ jal guMtxCatF -/* D8BB10 80240760 0080302D */ daddu $a2, $a0, $zero -/* D8BB14 80240764 E7B40010 */ swc1 $f20, 0x10($sp) -/* D8BB18 80240768 8E2500A8 */ lw $a1, 0xa8($s1) -/* D8BB1C 8024076C 4406A000 */ mfc1 $a2, $f20 -/* D8BB20 80240770 4407C000 */ mfc1 $a3, $f24 -/* D8BB24 80240774 0C019EC8 */ jal guRotateF -/* D8BB28 80240778 0200202D */ daddu $a0, $s0, $zero -/* D8BB2C 8024077C 27A40018 */ addiu $a0, $sp, 0x18 -/* D8BB30 80240780 0200282D */ daddu $a1, $s0, $zero -/* D8BB34 80240784 0C019D80 */ jal guMtxCatF -/* D8BB38 80240788 0080302D */ daddu $a2, $a0, $zero -/* D8BB3C 8024078C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D8BB40 80240790 3C013F36 */ lui $at, 0x3f36 -/* D8BB44 80240794 3421DB6E */ ori $at, $at, 0xdb6e -/* D8BB48 80240798 44810000 */ mtc1 $at, $f0 -/* D8BB4C 8024079C 0200202D */ daddu $a0, $s0, $zero -/* D8BB50 802407A0 44050000 */ mfc1 $a1, $f0 -/* D8BB54 802407A4 3C06BF36 */ lui $a2, 0xbf36 -/* D8BB58 802407A8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D8BB5C 802407AC 0C019DF0 */ jal guScaleF -/* D8BB60 802407B0 00A0382D */ daddu $a3, $a1, $zero -/* D8BB64 802407B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D8BB68 802407B8 0200282D */ daddu $a1, $s0, $zero -/* D8BB6C 802407BC 0C019D80 */ jal guMtxCatF -/* D8BB70 802407C0 0080302D */ daddu $a2, $a0, $zero -/* D8BB74 802407C4 27B00058 */ addiu $s0, $sp, 0x58 -/* D8BB78 802407C8 8E250028 */ lw $a1, 0x28($s1) -/* D8BB7C 802407CC C620002C */ lwc1 $f0, 0x2c($s1) -/* D8BB80 802407D0 8E270030 */ lw $a3, 0x30($s1) -/* D8BB84 802407D4 46000007 */ neg.s $f0, $f0 -/* D8BB88 802407D8 44060000 */ mfc1 $a2, $f0 -/* D8BB8C 802407DC 0C019E40 */ jal guTranslateF -/* D8BB90 802407E0 0200202D */ daddu $a0, $s0, $zero -/* D8BB94 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D8BB98 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D8BB9C 802407EC 0C019D80 */ jal guMtxCatF -/* D8BBA0 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D8BBA4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D8BBA8 802407F8 3C0142B4 */ lui $at, 0x42b4 -/* D8BBAC 802407FC 44810000 */ mtc1 $at, $f0 -/* D8BBB0 80240800 00000000 */ nop -/* D8BBB4 80240804 4602003E */ c.le.s $f0, $f2 -/* D8BBB8 80240808 00000000 */ nop -/* D8BBBC 8024080C 4500000A */ bc1f .L80240838 -/* D8BBC0 80240810 24040001 */ addiu $a0, $zero, 1 -/* D8BBC4 80240814 3C014387 */ lui $at, 0x4387 -/* D8BBC8 80240818 44810000 */ mtc1 $at, $f0 -/* D8BBCC 8024081C 00000000 */ nop -/* D8BBD0 80240820 4600103C */ c.lt.s $f2, $f0 -/* D8BBD4 80240824 00000000 */ nop -/* D8BBD8 80240828 45000004 */ bc1f .L8024083C -/* D8BBDC 8024082C 27A20018 */ addiu $v0, $sp, 0x18 -/* D8BBE0 80240830 3C041000 */ lui $a0, 0x1000 -/* D8BBE4 80240834 34840001 */ ori $a0, $a0, 1 -.L80240838: -/* D8BBE8 80240838 27A20018 */ addiu $v0, $sp, 0x18 -.L8024083C: -/* D8BBEC 8024083C 0000282D */ daddu $a1, $zero, $zero -/* D8BBF0 80240840 00A0302D */ daddu $a2, $a1, $zero -/* D8BBF4 80240844 00A0382D */ daddu $a3, $a1, $zero -/* D8BBF8 80240848 0C0B7710 */ jal render_sprite -/* D8BBFC 8024084C AFA20010 */ sw $v0, 0x10($sp) -/* D8BC00 80240850 8FBF0120 */ lw $ra, 0x120($sp) -/* D8BC04 80240854 8FB1011C */ lw $s1, 0x11c($sp) -/* D8BC08 80240858 8FB00118 */ lw $s0, 0x118($sp) -/* D8BC0C 8024085C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D8BC10 80240860 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D8BC14 80240864 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D8BC18 80240868 03E00008 */ jr $ra -/* D8BC1C 8024086C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_34/func_80240870_D8B3B0.s b/asm/nonmatchings/world/area_pra/pra_34/func_80240870_D8B3B0.s deleted file mode 100644 index 34d5f553c6..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/func_80240870_D8B3B0.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_D8BC20 -/* D8BC20 80240870 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D8BC24 80240874 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D8BC28 80240878 4480B000 */ mtc1 $zero, $f22 -/* D8BC2C 8024087C AFB10134 */ sw $s1, 0x134($sp) -/* D8BC30 80240880 0080882D */ daddu $s1, $a0, $zero -/* D8BC34 80240884 AFB3013C */ sw $s3, 0x13c($sp) -/* D8BC38 80240888 0000982D */ daddu $s3, $zero, $zero -/* D8BC3C 8024088C AFB60148 */ sw $s6, 0x148($sp) -/* D8BC40 80240890 3C16800B */ lui $s6, %hi(gCameras) -/* D8BC44 80240894 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D8BC48 80240898 AFB50144 */ sw $s5, 0x144($sp) -/* D8BC4C 8024089C 241500FF */ addiu $s5, $zero, 0xff -/* D8BC50 802408A0 AFB00130 */ sw $s0, 0x130($sp) -/* D8BC54 802408A4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D8BC58 802408A8 AFB20138 */ sw $s2, 0x138($sp) -/* D8BC5C 802408AC 27B20060 */ addiu $s2, $sp, 0x60 -/* D8BC60 802408B0 AFB40140 */ sw $s4, 0x140($sp) -/* D8BC64 802408B4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D8BC68 802408B8 AFBF014C */ sw $ra, 0x14c($sp) -/* D8BC6C 802408BC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D8BC70 802408C0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D8BC74 802408C4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D8BC78 802408C8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D8BC7C 802408CC F7B40150 */ sdc1 $f20, 0x150($sp) -.L802408D0: -/* D8BC80 802408D0 3C03800A */ lui $v1, 0x800a -/* D8BC84 802408D4 8463A634 */ lh $v1, -0x59cc($v1) -/* D8BC88 802408D8 00031080 */ sll $v0, $v1, 2 -/* D8BC8C 802408DC 00431021 */ addu $v0, $v0, $v1 -/* D8BC90 802408E0 00021080 */ sll $v0, $v0, 2 -/* D8BC94 802408E4 00431023 */ subu $v0, $v0, $v1 -/* D8BC98 802408E8 000218C0 */ sll $v1, $v0, 3 -/* D8BC9C 802408EC 00431021 */ addu $v0, $v0, $v1 -/* D8BCA0 802408F0 000210C0 */ sll $v0, $v0, 3 -/* D8BCA4 802408F4 00561021 */ addu $v0, $v0, $s6 -/* D8BCA8 802408F8 C440006C */ lwc1 $f0, 0x6c($v0) -/* D8BCAC 802408FC 16600065 */ bnez $s3, .L80240A94 -/* D8BCB0 80240900 46000507 */ neg.s $f20, $f0 -/* D8BCB4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D8BCB8 80240908 3C0142B4 */ lui $at, 0x42b4 -/* D8BCBC 8024090C 44810000 */ mtc1 $at, $f0 -/* D8BCC0 80240910 00000000 */ nop -/* D8BCC4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D8BCC8 80240918 00000000 */ nop -/* D8BCCC 8024091C 4500000A */ bc1f .L80240948 -/* D8BCD0 80240920 00000000 */ nop -/* D8BCD4 80240924 3C014334 */ lui $at, 0x4334 -/* D8BCD8 80240928 44812000 */ mtc1 $at, $f4 -/* D8BCDC 8024092C 00000000 */ nop -/* D8BCE0 80240930 4604103E */ c.le.s $f2, $f4 -/* D8BCE4 80240934 00000000 */ nop -/* D8BCE8 80240938 45000003 */ bc1f .L80240948 -/* D8BCEC 8024093C 00000000 */ nop -/* D8BCF0 80240940 08090276 */ j .L802409D8 -/* D8BCF4 80240944 46022501 */ sub.s $f20, $f4, $f2 -.L80240948: -/* D8BCF8 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D8BCFC 8024094C 3C014334 */ lui $at, 0x4334 -/* D8BD00 80240950 44812000 */ mtc1 $at, $f4 -/* D8BD04 80240954 00000000 */ nop -/* D8BD08 80240958 4600203C */ c.lt.s $f4, $f0 -/* D8BD0C 8024095C 00000000 */ nop -/* D8BD10 80240960 4500000C */ bc1f .L80240994 -/* D8BD14 80240964 00000000 */ nop -/* D8BD18 80240968 3C014387 */ lui $at, 0x4387 -/* D8BD1C 8024096C 44812000 */ mtc1 $at, $f4 -/* D8BD20 80240970 00000000 */ nop -/* D8BD24 80240974 4604003E */ c.le.s $f0, $f4 -/* D8BD28 80240978 00000000 */ nop -/* D8BD2C 8024097C 45000008 */ bc1f .L802409A0 -/* D8BD30 80240980 00000000 */ nop -/* D8BD34 80240984 3C014334 */ lui $at, 0x4334 -/* D8BD38 80240988 44812000 */ mtc1 $at, $f4 -/* D8BD3C 8024098C 08090276 */ j .L802409D8 -/* D8BD40 80240990 46040501 */ sub.s $f20, $f0, $f4 -.L80240994: -/* D8BD44 80240994 3C014387 */ lui $at, 0x4387 -/* D8BD48 80240998 44812000 */ mtc1 $at, $f4 -/* D8BD4C 8024099C 00000000 */ nop -.L802409A0: -/* D8BD50 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D8BD54 802409A4 00000000 */ nop -/* D8BD58 802409A8 4500000A */ bc1f .L802409D4 -/* D8BD5C 802409AC 00000000 */ nop -/* D8BD60 802409B0 3C0143B4 */ lui $at, 0x43b4 -/* D8BD64 802409B4 44811000 */ mtc1 $at, $f2 -/* D8BD68 802409B8 00000000 */ nop -/* D8BD6C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D8BD70 802409C0 00000000 */ nop -/* D8BD74 802409C4 45000003 */ bc1f .L802409D4 -/* D8BD78 802409C8 00000000 */ nop -/* D8BD7C 802409CC 08090276 */ j .L802409D8 -/* D8BD80 802409D0 46001501 */ sub.s $f20, $f2, $f0 -.L802409D4: -/* D8BD84 802409D4 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L802409D8: -/* D8BD88 802409D8 3C0141C8 */ lui $at, 0x41c8 -/* D8BD8C 802409DC 44810000 */ mtc1 $at, $f0 -/* D8BD90 802409E0 00000000 */ nop -/* D8BD94 802409E4 4600A003 */ div.s $f0, $f20, $f0 -/* D8BD98 802409E8 4600010D */ trunc.w.s $f4, $f0 -/* D8BD9C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D8BDA0 802409F0 00000000 */ nop -/* D8BDA4 802409F4 00071100 */ sll $v0, $a3, 4 -/* D8BDA8 802409F8 00471023 */ subu $v0, $v0, $a3 -/* D8BDAC 802409FC 00021080 */ sll $v0, $v0, 2 -/* D8BDB0 80240A00 02A23823 */ subu $a3, $s5, $v0 -/* D8BDB4 80240A04 28E20064 */ slti $v0, $a3, 0x64 -/* D8BDB8 80240A08 54400001 */ bnel $v0, $zero, .L80240A10 -/* D8BDBC 80240A0C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A10: -/* D8BDC0 80240A10 24040001 */ addiu $a0, $zero, 1 -/* D8BDC4 80240A14 2405FFFF */ addiu $a1, $zero, -1 -/* D8BDC8 80240A18 24060006 */ addiu $a2, $zero, 6 -/* D8BDCC 80240A1C AFA70010 */ sw $a3, 0x10($sp) -/* D8BDD0 80240A20 AFA70014 */ sw $a3, 0x14($sp) -/* D8BDD4 80240A24 AFB50018 */ sw $s5, 0x18($sp) -/* D8BDD8 80240A28 0C0B77B9 */ jal func_802DDEE4 -/* D8BDDC 80240A2C AFA0001C */ sw $zero, 0x1c($sp) -/* D8BDE0 80240A30 4405A000 */ mfc1 $a1, $f20 -/* D8BDE4 80240A34 4406B000 */ mfc1 $a2, $f22 -/* D8BDE8 80240A38 3C07BF80 */ lui $a3, 0xbf80 -/* D8BDEC 80240A3C 0200202D */ daddu $a0, $s0, $zero -/* D8BDF0 80240A40 0C019EC8 */ jal guRotateF -/* D8BDF4 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D8BDF8 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D8BDFC 80240A4C 0C00A6C9 */ jal clamp_angle -/* D8BE00 80240A50 00000000 */ nop -/* D8BE04 80240A54 44050000 */ mfc1 $a1, $f0 -/* D8BE08 80240A58 4406B000 */ mfc1 $a2, $f22 -/* D8BE0C 80240A5C 4407B000 */ mfc1 $a3, $f22 -/* D8BE10 80240A60 3C013F80 */ lui $at, 0x3f80 -/* D8BE14 80240A64 44812000 */ mtc1 $at, $f4 -/* D8BE18 80240A68 27A40020 */ addiu $a0, $sp, 0x20 -/* D8BE1C 80240A6C 0C019EC8 */ jal guRotateF -/* D8BE20 80240A70 E7A40010 */ swc1 $f4, 0x10($sp) -/* D8BE24 80240A74 0200202D */ daddu $a0, $s0, $zero -/* D8BE28 80240A78 27A50020 */ addiu $a1, $sp, 0x20 -/* D8BE2C 80240A7C 0C019D80 */ jal guMtxCatF -/* D8BE30 80240A80 00A0302D */ daddu $a2, $a1, $zero -/* D8BE34 80240A84 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D8BE38 80240A88 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D8BE3C 80240A8C 080902D6 */ j .L80240B58 -/* D8BE40 80240A90 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240A94: -/* D8BE44 80240A94 0260202D */ daddu $a0, $s3, $zero -/* D8BE48 80240A98 27A50120 */ addiu $a1, $sp, 0x120 -/* D8BE4C 80240A9C 27A60124 */ addiu $a2, $sp, 0x124 -/* D8BE50 80240AA0 0C03964E */ jal func_800E5938 -/* D8BE54 80240AA4 27A70128 */ addiu $a3, $sp, 0x128 -/* D8BE58 80240AA8 8FA60124 */ lw $a2, 0x124($sp) -/* D8BE5C 80240AAC 3C028000 */ lui $v0, 0x8000 -/* D8BE60 80240AB0 14C20004 */ bne $a2, $v0, .L80240AC4 -/* D8BE64 80240AB4 46000606 */ mov.s $f24, $f0 -/* D8BE68 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D8BE6C 80240ABC 080902B5 */ j .L80240AD4 -/* D8BE70 80240AC0 24040001 */ addiu $a0, $zero, 1 -.L80240AC4: -/* D8BE74 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D8BE78 80240AC8 00000000 */ nop -/* D8BE7C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D8BE80 80240AD0 24040001 */ addiu $a0, $zero, 1 -.L80240AD4: -/* D8BE84 80240AD4 2405FFFF */ addiu $a1, $zero, -1 -/* D8BE88 80240AD8 24060007 */ addiu $a2, $zero, 7 -/* D8BE8C 80240ADC 0000382D */ daddu $a3, $zero, $zero -/* D8BE90 80240AE0 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D8BE94 80240AE4 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D8BE98 80240AE8 24020040 */ addiu $v0, $zero, 0x40 -/* D8BE9C 80240AEC AFA00010 */ sw $zero, 0x10($sp) -/* D8BEA0 80240AF0 AFA00014 */ sw $zero, 0x14($sp) -/* D8BEA4 80240AF4 AFA20018 */ sw $v0, 0x18($sp) -/* D8BEA8 80240AF8 0C0B77B9 */ jal func_802DDEE4 -/* D8BEAC 80240AFC AFA0001C */ sw $zero, 0x1c($sp) -/* D8BEB0 80240B00 4405A000 */ mfc1 $a1, $f20 -/* D8BEB4 80240B04 4406B000 */ mfc1 $a2, $f22 -/* D8BEB8 80240B08 3C07BF80 */ lui $a3, 0xbf80 -/* D8BEBC 80240B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* D8BEC0 80240B10 0C019EC8 */ jal guRotateF -/* D8BEC4 80240B14 E7B60010 */ swc1 $f22, 0x10($sp) -/* D8BEC8 80240B18 4405A000 */ mfc1 $a1, $f20 -/* D8BECC 80240B1C 4406B000 */ mfc1 $a2, $f22 -/* D8BED0 80240B20 3C07BF80 */ lui $a3, 0xbf80 -/* D8BED4 80240B24 0200202D */ daddu $a0, $s0, $zero -/* D8BED8 80240B28 0C019EC8 */ jal guRotateF -/* D8BEDC 80240B2C E7B60010 */ swc1 $f22, 0x10($sp) -/* D8BEE0 80240B30 4405C000 */ mfc1 $a1, $f24 -/* D8BEE4 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D8BEE8 80240B38 3C073F80 */ lui $a3, 0x3f80 -/* D8BEEC 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D8BEF0 80240B40 0C019EC8 */ jal guRotateF -/* D8BEF4 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D8BEF8 80240B48 0200202D */ daddu $a0, $s0, $zero -/* D8BEFC 80240B4C 27A50020 */ addiu $a1, $sp, 0x20 -/* D8BF00 80240B50 0C019D80 */ jal guMtxCatF -/* D8BF04 80240B54 00A0302D */ daddu $a2, $a1, $zero -.L80240B58: -/* D8BF08 80240B58 862200B0 */ lh $v0, 0xb0($s1) -/* D8BF0C 80240B5C 3C013F00 */ lui $at, 0x3f00 -/* D8BF10 80240B60 44812000 */ mtc1 $at, $f4 -/* D8BF14 80240B64 00021023 */ negu $v0, $v0 -/* D8BF18 80240B68 44820000 */ mtc1 $v0, $f0 -/* D8BF1C 80240B6C 00000000 */ nop -/* D8BF20 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* D8BF24 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D8BF28 80240B78 00000000 */ nop -/* D8BF2C 80240B7C 4405B000 */ mfc1 $a1, $f22 -/* D8BF30 80240B80 4407B000 */ mfc1 $a3, $f22 -/* D8BF34 80240B84 44062000 */ mfc1 $a2, $f4 -/* D8BF38 80240B88 0C019E40 */ jal guTranslateF -/* D8BF3C 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* D8BF40 80240B90 0240202D */ daddu $a0, $s2, $zero -/* D8BF44 80240B94 27A50020 */ addiu $a1, $sp, 0x20 -/* D8BF48 80240B98 0C019D80 */ jal guMtxCatF -/* D8BF4C 80240B9C 00A0302D */ daddu $a2, $a1, $zero -/* D8BF50 80240BA0 4405A000 */ mfc1 $a1, $f20 -/* D8BF54 80240BA4 4406B000 */ mfc1 $a2, $f22 -/* D8BF58 80240BA8 3C073F80 */ lui $a3, 0x3f80 -/* D8BF5C 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* D8BF60 80240BB0 0C019EC8 */ jal guRotateF -/* D8BF64 80240BB4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D8BF68 80240BB8 27A40020 */ addiu $a0, $sp, 0x20 -/* D8BF6C 80240BBC 0200282D */ daddu $a1, $s0, $zero -/* D8BF70 80240BC0 0C019D80 */ jal guMtxCatF -/* D8BF74 80240BC4 0080302D */ daddu $a2, $a0, $zero -/* D8BF78 80240BC8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D8BF7C 80240BCC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D8BF80 80240BD0 4406B000 */ mfc1 $a2, $f22 -/* D8BF84 80240BD4 3C073F80 */ lui $a3, 0x3f80 -/* D8BF88 80240BD8 0C019EC8 */ jal guRotateF -/* D8BF8C 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D8BF90 80240BE0 27A40020 */ addiu $a0, $sp, 0x20 -/* D8BF94 80240BE4 0200282D */ daddu $a1, $s0, $zero -/* D8BF98 80240BE8 0C019D80 */ jal guMtxCatF -/* D8BF9C 80240BEC 0080302D */ daddu $a2, $a0, $zero -/* D8BFA0 80240BF0 862200B0 */ lh $v0, 0xb0($s1) -/* D8BFA4 80240BF4 3C013F00 */ lui $at, 0x3f00 -/* D8BFA8 80240BF8 44812000 */ mtc1 $at, $f4 -/* D8BFAC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D8BFB0 80240C00 00000000 */ nop -/* D8BFB4 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* D8BFB8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D8BFBC 80240C0C 00000000 */ nop -/* D8BFC0 80240C10 4405B000 */ mfc1 $a1, $f22 -/* D8BFC4 80240C14 4407B000 */ mfc1 $a3, $f22 -/* D8BFC8 80240C18 44062000 */ mfc1 $a2, $f4 -/* D8BFCC 80240C1C 0C019E40 */ jal guTranslateF -/* D8BFD0 80240C20 0240202D */ daddu $a0, $s2, $zero -/* D8BFD4 80240C24 27A40020 */ addiu $a0, $sp, 0x20 -/* D8BFD8 80240C28 0240282D */ daddu $a1, $s2, $zero -/* D8BFDC 80240C2C 0C019D80 */ jal guMtxCatF -/* D8BFE0 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D8BFE4 80240C34 3C013F36 */ lui $at, 0x3f36 -/* D8BFE8 80240C38 3421DB6E */ ori $at, $at, 0xdb6e -/* D8BFEC 80240C3C 44810000 */ mtc1 $at, $f0 -/* D8BFF0 80240C40 0280202D */ daddu $a0, $s4, $zero -/* D8BFF4 80240C44 44050000 */ mfc1 $a1, $f0 -/* D8BFF8 80240C48 3C06BF36 */ lui $a2, 0xbf36 -/* D8BFFC 80240C4C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D8C000 80240C50 0C019DF0 */ jal guScaleF -/* D8C004 80240C54 00A0382D */ daddu $a3, $a1, $zero -/* D8C008 80240C58 27A40020 */ addiu $a0, $sp, 0x20 -/* D8C00C 80240C5C 0280282D */ daddu $a1, $s4, $zero -/* D8C010 80240C60 0C019D80 */ jal guMtxCatF -/* D8C014 80240C64 0080302D */ daddu $a2, $a0, $zero -/* D8C018 80240C68 4600D687 */ neg.s $f26, $f26 -/* D8C01C 80240C6C 4405F000 */ mfc1 $a1, $f30 -/* D8C020 80240C70 4407E000 */ mfc1 $a3, $f28 -/* D8C024 80240C74 4406D000 */ mfc1 $a2, $f26 -/* D8C028 80240C78 0C019E40 */ jal guTranslateF -/* D8C02C 80240C7C 0240202D */ daddu $a0, $s2, $zero -/* D8C030 80240C80 27A40020 */ addiu $a0, $sp, 0x20 -/* D8C034 80240C84 0240282D */ daddu $a1, $s2, $zero -/* D8C038 80240C88 0C019D80 */ jal guMtxCatF -/* D8C03C 80240C8C 0080302D */ daddu $a2, $a0, $zero -/* D8C040 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D8C044 80240C94 3C0142B4 */ lui $at, 0x42b4 -/* D8C048 80240C98 44810000 */ mtc1 $at, $f0 -/* D8C04C 80240C9C 00000000 */ nop -/* D8C050 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D8C054 80240CA4 00000000 */ nop -/* D8C058 80240CA8 4500000A */ bc1f .L80240CD4 -/* D8C05C 80240CAC 24040001 */ addiu $a0, $zero, 1 -/* D8C060 80240CB0 3C014387 */ lui $at, 0x4387 -/* D8C064 80240CB4 44812000 */ mtc1 $at, $f4 -/* D8C068 80240CB8 00000000 */ nop -/* D8C06C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D8C070 80240CC0 00000000 */ nop -/* D8C074 80240CC4 45000004 */ bc1f .L80240CD8 -/* D8C078 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 -/* D8C07C 80240CCC 3C041000 */ lui $a0, 0x1000 -/* D8C080 80240CD0 34840001 */ ori $a0, $a0, 1 -.L80240CD4: -/* D8C084 80240CD4 27A20020 */ addiu $v0, $sp, 0x20 -.L80240CD8: -/* D8C088 80240CD8 AFA20010 */ sw $v0, 0x10($sp) -/* D8C08C 80240CDC 0000282D */ daddu $a1, $zero, $zero -/* D8C090 80240CE0 00A0302D */ daddu $a2, $a1, $zero -/* D8C094 80240CE4 0C0B7710 */ jal render_sprite -/* D8C098 80240CE8 00A0382D */ daddu $a3, $a1, $zero -/* D8C09C 80240CEC 26730001 */ addiu $s3, $s3, 1 -/* D8C0A0 80240CF0 2A620002 */ slti $v0, $s3, 2 -/* D8C0A4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D8C0A8 80240CF8 00000000 */ nop -/* D8C0AC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) -/* D8C0B0 80240D00 8FB60148 */ lw $s6, 0x148($sp) -/* D8C0B4 80240D04 8FB50144 */ lw $s5, 0x144($sp) -/* D8C0B8 80240D08 8FB40140 */ lw $s4, 0x140($sp) -/* D8C0BC 80240D0C 8FB3013C */ lw $s3, 0x13c($sp) -/* D8C0C0 80240D10 8FB20138 */ lw $s2, 0x138($sp) -/* D8C0C4 80240D14 8FB10134 */ lw $s1, 0x134($sp) -/* D8C0C8 80240D18 8FB00130 */ lw $s0, 0x130($sp) -/* D8C0CC 80240D1C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D8C0D0 80240D20 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D8C0D4 80240D24 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D8C0D8 80240D28 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D8C0DC 80240D2C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D8C0E0 80240D30 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D8C0E4 80240D34 03E00008 */ jr $ra -/* D8C0E8 80240D38 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_34/func_80240D3C_D8B3B0.s b/asm/nonmatchings/world/area_pra/pra_34/func_80240D3C_D8B3B0.s deleted file mode 100644 index eb6139a2be..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/func_80240D3C_D8B3B0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_D8C0EC -/* D8C0EC 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8C0F0 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D8C0F4 80240D44 0080802D */ daddu $s0, $a0, $zero -/* D8C0F8 80240D48 AFBF0014 */ sw $ra, 0x14($sp) -/* D8C0FC 80240D4C 8E020088 */ lw $v0, 0x88($s0) -/* D8C100 80240D50 14400017 */ bnez $v0, .L80240DB0 -/* D8C104 80240D54 24020001 */ addiu $v0, $zero, 1 -/* D8C108 80240D58 8E030084 */ lw $v1, 0x84($s0) -/* D8C10C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D8C110 80240D60 00000000 */ nop -/* D8C114 80240D64 28620002 */ slti $v0, $v1, 2 -/* D8C118 80240D68 50400005 */ beql $v0, $zero, .L80240D80 -/* D8C11C 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* D8C120 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D8C124 80240D74 00000000 */ nop -/* D8C128 80240D78 08090378 */ j .L80240DE0 -/* D8C12C 80240D7C 00000000 */ nop -.L80240D80: -/* D8C130 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D8C134 80240D84 00000000 */ nop -/* D8C138 80240D88 08090378 */ j .L80240DE0 -/* D8C13C 80240D8C 00000000 */ nop -.L80240D90: -/* D8C140 80240D90 3C048024 */ lui $a0, 0x8024 -/* D8C144 80240D94 24840E84 */ addiu $a0, $a0, 0xe84 -/* D8C148 80240D98 08090374 */ j .L80240DD0 -/* D8C14C 80240D9C 00000000 */ nop -.L80240DA0: -/* D8C150 80240DA0 3C048024 */ lui $a0, 0x8024 -/* D8C154 80240DA4 24840EEC */ addiu $a0, $a0, 0xeec -/* D8C158 80240DA8 08090374 */ j .L80240DD0 -/* D8C15C 80240DAC 00000000 */ nop -.L80240DB0: -/* D8C160 80240DB0 8E020084 */ lw $v0, 0x84($s0) -/* D8C164 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D8C168 80240DB8 00000000 */ nop -/* D8C16C 80240DBC 28420002 */ slti $v0, $v0, 2 -/* D8C170 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D8C174 80240DC4 00000000 */ nop -.L80240DC8: -/* D8C178 80240DC8 3C048024 */ lui $a0, 0x8024 -/* D8C17C 80240DCC 24840EB8 */ addiu $a0, $a0, 0xeb8 -.L80240DD0: -/* D8C180 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 -/* D8C184 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* D8C188 80240DD8 8E03013C */ lw $v1, 0x13c($s0) -/* D8C18C 80240DDC AC620004 */ sw $v0, 4($v1) -.L80240DE0: -/* D8C190 80240DE0 0C00EAD2 */ jal get_npc_safe -/* D8C194 80240DE4 2404FFFC */ addiu $a0, $zero, -4 -/* D8C198 80240DE8 0040282D */ daddu $a1, $v0, $zero -/* D8C19C 80240DEC 10A00021 */ beqz $a1, .L80240E74 -/* D8C1A0 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* D8C1A4 80240DF4 8E020088 */ lw $v0, 0x88($s0) -/* D8C1A8 80240DF8 14400014 */ bnez $v0, .L80240E4C -/* D8C1AC 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* D8C1B0 80240E00 8E040084 */ lw $a0, 0x84($s0) -/* D8C1B4 80240E04 10820016 */ beq $a0, $v0, .L80240E60 -/* D8C1B8 80240E08 28820002 */ slti $v0, $a0, 2 -/* D8C1BC 80240E0C 10400005 */ beqz $v0, .L80240E24 -/* D8C1C0 80240E10 24020002 */ addiu $v0, $zero, 2 -/* D8C1C4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D8C1C8 80240E18 00000000 */ nop -/* D8C1CC 80240E1C 0809039D */ j .L80240E74 -/* D8C1D0 80240E20 00000000 */ nop -.L80240E24: -/* D8C1D4 80240E24 10820006 */ beq $a0, $v0, .L80240E40 -/* D8C1D8 80240E28 24020002 */ addiu $v0, $zero, 2 -/* D8C1DC 80240E2C 0809039D */ j .L80240E74 -/* D8C1E0 80240E30 00000000 */ nop -.L80240E34: -/* D8C1E4 80240E34 8CA20000 */ lw $v0, ($a1) -/* D8C1E8 80240E38 0809039A */ j .L80240E68 -/* D8C1EC 80240E3C 3C03000A */ lui $v1, 0xa -.L80240E40: -/* D8C1F0 80240E40 8CA20000 */ lw $v0, ($a1) -/* D8C1F4 80240E44 0809039A */ j .L80240E68 -/* D8C1F8 80240E48 3C030002 */ lui $v1, 2 -.L80240E4C: -/* D8C1FC 80240E4C 8E020084 */ lw $v0, 0x84($s0) -/* D8C200 80240E50 04400007 */ bltz $v0, .L80240E70 -/* D8C204 80240E54 28420002 */ slti $v0, $v0, 2 -/* D8C208 80240E58 10400006 */ beqz $v0, .L80240E74 -/* D8C20C 80240E5C 24020002 */ addiu $v0, $zero, 2 -.L80240E60: -/* D8C210 80240E60 8CA20000 */ lw $v0, ($a1) -/* D8C214 80240E64 3C030008 */ lui $v1, 8 -.L80240E68: -/* D8C218 80240E68 00431025 */ or $v0, $v0, $v1 -/* D8C21C 80240E6C ACA20000 */ sw $v0, ($a1) -.L80240E70: -/* D8C220 80240E70 24020002 */ addiu $v0, $zero, 2 -.L80240E74: -/* D8C224 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* D8C228 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* D8C22C 80240E7C 03E00008 */ jr $ra -/* D8C230 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_34/func_80240E84_D8B3B0.s b/asm/nonmatchings/world/area_pra/pra_34/func_80240E84_D8B3B0.s deleted file mode 100644 index ab40d19093..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/func_80240E84_D8B3B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D8C234 -/* D8C234 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8C238 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D8C23C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D8C240 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D8C244 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D8C248 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D8C24C 80240E9C 3C03000A */ lui $v1, 0xa -/* D8C250 80240EA0 8C820000 */ lw $v0, ($a0) -/* D8C254 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D8C258 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D8C25C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D8C260 80240EB0 03E00008 */ jr $ra -/* D8C264 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_34/func_80240EB8_D8B3B0.s b/asm/nonmatchings/world/area_pra/pra_34/func_80240EB8_D8B3B0.s deleted file mode 100644 index b24a0e3087..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/func_80240EB8_D8B3B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D8C268 -/* D8C268 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8C26C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D8C270 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D8C274 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D8C278 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D8C27C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D8C280 80240ED0 3C030008 */ lui $v1, 8 -/* D8C284 80240ED4 8C820000 */ lw $v0, ($a0) -/* D8C288 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D8C28C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D8C290 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D8C294 80240EE4 03E00008 */ jr $ra -/* D8C298 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_34/func_80240EEC_D8B3B0.s b/asm/nonmatchings/world/area_pra/pra_34/func_80240EEC_D8B3B0.s deleted file mode 100644 index 854df4daac..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/func_80240EEC_D8B3B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D8C29C -/* D8C29C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8C2A0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D8C2A4 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D8C2A8 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D8C2AC 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D8C2B0 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D8C2B4 80240F04 3C030002 */ lui $v1, 2 -/* D8C2B8 80240F08 8C820000 */ lw $v0, ($a0) -/* D8C2BC 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D8C2C0 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D8C2C4 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D8C2C8 80240F18 03E00008 */ jr $ra -/* D8C2CC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_34/func_80240F20_D8B3B0.s b/asm/nonmatchings/world/area_pra/pra_34/func_80240F20_D8B3B0.s deleted file mode 100644 index 4b065abaef..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/func_80240F20_D8B3B0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D8C2D0 -/* D8C2D0 80240F20 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8C2D4 80240F24 AFBF0010 */ sw $ra, 0x10($sp) -/* D8C2D8 80240F28 0C04417A */ jal get_entity_by_index -/* D8C2DC 80240F2C 8C840084 */ lw $a0, 0x84($a0) -/* D8C2E0 80240F30 0040182D */ daddu $v1, $v0, $zero -/* D8C2E4 80240F34 8C640000 */ lw $a0, ($v1) -/* D8C2E8 80240F38 3C050010 */ lui $a1, 0x10 -/* D8C2EC 80240F3C 00852025 */ or $a0, $a0, $a1 -/* D8C2F0 80240F40 AC640000 */ sw $a0, ($v1) -/* D8C2F4 80240F44 8FBF0010 */ lw $ra, 0x10($sp) -/* D8C2F8 80240F48 24020002 */ addiu $v0, $zero, 2 -/* D8C2FC 80240F4C 03E00008 */ jr $ra -/* D8C300 80240F50 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_80240020_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_80240020_D8D250.s deleted file mode 100644 index d8438c0f51..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_80240020_D8D250.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D8D270 -/* D8D270 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D8D274 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D8D278 80240028 00822024 */ and $a0, $a0, $v0 -/* D8D27C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D8D280 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D8D284 80240034 00821821 */ addu $v1, $a0, $v0 -/* D8D288 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D8D28C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D8D290 80240040 30620001 */ andi $v0, $v1, 1 -/* D8D294 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D8D298 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D8D29C 8024004C 03E00008 */ jr $ra -/* D8D2A0 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_80240054_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_80240054_D8D250.s deleted file mode 100644 index 224370cf53..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_80240054_D8D250.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054_D8D2A4 -/* D8D2A4 80240054 00041403 */ sra $v0, $a0, 0x10 -/* D8D2A8 80240058 304300FF */ andi $v1, $v0, 0xff -/* D8D2AC 8024005C 24020006 */ addiu $v0, $zero, 6 -/* D8D2B0 80240060 10620015 */ beq $v1, $v0, .L802400B8 -/* D8D2B4 80240064 28620007 */ slti $v0, $v1, 7 -/* D8D2B8 80240068 10400005 */ beqz $v0, .L80240080 -/* D8D2BC 8024006C 24020001 */ addiu $v0, $zero, 1 -/* D8D2C0 80240070 1062000A */ beq $v1, $v0, .L8024009C -/* D8D2C4 80240074 3C020100 */ lui $v0, 0x100 -/* D8D2C8 80240078 03E00008 */ jr $ra -/* D8D2CC 8024007C 00821025 */ or $v0, $a0, $v0 -.L80240080: -/* D8D2D0 80240080 2862000A */ slti $v0, $v1, 0xa -/* D8D2D4 80240084 10400016 */ beqz $v0, .L802400E0 -/* D8D2D8 80240088 28620008 */ slti $v0, $v1, 8 -/* D8D2DC 8024008C 14400015 */ bnez $v0, .L802400E4 -/* D8D2E0 80240090 3C020100 */ lui $v0, 0x100 -/* D8D2E4 80240094 03E00008 */ jr $ra -/* D8D2E8 80240098 0080102D */ daddu $v0, $a0, $zero -.L8024009C: -/* D8D2EC 8024009C 3C020001 */ lui $v0, 1 -/* D8D2F0 802400A0 3442000C */ ori $v0, $v0, 0xc -/* D8D2F4 802400A4 0044102A */ slt $v0, $v0, $a0 -/* D8D2F8 802400A8 1040000E */ beqz $v0, .L802400E4 -/* D8D2FC 802400AC 3C020100 */ lui $v0, 0x100 -.L802400B0: -/* D8D300 802400B0 03E00008 */ jr $ra -/* D8D304 802400B4 0080102D */ daddu $v0, $a0, $zero -.L802400B8: -/* D8D308 802400B8 3C02FFF9 */ lui $v0, 0xfff9 -/* D8D30C 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D8D310 802400C0 00821821 */ addu $v1, $a0, $v0 -/* D8D314 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D8D318 802400C8 10400005 */ beqz $v0, .L802400E0 -/* D8D31C 802400CC 30620001 */ andi $v0, $v1, 1 -/* D8D320 802400D0 1440FFF7 */ bnez $v0, .L802400B0 -/* D8D324 802400D4 24820001 */ addiu $v0, $a0, 1 -/* D8D328 802400D8 03E00008 */ jr $ra -/* D8D32C 802400DC 00000000 */ nop -.L802400E0: -/* D8D330 802400E0 3C020100 */ lui $v0, 0x100 -.L802400E4: -/* D8D334 802400E4 03E00008 */ jr $ra -/* D8D338 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_802400EC_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_802400EC_D8D250.s deleted file mode 100644 index 01f0e994b6..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_802400EC_D8D250.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_D8D33C -/* D8D33C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8D340 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* D8D344 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D8D348 802400F8 3C058024 */ lui $a1, 0x8024 -/* D8D34C 802400FC 24A50128 */ addiu $a1, $a1, 0x128 -/* D8D350 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* D8D354 80240104 0C048C56 */ jal bind_dynamic_entity_3 -/* D8D358 80240108 0000202D */ daddu $a0, $zero, $zero -/* D8D35C 8024010C 8E03013C */ lw $v1, 0x13c($s0) -/* D8D360 80240110 AC620000 */ sw $v0, ($v1) -/* D8D364 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* D8D368 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* D8D36C 8024011C 24020002 */ addiu $v0, $zero, 2 -/* D8D370 80240120 03E00008 */ jr $ra -/* D8D374 80240124 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_80240128_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_80240128_D8D250.s deleted file mode 100644 index 96fc97f55f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_80240128_D8D250.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240128_D8D378 -/* D8D378 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D8D37C 8024012C AFB00040 */ sw $s0, 0x40($sp) -/* D8D380 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D8D384 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D8D388 80240138 AFB20048 */ sw $s2, 0x48($sp) -/* D8D38C 8024013C AFBF004C */ sw $ra, 0x4c($sp) -/* D8D390 80240140 AFB10044 */ sw $s1, 0x44($sp) -/* D8D394 80240144 8E020000 */ lw $v0, ($s0) -/* D8D398 80240148 821100BE */ lb $s1, 0xbe($s0) -/* D8D39C 8024014C 30420001 */ andi $v0, $v0, 1 -/* D8D3A0 80240150 10400061 */ beqz $v0, .L802402D8 -/* D8D3A4 80240154 27B20020 */ addiu $s2, $sp, 0x20 -/* D8D3A8 80240158 8E0400CC */ lw $a0, 0xcc($s0) -/* D8D3AC 8024015C 0C044181 */ jal get_shadow_by_index -/* D8D3B0 80240160 00000000 */ nop -/* D8D3B4 80240164 0C048B77 */ jal func_80122DDC -/* D8D3B8 80240168 84440008 */ lh $a0, 8($v0) -/* D8D3BC 8024016C 8C430000 */ lw $v1, ($v0) -/* D8D3C0 80240170 34630200 */ ori $v1, $v1, 0x200 -/* D8D3C4 80240174 AC430000 */ sw $v1, ($v0) -/* D8D3C8 80240178 8E050028 */ lw $a1, 0x28($s0) -/* D8D3CC 8024017C 8E06002C */ lw $a2, 0x2c($s0) -/* D8D3D0 80240180 27A20030 */ addiu $v0, $sp, 0x30 -/* D8D3D4 80240184 AFA20010 */ sw $v0, 0x10($sp) -/* D8D3D8 80240188 27A20034 */ addiu $v0, $sp, 0x34 -/* D8D3DC 8024018C AFA20014 */ sw $v0, 0x14($sp) -/* D8D3E0 80240190 C6000030 */ lwc1 $f0, 0x30($s0) -/* D8D3E4 80240194 3C04800A */ lui $a0, 0x800a -/* D8D3E8 80240198 8484A634 */ lh $a0, -0x59cc($a0) -/* D8D3EC 8024019C 46000007 */ neg.s $f0, $f0 -/* D8D3F0 802401A0 44070000 */ mfc1 $a3, $f0 -/* D8D3F4 802401A4 27A20038 */ addiu $v0, $sp, 0x38 -/* D8D3F8 802401A8 0C00B94E */ jal get_screen_coords -/* D8D3FC 802401AC AFA20018 */ sw $v0, 0x18($sp) -/* D8D400 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D8D404 802401B4 0C090008 */ jal func_80240020 -/* D8D408 802401B8 00000000 */ nop -/* D8D40C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) -/* D8D410 802401C0 3C014307 */ lui $at, 0x4307 -/* D8D414 802401C4 44810000 */ mtc1 $at, $f0 -/* D8D418 802401C8 00000000 */ nop -/* D8D41C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D8D420 802401D0 00000000 */ nop -/* D8D424 802401D4 4500000B */ bc1f .L80240204 -/* D8D428 802401D8 24040002 */ addiu $a0, $zero, 2 -/* D8D42C 802401DC 3C014361 */ lui $at, 0x4361 -/* D8D430 802401E0 44810000 */ mtc1 $at, $f0 -/* D8D434 802401E4 00000000 */ nop -/* D8D438 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D8D43C 802401EC 00000000 */ nop -/* D8D440 802401F0 45000004 */ bc1f .L80240204 -/* D8D444 802401F4 00000000 */ nop -/* D8D448 802401F8 0C090015 */ jal func_80240054 -/* D8D44C 802401FC 0040202D */ daddu $a0, $v0, $zero -/* D8D450 80240200 24040002 */ addiu $a0, $zero, 2 -.L80240204: -/* D8D454 80240204 3C063F80 */ lui $a2, 0x3f80 -/* D8D458 80240208 0C0B76A3 */ jal func_802DDA8C -/* D8D45C 8024020C 0040282D */ daddu $a1, $v0, $zero -/* D8D460 80240210 8E020000 */ lw $v0, ($s0) -/* D8D464 80240214 3C030002 */ lui $v1, 2 -/* D8D468 80240218 00431024 */ and $v0, $v0, $v1 -/* D8D46C 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 -/* D8D470 80240220 24110011 */ addiu $s1, $zero, 0x11 -/* D8D474 80240224 9203000E */ lbu $v1, 0xe($s0) -/* D8D478 80240228 3C02802E */ lui $v0, 0x802e -/* D8D47C 8024022C 90429D70 */ lbu $v0, -0x6290($v0) -/* D8D480 80240230 10620018 */ beq $v1, $v0, .L80240294 -/* D8D484 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D8D488 80240238 1040000B */ beqz $v0, .L80240268 -/* D8D48C 8024023C 24110011 */ addiu $s1, $zero, 0x11 -/* D8D490 80240240 24040002 */ addiu $a0, $zero, 2 -/* D8D494 80240244 2405FFFF */ addiu $a1, $zero, -1 -/* D8D498 80240248 24060007 */ addiu $a2, $zero, 7 -/* D8D49C 8024024C 0060102D */ daddu $v0, $v1, $zero -/* D8D4A0 80240250 0000382D */ daddu $a3, $zero, $zero -/* D8D4A4 80240254 AFA00010 */ sw $zero, 0x10($sp) -/* D8D4A8 80240258 AFA00014 */ sw $zero, 0x14($sp) -/* D8D4AC 8024025C AFA0001C */ sw $zero, 0x1c($sp) -/* D8D4B0 80240260 080900A3 */ j .L8024028C -/* D8D4B4 80240264 AFA20018 */ sw $v0, 0x18($sp) -.L80240268: -/* D8D4B8 80240268 2411000D */ addiu $s1, $zero, 0xd -/* D8D4BC 8024026C 24040002 */ addiu $a0, $zero, 2 -/* D8D4C0 80240270 2405FFFF */ addiu $a1, $zero, -1 -/* D8D4C4 80240274 0000302D */ daddu $a2, $zero, $zero -/* D8D4C8 80240278 00C0382D */ daddu $a3, $a2, $zero -/* D8D4CC 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* D8D4D0 80240280 AFA00014 */ sw $zero, 0x14($sp) -/* D8D4D4 80240284 AFA00018 */ sw $zero, 0x18($sp) -/* D8D4D8 80240288 AFA0001C */ sw $zero, 0x1c($sp) -.L8024028C: -/* D8D4DC 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D8D4E0 80240290 00000000 */ nop -.L80240294: -/* D8D4E4 80240294 9202000E */ lbu $v0, 0xe($s0) -/* D8D4E8 80240298 3C01802E */ lui $at, 0x802e -/* D8D4EC 8024029C A0229D70 */ sb $v0, -0x6290($at) -/* D8D4F0 802402A0 080900AD */ j .L802402B4 -/* D8D4F4 802402A4 0240202D */ daddu $a0, $s2, $zero -.L802402A8: -/* D8D4F8 802402A8 3C01802E */ lui $at, 0x802e -/* D8D4FC 802402AC A0209D70 */ sb $zero, -0x6290($at) -/* D8D500 802402B0 0240202D */ daddu $a0, $s2, $zero -.L802402B4: -/* D8D504 802402B4 AC910000 */ sw $s1, ($a0) -/* D8D508 802402B8 AC900008 */ sw $s0, 8($a0) -/* D8D50C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D8D510 802402C0 3C038024 */ lui $v1, 0x8024 -/* D8D514 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 -/* D8D518 802402C8 AC83000C */ sw $v1, 0xc($a0) -/* D8D51C 802402CC 00021023 */ negu $v0, $v0 -/* D8D520 802402D0 0C047644 */ jal queue_render_task -/* D8D524 802402D4 AC820004 */ sw $v0, 4($a0) -.L802402D8: -/* D8D528 802402D8 8FBF004C */ lw $ra, 0x4c($sp) -/* D8D52C 802402DC 8FB20048 */ lw $s2, 0x48($sp) -/* D8D530 802402E0 8FB10044 */ lw $s1, 0x44($sp) -/* D8D534 802402E4 8FB00040 */ lw $s0, 0x40($sp) -/* D8D538 802402E8 03E00008 */ jr $ra -/* D8D53C 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_802402F0_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_802402F0_D8D250.s deleted file mode 100644 index dd91de712f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_802402F0_D8D250.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D8D540 -/* D8D540 802402F0 3C03800A */ lui $v1, 0x800a -/* D8D544 802402F4 8463A634 */ lh $v1, -0x59cc($v1) -/* D8D548 802402F8 3C07BF80 */ lui $a3, 0xbf80 -/* D8D54C 802402FC 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D8D550 80240300 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D8D554 80240304 4480A000 */ mtc1 $zero, $f20 -/* D8D558 80240308 AFB1011C */ sw $s1, 0x11c($sp) -/* D8D55C 8024030C 0080882D */ daddu $s1, $a0, $zero -/* D8D560 80240310 AFB00118 */ sw $s0, 0x118($sp) -/* D8D564 80240314 27B00098 */ addiu $s0, $sp, 0x98 -/* D8D568 80240318 AFBF0120 */ sw $ra, 0x120($sp) -/* D8D56C 8024031C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D8D570 80240320 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D8D574 80240324 00031080 */ sll $v0, $v1, 2 -/* D8D578 80240328 00431021 */ addu $v0, $v0, $v1 -/* D8D57C 8024032C 00021080 */ sll $v0, $v0, 2 -/* D8D580 80240330 00431023 */ subu $v0, $v0, $v1 -/* D8D584 80240334 000218C0 */ sll $v1, $v0, 3 -/* D8D588 80240338 00431021 */ addu $v0, $v0, $v1 -/* D8D58C 8024033C 000210C0 */ sll $v0, $v0, 3 -/* D8D590 80240340 3C01800B */ lui $at, 0x800b -/* D8D594 80240344 00220821 */ addu $at, $at, $v0 -/* D8D598 80240348 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D8D59C 8024034C 4406A000 */ mfc1 $a2, $f20 -/* D8D5A0 80240350 4600B587 */ neg.s $f22, $f22 -/* D8D5A4 80240354 4405B000 */ mfc1 $a1, $f22 -/* D8D5A8 80240358 0200202D */ daddu $a0, $s0, $zero -/* D8D5AC 8024035C 0C019EC8 */ jal guRotateF -/* D8D5B0 80240360 E7B40010 */ swc1 $f20, 0x10($sp) -/* D8D5B4 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D8D5B8 80240368 0C00A6C9 */ jal clamp_angle -/* D8D5BC 8024036C 00000000 */ nop -/* D8D5C0 80240370 44050000 */ mfc1 $a1, $f0 -/* D8D5C4 80240374 4406A000 */ mfc1 $a2, $f20 -/* D8D5C8 80240378 4407A000 */ mfc1 $a3, $f20 -/* D8D5CC 8024037C 3C013F80 */ lui $at, 0x3f80 -/* D8D5D0 80240380 4481C000 */ mtc1 $at, $f24 -/* D8D5D4 80240384 27A40018 */ addiu $a0, $sp, 0x18 -/* D8D5D8 80240388 0C019EC8 */ jal guRotateF -/* D8D5DC 8024038C E7B80010 */ swc1 $f24, 0x10($sp) -/* D8D5E0 80240390 0200202D */ daddu $a0, $s0, $zero -/* D8D5E4 80240394 27A50018 */ addiu $a1, $sp, 0x18 -/* D8D5E8 80240398 0C019D80 */ jal guMtxCatF -/* D8D5EC 8024039C 00A0302D */ daddu $a2, $a1, $zero -/* D8D5F0 802403A0 4405B000 */ mfc1 $a1, $f22 -/* D8D5F4 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D8D5F8 802403A8 4407C000 */ mfc1 $a3, $f24 -/* D8D5FC 802403AC 0200202D */ daddu $a0, $s0, $zero -/* D8D600 802403B0 0C019EC8 */ jal guRotateF -/* D8D604 802403B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D8D608 802403B8 27A40018 */ addiu $a0, $sp, 0x18 -/* D8D60C 802403BC 0200282D */ daddu $a1, $s0, $zero -/* D8D610 802403C0 0C019D80 */ jal guMtxCatF -/* D8D614 802403C4 0080302D */ daddu $a2, $a0, $zero -/* D8D618 802403C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D8D61C 802403CC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D8D620 802403D0 4406A000 */ mfc1 $a2, $f20 -/* D8D624 802403D4 4407C000 */ mfc1 $a3, $f24 -/* D8D628 802403D8 0C019EC8 */ jal guRotateF -/* D8D62C 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D8D630 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* D8D634 802403E4 0200282D */ daddu $a1, $s0, $zero -/* D8D638 802403E8 0C019D80 */ jal guMtxCatF -/* D8D63C 802403EC 0080302D */ daddu $a2, $a0, $zero -/* D8D640 802403F0 3C013F36 */ lui $at, 0x3f36 -/* D8D644 802403F4 3421DB6E */ ori $at, $at, 0xdb6e -/* D8D648 802403F8 44810000 */ mtc1 $at, $f0 -/* D8D64C 802403FC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D8D650 80240400 44050000 */ mfc1 $a1, $f0 -/* D8D654 80240404 0200202D */ daddu $a0, $s0, $zero -/* D8D658 80240408 00A0302D */ daddu $a2, $a1, $zero -/* D8D65C 8024040C 0C019DF0 */ jal guScaleF -/* D8D660 80240410 00A0382D */ daddu $a3, $a1, $zero -/* D8D664 80240414 27A40018 */ addiu $a0, $sp, 0x18 -/* D8D668 80240418 0200282D */ daddu $a1, $s0, $zero -/* D8D66C 8024041C 0C019D80 */ jal guMtxCatF -/* D8D670 80240420 0080302D */ daddu $a2, $a0, $zero -/* D8D674 80240424 27B00058 */ addiu $s0, $sp, 0x58 -/* D8D678 80240428 C6200030 */ lwc1 $f0, 0x30($s1) -/* D8D67C 8024042C 3C014040 */ lui $at, 0x4040 -/* D8D680 80240430 44811000 */ mtc1 $at, $f2 -/* D8D684 80240434 46000007 */ neg.s $f0, $f0 -/* D8D688 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* D8D68C 8024043C 8E250028 */ lw $a1, 0x28($s1) -/* D8D690 80240440 8E26002C */ lw $a2, 0x2c($s1) -/* D8D694 80240444 44070000 */ mfc1 $a3, $f0 -/* D8D698 80240448 0C019E40 */ jal guTranslateF -/* D8D69C 8024044C 0200202D */ daddu $a0, $s0, $zero -/* D8D6A0 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* D8D6A4 80240454 0200282D */ daddu $a1, $s0, $zero -/* D8D6A8 80240458 0C019D80 */ jal guMtxCatF -/* D8D6AC 8024045C 0080302D */ daddu $a2, $a0, $zero -/* D8D6B0 80240460 24040002 */ addiu $a0, $zero, 2 -/* D8D6B4 80240464 0000282D */ daddu $a1, $zero, $zero -/* D8D6B8 80240468 00A0302D */ daddu $a2, $a1, $zero -/* D8D6BC 8024046C 00A0382D */ daddu $a3, $a1, $zero -/* D8D6C0 80240470 27A20018 */ addiu $v0, $sp, 0x18 -/* D8D6C4 80240474 0C0B7710 */ jal render_sprite -/* D8D6C8 80240478 AFA20010 */ sw $v0, 0x10($sp) -/* D8D6CC 8024047C 8FBF0120 */ lw $ra, 0x120($sp) -/* D8D6D0 80240480 8FB1011C */ lw $s1, 0x11c($sp) -/* D8D6D4 80240484 8FB00118 */ lw $s0, 0x118($sp) -/* D8D6D8 80240488 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D8D6DC 8024048C D7B60130 */ ldc1 $f22, 0x130($sp) -/* D8D6E0 80240490 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D8D6E4 80240494 03E00008 */ jr $ra -/* D8D6E8 80240498 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_8024049C_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_8024049C_D8D250.s deleted file mode 100644 index 82f5f1d2a4..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_8024049C_D8D250.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_D8D6EC -/* D8D6EC 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8D6F0 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* D8D6F4 802404A4 0080802D */ daddu $s0, $a0, $zero -/* D8D6F8 802404A8 AFBF0014 */ sw $ra, 0x14($sp) -/* D8D6FC 802404AC 8E020084 */ lw $v0, 0x84($s0) -/* D8D700 802404B0 0440000E */ bltz $v0, .L802404EC -/* D8D704 802404B4 28420002 */ slti $v0, $v0, 2 -/* D8D708 802404B8 1040000C */ beqz $v0, .L802404EC -/* D8D70C 802404BC 00000000 */ nop -/* D8D710 802404C0 3C058024 */ lui $a1, 0x8024 -/* D8D714 802404C4 24A50500 */ addiu $a1, $a1, 0x500 -/* D8D718 802404C8 0C048C56 */ jal bind_dynamic_entity_3 -/* D8D71C 802404CC 0000202D */ daddu $a0, $zero, $zero -/* D8D720 802404D0 8E03013C */ lw $v1, 0x13c($s0) -/* D8D724 802404D4 AC620000 */ sw $v0, ($v1) -/* D8D728 802404D8 3C03800A */ lui $v1, %hi(D_8009A650) -/* D8D72C 802404DC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D8D730 802404E0 8C620000 */ lw $v0, ($v1) -/* D8D734 802404E4 34420080 */ ori $v0, $v0, 0x80 -/* D8D738 802404E8 AC620000 */ sw $v0, ($v1) -.L802404EC: -/* D8D73C 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* D8D740 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* D8D744 802404F4 24020002 */ addiu $v0, $zero, 2 -/* D8D748 802404F8 03E00008 */ jr $ra -/* D8D74C 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_80240500_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_80240500_D8D250.s deleted file mode 100644 index 63cf4672c6..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_80240500_D8D250.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_D8D750 -/* D8D750 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D8D754 80240504 AFB00040 */ sw $s0, 0x40($sp) -/* D8D758 80240508 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D8D75C 8024050C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D8D760 80240510 AFB10044 */ sw $s1, 0x44($sp) -/* D8D764 80240514 AFBF004C */ sw $ra, 0x4c($sp) -/* D8D768 80240518 AFB20048 */ sw $s2, 0x48($sp) -/* D8D76C 8024051C 8E020000 */ lw $v0, ($s0) -/* D8D770 80240520 821200BE */ lb $s2, 0xbe($s0) -/* D8D774 80240524 30420001 */ andi $v0, $v0, 1 -/* D8D778 80240528 10400052 */ beqz $v0, .L80240674 -/* D8D77C 8024052C 27B10020 */ addiu $s1, $sp, 0x20 -/* D8D780 80240530 8E0400CC */ lw $a0, 0xcc($s0) -/* D8D784 80240534 0C044181 */ jal get_shadow_by_index -/* D8D788 80240538 00000000 */ nop -/* D8D78C 8024053C 0C048B77 */ jal func_80122DDC -/* D8D790 80240540 84440008 */ lh $a0, 8($v0) -/* D8D794 80240544 8E050028 */ lw $a1, 0x28($s0) -/* D8D798 80240548 8E070030 */ lw $a3, 0x30($s0) -/* D8D79C 8024054C 27A20030 */ addiu $v0, $sp, 0x30 -/* D8D7A0 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* D8D7A4 80240554 27A20034 */ addiu $v0, $sp, 0x34 -/* D8D7A8 80240558 AFA20014 */ sw $v0, 0x14($sp) -/* D8D7AC 8024055C 27A20038 */ addiu $v0, $sp, 0x38 -/* D8D7B0 80240560 AFA20018 */ sw $v0, 0x18($sp) -/* D8D7B4 80240564 C600002C */ lwc1 $f0, 0x2c($s0) -/* D8D7B8 80240568 3C04800A */ lui $a0, 0x800a -/* D8D7BC 8024056C 8484A634 */ lh $a0, -0x59cc($a0) -/* D8D7C0 80240570 46000007 */ neg.s $f0, $f0 -/* D8D7C4 80240574 44060000 */ mfc1 $a2, $f0 -/* D8D7C8 80240578 0C00B94E */ jal get_screen_coords -/* D8D7CC 8024057C 00000000 */ nop -/* D8D7D0 80240580 8E0500A4 */ lw $a1, 0xa4($s0) -/* D8D7D4 80240584 3C063F80 */ lui $a2, 0x3f80 -/* D8D7D8 80240588 0C0B76A3 */ jal func_802DDA8C -/* D8D7DC 8024058C 24040001 */ addiu $a0, $zero, 1 -/* D8D7E0 80240590 8E020000 */ lw $v0, ($s0) -/* D8D7E4 80240594 3C030002 */ lui $v1, 2 -/* D8D7E8 80240598 00431024 */ and $v0, $v0, $v1 -/* D8D7EC 8024059C 54400022 */ bnel $v0, $zero, .L80240628 -/* D8D7F0 802405A0 24120011 */ addiu $s2, $zero, 0x11 -/* D8D7F4 802405A4 9203000E */ lbu $v1, 0xe($s0) -/* D8D7F8 802405A8 3C02802E */ lui $v0, 0x802e -/* D8D7FC 802405AC 90429D71 */ lbu $v0, -0x628f($v0) -/* D8D800 802405B0 10620018 */ beq $v1, $v0, .L80240614 -/* D8D804 802405B4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D8D808 802405B8 1040000B */ beqz $v0, .L802405E8 -/* D8D80C 802405BC 24120011 */ addiu $s2, $zero, 0x11 -/* D8D810 802405C0 24040001 */ addiu $a0, $zero, 1 -/* D8D814 802405C4 2405FFFF */ addiu $a1, $zero, -1 -/* D8D818 802405C8 24060007 */ addiu $a2, $zero, 7 -/* D8D81C 802405CC 0060102D */ daddu $v0, $v1, $zero -/* D8D820 802405D0 0000382D */ daddu $a3, $zero, $zero -/* D8D824 802405D4 AFA00010 */ sw $zero, 0x10($sp) -/* D8D828 802405D8 AFA00014 */ sw $zero, 0x14($sp) -/* D8D82C 802405DC AFA0001C */ sw $zero, 0x1c($sp) -/* D8D830 802405E0 08090183 */ j .L8024060C -/* D8D834 802405E4 AFA20018 */ sw $v0, 0x18($sp) -.L802405E8: -/* D8D838 802405E8 2412000D */ addiu $s2, $zero, 0xd -/* D8D83C 802405EC 24040001 */ addiu $a0, $zero, 1 -/* D8D840 802405F0 2405FFFF */ addiu $a1, $zero, -1 -/* D8D844 802405F4 0000302D */ daddu $a2, $zero, $zero -/* D8D848 802405F8 00C0382D */ daddu $a3, $a2, $zero -/* D8D84C 802405FC AFA00010 */ sw $zero, 0x10($sp) -/* D8D850 80240600 AFA00014 */ sw $zero, 0x14($sp) -/* D8D854 80240604 AFA00018 */ sw $zero, 0x18($sp) -/* D8D858 80240608 AFA0001C */ sw $zero, 0x1c($sp) -.L8024060C: -/* D8D85C 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D8D860 80240610 00000000 */ nop -.L80240614: -/* D8D864 80240614 9202000E */ lbu $v0, 0xe($s0) -/* D8D868 80240618 3C01802E */ lui $at, 0x802e -/* D8D86C 8024061C A0229D71 */ sb $v0, -0x628f($at) -/* D8D870 80240620 0809018C */ j .L80240630 -/* D8D874 80240624 00000000 */ nop -.L80240628: -/* D8D878 80240628 3C01802E */ lui $at, 0x802e -/* D8D87C 8024062C A0209D71 */ sb $zero, -0x628f($at) -.L80240630: -/* D8D880 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D8D884 80240634 3C048024 */ lui $a0, 0x8024 -/* D8D888 80240638 24840870 */ addiu $a0, $a0, 0x870 -/* D8D88C 8024063C AE320000 */ sw $s2, ($s1) -/* D8D890 80240640 AE300008 */ sw $s0, 8($s1) -/* D8D894 80240644 00021023 */ negu $v0, $v0 -/* D8D898 80240648 AE220004 */ sw $v0, 4($s1) -/* D8D89C 8024064C 8E020000 */ lw $v0, ($s0) -/* D8D8A0 80240650 3C030002 */ lui $v1, 2 -/* D8D8A4 80240654 00431024 */ and $v0, $v0, $v1 -/* D8D8A8 80240658 54400004 */ bnel $v0, $zero, .L8024066C -/* D8D8AC 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D8D8B0 80240660 3C048024 */ lui $a0, 0x8024 -/* D8D8B4 80240664 2484068C */ addiu $a0, $a0, 0x68c -/* D8D8B8 80240668 AE24000C */ sw $a0, 0xc($s1) -.L8024066C: -/* D8D8BC 8024066C 0C047644 */ jal queue_render_task -/* D8D8C0 80240670 0220202D */ daddu $a0, $s1, $zero -.L80240674: -/* D8D8C4 80240674 8FBF004C */ lw $ra, 0x4c($sp) -/* D8D8C8 80240678 8FB20048 */ lw $s2, 0x48($sp) -/* D8D8CC 8024067C 8FB10044 */ lw $s1, 0x44($sp) -/* D8D8D0 80240680 8FB00040 */ lw $s0, 0x40($sp) -/* D8D8D4 80240684 03E00008 */ jr $ra -/* D8D8D8 80240688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_8024068C_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_8024068C_D8D250.s deleted file mode 100644 index 860deac038..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_8024068C_D8D250.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_D8D8DC -/* D8D8DC 8024068C 3C03800A */ lui $v1, 0x800a -/* D8D8E0 80240690 8463A634 */ lh $v1, -0x59cc($v1) -/* D8D8E4 80240694 3C07BF80 */ lui $a3, 0xbf80 -/* D8D8E8 80240698 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D8D8EC 8024069C F7B40128 */ sdc1 $f20, 0x128($sp) -/* D8D8F0 802406A0 4480A000 */ mtc1 $zero, $f20 -/* D8D8F4 802406A4 AFB1011C */ sw $s1, 0x11c($sp) -/* D8D8F8 802406A8 0080882D */ daddu $s1, $a0, $zero -/* D8D8FC 802406AC AFB00118 */ sw $s0, 0x118($sp) -/* D8D900 802406B0 27B00098 */ addiu $s0, $sp, 0x98 -/* D8D904 802406B4 AFBF0120 */ sw $ra, 0x120($sp) -/* D8D908 802406B8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D8D90C 802406BC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D8D910 802406C0 00031080 */ sll $v0, $v1, 2 -/* D8D914 802406C4 00431021 */ addu $v0, $v0, $v1 -/* D8D918 802406C8 00021080 */ sll $v0, $v0, 2 -/* D8D91C 802406CC 00431023 */ subu $v0, $v0, $v1 -/* D8D920 802406D0 000218C0 */ sll $v1, $v0, 3 -/* D8D924 802406D4 00431021 */ addu $v0, $v0, $v1 -/* D8D928 802406D8 000210C0 */ sll $v0, $v0, 3 -/* D8D92C 802406DC 3C01800B */ lui $at, 0x800b -/* D8D930 802406E0 00220821 */ addu $at, $at, $v0 -/* D8D934 802406E4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D8D938 802406E8 4406A000 */ mfc1 $a2, $f20 -/* D8D93C 802406EC 4600B587 */ neg.s $f22, $f22 -/* D8D940 802406F0 4405B000 */ mfc1 $a1, $f22 -/* D8D944 802406F4 0200202D */ daddu $a0, $s0, $zero -/* D8D948 802406F8 0C019EC8 */ jal guRotateF -/* D8D94C 802406FC E7B40010 */ swc1 $f20, 0x10($sp) -/* D8D950 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D8D954 80240704 0C00A6C9 */ jal clamp_angle -/* D8D958 80240708 00000000 */ nop -/* D8D95C 8024070C 44050000 */ mfc1 $a1, $f0 -/* D8D960 80240710 4406A000 */ mfc1 $a2, $f20 -/* D8D964 80240714 4407A000 */ mfc1 $a3, $f20 -/* D8D968 80240718 3C013F80 */ lui $at, 0x3f80 -/* D8D96C 8024071C 4481C000 */ mtc1 $at, $f24 -/* D8D970 80240720 27A40018 */ addiu $a0, $sp, 0x18 -/* D8D974 80240724 0C019EC8 */ jal guRotateF -/* D8D978 80240728 E7B80010 */ swc1 $f24, 0x10($sp) -/* D8D97C 8024072C 0200202D */ daddu $a0, $s0, $zero -/* D8D980 80240730 27A50018 */ addiu $a1, $sp, 0x18 -/* D8D984 80240734 0C019D80 */ jal guMtxCatF -/* D8D988 80240738 00A0302D */ daddu $a2, $a1, $zero -/* D8D98C 8024073C 4405B000 */ mfc1 $a1, $f22 -/* D8D990 80240740 4406A000 */ mfc1 $a2, $f20 -/* D8D994 80240744 4407C000 */ mfc1 $a3, $f24 -/* D8D998 80240748 0200202D */ daddu $a0, $s0, $zero -/* D8D99C 8024074C 0C019EC8 */ jal guRotateF -/* D8D9A0 80240750 E7B40010 */ swc1 $f20, 0x10($sp) -/* D8D9A4 80240754 27A40018 */ addiu $a0, $sp, 0x18 -/* D8D9A8 80240758 0200282D */ daddu $a1, $s0, $zero -/* D8D9AC 8024075C 0C019D80 */ jal guMtxCatF -/* D8D9B0 80240760 0080302D */ daddu $a2, $a0, $zero -/* D8D9B4 80240764 E7B40010 */ swc1 $f20, 0x10($sp) -/* D8D9B8 80240768 8E2500A8 */ lw $a1, 0xa8($s1) -/* D8D9BC 8024076C 4406A000 */ mfc1 $a2, $f20 -/* D8D9C0 80240770 4407C000 */ mfc1 $a3, $f24 -/* D8D9C4 80240774 0C019EC8 */ jal guRotateF -/* D8D9C8 80240778 0200202D */ daddu $a0, $s0, $zero -/* D8D9CC 8024077C 27A40018 */ addiu $a0, $sp, 0x18 -/* D8D9D0 80240780 0200282D */ daddu $a1, $s0, $zero -/* D8D9D4 80240784 0C019D80 */ jal guMtxCatF -/* D8D9D8 80240788 0080302D */ daddu $a2, $a0, $zero -/* D8D9DC 8024078C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D8D9E0 80240790 3C013F36 */ lui $at, 0x3f36 -/* D8D9E4 80240794 3421DB6E */ ori $at, $at, 0xdb6e -/* D8D9E8 80240798 44810000 */ mtc1 $at, $f0 -/* D8D9EC 8024079C 0200202D */ daddu $a0, $s0, $zero -/* D8D9F0 802407A0 44050000 */ mfc1 $a1, $f0 -/* D8D9F4 802407A4 3C06BF36 */ lui $a2, 0xbf36 -/* D8D9F8 802407A8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D8D9FC 802407AC 0C019DF0 */ jal guScaleF -/* D8DA00 802407B0 00A0382D */ daddu $a3, $a1, $zero -/* D8DA04 802407B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D8DA08 802407B8 0200282D */ daddu $a1, $s0, $zero -/* D8DA0C 802407BC 0C019D80 */ jal guMtxCatF -/* D8DA10 802407C0 0080302D */ daddu $a2, $a0, $zero -/* D8DA14 802407C4 27B00058 */ addiu $s0, $sp, 0x58 -/* D8DA18 802407C8 8E250028 */ lw $a1, 0x28($s1) -/* D8DA1C 802407CC C620002C */ lwc1 $f0, 0x2c($s1) -/* D8DA20 802407D0 8E270030 */ lw $a3, 0x30($s1) -/* D8DA24 802407D4 46000007 */ neg.s $f0, $f0 -/* D8DA28 802407D8 44060000 */ mfc1 $a2, $f0 -/* D8DA2C 802407DC 0C019E40 */ jal guTranslateF -/* D8DA30 802407E0 0200202D */ daddu $a0, $s0, $zero -/* D8DA34 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D8DA38 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D8DA3C 802407EC 0C019D80 */ jal guMtxCatF -/* D8DA40 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D8DA44 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D8DA48 802407F8 3C0142B4 */ lui $at, 0x42b4 -/* D8DA4C 802407FC 44810000 */ mtc1 $at, $f0 -/* D8DA50 80240800 00000000 */ nop -/* D8DA54 80240804 4602003E */ c.le.s $f0, $f2 -/* D8DA58 80240808 00000000 */ nop -/* D8DA5C 8024080C 4500000A */ bc1f .L80240838 -/* D8DA60 80240810 24040001 */ addiu $a0, $zero, 1 -/* D8DA64 80240814 3C014387 */ lui $at, 0x4387 -/* D8DA68 80240818 44810000 */ mtc1 $at, $f0 -/* D8DA6C 8024081C 00000000 */ nop -/* D8DA70 80240820 4600103C */ c.lt.s $f2, $f0 -/* D8DA74 80240824 00000000 */ nop -/* D8DA78 80240828 45000004 */ bc1f .L8024083C -/* D8DA7C 8024082C 27A20018 */ addiu $v0, $sp, 0x18 -/* D8DA80 80240830 3C041000 */ lui $a0, 0x1000 -/* D8DA84 80240834 34840001 */ ori $a0, $a0, 1 -.L80240838: -/* D8DA88 80240838 27A20018 */ addiu $v0, $sp, 0x18 -.L8024083C: -/* D8DA8C 8024083C 0000282D */ daddu $a1, $zero, $zero -/* D8DA90 80240840 00A0302D */ daddu $a2, $a1, $zero -/* D8DA94 80240844 00A0382D */ daddu $a3, $a1, $zero -/* D8DA98 80240848 0C0B7710 */ jal render_sprite -/* D8DA9C 8024084C AFA20010 */ sw $v0, 0x10($sp) -/* D8DAA0 80240850 8FBF0120 */ lw $ra, 0x120($sp) -/* D8DAA4 80240854 8FB1011C */ lw $s1, 0x11c($sp) -/* D8DAA8 80240858 8FB00118 */ lw $s0, 0x118($sp) -/* D8DAAC 8024085C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D8DAB0 80240860 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D8DAB4 80240864 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D8DAB8 80240868 03E00008 */ jr $ra -/* D8DABC 8024086C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_80240870_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_80240870_D8D250.s deleted file mode 100644 index a38b37d07c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_80240870_D8D250.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_D8DAC0 -/* D8DAC0 80240870 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D8DAC4 80240874 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D8DAC8 80240878 4480B000 */ mtc1 $zero, $f22 -/* D8DACC 8024087C AFB10134 */ sw $s1, 0x134($sp) -/* D8DAD0 80240880 0080882D */ daddu $s1, $a0, $zero -/* D8DAD4 80240884 AFB3013C */ sw $s3, 0x13c($sp) -/* D8DAD8 80240888 0000982D */ daddu $s3, $zero, $zero -/* D8DADC 8024088C AFB60148 */ sw $s6, 0x148($sp) -/* D8DAE0 80240890 3C16800B */ lui $s6, %hi(gCameras) -/* D8DAE4 80240894 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D8DAE8 80240898 AFB50144 */ sw $s5, 0x144($sp) -/* D8DAEC 8024089C 241500FF */ addiu $s5, $zero, 0xff -/* D8DAF0 802408A0 AFB00130 */ sw $s0, 0x130($sp) -/* D8DAF4 802408A4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D8DAF8 802408A8 AFB20138 */ sw $s2, 0x138($sp) -/* D8DAFC 802408AC 27B20060 */ addiu $s2, $sp, 0x60 -/* D8DB00 802408B0 AFB40140 */ sw $s4, 0x140($sp) -/* D8DB04 802408B4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D8DB08 802408B8 AFBF014C */ sw $ra, 0x14c($sp) -/* D8DB0C 802408BC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D8DB10 802408C0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D8DB14 802408C4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D8DB18 802408C8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D8DB1C 802408CC F7B40150 */ sdc1 $f20, 0x150($sp) -.L802408D0: -/* D8DB20 802408D0 3C03800A */ lui $v1, 0x800a -/* D8DB24 802408D4 8463A634 */ lh $v1, -0x59cc($v1) -/* D8DB28 802408D8 00031080 */ sll $v0, $v1, 2 -/* D8DB2C 802408DC 00431021 */ addu $v0, $v0, $v1 -/* D8DB30 802408E0 00021080 */ sll $v0, $v0, 2 -/* D8DB34 802408E4 00431023 */ subu $v0, $v0, $v1 -/* D8DB38 802408E8 000218C0 */ sll $v1, $v0, 3 -/* D8DB3C 802408EC 00431021 */ addu $v0, $v0, $v1 -/* D8DB40 802408F0 000210C0 */ sll $v0, $v0, 3 -/* D8DB44 802408F4 00561021 */ addu $v0, $v0, $s6 -/* D8DB48 802408F8 C440006C */ lwc1 $f0, 0x6c($v0) -/* D8DB4C 802408FC 16600065 */ bnez $s3, .L80240A94 -/* D8DB50 80240900 46000507 */ neg.s $f20, $f0 -/* D8DB54 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D8DB58 80240908 3C0142B4 */ lui $at, 0x42b4 -/* D8DB5C 8024090C 44810000 */ mtc1 $at, $f0 -/* D8DB60 80240910 00000000 */ nop -/* D8DB64 80240914 4602003C */ c.lt.s $f0, $f2 -/* D8DB68 80240918 00000000 */ nop -/* D8DB6C 8024091C 4500000A */ bc1f .L80240948 -/* D8DB70 80240920 00000000 */ nop -/* D8DB74 80240924 3C014334 */ lui $at, 0x4334 -/* D8DB78 80240928 44812000 */ mtc1 $at, $f4 -/* D8DB7C 8024092C 00000000 */ nop -/* D8DB80 80240930 4604103E */ c.le.s $f2, $f4 -/* D8DB84 80240934 00000000 */ nop -/* D8DB88 80240938 45000003 */ bc1f .L80240948 -/* D8DB8C 8024093C 00000000 */ nop -/* D8DB90 80240940 08090276 */ j .L802409D8 -/* D8DB94 80240944 46022501 */ sub.s $f20, $f4, $f2 -.L80240948: -/* D8DB98 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D8DB9C 8024094C 3C014334 */ lui $at, 0x4334 -/* D8DBA0 80240950 44812000 */ mtc1 $at, $f4 -/* D8DBA4 80240954 00000000 */ nop -/* D8DBA8 80240958 4600203C */ c.lt.s $f4, $f0 -/* D8DBAC 8024095C 00000000 */ nop -/* D8DBB0 80240960 4500000C */ bc1f .L80240994 -/* D8DBB4 80240964 00000000 */ nop -/* D8DBB8 80240968 3C014387 */ lui $at, 0x4387 -/* D8DBBC 8024096C 44812000 */ mtc1 $at, $f4 -/* D8DBC0 80240970 00000000 */ nop -/* D8DBC4 80240974 4604003E */ c.le.s $f0, $f4 -/* D8DBC8 80240978 00000000 */ nop -/* D8DBCC 8024097C 45000008 */ bc1f .L802409A0 -/* D8DBD0 80240980 00000000 */ nop -/* D8DBD4 80240984 3C014334 */ lui $at, 0x4334 -/* D8DBD8 80240988 44812000 */ mtc1 $at, $f4 -/* D8DBDC 8024098C 08090276 */ j .L802409D8 -/* D8DBE0 80240990 46040501 */ sub.s $f20, $f0, $f4 -.L80240994: -/* D8DBE4 80240994 3C014387 */ lui $at, 0x4387 -/* D8DBE8 80240998 44812000 */ mtc1 $at, $f4 -/* D8DBEC 8024099C 00000000 */ nop -.L802409A0: -/* D8DBF0 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D8DBF4 802409A4 00000000 */ nop -/* D8DBF8 802409A8 4500000A */ bc1f .L802409D4 -/* D8DBFC 802409AC 00000000 */ nop -/* D8DC00 802409B0 3C0143B4 */ lui $at, 0x43b4 -/* D8DC04 802409B4 44811000 */ mtc1 $at, $f2 -/* D8DC08 802409B8 00000000 */ nop -/* D8DC0C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D8DC10 802409C0 00000000 */ nop -/* D8DC14 802409C4 45000003 */ bc1f .L802409D4 -/* D8DC18 802409C8 00000000 */ nop -/* D8DC1C 802409CC 08090276 */ j .L802409D8 -/* D8DC20 802409D0 46001501 */ sub.s $f20, $f2, $f0 -.L802409D4: -/* D8DC24 802409D4 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L802409D8: -/* D8DC28 802409D8 3C0141C8 */ lui $at, 0x41c8 -/* D8DC2C 802409DC 44810000 */ mtc1 $at, $f0 -/* D8DC30 802409E0 00000000 */ nop -/* D8DC34 802409E4 4600A003 */ div.s $f0, $f20, $f0 -/* D8DC38 802409E8 4600010D */ trunc.w.s $f4, $f0 -/* D8DC3C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D8DC40 802409F0 00000000 */ nop -/* D8DC44 802409F4 00071100 */ sll $v0, $a3, 4 -/* D8DC48 802409F8 00471023 */ subu $v0, $v0, $a3 -/* D8DC4C 802409FC 00021080 */ sll $v0, $v0, 2 -/* D8DC50 80240A00 02A23823 */ subu $a3, $s5, $v0 -/* D8DC54 80240A04 28E20064 */ slti $v0, $a3, 0x64 -/* D8DC58 80240A08 54400001 */ bnel $v0, $zero, .L80240A10 -/* D8DC5C 80240A0C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A10: -/* D8DC60 80240A10 24040001 */ addiu $a0, $zero, 1 -/* D8DC64 80240A14 2405FFFF */ addiu $a1, $zero, -1 -/* D8DC68 80240A18 24060006 */ addiu $a2, $zero, 6 -/* D8DC6C 80240A1C AFA70010 */ sw $a3, 0x10($sp) -/* D8DC70 80240A20 AFA70014 */ sw $a3, 0x14($sp) -/* D8DC74 80240A24 AFB50018 */ sw $s5, 0x18($sp) -/* D8DC78 80240A28 0C0B77B9 */ jal func_802DDEE4 -/* D8DC7C 80240A2C AFA0001C */ sw $zero, 0x1c($sp) -/* D8DC80 80240A30 4405A000 */ mfc1 $a1, $f20 -/* D8DC84 80240A34 4406B000 */ mfc1 $a2, $f22 -/* D8DC88 80240A38 3C07BF80 */ lui $a3, 0xbf80 -/* D8DC8C 80240A3C 0200202D */ daddu $a0, $s0, $zero -/* D8DC90 80240A40 0C019EC8 */ jal guRotateF -/* D8DC94 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D8DC98 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D8DC9C 80240A4C 0C00A6C9 */ jal clamp_angle -/* D8DCA0 80240A50 00000000 */ nop -/* D8DCA4 80240A54 44050000 */ mfc1 $a1, $f0 -/* D8DCA8 80240A58 4406B000 */ mfc1 $a2, $f22 -/* D8DCAC 80240A5C 4407B000 */ mfc1 $a3, $f22 -/* D8DCB0 80240A60 3C013F80 */ lui $at, 0x3f80 -/* D8DCB4 80240A64 44812000 */ mtc1 $at, $f4 -/* D8DCB8 80240A68 27A40020 */ addiu $a0, $sp, 0x20 -/* D8DCBC 80240A6C 0C019EC8 */ jal guRotateF -/* D8DCC0 80240A70 E7A40010 */ swc1 $f4, 0x10($sp) -/* D8DCC4 80240A74 0200202D */ daddu $a0, $s0, $zero -/* D8DCC8 80240A78 27A50020 */ addiu $a1, $sp, 0x20 -/* D8DCCC 80240A7C 0C019D80 */ jal guMtxCatF -/* D8DCD0 80240A80 00A0302D */ daddu $a2, $a1, $zero -/* D8DCD4 80240A84 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D8DCD8 80240A88 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D8DCDC 80240A8C 080902D6 */ j .L80240B58 -/* D8DCE0 80240A90 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240A94: -/* D8DCE4 80240A94 0260202D */ daddu $a0, $s3, $zero -/* D8DCE8 80240A98 27A50120 */ addiu $a1, $sp, 0x120 -/* D8DCEC 80240A9C 27A60124 */ addiu $a2, $sp, 0x124 -/* D8DCF0 80240AA0 0C03964E */ jal func_800E5938 -/* D8DCF4 80240AA4 27A70128 */ addiu $a3, $sp, 0x128 -/* D8DCF8 80240AA8 8FA60124 */ lw $a2, 0x124($sp) -/* D8DCFC 80240AAC 3C028000 */ lui $v0, 0x8000 -/* D8DD00 80240AB0 14C20004 */ bne $a2, $v0, .L80240AC4 -/* D8DD04 80240AB4 46000606 */ mov.s $f24, $f0 -/* D8DD08 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D8DD0C 80240ABC 080902B5 */ j .L80240AD4 -/* D8DD10 80240AC0 24040001 */ addiu $a0, $zero, 1 -.L80240AC4: -/* D8DD14 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D8DD18 80240AC8 00000000 */ nop -/* D8DD1C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D8DD20 80240AD0 24040001 */ addiu $a0, $zero, 1 -.L80240AD4: -/* D8DD24 80240AD4 2405FFFF */ addiu $a1, $zero, -1 -/* D8DD28 80240AD8 24060007 */ addiu $a2, $zero, 7 -/* D8DD2C 80240ADC 0000382D */ daddu $a3, $zero, $zero -/* D8DD30 80240AE0 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D8DD34 80240AE4 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D8DD38 80240AE8 24020040 */ addiu $v0, $zero, 0x40 -/* D8DD3C 80240AEC AFA00010 */ sw $zero, 0x10($sp) -/* D8DD40 80240AF0 AFA00014 */ sw $zero, 0x14($sp) -/* D8DD44 80240AF4 AFA20018 */ sw $v0, 0x18($sp) -/* D8DD48 80240AF8 0C0B77B9 */ jal func_802DDEE4 -/* D8DD4C 80240AFC AFA0001C */ sw $zero, 0x1c($sp) -/* D8DD50 80240B00 4405A000 */ mfc1 $a1, $f20 -/* D8DD54 80240B04 4406B000 */ mfc1 $a2, $f22 -/* D8DD58 80240B08 3C07BF80 */ lui $a3, 0xbf80 -/* D8DD5C 80240B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* D8DD60 80240B10 0C019EC8 */ jal guRotateF -/* D8DD64 80240B14 E7B60010 */ swc1 $f22, 0x10($sp) -/* D8DD68 80240B18 4405A000 */ mfc1 $a1, $f20 -/* D8DD6C 80240B1C 4406B000 */ mfc1 $a2, $f22 -/* D8DD70 80240B20 3C07BF80 */ lui $a3, 0xbf80 -/* D8DD74 80240B24 0200202D */ daddu $a0, $s0, $zero -/* D8DD78 80240B28 0C019EC8 */ jal guRotateF -/* D8DD7C 80240B2C E7B60010 */ swc1 $f22, 0x10($sp) -/* D8DD80 80240B30 4405C000 */ mfc1 $a1, $f24 -/* D8DD84 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D8DD88 80240B38 3C073F80 */ lui $a3, 0x3f80 -/* D8DD8C 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D8DD90 80240B40 0C019EC8 */ jal guRotateF -/* D8DD94 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D8DD98 80240B48 0200202D */ daddu $a0, $s0, $zero -/* D8DD9C 80240B4C 27A50020 */ addiu $a1, $sp, 0x20 -/* D8DDA0 80240B50 0C019D80 */ jal guMtxCatF -/* D8DDA4 80240B54 00A0302D */ daddu $a2, $a1, $zero -.L80240B58: -/* D8DDA8 80240B58 862200B0 */ lh $v0, 0xb0($s1) -/* D8DDAC 80240B5C 3C013F00 */ lui $at, 0x3f00 -/* D8DDB0 80240B60 44812000 */ mtc1 $at, $f4 -/* D8DDB4 80240B64 00021023 */ negu $v0, $v0 -/* D8DDB8 80240B68 44820000 */ mtc1 $v0, $f0 -/* D8DDBC 80240B6C 00000000 */ nop -/* D8DDC0 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* D8DDC4 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D8DDC8 80240B78 00000000 */ nop -/* D8DDCC 80240B7C 4405B000 */ mfc1 $a1, $f22 -/* D8DDD0 80240B80 4407B000 */ mfc1 $a3, $f22 -/* D8DDD4 80240B84 44062000 */ mfc1 $a2, $f4 -/* D8DDD8 80240B88 0C019E40 */ jal guTranslateF -/* D8DDDC 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* D8DDE0 80240B90 0240202D */ daddu $a0, $s2, $zero -/* D8DDE4 80240B94 27A50020 */ addiu $a1, $sp, 0x20 -/* D8DDE8 80240B98 0C019D80 */ jal guMtxCatF -/* D8DDEC 80240B9C 00A0302D */ daddu $a2, $a1, $zero -/* D8DDF0 80240BA0 4405A000 */ mfc1 $a1, $f20 -/* D8DDF4 80240BA4 4406B000 */ mfc1 $a2, $f22 -/* D8DDF8 80240BA8 3C073F80 */ lui $a3, 0x3f80 -/* D8DDFC 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* D8DE00 80240BB0 0C019EC8 */ jal guRotateF -/* D8DE04 80240BB4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D8DE08 80240BB8 27A40020 */ addiu $a0, $sp, 0x20 -/* D8DE0C 80240BBC 0200282D */ daddu $a1, $s0, $zero -/* D8DE10 80240BC0 0C019D80 */ jal guMtxCatF -/* D8DE14 80240BC4 0080302D */ daddu $a2, $a0, $zero -/* D8DE18 80240BC8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D8DE1C 80240BCC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D8DE20 80240BD0 4406B000 */ mfc1 $a2, $f22 -/* D8DE24 80240BD4 3C073F80 */ lui $a3, 0x3f80 -/* D8DE28 80240BD8 0C019EC8 */ jal guRotateF -/* D8DE2C 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D8DE30 80240BE0 27A40020 */ addiu $a0, $sp, 0x20 -/* D8DE34 80240BE4 0200282D */ daddu $a1, $s0, $zero -/* D8DE38 80240BE8 0C019D80 */ jal guMtxCatF -/* D8DE3C 80240BEC 0080302D */ daddu $a2, $a0, $zero -/* D8DE40 80240BF0 862200B0 */ lh $v0, 0xb0($s1) -/* D8DE44 80240BF4 3C013F00 */ lui $at, 0x3f00 -/* D8DE48 80240BF8 44812000 */ mtc1 $at, $f4 -/* D8DE4C 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D8DE50 80240C00 00000000 */ nop -/* D8DE54 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* D8DE58 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D8DE5C 80240C0C 00000000 */ nop -/* D8DE60 80240C10 4405B000 */ mfc1 $a1, $f22 -/* D8DE64 80240C14 4407B000 */ mfc1 $a3, $f22 -/* D8DE68 80240C18 44062000 */ mfc1 $a2, $f4 -/* D8DE6C 80240C1C 0C019E40 */ jal guTranslateF -/* D8DE70 80240C20 0240202D */ daddu $a0, $s2, $zero -/* D8DE74 80240C24 27A40020 */ addiu $a0, $sp, 0x20 -/* D8DE78 80240C28 0240282D */ daddu $a1, $s2, $zero -/* D8DE7C 80240C2C 0C019D80 */ jal guMtxCatF -/* D8DE80 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D8DE84 80240C34 3C013F36 */ lui $at, 0x3f36 -/* D8DE88 80240C38 3421DB6E */ ori $at, $at, 0xdb6e -/* D8DE8C 80240C3C 44810000 */ mtc1 $at, $f0 -/* D8DE90 80240C40 0280202D */ daddu $a0, $s4, $zero -/* D8DE94 80240C44 44050000 */ mfc1 $a1, $f0 -/* D8DE98 80240C48 3C06BF36 */ lui $a2, 0xbf36 -/* D8DE9C 80240C4C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D8DEA0 80240C50 0C019DF0 */ jal guScaleF -/* D8DEA4 80240C54 00A0382D */ daddu $a3, $a1, $zero -/* D8DEA8 80240C58 27A40020 */ addiu $a0, $sp, 0x20 -/* D8DEAC 80240C5C 0280282D */ daddu $a1, $s4, $zero -/* D8DEB0 80240C60 0C019D80 */ jal guMtxCatF -/* D8DEB4 80240C64 0080302D */ daddu $a2, $a0, $zero -/* D8DEB8 80240C68 4600D687 */ neg.s $f26, $f26 -/* D8DEBC 80240C6C 4405F000 */ mfc1 $a1, $f30 -/* D8DEC0 80240C70 4407E000 */ mfc1 $a3, $f28 -/* D8DEC4 80240C74 4406D000 */ mfc1 $a2, $f26 -/* D8DEC8 80240C78 0C019E40 */ jal guTranslateF -/* D8DECC 80240C7C 0240202D */ daddu $a0, $s2, $zero -/* D8DED0 80240C80 27A40020 */ addiu $a0, $sp, 0x20 -/* D8DED4 80240C84 0240282D */ daddu $a1, $s2, $zero -/* D8DED8 80240C88 0C019D80 */ jal guMtxCatF -/* D8DEDC 80240C8C 0080302D */ daddu $a2, $a0, $zero -/* D8DEE0 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D8DEE4 80240C94 3C0142B4 */ lui $at, 0x42b4 -/* D8DEE8 80240C98 44810000 */ mtc1 $at, $f0 -/* D8DEEC 80240C9C 00000000 */ nop -/* D8DEF0 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D8DEF4 80240CA4 00000000 */ nop -/* D8DEF8 80240CA8 4500000A */ bc1f .L80240CD4 -/* D8DEFC 80240CAC 24040001 */ addiu $a0, $zero, 1 -/* D8DF00 80240CB0 3C014387 */ lui $at, 0x4387 -/* D8DF04 80240CB4 44812000 */ mtc1 $at, $f4 -/* D8DF08 80240CB8 00000000 */ nop -/* D8DF0C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D8DF10 80240CC0 00000000 */ nop -/* D8DF14 80240CC4 45000004 */ bc1f .L80240CD8 -/* D8DF18 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 -/* D8DF1C 80240CCC 3C041000 */ lui $a0, 0x1000 -/* D8DF20 80240CD0 34840001 */ ori $a0, $a0, 1 -.L80240CD4: -/* D8DF24 80240CD4 27A20020 */ addiu $v0, $sp, 0x20 -.L80240CD8: -/* D8DF28 80240CD8 AFA20010 */ sw $v0, 0x10($sp) -/* D8DF2C 80240CDC 0000282D */ daddu $a1, $zero, $zero -/* D8DF30 80240CE0 00A0302D */ daddu $a2, $a1, $zero -/* D8DF34 80240CE4 0C0B7710 */ jal render_sprite -/* D8DF38 80240CE8 00A0382D */ daddu $a3, $a1, $zero -/* D8DF3C 80240CEC 26730001 */ addiu $s3, $s3, 1 -/* D8DF40 80240CF0 2A620002 */ slti $v0, $s3, 2 -/* D8DF44 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D8DF48 80240CF8 00000000 */ nop -/* D8DF4C 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) -/* D8DF50 80240D00 8FB60148 */ lw $s6, 0x148($sp) -/* D8DF54 80240D04 8FB50144 */ lw $s5, 0x144($sp) -/* D8DF58 80240D08 8FB40140 */ lw $s4, 0x140($sp) -/* D8DF5C 80240D0C 8FB3013C */ lw $s3, 0x13c($sp) -/* D8DF60 80240D10 8FB20138 */ lw $s2, 0x138($sp) -/* D8DF64 80240D14 8FB10134 */ lw $s1, 0x134($sp) -/* D8DF68 80240D18 8FB00130 */ lw $s0, 0x130($sp) -/* D8DF6C 80240D1C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D8DF70 80240D20 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D8DF74 80240D24 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D8DF78 80240D28 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D8DF7C 80240D2C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D8DF80 80240D30 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D8DF84 80240D34 03E00008 */ jr $ra -/* D8DF88 80240D38 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_80240D3C_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_80240D3C_D8D250.s deleted file mode 100644 index 6cfa0a9f95..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_80240D3C_D8D250.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_D8DF8C -/* D8DF8C 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8DF90 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D8DF94 80240D44 0080802D */ daddu $s0, $a0, $zero -/* D8DF98 80240D48 AFBF0014 */ sw $ra, 0x14($sp) -/* D8DF9C 80240D4C 8E020088 */ lw $v0, 0x88($s0) -/* D8DFA0 80240D50 14400017 */ bnez $v0, .L80240DB0 -/* D8DFA4 80240D54 24020001 */ addiu $v0, $zero, 1 -/* D8DFA8 80240D58 8E030084 */ lw $v1, 0x84($s0) -/* D8DFAC 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D8DFB0 80240D60 00000000 */ nop -/* D8DFB4 80240D64 28620002 */ slti $v0, $v1, 2 -/* D8DFB8 80240D68 50400005 */ beql $v0, $zero, .L80240D80 -/* D8DFBC 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* D8DFC0 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D8DFC4 80240D74 00000000 */ nop -/* D8DFC8 80240D78 08090378 */ j .L80240DE0 -/* D8DFCC 80240D7C 00000000 */ nop -.L80240D80: -/* D8DFD0 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D8DFD4 80240D84 00000000 */ nop -/* D8DFD8 80240D88 08090378 */ j .L80240DE0 -/* D8DFDC 80240D8C 00000000 */ nop -.L80240D90: -/* D8DFE0 80240D90 3C048024 */ lui $a0, 0x8024 -/* D8DFE4 80240D94 24840E84 */ addiu $a0, $a0, 0xe84 -/* D8DFE8 80240D98 08090374 */ j .L80240DD0 -/* D8DFEC 80240D9C 00000000 */ nop -.L80240DA0: -/* D8DFF0 80240DA0 3C048024 */ lui $a0, 0x8024 -/* D8DFF4 80240DA4 24840EEC */ addiu $a0, $a0, 0xeec -/* D8DFF8 80240DA8 08090374 */ j .L80240DD0 -/* D8DFFC 80240DAC 00000000 */ nop -.L80240DB0: -/* D8E000 80240DB0 8E020084 */ lw $v0, 0x84($s0) -/* D8E004 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D8E008 80240DB8 00000000 */ nop -/* D8E00C 80240DBC 28420002 */ slti $v0, $v0, 2 -/* D8E010 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D8E014 80240DC4 00000000 */ nop -.L80240DC8: -/* D8E018 80240DC8 3C048024 */ lui $a0, 0x8024 -/* D8E01C 80240DCC 24840EB8 */ addiu $a0, $a0, 0xeb8 -.L80240DD0: -/* D8E020 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 -/* D8E024 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* D8E028 80240DD8 8E03013C */ lw $v1, 0x13c($s0) -/* D8E02C 80240DDC AC620004 */ sw $v0, 4($v1) -.L80240DE0: -/* D8E030 80240DE0 0C00EAD2 */ jal get_npc_safe -/* D8E034 80240DE4 2404FFFC */ addiu $a0, $zero, -4 -/* D8E038 80240DE8 0040282D */ daddu $a1, $v0, $zero -/* D8E03C 80240DEC 10A00021 */ beqz $a1, .L80240E74 -/* D8E040 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* D8E044 80240DF4 8E020088 */ lw $v0, 0x88($s0) -/* D8E048 80240DF8 14400014 */ bnez $v0, .L80240E4C -/* D8E04C 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* D8E050 80240E00 8E040084 */ lw $a0, 0x84($s0) -/* D8E054 80240E04 10820016 */ beq $a0, $v0, .L80240E60 -/* D8E058 80240E08 28820002 */ slti $v0, $a0, 2 -/* D8E05C 80240E0C 10400005 */ beqz $v0, .L80240E24 -/* D8E060 80240E10 24020002 */ addiu $v0, $zero, 2 -/* D8E064 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D8E068 80240E18 00000000 */ nop -/* D8E06C 80240E1C 0809039D */ j .L80240E74 -/* D8E070 80240E20 00000000 */ nop -.L80240E24: -/* D8E074 80240E24 10820006 */ beq $a0, $v0, .L80240E40 -/* D8E078 80240E28 24020002 */ addiu $v0, $zero, 2 -/* D8E07C 80240E2C 0809039D */ j .L80240E74 -/* D8E080 80240E30 00000000 */ nop -.L80240E34: -/* D8E084 80240E34 8CA20000 */ lw $v0, ($a1) -/* D8E088 80240E38 0809039A */ j .L80240E68 -/* D8E08C 80240E3C 3C03000A */ lui $v1, 0xa -.L80240E40: -/* D8E090 80240E40 8CA20000 */ lw $v0, ($a1) -/* D8E094 80240E44 0809039A */ j .L80240E68 -/* D8E098 80240E48 3C030002 */ lui $v1, 2 -.L80240E4C: -/* D8E09C 80240E4C 8E020084 */ lw $v0, 0x84($s0) -/* D8E0A0 80240E50 04400007 */ bltz $v0, .L80240E70 -/* D8E0A4 80240E54 28420002 */ slti $v0, $v0, 2 -/* D8E0A8 80240E58 10400006 */ beqz $v0, .L80240E74 -/* D8E0AC 80240E5C 24020002 */ addiu $v0, $zero, 2 -.L80240E60: -/* D8E0B0 80240E60 8CA20000 */ lw $v0, ($a1) -/* D8E0B4 80240E64 3C030008 */ lui $v1, 8 -.L80240E68: -/* D8E0B8 80240E68 00431025 */ or $v0, $v0, $v1 -/* D8E0BC 80240E6C ACA20000 */ sw $v0, ($a1) -.L80240E70: -/* D8E0C0 80240E70 24020002 */ addiu $v0, $zero, 2 -.L80240E74: -/* D8E0C4 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* D8E0C8 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* D8E0CC 80240E7C 03E00008 */ jr $ra -/* D8E0D0 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_80240E84_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_80240E84_D8D250.s deleted file mode 100644 index e7a0fc0d4b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_80240E84_D8D250.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D8E0D4 -/* D8E0D4 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8E0D8 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D8E0DC 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D8E0E0 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D8E0E4 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D8E0E8 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D8E0EC 80240E9C 3C03000A */ lui $v1, 0xa -/* D8E0F0 80240EA0 8C820000 */ lw $v0, ($a0) -/* D8E0F4 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D8E0F8 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D8E0FC 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D8E100 80240EB0 03E00008 */ jr $ra -/* D8E104 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_80240EB8_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_80240EB8_D8D250.s deleted file mode 100644 index c70b3cbbde..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_80240EB8_D8D250.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D8E108 -/* D8E108 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8E10C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D8E110 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D8E114 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D8E118 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D8E11C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D8E120 80240ED0 3C030008 */ lui $v1, 8 -/* D8E124 80240ED4 8C820000 */ lw $v0, ($a0) -/* D8E128 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D8E12C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D8E130 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D8E134 80240EE4 03E00008 */ jr $ra -/* D8E138 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_80240EEC_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_80240EEC_D8D250.s deleted file mode 100644 index c6da5354e7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_80240EEC_D8D250.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D8E13C -/* D8E13C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8E140 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D8E144 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D8E148 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D8E14C 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D8E150 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D8E154 80240F04 3C030002 */ lui $v1, 2 -/* D8E158 80240F08 8C820000 */ lw $v0, ($a0) -/* D8E15C 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D8E160 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D8E164 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D8E168 80240F18 03E00008 */ jr $ra -/* D8E16C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_80240F20_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_80240F20_D8D250.s deleted file mode 100644 index c2fdc05fe9..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_80240F20_D8D250.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D8E170 -/* D8E170 80240F20 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D8E174 80240F24 AFB50024 */ sw $s5, 0x24($sp) -/* D8E178 80240F28 0080A82D */ daddu $s5, $a0, $zero -/* D8E17C 80240F2C AFBF002C */ sw $ra, 0x2c($sp) -/* D8E180 80240F30 AFB60028 */ sw $s6, 0x28($sp) -/* D8E184 80240F34 AFB40020 */ sw $s4, 0x20($sp) -/* D8E188 80240F38 AFB3001C */ sw $s3, 0x1c($sp) -/* D8E18C 80240F3C AFB20018 */ sw $s2, 0x18($sp) -/* D8E190 80240F40 AFB10014 */ sw $s1, 0x14($sp) -/* D8E194 80240F44 AFB00010 */ sw $s0, 0x10($sp) -/* D8E198 80240F48 F7B80040 */ sdc1 $f24, 0x40($sp) -/* D8E19C 80240F4C F7B60038 */ sdc1 $f22, 0x38($sp) -/* D8E1A0 80240F50 F7B40030 */ sdc1 $f20, 0x30($sp) -/* D8E1A4 80240F54 8EB30148 */ lw $s3, 0x148($s5) -/* D8E1A8 80240F58 86640008 */ lh $a0, 8($s3) -/* D8E1AC 80240F5C 0C00EABB */ jal get_npc_unsafe -/* D8E1B0 80240F60 00A0B02D */ daddu $s6, $a1, $zero -/* D8E1B4 80240F64 0040A02D */ daddu $s4, $v0, $zero -/* D8E1B8 80240F68 AEA00074 */ sw $zero, 0x74($s5) -/* D8E1BC 80240F6C C6980038 */ lwc1 $f24, 0x38($s4) -/* D8E1C0 80240F70 C6960040 */ lwc1 $f22, 0x40($s4) -/* D8E1C4 80240F74 0000902D */ daddu $s2, $zero, $zero -/* D8E1C8 80240F78 AEA00078 */ sw $zero, 0x78($s5) -/* D8E1CC 80240F7C 8E6300D0 */ lw $v1, 0xd0($s3) -/* D8E1D0 80240F80 8C620000 */ lw $v0, ($v1) -/* D8E1D4 80240F84 3C0146FF */ lui $at, 0x46ff -/* D8E1D8 80240F88 3421FE00 */ ori $at, $at, 0xfe00 -/* D8E1DC 80240F8C 4481A000 */ mtc1 $at, $f20 -/* D8E1E0 80240F90 18400018 */ blez $v0, .L80240FF4 -/* D8E1E4 80240F94 0240802D */ daddu $s0, $s2, $zero -/* D8E1E8 80240F98 0240882D */ daddu $s1, $s2, $zero -.L80240F9C: -/* D8E1EC 80240F9C 02231021 */ addu $v0, $s1, $v1 -/* D8E1F0 80240FA0 4600C306 */ mov.s $f12, $f24 -/* D8E1F4 80240FA4 C4440004 */ lwc1 $f4, 4($v0) -/* D8E1F8 80240FA8 46802120 */ cvt.s.w $f4, $f4 -/* D8E1FC 80240FAC 44062000 */ mfc1 $a2, $f4 -/* D8E200 80240FB0 C444000C */ lwc1 $f4, 0xc($v0) -/* D8E204 80240FB4 46802120 */ cvt.s.w $f4, $f4 -/* D8E208 80240FB8 44072000 */ mfc1 $a3, $f4 -/* D8E20C 80240FBC 0C00A7B5 */ jal dist2D -/* D8E210 80240FC0 4600B386 */ mov.s $f14, $f22 -/* D8E214 80240FC4 4614003C */ c.lt.s $f0, $f20 -/* D8E218 80240FC8 00000000 */ nop -/* D8E21C 80240FCC 45000003 */ bc1f .L80240FDC -/* D8E220 80240FD0 2631000C */ addiu $s1, $s1, 0xc -/* D8E224 80240FD4 46000506 */ mov.s $f20, $f0 -/* D8E228 80240FD8 AEB20078 */ sw $s2, 0x78($s5) -.L80240FDC: -/* D8E22C 80240FDC 8E6300D0 */ lw $v1, 0xd0($s3) -/* D8E230 80240FE0 26100001 */ addiu $s0, $s0, 1 -/* D8E234 80240FE4 8C620000 */ lw $v0, ($v1) -/* D8E238 80240FE8 0202102A */ slt $v0, $s0, $v0 -/* D8E23C 80240FEC 1440FFEB */ bnez $v0, .L80240F9C -/* D8E240 80240FF0 26520001 */ addiu $s2, $s2, 1 -.L80240FF4: -/* D8E244 80240FF4 8E6200CC */ lw $v0, 0xcc($s3) -/* D8E248 80240FF8 8C420004 */ lw $v0, 4($v0) -/* D8E24C 80240FFC AE820028 */ sw $v0, 0x28($s4) -/* D8E250 80241000 8E6200D0 */ lw $v0, 0xd0($s3) -/* D8E254 80241004 8C42007C */ lw $v0, 0x7c($v0) -/* D8E258 80241008 04410004 */ bgez $v0, .L8024101C -/* D8E25C 8024100C 00000000 */ nop -/* D8E260 80241010 C6C00000 */ lwc1 $f0, ($s6) -/* D8E264 80241014 0809040F */ j .L8024103C -/* D8E268 80241018 E6800018 */ swc1 $f0, 0x18($s4) -.L8024101C: -/* D8E26C 8024101C 3C018024 */ lui $at, 0x8024 -/* D8E270 80241020 D4223FE0 */ ldc1 $f2, 0x3fe0($at) -/* D8E274 80241024 44820000 */ mtc1 $v0, $f0 -/* D8E278 80241028 00000000 */ nop -/* D8E27C 8024102C 46800021 */ cvt.d.w $f0, $f0 -/* D8E280 80241030 46220003 */ div.d $f0, $f0, $f2 -/* D8E284 80241034 46200020 */ cvt.s.d $f0, $f0 -/* D8E288 80241038 E6800018 */ swc1 $f0, 0x18($s4) -.L8024103C: -/* D8E28C 8024103C 24020001 */ addiu $v0, $zero, 1 -/* D8E290 80241040 AEA20070 */ sw $v0, 0x70($s5) -/* D8E294 80241044 8FBF002C */ lw $ra, 0x2c($sp) -/* D8E298 80241048 8FB60028 */ lw $s6, 0x28($sp) -/* D8E29C 8024104C 8FB50024 */ lw $s5, 0x24($sp) -/* D8E2A0 80241050 8FB40020 */ lw $s4, 0x20($sp) -/* D8E2A4 80241054 8FB3001C */ lw $s3, 0x1c($sp) -/* D8E2A8 80241058 8FB20018 */ lw $s2, 0x18($sp) -/* D8E2AC 8024105C 8FB10014 */ lw $s1, 0x14($sp) -/* D8E2B0 80241060 8FB00010 */ lw $s0, 0x10($sp) -/* D8E2B4 80241064 D7B80040 */ ldc1 $f24, 0x40($sp) -/* D8E2B8 80241068 D7B60038 */ ldc1 $f22, 0x38($sp) -/* D8E2BC 8024106C D7B40030 */ ldc1 $f20, 0x30($sp) -/* D8E2C0 80241070 03E00008 */ jr $ra -/* D8E2C4 80241074 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_80241078_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_80241078_D8D250.s deleted file mode 100644 index 7c6e1add80..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_80241078_D8D250.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241078_D8E2C8 -/* D8E2C8 80241078 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* D8E2CC 8024107C AFB20038 */ sw $s2, 0x38($sp) -/* D8E2D0 80241080 0080902D */ daddu $s2, $a0, $zero -/* D8E2D4 80241084 AFBF0044 */ sw $ra, 0x44($sp) -/* D8E2D8 80241088 AFB40040 */ sw $s4, 0x40($sp) -/* D8E2DC 8024108C AFB3003C */ sw $s3, 0x3c($sp) -/* D8E2E0 80241090 AFB10034 */ sw $s1, 0x34($sp) -/* D8E2E4 80241094 AFB00030 */ sw $s0, 0x30($sp) -/* D8E2E8 80241098 F7B60050 */ sdc1 $f22, 0x50($sp) -/* D8E2EC 8024109C F7B40048 */ sdc1 $f20, 0x48($sp) -/* D8E2F0 802410A0 8E510148 */ lw $s1, 0x148($s2) -/* D8E2F4 802410A4 00A0982D */ daddu $s3, $a1, $zero -/* D8E2F8 802410A8 86240008 */ lh $a0, 8($s1) -/* D8E2FC 802410AC 0C00EABB */ jal get_npc_unsafe -/* D8E300 802410B0 00C0A02D */ daddu $s4, $a2, $zero -/* D8E304 802410B4 8E630014 */ lw $v1, 0x14($s3) -/* D8E308 802410B8 04600030 */ bltz $v1, .L8024117C -/* D8E30C 802410BC 0040802D */ daddu $s0, $v0, $zero -/* D8E310 802410C0 8E420074 */ lw $v0, 0x74($s2) -/* D8E314 802410C4 1C40002C */ bgtz $v0, .L80241178 -/* D8E318 802410C8 2442FFFF */ addiu $v0, $v0, -1 -/* D8E31C 802410CC 0280202D */ daddu $a0, $s4, $zero -/* D8E320 802410D0 AE430074 */ sw $v1, 0x74($s2) -/* D8E324 802410D4 AFA00010 */ sw $zero, 0x10($sp) -/* D8E328 802410D8 8E66000C */ lw $a2, 0xc($s3) -/* D8E32C 802410DC 8E670010 */ lw $a3, 0x10($s3) -/* D8E330 802410E0 0C01242D */ jal func_800490B4 -/* D8E334 802410E4 0220282D */ daddu $a1, $s1, $zero -/* D8E338 802410E8 10400021 */ beqz $v0, .L80241170 -/* D8E33C 802410EC 0000202D */ daddu $a0, $zero, $zero -/* D8E340 802410F0 0200282D */ daddu $a1, $s0, $zero -/* D8E344 802410F4 0000302D */ daddu $a2, $zero, $zero -/* D8E348 802410F8 860300A8 */ lh $v1, 0xa8($s0) -/* D8E34C 802410FC 3C013F80 */ lui $at, 0x3f80 -/* D8E350 80241100 44810000 */ mtc1 $at, $f0 -/* D8E354 80241104 3C014000 */ lui $at, 0x4000 -/* D8E358 80241108 44811000 */ mtc1 $at, $f2 -/* D8E35C 8024110C 3C01C1A0 */ lui $at, 0xc1a0 -/* D8E360 80241110 44812000 */ mtc1 $at, $f4 -/* D8E364 80241114 2402000F */ addiu $v0, $zero, 0xf -/* D8E368 80241118 AFA2001C */ sw $v0, 0x1c($sp) -/* D8E36C 8024111C 44833000 */ mtc1 $v1, $f6 -/* D8E370 80241120 00000000 */ nop -/* D8E374 80241124 468031A0 */ cvt.s.w $f6, $f6 -/* D8E378 80241128 44073000 */ mfc1 $a3, $f6 -/* D8E37C 8024112C 27A20028 */ addiu $v0, $sp, 0x28 -/* D8E380 80241130 AFA20020 */ sw $v0, 0x20($sp) -/* D8E384 80241134 E7A00010 */ swc1 $f0, 0x10($sp) -/* D8E388 80241138 E7A20014 */ swc1 $f2, 0x14($sp) -/* D8E38C 8024113C 0C01BFA4 */ jal fx_emote -/* D8E390 80241140 E7A40018 */ swc1 $f4, 0x18($sp) -/* D8E394 80241144 0200202D */ daddu $a0, $s0, $zero -/* D8E398 80241148 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D8E39C 8024114C 0C012530 */ jal func_800494C0 -/* D8E3A0 80241150 3C060020 */ lui $a2, 0x20 -/* D8E3A4 80241154 8E220018 */ lw $v0, 0x18($s1) -/* D8E3A8 80241158 9442002A */ lhu $v0, 0x2a($v0) -/* D8E3AC 8024115C 30420001 */ andi $v0, $v0, 1 -/* D8E3B0 80241160 14400064 */ bnez $v0, .L802412F4 -/* D8E3B4 80241164 2402000A */ addiu $v0, $zero, 0xa -/* D8E3B8 80241168 080904BD */ j .L802412F4 -/* D8E3BC 8024116C 2402000C */ addiu $v0, $zero, 0xc -.L80241170: -/* D8E3C0 80241170 8E420074 */ lw $v0, 0x74($s2) -/* D8E3C4 80241174 2442FFFF */ addiu $v0, $v0, -1 -.L80241178: -/* D8E3C8 80241178 AE420074 */ sw $v0, 0x74($s2) -.L8024117C: -/* D8E3CC 8024117C 8602008C */ lh $v0, 0x8c($s0) -/* D8E3D0 80241180 1440005D */ bnez $v0, .L802412F8 -/* D8E3D4 80241184 00000000 */ nop -/* D8E3D8 80241188 C6000018 */ lwc1 $f0, 0x18($s0) -/* D8E3DC 8024118C 3C014010 */ lui $at, 0x4010 -/* D8E3E0 80241190 44811800 */ mtc1 $at, $f3 -/* D8E3E4 80241194 44801000 */ mtc1 $zero, $f2 -/* D8E3E8 80241198 46000021 */ cvt.d.s $f0, $f0 -/* D8E3EC 8024119C 4622003C */ c.lt.d $f0, $f2 -/* D8E3F0 802411A0 00000000 */ nop -/* D8E3F4 802411A4 45000003 */ bc1f .L802411B4 -/* D8E3F8 802411A8 0200202D */ daddu $a0, $s0, $zero -/* D8E3FC 802411AC 0809046E */ j .L802411B8 -/* D8E400 802411B0 0000282D */ daddu $a1, $zero, $zero -.L802411B4: -/* D8E404 802411B4 24050001 */ addiu $a1, $zero, 1 -.L802411B8: -/* D8E408 802411B8 0C00F598 */ jal func_8003D660 -/* D8E40C 802411BC 00000000 */ nop -/* D8E410 802411C0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D8E414 802411C4 8E430078 */ lw $v1, 0x78($s2) -/* D8E418 802411C8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D8E41C 802411CC 00031040 */ sll $v0, $v1, 1 -/* D8E420 802411D0 00431021 */ addu $v0, $v0, $v1 -/* D8E424 802411D4 8E2300D0 */ lw $v1, 0xd0($s1) -/* D8E428 802411D8 00021080 */ sll $v0, $v0, 2 -/* D8E42C 802411DC 00431021 */ addu $v0, $v0, $v1 -/* D8E430 802411E0 C4560004 */ lwc1 $f22, 4($v0) -/* D8E434 802411E4 4680B5A0 */ cvt.s.w $f22, $f22 -/* D8E438 802411E8 C454000C */ lwc1 $f20, 0xc($v0) -/* D8E43C 802411EC 4680A520 */ cvt.s.w $f20, $f20 -/* D8E440 802411F0 4406B000 */ mfc1 $a2, $f22 -/* D8E444 802411F4 4407A000 */ mfc1 $a3, $f20 -/* D8E448 802411F8 0C00A720 */ jal atan2 -/* D8E44C 802411FC 00000000 */ nop -/* D8E450 80241200 8E050018 */ lw $a1, 0x18($s0) -/* D8E454 80241204 44060000 */ mfc1 $a2, $f0 -/* D8E458 80241208 0200202D */ daddu $a0, $s0, $zero -/* D8E45C 8024120C 0C00EA95 */ jal npc_move_heading -/* D8E460 80241210 AE06000C */ sw $a2, 0xc($s0) -/* D8E464 80241214 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D8E468 80241218 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D8E46C 8024121C 4406B000 */ mfc1 $a2, $f22 -/* D8E470 80241220 4407A000 */ mfc1 $a3, $f20 -/* D8E474 80241224 0C00A7B5 */ jal dist2D -/* D8E478 80241228 00000000 */ nop -/* D8E47C 8024122C C6020018 */ lwc1 $f2, 0x18($s0) -/* D8E480 80241230 4602003E */ c.le.s $f0, $f2 -/* D8E484 80241234 00000000 */ nop -/* D8E488 80241238 4500002F */ bc1f .L802412F8 -/* D8E48C 8024123C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* D8E490 80241240 24020002 */ addiu $v0, $zero, 2 -/* D8E494 80241244 0C00A67F */ jal rand_int -/* D8E498 80241248 AE420070 */ sw $v0, 0x70($s2) -/* D8E49C 8024124C 3C035555 */ lui $v1, 0x5555 -/* D8E4A0 80241250 34635556 */ ori $v1, $v1, 0x5556 -/* D8E4A4 80241254 00430018 */ mult $v0, $v1 -/* D8E4A8 80241258 000227C3 */ sra $a0, $v0, 0x1f -/* D8E4AC 8024125C 00004010 */ mfhi $t0 -/* D8E4B0 80241260 01042023 */ subu $a0, $t0, $a0 -/* D8E4B4 80241264 00041840 */ sll $v1, $a0, 1 -/* D8E4B8 80241268 00641821 */ addu $v1, $v1, $a0 -/* D8E4BC 8024126C 00431023 */ subu $v0, $v0, $v1 -/* D8E4C0 80241270 24430002 */ addiu $v1, $v0, 2 -/* D8E4C4 80241274 AE430074 */ sw $v1, 0x74($s2) -/* D8E4C8 80241278 8E62002C */ lw $v0, 0x2c($s3) -/* D8E4CC 8024127C 18400009 */ blez $v0, .L802412A4 -/* D8E4D0 80241280 24020004 */ addiu $v0, $zero, 4 -/* D8E4D4 80241284 8E620004 */ lw $v0, 4($s3) -/* D8E4D8 80241288 18400006 */ blez $v0, .L802412A4 -/* D8E4DC 8024128C 24020004 */ addiu $v0, $zero, 4 -/* D8E4E0 80241290 8E620008 */ lw $v0, 8($s3) -/* D8E4E4 80241294 18400003 */ blez $v0, .L802412A4 -/* D8E4E8 80241298 24020004 */ addiu $v0, $zero, 4 -/* D8E4EC 8024129C 14600002 */ bnez $v1, .L802412A8 -/* D8E4F0 802412A0 00000000 */ nop -.L802412A4: -/* D8E4F4 802412A4 AE420070 */ sw $v0, 0x70($s2) -.L802412A8: -/* D8E4F8 802412A8 0C00A67F */ jal rand_int -/* D8E4FC 802412AC 24042710 */ addiu $a0, $zero, 0x2710 -/* D8E500 802412B0 3C0351EB */ lui $v1, 0x51eb -/* D8E504 802412B4 3463851F */ ori $v1, $v1, 0x851f -/* D8E508 802412B8 00430018 */ mult $v0, $v1 -/* D8E50C 802412BC 00021FC3 */ sra $v1, $v0, 0x1f -/* D8E510 802412C0 00004010 */ mfhi $t0 -/* D8E514 802412C4 00082143 */ sra $a0, $t0, 5 -/* D8E518 802412C8 00832023 */ subu $a0, $a0, $v1 -/* D8E51C 802412CC 00041840 */ sll $v1, $a0, 1 -/* D8E520 802412D0 00641821 */ addu $v1, $v1, $a0 -/* D8E524 802412D4 000318C0 */ sll $v1, $v1, 3 -/* D8E528 802412D8 00641821 */ addu $v1, $v1, $a0 -/* D8E52C 802412DC 00031880 */ sll $v1, $v1, 2 -/* D8E530 802412E0 8E640004 */ lw $a0, 4($s3) -/* D8E534 802412E4 00431023 */ subu $v0, $v0, $v1 -/* D8E538 802412E8 0044102A */ slt $v0, $v0, $a0 -/* D8E53C 802412EC 10400002 */ beqz $v0, .L802412F8 -/* D8E540 802412F0 24020004 */ addiu $v0, $zero, 4 -.L802412F4: -/* D8E544 802412F4 AE420070 */ sw $v0, 0x70($s2) -.L802412F8: -/* D8E548 802412F8 8FBF0044 */ lw $ra, 0x44($sp) -/* D8E54C 802412FC 8FB40040 */ lw $s4, 0x40($sp) -/* D8E550 80241300 8FB3003C */ lw $s3, 0x3c($sp) -/* D8E554 80241304 8FB20038 */ lw $s2, 0x38($sp) -/* D8E558 80241308 8FB10034 */ lw $s1, 0x34($sp) -/* D8E55C 8024130C 8FB00030 */ lw $s0, 0x30($sp) -/* D8E560 80241310 D7B60050 */ ldc1 $f22, 0x50($sp) -/* D8E564 80241314 D7B40048 */ ldc1 $f20, 0x48($sp) -/* D8E568 80241318 03E00008 */ jr $ra -/* D8E56C 8024131C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_80241320_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_80241320_D8D250.s deleted file mode 100644 index aed6642c59..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_80241320_D8D250.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241320_D8E570 -/* D8E570 80241320 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D8E574 80241324 AFB3001C */ sw $s3, 0x1c($sp) -/* D8E578 80241328 0080982D */ daddu $s3, $a0, $zero -/* D8E57C 8024132C AFBF0020 */ sw $ra, 0x20($sp) -/* D8E580 80241330 AFB20018 */ sw $s2, 0x18($sp) -/* D8E584 80241334 AFB10014 */ sw $s1, 0x14($sp) -/* D8E588 80241338 AFB00010 */ sw $s0, 0x10($sp) -/* D8E58C 8024133C 8E720148 */ lw $s2, 0x148($s3) -/* D8E590 80241340 86440008 */ lh $a0, 8($s2) -/* D8E594 80241344 0C00EABB */ jal get_npc_unsafe -/* D8E598 80241348 00A0882D */ daddu $s1, $a1, $zero -/* D8E59C 8024134C 8E240008 */ lw $a0, 8($s1) -/* D8E5A0 80241350 0040802D */ daddu $s0, $v0, $zero -/* D8E5A4 80241354 00041FC2 */ srl $v1, $a0, 0x1f -/* D8E5A8 80241358 00832021 */ addu $a0, $a0, $v1 -/* D8E5AC 8024135C 00042043 */ sra $a0, $a0, 1 -/* D8E5B0 80241360 0C00A67F */ jal rand_int -/* D8E5B4 80241364 24840001 */ addiu $a0, $a0, 1 -/* D8E5B8 80241368 8E230008 */ lw $v1, 8($s1) -/* D8E5BC 8024136C 240400B4 */ addiu $a0, $zero, 0xb4 -/* D8E5C0 80241370 00032FC2 */ srl $a1, $v1, 0x1f -/* D8E5C4 80241374 00651821 */ addu $v1, $v1, $a1 -/* D8E5C8 80241378 00031843 */ sra $v1, $v1, 1 -/* D8E5CC 8024137C 00621821 */ addu $v1, $v1, $v0 -/* D8E5D0 80241380 0C00A67F */ jal rand_int -/* D8E5D4 80241384 A603008E */ sh $v1, 0x8e($s0) -/* D8E5D8 80241388 C60C000C */ lwc1 $f12, 0xc($s0) -/* D8E5DC 8024138C 44820000 */ mtc1 $v0, $f0 -/* D8E5E0 80241390 00000000 */ nop -/* D8E5E4 80241394 46800020 */ cvt.s.w $f0, $f0 -/* D8E5E8 80241398 46006300 */ add.s $f12, $f12, $f0 -/* D8E5EC 8024139C 3C0142B4 */ lui $at, 0x42b4 -/* D8E5F0 802413A0 44810000 */ mtc1 $at, $f0 -/* D8E5F4 802413A4 0C00A6C9 */ jal clamp_angle -/* D8E5F8 802413A8 46006301 */ sub.s $f12, $f12, $f0 -/* D8E5FC 802413AC E600000C */ swc1 $f0, 0xc($s0) -/* D8E600 802413B0 8E4200CC */ lw $v0, 0xcc($s2) -/* D8E604 802413B4 8C420000 */ lw $v0, ($v0) -/* D8E608 802413B8 AE020028 */ sw $v0, 0x28($s0) -/* D8E60C 802413BC 24020003 */ addiu $v0, $zero, 3 -/* D8E610 802413C0 AE620070 */ sw $v0, 0x70($s3) -/* D8E614 802413C4 8FBF0020 */ lw $ra, 0x20($sp) -/* D8E618 802413C8 8FB3001C */ lw $s3, 0x1c($sp) -/* D8E61C 802413CC 8FB20018 */ lw $s2, 0x18($sp) -/* D8E620 802413D0 8FB10014 */ lw $s1, 0x14($sp) -/* D8E624 802413D4 8FB00010 */ lw $s0, 0x10($sp) -/* D8E628 802413D8 03E00008 */ jr $ra -/* D8E62C 802413DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_802413E0_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_802413E0_D8D250.s deleted file mode 100644 index 4f57541f47..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_802413E0_D8D250.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413E0_D8E630 -/* D8E630 802413E0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D8E634 802413E4 AFB40040 */ sw $s4, 0x40($sp) -/* D8E638 802413E8 0080A02D */ daddu $s4, $a0, $zero -/* D8E63C 802413EC AFBF0044 */ sw $ra, 0x44($sp) -/* D8E640 802413F0 AFB3003C */ sw $s3, 0x3c($sp) -/* D8E644 802413F4 AFB20038 */ sw $s2, 0x38($sp) -/* D8E648 802413F8 AFB10034 */ sw $s1, 0x34($sp) -/* D8E64C 802413FC AFB00030 */ sw $s0, 0x30($sp) -/* D8E650 80241400 8E910148 */ lw $s1, 0x148($s4) -/* D8E654 80241404 00A0902D */ daddu $s2, $a1, $zero -/* D8E658 80241408 86240008 */ lh $a0, 8($s1) -/* D8E65C 8024140C 0C00EABB */ jal get_npc_unsafe -/* D8E660 80241410 00C0982D */ daddu $s3, $a2, $zero -/* D8E664 80241414 8E430014 */ lw $v1, 0x14($s2) -/* D8E668 80241418 04600031 */ bltz $v1, .L802414E0 -/* D8E66C 8024141C 0040802D */ daddu $s0, $v0, $zero -/* D8E670 80241420 0260202D */ daddu $a0, $s3, $zero -/* D8E674 80241424 AFA00010 */ sw $zero, 0x10($sp) -/* D8E678 80241428 8E460024 */ lw $a2, 0x24($s2) -/* D8E67C 8024142C 8E470028 */ lw $a3, 0x28($s2) -/* D8E680 80241430 0C01242D */ jal func_800490B4 -/* D8E684 80241434 0220282D */ daddu $a1, $s1, $zero -/* D8E688 80241438 10400029 */ beqz $v0, .L802414E0 -/* D8E68C 8024143C 0000202D */ daddu $a0, $zero, $zero -/* D8E690 80241440 0200282D */ daddu $a1, $s0, $zero -/* D8E694 80241444 0000302D */ daddu $a2, $zero, $zero -/* D8E698 80241448 860300A8 */ lh $v1, 0xa8($s0) -/* D8E69C 8024144C 3C013F80 */ lui $at, 0x3f80 -/* D8E6A0 80241450 44810000 */ mtc1 $at, $f0 -/* D8E6A4 80241454 3C014000 */ lui $at, 0x4000 -/* D8E6A8 80241458 44811000 */ mtc1 $at, $f2 -/* D8E6AC 8024145C 3C01C1A0 */ lui $at, 0xc1a0 -/* D8E6B0 80241460 44812000 */ mtc1 $at, $f4 -/* D8E6B4 80241464 2402000F */ addiu $v0, $zero, 0xf -/* D8E6B8 80241468 AFA2001C */ sw $v0, 0x1c($sp) -/* D8E6BC 8024146C 44833000 */ mtc1 $v1, $f6 -/* D8E6C0 80241470 00000000 */ nop -/* D8E6C4 80241474 468031A0 */ cvt.s.w $f6, $f6 -/* D8E6C8 80241478 44073000 */ mfc1 $a3, $f6 -/* D8E6CC 8024147C 27A20028 */ addiu $v0, $sp, 0x28 -/* D8E6D0 80241480 AFA20020 */ sw $v0, 0x20($sp) -/* D8E6D4 80241484 E7A00010 */ swc1 $f0, 0x10($sp) -/* D8E6D8 80241488 E7A20014 */ swc1 $f2, 0x14($sp) -/* D8E6DC 8024148C 0C01BFA4 */ jal fx_emote -/* D8E6E0 80241490 E7A40018 */ swc1 $f4, 0x18($sp) -/* D8E6E4 80241494 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D8E6E8 80241498 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D8E6EC 8024149C C60C0038 */ lwc1 $f12, 0x38($s0) -/* D8E6F0 802414A0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D8E6F4 802414A4 8C460028 */ lw $a2, 0x28($v0) -/* D8E6F8 802414A8 0C00A720 */ jal atan2 -/* D8E6FC 802414AC 8C470030 */ lw $a3, 0x30($v0) -/* D8E700 802414B0 0200202D */ daddu $a0, $s0, $zero -/* D8E704 802414B4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D8E708 802414B8 3C060020 */ lui $a2, 0x20 -/* D8E70C 802414BC 0C012530 */ jal func_800494C0 -/* D8E710 802414C0 E480000C */ swc1 $f0, 0xc($a0) -/* D8E714 802414C4 8E220018 */ lw $v0, 0x18($s1) -/* D8E718 802414C8 9442002A */ lhu $v0, 0x2a($v0) -/* D8E71C 802414CC 30420001 */ andi $v0, $v0, 1 -/* D8E720 802414D0 14400029 */ bnez $v0, .L80241578 -/* D8E724 802414D4 2402000A */ addiu $v0, $zero, 0xa -/* D8E728 802414D8 0809055E */ j .L80241578 -/* D8E72C 802414DC 2402000C */ addiu $v0, $zero, 0xc -.L802414E0: -/* D8E730 802414E0 8602008C */ lh $v0, 0x8c($s0) -/* D8E734 802414E4 14400025 */ bnez $v0, .L8024157C -/* D8E738 802414E8 00000000 */ nop -/* D8E73C 802414EC 9602008E */ lhu $v0, 0x8e($s0) -/* D8E740 802414F0 2442FFFF */ addiu $v0, $v0, -1 -/* D8E744 802414F4 A602008E */ sh $v0, 0x8e($s0) -/* D8E748 802414F8 00021400 */ sll $v0, $v0, 0x10 -/* D8E74C 802414FC 1440001F */ bnez $v0, .L8024157C -/* D8E750 80241500 00000000 */ nop -/* D8E754 80241504 8E820074 */ lw $v0, 0x74($s4) -/* D8E758 80241508 2442FFFF */ addiu $v0, $v0, -1 -/* D8E75C 8024150C 10400019 */ beqz $v0, .L80241574 -/* D8E760 80241510 AE820074 */ sw $v0, 0x74($s4) -/* D8E764 80241514 8E220018 */ lw $v0, 0x18($s1) -/* D8E768 80241518 9442002A */ lhu $v0, 0x2a($v0) -/* D8E76C 8024151C 30420010 */ andi $v0, $v0, 0x10 -/* D8E770 80241520 14400007 */ bnez $v0, .L80241540 -/* D8E774 80241524 00000000 */ nop -/* D8E778 80241528 C600000C */ lwc1 $f0, 0xc($s0) -/* D8E77C 8024152C 3C014334 */ lui $at, 0x4334 -/* D8E780 80241530 44816000 */ mtc1 $at, $f12 -/* D8E784 80241534 0C00A6C9 */ jal clamp_angle -/* D8E788 80241538 460C0300 */ add.s $f12, $f0, $f12 -/* D8E78C 8024153C E600000C */ swc1 $f0, 0xc($s0) -.L80241540: -/* D8E790 80241540 8E440008 */ lw $a0, 8($s2) -/* D8E794 80241544 000417C2 */ srl $v0, $a0, 0x1f -/* D8E798 80241548 00822021 */ addu $a0, $a0, $v0 -/* D8E79C 8024154C 00042043 */ sra $a0, $a0, 1 -/* D8E7A0 80241550 0C00A67F */ jal rand_int -/* D8E7A4 80241554 24840001 */ addiu $a0, $a0, 1 -/* D8E7A8 80241558 8E430008 */ lw $v1, 8($s2) -/* D8E7AC 8024155C 000327C2 */ srl $a0, $v1, 0x1f -/* D8E7B0 80241560 00641821 */ addu $v1, $v1, $a0 -/* D8E7B4 80241564 00031843 */ sra $v1, $v1, 1 -/* D8E7B8 80241568 00621821 */ addu $v1, $v1, $v0 -/* D8E7BC 8024156C 0809055F */ j .L8024157C -/* D8E7C0 80241570 A603008E */ sh $v1, 0x8e($s0) -.L80241574: -/* D8E7C4 80241574 24020004 */ addiu $v0, $zero, 4 -.L80241578: -/* D8E7C8 80241578 AE820070 */ sw $v0, 0x70($s4) -.L8024157C: -/* D8E7CC 8024157C 8FBF0044 */ lw $ra, 0x44($sp) -/* D8E7D0 80241580 8FB40040 */ lw $s4, 0x40($sp) -/* D8E7D4 80241584 8FB3003C */ lw $s3, 0x3c($sp) -/* D8E7D8 80241588 8FB20038 */ lw $s2, 0x38($sp) -/* D8E7DC 8024158C 8FB10034 */ lw $s1, 0x34($sp) -/* D8E7E0 80241590 8FB00030 */ lw $s0, 0x30($sp) -/* D8E7E4 80241594 03E00008 */ jr $ra -/* D8E7E8 80241598 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_8024159C_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_8024159C_D8D250.s deleted file mode 100644 index 1d3b09ac3b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_8024159C_D8D250.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024159C_D8E7EC -/* D8E7EC 8024159C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8E7F0 802415A0 AFB10014 */ sw $s1, 0x14($sp) -/* D8E7F4 802415A4 0080882D */ daddu $s1, $a0, $zero -/* D8E7F8 802415A8 AFBF001C */ sw $ra, 0x1c($sp) -/* D8E7FC 802415AC AFB20018 */ sw $s2, 0x18($sp) -/* D8E800 802415B0 AFB00010 */ sw $s0, 0x10($sp) -/* D8E804 802415B4 8E300148 */ lw $s0, 0x148($s1) -/* D8E808 802415B8 86040008 */ lh $a0, 8($s0) -/* D8E80C 802415BC 0C00EABB */ jal get_npc_unsafe -/* D8E810 802415C0 00A0902D */ daddu $s2, $a1, $zero -/* D8E814 802415C4 8E230078 */ lw $v1, 0x78($s1) -/* D8E818 802415C8 24630001 */ addiu $v1, $v1, 1 -/* D8E81C 802415CC AE230078 */ sw $v1, 0x78($s1) -/* D8E820 802415D0 8E0400D0 */ lw $a0, 0xd0($s0) -/* D8E824 802415D4 8C840000 */ lw $a0, ($a0) -/* D8E828 802415D8 0064182A */ slt $v1, $v1, $a0 -/* D8E82C 802415DC 14600002 */ bnez $v1, .L802415E8 -/* D8E830 802415E0 0040282D */ daddu $a1, $v0, $zero -/* D8E834 802415E4 AE200078 */ sw $zero, 0x78($s1) -.L802415E8: -/* D8E838 802415E8 8E0200CC */ lw $v0, 0xcc($s0) -/* D8E83C 802415EC 8C420004 */ lw $v0, 4($v0) -/* D8E840 802415F0 ACA20028 */ sw $v0, 0x28($a1) -/* D8E844 802415F4 8E0200D0 */ lw $v0, 0xd0($s0) -/* D8E848 802415F8 8C42007C */ lw $v0, 0x7c($v0) -/* D8E84C 802415FC 04410004 */ bgez $v0, .L80241610 -/* D8E850 80241600 00000000 */ nop -/* D8E854 80241604 C6400000 */ lwc1 $f0, ($s2) -/* D8E858 80241608 0809058C */ j .L80241630 -/* D8E85C 8024160C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241610: -/* D8E860 80241610 3C018024 */ lui $at, 0x8024 -/* D8E864 80241614 D4223FE8 */ ldc1 $f2, 0x3fe8($at) -/* D8E868 80241618 44820000 */ mtc1 $v0, $f0 -/* D8E86C 8024161C 00000000 */ nop -/* D8E870 80241620 46800021 */ cvt.d.w $f0, $f0 -/* D8E874 80241624 46220003 */ div.d $f0, $f0, $f2 -/* D8E878 80241628 46200020 */ cvt.s.d $f0, $f0 -/* D8E87C 8024162C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241630: -/* D8E880 80241630 24020001 */ addiu $v0, $zero, 1 -/* D8E884 80241634 AE220070 */ sw $v0, 0x70($s1) -/* D8E888 80241638 8FBF001C */ lw $ra, 0x1c($sp) -/* D8E88C 8024163C 8FB20018 */ lw $s2, 0x18($sp) -/* D8E890 80241640 8FB10014 */ lw $s1, 0x14($sp) -/* D8E894 80241644 8FB00010 */ lw $s0, 0x10($sp) -/* D8E898 80241648 03E00008 */ jr $ra -/* D8E89C 8024164C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_80241650_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_80241650_D8D250.s deleted file mode 100644 index 923c1785d3..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_80241650_D8D250.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241650_D8E8A0 -/* D8E8A0 80241650 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8E8A4 80241654 AFB10014 */ sw $s1, 0x14($sp) -/* D8E8A8 80241658 0080882D */ daddu $s1, $a0, $zero -/* D8E8AC 8024165C AFBF0018 */ sw $ra, 0x18($sp) -/* D8E8B0 80241660 AFB00010 */ sw $s0, 0x10($sp) -/* D8E8B4 80241664 8E300148 */ lw $s0, 0x148($s1) -/* D8E8B8 80241668 0C00EABB */ jal get_npc_unsafe -/* D8E8BC 8024166C 86040008 */ lh $a0, 8($s0) -/* D8E8C0 80241670 8E0300CC */ lw $v1, 0xcc($s0) -/* D8E8C4 80241674 3C014120 */ lui $at, 0x4120 -/* D8E8C8 80241678 44812000 */ mtc1 $at, $f4 -/* D8E8CC 8024167C 3C014000 */ lui $at, 0x4000 -/* D8E8D0 80241680 44810000 */ mtc1 $at, $f0 -/* D8E8D4 80241684 C442003C */ lwc1 $f2, 0x3c($v0) -/* D8E8D8 80241688 8C640010 */ lw $a0, 0x10($v1) -/* D8E8DC 8024168C 8C430000 */ lw $v1, ($v0) -/* D8E8E0 80241690 E444001C */ swc1 $f4, 0x1c($v0) -/* D8E8E4 80241694 E4400014 */ swc1 $f0, 0x14($v0) -/* D8E8E8 80241698 E4420064 */ swc1 $f2, 0x64($v0) -/* D8E8EC 8024169C 34630800 */ ori $v1, $v1, 0x800 -/* D8E8F0 802416A0 AC430000 */ sw $v1, ($v0) -/* D8E8F4 802416A4 AC440028 */ sw $a0, 0x28($v0) -/* D8E8F8 802416A8 2402000B */ addiu $v0, $zero, 0xb -/* D8E8FC 802416AC AE220070 */ sw $v0, 0x70($s1) -/* D8E900 802416B0 8FBF0018 */ lw $ra, 0x18($sp) -/* D8E904 802416B4 8FB10014 */ lw $s1, 0x14($sp) -/* D8E908 802416B8 8FB00010 */ lw $s0, 0x10($sp) -/* D8E90C 802416BC 03E00008 */ jr $ra -/* D8E910 802416C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_802416C4_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_802416C4_D8D250.s deleted file mode 100644 index 136e653f10..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_802416C4_D8D250.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416C4_D8E914 -/* D8E914 802416C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8E918 802416C8 AFB00010 */ sw $s0, 0x10($sp) -/* D8E91C 802416CC 0080802D */ daddu $s0, $a0, $zero -/* D8E920 802416D0 AFBF0014 */ sw $ra, 0x14($sp) -/* D8E924 802416D4 8E020148 */ lw $v0, 0x148($s0) -/* D8E928 802416D8 0C00EABB */ jal get_npc_unsafe -/* D8E92C 802416DC 84440008 */ lh $a0, 8($v0) -/* D8E930 802416E0 0040202D */ daddu $a0, $v0, $zero -/* D8E934 802416E4 C482003C */ lwc1 $f2, 0x3c($a0) -/* D8E938 802416E8 C480001C */ lwc1 $f0, 0x1c($a0) -/* D8E93C 802416EC 46001080 */ add.s $f2, $f2, $f0 -/* D8E940 802416F0 C4840014 */ lwc1 $f4, 0x14($a0) -/* D8E944 802416F4 46040001 */ sub.s $f0, $f0, $f4 -/* D8E948 802416F8 C4840064 */ lwc1 $f4, 0x64($a0) -/* D8E94C 802416FC 4602203C */ c.lt.s $f4, $f2 -/* D8E950 80241700 E482003C */ swc1 $f2, 0x3c($a0) -/* D8E954 80241704 45010009 */ bc1t .L8024172C -/* D8E958 80241708 E480001C */ swc1 $f0, 0x1c($a0) -/* D8E95C 8024170C 8C820000 */ lw $v0, ($a0) -/* D8E960 80241710 2403F7FF */ addiu $v1, $zero, -0x801 -/* D8E964 80241714 E484003C */ swc1 $f4, 0x3c($a0) -/* D8E968 80241718 AC80001C */ sw $zero, 0x1c($a0) -/* D8E96C 8024171C 00431024 */ and $v0, $v0, $v1 -/* D8E970 80241720 AC820000 */ sw $v0, ($a0) -/* D8E974 80241724 2402000C */ addiu $v0, $zero, 0xc -/* D8E978 80241728 AE020070 */ sw $v0, 0x70($s0) -.L8024172C: -/* D8E97C 8024172C 8FBF0014 */ lw $ra, 0x14($sp) -/* D8E980 80241730 8FB00010 */ lw $s0, 0x10($sp) -/* D8E984 80241734 03E00008 */ jr $ra -/* D8E988 80241738 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_8024173C_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_8024173C_D8D250.s deleted file mode 100644 index ba7e40e58d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_8024173C_D8D250.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024173C_D8E98C -/* D8E98C 8024173C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D8E990 80241740 AFB3001C */ sw $s3, 0x1c($sp) -/* D8E994 80241744 0080982D */ daddu $s3, $a0, $zero -/* D8E998 80241748 AFBF0020 */ sw $ra, 0x20($sp) -/* D8E99C 8024174C AFB20018 */ sw $s2, 0x18($sp) -/* D8E9A0 80241750 AFB10014 */ sw $s1, 0x14($sp) -/* D8E9A4 80241754 AFB00010 */ sw $s0, 0x10($sp) -/* D8E9A8 80241758 F7B40028 */ sdc1 $f20, 0x28($sp) -/* D8E9AC 8024175C 8E710148 */ lw $s1, 0x148($s3) -/* D8E9B0 80241760 86240008 */ lh $a0, 8($s1) -/* D8E9B4 80241764 0C00EABB */ jal get_npc_unsafe -/* D8E9B8 80241768 00A0802D */ daddu $s0, $a1, $zero -/* D8E9BC 8024176C 8E040020 */ lw $a0, 0x20($s0) -/* D8E9C0 80241770 0040902D */ daddu $s2, $v0, $zero -/* D8E9C4 80241774 00041FC2 */ srl $v1, $a0, 0x1f -/* D8E9C8 80241778 00832021 */ addu $a0, $a0, $v1 -/* D8E9CC 8024177C 00042043 */ sra $a0, $a0, 1 -/* D8E9D0 80241780 0C00A67F */ jal rand_int -/* D8E9D4 80241784 24840001 */ addiu $a0, $a0, 1 -/* D8E9D8 80241788 8E030020 */ lw $v1, 0x20($s0) -/* D8E9DC 8024178C C64C0038 */ lwc1 $f12, 0x38($s2) -/* D8E9E0 80241790 000327C2 */ srl $a0, $v1, 0x1f -/* D8E9E4 80241794 00641821 */ addu $v1, $v1, $a0 -/* D8E9E8 80241798 00031843 */ sra $v1, $v1, 1 -/* D8E9EC 8024179C 00621821 */ addu $v1, $v1, $v0 -/* D8E9F0 802417A0 A643008E */ sh $v1, 0x8e($s2) -/* D8E9F4 802417A4 8E2200CC */ lw $v0, 0xcc($s1) -/* D8E9F8 802417A8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* D8E9FC 802417AC 8C42000C */ lw $v0, 0xc($v0) -/* D8EA00 802417B0 AE420028 */ sw $v0, 0x28($s2) -/* D8EA04 802417B4 C6000018 */ lwc1 $f0, 0x18($s0) -/* D8EA08 802417B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D8EA0C 802417BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D8EA10 802417C0 E6400018 */ swc1 $f0, 0x18($s2) -/* D8EA14 802417C4 8C460028 */ lw $a2, 0x28($v0) -/* D8EA18 802417C8 0C00A720 */ jal atan2 -/* D8EA1C 802417CC 8C470030 */ lw $a3, 0x30($v0) -/* D8EA20 802417D0 46000506 */ mov.s $f20, $f0 -/* D8EA24 802417D4 C64C000C */ lwc1 $f12, 0xc($s2) -/* D8EA28 802417D8 0C00A70A */ jal get_clamped_angle_diff -/* D8EA2C 802417DC 4600A386 */ mov.s $f14, $f20 -/* D8EA30 802417E0 46000086 */ mov.s $f2, $f0 -/* D8EA34 802417E4 8E02001C */ lw $v0, 0x1c($s0) -/* D8EA38 802417E8 46001005 */ abs.s $f0, $f2 -/* D8EA3C 802417EC 44822000 */ mtc1 $v0, $f4 -/* D8EA40 802417F0 00000000 */ nop -/* D8EA44 802417F4 46802120 */ cvt.s.w $f4, $f4 -/* D8EA48 802417F8 4600203C */ c.lt.s $f4, $f0 -/* D8EA4C 802417FC 00000000 */ nop -/* D8EA50 80241800 4500000D */ bc1f .L80241838 -/* D8EA54 80241804 00000000 */ nop -/* D8EA58 80241808 44800000 */ mtc1 $zero, $f0 -/* D8EA5C 8024180C C654000C */ lwc1 $f20, 0xc($s2) -/* D8EA60 80241810 4600103C */ c.lt.s $f2, $f0 -/* D8EA64 80241814 00000000 */ nop -/* D8EA68 80241818 45000006 */ bc1f .L80241834 -/* D8EA6C 8024181C 00021023 */ negu $v0, $v0 -/* D8EA70 80241820 44820000 */ mtc1 $v0, $f0 -/* D8EA74 80241824 00000000 */ nop -/* D8EA78 80241828 46800020 */ cvt.s.w $f0, $f0 -/* D8EA7C 8024182C 0809060E */ j .L80241838 -/* D8EA80 80241830 4600A500 */ add.s $f20, $f20, $f0 -.L80241834: -/* D8EA84 80241834 4604A500 */ add.s $f20, $f20, $f4 -.L80241838: -/* D8EA88 80241838 0C00A6C9 */ jal clamp_angle -/* D8EA8C 8024183C 4600A306 */ mov.s $f12, $f20 -/* D8EA90 80241840 2402000D */ addiu $v0, $zero, 0xd -/* D8EA94 80241844 E640000C */ swc1 $f0, 0xc($s2) -/* D8EA98 80241848 AE620070 */ sw $v0, 0x70($s3) -/* D8EA9C 8024184C 8FBF0020 */ lw $ra, 0x20($sp) -/* D8EAA0 80241850 8FB3001C */ lw $s3, 0x1c($sp) -/* D8EAA4 80241854 8FB20018 */ lw $s2, 0x18($sp) -/* D8EAA8 80241858 8FB10014 */ lw $s1, 0x14($sp) -/* D8EAAC 8024185C 8FB00010 */ lw $s0, 0x10($sp) -/* D8EAB0 80241860 D7B40028 */ ldc1 $f20, 0x28($sp) -/* D8EAB4 80241864 03E00008 */ jr $ra -/* D8EAB8 80241868 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_802419F4_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_802419F4_D8D250.s deleted file mode 100644 index f22765049a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_802419F4_D8D250.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419F4_D8EC44 -/* D8EC44 802419F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8EC48 802419F8 AFB10014 */ sw $s1, 0x14($sp) -/* D8EC4C 802419FC 0080882D */ daddu $s1, $a0, $zero -/* D8EC50 80241A00 AFBF001C */ sw $ra, 0x1c($sp) -/* D8EC54 80241A04 AFB20018 */ sw $s2, 0x18($sp) -/* D8EC58 80241A08 AFB00010 */ sw $s0, 0x10($sp) -/* D8EC5C 80241A0C 8E300148 */ lw $s0, 0x148($s1) -/* D8EC60 80241A10 86040008 */ lh $a0, 8($s0) -/* D8EC64 80241A14 0C00EABB */ jal get_npc_unsafe -/* D8EC68 80241A18 00A0902D */ daddu $s2, $a1, $zero -/* D8EC6C 80241A1C 8E0300D0 */ lw $v1, 0xd0($s0) -/* D8EC70 80241A20 8E240078 */ lw $a0, 0x78($s1) -/* D8EC74 80241A24 8C630000 */ lw $v1, ($v1) -/* D8EC78 80241A28 0083182A */ slt $v1, $a0, $v1 -/* D8EC7C 80241A2C 10600013 */ beqz $v1, .L80241A7C -/* D8EC80 80241A30 0040302D */ daddu $a2, $v0, $zero -/* D8EC84 80241A34 00041040 */ sll $v0, $a0, 1 -/* D8EC88 80241A38 00441021 */ addu $v0, $v0, $a0 -/* D8EC8C 80241A3C 00022880 */ sll $a1, $v0, 2 -.L80241A40: -/* D8EC90 80241A40 8E0300D0 */ lw $v1, 0xd0($s0) -/* D8EC94 80241A44 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* D8EC98 80241A48 00A31021 */ addu $v0, $a1, $v1 -/* D8EC9C 80241A4C C4400008 */ lwc1 $f0, 8($v0) -/* D8ECA0 80241A50 46800020 */ cvt.s.w $f0, $f0 -/* D8ECA4 80241A54 4602003E */ c.le.s $f0, $f2 -/* D8ECA8 80241A58 00000000 */ nop -/* D8ECAC 80241A5C 45020003 */ bc1fl .L80241A6C -/* D8ECB0 80241A60 24840001 */ addiu $a0, $a0, 1 -/* D8ECB4 80241A64 0809069F */ j .L80241A7C -/* D8ECB8 80241A68 AE240078 */ sw $a0, 0x78($s1) -.L80241A6C: -/* D8ECBC 80241A6C 8C620000 */ lw $v0, ($v1) -/* D8ECC0 80241A70 0082102A */ slt $v0, $a0, $v0 -/* D8ECC4 80241A74 1440FFF2 */ bnez $v0, .L80241A40 -/* D8ECC8 80241A78 24A5000C */ addiu $a1, $a1, 0xc -.L80241A7C: -/* D8ECCC 80241A7C C6400000 */ lwc1 $f0, ($s2) -/* D8ECD0 80241A80 E4C00018 */ swc1 $f0, 0x18($a2) -/* D8ECD4 80241A84 8E0200CC */ lw $v0, 0xcc($s0) -/* D8ECD8 80241A88 8C420004 */ lw $v0, 4($v0) -/* D8ECDC 80241A8C ACC20028 */ sw $v0, 0x28($a2) -/* D8ECE0 80241A90 24020001 */ addiu $v0, $zero, 1 -/* D8ECE4 80241A94 AE200074 */ sw $zero, 0x74($s1) -/* D8ECE8 80241A98 AE220070 */ sw $v0, 0x70($s1) -/* D8ECEC 80241A9C 8FBF001C */ lw $ra, 0x1c($sp) -/* D8ECF0 80241AA0 8FB20018 */ lw $s2, 0x18($sp) -/* D8ECF4 80241AA4 8FB10014 */ lw $s1, 0x14($sp) -/* D8ECF8 80241AA8 8FB00010 */ lw $s0, 0x10($sp) -/* D8ECFC 80241AAC 03E00008 */ jr $ra -/* D8ED00 80241AB0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_80241AB4_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_80241AB4_D8D250.s deleted file mode 100644 index 0caa47e06a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_80241AB4_D8D250.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AB4_D8ED04 -/* D8ED04 80241AB4 27BDFF98 */ addiu $sp, $sp, -0x68 -/* D8ED08 80241AB8 AFB40058 */ sw $s4, 0x58($sp) -/* D8ED0C 80241ABC 0080A02D */ daddu $s4, $a0, $zero -/* D8ED10 80241AC0 AFBF0060 */ sw $ra, 0x60($sp) -/* D8ED14 80241AC4 AFB5005C */ sw $s5, 0x5c($sp) -/* D8ED18 80241AC8 AFB30054 */ sw $s3, 0x54($sp) -/* D8ED1C 80241ACC AFB20050 */ sw $s2, 0x50($sp) -/* D8ED20 80241AD0 AFB1004C */ sw $s1, 0x4c($sp) -/* D8ED24 80241AD4 AFB00048 */ sw $s0, 0x48($sp) -/* D8ED28 80241AD8 8E910148 */ lw $s1, 0x148($s4) -/* D8ED2C 80241ADC 86240008 */ lh $a0, 8($s1) -/* D8ED30 80241AE0 0C00EABB */ jal get_npc_unsafe -/* D8ED34 80241AE4 00A0802D */ daddu $s0, $a1, $zero -/* D8ED38 80241AE8 8E83000C */ lw $v1, 0xc($s4) -/* D8ED3C 80241AEC 0280202D */ daddu $a0, $s4, $zero -/* D8ED40 80241AF0 8C650000 */ lw $a1, ($v1) -/* D8ED44 80241AF4 0C0B1EAF */ jal get_variable -/* D8ED48 80241AF8 0040902D */ daddu $s2, $v0, $zero -/* D8ED4C 80241AFC AFA00018 */ sw $zero, 0x18($sp) -/* D8ED50 80241B00 8E2300D0 */ lw $v1, 0xd0($s1) -/* D8ED54 80241B04 8C630094 */ lw $v1, 0x94($v1) -/* D8ED58 80241B08 AFA3001C */ sw $v1, 0x1c($sp) -/* D8ED5C 80241B0C 8E2300D0 */ lw $v1, 0xd0($s1) -/* D8ED60 80241B10 8C630080 */ lw $v1, 0x80($v1) -/* D8ED64 80241B14 AFA30020 */ sw $v1, 0x20($sp) -/* D8ED68 80241B18 8E2300D0 */ lw $v1, 0xd0($s1) -/* D8ED6C 80241B1C 8C630088 */ lw $v1, 0x88($v1) -/* D8ED70 80241B20 AFA30024 */ sw $v1, 0x24($sp) -/* D8ED74 80241B24 8E2300D0 */ lw $v1, 0xd0($s1) -/* D8ED78 80241B28 8C63008C */ lw $v1, 0x8c($v1) -/* D8ED7C 80241B2C 27B50018 */ addiu $s5, $sp, 0x18 -/* D8ED80 80241B30 AFA30028 */ sw $v1, 0x28($sp) -/* D8ED84 80241B34 8E2300D0 */ lw $v1, 0xd0($s1) -/* D8ED88 80241B38 3C014282 */ lui $at, 0x4282 -/* D8ED8C 80241B3C 44810000 */ mtc1 $at, $f0 -/* D8ED90 80241B40 8C630090 */ lw $v1, 0x90($v1) -/* D8ED94 80241B44 0040982D */ daddu $s3, $v0, $zero -/* D8ED98 80241B48 E7A00030 */ swc1 $f0, 0x30($sp) -/* D8ED9C 80241B4C A7A00034 */ sh $zero, 0x34($sp) -/* D8EDA0 80241B50 16000005 */ bnez $s0, .L80241B68 -/* D8EDA4 80241B54 AFA3002C */ sw $v1, 0x2c($sp) -/* D8EDA8 80241B58 8E2200B0 */ lw $v0, 0xb0($s1) -/* D8EDAC 80241B5C 30420004 */ andi $v0, $v0, 4 -/* D8EDB0 80241B60 10400044 */ beqz $v0, .L80241C74 -/* D8EDB4 80241B64 00000000 */ nop -.L80241B68: -/* D8EDB8 80241B68 2404F7FF */ addiu $a0, $zero, -0x801 -/* D8EDBC 80241B6C AE800070 */ sw $zero, 0x70($s4) -/* D8EDC0 80241B70 A640008E */ sh $zero, 0x8e($s2) -/* D8EDC4 80241B74 8E2200CC */ lw $v0, 0xcc($s1) -/* D8EDC8 80241B78 8E430000 */ lw $v1, ($s2) -/* D8EDCC 80241B7C 8C420000 */ lw $v0, ($v0) -/* D8EDD0 80241B80 00641824 */ and $v1, $v1, $a0 -/* D8EDD4 80241B84 AE430000 */ sw $v1, ($s2) -/* D8EDD8 80241B88 AE420028 */ sw $v0, 0x28($s2) -/* D8EDDC 80241B8C 8E2200D0 */ lw $v0, 0xd0($s1) -/* D8EDE0 80241B90 8C420098 */ lw $v0, 0x98($v0) -/* D8EDE4 80241B94 54400005 */ bnel $v0, $zero, .L80241BAC -/* D8EDE8 80241B98 2402FDFF */ addiu $v0, $zero, -0x201 -/* D8EDEC 80241B9C 34620200 */ ori $v0, $v1, 0x200 -/* D8EDF0 80241BA0 2403FFF7 */ addiu $v1, $zero, -9 -/* D8EDF4 80241BA4 080906ED */ j .L80241BB4 -/* D8EDF8 80241BA8 00431024 */ and $v0, $v0, $v1 -.L80241BAC: -/* D8EDFC 80241BAC 00621024 */ and $v0, $v1, $v0 -/* D8EE00 80241BB0 34420008 */ ori $v0, $v0, 8 -.L80241BB4: -/* D8EE04 80241BB4 AE420000 */ sw $v0, ($s2) -/* D8EE08 80241BB8 8E2200B0 */ lw $v0, 0xb0($s1) -/* D8EE0C 80241BBC 30420004 */ andi $v0, $v0, 4 -/* D8EE10 80241BC0 10400008 */ beqz $v0, .L80241BE4 -/* D8EE14 80241BC4 24020063 */ addiu $v0, $zero, 0x63 -/* D8EE18 80241BC8 AE820070 */ sw $v0, 0x70($s4) -/* D8EE1C 80241BCC AE800074 */ sw $zero, 0x74($s4) -/* D8EE20 80241BD0 8E2200B0 */ lw $v0, 0xb0($s1) -/* D8EE24 80241BD4 2403FFFB */ addiu $v1, $zero, -5 -/* D8EE28 80241BD8 00431024 */ and $v0, $v0, $v1 -/* D8EE2C 80241BDC 08090704 */ j .L80241C10 -/* D8EE30 80241BE0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241BE4: -/* D8EE34 80241BE4 8E220000 */ lw $v0, ($s1) -/* D8EE38 80241BE8 3C034000 */ lui $v1, 0x4000 -/* D8EE3C 80241BEC 00431024 */ and $v0, $v0, $v1 -/* D8EE40 80241BF0 10400007 */ beqz $v0, .L80241C10 -/* D8EE44 80241BF4 3C03BFFF */ lui $v1, 0xbfff -/* D8EE48 80241BF8 2402000C */ addiu $v0, $zero, 0xc -/* D8EE4C 80241BFC AE820070 */ sw $v0, 0x70($s4) -/* D8EE50 80241C00 8E220000 */ lw $v0, ($s1) -/* D8EE54 80241C04 3463FFFF */ ori $v1, $v1, 0xffff -/* D8EE58 80241C08 00431024 */ and $v0, $v0, $v1 -/* D8EE5C 80241C0C AE220000 */ sw $v0, ($s1) -.L80241C10: -/* D8EE60 80241C10 27A50038 */ addiu $a1, $sp, 0x38 -/* D8EE64 80241C14 27A6003C */ addiu $a2, $sp, 0x3c -/* D8EE68 80241C18 C6400038 */ lwc1 $f0, 0x38($s2) -/* D8EE6C 80241C1C 864200A8 */ lh $v0, 0xa8($s2) -/* D8EE70 80241C20 3C0142C8 */ lui $at, 0x42c8 -/* D8EE74 80241C24 44812000 */ mtc1 $at, $f4 -/* D8EE78 80241C28 44823000 */ mtc1 $v0, $f6 -/* D8EE7C 80241C2C 00000000 */ nop -/* D8EE80 80241C30 468031A0 */ cvt.s.w $f6, $f6 -/* D8EE84 80241C34 27A20044 */ addiu $v0, $sp, 0x44 -/* D8EE88 80241C38 E7A00038 */ swc1 $f0, 0x38($sp) -/* D8EE8C 80241C3C C640003C */ lwc1 $f0, 0x3c($s2) -/* D8EE90 80241C40 C6420040 */ lwc1 $f2, 0x40($s2) -/* D8EE94 80241C44 46060000 */ add.s $f0, $f0, $f6 -/* D8EE98 80241C48 E7A40044 */ swc1 $f4, 0x44($sp) -/* D8EE9C 80241C4C E7A20040 */ swc1 $f2, 0x40($sp) -/* D8EEA0 80241C50 E7A0003C */ swc1 $f0, 0x3c($sp) -/* D8EEA4 80241C54 AFA20010 */ sw $v0, 0x10($sp) -/* D8EEA8 80241C58 8E440080 */ lw $a0, 0x80($s2) -/* D8EEAC 80241C5C 0C0372DF */ jal func_800DCB7C -/* D8EEB0 80241C60 27A70040 */ addiu $a3, $sp, 0x40 -/* D8EEB4 80241C64 10400003 */ beqz $v0, .L80241C74 -/* D8EEB8 80241C68 00000000 */ nop -/* D8EEBC 80241C6C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* D8EEC0 80241C70 E640003C */ swc1 $f0, 0x3c($s2) -.L80241C74: -/* D8EEC4 80241C74 8E830070 */ lw $v1, 0x70($s4) -/* D8EEC8 80241C78 2C620064 */ sltiu $v0, $v1, 0x64 -/* D8EECC 80241C7C 10400042 */ beqz $v0, .L80241D88 -/* D8EED0 80241C80 00031080 */ sll $v0, $v1, 2 -/* D8EED4 80241C84 3C018024 */ lui $at, 0x8024 -/* D8EED8 80241C88 00220821 */ addu $at, $at, $v0 -/* D8EEDC 80241C8C 8C223FF0 */ lw $v0, 0x3ff0($at) -/* D8EEE0 80241C90 00400008 */ jr $v0 -/* D8EEE4 80241C94 00000000 */ nop -/* D8EEE8 80241C98 0280202D */ daddu $a0, $s4, $zero -/* D8EEEC 80241C9C 0260282D */ daddu $a1, $s3, $zero -/* D8EEF0 80241CA0 0C0903C8 */ jal func_80240F20 -/* D8EEF4 80241CA4 02A0302D */ daddu $a2, $s5, $zero -/* D8EEF8 80241CA8 0280202D */ daddu $a0, $s4, $zero -/* D8EEFC 80241CAC 0260282D */ daddu $a1, $s3, $zero -/* D8EF00 80241CB0 0C09041E */ jal func_80241078 -/* D8EF04 80241CB4 02A0302D */ daddu $a2, $s5, $zero -/* D8EF08 80241CB8 08090762 */ j .L80241D88 -/* D8EF0C 80241CBC 00000000 */ nop -/* D8EF10 80241CC0 0280202D */ daddu $a0, $s4, $zero -/* D8EF14 80241CC4 0260282D */ daddu $a1, $s3, $zero -/* D8EF18 80241CC8 0C0904C8 */ jal func_80241320 -/* D8EF1C 80241CCC 02A0302D */ daddu $a2, $s5, $zero -/* D8EF20 80241CD0 0280202D */ daddu $a0, $s4, $zero -/* D8EF24 80241CD4 0260282D */ daddu $a1, $s3, $zero -/* D8EF28 80241CD8 0C0904F8 */ jal func_802413E0 -/* D8EF2C 80241CDC 02A0302D */ daddu $a2, $s5, $zero -/* D8EF30 80241CE0 08090762 */ j .L80241D88 -/* D8EF34 80241CE4 00000000 */ nop -/* D8EF38 80241CE8 0280202D */ daddu $a0, $s4, $zero -/* D8EF3C 80241CEC 0260282D */ daddu $a1, $s3, $zero -/* D8EF40 80241CF0 0C090567 */ jal func_8024159C -/* D8EF44 80241CF4 02A0302D */ daddu $a2, $s5, $zero -/* D8EF48 80241CF8 08090762 */ j .L80241D88 -/* D8EF4C 80241CFC 00000000 */ nop -/* D8EF50 80241D00 0280202D */ daddu $a0, $s4, $zero -/* D8EF54 80241D04 0260282D */ daddu $a1, $s3, $zero -/* D8EF58 80241D08 0C090594 */ jal func_80241650 -/* D8EF5C 80241D0C 02A0302D */ daddu $a2, $s5, $zero -/* D8EF60 80241D10 0280202D */ daddu $a0, $s4, $zero -/* D8EF64 80241D14 0260282D */ daddu $a1, $s3, $zero -/* D8EF68 80241D18 0C0905B1 */ jal func_802416C4 -/* D8EF6C 80241D1C 02A0302D */ daddu $a2, $s5, $zero -/* D8EF70 80241D20 08090762 */ j .L80241D88 -/* D8EF74 80241D24 00000000 */ nop -/* D8EF78 80241D28 0280202D */ daddu $a0, $s4, $zero -/* D8EF7C 80241D2C 0260282D */ daddu $a1, $s3, $zero -/* D8EF80 80241D30 0C0905CF */ jal func_8024173C -/* D8EF84 80241D34 02A0302D */ daddu $a2, $s5, $zero -/* D8EF88 80241D38 0280202D */ daddu $a0, $s4, $zero -/* D8EF8C 80241D3C 0260282D */ daddu $a1, $s3, $zero -/* D8EF90 80241D40 0C09061B */ jal func_8024186C -/* D8EF94 80241D44 02A0302D */ daddu $a2, $s5, $zero -/* D8EF98 80241D48 08090762 */ j .L80241D88 -/* D8EF9C 80241D4C 00000000 */ nop -/* D8EFA0 80241D50 0280202D */ daddu $a0, $s4, $zero -/* D8EFA4 80241D54 0260282D */ daddu $a1, $s3, $zero -/* D8EFA8 80241D58 0C090663 */ jal func_8024198C -/* D8EFAC 80241D5C 02A0302D */ daddu $a2, $s5, $zero -/* D8EFB0 80241D60 08090762 */ j .L80241D88 -/* D8EFB4 80241D64 00000000 */ nop -/* D8EFB8 80241D68 0280202D */ daddu $a0, $s4, $zero -/* D8EFBC 80241D6C 0260282D */ daddu $a1, $s3, $zero -/* D8EFC0 80241D70 0C09067D */ jal func_802419F4 -/* D8EFC4 80241D74 02A0302D */ daddu $a2, $s5, $zero -/* D8EFC8 80241D78 08090762 */ j .L80241D88 -/* D8EFCC 80241D7C 00000000 */ nop -/* D8EFD0 80241D80 0C0129CF */ jal func_8004A73C -/* D8EFD4 80241D84 0280202D */ daddu $a0, $s4, $zero -.L80241D88: -/* D8EFD8 80241D88 8FBF0060 */ lw $ra, 0x60($sp) -/* D8EFDC 80241D8C 8FB5005C */ lw $s5, 0x5c($sp) -/* D8EFE0 80241D90 8FB40058 */ lw $s4, 0x58($sp) -/* D8EFE4 80241D94 8FB30054 */ lw $s3, 0x54($sp) -/* D8EFE8 80241D98 8FB20050 */ lw $s2, 0x50($sp) -/* D8EFEC 80241D9C 8FB1004C */ lw $s1, 0x4c($sp) -/* D8EFF0 80241DA0 8FB00048 */ lw $s0, 0x48($sp) -/* D8EFF4 80241DA4 0000102D */ daddu $v0, $zero, $zero -/* D8EFF8 80241DA8 03E00008 */ jr $ra -/* D8EFFC 80241DAC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_80241E1C_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_80241E1C_D8D250.s deleted file mode 100644 index 130c95ae9e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_80241E1C_D8D250.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E1C_D8F06C -/* D8F06C 80241E1C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8F070 80241E20 AFB10014 */ sw $s1, 0x14($sp) -/* D8F074 80241E24 0080882D */ daddu $s1, $a0, $zero -/* D8F078 80241E28 AFBF0018 */ sw $ra, 0x18($sp) -/* D8F07C 80241E2C AFB00010 */ sw $s0, 0x10($sp) -/* D8F080 80241E30 8E300148 */ lw $s0, 0x148($s1) -/* D8F084 80241E34 0C00EABB */ jal get_npc_unsafe -/* D8F088 80241E38 86040008 */ lh $a0, 8($s0) -/* D8F08C 80241E3C 0040202D */ daddu $a0, $v0, $zero -/* D8F090 80241E40 9482008E */ lhu $v0, 0x8e($a0) -/* D8F094 80241E44 2442FFFF */ addiu $v0, $v0, -1 -/* D8F098 80241E48 A482008E */ sh $v0, 0x8e($a0) -/* D8F09C 80241E4C 00021400 */ sll $v0, $v0, 0x10 -/* D8F0A0 80241E50 1C400009 */ bgtz $v0, .L80241E78 -/* D8F0A4 80241E54 24020003 */ addiu $v0, $zero, 3 -/* D8F0A8 80241E58 96030076 */ lhu $v1, 0x76($s0) -/* D8F0AC 80241E5C AE02006C */ sw $v0, 0x6c($s0) -/* D8F0B0 80241E60 A483008E */ sh $v1, 0x8e($a0) -/* D8F0B4 80241E64 8E0200CC */ lw $v0, 0xcc($s0) -/* D8F0B8 80241E68 8C420024 */ lw $v0, 0x24($v0) -/* D8F0BC 80241E6C AC820028 */ sw $v0, 0x28($a0) -/* D8F0C0 80241E70 24020020 */ addiu $v0, $zero, 0x20 -/* D8F0C4 80241E74 AE220070 */ sw $v0, 0x70($s1) -.L80241E78: -/* D8F0C8 80241E78 8FBF0018 */ lw $ra, 0x18($sp) -/* D8F0CC 80241E7C 8FB10014 */ lw $s1, 0x14($sp) -/* D8F0D0 80241E80 8FB00010 */ lw $s0, 0x10($sp) -/* D8F0D4 80241E84 03E00008 */ jr $ra -/* D8F0D8 80241E88 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_80241E8C_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_80241E8C_D8D250.s deleted file mode 100644 index 64766a8fe7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_80241E8C_D8D250.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E8C_D8F0DC -/* D8F0DC 80241E8C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D8F0E0 80241E90 AFB10034 */ sw $s1, 0x34($sp) -/* D8F0E4 80241E94 0080882D */ daddu $s1, $a0, $zero -/* D8F0E8 80241E98 AFBF0038 */ sw $ra, 0x38($sp) -/* D8F0EC 80241E9C AFB00030 */ sw $s0, 0x30($sp) -/* D8F0F0 80241EA0 8E300148 */ lw $s0, 0x148($s1) -/* D8F0F4 80241EA4 0C00EABB */ jal get_npc_unsafe -/* D8F0F8 80241EA8 86040008 */ lh $a0, 8($s0) -/* D8F0FC 80241EAC 0040282D */ daddu $a1, $v0, $zero -/* D8F100 80241EB0 94A2008E */ lhu $v0, 0x8e($a1) -/* D8F104 80241EB4 2442FFFF */ addiu $v0, $v0, -1 -/* D8F108 80241EB8 A4A2008E */ sh $v0, 0x8e($a1) -/* D8F10C 80241EBC 00021400 */ sll $v0, $v0, 0x10 -/* D8F110 80241EC0 1C400023 */ bgtz $v0, .L80241F50 -/* D8F114 80241EC4 24020004 */ addiu $v0, $zero, 4 -/* D8F118 80241EC8 8E0300CC */ lw $v1, 0xcc($s0) -/* D8F11C 80241ECC AE02006C */ sw $v0, 0x6c($s0) -/* D8F120 80241ED0 8C620000 */ lw $v0, ($v1) -/* D8F124 80241ED4 ACA20028 */ sw $v0, 0x28($a1) -/* D8F128 80241ED8 9602007A */ lhu $v0, 0x7a($s0) -/* D8F12C 80241EDC A4A2008E */ sh $v0, 0x8e($a1) -/* D8F130 80241EE0 8E020078 */ lw $v0, 0x78($s0) -/* D8F134 80241EE4 28420008 */ slti $v0, $v0, 8 -/* D8F138 80241EE8 14400018 */ bnez $v0, .L80241F4C -/* D8F13C 80241EEC 24020021 */ addiu $v0, $zero, 0x21 -/* D8F140 80241EF0 24040003 */ addiu $a0, $zero, 3 -/* D8F144 80241EF4 27A30028 */ addiu $v1, $sp, 0x28 -/* D8F148 80241EF8 84A700A8 */ lh $a3, 0xa8($a1) -/* D8F14C 80241EFC 3C013F80 */ lui $at, 0x3f80 -/* D8F150 80241F00 44810000 */ mtc1 $at, $f0 -/* D8F154 80241F04 3C014000 */ lui $at, 0x4000 -/* D8F158 80241F08 44811000 */ mtc1 $at, $f2 -/* D8F15C 80241F0C 3C01C1A0 */ lui $at, 0xc1a0 -/* D8F160 80241F10 44812000 */ mtc1 $at, $f4 -/* D8F164 80241F14 44873000 */ mtc1 $a3, $f6 -/* D8F168 80241F18 00000000 */ nop -/* D8F16C 80241F1C 468031A0 */ cvt.s.w $f6, $f6 -/* D8F170 80241F20 E7A00010 */ swc1 $f0, 0x10($sp) -/* D8F174 80241F24 E7A20014 */ swc1 $f2, 0x14($sp) -/* D8F178 80241F28 E7A40018 */ swc1 $f4, 0x18($sp) -/* D8F17C 80241F2C 8E020078 */ lw $v0, 0x78($s0) -/* D8F180 80241F30 44073000 */ mfc1 $a3, $f6 -/* D8F184 80241F34 0000302D */ daddu $a2, $zero, $zero -/* D8F188 80241F38 AFA30020 */ sw $v1, 0x20($sp) -/* D8F18C 80241F3C 2442FFFF */ addiu $v0, $v0, -1 -/* D8F190 80241F40 0C01BFA4 */ jal fx_emote -/* D8F194 80241F44 AFA2001C */ sw $v0, 0x1c($sp) -/* D8F198 80241F48 24020021 */ addiu $v0, $zero, 0x21 -.L80241F4C: -/* D8F19C 80241F4C AE220070 */ sw $v0, 0x70($s1) -.L80241F50: -/* D8F1A0 80241F50 8FBF0038 */ lw $ra, 0x38($sp) -/* D8F1A4 80241F54 8FB10034 */ lw $s1, 0x34($sp) -/* D8F1A8 80241F58 8FB00030 */ lw $s0, 0x30($sp) -/* D8F1AC 80241F5C 03E00008 */ jr $ra -/* D8F1B0 80241F60 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_8024216C_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_8024216C_D8D250.s deleted file mode 100644 index 35d2c3c879..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_8024216C_D8D250.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024216C_D8F3BC -/* D8F3BC 8024216C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D8F3C0 80242170 AFB40028 */ sw $s4, 0x28($sp) -/* D8F3C4 80242174 0080A02D */ daddu $s4, $a0, $zero -/* D8F3C8 80242178 AFBF002C */ sw $ra, 0x2c($sp) -/* D8F3CC 8024217C AFB30024 */ sw $s3, 0x24($sp) -/* D8F3D0 80242180 AFB20020 */ sw $s2, 0x20($sp) -/* D8F3D4 80242184 AFB1001C */ sw $s1, 0x1c($sp) -/* D8F3D8 80242188 AFB00018 */ sw $s0, 0x18($sp) -/* D8F3DC 8024218C 8E910148 */ lw $s1, 0x148($s4) -/* D8F3E0 80242190 86240008 */ lh $a0, 8($s1) -/* D8F3E4 80242194 0C00EABB */ jal get_npc_unsafe -/* D8F3E8 80242198 00A0802D */ daddu $s0, $a1, $zero -/* D8F3EC 8024219C 16000005 */ bnez $s0, .L802421B4 -/* D8F3F0 802421A0 0040902D */ daddu $s2, $v0, $zero -/* D8F3F4 802421A4 8E2200B0 */ lw $v0, 0xb0($s1) -/* D8F3F8 802421A8 30420004 */ andi $v0, $v0, 4 -/* D8F3FC 802421AC 10400015 */ beqz $v0, .L80242204 -/* D8F400 802421B0 00000000 */ nop -.L802421B4: -/* D8F404 802421B4 AE800070 */ sw $zero, 0x70($s4) -/* D8F408 802421B8 8E420000 */ lw $v0, ($s2) -/* D8F40C 802421BC 3C031F30 */ lui $v1, 0x1f30 -/* D8F410 802421C0 A640008E */ sh $zero, 0x8e($s2) -/* D8F414 802421C4 34420102 */ ori $v0, $v0, 0x102 -/* D8F418 802421C8 AE420000 */ sw $v0, ($s2) -/* D8F41C 802421CC 8E220000 */ lw $v0, ($s1) -/* D8F420 802421D0 3C01C47A */ lui $at, 0xc47a -/* D8F424 802421D4 44810000 */ mtc1 $at, $f0 -/* D8F428 802421D8 00431025 */ or $v0, $v0, $v1 -/* D8F42C 802421DC AE220000 */ sw $v0, ($s1) -/* D8F430 802421E0 AE400038 */ sw $zero, 0x38($s2) -/* D8F434 802421E4 E640003C */ swc1 $f0, 0x3c($s2) -/* D8F438 802421E8 AE400040 */ sw $zero, 0x40($s2) -/* D8F43C 802421EC 8E2300B0 */ lw $v1, 0xb0($s1) -/* D8F440 802421F0 30620004 */ andi $v0, $v1, 4 -/* D8F444 802421F4 10400003 */ beqz $v0, .L80242204 -/* D8F448 802421F8 2402FFFB */ addiu $v0, $zero, -5 -/* D8F44C 802421FC 00621024 */ and $v0, $v1, $v0 -/* D8F450 80242200 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242204: -/* D8F454 80242204 8E930070 */ lw $s3, 0x70($s4) -/* D8F458 80242208 12600005 */ beqz $s3, .L80242220 -/* D8F45C 8024220C 24020001 */ addiu $v0, $zero, 1 -/* D8F460 80242210 12620048 */ beq $s3, $v0, .L80242334 -/* D8F464 80242214 00000000 */ nop -/* D8F468 80242218 080908EA */ j .L802423A8 -/* D8F46C 8024221C 00000000 */ nop -.L80242220: -/* D8F470 80242220 86240008 */ lh $a0, 8($s1) -/* D8F474 80242224 0C00FB3A */ jal get_enemy -/* D8F478 80242228 2484FFFF */ addiu $a0, $a0, -1 -/* D8F47C 8024222C 0040802D */ daddu $s0, $v0, $zero -/* D8F480 80242230 0C00EABB */ jal get_npc_unsafe -/* D8F484 80242234 86040008 */ lh $a0, 8($s0) -/* D8F488 80242238 24030001 */ addiu $v1, $zero, 1 -/* D8F48C 8024223C 0040982D */ daddu $s3, $v0, $zero -/* D8F490 80242240 A2230007 */ sb $v1, 7($s1) -/* D8F494 80242244 8E03006C */ lw $v1, 0x6c($s0) -/* D8F498 80242248 24020003 */ addiu $v0, $zero, 3 -/* D8F49C 8024224C 14620056 */ bne $v1, $v0, .L802423A8 -/* D8F4A0 80242250 00000000 */ nop -/* D8F4A4 80242254 8E2500A8 */ lw $a1, 0xa8($s1) -/* D8F4A8 80242258 10A00003 */ beqz $a1, .L80242268 -/* D8F4AC 8024225C 0260202D */ daddu $a0, $s3, $zero -/* D8F4B0 80242260 0C012530 */ jal func_800494C0 -/* D8F4B4 80242264 0000302D */ daddu $a2, $zero, $zero -.L80242268: -/* D8F4B8 80242268 27A40010 */ addiu $a0, $sp, 0x10 -/* D8F4BC 8024226C C6280070 */ lwc1 $f8, 0x70($s1) -/* D8F4C0 80242270 46804220 */ cvt.s.w $f8, $f8 -/* D8F4C4 80242274 C6620034 */ lwc1 $f2, 0x34($s3) -/* D8F4C8 80242278 3C014387 */ lui $at, 0x4387 -/* D8F4CC 8024227C 44810000 */ mtc1 $at, $f0 -/* D8F4D0 80242280 44064000 */ mfc1 $a2, $f8 -/* D8F4D4 80242284 46020001 */ sub.s $f0, $f0, $f2 -/* D8F4D8 80242288 C6660038 */ lwc1 $f6, 0x38($s3) -/* D8F4DC 8024228C C6640040 */ lwc1 $f4, 0x40($s3) -/* D8F4E0 80242290 44070000 */ mfc1 $a3, $f0 -/* D8F4E4 80242294 27A50014 */ addiu $a1, $sp, 0x14 -/* D8F4E8 80242298 E7A60010 */ swc1 $f6, 0x10($sp) -/* D8F4EC 8024229C 0C00A7E7 */ jal add_vec2D_polar -/* D8F4F0 802422A0 E7A40014 */ swc1 $f4, 0x14($sp) -/* D8F4F4 802422A4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* D8F4F8 802422A8 4600020D */ trunc.w.s $f8, $f0 -/* D8F4FC 802422AC 44024000 */ mfc1 $v0, $f8 -/* D8F500 802422B0 E6400038 */ swc1 $f0, 0x38($s2) -/* D8F504 802422B4 A6220010 */ sh $v0, 0x10($s1) -/* D8F508 802422B8 C660003C */ lwc1 $f0, 0x3c($s3) -/* D8F50C 802422BC C622006C */ lwc1 $f2, 0x6c($s1) -/* D8F510 802422C0 468010A0 */ cvt.s.w $f2, $f2 -/* D8F514 802422C4 46020000 */ add.s $f0, $f0, $f2 -/* D8F518 802422C8 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* D8F51C 802422CC 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* D8F520 802422D0 E640003C */ swc1 $f0, 0x3c($s2) -/* D8F524 802422D4 C7A20014 */ lwc1 $f2, 0x14($sp) -/* D8F528 802422D8 4600020D */ trunc.w.s $f8, $f0 -/* D8F52C 802422DC 44024000 */ mfc1 $v0, $f8 -/* D8F530 802422E0 00000000 */ nop -/* D8F534 802422E4 A6220012 */ sh $v0, 0x12($s1) -/* D8F538 802422E8 4600120D */ trunc.w.s $f8, $f2 -/* D8F53C 802422EC 44024000 */ mfc1 $v0, $f8 -/* D8F540 802422F0 E6420040 */ swc1 $f2, 0x40($s2) -/* D8F544 802422F4 A6220014 */ sh $v0, 0x14($s1) -/* D8F548 802422F8 8C660028 */ lw $a2, 0x28($v1) -/* D8F54C 802422FC 8C670030 */ lw $a3, 0x30($v1) -/* D8F550 80242300 C64C0038 */ lwc1 $f12, 0x38($s2) -/* D8F554 80242304 0C00A720 */ jal atan2 -/* D8F558 80242308 C64E0040 */ lwc1 $f14, 0x40($s2) -/* D8F55C 8024230C 3C03E0EF */ lui $v1, 0xe0ef -/* D8F560 80242310 E640000C */ swc1 $f0, 0xc($s2) -/* D8F564 80242314 8E220000 */ lw $v0, ($s1) -/* D8F568 80242318 3463FFFF */ ori $v1, $v1, 0xffff -/* D8F56C 8024231C 00431024 */ and $v0, $v0, $v1 -/* D8F570 80242320 AE220000 */ sw $v0, ($s1) -/* D8F574 80242324 24020001 */ addiu $v0, $zero, 1 -/* D8F578 80242328 A640008E */ sh $zero, 0x8e($s2) -/* D8F57C 8024232C 080908EA */ j .L802423A8 -/* D8F580 80242330 AE820070 */ sw $v0, 0x70($s4) -.L80242334: -/* D8F584 80242334 86240008 */ lh $a0, 8($s1) -/* D8F588 80242338 0C00FB3A */ jal get_enemy -/* D8F58C 8024233C 2484FFFF */ addiu $a0, $a0, -1 -/* D8F590 80242340 0040802D */ daddu $s0, $v0, $zero -/* D8F594 80242344 0C00EABB */ jal get_npc_unsafe -/* D8F598 80242348 86040008 */ lh $a0, 8($s0) -/* D8F59C 8024234C 9642008E */ lhu $v0, 0x8e($s2) -/* D8F5A0 80242350 24420001 */ addiu $v0, $v0, 1 -/* D8F5A4 80242354 A642008E */ sh $v0, 0x8e($s2) -/* D8F5A8 80242358 00021400 */ sll $v0, $v0, 0x10 -/* D8F5AC 8024235C 8E23007C */ lw $v1, 0x7c($s1) -/* D8F5B0 80242360 00021403 */ sra $v0, $v0, 0x10 -/* D8F5B4 80242364 0043102A */ slt $v0, $v0, $v1 -/* D8F5B8 80242368 50400001 */ beql $v0, $zero, .L80242370 -/* D8F5BC 8024236C A2200007 */ sb $zero, 7($s1) -.L80242370: -/* D8F5C0 80242370 8E03006C */ lw $v1, 0x6c($s0) -/* D8F5C4 80242374 24020004 */ addiu $v0, $zero, 4 -/* D8F5C8 80242378 1462000B */ bne $v1, $v0, .L802423A8 -/* D8F5CC 8024237C 3C021F10 */ lui $v0, 0x1f10 -/* D8F5D0 80242380 8E230000 */ lw $v1, ($s1) -/* D8F5D4 80242384 3C01C47A */ lui $at, 0xc47a -/* D8F5D8 80242388 44810000 */ mtc1 $at, $f0 -/* D8F5DC 8024238C 00621825 */ or $v1, $v1, $v0 -/* D8F5E0 80242390 AE230000 */ sw $v1, ($s1) -/* D8F5E4 80242394 AE400038 */ sw $zero, 0x38($s2) -/* D8F5E8 80242398 E640003C */ swc1 $f0, 0x3c($s2) -/* D8F5EC 8024239C AE400040 */ sw $zero, 0x40($s2) -/* D8F5F0 802423A0 A2330007 */ sb $s3, 7($s1) -/* D8F5F4 802423A4 AE800070 */ sw $zero, 0x70($s4) -.L802423A8: -/* D8F5F8 802423A8 8FBF002C */ lw $ra, 0x2c($sp) -/* D8F5FC 802423AC 8FB40028 */ lw $s4, 0x28($sp) -/* D8F600 802423B0 8FB30024 */ lw $s3, 0x24($sp) -/* D8F604 802423B4 8FB20020 */ lw $s2, 0x20($sp) -/* D8F608 802423B8 8FB1001C */ lw $s1, 0x1c($sp) -/* D8F60C 802423BC 8FB00018 */ lw $s0, 0x18($sp) -/* D8F610 802423C0 0000102D */ daddu $v0, $zero, $zero -/* D8F614 802423C4 03E00008 */ jr $ra -/* D8F618 802423C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_802423CC_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_802423CC_D8D250.s deleted file mode 100644 index 399f392dbd..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_802423CC_D8D250.s +++ /dev/null @@ -1,190 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423CC_D8F61C -/* D8F61C 802423CC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D8F620 802423D0 AFB20038 */ sw $s2, 0x38($sp) -/* D8F624 802423D4 0080902D */ daddu $s2, $a0, $zero -/* D8F628 802423D8 AFBF0048 */ sw $ra, 0x48($sp) -/* D8F62C 802423DC AFB50044 */ sw $s5, 0x44($sp) -/* D8F630 802423E0 AFB40040 */ sw $s4, 0x40($sp) -/* D8F634 802423E4 AFB3003C */ sw $s3, 0x3c($sp) -/* D8F638 802423E8 AFB10034 */ sw $s1, 0x34($sp) -/* D8F63C 802423EC AFB00030 */ sw $s0, 0x30($sp) -/* D8F640 802423F0 8E510148 */ lw $s1, 0x148($s2) -/* D8F644 802423F4 86240008 */ lh $a0, 8($s1) -/* D8F648 802423F8 0C00EABB */ jal get_npc_unsafe -/* D8F64C 802423FC 00A0802D */ daddu $s0, $a1, $zero -/* D8F650 80242400 8E43000C */ lw $v1, 0xc($s2) -/* D8F654 80242404 0240202D */ daddu $a0, $s2, $zero -/* D8F658 80242408 8C650000 */ lw $a1, ($v1) -/* D8F65C 8024240C 0C0B1EAF */ jal get_variable -/* D8F660 80242410 0040A82D */ daddu $s5, $v0, $zero -/* D8F664 80242414 AFA00010 */ sw $zero, 0x10($sp) -/* D8F668 80242418 8E2300D0 */ lw $v1, 0xd0($s1) -/* D8F66C 8024241C 8C630094 */ lw $v1, 0x94($v1) -/* D8F670 80242420 AFA30014 */ sw $v1, 0x14($sp) -/* D8F674 80242424 8E2300D0 */ lw $v1, 0xd0($s1) -/* D8F678 80242428 8C630080 */ lw $v1, 0x80($v1) -/* D8F67C 8024242C AFA30018 */ sw $v1, 0x18($sp) -/* D8F680 80242430 8E2300D0 */ lw $v1, 0xd0($s1) -/* D8F684 80242434 8C630088 */ lw $v1, 0x88($v1) -/* D8F688 80242438 AFA3001C */ sw $v1, 0x1c($sp) -/* D8F68C 8024243C 8E2300D0 */ lw $v1, 0xd0($s1) -/* D8F690 80242440 8C63008C */ lw $v1, 0x8c($v1) -/* D8F694 80242444 27B40010 */ addiu $s4, $sp, 0x10 -/* D8F698 80242448 AFA30020 */ sw $v1, 0x20($sp) -/* D8F69C 8024244C 8E2300D0 */ lw $v1, 0xd0($s1) -/* D8F6A0 80242450 3C014282 */ lui $at, 0x4282 -/* D8F6A4 80242454 44810000 */ mtc1 $at, $f0 -/* D8F6A8 80242458 8C630090 */ lw $v1, 0x90($v1) -/* D8F6AC 8024245C 0040982D */ daddu $s3, $v0, $zero -/* D8F6B0 80242460 E7A00028 */ swc1 $f0, 0x28($sp) -/* D8F6B4 80242464 A7A0002C */ sh $zero, 0x2c($sp) -/* D8F6B8 80242468 16000005 */ bnez $s0, .L80242480 -/* D8F6BC 8024246C AFA30024 */ sw $v1, 0x24($sp) -/* D8F6C0 80242470 8E2200B0 */ lw $v0, 0xb0($s1) -/* D8F6C4 80242474 30420004 */ andi $v0, $v0, 4 -/* D8F6C8 80242478 10400020 */ beqz $v0, .L802424FC -/* D8F6CC 8024247C 00000000 */ nop -.L80242480: -/* D8F6D0 80242480 2404F7FF */ addiu $a0, $zero, -0x801 -/* D8F6D4 80242484 AE400070 */ sw $zero, 0x70($s2) -/* D8F6D8 80242488 A6A0008E */ sh $zero, 0x8e($s5) -/* D8F6DC 8024248C 8E2200CC */ lw $v0, 0xcc($s1) -/* D8F6E0 80242490 8EA30000 */ lw $v1, ($s5) -/* D8F6E4 80242494 8C420000 */ lw $v0, ($v0) -/* D8F6E8 80242498 00641824 */ and $v1, $v1, $a0 -/* D8F6EC 8024249C AEA30000 */ sw $v1, ($s5) -/* D8F6F0 802424A0 AEA20028 */ sw $v0, 0x28($s5) -/* D8F6F4 802424A4 8E2200D0 */ lw $v0, 0xd0($s1) -/* D8F6F8 802424A8 8C420098 */ lw $v0, 0x98($v0) -/* D8F6FC 802424AC 54400005 */ bnel $v0, $zero, .L802424C4 -/* D8F700 802424B0 2402FDFF */ addiu $v0, $zero, -0x201 -/* D8F704 802424B4 34620200 */ ori $v0, $v1, 0x200 -/* D8F708 802424B8 2403FFF7 */ addiu $v1, $zero, -9 -/* D8F70C 802424BC 08090933 */ j .L802424CC -/* D8F710 802424C0 00431024 */ and $v0, $v0, $v1 -.L802424C4: -/* D8F714 802424C4 00621024 */ and $v0, $v1, $v0 -/* D8F718 802424C8 34420008 */ ori $v0, $v0, 8 -.L802424CC: -/* D8F71C 802424CC AEA20000 */ sw $v0, ($s5) -/* D8F720 802424D0 8E2200B0 */ lw $v0, 0xb0($s1) -/* D8F724 802424D4 30420004 */ andi $v0, $v0, 4 -/* D8F728 802424D8 10400007 */ beqz $v0, .L802424F8 -/* D8F72C 802424DC 24020063 */ addiu $v0, $zero, 0x63 -/* D8F730 802424E0 AE420070 */ sw $v0, 0x70($s2) -/* D8F734 802424E4 AE400074 */ sw $zero, 0x74($s2) -/* D8F738 802424E8 8E2200B0 */ lw $v0, 0xb0($s1) -/* D8F73C 802424EC 2403FFFB */ addiu $v1, $zero, -5 -/* D8F740 802424F0 00431024 */ and $v0, $v0, $v1 -/* D8F744 802424F4 AE2200B0 */ sw $v0, 0xb0($s1) -.L802424F8: -/* D8F748 802424F8 AE20006C */ sw $zero, 0x6c($s1) -.L802424FC: -/* D8F74C 802424FC 8E420070 */ lw $v0, 0x70($s2) -/* D8F750 80242500 2842001E */ slti $v0, $v0, 0x1e -/* D8F754 80242504 10400009 */ beqz $v0, .L8024252C -/* D8F758 80242508 00000000 */ nop -/* D8F75C 8024250C 8E22006C */ lw $v0, 0x6c($s1) -/* D8F760 80242510 14400006 */ bnez $v0, .L8024252C -/* D8F764 80242514 00000000 */ nop -/* D8F768 80242518 0C0907EE */ jal func_80241FB8 -/* D8F76C 8024251C 0240202D */ daddu $a0, $s2, $zero -/* D8F770 80242520 10400002 */ beqz $v0, .L8024252C -/* D8F774 80242524 2402001E */ addiu $v0, $zero, 0x1e -/* D8F778 80242528 AE420070 */ sw $v0, 0x70($s2) -.L8024252C: -/* D8F77C 8024252C 8E430070 */ lw $v1, 0x70($s2) -/* D8F780 80242530 2C620064 */ sltiu $v0, $v1, 0x64 -/* D8F784 80242534 1040004E */ beqz $v0, .L80242670 -/* D8F788 80242538 00031080 */ sll $v0, $v1, 2 -/* D8F78C 8024253C 3C018024 */ lui $at, 0x8024 -/* D8F790 80242540 00220821 */ addu $at, $at, $v0 -/* D8F794 80242544 8C224188 */ lw $v0, 0x4188($at) -/* D8F798 80242548 00400008 */ jr $v0 -/* D8F79C 8024254C 00000000 */ nop -/* D8F7A0 80242550 0240202D */ daddu $a0, $s2, $zero -/* D8F7A4 80242554 0260282D */ daddu $a1, $s3, $zero -/* D8F7A8 80242558 0C0903C8 */ jal func_80240F20 -/* D8F7AC 8024255C 0280302D */ daddu $a2, $s4, $zero -/* D8F7B0 80242560 0240202D */ daddu $a0, $s2, $zero -/* D8F7B4 80242564 0260282D */ daddu $a1, $s3, $zero -/* D8F7B8 80242568 0C09041E */ jal func_80241078 -/* D8F7BC 8024256C 0280302D */ daddu $a2, $s4, $zero -/* D8F7C0 80242570 0809099C */ j .L80242670 -/* D8F7C4 80242574 00000000 */ nop -/* D8F7C8 80242578 0240202D */ daddu $a0, $s2, $zero -/* D8F7CC 8024257C 0260282D */ daddu $a1, $s3, $zero -/* D8F7D0 80242580 0C0904C8 */ jal func_80241320 -/* D8F7D4 80242584 0280302D */ daddu $a2, $s4, $zero -/* D8F7D8 80242588 0240202D */ daddu $a0, $s2, $zero -/* D8F7DC 8024258C 0260282D */ daddu $a1, $s3, $zero -/* D8F7E0 80242590 0C0904F8 */ jal func_802413E0 -/* D8F7E4 80242594 0280302D */ daddu $a2, $s4, $zero -/* D8F7E8 80242598 0809099C */ j .L80242670 -/* D8F7EC 8024259C 00000000 */ nop -/* D8F7F0 802425A0 0240202D */ daddu $a0, $s2, $zero -/* D8F7F4 802425A4 0260282D */ daddu $a1, $s3, $zero -/* D8F7F8 802425A8 0C090567 */ jal func_8024159C -/* D8F7FC 802425AC 0280302D */ daddu $a2, $s4, $zero -/* D8F800 802425B0 0809099C */ j .L80242670 -/* D8F804 802425B4 00000000 */ nop -/* D8F808 802425B8 0240202D */ daddu $a0, $s2, $zero -/* D8F80C 802425BC 0260282D */ daddu $a1, $s3, $zero -/* D8F810 802425C0 0C090594 */ jal func_80241650 -/* D8F814 802425C4 0280302D */ daddu $a2, $s4, $zero -/* D8F818 802425C8 0240202D */ daddu $a0, $s2, $zero -/* D8F81C 802425CC 0260282D */ daddu $a1, $s3, $zero -/* D8F820 802425D0 0C0905B1 */ jal func_802416C4 -/* D8F824 802425D4 0280302D */ daddu $a2, $s4, $zero -/* D8F828 802425D8 0809099C */ j .L80242670 -/* D8F82C 802425DC 00000000 */ nop -/* D8F830 802425E0 0240202D */ daddu $a0, $s2, $zero -/* D8F834 802425E4 0260282D */ daddu $a1, $s3, $zero -/* D8F838 802425E8 0C0905CF */ jal func_8024173C -/* D8F83C 802425EC 0280302D */ daddu $a2, $s4, $zero -/* D8F840 802425F0 0240202D */ daddu $a0, $s2, $zero -/* D8F844 802425F4 0260282D */ daddu $a1, $s3, $zero -/* D8F848 802425F8 0C09061B */ jal func_8024186C -/* D8F84C 802425FC 0280302D */ daddu $a2, $s4, $zero -/* D8F850 80242600 0809099C */ j .L80242670 -/* D8F854 80242604 00000000 */ nop -/* D8F858 80242608 0240202D */ daddu $a0, $s2, $zero -/* D8F85C 8024260C 0260282D */ daddu $a1, $s3, $zero -/* D8F860 80242610 0C090663 */ jal func_8024198C -/* D8F864 80242614 0280302D */ daddu $a2, $s4, $zero -/* D8F868 80242618 0809099C */ j .L80242670 -/* D8F86C 8024261C 00000000 */ nop -/* D8F870 80242620 0C09076C */ jal func_80241DB0 -/* D8F874 80242624 0240202D */ daddu $a0, $s2, $zero -/* D8F878 80242628 0C090787 */ jal func_80241E1C -/* D8F87C 8024262C 0240202D */ daddu $a0, $s2, $zero -/* D8F880 80242630 8E430070 */ lw $v1, 0x70($s2) -/* D8F884 80242634 24020020 */ addiu $v0, $zero, 0x20 -/* D8F888 80242638 1462000D */ bne $v1, $v0, .L80242670 -/* D8F88C 8024263C 00000000 */ nop -/* D8F890 80242640 0C0907A3 */ jal func_80241E8C -/* D8F894 80242644 0240202D */ daddu $a0, $s2, $zero -/* D8F898 80242648 8E430070 */ lw $v1, 0x70($s2) -/* D8F89C 8024264C 24020021 */ addiu $v0, $zero, 0x21 -/* D8F8A0 80242650 14620007 */ bne $v1, $v0, .L80242670 -/* D8F8A4 80242654 00000000 */ nop -/* D8F8A8 80242658 0C0907D9 */ jal func_80241F64 -/* D8F8AC 8024265C 0240202D */ daddu $a0, $s2, $zero -/* D8F8B0 80242660 0809099C */ j .L80242670 -/* D8F8B4 80242664 00000000 */ nop -/* D8F8B8 80242668 0C0129CF */ jal func_8004A73C -/* D8F8BC 8024266C 0240202D */ daddu $a0, $s2, $zero -.L80242670: -/* D8F8C0 80242670 8FBF0048 */ lw $ra, 0x48($sp) -/* D8F8C4 80242674 8FB50044 */ lw $s5, 0x44($sp) -/* D8F8C8 80242678 8FB40040 */ lw $s4, 0x40($sp) -/* D8F8CC 8024267C 8FB3003C */ lw $s3, 0x3c($sp) -/* D8F8D0 80242680 8FB20038 */ lw $s2, 0x38($sp) -/* D8F8D4 80242684 8FB10034 */ lw $s1, 0x34($sp) -/* D8F8D8 80242688 8FB00030 */ lw $s0, 0x30($sp) -/* D8F8DC 8024268C 0000102D */ daddu $v0, $zero, $zero -/* D8F8E0 80242690 03E00008 */ jr $ra -/* D8F8E4 80242694 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_35/func_80242A04_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/func_80242A04_D8D250.s deleted file mode 100644 index ead90d0611..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/func_80242A04_D8D250.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A04_D8FC54 -/* D8FC54 80242A04 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8FC58 80242A08 AFB00010 */ sw $s0, 0x10($sp) -/* D8FC5C 80242A0C 0080802D */ daddu $s0, $a0, $zero -/* D8FC60 80242A10 AFBF0018 */ sw $ra, 0x18($sp) -/* D8FC64 80242A14 AFB10014 */ sw $s1, 0x14($sp) -/* D8FC68 80242A18 8E02000C */ lw $v0, 0xc($s0) -/* D8FC6C 80242A1C 8C510000 */ lw $s1, ($v0) -/* D8FC70 80242A20 0C0B1EAF */ jal get_variable -/* D8FC74 80242A24 0220282D */ daddu $a1, $s1, $zero -/* D8FC78 80242A28 3C03FFF0 */ lui $v1, 0xfff0 -/* D8FC7C 80242A2C 3463FFFF */ ori $v1, $v1, 0xffff -/* D8FC80 80242A30 0200202D */ daddu $a0, $s0, $zero -/* D8FC84 80242A34 00431024 */ and $v0, $v0, $v1 -/* D8FC88 80242A38 00021140 */ sll $v0, $v0, 5 -/* D8FC8C 80242A3C 3C068008 */ lui $a2, %hi(gItemTable) -/* D8FC90 80242A40 00C23021 */ addu $a2, $a2, $v0 -/* D8FC94 80242A44 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D8FC98 80242A48 0C0B2026 */ jal set_variable -/* D8FC9C 80242A4C 0220282D */ daddu $a1, $s1, $zero -/* D8FCA0 80242A50 8FBF0018 */ lw $ra, 0x18($sp) -/* D8FCA4 80242A54 8FB10014 */ lw $s1, 0x14($sp) -/* D8FCA8 80242A58 8FB00010 */ lw $s0, 0x10($sp) -/* D8FCAC 80242A5C 24020002 */ addiu $v0, $zero, 2 -/* D8FCB0 80242A60 03E00008 */ jr $ra -/* D8FCB4 80242A64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_36/func_80240050_D91700.s b/asm/nonmatchings/world/area_pra/pra_36/func_80240050_D91700.s deleted file mode 100644 index 4b160927a2..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/func_80240050_D91700.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D91750 -/* D91750 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D91754 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D91758 80240058 00822024 */ and $a0, $a0, $v0 -/* D9175C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D91760 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D91764 80240064 00821821 */ addu $v1, $a0, $v0 -/* D91768 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D9176C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D91770 80240070 30620001 */ andi $v0, $v1, 1 -/* D91774 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D91778 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D9177C 8024007C 03E00008 */ jr $ra -/* D91780 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_36/func_80240084_D91700.s b/asm/nonmatchings/world/area_pra/pra_36/func_80240084_D91700.s deleted file mode 100644 index f761e06e13..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/func_80240084_D91700.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240084_D91784 -/* D91784 80240084 00041403 */ sra $v0, $a0, 0x10 -/* D91788 80240088 304300FF */ andi $v1, $v0, 0xff -/* D9178C 8024008C 24020006 */ addiu $v0, $zero, 6 -/* D91790 80240090 10620015 */ beq $v1, $v0, .L802400E8 -/* D91794 80240094 28620007 */ slti $v0, $v1, 7 -/* D91798 80240098 10400005 */ beqz $v0, .L802400B0 -/* D9179C 8024009C 24020001 */ addiu $v0, $zero, 1 -/* D917A0 802400A0 1062000A */ beq $v1, $v0, .L802400CC -/* D917A4 802400A4 3C020100 */ lui $v0, 0x100 -/* D917A8 802400A8 03E00008 */ jr $ra -/* D917AC 802400AC 00821025 */ or $v0, $a0, $v0 -.L802400B0: -/* D917B0 802400B0 2862000A */ slti $v0, $v1, 0xa -/* D917B4 802400B4 10400016 */ beqz $v0, .L80240110 -/* D917B8 802400B8 28620008 */ slti $v0, $v1, 8 -/* D917BC 802400BC 14400015 */ bnez $v0, .L80240114 -/* D917C0 802400C0 3C020100 */ lui $v0, 0x100 -/* D917C4 802400C4 03E00008 */ jr $ra -/* D917C8 802400C8 0080102D */ daddu $v0, $a0, $zero -.L802400CC: -/* D917CC 802400CC 3C020001 */ lui $v0, 1 -/* D917D0 802400D0 3442000C */ ori $v0, $v0, 0xc -/* D917D4 802400D4 0044102A */ slt $v0, $v0, $a0 -/* D917D8 802400D8 1040000E */ beqz $v0, .L80240114 -/* D917DC 802400DC 3C020100 */ lui $v0, 0x100 -.L802400E0: -/* D917E0 802400E0 03E00008 */ jr $ra -/* D917E4 802400E4 0080102D */ daddu $v0, $a0, $zero -.L802400E8: -/* D917E8 802400E8 3C02FFF9 */ lui $v0, 0xfff9 -/* D917EC 802400EC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D917F0 802400F0 00821821 */ addu $v1, $a0, $v0 -/* D917F4 802400F4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D917F8 802400F8 10400005 */ beqz $v0, .L80240110 -/* D917FC 802400FC 30620001 */ andi $v0, $v1, 1 -/* D91800 80240100 1440FFF7 */ bnez $v0, .L802400E0 -/* D91804 80240104 24820001 */ addiu $v0, $a0, 1 -/* D91808 80240108 03E00008 */ jr $ra -/* D9180C 8024010C 00000000 */ nop -.L80240110: -/* D91810 80240110 3C020100 */ lui $v0, 0x100 -.L80240114: -/* D91814 80240114 03E00008 */ jr $ra -/* D91818 80240118 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_36/func_8024011C_D91700.s b/asm/nonmatchings/world/area_pra/pra_36/func_8024011C_D91700.s deleted file mode 100644 index 62876a5b28..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/func_8024011C_D91700.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024011C_D9181C -/* D9181C 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D91820 80240120 AFB00010 */ sw $s0, 0x10($sp) -/* D91824 80240124 0080802D */ daddu $s0, $a0, $zero -/* D91828 80240128 3C058024 */ lui $a1, 0x8024 -/* D9182C 8024012C 24A50158 */ addiu $a1, $a1, 0x158 -/* D91830 80240130 AFBF0014 */ sw $ra, 0x14($sp) -/* D91834 80240134 0C048C56 */ jal bind_dynamic_entity_3 -/* D91838 80240138 0000202D */ daddu $a0, $zero, $zero -/* D9183C 8024013C 8E03013C */ lw $v1, 0x13c($s0) -/* D91840 80240140 AC620000 */ sw $v0, ($v1) -/* D91844 80240144 8FBF0014 */ lw $ra, 0x14($sp) -/* D91848 80240148 8FB00010 */ lw $s0, 0x10($sp) -/* D9184C 8024014C 24020002 */ addiu $v0, $zero, 2 -/* D91850 80240150 03E00008 */ jr $ra -/* D91854 80240154 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_36/func_80240158_D91700.s b/asm/nonmatchings/world/area_pra/pra_36/func_80240158_D91700.s deleted file mode 100644 index 447005e38f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/func_80240158_D91700.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_D91858 -/* D91858 80240158 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D9185C 8024015C AFB00040 */ sw $s0, 0x40($sp) -/* D91860 80240160 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D91864 80240164 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D91868 80240168 AFB20048 */ sw $s2, 0x48($sp) -/* D9186C 8024016C AFBF004C */ sw $ra, 0x4c($sp) -/* D91870 80240170 AFB10044 */ sw $s1, 0x44($sp) -/* D91874 80240174 8E020000 */ lw $v0, ($s0) -/* D91878 80240178 821100BE */ lb $s1, 0xbe($s0) -/* D9187C 8024017C 30420001 */ andi $v0, $v0, 1 -/* D91880 80240180 10400061 */ beqz $v0, .L80240308 -/* D91884 80240184 27B20020 */ addiu $s2, $sp, 0x20 -/* D91888 80240188 8E0400CC */ lw $a0, 0xcc($s0) -/* D9188C 8024018C 0C044181 */ jal get_shadow_by_index -/* D91890 80240190 00000000 */ nop -/* D91894 80240194 0C048B77 */ jal func_80122DDC -/* D91898 80240198 84440008 */ lh $a0, 8($v0) -/* D9189C 8024019C 8C430000 */ lw $v1, ($v0) -/* D918A0 802401A0 34630200 */ ori $v1, $v1, 0x200 -/* D918A4 802401A4 AC430000 */ sw $v1, ($v0) -/* D918A8 802401A8 8E050028 */ lw $a1, 0x28($s0) -/* D918AC 802401AC 8E06002C */ lw $a2, 0x2c($s0) -/* D918B0 802401B0 27A20030 */ addiu $v0, $sp, 0x30 -/* D918B4 802401B4 AFA20010 */ sw $v0, 0x10($sp) -/* D918B8 802401B8 27A20034 */ addiu $v0, $sp, 0x34 -/* D918BC 802401BC AFA20014 */ sw $v0, 0x14($sp) -/* D918C0 802401C0 C6000030 */ lwc1 $f0, 0x30($s0) -/* D918C4 802401C4 3C04800A */ lui $a0, 0x800a -/* D918C8 802401C8 8484A634 */ lh $a0, -0x59cc($a0) -/* D918CC 802401CC 46000007 */ neg.s $f0, $f0 -/* D918D0 802401D0 44070000 */ mfc1 $a3, $f0 -/* D918D4 802401D4 27A20038 */ addiu $v0, $sp, 0x38 -/* D918D8 802401D8 0C00B94E */ jal get_screen_coords -/* D918DC 802401DC AFA20018 */ sw $v0, 0x18($sp) -/* D918E0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D918E4 802401E4 0C090014 */ jal func_80240050 -/* D918E8 802401E8 00000000 */ nop -/* D918EC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) -/* D918F0 802401F0 3C014307 */ lui $at, 0x4307 -/* D918F4 802401F4 44810000 */ mtc1 $at, $f0 -/* D918F8 802401F8 00000000 */ nop -/* D918FC 802401FC 4602003C */ c.lt.s $f0, $f2 -/* D91900 80240200 00000000 */ nop -/* D91904 80240204 4500000B */ bc1f .L80240234 -/* D91908 80240208 24040002 */ addiu $a0, $zero, 2 -/* D9190C 8024020C 3C014361 */ lui $at, 0x4361 -/* D91910 80240210 44810000 */ mtc1 $at, $f0 -/* D91914 80240214 00000000 */ nop -/* D91918 80240218 4600103C */ c.lt.s $f2, $f0 -/* D9191C 8024021C 00000000 */ nop -/* D91920 80240220 45000004 */ bc1f .L80240234 -/* D91924 80240224 00000000 */ nop -/* D91928 80240228 0C090021 */ jal func_80240084 -/* D9192C 8024022C 0040202D */ daddu $a0, $v0, $zero -/* D91930 80240230 24040002 */ addiu $a0, $zero, 2 -.L80240234: -/* D91934 80240234 3C063F80 */ lui $a2, 0x3f80 -/* D91938 80240238 0C0B76A3 */ jal func_802DDA8C -/* D9193C 8024023C 0040282D */ daddu $a1, $v0, $zero -/* D91940 80240240 8E020000 */ lw $v0, ($s0) -/* D91944 80240244 3C030002 */ lui $v1, 2 -/* D91948 80240248 00431024 */ and $v0, $v0, $v1 -/* D9194C 8024024C 54400022 */ bnel $v0, $zero, .L802402D8 -/* D91950 80240250 24110011 */ addiu $s1, $zero, 0x11 -/* D91954 80240254 9203000E */ lbu $v1, 0xe($s0) -/* D91958 80240258 3C02802E */ lui $v0, 0x802e -/* D9195C 8024025C 90429D70 */ lbu $v0, -0x6290($v0) -/* D91960 80240260 10620018 */ beq $v1, $v0, .L802402C4 -/* D91964 80240264 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D91968 80240268 1040000B */ beqz $v0, .L80240298 -/* D9196C 8024026C 24110011 */ addiu $s1, $zero, 0x11 -/* D91970 80240270 24040002 */ addiu $a0, $zero, 2 -/* D91974 80240274 2405FFFF */ addiu $a1, $zero, -1 -/* D91978 80240278 24060007 */ addiu $a2, $zero, 7 -/* D9197C 8024027C 0060102D */ daddu $v0, $v1, $zero -/* D91980 80240280 0000382D */ daddu $a3, $zero, $zero -/* D91984 80240284 AFA00010 */ sw $zero, 0x10($sp) -/* D91988 80240288 AFA00014 */ sw $zero, 0x14($sp) -/* D9198C 8024028C AFA0001C */ sw $zero, 0x1c($sp) -/* D91990 80240290 080900AF */ j .L802402BC -/* D91994 80240294 AFA20018 */ sw $v0, 0x18($sp) -.L80240298: -/* D91998 80240298 2411000D */ addiu $s1, $zero, 0xd -/* D9199C 8024029C 24040002 */ addiu $a0, $zero, 2 -/* D919A0 802402A0 2405FFFF */ addiu $a1, $zero, -1 -/* D919A4 802402A4 0000302D */ daddu $a2, $zero, $zero -/* D919A8 802402A8 00C0382D */ daddu $a3, $a2, $zero -/* D919AC 802402AC AFA00010 */ sw $zero, 0x10($sp) -/* D919B0 802402B0 AFA00014 */ sw $zero, 0x14($sp) -/* D919B4 802402B4 AFA00018 */ sw $zero, 0x18($sp) -/* D919B8 802402B8 AFA0001C */ sw $zero, 0x1c($sp) -.L802402BC: -/* D919BC 802402BC 0C0B77B9 */ jal func_802DDEE4 -/* D919C0 802402C0 00000000 */ nop -.L802402C4: -/* D919C4 802402C4 9202000E */ lbu $v0, 0xe($s0) -/* D919C8 802402C8 3C01802E */ lui $at, 0x802e -/* D919CC 802402CC A0229D70 */ sb $v0, -0x6290($at) -/* D919D0 802402D0 080900B9 */ j .L802402E4 -/* D919D4 802402D4 0240202D */ daddu $a0, $s2, $zero -.L802402D8: -/* D919D8 802402D8 3C01802E */ lui $at, 0x802e -/* D919DC 802402DC A0209D70 */ sb $zero, -0x6290($at) -/* D919E0 802402E0 0240202D */ daddu $a0, $s2, $zero -.L802402E4: -/* D919E4 802402E4 AC910000 */ sw $s1, ($a0) -/* D919E8 802402E8 AC900008 */ sw $s0, 8($a0) -/* D919EC 802402EC 8FA20038 */ lw $v0, 0x38($sp) -/* D919F0 802402F0 3C038024 */ lui $v1, 0x8024 -/* D919F4 802402F4 24630320 */ addiu $v1, $v1, 0x320 -/* D919F8 802402F8 AC83000C */ sw $v1, 0xc($a0) -/* D919FC 802402FC 00021023 */ negu $v0, $v0 -/* D91A00 80240300 0C047644 */ jal queue_render_task -/* D91A04 80240304 AC820004 */ sw $v0, 4($a0) -.L80240308: -/* D91A08 80240308 8FBF004C */ lw $ra, 0x4c($sp) -/* D91A0C 8024030C 8FB20048 */ lw $s2, 0x48($sp) -/* D91A10 80240310 8FB10044 */ lw $s1, 0x44($sp) -/* D91A14 80240314 8FB00040 */ lw $s0, 0x40($sp) -/* D91A18 80240318 03E00008 */ jr $ra -/* D91A1C 8024031C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_36/func_80240320_D91700.s b/asm/nonmatchings/world/area_pra/pra_36/func_80240320_D91700.s deleted file mode 100644 index e9ccb8280d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/func_80240320_D91700.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240320_D91A20 -/* D91A20 80240320 3C03800A */ lui $v1, 0x800a -/* D91A24 80240324 8463A634 */ lh $v1, -0x59cc($v1) -/* D91A28 80240328 3C07BF80 */ lui $a3, 0xbf80 -/* D91A2C 8024032C 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D91A30 80240330 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D91A34 80240334 4480A000 */ mtc1 $zero, $f20 -/* D91A38 80240338 AFB1011C */ sw $s1, 0x11c($sp) -/* D91A3C 8024033C 0080882D */ daddu $s1, $a0, $zero -/* D91A40 80240340 AFB00118 */ sw $s0, 0x118($sp) -/* D91A44 80240344 27B00098 */ addiu $s0, $sp, 0x98 -/* D91A48 80240348 AFBF0120 */ sw $ra, 0x120($sp) -/* D91A4C 8024034C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D91A50 80240350 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D91A54 80240354 00031080 */ sll $v0, $v1, 2 -/* D91A58 80240358 00431021 */ addu $v0, $v0, $v1 -/* D91A5C 8024035C 00021080 */ sll $v0, $v0, 2 -/* D91A60 80240360 00431023 */ subu $v0, $v0, $v1 -/* D91A64 80240364 000218C0 */ sll $v1, $v0, 3 -/* D91A68 80240368 00431021 */ addu $v0, $v0, $v1 -/* D91A6C 8024036C 000210C0 */ sll $v0, $v0, 3 -/* D91A70 80240370 3C01800B */ lui $at, 0x800b -/* D91A74 80240374 00220821 */ addu $at, $at, $v0 -/* D91A78 80240378 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D91A7C 8024037C 4406A000 */ mfc1 $a2, $f20 -/* D91A80 80240380 4600B587 */ neg.s $f22, $f22 -/* D91A84 80240384 4405B000 */ mfc1 $a1, $f22 -/* D91A88 80240388 0200202D */ daddu $a0, $s0, $zero -/* D91A8C 8024038C 0C019EC8 */ jal guRotateF -/* D91A90 80240390 E7B40010 */ swc1 $f20, 0x10($sp) -/* D91A94 80240394 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D91A98 80240398 0C00A6C9 */ jal clamp_angle -/* D91A9C 8024039C 00000000 */ nop -/* D91AA0 802403A0 44050000 */ mfc1 $a1, $f0 -/* D91AA4 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D91AA8 802403A8 4407A000 */ mfc1 $a3, $f20 -/* D91AAC 802403AC 3C013F80 */ lui $at, 0x3f80 -/* D91AB0 802403B0 4481C000 */ mtc1 $at, $f24 -/* D91AB4 802403B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D91AB8 802403B8 0C019EC8 */ jal guRotateF -/* D91ABC 802403BC E7B80010 */ swc1 $f24, 0x10($sp) -/* D91AC0 802403C0 0200202D */ daddu $a0, $s0, $zero -/* D91AC4 802403C4 27A50018 */ addiu $a1, $sp, 0x18 -/* D91AC8 802403C8 0C019D80 */ jal guMtxCatF -/* D91ACC 802403CC 00A0302D */ daddu $a2, $a1, $zero -/* D91AD0 802403D0 4405B000 */ mfc1 $a1, $f22 -/* D91AD4 802403D4 4406A000 */ mfc1 $a2, $f20 -/* D91AD8 802403D8 4407C000 */ mfc1 $a3, $f24 -/* D91ADC 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D91AE0 802403E0 0C019EC8 */ jal guRotateF -/* D91AE4 802403E4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D91AE8 802403E8 27A40018 */ addiu $a0, $sp, 0x18 -/* D91AEC 802403EC 0200282D */ daddu $a1, $s0, $zero -/* D91AF0 802403F0 0C019D80 */ jal guMtxCatF -/* D91AF4 802403F4 0080302D */ daddu $a2, $a0, $zero -/* D91AF8 802403F8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D91AFC 802403FC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D91B00 80240400 4406A000 */ mfc1 $a2, $f20 -/* D91B04 80240404 4407C000 */ mfc1 $a3, $f24 -/* D91B08 80240408 0C019EC8 */ jal guRotateF -/* D91B0C 8024040C 0200202D */ daddu $a0, $s0, $zero -/* D91B10 80240410 27A40018 */ addiu $a0, $sp, 0x18 -/* D91B14 80240414 0200282D */ daddu $a1, $s0, $zero -/* D91B18 80240418 0C019D80 */ jal guMtxCatF -/* D91B1C 8024041C 0080302D */ daddu $a2, $a0, $zero -/* D91B20 80240420 3C013F36 */ lui $at, 0x3f36 -/* D91B24 80240424 3421DB6E */ ori $at, $at, 0xdb6e -/* D91B28 80240428 44810000 */ mtc1 $at, $f0 -/* D91B2C 8024042C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D91B30 80240430 44050000 */ mfc1 $a1, $f0 -/* D91B34 80240434 0200202D */ daddu $a0, $s0, $zero -/* D91B38 80240438 00A0302D */ daddu $a2, $a1, $zero -/* D91B3C 8024043C 0C019DF0 */ jal guScaleF -/* D91B40 80240440 00A0382D */ daddu $a3, $a1, $zero -/* D91B44 80240444 27A40018 */ addiu $a0, $sp, 0x18 -/* D91B48 80240448 0200282D */ daddu $a1, $s0, $zero -/* D91B4C 8024044C 0C019D80 */ jal guMtxCatF -/* D91B50 80240450 0080302D */ daddu $a2, $a0, $zero -/* D91B54 80240454 27B00058 */ addiu $s0, $sp, 0x58 -/* D91B58 80240458 C6200030 */ lwc1 $f0, 0x30($s1) -/* D91B5C 8024045C 3C014040 */ lui $at, 0x4040 -/* D91B60 80240460 44811000 */ mtc1 $at, $f2 -/* D91B64 80240464 46000007 */ neg.s $f0, $f0 -/* D91B68 80240468 46020001 */ sub.s $f0, $f0, $f2 -/* D91B6C 8024046C 8E250028 */ lw $a1, 0x28($s1) -/* D91B70 80240470 8E26002C */ lw $a2, 0x2c($s1) -/* D91B74 80240474 44070000 */ mfc1 $a3, $f0 -/* D91B78 80240478 0C019E40 */ jal guTranslateF -/* D91B7C 8024047C 0200202D */ daddu $a0, $s0, $zero -/* D91B80 80240480 27A40018 */ addiu $a0, $sp, 0x18 -/* D91B84 80240484 0200282D */ daddu $a1, $s0, $zero -/* D91B88 80240488 0C019D80 */ jal guMtxCatF -/* D91B8C 8024048C 0080302D */ daddu $a2, $a0, $zero -/* D91B90 80240490 24040002 */ addiu $a0, $zero, 2 -/* D91B94 80240494 0000282D */ daddu $a1, $zero, $zero -/* D91B98 80240498 00A0302D */ daddu $a2, $a1, $zero -/* D91B9C 8024049C 00A0382D */ daddu $a3, $a1, $zero -/* D91BA0 802404A0 27A20018 */ addiu $v0, $sp, 0x18 -/* D91BA4 802404A4 0C0B7710 */ jal render_sprite -/* D91BA8 802404A8 AFA20010 */ sw $v0, 0x10($sp) -/* D91BAC 802404AC 8FBF0120 */ lw $ra, 0x120($sp) -/* D91BB0 802404B0 8FB1011C */ lw $s1, 0x11c($sp) -/* D91BB4 802404B4 8FB00118 */ lw $s0, 0x118($sp) -/* D91BB8 802404B8 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D91BBC 802404BC D7B60130 */ ldc1 $f22, 0x130($sp) -/* D91BC0 802404C0 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D91BC4 802404C4 03E00008 */ jr $ra -/* D91BC8 802404C8 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_36/func_802404CC_D91700.s b/asm/nonmatchings/world/area_pra/pra_36/func_802404CC_D91700.s deleted file mode 100644 index 77c4128b8b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/func_802404CC_D91700.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404CC_D91BCC -/* D91BCC 802404CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D91BD0 802404D0 AFB00010 */ sw $s0, 0x10($sp) -/* D91BD4 802404D4 0080802D */ daddu $s0, $a0, $zero -/* D91BD8 802404D8 AFBF0014 */ sw $ra, 0x14($sp) -/* D91BDC 802404DC 8E020084 */ lw $v0, 0x84($s0) -/* D91BE0 802404E0 0440000E */ bltz $v0, .L8024051C -/* D91BE4 802404E4 28420002 */ slti $v0, $v0, 2 -/* D91BE8 802404E8 1040000C */ beqz $v0, .L8024051C -/* D91BEC 802404EC 00000000 */ nop -/* D91BF0 802404F0 3C058024 */ lui $a1, 0x8024 -/* D91BF4 802404F4 24A50530 */ addiu $a1, $a1, 0x530 -/* D91BF8 802404F8 0C048C56 */ jal bind_dynamic_entity_3 -/* D91BFC 802404FC 0000202D */ daddu $a0, $zero, $zero -/* D91C00 80240500 8E03013C */ lw $v1, 0x13c($s0) -/* D91C04 80240504 AC620000 */ sw $v0, ($v1) -/* D91C08 80240508 3C03800A */ lui $v1, %hi(D_8009A650) -/* D91C0C 8024050C 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D91C10 80240510 8C620000 */ lw $v0, ($v1) -/* D91C14 80240514 34420080 */ ori $v0, $v0, 0x80 -/* D91C18 80240518 AC620000 */ sw $v0, ($v1) -.L8024051C: -/* D91C1C 8024051C 8FBF0014 */ lw $ra, 0x14($sp) -/* D91C20 80240520 8FB00010 */ lw $s0, 0x10($sp) -/* D91C24 80240524 24020002 */ addiu $v0, $zero, 2 -/* D91C28 80240528 03E00008 */ jr $ra -/* D91C2C 8024052C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_36/func_80240530_D91700.s b/asm/nonmatchings/world/area_pra/pra_36/func_80240530_D91700.s deleted file mode 100644 index fcaf000306..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/func_80240530_D91700.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240530_D91C30 -/* D91C30 80240530 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D91C34 80240534 AFB00040 */ sw $s0, 0x40($sp) -/* D91C38 80240538 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D91C3C 8024053C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D91C40 80240540 AFB10044 */ sw $s1, 0x44($sp) -/* D91C44 80240544 AFBF004C */ sw $ra, 0x4c($sp) -/* D91C48 80240548 AFB20048 */ sw $s2, 0x48($sp) -/* D91C4C 8024054C 8E020000 */ lw $v0, ($s0) -/* D91C50 80240550 821200BE */ lb $s2, 0xbe($s0) -/* D91C54 80240554 30420001 */ andi $v0, $v0, 1 -/* D91C58 80240558 10400052 */ beqz $v0, .L802406A4 -/* D91C5C 8024055C 27B10020 */ addiu $s1, $sp, 0x20 -/* D91C60 80240560 8E0400CC */ lw $a0, 0xcc($s0) -/* D91C64 80240564 0C044181 */ jal get_shadow_by_index -/* D91C68 80240568 00000000 */ nop -/* D91C6C 8024056C 0C048B77 */ jal func_80122DDC -/* D91C70 80240570 84440008 */ lh $a0, 8($v0) -/* D91C74 80240574 8E050028 */ lw $a1, 0x28($s0) -/* D91C78 80240578 8E070030 */ lw $a3, 0x30($s0) -/* D91C7C 8024057C 27A20030 */ addiu $v0, $sp, 0x30 -/* D91C80 80240580 AFA20010 */ sw $v0, 0x10($sp) -/* D91C84 80240584 27A20034 */ addiu $v0, $sp, 0x34 -/* D91C88 80240588 AFA20014 */ sw $v0, 0x14($sp) -/* D91C8C 8024058C 27A20038 */ addiu $v0, $sp, 0x38 -/* D91C90 80240590 AFA20018 */ sw $v0, 0x18($sp) -/* D91C94 80240594 C600002C */ lwc1 $f0, 0x2c($s0) -/* D91C98 80240598 3C04800A */ lui $a0, 0x800a -/* D91C9C 8024059C 8484A634 */ lh $a0, -0x59cc($a0) -/* D91CA0 802405A0 46000007 */ neg.s $f0, $f0 -/* D91CA4 802405A4 44060000 */ mfc1 $a2, $f0 -/* D91CA8 802405A8 0C00B94E */ jal get_screen_coords -/* D91CAC 802405AC 00000000 */ nop -/* D91CB0 802405B0 8E0500A4 */ lw $a1, 0xa4($s0) -/* D91CB4 802405B4 3C063F80 */ lui $a2, 0x3f80 -/* D91CB8 802405B8 0C0B76A3 */ jal func_802DDA8C -/* D91CBC 802405BC 24040001 */ addiu $a0, $zero, 1 -/* D91CC0 802405C0 8E020000 */ lw $v0, ($s0) -/* D91CC4 802405C4 3C030002 */ lui $v1, 2 -/* D91CC8 802405C8 00431024 */ and $v0, $v0, $v1 -/* D91CCC 802405CC 54400022 */ bnel $v0, $zero, .L80240658 -/* D91CD0 802405D0 24120011 */ addiu $s2, $zero, 0x11 -/* D91CD4 802405D4 9203000E */ lbu $v1, 0xe($s0) -/* D91CD8 802405D8 3C02802E */ lui $v0, 0x802e -/* D91CDC 802405DC 90429D71 */ lbu $v0, -0x628f($v0) -/* D91CE0 802405E0 10620018 */ beq $v1, $v0, .L80240644 -/* D91CE4 802405E4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D91CE8 802405E8 1040000B */ beqz $v0, .L80240618 -/* D91CEC 802405EC 24120011 */ addiu $s2, $zero, 0x11 -/* D91CF0 802405F0 24040001 */ addiu $a0, $zero, 1 -/* D91CF4 802405F4 2405FFFF */ addiu $a1, $zero, -1 -/* D91CF8 802405F8 24060007 */ addiu $a2, $zero, 7 -/* D91CFC 802405FC 0060102D */ daddu $v0, $v1, $zero -/* D91D00 80240600 0000382D */ daddu $a3, $zero, $zero -/* D91D04 80240604 AFA00010 */ sw $zero, 0x10($sp) -/* D91D08 80240608 AFA00014 */ sw $zero, 0x14($sp) -/* D91D0C 8024060C AFA0001C */ sw $zero, 0x1c($sp) -/* D91D10 80240610 0809018F */ j .L8024063C -/* D91D14 80240614 AFA20018 */ sw $v0, 0x18($sp) -.L80240618: -/* D91D18 80240618 2412000D */ addiu $s2, $zero, 0xd -/* D91D1C 8024061C 24040001 */ addiu $a0, $zero, 1 -/* D91D20 80240620 2405FFFF */ addiu $a1, $zero, -1 -/* D91D24 80240624 0000302D */ daddu $a2, $zero, $zero -/* D91D28 80240628 00C0382D */ daddu $a3, $a2, $zero -/* D91D2C 8024062C AFA00010 */ sw $zero, 0x10($sp) -/* D91D30 80240630 AFA00014 */ sw $zero, 0x14($sp) -/* D91D34 80240634 AFA00018 */ sw $zero, 0x18($sp) -/* D91D38 80240638 AFA0001C */ sw $zero, 0x1c($sp) -.L8024063C: -/* D91D3C 8024063C 0C0B77B9 */ jal func_802DDEE4 -/* D91D40 80240640 00000000 */ nop -.L80240644: -/* D91D44 80240644 9202000E */ lbu $v0, 0xe($s0) -/* D91D48 80240648 3C01802E */ lui $at, 0x802e -/* D91D4C 8024064C A0229D71 */ sb $v0, -0x628f($at) -/* D91D50 80240650 08090198 */ j .L80240660 -/* D91D54 80240654 00000000 */ nop -.L80240658: -/* D91D58 80240658 3C01802E */ lui $at, 0x802e -/* D91D5C 8024065C A0209D71 */ sb $zero, -0x628f($at) -.L80240660: -/* D91D60 80240660 8FA20038 */ lw $v0, 0x38($sp) -/* D91D64 80240664 3C048024 */ lui $a0, 0x8024 -/* D91D68 80240668 248408A0 */ addiu $a0, $a0, 0x8a0 -/* D91D6C 8024066C AE320000 */ sw $s2, ($s1) -/* D91D70 80240670 AE300008 */ sw $s0, 8($s1) -/* D91D74 80240674 00021023 */ negu $v0, $v0 -/* D91D78 80240678 AE220004 */ sw $v0, 4($s1) -/* D91D7C 8024067C 8E020000 */ lw $v0, ($s0) -/* D91D80 80240680 3C030002 */ lui $v1, 2 -/* D91D84 80240684 00431024 */ and $v0, $v0, $v1 -/* D91D88 80240688 54400004 */ bnel $v0, $zero, .L8024069C -/* D91D8C 8024068C AE24000C */ sw $a0, 0xc($s1) -/* D91D90 80240690 3C048024 */ lui $a0, 0x8024 -/* D91D94 80240694 248406BC */ addiu $a0, $a0, 0x6bc -/* D91D98 80240698 AE24000C */ sw $a0, 0xc($s1) -.L8024069C: -/* D91D9C 8024069C 0C047644 */ jal queue_render_task -/* D91DA0 802406A0 0220202D */ daddu $a0, $s1, $zero -.L802406A4: -/* D91DA4 802406A4 8FBF004C */ lw $ra, 0x4c($sp) -/* D91DA8 802406A8 8FB20048 */ lw $s2, 0x48($sp) -/* D91DAC 802406AC 8FB10044 */ lw $s1, 0x44($sp) -/* D91DB0 802406B0 8FB00040 */ lw $s0, 0x40($sp) -/* D91DB4 802406B4 03E00008 */ jr $ra -/* D91DB8 802406B8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_36/func_802406BC_D91700.s b/asm/nonmatchings/world/area_pra/pra_36/func_802406BC_D91700.s deleted file mode 100644 index 24de2adffc..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/func_802406BC_D91700.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406BC_D91DBC -/* D91DBC 802406BC 3C03800A */ lui $v1, 0x800a -/* D91DC0 802406C0 8463A634 */ lh $v1, -0x59cc($v1) -/* D91DC4 802406C4 3C07BF80 */ lui $a3, 0xbf80 -/* D91DC8 802406C8 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D91DCC 802406CC F7B40128 */ sdc1 $f20, 0x128($sp) -/* D91DD0 802406D0 4480A000 */ mtc1 $zero, $f20 -/* D91DD4 802406D4 AFB1011C */ sw $s1, 0x11c($sp) -/* D91DD8 802406D8 0080882D */ daddu $s1, $a0, $zero -/* D91DDC 802406DC AFB00118 */ sw $s0, 0x118($sp) -/* D91DE0 802406E0 27B00098 */ addiu $s0, $sp, 0x98 -/* D91DE4 802406E4 AFBF0120 */ sw $ra, 0x120($sp) -/* D91DE8 802406E8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D91DEC 802406EC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D91DF0 802406F0 00031080 */ sll $v0, $v1, 2 -/* D91DF4 802406F4 00431021 */ addu $v0, $v0, $v1 -/* D91DF8 802406F8 00021080 */ sll $v0, $v0, 2 -/* D91DFC 802406FC 00431023 */ subu $v0, $v0, $v1 -/* D91E00 80240700 000218C0 */ sll $v1, $v0, 3 -/* D91E04 80240704 00431021 */ addu $v0, $v0, $v1 -/* D91E08 80240708 000210C0 */ sll $v0, $v0, 3 -/* D91E0C 8024070C 3C01800B */ lui $at, 0x800b -/* D91E10 80240710 00220821 */ addu $at, $at, $v0 -/* D91E14 80240714 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D91E18 80240718 4406A000 */ mfc1 $a2, $f20 -/* D91E1C 8024071C 4600B587 */ neg.s $f22, $f22 -/* D91E20 80240720 4405B000 */ mfc1 $a1, $f22 -/* D91E24 80240724 0200202D */ daddu $a0, $s0, $zero -/* D91E28 80240728 0C019EC8 */ jal guRotateF -/* D91E2C 8024072C E7B40010 */ swc1 $f20, 0x10($sp) -/* D91E30 80240730 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D91E34 80240734 0C00A6C9 */ jal clamp_angle -/* D91E38 80240738 00000000 */ nop -/* D91E3C 8024073C 44050000 */ mfc1 $a1, $f0 -/* D91E40 80240740 4406A000 */ mfc1 $a2, $f20 -/* D91E44 80240744 4407A000 */ mfc1 $a3, $f20 -/* D91E48 80240748 3C013F80 */ lui $at, 0x3f80 -/* D91E4C 8024074C 4481C000 */ mtc1 $at, $f24 -/* D91E50 80240750 27A40018 */ addiu $a0, $sp, 0x18 -/* D91E54 80240754 0C019EC8 */ jal guRotateF -/* D91E58 80240758 E7B80010 */ swc1 $f24, 0x10($sp) -/* D91E5C 8024075C 0200202D */ daddu $a0, $s0, $zero -/* D91E60 80240760 27A50018 */ addiu $a1, $sp, 0x18 -/* D91E64 80240764 0C019D80 */ jal guMtxCatF -/* D91E68 80240768 00A0302D */ daddu $a2, $a1, $zero -/* D91E6C 8024076C 4405B000 */ mfc1 $a1, $f22 -/* D91E70 80240770 4406A000 */ mfc1 $a2, $f20 -/* D91E74 80240774 4407C000 */ mfc1 $a3, $f24 -/* D91E78 80240778 0200202D */ daddu $a0, $s0, $zero -/* D91E7C 8024077C 0C019EC8 */ jal guRotateF -/* D91E80 80240780 E7B40010 */ swc1 $f20, 0x10($sp) -/* D91E84 80240784 27A40018 */ addiu $a0, $sp, 0x18 -/* D91E88 80240788 0200282D */ daddu $a1, $s0, $zero -/* D91E8C 8024078C 0C019D80 */ jal guMtxCatF -/* D91E90 80240790 0080302D */ daddu $a2, $a0, $zero -/* D91E94 80240794 E7B40010 */ swc1 $f20, 0x10($sp) -/* D91E98 80240798 8E2500A8 */ lw $a1, 0xa8($s1) -/* D91E9C 8024079C 4406A000 */ mfc1 $a2, $f20 -/* D91EA0 802407A0 4407C000 */ mfc1 $a3, $f24 -/* D91EA4 802407A4 0C019EC8 */ jal guRotateF -/* D91EA8 802407A8 0200202D */ daddu $a0, $s0, $zero -/* D91EAC 802407AC 27A40018 */ addiu $a0, $sp, 0x18 -/* D91EB0 802407B0 0200282D */ daddu $a1, $s0, $zero -/* D91EB4 802407B4 0C019D80 */ jal guMtxCatF -/* D91EB8 802407B8 0080302D */ daddu $a2, $a0, $zero -/* D91EBC 802407BC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D91EC0 802407C0 3C013F36 */ lui $at, 0x3f36 -/* D91EC4 802407C4 3421DB6E */ ori $at, $at, 0xdb6e -/* D91EC8 802407C8 44810000 */ mtc1 $at, $f0 -/* D91ECC 802407CC 0200202D */ daddu $a0, $s0, $zero -/* D91ED0 802407D0 44050000 */ mfc1 $a1, $f0 -/* D91ED4 802407D4 3C06BF36 */ lui $a2, 0xbf36 -/* D91ED8 802407D8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D91EDC 802407DC 0C019DF0 */ jal guScaleF -/* D91EE0 802407E0 00A0382D */ daddu $a3, $a1, $zero -/* D91EE4 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D91EE8 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D91EEC 802407EC 0C019D80 */ jal guMtxCatF -/* D91EF0 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D91EF4 802407F4 27B00058 */ addiu $s0, $sp, 0x58 -/* D91EF8 802407F8 8E250028 */ lw $a1, 0x28($s1) -/* D91EFC 802407FC C620002C */ lwc1 $f0, 0x2c($s1) -/* D91F00 80240800 8E270030 */ lw $a3, 0x30($s1) -/* D91F04 80240804 46000007 */ neg.s $f0, $f0 -/* D91F08 80240808 44060000 */ mfc1 $a2, $f0 -/* D91F0C 8024080C 0C019E40 */ jal guTranslateF -/* D91F10 80240810 0200202D */ daddu $a0, $s0, $zero -/* D91F14 80240814 27A40018 */ addiu $a0, $sp, 0x18 -/* D91F18 80240818 0200282D */ daddu $a1, $s0, $zero -/* D91F1C 8024081C 0C019D80 */ jal guMtxCatF -/* D91F20 80240820 0080302D */ daddu $a2, $a0, $zero -/* D91F24 80240824 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D91F28 80240828 3C0142B4 */ lui $at, 0x42b4 -/* D91F2C 8024082C 44810000 */ mtc1 $at, $f0 -/* D91F30 80240830 00000000 */ nop -/* D91F34 80240834 4602003E */ c.le.s $f0, $f2 -/* D91F38 80240838 00000000 */ nop -/* D91F3C 8024083C 4500000A */ bc1f .L80240868 -/* D91F40 80240840 24040001 */ addiu $a0, $zero, 1 -/* D91F44 80240844 3C014387 */ lui $at, 0x4387 -/* D91F48 80240848 44810000 */ mtc1 $at, $f0 -/* D91F4C 8024084C 00000000 */ nop -/* D91F50 80240850 4600103C */ c.lt.s $f2, $f0 -/* D91F54 80240854 00000000 */ nop -/* D91F58 80240858 45000004 */ bc1f .L8024086C -/* D91F5C 8024085C 27A20018 */ addiu $v0, $sp, 0x18 -/* D91F60 80240860 3C041000 */ lui $a0, 0x1000 -/* D91F64 80240864 34840001 */ ori $a0, $a0, 1 -.L80240868: -/* D91F68 80240868 27A20018 */ addiu $v0, $sp, 0x18 -.L8024086C: -/* D91F6C 8024086C 0000282D */ daddu $a1, $zero, $zero -/* D91F70 80240870 00A0302D */ daddu $a2, $a1, $zero -/* D91F74 80240874 00A0382D */ daddu $a3, $a1, $zero -/* D91F78 80240878 0C0B7710 */ jal render_sprite -/* D91F7C 8024087C AFA20010 */ sw $v0, 0x10($sp) -/* D91F80 80240880 8FBF0120 */ lw $ra, 0x120($sp) -/* D91F84 80240884 8FB1011C */ lw $s1, 0x11c($sp) -/* D91F88 80240888 8FB00118 */ lw $s0, 0x118($sp) -/* D91F8C 8024088C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D91F90 80240890 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D91F94 80240894 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D91F98 80240898 03E00008 */ jr $ra -/* D91F9C 8024089C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_36/func_802408A0_D91700.s b/asm/nonmatchings/world/area_pra/pra_36/func_802408A0_D91700.s deleted file mode 100644 index 475a4d3f79..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/func_802408A0_D91700.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A0_D91FA0 -/* D91FA0 802408A0 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D91FA4 802408A4 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D91FA8 802408A8 4480B000 */ mtc1 $zero, $f22 -/* D91FAC 802408AC AFB10134 */ sw $s1, 0x134($sp) -/* D91FB0 802408B0 0080882D */ daddu $s1, $a0, $zero -/* D91FB4 802408B4 AFB3013C */ sw $s3, 0x13c($sp) -/* D91FB8 802408B8 0000982D */ daddu $s3, $zero, $zero -/* D91FBC 802408BC AFB60148 */ sw $s6, 0x148($sp) -/* D91FC0 802408C0 3C16800B */ lui $s6, %hi(gCameras) -/* D91FC4 802408C4 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D91FC8 802408C8 AFB50144 */ sw $s5, 0x144($sp) -/* D91FCC 802408CC 241500FF */ addiu $s5, $zero, 0xff -/* D91FD0 802408D0 AFB00130 */ sw $s0, 0x130($sp) -/* D91FD4 802408D4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D91FD8 802408D8 AFB20138 */ sw $s2, 0x138($sp) -/* D91FDC 802408DC 27B20060 */ addiu $s2, $sp, 0x60 -/* D91FE0 802408E0 AFB40140 */ sw $s4, 0x140($sp) -/* D91FE4 802408E4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D91FE8 802408E8 AFBF014C */ sw $ra, 0x14c($sp) -/* D91FEC 802408EC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D91FF0 802408F0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D91FF4 802408F4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D91FF8 802408F8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D91FFC 802408FC F7B40150 */ sdc1 $f20, 0x150($sp) -.L80240900: -/* D92000 80240900 3C03800A */ lui $v1, 0x800a -/* D92004 80240904 8463A634 */ lh $v1, -0x59cc($v1) -/* D92008 80240908 00031080 */ sll $v0, $v1, 2 -/* D9200C 8024090C 00431021 */ addu $v0, $v0, $v1 -/* D92010 80240910 00021080 */ sll $v0, $v0, 2 -/* D92014 80240914 00431023 */ subu $v0, $v0, $v1 -/* D92018 80240918 000218C0 */ sll $v1, $v0, 3 -/* D9201C 8024091C 00431021 */ addu $v0, $v0, $v1 -/* D92020 80240920 000210C0 */ sll $v0, $v0, 3 -/* D92024 80240924 00561021 */ addu $v0, $v0, $s6 -/* D92028 80240928 C440006C */ lwc1 $f0, 0x6c($v0) -/* D9202C 8024092C 16600065 */ bnez $s3, .L80240AC4 -/* D92030 80240930 46000507 */ neg.s $f20, $f0 -/* D92034 80240934 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D92038 80240938 3C0142B4 */ lui $at, 0x42b4 -/* D9203C 8024093C 44810000 */ mtc1 $at, $f0 -/* D92040 80240940 00000000 */ nop -/* D92044 80240944 4602003C */ c.lt.s $f0, $f2 -/* D92048 80240948 00000000 */ nop -/* D9204C 8024094C 4500000A */ bc1f .L80240978 -/* D92050 80240950 00000000 */ nop -/* D92054 80240954 3C014334 */ lui $at, 0x4334 -/* D92058 80240958 44812000 */ mtc1 $at, $f4 -/* D9205C 8024095C 00000000 */ nop -/* D92060 80240960 4604103E */ c.le.s $f2, $f4 -/* D92064 80240964 00000000 */ nop -/* D92068 80240968 45000003 */ bc1f .L80240978 -/* D9206C 8024096C 00000000 */ nop -/* D92070 80240970 08090282 */ j .L80240A08 -/* D92074 80240974 46022501 */ sub.s $f20, $f4, $f2 -.L80240978: -/* D92078 80240978 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D9207C 8024097C 3C014334 */ lui $at, 0x4334 -/* D92080 80240980 44812000 */ mtc1 $at, $f4 -/* D92084 80240984 00000000 */ nop -/* D92088 80240988 4600203C */ c.lt.s $f4, $f0 -/* D9208C 8024098C 00000000 */ nop -/* D92090 80240990 4500000C */ bc1f .L802409C4 -/* D92094 80240994 00000000 */ nop -/* D92098 80240998 3C014387 */ lui $at, 0x4387 -/* D9209C 8024099C 44812000 */ mtc1 $at, $f4 -/* D920A0 802409A0 00000000 */ nop -/* D920A4 802409A4 4604003E */ c.le.s $f0, $f4 -/* D920A8 802409A8 00000000 */ nop -/* D920AC 802409AC 45000008 */ bc1f .L802409D0 -/* D920B0 802409B0 00000000 */ nop -/* D920B4 802409B4 3C014334 */ lui $at, 0x4334 -/* D920B8 802409B8 44812000 */ mtc1 $at, $f4 -/* D920BC 802409BC 08090282 */ j .L80240A08 -/* D920C0 802409C0 46040501 */ sub.s $f20, $f0, $f4 -.L802409C4: -/* D920C4 802409C4 3C014387 */ lui $at, 0x4387 -/* D920C8 802409C8 44812000 */ mtc1 $at, $f4 -/* D920CC 802409CC 00000000 */ nop -.L802409D0: -/* D920D0 802409D0 4600203C */ c.lt.s $f4, $f0 -/* D920D4 802409D4 00000000 */ nop -/* D920D8 802409D8 4500000A */ bc1f .L80240A04 -/* D920DC 802409DC 00000000 */ nop -/* D920E0 802409E0 3C0143B4 */ lui $at, 0x43b4 -/* D920E4 802409E4 44811000 */ mtc1 $at, $f2 -/* D920E8 802409E8 00000000 */ nop -/* D920EC 802409EC 4602003E */ c.le.s $f0, $f2 -/* D920F0 802409F0 00000000 */ nop -/* D920F4 802409F4 45000003 */ bc1f .L80240A04 -/* D920F8 802409F8 00000000 */ nop -/* D920FC 802409FC 08090282 */ j .L80240A08 -/* D92100 80240A00 46001501 */ sub.s $f20, $f2, $f0 -.L80240A04: -/* D92104 80240A04 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L80240A08: -/* D92108 80240A08 3C0141C8 */ lui $at, 0x41c8 -/* D9210C 80240A0C 44810000 */ mtc1 $at, $f0 -/* D92110 80240A10 00000000 */ nop -/* D92114 80240A14 4600A003 */ div.s $f0, $f20, $f0 -/* D92118 80240A18 4600010D */ trunc.w.s $f4, $f0 -/* D9211C 80240A1C 44072000 */ mfc1 $a3, $f4 -/* D92120 80240A20 00000000 */ nop -/* D92124 80240A24 00071100 */ sll $v0, $a3, 4 -/* D92128 80240A28 00471023 */ subu $v0, $v0, $a3 -/* D9212C 80240A2C 00021080 */ sll $v0, $v0, 2 -/* D92130 80240A30 02A23823 */ subu $a3, $s5, $v0 -/* D92134 80240A34 28E20064 */ slti $v0, $a3, 0x64 -/* D92138 80240A38 54400001 */ bnel $v0, $zero, .L80240A40 -/* D9213C 80240A3C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A40: -/* D92140 80240A40 24040001 */ addiu $a0, $zero, 1 -/* D92144 80240A44 2405FFFF */ addiu $a1, $zero, -1 -/* D92148 80240A48 24060006 */ addiu $a2, $zero, 6 -/* D9214C 80240A4C AFA70010 */ sw $a3, 0x10($sp) -/* D92150 80240A50 AFA70014 */ sw $a3, 0x14($sp) -/* D92154 80240A54 AFB50018 */ sw $s5, 0x18($sp) -/* D92158 80240A58 0C0B77B9 */ jal func_802DDEE4 -/* D9215C 80240A5C AFA0001C */ sw $zero, 0x1c($sp) -/* D92160 80240A60 4405A000 */ mfc1 $a1, $f20 -/* D92164 80240A64 4406B000 */ mfc1 $a2, $f22 -/* D92168 80240A68 3C07BF80 */ lui $a3, 0xbf80 -/* D9216C 80240A6C 0200202D */ daddu $a0, $s0, $zero -/* D92170 80240A70 0C019EC8 */ jal guRotateF -/* D92174 80240A74 E7B60010 */ swc1 $f22, 0x10($sp) -/* D92178 80240A78 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D9217C 80240A7C 0C00A6C9 */ jal clamp_angle -/* D92180 80240A80 00000000 */ nop -/* D92184 80240A84 44050000 */ mfc1 $a1, $f0 -/* D92188 80240A88 4406B000 */ mfc1 $a2, $f22 -/* D9218C 80240A8C 4407B000 */ mfc1 $a3, $f22 -/* D92190 80240A90 3C013F80 */ lui $at, 0x3f80 -/* D92194 80240A94 44812000 */ mtc1 $at, $f4 -/* D92198 80240A98 27A40020 */ addiu $a0, $sp, 0x20 -/* D9219C 80240A9C 0C019EC8 */ jal guRotateF -/* D921A0 80240AA0 E7A40010 */ swc1 $f4, 0x10($sp) -/* D921A4 80240AA4 0200202D */ daddu $a0, $s0, $zero -/* D921A8 80240AA8 27A50020 */ addiu $a1, $sp, 0x20 -/* D921AC 80240AAC 0C019D80 */ jal guMtxCatF -/* D921B0 80240AB0 00A0302D */ daddu $a2, $a1, $zero -/* D921B4 80240AB4 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D921B8 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D921BC 80240ABC 080902E2 */ j .L80240B88 -/* D921C0 80240AC0 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240AC4: -/* D921C4 80240AC4 0260202D */ daddu $a0, $s3, $zero -/* D921C8 80240AC8 27A50120 */ addiu $a1, $sp, 0x120 -/* D921CC 80240ACC 27A60124 */ addiu $a2, $sp, 0x124 -/* D921D0 80240AD0 0C03964E */ jal func_800E5938 -/* D921D4 80240AD4 27A70128 */ addiu $a3, $sp, 0x128 -/* D921D8 80240AD8 8FA60124 */ lw $a2, 0x124($sp) -/* D921DC 80240ADC 3C028000 */ lui $v0, 0x8000 -/* D921E0 80240AE0 14C20004 */ bne $a2, $v0, .L80240AF4 -/* D921E4 80240AE4 46000606 */ mov.s $f24, $f0 -/* D921E8 80240AE8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D921EC 80240AEC 080902C1 */ j .L80240B04 -/* D921F0 80240AF0 24040001 */ addiu $a0, $zero, 1 -.L80240AF4: -/* D921F4 80240AF4 4486D000 */ mtc1 $a2, $f26 -/* D921F8 80240AF8 00000000 */ nop -/* D921FC 80240AFC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D92200 80240B00 24040001 */ addiu $a0, $zero, 1 -.L80240B04: -/* D92204 80240B04 2405FFFF */ addiu $a1, $zero, -1 -/* D92208 80240B08 24060007 */ addiu $a2, $zero, 7 -/* D9220C 80240B0C 0000382D */ daddu $a3, $zero, $zero -/* D92210 80240B10 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D92214 80240B14 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D92218 80240B18 24020040 */ addiu $v0, $zero, 0x40 -/* D9221C 80240B1C AFA00010 */ sw $zero, 0x10($sp) -/* D92220 80240B20 AFA00014 */ sw $zero, 0x14($sp) -/* D92224 80240B24 AFA20018 */ sw $v0, 0x18($sp) -/* D92228 80240B28 0C0B77B9 */ jal func_802DDEE4 -/* D9222C 80240B2C AFA0001C */ sw $zero, 0x1c($sp) -/* D92230 80240B30 4405A000 */ mfc1 $a1, $f20 -/* D92234 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D92238 80240B38 3C07BF80 */ lui $a3, 0xbf80 -/* D9223C 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D92240 80240B40 0C019EC8 */ jal guRotateF -/* D92244 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D92248 80240B48 4405A000 */ mfc1 $a1, $f20 -/* D9224C 80240B4C 4406B000 */ mfc1 $a2, $f22 -/* D92250 80240B50 3C07BF80 */ lui $a3, 0xbf80 -/* D92254 80240B54 0200202D */ daddu $a0, $s0, $zero -/* D92258 80240B58 0C019EC8 */ jal guRotateF -/* D9225C 80240B5C E7B60010 */ swc1 $f22, 0x10($sp) -/* D92260 80240B60 4405C000 */ mfc1 $a1, $f24 -/* D92264 80240B64 4406B000 */ mfc1 $a2, $f22 -/* D92268 80240B68 3C073F80 */ lui $a3, 0x3f80 -/* D9226C 80240B6C 27A40020 */ addiu $a0, $sp, 0x20 -/* D92270 80240B70 0C019EC8 */ jal guRotateF -/* D92274 80240B74 E7B60010 */ swc1 $f22, 0x10($sp) -/* D92278 80240B78 0200202D */ daddu $a0, $s0, $zero -/* D9227C 80240B7C 27A50020 */ addiu $a1, $sp, 0x20 -/* D92280 80240B80 0C019D80 */ jal guMtxCatF -/* D92284 80240B84 00A0302D */ daddu $a2, $a1, $zero -.L80240B88: -/* D92288 80240B88 862200B0 */ lh $v0, 0xb0($s1) -/* D9228C 80240B8C 3C013F00 */ lui $at, 0x3f00 -/* D92290 80240B90 44812000 */ mtc1 $at, $f4 -/* D92294 80240B94 00021023 */ negu $v0, $v0 -/* D92298 80240B98 44820000 */ mtc1 $v0, $f0 -/* D9229C 80240B9C 00000000 */ nop -/* D922A0 80240BA0 46800020 */ cvt.s.w $f0, $f0 -/* D922A4 80240BA4 46040102 */ mul.s $f4, $f0, $f4 -/* D922A8 80240BA8 00000000 */ nop -/* D922AC 80240BAC 4405B000 */ mfc1 $a1, $f22 -/* D922B0 80240BB0 4407B000 */ mfc1 $a3, $f22 -/* D922B4 80240BB4 44062000 */ mfc1 $a2, $f4 -/* D922B8 80240BB8 0C019E40 */ jal guTranslateF -/* D922BC 80240BBC 0240202D */ daddu $a0, $s2, $zero -/* D922C0 80240BC0 0240202D */ daddu $a0, $s2, $zero -/* D922C4 80240BC4 27A50020 */ addiu $a1, $sp, 0x20 -/* D922C8 80240BC8 0C019D80 */ jal guMtxCatF -/* D922CC 80240BCC 00A0302D */ daddu $a2, $a1, $zero -/* D922D0 80240BD0 4405A000 */ mfc1 $a1, $f20 -/* D922D4 80240BD4 4406B000 */ mfc1 $a2, $f22 -/* D922D8 80240BD8 3C073F80 */ lui $a3, 0x3f80 -/* D922DC 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D922E0 80240BE0 0C019EC8 */ jal guRotateF -/* D922E4 80240BE4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D922E8 80240BE8 27A40020 */ addiu $a0, $sp, 0x20 -/* D922EC 80240BEC 0200282D */ daddu $a1, $s0, $zero -/* D922F0 80240BF0 0C019D80 */ jal guMtxCatF -/* D922F4 80240BF4 0080302D */ daddu $a2, $a0, $zero -/* D922F8 80240BF8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D922FC 80240BFC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D92300 80240C00 4406B000 */ mfc1 $a2, $f22 -/* D92304 80240C04 3C073F80 */ lui $a3, 0x3f80 -/* D92308 80240C08 0C019EC8 */ jal guRotateF -/* D9230C 80240C0C 0200202D */ daddu $a0, $s0, $zero -/* D92310 80240C10 27A40020 */ addiu $a0, $sp, 0x20 -/* D92314 80240C14 0200282D */ daddu $a1, $s0, $zero -/* D92318 80240C18 0C019D80 */ jal guMtxCatF -/* D9231C 80240C1C 0080302D */ daddu $a2, $a0, $zero -/* D92320 80240C20 862200B0 */ lh $v0, 0xb0($s1) -/* D92324 80240C24 3C013F00 */ lui $at, 0x3f00 -/* D92328 80240C28 44812000 */ mtc1 $at, $f4 -/* D9232C 80240C2C 44820000 */ mtc1 $v0, $f0 -/* D92330 80240C30 00000000 */ nop -/* D92334 80240C34 46800020 */ cvt.s.w $f0, $f0 -/* D92338 80240C38 46040102 */ mul.s $f4, $f0, $f4 -/* D9233C 80240C3C 00000000 */ nop -/* D92340 80240C40 4405B000 */ mfc1 $a1, $f22 -/* D92344 80240C44 4407B000 */ mfc1 $a3, $f22 -/* D92348 80240C48 44062000 */ mfc1 $a2, $f4 -/* D9234C 80240C4C 0C019E40 */ jal guTranslateF -/* D92350 80240C50 0240202D */ daddu $a0, $s2, $zero -/* D92354 80240C54 27A40020 */ addiu $a0, $sp, 0x20 -/* D92358 80240C58 0240282D */ daddu $a1, $s2, $zero -/* D9235C 80240C5C 0C019D80 */ jal guMtxCatF -/* D92360 80240C60 0080302D */ daddu $a2, $a0, $zero -/* D92364 80240C64 3C013F36 */ lui $at, 0x3f36 -/* D92368 80240C68 3421DB6E */ ori $at, $at, 0xdb6e -/* D9236C 80240C6C 44810000 */ mtc1 $at, $f0 -/* D92370 80240C70 0280202D */ daddu $a0, $s4, $zero -/* D92374 80240C74 44050000 */ mfc1 $a1, $f0 -/* D92378 80240C78 3C06BF36 */ lui $a2, 0xbf36 -/* D9237C 80240C7C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D92380 80240C80 0C019DF0 */ jal guScaleF -/* D92384 80240C84 00A0382D */ daddu $a3, $a1, $zero -/* D92388 80240C88 27A40020 */ addiu $a0, $sp, 0x20 -/* D9238C 80240C8C 0280282D */ daddu $a1, $s4, $zero -/* D92390 80240C90 0C019D80 */ jal guMtxCatF -/* D92394 80240C94 0080302D */ daddu $a2, $a0, $zero -/* D92398 80240C98 4600D687 */ neg.s $f26, $f26 -/* D9239C 80240C9C 4405F000 */ mfc1 $a1, $f30 -/* D923A0 80240CA0 4407E000 */ mfc1 $a3, $f28 -/* D923A4 80240CA4 4406D000 */ mfc1 $a2, $f26 -/* D923A8 80240CA8 0C019E40 */ jal guTranslateF -/* D923AC 80240CAC 0240202D */ daddu $a0, $s2, $zero -/* D923B0 80240CB0 27A40020 */ addiu $a0, $sp, 0x20 -/* D923B4 80240CB4 0240282D */ daddu $a1, $s2, $zero -/* D923B8 80240CB8 0C019D80 */ jal guMtxCatF -/* D923BC 80240CBC 0080302D */ daddu $a2, $a0, $zero -/* D923C0 80240CC0 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D923C4 80240CC4 3C0142B4 */ lui $at, 0x42b4 -/* D923C8 80240CC8 44810000 */ mtc1 $at, $f0 -/* D923CC 80240CCC 00000000 */ nop -/* D923D0 80240CD0 4602003E */ c.le.s $f0, $f2 -/* D923D4 80240CD4 00000000 */ nop -/* D923D8 80240CD8 4500000A */ bc1f .L80240D04 -/* D923DC 80240CDC 24040001 */ addiu $a0, $zero, 1 -/* D923E0 80240CE0 3C014387 */ lui $at, 0x4387 -/* D923E4 80240CE4 44812000 */ mtc1 $at, $f4 -/* D923E8 80240CE8 00000000 */ nop -/* D923EC 80240CEC 4604103C */ c.lt.s $f2, $f4 -/* D923F0 80240CF0 00000000 */ nop -/* D923F4 80240CF4 45000004 */ bc1f .L80240D08 -/* D923F8 80240CF8 27A20020 */ addiu $v0, $sp, 0x20 -/* D923FC 80240CFC 3C041000 */ lui $a0, 0x1000 -/* D92400 80240D00 34840001 */ ori $a0, $a0, 1 -.L80240D04: -/* D92404 80240D04 27A20020 */ addiu $v0, $sp, 0x20 -.L80240D08: -/* D92408 80240D08 AFA20010 */ sw $v0, 0x10($sp) -/* D9240C 80240D0C 0000282D */ daddu $a1, $zero, $zero -/* D92410 80240D10 00A0302D */ daddu $a2, $a1, $zero -/* D92414 80240D14 0C0B7710 */ jal render_sprite -/* D92418 80240D18 00A0382D */ daddu $a3, $a1, $zero -/* D9241C 80240D1C 26730001 */ addiu $s3, $s3, 1 -/* D92420 80240D20 2A620002 */ slti $v0, $s3, 2 -/* D92424 80240D24 1440FEF6 */ bnez $v0, .L80240900 -/* D92428 80240D28 00000000 */ nop -/* D9242C 80240D2C 8FBF014C */ lw $ra, 0x14c($sp) -/* D92430 80240D30 8FB60148 */ lw $s6, 0x148($sp) -/* D92434 80240D34 8FB50144 */ lw $s5, 0x144($sp) -/* D92438 80240D38 8FB40140 */ lw $s4, 0x140($sp) -/* D9243C 80240D3C 8FB3013C */ lw $s3, 0x13c($sp) -/* D92440 80240D40 8FB20138 */ lw $s2, 0x138($sp) -/* D92444 80240D44 8FB10134 */ lw $s1, 0x134($sp) -/* D92448 80240D48 8FB00130 */ lw $s0, 0x130($sp) -/* D9244C 80240D4C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D92450 80240D50 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D92454 80240D54 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D92458 80240D58 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D9245C 80240D5C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D92460 80240D60 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D92464 80240D64 03E00008 */ jr $ra -/* D92468 80240D68 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_36/func_80240D6C_D91700.s b/asm/nonmatchings/world/area_pra/pra_36/func_80240D6C_D91700.s deleted file mode 100644 index 0bbdcff77d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/func_80240D6C_D91700.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D6C_D9246C -/* D9246C 80240D6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D92470 80240D70 AFB00010 */ sw $s0, 0x10($sp) -/* D92474 80240D74 0080802D */ daddu $s0, $a0, $zero -/* D92478 80240D78 AFBF0014 */ sw $ra, 0x14($sp) -/* D9247C 80240D7C 8E020088 */ lw $v0, 0x88($s0) -/* D92480 80240D80 14400017 */ bnez $v0, .L80240DE0 -/* D92484 80240D84 24020001 */ addiu $v0, $zero, 1 -/* D92488 80240D88 8E030084 */ lw $v1, 0x84($s0) -/* D9248C 80240D8C 1062001A */ beq $v1, $v0, .L80240DF8 -/* D92490 80240D90 00000000 */ nop -/* D92494 80240D94 28620002 */ slti $v0, $v1, 2 -/* D92498 80240D98 50400005 */ beql $v0, $zero, .L80240DB0 -/* D9249C 80240D9C 24020002 */ addiu $v0, $zero, 2 -/* D924A0 80240DA0 10600007 */ beqz $v1, .L80240DC0 -/* D924A4 80240DA4 00000000 */ nop -/* D924A8 80240DA8 08090384 */ j .L80240E10 -/* D924AC 80240DAC 00000000 */ nop -.L80240DB0: -/* D924B0 80240DB0 10620007 */ beq $v1, $v0, .L80240DD0 -/* D924B4 80240DB4 00000000 */ nop -/* D924B8 80240DB8 08090384 */ j .L80240E10 -/* D924BC 80240DBC 00000000 */ nop -.L80240DC0: -/* D924C0 80240DC0 3C048024 */ lui $a0, 0x8024 -/* D924C4 80240DC4 24840EB4 */ addiu $a0, $a0, 0xeb4 -/* D924C8 80240DC8 08090380 */ j .L80240E00 -/* D924CC 80240DCC 00000000 */ nop -.L80240DD0: -/* D924D0 80240DD0 3C048024 */ lui $a0, 0x8024 -/* D924D4 80240DD4 24840F1C */ addiu $a0, $a0, 0xf1c -/* D924D8 80240DD8 08090380 */ j .L80240E00 -/* D924DC 80240DDC 00000000 */ nop -.L80240DE0: -/* D924E0 80240DE0 8E020084 */ lw $v0, 0x84($s0) -/* D924E4 80240DE4 0440000A */ bltz $v0, .L80240E10 -/* D924E8 80240DE8 00000000 */ nop -/* D924EC 80240DEC 28420002 */ slti $v0, $v0, 2 -/* D924F0 80240DF0 10400007 */ beqz $v0, .L80240E10 -/* D924F4 80240DF4 00000000 */ nop -.L80240DF8: -/* D924F8 80240DF8 3C048024 */ lui $a0, 0x8024 -/* D924FC 80240DFC 24840EE8 */ addiu $a0, $a0, 0xee8 -.L80240E00: -/* D92500 80240E00 0C048C56 */ jal bind_dynamic_entity_3 -/* D92504 80240E04 0000282D */ daddu $a1, $zero, $zero -/* D92508 80240E08 8E03013C */ lw $v1, 0x13c($s0) -/* D9250C 80240E0C AC620004 */ sw $v0, 4($v1) -.L80240E10: -/* D92510 80240E10 0C00EAD2 */ jal get_npc_safe -/* D92514 80240E14 2404FFFC */ addiu $a0, $zero, -4 -/* D92518 80240E18 0040282D */ daddu $a1, $v0, $zero -/* D9251C 80240E1C 10A00021 */ beqz $a1, .L80240EA4 -/* D92520 80240E20 24020002 */ addiu $v0, $zero, 2 -/* D92524 80240E24 8E020088 */ lw $v0, 0x88($s0) -/* D92528 80240E28 14400014 */ bnez $v0, .L80240E7C -/* D9252C 80240E2C 24020001 */ addiu $v0, $zero, 1 -/* D92530 80240E30 8E040084 */ lw $a0, 0x84($s0) -/* D92534 80240E34 10820016 */ beq $a0, $v0, .L80240E90 -/* D92538 80240E38 28820002 */ slti $v0, $a0, 2 -/* D9253C 80240E3C 10400005 */ beqz $v0, .L80240E54 -/* D92540 80240E40 24020002 */ addiu $v0, $zero, 2 -/* D92544 80240E44 10800007 */ beqz $a0, .L80240E64 -/* D92548 80240E48 00000000 */ nop -/* D9254C 80240E4C 080903A9 */ j .L80240EA4 -/* D92550 80240E50 00000000 */ nop -.L80240E54: -/* D92554 80240E54 10820006 */ beq $a0, $v0, .L80240E70 -/* D92558 80240E58 24020002 */ addiu $v0, $zero, 2 -/* D9255C 80240E5C 080903A9 */ j .L80240EA4 -/* D92560 80240E60 00000000 */ nop -.L80240E64: -/* D92564 80240E64 8CA20000 */ lw $v0, ($a1) -/* D92568 80240E68 080903A6 */ j .L80240E98 -/* D9256C 80240E6C 3C03000A */ lui $v1, 0xa -.L80240E70: -/* D92570 80240E70 8CA20000 */ lw $v0, ($a1) -/* D92574 80240E74 080903A6 */ j .L80240E98 -/* D92578 80240E78 3C030002 */ lui $v1, 2 -.L80240E7C: -/* D9257C 80240E7C 8E020084 */ lw $v0, 0x84($s0) -/* D92580 80240E80 04400007 */ bltz $v0, .L80240EA0 -/* D92584 80240E84 28420002 */ slti $v0, $v0, 2 -/* D92588 80240E88 10400006 */ beqz $v0, .L80240EA4 -/* D9258C 80240E8C 24020002 */ addiu $v0, $zero, 2 -.L80240E90: -/* D92590 80240E90 8CA20000 */ lw $v0, ($a1) -/* D92594 80240E94 3C030008 */ lui $v1, 8 -.L80240E98: -/* D92598 80240E98 00431025 */ or $v0, $v0, $v1 -/* D9259C 80240E9C ACA20000 */ sw $v0, ($a1) -.L80240EA0: -/* D925A0 80240EA0 24020002 */ addiu $v0, $zero, 2 -.L80240EA4: -/* D925A4 80240EA4 8FBF0014 */ lw $ra, 0x14($sp) -/* D925A8 80240EA8 8FB00010 */ lw $s0, 0x10($sp) -/* D925AC 80240EAC 03E00008 */ jr $ra -/* D925B0 80240EB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_36/func_80240EB4_D91700.s b/asm/nonmatchings/world/area_pra/pra_36/func_80240EB4_D91700.s deleted file mode 100644 index 54be3fa4c2..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/func_80240EB4_D91700.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_D925B4 -/* D925B4 80240EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D925B8 80240EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D925BC 80240EBC 0C00EAD2 */ jal get_npc_safe -/* D925C0 80240EC0 2404FFFC */ addiu $a0, $zero, -4 -/* D925C4 80240EC4 0040202D */ daddu $a0, $v0, $zero -/* D925C8 80240EC8 10800004 */ beqz $a0, .L80240EDC -/* D925CC 80240ECC 3C03000A */ lui $v1, 0xa -/* D925D0 80240ED0 8C820000 */ lw $v0, ($a0) -/* D925D4 80240ED4 00431025 */ or $v0, $v0, $v1 -/* D925D8 80240ED8 AC820000 */ sw $v0, ($a0) -.L80240EDC: -/* D925DC 80240EDC 8FBF0010 */ lw $ra, 0x10($sp) -/* D925E0 80240EE0 03E00008 */ jr $ra -/* D925E4 80240EE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_36/func_80240EE8_D91700.s b/asm/nonmatchings/world/area_pra/pra_36/func_80240EE8_D91700.s deleted file mode 100644 index 31bc9968b3..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/func_80240EE8_D91700.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE8_D925E8 -/* D925E8 80240EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D925EC 80240EEC AFBF0010 */ sw $ra, 0x10($sp) -/* D925F0 80240EF0 0C00EAD2 */ jal get_npc_safe -/* D925F4 80240EF4 2404FFFC */ addiu $a0, $zero, -4 -/* D925F8 80240EF8 0040202D */ daddu $a0, $v0, $zero -/* D925FC 80240EFC 10800004 */ beqz $a0, .L80240F10 -/* D92600 80240F00 3C030008 */ lui $v1, 8 -/* D92604 80240F04 8C820000 */ lw $v0, ($a0) -/* D92608 80240F08 00431025 */ or $v0, $v0, $v1 -/* D9260C 80240F0C AC820000 */ sw $v0, ($a0) -.L80240F10: -/* D92610 80240F10 8FBF0010 */ lw $ra, 0x10($sp) -/* D92614 80240F14 03E00008 */ jr $ra -/* D92618 80240F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_36/func_80240F1C_D91700.s b/asm/nonmatchings/world/area_pra/pra_36/func_80240F1C_D91700.s deleted file mode 100644 index da883f24f1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/func_80240F1C_D91700.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F1C_D9261C -/* D9261C 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D92620 80240F20 AFBF0010 */ sw $ra, 0x10($sp) -/* D92624 80240F24 0C00EAD2 */ jal get_npc_safe -/* D92628 80240F28 2404FFFC */ addiu $a0, $zero, -4 -/* D9262C 80240F2C 0040202D */ daddu $a0, $v0, $zero -/* D92630 80240F30 10800004 */ beqz $a0, .L80240F44 -/* D92634 80240F34 3C030002 */ lui $v1, 2 -/* D92638 80240F38 8C820000 */ lw $v0, ($a0) -/* D9263C 80240F3C 00431025 */ or $v0, $v0, $v1 -/* D92640 80240F40 AC820000 */ sw $v0, ($a0) -.L80240F44: -/* D92644 80240F44 8FBF0010 */ lw $ra, 0x10($sp) -/* D92648 80240F48 03E00008 */ jr $ra -/* D9264C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_37/func_80240050_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/func_80240050_D92F40.s deleted file mode 100644 index cae6353cb9..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/func_80240050_D92F40.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D92F90 -/* D92F90 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D92F94 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D92F98 80240058 00822024 */ and $a0, $a0, $v0 -/* D92F9C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D92FA0 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D92FA4 80240064 00821821 */ addu $v1, $a0, $v0 -/* D92FA8 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D92FAC 8024006C 10400003 */ beqz $v0, .L8024007C -/* D92FB0 80240070 30620001 */ andi $v0, $v1, 1 -/* D92FB4 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D92FB8 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D92FBC 8024007C 03E00008 */ jr $ra -/* D92FC0 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_37/func_80240084_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/func_80240084_D92F40.s deleted file mode 100644 index adfb8279e8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/func_80240084_D92F40.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240084_D92FC4 -/* D92FC4 80240084 00041403 */ sra $v0, $a0, 0x10 -/* D92FC8 80240088 304300FF */ andi $v1, $v0, 0xff -/* D92FCC 8024008C 24020006 */ addiu $v0, $zero, 6 -/* D92FD0 80240090 10620015 */ beq $v1, $v0, .L802400E8 -/* D92FD4 80240094 28620007 */ slti $v0, $v1, 7 -/* D92FD8 80240098 10400005 */ beqz $v0, .L802400B0 -/* D92FDC 8024009C 24020001 */ addiu $v0, $zero, 1 -/* D92FE0 802400A0 1062000A */ beq $v1, $v0, .L802400CC -/* D92FE4 802400A4 3C020100 */ lui $v0, 0x100 -/* D92FE8 802400A8 03E00008 */ jr $ra -/* D92FEC 802400AC 00821025 */ or $v0, $a0, $v0 -.L802400B0: -/* D92FF0 802400B0 2862000A */ slti $v0, $v1, 0xa -/* D92FF4 802400B4 10400016 */ beqz $v0, .L80240110 -/* D92FF8 802400B8 28620008 */ slti $v0, $v1, 8 -/* D92FFC 802400BC 14400015 */ bnez $v0, .L80240114 -/* D93000 802400C0 3C020100 */ lui $v0, 0x100 -/* D93004 802400C4 03E00008 */ jr $ra -/* D93008 802400C8 0080102D */ daddu $v0, $a0, $zero -.L802400CC: -/* D9300C 802400CC 3C020001 */ lui $v0, 1 -/* D93010 802400D0 3442000C */ ori $v0, $v0, 0xc -/* D93014 802400D4 0044102A */ slt $v0, $v0, $a0 -/* D93018 802400D8 1040000E */ beqz $v0, .L80240114 -/* D9301C 802400DC 3C020100 */ lui $v0, 0x100 -.L802400E0: -/* D93020 802400E0 03E00008 */ jr $ra -/* D93024 802400E4 0080102D */ daddu $v0, $a0, $zero -.L802400E8: -/* D93028 802400E8 3C02FFF9 */ lui $v0, 0xfff9 -/* D9302C 802400EC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D93030 802400F0 00821821 */ addu $v1, $a0, $v0 -/* D93034 802400F4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D93038 802400F8 10400005 */ beqz $v0, .L80240110 -/* D9303C 802400FC 30620001 */ andi $v0, $v1, 1 -/* D93040 80240100 1440FFF7 */ bnez $v0, .L802400E0 -/* D93044 80240104 24820001 */ addiu $v0, $a0, 1 -/* D93048 80240108 03E00008 */ jr $ra -/* D9304C 8024010C 00000000 */ nop -.L80240110: -/* D93050 80240110 3C020100 */ lui $v0, 0x100 -.L80240114: -/* D93054 80240114 03E00008 */ jr $ra -/* D93058 80240118 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_37/func_8024011C_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/func_8024011C_D92F40.s deleted file mode 100644 index c12624a85e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/func_8024011C_D92F40.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024011C_D9305C -/* D9305C 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D93060 80240120 AFB00010 */ sw $s0, 0x10($sp) -/* D93064 80240124 0080802D */ daddu $s0, $a0, $zero -/* D93068 80240128 3C058024 */ lui $a1, 0x8024 -/* D9306C 8024012C 24A50158 */ addiu $a1, $a1, 0x158 -/* D93070 80240130 AFBF0014 */ sw $ra, 0x14($sp) -/* D93074 80240134 0C048C56 */ jal bind_dynamic_entity_3 -/* D93078 80240138 0000202D */ daddu $a0, $zero, $zero -/* D9307C 8024013C 8E03013C */ lw $v1, 0x13c($s0) -/* D93080 80240140 AC620000 */ sw $v0, ($v1) -/* D93084 80240144 8FBF0014 */ lw $ra, 0x14($sp) -/* D93088 80240148 8FB00010 */ lw $s0, 0x10($sp) -/* D9308C 8024014C 24020002 */ addiu $v0, $zero, 2 -/* D93090 80240150 03E00008 */ jr $ra -/* D93094 80240154 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_37/func_80240158_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/func_80240158_D92F40.s deleted file mode 100644 index da446aa502..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/func_80240158_D92F40.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_D93098 -/* D93098 80240158 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D9309C 8024015C AFB00040 */ sw $s0, 0x40($sp) -/* D930A0 80240160 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D930A4 80240164 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D930A8 80240168 AFB20048 */ sw $s2, 0x48($sp) -/* D930AC 8024016C AFBF004C */ sw $ra, 0x4c($sp) -/* D930B0 80240170 AFB10044 */ sw $s1, 0x44($sp) -/* D930B4 80240174 8E020000 */ lw $v0, ($s0) -/* D930B8 80240178 821100BE */ lb $s1, 0xbe($s0) -/* D930BC 8024017C 30420001 */ andi $v0, $v0, 1 -/* D930C0 80240180 10400061 */ beqz $v0, .L80240308 -/* D930C4 80240184 27B20020 */ addiu $s2, $sp, 0x20 -/* D930C8 80240188 8E0400CC */ lw $a0, 0xcc($s0) -/* D930CC 8024018C 0C044181 */ jal get_shadow_by_index -/* D930D0 80240190 00000000 */ nop -/* D930D4 80240194 0C048B77 */ jal func_80122DDC -/* D930D8 80240198 84440008 */ lh $a0, 8($v0) -/* D930DC 8024019C 8C430000 */ lw $v1, ($v0) -/* D930E0 802401A0 34630200 */ ori $v1, $v1, 0x200 -/* D930E4 802401A4 AC430000 */ sw $v1, ($v0) -/* D930E8 802401A8 8E050028 */ lw $a1, 0x28($s0) -/* D930EC 802401AC 8E06002C */ lw $a2, 0x2c($s0) -/* D930F0 802401B0 27A20030 */ addiu $v0, $sp, 0x30 -/* D930F4 802401B4 AFA20010 */ sw $v0, 0x10($sp) -/* D930F8 802401B8 27A20034 */ addiu $v0, $sp, 0x34 -/* D930FC 802401BC AFA20014 */ sw $v0, 0x14($sp) -/* D93100 802401C0 C6000030 */ lwc1 $f0, 0x30($s0) -/* D93104 802401C4 3C04800A */ lui $a0, 0x800a -/* D93108 802401C8 8484A634 */ lh $a0, -0x59cc($a0) -/* D9310C 802401CC 46000007 */ neg.s $f0, $f0 -/* D93110 802401D0 44070000 */ mfc1 $a3, $f0 -/* D93114 802401D4 27A20038 */ addiu $v0, $sp, 0x38 -/* D93118 802401D8 0C00B94E */ jal get_screen_coords -/* D9311C 802401DC AFA20018 */ sw $v0, 0x18($sp) -/* D93120 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D93124 802401E4 0C090014 */ jal func_80240050 -/* D93128 802401E8 00000000 */ nop -/* D9312C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) -/* D93130 802401F0 3C014307 */ lui $at, 0x4307 -/* D93134 802401F4 44810000 */ mtc1 $at, $f0 -/* D93138 802401F8 00000000 */ nop -/* D9313C 802401FC 4602003C */ c.lt.s $f0, $f2 -/* D93140 80240200 00000000 */ nop -/* D93144 80240204 4500000B */ bc1f .L80240234 -/* D93148 80240208 24040002 */ addiu $a0, $zero, 2 -/* D9314C 8024020C 3C014361 */ lui $at, 0x4361 -/* D93150 80240210 44810000 */ mtc1 $at, $f0 -/* D93154 80240214 00000000 */ nop -/* D93158 80240218 4600103C */ c.lt.s $f2, $f0 -/* D9315C 8024021C 00000000 */ nop -/* D93160 80240220 45000004 */ bc1f .L80240234 -/* D93164 80240224 00000000 */ nop -/* D93168 80240228 0C090021 */ jal func_80240084 -/* D9316C 8024022C 0040202D */ daddu $a0, $v0, $zero -/* D93170 80240230 24040002 */ addiu $a0, $zero, 2 -.L80240234: -/* D93174 80240234 3C063F80 */ lui $a2, 0x3f80 -/* D93178 80240238 0C0B76A3 */ jal func_802DDA8C -/* D9317C 8024023C 0040282D */ daddu $a1, $v0, $zero -/* D93180 80240240 8E020000 */ lw $v0, ($s0) -/* D93184 80240244 3C030002 */ lui $v1, 2 -/* D93188 80240248 00431024 */ and $v0, $v0, $v1 -/* D9318C 8024024C 54400022 */ bnel $v0, $zero, .L802402D8 -/* D93190 80240250 24110011 */ addiu $s1, $zero, 0x11 -/* D93194 80240254 9203000E */ lbu $v1, 0xe($s0) -/* D93198 80240258 3C02802E */ lui $v0, 0x802e -/* D9319C 8024025C 90429D70 */ lbu $v0, -0x6290($v0) -/* D931A0 80240260 10620018 */ beq $v1, $v0, .L802402C4 -/* D931A4 80240264 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D931A8 80240268 1040000B */ beqz $v0, .L80240298 -/* D931AC 8024026C 24110011 */ addiu $s1, $zero, 0x11 -/* D931B0 80240270 24040002 */ addiu $a0, $zero, 2 -/* D931B4 80240274 2405FFFF */ addiu $a1, $zero, -1 -/* D931B8 80240278 24060007 */ addiu $a2, $zero, 7 -/* D931BC 8024027C 0060102D */ daddu $v0, $v1, $zero -/* D931C0 80240280 0000382D */ daddu $a3, $zero, $zero -/* D931C4 80240284 AFA00010 */ sw $zero, 0x10($sp) -/* D931C8 80240288 AFA00014 */ sw $zero, 0x14($sp) -/* D931CC 8024028C AFA0001C */ sw $zero, 0x1c($sp) -/* D931D0 80240290 080900AF */ j .L802402BC -/* D931D4 80240294 AFA20018 */ sw $v0, 0x18($sp) -.L80240298: -/* D931D8 80240298 2411000D */ addiu $s1, $zero, 0xd -/* D931DC 8024029C 24040002 */ addiu $a0, $zero, 2 -/* D931E0 802402A0 2405FFFF */ addiu $a1, $zero, -1 -/* D931E4 802402A4 0000302D */ daddu $a2, $zero, $zero -/* D931E8 802402A8 00C0382D */ daddu $a3, $a2, $zero -/* D931EC 802402AC AFA00010 */ sw $zero, 0x10($sp) -/* D931F0 802402B0 AFA00014 */ sw $zero, 0x14($sp) -/* D931F4 802402B4 AFA00018 */ sw $zero, 0x18($sp) -/* D931F8 802402B8 AFA0001C */ sw $zero, 0x1c($sp) -.L802402BC: -/* D931FC 802402BC 0C0B77B9 */ jal func_802DDEE4 -/* D93200 802402C0 00000000 */ nop -.L802402C4: -/* D93204 802402C4 9202000E */ lbu $v0, 0xe($s0) -/* D93208 802402C8 3C01802E */ lui $at, 0x802e -/* D9320C 802402CC A0229D70 */ sb $v0, -0x6290($at) -/* D93210 802402D0 080900B9 */ j .L802402E4 -/* D93214 802402D4 0240202D */ daddu $a0, $s2, $zero -.L802402D8: -/* D93218 802402D8 3C01802E */ lui $at, 0x802e -/* D9321C 802402DC A0209D70 */ sb $zero, -0x6290($at) -/* D93220 802402E0 0240202D */ daddu $a0, $s2, $zero -.L802402E4: -/* D93224 802402E4 AC910000 */ sw $s1, ($a0) -/* D93228 802402E8 AC900008 */ sw $s0, 8($a0) -/* D9322C 802402EC 8FA20038 */ lw $v0, 0x38($sp) -/* D93230 802402F0 3C038024 */ lui $v1, 0x8024 -/* D93234 802402F4 24630320 */ addiu $v1, $v1, 0x320 -/* D93238 802402F8 AC83000C */ sw $v1, 0xc($a0) -/* D9323C 802402FC 00021023 */ negu $v0, $v0 -/* D93240 80240300 0C047644 */ jal queue_render_task -/* D93244 80240304 AC820004 */ sw $v0, 4($a0) -.L80240308: -/* D93248 80240308 8FBF004C */ lw $ra, 0x4c($sp) -/* D9324C 8024030C 8FB20048 */ lw $s2, 0x48($sp) -/* D93250 80240310 8FB10044 */ lw $s1, 0x44($sp) -/* D93254 80240314 8FB00040 */ lw $s0, 0x40($sp) -/* D93258 80240318 03E00008 */ jr $ra -/* D9325C 8024031C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_37/func_80240320_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/func_80240320_D92F40.s deleted file mode 100644 index a49931f928..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/func_80240320_D92F40.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240320_D93260 -/* D93260 80240320 3C03800A */ lui $v1, 0x800a -/* D93264 80240324 8463A634 */ lh $v1, -0x59cc($v1) -/* D93268 80240328 3C07BF80 */ lui $a3, 0xbf80 -/* D9326C 8024032C 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D93270 80240330 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D93274 80240334 4480A000 */ mtc1 $zero, $f20 -/* D93278 80240338 AFB1011C */ sw $s1, 0x11c($sp) -/* D9327C 8024033C 0080882D */ daddu $s1, $a0, $zero -/* D93280 80240340 AFB00118 */ sw $s0, 0x118($sp) -/* D93284 80240344 27B00098 */ addiu $s0, $sp, 0x98 -/* D93288 80240348 AFBF0120 */ sw $ra, 0x120($sp) -/* D9328C 8024034C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D93290 80240350 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D93294 80240354 00031080 */ sll $v0, $v1, 2 -/* D93298 80240358 00431021 */ addu $v0, $v0, $v1 -/* D9329C 8024035C 00021080 */ sll $v0, $v0, 2 -/* D932A0 80240360 00431023 */ subu $v0, $v0, $v1 -/* D932A4 80240364 000218C0 */ sll $v1, $v0, 3 -/* D932A8 80240368 00431021 */ addu $v0, $v0, $v1 -/* D932AC 8024036C 000210C0 */ sll $v0, $v0, 3 -/* D932B0 80240370 3C01800B */ lui $at, 0x800b -/* D932B4 80240374 00220821 */ addu $at, $at, $v0 -/* D932B8 80240378 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D932BC 8024037C 4406A000 */ mfc1 $a2, $f20 -/* D932C0 80240380 4600B587 */ neg.s $f22, $f22 -/* D932C4 80240384 4405B000 */ mfc1 $a1, $f22 -/* D932C8 80240388 0200202D */ daddu $a0, $s0, $zero -/* D932CC 8024038C 0C019EC8 */ jal guRotateF -/* D932D0 80240390 E7B40010 */ swc1 $f20, 0x10($sp) -/* D932D4 80240394 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D932D8 80240398 0C00A6C9 */ jal clamp_angle -/* D932DC 8024039C 00000000 */ nop -/* D932E0 802403A0 44050000 */ mfc1 $a1, $f0 -/* D932E4 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D932E8 802403A8 4407A000 */ mfc1 $a3, $f20 -/* D932EC 802403AC 3C013F80 */ lui $at, 0x3f80 -/* D932F0 802403B0 4481C000 */ mtc1 $at, $f24 -/* D932F4 802403B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D932F8 802403B8 0C019EC8 */ jal guRotateF -/* D932FC 802403BC E7B80010 */ swc1 $f24, 0x10($sp) -/* D93300 802403C0 0200202D */ daddu $a0, $s0, $zero -/* D93304 802403C4 27A50018 */ addiu $a1, $sp, 0x18 -/* D93308 802403C8 0C019D80 */ jal guMtxCatF -/* D9330C 802403CC 00A0302D */ daddu $a2, $a1, $zero -/* D93310 802403D0 4405B000 */ mfc1 $a1, $f22 -/* D93314 802403D4 4406A000 */ mfc1 $a2, $f20 -/* D93318 802403D8 4407C000 */ mfc1 $a3, $f24 -/* D9331C 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D93320 802403E0 0C019EC8 */ jal guRotateF -/* D93324 802403E4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D93328 802403E8 27A40018 */ addiu $a0, $sp, 0x18 -/* D9332C 802403EC 0200282D */ daddu $a1, $s0, $zero -/* D93330 802403F0 0C019D80 */ jal guMtxCatF -/* D93334 802403F4 0080302D */ daddu $a2, $a0, $zero -/* D93338 802403F8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D9333C 802403FC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D93340 80240400 4406A000 */ mfc1 $a2, $f20 -/* D93344 80240404 4407C000 */ mfc1 $a3, $f24 -/* D93348 80240408 0C019EC8 */ jal guRotateF -/* D9334C 8024040C 0200202D */ daddu $a0, $s0, $zero -/* D93350 80240410 27A40018 */ addiu $a0, $sp, 0x18 -/* D93354 80240414 0200282D */ daddu $a1, $s0, $zero -/* D93358 80240418 0C019D80 */ jal guMtxCatF -/* D9335C 8024041C 0080302D */ daddu $a2, $a0, $zero -/* D93360 80240420 3C013F36 */ lui $at, 0x3f36 -/* D93364 80240424 3421DB6E */ ori $at, $at, 0xdb6e -/* D93368 80240428 44810000 */ mtc1 $at, $f0 -/* D9336C 8024042C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D93370 80240430 44050000 */ mfc1 $a1, $f0 -/* D93374 80240434 0200202D */ daddu $a0, $s0, $zero -/* D93378 80240438 00A0302D */ daddu $a2, $a1, $zero -/* D9337C 8024043C 0C019DF0 */ jal guScaleF -/* D93380 80240440 00A0382D */ daddu $a3, $a1, $zero -/* D93384 80240444 27A40018 */ addiu $a0, $sp, 0x18 -/* D93388 80240448 0200282D */ daddu $a1, $s0, $zero -/* D9338C 8024044C 0C019D80 */ jal guMtxCatF -/* D93390 80240450 0080302D */ daddu $a2, $a0, $zero -/* D93394 80240454 27B00058 */ addiu $s0, $sp, 0x58 -/* D93398 80240458 C6200030 */ lwc1 $f0, 0x30($s1) -/* D9339C 8024045C 3C014040 */ lui $at, 0x4040 -/* D933A0 80240460 44811000 */ mtc1 $at, $f2 -/* D933A4 80240464 46000007 */ neg.s $f0, $f0 -/* D933A8 80240468 46020001 */ sub.s $f0, $f0, $f2 -/* D933AC 8024046C 8E250028 */ lw $a1, 0x28($s1) -/* D933B0 80240470 8E26002C */ lw $a2, 0x2c($s1) -/* D933B4 80240474 44070000 */ mfc1 $a3, $f0 -/* D933B8 80240478 0C019E40 */ jal guTranslateF -/* D933BC 8024047C 0200202D */ daddu $a0, $s0, $zero -/* D933C0 80240480 27A40018 */ addiu $a0, $sp, 0x18 -/* D933C4 80240484 0200282D */ daddu $a1, $s0, $zero -/* D933C8 80240488 0C019D80 */ jal guMtxCatF -/* D933CC 8024048C 0080302D */ daddu $a2, $a0, $zero -/* D933D0 80240490 24040002 */ addiu $a0, $zero, 2 -/* D933D4 80240494 0000282D */ daddu $a1, $zero, $zero -/* D933D8 80240498 00A0302D */ daddu $a2, $a1, $zero -/* D933DC 8024049C 00A0382D */ daddu $a3, $a1, $zero -/* D933E0 802404A0 27A20018 */ addiu $v0, $sp, 0x18 -/* D933E4 802404A4 0C0B7710 */ jal render_sprite -/* D933E8 802404A8 AFA20010 */ sw $v0, 0x10($sp) -/* D933EC 802404AC 8FBF0120 */ lw $ra, 0x120($sp) -/* D933F0 802404B0 8FB1011C */ lw $s1, 0x11c($sp) -/* D933F4 802404B4 8FB00118 */ lw $s0, 0x118($sp) -/* D933F8 802404B8 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D933FC 802404BC D7B60130 */ ldc1 $f22, 0x130($sp) -/* D93400 802404C0 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D93404 802404C4 03E00008 */ jr $ra -/* D93408 802404C8 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_37/func_802404CC_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/func_802404CC_D92F40.s deleted file mode 100644 index 7e1df09ed3..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/func_802404CC_D92F40.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404CC_D9340C -/* D9340C 802404CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D93410 802404D0 AFB00010 */ sw $s0, 0x10($sp) -/* D93414 802404D4 0080802D */ daddu $s0, $a0, $zero -/* D93418 802404D8 AFBF0014 */ sw $ra, 0x14($sp) -/* D9341C 802404DC 8E020084 */ lw $v0, 0x84($s0) -/* D93420 802404E0 0440000E */ bltz $v0, .L8024051C -/* D93424 802404E4 28420002 */ slti $v0, $v0, 2 -/* D93428 802404E8 1040000C */ beqz $v0, .L8024051C -/* D9342C 802404EC 00000000 */ nop -/* D93430 802404F0 3C058024 */ lui $a1, 0x8024 -/* D93434 802404F4 24A50530 */ addiu $a1, $a1, 0x530 -/* D93438 802404F8 0C048C56 */ jal bind_dynamic_entity_3 -/* D9343C 802404FC 0000202D */ daddu $a0, $zero, $zero -/* D93440 80240500 8E03013C */ lw $v1, 0x13c($s0) -/* D93444 80240504 AC620000 */ sw $v0, ($v1) -/* D93448 80240508 3C03800A */ lui $v1, %hi(D_8009A650) -/* D9344C 8024050C 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D93450 80240510 8C620000 */ lw $v0, ($v1) -/* D93454 80240514 34420080 */ ori $v0, $v0, 0x80 -/* D93458 80240518 AC620000 */ sw $v0, ($v1) -.L8024051C: -/* D9345C 8024051C 8FBF0014 */ lw $ra, 0x14($sp) -/* D93460 80240520 8FB00010 */ lw $s0, 0x10($sp) -/* D93464 80240524 24020002 */ addiu $v0, $zero, 2 -/* D93468 80240528 03E00008 */ jr $ra -/* D9346C 8024052C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_37/func_80240530_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/func_80240530_D92F40.s deleted file mode 100644 index cfd19f893e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/func_80240530_D92F40.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240530_D93470 -/* D93470 80240530 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D93474 80240534 AFB00040 */ sw $s0, 0x40($sp) -/* D93478 80240538 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D9347C 8024053C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D93480 80240540 AFB10044 */ sw $s1, 0x44($sp) -/* D93484 80240544 AFBF004C */ sw $ra, 0x4c($sp) -/* D93488 80240548 AFB20048 */ sw $s2, 0x48($sp) -/* D9348C 8024054C 8E020000 */ lw $v0, ($s0) -/* D93490 80240550 821200BE */ lb $s2, 0xbe($s0) -/* D93494 80240554 30420001 */ andi $v0, $v0, 1 -/* D93498 80240558 10400052 */ beqz $v0, .L802406A4 -/* D9349C 8024055C 27B10020 */ addiu $s1, $sp, 0x20 -/* D934A0 80240560 8E0400CC */ lw $a0, 0xcc($s0) -/* D934A4 80240564 0C044181 */ jal get_shadow_by_index -/* D934A8 80240568 00000000 */ nop -/* D934AC 8024056C 0C048B77 */ jal func_80122DDC -/* D934B0 80240570 84440008 */ lh $a0, 8($v0) -/* D934B4 80240574 8E050028 */ lw $a1, 0x28($s0) -/* D934B8 80240578 8E070030 */ lw $a3, 0x30($s0) -/* D934BC 8024057C 27A20030 */ addiu $v0, $sp, 0x30 -/* D934C0 80240580 AFA20010 */ sw $v0, 0x10($sp) -/* D934C4 80240584 27A20034 */ addiu $v0, $sp, 0x34 -/* D934C8 80240588 AFA20014 */ sw $v0, 0x14($sp) -/* D934CC 8024058C 27A20038 */ addiu $v0, $sp, 0x38 -/* D934D0 80240590 AFA20018 */ sw $v0, 0x18($sp) -/* D934D4 80240594 C600002C */ lwc1 $f0, 0x2c($s0) -/* D934D8 80240598 3C04800A */ lui $a0, 0x800a -/* D934DC 8024059C 8484A634 */ lh $a0, -0x59cc($a0) -/* D934E0 802405A0 46000007 */ neg.s $f0, $f0 -/* D934E4 802405A4 44060000 */ mfc1 $a2, $f0 -/* D934E8 802405A8 0C00B94E */ jal get_screen_coords -/* D934EC 802405AC 00000000 */ nop -/* D934F0 802405B0 8E0500A4 */ lw $a1, 0xa4($s0) -/* D934F4 802405B4 3C063F80 */ lui $a2, 0x3f80 -/* D934F8 802405B8 0C0B76A3 */ jal func_802DDA8C -/* D934FC 802405BC 24040001 */ addiu $a0, $zero, 1 -/* D93500 802405C0 8E020000 */ lw $v0, ($s0) -/* D93504 802405C4 3C030002 */ lui $v1, 2 -/* D93508 802405C8 00431024 */ and $v0, $v0, $v1 -/* D9350C 802405CC 54400022 */ bnel $v0, $zero, .L80240658 -/* D93510 802405D0 24120011 */ addiu $s2, $zero, 0x11 -/* D93514 802405D4 9203000E */ lbu $v1, 0xe($s0) -/* D93518 802405D8 3C02802E */ lui $v0, 0x802e -/* D9351C 802405DC 90429D71 */ lbu $v0, -0x628f($v0) -/* D93520 802405E0 10620018 */ beq $v1, $v0, .L80240644 -/* D93524 802405E4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D93528 802405E8 1040000B */ beqz $v0, .L80240618 -/* D9352C 802405EC 24120011 */ addiu $s2, $zero, 0x11 -/* D93530 802405F0 24040001 */ addiu $a0, $zero, 1 -/* D93534 802405F4 2405FFFF */ addiu $a1, $zero, -1 -/* D93538 802405F8 24060007 */ addiu $a2, $zero, 7 -/* D9353C 802405FC 0060102D */ daddu $v0, $v1, $zero -/* D93540 80240600 0000382D */ daddu $a3, $zero, $zero -/* D93544 80240604 AFA00010 */ sw $zero, 0x10($sp) -/* D93548 80240608 AFA00014 */ sw $zero, 0x14($sp) -/* D9354C 8024060C AFA0001C */ sw $zero, 0x1c($sp) -/* D93550 80240610 0809018F */ j .L8024063C -/* D93554 80240614 AFA20018 */ sw $v0, 0x18($sp) -.L80240618: -/* D93558 80240618 2412000D */ addiu $s2, $zero, 0xd -/* D9355C 8024061C 24040001 */ addiu $a0, $zero, 1 -/* D93560 80240620 2405FFFF */ addiu $a1, $zero, -1 -/* D93564 80240624 0000302D */ daddu $a2, $zero, $zero -/* D93568 80240628 00C0382D */ daddu $a3, $a2, $zero -/* D9356C 8024062C AFA00010 */ sw $zero, 0x10($sp) -/* D93570 80240630 AFA00014 */ sw $zero, 0x14($sp) -/* D93574 80240634 AFA00018 */ sw $zero, 0x18($sp) -/* D93578 80240638 AFA0001C */ sw $zero, 0x1c($sp) -.L8024063C: -/* D9357C 8024063C 0C0B77B9 */ jal func_802DDEE4 -/* D93580 80240640 00000000 */ nop -.L80240644: -/* D93584 80240644 9202000E */ lbu $v0, 0xe($s0) -/* D93588 80240648 3C01802E */ lui $at, 0x802e -/* D9358C 8024064C A0229D71 */ sb $v0, -0x628f($at) -/* D93590 80240650 08090198 */ j .L80240660 -/* D93594 80240654 00000000 */ nop -.L80240658: -/* D93598 80240658 3C01802E */ lui $at, 0x802e -/* D9359C 8024065C A0209D71 */ sb $zero, -0x628f($at) -.L80240660: -/* D935A0 80240660 8FA20038 */ lw $v0, 0x38($sp) -/* D935A4 80240664 3C048024 */ lui $a0, 0x8024 -/* D935A8 80240668 248408A0 */ addiu $a0, $a0, 0x8a0 -/* D935AC 8024066C AE320000 */ sw $s2, ($s1) -/* D935B0 80240670 AE300008 */ sw $s0, 8($s1) -/* D935B4 80240674 00021023 */ negu $v0, $v0 -/* D935B8 80240678 AE220004 */ sw $v0, 4($s1) -/* D935BC 8024067C 8E020000 */ lw $v0, ($s0) -/* D935C0 80240680 3C030002 */ lui $v1, 2 -/* D935C4 80240684 00431024 */ and $v0, $v0, $v1 -/* D935C8 80240688 54400004 */ bnel $v0, $zero, .L8024069C -/* D935CC 8024068C AE24000C */ sw $a0, 0xc($s1) -/* D935D0 80240690 3C048024 */ lui $a0, 0x8024 -/* D935D4 80240694 248406BC */ addiu $a0, $a0, 0x6bc -/* D935D8 80240698 AE24000C */ sw $a0, 0xc($s1) -.L8024069C: -/* D935DC 8024069C 0C047644 */ jal queue_render_task -/* D935E0 802406A0 0220202D */ daddu $a0, $s1, $zero -.L802406A4: -/* D935E4 802406A4 8FBF004C */ lw $ra, 0x4c($sp) -/* D935E8 802406A8 8FB20048 */ lw $s2, 0x48($sp) -/* D935EC 802406AC 8FB10044 */ lw $s1, 0x44($sp) -/* D935F0 802406B0 8FB00040 */ lw $s0, 0x40($sp) -/* D935F4 802406B4 03E00008 */ jr $ra -/* D935F8 802406B8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_37/func_802406BC_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/func_802406BC_D92F40.s deleted file mode 100644 index 9ecfb102a5..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/func_802406BC_D92F40.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406BC_D935FC -/* D935FC 802406BC 3C03800A */ lui $v1, 0x800a -/* D93600 802406C0 8463A634 */ lh $v1, -0x59cc($v1) -/* D93604 802406C4 3C07BF80 */ lui $a3, 0xbf80 -/* D93608 802406C8 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D9360C 802406CC F7B40128 */ sdc1 $f20, 0x128($sp) -/* D93610 802406D0 4480A000 */ mtc1 $zero, $f20 -/* D93614 802406D4 AFB1011C */ sw $s1, 0x11c($sp) -/* D93618 802406D8 0080882D */ daddu $s1, $a0, $zero -/* D9361C 802406DC AFB00118 */ sw $s0, 0x118($sp) -/* D93620 802406E0 27B00098 */ addiu $s0, $sp, 0x98 -/* D93624 802406E4 AFBF0120 */ sw $ra, 0x120($sp) -/* D93628 802406E8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D9362C 802406EC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D93630 802406F0 00031080 */ sll $v0, $v1, 2 -/* D93634 802406F4 00431021 */ addu $v0, $v0, $v1 -/* D93638 802406F8 00021080 */ sll $v0, $v0, 2 -/* D9363C 802406FC 00431023 */ subu $v0, $v0, $v1 -/* D93640 80240700 000218C0 */ sll $v1, $v0, 3 -/* D93644 80240704 00431021 */ addu $v0, $v0, $v1 -/* D93648 80240708 000210C0 */ sll $v0, $v0, 3 -/* D9364C 8024070C 3C01800B */ lui $at, 0x800b -/* D93650 80240710 00220821 */ addu $at, $at, $v0 -/* D93654 80240714 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D93658 80240718 4406A000 */ mfc1 $a2, $f20 -/* D9365C 8024071C 4600B587 */ neg.s $f22, $f22 -/* D93660 80240720 4405B000 */ mfc1 $a1, $f22 -/* D93664 80240724 0200202D */ daddu $a0, $s0, $zero -/* D93668 80240728 0C019EC8 */ jal guRotateF -/* D9366C 8024072C E7B40010 */ swc1 $f20, 0x10($sp) -/* D93670 80240730 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D93674 80240734 0C00A6C9 */ jal clamp_angle -/* D93678 80240738 00000000 */ nop -/* D9367C 8024073C 44050000 */ mfc1 $a1, $f0 -/* D93680 80240740 4406A000 */ mfc1 $a2, $f20 -/* D93684 80240744 4407A000 */ mfc1 $a3, $f20 -/* D93688 80240748 3C013F80 */ lui $at, 0x3f80 -/* D9368C 8024074C 4481C000 */ mtc1 $at, $f24 -/* D93690 80240750 27A40018 */ addiu $a0, $sp, 0x18 -/* D93694 80240754 0C019EC8 */ jal guRotateF -/* D93698 80240758 E7B80010 */ swc1 $f24, 0x10($sp) -/* D9369C 8024075C 0200202D */ daddu $a0, $s0, $zero -/* D936A0 80240760 27A50018 */ addiu $a1, $sp, 0x18 -/* D936A4 80240764 0C019D80 */ jal guMtxCatF -/* D936A8 80240768 00A0302D */ daddu $a2, $a1, $zero -/* D936AC 8024076C 4405B000 */ mfc1 $a1, $f22 -/* D936B0 80240770 4406A000 */ mfc1 $a2, $f20 -/* D936B4 80240774 4407C000 */ mfc1 $a3, $f24 -/* D936B8 80240778 0200202D */ daddu $a0, $s0, $zero -/* D936BC 8024077C 0C019EC8 */ jal guRotateF -/* D936C0 80240780 E7B40010 */ swc1 $f20, 0x10($sp) -/* D936C4 80240784 27A40018 */ addiu $a0, $sp, 0x18 -/* D936C8 80240788 0200282D */ daddu $a1, $s0, $zero -/* D936CC 8024078C 0C019D80 */ jal guMtxCatF -/* D936D0 80240790 0080302D */ daddu $a2, $a0, $zero -/* D936D4 80240794 E7B40010 */ swc1 $f20, 0x10($sp) -/* D936D8 80240798 8E2500A8 */ lw $a1, 0xa8($s1) -/* D936DC 8024079C 4406A000 */ mfc1 $a2, $f20 -/* D936E0 802407A0 4407C000 */ mfc1 $a3, $f24 -/* D936E4 802407A4 0C019EC8 */ jal guRotateF -/* D936E8 802407A8 0200202D */ daddu $a0, $s0, $zero -/* D936EC 802407AC 27A40018 */ addiu $a0, $sp, 0x18 -/* D936F0 802407B0 0200282D */ daddu $a1, $s0, $zero -/* D936F4 802407B4 0C019D80 */ jal guMtxCatF -/* D936F8 802407B8 0080302D */ daddu $a2, $a0, $zero -/* D936FC 802407BC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D93700 802407C0 3C013F36 */ lui $at, 0x3f36 -/* D93704 802407C4 3421DB6E */ ori $at, $at, 0xdb6e -/* D93708 802407C8 44810000 */ mtc1 $at, $f0 -/* D9370C 802407CC 0200202D */ daddu $a0, $s0, $zero -/* D93710 802407D0 44050000 */ mfc1 $a1, $f0 -/* D93714 802407D4 3C06BF36 */ lui $a2, 0xbf36 -/* D93718 802407D8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D9371C 802407DC 0C019DF0 */ jal guScaleF -/* D93720 802407E0 00A0382D */ daddu $a3, $a1, $zero -/* D93724 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D93728 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D9372C 802407EC 0C019D80 */ jal guMtxCatF -/* D93730 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D93734 802407F4 27B00058 */ addiu $s0, $sp, 0x58 -/* D93738 802407F8 8E250028 */ lw $a1, 0x28($s1) -/* D9373C 802407FC C620002C */ lwc1 $f0, 0x2c($s1) -/* D93740 80240800 8E270030 */ lw $a3, 0x30($s1) -/* D93744 80240804 46000007 */ neg.s $f0, $f0 -/* D93748 80240808 44060000 */ mfc1 $a2, $f0 -/* D9374C 8024080C 0C019E40 */ jal guTranslateF -/* D93750 80240810 0200202D */ daddu $a0, $s0, $zero -/* D93754 80240814 27A40018 */ addiu $a0, $sp, 0x18 -/* D93758 80240818 0200282D */ daddu $a1, $s0, $zero -/* D9375C 8024081C 0C019D80 */ jal guMtxCatF -/* D93760 80240820 0080302D */ daddu $a2, $a0, $zero -/* D93764 80240824 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D93768 80240828 3C0142B4 */ lui $at, 0x42b4 -/* D9376C 8024082C 44810000 */ mtc1 $at, $f0 -/* D93770 80240830 00000000 */ nop -/* D93774 80240834 4602003E */ c.le.s $f0, $f2 -/* D93778 80240838 00000000 */ nop -/* D9377C 8024083C 4500000A */ bc1f .L80240868 -/* D93780 80240840 24040001 */ addiu $a0, $zero, 1 -/* D93784 80240844 3C014387 */ lui $at, 0x4387 -/* D93788 80240848 44810000 */ mtc1 $at, $f0 -/* D9378C 8024084C 00000000 */ nop -/* D93790 80240850 4600103C */ c.lt.s $f2, $f0 -/* D93794 80240854 00000000 */ nop -/* D93798 80240858 45000004 */ bc1f .L8024086C -/* D9379C 8024085C 27A20018 */ addiu $v0, $sp, 0x18 -/* D937A0 80240860 3C041000 */ lui $a0, 0x1000 -/* D937A4 80240864 34840001 */ ori $a0, $a0, 1 -.L80240868: -/* D937A8 80240868 27A20018 */ addiu $v0, $sp, 0x18 -.L8024086C: -/* D937AC 8024086C 0000282D */ daddu $a1, $zero, $zero -/* D937B0 80240870 00A0302D */ daddu $a2, $a1, $zero -/* D937B4 80240874 00A0382D */ daddu $a3, $a1, $zero -/* D937B8 80240878 0C0B7710 */ jal render_sprite -/* D937BC 8024087C AFA20010 */ sw $v0, 0x10($sp) -/* D937C0 80240880 8FBF0120 */ lw $ra, 0x120($sp) -/* D937C4 80240884 8FB1011C */ lw $s1, 0x11c($sp) -/* D937C8 80240888 8FB00118 */ lw $s0, 0x118($sp) -/* D937CC 8024088C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D937D0 80240890 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D937D4 80240894 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D937D8 80240898 03E00008 */ jr $ra -/* D937DC 8024089C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_37/func_802408A0_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/func_802408A0_D92F40.s deleted file mode 100644 index d80ddf7775..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/func_802408A0_D92F40.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A0_D937E0 -/* D937E0 802408A0 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D937E4 802408A4 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D937E8 802408A8 4480B000 */ mtc1 $zero, $f22 -/* D937EC 802408AC AFB10134 */ sw $s1, 0x134($sp) -/* D937F0 802408B0 0080882D */ daddu $s1, $a0, $zero -/* D937F4 802408B4 AFB3013C */ sw $s3, 0x13c($sp) -/* D937F8 802408B8 0000982D */ daddu $s3, $zero, $zero -/* D937FC 802408BC AFB60148 */ sw $s6, 0x148($sp) -/* D93800 802408C0 3C16800B */ lui $s6, %hi(gCameras) -/* D93804 802408C4 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D93808 802408C8 AFB50144 */ sw $s5, 0x144($sp) -/* D9380C 802408CC 241500FF */ addiu $s5, $zero, 0xff -/* D93810 802408D0 AFB00130 */ sw $s0, 0x130($sp) -/* D93814 802408D4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D93818 802408D8 AFB20138 */ sw $s2, 0x138($sp) -/* D9381C 802408DC 27B20060 */ addiu $s2, $sp, 0x60 -/* D93820 802408E0 AFB40140 */ sw $s4, 0x140($sp) -/* D93824 802408E4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D93828 802408E8 AFBF014C */ sw $ra, 0x14c($sp) -/* D9382C 802408EC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D93830 802408F0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D93834 802408F4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D93838 802408F8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D9383C 802408FC F7B40150 */ sdc1 $f20, 0x150($sp) -.L80240900: -/* D93840 80240900 3C03800A */ lui $v1, 0x800a -/* D93844 80240904 8463A634 */ lh $v1, -0x59cc($v1) -/* D93848 80240908 00031080 */ sll $v0, $v1, 2 -/* D9384C 8024090C 00431021 */ addu $v0, $v0, $v1 -/* D93850 80240910 00021080 */ sll $v0, $v0, 2 -/* D93854 80240914 00431023 */ subu $v0, $v0, $v1 -/* D93858 80240918 000218C0 */ sll $v1, $v0, 3 -/* D9385C 8024091C 00431021 */ addu $v0, $v0, $v1 -/* D93860 80240920 000210C0 */ sll $v0, $v0, 3 -/* D93864 80240924 00561021 */ addu $v0, $v0, $s6 -/* D93868 80240928 C440006C */ lwc1 $f0, 0x6c($v0) -/* D9386C 8024092C 16600065 */ bnez $s3, .L80240AC4 -/* D93870 80240930 46000507 */ neg.s $f20, $f0 -/* D93874 80240934 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D93878 80240938 3C0142B4 */ lui $at, 0x42b4 -/* D9387C 8024093C 44810000 */ mtc1 $at, $f0 -/* D93880 80240940 00000000 */ nop -/* D93884 80240944 4602003C */ c.lt.s $f0, $f2 -/* D93888 80240948 00000000 */ nop -/* D9388C 8024094C 4500000A */ bc1f .L80240978 -/* D93890 80240950 00000000 */ nop -/* D93894 80240954 3C014334 */ lui $at, 0x4334 -/* D93898 80240958 44812000 */ mtc1 $at, $f4 -/* D9389C 8024095C 00000000 */ nop -/* D938A0 80240960 4604103E */ c.le.s $f2, $f4 -/* D938A4 80240964 00000000 */ nop -/* D938A8 80240968 45000003 */ bc1f .L80240978 -/* D938AC 8024096C 00000000 */ nop -/* D938B0 80240970 08090282 */ j .L80240A08 -/* D938B4 80240974 46022501 */ sub.s $f20, $f4, $f2 -.L80240978: -/* D938B8 80240978 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D938BC 8024097C 3C014334 */ lui $at, 0x4334 -/* D938C0 80240980 44812000 */ mtc1 $at, $f4 -/* D938C4 80240984 00000000 */ nop -/* D938C8 80240988 4600203C */ c.lt.s $f4, $f0 -/* D938CC 8024098C 00000000 */ nop -/* D938D0 80240990 4500000C */ bc1f .L802409C4 -/* D938D4 80240994 00000000 */ nop -/* D938D8 80240998 3C014387 */ lui $at, 0x4387 -/* D938DC 8024099C 44812000 */ mtc1 $at, $f4 -/* D938E0 802409A0 00000000 */ nop -/* D938E4 802409A4 4604003E */ c.le.s $f0, $f4 -/* D938E8 802409A8 00000000 */ nop -/* D938EC 802409AC 45000008 */ bc1f .L802409D0 -/* D938F0 802409B0 00000000 */ nop -/* D938F4 802409B4 3C014334 */ lui $at, 0x4334 -/* D938F8 802409B8 44812000 */ mtc1 $at, $f4 -/* D938FC 802409BC 08090282 */ j .L80240A08 -/* D93900 802409C0 46040501 */ sub.s $f20, $f0, $f4 -.L802409C4: -/* D93904 802409C4 3C014387 */ lui $at, 0x4387 -/* D93908 802409C8 44812000 */ mtc1 $at, $f4 -/* D9390C 802409CC 00000000 */ nop -.L802409D0: -/* D93910 802409D0 4600203C */ c.lt.s $f4, $f0 -/* D93914 802409D4 00000000 */ nop -/* D93918 802409D8 4500000A */ bc1f .L80240A04 -/* D9391C 802409DC 00000000 */ nop -/* D93920 802409E0 3C0143B4 */ lui $at, 0x43b4 -/* D93924 802409E4 44811000 */ mtc1 $at, $f2 -/* D93928 802409E8 00000000 */ nop -/* D9392C 802409EC 4602003E */ c.le.s $f0, $f2 -/* D93930 802409F0 00000000 */ nop -/* D93934 802409F4 45000003 */ bc1f .L80240A04 -/* D93938 802409F8 00000000 */ nop -/* D9393C 802409FC 08090282 */ j .L80240A08 -/* D93940 80240A00 46001501 */ sub.s $f20, $f2, $f0 -.L80240A04: -/* D93944 80240A04 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L80240A08: -/* D93948 80240A08 3C0141C8 */ lui $at, 0x41c8 -/* D9394C 80240A0C 44810000 */ mtc1 $at, $f0 -/* D93950 80240A10 00000000 */ nop -/* D93954 80240A14 4600A003 */ div.s $f0, $f20, $f0 -/* D93958 80240A18 4600010D */ trunc.w.s $f4, $f0 -/* D9395C 80240A1C 44072000 */ mfc1 $a3, $f4 -/* D93960 80240A20 00000000 */ nop -/* D93964 80240A24 00071100 */ sll $v0, $a3, 4 -/* D93968 80240A28 00471023 */ subu $v0, $v0, $a3 -/* D9396C 80240A2C 00021080 */ sll $v0, $v0, 2 -/* D93970 80240A30 02A23823 */ subu $a3, $s5, $v0 -/* D93974 80240A34 28E20064 */ slti $v0, $a3, 0x64 -/* D93978 80240A38 54400001 */ bnel $v0, $zero, .L80240A40 -/* D9397C 80240A3C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A40: -/* D93980 80240A40 24040001 */ addiu $a0, $zero, 1 -/* D93984 80240A44 2405FFFF */ addiu $a1, $zero, -1 -/* D93988 80240A48 24060006 */ addiu $a2, $zero, 6 -/* D9398C 80240A4C AFA70010 */ sw $a3, 0x10($sp) -/* D93990 80240A50 AFA70014 */ sw $a3, 0x14($sp) -/* D93994 80240A54 AFB50018 */ sw $s5, 0x18($sp) -/* D93998 80240A58 0C0B77B9 */ jal func_802DDEE4 -/* D9399C 80240A5C AFA0001C */ sw $zero, 0x1c($sp) -/* D939A0 80240A60 4405A000 */ mfc1 $a1, $f20 -/* D939A4 80240A64 4406B000 */ mfc1 $a2, $f22 -/* D939A8 80240A68 3C07BF80 */ lui $a3, 0xbf80 -/* D939AC 80240A6C 0200202D */ daddu $a0, $s0, $zero -/* D939B0 80240A70 0C019EC8 */ jal guRotateF -/* D939B4 80240A74 E7B60010 */ swc1 $f22, 0x10($sp) -/* D939B8 80240A78 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D939BC 80240A7C 0C00A6C9 */ jal clamp_angle -/* D939C0 80240A80 00000000 */ nop -/* D939C4 80240A84 44050000 */ mfc1 $a1, $f0 -/* D939C8 80240A88 4406B000 */ mfc1 $a2, $f22 -/* D939CC 80240A8C 4407B000 */ mfc1 $a3, $f22 -/* D939D0 80240A90 3C013F80 */ lui $at, 0x3f80 -/* D939D4 80240A94 44812000 */ mtc1 $at, $f4 -/* D939D8 80240A98 27A40020 */ addiu $a0, $sp, 0x20 -/* D939DC 80240A9C 0C019EC8 */ jal guRotateF -/* D939E0 80240AA0 E7A40010 */ swc1 $f4, 0x10($sp) -/* D939E4 80240AA4 0200202D */ daddu $a0, $s0, $zero -/* D939E8 80240AA8 27A50020 */ addiu $a1, $sp, 0x20 -/* D939EC 80240AAC 0C019D80 */ jal guMtxCatF -/* D939F0 80240AB0 00A0302D */ daddu $a2, $a1, $zero -/* D939F4 80240AB4 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D939F8 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D939FC 80240ABC 080902E2 */ j .L80240B88 -/* D93A00 80240AC0 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240AC4: -/* D93A04 80240AC4 0260202D */ daddu $a0, $s3, $zero -/* D93A08 80240AC8 27A50120 */ addiu $a1, $sp, 0x120 -/* D93A0C 80240ACC 27A60124 */ addiu $a2, $sp, 0x124 -/* D93A10 80240AD0 0C03964E */ jal func_800E5938 -/* D93A14 80240AD4 27A70128 */ addiu $a3, $sp, 0x128 -/* D93A18 80240AD8 8FA60124 */ lw $a2, 0x124($sp) -/* D93A1C 80240ADC 3C028000 */ lui $v0, 0x8000 -/* D93A20 80240AE0 14C20004 */ bne $a2, $v0, .L80240AF4 -/* D93A24 80240AE4 46000606 */ mov.s $f24, $f0 -/* D93A28 80240AE8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D93A2C 80240AEC 080902C1 */ j .L80240B04 -/* D93A30 80240AF0 24040001 */ addiu $a0, $zero, 1 -.L80240AF4: -/* D93A34 80240AF4 4486D000 */ mtc1 $a2, $f26 -/* D93A38 80240AF8 00000000 */ nop -/* D93A3C 80240AFC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D93A40 80240B00 24040001 */ addiu $a0, $zero, 1 -.L80240B04: -/* D93A44 80240B04 2405FFFF */ addiu $a1, $zero, -1 -/* D93A48 80240B08 24060007 */ addiu $a2, $zero, 7 -/* D93A4C 80240B0C 0000382D */ daddu $a3, $zero, $zero -/* D93A50 80240B10 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D93A54 80240B14 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D93A58 80240B18 24020040 */ addiu $v0, $zero, 0x40 -/* D93A5C 80240B1C AFA00010 */ sw $zero, 0x10($sp) -/* D93A60 80240B20 AFA00014 */ sw $zero, 0x14($sp) -/* D93A64 80240B24 AFA20018 */ sw $v0, 0x18($sp) -/* D93A68 80240B28 0C0B77B9 */ jal func_802DDEE4 -/* D93A6C 80240B2C AFA0001C */ sw $zero, 0x1c($sp) -/* D93A70 80240B30 4405A000 */ mfc1 $a1, $f20 -/* D93A74 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D93A78 80240B38 3C07BF80 */ lui $a3, 0xbf80 -/* D93A7C 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D93A80 80240B40 0C019EC8 */ jal guRotateF -/* D93A84 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D93A88 80240B48 4405A000 */ mfc1 $a1, $f20 -/* D93A8C 80240B4C 4406B000 */ mfc1 $a2, $f22 -/* D93A90 80240B50 3C07BF80 */ lui $a3, 0xbf80 -/* D93A94 80240B54 0200202D */ daddu $a0, $s0, $zero -/* D93A98 80240B58 0C019EC8 */ jal guRotateF -/* D93A9C 80240B5C E7B60010 */ swc1 $f22, 0x10($sp) -/* D93AA0 80240B60 4405C000 */ mfc1 $a1, $f24 -/* D93AA4 80240B64 4406B000 */ mfc1 $a2, $f22 -/* D93AA8 80240B68 3C073F80 */ lui $a3, 0x3f80 -/* D93AAC 80240B6C 27A40020 */ addiu $a0, $sp, 0x20 -/* D93AB0 80240B70 0C019EC8 */ jal guRotateF -/* D93AB4 80240B74 E7B60010 */ swc1 $f22, 0x10($sp) -/* D93AB8 80240B78 0200202D */ daddu $a0, $s0, $zero -/* D93ABC 80240B7C 27A50020 */ addiu $a1, $sp, 0x20 -/* D93AC0 80240B80 0C019D80 */ jal guMtxCatF -/* D93AC4 80240B84 00A0302D */ daddu $a2, $a1, $zero -.L80240B88: -/* D93AC8 80240B88 862200B0 */ lh $v0, 0xb0($s1) -/* D93ACC 80240B8C 3C013F00 */ lui $at, 0x3f00 -/* D93AD0 80240B90 44812000 */ mtc1 $at, $f4 -/* D93AD4 80240B94 00021023 */ negu $v0, $v0 -/* D93AD8 80240B98 44820000 */ mtc1 $v0, $f0 -/* D93ADC 80240B9C 00000000 */ nop -/* D93AE0 80240BA0 46800020 */ cvt.s.w $f0, $f0 -/* D93AE4 80240BA4 46040102 */ mul.s $f4, $f0, $f4 -/* D93AE8 80240BA8 00000000 */ nop -/* D93AEC 80240BAC 4405B000 */ mfc1 $a1, $f22 -/* D93AF0 80240BB0 4407B000 */ mfc1 $a3, $f22 -/* D93AF4 80240BB4 44062000 */ mfc1 $a2, $f4 -/* D93AF8 80240BB8 0C019E40 */ jal guTranslateF -/* D93AFC 80240BBC 0240202D */ daddu $a0, $s2, $zero -/* D93B00 80240BC0 0240202D */ daddu $a0, $s2, $zero -/* D93B04 80240BC4 27A50020 */ addiu $a1, $sp, 0x20 -/* D93B08 80240BC8 0C019D80 */ jal guMtxCatF -/* D93B0C 80240BCC 00A0302D */ daddu $a2, $a1, $zero -/* D93B10 80240BD0 4405A000 */ mfc1 $a1, $f20 -/* D93B14 80240BD4 4406B000 */ mfc1 $a2, $f22 -/* D93B18 80240BD8 3C073F80 */ lui $a3, 0x3f80 -/* D93B1C 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D93B20 80240BE0 0C019EC8 */ jal guRotateF -/* D93B24 80240BE4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D93B28 80240BE8 27A40020 */ addiu $a0, $sp, 0x20 -/* D93B2C 80240BEC 0200282D */ daddu $a1, $s0, $zero -/* D93B30 80240BF0 0C019D80 */ jal guMtxCatF -/* D93B34 80240BF4 0080302D */ daddu $a2, $a0, $zero -/* D93B38 80240BF8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D93B3C 80240BFC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D93B40 80240C00 4406B000 */ mfc1 $a2, $f22 -/* D93B44 80240C04 3C073F80 */ lui $a3, 0x3f80 -/* D93B48 80240C08 0C019EC8 */ jal guRotateF -/* D93B4C 80240C0C 0200202D */ daddu $a0, $s0, $zero -/* D93B50 80240C10 27A40020 */ addiu $a0, $sp, 0x20 -/* D93B54 80240C14 0200282D */ daddu $a1, $s0, $zero -/* D93B58 80240C18 0C019D80 */ jal guMtxCatF -/* D93B5C 80240C1C 0080302D */ daddu $a2, $a0, $zero -/* D93B60 80240C20 862200B0 */ lh $v0, 0xb0($s1) -/* D93B64 80240C24 3C013F00 */ lui $at, 0x3f00 -/* D93B68 80240C28 44812000 */ mtc1 $at, $f4 -/* D93B6C 80240C2C 44820000 */ mtc1 $v0, $f0 -/* D93B70 80240C30 00000000 */ nop -/* D93B74 80240C34 46800020 */ cvt.s.w $f0, $f0 -/* D93B78 80240C38 46040102 */ mul.s $f4, $f0, $f4 -/* D93B7C 80240C3C 00000000 */ nop -/* D93B80 80240C40 4405B000 */ mfc1 $a1, $f22 -/* D93B84 80240C44 4407B000 */ mfc1 $a3, $f22 -/* D93B88 80240C48 44062000 */ mfc1 $a2, $f4 -/* D93B8C 80240C4C 0C019E40 */ jal guTranslateF -/* D93B90 80240C50 0240202D */ daddu $a0, $s2, $zero -/* D93B94 80240C54 27A40020 */ addiu $a0, $sp, 0x20 -/* D93B98 80240C58 0240282D */ daddu $a1, $s2, $zero -/* D93B9C 80240C5C 0C019D80 */ jal guMtxCatF -/* D93BA0 80240C60 0080302D */ daddu $a2, $a0, $zero -/* D93BA4 80240C64 3C013F36 */ lui $at, 0x3f36 -/* D93BA8 80240C68 3421DB6E */ ori $at, $at, 0xdb6e -/* D93BAC 80240C6C 44810000 */ mtc1 $at, $f0 -/* D93BB0 80240C70 0280202D */ daddu $a0, $s4, $zero -/* D93BB4 80240C74 44050000 */ mfc1 $a1, $f0 -/* D93BB8 80240C78 3C06BF36 */ lui $a2, 0xbf36 -/* D93BBC 80240C7C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D93BC0 80240C80 0C019DF0 */ jal guScaleF -/* D93BC4 80240C84 00A0382D */ daddu $a3, $a1, $zero -/* D93BC8 80240C88 27A40020 */ addiu $a0, $sp, 0x20 -/* D93BCC 80240C8C 0280282D */ daddu $a1, $s4, $zero -/* D93BD0 80240C90 0C019D80 */ jal guMtxCatF -/* D93BD4 80240C94 0080302D */ daddu $a2, $a0, $zero -/* D93BD8 80240C98 4600D687 */ neg.s $f26, $f26 -/* D93BDC 80240C9C 4405F000 */ mfc1 $a1, $f30 -/* D93BE0 80240CA0 4407E000 */ mfc1 $a3, $f28 -/* D93BE4 80240CA4 4406D000 */ mfc1 $a2, $f26 -/* D93BE8 80240CA8 0C019E40 */ jal guTranslateF -/* D93BEC 80240CAC 0240202D */ daddu $a0, $s2, $zero -/* D93BF0 80240CB0 27A40020 */ addiu $a0, $sp, 0x20 -/* D93BF4 80240CB4 0240282D */ daddu $a1, $s2, $zero -/* D93BF8 80240CB8 0C019D80 */ jal guMtxCatF -/* D93BFC 80240CBC 0080302D */ daddu $a2, $a0, $zero -/* D93C00 80240CC0 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D93C04 80240CC4 3C0142B4 */ lui $at, 0x42b4 -/* D93C08 80240CC8 44810000 */ mtc1 $at, $f0 -/* D93C0C 80240CCC 00000000 */ nop -/* D93C10 80240CD0 4602003E */ c.le.s $f0, $f2 -/* D93C14 80240CD4 00000000 */ nop -/* D93C18 80240CD8 4500000A */ bc1f .L80240D04 -/* D93C1C 80240CDC 24040001 */ addiu $a0, $zero, 1 -/* D93C20 80240CE0 3C014387 */ lui $at, 0x4387 -/* D93C24 80240CE4 44812000 */ mtc1 $at, $f4 -/* D93C28 80240CE8 00000000 */ nop -/* D93C2C 80240CEC 4604103C */ c.lt.s $f2, $f4 -/* D93C30 80240CF0 00000000 */ nop -/* D93C34 80240CF4 45000004 */ bc1f .L80240D08 -/* D93C38 80240CF8 27A20020 */ addiu $v0, $sp, 0x20 -/* D93C3C 80240CFC 3C041000 */ lui $a0, 0x1000 -/* D93C40 80240D00 34840001 */ ori $a0, $a0, 1 -.L80240D04: -/* D93C44 80240D04 27A20020 */ addiu $v0, $sp, 0x20 -.L80240D08: -/* D93C48 80240D08 AFA20010 */ sw $v0, 0x10($sp) -/* D93C4C 80240D0C 0000282D */ daddu $a1, $zero, $zero -/* D93C50 80240D10 00A0302D */ daddu $a2, $a1, $zero -/* D93C54 80240D14 0C0B7710 */ jal render_sprite -/* D93C58 80240D18 00A0382D */ daddu $a3, $a1, $zero -/* D93C5C 80240D1C 26730001 */ addiu $s3, $s3, 1 -/* D93C60 80240D20 2A620002 */ slti $v0, $s3, 2 -/* D93C64 80240D24 1440FEF6 */ bnez $v0, .L80240900 -/* D93C68 80240D28 00000000 */ nop -/* D93C6C 80240D2C 8FBF014C */ lw $ra, 0x14c($sp) -/* D93C70 80240D30 8FB60148 */ lw $s6, 0x148($sp) -/* D93C74 80240D34 8FB50144 */ lw $s5, 0x144($sp) -/* D93C78 80240D38 8FB40140 */ lw $s4, 0x140($sp) -/* D93C7C 80240D3C 8FB3013C */ lw $s3, 0x13c($sp) -/* D93C80 80240D40 8FB20138 */ lw $s2, 0x138($sp) -/* D93C84 80240D44 8FB10134 */ lw $s1, 0x134($sp) -/* D93C88 80240D48 8FB00130 */ lw $s0, 0x130($sp) -/* D93C8C 80240D4C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D93C90 80240D50 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D93C94 80240D54 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D93C98 80240D58 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D93C9C 80240D5C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D93CA0 80240D60 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D93CA4 80240D64 03E00008 */ jr $ra -/* D93CA8 80240D68 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_37/func_80240D6C_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/func_80240D6C_D92F40.s deleted file mode 100644 index 1658f17140..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/func_80240D6C_D92F40.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D6C_D93CAC -/* D93CAC 80240D6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D93CB0 80240D70 AFB00010 */ sw $s0, 0x10($sp) -/* D93CB4 80240D74 0080802D */ daddu $s0, $a0, $zero -/* D93CB8 80240D78 AFBF0014 */ sw $ra, 0x14($sp) -/* D93CBC 80240D7C 8E020088 */ lw $v0, 0x88($s0) -/* D93CC0 80240D80 14400017 */ bnez $v0, .L80240DE0 -/* D93CC4 80240D84 24020001 */ addiu $v0, $zero, 1 -/* D93CC8 80240D88 8E030084 */ lw $v1, 0x84($s0) -/* D93CCC 80240D8C 1062001A */ beq $v1, $v0, .L80240DF8 -/* D93CD0 80240D90 00000000 */ nop -/* D93CD4 80240D94 28620002 */ slti $v0, $v1, 2 -/* D93CD8 80240D98 50400005 */ beql $v0, $zero, .L80240DB0 -/* D93CDC 80240D9C 24020002 */ addiu $v0, $zero, 2 -/* D93CE0 80240DA0 10600007 */ beqz $v1, .L80240DC0 -/* D93CE4 80240DA4 00000000 */ nop -/* D93CE8 80240DA8 08090384 */ j .L80240E10 -/* D93CEC 80240DAC 00000000 */ nop -.L80240DB0: -/* D93CF0 80240DB0 10620007 */ beq $v1, $v0, .L80240DD0 -/* D93CF4 80240DB4 00000000 */ nop -/* D93CF8 80240DB8 08090384 */ j .L80240E10 -/* D93CFC 80240DBC 00000000 */ nop -.L80240DC0: -/* D93D00 80240DC0 3C048024 */ lui $a0, 0x8024 -/* D93D04 80240DC4 24840EB4 */ addiu $a0, $a0, 0xeb4 -/* D93D08 80240DC8 08090380 */ j .L80240E00 -/* D93D0C 80240DCC 00000000 */ nop -.L80240DD0: -/* D93D10 80240DD0 3C048024 */ lui $a0, 0x8024 -/* D93D14 80240DD4 24840F1C */ addiu $a0, $a0, 0xf1c -/* D93D18 80240DD8 08090380 */ j .L80240E00 -/* D93D1C 80240DDC 00000000 */ nop -.L80240DE0: -/* D93D20 80240DE0 8E020084 */ lw $v0, 0x84($s0) -/* D93D24 80240DE4 0440000A */ bltz $v0, .L80240E10 -/* D93D28 80240DE8 00000000 */ nop -/* D93D2C 80240DEC 28420002 */ slti $v0, $v0, 2 -/* D93D30 80240DF0 10400007 */ beqz $v0, .L80240E10 -/* D93D34 80240DF4 00000000 */ nop -.L80240DF8: -/* D93D38 80240DF8 3C048024 */ lui $a0, 0x8024 -/* D93D3C 80240DFC 24840EE8 */ addiu $a0, $a0, 0xee8 -.L80240E00: -/* D93D40 80240E00 0C048C56 */ jal bind_dynamic_entity_3 -/* D93D44 80240E04 0000282D */ daddu $a1, $zero, $zero -/* D93D48 80240E08 8E03013C */ lw $v1, 0x13c($s0) -/* D93D4C 80240E0C AC620004 */ sw $v0, 4($v1) -.L80240E10: -/* D93D50 80240E10 0C00EAD2 */ jal get_npc_safe -/* D93D54 80240E14 2404FFFC */ addiu $a0, $zero, -4 -/* D93D58 80240E18 0040282D */ daddu $a1, $v0, $zero -/* D93D5C 80240E1C 10A00021 */ beqz $a1, .L80240EA4 -/* D93D60 80240E20 24020002 */ addiu $v0, $zero, 2 -/* D93D64 80240E24 8E020088 */ lw $v0, 0x88($s0) -/* D93D68 80240E28 14400014 */ bnez $v0, .L80240E7C -/* D93D6C 80240E2C 24020001 */ addiu $v0, $zero, 1 -/* D93D70 80240E30 8E040084 */ lw $a0, 0x84($s0) -/* D93D74 80240E34 10820016 */ beq $a0, $v0, .L80240E90 -/* D93D78 80240E38 28820002 */ slti $v0, $a0, 2 -/* D93D7C 80240E3C 10400005 */ beqz $v0, .L80240E54 -/* D93D80 80240E40 24020002 */ addiu $v0, $zero, 2 -/* D93D84 80240E44 10800007 */ beqz $a0, .L80240E64 -/* D93D88 80240E48 00000000 */ nop -/* D93D8C 80240E4C 080903A9 */ j .L80240EA4 -/* D93D90 80240E50 00000000 */ nop -.L80240E54: -/* D93D94 80240E54 10820006 */ beq $a0, $v0, .L80240E70 -/* D93D98 80240E58 24020002 */ addiu $v0, $zero, 2 -/* D93D9C 80240E5C 080903A9 */ j .L80240EA4 -/* D93DA0 80240E60 00000000 */ nop -.L80240E64: -/* D93DA4 80240E64 8CA20000 */ lw $v0, ($a1) -/* D93DA8 80240E68 080903A6 */ j .L80240E98 -/* D93DAC 80240E6C 3C03000A */ lui $v1, 0xa -.L80240E70: -/* D93DB0 80240E70 8CA20000 */ lw $v0, ($a1) -/* D93DB4 80240E74 080903A6 */ j .L80240E98 -/* D93DB8 80240E78 3C030002 */ lui $v1, 2 -.L80240E7C: -/* D93DBC 80240E7C 8E020084 */ lw $v0, 0x84($s0) -/* D93DC0 80240E80 04400007 */ bltz $v0, .L80240EA0 -/* D93DC4 80240E84 28420002 */ slti $v0, $v0, 2 -/* D93DC8 80240E88 10400006 */ beqz $v0, .L80240EA4 -/* D93DCC 80240E8C 24020002 */ addiu $v0, $zero, 2 -.L80240E90: -/* D93DD0 80240E90 8CA20000 */ lw $v0, ($a1) -/* D93DD4 80240E94 3C030008 */ lui $v1, 8 -.L80240E98: -/* D93DD8 80240E98 00431025 */ or $v0, $v0, $v1 -/* D93DDC 80240E9C ACA20000 */ sw $v0, ($a1) -.L80240EA0: -/* D93DE0 80240EA0 24020002 */ addiu $v0, $zero, 2 -.L80240EA4: -/* D93DE4 80240EA4 8FBF0014 */ lw $ra, 0x14($sp) -/* D93DE8 80240EA8 8FB00010 */ lw $s0, 0x10($sp) -/* D93DEC 80240EAC 03E00008 */ jr $ra -/* D93DF0 80240EB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_37/func_80240EB4_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/func_80240EB4_D92F40.s deleted file mode 100644 index f713b605cf..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/func_80240EB4_D92F40.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_D93DF4 -/* D93DF4 80240EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D93DF8 80240EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D93DFC 80240EBC 0C00EAD2 */ jal get_npc_safe -/* D93E00 80240EC0 2404FFFC */ addiu $a0, $zero, -4 -/* D93E04 80240EC4 0040202D */ daddu $a0, $v0, $zero -/* D93E08 80240EC8 10800004 */ beqz $a0, .L80240EDC -/* D93E0C 80240ECC 3C03000A */ lui $v1, 0xa -/* D93E10 80240ED0 8C820000 */ lw $v0, ($a0) -/* D93E14 80240ED4 00431025 */ or $v0, $v0, $v1 -/* D93E18 80240ED8 AC820000 */ sw $v0, ($a0) -.L80240EDC: -/* D93E1C 80240EDC 8FBF0010 */ lw $ra, 0x10($sp) -/* D93E20 80240EE0 03E00008 */ jr $ra -/* D93E24 80240EE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_37/func_80240EE8_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/func_80240EE8_D92F40.s deleted file mode 100644 index d5e5e070a7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/func_80240EE8_D92F40.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE8_D93E28 -/* D93E28 80240EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D93E2C 80240EEC AFBF0010 */ sw $ra, 0x10($sp) -/* D93E30 80240EF0 0C00EAD2 */ jal get_npc_safe -/* D93E34 80240EF4 2404FFFC */ addiu $a0, $zero, -4 -/* D93E38 80240EF8 0040202D */ daddu $a0, $v0, $zero -/* D93E3C 80240EFC 10800004 */ beqz $a0, .L80240F10 -/* D93E40 80240F00 3C030008 */ lui $v1, 8 -/* D93E44 80240F04 8C820000 */ lw $v0, ($a0) -/* D93E48 80240F08 00431025 */ or $v0, $v0, $v1 -/* D93E4C 80240F0C AC820000 */ sw $v0, ($a0) -.L80240F10: -/* D93E50 80240F10 8FBF0010 */ lw $ra, 0x10($sp) -/* D93E54 80240F14 03E00008 */ jr $ra -/* D93E58 80240F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_37/func_80240F1C_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/func_80240F1C_D92F40.s deleted file mode 100644 index 961dc4a3d7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/func_80240F1C_D92F40.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F1C_D93E5C -/* D93E5C 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D93E60 80240F20 AFBF0010 */ sw $ra, 0x10($sp) -/* D93E64 80240F24 0C00EAD2 */ jal get_npc_safe -/* D93E68 80240F28 2404FFFC */ addiu $a0, $zero, -4 -/* D93E6C 80240F2C 0040202D */ daddu $a0, $v0, $zero -/* D93E70 80240F30 10800004 */ beqz $a0, .L80240F44 -/* D93E74 80240F34 3C030002 */ lui $v1, 2 -/* D93E78 80240F38 8C820000 */ lw $v0, ($a0) -/* D93E7C 80240F3C 00431025 */ or $v0, $v0, $v1 -/* D93E80 80240F40 AC820000 */ sw $v0, ($a0) -.L80240F44: -/* D93E84 80240F44 8FBF0010 */ lw $ra, 0x10($sp) -/* D93E88 80240F48 03E00008 */ jr $ra -/* D93E8C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_37/func_80240F50_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/func_80240F50_D92F40.s deleted file mode 100644 index cf5311752b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/func_80240F50_D92F40.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F50_D93E90 -/* D93E90 80240F50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D93E94 80240F54 AFB10014 */ sw $s1, 0x14($sp) -/* D93E98 80240F58 0080882D */ daddu $s1, $a0, $zero -/* D93E9C 80240F5C AFBF0018 */ sw $ra, 0x18($sp) -/* D93EA0 80240F60 AFB00010 */ sw $s0, 0x10($sp) -/* D93EA4 80240F64 8E300148 */ lw $s0, 0x148($s1) -/* D93EA8 80240F68 0C00EABB */ jal get_npc_unsafe -/* D93EAC 80240F6C 86040008 */ lh $a0, 8($s0) -/* D93EB0 80240F70 24030001 */ addiu $v1, $zero, 1 -/* D93EB4 80240F74 0040202D */ daddu $a0, $v0, $zero -/* D93EB8 80240F78 AE03006C */ sw $v1, 0x6c($s0) -/* D93EBC 80240F7C 8482008C */ lh $v0, 0x8c($a0) -/* D93EC0 80240F80 14400009 */ bnez $v0, .L80240FA8 -/* D93EC4 80240F84 24020002 */ addiu $v0, $zero, 2 -/* D93EC8 80240F88 96030072 */ lhu $v1, 0x72($s0) -/* D93ECC 80240F8C AE02006C */ sw $v0, 0x6c($s0) -/* D93ED0 80240F90 A483008E */ sh $v1, 0x8e($a0) -/* D93ED4 80240F94 8E0200CC */ lw $v0, 0xcc($s0) -/* D93ED8 80240F98 8C420020 */ lw $v0, 0x20($v0) -/* D93EDC 80240F9C AC820028 */ sw $v0, 0x28($a0) -/* D93EE0 80240FA0 2402001F */ addiu $v0, $zero, 0x1f -/* D93EE4 80240FA4 AE220070 */ sw $v0, 0x70($s1) -.L80240FA8: -/* D93EE8 80240FA8 8FBF0018 */ lw $ra, 0x18($sp) -/* D93EEC 80240FAC 8FB10014 */ lw $s1, 0x14($sp) -/* D93EF0 80240FB0 8FB00010 */ lw $s0, 0x10($sp) -/* D93EF4 80240FB4 03E00008 */ jr $ra -/* D93EF8 80240FB8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_37/func_80241104_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/func_80241104_D92F40.s deleted file mode 100644 index b8631d76cc..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/func_80241104_D92F40.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241104_D94044 -/* D94044 80241104 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D94048 80241108 AFB10014 */ sw $s1, 0x14($sp) -/* D9404C 8024110C 0080882D */ daddu $s1, $a0, $zero -/* D94050 80241110 AFBF0018 */ sw $ra, 0x18($sp) -/* D94054 80241114 AFB00010 */ sw $s0, 0x10($sp) -/* D94058 80241118 8E300148 */ lw $s0, 0x148($s1) -/* D9405C 8024111C 0C00EABB */ jal get_npc_unsafe -/* D94060 80241120 86040008 */ lh $a0, 8($s0) -/* D94064 80241124 9443008E */ lhu $v1, 0x8e($v0) -/* D94068 80241128 2463FFFF */ addiu $v1, $v1, -1 -/* D9406C 8024112C A443008E */ sh $v1, 0x8e($v0) -/* D94070 80241130 00031C00 */ sll $v1, $v1, 0x10 -/* D94074 80241134 1C600003 */ bgtz $v1, .L80241144 -/* D94078 80241138 2402000C */ addiu $v0, $zero, 0xc -/* D9407C 8024113C AE00006C */ sw $zero, 0x6c($s0) -/* D94080 80241140 AE220070 */ sw $v0, 0x70($s1) -.L80241144: -/* D94084 80241144 8FBF0018 */ lw $ra, 0x18($sp) -/* D94088 80241148 8FB10014 */ lw $s1, 0x14($sp) -/* D9408C 8024114C 8FB00010 */ lw $s0, 0x10($sp) -/* D94090 80241150 03E00008 */ jr $ra -/* D94094 80241154 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_37/func_80241158_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/func_80241158_D92F40.s deleted file mode 100644 index b48d5f11fc..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/func_80241158_D92F40.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241158_D94098 -/* D94098 80241158 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D9409C 8024115C AFBF0024 */ sw $ra, 0x24($sp) -/* D940A0 80241160 AFB40020 */ sw $s4, 0x20($sp) -/* D940A4 80241164 AFB3001C */ sw $s3, 0x1c($sp) -/* D940A8 80241168 AFB20018 */ sw $s2, 0x18($sp) -/* D940AC 8024116C AFB10014 */ sw $s1, 0x14($sp) -/* D940B0 80241170 AFB00010 */ sw $s0, 0x10($sp) -/* D940B4 80241174 F7B40028 */ sdc1 $f20, 0x28($sp) -/* D940B8 80241178 8C900148 */ lw $s0, 0x148($a0) -/* D940BC 8024117C 86040008 */ lh $a0, 8($s0) -/* D940C0 80241180 0C00EABB */ jal get_npc_unsafe -/* D940C4 80241184 24110001 */ addiu $s1, $zero, 1 -/* D940C8 80241188 86040008 */ lh $a0, 8($s0) -/* D940CC 8024118C 0040802D */ daddu $s0, $v0, $zero -/* D940D0 80241190 3C05800B */ lui $a1, %hi(gCameras) -/* D940D4 80241194 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* D940D8 80241198 3C03800A */ lui $v1, 0x800a -/* D940DC 8024119C 8463A634 */ lh $v1, -0x59cc($v1) -/* D940E0 802411A0 00912021 */ addu $a0, $a0, $s1 -/* D940E4 802411A4 00031080 */ sll $v0, $v1, 2 -/* D940E8 802411A8 00431021 */ addu $v0, $v0, $v1 -/* D940EC 802411AC 00021080 */ sll $v0, $v0, 2 -/* D940F0 802411B0 00431023 */ subu $v0, $v0, $v1 -/* D940F4 802411B4 000218C0 */ sll $v1, $v0, 3 -/* D940F8 802411B8 00431021 */ addu $v0, $v0, $v1 -/* D940FC 802411BC 000210C0 */ sll $v0, $v0, 3 -/* D94100 802411C0 0C00FB3A */ jal get_enemy -/* D94104 802411C4 00459021 */ addu $s2, $v0, $a1 -/* D94108 802411C8 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* D9410C 802411CC 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* D94110 802411D0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D94114 802411D4 8E830000 */ lw $v1, ($s4) -/* D94118 802411D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9411C 802411DC 8C660028 */ lw $a2, 0x28($v1) -/* D94120 802411E0 8C670030 */ lw $a3, 0x30($v1) -/* D94124 802411E4 0C00A7B5 */ jal dist2D -/* D94128 802411E8 0040982D */ daddu $s3, $v0, $zero -/* D9412C 802411EC C6620074 */ lwc1 $f2, 0x74($s3) -/* D94130 802411F0 468010A0 */ cvt.s.w $f2, $f2 -/* D94134 802411F4 4600103C */ c.lt.s $f2, $f0 -/* D94138 802411F8 00000000 */ nop -/* D9413C 802411FC 45030001 */ bc1tl .L80241204 -/* D94140 80241200 0000882D */ daddu $s1, $zero, $zero -.L80241204: -/* D94144 80241204 C64C006C */ lwc1 $f12, 0x6c($s2) -/* D94148 80241208 C60E000C */ lwc1 $f14, 0xc($s0) -/* D9414C 8024120C 3C014387 */ lui $at, 0x4387 -/* D94150 80241210 4481A000 */ mtc1 $at, $f20 -/* D94154 80241214 0C00A70A */ jal get_clamped_angle_diff -/* D94158 80241218 00000000 */ nop -/* D9415C 8024121C 0C00A6C9 */ jal clamp_angle -/* D94160 80241220 46000306 */ mov.s $f12, $f0 -/* D94164 80241224 3C018024 */ lui $at, 0x8024 -/* D94168 80241228 D4222510 */ ldc1 $f2, 0x2510($at) -/* D9416C 8024122C 46000021 */ cvt.d.s $f0, $f0 -/* D94170 80241230 4622003C */ c.lt.d $f0, $f2 -/* D94174 80241234 00000000 */ nop -/* D94178 80241238 45000003 */ bc1f .L80241248 -/* D9417C 8024123C 00000000 */ nop -/* D94180 80241240 3C0142B4 */ lui $at, 0x42b4 -/* D94184 80241244 4481A000 */ mtc1 $at, $f20 -.L80241248: -/* D94188 80241248 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9418C 8024124C 8E820000 */ lw $v0, ($s4) -/* D94190 80241250 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D94194 80241254 8C460028 */ lw $a2, 0x28($v0) -/* D94198 80241258 0C00A720 */ jal atan2 -/* D9419C 8024125C 8C470030 */ lw $a3, 0x30($v0) -/* D941A0 80241260 4600A306 */ mov.s $f12, $f20 -/* D941A4 80241264 0C00A70A */ jal get_clamped_angle_diff -/* D941A8 80241268 46000386 */ mov.s $f14, $f0 -/* D941AC 8024126C C6620078 */ lwc1 $f2, 0x78($s3) -/* D941B0 80241270 468010A0 */ cvt.s.w $f2, $f2 -/* D941B4 80241274 46000005 */ abs.s $f0, $f0 -/* D941B8 80241278 4600103C */ c.lt.s $f2, $f0 -/* D941BC 8024127C 00000000 */ nop -/* D941C0 80241280 45030001 */ bc1tl .L80241288 -/* D941C4 80241284 0000882D */ daddu $s1, $zero, $zero -.L80241288: -/* D941C8 80241288 8E820000 */ lw $v0, ($s4) -/* D941CC 8024128C C600003C */ lwc1 $f0, 0x3c($s0) -/* D941D0 80241290 C442002C */ lwc1 $f2, 0x2c($v0) -/* D941D4 80241294 860200A8 */ lh $v0, 0xa8($s0) -/* D941D8 80241298 46020001 */ sub.s $f0, $f0, $f2 -/* D941DC 8024129C 44821000 */ mtc1 $v0, $f2 -/* D941E0 802412A0 00000000 */ nop -/* D941E4 802412A4 468010A1 */ cvt.d.w $f2, $f2 -/* D941E8 802412A8 46221080 */ add.d $f2, $f2, $f2 -/* D941EC 802412AC 46000005 */ abs.s $f0, $f0 -/* D941F0 802412B0 46000021 */ cvt.d.s $f0, $f0 -/* D941F4 802412B4 4620103E */ c.le.d $f2, $f0 -/* D941F8 802412B8 00000000 */ nop -/* D941FC 802412BC 45030001 */ bc1tl .L802412C4 -/* D94200 802412C0 0000882D */ daddu $s1, $zero, $zero -.L802412C4: -/* D94204 802412C4 3C038011 */ lui $v1, 0x8011 -/* D94208 802412C8 8063EBB3 */ lb $v1, -0x144d($v1) -/* D9420C 802412CC 24020009 */ addiu $v0, $zero, 9 -/* D94210 802412D0 50620001 */ beql $v1, $v0, .L802412D8 -/* D94214 802412D4 0000882D */ daddu $s1, $zero, $zero -.L802412D8: -/* D94218 802412D8 24020007 */ addiu $v0, $zero, 7 -/* D9421C 802412DC 50620001 */ beql $v1, $v0, .L802412E4 -/* D94220 802412E0 0000882D */ daddu $s1, $zero, $zero -.L802412E4: -/* D94224 802412E4 0220102D */ daddu $v0, $s1, $zero -/* D94228 802412E8 8FBF0024 */ lw $ra, 0x24($sp) -/* D9422C 802412EC 8FB40020 */ lw $s4, 0x20($sp) -/* D94230 802412F0 8FB3001C */ lw $s3, 0x1c($sp) -/* D94234 802412F4 8FB20018 */ lw $s2, 0x18($sp) -/* D94238 802412F8 8FB10014 */ lw $s1, 0x14($sp) -/* D9423C 802412FC 8FB00010 */ lw $s0, 0x10($sp) -/* D94240 80241300 D7B40028 */ ldc1 $f20, 0x28($sp) -/* D94244 80241304 03E00008 */ jr $ra -/* D94248 80241308 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_pra/pra_37/func_8024130C_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/func_8024130C_D92F40.s deleted file mode 100644 index aa413b55ff..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/func_8024130C_D92F40.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024130C_D9424C -/* D9424C 8024130C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D94250 80241310 AFB40028 */ sw $s4, 0x28($sp) -/* D94254 80241314 0080A02D */ daddu $s4, $a0, $zero -/* D94258 80241318 AFBF002C */ sw $ra, 0x2c($sp) -/* D9425C 8024131C AFB30024 */ sw $s3, 0x24($sp) -/* D94260 80241320 AFB20020 */ sw $s2, 0x20($sp) -/* D94264 80241324 AFB1001C */ sw $s1, 0x1c($sp) -/* D94268 80241328 AFB00018 */ sw $s0, 0x18($sp) -/* D9426C 8024132C 8E910148 */ lw $s1, 0x148($s4) -/* D94270 80241330 86240008 */ lh $a0, 8($s1) -/* D94274 80241334 0C00EABB */ jal get_npc_unsafe -/* D94278 80241338 00A0802D */ daddu $s0, $a1, $zero -/* D9427C 8024133C 16000005 */ bnez $s0, .L80241354 -/* D94280 80241340 0040902D */ daddu $s2, $v0, $zero -/* D94284 80241344 8E2200B0 */ lw $v0, 0xb0($s1) -/* D94288 80241348 30420004 */ andi $v0, $v0, 4 -/* D9428C 8024134C 10400015 */ beqz $v0, .L802413A4 -/* D94290 80241350 00000000 */ nop -.L80241354: -/* D94294 80241354 AE800070 */ sw $zero, 0x70($s4) -/* D94298 80241358 8E420000 */ lw $v0, ($s2) -/* D9429C 8024135C 3C031F30 */ lui $v1, 0x1f30 -/* D942A0 80241360 A640008E */ sh $zero, 0x8e($s2) -/* D942A4 80241364 34420102 */ ori $v0, $v0, 0x102 -/* D942A8 80241368 AE420000 */ sw $v0, ($s2) -/* D942AC 8024136C 8E220000 */ lw $v0, ($s1) -/* D942B0 80241370 3C01C47A */ lui $at, 0xc47a -/* D942B4 80241374 44810000 */ mtc1 $at, $f0 -/* D942B8 80241378 00431025 */ or $v0, $v0, $v1 -/* D942BC 8024137C AE220000 */ sw $v0, ($s1) -/* D942C0 80241380 AE400038 */ sw $zero, 0x38($s2) -/* D942C4 80241384 E640003C */ swc1 $f0, 0x3c($s2) -/* D942C8 80241388 AE400040 */ sw $zero, 0x40($s2) -/* D942CC 8024138C 8E2300B0 */ lw $v1, 0xb0($s1) -/* D942D0 80241390 30620004 */ andi $v0, $v1, 4 -/* D942D4 80241394 10400003 */ beqz $v0, .L802413A4 -/* D942D8 80241398 2402FFFB */ addiu $v0, $zero, -5 -/* D942DC 8024139C 00621024 */ and $v0, $v1, $v0 -/* D942E0 802413A0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802413A4: -/* D942E4 802413A4 8E930070 */ lw $s3, 0x70($s4) -/* D942E8 802413A8 12600005 */ beqz $s3, .L802413C0 -/* D942EC 802413AC 24020001 */ addiu $v0, $zero, 1 -/* D942F0 802413B0 12620048 */ beq $s3, $v0, .L802414D4 -/* D942F4 802413B4 00000000 */ nop -/* D942F8 802413B8 08090552 */ j .L80241548 -/* D942FC 802413BC 00000000 */ nop -.L802413C0: -/* D94300 802413C0 86240008 */ lh $a0, 8($s1) -/* D94304 802413C4 0C00FB3A */ jal get_enemy -/* D94308 802413C8 2484FFFF */ addiu $a0, $a0, -1 -/* D9430C 802413CC 0040802D */ daddu $s0, $v0, $zero -/* D94310 802413D0 0C00EABB */ jal get_npc_unsafe -/* D94314 802413D4 86040008 */ lh $a0, 8($s0) -/* D94318 802413D8 24030001 */ addiu $v1, $zero, 1 -/* D9431C 802413DC 0040982D */ daddu $s3, $v0, $zero -/* D94320 802413E0 A2230007 */ sb $v1, 7($s1) -/* D94324 802413E4 8E03006C */ lw $v1, 0x6c($s0) -/* D94328 802413E8 24020003 */ addiu $v0, $zero, 3 -/* D9432C 802413EC 14620056 */ bne $v1, $v0, .L80241548 -/* D94330 802413F0 00000000 */ nop -/* D94334 802413F4 8E2500A8 */ lw $a1, 0xa8($s1) -/* D94338 802413F8 10A00003 */ beqz $a1, .L80241408 -/* D9433C 802413FC 0260202D */ daddu $a0, $s3, $zero -/* D94340 80241400 0C012530 */ jal func_800494C0 -/* D94344 80241404 0000302D */ daddu $a2, $zero, $zero -.L80241408: -/* D94348 80241408 27A40010 */ addiu $a0, $sp, 0x10 -/* D9434C 8024140C C6280070 */ lwc1 $f8, 0x70($s1) -/* D94350 80241410 46804220 */ cvt.s.w $f8, $f8 -/* D94354 80241414 C6620034 */ lwc1 $f2, 0x34($s3) -/* D94358 80241418 3C014387 */ lui $at, 0x4387 -/* D9435C 8024141C 44810000 */ mtc1 $at, $f0 -/* D94360 80241420 44064000 */ mfc1 $a2, $f8 -/* D94364 80241424 46020001 */ sub.s $f0, $f0, $f2 -/* D94368 80241428 C6660038 */ lwc1 $f6, 0x38($s3) -/* D9436C 8024142C C6640040 */ lwc1 $f4, 0x40($s3) -/* D94370 80241430 44070000 */ mfc1 $a3, $f0 -/* D94374 80241434 27A50014 */ addiu $a1, $sp, 0x14 -/* D94378 80241438 E7A60010 */ swc1 $f6, 0x10($sp) -/* D9437C 8024143C 0C00A7E7 */ jal add_vec2D_polar -/* D94380 80241440 E7A40014 */ swc1 $f4, 0x14($sp) -/* D94384 80241444 C7A00010 */ lwc1 $f0, 0x10($sp) -/* D94388 80241448 4600020D */ trunc.w.s $f8, $f0 -/* D9438C 8024144C 44024000 */ mfc1 $v0, $f8 -/* D94390 80241450 E6400038 */ swc1 $f0, 0x38($s2) -/* D94394 80241454 A6220010 */ sh $v0, 0x10($s1) -/* D94398 80241458 C660003C */ lwc1 $f0, 0x3c($s3) -/* D9439C 8024145C C622006C */ lwc1 $f2, 0x6c($s1) -/* D943A0 80241460 468010A0 */ cvt.s.w $f2, $f2 -/* D943A4 80241464 46020000 */ add.s $f0, $f0, $f2 -/* D943A8 80241468 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* D943AC 8024146C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* D943B0 80241470 E640003C */ swc1 $f0, 0x3c($s2) -/* D943B4 80241474 C7A20014 */ lwc1 $f2, 0x14($sp) -/* D943B8 80241478 4600020D */ trunc.w.s $f8, $f0 -/* D943BC 8024147C 44024000 */ mfc1 $v0, $f8 -/* D943C0 80241480 00000000 */ nop -/* D943C4 80241484 A6220012 */ sh $v0, 0x12($s1) -/* D943C8 80241488 4600120D */ trunc.w.s $f8, $f2 -/* D943CC 8024148C 44024000 */ mfc1 $v0, $f8 -/* D943D0 80241490 E6420040 */ swc1 $f2, 0x40($s2) -/* D943D4 80241494 A6220014 */ sh $v0, 0x14($s1) -/* D943D8 80241498 8C660028 */ lw $a2, 0x28($v1) -/* D943DC 8024149C 8C670030 */ lw $a3, 0x30($v1) -/* D943E0 802414A0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* D943E4 802414A4 0C00A720 */ jal atan2 -/* D943E8 802414A8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* D943EC 802414AC 3C03E0EF */ lui $v1, 0xe0ef -/* D943F0 802414B0 E640000C */ swc1 $f0, 0xc($s2) -/* D943F4 802414B4 8E220000 */ lw $v0, ($s1) -/* D943F8 802414B8 3463FFFF */ ori $v1, $v1, 0xffff -/* D943FC 802414BC 00431024 */ and $v0, $v0, $v1 -/* D94400 802414C0 AE220000 */ sw $v0, ($s1) -/* D94404 802414C4 24020001 */ addiu $v0, $zero, 1 -/* D94408 802414C8 A640008E */ sh $zero, 0x8e($s2) -/* D9440C 802414CC 08090552 */ j .L80241548 -/* D94410 802414D0 AE820070 */ sw $v0, 0x70($s4) -.L802414D4: -/* D94414 802414D4 86240008 */ lh $a0, 8($s1) -/* D94418 802414D8 0C00FB3A */ jal get_enemy -/* D9441C 802414DC 2484FFFF */ addiu $a0, $a0, -1 -/* D94420 802414E0 0040802D */ daddu $s0, $v0, $zero -/* D94424 802414E4 0C00EABB */ jal get_npc_unsafe -/* D94428 802414E8 86040008 */ lh $a0, 8($s0) -/* D9442C 802414EC 9642008E */ lhu $v0, 0x8e($s2) -/* D94430 802414F0 24420001 */ addiu $v0, $v0, 1 -/* D94434 802414F4 A642008E */ sh $v0, 0x8e($s2) -/* D94438 802414F8 00021400 */ sll $v0, $v0, 0x10 -/* D9443C 802414FC 8E23007C */ lw $v1, 0x7c($s1) -/* D94440 80241500 00021403 */ sra $v0, $v0, 0x10 -/* D94444 80241504 0043102A */ slt $v0, $v0, $v1 -/* D94448 80241508 50400001 */ beql $v0, $zero, .L80241510 -/* D9444C 8024150C A2200007 */ sb $zero, 7($s1) -.L80241510: -/* D94450 80241510 8E03006C */ lw $v1, 0x6c($s0) -/* D94454 80241514 24020004 */ addiu $v0, $zero, 4 -/* D94458 80241518 1462000B */ bne $v1, $v0, .L80241548 -/* D9445C 8024151C 3C021F10 */ lui $v0, 0x1f10 -/* D94460 80241520 8E230000 */ lw $v1, ($s1) -/* D94464 80241524 3C01C47A */ lui $at, 0xc47a -/* D94468 80241528 44810000 */ mtc1 $at, $f0 -/* D9446C 8024152C 00621825 */ or $v1, $v1, $v0 -/* D94470 80241530 AE230000 */ sw $v1, ($s1) -/* D94474 80241534 AE400038 */ sw $zero, 0x38($s2) -/* D94478 80241538 E640003C */ swc1 $f0, 0x3c($s2) -/* D9447C 8024153C AE400040 */ sw $zero, 0x40($s2) -/* D94480 80241540 A2330007 */ sb $s3, 7($s1) -/* D94484 80241544 AE800070 */ sw $zero, 0x70($s4) -.L80241548: -/* D94488 80241548 8FBF002C */ lw $ra, 0x2c($sp) -/* D9448C 8024154C 8FB40028 */ lw $s4, 0x28($sp) -/* D94490 80241550 8FB30024 */ lw $s3, 0x24($sp) -/* D94494 80241554 8FB20020 */ lw $s2, 0x20($sp) -/* D94498 80241558 8FB1001C */ lw $s1, 0x1c($sp) -/* D9449C 8024155C 8FB00018 */ lw $s0, 0x18($sp) -/* D944A0 80241560 0000102D */ daddu $v0, $zero, $zero -/* D944A4 80241564 03E00008 */ jr $ra -/* D944A8 80241568 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_pra/pra_38/func_80240050_D955F0.s b/asm/nonmatchings/world/area_pra/pra_38/func_80240050_D955F0.s deleted file mode 100644 index bf7b950d89..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/func_80240050_D955F0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D95640 -/* D95640 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D95644 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D95648 80240058 00822024 */ and $a0, $a0, $v0 -/* D9564C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D95650 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D95654 80240064 00821821 */ addu $v1, $a0, $v0 -/* D95658 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D9565C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D95660 80240070 30620001 */ andi $v0, $v1, 1 -/* D95664 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D95668 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D9566C 8024007C 03E00008 */ jr $ra -/* D95670 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_38/func_80240084_D955F0.s b/asm/nonmatchings/world/area_pra/pra_38/func_80240084_D955F0.s deleted file mode 100644 index b81c4bb999..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/func_80240084_D955F0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240084_D95674 -/* D95674 80240084 00041403 */ sra $v0, $a0, 0x10 -/* D95678 80240088 304300FF */ andi $v1, $v0, 0xff -/* D9567C 8024008C 24020006 */ addiu $v0, $zero, 6 -/* D95680 80240090 10620015 */ beq $v1, $v0, .L802400E8 -/* D95684 80240094 28620007 */ slti $v0, $v1, 7 -/* D95688 80240098 10400005 */ beqz $v0, .L802400B0 -/* D9568C 8024009C 24020001 */ addiu $v0, $zero, 1 -/* D95690 802400A0 1062000A */ beq $v1, $v0, .L802400CC -/* D95694 802400A4 3C020100 */ lui $v0, 0x100 -/* D95698 802400A8 03E00008 */ jr $ra -/* D9569C 802400AC 00821025 */ or $v0, $a0, $v0 -.L802400B0: -/* D956A0 802400B0 2862000A */ slti $v0, $v1, 0xa -/* D956A4 802400B4 10400016 */ beqz $v0, .L80240110 -/* D956A8 802400B8 28620008 */ slti $v0, $v1, 8 -/* D956AC 802400BC 14400015 */ bnez $v0, .L80240114 -/* D956B0 802400C0 3C020100 */ lui $v0, 0x100 -/* D956B4 802400C4 03E00008 */ jr $ra -/* D956B8 802400C8 0080102D */ daddu $v0, $a0, $zero -.L802400CC: -/* D956BC 802400CC 3C020001 */ lui $v0, 1 -/* D956C0 802400D0 3442000C */ ori $v0, $v0, 0xc -/* D956C4 802400D4 0044102A */ slt $v0, $v0, $a0 -/* D956C8 802400D8 1040000E */ beqz $v0, .L80240114 -/* D956CC 802400DC 3C020100 */ lui $v0, 0x100 -.L802400E0: -/* D956D0 802400E0 03E00008 */ jr $ra -/* D956D4 802400E4 0080102D */ daddu $v0, $a0, $zero -.L802400E8: -/* D956D8 802400E8 3C02FFF9 */ lui $v0, 0xfff9 -/* D956DC 802400EC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D956E0 802400F0 00821821 */ addu $v1, $a0, $v0 -/* D956E4 802400F4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D956E8 802400F8 10400005 */ beqz $v0, .L80240110 -/* D956EC 802400FC 30620001 */ andi $v0, $v1, 1 -/* D956F0 80240100 1440FFF7 */ bnez $v0, .L802400E0 -/* D956F4 80240104 24820001 */ addiu $v0, $a0, 1 -/* D956F8 80240108 03E00008 */ jr $ra -/* D956FC 8024010C 00000000 */ nop -.L80240110: -/* D95700 80240110 3C020100 */ lui $v0, 0x100 -.L80240114: -/* D95704 80240114 03E00008 */ jr $ra -/* D95708 80240118 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_38/func_8024011C_D955F0.s b/asm/nonmatchings/world/area_pra/pra_38/func_8024011C_D955F0.s deleted file mode 100644 index e379e1c522..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/func_8024011C_D955F0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024011C_D9570C -/* D9570C 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D95710 80240120 AFB00010 */ sw $s0, 0x10($sp) -/* D95714 80240124 0080802D */ daddu $s0, $a0, $zero -/* D95718 80240128 3C058024 */ lui $a1, 0x8024 -/* D9571C 8024012C 24A50158 */ addiu $a1, $a1, 0x158 -/* D95720 80240130 AFBF0014 */ sw $ra, 0x14($sp) -/* D95724 80240134 0C048C56 */ jal bind_dynamic_entity_3 -/* D95728 80240138 0000202D */ daddu $a0, $zero, $zero -/* D9572C 8024013C 8E03013C */ lw $v1, 0x13c($s0) -/* D95730 80240140 AC620000 */ sw $v0, ($v1) -/* D95734 80240144 8FBF0014 */ lw $ra, 0x14($sp) -/* D95738 80240148 8FB00010 */ lw $s0, 0x10($sp) -/* D9573C 8024014C 24020002 */ addiu $v0, $zero, 2 -/* D95740 80240150 03E00008 */ jr $ra -/* D95744 80240154 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_38/func_80240158_D955F0.s b/asm/nonmatchings/world/area_pra/pra_38/func_80240158_D955F0.s deleted file mode 100644 index d192cd555b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/func_80240158_D955F0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_D95748 -/* D95748 80240158 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D9574C 8024015C AFB00040 */ sw $s0, 0x40($sp) -/* D95750 80240160 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D95754 80240164 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D95758 80240168 AFB20048 */ sw $s2, 0x48($sp) -/* D9575C 8024016C AFBF004C */ sw $ra, 0x4c($sp) -/* D95760 80240170 AFB10044 */ sw $s1, 0x44($sp) -/* D95764 80240174 8E020000 */ lw $v0, ($s0) -/* D95768 80240178 821100BE */ lb $s1, 0xbe($s0) -/* D9576C 8024017C 30420001 */ andi $v0, $v0, 1 -/* D95770 80240180 10400061 */ beqz $v0, .L80240308 -/* D95774 80240184 27B20020 */ addiu $s2, $sp, 0x20 -/* D95778 80240188 8E0400CC */ lw $a0, 0xcc($s0) -/* D9577C 8024018C 0C044181 */ jal get_shadow_by_index -/* D95780 80240190 00000000 */ nop -/* D95784 80240194 0C048B77 */ jal func_80122DDC -/* D95788 80240198 84440008 */ lh $a0, 8($v0) -/* D9578C 8024019C 8C430000 */ lw $v1, ($v0) -/* D95790 802401A0 34630200 */ ori $v1, $v1, 0x200 -/* D95794 802401A4 AC430000 */ sw $v1, ($v0) -/* D95798 802401A8 8E050028 */ lw $a1, 0x28($s0) -/* D9579C 802401AC 8E06002C */ lw $a2, 0x2c($s0) -/* D957A0 802401B0 27A20030 */ addiu $v0, $sp, 0x30 -/* D957A4 802401B4 AFA20010 */ sw $v0, 0x10($sp) -/* D957A8 802401B8 27A20034 */ addiu $v0, $sp, 0x34 -/* D957AC 802401BC AFA20014 */ sw $v0, 0x14($sp) -/* D957B0 802401C0 C6000030 */ lwc1 $f0, 0x30($s0) -/* D957B4 802401C4 3C04800A */ lui $a0, 0x800a -/* D957B8 802401C8 8484A634 */ lh $a0, -0x59cc($a0) -/* D957BC 802401CC 46000007 */ neg.s $f0, $f0 -/* D957C0 802401D0 44070000 */ mfc1 $a3, $f0 -/* D957C4 802401D4 27A20038 */ addiu $v0, $sp, 0x38 -/* D957C8 802401D8 0C00B94E */ jal get_screen_coords -/* D957CC 802401DC AFA20018 */ sw $v0, 0x18($sp) -/* D957D0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D957D4 802401E4 0C090014 */ jal func_80240050 -/* D957D8 802401E8 00000000 */ nop -/* D957DC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) -/* D957E0 802401F0 3C014307 */ lui $at, 0x4307 -/* D957E4 802401F4 44810000 */ mtc1 $at, $f0 -/* D957E8 802401F8 00000000 */ nop -/* D957EC 802401FC 4602003C */ c.lt.s $f0, $f2 -/* D957F0 80240200 00000000 */ nop -/* D957F4 80240204 4500000B */ bc1f .L80240234 -/* D957F8 80240208 24040002 */ addiu $a0, $zero, 2 -/* D957FC 8024020C 3C014361 */ lui $at, 0x4361 -/* D95800 80240210 44810000 */ mtc1 $at, $f0 -/* D95804 80240214 00000000 */ nop -/* D95808 80240218 4600103C */ c.lt.s $f2, $f0 -/* D9580C 8024021C 00000000 */ nop -/* D95810 80240220 45000004 */ bc1f .L80240234 -/* D95814 80240224 00000000 */ nop -/* D95818 80240228 0C090021 */ jal func_80240084 -/* D9581C 8024022C 0040202D */ daddu $a0, $v0, $zero -/* D95820 80240230 24040002 */ addiu $a0, $zero, 2 -.L80240234: -/* D95824 80240234 3C063F80 */ lui $a2, 0x3f80 -/* D95828 80240238 0C0B76A3 */ jal func_802DDA8C -/* D9582C 8024023C 0040282D */ daddu $a1, $v0, $zero -/* D95830 80240240 8E020000 */ lw $v0, ($s0) -/* D95834 80240244 3C030002 */ lui $v1, 2 -/* D95838 80240248 00431024 */ and $v0, $v0, $v1 -/* D9583C 8024024C 54400022 */ bnel $v0, $zero, .L802402D8 -/* D95840 80240250 24110011 */ addiu $s1, $zero, 0x11 -/* D95844 80240254 9203000E */ lbu $v1, 0xe($s0) -/* D95848 80240258 3C02802E */ lui $v0, 0x802e -/* D9584C 8024025C 90429D70 */ lbu $v0, -0x6290($v0) -/* D95850 80240260 10620018 */ beq $v1, $v0, .L802402C4 -/* D95854 80240264 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D95858 80240268 1040000B */ beqz $v0, .L80240298 -/* D9585C 8024026C 24110011 */ addiu $s1, $zero, 0x11 -/* D95860 80240270 24040002 */ addiu $a0, $zero, 2 -/* D95864 80240274 2405FFFF */ addiu $a1, $zero, -1 -/* D95868 80240278 24060007 */ addiu $a2, $zero, 7 -/* D9586C 8024027C 0060102D */ daddu $v0, $v1, $zero -/* D95870 80240280 0000382D */ daddu $a3, $zero, $zero -/* D95874 80240284 AFA00010 */ sw $zero, 0x10($sp) -/* D95878 80240288 AFA00014 */ sw $zero, 0x14($sp) -/* D9587C 8024028C AFA0001C */ sw $zero, 0x1c($sp) -/* D95880 80240290 080900AF */ j .L802402BC -/* D95884 80240294 AFA20018 */ sw $v0, 0x18($sp) -.L80240298: -/* D95888 80240298 2411000D */ addiu $s1, $zero, 0xd -/* D9588C 8024029C 24040002 */ addiu $a0, $zero, 2 -/* D95890 802402A0 2405FFFF */ addiu $a1, $zero, -1 -/* D95894 802402A4 0000302D */ daddu $a2, $zero, $zero -/* D95898 802402A8 00C0382D */ daddu $a3, $a2, $zero -/* D9589C 802402AC AFA00010 */ sw $zero, 0x10($sp) -/* D958A0 802402B0 AFA00014 */ sw $zero, 0x14($sp) -/* D958A4 802402B4 AFA00018 */ sw $zero, 0x18($sp) -/* D958A8 802402B8 AFA0001C */ sw $zero, 0x1c($sp) -.L802402BC: -/* D958AC 802402BC 0C0B77B9 */ jal func_802DDEE4 -/* D958B0 802402C0 00000000 */ nop -.L802402C4: -/* D958B4 802402C4 9202000E */ lbu $v0, 0xe($s0) -/* D958B8 802402C8 3C01802E */ lui $at, 0x802e -/* D958BC 802402CC A0229D70 */ sb $v0, -0x6290($at) -/* D958C0 802402D0 080900B9 */ j .L802402E4 -/* D958C4 802402D4 0240202D */ daddu $a0, $s2, $zero -.L802402D8: -/* D958C8 802402D8 3C01802E */ lui $at, 0x802e -/* D958CC 802402DC A0209D70 */ sb $zero, -0x6290($at) -/* D958D0 802402E0 0240202D */ daddu $a0, $s2, $zero -.L802402E4: -/* D958D4 802402E4 AC910000 */ sw $s1, ($a0) -/* D958D8 802402E8 AC900008 */ sw $s0, 8($a0) -/* D958DC 802402EC 8FA20038 */ lw $v0, 0x38($sp) -/* D958E0 802402F0 3C038024 */ lui $v1, 0x8024 -/* D958E4 802402F4 24630320 */ addiu $v1, $v1, 0x320 -/* D958E8 802402F8 AC83000C */ sw $v1, 0xc($a0) -/* D958EC 802402FC 00021023 */ negu $v0, $v0 -/* D958F0 80240300 0C047644 */ jal queue_render_task -/* D958F4 80240304 AC820004 */ sw $v0, 4($a0) -.L80240308: -/* D958F8 80240308 8FBF004C */ lw $ra, 0x4c($sp) -/* D958FC 8024030C 8FB20048 */ lw $s2, 0x48($sp) -/* D95900 80240310 8FB10044 */ lw $s1, 0x44($sp) -/* D95904 80240314 8FB00040 */ lw $s0, 0x40($sp) -/* D95908 80240318 03E00008 */ jr $ra -/* D9590C 8024031C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_38/func_80240320_D955F0.s b/asm/nonmatchings/world/area_pra/pra_38/func_80240320_D955F0.s deleted file mode 100644 index ac2f1770bb..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/func_80240320_D955F0.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240320_D95910 -/* D95910 80240320 3C03800A */ lui $v1, 0x800a -/* D95914 80240324 8463A634 */ lh $v1, -0x59cc($v1) -/* D95918 80240328 3C07BF80 */ lui $a3, 0xbf80 -/* D9591C 8024032C 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D95920 80240330 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D95924 80240334 4480A000 */ mtc1 $zero, $f20 -/* D95928 80240338 AFB1011C */ sw $s1, 0x11c($sp) -/* D9592C 8024033C 0080882D */ daddu $s1, $a0, $zero -/* D95930 80240340 AFB00118 */ sw $s0, 0x118($sp) -/* D95934 80240344 27B00098 */ addiu $s0, $sp, 0x98 -/* D95938 80240348 AFBF0120 */ sw $ra, 0x120($sp) -/* D9593C 8024034C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D95940 80240350 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D95944 80240354 00031080 */ sll $v0, $v1, 2 -/* D95948 80240358 00431021 */ addu $v0, $v0, $v1 -/* D9594C 8024035C 00021080 */ sll $v0, $v0, 2 -/* D95950 80240360 00431023 */ subu $v0, $v0, $v1 -/* D95954 80240364 000218C0 */ sll $v1, $v0, 3 -/* D95958 80240368 00431021 */ addu $v0, $v0, $v1 -/* D9595C 8024036C 000210C0 */ sll $v0, $v0, 3 -/* D95960 80240370 3C01800B */ lui $at, 0x800b -/* D95964 80240374 00220821 */ addu $at, $at, $v0 -/* D95968 80240378 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D9596C 8024037C 4406A000 */ mfc1 $a2, $f20 -/* D95970 80240380 4600B587 */ neg.s $f22, $f22 -/* D95974 80240384 4405B000 */ mfc1 $a1, $f22 -/* D95978 80240388 0200202D */ daddu $a0, $s0, $zero -/* D9597C 8024038C 0C019EC8 */ jal guRotateF -/* D95980 80240390 E7B40010 */ swc1 $f20, 0x10($sp) -/* D95984 80240394 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D95988 80240398 0C00A6C9 */ jal clamp_angle -/* D9598C 8024039C 00000000 */ nop -/* D95990 802403A0 44050000 */ mfc1 $a1, $f0 -/* D95994 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D95998 802403A8 4407A000 */ mfc1 $a3, $f20 -/* D9599C 802403AC 3C013F80 */ lui $at, 0x3f80 -/* D959A0 802403B0 4481C000 */ mtc1 $at, $f24 -/* D959A4 802403B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D959A8 802403B8 0C019EC8 */ jal guRotateF -/* D959AC 802403BC E7B80010 */ swc1 $f24, 0x10($sp) -/* D959B0 802403C0 0200202D */ daddu $a0, $s0, $zero -/* D959B4 802403C4 27A50018 */ addiu $a1, $sp, 0x18 -/* D959B8 802403C8 0C019D80 */ jal guMtxCatF -/* D959BC 802403CC 00A0302D */ daddu $a2, $a1, $zero -/* D959C0 802403D0 4405B000 */ mfc1 $a1, $f22 -/* D959C4 802403D4 4406A000 */ mfc1 $a2, $f20 -/* D959C8 802403D8 4407C000 */ mfc1 $a3, $f24 -/* D959CC 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D959D0 802403E0 0C019EC8 */ jal guRotateF -/* D959D4 802403E4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D959D8 802403E8 27A40018 */ addiu $a0, $sp, 0x18 -/* D959DC 802403EC 0200282D */ daddu $a1, $s0, $zero -/* D959E0 802403F0 0C019D80 */ jal guMtxCatF -/* D959E4 802403F4 0080302D */ daddu $a2, $a0, $zero -/* D959E8 802403F8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D959EC 802403FC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D959F0 80240400 4406A000 */ mfc1 $a2, $f20 -/* D959F4 80240404 4407C000 */ mfc1 $a3, $f24 -/* D959F8 80240408 0C019EC8 */ jal guRotateF -/* D959FC 8024040C 0200202D */ daddu $a0, $s0, $zero -/* D95A00 80240410 27A40018 */ addiu $a0, $sp, 0x18 -/* D95A04 80240414 0200282D */ daddu $a1, $s0, $zero -/* D95A08 80240418 0C019D80 */ jal guMtxCatF -/* D95A0C 8024041C 0080302D */ daddu $a2, $a0, $zero -/* D95A10 80240420 3C013F36 */ lui $at, 0x3f36 -/* D95A14 80240424 3421DB6E */ ori $at, $at, 0xdb6e -/* D95A18 80240428 44810000 */ mtc1 $at, $f0 -/* D95A1C 8024042C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D95A20 80240430 44050000 */ mfc1 $a1, $f0 -/* D95A24 80240434 0200202D */ daddu $a0, $s0, $zero -/* D95A28 80240438 00A0302D */ daddu $a2, $a1, $zero -/* D95A2C 8024043C 0C019DF0 */ jal guScaleF -/* D95A30 80240440 00A0382D */ daddu $a3, $a1, $zero -/* D95A34 80240444 27A40018 */ addiu $a0, $sp, 0x18 -/* D95A38 80240448 0200282D */ daddu $a1, $s0, $zero -/* D95A3C 8024044C 0C019D80 */ jal guMtxCatF -/* D95A40 80240450 0080302D */ daddu $a2, $a0, $zero -/* D95A44 80240454 27B00058 */ addiu $s0, $sp, 0x58 -/* D95A48 80240458 C6200030 */ lwc1 $f0, 0x30($s1) -/* D95A4C 8024045C 3C014040 */ lui $at, 0x4040 -/* D95A50 80240460 44811000 */ mtc1 $at, $f2 -/* D95A54 80240464 46000007 */ neg.s $f0, $f0 -/* D95A58 80240468 46020001 */ sub.s $f0, $f0, $f2 -/* D95A5C 8024046C 8E250028 */ lw $a1, 0x28($s1) -/* D95A60 80240470 8E26002C */ lw $a2, 0x2c($s1) -/* D95A64 80240474 44070000 */ mfc1 $a3, $f0 -/* D95A68 80240478 0C019E40 */ jal guTranslateF -/* D95A6C 8024047C 0200202D */ daddu $a0, $s0, $zero -/* D95A70 80240480 27A40018 */ addiu $a0, $sp, 0x18 -/* D95A74 80240484 0200282D */ daddu $a1, $s0, $zero -/* D95A78 80240488 0C019D80 */ jal guMtxCatF -/* D95A7C 8024048C 0080302D */ daddu $a2, $a0, $zero -/* D95A80 80240490 24040002 */ addiu $a0, $zero, 2 -/* D95A84 80240494 0000282D */ daddu $a1, $zero, $zero -/* D95A88 80240498 00A0302D */ daddu $a2, $a1, $zero -/* D95A8C 8024049C 00A0382D */ daddu $a3, $a1, $zero -/* D95A90 802404A0 27A20018 */ addiu $v0, $sp, 0x18 -/* D95A94 802404A4 0C0B7710 */ jal render_sprite -/* D95A98 802404A8 AFA20010 */ sw $v0, 0x10($sp) -/* D95A9C 802404AC 8FBF0120 */ lw $ra, 0x120($sp) -/* D95AA0 802404B0 8FB1011C */ lw $s1, 0x11c($sp) -/* D95AA4 802404B4 8FB00118 */ lw $s0, 0x118($sp) -/* D95AA8 802404B8 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D95AAC 802404BC D7B60130 */ ldc1 $f22, 0x130($sp) -/* D95AB0 802404C0 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D95AB4 802404C4 03E00008 */ jr $ra -/* D95AB8 802404C8 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_38/func_802404CC_D955F0.s b/asm/nonmatchings/world/area_pra/pra_38/func_802404CC_D955F0.s deleted file mode 100644 index f6d321235e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/func_802404CC_D955F0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404CC_D95ABC -/* D95ABC 802404CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D95AC0 802404D0 AFB00010 */ sw $s0, 0x10($sp) -/* D95AC4 802404D4 0080802D */ daddu $s0, $a0, $zero -/* D95AC8 802404D8 AFBF0014 */ sw $ra, 0x14($sp) -/* D95ACC 802404DC 8E020084 */ lw $v0, 0x84($s0) -/* D95AD0 802404E0 0440000E */ bltz $v0, .L8024051C -/* D95AD4 802404E4 28420002 */ slti $v0, $v0, 2 -/* D95AD8 802404E8 1040000C */ beqz $v0, .L8024051C -/* D95ADC 802404EC 00000000 */ nop -/* D95AE0 802404F0 3C058024 */ lui $a1, 0x8024 -/* D95AE4 802404F4 24A50530 */ addiu $a1, $a1, 0x530 -/* D95AE8 802404F8 0C048C56 */ jal bind_dynamic_entity_3 -/* D95AEC 802404FC 0000202D */ daddu $a0, $zero, $zero -/* D95AF0 80240500 8E03013C */ lw $v1, 0x13c($s0) -/* D95AF4 80240504 AC620000 */ sw $v0, ($v1) -/* D95AF8 80240508 3C03800A */ lui $v1, %hi(D_8009A650) -/* D95AFC 8024050C 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D95B00 80240510 8C620000 */ lw $v0, ($v1) -/* D95B04 80240514 34420080 */ ori $v0, $v0, 0x80 -/* D95B08 80240518 AC620000 */ sw $v0, ($v1) -.L8024051C: -/* D95B0C 8024051C 8FBF0014 */ lw $ra, 0x14($sp) -/* D95B10 80240520 8FB00010 */ lw $s0, 0x10($sp) -/* D95B14 80240524 24020002 */ addiu $v0, $zero, 2 -/* D95B18 80240528 03E00008 */ jr $ra -/* D95B1C 8024052C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_38/func_80240530_D955F0.s b/asm/nonmatchings/world/area_pra/pra_38/func_80240530_D955F0.s deleted file mode 100644 index 59ac42bc72..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/func_80240530_D955F0.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240530_D95B20 -/* D95B20 80240530 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D95B24 80240534 AFB00040 */ sw $s0, 0x40($sp) -/* D95B28 80240538 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D95B2C 8024053C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D95B30 80240540 AFB10044 */ sw $s1, 0x44($sp) -/* D95B34 80240544 AFBF004C */ sw $ra, 0x4c($sp) -/* D95B38 80240548 AFB20048 */ sw $s2, 0x48($sp) -/* D95B3C 8024054C 8E020000 */ lw $v0, ($s0) -/* D95B40 80240550 821200BE */ lb $s2, 0xbe($s0) -/* D95B44 80240554 30420001 */ andi $v0, $v0, 1 -/* D95B48 80240558 10400052 */ beqz $v0, .L802406A4 -/* D95B4C 8024055C 27B10020 */ addiu $s1, $sp, 0x20 -/* D95B50 80240560 8E0400CC */ lw $a0, 0xcc($s0) -/* D95B54 80240564 0C044181 */ jal get_shadow_by_index -/* D95B58 80240568 00000000 */ nop -/* D95B5C 8024056C 0C048B77 */ jal func_80122DDC -/* D95B60 80240570 84440008 */ lh $a0, 8($v0) -/* D95B64 80240574 8E050028 */ lw $a1, 0x28($s0) -/* D95B68 80240578 8E070030 */ lw $a3, 0x30($s0) -/* D95B6C 8024057C 27A20030 */ addiu $v0, $sp, 0x30 -/* D95B70 80240580 AFA20010 */ sw $v0, 0x10($sp) -/* D95B74 80240584 27A20034 */ addiu $v0, $sp, 0x34 -/* D95B78 80240588 AFA20014 */ sw $v0, 0x14($sp) -/* D95B7C 8024058C 27A20038 */ addiu $v0, $sp, 0x38 -/* D95B80 80240590 AFA20018 */ sw $v0, 0x18($sp) -/* D95B84 80240594 C600002C */ lwc1 $f0, 0x2c($s0) -/* D95B88 80240598 3C04800A */ lui $a0, 0x800a -/* D95B8C 8024059C 8484A634 */ lh $a0, -0x59cc($a0) -/* D95B90 802405A0 46000007 */ neg.s $f0, $f0 -/* D95B94 802405A4 44060000 */ mfc1 $a2, $f0 -/* D95B98 802405A8 0C00B94E */ jal get_screen_coords -/* D95B9C 802405AC 00000000 */ nop -/* D95BA0 802405B0 8E0500A4 */ lw $a1, 0xa4($s0) -/* D95BA4 802405B4 3C063F80 */ lui $a2, 0x3f80 -/* D95BA8 802405B8 0C0B76A3 */ jal func_802DDA8C -/* D95BAC 802405BC 24040001 */ addiu $a0, $zero, 1 -/* D95BB0 802405C0 8E020000 */ lw $v0, ($s0) -/* D95BB4 802405C4 3C030002 */ lui $v1, 2 -/* D95BB8 802405C8 00431024 */ and $v0, $v0, $v1 -/* D95BBC 802405CC 54400022 */ bnel $v0, $zero, .L80240658 -/* D95BC0 802405D0 24120011 */ addiu $s2, $zero, 0x11 -/* D95BC4 802405D4 9203000E */ lbu $v1, 0xe($s0) -/* D95BC8 802405D8 3C02802E */ lui $v0, 0x802e -/* D95BCC 802405DC 90429D71 */ lbu $v0, -0x628f($v0) -/* D95BD0 802405E0 10620018 */ beq $v1, $v0, .L80240644 -/* D95BD4 802405E4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D95BD8 802405E8 1040000B */ beqz $v0, .L80240618 -/* D95BDC 802405EC 24120011 */ addiu $s2, $zero, 0x11 -/* D95BE0 802405F0 24040001 */ addiu $a0, $zero, 1 -/* D95BE4 802405F4 2405FFFF */ addiu $a1, $zero, -1 -/* D95BE8 802405F8 24060007 */ addiu $a2, $zero, 7 -/* D95BEC 802405FC 0060102D */ daddu $v0, $v1, $zero -/* D95BF0 80240600 0000382D */ daddu $a3, $zero, $zero -/* D95BF4 80240604 AFA00010 */ sw $zero, 0x10($sp) -/* D95BF8 80240608 AFA00014 */ sw $zero, 0x14($sp) -/* D95BFC 8024060C AFA0001C */ sw $zero, 0x1c($sp) -/* D95C00 80240610 0809018F */ j .L8024063C -/* D95C04 80240614 AFA20018 */ sw $v0, 0x18($sp) -.L80240618: -/* D95C08 80240618 2412000D */ addiu $s2, $zero, 0xd -/* D95C0C 8024061C 24040001 */ addiu $a0, $zero, 1 -/* D95C10 80240620 2405FFFF */ addiu $a1, $zero, -1 -/* D95C14 80240624 0000302D */ daddu $a2, $zero, $zero -/* D95C18 80240628 00C0382D */ daddu $a3, $a2, $zero -/* D95C1C 8024062C AFA00010 */ sw $zero, 0x10($sp) -/* D95C20 80240630 AFA00014 */ sw $zero, 0x14($sp) -/* D95C24 80240634 AFA00018 */ sw $zero, 0x18($sp) -/* D95C28 80240638 AFA0001C */ sw $zero, 0x1c($sp) -.L8024063C: -/* D95C2C 8024063C 0C0B77B9 */ jal func_802DDEE4 -/* D95C30 80240640 00000000 */ nop -.L80240644: -/* D95C34 80240644 9202000E */ lbu $v0, 0xe($s0) -/* D95C38 80240648 3C01802E */ lui $at, 0x802e -/* D95C3C 8024064C A0229D71 */ sb $v0, -0x628f($at) -/* D95C40 80240650 08090198 */ j .L80240660 -/* D95C44 80240654 00000000 */ nop -.L80240658: -/* D95C48 80240658 3C01802E */ lui $at, 0x802e -/* D95C4C 8024065C A0209D71 */ sb $zero, -0x628f($at) -.L80240660: -/* D95C50 80240660 8FA20038 */ lw $v0, 0x38($sp) -/* D95C54 80240664 3C048024 */ lui $a0, 0x8024 -/* D95C58 80240668 248408A0 */ addiu $a0, $a0, 0x8a0 -/* D95C5C 8024066C AE320000 */ sw $s2, ($s1) -/* D95C60 80240670 AE300008 */ sw $s0, 8($s1) -/* D95C64 80240674 00021023 */ negu $v0, $v0 -/* D95C68 80240678 AE220004 */ sw $v0, 4($s1) -/* D95C6C 8024067C 8E020000 */ lw $v0, ($s0) -/* D95C70 80240680 3C030002 */ lui $v1, 2 -/* D95C74 80240684 00431024 */ and $v0, $v0, $v1 -/* D95C78 80240688 54400004 */ bnel $v0, $zero, .L8024069C -/* D95C7C 8024068C AE24000C */ sw $a0, 0xc($s1) -/* D95C80 80240690 3C048024 */ lui $a0, 0x8024 -/* D95C84 80240694 248406BC */ addiu $a0, $a0, 0x6bc -/* D95C88 80240698 AE24000C */ sw $a0, 0xc($s1) -.L8024069C: -/* D95C8C 8024069C 0C047644 */ jal queue_render_task -/* D95C90 802406A0 0220202D */ daddu $a0, $s1, $zero -.L802406A4: -/* D95C94 802406A4 8FBF004C */ lw $ra, 0x4c($sp) -/* D95C98 802406A8 8FB20048 */ lw $s2, 0x48($sp) -/* D95C9C 802406AC 8FB10044 */ lw $s1, 0x44($sp) -/* D95CA0 802406B0 8FB00040 */ lw $s0, 0x40($sp) -/* D95CA4 802406B4 03E00008 */ jr $ra -/* D95CA8 802406B8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_38/func_802406BC_D955F0.s b/asm/nonmatchings/world/area_pra/pra_38/func_802406BC_D955F0.s deleted file mode 100644 index 0cd22f2c7d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/func_802406BC_D955F0.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406BC_D95CAC -/* D95CAC 802406BC 3C03800A */ lui $v1, 0x800a -/* D95CB0 802406C0 8463A634 */ lh $v1, -0x59cc($v1) -/* D95CB4 802406C4 3C07BF80 */ lui $a3, 0xbf80 -/* D95CB8 802406C8 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D95CBC 802406CC F7B40128 */ sdc1 $f20, 0x128($sp) -/* D95CC0 802406D0 4480A000 */ mtc1 $zero, $f20 -/* D95CC4 802406D4 AFB1011C */ sw $s1, 0x11c($sp) -/* D95CC8 802406D8 0080882D */ daddu $s1, $a0, $zero -/* D95CCC 802406DC AFB00118 */ sw $s0, 0x118($sp) -/* D95CD0 802406E0 27B00098 */ addiu $s0, $sp, 0x98 -/* D95CD4 802406E4 AFBF0120 */ sw $ra, 0x120($sp) -/* D95CD8 802406E8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D95CDC 802406EC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D95CE0 802406F0 00031080 */ sll $v0, $v1, 2 -/* D95CE4 802406F4 00431021 */ addu $v0, $v0, $v1 -/* D95CE8 802406F8 00021080 */ sll $v0, $v0, 2 -/* D95CEC 802406FC 00431023 */ subu $v0, $v0, $v1 -/* D95CF0 80240700 000218C0 */ sll $v1, $v0, 3 -/* D95CF4 80240704 00431021 */ addu $v0, $v0, $v1 -/* D95CF8 80240708 000210C0 */ sll $v0, $v0, 3 -/* D95CFC 8024070C 3C01800B */ lui $at, 0x800b -/* D95D00 80240710 00220821 */ addu $at, $at, $v0 -/* D95D04 80240714 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D95D08 80240718 4406A000 */ mfc1 $a2, $f20 -/* D95D0C 8024071C 4600B587 */ neg.s $f22, $f22 -/* D95D10 80240720 4405B000 */ mfc1 $a1, $f22 -/* D95D14 80240724 0200202D */ daddu $a0, $s0, $zero -/* D95D18 80240728 0C019EC8 */ jal guRotateF -/* D95D1C 8024072C E7B40010 */ swc1 $f20, 0x10($sp) -/* D95D20 80240730 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D95D24 80240734 0C00A6C9 */ jal clamp_angle -/* D95D28 80240738 00000000 */ nop -/* D95D2C 8024073C 44050000 */ mfc1 $a1, $f0 -/* D95D30 80240740 4406A000 */ mfc1 $a2, $f20 -/* D95D34 80240744 4407A000 */ mfc1 $a3, $f20 -/* D95D38 80240748 3C013F80 */ lui $at, 0x3f80 -/* D95D3C 8024074C 4481C000 */ mtc1 $at, $f24 -/* D95D40 80240750 27A40018 */ addiu $a0, $sp, 0x18 -/* D95D44 80240754 0C019EC8 */ jal guRotateF -/* D95D48 80240758 E7B80010 */ swc1 $f24, 0x10($sp) -/* D95D4C 8024075C 0200202D */ daddu $a0, $s0, $zero -/* D95D50 80240760 27A50018 */ addiu $a1, $sp, 0x18 -/* D95D54 80240764 0C019D80 */ jal guMtxCatF -/* D95D58 80240768 00A0302D */ daddu $a2, $a1, $zero -/* D95D5C 8024076C 4405B000 */ mfc1 $a1, $f22 -/* D95D60 80240770 4406A000 */ mfc1 $a2, $f20 -/* D95D64 80240774 4407C000 */ mfc1 $a3, $f24 -/* D95D68 80240778 0200202D */ daddu $a0, $s0, $zero -/* D95D6C 8024077C 0C019EC8 */ jal guRotateF -/* D95D70 80240780 E7B40010 */ swc1 $f20, 0x10($sp) -/* D95D74 80240784 27A40018 */ addiu $a0, $sp, 0x18 -/* D95D78 80240788 0200282D */ daddu $a1, $s0, $zero -/* D95D7C 8024078C 0C019D80 */ jal guMtxCatF -/* D95D80 80240790 0080302D */ daddu $a2, $a0, $zero -/* D95D84 80240794 E7B40010 */ swc1 $f20, 0x10($sp) -/* D95D88 80240798 8E2500A8 */ lw $a1, 0xa8($s1) -/* D95D8C 8024079C 4406A000 */ mfc1 $a2, $f20 -/* D95D90 802407A0 4407C000 */ mfc1 $a3, $f24 -/* D95D94 802407A4 0C019EC8 */ jal guRotateF -/* D95D98 802407A8 0200202D */ daddu $a0, $s0, $zero -/* D95D9C 802407AC 27A40018 */ addiu $a0, $sp, 0x18 -/* D95DA0 802407B0 0200282D */ daddu $a1, $s0, $zero -/* D95DA4 802407B4 0C019D80 */ jal guMtxCatF -/* D95DA8 802407B8 0080302D */ daddu $a2, $a0, $zero -/* D95DAC 802407BC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D95DB0 802407C0 3C013F36 */ lui $at, 0x3f36 -/* D95DB4 802407C4 3421DB6E */ ori $at, $at, 0xdb6e -/* D95DB8 802407C8 44810000 */ mtc1 $at, $f0 -/* D95DBC 802407CC 0200202D */ daddu $a0, $s0, $zero -/* D95DC0 802407D0 44050000 */ mfc1 $a1, $f0 -/* D95DC4 802407D4 3C06BF36 */ lui $a2, 0xbf36 -/* D95DC8 802407D8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D95DCC 802407DC 0C019DF0 */ jal guScaleF -/* D95DD0 802407E0 00A0382D */ daddu $a3, $a1, $zero -/* D95DD4 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D95DD8 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D95DDC 802407EC 0C019D80 */ jal guMtxCatF -/* D95DE0 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D95DE4 802407F4 27B00058 */ addiu $s0, $sp, 0x58 -/* D95DE8 802407F8 8E250028 */ lw $a1, 0x28($s1) -/* D95DEC 802407FC C620002C */ lwc1 $f0, 0x2c($s1) -/* D95DF0 80240800 8E270030 */ lw $a3, 0x30($s1) -/* D95DF4 80240804 46000007 */ neg.s $f0, $f0 -/* D95DF8 80240808 44060000 */ mfc1 $a2, $f0 -/* D95DFC 8024080C 0C019E40 */ jal guTranslateF -/* D95E00 80240810 0200202D */ daddu $a0, $s0, $zero -/* D95E04 80240814 27A40018 */ addiu $a0, $sp, 0x18 -/* D95E08 80240818 0200282D */ daddu $a1, $s0, $zero -/* D95E0C 8024081C 0C019D80 */ jal guMtxCatF -/* D95E10 80240820 0080302D */ daddu $a2, $a0, $zero -/* D95E14 80240824 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D95E18 80240828 3C0142B4 */ lui $at, 0x42b4 -/* D95E1C 8024082C 44810000 */ mtc1 $at, $f0 -/* D95E20 80240830 00000000 */ nop -/* D95E24 80240834 4602003E */ c.le.s $f0, $f2 -/* D95E28 80240838 00000000 */ nop -/* D95E2C 8024083C 4500000A */ bc1f .L80240868 -/* D95E30 80240840 24040001 */ addiu $a0, $zero, 1 -/* D95E34 80240844 3C014387 */ lui $at, 0x4387 -/* D95E38 80240848 44810000 */ mtc1 $at, $f0 -/* D95E3C 8024084C 00000000 */ nop -/* D95E40 80240850 4600103C */ c.lt.s $f2, $f0 -/* D95E44 80240854 00000000 */ nop -/* D95E48 80240858 45000004 */ bc1f .L8024086C -/* D95E4C 8024085C 27A20018 */ addiu $v0, $sp, 0x18 -/* D95E50 80240860 3C041000 */ lui $a0, 0x1000 -/* D95E54 80240864 34840001 */ ori $a0, $a0, 1 -.L80240868: -/* D95E58 80240868 27A20018 */ addiu $v0, $sp, 0x18 -.L8024086C: -/* D95E5C 8024086C 0000282D */ daddu $a1, $zero, $zero -/* D95E60 80240870 00A0302D */ daddu $a2, $a1, $zero -/* D95E64 80240874 00A0382D */ daddu $a3, $a1, $zero -/* D95E68 80240878 0C0B7710 */ jal render_sprite -/* D95E6C 8024087C AFA20010 */ sw $v0, 0x10($sp) -/* D95E70 80240880 8FBF0120 */ lw $ra, 0x120($sp) -/* D95E74 80240884 8FB1011C */ lw $s1, 0x11c($sp) -/* D95E78 80240888 8FB00118 */ lw $s0, 0x118($sp) -/* D95E7C 8024088C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D95E80 80240890 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D95E84 80240894 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D95E88 80240898 03E00008 */ jr $ra -/* D95E8C 8024089C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_38/func_802408A0_D955F0.s b/asm/nonmatchings/world/area_pra/pra_38/func_802408A0_D955F0.s deleted file mode 100644 index 32f61fcd0c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/func_802408A0_D955F0.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A0_D95E90 -/* D95E90 802408A0 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D95E94 802408A4 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D95E98 802408A8 4480B000 */ mtc1 $zero, $f22 -/* D95E9C 802408AC AFB10134 */ sw $s1, 0x134($sp) -/* D95EA0 802408B0 0080882D */ daddu $s1, $a0, $zero -/* D95EA4 802408B4 AFB3013C */ sw $s3, 0x13c($sp) -/* D95EA8 802408B8 0000982D */ daddu $s3, $zero, $zero -/* D95EAC 802408BC AFB60148 */ sw $s6, 0x148($sp) -/* D95EB0 802408C0 3C16800B */ lui $s6, %hi(gCameras) -/* D95EB4 802408C4 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D95EB8 802408C8 AFB50144 */ sw $s5, 0x144($sp) -/* D95EBC 802408CC 241500FF */ addiu $s5, $zero, 0xff -/* D95EC0 802408D0 AFB00130 */ sw $s0, 0x130($sp) -/* D95EC4 802408D4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D95EC8 802408D8 AFB20138 */ sw $s2, 0x138($sp) -/* D95ECC 802408DC 27B20060 */ addiu $s2, $sp, 0x60 -/* D95ED0 802408E0 AFB40140 */ sw $s4, 0x140($sp) -/* D95ED4 802408E4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D95ED8 802408E8 AFBF014C */ sw $ra, 0x14c($sp) -/* D95EDC 802408EC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D95EE0 802408F0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D95EE4 802408F4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D95EE8 802408F8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D95EEC 802408FC F7B40150 */ sdc1 $f20, 0x150($sp) -.L80240900: -/* D95EF0 80240900 3C03800A */ lui $v1, 0x800a -/* D95EF4 80240904 8463A634 */ lh $v1, -0x59cc($v1) -/* D95EF8 80240908 00031080 */ sll $v0, $v1, 2 -/* D95EFC 8024090C 00431021 */ addu $v0, $v0, $v1 -/* D95F00 80240910 00021080 */ sll $v0, $v0, 2 -/* D95F04 80240914 00431023 */ subu $v0, $v0, $v1 -/* D95F08 80240918 000218C0 */ sll $v1, $v0, 3 -/* D95F0C 8024091C 00431021 */ addu $v0, $v0, $v1 -/* D95F10 80240920 000210C0 */ sll $v0, $v0, 3 -/* D95F14 80240924 00561021 */ addu $v0, $v0, $s6 -/* D95F18 80240928 C440006C */ lwc1 $f0, 0x6c($v0) -/* D95F1C 8024092C 16600065 */ bnez $s3, .L80240AC4 -/* D95F20 80240930 46000507 */ neg.s $f20, $f0 -/* D95F24 80240934 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D95F28 80240938 3C0142B4 */ lui $at, 0x42b4 -/* D95F2C 8024093C 44810000 */ mtc1 $at, $f0 -/* D95F30 80240940 00000000 */ nop -/* D95F34 80240944 4602003C */ c.lt.s $f0, $f2 -/* D95F38 80240948 00000000 */ nop -/* D95F3C 8024094C 4500000A */ bc1f .L80240978 -/* D95F40 80240950 00000000 */ nop -/* D95F44 80240954 3C014334 */ lui $at, 0x4334 -/* D95F48 80240958 44812000 */ mtc1 $at, $f4 -/* D95F4C 8024095C 00000000 */ nop -/* D95F50 80240960 4604103E */ c.le.s $f2, $f4 -/* D95F54 80240964 00000000 */ nop -/* D95F58 80240968 45000003 */ bc1f .L80240978 -/* D95F5C 8024096C 00000000 */ nop -/* D95F60 80240970 08090282 */ j .L80240A08 -/* D95F64 80240974 46022501 */ sub.s $f20, $f4, $f2 -.L80240978: -/* D95F68 80240978 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D95F6C 8024097C 3C014334 */ lui $at, 0x4334 -/* D95F70 80240980 44812000 */ mtc1 $at, $f4 -/* D95F74 80240984 00000000 */ nop -/* D95F78 80240988 4600203C */ c.lt.s $f4, $f0 -/* D95F7C 8024098C 00000000 */ nop -/* D95F80 80240990 4500000C */ bc1f .L802409C4 -/* D95F84 80240994 00000000 */ nop -/* D95F88 80240998 3C014387 */ lui $at, 0x4387 -/* D95F8C 8024099C 44812000 */ mtc1 $at, $f4 -/* D95F90 802409A0 00000000 */ nop -/* D95F94 802409A4 4604003E */ c.le.s $f0, $f4 -/* D95F98 802409A8 00000000 */ nop -/* D95F9C 802409AC 45000008 */ bc1f .L802409D0 -/* D95FA0 802409B0 00000000 */ nop -/* D95FA4 802409B4 3C014334 */ lui $at, 0x4334 -/* D95FA8 802409B8 44812000 */ mtc1 $at, $f4 -/* D95FAC 802409BC 08090282 */ j .L80240A08 -/* D95FB0 802409C0 46040501 */ sub.s $f20, $f0, $f4 -.L802409C4: -/* D95FB4 802409C4 3C014387 */ lui $at, 0x4387 -/* D95FB8 802409C8 44812000 */ mtc1 $at, $f4 -/* D95FBC 802409CC 00000000 */ nop -.L802409D0: -/* D95FC0 802409D0 4600203C */ c.lt.s $f4, $f0 -/* D95FC4 802409D4 00000000 */ nop -/* D95FC8 802409D8 4500000A */ bc1f .L80240A04 -/* D95FCC 802409DC 00000000 */ nop -/* D95FD0 802409E0 3C0143B4 */ lui $at, 0x43b4 -/* D95FD4 802409E4 44811000 */ mtc1 $at, $f2 -/* D95FD8 802409E8 00000000 */ nop -/* D95FDC 802409EC 4602003E */ c.le.s $f0, $f2 -/* D95FE0 802409F0 00000000 */ nop -/* D95FE4 802409F4 45000003 */ bc1f .L80240A04 -/* D95FE8 802409F8 00000000 */ nop -/* D95FEC 802409FC 08090282 */ j .L80240A08 -/* D95FF0 80240A00 46001501 */ sub.s $f20, $f2, $f0 -.L80240A04: -/* D95FF4 80240A04 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L80240A08: -/* D95FF8 80240A08 3C0141C8 */ lui $at, 0x41c8 -/* D95FFC 80240A0C 44810000 */ mtc1 $at, $f0 -/* D96000 80240A10 00000000 */ nop -/* D96004 80240A14 4600A003 */ div.s $f0, $f20, $f0 -/* D96008 80240A18 4600010D */ trunc.w.s $f4, $f0 -/* D9600C 80240A1C 44072000 */ mfc1 $a3, $f4 -/* D96010 80240A20 00000000 */ nop -/* D96014 80240A24 00071100 */ sll $v0, $a3, 4 -/* D96018 80240A28 00471023 */ subu $v0, $v0, $a3 -/* D9601C 80240A2C 00021080 */ sll $v0, $v0, 2 -/* D96020 80240A30 02A23823 */ subu $a3, $s5, $v0 -/* D96024 80240A34 28E20064 */ slti $v0, $a3, 0x64 -/* D96028 80240A38 54400001 */ bnel $v0, $zero, .L80240A40 -/* D9602C 80240A3C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A40: -/* D96030 80240A40 24040001 */ addiu $a0, $zero, 1 -/* D96034 80240A44 2405FFFF */ addiu $a1, $zero, -1 -/* D96038 80240A48 24060006 */ addiu $a2, $zero, 6 -/* D9603C 80240A4C AFA70010 */ sw $a3, 0x10($sp) -/* D96040 80240A50 AFA70014 */ sw $a3, 0x14($sp) -/* D96044 80240A54 AFB50018 */ sw $s5, 0x18($sp) -/* D96048 80240A58 0C0B77B9 */ jal func_802DDEE4 -/* D9604C 80240A5C AFA0001C */ sw $zero, 0x1c($sp) -/* D96050 80240A60 4405A000 */ mfc1 $a1, $f20 -/* D96054 80240A64 4406B000 */ mfc1 $a2, $f22 -/* D96058 80240A68 3C07BF80 */ lui $a3, 0xbf80 -/* D9605C 80240A6C 0200202D */ daddu $a0, $s0, $zero -/* D96060 80240A70 0C019EC8 */ jal guRotateF -/* D96064 80240A74 E7B60010 */ swc1 $f22, 0x10($sp) -/* D96068 80240A78 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D9606C 80240A7C 0C00A6C9 */ jal clamp_angle -/* D96070 80240A80 00000000 */ nop -/* D96074 80240A84 44050000 */ mfc1 $a1, $f0 -/* D96078 80240A88 4406B000 */ mfc1 $a2, $f22 -/* D9607C 80240A8C 4407B000 */ mfc1 $a3, $f22 -/* D96080 80240A90 3C013F80 */ lui $at, 0x3f80 -/* D96084 80240A94 44812000 */ mtc1 $at, $f4 -/* D96088 80240A98 27A40020 */ addiu $a0, $sp, 0x20 -/* D9608C 80240A9C 0C019EC8 */ jal guRotateF -/* D96090 80240AA0 E7A40010 */ swc1 $f4, 0x10($sp) -/* D96094 80240AA4 0200202D */ daddu $a0, $s0, $zero -/* D96098 80240AA8 27A50020 */ addiu $a1, $sp, 0x20 -/* D9609C 80240AAC 0C019D80 */ jal guMtxCatF -/* D960A0 80240AB0 00A0302D */ daddu $a2, $a1, $zero -/* D960A4 80240AB4 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D960A8 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D960AC 80240ABC 080902E2 */ j .L80240B88 -/* D960B0 80240AC0 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240AC4: -/* D960B4 80240AC4 0260202D */ daddu $a0, $s3, $zero -/* D960B8 80240AC8 27A50120 */ addiu $a1, $sp, 0x120 -/* D960BC 80240ACC 27A60124 */ addiu $a2, $sp, 0x124 -/* D960C0 80240AD0 0C03964E */ jal func_800E5938 -/* D960C4 80240AD4 27A70128 */ addiu $a3, $sp, 0x128 -/* D960C8 80240AD8 8FA60124 */ lw $a2, 0x124($sp) -/* D960CC 80240ADC 3C028000 */ lui $v0, 0x8000 -/* D960D0 80240AE0 14C20004 */ bne $a2, $v0, .L80240AF4 -/* D960D4 80240AE4 46000606 */ mov.s $f24, $f0 -/* D960D8 80240AE8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D960DC 80240AEC 080902C1 */ j .L80240B04 -/* D960E0 80240AF0 24040001 */ addiu $a0, $zero, 1 -.L80240AF4: -/* D960E4 80240AF4 4486D000 */ mtc1 $a2, $f26 -/* D960E8 80240AF8 00000000 */ nop -/* D960EC 80240AFC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D960F0 80240B00 24040001 */ addiu $a0, $zero, 1 -.L80240B04: -/* D960F4 80240B04 2405FFFF */ addiu $a1, $zero, -1 -/* D960F8 80240B08 24060007 */ addiu $a2, $zero, 7 -/* D960FC 80240B0C 0000382D */ daddu $a3, $zero, $zero -/* D96100 80240B10 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D96104 80240B14 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D96108 80240B18 24020040 */ addiu $v0, $zero, 0x40 -/* D9610C 80240B1C AFA00010 */ sw $zero, 0x10($sp) -/* D96110 80240B20 AFA00014 */ sw $zero, 0x14($sp) -/* D96114 80240B24 AFA20018 */ sw $v0, 0x18($sp) -/* D96118 80240B28 0C0B77B9 */ jal func_802DDEE4 -/* D9611C 80240B2C AFA0001C */ sw $zero, 0x1c($sp) -/* D96120 80240B30 4405A000 */ mfc1 $a1, $f20 -/* D96124 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D96128 80240B38 3C07BF80 */ lui $a3, 0xbf80 -/* D9612C 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D96130 80240B40 0C019EC8 */ jal guRotateF -/* D96134 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D96138 80240B48 4405A000 */ mfc1 $a1, $f20 -/* D9613C 80240B4C 4406B000 */ mfc1 $a2, $f22 -/* D96140 80240B50 3C07BF80 */ lui $a3, 0xbf80 -/* D96144 80240B54 0200202D */ daddu $a0, $s0, $zero -/* D96148 80240B58 0C019EC8 */ jal guRotateF -/* D9614C 80240B5C E7B60010 */ swc1 $f22, 0x10($sp) -/* D96150 80240B60 4405C000 */ mfc1 $a1, $f24 -/* D96154 80240B64 4406B000 */ mfc1 $a2, $f22 -/* D96158 80240B68 3C073F80 */ lui $a3, 0x3f80 -/* D9615C 80240B6C 27A40020 */ addiu $a0, $sp, 0x20 -/* D96160 80240B70 0C019EC8 */ jal guRotateF -/* D96164 80240B74 E7B60010 */ swc1 $f22, 0x10($sp) -/* D96168 80240B78 0200202D */ daddu $a0, $s0, $zero -/* D9616C 80240B7C 27A50020 */ addiu $a1, $sp, 0x20 -/* D96170 80240B80 0C019D80 */ jal guMtxCatF -/* D96174 80240B84 00A0302D */ daddu $a2, $a1, $zero -.L80240B88: -/* D96178 80240B88 862200B0 */ lh $v0, 0xb0($s1) -/* D9617C 80240B8C 3C013F00 */ lui $at, 0x3f00 -/* D96180 80240B90 44812000 */ mtc1 $at, $f4 -/* D96184 80240B94 00021023 */ negu $v0, $v0 -/* D96188 80240B98 44820000 */ mtc1 $v0, $f0 -/* D9618C 80240B9C 00000000 */ nop -/* D96190 80240BA0 46800020 */ cvt.s.w $f0, $f0 -/* D96194 80240BA4 46040102 */ mul.s $f4, $f0, $f4 -/* D96198 80240BA8 00000000 */ nop -/* D9619C 80240BAC 4405B000 */ mfc1 $a1, $f22 -/* D961A0 80240BB0 4407B000 */ mfc1 $a3, $f22 -/* D961A4 80240BB4 44062000 */ mfc1 $a2, $f4 -/* D961A8 80240BB8 0C019E40 */ jal guTranslateF -/* D961AC 80240BBC 0240202D */ daddu $a0, $s2, $zero -/* D961B0 80240BC0 0240202D */ daddu $a0, $s2, $zero -/* D961B4 80240BC4 27A50020 */ addiu $a1, $sp, 0x20 -/* D961B8 80240BC8 0C019D80 */ jal guMtxCatF -/* D961BC 80240BCC 00A0302D */ daddu $a2, $a1, $zero -/* D961C0 80240BD0 4405A000 */ mfc1 $a1, $f20 -/* D961C4 80240BD4 4406B000 */ mfc1 $a2, $f22 -/* D961C8 80240BD8 3C073F80 */ lui $a3, 0x3f80 -/* D961CC 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D961D0 80240BE0 0C019EC8 */ jal guRotateF -/* D961D4 80240BE4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D961D8 80240BE8 27A40020 */ addiu $a0, $sp, 0x20 -/* D961DC 80240BEC 0200282D */ daddu $a1, $s0, $zero -/* D961E0 80240BF0 0C019D80 */ jal guMtxCatF -/* D961E4 80240BF4 0080302D */ daddu $a2, $a0, $zero -/* D961E8 80240BF8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D961EC 80240BFC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D961F0 80240C00 4406B000 */ mfc1 $a2, $f22 -/* D961F4 80240C04 3C073F80 */ lui $a3, 0x3f80 -/* D961F8 80240C08 0C019EC8 */ jal guRotateF -/* D961FC 80240C0C 0200202D */ daddu $a0, $s0, $zero -/* D96200 80240C10 27A40020 */ addiu $a0, $sp, 0x20 -/* D96204 80240C14 0200282D */ daddu $a1, $s0, $zero -/* D96208 80240C18 0C019D80 */ jal guMtxCatF -/* D9620C 80240C1C 0080302D */ daddu $a2, $a0, $zero -/* D96210 80240C20 862200B0 */ lh $v0, 0xb0($s1) -/* D96214 80240C24 3C013F00 */ lui $at, 0x3f00 -/* D96218 80240C28 44812000 */ mtc1 $at, $f4 -/* D9621C 80240C2C 44820000 */ mtc1 $v0, $f0 -/* D96220 80240C30 00000000 */ nop -/* D96224 80240C34 46800020 */ cvt.s.w $f0, $f0 -/* D96228 80240C38 46040102 */ mul.s $f4, $f0, $f4 -/* D9622C 80240C3C 00000000 */ nop -/* D96230 80240C40 4405B000 */ mfc1 $a1, $f22 -/* D96234 80240C44 4407B000 */ mfc1 $a3, $f22 -/* D96238 80240C48 44062000 */ mfc1 $a2, $f4 -/* D9623C 80240C4C 0C019E40 */ jal guTranslateF -/* D96240 80240C50 0240202D */ daddu $a0, $s2, $zero -/* D96244 80240C54 27A40020 */ addiu $a0, $sp, 0x20 -/* D96248 80240C58 0240282D */ daddu $a1, $s2, $zero -/* D9624C 80240C5C 0C019D80 */ jal guMtxCatF -/* D96250 80240C60 0080302D */ daddu $a2, $a0, $zero -/* D96254 80240C64 3C013F36 */ lui $at, 0x3f36 -/* D96258 80240C68 3421DB6E */ ori $at, $at, 0xdb6e -/* D9625C 80240C6C 44810000 */ mtc1 $at, $f0 -/* D96260 80240C70 0280202D */ daddu $a0, $s4, $zero -/* D96264 80240C74 44050000 */ mfc1 $a1, $f0 -/* D96268 80240C78 3C06BF36 */ lui $a2, 0xbf36 -/* D9626C 80240C7C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D96270 80240C80 0C019DF0 */ jal guScaleF -/* D96274 80240C84 00A0382D */ daddu $a3, $a1, $zero -/* D96278 80240C88 27A40020 */ addiu $a0, $sp, 0x20 -/* D9627C 80240C8C 0280282D */ daddu $a1, $s4, $zero -/* D96280 80240C90 0C019D80 */ jal guMtxCatF -/* D96284 80240C94 0080302D */ daddu $a2, $a0, $zero -/* D96288 80240C98 4600D687 */ neg.s $f26, $f26 -/* D9628C 80240C9C 4405F000 */ mfc1 $a1, $f30 -/* D96290 80240CA0 4407E000 */ mfc1 $a3, $f28 -/* D96294 80240CA4 4406D000 */ mfc1 $a2, $f26 -/* D96298 80240CA8 0C019E40 */ jal guTranslateF -/* D9629C 80240CAC 0240202D */ daddu $a0, $s2, $zero -/* D962A0 80240CB0 27A40020 */ addiu $a0, $sp, 0x20 -/* D962A4 80240CB4 0240282D */ daddu $a1, $s2, $zero -/* D962A8 80240CB8 0C019D80 */ jal guMtxCatF -/* D962AC 80240CBC 0080302D */ daddu $a2, $a0, $zero -/* D962B0 80240CC0 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D962B4 80240CC4 3C0142B4 */ lui $at, 0x42b4 -/* D962B8 80240CC8 44810000 */ mtc1 $at, $f0 -/* D962BC 80240CCC 00000000 */ nop -/* D962C0 80240CD0 4602003E */ c.le.s $f0, $f2 -/* D962C4 80240CD4 00000000 */ nop -/* D962C8 80240CD8 4500000A */ bc1f .L80240D04 -/* D962CC 80240CDC 24040001 */ addiu $a0, $zero, 1 -/* D962D0 80240CE0 3C014387 */ lui $at, 0x4387 -/* D962D4 80240CE4 44812000 */ mtc1 $at, $f4 -/* D962D8 80240CE8 00000000 */ nop -/* D962DC 80240CEC 4604103C */ c.lt.s $f2, $f4 -/* D962E0 80240CF0 00000000 */ nop -/* D962E4 80240CF4 45000004 */ bc1f .L80240D08 -/* D962E8 80240CF8 27A20020 */ addiu $v0, $sp, 0x20 -/* D962EC 80240CFC 3C041000 */ lui $a0, 0x1000 -/* D962F0 80240D00 34840001 */ ori $a0, $a0, 1 -.L80240D04: -/* D962F4 80240D04 27A20020 */ addiu $v0, $sp, 0x20 -.L80240D08: -/* D962F8 80240D08 AFA20010 */ sw $v0, 0x10($sp) -/* D962FC 80240D0C 0000282D */ daddu $a1, $zero, $zero -/* D96300 80240D10 00A0302D */ daddu $a2, $a1, $zero -/* D96304 80240D14 0C0B7710 */ jal render_sprite -/* D96308 80240D18 00A0382D */ daddu $a3, $a1, $zero -/* D9630C 80240D1C 26730001 */ addiu $s3, $s3, 1 -/* D96310 80240D20 2A620002 */ slti $v0, $s3, 2 -/* D96314 80240D24 1440FEF6 */ bnez $v0, .L80240900 -/* D96318 80240D28 00000000 */ nop -/* D9631C 80240D2C 8FBF014C */ lw $ra, 0x14c($sp) -/* D96320 80240D30 8FB60148 */ lw $s6, 0x148($sp) -/* D96324 80240D34 8FB50144 */ lw $s5, 0x144($sp) -/* D96328 80240D38 8FB40140 */ lw $s4, 0x140($sp) -/* D9632C 80240D3C 8FB3013C */ lw $s3, 0x13c($sp) -/* D96330 80240D40 8FB20138 */ lw $s2, 0x138($sp) -/* D96334 80240D44 8FB10134 */ lw $s1, 0x134($sp) -/* D96338 80240D48 8FB00130 */ lw $s0, 0x130($sp) -/* D9633C 80240D4C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D96340 80240D50 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D96344 80240D54 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D96348 80240D58 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D9634C 80240D5C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D96350 80240D60 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D96354 80240D64 03E00008 */ jr $ra -/* D96358 80240D68 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_38/func_80240D6C_D955F0.s b/asm/nonmatchings/world/area_pra/pra_38/func_80240D6C_D955F0.s deleted file mode 100644 index d09e4a6241..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/func_80240D6C_D955F0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D6C_D9635C -/* D9635C 80240D6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D96360 80240D70 AFB00010 */ sw $s0, 0x10($sp) -/* D96364 80240D74 0080802D */ daddu $s0, $a0, $zero -/* D96368 80240D78 AFBF0014 */ sw $ra, 0x14($sp) -/* D9636C 80240D7C 8E020088 */ lw $v0, 0x88($s0) -/* D96370 80240D80 14400017 */ bnez $v0, .L80240DE0 -/* D96374 80240D84 24020001 */ addiu $v0, $zero, 1 -/* D96378 80240D88 8E030084 */ lw $v1, 0x84($s0) -/* D9637C 80240D8C 1062001A */ beq $v1, $v0, .L80240DF8 -/* D96380 80240D90 00000000 */ nop -/* D96384 80240D94 28620002 */ slti $v0, $v1, 2 -/* D96388 80240D98 50400005 */ beql $v0, $zero, .L80240DB0 -/* D9638C 80240D9C 24020002 */ addiu $v0, $zero, 2 -/* D96390 80240DA0 10600007 */ beqz $v1, .L80240DC0 -/* D96394 80240DA4 00000000 */ nop -/* D96398 80240DA8 08090384 */ j .L80240E10 -/* D9639C 80240DAC 00000000 */ nop -.L80240DB0: -/* D963A0 80240DB0 10620007 */ beq $v1, $v0, .L80240DD0 -/* D963A4 80240DB4 00000000 */ nop -/* D963A8 80240DB8 08090384 */ j .L80240E10 -/* D963AC 80240DBC 00000000 */ nop -.L80240DC0: -/* D963B0 80240DC0 3C048024 */ lui $a0, 0x8024 -/* D963B4 80240DC4 24840EB4 */ addiu $a0, $a0, 0xeb4 -/* D963B8 80240DC8 08090380 */ j .L80240E00 -/* D963BC 80240DCC 00000000 */ nop -.L80240DD0: -/* D963C0 80240DD0 3C048024 */ lui $a0, 0x8024 -/* D963C4 80240DD4 24840F1C */ addiu $a0, $a0, 0xf1c -/* D963C8 80240DD8 08090380 */ j .L80240E00 -/* D963CC 80240DDC 00000000 */ nop -.L80240DE0: -/* D963D0 80240DE0 8E020084 */ lw $v0, 0x84($s0) -/* D963D4 80240DE4 0440000A */ bltz $v0, .L80240E10 -/* D963D8 80240DE8 00000000 */ nop -/* D963DC 80240DEC 28420002 */ slti $v0, $v0, 2 -/* D963E0 80240DF0 10400007 */ beqz $v0, .L80240E10 -/* D963E4 80240DF4 00000000 */ nop -.L80240DF8: -/* D963E8 80240DF8 3C048024 */ lui $a0, 0x8024 -/* D963EC 80240DFC 24840EE8 */ addiu $a0, $a0, 0xee8 -.L80240E00: -/* D963F0 80240E00 0C048C56 */ jal bind_dynamic_entity_3 -/* D963F4 80240E04 0000282D */ daddu $a1, $zero, $zero -/* D963F8 80240E08 8E03013C */ lw $v1, 0x13c($s0) -/* D963FC 80240E0C AC620004 */ sw $v0, 4($v1) -.L80240E10: -/* D96400 80240E10 0C00EAD2 */ jal get_npc_safe -/* D96404 80240E14 2404FFFC */ addiu $a0, $zero, -4 -/* D96408 80240E18 0040282D */ daddu $a1, $v0, $zero -/* D9640C 80240E1C 10A00021 */ beqz $a1, .L80240EA4 -/* D96410 80240E20 24020002 */ addiu $v0, $zero, 2 -/* D96414 80240E24 8E020088 */ lw $v0, 0x88($s0) -/* D96418 80240E28 14400014 */ bnez $v0, .L80240E7C -/* D9641C 80240E2C 24020001 */ addiu $v0, $zero, 1 -/* D96420 80240E30 8E040084 */ lw $a0, 0x84($s0) -/* D96424 80240E34 10820016 */ beq $a0, $v0, .L80240E90 -/* D96428 80240E38 28820002 */ slti $v0, $a0, 2 -/* D9642C 80240E3C 10400005 */ beqz $v0, .L80240E54 -/* D96430 80240E40 24020002 */ addiu $v0, $zero, 2 -/* D96434 80240E44 10800007 */ beqz $a0, .L80240E64 -/* D96438 80240E48 00000000 */ nop -/* D9643C 80240E4C 080903A9 */ j .L80240EA4 -/* D96440 80240E50 00000000 */ nop -.L80240E54: -/* D96444 80240E54 10820006 */ beq $a0, $v0, .L80240E70 -/* D96448 80240E58 24020002 */ addiu $v0, $zero, 2 -/* D9644C 80240E5C 080903A9 */ j .L80240EA4 -/* D96450 80240E60 00000000 */ nop -.L80240E64: -/* D96454 80240E64 8CA20000 */ lw $v0, ($a1) -/* D96458 80240E68 080903A6 */ j .L80240E98 -/* D9645C 80240E6C 3C03000A */ lui $v1, 0xa -.L80240E70: -/* D96460 80240E70 8CA20000 */ lw $v0, ($a1) -/* D96464 80240E74 080903A6 */ j .L80240E98 -/* D96468 80240E78 3C030002 */ lui $v1, 2 -.L80240E7C: -/* D9646C 80240E7C 8E020084 */ lw $v0, 0x84($s0) -/* D96470 80240E80 04400007 */ bltz $v0, .L80240EA0 -/* D96474 80240E84 28420002 */ slti $v0, $v0, 2 -/* D96478 80240E88 10400006 */ beqz $v0, .L80240EA4 -/* D9647C 80240E8C 24020002 */ addiu $v0, $zero, 2 -.L80240E90: -/* D96480 80240E90 8CA20000 */ lw $v0, ($a1) -/* D96484 80240E94 3C030008 */ lui $v1, 8 -.L80240E98: -/* D96488 80240E98 00431025 */ or $v0, $v0, $v1 -/* D9648C 80240E9C ACA20000 */ sw $v0, ($a1) -.L80240EA0: -/* D96490 80240EA0 24020002 */ addiu $v0, $zero, 2 -.L80240EA4: -/* D96494 80240EA4 8FBF0014 */ lw $ra, 0x14($sp) -/* D96498 80240EA8 8FB00010 */ lw $s0, 0x10($sp) -/* D9649C 80240EAC 03E00008 */ jr $ra -/* D964A0 80240EB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_38/func_80240EB4_D955F0.s b/asm/nonmatchings/world/area_pra/pra_38/func_80240EB4_D955F0.s deleted file mode 100644 index ffa191a56f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/func_80240EB4_D955F0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_D964A4 -/* D964A4 80240EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D964A8 80240EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D964AC 80240EBC 0C00EAD2 */ jal get_npc_safe -/* D964B0 80240EC0 2404FFFC */ addiu $a0, $zero, -4 -/* D964B4 80240EC4 0040202D */ daddu $a0, $v0, $zero -/* D964B8 80240EC8 10800004 */ beqz $a0, .L80240EDC -/* D964BC 80240ECC 3C03000A */ lui $v1, 0xa -/* D964C0 80240ED0 8C820000 */ lw $v0, ($a0) -/* D964C4 80240ED4 00431025 */ or $v0, $v0, $v1 -/* D964C8 80240ED8 AC820000 */ sw $v0, ($a0) -.L80240EDC: -/* D964CC 80240EDC 8FBF0010 */ lw $ra, 0x10($sp) -/* D964D0 80240EE0 03E00008 */ jr $ra -/* D964D4 80240EE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_38/func_80240EE8_D955F0.s b/asm/nonmatchings/world/area_pra/pra_38/func_80240EE8_D955F0.s deleted file mode 100644 index 6c37085265..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/func_80240EE8_D955F0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE8_D964D8 -/* D964D8 80240EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D964DC 80240EEC AFBF0010 */ sw $ra, 0x10($sp) -/* D964E0 80240EF0 0C00EAD2 */ jal get_npc_safe -/* D964E4 80240EF4 2404FFFC */ addiu $a0, $zero, -4 -/* D964E8 80240EF8 0040202D */ daddu $a0, $v0, $zero -/* D964EC 80240EFC 10800004 */ beqz $a0, .L80240F10 -/* D964F0 80240F00 3C030008 */ lui $v1, 8 -/* D964F4 80240F04 8C820000 */ lw $v0, ($a0) -/* D964F8 80240F08 00431025 */ or $v0, $v0, $v1 -/* D964FC 80240F0C AC820000 */ sw $v0, ($a0) -.L80240F10: -/* D96500 80240F10 8FBF0010 */ lw $ra, 0x10($sp) -/* D96504 80240F14 03E00008 */ jr $ra -/* D96508 80240F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_38/func_80240F1C_D955F0.s b/asm/nonmatchings/world/area_pra/pra_38/func_80240F1C_D955F0.s deleted file mode 100644 index 3135ed1e2e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/func_80240F1C_D955F0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F1C_D9650C -/* D9650C 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D96510 80240F20 AFBF0010 */ sw $ra, 0x10($sp) -/* D96514 80240F24 0C00EAD2 */ jal get_npc_safe -/* D96518 80240F28 2404FFFC */ addiu $a0, $zero, -4 -/* D9651C 80240F2C 0040202D */ daddu $a0, $v0, $zero -/* D96520 80240F30 10800004 */ beqz $a0, .L80240F44 -/* D96524 80240F34 3C030002 */ lui $v1, 2 -/* D96528 80240F38 8C820000 */ lw $v0, ($a0) -/* D9652C 80240F3C 00431025 */ or $v0, $v0, $v1 -/* D96530 80240F40 AC820000 */ sw $v0, ($a0) -.L80240F44: -/* D96534 80240F44 8FBF0010 */ lw $ra, 0x10($sp) -/* D96538 80240F48 03E00008 */ jr $ra -/* D9653C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_38/func_80240F50_D955F0.s b/asm/nonmatchings/world/area_pra/pra_38/func_80240F50_D955F0.s deleted file mode 100644 index a30271a155..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/func_80240F50_D955F0.s +++ /dev/null @@ -1,508 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F50_D96540 -/* D96540 80240F50 27BDFF88 */ addiu $sp, $sp, -0x78 -/* D96544 80240F54 AFB3005C */ sw $s3, 0x5c($sp) -/* D96548 80240F58 0080982D */ daddu $s3, $a0, $zero -/* D9654C 80240F5C AFBF006C */ sw $ra, 0x6c($sp) -/* D96550 80240F60 AFB60068 */ sw $s6, 0x68($sp) -/* D96554 80240F64 AFB50064 */ sw $s5, 0x64($sp) -/* D96558 80240F68 AFB40060 */ sw $s4, 0x60($sp) -/* D9655C 80240F6C AFB20058 */ sw $s2, 0x58($sp) -/* D96560 80240F70 AFB10054 */ sw $s1, 0x54($sp) -/* D96564 80240F74 AFB00050 */ sw $s0, 0x50($sp) -/* D96568 80240F78 F7B40070 */ sdc1 $f20, 0x70($sp) -/* D9656C 80240F7C 8E720148 */ lw $s2, 0x148($s3) -/* D96570 80240F80 86440008 */ lh $a0, 8($s2) -/* D96574 80240F84 0C00EABB */ jal get_npc_unsafe -/* D96578 80240F88 00A0802D */ daddu $s0, $a1, $zero -/* D9657C 80240F8C 8E63000C */ lw $v1, 0xc($s3) -/* D96580 80240F90 0260202D */ daddu $a0, $s3, $zero -/* D96584 80240F94 8C650000 */ lw $a1, ($v1) -/* D96588 80240F98 0C0B1EAF */ jal get_variable -/* D9658C 80240F9C 0040882D */ daddu $s1, $v0, $zero -/* D96590 80240FA0 AFA00020 */ sw $zero, 0x20($sp) -/* D96594 80240FA4 8E4300D0 */ lw $v1, 0xd0($s2) -/* D96598 80240FA8 8C630030 */ lw $v1, 0x30($v1) -/* D9659C 80240FAC AFA30024 */ sw $v1, 0x24($sp) -/* D965A0 80240FB0 8E4300D0 */ lw $v1, 0xd0($s2) -/* D965A4 80240FB4 8C63001C */ lw $v1, 0x1c($v1) -/* D965A8 80240FB8 AFA30028 */ sw $v1, 0x28($sp) -/* D965AC 80240FBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* D965B0 80240FC0 8C630024 */ lw $v1, 0x24($v1) -/* D965B4 80240FC4 AFA3002C */ sw $v1, 0x2c($sp) -/* D965B8 80240FC8 8E4300D0 */ lw $v1, 0xd0($s2) -/* D965BC 80240FCC 3C158011 */ lui $s5, %hi(gPlayerStatus) -/* D965C0 80240FD0 26B5EFC8 */ addiu $s5, $s5, %lo(gPlayerStatus) -/* D965C4 80240FD4 8C630028 */ lw $v1, 0x28($v1) -/* D965C8 80240FD8 27B60020 */ addiu $s6, $sp, 0x20 -/* D965CC 80240FDC AFA30030 */ sw $v1, 0x30($sp) -/* D965D0 80240FE0 8E4300D0 */ lw $v1, 0xd0($s2) -/* D965D4 80240FE4 3C0143FA */ lui $at, 0x43fa -/* D965D8 80240FE8 44810000 */ mtc1 $at, $f0 -/* D965DC 80240FEC 8C63002C */ lw $v1, 0x2c($v1) -/* D965E0 80240FF0 0040A02D */ daddu $s4, $v0, $zero -/* D965E4 80240FF4 E7A00038 */ swc1 $f0, 0x38($sp) -/* D965E8 80240FF8 A7A0003C */ sh $zero, 0x3c($sp) -/* D965EC 80240FFC 12000019 */ beqz $s0, .L80241064 -/* D965F0 80241000 AFA30034 */ sw $v1, 0x34($sp) -/* D965F4 80241004 27A50040 */ addiu $a1, $sp, 0x40 -/* D965F8 80241008 27A60044 */ addiu $a2, $sp, 0x44 -/* D965FC 8024100C AE600070 */ sw $zero, 0x70($s3) -/* D96600 80241010 A620008E */ sh $zero, 0x8e($s1) -/* D96604 80241014 8E4200B0 */ lw $v0, 0xb0($s2) -/* D96608 80241018 3C01447A */ lui $at, 0x447a -/* D9660C 8024101C 44810000 */ mtc1 $at, $f0 -/* D96610 80241020 34420010 */ ori $v0, $v0, 0x10 -/* D96614 80241024 AE4200B0 */ sw $v0, 0xb0($s2) -/* D96618 80241028 C6220038 */ lwc1 $f2, 0x38($s1) -/* D9661C 8024102C C624003C */ lwc1 $f4, 0x3c($s1) -/* D96620 80241030 C6260040 */ lwc1 $f6, 0x40($s1) -/* D96624 80241034 27A2004C */ addiu $v0, $sp, 0x4c -/* D96628 80241038 E7A0004C */ swc1 $f0, 0x4c($sp) -/* D9662C 8024103C E7A20040 */ swc1 $f2, 0x40($sp) -/* D96630 80241040 E7A40044 */ swc1 $f4, 0x44($sp) -/* D96634 80241044 E7A60048 */ swc1 $f6, 0x48($sp) -/* D96638 80241048 AFA20010 */ sw $v0, 0x10($sp) -/* D9663C 8024104C 8E240080 */ lw $a0, 0x80($s1) -/* D96640 80241050 0C0372DF */ jal func_800DCB7C -/* D96644 80241054 27A70048 */ addiu $a3, $sp, 0x48 -/* D96648 80241058 C7A00044 */ lwc1 $f0, 0x44($sp) -/* D9664C 8024105C 4600028D */ trunc.w.s $f10, $f0 -/* D96650 80241060 E64A0070 */ swc1 $f10, 0x70($s2) -.L80241064: -/* D96654 80241064 8E4300B0 */ lw $v1, 0xb0($s2) -/* D96658 80241068 30620004 */ andi $v0, $v1, 4 -/* D9665C 8024106C 10400007 */ beqz $v0, .L8024108C -/* D96660 80241070 00000000 */ nop -/* D96664 80241074 824200B4 */ lb $v0, 0xb4($s2) -/* D96668 80241078 1440018D */ bnez $v0, .L802416B0 -/* D9666C 8024107C 0000102D */ daddu $v0, $zero, $zero -/* D96670 80241080 2402FFFB */ addiu $v0, $zero, -5 -/* D96674 80241084 00621024 */ and $v0, $v1, $v0 -/* D96678 80241088 AE4200B0 */ sw $v0, 0xb0($s2) -.L8024108C: -/* D9667C 8024108C 8E630070 */ lw $v1, 0x70($s3) -/* D96680 80241090 2C620010 */ sltiu $v0, $v1, 0x10 -/* D96684 80241094 10400185 */ beqz $v0, .L802416AC -/* D96688 80241098 00031080 */ sll $v0, $v1, 2 -/* D9668C 8024109C 3C018024 */ lui $at, 0x8024 -/* D96690 802410A0 00220821 */ addu $at, $at, $v0 -/* D96694 802410A4 8C222250 */ lw $v0, 0x2250($at) -/* D96698 802410A8 00400008 */ jr $v0 -/* D9669C 802410AC 00000000 */ nop -/* D966A0 802410B0 8E4200CC */ lw $v0, 0xcc($s2) -/* D966A4 802410B4 922300A9 */ lbu $v1, 0xa9($s1) -/* D966A8 802410B8 8C440000 */ lw $a0, ($v0) -/* D966AC 802410BC 8E220000 */ lw $v0, ($s1) -/* D966B0 802410C0 A22300AB */ sb $v1, 0xab($s1) -/* D966B4 802410C4 34420080 */ ori $v0, $v0, 0x80 -/* D966B8 802410C8 AE220000 */ sw $v0, ($s1) -/* D966BC 802410CC 24020001 */ addiu $v0, $zero, 1 -/* D966C0 802410D0 AE240028 */ sw $a0, 0x28($s1) -/* D966C4 802410D4 AE600074 */ sw $zero, 0x74($s3) -/* D966C8 802410D8 AE620070 */ sw $v0, 0x70($s3) -/* D966CC 802410DC 8E830014 */ lw $v1, 0x14($s4) -/* D966D0 802410E0 04600015 */ bltz $v1, .L80241138 -/* D966D4 802410E4 00000000 */ nop -/* D966D8 802410E8 8E620074 */ lw $v0, 0x74($s3) -/* D966DC 802410EC 1C400011 */ bgtz $v0, .L80241134 -/* D966E0 802410F0 2442FFFF */ addiu $v0, $v0, -1 -/* D966E4 802410F4 02C0202D */ daddu $a0, $s6, $zero -/* D966E8 802410F8 AE630074 */ sw $v1, 0x74($s3) -/* D966EC 802410FC AFA00010 */ sw $zero, 0x10($sp) -/* D966F0 80241100 8E86000C */ lw $a2, 0xc($s4) -/* D966F4 80241104 8E870010 */ lw $a3, 0x10($s4) -/* D966F8 80241108 0C01242D */ jal func_800490B4 -/* D966FC 8024110C 0240282D */ daddu $a1, $s2, $zero -/* D96700 80241110 10400006 */ beqz $v0, .L8024112C -/* D96704 80241114 0220202D */ daddu $a0, $s1, $zero -/* D96708 80241118 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D9670C 8024111C 0C012530 */ jal func_800494C0 -/* D96710 80241120 3C060020 */ lui $a2, 0x20 -/* D96714 80241124 2402000A */ addiu $v0, $zero, 0xa -/* D96718 80241128 AE620070 */ sw $v0, 0x70($s3) -.L8024112C: -/* D9671C 8024112C 8E620074 */ lw $v0, 0x74($s3) -/* D96720 80241130 2442FFFF */ addiu $v0, $v0, -1 -.L80241134: -/* D96724 80241134 AE620074 */ sw $v0, 0x74($s3) -.L80241138: -/* D96728 80241138 8E630070 */ lw $v1, 0x70($s3) -/* D9672C 8024113C 2402000A */ addiu $v0, $zero, 0xa -/* D96730 80241140 1462015B */ bne $v1, $v0, .L802416B0 -/* D96734 80241144 0000102D */ daddu $v0, $zero, $zero -/* D96738 80241148 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D9673C 8024114C 8E4200CC */ lw $v0, 0xcc($s2) -/* D96740 80241150 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D96744 80241154 8C42000C */ lw $v0, 0xc($v0) -/* D96748 80241158 AE220028 */ sw $v0, 0x28($s1) -/* D9674C 8024115C 8EA60028 */ lw $a2, 0x28($s5) -/* D96750 80241160 0C00A720 */ jal atan2 -/* D96754 80241164 8EA70030 */ lw $a3, 0x30($s5) -/* D96758 80241168 3C013FA6 */ lui $at, 0x3fa6 -/* D9675C 8024116C 34216666 */ ori $at, $at, 0x6666 -/* D96760 80241170 44811000 */ mtc1 $at, $f2 -/* D96764 80241174 27A50040 */ addiu $a1, $sp, 0x40 -/* D96768 80241178 E6200010 */ swc1 $f0, 0x10($s1) -/* D9676C 8024117C C6200038 */ lwc1 $f0, 0x38($s1) -/* D96770 80241180 C6240040 */ lwc1 $f4, 0x40($s1) -/* D96774 80241184 3C01447A */ lui $at, 0x447a -/* D96778 80241188 44813000 */ mtc1 $at, $f6 -/* D9677C 8024118C 27A60044 */ addiu $a2, $sp, 0x44 -/* D96780 80241190 AE20001C */ sw $zero, 0x1c($s1) -/* D96784 80241194 E6220014 */ swc1 $f2, 0x14($s1) -/* D96788 80241198 C6880000 */ lwc1 $f8, ($s4) -/* D9678C 8024119C C622003C */ lwc1 $f2, 0x3c($s1) -/* D96790 802411A0 27A2004C */ addiu $v0, $sp, 0x4c -/* D96794 802411A4 E7A00040 */ swc1 $f0, 0x40($sp) -/* D96798 802411A8 E7A40048 */ swc1 $f4, 0x48($sp) -/* D9679C 802411AC E7A6004C */ swc1 $f6, 0x4c($sp) -/* D967A0 802411B0 E7A20044 */ swc1 $f2, 0x44($sp) -/* D967A4 802411B4 E6280018 */ swc1 $f8, 0x18($s1) -/* D967A8 802411B8 AFA20010 */ sw $v0, 0x10($sp) -/* D967AC 802411BC 8E240080 */ lw $a0, 0x80($s1) -/* D967B0 802411C0 0C0372DF */ jal func_800DCB7C -/* D967B4 802411C4 27A70048 */ addiu $a3, $sp, 0x48 -/* D967B8 802411C8 10400010 */ beqz $v0, .L8024120C -/* D967BC 802411CC 00000000 */ nop -/* D967C0 802411D0 C620003C */ lwc1 $f0, 0x3c($s1) -/* D967C4 802411D4 C6440070 */ lwc1 $f4, 0x70($s2) -/* D967C8 802411D8 46802120 */ cvt.s.w $f4, $f4 -/* D967CC 802411DC 46040001 */ sub.s $f0, $f0, $f4 -/* D967D0 802411E0 3C018024 */ lui $at, 0x8024 -/* D967D4 802411E4 D4222290 */ ldc1 $f2, 0x2290($at) -/* D967D8 802411E8 46000021 */ cvt.d.s $f0, $f0 -/* D967DC 802411EC 46220002 */ mul.d $f0, $f0, $f2 -/* D967E0 802411F0 00000000 */ nop -/* D967E4 802411F4 460020A1 */ cvt.d.s $f2, $f4 -/* D967E8 802411F8 46201080 */ add.d $f2, $f2, $f0 -/* D967EC 802411FC E7A40044 */ swc1 $f4, 0x44($sp) -/* D967F0 80241200 462010A0 */ cvt.s.d $f2, $f2 -/* D967F4 80241204 0809048F */ j .L8024123C -/* D967F8 80241208 E6220064 */ swc1 $f2, 0x64($s1) -.L8024120C: -/* D967FC 8024120C C6A0002C */ lwc1 $f0, 0x2c($s5) -/* D96800 80241210 C622003C */ lwc1 $f2, 0x3c($s1) -/* D96804 80241214 46001081 */ sub.s $f2, $f2, $f0 -/* D96808 80241218 3C018024 */ lui $at, 0x8024 -/* D9680C 8024121C D4242298 */ ldc1 $f4, 0x2298($at) -/* D96810 80241220 460010A1 */ cvt.d.s $f2, $f2 -/* D96814 80241224 46241082 */ mul.d $f2, $f2, $f4 -/* D96818 80241228 00000000 */ nop -/* D9681C 8024122C 46000021 */ cvt.d.s $f0, $f0 -/* D96820 80241230 46220000 */ add.d $f0, $f0, $f2 -/* D96824 80241234 46200020 */ cvt.s.d $f0, $f0 -/* D96828 80241238 E6200064 */ swc1 $f0, 0x64($s1) -.L8024123C: -/* D9682C 8024123C C620003C */ lwc1 $f0, 0x3c($s1) -/* D96830 80241240 2402000B */ addiu $v0, $zero, 0xb -/* D96834 80241244 E6200068 */ swc1 $f0, 0x68($s1) -/* D96838 80241248 AE620070 */ sw $v0, 0x70($s3) -/* D9683C 8024124C C6200018 */ lwc1 $f0, 0x18($s1) -/* D96840 80241250 44801000 */ mtc1 $zero, $f2 -/* D96844 80241254 44801800 */ mtc1 $zero, $f3 -/* D96848 80241258 46000021 */ cvt.d.s $f0, $f0 -/* D9684C 8024125C 4620103C */ c.lt.d $f2, $f0 -/* D96850 80241260 00000000 */ nop -/* D96854 80241264 45000025 */ bc1f .L802412FC -/* D96858 80241268 27A50040 */ addiu $a1, $sp, 0x40 -/* D9685C 8024126C C6200038 */ lwc1 $f0, 0x38($s1) -/* D96860 80241270 C622003C */ lwc1 $f2, 0x3c($s1) -/* D96864 80241274 C6240040 */ lwc1 $f4, 0x40($s1) -/* D96868 80241278 C6260018 */ lwc1 $f6, 0x18($s1) -/* D9686C 8024127C E7A00040 */ swc1 $f0, 0x40($sp) -/* D96870 80241280 E7A20044 */ swc1 $f2, 0x44($sp) -/* D96874 80241284 E7A40048 */ swc1 $f4, 0x48($sp) -/* D96878 80241288 E7A60010 */ swc1 $f6, 0x10($sp) -/* D9687C 8024128C C620000C */ lwc1 $f0, 0xc($s1) -/* D96880 80241290 E7A00014 */ swc1 $f0, 0x14($sp) -/* D96884 80241294 862200A8 */ lh $v0, 0xa8($s1) -/* D96888 80241298 44820000 */ mtc1 $v0, $f0 -/* D9688C 8024129C 00000000 */ nop -/* D96890 802412A0 46800020 */ cvt.s.w $f0, $f0 -/* D96894 802412A4 E7A00018 */ swc1 $f0, 0x18($sp) -/* D96898 802412A8 862200A6 */ lh $v0, 0xa6($s1) -/* D9689C 802412AC 27A60044 */ addiu $a2, $sp, 0x44 -/* D968A0 802412B0 44820000 */ mtc1 $v0, $f0 -/* D968A4 802412B4 00000000 */ nop -/* D968A8 802412B8 46800020 */ cvt.s.w $f0, $f0 -/* D968AC 802412BC E7A0001C */ swc1 $f0, 0x1c($sp) -/* D968B0 802412C0 8E240080 */ lw $a0, 0x80($s1) -/* D968B4 802412C4 0C037711 */ jal func_800DDC44 -/* D968B8 802412C8 27A70048 */ addiu $a3, $sp, 0x48 -/* D968BC 802412CC 54400001 */ bnel $v0, $zero, .L802412D4 -/* D968C0 802412D0 AE200018 */ sw $zero, 0x18($s1) -.L802412D4: -/* D968C4 802412D4 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D968C8 802412D8 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D968CC 802412DC 8EA60028 */ lw $a2, 0x28($s5) -/* D968D0 802412E0 0C00A720 */ jal atan2 -/* D968D4 802412E4 8EA70030 */ lw $a3, 0x30($s5) -/* D968D8 802412E8 8E250018 */ lw $a1, 0x18($s1) -/* D968DC 802412EC 44060000 */ mfc1 $a2, $f0 -/* D968E0 802412F0 0220202D */ daddu $a0, $s1, $zero -/* D968E4 802412F4 0C00EA95 */ jal npc_move_heading -/* D968E8 802412F8 AE26000C */ sw $a2, 0xc($s1) -.L802412FC: -/* D968EC 802412FC C620001C */ lwc1 $f0, 0x1c($s1) -/* D968F0 80241300 C6220014 */ lwc1 $f2, 0x14($s1) -/* D968F4 80241304 46020001 */ sub.s $f0, $f0, $f2 -/* D968F8 80241308 C622003C */ lwc1 $f2, 0x3c($s1) -/* D968FC 8024130C C6240064 */ lwc1 $f4, 0x64($s1) -/* D96900 80241310 46001080 */ add.s $f2, $f2, $f0 -/* D96904 80241314 E620001C */ swc1 $f0, 0x1c($s1) -/* D96908 80241318 4604103C */ c.lt.s $f2, $f4 -/* D9690C 8024131C 00000000 */ nop -/* D96910 80241320 450000E2 */ bc1f .L802416AC -/* D96914 80241324 E622003C */ swc1 $f2, 0x3c($s1) -/* D96918 80241328 2402000C */ addiu $v0, $zero, 0xc -/* D9691C 8024132C E624003C */ swc1 $f4, 0x3c($s1) -/* D96920 80241330 AE620070 */ sw $v0, 0x70($s3) -/* D96924 80241334 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D96928 80241338 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D9692C 8024133C 8EA60028 */ lw $a2, 0x28($s5) -/* D96930 80241340 0C00A7B5 */ jal dist2D -/* D96934 80241344 8EA70030 */ lw $a3, 0x30($s5) -/* D96938 80241348 3C014270 */ lui $at, 0x4270 -/* D9693C 8024134C 44811000 */ mtc1 $at, $f2 -/* D96940 80241350 00000000 */ nop -/* D96944 80241354 4602003C */ c.lt.s $f0, $f2 -/* D96948 80241358 00000000 */ nop -/* D9694C 8024135C 45000002 */ bc1f .L80241368 -/* D96950 80241360 E6200010 */ swc1 $f0, 0x10($s1) -/* D96954 80241364 E6220010 */ swc1 $f2, 0x10($s1) -.L80241368: -/* D96958 80241368 C6860018 */ lwc1 $f6, 0x18($s4) -/* D9695C 8024136C C6400070 */ lwc1 $f0, 0x70($s2) -/* D96960 80241370 46800020 */ cvt.s.w $f0, $f0 -/* D96964 80241374 E7A00044 */ swc1 $f0, 0x44($sp) -/* D96968 80241378 46000021 */ cvt.d.s $f0, $f0 -/* D9696C 8024137C C6240010 */ lwc1 $f4, 0x10($s1) -/* D96970 80241380 3C014024 */ lui $at, 0x4024 -/* D96974 80241384 44811800 */ mtc1 $at, $f3 -/* D96978 80241388 44801000 */ mtc1 $zero, $f2 -/* D9697C 8024138C 46062103 */ div.s $f4, $f4, $f6 -/* D96980 80241390 46220000 */ add.d $f0, $f0, $f2 -/* D96984 80241394 C622003C */ lwc1 $f2, 0x3c($s1) -/* D96988 80241398 4600228D */ trunc.w.s $f10, $f4 -/* D9698C 8024139C 44025000 */ mfc1 $v0, $f10 -/* D96990 802413A0 00000000 */ nop -/* D96994 802413A4 A622008E */ sh $v0, 0x8e($s1) -/* D96998 802413A8 460010A1 */ cvt.d.s $f2, $f2 -/* D9699C 802413AC 46220001 */ sub.d $f0, $f0, $f2 -/* D969A0 802413B0 00021400 */ sll $v0, $v0, 0x10 -/* D969A4 802413B4 E6260018 */ swc1 $f6, 0x18($s1) -/* D969A8 802413B8 14400003 */ bnez $v0, .L802413C8 -/* D969AC 802413BC 46200120 */ cvt.s.d $f4, $f0 -/* D969B0 802413C0 24020001 */ addiu $v0, $zero, 1 -/* D969B4 802413C4 A622008E */ sh $v0, 0x8e($s1) -.L802413C8: -/* D969B8 802413C8 8622008E */ lh $v0, 0x8e($s1) -/* D969BC 802413CC C620001C */ lwc1 $f0, 0x1c($s1) -/* D969C0 802413D0 44821000 */ mtc1 $v0, $f2 -/* D969C4 802413D4 00000000 */ nop -/* D969C8 802413D8 468010A0 */ cvt.s.w $f2, $f2 -/* D969CC 802413DC 46000007 */ neg.s $f0, $f0 -/* D969D0 802413E0 46020002 */ mul.s $f0, $f0, $f2 -/* D969D4 802413E4 00000000 */ nop -/* D969D8 802413E8 00420018 */ mult $v0, $v0 -/* D969DC 802413EC 8E230000 */ lw $v1, ($s1) -/* D969E0 802413F0 46040000 */ add.s $f0, $f0, $f4 -/* D969E4 802413F4 A22000AB */ sb $zero, 0xab($s1) -/* D969E8 802413F8 2402FF7F */ addiu $v0, $zero, -0x81 -/* D969EC 802413FC 00004012 */ mflo $t0 -/* D969F0 80241400 00621824 */ and $v1, $v1, $v0 -/* D969F4 80241404 24020005 */ addiu $v0, $zero, 5 -/* D969F8 80241408 46000000 */ add.s $f0, $f0, $f0 -/* D969FC 8024140C AE230000 */ sw $v1, ($s1) -/* D96A00 80241410 44881000 */ mtc1 $t0, $f2 -/* D96A04 80241414 00000000 */ nop -/* D96A08 80241418 468010A0 */ cvt.s.w $f2, $f2 -/* D96A0C 8024141C 46000007 */ neg.s $f0, $f0 -/* D96A10 80241420 46020003 */ div.s $f0, $f0, $f2 -/* D96A14 80241424 46000005 */ abs.s $f0, $f0 -/* D96A18 80241428 46000007 */ neg.s $f0, $f0 -/* D96A1C 8024142C E6200014 */ swc1 $f0, 0x14($s1) -/* D96A20 80241430 AE42006C */ sw $v0, 0x6c($s2) -/* D96A24 80241434 2402000D */ addiu $v0, $zero, 0xd -/* D96A28 80241438 A620008E */ sh $zero, 0x8e($s1) -/* D96A2C 8024143C AE620070 */ sw $v0, 0x70($s3) -/* D96A30 80241440 C620001C */ lwc1 $f0, 0x1c($s1) -/* D96A34 80241444 C6220014 */ lwc1 $f2, 0x14($s1) -/* D96A38 80241448 46020001 */ sub.s $f0, $f0, $f2 -/* D96A3C 8024144C 4480A000 */ mtc1 $zero, $f20 -/* D96A40 80241450 00000000 */ nop -/* D96A44 80241454 4614003C */ c.lt.s $f0, $f20 -/* D96A48 80241458 00000000 */ nop -/* D96A4C 8024145C 45000012 */ bc1f .L802414A8 -/* D96A50 80241460 E620001C */ swc1 $f0, 0x1c($s1) -/* D96A54 80241464 27A50040 */ addiu $a1, $sp, 0x40 -/* D96A58 80241468 27A60044 */ addiu $a2, $sp, 0x44 -/* D96A5C 8024146C 27A2004C */ addiu $v0, $sp, 0x4c -/* D96A60 80241470 C6220038 */ lwc1 $f2, 0x38($s1) -/* D96A64 80241474 C624003C */ lwc1 $f4, 0x3c($s1) -/* D96A68 80241478 C6260040 */ lwc1 $f6, 0x40($s1) -/* D96A6C 8024147C 46000007 */ neg.s $f0, $f0 -/* D96A70 80241480 E7A0004C */ swc1 $f0, 0x4c($sp) -/* D96A74 80241484 E7A20040 */ swc1 $f2, 0x40($sp) -/* D96A78 80241488 E7A40044 */ swc1 $f4, 0x44($sp) -/* D96A7C 8024148C E7A60048 */ swc1 $f6, 0x48($sp) -/* D96A80 80241490 AFA20010 */ sw $v0, 0x10($sp) -/* D96A84 80241494 8E240080 */ lw $a0, 0x80($s1) -/* D96A88 80241498 0C0372DF */ jal func_800DCB7C -/* D96A8C 8024149C 27A70048 */ addiu $a3, $sp, 0x48 -/* D96A90 802414A0 54400001 */ bnel $v0, $zero, .L802414A8 -/* D96A94 802414A4 E634001C */ swc1 $f20, 0x1c($s1) -.L802414A8: -/* D96A98 802414A8 C624003C */ lwc1 $f4, 0x3c($s1) -/* D96A9C 802414AC C620001C */ lwc1 $f0, 0x1c($s1) -/* D96AA0 802414B0 46002100 */ add.s $f4, $f4, $f0 -/* D96AA4 802414B4 C6200018 */ lwc1 $f0, 0x18($s1) -/* D96AA8 802414B8 44801000 */ mtc1 $zero, $f2 -/* D96AAC 802414BC 44801800 */ mtc1 $zero, $f3 -/* D96AB0 802414C0 46000021 */ cvt.d.s $f0, $f0 -/* D96AB4 802414C4 4620103C */ c.lt.d $f2, $f0 -/* D96AB8 802414C8 00000000 */ nop -/* D96ABC 802414CC 45000057 */ bc1f .L8024162C -/* D96AC0 802414D0 E624003C */ swc1 $f4, 0x3c($s1) -/* D96AC4 802414D4 46002086 */ mov.s $f2, $f4 -/* D96AC8 802414D8 C6200038 */ lwc1 $f0, 0x38($s1) -/* D96ACC 802414DC C6240040 */ lwc1 $f4, 0x40($s1) -/* D96AD0 802414E0 C6260018 */ lwc1 $f6, 0x18($s1) -/* D96AD4 802414E4 E7A20044 */ swc1 $f2, 0x44($sp) -/* D96AD8 802414E8 E7A00040 */ swc1 $f0, 0x40($sp) -/* D96ADC 802414EC E7A40048 */ swc1 $f4, 0x48($sp) -/* D96AE0 802414F0 E7A60010 */ swc1 $f6, 0x10($sp) -/* D96AE4 802414F4 C620000C */ lwc1 $f0, 0xc($s1) -/* D96AE8 802414F8 E7A00014 */ swc1 $f0, 0x14($sp) -/* D96AEC 802414FC 862200A8 */ lh $v0, 0xa8($s1) -/* D96AF0 80241500 27A50040 */ addiu $a1, $sp, 0x40 -/* D96AF4 80241504 44820000 */ mtc1 $v0, $f0 -/* D96AF8 80241508 00000000 */ nop -/* D96AFC 8024150C 46800020 */ cvt.s.w $f0, $f0 -/* D96B00 80241510 E7A00018 */ swc1 $f0, 0x18($sp) -/* D96B04 80241514 862200A6 */ lh $v0, 0xa6($s1) -/* D96B08 80241518 27A60044 */ addiu $a2, $sp, 0x44 -/* D96B0C 8024151C 44820000 */ mtc1 $v0, $f0 -/* D96B10 80241520 00000000 */ nop -/* D96B14 80241524 46800020 */ cvt.s.w $f0, $f0 -/* D96B18 80241528 E7A0001C */ swc1 $f0, 0x1c($sp) -/* D96B1C 8024152C 8E240080 */ lw $a0, 0x80($s1) -/* D96B20 80241530 0C037711 */ jal func_800DDC44 -/* D96B24 80241534 27A70048 */ addiu $a3, $sp, 0x48 -/* D96B28 80241538 10400003 */ beqz $v0, .L80241548 -/* D96B2C 8024153C 00000000 */ nop -/* D96B30 80241540 08090587 */ j .L8024161C -/* D96B34 80241544 AE200018 */ sw $zero, 0x18($s1) -.L80241548: -/* D96B38 80241548 C620001C */ lwc1 $f0, 0x1c($s1) -/* D96B3C 8024154C 3C01C004 */ lui $at, 0xc004 -/* D96B40 80241550 44811800 */ mtc1 $at, $f3 -/* D96B44 80241554 44801000 */ mtc1 $zero, $f2 -/* D96B48 80241558 46000021 */ cvt.d.s $f0, $f0 -/* D96B4C 8024155C 4622003C */ c.lt.d $f0, $f2 -/* D96B50 80241560 00000000 */ nop -/* D96B54 80241564 4500002D */ bc1f .L8024161C -/* D96B58 80241568 00000000 */ nop -/* D96B5C 8024156C 9622008E */ lhu $v0, 0x8e($s1) -/* D96B60 80241570 24420001 */ addiu $v0, $v0, 1 -/* D96B64 80241574 A622008E */ sh $v0, 0x8e($s1) -/* D96B68 80241578 00021400 */ sll $v0, $v0, 0x10 -/* D96B6C 8024157C 8E830020 */ lw $v1, 0x20($s4) -/* D96B70 80241580 00021403 */ sra $v0, $v0, 0x10 -/* D96B74 80241584 0043102A */ slt $v0, $v0, $v1 -/* D96B78 80241588 14400024 */ bnez $v0, .L8024161C -/* D96B7C 8024158C 00000000 */ nop -/* D96B80 80241590 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D96B84 80241594 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D96B88 80241598 8EA60028 */ lw $a2, 0x28($s5) -/* D96B8C 8024159C 0C00A720 */ jal atan2 -/* D96B90 802415A0 8EA70030 */ lw $a3, 0x30($s5) -/* D96B94 802415A4 46000506 */ mov.s $f20, $f0 -/* D96B98 802415A8 C62C000C */ lwc1 $f12, 0xc($s1) -/* D96B9C 802415AC 0C00A70A */ jal get_clamped_angle_diff -/* D96BA0 802415B0 4600A386 */ mov.s $f14, $f20 -/* D96BA4 802415B4 46000086 */ mov.s $f2, $f0 -/* D96BA8 802415B8 8E82001C */ lw $v0, 0x1c($s4) -/* D96BAC 802415BC 46001005 */ abs.s $f0, $f2 -/* D96BB0 802415C0 44822000 */ mtc1 $v0, $f4 -/* D96BB4 802415C4 00000000 */ nop -/* D96BB8 802415C8 46802120 */ cvt.s.w $f4, $f4 -/* D96BBC 802415CC 4600203C */ c.lt.s $f4, $f0 -/* D96BC0 802415D0 00000000 */ nop -/* D96BC4 802415D4 4500000D */ bc1f .L8024160C -/* D96BC8 802415D8 00000000 */ nop -/* D96BCC 802415DC 44800000 */ mtc1 $zero, $f0 -/* D96BD0 802415E0 C634000C */ lwc1 $f20, 0xc($s1) -/* D96BD4 802415E4 4600103C */ c.lt.s $f2, $f0 -/* D96BD8 802415E8 00000000 */ nop -/* D96BDC 802415EC 45000006 */ bc1f .L80241608 -/* D96BE0 802415F0 00021023 */ negu $v0, $v0 -/* D96BE4 802415F4 44820000 */ mtc1 $v0, $f0 -/* D96BE8 802415F8 00000000 */ nop -/* D96BEC 802415FC 46800020 */ cvt.s.w $f0, $f0 -/* D96BF0 80241600 08090583 */ j .L8024160C -/* D96BF4 80241604 4600A500 */ add.s $f20, $f20, $f0 -.L80241608: -/* D96BF8 80241608 4604A500 */ add.s $f20, $f20, $f4 -.L8024160C: -/* D96BFC 8024160C 0C00A6C9 */ jal clamp_angle -/* D96C00 80241610 4600A306 */ mov.s $f12, $f20 -/* D96C04 80241614 E620000C */ swc1 $f0, 0xc($s1) -/* D96C08 80241618 A620008E */ sh $zero, 0x8e($s1) -.L8024161C: -/* D96C0C 8024161C 8E250018 */ lw $a1, 0x18($s1) -/* D96C10 80241620 8E26000C */ lw $a2, 0xc($s1) -/* D96C14 80241624 0C00EA95 */ jal npc_move_heading -/* D96C18 80241628 0220202D */ daddu $a0, $s1, $zero -.L8024162C: -/* D96C1C 8024162C 8E42006C */ lw $v0, 0x6c($s2) -/* D96C20 80241630 2442FFFF */ addiu $v0, $v0, -1 -/* D96C24 80241634 1C400003 */ bgtz $v0, .L80241644 -/* D96C28 80241638 AE42006C */ sw $v0, 0x6c($s2) -/* D96C2C 8024163C 24020005 */ addiu $v0, $zero, 5 -/* D96C30 80241640 AE42006C */ sw $v0, 0x6c($s2) -.L80241644: -/* D96C34 80241644 C620003C */ lwc1 $f0, 0x3c($s1) -/* D96C38 80241648 C6220068 */ lwc1 $f2, 0x68($s1) -/* D96C3C 8024164C 4600103C */ c.lt.s $f2, $f0 -/* D96C40 80241650 00000000 */ nop -/* D96C44 80241654 45000015 */ bc1f .L802416AC -/* D96C48 80241658 2402000E */ addiu $v0, $zero, 0xe -/* D96C4C 8024165C E622003C */ swc1 $f2, 0x3c($s1) -/* D96C50 80241660 AE620070 */ sw $v0, 0x70($s3) -/* D96C54 80241664 8E4200CC */ lw $v0, 0xcc($s2) -/* D96C58 80241668 922300A9 */ lbu $v1, 0xa9($s1) -/* D96C5C 8024166C 8C440020 */ lw $a0, 0x20($v0) -/* D96C60 80241670 8E220000 */ lw $v0, ($s1) -/* D96C64 80241674 A22300AB */ sb $v1, 0xab($s1) -/* D96C68 80241678 34420080 */ ori $v0, $v0, 0x80 -/* D96C6C 8024167C AE220000 */ sw $v0, ($s1) -/* D96C70 80241680 2402000F */ addiu $v0, $zero, 0xf -/* D96C74 80241684 A622008E */ sh $v0, 0x8e($s1) -/* D96C78 80241688 2402000F */ addiu $v0, $zero, 0xf -/* D96C7C 8024168C AE240028 */ sw $a0, 0x28($s1) -/* D96C80 80241690 AE620070 */ sw $v0, 0x70($s3) -/* D96C84 80241694 9622008E */ lhu $v0, 0x8e($s1) -/* D96C88 80241698 2442FFFF */ addiu $v0, $v0, -1 -/* D96C8C 8024169C A622008E */ sh $v0, 0x8e($s1) -/* D96C90 802416A0 00021400 */ sll $v0, $v0, 0x10 -/* D96C94 802416A4 58400001 */ blezl $v0, .L802416AC -/* D96C98 802416A8 AE600070 */ sw $zero, 0x70($s3) -.L802416AC: -/* D96C9C 802416AC 0000102D */ daddu $v0, $zero, $zero -.L802416B0: -/* D96CA0 802416B0 8FBF006C */ lw $ra, 0x6c($sp) -/* D96CA4 802416B4 8FB60068 */ lw $s6, 0x68($sp) -/* D96CA8 802416B8 8FB50064 */ lw $s5, 0x64($sp) -/* D96CAC 802416BC 8FB40060 */ lw $s4, 0x60($sp) -/* D96CB0 802416C0 8FB3005C */ lw $s3, 0x5c($sp) -/* D96CB4 802416C4 8FB20058 */ lw $s2, 0x58($sp) -/* D96CB8 802416C8 8FB10054 */ lw $s1, 0x54($sp) -/* D96CBC 802416CC 8FB00050 */ lw $s0, 0x50($sp) -/* D96CC0 802416D0 D7B40070 */ ldc1 $f20, 0x70($sp) -/* D96CC4 802416D4 03E00008 */ jr $ra -/* D96CC8 802416D8 27BD0078 */ addiu $sp, $sp, 0x78 -/* D96CCC 802416DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_39/func_80240050_D97890.s b/asm/nonmatchings/world/area_pra/pra_39/func_80240050_D97890.s deleted file mode 100644 index eb13d4dc10..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/func_80240050_D97890.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D978E0 -/* D978E0 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D978E4 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D978E8 80240058 00822024 */ and $a0, $a0, $v0 -/* D978EC 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D978F0 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D978F4 80240064 00821821 */ addu $v1, $a0, $v0 -/* D978F8 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D978FC 8024006C 10400003 */ beqz $v0, .L8024007C -/* D97900 80240070 30620001 */ andi $v0, $v1, 1 -/* D97904 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D97908 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D9790C 8024007C 03E00008 */ jr $ra -/* D97910 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_39/func_80240084_D97890.s b/asm/nonmatchings/world/area_pra/pra_39/func_80240084_D97890.s deleted file mode 100644 index adce6c4cba..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/func_80240084_D97890.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240084_D97914 -/* D97914 80240084 00041403 */ sra $v0, $a0, 0x10 -/* D97918 80240088 304300FF */ andi $v1, $v0, 0xff -/* D9791C 8024008C 24020006 */ addiu $v0, $zero, 6 -/* D97920 80240090 10620015 */ beq $v1, $v0, .L802400E8 -/* D97924 80240094 28620007 */ slti $v0, $v1, 7 -/* D97928 80240098 10400005 */ beqz $v0, .L802400B0 -/* D9792C 8024009C 24020001 */ addiu $v0, $zero, 1 -/* D97930 802400A0 1062000A */ beq $v1, $v0, .L802400CC -/* D97934 802400A4 3C020100 */ lui $v0, 0x100 -/* D97938 802400A8 03E00008 */ jr $ra -/* D9793C 802400AC 00821025 */ or $v0, $a0, $v0 -.L802400B0: -/* D97940 802400B0 2862000A */ slti $v0, $v1, 0xa -/* D97944 802400B4 10400016 */ beqz $v0, .L80240110 -/* D97948 802400B8 28620008 */ slti $v0, $v1, 8 -/* D9794C 802400BC 14400015 */ bnez $v0, .L80240114 -/* D97950 802400C0 3C020100 */ lui $v0, 0x100 -/* D97954 802400C4 03E00008 */ jr $ra -/* D97958 802400C8 0080102D */ daddu $v0, $a0, $zero -.L802400CC: -/* D9795C 802400CC 3C020001 */ lui $v0, 1 -/* D97960 802400D0 3442000C */ ori $v0, $v0, 0xc -/* D97964 802400D4 0044102A */ slt $v0, $v0, $a0 -/* D97968 802400D8 1040000E */ beqz $v0, .L80240114 -/* D9796C 802400DC 3C020100 */ lui $v0, 0x100 -.L802400E0: -/* D97970 802400E0 03E00008 */ jr $ra -/* D97974 802400E4 0080102D */ daddu $v0, $a0, $zero -.L802400E8: -/* D97978 802400E8 3C02FFF9 */ lui $v0, 0xfff9 -/* D9797C 802400EC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D97980 802400F0 00821821 */ addu $v1, $a0, $v0 -/* D97984 802400F4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D97988 802400F8 10400005 */ beqz $v0, .L80240110 -/* D9798C 802400FC 30620001 */ andi $v0, $v1, 1 -/* D97990 80240100 1440FFF7 */ bnez $v0, .L802400E0 -/* D97994 80240104 24820001 */ addiu $v0, $a0, 1 -/* D97998 80240108 03E00008 */ jr $ra -/* D9799C 8024010C 00000000 */ nop -.L80240110: -/* D979A0 80240110 3C020100 */ lui $v0, 0x100 -.L80240114: -/* D979A4 80240114 03E00008 */ jr $ra -/* D979A8 80240118 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_39/func_8024011C_D97890.s b/asm/nonmatchings/world/area_pra/pra_39/func_8024011C_D97890.s deleted file mode 100644 index 34a3cc9db9..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/func_8024011C_D97890.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024011C_D979AC -/* D979AC 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D979B0 80240120 AFB00010 */ sw $s0, 0x10($sp) -/* D979B4 80240124 0080802D */ daddu $s0, $a0, $zero -/* D979B8 80240128 3C058024 */ lui $a1, 0x8024 -/* D979BC 8024012C 24A50158 */ addiu $a1, $a1, 0x158 -/* D979C0 80240130 AFBF0014 */ sw $ra, 0x14($sp) -/* D979C4 80240134 0C048C56 */ jal bind_dynamic_entity_3 -/* D979C8 80240138 0000202D */ daddu $a0, $zero, $zero -/* D979CC 8024013C 8E03013C */ lw $v1, 0x13c($s0) -/* D979D0 80240140 AC620000 */ sw $v0, ($v1) -/* D979D4 80240144 8FBF0014 */ lw $ra, 0x14($sp) -/* D979D8 80240148 8FB00010 */ lw $s0, 0x10($sp) -/* D979DC 8024014C 24020002 */ addiu $v0, $zero, 2 -/* D979E0 80240150 03E00008 */ jr $ra -/* D979E4 80240154 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_39/func_80240158_D97890.s b/asm/nonmatchings/world/area_pra/pra_39/func_80240158_D97890.s deleted file mode 100644 index e032d61d97..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/func_80240158_D97890.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_D979E8 -/* D979E8 80240158 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D979EC 8024015C AFB00040 */ sw $s0, 0x40($sp) -/* D979F0 80240160 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D979F4 80240164 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D979F8 80240168 AFB20048 */ sw $s2, 0x48($sp) -/* D979FC 8024016C AFBF004C */ sw $ra, 0x4c($sp) -/* D97A00 80240170 AFB10044 */ sw $s1, 0x44($sp) -/* D97A04 80240174 8E020000 */ lw $v0, ($s0) -/* D97A08 80240178 821100BE */ lb $s1, 0xbe($s0) -/* D97A0C 8024017C 30420001 */ andi $v0, $v0, 1 -/* D97A10 80240180 10400061 */ beqz $v0, .L80240308 -/* D97A14 80240184 27B20020 */ addiu $s2, $sp, 0x20 -/* D97A18 80240188 8E0400CC */ lw $a0, 0xcc($s0) -/* D97A1C 8024018C 0C044181 */ jal get_shadow_by_index -/* D97A20 80240190 00000000 */ nop -/* D97A24 80240194 0C048B77 */ jal func_80122DDC -/* D97A28 80240198 84440008 */ lh $a0, 8($v0) -/* D97A2C 8024019C 8C430000 */ lw $v1, ($v0) -/* D97A30 802401A0 34630200 */ ori $v1, $v1, 0x200 -/* D97A34 802401A4 AC430000 */ sw $v1, ($v0) -/* D97A38 802401A8 8E050028 */ lw $a1, 0x28($s0) -/* D97A3C 802401AC 8E06002C */ lw $a2, 0x2c($s0) -/* D97A40 802401B0 27A20030 */ addiu $v0, $sp, 0x30 -/* D97A44 802401B4 AFA20010 */ sw $v0, 0x10($sp) -/* D97A48 802401B8 27A20034 */ addiu $v0, $sp, 0x34 -/* D97A4C 802401BC AFA20014 */ sw $v0, 0x14($sp) -/* D97A50 802401C0 C6000030 */ lwc1 $f0, 0x30($s0) -/* D97A54 802401C4 3C04800A */ lui $a0, 0x800a -/* D97A58 802401C8 8484A634 */ lh $a0, -0x59cc($a0) -/* D97A5C 802401CC 46000007 */ neg.s $f0, $f0 -/* D97A60 802401D0 44070000 */ mfc1 $a3, $f0 -/* D97A64 802401D4 27A20038 */ addiu $v0, $sp, 0x38 -/* D97A68 802401D8 0C00B94E */ jal get_screen_coords -/* D97A6C 802401DC AFA20018 */ sw $v0, 0x18($sp) -/* D97A70 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D97A74 802401E4 0C090014 */ jal func_80240050 -/* D97A78 802401E8 00000000 */ nop -/* D97A7C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) -/* D97A80 802401F0 3C014307 */ lui $at, 0x4307 -/* D97A84 802401F4 44810000 */ mtc1 $at, $f0 -/* D97A88 802401F8 00000000 */ nop -/* D97A8C 802401FC 4602003C */ c.lt.s $f0, $f2 -/* D97A90 80240200 00000000 */ nop -/* D97A94 80240204 4500000B */ bc1f .L80240234 -/* D97A98 80240208 24040002 */ addiu $a0, $zero, 2 -/* D97A9C 8024020C 3C014361 */ lui $at, 0x4361 -/* D97AA0 80240210 44810000 */ mtc1 $at, $f0 -/* D97AA4 80240214 00000000 */ nop -/* D97AA8 80240218 4600103C */ c.lt.s $f2, $f0 -/* D97AAC 8024021C 00000000 */ nop -/* D97AB0 80240220 45000004 */ bc1f .L80240234 -/* D97AB4 80240224 00000000 */ nop -/* D97AB8 80240228 0C090021 */ jal func_80240084 -/* D97ABC 8024022C 0040202D */ daddu $a0, $v0, $zero -/* D97AC0 80240230 24040002 */ addiu $a0, $zero, 2 -.L80240234: -/* D97AC4 80240234 3C063F80 */ lui $a2, 0x3f80 -/* D97AC8 80240238 0C0B76A3 */ jal func_802DDA8C -/* D97ACC 8024023C 0040282D */ daddu $a1, $v0, $zero -/* D97AD0 80240240 8E020000 */ lw $v0, ($s0) -/* D97AD4 80240244 3C030002 */ lui $v1, 2 -/* D97AD8 80240248 00431024 */ and $v0, $v0, $v1 -/* D97ADC 8024024C 54400022 */ bnel $v0, $zero, .L802402D8 -/* D97AE0 80240250 24110011 */ addiu $s1, $zero, 0x11 -/* D97AE4 80240254 9203000E */ lbu $v1, 0xe($s0) -/* D97AE8 80240258 3C02802E */ lui $v0, 0x802e -/* D97AEC 8024025C 90429D70 */ lbu $v0, -0x6290($v0) -/* D97AF0 80240260 10620018 */ beq $v1, $v0, .L802402C4 -/* D97AF4 80240264 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D97AF8 80240268 1040000B */ beqz $v0, .L80240298 -/* D97AFC 8024026C 24110011 */ addiu $s1, $zero, 0x11 -/* D97B00 80240270 24040002 */ addiu $a0, $zero, 2 -/* D97B04 80240274 2405FFFF */ addiu $a1, $zero, -1 -/* D97B08 80240278 24060007 */ addiu $a2, $zero, 7 -/* D97B0C 8024027C 0060102D */ daddu $v0, $v1, $zero -/* D97B10 80240280 0000382D */ daddu $a3, $zero, $zero -/* D97B14 80240284 AFA00010 */ sw $zero, 0x10($sp) -/* D97B18 80240288 AFA00014 */ sw $zero, 0x14($sp) -/* D97B1C 8024028C AFA0001C */ sw $zero, 0x1c($sp) -/* D97B20 80240290 080900AF */ j .L802402BC -/* D97B24 80240294 AFA20018 */ sw $v0, 0x18($sp) -.L80240298: -/* D97B28 80240298 2411000D */ addiu $s1, $zero, 0xd -/* D97B2C 8024029C 24040002 */ addiu $a0, $zero, 2 -/* D97B30 802402A0 2405FFFF */ addiu $a1, $zero, -1 -/* D97B34 802402A4 0000302D */ daddu $a2, $zero, $zero -/* D97B38 802402A8 00C0382D */ daddu $a3, $a2, $zero -/* D97B3C 802402AC AFA00010 */ sw $zero, 0x10($sp) -/* D97B40 802402B0 AFA00014 */ sw $zero, 0x14($sp) -/* D97B44 802402B4 AFA00018 */ sw $zero, 0x18($sp) -/* D97B48 802402B8 AFA0001C */ sw $zero, 0x1c($sp) -.L802402BC: -/* D97B4C 802402BC 0C0B77B9 */ jal func_802DDEE4 -/* D97B50 802402C0 00000000 */ nop -.L802402C4: -/* D97B54 802402C4 9202000E */ lbu $v0, 0xe($s0) -/* D97B58 802402C8 3C01802E */ lui $at, 0x802e -/* D97B5C 802402CC A0229D70 */ sb $v0, -0x6290($at) -/* D97B60 802402D0 080900B9 */ j .L802402E4 -/* D97B64 802402D4 0240202D */ daddu $a0, $s2, $zero -.L802402D8: -/* D97B68 802402D8 3C01802E */ lui $at, 0x802e -/* D97B6C 802402DC A0209D70 */ sb $zero, -0x6290($at) -/* D97B70 802402E0 0240202D */ daddu $a0, $s2, $zero -.L802402E4: -/* D97B74 802402E4 AC910000 */ sw $s1, ($a0) -/* D97B78 802402E8 AC900008 */ sw $s0, 8($a0) -/* D97B7C 802402EC 8FA20038 */ lw $v0, 0x38($sp) -/* D97B80 802402F0 3C038024 */ lui $v1, 0x8024 -/* D97B84 802402F4 24630320 */ addiu $v1, $v1, 0x320 -/* D97B88 802402F8 AC83000C */ sw $v1, 0xc($a0) -/* D97B8C 802402FC 00021023 */ negu $v0, $v0 -/* D97B90 80240300 0C047644 */ jal queue_render_task -/* D97B94 80240304 AC820004 */ sw $v0, 4($a0) -.L80240308: -/* D97B98 80240308 8FBF004C */ lw $ra, 0x4c($sp) -/* D97B9C 8024030C 8FB20048 */ lw $s2, 0x48($sp) -/* D97BA0 80240310 8FB10044 */ lw $s1, 0x44($sp) -/* D97BA4 80240314 8FB00040 */ lw $s0, 0x40($sp) -/* D97BA8 80240318 03E00008 */ jr $ra -/* D97BAC 8024031C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_39/func_80240320_D97890.s b/asm/nonmatchings/world/area_pra/pra_39/func_80240320_D97890.s deleted file mode 100644 index 37ef8d6714..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/func_80240320_D97890.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240320_D97BB0 -/* D97BB0 80240320 3C03800A */ lui $v1, 0x800a -/* D97BB4 80240324 8463A634 */ lh $v1, -0x59cc($v1) -/* D97BB8 80240328 3C07BF80 */ lui $a3, 0xbf80 -/* D97BBC 8024032C 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D97BC0 80240330 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D97BC4 80240334 4480A000 */ mtc1 $zero, $f20 -/* D97BC8 80240338 AFB1011C */ sw $s1, 0x11c($sp) -/* D97BCC 8024033C 0080882D */ daddu $s1, $a0, $zero -/* D97BD0 80240340 AFB00118 */ sw $s0, 0x118($sp) -/* D97BD4 80240344 27B00098 */ addiu $s0, $sp, 0x98 -/* D97BD8 80240348 AFBF0120 */ sw $ra, 0x120($sp) -/* D97BDC 8024034C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D97BE0 80240350 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D97BE4 80240354 00031080 */ sll $v0, $v1, 2 -/* D97BE8 80240358 00431021 */ addu $v0, $v0, $v1 -/* D97BEC 8024035C 00021080 */ sll $v0, $v0, 2 -/* D97BF0 80240360 00431023 */ subu $v0, $v0, $v1 -/* D97BF4 80240364 000218C0 */ sll $v1, $v0, 3 -/* D97BF8 80240368 00431021 */ addu $v0, $v0, $v1 -/* D97BFC 8024036C 000210C0 */ sll $v0, $v0, 3 -/* D97C00 80240370 3C01800B */ lui $at, 0x800b -/* D97C04 80240374 00220821 */ addu $at, $at, $v0 -/* D97C08 80240378 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D97C0C 8024037C 4406A000 */ mfc1 $a2, $f20 -/* D97C10 80240380 4600B587 */ neg.s $f22, $f22 -/* D97C14 80240384 4405B000 */ mfc1 $a1, $f22 -/* D97C18 80240388 0200202D */ daddu $a0, $s0, $zero -/* D97C1C 8024038C 0C019EC8 */ jal guRotateF -/* D97C20 80240390 E7B40010 */ swc1 $f20, 0x10($sp) -/* D97C24 80240394 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D97C28 80240398 0C00A6C9 */ jal clamp_angle -/* D97C2C 8024039C 00000000 */ nop -/* D97C30 802403A0 44050000 */ mfc1 $a1, $f0 -/* D97C34 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D97C38 802403A8 4407A000 */ mfc1 $a3, $f20 -/* D97C3C 802403AC 3C013F80 */ lui $at, 0x3f80 -/* D97C40 802403B0 4481C000 */ mtc1 $at, $f24 -/* D97C44 802403B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D97C48 802403B8 0C019EC8 */ jal guRotateF -/* D97C4C 802403BC E7B80010 */ swc1 $f24, 0x10($sp) -/* D97C50 802403C0 0200202D */ daddu $a0, $s0, $zero -/* D97C54 802403C4 27A50018 */ addiu $a1, $sp, 0x18 -/* D97C58 802403C8 0C019D80 */ jal guMtxCatF -/* D97C5C 802403CC 00A0302D */ daddu $a2, $a1, $zero -/* D97C60 802403D0 4405B000 */ mfc1 $a1, $f22 -/* D97C64 802403D4 4406A000 */ mfc1 $a2, $f20 -/* D97C68 802403D8 4407C000 */ mfc1 $a3, $f24 -/* D97C6C 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D97C70 802403E0 0C019EC8 */ jal guRotateF -/* D97C74 802403E4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D97C78 802403E8 27A40018 */ addiu $a0, $sp, 0x18 -/* D97C7C 802403EC 0200282D */ daddu $a1, $s0, $zero -/* D97C80 802403F0 0C019D80 */ jal guMtxCatF -/* D97C84 802403F4 0080302D */ daddu $a2, $a0, $zero -/* D97C88 802403F8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D97C8C 802403FC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D97C90 80240400 4406A000 */ mfc1 $a2, $f20 -/* D97C94 80240404 4407C000 */ mfc1 $a3, $f24 -/* D97C98 80240408 0C019EC8 */ jal guRotateF -/* D97C9C 8024040C 0200202D */ daddu $a0, $s0, $zero -/* D97CA0 80240410 27A40018 */ addiu $a0, $sp, 0x18 -/* D97CA4 80240414 0200282D */ daddu $a1, $s0, $zero -/* D97CA8 80240418 0C019D80 */ jal guMtxCatF -/* D97CAC 8024041C 0080302D */ daddu $a2, $a0, $zero -/* D97CB0 80240420 3C013F36 */ lui $at, 0x3f36 -/* D97CB4 80240424 3421DB6E */ ori $at, $at, 0xdb6e -/* D97CB8 80240428 44810000 */ mtc1 $at, $f0 -/* D97CBC 8024042C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D97CC0 80240430 44050000 */ mfc1 $a1, $f0 -/* D97CC4 80240434 0200202D */ daddu $a0, $s0, $zero -/* D97CC8 80240438 00A0302D */ daddu $a2, $a1, $zero -/* D97CCC 8024043C 0C019DF0 */ jal guScaleF -/* D97CD0 80240440 00A0382D */ daddu $a3, $a1, $zero -/* D97CD4 80240444 27A40018 */ addiu $a0, $sp, 0x18 -/* D97CD8 80240448 0200282D */ daddu $a1, $s0, $zero -/* D97CDC 8024044C 0C019D80 */ jal guMtxCatF -/* D97CE0 80240450 0080302D */ daddu $a2, $a0, $zero -/* D97CE4 80240454 27B00058 */ addiu $s0, $sp, 0x58 -/* D97CE8 80240458 C6200030 */ lwc1 $f0, 0x30($s1) -/* D97CEC 8024045C 3C014040 */ lui $at, 0x4040 -/* D97CF0 80240460 44811000 */ mtc1 $at, $f2 -/* D97CF4 80240464 46000007 */ neg.s $f0, $f0 -/* D97CF8 80240468 46020001 */ sub.s $f0, $f0, $f2 -/* D97CFC 8024046C 8E250028 */ lw $a1, 0x28($s1) -/* D97D00 80240470 8E26002C */ lw $a2, 0x2c($s1) -/* D97D04 80240474 44070000 */ mfc1 $a3, $f0 -/* D97D08 80240478 0C019E40 */ jal guTranslateF -/* D97D0C 8024047C 0200202D */ daddu $a0, $s0, $zero -/* D97D10 80240480 27A40018 */ addiu $a0, $sp, 0x18 -/* D97D14 80240484 0200282D */ daddu $a1, $s0, $zero -/* D97D18 80240488 0C019D80 */ jal guMtxCatF -/* D97D1C 8024048C 0080302D */ daddu $a2, $a0, $zero -/* D97D20 80240490 24040002 */ addiu $a0, $zero, 2 -/* D97D24 80240494 0000282D */ daddu $a1, $zero, $zero -/* D97D28 80240498 00A0302D */ daddu $a2, $a1, $zero -/* D97D2C 8024049C 00A0382D */ daddu $a3, $a1, $zero -/* D97D30 802404A0 27A20018 */ addiu $v0, $sp, 0x18 -/* D97D34 802404A4 0C0B7710 */ jal render_sprite -/* D97D38 802404A8 AFA20010 */ sw $v0, 0x10($sp) -/* D97D3C 802404AC 8FBF0120 */ lw $ra, 0x120($sp) -/* D97D40 802404B0 8FB1011C */ lw $s1, 0x11c($sp) -/* D97D44 802404B4 8FB00118 */ lw $s0, 0x118($sp) -/* D97D48 802404B8 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D97D4C 802404BC D7B60130 */ ldc1 $f22, 0x130($sp) -/* D97D50 802404C0 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D97D54 802404C4 03E00008 */ jr $ra -/* D97D58 802404C8 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_39/func_802404CC_D97890.s b/asm/nonmatchings/world/area_pra/pra_39/func_802404CC_D97890.s deleted file mode 100644 index 9e1ec2cbc6..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/func_802404CC_D97890.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404CC_D97D5C -/* D97D5C 802404CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D97D60 802404D0 AFB00010 */ sw $s0, 0x10($sp) -/* D97D64 802404D4 0080802D */ daddu $s0, $a0, $zero -/* D97D68 802404D8 AFBF0014 */ sw $ra, 0x14($sp) -/* D97D6C 802404DC 8E020084 */ lw $v0, 0x84($s0) -/* D97D70 802404E0 0440000E */ bltz $v0, .L8024051C -/* D97D74 802404E4 28420002 */ slti $v0, $v0, 2 -/* D97D78 802404E8 1040000C */ beqz $v0, .L8024051C -/* D97D7C 802404EC 00000000 */ nop -/* D97D80 802404F0 3C058024 */ lui $a1, 0x8024 -/* D97D84 802404F4 24A50530 */ addiu $a1, $a1, 0x530 -/* D97D88 802404F8 0C048C56 */ jal bind_dynamic_entity_3 -/* D97D8C 802404FC 0000202D */ daddu $a0, $zero, $zero -/* D97D90 80240500 8E03013C */ lw $v1, 0x13c($s0) -/* D97D94 80240504 AC620000 */ sw $v0, ($v1) -/* D97D98 80240508 3C03800A */ lui $v1, %hi(D_8009A650) -/* D97D9C 8024050C 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D97DA0 80240510 8C620000 */ lw $v0, ($v1) -/* D97DA4 80240514 34420080 */ ori $v0, $v0, 0x80 -/* D97DA8 80240518 AC620000 */ sw $v0, ($v1) -.L8024051C: -/* D97DAC 8024051C 8FBF0014 */ lw $ra, 0x14($sp) -/* D97DB0 80240520 8FB00010 */ lw $s0, 0x10($sp) -/* D97DB4 80240524 24020002 */ addiu $v0, $zero, 2 -/* D97DB8 80240528 03E00008 */ jr $ra -/* D97DBC 8024052C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_39/func_80240530_D97890.s b/asm/nonmatchings/world/area_pra/pra_39/func_80240530_D97890.s deleted file mode 100644 index 91ae438748..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/func_80240530_D97890.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240530_D97DC0 -/* D97DC0 80240530 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D97DC4 80240534 AFB00040 */ sw $s0, 0x40($sp) -/* D97DC8 80240538 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D97DCC 8024053C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D97DD0 80240540 AFB10044 */ sw $s1, 0x44($sp) -/* D97DD4 80240544 AFBF004C */ sw $ra, 0x4c($sp) -/* D97DD8 80240548 AFB20048 */ sw $s2, 0x48($sp) -/* D97DDC 8024054C 8E020000 */ lw $v0, ($s0) -/* D97DE0 80240550 821200BE */ lb $s2, 0xbe($s0) -/* D97DE4 80240554 30420001 */ andi $v0, $v0, 1 -/* D97DE8 80240558 10400052 */ beqz $v0, .L802406A4 -/* D97DEC 8024055C 27B10020 */ addiu $s1, $sp, 0x20 -/* D97DF0 80240560 8E0400CC */ lw $a0, 0xcc($s0) -/* D97DF4 80240564 0C044181 */ jal get_shadow_by_index -/* D97DF8 80240568 00000000 */ nop -/* D97DFC 8024056C 0C048B77 */ jal func_80122DDC -/* D97E00 80240570 84440008 */ lh $a0, 8($v0) -/* D97E04 80240574 8E050028 */ lw $a1, 0x28($s0) -/* D97E08 80240578 8E070030 */ lw $a3, 0x30($s0) -/* D97E0C 8024057C 27A20030 */ addiu $v0, $sp, 0x30 -/* D97E10 80240580 AFA20010 */ sw $v0, 0x10($sp) -/* D97E14 80240584 27A20034 */ addiu $v0, $sp, 0x34 -/* D97E18 80240588 AFA20014 */ sw $v0, 0x14($sp) -/* D97E1C 8024058C 27A20038 */ addiu $v0, $sp, 0x38 -/* D97E20 80240590 AFA20018 */ sw $v0, 0x18($sp) -/* D97E24 80240594 C600002C */ lwc1 $f0, 0x2c($s0) -/* D97E28 80240598 3C04800A */ lui $a0, 0x800a -/* D97E2C 8024059C 8484A634 */ lh $a0, -0x59cc($a0) -/* D97E30 802405A0 46000007 */ neg.s $f0, $f0 -/* D97E34 802405A4 44060000 */ mfc1 $a2, $f0 -/* D97E38 802405A8 0C00B94E */ jal get_screen_coords -/* D97E3C 802405AC 00000000 */ nop -/* D97E40 802405B0 8E0500A4 */ lw $a1, 0xa4($s0) -/* D97E44 802405B4 3C063F80 */ lui $a2, 0x3f80 -/* D97E48 802405B8 0C0B76A3 */ jal func_802DDA8C -/* D97E4C 802405BC 24040001 */ addiu $a0, $zero, 1 -/* D97E50 802405C0 8E020000 */ lw $v0, ($s0) -/* D97E54 802405C4 3C030002 */ lui $v1, 2 -/* D97E58 802405C8 00431024 */ and $v0, $v0, $v1 -/* D97E5C 802405CC 54400022 */ bnel $v0, $zero, .L80240658 -/* D97E60 802405D0 24120011 */ addiu $s2, $zero, 0x11 -/* D97E64 802405D4 9203000E */ lbu $v1, 0xe($s0) -/* D97E68 802405D8 3C02802E */ lui $v0, 0x802e -/* D97E6C 802405DC 90429D71 */ lbu $v0, -0x628f($v0) -/* D97E70 802405E0 10620018 */ beq $v1, $v0, .L80240644 -/* D97E74 802405E4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D97E78 802405E8 1040000B */ beqz $v0, .L80240618 -/* D97E7C 802405EC 24120011 */ addiu $s2, $zero, 0x11 -/* D97E80 802405F0 24040001 */ addiu $a0, $zero, 1 -/* D97E84 802405F4 2405FFFF */ addiu $a1, $zero, -1 -/* D97E88 802405F8 24060007 */ addiu $a2, $zero, 7 -/* D97E8C 802405FC 0060102D */ daddu $v0, $v1, $zero -/* D97E90 80240600 0000382D */ daddu $a3, $zero, $zero -/* D97E94 80240604 AFA00010 */ sw $zero, 0x10($sp) -/* D97E98 80240608 AFA00014 */ sw $zero, 0x14($sp) -/* D97E9C 8024060C AFA0001C */ sw $zero, 0x1c($sp) -/* D97EA0 80240610 0809018F */ j .L8024063C -/* D97EA4 80240614 AFA20018 */ sw $v0, 0x18($sp) -.L80240618: -/* D97EA8 80240618 2412000D */ addiu $s2, $zero, 0xd -/* D97EAC 8024061C 24040001 */ addiu $a0, $zero, 1 -/* D97EB0 80240620 2405FFFF */ addiu $a1, $zero, -1 -/* D97EB4 80240624 0000302D */ daddu $a2, $zero, $zero -/* D97EB8 80240628 00C0382D */ daddu $a3, $a2, $zero -/* D97EBC 8024062C AFA00010 */ sw $zero, 0x10($sp) -/* D97EC0 80240630 AFA00014 */ sw $zero, 0x14($sp) -/* D97EC4 80240634 AFA00018 */ sw $zero, 0x18($sp) -/* D97EC8 80240638 AFA0001C */ sw $zero, 0x1c($sp) -.L8024063C: -/* D97ECC 8024063C 0C0B77B9 */ jal func_802DDEE4 -/* D97ED0 80240640 00000000 */ nop -.L80240644: -/* D97ED4 80240644 9202000E */ lbu $v0, 0xe($s0) -/* D97ED8 80240648 3C01802E */ lui $at, 0x802e -/* D97EDC 8024064C A0229D71 */ sb $v0, -0x628f($at) -/* D97EE0 80240650 08090198 */ j .L80240660 -/* D97EE4 80240654 00000000 */ nop -.L80240658: -/* D97EE8 80240658 3C01802E */ lui $at, 0x802e -/* D97EEC 8024065C A0209D71 */ sb $zero, -0x628f($at) -.L80240660: -/* D97EF0 80240660 8FA20038 */ lw $v0, 0x38($sp) -/* D97EF4 80240664 3C048024 */ lui $a0, 0x8024 -/* D97EF8 80240668 248408A0 */ addiu $a0, $a0, 0x8a0 -/* D97EFC 8024066C AE320000 */ sw $s2, ($s1) -/* D97F00 80240670 AE300008 */ sw $s0, 8($s1) -/* D97F04 80240674 00021023 */ negu $v0, $v0 -/* D97F08 80240678 AE220004 */ sw $v0, 4($s1) -/* D97F0C 8024067C 8E020000 */ lw $v0, ($s0) -/* D97F10 80240680 3C030002 */ lui $v1, 2 -/* D97F14 80240684 00431024 */ and $v0, $v0, $v1 -/* D97F18 80240688 54400004 */ bnel $v0, $zero, .L8024069C -/* D97F1C 8024068C AE24000C */ sw $a0, 0xc($s1) -/* D97F20 80240690 3C048024 */ lui $a0, 0x8024 -/* D97F24 80240694 248406BC */ addiu $a0, $a0, 0x6bc -/* D97F28 80240698 AE24000C */ sw $a0, 0xc($s1) -.L8024069C: -/* D97F2C 8024069C 0C047644 */ jal queue_render_task -/* D97F30 802406A0 0220202D */ daddu $a0, $s1, $zero -.L802406A4: -/* D97F34 802406A4 8FBF004C */ lw $ra, 0x4c($sp) -/* D97F38 802406A8 8FB20048 */ lw $s2, 0x48($sp) -/* D97F3C 802406AC 8FB10044 */ lw $s1, 0x44($sp) -/* D97F40 802406B0 8FB00040 */ lw $s0, 0x40($sp) -/* D97F44 802406B4 03E00008 */ jr $ra -/* D97F48 802406B8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_39/func_802406BC_D97890.s b/asm/nonmatchings/world/area_pra/pra_39/func_802406BC_D97890.s deleted file mode 100644 index bc7429ab0a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/func_802406BC_D97890.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406BC_D97F4C -/* D97F4C 802406BC 3C03800A */ lui $v1, 0x800a -/* D97F50 802406C0 8463A634 */ lh $v1, -0x59cc($v1) -/* D97F54 802406C4 3C07BF80 */ lui $a3, 0xbf80 -/* D97F58 802406C8 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D97F5C 802406CC F7B40128 */ sdc1 $f20, 0x128($sp) -/* D97F60 802406D0 4480A000 */ mtc1 $zero, $f20 -/* D97F64 802406D4 AFB1011C */ sw $s1, 0x11c($sp) -/* D97F68 802406D8 0080882D */ daddu $s1, $a0, $zero -/* D97F6C 802406DC AFB00118 */ sw $s0, 0x118($sp) -/* D97F70 802406E0 27B00098 */ addiu $s0, $sp, 0x98 -/* D97F74 802406E4 AFBF0120 */ sw $ra, 0x120($sp) -/* D97F78 802406E8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D97F7C 802406EC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D97F80 802406F0 00031080 */ sll $v0, $v1, 2 -/* D97F84 802406F4 00431021 */ addu $v0, $v0, $v1 -/* D97F88 802406F8 00021080 */ sll $v0, $v0, 2 -/* D97F8C 802406FC 00431023 */ subu $v0, $v0, $v1 -/* D97F90 80240700 000218C0 */ sll $v1, $v0, 3 -/* D97F94 80240704 00431021 */ addu $v0, $v0, $v1 -/* D97F98 80240708 000210C0 */ sll $v0, $v0, 3 -/* D97F9C 8024070C 3C01800B */ lui $at, 0x800b -/* D97FA0 80240710 00220821 */ addu $at, $at, $v0 -/* D97FA4 80240714 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D97FA8 80240718 4406A000 */ mfc1 $a2, $f20 -/* D97FAC 8024071C 4600B587 */ neg.s $f22, $f22 -/* D97FB0 80240720 4405B000 */ mfc1 $a1, $f22 -/* D97FB4 80240724 0200202D */ daddu $a0, $s0, $zero -/* D97FB8 80240728 0C019EC8 */ jal guRotateF -/* D97FBC 8024072C E7B40010 */ swc1 $f20, 0x10($sp) -/* D97FC0 80240730 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D97FC4 80240734 0C00A6C9 */ jal clamp_angle -/* D97FC8 80240738 00000000 */ nop -/* D97FCC 8024073C 44050000 */ mfc1 $a1, $f0 -/* D97FD0 80240740 4406A000 */ mfc1 $a2, $f20 -/* D97FD4 80240744 4407A000 */ mfc1 $a3, $f20 -/* D97FD8 80240748 3C013F80 */ lui $at, 0x3f80 -/* D97FDC 8024074C 4481C000 */ mtc1 $at, $f24 -/* D97FE0 80240750 27A40018 */ addiu $a0, $sp, 0x18 -/* D97FE4 80240754 0C019EC8 */ jal guRotateF -/* D97FE8 80240758 E7B80010 */ swc1 $f24, 0x10($sp) -/* D97FEC 8024075C 0200202D */ daddu $a0, $s0, $zero -/* D97FF0 80240760 27A50018 */ addiu $a1, $sp, 0x18 -/* D97FF4 80240764 0C019D80 */ jal guMtxCatF -/* D97FF8 80240768 00A0302D */ daddu $a2, $a1, $zero -/* D97FFC 8024076C 4405B000 */ mfc1 $a1, $f22 -/* D98000 80240770 4406A000 */ mfc1 $a2, $f20 -/* D98004 80240774 4407C000 */ mfc1 $a3, $f24 -/* D98008 80240778 0200202D */ daddu $a0, $s0, $zero -/* D9800C 8024077C 0C019EC8 */ jal guRotateF -/* D98010 80240780 E7B40010 */ swc1 $f20, 0x10($sp) -/* D98014 80240784 27A40018 */ addiu $a0, $sp, 0x18 -/* D98018 80240788 0200282D */ daddu $a1, $s0, $zero -/* D9801C 8024078C 0C019D80 */ jal guMtxCatF -/* D98020 80240790 0080302D */ daddu $a2, $a0, $zero -/* D98024 80240794 E7B40010 */ swc1 $f20, 0x10($sp) -/* D98028 80240798 8E2500A8 */ lw $a1, 0xa8($s1) -/* D9802C 8024079C 4406A000 */ mfc1 $a2, $f20 -/* D98030 802407A0 4407C000 */ mfc1 $a3, $f24 -/* D98034 802407A4 0C019EC8 */ jal guRotateF -/* D98038 802407A8 0200202D */ daddu $a0, $s0, $zero -/* D9803C 802407AC 27A40018 */ addiu $a0, $sp, 0x18 -/* D98040 802407B0 0200282D */ daddu $a1, $s0, $zero -/* D98044 802407B4 0C019D80 */ jal guMtxCatF -/* D98048 802407B8 0080302D */ daddu $a2, $a0, $zero -/* D9804C 802407BC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D98050 802407C0 3C013F36 */ lui $at, 0x3f36 -/* D98054 802407C4 3421DB6E */ ori $at, $at, 0xdb6e -/* D98058 802407C8 44810000 */ mtc1 $at, $f0 -/* D9805C 802407CC 0200202D */ daddu $a0, $s0, $zero -/* D98060 802407D0 44050000 */ mfc1 $a1, $f0 -/* D98064 802407D4 3C06BF36 */ lui $a2, 0xbf36 -/* D98068 802407D8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D9806C 802407DC 0C019DF0 */ jal guScaleF -/* D98070 802407E0 00A0382D */ daddu $a3, $a1, $zero -/* D98074 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D98078 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D9807C 802407EC 0C019D80 */ jal guMtxCatF -/* D98080 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D98084 802407F4 27B00058 */ addiu $s0, $sp, 0x58 -/* D98088 802407F8 8E250028 */ lw $a1, 0x28($s1) -/* D9808C 802407FC C620002C */ lwc1 $f0, 0x2c($s1) -/* D98090 80240800 8E270030 */ lw $a3, 0x30($s1) -/* D98094 80240804 46000007 */ neg.s $f0, $f0 -/* D98098 80240808 44060000 */ mfc1 $a2, $f0 -/* D9809C 8024080C 0C019E40 */ jal guTranslateF -/* D980A0 80240810 0200202D */ daddu $a0, $s0, $zero -/* D980A4 80240814 27A40018 */ addiu $a0, $sp, 0x18 -/* D980A8 80240818 0200282D */ daddu $a1, $s0, $zero -/* D980AC 8024081C 0C019D80 */ jal guMtxCatF -/* D980B0 80240820 0080302D */ daddu $a2, $a0, $zero -/* D980B4 80240824 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D980B8 80240828 3C0142B4 */ lui $at, 0x42b4 -/* D980BC 8024082C 44810000 */ mtc1 $at, $f0 -/* D980C0 80240830 00000000 */ nop -/* D980C4 80240834 4602003E */ c.le.s $f0, $f2 -/* D980C8 80240838 00000000 */ nop -/* D980CC 8024083C 4500000A */ bc1f .L80240868 -/* D980D0 80240840 24040001 */ addiu $a0, $zero, 1 -/* D980D4 80240844 3C014387 */ lui $at, 0x4387 -/* D980D8 80240848 44810000 */ mtc1 $at, $f0 -/* D980DC 8024084C 00000000 */ nop -/* D980E0 80240850 4600103C */ c.lt.s $f2, $f0 -/* D980E4 80240854 00000000 */ nop -/* D980E8 80240858 45000004 */ bc1f .L8024086C -/* D980EC 8024085C 27A20018 */ addiu $v0, $sp, 0x18 -/* D980F0 80240860 3C041000 */ lui $a0, 0x1000 -/* D980F4 80240864 34840001 */ ori $a0, $a0, 1 -.L80240868: -/* D980F8 80240868 27A20018 */ addiu $v0, $sp, 0x18 -.L8024086C: -/* D980FC 8024086C 0000282D */ daddu $a1, $zero, $zero -/* D98100 80240870 00A0302D */ daddu $a2, $a1, $zero -/* D98104 80240874 00A0382D */ daddu $a3, $a1, $zero -/* D98108 80240878 0C0B7710 */ jal render_sprite -/* D9810C 8024087C AFA20010 */ sw $v0, 0x10($sp) -/* D98110 80240880 8FBF0120 */ lw $ra, 0x120($sp) -/* D98114 80240884 8FB1011C */ lw $s1, 0x11c($sp) -/* D98118 80240888 8FB00118 */ lw $s0, 0x118($sp) -/* D9811C 8024088C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D98120 80240890 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D98124 80240894 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D98128 80240898 03E00008 */ jr $ra -/* D9812C 8024089C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_39/func_802408A0_D97890.s b/asm/nonmatchings/world/area_pra/pra_39/func_802408A0_D97890.s deleted file mode 100644 index 7eb2b2464d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/func_802408A0_D97890.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A0_D98130 -/* D98130 802408A0 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D98134 802408A4 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D98138 802408A8 4480B000 */ mtc1 $zero, $f22 -/* D9813C 802408AC AFB10134 */ sw $s1, 0x134($sp) -/* D98140 802408B0 0080882D */ daddu $s1, $a0, $zero -/* D98144 802408B4 AFB3013C */ sw $s3, 0x13c($sp) -/* D98148 802408B8 0000982D */ daddu $s3, $zero, $zero -/* D9814C 802408BC AFB60148 */ sw $s6, 0x148($sp) -/* D98150 802408C0 3C16800B */ lui $s6, %hi(gCameras) -/* D98154 802408C4 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D98158 802408C8 AFB50144 */ sw $s5, 0x144($sp) -/* D9815C 802408CC 241500FF */ addiu $s5, $zero, 0xff -/* D98160 802408D0 AFB00130 */ sw $s0, 0x130($sp) -/* D98164 802408D4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D98168 802408D8 AFB20138 */ sw $s2, 0x138($sp) -/* D9816C 802408DC 27B20060 */ addiu $s2, $sp, 0x60 -/* D98170 802408E0 AFB40140 */ sw $s4, 0x140($sp) -/* D98174 802408E4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D98178 802408E8 AFBF014C */ sw $ra, 0x14c($sp) -/* D9817C 802408EC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D98180 802408F0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D98184 802408F4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D98188 802408F8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D9818C 802408FC F7B40150 */ sdc1 $f20, 0x150($sp) -.L80240900: -/* D98190 80240900 3C03800A */ lui $v1, 0x800a -/* D98194 80240904 8463A634 */ lh $v1, -0x59cc($v1) -/* D98198 80240908 00031080 */ sll $v0, $v1, 2 -/* D9819C 8024090C 00431021 */ addu $v0, $v0, $v1 -/* D981A0 80240910 00021080 */ sll $v0, $v0, 2 -/* D981A4 80240914 00431023 */ subu $v0, $v0, $v1 -/* D981A8 80240918 000218C0 */ sll $v1, $v0, 3 -/* D981AC 8024091C 00431021 */ addu $v0, $v0, $v1 -/* D981B0 80240920 000210C0 */ sll $v0, $v0, 3 -/* D981B4 80240924 00561021 */ addu $v0, $v0, $s6 -/* D981B8 80240928 C440006C */ lwc1 $f0, 0x6c($v0) -/* D981BC 8024092C 16600065 */ bnez $s3, .L80240AC4 -/* D981C0 80240930 46000507 */ neg.s $f20, $f0 -/* D981C4 80240934 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D981C8 80240938 3C0142B4 */ lui $at, 0x42b4 -/* D981CC 8024093C 44810000 */ mtc1 $at, $f0 -/* D981D0 80240940 00000000 */ nop -/* D981D4 80240944 4602003C */ c.lt.s $f0, $f2 -/* D981D8 80240948 00000000 */ nop -/* D981DC 8024094C 4500000A */ bc1f .L80240978 -/* D981E0 80240950 00000000 */ nop -/* D981E4 80240954 3C014334 */ lui $at, 0x4334 -/* D981E8 80240958 44812000 */ mtc1 $at, $f4 -/* D981EC 8024095C 00000000 */ nop -/* D981F0 80240960 4604103E */ c.le.s $f2, $f4 -/* D981F4 80240964 00000000 */ nop -/* D981F8 80240968 45000003 */ bc1f .L80240978 -/* D981FC 8024096C 00000000 */ nop -/* D98200 80240970 08090282 */ j .L80240A08 -/* D98204 80240974 46022501 */ sub.s $f20, $f4, $f2 -.L80240978: -/* D98208 80240978 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D9820C 8024097C 3C014334 */ lui $at, 0x4334 -/* D98210 80240980 44812000 */ mtc1 $at, $f4 -/* D98214 80240984 00000000 */ nop -/* D98218 80240988 4600203C */ c.lt.s $f4, $f0 -/* D9821C 8024098C 00000000 */ nop -/* D98220 80240990 4500000C */ bc1f .L802409C4 -/* D98224 80240994 00000000 */ nop -/* D98228 80240998 3C014387 */ lui $at, 0x4387 -/* D9822C 8024099C 44812000 */ mtc1 $at, $f4 -/* D98230 802409A0 00000000 */ nop -/* D98234 802409A4 4604003E */ c.le.s $f0, $f4 -/* D98238 802409A8 00000000 */ nop -/* D9823C 802409AC 45000008 */ bc1f .L802409D0 -/* D98240 802409B0 00000000 */ nop -/* D98244 802409B4 3C014334 */ lui $at, 0x4334 -/* D98248 802409B8 44812000 */ mtc1 $at, $f4 -/* D9824C 802409BC 08090282 */ j .L80240A08 -/* D98250 802409C0 46040501 */ sub.s $f20, $f0, $f4 -.L802409C4: -/* D98254 802409C4 3C014387 */ lui $at, 0x4387 -/* D98258 802409C8 44812000 */ mtc1 $at, $f4 -/* D9825C 802409CC 00000000 */ nop -.L802409D0: -/* D98260 802409D0 4600203C */ c.lt.s $f4, $f0 -/* D98264 802409D4 00000000 */ nop -/* D98268 802409D8 4500000A */ bc1f .L80240A04 -/* D9826C 802409DC 00000000 */ nop -/* D98270 802409E0 3C0143B4 */ lui $at, 0x43b4 -/* D98274 802409E4 44811000 */ mtc1 $at, $f2 -/* D98278 802409E8 00000000 */ nop -/* D9827C 802409EC 4602003E */ c.le.s $f0, $f2 -/* D98280 802409F0 00000000 */ nop -/* D98284 802409F4 45000003 */ bc1f .L80240A04 -/* D98288 802409F8 00000000 */ nop -/* D9828C 802409FC 08090282 */ j .L80240A08 -/* D98290 80240A00 46001501 */ sub.s $f20, $f2, $f0 -.L80240A04: -/* D98294 80240A04 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L80240A08: -/* D98298 80240A08 3C0141C8 */ lui $at, 0x41c8 -/* D9829C 80240A0C 44810000 */ mtc1 $at, $f0 -/* D982A0 80240A10 00000000 */ nop -/* D982A4 80240A14 4600A003 */ div.s $f0, $f20, $f0 -/* D982A8 80240A18 4600010D */ trunc.w.s $f4, $f0 -/* D982AC 80240A1C 44072000 */ mfc1 $a3, $f4 -/* D982B0 80240A20 00000000 */ nop -/* D982B4 80240A24 00071100 */ sll $v0, $a3, 4 -/* D982B8 80240A28 00471023 */ subu $v0, $v0, $a3 -/* D982BC 80240A2C 00021080 */ sll $v0, $v0, 2 -/* D982C0 80240A30 02A23823 */ subu $a3, $s5, $v0 -/* D982C4 80240A34 28E20064 */ slti $v0, $a3, 0x64 -/* D982C8 80240A38 54400001 */ bnel $v0, $zero, .L80240A40 -/* D982CC 80240A3C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A40: -/* D982D0 80240A40 24040001 */ addiu $a0, $zero, 1 -/* D982D4 80240A44 2405FFFF */ addiu $a1, $zero, -1 -/* D982D8 80240A48 24060006 */ addiu $a2, $zero, 6 -/* D982DC 80240A4C AFA70010 */ sw $a3, 0x10($sp) -/* D982E0 80240A50 AFA70014 */ sw $a3, 0x14($sp) -/* D982E4 80240A54 AFB50018 */ sw $s5, 0x18($sp) -/* D982E8 80240A58 0C0B77B9 */ jal func_802DDEE4 -/* D982EC 80240A5C AFA0001C */ sw $zero, 0x1c($sp) -/* D982F0 80240A60 4405A000 */ mfc1 $a1, $f20 -/* D982F4 80240A64 4406B000 */ mfc1 $a2, $f22 -/* D982F8 80240A68 3C07BF80 */ lui $a3, 0xbf80 -/* D982FC 80240A6C 0200202D */ daddu $a0, $s0, $zero -/* D98300 80240A70 0C019EC8 */ jal guRotateF -/* D98304 80240A74 E7B60010 */ swc1 $f22, 0x10($sp) -/* D98308 80240A78 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D9830C 80240A7C 0C00A6C9 */ jal clamp_angle -/* D98310 80240A80 00000000 */ nop -/* D98314 80240A84 44050000 */ mfc1 $a1, $f0 -/* D98318 80240A88 4406B000 */ mfc1 $a2, $f22 -/* D9831C 80240A8C 4407B000 */ mfc1 $a3, $f22 -/* D98320 80240A90 3C013F80 */ lui $at, 0x3f80 -/* D98324 80240A94 44812000 */ mtc1 $at, $f4 -/* D98328 80240A98 27A40020 */ addiu $a0, $sp, 0x20 -/* D9832C 80240A9C 0C019EC8 */ jal guRotateF -/* D98330 80240AA0 E7A40010 */ swc1 $f4, 0x10($sp) -/* D98334 80240AA4 0200202D */ daddu $a0, $s0, $zero -/* D98338 80240AA8 27A50020 */ addiu $a1, $sp, 0x20 -/* D9833C 80240AAC 0C019D80 */ jal guMtxCatF -/* D98340 80240AB0 00A0302D */ daddu $a2, $a1, $zero -/* D98344 80240AB4 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D98348 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D9834C 80240ABC 080902E2 */ j .L80240B88 -/* D98350 80240AC0 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240AC4: -/* D98354 80240AC4 0260202D */ daddu $a0, $s3, $zero -/* D98358 80240AC8 27A50120 */ addiu $a1, $sp, 0x120 -/* D9835C 80240ACC 27A60124 */ addiu $a2, $sp, 0x124 -/* D98360 80240AD0 0C03964E */ jal func_800E5938 -/* D98364 80240AD4 27A70128 */ addiu $a3, $sp, 0x128 -/* D98368 80240AD8 8FA60124 */ lw $a2, 0x124($sp) -/* D9836C 80240ADC 3C028000 */ lui $v0, 0x8000 -/* D98370 80240AE0 14C20004 */ bne $a2, $v0, .L80240AF4 -/* D98374 80240AE4 46000606 */ mov.s $f24, $f0 -/* D98378 80240AE8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D9837C 80240AEC 080902C1 */ j .L80240B04 -/* D98380 80240AF0 24040001 */ addiu $a0, $zero, 1 -.L80240AF4: -/* D98384 80240AF4 4486D000 */ mtc1 $a2, $f26 -/* D98388 80240AF8 00000000 */ nop -/* D9838C 80240AFC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D98390 80240B00 24040001 */ addiu $a0, $zero, 1 -.L80240B04: -/* D98394 80240B04 2405FFFF */ addiu $a1, $zero, -1 -/* D98398 80240B08 24060007 */ addiu $a2, $zero, 7 -/* D9839C 80240B0C 0000382D */ daddu $a3, $zero, $zero -/* D983A0 80240B10 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D983A4 80240B14 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D983A8 80240B18 24020040 */ addiu $v0, $zero, 0x40 -/* D983AC 80240B1C AFA00010 */ sw $zero, 0x10($sp) -/* D983B0 80240B20 AFA00014 */ sw $zero, 0x14($sp) -/* D983B4 80240B24 AFA20018 */ sw $v0, 0x18($sp) -/* D983B8 80240B28 0C0B77B9 */ jal func_802DDEE4 -/* D983BC 80240B2C AFA0001C */ sw $zero, 0x1c($sp) -/* D983C0 80240B30 4405A000 */ mfc1 $a1, $f20 -/* D983C4 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D983C8 80240B38 3C07BF80 */ lui $a3, 0xbf80 -/* D983CC 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D983D0 80240B40 0C019EC8 */ jal guRotateF -/* D983D4 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D983D8 80240B48 4405A000 */ mfc1 $a1, $f20 -/* D983DC 80240B4C 4406B000 */ mfc1 $a2, $f22 -/* D983E0 80240B50 3C07BF80 */ lui $a3, 0xbf80 -/* D983E4 80240B54 0200202D */ daddu $a0, $s0, $zero -/* D983E8 80240B58 0C019EC8 */ jal guRotateF -/* D983EC 80240B5C E7B60010 */ swc1 $f22, 0x10($sp) -/* D983F0 80240B60 4405C000 */ mfc1 $a1, $f24 -/* D983F4 80240B64 4406B000 */ mfc1 $a2, $f22 -/* D983F8 80240B68 3C073F80 */ lui $a3, 0x3f80 -/* D983FC 80240B6C 27A40020 */ addiu $a0, $sp, 0x20 -/* D98400 80240B70 0C019EC8 */ jal guRotateF -/* D98404 80240B74 E7B60010 */ swc1 $f22, 0x10($sp) -/* D98408 80240B78 0200202D */ daddu $a0, $s0, $zero -/* D9840C 80240B7C 27A50020 */ addiu $a1, $sp, 0x20 -/* D98410 80240B80 0C019D80 */ jal guMtxCatF -/* D98414 80240B84 00A0302D */ daddu $a2, $a1, $zero -.L80240B88: -/* D98418 80240B88 862200B0 */ lh $v0, 0xb0($s1) -/* D9841C 80240B8C 3C013F00 */ lui $at, 0x3f00 -/* D98420 80240B90 44812000 */ mtc1 $at, $f4 -/* D98424 80240B94 00021023 */ negu $v0, $v0 -/* D98428 80240B98 44820000 */ mtc1 $v0, $f0 -/* D9842C 80240B9C 00000000 */ nop -/* D98430 80240BA0 46800020 */ cvt.s.w $f0, $f0 -/* D98434 80240BA4 46040102 */ mul.s $f4, $f0, $f4 -/* D98438 80240BA8 00000000 */ nop -/* D9843C 80240BAC 4405B000 */ mfc1 $a1, $f22 -/* D98440 80240BB0 4407B000 */ mfc1 $a3, $f22 -/* D98444 80240BB4 44062000 */ mfc1 $a2, $f4 -/* D98448 80240BB8 0C019E40 */ jal guTranslateF -/* D9844C 80240BBC 0240202D */ daddu $a0, $s2, $zero -/* D98450 80240BC0 0240202D */ daddu $a0, $s2, $zero -/* D98454 80240BC4 27A50020 */ addiu $a1, $sp, 0x20 -/* D98458 80240BC8 0C019D80 */ jal guMtxCatF -/* D9845C 80240BCC 00A0302D */ daddu $a2, $a1, $zero -/* D98460 80240BD0 4405A000 */ mfc1 $a1, $f20 -/* D98464 80240BD4 4406B000 */ mfc1 $a2, $f22 -/* D98468 80240BD8 3C073F80 */ lui $a3, 0x3f80 -/* D9846C 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D98470 80240BE0 0C019EC8 */ jal guRotateF -/* D98474 80240BE4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D98478 80240BE8 27A40020 */ addiu $a0, $sp, 0x20 -/* D9847C 80240BEC 0200282D */ daddu $a1, $s0, $zero -/* D98480 80240BF0 0C019D80 */ jal guMtxCatF -/* D98484 80240BF4 0080302D */ daddu $a2, $a0, $zero -/* D98488 80240BF8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D9848C 80240BFC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D98490 80240C00 4406B000 */ mfc1 $a2, $f22 -/* D98494 80240C04 3C073F80 */ lui $a3, 0x3f80 -/* D98498 80240C08 0C019EC8 */ jal guRotateF -/* D9849C 80240C0C 0200202D */ daddu $a0, $s0, $zero -/* D984A0 80240C10 27A40020 */ addiu $a0, $sp, 0x20 -/* D984A4 80240C14 0200282D */ daddu $a1, $s0, $zero -/* D984A8 80240C18 0C019D80 */ jal guMtxCatF -/* D984AC 80240C1C 0080302D */ daddu $a2, $a0, $zero -/* D984B0 80240C20 862200B0 */ lh $v0, 0xb0($s1) -/* D984B4 80240C24 3C013F00 */ lui $at, 0x3f00 -/* D984B8 80240C28 44812000 */ mtc1 $at, $f4 -/* D984BC 80240C2C 44820000 */ mtc1 $v0, $f0 -/* D984C0 80240C30 00000000 */ nop -/* D984C4 80240C34 46800020 */ cvt.s.w $f0, $f0 -/* D984C8 80240C38 46040102 */ mul.s $f4, $f0, $f4 -/* D984CC 80240C3C 00000000 */ nop -/* D984D0 80240C40 4405B000 */ mfc1 $a1, $f22 -/* D984D4 80240C44 4407B000 */ mfc1 $a3, $f22 -/* D984D8 80240C48 44062000 */ mfc1 $a2, $f4 -/* D984DC 80240C4C 0C019E40 */ jal guTranslateF -/* D984E0 80240C50 0240202D */ daddu $a0, $s2, $zero -/* D984E4 80240C54 27A40020 */ addiu $a0, $sp, 0x20 -/* D984E8 80240C58 0240282D */ daddu $a1, $s2, $zero -/* D984EC 80240C5C 0C019D80 */ jal guMtxCatF -/* D984F0 80240C60 0080302D */ daddu $a2, $a0, $zero -/* D984F4 80240C64 3C013F36 */ lui $at, 0x3f36 -/* D984F8 80240C68 3421DB6E */ ori $at, $at, 0xdb6e -/* D984FC 80240C6C 44810000 */ mtc1 $at, $f0 -/* D98500 80240C70 0280202D */ daddu $a0, $s4, $zero -/* D98504 80240C74 44050000 */ mfc1 $a1, $f0 -/* D98508 80240C78 3C06BF36 */ lui $a2, 0xbf36 -/* D9850C 80240C7C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D98510 80240C80 0C019DF0 */ jal guScaleF -/* D98514 80240C84 00A0382D */ daddu $a3, $a1, $zero -/* D98518 80240C88 27A40020 */ addiu $a0, $sp, 0x20 -/* D9851C 80240C8C 0280282D */ daddu $a1, $s4, $zero -/* D98520 80240C90 0C019D80 */ jal guMtxCatF -/* D98524 80240C94 0080302D */ daddu $a2, $a0, $zero -/* D98528 80240C98 4600D687 */ neg.s $f26, $f26 -/* D9852C 80240C9C 4405F000 */ mfc1 $a1, $f30 -/* D98530 80240CA0 4407E000 */ mfc1 $a3, $f28 -/* D98534 80240CA4 4406D000 */ mfc1 $a2, $f26 -/* D98538 80240CA8 0C019E40 */ jal guTranslateF -/* D9853C 80240CAC 0240202D */ daddu $a0, $s2, $zero -/* D98540 80240CB0 27A40020 */ addiu $a0, $sp, 0x20 -/* D98544 80240CB4 0240282D */ daddu $a1, $s2, $zero -/* D98548 80240CB8 0C019D80 */ jal guMtxCatF -/* D9854C 80240CBC 0080302D */ daddu $a2, $a0, $zero -/* D98550 80240CC0 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D98554 80240CC4 3C0142B4 */ lui $at, 0x42b4 -/* D98558 80240CC8 44810000 */ mtc1 $at, $f0 -/* D9855C 80240CCC 00000000 */ nop -/* D98560 80240CD0 4602003E */ c.le.s $f0, $f2 -/* D98564 80240CD4 00000000 */ nop -/* D98568 80240CD8 4500000A */ bc1f .L80240D04 -/* D9856C 80240CDC 24040001 */ addiu $a0, $zero, 1 -/* D98570 80240CE0 3C014387 */ lui $at, 0x4387 -/* D98574 80240CE4 44812000 */ mtc1 $at, $f4 -/* D98578 80240CE8 00000000 */ nop -/* D9857C 80240CEC 4604103C */ c.lt.s $f2, $f4 -/* D98580 80240CF0 00000000 */ nop -/* D98584 80240CF4 45000004 */ bc1f .L80240D08 -/* D98588 80240CF8 27A20020 */ addiu $v0, $sp, 0x20 -/* D9858C 80240CFC 3C041000 */ lui $a0, 0x1000 -/* D98590 80240D00 34840001 */ ori $a0, $a0, 1 -.L80240D04: -/* D98594 80240D04 27A20020 */ addiu $v0, $sp, 0x20 -.L80240D08: -/* D98598 80240D08 AFA20010 */ sw $v0, 0x10($sp) -/* D9859C 80240D0C 0000282D */ daddu $a1, $zero, $zero -/* D985A0 80240D10 00A0302D */ daddu $a2, $a1, $zero -/* D985A4 80240D14 0C0B7710 */ jal render_sprite -/* D985A8 80240D18 00A0382D */ daddu $a3, $a1, $zero -/* D985AC 80240D1C 26730001 */ addiu $s3, $s3, 1 -/* D985B0 80240D20 2A620002 */ slti $v0, $s3, 2 -/* D985B4 80240D24 1440FEF6 */ bnez $v0, .L80240900 -/* D985B8 80240D28 00000000 */ nop -/* D985BC 80240D2C 8FBF014C */ lw $ra, 0x14c($sp) -/* D985C0 80240D30 8FB60148 */ lw $s6, 0x148($sp) -/* D985C4 80240D34 8FB50144 */ lw $s5, 0x144($sp) -/* D985C8 80240D38 8FB40140 */ lw $s4, 0x140($sp) -/* D985CC 80240D3C 8FB3013C */ lw $s3, 0x13c($sp) -/* D985D0 80240D40 8FB20138 */ lw $s2, 0x138($sp) -/* D985D4 80240D44 8FB10134 */ lw $s1, 0x134($sp) -/* D985D8 80240D48 8FB00130 */ lw $s0, 0x130($sp) -/* D985DC 80240D4C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D985E0 80240D50 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D985E4 80240D54 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D985E8 80240D58 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D985EC 80240D5C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D985F0 80240D60 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D985F4 80240D64 03E00008 */ jr $ra -/* D985F8 80240D68 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_39/func_80240D6C_D97890.s b/asm/nonmatchings/world/area_pra/pra_39/func_80240D6C_D97890.s deleted file mode 100644 index 3c5320ff8d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/func_80240D6C_D97890.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D6C_D985FC -/* D985FC 80240D6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D98600 80240D70 AFB00010 */ sw $s0, 0x10($sp) -/* D98604 80240D74 0080802D */ daddu $s0, $a0, $zero -/* D98608 80240D78 AFBF0014 */ sw $ra, 0x14($sp) -/* D9860C 80240D7C 8E020088 */ lw $v0, 0x88($s0) -/* D98610 80240D80 14400017 */ bnez $v0, .L80240DE0 -/* D98614 80240D84 24020001 */ addiu $v0, $zero, 1 -/* D98618 80240D88 8E030084 */ lw $v1, 0x84($s0) -/* D9861C 80240D8C 1062001A */ beq $v1, $v0, .L80240DF8 -/* D98620 80240D90 00000000 */ nop -/* D98624 80240D94 28620002 */ slti $v0, $v1, 2 -/* D98628 80240D98 50400005 */ beql $v0, $zero, .L80240DB0 -/* D9862C 80240D9C 24020002 */ addiu $v0, $zero, 2 -/* D98630 80240DA0 10600007 */ beqz $v1, .L80240DC0 -/* D98634 80240DA4 00000000 */ nop -/* D98638 80240DA8 08090384 */ j .L80240E10 -/* D9863C 80240DAC 00000000 */ nop -.L80240DB0: -/* D98640 80240DB0 10620007 */ beq $v1, $v0, .L80240DD0 -/* D98644 80240DB4 00000000 */ nop -/* D98648 80240DB8 08090384 */ j .L80240E10 -/* D9864C 80240DBC 00000000 */ nop -.L80240DC0: -/* D98650 80240DC0 3C048024 */ lui $a0, 0x8024 -/* D98654 80240DC4 24840EB4 */ addiu $a0, $a0, 0xeb4 -/* D98658 80240DC8 08090380 */ j .L80240E00 -/* D9865C 80240DCC 00000000 */ nop -.L80240DD0: -/* D98660 80240DD0 3C048024 */ lui $a0, 0x8024 -/* D98664 80240DD4 24840F1C */ addiu $a0, $a0, 0xf1c -/* D98668 80240DD8 08090380 */ j .L80240E00 -/* D9866C 80240DDC 00000000 */ nop -.L80240DE0: -/* D98670 80240DE0 8E020084 */ lw $v0, 0x84($s0) -/* D98674 80240DE4 0440000A */ bltz $v0, .L80240E10 -/* D98678 80240DE8 00000000 */ nop -/* D9867C 80240DEC 28420002 */ slti $v0, $v0, 2 -/* D98680 80240DF0 10400007 */ beqz $v0, .L80240E10 -/* D98684 80240DF4 00000000 */ nop -.L80240DF8: -/* D98688 80240DF8 3C048024 */ lui $a0, 0x8024 -/* D9868C 80240DFC 24840EE8 */ addiu $a0, $a0, 0xee8 -.L80240E00: -/* D98690 80240E00 0C048C56 */ jal bind_dynamic_entity_3 -/* D98694 80240E04 0000282D */ daddu $a1, $zero, $zero -/* D98698 80240E08 8E03013C */ lw $v1, 0x13c($s0) -/* D9869C 80240E0C AC620004 */ sw $v0, 4($v1) -.L80240E10: -/* D986A0 80240E10 0C00EAD2 */ jal get_npc_safe -/* D986A4 80240E14 2404FFFC */ addiu $a0, $zero, -4 -/* D986A8 80240E18 0040282D */ daddu $a1, $v0, $zero -/* D986AC 80240E1C 10A00021 */ beqz $a1, .L80240EA4 -/* D986B0 80240E20 24020002 */ addiu $v0, $zero, 2 -/* D986B4 80240E24 8E020088 */ lw $v0, 0x88($s0) -/* D986B8 80240E28 14400014 */ bnez $v0, .L80240E7C -/* D986BC 80240E2C 24020001 */ addiu $v0, $zero, 1 -/* D986C0 80240E30 8E040084 */ lw $a0, 0x84($s0) -/* D986C4 80240E34 10820016 */ beq $a0, $v0, .L80240E90 -/* D986C8 80240E38 28820002 */ slti $v0, $a0, 2 -/* D986CC 80240E3C 10400005 */ beqz $v0, .L80240E54 -/* D986D0 80240E40 24020002 */ addiu $v0, $zero, 2 -/* D986D4 80240E44 10800007 */ beqz $a0, .L80240E64 -/* D986D8 80240E48 00000000 */ nop -/* D986DC 80240E4C 080903A9 */ j .L80240EA4 -/* D986E0 80240E50 00000000 */ nop -.L80240E54: -/* D986E4 80240E54 10820006 */ beq $a0, $v0, .L80240E70 -/* D986E8 80240E58 24020002 */ addiu $v0, $zero, 2 -/* D986EC 80240E5C 080903A9 */ j .L80240EA4 -/* D986F0 80240E60 00000000 */ nop -.L80240E64: -/* D986F4 80240E64 8CA20000 */ lw $v0, ($a1) -/* D986F8 80240E68 080903A6 */ j .L80240E98 -/* D986FC 80240E6C 3C03000A */ lui $v1, 0xa -.L80240E70: -/* D98700 80240E70 8CA20000 */ lw $v0, ($a1) -/* D98704 80240E74 080903A6 */ j .L80240E98 -/* D98708 80240E78 3C030002 */ lui $v1, 2 -.L80240E7C: -/* D9870C 80240E7C 8E020084 */ lw $v0, 0x84($s0) -/* D98710 80240E80 04400007 */ bltz $v0, .L80240EA0 -/* D98714 80240E84 28420002 */ slti $v0, $v0, 2 -/* D98718 80240E88 10400006 */ beqz $v0, .L80240EA4 -/* D9871C 80240E8C 24020002 */ addiu $v0, $zero, 2 -.L80240E90: -/* D98720 80240E90 8CA20000 */ lw $v0, ($a1) -/* D98724 80240E94 3C030008 */ lui $v1, 8 -.L80240E98: -/* D98728 80240E98 00431025 */ or $v0, $v0, $v1 -/* D9872C 80240E9C ACA20000 */ sw $v0, ($a1) -.L80240EA0: -/* D98730 80240EA0 24020002 */ addiu $v0, $zero, 2 -.L80240EA4: -/* D98734 80240EA4 8FBF0014 */ lw $ra, 0x14($sp) -/* D98738 80240EA8 8FB00010 */ lw $s0, 0x10($sp) -/* D9873C 80240EAC 03E00008 */ jr $ra -/* D98740 80240EB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_39/func_80240EB4_D97890.s b/asm/nonmatchings/world/area_pra/pra_39/func_80240EB4_D97890.s deleted file mode 100644 index 2e97c7af1b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/func_80240EB4_D97890.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_D98744 -/* D98744 80240EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D98748 80240EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D9874C 80240EBC 0C00EAD2 */ jal get_npc_safe -/* D98750 80240EC0 2404FFFC */ addiu $a0, $zero, -4 -/* D98754 80240EC4 0040202D */ daddu $a0, $v0, $zero -/* D98758 80240EC8 10800004 */ beqz $a0, .L80240EDC -/* D9875C 80240ECC 3C03000A */ lui $v1, 0xa -/* D98760 80240ED0 8C820000 */ lw $v0, ($a0) -/* D98764 80240ED4 00431025 */ or $v0, $v0, $v1 -/* D98768 80240ED8 AC820000 */ sw $v0, ($a0) -.L80240EDC: -/* D9876C 80240EDC 8FBF0010 */ lw $ra, 0x10($sp) -/* D98770 80240EE0 03E00008 */ jr $ra -/* D98774 80240EE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_39/func_80240EE8_D97890.s b/asm/nonmatchings/world/area_pra/pra_39/func_80240EE8_D97890.s deleted file mode 100644 index b05aed2582..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/func_80240EE8_D97890.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE8_D98778 -/* D98778 80240EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9877C 80240EEC AFBF0010 */ sw $ra, 0x10($sp) -/* D98780 80240EF0 0C00EAD2 */ jal get_npc_safe -/* D98784 80240EF4 2404FFFC */ addiu $a0, $zero, -4 -/* D98788 80240EF8 0040202D */ daddu $a0, $v0, $zero -/* D9878C 80240EFC 10800004 */ beqz $a0, .L80240F10 -/* D98790 80240F00 3C030008 */ lui $v1, 8 -/* D98794 80240F04 8C820000 */ lw $v0, ($a0) -/* D98798 80240F08 00431025 */ or $v0, $v0, $v1 -/* D9879C 80240F0C AC820000 */ sw $v0, ($a0) -.L80240F10: -/* D987A0 80240F10 8FBF0010 */ lw $ra, 0x10($sp) -/* D987A4 80240F14 03E00008 */ jr $ra -/* D987A8 80240F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_39/func_80240F1C_D97890.s b/asm/nonmatchings/world/area_pra/pra_39/func_80240F1C_D97890.s deleted file mode 100644 index c285860b83..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/func_80240F1C_D97890.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F1C_D987AC -/* D987AC 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D987B0 80240F20 AFBF0010 */ sw $ra, 0x10($sp) -/* D987B4 80240F24 0C00EAD2 */ jal get_npc_safe -/* D987B8 80240F28 2404FFFC */ addiu $a0, $zero, -4 -/* D987BC 80240F2C 0040202D */ daddu $a0, $v0, $zero -/* D987C0 80240F30 10800004 */ beqz $a0, .L80240F44 -/* D987C4 80240F34 3C030002 */ lui $v1, 2 -/* D987C8 80240F38 8C820000 */ lw $v0, ($a0) -/* D987CC 80240F3C 00431025 */ or $v0, $v0, $v1 -/* D987D0 80240F40 AC820000 */ sw $v0, ($a0) -.L80240F44: -/* D987D4 80240F44 8FBF0010 */ lw $ra, 0x10($sp) -/* D987D8 80240F48 03E00008 */ jr $ra -/* D987DC 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_39/func_80240F50_D97890.s b/asm/nonmatchings/world/area_pra/pra_39/func_80240F50_D97890.s deleted file mode 100644 index 08bc600713..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/func_80240F50_D97890.s +++ /dev/null @@ -1,508 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F50_D987E0 -/* D987E0 80240F50 27BDFF88 */ addiu $sp, $sp, -0x78 -/* D987E4 80240F54 AFB3005C */ sw $s3, 0x5c($sp) -/* D987E8 80240F58 0080982D */ daddu $s3, $a0, $zero -/* D987EC 80240F5C AFBF006C */ sw $ra, 0x6c($sp) -/* D987F0 80240F60 AFB60068 */ sw $s6, 0x68($sp) -/* D987F4 80240F64 AFB50064 */ sw $s5, 0x64($sp) -/* D987F8 80240F68 AFB40060 */ sw $s4, 0x60($sp) -/* D987FC 80240F6C AFB20058 */ sw $s2, 0x58($sp) -/* D98800 80240F70 AFB10054 */ sw $s1, 0x54($sp) -/* D98804 80240F74 AFB00050 */ sw $s0, 0x50($sp) -/* D98808 80240F78 F7B40070 */ sdc1 $f20, 0x70($sp) -/* D9880C 80240F7C 8E720148 */ lw $s2, 0x148($s3) -/* D98810 80240F80 86440008 */ lh $a0, 8($s2) -/* D98814 80240F84 0C00EABB */ jal get_npc_unsafe -/* D98818 80240F88 00A0802D */ daddu $s0, $a1, $zero -/* D9881C 80240F8C 8E63000C */ lw $v1, 0xc($s3) -/* D98820 80240F90 0260202D */ daddu $a0, $s3, $zero -/* D98824 80240F94 8C650000 */ lw $a1, ($v1) -/* D98828 80240F98 0C0B1EAF */ jal get_variable -/* D9882C 80240F9C 0040882D */ daddu $s1, $v0, $zero -/* D98830 80240FA0 AFA00020 */ sw $zero, 0x20($sp) -/* D98834 80240FA4 8E4300D0 */ lw $v1, 0xd0($s2) -/* D98838 80240FA8 8C630030 */ lw $v1, 0x30($v1) -/* D9883C 80240FAC AFA30024 */ sw $v1, 0x24($sp) -/* D98840 80240FB0 8E4300D0 */ lw $v1, 0xd0($s2) -/* D98844 80240FB4 8C63001C */ lw $v1, 0x1c($v1) -/* D98848 80240FB8 AFA30028 */ sw $v1, 0x28($sp) -/* D9884C 80240FBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* D98850 80240FC0 8C630024 */ lw $v1, 0x24($v1) -/* D98854 80240FC4 AFA3002C */ sw $v1, 0x2c($sp) -/* D98858 80240FC8 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9885C 80240FCC 3C158011 */ lui $s5, %hi(gPlayerStatus) -/* D98860 80240FD0 26B5EFC8 */ addiu $s5, $s5, %lo(gPlayerStatus) -/* D98864 80240FD4 8C630028 */ lw $v1, 0x28($v1) -/* D98868 80240FD8 27B60020 */ addiu $s6, $sp, 0x20 -/* D9886C 80240FDC AFA30030 */ sw $v1, 0x30($sp) -/* D98870 80240FE0 8E4300D0 */ lw $v1, 0xd0($s2) -/* D98874 80240FE4 3C0143FA */ lui $at, 0x43fa -/* D98878 80240FE8 44810000 */ mtc1 $at, $f0 -/* D9887C 80240FEC 8C63002C */ lw $v1, 0x2c($v1) -/* D98880 80240FF0 0040A02D */ daddu $s4, $v0, $zero -/* D98884 80240FF4 E7A00038 */ swc1 $f0, 0x38($sp) -/* D98888 80240FF8 A7A0003C */ sh $zero, 0x3c($sp) -/* D9888C 80240FFC 12000019 */ beqz $s0, .L80241064 -/* D98890 80241000 AFA30034 */ sw $v1, 0x34($sp) -/* D98894 80241004 27A50040 */ addiu $a1, $sp, 0x40 -/* D98898 80241008 27A60044 */ addiu $a2, $sp, 0x44 -/* D9889C 8024100C AE600070 */ sw $zero, 0x70($s3) -/* D988A0 80241010 A620008E */ sh $zero, 0x8e($s1) -/* D988A4 80241014 8E4200B0 */ lw $v0, 0xb0($s2) -/* D988A8 80241018 3C01447A */ lui $at, 0x447a -/* D988AC 8024101C 44810000 */ mtc1 $at, $f0 -/* D988B0 80241020 34420010 */ ori $v0, $v0, 0x10 -/* D988B4 80241024 AE4200B0 */ sw $v0, 0xb0($s2) -/* D988B8 80241028 C6220038 */ lwc1 $f2, 0x38($s1) -/* D988BC 8024102C C624003C */ lwc1 $f4, 0x3c($s1) -/* D988C0 80241030 C6260040 */ lwc1 $f6, 0x40($s1) -/* D988C4 80241034 27A2004C */ addiu $v0, $sp, 0x4c -/* D988C8 80241038 E7A0004C */ swc1 $f0, 0x4c($sp) -/* D988CC 8024103C E7A20040 */ swc1 $f2, 0x40($sp) -/* D988D0 80241040 E7A40044 */ swc1 $f4, 0x44($sp) -/* D988D4 80241044 E7A60048 */ swc1 $f6, 0x48($sp) -/* D988D8 80241048 AFA20010 */ sw $v0, 0x10($sp) -/* D988DC 8024104C 8E240080 */ lw $a0, 0x80($s1) -/* D988E0 80241050 0C0372DF */ jal func_800DCB7C -/* D988E4 80241054 27A70048 */ addiu $a3, $sp, 0x48 -/* D988E8 80241058 C7A00044 */ lwc1 $f0, 0x44($sp) -/* D988EC 8024105C 4600028D */ trunc.w.s $f10, $f0 -/* D988F0 80241060 E64A0070 */ swc1 $f10, 0x70($s2) -.L80241064: -/* D988F4 80241064 8E4300B0 */ lw $v1, 0xb0($s2) -/* D988F8 80241068 30620004 */ andi $v0, $v1, 4 -/* D988FC 8024106C 10400007 */ beqz $v0, .L8024108C -/* D98900 80241070 00000000 */ nop -/* D98904 80241074 824200B4 */ lb $v0, 0xb4($s2) -/* D98908 80241078 1440018D */ bnez $v0, .L802416B0 -/* D9890C 8024107C 0000102D */ daddu $v0, $zero, $zero -/* D98910 80241080 2402FFFB */ addiu $v0, $zero, -5 -/* D98914 80241084 00621024 */ and $v0, $v1, $v0 -/* D98918 80241088 AE4200B0 */ sw $v0, 0xb0($s2) -.L8024108C: -/* D9891C 8024108C 8E630070 */ lw $v1, 0x70($s3) -/* D98920 80241090 2C620010 */ sltiu $v0, $v1, 0x10 -/* D98924 80241094 10400185 */ beqz $v0, .L802416AC -/* D98928 80241098 00031080 */ sll $v0, $v1, 2 -/* D9892C 8024109C 3C018024 */ lui $at, 0x8024 -/* D98930 802410A0 00220821 */ addu $at, $at, $v0 -/* D98934 802410A4 8C2220D0 */ lw $v0, 0x20d0($at) -/* D98938 802410A8 00400008 */ jr $v0 -/* D9893C 802410AC 00000000 */ nop -/* D98940 802410B0 8E4200CC */ lw $v0, 0xcc($s2) -/* D98944 802410B4 922300A9 */ lbu $v1, 0xa9($s1) -/* D98948 802410B8 8C440000 */ lw $a0, ($v0) -/* D9894C 802410BC 8E220000 */ lw $v0, ($s1) -/* D98950 802410C0 A22300AB */ sb $v1, 0xab($s1) -/* D98954 802410C4 34420080 */ ori $v0, $v0, 0x80 -/* D98958 802410C8 AE220000 */ sw $v0, ($s1) -/* D9895C 802410CC 24020001 */ addiu $v0, $zero, 1 -/* D98960 802410D0 AE240028 */ sw $a0, 0x28($s1) -/* D98964 802410D4 AE600074 */ sw $zero, 0x74($s3) -/* D98968 802410D8 AE620070 */ sw $v0, 0x70($s3) -/* D9896C 802410DC 8E830014 */ lw $v1, 0x14($s4) -/* D98970 802410E0 04600015 */ bltz $v1, .L80241138 -/* D98974 802410E4 00000000 */ nop -/* D98978 802410E8 8E620074 */ lw $v0, 0x74($s3) -/* D9897C 802410EC 1C400011 */ bgtz $v0, .L80241134 -/* D98980 802410F0 2442FFFF */ addiu $v0, $v0, -1 -/* D98984 802410F4 02C0202D */ daddu $a0, $s6, $zero -/* D98988 802410F8 AE630074 */ sw $v1, 0x74($s3) -/* D9898C 802410FC AFA00010 */ sw $zero, 0x10($sp) -/* D98990 80241100 8E86000C */ lw $a2, 0xc($s4) -/* D98994 80241104 8E870010 */ lw $a3, 0x10($s4) -/* D98998 80241108 0C01242D */ jal func_800490B4 -/* D9899C 8024110C 0240282D */ daddu $a1, $s2, $zero -/* D989A0 80241110 10400006 */ beqz $v0, .L8024112C -/* D989A4 80241114 0220202D */ daddu $a0, $s1, $zero -/* D989A8 80241118 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D989AC 8024111C 0C012530 */ jal func_800494C0 -/* D989B0 80241120 3C060020 */ lui $a2, 0x20 -/* D989B4 80241124 2402000A */ addiu $v0, $zero, 0xa -/* D989B8 80241128 AE620070 */ sw $v0, 0x70($s3) -.L8024112C: -/* D989BC 8024112C 8E620074 */ lw $v0, 0x74($s3) -/* D989C0 80241130 2442FFFF */ addiu $v0, $v0, -1 -.L80241134: -/* D989C4 80241134 AE620074 */ sw $v0, 0x74($s3) -.L80241138: -/* D989C8 80241138 8E630070 */ lw $v1, 0x70($s3) -/* D989CC 8024113C 2402000A */ addiu $v0, $zero, 0xa -/* D989D0 80241140 1462015B */ bne $v1, $v0, .L802416B0 -/* D989D4 80241144 0000102D */ daddu $v0, $zero, $zero -/* D989D8 80241148 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D989DC 8024114C 8E4200CC */ lw $v0, 0xcc($s2) -/* D989E0 80241150 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D989E4 80241154 8C42000C */ lw $v0, 0xc($v0) -/* D989E8 80241158 AE220028 */ sw $v0, 0x28($s1) -/* D989EC 8024115C 8EA60028 */ lw $a2, 0x28($s5) -/* D989F0 80241160 0C00A720 */ jal atan2 -/* D989F4 80241164 8EA70030 */ lw $a3, 0x30($s5) -/* D989F8 80241168 3C013FA6 */ lui $at, 0x3fa6 -/* D989FC 8024116C 34216666 */ ori $at, $at, 0x6666 -/* D98A00 80241170 44811000 */ mtc1 $at, $f2 -/* D98A04 80241174 27A50040 */ addiu $a1, $sp, 0x40 -/* D98A08 80241178 E6200010 */ swc1 $f0, 0x10($s1) -/* D98A0C 8024117C C6200038 */ lwc1 $f0, 0x38($s1) -/* D98A10 80241180 C6240040 */ lwc1 $f4, 0x40($s1) -/* D98A14 80241184 3C01447A */ lui $at, 0x447a -/* D98A18 80241188 44813000 */ mtc1 $at, $f6 -/* D98A1C 8024118C 27A60044 */ addiu $a2, $sp, 0x44 -/* D98A20 80241190 AE20001C */ sw $zero, 0x1c($s1) -/* D98A24 80241194 E6220014 */ swc1 $f2, 0x14($s1) -/* D98A28 80241198 C6880000 */ lwc1 $f8, ($s4) -/* D98A2C 8024119C C622003C */ lwc1 $f2, 0x3c($s1) -/* D98A30 802411A0 27A2004C */ addiu $v0, $sp, 0x4c -/* D98A34 802411A4 E7A00040 */ swc1 $f0, 0x40($sp) -/* D98A38 802411A8 E7A40048 */ swc1 $f4, 0x48($sp) -/* D98A3C 802411AC E7A6004C */ swc1 $f6, 0x4c($sp) -/* D98A40 802411B0 E7A20044 */ swc1 $f2, 0x44($sp) -/* D98A44 802411B4 E6280018 */ swc1 $f8, 0x18($s1) -/* D98A48 802411B8 AFA20010 */ sw $v0, 0x10($sp) -/* D98A4C 802411BC 8E240080 */ lw $a0, 0x80($s1) -/* D98A50 802411C0 0C0372DF */ jal func_800DCB7C -/* D98A54 802411C4 27A70048 */ addiu $a3, $sp, 0x48 -/* D98A58 802411C8 10400010 */ beqz $v0, .L8024120C -/* D98A5C 802411CC 00000000 */ nop -/* D98A60 802411D0 C620003C */ lwc1 $f0, 0x3c($s1) -/* D98A64 802411D4 C6440070 */ lwc1 $f4, 0x70($s2) -/* D98A68 802411D8 46802120 */ cvt.s.w $f4, $f4 -/* D98A6C 802411DC 46040001 */ sub.s $f0, $f0, $f4 -/* D98A70 802411E0 3C018024 */ lui $at, 0x8024 -/* D98A74 802411E4 D4222110 */ ldc1 $f2, 0x2110($at) -/* D98A78 802411E8 46000021 */ cvt.d.s $f0, $f0 -/* D98A7C 802411EC 46220002 */ mul.d $f0, $f0, $f2 -/* D98A80 802411F0 00000000 */ nop -/* D98A84 802411F4 460020A1 */ cvt.d.s $f2, $f4 -/* D98A88 802411F8 46201080 */ add.d $f2, $f2, $f0 -/* D98A8C 802411FC E7A40044 */ swc1 $f4, 0x44($sp) -/* D98A90 80241200 462010A0 */ cvt.s.d $f2, $f2 -/* D98A94 80241204 0809048F */ j .L8024123C -/* D98A98 80241208 E6220064 */ swc1 $f2, 0x64($s1) -.L8024120C: -/* D98A9C 8024120C C6A0002C */ lwc1 $f0, 0x2c($s5) -/* D98AA0 80241210 C622003C */ lwc1 $f2, 0x3c($s1) -/* D98AA4 80241214 46001081 */ sub.s $f2, $f2, $f0 -/* D98AA8 80241218 3C018024 */ lui $at, 0x8024 -/* D98AAC 8024121C D4242118 */ ldc1 $f4, 0x2118($at) -/* D98AB0 80241220 460010A1 */ cvt.d.s $f2, $f2 -/* D98AB4 80241224 46241082 */ mul.d $f2, $f2, $f4 -/* D98AB8 80241228 00000000 */ nop -/* D98ABC 8024122C 46000021 */ cvt.d.s $f0, $f0 -/* D98AC0 80241230 46220000 */ add.d $f0, $f0, $f2 -/* D98AC4 80241234 46200020 */ cvt.s.d $f0, $f0 -/* D98AC8 80241238 E6200064 */ swc1 $f0, 0x64($s1) -.L8024123C: -/* D98ACC 8024123C C620003C */ lwc1 $f0, 0x3c($s1) -/* D98AD0 80241240 2402000B */ addiu $v0, $zero, 0xb -/* D98AD4 80241244 E6200068 */ swc1 $f0, 0x68($s1) -/* D98AD8 80241248 AE620070 */ sw $v0, 0x70($s3) -/* D98ADC 8024124C C6200018 */ lwc1 $f0, 0x18($s1) -/* D98AE0 80241250 44801000 */ mtc1 $zero, $f2 -/* D98AE4 80241254 44801800 */ mtc1 $zero, $f3 -/* D98AE8 80241258 46000021 */ cvt.d.s $f0, $f0 -/* D98AEC 8024125C 4620103C */ c.lt.d $f2, $f0 -/* D98AF0 80241260 00000000 */ nop -/* D98AF4 80241264 45000025 */ bc1f .L802412FC -/* D98AF8 80241268 27A50040 */ addiu $a1, $sp, 0x40 -/* D98AFC 8024126C C6200038 */ lwc1 $f0, 0x38($s1) -/* D98B00 80241270 C622003C */ lwc1 $f2, 0x3c($s1) -/* D98B04 80241274 C6240040 */ lwc1 $f4, 0x40($s1) -/* D98B08 80241278 C6260018 */ lwc1 $f6, 0x18($s1) -/* D98B0C 8024127C E7A00040 */ swc1 $f0, 0x40($sp) -/* D98B10 80241280 E7A20044 */ swc1 $f2, 0x44($sp) -/* D98B14 80241284 E7A40048 */ swc1 $f4, 0x48($sp) -/* D98B18 80241288 E7A60010 */ swc1 $f6, 0x10($sp) -/* D98B1C 8024128C C620000C */ lwc1 $f0, 0xc($s1) -/* D98B20 80241290 E7A00014 */ swc1 $f0, 0x14($sp) -/* D98B24 80241294 862200A8 */ lh $v0, 0xa8($s1) -/* D98B28 80241298 44820000 */ mtc1 $v0, $f0 -/* D98B2C 8024129C 00000000 */ nop -/* D98B30 802412A0 46800020 */ cvt.s.w $f0, $f0 -/* D98B34 802412A4 E7A00018 */ swc1 $f0, 0x18($sp) -/* D98B38 802412A8 862200A6 */ lh $v0, 0xa6($s1) -/* D98B3C 802412AC 27A60044 */ addiu $a2, $sp, 0x44 -/* D98B40 802412B0 44820000 */ mtc1 $v0, $f0 -/* D98B44 802412B4 00000000 */ nop -/* D98B48 802412B8 46800020 */ cvt.s.w $f0, $f0 -/* D98B4C 802412BC E7A0001C */ swc1 $f0, 0x1c($sp) -/* D98B50 802412C0 8E240080 */ lw $a0, 0x80($s1) -/* D98B54 802412C4 0C037711 */ jal func_800DDC44 -/* D98B58 802412C8 27A70048 */ addiu $a3, $sp, 0x48 -/* D98B5C 802412CC 54400001 */ bnel $v0, $zero, .L802412D4 -/* D98B60 802412D0 AE200018 */ sw $zero, 0x18($s1) -.L802412D4: -/* D98B64 802412D4 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D98B68 802412D8 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D98B6C 802412DC 8EA60028 */ lw $a2, 0x28($s5) -/* D98B70 802412E0 0C00A720 */ jal atan2 -/* D98B74 802412E4 8EA70030 */ lw $a3, 0x30($s5) -/* D98B78 802412E8 8E250018 */ lw $a1, 0x18($s1) -/* D98B7C 802412EC 44060000 */ mfc1 $a2, $f0 -/* D98B80 802412F0 0220202D */ daddu $a0, $s1, $zero -/* D98B84 802412F4 0C00EA95 */ jal npc_move_heading -/* D98B88 802412F8 AE26000C */ sw $a2, 0xc($s1) -.L802412FC: -/* D98B8C 802412FC C620001C */ lwc1 $f0, 0x1c($s1) -/* D98B90 80241300 C6220014 */ lwc1 $f2, 0x14($s1) -/* D98B94 80241304 46020001 */ sub.s $f0, $f0, $f2 -/* D98B98 80241308 C622003C */ lwc1 $f2, 0x3c($s1) -/* D98B9C 8024130C C6240064 */ lwc1 $f4, 0x64($s1) -/* D98BA0 80241310 46001080 */ add.s $f2, $f2, $f0 -/* D98BA4 80241314 E620001C */ swc1 $f0, 0x1c($s1) -/* D98BA8 80241318 4604103C */ c.lt.s $f2, $f4 -/* D98BAC 8024131C 00000000 */ nop -/* D98BB0 80241320 450000E2 */ bc1f .L802416AC -/* D98BB4 80241324 E622003C */ swc1 $f2, 0x3c($s1) -/* D98BB8 80241328 2402000C */ addiu $v0, $zero, 0xc -/* D98BBC 8024132C E624003C */ swc1 $f4, 0x3c($s1) -/* D98BC0 80241330 AE620070 */ sw $v0, 0x70($s3) -/* D98BC4 80241334 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D98BC8 80241338 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D98BCC 8024133C 8EA60028 */ lw $a2, 0x28($s5) -/* D98BD0 80241340 0C00A7B5 */ jal dist2D -/* D98BD4 80241344 8EA70030 */ lw $a3, 0x30($s5) -/* D98BD8 80241348 3C014270 */ lui $at, 0x4270 -/* D98BDC 8024134C 44811000 */ mtc1 $at, $f2 -/* D98BE0 80241350 00000000 */ nop -/* D98BE4 80241354 4602003C */ c.lt.s $f0, $f2 -/* D98BE8 80241358 00000000 */ nop -/* D98BEC 8024135C 45000002 */ bc1f .L80241368 -/* D98BF0 80241360 E6200010 */ swc1 $f0, 0x10($s1) -/* D98BF4 80241364 E6220010 */ swc1 $f2, 0x10($s1) -.L80241368: -/* D98BF8 80241368 C6860018 */ lwc1 $f6, 0x18($s4) -/* D98BFC 8024136C C6400070 */ lwc1 $f0, 0x70($s2) -/* D98C00 80241370 46800020 */ cvt.s.w $f0, $f0 -/* D98C04 80241374 E7A00044 */ swc1 $f0, 0x44($sp) -/* D98C08 80241378 46000021 */ cvt.d.s $f0, $f0 -/* D98C0C 8024137C C6240010 */ lwc1 $f4, 0x10($s1) -/* D98C10 80241380 3C014024 */ lui $at, 0x4024 -/* D98C14 80241384 44811800 */ mtc1 $at, $f3 -/* D98C18 80241388 44801000 */ mtc1 $zero, $f2 -/* D98C1C 8024138C 46062103 */ div.s $f4, $f4, $f6 -/* D98C20 80241390 46220000 */ add.d $f0, $f0, $f2 -/* D98C24 80241394 C622003C */ lwc1 $f2, 0x3c($s1) -/* D98C28 80241398 4600228D */ trunc.w.s $f10, $f4 -/* D98C2C 8024139C 44025000 */ mfc1 $v0, $f10 -/* D98C30 802413A0 00000000 */ nop -/* D98C34 802413A4 A622008E */ sh $v0, 0x8e($s1) -/* D98C38 802413A8 460010A1 */ cvt.d.s $f2, $f2 -/* D98C3C 802413AC 46220001 */ sub.d $f0, $f0, $f2 -/* D98C40 802413B0 00021400 */ sll $v0, $v0, 0x10 -/* D98C44 802413B4 E6260018 */ swc1 $f6, 0x18($s1) -/* D98C48 802413B8 14400003 */ bnez $v0, .L802413C8 -/* D98C4C 802413BC 46200120 */ cvt.s.d $f4, $f0 -/* D98C50 802413C0 24020001 */ addiu $v0, $zero, 1 -/* D98C54 802413C4 A622008E */ sh $v0, 0x8e($s1) -.L802413C8: -/* D98C58 802413C8 8622008E */ lh $v0, 0x8e($s1) -/* D98C5C 802413CC C620001C */ lwc1 $f0, 0x1c($s1) -/* D98C60 802413D0 44821000 */ mtc1 $v0, $f2 -/* D98C64 802413D4 00000000 */ nop -/* D98C68 802413D8 468010A0 */ cvt.s.w $f2, $f2 -/* D98C6C 802413DC 46000007 */ neg.s $f0, $f0 -/* D98C70 802413E0 46020002 */ mul.s $f0, $f0, $f2 -/* D98C74 802413E4 00000000 */ nop -/* D98C78 802413E8 00420018 */ mult $v0, $v0 -/* D98C7C 802413EC 8E230000 */ lw $v1, ($s1) -/* D98C80 802413F0 46040000 */ add.s $f0, $f0, $f4 -/* D98C84 802413F4 A22000AB */ sb $zero, 0xab($s1) -/* D98C88 802413F8 2402FF7F */ addiu $v0, $zero, -0x81 -/* D98C8C 802413FC 00004012 */ mflo $t0 -/* D98C90 80241400 00621824 */ and $v1, $v1, $v0 -/* D98C94 80241404 24020005 */ addiu $v0, $zero, 5 -/* D98C98 80241408 46000000 */ add.s $f0, $f0, $f0 -/* D98C9C 8024140C AE230000 */ sw $v1, ($s1) -/* D98CA0 80241410 44881000 */ mtc1 $t0, $f2 -/* D98CA4 80241414 00000000 */ nop -/* D98CA8 80241418 468010A0 */ cvt.s.w $f2, $f2 -/* D98CAC 8024141C 46000007 */ neg.s $f0, $f0 -/* D98CB0 80241420 46020003 */ div.s $f0, $f0, $f2 -/* D98CB4 80241424 46000005 */ abs.s $f0, $f0 -/* D98CB8 80241428 46000007 */ neg.s $f0, $f0 -/* D98CBC 8024142C E6200014 */ swc1 $f0, 0x14($s1) -/* D98CC0 80241430 AE42006C */ sw $v0, 0x6c($s2) -/* D98CC4 80241434 2402000D */ addiu $v0, $zero, 0xd -/* D98CC8 80241438 A620008E */ sh $zero, 0x8e($s1) -/* D98CCC 8024143C AE620070 */ sw $v0, 0x70($s3) -/* D98CD0 80241440 C620001C */ lwc1 $f0, 0x1c($s1) -/* D98CD4 80241444 C6220014 */ lwc1 $f2, 0x14($s1) -/* D98CD8 80241448 46020001 */ sub.s $f0, $f0, $f2 -/* D98CDC 8024144C 4480A000 */ mtc1 $zero, $f20 -/* D98CE0 80241450 00000000 */ nop -/* D98CE4 80241454 4614003C */ c.lt.s $f0, $f20 -/* D98CE8 80241458 00000000 */ nop -/* D98CEC 8024145C 45000012 */ bc1f .L802414A8 -/* D98CF0 80241460 E620001C */ swc1 $f0, 0x1c($s1) -/* D98CF4 80241464 27A50040 */ addiu $a1, $sp, 0x40 -/* D98CF8 80241468 27A60044 */ addiu $a2, $sp, 0x44 -/* D98CFC 8024146C 27A2004C */ addiu $v0, $sp, 0x4c -/* D98D00 80241470 C6220038 */ lwc1 $f2, 0x38($s1) -/* D98D04 80241474 C624003C */ lwc1 $f4, 0x3c($s1) -/* D98D08 80241478 C6260040 */ lwc1 $f6, 0x40($s1) -/* D98D0C 8024147C 46000007 */ neg.s $f0, $f0 -/* D98D10 80241480 E7A0004C */ swc1 $f0, 0x4c($sp) -/* D98D14 80241484 E7A20040 */ swc1 $f2, 0x40($sp) -/* D98D18 80241488 E7A40044 */ swc1 $f4, 0x44($sp) -/* D98D1C 8024148C E7A60048 */ swc1 $f6, 0x48($sp) -/* D98D20 80241490 AFA20010 */ sw $v0, 0x10($sp) -/* D98D24 80241494 8E240080 */ lw $a0, 0x80($s1) -/* D98D28 80241498 0C0372DF */ jal func_800DCB7C -/* D98D2C 8024149C 27A70048 */ addiu $a3, $sp, 0x48 -/* D98D30 802414A0 54400001 */ bnel $v0, $zero, .L802414A8 -/* D98D34 802414A4 E634001C */ swc1 $f20, 0x1c($s1) -.L802414A8: -/* D98D38 802414A8 C624003C */ lwc1 $f4, 0x3c($s1) -/* D98D3C 802414AC C620001C */ lwc1 $f0, 0x1c($s1) -/* D98D40 802414B0 46002100 */ add.s $f4, $f4, $f0 -/* D98D44 802414B4 C6200018 */ lwc1 $f0, 0x18($s1) -/* D98D48 802414B8 44801000 */ mtc1 $zero, $f2 -/* D98D4C 802414BC 44801800 */ mtc1 $zero, $f3 -/* D98D50 802414C0 46000021 */ cvt.d.s $f0, $f0 -/* D98D54 802414C4 4620103C */ c.lt.d $f2, $f0 -/* D98D58 802414C8 00000000 */ nop -/* D98D5C 802414CC 45000057 */ bc1f .L8024162C -/* D98D60 802414D0 E624003C */ swc1 $f4, 0x3c($s1) -/* D98D64 802414D4 46002086 */ mov.s $f2, $f4 -/* D98D68 802414D8 C6200038 */ lwc1 $f0, 0x38($s1) -/* D98D6C 802414DC C6240040 */ lwc1 $f4, 0x40($s1) -/* D98D70 802414E0 C6260018 */ lwc1 $f6, 0x18($s1) -/* D98D74 802414E4 E7A20044 */ swc1 $f2, 0x44($sp) -/* D98D78 802414E8 E7A00040 */ swc1 $f0, 0x40($sp) -/* D98D7C 802414EC E7A40048 */ swc1 $f4, 0x48($sp) -/* D98D80 802414F0 E7A60010 */ swc1 $f6, 0x10($sp) -/* D98D84 802414F4 C620000C */ lwc1 $f0, 0xc($s1) -/* D98D88 802414F8 E7A00014 */ swc1 $f0, 0x14($sp) -/* D98D8C 802414FC 862200A8 */ lh $v0, 0xa8($s1) -/* D98D90 80241500 27A50040 */ addiu $a1, $sp, 0x40 -/* D98D94 80241504 44820000 */ mtc1 $v0, $f0 -/* D98D98 80241508 00000000 */ nop -/* D98D9C 8024150C 46800020 */ cvt.s.w $f0, $f0 -/* D98DA0 80241510 E7A00018 */ swc1 $f0, 0x18($sp) -/* D98DA4 80241514 862200A6 */ lh $v0, 0xa6($s1) -/* D98DA8 80241518 27A60044 */ addiu $a2, $sp, 0x44 -/* D98DAC 8024151C 44820000 */ mtc1 $v0, $f0 -/* D98DB0 80241520 00000000 */ nop -/* D98DB4 80241524 46800020 */ cvt.s.w $f0, $f0 -/* D98DB8 80241528 E7A0001C */ swc1 $f0, 0x1c($sp) -/* D98DBC 8024152C 8E240080 */ lw $a0, 0x80($s1) -/* D98DC0 80241530 0C037711 */ jal func_800DDC44 -/* D98DC4 80241534 27A70048 */ addiu $a3, $sp, 0x48 -/* D98DC8 80241538 10400003 */ beqz $v0, .L80241548 -/* D98DCC 8024153C 00000000 */ nop -/* D98DD0 80241540 08090587 */ j .L8024161C -/* D98DD4 80241544 AE200018 */ sw $zero, 0x18($s1) -.L80241548: -/* D98DD8 80241548 C620001C */ lwc1 $f0, 0x1c($s1) -/* D98DDC 8024154C 3C01C004 */ lui $at, 0xc004 -/* D98DE0 80241550 44811800 */ mtc1 $at, $f3 -/* D98DE4 80241554 44801000 */ mtc1 $zero, $f2 -/* D98DE8 80241558 46000021 */ cvt.d.s $f0, $f0 -/* D98DEC 8024155C 4622003C */ c.lt.d $f0, $f2 -/* D98DF0 80241560 00000000 */ nop -/* D98DF4 80241564 4500002D */ bc1f .L8024161C -/* D98DF8 80241568 00000000 */ nop -/* D98DFC 8024156C 9622008E */ lhu $v0, 0x8e($s1) -/* D98E00 80241570 24420001 */ addiu $v0, $v0, 1 -/* D98E04 80241574 A622008E */ sh $v0, 0x8e($s1) -/* D98E08 80241578 00021400 */ sll $v0, $v0, 0x10 -/* D98E0C 8024157C 8E830020 */ lw $v1, 0x20($s4) -/* D98E10 80241580 00021403 */ sra $v0, $v0, 0x10 -/* D98E14 80241584 0043102A */ slt $v0, $v0, $v1 -/* D98E18 80241588 14400024 */ bnez $v0, .L8024161C -/* D98E1C 8024158C 00000000 */ nop -/* D98E20 80241590 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D98E24 80241594 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D98E28 80241598 8EA60028 */ lw $a2, 0x28($s5) -/* D98E2C 8024159C 0C00A720 */ jal atan2 -/* D98E30 802415A0 8EA70030 */ lw $a3, 0x30($s5) -/* D98E34 802415A4 46000506 */ mov.s $f20, $f0 -/* D98E38 802415A8 C62C000C */ lwc1 $f12, 0xc($s1) -/* D98E3C 802415AC 0C00A70A */ jal get_clamped_angle_diff -/* D98E40 802415B0 4600A386 */ mov.s $f14, $f20 -/* D98E44 802415B4 46000086 */ mov.s $f2, $f0 -/* D98E48 802415B8 8E82001C */ lw $v0, 0x1c($s4) -/* D98E4C 802415BC 46001005 */ abs.s $f0, $f2 -/* D98E50 802415C0 44822000 */ mtc1 $v0, $f4 -/* D98E54 802415C4 00000000 */ nop -/* D98E58 802415C8 46802120 */ cvt.s.w $f4, $f4 -/* D98E5C 802415CC 4600203C */ c.lt.s $f4, $f0 -/* D98E60 802415D0 00000000 */ nop -/* D98E64 802415D4 4500000D */ bc1f .L8024160C -/* D98E68 802415D8 00000000 */ nop -/* D98E6C 802415DC 44800000 */ mtc1 $zero, $f0 -/* D98E70 802415E0 C634000C */ lwc1 $f20, 0xc($s1) -/* D98E74 802415E4 4600103C */ c.lt.s $f2, $f0 -/* D98E78 802415E8 00000000 */ nop -/* D98E7C 802415EC 45000006 */ bc1f .L80241608 -/* D98E80 802415F0 00021023 */ negu $v0, $v0 -/* D98E84 802415F4 44820000 */ mtc1 $v0, $f0 -/* D98E88 802415F8 00000000 */ nop -/* D98E8C 802415FC 46800020 */ cvt.s.w $f0, $f0 -/* D98E90 80241600 08090583 */ j .L8024160C -/* D98E94 80241604 4600A500 */ add.s $f20, $f20, $f0 -.L80241608: -/* D98E98 80241608 4604A500 */ add.s $f20, $f20, $f4 -.L8024160C: -/* D98E9C 8024160C 0C00A6C9 */ jal clamp_angle -/* D98EA0 80241610 4600A306 */ mov.s $f12, $f20 -/* D98EA4 80241614 E620000C */ swc1 $f0, 0xc($s1) -/* D98EA8 80241618 A620008E */ sh $zero, 0x8e($s1) -.L8024161C: -/* D98EAC 8024161C 8E250018 */ lw $a1, 0x18($s1) -/* D98EB0 80241620 8E26000C */ lw $a2, 0xc($s1) -/* D98EB4 80241624 0C00EA95 */ jal npc_move_heading -/* D98EB8 80241628 0220202D */ daddu $a0, $s1, $zero -.L8024162C: -/* D98EBC 8024162C 8E42006C */ lw $v0, 0x6c($s2) -/* D98EC0 80241630 2442FFFF */ addiu $v0, $v0, -1 -/* D98EC4 80241634 1C400003 */ bgtz $v0, .L80241644 -/* D98EC8 80241638 AE42006C */ sw $v0, 0x6c($s2) -/* D98ECC 8024163C 24020005 */ addiu $v0, $zero, 5 -/* D98ED0 80241640 AE42006C */ sw $v0, 0x6c($s2) -.L80241644: -/* D98ED4 80241644 C620003C */ lwc1 $f0, 0x3c($s1) -/* D98ED8 80241648 C6220068 */ lwc1 $f2, 0x68($s1) -/* D98EDC 8024164C 4600103C */ c.lt.s $f2, $f0 -/* D98EE0 80241650 00000000 */ nop -/* D98EE4 80241654 45000015 */ bc1f .L802416AC -/* D98EE8 80241658 2402000E */ addiu $v0, $zero, 0xe -/* D98EEC 8024165C E622003C */ swc1 $f2, 0x3c($s1) -/* D98EF0 80241660 AE620070 */ sw $v0, 0x70($s3) -/* D98EF4 80241664 8E4200CC */ lw $v0, 0xcc($s2) -/* D98EF8 80241668 922300A9 */ lbu $v1, 0xa9($s1) -/* D98EFC 8024166C 8C440020 */ lw $a0, 0x20($v0) -/* D98F00 80241670 8E220000 */ lw $v0, ($s1) -/* D98F04 80241674 A22300AB */ sb $v1, 0xab($s1) -/* D98F08 80241678 34420080 */ ori $v0, $v0, 0x80 -/* D98F0C 8024167C AE220000 */ sw $v0, ($s1) -/* D98F10 80241680 2402000F */ addiu $v0, $zero, 0xf -/* D98F14 80241684 A622008E */ sh $v0, 0x8e($s1) -/* D98F18 80241688 2402000F */ addiu $v0, $zero, 0xf -/* D98F1C 8024168C AE240028 */ sw $a0, 0x28($s1) -/* D98F20 80241690 AE620070 */ sw $v0, 0x70($s3) -/* D98F24 80241694 9622008E */ lhu $v0, 0x8e($s1) -/* D98F28 80241698 2442FFFF */ addiu $v0, $v0, -1 -/* D98F2C 8024169C A622008E */ sh $v0, 0x8e($s1) -/* D98F30 802416A0 00021400 */ sll $v0, $v0, 0x10 -/* D98F34 802416A4 58400001 */ blezl $v0, .L802416AC -/* D98F38 802416A8 AE600070 */ sw $zero, 0x70($s3) -.L802416AC: -/* D98F3C 802416AC 0000102D */ daddu $v0, $zero, $zero -.L802416B0: -/* D98F40 802416B0 8FBF006C */ lw $ra, 0x6c($sp) -/* D98F44 802416B4 8FB60068 */ lw $s6, 0x68($sp) -/* D98F48 802416B8 8FB50064 */ lw $s5, 0x64($sp) -/* D98F4C 802416BC 8FB40060 */ lw $s4, 0x60($sp) -/* D98F50 802416C0 8FB3005C */ lw $s3, 0x5c($sp) -/* D98F54 802416C4 8FB20058 */ lw $s2, 0x58($sp) -/* D98F58 802416C8 8FB10054 */ lw $s1, 0x54($sp) -/* D98F5C 802416CC 8FB00050 */ lw $s0, 0x50($sp) -/* D98F60 802416D0 D7B40070 */ ldc1 $f20, 0x70($sp) -/* D98F64 802416D4 03E00008 */ jr $ra -/* D98F68 802416D8 27BD0078 */ addiu $sp, $sp, 0x78 -/* D98F6C 802416DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_40/func_80240020_D999B0.s b/asm/nonmatchings/world/area_pra/pra_40/func_80240020_D999B0.s deleted file mode 100644 index dbc6d0a3d0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/func_80240020_D999B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D999D0 -/* D999D0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D999D4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D999D8 80240028 00822024 */ and $a0, $a0, $v0 -/* D999DC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D999E0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D999E4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D999E8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D999EC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D999F0 80240040 30620001 */ andi $v0, $v1, 1 -/* D999F4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D999F8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D999FC 8024004C 03E00008 */ jr $ra -/* D99A00 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_40/func_80240054_D999B0.s b/asm/nonmatchings/world/area_pra/pra_40/func_80240054_D999B0.s deleted file mode 100644 index fb3432309e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/func_80240054_D999B0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054_D99A04 -/* D99A04 80240054 00041403 */ sra $v0, $a0, 0x10 -/* D99A08 80240058 304300FF */ andi $v1, $v0, 0xff -/* D99A0C 8024005C 24020006 */ addiu $v0, $zero, 6 -/* D99A10 80240060 10620015 */ beq $v1, $v0, .L802400B8 -/* D99A14 80240064 28620007 */ slti $v0, $v1, 7 -/* D99A18 80240068 10400005 */ beqz $v0, .L80240080 -/* D99A1C 8024006C 24020001 */ addiu $v0, $zero, 1 -/* D99A20 80240070 1062000A */ beq $v1, $v0, .L8024009C -/* D99A24 80240074 3C020100 */ lui $v0, 0x100 -/* D99A28 80240078 03E00008 */ jr $ra -/* D99A2C 8024007C 00821025 */ or $v0, $a0, $v0 -.L80240080: -/* D99A30 80240080 2862000A */ slti $v0, $v1, 0xa -/* D99A34 80240084 10400016 */ beqz $v0, .L802400E0 -/* D99A38 80240088 28620008 */ slti $v0, $v1, 8 -/* D99A3C 8024008C 14400015 */ bnez $v0, .L802400E4 -/* D99A40 80240090 3C020100 */ lui $v0, 0x100 -/* D99A44 80240094 03E00008 */ jr $ra -/* D99A48 80240098 0080102D */ daddu $v0, $a0, $zero -.L8024009C: -/* D99A4C 8024009C 3C020001 */ lui $v0, 1 -/* D99A50 802400A0 3442000C */ ori $v0, $v0, 0xc -/* D99A54 802400A4 0044102A */ slt $v0, $v0, $a0 -/* D99A58 802400A8 1040000E */ beqz $v0, .L802400E4 -/* D99A5C 802400AC 3C020100 */ lui $v0, 0x100 -.L802400B0: -/* D99A60 802400B0 03E00008 */ jr $ra -/* D99A64 802400B4 0080102D */ daddu $v0, $a0, $zero -.L802400B8: -/* D99A68 802400B8 3C02FFF9 */ lui $v0, 0xfff9 -/* D99A6C 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D99A70 802400C0 00821821 */ addu $v1, $a0, $v0 -/* D99A74 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D99A78 802400C8 10400005 */ beqz $v0, .L802400E0 -/* D99A7C 802400CC 30620001 */ andi $v0, $v1, 1 -/* D99A80 802400D0 1440FFF7 */ bnez $v0, .L802400B0 -/* D99A84 802400D4 24820001 */ addiu $v0, $a0, 1 -/* D99A88 802400D8 03E00008 */ jr $ra -/* D99A8C 802400DC 00000000 */ nop -.L802400E0: -/* D99A90 802400E0 3C020100 */ lui $v0, 0x100 -.L802400E4: -/* D99A94 802400E4 03E00008 */ jr $ra -/* D99A98 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_40/func_802400EC_D999B0.s b/asm/nonmatchings/world/area_pra/pra_40/func_802400EC_D999B0.s deleted file mode 100644 index 8dbca5517d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/func_802400EC_D999B0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_D99A9C -/* D99A9C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D99AA0 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* D99AA4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D99AA8 802400F8 3C058024 */ lui $a1, 0x8024 -/* D99AAC 802400FC 24A50128 */ addiu $a1, $a1, 0x128 -/* D99AB0 80240100 AFBF0014 */ sw $ra, 0x14($sp) -/* D99AB4 80240104 0C048C56 */ jal bind_dynamic_entity_3 -/* D99AB8 80240108 0000202D */ daddu $a0, $zero, $zero -/* D99ABC 8024010C 8E03013C */ lw $v1, 0x13c($s0) -/* D99AC0 80240110 AC620000 */ sw $v0, ($v1) -/* D99AC4 80240114 8FBF0014 */ lw $ra, 0x14($sp) -/* D99AC8 80240118 8FB00010 */ lw $s0, 0x10($sp) -/* D99ACC 8024011C 24020002 */ addiu $v0, $zero, 2 -/* D99AD0 80240120 03E00008 */ jr $ra -/* D99AD4 80240124 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_40/func_80240128_D999B0.s b/asm/nonmatchings/world/area_pra/pra_40/func_80240128_D999B0.s deleted file mode 100644 index 4f73fffffb..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/func_80240128_D999B0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240128_D99AD8 -/* D99AD8 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D99ADC 8024012C AFB00040 */ sw $s0, 0x40($sp) -/* D99AE0 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D99AE4 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D99AE8 80240138 AFB20048 */ sw $s2, 0x48($sp) -/* D99AEC 8024013C AFBF004C */ sw $ra, 0x4c($sp) -/* D99AF0 80240140 AFB10044 */ sw $s1, 0x44($sp) -/* D99AF4 80240144 8E020000 */ lw $v0, ($s0) -/* D99AF8 80240148 821100BE */ lb $s1, 0xbe($s0) -/* D99AFC 8024014C 30420001 */ andi $v0, $v0, 1 -/* D99B00 80240150 10400061 */ beqz $v0, .L802402D8 -/* D99B04 80240154 27B20020 */ addiu $s2, $sp, 0x20 -/* D99B08 80240158 8E0400CC */ lw $a0, 0xcc($s0) -/* D99B0C 8024015C 0C044181 */ jal get_shadow_by_index -/* D99B10 80240160 00000000 */ nop -/* D99B14 80240164 0C048B77 */ jal func_80122DDC -/* D99B18 80240168 84440008 */ lh $a0, 8($v0) -/* D99B1C 8024016C 8C430000 */ lw $v1, ($v0) -/* D99B20 80240170 34630200 */ ori $v1, $v1, 0x200 -/* D99B24 80240174 AC430000 */ sw $v1, ($v0) -/* D99B28 80240178 8E050028 */ lw $a1, 0x28($s0) -/* D99B2C 8024017C 8E06002C */ lw $a2, 0x2c($s0) -/* D99B30 80240180 27A20030 */ addiu $v0, $sp, 0x30 -/* D99B34 80240184 AFA20010 */ sw $v0, 0x10($sp) -/* D99B38 80240188 27A20034 */ addiu $v0, $sp, 0x34 -/* D99B3C 8024018C AFA20014 */ sw $v0, 0x14($sp) -/* D99B40 80240190 C6000030 */ lwc1 $f0, 0x30($s0) -/* D99B44 80240194 3C04800A */ lui $a0, 0x800a -/* D99B48 80240198 8484A634 */ lh $a0, -0x59cc($a0) -/* D99B4C 8024019C 46000007 */ neg.s $f0, $f0 -/* D99B50 802401A0 44070000 */ mfc1 $a3, $f0 -/* D99B54 802401A4 27A20038 */ addiu $v0, $sp, 0x38 -/* D99B58 802401A8 0C00B94E */ jal get_screen_coords -/* D99B5C 802401AC AFA20018 */ sw $v0, 0x18($sp) -/* D99B60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D99B64 802401B4 0C090008 */ jal func_80240020 -/* D99B68 802401B8 00000000 */ nop -/* D99B6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) -/* D99B70 802401C0 3C014307 */ lui $at, 0x4307 -/* D99B74 802401C4 44810000 */ mtc1 $at, $f0 -/* D99B78 802401C8 00000000 */ nop -/* D99B7C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D99B80 802401D0 00000000 */ nop -/* D99B84 802401D4 4500000B */ bc1f .L80240204 -/* D99B88 802401D8 24040002 */ addiu $a0, $zero, 2 -/* D99B8C 802401DC 3C014361 */ lui $at, 0x4361 -/* D99B90 802401E0 44810000 */ mtc1 $at, $f0 -/* D99B94 802401E4 00000000 */ nop -/* D99B98 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D99B9C 802401EC 00000000 */ nop -/* D99BA0 802401F0 45000004 */ bc1f .L80240204 -/* D99BA4 802401F4 00000000 */ nop -/* D99BA8 802401F8 0C090015 */ jal func_80240054 -/* D99BAC 802401FC 0040202D */ daddu $a0, $v0, $zero -/* D99BB0 80240200 24040002 */ addiu $a0, $zero, 2 -.L80240204: -/* D99BB4 80240204 3C063F80 */ lui $a2, 0x3f80 -/* D99BB8 80240208 0C0B76A3 */ jal func_802DDA8C -/* D99BBC 8024020C 0040282D */ daddu $a1, $v0, $zero -/* D99BC0 80240210 8E020000 */ lw $v0, ($s0) -/* D99BC4 80240214 3C030002 */ lui $v1, 2 -/* D99BC8 80240218 00431024 */ and $v0, $v0, $v1 -/* D99BCC 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 -/* D99BD0 80240220 24110011 */ addiu $s1, $zero, 0x11 -/* D99BD4 80240224 9203000E */ lbu $v1, 0xe($s0) -/* D99BD8 80240228 3C02802E */ lui $v0, 0x802e -/* D99BDC 8024022C 90429D70 */ lbu $v0, -0x6290($v0) -/* D99BE0 80240230 10620018 */ beq $v1, $v0, .L80240294 -/* D99BE4 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D99BE8 80240238 1040000B */ beqz $v0, .L80240268 -/* D99BEC 8024023C 24110011 */ addiu $s1, $zero, 0x11 -/* D99BF0 80240240 24040002 */ addiu $a0, $zero, 2 -/* D99BF4 80240244 2405FFFF */ addiu $a1, $zero, -1 -/* D99BF8 80240248 24060007 */ addiu $a2, $zero, 7 -/* D99BFC 8024024C 0060102D */ daddu $v0, $v1, $zero -/* D99C00 80240250 0000382D */ daddu $a3, $zero, $zero -/* D99C04 80240254 AFA00010 */ sw $zero, 0x10($sp) -/* D99C08 80240258 AFA00014 */ sw $zero, 0x14($sp) -/* D99C0C 8024025C AFA0001C */ sw $zero, 0x1c($sp) -/* D99C10 80240260 080900A3 */ j .L8024028C -/* D99C14 80240264 AFA20018 */ sw $v0, 0x18($sp) -.L80240268: -/* D99C18 80240268 2411000D */ addiu $s1, $zero, 0xd -/* D99C1C 8024026C 24040002 */ addiu $a0, $zero, 2 -/* D99C20 80240270 2405FFFF */ addiu $a1, $zero, -1 -/* D99C24 80240274 0000302D */ daddu $a2, $zero, $zero -/* D99C28 80240278 00C0382D */ daddu $a3, $a2, $zero -/* D99C2C 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* D99C30 80240280 AFA00014 */ sw $zero, 0x14($sp) -/* D99C34 80240284 AFA00018 */ sw $zero, 0x18($sp) -/* D99C38 80240288 AFA0001C */ sw $zero, 0x1c($sp) -.L8024028C: -/* D99C3C 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D99C40 80240290 00000000 */ nop -.L80240294: -/* D99C44 80240294 9202000E */ lbu $v0, 0xe($s0) -/* D99C48 80240298 3C01802E */ lui $at, 0x802e -/* D99C4C 8024029C A0229D70 */ sb $v0, -0x6290($at) -/* D99C50 802402A0 080900AD */ j .L802402B4 -/* D99C54 802402A4 0240202D */ daddu $a0, $s2, $zero -.L802402A8: -/* D99C58 802402A8 3C01802E */ lui $at, 0x802e -/* D99C5C 802402AC A0209D70 */ sb $zero, -0x6290($at) -/* D99C60 802402B0 0240202D */ daddu $a0, $s2, $zero -.L802402B4: -/* D99C64 802402B4 AC910000 */ sw $s1, ($a0) -/* D99C68 802402B8 AC900008 */ sw $s0, 8($a0) -/* D99C6C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D99C70 802402C0 3C038024 */ lui $v1, 0x8024 -/* D99C74 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 -/* D99C78 802402C8 AC83000C */ sw $v1, 0xc($a0) -/* D99C7C 802402CC 00021023 */ negu $v0, $v0 -/* D99C80 802402D0 0C047644 */ jal queue_render_task -/* D99C84 802402D4 AC820004 */ sw $v0, 4($a0) -.L802402D8: -/* D99C88 802402D8 8FBF004C */ lw $ra, 0x4c($sp) -/* D99C8C 802402DC 8FB20048 */ lw $s2, 0x48($sp) -/* D99C90 802402E0 8FB10044 */ lw $s1, 0x44($sp) -/* D99C94 802402E4 8FB00040 */ lw $s0, 0x40($sp) -/* D99C98 802402E8 03E00008 */ jr $ra -/* D99C9C 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_40/func_802402F0_D999B0.s b/asm/nonmatchings/world/area_pra/pra_40/func_802402F0_D999B0.s deleted file mode 100644 index 139c4df6ce..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/func_802402F0_D999B0.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D99CA0 -/* D99CA0 802402F0 3C03800A */ lui $v1, 0x800a -/* D99CA4 802402F4 8463A634 */ lh $v1, -0x59cc($v1) -/* D99CA8 802402F8 3C07BF80 */ lui $a3, 0xbf80 -/* D99CAC 802402FC 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D99CB0 80240300 F7B40128 */ sdc1 $f20, 0x128($sp) -/* D99CB4 80240304 4480A000 */ mtc1 $zero, $f20 -/* D99CB8 80240308 AFB1011C */ sw $s1, 0x11c($sp) -/* D99CBC 8024030C 0080882D */ daddu $s1, $a0, $zero -/* D99CC0 80240310 AFB00118 */ sw $s0, 0x118($sp) -/* D99CC4 80240314 27B00098 */ addiu $s0, $sp, 0x98 -/* D99CC8 80240318 AFBF0120 */ sw $ra, 0x120($sp) -/* D99CCC 8024031C F7B80138 */ sdc1 $f24, 0x138($sp) -/* D99CD0 80240320 F7B60130 */ sdc1 $f22, 0x130($sp) -/* D99CD4 80240324 00031080 */ sll $v0, $v1, 2 -/* D99CD8 80240328 00431021 */ addu $v0, $v0, $v1 -/* D99CDC 8024032C 00021080 */ sll $v0, $v0, 2 -/* D99CE0 80240330 00431023 */ subu $v0, $v0, $v1 -/* D99CE4 80240334 000218C0 */ sll $v1, $v0, 3 -/* D99CE8 80240338 00431021 */ addu $v0, $v0, $v1 -/* D99CEC 8024033C 000210C0 */ sll $v0, $v0, 3 -/* D99CF0 80240340 3C01800B */ lui $at, 0x800b -/* D99CF4 80240344 00220821 */ addu $at, $at, $v0 -/* D99CF8 80240348 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D99CFC 8024034C 4406A000 */ mfc1 $a2, $f20 -/* D99D00 80240350 4600B587 */ neg.s $f22, $f22 -/* D99D04 80240354 4405B000 */ mfc1 $a1, $f22 -/* D99D08 80240358 0200202D */ daddu $a0, $s0, $zero -/* D99D0C 8024035C 0C019EC8 */ jal guRotateF -/* D99D10 80240360 E7B40010 */ swc1 $f20, 0x10($sp) -/* D99D14 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D99D18 80240368 0C00A6C9 */ jal clamp_angle -/* D99D1C 8024036C 00000000 */ nop -/* D99D20 80240370 44050000 */ mfc1 $a1, $f0 -/* D99D24 80240374 4406A000 */ mfc1 $a2, $f20 -/* D99D28 80240378 4407A000 */ mfc1 $a3, $f20 -/* D99D2C 8024037C 3C013F80 */ lui $at, 0x3f80 -/* D99D30 80240380 4481C000 */ mtc1 $at, $f24 -/* D99D34 80240384 27A40018 */ addiu $a0, $sp, 0x18 -/* D99D38 80240388 0C019EC8 */ jal guRotateF -/* D99D3C 8024038C E7B80010 */ swc1 $f24, 0x10($sp) -/* D99D40 80240390 0200202D */ daddu $a0, $s0, $zero -/* D99D44 80240394 27A50018 */ addiu $a1, $sp, 0x18 -/* D99D48 80240398 0C019D80 */ jal guMtxCatF -/* D99D4C 8024039C 00A0302D */ daddu $a2, $a1, $zero -/* D99D50 802403A0 4405B000 */ mfc1 $a1, $f22 -/* D99D54 802403A4 4406A000 */ mfc1 $a2, $f20 -/* D99D58 802403A8 4407C000 */ mfc1 $a3, $f24 -/* D99D5C 802403AC 0200202D */ daddu $a0, $s0, $zero -/* D99D60 802403B0 0C019EC8 */ jal guRotateF -/* D99D64 802403B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D99D68 802403B8 27A40018 */ addiu $a0, $sp, 0x18 -/* D99D6C 802403BC 0200282D */ daddu $a1, $s0, $zero -/* D99D70 802403C0 0C019D80 */ jal guMtxCatF -/* D99D74 802403C4 0080302D */ daddu $a2, $a0, $zero -/* D99D78 802403C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* D99D7C 802403CC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D99D80 802403D0 4406A000 */ mfc1 $a2, $f20 -/* D99D84 802403D4 4407C000 */ mfc1 $a3, $f24 -/* D99D88 802403D8 0C019EC8 */ jal guRotateF -/* D99D8C 802403DC 0200202D */ daddu $a0, $s0, $zero -/* D99D90 802403E0 27A40018 */ addiu $a0, $sp, 0x18 -/* D99D94 802403E4 0200282D */ daddu $a1, $s0, $zero -/* D99D98 802403E8 0C019D80 */ jal guMtxCatF -/* D99D9C 802403EC 0080302D */ daddu $a2, $a0, $zero -/* D99DA0 802403F0 3C013F36 */ lui $at, 0x3f36 -/* D99DA4 802403F4 3421DB6E */ ori $at, $at, 0xdb6e -/* D99DA8 802403F8 44810000 */ mtc1 $at, $f0 -/* D99DAC 802403FC 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D99DB0 80240400 44050000 */ mfc1 $a1, $f0 -/* D99DB4 80240404 0200202D */ daddu $a0, $s0, $zero -/* D99DB8 80240408 00A0302D */ daddu $a2, $a1, $zero -/* D99DBC 8024040C 0C019DF0 */ jal guScaleF -/* D99DC0 80240410 00A0382D */ daddu $a3, $a1, $zero -/* D99DC4 80240414 27A40018 */ addiu $a0, $sp, 0x18 -/* D99DC8 80240418 0200282D */ daddu $a1, $s0, $zero -/* D99DCC 8024041C 0C019D80 */ jal guMtxCatF -/* D99DD0 80240420 0080302D */ daddu $a2, $a0, $zero -/* D99DD4 80240424 27B00058 */ addiu $s0, $sp, 0x58 -/* D99DD8 80240428 C6200030 */ lwc1 $f0, 0x30($s1) -/* D99DDC 8024042C 3C014040 */ lui $at, 0x4040 -/* D99DE0 80240430 44811000 */ mtc1 $at, $f2 -/* D99DE4 80240434 46000007 */ neg.s $f0, $f0 -/* D99DE8 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* D99DEC 8024043C 8E250028 */ lw $a1, 0x28($s1) -/* D99DF0 80240440 8E26002C */ lw $a2, 0x2c($s1) -/* D99DF4 80240444 44070000 */ mfc1 $a3, $f0 -/* D99DF8 80240448 0C019E40 */ jal guTranslateF -/* D99DFC 8024044C 0200202D */ daddu $a0, $s0, $zero -/* D99E00 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* D99E04 80240454 0200282D */ daddu $a1, $s0, $zero -/* D99E08 80240458 0C019D80 */ jal guMtxCatF -/* D99E0C 8024045C 0080302D */ daddu $a2, $a0, $zero -/* D99E10 80240460 24040002 */ addiu $a0, $zero, 2 -/* D99E14 80240464 0000282D */ daddu $a1, $zero, $zero -/* D99E18 80240468 00A0302D */ daddu $a2, $a1, $zero -/* D99E1C 8024046C 00A0382D */ daddu $a3, $a1, $zero -/* D99E20 80240470 27A20018 */ addiu $v0, $sp, 0x18 -/* D99E24 80240474 0C0B7710 */ jal render_sprite -/* D99E28 80240478 AFA20010 */ sw $v0, 0x10($sp) -/* D99E2C 8024047C 8FBF0120 */ lw $ra, 0x120($sp) -/* D99E30 80240480 8FB1011C */ lw $s1, 0x11c($sp) -/* D99E34 80240484 8FB00118 */ lw $s0, 0x118($sp) -/* D99E38 80240488 D7B80138 */ ldc1 $f24, 0x138($sp) -/* D99E3C 8024048C D7B60130 */ ldc1 $f22, 0x130($sp) -/* D99E40 80240490 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D99E44 80240494 03E00008 */ jr $ra -/* D99E48 80240498 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_40/func_8024049C_D999B0.s b/asm/nonmatchings/world/area_pra/pra_40/func_8024049C_D999B0.s deleted file mode 100644 index facf4f92e2..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/func_8024049C_D999B0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_D99E4C -/* D99E4C 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D99E50 802404A0 AFB00010 */ sw $s0, 0x10($sp) -/* D99E54 802404A4 0080802D */ daddu $s0, $a0, $zero -/* D99E58 802404A8 AFBF0014 */ sw $ra, 0x14($sp) -/* D99E5C 802404AC 8E020084 */ lw $v0, 0x84($s0) -/* D99E60 802404B0 0440000E */ bltz $v0, .L802404EC -/* D99E64 802404B4 28420002 */ slti $v0, $v0, 2 -/* D99E68 802404B8 1040000C */ beqz $v0, .L802404EC -/* D99E6C 802404BC 00000000 */ nop -/* D99E70 802404C0 3C058024 */ lui $a1, 0x8024 -/* D99E74 802404C4 24A50500 */ addiu $a1, $a1, 0x500 -/* D99E78 802404C8 0C048C56 */ jal bind_dynamic_entity_3 -/* D99E7C 802404CC 0000202D */ daddu $a0, $zero, $zero -/* D99E80 802404D0 8E03013C */ lw $v1, 0x13c($s0) -/* D99E84 802404D4 AC620000 */ sw $v0, ($v1) -/* D99E88 802404D8 3C03800A */ lui $v1, %hi(D_8009A650) -/* D99E8C 802404DC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D99E90 802404E0 8C620000 */ lw $v0, ($v1) -/* D99E94 802404E4 34420080 */ ori $v0, $v0, 0x80 -/* D99E98 802404E8 AC620000 */ sw $v0, ($v1) -.L802404EC: -/* D99E9C 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* D99EA0 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* D99EA4 802404F4 24020002 */ addiu $v0, $zero, 2 -/* D99EA8 802404F8 03E00008 */ jr $ra -/* D99EAC 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_40/func_80240500_D999B0.s b/asm/nonmatchings/world/area_pra/pra_40/func_80240500_D999B0.s deleted file mode 100644 index a1bfc96f5c..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/func_80240500_D999B0.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_D99EB0 -/* D99EB0 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D99EB4 80240504 AFB00040 */ sw $s0, 0x40($sp) -/* D99EB8 80240508 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D99EBC 8024050C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D99EC0 80240510 AFB10044 */ sw $s1, 0x44($sp) -/* D99EC4 80240514 AFBF004C */ sw $ra, 0x4c($sp) -/* D99EC8 80240518 AFB20048 */ sw $s2, 0x48($sp) -/* D99ECC 8024051C 8E020000 */ lw $v0, ($s0) -/* D99ED0 80240520 821200BE */ lb $s2, 0xbe($s0) -/* D99ED4 80240524 30420001 */ andi $v0, $v0, 1 -/* D99ED8 80240528 10400052 */ beqz $v0, .L80240674 -/* D99EDC 8024052C 27B10020 */ addiu $s1, $sp, 0x20 -/* D99EE0 80240530 8E0400CC */ lw $a0, 0xcc($s0) -/* D99EE4 80240534 0C044181 */ jal get_shadow_by_index -/* D99EE8 80240538 00000000 */ nop -/* D99EEC 8024053C 0C048B77 */ jal func_80122DDC -/* D99EF0 80240540 84440008 */ lh $a0, 8($v0) -/* D99EF4 80240544 8E050028 */ lw $a1, 0x28($s0) -/* D99EF8 80240548 8E070030 */ lw $a3, 0x30($s0) -/* D99EFC 8024054C 27A20030 */ addiu $v0, $sp, 0x30 -/* D99F00 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* D99F04 80240554 27A20034 */ addiu $v0, $sp, 0x34 -/* D99F08 80240558 AFA20014 */ sw $v0, 0x14($sp) -/* D99F0C 8024055C 27A20038 */ addiu $v0, $sp, 0x38 -/* D99F10 80240560 AFA20018 */ sw $v0, 0x18($sp) -/* D99F14 80240564 C600002C */ lwc1 $f0, 0x2c($s0) -/* D99F18 80240568 3C04800A */ lui $a0, 0x800a -/* D99F1C 8024056C 8484A634 */ lh $a0, -0x59cc($a0) -/* D99F20 80240570 46000007 */ neg.s $f0, $f0 -/* D99F24 80240574 44060000 */ mfc1 $a2, $f0 -/* D99F28 80240578 0C00B94E */ jal get_screen_coords -/* D99F2C 8024057C 00000000 */ nop -/* D99F30 80240580 8E0500A4 */ lw $a1, 0xa4($s0) -/* D99F34 80240584 3C063F80 */ lui $a2, 0x3f80 -/* D99F38 80240588 0C0B76A3 */ jal func_802DDA8C -/* D99F3C 8024058C 24040001 */ addiu $a0, $zero, 1 -/* D99F40 80240590 8E020000 */ lw $v0, ($s0) -/* D99F44 80240594 3C030002 */ lui $v1, 2 -/* D99F48 80240598 00431024 */ and $v0, $v0, $v1 -/* D99F4C 8024059C 54400022 */ bnel $v0, $zero, .L80240628 -/* D99F50 802405A0 24120011 */ addiu $s2, $zero, 0x11 -/* D99F54 802405A4 9203000E */ lbu $v1, 0xe($s0) -/* D99F58 802405A8 3C02802E */ lui $v0, 0x802e -/* D99F5C 802405AC 90429D71 */ lbu $v0, -0x628f($v0) -/* D99F60 802405B0 10620018 */ beq $v1, $v0, .L80240614 -/* D99F64 802405B4 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D99F68 802405B8 1040000B */ beqz $v0, .L802405E8 -/* D99F6C 802405BC 24120011 */ addiu $s2, $zero, 0x11 -/* D99F70 802405C0 24040001 */ addiu $a0, $zero, 1 -/* D99F74 802405C4 2405FFFF */ addiu $a1, $zero, -1 -/* D99F78 802405C8 24060007 */ addiu $a2, $zero, 7 -/* D99F7C 802405CC 0060102D */ daddu $v0, $v1, $zero -/* D99F80 802405D0 0000382D */ daddu $a3, $zero, $zero -/* D99F84 802405D4 AFA00010 */ sw $zero, 0x10($sp) -/* D99F88 802405D8 AFA00014 */ sw $zero, 0x14($sp) -/* D99F8C 802405DC AFA0001C */ sw $zero, 0x1c($sp) -/* D99F90 802405E0 08090183 */ j .L8024060C -/* D99F94 802405E4 AFA20018 */ sw $v0, 0x18($sp) -.L802405E8: -/* D99F98 802405E8 2412000D */ addiu $s2, $zero, 0xd -/* D99F9C 802405EC 24040001 */ addiu $a0, $zero, 1 -/* D99FA0 802405F0 2405FFFF */ addiu $a1, $zero, -1 -/* D99FA4 802405F4 0000302D */ daddu $a2, $zero, $zero -/* D99FA8 802405F8 00C0382D */ daddu $a3, $a2, $zero -/* D99FAC 802405FC AFA00010 */ sw $zero, 0x10($sp) -/* D99FB0 80240600 AFA00014 */ sw $zero, 0x14($sp) -/* D99FB4 80240604 AFA00018 */ sw $zero, 0x18($sp) -/* D99FB8 80240608 AFA0001C */ sw $zero, 0x1c($sp) -.L8024060C: -/* D99FBC 8024060C 0C0B77B9 */ jal func_802DDEE4 -/* D99FC0 80240610 00000000 */ nop -.L80240614: -/* D99FC4 80240614 9202000E */ lbu $v0, 0xe($s0) -/* D99FC8 80240618 3C01802E */ lui $at, 0x802e -/* D99FCC 8024061C A0229D71 */ sb $v0, -0x628f($at) -/* D99FD0 80240620 0809018C */ j .L80240630 -/* D99FD4 80240624 00000000 */ nop -.L80240628: -/* D99FD8 80240628 3C01802E */ lui $at, 0x802e -/* D99FDC 8024062C A0209D71 */ sb $zero, -0x628f($at) -.L80240630: -/* D99FE0 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D99FE4 80240634 3C048024 */ lui $a0, 0x8024 -/* D99FE8 80240638 24840870 */ addiu $a0, $a0, 0x870 -/* D99FEC 8024063C AE320000 */ sw $s2, ($s1) -/* D99FF0 80240640 AE300008 */ sw $s0, 8($s1) -/* D99FF4 80240644 00021023 */ negu $v0, $v0 -/* D99FF8 80240648 AE220004 */ sw $v0, 4($s1) -/* D99FFC 8024064C 8E020000 */ lw $v0, ($s0) -/* D9A000 80240650 3C030002 */ lui $v1, 2 -/* D9A004 80240654 00431024 */ and $v0, $v0, $v1 -/* D9A008 80240658 54400004 */ bnel $v0, $zero, .L8024066C -/* D9A00C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D9A010 80240660 3C048024 */ lui $a0, 0x8024 -/* D9A014 80240664 2484068C */ addiu $a0, $a0, 0x68c -/* D9A018 80240668 AE24000C */ sw $a0, 0xc($s1) -.L8024066C: -/* D9A01C 8024066C 0C047644 */ jal queue_render_task -/* D9A020 80240670 0220202D */ daddu $a0, $s1, $zero -.L80240674: -/* D9A024 80240674 8FBF004C */ lw $ra, 0x4c($sp) -/* D9A028 80240678 8FB20048 */ lw $s2, 0x48($sp) -/* D9A02C 8024067C 8FB10044 */ lw $s1, 0x44($sp) -/* D9A030 80240680 8FB00040 */ lw $s0, 0x40($sp) -/* D9A034 80240684 03E00008 */ jr $ra -/* D9A038 80240688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_40/func_8024068C_D999B0.s b/asm/nonmatchings/world/area_pra/pra_40/func_8024068C_D999B0.s deleted file mode 100644 index 8cdd003dc8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/func_8024068C_D999B0.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C_D9A03C -/* D9A03C 8024068C 3C03800A */ lui $v1, 0x800a -/* D9A040 80240690 8463A634 */ lh $v1, -0x59cc($v1) -/* D9A044 80240694 3C07BF80 */ lui $a3, 0xbf80 -/* D9A048 80240698 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* D9A04C 8024069C F7B40128 */ sdc1 $f20, 0x128($sp) -/* D9A050 802406A0 4480A000 */ mtc1 $zero, $f20 -/* D9A054 802406A4 AFB1011C */ sw $s1, 0x11c($sp) -/* D9A058 802406A8 0080882D */ daddu $s1, $a0, $zero -/* D9A05C 802406AC AFB00118 */ sw $s0, 0x118($sp) -/* D9A060 802406B0 27B00098 */ addiu $s0, $sp, 0x98 -/* D9A064 802406B4 AFBF0120 */ sw $ra, 0x120($sp) -/* D9A068 802406B8 F7B80138 */ sdc1 $f24, 0x138($sp) -/* D9A06C 802406BC F7B60130 */ sdc1 $f22, 0x130($sp) -/* D9A070 802406C0 00031080 */ sll $v0, $v1, 2 -/* D9A074 802406C4 00431021 */ addu $v0, $v0, $v1 -/* D9A078 802406C8 00021080 */ sll $v0, $v0, 2 -/* D9A07C 802406CC 00431023 */ subu $v0, $v0, $v1 -/* D9A080 802406D0 000218C0 */ sll $v1, $v0, 3 -/* D9A084 802406D4 00431021 */ addu $v0, $v0, $v1 -/* D9A088 802406D8 000210C0 */ sll $v0, $v0, 3 -/* D9A08C 802406DC 3C01800B */ lui $at, 0x800b -/* D9A090 802406E0 00220821 */ addu $at, $at, $v0 -/* D9A094 802406E4 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D9A098 802406E8 4406A000 */ mfc1 $a2, $f20 -/* D9A09C 802406EC 4600B587 */ neg.s $f22, $f22 -/* D9A0A0 802406F0 4405B000 */ mfc1 $a1, $f22 -/* D9A0A4 802406F4 0200202D */ daddu $a0, $s0, $zero -/* D9A0A8 802406F8 0C019EC8 */ jal guRotateF -/* D9A0AC 802406FC E7B40010 */ swc1 $f20, 0x10($sp) -/* D9A0B0 80240700 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D9A0B4 80240704 0C00A6C9 */ jal clamp_angle -/* D9A0B8 80240708 00000000 */ nop -/* D9A0BC 8024070C 44050000 */ mfc1 $a1, $f0 -/* D9A0C0 80240710 4406A000 */ mfc1 $a2, $f20 -/* D9A0C4 80240714 4407A000 */ mfc1 $a3, $f20 -/* D9A0C8 80240718 3C013F80 */ lui $at, 0x3f80 -/* D9A0CC 8024071C 4481C000 */ mtc1 $at, $f24 -/* D9A0D0 80240720 27A40018 */ addiu $a0, $sp, 0x18 -/* D9A0D4 80240724 0C019EC8 */ jal guRotateF -/* D9A0D8 80240728 E7B80010 */ swc1 $f24, 0x10($sp) -/* D9A0DC 8024072C 0200202D */ daddu $a0, $s0, $zero -/* D9A0E0 80240730 27A50018 */ addiu $a1, $sp, 0x18 -/* D9A0E4 80240734 0C019D80 */ jal guMtxCatF -/* D9A0E8 80240738 00A0302D */ daddu $a2, $a1, $zero -/* D9A0EC 8024073C 4405B000 */ mfc1 $a1, $f22 -/* D9A0F0 80240740 4406A000 */ mfc1 $a2, $f20 -/* D9A0F4 80240744 4407C000 */ mfc1 $a3, $f24 -/* D9A0F8 80240748 0200202D */ daddu $a0, $s0, $zero -/* D9A0FC 8024074C 0C019EC8 */ jal guRotateF -/* D9A100 80240750 E7B40010 */ swc1 $f20, 0x10($sp) -/* D9A104 80240754 27A40018 */ addiu $a0, $sp, 0x18 -/* D9A108 80240758 0200282D */ daddu $a1, $s0, $zero -/* D9A10C 8024075C 0C019D80 */ jal guMtxCatF -/* D9A110 80240760 0080302D */ daddu $a2, $a0, $zero -/* D9A114 80240764 E7B40010 */ swc1 $f20, 0x10($sp) -/* D9A118 80240768 8E2500A8 */ lw $a1, 0xa8($s1) -/* D9A11C 8024076C 4406A000 */ mfc1 $a2, $f20 -/* D9A120 80240770 4407C000 */ mfc1 $a3, $f24 -/* D9A124 80240774 0C019EC8 */ jal guRotateF -/* D9A128 80240778 0200202D */ daddu $a0, $s0, $zero -/* D9A12C 8024077C 27A40018 */ addiu $a0, $sp, 0x18 -/* D9A130 80240780 0200282D */ daddu $a1, $s0, $zero -/* D9A134 80240784 0C019D80 */ jal guMtxCatF -/* D9A138 80240788 0080302D */ daddu $a2, $a0, $zero -/* D9A13C 8024078C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* D9A140 80240790 3C013F36 */ lui $at, 0x3f36 -/* D9A144 80240794 3421DB6E */ ori $at, $at, 0xdb6e -/* D9A148 80240798 44810000 */ mtc1 $at, $f0 -/* D9A14C 8024079C 0200202D */ daddu $a0, $s0, $zero -/* D9A150 802407A0 44050000 */ mfc1 $a1, $f0 -/* D9A154 802407A4 3C06BF36 */ lui $a2, 0xbf36 -/* D9A158 802407A8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D9A15C 802407AC 0C019DF0 */ jal guScaleF -/* D9A160 802407B0 00A0382D */ daddu $a3, $a1, $zero -/* D9A164 802407B4 27A40018 */ addiu $a0, $sp, 0x18 -/* D9A168 802407B8 0200282D */ daddu $a1, $s0, $zero -/* D9A16C 802407BC 0C019D80 */ jal guMtxCatF -/* D9A170 802407C0 0080302D */ daddu $a2, $a0, $zero -/* D9A174 802407C4 27B00058 */ addiu $s0, $sp, 0x58 -/* D9A178 802407C8 8E250028 */ lw $a1, 0x28($s1) -/* D9A17C 802407CC C620002C */ lwc1 $f0, 0x2c($s1) -/* D9A180 802407D0 8E270030 */ lw $a3, 0x30($s1) -/* D9A184 802407D4 46000007 */ neg.s $f0, $f0 -/* D9A188 802407D8 44060000 */ mfc1 $a2, $f0 -/* D9A18C 802407DC 0C019E40 */ jal guTranslateF -/* D9A190 802407E0 0200202D */ daddu $a0, $s0, $zero -/* D9A194 802407E4 27A40018 */ addiu $a0, $sp, 0x18 -/* D9A198 802407E8 0200282D */ daddu $a1, $s0, $zero -/* D9A19C 802407EC 0C019D80 */ jal guMtxCatF -/* D9A1A0 802407F0 0080302D */ daddu $a2, $a0, $zero -/* D9A1A4 802407F4 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D9A1A8 802407F8 3C0142B4 */ lui $at, 0x42b4 -/* D9A1AC 802407FC 44810000 */ mtc1 $at, $f0 -/* D9A1B0 80240800 00000000 */ nop -/* D9A1B4 80240804 4602003E */ c.le.s $f0, $f2 -/* D9A1B8 80240808 00000000 */ nop -/* D9A1BC 8024080C 4500000A */ bc1f .L80240838 -/* D9A1C0 80240810 24040001 */ addiu $a0, $zero, 1 -/* D9A1C4 80240814 3C014387 */ lui $at, 0x4387 -/* D9A1C8 80240818 44810000 */ mtc1 $at, $f0 -/* D9A1CC 8024081C 00000000 */ nop -/* D9A1D0 80240820 4600103C */ c.lt.s $f2, $f0 -/* D9A1D4 80240824 00000000 */ nop -/* D9A1D8 80240828 45000004 */ bc1f .L8024083C -/* D9A1DC 8024082C 27A20018 */ addiu $v0, $sp, 0x18 -/* D9A1E0 80240830 3C041000 */ lui $a0, 0x1000 -/* D9A1E4 80240834 34840001 */ ori $a0, $a0, 1 -.L80240838: -/* D9A1E8 80240838 27A20018 */ addiu $v0, $sp, 0x18 -.L8024083C: -/* D9A1EC 8024083C 0000282D */ daddu $a1, $zero, $zero -/* D9A1F0 80240840 00A0302D */ daddu $a2, $a1, $zero -/* D9A1F4 80240844 00A0382D */ daddu $a3, $a1, $zero -/* D9A1F8 80240848 0C0B7710 */ jal render_sprite -/* D9A1FC 8024084C AFA20010 */ sw $v0, 0x10($sp) -/* D9A200 80240850 8FBF0120 */ lw $ra, 0x120($sp) -/* D9A204 80240854 8FB1011C */ lw $s1, 0x11c($sp) -/* D9A208 80240858 8FB00118 */ lw $s0, 0x118($sp) -/* D9A20C 8024085C D7B80138 */ ldc1 $f24, 0x138($sp) -/* D9A210 80240860 D7B60130 */ ldc1 $f22, 0x130($sp) -/* D9A214 80240864 D7B40128 */ ldc1 $f20, 0x128($sp) -/* D9A218 80240868 03E00008 */ jr $ra -/* D9A21C 8024086C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_pra/pra_40/func_80240870_D999B0.s b/asm/nonmatchings/world/area_pra/pra_40/func_80240870_D999B0.s deleted file mode 100644 index 183e65dd40..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/func_80240870_D999B0.s +++ /dev/null @@ -1,324 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870_D9A220 -/* D9A220 80240870 27BDFE80 */ addiu $sp, $sp, -0x180 -/* D9A224 80240874 F7B60158 */ sdc1 $f22, 0x158($sp) -/* D9A228 80240878 4480B000 */ mtc1 $zero, $f22 -/* D9A22C 8024087C AFB10134 */ sw $s1, 0x134($sp) -/* D9A230 80240880 0080882D */ daddu $s1, $a0, $zero -/* D9A234 80240884 AFB3013C */ sw $s3, 0x13c($sp) -/* D9A238 80240888 0000982D */ daddu $s3, $zero, $zero -/* D9A23C 8024088C AFB60148 */ sw $s6, 0x148($sp) -/* D9A240 80240890 3C16800B */ lui $s6, %hi(gCameras) -/* D9A244 80240894 26D61D80 */ addiu $s6, $s6, %lo(gCameras) -/* D9A248 80240898 AFB50144 */ sw $s5, 0x144($sp) -/* D9A24C 8024089C 241500FF */ addiu $s5, $zero, 0xff -/* D9A250 802408A0 AFB00130 */ sw $s0, 0x130($sp) -/* D9A254 802408A4 27B000A0 */ addiu $s0, $sp, 0xa0 -/* D9A258 802408A8 AFB20138 */ sw $s2, 0x138($sp) -/* D9A25C 802408AC 27B20060 */ addiu $s2, $sp, 0x60 -/* D9A260 802408B0 AFB40140 */ sw $s4, 0x140($sp) -/* D9A264 802408B4 27B400E0 */ addiu $s4, $sp, 0xe0 -/* D9A268 802408B8 AFBF014C */ sw $ra, 0x14c($sp) -/* D9A26C 802408BC F7BE0178 */ sdc1 $f30, 0x178($sp) -/* D9A270 802408C0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* D9A274 802408C4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* D9A278 802408C8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* D9A27C 802408CC F7B40150 */ sdc1 $f20, 0x150($sp) -.L802408D0: -/* D9A280 802408D0 3C03800A */ lui $v1, 0x800a -/* D9A284 802408D4 8463A634 */ lh $v1, -0x59cc($v1) -/* D9A288 802408D8 00031080 */ sll $v0, $v1, 2 -/* D9A28C 802408DC 00431021 */ addu $v0, $v0, $v1 -/* D9A290 802408E0 00021080 */ sll $v0, $v0, 2 -/* D9A294 802408E4 00431023 */ subu $v0, $v0, $v1 -/* D9A298 802408E8 000218C0 */ sll $v1, $v0, 3 -/* D9A29C 802408EC 00431021 */ addu $v0, $v0, $v1 -/* D9A2A0 802408F0 000210C0 */ sll $v0, $v0, 3 -/* D9A2A4 802408F4 00561021 */ addu $v0, $v0, $s6 -/* D9A2A8 802408F8 C440006C */ lwc1 $f0, 0x6c($v0) -/* D9A2AC 802408FC 16600065 */ bnez $s3, .L80240A94 -/* D9A2B0 80240900 46000507 */ neg.s $f20, $f0 -/* D9A2B4 80240904 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D9A2B8 80240908 3C0142B4 */ lui $at, 0x42b4 -/* D9A2BC 8024090C 44810000 */ mtc1 $at, $f0 -/* D9A2C0 80240910 00000000 */ nop -/* D9A2C4 80240914 4602003C */ c.lt.s $f0, $f2 -/* D9A2C8 80240918 00000000 */ nop -/* D9A2CC 8024091C 4500000A */ bc1f .L80240948 -/* D9A2D0 80240920 00000000 */ nop -/* D9A2D4 80240924 3C014334 */ lui $at, 0x4334 -/* D9A2D8 80240928 44812000 */ mtc1 $at, $f4 -/* D9A2DC 8024092C 00000000 */ nop -/* D9A2E0 80240930 4604103E */ c.le.s $f2, $f4 -/* D9A2E4 80240934 00000000 */ nop -/* D9A2E8 80240938 45000003 */ bc1f .L80240948 -/* D9A2EC 8024093C 00000000 */ nop -/* D9A2F0 80240940 08090276 */ j .L802409D8 -/* D9A2F4 80240944 46022501 */ sub.s $f20, $f4, $f2 -.L80240948: -/* D9A2F8 80240948 C62000A8 */ lwc1 $f0, 0xa8($s1) -/* D9A2FC 8024094C 3C014334 */ lui $at, 0x4334 -/* D9A300 80240950 44812000 */ mtc1 $at, $f4 -/* D9A304 80240954 00000000 */ nop -/* D9A308 80240958 4600203C */ c.lt.s $f4, $f0 -/* D9A30C 8024095C 00000000 */ nop -/* D9A310 80240960 4500000C */ bc1f .L80240994 -/* D9A314 80240964 00000000 */ nop -/* D9A318 80240968 3C014387 */ lui $at, 0x4387 -/* D9A31C 8024096C 44812000 */ mtc1 $at, $f4 -/* D9A320 80240970 00000000 */ nop -/* D9A324 80240974 4604003E */ c.le.s $f0, $f4 -/* D9A328 80240978 00000000 */ nop -/* D9A32C 8024097C 45000008 */ bc1f .L802409A0 -/* D9A330 80240980 00000000 */ nop -/* D9A334 80240984 3C014334 */ lui $at, 0x4334 -/* D9A338 80240988 44812000 */ mtc1 $at, $f4 -/* D9A33C 8024098C 08090276 */ j .L802409D8 -/* D9A340 80240990 46040501 */ sub.s $f20, $f0, $f4 -.L80240994: -/* D9A344 80240994 3C014387 */ lui $at, 0x4387 -/* D9A348 80240998 44812000 */ mtc1 $at, $f4 -/* D9A34C 8024099C 00000000 */ nop -.L802409A0: -/* D9A350 802409A0 4600203C */ c.lt.s $f4, $f0 -/* D9A354 802409A4 00000000 */ nop -/* D9A358 802409A8 4500000A */ bc1f .L802409D4 -/* D9A35C 802409AC 00000000 */ nop -/* D9A360 802409B0 3C0143B4 */ lui $at, 0x43b4 -/* D9A364 802409B4 44811000 */ mtc1 $at, $f2 -/* D9A368 802409B8 00000000 */ nop -/* D9A36C 802409BC 4602003E */ c.le.s $f0, $f2 -/* D9A370 802409C0 00000000 */ nop -/* D9A374 802409C4 45000003 */ bc1f .L802409D4 -/* D9A378 802409C8 00000000 */ nop -/* D9A37C 802409CC 08090276 */ j .L802409D8 -/* D9A380 802409D0 46001501 */ sub.s $f20, $f2, $f0 -.L802409D4: -/* D9A384 802409D4 C63400A8 */ lwc1 $f20, 0xa8($s1) -.L802409D8: -/* D9A388 802409D8 3C0141C8 */ lui $at, 0x41c8 -/* D9A38C 802409DC 44810000 */ mtc1 $at, $f0 -/* D9A390 802409E0 00000000 */ nop -/* D9A394 802409E4 4600A003 */ div.s $f0, $f20, $f0 -/* D9A398 802409E8 4600010D */ trunc.w.s $f4, $f0 -/* D9A39C 802409EC 44072000 */ mfc1 $a3, $f4 -/* D9A3A0 802409F0 00000000 */ nop -/* D9A3A4 802409F4 00071100 */ sll $v0, $a3, 4 -/* D9A3A8 802409F8 00471023 */ subu $v0, $v0, $a3 -/* D9A3AC 802409FC 00021080 */ sll $v0, $v0, 2 -/* D9A3B0 80240A00 02A23823 */ subu $a3, $s5, $v0 -/* D9A3B4 80240A04 28E20064 */ slti $v0, $a3, 0x64 -/* D9A3B8 80240A08 54400001 */ bnel $v0, $zero, .L80240A10 -/* D9A3BC 80240A0C 24070064 */ addiu $a3, $zero, 0x64 -.L80240A10: -/* D9A3C0 80240A10 24040001 */ addiu $a0, $zero, 1 -/* D9A3C4 80240A14 2405FFFF */ addiu $a1, $zero, -1 -/* D9A3C8 80240A18 24060006 */ addiu $a2, $zero, 6 -/* D9A3CC 80240A1C AFA70010 */ sw $a3, 0x10($sp) -/* D9A3D0 80240A20 AFA70014 */ sw $a3, 0x14($sp) -/* D9A3D4 80240A24 AFB50018 */ sw $s5, 0x18($sp) -/* D9A3D8 80240A28 0C0B77B9 */ jal func_802DDEE4 -/* D9A3DC 80240A2C AFA0001C */ sw $zero, 0x1c($sp) -/* D9A3E0 80240A30 4405A000 */ mfc1 $a1, $f20 -/* D9A3E4 80240A34 4406B000 */ mfc1 $a2, $f22 -/* D9A3E8 80240A38 3C07BF80 */ lui $a3, 0xbf80 -/* D9A3EC 80240A3C 0200202D */ daddu $a0, $s0, $zero -/* D9A3F0 80240A40 0C019EC8 */ jal guRotateF -/* D9A3F4 80240A44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D9A3F8 80240A48 C62C008C */ lwc1 $f12, 0x8c($s1) -/* D9A3FC 80240A4C 0C00A6C9 */ jal clamp_angle -/* D9A400 80240A50 00000000 */ nop -/* D9A404 80240A54 44050000 */ mfc1 $a1, $f0 -/* D9A408 80240A58 4406B000 */ mfc1 $a2, $f22 -/* D9A40C 80240A5C 4407B000 */ mfc1 $a3, $f22 -/* D9A410 80240A60 3C013F80 */ lui $at, 0x3f80 -/* D9A414 80240A64 44812000 */ mtc1 $at, $f4 -/* D9A418 80240A68 27A40020 */ addiu $a0, $sp, 0x20 -/* D9A41C 80240A6C 0C019EC8 */ jal guRotateF -/* D9A420 80240A70 E7A40010 */ swc1 $f4, 0x10($sp) -/* D9A424 80240A74 0200202D */ daddu $a0, $s0, $zero -/* D9A428 80240A78 27A50020 */ addiu $a1, $sp, 0x20 -/* D9A42C 80240A7C 0C019D80 */ jal guMtxCatF -/* D9A430 80240A80 00A0302D */ daddu $a2, $a1, $zero -/* D9A434 80240A84 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D9A438 80240A88 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D9A43C 80240A8C 080902D6 */ j .L80240B58 -/* D9A440 80240A90 C63C0030 */ lwc1 $f28, 0x30($s1) -.L80240A94: -/* D9A444 80240A94 0260202D */ daddu $a0, $s3, $zero -/* D9A448 80240A98 27A50120 */ addiu $a1, $sp, 0x120 -/* D9A44C 80240A9C 27A60124 */ addiu $a2, $sp, 0x124 -/* D9A450 80240AA0 0C03964E */ jal func_800E5938 -/* D9A454 80240AA4 27A70128 */ addiu $a3, $sp, 0x128 -/* D9A458 80240AA8 8FA60124 */ lw $a2, 0x124($sp) -/* D9A45C 80240AAC 3C028000 */ lui $v0, 0x8000 -/* D9A460 80240AB0 14C20004 */ bne $a2, $v0, .L80240AC4 -/* D9A464 80240AB4 46000606 */ mov.s $f24, $f0 -/* D9A468 80240AB8 C63A002C */ lwc1 $f26, 0x2c($s1) -/* D9A46C 80240ABC 080902B5 */ j .L80240AD4 -/* D9A470 80240AC0 24040001 */ addiu $a0, $zero, 1 -.L80240AC4: -/* D9A474 80240AC4 4486D000 */ mtc1 $a2, $f26 -/* D9A478 80240AC8 00000000 */ nop -/* D9A47C 80240ACC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D9A480 80240AD0 24040001 */ addiu $a0, $zero, 1 -.L80240AD4: -/* D9A484 80240AD4 2405FFFF */ addiu $a1, $zero, -1 -/* D9A488 80240AD8 24060007 */ addiu $a2, $zero, 7 -/* D9A48C 80240ADC 0000382D */ daddu $a3, $zero, $zero -/* D9A490 80240AE0 C63E0028 */ lwc1 $f30, 0x28($s1) -/* D9A494 80240AE4 C63C0030 */ lwc1 $f28, 0x30($s1) -/* D9A498 80240AE8 24020040 */ addiu $v0, $zero, 0x40 -/* D9A49C 80240AEC AFA00010 */ sw $zero, 0x10($sp) -/* D9A4A0 80240AF0 AFA00014 */ sw $zero, 0x14($sp) -/* D9A4A4 80240AF4 AFA20018 */ sw $v0, 0x18($sp) -/* D9A4A8 80240AF8 0C0B77B9 */ jal func_802DDEE4 -/* D9A4AC 80240AFC AFA0001C */ sw $zero, 0x1c($sp) -/* D9A4B0 80240B00 4405A000 */ mfc1 $a1, $f20 -/* D9A4B4 80240B04 4406B000 */ mfc1 $a2, $f22 -/* D9A4B8 80240B08 3C07BF80 */ lui $a3, 0xbf80 -/* D9A4BC 80240B0C 27A40020 */ addiu $a0, $sp, 0x20 -/* D9A4C0 80240B10 0C019EC8 */ jal guRotateF -/* D9A4C4 80240B14 E7B60010 */ swc1 $f22, 0x10($sp) -/* D9A4C8 80240B18 4405A000 */ mfc1 $a1, $f20 -/* D9A4CC 80240B1C 4406B000 */ mfc1 $a2, $f22 -/* D9A4D0 80240B20 3C07BF80 */ lui $a3, 0xbf80 -/* D9A4D4 80240B24 0200202D */ daddu $a0, $s0, $zero -/* D9A4D8 80240B28 0C019EC8 */ jal guRotateF -/* D9A4DC 80240B2C E7B60010 */ swc1 $f22, 0x10($sp) -/* D9A4E0 80240B30 4405C000 */ mfc1 $a1, $f24 -/* D9A4E4 80240B34 4406B000 */ mfc1 $a2, $f22 -/* D9A4E8 80240B38 3C073F80 */ lui $a3, 0x3f80 -/* D9A4EC 80240B3C 27A40020 */ addiu $a0, $sp, 0x20 -/* D9A4F0 80240B40 0C019EC8 */ jal guRotateF -/* D9A4F4 80240B44 E7B60010 */ swc1 $f22, 0x10($sp) -/* D9A4F8 80240B48 0200202D */ daddu $a0, $s0, $zero -/* D9A4FC 80240B4C 27A50020 */ addiu $a1, $sp, 0x20 -/* D9A500 80240B50 0C019D80 */ jal guMtxCatF -/* D9A504 80240B54 00A0302D */ daddu $a2, $a1, $zero -.L80240B58: -/* D9A508 80240B58 862200B0 */ lh $v0, 0xb0($s1) -/* D9A50C 80240B5C 3C013F00 */ lui $at, 0x3f00 -/* D9A510 80240B60 44812000 */ mtc1 $at, $f4 -/* D9A514 80240B64 00021023 */ negu $v0, $v0 -/* D9A518 80240B68 44820000 */ mtc1 $v0, $f0 -/* D9A51C 80240B6C 00000000 */ nop -/* D9A520 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* D9A524 80240B74 46040102 */ mul.s $f4, $f0, $f4 -/* D9A528 80240B78 00000000 */ nop -/* D9A52C 80240B7C 4405B000 */ mfc1 $a1, $f22 -/* D9A530 80240B80 4407B000 */ mfc1 $a3, $f22 -/* D9A534 80240B84 44062000 */ mfc1 $a2, $f4 -/* D9A538 80240B88 0C019E40 */ jal guTranslateF -/* D9A53C 80240B8C 0240202D */ daddu $a0, $s2, $zero -/* D9A540 80240B90 0240202D */ daddu $a0, $s2, $zero -/* D9A544 80240B94 27A50020 */ addiu $a1, $sp, 0x20 -/* D9A548 80240B98 0C019D80 */ jal guMtxCatF -/* D9A54C 80240B9C 00A0302D */ daddu $a2, $a1, $zero -/* D9A550 80240BA0 4405A000 */ mfc1 $a1, $f20 -/* D9A554 80240BA4 4406B000 */ mfc1 $a2, $f22 -/* D9A558 80240BA8 3C073F80 */ lui $a3, 0x3f80 -/* D9A55C 80240BAC 0200202D */ daddu $a0, $s0, $zero -/* D9A560 80240BB0 0C019EC8 */ jal guRotateF -/* D9A564 80240BB4 E7B60010 */ swc1 $f22, 0x10($sp) -/* D9A568 80240BB8 27A40020 */ addiu $a0, $sp, 0x20 -/* D9A56C 80240BBC 0200282D */ daddu $a1, $s0, $zero -/* D9A570 80240BC0 0C019D80 */ jal guMtxCatF -/* D9A574 80240BC4 0080302D */ daddu $a2, $a0, $zero -/* D9A578 80240BC8 E7B60010 */ swc1 $f22, 0x10($sp) -/* D9A57C 80240BCC 8E2500A8 */ lw $a1, 0xa8($s1) -/* D9A580 80240BD0 4406B000 */ mfc1 $a2, $f22 -/* D9A584 80240BD4 3C073F80 */ lui $a3, 0x3f80 -/* D9A588 80240BD8 0C019EC8 */ jal guRotateF -/* D9A58C 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* D9A590 80240BE0 27A40020 */ addiu $a0, $sp, 0x20 -/* D9A594 80240BE4 0200282D */ daddu $a1, $s0, $zero -/* D9A598 80240BE8 0C019D80 */ jal guMtxCatF -/* D9A59C 80240BEC 0080302D */ daddu $a2, $a0, $zero -/* D9A5A0 80240BF0 862200B0 */ lh $v0, 0xb0($s1) -/* D9A5A4 80240BF4 3C013F00 */ lui $at, 0x3f00 -/* D9A5A8 80240BF8 44812000 */ mtc1 $at, $f4 -/* D9A5AC 80240BFC 44820000 */ mtc1 $v0, $f0 -/* D9A5B0 80240C00 00000000 */ nop -/* D9A5B4 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* D9A5B8 80240C08 46040102 */ mul.s $f4, $f0, $f4 -/* D9A5BC 80240C0C 00000000 */ nop -/* D9A5C0 80240C10 4405B000 */ mfc1 $a1, $f22 -/* D9A5C4 80240C14 4407B000 */ mfc1 $a3, $f22 -/* D9A5C8 80240C18 44062000 */ mfc1 $a2, $f4 -/* D9A5CC 80240C1C 0C019E40 */ jal guTranslateF -/* D9A5D0 80240C20 0240202D */ daddu $a0, $s2, $zero -/* D9A5D4 80240C24 27A40020 */ addiu $a0, $sp, 0x20 -/* D9A5D8 80240C28 0240282D */ daddu $a1, $s2, $zero -/* D9A5DC 80240C2C 0C019D80 */ jal guMtxCatF -/* D9A5E0 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D9A5E4 80240C34 3C013F36 */ lui $at, 0x3f36 -/* D9A5E8 80240C38 3421DB6E */ ori $at, $at, 0xdb6e -/* D9A5EC 80240C3C 44810000 */ mtc1 $at, $f0 -/* D9A5F0 80240C40 0280202D */ daddu $a0, $s4, $zero -/* D9A5F4 80240C44 44050000 */ mfc1 $a1, $f0 -/* D9A5F8 80240C48 3C06BF36 */ lui $a2, 0xbf36 -/* D9A5FC 80240C4C 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* D9A600 80240C50 0C019DF0 */ jal guScaleF -/* D9A604 80240C54 00A0382D */ daddu $a3, $a1, $zero -/* D9A608 80240C58 27A40020 */ addiu $a0, $sp, 0x20 -/* D9A60C 80240C5C 0280282D */ daddu $a1, $s4, $zero -/* D9A610 80240C60 0C019D80 */ jal guMtxCatF -/* D9A614 80240C64 0080302D */ daddu $a2, $a0, $zero -/* D9A618 80240C68 4600D687 */ neg.s $f26, $f26 -/* D9A61C 80240C6C 4405F000 */ mfc1 $a1, $f30 -/* D9A620 80240C70 4407E000 */ mfc1 $a3, $f28 -/* D9A624 80240C74 4406D000 */ mfc1 $a2, $f26 -/* D9A628 80240C78 0C019E40 */ jal guTranslateF -/* D9A62C 80240C7C 0240202D */ daddu $a0, $s2, $zero -/* D9A630 80240C80 27A40020 */ addiu $a0, $sp, 0x20 -/* D9A634 80240C84 0240282D */ daddu $a1, $s2, $zero -/* D9A638 80240C88 0C019D80 */ jal guMtxCatF -/* D9A63C 80240C8C 0080302D */ daddu $a2, $a0, $zero -/* D9A640 80240C90 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* D9A644 80240C94 3C0142B4 */ lui $at, 0x42b4 -/* D9A648 80240C98 44810000 */ mtc1 $at, $f0 -/* D9A64C 80240C9C 00000000 */ nop -/* D9A650 80240CA0 4602003E */ c.le.s $f0, $f2 -/* D9A654 80240CA4 00000000 */ nop -/* D9A658 80240CA8 4500000A */ bc1f .L80240CD4 -/* D9A65C 80240CAC 24040001 */ addiu $a0, $zero, 1 -/* D9A660 80240CB0 3C014387 */ lui $at, 0x4387 -/* D9A664 80240CB4 44812000 */ mtc1 $at, $f4 -/* D9A668 80240CB8 00000000 */ nop -/* D9A66C 80240CBC 4604103C */ c.lt.s $f2, $f4 -/* D9A670 80240CC0 00000000 */ nop -/* D9A674 80240CC4 45000004 */ bc1f .L80240CD8 -/* D9A678 80240CC8 27A20020 */ addiu $v0, $sp, 0x20 -/* D9A67C 80240CCC 3C041000 */ lui $a0, 0x1000 -/* D9A680 80240CD0 34840001 */ ori $a0, $a0, 1 -.L80240CD4: -/* D9A684 80240CD4 27A20020 */ addiu $v0, $sp, 0x20 -.L80240CD8: -/* D9A688 80240CD8 AFA20010 */ sw $v0, 0x10($sp) -/* D9A68C 80240CDC 0000282D */ daddu $a1, $zero, $zero -/* D9A690 80240CE0 00A0302D */ daddu $a2, $a1, $zero -/* D9A694 80240CE4 0C0B7710 */ jal render_sprite -/* D9A698 80240CE8 00A0382D */ daddu $a3, $a1, $zero -/* D9A69C 80240CEC 26730001 */ addiu $s3, $s3, 1 -/* D9A6A0 80240CF0 2A620002 */ slti $v0, $s3, 2 -/* D9A6A4 80240CF4 1440FEF6 */ bnez $v0, .L802408D0 -/* D9A6A8 80240CF8 00000000 */ nop -/* D9A6AC 80240CFC 8FBF014C */ lw $ra, 0x14c($sp) -/* D9A6B0 80240D00 8FB60148 */ lw $s6, 0x148($sp) -/* D9A6B4 80240D04 8FB50144 */ lw $s5, 0x144($sp) -/* D9A6B8 80240D08 8FB40140 */ lw $s4, 0x140($sp) -/* D9A6BC 80240D0C 8FB3013C */ lw $s3, 0x13c($sp) -/* D9A6C0 80240D10 8FB20138 */ lw $s2, 0x138($sp) -/* D9A6C4 80240D14 8FB10134 */ lw $s1, 0x134($sp) -/* D9A6C8 80240D18 8FB00130 */ lw $s0, 0x130($sp) -/* D9A6CC 80240D1C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* D9A6D0 80240D20 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* D9A6D4 80240D24 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* D9A6D8 80240D28 D7B80160 */ ldc1 $f24, 0x160($sp) -/* D9A6DC 80240D2C D7B60158 */ ldc1 $f22, 0x158($sp) -/* D9A6E0 80240D30 D7B40150 */ ldc1 $f20, 0x150($sp) -/* D9A6E4 80240D34 03E00008 */ jr $ra -/* D9A6E8 80240D38 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/world/area_pra/pra_40/func_80240D3C_D999B0.s b/asm/nonmatchings/world/area_pra/pra_40/func_80240D3C_D999B0.s deleted file mode 100644 index 015fb79d0b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/func_80240D3C_D999B0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C_D9A6EC -/* D9A6EC 80240D3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9A6F0 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D9A6F4 80240D44 0080802D */ daddu $s0, $a0, $zero -/* D9A6F8 80240D48 AFBF0014 */ sw $ra, 0x14($sp) -/* D9A6FC 80240D4C 8E020088 */ lw $v0, 0x88($s0) -/* D9A700 80240D50 14400017 */ bnez $v0, .L80240DB0 -/* D9A704 80240D54 24020001 */ addiu $v0, $zero, 1 -/* D9A708 80240D58 8E030084 */ lw $v1, 0x84($s0) -/* D9A70C 80240D5C 1062001A */ beq $v1, $v0, .L80240DC8 -/* D9A710 80240D60 00000000 */ nop -/* D9A714 80240D64 28620002 */ slti $v0, $v1, 2 -/* D9A718 80240D68 50400005 */ beql $v0, $zero, .L80240D80 -/* D9A71C 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* D9A720 80240D70 10600007 */ beqz $v1, .L80240D90 -/* D9A724 80240D74 00000000 */ nop -/* D9A728 80240D78 08090378 */ j .L80240DE0 -/* D9A72C 80240D7C 00000000 */ nop -.L80240D80: -/* D9A730 80240D80 10620007 */ beq $v1, $v0, .L80240DA0 -/* D9A734 80240D84 00000000 */ nop -/* D9A738 80240D88 08090378 */ j .L80240DE0 -/* D9A73C 80240D8C 00000000 */ nop -.L80240D90: -/* D9A740 80240D90 3C048024 */ lui $a0, 0x8024 -/* D9A744 80240D94 24840E84 */ addiu $a0, $a0, 0xe84 -/* D9A748 80240D98 08090374 */ j .L80240DD0 -/* D9A74C 80240D9C 00000000 */ nop -.L80240DA0: -/* D9A750 80240DA0 3C048024 */ lui $a0, 0x8024 -/* D9A754 80240DA4 24840EEC */ addiu $a0, $a0, 0xeec -/* D9A758 80240DA8 08090374 */ j .L80240DD0 -/* D9A75C 80240DAC 00000000 */ nop -.L80240DB0: -/* D9A760 80240DB0 8E020084 */ lw $v0, 0x84($s0) -/* D9A764 80240DB4 0440000A */ bltz $v0, .L80240DE0 -/* D9A768 80240DB8 00000000 */ nop -/* D9A76C 80240DBC 28420002 */ slti $v0, $v0, 2 -/* D9A770 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* D9A774 80240DC4 00000000 */ nop -.L80240DC8: -/* D9A778 80240DC8 3C048024 */ lui $a0, 0x8024 -/* D9A77C 80240DCC 24840EB8 */ addiu $a0, $a0, 0xeb8 -.L80240DD0: -/* D9A780 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 -/* D9A784 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* D9A788 80240DD8 8E03013C */ lw $v1, 0x13c($s0) -/* D9A78C 80240DDC AC620004 */ sw $v0, 4($v1) -.L80240DE0: -/* D9A790 80240DE0 0C00EAD2 */ jal get_npc_safe -/* D9A794 80240DE4 2404FFFC */ addiu $a0, $zero, -4 -/* D9A798 80240DE8 0040282D */ daddu $a1, $v0, $zero -/* D9A79C 80240DEC 10A00021 */ beqz $a1, .L80240E74 -/* D9A7A0 80240DF0 24020002 */ addiu $v0, $zero, 2 -/* D9A7A4 80240DF4 8E020088 */ lw $v0, 0x88($s0) -/* D9A7A8 80240DF8 14400014 */ bnez $v0, .L80240E4C -/* D9A7AC 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* D9A7B0 80240E00 8E040084 */ lw $a0, 0x84($s0) -/* D9A7B4 80240E04 10820016 */ beq $a0, $v0, .L80240E60 -/* D9A7B8 80240E08 28820002 */ slti $v0, $a0, 2 -/* D9A7BC 80240E0C 10400005 */ beqz $v0, .L80240E24 -/* D9A7C0 80240E10 24020002 */ addiu $v0, $zero, 2 -/* D9A7C4 80240E14 10800007 */ beqz $a0, .L80240E34 -/* D9A7C8 80240E18 00000000 */ nop -/* D9A7CC 80240E1C 0809039D */ j .L80240E74 -/* D9A7D0 80240E20 00000000 */ nop -.L80240E24: -/* D9A7D4 80240E24 10820006 */ beq $a0, $v0, .L80240E40 -/* D9A7D8 80240E28 24020002 */ addiu $v0, $zero, 2 -/* D9A7DC 80240E2C 0809039D */ j .L80240E74 -/* D9A7E0 80240E30 00000000 */ nop -.L80240E34: -/* D9A7E4 80240E34 8CA20000 */ lw $v0, ($a1) -/* D9A7E8 80240E38 0809039A */ j .L80240E68 -/* D9A7EC 80240E3C 3C03000A */ lui $v1, 0xa -.L80240E40: -/* D9A7F0 80240E40 8CA20000 */ lw $v0, ($a1) -/* D9A7F4 80240E44 0809039A */ j .L80240E68 -/* D9A7F8 80240E48 3C030002 */ lui $v1, 2 -.L80240E4C: -/* D9A7FC 80240E4C 8E020084 */ lw $v0, 0x84($s0) -/* D9A800 80240E50 04400007 */ bltz $v0, .L80240E70 -/* D9A804 80240E54 28420002 */ slti $v0, $v0, 2 -/* D9A808 80240E58 10400006 */ beqz $v0, .L80240E74 -/* D9A80C 80240E5C 24020002 */ addiu $v0, $zero, 2 -.L80240E60: -/* D9A810 80240E60 8CA20000 */ lw $v0, ($a1) -/* D9A814 80240E64 3C030008 */ lui $v1, 8 -.L80240E68: -/* D9A818 80240E68 00431025 */ or $v0, $v0, $v1 -/* D9A81C 80240E6C ACA20000 */ sw $v0, ($a1) -.L80240E70: -/* D9A820 80240E70 24020002 */ addiu $v0, $zero, 2 -.L80240E74: -/* D9A824 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* D9A828 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* D9A82C 80240E7C 03E00008 */ jr $ra -/* D9A830 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_40/func_80240E84_D999B0.s b/asm/nonmatchings/world/area_pra/pra_40/func_80240E84_D999B0.s deleted file mode 100644 index b7a8aa4564..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/func_80240E84_D999B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E84_D9A834 -/* D9A834 80240E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9A838 80240E88 AFBF0010 */ sw $ra, 0x10($sp) -/* D9A83C 80240E8C 0C00EAD2 */ jal get_npc_safe -/* D9A840 80240E90 2404FFFC */ addiu $a0, $zero, -4 -/* D9A844 80240E94 0040202D */ daddu $a0, $v0, $zero -/* D9A848 80240E98 10800004 */ beqz $a0, .L80240EAC -/* D9A84C 80240E9C 3C03000A */ lui $v1, 0xa -/* D9A850 80240EA0 8C820000 */ lw $v0, ($a0) -/* D9A854 80240EA4 00431025 */ or $v0, $v0, $v1 -/* D9A858 80240EA8 AC820000 */ sw $v0, ($a0) -.L80240EAC: -/* D9A85C 80240EAC 8FBF0010 */ lw $ra, 0x10($sp) -/* D9A860 80240EB0 03E00008 */ jr $ra -/* D9A864 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_40/func_80240EB8_D999B0.s b/asm/nonmatchings/world/area_pra/pra_40/func_80240EB8_D999B0.s deleted file mode 100644 index f0f8949c32..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/func_80240EB8_D999B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D9A868 -/* D9A868 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9A86C 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D9A870 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D9A874 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D9A878 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D9A87C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D9A880 80240ED0 3C030008 */ lui $v1, 8 -/* D9A884 80240ED4 8C820000 */ lw $v0, ($a0) -/* D9A888 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D9A88C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D9A890 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D9A894 80240EE4 03E00008 */ jr $ra -/* D9A898 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_40/func_80240EEC_D999B0.s b/asm/nonmatchings/world/area_pra/pra_40/func_80240EEC_D999B0.s deleted file mode 100644 index f5d4965a22..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/func_80240EEC_D999B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC_D9A89C -/* D9A89C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9A8A0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* D9A8A4 80240EF4 0C00EAD2 */ jal get_npc_safe -/* D9A8A8 80240EF8 2404FFFC */ addiu $a0, $zero, -4 -/* D9A8AC 80240EFC 0040202D */ daddu $a0, $v0, $zero -/* D9A8B0 80240F00 10800004 */ beqz $a0, .L80240F14 -/* D9A8B4 80240F04 3C030002 */ lui $v1, 2 -/* D9A8B8 80240F08 8C820000 */ lw $v0, ($a0) -/* D9A8BC 80240F0C 00431025 */ or $v0, $v0, $v1 -/* D9A8C0 80240F10 AC820000 */ sw $v0, ($a0) -.L80240F14: -/* D9A8C4 80240F14 8FBF0010 */ lw $ra, 0x10($sp) -/* D9A8C8 80240F18 03E00008 */ jr $ra -/* D9A8CC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80240124_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80240124_CF7B70.s deleted file mode 100644 index cb05aae46a..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80240124_CF7B70.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_CF7C94 -/* CF7C94 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF7C98 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* CF7C9C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* CF7CA0 80240130 10A00005 */ beqz $a1, .L80240148 -/* CF7CA4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* CF7CA8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* CF7CAC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* CF7CB0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* CF7CB4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* CF7CB8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* CF7CBC 8024014C 1440000E */ bnez $v0, .L80240188 -/* CF7CC0 80240150 00000000 */ nop -/* CF7CC4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* CF7CC8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* CF7CCC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* CF7CD0 80240160 04610004 */ bgez $v1, .L80240174 -/* CF7CD4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* CF7CD8 80240168 3C020002 */ lui $v0, 2 -/* CF7CDC 8024016C 08090061 */ j .L80240184 -/* CF7CE0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* CF7CE4 80240174 3C040002 */ lui $a0, 2 -/* CF7CE8 80240178 0083102A */ slt $v0, $a0, $v1 -/* CF7CEC 8024017C 10400002 */ beqz $v0, .L80240188 -/* CF7CF0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* CF7CF4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* CF7CF8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* CF7CFC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* CF7D00 80240190 00000000 */ nop -/* CF7D04 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* CF7D08 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* CF7D0C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* CF7D10 802401A0 04610004 */ bgez $v1, .L802401B4 -/* CF7D14 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* CF7D18 802401A8 3C020002 */ lui $v0, 2 -/* CF7D1C 802401AC 08090071 */ j .L802401C4 -/* CF7D20 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* CF7D24 802401B4 3C040002 */ lui $a0, 2 -/* CF7D28 802401B8 0083102A */ slt $v0, $a0, $v1 -/* CF7D2C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* CF7D30 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* CF7D34 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* CF7D38 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* CF7D3C 802401CC 1440000E */ bnez $v0, .L80240208 -/* CF7D40 802401D0 00000000 */ nop -/* CF7D44 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* CF7D48 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* CF7D4C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* CF7D50 802401E0 04610004 */ bgez $v1, .L802401F4 -/* CF7D54 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* CF7D58 802401E8 3C020002 */ lui $v0, 2 -/* CF7D5C 802401EC 08090081 */ j .L80240204 -/* CF7D60 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* CF7D64 802401F4 3C040002 */ lui $a0, 2 -/* CF7D68 802401F8 0083102A */ slt $v0, $a0, $v1 -/* CF7D6C 802401FC 10400002 */ beqz $v0, .L80240208 -/* CF7D70 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* CF7D74 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* CF7D78 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* CF7D7C 8024020C 1440000E */ bnez $v0, .L80240248 -/* CF7D80 80240210 00000000 */ nop -/* CF7D84 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* CF7D88 80240218 8E020094 */ lw $v0, 0x94($s0) -/* CF7D8C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* CF7D90 80240220 04610004 */ bgez $v1, .L80240234 -/* CF7D94 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* CF7D98 80240228 3C020002 */ lui $v0, 2 -/* CF7D9C 8024022C 08090091 */ j .L80240244 -/* CF7DA0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* CF7DA4 80240234 3C040002 */ lui $a0, 2 -/* CF7DA8 80240238 0083102A */ slt $v0, $a0, $v1 -/* CF7DAC 8024023C 10400002 */ beqz $v0, .L80240248 -/* CF7DB0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* CF7DB4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* CF7DB8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* CF7DBC 8024024C 0C046F07 */ jal set_main_pan_u -/* CF7DC0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* CF7DC4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* CF7DC8 80240258 0C046F0D */ jal set_main_pan_v -/* CF7DCC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* CF7DD0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* CF7DD4 80240264 0C046F13 */ jal set_aux_pan_u -/* CF7DD8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* CF7DDC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* CF7DE0 80240270 0C046F19 */ jal set_aux_pan_v -/* CF7DE4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* CF7DE8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* CF7DEC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* CF7DF0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* CF7DF4 80240284 24420001 */ addiu $v0, $v0, 1 -/* CF7DF8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* CF7DFC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* CF7E00 80240290 24630001 */ addiu $v1, $v1, 1 -/* CF7E04 80240294 AE030078 */ sw $v1, 0x78($s0) -/* CF7E08 80240298 8E030070 */ lw $v1, 0x70($s0) -/* CF7E0C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* CF7E10 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* CF7E14 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* CF7E18 802402A8 0064182A */ slt $v1, $v1, $a0 -/* CF7E1C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* CF7E20 802402B0 14600002 */ bnez $v1, .L802402BC -/* CF7E24 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* CF7E28 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* CF7E2C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* CF7E30 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* CF7E34 802402C4 0043102A */ slt $v0, $v0, $v1 -/* CF7E38 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* CF7E3C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* CF7E40 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* CF7E44 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* CF7E48 802402D8 0043102A */ slt $v0, $v0, $v1 -/* CF7E4C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* CF7E50 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* CF7E54 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* CF7E58 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* CF7E5C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* CF7E60 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* CF7E64 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* CF7E68 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* CF7E6C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* CF7E70 80240300 0000102D */ daddu $v0, $zero, $zero -/* CF7E74 80240304 03E00008 */ jr $ra -/* CF7E78 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* CF7E7C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80240310_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80240310_CF7B70.s deleted file mode 100644 index fa72f354f1..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80240310_CF7B70.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_CF7E80 -/* CF7E80 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF7E84 80240314 AFB10014 */ sw $s1, 0x14($sp) -/* CF7E88 80240318 0080882D */ daddu $s1, $a0, $zero -/* CF7E8C 8024031C AFBF0018 */ sw $ra, 0x18($sp) -/* CF7E90 80240320 AFB00010 */ sw $s0, 0x10($sp) -/* CF7E94 80240324 8E30000C */ lw $s0, 0xc($s1) -/* CF7E98 80240328 8E050000 */ lw $a1, ($s0) -/* CF7E9C 8024032C 0C0B1EAF */ jal get_variable -/* CF7EA0 80240330 26100004 */ addiu $s0, $s0, 4 -/* CF7EA4 80240334 0C00EAD2 */ jal get_npc_safe -/* CF7EA8 80240338 0040202D */ daddu $a0, $v0, $zero -/* CF7EAC 8024033C 10400005 */ beqz $v0, .L80240354 -/* CF7EB0 80240340 00000000 */ nop -/* CF7EB4 80240344 8E050000 */ lw $a1, ($s0) -/* CF7EB8 80240348 844600A8 */ lh $a2, 0xa8($v0) -/* CF7EBC 8024034C 0C0B2026 */ jal set_variable -/* CF7EC0 80240350 0220202D */ daddu $a0, $s1, $zero -.L80240354: -/* CF7EC4 80240354 8FBF0018 */ lw $ra, 0x18($sp) -/* CF7EC8 80240358 8FB10014 */ lw $s1, 0x14($sp) -/* CF7ECC 8024035C 8FB00010 */ lw $s0, 0x10($sp) -/* CF7ED0 80240360 24020002 */ addiu $v0, $zero, 2 -/* CF7ED4 80240364 03E00008 */ jr $ra -/* CF7ED8 80240368 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_8024036C_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_8024036C_CF7B70.s deleted file mode 100644 index 3af04e028a..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_8024036C_CF7B70.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024036C_CF7EDC -/* CF7EDC 8024036C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CF7EE0 80240370 AFB10014 */ sw $s1, 0x14($sp) -/* CF7EE4 80240374 0080882D */ daddu $s1, $a0, $zero -/* CF7EE8 80240378 AFBF0024 */ sw $ra, 0x24($sp) -/* CF7EEC 8024037C AFB40020 */ sw $s4, 0x20($sp) -/* CF7EF0 80240380 AFB3001C */ sw $s3, 0x1c($sp) -/* CF7EF4 80240384 AFB20018 */ sw $s2, 0x18($sp) -/* CF7EF8 80240388 AFB00010 */ sw $s0, 0x10($sp) -/* CF7EFC 8024038C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* CF7F00 80240390 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* CF7F04 80240394 F7B80038 */ sdc1 $f24, 0x38($sp) -/* CF7F08 80240398 F7B60030 */ sdc1 $f22, 0x30($sp) -/* CF7F0C 8024039C F7B40028 */ sdc1 $f20, 0x28($sp) -/* CF7F10 802403A0 8E30000C */ lw $s0, 0xc($s1) -/* CF7F14 802403A4 8E130000 */ lw $s3, ($s0) -/* CF7F18 802403A8 26100004 */ addiu $s0, $s0, 4 -/* CF7F1C 802403AC 0C0B1EAF */ jal get_variable -/* CF7F20 802403B0 0260282D */ daddu $a1, $s3, $zero -/* CF7F24 802403B4 4482E000 */ mtc1 $v0, $f28 -/* CF7F28 802403B8 00000000 */ nop -/* CF7F2C 802403BC 4680E720 */ cvt.s.w $f28, $f28 -/* CF7F30 802403C0 8E140000 */ lw $s4, ($s0) -/* CF7F34 802403C4 26100004 */ addiu $s0, $s0, 4 -/* CF7F38 802403C8 0220202D */ daddu $a0, $s1, $zero -/* CF7F3C 802403CC 0C0B1EAF */ jal get_variable -/* CF7F40 802403D0 0280282D */ daddu $a1, $s4, $zero -/* CF7F44 802403D4 4482D000 */ mtc1 $v0, $f26 -/* CF7F48 802403D8 00000000 */ nop -/* CF7F4C 802403DC 4680D6A0 */ cvt.s.w $f26, $f26 -/* CF7F50 802403E0 8E100000 */ lw $s0, ($s0) -/* CF7F54 802403E4 0220202D */ daddu $a0, $s1, $zero -/* CF7F58 802403E8 0C0B1EAF */ jal get_variable -/* CF7F5C 802403EC 0200282D */ daddu $a1, $s0, $zero -/* CF7F60 802403F0 4482C000 */ mtc1 $v0, $f24 -/* CF7F64 802403F4 00000000 */ nop -/* CF7F68 802403F8 4680C620 */ cvt.s.w $f24, $f24 -/* CF7F6C 802403FC 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* CF7F70 80240400 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* CF7F74 80240404 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* CF7F78 80240408 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CF7F7C 8024040C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* CF7F80 80240410 44800000 */ mtc1 $zero, $f0 -/* CF7F84 80240414 00031080 */ sll $v0, $v1, 2 -/* CF7F88 80240418 00431021 */ addu $v0, $v0, $v1 -/* CF7F8C 8024041C 00021080 */ sll $v0, $v0, 2 -/* CF7F90 80240420 00431023 */ subu $v0, $v0, $v1 -/* CF7F94 80240424 000218C0 */ sll $v1, $v0, 3 -/* CF7F98 80240428 00431021 */ addu $v0, $v0, $v1 -/* CF7F9C 8024042C 000210C0 */ sll $v0, $v0, 3 -/* CF7FA0 80240430 46001032 */ c.eq.s $f2, $f0 -/* CF7FA4 80240434 3C01800B */ lui $at, 0x800b -/* CF7FA8 80240438 00220821 */ addu $at, $at, $v0 -/* CF7FAC 8024043C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* CF7FB0 80240440 45000005 */ bc1f .L80240458 -/* CF7FB4 80240444 00000000 */ nop -/* CF7FB8 80240448 3C0142C8 */ lui $at, 0x42c8 -/* CF7FBC 8024044C 44810000 */ mtc1 $at, $f0 -/* CF7FC0 80240450 0809011A */ j .L80240468 -/* CF7FC4 80240454 4600B581 */ sub.s $f22, $f22, $f0 -.L80240458: -/* CF7FC8 80240458 3C0142C8 */ lui $at, 0x42c8 -/* CF7FCC 8024045C 44810000 */ mtc1 $at, $f0 -/* CF7FD0 80240460 00000000 */ nop -/* CF7FD4 80240464 4600B580 */ add.s $f22, $f22, $f0 -.L80240468: -/* CF7FD8 80240468 0C00A6C9 */ jal clamp_angle -/* CF7FDC 8024046C 4600B306 */ mov.s $f12, $f22 -/* CF7FE0 80240470 46000586 */ mov.s $f22, $f0 -/* CF7FE4 80240474 3C014170 */ lui $at, 0x4170 -/* CF7FE8 80240478 4481A000 */ mtc1 $at, $f20 -/* CF7FEC 8024047C 0C00A8BB */ jal sin_deg -/* CF7FF0 80240480 4600B306 */ mov.s $f12, $f22 -/* CF7FF4 80240484 46140002 */ mul.s $f0, $f0, $f20 -/* CF7FF8 80240488 00000000 */ nop -/* CF7FFC 8024048C 864200B0 */ lh $v0, 0xb0($s2) -/* CF8000 80240490 3C013F00 */ lui $at, 0x3f00 -/* CF8004 80240494 44812000 */ mtc1 $at, $f4 -/* CF8008 80240498 44821000 */ mtc1 $v0, $f2 -/* CF800C 8024049C 00000000 */ nop -/* CF8010 802404A0 468010A0 */ cvt.s.w $f2, $f2 -/* CF8014 802404A4 46041082 */ mul.s $f2, $f2, $f4 -/* CF8018 802404A8 00000000 */ nop -/* CF801C 802404AC 4600E700 */ add.s $f28, $f28, $f0 -/* CF8020 802404B0 4602D680 */ add.s $f26, $f26, $f2 -/* CF8024 802404B4 0C00A8D4 */ jal cos_deg -/* CF8028 802404B8 4600B306 */ mov.s $f12, $f22 -/* CF802C 802404BC 46140002 */ mul.s $f0, $f0, $f20 -/* CF8030 802404C0 00000000 */ nop -/* CF8034 802404C4 0220202D */ daddu $a0, $s1, $zero -/* CF8038 802404C8 0260282D */ daddu $a1, $s3, $zero -/* CF803C 802404CC 4600E18D */ trunc.w.s $f6, $f28 -/* CF8040 802404D0 44063000 */ mfc1 $a2, $f6 -/* CF8044 802404D4 0C0B2026 */ jal set_variable -/* CF8048 802404D8 4600C601 */ sub.s $f24, $f24, $f0 -/* CF804C 802404DC 0220202D */ daddu $a0, $s1, $zero -/* CF8050 802404E0 4600D18D */ trunc.w.s $f6, $f26 -/* CF8054 802404E4 44063000 */ mfc1 $a2, $f6 -/* CF8058 802404E8 0C0B2026 */ jal set_variable -/* CF805C 802404EC 0280282D */ daddu $a1, $s4, $zero -/* CF8060 802404F0 0220202D */ daddu $a0, $s1, $zero -/* CF8064 802404F4 4600C18D */ trunc.w.s $f6, $f24 -/* CF8068 802404F8 44063000 */ mfc1 $a2, $f6 -/* CF806C 802404FC 0C0B2026 */ jal set_variable -/* CF8070 80240500 0200282D */ daddu $a1, $s0, $zero -/* CF8074 80240504 8FBF0024 */ lw $ra, 0x24($sp) -/* CF8078 80240508 8FB40020 */ lw $s4, 0x20($sp) -/* CF807C 8024050C 8FB3001C */ lw $s3, 0x1c($sp) -/* CF8080 80240510 8FB20018 */ lw $s2, 0x18($sp) -/* CF8084 80240514 8FB10014 */ lw $s1, 0x14($sp) -/* CF8088 80240518 8FB00010 */ lw $s0, 0x10($sp) -/* CF808C 8024051C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* CF8090 80240520 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* CF8094 80240524 D7B80038 */ ldc1 $f24, 0x38($sp) -/* CF8098 80240528 D7B60030 */ ldc1 $f22, 0x30($sp) -/* CF809C 8024052C D7B40028 */ ldc1 $f20, 0x28($sp) -/* CF80A0 80240530 24020002 */ addiu $v0, $zero, 2 -/* CF80A4 80240534 03E00008 */ jr $ra -/* CF80A8 80240538 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80240590_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80240590_CF7B70.s deleted file mode 100644 index 2d7fa2b4ac..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80240590_CF7B70.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240590_CF8100 -/* CF8100 80240590 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF8104 80240594 AFBF0010 */ sw $ra, 0x10($sp) -/* CF8108 80240598 8C82000C */ lw $v0, 0xc($a0) -/* CF810C 8024059C 0C0B1EAF */ jal get_variable -/* CF8110 802405A0 8C450000 */ lw $a1, ($v0) -/* CF8114 802405A4 3C018024 */ lui $at, 0x8024 -/* CF8118 802405A8 AC2232D4 */ sw $v0, 0x32d4($at) -/* CF811C 802405AC 24020002 */ addiu $v0, $zero, 2 -/* CF8120 802405B0 8FBF0010 */ lw $ra, 0x10($sp) -/* CF8124 802405B4 24030001 */ addiu $v1, $zero, 1 -/* CF8128 802405B8 3C018024 */ lui $at, 0x8024 -/* CF812C 802405BC AC2332D0 */ sw $v1, 0x32d0($at) -/* CF8130 802405C0 03E00008 */ jr $ra -/* CF8134 802405C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_802405C8_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_802405C8_CF7B70.s deleted file mode 100644 index 93409d509e..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_802405C8_CF7B70.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405C8_CF8138 -/* CF8138 802405C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF813C 802405CC AFBF0010 */ sw $ra, 0x10($sp) -/* CF8140 802405D0 8C82000C */ lw $v0, 0xc($a0) -/* CF8144 802405D4 0C0B1EAF */ jal get_variable -/* CF8148 802405D8 8C450000 */ lw $a1, ($v0) -/* CF814C 802405DC 0040182D */ daddu $v1, $v0, $zero -/* CF8150 802405E0 10600012 */ beqz $v1, .L8024062C -/* CF8154 802405E4 0000202D */ daddu $a0, $zero, $zero -/* CF8158 802405E8 8C620000 */ lw $v0, ($v1) -/* CF815C 802405EC 5040000A */ beql $v0, $zero, .L80240618 -/* CF8160 802405F0 00041080 */ sll $v0, $a0, 2 -/* CF8164 802405F4 3C058025 */ lui $a1, 0x8025 -/* CF8168 802405F8 24A5DBC0 */ addiu $a1, $a1, -0x2440 -.L802405FC: -/* CF816C 802405FC 24630004 */ addiu $v1, $v1, 4 -/* CF8170 80240600 24840001 */ addiu $a0, $a0, 1 -/* CF8174 80240604 ACA20000 */ sw $v0, ($a1) -/* CF8178 80240608 8C620000 */ lw $v0, ($v1) -/* CF817C 8024060C 1440FFFB */ bnez $v0, .L802405FC -/* CF8180 80240610 24A50004 */ addiu $a1, $a1, 4 -/* CF8184 80240614 00041080 */ sll $v0, $a0, 2 -.L80240618: -/* CF8188 80240618 3C018025 */ lui $at, 0x8025 -/* CF818C 8024061C 00220821 */ addu $at, $at, $v0 -/* CF8190 80240620 AC20DBC0 */ sw $zero, -0x2440($at) -/* CF8194 80240624 08090195 */ j .L80240654 -/* CF8198 80240628 00000000 */ nop -.L8024062C: -/* CF819C 8024062C 3C038025 */ lui $v1, 0x8025 -/* CF81A0 80240630 2463DBC0 */ addiu $v1, $v1, -0x2440 -/* CF81A4 80240634 0060282D */ daddu $a1, $v1, $zero -.L80240638: -/* CF81A8 80240638 24820010 */ addiu $v0, $a0, 0x10 -/* CF81AC 8024063C AC620000 */ sw $v0, ($v1) -/* CF81B0 80240640 24630004 */ addiu $v1, $v1, 4 -/* CF81B4 80240644 24840001 */ addiu $a0, $a0, 1 -/* CF81B8 80240648 28820070 */ slti $v0, $a0, 0x70 -/* CF81BC 8024064C 1440FFFA */ bnez $v0, .L80240638 -/* CF81C0 80240650 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80240654: -/* CF81C4 80240654 8FBF0010 */ lw $ra, 0x10($sp) -/* CF81C8 80240658 24020002 */ addiu $v0, $zero, 2 -/* CF81CC 8024065C 03E00008 */ jr $ra -/* CF81D0 80240660 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80240818_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80240818_CF7B70.s deleted file mode 100644 index dadba2d8a8..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80240818_CF7B70.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240818_CF8388 -/* CF8388 80240818 24020001 */ addiu $v0, $zero, 1 -/* CF838C 8024081C 3C018015 */ lui $at, %hi(D_80151310) -/* CF8390 80240820 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* CF8394 80240824 03E00008 */ jr $ra -/* CF8398 80240828 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_8024082C_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_8024082C_CF7B70.s deleted file mode 100644 index 3aa0d280ba..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_8024082C_CF7B70.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024082C_CF839C -/* CF839C 8024082C 3C018015 */ lui $at, %hi(D_80151310) -/* CF83A0 80240830 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* CF83A4 80240834 03E00008 */ jr $ra -/* CF83A8 80240838 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_8024083C_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_8024083C_CF7B70.s deleted file mode 100644 index 75704cbdd6..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_8024083C_CF7B70.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024083C_CF83AC -/* CF83AC 8024083C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CF83B0 80240840 AFB10024 */ sw $s1, 0x24($sp) -/* CF83B4 80240844 0080882D */ daddu $s1, $a0, $zero -/* CF83B8 80240848 3C05F840 */ lui $a1, 0xf840 -/* CF83BC 8024084C AFBF0044 */ sw $ra, 0x44($sp) -/* CF83C0 80240850 AFBE0040 */ sw $fp, 0x40($sp) -/* CF83C4 80240854 AFB7003C */ sw $s7, 0x3c($sp) -/* CF83C8 80240858 AFB60038 */ sw $s6, 0x38($sp) -/* CF83CC 8024085C AFB50034 */ sw $s5, 0x34($sp) -/* CF83D0 80240860 AFB40030 */ sw $s4, 0x30($sp) -/* CF83D4 80240864 AFB3002C */ sw $s3, 0x2c($sp) -/* CF83D8 80240868 AFB20028 */ sw $s2, 0x28($sp) -/* CF83DC 8024086C AFB00020 */ sw $s0, 0x20($sp) -/* CF83E0 80240870 8E3E0148 */ lw $fp, 0x148($s1) -/* CF83E4 80240874 0C0B1EAF */ jal get_variable -/* CF83E8 80240878 34A56268 */ ori $a1, $a1, 0x6268 -/* CF83EC 8024087C 0040802D */ daddu $s0, $v0, $zero -/* CF83F0 80240880 0220202D */ daddu $a0, $s1, $zero -/* CF83F4 80240884 3C05F840 */ lui $a1, 0xf840 -/* CF83F8 80240888 0C0B1EAF */ jal get_variable -/* CF83FC 8024088C 34A56269 */ ori $a1, $a1, 0x6269 -/* CF8400 80240890 0040B82D */ daddu $s7, $v0, $zero -/* CF8404 80240894 0220202D */ daddu $a0, $s1, $zero -/* CF8408 80240898 3C05F5DE */ lui $a1, 0xf5de -/* CF840C 8024089C 0C0B1EAF */ jal get_variable -/* CF8410 802408A0 34A502DE */ ori $a1, $a1, 0x2de -/* CF8414 802408A4 0040B02D */ daddu $s6, $v0, $zero -/* CF8418 802408A8 0220202D */ daddu $a0, $s1, $zero -/* CF841C 802408AC 3C05F5DE */ lui $a1, 0xf5de -/* CF8420 802408B0 0C0B1EAF */ jal get_variable -/* CF8424 802408B4 34A502DF */ ori $a1, $a1, 0x2df -/* CF8428 802408B8 0040A82D */ daddu $s5, $v0, $zero -/* CF842C 802408BC 93D3006D */ lbu $s3, 0x6d($fp) -/* CF8430 802408C0 32C2FFFF */ andi $v0, $s6, 0xffff -/* CF8434 802408C4 A7B30010 */ sh $s3, 0x10($sp) -/* CF8438 802408C8 93D2006E */ lbu $s2, 0x6e($fp) -/* CF843C 802408CC 93C7006F */ lbu $a3, 0x6f($fp) -/* CF8440 802408D0 3274FFFF */ andi $s4, $s3, 0xffff -/* CF8444 802408D4 12820003 */ beq $s4, $v0, .L802408E4 -/* CF8448 802408D8 A7A7001E */ sh $a3, 0x1e($sp) -/* CF844C 802408DC 0000B82D */ daddu $s7, $zero, $zero -/* CF8450 802408E0 02E0802D */ daddu $s0, $s7, $zero -.L802408E4: -/* CF8454 802408E4 3202FFFF */ andi $v0, $s0, 0xffff -/* CF8458 802408E8 14400016 */ bnez $v0, .L80240944 -/* CF845C 802408EC 0220202D */ daddu $a0, $s1, $zero -/* CF8460 802408F0 0C00A67F */ jal rand_int -/* CF8464 802408F4 24040064 */ addiu $a0, $zero, 0x64 -/* CF8468 802408F8 2842001E */ slti $v0, $v0, 0x1e -/* CF846C 802408FC 10400011 */ beqz $v0, .L80240944 -/* CF8470 80240900 0220202D */ daddu $a0, $s1, $zero -/* CF8474 80240904 0C00A67F */ jal rand_int -/* CF8478 80240908 2644FFFF */ addiu $a0, $s2, -1 -/* CF847C 8024090C 0040A82D */ daddu $s5, $v0, $zero -/* CF8480 80240910 0260B02D */ daddu $s6, $s3, $zero -/* CF8484 80240914 0220202D */ daddu $a0, $s1, $zero -/* CF8488 80240918 3C05F5DE */ lui $a1, 0xf5de -/* CF848C 8024091C 34A502DE */ ori $a1, $a1, 0x2de -/* CF8490 80240920 0C0B2026 */ jal set_variable -/* CF8494 80240924 0280302D */ daddu $a2, $s4, $zero -/* CF8498 80240928 0220202D */ daddu $a0, $s1, $zero -/* CF849C 8024092C 3C05F5DE */ lui $a1, 0xf5de -/* CF84A0 80240930 34A502DF */ ori $a1, $a1, 0x2df -/* CF84A4 80240934 0C0B2026 */ jal set_variable -/* CF84A8 80240938 32A6FFFF */ andi $a2, $s5, 0xffff -/* CF84AC 8024093C 24100001 */ addiu $s0, $zero, 1 -/* CF84B0 80240940 0220202D */ daddu $a0, $s1, $zero -.L80240944: -/* CF84B4 80240944 3C05F840 */ lui $a1, 0xf840 -/* CF84B8 80240948 34A56268 */ ori $a1, $a1, 0x6268 -/* CF84BC 8024094C 0C0B2026 */ jal set_variable -/* CF84C0 80240950 3206FFFF */ andi $a2, $s0, 0xffff -/* CF84C4 80240954 0220202D */ daddu $a0, $s1, $zero -/* CF84C8 80240958 3C05F840 */ lui $a1, 0xf840 -/* CF84CC 8024095C 34A56269 */ ori $a1, $a1, 0x6269 -/* CF84D0 80240960 0C0B2026 */ jal set_variable -/* CF84D4 80240964 32E6FFFF */ andi $a2, $s7, 0xffff -/* CF84D8 80240968 0000202D */ daddu $a0, $zero, $zero -/* CF84DC 8024096C 3C05F5DE */ lui $a1, 0xf5de -/* CF84E0 80240970 0C0B1EAF */ jal get_variable -/* CF84E4 80240974 34A502E0 */ ori $a1, $a1, 0x2e0 -/* CF84E8 80240978 0000202D */ daddu $a0, $zero, $zero -/* CF84EC 8024097C 3C05F5DE */ lui $a1, 0xf5de -/* CF84F0 80240980 34A50180 */ ori $a1, $a1, 0x180 -/* CF84F4 80240984 0C0B1EAF */ jal get_variable -/* CF84F8 80240988 0040802D */ daddu $s0, $v0, $zero -/* CF84FC 8024098C 0040282D */ daddu $a1, $v0, $zero -/* CF8500 80240990 0000182D */ daddu $v1, $zero, $zero -/* CF8504 80240994 3C068024 */ lui $a2, 0x8024 -/* CF8508 80240998 24C6373C */ addiu $a2, $a2, 0x373c -/* CF850C 8024099C 00C0202D */ daddu $a0, $a2, $zero -.L802409A0: -/* CF8510 802409A0 8C820000 */ lw $v0, ($a0) -/* CF8514 802409A4 00A2102A */ slt $v0, $a1, $v0 -/* CF8518 802409A8 14400006 */ bnez $v0, .L802409C4 -/* CF851C 802409AC 000310C0 */ sll $v0, $v1, 3 -/* CF8520 802409B0 24630001 */ addiu $v1, $v1, 1 -/* CF8524 802409B4 28620008 */ slti $v0, $v1, 8 -/* CF8528 802409B8 1440FFF9 */ bnez $v0, .L802409A0 -/* CF852C 802409BC 24840008 */ addiu $a0, $a0, 8 -/* CF8530 802409C0 000310C0 */ sll $v0, $v1, 3 -.L802409C4: -/* CF8534 802409C4 00461021 */ addu $v0, $v0, $a2 -/* CF8538 802409C8 8C420004 */ lw $v0, 4($v0) -/* CF853C 802409CC 97A30010 */ lhu $v1, 0x10($sp) -/* CF8540 802409D0 0202202A */ slt $a0, $s0, $v0 -/* CF8544 802409D4 32C2FFFF */ andi $v0, $s6, 0xffff -/* CF8548 802409D8 14620008 */ bne $v1, $v0, .L802409FC -/* CF854C 802409DC 32A2FFFF */ andi $v0, $s5, 0xffff -/* CF8550 802409E0 97A7001E */ lhu $a3, 0x1e($sp) -/* CF8554 802409E4 14E20005 */ bne $a3, $v0, .L802409FC -/* CF8558 802409E8 32E2FFFF */ andi $v0, $s7, 0xffff -/* CF855C 802409EC 14400003 */ bnez $v0, .L802409FC -/* CF8560 802409F0 00000000 */ nop -/* CF8564 802409F4 14800008 */ bnez $a0, .L80240A18 -/* CF8568 802409F8 24020001 */ addiu $v0, $zero, 1 -.L802409FC: -/* CF856C 802409FC 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* CF8570 80240A00 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* CF8574 80240A04 80420075 */ lb $v0, 0x75($v0) -/* CF8578 80240A08 10400005 */ beqz $v0, .L80240A20 -/* CF857C 80240A0C 00000000 */ nop -/* CF8580 80240A10 10800003 */ beqz $a0, .L80240A20 -/* CF8584 80240A14 24020001 */ addiu $v0, $zero, 1 -.L80240A18: -/* CF8588 80240A18 0809028B */ j .L80240A2C -/* CF858C 80240A1C AE220084 */ sw $v0, 0x84($s1) -.L80240A20: -/* CF8590 80240A20 0C00F9EB */ jal kill_enemy -/* CF8594 80240A24 03C0202D */ daddu $a0, $fp, $zero -/* CF8598 80240A28 AE200084 */ sw $zero, 0x84($s1) -.L80240A2C: -/* CF859C 80240A2C 8FBF0044 */ lw $ra, 0x44($sp) -/* CF85A0 80240A30 8FBE0040 */ lw $fp, 0x40($sp) -/* CF85A4 80240A34 8FB7003C */ lw $s7, 0x3c($sp) -/* CF85A8 80240A38 8FB60038 */ lw $s6, 0x38($sp) -/* CF85AC 80240A3C 8FB50034 */ lw $s5, 0x34($sp) -/* CF85B0 80240A40 8FB40030 */ lw $s4, 0x30($sp) -/* CF85B4 80240A44 8FB3002C */ lw $s3, 0x2c($sp) -/* CF85B8 80240A48 8FB20028 */ lw $s2, 0x28($sp) -/* CF85BC 80240A4C 8FB10024 */ lw $s1, 0x24($sp) -/* CF85C0 80240A50 8FB00020 */ lw $s0, 0x20($sp) -/* CF85C4 80240A54 24020002 */ addiu $v0, $zero, 2 -/* CF85C8 80240A58 03E00008 */ jr $ra -/* CF85CC 80240A5C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80240A60_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80240A60_CF7B70.s deleted file mode 100644 index b449a731d6..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80240A60_CF7B70.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A60_CF85D0 -/* CF85D0 80240A60 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF85D4 80240A64 AFBF0014 */ sw $ra, 0x14($sp) -/* CF85D8 80240A68 AFB00010 */ sw $s0, 0x10($sp) -/* CF85DC 80240A6C 0C00EABB */ jal get_npc_unsafe -/* CF85E0 80240A70 8C84014C */ lw $a0, 0x14c($a0) -/* CF85E4 80240A74 24040008 */ addiu $a0, $zero, 8 -/* CF85E8 80240A78 0040802D */ daddu $s0, $v0, $zero -/* CF85EC 80240A7C 3C028024 */ lui $v0, 0x8024 -/* CF85F0 80240A80 24420ACC */ addiu $v0, $v0, 0xacc -/* CF85F4 80240A84 0C00AB39 */ jal heap_malloc -/* CF85F8 80240A88 AE020008 */ sw $v0, 8($s0) -/* CF85FC 80240A8C 0040182D */ daddu $v1, $v0, $zero -/* CF8600 80240A90 AE030020 */ sw $v1, 0x20($s0) -/* CF8604 80240A94 AC600000 */ sw $zero, ($v1) -/* CF8608 80240A98 8FBF0014 */ lw $ra, 0x14($sp) -/* CF860C 80240A9C 8FB00010 */ lw $s0, 0x10($sp) -/* CF8610 80240AA0 24020001 */ addiu $v0, $zero, 1 -/* CF8614 80240AA4 03E00008 */ jr $ra -/* CF8618 80240AA8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80240AAC_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80240AAC_CF7B70.s deleted file mode 100644 index da8920679c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80240AAC_CF7B70.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AAC_CF861C -/* CF861C 80240AAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF8620 80240AB0 AFBF0010 */ sw $ra, 0x10($sp) -/* CF8624 80240AB4 0C00EABB */ jal get_npc_unsafe -/* CF8628 80240AB8 8C84014C */ lw $a0, 0x14c($a0) -/* CF862C 80240ABC 8FBF0010 */ lw $ra, 0x10($sp) -/* CF8630 80240AC0 0000102D */ daddu $v0, $zero, $zero -/* CF8634 80240AC4 03E00008 */ jr $ra -/* CF8638 80240AC8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80240B2C_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80240B2C_CF7B70.s deleted file mode 100644 index c5a5eb3f66..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80240B2C_CF7B70.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B2C_CF869C -/* CF869C 80240B2C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CF86A0 80240B30 AFB10014 */ sw $s1, 0x14($sp) -/* CF86A4 80240B34 0080882D */ daddu $s1, $a0, $zero -/* CF86A8 80240B38 AFBF0024 */ sw $ra, 0x24($sp) -/* CF86AC 80240B3C AFB40020 */ sw $s4, 0x20($sp) -/* CF86B0 80240B40 AFB3001C */ sw $s3, 0x1c($sp) -/* CF86B4 80240B44 AFB20018 */ sw $s2, 0x18($sp) -/* CF86B8 80240B48 10A00033 */ beqz $a1, .L80240C18 -/* CF86BC 80240B4C AFB00010 */ sw $s0, 0x10($sp) -/* CF86C0 80240B50 0C04760B */ jal func_8011D82C -/* CF86C4 80240B54 24040001 */ addiu $a0, $zero, 1 -/* CF86C8 80240B58 0000202D */ daddu $a0, $zero, $zero -/* CF86CC 80240B5C 0080282D */ daddu $a1, $a0, $zero -/* CF86D0 80240B60 0080302D */ daddu $a2, $a0, $zero -/* CF86D4 80240B64 0080382D */ daddu $a3, $a0, $zero -/* CF86D8 80240B68 0080802D */ daddu $s0, $a0, $zero -/* CF86DC 80240B6C 2414FFFC */ addiu $s4, $zero, -4 -/* CF86E0 80240B70 2413000E */ addiu $s3, $zero, 0xe -/* CF86E4 80240B74 3C120080 */ lui $s2, 0x80 -/* CF86E8 80240B78 3C038015 */ lui $v1, 0x8015 -/* CF86EC 80240B7C 8C6312F0 */ lw $v1, 0x12f0($v1) -/* CF86F0 80240B80 24020001 */ addiu $v0, $zero, 1 -/* CF86F4 80240B84 0C046F97 */ jal set_background_color_blend -/* CF86F8 80240B88 A0620000 */ sb $v0, ($v1) -.L80240B8C: -/* CF86FC 80240B8C 0C00E2B7 */ jal get_npc_by_index -/* CF8700 80240B90 0200202D */ daddu $a0, $s0, $zero -/* CF8704 80240B94 0040202D */ daddu $a0, $v0, $zero -/* CF8708 80240B98 5080000B */ beql $a0, $zero, .L80240BC8 -/* CF870C 80240B9C 26100001 */ addiu $s0, $s0, 1 -/* CF8710 80240BA0 8C820000 */ lw $v0, ($a0) -/* CF8714 80240BA4 50400008 */ beql $v0, $zero, .L80240BC8 -/* CF8718 80240BA8 26100001 */ addiu $s0, $s0, 1 -/* CF871C 80240BAC 808300A4 */ lb $v1, 0xa4($a0) -/* CF8720 80240BB0 10740005 */ beq $v1, $s4, .L80240BC8 -/* CF8724 80240BB4 26100001 */ addiu $s0, $s0, 1 -/* CF8728 80240BB8 10730003 */ beq $v1, $s3, .L80240BC8 -/* CF872C 80240BBC 00000000 */ nop -/* CF8730 80240BC0 00521025 */ or $v0, $v0, $s2 -/* CF8734 80240BC4 AC820000 */ sw $v0, ($a0) -.L80240BC8: -/* CF8738 80240BC8 2A020040 */ slti $v0, $s0, 0x40 -/* CF873C 80240BCC 1440FFEF */ bnez $v0, .L80240B8C -/* CF8740 80240BD0 00000000 */ nop -/* CF8744 80240BD4 0000802D */ daddu $s0, $zero, $zero -/* CF8748 80240BD8 3C120800 */ lui $s2, 0x800 -.L80240BDC: -/* CF874C 80240BDC 0C04C3D6 */ jal get_item_entity -/* CF8750 80240BE0 0200202D */ daddu $a0, $s0, $zero -/* CF8754 80240BE4 0040182D */ daddu $v1, $v0, $zero -/* CF8758 80240BE8 10600007 */ beqz $v1, .L80240C08 -/* CF875C 80240BEC 26100001 */ addiu $s0, $s0, 1 -/* CF8760 80240BF0 8C640000 */ lw $a0, ($v1) -/* CF8764 80240BF4 30820010 */ andi $v0, $a0, 0x10 -/* CF8768 80240BF8 10400003 */ beqz $v0, .L80240C08 -/* CF876C 80240BFC 00000000 */ nop -/* CF8770 80240C00 00921025 */ or $v0, $a0, $s2 -/* CF8774 80240C04 AC620000 */ sw $v0, ($v1) -.L80240C08: -/* CF8778 80240C08 2A020100 */ slti $v0, $s0, 0x100 -/* CF877C 80240C0C 1440FFF3 */ bnez $v0, .L80240BDC -/* CF8780 80240C10 00000000 */ nop -/* CF8784 80240C14 AE200070 */ sw $zero, 0x70($s1) -.L80240C18: -/* CF8788 80240C18 8E220070 */ lw $v0, 0x70($s1) -/* CF878C 80240C1C 24420008 */ addiu $v0, $v0, 8 -/* CF8790 80240C20 AE220070 */ sw $v0, 0x70($s1) -/* CF8794 80240C24 28420100 */ slti $v0, $v0, 0x100 -/* CF8798 80240C28 14400003 */ bnez $v0, .L80240C38 -/* CF879C 80240C2C 0000202D */ daddu $a0, $zero, $zero -/* CF87A0 80240C30 240200FF */ addiu $v0, $zero, 0xff -/* CF87A4 80240C34 AE220070 */ sw $v0, 0x70($s1) -.L80240C38: -/* CF87A8 80240C38 0080282D */ daddu $a1, $a0, $zero -/* CF87AC 80240C3C 92270073 */ lbu $a3, 0x73($s1) -/* CF87B0 80240C40 0C046F97 */ jal set_background_color_blend -/* CF87B4 80240C44 0080302D */ daddu $a2, $a0, $zero -/* CF87B8 80240C48 8E220070 */ lw $v0, 0x70($s1) -/* CF87BC 80240C4C 8FBF0024 */ lw $ra, 0x24($sp) -/* CF87C0 80240C50 8FB40020 */ lw $s4, 0x20($sp) -/* CF87C4 80240C54 8FB3001C */ lw $s3, 0x1c($sp) -/* CF87C8 80240C58 8FB20018 */ lw $s2, 0x18($sp) -/* CF87CC 80240C5C 8FB10014 */ lw $s1, 0x14($sp) -/* CF87D0 80240C60 8FB00010 */ lw $s0, 0x10($sp) -/* CF87D4 80240C64 384200FF */ xori $v0, $v0, 0xff -/* CF87D8 80240C68 2C420001 */ sltiu $v0, $v0, 1 -/* CF87DC 80240C6C 00021040 */ sll $v0, $v0, 1 -/* CF87E0 80240C70 03E00008 */ jr $ra -/* CF87E4 80240C74 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80240C78_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80240C78_CF7B70.s deleted file mode 100644 index 20513571b3..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80240C78_CF7B70.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C78_CF87E8 -/* CF87E8 80240C78 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CF87EC 80240C7C AFB00010 */ sw $s0, 0x10($sp) -/* CF87F0 80240C80 0080802D */ daddu $s0, $a0, $zero -/* CF87F4 80240C84 AFBF0020 */ sw $ra, 0x20($sp) -/* CF87F8 80240C88 AFB3001C */ sw $s3, 0x1c($sp) -/* CF87FC 80240C8C AFB20018 */ sw $s2, 0x18($sp) -/* CF8800 80240C90 10A00009 */ beqz $a1, .L80240CB8 -/* CF8804 80240C94 AFB10014 */ sw $s1, 0x14($sp) -/* CF8808 80240C98 0000202D */ daddu $a0, $zero, $zero -/* CF880C 80240C9C 0080282D */ daddu $a1, $a0, $zero -/* CF8810 80240CA0 0080302D */ daddu $a2, $a0, $zero -/* CF8814 80240CA4 0C046F97 */ jal set_background_color_blend -/* CF8818 80240CA8 240700FF */ addiu $a3, $zero, 0xff -/* CF881C 80240CAC 240200FF */ addiu $v0, $zero, 0xff -/* CF8820 80240CB0 AE020070 */ sw $v0, 0x70($s0) -/* CF8824 80240CB4 AE000074 */ sw $zero, 0x74($s0) -.L80240CB8: -/* CF8828 80240CB8 8E020070 */ lw $v0, 0x70($s0) -/* CF882C 80240CBC 2442FFF8 */ addiu $v0, $v0, -8 -/* CF8830 80240CC0 04410002 */ bgez $v0, .L80240CCC -/* CF8834 80240CC4 AE020070 */ sw $v0, 0x70($s0) -/* CF8838 80240CC8 AE000070 */ sw $zero, 0x70($s0) -.L80240CCC: -/* CF883C 80240CCC 0000202D */ daddu $a0, $zero, $zero -/* CF8840 80240CD0 0080282D */ daddu $a1, $a0, $zero -/* CF8844 80240CD4 92070073 */ lbu $a3, 0x73($s0) -/* CF8848 80240CD8 0C046F97 */ jal set_background_color_blend -/* CF884C 80240CDC 0080302D */ daddu $a2, $a0, $zero -/* CF8850 80240CE0 8E020070 */ lw $v0, 0x70($s0) -/* CF8854 80240CE4 14400006 */ bnez $v0, .L80240D00 -/* CF8858 80240CE8 00000000 */ nop -/* CF885C 80240CEC 8E020074 */ lw $v0, 0x74($s0) -/* CF8860 80240CF0 14400003 */ bnez $v0, .L80240D00 -/* CF8864 80240CF4 24020001 */ addiu $v0, $zero, 1 -/* CF8868 80240CF8 08090373 */ j .L80240DCC -/* CF886C 80240CFC AE020074 */ sw $v0, 0x74($s0) -.L80240D00: -/* CF8870 80240D00 8E030074 */ lw $v1, 0x74($s0) -/* CF8874 80240D04 24020001 */ addiu $v0, $zero, 1 -/* CF8878 80240D08 14620031 */ bne $v1, $v0, .L80240DD0 -/* CF887C 80240D0C 0000102D */ daddu $v0, $zero, $zero -/* CF8880 80240D10 0C04760B */ jal func_8011D82C -/* CF8884 80240D14 0000202D */ daddu $a0, $zero, $zero -/* CF8888 80240D18 0000802D */ daddu $s0, $zero, $zero -/* CF888C 80240D1C 2413FFFC */ addiu $s3, $zero, -4 -/* CF8890 80240D20 2412000E */ addiu $s2, $zero, 0xe -/* CF8894 80240D24 3C11FF7F */ lui $s1, 0xff7f -/* CF8898 80240D28 3C028015 */ lui $v0, 0x8015 -/* CF889C 80240D2C 8C4212F0 */ lw $v0, 0x12f0($v0) -/* CF88A0 80240D30 3631FFFF */ ori $s1, $s1, 0xffff -/* CF88A4 80240D34 A0400000 */ sb $zero, ($v0) -.L80240D38: -/* CF88A8 80240D38 0C00E2B7 */ jal get_npc_by_index -/* CF88AC 80240D3C 0200202D */ daddu $a0, $s0, $zero -/* CF88B0 80240D40 0040202D */ daddu $a0, $v0, $zero -/* CF88B4 80240D44 5080000B */ beql $a0, $zero, .L80240D74 -/* CF88B8 80240D48 26100001 */ addiu $s0, $s0, 1 -/* CF88BC 80240D4C 8C820000 */ lw $v0, ($a0) -/* CF88C0 80240D50 50400008 */ beql $v0, $zero, .L80240D74 -/* CF88C4 80240D54 26100001 */ addiu $s0, $s0, 1 -/* CF88C8 80240D58 808300A4 */ lb $v1, 0xa4($a0) -/* CF88CC 80240D5C 10730005 */ beq $v1, $s3, .L80240D74 -/* CF88D0 80240D60 26100001 */ addiu $s0, $s0, 1 -/* CF88D4 80240D64 10720003 */ beq $v1, $s2, .L80240D74 -/* CF88D8 80240D68 00000000 */ nop -/* CF88DC 80240D6C 00511024 */ and $v0, $v0, $s1 -/* CF88E0 80240D70 AC820000 */ sw $v0, ($a0) -.L80240D74: -/* CF88E4 80240D74 2A020040 */ slti $v0, $s0, 0x40 -/* CF88E8 80240D78 1440FFEF */ bnez $v0, .L80240D38 -/* CF88EC 80240D7C 00000000 */ nop -/* CF88F0 80240D80 0000802D */ daddu $s0, $zero, $zero -/* CF88F4 80240D84 3C11F7FF */ lui $s1, 0xf7ff -/* CF88F8 80240D88 3631FFFF */ ori $s1, $s1, 0xffff -.L80240D8C: -/* CF88FC 80240D8C 0C04C3D6 */ jal get_item_entity -/* CF8900 80240D90 0200202D */ daddu $a0, $s0, $zero -/* CF8904 80240D94 0040182D */ daddu $v1, $v0, $zero -/* CF8908 80240D98 10600007 */ beqz $v1, .L80240DB8 -/* CF890C 80240D9C 26100001 */ addiu $s0, $s0, 1 -/* CF8910 80240DA0 8C640000 */ lw $a0, ($v1) -/* CF8914 80240DA4 30820010 */ andi $v0, $a0, 0x10 -/* CF8918 80240DA8 10400003 */ beqz $v0, .L80240DB8 -/* CF891C 80240DAC 00000000 */ nop -/* CF8920 80240DB0 00911024 */ and $v0, $a0, $s1 -/* CF8924 80240DB4 AC620000 */ sw $v0, ($v1) -.L80240DB8: -/* CF8928 80240DB8 2A020100 */ slti $v0, $s0, 0x100 -/* CF892C 80240DBC 1440FFF3 */ bnez $v0, .L80240D8C -/* CF8930 80240DC0 24020002 */ addiu $v0, $zero, 2 -/* CF8934 80240DC4 08090374 */ j .L80240DD0 -/* CF8938 80240DC8 00000000 */ nop -.L80240DCC: -/* CF893C 80240DCC 0000102D */ daddu $v0, $zero, $zero -.L80240DD0: -/* CF8940 80240DD0 8FBF0020 */ lw $ra, 0x20($sp) -/* CF8944 80240DD4 8FB3001C */ lw $s3, 0x1c($sp) -/* CF8948 80240DD8 8FB20018 */ lw $s2, 0x18($sp) -/* CF894C 80240DDC 8FB10014 */ lw $s1, 0x14($sp) -/* CF8950 80240DE0 8FB00010 */ lw $s0, 0x10($sp) -/* CF8954 80240DE4 03E00008 */ jr $ra -/* CF8958 80240DE8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80240DEC_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80240DEC_CF7B70.s deleted file mode 100644 index afb8b827a9..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80240DEC_CF7B70.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DEC_CF895C -/* CF895C 80240DEC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF8960 80240DF0 AFB00010 */ sw $s0, 0x10($sp) -/* CF8964 80240DF4 3C108011 */ lui $s0, %hi(gPlayerData) -/* CF8968 80240DF8 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* CF896C 80240DFC AFBF0018 */ sw $ra, 0x18($sp) -/* CF8970 80240E00 AFB10014 */ sw $s1, 0x14($sp) -/* CF8974 80240E04 960302C0 */ lhu $v1, 0x2c0($s0) -/* CF8978 80240E08 2C6203E7 */ sltiu $v0, $v1, 0x3e7 -/* CF897C 80240E0C 10400003 */ beqz $v0, .L80240E1C -/* CF8980 80240E10 0080882D */ daddu $s1, $a0, $zero -/* CF8984 80240E14 24620001 */ addiu $v0, $v1, 1 -/* CF8988 80240E18 A60202C0 */ sh $v0, 0x2c0($s0) -.L80240E1C: -/* CF898C 80240E1C 3C05F5DE */ lui $a1, 0xf5de -/* CF8990 80240E20 34A502E0 */ ori $a1, $a1, 0x2e0 -/* CF8994 80240E24 0C0B1EAF */ jal get_variable -/* CF8998 80240E28 0000202D */ daddu $a0, $zero, $zero -/* CF899C 80240E2C 3C038024 */ lui $v1, 0x8024 -/* CF89A0 80240E30 00621821 */ addu $v1, $v1, $v0 -/* CF89A4 80240E34 906336FC */ lbu $v1, 0x36fc($v1) -/* CF89A8 80240E38 8E220084 */ lw $v0, 0x84($s1) -/* CF89AC 80240E3C 54430006 */ bnel $v0, $v1, .L80240E58 -/* CF89B0 80240E40 AE200084 */ sw $zero, 0x84($s1) -/* CF89B4 80240E44 24020001 */ addiu $v0, $zero, 1 -/* CF89B8 80240E48 AE220084 */ sw $v0, 0x84($s1) -/* CF89BC 80240E4C 960202C2 */ lhu $v0, 0x2c2($s0) -/* CF89C0 80240E50 24420001 */ addiu $v0, $v0, 1 -/* CF89C4 80240E54 A60202C2 */ sh $v0, 0x2c2($s0) -.L80240E58: -/* CF89C8 80240E58 8FBF0018 */ lw $ra, 0x18($sp) -/* CF89CC 80240E5C 8FB10014 */ lw $s1, 0x14($sp) -/* CF89D0 80240E60 8FB00010 */ lw $s0, 0x10($sp) -/* CF89D4 80240E64 24020002 */ addiu $v0, $zero, 2 -/* CF89D8 80240E68 03E00008 */ jr $ra -/* CF89DC 80240E6C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80240E70_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80240E70_CF7B70.s deleted file mode 100644 index 93a9e803ea..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80240E70_CF7B70.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E70_CF89E0 -/* CF89E0 80240E70 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CF89E4 80240E74 AFB1001C */ sw $s1, 0x1c($sp) -/* CF89E8 80240E78 AFBF0020 */ sw $ra, 0x20($sp) -/* CF89EC 80240E7C AFB00018 */ sw $s0, 0x18($sp) -/* CF89F0 80240E80 F7B60030 */ sdc1 $f22, 0x30($sp) -/* CF89F4 80240E84 F7B40028 */ sdc1 $f20, 0x28($sp) -/* CF89F8 80240E88 10A00060 */ beqz $a1, .L8024100C -/* CF89FC 80240E8C 0080882D */ daddu $s1, $a0, $zero -/* CF8A00 80240E90 3C05F4AC */ lui $a1, 0xf4ac -/* CF8A04 80240E94 0C0B1EAF */ jal get_variable -/* CF8A08 80240E98 34A5D481 */ ori $a1, $a1, 0xd481 -/* CF8A0C 80240E9C 0220202D */ daddu $a0, $s1, $zero -/* CF8A10 80240EA0 3C05F4AC */ lui $a1, 0xf4ac -/* CF8A14 80240EA4 4482B000 */ mtc1 $v0, $f22 -/* CF8A18 80240EA8 00000000 */ nop -/* CF8A1C 80240EAC 4680B5A0 */ cvt.s.w $f22, $f22 -/* CF8A20 80240EB0 0C0B1EAF */ jal get_variable -/* CF8A24 80240EB4 34A5D482 */ ori $a1, $a1, 0xd482 -/* CF8A28 80240EB8 0220202D */ daddu $a0, $s1, $zero -/* CF8A2C 80240EBC 3C05F4AC */ lui $a1, 0xf4ac -/* CF8A30 80240EC0 4482A000 */ mtc1 $v0, $f20 -/* CF8A34 80240EC4 00000000 */ nop -/* CF8A38 80240EC8 4680A520 */ cvt.s.w $f20, $f20 -/* CF8A3C 80240ECC 0C0B1EAF */ jal get_variable -/* CF8A40 80240ED0 34A5D483 */ ori $a1, $a1, 0xd483 -/* CF8A44 80240ED4 44821000 */ mtc1 $v0, $f2 -/* CF8A48 80240ED8 00000000 */ nop -/* CF8A4C 80240EDC 468010A0 */ cvt.s.w $f2, $f2 -/* CF8A50 80240EE0 4405B000 */ mfc1 $a1, $f22 -/* CF8A54 80240EE4 4406A000 */ mfc1 $a2, $f20 -/* CF8A58 80240EE8 44071000 */ mfc1 $a3, $f2 -/* CF8A5C 80240EEC 0C01C574 */ jal func_800715D0 -/* CF8A60 80240EF0 0000202D */ daddu $a0, $zero, $zero -/* CF8A64 80240EF4 0220202D */ daddu $a0, $s1, $zero -/* CF8A68 80240EF8 3C05F4AC */ lui $a1, 0xf4ac -/* CF8A6C 80240EFC 34A5D481 */ ori $a1, $a1, 0xd481 -/* CF8A70 80240F00 3C108025 */ lui $s0, 0x8025 -/* CF8A74 80240F04 2610DF18 */ addiu $s0, $s0, -0x20e8 -/* CF8A78 80240F08 0C0B1EAF */ jal get_variable -/* CF8A7C 80240F0C AE020000 */ sw $v0, ($s0) -/* CF8A80 80240F10 0220202D */ daddu $a0, $s1, $zero -/* CF8A84 80240F14 3C05F4AC */ lui $a1, 0xf4ac -/* CF8A88 80240F18 4482B000 */ mtc1 $v0, $f22 -/* CF8A8C 80240F1C 00000000 */ nop -/* CF8A90 80240F20 4680B5A0 */ cvt.s.w $f22, $f22 -/* CF8A94 80240F24 0C0B1EAF */ jal get_variable -/* CF8A98 80240F28 34A5D482 */ ori $a1, $a1, 0xd482 -/* CF8A9C 80240F2C 0220202D */ daddu $a0, $s1, $zero -/* CF8AA0 80240F30 3C05F4AC */ lui $a1, 0xf4ac -/* CF8AA4 80240F34 4482A000 */ mtc1 $v0, $f20 -/* CF8AA8 80240F38 00000000 */ nop -/* CF8AAC 80240F3C 4680A520 */ cvt.s.w $f20, $f20 -/* CF8AB0 80240F40 0C0B1EAF */ jal get_variable -/* CF8AB4 80240F44 34A5D483 */ ori $a1, $a1, 0xd483 -/* CF8AB8 80240F48 44821000 */ mtc1 $v0, $f2 -/* CF8ABC 80240F4C 00000000 */ nop -/* CF8AC0 80240F50 468010A0 */ cvt.s.w $f2, $f2 -/* CF8AC4 80240F54 4405B000 */ mfc1 $a1, $f22 -/* CF8AC8 80240F58 4406A000 */ mfc1 $a2, $f20 -/* CF8ACC 80240F5C 44071000 */ mfc1 $a3, $f2 -/* CF8AD0 80240F60 0C01C604 */ jal func_80071810 -/* CF8AD4 80240F64 0000202D */ daddu $a0, $zero, $zero -/* CF8AD8 80240F68 0220202D */ daddu $a0, $s1, $zero -/* CF8ADC 80240F6C 3C05F4AC */ lui $a1, 0xf4ac -/* CF8AE0 80240F70 3C018025 */ lui $at, 0x8025 -/* CF8AE4 80240F74 AC22DF1C */ sw $v0, -0x20e4($at) -/* CF8AE8 80240F78 0C0B1EAF */ jal get_variable -/* CF8AEC 80240F7C 34A5D481 */ ori $a1, $a1, 0xd481 -/* CF8AF0 80240F80 0220202D */ daddu $a0, $s1, $zero -/* CF8AF4 80240F84 3C05F4AC */ lui $a1, 0xf4ac -/* CF8AF8 80240F88 4482B000 */ mtc1 $v0, $f22 -/* CF8AFC 80240F8C 00000000 */ nop -/* CF8B00 80240F90 4680B5A0 */ cvt.s.w $f22, $f22 -/* CF8B04 80240F94 0C0B1EAF */ jal get_variable -/* CF8B08 80240F98 34A5D482 */ ori $a1, $a1, 0xd482 -/* CF8B0C 80240F9C 0220202D */ daddu $a0, $s1, $zero -/* CF8B10 80240FA0 3C05F4AC */ lui $a1, 0xf4ac -/* CF8B14 80240FA4 4482A000 */ mtc1 $v0, $f20 -/* CF8B18 80240FA8 00000000 */ nop -/* CF8B1C 80240FAC 4680A520 */ cvt.s.w $f20, $f20 -/* CF8B20 80240FB0 0C0B1EAF */ jal get_variable -/* CF8B24 80240FB4 34A5D483 */ ori $a1, $a1, 0xd483 -/* CF8B28 80240FB8 44821000 */ mtc1 $v0, $f2 -/* CF8B2C 80240FBC 00000000 */ nop -/* CF8B30 80240FC0 468010A0 */ cvt.s.w $f2, $f2 -/* CF8B34 80240FC4 4405B000 */ mfc1 $a1, $f22 -/* CF8B38 80240FC8 4406A000 */ mfc1 $a2, $f20 -/* CF8B3C 80240FCC 3C013F80 */ lui $at, 0x3f80 -/* CF8B40 80240FD0 44810000 */ mtc1 $at, $f0 -/* CF8B44 80240FD4 44071000 */ mfc1 $a3, $f2 -/* CF8B48 80240FD8 0000202D */ daddu $a0, $zero, $zero -/* CF8B4C 80240FDC AFA00014 */ sw $zero, 0x14($sp) -/* CF8B50 80240FE0 0C01CA24 */ jal func_80072890 -/* CF8B54 80240FE4 E7A00010 */ swc1 $f0, 0x10($sp) -/* CF8B58 80240FE8 8E030000 */ lw $v1, ($s0) -/* CF8B5C 80240FEC 8C64000C */ lw $a0, 0xc($v1) -/* CF8B60 80240FF0 3C018025 */ lui $at, 0x8025 -/* CF8B64 80240FF4 AC22DF20 */ sw $v0, -0x20e0($at) -/* CF8B68 80240FF8 AC800018 */ sw $zero, 0x18($a0) -/* CF8B6C 80240FFC AC800020 */ sw $zero, 0x20($a0) -/* CF8B70 80241000 AC800024 */ sw $zero, 0x24($a0) -/* CF8B74 80241004 AC800028 */ sw $zero, 0x28($a0) -/* CF8B78 80241008 AC80001C */ sw $zero, 0x1c($a0) -.L8024100C: -/* CF8B7C 8024100C 3C028025 */ lui $v0, 0x8025 -/* CF8B80 80241010 8C42DF18 */ lw $v0, -0x20e8($v0) -/* CF8B84 80241014 8C44000C */ lw $a0, 0xc($v0) -/* CF8B88 80241018 8C820020 */ lw $v0, 0x20($a0) -/* CF8B8C 8024101C 8C830028 */ lw $v1, 0x28($a0) -/* CF8B90 80241020 2442000A */ addiu $v0, $v0, 0xa -/* CF8B94 80241024 AC820020 */ sw $v0, 0x20($a0) -/* CF8B98 80241028 8C820024 */ lw $v0, 0x24($a0) -/* CF8B9C 8024102C 2463000A */ addiu $v1, $v1, 0xa -/* CF8BA0 80241030 AC830028 */ sw $v1, 0x28($a0) -/* CF8BA4 80241034 8C830018 */ lw $v1, 0x18($a0) -/* CF8BA8 80241038 2442000A */ addiu $v0, $v0, 0xa -/* CF8BAC 8024103C AC820024 */ sw $v0, 0x24($a0) -/* CF8BB0 80241040 8C82001C */ lw $v0, 0x1c($a0) -/* CF8BB4 80241044 2463000A */ addiu $v1, $v1, 0xa -/* CF8BB8 80241048 AC830018 */ sw $v1, 0x18($a0) -/* CF8BBC 8024104C 286300FF */ slti $v1, $v1, 0xff -/* CF8BC0 80241050 2442000A */ addiu $v0, $v0, 0xa -/* CF8BC4 80241054 AC82001C */ sw $v0, 0x1c($a0) -/* CF8BC8 80241058 14600004 */ bnez $v1, .L8024106C -/* CF8BCC 8024105C 0000102D */ daddu $v0, $zero, $zero -/* CF8BD0 80241060 240200FF */ addiu $v0, $zero, 0xff -/* CF8BD4 80241064 AC820018 */ sw $v0, 0x18($a0) -/* CF8BD8 80241068 24020002 */ addiu $v0, $zero, 2 -.L8024106C: -/* CF8BDC 8024106C 8FBF0020 */ lw $ra, 0x20($sp) -/* CF8BE0 80241070 8FB1001C */ lw $s1, 0x1c($sp) -/* CF8BE4 80241074 8FB00018 */ lw $s0, 0x18($sp) -/* CF8BE8 80241078 D7B60030 */ ldc1 $f22, 0x30($sp) -/* CF8BEC 8024107C D7B40028 */ ldc1 $f20, 0x28($sp) -/* CF8BF0 80241080 03E00008 */ jr $ra -/* CF8BF4 80241084 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_8024113C_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_8024113C_CF7B70.s deleted file mode 100644 index d734fbeb0f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_8024113C_CF7B70.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024113C_CF8CAC -/* CF8CAC 8024113C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF8CB0 80241140 AFBF0010 */ sw $ra, 0x10($sp) -/* CF8CB4 80241144 8C82000C */ lw $v0, 0xc($a0) -/* CF8CB8 80241148 0C0B1EAF */ jal get_variable -/* CF8CBC 8024114C 8C450000 */ lw $a1, ($v0) -/* CF8CC0 80241150 3C038025 */ lui $v1, 0x8025 -/* CF8CC4 80241154 8C63DF18 */ lw $v1, -0x20e8($v1) -/* CF8CC8 80241158 8C63000C */ lw $v1, 0xc($v1) -/* CF8CCC 8024115C AC620034 */ sw $v0, 0x34($v1) -/* CF8CD0 80241160 8FBF0010 */ lw $ra, 0x10($sp) -/* CF8CD4 80241164 24020002 */ addiu $v0, $zero, 2 -/* CF8CD8 80241168 03E00008 */ jr $ra -/* CF8CDC 8024116C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80241170_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80241170_CF7B70.s deleted file mode 100644 index fd42da8ef7..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80241170_CF7B70.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241170_CF8CE0 -/* CF8CE0 80241170 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF8CE4 80241174 AFBF0010 */ sw $ra, 0x10($sp) -/* CF8CE8 80241178 8C82000C */ lw $v0, 0xc($a0) -/* CF8CEC 8024117C 0C0B1EAF */ jal get_variable -/* CF8CF0 80241180 8C450000 */ lw $a1, ($v0) -/* CF8CF4 80241184 0040202D */ daddu $a0, $v0, $zero -/* CF8CF8 80241188 3C028025 */ lui $v0, 0x8025 -/* CF8CFC 8024118C 8C42DF18 */ lw $v0, -0x20e8($v0) -/* CF8D00 80241190 24030001 */ addiu $v1, $zero, 1 -/* CF8D04 80241194 8C45000C */ lw $a1, 0xc($v0) -/* CF8D08 80241198 1083000D */ beq $a0, $v1, .L802411D0 -/* CF8D0C 8024119C 28820002 */ slti $v0, $a0, 2 -/* CF8D10 802411A0 10400005 */ beqz $v0, .L802411B8 -/* CF8D14 802411A4 24020002 */ addiu $v0, $zero, 2 -/* CF8D18 802411A8 10800007 */ beqz $a0, .L802411C8 -/* CF8D1C 802411AC 240200C0 */ addiu $v0, $zero, 0xc0 -/* CF8D20 802411B0 08090478 */ j .L802411E0 -/* CF8D24 802411B4 ACA00038 */ sw $zero, 0x38($a1) -.L802411B8: -/* CF8D28 802411B8 10820008 */ beq $a0, $v0, .L802411DC -/* CF8D2C 802411BC 24020040 */ addiu $v0, $zero, 0x40 -/* CF8D30 802411C0 08090478 */ j .L802411E0 -/* CF8D34 802411C4 ACA00038 */ sw $zero, 0x38($a1) -.L802411C8: -/* CF8D38 802411C8 08090478 */ j .L802411E0 -/* CF8D3C 802411CC ACA20038 */ sw $v0, 0x38($a1) -.L802411D0: -/* CF8D40 802411D0 24020080 */ addiu $v0, $zero, 0x80 -/* CF8D44 802411D4 08090478 */ j .L802411E0 -/* CF8D48 802411D8 ACA20038 */ sw $v0, 0x38($a1) -.L802411DC: -/* CF8D4C 802411DC ACA20038 */ sw $v0, 0x38($a1) -.L802411E0: -/* CF8D50 802411E0 8FBF0010 */ lw $ra, 0x10($sp) -/* CF8D54 802411E4 24020002 */ addiu $v0, $zero, 2 -/* CF8D58 802411E8 03E00008 */ jr $ra -/* CF8D5C 802411EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_802411F0_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_802411F0_CF7B70.s deleted file mode 100644 index af537c7ca8..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_802411F0_CF7B70.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411F0_CF8D60 -/* CF8D60 802411F0 3C028025 */ lui $v0, 0x8025 -/* CF8D64 802411F4 8C42DF20 */ lw $v0, -0x20e0($v0) -/* CF8D68 802411F8 8C42000C */ lw $v0, 0xc($v0) -/* CF8D6C 802411FC AC40001C */ sw $zero, 0x1c($v0) -/* CF8D70 80241200 03E00008 */ jr $ra -/* CF8D74 80241204 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80241224_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80241224_CF7B70.s deleted file mode 100644 index ecf660d0db..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80241224_CF7B70.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241224_CF8D94 -/* CF8D94 80241224 3C028025 */ lui $v0, 0x8025 -/* CF8D98 80241228 8C42DF20 */ lw $v0, -0x20e0($v0) -/* CF8D9C 8024122C 8C43000C */ lw $v1, 0xc($v0) -/* CF8DA0 80241230 24020002 */ addiu $v0, $zero, 2 -/* CF8DA4 80241234 03E00008 */ jr $ra -/* CF8DA8 80241238 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_8024126C_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_8024126C_CF7B70.s deleted file mode 100644 index 5c5430a400..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_8024126C_CF7B70.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024126C_CF8DDC -/* CF8DDC 8024126C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF8DE0 80241270 AFB10014 */ sw $s1, 0x14($sp) -/* CF8DE4 80241274 0080882D */ daddu $s1, $a0, $zero -/* CF8DE8 80241278 AFBF0018 */ sw $ra, 0x18($sp) -/* CF8DEC 8024127C AFB00010 */ sw $s0, 0x10($sp) -/* CF8DF0 80241280 8E30000C */ lw $s0, 0xc($s1) -/* CF8DF4 80241284 8E050000 */ lw $a1, ($s0) -/* CF8DF8 80241288 0C0B1EAF */ jal get_variable -/* CF8DFC 8024128C 26100004 */ addiu $s0, $s0, 4 -/* CF8E00 80241290 0220202D */ daddu $a0, $s1, $zero -/* CF8E04 80241294 8E050000 */ lw $a1, ($s0) -/* CF8E08 80241298 0C0B210B */ jal get_float_variable -/* CF8E0C 8024129C 0040802D */ daddu $s0, $v0, $zero -/* CF8E10 802412A0 24020002 */ addiu $v0, $zero, 2 -/* CF8E14 802412A4 00501804 */ sllv $v1, $s0, $v0 -/* CF8E18 802412A8 00701821 */ addu $v1, $v1, $s0 -/* CF8E1C 802412AC 00431804 */ sllv $v1, $v1, $v0 -/* CF8E20 802412B0 00701823 */ subu $v1, $v1, $s0 -/* CF8E24 802412B4 000320C0 */ sll $a0, $v1, 3 -/* CF8E28 802412B8 00641821 */ addu $v1, $v1, $a0 -/* CF8E2C 802412BC 000318C0 */ sll $v1, $v1, 3 -/* CF8E30 802412C0 3C01800B */ lui $at, 0x800b -/* CF8E34 802412C4 00230821 */ addu $at, $at, $v1 -/* CF8E38 802412C8 E4201D98 */ swc1 $f0, 0x1d98($at) -/* CF8E3C 802412CC 8FBF0018 */ lw $ra, 0x18($sp) -/* CF8E40 802412D0 8FB10014 */ lw $s1, 0x14($sp) -/* CF8E44 802412D4 8FB00010 */ lw $s0, 0x10($sp) -/* CF8E48 802412D8 03E00008 */ jr $ra -/* CF8E4C 802412DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_802412E0_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_802412E0_CF7B70.s deleted file mode 100644 index 06fac4e40f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_802412E0_CF7B70.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412E0_CF8E50 -/* CF8E50 802412E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF8E54 802412E4 AFB10014 */ sw $s1, 0x14($sp) -/* CF8E58 802412E8 0080882D */ daddu $s1, $a0, $zero -/* CF8E5C 802412EC AFBF0018 */ sw $ra, 0x18($sp) -/* CF8E60 802412F0 AFB00010 */ sw $s0, 0x10($sp) -/* CF8E64 802412F4 8E30000C */ lw $s0, 0xc($s1) -/* CF8E68 802412F8 8E050000 */ lw $a1, ($s0) -/* CF8E6C 802412FC 0C0B1EAF */ jal get_variable -/* CF8E70 80241300 26100004 */ addiu $s0, $s0, 4 -/* CF8E74 80241304 00021880 */ sll $v1, $v0, 2 -/* CF8E78 80241308 00621821 */ addu $v1, $v1, $v0 -/* CF8E7C 8024130C 00031880 */ sll $v1, $v1, 2 -/* CF8E80 80241310 00621823 */ subu $v1, $v1, $v0 -/* CF8E84 80241314 000310C0 */ sll $v0, $v1, 3 -/* CF8E88 80241318 00621821 */ addu $v1, $v1, $v0 -/* CF8E8C 8024131C 000318C0 */ sll $v1, $v1, 3 -/* CF8E90 80241320 3C01800B */ lui $at, 0x800b -/* CF8E94 80241324 00230821 */ addu $at, $at, $v1 -/* CF8E98 80241328 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* CF8E9C 8024132C 3C014480 */ lui $at, 0x4480 -/* CF8EA0 80241330 44810000 */ mtc1 $at, $f0 -/* CF8EA4 80241334 00000000 */ nop -/* CF8EA8 80241338 46001082 */ mul.s $f2, $f2, $f0 -/* CF8EAC 8024133C 00000000 */ nop -/* CF8EB0 80241340 3C01CD5B */ lui $at, 0xcd5b -/* CF8EB4 80241344 34215858 */ ori $at, $at, 0x5858 -/* CF8EB8 80241348 44810000 */ mtc1 $at, $f0 -/* CF8EBC 8024134C 00000000 */ nop -/* CF8EC0 80241350 46001080 */ add.s $f2, $f2, $f0 -/* CF8EC4 80241354 8E050000 */ lw $a1, ($s0) -/* CF8EC8 80241358 4600110D */ trunc.w.s $f4, $f2 -/* CF8ECC 8024135C 44062000 */ mfc1 $a2, $f4 -/* CF8ED0 80241360 0C0B2026 */ jal set_variable -/* CF8ED4 80241364 0220202D */ daddu $a0, $s1, $zero -/* CF8ED8 80241368 8FBF0018 */ lw $ra, 0x18($sp) -/* CF8EDC 8024136C 8FB10014 */ lw $s1, 0x14($sp) -/* CF8EE0 80241370 8FB00010 */ lw $s0, 0x10($sp) -/* CF8EE4 80241374 24020002 */ addiu $v0, $zero, 2 -/* CF8EE8 80241378 03E00008 */ jr $ra -/* CF8EEC 8024137C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_8024151C_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_8024151C_CF7B70.s deleted file mode 100644 index 50b2d10126..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_8024151C_CF7B70.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024151C_CF908C -/* CF908C 8024151C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* CF9090 80241520 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* CF9094 80241524 10A00002 */ beqz $a1, .L80241530 -/* CF9098 80241528 2402003C */ addiu $v0, $zero, 0x3c -/* CF909C 8024152C AC820070 */ sw $v0, 0x70($a0) -.L80241530: -/* CF90A0 80241530 C4620080 */ lwc1 $f2, 0x80($v1) -/* CF90A4 80241534 3C0141F0 */ lui $at, 0x41f0 -/* CF90A8 80241538 44810000 */ mtc1 $at, $f0 -/* CF90AC 8024153C 00000000 */ nop -/* CF90B0 80241540 46001000 */ add.s $f0, $f2, $f0 -/* CF90B4 80241544 3C0143B4 */ lui $at, 0x43b4 -/* CF90B8 80241548 44811000 */ mtc1 $at, $f2 -/* CF90BC 8024154C 00000000 */ nop -/* CF90C0 80241550 4600103E */ c.le.s $f2, $f0 -/* CF90C4 80241554 00000000 */ nop -/* CF90C8 80241558 45000003 */ bc1f .L80241568 -/* CF90CC 8024155C E4600080 */ swc1 $f0, 0x80($v1) -/* CF90D0 80241560 46020001 */ sub.s $f0, $f0, $f2 -/* CF90D4 80241564 E4600080 */ swc1 $f0, 0x80($v1) -.L80241568: -/* CF90D8 80241568 8C820070 */ lw $v0, 0x70($a0) -/* CF90DC 8024156C 2442FFFF */ addiu $v0, $v0, -1 -/* CF90E0 80241570 AC820070 */ sw $v0, 0x70($a0) -/* CF90E4 80241574 000217C3 */ sra $v0, $v0, 0x1f -/* CF90E8 80241578 03E00008 */ jr $ra -/* CF90EC 8024157C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80241580_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80241580_CF7B70.s deleted file mode 100644 index d9ad39c33f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80241580_CF7B70.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241580_CF90F0 -/* CF90F0 80241580 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF90F4 80241584 AFB10014 */ sw $s1, 0x14($sp) -/* CF90F8 80241588 0080882D */ daddu $s1, $a0, $zero -/* CF90FC 8024158C AFB00010 */ sw $s0, 0x10($sp) -/* CF9100 80241590 00A0802D */ daddu $s0, $a1, $zero -/* CF9104 80241594 AFBF0018 */ sw $ra, 0x18($sp) -/* CF9108 80241598 0C00EABB */ jal get_npc_unsafe -/* CF910C 8024159C 2404FFFC */ addiu $a0, $zero, -4 -/* CF9110 802415A0 12000003 */ beqz $s0, .L802415B0 -/* CF9114 802415A4 0040182D */ daddu $v1, $v0, $zero -/* CF9118 802415A8 2402003C */ addiu $v0, $zero, 0x3c -/* CF911C 802415AC AE220070 */ sw $v0, 0x70($s1) -.L802415B0: -/* CF9120 802415B0 C462000C */ lwc1 $f2, 0xc($v1) -/* CF9124 802415B4 3C0141F0 */ lui $at, 0x41f0 -/* CF9128 802415B8 44810000 */ mtc1 $at, $f0 -/* CF912C 802415BC 00000000 */ nop -/* CF9130 802415C0 46001000 */ add.s $f0, $f2, $f0 -/* CF9134 802415C4 3C0143B4 */ lui $at, 0x43b4 -/* CF9138 802415C8 44811000 */ mtc1 $at, $f2 -/* CF913C 802415CC 00000000 */ nop -/* CF9140 802415D0 4600103E */ c.le.s $f2, $f0 -/* CF9144 802415D4 00000000 */ nop -/* CF9148 802415D8 45000003 */ bc1f .L802415E8 -/* CF914C 802415DC E460000C */ swc1 $f0, 0xc($v1) -/* CF9150 802415E0 46020001 */ sub.s $f0, $f0, $f2 -/* CF9154 802415E4 E460000C */ swc1 $f0, 0xc($v1) -.L802415E8: -/* CF9158 802415E8 8E230070 */ lw $v1, 0x70($s1) -/* CF915C 802415EC 2463FFFF */ addiu $v1, $v1, -1 -/* CF9160 802415F0 000317C3 */ sra $v0, $v1, 0x1f -/* CF9164 802415F4 AE230070 */ sw $v1, 0x70($s1) -/* CF9168 802415F8 8FBF0018 */ lw $ra, 0x18($sp) -/* CF916C 802415FC 8FB10014 */ lw $s1, 0x14($sp) -/* CF9170 80241600 8FB00010 */ lw $s0, 0x10($sp) -/* CF9174 80241604 30420002 */ andi $v0, $v0, 2 -/* CF9178 80241608 03E00008 */ jr $ra -/* CF917C 8024160C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80241610_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80241610_CF7B70.s deleted file mode 100644 index ada9d7a6c1..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80241610_CF7B70.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241610_CF9180 -/* CF9180 80241610 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CF9184 80241614 AFB10014 */ sw $s1, 0x14($sp) -/* CF9188 80241618 0080882D */ daddu $s1, $a0, $zero -/* CF918C 8024161C AFB00010 */ sw $s0, 0x10($sp) -/* CF9190 80241620 00A0802D */ daddu $s0, $a1, $zero -/* CF9194 80241624 AFBF001C */ sw $ra, 0x1c($sp) -/* CF9198 80241628 AFB20018 */ sw $s2, 0x18($sp) -/* CF919C 8024162C F7B40020 */ sdc1 $f20, 0x20($sp) -/* CF91A0 80241630 0C00EABB */ jal get_npc_unsafe -/* CF91A4 80241634 2404FFFC */ addiu $a0, $zero, -4 -/* CF91A8 80241638 12000017 */ beqz $s0, .L80241698 -/* CF91AC 8024163C 0040902D */ daddu $s2, $v0, $zero -/* CF91B0 80241640 0220202D */ daddu $a0, $s1, $zero -/* CF91B4 80241644 3C05FE36 */ lui $a1, 0xfe36 -/* CF91B8 80241648 0C0B210B */ jal get_float_variable -/* CF91BC 8024164C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* CF91C0 80241650 0220202D */ daddu $a0, $s1, $zero -/* CF91C4 80241654 3C05FE36 */ lui $a1, 0xfe36 -/* CF91C8 80241658 3C014270 */ lui $at, 0x4270 -/* CF91CC 8024165C 4481A000 */ mtc1 $at, $f20 -/* CF91D0 80241660 34A53C85 */ ori $a1, $a1, 0x3c85 -/* CF91D4 80241664 46140003 */ div.s $f0, $f0, $f20 -/* CF91D8 80241668 0C0B210B */ jal get_float_variable -/* CF91DC 8024166C E6200074 */ swc1 $f0, 0x74($s1) -/* CF91E0 80241670 0220202D */ daddu $a0, $s1, $zero -/* CF91E4 80241674 3C05FE36 */ lui $a1, 0xfe36 -/* CF91E8 80241678 34A53C81 */ ori $a1, $a1, 0x3c81 -/* CF91EC 8024167C 46140003 */ div.s $f0, $f0, $f20 -/* CF91F0 80241680 0C0B210B */ jal get_float_variable -/* CF91F4 80241684 E6200078 */ swc1 $f0, 0x78($s1) -/* CF91F8 80241688 46140003 */ div.s $f0, $f0, $f20 -/* CF91FC 8024168C 2402003C */ addiu $v0, $zero, 0x3c -/* CF9200 80241690 E620007C */ swc1 $f0, 0x7c($s1) -/* CF9204 80241694 AE220070 */ sw $v0, 0x70($s1) -.L80241698: -/* CF9208 80241698 C6400038 */ lwc1 $f0, 0x38($s2) -/* CF920C 8024169C C6220074 */ lwc1 $f2, 0x74($s1) -/* CF9210 802416A0 46020000 */ add.s $f0, $f0, $f2 -/* CF9214 802416A4 E6400038 */ swc1 $f0, 0x38($s2) -/* CF9218 802416A8 C640003C */ lwc1 $f0, 0x3c($s2) -/* CF921C 802416AC C6220078 */ lwc1 $f2, 0x78($s1) -/* CF9220 802416B0 46020000 */ add.s $f0, $f0, $f2 -/* CF9224 802416B4 E640003C */ swc1 $f0, 0x3c($s2) -/* CF9228 802416B8 C6400040 */ lwc1 $f0, 0x40($s2) -/* CF922C 802416BC C622007C */ lwc1 $f2, 0x7c($s1) -/* CF9230 802416C0 46020000 */ add.s $f0, $f0, $f2 -/* CF9234 802416C4 E6400040 */ swc1 $f0, 0x40($s2) -/* CF9238 802416C8 8E230070 */ lw $v1, 0x70($s1) -/* CF923C 802416CC 2463FFFF */ addiu $v1, $v1, -1 -/* CF9240 802416D0 2C620001 */ sltiu $v0, $v1, 1 -/* CF9244 802416D4 AE230070 */ sw $v1, 0x70($s1) -/* CF9248 802416D8 8FBF001C */ lw $ra, 0x1c($sp) -/* CF924C 802416DC 8FB20018 */ lw $s2, 0x18($sp) -/* CF9250 802416E0 8FB10014 */ lw $s1, 0x14($sp) -/* CF9254 802416E4 8FB00010 */ lw $s0, 0x10($sp) -/* CF9258 802416E8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* CF925C 802416EC 00021040 */ sll $v0, $v0, 1 -/* CF9260 802416F0 03E00008 */ jr $ra -/* CF9264 802416F4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_802416F8_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_802416F8_CF7B70.s deleted file mode 100644 index bdba73fd8b..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_802416F8_CF7B70.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416F8_CF9268 -/* CF9268 802416F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF926C 802416FC 3C058025 */ lui $a1, 0x8025 -/* CF9270 80241700 8CA5DF10 */ lw $a1, -0x20f0($a1) -/* CF9274 80241704 AFBF0010 */ sw $ra, 0x10($sp) -/* CF9278 80241708 0C0B1EAF */ jal get_variable -/* CF927C 8024170C 0000202D */ daddu $a0, $zero, $zero -/* CF9280 80241710 0040182D */ daddu $v1, $v0, $zero -/* CF9284 80241714 24020001 */ addiu $v0, $zero, 1 -/* CF9288 80241718 14620006 */ bne $v1, $v0, .L80241734 -/* CF928C 8024171C 24020002 */ addiu $v0, $zero, 2 -/* CF9290 80241720 44800000 */ mtc1 $zero, $f0 -/* CF9294 80241724 00000000 */ nop -/* CF9298 80241728 44050000 */ mfc1 $a1, $f0 -/* CF929C 8024172C 080905D3 */ j .L8024174C -/* CF92A0 80241730 0000202D */ daddu $a0, $zero, $zero -.L80241734: -/* CF92A4 80241734 14620008 */ bne $v1, $v0, .L80241758 -/* CF92A8 80241738 24040001 */ addiu $a0, $zero, 1 -/* CF92AC 8024173C 44800000 */ mtc1 $zero, $f0 -/* CF92B0 80241740 00000000 */ nop -/* CF92B4 80241744 44050000 */ mfc1 $a1, $f0 -/* CF92B8 80241748 00000000 */ nop -.L8024174C: -/* CF92BC 8024174C 00A0302D */ daddu $a2, $a1, $zero -/* CF92C0 80241750 0C01C5A4 */ jal func_80071690 -/* CF92C4 80241754 00A0382D */ daddu $a3, $a1, $zero -.L80241758: -/* CF92C8 80241758 8FBF0010 */ lw $ra, 0x10($sp) -/* CF92CC 8024175C 03E00008 */ jr $ra -/* CF92D0 80241760 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80241764_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80241764_CF7B70.s deleted file mode 100644 index b5cae0653b..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80241764_CF7B70.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241764_CF92D4 -/* CF92D4 80241764 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF92D8 80241768 3C058024 */ lui $a1, 0x8024 -/* CF92DC 8024176C 24A516F8 */ addiu $a1, $a1, 0x16f8 -/* CF92E0 80241770 AFBF0010 */ sw $ra, 0x10($sp) -/* CF92E4 80241774 0C048C8F */ jal bind_dynamic_entity_7 -/* CF92E8 80241778 0000202D */ daddu $a0, $zero, $zero -/* CF92EC 8024177C 8FBF0010 */ lw $ra, 0x10($sp) -/* CF92F0 80241780 3C018025 */ lui $at, 0x8025 -/* CF92F4 80241784 AC22DEF8 */ sw $v0, -0x2108($at) -/* CF92F8 80241788 24020002 */ addiu $v0, $zero, 2 -/* CF92FC 8024178C 03E00008 */ jr $ra -/* CF9300 80241790 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80241A10_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80241A10_CF7B70.s deleted file mode 100644 index 32fc33f0a3..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80241A10_CF7B70.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A10_CF9580 -/* CF9580 80241A10 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF9584 80241A14 AFB00010 */ sw $s0, 0x10($sp) -/* CF9588 80241A18 0080802D */ daddu $s0, $a0, $zero -/* CF958C 80241A1C AFBF0014 */ sw $ra, 0x14($sp) -/* CF9590 80241A20 0C00EABB */ jal get_npc_unsafe -/* CF9594 80241A24 8E04008C */ lw $a0, 0x8c($s0) -/* CF9598 80241A28 0040282D */ daddu $a1, $v0, $zero -/* CF959C 80241A2C 8E040094 */ lw $a0, 0x94($s0) -/* CF95A0 80241A30 8CA30028 */ lw $v1, 0x28($a1) -/* CF95A4 80241A34 ACA40028 */ sw $a0, 0x28($a1) -/* CF95A8 80241A38 8FBF0014 */ lw $ra, 0x14($sp) -/* CF95AC 80241A3C 8FB00010 */ lw $s0, 0x10($sp) -/* CF95B0 80241A40 24020002 */ addiu $v0, $zero, 2 -/* CF95B4 80241A44 3C018025 */ lui $at, 0x8025 -/* CF95B8 80241A48 AC23DF24 */ sw $v1, -0x20dc($at) -/* CF95BC 80241A4C 03E00008 */ jr $ra -/* CF95C0 80241A50 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80241A80_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80241A80_CF7B70.s deleted file mode 100644 index 38ab059e13..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80241A80_CF7B70.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A80_CF95F0 -/* CF95F0 80241A80 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF95F4 80241A84 AFB20018 */ sw $s2, 0x18($sp) -/* CF95F8 80241A88 0080902D */ daddu $s2, $a0, $zero -/* CF95FC 80241A8C AFBF001C */ sw $ra, 0x1c($sp) -/* CF9600 80241A90 AFB10014 */ sw $s1, 0x14($sp) -/* CF9604 80241A94 AFB00010 */ sw $s0, 0x10($sp) -/* CF9608 80241A98 8E50000C */ lw $s0, 0xc($s2) -/* CF960C 80241A9C 8E050000 */ lw $a1, ($s0) -/* CF9610 80241AA0 0C0B1EAF */ jal get_variable -/* CF9614 80241AA4 26100004 */ addiu $s0, $s0, 4 -/* CF9618 80241AA8 0C04C3D6 */ jal get_item_entity -/* CF961C 80241AAC 0040202D */ daddu $a0, $v0, $zero -/* CF9620 80241AB0 8E050000 */ lw $a1, ($s0) -/* CF9624 80241AB4 26100004 */ addiu $s0, $s0, 4 -/* CF9628 80241AB8 0040882D */ daddu $s1, $v0, $zero -/* CF962C 80241ABC C6200008 */ lwc1 $f0, 8($s1) -/* CF9630 80241AC0 4600008D */ trunc.w.s $f2, $f0 -/* CF9634 80241AC4 44061000 */ mfc1 $a2, $f2 -/* CF9638 80241AC8 0C0B2026 */ jal set_variable -/* CF963C 80241ACC 0240202D */ daddu $a0, $s2, $zero -/* CF9640 80241AD0 8E050000 */ lw $a1, ($s0) -/* CF9644 80241AD4 26100004 */ addiu $s0, $s0, 4 -/* CF9648 80241AD8 C620000C */ lwc1 $f0, 0xc($s1) -/* CF964C 80241ADC 4600008D */ trunc.w.s $f2, $f0 -/* CF9650 80241AE0 44061000 */ mfc1 $a2, $f2 -/* CF9654 80241AE4 0C0B2026 */ jal set_variable -/* CF9658 80241AE8 0240202D */ daddu $a0, $s2, $zero -/* CF965C 80241AEC C6200010 */ lwc1 $f0, 0x10($s1) -/* CF9660 80241AF0 8E050000 */ lw $a1, ($s0) -/* CF9664 80241AF4 4600008D */ trunc.w.s $f2, $f0 -/* CF9668 80241AF8 44061000 */ mfc1 $a2, $f2 -/* CF966C 80241AFC 0C0B2026 */ jal set_variable -/* CF9670 80241B00 0240202D */ daddu $a0, $s2, $zero -/* CF9674 80241B04 8FBF001C */ lw $ra, 0x1c($sp) -/* CF9678 80241B08 8FB20018 */ lw $s2, 0x18($sp) -/* CF967C 80241B0C 8FB10014 */ lw $s1, 0x14($sp) -/* CF9680 80241B10 8FB00010 */ lw $s0, 0x10($sp) -/* CF9684 80241B14 24020002 */ addiu $v0, $zero, 2 -/* CF9688 80241B18 03E00008 */ jr $ra -/* CF968C 80241B1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80241B20_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80241B20_CF7B70.s deleted file mode 100644 index 3a129746a4..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80241B20_CF7B70.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B20_CF9690 -/* CF9690 80241B20 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CF9694 80241B24 AFB10014 */ sw $s1, 0x14($sp) -/* CF9698 80241B28 0080882D */ daddu $s1, $a0, $zero -/* CF969C 80241B2C AFBF0020 */ sw $ra, 0x20($sp) -/* CF96A0 80241B30 AFB3001C */ sw $s3, 0x1c($sp) -/* CF96A4 80241B34 AFB20018 */ sw $s2, 0x18($sp) -/* CF96A8 80241B38 AFB00010 */ sw $s0, 0x10($sp) -/* CF96AC 80241B3C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* CF96B0 80241B40 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* CF96B4 80241B44 F7B80038 */ sdc1 $f24, 0x38($sp) -/* CF96B8 80241B48 F7B60030 */ sdc1 $f22, 0x30($sp) -/* CF96BC 80241B4C F7B40028 */ sdc1 $f20, 0x28($sp) -/* CF96C0 80241B50 8E30000C */ lw $s0, 0xc($s1) -/* CF96C4 80241B54 8E050000 */ lw $a1, ($s0) -/* CF96C8 80241B58 0C0B1EAF */ jal get_variable -/* CF96CC 80241B5C 26100004 */ addiu $s0, $s0, 4 -/* CF96D0 80241B60 8E050000 */ lw $a1, ($s0) -/* CF96D4 80241B64 26100004 */ addiu $s0, $s0, 4 -/* CF96D8 80241B68 0220202D */ daddu $a0, $s1, $zero -/* CF96DC 80241B6C 0C0B1EAF */ jal get_variable -/* CF96E0 80241B70 0040902D */ daddu $s2, $v0, $zero -/* CF96E4 80241B74 0220202D */ daddu $a0, $s1, $zero -/* CF96E8 80241B78 8E050000 */ lw $a1, ($s0) -/* CF96EC 80241B7C 0C0B1EAF */ jal get_variable -/* CF96F0 80241B80 0040982D */ daddu $s3, $v0, $zero -/* CF96F4 80241B84 3C10800B */ lui $s0, %hi(gCameras) -/* CF96F8 80241B88 26101D80 */ addiu $s0, $s0, %lo(gCameras) -/* CF96FC 80241B8C C60C006C */ lwc1 $f12, 0x6c($s0) -/* CF9700 80241B90 3C014387 */ lui $at, 0x4387 -/* CF9704 80241B94 4481B000 */ mtc1 $at, $f22 -/* CF9708 80241B98 00000000 */ nop -/* CF970C 80241B9C 46166300 */ add.s $f12, $f12, $f22 -/* CF9710 80241BA0 4482C000 */ mtc1 $v0, $f24 -/* CF9714 80241BA4 00000000 */ nop -/* CF9718 80241BA8 4680C620 */ cvt.s.w $f24, $f24 -/* CF971C 80241BAC 3C0142C8 */ lui $at, 0x42c8 -/* CF9720 80241BB0 4481D000 */ mtc1 $at, $f26 -/* CF9724 80241BB4 0C00A8BB */ jal sin_deg -/* CF9728 80241BB8 46186300 */ add.s $f12, $f12, $f24 -/* CF972C 80241BBC 461A0002 */ mul.s $f0, $f0, $f26 -/* CF9730 80241BC0 00000000 */ nop -/* CF9734 80241BC4 4492A000 */ mtc1 $s2, $f20 -/* CF9738 80241BC8 00000000 */ nop -/* CF973C 80241BCC 4680A520 */ cvt.s.w $f20, $f20 -/* CF9740 80241BD0 4600A000 */ add.s $f0, $f20, $f0 -/* CF9744 80241BD4 4600008D */ trunc.w.s $f2, $f0 -/* CF9748 80241BD8 E6220084 */ swc1 $f2, 0x84($s1) -/* CF974C 80241BDC C60C006C */ lwc1 $f12, 0x6c($s0) -/* CF9750 80241BE0 46166300 */ add.s $f12, $f12, $f22 -/* CF9754 80241BE4 0C00A8D4 */ jal cos_deg -/* CF9758 80241BE8 46186300 */ add.s $f12, $f12, $f24 -/* CF975C 80241BEC 461A0002 */ mul.s $f0, $f0, $f26 -/* CF9760 80241BF0 00000000 */ nop -/* CF9764 80241BF4 4493B000 */ mtc1 $s3, $f22 -/* CF9768 80241BF8 00000000 */ nop -/* CF976C 80241BFC 4680B5A0 */ cvt.s.w $f22, $f22 -/* CF9770 80241C00 4600B001 */ sub.s $f0, $f22, $f0 -/* CF9774 80241C04 3C0142B4 */ lui $at, 0x42b4 -/* CF9778 80241C08 4481E000 */ mtc1 $at, $f28 -/* CF977C 80241C0C 4600008D */ trunc.w.s $f2, $f0 -/* CF9780 80241C10 E6220088 */ swc1 $f2, 0x88($s1) -/* CF9784 80241C14 C60C006C */ lwc1 $f12, 0x6c($s0) -/* CF9788 80241C18 461C6300 */ add.s $f12, $f12, $f28 -/* CF978C 80241C1C 0C00A8BB */ jal sin_deg -/* CF9790 80241C20 46186300 */ add.s $f12, $f12, $f24 -/* CF9794 80241C24 461A0002 */ mul.s $f0, $f0, $f26 -/* CF9798 80241C28 00000000 */ nop -/* CF979C 80241C2C 4600A500 */ add.s $f20, $f20, $f0 -/* CF97A0 80241C30 4600A08D */ trunc.w.s $f2, $f20 -/* CF97A4 80241C34 E622008C */ swc1 $f2, 0x8c($s1) -/* CF97A8 80241C38 C60C006C */ lwc1 $f12, 0x6c($s0) -/* CF97AC 80241C3C 461C6300 */ add.s $f12, $f12, $f28 -/* CF97B0 80241C40 0C00A8D4 */ jal cos_deg -/* CF97B4 80241C44 46186300 */ add.s $f12, $f12, $f24 -/* CF97B8 80241C48 461A0002 */ mul.s $f0, $f0, $f26 -/* CF97BC 80241C4C 00000000 */ nop -/* CF97C0 80241C50 4600B581 */ sub.s $f22, $f22, $f0 -/* CF97C4 80241C54 4600B08D */ trunc.w.s $f2, $f22 -/* CF97C8 80241C58 E6220090 */ swc1 $f2, 0x90($s1) -/* CF97CC 80241C5C 8FBF0020 */ lw $ra, 0x20($sp) -/* CF97D0 80241C60 8FB3001C */ lw $s3, 0x1c($sp) -/* CF97D4 80241C64 8FB20018 */ lw $s2, 0x18($sp) -/* CF97D8 80241C68 8FB10014 */ lw $s1, 0x14($sp) -/* CF97DC 80241C6C 8FB00010 */ lw $s0, 0x10($sp) -/* CF97E0 80241C70 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* CF97E4 80241C74 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* CF97E8 80241C78 D7B80038 */ ldc1 $f24, 0x38($sp) -/* CF97EC 80241C7C D7B60030 */ ldc1 $f22, 0x30($sp) -/* CF97F0 80241C80 D7B40028 */ ldc1 $f20, 0x28($sp) -/* CF97F4 80241C84 24020002 */ addiu $v0, $zero, 2 -/* CF97F8 80241C88 03E00008 */ jr $ra -/* CF97FC 80241C8C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80241C90_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80241C90_CF7B70.s deleted file mode 100644 index eadfd28f40..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80241C90_CF7B70.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C90_CF9800 -/* CF9800 80241C90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF9804 80241C94 AFB00010 */ sw $s0, 0x10($sp) -/* CF9808 80241C98 3C108025 */ lui $s0, 0x8025 -/* CF980C 80241C9C 2610D8F0 */ addiu $s0, $s0, -0x2710 -/* CF9810 80241CA0 AFBF0018 */ sw $ra, 0x18($sp) -/* CF9814 80241CA4 AFB10014 */ sw $s1, 0x14($sp) -/* CF9818 80241CA8 8E020000 */ lw $v0, ($s0) -/* CF981C 80241CAC 14400010 */ bnez $v0, .L80241CF0 -/* CF9820 80241CB0 0080882D */ daddu $s1, $a0, $zero -/* CF9824 80241CB4 0C00AB39 */ jal heap_malloc -/* CF9828 80241CB8 24040040 */ addiu $a0, $zero, 0x40 -/* CF982C 80241CBC AE020000 */ sw $v0, ($s0) -/* CF9830 80241CC0 0000182D */ daddu $v1, $zero, $zero -/* CF9834 80241CC4 0040282D */ daddu $a1, $v0, $zero -/* CF9838 80241CC8 0220202D */ daddu $a0, $s1, $zero -.L80241CCC: -/* CF983C 80241CCC 8C820084 */ lw $v0, 0x84($a0) -/* CF9840 80241CD0 24840004 */ addiu $a0, $a0, 4 -/* CF9844 80241CD4 24630001 */ addiu $v1, $v1, 1 -/* CF9848 80241CD8 ACA20000 */ sw $v0, ($a1) -/* CF984C 80241CDC 28620010 */ slti $v0, $v1, 0x10 -/* CF9850 80241CE0 1440FFFA */ bnez $v0, .L80241CCC -/* CF9854 80241CE4 24A50004 */ addiu $a1, $a1, 4 -/* CF9858 80241CE8 0809074B */ j .L80241D2C -/* CF985C 80241CEC 00000000 */ nop -.L80241CF0: -/* CF9860 80241CF0 0000182D */ daddu $v1, $zero, $zero -/* CF9864 80241CF4 0040282D */ daddu $a1, $v0, $zero -/* CF9868 80241CF8 0220202D */ daddu $a0, $s1, $zero -.L80241CFC: -/* CF986C 80241CFC 8CA20000 */ lw $v0, ($a1) -/* CF9870 80241D00 24A50004 */ addiu $a1, $a1, 4 -/* CF9874 80241D04 24630001 */ addiu $v1, $v1, 1 -/* CF9878 80241D08 AC820084 */ sw $v0, 0x84($a0) -/* CF987C 80241D0C 28620010 */ slti $v0, $v1, 0x10 -/* CF9880 80241D10 1440FFFA */ bnez $v0, .L80241CFC -/* CF9884 80241D14 24840004 */ addiu $a0, $a0, 4 -/* CF9888 80241D18 3C108025 */ lui $s0, 0x8025 -/* CF988C 80241D1C 2610D8F0 */ addiu $s0, $s0, -0x2710 -/* CF9890 80241D20 0C00AB4B */ jal heap_free -/* CF9894 80241D24 8E040000 */ lw $a0, ($s0) -/* CF9898 80241D28 AE000000 */ sw $zero, ($s0) -.L80241D2C: -/* CF989C 80241D2C 8FBF0018 */ lw $ra, 0x18($sp) -/* CF98A0 80241D30 8FB10014 */ lw $s1, 0x14($sp) -/* CF98A4 80241D34 8FB00010 */ lw $s0, 0x10($sp) -/* CF98A8 80241D38 24020002 */ addiu $v0, $zero, 2 -/* CF98AC 80241D3C 03E00008 */ jr $ra -/* CF98B0 80241D40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80241D44_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80241D44_CF7B70.s deleted file mode 100644 index 8ed37cb5cf..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80241D44_CF7B70.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D44_CF98B4 -/* CF98B4 80241D44 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF98B8 80241D48 AFB00010 */ sw $s0, 0x10($sp) -/* CF98BC 80241D4C 0080802D */ daddu $s0, $a0, $zero -/* CF98C0 80241D50 AFBF0018 */ sw $ra, 0x18($sp) -/* CF98C4 80241D54 AFB10014 */ sw $s1, 0x14($sp) -/* CF98C8 80241D58 8E02000C */ lw $v0, 0xc($s0) -/* CF98CC 80241D5C 8C510000 */ lw $s1, ($v0) -/* CF98D0 80241D60 0C0B1EAF */ jal get_variable -/* CF98D4 80241D64 0220282D */ daddu $a1, $s1, $zero -/* CF98D8 80241D68 3C03FFF0 */ lui $v1, 0xfff0 -/* CF98DC 80241D6C 3463FFFF */ ori $v1, $v1, 0xffff -/* CF98E0 80241D70 0200202D */ daddu $a0, $s0, $zero -/* CF98E4 80241D74 00431024 */ and $v0, $v0, $v1 -/* CF98E8 80241D78 00021140 */ sll $v0, $v0, 5 -/* CF98EC 80241D7C 3C068008 */ lui $a2, %hi(gItemTable) -/* CF98F0 80241D80 00C23021 */ addu $a2, $a2, $v0 -/* CF98F4 80241D84 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* CF98F8 80241D88 0C0B2026 */ jal set_variable -/* CF98FC 80241D8C 0220282D */ daddu $a1, $s1, $zero -/* CF9900 80241D90 8FBF0018 */ lw $ra, 0x18($sp) -/* CF9904 80241D94 8FB10014 */ lw $s1, 0x14($sp) -/* CF9908 80241D98 8FB00010 */ lw $s0, 0x10($sp) -/* CF990C 80241D9C 24020002 */ addiu $v0, $zero, 2 -/* CF9910 80241DA0 03E00008 */ jr $ra -/* CF9914 80241DA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/func_80241EF8_CF7B70.s b/asm/nonmatchings/world/area_sam/sam_01/func_80241EF8_CF7B70.s deleted file mode 100644 index b0013735bd..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/func_80241EF8_CF7B70.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EF8_CF9A68 -/* CF9A68 80241EF8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF9A6C 80241EFC AFB00010 */ sw $s0, 0x10($sp) -/* CF9A70 80241F00 0080802D */ daddu $s0, $a0, $zero -/* CF9A74 80241F04 AFBF0014 */ sw $ra, 0x14($sp) -/* CF9A78 80241F08 8E02000C */ lw $v0, 0xc($s0) -/* CF9A7C 80241F0C 0C0B1EAF */ jal get_variable -/* CF9A80 80241F10 8C450000 */ lw $a1, ($v0) -/* CF9A84 80241F14 00021140 */ sll $v0, $v0, 5 -/* CF9A88 80241F18 AE000084 */ sw $zero, 0x84($s0) -/* CF9A8C 80241F1C 3C018008 */ lui $at, 0x8008 -/* CF9A90 80241F20 00220821 */ addu $at, $at, $v0 -/* CF9A94 80241F24 942278F8 */ lhu $v0, 0x78f8($at) -/* CF9A98 80241F28 30420040 */ andi $v0, $v0, 0x40 -/* CF9A9C 80241F2C 10400002 */ beqz $v0, .L80241F38 -/* CF9AA0 80241F30 24020001 */ addiu $v0, $zero, 1 -/* CF9AA4 80241F34 AE020084 */ sw $v0, 0x84($s0) -.L80241F38: -/* CF9AA8 80241F38 8FBF0014 */ lw $ra, 0x14($sp) -/* CF9AAC 80241F3C 8FB00010 */ lw $s0, 0x10($sp) -/* CF9AB0 80241F40 24020002 */ addiu $v0, $zero, 2 -/* CF9AB4 80241F44 03E00008 */ jr $ra -/* CF9AB8 80241F48 27BD0018 */ addiu $sp, $sp, 0x18 -/* CF9ABC 80241F4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_02/begin_battle_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/begin_battle_D05730.s deleted file mode 100644 index c37d6ec0c2..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/begin_battle_D05730.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel begin_battle_D06948 -/* D06948 80241218 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D0694C 8024121C AFB00010 */ sw $s0, 0x10($sp) -/* D06950 80241220 3C108011 */ lui $s0, %hi(gPlayerData) -/* D06954 80241224 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* D06958 80241228 AFBF0018 */ sw $ra, 0x18($sp) -/* D0695C 8024122C AFB10014 */ sw $s1, 0x14($sp) -/* D06960 80241230 960302C0 */ lhu $v1, 0x2c0($s0) -/* D06964 80241234 2C6203E7 */ sltiu $v0, $v1, 0x3e7 -/* D06968 80241238 10400003 */ beqz $v0, .L80241248 -/* D0696C 8024123C 0080882D */ daddu $s1, $a0, $zero -/* D06970 80241240 24620001 */ addiu $v0, $v1, 1 -/* D06974 80241244 A60202C0 */ sh $v0, 0x2c0($s0) -.L80241248: -/* D06978 80241248 3C05F5DE */ lui $a1, 0xf5de -/* D0697C 8024124C 34A502E0 */ ori $a1, $a1, 0x2e0 -/* D06980 80241250 0C0B1EAF */ jal get_variable -/* D06984 80241254 0000202D */ daddu $a0, $zero, $zero -/* D06988 80241258 3C038024 */ lui $v1, 0x8024 -/* D0698C 8024125C 00621821 */ addu $v1, $v1, $v0 -/* D06990 80241260 90636BC4 */ lbu $v1, 0x6bc4($v1) -/* D06994 80241264 8E220084 */ lw $v0, 0x84($s1) -/* D06998 80241268 54430006 */ bnel $v0, $v1, .L80241284 -/* D0699C 8024126C AE200084 */ sw $zero, 0x84($s1) -/* D069A0 80241270 24020001 */ addiu $v0, $zero, 1 -/* D069A4 80241274 AE220084 */ sw $v0, 0x84($s1) -/* D069A8 80241278 960202C2 */ lhu $v0, 0x2c2($s0) -/* D069AC 8024127C 24420001 */ addiu $v0, $v0, 1 -/* D069B0 80241280 A60202C2 */ sh $v0, 0x2c2($s0) -.L80241284: -/* D069B4 80241284 8FBF0018 */ lw $ra, 0x18($sp) -/* D069B8 80241288 8FB10014 */ lw $s1, 0x14($sp) -/* D069BC 8024128C 8FB00010 */ lw $s0, 0x10($sp) -/* D069C0 80241290 24020002 */ addiu $v0, $zero, 2 -/* D069C4 80241294 03E00008 */ jr $ra -/* D069C8 80241298 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80240020_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80240020_D05730.s deleted file mode 100644 index 30e5604637..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80240020_D05730.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D05750 -/* D05750 80240020 3C028016 */ lui $v0, 0x8016 -/* D05754 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* D05758 80240028 AC820084 */ sw $v0, 0x84($a0) -/* D0575C 8024002C 03E00008 */ jr $ra -/* D05760 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80240034_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80240034_D05730.s deleted file mode 100644 index 8a1741eff4..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80240034_D05730.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_D05764 -/* D05764 80240034 3C038016 */ lui $v1, 0x8016 -/* D05768 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* D0576C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D05770 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* D05774 80240044 0080802D */ daddu $s0, $a0, $zero -/* D05778 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* D0577C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* D05780 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* D05784 80240054 24020002 */ addiu $v0, $zero, 2 -/* D05788 80240058 08090038 */ j .L802400E0 -/* D0578C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* D05790 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D05794 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D05798 80240068 80620040 */ lb $v0, 0x40($v1) -/* D0579C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* D057A0 80240070 04420001 */ bltzl $v0, .L80240078 -/* D057A4 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* D057A8 80240078 14400003 */ bnez $v0, .L80240088 -/* D057AC 8024007C 00000000 */ nop -/* D057B0 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* D057B4 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* D057B8 80240088 44822000 */ mtc1 $v0, $f4 -/* D057BC 8024008C 00000000 */ nop -/* D057C0 80240090 46802120 */ cvt.s.w $f4, $f4 -/* D057C4 80240094 44062000 */ mfc1 $a2, $f4 -/* D057C8 80240098 44872000 */ mtc1 $a3, $f4 -/* D057CC 8024009C 00000000 */ nop -/* D057D0 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* D057D4 802400A4 44806000 */ mtc1 $zero, $f12 -/* D057D8 802400A8 44072000 */ mfc1 $a3, $f4 -/* D057DC 802400AC 0C00A720 */ jal atan2 -/* D057E0 802400B0 46006386 */ mov.s $f14, $f12 -/* D057E4 802400B4 3C014270 */ lui $at, 0x4270 -/* D057E8 802400B8 44811000 */ mtc1 $at, $f2 -/* D057EC 802400BC 00000000 */ nop -/* D057F0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* D057F4 802400C4 00000000 */ nop -/* D057F8 802400C8 45000004 */ bc1f .L802400DC -/* D057FC 802400CC 24020001 */ addiu $v0, $zero, 1 -/* D05800 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* D05804 802400D4 08090038 */ j .L802400E0 -/* D05808 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* D0580C 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* D05810 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* D05814 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* D05818 802400E8 03E00008 */ jr $ra -/* D0581C 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_802400F0_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_802400F0_D05730.s deleted file mode 100644 index ad8e0b2f91..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_802400F0_D05730.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_D05820 -/* D05820 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D05824 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* D05828 802400F8 0080882D */ daddu $s1, $a0, $zero -/* D0582C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* D05830 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* D05834 80240104 0C016AFA */ jal get_current_map_header -/* D05838 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* D0583C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* D05840 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* D05844 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D05848 80240118 0C0B1EAF */ jal get_variable -/* D0584C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* D05850 80240120 0220202D */ daddu $a0, $s1, $zero -/* D05854 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* D05858 80240128 8E430014 */ lw $v1, 0x14($s2) -/* D0585C 8024012C 00028100 */ sll $s0, $v0, 4 -/* D05860 80240130 02031821 */ addu $v1, $s0, $v1 -/* D05864 80240134 C4600000 */ lwc1 $f0, ($v1) -/* D05868 80240138 4600008D */ trunc.w.s $f2, $f0 -/* D0586C 8024013C 44061000 */ mfc1 $a2, $f2 -/* D05870 80240140 0C0B2026 */ jal set_variable -/* D05874 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* D05878 80240148 0220202D */ daddu $a0, $s1, $zero -/* D0587C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* D05880 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* D05884 80240154 02021021 */ addu $v0, $s0, $v0 -/* D05888 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* D0588C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* D05890 80240160 44061000 */ mfc1 $a2, $f2 -/* D05894 80240164 0C0B2026 */ jal set_variable -/* D05898 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* D0589C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* D058A0 80240170 8E420014 */ lw $v0, 0x14($s2) -/* D058A4 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* D058A8 80240178 02021021 */ addu $v0, $s0, $v0 -/* D058AC 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* D058B0 80240180 4600008D */ trunc.w.s $f2, $f0 -/* D058B4 80240184 44061000 */ mfc1 $a2, $f2 -/* D058B8 80240188 0C0B2026 */ jal set_variable -/* D058BC 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* D058C0 80240190 0220202D */ daddu $a0, $s1, $zero -/* D058C4 80240194 8E420014 */ lw $v0, 0x14($s2) -/* D058C8 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* D058CC 8024019C 02028021 */ addu $s0, $s0, $v0 -/* D058D0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* D058D4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* D058D8 802401A8 44061000 */ mfc1 $a2, $f2 -/* D058DC 802401AC 0C0B2026 */ jal set_variable -/* D058E0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* D058E4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* D058E8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* D058EC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* D058F0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* D058F4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* D058F8 802401C8 03E00008 */ jr $ra -/* D058FC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_802401D0_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_802401D0_D05730.s deleted file mode 100644 index 207dce635d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_802401D0_D05730.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_D05900 -/* D05900 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D05904 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D05908 802401D8 3C014334 */ lui $at, 0x4334 -/* D0590C 802401DC 44816000 */ mtc1 $at, $f12 -/* D05910 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D05914 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* D05918 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* D0591C 802401EC 00031080 */ sll $v0, $v1, 2 -/* D05920 802401F0 00431021 */ addu $v0, $v0, $v1 -/* D05924 802401F4 00021080 */ sll $v0, $v0, 2 -/* D05928 802401F8 00431023 */ subu $v0, $v0, $v1 -/* D0592C 802401FC 000218C0 */ sll $v1, $v0, 3 -/* D05930 80240200 00431021 */ addu $v0, $v0, $v1 -/* D05934 80240204 000210C0 */ sll $v0, $v0, 3 -/* D05938 80240208 3C01800B */ lui $at, 0x800b -/* D0593C 8024020C 00220821 */ addu $at, $at, $v0 -/* D05940 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* D05944 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* D05948 80240218 0C00A6C9 */ jal clamp_angle -/* D0594C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* D05950 80240220 4600008D */ trunc.w.s $f2, $f0 -/* D05954 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* D05958 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* D0595C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* D05960 80240230 24020002 */ addiu $v0, $zero, 2 -/* D05964 80240234 03E00008 */ jr $ra -/* D05968 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_8024023C_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_8024023C_D05730.s deleted file mode 100644 index e723b679f9..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_8024023C_D05730.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_D0596C -/* D0596C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D05970 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* D05974 80240244 0080802D */ daddu $s0, $a0, $zero -/* D05978 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* D0597C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* D05980 80240250 8E02000C */ lw $v0, 0xc($s0) -/* D05984 80240254 0C0B210B */ jal get_float_variable -/* D05988 80240258 8C450000 */ lw $a1, ($v0) -/* D0598C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* D05990 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* D05994 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* D05998 80240268 44060000 */ mfc1 $a2, $f0 -/* D0599C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* D059A0 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* D059A4 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* D059A8 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* D059AC 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* D059B0 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* D059B4 80240284 0C00A7E7 */ jal add_vec2D_polar -/* D059B8 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* D059BC 8024028C 0200202D */ daddu $a0, $s0, $zero -/* D059C0 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* D059C4 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* D059C8 80240298 0C0B2190 */ jal set_float_variable -/* D059CC 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D059D0 802402A0 0200202D */ daddu $a0, $s0, $zero -/* D059D4 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* D059D8 802402A8 4406A000 */ mfc1 $a2, $f20 -/* D059DC 802402AC 0C0B2190 */ jal set_float_variable -/* D059E0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* D059E4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* D059E8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* D059EC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* D059F0 802402C0 0C0B2190 */ jal set_float_variable -/* D059F4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* D059F8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* D059FC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* D05A00 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* D05A04 802402D4 24020002 */ addiu $v0, $zero, 2 -/* D05A08 802402D8 03E00008 */ jr $ra -/* D05A0C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_802402E0_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_802402E0_D05730.s deleted file mode 100644 index 249276038d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_802402E0_D05730.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_D05A10 -/* D05A10 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D05A14 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* D05A18 802402E8 0080802D */ daddu $s0, $a0, $zero -/* D05A1C 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* D05A20 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* D05A24 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* D05A28 802402F8 00621821 */ addu $v1, $v1, $v0 -/* D05A2C 802402FC 04610004 */ bgez $v1, .L80240310 -/* D05A30 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* D05A34 80240304 3C020002 */ lui $v0, 2 -/* D05A38 80240308 080900C8 */ j .L80240320 -/* D05A3C 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* D05A40 80240310 3C040002 */ lui $a0, 2 -/* D05A44 80240314 0083102A */ slt $v0, $a0, $v1 -/* D05A48 80240318 10400002 */ beqz $v0, .L80240324 -/* D05A4C 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* D05A50 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* D05A54 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* D05A58 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* D05A5C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* D05A60 80240330 04610004 */ bgez $v1, .L80240344 -/* D05A64 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* D05A68 80240338 3C020002 */ lui $v0, 2 -/* D05A6C 8024033C 080900D5 */ j .L80240354 -/* D05A70 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* D05A74 80240344 3C040002 */ lui $a0, 2 -/* D05A78 80240348 0083102A */ slt $v0, $a0, $v1 -/* D05A7C 8024034C 10400002 */ beqz $v0, .L80240358 -/* D05A80 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* D05A84 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* D05A88 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* D05A8C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* D05A90 80240360 00621821 */ addu $v1, $v1, $v0 -/* D05A94 80240364 04610004 */ bgez $v1, .L80240378 -/* D05A98 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* D05A9C 8024036C 3C020002 */ lui $v0, 2 -/* D05AA0 80240370 080900E2 */ j .L80240388 -/* D05AA4 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* D05AA8 80240378 3C040002 */ lui $a0, 2 -/* D05AAC 8024037C 0083102A */ slt $v0, $a0, $v1 -/* D05AB0 80240380 10400002 */ beqz $v0, .L8024038C -/* D05AB4 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* D05AB8 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* D05ABC 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* D05AC0 80240390 8E020094 */ lw $v0, 0x94($s0) -/* D05AC4 80240394 00621821 */ addu $v1, $v1, $v0 -/* D05AC8 80240398 04610004 */ bgez $v1, .L802403AC -/* D05ACC 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* D05AD0 802403A0 3C020002 */ lui $v0, 2 -/* D05AD4 802403A4 080900EF */ j .L802403BC -/* D05AD8 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* D05ADC 802403AC 3C040002 */ lui $a0, 2 -/* D05AE0 802403B0 0083102A */ slt $v0, $a0, $v1 -/* D05AE4 802403B4 10400002 */ beqz $v0, .L802403C0 -/* D05AE8 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* D05AEC 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* D05AF0 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* D05AF4 802403C4 0C046F07 */ jal set_main_pan_u -/* D05AF8 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* D05AFC 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* D05B00 802403D0 0C046F0D */ jal set_main_pan_v -/* D05B04 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* D05B08 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* D05B0C 802403DC 0C046F13 */ jal set_aux_pan_u -/* D05B10 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* D05B14 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* D05B18 802403E8 0C046F19 */ jal set_aux_pan_v -/* D05B1C 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* D05B20 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* D05B24 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* D05B28 802403F8 0000102D */ daddu $v0, $zero, $zero -/* D05B2C 802403FC 03E00008 */ jr $ra -/* D05B30 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80240404_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80240404_D05730.s deleted file mode 100644 index 98782aed29..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80240404_D05730.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_D05B34 -/* D05B34 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D05B38 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* D05B3C 8024040C 0080802D */ daddu $s0, $a0, $zero -/* D05B40 80240410 10A00005 */ beqz $a1, .L80240428 -/* D05B44 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* D05B48 80240418 AE000070 */ sw $zero, 0x70($s0) -/* D05B4C 8024041C AE000074 */ sw $zero, 0x74($s0) -/* D05B50 80240420 AE000078 */ sw $zero, 0x78($s0) -/* D05B54 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* D05B58 80240428 8E020070 */ lw $v0, 0x70($s0) -/* D05B5C 8024042C 1440000E */ bnez $v0, .L80240468 -/* D05B60 80240430 00000000 */ nop -/* D05B64 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* D05B68 80240438 8E020088 */ lw $v0, 0x88($s0) -/* D05B6C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* D05B70 80240440 04610004 */ bgez $v1, .L80240454 -/* D05B74 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* D05B78 80240448 3C020002 */ lui $v0, 2 -/* D05B7C 8024044C 08090119 */ j .L80240464 -/* D05B80 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* D05B84 80240454 3C040002 */ lui $a0, 2 -/* D05B88 80240458 0083102A */ slt $v0, $a0, $v1 -/* D05B8C 8024045C 10400002 */ beqz $v0, .L80240468 -/* D05B90 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* D05B94 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* D05B98 80240468 8E020074 */ lw $v0, 0x74($s0) -/* D05B9C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* D05BA0 80240470 00000000 */ nop -/* D05BA4 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* D05BA8 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* D05BAC 8024047C 00621821 */ addu $v1, $v1, $v0 -/* D05BB0 80240480 04610004 */ bgez $v1, .L80240494 -/* D05BB4 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* D05BB8 80240488 3C020002 */ lui $v0, 2 -/* D05BBC 8024048C 08090129 */ j .L802404A4 -/* D05BC0 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* D05BC4 80240494 3C040002 */ lui $a0, 2 -/* D05BC8 80240498 0083102A */ slt $v0, $a0, $v1 -/* D05BCC 8024049C 10400002 */ beqz $v0, .L802404A8 -/* D05BD0 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* D05BD4 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* D05BD8 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* D05BDC 802404AC 1440000E */ bnez $v0, .L802404E8 -/* D05BE0 802404B0 00000000 */ nop -/* D05BE4 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* D05BE8 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* D05BEC 802404BC 00621821 */ addu $v1, $v1, $v0 -/* D05BF0 802404C0 04610004 */ bgez $v1, .L802404D4 -/* D05BF4 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* D05BF8 802404C8 3C020002 */ lui $v0, 2 -/* D05BFC 802404CC 08090139 */ j .L802404E4 -/* D05C00 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* D05C04 802404D4 3C040002 */ lui $a0, 2 -/* D05C08 802404D8 0083102A */ slt $v0, $a0, $v1 -/* D05C0C 802404DC 10400002 */ beqz $v0, .L802404E8 -/* D05C10 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* D05C14 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* D05C18 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* D05C1C 802404EC 1440000E */ bnez $v0, .L80240528 -/* D05C20 802404F0 00000000 */ nop -/* D05C24 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* D05C28 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* D05C2C 802404FC 00621821 */ addu $v1, $v1, $v0 -/* D05C30 80240500 04610004 */ bgez $v1, .L80240514 -/* D05C34 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* D05C38 80240508 3C020002 */ lui $v0, 2 -/* D05C3C 8024050C 08090149 */ j .L80240524 -/* D05C40 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* D05C44 80240514 3C040002 */ lui $a0, 2 -/* D05C48 80240518 0083102A */ slt $v0, $a0, $v1 -/* D05C4C 8024051C 10400002 */ beqz $v0, .L80240528 -/* D05C50 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* D05C54 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* D05C58 80240528 8E040084 */ lw $a0, 0x84($s0) -/* D05C5C 8024052C 0C046F07 */ jal set_main_pan_u -/* D05C60 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* D05C64 80240534 8E040084 */ lw $a0, 0x84($s0) -/* D05C68 80240538 0C046F0D */ jal set_main_pan_v -/* D05C6C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* D05C70 80240540 8E040084 */ lw $a0, 0x84($s0) -/* D05C74 80240544 0C046F13 */ jal set_aux_pan_u -/* D05C78 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* D05C7C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* D05C80 80240550 0C046F19 */ jal set_aux_pan_v -/* D05C84 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* D05C88 80240558 8E020070 */ lw $v0, 0x70($s0) -/* D05C8C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* D05C90 80240560 8E040098 */ lw $a0, 0x98($s0) -/* D05C94 80240564 24420001 */ addiu $v0, $v0, 1 -/* D05C98 80240568 AE020070 */ sw $v0, 0x70($s0) -/* D05C9C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* D05CA0 80240570 24630001 */ addiu $v1, $v1, 1 -/* D05CA4 80240574 AE030078 */ sw $v1, 0x78($s0) -/* D05CA8 80240578 8E030070 */ lw $v1, 0x70($s0) -/* D05CAC 8024057C 24420001 */ addiu $v0, $v0, 1 -/* D05CB0 80240580 AE020074 */ sw $v0, 0x74($s0) -/* D05CB4 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* D05CB8 80240588 0064182A */ slt $v1, $v1, $a0 -/* D05CBC 8024058C 24420001 */ addiu $v0, $v0, 1 -/* D05CC0 80240590 14600002 */ bnez $v1, .L8024059C -/* D05CC4 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* D05CC8 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* D05CCC 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* D05CD0 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* D05CD4 802405A4 0043102A */ slt $v0, $v0, $v1 -/* D05CD8 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* D05CDC 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* D05CE0 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* D05CE4 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* D05CE8 802405B8 0043102A */ slt $v0, $v0, $v1 -/* D05CEC 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* D05CF0 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* D05CF4 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* D05CF8 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* D05CFC 802405CC 0043102A */ slt $v0, $v0, $v1 -/* D05D00 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* D05D04 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* D05D08 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* D05D0C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* D05D10 802405E0 0000102D */ daddu $v0, $zero, $zero -/* D05D14 802405E4 03E00008 */ jr $ra -/* D05D18 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_802405EC_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_802405EC_D05730.s deleted file mode 100644 index 003b73ceb2..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_802405EC_D05730.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_D05D1C -/* D05D1C 802405EC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D05D20 802405F0 F7B40018 */ sdc1 $f20, 0x18($sp) -/* D05D24 802405F4 4485A000 */ mtc1 $a1, $f20 -/* D05D28 802405F8 F7B60020 */ sdc1 $f22, 0x20($sp) -/* D05D2C 802405FC 4486B000 */ mtc1 $a2, $f22 -/* D05D30 80240600 AFB00010 */ sw $s0, 0x10($sp) -/* D05D34 80240604 F7B80028 */ sdc1 $f24, 0x28($sp) -/* D05D38 80240608 4487C000 */ mtc1 $a3, $f24 -/* D05D3C 8024060C AFBF0014 */ sw $ra, 0x14($sp) -/* D05D40 80240610 0C019D28 */ jal guMtxIdentF -/* D05D44 80240614 0080802D */ daddu $s0, $a0, $zero -/* D05D48 80240618 4616A582 */ mul.s $f22, $f20, $f22 -/* D05D4C 8024061C 00000000 */ nop -/* D05D50 80240620 4618A502 */ mul.s $f20, $f20, $f24 -/* D05D54 80240624 00000000 */ nop -/* D05D58 80240628 3C013F80 */ lui $at, 0x3f80 -/* D05D5C 8024062C 44810000 */ mtc1 $at, $f0 -/* D05D60 80240630 00000000 */ nop -/* D05D64 80240634 E6000014 */ swc1 $f0, 0x14($s0) -/* D05D68 80240638 E6160010 */ swc1 $f22, 0x10($s0) -/* D05D6C 8024063C E6140018 */ swc1 $f20, 0x18($s0) -/* D05D70 80240640 8FBF0014 */ lw $ra, 0x14($sp) -/* D05D74 80240644 8FB00010 */ lw $s0, 0x10($sp) -/* D05D78 80240648 D7B80028 */ ldc1 $f24, 0x28($sp) -/* D05D7C 8024064C D7B60020 */ ldc1 $f22, 0x20($sp) -/* D05D80 80240650 D7B40018 */ ldc1 $f20, 0x18($sp) -/* D05D84 80240654 03E00008 */ jr $ra -/* D05D88 80240658 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_8024065C_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_8024065C_D05730.s deleted file mode 100644 index bf25e770e7..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_8024065C_D05730.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024065C_D05D8C -/* D05D8C 8024065C 27BDFF78 */ addiu $sp, $sp, -0x88 -/* D05D90 80240660 AFB10054 */ sw $s1, 0x54($sp) -/* D05D94 80240664 0080882D */ daddu $s1, $a0, $zero -/* D05D98 80240668 AFBF005C */ sw $ra, 0x5c($sp) -/* D05D9C 8024066C AFB20058 */ sw $s2, 0x58($sp) -/* D05DA0 80240670 AFB00050 */ sw $s0, 0x50($sp) -/* D05DA4 80240674 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* D05DA8 80240678 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* D05DAC 8024067C F7B80070 */ sdc1 $f24, 0x70($sp) -/* D05DB0 80240680 F7B60068 */ sdc1 $f22, 0x68($sp) -/* D05DB4 80240684 F7B40060 */ sdc1 $f20, 0x60($sp) -/* D05DB8 80240688 8E30000C */ lw $s0, 0xc($s1) -/* D05DBC 8024068C 8E050000 */ lw $a1, ($s0) -/* D05DC0 80240690 0C0B1EAF */ jal get_variable -/* D05DC4 80240694 26100004 */ addiu $s0, $s0, 4 -/* D05DC8 80240698 0C046C04 */ jal get_model_list_index_from_tree_index -/* D05DCC 8024069C 0040202D */ daddu $a0, $v0, $zero -/* D05DD0 802406A0 8E050000 */ lw $a1, ($s0) -/* D05DD4 802406A4 26100004 */ addiu $s0, $s0, 4 -/* D05DD8 802406A8 0220202D */ daddu $a0, $s1, $zero -/* D05DDC 802406AC 0C0B210B */ jal get_float_variable -/* D05DE0 802406B0 0040902D */ daddu $s2, $v0, $zero -/* D05DE4 802406B4 8E050000 */ lw $a1, ($s0) -/* D05DE8 802406B8 26100004 */ addiu $s0, $s0, 4 -/* D05DEC 802406BC 0220202D */ daddu $a0, $s1, $zero -/* D05DF0 802406C0 0C0B210B */ jal get_float_variable -/* D05DF4 802406C4 46000706 */ mov.s $f28, $f0 -/* D05DF8 802406C8 8E050000 */ lw $a1, ($s0) -/* D05DFC 802406CC 26100004 */ addiu $s0, $s0, 4 -/* D05E00 802406D0 0220202D */ daddu $a0, $s1, $zero -/* D05E04 802406D4 0C0B210B */ jal get_float_variable -/* D05E08 802406D8 46000686 */ mov.s $f26, $f0 -/* D05E0C 802406DC 0220202D */ daddu $a0, $s1, $zero -/* D05E10 802406E0 8E050000 */ lw $a1, ($s0) -/* D05E14 802406E4 0C0B210B */ jal get_float_variable -/* D05E18 802406E8 46000586 */ mov.s $f22, $f0 -/* D05E1C 802406EC 0240202D */ daddu $a0, $s2, $zero -/* D05E20 802406F0 0C046B4C */ jal get_model_from_list_index -/* D05E24 802406F4 46000606 */ mov.s $f24, $f0 -/* D05E28 802406F8 0040882D */ daddu $s1, $v0, $zero -/* D05E2C 802406FC 96220000 */ lhu $v0, ($s1) -/* D05E30 80240700 30420400 */ andi $v0, $v0, 0x400 -/* D05E34 80240704 1440001E */ bnez $v0, .L80240780 -/* D05E38 80240708 26300058 */ addiu $s0, $s1, 0x58 -/* D05E3C 8024070C 4480A000 */ mtc1 $zero, $f20 -/* D05E40 80240710 4406B000 */ mfc1 $a2, $f22 -/* D05E44 80240714 4405A000 */ mfc1 $a1, $f20 -/* D05E48 80240718 4407A000 */ mfc1 $a3, $f20 -/* D05E4C 8024071C 0C019E40 */ jal guTranslateF -/* D05E50 80240720 0200202D */ daddu $a0, $s0, $zero -/* D05E54 80240724 4405E000 */ mfc1 $a1, $f28 -/* D05E58 80240728 4406D000 */ mfc1 $a2, $f26 -/* D05E5C 8024072C 4407C000 */ mfc1 $a3, $f24 -/* D05E60 80240730 0C09017B */ jal func_802405EC -/* D05E64 80240734 27A40010 */ addiu $a0, $sp, 0x10 -/* D05E68 80240738 27A40010 */ addiu $a0, $sp, 0x10 -/* D05E6C 8024073C 0200282D */ daddu $a1, $s0, $zero -/* D05E70 80240740 0C019D80 */ jal guMtxCatF -/* D05E74 80240744 0200302D */ daddu $a2, $s0, $zero -/* D05E78 80240748 27A40010 */ addiu $a0, $sp, 0x10 -/* D05E7C 8024074C 4600B587 */ neg.s $f22, $f22 -/* D05E80 80240750 4405A000 */ mfc1 $a1, $f20 -/* D05E84 80240754 4406B000 */ mfc1 $a2, $f22 -/* D05E88 80240758 0C019E40 */ jal guTranslateF -/* D05E8C 8024075C 00A0382D */ daddu $a3, $a1, $zero -/* D05E90 80240760 27A40010 */ addiu $a0, $sp, 0x10 -/* D05E94 80240764 0200282D */ daddu $a1, $s0, $zero -/* D05E98 80240768 0C019D80 */ jal guMtxCatF -/* D05E9C 8024076C 00A0302D */ daddu $a2, $a1, $zero -/* D05EA0 80240770 96220000 */ lhu $v0, ($s1) -/* D05EA4 80240774 34421400 */ ori $v0, $v0, 0x1400 -/* D05EA8 80240778 080901FE */ j .L802407F8 -/* D05EAC 8024077C A6220000 */ sh $v0, ($s1) -.L80240780: -/* D05EB0 80240780 4480A000 */ mtc1 $zero, $f20 -/* D05EB4 80240784 4406B000 */ mfc1 $a2, $f22 -/* D05EB8 80240788 4405A000 */ mfc1 $a1, $f20 -/* D05EBC 8024078C 4407A000 */ mfc1 $a3, $f20 -/* D05EC0 80240790 0C019E40 */ jal guTranslateF -/* D05EC4 80240794 27A40010 */ addiu $a0, $sp, 0x10 -/* D05EC8 80240798 27A40010 */ addiu $a0, $sp, 0x10 -/* D05ECC 8024079C 26300058 */ addiu $s0, $s1, 0x58 -/* D05ED0 802407A0 0200282D */ daddu $a1, $s0, $zero -/* D05ED4 802407A4 0C019D80 */ jal guMtxCatF -/* D05ED8 802407A8 0200302D */ daddu $a2, $s0, $zero -/* D05EDC 802407AC 4405E000 */ mfc1 $a1, $f28 -/* D05EE0 802407B0 4406D000 */ mfc1 $a2, $f26 -/* D05EE4 802407B4 4407C000 */ mfc1 $a3, $f24 -/* D05EE8 802407B8 0C09017B */ jal func_802405EC -/* D05EEC 802407BC 27A40010 */ addiu $a0, $sp, 0x10 -/* D05EF0 802407C0 27A40010 */ addiu $a0, $sp, 0x10 -/* D05EF4 802407C4 0200282D */ daddu $a1, $s0, $zero -/* D05EF8 802407C8 0C019D80 */ jal guMtxCatF -/* D05EFC 802407CC 0200302D */ daddu $a2, $s0, $zero -/* D05F00 802407D0 27A40010 */ addiu $a0, $sp, 0x10 -/* D05F04 802407D4 4600B587 */ neg.s $f22, $f22 -/* D05F08 802407D8 4405A000 */ mfc1 $a1, $f20 -/* D05F0C 802407DC 4406B000 */ mfc1 $a2, $f22 -/* D05F10 802407E0 0C019E40 */ jal guTranslateF -/* D05F14 802407E4 00A0382D */ daddu $a3, $a1, $zero -/* D05F18 802407E8 27A40010 */ addiu $a0, $sp, 0x10 -/* D05F1C 802407EC 0200282D */ daddu $a1, $s0, $zero -/* D05F20 802407F0 0C019D80 */ jal guMtxCatF -/* D05F24 802407F4 00A0302D */ daddu $a2, $a1, $zero -.L802407F8: -/* D05F28 802407F8 8FBF005C */ lw $ra, 0x5c($sp) -/* D05F2C 802407FC 8FB20058 */ lw $s2, 0x58($sp) -/* D05F30 80240800 8FB10054 */ lw $s1, 0x54($sp) -/* D05F34 80240804 8FB00050 */ lw $s0, 0x50($sp) -/* D05F38 80240808 D7BC0080 */ ldc1 $f28, 0x80($sp) -/* D05F3C 8024080C D7BA0078 */ ldc1 $f26, 0x78($sp) -/* D05F40 80240810 D7B80070 */ ldc1 $f24, 0x70($sp) -/* D05F44 80240814 D7B60068 */ ldc1 $f22, 0x68($sp) -/* D05F48 80240818 D7B40060 */ ldc1 $f20, 0x60($sp) -/* D05F4C 8024081C 24020002 */ addiu $v0, $zero, 2 -/* D05F50 80240820 03E00008 */ jr $ra -/* D05F54 80240824 27BD0088 */ addiu $sp, $sp, 0x88 -/* D05F58 80240828 00000000 */ nop -/* D05F5C 8024082C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80240830_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80240830_D05730.s deleted file mode 100644 index 28763cfcd6..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80240830_D05730.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240830_D05F60 -/* D05F60 80240830 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D05F64 80240834 AFBF0010 */ sw $ra, 0x10($sp) -/* D05F68 80240838 0C03A625 */ jal func_800E9894 -/* D05F6C 8024083C 00000000 */ nop -/* D05F70 80240840 8FBF0010 */ lw $ra, 0x10($sp) -/* D05F74 80240844 24020002 */ addiu $v0, $zero, 2 -/* D05F78 80240848 03E00008 */ jr $ra -/* D05F7C 8024084C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80240850_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80240850_D05730.s deleted file mode 100644 index 79f4dca6c4..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80240850_D05730.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240850_D05F80 -/* D05F80 80240850 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D05F84 80240854 AFBF0010 */ sw $ra, 0x10($sp) -/* D05F88 80240858 0C03A631 */ jal func_800E98C4 -/* D05F8C 8024085C 00000000 */ nop -/* D05F90 80240860 0C03A6DB */ jal sync_status_menu -/* D05F94 80240864 00000000 */ nop -/* D05F98 80240868 8FBF0010 */ lw $ra, 0x10($sp) -/* D05F9C 8024086C 24020002 */ addiu $v0, $zero, 2 -/* D05FA0 80240870 03E00008 */ jr $ra -/* D05FA4 80240874 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80240878_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80240878_D05730.s deleted file mode 100644 index 3b4a9ca74f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80240878_D05730.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240878_D05FA8 -/* D05FA8 80240878 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D05FAC 8024087C AFB10014 */ sw $s1, 0x14($sp) -/* D05FB0 80240880 0080882D */ daddu $s1, $a0, $zero -/* D05FB4 80240884 AFBF0018 */ sw $ra, 0x18($sp) -/* D05FB8 80240888 AFB00010 */ sw $s0, 0x10($sp) -/* D05FBC 8024088C 8E30000C */ lw $s0, 0xc($s1) -/* D05FC0 80240890 8E050000 */ lw $a1, ($s0) -/* D05FC4 80240894 0C0B1EAF */ jal get_variable -/* D05FC8 80240898 26100004 */ addiu $s0, $s0, 4 -/* D05FCC 8024089C 0220202D */ daddu $a0, $s1, $zero -/* D05FD0 802408A0 8E050000 */ lw $a1, ($s0) -/* D05FD4 802408A4 0C0B1EAF */ jal get_variable -/* D05FD8 802408A8 0040882D */ daddu $s1, $v0, $zero -/* D05FDC 802408AC 0000202D */ daddu $a0, $zero, $zero -/* D05FE0 802408B0 0080282D */ daddu $a1, $a0, $zero -/* D05FE4 802408B4 0040802D */ daddu $s0, $v0, $zero -/* D05FE8 802408B8 240600BE */ addiu $a2, $zero, 0xbe -/* D05FEC 802408BC 0C04DF93 */ jal func_80137E4C -/* D05FF0 802408C0 24070091 */ addiu $a3, $zero, 0x91 -/* D05FF4 802408C4 44900000 */ mtc1 $s0, $f0 -/* D05FF8 802408C8 00000000 */ nop -/* D05FFC 802408CC 46800020 */ cvt.s.w $f0, $f0 -/* D06000 802408D0 44050000 */ mfc1 $a1, $f0 -/* D06004 802408D4 0C04DF62 */ jal func_80137D88 -/* D06008 802408D8 322400FF */ andi $a0, $s1, 0xff -/* D0600C 802408DC 8FBF0018 */ lw $ra, 0x18($sp) -/* D06010 802408E0 8FB10014 */ lw $s1, 0x14($sp) -/* D06014 802408E4 8FB00010 */ lw $s0, 0x10($sp) -/* D06018 802408E8 24020002 */ addiu $v0, $zero, 2 -/* D0601C 802408EC 03E00008 */ jr $ra -/* D06020 802408F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80240974_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80240974_D05730.s deleted file mode 100644 index 2eaaf35507..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80240974_D05730.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240974_D060A4 -/* D060A4 80240974 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D060A8 80240978 AFBF0010 */ sw $ra, 0x10($sp) -/* D060AC 8024097C 8C82000C */ lw $v0, 0xc($a0) -/* D060B0 80240980 0C0B1EAF */ jal get_variable -/* D060B4 80240984 8C450000 */ lw $a1, ($v0) -/* D060B8 80240988 0C0B1059 */ jal does_script_exist -/* D060BC 8024098C 0040202D */ daddu $a0, $v0, $zero -/* D060C0 80240990 2C420001 */ sltiu $v0, $v0, 1 -/* D060C4 80240994 8FBF0010 */ lw $ra, 0x10($sp) -/* D060C8 80240998 00021040 */ sll $v0, $v0, 1 -/* D060CC 8024099C 03E00008 */ jr $ra -/* D060D0 802409A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_802409D0_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_802409D0_D05730.s deleted file mode 100644 index 6f9347d460..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_802409D0_D05730.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409D0_D06100 -/* D06100 802409D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D06104 802409D4 AFBF0010 */ sw $ra, 0x10($sp) -/* D06108 802409D8 0C03AE18 */ jal partner_resume_ability_script -/* D0610C 802409DC 00000000 */ nop -/* D06110 802409E0 8FBF0010 */ lw $ra, 0x10($sp) -/* D06114 802409E4 24020002 */ addiu $v0, $zero, 2 -/* D06118 802409E8 03E00008 */ jr $ra -/* D0611C 802409EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_802409F0_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_802409F0_D05730.s deleted file mode 100644 index 7e9acbcc65..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_802409F0_D05730.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409F0_D06120 -/* D06120 802409F0 3C058011 */ lui $a1, %hi(gPlayerData) -/* D06124 802409F4 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* D06128 802409F8 AC800088 */ sw $zero, 0x88($a0) -/* D0612C 802409FC 80A30003 */ lb $v1, 3($a1) -/* D06130 80240A00 80A20002 */ lb $v0, 2($a1) -/* D06134 80240A04 1462000B */ bne $v1, $v0, .L80240A34 -/* D06138 80240A08 00A0302D */ daddu $a2, $a1, $zero -/* D0613C 80240A0C 80A30006 */ lb $v1, 6($a1) -/* D06140 80240A10 80A20005 */ lb $v0, 5($a1) -/* D06144 80240A14 14620007 */ bne $v1, $v0, .L80240A34 -/* D06148 80240A18 00000000 */ nop -/* D0614C 80240A1C 80C2028E */ lb $v0, 0x28e($a2) -/* D06150 80240A20 84C30290 */ lh $v1, 0x290($a2) -/* D06154 80240A24 00021200 */ sll $v0, $v0, 8 -/* D06158 80240A28 14620004 */ bne $v1, $v0, .L80240A3C -/* D0615C 80240A2C 24020001 */ addiu $v0, $zero, 1 -/* D06160 80240A30 AC820088 */ sw $v0, 0x88($a0) -.L80240A34: -/* D06164 80240A34 03E00008 */ jr $ra -/* D06168 80240A38 24020002 */ addiu $v0, $zero, 2 -.L80240A3C: -/* D0616C 80240A3C 03E00008 */ jr $ra -/* D06170 80240A40 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80240A44_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80240A44_D05730.s deleted file mode 100644 index cb49d1440b..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80240A44_D05730.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A44_D06174 -/* D06174 80240A44 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D06178 80240A48 AFB10014 */ sw $s1, 0x14($sp) -/* D0617C 80240A4C 0080882D */ daddu $s1, $a0, $zero -/* D06180 80240A50 AFBF001C */ sw $ra, 0x1c($sp) -/* D06184 80240A54 AFB20018 */ sw $s2, 0x18($sp) -/* D06188 80240A58 AFB00010 */ sw $s0, 0x10($sp) -/* D0618C 80240A5C 8E30000C */ lw $s0, 0xc($s1) -/* D06190 80240A60 8E050000 */ lw $a1, ($s0) -/* D06194 80240A64 0C0B1EAF */ jal get_variable -/* D06198 80240A68 26100004 */ addiu $s0, $s0, 4 -/* D0619C 80240A6C 8E050000 */ lw $a1, ($s0) -/* D061A0 80240A70 26100004 */ addiu $s0, $s0, 4 -/* D061A4 80240A74 0220202D */ daddu $a0, $s1, $zero -/* D061A8 80240A78 0C0B1EAF */ jal get_variable -/* D061AC 80240A7C 0040902D */ daddu $s2, $v0, $zero -/* D061B0 80240A80 0220202D */ daddu $a0, $s1, $zero -/* D061B4 80240A84 8E050000 */ lw $a1, ($s0) -/* D061B8 80240A88 0C0B1EAF */ jal get_variable -/* D061BC 80240A8C 0040802D */ daddu $s0, $v0, $zero -/* D061C0 80240A90 0000202D */ daddu $a0, $zero, $zero -/* D061C4 80240A94 324500FF */ andi $a1, $s2, 0xff -/* D061C8 80240A98 320600FF */ andi $a2, $s0, 0xff -/* D061CC 80240A9C 0C04DF84 */ jal func_80137E10 -/* D061D0 80240AA0 304700FF */ andi $a3, $v0, 0xff -/* D061D4 80240AA4 8FBF001C */ lw $ra, 0x1c($sp) -/* D061D8 80240AA8 8FB20018 */ lw $s2, 0x18($sp) -/* D061DC 80240AAC 8FB10014 */ lw $s1, 0x14($sp) -/* D061E0 80240AB0 8FB00010 */ lw $s0, 0x10($sp) -/* D061E4 80240AB4 24020002 */ addiu $v0, $zero, 2 -/* D061E8 80240AB8 03E00008 */ jr $ra -/* D061EC 80240ABC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80240B24_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80240B24_D05730.s deleted file mode 100644 index 5479636028..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80240B24_D05730.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B24_D06254 -/* D06254 80240B24 03E00008 */ jr $ra -/* D06258 80240B28 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80240B2C_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80240B2C_D05730.s deleted file mode 100644 index 9e2f111f13..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80240B2C_D05730.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B2C_D0625C -/* D0625C 80240B2C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D06260 80240B30 AFB00010 */ sw $s0, 0x10($sp) -/* D06264 80240B34 3C108024 */ lui $s0, 0x8024 -/* D06268 80240B38 26106B60 */ addiu $s0, $s0, 0x6b60 -/* D0626C 80240B3C AFBF0018 */ sw $ra, 0x18($sp) -/* D06270 80240B40 AFB10014 */ sw $s1, 0x14($sp) -/* D06274 80240B44 8E020000 */ lw $v0, ($s0) -/* D06278 80240B48 14400010 */ bnez $v0, .L80240B8C -/* D0627C 80240B4C 0080882D */ daddu $s1, $a0, $zero -/* D06280 80240B50 0C00AB39 */ jal heap_malloc -/* D06284 80240B54 24040040 */ addiu $a0, $zero, 0x40 -/* D06288 80240B58 AE020000 */ sw $v0, ($s0) -/* D0628C 80240B5C 0000182D */ daddu $v1, $zero, $zero -/* D06290 80240B60 0040282D */ daddu $a1, $v0, $zero -/* D06294 80240B64 0220202D */ daddu $a0, $s1, $zero -.L80240B68: -/* D06298 80240B68 8C820084 */ lw $v0, 0x84($a0) -/* D0629C 80240B6C 24840004 */ addiu $a0, $a0, 4 -/* D062A0 80240B70 24630001 */ addiu $v1, $v1, 1 -/* D062A4 80240B74 ACA20000 */ sw $v0, ($a1) -/* D062A8 80240B78 28620010 */ slti $v0, $v1, 0x10 -/* D062AC 80240B7C 1440FFFA */ bnez $v0, .L80240B68 -/* D062B0 80240B80 24A50004 */ addiu $a1, $a1, 4 -/* D062B4 80240B84 080902F2 */ j .L80240BC8 -/* D062B8 80240B88 00000000 */ nop -.L80240B8C: -/* D062BC 80240B8C 0000182D */ daddu $v1, $zero, $zero -/* D062C0 80240B90 0040282D */ daddu $a1, $v0, $zero -/* D062C4 80240B94 0220202D */ daddu $a0, $s1, $zero -.L80240B98: -/* D062C8 80240B98 8CA20000 */ lw $v0, ($a1) -/* D062CC 80240B9C 24A50004 */ addiu $a1, $a1, 4 -/* D062D0 80240BA0 24630001 */ addiu $v1, $v1, 1 -/* D062D4 80240BA4 AC820084 */ sw $v0, 0x84($a0) -/* D062D8 80240BA8 28620010 */ slti $v0, $v1, 0x10 -/* D062DC 80240BAC 1440FFFA */ bnez $v0, .L80240B98 -/* D062E0 80240BB0 24840004 */ addiu $a0, $a0, 4 -/* D062E4 80240BB4 3C108024 */ lui $s0, 0x8024 -/* D062E8 80240BB8 26106B60 */ addiu $s0, $s0, 0x6b60 -/* D062EC 80240BBC 0C00AB4B */ jal heap_free -/* D062F0 80240BC0 8E040000 */ lw $a0, ($s0) -/* D062F4 80240BC4 AE000000 */ sw $zero, ($s0) -.L80240BC8: -/* D062F8 80240BC8 8FBF0018 */ lw $ra, 0x18($sp) -/* D062FC 80240BCC 8FB10014 */ lw $s1, 0x14($sp) -/* D06300 80240BD0 8FB00010 */ lw $s0, 0x10($sp) -/* D06304 80240BD4 24020002 */ addiu $v0, $zero, 2 -/* D06308 80240BD8 03E00008 */ jr $ra -/* D0630C 80240BDC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80240BE0_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80240BE0_D05730.s deleted file mode 100644 index bdc7708f93..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80240BE0_D05730.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BE0_D06310 -/* D06310 80240BE0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D06314 80240BE4 AFB00010 */ sw $s0, 0x10($sp) -/* D06318 80240BE8 0080802D */ daddu $s0, $a0, $zero -/* D0631C 80240BEC AFBF0018 */ sw $ra, 0x18($sp) -/* D06320 80240BF0 AFB10014 */ sw $s1, 0x14($sp) -/* D06324 80240BF4 8E02000C */ lw $v0, 0xc($s0) -/* D06328 80240BF8 8C510000 */ lw $s1, ($v0) -/* D0632C 80240BFC 0C0B1EAF */ jal get_variable -/* D06330 80240C00 0220282D */ daddu $a1, $s1, $zero -/* D06334 80240C04 3C03FFF0 */ lui $v1, 0xfff0 -/* D06338 80240C08 3463FFFF */ ori $v1, $v1, 0xffff -/* D0633C 80240C0C 0200202D */ daddu $a0, $s0, $zero -/* D06340 80240C10 00431024 */ and $v0, $v0, $v1 -/* D06344 80240C14 00021140 */ sll $v0, $v0, 5 -/* D06348 80240C18 3C068008 */ lui $a2, %hi(gItemTable) -/* D0634C 80240C1C 00C23021 */ addu $a2, $a2, $v0 -/* D06350 80240C20 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D06354 80240C24 0C0B2026 */ jal set_variable -/* D06358 80240C28 0220282D */ daddu $a1, $s1, $zero -/* D0635C 80240C2C 8FBF0018 */ lw $ra, 0x18($sp) -/* D06360 80240C30 8FB10014 */ lw $s1, 0x14($sp) -/* D06364 80240C34 8FB00010 */ lw $s0, 0x10($sp) -/* D06368 80240C38 24020002 */ addiu $v0, $zero, 2 -/* D0636C 80240C3C 03E00008 */ jr $ra -/* D06370 80240C40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80240C44_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80240C44_D05730.s deleted file mode 100644 index e90f8d35f5..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80240C44_D05730.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C44_D06374 -/* D06374 80240C44 24020001 */ addiu $v0, $zero, 1 -/* D06378 80240C48 3C018015 */ lui $at, %hi(D_80151310) -/* D0637C 80240C4C AC221310 */ sw $v0, %lo(D_80151310)($at) -/* D06380 80240C50 03E00008 */ jr $ra -/* D06384 80240C54 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80240C58_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80240C58_D05730.s deleted file mode 100644 index 478c4497ba..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80240C58_D05730.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C58_D06388 -/* D06388 80240C58 3C018015 */ lui $at, %hi(D_80151310) -/* D0638C 80240C5C AC201310 */ sw $zero, %lo(D_80151310)($at) -/* D06390 80240C60 03E00008 */ jr $ra -/* D06394 80240C64 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80240ED8_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80240ED8_D05730.s deleted file mode 100644 index 3850de84f6..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80240ED8_D05730.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ED8_D06608 -/* D06608 80240ED8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D0660C 80240EDC AFBF0010 */ sw $ra, 0x10($sp) -/* D06610 80240EE0 0C00EABB */ jal get_npc_unsafe -/* D06614 80240EE4 8C84014C */ lw $a0, 0x14c($a0) -/* D06618 80240EE8 8FBF0010 */ lw $ra, 0x10($sp) -/* D0661C 80240EEC 0000102D */ daddu $v0, $zero, $zero -/* D06620 80240EF0 03E00008 */ jr $ra -/* D06624 80240EF4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80240EF8_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80240EF8_D05730.s deleted file mode 100644 index 7af892f679..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80240EF8_D05730.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EF8_D06628 -/* D06628 80240EF8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D0662C 80240EFC 3C03800A */ lui $v1, 0x800a -/* D06630 80240F00 8463A634 */ lh $v1, -0x59cc($v1) -/* D06634 80240F04 3C05800B */ lui $a1, %hi(gCameras) -/* D06638 80240F08 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* D0663C 80240F0C AFBF0010 */ sw $ra, 0x10($sp) -/* D06640 80240F10 00031080 */ sll $v0, $v1, 2 -/* D06644 80240F14 00431021 */ addu $v0, $v0, $v1 -/* D06648 80240F18 00021080 */ sll $v0, $v0, 2 -/* D0664C 80240F1C 00431023 */ subu $v0, $v0, $v1 -/* D06650 80240F20 000218C0 */ sll $v1, $v0, 3 -/* D06654 80240F24 00431021 */ addu $v0, $v0, $v1 -/* D06658 80240F28 8C830020 */ lw $v1, 0x20($a0) -/* D0665C 80240F2C 000210C0 */ sll $v0, $v0, 3 -/* D06660 80240F30 8C630000 */ lw $v1, ($v1) -/* D06664 80240F34 30630001 */ andi $v1, $v1, 1 -/* D06668 80240F38 10600004 */ beqz $v1, .L80240F4C -/* D0666C 80240F3C 00451021 */ addu $v0, $v0, $a1 -/* D06670 80240F40 C44C006C */ lwc1 $f12, 0x6c($v0) -/* D06674 80240F44 0C00A6C9 */ jal clamp_angle -/* D06678 80240F48 46006307 */ neg.s $f12, $f12 -.L80240F4C: -/* D0667C 80240F4C 8FBF0010 */ lw $ra, 0x10($sp) -/* D06680 80240F50 03E00008 */ jr $ra -/* D06684 80240F54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80240F58_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80240F58_D05730.s deleted file mode 100644 index 279ce6a6c8..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80240F58_D05730.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F58_D06688 -/* D06688 80240F58 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D0668C 80240F5C AFB10014 */ sw $s1, 0x14($sp) -/* D06690 80240F60 0080882D */ daddu $s1, $a0, $zero -/* D06694 80240F64 AFBF0024 */ sw $ra, 0x24($sp) -/* D06698 80240F68 AFB40020 */ sw $s4, 0x20($sp) -/* D0669C 80240F6C AFB3001C */ sw $s3, 0x1c($sp) -/* D066A0 80240F70 AFB20018 */ sw $s2, 0x18($sp) -/* D066A4 80240F74 10A00033 */ beqz $a1, .L80241044 -/* D066A8 80240F78 AFB00010 */ sw $s0, 0x10($sp) -/* D066AC 80240F7C 0C04760B */ jal func_8011D82C -/* D066B0 80240F80 24040001 */ addiu $a0, $zero, 1 -/* D066B4 80240F84 0000202D */ daddu $a0, $zero, $zero -/* D066B8 80240F88 0080282D */ daddu $a1, $a0, $zero -/* D066BC 80240F8C 0080302D */ daddu $a2, $a0, $zero -/* D066C0 80240F90 0080382D */ daddu $a3, $a0, $zero -/* D066C4 80240F94 0080802D */ daddu $s0, $a0, $zero -/* D066C8 80240F98 2414FFFC */ addiu $s4, $zero, -4 -/* D066CC 80240F9C 24130008 */ addiu $s3, $zero, 8 -/* D066D0 80240FA0 3C120080 */ lui $s2, 0x80 -/* D066D4 80240FA4 3C038015 */ lui $v1, 0x8015 -/* D066D8 80240FA8 8C6312F0 */ lw $v1, 0x12f0($v1) -/* D066DC 80240FAC 24020001 */ addiu $v0, $zero, 1 -/* D066E0 80240FB0 0C046F97 */ jal set_background_color_blend -/* D066E4 80240FB4 A0620000 */ sb $v0, ($v1) -.L80240FB8: -/* D066E8 80240FB8 0C00E2B7 */ jal get_npc_by_index -/* D066EC 80240FBC 0200202D */ daddu $a0, $s0, $zero -/* D066F0 80240FC0 0040202D */ daddu $a0, $v0, $zero -/* D066F4 80240FC4 5080000B */ beql $a0, $zero, .L80240FF4 -/* D066F8 80240FC8 26100001 */ addiu $s0, $s0, 1 -/* D066FC 80240FCC 8C820000 */ lw $v0, ($a0) -/* D06700 80240FD0 50400008 */ beql $v0, $zero, .L80240FF4 -/* D06704 80240FD4 26100001 */ addiu $s0, $s0, 1 -/* D06708 80240FD8 808300A4 */ lb $v1, 0xa4($a0) -/* D0670C 80240FDC 10740005 */ beq $v1, $s4, .L80240FF4 -/* D06710 80240FE0 26100001 */ addiu $s0, $s0, 1 -/* D06714 80240FE4 10730003 */ beq $v1, $s3, .L80240FF4 -/* D06718 80240FE8 00000000 */ nop -/* D0671C 80240FEC 00521025 */ or $v0, $v0, $s2 -/* D06720 80240FF0 AC820000 */ sw $v0, ($a0) -.L80240FF4: -/* D06724 80240FF4 2A020040 */ slti $v0, $s0, 0x40 -/* D06728 80240FF8 1440FFEF */ bnez $v0, .L80240FB8 -/* D0672C 80240FFC 00000000 */ nop -/* D06730 80241000 0000802D */ daddu $s0, $zero, $zero -/* D06734 80241004 3C120800 */ lui $s2, 0x800 -.L80241008: -/* D06738 80241008 0C04C3D6 */ jal get_item_entity -/* D0673C 8024100C 0200202D */ daddu $a0, $s0, $zero -/* D06740 80241010 0040182D */ daddu $v1, $v0, $zero -/* D06744 80241014 10600007 */ beqz $v1, .L80241034 -/* D06748 80241018 26100001 */ addiu $s0, $s0, 1 -/* D0674C 8024101C 8C640000 */ lw $a0, ($v1) -/* D06750 80241020 30820010 */ andi $v0, $a0, 0x10 -/* D06754 80241024 10400003 */ beqz $v0, .L80241034 -/* D06758 80241028 00000000 */ nop -/* D0675C 8024102C 00921025 */ or $v0, $a0, $s2 -/* D06760 80241030 AC620000 */ sw $v0, ($v1) -.L80241034: -/* D06764 80241034 2A020100 */ slti $v0, $s0, 0x100 -/* D06768 80241038 1440FFF3 */ bnez $v0, .L80241008 -/* D0676C 8024103C 00000000 */ nop -/* D06770 80241040 AE200070 */ sw $zero, 0x70($s1) -.L80241044: -/* D06774 80241044 8E220070 */ lw $v0, 0x70($s1) -/* D06778 80241048 24420008 */ addiu $v0, $v0, 8 -/* D0677C 8024104C AE220070 */ sw $v0, 0x70($s1) -/* D06780 80241050 28420100 */ slti $v0, $v0, 0x100 -/* D06784 80241054 14400003 */ bnez $v0, .L80241064 -/* D06788 80241058 0000202D */ daddu $a0, $zero, $zero -/* D0678C 8024105C 240200FF */ addiu $v0, $zero, 0xff -/* D06790 80241060 AE220070 */ sw $v0, 0x70($s1) -.L80241064: -/* D06794 80241064 0080282D */ daddu $a1, $a0, $zero -/* D06798 80241068 92270073 */ lbu $a3, 0x73($s1) -/* D0679C 8024106C 0C046F97 */ jal set_background_color_blend -/* D067A0 80241070 0080302D */ daddu $a2, $a0, $zero -/* D067A4 80241074 8E220070 */ lw $v0, 0x70($s1) -/* D067A8 80241078 8FBF0024 */ lw $ra, 0x24($sp) -/* D067AC 8024107C 8FB40020 */ lw $s4, 0x20($sp) -/* D067B0 80241080 8FB3001C */ lw $s3, 0x1c($sp) -/* D067B4 80241084 8FB20018 */ lw $s2, 0x18($sp) -/* D067B8 80241088 8FB10014 */ lw $s1, 0x14($sp) -/* D067BC 8024108C 8FB00010 */ lw $s0, 0x10($sp) -/* D067C0 80241090 384200FF */ xori $v0, $v0, 0xff -/* D067C4 80241094 2C420001 */ sltiu $v0, $v0, 1 -/* D067C8 80241098 00021040 */ sll $v0, $v0, 1 -/* D067CC 8024109C 03E00008 */ jr $ra -/* D067D0 802410A0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_802410A4_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_802410A4_D05730.s deleted file mode 100644 index 9b29db2790..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_802410A4_D05730.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410A4_D067D4 -/* D067D4 802410A4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D067D8 802410A8 AFB00010 */ sw $s0, 0x10($sp) -/* D067DC 802410AC 0080802D */ daddu $s0, $a0, $zero -/* D067E0 802410B0 AFBF0020 */ sw $ra, 0x20($sp) -/* D067E4 802410B4 AFB3001C */ sw $s3, 0x1c($sp) -/* D067E8 802410B8 AFB20018 */ sw $s2, 0x18($sp) -/* D067EC 802410BC 10A00009 */ beqz $a1, .L802410E4 -/* D067F0 802410C0 AFB10014 */ sw $s1, 0x14($sp) -/* D067F4 802410C4 0000202D */ daddu $a0, $zero, $zero -/* D067F8 802410C8 0080282D */ daddu $a1, $a0, $zero -/* D067FC 802410CC 0080302D */ daddu $a2, $a0, $zero -/* D06800 802410D0 0C046F97 */ jal set_background_color_blend -/* D06804 802410D4 240700FF */ addiu $a3, $zero, 0xff -/* D06808 802410D8 240200FF */ addiu $v0, $zero, 0xff -/* D0680C 802410DC AE020070 */ sw $v0, 0x70($s0) -/* D06810 802410E0 AE000074 */ sw $zero, 0x74($s0) -.L802410E4: -/* D06814 802410E4 8E020070 */ lw $v0, 0x70($s0) -/* D06818 802410E8 2442FFF8 */ addiu $v0, $v0, -8 -/* D0681C 802410EC 04410002 */ bgez $v0, .L802410F8 -/* D06820 802410F0 AE020070 */ sw $v0, 0x70($s0) -/* D06824 802410F4 AE000070 */ sw $zero, 0x70($s0) -.L802410F8: -/* D06828 802410F8 0000202D */ daddu $a0, $zero, $zero -/* D0682C 802410FC 0080282D */ daddu $a1, $a0, $zero -/* D06830 80241100 92070073 */ lbu $a3, 0x73($s0) -/* D06834 80241104 0C046F97 */ jal set_background_color_blend -/* D06838 80241108 0080302D */ daddu $a2, $a0, $zero -/* D0683C 8024110C 8E020070 */ lw $v0, 0x70($s0) -/* D06840 80241110 14400006 */ bnez $v0, .L8024112C -/* D06844 80241114 00000000 */ nop -/* D06848 80241118 8E020074 */ lw $v0, 0x74($s0) -/* D0684C 8024111C 14400003 */ bnez $v0, .L8024112C -/* D06850 80241120 24020001 */ addiu $v0, $zero, 1 -/* D06854 80241124 0809047E */ j .L802411F8 -/* D06858 80241128 AE020074 */ sw $v0, 0x74($s0) -.L8024112C: -/* D0685C 8024112C 8E030074 */ lw $v1, 0x74($s0) -/* D06860 80241130 24020001 */ addiu $v0, $zero, 1 -/* D06864 80241134 14620031 */ bne $v1, $v0, .L802411FC -/* D06868 80241138 0000102D */ daddu $v0, $zero, $zero -/* D0686C 8024113C 0C04760B */ jal func_8011D82C -/* D06870 80241140 0000202D */ daddu $a0, $zero, $zero -/* D06874 80241144 0000802D */ daddu $s0, $zero, $zero -/* D06878 80241148 2413FFFC */ addiu $s3, $zero, -4 -/* D0687C 8024114C 24120008 */ addiu $s2, $zero, 8 -/* D06880 80241150 3C11FF7F */ lui $s1, 0xff7f -/* D06884 80241154 3C028015 */ lui $v0, 0x8015 -/* D06888 80241158 8C4212F0 */ lw $v0, 0x12f0($v0) -/* D0688C 8024115C 3631FFFF */ ori $s1, $s1, 0xffff -/* D06890 80241160 A0400000 */ sb $zero, ($v0) -.L80241164: -/* D06894 80241164 0C00E2B7 */ jal get_npc_by_index -/* D06898 80241168 0200202D */ daddu $a0, $s0, $zero -/* D0689C 8024116C 0040202D */ daddu $a0, $v0, $zero -/* D068A0 80241170 5080000B */ beql $a0, $zero, .L802411A0 -/* D068A4 80241174 26100001 */ addiu $s0, $s0, 1 -/* D068A8 80241178 8C820000 */ lw $v0, ($a0) -/* D068AC 8024117C 50400008 */ beql $v0, $zero, .L802411A0 -/* D068B0 80241180 26100001 */ addiu $s0, $s0, 1 -/* D068B4 80241184 808300A4 */ lb $v1, 0xa4($a0) -/* D068B8 80241188 10730005 */ beq $v1, $s3, .L802411A0 -/* D068BC 8024118C 26100001 */ addiu $s0, $s0, 1 -/* D068C0 80241190 10720003 */ beq $v1, $s2, .L802411A0 -/* D068C4 80241194 00000000 */ nop -/* D068C8 80241198 00511024 */ and $v0, $v0, $s1 -/* D068CC 8024119C AC820000 */ sw $v0, ($a0) -.L802411A0: -/* D068D0 802411A0 2A020040 */ slti $v0, $s0, 0x40 -/* D068D4 802411A4 1440FFEF */ bnez $v0, .L80241164 -/* D068D8 802411A8 00000000 */ nop -/* D068DC 802411AC 0000802D */ daddu $s0, $zero, $zero -/* D068E0 802411B0 3C11F7FF */ lui $s1, 0xf7ff -/* D068E4 802411B4 3631FFFF */ ori $s1, $s1, 0xffff -.L802411B8: -/* D068E8 802411B8 0C04C3D6 */ jal get_item_entity -/* D068EC 802411BC 0200202D */ daddu $a0, $s0, $zero -/* D068F0 802411C0 0040182D */ daddu $v1, $v0, $zero -/* D068F4 802411C4 10600007 */ beqz $v1, .L802411E4 -/* D068F8 802411C8 26100001 */ addiu $s0, $s0, 1 -/* D068FC 802411CC 8C640000 */ lw $a0, ($v1) -/* D06900 802411D0 30820010 */ andi $v0, $a0, 0x10 -/* D06904 802411D4 10400003 */ beqz $v0, .L802411E4 -/* D06908 802411D8 00000000 */ nop -/* D0690C 802411DC 00911024 */ and $v0, $a0, $s1 -/* D06910 802411E0 AC620000 */ sw $v0, ($v1) -.L802411E4: -/* D06914 802411E4 2A020100 */ slti $v0, $s0, 0x100 -/* D06918 802411E8 1440FFF3 */ bnez $v0, .L802411B8 -/* D0691C 802411EC 24020002 */ addiu $v0, $zero, 2 -/* D06920 802411F0 0809047F */ j .L802411FC -/* D06924 802411F4 00000000 */ nop -.L802411F8: -/* D06928 802411F8 0000102D */ daddu $v0, $zero, $zero -.L802411FC: -/* D0692C 802411FC 8FBF0020 */ lw $ra, 0x20($sp) -/* D06930 80241200 8FB3001C */ lw $s3, 0x1c($sp) -/* D06934 80241204 8FB20018 */ lw $s2, 0x18($sp) -/* D06938 80241208 8FB10014 */ lw $s1, 0x14($sp) -/* D0693C 8024120C 8FB00010 */ lw $s0, 0x10($sp) -/* D06940 80241210 03E00008 */ jr $ra -/* D06944 80241214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_8024129C_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_8024129C_D05730.s deleted file mode 100644 index 34aae16205..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_8024129C_D05730.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024129C_D069CC -/* D069CC 8024129C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* D069D0 802412A0 AFB1001C */ sw $s1, 0x1c($sp) -/* D069D4 802412A4 AFBF0020 */ sw $ra, 0x20($sp) -/* D069D8 802412A8 AFB00018 */ sw $s0, 0x18($sp) -/* D069DC 802412AC F7B60030 */ sdc1 $f22, 0x30($sp) -/* D069E0 802412B0 F7B40028 */ sdc1 $f20, 0x28($sp) -/* D069E4 802412B4 10A00060 */ beqz $a1, .L80241438 -/* D069E8 802412B8 0080882D */ daddu $s1, $a0, $zero -/* D069EC 802412BC 3C05F4AC */ lui $a1, 0xf4ac -/* D069F0 802412C0 0C0B1EAF */ jal get_variable -/* D069F4 802412C4 34A5D481 */ ori $a1, $a1, 0xd481 -/* D069F8 802412C8 0220202D */ daddu $a0, $s1, $zero -/* D069FC 802412CC 3C05F4AC */ lui $a1, 0xf4ac -/* D06A00 802412D0 4482B000 */ mtc1 $v0, $f22 -/* D06A04 802412D4 00000000 */ nop -/* D06A08 802412D8 4680B5A0 */ cvt.s.w $f22, $f22 -/* D06A0C 802412DC 0C0B1EAF */ jal get_variable -/* D06A10 802412E0 34A5D482 */ ori $a1, $a1, 0xd482 -/* D06A14 802412E4 0220202D */ daddu $a0, $s1, $zero -/* D06A18 802412E8 3C05F4AC */ lui $a1, 0xf4ac -/* D06A1C 802412EC 4482A000 */ mtc1 $v0, $f20 -/* D06A20 802412F0 00000000 */ nop -/* D06A24 802412F4 4680A520 */ cvt.s.w $f20, $f20 -/* D06A28 802412F8 0C0B1EAF */ jal get_variable -/* D06A2C 802412FC 34A5D483 */ ori $a1, $a1, 0xd483 -/* D06A30 80241300 44821000 */ mtc1 $v0, $f2 -/* D06A34 80241304 00000000 */ nop -/* D06A38 80241308 468010A0 */ cvt.s.w $f2, $f2 -/* D06A3C 8024130C 4405B000 */ mfc1 $a1, $f22 -/* D06A40 80241310 4406A000 */ mfc1 $a2, $f20 -/* D06A44 80241314 44071000 */ mfc1 $a3, $f2 -/* D06A48 80241318 0C01C574 */ jal func_800715D0 -/* D06A4C 8024131C 0000202D */ daddu $a0, $zero, $zero -/* D06A50 80241320 0220202D */ daddu $a0, $s1, $zero -/* D06A54 80241324 3C05F4AC */ lui $a1, 0xf4ac -/* D06A58 80241328 34A5D481 */ ori $a1, $a1, 0xd481 -/* D06A5C 8024132C 3C108025 */ lui $s0, 0x8025 -/* D06A60 80241330 2610B9B0 */ addiu $s0, $s0, -0x4650 -/* D06A64 80241334 0C0B1EAF */ jal get_variable -/* D06A68 80241338 AE020000 */ sw $v0, ($s0) -/* D06A6C 8024133C 0220202D */ daddu $a0, $s1, $zero -/* D06A70 80241340 3C05F4AC */ lui $a1, 0xf4ac -/* D06A74 80241344 4482B000 */ mtc1 $v0, $f22 -/* D06A78 80241348 00000000 */ nop -/* D06A7C 8024134C 4680B5A0 */ cvt.s.w $f22, $f22 -/* D06A80 80241350 0C0B1EAF */ jal get_variable -/* D06A84 80241354 34A5D482 */ ori $a1, $a1, 0xd482 -/* D06A88 80241358 0220202D */ daddu $a0, $s1, $zero -/* D06A8C 8024135C 3C05F4AC */ lui $a1, 0xf4ac -/* D06A90 80241360 4482A000 */ mtc1 $v0, $f20 -/* D06A94 80241364 00000000 */ nop -/* D06A98 80241368 4680A520 */ cvt.s.w $f20, $f20 -/* D06A9C 8024136C 0C0B1EAF */ jal get_variable -/* D06AA0 80241370 34A5D483 */ ori $a1, $a1, 0xd483 -/* D06AA4 80241374 44821000 */ mtc1 $v0, $f2 -/* D06AA8 80241378 00000000 */ nop -/* D06AAC 8024137C 468010A0 */ cvt.s.w $f2, $f2 -/* D06AB0 80241380 4405B000 */ mfc1 $a1, $f22 -/* D06AB4 80241384 4406A000 */ mfc1 $a2, $f20 -/* D06AB8 80241388 44071000 */ mfc1 $a3, $f2 -/* D06ABC 8024138C 0C01C604 */ jal func_80071810 -/* D06AC0 80241390 0000202D */ daddu $a0, $zero, $zero -/* D06AC4 80241394 0220202D */ daddu $a0, $s1, $zero -/* D06AC8 80241398 3C05F4AC */ lui $a1, 0xf4ac -/* D06ACC 8024139C 3C018025 */ lui $at, 0x8025 -/* D06AD0 802413A0 AC22B9B4 */ sw $v0, -0x464c($at) -/* D06AD4 802413A4 0C0B1EAF */ jal get_variable -/* D06AD8 802413A8 34A5D481 */ ori $a1, $a1, 0xd481 -/* D06ADC 802413AC 0220202D */ daddu $a0, $s1, $zero -/* D06AE0 802413B0 3C05F4AC */ lui $a1, 0xf4ac -/* D06AE4 802413B4 4482B000 */ mtc1 $v0, $f22 -/* D06AE8 802413B8 00000000 */ nop -/* D06AEC 802413BC 4680B5A0 */ cvt.s.w $f22, $f22 -/* D06AF0 802413C0 0C0B1EAF */ jal get_variable -/* D06AF4 802413C4 34A5D482 */ ori $a1, $a1, 0xd482 -/* D06AF8 802413C8 0220202D */ daddu $a0, $s1, $zero -/* D06AFC 802413CC 3C05F4AC */ lui $a1, 0xf4ac -/* D06B00 802413D0 4482A000 */ mtc1 $v0, $f20 -/* D06B04 802413D4 00000000 */ nop -/* D06B08 802413D8 4680A520 */ cvt.s.w $f20, $f20 -/* D06B0C 802413DC 0C0B1EAF */ jal get_variable -/* D06B10 802413E0 34A5D483 */ ori $a1, $a1, 0xd483 -/* D06B14 802413E4 44821000 */ mtc1 $v0, $f2 -/* D06B18 802413E8 00000000 */ nop -/* D06B1C 802413EC 468010A0 */ cvt.s.w $f2, $f2 -/* D06B20 802413F0 4405B000 */ mfc1 $a1, $f22 -/* D06B24 802413F4 4406A000 */ mfc1 $a2, $f20 -/* D06B28 802413F8 3C013F80 */ lui $at, 0x3f80 -/* D06B2C 802413FC 44810000 */ mtc1 $at, $f0 -/* D06B30 80241400 44071000 */ mfc1 $a3, $f2 -/* D06B34 80241404 0000202D */ daddu $a0, $zero, $zero -/* D06B38 80241408 AFA00014 */ sw $zero, 0x14($sp) -/* D06B3C 8024140C 0C01CA24 */ jal func_80072890 -/* D06B40 80241410 E7A00010 */ swc1 $f0, 0x10($sp) -/* D06B44 80241414 8E030000 */ lw $v1, ($s0) -/* D06B48 80241418 8C64000C */ lw $a0, 0xc($v1) -/* D06B4C 8024141C 3C018025 */ lui $at, 0x8025 -/* D06B50 80241420 AC22B9B8 */ sw $v0, -0x4648($at) -/* D06B54 80241424 AC800018 */ sw $zero, 0x18($a0) -/* D06B58 80241428 AC800020 */ sw $zero, 0x20($a0) -/* D06B5C 8024142C AC800024 */ sw $zero, 0x24($a0) -/* D06B60 80241430 AC800028 */ sw $zero, 0x28($a0) -/* D06B64 80241434 AC80001C */ sw $zero, 0x1c($a0) -.L80241438: -/* D06B68 80241438 3C028025 */ lui $v0, 0x8025 -/* D06B6C 8024143C 8C42B9B0 */ lw $v0, -0x4650($v0) -/* D06B70 80241440 8C44000C */ lw $a0, 0xc($v0) -/* D06B74 80241444 8C820020 */ lw $v0, 0x20($a0) -/* D06B78 80241448 8C830028 */ lw $v1, 0x28($a0) -/* D06B7C 8024144C 2442000A */ addiu $v0, $v0, 0xa -/* D06B80 80241450 AC820020 */ sw $v0, 0x20($a0) -/* D06B84 80241454 8C820024 */ lw $v0, 0x24($a0) -/* D06B88 80241458 2463000A */ addiu $v1, $v1, 0xa -/* D06B8C 8024145C AC830028 */ sw $v1, 0x28($a0) -/* D06B90 80241460 8C830018 */ lw $v1, 0x18($a0) -/* D06B94 80241464 2442000A */ addiu $v0, $v0, 0xa -/* D06B98 80241468 AC820024 */ sw $v0, 0x24($a0) -/* D06B9C 8024146C 8C82001C */ lw $v0, 0x1c($a0) -/* D06BA0 80241470 2463000A */ addiu $v1, $v1, 0xa -/* D06BA4 80241474 AC830018 */ sw $v1, 0x18($a0) -/* D06BA8 80241478 286300FF */ slti $v1, $v1, 0xff -/* D06BAC 8024147C 2442000A */ addiu $v0, $v0, 0xa -/* D06BB0 80241480 AC82001C */ sw $v0, 0x1c($a0) -/* D06BB4 80241484 14600004 */ bnez $v1, .L80241498 -/* D06BB8 80241488 0000102D */ daddu $v0, $zero, $zero -/* D06BBC 8024148C 240200FF */ addiu $v0, $zero, 0xff -/* D06BC0 80241490 AC820018 */ sw $v0, 0x18($a0) -/* D06BC4 80241494 24020002 */ addiu $v0, $zero, 2 -.L80241498: -/* D06BC8 80241498 8FBF0020 */ lw $ra, 0x20($sp) -/* D06BCC 8024149C 8FB1001C */ lw $s1, 0x1c($sp) -/* D06BD0 802414A0 8FB00018 */ lw $s0, 0x18($sp) -/* D06BD4 802414A4 D7B60030 */ ldc1 $f22, 0x30($sp) -/* D06BD8 802414A8 D7B40028 */ ldc1 $f20, 0x28($sp) -/* D06BDC 802414AC 03E00008 */ jr $ra -/* D06BE0 802414B0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_802414B4_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_802414B4_D05730.s deleted file mode 100644 index 6b69371017..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_802414B4_D05730.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414B4_D06BE4 -/* D06BE4 802414B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D06BE8 802414B8 10A0000B */ beqz $a1, .L802414E8 -/* D06BEC 802414BC AFBF0010 */ sw $ra, 0x10($sp) -/* D06BF0 802414C0 3C038025 */ lui $v1, 0x8025 -/* D06BF4 802414C4 8C63B9B4 */ lw $v1, -0x464c($v1) -/* D06BF8 802414C8 8C620000 */ lw $v0, ($v1) -/* D06BFC 802414CC 3C048025 */ lui $a0, 0x8025 -/* D06C00 802414D0 8C84B9B8 */ lw $a0, -0x4648($a0) -/* D06C04 802414D4 34420010 */ ori $v0, $v0, 0x10 -/* D06C08 802414D8 AC620000 */ sw $v0, ($v1) -/* D06C0C 802414DC 8C820000 */ lw $v0, ($a0) -/* D06C10 802414E0 34420010 */ ori $v0, $v0, 0x10 -/* D06C14 802414E4 AC820000 */ sw $v0, ($a0) -.L802414E8: -/* D06C18 802414E8 3C048025 */ lui $a0, 0x8025 -/* D06C1C 802414EC 8C84B9B0 */ lw $a0, -0x4650($a0) -/* D06C20 802414F0 8C85000C */ lw $a1, 0xc($a0) -/* D06C24 802414F4 8CA20018 */ lw $v0, 0x18($a1) -/* D06C28 802414F8 8CA30020 */ lw $v1, 0x20($a1) -/* D06C2C 802414FC 2442FFF6 */ addiu $v0, $v0, -0xa -/* D06C30 80241500 ACA20018 */ sw $v0, 0x18($a1) -/* D06C34 80241504 8CA20024 */ lw $v0, 0x24($a1) -/* D06C38 80241508 2463FFF6 */ addiu $v1, $v1, -0xa -/* D06C3C 8024150C ACA30020 */ sw $v1, 0x20($a1) -/* D06C40 80241510 8CA30028 */ lw $v1, 0x28($a1) -/* D06C44 80241514 2442FFF6 */ addiu $v0, $v0, -0xa -/* D06C48 80241518 ACA20024 */ sw $v0, 0x24($a1) -/* D06C4C 8024151C 8CA2001C */ lw $v0, 0x1c($a1) -/* D06C50 80241520 2463FFF6 */ addiu $v1, $v1, -0xa -/* D06C54 80241524 ACA30028 */ sw $v1, 0x28($a1) -/* D06C58 80241528 8CA30018 */ lw $v1, 0x18($a1) -/* D06C5C 8024152C 2442FFF6 */ addiu $v0, $v0, -0xa -/* D06C60 80241530 18600003 */ blez $v1, .L80241540 -/* D06C64 80241534 ACA2001C */ sw $v0, 0x1c($a1) -/* D06C68 80241538 08090557 */ j .L8024155C -/* D06C6C 8024153C 0000102D */ daddu $v0, $zero, $zero -.L80241540: -/* D06C70 80241540 0C016914 */ jal remove_effect -/* D06C74 80241544 ACA00018 */ sw $zero, 0x18($a1) -/* D06C78 80241548 3C048025 */ lui $a0, 0x8025 -/* D06C7C 8024154C 8C84B990 */ lw $a0, -0x4670($a0) -/* D06C80 80241550 0C048D70 */ jal func_801235C0 -/* D06C84 80241554 00000000 */ nop -/* D06C88 80241558 24020002 */ addiu $v0, $zero, 2 -.L8024155C: -/* D06C8C 8024155C 8FBF0010 */ lw $ra, 0x10($sp) -/* D06C90 80241560 03E00008 */ jr $ra -/* D06C94 80241564 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80241568_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80241568_D05730.s deleted file mode 100644 index 3a13f04b6b..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80241568_D05730.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241568_D06C98 -/* D06C98 80241568 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D06C9C 8024156C AFBF0010 */ sw $ra, 0x10($sp) -/* D06CA0 80241570 8C82000C */ lw $v0, 0xc($a0) -/* D06CA4 80241574 0C0B1EAF */ jal get_variable -/* D06CA8 80241578 8C450000 */ lw $a1, ($v0) -/* D06CAC 8024157C 3C038025 */ lui $v1, 0x8025 -/* D06CB0 80241580 8C63B9B0 */ lw $v1, -0x4650($v1) -/* D06CB4 80241584 8C63000C */ lw $v1, 0xc($v1) -/* D06CB8 80241588 AC620034 */ sw $v0, 0x34($v1) -/* D06CBC 8024158C 8FBF0010 */ lw $ra, 0x10($sp) -/* D06CC0 80241590 24020002 */ addiu $v0, $zero, 2 -/* D06CC4 80241594 03E00008 */ jr $ra -/* D06CC8 80241598 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_8024159C_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_8024159C_D05730.s deleted file mode 100644 index 10e2a8cf9c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_8024159C_D05730.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024159C_D06CCC -/* D06CCC 8024159C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D06CD0 802415A0 AFBF0010 */ sw $ra, 0x10($sp) -/* D06CD4 802415A4 8C82000C */ lw $v0, 0xc($a0) -/* D06CD8 802415A8 0C0B1EAF */ jal get_variable -/* D06CDC 802415AC 8C450000 */ lw $a1, ($v0) -/* D06CE0 802415B0 0040202D */ daddu $a0, $v0, $zero -/* D06CE4 802415B4 3C028025 */ lui $v0, 0x8025 -/* D06CE8 802415B8 8C42B9B0 */ lw $v0, -0x4650($v0) -/* D06CEC 802415BC 24030001 */ addiu $v1, $zero, 1 -/* D06CF0 802415C0 8C45000C */ lw $a1, 0xc($v0) -/* D06CF4 802415C4 1083000D */ beq $a0, $v1, .L802415FC -/* D06CF8 802415C8 28820002 */ slti $v0, $a0, 2 -/* D06CFC 802415CC 10400005 */ beqz $v0, .L802415E4 -/* D06D00 802415D0 24020002 */ addiu $v0, $zero, 2 -/* D06D04 802415D4 10800007 */ beqz $a0, .L802415F4 -/* D06D08 802415D8 240200C0 */ addiu $v0, $zero, 0xc0 -/* D06D0C 802415DC 08090583 */ j .L8024160C -/* D06D10 802415E0 ACA00038 */ sw $zero, 0x38($a1) -.L802415E4: -/* D06D14 802415E4 10820008 */ beq $a0, $v0, .L80241608 -/* D06D18 802415E8 24020040 */ addiu $v0, $zero, 0x40 -/* D06D1C 802415EC 08090583 */ j .L8024160C -/* D06D20 802415F0 ACA00038 */ sw $zero, 0x38($a1) -.L802415F4: -/* D06D24 802415F4 08090583 */ j .L8024160C -/* D06D28 802415F8 ACA20038 */ sw $v0, 0x38($a1) -.L802415FC: -/* D06D2C 802415FC 24020080 */ addiu $v0, $zero, 0x80 -/* D06D30 80241600 08090583 */ j .L8024160C -/* D06D34 80241604 ACA20038 */ sw $v0, 0x38($a1) -.L80241608: -/* D06D38 80241608 ACA20038 */ sw $v0, 0x38($a1) -.L8024160C: -/* D06D3C 8024160C 8FBF0010 */ lw $ra, 0x10($sp) -/* D06D40 80241610 24020002 */ addiu $v0, $zero, 2 -/* D06D44 80241614 03E00008 */ jr $ra -/* D06D48 80241618 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80241650_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80241650_D05730.s deleted file mode 100644 index 26be5e8d21..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80241650_D05730.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241650_D06D80 -/* D06D80 80241650 3C028025 */ lui $v0, 0x8025 -/* D06D84 80241654 8C42B9B8 */ lw $v0, -0x4648($v0) -/* D06D88 80241658 8C43000C */ lw $v1, 0xc($v0) -/* D06D8C 8024165C 24020002 */ addiu $v0, $zero, 2 -/* D06D90 80241660 03E00008 */ jr $ra -/* D06D94 80241664 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80241668_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80241668_D05730.s deleted file mode 100644 index 05d98f2420..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80241668_D05730.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241668_D06D98 -/* D06D98 80241668 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D06D9C 8024166C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* D06DA0 80241670 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* D06DA4 80241674 3C05FE36 */ lui $a1, 0xfe36 -/* D06DA8 80241678 AFBF0010 */ sw $ra, 0x10($sp) -/* D06DAC 8024167C 80460075 */ lb $a2, 0x75($v0) -/* D06DB0 80241680 0C0B2026 */ jal set_variable -/* D06DB4 80241684 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D06DB8 80241688 8FBF0010 */ lw $ra, 0x10($sp) -/* D06DBC 8024168C 24020002 */ addiu $v0, $zero, 2 -/* D06DC0 80241690 03E00008 */ jr $ra -/* D06DC4 80241694 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_8024170C_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_8024170C_D05730.s deleted file mode 100644 index ec1da9607d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_8024170C_D05730.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024170C_D06E3C -/* D06E3C 8024170C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D06E40 80241710 AFB10014 */ sw $s1, 0x14($sp) -/* D06E44 80241714 0080882D */ daddu $s1, $a0, $zero -/* D06E48 80241718 AFBF0018 */ sw $ra, 0x18($sp) -/* D06E4C 8024171C AFB00010 */ sw $s0, 0x10($sp) -/* D06E50 80241720 8E30000C */ lw $s0, 0xc($s1) -/* D06E54 80241724 8E050000 */ lw $a1, ($s0) -/* D06E58 80241728 0C0B1EAF */ jal get_variable -/* D06E5C 8024172C 26100004 */ addiu $s0, $s0, 4 -/* D06E60 80241730 00021880 */ sll $v1, $v0, 2 -/* D06E64 80241734 00621821 */ addu $v1, $v1, $v0 -/* D06E68 80241738 00031880 */ sll $v1, $v1, 2 -/* D06E6C 8024173C 00621823 */ subu $v1, $v1, $v0 -/* D06E70 80241740 000310C0 */ sll $v0, $v1, 3 -/* D06E74 80241744 00621821 */ addu $v1, $v1, $v0 -/* D06E78 80241748 000318C0 */ sll $v1, $v1, 3 -/* D06E7C 8024174C 3C01800B */ lui $at, 0x800b -/* D06E80 80241750 00230821 */ addu $at, $at, $v1 -/* D06E84 80241754 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* D06E88 80241758 3C014480 */ lui $at, 0x4480 -/* D06E8C 8024175C 44810000 */ mtc1 $at, $f0 -/* D06E90 80241760 00000000 */ nop -/* D06E94 80241764 46001082 */ mul.s $f2, $f2, $f0 -/* D06E98 80241768 00000000 */ nop -/* D06E9C 8024176C 3C01CD5B */ lui $at, 0xcd5b -/* D06EA0 80241770 34215858 */ ori $at, $at, 0x5858 -/* D06EA4 80241774 44810000 */ mtc1 $at, $f0 -/* D06EA8 80241778 00000000 */ nop -/* D06EAC 8024177C 46001080 */ add.s $f2, $f2, $f0 -/* D06EB0 80241780 8E050000 */ lw $a1, ($s0) -/* D06EB4 80241784 4600110D */ trunc.w.s $f4, $f2 -/* D06EB8 80241788 44062000 */ mfc1 $a2, $f4 -/* D06EBC 8024178C 0C0B2026 */ jal set_variable -/* D06EC0 80241790 0220202D */ daddu $a0, $s1, $zero -/* D06EC4 80241794 8FBF0018 */ lw $ra, 0x18($sp) -/* D06EC8 80241798 8FB10014 */ lw $s1, 0x14($sp) -/* D06ECC 8024179C 8FB00010 */ lw $s0, 0x10($sp) -/* D06ED0 802417A0 24020002 */ addiu $v0, $zero, 2 -/* D06ED4 802417A4 03E00008 */ jr $ra -/* D06ED8 802417A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_802417AC_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_802417AC_D05730.s deleted file mode 100644 index 26ee6de3ae..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_802417AC_D05730.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417AC_D06EDC -/* D06EDC 802417AC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D06EE0 802417B0 AFB20018 */ sw $s2, 0x18($sp) -/* D06EE4 802417B4 0080902D */ daddu $s2, $a0, $zero -/* D06EE8 802417B8 AFBF0030 */ sw $ra, 0x30($sp) -/* D06EEC 802417BC AFB7002C */ sw $s7, 0x2c($sp) -/* D06EF0 802417C0 AFB60028 */ sw $s6, 0x28($sp) -/* D06EF4 802417C4 AFB50024 */ sw $s5, 0x24($sp) -/* D06EF8 802417C8 AFB40020 */ sw $s4, 0x20($sp) -/* D06EFC 802417CC AFB3001C */ sw $s3, 0x1c($sp) -/* D06F00 802417D0 AFB10014 */ sw $s1, 0x14($sp) -/* D06F04 802417D4 AFB00010 */ sw $s0, 0x10($sp) -/* D06F08 802417D8 F7B60040 */ sdc1 $f22, 0x40($sp) -/* D06F0C 802417DC F7B40038 */ sdc1 $f20, 0x38($sp) -/* D06F10 802417E0 8E50000C */ lw $s0, 0xc($s2) -/* D06F14 802417E4 8E050000 */ lw $a1, ($s0) -/* D06F18 802417E8 0C0B1EAF */ jal get_variable -/* D06F1C 802417EC 26100004 */ addiu $s0, $s0, 4 -/* D06F20 802417F0 8E050000 */ lw $a1, ($s0) -/* D06F24 802417F4 26100004 */ addiu $s0, $s0, 4 -/* D06F28 802417F8 0240202D */ daddu $a0, $s2, $zero -/* D06F2C 802417FC 0C0B1EAF */ jal get_variable -/* D06F30 80241800 0040B82D */ daddu $s7, $v0, $zero -/* D06F34 80241804 8E050000 */ lw $a1, ($s0) -/* D06F38 80241808 26100004 */ addiu $s0, $s0, 4 -/* D06F3C 8024180C 0240202D */ daddu $a0, $s2, $zero -/* D06F40 80241810 0C0B1EAF */ jal get_variable -/* D06F44 80241814 0040B02D */ daddu $s6, $v0, $zero -/* D06F48 80241818 0240202D */ daddu $a0, $s2, $zero -/* D06F4C 8024181C 3C05F4AC */ lui $a1, 0xf4ac -/* D06F50 80241820 34A5D481 */ ori $a1, $a1, 0xd481 -/* D06F54 80241824 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* D06F58 80241828 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* D06F5C 8024182C 8E140000 */ lw $s4, ($s0) -/* D06F60 80241830 00061880 */ sll $v1, $a2, 2 -/* D06F64 80241834 00661821 */ addu $v1, $v1, $a2 -/* D06F68 80241838 00031880 */ sll $v1, $v1, 2 -/* D06F6C 8024183C 00661823 */ subu $v1, $v1, $a2 -/* D06F70 80241840 000330C0 */ sll $a2, $v1, 3 -/* D06F74 80241844 00661821 */ addu $v1, $v1, $a2 -/* D06F78 80241848 000318C0 */ sll $v1, $v1, 3 -/* D06F7C 8024184C 3C01800B */ lui $at, 0x800b -/* D06F80 80241850 00230821 */ addu $at, $at, $v1 -/* D06F84 80241854 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* D06F88 80241858 8E150004 */ lw $s5, 4($s0) -/* D06F8C 8024185C 4600010D */ trunc.w.s $f4, $f0 -/* D06F90 80241860 44112000 */ mfc1 $s1, $f4 -/* D06F94 80241864 0C0B1EAF */ jal get_variable -/* D06F98 80241868 0040982D */ daddu $s3, $v0, $zero -/* D06F9C 8024186C 4491B000 */ mtc1 $s1, $f22 -/* D06FA0 80241870 00000000 */ nop -/* D06FA4 80241874 4680B5A0 */ cvt.s.w $f22, $f22 -/* D06FA8 80241878 4600B306 */ mov.s $f12, $f22 -/* D06FAC 8024187C 0C00A8D4 */ jal cos_deg -/* D06FB0 80241880 0040802D */ daddu $s0, $v0, $zero -/* D06FB4 80241884 4493A000 */ mtc1 $s3, $f20 -/* D06FB8 80241888 00000000 */ nop -/* D06FBC 8024188C 4680A520 */ cvt.s.w $f20, $f20 -/* D06FC0 80241890 4600A002 */ mul.s $f0, $f20, $f0 -/* D06FC4 80241894 00000000 */ nop -/* D06FC8 80241898 0240202D */ daddu $a0, $s2, $zero -/* D06FCC 8024189C 44901000 */ mtc1 $s0, $f2 -/* D06FD0 802418A0 00000000 */ nop -/* D06FD4 802418A4 468010A0 */ cvt.s.w $f2, $f2 -/* D06FD8 802418A8 46001081 */ sub.s $f2, $f2, $f0 -/* D06FDC 802418AC 3C05F4AC */ lui $a1, 0xf4ac -/* D06FE0 802418B0 4600110D */ trunc.w.s $f4, $f2 -/* D06FE4 802418B4 44102000 */ mfc1 $s0, $f4 -/* D06FE8 802418B8 0C0B1EAF */ jal get_variable -/* D06FEC 802418BC 34A5D483 */ ori $a1, $a1, 0xd483 -/* D06FF0 802418C0 4600B306 */ mov.s $f12, $f22 -/* D06FF4 802418C4 0C00A8BB */ jal sin_deg -/* D06FF8 802418C8 0040882D */ daddu $s1, $v0, $zero -/* D06FFC 802418CC 4600A502 */ mul.s $f20, $f20, $f0 -/* D07000 802418D0 00000000 */ nop -/* D07004 802418D4 0240202D */ daddu $a0, $s2, $zero -/* D07008 802418D8 44910000 */ mtc1 $s1, $f0 -/* D0700C 802418DC 00000000 */ nop -/* D07010 802418E0 46800020 */ cvt.s.w $f0, $f0 -/* D07014 802418E4 46140001 */ sub.s $f0, $f0, $f20 -/* D07018 802418E8 0280282D */ daddu $a1, $s4, $zero -/* D0701C 802418EC 02173023 */ subu $a2, $s0, $s7 -/* D07020 802418F0 4600010D */ trunc.w.s $f4, $f0 -/* D07024 802418F4 44102000 */ mfc1 $s0, $f4 -/* D07028 802418F8 0C0B2026 */ jal set_variable -/* D0702C 802418FC 02168023 */ subu $s0, $s0, $s6 -/* D07030 80241900 0240202D */ daddu $a0, $s2, $zero -/* D07034 80241904 02A0282D */ daddu $a1, $s5, $zero -/* D07038 80241908 0C0B2026 */ jal set_variable -/* D0703C 8024190C 0200302D */ daddu $a2, $s0, $zero -/* D07040 80241910 8FBF0030 */ lw $ra, 0x30($sp) -/* D07044 80241914 8FB7002C */ lw $s7, 0x2c($sp) -/* D07048 80241918 8FB60028 */ lw $s6, 0x28($sp) -/* D0704C 8024191C 8FB50024 */ lw $s5, 0x24($sp) -/* D07050 80241920 8FB40020 */ lw $s4, 0x20($sp) -/* D07054 80241924 8FB3001C */ lw $s3, 0x1c($sp) -/* D07058 80241928 8FB20018 */ lw $s2, 0x18($sp) -/* D0705C 8024192C 8FB10014 */ lw $s1, 0x14($sp) -/* D07060 80241930 8FB00010 */ lw $s0, 0x10($sp) -/* D07064 80241934 D7B60040 */ ldc1 $f22, 0x40($sp) -/* D07068 80241938 D7B40038 */ ldc1 $f20, 0x38($sp) -/* D0706C 8024193C 24020002 */ addiu $v0, $zero, 2 -/* D07070 80241940 03E00008 */ jr $ra -/* D07074 80241944 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80241948_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80241948_D05730.s deleted file mode 100644 index 82bc1f8e14..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80241948_D05730.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241948_D07078 -/* D07078 80241948 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* D0707C 8024194C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* D07080 80241950 10A00002 */ beqz $a1, .L8024195C -/* D07084 80241954 2402003C */ addiu $v0, $zero, 0x3c -/* D07088 80241958 AC820070 */ sw $v0, 0x70($a0) -.L8024195C: -/* D0708C 8024195C C4620080 */ lwc1 $f2, 0x80($v1) -/* D07090 80241960 3C0141F0 */ lui $at, 0x41f0 -/* D07094 80241964 44810000 */ mtc1 $at, $f0 -/* D07098 80241968 00000000 */ nop -/* D0709C 8024196C 46001000 */ add.s $f0, $f2, $f0 -/* D070A0 80241970 3C0143B4 */ lui $at, 0x43b4 -/* D070A4 80241974 44811000 */ mtc1 $at, $f2 -/* D070A8 80241978 00000000 */ nop -/* D070AC 8024197C 4600103E */ c.le.s $f2, $f0 -/* D070B0 80241980 00000000 */ nop -/* D070B4 80241984 45000003 */ bc1f .L80241994 -/* D070B8 80241988 E4600080 */ swc1 $f0, 0x80($v1) -/* D070BC 8024198C 46020001 */ sub.s $f0, $f0, $f2 -/* D070C0 80241990 E4600080 */ swc1 $f0, 0x80($v1) -.L80241994: -/* D070C4 80241994 8C820070 */ lw $v0, 0x70($a0) -/* D070C8 80241998 2442FFFF */ addiu $v0, $v0, -1 -/* D070CC 8024199C AC820070 */ sw $v0, 0x70($a0) -/* D070D0 802419A0 000217C3 */ sra $v0, $v0, 0x1f -/* D070D4 802419A4 03E00008 */ jr $ra -/* D070D8 802419A8 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_802419AC_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_802419AC_D05730.s deleted file mode 100644 index d6e0afad60..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_802419AC_D05730.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419AC_D070DC -/* D070DC 802419AC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D070E0 802419B0 AFB10014 */ sw $s1, 0x14($sp) -/* D070E4 802419B4 0080882D */ daddu $s1, $a0, $zero -/* D070E8 802419B8 AFB00010 */ sw $s0, 0x10($sp) -/* D070EC 802419BC 00A0802D */ daddu $s0, $a1, $zero -/* D070F0 802419C0 AFBF0018 */ sw $ra, 0x18($sp) -/* D070F4 802419C4 0C00EABB */ jal get_npc_unsafe -/* D070F8 802419C8 2404FFFC */ addiu $a0, $zero, -4 -/* D070FC 802419CC 12000003 */ beqz $s0, .L802419DC -/* D07100 802419D0 0040182D */ daddu $v1, $v0, $zero -/* D07104 802419D4 2402003C */ addiu $v0, $zero, 0x3c -/* D07108 802419D8 AE220070 */ sw $v0, 0x70($s1) -.L802419DC: -/* D0710C 802419DC C462000C */ lwc1 $f2, 0xc($v1) -/* D07110 802419E0 3C0141F0 */ lui $at, 0x41f0 -/* D07114 802419E4 44810000 */ mtc1 $at, $f0 -/* D07118 802419E8 00000000 */ nop -/* D0711C 802419EC 46001000 */ add.s $f0, $f2, $f0 -/* D07120 802419F0 3C0143B4 */ lui $at, 0x43b4 -/* D07124 802419F4 44811000 */ mtc1 $at, $f2 -/* D07128 802419F8 00000000 */ nop -/* D0712C 802419FC 4600103E */ c.le.s $f2, $f0 -/* D07130 80241A00 00000000 */ nop -/* D07134 80241A04 45000003 */ bc1f .L80241A14 -/* D07138 80241A08 E460000C */ swc1 $f0, 0xc($v1) -/* D0713C 80241A0C 46020001 */ sub.s $f0, $f0, $f2 -/* D07140 80241A10 E460000C */ swc1 $f0, 0xc($v1) -.L80241A14: -/* D07144 80241A14 8E230070 */ lw $v1, 0x70($s1) -/* D07148 80241A18 2463FFFF */ addiu $v1, $v1, -1 -/* D0714C 80241A1C 000317C3 */ sra $v0, $v1, 0x1f -/* D07150 80241A20 AE230070 */ sw $v1, 0x70($s1) -/* D07154 80241A24 8FBF0018 */ lw $ra, 0x18($sp) -/* D07158 80241A28 8FB10014 */ lw $s1, 0x14($sp) -/* D0715C 80241A2C 8FB00010 */ lw $s0, 0x10($sp) -/* D07160 80241A30 30420002 */ andi $v0, $v0, 2 -/* D07164 80241A34 03E00008 */ jr $ra -/* D07168 80241A38 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80241A3C_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80241A3C_D05730.s deleted file mode 100644 index 60094ee900..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80241A3C_D05730.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A3C_D0716C -/* D0716C 80241A3C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D07170 80241A40 AFB10014 */ sw $s1, 0x14($sp) -/* D07174 80241A44 0080882D */ daddu $s1, $a0, $zero -/* D07178 80241A48 AFB00010 */ sw $s0, 0x10($sp) -/* D0717C 80241A4C 00A0802D */ daddu $s0, $a1, $zero -/* D07180 80241A50 AFBF001C */ sw $ra, 0x1c($sp) -/* D07184 80241A54 AFB20018 */ sw $s2, 0x18($sp) -/* D07188 80241A58 F7B40020 */ sdc1 $f20, 0x20($sp) -/* D0718C 80241A5C 0C00EABB */ jal get_npc_unsafe -/* D07190 80241A60 2404FFFC */ addiu $a0, $zero, -4 -/* D07194 80241A64 12000017 */ beqz $s0, .L80241AC4 -/* D07198 80241A68 0040902D */ daddu $s2, $v0, $zero -/* D0719C 80241A6C 0220202D */ daddu $a0, $s1, $zero -/* D071A0 80241A70 3C05FE36 */ lui $a1, 0xfe36 -/* D071A4 80241A74 0C0B210B */ jal get_float_variable -/* D071A8 80241A78 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D071AC 80241A7C 0220202D */ daddu $a0, $s1, $zero -/* D071B0 80241A80 3C05FE36 */ lui $a1, 0xfe36 -/* D071B4 80241A84 3C014270 */ lui $at, 0x4270 -/* D071B8 80241A88 4481A000 */ mtc1 $at, $f20 -/* D071BC 80241A8C 34A53C85 */ ori $a1, $a1, 0x3c85 -/* D071C0 80241A90 46140003 */ div.s $f0, $f0, $f20 -/* D071C4 80241A94 0C0B210B */ jal get_float_variable -/* D071C8 80241A98 E6200074 */ swc1 $f0, 0x74($s1) -/* D071CC 80241A9C 0220202D */ daddu $a0, $s1, $zero -/* D071D0 80241AA0 3C05FE36 */ lui $a1, 0xfe36 -/* D071D4 80241AA4 34A53C81 */ ori $a1, $a1, 0x3c81 -/* D071D8 80241AA8 46140003 */ div.s $f0, $f0, $f20 -/* D071DC 80241AAC 0C0B210B */ jal get_float_variable -/* D071E0 80241AB0 E6200078 */ swc1 $f0, 0x78($s1) -/* D071E4 80241AB4 46140003 */ div.s $f0, $f0, $f20 -/* D071E8 80241AB8 2402003C */ addiu $v0, $zero, 0x3c -/* D071EC 80241ABC E620007C */ swc1 $f0, 0x7c($s1) -/* D071F0 80241AC0 AE220070 */ sw $v0, 0x70($s1) -.L80241AC4: -/* D071F4 80241AC4 C6400038 */ lwc1 $f0, 0x38($s2) -/* D071F8 80241AC8 C6220074 */ lwc1 $f2, 0x74($s1) -/* D071FC 80241ACC 46020000 */ add.s $f0, $f0, $f2 -/* D07200 80241AD0 E6400038 */ swc1 $f0, 0x38($s2) -/* D07204 80241AD4 C640003C */ lwc1 $f0, 0x3c($s2) -/* D07208 80241AD8 C6220078 */ lwc1 $f2, 0x78($s1) -/* D0720C 80241ADC 46020000 */ add.s $f0, $f0, $f2 -/* D07210 80241AE0 E640003C */ swc1 $f0, 0x3c($s2) -/* D07214 80241AE4 C6400040 */ lwc1 $f0, 0x40($s2) -/* D07218 80241AE8 C622007C */ lwc1 $f2, 0x7c($s1) -/* D0721C 80241AEC 46020000 */ add.s $f0, $f0, $f2 -/* D07220 80241AF0 E6400040 */ swc1 $f0, 0x40($s2) -/* D07224 80241AF4 8E230070 */ lw $v1, 0x70($s1) -/* D07228 80241AF8 2463FFFF */ addiu $v1, $v1, -1 -/* D0722C 80241AFC 2C620001 */ sltiu $v0, $v1, 1 -/* D07230 80241B00 AE230070 */ sw $v1, 0x70($s1) -/* D07234 80241B04 8FBF001C */ lw $ra, 0x1c($sp) -/* D07238 80241B08 8FB20018 */ lw $s2, 0x18($sp) -/* D0723C 80241B0C 8FB10014 */ lw $s1, 0x14($sp) -/* D07240 80241B10 8FB00010 */ lw $s0, 0x10($sp) -/* D07244 80241B14 D7B40020 */ ldc1 $f20, 0x20($sp) -/* D07248 80241B18 00021040 */ sll $v0, $v0, 1 -/* D0724C 80241B1C 03E00008 */ jr $ra -/* D07250 80241B20 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_02/func_80241B90_D05730.s b/asm/nonmatchings/world/area_sam/sam_02/func_80241B90_D05730.s deleted file mode 100644 index 04b79cc2f6..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/func_80241B90_D05730.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B90_D072C0 -/* D072C0 80241B90 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D072C4 80241B94 3C058024 */ lui $a1, 0x8024 -/* D072C8 80241B98 24A51B24 */ addiu $a1, $a1, 0x1b24 -/* D072CC 80241B9C AFBF0010 */ sw $ra, 0x10($sp) -/* D072D0 80241BA0 0C048C8F */ jal bind_dynamic_entity_7 -/* D072D4 80241BA4 0000202D */ daddu $a0, $zero, $zero -/* D072D8 80241BA8 8FBF0010 */ lw $ra, 0x10($sp) -/* D072DC 80241BAC 3C018025 */ lui $at, 0x8025 -/* D072E0 80241BB0 AC22B990 */ sw $v0, -0x4670($at) -/* D072E4 80241BB4 24020002 */ addiu $v0, $zero, 2 -/* D072E8 80241BB8 03E00008 */ jr $ra -/* D072EC 80241BBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_03/func_80240050_D110C0.s b/asm/nonmatchings/world/area_sam/sam_03/func_80240050_D110C0.s deleted file mode 100644 index 1437f7576d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_03/func_80240050_D110C0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D11110 -/* D11110 80240050 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D11114 80240054 AFB10014 */ sw $s1, 0x14($sp) -/* D11118 80240058 0080882D */ daddu $s1, $a0, $zero -/* D1111C 8024005C AFBF0018 */ sw $ra, 0x18($sp) -/* D11120 80240060 AFB00010 */ sw $s0, 0x10($sp) -/* D11124 80240064 8E300148 */ lw $s0, 0x148($s1) -/* D11128 80240068 0C00EABB */ jal get_npc_unsafe -/* D1112C 8024006C 86040008 */ lh $a0, 8($s0) -/* D11130 80240070 24030001 */ addiu $v1, $zero, 1 -/* D11134 80240074 0040202D */ daddu $a0, $v0, $zero -/* D11138 80240078 AE03006C */ sw $v1, 0x6c($s0) -/* D1113C 8024007C 8482008C */ lh $v0, 0x8c($a0) -/* D11140 80240080 14400009 */ bnez $v0, .L802400A8 -/* D11144 80240084 24020002 */ addiu $v0, $zero, 2 -/* D11148 80240088 96030072 */ lhu $v1, 0x72($s0) -/* D1114C 8024008C AE02006C */ sw $v0, 0x6c($s0) -/* D11150 80240090 A483008E */ sh $v1, 0x8e($a0) -/* D11154 80240094 8E0200CC */ lw $v0, 0xcc($s0) -/* D11158 80240098 8C420020 */ lw $v0, 0x20($v0) -/* D1115C 8024009C AC820028 */ sw $v0, 0x28($a0) -/* D11160 802400A0 2402001F */ addiu $v0, $zero, 0x1f -/* D11164 802400A4 AE220070 */ sw $v0, 0x70($s1) -.L802400A8: -/* D11168 802400A8 8FBF0018 */ lw $ra, 0x18($sp) -/* D1116C 802400AC 8FB10014 */ lw $s1, 0x14($sp) -/* D11170 802400B0 8FB00010 */ lw $s0, 0x10($sp) -/* D11174 802400B4 03E00008 */ jr $ra -/* D11178 802400B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_03/func_802400BC_D110C0.s b/asm/nonmatchings/world/area_sam/sam_03/func_802400BC_D110C0.s deleted file mode 100644 index 3ebdb78f6a..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_03/func_802400BC_D110C0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400BC_D1117C -/* D1117C 802400BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D11180 802400C0 AFB10014 */ sw $s1, 0x14($sp) -/* D11184 802400C4 0080882D */ daddu $s1, $a0, $zero -/* D11188 802400C8 AFBF0018 */ sw $ra, 0x18($sp) -/* D1118C 802400CC AFB00010 */ sw $s0, 0x10($sp) -/* D11190 802400D0 8E300148 */ lw $s0, 0x148($s1) -/* D11194 802400D4 0C00EABB */ jal get_npc_unsafe -/* D11198 802400D8 86040008 */ lh $a0, 8($s0) -/* D1119C 802400DC 0040202D */ daddu $a0, $v0, $zero -/* D111A0 802400E0 9482008E */ lhu $v0, 0x8e($a0) -/* D111A4 802400E4 2442FFFF */ addiu $v0, $v0, -1 -/* D111A8 802400E8 A482008E */ sh $v0, 0x8e($a0) -/* D111AC 802400EC 00021400 */ sll $v0, $v0, 0x10 -/* D111B0 802400F0 1C400009 */ bgtz $v0, .L80240118 -/* D111B4 802400F4 24020003 */ addiu $v0, $zero, 3 -/* D111B8 802400F8 96030076 */ lhu $v1, 0x76($s0) -/* D111BC 802400FC AE02006C */ sw $v0, 0x6c($s0) -/* D111C0 80240100 A483008E */ sh $v1, 0x8e($a0) -/* D111C4 80240104 8E0200CC */ lw $v0, 0xcc($s0) -/* D111C8 80240108 8C420024 */ lw $v0, 0x24($v0) -/* D111CC 8024010C AC820028 */ sw $v0, 0x28($a0) -/* D111D0 80240110 24020020 */ addiu $v0, $zero, 0x20 -/* D111D4 80240114 AE220070 */ sw $v0, 0x70($s1) -.L80240118: -/* D111D8 80240118 8FBF0018 */ lw $ra, 0x18($sp) -/* D111DC 8024011C 8FB10014 */ lw $s1, 0x14($sp) -/* D111E0 80240120 8FB00010 */ lw $s0, 0x10($sp) -/* D111E4 80240124 03E00008 */ jr $ra -/* D111E8 80240128 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_03/func_80240204_D110C0.s b/asm/nonmatchings/world/area_sam/sam_03/func_80240204_D110C0.s deleted file mode 100644 index 610e5cb35c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_03/func_80240204_D110C0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240204_D112C4 -/* D112C4 80240204 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D112C8 80240208 AFB10014 */ sw $s1, 0x14($sp) -/* D112CC 8024020C 0080882D */ daddu $s1, $a0, $zero -/* D112D0 80240210 AFBF0018 */ sw $ra, 0x18($sp) -/* D112D4 80240214 AFB00010 */ sw $s0, 0x10($sp) -/* D112D8 80240218 8E300148 */ lw $s0, 0x148($s1) -/* D112DC 8024021C 0C00EABB */ jal get_npc_unsafe -/* D112E0 80240220 86040008 */ lh $a0, 8($s0) -/* D112E4 80240224 9443008E */ lhu $v1, 0x8e($v0) -/* D112E8 80240228 2463FFFF */ addiu $v1, $v1, -1 -/* D112EC 8024022C A443008E */ sh $v1, 0x8e($v0) -/* D112F0 80240230 00031C00 */ sll $v1, $v1, 0x10 -/* D112F4 80240234 1C600003 */ bgtz $v1, .L80240244 -/* D112F8 80240238 2402000C */ addiu $v0, $zero, 0xc -/* D112FC 8024023C AE00006C */ sw $zero, 0x6c($s0) -/* D11300 80240240 AE220070 */ sw $v0, 0x70($s1) -.L80240244: -/* D11304 80240244 8FBF0018 */ lw $ra, 0x18($sp) -/* D11308 80240248 8FB10014 */ lw $s1, 0x14($sp) -/* D1130C 8024024C 8FB00010 */ lw $s0, 0x10($sp) -/* D11310 80240250 03E00008 */ jr $ra -/* D11314 80240254 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_03/func_8024040C_D110C0.s b/asm/nonmatchings/world/area_sam/sam_03/func_8024040C_D110C0.s deleted file mode 100644 index d28c35f589..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_03/func_8024040C_D110C0.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024040C_D114CC -/* D114CC 8024040C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D114D0 80240410 AFB40028 */ sw $s4, 0x28($sp) -/* D114D4 80240414 0080A02D */ daddu $s4, $a0, $zero -/* D114D8 80240418 AFBF002C */ sw $ra, 0x2c($sp) -/* D114DC 8024041C AFB30024 */ sw $s3, 0x24($sp) -/* D114E0 80240420 AFB20020 */ sw $s2, 0x20($sp) -/* D114E4 80240424 AFB1001C */ sw $s1, 0x1c($sp) -/* D114E8 80240428 AFB00018 */ sw $s0, 0x18($sp) -/* D114EC 8024042C 8E910148 */ lw $s1, 0x148($s4) -/* D114F0 80240430 86240008 */ lh $a0, 8($s1) -/* D114F4 80240434 0C00EABB */ jal get_npc_unsafe -/* D114F8 80240438 00A0802D */ daddu $s0, $a1, $zero -/* D114FC 8024043C 16000005 */ bnez $s0, .L80240454 -/* D11500 80240440 0040902D */ daddu $s2, $v0, $zero -/* D11504 80240444 8E2200B0 */ lw $v0, 0xb0($s1) -/* D11508 80240448 30420004 */ andi $v0, $v0, 4 -/* D1150C 8024044C 10400015 */ beqz $v0, .L802404A4 -/* D11510 80240450 00000000 */ nop -.L80240454: -/* D11514 80240454 AE800070 */ sw $zero, 0x70($s4) -/* D11518 80240458 8E420000 */ lw $v0, ($s2) -/* D1151C 8024045C 3C031F30 */ lui $v1, 0x1f30 -/* D11520 80240460 A640008E */ sh $zero, 0x8e($s2) -/* D11524 80240464 34420102 */ ori $v0, $v0, 0x102 -/* D11528 80240468 AE420000 */ sw $v0, ($s2) -/* D1152C 8024046C 8E220000 */ lw $v0, ($s1) -/* D11530 80240470 3C01C47A */ lui $at, 0xc47a -/* D11534 80240474 44810000 */ mtc1 $at, $f0 -/* D11538 80240478 00431025 */ or $v0, $v0, $v1 -/* D1153C 8024047C AE220000 */ sw $v0, ($s1) -/* D11540 80240480 AE400038 */ sw $zero, 0x38($s2) -/* D11544 80240484 E640003C */ swc1 $f0, 0x3c($s2) -/* D11548 80240488 AE400040 */ sw $zero, 0x40($s2) -/* D1154C 8024048C 8E2300B0 */ lw $v1, 0xb0($s1) -/* D11550 80240490 30620004 */ andi $v0, $v1, 4 -/* D11554 80240494 10400003 */ beqz $v0, .L802404A4 -/* D11558 80240498 2402FFFB */ addiu $v0, $zero, -5 -/* D1155C 8024049C 00621024 */ and $v0, $v1, $v0 -/* D11560 802404A0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802404A4: -/* D11564 802404A4 8E930070 */ lw $s3, 0x70($s4) -/* D11568 802404A8 12600005 */ beqz $s3, .L802404C0 -/* D1156C 802404AC 24020001 */ addiu $v0, $zero, 1 -/* D11570 802404B0 12620048 */ beq $s3, $v0, .L802405D4 -/* D11574 802404B4 00000000 */ nop -/* D11578 802404B8 08090192 */ j .L80240648 -/* D1157C 802404BC 00000000 */ nop -.L802404C0: -/* D11580 802404C0 86240008 */ lh $a0, 8($s1) -/* D11584 802404C4 0C00FB3A */ jal get_enemy -/* D11588 802404C8 2484FFFF */ addiu $a0, $a0, -1 -/* D1158C 802404CC 0040802D */ daddu $s0, $v0, $zero -/* D11590 802404D0 0C00EABB */ jal get_npc_unsafe -/* D11594 802404D4 86040008 */ lh $a0, 8($s0) -/* D11598 802404D8 24030001 */ addiu $v1, $zero, 1 -/* D1159C 802404DC 0040982D */ daddu $s3, $v0, $zero -/* D115A0 802404E0 A2230007 */ sb $v1, 7($s1) -/* D115A4 802404E4 8E03006C */ lw $v1, 0x6c($s0) -/* D115A8 802404E8 24020003 */ addiu $v0, $zero, 3 -/* D115AC 802404EC 14620056 */ bne $v1, $v0, .L80240648 -/* D115B0 802404F0 00000000 */ nop -/* D115B4 802404F4 8E2500A8 */ lw $a1, 0xa8($s1) -/* D115B8 802404F8 10A00003 */ beqz $a1, .L80240508 -/* D115BC 802404FC 0260202D */ daddu $a0, $s3, $zero -/* D115C0 80240500 0C012530 */ jal func_800494C0 -/* D115C4 80240504 0000302D */ daddu $a2, $zero, $zero -.L80240508: -/* D115C8 80240508 27A40010 */ addiu $a0, $sp, 0x10 -/* D115CC 8024050C C6280070 */ lwc1 $f8, 0x70($s1) -/* D115D0 80240510 46804220 */ cvt.s.w $f8, $f8 -/* D115D4 80240514 C6620034 */ lwc1 $f2, 0x34($s3) -/* D115D8 80240518 3C014387 */ lui $at, 0x4387 -/* D115DC 8024051C 44810000 */ mtc1 $at, $f0 -/* D115E0 80240520 44064000 */ mfc1 $a2, $f8 -/* D115E4 80240524 46020001 */ sub.s $f0, $f0, $f2 -/* D115E8 80240528 C6660038 */ lwc1 $f6, 0x38($s3) -/* D115EC 8024052C C6640040 */ lwc1 $f4, 0x40($s3) -/* D115F0 80240530 44070000 */ mfc1 $a3, $f0 -/* D115F4 80240534 27A50014 */ addiu $a1, $sp, 0x14 -/* D115F8 80240538 E7A60010 */ swc1 $f6, 0x10($sp) -/* D115FC 8024053C 0C00A7E7 */ jal add_vec2D_polar -/* D11600 80240540 E7A40014 */ swc1 $f4, 0x14($sp) -/* D11604 80240544 C7A00010 */ lwc1 $f0, 0x10($sp) -/* D11608 80240548 4600020D */ trunc.w.s $f8, $f0 -/* D1160C 8024054C 44024000 */ mfc1 $v0, $f8 -/* D11610 80240550 E6400038 */ swc1 $f0, 0x38($s2) -/* D11614 80240554 A6220010 */ sh $v0, 0x10($s1) -/* D11618 80240558 C660003C */ lwc1 $f0, 0x3c($s3) -/* D1161C 8024055C C622006C */ lwc1 $f2, 0x6c($s1) -/* D11620 80240560 468010A0 */ cvt.s.w $f2, $f2 -/* D11624 80240564 46020000 */ add.s $f0, $f0, $f2 -/* D11628 80240568 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* D1162C 8024056C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* D11630 80240570 E640003C */ swc1 $f0, 0x3c($s2) -/* D11634 80240574 C7A20014 */ lwc1 $f2, 0x14($sp) -/* D11638 80240578 4600020D */ trunc.w.s $f8, $f0 -/* D1163C 8024057C 44024000 */ mfc1 $v0, $f8 -/* D11640 80240580 00000000 */ nop -/* D11644 80240584 A6220012 */ sh $v0, 0x12($s1) -/* D11648 80240588 4600120D */ trunc.w.s $f8, $f2 -/* D1164C 8024058C 44024000 */ mfc1 $v0, $f8 -/* D11650 80240590 E6420040 */ swc1 $f2, 0x40($s2) -/* D11654 80240594 A6220014 */ sh $v0, 0x14($s1) -/* D11658 80240598 8C660028 */ lw $a2, 0x28($v1) -/* D1165C 8024059C 8C670030 */ lw $a3, 0x30($v1) -/* D11660 802405A0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* D11664 802405A4 0C00A720 */ jal atan2 -/* D11668 802405A8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* D1166C 802405AC 3C03E0EF */ lui $v1, 0xe0ef -/* D11670 802405B0 E640000C */ swc1 $f0, 0xc($s2) -/* D11674 802405B4 8E220000 */ lw $v0, ($s1) -/* D11678 802405B8 3463FFFF */ ori $v1, $v1, 0xffff -/* D1167C 802405BC 00431024 */ and $v0, $v0, $v1 -/* D11680 802405C0 AE220000 */ sw $v0, ($s1) -/* D11684 802405C4 24020001 */ addiu $v0, $zero, 1 -/* D11688 802405C8 A640008E */ sh $zero, 0x8e($s2) -/* D1168C 802405CC 08090192 */ j .L80240648 -/* D11690 802405D0 AE820070 */ sw $v0, 0x70($s4) -.L802405D4: -/* D11694 802405D4 86240008 */ lh $a0, 8($s1) -/* D11698 802405D8 0C00FB3A */ jal get_enemy -/* D1169C 802405DC 2484FFFF */ addiu $a0, $a0, -1 -/* D116A0 802405E0 0040802D */ daddu $s0, $v0, $zero -/* D116A4 802405E4 0C00EABB */ jal get_npc_unsafe -/* D116A8 802405E8 86040008 */ lh $a0, 8($s0) -/* D116AC 802405EC 9642008E */ lhu $v0, 0x8e($s2) -/* D116B0 802405F0 24420001 */ addiu $v0, $v0, 1 -/* D116B4 802405F4 A642008E */ sh $v0, 0x8e($s2) -/* D116B8 802405F8 00021400 */ sll $v0, $v0, 0x10 -/* D116BC 802405FC 8E23007C */ lw $v1, 0x7c($s1) -/* D116C0 80240600 00021403 */ sra $v0, $v0, 0x10 -/* D116C4 80240604 0043102A */ slt $v0, $v0, $v1 -/* D116C8 80240608 50400001 */ beql $v0, $zero, .L80240610 -/* D116CC 8024060C A2200007 */ sb $zero, 7($s1) -.L80240610: -/* D116D0 80240610 8E03006C */ lw $v1, 0x6c($s0) -/* D116D4 80240614 24020004 */ addiu $v0, $zero, 4 -/* D116D8 80240618 1462000B */ bne $v1, $v0, .L80240648 -/* D116DC 8024061C 3C021F10 */ lui $v0, 0x1f10 -/* D116E0 80240620 8E230000 */ lw $v1, ($s1) -/* D116E4 80240624 3C01C47A */ lui $at, 0xc47a -/* D116E8 80240628 44810000 */ mtc1 $at, $f0 -/* D116EC 8024062C 00621825 */ or $v1, $v1, $v0 -/* D116F0 80240630 AE230000 */ sw $v1, ($s1) -/* D116F4 80240634 AE400038 */ sw $zero, 0x38($s2) -/* D116F8 80240638 E640003C */ swc1 $f0, 0x3c($s2) -/* D116FC 8024063C AE400040 */ sw $zero, 0x40($s2) -/* D11700 80240640 A2330007 */ sb $s3, 7($s1) -/* D11704 80240644 AE800070 */ sw $zero, 0x70($s4) -.L80240648: -/* D11708 80240648 8FBF002C */ lw $ra, 0x2c($sp) -/* D1170C 8024064C 8FB40028 */ lw $s4, 0x28($sp) -/* D11710 80240650 8FB30024 */ lw $s3, 0x24($sp) -/* D11714 80240654 8FB20020 */ lw $s2, 0x20($sp) -/* D11718 80240658 8FB1001C */ lw $s1, 0x1c($sp) -/* D1171C 8024065C 8FB00018 */ lw $s0, 0x18($sp) -/* D11720 80240660 0000102D */ daddu $v0, $zero, $zero -/* D11724 80240664 03E00008 */ jr $ra -/* D11728 80240668 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_03/func_8024066C_D110C0.s b/asm/nonmatchings/world/area_sam/sam_03/func_8024066C_D110C0.s deleted file mode 100644 index 2fbf4a5760..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_03/func_8024066C_D110C0.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024066C_D1172C -/* D1172C 8024066C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D11730 80240670 AFB20038 */ sw $s2, 0x38($sp) -/* D11734 80240674 0080902D */ daddu $s2, $a0, $zero -/* D11738 80240678 AFBF0048 */ sw $ra, 0x48($sp) -/* D1173C 8024067C AFB50044 */ sw $s5, 0x44($sp) -/* D11740 80240680 AFB40040 */ sw $s4, 0x40($sp) -/* D11744 80240684 AFB3003C */ sw $s3, 0x3c($sp) -/* D11748 80240688 AFB10034 */ sw $s1, 0x34($sp) -/* D1174C 8024068C AFB00030 */ sw $s0, 0x30($sp) -/* D11750 80240690 8E510148 */ lw $s1, 0x148($s2) -/* D11754 80240694 86240008 */ lh $a0, 8($s1) -/* D11758 80240698 0C00EABB */ jal get_npc_unsafe -/* D1175C 8024069C 00A0802D */ daddu $s0, $a1, $zero -/* D11760 802406A0 8E43000C */ lw $v1, 0xc($s2) -/* D11764 802406A4 0240202D */ daddu $a0, $s2, $zero -/* D11768 802406A8 8C650000 */ lw $a1, ($v1) -/* D1176C 802406AC 0C0B1EAF */ jal get_variable -/* D11770 802406B0 0040A82D */ daddu $s5, $v0, $zero -/* D11774 802406B4 AFA00010 */ sw $zero, 0x10($sp) -/* D11778 802406B8 8E2300D0 */ lw $v1, 0xd0($s1) -/* D1177C 802406BC 8C630030 */ lw $v1, 0x30($v1) -/* D11780 802406C0 AFA30014 */ sw $v1, 0x14($sp) -/* D11784 802406C4 8E2300D0 */ lw $v1, 0xd0($s1) -/* D11788 802406C8 8C63001C */ lw $v1, 0x1c($v1) -/* D1178C 802406CC AFA30018 */ sw $v1, 0x18($sp) -/* D11790 802406D0 8E2300D0 */ lw $v1, 0xd0($s1) -/* D11794 802406D4 8C630024 */ lw $v1, 0x24($v1) -/* D11798 802406D8 AFA3001C */ sw $v1, 0x1c($sp) -/* D1179C 802406DC 8E2300D0 */ lw $v1, 0xd0($s1) -/* D117A0 802406E0 8C630028 */ lw $v1, 0x28($v1) -/* D117A4 802406E4 27B40010 */ addiu $s4, $sp, 0x10 -/* D117A8 802406E8 AFA30020 */ sw $v1, 0x20($sp) -/* D117AC 802406EC 8E2300D0 */ lw $v1, 0xd0($s1) -/* D117B0 802406F0 3C014282 */ lui $at, 0x4282 -/* D117B4 802406F4 44810000 */ mtc1 $at, $f0 -/* D117B8 802406F8 8C63002C */ lw $v1, 0x2c($v1) -/* D117BC 802406FC 0040982D */ daddu $s3, $v0, $zero -/* D117C0 80240700 E7A00028 */ swc1 $f0, 0x28($sp) -/* D117C4 80240704 A7A0002C */ sh $zero, 0x2c($sp) -/* D117C8 80240708 16000005 */ bnez $s0, .L80240720 -/* D117CC 8024070C AFA30024 */ sw $v1, 0x24($sp) -/* D117D0 80240710 8E2200B0 */ lw $v0, 0xb0($s1) -/* D117D4 80240714 30420004 */ andi $v0, $v0, 4 -/* D117D8 80240718 10400020 */ beqz $v0, .L8024079C -/* D117DC 8024071C 00000000 */ nop -.L80240720: -/* D117E0 80240720 2404F7FF */ addiu $a0, $zero, -0x801 -/* D117E4 80240724 AE400070 */ sw $zero, 0x70($s2) -/* D117E8 80240728 A6A0008E */ sh $zero, 0x8e($s5) -/* D117EC 8024072C 8E2200CC */ lw $v0, 0xcc($s1) -/* D117F0 80240730 8EA30000 */ lw $v1, ($s5) -/* D117F4 80240734 8C420000 */ lw $v0, ($v0) -/* D117F8 80240738 00641824 */ and $v1, $v1, $a0 -/* D117FC 8024073C AEA30000 */ sw $v1, ($s5) -/* D11800 80240740 AEA20028 */ sw $v0, 0x28($s5) -/* D11804 80240744 8E2200D0 */ lw $v0, 0xd0($s1) -/* D11808 80240748 8C420034 */ lw $v0, 0x34($v0) -/* D1180C 8024074C 54400005 */ bnel $v0, $zero, .L80240764 -/* D11810 80240750 2402FDFF */ addiu $v0, $zero, -0x201 -/* D11814 80240754 34620200 */ ori $v0, $v1, 0x200 -/* D11818 80240758 2403FFF7 */ addiu $v1, $zero, -9 -/* D1181C 8024075C 080901DB */ j .L8024076C -/* D11820 80240760 00431024 */ and $v0, $v0, $v1 -.L80240764: -/* D11824 80240764 00621024 */ and $v0, $v1, $v0 -/* D11828 80240768 34420008 */ ori $v0, $v0, 8 -.L8024076C: -/* D1182C 8024076C AEA20000 */ sw $v0, ($s5) -/* D11830 80240770 8E2200B0 */ lw $v0, 0xb0($s1) -/* D11834 80240774 30420004 */ andi $v0, $v0, 4 -/* D11838 80240778 10400007 */ beqz $v0, .L80240798 -/* D1183C 8024077C 24020063 */ addiu $v0, $zero, 0x63 -/* D11840 80240780 AE420070 */ sw $v0, 0x70($s2) -/* D11844 80240784 AE400074 */ sw $zero, 0x74($s2) -/* D11848 80240788 8E2200B0 */ lw $v0, 0xb0($s1) -/* D1184C 8024078C 2403FFFB */ addiu $v1, $zero, -5 -/* D11850 80240790 00431024 */ and $v0, $v0, $v1 -/* D11854 80240794 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240798: -/* D11858 80240798 AE20006C */ sw $zero, 0x6c($s1) -.L8024079C: -/* D1185C 8024079C 8E420070 */ lw $v0, 0x70($s2) -/* D11860 802407A0 2842001E */ slti $v0, $v0, 0x1e -/* D11864 802407A4 10400009 */ beqz $v0, .L802407CC -/* D11868 802407A8 00000000 */ nop -/* D1186C 802407AC 8E22006C */ lw $v0, 0x6c($s1) -/* D11870 802407B0 14400006 */ bnez $v0, .L802407CC -/* D11874 802407B4 00000000 */ nop -/* D11878 802407B8 0C090096 */ jal func_80240258 -/* D1187C 802407BC 0240202D */ daddu $a0, $s2, $zero -/* D11880 802407C0 10400002 */ beqz $v0, .L802407CC -/* D11884 802407C4 2402001E */ addiu $v0, $zero, 0x1e -/* D11888 802407C8 AE420070 */ sw $v0, 0x70($s2) -.L802407CC: -/* D1188C 802407CC 8E430070 */ lw $v1, 0x70($s2) -/* D11890 802407D0 2C620064 */ sltiu $v0, $v1, 0x64 -/* D11894 802407D4 10400048 */ beqz $v0, .L802408F8 -/* D11898 802407D8 00031080 */ sll $v0, $v1, 2 -/* D1189C 802407DC 3C018024 */ lui $at, 0x8024 -/* D118A0 802407E0 00220821 */ addu $at, $at, $v0 -/* D118A4 802407E4 8C222378 */ lw $v0, 0x2378($at) -/* D118A8 802407E8 00400008 */ jr $v0 -/* D118AC 802407EC 00000000 */ nop -/* D118B0 802407F0 0240202D */ daddu $a0, $s2, $zero -/* D118B4 802407F4 0260282D */ daddu $a1, $s3, $zero -/* D118B8 802407F8 0C012568 */ jal func_800495A0 -/* D118BC 802407FC 0280302D */ daddu $a2, $s4, $zero -/* D118C0 80240800 0240202D */ daddu $a0, $s2, $zero -/* D118C4 80240804 0260282D */ daddu $a1, $s3, $zero -/* D118C8 80240808 0C0125AE */ jal func_800496B8 -/* D118CC 8024080C 0280302D */ daddu $a2, $s4, $zero -/* D118D0 80240810 0809023E */ j .L802408F8 -/* D118D4 80240814 00000000 */ nop -/* D118D8 80240818 0240202D */ daddu $a0, $s2, $zero -/* D118DC 8024081C 0260282D */ daddu $a1, $s3, $zero -/* D118E0 80240820 0C0126D1 */ jal func_80049B44 -/* D118E4 80240824 0280302D */ daddu $a2, $s4, $zero -/* D118E8 80240828 0240202D */ daddu $a0, $s2, $zero -/* D118EC 8024082C 0260282D */ daddu $a1, $s3, $zero -/* D118F0 80240830 0C012701 */ jal func_80049C04 -/* D118F4 80240834 0280302D */ daddu $a2, $s4, $zero -/* D118F8 80240838 0809023E */ j .L802408F8 -/* D118FC 8024083C 00000000 */ nop -/* D11900 80240840 0240202D */ daddu $a0, $s2, $zero -/* D11904 80240844 0260282D */ daddu $a1, $s3, $zero -/* D11908 80240848 0C01278F */ jal func_80049E3C -/* D1190C 8024084C 0280302D */ daddu $a2, $s4, $zero -/* D11910 80240850 0240202D */ daddu $a0, $s2, $zero -/* D11914 80240854 0260282D */ daddu $a1, $s3, $zero -/* D11918 80240858 0C0127B3 */ jal func_80049ECC -/* D1191C 8024085C 0280302D */ daddu $a2, $s4, $zero -/* D11920 80240860 0809023E */ j .L802408F8 -/* D11924 80240864 00000000 */ nop -/* D11928 80240868 0240202D */ daddu $a0, $s2, $zero -/* D1192C 8024086C 0260282D */ daddu $a1, $s3, $zero -/* D11930 80240870 0C0127DF */ jal func_80049F7C -/* D11934 80240874 0280302D */ daddu $a2, $s4, $zero -/* D11938 80240878 0240202D */ daddu $a0, $s2, $zero -/* D1193C 8024087C 0260282D */ daddu $a1, $s3, $zero -/* D11940 80240880 0C012849 */ jal func_8004A124 -/* D11944 80240884 0280302D */ daddu $a2, $s4, $zero -/* D11948 80240888 0809023E */ j .L802408F8 -/* D1194C 8024088C 00000000 */ nop -/* D11950 80240890 0240202D */ daddu $a0, $s2, $zero -/* D11954 80240894 0260282D */ daddu $a1, $s3, $zero -/* D11958 80240898 0C0128FA */ jal func_8004A3E8 -/* D1195C 8024089C 0280302D */ daddu $a2, $s4, $zero -/* D11960 802408A0 0809023E */ j .L802408F8 -/* D11964 802408A4 00000000 */ nop -/* D11968 802408A8 0C090014 */ jal func_80240050 -/* D1196C 802408AC 0240202D */ daddu $a0, $s2, $zero -/* D11970 802408B0 0C09002F */ jal func_802400BC -/* D11974 802408B4 0240202D */ daddu $a0, $s2, $zero -/* D11978 802408B8 8E430070 */ lw $v1, 0x70($s2) -/* D1197C 802408BC 24020020 */ addiu $v0, $zero, 0x20 -/* D11980 802408C0 1462000D */ bne $v1, $v0, .L802408F8 -/* D11984 802408C4 00000000 */ nop -/* D11988 802408C8 0C09004B */ jal func_8024012C -/* D1198C 802408CC 0240202D */ daddu $a0, $s2, $zero -/* D11990 802408D0 8E430070 */ lw $v1, 0x70($s2) -/* D11994 802408D4 24020021 */ addiu $v0, $zero, 0x21 -/* D11998 802408D8 14620007 */ bne $v1, $v0, .L802408F8 -/* D1199C 802408DC 00000000 */ nop -/* D119A0 802408E0 0C090081 */ jal func_80240204 -/* D119A4 802408E4 0240202D */ daddu $a0, $s2, $zero -/* D119A8 802408E8 0809023E */ j .L802408F8 -/* D119AC 802408EC 00000000 */ nop -/* D119B0 802408F0 0C0129CF */ jal func_8004A73C -/* D119B4 802408F4 0240202D */ daddu $a0, $s2, $zero -.L802408F8: -/* D119B8 802408F8 8FBF0048 */ lw $ra, 0x48($sp) -/* D119BC 802408FC 8FB50044 */ lw $s5, 0x44($sp) -/* D119C0 80240900 8FB40040 */ lw $s4, 0x40($sp) -/* D119C4 80240904 8FB3003C */ lw $s3, 0x3c($sp) -/* D119C8 80240908 8FB20038 */ lw $s2, 0x38($sp) -/* D119CC 8024090C 8FB10034 */ lw $s1, 0x34($sp) -/* D119D0 80240910 8FB00030 */ lw $s0, 0x30($sp) -/* D119D4 80240914 0000102D */ daddu $v0, $zero, $zero -/* D119D8 80240918 03E00008 */ jr $ra -/* D119DC 8024091C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_04/func_80240070_D135D0.s b/asm/nonmatchings/world/area_sam/sam_04/func_80240070_D135D0.s deleted file mode 100644 index c87615d5a0..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_04/func_80240070_D135D0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_D13640 -/* D13640 80240070 27BDFF78 */ addiu $sp, $sp, -0x88 -/* D13644 80240074 AFB10054 */ sw $s1, 0x54($sp) -/* D13648 80240078 0080882D */ daddu $s1, $a0, $zero -/* D1364C 8024007C AFBF005C */ sw $ra, 0x5c($sp) -/* D13650 80240080 AFB20058 */ sw $s2, 0x58($sp) -/* D13654 80240084 AFB00050 */ sw $s0, 0x50($sp) -/* D13658 80240088 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* D1365C 8024008C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* D13660 80240090 F7B80070 */ sdc1 $f24, 0x70($sp) -/* D13664 80240094 F7B60068 */ sdc1 $f22, 0x68($sp) -/* D13668 80240098 F7B40060 */ sdc1 $f20, 0x60($sp) -/* D1366C 8024009C 8E30000C */ lw $s0, 0xc($s1) -/* D13670 802400A0 8E050000 */ lw $a1, ($s0) -/* D13674 802400A4 0C0B1EAF */ jal get_variable -/* D13678 802400A8 26100004 */ addiu $s0, $s0, 4 -/* D1367C 802400AC 0C046C04 */ jal get_model_list_index_from_tree_index -/* D13680 802400B0 0040202D */ daddu $a0, $v0, $zero -/* D13684 802400B4 8E050000 */ lw $a1, ($s0) -/* D13688 802400B8 26100004 */ addiu $s0, $s0, 4 -/* D1368C 802400BC 0220202D */ daddu $a0, $s1, $zero -/* D13690 802400C0 0C0B210B */ jal get_float_variable -/* D13694 802400C4 0040902D */ daddu $s2, $v0, $zero -/* D13698 802400C8 8E050000 */ lw $a1, ($s0) -/* D1369C 802400CC 26100004 */ addiu $s0, $s0, 4 -/* D136A0 802400D0 0220202D */ daddu $a0, $s1, $zero -/* D136A4 802400D4 0C0B210B */ jal get_float_variable -/* D136A8 802400D8 46000706 */ mov.s $f28, $f0 -/* D136AC 802400DC 8E050000 */ lw $a1, ($s0) -/* D136B0 802400E0 26100004 */ addiu $s0, $s0, 4 -/* D136B4 802400E4 0220202D */ daddu $a0, $s1, $zero -/* D136B8 802400E8 0C0B210B */ jal get_float_variable -/* D136BC 802400EC 46000686 */ mov.s $f26, $f0 -/* D136C0 802400F0 0220202D */ daddu $a0, $s1, $zero -/* D136C4 802400F4 8E050000 */ lw $a1, ($s0) -/* D136C8 802400F8 0C0B210B */ jal get_float_variable -/* D136CC 802400FC 46000586 */ mov.s $f22, $f0 -/* D136D0 80240100 0240202D */ daddu $a0, $s2, $zero -/* D136D4 80240104 0C046B4C */ jal get_model_from_list_index -/* D136D8 80240108 46000606 */ mov.s $f24, $f0 -/* D136DC 8024010C 0040882D */ daddu $s1, $v0, $zero -/* D136E0 80240110 96220000 */ lhu $v0, ($s1) -/* D136E4 80240114 30420400 */ andi $v0, $v0, 0x400 -/* D136E8 80240118 1440001E */ bnez $v0, .L80240194 -/* D136EC 8024011C 26300058 */ addiu $s0, $s1, 0x58 -/* D136F0 80240120 4480A000 */ mtc1 $zero, $f20 -/* D136F4 80240124 4406B000 */ mfc1 $a2, $f22 -/* D136F8 80240128 4405A000 */ mfc1 $a1, $f20 -/* D136FC 8024012C 4407A000 */ mfc1 $a3, $f20 -/* D13700 80240130 0C019E40 */ jal guTranslateF -/* D13704 80240134 0200202D */ daddu $a0, $s0, $zero -/* D13708 80240138 4405E000 */ mfc1 $a1, $f28 -/* D1370C 8024013C 4406D000 */ mfc1 $a2, $f26 -/* D13710 80240140 4407C000 */ mfc1 $a3, $f24 -/* D13714 80240144 0C090000 */ jal func_80240000 -/* D13718 80240148 27A40010 */ addiu $a0, $sp, 0x10 -/* D1371C 8024014C 27A40010 */ addiu $a0, $sp, 0x10 -/* D13720 80240150 0200282D */ daddu $a1, $s0, $zero -/* D13724 80240154 0C019D80 */ jal guMtxCatF -/* D13728 80240158 0200302D */ daddu $a2, $s0, $zero -/* D1372C 8024015C 27A40010 */ addiu $a0, $sp, 0x10 -/* D13730 80240160 4600B587 */ neg.s $f22, $f22 -/* D13734 80240164 4405A000 */ mfc1 $a1, $f20 -/* D13738 80240168 4406B000 */ mfc1 $a2, $f22 -/* D1373C 8024016C 0C019E40 */ jal guTranslateF -/* D13740 80240170 00A0382D */ daddu $a3, $a1, $zero -/* D13744 80240174 27A40010 */ addiu $a0, $sp, 0x10 -/* D13748 80240178 0200282D */ daddu $a1, $s0, $zero -/* D1374C 8024017C 0C019D80 */ jal guMtxCatF -/* D13750 80240180 00A0302D */ daddu $a2, $a1, $zero -/* D13754 80240184 96220000 */ lhu $v0, ($s1) -/* D13758 80240188 34421400 */ ori $v0, $v0, 0x1400 -/* D1375C 8024018C 08090083 */ j .L8024020C -/* D13760 80240190 A6220000 */ sh $v0, ($s1) -.L80240194: -/* D13764 80240194 4480A000 */ mtc1 $zero, $f20 -/* D13768 80240198 4406B000 */ mfc1 $a2, $f22 -/* D1376C 8024019C 4405A000 */ mfc1 $a1, $f20 -/* D13770 802401A0 4407A000 */ mfc1 $a3, $f20 -/* D13774 802401A4 0C019E40 */ jal guTranslateF -/* D13778 802401A8 27A40010 */ addiu $a0, $sp, 0x10 -/* D1377C 802401AC 27A40010 */ addiu $a0, $sp, 0x10 -/* D13780 802401B0 26300058 */ addiu $s0, $s1, 0x58 -/* D13784 802401B4 0200282D */ daddu $a1, $s0, $zero -/* D13788 802401B8 0C019D80 */ jal guMtxCatF -/* D1378C 802401BC 0200302D */ daddu $a2, $s0, $zero -/* D13790 802401C0 4405E000 */ mfc1 $a1, $f28 -/* D13794 802401C4 4406D000 */ mfc1 $a2, $f26 -/* D13798 802401C8 4407C000 */ mfc1 $a3, $f24 -/* D1379C 802401CC 0C090000 */ jal func_80240000 -/* D137A0 802401D0 27A40010 */ addiu $a0, $sp, 0x10 -/* D137A4 802401D4 27A40010 */ addiu $a0, $sp, 0x10 -/* D137A8 802401D8 0200282D */ daddu $a1, $s0, $zero -/* D137AC 802401DC 0C019D80 */ jal guMtxCatF -/* D137B0 802401E0 0200302D */ daddu $a2, $s0, $zero -/* D137B4 802401E4 27A40010 */ addiu $a0, $sp, 0x10 -/* D137B8 802401E8 4600B587 */ neg.s $f22, $f22 -/* D137BC 802401EC 4405A000 */ mfc1 $a1, $f20 -/* D137C0 802401F0 4406B000 */ mfc1 $a2, $f22 -/* D137C4 802401F4 0C019E40 */ jal guTranslateF -/* D137C8 802401F8 00A0382D */ daddu $a3, $a1, $zero -/* D137CC 802401FC 27A40010 */ addiu $a0, $sp, 0x10 -/* D137D0 80240200 0200282D */ daddu $a1, $s0, $zero -/* D137D4 80240204 0C019D80 */ jal guMtxCatF -/* D137D8 80240208 00A0302D */ daddu $a2, $a1, $zero -.L8024020C: -/* D137DC 8024020C 8FBF005C */ lw $ra, 0x5c($sp) -/* D137E0 80240210 8FB20058 */ lw $s2, 0x58($sp) -/* D137E4 80240214 8FB10054 */ lw $s1, 0x54($sp) -/* D137E8 80240218 8FB00050 */ lw $s0, 0x50($sp) -/* D137EC 8024021C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* D137F0 80240220 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* D137F4 80240224 D7B80070 */ ldc1 $f24, 0x70($sp) -/* D137F8 80240228 D7B60068 */ ldc1 $f22, 0x68($sp) -/* D137FC 8024022C D7B40060 */ ldc1 $f20, 0x60($sp) -/* D13800 80240230 24020002 */ addiu $v0, $zero, 2 -/* D13804 80240234 03E00008 */ jr $ra -/* D13808 80240238 27BD0088 */ addiu $sp, $sp, 0x88 -/* D1380C 8024023C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_04/func_80240240_D135D0.s b/asm/nonmatchings/world/area_sam/sam_04/func_80240240_D135D0.s deleted file mode 100644 index bdec32d8fd..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_04/func_80240240_D135D0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240240_D13810 -/* D13810 80240240 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* D13814 80240244 AFB10014 */ sw $s1, 0x14($sp) -/* D13818 80240248 0080882D */ daddu $s1, $a0, $zero -/* D1381C 8024024C AFBF001C */ sw $ra, 0x1c($sp) -/* D13820 80240250 AFB20018 */ sw $s2, 0x18($sp) -/* D13824 80240254 AFB00010 */ sw $s0, 0x10($sp) -/* D13828 80240258 F7B80030 */ sdc1 $f24, 0x30($sp) -/* D1382C 8024025C F7B60028 */ sdc1 $f22, 0x28($sp) -/* D13830 80240260 F7B40020 */ sdc1 $f20, 0x20($sp) -/* D13834 80240264 8E30000C */ lw $s0, 0xc($s1) -/* D13838 80240268 8E120000 */ lw $s2, ($s0) -/* D1383C 8024026C 26100004 */ addiu $s0, $s0, 4 -/* D13840 80240270 8E050000 */ lw $a1, ($s0) -/* D13844 80240274 0C0B210B */ jal get_float_variable -/* D13848 80240278 26100004 */ addiu $s0, $s0, 4 -/* D1384C 8024027C 8E050000 */ lw $a1, ($s0) -/* D13850 80240280 26100004 */ addiu $s0, $s0, 4 -/* D13854 80240284 0220202D */ daddu $a0, $s1, $zero -/* D13858 80240288 0C0B210B */ jal get_float_variable -/* D1385C 8024028C 46000606 */ mov.s $f24, $f0 -/* D13860 80240290 8E050000 */ lw $a1, ($s0) -/* D13864 80240294 26100004 */ addiu $s0, $s0, 4 -/* D13868 80240298 0220202D */ daddu $a0, $s1, $zero -/* D1386C 8024029C 0C0B210B */ jal get_float_variable -/* D13870 802402A0 46000586 */ mov.s $f22, $f0 -/* D13874 802402A4 0220202D */ daddu $a0, $s1, $zero -/* D13878 802402A8 8E050000 */ lw $a1, ($s0) -/* D1387C 802402AC 0C0B210B */ jal get_float_variable -/* D13880 802402B0 46000506 */ mov.s $f20, $f0 -/* D13884 802402B4 4600C306 */ mov.s $f12, $f24 -/* D13888 802402B8 4406A000 */ mfc1 $a2, $f20 -/* D1388C 802402BC 44070000 */ mfc1 $a3, $f0 -/* D13890 802402C0 0C00A720 */ jal atan2 -/* D13894 802402C4 4600B386 */ mov.s $f14, $f22 -/* D13898 802402C8 0C00A6C9 */ jal clamp_angle -/* D1389C 802402CC 46000306 */ mov.s $f12, $f0 -/* D138A0 802402D0 0220202D */ daddu $a0, $s1, $zero -/* D138A4 802402D4 44060000 */ mfc1 $a2, $f0 -/* D138A8 802402D8 0C0B2190 */ jal set_float_variable -/* D138AC 802402DC 0240282D */ daddu $a1, $s2, $zero -/* D138B0 802402E0 8FBF001C */ lw $ra, 0x1c($sp) -/* D138B4 802402E4 8FB20018 */ lw $s2, 0x18($sp) -/* D138B8 802402E8 8FB10014 */ lw $s1, 0x14($sp) -/* D138BC 802402EC 8FB00010 */ lw $s0, 0x10($sp) -/* D138C0 802402F0 D7B80030 */ ldc1 $f24, 0x30($sp) -/* D138C4 802402F4 D7B60028 */ ldc1 $f22, 0x28($sp) -/* D138C8 802402F8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* D138CC 802402FC 24020002 */ addiu $v0, $zero, 2 -/* D138D0 80240300 03E00008 */ jr $ra -/* D138D4 80240304 27BD0038 */ addiu $sp, $sp, 0x38 -/* D138D8 80240308 00000000 */ nop -/* D138DC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_04/func_80240310_D135D0.s b/asm/nonmatchings/world/area_sam/sam_04/func_80240310_D135D0.s deleted file mode 100644 index dd69b186ae..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_04/func_80240310_D135D0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_D138E0 -/* D138E0 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D138E4 80240314 AFB10014 */ sw $s1, 0x14($sp) -/* D138E8 80240318 0080882D */ daddu $s1, $a0, $zero -/* D138EC 8024031C AFBF0018 */ sw $ra, 0x18($sp) -/* D138F0 80240320 AFB00010 */ sw $s0, 0x10($sp) -/* D138F4 80240324 8E30000C */ lw $s0, 0xc($s1) -/* D138F8 80240328 8E050000 */ lw $a1, ($s0) -/* D138FC 8024032C 0C0B1EAF */ jal get_variable -/* D13900 80240330 26100004 */ addiu $s0, $s0, 4 -/* D13904 80240334 0C00EAD2 */ jal get_npc_safe -/* D13908 80240338 0040202D */ daddu $a0, $v0, $zero -/* D1390C 8024033C 10400005 */ beqz $v0, .L80240354 -/* D13910 80240340 00000000 */ nop -/* D13914 80240344 8E050000 */ lw $a1, ($s0) -/* D13918 80240348 844600A8 */ lh $a2, 0xa8($v0) -/* D1391C 8024034C 0C0B2026 */ jal set_variable -/* D13920 80240350 0220202D */ daddu $a0, $s1, $zero -.L80240354: -/* D13924 80240354 8FBF0018 */ lw $ra, 0x18($sp) -/* D13928 80240358 8FB10014 */ lw $s1, 0x14($sp) -/* D1392C 8024035C 8FB00010 */ lw $s0, 0x10($sp) -/* D13930 80240360 24020002 */ addiu $v0, $zero, 2 -/* D13934 80240364 03E00008 */ jr $ra -/* D13938 80240368 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_04/func_8024036C_D135D0.s b/asm/nonmatchings/world/area_sam/sam_04/func_8024036C_D135D0.s deleted file mode 100644 index d053f418c0..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_04/func_8024036C_D135D0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024036C_D1393C -/* D1393C 8024036C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D13940 80240370 AFB10014 */ sw $s1, 0x14($sp) -/* D13944 80240374 0080882D */ daddu $s1, $a0, $zero -/* D13948 80240378 AFBF0024 */ sw $ra, 0x24($sp) -/* D1394C 8024037C AFB40020 */ sw $s4, 0x20($sp) -/* D13950 80240380 AFB3001C */ sw $s3, 0x1c($sp) -/* D13954 80240384 AFB20018 */ sw $s2, 0x18($sp) -/* D13958 80240388 AFB00010 */ sw $s0, 0x10($sp) -/* D1395C 8024038C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* D13960 80240390 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* D13964 80240394 F7B80038 */ sdc1 $f24, 0x38($sp) -/* D13968 80240398 F7B60030 */ sdc1 $f22, 0x30($sp) -/* D1396C 8024039C F7B40028 */ sdc1 $f20, 0x28($sp) -/* D13970 802403A0 8E30000C */ lw $s0, 0xc($s1) -/* D13974 802403A4 8E130000 */ lw $s3, ($s0) -/* D13978 802403A8 26100004 */ addiu $s0, $s0, 4 -/* D1397C 802403AC 0C0B1EAF */ jal get_variable -/* D13980 802403B0 0260282D */ daddu $a1, $s3, $zero -/* D13984 802403B4 4482E000 */ mtc1 $v0, $f28 -/* D13988 802403B8 00000000 */ nop -/* D1398C 802403BC 4680E720 */ cvt.s.w $f28, $f28 -/* D13990 802403C0 8E140000 */ lw $s4, ($s0) -/* D13994 802403C4 26100004 */ addiu $s0, $s0, 4 -/* D13998 802403C8 0220202D */ daddu $a0, $s1, $zero -/* D1399C 802403CC 0C0B1EAF */ jal get_variable -/* D139A0 802403D0 0280282D */ daddu $a1, $s4, $zero -/* D139A4 802403D4 4482D000 */ mtc1 $v0, $f26 -/* D139A8 802403D8 00000000 */ nop -/* D139AC 802403DC 4680D6A0 */ cvt.s.w $f26, $f26 -/* D139B0 802403E0 8E100000 */ lw $s0, ($s0) -/* D139B4 802403E4 0220202D */ daddu $a0, $s1, $zero -/* D139B8 802403E8 0C0B1EAF */ jal get_variable -/* D139BC 802403EC 0200282D */ daddu $a1, $s0, $zero -/* D139C0 802403F0 4482C000 */ mtc1 $v0, $f24 -/* D139C4 802403F4 00000000 */ nop -/* D139C8 802403F8 4680C620 */ cvt.s.w $f24, $f24 -/* D139CC 802403FC 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* D139D0 80240400 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* D139D4 80240404 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D139D8 80240408 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D139DC 8024040C C64200A8 */ lwc1 $f2, 0xa8($s2) -/* D139E0 80240410 44800000 */ mtc1 $zero, $f0 -/* D139E4 80240414 00031080 */ sll $v0, $v1, 2 -/* D139E8 80240418 00431021 */ addu $v0, $v0, $v1 -/* D139EC 8024041C 00021080 */ sll $v0, $v0, 2 -/* D139F0 80240420 00431023 */ subu $v0, $v0, $v1 -/* D139F4 80240424 000218C0 */ sll $v1, $v0, 3 -/* D139F8 80240428 00431021 */ addu $v0, $v0, $v1 -/* D139FC 8024042C 000210C0 */ sll $v0, $v0, 3 -/* D13A00 80240430 46001032 */ c.eq.s $f2, $f0 -/* D13A04 80240434 3C01800B */ lui $at, 0x800b -/* D13A08 80240438 00220821 */ addu $at, $at, $v0 -/* D13A0C 8024043C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* D13A10 80240440 45000005 */ bc1f .L80240458 -/* D13A14 80240444 00000000 */ nop -/* D13A18 80240448 3C0142C8 */ lui $at, 0x42c8 -/* D13A1C 8024044C 44810000 */ mtc1 $at, $f0 -/* D13A20 80240450 0809011A */ j .L80240468 -/* D13A24 80240454 4600B581 */ sub.s $f22, $f22, $f0 -.L80240458: -/* D13A28 80240458 3C0142C8 */ lui $at, 0x42c8 -/* D13A2C 8024045C 44810000 */ mtc1 $at, $f0 -/* D13A30 80240460 00000000 */ nop -/* D13A34 80240464 4600B580 */ add.s $f22, $f22, $f0 -.L80240468: -/* D13A38 80240468 0C00A6C9 */ jal clamp_angle -/* D13A3C 8024046C 4600B306 */ mov.s $f12, $f22 -/* D13A40 80240470 46000586 */ mov.s $f22, $f0 -/* D13A44 80240474 3C014170 */ lui $at, 0x4170 -/* D13A48 80240478 4481A000 */ mtc1 $at, $f20 -/* D13A4C 8024047C 0C00A8BB */ jal sin_deg -/* D13A50 80240480 4600B306 */ mov.s $f12, $f22 -/* D13A54 80240484 46140002 */ mul.s $f0, $f0, $f20 -/* D13A58 80240488 00000000 */ nop -/* D13A5C 8024048C 864200B0 */ lh $v0, 0xb0($s2) -/* D13A60 80240490 3C013F00 */ lui $at, 0x3f00 -/* D13A64 80240494 44812000 */ mtc1 $at, $f4 -/* D13A68 80240498 44821000 */ mtc1 $v0, $f2 -/* D13A6C 8024049C 00000000 */ nop -/* D13A70 802404A0 468010A0 */ cvt.s.w $f2, $f2 -/* D13A74 802404A4 46041082 */ mul.s $f2, $f2, $f4 -/* D13A78 802404A8 00000000 */ nop -/* D13A7C 802404AC 4600E700 */ add.s $f28, $f28, $f0 -/* D13A80 802404B0 4602D680 */ add.s $f26, $f26, $f2 -/* D13A84 802404B4 0C00A8D4 */ jal cos_deg -/* D13A88 802404B8 4600B306 */ mov.s $f12, $f22 -/* D13A8C 802404BC 46140002 */ mul.s $f0, $f0, $f20 -/* D13A90 802404C0 00000000 */ nop -/* D13A94 802404C4 0220202D */ daddu $a0, $s1, $zero -/* D13A98 802404C8 0260282D */ daddu $a1, $s3, $zero -/* D13A9C 802404CC 4600E18D */ trunc.w.s $f6, $f28 -/* D13AA0 802404D0 44063000 */ mfc1 $a2, $f6 -/* D13AA4 802404D4 0C0B2026 */ jal set_variable -/* D13AA8 802404D8 4600C601 */ sub.s $f24, $f24, $f0 -/* D13AAC 802404DC 0220202D */ daddu $a0, $s1, $zero -/* D13AB0 802404E0 4600D18D */ trunc.w.s $f6, $f26 -/* D13AB4 802404E4 44063000 */ mfc1 $a2, $f6 -/* D13AB8 802404E8 0C0B2026 */ jal set_variable -/* D13ABC 802404EC 0280282D */ daddu $a1, $s4, $zero -/* D13AC0 802404F0 0220202D */ daddu $a0, $s1, $zero -/* D13AC4 802404F4 4600C18D */ trunc.w.s $f6, $f24 -/* D13AC8 802404F8 44063000 */ mfc1 $a2, $f6 -/* D13ACC 802404FC 0C0B2026 */ jal set_variable -/* D13AD0 80240500 0200282D */ daddu $a1, $s0, $zero -/* D13AD4 80240504 8FBF0024 */ lw $ra, 0x24($sp) -/* D13AD8 80240508 8FB40020 */ lw $s4, 0x20($sp) -/* D13ADC 8024050C 8FB3001C */ lw $s3, 0x1c($sp) -/* D13AE0 80240510 8FB20018 */ lw $s2, 0x18($sp) -/* D13AE4 80240514 8FB10014 */ lw $s1, 0x14($sp) -/* D13AE8 80240518 8FB00010 */ lw $s0, 0x10($sp) -/* D13AEC 8024051C D7BC0048 */ ldc1 $f28, 0x48($sp) -/* D13AF0 80240520 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* D13AF4 80240524 D7B80038 */ ldc1 $f24, 0x38($sp) -/* D13AF8 80240528 D7B60030 */ ldc1 $f22, 0x30($sp) -/* D13AFC 8024052C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D13B00 80240530 24020002 */ addiu $v0, $zero, 2 -/* D13B04 80240534 03E00008 */ jr $ra -/* D13B08 80240538 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_04/func_8024053C_D135D0.s b/asm/nonmatchings/world/area_sam/sam_04/func_8024053C_D135D0.s deleted file mode 100644 index aee3181563..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_04/func_8024053C_D135D0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024053C_D13B0C -/* D13B0C 8024053C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D13B10 80240540 AFBF0010 */ sw $ra, 0x10($sp) -/* D13B14 80240544 10A00003 */ beqz $a1, .L80240554 -/* D13B18 80240548 8C86000C */ lw $a2, 0xc($a0) -/* D13B1C 8024054C 3C018024 */ lui $at, 0x8024 -/* D13B20 80240550 AC20387C */ sw $zero, 0x387c($at) -.L80240554: -/* D13B24 80240554 3C038024 */ lui $v1, 0x8024 -/* D13B28 80240558 2463387C */ addiu $v1, $v1, 0x387c -/* D13B2C 8024055C 8C620000 */ lw $v0, ($v1) -/* D13B30 80240560 54400003 */ bnel $v0, $zero, .L80240570 -/* D13B34 80240564 AC600000 */ sw $zero, ($v1) -/* D13B38 80240568 08090161 */ j .L80240584 -/* D13B3C 8024056C 0000102D */ daddu $v0, $zero, $zero -.L80240570: -/* D13B40 80240570 8CC50000 */ lw $a1, ($a2) -/* D13B44 80240574 3C068024 */ lui $a2, 0x8024 -/* D13B48 80240578 0C0B2026 */ jal set_variable -/* D13B4C 8024057C 8CC63880 */ lw $a2, 0x3880($a2) -/* D13B50 80240580 24020002 */ addiu $v0, $zero, 2 -.L80240584: -/* D13B54 80240584 8FBF0010 */ lw $ra, 0x10($sp) -/* D13B58 80240588 03E00008 */ jr $ra -/* D13B5C 8024058C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_04/func_80240590_D135D0.s b/asm/nonmatchings/world/area_sam/sam_04/func_80240590_D135D0.s deleted file mode 100644 index 52d4fec4ab..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_04/func_80240590_D135D0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240590_D13B60 -/* D13B60 80240590 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D13B64 80240594 AFBF0010 */ sw $ra, 0x10($sp) -/* D13B68 80240598 8C82000C */ lw $v0, 0xc($a0) -/* D13B6C 8024059C 0C0B1EAF */ jal get_variable -/* D13B70 802405A0 8C450000 */ lw $a1, ($v0) -/* D13B74 802405A4 3C018024 */ lui $at, 0x8024 -/* D13B78 802405A8 AC223880 */ sw $v0, 0x3880($at) -/* D13B7C 802405AC 24020002 */ addiu $v0, $zero, 2 -/* D13B80 802405B0 8FBF0010 */ lw $ra, 0x10($sp) -/* D13B84 802405B4 24030001 */ addiu $v1, $zero, 1 -/* D13B88 802405B8 3C018024 */ lui $at, 0x8024 -/* D13B8C 802405BC AC23387C */ sw $v1, 0x387c($at) -/* D13B90 802405C0 03E00008 */ jr $ra -/* D13B94 802405C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_04/func_802405C8_D135D0.s b/asm/nonmatchings/world/area_sam/sam_04/func_802405C8_D135D0.s deleted file mode 100644 index 1c3bbfcd25..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_04/func_802405C8_D135D0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405C8_D13B98 -/* D13B98 802405C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D13B9C 802405CC AFBF0010 */ sw $ra, 0x10($sp) -/* D13BA0 802405D0 8C82000C */ lw $v0, 0xc($a0) -/* D13BA4 802405D4 0C0B1EAF */ jal get_variable -/* D13BA8 802405D8 8C450000 */ lw $a1, ($v0) -/* D13BAC 802405DC 0040182D */ daddu $v1, $v0, $zero -/* D13BB0 802405E0 10600012 */ beqz $v1, .L8024062C -/* D13BB4 802405E4 0000202D */ daddu $a0, $zero, $zero -/* D13BB8 802405E8 8C620000 */ lw $v0, ($v1) -/* D13BBC 802405EC 5040000A */ beql $v0, $zero, .L80240618 -/* D13BC0 802405F0 00041080 */ sll $v0, $a0, 2 -/* D13BC4 802405F4 3C058024 */ lui $a1, 0x8024 -/* D13BC8 802405F8 24A55210 */ addiu $a1, $a1, 0x5210 -.L802405FC: -/* D13BCC 802405FC 24630004 */ addiu $v1, $v1, 4 -/* D13BD0 80240600 24840001 */ addiu $a0, $a0, 1 -/* D13BD4 80240604 ACA20000 */ sw $v0, ($a1) -/* D13BD8 80240608 8C620000 */ lw $v0, ($v1) -/* D13BDC 8024060C 1440FFFB */ bnez $v0, .L802405FC -/* D13BE0 80240610 24A50004 */ addiu $a1, $a1, 4 -/* D13BE4 80240614 00041080 */ sll $v0, $a0, 2 -.L80240618: -/* D13BE8 80240618 3C018024 */ lui $at, 0x8024 -/* D13BEC 8024061C 00220821 */ addu $at, $at, $v0 -/* D13BF0 80240620 AC205210 */ sw $zero, 0x5210($at) -/* D13BF4 80240624 08090195 */ j .L80240654 -/* D13BF8 80240628 00000000 */ nop -.L8024062C: -/* D13BFC 8024062C 3C038024 */ lui $v1, 0x8024 -/* D13C00 80240630 24635210 */ addiu $v1, $v1, 0x5210 -/* D13C04 80240634 0060282D */ daddu $a1, $v1, $zero -.L80240638: -/* D13C08 80240638 24820010 */ addiu $v0, $a0, 0x10 -/* D13C0C 8024063C AC620000 */ sw $v0, ($v1) -/* D13C10 80240640 24630004 */ addiu $v1, $v1, 4 -/* D13C14 80240644 24840001 */ addiu $a0, $a0, 1 -/* D13C18 80240648 28820070 */ slti $v0, $a0, 0x70 -/* D13C1C 8024064C 1440FFFA */ bnez $v0, .L80240638 -/* D13C20 80240650 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80240654: -/* D13C24 80240654 8FBF0010 */ lw $ra, 0x10($sp) -/* D13C28 80240658 24020002 */ addiu $v0, $zero, 2 -/* D13C2C 8024065C 03E00008 */ jr $ra -/* D13C30 80240660 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_04/func_80240664_D135D0.s b/asm/nonmatchings/world/area_sam/sam_04/func_80240664_D135D0.s deleted file mode 100644 index 2db003f144..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_04/func_80240664_D135D0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240664_D13C34 -/* D13C34 80240664 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D13C38 80240668 AFBF0010 */ sw $ra, 0x10($sp) -/* D13C3C 8024066C 8C82000C */ lw $v0, 0xc($a0) -/* D13C40 80240670 0C0B1EAF */ jal get_variable -/* D13C44 80240674 8C450000 */ lw $a1, ($v0) -/* D13C48 80240678 0040182D */ daddu $v1, $v0, $zero -/* D13C4C 8024067C 10600012 */ beqz $v1, .L802406C8 -/* D13C50 80240680 0000202D */ daddu $a0, $zero, $zero -/* D13C54 80240684 8C620000 */ lw $v0, ($v1) -/* D13C58 80240688 5040000A */ beql $v0, $zero, .L802406B4 -/* D13C5C 8024068C 00041080 */ sll $v0, $a0, 2 -/* D13C60 80240690 3C058024 */ lui $a1, 0x8024 -/* D13C64 80240694 24A553D8 */ addiu $a1, $a1, 0x53d8 -.L80240698: -/* D13C68 80240698 24630004 */ addiu $v1, $v1, 4 -/* D13C6C 8024069C 24840001 */ addiu $a0, $a0, 1 -/* D13C70 802406A0 ACA20000 */ sw $v0, ($a1) -/* D13C74 802406A4 8C620000 */ lw $v0, ($v1) -/* D13C78 802406A8 1440FFFB */ bnez $v0, .L80240698 -/* D13C7C 802406AC 24A50004 */ addiu $a1, $a1, 4 -/* D13C80 802406B0 00041080 */ sll $v0, $a0, 2 -.L802406B4: -/* D13C84 802406B4 3C018024 */ lui $at, 0x8024 -/* D13C88 802406B8 00220821 */ addu $at, $at, $v0 -/* D13C8C 802406BC AC2053D8 */ sw $zero, 0x53d8($at) -/* D13C90 802406C0 080901BC */ j .L802406F0 -/* D13C94 802406C4 00000000 */ nop -.L802406C8: -/* D13C98 802406C8 3C038024 */ lui $v1, 0x8024 -/* D13C9C 802406CC 246353D8 */ addiu $v1, $v1, 0x53d8 -/* D13CA0 802406D0 0060282D */ daddu $a1, $v1, $zero -.L802406D4: -/* D13CA4 802406D4 24820080 */ addiu $v0, $a0, 0x80 -/* D13CA8 802406D8 AC620000 */ sw $v0, ($v1) -/* D13CAC 802406DC 24630004 */ addiu $v1, $v1, 4 -/* D13CB0 802406E0 24840001 */ addiu $a0, $a0, 1 -/* D13CB4 802406E4 2882005B */ slti $v0, $a0, 0x5b -/* D13CB8 802406E8 1440FFFA */ bnez $v0, .L802406D4 -/* D13CBC 802406EC ACA0016C */ sw $zero, 0x16c($a1) -.L802406F0: -/* D13CC0 802406F0 8FBF0010 */ lw $ra, 0x10($sp) -/* D13CC4 802406F4 24020002 */ addiu $v0, $zero, 2 -/* D13CC8 802406F8 03E00008 */ jr $ra -/* D13CCC 802406FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_05/func_8024006C_D187E0.s b/asm/nonmatchings/world/area_sam/sam_05/func_8024006C_D187E0.s deleted file mode 100644 index 742e943ad5..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/func_8024006C_D187E0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024006C_D1884C -/* D1884C 8024006C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D18850 80240070 AFB10014 */ sw $s1, 0x14($sp) -/* D18854 80240074 0080882D */ daddu $s1, $a0, $zero -/* D18858 80240078 AFBF0018 */ sw $ra, 0x18($sp) -/* D1885C 8024007C AFB00010 */ sw $s0, 0x10($sp) -/* D18860 80240080 8E300148 */ lw $s0, 0x148($s1) -/* D18864 80240084 0C00EABB */ jal get_npc_unsafe -/* D18868 80240088 86040008 */ lh $a0, 8($s0) -/* D1886C 8024008C 0040202D */ daddu $a0, $v0, $zero -/* D18870 80240090 9482008E */ lhu $v0, 0x8e($a0) -/* D18874 80240094 2442FFFF */ addiu $v0, $v0, -1 -/* D18878 80240098 A482008E */ sh $v0, 0x8e($a0) -/* D1887C 8024009C 00021400 */ sll $v0, $v0, 0x10 -/* D18880 802400A0 1C400009 */ bgtz $v0, .L802400C8 -/* D18884 802400A4 24020003 */ addiu $v0, $zero, 3 -/* D18888 802400A8 96030076 */ lhu $v1, 0x76($s0) -/* D1888C 802400AC AE02006C */ sw $v0, 0x6c($s0) -/* D18890 802400B0 A483008E */ sh $v1, 0x8e($a0) -/* D18894 802400B4 8E0200CC */ lw $v0, 0xcc($s0) -/* D18898 802400B8 8C420024 */ lw $v0, 0x24($v0) -/* D1889C 802400BC AC820028 */ sw $v0, 0x28($a0) -/* D188A0 802400C0 24020020 */ addiu $v0, $zero, 0x20 -/* D188A4 802400C4 AE220070 */ sw $v0, 0x70($s1) -.L802400C8: -/* D188A8 802400C8 8FBF0018 */ lw $ra, 0x18($sp) -/* D188AC 802400CC 8FB10014 */ lw $s1, 0x14($sp) -/* D188B0 802400D0 8FB00010 */ lw $s0, 0x10($sp) -/* D188B4 802400D4 03E00008 */ jr $ra -/* D188B8 802400D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_05/func_802400DC_D187E0.s b/asm/nonmatchings/world/area_sam/sam_05/func_802400DC_D187E0.s deleted file mode 100644 index 1deb32170c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/func_802400DC_D187E0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC_D188BC -/* D188BC 802400DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D188C0 802400E0 AFB10034 */ sw $s1, 0x34($sp) -/* D188C4 802400E4 0080882D */ daddu $s1, $a0, $zero -/* D188C8 802400E8 AFBF0038 */ sw $ra, 0x38($sp) -/* D188CC 802400EC AFB00030 */ sw $s0, 0x30($sp) -/* D188D0 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* D188D4 802400F4 0C00EABB */ jal get_npc_unsafe -/* D188D8 802400F8 86040008 */ lh $a0, 8($s0) -/* D188DC 802400FC 0040282D */ daddu $a1, $v0, $zero -/* D188E0 80240100 94A2008E */ lhu $v0, 0x8e($a1) -/* D188E4 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* D188E8 80240108 A4A2008E */ sh $v0, 0x8e($a1) -/* D188EC 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* D188F0 80240110 1C400023 */ bgtz $v0, .L802401A0 -/* D188F4 80240114 24020004 */ addiu $v0, $zero, 4 -/* D188F8 80240118 8E0300CC */ lw $v1, 0xcc($s0) -/* D188FC 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* D18900 80240120 8C620000 */ lw $v0, ($v1) -/* D18904 80240124 ACA20028 */ sw $v0, 0x28($a1) -/* D18908 80240128 9602007A */ lhu $v0, 0x7a($s0) -/* D1890C 8024012C A4A2008E */ sh $v0, 0x8e($a1) -/* D18910 80240130 8E020078 */ lw $v0, 0x78($s0) -/* D18914 80240134 28420008 */ slti $v0, $v0, 8 -/* D18918 80240138 14400018 */ bnez $v0, .L8024019C -/* D1891C 8024013C 24020021 */ addiu $v0, $zero, 0x21 -/* D18920 80240140 24040003 */ addiu $a0, $zero, 3 -/* D18924 80240144 27A30028 */ addiu $v1, $sp, 0x28 -/* D18928 80240148 84A700A8 */ lh $a3, 0xa8($a1) -/* D1892C 8024014C 3C013F80 */ lui $at, 0x3f80 -/* D18930 80240150 44810000 */ mtc1 $at, $f0 -/* D18934 80240154 3C014000 */ lui $at, 0x4000 -/* D18938 80240158 44811000 */ mtc1 $at, $f2 -/* D1893C 8024015C 3C01C1A0 */ lui $at, 0xc1a0 -/* D18940 80240160 44812000 */ mtc1 $at, $f4 -/* D18944 80240164 44873000 */ mtc1 $a3, $f6 -/* D18948 80240168 00000000 */ nop -/* D1894C 8024016C 468031A0 */ cvt.s.w $f6, $f6 -/* D18950 80240170 E7A00010 */ swc1 $f0, 0x10($sp) -/* D18954 80240174 E7A20014 */ swc1 $f2, 0x14($sp) -/* D18958 80240178 E7A40018 */ swc1 $f4, 0x18($sp) -/* D1895C 8024017C 8E020078 */ lw $v0, 0x78($s0) -/* D18960 80240180 44073000 */ mfc1 $a3, $f6 -/* D18964 80240184 0000302D */ daddu $a2, $zero, $zero -/* D18968 80240188 AFA30020 */ sw $v1, 0x20($sp) -/* D1896C 8024018C 2442FFFF */ addiu $v0, $v0, -1 -/* D18970 80240190 0C01BFA4 */ jal fx_emote -/* D18974 80240194 AFA2001C */ sw $v0, 0x1c($sp) -/* D18978 80240198 24020021 */ addiu $v0, $zero, 0x21 -.L8024019C: -/* D1897C 8024019C AE220070 */ sw $v0, 0x70($s1) -.L802401A0: -/* D18980 802401A0 8FBF0038 */ lw $ra, 0x38($sp) -/* D18984 802401A4 8FB10034 */ lw $s1, 0x34($sp) -/* D18988 802401A8 8FB00030 */ lw $s0, 0x30($sp) -/* D1898C 802401AC 03E00008 */ jr $ra -/* D18990 802401B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_sam/sam_05/func_802401B4_D187E0.s b/asm/nonmatchings/world/area_sam/sam_05/func_802401B4_D187E0.s deleted file mode 100644 index 4489c865bb..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/func_802401B4_D187E0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B4_D18994 -/* D18994 802401B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D18998 802401B8 AFB10014 */ sw $s1, 0x14($sp) -/* D1899C 802401BC 0080882D */ daddu $s1, $a0, $zero -/* D189A0 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* D189A4 802401C4 AFB00010 */ sw $s0, 0x10($sp) -/* D189A8 802401C8 8E300148 */ lw $s0, 0x148($s1) -/* D189AC 802401CC 0C00EABB */ jal get_npc_unsafe -/* D189B0 802401D0 86040008 */ lh $a0, 8($s0) -/* D189B4 802401D4 9443008E */ lhu $v1, 0x8e($v0) -/* D189B8 802401D8 2463FFFF */ addiu $v1, $v1, -1 -/* D189BC 802401DC A443008E */ sh $v1, 0x8e($v0) -/* D189C0 802401E0 00031C00 */ sll $v1, $v1, 0x10 -/* D189C4 802401E4 1C600003 */ bgtz $v1, .L802401F4 -/* D189C8 802401E8 2402000C */ addiu $v0, $zero, 0xc -/* D189CC 802401EC AE00006C */ sw $zero, 0x6c($s0) -/* D189D0 802401F0 AE220070 */ sw $v0, 0x70($s1) -.L802401F4: -/* D189D4 802401F4 8FBF0018 */ lw $ra, 0x18($sp) -/* D189D8 802401F8 8FB10014 */ lw $s1, 0x14($sp) -/* D189DC 802401FC 8FB00010 */ lw $s0, 0x10($sp) -/* D189E0 80240200 03E00008 */ jr $ra -/* D189E4 80240204 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_05/func_80240208_D187E0.s b/asm/nonmatchings/world/area_sam/sam_05/func_80240208_D187E0.s deleted file mode 100644 index ac3555908a..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/func_80240208_D187E0.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240208_D189E8 -/* D189E8 80240208 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D189EC 8024020C AFBF0024 */ sw $ra, 0x24($sp) -/* D189F0 80240210 AFB40020 */ sw $s4, 0x20($sp) -/* D189F4 80240214 AFB3001C */ sw $s3, 0x1c($sp) -/* D189F8 80240218 AFB20018 */ sw $s2, 0x18($sp) -/* D189FC 8024021C AFB10014 */ sw $s1, 0x14($sp) -/* D18A00 80240220 AFB00010 */ sw $s0, 0x10($sp) -/* D18A04 80240224 F7B40028 */ sdc1 $f20, 0x28($sp) -/* D18A08 80240228 8C900148 */ lw $s0, 0x148($a0) -/* D18A0C 8024022C 86040008 */ lh $a0, 8($s0) -/* D18A10 80240230 0C00EABB */ jal get_npc_unsafe -/* D18A14 80240234 24110001 */ addiu $s1, $zero, 1 -/* D18A18 80240238 86040008 */ lh $a0, 8($s0) -/* D18A1C 8024023C 0040802D */ daddu $s0, $v0, $zero -/* D18A20 80240240 3C05800B */ lui $a1, %hi(gCameras) -/* D18A24 80240244 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* D18A28 80240248 3C03800A */ lui $v1, 0x800a -/* D18A2C 8024024C 8463A634 */ lh $v1, -0x59cc($v1) -/* D18A30 80240250 00912021 */ addu $a0, $a0, $s1 -/* D18A34 80240254 00031080 */ sll $v0, $v1, 2 -/* D18A38 80240258 00431021 */ addu $v0, $v0, $v1 -/* D18A3C 8024025C 00021080 */ sll $v0, $v0, 2 -/* D18A40 80240260 00431023 */ subu $v0, $v0, $v1 -/* D18A44 80240264 000218C0 */ sll $v1, $v0, 3 -/* D18A48 80240268 00431021 */ addu $v0, $v0, $v1 -/* D18A4C 8024026C 000210C0 */ sll $v0, $v0, 3 -/* D18A50 80240270 0C00FB3A */ jal get_enemy -/* D18A54 80240274 00459021 */ addu $s2, $v0, $a1 -/* D18A58 80240278 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* D18A5C 8024027C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* D18A60 80240280 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D18A64 80240284 8E830000 */ lw $v1, ($s4) -/* D18A68 80240288 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D18A6C 8024028C 8C660028 */ lw $a2, 0x28($v1) -/* D18A70 80240290 8C670030 */ lw $a3, 0x30($v1) -/* D18A74 80240294 0C00A7B5 */ jal dist2D -/* D18A78 80240298 0040982D */ daddu $s3, $v0, $zero -/* D18A7C 8024029C C6620074 */ lwc1 $f2, 0x74($s3) -/* D18A80 802402A0 468010A0 */ cvt.s.w $f2, $f2 -/* D18A84 802402A4 4600103C */ c.lt.s $f2, $f0 -/* D18A88 802402A8 00000000 */ nop -/* D18A8C 802402AC 45030001 */ bc1tl .L802402B4 -/* D18A90 802402B0 0000882D */ daddu $s1, $zero, $zero -.L802402B4: -/* D18A94 802402B4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* D18A98 802402B8 C60E000C */ lwc1 $f14, 0xc($s0) -/* D18A9C 802402BC 3C014387 */ lui $at, 0x4387 -/* D18AA0 802402C0 4481A000 */ mtc1 $at, $f20 -/* D18AA4 802402C4 0C00A70A */ jal get_clamped_angle_diff -/* D18AA8 802402C8 00000000 */ nop -/* D18AAC 802402CC 0C00A6C9 */ jal clamp_angle -/* D18AB0 802402D0 46000306 */ mov.s $f12, $f0 -/* D18AB4 802402D4 3C018024 */ lui $at, 0x8024 -/* D18AB8 802402D8 D42274E0 */ ldc1 $f2, 0x74e0($at) -/* D18ABC 802402DC 46000021 */ cvt.d.s $f0, $f0 -/* D18AC0 802402E0 4622003C */ c.lt.d $f0, $f2 -/* D18AC4 802402E4 00000000 */ nop -/* D18AC8 802402E8 45000003 */ bc1f .L802402F8 -/* D18ACC 802402EC 00000000 */ nop -/* D18AD0 802402F0 3C0142B4 */ lui $at, 0x42b4 -/* D18AD4 802402F4 4481A000 */ mtc1 $at, $f20 -.L802402F8: -/* D18AD8 802402F8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D18ADC 802402FC 8E820000 */ lw $v0, ($s4) -/* D18AE0 80240300 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D18AE4 80240304 8C460028 */ lw $a2, 0x28($v0) -/* D18AE8 80240308 0C00A720 */ jal atan2 -/* D18AEC 8024030C 8C470030 */ lw $a3, 0x30($v0) -/* D18AF0 80240310 4600A306 */ mov.s $f12, $f20 -/* D18AF4 80240314 0C00A70A */ jal get_clamped_angle_diff -/* D18AF8 80240318 46000386 */ mov.s $f14, $f0 -/* D18AFC 8024031C C6620078 */ lwc1 $f2, 0x78($s3) -/* D18B00 80240320 468010A0 */ cvt.s.w $f2, $f2 -/* D18B04 80240324 46000005 */ abs.s $f0, $f0 -/* D18B08 80240328 4600103C */ c.lt.s $f2, $f0 -/* D18B0C 8024032C 00000000 */ nop -/* D18B10 80240330 45030001 */ bc1tl .L80240338 -/* D18B14 80240334 0000882D */ daddu $s1, $zero, $zero -.L80240338: -/* D18B18 80240338 8E820000 */ lw $v0, ($s4) -/* D18B1C 8024033C C600003C */ lwc1 $f0, 0x3c($s0) -/* D18B20 80240340 C442002C */ lwc1 $f2, 0x2c($v0) -/* D18B24 80240344 860200A8 */ lh $v0, 0xa8($s0) -/* D18B28 80240348 46020001 */ sub.s $f0, $f0, $f2 -/* D18B2C 8024034C 44821000 */ mtc1 $v0, $f2 -/* D18B30 80240350 00000000 */ nop -/* D18B34 80240354 468010A1 */ cvt.d.w $f2, $f2 -/* D18B38 80240358 46221080 */ add.d $f2, $f2, $f2 -/* D18B3C 8024035C 46000005 */ abs.s $f0, $f0 -/* D18B40 80240360 46000021 */ cvt.d.s $f0, $f0 -/* D18B44 80240364 4620103E */ c.le.d $f2, $f0 -/* D18B48 80240368 00000000 */ nop -/* D18B4C 8024036C 45030001 */ bc1tl .L80240374 -/* D18B50 80240370 0000882D */ daddu $s1, $zero, $zero -.L80240374: -/* D18B54 80240374 3C038011 */ lui $v1, 0x8011 -/* D18B58 80240378 8063EBB3 */ lb $v1, -0x144d($v1) -/* D18B5C 8024037C 24020009 */ addiu $v0, $zero, 9 -/* D18B60 80240380 50620001 */ beql $v1, $v0, .L80240388 -/* D18B64 80240384 0000882D */ daddu $s1, $zero, $zero -.L80240388: -/* D18B68 80240388 24020007 */ addiu $v0, $zero, 7 -/* D18B6C 8024038C 50620001 */ beql $v1, $v0, .L80240394 -/* D18B70 80240390 0000882D */ daddu $s1, $zero, $zero -.L80240394: -/* D18B74 80240394 0220102D */ daddu $v0, $s1, $zero -/* D18B78 80240398 8FBF0024 */ lw $ra, 0x24($sp) -/* D18B7C 8024039C 8FB40020 */ lw $s4, 0x20($sp) -/* D18B80 802403A0 8FB3001C */ lw $s3, 0x1c($sp) -/* D18B84 802403A4 8FB20018 */ lw $s2, 0x18($sp) -/* D18B88 802403A8 8FB10014 */ lw $s1, 0x14($sp) -/* D18B8C 802403AC 8FB00010 */ lw $s0, 0x10($sp) -/* D18B90 802403B0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* D18B94 802403B4 03E00008 */ jr $ra -/* D18B98 802403B8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_05/func_8024061C_D187E0.s b/asm/nonmatchings/world/area_sam/sam_05/func_8024061C_D187E0.s deleted file mode 100644 index 40d8450830..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/func_8024061C_D187E0.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_D18DFC -/* D18DFC 8024061C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D18E00 80240620 AFB20038 */ sw $s2, 0x38($sp) -/* D18E04 80240624 0080902D */ daddu $s2, $a0, $zero -/* D18E08 80240628 AFBF0048 */ sw $ra, 0x48($sp) -/* D18E0C 8024062C AFB50044 */ sw $s5, 0x44($sp) -/* D18E10 80240630 AFB40040 */ sw $s4, 0x40($sp) -/* D18E14 80240634 AFB3003C */ sw $s3, 0x3c($sp) -/* D18E18 80240638 AFB10034 */ sw $s1, 0x34($sp) -/* D18E1C 8024063C AFB00030 */ sw $s0, 0x30($sp) -/* D18E20 80240640 8E510148 */ lw $s1, 0x148($s2) -/* D18E24 80240644 86240008 */ lh $a0, 8($s1) -/* D18E28 80240648 0C00EABB */ jal get_npc_unsafe -/* D18E2C 8024064C 00A0802D */ daddu $s0, $a1, $zero -/* D18E30 80240650 8E43000C */ lw $v1, 0xc($s2) -/* D18E34 80240654 0240202D */ daddu $a0, $s2, $zero -/* D18E38 80240658 8C650000 */ lw $a1, ($v1) -/* D18E3C 8024065C 0C0B1EAF */ jal get_variable -/* D18E40 80240660 0040A82D */ daddu $s5, $v0, $zero -/* D18E44 80240664 AFA00010 */ sw $zero, 0x10($sp) -/* D18E48 80240668 8E2300D0 */ lw $v1, 0xd0($s1) -/* D18E4C 8024066C 8C630030 */ lw $v1, 0x30($v1) -/* D18E50 80240670 AFA30014 */ sw $v1, 0x14($sp) -/* D18E54 80240674 8E2300D0 */ lw $v1, 0xd0($s1) -/* D18E58 80240678 8C63001C */ lw $v1, 0x1c($v1) -/* D18E5C 8024067C AFA30018 */ sw $v1, 0x18($sp) -/* D18E60 80240680 8E2300D0 */ lw $v1, 0xd0($s1) -/* D18E64 80240684 8C630024 */ lw $v1, 0x24($v1) -/* D18E68 80240688 AFA3001C */ sw $v1, 0x1c($sp) -/* D18E6C 8024068C 8E2300D0 */ lw $v1, 0xd0($s1) -/* D18E70 80240690 8C630028 */ lw $v1, 0x28($v1) -/* D18E74 80240694 27B40010 */ addiu $s4, $sp, 0x10 -/* D18E78 80240698 AFA30020 */ sw $v1, 0x20($sp) -/* D18E7C 8024069C 8E2300D0 */ lw $v1, 0xd0($s1) -/* D18E80 802406A0 3C014282 */ lui $at, 0x4282 -/* D18E84 802406A4 44810000 */ mtc1 $at, $f0 -/* D18E88 802406A8 8C63002C */ lw $v1, 0x2c($v1) -/* D18E8C 802406AC 0040982D */ daddu $s3, $v0, $zero -/* D18E90 802406B0 E7A00028 */ swc1 $f0, 0x28($sp) -/* D18E94 802406B4 A7A0002C */ sh $zero, 0x2c($sp) -/* D18E98 802406B8 16000005 */ bnez $s0, .L802406D0 -/* D18E9C 802406BC AFA30024 */ sw $v1, 0x24($sp) -/* D18EA0 802406C0 8E2200B0 */ lw $v0, 0xb0($s1) -/* D18EA4 802406C4 30420004 */ andi $v0, $v0, 4 -/* D18EA8 802406C8 10400020 */ beqz $v0, .L8024074C -/* D18EAC 802406CC 00000000 */ nop -.L802406D0: -/* D18EB0 802406D0 2404F7FF */ addiu $a0, $zero, -0x801 -/* D18EB4 802406D4 AE400070 */ sw $zero, 0x70($s2) -/* D18EB8 802406D8 A6A0008E */ sh $zero, 0x8e($s5) -/* D18EBC 802406DC 8E2200CC */ lw $v0, 0xcc($s1) -/* D18EC0 802406E0 8EA30000 */ lw $v1, ($s5) -/* D18EC4 802406E4 8C420000 */ lw $v0, ($v0) -/* D18EC8 802406E8 00641824 */ and $v1, $v1, $a0 -/* D18ECC 802406EC AEA30000 */ sw $v1, ($s5) -/* D18ED0 802406F0 AEA20028 */ sw $v0, 0x28($s5) -/* D18ED4 802406F4 8E2200D0 */ lw $v0, 0xd0($s1) -/* D18ED8 802406F8 8C420034 */ lw $v0, 0x34($v0) -/* D18EDC 802406FC 54400005 */ bnel $v0, $zero, .L80240714 -/* D18EE0 80240700 2402FDFF */ addiu $v0, $zero, -0x201 -/* D18EE4 80240704 34620200 */ ori $v0, $v1, 0x200 -/* D18EE8 80240708 2403FFF7 */ addiu $v1, $zero, -9 -/* D18EEC 8024070C 080901C7 */ j .L8024071C -/* D18EF0 80240710 00431024 */ and $v0, $v0, $v1 -.L80240714: -/* D18EF4 80240714 00621024 */ and $v0, $v1, $v0 -/* D18EF8 80240718 34420008 */ ori $v0, $v0, 8 -.L8024071C: -/* D18EFC 8024071C AEA20000 */ sw $v0, ($s5) -/* D18F00 80240720 8E2200B0 */ lw $v0, 0xb0($s1) -/* D18F04 80240724 30420004 */ andi $v0, $v0, 4 -/* D18F08 80240728 10400007 */ beqz $v0, .L80240748 -/* D18F0C 8024072C 24020063 */ addiu $v0, $zero, 0x63 -/* D18F10 80240730 AE420070 */ sw $v0, 0x70($s2) -/* D18F14 80240734 AE400074 */ sw $zero, 0x74($s2) -/* D18F18 80240738 8E2200B0 */ lw $v0, 0xb0($s1) -/* D18F1C 8024073C 2403FFFB */ addiu $v1, $zero, -5 -/* D18F20 80240740 00431024 */ and $v0, $v0, $v1 -/* D18F24 80240744 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240748: -/* D18F28 80240748 AE20006C */ sw $zero, 0x6c($s1) -.L8024074C: -/* D18F2C 8024074C 8E420070 */ lw $v0, 0x70($s2) -/* D18F30 80240750 2842001E */ slti $v0, $v0, 0x1e -/* D18F34 80240754 10400009 */ beqz $v0, .L8024077C -/* D18F38 80240758 00000000 */ nop -/* D18F3C 8024075C 8E22006C */ lw $v0, 0x6c($s1) -/* D18F40 80240760 14400006 */ bnez $v0, .L8024077C -/* D18F44 80240764 00000000 */ nop -/* D18F48 80240768 0C090082 */ jal func_80240208 -/* D18F4C 8024076C 0240202D */ daddu $a0, $s2, $zero -/* D18F50 80240770 10400002 */ beqz $v0, .L8024077C -/* D18F54 80240774 2402001E */ addiu $v0, $zero, 0x1e -/* D18F58 80240778 AE420070 */ sw $v0, 0x70($s2) -.L8024077C: -/* D18F5C 8024077C 8E430070 */ lw $v1, 0x70($s2) -/* D18F60 80240780 2C620064 */ sltiu $v0, $v1, 0x64 -/* D18F64 80240784 10400048 */ beqz $v0, .L802408A8 -/* D18F68 80240788 00031080 */ sll $v0, $v1, 2 -/* D18F6C 8024078C 3C018024 */ lui $at, 0x8024 -/* D18F70 80240790 00220821 */ addu $at, $at, $v0 -/* D18F74 80240794 8C2274E8 */ lw $v0, 0x74e8($at) -/* D18F78 80240798 00400008 */ jr $v0 -/* D18F7C 8024079C 00000000 */ nop -/* D18F80 802407A0 0240202D */ daddu $a0, $s2, $zero -/* D18F84 802407A4 0260282D */ daddu $a1, $s3, $zero -/* D18F88 802407A8 0C012568 */ jal func_800495A0 -/* D18F8C 802407AC 0280302D */ daddu $a2, $s4, $zero -/* D18F90 802407B0 0240202D */ daddu $a0, $s2, $zero -/* D18F94 802407B4 0260282D */ daddu $a1, $s3, $zero -/* D18F98 802407B8 0C0125AE */ jal func_800496B8 -/* D18F9C 802407BC 0280302D */ daddu $a2, $s4, $zero -/* D18FA0 802407C0 0809022A */ j .L802408A8 -/* D18FA4 802407C4 00000000 */ nop -/* D18FA8 802407C8 0240202D */ daddu $a0, $s2, $zero -/* D18FAC 802407CC 0260282D */ daddu $a1, $s3, $zero -/* D18FB0 802407D0 0C0126D1 */ jal func_80049B44 -/* D18FB4 802407D4 0280302D */ daddu $a2, $s4, $zero -/* D18FB8 802407D8 0240202D */ daddu $a0, $s2, $zero -/* D18FBC 802407DC 0260282D */ daddu $a1, $s3, $zero -/* D18FC0 802407E0 0C012701 */ jal func_80049C04 -/* D18FC4 802407E4 0280302D */ daddu $a2, $s4, $zero -/* D18FC8 802407E8 0809022A */ j .L802408A8 -/* D18FCC 802407EC 00000000 */ nop -/* D18FD0 802407F0 0240202D */ daddu $a0, $s2, $zero -/* D18FD4 802407F4 0260282D */ daddu $a1, $s3, $zero -/* D18FD8 802407F8 0C01278F */ jal func_80049E3C -/* D18FDC 802407FC 0280302D */ daddu $a2, $s4, $zero -/* D18FE0 80240800 0240202D */ daddu $a0, $s2, $zero -/* D18FE4 80240804 0260282D */ daddu $a1, $s3, $zero -/* D18FE8 80240808 0C0127B3 */ jal func_80049ECC -/* D18FEC 8024080C 0280302D */ daddu $a2, $s4, $zero -/* D18FF0 80240810 0809022A */ j .L802408A8 -/* D18FF4 80240814 00000000 */ nop -/* D18FF8 80240818 0240202D */ daddu $a0, $s2, $zero -/* D18FFC 8024081C 0260282D */ daddu $a1, $s3, $zero -/* D19000 80240820 0C0127DF */ jal func_80049F7C -/* D19004 80240824 0280302D */ daddu $a2, $s4, $zero -/* D19008 80240828 0240202D */ daddu $a0, $s2, $zero -/* D1900C 8024082C 0260282D */ daddu $a1, $s3, $zero -/* D19010 80240830 0C012849 */ jal func_8004A124 -/* D19014 80240834 0280302D */ daddu $a2, $s4, $zero -/* D19018 80240838 0809022A */ j .L802408A8 -/* D1901C 8024083C 00000000 */ nop -/* D19020 80240840 0240202D */ daddu $a0, $s2, $zero -/* D19024 80240844 0260282D */ daddu $a1, $s3, $zero -/* D19028 80240848 0C0128FA */ jal func_8004A3E8 -/* D1902C 8024084C 0280302D */ daddu $a2, $s4, $zero -/* D19030 80240850 0809022A */ j .L802408A8 -/* D19034 80240854 00000000 */ nop -/* D19038 80240858 0C090000 */ jal func_80240000 -/* D1903C 8024085C 0240202D */ daddu $a0, $s2, $zero -/* D19040 80240860 0C09001B */ jal func_8024006C -/* D19044 80240864 0240202D */ daddu $a0, $s2, $zero -/* D19048 80240868 8E430070 */ lw $v1, 0x70($s2) -/* D1904C 8024086C 24020020 */ addiu $v0, $zero, 0x20 -/* D19050 80240870 1462000D */ bne $v1, $v0, .L802408A8 -/* D19054 80240874 00000000 */ nop -/* D19058 80240878 0C090037 */ jal func_802400DC -/* D1905C 8024087C 0240202D */ daddu $a0, $s2, $zero -/* D19060 80240880 8E430070 */ lw $v1, 0x70($s2) -/* D19064 80240884 24020021 */ addiu $v0, $zero, 0x21 -/* D19068 80240888 14620007 */ bne $v1, $v0, .L802408A8 -/* D1906C 8024088C 00000000 */ nop -/* D19070 80240890 0C09006D */ jal func_802401B4 -/* D19074 80240894 0240202D */ daddu $a0, $s2, $zero -/* D19078 80240898 0809022A */ j .L802408A8 -/* D1907C 8024089C 00000000 */ nop -/* D19080 802408A0 0C0129CF */ jal func_8004A73C -/* D19084 802408A4 0240202D */ daddu $a0, $s2, $zero -.L802408A8: -/* D19088 802408A8 8FBF0048 */ lw $ra, 0x48($sp) -/* D1908C 802408AC 8FB50044 */ lw $s5, 0x44($sp) -/* D19090 802408B0 8FB40040 */ lw $s4, 0x40($sp) -/* D19094 802408B4 8FB3003C */ lw $s3, 0x3c($sp) -/* D19098 802408B8 8FB20038 */ lw $s2, 0x38($sp) -/* D1909C 802408BC 8FB10034 */ lw $s1, 0x34($sp) -/* D190A0 802408C0 8FB00030 */ lw $s0, 0x30($sp) -/* D190A4 802408C4 0000102D */ daddu $v0, $zero, $zero -/* D190A8 802408C8 03E00008 */ jr $ra -/* D190AC 802408CC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_05/func_802408D0_D187E0.s b/asm/nonmatchings/world/area_sam/sam_05/func_802408D0_D187E0.s deleted file mode 100644 index 46a4bd2e83..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/func_802408D0_D187E0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408D0_D190B0 -/* D190B0 802408D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D190B4 802408D4 AFB10014 */ sw $s1, 0x14($sp) -/* D190B8 802408D8 0080882D */ daddu $s1, $a0, $zero -/* D190BC 802408DC AFBF0018 */ sw $ra, 0x18($sp) -/* D190C0 802408E0 AFB00010 */ sw $s0, 0x10($sp) -/* D190C4 802408E4 8E300148 */ lw $s0, 0x148($s1) -/* D190C8 802408E8 0C00EABB */ jal get_npc_unsafe -/* D190CC 802408EC 86040008 */ lh $a0, 8($s0) -/* D190D0 802408F0 0040202D */ daddu $a0, $v0, $zero -/* D190D4 802408F4 8482008E */ lh $v0, 0x8e($a0) -/* D190D8 802408F8 9483008E */ lhu $v1, 0x8e($a0) -/* D190DC 802408FC 18400003 */ blez $v0, .L8024090C -/* D190E0 80240900 2462FFFF */ addiu $v0, $v1, -1 -/* D190E4 80240904 0809024A */ j .L80240928 -/* D190E8 80240908 A482008E */ sh $v0, 0x8e($a0) -.L8024090C: -/* D190EC 8024090C 8E0200CC */ lw $v0, 0xcc($s0) -/* D190F0 80240910 AE00006C */ sw $zero, 0x6c($s0) -/* D190F4 80240914 8C420000 */ lw $v0, ($v0) -/* D190F8 80240918 AC820028 */ sw $v0, 0x28($a0) -/* D190FC 8024091C 24020001 */ addiu $v0, $zero, 1 -/* D19100 80240920 AE200074 */ sw $zero, 0x74($s1) -/* D19104 80240924 AE220070 */ sw $v0, 0x70($s1) -.L80240928: -/* D19108 80240928 8FBF0018 */ lw $ra, 0x18($sp) -/* D1910C 8024092C 8FB10014 */ lw $s1, 0x14($sp) -/* D19110 80240930 8FB00010 */ lw $s0, 0x10($sp) -/* D19114 80240934 03E00008 */ jr $ra -/* D19118 80240938 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_05/func_8024093C_D187E0.s b/asm/nonmatchings/world/area_sam/sam_05/func_8024093C_D187E0.s deleted file mode 100644 index 4077dc0bc4..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/func_8024093C_D187E0.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024093C_D1911C -/* D1911C 8024093C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D19120 80240940 AFB3003C */ sw $s3, 0x3c($sp) -/* D19124 80240944 0080982D */ daddu $s3, $a0, $zero -/* D19128 80240948 AFBF0040 */ sw $ra, 0x40($sp) -/* D1912C 8024094C AFB20038 */ sw $s2, 0x38($sp) -/* D19130 80240950 AFB10034 */ sw $s1, 0x34($sp) -/* D19134 80240954 AFB00030 */ sw $s0, 0x30($sp) -/* D19138 80240958 8E720148 */ lw $s2, 0x148($s3) -/* D1913C 8024095C 00A0882D */ daddu $s1, $a1, $zero -/* D19140 80240960 86440008 */ lh $a0, 8($s2) -/* D19144 80240964 0C00EABB */ jal get_npc_unsafe -/* D19148 80240968 00C0802D */ daddu $s0, $a2, $zero -/* D1914C 8024096C 0200202D */ daddu $a0, $s0, $zero -/* D19150 80240970 0240282D */ daddu $a1, $s2, $zero -/* D19154 80240974 AFA00010 */ sw $zero, 0x10($sp) -/* D19158 80240978 8E26000C */ lw $a2, 0xc($s1) -/* D1915C 8024097C 8E270010 */ lw $a3, 0x10($s1) -/* D19160 80240980 0C01242D */ jal func_800490B4 -/* D19164 80240984 0040882D */ daddu $s1, $v0, $zero -/* D19168 80240988 10400024 */ beqz $v0, .L80240A1C -/* D1916C 8024098C 0220202D */ daddu $a0, $s1, $zero -/* D19170 80240990 24050322 */ addiu $a1, $zero, 0x322 -/* D19174 80240994 0C012530 */ jal func_800494C0 -/* D19178 80240998 0000302D */ daddu $a2, $zero, $zero -/* D1917C 8024099C 0000202D */ daddu $a0, $zero, $zero -/* D19180 802409A0 0220282D */ daddu $a1, $s1, $zero -/* D19184 802409A4 0000302D */ daddu $a2, $zero, $zero -/* D19188 802409A8 2410000A */ addiu $s0, $zero, 0xa -/* D1918C 802409AC 862300A8 */ lh $v1, 0xa8($s1) -/* D19190 802409B0 3C013F80 */ lui $at, 0x3f80 -/* D19194 802409B4 44810000 */ mtc1 $at, $f0 -/* D19198 802409B8 3C014000 */ lui $at, 0x4000 -/* D1919C 802409BC 44811000 */ mtc1 $at, $f2 -/* D191A0 802409C0 3C01C1A0 */ lui $at, 0xc1a0 -/* D191A4 802409C4 44812000 */ mtc1 $at, $f4 -/* D191A8 802409C8 44833000 */ mtc1 $v1, $f6 -/* D191AC 802409CC 00000000 */ nop -/* D191B0 802409D0 468031A0 */ cvt.s.w $f6, $f6 -/* D191B4 802409D4 44073000 */ mfc1 $a3, $f6 -/* D191B8 802409D8 27A20028 */ addiu $v0, $sp, 0x28 -/* D191BC 802409DC AFB0001C */ sw $s0, 0x1c($sp) -/* D191C0 802409E0 AFA20020 */ sw $v0, 0x20($sp) -/* D191C4 802409E4 E7A00010 */ swc1 $f0, 0x10($sp) -/* D191C8 802409E8 E7A20014 */ swc1 $f2, 0x14($sp) -/* D191CC 802409EC 0C01BFA4 */ jal fx_emote -/* D191D0 802409F0 E7A40018 */ swc1 $f4, 0x18($sp) -/* D191D4 802409F4 0220202D */ daddu $a0, $s1, $zero -/* D191D8 802409F8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D191DC 802409FC 0C012530 */ jal func_800494C0 -/* D191E0 80240A00 3C060020 */ lui $a2, 0x20 -/* D191E4 80240A04 8E4200CC */ lw $v0, 0xcc($s2) -/* D191E8 80240A08 8C420020 */ lw $v0, 0x20($v0) -/* D191EC 80240A0C AE220028 */ sw $v0, 0x28($s1) -/* D191F0 80240A10 9642008E */ lhu $v0, 0x8e($s2) -/* D191F4 80240A14 A622008E */ sh $v0, 0x8e($s1) -/* D191F8 80240A18 AE700070 */ sw $s0, 0x70($s3) -.L80240A1C: -/* D191FC 80240A1C 8FBF0040 */ lw $ra, 0x40($sp) -/* D19200 80240A20 8FB3003C */ lw $s3, 0x3c($sp) -/* D19204 80240A24 8FB20038 */ lw $s2, 0x38($sp) -/* D19208 80240A28 8FB10034 */ lw $s1, 0x34($sp) -/* D1920C 80240A2C 8FB00030 */ lw $s0, 0x30($sp) -/* D19210 80240A30 03E00008 */ jr $ra -/* D19214 80240A34 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_05/func_80240A38_D187E0.s b/asm/nonmatchings/world/area_sam/sam_05/func_80240A38_D187E0.s deleted file mode 100644 index 76229013e5..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/func_80240A38_D187E0.s +++ /dev/null @@ -1,688 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A38_D19218 -/* D19218 80240A38 27BDFF80 */ addiu $sp, $sp, -0x80 -/* D1921C 80240A3C AFBF0064 */ sw $ra, 0x64($sp) -/* D19220 80240A40 AFBE0060 */ sw $fp, 0x60($sp) -/* D19224 80240A44 AFB7005C */ sw $s7, 0x5c($sp) -/* D19228 80240A48 AFB60058 */ sw $s6, 0x58($sp) -/* D1922C 80240A4C AFB50054 */ sw $s5, 0x54($sp) -/* D19230 80240A50 AFB40050 */ sw $s4, 0x50($sp) -/* D19234 80240A54 AFB3004C */ sw $s3, 0x4c($sp) -/* D19238 80240A58 AFB20048 */ sw $s2, 0x48($sp) -/* D1923C 80240A5C AFB10044 */ sw $s1, 0x44($sp) -/* D19240 80240A60 AFB00040 */ sw $s0, 0x40($sp) -/* D19244 80240A64 F7B80078 */ sdc1 $f24, 0x78($sp) -/* D19248 80240A68 F7B60070 */ sdc1 $f22, 0x70($sp) -/* D1924C 80240A6C F7B40068 */ sdc1 $f20, 0x68($sp) -/* D19250 80240A70 AFA40080 */ sw $a0, 0x80($sp) -/* D19254 80240A74 8C960148 */ lw $s6, 0x148($a0) -/* D19258 80240A78 00C0902D */ daddu $s2, $a2, $zero -/* D1925C 80240A7C 86C40008 */ lh $a0, 8($s6) -/* D19260 80240A80 0C00EABB */ jal get_npc_unsafe -/* D19264 80240A84 0000B82D */ daddu $s7, $zero, $zero -/* D19268 80240A88 0040882D */ daddu $s1, $v0, $zero -/* D1926C 80240A8C 9622008E */ lhu $v0, 0x8e($s1) -/* D19270 80240A90 2442FFFF */ addiu $v0, $v0, -1 -/* D19274 80240A94 A622008E */ sh $v0, 0x8e($s1) -/* D19278 80240A98 00021400 */ sll $v0, $v0, 0x10 -/* D1927C 80240A9C 8EC30090 */ lw $v1, 0x90($s6) -/* D19280 80240AA0 00021403 */ sra $v0, $v0, 0x10 -/* D19284 80240AA4 0062182A */ slt $v1, $v1, $v0 -/* D19288 80240AA8 14600005 */ bnez $v1, .L80240AC0 -/* D1928C 80240AAC 02E0F02D */ daddu $fp, $s7, $zero -/* D19290 80240AB0 8EC20000 */ lw $v0, ($s6) -/* D19294 80240AB4 3C031F10 */ lui $v1, 0x1f10 -/* D19298 80240AB8 00431025 */ or $v0, $v0, $v1 -/* D1929C 80240ABC AEC20000 */ sw $v0, ($s6) -.L80240AC0: -/* D192A0 80240AC0 8622008E */ lh $v0, 0x8e($s1) -/* D192A4 80240AC4 1440025D */ bnez $v0, .L8024143C -/* D192A8 80240AC8 00000000 */ nop -/* D192AC 80240ACC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D192B0 80240AD0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D192B4 80240AD4 0C00A6C9 */ jal clamp_angle -/* D192B8 80240AD8 C44C00A8 */ lwc1 $f12, 0xa8($v0) -/* D192BC 80240ADC 3C014334 */ lui $at, 0x4334 -/* D192C0 80240AE0 44811000 */ mtc1 $at, $f2 -/* D192C4 80240AE4 00000000 */ nop -/* D192C8 80240AE8 4602003C */ c.lt.s $f0, $f2 -/* D192CC 80240AEC 00000000 */ nop -/* D192D0 80240AF0 45000011 */ bc1f .L80240B38 -/* D192D4 80240AF4 00000000 */ nop -/* D192D8 80240AF8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D192DC 80240AFC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D192E0 80240B00 3C0142B4 */ lui $at, 0x42b4 -/* D192E4 80240B04 44816000 */ mtc1 $at, $f12 -/* D192E8 80240B08 00031080 */ sll $v0, $v1, 2 -/* D192EC 80240B0C 00431021 */ addu $v0, $v0, $v1 -/* D192F0 80240B10 00021080 */ sll $v0, $v0, 2 -/* D192F4 80240B14 00431023 */ subu $v0, $v0, $v1 -/* D192F8 80240B18 000218C0 */ sll $v1, $v0, 3 -/* D192FC 80240B1C 00431021 */ addu $v0, $v0, $v1 -/* D19300 80240B20 000210C0 */ sll $v0, $v0, 3 -/* D19304 80240B24 3C01800B */ lui $at, 0x800b -/* D19308 80240B28 00220821 */ addu $at, $at, $v0 -/* D1930C 80240B2C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* D19310 80240B30 080902DD */ j .L80240B74 -/* D19314 80240B34 460C0301 */ sub.s $f12, $f0, $f12 -.L80240B38: -/* D19318 80240B38 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D1931C 80240B3C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D19320 80240B40 3C0142B4 */ lui $at, 0x42b4 -/* D19324 80240B44 44816000 */ mtc1 $at, $f12 -/* D19328 80240B48 00031080 */ sll $v0, $v1, 2 -/* D1932C 80240B4C 00431021 */ addu $v0, $v0, $v1 -/* D19330 80240B50 00021080 */ sll $v0, $v0, 2 -/* D19334 80240B54 00431023 */ subu $v0, $v0, $v1 -/* D19338 80240B58 000218C0 */ sll $v1, $v0, 3 -/* D1933C 80240B5C 00431021 */ addu $v0, $v0, $v1 -/* D19340 80240B60 000210C0 */ sll $v0, $v0, 3 -/* D19344 80240B64 3C01800B */ lui $at, 0x800b -/* D19348 80240B68 00220821 */ addu $at, $at, $v0 -/* D1934C 80240B6C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* D19350 80240B70 460C0300 */ add.s $f12, $f0, $f12 -.L80240B74: -/* D19354 80240B74 0C00A6C9 */ jal clamp_angle -/* D19358 80240B78 00000000 */ nop -/* D1935C 80240B7C 46000586 */ mov.s $f22, $f0 -/* D19360 80240B80 3C014334 */ lui $at, 0x4334 -/* D19364 80240B84 44816000 */ mtc1 $at, $f12 -/* D19368 80240B88 0C00A6C9 */ jal clamp_angle -/* D1936C 80240B8C 460CB300 */ add.s $f12, $f22, $f12 -/* D19370 80240B90 8EC20088 */ lw $v0, 0x88($s6) -/* D19374 80240B94 14400010 */ bnez $v0, .L80240BD8 -/* D19378 80240B98 46000606 */ mov.s $f24, $f0 -/* D1937C 80240B9C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D19380 80240BA0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D19384 80240BA4 804300B4 */ lb $v1, 0xb4($v0) -/* D19388 80240BA8 3C014200 */ lui $at, 0x4200 -/* D1938C 80240BAC 4481A000 */ mtc1 $at, $f20 -/* D19390 80240BB0 10600016 */ beqz $v1, .L80240C0C -/* D19394 80240BB4 24020001 */ addiu $v0, $zero, 1 -/* D19398 80240BB8 3C0142C8 */ lui $at, 0x42c8 -/* D1939C 80240BBC 4481A000 */ mtc1 $at, $f20 -/* D193A0 80240BC0 14620013 */ bne $v1, $v0, .L80240C10 -/* D193A4 80240BC4 26300038 */ addiu $s0, $s1, 0x38 -/* D193A8 80240BC8 3C0142B4 */ lui $at, 0x42b4 -/* D193AC 80240BCC 4481A000 */ mtc1 $at, $f20 -/* D193B0 80240BD0 08090305 */ j .L80240C14 -/* D193B4 80240BD4 0200202D */ daddu $a0, $s0, $zero -.L80240BD8: -/* D193B8 80240BD8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D193BC 80240BDC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D193C0 80240BE0 804300B4 */ lb $v1, 0xb4($v0) -/* D193C4 80240BE4 3C014218 */ lui $at, 0x4218 -/* D193C8 80240BE8 4481A000 */ mtc1 $at, $f20 -/* D193CC 80240BEC 10600007 */ beqz $v1, .L80240C0C -/* D193D0 80240BF0 24020001 */ addiu $v0, $zero, 1 -/* D193D4 80240BF4 3C0142B4 */ lui $at, 0x42b4 -/* D193D8 80240BF8 4481A000 */ mtc1 $at, $f20 -/* D193DC 80240BFC 14620004 */ bne $v1, $v0, .L80240C10 -/* D193E0 80240C00 26300038 */ addiu $s0, $s1, 0x38 -/* D193E4 80240C04 3C014296 */ lui $at, 0x4296 -/* D193E8 80240C08 4481A000 */ mtc1 $at, $f20 -.L80240C0C: -/* D193EC 80240C0C 26300038 */ addiu $s0, $s1, 0x38 -.L80240C10: -/* D193F0 80240C10 0200202D */ daddu $a0, $s0, $zero -.L80240C14: -/* D193F4 80240C14 3C15800F */ lui $s5, %hi(gPlayerStatusPtr) -/* D193F8 80240C18 26B57B30 */ addiu $s5, $s5, %lo(gPlayerStatusPtr) -/* D193FC 80240C1C 4407C000 */ mfc1 $a3, $f24 -/* D19400 80240C20 862200A6 */ lh $v0, 0xa6($s1) -/* D19404 80240C24 8EA30000 */ lw $v1, ($s5) -/* D19408 80240C28 44824000 */ mtc1 $v0, $f8 -/* D1940C 80240C2C 00000000 */ nop -/* D19410 80240C30 46804220 */ cvt.s.w $f8, $f8 -/* D19414 80240C34 C4600028 */ lwc1 $f0, 0x28($v1) -/* D19418 80240C38 44064000 */ mfc1 $a2, $f8 -/* D1941C 80240C3C 26330040 */ addiu $s3, $s1, 0x40 -/* D19420 80240C40 E6200038 */ swc1 $f0, 0x38($s1) -/* D19424 80240C44 C4600030 */ lwc1 $f0, 0x30($v1) -/* D19428 80240C48 0260282D */ daddu $a1, $s3, $zero -/* D1942C 80240C4C 0C00A7E7 */ jal add_vec2D_polar -/* D19430 80240C50 E6200040 */ swc1 $f0, 0x40($s1) -/* D19434 80240C54 862200A6 */ lh $v0, 0xa6($s1) -/* D19438 80240C58 44820000 */ mtc1 $v0, $f0 -/* D1943C 80240C5C 00000000 */ nop -/* D19440 80240C60 46800020 */ cvt.s.w $f0, $f0 -/* D19444 80240C64 4600A000 */ add.s $f0, $f20, $f0 -/* D19448 80240C68 4406B000 */ mfc1 $a2, $f22 -/* D1944C 80240C6C 44050000 */ mfc1 $a1, $f0 -/* D19450 80240C70 0C00EA95 */ jal npc_move_heading -/* D19454 80240C74 0220202D */ daddu $a0, $s1, $zero -/* D19458 80240C78 8EC20088 */ lw $v0, 0x88($s6) -/* D1945C 80240C7C 1440005D */ bnez $v0, .L80240DF4 -/* D19460 80240C80 00000000 */ nop -/* D19464 80240C84 C6200038 */ lwc1 $f0, 0x38($s1) -/* D19468 80240C88 3C018024 */ lui $at, 0x8024 -/* D1946C 80240C8C D4247678 */ ldc1 $f4, 0x7678($at) -/* D19470 80240C90 46000021 */ cvt.d.s $f0, $f0 -/* D19474 80240C94 4620203C */ c.lt.d $f4, $f0 -/* D19478 80240C98 00000000 */ nop -/* D1947C 80240C9C 45000005 */ bc1f .L80240CB4 -/* D19480 80240CA0 00000000 */ nop -/* D19484 80240CA4 3C0143BE */ lui $at, 0x43be -/* D19488 80240CA8 44810000 */ mtc1 $at, $f0 -/* D1948C 80240CAC 00000000 */ nop -/* D19490 80240CB0 E6200038 */ swc1 $f0, 0x38($s1) -.L80240CB4: -/* D19494 80240CB4 C6200038 */ lwc1 $f0, 0x38($s1) -/* D19498 80240CB8 3C018024 */ lui $at, 0x8024 -/* D1949C 80240CBC D4227680 */ ldc1 $f2, 0x7680($at) -/* D194A0 80240CC0 46000021 */ cvt.d.s $f0, $f0 -/* D194A4 80240CC4 4622003C */ c.lt.d $f0, $f2 -/* D194A8 80240CC8 00000000 */ nop -/* D194AC 80240CCC 45000005 */ bc1f .L80240CE4 -/* D194B0 80240CD0 00000000 */ nop -/* D194B4 80240CD4 3C01C3BE */ lui $at, 0xc3be -/* D194B8 80240CD8 44810000 */ mtc1 $at, $f0 -/* D194BC 80240CDC 00000000 */ nop -/* D194C0 80240CE0 E6200038 */ swc1 $f0, 0x38($s1) -.L80240CE4: -/* D194C4 80240CE4 C6200040 */ lwc1 $f0, 0x40($s1) -/* D194C8 80240CE8 46000021 */ cvt.d.s $f0, $f0 -/* D194CC 80240CEC 4620203C */ c.lt.d $f4, $f0 -/* D194D0 80240CF0 00000000 */ nop -/* D194D4 80240CF4 45000005 */ bc1f .L80240D0C -/* D194D8 80240CF8 00000000 */ nop -/* D194DC 80240CFC 3C0143BE */ lui $at, 0x43be -/* D194E0 80240D00 44810000 */ mtc1 $at, $f0 -/* D194E4 80240D04 00000000 */ nop -/* D194E8 80240D08 E6200040 */ swc1 $f0, 0x40($s1) -.L80240D0C: -/* D194EC 80240D0C C6200040 */ lwc1 $f0, 0x40($s1) -/* D194F0 80240D10 46000021 */ cvt.d.s $f0, $f0 -/* D194F4 80240D14 4622003C */ c.lt.d $f0, $f2 -/* D194F8 80240D18 00000000 */ nop -/* D194FC 80240D1C 45000005 */ bc1f .L80240D34 -/* D19500 80240D20 00000000 */ nop -/* D19504 80240D24 3C01C3BE */ lui $at, 0xc3be -/* D19508 80240D28 44810000 */ mtc1 $at, $f0 -/* D1950C 80240D2C 00000000 */ nop -/* D19510 80240D30 E6200040 */ swc1 $f0, 0x40($s1) -.L80240D34: -/* D19514 80240D34 C6220038 */ lwc1 $f2, 0x38($s1) -/* D19518 80240D38 46021082 */ mul.s $f2, $f2, $f2 -/* D1951C 80240D3C 00000000 */ nop -/* D19520 80240D40 C6200040 */ lwc1 $f0, 0x40($s1) -/* D19524 80240D44 46000002 */ mul.s $f0, $f0, $f0 -/* D19528 80240D48 00000000 */ nop -/* D1952C 80240D4C 46001300 */ add.s $f12, $f2, $f0 -/* D19530 80240D50 46006004 */ sqrt.s $f0, $f12 -/* D19534 80240D54 46000032 */ c.eq.s $f0, $f0 -/* D19538 80240D58 00000000 */ nop -/* D1953C 80240D5C 45010003 */ bc1t .L80240D6C -/* D19540 80240D60 00000000 */ nop -/* D19544 80240D64 0C0187BC */ jal sqrtf -/* D19548 80240D68 00000000 */ nop -.L80240D6C: -/* D1954C 80240D6C 8E260038 */ lw $a2, 0x38($s1) -/* D19550 80240D70 8E270040 */ lw $a3, 0x40($s1) -/* D19554 80240D74 4480A000 */ mtc1 $zero, $f20 -/* D19558 80240D78 E7A00038 */ swc1 $f0, 0x38($sp) -/* D1955C 80240D7C 4600A306 */ mov.s $f12, $f20 -/* D19560 80240D80 0C00A720 */ jal atan2 -/* D19564 80240D84 4600A386 */ mov.s $f14, $f20 -/* D19568 80240D88 46000586 */ mov.s $f22, $f0 -/* D1956C 80240D8C C7A20038 */ lwc1 $f2, 0x38($sp) -/* D19570 80240D90 3C018024 */ lui $at, 0x8024 -/* D19574 80240D94 D4207688 */ ldc1 $f0, 0x7688($at) -/* D19578 80240D98 460010A1 */ cvt.d.s $f2, $f2 -/* D1957C 80240D9C 4620103C */ c.lt.d $f2, $f0 -/* D19580 80240DA0 00000000 */ nop -/* D19584 80240DA4 45000004 */ bc1f .L80240DB8 -/* D19588 80240DA8 0200202D */ daddu $a0, $s0, $zero -/* D1958C 80240DAC 3C064398 */ lui $a2, 0x4398 -/* D19590 80240DB0 08090376 */ j .L80240DD8 -/* D19594 80240DB4 34C68000 */ ori $a2, $a2, 0x8000 -.L80240DB8: -/* D19598 80240DB8 3C018024 */ lui $at, 0x8024 -/* D1959C 80240DBC D4207690 */ ldc1 $f0, 0x7690($at) -/* D195A0 80240DC0 4622003C */ c.lt.d $f0, $f2 -/* D195A4 80240DC4 00000000 */ nop -/* D195A8 80240DC8 450000FA */ bc1f .L802411B4 -/* D195AC 80240DCC 00000000 */ nop -/* D195B0 80240DD0 3C0643BB */ lui $a2, 0x43bb -/* D195B4 80240DD4 34C68000 */ ori $a2, $a2, 0x8000 -.L80240DD8: -/* D195B8 80240DD8 4407B000 */ mfc1 $a3, $f22 -/* D195BC 80240DDC 0260282D */ daddu $a1, $s3, $zero -/* D195C0 80240DE0 E6340038 */ swc1 $f20, 0x38($s1) -/* D195C4 80240DE4 0C00A7E7 */ jal add_vec2D_polar -/* D195C8 80240DE8 E6340040 */ swc1 $f20, 0x40($s1) -/* D195CC 80240DEC 0809046D */ j .L802411B4 -/* D195D0 80240DF0 00000000 */ nop -.L80240DF4: -/* D195D4 80240DF4 8E220000 */ lw $v0, ($s1) -/* D195D8 80240DF8 30420040 */ andi $v0, $v0, 0x40 -/* D195DC 80240DFC 144000B0 */ bnez $v0, .L802410C0 -/* D195E0 80240E00 27A50020 */ addiu $a1, $sp, 0x20 -/* D195E4 80240E04 27B40020 */ addiu $s4, $sp, 0x20 -/* D195E8 80240E08 0280282D */ daddu $a1, $s4, $zero -/* D195EC 80240E0C 27B30024 */ addiu $s3, $sp, 0x24 -/* D195F0 80240E10 8EA20000 */ lw $v0, ($s5) -/* D195F4 80240E14 3C014032 */ lui $at, 0x4032 -/* D195F8 80240E18 44811800 */ mtc1 $at, $f3 -/* D195FC 80240E1C 44801000 */ mtc1 $zero, $f2 -/* D19600 80240E20 C440002C */ lwc1 $f0, 0x2c($v0) -/* D19604 80240E24 C4460028 */ lwc1 $f6, 0x28($v0) -/* D19608 80240E28 C4440030 */ lwc1 $f4, 0x30($v0) -/* D1960C 80240E2C 46000021 */ cvt.d.s $f0, $f0 -/* D19610 80240E30 46220000 */ add.d $f0, $f0, $f2 -/* D19614 80240E34 E7A60020 */ swc1 $f6, 0x20($sp) -/* D19618 80240E38 E7A40028 */ swc1 $f4, 0x28($sp) -/* D1961C 80240E3C 46200020 */ cvt.s.d $f0, $f0 -/* D19620 80240E40 E7A00024 */ swc1 $f0, 0x24($sp) -/* D19624 80240E44 E7B40010 */ swc1 $f20, 0x10($sp) -/* D19628 80240E48 E7B60014 */ swc1 $f22, 0x14($sp) -/* D1962C 80240E4C 862200A8 */ lh $v0, 0xa8($s1) -/* D19630 80240E50 0260302D */ daddu $a2, $s3, $zero -/* D19634 80240E54 44820000 */ mtc1 $v0, $f0 -/* D19638 80240E58 00000000 */ nop -/* D1963C 80240E5C 46800020 */ cvt.s.w $f0, $f0 -/* D19640 80240E60 E7A00018 */ swc1 $f0, 0x18($sp) -/* D19644 80240E64 862200A6 */ lh $v0, 0xa6($s1) -/* D19648 80240E68 27B00028 */ addiu $s0, $sp, 0x28 -/* D1964C 80240E6C 44820000 */ mtc1 $v0, $f0 -/* D19650 80240E70 00000000 */ nop -/* D19654 80240E74 46800020 */ cvt.s.w $f0, $f0 -/* D19658 80240E78 E7A0001C */ swc1 $f0, 0x1c($sp) -/* D1965C 80240E7C 8E240080 */ lw $a0, 0x80($s1) -/* D19660 80240E80 0C037711 */ jal func_800DDC44 -/* D19664 80240E84 0200382D */ daddu $a3, $s0, $zero -/* D19668 80240E88 104000CA */ beqz $v0, .L802411B4 -/* D1966C 80240E8C 0280282D */ daddu $a1, $s4, $zero -/* D19670 80240E90 8EA20000 */ lw $v0, ($s5) -/* D19674 80240E94 3C018024 */ lui $at, 0x8024 -/* D19678 80240E98 D4227698 */ ldc1 $f2, 0x7698($at) -/* D1967C 80240E9C C440002C */ lwc1 $f0, 0x2c($v0) -/* D19680 80240EA0 C4460028 */ lwc1 $f6, 0x28($v0) -/* D19684 80240EA4 C4440030 */ lwc1 $f4, 0x30($v0) -/* D19688 80240EA8 46000021 */ cvt.d.s $f0, $f0 -/* D1968C 80240EAC 46220000 */ add.d $f0, $f0, $f2 -/* D19690 80240EB0 E7A60020 */ swc1 $f6, 0x20($sp) -/* D19694 80240EB4 E7A40028 */ swc1 $f4, 0x28($sp) -/* D19698 80240EB8 46200020 */ cvt.s.d $f0, $f0 -/* D1969C 80240EBC E7A00024 */ swc1 $f0, 0x24($sp) -/* D196A0 80240EC0 E7B40010 */ swc1 $f20, 0x10($sp) -/* D196A4 80240EC4 E7B60014 */ swc1 $f22, 0x14($sp) -/* D196A8 80240EC8 862200A8 */ lh $v0, 0xa8($s1) -/* D196AC 80240ECC 44820000 */ mtc1 $v0, $f0 -/* D196B0 80240ED0 00000000 */ nop -/* D196B4 80240ED4 46800020 */ cvt.s.w $f0, $f0 -/* D196B8 80240ED8 E7A00018 */ swc1 $f0, 0x18($sp) -/* D196BC 80240EDC 862200A6 */ lh $v0, 0xa6($s1) -/* D196C0 80240EE0 0260302D */ daddu $a2, $s3, $zero -/* D196C4 80240EE4 44820000 */ mtc1 $v0, $f0 -/* D196C8 80240EE8 00000000 */ nop -/* D196CC 80240EEC 46800020 */ cvt.s.w $f0, $f0 -/* D196D0 80240EF0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* D196D4 80240EF4 8E240080 */ lw $a0, 0x80($s1) -/* D196D8 80240EF8 0C037711 */ jal func_800DDC44 -/* D196DC 80240EFC 0200382D */ daddu $a3, $s0, $zero -/* D196E0 80240F00 27A5002C */ addiu $a1, $sp, 0x2c -/* D196E4 80240F04 27A60030 */ addiu $a2, $sp, 0x30 -/* D196E8 80240F08 27A70034 */ addiu $a3, $sp, 0x34 -/* D196EC 80240F0C 27A30038 */ addiu $v1, $sp, 0x38 -/* D196F0 80240F10 C6220038 */ lwc1 $f2, 0x38($s1) -/* D196F4 80240F14 C620003C */ lwc1 $f0, 0x3c($s1) -/* D196F8 80240F18 3C014348 */ lui $at, 0x4348 -/* D196FC 80240F1C 44813000 */ mtc1 $at, $f6 -/* D19700 80240F20 46000021 */ cvt.d.s $f0, $f0 -/* D19704 80240F24 E7A2002C */ swc1 $f2, 0x2c($sp) -/* D19708 80240F28 3C014059 */ lui $at, 0x4059 -/* D1970C 80240F2C 44811800 */ mtc1 $at, $f3 -/* D19710 80240F30 44801000 */ mtc1 $zero, $f2 -/* D19714 80240F34 C6240040 */ lwc1 $f4, 0x40($s1) -/* D19718 80240F38 46220000 */ add.d $f0, $f0, $f2 -/* D1971C 80240F3C E7A60038 */ swc1 $f6, 0x38($sp) -/* D19720 80240F40 E7A40034 */ swc1 $f4, 0x34($sp) -/* D19724 80240F44 46200020 */ cvt.s.d $f0, $f0 -/* D19728 80240F48 E7A00030 */ swc1 $f0, 0x30($sp) -/* D1972C 80240F4C AFA30010 */ sw $v1, 0x10($sp) -/* D19730 80240F50 8E240080 */ lw $a0, 0x80($s1) -/* D19734 80240F54 0C0372DF */ jal func_800DCB7C -/* D19738 80240F58 0040802D */ daddu $s0, $v0, $zero -/* D1973C 80240F5C 1600001C */ bnez $s0, .L80240FD0 -/* D19740 80240F60 00000000 */ nop -/* D19744 80240F64 1040001A */ beqz $v0, .L80240FD0 -/* D19748 80240F68 00000000 */ nop -/* D1974C 80240F6C C7A20038 */ lwc1 $f2, 0x38($sp) -/* D19750 80240F70 3C014054 */ lui $at, 0x4054 -/* D19754 80240F74 44810800 */ mtc1 $at, $f1 -/* D19758 80240F78 44800000 */ mtc1 $zero, $f0 -/* D1975C 80240F7C 460010A1 */ cvt.d.s $f2, $f2 -/* D19760 80240F80 4622003C */ c.lt.d $f0, $f2 -/* D19764 80240F84 00000000 */ nop -/* D19768 80240F88 45000011 */ bc1f .L80240FD0 -/* D1976C 80240F8C 00000000 */ nop -/* D19770 80240F90 3C01405E */ lui $at, 0x405e -/* D19774 80240F94 44810800 */ mtc1 $at, $f1 -/* D19778 80240F98 44800000 */ mtc1 $zero, $f0 -/* D1977C 80240F9C 00000000 */ nop -/* D19780 80240FA0 4620103C */ c.lt.d $f2, $f0 -/* D19784 80240FA4 00000000 */ nop -/* D19788 80240FA8 45000009 */ bc1f .L80240FD0 -/* D1978C 80240FAC 00000000 */ nop -/* D19790 80240FB0 C622003C */ lwc1 $f2, 0x3c($s1) -/* D19794 80240FB4 C7A00030 */ lwc1 $f0, 0x30($sp) -/* D19798 80240FB8 46001032 */ c.eq.s $f2, $f0 -/* D1979C 80240FBC 00000000 */ nop -/* D197A0 80240FC0 45010003 */ bc1t .L80240FD0 -/* D197A4 80240FC4 00000000 */ nop -/* D197A8 80240FC8 0809046D */ j .L802411B4 -/* D197AC 80240FCC 241E0001 */ addiu $fp, $zero, 1 -.L80240FD0: -/* D197B0 80240FD0 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* D197B4 80240FD4 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* D197B8 80240FD8 8E020000 */ lw $v0, ($s0) -/* D197BC 80240FDC 3C014024 */ lui $at, 0x4024 -/* D197C0 80240FE0 44811800 */ mtc1 $at, $f3 -/* D197C4 80240FE4 44801000 */ mtc1 $zero, $f2 -/* D197C8 80240FE8 C440002C */ lwc1 $f0, 0x2c($v0) -/* D197CC 80240FEC C4460028 */ lwc1 $f6, 0x28($v0) -/* D197D0 80240FF0 C4440030 */ lwc1 $f4, 0x30($v0) -/* D197D4 80240FF4 46000021 */ cvt.d.s $f0, $f0 -/* D197D8 80240FF8 46220000 */ add.d $f0, $f0, $f2 -/* D197DC 80240FFC E7A60020 */ swc1 $f6, 0x20($sp) -/* D197E0 80241000 E7A40028 */ swc1 $f4, 0x28($sp) -/* D197E4 80241004 46200020 */ cvt.s.d $f0, $f0 -/* D197E8 80241008 E7A00024 */ swc1 $f0, 0x24($sp) -/* D197EC 8024100C E7B40010 */ swc1 $f20, 0x10($sp) -/* D197F0 80241010 E7B60014 */ swc1 $f22, 0x14($sp) -/* D197F4 80241014 862200A8 */ lh $v0, 0xa8($s1) -/* D197F8 80241018 27A50020 */ addiu $a1, $sp, 0x20 -/* D197FC 8024101C 44820000 */ mtc1 $v0, $f0 -/* D19800 80241020 00000000 */ nop -/* D19804 80241024 46800020 */ cvt.s.w $f0, $f0 -/* D19808 80241028 E7A00018 */ swc1 $f0, 0x18($sp) -/* D1980C 8024102C 862200A6 */ lh $v0, 0xa6($s1) -/* D19810 80241030 27A60024 */ addiu $a2, $sp, 0x24 -/* D19814 80241034 44820000 */ mtc1 $v0, $f0 -/* D19818 80241038 00000000 */ nop -/* D1981C 8024103C 46800020 */ cvt.s.w $f0, $f0 -/* D19820 80241040 E7A0001C */ swc1 $f0, 0x1c($sp) -/* D19824 80241044 8E240080 */ lw $a0, 0x80($s1) -/* D19828 80241048 0C037711 */ jal func_800DDC44 -/* D1982C 8024104C 27A70028 */ addiu $a3, $sp, 0x28 -/* D19830 80241050 8FA60020 */ lw $a2, 0x20($sp) -/* D19834 80241054 8E020000 */ lw $v0, ($s0) -/* D19838 80241058 8FA70028 */ lw $a3, 0x28($sp) -/* D1983C 8024105C C44C0028 */ lwc1 $f12, 0x28($v0) -/* D19840 80241060 C44E0030 */ lwc1 $f14, 0x30($v0) -/* D19844 80241064 0C00A7B5 */ jal dist2D -/* D19848 80241068 24170001 */ addiu $s7, $zero, 1 -/* D1984C 8024106C 46000506 */ mov.s $f20, $f0 -/* D19850 80241070 8E030000 */ lw $v1, ($s0) -/* D19854 80241074 862200A6 */ lh $v0, 0xa6($s1) -/* D19858 80241078 4407C000 */ mfc1 $a3, $f24 -/* D1985C 8024107C 44824000 */ mtc1 $v0, $f8 -/* D19860 80241080 00000000 */ nop -/* D19864 80241084 46804220 */ cvt.s.w $f8, $f8 -/* D19868 80241088 C4600028 */ lwc1 $f0, 0x28($v1) -/* D1986C 8024108C 44064000 */ mfc1 $a2, $f8 -/* D19870 80241090 26240038 */ addiu $a0, $s1, 0x38 -/* D19874 80241094 E6200038 */ swc1 $f0, 0x38($s1) -/* D19878 80241098 C4600030 */ lwc1 $f0, 0x30($v1) -/* D1987C 8024109C 26250040 */ addiu $a1, $s1, 0x40 -/* D19880 802410A0 0C00A7E7 */ jal add_vec2D_polar -/* D19884 802410A4 E6200040 */ swc1 $f0, 0x40($s1) -/* D19888 802410A8 862200A6 */ lh $v0, 0xa6($s1) -/* D1988C 802410AC 44820000 */ mtc1 $v0, $f0 -/* D19890 802410B0 00000000 */ nop -/* D19894 802410B4 46800020 */ cvt.s.w $f0, $f0 -/* D19898 802410B8 08090469 */ j .L802411A4 -/* D1989C 802410BC 4600A500 */ add.s $f20, $f20, $f0 -.L802410C0: -/* D198A0 802410C0 8EA20000 */ lw $v0, ($s5) -/* D198A4 802410C4 3C014032 */ lui $at, 0x4032 -/* D198A8 802410C8 44811800 */ mtc1 $at, $f3 -/* D198AC 802410CC 44801000 */ mtc1 $zero, $f2 -/* D198B0 802410D0 C440002C */ lwc1 $f0, 0x2c($v0) -/* D198B4 802410D4 C4460028 */ lwc1 $f6, 0x28($v0) -/* D198B8 802410D8 C4440030 */ lwc1 $f4, 0x30($v0) -/* D198BC 802410DC 46000021 */ cvt.d.s $f0, $f0 -/* D198C0 802410E0 46220000 */ add.d $f0, $f0, $f2 -/* D198C4 802410E4 E7A60020 */ swc1 $f6, 0x20($sp) -/* D198C8 802410E8 E7A40028 */ swc1 $f4, 0x28($sp) -/* D198CC 802410EC 46200020 */ cvt.s.d $f0, $f0 -/* D198D0 802410F0 E7A00024 */ swc1 $f0, 0x24($sp) -/* D198D4 802410F4 E7B40010 */ swc1 $f20, 0x10($sp) -/* D198D8 802410F8 E7B60014 */ swc1 $f22, 0x14($sp) -/* D198DC 802410FC 862200A8 */ lh $v0, 0xa8($s1) -/* D198E0 80241100 44820000 */ mtc1 $v0, $f0 -/* D198E4 80241104 00000000 */ nop -/* D198E8 80241108 46800020 */ cvt.s.w $f0, $f0 -/* D198EC 8024110C E7A00018 */ swc1 $f0, 0x18($sp) -/* D198F0 80241110 862200A6 */ lh $v0, 0xa6($s1) -/* D198F4 80241114 27A60024 */ addiu $a2, $sp, 0x24 -/* D198F8 80241118 44820000 */ mtc1 $v0, $f0 -/* D198FC 8024111C 00000000 */ nop -/* D19900 80241120 46800020 */ cvt.s.w $f0, $f0 -/* D19904 80241124 E7A0001C */ swc1 $f0, 0x1c($sp) -/* D19908 80241128 8E240080 */ lw $a0, 0x80($s1) -/* D1990C 8024112C 0C037711 */ jal func_800DDC44 -/* D19910 80241130 27A70028 */ addiu $a3, $sp, 0x28 -/* D19914 80241134 1040001F */ beqz $v0, .L802411B4 -/* D19918 80241138 00000000 */ nop -/* D1991C 8024113C 8FA60020 */ lw $a2, 0x20($sp) -/* D19920 80241140 8EA20000 */ lw $v0, ($s5) -/* D19924 80241144 8FA70028 */ lw $a3, 0x28($sp) -/* D19928 80241148 C44C0028 */ lwc1 $f12, 0x28($v0) -/* D1992C 8024114C 0C00A7B5 */ jal dist2D -/* D19930 80241150 C44E0030 */ lwc1 $f14, 0x30($v0) -/* D19934 80241154 46000506 */ mov.s $f20, $f0 -/* D19938 80241158 8EA30000 */ lw $v1, ($s5) -/* D1993C 8024115C 862200A6 */ lh $v0, 0xa6($s1) -/* D19940 80241160 4407C000 */ mfc1 $a3, $f24 -/* D19944 80241164 44824000 */ mtc1 $v0, $f8 -/* D19948 80241168 00000000 */ nop -/* D1994C 8024116C 46804220 */ cvt.s.w $f8, $f8 -/* D19950 80241170 C4600028 */ lwc1 $f0, 0x28($v1) -/* D19954 80241174 44064000 */ mfc1 $a2, $f8 -/* D19958 80241178 0200202D */ daddu $a0, $s0, $zero -/* D1995C 8024117C E6200038 */ swc1 $f0, 0x38($s1) -/* D19960 80241180 C4600030 */ lwc1 $f0, 0x30($v1) -/* D19964 80241184 0260282D */ daddu $a1, $s3, $zero -/* D19968 80241188 0C00A7E7 */ jal add_vec2D_polar -/* D1996C 8024118C E6200040 */ swc1 $f0, 0x40($s1) -/* D19970 80241190 862200A6 */ lh $v0, 0xa6($s1) -/* D19974 80241194 44820000 */ mtc1 $v0, $f0 -/* D19978 80241198 00000000 */ nop -/* D1997C 8024119C 46800020 */ cvt.s.w $f0, $f0 -/* D19980 802411A0 4600A500 */ add.s $f20, $f20, $f0 -.L802411A4: -/* D19984 802411A4 4406B000 */ mfc1 $a2, $f22 -/* D19988 802411A8 4405A000 */ mfc1 $a1, $f20 -/* D1998C 802411AC 0C00EA95 */ jal npc_move_heading -/* D19990 802411B0 0220202D */ daddu $a0, $s1, $zero -.L802411B4: -/* D19994 802411B4 C6400008 */ lwc1 $f0, 8($s2) -/* D19998 802411B8 46800020 */ cvt.s.w $f0, $f0 -/* D1999C 802411BC 44050000 */ mfc1 $a1, $f0 -/* D199A0 802411C0 C640000C */ lwc1 $f0, 0xc($s2) -/* D199A4 802411C4 46800020 */ cvt.s.w $f0, $f0 -/* D199A8 802411C8 44060000 */ mfc1 $a2, $f0 -/* D199AC 802411CC C6200040 */ lwc1 $f0, 0x40($s1) -/* D199B0 802411D0 26300038 */ addiu $s0, $s1, 0x38 -/* D199B4 802411D4 E7A00010 */ swc1 $f0, 0x10($sp) -/* D199B8 802411D8 C6400010 */ lwc1 $f0, 0x10($s2) -/* D199BC 802411DC 46800020 */ cvt.s.w $f0, $f0 -/* D199C0 802411E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* D199C4 802411E4 C6400014 */ lwc1 $f0, 0x14($s2) -/* D199C8 802411E8 46800020 */ cvt.s.w $f0, $f0 -/* D199CC 802411EC E7A00018 */ swc1 $f0, 0x18($sp) -/* D199D0 802411F0 8E440004 */ lw $a0, 4($s2) -/* D199D4 802411F4 8E270038 */ lw $a3, 0x38($s1) -/* D199D8 802411F8 0C0123F5 */ jal is_point_within_region -/* D199DC 802411FC 26330040 */ addiu $s3, $s1, 0x40 -/* D199E0 80241200 1040005A */ beqz $v0, .L8024136C -/* D199E4 80241204 00000000 */ nop -/* D199E8 80241208 8E430004 */ lw $v1, 4($s2) -/* D199EC 8024120C 10600005 */ beqz $v1, .L80241224 -/* D199F0 80241210 24020001 */ addiu $v0, $zero, 1 -/* D199F4 80241214 10620029 */ beq $v1, $v0, .L802412BC -/* D199F8 80241218 00000000 */ nop -/* D199FC 8024121C 080904DB */ j .L8024136C -/* D19A00 80241220 00000000 */ nop -.L80241224: -/* D19A04 80241224 C6480008 */ lwc1 $f8, 8($s2) -/* D19A08 80241228 46804220 */ cvt.s.w $f8, $f8 -/* D19A0C 8024122C 44064000 */ mfc1 $a2, $f8 -/* D19A10 80241230 C648000C */ lwc1 $f8, 0xc($s2) -/* D19A14 80241234 46804220 */ cvt.s.w $f8, $f8 -/* D19A18 80241238 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D19A1C 8024123C C62E0040 */ lwc1 $f14, 0x40($s1) -/* D19A20 80241240 44074000 */ mfc1 $a3, $f8 -/* D19A24 80241244 0C00A7B5 */ jal dist2D -/* D19A28 80241248 00000000 */ nop -/* D19A2C 8024124C C6420010 */ lwc1 $f2, 0x10($s2) -/* D19A30 80241250 468010A0 */ cvt.s.w $f2, $f2 -/* D19A34 80241254 4600103C */ c.lt.s $f2, $f0 -/* D19A38 80241258 00000000 */ nop -/* D19A3C 8024125C 45000043 */ bc1f .L8024136C -/* D19A40 80241260 E7A00038 */ swc1 $f0, 0x38($sp) -/* D19A44 80241264 C64C0008 */ lwc1 $f12, 8($s2) -/* D19A48 80241268 46806320 */ cvt.s.w $f12, $f12 -/* D19A4C 8024126C 8E260038 */ lw $a2, 0x38($s1) -/* D19A50 80241270 8E270040 */ lw $a3, 0x40($s1) -/* D19A54 80241274 C64E000C */ lwc1 $f14, 0xc($s2) -/* D19A58 80241278 0C00A720 */ jal atan2 -/* D19A5C 8024127C 468073A0 */ cvt.s.w $f14, $f14 -/* D19A60 80241280 0200202D */ daddu $a0, $s0, $zero -/* D19A64 80241284 44070000 */ mfc1 $a3, $f0 -/* D19A68 80241288 C6400008 */ lwc1 $f0, 8($s2) -/* D19A6C 8024128C 46800020 */ cvt.s.w $f0, $f0 -/* D19A70 80241290 E6200038 */ swc1 $f0, 0x38($s1) -/* D19A74 80241294 C640000C */ lwc1 $f0, 0xc($s2) -/* D19A78 80241298 46800020 */ cvt.s.w $f0, $f0 -/* D19A7C 8024129C E6200040 */ swc1 $f0, 0x40($s1) -/* D19A80 802412A0 C6480010 */ lwc1 $f8, 0x10($s2) -/* D19A84 802412A4 46804220 */ cvt.s.w $f8, $f8 -/* D19A88 802412A8 44064000 */ mfc1 $a2, $f8 -/* D19A8C 802412AC 0C00A7E7 */ jal add_vec2D_polar -/* D19A90 802412B0 0260282D */ daddu $a1, $s3, $zero -/* D19A94 802412B4 080904DB */ j .L8024136C -/* D19A98 802412B8 00000000 */ nop -.L802412BC: -/* D19A9C 802412BC 8E420008 */ lw $v0, 8($s2) -/* D19AA0 802412C0 8E430010 */ lw $v1, 0x10($s2) -/* D19AA4 802412C4 C6200038 */ lwc1 $f0, 0x38($s1) -/* D19AA8 802412C8 00431021 */ addu $v0, $v0, $v1 -/* D19AAC 802412CC 44821000 */ mtc1 $v0, $f2 -/* D19AB0 802412D0 00000000 */ nop -/* D19AB4 802412D4 468010A0 */ cvt.s.w $f2, $f2 -/* D19AB8 802412D8 4600103C */ c.lt.s $f2, $f0 -/* D19ABC 802412DC 00000000 */ nop -/* D19AC0 802412E0 45030001 */ bc1tl .L802412E8 -/* D19AC4 802412E4 E6220038 */ swc1 $f2, 0x38($s1) -.L802412E8: -/* D19AC8 802412E8 8E420008 */ lw $v0, 8($s2) -/* D19ACC 802412EC 8E430010 */ lw $v1, 0x10($s2) -/* D19AD0 802412F0 C6200038 */ lwc1 $f0, 0x38($s1) -/* D19AD4 802412F4 00431023 */ subu $v0, $v0, $v1 -/* D19AD8 802412F8 44821000 */ mtc1 $v0, $f2 -/* D19ADC 802412FC 00000000 */ nop -/* D19AE0 80241300 468010A0 */ cvt.s.w $f2, $f2 -/* D19AE4 80241304 4602003C */ c.lt.s $f0, $f2 -/* D19AE8 80241308 00000000 */ nop -/* D19AEC 8024130C 45030001 */ bc1tl .L80241314 -/* D19AF0 80241310 E6220038 */ swc1 $f2, 0x38($s1) -.L80241314: -/* D19AF4 80241314 8E42000C */ lw $v0, 0xc($s2) -/* D19AF8 80241318 8E430014 */ lw $v1, 0x14($s2) -/* D19AFC 8024131C C6200040 */ lwc1 $f0, 0x40($s1) -/* D19B00 80241320 00431021 */ addu $v0, $v0, $v1 -/* D19B04 80241324 44821000 */ mtc1 $v0, $f2 -/* D19B08 80241328 00000000 */ nop -/* D19B0C 8024132C 468010A0 */ cvt.s.w $f2, $f2 -/* D19B10 80241330 4600103C */ c.lt.s $f2, $f0 -/* D19B14 80241334 00000000 */ nop -/* D19B18 80241338 45030001 */ bc1tl .L80241340 -/* D19B1C 8024133C E6220040 */ swc1 $f2, 0x40($s1) -.L80241340: -/* D19B20 80241340 8E42000C */ lw $v0, 0xc($s2) -/* D19B24 80241344 8E430014 */ lw $v1, 0x14($s2) -/* D19B28 80241348 C6200040 */ lwc1 $f0, 0x40($s1) -/* D19B2C 8024134C 00431023 */ subu $v0, $v0, $v1 -/* D19B30 80241350 44821000 */ mtc1 $v0, $f2 -/* D19B34 80241354 00000000 */ nop -/* D19B38 80241358 468010A0 */ cvt.s.w $f2, $f2 -/* D19B3C 8024135C 4602003C */ c.lt.s $f0, $f2 -/* D19B40 80241360 00000000 */ nop -/* D19B44 80241364 45030001 */ bc1tl .L8024136C -/* D19B48 80241368 E6220040 */ swc1 $f2, 0x40($s1) -.L8024136C: -/* D19B4C 8024136C 16E0001F */ bnez $s7, .L802413EC -/* D19B50 80241370 00000000 */ nop -/* D19B54 80241374 8E220000 */ lw $v0, ($s1) -/* D19B58 80241378 30420008 */ andi $v0, $v0, 8 -/* D19B5C 8024137C 10400003 */ beqz $v0, .L8024138C -/* D19B60 80241380 27A50020 */ addiu $a1, $sp, 0x20 -/* D19B64 80241384 13C00019 */ beqz $fp, .L802413EC -/* D19B68 80241388 00000000 */ nop -.L8024138C: -/* D19B6C 8024138C 27A60024 */ addiu $a2, $sp, 0x24 -/* D19B70 80241390 27A20038 */ addiu $v0, $sp, 0x38 -/* D19B74 80241394 C6220038 */ lwc1 $f2, 0x38($s1) -/* D19B78 80241398 C620003C */ lwc1 $f0, 0x3c($s1) -/* D19B7C 8024139C 3C0143C8 */ lui $at, 0x43c8 -/* D19B80 802413A0 44813000 */ mtc1 $at, $f6 -/* D19B84 802413A4 46000021 */ cvt.d.s $f0, $f0 -/* D19B88 802413A8 E7A20020 */ swc1 $f2, 0x20($sp) -/* D19B8C 802413AC 3C018024 */ lui $at, 0x8024 -/* D19B90 802413B0 D42276A0 */ ldc1 $f2, 0x76a0($at) -/* D19B94 802413B4 C6240040 */ lwc1 $f4, 0x40($s1) -/* D19B98 802413B8 46220000 */ add.d $f0, $f0, $f2 -/* D19B9C 802413BC E7A60038 */ swc1 $f6, 0x38($sp) -/* D19BA0 802413C0 E7A40028 */ swc1 $f4, 0x28($sp) -/* D19BA4 802413C4 46200020 */ cvt.s.d $f0, $f0 -/* D19BA8 802413C8 E7A00024 */ swc1 $f0, 0x24($sp) -/* D19BAC 802413CC AFA20010 */ sw $v0, 0x10($sp) -/* D19BB0 802413D0 8E240080 */ lw $a0, 0x80($s1) -/* D19BB4 802413D4 0C0372DF */ jal func_800DCB7C -/* D19BB8 802413D8 27A70028 */ addiu $a3, $sp, 0x28 -/* D19BBC 802413DC 10400003 */ beqz $v0, .L802413EC -/* D19BC0 802413E0 00000000 */ nop -/* D19BC4 802413E4 C7A00024 */ lwc1 $f0, 0x24($sp) -/* D19BC8 802413E8 E620003C */ swc1 $f0, 0x3c($s1) -.L802413EC: -/* D19BCC 802413EC C62C0038 */ lwc1 $f12, 0x38($s1) -/* D19BD0 802413F0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D19BD4 802413F4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D19BD8 802413F8 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D19BDC 802413FC 8C460028 */ lw $a2, 0x28($v0) -/* D19BE0 80241400 0C00A720 */ jal atan2 -/* D19BE4 80241404 8C470030 */ lw $a3, 0x30($v0) -/* D19BE8 80241408 0220202D */ daddu $a0, $s1, $zero -/* D19BEC 8024140C 24050321 */ addiu $a1, $zero, 0x321 -/* D19BF0 80241410 0000302D */ daddu $a2, $zero, $zero -/* D19BF4 80241414 0C012530 */ jal func_800494C0 -/* D19BF8 80241418 E620000C */ swc1 $f0, 0xc($s1) -/* D19BFC 8024141C 8EC200CC */ lw $v0, 0xcc($s6) -/* D19C00 80241420 8C420024 */ lw $v0, 0x24($v0) -/* D19C04 80241424 AE220028 */ sw $v0, 0x28($s1) -/* D19C08 80241428 96C20096 */ lhu $v0, 0x96($s6) -/* D19C0C 8024142C A622008E */ sh $v0, 0x8e($s1) -/* D19C10 80241430 8FA80080 */ lw $t0, 0x80($sp) -/* D19C14 80241434 2402000B */ addiu $v0, $zero, 0xb -/* D19C18 80241438 AD020070 */ sw $v0, 0x70($t0) -.L8024143C: -/* D19C1C 8024143C 8FBF0064 */ lw $ra, 0x64($sp) -/* D19C20 80241440 8FBE0060 */ lw $fp, 0x60($sp) -/* D19C24 80241444 8FB7005C */ lw $s7, 0x5c($sp) -/* D19C28 80241448 8FB60058 */ lw $s6, 0x58($sp) -/* D19C2C 8024144C 8FB50054 */ lw $s5, 0x54($sp) -/* D19C30 80241450 8FB40050 */ lw $s4, 0x50($sp) -/* D19C34 80241454 8FB3004C */ lw $s3, 0x4c($sp) -/* D19C38 80241458 8FB20048 */ lw $s2, 0x48($sp) -/* D19C3C 8024145C 8FB10044 */ lw $s1, 0x44($sp) -/* D19C40 80241460 8FB00040 */ lw $s0, 0x40($sp) -/* D19C44 80241464 D7B80078 */ ldc1 $f24, 0x78($sp) -/* D19C48 80241468 D7B60070 */ ldc1 $f22, 0x70($sp) -/* D19C4C 8024146C D7B40068 */ ldc1 $f20, 0x68($sp) -/* D19C50 80241470 03E00008 */ jr $ra -/* D19C54 80241474 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_sam/sam_05/func_80241508_D187E0.s b/asm/nonmatchings/world/area_sam/sam_05/func_80241508_D187E0.s deleted file mode 100644 index 557922c18e..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/func_80241508_D187E0.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241508_D19CE8 -/* D19CE8 80241508 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D19CEC 8024150C AFB10034 */ sw $s1, 0x34($sp) -/* D19CF0 80241510 0080882D */ daddu $s1, $a0, $zero -/* D19CF4 80241514 AFBF0038 */ sw $ra, 0x38($sp) -/* D19CF8 80241518 AFB00030 */ sw $s0, 0x30($sp) -/* D19CFC 8024151C 8E300148 */ lw $s0, 0x148($s1) -/* D19D00 80241520 0C00EABB */ jal get_npc_unsafe -/* D19D04 80241524 86040008 */ lh $a0, 8($s0) -/* D19D08 80241528 0040282D */ daddu $a1, $v0, $zero -/* D19D0C 8024152C 94A2008E */ lhu $v0, 0x8e($a1) -/* D19D10 80241530 24420001 */ addiu $v0, $v0, 1 -/* D19D14 80241534 A4A2008E */ sh $v0, 0x8e($a1) -/* D19D18 80241538 00021400 */ sll $v0, $v0, 0x10 -/* D19D1C 8024153C 8E0300A0 */ lw $v1, 0xa0($s0) -/* D19D20 80241540 00021403 */ sra $v0, $v0, 0x10 -/* D19D24 80241544 14430004 */ bne $v0, $v1, .L80241558 -/* D19D28 80241548 00000000 */ nop -/* D19D2C 8024154C 8E0200CC */ lw $v0, 0xcc($s0) -/* D19D30 80241550 8C42002C */ lw $v0, 0x2c($v0) -/* D19D34 80241554 ACA20028 */ sw $v0, 0x28($a1) -.L80241558: -/* D19D38 80241558 84A3008E */ lh $v1, 0x8e($a1) -/* D19D3C 8024155C 8E0200A4 */ lw $v0, 0xa4($s0) -/* D19D40 80241560 14620002 */ bne $v1, $v0, .L8024156C -/* D19D44 80241564 24020003 */ addiu $v0, $zero, 3 -/* D19D48 80241568 AE02006C */ sw $v0, 0x6c($s0) -.L8024156C: -/* D19D4C 8024156C 84A2008E */ lh $v0, 0x8e($a1) -/* D19D50 80241570 8E03009C */ lw $v1, 0x9c($s0) -/* D19D54 80241574 0043102A */ slt $v0, $v0, $v1 -/* D19D58 80241578 1440001E */ bnez $v0, .L802415F4 -/* D19D5C 8024157C 24020004 */ addiu $v0, $zero, 4 -/* D19D60 80241580 AE02006C */ sw $v0, 0x6c($s0) -/* D19D64 80241584 24020008 */ addiu $v0, $zero, 8 -/* D19D68 80241588 24040003 */ addiu $a0, $zero, 3 -/* D19D6C 8024158C A4A2008E */ sh $v0, 0x8e($a1) -/* D19D70 80241590 8E0200CC */ lw $v0, 0xcc($s0) -/* D19D74 80241594 84A300A8 */ lh $v1, 0xa8($a1) -/* D19D78 80241598 3C013F80 */ lui $at, 0x3f80 -/* D19D7C 8024159C 44810000 */ mtc1 $at, $f0 -/* D19D80 802415A0 3C014000 */ lui $at, 0x4000 -/* D19D84 802415A4 44811000 */ mtc1 $at, $f2 -/* D19D88 802415A8 3C01C1A0 */ lui $at, 0xc1a0 -/* D19D8C 802415AC 44812000 */ mtc1 $at, $f4 -/* D19D90 802415B0 44833000 */ mtc1 $v1, $f6 -/* D19D94 802415B4 00000000 */ nop -/* D19D98 802415B8 468031A0 */ cvt.s.w $f6, $f6 -/* D19D9C 802415BC 8C420000 */ lw $v0, ($v0) -/* D19DA0 802415C0 44073000 */ mfc1 $a3, $f6 -/* D19DA4 802415C4 0000302D */ daddu $a2, $zero, $zero -/* D19DA8 802415C8 ACA20028 */ sw $v0, 0x28($a1) -/* D19DAC 802415CC 2402000A */ addiu $v0, $zero, 0xa -/* D19DB0 802415D0 AFA2001C */ sw $v0, 0x1c($sp) -/* D19DB4 802415D4 27A20028 */ addiu $v0, $sp, 0x28 -/* D19DB8 802415D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* D19DBC 802415DC E7A20014 */ swc1 $f2, 0x14($sp) -/* D19DC0 802415E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* D19DC4 802415E4 0C01BFA4 */ jal fx_emote -/* D19DC8 802415E8 AFA20020 */ sw $v0, 0x20($sp) -/* D19DCC 802415EC 2402000D */ addiu $v0, $zero, 0xd -/* D19DD0 802415F0 AE220070 */ sw $v0, 0x70($s1) -.L802415F4: -/* D19DD4 802415F4 8FBF0038 */ lw $ra, 0x38($sp) -/* D19DD8 802415F8 8FB10034 */ lw $s1, 0x34($sp) -/* D19DDC 802415FC 8FB00030 */ lw $s0, 0x30($sp) -/* D19DE0 80241600 03E00008 */ jr $ra -/* D19DE4 80241604 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_sam/sam_05/func_80241608_D187E0.s b/asm/nonmatchings/world/area_sam/sam_05/func_80241608_D187E0.s deleted file mode 100644 index ffeaf17dd7..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/func_80241608_D187E0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241608_D19DE8 -/* D19DE8 80241608 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D19DEC 8024160C AFB10014 */ sw $s1, 0x14($sp) -/* D19DF0 80241610 0080882D */ daddu $s1, $a0, $zero -/* D19DF4 80241614 AFBF0018 */ sw $ra, 0x18($sp) -/* D19DF8 80241618 AFB00010 */ sw $s0, 0x10($sp) -/* D19DFC 8024161C 8E300148 */ lw $s0, 0x148($s1) -/* D19E00 80241620 0C00EABB */ jal get_npc_unsafe -/* D19E04 80241624 86040008 */ lh $a0, 8($s0) -/* D19E08 80241628 0040182D */ daddu $v1, $v0, $zero -/* D19E0C 8024162C 9462008E */ lhu $v0, 0x8e($v1) -/* D19E10 80241630 2442FFFF */ addiu $v0, $v0, -1 -/* D19E14 80241634 A462008E */ sh $v0, 0x8e($v1) -/* D19E18 80241638 00021400 */ sll $v0, $v0, 0x10 -/* D19E1C 8024163C 14400005 */ bnez $v0, .L80241654 -/* D19E20 80241640 00000000 */ nop -/* D19E24 80241644 960200AA */ lhu $v0, 0xaa($s0) -/* D19E28 80241648 A462008E */ sh $v0, 0x8e($v1) -/* D19E2C 8024164C 2402000E */ addiu $v0, $zero, 0xe -/* D19E30 80241650 AE220070 */ sw $v0, 0x70($s1) -.L80241654: -/* D19E34 80241654 8FBF0018 */ lw $ra, 0x18($sp) -/* D19E38 80241658 8FB10014 */ lw $s1, 0x14($sp) -/* D19E3C 8024165C 8FB00010 */ lw $s0, 0x10($sp) -/* D19E40 80241660 03E00008 */ jr $ra -/* D19E44 80241664 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_05/func_80241668_D187E0.s b/asm/nonmatchings/world/area_sam/sam_05/func_80241668_D187E0.s deleted file mode 100644 index 4b392ff6ee..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/func_80241668_D187E0.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241668_D19E48 -/* D19E48 80241668 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D19E4C 8024166C AFB40040 */ sw $s4, 0x40($sp) -/* D19E50 80241670 0080A02D */ daddu $s4, $a0, $zero -/* D19E54 80241674 AFBF0044 */ sw $ra, 0x44($sp) -/* D19E58 80241678 AFB3003C */ sw $s3, 0x3c($sp) -/* D19E5C 8024167C AFB20038 */ sw $s2, 0x38($sp) -/* D19E60 80241680 AFB10034 */ sw $s1, 0x34($sp) -/* D19E64 80241684 AFB00030 */ sw $s0, 0x30($sp) -/* D19E68 80241688 8E910148 */ lw $s1, 0x148($s4) -/* D19E6C 8024168C 00A0902D */ daddu $s2, $a1, $zero -/* D19E70 80241690 86240008 */ lh $a0, 8($s1) -/* D19E74 80241694 0C00EABB */ jal get_npc_unsafe -/* D19E78 80241698 00C0982D */ daddu $s3, $a2, $zero -/* D19E7C 8024169C 0040802D */ daddu $s0, $v0, $zero -/* D19E80 802416A0 9602008E */ lhu $v0, 0x8e($s0) -/* D19E84 802416A4 2442FFFF */ addiu $v0, $v0, -1 -/* D19E88 802416A8 A602008E */ sh $v0, 0x8e($s0) -/* D19E8C 802416AC 00021400 */ sll $v0, $v0, 0x10 -/* D19E90 802416B0 14400020 */ bnez $v0, .L80241734 -/* D19E94 802416B4 0260202D */ daddu $a0, $s3, $zero -/* D19E98 802416B8 AFA00010 */ sw $zero, 0x10($sp) -/* D19E9C 802416BC 8E46000C */ lw $a2, 0xc($s2) -/* D19EA0 802416C0 8E470010 */ lw $a3, 0x10($s2) -/* D19EA4 802416C4 0C01242D */ jal func_800490B4 -/* D19EA8 802416C8 0220282D */ daddu $a1, $s1, $zero -/* D19EAC 802416CC 54400018 */ bnel $v0, $zero, .L80241730 -/* D19EB0 802416D0 A600008E */ sh $zero, 0x8e($s0) -/* D19EB4 802416D4 24040002 */ addiu $a0, $zero, 2 -/* D19EB8 802416D8 0200282D */ daddu $a1, $s0, $zero -/* D19EBC 802416DC 0000302D */ daddu $a2, $zero, $zero -/* D19EC0 802416E0 860300A8 */ lh $v1, 0xa8($s0) -/* D19EC4 802416E4 3C013F80 */ lui $at, 0x3f80 -/* D19EC8 802416E8 44810000 */ mtc1 $at, $f0 -/* D19ECC 802416EC 3C014000 */ lui $at, 0x4000 -/* D19ED0 802416F0 44811000 */ mtc1 $at, $f2 -/* D19ED4 802416F4 3C01C1A0 */ lui $at, 0xc1a0 -/* D19ED8 802416F8 44812000 */ mtc1 $at, $f4 -/* D19EDC 802416FC 2402000F */ addiu $v0, $zero, 0xf -/* D19EE0 80241700 AFA2001C */ sw $v0, 0x1c($sp) -/* D19EE4 80241704 44833000 */ mtc1 $v1, $f6 -/* D19EE8 80241708 00000000 */ nop -/* D19EEC 8024170C 468031A0 */ cvt.s.w $f6, $f6 -/* D19EF0 80241710 44073000 */ mfc1 $a3, $f6 -/* D19EF4 80241714 27A20028 */ addiu $v0, $sp, 0x28 -/* D19EF8 80241718 AFA20020 */ sw $v0, 0x20($sp) -/* D19EFC 8024171C E7A00010 */ swc1 $f0, 0x10($sp) -/* D19F00 80241720 E7A20014 */ swc1 $f2, 0x14($sp) -/* D19F04 80241724 0C01BFA4 */ jal fx_emote -/* D19F08 80241728 E7A40018 */ swc1 $f4, 0x18($sp) -/* D19F0C 8024172C A600008E */ sh $zero, 0x8e($s0) -.L80241730: -/* D19F10 80241730 AE800070 */ sw $zero, 0x70($s4) -.L80241734: -/* D19F14 80241734 8FBF0044 */ lw $ra, 0x44($sp) -/* D19F18 80241738 8FB40040 */ lw $s4, 0x40($sp) -/* D19F1C 8024173C 8FB3003C */ lw $s3, 0x3c($sp) -/* D19F20 80241740 8FB20038 */ lw $s2, 0x38($sp) -/* D19F24 80241744 8FB10034 */ lw $s1, 0x34($sp) -/* D19F28 80241748 8FB00030 */ lw $s0, 0x30($sp) -/* D19F2C 8024174C 03E00008 */ jr $ra -/* D19F30 80241750 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_05/func_80241754_D187E0.s b/asm/nonmatchings/world/area_sam/sam_05/func_80241754_D187E0.s deleted file mode 100644 index 9f6097f04f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/func_80241754_D187E0.s +++ /dev/null @@ -1,165 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241754_D19F34 -/* D19F34 80241754 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D19F38 80241758 AFB20038 */ sw $s2, 0x38($sp) -/* D19F3C 8024175C 0080902D */ daddu $s2, $a0, $zero -/* D19F40 80241760 AFBF0048 */ sw $ra, 0x48($sp) -/* D19F44 80241764 AFB50044 */ sw $s5, 0x44($sp) -/* D19F48 80241768 AFB40040 */ sw $s4, 0x40($sp) -/* D19F4C 8024176C AFB3003C */ sw $s3, 0x3c($sp) -/* D19F50 80241770 AFB10034 */ sw $s1, 0x34($sp) -/* D19F54 80241774 AFB00030 */ sw $s0, 0x30($sp) -/* D19F58 80241778 8E510148 */ lw $s1, 0x148($s2) -/* D19F5C 8024177C 86240008 */ lh $a0, 8($s1) -/* D19F60 80241780 0C00EABB */ jal get_npc_unsafe -/* D19F64 80241784 00A0802D */ daddu $s0, $a1, $zero -/* D19F68 80241788 8E43000C */ lw $v1, 0xc($s2) -/* D19F6C 8024178C 0240202D */ daddu $a0, $s2, $zero -/* D19F70 80241790 8C650000 */ lw $a1, ($v1) -/* D19F74 80241794 0C0B1EAF */ jal get_variable -/* D19F78 80241798 0040A82D */ daddu $s5, $v0, $zero -/* D19F7C 8024179C AFA00010 */ sw $zero, 0x10($sp) -/* D19F80 802417A0 8E2300D0 */ lw $v1, 0xd0($s1) -/* D19F84 802417A4 8C630030 */ lw $v1, 0x30($v1) -/* D19F88 802417A8 AFA30014 */ sw $v1, 0x14($sp) -/* D19F8C 802417AC 8E2300D0 */ lw $v1, 0xd0($s1) -/* D19F90 802417B0 8C63001C */ lw $v1, 0x1c($v1) -/* D19F94 802417B4 AFA30018 */ sw $v1, 0x18($sp) -/* D19F98 802417B8 8E2300D0 */ lw $v1, 0xd0($s1) -/* D19F9C 802417BC 8C630024 */ lw $v1, 0x24($v1) -/* D19FA0 802417C0 AFA3001C */ sw $v1, 0x1c($sp) -/* D19FA4 802417C4 8E2300D0 */ lw $v1, 0xd0($s1) -/* D19FA8 802417C8 8C630028 */ lw $v1, 0x28($v1) -/* D19FAC 802417CC 27B40010 */ addiu $s4, $sp, 0x10 -/* D19FB0 802417D0 AFA30020 */ sw $v1, 0x20($sp) -/* D19FB4 802417D4 8E2300D0 */ lw $v1, 0xd0($s1) -/* D19FB8 802417D8 3C014348 */ lui $at, 0x4348 -/* D19FBC 802417DC 44810000 */ mtc1 $at, $f0 -/* D19FC0 802417E0 8C63002C */ lw $v1, 0x2c($v1) -/* D19FC4 802417E4 0040982D */ daddu $s3, $v0, $zero -/* D19FC8 802417E8 E7A00028 */ swc1 $f0, 0x28($sp) -/* D19FCC 802417EC A7A0002C */ sh $zero, 0x2c($sp) -/* D19FD0 802417F0 16000005 */ bnez $s0, .L80241808 -/* D19FD4 802417F4 AFA30024 */ sw $v1, 0x24($sp) -/* D19FD8 802417F8 8E2200B0 */ lw $v0, 0xb0($s1) -/* D19FDC 802417FC 30420004 */ andi $v0, $v0, 4 -/* D19FE0 80241800 10400011 */ beqz $v0, .L80241848 -/* D19FE4 80241804 00000000 */ nop -.L80241808: -/* D19FE8 80241808 AE400070 */ sw $zero, 0x70($s2) -/* D19FEC 8024180C A6A0008E */ sh $zero, 0x8e($s5) -/* D19FF0 80241810 8E2200CC */ lw $v0, 0xcc($s1) -/* D19FF4 80241814 8C420000 */ lw $v0, ($v0) -/* D19FF8 80241818 AEA20028 */ sw $v0, 0x28($s5) -/* D19FFC 8024181C 8E2200B0 */ lw $v0, 0xb0($s1) -/* D1A000 80241820 30420004 */ andi $v0, $v0, 4 -/* D1A004 80241824 10400008 */ beqz $v0, .L80241848 -/* D1A008 80241828 AE20006C */ sw $zero, 0x6c($s1) -/* D1A00C 8024182C 24020063 */ addiu $v0, $zero, 0x63 -/* D1A010 80241830 AE420070 */ sw $v0, 0x70($s2) -/* D1A014 80241834 AE400074 */ sw $zero, 0x74($s2) -/* D1A018 80241838 8E2200B0 */ lw $v0, 0xb0($s1) -/* D1A01C 8024183C 2403FFFB */ addiu $v1, $zero, -5 -/* D1A020 80241840 00431024 */ and $v0, $v0, $v1 -/* D1A024 80241844 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241848: -/* D1A028 80241848 8E430070 */ lw $v1, 0x70($s2) -/* D1A02C 8024184C 2410000B */ addiu $s0, $zero, 0xb -/* D1A030 80241850 1070002A */ beq $v1, $s0, .L802418FC -/* D1A034 80241854 2862000C */ slti $v0, $v1, 0xc -/* D1A038 80241858 1040000D */ beqz $v0, .L80241890 -/* D1A03C 8024185C 24020001 */ addiu $v0, $zero, 1 -/* D1A040 80241860 1062001A */ beq $v1, $v0, .L802418CC -/* D1A044 80241864 28620002 */ slti $v0, $v1, 2 -/* D1A048 80241868 10400005 */ beqz $v0, .L80241880 -/* D1A04C 8024186C 2402000A */ addiu $v0, $zero, 0xa -/* D1A050 80241870 10600013 */ beqz $v1, .L802418C0 -/* D1A054 80241874 0240202D */ daddu $a0, $s2, $zero -/* D1A058 80241878 0809065F */ j .L8024197C -/* D1A05C 8024187C 00000000 */ nop -.L80241880: -/* D1A060 80241880 10620018 */ beq $v1, $v0, .L802418E4 -/* D1A064 80241884 0240202D */ daddu $a0, $s2, $zero -/* D1A068 80241888 0809065F */ j .L8024197C -/* D1A06C 8024188C 00000000 */ nop -.L80241890: -/* D1A070 80241890 2402000D */ addiu $v0, $zero, 0xd -/* D1A074 80241894 10620029 */ beq $v1, $v0, .L8024193C -/* D1A078 80241898 0062102A */ slt $v0, $v1, $v0 -/* D1A07C 8024189C 14400020 */ bnez $v0, .L80241920 -/* D1A080 802418A0 0240202D */ daddu $a0, $s2, $zero -/* D1A084 802418A4 2402000E */ addiu $v0, $zero, 0xe -/* D1A088 802418A8 1062002D */ beq $v1, $v0, .L80241960 -/* D1A08C 802418AC 24020063 */ addiu $v0, $zero, 0x63 -/* D1A090 802418B0 10620030 */ beq $v1, $v0, .L80241974 -/* D1A094 802418B4 00000000 */ nop -/* D1A098 802418B8 0809065F */ j .L8024197C -/* D1A09C 802418BC 00000000 */ nop -.L802418C0: -/* D1A0A0 802418C0 0260282D */ daddu $a1, $s3, $zero -/* D1A0A4 802418C4 0C090234 */ jal func_802408D0 -/* D1A0A8 802418C8 0280302D */ daddu $a2, $s4, $zero -.L802418CC: -/* D1A0AC 802418CC 0240202D */ daddu $a0, $s2, $zero -/* D1A0B0 802418D0 0260282D */ daddu $a1, $s3, $zero -/* D1A0B4 802418D4 0C09024F */ jal func_8024093C -/* D1A0B8 802418D8 0280302D */ daddu $a2, $s4, $zero -/* D1A0BC 802418DC 0809065F */ j .L8024197C -/* D1A0C0 802418E0 00000000 */ nop -.L802418E4: -/* D1A0C4 802418E4 0260282D */ daddu $a1, $s3, $zero -/* D1A0C8 802418E8 0C09028E */ jal func_80240A38 -/* D1A0CC 802418EC 0280302D */ daddu $a2, $s4, $zero -/* D1A0D0 802418F0 8E420070 */ lw $v0, 0x70($s2) -/* D1A0D4 802418F4 14500021 */ bne $v0, $s0, .L8024197C -/* D1A0D8 802418F8 00000000 */ nop -.L802418FC: -/* D1A0DC 802418FC 0240202D */ daddu $a0, $s2, $zero -/* D1A0E0 80241900 0260282D */ daddu $a1, $s3, $zero -/* D1A0E4 80241904 0C09051E */ jal func_80241478 -/* D1A0E8 80241908 0280302D */ daddu $a2, $s4, $zero -/* D1A0EC 8024190C 8E430070 */ lw $v1, 0x70($s2) -/* D1A0F0 80241910 2402000C */ addiu $v0, $zero, 0xc -/* D1A0F4 80241914 14620019 */ bne $v1, $v0, .L8024197C -/* D1A0F8 80241918 00000000 */ nop -/* D1A0FC 8024191C 0240202D */ daddu $a0, $s2, $zero -.L80241920: -/* D1A100 80241920 0260282D */ daddu $a1, $s3, $zero -/* D1A104 80241924 0C090542 */ jal func_80241508 -/* D1A108 80241928 0280302D */ daddu $a2, $s4, $zero -/* D1A10C 8024192C 8E430070 */ lw $v1, 0x70($s2) -/* D1A110 80241930 2402000D */ addiu $v0, $zero, 0xd -/* D1A114 80241934 14620011 */ bne $v1, $v0, .L8024197C -/* D1A118 80241938 00000000 */ nop -.L8024193C: -/* D1A11C 8024193C 0240202D */ daddu $a0, $s2, $zero -/* D1A120 80241940 0260282D */ daddu $a1, $s3, $zero -/* D1A124 80241944 0C090582 */ jal func_80241608 -/* D1A128 80241948 0280302D */ daddu $a2, $s4, $zero -/* D1A12C 8024194C 8E430070 */ lw $v1, 0x70($s2) -/* D1A130 80241950 2402000E */ addiu $v0, $zero, 0xe -/* D1A134 80241954 14620009 */ bne $v1, $v0, .L8024197C -/* D1A138 80241958 00000000 */ nop -/* D1A13C 8024195C 0240202D */ daddu $a0, $s2, $zero -.L80241960: -/* D1A140 80241960 0260282D */ daddu $a1, $s3, $zero -/* D1A144 80241964 0C09059A */ jal func_80241668 -/* D1A148 80241968 0280302D */ daddu $a2, $s4, $zero -/* D1A14C 8024196C 0809065F */ j .L8024197C -/* D1A150 80241970 00000000 */ nop -.L80241974: -/* D1A154 80241974 0C0129CF */ jal func_8004A73C -/* D1A158 80241978 0240202D */ daddu $a0, $s2, $zero -.L8024197C: -/* D1A15C 8024197C 8FBF0048 */ lw $ra, 0x48($sp) -/* D1A160 80241980 8FB50044 */ lw $s5, 0x44($sp) -/* D1A164 80241984 8FB40040 */ lw $s4, 0x40($sp) -/* D1A168 80241988 8FB3003C */ lw $s3, 0x3c($sp) -/* D1A16C 8024198C 8FB20038 */ lw $s2, 0x38($sp) -/* D1A170 80241990 8FB10034 */ lw $s1, 0x34($sp) -/* D1A174 80241994 8FB00030 */ lw $s0, 0x30($sp) -/* D1A178 80241998 0000102D */ daddu $v0, $zero, $zero -/* D1A17C 8024199C 03E00008 */ jr $ra -/* D1A180 802419A0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_05/func_80241D20_D187E0.s b/asm/nonmatchings/world/area_sam/sam_05/func_80241D20_D187E0.s deleted file mode 100644 index e9b6d146ea..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/func_80241D20_D187E0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D20_D1A500 -/* D1A500 80241D20 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* D1A504 80241D24 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* D1A508 80241D28 90420012 */ lbu $v0, 0x12($v0) -/* D1A50C 80241D2C 000211C2 */ srl $v0, $v0, 7 -/* D1A510 80241D30 03E00008 */ jr $ra -/* D1A514 80241D34 00021040 */ sll $v0, $v0, 1 -/* D1A518 80241D38 00000000 */ nop -/* D1A51C 80241D3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_05/update_starpoints_display_D187E0.s b/asm/nonmatchings/world/area_sam/sam_05/update_starpoints_display_D187E0.s deleted file mode 100644 index 473a53e3bc..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/update_starpoints_display_D187E0.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_starpoints_display_D18B9C -/* D18B9C 802403BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D18BA0 802403C0 AFB40028 */ sw $s4, 0x28($sp) -/* D18BA4 802403C4 0080A02D */ daddu $s4, $a0, $zero -/* D18BA8 802403C8 AFBF002C */ sw $ra, 0x2c($sp) -/* D18BAC 802403CC AFB30024 */ sw $s3, 0x24($sp) -/* D18BB0 802403D0 AFB20020 */ sw $s2, 0x20($sp) -/* D18BB4 802403D4 AFB1001C */ sw $s1, 0x1c($sp) -/* D18BB8 802403D8 AFB00018 */ sw $s0, 0x18($sp) -/* D18BBC 802403DC 8E910148 */ lw $s1, 0x148($s4) -/* D18BC0 802403E0 86240008 */ lh $a0, 8($s1) -/* D18BC4 802403E4 0C00EABB */ jal get_npc_unsafe -/* D18BC8 802403E8 00A0802D */ daddu $s0, $a1, $zero -/* D18BCC 802403EC 16000005 */ bnez $s0, .L80240404 -/* D18BD0 802403F0 0040902D */ daddu $s2, $v0, $zero -/* D18BD4 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) -/* D18BD8 802403F8 30420004 */ andi $v0, $v0, 4 -/* D18BDC 802403FC 10400015 */ beqz $v0, .L80240454 -/* D18BE0 80240400 00000000 */ nop -.L80240404: -/* D18BE4 80240404 AE800070 */ sw $zero, 0x70($s4) -/* D18BE8 80240408 8E420000 */ lw $v0, ($s2) -/* D18BEC 8024040C 3C031F30 */ lui $v1, 0x1f30 -/* D18BF0 80240410 A640008E */ sh $zero, 0x8e($s2) -/* D18BF4 80240414 34420102 */ ori $v0, $v0, 0x102 -/* D18BF8 80240418 AE420000 */ sw $v0, ($s2) -/* D18BFC 8024041C 8E220000 */ lw $v0, ($s1) -/* D18C00 80240420 3C01C47A */ lui $at, 0xc47a -/* D18C04 80240424 44810000 */ mtc1 $at, $f0 -/* D18C08 80240428 00431025 */ or $v0, $v0, $v1 -/* D18C0C 8024042C AE220000 */ sw $v0, ($s1) -/* D18C10 80240430 AE400038 */ sw $zero, 0x38($s2) -/* D18C14 80240434 E640003C */ swc1 $f0, 0x3c($s2) -/* D18C18 80240438 AE400040 */ sw $zero, 0x40($s2) -/* D18C1C 8024043C 8E2300B0 */ lw $v1, 0xb0($s1) -/* D18C20 80240440 30620004 */ andi $v0, $v1, 4 -/* D18C24 80240444 10400003 */ beqz $v0, .L80240454 -/* D18C28 80240448 2402FFFB */ addiu $v0, $zero, -5 -/* D18C2C 8024044C 00621024 */ and $v0, $v1, $v0 -/* D18C30 80240450 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240454: -/* D18C34 80240454 8E930070 */ lw $s3, 0x70($s4) -/* D18C38 80240458 12600005 */ beqz $s3, .L80240470 -/* D18C3C 8024045C 24020001 */ addiu $v0, $zero, 1 -/* D18C40 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* D18C44 80240464 00000000 */ nop -/* D18C48 80240468 0809017E */ j .L802405F8 -/* D18C4C 8024046C 00000000 */ nop -.L80240470: -/* D18C50 80240470 86240008 */ lh $a0, 8($s1) -/* D18C54 80240474 0C00FB3A */ jal get_enemy -/* D18C58 80240478 2484FFFF */ addiu $a0, $a0, -1 -/* D18C5C 8024047C 0040802D */ daddu $s0, $v0, $zero -/* D18C60 80240480 0C00EABB */ jal get_npc_unsafe -/* D18C64 80240484 86040008 */ lh $a0, 8($s0) -/* D18C68 80240488 24030001 */ addiu $v1, $zero, 1 -/* D18C6C 8024048C 0040982D */ daddu $s3, $v0, $zero -/* D18C70 80240490 A2230007 */ sb $v1, 7($s1) -/* D18C74 80240494 8E03006C */ lw $v1, 0x6c($s0) -/* D18C78 80240498 24020003 */ addiu $v0, $zero, 3 -/* D18C7C 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* D18C80 802404A0 00000000 */ nop -/* D18C84 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) -/* D18C88 802404A8 10A00003 */ beqz $a1, .L802404B8 -/* D18C8C 802404AC 0260202D */ daddu $a0, $s3, $zero -/* D18C90 802404B0 0C012530 */ jal func_800494C0 -/* D18C94 802404B4 0000302D */ daddu $a2, $zero, $zero -.L802404B8: -/* D18C98 802404B8 27A40010 */ addiu $a0, $sp, 0x10 -/* D18C9C 802404BC C6280070 */ lwc1 $f8, 0x70($s1) -/* D18CA0 802404C0 46804220 */ cvt.s.w $f8, $f8 -/* D18CA4 802404C4 C6620034 */ lwc1 $f2, 0x34($s3) -/* D18CA8 802404C8 3C014387 */ lui $at, 0x4387 -/* D18CAC 802404CC 44810000 */ mtc1 $at, $f0 -/* D18CB0 802404D0 44064000 */ mfc1 $a2, $f8 -/* D18CB4 802404D4 46020001 */ sub.s $f0, $f0, $f2 -/* D18CB8 802404D8 C6660038 */ lwc1 $f6, 0x38($s3) -/* D18CBC 802404DC C6640040 */ lwc1 $f4, 0x40($s3) -/* D18CC0 802404E0 44070000 */ mfc1 $a3, $f0 -/* D18CC4 802404E4 27A50014 */ addiu $a1, $sp, 0x14 -/* D18CC8 802404E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* D18CCC 802404EC 0C00A7E7 */ jal add_vec2D_polar -/* D18CD0 802404F0 E7A40014 */ swc1 $f4, 0x14($sp) -/* D18CD4 802404F4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* D18CD8 802404F8 4600020D */ trunc.w.s $f8, $f0 -/* D18CDC 802404FC 44024000 */ mfc1 $v0, $f8 -/* D18CE0 80240500 E6400038 */ swc1 $f0, 0x38($s2) -/* D18CE4 80240504 A6220010 */ sh $v0, 0x10($s1) -/* D18CE8 80240508 C660003C */ lwc1 $f0, 0x3c($s3) -/* D18CEC 8024050C C622006C */ lwc1 $f2, 0x6c($s1) -/* D18CF0 80240510 468010A0 */ cvt.s.w $f2, $f2 -/* D18CF4 80240514 46020000 */ add.s $f0, $f0, $f2 -/* D18CF8 80240518 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* D18CFC 8024051C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* D18D00 80240520 E640003C */ swc1 $f0, 0x3c($s2) -/* D18D04 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) -/* D18D08 80240528 4600020D */ trunc.w.s $f8, $f0 -/* D18D0C 8024052C 44024000 */ mfc1 $v0, $f8 -/* D18D10 80240530 00000000 */ nop -/* D18D14 80240534 A6220012 */ sh $v0, 0x12($s1) -/* D18D18 80240538 4600120D */ trunc.w.s $f8, $f2 -/* D18D1C 8024053C 44024000 */ mfc1 $v0, $f8 -/* D18D20 80240540 E6420040 */ swc1 $f2, 0x40($s2) -/* D18D24 80240544 A6220014 */ sh $v0, 0x14($s1) -/* D18D28 80240548 8C660028 */ lw $a2, 0x28($v1) -/* D18D2C 8024054C 8C670030 */ lw $a3, 0x30($v1) -/* D18D30 80240550 C64C0038 */ lwc1 $f12, 0x38($s2) -/* D18D34 80240554 0C00A720 */ jal atan2 -/* D18D38 80240558 C64E0040 */ lwc1 $f14, 0x40($s2) -/* D18D3C 8024055C 3C03E0EF */ lui $v1, 0xe0ef -/* D18D40 80240560 E640000C */ swc1 $f0, 0xc($s2) -/* D18D44 80240564 8E220000 */ lw $v0, ($s1) -/* D18D48 80240568 3463FFFF */ ori $v1, $v1, 0xffff -/* D18D4C 8024056C 00431024 */ and $v0, $v0, $v1 -/* D18D50 80240570 AE220000 */ sw $v0, ($s1) -/* D18D54 80240574 24020001 */ addiu $v0, $zero, 1 -/* D18D58 80240578 A640008E */ sh $zero, 0x8e($s2) -/* D18D5C 8024057C 0809017E */ j .L802405F8 -/* D18D60 80240580 AE820070 */ sw $v0, 0x70($s4) -.L80240584: -/* D18D64 80240584 86240008 */ lh $a0, 8($s1) -/* D18D68 80240588 0C00FB3A */ jal get_enemy -/* D18D6C 8024058C 2484FFFF */ addiu $a0, $a0, -1 -/* D18D70 80240590 0040802D */ daddu $s0, $v0, $zero -/* D18D74 80240594 0C00EABB */ jal get_npc_unsafe -/* D18D78 80240598 86040008 */ lh $a0, 8($s0) -/* D18D7C 8024059C 9642008E */ lhu $v0, 0x8e($s2) -/* D18D80 802405A0 24420001 */ addiu $v0, $v0, 1 -/* D18D84 802405A4 A642008E */ sh $v0, 0x8e($s2) -/* D18D88 802405A8 00021400 */ sll $v0, $v0, 0x10 -/* D18D8C 802405AC 8E23007C */ lw $v1, 0x7c($s1) -/* D18D90 802405B0 00021403 */ sra $v0, $v0, 0x10 -/* D18D94 802405B4 0043102A */ slt $v0, $v0, $v1 -/* D18D98 802405B8 50400001 */ beql $v0, $zero, .L802405C0 -/* D18D9C 802405BC A2200007 */ sb $zero, 7($s1) -.L802405C0: -/* D18DA0 802405C0 8E03006C */ lw $v1, 0x6c($s0) -/* D18DA4 802405C4 24020004 */ addiu $v0, $zero, 4 -/* D18DA8 802405C8 1462000B */ bne $v1, $v0, .L802405F8 -/* D18DAC 802405CC 3C021F10 */ lui $v0, 0x1f10 -/* D18DB0 802405D0 8E230000 */ lw $v1, ($s1) -/* D18DB4 802405D4 3C01C47A */ lui $at, 0xc47a -/* D18DB8 802405D8 44810000 */ mtc1 $at, $f0 -/* D18DBC 802405DC 00621825 */ or $v1, $v1, $v0 -/* D18DC0 802405E0 AE230000 */ sw $v1, ($s1) -/* D18DC4 802405E4 AE400038 */ sw $zero, 0x38($s2) -/* D18DC8 802405E8 E640003C */ swc1 $f0, 0x3c($s2) -/* D18DCC 802405EC AE400040 */ sw $zero, 0x40($s2) -/* D18DD0 802405F0 A2330007 */ sb $s3, 7($s1) -/* D18DD4 802405F4 AE800070 */ sw $zero, 0x70($s4) -.L802405F8: -/* D18DD8 802405F8 8FBF002C */ lw $ra, 0x2c($sp) -/* D18DDC 802405FC 8FB40028 */ lw $s4, 0x28($sp) -/* D18DE0 80240600 8FB30024 */ lw $s3, 0x24($sp) -/* D18DE4 80240604 8FB20020 */ lw $s2, 0x20($sp) -/* D18DE8 80240608 8FB1001C */ lw $s1, 0x1c($sp) -/* D18DEC 8024060C 8FB00018 */ lw $s0, 0x18($sp) -/* D18DF0 80240610 0000102D */ daddu $v0, $zero, $zero -/* D18DF4 80240614 03E00008 */ jr $ra -/* D18DF8 80240618 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_80240124_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_80240124_D1FE90.s deleted file mode 100644 index 614cd1acf8..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_80240124_D1FE90.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_D1FFB4 -/* D1FFB4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D1FFB8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* D1FFBC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* D1FFC0 80240130 10A00005 */ beqz $a1, .L80240148 -/* D1FFC4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* D1FFC8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* D1FFCC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* D1FFD0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* D1FFD4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* D1FFD8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* D1FFDC 8024014C 1440000E */ bnez $v0, .L80240188 -/* D1FFE0 80240150 00000000 */ nop -/* D1FFE4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* D1FFE8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* D1FFEC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* D1FFF0 80240160 04610004 */ bgez $v1, .L80240174 -/* D1FFF4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* D1FFF8 80240168 3C020002 */ lui $v0, 2 -/* D1FFFC 8024016C 08090061 */ j .L80240184 -/* D20000 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* D20004 80240174 3C040002 */ lui $a0, 2 -/* D20008 80240178 0083102A */ slt $v0, $a0, $v1 -/* D2000C 8024017C 10400002 */ beqz $v0, .L80240188 -/* D20010 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* D20014 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* D20018 80240188 8E020074 */ lw $v0, 0x74($s0) -/* D2001C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* D20020 80240190 00000000 */ nop -/* D20024 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* D20028 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* D2002C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* D20030 802401A0 04610004 */ bgez $v1, .L802401B4 -/* D20034 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* D20038 802401A8 3C020002 */ lui $v0, 2 -/* D2003C 802401AC 08090071 */ j .L802401C4 -/* D20040 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* D20044 802401B4 3C040002 */ lui $a0, 2 -/* D20048 802401B8 0083102A */ slt $v0, $a0, $v1 -/* D2004C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* D20050 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* D20054 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* D20058 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* D2005C 802401CC 1440000E */ bnez $v0, .L80240208 -/* D20060 802401D0 00000000 */ nop -/* D20064 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* D20068 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* D2006C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* D20070 802401E0 04610004 */ bgez $v1, .L802401F4 -/* D20074 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* D20078 802401E8 3C020002 */ lui $v0, 2 -/* D2007C 802401EC 08090081 */ j .L80240204 -/* D20080 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* D20084 802401F4 3C040002 */ lui $a0, 2 -/* D20088 802401F8 0083102A */ slt $v0, $a0, $v1 -/* D2008C 802401FC 10400002 */ beqz $v0, .L80240208 -/* D20090 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* D20094 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* D20098 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* D2009C 8024020C 1440000E */ bnez $v0, .L80240248 -/* D200A0 80240210 00000000 */ nop -/* D200A4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* D200A8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* D200AC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* D200B0 80240220 04610004 */ bgez $v1, .L80240234 -/* D200B4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* D200B8 80240228 3C020002 */ lui $v0, 2 -/* D200BC 8024022C 08090091 */ j .L80240244 -/* D200C0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* D200C4 80240234 3C040002 */ lui $a0, 2 -/* D200C8 80240238 0083102A */ slt $v0, $a0, $v1 -/* D200CC 8024023C 10400002 */ beqz $v0, .L80240248 -/* D200D0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* D200D4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* D200D8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* D200DC 8024024C 0C046F07 */ jal set_main_pan_u -/* D200E0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* D200E4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* D200E8 80240258 0C046F0D */ jal set_main_pan_v -/* D200EC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* D200F0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* D200F4 80240264 0C046F13 */ jal set_aux_pan_u -/* D200F8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* D200FC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* D20100 80240270 0C046F19 */ jal set_aux_pan_v -/* D20104 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* D20108 80240278 8E020070 */ lw $v0, 0x70($s0) -/* D2010C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* D20110 80240280 8E040098 */ lw $a0, 0x98($s0) -/* D20114 80240284 24420001 */ addiu $v0, $v0, 1 -/* D20118 80240288 AE020070 */ sw $v0, 0x70($s0) -/* D2011C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* D20120 80240290 24630001 */ addiu $v1, $v1, 1 -/* D20124 80240294 AE030078 */ sw $v1, 0x78($s0) -/* D20128 80240298 8E030070 */ lw $v1, 0x70($s0) -/* D2012C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* D20130 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* D20134 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* D20138 802402A8 0064182A */ slt $v1, $v1, $a0 -/* D2013C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* D20140 802402B0 14600002 */ bnez $v1, .L802402BC -/* D20144 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* D20148 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* D2014C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* D20150 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* D20154 802402C4 0043102A */ slt $v0, $v0, $v1 -/* D20158 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* D2015C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* D20160 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* D20164 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* D20168 802402D8 0043102A */ slt $v0, $v0, $v1 -/* D2016C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* D20170 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* D20174 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* D20178 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* D2017C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* D20180 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* D20184 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* D20188 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* D2018C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* D20190 80240300 0000102D */ daddu $v0, $zero, $zero -/* D20194 80240304 03E00008 */ jr $ra -/* D20198 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_8024030C_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_8024030C_D1FE90.s deleted file mode 100644 index 0a987824e0..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_8024030C_D1FE90.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_D2019C -/* D2019C 8024030C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D201A0 80240310 F7B40018 */ sdc1 $f20, 0x18($sp) -/* D201A4 80240314 4485A000 */ mtc1 $a1, $f20 -/* D201A8 80240318 F7B60020 */ sdc1 $f22, 0x20($sp) -/* D201AC 8024031C 4486B000 */ mtc1 $a2, $f22 -/* D201B0 80240320 AFB00010 */ sw $s0, 0x10($sp) -/* D201B4 80240324 F7B80028 */ sdc1 $f24, 0x28($sp) -/* D201B8 80240328 4487C000 */ mtc1 $a3, $f24 -/* D201BC 8024032C AFBF0014 */ sw $ra, 0x14($sp) -/* D201C0 80240330 0C019D28 */ jal guMtxIdentF -/* D201C4 80240334 0080802D */ daddu $s0, $a0, $zero -/* D201C8 80240338 4616A582 */ mul.s $f22, $f20, $f22 -/* D201CC 8024033C 00000000 */ nop -/* D201D0 80240340 4618A502 */ mul.s $f20, $f20, $f24 -/* D201D4 80240344 00000000 */ nop -/* D201D8 80240348 3C013F80 */ lui $at, 0x3f80 -/* D201DC 8024034C 44810000 */ mtc1 $at, $f0 -/* D201E0 80240350 00000000 */ nop -/* D201E4 80240354 E6000014 */ swc1 $f0, 0x14($s0) -/* D201E8 80240358 E6160010 */ swc1 $f22, 0x10($s0) -/* D201EC 8024035C E6140018 */ swc1 $f20, 0x18($s0) -/* D201F0 80240360 8FBF0014 */ lw $ra, 0x14($sp) -/* D201F4 80240364 8FB00010 */ lw $s0, 0x10($sp) -/* D201F8 80240368 D7B80028 */ ldc1 $f24, 0x28($sp) -/* D201FC 8024036C D7B60020 */ ldc1 $f22, 0x20($sp) -/* D20200 80240370 D7B40018 */ ldc1 $f20, 0x18($sp) -/* D20204 80240374 03E00008 */ jr $ra -/* D20208 80240378 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_8024037C_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_8024037C_D1FE90.s deleted file mode 100644 index 6cd7270bbf..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_8024037C_D1FE90.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024037C_D2020C -/* D2020C 8024037C 27BDFF78 */ addiu $sp, $sp, -0x88 -/* D20210 80240380 AFB10054 */ sw $s1, 0x54($sp) -/* D20214 80240384 0080882D */ daddu $s1, $a0, $zero -/* D20218 80240388 AFBF005C */ sw $ra, 0x5c($sp) -/* D2021C 8024038C AFB20058 */ sw $s2, 0x58($sp) -/* D20220 80240390 AFB00050 */ sw $s0, 0x50($sp) -/* D20224 80240394 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* D20228 80240398 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* D2022C 8024039C F7B80070 */ sdc1 $f24, 0x70($sp) -/* D20230 802403A0 F7B60068 */ sdc1 $f22, 0x68($sp) -/* D20234 802403A4 F7B40060 */ sdc1 $f20, 0x60($sp) -/* D20238 802403A8 8E30000C */ lw $s0, 0xc($s1) -/* D2023C 802403AC 8E050000 */ lw $a1, ($s0) -/* D20240 802403B0 0C0B1EAF */ jal get_variable -/* D20244 802403B4 26100004 */ addiu $s0, $s0, 4 -/* D20248 802403B8 0C046C04 */ jal get_model_list_index_from_tree_index -/* D2024C 802403BC 0040202D */ daddu $a0, $v0, $zero -/* D20250 802403C0 8E050000 */ lw $a1, ($s0) -/* D20254 802403C4 26100004 */ addiu $s0, $s0, 4 -/* D20258 802403C8 0220202D */ daddu $a0, $s1, $zero -/* D2025C 802403CC 0C0B210B */ jal get_float_variable -/* D20260 802403D0 0040902D */ daddu $s2, $v0, $zero -/* D20264 802403D4 8E050000 */ lw $a1, ($s0) -/* D20268 802403D8 26100004 */ addiu $s0, $s0, 4 -/* D2026C 802403DC 0220202D */ daddu $a0, $s1, $zero -/* D20270 802403E0 0C0B210B */ jal get_float_variable -/* D20274 802403E4 46000706 */ mov.s $f28, $f0 -/* D20278 802403E8 8E050000 */ lw $a1, ($s0) -/* D2027C 802403EC 26100004 */ addiu $s0, $s0, 4 -/* D20280 802403F0 0220202D */ daddu $a0, $s1, $zero -/* D20284 802403F4 0C0B210B */ jal get_float_variable -/* D20288 802403F8 46000686 */ mov.s $f26, $f0 -/* D2028C 802403FC 0220202D */ daddu $a0, $s1, $zero -/* D20290 80240400 8E050000 */ lw $a1, ($s0) -/* D20294 80240404 0C0B210B */ jal get_float_variable -/* D20298 80240408 46000586 */ mov.s $f22, $f0 -/* D2029C 8024040C 0240202D */ daddu $a0, $s2, $zero -/* D202A0 80240410 0C046B4C */ jal get_model_from_list_index -/* D202A4 80240414 46000606 */ mov.s $f24, $f0 -/* D202A8 80240418 0040882D */ daddu $s1, $v0, $zero -/* D202AC 8024041C 96220000 */ lhu $v0, ($s1) -/* D202B0 80240420 30420400 */ andi $v0, $v0, 0x400 -/* D202B4 80240424 1440001E */ bnez $v0, .L802404A0 -/* D202B8 80240428 26300058 */ addiu $s0, $s1, 0x58 -/* D202BC 8024042C 4480A000 */ mtc1 $zero, $f20 -/* D202C0 80240430 4406B000 */ mfc1 $a2, $f22 -/* D202C4 80240434 4405A000 */ mfc1 $a1, $f20 -/* D202C8 80240438 4407A000 */ mfc1 $a3, $f20 -/* D202CC 8024043C 0C019E40 */ jal guTranslateF -/* D202D0 80240440 0200202D */ daddu $a0, $s0, $zero -/* D202D4 80240444 4405E000 */ mfc1 $a1, $f28 -/* D202D8 80240448 4406D000 */ mfc1 $a2, $f26 -/* D202DC 8024044C 4407C000 */ mfc1 $a3, $f24 -/* D202E0 80240450 0C0900C3 */ jal func_8024030C -/* D202E4 80240454 27A40010 */ addiu $a0, $sp, 0x10 -/* D202E8 80240458 27A40010 */ addiu $a0, $sp, 0x10 -/* D202EC 8024045C 0200282D */ daddu $a1, $s0, $zero -/* D202F0 80240460 0C019D80 */ jal guMtxCatF -/* D202F4 80240464 0200302D */ daddu $a2, $s0, $zero -/* D202F8 80240468 27A40010 */ addiu $a0, $sp, 0x10 -/* D202FC 8024046C 4600B587 */ neg.s $f22, $f22 -/* D20300 80240470 4405A000 */ mfc1 $a1, $f20 -/* D20304 80240474 4406B000 */ mfc1 $a2, $f22 -/* D20308 80240478 0C019E40 */ jal guTranslateF -/* D2030C 8024047C 00A0382D */ daddu $a3, $a1, $zero -/* D20310 80240480 27A40010 */ addiu $a0, $sp, 0x10 -/* D20314 80240484 0200282D */ daddu $a1, $s0, $zero -/* D20318 80240488 0C019D80 */ jal guMtxCatF -/* D2031C 8024048C 00A0302D */ daddu $a2, $a1, $zero -/* D20320 80240490 96220000 */ lhu $v0, ($s1) -/* D20324 80240494 34421400 */ ori $v0, $v0, 0x1400 -/* D20328 80240498 08090146 */ j .L80240518 -/* D2032C 8024049C A6220000 */ sh $v0, ($s1) -.L802404A0: -/* D20330 802404A0 4480A000 */ mtc1 $zero, $f20 -/* D20334 802404A4 4406B000 */ mfc1 $a2, $f22 -/* D20338 802404A8 4405A000 */ mfc1 $a1, $f20 -/* D2033C 802404AC 4407A000 */ mfc1 $a3, $f20 -/* D20340 802404B0 0C019E40 */ jal guTranslateF -/* D20344 802404B4 27A40010 */ addiu $a0, $sp, 0x10 -/* D20348 802404B8 27A40010 */ addiu $a0, $sp, 0x10 -/* D2034C 802404BC 26300058 */ addiu $s0, $s1, 0x58 -/* D20350 802404C0 0200282D */ daddu $a1, $s0, $zero -/* D20354 802404C4 0C019D80 */ jal guMtxCatF -/* D20358 802404C8 0200302D */ daddu $a2, $s0, $zero -/* D2035C 802404CC 4405E000 */ mfc1 $a1, $f28 -/* D20360 802404D0 4406D000 */ mfc1 $a2, $f26 -/* D20364 802404D4 4407C000 */ mfc1 $a3, $f24 -/* D20368 802404D8 0C0900C3 */ jal func_8024030C -/* D2036C 802404DC 27A40010 */ addiu $a0, $sp, 0x10 -/* D20370 802404E0 27A40010 */ addiu $a0, $sp, 0x10 -/* D20374 802404E4 0200282D */ daddu $a1, $s0, $zero -/* D20378 802404E8 0C019D80 */ jal guMtxCatF -/* D2037C 802404EC 0200302D */ daddu $a2, $s0, $zero -/* D20380 802404F0 27A40010 */ addiu $a0, $sp, 0x10 -/* D20384 802404F4 4600B587 */ neg.s $f22, $f22 -/* D20388 802404F8 4405A000 */ mfc1 $a1, $f20 -/* D2038C 802404FC 4406B000 */ mfc1 $a2, $f22 -/* D20390 80240500 0C019E40 */ jal guTranslateF -/* D20394 80240504 00A0382D */ daddu $a3, $a1, $zero -/* D20398 80240508 27A40010 */ addiu $a0, $sp, 0x10 -/* D2039C 8024050C 0200282D */ daddu $a1, $s0, $zero -/* D203A0 80240510 0C019D80 */ jal guMtxCatF -/* D203A4 80240514 00A0302D */ daddu $a2, $a1, $zero -.L80240518: -/* D203A8 80240518 8FBF005C */ lw $ra, 0x5c($sp) -/* D203AC 8024051C 8FB20058 */ lw $s2, 0x58($sp) -/* D203B0 80240520 8FB10054 */ lw $s1, 0x54($sp) -/* D203B4 80240524 8FB00050 */ lw $s0, 0x50($sp) -/* D203B8 80240528 D7BC0080 */ ldc1 $f28, 0x80($sp) -/* D203BC 8024052C D7BA0078 */ ldc1 $f26, 0x78($sp) -/* D203C0 80240530 D7B80070 */ ldc1 $f24, 0x70($sp) -/* D203C4 80240534 D7B60068 */ ldc1 $f22, 0x68($sp) -/* D203C8 80240538 D7B40060 */ ldc1 $f20, 0x60($sp) -/* D203CC 8024053C 24020002 */ addiu $v0, $zero, 2 -/* D203D0 80240540 03E00008 */ jr $ra -/* D203D4 80240544 27BD0088 */ addiu $sp, $sp, 0x88 -/* D203D8 80240548 00000000 */ nop -/* D203DC 8024054C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_80240550_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_80240550_D1FE90.s deleted file mode 100644 index 3b974202d0..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_80240550_D1FE90.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240550_D203E0 -/* D203E0 80240550 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* D203E4 80240554 AFB3002C */ sw $s3, 0x2c($sp) -/* D203E8 80240558 0080982D */ daddu $s3, $a0, $zero -/* D203EC 8024055C AFBF0030 */ sw $ra, 0x30($sp) -/* D203F0 80240560 AFB20028 */ sw $s2, 0x28($sp) -/* D203F4 80240564 AFB10024 */ sw $s1, 0x24($sp) -/* D203F8 80240568 AFB00020 */ sw $s0, 0x20($sp) -/* D203FC 8024056C 8E710148 */ lw $s1, 0x148($s3) -/* D20400 80240570 86240008 */ lh $a0, 8($s1) -/* D20404 80240574 0C00EABB */ jal get_npc_unsafe -/* D20408 80240578 00A0902D */ daddu $s2, $a1, $zero -/* D2040C 8024057C 8E440004 */ lw $a0, 4($s2) -/* D20410 80240580 0040802D */ daddu $s0, $v0, $zero -/* D20414 80240584 00041FC2 */ srl $v1, $a0, 0x1f -/* D20418 80240588 00832021 */ addu $a0, $a0, $v1 -/* D2041C 8024058C 00042043 */ sra $a0, $a0, 1 -/* D20420 80240590 0C00A67F */ jal rand_int -/* D20424 80240594 24840001 */ addiu $a0, $a0, 1 -/* D20428 80240598 8E430004 */ lw $v1, 4($s2) -/* D2042C 8024059C 000327C2 */ srl $a0, $v1, 0x1f -/* D20430 802405A0 00641821 */ addu $v1, $v1, $a0 -/* D20434 802405A4 00031843 */ sra $v1, $v1, 1 -/* D20438 802405A8 00621821 */ addu $v1, $v1, $v0 -/* D2043C 802405AC A603008E */ sh $v1, 0x8e($s0) -/* D20440 802405B0 8E2300D0 */ lw $v1, 0xd0($s1) -/* D20444 802405B4 C6000040 */ lwc1 $f0, 0x40($s0) -/* D20448 802405B8 C4640000 */ lwc1 $f4, ($v1) -/* D2044C 802405BC 46802120 */ cvt.s.w $f4, $f4 -/* D20450 802405C0 C4620008 */ lwc1 $f2, 8($v1) -/* D20454 802405C4 468010A0 */ cvt.s.w $f2, $f2 -/* D20458 802405C8 E7A00010 */ swc1 $f0, 0x10($sp) -/* D2045C 802405CC 8E2200D0 */ lw $v0, 0xd0($s1) -/* D20460 802405D0 44061000 */ mfc1 $a2, $f2 -/* D20464 802405D4 C440000C */ lwc1 $f0, 0xc($v0) -/* D20468 802405D8 46800020 */ cvt.s.w $f0, $f0 -/* D2046C 802405DC E7A00014 */ swc1 $f0, 0x14($sp) -/* D20470 802405E0 8E2200D0 */ lw $v0, 0xd0($s1) -/* D20474 802405E4 44052000 */ mfc1 $a1, $f4 -/* D20478 802405E8 C4400010 */ lwc1 $f0, 0x10($v0) -/* D2047C 802405EC 46800020 */ cvt.s.w $f0, $f0 -/* D20480 802405F0 E7A00018 */ swc1 $f0, 0x18($sp) -/* D20484 802405F4 8C640018 */ lw $a0, 0x18($v1) -/* D20488 802405F8 0C0123F5 */ jal is_point_within_region -/* D2048C 802405FC 8E070038 */ lw $a3, 0x38($s0) -/* D20490 80240600 1040000E */ beqz $v0, .L8024063C -/* D20494 80240604 00000000 */ nop -/* D20498 80240608 8E2200D0 */ lw $v0, 0xd0($s1) -/* D2049C 8024060C C60C0038 */ lwc1 $f12, 0x38($s0) -/* D204A0 80240610 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D204A4 80240614 C4460000 */ lwc1 $f6, ($v0) -/* D204A8 80240618 468031A0 */ cvt.s.w $f6, $f6 -/* D204AC 8024061C 44063000 */ mfc1 $a2, $f6 -/* D204B0 80240620 C4460008 */ lwc1 $f6, 8($v0) -/* D204B4 80240624 468031A0 */ cvt.s.w $f6, $f6 -/* D204B8 80240628 44073000 */ mfc1 $a3, $f6 -/* D204BC 8024062C 0C00A720 */ jal atan2 -/* D204C0 80240630 00000000 */ nop -/* D204C4 80240634 0809019B */ j .L8024066C -/* D204C8 80240638 E600000C */ swc1 $f0, 0xc($s0) -.L8024063C: -/* D204CC 8024063C 0C00A67F */ jal rand_int -/* D204D0 80240640 2404003C */ addiu $a0, $zero, 0x3c -/* D204D4 80240644 C60C000C */ lwc1 $f12, 0xc($s0) -/* D204D8 80240648 44820000 */ mtc1 $v0, $f0 -/* D204DC 8024064C 00000000 */ nop -/* D204E0 80240650 46800020 */ cvt.s.w $f0, $f0 -/* D204E4 80240654 46006300 */ add.s $f12, $f12, $f0 -/* D204E8 80240658 3C0141F0 */ lui $at, 0x41f0 -/* D204EC 8024065C 44810000 */ mtc1 $at, $f0 -/* D204F0 80240660 0C00A6C9 */ jal clamp_angle -/* D204F4 80240664 46006301 */ sub.s $f12, $f12, $f0 -/* D204F8 80240668 E600000C */ swc1 $f0, 0xc($s0) -.L8024066C: -/* D204FC 8024066C 8E2200CC */ lw $v0, 0xcc($s1) -/* D20500 80240670 8C420004 */ lw $v0, 4($v0) -/* D20504 80240674 AE020028 */ sw $v0, 0x28($s0) -/* D20508 80240678 AE600074 */ sw $zero, 0x74($s3) -/* D2050C 8024067C 8E2200D0 */ lw $v0, 0xd0($s1) -/* D20510 80240680 8C420014 */ lw $v0, 0x14($v0) -/* D20514 80240684 04410004 */ bgez $v0, .L80240698 -/* D20518 80240688 00000000 */ nop -/* D2051C 8024068C C6400000 */ lwc1 $f0, ($s2) -/* D20520 80240690 080901AE */ j .L802406B8 -/* D20524 80240694 E6000018 */ swc1 $f0, 0x18($s0) -.L80240698: -/* D20528 80240698 3C018025 */ lui $at, 0x8025 -/* D2052C 8024069C D422BE40 */ ldc1 $f2, -0x41c0($at) -/* D20530 802406A0 44820000 */ mtc1 $v0, $f0 -/* D20534 802406A4 00000000 */ nop -/* D20538 802406A8 46800021 */ cvt.d.w $f0, $f0 -/* D2053C 802406AC 46220003 */ div.d $f0, $f0, $f2 -/* D20540 802406B0 46200020 */ cvt.s.d $f0, $f0 -/* D20544 802406B4 E6000018 */ swc1 $f0, 0x18($s0) -.L802406B8: -/* D20548 802406B8 C600003C */ lwc1 $f0, 0x3c($s0) -/* D2054C 802406BC 3C014059 */ lui $at, 0x4059 -/* D20550 802406C0 44811800 */ mtc1 $at, $f3 -/* D20554 802406C4 44801000 */ mtc1 $zero, $f2 -/* D20558 802406C8 46000021 */ cvt.d.s $f0, $f0 -/* D2055C 802406CC 46220002 */ mul.d $f0, $f0, $f2 -/* D20560 802406D0 00000000 */ nop -/* D20564 802406D4 24020001 */ addiu $v0, $zero, 1 -/* D20568 802406D8 4620018D */ trunc.w.d $f6, $f0 -/* D2056C 802406DC E626007C */ swc1 $f6, 0x7c($s1) -/* D20570 802406E0 AE620070 */ sw $v0, 0x70($s3) -/* D20574 802406E4 8FBF0030 */ lw $ra, 0x30($sp) -/* D20578 802406E8 8FB3002C */ lw $s3, 0x2c($sp) -/* D2057C 802406EC 8FB20028 */ lw $s2, 0x28($sp) -/* D20580 802406F0 8FB10024 */ lw $s1, 0x24($sp) -/* D20584 802406F4 8FB00020 */ lw $s0, 0x20($sp) -/* D20588 802406F8 03E00008 */ jr $ra -/* D2058C 802406FC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_80240700_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_80240700_D1FE90.s deleted file mode 100644 index 84a09e1e54..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_80240700_D1FE90.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240700_D20590 -/* D20590 80240700 27BDFF80 */ addiu $sp, $sp, -0x80 -/* D20594 80240704 AFB3004C */ sw $s3, 0x4c($sp) -/* D20598 80240708 0080982D */ daddu $s3, $a0, $zero -/* D2059C 8024070C AFBF0058 */ sw $ra, 0x58($sp) -/* D205A0 80240710 AFB50054 */ sw $s5, 0x54($sp) -/* D205A4 80240714 AFB40050 */ sw $s4, 0x50($sp) -/* D205A8 80240718 AFB20048 */ sw $s2, 0x48($sp) -/* D205AC 8024071C AFB10044 */ sw $s1, 0x44($sp) -/* D205B0 80240720 AFB00040 */ sw $s0, 0x40($sp) -/* D205B4 80240724 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* D205B8 80240728 F7B80070 */ sdc1 $f24, 0x70($sp) -/* D205BC 8024072C F7B60068 */ sdc1 $f22, 0x68($sp) -/* D205C0 80240730 F7B40060 */ sdc1 $f20, 0x60($sp) -/* D205C4 80240734 8E710148 */ lw $s1, 0x148($s3) -/* D205C8 80240738 00A0902D */ daddu $s2, $a1, $zero -/* D205CC 8024073C 86240008 */ lh $a0, 8($s1) -/* D205D0 80240740 0C00EABB */ jal get_npc_unsafe -/* D205D4 80240744 00C0A82D */ daddu $s5, $a2, $zero -/* D205D8 80240748 0040802D */ daddu $s0, $v0, $zero -/* D205DC 8024074C 0000A02D */ daddu $s4, $zero, $zero -/* D205E0 80240750 C624007C */ lwc1 $f4, 0x7c($s1) -/* D205E4 80240754 46802120 */ cvt.s.w $f4, $f4 -/* D205E8 80240758 C6220088 */ lwc1 $f2, 0x88($s1) -/* D205EC 8024075C 468010A0 */ cvt.s.w $f2, $f2 -/* D205F0 80240760 460010A1 */ cvt.d.s $f2, $f2 -/* D205F4 80240764 46002121 */ cvt.d.s $f4, $f4 -/* D205F8 80240768 C600003C */ lwc1 $f0, 0x3c($s0) -/* D205FC 8024076C 3C014059 */ lui $at, 0x4059 -/* D20600 80240770 44813800 */ mtc1 $at, $f7 -/* D20604 80240774 44803000 */ mtc1 $zero, $f6 -/* D20608 80240778 46000021 */ cvt.d.s $f0, $f0 -/* D2060C 8024077C 46260002 */ mul.d $f0, $f0, $f6 -/* D20610 80240780 00000000 */ nop -/* D20614 80240784 24020001 */ addiu $v0, $zero, 1 -/* D20618 80240788 8E24006C */ lw $a0, 0x6c($s1) -/* D2061C 8024078C 46261083 */ div.d $f2, $f2, $f6 -/* D20620 80240790 462010A0 */ cvt.s.d $f2, $f2 -/* D20624 80240794 46262103 */ div.d $f4, $f4, $f6 -/* D20628 80240798 46202520 */ cvt.s.d $f20, $f4 -/* D2062C 8024079C 30830011 */ andi $v1, $a0, 0x11 -/* D20630 802407A0 4620020D */ trunc.w.d $f8, $f0 -/* D20634 802407A4 E628007C */ swc1 $f8, 0x7c($s1) -/* D20638 802407A8 C6200078 */ lwc1 $f0, 0x78($s1) -/* D2063C 802407AC 46800020 */ cvt.s.w $f0, $f0 -/* D20640 802407B0 46000021 */ cvt.d.s $f0, $f0 -/* D20644 802407B4 46260003 */ div.d $f0, $f0, $f6 -/* D20648 802407B8 462006A0 */ cvt.s.d $f26, $f0 -/* D2064C 802407BC C6200070 */ lwc1 $f0, 0x70($s1) -/* D20650 802407C0 46800020 */ cvt.s.w $f0, $f0 -/* D20654 802407C4 46000021 */ cvt.d.s $f0, $f0 -/* D20658 802407C8 46260003 */ div.d $f0, $f0, $f6 -/* D2065C 802407CC 462005A0 */ cvt.s.d $f22, $f0 -/* D20660 802407D0 14620025 */ bne $v1, $v0, .L80240868 -/* D20664 802407D4 4602D600 */ add.s $f24, $f26, $f2 -/* D20668 802407D8 8E020000 */ lw $v0, ($s0) -/* D2066C 802407DC 30420008 */ andi $v0, $v0, 8 -/* D20670 802407E0 10400009 */ beqz $v0, .L80240808 -/* D20674 802407E4 27A50028 */ addiu $a1, $sp, 0x28 -/* D20678 802407E8 C600003C */ lwc1 $f0, 0x3c($s0) -/* D2067C 802407EC 4600C001 */ sub.s $f0, $f24, $f0 -/* D20680 802407F0 4600B03C */ c.lt.s $f22, $f0 -/* D20684 802407F4 00000000 */ nop -/* D20688 802407F8 4500001B */ bc1f .L80240868 -/* D2068C 802407FC 34820010 */ ori $v0, $a0, 0x10 -/* D20690 80240800 0809021A */ j .L80240868 -/* D20694 80240804 AE22006C */ sw $v0, 0x6c($s1) -.L80240808: -/* D20698 80240808 27A6002C */ addiu $a2, $sp, 0x2c -/* D2069C 8024080C C6000038 */ lwc1 $f0, 0x38($s0) -/* D206A0 80240810 C602003C */ lwc1 $f2, 0x3c($s0) -/* D206A4 80240814 C6040040 */ lwc1 $f4, 0x40($s0) -/* D206A8 80240818 3C01447A */ lui $at, 0x447a -/* D206AC 8024081C 44813000 */ mtc1 $at, $f6 -/* D206B0 80240820 27A20034 */ addiu $v0, $sp, 0x34 -/* D206B4 80240824 E7A00028 */ swc1 $f0, 0x28($sp) -/* D206B8 80240828 E7A2002C */ swc1 $f2, 0x2c($sp) -/* D206BC 8024082C E7A40030 */ swc1 $f4, 0x30($sp) -/* D206C0 80240830 E7A60034 */ swc1 $f6, 0x34($sp) -/* D206C4 80240834 AFA20010 */ sw $v0, 0x10($sp) -/* D206C8 80240838 8E040080 */ lw $a0, 0x80($s0) -/* D206CC 8024083C 0C0372DF */ jal func_800DCB7C -/* D206D0 80240840 27A70030 */ addiu $a3, $sp, 0x30 -/* D206D4 80240844 C7A00034 */ lwc1 $f0, 0x34($sp) -/* D206D8 80240848 4600D001 */ sub.s $f0, $f26, $f0 -/* D206DC 8024084C 4600B03C */ c.lt.s $f22, $f0 -/* D206E0 80240850 00000000 */ nop -/* D206E4 80240854 45000004 */ bc1f .L80240868 -/* D206E8 80240858 00000000 */ nop -/* D206EC 8024085C 8E22006C */ lw $v0, 0x6c($s1) -/* D206F0 80240860 34420010 */ ori $v0, $v0, 0x10 -/* D206F4 80240864 AE22006C */ sw $v0, 0x6c($s1) -.L80240868: -/* D206F8 80240868 8E22006C */ lw $v0, 0x6c($s1) -/* D206FC 8024086C 24030011 */ addiu $v1, $zero, 0x11 -/* D20700 80240870 30420011 */ andi $v0, $v0, 0x11 -/* D20704 80240874 14430039 */ bne $v0, $v1, .L8024095C -/* D20708 80240878 00000000 */ nop -/* D2070C 8024087C 8E020000 */ lw $v0, ($s0) -/* D20710 80240880 30420008 */ andi $v0, $v0, 8 -/* D20714 80240884 1040000A */ beqz $v0, .L802408B0 -/* D20718 80240888 4600C106 */ mov.s $f4, $f24 -/* D2071C 8024088C 4614C081 */ sub.s $f2, $f24, $f20 -/* D20720 80240890 3C018025 */ lui $at, 0x8025 -/* D20724 80240894 D420BE48 */ ldc1 $f0, -0x41b8($at) -/* D20728 80240898 460010A1 */ cvt.d.s $f2, $f2 -/* D2072C 8024089C 46201082 */ mul.d $f2, $f2, $f0 -/* D20730 802408A0 00000000 */ nop -/* D20734 802408A4 4600A021 */ cvt.d.s $f0, $f20 -/* D20738 802408A8 08090245 */ j .L80240914 -/* D2073C 802408AC 46220000 */ add.d $f0, $f0, $f2 -.L802408B0: -/* D20740 802408B0 27A50028 */ addiu $a1, $sp, 0x28 -/* D20744 802408B4 27A6002C */ addiu $a2, $sp, 0x2c -/* D20748 802408B8 C6000038 */ lwc1 $f0, 0x38($s0) -/* D2074C 802408BC C6020040 */ lwc1 $f2, 0x40($s0) -/* D20750 802408C0 3C01447A */ lui $at, 0x447a -/* D20754 802408C4 44812000 */ mtc1 $at, $f4 -/* D20758 802408C8 27A20034 */ addiu $v0, $sp, 0x34 -/* D2075C 802408CC E7B4002C */ swc1 $f20, 0x2c($sp) -/* D20760 802408D0 E7A00028 */ swc1 $f0, 0x28($sp) -/* D20764 802408D4 E7A20030 */ swc1 $f2, 0x30($sp) -/* D20768 802408D8 E7A40034 */ swc1 $f4, 0x34($sp) -/* D2076C 802408DC AFA20010 */ sw $v0, 0x10($sp) -/* D20770 802408E0 8E040080 */ lw $a0, 0x80($s0) -/* D20774 802408E4 0C0372DF */ jal func_800DCB7C -/* D20778 802408E8 27A70030 */ addiu $a3, $sp, 0x30 -/* D2077C 802408EC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* D20780 802408F0 461A2100 */ add.s $f4, $f4, $f26 -/* D20784 802408F4 46142081 */ sub.s $f2, $f4, $f20 -/* D20788 802408F8 3C018025 */ lui $at, 0x8025 -/* D2078C 802408FC D420BE50 */ ldc1 $f0, -0x41b0($at) -/* D20790 80240900 460010A1 */ cvt.d.s $f2, $f2 -/* D20794 80240904 46201082 */ mul.d $f2, $f2, $f0 -/* D20798 80240908 00000000 */ nop -/* D2079C 8024090C 4600A021 */ cvt.d.s $f0, $f20 -/* D207A0 80240910 46220000 */ add.d $f0, $f0, $f2 -.L80240914: -/* D207A4 80240914 46200020 */ cvt.s.d $f0, $f0 -/* D207A8 80240918 E600003C */ swc1 $f0, 0x3c($s0) -/* D207AC 8024091C C600003C */ lwc1 $f0, 0x3c($s0) -/* D207B0 80240920 46002001 */ sub.s $f0, $f4, $f0 -/* D207B4 80240924 3C013FF0 */ lui $at, 0x3ff0 -/* D207B8 80240928 44811800 */ mtc1 $at, $f3 -/* D207BC 8024092C 44801000 */ mtc1 $zero, $f2 -/* D207C0 80240930 46000005 */ abs.s $f0, $f0 -/* D207C4 80240934 46000021 */ cvt.d.s $f0, $f0 -/* D207C8 80240938 4622003C */ c.lt.d $f0, $f2 -/* D207CC 8024093C 00000000 */ nop -/* D207D0 80240940 45000036 */ bc1f .L80240A1C -/* D207D4 80240944 2403FFEF */ addiu $v1, $zero, -0x11 -/* D207D8 80240948 E604003C */ swc1 $f4, 0x3c($s0) -/* D207DC 8024094C 8E22006C */ lw $v0, 0x6c($s1) -/* D207E0 80240950 00431024 */ and $v0, $v0, $v1 -/* D207E4 80240954 08090287 */ j .L80240A1C -/* D207E8 80240958 AE22006C */ sw $v0, 0x6c($s1) -.L8024095C: -/* D207EC 8024095C 8E220070 */ lw $v0, 0x70($s1) -/* D207F0 80240960 1840002E */ blez $v0, .L80240A1C -/* D207F4 80240964 00000000 */ nop -/* D207F8 80240968 C62C0074 */ lwc1 $f12, 0x74($s1) -/* D207FC 8024096C 0C00A8BB */ jal sin_deg -/* D20800 80240970 46806320 */ cvt.s.w $f12, $f12 -/* D20804 80240974 8E020000 */ lw $v0, ($s0) -/* D20808 80240978 30420008 */ andi $v0, $v0, 8 -/* D2080C 8024097C 10400003 */ beqz $v0, .L8024098C -/* D20810 80240980 46000506 */ mov.s $f20, $f0 -/* D20814 80240984 08090273 */ j .L802409CC -/* D20818 80240988 0000102D */ daddu $v0, $zero, $zero -.L8024098C: -/* D2081C 8024098C 27A50028 */ addiu $a1, $sp, 0x28 -/* D20820 80240990 27A6002C */ addiu $a2, $sp, 0x2c -/* D20824 80240994 C6000038 */ lwc1 $f0, 0x38($s0) -/* D20828 80240998 C602003C */ lwc1 $f2, 0x3c($s0) -/* D2082C 8024099C C6040040 */ lwc1 $f4, 0x40($s0) -/* D20830 802409A0 3C01447A */ lui $at, 0x447a -/* D20834 802409A4 44813000 */ mtc1 $at, $f6 -/* D20838 802409A8 27A20034 */ addiu $v0, $sp, 0x34 -/* D2083C 802409AC E7A00028 */ swc1 $f0, 0x28($sp) -/* D20840 802409B0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* D20844 802409B4 E7A40030 */ swc1 $f4, 0x30($sp) -/* D20848 802409B8 E7A60034 */ swc1 $f6, 0x34($sp) -/* D2084C 802409BC AFA20010 */ sw $v0, 0x10($sp) -/* D20850 802409C0 8E040080 */ lw $a0, 0x80($s0) -/* D20854 802409C4 0C0372DF */ jal func_800DCB7C -/* D20858 802409C8 27A70030 */ addiu $a3, $sp, 0x30 -.L802409CC: -/* D2085C 802409CC 10400007 */ beqz $v0, .L802409EC -/* D20860 802409D0 00000000 */ nop -/* D20864 802409D4 4616A082 */ mul.s $f2, $f20, $f22 -/* D20868 802409D8 00000000 */ nop -/* D2086C 802409DC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* D20870 802409E0 461A0000 */ add.s $f0, $f0, $f26 -/* D20874 802409E4 0809027E */ j .L802409F8 -/* D20878 802409E8 46020000 */ add.s $f0, $f0, $f2 -.L802409EC: -/* D2087C 802409EC 4616A002 */ mul.s $f0, $f20, $f22 -/* D20880 802409F0 00000000 */ nop -/* D20884 802409F4 4600C000 */ add.s $f0, $f24, $f0 -.L802409F8: -/* D20888 802409F8 E600003C */ swc1 $f0, 0x3c($s0) -/* D2088C 802409FC 8E220074 */ lw $v0, 0x74($s1) -/* D20890 80240A00 2442000A */ addiu $v0, $v0, 0xa -/* D20894 80240A04 44826000 */ mtc1 $v0, $f12 -/* D20898 80240A08 00000000 */ nop -/* D2089C 80240A0C 0C00A6C9 */ jal clamp_angle -/* D208A0 80240A10 46806320 */ cvt.s.w $f12, $f12 -/* D208A4 80240A14 4600020D */ trunc.w.s $f8, $f0 -/* D208A8 80240A18 E6280074 */ swc1 $f8, 0x74($s1) -.L80240A1C: -/* D208AC 80240A1C 8E220090 */ lw $v0, 0x90($s1) -/* D208B0 80240A20 1C40004A */ bgtz $v0, .L80240B4C -/* D208B4 80240A24 2442FFFF */ addiu $v0, $v0, -1 -/* D208B8 80240A28 8E430014 */ lw $v1, 0x14($s2) -/* D208BC 80240A2C 04600048 */ bltz $v1, .L80240B50 -/* D208C0 80240A30 00000000 */ nop -/* D208C4 80240A34 8E620074 */ lw $v0, 0x74($s3) -/* D208C8 80240A38 1C400042 */ bgtz $v0, .L80240B44 -/* D208CC 80240A3C 2442FFFF */ addiu $v0, $v0, -1 -/* D208D0 80240A40 AE630074 */ sw $v1, 0x74($s3) -/* D208D4 80240A44 860200A8 */ lh $v0, 0xa8($s0) -/* D208D8 80240A48 C602003C */ lwc1 $f2, 0x3c($s0) -/* D208DC 80240A4C 44820000 */ mtc1 $v0, $f0 -/* D208E0 80240A50 00000000 */ nop -/* D208E4 80240A54 46800020 */ cvt.s.w $f0, $f0 -/* D208E8 80240A58 46001080 */ add.s $f2, $f2, $f0 -/* D208EC 80240A5C 3C014024 */ lui $at, 0x4024 -/* D208F0 80240A60 44810800 */ mtc1 $at, $f1 -/* D208F4 80240A64 44800000 */ mtc1 $zero, $f0 -/* D208F8 80240A68 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D208FC 80240A6C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D20900 80240A70 460010A1 */ cvt.d.s $f2, $f2 -/* D20904 80240A74 46201080 */ add.d $f2, $f2, $f0 -/* D20908 80240A78 C440002C */ lwc1 $f0, 0x2c($v0) -/* D2090C 80240A7C 46000021 */ cvt.d.s $f0, $f0 -/* D20910 80240A80 4622003C */ c.lt.d $f0, $f2 -/* D20914 80240A84 00000000 */ nop -/* D20918 80240A88 4500002C */ bc1f .L80240B3C -/* D2091C 80240A8C 02A0202D */ daddu $a0, $s5, $zero -/* D20920 80240A90 AFA00010 */ sw $zero, 0x10($sp) -/* D20924 80240A94 8E46000C */ lw $a2, 0xc($s2) -/* D20928 80240A98 8E470010 */ lw $a3, 0x10($s2) -/* D2092C 80240A9C 0C01242D */ jal func_800490B4 -/* D20930 80240AA0 0220282D */ daddu $a1, $s1, $zero -/* D20934 80240AA4 10400025 */ beqz $v0, .L80240B3C -/* D20938 80240AA8 0000202D */ daddu $a0, $zero, $zero -/* D2093C 80240AAC 0200282D */ daddu $a1, $s0, $zero -/* D20940 80240AB0 0000302D */ daddu $a2, $zero, $zero -/* D20944 80240AB4 2412000C */ addiu $s2, $zero, 0xc -/* D20948 80240AB8 860300A8 */ lh $v1, 0xa8($s0) -/* D2094C 80240ABC 3C013F80 */ lui $at, 0x3f80 -/* D20950 80240AC0 44810000 */ mtc1 $at, $f0 -/* D20954 80240AC4 3C014000 */ lui $at, 0x4000 -/* D20958 80240AC8 44811000 */ mtc1 $at, $f2 -/* D2095C 80240ACC 3C01C1A0 */ lui $at, 0xc1a0 -/* D20960 80240AD0 44812000 */ mtc1 $at, $f4 -/* D20964 80240AD4 44834000 */ mtc1 $v1, $f8 -/* D20968 80240AD8 00000000 */ nop -/* D2096C 80240ADC 46804220 */ cvt.s.w $f8, $f8 -/* D20970 80240AE0 44074000 */ mfc1 $a3, $f8 -/* D20974 80240AE4 27A20038 */ addiu $v0, $sp, 0x38 -/* D20978 80240AE8 AFB2001C */ sw $s2, 0x1c($sp) -/* D2097C 80240AEC AFA20020 */ sw $v0, 0x20($sp) -/* D20980 80240AF0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D20984 80240AF4 E7A20014 */ swc1 $f2, 0x14($sp) -/* D20988 80240AF8 0C01BFA4 */ jal fx_emote -/* D2098C 80240AFC E7A40018 */ swc1 $f4, 0x18($sp) -/* D20990 80240B00 0200202D */ daddu $a0, $s0, $zero -/* D20994 80240B04 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D20998 80240B08 C480003C */ lwc1 $f0, 0x3c($a0) -/* D2099C 80240B0C 3C060020 */ lui $a2, 0x20 -/* D209A0 80240B10 0C012530 */ jal func_800494C0 -/* D209A4 80240B14 E4800064 */ swc1 $f0, 0x64($a0) -/* D209A8 80240B18 8E220018 */ lw $v0, 0x18($s1) -/* D209AC 80240B1C 9442002A */ lhu $v0, 0x2a($v0) -/* D209B0 80240B20 30420001 */ andi $v0, $v0, 1 -/* D209B4 80240B24 10400003 */ beqz $v0, .L80240B34 -/* D209B8 80240B28 2402000A */ addiu $v0, $zero, 0xa -/* D209BC 80240B2C 0809033D */ j .L80240CF4 -/* D209C0 80240B30 AE620070 */ sw $v0, 0x70($s3) -.L80240B34: -/* D209C4 80240B34 0809033D */ j .L80240CF4 -/* D209C8 80240B38 AE720070 */ sw $s2, 0x70($s3) -.L80240B3C: -/* D209CC 80240B3C 8E620074 */ lw $v0, 0x74($s3) -/* D209D0 80240B40 2442FFFF */ addiu $v0, $v0, -1 -.L80240B44: -/* D209D4 80240B44 080902D4 */ j .L80240B50 -/* D209D8 80240B48 AE620074 */ sw $v0, 0x74($s3) -.L80240B4C: -/* D209DC 80240B4C AE220090 */ sw $v0, 0x90($s1) -.L80240B50: -/* D209E0 80240B50 8E2300D0 */ lw $v1, 0xd0($s1) -/* D209E4 80240B54 C6000040 */ lwc1 $f0, 0x40($s0) -/* D209E8 80240B58 C4620000 */ lwc1 $f2, ($v1) -/* D209EC 80240B5C 468010A0 */ cvt.s.w $f2, $f2 -/* D209F0 80240B60 C4640008 */ lwc1 $f4, 8($v1) -/* D209F4 80240B64 46802120 */ cvt.s.w $f4, $f4 -/* D209F8 80240B68 E7A00010 */ swc1 $f0, 0x10($sp) -/* D209FC 80240B6C 8E2200D0 */ lw $v0, 0xd0($s1) -/* D20A00 80240B70 44051000 */ mfc1 $a1, $f2 -/* D20A04 80240B74 C440000C */ lwc1 $f0, 0xc($v0) -/* D20A08 80240B78 46800020 */ cvt.s.w $f0, $f0 -/* D20A0C 80240B7C E7A00014 */ swc1 $f0, 0x14($sp) -/* D20A10 80240B80 8E2200D0 */ lw $v0, 0xd0($s1) -/* D20A14 80240B84 44062000 */ mfc1 $a2, $f4 -/* D20A18 80240B88 C4400010 */ lwc1 $f0, 0x10($v0) -/* D20A1C 80240B8C 46800020 */ cvt.s.w $f0, $f0 -/* D20A20 80240B90 E7A00018 */ swc1 $f0, 0x18($sp) -/* D20A24 80240B94 8C640018 */ lw $a0, 0x18($v1) -/* D20A28 80240B98 0C0123F5 */ jal is_point_within_region -/* D20A2C 80240B9C 8E070038 */ lw $a3, 0x38($s0) -/* D20A30 80240BA0 1040001A */ beqz $v0, .L80240C0C -/* D20A34 80240BA4 00000000 */ nop -/* D20A38 80240BA8 8E060038 */ lw $a2, 0x38($s0) -/* D20A3C 80240BAC 8E2200D0 */ lw $v0, 0xd0($s1) -/* D20A40 80240BB0 8E070040 */ lw $a3, 0x40($s0) -/* D20A44 80240BB4 C44C0000 */ lwc1 $f12, ($v0) -/* D20A48 80240BB8 46806320 */ cvt.s.w $f12, $f12 -/* D20A4C 80240BBC C44E0008 */ lwc1 $f14, 8($v0) -/* D20A50 80240BC0 0C00A7B5 */ jal dist2D -/* D20A54 80240BC4 468073A0 */ cvt.s.w $f14, $f14 -/* D20A58 80240BC8 C6020018 */ lwc1 $f2, 0x18($s0) -/* D20A5C 80240BCC 4600103C */ c.lt.s $f2, $f0 -/* D20A60 80240BD0 00000000 */ nop -/* D20A64 80240BD4 4500000D */ bc1f .L80240C0C -/* D20A68 80240BD8 E7A00034 */ swc1 $f0, 0x34($sp) -/* D20A6C 80240BDC C60C0038 */ lwc1 $f12, 0x38($s0) -/* D20A70 80240BE0 8E2200D0 */ lw $v0, 0xd0($s1) -/* D20A74 80240BE4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D20A78 80240BE8 C4480000 */ lwc1 $f8, ($v0) -/* D20A7C 80240BEC 46804220 */ cvt.s.w $f8, $f8 -/* D20A80 80240BF0 44064000 */ mfc1 $a2, $f8 -/* D20A84 80240BF4 C4480008 */ lwc1 $f8, 8($v0) -/* D20A88 80240BF8 46804220 */ cvt.s.w $f8, $f8 -/* D20A8C 80240BFC 44074000 */ mfc1 $a3, $f8 -/* D20A90 80240C00 0C00A720 */ jal atan2 -/* D20A94 80240C04 24140001 */ addiu $s4, $zero, 1 -/* D20A98 80240C08 E600000C */ swc1 $f0, 0xc($s0) -.L80240C0C: -/* D20A9C 80240C0C 8E2200D0 */ lw $v0, 0xd0($s1) -/* D20AA0 80240C10 8C43000C */ lw $v1, 0xc($v0) -/* D20AA4 80240C14 8C420010 */ lw $v0, 0x10($v0) -/* D20AA8 80240C18 00621825 */ or $v1, $v1, $v0 -/* D20AAC 80240C1C 00741825 */ or $v1, $v1, $s4 -/* D20AB0 80240C20 10600008 */ beqz $v1, .L80240C44 -/* D20AB4 80240C24 00000000 */ nop -/* D20AB8 80240C28 8602008C */ lh $v0, 0x8c($s0) -/* D20ABC 80240C2C 14400031 */ bnez $v0, .L80240CF4 -/* D20AC0 80240C30 00000000 */ nop -/* D20AC4 80240C34 8E050018 */ lw $a1, 0x18($s0) -/* D20AC8 80240C38 8E06000C */ lw $a2, 0xc($s0) -/* D20ACC 80240C3C 0C00EA95 */ jal npc_move_heading -/* D20AD0 80240C40 0200202D */ daddu $a0, $s0, $zero -.L80240C44: -/* D20AD4 80240C44 C600003C */ lwc1 $f0, 0x3c($s0) -/* D20AD8 80240C48 3C014059 */ lui $at, 0x4059 -/* D20ADC 80240C4C 44811800 */ mtc1 $at, $f3 -/* D20AE0 80240C50 44801000 */ mtc1 $zero, $f2 -/* D20AE4 80240C54 46000021 */ cvt.d.s $f0, $f0 -/* D20AE8 80240C58 46220002 */ mul.d $f0, $f0, $f2 -/* D20AEC 80240C5C 00000000 */ nop -/* D20AF0 80240C60 4620020D */ trunc.w.d $f8, $f0 -/* D20AF4 80240C64 E628007C */ swc1 $f8, 0x7c($s1) -/* D20AF8 80240C68 8E420004 */ lw $v0, 4($s2) -/* D20AFC 80240C6C 18400021 */ blez $v0, .L80240CF4 -/* D20B00 80240C70 00000000 */ nop -/* D20B04 80240C74 8602008E */ lh $v0, 0x8e($s0) -/* D20B08 80240C78 9603008E */ lhu $v1, 0x8e($s0) -/* D20B0C 80240C7C 18400005 */ blez $v0, .L80240C94 -/* D20B10 80240C80 2462FFFF */ addiu $v0, $v1, -1 -/* D20B14 80240C84 A602008E */ sh $v0, 0x8e($s0) -/* D20B18 80240C88 00021400 */ sll $v0, $v0, 0x10 -/* D20B1C 80240C8C 1C400019 */ bgtz $v0, .L80240CF4 -/* D20B20 80240C90 00000000 */ nop -.L80240C94: -/* D20B24 80240C94 240403E8 */ addiu $a0, $zero, 0x3e8 -/* D20B28 80240C98 24020002 */ addiu $v0, $zero, 2 -/* D20B2C 80240C9C 0C00A67F */ jal rand_int -/* D20B30 80240CA0 AE620070 */ sw $v0, 0x70($s3) -/* D20B34 80240CA4 3C035555 */ lui $v1, 0x5555 -/* D20B38 80240CA8 34635556 */ ori $v1, $v1, 0x5556 -/* D20B3C 80240CAC 00430018 */ mult $v0, $v1 -/* D20B40 80240CB0 000227C3 */ sra $a0, $v0, 0x1f -/* D20B44 80240CB4 00004010 */ mfhi $t0 -/* D20B48 80240CB8 01042023 */ subu $a0, $t0, $a0 -/* D20B4C 80240CBC 00041840 */ sll $v1, $a0, 1 -/* D20B50 80240CC0 00641821 */ addu $v1, $v1, $a0 -/* D20B54 80240CC4 00431023 */ subu $v0, $v0, $v1 -/* D20B58 80240CC8 24430002 */ addiu $v1, $v0, 2 -/* D20B5C 80240CCC AE630074 */ sw $v1, 0x74($s3) -/* D20B60 80240CD0 8E42002C */ lw $v0, 0x2c($s2) -/* D20B64 80240CD4 58400007 */ blezl $v0, .L80240CF4 -/* D20B68 80240CD8 AE600070 */ sw $zero, 0x70($s3) -/* D20B6C 80240CDC 8E420008 */ lw $v0, 8($s2) -/* D20B70 80240CE0 18400003 */ blez $v0, .L80240CF0 -/* D20B74 80240CE4 28620003 */ slti $v0, $v1, 3 -/* D20B78 80240CE8 10400002 */ beqz $v0, .L80240CF4 -/* D20B7C 80240CEC 00000000 */ nop -.L80240CF0: -/* D20B80 80240CF0 AE600070 */ sw $zero, 0x70($s3) -.L80240CF4: -/* D20B84 80240CF4 8FBF0058 */ lw $ra, 0x58($sp) -/* D20B88 80240CF8 8FB50054 */ lw $s5, 0x54($sp) -/* D20B8C 80240CFC 8FB40050 */ lw $s4, 0x50($sp) -/* D20B90 80240D00 8FB3004C */ lw $s3, 0x4c($sp) -/* D20B94 80240D04 8FB20048 */ lw $s2, 0x48($sp) -/* D20B98 80240D08 8FB10044 */ lw $s1, 0x44($sp) -/* D20B9C 80240D0C 8FB00040 */ lw $s0, 0x40($sp) -/* D20BA0 80240D10 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* D20BA4 80240D14 D7B80070 */ ldc1 $f24, 0x70($sp) -/* D20BA8 80240D18 D7B60068 */ ldc1 $f22, 0x68($sp) -/* D20BAC 80240D1C D7B40060 */ ldc1 $f20, 0x60($sp) -/* D20BB0 80240D20 03E00008 */ jr $ra -/* D20BB4 80240D24 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_80240DE8_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_80240DE8_D1FE90.s deleted file mode 100644 index 7aed923221..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_80240DE8_D1FE90.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DE8_D20C78 -/* D20C78 80240DE8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* D20C7C 80240DEC AFB3004C */ sw $s3, 0x4c($sp) -/* D20C80 80240DF0 0080982D */ daddu $s3, $a0, $zero -/* D20C84 80240DF4 AFBF0054 */ sw $ra, 0x54($sp) -/* D20C88 80240DF8 AFB40050 */ sw $s4, 0x50($sp) -/* D20C8C 80240DFC AFB20048 */ sw $s2, 0x48($sp) -/* D20C90 80240E00 AFB10044 */ sw $s1, 0x44($sp) -/* D20C94 80240E04 AFB00040 */ sw $s0, 0x40($sp) -/* D20C98 80240E08 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* D20C9C 80240E0C F7B80068 */ sdc1 $f24, 0x68($sp) -/* D20CA0 80240E10 F7B60060 */ sdc1 $f22, 0x60($sp) -/* D20CA4 80240E14 F7B40058 */ sdc1 $f20, 0x58($sp) -/* D20CA8 80240E18 8E710148 */ lw $s1, 0x148($s3) -/* D20CAC 80240E1C 00A0902D */ daddu $s2, $a1, $zero -/* D20CB0 80240E20 86240008 */ lh $a0, 8($s1) -/* D20CB4 80240E24 0C00EABB */ jal get_npc_unsafe -/* D20CB8 80240E28 00C0A02D */ daddu $s4, $a2, $zero -/* D20CBC 80240E2C 0040802D */ daddu $s0, $v0, $zero -/* D20CC0 80240E30 C6200078 */ lwc1 $f0, 0x78($s1) -/* D20CC4 80240E34 46800020 */ cvt.s.w $f0, $f0 -/* D20CC8 80240E38 46000021 */ cvt.d.s $f0, $f0 -/* D20CCC 80240E3C 3C014059 */ lui $at, 0x4059 -/* D20CD0 80240E40 44811800 */ mtc1 $at, $f3 -/* D20CD4 80240E44 44801000 */ mtc1 $zero, $f2 -/* D20CD8 80240E48 8602008E */ lh $v0, 0x8e($s0) -/* D20CDC 80240E4C 9603008E */ lhu $v1, 0x8e($s0) -/* D20CE0 80240E50 46220003 */ div.d $f0, $f0, $f2 -/* D20CE4 80240E54 46200620 */ cvt.s.d $f24, $f0 -/* D20CE8 80240E58 C6200088 */ lwc1 $f0, 0x88($s1) -/* D20CEC 80240E5C 46800020 */ cvt.s.w $f0, $f0 -/* D20CF0 80240E60 46000021 */ cvt.d.s $f0, $f0 -/* D20CF4 80240E64 46220003 */ div.d $f0, $f0, $f2 -/* D20CF8 80240E68 46200020 */ cvt.s.d $f0, $f0 -/* D20CFC 80240E6C 18400003 */ blez $v0, .L80240E7C -/* D20D00 80240E70 4600C680 */ add.s $f26, $f24, $f0 -/* D20D04 80240E74 2462FFFF */ addiu $v0, $v1, -1 -/* D20D08 80240E78 A602008E */ sh $v0, 0x8e($s0) -.L80240E7C: -/* D20D0C 80240E7C 8E220070 */ lw $v0, 0x70($s1) -/* D20D10 80240E80 18400034 */ blez $v0, .L80240F54 -/* D20D14 80240E84 00000000 */ nop -/* D20D18 80240E88 C62C0074 */ lwc1 $f12, 0x74($s1) -/* D20D1C 80240E8C 46806320 */ cvt.s.w $f12, $f12 -/* D20D20 80240E90 44820000 */ mtc1 $v0, $f0 -/* D20D24 80240E94 00000000 */ nop -/* D20D28 80240E98 46800020 */ cvt.s.w $f0, $f0 -/* D20D2C 80240E9C 46000021 */ cvt.d.s $f0, $f0 -/* D20D30 80240EA0 46220003 */ div.d $f0, $f0, $f2 -/* D20D34 80240EA4 0C00A8BB */ jal sin_deg -/* D20D38 80240EA8 462005A0 */ cvt.s.d $f22, $f0 -/* D20D3C 80240EAC 8E020000 */ lw $v0, ($s0) -/* D20D40 80240EB0 30420008 */ andi $v0, $v0, 8 -/* D20D44 80240EB4 10400003 */ beqz $v0, .L80240EC4 -/* D20D48 80240EB8 46000506 */ mov.s $f20, $f0 -/* D20D4C 80240EBC 080903C1 */ j .L80240F04 -/* D20D50 80240EC0 0000102D */ daddu $v0, $zero, $zero -.L80240EC4: -/* D20D54 80240EC4 27A50028 */ addiu $a1, $sp, 0x28 -/* D20D58 80240EC8 27A6002C */ addiu $a2, $sp, 0x2c -/* D20D5C 80240ECC C6000038 */ lwc1 $f0, 0x38($s0) -/* D20D60 80240ED0 C602003C */ lwc1 $f2, 0x3c($s0) -/* D20D64 80240ED4 C6040040 */ lwc1 $f4, 0x40($s0) -/* D20D68 80240ED8 3C01447A */ lui $at, 0x447a -/* D20D6C 80240EDC 44813000 */ mtc1 $at, $f6 -/* D20D70 80240EE0 27A20034 */ addiu $v0, $sp, 0x34 -/* D20D74 80240EE4 E7A00028 */ swc1 $f0, 0x28($sp) -/* D20D78 80240EE8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* D20D7C 80240EEC E7A40030 */ swc1 $f4, 0x30($sp) -/* D20D80 80240EF0 E7A60034 */ swc1 $f6, 0x34($sp) -/* D20D84 80240EF4 AFA20010 */ sw $v0, 0x10($sp) -/* D20D88 80240EF8 8E040080 */ lw $a0, 0x80($s0) -/* D20D8C 80240EFC 0C0372DF */ jal func_800DCB7C -/* D20D90 80240F00 27A70030 */ addiu $a3, $sp, 0x30 -.L80240F04: -/* D20D94 80240F04 10400007 */ beqz $v0, .L80240F24 -/* D20D98 80240F08 00000000 */ nop -/* D20D9C 80240F0C 4616A082 */ mul.s $f2, $f20, $f22 -/* D20DA0 80240F10 00000000 */ nop -/* D20DA4 80240F14 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* D20DA8 80240F18 46180000 */ add.s $f0, $f0, $f24 -/* D20DAC 80240F1C 080903CC */ j .L80240F30 -/* D20DB0 80240F20 46020000 */ add.s $f0, $f0, $f2 -.L80240F24: -/* D20DB4 80240F24 4616A002 */ mul.s $f0, $f20, $f22 -/* D20DB8 80240F28 00000000 */ nop -/* D20DBC 80240F2C 4600D000 */ add.s $f0, $f26, $f0 -.L80240F30: -/* D20DC0 80240F30 E600003C */ swc1 $f0, 0x3c($s0) -/* D20DC4 80240F34 8E220074 */ lw $v0, 0x74($s1) -/* D20DC8 80240F38 2442000A */ addiu $v0, $v0, 0xa -/* D20DCC 80240F3C 44826000 */ mtc1 $v0, $f12 -/* D20DD0 80240F40 00000000 */ nop -/* D20DD4 80240F44 0C00A6C9 */ jal clamp_angle -/* D20DD8 80240F48 46806320 */ cvt.s.w $f12, $f12 -/* D20DDC 80240F4C 4600020D */ trunc.w.s $f8, $f0 -/* D20DE0 80240F50 E6280074 */ swc1 $f8, 0x74($s1) -.L80240F54: -/* D20DE4 80240F54 8E220090 */ lw $v0, 0x90($s1) -/* D20DE8 80240F58 1C400040 */ bgtz $v0, .L8024105C -/* D20DEC 80240F5C 2442FFFF */ addiu $v0, $v0, -1 -/* D20DF0 80240F60 860200A8 */ lh $v0, 0xa8($s0) -/* D20DF4 80240F64 C600003C */ lwc1 $f0, 0x3c($s0) -/* D20DF8 80240F68 44821000 */ mtc1 $v0, $f2 -/* D20DFC 80240F6C 00000000 */ nop -/* D20E00 80240F70 468010A0 */ cvt.s.w $f2, $f2 -/* D20E04 80240F74 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D20E08 80240F78 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D20E0C 80240F7C 46020000 */ add.s $f0, $f0, $f2 -/* D20E10 80240F80 3C014024 */ lui $at, 0x4024 -/* D20E14 80240F84 44812800 */ mtc1 $at, $f5 -/* D20E18 80240F88 44802000 */ mtc1 $zero, $f4 -/* D20E1C 80240F8C C442002C */ lwc1 $f2, 0x2c($v0) -/* D20E20 80240F90 46000021 */ cvt.d.s $f0, $f0 -/* D20E24 80240F94 46240000 */ add.d $f0, $f0, $f4 -/* D20E28 80240F98 460010A1 */ cvt.d.s $f2, $f2 -/* D20E2C 80240F9C 4620103C */ c.lt.d $f2, $f0 -/* D20E30 80240FA0 00000000 */ nop -/* D20E34 80240FA4 4500002E */ bc1f .L80241060 -/* D20E38 80240FA8 0280202D */ daddu $a0, $s4, $zero -/* D20E3C 80240FAC 24020001 */ addiu $v0, $zero, 1 -/* D20E40 80240FB0 AFA20010 */ sw $v0, 0x10($sp) -/* D20E44 80240FB4 8E460024 */ lw $a2, 0x24($s2) -/* D20E48 80240FB8 8E470028 */ lw $a3, 0x28($s2) -/* D20E4C 80240FBC 0C01242D */ jal func_800490B4 -/* D20E50 80240FC0 0220282D */ daddu $a1, $s1, $zero -/* D20E54 80240FC4 10400026 */ beqz $v0, .L80241060 -/* D20E58 80240FC8 0000202D */ daddu $a0, $zero, $zero -/* D20E5C 80240FCC 0200282D */ daddu $a1, $s0, $zero -/* D20E60 80240FD0 0000302D */ daddu $a2, $zero, $zero -/* D20E64 80240FD4 2412000C */ addiu $s2, $zero, 0xc -/* D20E68 80240FD8 860300A8 */ lh $v1, 0xa8($s0) -/* D20E6C 80240FDC 3C013F80 */ lui $at, 0x3f80 -/* D20E70 80240FE0 44810000 */ mtc1 $at, $f0 -/* D20E74 80240FE4 3C014000 */ lui $at, 0x4000 -/* D20E78 80240FE8 44811000 */ mtc1 $at, $f2 -/* D20E7C 80240FEC 3C01C1A0 */ lui $at, 0xc1a0 -/* D20E80 80240FF0 44812000 */ mtc1 $at, $f4 -/* D20E84 80240FF4 44834000 */ mtc1 $v1, $f8 -/* D20E88 80240FF8 00000000 */ nop -/* D20E8C 80240FFC 46804220 */ cvt.s.w $f8, $f8 -/* D20E90 80241000 44074000 */ mfc1 $a3, $f8 -/* D20E94 80241004 27A20038 */ addiu $v0, $sp, 0x38 -/* D20E98 80241008 AFB2001C */ sw $s2, 0x1c($sp) -/* D20E9C 8024100C AFA20020 */ sw $v0, 0x20($sp) -/* D20EA0 80241010 E7A00010 */ swc1 $f0, 0x10($sp) -/* D20EA4 80241014 E7A20014 */ swc1 $f2, 0x14($sp) -/* D20EA8 80241018 0C01BFA4 */ jal fx_emote -/* D20EAC 8024101C E7A40018 */ swc1 $f4, 0x18($sp) -/* D20EB0 80241020 0200202D */ daddu $a0, $s0, $zero -/* D20EB4 80241024 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D20EB8 80241028 C480003C */ lwc1 $f0, 0x3c($a0) -/* D20EBC 8024102C 3C060020 */ lui $a2, 0x20 -/* D20EC0 80241030 0C012530 */ jal func_800494C0 -/* D20EC4 80241034 E4800064 */ swc1 $f0, 0x64($a0) -/* D20EC8 80241038 8E220018 */ lw $v0, 0x18($s1) -/* D20ECC 8024103C 9442002A */ lhu $v0, 0x2a($v0) -/* D20ED0 80241040 30420001 */ andi $v0, $v0, 1 -/* D20ED4 80241044 10400003 */ beqz $v0, .L80241054 -/* D20ED8 80241048 2402000A */ addiu $v0, $zero, 0xa -/* D20EDC 8024104C 0809043F */ j .L802410FC -/* D20EE0 80241050 AE620070 */ sw $v0, 0x70($s3) -.L80241054: -/* D20EE4 80241054 0809043F */ j .L802410FC -/* D20EE8 80241058 AE720070 */ sw $s2, 0x70($s3) -.L8024105C: -/* D20EEC 8024105C AE220090 */ sw $v0, 0x90($s1) -.L80241060: -/* D20EF0 80241060 8602008C */ lh $v0, 0x8c($s0) -/* D20EF4 80241064 14400025 */ bnez $v0, .L802410FC -/* D20EF8 80241068 00000000 */ nop -/* D20EFC 8024106C 8602008E */ lh $v0, 0x8e($s0) -/* D20F00 80241070 1C400022 */ bgtz $v0, .L802410FC -/* D20F04 80241074 00000000 */ nop -/* D20F08 80241078 8E620074 */ lw $v0, 0x74($s3) -/* D20F0C 8024107C 2442FFFF */ addiu $v0, $v0, -1 -/* D20F10 80241080 1840001D */ blez $v0, .L802410F8 -/* D20F14 80241084 AE620074 */ sw $v0, 0x74($s3) -/* D20F18 80241088 8E220018 */ lw $v0, 0x18($s1) -/* D20F1C 8024108C 9442002A */ lhu $v0, 0x2a($v0) -/* D20F20 80241090 30420010 */ andi $v0, $v0, 0x10 -/* D20F24 80241094 14400007 */ bnez $v0, .L802410B4 -/* D20F28 80241098 00000000 */ nop -/* D20F2C 8024109C C600000C */ lwc1 $f0, 0xc($s0) -/* D20F30 802410A0 3C014334 */ lui $at, 0x4334 -/* D20F34 802410A4 44816000 */ mtc1 $at, $f12 -/* D20F38 802410A8 0C00A6C9 */ jal clamp_angle -/* D20F3C 802410AC 460C0300 */ add.s $f12, $f0, $f12 -/* D20F40 802410B0 E600000C */ swc1 $f0, 0xc($s0) -.L802410B4: -/* D20F44 802410B4 0C00A67F */ jal rand_int -/* D20F48 802410B8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* D20F4C 802410BC 3C032E8B */ lui $v1, 0x2e8b -/* D20F50 802410C0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* D20F54 802410C4 00430018 */ mult $v0, $v1 -/* D20F58 802410C8 00021FC3 */ sra $v1, $v0, 0x1f -/* D20F5C 802410CC 00004010 */ mfhi $t0 -/* D20F60 802410D0 00082043 */ sra $a0, $t0, 1 -/* D20F64 802410D4 00832023 */ subu $a0, $a0, $v1 -/* D20F68 802410D8 00041840 */ sll $v1, $a0, 1 -/* D20F6C 802410DC 00641821 */ addu $v1, $v1, $a0 -/* D20F70 802410E0 00031880 */ sll $v1, $v1, 2 -/* D20F74 802410E4 00641823 */ subu $v1, $v1, $a0 -/* D20F78 802410E8 00431023 */ subu $v0, $v0, $v1 -/* D20F7C 802410EC 24420005 */ addiu $v0, $v0, 5 -/* D20F80 802410F0 0809043F */ j .L802410FC -/* D20F84 802410F4 A602008E */ sh $v0, 0x8e($s0) -.L802410F8: -/* D20F88 802410F8 AE600070 */ sw $zero, 0x70($s3) -.L802410FC: -/* D20F8C 802410FC 8FBF0054 */ lw $ra, 0x54($sp) -/* D20F90 80241100 8FB40050 */ lw $s4, 0x50($sp) -/* D20F94 80241104 8FB3004C */ lw $s3, 0x4c($sp) -/* D20F98 80241108 8FB20048 */ lw $s2, 0x48($sp) -/* D20F9C 8024110C 8FB10044 */ lw $s1, 0x44($sp) -/* D20FA0 80241110 8FB00040 */ lw $s0, 0x40($sp) -/* D20FA4 80241114 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* D20FA8 80241118 D7B80068 */ ldc1 $f24, 0x68($sp) -/* D20FAC 8024111C D7B60060 */ ldc1 $f22, 0x60($sp) -/* D20FB0 80241120 D7B40058 */ ldc1 $f20, 0x58($sp) -/* D20FB4 80241124 03E00008 */ jr $ra -/* D20FB8 80241128 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_8024112C_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_8024112C_D1FE90.s deleted file mode 100644 index 149ccd928d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_8024112C_D1FE90.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024112C_D20FBC -/* D20FBC 8024112C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D20FC0 80241130 AFB20018 */ sw $s2, 0x18($sp) -/* D20FC4 80241134 0080902D */ daddu $s2, $a0, $zero -/* D20FC8 80241138 AFBF001C */ sw $ra, 0x1c($sp) -/* D20FCC 8024113C AFB10014 */ sw $s1, 0x14($sp) -/* D20FD0 80241140 AFB00010 */ sw $s0, 0x10($sp) -/* D20FD4 80241144 8E510148 */ lw $s1, 0x148($s2) -/* D20FD8 80241148 0C00EABB */ jal get_npc_unsafe -/* D20FDC 8024114C 86240008 */ lh $a0, 8($s1) -/* D20FE0 80241150 0040802D */ daddu $s0, $v0, $zero -/* D20FE4 80241154 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D20FE8 80241158 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D20FEC 8024115C C60C0038 */ lwc1 $f12, 0x38($s0) -/* D20FF0 80241160 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D20FF4 80241164 A600008E */ sh $zero, 0x8e($s0) -/* D20FF8 80241168 8C460028 */ lw $a2, 0x28($v0) -/* D20FFC 8024116C 0C00A720 */ jal atan2 -/* D21000 80241170 8C470030 */ lw $a3, 0x30($v0) -/* D21004 80241174 E600000C */ swc1 $f0, 0xc($s0) -/* D21008 80241178 8E2200CC */ lw $v0, 0xcc($s1) -/* D2100C 8024117C 8C420020 */ lw $v0, 0x20($v0) -/* D21010 80241180 AE020028 */ sw $v0, 0x28($s0) -/* D21014 80241184 2402000B */ addiu $v0, $zero, 0xb -/* D21018 80241188 AE420070 */ sw $v0, 0x70($s2) -/* D2101C 8024118C 8FBF001C */ lw $ra, 0x1c($sp) -/* D21020 80241190 8FB20018 */ lw $s2, 0x18($sp) -/* D21024 80241194 8FB10014 */ lw $s1, 0x14($sp) -/* D21028 80241198 8FB00010 */ lw $s0, 0x10($sp) -/* D2102C 8024119C 03E00008 */ jr $ra -/* D21030 802411A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_802411A4_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_802411A4_D1FE90.s deleted file mode 100644 index 654f0c54ec..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_802411A4_D1FE90.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411A4_D21034 -/* D21034 802411A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21038 802411A8 AFB00010 */ sw $s0, 0x10($sp) -/* D2103C 802411AC 0080802D */ daddu $s0, $a0, $zero -/* D21040 802411B0 AFBF0014 */ sw $ra, 0x14($sp) -/* D21044 802411B4 8E020148 */ lw $v0, 0x148($s0) -/* D21048 802411B8 0C00EABB */ jal get_npc_unsafe -/* D2104C 802411BC 84440008 */ lh $a0, 8($v0) -/* D21050 802411C0 9443008E */ lhu $v1, 0x8e($v0) -/* D21054 802411C4 C440003C */ lwc1 $f0, 0x3c($v0) -/* D21058 802411C8 24640001 */ addiu $a0, $v1, 1 -/* D2105C 802411CC 00031C00 */ sll $v1, $v1, 0x10 -/* D21060 802411D0 00031B83 */ sra $v1, $v1, 0xe -/* D21064 802411D4 A444008E */ sh $a0, 0x8e($v0) -/* D21068 802411D8 3C018024 */ lui $at, 0x8024 -/* D2106C 802411DC 00230821 */ addu $at, $at, $v1 -/* D21070 802411E0 C42241B8 */ lwc1 $f2, 0x41b8($at) -/* D21074 802411E4 8443008E */ lh $v1, 0x8e($v0) -/* D21078 802411E8 46020000 */ add.s $f0, $f0, $f2 -/* D2107C 802411EC 28630005 */ slti $v1, $v1, 5 -/* D21080 802411F0 14600003 */ bnez $v1, .L80241200 -/* D21084 802411F4 E440003C */ swc1 $f0, 0x3c($v0) -/* D21088 802411F8 2402000C */ addiu $v0, $zero, 0xc -/* D2108C 802411FC AE020070 */ sw $v0, 0x70($s0) -.L80241200: -/* D21090 80241200 8FBF0014 */ lw $ra, 0x14($sp) -/* D21094 80241204 8FB00010 */ lw $s0, 0x10($sp) -/* D21098 80241208 03E00008 */ jr $ra -/* D2109C 8024120C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_80241210_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_80241210_D1FE90.s deleted file mode 100644 index 459efb56b8..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_80241210_D1FE90.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241210_D210A0 -/* D210A0 80241210 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D210A4 80241214 AFB3001C */ sw $s3, 0x1c($sp) -/* D210A8 80241218 0080982D */ daddu $s3, $a0, $zero -/* D210AC 8024121C AFBF0020 */ sw $ra, 0x20($sp) -/* D210B0 80241220 AFB20018 */ sw $s2, 0x18($sp) -/* D210B4 80241224 AFB10014 */ sw $s1, 0x14($sp) -/* D210B8 80241228 AFB00010 */ sw $s0, 0x10($sp) -/* D210BC 8024122C 8E720148 */ lw $s2, 0x148($s3) -/* D210C0 80241230 86440008 */ lh $a0, 8($s2) -/* D210C4 80241234 0C00EABB */ jal get_npc_unsafe -/* D210C8 80241238 00A0802D */ daddu $s0, $a1, $zero -/* D210CC 8024123C 0040882D */ daddu $s1, $v0, $zero -/* D210D0 80241240 C6420080 */ lwc1 $f2, 0x80($s2) -/* D210D4 80241244 468010A0 */ cvt.s.w $f2, $f2 -/* D210D8 80241248 460010A1 */ cvt.d.s $f2, $f2 -/* D210DC 8024124C C6400084 */ lwc1 $f0, 0x84($s2) -/* D210E0 80241250 46800020 */ cvt.s.w $f0, $f0 -/* D210E4 80241254 46000021 */ cvt.d.s $f0, $f0 -/* D210E8 80241258 3C014059 */ lui $at, 0x4059 -/* D210EC 8024125C 44812800 */ mtc1 $at, $f5 -/* D210F0 80241260 44802000 */ mtc1 $zero, $f4 -/* D210F4 80241264 8E4200CC */ lw $v0, 0xcc($s2) -/* D210F8 80241268 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D210FC 8024126C C62E0040 */ lwc1 $f14, 0x40($s1) -/* D21100 80241270 46241083 */ div.d $f2, $f2, $f4 -/* D21104 80241274 462010A0 */ cvt.s.d $f2, $f2 -/* D21108 80241278 46240003 */ div.d $f0, $f0, $f4 -/* D2110C 8024127C 8C420020 */ lw $v0, 0x20($v0) -/* D21110 80241280 46200020 */ cvt.s.d $f0, $f0 -/* D21114 80241284 E622001C */ swc1 $f2, 0x1c($s1) -/* D21118 80241288 E6200014 */ swc1 $f0, 0x14($s1) -/* D2111C 8024128C AE220028 */ sw $v0, 0x28($s1) -/* D21120 80241290 C6000018 */ lwc1 $f0, 0x18($s0) -/* D21124 80241294 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D21128 80241298 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D2112C 8024129C E6200018 */ swc1 $f0, 0x18($s1) -/* D21130 802412A0 8C460028 */ lw $a2, 0x28($v0) -/* D21134 802412A4 0C00A720 */ jal atan2 -/* D21138 802412A8 8C470030 */ lw $a3, 0x30($v0) -/* D2113C 802412AC E620000C */ swc1 $f0, 0xc($s1) -/* D21140 802412B0 8E420018 */ lw $v0, 0x18($s2) -/* D21144 802412B4 AE400074 */ sw $zero, 0x74($s2) -/* D21148 802412B8 9442002A */ lhu $v0, 0x2a($v0) -/* D2114C 802412BC 30420002 */ andi $v0, $v0, 2 -/* D21150 802412C0 10400005 */ beqz $v0, .L802412D8 -/* D21154 802412C4 24020003 */ addiu $v0, $zero, 3 -/* D21158 802412C8 A622008E */ sh $v0, 0x8e($s1) -/* D2115C 802412CC 2402000D */ addiu $v0, $zero, 0xd -/* D21160 802412D0 080904CA */ j .L80241328 -/* D21164 802412D4 AE620070 */ sw $v0, 0x70($s3) -.L802412D8: -/* D21168 802412D8 24030001 */ addiu $v1, $zero, 1 -/* D2116C 802412DC 2402000E */ addiu $v0, $zero, 0xe -/* D21170 802412E0 A623008E */ sh $v1, 0x8e($s1) -/* D21174 802412E4 AE620070 */ sw $v0, 0x70($s3) -/* D21178 802412E8 C6200038 */ lwc1 $f0, 0x38($s1) -/* D2117C 802412EC 4600018D */ trunc.w.s $f6, $f0 -/* D21180 802412F0 44023000 */ mfc1 $v0, $f6 -/* D21184 802412F4 00000000 */ nop -/* D21188 802412F8 A6420010 */ sh $v0, 0x10($s2) -/* D2118C 802412FC C620003C */ lwc1 $f0, 0x3c($s1) -/* D21190 80241300 4600018D */ trunc.w.s $f6, $f0 -/* D21194 80241304 44023000 */ mfc1 $v0, $f6 -/* D21198 80241308 00000000 */ nop -/* D2119C 8024130C A6420012 */ sh $v0, 0x12($s2) -/* D211A0 80241310 C6200040 */ lwc1 $f0, 0x40($s1) -/* D211A4 80241314 A2430007 */ sb $v1, 7($s2) -/* D211A8 80241318 4600018D */ trunc.w.s $f6, $f0 -/* D211AC 8024131C 44023000 */ mfc1 $v0, $f6 -/* D211B0 80241320 00000000 */ nop -/* D211B4 80241324 A6420014 */ sh $v0, 0x14($s2) -.L80241328: -/* D211B8 80241328 8FBF0020 */ lw $ra, 0x20($sp) -/* D211BC 8024132C 8FB3001C */ lw $s3, 0x1c($sp) -/* D211C0 80241330 8FB20018 */ lw $s2, 0x18($sp) -/* D211C4 80241334 8FB10014 */ lw $s1, 0x14($sp) -/* D211C8 80241338 8FB00010 */ lw $s0, 0x10($sp) -/* D211CC 8024133C 03E00008 */ jr $ra -/* D211D0 80241340 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_802413A8_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_802413A8_D1FE90.s deleted file mode 100644 index 59b56cb36c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_802413A8_D1FE90.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413A8_D21238 -/* D21238 802413A8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D2123C 802413AC AFB20030 */ sw $s2, 0x30($sp) -/* D21240 802413B0 0080902D */ daddu $s2, $a0, $zero -/* D21244 802413B4 AFBF0038 */ sw $ra, 0x38($sp) -/* D21248 802413B8 AFB30034 */ sw $s3, 0x34($sp) -/* D2124C 802413BC AFB1002C */ sw $s1, 0x2c($sp) -/* D21250 802413C0 AFB00028 */ sw $s0, 0x28($sp) -/* D21254 802413C4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* D21258 802413C8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* D2125C 802413CC 8E510148 */ lw $s1, 0x148($s2) -/* D21260 802413D0 86240008 */ lh $a0, 8($s1) -/* D21264 802413D4 0C00EABB */ jal get_npc_unsafe -/* D21268 802413D8 00A0982D */ daddu $s3, $a1, $zero -/* D2126C 802413DC 0040802D */ daddu $s0, $v0, $zero -/* D21270 802413E0 0200202D */ daddu $a0, $s0, $zero -/* D21274 802413E4 C6220088 */ lwc1 $f2, 0x88($s1) -/* D21278 802413E8 468010A0 */ cvt.s.w $f2, $f2 -/* D2127C 802413EC 460010A1 */ cvt.d.s $f2, $f2 -/* D21280 802413F0 C604001C */ lwc1 $f4, 0x1c($s0) -/* D21284 802413F4 C6000014 */ lwc1 $f0, 0x14($s0) -/* D21288 802413F8 8E050018 */ lw $a1, 0x18($s0) -/* D2128C 802413FC 46002100 */ add.s $f4, $f4, $f0 -/* D21290 80241400 8E06000C */ lw $a2, 0xc($s0) -/* D21294 80241404 C6200078 */ lwc1 $f0, 0x78($s1) -/* D21298 80241408 46800020 */ cvt.s.w $f0, $f0 -/* D2129C 8024140C E604001C */ swc1 $f4, 0x1c($s0) -/* D212A0 80241410 3C014059 */ lui $at, 0x4059 -/* D212A4 80241414 44812800 */ mtc1 $at, $f5 -/* D212A8 80241418 44802000 */ mtc1 $zero, $f4 -/* D212AC 8024141C 46000021 */ cvt.d.s $f0, $f0 -/* D212B0 80241420 46240003 */ div.d $f0, $f0, $f4 -/* D212B4 80241424 46200520 */ cvt.s.d $f20, $f0 -/* D212B8 80241428 46241083 */ div.d $f2, $f2, $f4 -/* D212BC 8024142C 0C00EA95 */ jal npc_move_heading -/* D212C0 80241430 462015A0 */ cvt.s.d $f22, $f2 -/* D212C4 80241434 C604001C */ lwc1 $f4, 0x1c($s0) -/* D212C8 80241438 44801000 */ mtc1 $zero, $f2 -/* D212CC 8024143C 44801800 */ mtc1 $zero, $f3 -/* D212D0 80241440 46002021 */ cvt.d.s $f0, $f4 -/* D212D4 80241444 4620103E */ c.le.d $f2, $f0 -/* D212D8 80241448 00000000 */ nop -/* D212DC 8024144C 45000030 */ bc1f .L80241510 -/* D212E0 80241450 00000000 */ nop -/* D212E4 80241454 C600003C */ lwc1 $f0, 0x3c($s0) -/* D212E8 80241458 46040000 */ add.s $f0, $f0, $f4 -/* D212EC 8024145C E600003C */ swc1 $f0, 0x3c($s0) -/* D212F0 80241460 8E2200CC */ lw $v0, 0xcc($s1) -/* D212F4 80241464 8C420024 */ lw $v0, 0x24($v0) -/* D212F8 80241468 AE020028 */ sw $v0, 0x28($s0) -/* D212FC 8024146C A2200007 */ sb $zero, 7($s1) -/* D21300 80241470 8E020000 */ lw $v0, ($s0) -/* D21304 80241474 30420008 */ andi $v0, $v0, 8 -/* D21308 80241478 14400011 */ bnez $v0, .L802414C0 -/* D2130C 8024147C 0000102D */ daddu $v0, $zero, $zero -/* D21310 80241480 27A50018 */ addiu $a1, $sp, 0x18 -/* D21314 80241484 27A6001C */ addiu $a2, $sp, 0x1c -/* D21318 80241488 C6000038 */ lwc1 $f0, 0x38($s0) -/* D2131C 8024148C C602003C */ lwc1 $f2, 0x3c($s0) -/* D21320 80241490 C6040040 */ lwc1 $f4, 0x40($s0) -/* D21324 80241494 3C01447A */ lui $at, 0x447a -/* D21328 80241498 44813000 */ mtc1 $at, $f6 -/* D2132C 8024149C 27A20024 */ addiu $v0, $sp, 0x24 -/* D21330 802414A0 E7A00018 */ swc1 $f0, 0x18($sp) -/* D21334 802414A4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* D21338 802414A8 E7A40020 */ swc1 $f4, 0x20($sp) -/* D2133C 802414AC E7A60024 */ swc1 $f6, 0x24($sp) -/* D21340 802414B0 AFA20010 */ sw $v0, 0x10($sp) -/* D21344 802414B4 8E040080 */ lw $a0, 0x80($s0) -/* D21348 802414B8 0C0372DF */ jal func_800DCB7C -/* D2134C 802414BC 27A70020 */ addiu $a3, $sp, 0x20 -.L802414C0: -/* D21350 802414C0 1040000B */ beqz $v0, .L802414F0 -/* D21354 802414C4 00000000 */ nop -/* D21358 802414C8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* D2135C 802414CC 46140080 */ add.s $f2, $f0, $f20 -/* D21360 802414D0 C600003C */ lwc1 $f0, 0x3c($s0) -/* D21364 802414D4 4600103E */ c.le.s $f2, $f0 -/* D21368 802414D8 00000000 */ nop -/* D2136C 802414DC 4500008D */ bc1f .L80241714 -/* D21370 802414E0 00000000 */ nop -/* D21374 802414E4 E602003C */ swc1 $f2, 0x3c($s0) -/* D21378 802414E8 080905C5 */ j .L80241714 -/* D2137C 802414EC AE400070 */ sw $zero, 0x70($s2) -.L802414F0: -/* D21380 802414F0 C602003C */ lwc1 $f2, 0x3c($s0) -/* D21384 802414F4 C6000064 */ lwc1 $f0, 0x64($s0) -/* D21388 802414F8 4602003E */ c.le.s $f0, $f2 -/* D2138C 802414FC 00000000 */ nop -/* D21390 80241500 45030084 */ bc1tl .L80241714 -/* D21394 80241504 AE400070 */ sw $zero, 0x70($s2) -/* D21398 80241508 080905C5 */ j .L80241714 -/* D2139C 8024150C 00000000 */ nop -.L80241510: -/* D213A0 80241510 4622003C */ c.lt.d $f0, $f2 -/* D213A4 80241514 00000000 */ nop -/* D213A8 80241518 4500007E */ bc1f .L80241714 -/* D213AC 8024151C 00000000 */ nop -/* D213B0 80241520 9602008E */ lhu $v0, 0x8e($s0) -/* D213B4 80241524 24420001 */ addiu $v0, $v0, 1 -/* D213B8 80241528 A602008E */ sh $v0, 0x8e($s0) -/* D213BC 8024152C 00021400 */ sll $v0, $v0, 0x10 -/* D213C0 80241530 8E630020 */ lw $v1, 0x20($s3) -/* D213C4 80241534 00021403 */ sra $v0, $v0, 0x10 -/* D213C8 80241538 0043102A */ slt $v0, $v0, $v1 -/* D213CC 8024153C 14400026 */ bnez $v0, .L802415D8 -/* D213D0 80241540 00000000 */ nop -/* D213D4 80241544 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D213D8 80241548 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D213DC 8024154C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D213E0 80241550 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D213E4 80241554 A600008E */ sh $zero, 0x8e($s0) -/* D213E8 80241558 8C460028 */ lw $a2, 0x28($v0) -/* D213EC 8024155C 0C00A720 */ jal atan2 -/* D213F0 80241560 8C470030 */ lw $a3, 0x30($v0) -/* D213F4 80241564 46000506 */ mov.s $f20, $f0 -/* D213F8 80241568 C60C000C */ lwc1 $f12, 0xc($s0) -/* D213FC 8024156C 0C00A70A */ jal get_clamped_angle_diff -/* D21400 80241570 4600A386 */ mov.s $f14, $f20 -/* D21404 80241574 46000086 */ mov.s $f2, $f0 -/* D21408 80241578 8E62001C */ lw $v0, 0x1c($s3) -/* D2140C 8024157C 46001005 */ abs.s $f0, $f2 -/* D21410 80241580 44822000 */ mtc1 $v0, $f4 -/* D21414 80241584 00000000 */ nop -/* D21418 80241588 46802120 */ cvt.s.w $f4, $f4 -/* D2141C 8024158C 4600203C */ c.lt.s $f4, $f0 -/* D21420 80241590 00000000 */ nop -/* D21424 80241594 4500000D */ bc1f .L802415CC -/* D21428 80241598 00000000 */ nop -/* D2142C 8024159C 44800000 */ mtc1 $zero, $f0 -/* D21430 802415A0 C614000C */ lwc1 $f20, 0xc($s0) -/* D21434 802415A4 4600103C */ c.lt.s $f2, $f0 -/* D21438 802415A8 00000000 */ nop -/* D2143C 802415AC 45000006 */ bc1f .L802415C8 -/* D21440 802415B0 00021023 */ negu $v0, $v0 -/* D21444 802415B4 44820000 */ mtc1 $v0, $f0 -/* D21448 802415B8 00000000 */ nop -/* D2144C 802415BC 46800020 */ cvt.s.w $f0, $f0 -/* D21450 802415C0 08090573 */ j .L802415CC -/* D21454 802415C4 4600A500 */ add.s $f20, $f20, $f0 -.L802415C8: -/* D21458 802415C8 4604A500 */ add.s $f20, $f20, $f4 -.L802415CC: -/* D2145C 802415CC 0C00A6C9 */ jal clamp_angle -/* D21460 802415D0 4600A306 */ mov.s $f12, $f20 -/* D21464 802415D4 E600000C */ swc1 $f0, 0xc($s0) -.L802415D8: -/* D21468 802415D8 8E020000 */ lw $v0, ($s0) -/* D2146C 802415DC 30420008 */ andi $v0, $v0, 8 -/* D21470 802415E0 1040000A */ beqz $v0, .L8024160C -/* D21474 802415E4 27A50018 */ addiu $a1, $sp, 0x18 -/* D21478 802415E8 C602003C */ lwc1 $f2, 0x3c($s0) -/* D2147C 802415EC C600001C */ lwc1 $f0, 0x1c($s0) -/* D21480 802415F0 46001080 */ add.s $f2, $f2, $f0 -/* D21484 802415F4 4616103C */ c.lt.s $f2, $f22 -/* D21488 802415F8 00000000 */ nop -/* D2148C 802415FC 45020045 */ bc1fl .L80241714 -/* D21490 80241600 E602003C */ swc1 $f2, 0x3c($s0) -/* D21494 80241604 080905C4 */ j .L80241710 -/* D21498 80241608 E616003C */ swc1 $f22, 0x3c($s0) -.L8024160C: -/* D2149C 8024160C C6000038 */ lwc1 $f0, 0x38($s0) -/* D214A0 80241610 27A6001C */ addiu $a2, $sp, 0x1c -/* D214A4 80241614 E7A00018 */ swc1 $f0, 0x18($sp) -/* D214A8 80241618 860200A8 */ lh $v0, 0xa8($s0) -/* D214AC 8024161C C600001C */ lwc1 $f0, 0x1c($s0) -/* D214B0 80241620 C604003C */ lwc1 $f4, 0x3c($s0) -/* D214B4 80241624 44821000 */ mtc1 $v0, $f2 -/* D214B8 80241628 00000000 */ nop -/* D214BC 8024162C 468010A0 */ cvt.s.w $f2, $f2 -/* D214C0 80241630 46000005 */ abs.s $f0, $f0 -/* D214C4 80241634 46020000 */ add.s $f0, $f0, $f2 -/* D214C8 80241638 C6060040 */ lwc1 $f6, 0x40($s0) -/* D214CC 8024163C 27A20024 */ addiu $v0, $sp, 0x24 -/* D214D0 80241640 46022100 */ add.s $f4, $f4, $f2 -/* D214D4 80241644 3C014024 */ lui $at, 0x4024 -/* D214D8 80241648 44811800 */ mtc1 $at, $f3 -/* D214DC 8024164C 44801000 */ mtc1 $zero, $f2 -/* D214E0 80241650 46000021 */ cvt.d.s $f0, $f0 -/* D214E4 80241654 46220000 */ add.d $f0, $f0, $f2 -/* D214E8 80241658 E7A60020 */ swc1 $f6, 0x20($sp) -/* D214EC 8024165C E7A4001C */ swc1 $f4, 0x1c($sp) -/* D214F0 80241660 46200020 */ cvt.s.d $f0, $f0 -/* D214F4 80241664 E7A00024 */ swc1 $f0, 0x24($sp) -/* D214F8 80241668 AFA20010 */ sw $v0, 0x10($sp) -/* D214FC 8024166C 8E040080 */ lw $a0, 0x80($s0) -/* D21500 80241670 0C0372DF */ jal func_800DCB7C -/* D21504 80241674 27A70020 */ addiu $a3, $sp, 0x20 -/* D21508 80241678 10400015 */ beqz $v0, .L802416D0 -/* D2150C 8024167C 00000000 */ nop -/* D21510 80241680 860200A8 */ lh $v0, 0xa8($s0) -/* D21514 80241684 C604001C */ lwc1 $f4, 0x1c($s0) -/* D21518 80241688 44820000 */ mtc1 $v0, $f0 -/* D2151C 8024168C 00000000 */ nop -/* D21520 80241690 46800020 */ cvt.s.w $f0, $f0 -/* D21524 80241694 46002085 */ abs.s $f2, $f4 -/* D21528 80241698 46020000 */ add.s $f0, $f0, $f2 -/* D2152C 8024169C C7A20024 */ lwc1 $f2, 0x24($sp) -/* D21530 802416A0 4600103E */ c.le.s $f2, $f0 -/* D21534 802416A4 00000000 */ nop -/* D21538 802416A8 45000005 */ bc1f .L802416C0 -/* D2153C 802416AC 00000000 */ nop -/* D21540 802416B0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* D21544 802416B4 AE00001C */ sw $zero, 0x1c($s0) -/* D21548 802416B8 080905C5 */ j .L80241714 -/* D2154C 802416BC E600003C */ swc1 $f0, 0x3c($s0) -.L802416C0: -/* D21550 802416C0 C600003C */ lwc1 $f0, 0x3c($s0) -/* D21554 802416C4 46040000 */ add.s $f0, $f0, $f4 -/* D21558 802416C8 080905C5 */ j .L80241714 -/* D2155C 802416CC E600003C */ swc1 $f0, 0x3c($s0) -.L802416D0: -/* D21560 802416D0 C606003C */ lwc1 $f6, 0x3c($s0) -/* D21564 802416D4 860200A8 */ lh $v0, 0xa8($s0) -/* D21568 802416D8 46163081 */ sub.s $f2, $f6, $f22 -/* D2156C 802416DC 44820000 */ mtc1 $v0, $f0 -/* D21570 802416E0 00000000 */ nop -/* D21574 802416E4 46800020 */ cvt.s.w $f0, $f0 -/* D21578 802416E8 46001080 */ add.s $f2, $f2, $f0 -/* D2157C 802416EC C604001C */ lwc1 $f4, 0x1c($s0) -/* D21580 802416F0 46002005 */ abs.s $f0, $f4 -/* D21584 802416F4 4602003C */ c.lt.s $f0, $f2 -/* D21588 802416F8 00000000 */ nop -/* D2158C 802416FC 45020005 */ bc1fl .L80241714 -/* D21590 80241700 AE00001C */ sw $zero, 0x1c($s0) -/* D21594 80241704 46043000 */ add.s $f0, $f6, $f4 -/* D21598 80241708 080905C5 */ j .L80241714 -/* D2159C 8024170C E600003C */ swc1 $f0, 0x3c($s0) -.L80241710: -/* D215A0 80241710 AE00001C */ sw $zero, 0x1c($s0) -.L80241714: -/* D215A4 80241714 8FBF0038 */ lw $ra, 0x38($sp) -/* D215A8 80241718 8FB30034 */ lw $s3, 0x34($sp) -/* D215AC 8024171C 8FB20030 */ lw $s2, 0x30($sp) -/* D215B0 80241720 8FB1002C */ lw $s1, 0x2c($sp) -/* D215B4 80241724 8FB00028 */ lw $s0, 0x28($sp) -/* D215B8 80241728 D7B60048 */ ldc1 $f22, 0x48($sp) -/* D215BC 8024172C D7B40040 */ ldc1 $f20, 0x40($sp) -/* D215C0 80241730 03E00008 */ jr $ra -/* D215C4 80241734 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_80241738_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_80241738_D1FE90.s deleted file mode 100644 index 203d77551f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_80241738_D1FE90.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241738_D215C8 -/* D215C8 80241738 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* D215CC 8024173C AFB00028 */ sw $s0, 0x28($sp) -/* D215D0 80241740 00A0802D */ daddu $s0, $a1, $zero -/* D215D4 80241744 AFB1002C */ sw $s1, 0x2c($sp) -/* D215D8 80241748 00C0882D */ daddu $s1, $a2, $zero -/* D215DC 8024174C AFBF0034 */ sw $ra, 0x34($sp) -/* D215E0 80241750 AFB20030 */ sw $s2, 0x30($sp) -/* D215E4 80241754 AE200070 */ sw $zero, 0x70($s1) -/* D215E8 80241758 8C830000 */ lw $v1, ($a0) -/* D215EC 8024175C 2402FDFF */ addiu $v0, $zero, -0x201 -/* D215F0 80241760 A480008E */ sh $zero, 0x8e($a0) -/* D215F4 80241764 00621824 */ and $v1, $v1, $v0 -/* D215F8 80241768 34650800 */ ori $a1, $v1, 0x800 -/* D215FC 8024176C AC850000 */ sw $a1, ($a0) -/* D21600 80241770 8E0200D0 */ lw $v0, 0xd0($s0) -/* D21604 80241774 8C420034 */ lw $v0, 0x34($v0) -/* D21608 80241778 10400003 */ beqz $v0, .L80241788 -/* D2160C 8024177C 00E0902D */ daddu $s2, $a3, $zero -/* D21610 80241780 080905E4 */ j .L80241790 -/* D21614 80241784 34620808 */ ori $v0, $v1, 0x808 -.L80241788: -/* D21618 80241788 2402FFF7 */ addiu $v0, $zero, -9 -/* D2161C 8024178C 00A21024 */ and $v0, $a1, $v0 -.L80241790: -/* D21620 80241790 AC820000 */ sw $v0, ($a0) -/* D21624 80241794 27A20024 */ addiu $v0, $sp, 0x24 -/* D21628 80241798 27A50018 */ addiu $a1, $sp, 0x18 -/* D2162C 8024179C C4800038 */ lwc1 $f0, 0x38($a0) -/* D21630 802417A0 C482003C */ lwc1 $f2, 0x3c($a0) -/* D21634 802417A4 C4840040 */ lwc1 $f4, 0x40($a0) -/* D21638 802417A8 3C01447A */ lui $at, 0x447a -/* D2163C 802417AC 44813000 */ mtc1 $at, $f6 -/* D21640 802417B0 27A6001C */ addiu $a2, $sp, 0x1c -/* D21644 802417B4 E7A00018 */ swc1 $f0, 0x18($sp) -/* D21648 802417B8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* D2164C 802417BC E7A40020 */ swc1 $f4, 0x20($sp) -/* D21650 802417C0 E7A60024 */ swc1 $f6, 0x24($sp) -/* D21654 802417C4 AFA20010 */ sw $v0, 0x10($sp) -/* D21658 802417C8 8C840080 */ lw $a0, 0x80($a0) -/* D2165C 802417CC 0C0372DF */ jal func_800DCB7C -/* D21660 802417D0 27A70020 */ addiu $a3, $sp, 0x20 -/* D21664 802417D4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* D21668 802417D8 3C014059 */ lui $at, 0x4059 -/* D2166C 802417DC 44812800 */ mtc1 $at, $f5 -/* D21670 802417E0 44802000 */ mtc1 $zero, $f4 -/* D21674 802417E4 460010A1 */ cvt.d.s $f2, $f2 -/* D21678 802417E8 46241082 */ mul.d $f2, $f2, $f4 -/* D2167C 802417EC 00000000 */ nop -/* D21680 802417F0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* D21684 802417F4 46000021 */ cvt.d.s $f0, $f0 -/* D21688 802417F8 46240002 */ mul.d $f0, $f0, $f4 -/* D2168C 802417FC 00000000 */ nop -/* D21690 80241800 3C013FE0 */ lui $at, 0x3fe0 -/* D21694 80241804 44812800 */ mtc1 $at, $f5 -/* D21698 80241808 44802000 */ mtc1 $zero, $f4 -/* D2169C 8024180C 00000000 */ nop -/* D216A0 80241810 46241080 */ add.d $f2, $f2, $f4 -/* D216A4 80241814 AE000074 */ sw $zero, 0x74($s0) -/* D216A8 80241818 46240000 */ add.d $f0, $f0, $f4 -/* D216AC 8024181C AE000090 */ sw $zero, 0x90($s0) -/* D216B0 80241820 4620120D */ trunc.w.d $f8, $f2 -/* D216B4 80241824 E6080078 */ swc1 $f8, 0x78($s0) -/* D216B8 80241828 4620020D */ trunc.w.d $f8, $f0 -/* D216BC 8024182C E6080088 */ swc1 $f8, 0x88($s0) -/* D216C0 80241830 8E420014 */ lw $v0, 0x14($s2) -/* D216C4 80241834 AE220074 */ sw $v0, 0x74($s1) -/* D216C8 80241838 8E0200B0 */ lw $v0, 0xb0($s0) -/* D216CC 8024183C 34420010 */ ori $v0, $v0, 0x10 -/* D216D0 80241840 AE0200B0 */ sw $v0, 0xb0($s0) -/* D216D4 80241844 8FBF0034 */ lw $ra, 0x34($sp) -/* D216D8 80241848 8FB20030 */ lw $s2, 0x30($sp) -/* D216DC 8024184C 8FB1002C */ lw $s1, 0x2c($sp) -/* D216E0 80241850 8FB00028 */ lw $s0, 0x28($sp) -/* D216E4 80241854 03E00008 */ jr $ra -/* D216E8 80241858 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_80241E18_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_80241E18_D1FE90.s deleted file mode 100644 index 60293759d9..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_80241E18_D1FE90.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E18_D21CA8 -/* D21CA8 80241E18 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21CAC 80241E1C AFBF0010 */ sw $ra, 0x10($sp) -/* D21CB0 80241E20 8C82000C */ lw $v0, 0xc($a0) -/* D21CB4 80241E24 0C0B1EAF */ jal get_variable -/* D21CB8 80241E28 8C450000 */ lw $a1, ($v0) -/* D21CBC 80241E2C 0040182D */ daddu $v1, $v0, $zero -/* D21CC0 80241E30 10600012 */ beqz $v1, .L80241E7C -/* D21CC4 80241E34 0000202D */ daddu $a0, $zero, $zero -/* D21CC8 80241E38 8C620000 */ lw $v0, ($v1) -/* D21CCC 80241E3C 5040000A */ beql $v0, $zero, .L80241E68 -/* D21CD0 80241E40 00041080 */ sll $v0, $a0, 2 -/* D21CD4 80241E44 3C058025 */ lui $a1, 0x8025 -/* D21CD8 80241E48 24A5BEA0 */ addiu $a1, $a1, -0x4160 -.L80241E4C: -/* D21CDC 80241E4C 24630004 */ addiu $v1, $v1, 4 -/* D21CE0 80241E50 24840001 */ addiu $a0, $a0, 1 -/* D21CE4 80241E54 ACA20000 */ sw $v0, ($a1) -/* D21CE8 80241E58 8C620000 */ lw $v0, ($v1) -/* D21CEC 80241E5C 1440FFFB */ bnez $v0, .L80241E4C -/* D21CF0 80241E60 24A50004 */ addiu $a1, $a1, 4 -/* D21CF4 80241E64 00041080 */ sll $v0, $a0, 2 -.L80241E68: -/* D21CF8 80241E68 3C018025 */ lui $at, 0x8025 -/* D21CFC 80241E6C 00220821 */ addu $at, $at, $v0 -/* D21D00 80241E70 AC20BEA0 */ sw $zero, -0x4160($at) -/* D21D04 80241E74 080907A9 */ j .L80241EA4 -/* D21D08 80241E78 00000000 */ nop -.L80241E7C: -/* D21D0C 80241E7C 3C038025 */ lui $v1, 0x8025 -/* D21D10 80241E80 2463BEA0 */ addiu $v1, $v1, -0x4160 -/* D21D14 80241E84 0060282D */ daddu $a1, $v1, $zero -.L80241E88: -/* D21D18 80241E88 24820010 */ addiu $v0, $a0, 0x10 -/* D21D1C 80241E8C AC620000 */ sw $v0, ($v1) -/* D21D20 80241E90 24630004 */ addiu $v1, $v1, 4 -/* D21D24 80241E94 24840001 */ addiu $a0, $a0, 1 -/* D21D28 80241E98 28820070 */ slti $v0, $a0, 0x70 -/* D21D2C 80241E9C 1440FFFA */ bnez $v0, .L80241E88 -/* D21D30 80241EA0 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241EA4: -/* D21D34 80241EA4 8FBF0010 */ lw $ra, 0x10($sp) -/* D21D38 80241EA8 24020002 */ addiu $v0, $zero, 2 -/* D21D3C 80241EAC 03E00008 */ jr $ra -/* D21D40 80241EB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_80241F98_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_80241F98_D1FE90.s deleted file mode 100644 index df06c2432d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_80241F98_D1FE90.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F98_D21E28 -/* D21E28 80241F98 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D21E2C 80241F9C AFB10014 */ sw $s1, 0x14($sp) -/* D21E30 80241FA0 0080882D */ daddu $s1, $a0, $zero -/* D21E34 80241FA4 AFBF0018 */ sw $ra, 0x18($sp) -/* D21E38 80241FA8 AFB00010 */ sw $s0, 0x10($sp) -/* D21E3C 80241FAC 8E30000C */ lw $s0, 0xc($s1) -/* D21E40 80241FB0 8E050000 */ lw $a1, ($s0) -/* D21E44 80241FB4 0C0B1EAF */ jal get_variable -/* D21E48 80241FB8 26100004 */ addiu $s0, $s0, 4 -/* D21E4C 80241FBC 0220202D */ daddu $a0, $s1, $zero -/* D21E50 80241FC0 8E050000 */ lw $a1, ($s0) -/* D21E54 80241FC4 0C0B1EAF */ jal get_variable -/* D21E58 80241FC8 0040882D */ daddu $s1, $v0, $zero -/* D21E5C 80241FCC 0000202D */ daddu $a0, $zero, $zero -/* D21E60 80241FD0 0080282D */ daddu $a1, $a0, $zero -/* D21E64 80241FD4 0040802D */ daddu $s0, $v0, $zero -/* D21E68 80241FD8 240600BE */ addiu $a2, $zero, 0xbe -/* D21E6C 80241FDC 0C04DF93 */ jal func_80137E4C -/* D21E70 80241FE0 24070091 */ addiu $a3, $zero, 0x91 -/* D21E74 80241FE4 44900000 */ mtc1 $s0, $f0 -/* D21E78 80241FE8 00000000 */ nop -/* D21E7C 80241FEC 46800020 */ cvt.s.w $f0, $f0 -/* D21E80 80241FF0 44050000 */ mfc1 $a1, $f0 -/* D21E84 80241FF4 0C04DF62 */ jal func_80137D88 -/* D21E88 80241FF8 322400FF */ andi $a0, $s1, 0xff -/* D21E8C 80241FFC 8FBF0018 */ lw $ra, 0x18($sp) -/* D21E90 80242000 8FB10014 */ lw $s1, 0x14($sp) -/* D21E94 80242004 8FB00010 */ lw $s0, 0x10($sp) -/* D21E98 80242008 24020002 */ addiu $v0, $zero, 2 -/* D21E9C 8024200C 03E00008 */ jr $ra -/* D21EA0 80242010 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_80242014_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_80242014_D1FE90.s deleted file mode 100644 index e330cdda4a..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_80242014_D1FE90.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242014_D21EA4 -/* D21EA4 80242014 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D21EA8 80242018 AFB10014 */ sw $s1, 0x14($sp) -/* D21EAC 8024201C 0080882D */ daddu $s1, $a0, $zero -/* D21EB0 80242020 AFBF0018 */ sw $ra, 0x18($sp) -/* D21EB4 80242024 AFB00010 */ sw $s0, 0x10($sp) -/* D21EB8 80242028 8E30000C */ lw $s0, 0xc($s1) -/* D21EBC 8024202C 8E050000 */ lw $a1, ($s0) -/* D21EC0 80242030 0C0B1EAF */ jal get_variable -/* D21EC4 80242034 26100004 */ addiu $s0, $s0, 4 -/* D21EC8 80242038 0220202D */ daddu $a0, $s1, $zero -/* D21ECC 8024203C 8E050000 */ lw $a1, ($s0) -/* D21ED0 80242040 0C0B1EAF */ jal get_variable -/* D21ED4 80242044 0040802D */ daddu $s0, $v0, $zero -/* D21ED8 80242048 44820000 */ mtc1 $v0, $f0 -/* D21EDC 8024204C 00000000 */ nop -/* D21EE0 80242050 46800020 */ cvt.s.w $f0, $f0 -/* D21EE4 80242054 24020002 */ addiu $v0, $zero, 2 -/* D21EE8 80242058 00501804 */ sllv $v1, $s0, $v0 -/* D21EEC 8024205C 00701821 */ addu $v1, $v1, $s0 -/* D21EF0 80242060 00431804 */ sllv $v1, $v1, $v0 -/* D21EF4 80242064 00701823 */ subu $v1, $v1, $s0 -/* D21EF8 80242068 000320C0 */ sll $a0, $v1, 3 -/* D21EFC 8024206C 00641821 */ addu $v1, $v1, $a0 -/* D21F00 80242070 000318C0 */ sll $v1, $v1, 3 -/* D21F04 80242074 3C01800B */ lui $at, 0x800b -/* D21F08 80242078 00230821 */ addu $at, $at, $v1 -/* D21F0C 8024207C E4201D98 */ swc1 $f0, 0x1d98($at) -/* D21F10 80242080 8FBF0018 */ lw $ra, 0x18($sp) -/* D21F14 80242084 8FB10014 */ lw $s1, 0x14($sp) -/* D21F18 80242088 8FB00010 */ lw $s0, 0x10($sp) -/* D21F1C 8024208C 03E00008 */ jr $ra -/* D21F20 80242090 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_802420F0_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_802420F0_D1FE90.s deleted file mode 100644 index 0ae571f005..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_802420F0_D1FE90.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420F0_D21F80 -/* D21F80 802420F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21F84 802420F4 AFBF0010 */ sw $ra, 0x10($sp) -/* D21F88 802420F8 0C03AE18 */ jal partner_resume_ability_script -/* D21F8C 802420FC 00000000 */ nop -/* D21F90 80242100 8FBF0010 */ lw $ra, 0x10($sp) -/* D21F94 80242104 24020002 */ addiu $v0, $zero, 2 -/* D21F98 80242108 03E00008 */ jr $ra -/* D21F9C 8024210C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_802421E0_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_802421E0_D1FE90.s deleted file mode 100644 index f3a6d4f68c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_802421E0_D1FE90.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421E0_D22070 -/* D22070 802421E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D22074 802421E4 AFBF0010 */ sw $ra, 0x10($sp) -/* D22078 802421E8 8C82000C */ lw $v0, 0xc($a0) -/* D2207C 802421EC 3C068011 */ lui $a2, 0x8011 -/* D22080 802421F0 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* D22084 802421F4 0C0B2026 */ jal set_variable -/* D22088 802421F8 8C450000 */ lw $a1, ($v0) -/* D2208C 802421FC 0C03AC5A */ jal func_800EB168 -/* D22090 80242200 0000202D */ daddu $a0, $zero, $zero -/* D22094 80242204 8FBF0010 */ lw $ra, 0x10($sp) -/* D22098 80242208 24020002 */ addiu $v0, $zero, 2 -/* D2209C 8024220C 03E00008 */ jr $ra -/* D220A0 80242210 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_80242214_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_80242214_D1FE90.s deleted file mode 100644 index 75756157e8..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_80242214_D1FE90.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242214_D220A4 -/* D220A4 80242214 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D220A8 80242218 AFBF0010 */ sw $ra, 0x10($sp) -/* D220AC 8024221C 8C82000C */ lw $v0, 0xc($a0) -/* D220B0 80242220 0C0B1EAF */ jal get_variable -/* D220B4 80242224 8C450000 */ lw $a1, ($v0) -/* D220B8 80242228 00021600 */ sll $v0, $v0, 0x18 -/* D220BC 8024222C 0C03AC5A */ jal func_800EB168 -/* D220C0 80242230 00022603 */ sra $a0, $v0, 0x18 -/* D220C4 80242234 8FBF0010 */ lw $ra, 0x10($sp) -/* D220C8 80242238 24020002 */ addiu $v0, $zero, 2 -/* D220CC 8024223C 03E00008 */ jr $ra -/* D220D0 80242240 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/func_8024233C_D1FE90.s b/asm/nonmatchings/world/area_sam/sam_06/func_8024233C_D1FE90.s deleted file mode 100644 index e7dedc7441..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/func_8024233C_D1FE90.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024233C_D221CC -/* D221CC 8024233C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D221D0 80242340 AFB1001C */ sw $s1, 0x1c($sp) -/* D221D4 80242344 0080882D */ daddu $s1, $a0, $zero -/* D221D8 80242348 AFBF0034 */ sw $ra, 0x34($sp) -/* D221DC 8024234C AFB60030 */ sw $s6, 0x30($sp) -/* D221E0 80242350 AFB5002C */ sw $s5, 0x2c($sp) -/* D221E4 80242354 AFB40028 */ sw $s4, 0x28($sp) -/* D221E8 80242358 AFB30024 */ sw $s3, 0x24($sp) -/* D221EC 8024235C AFB20020 */ sw $s2, 0x20($sp) -/* D221F0 80242360 AFB00018 */ sw $s0, 0x18($sp) -/* D221F4 80242364 F7B60040 */ sdc1 $f22, 0x40($sp) -/* D221F8 80242368 F7B40038 */ sdc1 $f20, 0x38($sp) -/* D221FC 8024236C 8E30000C */ lw $s0, 0xc($s1) -/* D22200 80242370 8E160000 */ lw $s6, ($s0) -/* D22204 80242374 26100004 */ addiu $s0, $s0, 4 -/* D22208 80242378 0C0B1EAF */ jal get_variable -/* D2220C 8024237C 02C0282D */ daddu $a1, $s6, $zero -/* D22210 80242380 44820000 */ mtc1 $v0, $f0 -/* D22214 80242384 00000000 */ nop -/* D22218 80242388 46800020 */ cvt.s.w $f0, $f0 -/* D2221C 8024238C E7A00010 */ swc1 $f0, 0x10($sp) -/* D22220 80242390 8E140000 */ lw $s4, ($s0) -/* D22224 80242394 26100004 */ addiu $s0, $s0, 4 -/* D22228 80242398 0220202D */ daddu $a0, $s1, $zero -/* D2222C 8024239C 0C0B1EAF */ jal get_variable -/* D22230 802423A0 0280282D */ daddu $a1, $s4, $zero -/* D22234 802423A4 0220202D */ daddu $a0, $s1, $zero -/* D22238 802423A8 8E150000 */ lw $s5, ($s0) -/* D2223C 802423AC 4482B000 */ mtc1 $v0, $f22 -/* D22240 802423B0 00000000 */ nop -/* D22244 802423B4 4680B5A0 */ cvt.s.w $f22, $f22 -/* D22248 802423B8 0C0B1EAF */ jal get_variable -/* D2224C 802423BC 02A0282D */ daddu $a1, $s5, $zero -/* D22250 802423C0 2404FFFC */ addiu $a0, $zero, -4 -/* D22254 802423C4 44820000 */ mtc1 $v0, $f0 -/* D22258 802423C8 00000000 */ nop -/* D2225C 802423CC 46800020 */ cvt.s.w $f0, $f0 -/* D22260 802423D0 0C00EABB */ jal get_npc_unsafe -/* D22264 802423D4 E7A00014 */ swc1 $f0, 0x14($sp) -/* D22268 802423D8 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* D2226C 802423DC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* D22270 802423E0 3C014334 */ lui $at, 0x4334 -/* D22274 802423E4 44816000 */ mtc1 $at, $f12 -/* D22278 802423E8 00041880 */ sll $v1, $a0, 2 -/* D2227C 802423EC 00641821 */ addu $v1, $v1, $a0 -/* D22280 802423F0 00031880 */ sll $v1, $v1, 2 -/* D22284 802423F4 00641823 */ subu $v1, $v1, $a0 -/* D22288 802423F8 000320C0 */ sll $a0, $v1, 3 -/* D2228C 802423FC 00641821 */ addu $v1, $v1, $a0 -/* D22290 80242400 000318C0 */ sll $v1, $v1, 3 -/* D22294 80242404 3C01800B */ lui $at, 0x800b -/* D22298 80242408 00230821 */ addu $at, $at, $v1 -/* D2229C 8024240C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* D222A0 80242410 460C0300 */ add.s $f12, $f0, $f12 -/* D222A4 80242414 0C00A6C9 */ jal clamp_angle -/* D222A8 80242418 0040982D */ daddu $s3, $v0, $zero -/* D222AC 8024241C 27B00010 */ addiu $s0, $sp, 0x10 -/* D222B0 80242420 0200202D */ daddu $a0, $s0, $zero -/* D222B4 80242424 27B20014 */ addiu $s2, $sp, 0x14 -/* D222B8 80242428 0240282D */ daddu $a1, $s2, $zero -/* D222BC 8024242C 3C064170 */ lui $a2, 0x4170 -/* D222C0 80242430 8E67000C */ lw $a3, 0xc($s3) -/* D222C4 80242434 0C00A7E7 */ jal add_vec2D_polar -/* D222C8 80242438 46000506 */ mov.s $f20, $f0 -/* D222CC 8024243C 0200202D */ daddu $a0, $s0, $zero -/* D222D0 80242440 3C064120 */ lui $a2, 0x4120 -/* D222D4 80242444 4407A000 */ mfc1 $a3, $f20 -/* D222D8 80242448 0C00A7E7 */ jal add_vec2D_polar -/* D222DC 8024244C 0240282D */ daddu $a1, $s2, $zero -/* D222E0 80242450 0220202D */ daddu $a0, $s1, $zero -/* D222E4 80242454 C7A00010 */ lwc1 $f0, 0x10($sp) -/* D222E8 80242458 4600008D */ trunc.w.s $f2, $f0 -/* D222EC 8024245C 44061000 */ mfc1 $a2, $f2 -/* D222F0 80242460 0C0B2026 */ jal set_variable -/* D222F4 80242464 02C0282D */ daddu $a1, $s6, $zero -/* D222F8 80242468 0220202D */ daddu $a0, $s1, $zero -/* D222FC 8024246C 4600B08D */ trunc.w.s $f2, $f22 -/* D22300 80242470 44061000 */ mfc1 $a2, $f2 -/* D22304 80242474 0C0B2026 */ jal set_variable -/* D22308 80242478 0280282D */ daddu $a1, $s4, $zero -/* D2230C 8024247C 0220202D */ daddu $a0, $s1, $zero -/* D22310 80242480 C7A00014 */ lwc1 $f0, 0x14($sp) -/* D22314 80242484 4600008D */ trunc.w.s $f2, $f0 -/* D22318 80242488 44061000 */ mfc1 $a2, $f2 -/* D2231C 8024248C 0C0B2026 */ jal set_variable -/* D22320 80242490 02A0282D */ daddu $a1, $s5, $zero -/* D22324 80242494 8FBF0034 */ lw $ra, 0x34($sp) -/* D22328 80242498 8FB60030 */ lw $s6, 0x30($sp) -/* D2232C 8024249C 8FB5002C */ lw $s5, 0x2c($sp) -/* D22330 802424A0 8FB40028 */ lw $s4, 0x28($sp) -/* D22334 802424A4 8FB30024 */ lw $s3, 0x24($sp) -/* D22338 802424A8 8FB20020 */ lw $s2, 0x20($sp) -/* D2233C 802424AC 8FB1001C */ lw $s1, 0x1c($sp) -/* D22340 802424B0 8FB00018 */ lw $s0, 0x18($sp) -/* D22344 802424B4 D7B60040 */ ldc1 $f22, 0x40($sp) -/* D22348 802424B8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* D2234C 802424BC 24020002 */ addiu $v0, $zero, 2 -/* D22350 802424C0 03E00008 */ jr $ra -/* D22354 802424C4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_07/func_80240448_D2BD30.s b/asm/nonmatchings/world/area_sam/sam_07/func_80240448_D2BD30.s deleted file mode 100644 index 1b17689e94..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/func_80240448_D2BD30.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240448_D2C178 -/* D2C178 80240448 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* D2C17C 8024044C AFB10014 */ sw $s1, 0x14($sp) -/* D2C180 80240450 0080882D */ daddu $s1, $a0, $zero -/* D2C184 80240454 AFBF001C */ sw $ra, 0x1c($sp) -/* D2C188 80240458 AFB20018 */ sw $s2, 0x18($sp) -/* D2C18C 8024045C AFB00010 */ sw $s0, 0x10($sp) -/* D2C190 80240460 F7B80030 */ sdc1 $f24, 0x30($sp) -/* D2C194 80240464 F7B60028 */ sdc1 $f22, 0x28($sp) -/* D2C198 80240468 F7B40020 */ sdc1 $f20, 0x20($sp) -/* D2C19C 8024046C 8E30000C */ lw $s0, 0xc($s1) -/* D2C1A0 80240470 8E050000 */ lw $a1, ($s0) -/* D2C1A4 80240474 0C0B1EAF */ jal get_variable -/* D2C1A8 80240478 26100004 */ addiu $s0, $s0, 4 -/* D2C1AC 8024047C 8E050000 */ lw $a1, ($s0) -/* D2C1B0 80240480 26100004 */ addiu $s0, $s0, 4 -/* D2C1B4 80240484 0220202D */ daddu $a0, $s1, $zero -/* D2C1B8 80240488 0C0B1EAF */ jal get_variable -/* D2C1BC 8024048C 0040902D */ daddu $s2, $v0, $zero -/* D2C1C0 80240490 8E050000 */ lw $a1, ($s0) -/* D2C1C4 80240494 26100004 */ addiu $s0, $s0, 4 -/* D2C1C8 80240498 4482C000 */ mtc1 $v0, $f24 -/* D2C1CC 8024049C 00000000 */ nop -/* D2C1D0 802404A0 4680C620 */ cvt.s.w $f24, $f24 -/* D2C1D4 802404A4 0C0B1EAF */ jal get_variable -/* D2C1D8 802404A8 0220202D */ daddu $a0, $s1, $zero -/* D2C1DC 802404AC 8E050000 */ lw $a1, ($s0) -/* D2C1E0 802404B0 4482B000 */ mtc1 $v0, $f22 -/* D2C1E4 802404B4 00000000 */ nop -/* D2C1E8 802404B8 4680B5A0 */ cvt.s.w $f22, $f22 -/* D2C1EC 802404BC 0C0B1EAF */ jal get_variable -/* D2C1F0 802404C0 0220202D */ daddu $a0, $s1, $zero -/* D2C1F4 802404C4 4482A000 */ mtc1 $v0, $f20 -/* D2C1F8 802404C8 00000000 */ nop -/* D2C1FC 802404CC 4680A520 */ cvt.s.w $f20, $f20 -/* D2C200 802404D0 0C04417A */ jal get_entity_by_index -/* D2C204 802404D4 0240202D */ daddu $a0, $s2, $zero -/* D2C208 802404D8 0040182D */ daddu $v1, $v0, $zero -/* D2C20C 802404DC E4780048 */ swc1 $f24, 0x48($v1) -/* D2C210 802404E0 E476004C */ swc1 $f22, 0x4c($v1) -/* D2C214 802404E4 E4740050 */ swc1 $f20, 0x50($v1) -/* D2C218 802404E8 8FBF001C */ lw $ra, 0x1c($sp) -/* D2C21C 802404EC 8FB20018 */ lw $s2, 0x18($sp) -/* D2C220 802404F0 8FB10014 */ lw $s1, 0x14($sp) -/* D2C224 802404F4 8FB00010 */ lw $s0, 0x10($sp) -/* D2C228 802404F8 D7B80030 */ ldc1 $f24, 0x30($sp) -/* D2C22C 802404FC D7B60028 */ ldc1 $f22, 0x28($sp) -/* D2C230 80240500 D7B40020 */ ldc1 $f20, 0x20($sp) -/* D2C234 80240504 24020002 */ addiu $v0, $zero, 2 -/* D2C238 80240508 03E00008 */ jr $ra -/* D2C23C 8024050C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_sam/sam_07/func_80240510_D2BD30.s b/asm/nonmatchings/world/area_sam/sam_07/func_80240510_D2BD30.s deleted file mode 100644 index 684c6a88d1..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/func_80240510_D2BD30.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240510_D2C240 -/* D2C240 80240510 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2C244 80240514 AFB20018 */ sw $s2, 0x18($sp) -/* D2C248 80240518 0080902D */ daddu $s2, $a0, $zero -/* D2C24C 8024051C AFBF001C */ sw $ra, 0x1c($sp) -/* D2C250 80240520 AFB10014 */ sw $s1, 0x14($sp) -/* D2C254 80240524 AFB00010 */ sw $s0, 0x10($sp) -/* D2C258 80240528 8E50000C */ lw $s0, 0xc($s2) -/* D2C25C 8024052C 8E050000 */ lw $a1, ($s0) -/* D2C260 80240530 0C0B1EAF */ jal get_variable -/* D2C264 80240534 26100004 */ addiu $s0, $s0, 4 -/* D2C268 80240538 0C04417A */ jal get_entity_by_index -/* D2C26C 8024053C 0040202D */ daddu $a0, $v0, $zero -/* D2C270 80240540 8E050000 */ lw $a1, ($s0) -/* D2C274 80240544 26100004 */ addiu $s0, $s0, 4 -/* D2C278 80240548 0040882D */ daddu $s1, $v0, $zero -/* D2C27C 8024054C C6200048 */ lwc1 $f0, 0x48($s1) -/* D2C280 80240550 4600008D */ trunc.w.s $f2, $f0 -/* D2C284 80240554 44061000 */ mfc1 $a2, $f2 -/* D2C288 80240558 0C0B2026 */ jal set_variable -/* D2C28C 8024055C 0240202D */ daddu $a0, $s2, $zero -/* D2C290 80240560 8E050000 */ lw $a1, ($s0) -/* D2C294 80240564 26100004 */ addiu $s0, $s0, 4 -/* D2C298 80240568 C620004C */ lwc1 $f0, 0x4c($s1) -/* D2C29C 8024056C 4600008D */ trunc.w.s $f2, $f0 -/* D2C2A0 80240570 44061000 */ mfc1 $a2, $f2 -/* D2C2A4 80240574 0C0B2026 */ jal set_variable -/* D2C2A8 80240578 0240202D */ daddu $a0, $s2, $zero -/* D2C2AC 8024057C C6200050 */ lwc1 $f0, 0x50($s1) -/* D2C2B0 80240580 8E050000 */ lw $a1, ($s0) -/* D2C2B4 80240584 4600008D */ trunc.w.s $f2, $f0 -/* D2C2B8 80240588 44061000 */ mfc1 $a2, $f2 -/* D2C2BC 8024058C 0C0B2026 */ jal set_variable -/* D2C2C0 80240590 0240202D */ daddu $a0, $s2, $zero -/* D2C2C4 80240594 8FBF001C */ lw $ra, 0x1c($sp) -/* D2C2C8 80240598 8FB20018 */ lw $s2, 0x18($sp) -/* D2C2CC 8024059C 8FB10014 */ lw $s1, 0x14($sp) -/* D2C2D0 802405A0 8FB00010 */ lw $s0, 0x10($sp) -/* D2C2D4 802405A4 24020002 */ addiu $v0, $zero, 2 -/* D2C2D8 802405A8 03E00008 */ jr $ra -/* D2C2DC 802405AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_07/func_802405B0_D2BD30.s b/asm/nonmatchings/world/area_sam/sam_07/func_802405B0_D2BD30.s deleted file mode 100644 index 45b745a3b0..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/func_802405B0_D2BD30.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405B0_D2C2E0 -/* D2C2E0 802405B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2C2E4 802405B4 AFB10014 */ sw $s1, 0x14($sp) -/* D2C2E8 802405B8 0080882D */ daddu $s1, $a0, $zero -/* D2C2EC 802405BC AFBF0018 */ sw $ra, 0x18($sp) -/* D2C2F0 802405C0 AFB00010 */ sw $s0, 0x10($sp) -/* D2C2F4 802405C4 8E30000C */ lw $s0, 0xc($s1) -/* D2C2F8 802405C8 8E050000 */ lw $a1, ($s0) -/* D2C2FC 802405CC 0C0B1EAF */ jal get_variable -/* D2C300 802405D0 26100004 */ addiu $s0, $s0, 4 -/* D2C304 802405D4 0220202D */ daddu $a0, $s1, $zero -/* D2C308 802405D8 8E050000 */ lw $a1, ($s0) -/* D2C30C 802405DC 0C0B1EAF */ jal get_variable -/* D2C310 802405E0 0040802D */ daddu $s0, $v0, $zero -/* D2C314 802405E4 3C038016 */ lui $v1, 0x8016 -/* D2C318 802405E8 8463A552 */ lh $v1, -0x5aae($v1) -/* D2C31C 802405EC 10700003 */ beq $v1, $s0, .L802405FC -/* D2C320 802405F0 00000000 */ nop -/* D2C324 802405F4 1462000A */ bne $v1, $v0, .L80240620 -/* D2C328 802405F8 24020002 */ addiu $v0, $zero, 2 -.L802405FC: -/* D2C32C 802405FC 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* D2C330 80240600 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* D2C334 80240604 804300B4 */ lb $v1, 0xb4($v0) -/* D2C338 80240608 2402000E */ addiu $v0, $zero, 0xe -/* D2C33C 8024060C 10620003 */ beq $v1, $v0, .L8024061C -/* D2C340 80240610 24020010 */ addiu $v0, $zero, 0x10 -/* D2C344 80240614 14620002 */ bne $v1, $v0, .L80240620 -/* D2C348 80240618 24020002 */ addiu $v0, $zero, 2 -.L8024061C: -/* D2C34C 8024061C 0000102D */ daddu $v0, $zero, $zero -.L80240620: -/* D2C350 80240620 8FBF0018 */ lw $ra, 0x18($sp) -/* D2C354 80240624 8FB10014 */ lw $s1, 0x14($sp) -/* D2C358 80240628 8FB00010 */ lw $s0, 0x10($sp) -/* D2C35C 8024062C 03E00008 */ jr $ra -/* D2C360 80240630 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_07/func_80240634_D2BD30.s b/asm/nonmatchings/world/area_sam/sam_07/func_80240634_D2BD30.s deleted file mode 100644 index 9a25be2d33..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/func_80240634_D2BD30.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240634_D2C364 -/* D2C364 80240634 3C03800B */ lui $v1, %hi(gCameras) -/* D2C368 80240638 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* D2C36C 8024063C 94620002 */ lhu $v0, 2($v1) -/* D2C370 80240640 3042FFFE */ andi $v0, $v0, 0xfffe -/* D2C374 80240644 A4620002 */ sh $v0, 2($v1) -/* D2C378 80240648 03E00008 */ jr $ra -/* D2C37C 8024064C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_07/func_802406BC_D2BD30.s b/asm/nonmatchings/world/area_sam/sam_07/func_802406BC_D2BD30.s deleted file mode 100644 index 77af27fa6b..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/func_802406BC_D2BD30.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406BC_D2C3EC -/* D2C3EC 802406BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2C3F0 802406C0 AFB10014 */ sw $s1, 0x14($sp) -/* D2C3F4 802406C4 0080882D */ daddu $s1, $a0, $zero -/* D2C3F8 802406C8 AFBF0018 */ sw $ra, 0x18($sp) -/* D2C3FC 802406CC AFB00010 */ sw $s0, 0x10($sp) -/* D2C400 802406D0 8E300148 */ lw $s0, 0x148($s1) -/* D2C404 802406D4 0C00EABB */ jal get_npc_unsafe -/* D2C408 802406D8 86040008 */ lh $a0, 8($s0) -/* D2C40C 802406DC 0040202D */ daddu $a0, $v0, $zero -/* D2C410 802406E0 9482008E */ lhu $v0, 0x8e($a0) -/* D2C414 802406E4 2442FFFF */ addiu $v0, $v0, -1 -/* D2C418 802406E8 A482008E */ sh $v0, 0x8e($a0) -/* D2C41C 802406EC 00021400 */ sll $v0, $v0, 0x10 -/* D2C420 802406F0 1C400009 */ bgtz $v0, .L80240718 -/* D2C424 802406F4 24020003 */ addiu $v0, $zero, 3 -/* D2C428 802406F8 96030076 */ lhu $v1, 0x76($s0) -/* D2C42C 802406FC AE02006C */ sw $v0, 0x6c($s0) -/* D2C430 80240700 A483008E */ sh $v1, 0x8e($a0) -/* D2C434 80240704 8E0200CC */ lw $v0, 0xcc($s0) -/* D2C438 80240708 8C420024 */ lw $v0, 0x24($v0) -/* D2C43C 8024070C AC820028 */ sw $v0, 0x28($a0) -/* D2C440 80240710 24020020 */ addiu $v0, $zero, 0x20 -/* D2C444 80240714 AE220070 */ sw $v0, 0x70($s1) -.L80240718: -/* D2C448 80240718 8FBF0018 */ lw $ra, 0x18($sp) -/* D2C44C 8024071C 8FB10014 */ lw $s1, 0x14($sp) -/* D2C450 80240720 8FB00010 */ lw $s0, 0x10($sp) -/* D2C454 80240724 03E00008 */ jr $ra -/* D2C458 80240728 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_07/func_8024072C_D2BD30.s b/asm/nonmatchings/world/area_sam/sam_07/func_8024072C_D2BD30.s deleted file mode 100644 index 518539b4ab..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/func_8024072C_D2BD30.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024072C_D2C45C -/* D2C45C 8024072C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D2C460 80240730 AFB10034 */ sw $s1, 0x34($sp) -/* D2C464 80240734 0080882D */ daddu $s1, $a0, $zero -/* D2C468 80240738 AFBF0038 */ sw $ra, 0x38($sp) -/* D2C46C 8024073C AFB00030 */ sw $s0, 0x30($sp) -/* D2C470 80240740 8E300148 */ lw $s0, 0x148($s1) -/* D2C474 80240744 0C00EABB */ jal get_npc_unsafe -/* D2C478 80240748 86040008 */ lh $a0, 8($s0) -/* D2C47C 8024074C 0040282D */ daddu $a1, $v0, $zero -/* D2C480 80240750 94A2008E */ lhu $v0, 0x8e($a1) -/* D2C484 80240754 2442FFFF */ addiu $v0, $v0, -1 -/* D2C488 80240758 A4A2008E */ sh $v0, 0x8e($a1) -/* D2C48C 8024075C 00021400 */ sll $v0, $v0, 0x10 -/* D2C490 80240760 1C400023 */ bgtz $v0, .L802407F0 -/* D2C494 80240764 24020004 */ addiu $v0, $zero, 4 -/* D2C498 80240768 8E0300CC */ lw $v1, 0xcc($s0) -/* D2C49C 8024076C AE02006C */ sw $v0, 0x6c($s0) -/* D2C4A0 80240770 8C620000 */ lw $v0, ($v1) -/* D2C4A4 80240774 ACA20028 */ sw $v0, 0x28($a1) -/* D2C4A8 80240778 9602007A */ lhu $v0, 0x7a($s0) -/* D2C4AC 8024077C A4A2008E */ sh $v0, 0x8e($a1) -/* D2C4B0 80240780 8E020078 */ lw $v0, 0x78($s0) -/* D2C4B4 80240784 28420008 */ slti $v0, $v0, 8 -/* D2C4B8 80240788 14400018 */ bnez $v0, .L802407EC -/* D2C4BC 8024078C 24020021 */ addiu $v0, $zero, 0x21 -/* D2C4C0 80240790 24040003 */ addiu $a0, $zero, 3 -/* D2C4C4 80240794 27A30028 */ addiu $v1, $sp, 0x28 -/* D2C4C8 80240798 84A700A8 */ lh $a3, 0xa8($a1) -/* D2C4CC 8024079C 3C013F80 */ lui $at, 0x3f80 -/* D2C4D0 802407A0 44810000 */ mtc1 $at, $f0 -/* D2C4D4 802407A4 3C014000 */ lui $at, 0x4000 -/* D2C4D8 802407A8 44811000 */ mtc1 $at, $f2 -/* D2C4DC 802407AC 3C01C1A0 */ lui $at, 0xc1a0 -/* D2C4E0 802407B0 44812000 */ mtc1 $at, $f4 -/* D2C4E4 802407B4 44873000 */ mtc1 $a3, $f6 -/* D2C4E8 802407B8 00000000 */ nop -/* D2C4EC 802407BC 468031A0 */ cvt.s.w $f6, $f6 -/* D2C4F0 802407C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D2C4F4 802407C4 E7A20014 */ swc1 $f2, 0x14($sp) -/* D2C4F8 802407C8 E7A40018 */ swc1 $f4, 0x18($sp) -/* D2C4FC 802407CC 8E020078 */ lw $v0, 0x78($s0) -/* D2C500 802407D0 44073000 */ mfc1 $a3, $f6 -/* D2C504 802407D4 0000302D */ daddu $a2, $zero, $zero -/* D2C508 802407D8 AFA30020 */ sw $v1, 0x20($sp) -/* D2C50C 802407DC 2442FFFF */ addiu $v0, $v0, -1 -/* D2C510 802407E0 0C01BFA4 */ jal fx_emote -/* D2C514 802407E4 AFA2001C */ sw $v0, 0x1c($sp) -/* D2C518 802407E8 24020021 */ addiu $v0, $zero, 0x21 -.L802407EC: -/* D2C51C 802407EC AE220070 */ sw $v0, 0x70($s1) -.L802407F0: -/* D2C520 802407F0 8FBF0038 */ lw $ra, 0x38($sp) -/* D2C524 802407F4 8FB10034 */ lw $s1, 0x34($sp) -/* D2C528 802407F8 8FB00030 */ lw $s0, 0x30($sp) -/* D2C52C 802407FC 03E00008 */ jr $ra -/* D2C530 80240800 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_sam/sam_07/func_80240858_D2BD30.s b/asm/nonmatchings/world/area_sam/sam_07/func_80240858_D2BD30.s deleted file mode 100644 index 19d58b9f1d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/func_80240858_D2BD30.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240858_D2C588 -/* D2C588 80240858 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D2C58C 8024085C AFBF0024 */ sw $ra, 0x24($sp) -/* D2C590 80240860 AFB40020 */ sw $s4, 0x20($sp) -/* D2C594 80240864 AFB3001C */ sw $s3, 0x1c($sp) -/* D2C598 80240868 AFB20018 */ sw $s2, 0x18($sp) -/* D2C59C 8024086C AFB10014 */ sw $s1, 0x14($sp) -/* D2C5A0 80240870 AFB00010 */ sw $s0, 0x10($sp) -/* D2C5A4 80240874 F7B40028 */ sdc1 $f20, 0x28($sp) -/* D2C5A8 80240878 8C900148 */ lw $s0, 0x148($a0) -/* D2C5AC 8024087C 86040008 */ lh $a0, 8($s0) -/* D2C5B0 80240880 0C00EABB */ jal get_npc_unsafe -/* D2C5B4 80240884 24110001 */ addiu $s1, $zero, 1 -/* D2C5B8 80240888 86040008 */ lh $a0, 8($s0) -/* D2C5BC 8024088C 0040802D */ daddu $s0, $v0, $zero -/* D2C5C0 80240890 3C05800B */ lui $a1, %hi(gCameras) -/* D2C5C4 80240894 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* D2C5C8 80240898 3C03800A */ lui $v1, 0x800a -/* D2C5CC 8024089C 8463A634 */ lh $v1, -0x59cc($v1) -/* D2C5D0 802408A0 00912021 */ addu $a0, $a0, $s1 -/* D2C5D4 802408A4 00031080 */ sll $v0, $v1, 2 -/* D2C5D8 802408A8 00431021 */ addu $v0, $v0, $v1 -/* D2C5DC 802408AC 00021080 */ sll $v0, $v0, 2 -/* D2C5E0 802408B0 00431023 */ subu $v0, $v0, $v1 -/* D2C5E4 802408B4 000218C0 */ sll $v1, $v0, 3 -/* D2C5E8 802408B8 00431021 */ addu $v0, $v0, $v1 -/* D2C5EC 802408BC 000210C0 */ sll $v0, $v0, 3 -/* D2C5F0 802408C0 0C00FB3A */ jal get_enemy -/* D2C5F4 802408C4 00459021 */ addu $s2, $v0, $a1 -/* D2C5F8 802408C8 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* D2C5FC 802408CC 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* D2C600 802408D0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D2C604 802408D4 8E830000 */ lw $v1, ($s4) -/* D2C608 802408D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D2C60C 802408DC 8C660028 */ lw $a2, 0x28($v1) -/* D2C610 802408E0 8C670030 */ lw $a3, 0x30($v1) -/* D2C614 802408E4 0C00A7B5 */ jal dist2D -/* D2C618 802408E8 0040982D */ daddu $s3, $v0, $zero -/* D2C61C 802408EC C6620074 */ lwc1 $f2, 0x74($s3) -/* D2C620 802408F0 468010A0 */ cvt.s.w $f2, $f2 -/* D2C624 802408F4 4600103C */ c.lt.s $f2, $f0 -/* D2C628 802408F8 00000000 */ nop -/* D2C62C 802408FC 45030001 */ bc1tl .L80240904 -/* D2C630 80240900 0000882D */ daddu $s1, $zero, $zero -.L80240904: -/* D2C634 80240904 C64C006C */ lwc1 $f12, 0x6c($s2) -/* D2C638 80240908 C60E000C */ lwc1 $f14, 0xc($s0) -/* D2C63C 8024090C 3C014387 */ lui $at, 0x4387 -/* D2C640 80240910 4481A000 */ mtc1 $at, $f20 -/* D2C644 80240914 0C00A70A */ jal get_clamped_angle_diff -/* D2C648 80240918 00000000 */ nop -/* D2C64C 8024091C 0C00A6C9 */ jal clamp_angle -/* D2C650 80240920 46000306 */ mov.s $f12, $f0 -/* D2C654 80240924 3C018024 */ lui $at, 0x8024 -/* D2C658 80240928 D4223D80 */ ldc1 $f2, 0x3d80($at) -/* D2C65C 8024092C 46000021 */ cvt.d.s $f0, $f0 -/* D2C660 80240930 4622003C */ c.lt.d $f0, $f2 -/* D2C664 80240934 00000000 */ nop -/* D2C668 80240938 45000003 */ bc1f .L80240948 -/* D2C66C 8024093C 00000000 */ nop -/* D2C670 80240940 3C0142B4 */ lui $at, 0x42b4 -/* D2C674 80240944 4481A000 */ mtc1 $at, $f20 -.L80240948: -/* D2C678 80240948 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D2C67C 8024094C 8E820000 */ lw $v0, ($s4) -/* D2C680 80240950 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D2C684 80240954 8C460028 */ lw $a2, 0x28($v0) -/* D2C688 80240958 0C00A720 */ jal atan2 -/* D2C68C 8024095C 8C470030 */ lw $a3, 0x30($v0) -/* D2C690 80240960 4600A306 */ mov.s $f12, $f20 -/* D2C694 80240964 0C00A70A */ jal get_clamped_angle_diff -/* D2C698 80240968 46000386 */ mov.s $f14, $f0 -/* D2C69C 8024096C C6620078 */ lwc1 $f2, 0x78($s3) -/* D2C6A0 80240970 468010A0 */ cvt.s.w $f2, $f2 -/* D2C6A4 80240974 46000005 */ abs.s $f0, $f0 -/* D2C6A8 80240978 4600103C */ c.lt.s $f2, $f0 -/* D2C6AC 8024097C 00000000 */ nop -/* D2C6B0 80240980 45030001 */ bc1tl .L80240988 -/* D2C6B4 80240984 0000882D */ daddu $s1, $zero, $zero -.L80240988: -/* D2C6B8 80240988 8E820000 */ lw $v0, ($s4) -/* D2C6BC 8024098C C600003C */ lwc1 $f0, 0x3c($s0) -/* D2C6C0 80240990 C442002C */ lwc1 $f2, 0x2c($v0) -/* D2C6C4 80240994 860200A8 */ lh $v0, 0xa8($s0) -/* D2C6C8 80240998 46020001 */ sub.s $f0, $f0, $f2 -/* D2C6CC 8024099C 44821000 */ mtc1 $v0, $f2 -/* D2C6D0 802409A0 00000000 */ nop -/* D2C6D4 802409A4 468010A1 */ cvt.d.w $f2, $f2 -/* D2C6D8 802409A8 46221080 */ add.d $f2, $f2, $f2 -/* D2C6DC 802409AC 46000005 */ abs.s $f0, $f0 -/* D2C6E0 802409B0 46000021 */ cvt.d.s $f0, $f0 -/* D2C6E4 802409B4 4620103E */ c.le.d $f2, $f0 -/* D2C6E8 802409B8 00000000 */ nop -/* D2C6EC 802409BC 45030001 */ bc1tl .L802409C4 -/* D2C6F0 802409C0 0000882D */ daddu $s1, $zero, $zero -.L802409C4: -/* D2C6F4 802409C4 3C038011 */ lui $v1, 0x8011 -/* D2C6F8 802409C8 8063EBB3 */ lb $v1, -0x144d($v1) -/* D2C6FC 802409CC 24020009 */ addiu $v0, $zero, 9 -/* D2C700 802409D0 50620001 */ beql $v1, $v0, .L802409D8 -/* D2C704 802409D4 0000882D */ daddu $s1, $zero, $zero -.L802409D8: -/* D2C708 802409D8 24020007 */ addiu $v0, $zero, 7 -/* D2C70C 802409DC 50620001 */ beql $v1, $v0, .L802409E4 -/* D2C710 802409E0 0000882D */ daddu $s1, $zero, $zero -.L802409E4: -/* D2C714 802409E4 0220102D */ daddu $v0, $s1, $zero -/* D2C718 802409E8 8FBF0024 */ lw $ra, 0x24($sp) -/* D2C71C 802409EC 8FB40020 */ lw $s4, 0x20($sp) -/* D2C720 802409F0 8FB3001C */ lw $s3, 0x1c($sp) -/* D2C724 802409F4 8FB20018 */ lw $s2, 0x18($sp) -/* D2C728 802409F8 8FB10014 */ lw $s1, 0x14($sp) -/* D2C72C 802409FC 8FB00010 */ lw $s0, 0x10($sp) -/* D2C730 80240A00 D7B40028 */ ldc1 $f20, 0x28($sp) -/* D2C734 80240A04 03E00008 */ jr $ra -/* D2C738 80240A08 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_07/func_80240A0C_D2BD30.s b/asm/nonmatchings/world/area_sam/sam_07/func_80240A0C_D2BD30.s deleted file mode 100644 index cf8f9a27fb..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/func_80240A0C_D2BD30.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A0C_D2C73C -/* D2C73C 80240A0C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D2C740 80240A10 AFB40028 */ sw $s4, 0x28($sp) -/* D2C744 80240A14 0080A02D */ daddu $s4, $a0, $zero -/* D2C748 80240A18 AFBF002C */ sw $ra, 0x2c($sp) -/* D2C74C 80240A1C AFB30024 */ sw $s3, 0x24($sp) -/* D2C750 80240A20 AFB20020 */ sw $s2, 0x20($sp) -/* D2C754 80240A24 AFB1001C */ sw $s1, 0x1c($sp) -/* D2C758 80240A28 AFB00018 */ sw $s0, 0x18($sp) -/* D2C75C 80240A2C 8E910148 */ lw $s1, 0x148($s4) -/* D2C760 80240A30 86240008 */ lh $a0, 8($s1) -/* D2C764 80240A34 0C00EABB */ jal get_npc_unsafe -/* D2C768 80240A38 00A0802D */ daddu $s0, $a1, $zero -/* D2C76C 80240A3C 16000005 */ bnez $s0, .L80240A54 -/* D2C770 80240A40 0040902D */ daddu $s2, $v0, $zero -/* D2C774 80240A44 8E2200B0 */ lw $v0, 0xb0($s1) -/* D2C778 80240A48 30420004 */ andi $v0, $v0, 4 -/* D2C77C 80240A4C 10400015 */ beqz $v0, .L80240AA4 -/* D2C780 80240A50 00000000 */ nop -.L80240A54: -/* D2C784 80240A54 AE800070 */ sw $zero, 0x70($s4) -/* D2C788 80240A58 8E420000 */ lw $v0, ($s2) -/* D2C78C 80240A5C 3C031F30 */ lui $v1, 0x1f30 -/* D2C790 80240A60 A640008E */ sh $zero, 0x8e($s2) -/* D2C794 80240A64 34420102 */ ori $v0, $v0, 0x102 -/* D2C798 80240A68 AE420000 */ sw $v0, ($s2) -/* D2C79C 80240A6C 8E220000 */ lw $v0, ($s1) -/* D2C7A0 80240A70 3C01C47A */ lui $at, 0xc47a -/* D2C7A4 80240A74 44810000 */ mtc1 $at, $f0 -/* D2C7A8 80240A78 00431025 */ or $v0, $v0, $v1 -/* D2C7AC 80240A7C AE220000 */ sw $v0, ($s1) -/* D2C7B0 80240A80 AE400038 */ sw $zero, 0x38($s2) -/* D2C7B4 80240A84 E640003C */ swc1 $f0, 0x3c($s2) -/* D2C7B8 80240A88 AE400040 */ sw $zero, 0x40($s2) -/* D2C7BC 80240A8C 8E2300B0 */ lw $v1, 0xb0($s1) -/* D2C7C0 80240A90 30620004 */ andi $v0, $v1, 4 -/* D2C7C4 80240A94 10400003 */ beqz $v0, .L80240AA4 -/* D2C7C8 80240A98 2402FFFB */ addiu $v0, $zero, -5 -/* D2C7CC 80240A9C 00621024 */ and $v0, $v1, $v0 -/* D2C7D0 80240AA0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240AA4: -/* D2C7D4 80240AA4 8E930070 */ lw $s3, 0x70($s4) -/* D2C7D8 80240AA8 12600005 */ beqz $s3, .L80240AC0 -/* D2C7DC 80240AAC 24020001 */ addiu $v0, $zero, 1 -/* D2C7E0 80240AB0 12620048 */ beq $s3, $v0, .L80240BD4 -/* D2C7E4 80240AB4 00000000 */ nop -/* D2C7E8 80240AB8 08090312 */ j .L80240C48 -/* D2C7EC 80240ABC 00000000 */ nop -.L80240AC0: -/* D2C7F0 80240AC0 86240008 */ lh $a0, 8($s1) -/* D2C7F4 80240AC4 0C00FB3A */ jal get_enemy -/* D2C7F8 80240AC8 2484FFFF */ addiu $a0, $a0, -1 -/* D2C7FC 80240ACC 0040802D */ daddu $s0, $v0, $zero -/* D2C800 80240AD0 0C00EABB */ jal get_npc_unsafe -/* D2C804 80240AD4 86040008 */ lh $a0, 8($s0) -/* D2C808 80240AD8 24030001 */ addiu $v1, $zero, 1 -/* D2C80C 80240ADC 0040982D */ daddu $s3, $v0, $zero -/* D2C810 80240AE0 A2230007 */ sb $v1, 7($s1) -/* D2C814 80240AE4 8E03006C */ lw $v1, 0x6c($s0) -/* D2C818 80240AE8 24020003 */ addiu $v0, $zero, 3 -/* D2C81C 80240AEC 14620056 */ bne $v1, $v0, .L80240C48 -/* D2C820 80240AF0 00000000 */ nop -/* D2C824 80240AF4 8E2500A8 */ lw $a1, 0xa8($s1) -/* D2C828 80240AF8 10A00003 */ beqz $a1, .L80240B08 -/* D2C82C 80240AFC 0260202D */ daddu $a0, $s3, $zero -/* D2C830 80240B00 0C012530 */ jal func_800494C0 -/* D2C834 80240B04 0000302D */ daddu $a2, $zero, $zero -.L80240B08: -/* D2C838 80240B08 27A40010 */ addiu $a0, $sp, 0x10 -/* D2C83C 80240B0C C6280070 */ lwc1 $f8, 0x70($s1) -/* D2C840 80240B10 46804220 */ cvt.s.w $f8, $f8 -/* D2C844 80240B14 C6620034 */ lwc1 $f2, 0x34($s3) -/* D2C848 80240B18 3C014387 */ lui $at, 0x4387 -/* D2C84C 80240B1C 44810000 */ mtc1 $at, $f0 -/* D2C850 80240B20 44064000 */ mfc1 $a2, $f8 -/* D2C854 80240B24 46020001 */ sub.s $f0, $f0, $f2 -/* D2C858 80240B28 C6660038 */ lwc1 $f6, 0x38($s3) -/* D2C85C 80240B2C C6640040 */ lwc1 $f4, 0x40($s3) -/* D2C860 80240B30 44070000 */ mfc1 $a3, $f0 -/* D2C864 80240B34 27A50014 */ addiu $a1, $sp, 0x14 -/* D2C868 80240B38 E7A60010 */ swc1 $f6, 0x10($sp) -/* D2C86C 80240B3C 0C00A7E7 */ jal add_vec2D_polar -/* D2C870 80240B40 E7A40014 */ swc1 $f4, 0x14($sp) -/* D2C874 80240B44 C7A00010 */ lwc1 $f0, 0x10($sp) -/* D2C878 80240B48 4600020D */ trunc.w.s $f8, $f0 -/* D2C87C 80240B4C 44024000 */ mfc1 $v0, $f8 -/* D2C880 80240B50 E6400038 */ swc1 $f0, 0x38($s2) -/* D2C884 80240B54 A6220010 */ sh $v0, 0x10($s1) -/* D2C888 80240B58 C660003C */ lwc1 $f0, 0x3c($s3) -/* D2C88C 80240B5C C622006C */ lwc1 $f2, 0x6c($s1) -/* D2C890 80240B60 468010A0 */ cvt.s.w $f2, $f2 -/* D2C894 80240B64 46020000 */ add.s $f0, $f0, $f2 -/* D2C898 80240B68 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* D2C89C 80240B6C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* D2C8A0 80240B70 E640003C */ swc1 $f0, 0x3c($s2) -/* D2C8A4 80240B74 C7A20014 */ lwc1 $f2, 0x14($sp) -/* D2C8A8 80240B78 4600020D */ trunc.w.s $f8, $f0 -/* D2C8AC 80240B7C 44024000 */ mfc1 $v0, $f8 -/* D2C8B0 80240B80 00000000 */ nop -/* D2C8B4 80240B84 A6220012 */ sh $v0, 0x12($s1) -/* D2C8B8 80240B88 4600120D */ trunc.w.s $f8, $f2 -/* D2C8BC 80240B8C 44024000 */ mfc1 $v0, $f8 -/* D2C8C0 80240B90 E6420040 */ swc1 $f2, 0x40($s2) -/* D2C8C4 80240B94 A6220014 */ sh $v0, 0x14($s1) -/* D2C8C8 80240B98 8C660028 */ lw $a2, 0x28($v1) -/* D2C8CC 80240B9C 8C670030 */ lw $a3, 0x30($v1) -/* D2C8D0 80240BA0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* D2C8D4 80240BA4 0C00A720 */ jal atan2 -/* D2C8D8 80240BA8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* D2C8DC 80240BAC 3C03E0EF */ lui $v1, 0xe0ef -/* D2C8E0 80240BB0 E640000C */ swc1 $f0, 0xc($s2) -/* D2C8E4 80240BB4 8E220000 */ lw $v0, ($s1) -/* D2C8E8 80240BB8 3463FFFF */ ori $v1, $v1, 0xffff -/* D2C8EC 80240BBC 00431024 */ and $v0, $v0, $v1 -/* D2C8F0 80240BC0 AE220000 */ sw $v0, ($s1) -/* D2C8F4 80240BC4 24020001 */ addiu $v0, $zero, 1 -/* D2C8F8 80240BC8 A640008E */ sh $zero, 0x8e($s2) -/* D2C8FC 80240BCC 08090312 */ j .L80240C48 -/* D2C900 80240BD0 AE820070 */ sw $v0, 0x70($s4) -.L80240BD4: -/* D2C904 80240BD4 86240008 */ lh $a0, 8($s1) -/* D2C908 80240BD8 0C00FB3A */ jal get_enemy -/* D2C90C 80240BDC 2484FFFF */ addiu $a0, $a0, -1 -/* D2C910 80240BE0 0040802D */ daddu $s0, $v0, $zero -/* D2C914 80240BE4 0C00EABB */ jal get_npc_unsafe -/* D2C918 80240BE8 86040008 */ lh $a0, 8($s0) -/* D2C91C 80240BEC 9642008E */ lhu $v0, 0x8e($s2) -/* D2C920 80240BF0 24420001 */ addiu $v0, $v0, 1 -/* D2C924 80240BF4 A642008E */ sh $v0, 0x8e($s2) -/* D2C928 80240BF8 00021400 */ sll $v0, $v0, 0x10 -/* D2C92C 80240BFC 8E23007C */ lw $v1, 0x7c($s1) -/* D2C930 80240C00 00021403 */ sra $v0, $v0, 0x10 -/* D2C934 80240C04 0043102A */ slt $v0, $v0, $v1 -/* D2C938 80240C08 50400001 */ beql $v0, $zero, .L80240C10 -/* D2C93C 80240C0C A2200007 */ sb $zero, 7($s1) -.L80240C10: -/* D2C940 80240C10 8E03006C */ lw $v1, 0x6c($s0) -/* D2C944 80240C14 24020004 */ addiu $v0, $zero, 4 -/* D2C948 80240C18 1462000B */ bne $v1, $v0, .L80240C48 -/* D2C94C 80240C1C 3C021F10 */ lui $v0, 0x1f10 -/* D2C950 80240C20 8E230000 */ lw $v1, ($s1) -/* D2C954 80240C24 3C01C47A */ lui $at, 0xc47a -/* D2C958 80240C28 44810000 */ mtc1 $at, $f0 -/* D2C95C 80240C2C 00621825 */ or $v1, $v1, $v0 -/* D2C960 80240C30 AE230000 */ sw $v1, ($s1) -/* D2C964 80240C34 AE400038 */ sw $zero, 0x38($s2) -/* D2C968 80240C38 E640003C */ swc1 $f0, 0x3c($s2) -/* D2C96C 80240C3C AE400040 */ sw $zero, 0x40($s2) -/* D2C970 80240C40 A2330007 */ sb $s3, 7($s1) -/* D2C974 80240C44 AE800070 */ sw $zero, 0x70($s4) -.L80240C48: -/* D2C978 80240C48 8FBF002C */ lw $ra, 0x2c($sp) -/* D2C97C 80240C4C 8FB40028 */ lw $s4, 0x28($sp) -/* D2C980 80240C50 8FB30024 */ lw $s3, 0x24($sp) -/* D2C984 80240C54 8FB20020 */ lw $s2, 0x20($sp) -/* D2C988 80240C58 8FB1001C */ lw $s1, 0x1c($sp) -/* D2C98C 80240C5C 8FB00018 */ lw $s0, 0x18($sp) -/* D2C990 80240C60 0000102D */ daddu $v0, $zero, $zero -/* D2C994 80240C64 03E00008 */ jr $ra -/* D2C998 80240C68 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_07/func_80240F20_D2BD30.s b/asm/nonmatchings/world/area_sam/sam_07/func_80240F20_D2BD30.s deleted file mode 100644 index 0f21d3506c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/func_80240F20_D2BD30.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_D2CC50 -/* D2CC50 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2CC54 80240F24 AFB10014 */ sw $s1, 0x14($sp) -/* D2CC58 80240F28 0080882D */ daddu $s1, $a0, $zero -/* D2CC5C 80240F2C AFBF0018 */ sw $ra, 0x18($sp) -/* D2CC60 80240F30 AFB00010 */ sw $s0, 0x10($sp) -/* D2CC64 80240F34 8E300148 */ lw $s0, 0x148($s1) -/* D2CC68 80240F38 0C00EABB */ jal get_npc_unsafe -/* D2CC6C 80240F3C 86040008 */ lh $a0, 8($s0) -/* D2CC70 80240F40 0040202D */ daddu $a0, $v0, $zero -/* D2CC74 80240F44 8482008E */ lh $v0, 0x8e($a0) -/* D2CC78 80240F48 9483008E */ lhu $v1, 0x8e($a0) -/* D2CC7C 80240F4C 18400003 */ blez $v0, .L80240F5C -/* D2CC80 80240F50 2462FFFF */ addiu $v0, $v1, -1 -/* D2CC84 80240F54 080903DE */ j .L80240F78 -/* D2CC88 80240F58 A482008E */ sh $v0, 0x8e($a0) -.L80240F5C: -/* D2CC8C 80240F5C 8E0200CC */ lw $v0, 0xcc($s0) -/* D2CC90 80240F60 AE00006C */ sw $zero, 0x6c($s0) -/* D2CC94 80240F64 8C420000 */ lw $v0, ($v0) -/* D2CC98 80240F68 AC820028 */ sw $v0, 0x28($a0) -/* D2CC9C 80240F6C 24020001 */ addiu $v0, $zero, 1 -/* D2CCA0 80240F70 AE200074 */ sw $zero, 0x74($s1) -/* D2CCA4 80240F74 AE220070 */ sw $v0, 0x70($s1) -.L80240F78: -/* D2CCA8 80240F78 8FBF0018 */ lw $ra, 0x18($sp) -/* D2CCAC 80240F7C 8FB10014 */ lw $s1, 0x14($sp) -/* D2CCB0 80240F80 8FB00010 */ lw $s0, 0x10($sp) -/* D2CCB4 80240F84 03E00008 */ jr $ra -/* D2CCB8 80240F88 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_07/func_80240F8C_D2BD30.s b/asm/nonmatchings/world/area_sam/sam_07/func_80240F8C_D2BD30.s deleted file mode 100644 index 2a61d6746c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/func_80240F8C_D2BD30.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F8C_D2CCBC -/* D2CCBC 80240F8C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D2CCC0 80240F90 AFB3003C */ sw $s3, 0x3c($sp) -/* D2CCC4 80240F94 0080982D */ daddu $s3, $a0, $zero -/* D2CCC8 80240F98 AFBF0040 */ sw $ra, 0x40($sp) -/* D2CCCC 80240F9C AFB20038 */ sw $s2, 0x38($sp) -/* D2CCD0 80240FA0 AFB10034 */ sw $s1, 0x34($sp) -/* D2CCD4 80240FA4 AFB00030 */ sw $s0, 0x30($sp) -/* D2CCD8 80240FA8 8E720148 */ lw $s2, 0x148($s3) -/* D2CCDC 80240FAC 00A0882D */ daddu $s1, $a1, $zero -/* D2CCE0 80240FB0 86440008 */ lh $a0, 8($s2) -/* D2CCE4 80240FB4 0C00EABB */ jal get_npc_unsafe -/* D2CCE8 80240FB8 00C0802D */ daddu $s0, $a2, $zero -/* D2CCEC 80240FBC 0200202D */ daddu $a0, $s0, $zero -/* D2CCF0 80240FC0 0240282D */ daddu $a1, $s2, $zero -/* D2CCF4 80240FC4 AFA00010 */ sw $zero, 0x10($sp) -/* D2CCF8 80240FC8 8E26000C */ lw $a2, 0xc($s1) -/* D2CCFC 80240FCC 8E270010 */ lw $a3, 0x10($s1) -/* D2CD00 80240FD0 0C01242D */ jal func_800490B4 -/* D2CD04 80240FD4 0040882D */ daddu $s1, $v0, $zero -/* D2CD08 80240FD8 10400024 */ beqz $v0, .L8024106C -/* D2CD0C 80240FDC 0220202D */ daddu $a0, $s1, $zero -/* D2CD10 80240FE0 24050322 */ addiu $a1, $zero, 0x322 -/* D2CD14 80240FE4 0C012530 */ jal func_800494C0 -/* D2CD18 80240FE8 0000302D */ daddu $a2, $zero, $zero -/* D2CD1C 80240FEC 0000202D */ daddu $a0, $zero, $zero -/* D2CD20 80240FF0 0220282D */ daddu $a1, $s1, $zero -/* D2CD24 80240FF4 0000302D */ daddu $a2, $zero, $zero -/* D2CD28 80240FF8 2410000A */ addiu $s0, $zero, 0xa -/* D2CD2C 80240FFC 862300A8 */ lh $v1, 0xa8($s1) -/* D2CD30 80241000 3C013F80 */ lui $at, 0x3f80 -/* D2CD34 80241004 44810000 */ mtc1 $at, $f0 -/* D2CD38 80241008 3C014000 */ lui $at, 0x4000 -/* D2CD3C 8024100C 44811000 */ mtc1 $at, $f2 -/* D2CD40 80241010 3C01C1A0 */ lui $at, 0xc1a0 -/* D2CD44 80241014 44812000 */ mtc1 $at, $f4 -/* D2CD48 80241018 44833000 */ mtc1 $v1, $f6 -/* D2CD4C 8024101C 00000000 */ nop -/* D2CD50 80241020 468031A0 */ cvt.s.w $f6, $f6 -/* D2CD54 80241024 44073000 */ mfc1 $a3, $f6 -/* D2CD58 80241028 27A20028 */ addiu $v0, $sp, 0x28 -/* D2CD5C 8024102C AFB0001C */ sw $s0, 0x1c($sp) -/* D2CD60 80241030 AFA20020 */ sw $v0, 0x20($sp) -/* D2CD64 80241034 E7A00010 */ swc1 $f0, 0x10($sp) -/* D2CD68 80241038 E7A20014 */ swc1 $f2, 0x14($sp) -/* D2CD6C 8024103C 0C01BFA4 */ jal fx_emote -/* D2CD70 80241040 E7A40018 */ swc1 $f4, 0x18($sp) -/* D2CD74 80241044 0220202D */ daddu $a0, $s1, $zero -/* D2CD78 80241048 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D2CD7C 8024104C 0C012530 */ jal func_800494C0 -/* D2CD80 80241050 3C060020 */ lui $a2, 0x20 -/* D2CD84 80241054 8E4200CC */ lw $v0, 0xcc($s2) -/* D2CD88 80241058 8C420020 */ lw $v0, 0x20($v0) -/* D2CD8C 8024105C AE220028 */ sw $v0, 0x28($s1) -/* D2CD90 80241060 9642008E */ lhu $v0, 0x8e($s2) -/* D2CD94 80241064 A622008E */ sh $v0, 0x8e($s1) -/* D2CD98 80241068 AE700070 */ sw $s0, 0x70($s3) -.L8024106C: -/* D2CD9C 8024106C 8FBF0040 */ lw $ra, 0x40($sp) -/* D2CDA0 80241070 8FB3003C */ lw $s3, 0x3c($sp) -/* D2CDA4 80241074 8FB20038 */ lw $s2, 0x38($sp) -/* D2CDA8 80241078 8FB10034 */ lw $s1, 0x34($sp) -/* D2CDAC 8024107C 8FB00030 */ lw $s0, 0x30($sp) -/* D2CDB0 80241080 03E00008 */ jr $ra -/* D2CDB4 80241084 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_07/func_80241088_D2BD30.s b/asm/nonmatchings/world/area_sam/sam_07/func_80241088_D2BD30.s deleted file mode 100644 index 94b08e0255..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/func_80241088_D2BD30.s +++ /dev/null @@ -1,688 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241088_D2CDB8 -/* D2CDB8 80241088 27BDFF80 */ addiu $sp, $sp, -0x80 -/* D2CDBC 8024108C AFBF0064 */ sw $ra, 0x64($sp) -/* D2CDC0 80241090 AFBE0060 */ sw $fp, 0x60($sp) -/* D2CDC4 80241094 AFB7005C */ sw $s7, 0x5c($sp) -/* D2CDC8 80241098 AFB60058 */ sw $s6, 0x58($sp) -/* D2CDCC 8024109C AFB50054 */ sw $s5, 0x54($sp) -/* D2CDD0 802410A0 AFB40050 */ sw $s4, 0x50($sp) -/* D2CDD4 802410A4 AFB3004C */ sw $s3, 0x4c($sp) -/* D2CDD8 802410A8 AFB20048 */ sw $s2, 0x48($sp) -/* D2CDDC 802410AC AFB10044 */ sw $s1, 0x44($sp) -/* D2CDE0 802410B0 AFB00040 */ sw $s0, 0x40($sp) -/* D2CDE4 802410B4 F7B80078 */ sdc1 $f24, 0x78($sp) -/* D2CDE8 802410B8 F7B60070 */ sdc1 $f22, 0x70($sp) -/* D2CDEC 802410BC F7B40068 */ sdc1 $f20, 0x68($sp) -/* D2CDF0 802410C0 AFA40080 */ sw $a0, 0x80($sp) -/* D2CDF4 802410C4 8C960148 */ lw $s6, 0x148($a0) -/* D2CDF8 802410C8 00C0902D */ daddu $s2, $a2, $zero -/* D2CDFC 802410CC 86C40008 */ lh $a0, 8($s6) -/* D2CE00 802410D0 0C00EABB */ jal get_npc_unsafe -/* D2CE04 802410D4 0000B82D */ daddu $s7, $zero, $zero -/* D2CE08 802410D8 0040882D */ daddu $s1, $v0, $zero -/* D2CE0C 802410DC 9622008E */ lhu $v0, 0x8e($s1) -/* D2CE10 802410E0 2442FFFF */ addiu $v0, $v0, -1 -/* D2CE14 802410E4 A622008E */ sh $v0, 0x8e($s1) -/* D2CE18 802410E8 00021400 */ sll $v0, $v0, 0x10 -/* D2CE1C 802410EC 8EC30090 */ lw $v1, 0x90($s6) -/* D2CE20 802410F0 00021403 */ sra $v0, $v0, 0x10 -/* D2CE24 802410F4 0062182A */ slt $v1, $v1, $v0 -/* D2CE28 802410F8 14600005 */ bnez $v1, .L80241110 -/* D2CE2C 802410FC 02E0F02D */ daddu $fp, $s7, $zero -/* D2CE30 80241100 8EC20000 */ lw $v0, ($s6) -/* D2CE34 80241104 3C031F10 */ lui $v1, 0x1f10 -/* D2CE38 80241108 00431025 */ or $v0, $v0, $v1 -/* D2CE3C 8024110C AEC20000 */ sw $v0, ($s6) -.L80241110: -/* D2CE40 80241110 8622008E */ lh $v0, 0x8e($s1) -/* D2CE44 80241114 1440025D */ bnez $v0, .L80241A8C -/* D2CE48 80241118 00000000 */ nop -/* D2CE4C 8024111C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D2CE50 80241120 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D2CE54 80241124 0C00A6C9 */ jal clamp_angle -/* D2CE58 80241128 C44C00A8 */ lwc1 $f12, 0xa8($v0) -/* D2CE5C 8024112C 3C014334 */ lui $at, 0x4334 -/* D2CE60 80241130 44811000 */ mtc1 $at, $f2 -/* D2CE64 80241134 00000000 */ nop -/* D2CE68 80241138 4602003C */ c.lt.s $f0, $f2 -/* D2CE6C 8024113C 00000000 */ nop -/* D2CE70 80241140 45000011 */ bc1f .L80241188 -/* D2CE74 80241144 00000000 */ nop -/* D2CE78 80241148 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D2CE7C 8024114C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D2CE80 80241150 3C0142B4 */ lui $at, 0x42b4 -/* D2CE84 80241154 44816000 */ mtc1 $at, $f12 -/* D2CE88 80241158 00031080 */ sll $v0, $v1, 2 -/* D2CE8C 8024115C 00431021 */ addu $v0, $v0, $v1 -/* D2CE90 80241160 00021080 */ sll $v0, $v0, 2 -/* D2CE94 80241164 00431023 */ subu $v0, $v0, $v1 -/* D2CE98 80241168 000218C0 */ sll $v1, $v0, 3 -/* D2CE9C 8024116C 00431021 */ addu $v0, $v0, $v1 -/* D2CEA0 80241170 000210C0 */ sll $v0, $v0, 3 -/* D2CEA4 80241174 3C01800B */ lui $at, 0x800b -/* D2CEA8 80241178 00220821 */ addu $at, $at, $v0 -/* D2CEAC 8024117C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* D2CEB0 80241180 08090471 */ j .L802411C4 -/* D2CEB4 80241184 460C0301 */ sub.s $f12, $f0, $f12 -.L80241188: -/* D2CEB8 80241188 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* D2CEBC 8024118C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* D2CEC0 80241190 3C0142B4 */ lui $at, 0x42b4 -/* D2CEC4 80241194 44816000 */ mtc1 $at, $f12 -/* D2CEC8 80241198 00031080 */ sll $v0, $v1, 2 -/* D2CECC 8024119C 00431021 */ addu $v0, $v0, $v1 -/* D2CED0 802411A0 00021080 */ sll $v0, $v0, 2 -/* D2CED4 802411A4 00431023 */ subu $v0, $v0, $v1 -/* D2CED8 802411A8 000218C0 */ sll $v1, $v0, 3 -/* D2CEDC 802411AC 00431021 */ addu $v0, $v0, $v1 -/* D2CEE0 802411B0 000210C0 */ sll $v0, $v0, 3 -/* D2CEE4 802411B4 3C01800B */ lui $at, 0x800b -/* D2CEE8 802411B8 00220821 */ addu $at, $at, $v0 -/* D2CEEC 802411BC C4201DEC */ lwc1 $f0, 0x1dec($at) -/* D2CEF0 802411C0 460C0300 */ add.s $f12, $f0, $f12 -.L802411C4: -/* D2CEF4 802411C4 0C00A6C9 */ jal clamp_angle -/* D2CEF8 802411C8 00000000 */ nop -/* D2CEFC 802411CC 46000586 */ mov.s $f22, $f0 -/* D2CF00 802411D0 3C014334 */ lui $at, 0x4334 -/* D2CF04 802411D4 44816000 */ mtc1 $at, $f12 -/* D2CF08 802411D8 0C00A6C9 */ jal clamp_angle -/* D2CF0C 802411DC 460CB300 */ add.s $f12, $f22, $f12 -/* D2CF10 802411E0 8EC20088 */ lw $v0, 0x88($s6) -/* D2CF14 802411E4 14400010 */ bnez $v0, .L80241228 -/* D2CF18 802411E8 46000606 */ mov.s $f24, $f0 -/* D2CF1C 802411EC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D2CF20 802411F0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D2CF24 802411F4 804300B4 */ lb $v1, 0xb4($v0) -/* D2CF28 802411F8 3C014200 */ lui $at, 0x4200 -/* D2CF2C 802411FC 4481A000 */ mtc1 $at, $f20 -/* D2CF30 80241200 10600016 */ beqz $v1, .L8024125C -/* D2CF34 80241204 24020001 */ addiu $v0, $zero, 1 -/* D2CF38 80241208 3C0142C8 */ lui $at, 0x42c8 -/* D2CF3C 8024120C 4481A000 */ mtc1 $at, $f20 -/* D2CF40 80241210 14620013 */ bne $v1, $v0, .L80241260 -/* D2CF44 80241214 26300038 */ addiu $s0, $s1, 0x38 -/* D2CF48 80241218 3C0142B4 */ lui $at, 0x42b4 -/* D2CF4C 8024121C 4481A000 */ mtc1 $at, $f20 -/* D2CF50 80241220 08090499 */ j .L80241264 -/* D2CF54 80241224 0200202D */ daddu $a0, $s0, $zero -.L80241228: -/* D2CF58 80241228 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D2CF5C 8024122C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D2CF60 80241230 804300B4 */ lb $v1, 0xb4($v0) -/* D2CF64 80241234 3C014218 */ lui $at, 0x4218 -/* D2CF68 80241238 4481A000 */ mtc1 $at, $f20 -/* D2CF6C 8024123C 10600007 */ beqz $v1, .L8024125C -/* D2CF70 80241240 24020001 */ addiu $v0, $zero, 1 -/* D2CF74 80241244 3C0142B4 */ lui $at, 0x42b4 -/* D2CF78 80241248 4481A000 */ mtc1 $at, $f20 -/* D2CF7C 8024124C 14620004 */ bne $v1, $v0, .L80241260 -/* D2CF80 80241250 26300038 */ addiu $s0, $s1, 0x38 -/* D2CF84 80241254 3C014296 */ lui $at, 0x4296 -/* D2CF88 80241258 4481A000 */ mtc1 $at, $f20 -.L8024125C: -/* D2CF8C 8024125C 26300038 */ addiu $s0, $s1, 0x38 -.L80241260: -/* D2CF90 80241260 0200202D */ daddu $a0, $s0, $zero -.L80241264: -/* D2CF94 80241264 3C15800F */ lui $s5, %hi(gPlayerStatusPtr) -/* D2CF98 80241268 26B57B30 */ addiu $s5, $s5, %lo(gPlayerStatusPtr) -/* D2CF9C 8024126C 4407C000 */ mfc1 $a3, $f24 -/* D2CFA0 80241270 862200A6 */ lh $v0, 0xa6($s1) -/* D2CFA4 80241274 8EA30000 */ lw $v1, ($s5) -/* D2CFA8 80241278 44824000 */ mtc1 $v0, $f8 -/* D2CFAC 8024127C 00000000 */ nop -/* D2CFB0 80241280 46804220 */ cvt.s.w $f8, $f8 -/* D2CFB4 80241284 C4600028 */ lwc1 $f0, 0x28($v1) -/* D2CFB8 80241288 44064000 */ mfc1 $a2, $f8 -/* D2CFBC 8024128C 26330040 */ addiu $s3, $s1, 0x40 -/* D2CFC0 80241290 E6200038 */ swc1 $f0, 0x38($s1) -/* D2CFC4 80241294 C4600030 */ lwc1 $f0, 0x30($v1) -/* D2CFC8 80241298 0260282D */ daddu $a1, $s3, $zero -/* D2CFCC 8024129C 0C00A7E7 */ jal add_vec2D_polar -/* D2CFD0 802412A0 E6200040 */ swc1 $f0, 0x40($s1) -/* D2CFD4 802412A4 862200A6 */ lh $v0, 0xa6($s1) -/* D2CFD8 802412A8 44820000 */ mtc1 $v0, $f0 -/* D2CFDC 802412AC 00000000 */ nop -/* D2CFE0 802412B0 46800020 */ cvt.s.w $f0, $f0 -/* D2CFE4 802412B4 4600A000 */ add.s $f0, $f20, $f0 -/* D2CFE8 802412B8 4406B000 */ mfc1 $a2, $f22 -/* D2CFEC 802412BC 44050000 */ mfc1 $a1, $f0 -/* D2CFF0 802412C0 0C00EA95 */ jal npc_move_heading -/* D2CFF4 802412C4 0220202D */ daddu $a0, $s1, $zero -/* D2CFF8 802412C8 8EC20088 */ lw $v0, 0x88($s6) -/* D2CFFC 802412CC 1440005D */ bnez $v0, .L80241444 -/* D2D000 802412D0 00000000 */ nop -/* D2D004 802412D4 C6200038 */ lwc1 $f0, 0x38($s1) -/* D2D008 802412D8 3C018024 */ lui $at, 0x8024 -/* D2D00C 802412DC D4243F18 */ ldc1 $f4, 0x3f18($at) -/* D2D010 802412E0 46000021 */ cvt.d.s $f0, $f0 -/* D2D014 802412E4 4620203C */ c.lt.d $f4, $f0 -/* D2D018 802412E8 00000000 */ nop -/* D2D01C 802412EC 45000005 */ bc1f .L80241304 -/* D2D020 802412F0 00000000 */ nop -/* D2D024 802412F4 3C0143BE */ lui $at, 0x43be -/* D2D028 802412F8 44810000 */ mtc1 $at, $f0 -/* D2D02C 802412FC 00000000 */ nop -/* D2D030 80241300 E6200038 */ swc1 $f0, 0x38($s1) -.L80241304: -/* D2D034 80241304 C6200038 */ lwc1 $f0, 0x38($s1) -/* D2D038 80241308 3C018024 */ lui $at, 0x8024 -/* D2D03C 8024130C D4223F20 */ ldc1 $f2, 0x3f20($at) -/* D2D040 80241310 46000021 */ cvt.d.s $f0, $f0 -/* D2D044 80241314 4622003C */ c.lt.d $f0, $f2 -/* D2D048 80241318 00000000 */ nop -/* D2D04C 8024131C 45000005 */ bc1f .L80241334 -/* D2D050 80241320 00000000 */ nop -/* D2D054 80241324 3C01C3BE */ lui $at, 0xc3be -/* D2D058 80241328 44810000 */ mtc1 $at, $f0 -/* D2D05C 8024132C 00000000 */ nop -/* D2D060 80241330 E6200038 */ swc1 $f0, 0x38($s1) -.L80241334: -/* D2D064 80241334 C6200040 */ lwc1 $f0, 0x40($s1) -/* D2D068 80241338 46000021 */ cvt.d.s $f0, $f0 -/* D2D06C 8024133C 4620203C */ c.lt.d $f4, $f0 -/* D2D070 80241340 00000000 */ nop -/* D2D074 80241344 45000005 */ bc1f .L8024135C -/* D2D078 80241348 00000000 */ nop -/* D2D07C 8024134C 3C0143BE */ lui $at, 0x43be -/* D2D080 80241350 44810000 */ mtc1 $at, $f0 -/* D2D084 80241354 00000000 */ nop -/* D2D088 80241358 E6200040 */ swc1 $f0, 0x40($s1) -.L8024135C: -/* D2D08C 8024135C C6200040 */ lwc1 $f0, 0x40($s1) -/* D2D090 80241360 46000021 */ cvt.d.s $f0, $f0 -/* D2D094 80241364 4622003C */ c.lt.d $f0, $f2 -/* D2D098 80241368 00000000 */ nop -/* D2D09C 8024136C 45000005 */ bc1f .L80241384 -/* D2D0A0 80241370 00000000 */ nop -/* D2D0A4 80241374 3C01C3BE */ lui $at, 0xc3be -/* D2D0A8 80241378 44810000 */ mtc1 $at, $f0 -/* D2D0AC 8024137C 00000000 */ nop -/* D2D0B0 80241380 E6200040 */ swc1 $f0, 0x40($s1) -.L80241384: -/* D2D0B4 80241384 C6220038 */ lwc1 $f2, 0x38($s1) -/* D2D0B8 80241388 46021082 */ mul.s $f2, $f2, $f2 -/* D2D0BC 8024138C 00000000 */ nop -/* D2D0C0 80241390 C6200040 */ lwc1 $f0, 0x40($s1) -/* D2D0C4 80241394 46000002 */ mul.s $f0, $f0, $f0 -/* D2D0C8 80241398 00000000 */ nop -/* D2D0CC 8024139C 46001300 */ add.s $f12, $f2, $f0 -/* D2D0D0 802413A0 46006004 */ sqrt.s $f0, $f12 -/* D2D0D4 802413A4 46000032 */ c.eq.s $f0, $f0 -/* D2D0D8 802413A8 00000000 */ nop -/* D2D0DC 802413AC 45010003 */ bc1t .L802413BC -/* D2D0E0 802413B0 00000000 */ nop -/* D2D0E4 802413B4 0C0187BC */ jal sqrtf -/* D2D0E8 802413B8 00000000 */ nop -.L802413BC: -/* D2D0EC 802413BC 8E260038 */ lw $a2, 0x38($s1) -/* D2D0F0 802413C0 8E270040 */ lw $a3, 0x40($s1) -/* D2D0F4 802413C4 4480A000 */ mtc1 $zero, $f20 -/* D2D0F8 802413C8 E7A00038 */ swc1 $f0, 0x38($sp) -/* D2D0FC 802413CC 4600A306 */ mov.s $f12, $f20 -/* D2D100 802413D0 0C00A720 */ jal atan2 -/* D2D104 802413D4 4600A386 */ mov.s $f14, $f20 -/* D2D108 802413D8 46000586 */ mov.s $f22, $f0 -/* D2D10C 802413DC C7A20038 */ lwc1 $f2, 0x38($sp) -/* D2D110 802413E0 3C018024 */ lui $at, 0x8024 -/* D2D114 802413E4 D4203F28 */ ldc1 $f0, 0x3f28($at) -/* D2D118 802413E8 460010A1 */ cvt.d.s $f2, $f2 -/* D2D11C 802413EC 4620103C */ c.lt.d $f2, $f0 -/* D2D120 802413F0 00000000 */ nop -/* D2D124 802413F4 45000004 */ bc1f .L80241408 -/* D2D128 802413F8 0200202D */ daddu $a0, $s0, $zero -/* D2D12C 802413FC 3C064398 */ lui $a2, 0x4398 -/* D2D130 80241400 0809050A */ j .L80241428 -/* D2D134 80241404 34C68000 */ ori $a2, $a2, 0x8000 -.L80241408: -/* D2D138 80241408 3C018024 */ lui $at, 0x8024 -/* D2D13C 8024140C D4203F30 */ ldc1 $f0, 0x3f30($at) -/* D2D140 80241410 4622003C */ c.lt.d $f0, $f2 -/* D2D144 80241414 00000000 */ nop -/* D2D148 80241418 450000FA */ bc1f .L80241804 -/* D2D14C 8024141C 00000000 */ nop -/* D2D150 80241420 3C0643BB */ lui $a2, 0x43bb -/* D2D154 80241424 34C68000 */ ori $a2, $a2, 0x8000 -.L80241428: -/* D2D158 80241428 4407B000 */ mfc1 $a3, $f22 -/* D2D15C 8024142C 0260282D */ daddu $a1, $s3, $zero -/* D2D160 80241430 E6340038 */ swc1 $f20, 0x38($s1) -/* D2D164 80241434 0C00A7E7 */ jal add_vec2D_polar -/* D2D168 80241438 E6340040 */ swc1 $f20, 0x40($s1) -/* D2D16C 8024143C 08090601 */ j .L80241804 -/* D2D170 80241440 00000000 */ nop -.L80241444: -/* D2D174 80241444 8E220000 */ lw $v0, ($s1) -/* D2D178 80241448 30420040 */ andi $v0, $v0, 0x40 -/* D2D17C 8024144C 144000B0 */ bnez $v0, .L80241710 -/* D2D180 80241450 27A50020 */ addiu $a1, $sp, 0x20 -/* D2D184 80241454 27B40020 */ addiu $s4, $sp, 0x20 -/* D2D188 80241458 0280282D */ daddu $a1, $s4, $zero -/* D2D18C 8024145C 27B30024 */ addiu $s3, $sp, 0x24 -/* D2D190 80241460 8EA20000 */ lw $v0, ($s5) -/* D2D194 80241464 3C014032 */ lui $at, 0x4032 -/* D2D198 80241468 44811800 */ mtc1 $at, $f3 -/* D2D19C 8024146C 44801000 */ mtc1 $zero, $f2 -/* D2D1A0 80241470 C440002C */ lwc1 $f0, 0x2c($v0) -/* D2D1A4 80241474 C4460028 */ lwc1 $f6, 0x28($v0) -/* D2D1A8 80241478 C4440030 */ lwc1 $f4, 0x30($v0) -/* D2D1AC 8024147C 46000021 */ cvt.d.s $f0, $f0 -/* D2D1B0 80241480 46220000 */ add.d $f0, $f0, $f2 -/* D2D1B4 80241484 E7A60020 */ swc1 $f6, 0x20($sp) -/* D2D1B8 80241488 E7A40028 */ swc1 $f4, 0x28($sp) -/* D2D1BC 8024148C 46200020 */ cvt.s.d $f0, $f0 -/* D2D1C0 80241490 E7A00024 */ swc1 $f0, 0x24($sp) -/* D2D1C4 80241494 E7B40010 */ swc1 $f20, 0x10($sp) -/* D2D1C8 80241498 E7B60014 */ swc1 $f22, 0x14($sp) -/* D2D1CC 8024149C 862200A8 */ lh $v0, 0xa8($s1) -/* D2D1D0 802414A0 0260302D */ daddu $a2, $s3, $zero -/* D2D1D4 802414A4 44820000 */ mtc1 $v0, $f0 -/* D2D1D8 802414A8 00000000 */ nop -/* D2D1DC 802414AC 46800020 */ cvt.s.w $f0, $f0 -/* D2D1E0 802414B0 E7A00018 */ swc1 $f0, 0x18($sp) -/* D2D1E4 802414B4 862200A6 */ lh $v0, 0xa6($s1) -/* D2D1E8 802414B8 27B00028 */ addiu $s0, $sp, 0x28 -/* D2D1EC 802414BC 44820000 */ mtc1 $v0, $f0 -/* D2D1F0 802414C0 00000000 */ nop -/* D2D1F4 802414C4 46800020 */ cvt.s.w $f0, $f0 -/* D2D1F8 802414C8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* D2D1FC 802414CC 8E240080 */ lw $a0, 0x80($s1) -/* D2D200 802414D0 0C037711 */ jal func_800DDC44 -/* D2D204 802414D4 0200382D */ daddu $a3, $s0, $zero -/* D2D208 802414D8 104000CA */ beqz $v0, .L80241804 -/* D2D20C 802414DC 0280282D */ daddu $a1, $s4, $zero -/* D2D210 802414E0 8EA20000 */ lw $v0, ($s5) -/* D2D214 802414E4 3C018024 */ lui $at, 0x8024 -/* D2D218 802414E8 D4223F38 */ ldc1 $f2, 0x3f38($at) -/* D2D21C 802414EC C440002C */ lwc1 $f0, 0x2c($v0) -/* D2D220 802414F0 C4460028 */ lwc1 $f6, 0x28($v0) -/* D2D224 802414F4 C4440030 */ lwc1 $f4, 0x30($v0) -/* D2D228 802414F8 46000021 */ cvt.d.s $f0, $f0 -/* D2D22C 802414FC 46220000 */ add.d $f0, $f0, $f2 -/* D2D230 80241500 E7A60020 */ swc1 $f6, 0x20($sp) -/* D2D234 80241504 E7A40028 */ swc1 $f4, 0x28($sp) -/* D2D238 80241508 46200020 */ cvt.s.d $f0, $f0 -/* D2D23C 8024150C E7A00024 */ swc1 $f0, 0x24($sp) -/* D2D240 80241510 E7B40010 */ swc1 $f20, 0x10($sp) -/* D2D244 80241514 E7B60014 */ swc1 $f22, 0x14($sp) -/* D2D248 80241518 862200A8 */ lh $v0, 0xa8($s1) -/* D2D24C 8024151C 44820000 */ mtc1 $v0, $f0 -/* D2D250 80241520 00000000 */ nop -/* D2D254 80241524 46800020 */ cvt.s.w $f0, $f0 -/* D2D258 80241528 E7A00018 */ swc1 $f0, 0x18($sp) -/* D2D25C 8024152C 862200A6 */ lh $v0, 0xa6($s1) -/* D2D260 80241530 0260302D */ daddu $a2, $s3, $zero -/* D2D264 80241534 44820000 */ mtc1 $v0, $f0 -/* D2D268 80241538 00000000 */ nop -/* D2D26C 8024153C 46800020 */ cvt.s.w $f0, $f0 -/* D2D270 80241540 E7A0001C */ swc1 $f0, 0x1c($sp) -/* D2D274 80241544 8E240080 */ lw $a0, 0x80($s1) -/* D2D278 80241548 0C037711 */ jal func_800DDC44 -/* D2D27C 8024154C 0200382D */ daddu $a3, $s0, $zero -/* D2D280 80241550 27A5002C */ addiu $a1, $sp, 0x2c -/* D2D284 80241554 27A60030 */ addiu $a2, $sp, 0x30 -/* D2D288 80241558 27A70034 */ addiu $a3, $sp, 0x34 -/* D2D28C 8024155C 27A30038 */ addiu $v1, $sp, 0x38 -/* D2D290 80241560 C6220038 */ lwc1 $f2, 0x38($s1) -/* D2D294 80241564 C620003C */ lwc1 $f0, 0x3c($s1) -/* D2D298 80241568 3C014348 */ lui $at, 0x4348 -/* D2D29C 8024156C 44813000 */ mtc1 $at, $f6 -/* D2D2A0 80241570 46000021 */ cvt.d.s $f0, $f0 -/* D2D2A4 80241574 E7A2002C */ swc1 $f2, 0x2c($sp) -/* D2D2A8 80241578 3C014059 */ lui $at, 0x4059 -/* D2D2AC 8024157C 44811800 */ mtc1 $at, $f3 -/* D2D2B0 80241580 44801000 */ mtc1 $zero, $f2 -/* D2D2B4 80241584 C6240040 */ lwc1 $f4, 0x40($s1) -/* D2D2B8 80241588 46220000 */ add.d $f0, $f0, $f2 -/* D2D2BC 8024158C E7A60038 */ swc1 $f6, 0x38($sp) -/* D2D2C0 80241590 E7A40034 */ swc1 $f4, 0x34($sp) -/* D2D2C4 80241594 46200020 */ cvt.s.d $f0, $f0 -/* D2D2C8 80241598 E7A00030 */ swc1 $f0, 0x30($sp) -/* D2D2CC 8024159C AFA30010 */ sw $v1, 0x10($sp) -/* D2D2D0 802415A0 8E240080 */ lw $a0, 0x80($s1) -/* D2D2D4 802415A4 0C0372DF */ jal func_800DCB7C -/* D2D2D8 802415A8 0040802D */ daddu $s0, $v0, $zero -/* D2D2DC 802415AC 1600001C */ bnez $s0, .L80241620 -/* D2D2E0 802415B0 00000000 */ nop -/* D2D2E4 802415B4 1040001A */ beqz $v0, .L80241620 -/* D2D2E8 802415B8 00000000 */ nop -/* D2D2EC 802415BC C7A20038 */ lwc1 $f2, 0x38($sp) -/* D2D2F0 802415C0 3C014054 */ lui $at, 0x4054 -/* D2D2F4 802415C4 44810800 */ mtc1 $at, $f1 -/* D2D2F8 802415C8 44800000 */ mtc1 $zero, $f0 -/* D2D2FC 802415CC 460010A1 */ cvt.d.s $f2, $f2 -/* D2D300 802415D0 4622003C */ c.lt.d $f0, $f2 -/* D2D304 802415D4 00000000 */ nop -/* D2D308 802415D8 45000011 */ bc1f .L80241620 -/* D2D30C 802415DC 00000000 */ nop -/* D2D310 802415E0 3C01405E */ lui $at, 0x405e -/* D2D314 802415E4 44810800 */ mtc1 $at, $f1 -/* D2D318 802415E8 44800000 */ mtc1 $zero, $f0 -/* D2D31C 802415EC 00000000 */ nop -/* D2D320 802415F0 4620103C */ c.lt.d $f2, $f0 -/* D2D324 802415F4 00000000 */ nop -/* D2D328 802415F8 45000009 */ bc1f .L80241620 -/* D2D32C 802415FC 00000000 */ nop -/* D2D330 80241600 C622003C */ lwc1 $f2, 0x3c($s1) -/* D2D334 80241604 C7A00030 */ lwc1 $f0, 0x30($sp) -/* D2D338 80241608 46001032 */ c.eq.s $f2, $f0 -/* D2D33C 8024160C 00000000 */ nop -/* D2D340 80241610 45010003 */ bc1t .L80241620 -/* D2D344 80241614 00000000 */ nop -/* D2D348 80241618 08090601 */ j .L80241804 -/* D2D34C 8024161C 241E0001 */ addiu $fp, $zero, 1 -.L80241620: -/* D2D350 80241620 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* D2D354 80241624 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* D2D358 80241628 8E020000 */ lw $v0, ($s0) -/* D2D35C 8024162C 3C014024 */ lui $at, 0x4024 -/* D2D360 80241630 44811800 */ mtc1 $at, $f3 -/* D2D364 80241634 44801000 */ mtc1 $zero, $f2 -/* D2D368 80241638 C440002C */ lwc1 $f0, 0x2c($v0) -/* D2D36C 8024163C C4460028 */ lwc1 $f6, 0x28($v0) -/* D2D370 80241640 C4440030 */ lwc1 $f4, 0x30($v0) -/* D2D374 80241644 46000021 */ cvt.d.s $f0, $f0 -/* D2D378 80241648 46220000 */ add.d $f0, $f0, $f2 -/* D2D37C 8024164C E7A60020 */ swc1 $f6, 0x20($sp) -/* D2D380 80241650 E7A40028 */ swc1 $f4, 0x28($sp) -/* D2D384 80241654 46200020 */ cvt.s.d $f0, $f0 -/* D2D388 80241658 E7A00024 */ swc1 $f0, 0x24($sp) -/* D2D38C 8024165C E7B40010 */ swc1 $f20, 0x10($sp) -/* D2D390 80241660 E7B60014 */ swc1 $f22, 0x14($sp) -/* D2D394 80241664 862200A8 */ lh $v0, 0xa8($s1) -/* D2D398 80241668 27A50020 */ addiu $a1, $sp, 0x20 -/* D2D39C 8024166C 44820000 */ mtc1 $v0, $f0 -/* D2D3A0 80241670 00000000 */ nop -/* D2D3A4 80241674 46800020 */ cvt.s.w $f0, $f0 -/* D2D3A8 80241678 E7A00018 */ swc1 $f0, 0x18($sp) -/* D2D3AC 8024167C 862200A6 */ lh $v0, 0xa6($s1) -/* D2D3B0 80241680 27A60024 */ addiu $a2, $sp, 0x24 -/* D2D3B4 80241684 44820000 */ mtc1 $v0, $f0 -/* D2D3B8 80241688 00000000 */ nop -/* D2D3BC 8024168C 46800020 */ cvt.s.w $f0, $f0 -/* D2D3C0 80241690 E7A0001C */ swc1 $f0, 0x1c($sp) -/* D2D3C4 80241694 8E240080 */ lw $a0, 0x80($s1) -/* D2D3C8 80241698 0C037711 */ jal func_800DDC44 -/* D2D3CC 8024169C 27A70028 */ addiu $a3, $sp, 0x28 -/* D2D3D0 802416A0 8FA60020 */ lw $a2, 0x20($sp) -/* D2D3D4 802416A4 8E020000 */ lw $v0, ($s0) -/* D2D3D8 802416A8 8FA70028 */ lw $a3, 0x28($sp) -/* D2D3DC 802416AC C44C0028 */ lwc1 $f12, 0x28($v0) -/* D2D3E0 802416B0 C44E0030 */ lwc1 $f14, 0x30($v0) -/* D2D3E4 802416B4 0C00A7B5 */ jal dist2D -/* D2D3E8 802416B8 24170001 */ addiu $s7, $zero, 1 -/* D2D3EC 802416BC 46000506 */ mov.s $f20, $f0 -/* D2D3F0 802416C0 8E030000 */ lw $v1, ($s0) -/* D2D3F4 802416C4 862200A6 */ lh $v0, 0xa6($s1) -/* D2D3F8 802416C8 4407C000 */ mfc1 $a3, $f24 -/* D2D3FC 802416CC 44824000 */ mtc1 $v0, $f8 -/* D2D400 802416D0 00000000 */ nop -/* D2D404 802416D4 46804220 */ cvt.s.w $f8, $f8 -/* D2D408 802416D8 C4600028 */ lwc1 $f0, 0x28($v1) -/* D2D40C 802416DC 44064000 */ mfc1 $a2, $f8 -/* D2D410 802416E0 26240038 */ addiu $a0, $s1, 0x38 -/* D2D414 802416E4 E6200038 */ swc1 $f0, 0x38($s1) -/* D2D418 802416E8 C4600030 */ lwc1 $f0, 0x30($v1) -/* D2D41C 802416EC 26250040 */ addiu $a1, $s1, 0x40 -/* D2D420 802416F0 0C00A7E7 */ jal add_vec2D_polar -/* D2D424 802416F4 E6200040 */ swc1 $f0, 0x40($s1) -/* D2D428 802416F8 862200A6 */ lh $v0, 0xa6($s1) -/* D2D42C 802416FC 44820000 */ mtc1 $v0, $f0 -/* D2D430 80241700 00000000 */ nop -/* D2D434 80241704 46800020 */ cvt.s.w $f0, $f0 -/* D2D438 80241708 080905FD */ j .L802417F4 -/* D2D43C 8024170C 4600A500 */ add.s $f20, $f20, $f0 -.L80241710: -/* D2D440 80241710 8EA20000 */ lw $v0, ($s5) -/* D2D444 80241714 3C014032 */ lui $at, 0x4032 -/* D2D448 80241718 44811800 */ mtc1 $at, $f3 -/* D2D44C 8024171C 44801000 */ mtc1 $zero, $f2 -/* D2D450 80241720 C440002C */ lwc1 $f0, 0x2c($v0) -/* D2D454 80241724 C4460028 */ lwc1 $f6, 0x28($v0) -/* D2D458 80241728 C4440030 */ lwc1 $f4, 0x30($v0) -/* D2D45C 8024172C 46000021 */ cvt.d.s $f0, $f0 -/* D2D460 80241730 46220000 */ add.d $f0, $f0, $f2 -/* D2D464 80241734 E7A60020 */ swc1 $f6, 0x20($sp) -/* D2D468 80241738 E7A40028 */ swc1 $f4, 0x28($sp) -/* D2D46C 8024173C 46200020 */ cvt.s.d $f0, $f0 -/* D2D470 80241740 E7A00024 */ swc1 $f0, 0x24($sp) -/* D2D474 80241744 E7B40010 */ swc1 $f20, 0x10($sp) -/* D2D478 80241748 E7B60014 */ swc1 $f22, 0x14($sp) -/* D2D47C 8024174C 862200A8 */ lh $v0, 0xa8($s1) -/* D2D480 80241750 44820000 */ mtc1 $v0, $f0 -/* D2D484 80241754 00000000 */ nop -/* D2D488 80241758 46800020 */ cvt.s.w $f0, $f0 -/* D2D48C 8024175C E7A00018 */ swc1 $f0, 0x18($sp) -/* D2D490 80241760 862200A6 */ lh $v0, 0xa6($s1) -/* D2D494 80241764 27A60024 */ addiu $a2, $sp, 0x24 -/* D2D498 80241768 44820000 */ mtc1 $v0, $f0 -/* D2D49C 8024176C 00000000 */ nop -/* D2D4A0 80241770 46800020 */ cvt.s.w $f0, $f0 -/* D2D4A4 80241774 E7A0001C */ swc1 $f0, 0x1c($sp) -/* D2D4A8 80241778 8E240080 */ lw $a0, 0x80($s1) -/* D2D4AC 8024177C 0C037711 */ jal func_800DDC44 -/* D2D4B0 80241780 27A70028 */ addiu $a3, $sp, 0x28 -/* D2D4B4 80241784 1040001F */ beqz $v0, .L80241804 -/* D2D4B8 80241788 00000000 */ nop -/* D2D4BC 8024178C 8FA60020 */ lw $a2, 0x20($sp) -/* D2D4C0 80241790 8EA20000 */ lw $v0, ($s5) -/* D2D4C4 80241794 8FA70028 */ lw $a3, 0x28($sp) -/* D2D4C8 80241798 C44C0028 */ lwc1 $f12, 0x28($v0) -/* D2D4CC 8024179C 0C00A7B5 */ jal dist2D -/* D2D4D0 802417A0 C44E0030 */ lwc1 $f14, 0x30($v0) -/* D2D4D4 802417A4 46000506 */ mov.s $f20, $f0 -/* D2D4D8 802417A8 8EA30000 */ lw $v1, ($s5) -/* D2D4DC 802417AC 862200A6 */ lh $v0, 0xa6($s1) -/* D2D4E0 802417B0 4407C000 */ mfc1 $a3, $f24 -/* D2D4E4 802417B4 44824000 */ mtc1 $v0, $f8 -/* D2D4E8 802417B8 00000000 */ nop -/* D2D4EC 802417BC 46804220 */ cvt.s.w $f8, $f8 -/* D2D4F0 802417C0 C4600028 */ lwc1 $f0, 0x28($v1) -/* D2D4F4 802417C4 44064000 */ mfc1 $a2, $f8 -/* D2D4F8 802417C8 0200202D */ daddu $a0, $s0, $zero -/* D2D4FC 802417CC E6200038 */ swc1 $f0, 0x38($s1) -/* D2D500 802417D0 C4600030 */ lwc1 $f0, 0x30($v1) -/* D2D504 802417D4 0260282D */ daddu $a1, $s3, $zero -/* D2D508 802417D8 0C00A7E7 */ jal add_vec2D_polar -/* D2D50C 802417DC E6200040 */ swc1 $f0, 0x40($s1) -/* D2D510 802417E0 862200A6 */ lh $v0, 0xa6($s1) -/* D2D514 802417E4 44820000 */ mtc1 $v0, $f0 -/* D2D518 802417E8 00000000 */ nop -/* D2D51C 802417EC 46800020 */ cvt.s.w $f0, $f0 -/* D2D520 802417F0 4600A500 */ add.s $f20, $f20, $f0 -.L802417F4: -/* D2D524 802417F4 4406B000 */ mfc1 $a2, $f22 -/* D2D528 802417F8 4405A000 */ mfc1 $a1, $f20 -/* D2D52C 802417FC 0C00EA95 */ jal npc_move_heading -/* D2D530 80241800 0220202D */ daddu $a0, $s1, $zero -.L80241804: -/* D2D534 80241804 C6400008 */ lwc1 $f0, 8($s2) -/* D2D538 80241808 46800020 */ cvt.s.w $f0, $f0 -/* D2D53C 8024180C 44050000 */ mfc1 $a1, $f0 -/* D2D540 80241810 C640000C */ lwc1 $f0, 0xc($s2) -/* D2D544 80241814 46800020 */ cvt.s.w $f0, $f0 -/* D2D548 80241818 44060000 */ mfc1 $a2, $f0 -/* D2D54C 8024181C C6200040 */ lwc1 $f0, 0x40($s1) -/* D2D550 80241820 26300038 */ addiu $s0, $s1, 0x38 -/* D2D554 80241824 E7A00010 */ swc1 $f0, 0x10($sp) -/* D2D558 80241828 C6400010 */ lwc1 $f0, 0x10($s2) -/* D2D55C 8024182C 46800020 */ cvt.s.w $f0, $f0 -/* D2D560 80241830 E7A00014 */ swc1 $f0, 0x14($sp) -/* D2D564 80241834 C6400014 */ lwc1 $f0, 0x14($s2) -/* D2D568 80241838 46800020 */ cvt.s.w $f0, $f0 -/* D2D56C 8024183C E7A00018 */ swc1 $f0, 0x18($sp) -/* D2D570 80241840 8E440004 */ lw $a0, 4($s2) -/* D2D574 80241844 8E270038 */ lw $a3, 0x38($s1) -/* D2D578 80241848 0C0123F5 */ jal is_point_within_region -/* D2D57C 8024184C 26330040 */ addiu $s3, $s1, 0x40 -/* D2D580 80241850 1040005A */ beqz $v0, .L802419BC -/* D2D584 80241854 00000000 */ nop -/* D2D588 80241858 8E430004 */ lw $v1, 4($s2) -/* D2D58C 8024185C 10600005 */ beqz $v1, .L80241874 -/* D2D590 80241860 24020001 */ addiu $v0, $zero, 1 -/* D2D594 80241864 10620029 */ beq $v1, $v0, .L8024190C -/* D2D598 80241868 00000000 */ nop -/* D2D59C 8024186C 0809066F */ j .L802419BC -/* D2D5A0 80241870 00000000 */ nop -.L80241874: -/* D2D5A4 80241874 C6480008 */ lwc1 $f8, 8($s2) -/* D2D5A8 80241878 46804220 */ cvt.s.w $f8, $f8 -/* D2D5AC 8024187C 44064000 */ mfc1 $a2, $f8 -/* D2D5B0 80241880 C648000C */ lwc1 $f8, 0xc($s2) -/* D2D5B4 80241884 46804220 */ cvt.s.w $f8, $f8 -/* D2D5B8 80241888 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D2D5BC 8024188C C62E0040 */ lwc1 $f14, 0x40($s1) -/* D2D5C0 80241890 44074000 */ mfc1 $a3, $f8 -/* D2D5C4 80241894 0C00A7B5 */ jal dist2D -/* D2D5C8 80241898 00000000 */ nop -/* D2D5CC 8024189C C6420010 */ lwc1 $f2, 0x10($s2) -/* D2D5D0 802418A0 468010A0 */ cvt.s.w $f2, $f2 -/* D2D5D4 802418A4 4600103C */ c.lt.s $f2, $f0 -/* D2D5D8 802418A8 00000000 */ nop -/* D2D5DC 802418AC 45000043 */ bc1f .L802419BC -/* D2D5E0 802418B0 E7A00038 */ swc1 $f0, 0x38($sp) -/* D2D5E4 802418B4 C64C0008 */ lwc1 $f12, 8($s2) -/* D2D5E8 802418B8 46806320 */ cvt.s.w $f12, $f12 -/* D2D5EC 802418BC 8E260038 */ lw $a2, 0x38($s1) -/* D2D5F0 802418C0 8E270040 */ lw $a3, 0x40($s1) -/* D2D5F4 802418C4 C64E000C */ lwc1 $f14, 0xc($s2) -/* D2D5F8 802418C8 0C00A720 */ jal atan2 -/* D2D5FC 802418CC 468073A0 */ cvt.s.w $f14, $f14 -/* D2D600 802418D0 0200202D */ daddu $a0, $s0, $zero -/* D2D604 802418D4 44070000 */ mfc1 $a3, $f0 -/* D2D608 802418D8 C6400008 */ lwc1 $f0, 8($s2) -/* D2D60C 802418DC 46800020 */ cvt.s.w $f0, $f0 -/* D2D610 802418E0 E6200038 */ swc1 $f0, 0x38($s1) -/* D2D614 802418E4 C640000C */ lwc1 $f0, 0xc($s2) -/* D2D618 802418E8 46800020 */ cvt.s.w $f0, $f0 -/* D2D61C 802418EC E6200040 */ swc1 $f0, 0x40($s1) -/* D2D620 802418F0 C6480010 */ lwc1 $f8, 0x10($s2) -/* D2D624 802418F4 46804220 */ cvt.s.w $f8, $f8 -/* D2D628 802418F8 44064000 */ mfc1 $a2, $f8 -/* D2D62C 802418FC 0C00A7E7 */ jal add_vec2D_polar -/* D2D630 80241900 0260282D */ daddu $a1, $s3, $zero -/* D2D634 80241904 0809066F */ j .L802419BC -/* D2D638 80241908 00000000 */ nop -.L8024190C: -/* D2D63C 8024190C 8E420008 */ lw $v0, 8($s2) -/* D2D640 80241910 8E430010 */ lw $v1, 0x10($s2) -/* D2D644 80241914 C6200038 */ lwc1 $f0, 0x38($s1) -/* D2D648 80241918 00431021 */ addu $v0, $v0, $v1 -/* D2D64C 8024191C 44821000 */ mtc1 $v0, $f2 -/* D2D650 80241920 00000000 */ nop -/* D2D654 80241924 468010A0 */ cvt.s.w $f2, $f2 -/* D2D658 80241928 4600103C */ c.lt.s $f2, $f0 -/* D2D65C 8024192C 00000000 */ nop -/* D2D660 80241930 45030001 */ bc1tl .L80241938 -/* D2D664 80241934 E6220038 */ swc1 $f2, 0x38($s1) -.L80241938: -/* D2D668 80241938 8E420008 */ lw $v0, 8($s2) -/* D2D66C 8024193C 8E430010 */ lw $v1, 0x10($s2) -/* D2D670 80241940 C6200038 */ lwc1 $f0, 0x38($s1) -/* D2D674 80241944 00431023 */ subu $v0, $v0, $v1 -/* D2D678 80241948 44821000 */ mtc1 $v0, $f2 -/* D2D67C 8024194C 00000000 */ nop -/* D2D680 80241950 468010A0 */ cvt.s.w $f2, $f2 -/* D2D684 80241954 4602003C */ c.lt.s $f0, $f2 -/* D2D688 80241958 00000000 */ nop -/* D2D68C 8024195C 45030001 */ bc1tl .L80241964 -/* D2D690 80241960 E6220038 */ swc1 $f2, 0x38($s1) -.L80241964: -/* D2D694 80241964 8E42000C */ lw $v0, 0xc($s2) -/* D2D698 80241968 8E430014 */ lw $v1, 0x14($s2) -/* D2D69C 8024196C C6200040 */ lwc1 $f0, 0x40($s1) -/* D2D6A0 80241970 00431021 */ addu $v0, $v0, $v1 -/* D2D6A4 80241974 44821000 */ mtc1 $v0, $f2 -/* D2D6A8 80241978 00000000 */ nop -/* D2D6AC 8024197C 468010A0 */ cvt.s.w $f2, $f2 -/* D2D6B0 80241980 4600103C */ c.lt.s $f2, $f0 -/* D2D6B4 80241984 00000000 */ nop -/* D2D6B8 80241988 45030001 */ bc1tl .L80241990 -/* D2D6BC 8024198C E6220040 */ swc1 $f2, 0x40($s1) -.L80241990: -/* D2D6C0 80241990 8E42000C */ lw $v0, 0xc($s2) -/* D2D6C4 80241994 8E430014 */ lw $v1, 0x14($s2) -/* D2D6C8 80241998 C6200040 */ lwc1 $f0, 0x40($s1) -/* D2D6CC 8024199C 00431023 */ subu $v0, $v0, $v1 -/* D2D6D0 802419A0 44821000 */ mtc1 $v0, $f2 -/* D2D6D4 802419A4 00000000 */ nop -/* D2D6D8 802419A8 468010A0 */ cvt.s.w $f2, $f2 -/* D2D6DC 802419AC 4602003C */ c.lt.s $f0, $f2 -/* D2D6E0 802419B0 00000000 */ nop -/* D2D6E4 802419B4 45030001 */ bc1tl .L802419BC -/* D2D6E8 802419B8 E6220040 */ swc1 $f2, 0x40($s1) -.L802419BC: -/* D2D6EC 802419BC 16E0001F */ bnez $s7, .L80241A3C -/* D2D6F0 802419C0 00000000 */ nop -/* D2D6F4 802419C4 8E220000 */ lw $v0, ($s1) -/* D2D6F8 802419C8 30420008 */ andi $v0, $v0, 8 -/* D2D6FC 802419CC 10400003 */ beqz $v0, .L802419DC -/* D2D700 802419D0 27A50020 */ addiu $a1, $sp, 0x20 -/* D2D704 802419D4 13C00019 */ beqz $fp, .L80241A3C -/* D2D708 802419D8 00000000 */ nop -.L802419DC: -/* D2D70C 802419DC 27A60024 */ addiu $a2, $sp, 0x24 -/* D2D710 802419E0 27A20038 */ addiu $v0, $sp, 0x38 -/* D2D714 802419E4 C6220038 */ lwc1 $f2, 0x38($s1) -/* D2D718 802419E8 C620003C */ lwc1 $f0, 0x3c($s1) -/* D2D71C 802419EC 3C0143C8 */ lui $at, 0x43c8 -/* D2D720 802419F0 44813000 */ mtc1 $at, $f6 -/* D2D724 802419F4 46000021 */ cvt.d.s $f0, $f0 -/* D2D728 802419F8 E7A20020 */ swc1 $f2, 0x20($sp) -/* D2D72C 802419FC 3C018024 */ lui $at, 0x8024 -/* D2D730 80241A00 D4223F40 */ ldc1 $f2, 0x3f40($at) -/* D2D734 80241A04 C6240040 */ lwc1 $f4, 0x40($s1) -/* D2D738 80241A08 46220000 */ add.d $f0, $f0, $f2 -/* D2D73C 80241A0C E7A60038 */ swc1 $f6, 0x38($sp) -/* D2D740 80241A10 E7A40028 */ swc1 $f4, 0x28($sp) -/* D2D744 80241A14 46200020 */ cvt.s.d $f0, $f0 -/* D2D748 80241A18 E7A00024 */ swc1 $f0, 0x24($sp) -/* D2D74C 80241A1C AFA20010 */ sw $v0, 0x10($sp) -/* D2D750 80241A20 8E240080 */ lw $a0, 0x80($s1) -/* D2D754 80241A24 0C0372DF */ jal func_800DCB7C -/* D2D758 80241A28 27A70028 */ addiu $a3, $sp, 0x28 -/* D2D75C 80241A2C 10400003 */ beqz $v0, .L80241A3C -/* D2D760 80241A30 00000000 */ nop -/* D2D764 80241A34 C7A00024 */ lwc1 $f0, 0x24($sp) -/* D2D768 80241A38 E620003C */ swc1 $f0, 0x3c($s1) -.L80241A3C: -/* D2D76C 80241A3C C62C0038 */ lwc1 $f12, 0x38($s1) -/* D2D770 80241A40 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D2D774 80241A44 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D2D778 80241A48 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D2D77C 80241A4C 8C460028 */ lw $a2, 0x28($v0) -/* D2D780 80241A50 0C00A720 */ jal atan2 -/* D2D784 80241A54 8C470030 */ lw $a3, 0x30($v0) -/* D2D788 80241A58 0220202D */ daddu $a0, $s1, $zero -/* D2D78C 80241A5C 24050321 */ addiu $a1, $zero, 0x321 -/* D2D790 80241A60 0000302D */ daddu $a2, $zero, $zero -/* D2D794 80241A64 0C012530 */ jal func_800494C0 -/* D2D798 80241A68 E620000C */ swc1 $f0, 0xc($s1) -/* D2D79C 80241A6C 8EC200CC */ lw $v0, 0xcc($s6) -/* D2D7A0 80241A70 8C420024 */ lw $v0, 0x24($v0) -/* D2D7A4 80241A74 AE220028 */ sw $v0, 0x28($s1) -/* D2D7A8 80241A78 96C20096 */ lhu $v0, 0x96($s6) -/* D2D7AC 80241A7C A622008E */ sh $v0, 0x8e($s1) -/* D2D7B0 80241A80 8FA80080 */ lw $t0, 0x80($sp) -/* D2D7B4 80241A84 2402000B */ addiu $v0, $zero, 0xb -/* D2D7B8 80241A88 AD020070 */ sw $v0, 0x70($t0) -.L80241A8C: -/* D2D7BC 80241A8C 8FBF0064 */ lw $ra, 0x64($sp) -/* D2D7C0 80241A90 8FBE0060 */ lw $fp, 0x60($sp) -/* D2D7C4 80241A94 8FB7005C */ lw $s7, 0x5c($sp) -/* D2D7C8 80241A98 8FB60058 */ lw $s6, 0x58($sp) -/* D2D7CC 80241A9C 8FB50054 */ lw $s5, 0x54($sp) -/* D2D7D0 80241AA0 8FB40050 */ lw $s4, 0x50($sp) -/* D2D7D4 80241AA4 8FB3004C */ lw $s3, 0x4c($sp) -/* D2D7D8 80241AA8 8FB20048 */ lw $s2, 0x48($sp) -/* D2D7DC 80241AAC 8FB10044 */ lw $s1, 0x44($sp) -/* D2D7E0 80241AB0 8FB00040 */ lw $s0, 0x40($sp) -/* D2D7E4 80241AB4 D7B80078 */ ldc1 $f24, 0x78($sp) -/* D2D7E8 80241AB8 D7B60070 */ ldc1 $f22, 0x70($sp) -/* D2D7EC 80241ABC D7B40068 */ ldc1 $f20, 0x68($sp) -/* D2D7F0 80241AC0 03E00008 */ jr $ra -/* D2D7F4 80241AC4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_sam/sam_07/func_80241B58_D2BD30.s b/asm/nonmatchings/world/area_sam/sam_07/func_80241B58_D2BD30.s deleted file mode 100644 index e8a3e156d7..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/func_80241B58_D2BD30.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B58_D2D888 -/* D2D888 80241B58 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D2D88C 80241B5C AFB10034 */ sw $s1, 0x34($sp) -/* D2D890 80241B60 0080882D */ daddu $s1, $a0, $zero -/* D2D894 80241B64 AFBF0038 */ sw $ra, 0x38($sp) -/* D2D898 80241B68 AFB00030 */ sw $s0, 0x30($sp) -/* D2D89C 80241B6C 8E300148 */ lw $s0, 0x148($s1) -/* D2D8A0 80241B70 0C00EABB */ jal get_npc_unsafe -/* D2D8A4 80241B74 86040008 */ lh $a0, 8($s0) -/* D2D8A8 80241B78 0040282D */ daddu $a1, $v0, $zero -/* D2D8AC 80241B7C 94A2008E */ lhu $v0, 0x8e($a1) -/* D2D8B0 80241B80 24420001 */ addiu $v0, $v0, 1 -/* D2D8B4 80241B84 A4A2008E */ sh $v0, 0x8e($a1) -/* D2D8B8 80241B88 00021400 */ sll $v0, $v0, 0x10 -/* D2D8BC 80241B8C 8E0300A0 */ lw $v1, 0xa0($s0) -/* D2D8C0 80241B90 00021403 */ sra $v0, $v0, 0x10 -/* D2D8C4 80241B94 14430004 */ bne $v0, $v1, .L80241BA8 -/* D2D8C8 80241B98 00000000 */ nop -/* D2D8CC 80241B9C 8E0200CC */ lw $v0, 0xcc($s0) -/* D2D8D0 80241BA0 8C42002C */ lw $v0, 0x2c($v0) -/* D2D8D4 80241BA4 ACA20028 */ sw $v0, 0x28($a1) -.L80241BA8: -/* D2D8D8 80241BA8 84A3008E */ lh $v1, 0x8e($a1) -/* D2D8DC 80241BAC 8E0200A4 */ lw $v0, 0xa4($s0) -/* D2D8E0 80241BB0 14620002 */ bne $v1, $v0, .L80241BBC -/* D2D8E4 80241BB4 24020003 */ addiu $v0, $zero, 3 -/* D2D8E8 80241BB8 AE02006C */ sw $v0, 0x6c($s0) -.L80241BBC: -/* D2D8EC 80241BBC 84A2008E */ lh $v0, 0x8e($a1) -/* D2D8F0 80241BC0 8E03009C */ lw $v1, 0x9c($s0) -/* D2D8F4 80241BC4 0043102A */ slt $v0, $v0, $v1 -/* D2D8F8 80241BC8 1440001E */ bnez $v0, .L80241C44 -/* D2D8FC 80241BCC 24020004 */ addiu $v0, $zero, 4 -/* D2D900 80241BD0 AE02006C */ sw $v0, 0x6c($s0) -/* D2D904 80241BD4 24020008 */ addiu $v0, $zero, 8 -/* D2D908 80241BD8 24040003 */ addiu $a0, $zero, 3 -/* D2D90C 80241BDC A4A2008E */ sh $v0, 0x8e($a1) -/* D2D910 80241BE0 8E0200CC */ lw $v0, 0xcc($s0) -/* D2D914 80241BE4 84A300A8 */ lh $v1, 0xa8($a1) -/* D2D918 80241BE8 3C013F80 */ lui $at, 0x3f80 -/* D2D91C 80241BEC 44810000 */ mtc1 $at, $f0 -/* D2D920 80241BF0 3C014000 */ lui $at, 0x4000 -/* D2D924 80241BF4 44811000 */ mtc1 $at, $f2 -/* D2D928 80241BF8 3C01C1A0 */ lui $at, 0xc1a0 -/* D2D92C 80241BFC 44812000 */ mtc1 $at, $f4 -/* D2D930 80241C00 44833000 */ mtc1 $v1, $f6 -/* D2D934 80241C04 00000000 */ nop -/* D2D938 80241C08 468031A0 */ cvt.s.w $f6, $f6 -/* D2D93C 80241C0C 8C420000 */ lw $v0, ($v0) -/* D2D940 80241C10 44073000 */ mfc1 $a3, $f6 -/* D2D944 80241C14 0000302D */ daddu $a2, $zero, $zero -/* D2D948 80241C18 ACA20028 */ sw $v0, 0x28($a1) -/* D2D94C 80241C1C 2402000A */ addiu $v0, $zero, 0xa -/* D2D950 80241C20 AFA2001C */ sw $v0, 0x1c($sp) -/* D2D954 80241C24 27A20028 */ addiu $v0, $sp, 0x28 -/* D2D958 80241C28 E7A00010 */ swc1 $f0, 0x10($sp) -/* D2D95C 80241C2C E7A20014 */ swc1 $f2, 0x14($sp) -/* D2D960 80241C30 E7A40018 */ swc1 $f4, 0x18($sp) -/* D2D964 80241C34 0C01BFA4 */ jal fx_emote -/* D2D968 80241C38 AFA20020 */ sw $v0, 0x20($sp) -/* D2D96C 80241C3C 2402000D */ addiu $v0, $zero, 0xd -/* D2D970 80241C40 AE220070 */ sw $v0, 0x70($s1) -.L80241C44: -/* D2D974 80241C44 8FBF0038 */ lw $ra, 0x38($sp) -/* D2D978 80241C48 8FB10034 */ lw $s1, 0x34($sp) -/* D2D97C 80241C4C 8FB00030 */ lw $s0, 0x30($sp) -/* D2D980 80241C50 03E00008 */ jr $ra -/* D2D984 80241C54 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_8024001C_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_8024001C_D2FC80.s deleted file mode 100644 index f6e93e3aa8..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_8024001C_D2FC80.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_D2FC9C -/* D2FC9C 8024001C 3C02800A */ lui $v0, %hi(D_8009A650) -/* D2FCA0 80240020 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* D2FCA4 80240024 8C430000 */ lw $v1, ($v0) -/* D2FCA8 80240028 2404FFBF */ addiu $a0, $zero, -0x41 -/* D2FCAC 8024002C 00641824 */ and $v1, $v1, $a0 -/* D2FCB0 80240030 AC430000 */ sw $v1, ($v0) -/* D2FCB4 80240034 03E00008 */ jr $ra -/* D2FCB8 80240038 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_8024003C_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_8024003C_D2FC80.s deleted file mode 100644 index 9c127e88b2..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_8024003C_D2FC80.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024003C_D2FCBC -/* D2FCBC 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D2FCC0 80240040 AFBF0010 */ sw $ra, 0x10($sp) -/* D2FCC4 80240044 8C82000C */ lw $v0, 0xc($a0) -/* D2FCC8 80240048 0C0B1EAF */ jal get_variable -/* D2FCCC 8024004C 8C450000 */ lw $a1, ($v0) -/* D2FCD0 80240050 0C0B95A4 */ jal func_802E5690 -/* D2FCD4 80240054 0040202D */ daddu $a0, $v0, $zero -/* D2FCD8 80240058 8FBF0010 */ lw $ra, 0x10($sp) -/* D2FCDC 8024005C 24020002 */ addiu $v0, $zero, 2 -/* D2FCE0 80240060 03E00008 */ jr $ra -/* D2FCE4 80240064 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_80240068_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_80240068_D2FC80.s deleted file mode 100644 index dd8cc93a60..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_80240068_D2FC80.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240068_D2FCE8 -/* D2FCE8 80240068 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2FCEC 8024006C AFB00010 */ sw $s0, 0x10($sp) -/* D2FCF0 80240070 0080802D */ daddu $s0, $a0, $zero -/* D2FCF4 80240074 AFBF0018 */ sw $ra, 0x18($sp) -/* D2FCF8 80240078 AFB10014 */ sw $s1, 0x14($sp) -/* D2FCFC 8024007C 8E11000C */ lw $s1, 0xc($s0) -/* D2FD00 80240080 8E250000 */ lw $a1, ($s1) -/* D2FD04 80240084 0C0B1EAF */ jal get_variable -/* D2FD08 80240088 26310004 */ addiu $s1, $s1, 4 -/* D2FD0C 8024008C 0200202D */ daddu $a0, $s0, $zero -/* D2FD10 80240090 3C038011 */ lui $v1, %hi(gPlayerData) -/* D2FD14 80240094 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* D2FD18 80240098 000210C0 */ sll $v0, $v0, 3 -/* D2FD1C 8024009C 00431021 */ addu $v0, $v0, $v1 -/* D2FD20 802400A0 90460015 */ lbu $a2, 0x15($v0) -/* D2FD24 802400A4 8E250000 */ lw $a1, ($s1) -/* D2FD28 802400A8 24C60001 */ addiu $a2, $a2, 1 -/* D2FD2C 802400AC A0460015 */ sb $a2, 0x15($v0) -/* D2FD30 802400B0 00063600 */ sll $a2, $a2, 0x18 -/* D2FD34 802400B4 0C0B2026 */ jal set_variable -/* D2FD38 802400B8 00063603 */ sra $a2, $a2, 0x18 -/* D2FD3C 802400BC 8FBF0018 */ lw $ra, 0x18($sp) -/* D2FD40 802400C0 8FB10014 */ lw $s1, 0x14($sp) -/* D2FD44 802400C4 8FB00010 */ lw $s0, 0x10($sp) -/* D2FD48 802400C8 24020002 */ addiu $v0, $zero, 2 -/* D2FD4C 802400CC 03E00008 */ jr $ra -/* D2FD50 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_802400D4_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_802400D4_D2FC80.s deleted file mode 100644 index a12e923552..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_802400D4_D2FC80.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400D4_D2FD54 -/* D2FD54 802400D4 3C028011 */ lui $v0, %hi(gPlayerData) -/* D2FD58 802400D8 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* D2FD5C 802400DC 000420C0 */ sll $a0, $a0, 3 -/* D2FD60 802400E0 00822021 */ addu $a0, $a0, $v0 -/* D2FD64 802400E4 90820014 */ lbu $v0, 0x14($a0) -/* D2FD68 802400E8 10400009 */ beqz $v0, .L80240110 -/* D2FD6C 802400EC 00000000 */ nop -/* D2FD70 802400F0 90820015 */ lbu $v0, 0x15($a0) -/* D2FD74 802400F4 00022600 */ sll $a0, $v0, 0x18 -/* D2FD78 802400F8 00041E03 */ sra $v1, $a0, 0x18 -/* D2FD7C 802400FC 00051400 */ sll $v0, $a1, 0x10 -/* D2FD80 80240100 00021403 */ sra $v0, $v0, 0x10 -/* D2FD84 80240104 0043102A */ slt $v0, $v0, $v1 -/* D2FD88 80240108 10400003 */ beqz $v0, .L80240118 -/* D2FD8C 8024010C 00000000 */ nop -.L80240110: -/* D2FD90 80240110 03E00008 */ jr $ra -/* D2FD94 80240114 2402FFFF */ addiu $v0, $zero, -1 -.L80240118: -/* D2FD98 80240118 03E00008 */ jr $ra -/* D2FD9C 8024011C 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_80240120_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_80240120_D2FC80.s deleted file mode 100644 index 7f9997a0a9..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_80240120_D2FC80.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240120_D2FDA0 -/* D2FDA0 80240120 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D2FDA4 80240124 AFB3001C */ sw $s3, 0x1c($sp) -/* D2FDA8 80240128 0080982D */ daddu $s3, $a0, $zero -/* D2FDAC 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* D2FDB0 80240130 24100001 */ addiu $s0, $zero, 1 -/* D2FDB4 80240134 AFB40020 */ sw $s4, 0x20($sp) -/* D2FDB8 80240138 2414FFFF */ addiu $s4, $zero, -1 -/* D2FDBC 8024013C AFB50024 */ sw $s5, 0x24($sp) -/* D2FDC0 80240140 0200A82D */ daddu $s5, $s0, $zero -/* D2FDC4 80240144 AFB10014 */ sw $s1, 0x14($sp) -/* D2FDC8 80240148 3C118011 */ lui $s1, 0x8011 -/* D2FDCC 8024014C 2631F298 */ addiu $s1, $s1, -0xd68 -/* D2FDD0 80240150 AFBF0028 */ sw $ra, 0x28($sp) -/* D2FDD4 80240154 AFB20018 */ sw $s2, 0x18($sp) -/* D2FDD8 80240158 8E6200B4 */ lw $v0, 0xb4($s3) -/* D2FDDC 8024015C 0280182D */ daddu $v1, $s4, $zero -/* D2FDE0 80240160 AE630084 */ sw $v1, 0x84($s3) -/* D2FDE4 80240164 00021027 */ nor $v0, $zero, $v0 -/* D2FDE8 80240168 000217C2 */ srl $v0, $v0, 0x1f -/* D2FDEC 8024016C 00029400 */ sll $s2, $v0, 0x10 -.L80240170: -/* D2FDF0 80240170 92220014 */ lbu $v0, 0x14($s1) -/* D2FDF4 80240174 50400008 */ beql $v0, $zero, .L80240198 -/* D2FDF8 80240178 26100001 */ addiu $s0, $s0, 1 -/* D2FDFC 8024017C 0200202D */ daddu $a0, $s0, $zero -/* D2FE00 80240180 0C090035 */ jal func_802400D4 -/* D2FE04 80240184 00122C03 */ sra $a1, $s2, 0x10 -/* D2FE08 80240188 10540003 */ beq $v0, $s4, .L80240198 -/* D2FE0C 8024018C 26100001 */ addiu $s0, $s0, 1 -/* D2FE10 80240190 08090069 */ j .L802401A4 -/* D2FE14 80240194 AE750084 */ sw $s5, 0x84($s3) -.L80240198: -/* D2FE18 80240198 2A02000C */ slti $v0, $s0, 0xc -/* D2FE1C 8024019C 1440FFF4 */ bnez $v0, .L80240170 -/* D2FE20 802401A0 26310008 */ addiu $s1, $s1, 8 -.L802401A4: -/* D2FE24 802401A4 8FBF0028 */ lw $ra, 0x28($sp) -/* D2FE28 802401A8 8FB50024 */ lw $s5, 0x24($sp) -/* D2FE2C 802401AC 8FB40020 */ lw $s4, 0x20($sp) -/* D2FE30 802401B0 8FB3001C */ lw $s3, 0x1c($sp) -/* D2FE34 802401B4 8FB20018 */ lw $s2, 0x18($sp) -/* D2FE38 802401B8 8FB10014 */ lw $s1, 0x14($sp) -/* D2FE3C 802401BC 8FB00010 */ lw $s0, 0x10($sp) -/* D2FE40 802401C0 24020002 */ addiu $v0, $zero, 2 -/* D2FE44 802401C4 03E00008 */ jr $ra -/* D2FE48 802401C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_802401CC_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_802401CC_D2FC80.s deleted file mode 100644 index 2d158b572f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_802401CC_D2FC80.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401CC_D2FE4C -/* D2FE4C 802401CC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D2FE50 802401D0 AFB5002C */ sw $s5, 0x2c($sp) -/* D2FE54 802401D4 0080A82D */ daddu $s5, $a0, $zero -/* D2FE58 802401D8 AFBE0038 */ sw $fp, 0x38($sp) -/* D2FE5C 802401DC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* D2FE60 802401E0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* D2FE64 802401E4 AFBF003C */ sw $ra, 0x3c($sp) -/* D2FE68 802401E8 AFB70034 */ sw $s7, 0x34($sp) -/* D2FE6C 802401EC AFB60030 */ sw $s6, 0x30($sp) -/* D2FE70 802401F0 AFB40028 */ sw $s4, 0x28($sp) -/* D2FE74 802401F4 AFB30024 */ sw $s3, 0x24($sp) -/* D2FE78 802401F8 AFB20020 */ sw $s2, 0x20($sp) -/* D2FE7C 802401FC AFB1001C */ sw $s1, 0x1c($sp) -/* D2FE80 80240200 10A0004F */ beqz $a1, .L80240340 -/* D2FE84 80240204 AFB00018 */ sw $s0, 0x18($sp) -/* D2FE88 80240208 0C00AB39 */ jal heap_malloc -/* D2FE8C 8024020C 24040330 */ addiu $a0, $zero, 0x330 -/* D2FE90 80240210 0040982D */ daddu $s3, $v0, $zero -/* D2FE94 80240214 0000B02D */ daddu $s6, $zero, $zero -/* D2FE98 80240218 02C0902D */ daddu $s2, $s6, $zero -/* D2FE9C 8024021C 3C148024 */ lui $s4, 0x8024 -/* D2FEA0 80240220 26941AE8 */ addiu $s4, $s4, 0x1ae8 -/* D2FEA4 80240224 0260882D */ daddu $s1, $s3, $zero -/* D2FEA8 80240228 8EA200B4 */ lw $v0, 0xb4($s5) -/* D2FEAC 8024022C 3C038024 */ lui $v1, 0x8024 -/* D2FEB0 80240230 24631AE0 */ addiu $v1, $v1, 0x1ae0 -/* D2FEB4 80240234 AEB30078 */ sw $s3, 0x78($s5) -/* D2FEB8 80240238 00021027 */ nor $v0, $zero, $v0 -/* D2FEBC 8024023C 0002BFC2 */ srl $s7, $v0, 0x1f -/* D2FEC0 80240240 00171080 */ sll $v0, $s7, 2 -/* D2FEC4 80240244 00431021 */ addu $v0, $v0, $v1 -/* D2FEC8 80240248 AFA20010 */ sw $v0, 0x10($sp) -.L8024024C: -/* D2FECC 8024024C 86900000 */ lh $s0, ($s4) -/* D2FED0 80240250 001010C0 */ sll $v0, $s0, 3 -/* D2FED4 80240254 03C21021 */ addu $v0, $fp, $v0 -/* D2FED8 80240258 90420014 */ lbu $v0, 0x14($v0) -/* D2FEDC 8024025C 5040002E */ beql $v0, $zero, .L80240318 -/* D2FEE0 80240260 26520001 */ addiu $s2, $s2, 1 -/* D2FEE4 80240264 00101100 */ sll $v0, $s0, 4 -/* D2FEE8 80240268 3C068009 */ lui $a2, 0x8009 -/* D2FEEC 8024026C 24C6EF20 */ addiu $a2, $a2, -0x10e0 -/* D2FEF0 80240270 00461021 */ addu $v0, $v0, $a2 -/* D2FEF4 80240274 0200202D */ daddu $a0, $s0, $zero -/* D2FEF8 80240278 AE300108 */ sw $s0, 0x108($s1) -/* D2FEFC 8024027C 8C420000 */ lw $v0, ($v0) -/* D2FF00 80240280 02E0282D */ daddu $a1, $s7, $zero -/* D2FF04 80240284 0C090035 */ jal func_802400D4 -/* D2FF08 80240288 AE220084 */ sw $v0, 0x84($s1) -/* D2FF0C 8024028C 0040202D */ daddu $a0, $v0, $zero -/* D2FF10 80240290 04800011 */ bltz $a0, .L802402D8 -/* D2FF14 80240294 00101080 */ sll $v0, $s0, 2 -/* D2FF18 80240298 3C06800F */ lui $a2, 0x800f -/* D2FF1C 8024029C 24C67F00 */ addiu $a2, $a2, 0x7f00 -/* D2FF20 802402A0 00461021 */ addu $v0, $v0, $a2 -/* D2FF24 802402A4 8C430000 */ lw $v1, ($v0) -/* D2FF28 802402A8 24020001 */ addiu $v0, $zero, 1 -/* D2FF2C 802402AC AE22018C */ sw $v0, 0x18c($s1) -/* D2FF30 802402B0 00041080 */ sll $v0, $a0, 2 -/* D2FF34 802402B4 3C068024 */ lui $a2, 0x8024 -/* D2FF38 802402B8 24C61AF8 */ addiu $a2, $a2, 0x1af8 -/* D2FF3C 802402BC AE230000 */ sw $v1, ($s1) -/* D2FF40 802402C0 001218C0 */ sll $v1, $s2, 3 -/* D2FF44 802402C4 00431021 */ addu $v0, $v0, $v1 -/* D2FF48 802402C8 00461021 */ addu $v0, $v0, $a2 -/* D2FF4C 802402CC 8C420000 */ lw $v0, ($v0) -/* D2FF50 802402D0 080900BF */ j .L802402FC -/* D2FF54 802402D4 AE220294 */ sw $v0, 0x294($s1) -.L802402D8: -/* D2FF58 802402D8 3C06800F */ lui $a2, 0x800f -/* D2FF5C 802402DC 24C67F40 */ addiu $a2, $a2, 0x7f40 -/* D2FF60 802402E0 00461021 */ addu $v0, $v0, $a2 -/* D2FF64 802402E4 8C420000 */ lw $v0, ($v0) -/* D2FF68 802402E8 AE20018C */ sw $zero, 0x18c($s1) -/* D2FF6C 802402EC AE220000 */ sw $v0, ($s1) -/* D2FF70 802402F0 8FA60010 */ lw $a2, 0x10($sp) -/* D2FF74 802402F4 8CC20000 */ lw $v0, ($a2) -/* D2FF78 802402F8 AE220294 */ sw $v0, 0x294($s1) -.L802402FC: -/* D2FF7C 802402FC 001010C0 */ sll $v0, $s0, 3 -/* D2FF80 80240300 03C21021 */ addu $v0, $fp, $v0 -/* D2FF84 80240304 80420015 */ lb $v0, 0x15($v0) -/* D2FF88 80240308 26D60001 */ addiu $s6, $s6, 1 -/* D2FF8C 8024030C AE220210 */ sw $v0, 0x210($s1) -/* D2FF90 80240310 26310004 */ addiu $s1, $s1, 4 -/* D2FF94 80240314 26520001 */ addiu $s2, $s2, 1 -.L80240318: -/* D2FF98 80240318 2A420008 */ slti $v0, $s2, 8 -/* D2FF9C 8024031C 1440FFCB */ bnez $v0, .L8024024C -/* D2FFA0 80240320 26940002 */ addiu $s4, $s4, 2 -/* D2FFA4 80240324 0260202D */ daddu $a0, $s3, $zero -/* D2FFA8 80240328 24020004 */ addiu $v0, $zero, 4 -/* D2FFAC 8024032C AC820318 */ sw $v0, 0x318($a0) -/* D2FFB0 80240330 AC960324 */ sw $s6, 0x324($a0) -/* D2FFB4 80240334 0C03D390 */ jal func_800F4E40 -/* D2FFB8 80240338 AC800328 */ sw $zero, 0x328($a0) -/* D2FFBC 8024033C AEA00070 */ sw $zero, 0x70($s5) -.L80240340: -/* D2FFC0 80240340 8EA20070 */ lw $v0, 0x70($s5) -/* D2FFC4 80240344 8EB30078 */ lw $s3, 0x78($s5) -/* D2FFC8 80240348 14400008 */ bnez $v0, .L8024036C -/* D2FFCC 8024034C 24420001 */ addiu $v0, $v0, 1 -/* D2FFD0 80240350 8662032C */ lh $v0, 0x32c($s3) -/* D2FFD4 80240354 10400009 */ beqz $v0, .L8024037C -/* D2FFD8 80240358 AEA20074 */ sw $v0, 0x74($s5) -/* D2FFDC 8024035C 0C03C4EC */ jal func_800F13B0 -/* D2FFE0 80240360 00000000 */ nop -/* D2FFE4 80240364 8EA20070 */ lw $v0, 0x70($s5) -/* D2FFE8 80240368 24420001 */ addiu $v0, $v0, 1 -.L8024036C: -/* D2FFEC 8024036C AEA20070 */ sw $v0, 0x70($s5) -/* D2FFF0 80240370 2842000F */ slti $v0, $v0, 0xf -/* D2FFF4 80240374 10400003 */ beqz $v0, .L80240384 -/* D2FFF8 80240378 00000000 */ nop -.L8024037C: -/* D2FFFC 8024037C 080900FB */ j .L802403EC -/* D30000 80240380 0000102D */ daddu $v0, $zero, $zero -.L80240384: -/* D30004 80240384 0C03C54E */ jal func_800F1538 -/* D30008 80240388 00000000 */ nop -/* D3000C 8024038C 8EA30074 */ lw $v1, 0x74($s5) -/* D30010 80240390 240200FF */ addiu $v0, $zero, 0xff -/* D30014 80240394 10620010 */ beq $v1, $v0, .L802403D8 -/* D30018 80240398 2462FFFF */ addiu $v0, $v1, -1 -/* D3001C 8024039C 00021080 */ sll $v0, $v0, 2 -/* D30020 802403A0 02621021 */ addu $v0, $s3, $v0 -/* D30024 802403A4 8C420108 */ lw $v0, 0x108($v0) -/* D30028 802403A8 00021100 */ sll $v0, $v0, 4 -/* D3002C 802403AC 3C038009 */ lui $v1, 0x8009 -/* D30030 802403B0 00621821 */ addu $v1, $v1, $v0 -/* D30034 802403B4 8C63EF20 */ lw $v1, -0x10e0($v1) -/* D30038 802403B8 8EA20074 */ lw $v0, 0x74($s5) -/* D3003C 802403BC 2442FFFF */ addiu $v0, $v0, -1 -/* D30040 802403C0 00021080 */ sll $v0, $v0, 2 -/* D30044 802403C4 02621021 */ addu $v0, $s3, $v0 -/* D30048 802403C8 AEA30084 */ sw $v1, 0x84($s5) -/* D3004C 802403CC 8C420108 */ lw $v0, 0x108($v0) -/* D30050 802403D0 080900F8 */ j .L802403E0 -/* D30054 802403D4 AEA20088 */ sw $v0, 0x88($s5) -.L802403D8: -/* D30058 802403D8 2402FFFF */ addiu $v0, $zero, -1 -/* D3005C 802403DC AEA20084 */ sw $v0, 0x84($s5) -.L802403E0: -/* D30060 802403E0 0C00AB4B */ jal heap_free -/* D30064 802403E4 8EA40078 */ lw $a0, 0x78($s5) -/* D30068 802403E8 24020002 */ addiu $v0, $zero, 2 -.L802403EC: -/* D3006C 802403EC 8FBF003C */ lw $ra, 0x3c($sp) -/* D30070 802403F0 8FBE0038 */ lw $fp, 0x38($sp) -/* D30074 802403F4 8FB70034 */ lw $s7, 0x34($sp) -/* D30078 802403F8 8FB60030 */ lw $s6, 0x30($sp) -/* D3007C 802403FC 8FB5002C */ lw $s5, 0x2c($sp) -/* D30080 80240400 8FB40028 */ lw $s4, 0x28($sp) -/* D30084 80240404 8FB30024 */ lw $s3, 0x24($sp) -/* D30088 80240408 8FB20020 */ lw $s2, 0x20($sp) -/* D3008C 8024040C 8FB1001C */ lw $s1, 0x1c($sp) -/* D30090 80240410 8FB00018 */ lw $s0, 0x18($sp) -/* D30094 80240414 03E00008 */ jr $ra -/* D30098 80240418 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_8024041C_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_8024041C_D2FC80.s deleted file mode 100644 index 56d3d9bda2..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_8024041C_D2FC80.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024041C_D3009C -/* D3009C 8024041C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D300A0 80240420 AFBF0010 */ sw $ra, 0x10($sp) -/* D300A4 80240424 8C82000C */ lw $v0, 0xc($a0) -/* D300A8 80240428 0C0B1EAF */ jal get_variable -/* D300AC 8024042C 8C450000 */ lw $a1, ($v0) -/* D300B0 80240430 0C03AC5A */ jal func_800EB168 -/* D300B4 80240434 0040202D */ daddu $a0, $v0, $zero -/* D300B8 80240438 8FBF0010 */ lw $ra, 0x10($sp) -/* D300BC 8024043C 24020002 */ addiu $v0, $zero, 2 -/* D300C0 80240440 03E00008 */ jr $ra -/* D300C4 80240444 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_80240448_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_80240448_D2FC80.s deleted file mode 100644 index 0847937065..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_80240448_D2FC80.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240448_D300C8 -/* D300C8 80240448 3C028011 */ lui $v0, 0x8011 -/* D300CC 8024044C 8042F2A2 */ lb $v0, -0xd5e($v0) -/* D300D0 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D300D4 80240454 AFBF0010 */ sw $ra, 0x10($sp) -/* D300D8 80240458 00021100 */ sll $v0, $v0, 4 -/* D300DC 8024045C 3C048009 */ lui $a0, 0x8009 -/* D300E0 80240460 00822021 */ addu $a0, $a0, $v0 -/* D300E4 80240464 8C84EF20 */ lw $a0, -0x10e0($a0) -/* D300E8 80240468 0C0496CF */ jal set_message_string -/* D300EC 8024046C 0000282D */ daddu $a1, $zero, $zero -/* D300F0 80240470 8FBF0010 */ lw $ra, 0x10($sp) -/* D300F4 80240474 24020002 */ addiu $v0, $zero, 2 -/* D300F8 80240478 03E00008 */ jr $ra -/* D300FC 8024047C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_80240480_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_80240480_D2FC80.s deleted file mode 100644 index fd0828cc3b..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_80240480_D2FC80.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240480_D30100 -/* D30100 80240480 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D30104 80240484 AFB1001C */ sw $s1, 0x1c($sp) -/* D30108 80240488 0080882D */ daddu $s1, $a0, $zero -/* D3010C 8024048C AFBF0020 */ sw $ra, 0x20($sp) -/* D30110 80240490 AFB00018 */ sw $s0, 0x18($sp) -/* D30114 80240494 8E30000C */ lw $s0, 0xc($s1) -/* D30118 80240498 8E050000 */ lw $a1, ($s0) -/* D3011C 8024049C 0C0B1EAF */ jal get_variable -/* D30120 802404A0 26100004 */ addiu $s0, $s0, 4 -/* D30124 802404A4 0C04417A */ jal get_entity_by_index -/* D30128 802404A8 0040202D */ daddu $a0, $v0, $zero -/* D3012C 802404AC 8E100000 */ lw $s0, ($s0) -/* D30130 802404B0 C444004C */ lwc1 $f4, 0x4c($v0) -/* D30134 802404B4 3C014148 */ lui $at, 0x4148 -/* D30138 802404B8 44810000 */ mtc1 $at, $f0 -/* D3013C 802404BC 3C013F33 */ lui $at, 0x3f33 -/* D30140 802404C0 34213333 */ ori $at, $at, 0x3333 -/* D30144 802404C4 44811000 */ mtc1 $at, $f2 -/* D30148 802404C8 AFA00014 */ sw $zero, 0x14($sp) -/* D3014C 802404CC 46002100 */ add.s $f4, $f4, $f0 -/* D30150 802404D0 E7A20010 */ swc1 $f2, 0x10($sp) -/* D30154 802404D4 8C450048 */ lw $a1, 0x48($v0) -/* D30158 802404D8 8C470050 */ lw $a3, 0x50($v0) -/* D3015C 802404DC 44062000 */ mfc1 $a2, $f4 -/* D30160 802404E0 0C01C5D4 */ jal func_80071750 -/* D30164 802404E4 0000202D */ daddu $a0, $zero, $zero -/* D30168 802404E8 0220202D */ daddu $a0, $s1, $zero -/* D3016C 802404EC 0200282D */ daddu $a1, $s0, $zero -/* D30170 802404F0 0C0B2026 */ jal set_variable -/* D30174 802404F4 0040302D */ daddu $a2, $v0, $zero -/* D30178 802404F8 8FBF0020 */ lw $ra, 0x20($sp) -/* D3017C 802404FC 8FB1001C */ lw $s1, 0x1c($sp) -/* D30180 80240500 8FB00018 */ lw $s0, 0x18($sp) -/* D30184 80240504 24020002 */ addiu $v0, $zero, 2 -/* D30188 80240508 03E00008 */ jr $ra -/* D3018C 8024050C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_80240510_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_80240510_D2FC80.s deleted file mode 100644 index 1438b879de..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_80240510_D2FC80.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240510_D30190 -/* D30190 80240510 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D30194 80240514 AFBF0010 */ sw $ra, 0x10($sp) -/* D30198 80240518 8C82000C */ lw $v0, 0xc($a0) -/* D3019C 8024051C 0C0B1EAF */ jal get_variable -/* D301A0 80240520 8C450000 */ lw $a1, ($v0) -/* D301A4 80240524 0040202D */ daddu $a0, $v0, $zero -/* D301A8 80240528 8C830000 */ lw $v1, ($a0) -/* D301AC 8024052C 34630010 */ ori $v1, $v1, 0x10 -/* D301B0 80240530 AC830000 */ sw $v1, ($a0) -/* D301B4 80240534 8FBF0010 */ lw $ra, 0x10($sp) -/* D301B8 80240538 24020002 */ addiu $v0, $zero, 2 -/* D301BC 8024053C 03E00008 */ jr $ra -/* D301C0 80240540 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_80240544_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_80240544_D2FC80.s deleted file mode 100644 index 6c7021ba2a..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_80240544_D2FC80.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240544_D301C4 -/* D301C4 80240544 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D301C8 80240548 AFBF0018 */ sw $ra, 0x18($sp) -/* D301CC 8024054C 8C82000C */ lw $v0, 0xc($a0) -/* D301D0 80240550 0C0B1EAF */ jal get_variable -/* D301D4 80240554 8C450000 */ lw $a1, ($v0) -/* D301D8 80240558 0C04417A */ jal get_entity_by_index -/* D301DC 8024055C 0040202D */ daddu $a0, $v0, $zero -/* D301E0 80240560 3C013F80 */ lui $at, 0x3f80 -/* D301E4 80240564 44810000 */ mtc1 $at, $f0 -/* D301E8 80240568 C442004C */ lwc1 $f2, 0x4c($v0) -/* D301EC 8024056C E7A00010 */ swc1 $f0, 0x10($sp) -/* D301F0 80240570 3C014148 */ lui $at, 0x4148 -/* D301F4 80240574 44810000 */ mtc1 $at, $f0 -/* D301F8 80240578 2403004B */ addiu $v1, $zero, 0x4b -/* D301FC 8024057C AFA30014 */ sw $v1, 0x14($sp) -/* D30200 80240580 46001080 */ add.s $f2, $f2, $f0 -/* D30204 80240584 8C450048 */ lw $a1, 0x48($v0) -/* D30208 80240588 8C470050 */ lw $a3, 0x50($v0) -/* D3020C 8024058C 44061000 */ mfc1 $a2, $f2 -/* D30210 80240590 0C01C2EC */ jal func_80070BB0 -/* D30214 80240594 24040004 */ addiu $a0, $zero, 4 -/* D30218 80240598 8FBF0018 */ lw $ra, 0x18($sp) -/* D3021C 8024059C 24020002 */ addiu $v0, $zero, 2 -/* D30220 802405A0 03E00008 */ jr $ra -/* D30224 802405A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_802405A8_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_802405A8_D2FC80.s deleted file mode 100644 index ee60f09b60..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_802405A8_D2FC80.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A8_D30228 -/* D30228 802405A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3022C 802405AC AFBF0018 */ sw $ra, 0x18($sp) -/* D30230 802405B0 0C00EAD2 */ jal get_npc_safe -/* D30234 802405B4 2404FFFC */ addiu $a0, $zero, -4 -/* D30238 802405B8 C444003C */ lwc1 $f4, 0x3c($v0) -/* D3023C 802405BC 3C014148 */ lui $at, 0x4148 -/* D30240 802405C0 44811000 */ mtc1 $at, $f2 -/* D30244 802405C4 3C013F80 */ lui $at, 0x3f80 -/* D30248 802405C8 44810000 */ mtc1 $at, $f0 -/* D3024C 802405CC 2403001E */ addiu $v1, $zero, 0x1e -/* D30250 802405D0 AFA30014 */ sw $v1, 0x14($sp) -/* D30254 802405D4 46022100 */ add.s $f4, $f4, $f2 -/* D30258 802405D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* D3025C 802405DC 8C450038 */ lw $a1, 0x38($v0) -/* D30260 802405E0 8C470040 */ lw $a3, 0x40($v0) -/* D30264 802405E4 44062000 */ mfc1 $a2, $f4 -/* D30268 802405E8 0C01C2EC */ jal func_80070BB0 -/* D3026C 802405EC 24040009 */ addiu $a0, $zero, 9 -/* D30270 802405F0 8FBF0018 */ lw $ra, 0x18($sp) -/* D30274 802405F4 24020002 */ addiu $v0, $zero, 2 -/* D30278 802405F8 03E00008 */ jr $ra -/* D3027C 802405FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_80240600_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_80240600_D2FC80.s deleted file mode 100644 index a99d15a245..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_80240600_D2FC80.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240600_D30280 -/* D30280 80240600 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* D30284 80240604 AFB60040 */ sw $s6, 0x40($sp) -/* D30288 80240608 0080B02D */ daddu $s6, $a0, $zero -/* D3028C 8024060C AFB00028 */ sw $s0, 0x28($sp) -/* D30290 80240610 00A0802D */ daddu $s0, $a1, $zero -/* D30294 80240614 AFBF0044 */ sw $ra, 0x44($sp) -/* D30298 80240618 AFB5003C */ sw $s5, 0x3c($sp) -/* D3029C 8024061C AFB40038 */ sw $s4, 0x38($sp) -/* D302A0 80240620 AFB30034 */ sw $s3, 0x34($sp) -/* D302A4 80240624 AFB20030 */ sw $s2, 0x30($sp) -/* D302A8 80240628 AFB1002C */ sw $s1, 0x2c($sp) -/* D302AC 8024062C F7B80058 */ sdc1 $f24, 0x58($sp) -/* D302B0 80240630 F7B60050 */ sdc1 $f22, 0x50($sp) -/* D302B4 80240634 F7B40048 */ sdc1 $f20, 0x48($sp) -/* D302B8 80240638 8ED3000C */ lw $s3, 0xc($s6) -/* D302BC 8024063C 0C00EAD2 */ jal get_npc_safe -/* D302C0 80240640 2404FFFC */ addiu $a0, $zero, -4 -/* D302C4 80240644 27A50018 */ addiu $a1, $sp, 0x18 -/* D302C8 80240648 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* D302CC 8024064C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* D302D0 80240650 27A6001C */ addiu $a2, $sp, 0x1c -/* D302D4 80240654 00041880 */ sll $v1, $a0, 2 -/* D302D8 80240658 00641821 */ addu $v1, $v1, $a0 -/* D302DC 8024065C 00031880 */ sll $v1, $v1, 2 -/* D302E0 80240660 00641823 */ subu $v1, $v1, $a0 -/* D302E4 80240664 000320C0 */ sll $a0, $v1, 3 -/* D302E8 80240668 00641821 */ addu $v1, $v1, $a0 -/* D302EC 8024066C 000318C0 */ sll $v1, $v1, 3 -/* D302F0 80240670 3C01800B */ lui $at, 0x800b -/* D302F4 80240674 00230821 */ addu $at, $at, $v1 -/* D302F8 80240678 C42C1DEC */ lwc1 $f12, 0x1dec($at) -/* D302FC 8024067C 0C00A88D */ jal sin_cos_deg -/* D30300 80240680 0040A82D */ daddu $s5, $v0, $zero -/* D30304 80240684 1200005D */ beqz $s0, .L802407FC -/* D30308 80240688 00000000 */ nop -/* D3030C 8024068C 0C00AB0A */ jal general_heap_malloc -/* D30310 80240690 24040068 */ addiu $a0, $zero, 0x68 -/* D30314 80240694 0040902D */ daddu $s2, $v0, $zero -/* D30318 80240698 02C0202D */ daddu $a0, $s6, $zero -/* D3031C 8024069C 0000882D */ daddu $s1, $zero, $zero -/* D30320 802406A0 2414FFFF */ addiu $s4, $zero, -1 -/* D30324 802406A4 AED20060 */ sw $s2, 0x60($s6) -/* D30328 802406A8 8E650000 */ lw $a1, ($s3) -/* D3032C 802406AC 3C014148 */ lui $at, 0x4148 -/* D30330 802406B0 4481C000 */ mtc1 $at, $f24 -/* D30334 802406B4 3C013F80 */ lui $at, 0x3f80 -/* D30338 802406B8 4481B000 */ mtc1 $at, $f22 -/* D3033C 802406BC 4480A000 */ mtc1 $zero, $f20 -/* D30340 802406C0 0C0B1EAF */ jal get_variable -/* D30344 802406C4 0240802D */ daddu $s0, $s2, $zero -/* D30348 802406C8 0C04417A */ jal get_entity_by_index -/* D3034C 802406CC 0040202D */ daddu $a0, $v0, $zero -/* D30350 802406D0 AE42005C */ sw $v0, 0x5c($s2) -.L802406D4: -/* D30354 802406D4 8E42005C */ lw $v0, 0x5c($s2) -/* D30358 802406D8 C440004C */ lwc1 $f0, 0x4c($v0) -/* D3035C 802406DC 0000202D */ daddu $a0, $zero, $zero -/* D30360 802406E0 E7B60010 */ swc1 $f22, 0x10($sp) -/* D30364 802406E4 AFB40014 */ sw $s4, 0x14($sp) -/* D30368 802406E8 46180000 */ add.s $f0, $f0, $f24 -/* D3036C 802406EC 8C450048 */ lw $a1, 0x48($v0) -/* D30370 802406F0 8C470050 */ lw $a3, 0x50($v0) -/* D30374 802406F4 44060000 */ mfc1 $a2, $f0 -/* D30378 802406F8 0C01C5BC */ jal func_800716F0 -/* D3037C 802406FC 26310001 */ addiu $s1, $s1, 1 -/* D30380 80240700 AE020008 */ sw $v0, 8($s0) -/* D30384 80240704 E614002C */ swc1 $f20, 0x2c($s0) -/* D30388 80240708 E6140020 */ swc1 $f20, 0x20($s0) -/* D3038C 8024070C E6140014 */ swc1 $f20, 0x14($s0) -/* D30390 80240710 E6140050 */ swc1 $f20, 0x50($s0) -/* D30394 80240714 E6140044 */ swc1 $f20, 0x44($s0) -/* D30398 80240718 E6140038 */ swc1 $f20, 0x38($s0) -/* D3039C 8024071C 2A220003 */ slti $v0, $s1, 3 -/* D303A0 80240720 1440FFEC */ bnez $v0, .L802406D4 -/* D303A4 80240724 26100004 */ addiu $s0, $s0, 4 -/* D303A8 80240728 0000882D */ daddu $s1, $zero, $zero -/* D303AC 8024072C 0240802D */ daddu $s0, $s2, $zero -/* D303B0 80240730 3C148024 */ lui $s4, 0x8024 -/* D303B4 80240734 26941B38 */ addiu $s4, $s4, 0x1b38 -/* D303B8 80240738 3C014248 */ lui $at, 0x4248 -/* D303BC 8024073C 4481A000 */ mtc1 $at, $f20 -/* D303C0 80240740 24130044 */ addiu $s3, $zero, 0x44 -/* D303C4 80240744 AE400000 */ sw $zero, ($s2) -/* D303C8 80240748 AE400004 */ sw $zero, 4($s2) -/* D303CC 8024074C AE400060 */ sw $zero, 0x60($s2) -/* D303D0 80240750 AE400064 */ sw $zero, 0x64($s2) -.L80240754: -/* D303D4 80240754 27A40020 */ addiu $a0, $sp, 0x20 -/* D303D8 80240758 4406A000 */ mfc1 $a2, $f20 -/* D303DC 8024075C 8E870000 */ lw $a3, ($s4) -/* D303E0 80240760 02532821 */ addu $a1, $s2, $s3 -/* D303E4 80240764 0C00A7E7 */ jal add_vec2D_polar -/* D303E8 80240768 AFA00020 */ sw $zero, 0x20($sp) -/* D303EC 8024076C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* D303F0 80240770 C7A40020 */ lwc1 $f4, 0x20($sp) -/* D303F4 80240774 46041082 */ mul.s $f2, $f2, $f4 -/* D303F8 80240778 00000000 */ nop -/* D303FC 8024077C C7A00018 */ lwc1 $f0, 0x18($sp) -/* D30400 80240780 46040002 */ mul.s $f0, $f0, $f4 -/* D30404 80240784 00000000 */ nop -/* D30408 80240788 E6020038 */ swc1 $f2, 0x38($s0) -/* D3040C 8024078C E6000050 */ swc1 $f0, 0x50($s0) -/* D30410 80240790 8E42005C */ lw $v0, 0x5c($s2) -/* D30414 80240794 C6000038 */ lwc1 $f0, 0x38($s0) -/* D30418 80240798 C4420048 */ lwc1 $f2, 0x48($v0) -/* D3041C 8024079C 46001080 */ add.s $f2, $f2, $f0 -/* D30420 802407A0 C6A00038 */ lwc1 $f0, 0x38($s5) -/* D30424 802407A4 46020001 */ sub.s $f0, $f0, $f2 -/* D30428 802407A8 E6000038 */ swc1 $f0, 0x38($s0) -/* D3042C 802407AC 8E42005C */ lw $v0, 0x5c($s2) -/* D30430 802407B0 C6000044 */ lwc1 $f0, 0x44($s0) -/* D30434 802407B4 C442004C */ lwc1 $f2, 0x4c($v0) -/* D30438 802407B8 46001080 */ add.s $f2, $f2, $f0 -/* D3043C 802407BC C6A0003C */ lwc1 $f0, 0x3c($s5) -/* D30440 802407C0 46020001 */ sub.s $f0, $f0, $f2 -/* D30444 802407C4 E6000044 */ swc1 $f0, 0x44($s0) -/* D30448 802407C8 8E42005C */ lw $v0, 0x5c($s2) -/* D3044C 802407CC C6000050 */ lwc1 $f0, 0x50($s0) -/* D30450 802407D0 C4420050 */ lwc1 $f2, 0x50($v0) -/* D30454 802407D4 26940004 */ addiu $s4, $s4, 4 -/* D30458 802407D8 46001080 */ add.s $f2, $f2, $f0 -/* D3045C 802407DC C6A00040 */ lwc1 $f0, 0x40($s5) -/* D30460 802407E0 26730004 */ addiu $s3, $s3, 4 -/* D30464 802407E4 46020001 */ sub.s $f0, $f0, $f2 -/* D30468 802407E8 26310001 */ addiu $s1, $s1, 1 -/* D3046C 802407EC 2A220003 */ slti $v0, $s1, 3 -/* D30470 802407F0 E6000050 */ swc1 $f0, 0x50($s0) -/* D30474 802407F4 1440FFD7 */ bnez $v0, .L80240754 -/* D30478 802407F8 26100004 */ addiu $s0, $s0, 4 -.L802407FC: -/* D3047C 802407FC 8ED20060 */ lw $s2, 0x60($s6) -/* D30480 80240800 8E430000 */ lw $v1, ($s2) -/* D30484 80240804 24020001 */ addiu $v0, $zero, 1 -/* D30488 80240808 10620038 */ beq $v1, $v0, .L802408EC -/* D3048C 8024080C 28620002 */ slti $v0, $v1, 2 -/* D30490 80240810 50400005 */ beql $v0, $zero, .L80240828 -/* D30494 80240814 24020002 */ addiu $v0, $zero, 2 -/* D30498 80240818 10600007 */ beqz $v1, .L80240838 -/* D3049C 8024081C 24040005 */ addiu $a0, $zero, 5 -/* D304A0 80240820 08090274 */ j .L802409D0 -/* D304A4 80240824 00000000 */ nop -.L80240828: -/* D304A8 80240828 10620058 */ beq $v1, $v0, .L8024098C -/* D304AC 8024082C 00000000 */ nop -/* D304B0 80240830 08090274 */ j .L802409D0 -/* D304B4 80240834 00000000 */ nop -.L80240838: -/* D304B8 80240838 0000882D */ daddu $s1, $zero, $zero -/* D304BC 8024083C 3C148024 */ lui $s4, 0x8024 -/* D304C0 80240840 26941B38 */ addiu $s4, $s4, 0x1b38 -/* D304C4 80240844 24130020 */ addiu $s3, $zero, 0x20 -/* D304C8 80240848 3C064248 */ lui $a2, 0x4248 -/* D304CC 8024084C 44800000 */ mtc1 $zero, $f0 -/* D304D0 80240850 24020014 */ addiu $v0, $zero, 0x14 -/* D304D4 80240854 AFA20010 */ sw $v0, 0x10($sp) -/* D304D8 80240858 44050000 */ mfc1 $a1, $f0 -/* D304DC 8024085C 8E470060 */ lw $a3, 0x60($s2) -/* D304E0 80240860 4485B000 */ mtc1 $a1, $f22 -/* D304E4 80240864 0C00A8ED */ jal update_lerp -/* D304E8 80240868 0240802D */ daddu $s0, $s2, $zero -/* D304EC 8024086C 46000506 */ mov.s $f20, $f0 -.L80240870: -/* D304F0 80240870 4406A000 */ mfc1 $a2, $f20 -/* D304F4 80240874 27A40020 */ addiu $a0, $sp, 0x20 -/* D304F8 80240878 E6160020 */ swc1 $f22, 0x20($s0) -/* D304FC 8024087C 8E870000 */ lw $a3, ($s4) -/* D30500 80240880 02532821 */ addu $a1, $s2, $s3 -/* D30504 80240884 0C00A7E7 */ jal add_vec2D_polar -/* D30508 80240888 E7B60020 */ swc1 $f22, 0x20($sp) -/* D3050C 8024088C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* D30510 80240890 C7A00020 */ lwc1 $f0, 0x20($sp) -/* D30514 80240894 46002102 */ mul.s $f4, $f4, $f0 -/* D30518 80240898 00000000 */ nop -/* D3051C 8024089C C7A20018 */ lwc1 $f2, 0x18($sp) -/* D30520 802408A0 26940004 */ addiu $s4, $s4, 4 -/* D30524 802408A4 46001082 */ mul.s $f2, $f2, $f0 -/* D30528 802408A8 00000000 */ nop -/* D3052C 802408AC 26730004 */ addiu $s3, $s3, 4 -/* D30530 802408B0 26310001 */ addiu $s1, $s1, 1 -/* D30534 802408B4 2A220003 */ slti $v0, $s1, 3 -/* D30538 802408B8 E6040014 */ swc1 $f4, 0x14($s0) -/* D3053C 802408BC E602002C */ swc1 $f2, 0x2c($s0) -/* D30540 802408C0 1440FFEB */ bnez $v0, .L80240870 -/* D30544 802408C4 26100004 */ addiu $s0, $s0, 4 -/* D30548 802408C8 8E420060 */ lw $v0, 0x60($s2) -/* D3054C 802408CC 24420001 */ addiu $v0, $v0, 1 -/* D30550 802408D0 AE420060 */ sw $v0, 0x60($s2) -/* D30554 802408D4 28420015 */ slti $v0, $v0, 0x15 -/* D30558 802408D8 1440003D */ bnez $v0, .L802409D0 -/* D3055C 802408DC 24020001 */ addiu $v0, $zero, 1 -/* D30560 802408E0 AE420000 */ sw $v0, ($s2) -/* D30564 802408E4 08090274 */ j .L802409D0 -/* D30568 802408E8 AE400060 */ sw $zero, 0x60($s2) -.L802408EC: -/* D3056C 802408EC 0000882D */ daddu $s1, $zero, $zero -/* D30570 802408F0 3C148024 */ lui $s4, 0x8024 -/* D30574 802408F4 26941B38 */ addiu $s4, $s4, 0x1b38 -/* D30578 802408F8 24130020 */ addiu $s3, $zero, 0x20 -/* D3057C 802408FC 0240802D */ daddu $s0, $s2, $zero -/* D30580 80240900 3C014248 */ lui $at, 0x4248 -/* D30584 80240904 4481A000 */ mtc1 $at, $f20 -/* D30588 80240908 4480B000 */ mtc1 $zero, $f22 -.L8024090C: -/* D3058C 8024090C 4406A000 */ mfc1 $a2, $f20 -/* D30590 80240910 27A40020 */ addiu $a0, $sp, 0x20 -/* D30594 80240914 E6160020 */ swc1 $f22, 0x20($s0) -/* D30598 80240918 8E870000 */ lw $a3, ($s4) -/* D3059C 8024091C 02532821 */ addu $a1, $s2, $s3 -/* D305A0 80240920 0C00A7E7 */ jal add_vec2D_polar -/* D305A4 80240924 E7B60020 */ swc1 $f22, 0x20($sp) -/* D305A8 80240928 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* D305AC 8024092C C7A00020 */ lwc1 $f0, 0x20($sp) -/* D305B0 80240930 46002102 */ mul.s $f4, $f4, $f0 -/* D305B4 80240934 00000000 */ nop -/* D305B8 80240938 C7A20018 */ lwc1 $f2, 0x18($sp) -/* D305BC 8024093C 26940004 */ addiu $s4, $s4, 4 -/* D305C0 80240940 46001082 */ mul.s $f2, $f2, $f0 -/* D305C4 80240944 00000000 */ nop -/* D305C8 80240948 26730004 */ addiu $s3, $s3, 4 -/* D305CC 8024094C 26310001 */ addiu $s1, $s1, 1 -/* D305D0 80240950 2A220003 */ slti $v0, $s1, 3 -/* D305D4 80240954 E6040014 */ swc1 $f4, 0x14($s0) -/* D305D8 80240958 E602002C */ swc1 $f2, 0x2c($s0) -/* D305DC 8024095C 1440FFEB */ bnez $v0, .L8024090C -/* D305E0 80240960 26100004 */ addiu $s0, $s0, 4 -/* D305E4 80240964 8E420060 */ lw $v0, 0x60($s2) -/* D305E8 80240968 24420001 */ addiu $v0, $v0, 1 -/* D305EC 8024096C AE420060 */ sw $v0, 0x60($s2) -/* D305F0 80240970 28420010 */ slti $v0, $v0, 0x10 -/* D305F4 80240974 14400016 */ bnez $v0, .L802409D0 -/* D305F8 80240978 2402000F */ addiu $v0, $zero, 0xf -/* D305FC 8024097C AE420060 */ sw $v0, 0x60($s2) -/* D30600 80240980 24020002 */ addiu $v0, $zero, 2 -/* D30604 80240984 08090274 */ j .L802409D0 -/* D30608 80240988 AE420000 */ sw $v0, ($s2) -.L8024098C: -/* D3060C 8024098C 8E420060 */ lw $v0, 0x60($s2) -/* D30610 80240990 24420001 */ addiu $v0, $v0, 1 -/* D30614 80240994 AE420060 */ sw $v0, 0x60($s2) -/* D30618 80240998 2842001F */ slti $v0, $v0, 0x1f -/* D3061C 8024099C 1440000C */ bnez $v0, .L802409D0 -/* D30620 802409A0 0000882D */ daddu $s1, $zero, $zero -/* D30624 802409A4 0240282D */ daddu $a1, $s2, $zero -.L802409A8: -/* D30628 802409A8 8CA20008 */ lw $v0, 8($a1) -/* D3062C 802409AC 8C430000 */ lw $v1, ($v0) -/* D30630 802409B0 26310001 */ addiu $s1, $s1, 1 -/* D30634 802409B4 34630010 */ ori $v1, $v1, 0x10 -/* D30638 802409B8 AC430000 */ sw $v1, ($v0) -/* D3063C 802409BC 2A220003 */ slti $v0, $s1, 3 -/* D30640 802409C0 1440FFF9 */ bnez $v0, .L802409A8 -/* D30644 802409C4 24A50004 */ addiu $a1, $a1, 4 -/* D30648 802409C8 080902C1 */ j .L80240B04 -/* D3064C 802409CC 24020002 */ addiu $v0, $zero, 2 -.L802409D0: -/* D30650 802409D0 8E430004 */ lw $v1, 4($s2) -/* D30654 802409D4 10600005 */ beqz $v1, .L802409EC -/* D30658 802409D8 24020001 */ addiu $v0, $zero, 1 -/* D3065C 802409DC 1062000B */ beq $v1, $v0, .L80240A0C -/* D30660 802409E0 0000882D */ daddu $s1, $zero, $zero -/* D30664 802409E4 080902B0 */ j .L80240AC0 -/* D30668 802409E8 0240282D */ daddu $a1, $s2, $zero -.L802409EC: -/* D3066C 802409EC 8E420064 */ lw $v0, 0x64($s2) -/* D30670 802409F0 24420001 */ addiu $v0, $v0, 1 -/* D30674 802409F4 AE420064 */ sw $v0, 0x64($s2) -/* D30678 802409F8 28420010 */ slti $v0, $v0, 0x10 -/* D3067C 802409FC 1440002F */ bnez $v0, .L80240ABC -/* D30680 80240A00 0000882D */ daddu $s1, $zero, $zero -/* D30684 80240A04 080902AC */ j .L80240AB0 -/* D30688 80240A08 24020001 */ addiu $v0, $zero, 1 -.L80240A0C: -/* D3068C 80240A0C 4480A000 */ mtc1 $zero, $f20 -/* D30690 80240A10 24130014 */ addiu $s3, $zero, 0x14 -/* D30694 80240A14 0240802D */ daddu $s0, $s2, $zero -.L80240A18: -/* D30698 80240A18 4405A000 */ mfc1 $a1, $f20 -/* D3069C 80240A1C AFB30010 */ sw $s3, 0x10($sp) -/* D306A0 80240A20 8E060038 */ lw $a2, 0x38($s0) -/* D306A4 80240A24 8E470064 */ lw $a3, 0x64($s2) -/* D306A8 80240A28 0C00A8ED */ jal update_lerp -/* D306AC 80240A2C 24040001 */ addiu $a0, $zero, 1 -/* D306B0 80240A30 C6020014 */ lwc1 $f2, 0x14($s0) -/* D306B4 80240A34 46001080 */ add.s $f2, $f2, $f0 -/* D306B8 80240A38 4405A000 */ mfc1 $a1, $f20 -/* D306BC 80240A3C E6020014 */ swc1 $f2, 0x14($s0) -/* D306C0 80240A40 AFB30010 */ sw $s3, 0x10($sp) -/* D306C4 80240A44 8E060044 */ lw $a2, 0x44($s0) -/* D306C8 80240A48 8E470064 */ lw $a3, 0x64($s2) -/* D306CC 80240A4C 0C00A8ED */ jal update_lerp -/* D306D0 80240A50 24040001 */ addiu $a0, $zero, 1 -/* D306D4 80240A54 C6020020 */ lwc1 $f2, 0x20($s0) -/* D306D8 80240A58 46001080 */ add.s $f2, $f2, $f0 -/* D306DC 80240A5C 4405A000 */ mfc1 $a1, $f20 -/* D306E0 80240A60 E6020020 */ swc1 $f2, 0x20($s0) -/* D306E4 80240A64 AFB30010 */ sw $s3, 0x10($sp) -/* D306E8 80240A68 8E060050 */ lw $a2, 0x50($s0) -/* D306EC 80240A6C 8E470064 */ lw $a3, 0x64($s2) -/* D306F0 80240A70 0C00A8ED */ jal update_lerp -/* D306F4 80240A74 24040001 */ addiu $a0, $zero, 1 -/* D306F8 80240A78 C602002C */ lwc1 $f2, 0x2c($s0) -/* D306FC 80240A7C 46001080 */ add.s $f2, $f2, $f0 -/* D30700 80240A80 26310001 */ addiu $s1, $s1, 1 -/* D30704 80240A84 2A220003 */ slti $v0, $s1, 3 -/* D30708 80240A88 E602002C */ swc1 $f2, 0x2c($s0) -/* D3070C 80240A8C 1440FFE2 */ bnez $v0, .L80240A18 -/* D30710 80240A90 26100004 */ addiu $s0, $s0, 4 -/* D30714 80240A94 8E420064 */ lw $v0, 0x64($s2) -/* D30718 80240A98 24420001 */ addiu $v0, $v0, 1 -/* D3071C 80240A9C AE420064 */ sw $v0, 0x64($s2) -/* D30720 80240AA0 28420015 */ slti $v0, $v0, 0x15 -/* D30724 80240AA4 14400005 */ bnez $v0, .L80240ABC -/* D30728 80240AA8 0000882D */ daddu $s1, $zero, $zero -/* D3072C 80240AAC 24020002 */ addiu $v0, $zero, 2 -.L80240AB0: -/* D30730 80240AB0 AE420004 */ sw $v0, 4($s2) -/* D30734 80240AB4 AE400064 */ sw $zero, 0x64($s2) -/* D30738 80240AB8 0000882D */ daddu $s1, $zero, $zero -.L80240ABC: -/* D3073C 80240ABC 0240282D */ daddu $a1, $s2, $zero -.L80240AC0: -/* D30740 80240AC0 8CA20008 */ lw $v0, 8($a1) -/* D30744 80240AC4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* D30748 80240AC8 8C42000C */ lw $v0, 0xc($v0) -/* D3074C 80240ACC E4400010 */ swc1 $f0, 0x10($v0) -/* D30750 80240AD0 8CA20008 */ lw $v0, 8($a1) -/* D30754 80240AD4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* D30758 80240AD8 8C42000C */ lw $v0, 0xc($v0) -/* D3075C 80240ADC 26310001 */ addiu $s1, $s1, 1 -/* D30760 80240AE0 E4400014 */ swc1 $f0, 0x14($v0) -/* D30764 80240AE4 8CA20008 */ lw $v0, 8($a1) -/* D30768 80240AE8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* D3076C 80240AEC 8C42000C */ lw $v0, 0xc($v0) -/* D30770 80240AF0 E4400018 */ swc1 $f0, 0x18($v0) -/* D30774 80240AF4 2A220003 */ slti $v0, $s1, 3 -/* D30778 80240AF8 1440FFF1 */ bnez $v0, .L80240AC0 -/* D3077C 80240AFC 24A50004 */ addiu $a1, $a1, 4 -/* D30780 80240B00 0000102D */ daddu $v0, $zero, $zero -.L80240B04: -/* D30784 80240B04 8FBF0044 */ lw $ra, 0x44($sp) -/* D30788 80240B08 8FB60040 */ lw $s6, 0x40($sp) -/* D3078C 80240B0C 8FB5003C */ lw $s5, 0x3c($sp) -/* D30790 80240B10 8FB40038 */ lw $s4, 0x38($sp) -/* D30794 80240B14 8FB30034 */ lw $s3, 0x34($sp) -/* D30798 80240B18 8FB20030 */ lw $s2, 0x30($sp) -/* D3079C 80240B1C 8FB1002C */ lw $s1, 0x2c($sp) -/* D307A0 80240B20 8FB00028 */ lw $s0, 0x28($sp) -/* D307A4 80240B24 D7B80058 */ ldc1 $f24, 0x58($sp) -/* D307A8 80240B28 D7B60050 */ ldc1 $f22, 0x50($sp) -/* D307AC 80240B2C D7B40048 */ ldc1 $f20, 0x48($sp) -/* D307B0 80240B30 03E00008 */ jr $ra -/* D307B4 80240B34 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_80240B38_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_80240B38_D2FC80.s deleted file mode 100644 index b80c77e16b..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_80240B38_D2FC80.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B38_D307B8 -/* D307B8 80240B38 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D307BC 80240B3C AFB10014 */ sw $s1, 0x14($sp) -/* D307C0 80240B40 0080882D */ daddu $s1, $a0, $zero -/* D307C4 80240B44 AFB20018 */ sw $s2, 0x18($sp) -/* D307C8 80240B48 AFBF001C */ sw $ra, 0x1c($sp) -/* D307CC 80240B4C AFB00010 */ sw $s0, 0x10($sp) -/* D307D0 80240B50 8E30000C */ lw $s0, 0xc($s1) -/* D307D4 80240B54 10A00010 */ beqz $a1, .L80240B98 -/* D307D8 80240B58 0000902D */ daddu $s2, $zero, $zero -/* D307DC 80240B5C 8E050000 */ lw $a1, ($s0) -/* D307E0 80240B60 0C0B1EAF */ jal get_variable -/* D307E4 80240B64 26100004 */ addiu $s0, $s0, 4 -/* D307E8 80240B68 AE220084 */ sw $v0, 0x84($s1) -/* D307EC 80240B6C 8E050000 */ lw $a1, ($s0) -/* D307F0 80240B70 0C0B1EAF */ jal get_variable -/* D307F4 80240B74 0220202D */ daddu $a0, $s1, $zero -/* D307F8 80240B78 0240202D */ daddu $a0, $s2, $zero -/* D307FC 80240B7C 240500D0 */ addiu $a1, $zero, 0xd0 -/* D30800 80240B80 00A0302D */ daddu $a2, $a1, $zero -/* D30804 80240B84 00A0382D */ daddu $a3, $a1, $zero -/* D30808 80240B88 AE220088 */ sw $v0, 0x88($s1) -/* D3080C 80240B8C AE200070 */ sw $zero, 0x70($s1) -/* D30810 80240B90 0C04DF84 */ jal func_80137E10 -/* D30814 80240B94 AE200074 */ sw $zero, 0x74($s1) -.L80240B98: -/* D30818 80240B98 8E230070 */ lw $v1, 0x70($s1) -/* D3081C 80240B9C 24040001 */ addiu $a0, $zero, 1 -/* D30820 80240BA0 10640019 */ beq $v1, $a0, .L80240C08 -/* D30824 80240BA4 28620002 */ slti $v0, $v1, 2 -/* D30828 80240BA8 10400005 */ beqz $v0, .L80240BC0 -/* D3082C 80240BAC 24020002 */ addiu $v0, $zero, 2 -/* D30830 80240BB0 10600007 */ beqz $v1, .L80240BD0 -/* D30834 80240BB4 240500FF */ addiu $a1, $zero, 0xff -/* D30838 80240BB8 08090312 */ j .L80240C48 -/* D3083C 80240BBC 00000000 */ nop -.L80240BC0: -/* D30840 80240BC0 10620019 */ beq $v1, $v0, .L80240C28 -/* D30844 80240BC4 00000000 */ nop -/* D30848 80240BC8 08090312 */ j .L80240C48 -/* D3084C 80240BCC 00000000 */ nop -.L80240BD0: -/* D30850 80240BD0 8E220074 */ lw $v0, 0x74($s1) -/* D30854 80240BD4 14450004 */ bne $v0, $a1, .L80240BE8 -/* D30858 80240BD8 00000000 */ nop -/* D3085C 80240BDC AE240070 */ sw $a0, 0x70($s1) -/* D30860 80240BE0 AE200078 */ sw $zero, 0x78($s1) -/* D30864 80240BE4 8E220074 */ lw $v0, 0x74($s1) -.L80240BE8: -/* D30868 80240BE8 8E230084 */ lw $v1, 0x84($s1) -/* D3086C 80240BEC 00431021 */ addu $v0, $v0, $v1 -/* D30870 80240BF0 AE220074 */ sw $v0, 0x74($s1) -/* D30874 80240BF4 28420100 */ slti $v0, $v0, 0x100 -/* D30878 80240BF8 50400013 */ beql $v0, $zero, .L80240C48 -/* D3087C 80240BFC AE250074 */ sw $a1, 0x74($s1) -/* D30880 80240C00 08090312 */ j .L80240C48 -/* D30884 80240C04 00000000 */ nop -.L80240C08: -/* D30888 80240C08 8E220078 */ lw $v0, 0x78($s1) -/* D3088C 80240C0C 24420001 */ addiu $v0, $v0, 1 -/* D30890 80240C10 AE220078 */ sw $v0, 0x78($s1) -/* D30894 80240C14 28420002 */ slti $v0, $v0, 2 -/* D30898 80240C18 1440000B */ bnez $v0, .L80240C48 -/* D3089C 80240C1C 24020002 */ addiu $v0, $zero, 2 -/* D308A0 80240C20 08090312 */ j .L80240C48 -/* D308A4 80240C24 AE220070 */ sw $v0, 0x70($s1) -.L80240C28: -/* D308A8 80240C28 8E230074 */ lw $v1, 0x74($s1) -/* D308AC 80240C2C 50600001 */ beql $v1, $zero, .L80240C34 -/* D308B0 80240C30 24120001 */ addiu $s2, $zero, 1 -.L80240C34: -/* D308B4 80240C34 8E220088 */ lw $v0, 0x88($s1) -/* D308B8 80240C38 00621023 */ subu $v0, $v1, $v0 -/* D308BC 80240C3C 04410002 */ bgez $v0, .L80240C48 -/* D308C0 80240C40 AE220074 */ sw $v0, 0x74($s1) -/* D308C4 80240C44 AE200074 */ sw $zero, 0x74($s1) -.L80240C48: -/* D308C8 80240C48 C6200074 */ lwc1 $f0, 0x74($s1) -/* D308CC 80240C4C 46800020 */ cvt.s.w $f0, $f0 -/* D308D0 80240C50 44050000 */ mfc1 $a1, $f0 -/* D308D4 80240C54 0C04DF62 */ jal func_80137D88 -/* D308D8 80240C58 24040001 */ addiu $a0, $zero, 1 -/* D308DC 80240C5C 0240102D */ daddu $v0, $s2, $zero -/* D308E0 80240C60 8FBF001C */ lw $ra, 0x1c($sp) -/* D308E4 80240C64 8FB20018 */ lw $s2, 0x18($sp) -/* D308E8 80240C68 8FB10014 */ lw $s1, 0x14($sp) -/* D308EC 80240C6C 8FB00010 */ lw $s0, 0x10($sp) -/* D308F0 80240C70 03E00008 */ jr $ra -/* D308F4 80240C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_80240C78_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_80240C78_D2FC80.s deleted file mode 100644 index 7e8a0bf4da..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_80240C78_D2FC80.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C78_D308F8 -/* D308F8 80240C78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D308FC 80240C7C AFBF0018 */ sw $ra, 0x18($sp) -/* D30900 80240C80 0C00EAD2 */ jal get_npc_safe -/* D30904 80240C84 2404FFFC */ addiu $a0, $zero, -4 -/* D30908 80240C88 3C0141F0 */ lui $at, 0x41f0 -/* D3090C 80240C8C 44810000 */ mtc1 $at, $f0 -/* D30910 80240C90 C442003C */ lwc1 $f2, 0x3c($v0) -/* D30914 80240C94 46001080 */ add.s $f2, $f2, $f0 -/* D30918 80240C98 E7A00010 */ swc1 $f0, 0x10($sp) -/* D3091C 80240C9C 8C450038 */ lw $a1, 0x38($v0) -/* D30920 80240CA0 8C470040 */ lw $a3, 0x40($v0) -/* D30924 80240CA4 44061000 */ mfc1 $a2, $f2 -/* D30928 80240CA8 0C01BFBC */ jal func_8006FEF0 -/* D3092C 80240CAC 24040002 */ addiu $a0, $zero, 2 -/* D30930 80240CB0 8FBF0018 */ lw $ra, 0x18($sp) -/* D30934 80240CB4 24020002 */ addiu $v0, $zero, 2 -/* D30938 80240CB8 03E00008 */ jr $ra -/* D3093C 80240CBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_80240CC0_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_80240CC0_D2FC80.s deleted file mode 100644 index f01b5e3382..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_80240CC0_D2FC80.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0_D30940 -/* D30940 80240CC0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D30944 80240CC4 AFBF0018 */ sw $ra, 0x18($sp) -/* D30948 80240CC8 0C00EAD2 */ jal get_npc_safe -/* D3094C 80240CCC 2404FFFC */ addiu $a0, $zero, -4 -/* D30950 80240CD0 3C0141F0 */ lui $at, 0x41f0 -/* D30954 80240CD4 44810000 */ mtc1 $at, $f0 -/* D30958 80240CD8 C442003C */ lwc1 $f2, 0x3c($v0) -/* D3095C 80240CDC 46001080 */ add.s $f2, $f2, $f0 -/* D30960 80240CE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D30964 80240CE4 8C450038 */ lw $a1, 0x38($v0) -/* D30968 80240CE8 8C470040 */ lw $a3, 0x40($v0) -/* D3096C 80240CEC 44061000 */ mfc1 $a2, $f2 -/* D30970 80240CF0 0C01BFBC */ jal func_8006FEF0 -/* D30974 80240CF4 24040004 */ addiu $a0, $zero, 4 -/* D30978 80240CF8 8FBF0018 */ lw $ra, 0x18($sp) -/* D3097C 80240CFC 24020002 */ addiu $v0, $zero, 2 -/* D30980 80240D00 03E00008 */ jr $ra -/* D30984 80240D04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_80240D08_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_80240D08_D2FC80.s deleted file mode 100644 index 132e2073df..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_80240D08_D2FC80.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D08_D30988 -/* D30988 80240D08 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* D3098C 80240D0C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* D30990 80240D10 AC800084 */ sw $zero, 0x84($a0) -/* D30994 80240D14 80620000 */ lb $v0, ($v1) -/* D30998 80240D18 10400005 */ beqz $v0, .L80240D30 -/* D3099C 80240D1C 24020003 */ addiu $v0, $zero, 3 -/* D309A0 80240D20 80630003 */ lb $v1, 3($v1) -/* D309A4 80240D24 14620002 */ bne $v1, $v0, .L80240D30 -/* D309A8 80240D28 24020001 */ addiu $v0, $zero, 1 -/* D309AC 80240D2C AC820084 */ sw $v0, 0x84($a0) -.L80240D30: -/* D309B0 80240D30 03E00008 */ jr $ra -/* D309B4 80240D34 24020002 */ addiu $v0, $zero, 2 -/* D309B8 80240D38 00000000 */ nop -/* D309BC 80240D3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_80240D40_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_80240D40_D2FC80.s deleted file mode 100644 index 344541f18b..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_80240D40_D2FC80.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D40_D309C0 -/* D309C0 80240D40 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D309C4 80240D44 AFB10014 */ sw $s1, 0x14($sp) -/* D309C8 80240D48 0080882D */ daddu $s1, $a0, $zero -/* D309CC 80240D4C AFBF0018 */ sw $ra, 0x18($sp) -/* D309D0 80240D50 AFB00010 */ sw $s0, 0x10($sp) -/* D309D4 80240D54 8E300148 */ lw $s0, 0x148($s1) -/* D309D8 80240D58 0C00EABB */ jal get_npc_unsafe -/* D309DC 80240D5C 86040008 */ lh $a0, 8($s0) -/* D309E0 80240D60 24030001 */ addiu $v1, $zero, 1 -/* D309E4 80240D64 0040202D */ daddu $a0, $v0, $zero -/* D309E8 80240D68 AE03006C */ sw $v1, 0x6c($s0) -/* D309EC 80240D6C 8482008C */ lh $v0, 0x8c($a0) -/* D309F0 80240D70 14400009 */ bnez $v0, .L80240D98 -/* D309F4 80240D74 24020002 */ addiu $v0, $zero, 2 -/* D309F8 80240D78 96030072 */ lhu $v1, 0x72($s0) -/* D309FC 80240D7C AE02006C */ sw $v0, 0x6c($s0) -/* D30A00 80240D80 A483008E */ sh $v1, 0x8e($a0) -/* D30A04 80240D84 8E0200CC */ lw $v0, 0xcc($s0) -/* D30A08 80240D88 8C420020 */ lw $v0, 0x20($v0) -/* D30A0C 80240D8C AC820028 */ sw $v0, 0x28($a0) -/* D30A10 80240D90 2402001F */ addiu $v0, $zero, 0x1f -/* D30A14 80240D94 AE220070 */ sw $v0, 0x70($s1) -.L80240D98: -/* D30A18 80240D98 8FBF0018 */ lw $ra, 0x18($sp) -/* D30A1C 80240D9C 8FB10014 */ lw $s1, 0x14($sp) -/* D30A20 80240DA0 8FB00010 */ lw $s0, 0x10($sp) -/* D30A24 80240DA4 03E00008 */ jr $ra -/* D30A28 80240DA8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_80240DAC_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_80240DAC_D2FC80.s deleted file mode 100644 index 8a249da4c0..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_80240DAC_D2FC80.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DAC_D30A2C -/* D30A2C 80240DAC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D30A30 80240DB0 AFB10014 */ sw $s1, 0x14($sp) -/* D30A34 80240DB4 0080882D */ daddu $s1, $a0, $zero -/* D30A38 80240DB8 AFBF0018 */ sw $ra, 0x18($sp) -/* D30A3C 80240DBC AFB00010 */ sw $s0, 0x10($sp) -/* D30A40 80240DC0 8E300148 */ lw $s0, 0x148($s1) -/* D30A44 80240DC4 0C00EABB */ jal get_npc_unsafe -/* D30A48 80240DC8 86040008 */ lh $a0, 8($s0) -/* D30A4C 80240DCC 0040202D */ daddu $a0, $v0, $zero -/* D30A50 80240DD0 9482008E */ lhu $v0, 0x8e($a0) -/* D30A54 80240DD4 2442FFFF */ addiu $v0, $v0, -1 -/* D30A58 80240DD8 A482008E */ sh $v0, 0x8e($a0) -/* D30A5C 80240DDC 00021400 */ sll $v0, $v0, 0x10 -/* D30A60 80240DE0 1C400009 */ bgtz $v0, .L80240E08 -/* D30A64 80240DE4 24020003 */ addiu $v0, $zero, 3 -/* D30A68 80240DE8 96030076 */ lhu $v1, 0x76($s0) -/* D30A6C 80240DEC AE02006C */ sw $v0, 0x6c($s0) -/* D30A70 80240DF0 A483008E */ sh $v1, 0x8e($a0) -/* D30A74 80240DF4 8E0200CC */ lw $v0, 0xcc($s0) -/* D30A78 80240DF8 8C420024 */ lw $v0, 0x24($v0) -/* D30A7C 80240DFC AC820028 */ sw $v0, 0x28($a0) -/* D30A80 80240E00 24020020 */ addiu $v0, $zero, 0x20 -/* D30A84 80240E04 AE220070 */ sw $v0, 0x70($s1) -.L80240E08: -/* D30A88 80240E08 8FBF0018 */ lw $ra, 0x18($sp) -/* D30A8C 80240E0C 8FB10014 */ lw $s1, 0x14($sp) -/* D30A90 80240E10 8FB00010 */ lw $s0, 0x10($sp) -/* D30A94 80240E14 03E00008 */ jr $ra -/* D30A98 80240E18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_80240E1C_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_80240E1C_D2FC80.s deleted file mode 100644 index 91e641c58f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_80240E1C_D2FC80.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E1C_D30A9C -/* D30A9C 80240E1C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D30AA0 80240E20 AFB10034 */ sw $s1, 0x34($sp) -/* D30AA4 80240E24 0080882D */ daddu $s1, $a0, $zero -/* D30AA8 80240E28 AFBF0038 */ sw $ra, 0x38($sp) -/* D30AAC 80240E2C AFB00030 */ sw $s0, 0x30($sp) -/* D30AB0 80240E30 8E300148 */ lw $s0, 0x148($s1) -/* D30AB4 80240E34 0C00EABB */ jal get_npc_unsafe -/* D30AB8 80240E38 86040008 */ lh $a0, 8($s0) -/* D30ABC 80240E3C 0040282D */ daddu $a1, $v0, $zero -/* D30AC0 80240E40 94A2008E */ lhu $v0, 0x8e($a1) -/* D30AC4 80240E44 2442FFFF */ addiu $v0, $v0, -1 -/* D30AC8 80240E48 A4A2008E */ sh $v0, 0x8e($a1) -/* D30ACC 80240E4C 00021400 */ sll $v0, $v0, 0x10 -/* D30AD0 80240E50 1C400023 */ bgtz $v0, .L80240EE0 -/* D30AD4 80240E54 24020004 */ addiu $v0, $zero, 4 -/* D30AD8 80240E58 8E0300CC */ lw $v1, 0xcc($s0) -/* D30ADC 80240E5C AE02006C */ sw $v0, 0x6c($s0) -/* D30AE0 80240E60 8C620000 */ lw $v0, ($v1) -/* D30AE4 80240E64 ACA20028 */ sw $v0, 0x28($a1) -/* D30AE8 80240E68 9602007A */ lhu $v0, 0x7a($s0) -/* D30AEC 80240E6C A4A2008E */ sh $v0, 0x8e($a1) -/* D30AF0 80240E70 8E020078 */ lw $v0, 0x78($s0) -/* D30AF4 80240E74 28420008 */ slti $v0, $v0, 8 -/* D30AF8 80240E78 14400018 */ bnez $v0, .L80240EDC -/* D30AFC 80240E7C 24020021 */ addiu $v0, $zero, 0x21 -/* D30B00 80240E80 24040003 */ addiu $a0, $zero, 3 -/* D30B04 80240E84 27A30028 */ addiu $v1, $sp, 0x28 -/* D30B08 80240E88 84A700A8 */ lh $a3, 0xa8($a1) -/* D30B0C 80240E8C 3C013F80 */ lui $at, 0x3f80 -/* D30B10 80240E90 44810000 */ mtc1 $at, $f0 -/* D30B14 80240E94 3C014000 */ lui $at, 0x4000 -/* D30B18 80240E98 44811000 */ mtc1 $at, $f2 -/* D30B1C 80240E9C 3C01C1A0 */ lui $at, 0xc1a0 -/* D30B20 80240EA0 44812000 */ mtc1 $at, $f4 -/* D30B24 80240EA4 44873000 */ mtc1 $a3, $f6 -/* D30B28 80240EA8 00000000 */ nop -/* D30B2C 80240EAC 468031A0 */ cvt.s.w $f6, $f6 -/* D30B30 80240EB0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D30B34 80240EB4 E7A20014 */ swc1 $f2, 0x14($sp) -/* D30B38 80240EB8 E7A40018 */ swc1 $f4, 0x18($sp) -/* D30B3C 80240EBC 8E020078 */ lw $v0, 0x78($s0) -/* D30B40 80240EC0 44073000 */ mfc1 $a3, $f6 -/* D30B44 80240EC4 0000302D */ daddu $a2, $zero, $zero -/* D30B48 80240EC8 AFA30020 */ sw $v1, 0x20($sp) -/* D30B4C 80240ECC 2442FFFF */ addiu $v0, $v0, -1 -/* D30B50 80240ED0 0C01BFA4 */ jal fx_emote -/* D30B54 80240ED4 AFA2001C */ sw $v0, 0x1c($sp) -/* D30B58 80240ED8 24020021 */ addiu $v0, $zero, 0x21 -.L80240EDC: -/* D30B5C 80240EDC AE220070 */ sw $v0, 0x70($s1) -.L80240EE0: -/* D30B60 80240EE0 8FBF0038 */ lw $ra, 0x38($sp) -/* D30B64 80240EE4 8FB10034 */ lw $s1, 0x34($sp) -/* D30B68 80240EE8 8FB00030 */ lw $s0, 0x30($sp) -/* D30B6C 80240EEC 03E00008 */ jr $ra -/* D30B70 80240EF0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_80240EF4_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_80240EF4_D2FC80.s deleted file mode 100644 index 62c3f256c6..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_80240EF4_D2FC80.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EF4_D30B74 -/* D30B74 80240EF4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D30B78 80240EF8 AFB10014 */ sw $s1, 0x14($sp) -/* D30B7C 80240EFC 0080882D */ daddu $s1, $a0, $zero -/* D30B80 80240F00 AFBF0018 */ sw $ra, 0x18($sp) -/* D30B84 80240F04 AFB00010 */ sw $s0, 0x10($sp) -/* D30B88 80240F08 8E300148 */ lw $s0, 0x148($s1) -/* D30B8C 80240F0C 0C00EABB */ jal get_npc_unsafe -/* D30B90 80240F10 86040008 */ lh $a0, 8($s0) -/* D30B94 80240F14 9443008E */ lhu $v1, 0x8e($v0) -/* D30B98 80240F18 2463FFFF */ addiu $v1, $v1, -1 -/* D30B9C 80240F1C A443008E */ sh $v1, 0x8e($v0) -/* D30BA0 80240F20 00031C00 */ sll $v1, $v1, 0x10 -/* D30BA4 80240F24 1C600003 */ bgtz $v1, .L80240F34 -/* D30BA8 80240F28 2402000C */ addiu $v0, $zero, 0xc -/* D30BAC 80240F2C AE00006C */ sw $zero, 0x6c($s0) -/* D30BB0 80240F30 AE220070 */ sw $v0, 0x70($s1) -.L80240F34: -/* D30BB4 80240F34 8FBF0018 */ lw $ra, 0x18($sp) -/* D30BB8 80240F38 8FB10014 */ lw $s1, 0x14($sp) -/* D30BBC 80240F3C 8FB00010 */ lw $s0, 0x10($sp) -/* D30BC0 80240F40 03E00008 */ jr $ra -/* D30BC4 80240F44 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_802410FC_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_802410FC_D2FC80.s deleted file mode 100644 index b411560812..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_802410FC_D2FC80.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410FC_D30D7C -/* D30D7C 802410FC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D30D80 80241100 AFB40028 */ sw $s4, 0x28($sp) -/* D30D84 80241104 0080A02D */ daddu $s4, $a0, $zero -/* D30D88 80241108 AFBF002C */ sw $ra, 0x2c($sp) -/* D30D8C 8024110C AFB30024 */ sw $s3, 0x24($sp) -/* D30D90 80241110 AFB20020 */ sw $s2, 0x20($sp) -/* D30D94 80241114 AFB1001C */ sw $s1, 0x1c($sp) -/* D30D98 80241118 AFB00018 */ sw $s0, 0x18($sp) -/* D30D9C 8024111C 8E910148 */ lw $s1, 0x148($s4) -/* D30DA0 80241120 86240008 */ lh $a0, 8($s1) -/* D30DA4 80241124 0C00EABB */ jal get_npc_unsafe -/* D30DA8 80241128 00A0802D */ daddu $s0, $a1, $zero -/* D30DAC 8024112C 16000005 */ bnez $s0, .L80241144 -/* D30DB0 80241130 0040902D */ daddu $s2, $v0, $zero -/* D30DB4 80241134 8E2200B0 */ lw $v0, 0xb0($s1) -/* D30DB8 80241138 30420004 */ andi $v0, $v0, 4 -/* D30DBC 8024113C 10400015 */ beqz $v0, .L80241194 -/* D30DC0 80241140 00000000 */ nop -.L80241144: -/* D30DC4 80241144 AE800070 */ sw $zero, 0x70($s4) -/* D30DC8 80241148 8E420000 */ lw $v0, ($s2) -/* D30DCC 8024114C 3C031F30 */ lui $v1, 0x1f30 -/* D30DD0 80241150 A640008E */ sh $zero, 0x8e($s2) -/* D30DD4 80241154 34420102 */ ori $v0, $v0, 0x102 -/* D30DD8 80241158 AE420000 */ sw $v0, ($s2) -/* D30DDC 8024115C 8E220000 */ lw $v0, ($s1) -/* D30DE0 80241160 3C01C47A */ lui $at, 0xc47a -/* D30DE4 80241164 44810000 */ mtc1 $at, $f0 -/* D30DE8 80241168 00431025 */ or $v0, $v0, $v1 -/* D30DEC 8024116C AE220000 */ sw $v0, ($s1) -/* D30DF0 80241170 AE400038 */ sw $zero, 0x38($s2) -/* D30DF4 80241174 E640003C */ swc1 $f0, 0x3c($s2) -/* D30DF8 80241178 AE400040 */ sw $zero, 0x40($s2) -/* D30DFC 8024117C 8E2300B0 */ lw $v1, 0xb0($s1) -/* D30E00 80241180 30620004 */ andi $v0, $v1, 4 -/* D30E04 80241184 10400003 */ beqz $v0, .L80241194 -/* D30E08 80241188 2402FFFB */ addiu $v0, $zero, -5 -/* D30E0C 8024118C 00621024 */ and $v0, $v1, $v0 -/* D30E10 80241190 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241194: -/* D30E14 80241194 8E930070 */ lw $s3, 0x70($s4) -/* D30E18 80241198 12600005 */ beqz $s3, .L802411B0 -/* D30E1C 8024119C 24020001 */ addiu $v0, $zero, 1 -/* D30E20 802411A0 12620048 */ beq $s3, $v0, .L802412C4 -/* D30E24 802411A4 00000000 */ nop -/* D30E28 802411A8 080904CE */ j .L80241338 -/* D30E2C 802411AC 00000000 */ nop -.L802411B0: -/* D30E30 802411B0 86240008 */ lh $a0, 8($s1) -/* D30E34 802411B4 0C00FB3A */ jal get_enemy -/* D30E38 802411B8 2484FFFF */ addiu $a0, $a0, -1 -/* D30E3C 802411BC 0040802D */ daddu $s0, $v0, $zero -/* D30E40 802411C0 0C00EABB */ jal get_npc_unsafe -/* D30E44 802411C4 86040008 */ lh $a0, 8($s0) -/* D30E48 802411C8 24030001 */ addiu $v1, $zero, 1 -/* D30E4C 802411CC 0040982D */ daddu $s3, $v0, $zero -/* D30E50 802411D0 A2230007 */ sb $v1, 7($s1) -/* D30E54 802411D4 8E03006C */ lw $v1, 0x6c($s0) -/* D30E58 802411D8 24020003 */ addiu $v0, $zero, 3 -/* D30E5C 802411DC 14620056 */ bne $v1, $v0, .L80241338 -/* D30E60 802411E0 00000000 */ nop -/* D30E64 802411E4 8E2500A8 */ lw $a1, 0xa8($s1) -/* D30E68 802411E8 10A00003 */ beqz $a1, .L802411F8 -/* D30E6C 802411EC 0260202D */ daddu $a0, $s3, $zero -/* D30E70 802411F0 0C012530 */ jal func_800494C0 -/* D30E74 802411F4 0000302D */ daddu $a2, $zero, $zero -.L802411F8: -/* D30E78 802411F8 27A40010 */ addiu $a0, $sp, 0x10 -/* D30E7C 802411FC C6280070 */ lwc1 $f8, 0x70($s1) -/* D30E80 80241200 46804220 */ cvt.s.w $f8, $f8 -/* D30E84 80241204 C6620034 */ lwc1 $f2, 0x34($s3) -/* D30E88 80241208 3C014387 */ lui $at, 0x4387 -/* D30E8C 8024120C 44810000 */ mtc1 $at, $f0 -/* D30E90 80241210 44064000 */ mfc1 $a2, $f8 -/* D30E94 80241214 46020001 */ sub.s $f0, $f0, $f2 -/* D30E98 80241218 C6660038 */ lwc1 $f6, 0x38($s3) -/* D30E9C 8024121C C6640040 */ lwc1 $f4, 0x40($s3) -/* D30EA0 80241220 44070000 */ mfc1 $a3, $f0 -/* D30EA4 80241224 27A50014 */ addiu $a1, $sp, 0x14 -/* D30EA8 80241228 E7A60010 */ swc1 $f6, 0x10($sp) -/* D30EAC 8024122C 0C00A7E7 */ jal add_vec2D_polar -/* D30EB0 80241230 E7A40014 */ swc1 $f4, 0x14($sp) -/* D30EB4 80241234 C7A00010 */ lwc1 $f0, 0x10($sp) -/* D30EB8 80241238 4600020D */ trunc.w.s $f8, $f0 -/* D30EBC 8024123C 44024000 */ mfc1 $v0, $f8 -/* D30EC0 80241240 E6400038 */ swc1 $f0, 0x38($s2) -/* D30EC4 80241244 A6220010 */ sh $v0, 0x10($s1) -/* D30EC8 80241248 C660003C */ lwc1 $f0, 0x3c($s3) -/* D30ECC 8024124C C622006C */ lwc1 $f2, 0x6c($s1) -/* D30ED0 80241250 468010A0 */ cvt.s.w $f2, $f2 -/* D30ED4 80241254 46020000 */ add.s $f0, $f0, $f2 -/* D30ED8 80241258 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* D30EDC 8024125C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* D30EE0 80241260 E640003C */ swc1 $f0, 0x3c($s2) -/* D30EE4 80241264 C7A20014 */ lwc1 $f2, 0x14($sp) -/* D30EE8 80241268 4600020D */ trunc.w.s $f8, $f0 -/* D30EEC 8024126C 44024000 */ mfc1 $v0, $f8 -/* D30EF0 80241270 00000000 */ nop -/* D30EF4 80241274 A6220012 */ sh $v0, 0x12($s1) -/* D30EF8 80241278 4600120D */ trunc.w.s $f8, $f2 -/* D30EFC 8024127C 44024000 */ mfc1 $v0, $f8 -/* D30F00 80241280 E6420040 */ swc1 $f2, 0x40($s2) -/* D30F04 80241284 A6220014 */ sh $v0, 0x14($s1) -/* D30F08 80241288 8C660028 */ lw $a2, 0x28($v1) -/* D30F0C 8024128C 8C670030 */ lw $a3, 0x30($v1) -/* D30F10 80241290 C64C0038 */ lwc1 $f12, 0x38($s2) -/* D30F14 80241294 0C00A720 */ jal atan2 -/* D30F18 80241298 C64E0040 */ lwc1 $f14, 0x40($s2) -/* D30F1C 8024129C 3C03E0EF */ lui $v1, 0xe0ef -/* D30F20 802412A0 E640000C */ swc1 $f0, 0xc($s2) -/* D30F24 802412A4 8E220000 */ lw $v0, ($s1) -/* D30F28 802412A8 3463FFFF */ ori $v1, $v1, 0xffff -/* D30F2C 802412AC 00431024 */ and $v0, $v0, $v1 -/* D30F30 802412B0 AE220000 */ sw $v0, ($s1) -/* D30F34 802412B4 24020001 */ addiu $v0, $zero, 1 -/* D30F38 802412B8 A640008E */ sh $zero, 0x8e($s2) -/* D30F3C 802412BC 080904CE */ j .L80241338 -/* D30F40 802412C0 AE820070 */ sw $v0, 0x70($s4) -.L802412C4: -/* D30F44 802412C4 86240008 */ lh $a0, 8($s1) -/* D30F48 802412C8 0C00FB3A */ jal get_enemy -/* D30F4C 802412CC 2484FFFF */ addiu $a0, $a0, -1 -/* D30F50 802412D0 0040802D */ daddu $s0, $v0, $zero -/* D30F54 802412D4 0C00EABB */ jal get_npc_unsafe -/* D30F58 802412D8 86040008 */ lh $a0, 8($s0) -/* D30F5C 802412DC 9642008E */ lhu $v0, 0x8e($s2) -/* D30F60 802412E0 24420001 */ addiu $v0, $v0, 1 -/* D30F64 802412E4 A642008E */ sh $v0, 0x8e($s2) -/* D30F68 802412E8 00021400 */ sll $v0, $v0, 0x10 -/* D30F6C 802412EC 8E23007C */ lw $v1, 0x7c($s1) -/* D30F70 802412F0 00021403 */ sra $v0, $v0, 0x10 -/* D30F74 802412F4 0043102A */ slt $v0, $v0, $v1 -/* D30F78 802412F8 50400001 */ beql $v0, $zero, .L80241300 -/* D30F7C 802412FC A2200007 */ sb $zero, 7($s1) -.L80241300: -/* D30F80 80241300 8E03006C */ lw $v1, 0x6c($s0) -/* D30F84 80241304 24020004 */ addiu $v0, $zero, 4 -/* D30F88 80241308 1462000B */ bne $v1, $v0, .L80241338 -/* D30F8C 8024130C 3C021F10 */ lui $v0, 0x1f10 -/* D30F90 80241310 8E230000 */ lw $v1, ($s1) -/* D30F94 80241314 3C01C47A */ lui $at, 0xc47a -/* D30F98 80241318 44810000 */ mtc1 $at, $f0 -/* D30F9C 8024131C 00621825 */ or $v1, $v1, $v0 -/* D30FA0 80241320 AE230000 */ sw $v1, ($s1) -/* D30FA4 80241324 AE400038 */ sw $zero, 0x38($s2) -/* D30FA8 80241328 E640003C */ swc1 $f0, 0x3c($s2) -/* D30FAC 8024132C AE400040 */ sw $zero, 0x40($s2) -/* D30FB0 80241330 A2330007 */ sb $s3, 7($s1) -/* D30FB4 80241334 AE800070 */ sw $zero, 0x70($s4) -.L80241338: -/* D30FB8 80241338 8FBF002C */ lw $ra, 0x2c($sp) -/* D30FBC 8024133C 8FB40028 */ lw $s4, 0x28($sp) -/* D30FC0 80241340 8FB30024 */ lw $s3, 0x24($sp) -/* D30FC4 80241344 8FB20020 */ lw $s2, 0x20($sp) -/* D30FC8 80241348 8FB1001C */ lw $s1, 0x1c($sp) -/* D30FCC 8024134C 8FB00018 */ lw $s0, 0x18($sp) -/* D30FD0 80241350 0000102D */ daddu $v0, $zero, $zero -/* D30FD4 80241354 03E00008 */ jr $ra -/* D30FD8 80241358 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_80241610_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_80241610_D2FC80.s deleted file mode 100644 index 56fae37e68..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_80241610_D2FC80.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241610_D31290 -/* D31290 80241610 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D31294 80241614 AFB10014 */ sw $s1, 0x14($sp) -/* D31298 80241618 0080882D */ daddu $s1, $a0, $zero -/* D3129C 8024161C AFBF001C */ sw $ra, 0x1c($sp) -/* D312A0 80241620 AFB20018 */ sw $s2, 0x18($sp) -/* D312A4 80241624 AFB00010 */ sw $s0, 0x10($sp) -/* D312A8 80241628 8E30000C */ lw $s0, 0xc($s1) -/* D312AC 8024162C 8E050000 */ lw $a1, ($s0) -/* D312B0 80241630 0C0B1EAF */ jal get_variable -/* D312B4 80241634 26100004 */ addiu $s0, $s0, 4 -/* D312B8 80241638 8E050000 */ lw $a1, ($s0) -/* D312BC 8024163C 26100004 */ addiu $s0, $s0, 4 -/* D312C0 80241640 0220202D */ daddu $a0, $s1, $zero -/* D312C4 80241644 0C0B1EAF */ jal get_variable -/* D312C8 80241648 0040902D */ daddu $s2, $v0, $zero -/* D312CC 8024164C 0220202D */ daddu $a0, $s1, $zero -/* D312D0 80241650 8E050000 */ lw $a1, ($s0) -/* D312D4 80241654 0C0B1EAF */ jal get_variable -/* D312D8 80241658 0040802D */ daddu $s0, $v0, $zero -/* D312DC 8024165C 44926000 */ mtc1 $s2, $f12 -/* D312E0 80241660 00000000 */ nop -/* D312E4 80241664 46806320 */ cvt.s.w $f12, $f12 -/* D312E8 80241668 44820000 */ mtc1 $v0, $f0 -/* D312EC 8024166C 00000000 */ nop -/* D312F0 80241670 46800020 */ cvt.s.w $f0, $f0 -/* D312F4 80241674 44060000 */ mfc1 $a2, $f0 -/* D312F8 80241678 44907000 */ mtc1 $s0, $f14 -/* D312FC 8024167C 00000000 */ nop -/* D31300 80241680 0C01BE3C */ jal func_8006F8F0 -/* D31304 80241684 468073A0 */ cvt.s.w $f14, $f14 -/* D31308 80241688 8FBF001C */ lw $ra, 0x1c($sp) -/* D3130C 8024168C 8FB20018 */ lw $s2, 0x18($sp) -/* D31310 80241690 8FB10014 */ lw $s1, 0x14($sp) -/* D31314 80241694 8FB00010 */ lw $s0, 0x10($sp) -/* D31318 80241698 24020002 */ addiu $v0, $zero, 2 -/* D3131C 8024169C 03E00008 */ jr $ra -/* D31320 802416A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_802416A4_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_802416A4_D2FC80.s deleted file mode 100644 index d9dc21fc49..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_802416A4_D2FC80.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416A4_D31324 -/* D31324 802416A4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D31328 802416A8 AFB1001C */ sw $s1, 0x1c($sp) -/* D3132C 802416AC 0080882D */ daddu $s1, $a0, $zero -/* D31330 802416B0 AFBF0024 */ sw $ra, 0x24($sp) -/* D31334 802416B4 AFB20020 */ sw $s2, 0x20($sp) -/* D31338 802416B8 AFB00018 */ sw $s0, 0x18($sp) -/* D3133C 802416BC 8E30000C */ lw $s0, 0xc($s1) -/* D31340 802416C0 8E050000 */ lw $a1, ($s0) -/* D31344 802416C4 0C0B1EAF */ jal get_variable -/* D31348 802416C8 26100004 */ addiu $s0, $s0, 4 -/* D3134C 802416CC 8E050000 */ lw $a1, ($s0) -/* D31350 802416D0 26100004 */ addiu $s0, $s0, 4 -/* D31354 802416D4 0220202D */ daddu $a0, $s1, $zero -/* D31358 802416D8 0C0B1EAF */ jal get_variable -/* D3135C 802416DC 0040902D */ daddu $s2, $v0, $zero -/* D31360 802416E0 0220202D */ daddu $a0, $s1, $zero -/* D31364 802416E4 8E050000 */ lw $a1, ($s0) -/* D31368 802416E8 0C0B1EAF */ jal get_variable -/* D3136C 802416EC 0040802D */ daddu $s0, $v0, $zero -/* D31370 802416F0 3C048000 */ lui $a0, 0x8000 -/* D31374 802416F4 3484006C */ ori $a0, $a0, 0x6c -/* D31378 802416F8 0000282D */ daddu $a1, $zero, $zero -/* D3137C 802416FC 44921000 */ mtc1 $s2, $f2 -/* D31380 80241700 00000000 */ nop -/* D31384 80241704 468010A0 */ cvt.s.w $f2, $f2 -/* D31388 80241708 44061000 */ mfc1 $a2, $f2 -/* D3138C 8024170C 44901000 */ mtc1 $s0, $f2 -/* D31390 80241710 00000000 */ nop -/* D31394 80241714 468010A0 */ cvt.s.w $f2, $f2 -/* D31398 80241718 44071000 */ mfc1 $a3, $f2 -/* D3139C 8024171C 44820000 */ mtc1 $v0, $f0 -/* D313A0 80241720 00000000 */ nop -/* D313A4 80241724 46800020 */ cvt.s.w $f0, $f0 -/* D313A8 80241728 0C05267B */ jal func_801499EC -/* D313AC 8024172C E7A00010 */ swc1 $f0, 0x10($sp) -/* D313B0 80241730 8FBF0024 */ lw $ra, 0x24($sp) -/* D313B4 80241734 8FB20020 */ lw $s2, 0x20($sp) -/* D313B8 80241738 8FB1001C */ lw $s1, 0x1c($sp) -/* D313BC 8024173C 8FB00018 */ lw $s0, 0x18($sp) -/* D313C0 80241740 24020002 */ addiu $v0, $zero, 2 -/* D313C4 80241744 03E00008 */ jr $ra -/* D313C8 80241748 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_08/func_8024174C_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/func_8024174C_D2FC80.s deleted file mode 100644 index 214631f347..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/func_8024174C_D2FC80.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024174C_D313CC -/* D313CC 8024174C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D313D0 80241750 AFB10014 */ sw $s1, 0x14($sp) -/* D313D4 80241754 0080882D */ daddu $s1, $a0, $zero -/* D313D8 80241758 AFBF0018 */ sw $ra, 0x18($sp) -/* D313DC 8024175C AFB00010 */ sw $s0, 0x10($sp) -/* D313E0 80241760 8E30000C */ lw $s0, 0xc($s1) -/* D313E4 80241764 8E050000 */ lw $a1, ($s0) -/* D313E8 80241768 0C0B1EAF */ jal get_variable -/* D313EC 8024176C 26100004 */ addiu $s0, $s0, 4 -/* D313F0 80241770 0220202D */ daddu $a0, $s1, $zero -/* D313F4 80241774 8E050000 */ lw $a1, ($s0) -/* D313F8 80241778 0C0B1EAF */ jal get_variable -/* D313FC 8024177C 0040802D */ daddu $s0, $v0, $zero -/* D31400 80241780 320400FF */ andi $a0, $s0, 0xff -/* D31404 80241784 0C00A3C2 */ jal start_rumble -/* D31408 80241788 3045FFFF */ andi $a1, $v0, 0xffff -/* D3140C 8024178C 8FBF0018 */ lw $ra, 0x18($sp) -/* D31410 80241790 8FB10014 */ lw $s1, 0x14($sp) -/* D31414 80241794 8FB00010 */ lw $s0, 0x10($sp) -/* D31418 80241798 24020002 */ addiu $v0, $zero, 2 -/* D3141C 8024179C 03E00008 */ jr $ra -/* D31420 802417A0 27BD0020 */ addiu $sp, $sp, 0x20 -/* D31424 802417A4 00000000 */ nop -/* D31428 802417A8 00000000 */ nop -/* D3142C 802417AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_09/func_802400B4_D362F0.s b/asm/nonmatchings/world/area_sam/sam_09/func_802400B4_D362F0.s deleted file mode 100644 index f5a32d0ec2..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_09/func_802400B4_D362F0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_D363A4 -/* D363A4 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D363A8 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* D363AC 802400BC 0080802D */ daddu $s0, $a0, $zero -/* D363B0 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* D363B4 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* D363B8 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* D363BC 802400CC 8C510000 */ lw $s1, ($v0) -/* D363C0 802400D0 0C0B1EAF */ jal get_variable -/* D363C4 802400D4 0220282D */ daddu $a1, $s1, $zero -/* D363C8 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* D363CC 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* D363D0 802400E0 0200202D */ daddu $a0, $s0, $zero -/* D363D4 802400E4 00431024 */ and $v0, $v0, $v1 -/* D363D8 802400E8 00021140 */ sll $v0, $v0, 5 -/* D363DC 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* D363E0 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* D363E4 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D363E8 802400F8 0C0B2026 */ jal set_variable -/* D363EC 802400FC 0220282D */ daddu $a1, $s1, $zero -/* D363F0 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* D363F4 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* D363F8 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* D363FC 8024010C 24020002 */ addiu $v0, $zero, 2 -/* D36400 80240110 03E00008 */ jr $ra -/* D36404 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_09/func_80240118_D362F0.s b/asm/nonmatchings/world/area_sam/sam_09/func_80240118_D362F0.s deleted file mode 100644 index 85e06e2d4b..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_09/func_80240118_D362F0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_D36408 -/* D36408 80240118 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3640C 8024011C AFB00010 */ sw $s0, 0x10($sp) -/* D36410 80240120 0080802D */ daddu $s0, $a0, $zero -/* D36414 80240124 AFBF0014 */ sw $ra, 0x14($sp) -/* D36418 80240128 8E02000C */ lw $v0, 0xc($s0) -/* D3641C 8024012C 0C0B1EAF */ jal get_variable -/* D36420 80240130 8C450000 */ lw $a1, ($v0) -/* D36424 80240134 0C04C3D6 */ jal get_item_entity -/* D36428 80240138 0040202D */ daddu $a0, $v0, $zero -/* D3642C 8024013C 84430018 */ lh $v1, 0x18($v0) -/* D36430 80240140 AE030084 */ sw $v1, 0x84($s0) -/* D36434 80240144 8FBF0014 */ lw $ra, 0x14($sp) -/* D36438 80240148 8FB00010 */ lw $s0, 0x10($sp) -/* D3643C 8024014C 24020002 */ addiu $v0, $zero, 2 -/* D36440 80240150 03E00008 */ jr $ra -/* D36444 80240154 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_09/func_80240158_D362F0.s b/asm/nonmatchings/world/area_sam/sam_09/func_80240158_D362F0.s deleted file mode 100644 index 36e498c1f8..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_09/func_80240158_D362F0.s +++ /dev/null @@ -1,74 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_D36448 -/* D36448 80240158 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3644C 8024015C AFB10014 */ sw $s1, 0x14($sp) -/* D36450 80240160 0080882D */ daddu $s1, $a0, $zero -/* D36454 80240164 3C05FD05 */ lui $a1, 0xfd05 -/* D36458 80240168 34A50F80 */ ori $a1, $a1, 0xf80 -/* D3645C 8024016C AFBF001C */ sw $ra, 0x1c($sp) -/* D36460 80240170 AFB20018 */ sw $s2, 0x18($sp) -/* D36464 80240174 0C0B1EAF */ jal get_variable -/* D36468 80240178 AFB00010 */ sw $s0, 0x10($sp) -/* D3646C 8024017C 0040802D */ daddu $s0, $v0, $zero -/* D36470 80240180 2412FFFF */ addiu $s2, $zero, -1 -/* D36474 80240184 52120001 */ beql $s0, $s2, .L8024018C -/* D36478 80240188 241000FF */ addiu $s0, $zero, 0xff -.L8024018C: -/* D3647C 8024018C 0220202D */ daddu $a0, $s1, $zero -/* D36480 80240190 3C05F5DE */ lui $a1, 0xf5de -/* D36484 80240194 34A50288 */ ori $a1, $a1, 0x288 -/* D36488 80240198 0C0B2026 */ jal set_variable -/* D3648C 8024019C 320600FF */ andi $a2, $s0, 0xff -/* D36490 802401A0 0220202D */ daddu $a0, $s1, $zero -/* D36494 802401A4 3C05F5DE */ lui $a1, 0xf5de -/* D36498 802401A8 34A50289 */ ori $a1, $a1, 0x289 -/* D3649C 802401AC 00103203 */ sra $a2, $s0, 8 -/* D364A0 802401B0 0C0B2026 */ jal set_variable -/* D364A4 802401B4 30C600FF */ andi $a2, $a2, 0xff -/* D364A8 802401B8 0220202D */ daddu $a0, $s1, $zero -/* D364AC 802401BC 3C05FD05 */ lui $a1, 0xfd05 -/* D364B0 802401C0 0C0B1EAF */ jal get_variable -/* D364B4 802401C4 34A50F81 */ ori $a1, $a1, 0xf81 -/* D364B8 802401C8 0040802D */ daddu $s0, $v0, $zero -/* D364BC 802401CC 52120001 */ beql $s0, $s2, .L802401D4 -/* D364C0 802401D0 241000FF */ addiu $s0, $zero, 0xff -.L802401D4: -/* D364C4 802401D4 0220202D */ daddu $a0, $s1, $zero -/* D364C8 802401D8 3C05F5DE */ lui $a1, 0xf5de -/* D364CC 802401DC 34A5028A */ ori $a1, $a1, 0x28a -/* D364D0 802401E0 0C0B2026 */ jal set_variable -/* D364D4 802401E4 320600FF */ andi $a2, $s0, 0xff -/* D364D8 802401E8 0220202D */ daddu $a0, $s1, $zero -/* D364DC 802401EC 3C05F5DE */ lui $a1, 0xf5de -/* D364E0 802401F0 34A5028B */ ori $a1, $a1, 0x28b -/* D364E4 802401F4 00103203 */ sra $a2, $s0, 8 -/* D364E8 802401F8 0C0B2026 */ jal set_variable -/* D364EC 802401FC 30C600FF */ andi $a2, $a2, 0xff -/* D364F0 80240200 0220202D */ daddu $a0, $s1, $zero -/* D364F4 80240204 3C05FD05 */ lui $a1, 0xfd05 -/* D364F8 80240208 0C0B1EAF */ jal get_variable -/* D364FC 8024020C 34A50F82 */ ori $a1, $a1, 0xf82 -/* D36500 80240210 0040802D */ daddu $s0, $v0, $zero -/* D36504 80240214 52120001 */ beql $s0, $s2, .L8024021C -/* D36508 80240218 241000FF */ addiu $s0, $zero, 0xff -.L8024021C: -/* D3650C 8024021C 0220202D */ daddu $a0, $s1, $zero -/* D36510 80240220 3C05F5DE */ lui $a1, 0xf5de -/* D36514 80240224 34A5028C */ ori $a1, $a1, 0x28c -/* D36518 80240228 0C0B2026 */ jal set_variable -/* D3651C 8024022C 320600FF */ andi $a2, $s0, 0xff -/* D36520 80240230 0220202D */ daddu $a0, $s1, $zero -/* D36524 80240234 3C05F5DE */ lui $a1, 0xf5de -/* D36528 80240238 34A5028D */ ori $a1, $a1, 0x28d -/* D3652C 8024023C 00103203 */ sra $a2, $s0, 8 -/* D36530 80240240 0C0B2026 */ jal set_variable -/* D36534 80240244 30C600FF */ andi $a2, $a2, 0xff -/* D36538 80240248 8FBF001C */ lw $ra, 0x1c($sp) -/* D3653C 8024024C 8FB20018 */ lw $s2, 0x18($sp) -/* D36540 80240250 8FB10014 */ lw $s1, 0x14($sp) -/* D36544 80240254 8FB00010 */ lw $s0, 0x10($sp) -/* D36548 80240258 24020002 */ addiu $v0, $zero, 2 -/* D3654C 8024025C 03E00008 */ jr $ra -/* D36550 80240260 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_09/func_80240264_D362F0.s b/asm/nonmatchings/world/area_sam/sam_09/func_80240264_D362F0.s deleted file mode 100644 index db2a60e214..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_09/func_80240264_D362F0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240264_D36554 -/* D36554 80240264 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D36558 80240268 AFB10014 */ sw $s1, 0x14($sp) -/* D3655C 8024026C 0080882D */ daddu $s1, $a0, $zero -/* D36560 80240270 3C05F5DE */ lui $a1, 0xf5de -/* D36564 80240274 34A50288 */ ori $a1, $a1, 0x288 -/* D36568 80240278 AFBF0018 */ sw $ra, 0x18($sp) -/* D3656C 8024027C 0C0B1EAF */ jal get_variable -/* D36570 80240280 AFB00010 */ sw $s0, 0x10($sp) -/* D36574 80240284 305000FF */ andi $s0, $v0, 0xff -/* D36578 80240288 0220202D */ daddu $a0, $s1, $zero -/* D3657C 8024028C 3C05F5DE */ lui $a1, 0xf5de -/* D36580 80240290 0C0B1EAF */ jal get_variable -/* D36584 80240294 34A50289 */ ori $a1, $a1, 0x289 -/* D36588 80240298 304600FF */ andi $a2, $v0, 0xff -/* D3658C 8024029C 240200FF */ addiu $v0, $zero, 0xff -/* D36590 802402A0 12020006 */ beq $s0, $v0, .L802402BC -/* D36594 802402A4 0220202D */ daddu $a0, $s1, $zero -/* D36598 802402A8 3C05FD05 */ lui $a1, 0xfd05 -/* D3659C 802402AC 34A50F80 */ ori $a1, $a1, 0xf80 -/* D365A0 802402B0 00063200 */ sll $a2, $a2, 8 -/* D365A4 802402B4 080900B2 */ j .L802402C8 -/* D365A8 802402B8 00D03025 */ or $a2, $a2, $s0 -.L802402BC: -/* D365AC 802402BC 3C05FD05 */ lui $a1, 0xfd05 -/* D365B0 802402C0 34A50F80 */ ori $a1, $a1, 0xf80 -/* D365B4 802402C4 2406FFFF */ addiu $a2, $zero, -1 -.L802402C8: -/* D365B8 802402C8 0C0B2026 */ jal set_variable -/* D365BC 802402CC 00000000 */ nop -/* D365C0 802402D0 0220202D */ daddu $a0, $s1, $zero -/* D365C4 802402D4 3C05F5DE */ lui $a1, 0xf5de -/* D365C8 802402D8 0C0B1EAF */ jal get_variable -/* D365CC 802402DC 34A5028A */ ori $a1, $a1, 0x28a -/* D365D0 802402E0 305000FF */ andi $s0, $v0, 0xff -/* D365D4 802402E4 0220202D */ daddu $a0, $s1, $zero -/* D365D8 802402E8 3C05F5DE */ lui $a1, 0xf5de -/* D365DC 802402EC 0C0B1EAF */ jal get_variable -/* D365E0 802402F0 34A5028B */ ori $a1, $a1, 0x28b -/* D365E4 802402F4 304600FF */ andi $a2, $v0, 0xff -/* D365E8 802402F8 240200FF */ addiu $v0, $zero, 0xff -/* D365EC 802402FC 12020006 */ beq $s0, $v0, .L80240318 -/* D365F0 80240300 0220202D */ daddu $a0, $s1, $zero -/* D365F4 80240304 3C05FD05 */ lui $a1, 0xfd05 -/* D365F8 80240308 34A50F81 */ ori $a1, $a1, 0xf81 -/* D365FC 8024030C 00063200 */ sll $a2, $a2, 8 -/* D36600 80240310 080900C9 */ j .L80240324 -/* D36604 80240314 00D03025 */ or $a2, $a2, $s0 -.L80240318: -/* D36608 80240318 3C05FD05 */ lui $a1, 0xfd05 -/* D3660C 8024031C 34A50F81 */ ori $a1, $a1, 0xf81 -/* D36610 80240320 2406FFFF */ addiu $a2, $zero, -1 -.L80240324: -/* D36614 80240324 0C0B2026 */ jal set_variable -/* D36618 80240328 00000000 */ nop -/* D3661C 8024032C 0220202D */ daddu $a0, $s1, $zero -/* D36620 80240330 3C05F5DE */ lui $a1, 0xf5de -/* D36624 80240334 0C0B1EAF */ jal get_variable -/* D36628 80240338 34A5028C */ ori $a1, $a1, 0x28c -/* D3662C 8024033C 305000FF */ andi $s0, $v0, 0xff -/* D36630 80240340 0220202D */ daddu $a0, $s1, $zero -/* D36634 80240344 3C05F5DE */ lui $a1, 0xf5de -/* D36638 80240348 0C0B1EAF */ jal get_variable -/* D3663C 8024034C 34A5028D */ ori $a1, $a1, 0x28d -/* D36640 80240350 304600FF */ andi $a2, $v0, 0xff -/* D36644 80240354 240200FF */ addiu $v0, $zero, 0xff -/* D36648 80240358 12020006 */ beq $s0, $v0, .L80240374 -/* D3664C 8024035C 0220202D */ daddu $a0, $s1, $zero -/* D36650 80240360 3C05FD05 */ lui $a1, 0xfd05 -/* D36654 80240364 34A50F82 */ ori $a1, $a1, 0xf82 -/* D36658 80240368 00063200 */ sll $a2, $a2, 8 -/* D3665C 8024036C 080900E0 */ j .L80240380 -/* D36660 80240370 00D03025 */ or $a2, $a2, $s0 -.L80240374: -/* D36664 80240374 3C05FD05 */ lui $a1, 0xfd05 -/* D36668 80240378 34A50F82 */ ori $a1, $a1, 0xf82 -/* D3666C 8024037C 2406FFFF */ addiu $a2, $zero, -1 -.L80240380: -/* D36670 80240380 0C0B2026 */ jal set_variable -/* D36674 80240384 00000000 */ nop -/* D36678 80240388 8FBF0018 */ lw $ra, 0x18($sp) -/* D3667C 8024038C 8FB10014 */ lw $s1, 0x14($sp) -/* D36680 80240390 8FB00010 */ lw $s0, 0x10($sp) -/* D36684 80240394 24020002 */ addiu $v0, $zero, 2 -/* D36688 80240398 03E00008 */ jr $ra -/* D3668C 8024039C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_09/func_802403A0_D362F0.s b/asm/nonmatchings/world/area_sam/sam_09/func_802403A0_D362F0.s deleted file mode 100644 index 06474a753f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_09/func_802403A0_D362F0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403A0_D36690 -/* D36690 802403A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D36694 802403A4 AFB00010 */ sw $s0, 0x10($sp) -/* D36698 802403A8 0080802D */ daddu $s0, $a0, $zero -/* D3669C 802403AC AFBF0014 */ sw $ra, 0x14($sp) -/* D366A0 802403B0 0C00AB39 */ jal heap_malloc -/* D366A4 802403B4 24040170 */ addiu $a0, $zero, 0x170 -/* D366A8 802403B8 2405005A */ addiu $a1, $zero, 0x5a -/* D366AC 802403BC 24440168 */ addiu $a0, $v0, 0x168 -/* D366B0 802403C0 240300DA */ addiu $v1, $zero, 0xda -/* D366B4 802403C4 AE020084 */ sw $v0, 0x84($s0) -.L802403C8: -/* D366B8 802403C8 AC830000 */ sw $v1, ($a0) -/* D366BC 802403CC 2484FFFC */ addiu $a0, $a0, -4 -/* D366C0 802403D0 24A5FFFF */ addiu $a1, $a1, -1 -/* D366C4 802403D4 04A1FFFC */ bgez $a1, .L802403C8 -/* D366C8 802403D8 2463FFFF */ addiu $v1, $v1, -1 -/* D366CC 802403DC AC40016C */ sw $zero, 0x16c($v0) -/* D366D0 802403E0 8FBF0014 */ lw $ra, 0x14($sp) -/* D366D4 802403E4 8FB00010 */ lw $s0, 0x10($sp) -/* D366D8 802403E8 24020002 */ addiu $v0, $zero, 2 -/* D366DC 802403EC 03E00008 */ jr $ra -/* D366E0 802403F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* D366E4 802403F4 00000000 */ nop -/* D366E8 802403F8 00000000 */ nop -/* D366EC 802403FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_10/func_802400B4_D37800.s b/asm/nonmatchings/world/area_sam/sam_10/func_802400B4_D37800.s deleted file mode 100644 index 690f867dd2..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/func_802400B4_D37800.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_D378B4 -/* D378B4 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D378B8 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* D378BC 802400BC 0080802D */ daddu $s0, $a0, $zero -/* D378C0 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* D378C4 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* D378C8 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* D378CC 802400CC 8C510000 */ lw $s1, ($v0) -/* D378D0 802400D0 0C0B1EAF */ jal get_variable -/* D378D4 802400D4 0220282D */ daddu $a1, $s1, $zero -/* D378D8 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* D378DC 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* D378E0 802400E0 0200202D */ daddu $a0, $s0, $zero -/* D378E4 802400E4 00431024 */ and $v0, $v0, $v1 -/* D378E8 802400E8 00021140 */ sll $v0, $v0, 5 -/* D378EC 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* D378F0 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* D378F4 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D378F8 802400F8 0C0B2026 */ jal set_variable -/* D378FC 802400FC 0220282D */ daddu $a1, $s1, $zero -/* D37900 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* D37904 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* D37908 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* D3790C 8024010C 24020002 */ addiu $v0, $zero, 2 -/* D37910 80240110 03E00008 */ jr $ra -/* D37914 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_10/func_80240118_D37800.s b/asm/nonmatchings/world/area_sam/sam_10/func_80240118_D37800.s deleted file mode 100644 index 5d6b91a0ef..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/func_80240118_D37800.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_sam/sam_10/func_80240268_D37800.s b/asm/nonmatchings/world/area_sam/sam_10/func_80240268_D37800.s deleted file mode 100644 index 860e726e19..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/func_80240268_D37800.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_D37A68 -/* D37A68 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D37A6C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* D37A70 80240270 0080802D */ daddu $s0, $a0, $zero -/* D37A74 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* D37A78 80240278 8E02000C */ lw $v0, 0xc($s0) -/* D37A7C 8024027C 0C0B1EAF */ jal get_variable -/* D37A80 80240280 8C450000 */ lw $a1, ($v0) -/* D37A84 80240284 00021140 */ sll $v0, $v0, 5 -/* D37A88 80240288 AE000084 */ sw $zero, 0x84($s0) -/* D37A8C 8024028C 3C018008 */ lui $at, 0x8008 -/* D37A90 80240290 00220821 */ addu $at, $at, $v0 -/* D37A94 80240294 942278F8 */ lhu $v0, 0x78f8($at) -/* D37A98 80240298 30420040 */ andi $v0, $v0, 0x40 -/* D37A9C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* D37AA0 802402A0 24020001 */ addiu $v0, $zero, 1 -/* D37AA4 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* D37AA8 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* D37AAC 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* D37AB0 802402B0 24020002 */ addiu $v0, $zero, 2 -/* D37AB4 802402B4 03E00008 */ jr $ra -/* D37AB8 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_10/func_802402BC_D37800.s b/asm/nonmatchings/world/area_sam/sam_10/func_802402BC_D37800.s deleted file mode 100644 index 5652ebd8b7..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/func_802402BC_D37800.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402BC_D37ABC -/* D37ABC 802402BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D37AC0 802402C0 AFBF0010 */ sw $ra, 0x10($sp) -/* D37AC4 802402C4 0C04C3D6 */ jal get_item_entity -/* D37AC8 802402C8 8C840084 */ lw $a0, 0x84($a0) -/* D37ACC 802402CC 3C013F4C */ lui $at, 0x3f4c -/* D37AD0 802402D0 3421CCCD */ ori $at, $at, 0xcccd -/* D37AD4 802402D4 44810000 */ mtc1 $at, $f0 -/* D37AD8 802402D8 00000000 */ nop -/* D37ADC 802402DC E4400030 */ swc1 $f0, 0x30($v0) -/* D37AE0 802402E0 8FBF0010 */ lw $ra, 0x10($sp) -/* D37AE4 802402E4 24020002 */ addiu $v0, $zero, 2 -/* D37AE8 802402E8 03E00008 */ jr $ra -/* D37AEC 802402EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_10/func_802402F0_D37800.s b/asm/nonmatchings/world/area_sam/sam_10/func_802402F0_D37800.s deleted file mode 100644 index ca02c82632..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/func_802402F0_D37800.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_D37AF0 -/* D37AF0 802402F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D37AF4 802402F4 F7B60028 */ sdc1 $f22, 0x28($sp) -/* D37AF8 802402F8 3C01439B */ lui $at, 0x439b -/* D37AFC 802402FC 4481B000 */ mtc1 $at, $f22 -/* D37B00 80240300 F7B40020 */ sdc1 $f20, 0x20($sp) -/* D37B04 80240304 3C0142C8 */ lui $at, 0x42c8 -/* D37B08 80240308 4481A000 */ mtc1 $at, $f20 -/* D37B0C 8024030C AFB10014 */ sw $s1, 0x14($sp) -/* D37B10 80240310 0080882D */ daddu $s1, $a0, $zero -/* D37B14 80240314 AFBF0018 */ sw $ra, 0x18($sp) -/* D37B18 80240318 AFB00010 */ sw $s0, 0x10($sp) -/* D37B1C 8024031C 0C00A8BB */ jal sin_deg -/* D37B20 80240320 4600B306 */ mov.s $f12, $f22 -/* D37B24 80240324 46140002 */ mul.s $f0, $f0, $f20 -/* D37B28 80240328 00000000 */ nop -/* D37B2C 8024032C 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D37B30 80240330 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D37B34 80240334 C6020028 */ lwc1 $f2, 0x28($s0) -/* D37B38 80240338 46001080 */ add.s $f2, $f2, $f0 -/* D37B3C 8024033C 4600110D */ trunc.w.s $f4, $f2 -/* D37B40 80240340 E6240084 */ swc1 $f4, 0x84($s1) -/* D37B44 80240344 0C00A8D4 */ jal cos_deg -/* D37B48 80240348 4600B306 */ mov.s $f12, $f22 -/* D37B4C 8024034C 46140002 */ mul.s $f0, $f0, $f20 -/* D37B50 80240350 00000000 */ nop -/* D37B54 80240354 C6020030 */ lwc1 $f2, 0x30($s0) -/* D37B58 80240358 3C014302 */ lui $at, 0x4302 -/* D37B5C 8024035C 4481B000 */ mtc1 $at, $f22 -/* D37B60 80240360 46001081 */ sub.s $f2, $f2, $f0 -/* D37B64 80240364 4600110D */ trunc.w.s $f4, $f2 -/* D37B68 80240368 E6240088 */ swc1 $f4, 0x88($s1) -/* D37B6C 8024036C 0C00A8BB */ jal sin_deg -/* D37B70 80240370 4600B306 */ mov.s $f12, $f22 -/* D37B74 80240374 46140002 */ mul.s $f0, $f0, $f20 -/* D37B78 80240378 00000000 */ nop -/* D37B7C 8024037C C6020028 */ lwc1 $f2, 0x28($s0) -/* D37B80 80240380 46001080 */ add.s $f2, $f2, $f0 -/* D37B84 80240384 4600110D */ trunc.w.s $f4, $f2 -/* D37B88 80240388 E624008C */ swc1 $f4, 0x8c($s1) -/* D37B8C 8024038C 0C00A8D4 */ jal cos_deg -/* D37B90 80240390 4600B306 */ mov.s $f12, $f22 -/* D37B94 80240394 46140002 */ mul.s $f0, $f0, $f20 -/* D37B98 80240398 00000000 */ nop -/* D37B9C 8024039C C6020030 */ lwc1 $f2, 0x30($s0) -/* D37BA0 802403A0 46001081 */ sub.s $f2, $f2, $f0 -/* D37BA4 802403A4 4600110D */ trunc.w.s $f4, $f2 -/* D37BA8 802403A8 E6240090 */ swc1 $f4, 0x90($s1) -/* D37BAC 802403AC 8FBF0018 */ lw $ra, 0x18($sp) -/* D37BB0 802403B0 8FB10014 */ lw $s1, 0x14($sp) -/* D37BB4 802403B4 8FB00010 */ lw $s0, 0x10($sp) -/* D37BB8 802403B8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* D37BBC 802403BC D7B40020 */ ldc1 $f20, 0x20($sp) -/* D37BC0 802403C0 24020002 */ addiu $v0, $zero, 2 -/* D37BC4 802403C4 03E00008 */ jr $ra -/* D37BC8 802403C8 27BD0030 */ addiu $sp, $sp, 0x30 -/* D37BCC 802403CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_10/func_802403D0_D37800.s b/asm/nonmatchings/world/area_sam/sam_10/func_802403D0_D37800.s deleted file mode 100644 index e4ae6afb6a..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/func_802403D0_D37800.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403D0_D37BD0 -/* D37BD0 802403D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D37BD4 802403D4 AFB10014 */ sw $s1, 0x14($sp) -/* D37BD8 802403D8 0080882D */ daddu $s1, $a0, $zero -/* D37BDC 802403DC AFBF0018 */ sw $ra, 0x18($sp) -/* D37BE0 802403E0 AFB00010 */ sw $s0, 0x10($sp) -/* D37BE4 802403E4 8E300148 */ lw $s0, 0x148($s1) -/* D37BE8 802403E8 0C00EABB */ jal get_npc_unsafe -/* D37BEC 802403EC 86040008 */ lh $a0, 8($s0) -/* D37BF0 802403F0 24030001 */ addiu $v1, $zero, 1 -/* D37BF4 802403F4 0040202D */ daddu $a0, $v0, $zero -/* D37BF8 802403F8 AE03006C */ sw $v1, 0x6c($s0) -/* D37BFC 802403FC 8482008C */ lh $v0, 0x8c($a0) -/* D37C00 80240400 14400009 */ bnez $v0, .L80240428 -/* D37C04 80240404 24020002 */ addiu $v0, $zero, 2 -/* D37C08 80240408 96030072 */ lhu $v1, 0x72($s0) -/* D37C0C 8024040C AE02006C */ sw $v0, 0x6c($s0) -/* D37C10 80240410 A483008E */ sh $v1, 0x8e($a0) -/* D37C14 80240414 8E0200CC */ lw $v0, 0xcc($s0) -/* D37C18 80240418 8C420020 */ lw $v0, 0x20($v0) -/* D37C1C 8024041C AC820028 */ sw $v0, 0x28($a0) -/* D37C20 80240420 2402001F */ addiu $v0, $zero, 0x1f -/* D37C24 80240424 AE220070 */ sw $v0, 0x70($s1) -.L80240428: -/* D37C28 80240428 8FBF0018 */ lw $ra, 0x18($sp) -/* D37C2C 8024042C 8FB10014 */ lw $s1, 0x14($sp) -/* D37C30 80240430 8FB00010 */ lw $s0, 0x10($sp) -/* D37C34 80240434 03E00008 */ jr $ra -/* D37C38 80240438 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_10/func_8024043C_D37800.s b/asm/nonmatchings/world/area_sam/sam_10/func_8024043C_D37800.s deleted file mode 100644 index 778a400932..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/func_8024043C_D37800.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024043C_D37C3C -/* D37C3C 8024043C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D37C40 80240440 AFB10014 */ sw $s1, 0x14($sp) -/* D37C44 80240444 0080882D */ daddu $s1, $a0, $zero -/* D37C48 80240448 AFBF0018 */ sw $ra, 0x18($sp) -/* D37C4C 8024044C AFB00010 */ sw $s0, 0x10($sp) -/* D37C50 80240450 8E300148 */ lw $s0, 0x148($s1) -/* D37C54 80240454 0C00EABB */ jal get_npc_unsafe -/* D37C58 80240458 86040008 */ lh $a0, 8($s0) -/* D37C5C 8024045C 0040202D */ daddu $a0, $v0, $zero -/* D37C60 80240460 9482008E */ lhu $v0, 0x8e($a0) -/* D37C64 80240464 2442FFFF */ addiu $v0, $v0, -1 -/* D37C68 80240468 A482008E */ sh $v0, 0x8e($a0) -/* D37C6C 8024046C 00021400 */ sll $v0, $v0, 0x10 -/* D37C70 80240470 1C400009 */ bgtz $v0, .L80240498 -/* D37C74 80240474 24020003 */ addiu $v0, $zero, 3 -/* D37C78 80240478 96030076 */ lhu $v1, 0x76($s0) -/* D37C7C 8024047C AE02006C */ sw $v0, 0x6c($s0) -/* D37C80 80240480 A483008E */ sh $v1, 0x8e($a0) -/* D37C84 80240484 8E0200CC */ lw $v0, 0xcc($s0) -/* D37C88 80240488 8C420024 */ lw $v0, 0x24($v0) -/* D37C8C 8024048C AC820028 */ sw $v0, 0x28($a0) -/* D37C90 80240490 24020020 */ addiu $v0, $zero, 0x20 -/* D37C94 80240494 AE220070 */ sw $v0, 0x70($s1) -.L80240498: -/* D37C98 80240498 8FBF0018 */ lw $ra, 0x18($sp) -/* D37C9C 8024049C 8FB10014 */ lw $s1, 0x14($sp) -/* D37CA0 802404A0 8FB00010 */ lw $s0, 0x10($sp) -/* D37CA4 802404A4 03E00008 */ jr $ra -/* D37CA8 802404A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_10/func_802404AC_D37800.s b/asm/nonmatchings/world/area_sam/sam_10/func_802404AC_D37800.s deleted file mode 100644 index b07c9f1d5f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/func_802404AC_D37800.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404AC_D37CAC -/* D37CAC 802404AC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D37CB0 802404B0 AFB10034 */ sw $s1, 0x34($sp) -/* D37CB4 802404B4 0080882D */ daddu $s1, $a0, $zero -/* D37CB8 802404B8 AFBF0038 */ sw $ra, 0x38($sp) -/* D37CBC 802404BC AFB00030 */ sw $s0, 0x30($sp) -/* D37CC0 802404C0 8E300148 */ lw $s0, 0x148($s1) -/* D37CC4 802404C4 0C00EABB */ jal get_npc_unsafe -/* D37CC8 802404C8 86040008 */ lh $a0, 8($s0) -/* D37CCC 802404CC 0040282D */ daddu $a1, $v0, $zero -/* D37CD0 802404D0 94A2008E */ lhu $v0, 0x8e($a1) -/* D37CD4 802404D4 2442FFFF */ addiu $v0, $v0, -1 -/* D37CD8 802404D8 A4A2008E */ sh $v0, 0x8e($a1) -/* D37CDC 802404DC 00021400 */ sll $v0, $v0, 0x10 -/* D37CE0 802404E0 1C400023 */ bgtz $v0, .L80240570 -/* D37CE4 802404E4 24020004 */ addiu $v0, $zero, 4 -/* D37CE8 802404E8 8E0300CC */ lw $v1, 0xcc($s0) -/* D37CEC 802404EC AE02006C */ sw $v0, 0x6c($s0) -/* D37CF0 802404F0 8C620000 */ lw $v0, ($v1) -/* D37CF4 802404F4 ACA20028 */ sw $v0, 0x28($a1) -/* D37CF8 802404F8 9602007A */ lhu $v0, 0x7a($s0) -/* D37CFC 802404FC A4A2008E */ sh $v0, 0x8e($a1) -/* D37D00 80240500 8E020078 */ lw $v0, 0x78($s0) -/* D37D04 80240504 28420008 */ slti $v0, $v0, 8 -/* D37D08 80240508 14400018 */ bnez $v0, .L8024056C -/* D37D0C 8024050C 24020021 */ addiu $v0, $zero, 0x21 -/* D37D10 80240510 24040003 */ addiu $a0, $zero, 3 -/* D37D14 80240514 27A30028 */ addiu $v1, $sp, 0x28 -/* D37D18 80240518 84A700A8 */ lh $a3, 0xa8($a1) -/* D37D1C 8024051C 3C013F80 */ lui $at, 0x3f80 -/* D37D20 80240520 44810000 */ mtc1 $at, $f0 -/* D37D24 80240524 3C014000 */ lui $at, 0x4000 -/* D37D28 80240528 44811000 */ mtc1 $at, $f2 -/* D37D2C 8024052C 3C01C1A0 */ lui $at, 0xc1a0 -/* D37D30 80240530 44812000 */ mtc1 $at, $f4 -/* D37D34 80240534 44873000 */ mtc1 $a3, $f6 -/* D37D38 80240538 00000000 */ nop -/* D37D3C 8024053C 468031A0 */ cvt.s.w $f6, $f6 -/* D37D40 80240540 E7A00010 */ swc1 $f0, 0x10($sp) -/* D37D44 80240544 E7A20014 */ swc1 $f2, 0x14($sp) -/* D37D48 80240548 E7A40018 */ swc1 $f4, 0x18($sp) -/* D37D4C 8024054C 8E020078 */ lw $v0, 0x78($s0) -/* D37D50 80240550 44073000 */ mfc1 $a3, $f6 -/* D37D54 80240554 0000302D */ daddu $a2, $zero, $zero -/* D37D58 80240558 AFA30020 */ sw $v1, 0x20($sp) -/* D37D5C 8024055C 2442FFFF */ addiu $v0, $v0, -1 -/* D37D60 80240560 0C01BFA4 */ jal fx_emote -/* D37D64 80240564 AFA2001C */ sw $v0, 0x1c($sp) -/* D37D68 80240568 24020021 */ addiu $v0, $zero, 0x21 -.L8024056C: -/* D37D6C 8024056C AE220070 */ sw $v0, 0x70($s1) -.L80240570: -/* D37D70 80240570 8FBF0038 */ lw $ra, 0x38($sp) -/* D37D74 80240574 8FB10034 */ lw $s1, 0x34($sp) -/* D37D78 80240578 8FB00030 */ lw $s0, 0x30($sp) -/* D37D7C 8024057C 03E00008 */ jr $ra -/* D37D80 80240580 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_sam/sam_10/func_80240584_D37800.s b/asm/nonmatchings/world/area_sam/sam_10/func_80240584_D37800.s deleted file mode 100644 index f46cf2deef..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/func_80240584_D37800.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240584_D37D84 -/* D37D84 80240584 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D37D88 80240588 AFB10014 */ sw $s1, 0x14($sp) -/* D37D8C 8024058C 0080882D */ daddu $s1, $a0, $zero -/* D37D90 80240590 AFBF0018 */ sw $ra, 0x18($sp) -/* D37D94 80240594 AFB00010 */ sw $s0, 0x10($sp) -/* D37D98 80240598 8E300148 */ lw $s0, 0x148($s1) -/* D37D9C 8024059C 0C00EABB */ jal get_npc_unsafe -/* D37DA0 802405A0 86040008 */ lh $a0, 8($s0) -/* D37DA4 802405A4 9443008E */ lhu $v1, 0x8e($v0) -/* D37DA8 802405A8 2463FFFF */ addiu $v1, $v1, -1 -/* D37DAC 802405AC A443008E */ sh $v1, 0x8e($v0) -/* D37DB0 802405B0 00031C00 */ sll $v1, $v1, 0x10 -/* D37DB4 802405B4 1C600003 */ bgtz $v1, .L802405C4 -/* D37DB8 802405B8 2402000C */ addiu $v0, $zero, 0xc -/* D37DBC 802405BC AE00006C */ sw $zero, 0x6c($s0) -/* D37DC0 802405C0 AE220070 */ sw $v0, 0x70($s1) -.L802405C4: -/* D37DC4 802405C4 8FBF0018 */ lw $ra, 0x18($sp) -/* D37DC8 802405C8 8FB10014 */ lw $s1, 0x14($sp) -/* D37DCC 802405CC 8FB00010 */ lw $s0, 0x10($sp) -/* D37DD0 802405D0 03E00008 */ jr $ra -/* D37DD4 802405D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_10/func_802405D8_D37800.s b/asm/nonmatchings/world/area_sam/sam_10/func_802405D8_D37800.s deleted file mode 100644 index 387cf40836..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/func_802405D8_D37800.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405D8_D37DD8 -/* D37DD8 802405D8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D37DDC 802405DC AFBF0024 */ sw $ra, 0x24($sp) -/* D37DE0 802405E0 AFB40020 */ sw $s4, 0x20($sp) -/* D37DE4 802405E4 AFB3001C */ sw $s3, 0x1c($sp) -/* D37DE8 802405E8 AFB20018 */ sw $s2, 0x18($sp) -/* D37DEC 802405EC AFB10014 */ sw $s1, 0x14($sp) -/* D37DF0 802405F0 AFB00010 */ sw $s0, 0x10($sp) -/* D37DF4 802405F4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* D37DF8 802405F8 8C900148 */ lw $s0, 0x148($a0) -/* D37DFC 802405FC 86040008 */ lh $a0, 8($s0) -/* D37E00 80240600 0C00EABB */ jal get_npc_unsafe -/* D37E04 80240604 24110001 */ addiu $s1, $zero, 1 -/* D37E08 80240608 86040008 */ lh $a0, 8($s0) -/* D37E0C 8024060C 0040802D */ daddu $s0, $v0, $zero -/* D37E10 80240610 3C05800B */ lui $a1, %hi(gCameras) -/* D37E14 80240614 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* D37E18 80240618 3C03800A */ lui $v1, 0x800a -/* D37E1C 8024061C 8463A634 */ lh $v1, -0x59cc($v1) -/* D37E20 80240620 00912021 */ addu $a0, $a0, $s1 -/* D37E24 80240624 00031080 */ sll $v0, $v1, 2 -/* D37E28 80240628 00431021 */ addu $v0, $v0, $v1 -/* D37E2C 8024062C 00021080 */ sll $v0, $v0, 2 -/* D37E30 80240630 00431023 */ subu $v0, $v0, $v1 -/* D37E34 80240634 000218C0 */ sll $v1, $v0, 3 -/* D37E38 80240638 00431021 */ addu $v0, $v0, $v1 -/* D37E3C 8024063C 000210C0 */ sll $v0, $v0, 3 -/* D37E40 80240640 0C00FB3A */ jal get_enemy -/* D37E44 80240644 00459021 */ addu $s2, $v0, $a1 -/* D37E48 80240648 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* D37E4C 8024064C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* D37E50 80240650 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D37E54 80240654 8E830000 */ lw $v1, ($s4) -/* D37E58 80240658 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D37E5C 8024065C 8C660028 */ lw $a2, 0x28($v1) -/* D37E60 80240660 8C670030 */ lw $a3, 0x30($v1) -/* D37E64 80240664 0C00A7B5 */ jal dist2D -/* D37E68 80240668 0040982D */ daddu $s3, $v0, $zero -/* D37E6C 8024066C C6620074 */ lwc1 $f2, 0x74($s3) -/* D37E70 80240670 468010A0 */ cvt.s.w $f2, $f2 -/* D37E74 80240674 4600103C */ c.lt.s $f2, $f0 -/* D37E78 80240678 00000000 */ nop -/* D37E7C 8024067C 45030001 */ bc1tl .L80240684 -/* D37E80 80240680 0000882D */ daddu $s1, $zero, $zero -.L80240684: -/* D37E84 80240684 C64C006C */ lwc1 $f12, 0x6c($s2) -/* D37E88 80240688 C60E000C */ lwc1 $f14, 0xc($s0) -/* D37E8C 8024068C 3C014387 */ lui $at, 0x4387 -/* D37E90 80240690 4481A000 */ mtc1 $at, $f20 -/* D37E94 80240694 0C00A70A */ jal get_clamped_angle_diff -/* D37E98 80240698 00000000 */ nop -/* D37E9C 8024069C 0C00A6C9 */ jal clamp_angle -/* D37EA0 802406A0 46000306 */ mov.s $f12, $f0 -/* D37EA4 802406A4 3C018024 */ lui $at, 0x8024 -/* D37EA8 802406A8 D4222C30 */ ldc1 $f2, 0x2c30($at) -/* D37EAC 802406AC 46000021 */ cvt.d.s $f0, $f0 -/* D37EB0 802406B0 4622003C */ c.lt.d $f0, $f2 -/* D37EB4 802406B4 00000000 */ nop -/* D37EB8 802406B8 45000003 */ bc1f .L802406C8 -/* D37EBC 802406BC 00000000 */ nop -/* D37EC0 802406C0 3C0142B4 */ lui $at, 0x42b4 -/* D37EC4 802406C4 4481A000 */ mtc1 $at, $f20 -.L802406C8: -/* D37EC8 802406C8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D37ECC 802406CC 8E820000 */ lw $v0, ($s4) -/* D37ED0 802406D0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D37ED4 802406D4 8C460028 */ lw $a2, 0x28($v0) -/* D37ED8 802406D8 0C00A720 */ jal atan2 -/* D37EDC 802406DC 8C470030 */ lw $a3, 0x30($v0) -/* D37EE0 802406E0 4600A306 */ mov.s $f12, $f20 -/* D37EE4 802406E4 0C00A70A */ jal get_clamped_angle_diff -/* D37EE8 802406E8 46000386 */ mov.s $f14, $f0 -/* D37EEC 802406EC C6620078 */ lwc1 $f2, 0x78($s3) -/* D37EF0 802406F0 468010A0 */ cvt.s.w $f2, $f2 -/* D37EF4 802406F4 46000005 */ abs.s $f0, $f0 -/* D37EF8 802406F8 4600103C */ c.lt.s $f2, $f0 -/* D37EFC 802406FC 00000000 */ nop -/* D37F00 80240700 45030001 */ bc1tl .L80240708 -/* D37F04 80240704 0000882D */ daddu $s1, $zero, $zero -.L80240708: -/* D37F08 80240708 8E820000 */ lw $v0, ($s4) -/* D37F0C 8024070C C600003C */ lwc1 $f0, 0x3c($s0) -/* D37F10 80240710 C442002C */ lwc1 $f2, 0x2c($v0) -/* D37F14 80240714 860200A8 */ lh $v0, 0xa8($s0) -/* D37F18 80240718 46020001 */ sub.s $f0, $f0, $f2 -/* D37F1C 8024071C 44821000 */ mtc1 $v0, $f2 -/* D37F20 80240720 00000000 */ nop -/* D37F24 80240724 468010A1 */ cvt.d.w $f2, $f2 -/* D37F28 80240728 46221080 */ add.d $f2, $f2, $f2 -/* D37F2C 8024072C 46000005 */ abs.s $f0, $f0 -/* D37F30 80240730 46000021 */ cvt.d.s $f0, $f0 -/* D37F34 80240734 4620103E */ c.le.d $f2, $f0 -/* D37F38 80240738 00000000 */ nop -/* D37F3C 8024073C 45030001 */ bc1tl .L80240744 -/* D37F40 80240740 0000882D */ daddu $s1, $zero, $zero -.L80240744: -/* D37F44 80240744 3C038011 */ lui $v1, 0x8011 -/* D37F48 80240748 8063EBB3 */ lb $v1, -0x144d($v1) -/* D37F4C 8024074C 24020009 */ addiu $v0, $zero, 9 -/* D37F50 80240750 50620001 */ beql $v1, $v0, .L80240758 -/* D37F54 80240754 0000882D */ daddu $s1, $zero, $zero -.L80240758: -/* D37F58 80240758 24020007 */ addiu $v0, $zero, 7 -/* D37F5C 8024075C 50620001 */ beql $v1, $v0, .L80240764 -/* D37F60 80240760 0000882D */ daddu $s1, $zero, $zero -.L80240764: -/* D37F64 80240764 0220102D */ daddu $v0, $s1, $zero -/* D37F68 80240768 8FBF0024 */ lw $ra, 0x24($sp) -/* D37F6C 8024076C 8FB40020 */ lw $s4, 0x20($sp) -/* D37F70 80240770 8FB3001C */ lw $s3, 0x1c($sp) -/* D37F74 80240774 8FB20018 */ lw $s2, 0x18($sp) -/* D37F78 80240778 8FB10014 */ lw $s1, 0x14($sp) -/* D37F7C 8024077C 8FB00010 */ lw $s0, 0x10($sp) -/* D37F80 80240780 D7B40028 */ ldc1 $f20, 0x28($sp) -/* D37F84 80240784 03E00008 */ jr $ra -/* D37F88 80240788 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_10/func_8024078C_D37800.s b/asm/nonmatchings/world/area_sam/sam_10/func_8024078C_D37800.s deleted file mode 100644 index ceeb63226c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/func_8024078C_D37800.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024078C_D37F8C -/* D37F8C 8024078C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D37F90 80240790 AFB40028 */ sw $s4, 0x28($sp) -/* D37F94 80240794 0080A02D */ daddu $s4, $a0, $zero -/* D37F98 80240798 AFBF002C */ sw $ra, 0x2c($sp) -/* D37F9C 8024079C AFB30024 */ sw $s3, 0x24($sp) -/* D37FA0 802407A0 AFB20020 */ sw $s2, 0x20($sp) -/* D37FA4 802407A4 AFB1001C */ sw $s1, 0x1c($sp) -/* D37FA8 802407A8 AFB00018 */ sw $s0, 0x18($sp) -/* D37FAC 802407AC 8E910148 */ lw $s1, 0x148($s4) -/* D37FB0 802407B0 86240008 */ lh $a0, 8($s1) -/* D37FB4 802407B4 0C00EABB */ jal get_npc_unsafe -/* D37FB8 802407B8 00A0802D */ daddu $s0, $a1, $zero -/* D37FBC 802407BC 16000005 */ bnez $s0, .L802407D4 -/* D37FC0 802407C0 0040902D */ daddu $s2, $v0, $zero -/* D37FC4 802407C4 8E2200B0 */ lw $v0, 0xb0($s1) -/* D37FC8 802407C8 30420004 */ andi $v0, $v0, 4 -/* D37FCC 802407CC 10400015 */ beqz $v0, .L80240824 -/* D37FD0 802407D0 00000000 */ nop -.L802407D4: -/* D37FD4 802407D4 AE800070 */ sw $zero, 0x70($s4) -/* D37FD8 802407D8 8E420000 */ lw $v0, ($s2) -/* D37FDC 802407DC 3C031F30 */ lui $v1, 0x1f30 -/* D37FE0 802407E0 A640008E */ sh $zero, 0x8e($s2) -/* D37FE4 802407E4 34420102 */ ori $v0, $v0, 0x102 -/* D37FE8 802407E8 AE420000 */ sw $v0, ($s2) -/* D37FEC 802407EC 8E220000 */ lw $v0, ($s1) -/* D37FF0 802407F0 3C01C47A */ lui $at, 0xc47a -/* D37FF4 802407F4 44810000 */ mtc1 $at, $f0 -/* D37FF8 802407F8 00431025 */ or $v0, $v0, $v1 -/* D37FFC 802407FC AE220000 */ sw $v0, ($s1) -/* D38000 80240800 AE400038 */ sw $zero, 0x38($s2) -/* D38004 80240804 E640003C */ swc1 $f0, 0x3c($s2) -/* D38008 80240808 AE400040 */ sw $zero, 0x40($s2) -/* D3800C 8024080C 8E2300B0 */ lw $v1, 0xb0($s1) -/* D38010 80240810 30620004 */ andi $v0, $v1, 4 -/* D38014 80240814 10400003 */ beqz $v0, .L80240824 -/* D38018 80240818 2402FFFB */ addiu $v0, $zero, -5 -/* D3801C 8024081C 00621024 */ and $v0, $v1, $v0 -/* D38020 80240820 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240824: -/* D38024 80240824 8E930070 */ lw $s3, 0x70($s4) -/* D38028 80240828 12600005 */ beqz $s3, .L80240840 -/* D3802C 8024082C 24020001 */ addiu $v0, $zero, 1 -/* D38030 80240830 12620048 */ beq $s3, $v0, .L80240954 -/* D38034 80240834 00000000 */ nop -/* D38038 80240838 08090272 */ j .L802409C8 -/* D3803C 8024083C 00000000 */ nop -.L80240840: -/* D38040 80240840 86240008 */ lh $a0, 8($s1) -/* D38044 80240844 0C00FB3A */ jal get_enemy -/* D38048 80240848 2484FFFF */ addiu $a0, $a0, -1 -/* D3804C 8024084C 0040802D */ daddu $s0, $v0, $zero -/* D38050 80240850 0C00EABB */ jal get_npc_unsafe -/* D38054 80240854 86040008 */ lh $a0, 8($s0) -/* D38058 80240858 24030001 */ addiu $v1, $zero, 1 -/* D3805C 8024085C 0040982D */ daddu $s3, $v0, $zero -/* D38060 80240860 A2230007 */ sb $v1, 7($s1) -/* D38064 80240864 8E03006C */ lw $v1, 0x6c($s0) -/* D38068 80240868 24020003 */ addiu $v0, $zero, 3 -/* D3806C 8024086C 14620056 */ bne $v1, $v0, .L802409C8 -/* D38070 80240870 00000000 */ nop -/* D38074 80240874 8E2500A8 */ lw $a1, 0xa8($s1) -/* D38078 80240878 10A00003 */ beqz $a1, .L80240888 -/* D3807C 8024087C 0260202D */ daddu $a0, $s3, $zero -/* D38080 80240880 0C012530 */ jal func_800494C0 -/* D38084 80240884 0000302D */ daddu $a2, $zero, $zero -.L80240888: -/* D38088 80240888 27A40010 */ addiu $a0, $sp, 0x10 -/* D3808C 8024088C C6280070 */ lwc1 $f8, 0x70($s1) -/* D38090 80240890 46804220 */ cvt.s.w $f8, $f8 -/* D38094 80240894 C6620034 */ lwc1 $f2, 0x34($s3) -/* D38098 80240898 3C014387 */ lui $at, 0x4387 -/* D3809C 8024089C 44810000 */ mtc1 $at, $f0 -/* D380A0 802408A0 44064000 */ mfc1 $a2, $f8 -/* D380A4 802408A4 46020001 */ sub.s $f0, $f0, $f2 -/* D380A8 802408A8 C6660038 */ lwc1 $f6, 0x38($s3) -/* D380AC 802408AC C6640040 */ lwc1 $f4, 0x40($s3) -/* D380B0 802408B0 44070000 */ mfc1 $a3, $f0 -/* D380B4 802408B4 27A50014 */ addiu $a1, $sp, 0x14 -/* D380B8 802408B8 E7A60010 */ swc1 $f6, 0x10($sp) -/* D380BC 802408BC 0C00A7E7 */ jal add_vec2D_polar -/* D380C0 802408C0 E7A40014 */ swc1 $f4, 0x14($sp) -/* D380C4 802408C4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* D380C8 802408C8 4600020D */ trunc.w.s $f8, $f0 -/* D380CC 802408CC 44024000 */ mfc1 $v0, $f8 -/* D380D0 802408D0 E6400038 */ swc1 $f0, 0x38($s2) -/* D380D4 802408D4 A6220010 */ sh $v0, 0x10($s1) -/* D380D8 802408D8 C660003C */ lwc1 $f0, 0x3c($s3) -/* D380DC 802408DC C622006C */ lwc1 $f2, 0x6c($s1) -/* D380E0 802408E0 468010A0 */ cvt.s.w $f2, $f2 -/* D380E4 802408E4 46020000 */ add.s $f0, $f0, $f2 -/* D380E8 802408E8 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* D380EC 802408EC 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* D380F0 802408F0 E640003C */ swc1 $f0, 0x3c($s2) -/* D380F4 802408F4 C7A20014 */ lwc1 $f2, 0x14($sp) -/* D380F8 802408F8 4600020D */ trunc.w.s $f8, $f0 -/* D380FC 802408FC 44024000 */ mfc1 $v0, $f8 -/* D38100 80240900 00000000 */ nop -/* D38104 80240904 A6220012 */ sh $v0, 0x12($s1) -/* D38108 80240908 4600120D */ trunc.w.s $f8, $f2 -/* D3810C 8024090C 44024000 */ mfc1 $v0, $f8 -/* D38110 80240910 E6420040 */ swc1 $f2, 0x40($s2) -/* D38114 80240914 A6220014 */ sh $v0, 0x14($s1) -/* D38118 80240918 8C660028 */ lw $a2, 0x28($v1) -/* D3811C 8024091C 8C670030 */ lw $a3, 0x30($v1) -/* D38120 80240920 C64C0038 */ lwc1 $f12, 0x38($s2) -/* D38124 80240924 0C00A720 */ jal atan2 -/* D38128 80240928 C64E0040 */ lwc1 $f14, 0x40($s2) -/* D3812C 8024092C 3C03E0EF */ lui $v1, 0xe0ef -/* D38130 80240930 E640000C */ swc1 $f0, 0xc($s2) -/* D38134 80240934 8E220000 */ lw $v0, ($s1) -/* D38138 80240938 3463FFFF */ ori $v1, $v1, 0xffff -/* D3813C 8024093C 00431024 */ and $v0, $v0, $v1 -/* D38140 80240940 AE220000 */ sw $v0, ($s1) -/* D38144 80240944 24020001 */ addiu $v0, $zero, 1 -/* D38148 80240948 A640008E */ sh $zero, 0x8e($s2) -/* D3814C 8024094C 08090272 */ j .L802409C8 -/* D38150 80240950 AE820070 */ sw $v0, 0x70($s4) -.L80240954: -/* D38154 80240954 86240008 */ lh $a0, 8($s1) -/* D38158 80240958 0C00FB3A */ jal get_enemy -/* D3815C 8024095C 2484FFFF */ addiu $a0, $a0, -1 -/* D38160 80240960 0040802D */ daddu $s0, $v0, $zero -/* D38164 80240964 0C00EABB */ jal get_npc_unsafe -/* D38168 80240968 86040008 */ lh $a0, 8($s0) -/* D3816C 8024096C 9642008E */ lhu $v0, 0x8e($s2) -/* D38170 80240970 24420001 */ addiu $v0, $v0, 1 -/* D38174 80240974 A642008E */ sh $v0, 0x8e($s2) -/* D38178 80240978 00021400 */ sll $v0, $v0, 0x10 -/* D3817C 8024097C 8E23007C */ lw $v1, 0x7c($s1) -/* D38180 80240980 00021403 */ sra $v0, $v0, 0x10 -/* D38184 80240984 0043102A */ slt $v0, $v0, $v1 -/* D38188 80240988 50400001 */ beql $v0, $zero, .L80240990 -/* D3818C 8024098C A2200007 */ sb $zero, 7($s1) -.L80240990: -/* D38190 80240990 8E03006C */ lw $v1, 0x6c($s0) -/* D38194 80240994 24020004 */ addiu $v0, $zero, 4 -/* D38198 80240998 1462000B */ bne $v1, $v0, .L802409C8 -/* D3819C 8024099C 3C021F10 */ lui $v0, 0x1f10 -/* D381A0 802409A0 8E230000 */ lw $v1, ($s1) -/* D381A4 802409A4 3C01C47A */ lui $at, 0xc47a -/* D381A8 802409A8 44810000 */ mtc1 $at, $f0 -/* D381AC 802409AC 00621825 */ or $v1, $v1, $v0 -/* D381B0 802409B0 AE230000 */ sw $v1, ($s1) -/* D381B4 802409B4 AE400038 */ sw $zero, 0x38($s2) -/* D381B8 802409B8 E640003C */ swc1 $f0, 0x3c($s2) -/* D381BC 802409BC AE400040 */ sw $zero, 0x40($s2) -/* D381C0 802409C0 A2330007 */ sb $s3, 7($s1) -/* D381C4 802409C4 AE800070 */ sw $zero, 0x70($s4) -.L802409C8: -/* D381C8 802409C8 8FBF002C */ lw $ra, 0x2c($sp) -/* D381CC 802409CC 8FB40028 */ lw $s4, 0x28($sp) -/* D381D0 802409D0 8FB30024 */ lw $s3, 0x24($sp) -/* D381D4 802409D4 8FB20020 */ lw $s2, 0x20($sp) -/* D381D8 802409D8 8FB1001C */ lw $s1, 0x1c($sp) -/* D381DC 802409DC 8FB00018 */ lw $s0, 0x18($sp) -/* D381E0 802409E0 0000102D */ daddu $v0, $zero, $zero -/* D381E4 802409E4 03E00008 */ jr $ra -/* D381E8 802409E8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_10/func_802409EC_D37800.s b/asm/nonmatchings/world/area_sam/sam_10/func_802409EC_D37800.s deleted file mode 100644 index b66faf5654..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/func_802409EC_D37800.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409EC_D381EC -/* D381EC 802409EC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D381F0 802409F0 AFB20038 */ sw $s2, 0x38($sp) -/* D381F4 802409F4 0080902D */ daddu $s2, $a0, $zero -/* D381F8 802409F8 AFBF0048 */ sw $ra, 0x48($sp) -/* D381FC 802409FC AFB50044 */ sw $s5, 0x44($sp) -/* D38200 80240A00 AFB40040 */ sw $s4, 0x40($sp) -/* D38204 80240A04 AFB3003C */ sw $s3, 0x3c($sp) -/* D38208 80240A08 AFB10034 */ sw $s1, 0x34($sp) -/* D3820C 80240A0C AFB00030 */ sw $s0, 0x30($sp) -/* D38210 80240A10 8E510148 */ lw $s1, 0x148($s2) -/* D38214 80240A14 86240008 */ lh $a0, 8($s1) -/* D38218 80240A18 0C00EABB */ jal get_npc_unsafe -/* D3821C 80240A1C 00A0802D */ daddu $s0, $a1, $zero -/* D38220 80240A20 8E43000C */ lw $v1, 0xc($s2) -/* D38224 80240A24 0240202D */ daddu $a0, $s2, $zero -/* D38228 80240A28 8C650000 */ lw $a1, ($v1) -/* D3822C 80240A2C 0C0B1EAF */ jal get_variable -/* D38230 80240A30 0040A82D */ daddu $s5, $v0, $zero -/* D38234 80240A34 AFA00010 */ sw $zero, 0x10($sp) -/* D38238 80240A38 8E2300D0 */ lw $v1, 0xd0($s1) -/* D3823C 80240A3C 8C630030 */ lw $v1, 0x30($v1) -/* D38240 80240A40 AFA30014 */ sw $v1, 0x14($sp) -/* D38244 80240A44 8E2300D0 */ lw $v1, 0xd0($s1) -/* D38248 80240A48 8C63001C */ lw $v1, 0x1c($v1) -/* D3824C 80240A4C AFA30018 */ sw $v1, 0x18($sp) -/* D38250 80240A50 8E2300D0 */ lw $v1, 0xd0($s1) -/* D38254 80240A54 8C630024 */ lw $v1, 0x24($v1) -/* D38258 80240A58 AFA3001C */ sw $v1, 0x1c($sp) -/* D3825C 80240A5C 8E2300D0 */ lw $v1, 0xd0($s1) -/* D38260 80240A60 8C630028 */ lw $v1, 0x28($v1) -/* D38264 80240A64 27B40010 */ addiu $s4, $sp, 0x10 -/* D38268 80240A68 AFA30020 */ sw $v1, 0x20($sp) -/* D3826C 80240A6C 8E2300D0 */ lw $v1, 0xd0($s1) -/* D38270 80240A70 3C014282 */ lui $at, 0x4282 -/* D38274 80240A74 44810000 */ mtc1 $at, $f0 -/* D38278 80240A78 8C63002C */ lw $v1, 0x2c($v1) -/* D3827C 80240A7C 0040982D */ daddu $s3, $v0, $zero -/* D38280 80240A80 E7A00028 */ swc1 $f0, 0x28($sp) -/* D38284 80240A84 A7A0002C */ sh $zero, 0x2c($sp) -/* D38288 80240A88 16000005 */ bnez $s0, .L80240AA0 -/* D3828C 80240A8C AFA30024 */ sw $v1, 0x24($sp) -/* D38290 80240A90 8E2200B0 */ lw $v0, 0xb0($s1) -/* D38294 80240A94 30420004 */ andi $v0, $v0, 4 -/* D38298 80240A98 10400020 */ beqz $v0, .L80240B1C -/* D3829C 80240A9C 00000000 */ nop -.L80240AA0: -/* D382A0 80240AA0 2404F7FF */ addiu $a0, $zero, -0x801 -/* D382A4 80240AA4 AE400070 */ sw $zero, 0x70($s2) -/* D382A8 80240AA8 A6A0008E */ sh $zero, 0x8e($s5) -/* D382AC 80240AAC 8E2200CC */ lw $v0, 0xcc($s1) -/* D382B0 80240AB0 8EA30000 */ lw $v1, ($s5) -/* D382B4 80240AB4 8C420000 */ lw $v0, ($v0) -/* D382B8 80240AB8 00641824 */ and $v1, $v1, $a0 -/* D382BC 80240ABC AEA30000 */ sw $v1, ($s5) -/* D382C0 80240AC0 AEA20028 */ sw $v0, 0x28($s5) -/* D382C4 80240AC4 8E2200D0 */ lw $v0, 0xd0($s1) -/* D382C8 80240AC8 8C420034 */ lw $v0, 0x34($v0) -/* D382CC 80240ACC 54400005 */ bnel $v0, $zero, .L80240AE4 -/* D382D0 80240AD0 2402FDFF */ addiu $v0, $zero, -0x201 -/* D382D4 80240AD4 34620200 */ ori $v0, $v1, 0x200 -/* D382D8 80240AD8 2403FFF7 */ addiu $v1, $zero, -9 -/* D382DC 80240ADC 080902BB */ j .L80240AEC -/* D382E0 80240AE0 00431024 */ and $v0, $v0, $v1 -.L80240AE4: -/* D382E4 80240AE4 00621024 */ and $v0, $v1, $v0 -/* D382E8 80240AE8 34420008 */ ori $v0, $v0, 8 -.L80240AEC: -/* D382EC 80240AEC AEA20000 */ sw $v0, ($s5) -/* D382F0 80240AF0 8E2200B0 */ lw $v0, 0xb0($s1) -/* D382F4 80240AF4 30420004 */ andi $v0, $v0, 4 -/* D382F8 80240AF8 10400007 */ beqz $v0, .L80240B18 -/* D382FC 80240AFC 24020063 */ addiu $v0, $zero, 0x63 -/* D38300 80240B00 AE420070 */ sw $v0, 0x70($s2) -/* D38304 80240B04 AE400074 */ sw $zero, 0x74($s2) -/* D38308 80240B08 8E2200B0 */ lw $v0, 0xb0($s1) -/* D3830C 80240B0C 2403FFFB */ addiu $v1, $zero, -5 -/* D38310 80240B10 00431024 */ and $v0, $v0, $v1 -/* D38314 80240B14 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240B18: -/* D38318 80240B18 AE20006C */ sw $zero, 0x6c($s1) -.L80240B1C: -/* D3831C 80240B1C 8E420070 */ lw $v0, 0x70($s2) -/* D38320 80240B20 2842001E */ slti $v0, $v0, 0x1e -/* D38324 80240B24 10400009 */ beqz $v0, .L80240B4C -/* D38328 80240B28 00000000 */ nop -/* D3832C 80240B2C 8E22006C */ lw $v0, 0x6c($s1) -/* D38330 80240B30 14400006 */ bnez $v0, .L80240B4C -/* D38334 80240B34 00000000 */ nop -/* D38338 80240B38 0C090176 */ jal func_802405D8 -/* D3833C 80240B3C 0240202D */ daddu $a0, $s2, $zero -/* D38340 80240B40 10400002 */ beqz $v0, .L80240B4C -/* D38344 80240B44 2402001E */ addiu $v0, $zero, 0x1e -/* D38348 80240B48 AE420070 */ sw $v0, 0x70($s2) -.L80240B4C: -/* D3834C 80240B4C 8E430070 */ lw $v1, 0x70($s2) -/* D38350 80240B50 2C620064 */ sltiu $v0, $v1, 0x64 -/* D38354 80240B54 10400048 */ beqz $v0, .L80240C78 -/* D38358 80240B58 00031080 */ sll $v0, $v1, 2 -/* D3835C 80240B5C 3C018024 */ lui $at, 0x8024 -/* D38360 80240B60 00220821 */ addu $at, $at, $v0 -/* D38364 80240B64 8C222C38 */ lw $v0, 0x2c38($at) -/* D38368 80240B68 00400008 */ jr $v0 -/* D3836C 80240B6C 00000000 */ nop -/* D38370 80240B70 0240202D */ daddu $a0, $s2, $zero -/* D38374 80240B74 0260282D */ daddu $a1, $s3, $zero -/* D38378 80240B78 0C012568 */ jal func_800495A0 -/* D3837C 80240B7C 0280302D */ daddu $a2, $s4, $zero -/* D38380 80240B80 0240202D */ daddu $a0, $s2, $zero -/* D38384 80240B84 0260282D */ daddu $a1, $s3, $zero -/* D38388 80240B88 0C0125AE */ jal func_800496B8 -/* D3838C 80240B8C 0280302D */ daddu $a2, $s4, $zero -/* D38390 80240B90 0809031E */ j .L80240C78 -/* D38394 80240B94 00000000 */ nop -/* D38398 80240B98 0240202D */ daddu $a0, $s2, $zero -/* D3839C 80240B9C 0260282D */ daddu $a1, $s3, $zero -/* D383A0 80240BA0 0C0126D1 */ jal func_80049B44 -/* D383A4 80240BA4 0280302D */ daddu $a2, $s4, $zero -/* D383A8 80240BA8 0240202D */ daddu $a0, $s2, $zero -/* D383AC 80240BAC 0260282D */ daddu $a1, $s3, $zero -/* D383B0 80240BB0 0C012701 */ jal func_80049C04 -/* D383B4 80240BB4 0280302D */ daddu $a2, $s4, $zero -/* D383B8 80240BB8 0809031E */ j .L80240C78 -/* D383BC 80240BBC 00000000 */ nop -/* D383C0 80240BC0 0240202D */ daddu $a0, $s2, $zero -/* D383C4 80240BC4 0260282D */ daddu $a1, $s3, $zero -/* D383C8 80240BC8 0C01278F */ jal func_80049E3C -/* D383CC 80240BCC 0280302D */ daddu $a2, $s4, $zero -/* D383D0 80240BD0 0240202D */ daddu $a0, $s2, $zero -/* D383D4 80240BD4 0260282D */ daddu $a1, $s3, $zero -/* D383D8 80240BD8 0C0127B3 */ jal func_80049ECC -/* D383DC 80240BDC 0280302D */ daddu $a2, $s4, $zero -/* D383E0 80240BE0 0809031E */ j .L80240C78 -/* D383E4 80240BE4 00000000 */ nop -/* D383E8 80240BE8 0240202D */ daddu $a0, $s2, $zero -/* D383EC 80240BEC 0260282D */ daddu $a1, $s3, $zero -/* D383F0 80240BF0 0C0127DF */ jal func_80049F7C -/* D383F4 80240BF4 0280302D */ daddu $a2, $s4, $zero -/* D383F8 80240BF8 0240202D */ daddu $a0, $s2, $zero -/* D383FC 80240BFC 0260282D */ daddu $a1, $s3, $zero -/* D38400 80240C00 0C012849 */ jal func_8004A124 -/* D38404 80240C04 0280302D */ daddu $a2, $s4, $zero -/* D38408 80240C08 0809031E */ j .L80240C78 -/* D3840C 80240C0C 00000000 */ nop -/* D38410 80240C10 0240202D */ daddu $a0, $s2, $zero -/* D38414 80240C14 0260282D */ daddu $a1, $s3, $zero -/* D38418 80240C18 0C0128FA */ jal func_8004A3E8 -/* D3841C 80240C1C 0280302D */ daddu $a2, $s4, $zero -/* D38420 80240C20 0809031E */ j .L80240C78 -/* D38424 80240C24 00000000 */ nop -/* D38428 80240C28 0C0900F4 */ jal func_802403D0 -/* D3842C 80240C2C 0240202D */ daddu $a0, $s2, $zero -/* D38430 80240C30 0C09010F */ jal func_8024043C -/* D38434 80240C34 0240202D */ daddu $a0, $s2, $zero -/* D38438 80240C38 8E430070 */ lw $v1, 0x70($s2) -/* D3843C 80240C3C 24020020 */ addiu $v0, $zero, 0x20 -/* D38440 80240C40 1462000D */ bne $v1, $v0, .L80240C78 -/* D38444 80240C44 00000000 */ nop -/* D38448 80240C48 0C09012B */ jal func_802404AC -/* D3844C 80240C4C 0240202D */ daddu $a0, $s2, $zero -/* D38450 80240C50 8E430070 */ lw $v1, 0x70($s2) -/* D38454 80240C54 24020021 */ addiu $v0, $zero, 0x21 -/* D38458 80240C58 14620007 */ bne $v1, $v0, .L80240C78 -/* D3845C 80240C5C 00000000 */ nop -/* D38460 80240C60 0C090161 */ jal func_80240584 -/* D38464 80240C64 0240202D */ daddu $a0, $s2, $zero -/* D38468 80240C68 0809031E */ j .L80240C78 -/* D3846C 80240C6C 00000000 */ nop -/* D38470 80240C70 0C0129CF */ jal func_8004A73C -/* D38474 80240C74 0240202D */ daddu $a0, $s2, $zero -.L80240C78: -/* D38478 80240C78 8FBF0048 */ lw $ra, 0x48($sp) -/* D3847C 80240C7C 8FB50044 */ lw $s5, 0x44($sp) -/* D38480 80240C80 8FB40040 */ lw $s4, 0x40($sp) -/* D38484 80240C84 8FB3003C */ lw $s3, 0x3c($sp) -/* D38488 80240C88 8FB20038 */ lw $s2, 0x38($sp) -/* D3848C 80240C8C 8FB10034 */ lw $s1, 0x34($sp) -/* D38490 80240C90 8FB00030 */ lw $s0, 0x30($sp) -/* D38494 80240C94 0000102D */ daddu $v0, $zero, $zero -/* D38498 80240C98 03E00008 */ jr $ra -/* D3849C 80240C9C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80240040_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80240040_D3A5D0.s deleted file mode 100644 index b7aefde073..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80240040_D3A5D0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_D3A610 -/* D3A610 80240040 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D3A614 80240044 F7B40018 */ sdc1 $f20, 0x18($sp) -/* D3A618 80240048 4485A000 */ mtc1 $a1, $f20 -/* D3A61C 8024004C F7B60020 */ sdc1 $f22, 0x20($sp) -/* D3A620 80240050 4486B000 */ mtc1 $a2, $f22 -/* D3A624 80240054 AFB00010 */ sw $s0, 0x10($sp) -/* D3A628 80240058 F7B80028 */ sdc1 $f24, 0x28($sp) -/* D3A62C 8024005C 4487C000 */ mtc1 $a3, $f24 -/* D3A630 80240060 AFBF0014 */ sw $ra, 0x14($sp) -/* D3A634 80240064 0C019D28 */ jal guMtxIdentF -/* D3A638 80240068 0080802D */ daddu $s0, $a0, $zero -/* D3A63C 8024006C 4616A582 */ mul.s $f22, $f20, $f22 -/* D3A640 80240070 00000000 */ nop -/* D3A644 80240074 4618A502 */ mul.s $f20, $f20, $f24 -/* D3A648 80240078 00000000 */ nop -/* D3A64C 8024007C 3C013F80 */ lui $at, 0x3f80 -/* D3A650 80240080 44810000 */ mtc1 $at, $f0 -/* D3A654 80240084 00000000 */ nop -/* D3A658 80240088 E6000014 */ swc1 $f0, 0x14($s0) -/* D3A65C 8024008C E6160010 */ swc1 $f22, 0x10($s0) -/* D3A660 80240090 E6140018 */ swc1 $f20, 0x18($s0) -/* D3A664 80240094 8FBF0014 */ lw $ra, 0x14($sp) -/* D3A668 80240098 8FB00010 */ lw $s0, 0x10($sp) -/* D3A66C 8024009C D7B80028 */ ldc1 $f24, 0x28($sp) -/* D3A670 802400A0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* D3A674 802400A4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* D3A678 802400A8 03E00008 */ jr $ra -/* D3A67C 802400AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_802400B0_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_802400B0_D3A5D0.s deleted file mode 100644 index 5f64a27b0d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_802400B0_D3A5D0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B0_D3A680 -/* D3A680 802400B0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* D3A684 802400B4 AFB10054 */ sw $s1, 0x54($sp) -/* D3A688 802400B8 0080882D */ daddu $s1, $a0, $zero -/* D3A68C 802400BC AFBF005C */ sw $ra, 0x5c($sp) -/* D3A690 802400C0 AFB20058 */ sw $s2, 0x58($sp) -/* D3A694 802400C4 AFB00050 */ sw $s0, 0x50($sp) -/* D3A698 802400C8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* D3A69C 802400CC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* D3A6A0 802400D0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* D3A6A4 802400D4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* D3A6A8 802400D8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* D3A6AC 802400DC 8E30000C */ lw $s0, 0xc($s1) -/* D3A6B0 802400E0 8E050000 */ lw $a1, ($s0) -/* D3A6B4 802400E4 0C0B1EAF */ jal get_variable -/* D3A6B8 802400E8 26100004 */ addiu $s0, $s0, 4 -/* D3A6BC 802400EC 0C046C04 */ jal get_model_list_index_from_tree_index -/* D3A6C0 802400F0 0040202D */ daddu $a0, $v0, $zero -/* D3A6C4 802400F4 8E050000 */ lw $a1, ($s0) -/* D3A6C8 802400F8 26100004 */ addiu $s0, $s0, 4 -/* D3A6CC 802400FC 0220202D */ daddu $a0, $s1, $zero -/* D3A6D0 80240100 0C0B210B */ jal get_float_variable -/* D3A6D4 80240104 0040902D */ daddu $s2, $v0, $zero -/* D3A6D8 80240108 8E050000 */ lw $a1, ($s0) -/* D3A6DC 8024010C 26100004 */ addiu $s0, $s0, 4 -/* D3A6E0 80240110 0220202D */ daddu $a0, $s1, $zero -/* D3A6E4 80240114 0C0B210B */ jal get_float_variable -/* D3A6E8 80240118 46000706 */ mov.s $f28, $f0 -/* D3A6EC 8024011C 8E050000 */ lw $a1, ($s0) -/* D3A6F0 80240120 26100004 */ addiu $s0, $s0, 4 -/* D3A6F4 80240124 0220202D */ daddu $a0, $s1, $zero -/* D3A6F8 80240128 0C0B210B */ jal get_float_variable -/* D3A6FC 8024012C 46000686 */ mov.s $f26, $f0 -/* D3A700 80240130 0220202D */ daddu $a0, $s1, $zero -/* D3A704 80240134 8E050000 */ lw $a1, ($s0) -/* D3A708 80240138 0C0B210B */ jal get_float_variable -/* D3A70C 8024013C 46000586 */ mov.s $f22, $f0 -/* D3A710 80240140 0240202D */ daddu $a0, $s2, $zero -/* D3A714 80240144 0C046B4C */ jal get_model_from_list_index -/* D3A718 80240148 46000606 */ mov.s $f24, $f0 -/* D3A71C 8024014C 0040882D */ daddu $s1, $v0, $zero -/* D3A720 80240150 96220000 */ lhu $v0, ($s1) -/* D3A724 80240154 30420400 */ andi $v0, $v0, 0x400 -/* D3A728 80240158 1440001E */ bnez $v0, .L802401D4 -/* D3A72C 8024015C 26300058 */ addiu $s0, $s1, 0x58 -/* D3A730 80240160 4480A000 */ mtc1 $zero, $f20 -/* D3A734 80240164 4406B000 */ mfc1 $a2, $f22 -/* D3A738 80240168 4405A000 */ mfc1 $a1, $f20 -/* D3A73C 8024016C 4407A000 */ mfc1 $a3, $f20 -/* D3A740 80240170 0C019E40 */ jal guTranslateF -/* D3A744 80240174 0200202D */ daddu $a0, $s0, $zero -/* D3A748 80240178 4405E000 */ mfc1 $a1, $f28 -/* D3A74C 8024017C 4406D000 */ mfc1 $a2, $f26 -/* D3A750 80240180 4407C000 */ mfc1 $a3, $f24 -/* D3A754 80240184 0C090010 */ jal func_80240040 -/* D3A758 80240188 27A40010 */ addiu $a0, $sp, 0x10 -/* D3A75C 8024018C 27A40010 */ addiu $a0, $sp, 0x10 -/* D3A760 80240190 0200282D */ daddu $a1, $s0, $zero -/* D3A764 80240194 0C019D80 */ jal guMtxCatF -/* D3A768 80240198 0200302D */ daddu $a2, $s0, $zero -/* D3A76C 8024019C 27A40010 */ addiu $a0, $sp, 0x10 -/* D3A770 802401A0 4600B587 */ neg.s $f22, $f22 -/* D3A774 802401A4 4405A000 */ mfc1 $a1, $f20 -/* D3A778 802401A8 4406B000 */ mfc1 $a2, $f22 -/* D3A77C 802401AC 0C019E40 */ jal guTranslateF -/* D3A780 802401B0 00A0382D */ daddu $a3, $a1, $zero -/* D3A784 802401B4 27A40010 */ addiu $a0, $sp, 0x10 -/* D3A788 802401B8 0200282D */ daddu $a1, $s0, $zero -/* D3A78C 802401BC 0C019D80 */ jal guMtxCatF -/* D3A790 802401C0 00A0302D */ daddu $a2, $a1, $zero -/* D3A794 802401C4 96220000 */ lhu $v0, ($s1) -/* D3A798 802401C8 34421400 */ ori $v0, $v0, 0x1400 -/* D3A79C 802401CC 08090093 */ j .L8024024C -/* D3A7A0 802401D0 A6220000 */ sh $v0, ($s1) -.L802401D4: -/* D3A7A4 802401D4 4480A000 */ mtc1 $zero, $f20 -/* D3A7A8 802401D8 4406B000 */ mfc1 $a2, $f22 -/* D3A7AC 802401DC 4405A000 */ mfc1 $a1, $f20 -/* D3A7B0 802401E0 4407A000 */ mfc1 $a3, $f20 -/* D3A7B4 802401E4 0C019E40 */ jal guTranslateF -/* D3A7B8 802401E8 27A40010 */ addiu $a0, $sp, 0x10 -/* D3A7BC 802401EC 27A40010 */ addiu $a0, $sp, 0x10 -/* D3A7C0 802401F0 26300058 */ addiu $s0, $s1, 0x58 -/* D3A7C4 802401F4 0200282D */ daddu $a1, $s0, $zero -/* D3A7C8 802401F8 0C019D80 */ jal guMtxCatF -/* D3A7CC 802401FC 0200302D */ daddu $a2, $s0, $zero -/* D3A7D0 80240200 4405E000 */ mfc1 $a1, $f28 -/* D3A7D4 80240204 4406D000 */ mfc1 $a2, $f26 -/* D3A7D8 80240208 4407C000 */ mfc1 $a3, $f24 -/* D3A7DC 8024020C 0C090010 */ jal func_80240040 -/* D3A7E0 80240210 27A40010 */ addiu $a0, $sp, 0x10 -/* D3A7E4 80240214 27A40010 */ addiu $a0, $sp, 0x10 -/* D3A7E8 80240218 0200282D */ daddu $a1, $s0, $zero -/* D3A7EC 8024021C 0C019D80 */ jal guMtxCatF -/* D3A7F0 80240220 0200302D */ daddu $a2, $s0, $zero -/* D3A7F4 80240224 27A40010 */ addiu $a0, $sp, 0x10 -/* D3A7F8 80240228 4600B587 */ neg.s $f22, $f22 -/* D3A7FC 8024022C 4405A000 */ mfc1 $a1, $f20 -/* D3A800 80240230 4406B000 */ mfc1 $a2, $f22 -/* D3A804 80240234 0C019E40 */ jal guTranslateF -/* D3A808 80240238 00A0382D */ daddu $a3, $a1, $zero -/* D3A80C 8024023C 27A40010 */ addiu $a0, $sp, 0x10 -/* D3A810 80240240 0200282D */ daddu $a1, $s0, $zero -/* D3A814 80240244 0C019D80 */ jal guMtxCatF -/* D3A818 80240248 00A0302D */ daddu $a2, $a1, $zero -.L8024024C: -/* D3A81C 8024024C 8FBF005C */ lw $ra, 0x5c($sp) -/* D3A820 80240250 8FB20058 */ lw $s2, 0x58($sp) -/* D3A824 80240254 8FB10054 */ lw $s1, 0x54($sp) -/* D3A828 80240258 8FB00050 */ lw $s0, 0x50($sp) -/* D3A82C 8024025C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* D3A830 80240260 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* D3A834 80240264 D7B80070 */ ldc1 $f24, 0x70($sp) -/* D3A838 80240268 D7B60068 */ ldc1 $f22, 0x68($sp) -/* D3A83C 8024026C D7B40060 */ ldc1 $f20, 0x60($sp) -/* D3A840 80240270 24020002 */ addiu $v0, $zero, 2 -/* D3A844 80240274 03E00008 */ jr $ra -/* D3A848 80240278 27BD0088 */ addiu $sp, $sp, 0x88 -/* D3A84C 8024027C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80240280_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80240280_D3A5D0.s deleted file mode 100644 index abfa4b3e1b..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80240280_D3A5D0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240280_D3A850 -/* D3A850 80240280 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3A854 80240284 AFBF0010 */ sw $ra, 0x10($sp) -/* D3A858 80240288 0C04417A */ jal get_entity_by_index -/* D3A85C 8024028C 8C840084 */ lw $a0, 0x84($a0) -/* D3A860 80240290 0040182D */ daddu $v1, $v0, $zero -/* D3A864 80240294 8C640000 */ lw $a0, ($v1) -/* D3A868 80240298 3C050010 */ lui $a1, 0x10 -/* D3A86C 8024029C 00852025 */ or $a0, $a0, $a1 -/* D3A870 802402A0 AC640000 */ sw $a0, ($v1) -/* D3A874 802402A4 8FBF0010 */ lw $ra, 0x10($sp) -/* D3A878 802402A8 24020002 */ addiu $v0, $zero, 2 -/* D3A87C 802402AC 03E00008 */ jr $ra -/* D3A880 802402B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_802402B4_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_802402B4_D3A5D0.s deleted file mode 100644 index a531998135..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_802402B4_D3A5D0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402B4_D3A884 -/* D3A884 802402B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3A888 802402B8 AFB20018 */ sw $s2, 0x18($sp) -/* D3A88C 802402BC 0080902D */ daddu $s2, $a0, $zero -/* D3A890 802402C0 AFBF001C */ sw $ra, 0x1c($sp) -/* D3A894 802402C4 AFB10014 */ sw $s1, 0x14($sp) -/* D3A898 802402C8 AFB00010 */ sw $s0, 0x10($sp) -/* D3A89C 802402CC 8E50000C */ lw $s0, 0xc($s2) -/* D3A8A0 802402D0 8E050000 */ lw $a1, ($s0) -/* D3A8A4 802402D4 0C0B1EAF */ jal get_variable -/* D3A8A8 802402D8 26100004 */ addiu $s0, $s0, 4 -/* D3A8AC 802402DC 0C04417A */ jal get_entity_by_index -/* D3A8B0 802402E0 0040202D */ daddu $a0, $v0, $zero -/* D3A8B4 802402E4 8E050000 */ lw $a1, ($s0) -/* D3A8B8 802402E8 26100004 */ addiu $s0, $s0, 4 -/* D3A8BC 802402EC 0040882D */ daddu $s1, $v0, $zero -/* D3A8C0 802402F0 C6200048 */ lwc1 $f0, 0x48($s1) -/* D3A8C4 802402F4 4600008D */ trunc.w.s $f2, $f0 -/* D3A8C8 802402F8 44061000 */ mfc1 $a2, $f2 -/* D3A8CC 802402FC 0C0B2026 */ jal set_variable -/* D3A8D0 80240300 0240202D */ daddu $a0, $s2, $zero -/* D3A8D4 80240304 8E050000 */ lw $a1, ($s0) -/* D3A8D8 80240308 26100004 */ addiu $s0, $s0, 4 -/* D3A8DC 8024030C C620004C */ lwc1 $f0, 0x4c($s1) -/* D3A8E0 80240310 4600008D */ trunc.w.s $f2, $f0 -/* D3A8E4 80240314 44061000 */ mfc1 $a2, $f2 -/* D3A8E8 80240318 0C0B2026 */ jal set_variable -/* D3A8EC 8024031C 0240202D */ daddu $a0, $s2, $zero -/* D3A8F0 80240320 C6200050 */ lwc1 $f0, 0x50($s1) -/* D3A8F4 80240324 8E050000 */ lw $a1, ($s0) -/* D3A8F8 80240328 4600008D */ trunc.w.s $f2, $f0 -/* D3A8FC 8024032C 44061000 */ mfc1 $a2, $f2 -/* D3A900 80240330 0C0B2026 */ jal set_variable -/* D3A904 80240334 0240202D */ daddu $a0, $s2, $zero -/* D3A908 80240338 8FBF001C */ lw $ra, 0x1c($sp) -/* D3A90C 8024033C 8FB20018 */ lw $s2, 0x18($sp) -/* D3A910 80240340 8FB10014 */ lw $s1, 0x14($sp) -/* D3A914 80240344 8FB00010 */ lw $s0, 0x10($sp) -/* D3A918 80240348 24020002 */ addiu $v0, $zero, 2 -/* D3A91C 8024034C 03E00008 */ jr $ra -/* D3A920 80240350 27BD0020 */ addiu $sp, $sp, 0x20 -/* D3A924 80240354 00000000 */ nop -/* D3A928 80240358 00000000 */ nop -/* D3A92C 8024035C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80240360_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80240360_D3A5D0.s deleted file mode 100644 index a19823dd01..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80240360_D3A5D0.s +++ /dev/null @@ -1,126 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240360_D3A930 -/* D3A930 80240360 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3A934 80240364 AFB00018 */ sw $s0, 0x18($sp) -/* D3A938 80240368 0080802D */ daddu $s0, $a0, $zero -/* D3A93C 8024036C 10A00018 */ beqz $a1, .L802403D0 -/* D3A940 80240370 AFBF001C */ sw $ra, 0x1c($sp) -/* D3A944 80240374 2405FFFF */ addiu $a1, $zero, -1 -/* D3A948 80240378 24060001 */ addiu $a2, $zero, 1 -/* D3A94C 8024037C 9604008A */ lhu $a0, 0x8a($s0) -/* D3A950 80240380 0C046E54 */ jal func_8011B950 -/* D3A954 80240384 00C0382D */ daddu $a3, $a2, $zero -/* D3A958 80240388 27A40010 */ addiu $a0, $sp, 0x10 -/* D3A95C 8024038C 27A50011 */ addiu $a1, $sp, 0x11 -/* D3A960 80240390 27A60012 */ addiu $a2, $sp, 0x12 -/* D3A964 80240394 27A70013 */ addiu $a3, $sp, 0x13 -/* D3A968 80240398 0C046FA0 */ jal get_background_color_blend -/* D3A96C 8024039C AE000070 */ sw $zero, 0x70($s0) -/* D3A970 802403A0 8E040084 */ lw $a0, 0x84($s0) -/* D3A974 802403A4 14800005 */ bnez $a0, .L802403BC -/* D3A978 802403A8 24020001 */ addiu $v0, $zero, 1 -/* D3A97C 802403AC 93A30013 */ lbu $v1, 0x13($sp) -/* D3A980 802403B0 240200FF */ addiu $v0, $zero, 0xff -/* D3A984 802403B4 10620058 */ beq $v1, $v0, .L80240518 -/* D3A988 802403B8 24020001 */ addiu $v0, $zero, 1 -.L802403BC: -/* D3A98C 802403BC 14820004 */ bne $a0, $v0, .L802403D0 -/* D3A990 802403C0 00000000 */ nop -/* D3A994 802403C4 93A20013 */ lbu $v0, 0x13($sp) -/* D3A998 802403C8 10400054 */ beqz $v0, .L8024051C -/* D3A99C 802403CC 24020002 */ addiu $v0, $zero, 2 -.L802403D0: -/* D3A9A0 802403D0 8E020070 */ lw $v0, 0x70($s0) -/* D3A9A4 802403D4 8E03008C */ lw $v1, 0x8c($s0) -/* D3A9A8 802403D8 00431021 */ addu $v0, $v0, $v1 -/* D3A9AC 802403DC AE020070 */ sw $v0, 0x70($s0) -/* D3A9B0 802403E0 28420100 */ slti $v0, $v0, 0x100 -/* D3A9B4 802403E4 14400002 */ bnez $v0, .L802403F0 -/* D3A9B8 802403E8 240200FF */ addiu $v0, $zero, 0xff -/* D3A9BC 802403EC AE020070 */ sw $v0, 0x70($s0) -.L802403F0: -/* D3A9C0 802403F0 8E020084 */ lw $v0, 0x84($s0) -/* D3A9C4 802403F4 14400004 */ bnez $v0, .L80240408 -/* D3A9C8 802403F8 0000202D */ daddu $a0, $zero, $zero -/* D3A9CC 802403FC 92020073 */ lbu $v0, 0x73($s0) -/* D3A9D0 80240400 08090105 */ j .L80240414 -/* D3A9D4 80240404 0080282D */ daddu $a1, $a0, $zero -.L80240408: -/* D3A9D8 80240408 92020073 */ lbu $v0, 0x73($s0) -/* D3A9DC 8024040C 00021027 */ nor $v0, $zero, $v0 -/* D3A9E0 80240410 0080282D */ daddu $a1, $a0, $zero -.L80240414: -/* D3A9E4 80240414 A3A20013 */ sb $v0, 0x13($sp) -/* D3A9E8 80240418 304700FF */ andi $a3, $v0, 0xff -/* D3A9EC 8024041C 0C046F97 */ jal set_background_color_blend -/* D3A9F0 80240420 0080302D */ daddu $a2, $a0, $zero -/* D3A9F4 80240424 240600FF */ addiu $a2, $zero, 0xff -/* D3A9F8 80240428 93A20013 */ lbu $v0, 0x13($sp) -/* D3A9FC 8024042C 3C038024 */ lui $v1, 0x8024 -/* D3AA00 80240430 8C633CC0 */ lw $v1, 0x3cc0($v1) -/* D3AA04 80240434 00C23023 */ subu $a2, $a2, $v0 -/* D3AA08 80240438 00660018 */ mult $v1, $a2 -/* D3AA0C 8024043C 00001812 */ mflo $v1 -/* D3AA10 80240440 3C058024 */ lui $a1, 0x8024 -/* D3AA14 80240444 8CA53CC4 */ lw $a1, 0x3cc4($a1) -/* D3AA18 80240448 00A60018 */ mult $a1, $a2 -/* D3AA1C 8024044C 00002812 */ mflo $a1 -/* D3AA20 80240450 3C078080 */ lui $a3, 0x8080 -/* D3AA24 80240454 34E78081 */ ori $a3, $a3, 0x8081 -/* D3AA28 80240458 00670018 */ mult $v1, $a3 -/* D3AA2C 8024045C 00005010 */ mfhi $t2 -/* D3AA30 80240460 00000000 */ nop -/* D3AA34 80240464 00000000 */ nop -/* D3AA38 80240468 00A70018 */ mult $a1, $a3 -/* D3AA3C 8024046C 00004010 */ mfhi $t0 -/* D3AA40 80240470 3C048024 */ lui $a0, 0x8024 -/* D3AA44 80240474 8C843CC8 */ lw $a0, 0x3cc8($a0) -/* D3AA48 80240478 00860018 */ mult $a0, $a2 -/* D3AA4C 8024047C 01431021 */ addu $v0, $t2, $v1 -/* D3AA50 80240480 000211C3 */ sra $v0, $v0, 7 -/* D3AA54 80240484 00031FC3 */ sra $v1, $v1, 0x1f -/* D3AA58 80240488 00431023 */ subu $v0, $v0, $v1 -/* D3AA5C 8024048C 00002012 */ mflo $a0 -/* D3AA60 80240490 A3A20010 */ sb $v0, 0x10($sp) -/* D3AA64 80240494 01051021 */ addu $v0, $t0, $a1 -/* D3AA68 80240498 00870018 */ mult $a0, $a3 -/* D3AA6C 8024049C 000211C3 */ sra $v0, $v0, 7 -/* D3AA70 802404A0 00052FC3 */ sra $a1, $a1, 0x1f -/* D3AA74 802404A4 00451023 */ subu $v0, $v0, $a1 -/* D3AA78 802404A8 A3A20011 */ sb $v0, 0x11($sp) -/* D3AA7C 802404AC 00001810 */ mfhi $v1 -/* D3AA80 802404B0 00641021 */ addu $v0, $v1, $a0 -/* D3AA84 802404B4 000211C3 */ sra $v0, $v0, 7 -/* D3AA88 802404B8 000427C3 */ sra $a0, $a0, 0x1f -/* D3AA8C 802404BC 00441023 */ subu $v0, $v0, $a0 -/* D3AA90 802404C0 A3A20012 */ sb $v0, 0x12($sp) -/* D3AA94 802404C4 304500FF */ andi $a1, $v0, 0xff -/* D3AA98 802404C8 93A30010 */ lbu $v1, 0x10($sp) -/* D3AA9C 802404CC 93A40011 */ lbu $a0, 0x11($sp) -/* D3AAA0 802404D0 3C02800B */ lui $v0, %hi(gCameras) -/* D3AAA4 802404D4 24421D80 */ addiu $v0, $v0, %lo(gCameras) -/* D3AAA8 802404D8 A4450030 */ sh $a1, 0x30($v0) -/* D3AAAC 802404DC A443002C */ sh $v1, 0x2c($v0) -/* D3AAB0 802404E0 A444002E */ sh $a0, 0x2e($v0) -/* D3AAB4 802404E4 8E020070 */ lw $v0, 0x70($s0) -/* D3AAB8 802404E8 284200FF */ slti $v0, $v0, 0xff -/* D3AABC 802404EC 1440000B */ bnez $v0, .L8024051C -/* D3AAC0 802404F0 0000102D */ daddu $v0, $zero, $zero -/* D3AAC4 802404F4 8E030084 */ lw $v1, 0x84($s0) -/* D3AAC8 802404F8 24020001 */ addiu $v0, $zero, 1 -/* D3AACC 802404FC 54620007 */ bnel $v1, $v0, .L8024051C -/* D3AAD0 80240500 24020002 */ addiu $v0, $zero, 2 -/* D3AAD4 80240504 9604008A */ lhu $a0, 0x8a($s0) -/* D3AAD8 80240508 2405FFFF */ addiu $a1, $zero, -1 -/* D3AADC 8024050C 0000302D */ daddu $a2, $zero, $zero -/* D3AAE0 80240510 0C046E54 */ jal func_8011B950 -/* D3AAE4 80240514 0040382D */ daddu $a3, $v0, $zero -.L80240518: -/* D3AAE8 80240518 24020002 */ addiu $v0, $zero, 2 -.L8024051C: -/* D3AAEC 8024051C 8FBF001C */ lw $ra, 0x1c($sp) -/* D3AAF0 80240520 8FB00018 */ lw $s0, 0x18($sp) -/* D3AAF4 80240524 03E00008 */ jr $ra -/* D3AAF8 80240528 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_8024052C_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_8024052C_D3A5D0.s deleted file mode 100644 index 9f8a2e7390..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_8024052C_D3A5D0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024052C_D3AAFC -/* D3AAFC 8024052C 24020001 */ addiu $v0, $zero, 1 -/* D3AB00 80240530 3C018015 */ lui $at, %hi(D_80151310) -/* D3AB04 80240534 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* D3AB08 80240538 03E00008 */ jr $ra -/* D3AB0C 8024053C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80240540_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80240540_D3A5D0.s deleted file mode 100644 index ffe44ebffd..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80240540_D3A5D0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240540_D3AB10 -/* D3AB10 80240540 24020002 */ addiu $v0, $zero, 2 -/* D3AB14 80240544 3C018015 */ lui $at, %hi(D_80151310) -/* D3AB18 80240548 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* D3AB1C 8024054C 03E00008 */ jr $ra -/* D3AB20 80240550 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80240554_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80240554_D3A5D0.s deleted file mode 100644 index 8fb3711d85..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80240554_D3A5D0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240554_D3AB24 -/* D3AB24 80240554 3C018015 */ lui $at, %hi(D_80151310) -/* D3AB28 80240558 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* D3AB2C 8024055C 03E00008 */ jr $ra -/* D3AB30 80240560 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80240564_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80240564_D3A5D0.s deleted file mode 100644 index cf8cb93fce..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80240564_D3A5D0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240564_D3AB34 -/* D3AB34 80240564 3C03800B */ lui $v1, %hi(gCameras) -/* D3AB38 80240568 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* D3AB3C 8024056C 94620002 */ lhu $v0, 2($v1) -/* D3AB40 80240570 3042FFFE */ andi $v0, $v0, 0xfffe -/* D3AB44 80240574 A4620002 */ sh $v0, 2($v1) -/* D3AB48 80240578 03E00008 */ jr $ra -/* D3AB4C 8024057C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_8024059C_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_8024059C_D3A5D0.s deleted file mode 100644 index d897c0f084..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_8024059C_D3A5D0.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024059C_D3AB6C -/* D3AB6C 8024059C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D3AB70 802405A0 AFB1002C */ sw $s1, 0x2c($sp) -/* D3AB74 802405A4 AFB20030 */ sw $s2, 0x30($sp) -/* D3AB78 802405A8 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* D3AB7C 802405AC 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* D3AB80 802405B0 AFBF0034 */ sw $ra, 0x34($sp) -/* D3AB84 802405B4 AFB00028 */ sw $s0, 0x28($sp) -/* D3AB88 802405B8 F7B40038 */ sdc1 $f20, 0x38($sp) -/* D3AB8C 802405BC 10A00003 */ beqz $a1, .L802405CC -/* D3AB90 802405C0 0080882D */ daddu $s1, $a0, $zero -/* D3AB94 802405C4 2402000A */ addiu $v0, $zero, 0xa -/* D3AB98 802405C8 AE220074 */ sw $v0, 0x74($s1) -.L802405CC: -/* D3AB9C 802405CC 3C014387 */ lui $at, 0x4387 -/* D3ABA0 802405D0 44810000 */ mtc1 $at, $f0 -/* D3ABA4 802405D4 00000000 */ nop -/* D3ABA8 802405D8 E6400080 */ swc1 $f0, 0x80($s2) -/* D3ABAC 802405DC 8E220074 */ lw $v0, 0x74($s1) -/* D3ABB0 802405E0 24420004 */ addiu $v0, $v0, 4 -/* D3ABB4 802405E4 AE220074 */ sw $v0, 0x74($s1) -/* D3ABB8 802405E8 C64C0080 */ lwc1 $f12, 0x80($s2) -/* D3ABBC 802405EC 0C00A8BB */ jal sin_deg -/* D3ABC0 802405F0 3C106666 */ lui $s0, 0x6666 -/* D3ABC4 802405F4 8E230074 */ lw $v1, 0x74($s1) -/* D3ABC8 802405F8 36106667 */ ori $s0, $s0, 0x6667 -/* D3ABCC 802405FC 00700018 */ mult $v1, $s0 -/* D3ABD0 80240600 C64C0080 */ lwc1 $f12, 0x80($s2) -/* D3ABD4 80240604 00031FC3 */ sra $v1, $v1, 0x1f -/* D3ABD8 80240608 00004010 */ mfhi $t0 -/* D3ABDC 8024060C 00081083 */ sra $v0, $t0, 2 -/* D3ABE0 80240610 00431023 */ subu $v0, $v0, $v1 -/* D3ABE4 80240614 4482A000 */ mtc1 $v0, $f20 -/* D3ABE8 80240618 00000000 */ nop -/* D3ABEC 8024061C 4680A520 */ cvt.s.w $f20, $f20 -/* D3ABF0 80240620 4600A502 */ mul.s $f20, $f20, $f0 -/* D3ABF4 80240624 0C00A8D4 */ jal cos_deg -/* D3ABF8 80240628 00000000 */ nop -/* D3ABFC 8024062C 8E230074 */ lw $v1, 0x74($s1) -/* D3AC00 80240630 00700018 */ mult $v1, $s0 -/* D3AC04 80240634 46000007 */ neg.s $f0, $f0 -/* D3AC08 80240638 00031FC3 */ sra $v1, $v1, 0x1f -/* D3AC0C 8024063C 00004010 */ mfhi $t0 -/* D3AC10 80240640 00081083 */ sra $v0, $t0, 2 -/* D3AC14 80240644 00431023 */ subu $v0, $v0, $v1 -/* D3AC18 80240648 44824000 */ mtc1 $v0, $f8 -/* D3AC1C 8024064C 00000000 */ nop -/* D3AC20 80240650 46804220 */ cvt.s.w $f8, $f8 -/* D3AC24 80240654 46004202 */ mul.s $f8, $f8, $f0 -/* D3AC28 80240658 00000000 */ nop -/* D3AC2C 8024065C 0000202D */ daddu $a0, $zero, $zero -/* D3AC30 80240660 864200B0 */ lh $v0, 0xb0($s2) -/* D3AC34 80240664 3C013F00 */ lui $at, 0x3f00 -/* D3AC38 80240668 44811000 */ mtc1 $at, $f2 -/* D3AC3C 8024066C 44820000 */ mtc1 $v0, $f0 -/* D3AC40 80240670 00000000 */ nop -/* D3AC44 80240674 46800020 */ cvt.s.w $f0, $f0 -/* D3AC48 80240678 46020002 */ mul.s $f0, $f0, $f2 -/* D3AC4C 8024067C 00000000 */ nop -/* D3AC50 80240680 27A50018 */ addiu $a1, $sp, 0x18 -/* D3AC54 80240684 27A6001C */ addiu $a2, $sp, 0x1c -/* D3AC58 80240688 C6440028 */ lwc1 $f4, 0x28($s2) -/* D3AC5C 8024068C 27A70020 */ addiu $a3, $sp, 0x20 -/* D3AC60 80240690 46142100 */ add.s $f4, $f4, $f20 -/* D3AC64 80240694 C642002C */ lwc1 $f2, 0x2c($s2) -/* D3AC68 80240698 3C0143FA */ lui $at, 0x43fa -/* D3AC6C 8024069C 44813000 */ mtc1 $at, $f6 -/* D3AC70 802406A0 46001080 */ add.s $f2, $f2, $f0 -/* D3AC74 802406A4 C6400030 */ lwc1 $f0, 0x30($s2) -/* D3AC78 802406A8 27A20024 */ addiu $v0, $sp, 0x24 -/* D3AC7C 802406AC E7A60024 */ swc1 $f6, 0x24($sp) -/* D3AC80 802406B0 46080000 */ add.s $f0, $f0, $f8 -/* D3AC84 802406B4 E7A40018 */ swc1 $f4, 0x18($sp) -/* D3AC88 802406B8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* D3AC8C 802406BC E7A00020 */ swc1 $f0, 0x20($sp) -/* D3AC90 802406C0 0C0372DF */ jal func_800DCB7C -/* D3AC94 802406C4 AFA20010 */ sw $v0, 0x10($sp) -/* D3AC98 802406C8 10400011 */ beqz $v0, .L80240710 -/* D3AC9C 802406CC 24020002 */ addiu $v0, $zero, 2 -/* D3ACA0 802406D0 C7A20024 */ lwc1 $f2, 0x24($sp) -/* D3ACA4 802406D4 3C0142C8 */ lui $at, 0x42c8 -/* D3ACA8 802406D8 44810000 */ mtc1 $at, $f0 -/* D3ACAC 802406DC 00000000 */ nop -/* D3ACB0 802406E0 4600103C */ c.lt.s $f2, $f0 -/* D3ACB4 802406E4 00000000 */ nop -/* D3ACB8 802406E8 45000008 */ bc1f .L8024070C -/* D3ACBC 802406EC 0000102D */ daddu $v0, $zero, $zero -/* D3ACC0 802406F0 C7A00018 */ lwc1 $f0, 0x18($sp) -/* D3ACC4 802406F4 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* D3ACC8 802406F8 C7A40020 */ lwc1 $f4, 0x20($sp) -/* D3ACCC 802406FC E6400028 */ swc1 $f0, 0x28($s2) -/* D3ACD0 80240700 E642002C */ swc1 $f2, 0x2c($s2) -/* D3ACD4 80240704 080901C4 */ j .L80240710 -/* D3ACD8 80240708 E6440030 */ swc1 $f4, 0x30($s2) -.L8024070C: -/* D3ACDC 8024070C 24020002 */ addiu $v0, $zero, 2 -.L80240710: -/* D3ACE0 80240710 8FBF0034 */ lw $ra, 0x34($sp) -/* D3ACE4 80240714 8FB20030 */ lw $s2, 0x30($sp) -/* D3ACE8 80240718 8FB1002C */ lw $s1, 0x2c($sp) -/* D3ACEC 8024071C 8FB00028 */ lw $s0, 0x28($sp) -/* D3ACF0 80240720 D7B40038 */ ldc1 $f20, 0x38($sp) -/* D3ACF4 80240724 03E00008 */ jr $ra -/* D3ACF8 80240728 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_8024072C_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_8024072C_D3A5D0.s deleted file mode 100644 index 29f4cec1f9..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_8024072C_D3A5D0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024072C_D3ACFC -/* D3ACFC 8024072C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* D3AD00 80240730 8C42EFC8 */ lw $v0, %lo(gPlayerStatus)($v0) -/* D3AD04 80240734 30423000 */ andi $v0, $v0, 0x3000 -/* D3AD08 80240738 10400003 */ beqz $v0, .L80240748 -/* D3AD0C 8024073C 24020001 */ addiu $v0, $zero, 1 -/* D3AD10 80240740 080901D3 */ j .L8024074C -/* D3AD14 80240744 AC820084 */ sw $v0, 0x84($a0) -.L80240748: -/* D3AD18 80240748 AC800084 */ sw $zero, 0x84($a0) -.L8024074C: -/* D3AD1C 8024074C 03E00008 */ jr $ra -/* D3AD20 80240750 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80240754_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80240754_D3A5D0.s deleted file mode 100644 index 82b6f3ba68..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80240754_D3A5D0.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240754_D3AD24 -/* D3AD24 80240754 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3AD28 80240758 AFB10014 */ sw $s1, 0x14($sp) -/* D3AD2C 8024075C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* D3AD30 80240760 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* D3AD34 80240764 AFB00010 */ sw $s0, 0x10($sp) -/* D3AD38 80240768 0040802D */ daddu $s0, $v0, $zero -/* D3AD3C 8024076C AFBF0018 */ sw $ra, 0x18($sp) -/* D3AD40 80240770 86030018 */ lh $v1, 0x18($s0) -/* D3AD44 80240774 24020181 */ addiu $v0, $zero, 0x181 -/* D3AD48 80240778 14620006 */ bne $v1, $v0, .L80240794 -/* D3AD4C 8024077C 0080882D */ daddu $s1, $a0, $zero -/* D3AD50 80240780 3C05FD05 */ lui $a1, 0xfd05 -/* D3AD54 80240784 34A50F87 */ ori $a1, $a1, 0xf87 -/* D3AD58 80240788 0C0B2026 */ jal set_variable -/* D3AD5C 8024078C 0000302D */ daddu $a2, $zero, $zero -/* D3AD60 80240790 86030018 */ lh $v1, 0x18($s0) -.L80240794: -/* D3AD64 80240794 24020096 */ addiu $v0, $zero, 0x96 -/* D3AD68 80240798 14620005 */ bne $v1, $v0, .L802407B0 -/* D3AD6C 8024079C 0220202D */ daddu $a0, $s1, $zero -/* D3AD70 802407A0 3C05FD05 */ lui $a1, 0xfd05 -/* D3AD74 802407A4 34A50F87 */ ori $a1, $a1, 0xf87 -/* D3AD78 802407A8 0C0B2026 */ jal set_variable -/* D3AD7C 802407AC 24060001 */ addiu $a2, $zero, 1 -.L802407B0: -/* D3AD80 802407B0 8FBF0018 */ lw $ra, 0x18($sp) -/* D3AD84 802407B4 8FB10014 */ lw $s1, 0x14($sp) -/* D3AD88 802407B8 8FB00010 */ lw $s0, 0x10($sp) -/* D3AD8C 802407BC 0000102D */ daddu $v0, $zero, $zero -/* D3AD90 802407C0 03E00008 */ jr $ra -/* D3AD94 802407C4 27BD0020 */ addiu $sp, $sp, 0x20 -/* D3AD98 802407C8 00000000 */ nop -/* D3AD9C 802407CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80240884_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80240884_D3A5D0.s deleted file mode 100644 index 41570ea6e1..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80240884_D3A5D0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240884_D3AE54 -/* D3AE54 80240884 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3AE58 80240888 AFB00010 */ sw $s0, 0x10($sp) -/* D3AE5C 8024088C 0080802D */ daddu $s0, $a0, $zero -/* D3AE60 80240890 AFBF0018 */ sw $ra, 0x18($sp) -/* D3AE64 80240894 AFB10014 */ sw $s1, 0x14($sp) -/* D3AE68 80240898 8E02000C */ lw $v0, 0xc($s0) -/* D3AE6C 8024089C 8C510000 */ lw $s1, ($v0) -/* D3AE70 802408A0 0C0B1EAF */ jal get_variable -/* D3AE74 802408A4 0220282D */ daddu $a1, $s1, $zero -/* D3AE78 802408A8 3C03FFF0 */ lui $v1, 0xfff0 -/* D3AE7C 802408AC 3463FFFF */ ori $v1, $v1, 0xffff -/* D3AE80 802408B0 0200202D */ daddu $a0, $s0, $zero -/* D3AE84 802408B4 00431024 */ and $v0, $v0, $v1 -/* D3AE88 802408B8 00021140 */ sll $v0, $v0, 5 -/* D3AE8C 802408BC 3C068008 */ lui $a2, %hi(gItemTable) -/* D3AE90 802408C0 00C23021 */ addu $a2, $a2, $v0 -/* D3AE94 802408C4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D3AE98 802408C8 0C0B2026 */ jal set_variable -/* D3AE9C 802408CC 0220282D */ daddu $a1, $s1, $zero -/* D3AEA0 802408D0 8FBF0018 */ lw $ra, 0x18($sp) -/* D3AEA4 802408D4 8FB10014 */ lw $s1, 0x14($sp) -/* D3AEA8 802408D8 8FB00010 */ lw $s0, 0x10($sp) -/* D3AEAC 802408DC 24020002 */ addiu $v0, $zero, 2 -/* D3AEB0 802408E0 03E00008 */ jr $ra -/* D3AEB4 802408E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_802408E8_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_802408E8_D3A5D0.s deleted file mode 100644 index 8b351f5459..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_802408E8_D3A5D0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408E8_D3AEB8 -/* D3AEB8 802408E8 24020001 */ addiu $v0, $zero, 1 -/* D3AEBC 802408EC 3C018015 */ lui $at, %hi(D_80151310) -/* D3AEC0 802408F0 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* D3AEC4 802408F4 03E00008 */ jr $ra -/* D3AEC8 802408F8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_802408FC_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_802408FC_D3A5D0.s deleted file mode 100644 index 602720afe0..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_802408FC_D3A5D0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408FC_D3AECC -/* D3AECC 802408FC 3C018015 */ lui $at, %hi(D_80151310) -/* D3AED0 80240900 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* D3AED4 80240904 03E00008 */ jr $ra -/* D3AED8 80240908 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80240B30_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80240B30_D3A5D0.s deleted file mode 100644 index 6158341e25..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80240B30_D3A5D0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B30_D3B100 -/* D3B100 80240B30 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3B104 80240B34 AFBF0014 */ sw $ra, 0x14($sp) -/* D3B108 80240B38 AFB00010 */ sw $s0, 0x10($sp) -/* D3B10C 80240B3C 0C00EABB */ jal get_npc_unsafe -/* D3B110 80240B40 8C84014C */ lw $a0, 0x14c($a0) -/* D3B114 80240B44 24040008 */ addiu $a0, $zero, 8 -/* D3B118 80240B48 0040802D */ daddu $s0, $v0, $zero -/* D3B11C 80240B4C 3C028024 */ lui $v0, 0x8024 -/* D3B120 80240B50 24420B9C */ addiu $v0, $v0, 0xb9c -/* D3B124 80240B54 0C00AB39 */ jal heap_malloc -/* D3B128 80240B58 AE020008 */ sw $v0, 8($s0) -/* D3B12C 80240B5C 0040182D */ daddu $v1, $v0, $zero -/* D3B130 80240B60 AE030020 */ sw $v1, 0x20($s0) -/* D3B134 80240B64 AC600000 */ sw $zero, ($v1) -/* D3B138 80240B68 8FBF0014 */ lw $ra, 0x14($sp) -/* D3B13C 80240B6C 8FB00010 */ lw $s0, 0x10($sp) -/* D3B140 80240B70 24020001 */ addiu $v0, $zero, 1 -/* D3B144 80240B74 03E00008 */ jr $ra -/* D3B148 80240B78 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80240B9C_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80240B9C_D3A5D0.s deleted file mode 100644 index 1d2163a0f6..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80240B9C_D3A5D0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B9C_D3B16C -/* D3B16C 80240B9C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3B170 80240BA0 3C03800A */ lui $v1, 0x800a -/* D3B174 80240BA4 8463A634 */ lh $v1, -0x59cc($v1) -/* D3B178 80240BA8 3C05800B */ lui $a1, %hi(gCameras) -/* D3B17C 80240BAC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* D3B180 80240BB0 AFBF0010 */ sw $ra, 0x10($sp) -/* D3B184 80240BB4 00031080 */ sll $v0, $v1, 2 -/* D3B188 80240BB8 00431021 */ addu $v0, $v0, $v1 -/* D3B18C 80240BBC 00021080 */ sll $v0, $v0, 2 -/* D3B190 80240BC0 00431023 */ subu $v0, $v0, $v1 -/* D3B194 80240BC4 000218C0 */ sll $v1, $v0, 3 -/* D3B198 80240BC8 00431021 */ addu $v0, $v0, $v1 -/* D3B19C 80240BCC 8C830020 */ lw $v1, 0x20($a0) -/* D3B1A0 80240BD0 000210C0 */ sll $v0, $v0, 3 -/* D3B1A4 80240BD4 8C630000 */ lw $v1, ($v1) -/* D3B1A8 80240BD8 30630001 */ andi $v1, $v1, 1 -/* D3B1AC 80240BDC 10600004 */ beqz $v1, .L80240BF0 -/* D3B1B0 80240BE0 00451021 */ addu $v0, $v0, $a1 -/* D3B1B4 80240BE4 C44C006C */ lwc1 $f12, 0x6c($v0) -/* D3B1B8 80240BE8 0C00A6C9 */ jal clamp_angle -/* D3B1BC 80240BEC 46006307 */ neg.s $f12, $f12 -.L80240BF0: -/* D3B1C0 80240BF0 8FBF0010 */ lw $ra, 0x10($sp) -/* D3B1C4 80240BF4 03E00008 */ jr $ra -/* D3B1C8 80240BF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80240BFC_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80240BFC_D3A5D0.s deleted file mode 100644 index 552332fbf0..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80240BFC_D3A5D0.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BFC_D3B1CC -/* D3B1CC 80240BFC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D3B1D0 80240C00 AFB10014 */ sw $s1, 0x14($sp) -/* D3B1D4 80240C04 0080882D */ daddu $s1, $a0, $zero -/* D3B1D8 80240C08 AFBF0024 */ sw $ra, 0x24($sp) -/* D3B1DC 80240C0C AFB40020 */ sw $s4, 0x20($sp) -/* D3B1E0 80240C10 AFB3001C */ sw $s3, 0x1c($sp) -/* D3B1E4 80240C14 AFB20018 */ sw $s2, 0x18($sp) -/* D3B1E8 80240C18 10A00033 */ beqz $a1, .L80240CE8 -/* D3B1EC 80240C1C AFB00010 */ sw $s0, 0x10($sp) -/* D3B1F0 80240C20 0C04760B */ jal func_8011D82C -/* D3B1F4 80240C24 24040001 */ addiu $a0, $zero, 1 -/* D3B1F8 80240C28 0000202D */ daddu $a0, $zero, $zero -/* D3B1FC 80240C2C 0080282D */ daddu $a1, $a0, $zero -/* D3B200 80240C30 0080302D */ daddu $a2, $a0, $zero -/* D3B204 80240C34 0080382D */ daddu $a3, $a0, $zero -/* D3B208 80240C38 0080802D */ daddu $s0, $a0, $zero -/* D3B20C 80240C3C 2414FFFC */ addiu $s4, $zero, -4 -/* D3B210 80240C40 24130011 */ addiu $s3, $zero, 0x11 -/* D3B214 80240C44 3C120080 */ lui $s2, 0x80 -/* D3B218 80240C48 3C038015 */ lui $v1, 0x8015 -/* D3B21C 80240C4C 8C6312F0 */ lw $v1, 0x12f0($v1) -/* D3B220 80240C50 24020001 */ addiu $v0, $zero, 1 -/* D3B224 80240C54 0C046F97 */ jal set_background_color_blend -/* D3B228 80240C58 A0620000 */ sb $v0, ($v1) -.L80240C5C: -/* D3B22C 80240C5C 0C00E2B7 */ jal get_npc_by_index -/* D3B230 80240C60 0200202D */ daddu $a0, $s0, $zero -/* D3B234 80240C64 0040202D */ daddu $a0, $v0, $zero -/* D3B238 80240C68 5080000B */ beql $a0, $zero, .L80240C98 -/* D3B23C 80240C6C 26100001 */ addiu $s0, $s0, 1 -/* D3B240 80240C70 8C820000 */ lw $v0, ($a0) -/* D3B244 80240C74 50400008 */ beql $v0, $zero, .L80240C98 -/* D3B248 80240C78 26100001 */ addiu $s0, $s0, 1 -/* D3B24C 80240C7C 808300A4 */ lb $v1, 0xa4($a0) -/* D3B250 80240C80 10740005 */ beq $v1, $s4, .L80240C98 -/* D3B254 80240C84 26100001 */ addiu $s0, $s0, 1 -/* D3B258 80240C88 10730003 */ beq $v1, $s3, .L80240C98 -/* D3B25C 80240C8C 00000000 */ nop -/* D3B260 80240C90 00521025 */ or $v0, $v0, $s2 -/* D3B264 80240C94 AC820000 */ sw $v0, ($a0) -.L80240C98: -/* D3B268 80240C98 2A020040 */ slti $v0, $s0, 0x40 -/* D3B26C 80240C9C 1440FFEF */ bnez $v0, .L80240C5C -/* D3B270 80240CA0 00000000 */ nop -/* D3B274 80240CA4 0000802D */ daddu $s0, $zero, $zero -/* D3B278 80240CA8 3C120800 */ lui $s2, 0x800 -.L80240CAC: -/* D3B27C 80240CAC 0C04C3D6 */ jal get_item_entity -/* D3B280 80240CB0 0200202D */ daddu $a0, $s0, $zero -/* D3B284 80240CB4 0040182D */ daddu $v1, $v0, $zero -/* D3B288 80240CB8 10600007 */ beqz $v1, .L80240CD8 -/* D3B28C 80240CBC 26100001 */ addiu $s0, $s0, 1 -/* D3B290 80240CC0 8C640000 */ lw $a0, ($v1) -/* D3B294 80240CC4 30820010 */ andi $v0, $a0, 0x10 -/* D3B298 80240CC8 10400003 */ beqz $v0, .L80240CD8 -/* D3B29C 80240CCC 00000000 */ nop -/* D3B2A0 80240CD0 00921025 */ or $v0, $a0, $s2 -/* D3B2A4 80240CD4 AC620000 */ sw $v0, ($v1) -.L80240CD8: -/* D3B2A8 80240CD8 2A020100 */ slti $v0, $s0, 0x100 -/* D3B2AC 80240CDC 1440FFF3 */ bnez $v0, .L80240CAC -/* D3B2B0 80240CE0 00000000 */ nop -/* D3B2B4 80240CE4 AE200070 */ sw $zero, 0x70($s1) -.L80240CE8: -/* D3B2B8 80240CE8 8E220070 */ lw $v0, 0x70($s1) -/* D3B2BC 80240CEC 24420008 */ addiu $v0, $v0, 8 -/* D3B2C0 80240CF0 AE220070 */ sw $v0, 0x70($s1) -/* D3B2C4 80240CF4 28420100 */ slti $v0, $v0, 0x100 -/* D3B2C8 80240CF8 14400003 */ bnez $v0, .L80240D08 -/* D3B2CC 80240CFC 0000202D */ daddu $a0, $zero, $zero -/* D3B2D0 80240D00 240200FF */ addiu $v0, $zero, 0xff -/* D3B2D4 80240D04 AE220070 */ sw $v0, 0x70($s1) -.L80240D08: -/* D3B2D8 80240D08 0080282D */ daddu $a1, $a0, $zero -/* D3B2DC 80240D0C 92270073 */ lbu $a3, 0x73($s1) -/* D3B2E0 80240D10 0C046F97 */ jal set_background_color_blend -/* D3B2E4 80240D14 0080302D */ daddu $a2, $a0, $zero -/* D3B2E8 80240D18 8E220070 */ lw $v0, 0x70($s1) -/* D3B2EC 80240D1C 8FBF0024 */ lw $ra, 0x24($sp) -/* D3B2F0 80240D20 8FB40020 */ lw $s4, 0x20($sp) -/* D3B2F4 80240D24 8FB3001C */ lw $s3, 0x1c($sp) -/* D3B2F8 80240D28 8FB20018 */ lw $s2, 0x18($sp) -/* D3B2FC 80240D2C 8FB10014 */ lw $s1, 0x14($sp) -/* D3B300 80240D30 8FB00010 */ lw $s0, 0x10($sp) -/* D3B304 80240D34 384200FF */ xori $v0, $v0, 0xff -/* D3B308 80240D38 2C420001 */ sltiu $v0, $v0, 1 -/* D3B30C 80240D3C 00021040 */ sll $v0, $v0, 1 -/* D3B310 80240D40 03E00008 */ jr $ra -/* D3B314 80240D44 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80240D48_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80240D48_D3A5D0.s deleted file mode 100644 index 3475747959..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80240D48_D3A5D0.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D48_D3B318 -/* D3B318 80240D48 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D3B31C 80240D4C AFB00010 */ sw $s0, 0x10($sp) -/* D3B320 80240D50 0080802D */ daddu $s0, $a0, $zero -/* D3B324 80240D54 AFBF0020 */ sw $ra, 0x20($sp) -/* D3B328 80240D58 AFB3001C */ sw $s3, 0x1c($sp) -/* D3B32C 80240D5C AFB20018 */ sw $s2, 0x18($sp) -/* D3B330 80240D60 10A00009 */ beqz $a1, .L80240D88 -/* D3B334 80240D64 AFB10014 */ sw $s1, 0x14($sp) -/* D3B338 80240D68 0000202D */ daddu $a0, $zero, $zero -/* D3B33C 80240D6C 0080282D */ daddu $a1, $a0, $zero -/* D3B340 80240D70 0080302D */ daddu $a2, $a0, $zero -/* D3B344 80240D74 0C046F97 */ jal set_background_color_blend -/* D3B348 80240D78 240700FF */ addiu $a3, $zero, 0xff -/* D3B34C 80240D7C 240200FF */ addiu $v0, $zero, 0xff -/* D3B350 80240D80 AE020070 */ sw $v0, 0x70($s0) -/* D3B354 80240D84 AE000074 */ sw $zero, 0x74($s0) -.L80240D88: -/* D3B358 80240D88 8E020070 */ lw $v0, 0x70($s0) -/* D3B35C 80240D8C 2442FFF8 */ addiu $v0, $v0, -8 -/* D3B360 80240D90 04410002 */ bgez $v0, .L80240D9C -/* D3B364 80240D94 AE020070 */ sw $v0, 0x70($s0) -/* D3B368 80240D98 AE000070 */ sw $zero, 0x70($s0) -.L80240D9C: -/* D3B36C 80240D9C 0000202D */ daddu $a0, $zero, $zero -/* D3B370 80240DA0 0080282D */ daddu $a1, $a0, $zero -/* D3B374 80240DA4 92070073 */ lbu $a3, 0x73($s0) -/* D3B378 80240DA8 0C046F97 */ jal set_background_color_blend -/* D3B37C 80240DAC 0080302D */ daddu $a2, $a0, $zero -/* D3B380 80240DB0 8E020070 */ lw $v0, 0x70($s0) -/* D3B384 80240DB4 14400006 */ bnez $v0, .L80240DD0 -/* D3B388 80240DB8 00000000 */ nop -/* D3B38C 80240DBC 8E020074 */ lw $v0, 0x74($s0) -/* D3B390 80240DC0 14400003 */ bnez $v0, .L80240DD0 -/* D3B394 80240DC4 24020001 */ addiu $v0, $zero, 1 -/* D3B398 80240DC8 080903A7 */ j .L80240E9C -/* D3B39C 80240DCC AE020074 */ sw $v0, 0x74($s0) -.L80240DD0: -/* D3B3A0 80240DD0 8E030074 */ lw $v1, 0x74($s0) -/* D3B3A4 80240DD4 24020001 */ addiu $v0, $zero, 1 -/* D3B3A8 80240DD8 14620031 */ bne $v1, $v0, .L80240EA0 -/* D3B3AC 80240DDC 0000102D */ daddu $v0, $zero, $zero -/* D3B3B0 80240DE0 0C04760B */ jal func_8011D82C -/* D3B3B4 80240DE4 0000202D */ daddu $a0, $zero, $zero -/* D3B3B8 80240DE8 0000802D */ daddu $s0, $zero, $zero -/* D3B3BC 80240DEC 2413FFFC */ addiu $s3, $zero, -4 -/* D3B3C0 80240DF0 24120011 */ addiu $s2, $zero, 0x11 -/* D3B3C4 80240DF4 3C11FF7F */ lui $s1, 0xff7f -/* D3B3C8 80240DF8 3C028015 */ lui $v0, 0x8015 -/* D3B3CC 80240DFC 8C4212F0 */ lw $v0, 0x12f0($v0) -/* D3B3D0 80240E00 3631FFFF */ ori $s1, $s1, 0xffff -/* D3B3D4 80240E04 A0400000 */ sb $zero, ($v0) -.L80240E08: -/* D3B3D8 80240E08 0C00E2B7 */ jal get_npc_by_index -/* D3B3DC 80240E0C 0200202D */ daddu $a0, $s0, $zero -/* D3B3E0 80240E10 0040202D */ daddu $a0, $v0, $zero -/* D3B3E4 80240E14 5080000B */ beql $a0, $zero, .L80240E44 -/* D3B3E8 80240E18 26100001 */ addiu $s0, $s0, 1 -/* D3B3EC 80240E1C 8C820000 */ lw $v0, ($a0) -/* D3B3F0 80240E20 50400008 */ beql $v0, $zero, .L80240E44 -/* D3B3F4 80240E24 26100001 */ addiu $s0, $s0, 1 -/* D3B3F8 80240E28 808300A4 */ lb $v1, 0xa4($a0) -/* D3B3FC 80240E2C 10730005 */ beq $v1, $s3, .L80240E44 -/* D3B400 80240E30 26100001 */ addiu $s0, $s0, 1 -/* D3B404 80240E34 10720003 */ beq $v1, $s2, .L80240E44 -/* D3B408 80240E38 00000000 */ nop -/* D3B40C 80240E3C 00511024 */ and $v0, $v0, $s1 -/* D3B410 80240E40 AC820000 */ sw $v0, ($a0) -.L80240E44: -/* D3B414 80240E44 2A020040 */ slti $v0, $s0, 0x40 -/* D3B418 80240E48 1440FFEF */ bnez $v0, .L80240E08 -/* D3B41C 80240E4C 00000000 */ nop -/* D3B420 80240E50 0000802D */ daddu $s0, $zero, $zero -/* D3B424 80240E54 3C11F7FF */ lui $s1, 0xf7ff -/* D3B428 80240E58 3631FFFF */ ori $s1, $s1, 0xffff -.L80240E5C: -/* D3B42C 80240E5C 0C04C3D6 */ jal get_item_entity -/* D3B430 80240E60 0200202D */ daddu $a0, $s0, $zero -/* D3B434 80240E64 0040182D */ daddu $v1, $v0, $zero -/* D3B438 80240E68 10600007 */ beqz $v1, .L80240E88 -/* D3B43C 80240E6C 26100001 */ addiu $s0, $s0, 1 -/* D3B440 80240E70 8C640000 */ lw $a0, ($v1) -/* D3B444 80240E74 30820010 */ andi $v0, $a0, 0x10 -/* D3B448 80240E78 10400003 */ beqz $v0, .L80240E88 -/* D3B44C 80240E7C 00000000 */ nop -/* D3B450 80240E80 00911024 */ and $v0, $a0, $s1 -/* D3B454 80240E84 AC620000 */ sw $v0, ($v1) -.L80240E88: -/* D3B458 80240E88 2A020100 */ slti $v0, $s0, 0x100 -/* D3B45C 80240E8C 1440FFF3 */ bnez $v0, .L80240E5C -/* D3B460 80240E90 24020002 */ addiu $v0, $zero, 2 -/* D3B464 80240E94 080903A8 */ j .L80240EA0 -/* D3B468 80240E98 00000000 */ nop -.L80240E9C: -/* D3B46C 80240E9C 0000102D */ daddu $v0, $zero, $zero -.L80240EA0: -/* D3B470 80240EA0 8FBF0020 */ lw $ra, 0x20($sp) -/* D3B474 80240EA4 8FB3001C */ lw $s3, 0x1c($sp) -/* D3B478 80240EA8 8FB20018 */ lw $s2, 0x18($sp) -/* D3B47C 80240EAC 8FB10014 */ lw $s1, 0x14($sp) -/* D3B480 80240EB0 8FB00010 */ lw $s0, 0x10($sp) -/* D3B484 80240EB4 03E00008 */ jr $ra -/* D3B488 80240EB8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80240EBC_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80240EBC_D3A5D0.s deleted file mode 100644 index 90aa8e6fdb..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80240EBC_D3A5D0.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EBC_D3B48C -/* D3B48C 80240EBC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3B490 80240EC0 AFB00010 */ sw $s0, 0x10($sp) -/* D3B494 80240EC4 3C108011 */ lui $s0, %hi(gPlayerData) -/* D3B498 80240EC8 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* D3B49C 80240ECC AFBF0018 */ sw $ra, 0x18($sp) -/* D3B4A0 80240ED0 AFB10014 */ sw $s1, 0x14($sp) -/* D3B4A4 80240ED4 960302C0 */ lhu $v1, 0x2c0($s0) -/* D3B4A8 80240ED8 2C6203E7 */ sltiu $v0, $v1, 0x3e7 -/* D3B4AC 80240EDC 10400003 */ beqz $v0, .L80240EEC -/* D3B4B0 80240EE0 0080882D */ daddu $s1, $a0, $zero -/* D3B4B4 80240EE4 24620001 */ addiu $v0, $v1, 1 -/* D3B4B8 80240EE8 A60202C0 */ sh $v0, 0x2c0($s0) -.L80240EEC: -/* D3B4BC 80240EEC 3C05F5DE */ lui $a1, 0xf5de -/* D3B4C0 80240EF0 34A502E0 */ ori $a1, $a1, 0x2e0 -/* D3B4C4 80240EF4 0C0B1EAF */ jal get_variable -/* D3B4C8 80240EF8 0000202D */ daddu $a0, $zero, $zero -/* D3B4CC 80240EFC 3C038024 */ lui $v1, 0x8024 -/* D3B4D0 80240F00 00621821 */ addu $v1, $v1, $v0 -/* D3B4D4 80240F04 90634FDC */ lbu $v1, 0x4fdc($v1) -/* D3B4D8 80240F08 8E220084 */ lw $v0, 0x84($s1) -/* D3B4DC 80240F0C 54430006 */ bnel $v0, $v1, .L80240F28 -/* D3B4E0 80240F10 AE200084 */ sw $zero, 0x84($s1) -/* D3B4E4 80240F14 24020001 */ addiu $v0, $zero, 1 -/* D3B4E8 80240F18 AE220084 */ sw $v0, 0x84($s1) -/* D3B4EC 80240F1C 960202C2 */ lhu $v0, 0x2c2($s0) -/* D3B4F0 80240F20 24420001 */ addiu $v0, $v0, 1 -/* D3B4F4 80240F24 A60202C2 */ sh $v0, 0x2c2($s0) -.L80240F28: -/* D3B4F8 80240F28 8FBF0018 */ lw $ra, 0x18($sp) -/* D3B4FC 80240F2C 8FB10014 */ lw $s1, 0x14($sp) -/* D3B500 80240F30 8FB00010 */ lw $s0, 0x10($sp) -/* D3B504 80240F34 24020002 */ addiu $v0, $zero, 2 -/* D3B508 80240F38 03E00008 */ jr $ra -/* D3B50C 80240F3C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80240F40_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80240F40_D3A5D0.s deleted file mode 100644 index ef4c1b93c6..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80240F40_D3A5D0.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F40_D3B510 -/* D3B510 80240F40 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* D3B514 80240F44 AFB1001C */ sw $s1, 0x1c($sp) -/* D3B518 80240F48 AFBF0020 */ sw $ra, 0x20($sp) -/* D3B51C 80240F4C AFB00018 */ sw $s0, 0x18($sp) -/* D3B520 80240F50 F7B60030 */ sdc1 $f22, 0x30($sp) -/* D3B524 80240F54 F7B40028 */ sdc1 $f20, 0x28($sp) -/* D3B528 80240F58 10A00060 */ beqz $a1, .L802410DC -/* D3B52C 80240F5C 0080882D */ daddu $s1, $a0, $zero -/* D3B530 80240F60 3C05F4AC */ lui $a1, 0xf4ac -/* D3B534 80240F64 0C0B1EAF */ jal get_variable -/* D3B538 80240F68 34A5D481 */ ori $a1, $a1, 0xd481 -/* D3B53C 80240F6C 0220202D */ daddu $a0, $s1, $zero -/* D3B540 80240F70 3C05F4AC */ lui $a1, 0xf4ac -/* D3B544 80240F74 4482B000 */ mtc1 $v0, $f22 -/* D3B548 80240F78 00000000 */ nop -/* D3B54C 80240F7C 4680B5A0 */ cvt.s.w $f22, $f22 -/* D3B550 80240F80 0C0B1EAF */ jal get_variable -/* D3B554 80240F84 34A5D482 */ ori $a1, $a1, 0xd482 -/* D3B558 80240F88 0220202D */ daddu $a0, $s1, $zero -/* D3B55C 80240F8C 3C05F4AC */ lui $a1, 0xf4ac -/* D3B560 80240F90 4482A000 */ mtc1 $v0, $f20 -/* D3B564 80240F94 00000000 */ nop -/* D3B568 80240F98 4680A520 */ cvt.s.w $f20, $f20 -/* D3B56C 80240F9C 0C0B1EAF */ jal get_variable -/* D3B570 80240FA0 34A5D483 */ ori $a1, $a1, 0xd483 -/* D3B574 80240FA4 44821000 */ mtc1 $v0, $f2 -/* D3B578 80240FA8 00000000 */ nop -/* D3B57C 80240FAC 468010A0 */ cvt.s.w $f2, $f2 -/* D3B580 80240FB0 4405B000 */ mfc1 $a1, $f22 -/* D3B584 80240FB4 4406A000 */ mfc1 $a2, $f20 -/* D3B588 80240FB8 44071000 */ mfc1 $a3, $f2 -/* D3B58C 80240FBC 0C01C574 */ jal func_800715D0 -/* D3B590 80240FC0 0000202D */ daddu $a0, $zero, $zero -/* D3B594 80240FC4 0220202D */ daddu $a0, $s1, $zero -/* D3B598 80240FC8 3C05F4AC */ lui $a1, 0xf4ac -/* D3B59C 80240FCC 34A5D481 */ ori $a1, $a1, 0xd481 -/* D3B5A0 80240FD0 3C108025 */ lui $s0, 0x8025 -/* D3B5A4 80240FD4 26101470 */ addiu $s0, $s0, 0x1470 -/* D3B5A8 80240FD8 0C0B1EAF */ jal get_variable -/* D3B5AC 80240FDC AE020000 */ sw $v0, ($s0) -/* D3B5B0 80240FE0 0220202D */ daddu $a0, $s1, $zero -/* D3B5B4 80240FE4 3C05F4AC */ lui $a1, 0xf4ac -/* D3B5B8 80240FE8 4482B000 */ mtc1 $v0, $f22 -/* D3B5BC 80240FEC 00000000 */ nop -/* D3B5C0 80240FF0 4680B5A0 */ cvt.s.w $f22, $f22 -/* D3B5C4 80240FF4 0C0B1EAF */ jal get_variable -/* D3B5C8 80240FF8 34A5D482 */ ori $a1, $a1, 0xd482 -/* D3B5CC 80240FFC 0220202D */ daddu $a0, $s1, $zero -/* D3B5D0 80241000 3C05F4AC */ lui $a1, 0xf4ac -/* D3B5D4 80241004 4482A000 */ mtc1 $v0, $f20 -/* D3B5D8 80241008 00000000 */ nop -/* D3B5DC 8024100C 4680A520 */ cvt.s.w $f20, $f20 -/* D3B5E0 80241010 0C0B1EAF */ jal get_variable -/* D3B5E4 80241014 34A5D483 */ ori $a1, $a1, 0xd483 -/* D3B5E8 80241018 44821000 */ mtc1 $v0, $f2 -/* D3B5EC 8024101C 00000000 */ nop -/* D3B5F0 80241020 468010A0 */ cvt.s.w $f2, $f2 -/* D3B5F4 80241024 4405B000 */ mfc1 $a1, $f22 -/* D3B5F8 80241028 4406A000 */ mfc1 $a2, $f20 -/* D3B5FC 8024102C 44071000 */ mfc1 $a3, $f2 -/* D3B600 80241030 0C01C604 */ jal func_80071810 -/* D3B604 80241034 0000202D */ daddu $a0, $zero, $zero -/* D3B608 80241038 0220202D */ daddu $a0, $s1, $zero -/* D3B60C 8024103C 3C05F4AC */ lui $a1, 0xf4ac -/* D3B610 80241040 3C018025 */ lui $at, 0x8025 -/* D3B614 80241044 AC221474 */ sw $v0, 0x1474($at) -/* D3B618 80241048 0C0B1EAF */ jal get_variable -/* D3B61C 8024104C 34A5D481 */ ori $a1, $a1, 0xd481 -/* D3B620 80241050 0220202D */ daddu $a0, $s1, $zero -/* D3B624 80241054 3C05F4AC */ lui $a1, 0xf4ac -/* D3B628 80241058 4482B000 */ mtc1 $v0, $f22 -/* D3B62C 8024105C 00000000 */ nop -/* D3B630 80241060 4680B5A0 */ cvt.s.w $f22, $f22 -/* D3B634 80241064 0C0B1EAF */ jal get_variable -/* D3B638 80241068 34A5D482 */ ori $a1, $a1, 0xd482 -/* D3B63C 8024106C 0220202D */ daddu $a0, $s1, $zero -/* D3B640 80241070 3C05F4AC */ lui $a1, 0xf4ac -/* D3B644 80241074 4482A000 */ mtc1 $v0, $f20 -/* D3B648 80241078 00000000 */ nop -/* D3B64C 8024107C 4680A520 */ cvt.s.w $f20, $f20 -/* D3B650 80241080 0C0B1EAF */ jal get_variable -/* D3B654 80241084 34A5D483 */ ori $a1, $a1, 0xd483 -/* D3B658 80241088 44821000 */ mtc1 $v0, $f2 -/* D3B65C 8024108C 00000000 */ nop -/* D3B660 80241090 468010A0 */ cvt.s.w $f2, $f2 -/* D3B664 80241094 4405B000 */ mfc1 $a1, $f22 -/* D3B668 80241098 4406A000 */ mfc1 $a2, $f20 -/* D3B66C 8024109C 3C013F80 */ lui $at, 0x3f80 -/* D3B670 802410A0 44810000 */ mtc1 $at, $f0 -/* D3B674 802410A4 44071000 */ mfc1 $a3, $f2 -/* D3B678 802410A8 0000202D */ daddu $a0, $zero, $zero -/* D3B67C 802410AC AFA00014 */ sw $zero, 0x14($sp) -/* D3B680 802410B0 0C01CA24 */ jal func_80072890 -/* D3B684 802410B4 E7A00010 */ swc1 $f0, 0x10($sp) -/* D3B688 802410B8 8E030000 */ lw $v1, ($s0) -/* D3B68C 802410BC 8C64000C */ lw $a0, 0xc($v1) -/* D3B690 802410C0 3C018025 */ lui $at, 0x8025 -/* D3B694 802410C4 AC221478 */ sw $v0, 0x1478($at) -/* D3B698 802410C8 AC800018 */ sw $zero, 0x18($a0) -/* D3B69C 802410CC AC800020 */ sw $zero, 0x20($a0) -/* D3B6A0 802410D0 AC800024 */ sw $zero, 0x24($a0) -/* D3B6A4 802410D4 AC800028 */ sw $zero, 0x28($a0) -/* D3B6A8 802410D8 AC80001C */ sw $zero, 0x1c($a0) -.L802410DC: -/* D3B6AC 802410DC 3C028025 */ lui $v0, 0x8025 -/* D3B6B0 802410E0 8C421470 */ lw $v0, 0x1470($v0) -/* D3B6B4 802410E4 8C44000C */ lw $a0, 0xc($v0) -/* D3B6B8 802410E8 8C820020 */ lw $v0, 0x20($a0) -/* D3B6BC 802410EC 8C830028 */ lw $v1, 0x28($a0) -/* D3B6C0 802410F0 2442000A */ addiu $v0, $v0, 0xa -/* D3B6C4 802410F4 AC820020 */ sw $v0, 0x20($a0) -/* D3B6C8 802410F8 8C820024 */ lw $v0, 0x24($a0) -/* D3B6CC 802410FC 2463000A */ addiu $v1, $v1, 0xa -/* D3B6D0 80241100 AC830028 */ sw $v1, 0x28($a0) -/* D3B6D4 80241104 8C830018 */ lw $v1, 0x18($a0) -/* D3B6D8 80241108 2442000A */ addiu $v0, $v0, 0xa -/* D3B6DC 8024110C AC820024 */ sw $v0, 0x24($a0) -/* D3B6E0 80241110 8C82001C */ lw $v0, 0x1c($a0) -/* D3B6E4 80241114 2463000A */ addiu $v1, $v1, 0xa -/* D3B6E8 80241118 AC830018 */ sw $v1, 0x18($a0) -/* D3B6EC 8024111C 286300FF */ slti $v1, $v1, 0xff -/* D3B6F0 80241120 2442000A */ addiu $v0, $v0, 0xa -/* D3B6F4 80241124 AC82001C */ sw $v0, 0x1c($a0) -/* D3B6F8 80241128 14600004 */ bnez $v1, .L8024113C -/* D3B6FC 8024112C 0000102D */ daddu $v0, $zero, $zero -/* D3B700 80241130 240200FF */ addiu $v0, $zero, 0xff -/* D3B704 80241134 AC820018 */ sw $v0, 0x18($a0) -/* D3B708 80241138 24020002 */ addiu $v0, $zero, 2 -.L8024113C: -/* D3B70C 8024113C 8FBF0020 */ lw $ra, 0x20($sp) -/* D3B710 80241140 8FB1001C */ lw $s1, 0x1c($sp) -/* D3B714 80241144 8FB00018 */ lw $s0, 0x18($sp) -/* D3B718 80241148 D7B60030 */ ldc1 $f22, 0x30($sp) -/* D3B71C 8024114C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D3B720 80241150 03E00008 */ jr $ra -/* D3B724 80241154 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80241158_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80241158_D3A5D0.s deleted file mode 100644 index 91b0c9beb3..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80241158_D3A5D0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241158_D3B728 -/* D3B728 80241158 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3B72C 8024115C 10A0000B */ beqz $a1, .L8024118C -/* D3B730 80241160 AFBF0010 */ sw $ra, 0x10($sp) -/* D3B734 80241164 3C038025 */ lui $v1, 0x8025 -/* D3B738 80241168 8C631474 */ lw $v1, 0x1474($v1) -/* D3B73C 8024116C 8C620000 */ lw $v0, ($v1) -/* D3B740 80241170 3C048025 */ lui $a0, 0x8025 -/* D3B744 80241174 8C841478 */ lw $a0, 0x1478($a0) -/* D3B748 80241178 34420010 */ ori $v0, $v0, 0x10 -/* D3B74C 8024117C AC620000 */ sw $v0, ($v1) -/* D3B750 80241180 8C820000 */ lw $v0, ($a0) -/* D3B754 80241184 34420010 */ ori $v0, $v0, 0x10 -/* D3B758 80241188 AC820000 */ sw $v0, ($a0) -.L8024118C: -/* D3B75C 8024118C 3C048025 */ lui $a0, 0x8025 -/* D3B760 80241190 8C841470 */ lw $a0, 0x1470($a0) -/* D3B764 80241194 8C85000C */ lw $a1, 0xc($a0) -/* D3B768 80241198 8CA20018 */ lw $v0, 0x18($a1) -/* D3B76C 8024119C 8CA30020 */ lw $v1, 0x20($a1) -/* D3B770 802411A0 2442FFF6 */ addiu $v0, $v0, -0xa -/* D3B774 802411A4 ACA20018 */ sw $v0, 0x18($a1) -/* D3B778 802411A8 8CA20024 */ lw $v0, 0x24($a1) -/* D3B77C 802411AC 2463FFF6 */ addiu $v1, $v1, -0xa -/* D3B780 802411B0 ACA30020 */ sw $v1, 0x20($a1) -/* D3B784 802411B4 8CA30028 */ lw $v1, 0x28($a1) -/* D3B788 802411B8 2442FFF6 */ addiu $v0, $v0, -0xa -/* D3B78C 802411BC ACA20024 */ sw $v0, 0x24($a1) -/* D3B790 802411C0 8CA2001C */ lw $v0, 0x1c($a1) -/* D3B794 802411C4 2463FFF6 */ addiu $v1, $v1, -0xa -/* D3B798 802411C8 ACA30028 */ sw $v1, 0x28($a1) -/* D3B79C 802411CC 8CA30018 */ lw $v1, 0x18($a1) -/* D3B7A0 802411D0 2442FFF6 */ addiu $v0, $v0, -0xa -/* D3B7A4 802411D4 18600003 */ blez $v1, .L802411E4 -/* D3B7A8 802411D8 ACA2001C */ sw $v0, 0x1c($a1) -/* D3B7AC 802411DC 08090480 */ j .L80241200 -/* D3B7B0 802411E0 0000102D */ daddu $v0, $zero, $zero -.L802411E4: -/* D3B7B4 802411E4 0C016914 */ jal remove_effect -/* D3B7B8 802411E8 ACA00018 */ sw $zero, 0x18($a1) -/* D3B7BC 802411EC 3C048025 */ lui $a0, 0x8025 -/* D3B7C0 802411F0 8C841450 */ lw $a0, 0x1450($a0) -/* D3B7C4 802411F4 0C048D70 */ jal func_801235C0 -/* D3B7C8 802411F8 00000000 */ nop -/* D3B7CC 802411FC 24020002 */ addiu $v0, $zero, 2 -.L80241200: -/* D3B7D0 80241200 8FBF0010 */ lw $ra, 0x10($sp) -/* D3B7D4 80241204 03E00008 */ jr $ra -/* D3B7D8 80241208 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_802412C0_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_802412C0_D3A5D0.s deleted file mode 100644 index acfae4aa06..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_802412C0_D3A5D0.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412C0_D3B890 -/* D3B890 802412C0 3C028025 */ lui $v0, 0x8025 -/* D3B894 802412C4 8C421478 */ lw $v0, 0x1478($v0) -/* D3B898 802412C8 8C42000C */ lw $v0, 0xc($v0) -/* D3B89C 802412CC AC40001C */ sw $zero, 0x1c($v0) -/* D3B8A0 802412D0 03E00008 */ jr $ra -/* D3B8A4 802412D4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_802412D8_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_802412D8_D3A5D0.s deleted file mode 100644 index d6a9fd59ec..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_802412D8_D3A5D0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412D8_D3B8A8 -/* D3B8A8 802412D8 3C028025 */ lui $v0, 0x8025 -/* D3B8AC 802412DC 8C421478 */ lw $v0, 0x1478($v0) -/* D3B8B0 802412E0 8C43000C */ lw $v1, 0xc($v0) -/* D3B8B4 802412E4 24020001 */ addiu $v0, $zero, 1 -/* D3B8B8 802412E8 AC62001C */ sw $v0, 0x1c($v1) -/* D3B8BC 802412EC 03E00008 */ jr $ra -/* D3B8C0 802412F0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_802412F4_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_802412F4_D3A5D0.s deleted file mode 100644 index 1ebc073f1f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_802412F4_D3A5D0.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412F4_D3B8C4 -/* D3B8C4 802412F4 3C028025 */ lui $v0, 0x8025 -/* D3B8C8 802412F8 8C421478 */ lw $v0, 0x1478($v0) -/* D3B8CC 802412FC 8C43000C */ lw $v1, 0xc($v0) -/* D3B8D0 80241300 24020002 */ addiu $v0, $zero, 2 -/* D3B8D4 80241304 03E00008 */ jr $ra -/* D3B8D8 80241308 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_8024130C_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_8024130C_D3A5D0.s deleted file mode 100644 index 1c74a349fd..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_8024130C_D3A5D0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024130C_D3B8DC -/* D3B8DC 8024130C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3B8E0 80241310 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* D3B8E4 80241314 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* D3B8E8 80241318 3C05FE36 */ lui $a1, 0xfe36 -/* D3B8EC 8024131C AFBF0010 */ sw $ra, 0x10($sp) -/* D3B8F0 80241320 80460075 */ lb $a2, 0x75($v0) -/* D3B8F4 80241324 0C0B2026 */ jal set_variable -/* D3B8F8 80241328 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D3B8FC 8024132C 8FBF0010 */ lw $ra, 0x10($sp) -/* D3B900 80241330 24020002 */ addiu $v0, $zero, 2 -/* D3B904 80241334 03E00008 */ jr $ra -/* D3B908 80241338 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_8024133C_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_8024133C_D3A5D0.s deleted file mode 100644 index 5f6c8e24cb..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_8024133C_D3A5D0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024133C_D3B90C -/* D3B90C 8024133C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3B910 80241340 AFB10014 */ sw $s1, 0x14($sp) -/* D3B914 80241344 0080882D */ daddu $s1, $a0, $zero -/* D3B918 80241348 AFBF0018 */ sw $ra, 0x18($sp) -/* D3B91C 8024134C AFB00010 */ sw $s0, 0x10($sp) -/* D3B920 80241350 8E30000C */ lw $s0, 0xc($s1) -/* D3B924 80241354 8E050000 */ lw $a1, ($s0) -/* D3B928 80241358 0C0B1EAF */ jal get_variable -/* D3B92C 8024135C 26100004 */ addiu $s0, $s0, 4 -/* D3B930 80241360 0220202D */ daddu $a0, $s1, $zero -/* D3B934 80241364 8E050000 */ lw $a1, ($s0) -/* D3B938 80241368 0C0B210B */ jal get_float_variable -/* D3B93C 8024136C 0040802D */ daddu $s0, $v0, $zero -/* D3B940 80241370 24020002 */ addiu $v0, $zero, 2 -/* D3B944 80241374 00501804 */ sllv $v1, $s0, $v0 -/* D3B948 80241378 00701821 */ addu $v1, $v1, $s0 -/* D3B94C 8024137C 00431804 */ sllv $v1, $v1, $v0 -/* D3B950 80241380 00701823 */ subu $v1, $v1, $s0 -/* D3B954 80241384 000320C0 */ sll $a0, $v1, 3 -/* D3B958 80241388 00641821 */ addu $v1, $v1, $a0 -/* D3B95C 8024138C 000318C0 */ sll $v1, $v1, 3 -/* D3B960 80241390 3C01800B */ lui $at, 0x800b -/* D3B964 80241394 00230821 */ addu $at, $at, $v1 -/* D3B968 80241398 E4201D98 */ swc1 $f0, 0x1d98($at) -/* D3B96C 8024139C 8FBF0018 */ lw $ra, 0x18($sp) -/* D3B970 802413A0 8FB10014 */ lw $s1, 0x14($sp) -/* D3B974 802413A4 8FB00010 */ lw $s0, 0x10($sp) -/* D3B978 802413A8 03E00008 */ jr $ra -/* D3B97C 802413AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_802413B0_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_802413B0_D3A5D0.s deleted file mode 100644 index 8f479509d9..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_802413B0_D3A5D0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413B0_D3B980 -/* D3B980 802413B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3B984 802413B4 AFB10014 */ sw $s1, 0x14($sp) -/* D3B988 802413B8 0080882D */ daddu $s1, $a0, $zero -/* D3B98C 802413BC AFBF0018 */ sw $ra, 0x18($sp) -/* D3B990 802413C0 AFB00010 */ sw $s0, 0x10($sp) -/* D3B994 802413C4 8E30000C */ lw $s0, 0xc($s1) -/* D3B998 802413C8 8E050000 */ lw $a1, ($s0) -/* D3B99C 802413CC 0C0B1EAF */ jal get_variable -/* D3B9A0 802413D0 26100004 */ addiu $s0, $s0, 4 -/* D3B9A4 802413D4 00021880 */ sll $v1, $v0, 2 -/* D3B9A8 802413D8 00621821 */ addu $v1, $v1, $v0 -/* D3B9AC 802413DC 00031880 */ sll $v1, $v1, 2 -/* D3B9B0 802413E0 00621823 */ subu $v1, $v1, $v0 -/* D3B9B4 802413E4 000310C0 */ sll $v0, $v1, 3 -/* D3B9B8 802413E8 00621821 */ addu $v1, $v1, $v0 -/* D3B9BC 802413EC 000318C0 */ sll $v1, $v1, 3 -/* D3B9C0 802413F0 3C01800B */ lui $at, 0x800b -/* D3B9C4 802413F4 00230821 */ addu $at, $at, $v1 -/* D3B9C8 802413F8 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* D3B9CC 802413FC 3C014480 */ lui $at, 0x4480 -/* D3B9D0 80241400 44810000 */ mtc1 $at, $f0 -/* D3B9D4 80241404 00000000 */ nop -/* D3B9D8 80241408 46001082 */ mul.s $f2, $f2, $f0 -/* D3B9DC 8024140C 00000000 */ nop -/* D3B9E0 80241410 3C01CD5B */ lui $at, 0xcd5b -/* D3B9E4 80241414 34215858 */ ori $at, $at, 0x5858 -/* D3B9E8 80241418 44810000 */ mtc1 $at, $f0 -/* D3B9EC 8024141C 00000000 */ nop -/* D3B9F0 80241420 46001080 */ add.s $f2, $f2, $f0 -/* D3B9F4 80241424 8E050000 */ lw $a1, ($s0) -/* D3B9F8 80241428 4600110D */ trunc.w.s $f4, $f2 -/* D3B9FC 8024142C 44062000 */ mfc1 $a2, $f4 -/* D3BA00 80241430 0C0B2026 */ jal set_variable -/* D3BA04 80241434 0220202D */ daddu $a0, $s1, $zero -/* D3BA08 80241438 8FBF0018 */ lw $ra, 0x18($sp) -/* D3BA0C 8024143C 8FB10014 */ lw $s1, 0x14($sp) -/* D3BA10 80241440 8FB00010 */ lw $s0, 0x10($sp) -/* D3BA14 80241444 24020002 */ addiu $v0, $zero, 2 -/* D3BA18 80241448 03E00008 */ jr $ra -/* D3BA1C 8024144C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80241450_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80241450_D3A5D0.s deleted file mode 100644 index 546c2ed5db..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80241450_D3A5D0.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241450_D3BA20 -/* D3BA20 80241450 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D3BA24 80241454 AFB20018 */ sw $s2, 0x18($sp) -/* D3BA28 80241458 0080902D */ daddu $s2, $a0, $zero -/* D3BA2C 8024145C AFBF0030 */ sw $ra, 0x30($sp) -/* D3BA30 80241460 AFB7002C */ sw $s7, 0x2c($sp) -/* D3BA34 80241464 AFB60028 */ sw $s6, 0x28($sp) -/* D3BA38 80241468 AFB50024 */ sw $s5, 0x24($sp) -/* D3BA3C 8024146C AFB40020 */ sw $s4, 0x20($sp) -/* D3BA40 80241470 AFB3001C */ sw $s3, 0x1c($sp) -/* D3BA44 80241474 AFB10014 */ sw $s1, 0x14($sp) -/* D3BA48 80241478 AFB00010 */ sw $s0, 0x10($sp) -/* D3BA4C 8024147C F7B60040 */ sdc1 $f22, 0x40($sp) -/* D3BA50 80241480 F7B40038 */ sdc1 $f20, 0x38($sp) -/* D3BA54 80241484 8E50000C */ lw $s0, 0xc($s2) -/* D3BA58 80241488 8E050000 */ lw $a1, ($s0) -/* D3BA5C 8024148C 0C0B1EAF */ jal get_variable -/* D3BA60 80241490 26100004 */ addiu $s0, $s0, 4 -/* D3BA64 80241494 8E050000 */ lw $a1, ($s0) -/* D3BA68 80241498 26100004 */ addiu $s0, $s0, 4 -/* D3BA6C 8024149C 0240202D */ daddu $a0, $s2, $zero -/* D3BA70 802414A0 0C0B1EAF */ jal get_variable -/* D3BA74 802414A4 0040B82D */ daddu $s7, $v0, $zero -/* D3BA78 802414A8 8E050000 */ lw $a1, ($s0) -/* D3BA7C 802414AC 26100004 */ addiu $s0, $s0, 4 -/* D3BA80 802414B0 0240202D */ daddu $a0, $s2, $zero -/* D3BA84 802414B4 0C0B1EAF */ jal get_variable -/* D3BA88 802414B8 0040B02D */ daddu $s6, $v0, $zero -/* D3BA8C 802414BC 0240202D */ daddu $a0, $s2, $zero -/* D3BA90 802414C0 3C05F4AC */ lui $a1, 0xf4ac -/* D3BA94 802414C4 34A5D481 */ ori $a1, $a1, 0xd481 -/* D3BA98 802414C8 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* D3BA9C 802414CC 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* D3BAA0 802414D0 8E140000 */ lw $s4, ($s0) -/* D3BAA4 802414D4 00061880 */ sll $v1, $a2, 2 -/* D3BAA8 802414D8 00661821 */ addu $v1, $v1, $a2 -/* D3BAAC 802414DC 00031880 */ sll $v1, $v1, 2 -/* D3BAB0 802414E0 00661823 */ subu $v1, $v1, $a2 -/* D3BAB4 802414E4 000330C0 */ sll $a2, $v1, 3 -/* D3BAB8 802414E8 00661821 */ addu $v1, $v1, $a2 -/* D3BABC 802414EC 000318C0 */ sll $v1, $v1, 3 -/* D3BAC0 802414F0 3C01800B */ lui $at, 0x800b -/* D3BAC4 802414F4 00230821 */ addu $at, $at, $v1 -/* D3BAC8 802414F8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* D3BACC 802414FC 8E150004 */ lw $s5, 4($s0) -/* D3BAD0 80241500 4600010D */ trunc.w.s $f4, $f0 -/* D3BAD4 80241504 44112000 */ mfc1 $s1, $f4 -/* D3BAD8 80241508 0C0B1EAF */ jal get_variable -/* D3BADC 8024150C 0040982D */ daddu $s3, $v0, $zero -/* D3BAE0 80241510 4491B000 */ mtc1 $s1, $f22 -/* D3BAE4 80241514 00000000 */ nop -/* D3BAE8 80241518 4680B5A0 */ cvt.s.w $f22, $f22 -/* D3BAEC 8024151C 4600B306 */ mov.s $f12, $f22 -/* D3BAF0 80241520 0C00A8D4 */ jal cos_deg -/* D3BAF4 80241524 0040802D */ daddu $s0, $v0, $zero -/* D3BAF8 80241528 4493A000 */ mtc1 $s3, $f20 -/* D3BAFC 8024152C 00000000 */ nop -/* D3BB00 80241530 4680A520 */ cvt.s.w $f20, $f20 -/* D3BB04 80241534 4600A002 */ mul.s $f0, $f20, $f0 -/* D3BB08 80241538 00000000 */ nop -/* D3BB0C 8024153C 0240202D */ daddu $a0, $s2, $zero -/* D3BB10 80241540 44901000 */ mtc1 $s0, $f2 -/* D3BB14 80241544 00000000 */ nop -/* D3BB18 80241548 468010A0 */ cvt.s.w $f2, $f2 -/* D3BB1C 8024154C 46001081 */ sub.s $f2, $f2, $f0 -/* D3BB20 80241550 3C05F4AC */ lui $a1, 0xf4ac -/* D3BB24 80241554 4600110D */ trunc.w.s $f4, $f2 -/* D3BB28 80241558 44102000 */ mfc1 $s0, $f4 -/* D3BB2C 8024155C 0C0B1EAF */ jal get_variable -/* D3BB30 80241560 34A5D483 */ ori $a1, $a1, 0xd483 -/* D3BB34 80241564 4600B306 */ mov.s $f12, $f22 -/* D3BB38 80241568 0C00A8BB */ jal sin_deg -/* D3BB3C 8024156C 0040882D */ daddu $s1, $v0, $zero -/* D3BB40 80241570 4600A502 */ mul.s $f20, $f20, $f0 -/* D3BB44 80241574 00000000 */ nop -/* D3BB48 80241578 0240202D */ daddu $a0, $s2, $zero -/* D3BB4C 8024157C 44910000 */ mtc1 $s1, $f0 -/* D3BB50 80241580 00000000 */ nop -/* D3BB54 80241584 46800020 */ cvt.s.w $f0, $f0 -/* D3BB58 80241588 46140001 */ sub.s $f0, $f0, $f20 -/* D3BB5C 8024158C 0280282D */ daddu $a1, $s4, $zero -/* D3BB60 80241590 02173023 */ subu $a2, $s0, $s7 -/* D3BB64 80241594 4600010D */ trunc.w.s $f4, $f0 -/* D3BB68 80241598 44102000 */ mfc1 $s0, $f4 -/* D3BB6C 8024159C 0C0B2026 */ jal set_variable -/* D3BB70 802415A0 02168023 */ subu $s0, $s0, $s6 -/* D3BB74 802415A4 0240202D */ daddu $a0, $s2, $zero -/* D3BB78 802415A8 02A0282D */ daddu $a1, $s5, $zero -/* D3BB7C 802415AC 0C0B2026 */ jal set_variable -/* D3BB80 802415B0 0200302D */ daddu $a2, $s0, $zero -/* D3BB84 802415B4 8FBF0030 */ lw $ra, 0x30($sp) -/* D3BB88 802415B8 8FB7002C */ lw $s7, 0x2c($sp) -/* D3BB8C 802415BC 8FB60028 */ lw $s6, 0x28($sp) -/* D3BB90 802415C0 8FB50024 */ lw $s5, 0x24($sp) -/* D3BB94 802415C4 8FB40020 */ lw $s4, 0x20($sp) -/* D3BB98 802415C8 8FB3001C */ lw $s3, 0x1c($sp) -/* D3BB9C 802415CC 8FB20018 */ lw $s2, 0x18($sp) -/* D3BBA0 802415D0 8FB10014 */ lw $s1, 0x14($sp) -/* D3BBA4 802415D4 8FB00010 */ lw $s0, 0x10($sp) -/* D3BBA8 802415D8 D7B60040 */ ldc1 $f22, 0x40($sp) -/* D3BBAC 802415DC D7B40038 */ ldc1 $f20, 0x38($sp) -/* D3BBB0 802415E0 24020002 */ addiu $v0, $zero, 2 -/* D3BBB4 802415E4 03E00008 */ jr $ra -/* D3BBB8 802415E8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_802415EC_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_802415EC_D3A5D0.s deleted file mode 100644 index 158301533b..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_802415EC_D3A5D0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415EC_D3BBBC -/* D3BBBC 802415EC 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* D3BBC0 802415F0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* D3BBC4 802415F4 10A00002 */ beqz $a1, .L80241600 -/* D3BBC8 802415F8 2402003C */ addiu $v0, $zero, 0x3c -/* D3BBCC 802415FC AC820070 */ sw $v0, 0x70($a0) -.L80241600: -/* D3BBD0 80241600 C4620080 */ lwc1 $f2, 0x80($v1) -/* D3BBD4 80241604 3C0141F0 */ lui $at, 0x41f0 -/* D3BBD8 80241608 44810000 */ mtc1 $at, $f0 -/* D3BBDC 8024160C 00000000 */ nop -/* D3BBE0 80241610 46001000 */ add.s $f0, $f2, $f0 -/* D3BBE4 80241614 3C0143B4 */ lui $at, 0x43b4 -/* D3BBE8 80241618 44811000 */ mtc1 $at, $f2 -/* D3BBEC 8024161C 00000000 */ nop -/* D3BBF0 80241620 4600103E */ c.le.s $f2, $f0 -/* D3BBF4 80241624 00000000 */ nop -/* D3BBF8 80241628 45000003 */ bc1f .L80241638 -/* D3BBFC 8024162C E4600080 */ swc1 $f0, 0x80($v1) -/* D3BC00 80241630 46020001 */ sub.s $f0, $f0, $f2 -/* D3BC04 80241634 E4600080 */ swc1 $f0, 0x80($v1) -.L80241638: -/* D3BC08 80241638 8C820070 */ lw $v0, 0x70($a0) -/* D3BC0C 8024163C 2442FFFF */ addiu $v0, $v0, -1 -/* D3BC10 80241640 AC820070 */ sw $v0, 0x70($a0) -/* D3BC14 80241644 000217C3 */ sra $v0, $v0, 0x1f -/* D3BC18 80241648 03E00008 */ jr $ra -/* D3BC1C 8024164C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80241650_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80241650_D3A5D0.s deleted file mode 100644 index 1c705acb9e..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80241650_D3A5D0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241650_D3BC20 -/* D3BC20 80241650 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3BC24 80241654 AFB10014 */ sw $s1, 0x14($sp) -/* D3BC28 80241658 0080882D */ daddu $s1, $a0, $zero -/* D3BC2C 8024165C AFB00010 */ sw $s0, 0x10($sp) -/* D3BC30 80241660 00A0802D */ daddu $s0, $a1, $zero -/* D3BC34 80241664 AFBF0018 */ sw $ra, 0x18($sp) -/* D3BC38 80241668 0C00EABB */ jal get_npc_unsafe -/* D3BC3C 8024166C 2404FFFC */ addiu $a0, $zero, -4 -/* D3BC40 80241670 12000003 */ beqz $s0, .L80241680 -/* D3BC44 80241674 0040182D */ daddu $v1, $v0, $zero -/* D3BC48 80241678 2402003C */ addiu $v0, $zero, 0x3c -/* D3BC4C 8024167C AE220070 */ sw $v0, 0x70($s1) -.L80241680: -/* D3BC50 80241680 C462000C */ lwc1 $f2, 0xc($v1) -/* D3BC54 80241684 3C0141F0 */ lui $at, 0x41f0 -/* D3BC58 80241688 44810000 */ mtc1 $at, $f0 -/* D3BC5C 8024168C 00000000 */ nop -/* D3BC60 80241690 46001000 */ add.s $f0, $f2, $f0 -/* D3BC64 80241694 3C0143B4 */ lui $at, 0x43b4 -/* D3BC68 80241698 44811000 */ mtc1 $at, $f2 -/* D3BC6C 8024169C 00000000 */ nop -/* D3BC70 802416A0 4600103E */ c.le.s $f2, $f0 -/* D3BC74 802416A4 00000000 */ nop -/* D3BC78 802416A8 45000003 */ bc1f .L802416B8 -/* D3BC7C 802416AC E460000C */ swc1 $f0, 0xc($v1) -/* D3BC80 802416B0 46020001 */ sub.s $f0, $f0, $f2 -/* D3BC84 802416B4 E460000C */ swc1 $f0, 0xc($v1) -.L802416B8: -/* D3BC88 802416B8 8E230070 */ lw $v1, 0x70($s1) -/* D3BC8C 802416BC 2463FFFF */ addiu $v1, $v1, -1 -/* D3BC90 802416C0 000317C3 */ sra $v0, $v1, 0x1f -/* D3BC94 802416C4 AE230070 */ sw $v1, 0x70($s1) -/* D3BC98 802416C8 8FBF0018 */ lw $ra, 0x18($sp) -/* D3BC9C 802416CC 8FB10014 */ lw $s1, 0x14($sp) -/* D3BCA0 802416D0 8FB00010 */ lw $s0, 0x10($sp) -/* D3BCA4 802416D4 30420002 */ andi $v0, $v0, 2 -/* D3BCA8 802416D8 03E00008 */ jr $ra -/* D3BCAC 802416DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_802416E0_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_802416E0_D3A5D0.s deleted file mode 100644 index 9fc9db0881..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_802416E0_D3A5D0.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416E0_D3BCB0 -/* D3BCB0 802416E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D3BCB4 802416E4 AFB10014 */ sw $s1, 0x14($sp) -/* D3BCB8 802416E8 0080882D */ daddu $s1, $a0, $zero -/* D3BCBC 802416EC AFB00010 */ sw $s0, 0x10($sp) -/* D3BCC0 802416F0 00A0802D */ daddu $s0, $a1, $zero -/* D3BCC4 802416F4 AFBF001C */ sw $ra, 0x1c($sp) -/* D3BCC8 802416F8 AFB20018 */ sw $s2, 0x18($sp) -/* D3BCCC 802416FC F7B40020 */ sdc1 $f20, 0x20($sp) -/* D3BCD0 80241700 0C00EABB */ jal get_npc_unsafe -/* D3BCD4 80241704 2404FFFC */ addiu $a0, $zero, -4 -/* D3BCD8 80241708 12000017 */ beqz $s0, .L80241768 -/* D3BCDC 8024170C 0040902D */ daddu $s2, $v0, $zero -/* D3BCE0 80241710 0220202D */ daddu $a0, $s1, $zero -/* D3BCE4 80241714 3C05FE36 */ lui $a1, 0xfe36 -/* D3BCE8 80241718 0C0B210B */ jal get_float_variable -/* D3BCEC 8024171C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D3BCF0 80241720 0220202D */ daddu $a0, $s1, $zero -/* D3BCF4 80241724 3C05FE36 */ lui $a1, 0xfe36 -/* D3BCF8 80241728 3C014270 */ lui $at, 0x4270 -/* D3BCFC 8024172C 4481A000 */ mtc1 $at, $f20 -/* D3BD00 80241730 34A53C85 */ ori $a1, $a1, 0x3c85 -/* D3BD04 80241734 46140003 */ div.s $f0, $f0, $f20 -/* D3BD08 80241738 0C0B210B */ jal get_float_variable -/* D3BD0C 8024173C E6200074 */ swc1 $f0, 0x74($s1) -/* D3BD10 80241740 0220202D */ daddu $a0, $s1, $zero -/* D3BD14 80241744 3C05FE36 */ lui $a1, 0xfe36 -/* D3BD18 80241748 34A53C81 */ ori $a1, $a1, 0x3c81 -/* D3BD1C 8024174C 46140003 */ div.s $f0, $f0, $f20 -/* D3BD20 80241750 0C0B210B */ jal get_float_variable -/* D3BD24 80241754 E6200078 */ swc1 $f0, 0x78($s1) -/* D3BD28 80241758 46140003 */ div.s $f0, $f0, $f20 -/* D3BD2C 8024175C 2402003C */ addiu $v0, $zero, 0x3c -/* D3BD30 80241760 E620007C */ swc1 $f0, 0x7c($s1) -/* D3BD34 80241764 AE220070 */ sw $v0, 0x70($s1) -.L80241768: -/* D3BD38 80241768 C6400038 */ lwc1 $f0, 0x38($s2) -/* D3BD3C 8024176C C6220074 */ lwc1 $f2, 0x74($s1) -/* D3BD40 80241770 46020000 */ add.s $f0, $f0, $f2 -/* D3BD44 80241774 E6400038 */ swc1 $f0, 0x38($s2) -/* D3BD48 80241778 C640003C */ lwc1 $f0, 0x3c($s2) -/* D3BD4C 8024177C C6220078 */ lwc1 $f2, 0x78($s1) -/* D3BD50 80241780 46020000 */ add.s $f0, $f0, $f2 -/* D3BD54 80241784 E640003C */ swc1 $f0, 0x3c($s2) -/* D3BD58 80241788 C6400040 */ lwc1 $f0, 0x40($s2) -/* D3BD5C 8024178C C622007C */ lwc1 $f2, 0x7c($s1) -/* D3BD60 80241790 46020000 */ add.s $f0, $f0, $f2 -/* D3BD64 80241794 E6400040 */ swc1 $f0, 0x40($s2) -/* D3BD68 80241798 8E230070 */ lw $v1, 0x70($s1) -/* D3BD6C 8024179C 2463FFFF */ addiu $v1, $v1, -1 -/* D3BD70 802417A0 2C620001 */ sltiu $v0, $v1, 1 -/* D3BD74 802417A4 AE230070 */ sw $v1, 0x70($s1) -/* D3BD78 802417A8 8FBF001C */ lw $ra, 0x1c($sp) -/* D3BD7C 802417AC 8FB20018 */ lw $s2, 0x18($sp) -/* D3BD80 802417B0 8FB10014 */ lw $s1, 0x14($sp) -/* D3BD84 802417B4 8FB00010 */ lw $s0, 0x10($sp) -/* D3BD88 802417B8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* D3BD8C 802417BC 00021040 */ sll $v0, $v0, 1 -/* D3BD90 802417C0 03E00008 */ jr $ra -/* D3BD94 802417C4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_802417C8_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_802417C8_D3A5D0.s deleted file mode 100644 index 0d6ae21bb9..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_802417C8_D3A5D0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417C8_D3BD98 -/* D3BD98 802417C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3BD9C 802417CC 3C058025 */ lui $a1, 0x8025 -/* D3BDA0 802417D0 8CA51468 */ lw $a1, 0x1468($a1) -/* D3BDA4 802417D4 AFBF0010 */ sw $ra, 0x10($sp) -/* D3BDA8 802417D8 0C0B1EAF */ jal get_variable -/* D3BDAC 802417DC 0000202D */ daddu $a0, $zero, $zero -/* D3BDB0 802417E0 0040182D */ daddu $v1, $v0, $zero -/* D3BDB4 802417E4 24020001 */ addiu $v0, $zero, 1 -/* D3BDB8 802417E8 14620006 */ bne $v1, $v0, .L80241804 -/* D3BDBC 802417EC 24020002 */ addiu $v0, $zero, 2 -/* D3BDC0 802417F0 44800000 */ mtc1 $zero, $f0 -/* D3BDC4 802417F4 00000000 */ nop -/* D3BDC8 802417F8 44050000 */ mfc1 $a1, $f0 -/* D3BDCC 802417FC 08090607 */ j .L8024181C -/* D3BDD0 80241800 0000202D */ daddu $a0, $zero, $zero -.L80241804: -/* D3BDD4 80241804 14620008 */ bne $v1, $v0, .L80241828 -/* D3BDD8 80241808 24040001 */ addiu $a0, $zero, 1 -/* D3BDDC 8024180C 44800000 */ mtc1 $zero, $f0 -/* D3BDE0 80241810 00000000 */ nop -/* D3BDE4 80241814 44050000 */ mfc1 $a1, $f0 -/* D3BDE8 80241818 00000000 */ nop -.L8024181C: -/* D3BDEC 8024181C 00A0302D */ daddu $a2, $a1, $zero -/* D3BDF0 80241820 0C01C5A4 */ jal func_80071690 -/* D3BDF4 80241824 00A0382D */ daddu $a3, $a1, $zero -.L80241828: -/* D3BDF8 80241828 8FBF0010 */ lw $ra, 0x10($sp) -/* D3BDFC 8024182C 03E00008 */ jr $ra -/* D3BE00 80241830 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80241864_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80241864_D3A5D0.s deleted file mode 100644 index 0fa6de7810..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80241864_D3A5D0.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241864_D3BE34 -/* D3BE34 80241864 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3BE38 80241868 AFB00010 */ sw $s0, 0x10($sp) -/* D3BE3C 8024186C 0080802D */ daddu $s0, $a0, $zero -/* D3BE40 80241870 AFBF0014 */ sw $ra, 0x14($sp) -/* D3BE44 80241874 0C00EAD2 */ jal get_npc_safe -/* D3BE48 80241878 24040001 */ addiu $a0, $zero, 1 -/* D3BE4C 8024187C 3C0143EB */ lui $at, 0x43eb -/* D3BE50 80241880 44811000 */ mtc1 $at, $f2 -/* D3BE54 80241884 3C0140A0 */ lui $at, 0x40a0 -/* D3BE58 80241888 44810000 */ mtc1 $at, $f0 -/* D3BE5C 8024188C 0040182D */ daddu $v1, $v0, $zero -/* D3BE60 80241890 AC60003C */ sw $zero, 0x3c($v1) -/* D3BE64 80241894 E4620038 */ swc1 $f2, 0x38($v1) -/* D3BE68 80241898 E4600040 */ swc1 $f0, 0x40($v1) -/* D3BE6C 8024189C E60000AC */ swc1 $f0, 0xac($s0) -/* D3BE70 802418A0 8FBF0014 */ lw $ra, 0x14($sp) -/* D3BE74 802418A4 8FB00010 */ lw $s0, 0x10($sp) -/* D3BE78 802418A8 24020002 */ addiu $v0, $zero, 2 -/* D3BE7C 802418AC 03E00008 */ jr $ra -/* D3BE80 802418B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80241A6C_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80241A6C_D3A5D0.s deleted file mode 100644 index 8b4e3a82f6..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80241A6C_D3A5D0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A6C_D3C03C -/* D3C03C 80241A6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3C040 80241A70 AFBF0010 */ sw $ra, 0x10($sp) -/* D3C044 80241A74 0C04C3D6 */ jal get_item_entity -/* D3C048 80241A78 8C840084 */ lw $a0, 0x84($a0) -/* D3C04C 80241A7C 3C013F19 */ lui $at, 0x3f19 -/* D3C050 80241A80 3421999A */ ori $at, $at, 0x999a -/* D3C054 80241A84 44810000 */ mtc1 $at, $f0 -/* D3C058 80241A88 00000000 */ nop -/* D3C05C 80241A8C E4400030 */ swc1 $f0, 0x30($v0) -/* D3C060 80241A90 8FBF0010 */ lw $ra, 0x10($sp) -/* D3C064 80241A94 24020002 */ addiu $v0, $zero, 2 -/* D3C068 80241A98 03E00008 */ jr $ra -/* D3C06C 80241A9C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80241BC4_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80241BC4_D3A5D0.s deleted file mode 100644 index c622f87f7e..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80241BC4_D3A5D0.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BC4_D3C194 -/* D3C194 80241BC4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3C198 80241BC8 AFB00010 */ sw $s0, 0x10($sp) -/* D3C19C 80241BCC 0080802D */ daddu $s0, $a0, $zero -/* D3C1A0 80241BD0 10A00005 */ beqz $a1, .L80241BE8 -/* D3C1A4 80241BD4 AFBF0014 */ sw $ra, 0x14($sp) -/* D3C1A8 80241BD8 AE000070 */ sw $zero, 0x70($s0) -/* D3C1AC 80241BDC AE000074 */ sw $zero, 0x74($s0) -/* D3C1B0 80241BE0 AE000078 */ sw $zero, 0x78($s0) -/* D3C1B4 80241BE4 AE00007C */ sw $zero, 0x7c($s0) -.L80241BE8: -/* D3C1B8 80241BE8 8E020070 */ lw $v0, 0x70($s0) -/* D3C1BC 80241BEC 1440000E */ bnez $v0, .L80241C28 -/* D3C1C0 80241BF0 00000000 */ nop -/* D3C1C4 80241BF4 8E0300A8 */ lw $v1, 0xa8($s0) -/* D3C1C8 80241BF8 8E020088 */ lw $v0, 0x88($s0) -/* D3C1CC 80241BFC 00621821 */ addu $v1, $v1, $v0 -/* D3C1D0 80241C00 04610004 */ bgez $v1, .L80241C14 -/* D3C1D4 80241C04 AE0300A8 */ sw $v1, 0xa8($s0) -/* D3C1D8 80241C08 3C020002 */ lui $v0, 2 -/* D3C1DC 80241C0C 08090709 */ j .L80241C24 -/* D3C1E0 80241C10 00621021 */ addu $v0, $v1, $v0 -.L80241C14: -/* D3C1E4 80241C14 3C040002 */ lui $a0, 2 -/* D3C1E8 80241C18 0083102A */ slt $v0, $a0, $v1 -/* D3C1EC 80241C1C 10400002 */ beqz $v0, .L80241C28 -/* D3C1F0 80241C20 00641023 */ subu $v0, $v1, $a0 -.L80241C24: -/* D3C1F4 80241C24 AE0200A8 */ sw $v0, 0xa8($s0) -.L80241C28: -/* D3C1F8 80241C28 8E020074 */ lw $v0, 0x74($s0) -/* D3C1FC 80241C2C 1440000E */ bnez $v0, .L80241C68 -/* D3C200 80241C30 00000000 */ nop -/* D3C204 80241C34 8E0300AC */ lw $v1, 0xac($s0) -/* D3C208 80241C38 8E02008C */ lw $v0, 0x8c($s0) -/* D3C20C 80241C3C 00621821 */ addu $v1, $v1, $v0 -/* D3C210 80241C40 04610004 */ bgez $v1, .L80241C54 -/* D3C214 80241C44 AE0300AC */ sw $v1, 0xac($s0) -/* D3C218 80241C48 3C020002 */ lui $v0, 2 -/* D3C21C 80241C4C 08090719 */ j .L80241C64 -/* D3C220 80241C50 00621021 */ addu $v0, $v1, $v0 -.L80241C54: -/* D3C224 80241C54 3C040002 */ lui $a0, 2 -/* D3C228 80241C58 0083102A */ slt $v0, $a0, $v1 -/* D3C22C 80241C5C 10400002 */ beqz $v0, .L80241C68 -/* D3C230 80241C60 00641023 */ subu $v0, $v1, $a0 -.L80241C64: -/* D3C234 80241C64 AE0200AC */ sw $v0, 0xac($s0) -.L80241C68: -/* D3C238 80241C68 8E020078 */ lw $v0, 0x78($s0) -/* D3C23C 80241C6C 1440000E */ bnez $v0, .L80241CA8 -/* D3C240 80241C70 00000000 */ nop -/* D3C244 80241C74 8E0300B0 */ lw $v1, 0xb0($s0) -/* D3C248 80241C78 8E020090 */ lw $v0, 0x90($s0) -/* D3C24C 80241C7C 00621821 */ addu $v1, $v1, $v0 -/* D3C250 80241C80 04610004 */ bgez $v1, .L80241C94 -/* D3C254 80241C84 AE0300B0 */ sw $v1, 0xb0($s0) -/* D3C258 80241C88 3C020002 */ lui $v0, 2 -/* D3C25C 80241C8C 08090729 */ j .L80241CA4 -/* D3C260 80241C90 00621021 */ addu $v0, $v1, $v0 -.L80241C94: -/* D3C264 80241C94 3C040002 */ lui $a0, 2 -/* D3C268 80241C98 0083102A */ slt $v0, $a0, $v1 -/* D3C26C 80241C9C 10400002 */ beqz $v0, .L80241CA8 -/* D3C270 80241CA0 00641023 */ subu $v0, $v1, $a0 -.L80241CA4: -/* D3C274 80241CA4 AE0200B0 */ sw $v0, 0xb0($s0) -.L80241CA8: -/* D3C278 80241CA8 8E02007C */ lw $v0, 0x7c($s0) -/* D3C27C 80241CAC 1440000E */ bnez $v0, .L80241CE8 -/* D3C280 80241CB0 00000000 */ nop -/* D3C284 80241CB4 8E0300B4 */ lw $v1, 0xb4($s0) -/* D3C288 80241CB8 8E020094 */ lw $v0, 0x94($s0) -/* D3C28C 80241CBC 00621821 */ addu $v1, $v1, $v0 -/* D3C290 80241CC0 04610004 */ bgez $v1, .L80241CD4 -/* D3C294 80241CC4 AE0300B4 */ sw $v1, 0xb4($s0) -/* D3C298 80241CC8 3C020002 */ lui $v0, 2 -/* D3C29C 80241CCC 08090739 */ j .L80241CE4 -/* D3C2A0 80241CD0 00621021 */ addu $v0, $v1, $v0 -.L80241CD4: -/* D3C2A4 80241CD4 3C040002 */ lui $a0, 2 -/* D3C2A8 80241CD8 0083102A */ slt $v0, $a0, $v1 -/* D3C2AC 80241CDC 10400002 */ beqz $v0, .L80241CE8 -/* D3C2B0 80241CE0 00641023 */ subu $v0, $v1, $a0 -.L80241CE4: -/* D3C2B4 80241CE4 AE0200B4 */ sw $v0, 0xb4($s0) -.L80241CE8: -/* D3C2B8 80241CE8 8E040084 */ lw $a0, 0x84($s0) -/* D3C2BC 80241CEC 0C046F07 */ jal set_main_pan_u -/* D3C2C0 80241CF0 8E0500A8 */ lw $a1, 0xa8($s0) -/* D3C2C4 80241CF4 8E040084 */ lw $a0, 0x84($s0) -/* D3C2C8 80241CF8 0C046F0D */ jal set_main_pan_v -/* D3C2CC 80241CFC 8E0500AC */ lw $a1, 0xac($s0) -/* D3C2D0 80241D00 8E040084 */ lw $a0, 0x84($s0) -/* D3C2D4 80241D04 0C046F13 */ jal set_aux_pan_u -/* D3C2D8 80241D08 8E0500B0 */ lw $a1, 0xb0($s0) -/* D3C2DC 80241D0C 8E040084 */ lw $a0, 0x84($s0) -/* D3C2E0 80241D10 0C046F19 */ jal set_aux_pan_v -/* D3C2E4 80241D14 8E0500B4 */ lw $a1, 0xb4($s0) -/* D3C2E8 80241D18 8E020070 */ lw $v0, 0x70($s0) -/* D3C2EC 80241D1C 8E030078 */ lw $v1, 0x78($s0) -/* D3C2F0 80241D20 8E040098 */ lw $a0, 0x98($s0) -/* D3C2F4 80241D24 24420001 */ addiu $v0, $v0, 1 -/* D3C2F8 80241D28 AE020070 */ sw $v0, 0x70($s0) -/* D3C2FC 80241D2C 8E020074 */ lw $v0, 0x74($s0) -/* D3C300 80241D30 24630001 */ addiu $v1, $v1, 1 -/* D3C304 80241D34 AE030078 */ sw $v1, 0x78($s0) -/* D3C308 80241D38 8E030070 */ lw $v1, 0x70($s0) -/* D3C30C 80241D3C 24420001 */ addiu $v0, $v0, 1 -/* D3C310 80241D40 AE020074 */ sw $v0, 0x74($s0) -/* D3C314 80241D44 8E02007C */ lw $v0, 0x7c($s0) -/* D3C318 80241D48 0064182A */ slt $v1, $v1, $a0 -/* D3C31C 80241D4C 24420001 */ addiu $v0, $v0, 1 -/* D3C320 80241D50 14600002 */ bnez $v1, .L80241D5C -/* D3C324 80241D54 AE02007C */ sw $v0, 0x7c($s0) -/* D3C328 80241D58 AE000070 */ sw $zero, 0x70($s0) -.L80241D5C: -/* D3C32C 80241D5C 8E020074 */ lw $v0, 0x74($s0) -/* D3C330 80241D60 8E03009C */ lw $v1, 0x9c($s0) -/* D3C334 80241D64 0043102A */ slt $v0, $v0, $v1 -/* D3C338 80241D68 50400001 */ beql $v0, $zero, .L80241D70 -/* D3C33C 80241D6C AE000074 */ sw $zero, 0x74($s0) -.L80241D70: -/* D3C340 80241D70 8E020078 */ lw $v0, 0x78($s0) -/* D3C344 80241D74 8E0300A0 */ lw $v1, 0xa0($s0) -/* D3C348 80241D78 0043102A */ slt $v0, $v0, $v1 -/* D3C34C 80241D7C 50400001 */ beql $v0, $zero, .L80241D84 -/* D3C350 80241D80 AE000078 */ sw $zero, 0x78($s0) -.L80241D84: -/* D3C354 80241D84 8E02007C */ lw $v0, 0x7c($s0) -/* D3C358 80241D88 8E0300A4 */ lw $v1, 0xa4($s0) -/* D3C35C 80241D8C 0043102A */ slt $v0, $v0, $v1 -/* D3C360 80241D90 50400001 */ beql $v0, $zero, .L80241D98 -/* D3C364 80241D94 AE00007C */ sw $zero, 0x7c($s0) -.L80241D98: -/* D3C368 80241D98 8FBF0014 */ lw $ra, 0x14($sp) -/* D3C36C 80241D9C 8FB00010 */ lw $s0, 0x10($sp) -/* D3C370 80241DA0 0000102D */ daddu $v0, $zero, $zero -/* D3C374 80241DA4 03E00008 */ jr $ra -/* D3C378 80241DA8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/func_80241DAC_D3A5D0.s b/asm/nonmatchings/world/area_sam/sam_11/func_80241DAC_D3A5D0.s deleted file mode 100644 index 279ac4baf8..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/func_80241DAC_D3A5D0.s +++ /dev/null @@ -1,134 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DAC_D3C37C -/* D3C37C 80241DAC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D3C380 80241DB0 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* D3C384 80241DB4 4480E000 */ mtc1 $zero, $f28 -/* D3C388 80241DB8 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* D3C38C 80241DBC 3C018025 */ lui $at, 0x8025 -/* D3C390 80241DC0 D43A1430 */ ldc1 $f26, 0x1430($at) -/* D3C394 80241DC4 AFB1001C */ sw $s1, 0x1c($sp) -/* D3C398 80241DC8 0000882D */ daddu $s1, $zero, $zero -/* D3C39C 80241DCC AFB20020 */ sw $s2, 0x20($sp) -/* D3C3A0 80241DD0 0220902D */ daddu $s2, $s1, $zero -/* D3C3A4 80241DD4 AFBF0024 */ sw $ra, 0x24($sp) -/* D3C3A8 80241DD8 AFB00018 */ sw $s0, 0x18($sp) -/* D3C3AC 80241DDC F7B80038 */ sdc1 $f24, 0x38($sp) -/* D3C3B0 80241DE0 F7B60030 */ sdc1 $f22, 0x30($sp) -/* D3C3B4 80241DE4 F7B40028 */ sdc1 $f20, 0x28($sp) -.L80241DE8: -/* D3C3B8 80241DE8 3C022AAA */ lui $v0, 0x2aaa -/* D3C3BC 80241DEC 3442AAAB */ ori $v0, $v0, 0xaaab -/* D3C3C0 80241DF0 02220018 */ mult $s1, $v0 -/* D3C3C4 80241DF4 001127C3 */ sra $a0, $s1, 0x1f -/* D3C3C8 80241DF8 00004010 */ mfhi $t0 -/* D3C3CC 80241DFC 01042023 */ subu $a0, $t0, $a0 -/* D3C3D0 80241E00 00041840 */ sll $v1, $a0, 1 -/* D3C3D4 80241E04 00641821 */ addu $v1, $v1, $a0 -/* D3C3D8 80241E08 00031840 */ sll $v1, $v1, 1 -/* D3C3DC 80241E0C 02231823 */ subu $v1, $s1, $v1 -/* D3C3E0 80241E10 00031080 */ sll $v0, $v1, 2 -/* D3C3E4 80241E14 00431021 */ addu $v0, $v0, $v1 -/* D3C3E8 80241E18 000210C0 */ sll $v0, $v0, 3 -/* D3C3EC 80241E1C 2442FF9C */ addiu $v0, $v0, -0x64 -/* D3C3F0 80241E20 4482C000 */ mtc1 $v0, $f24 -/* D3C3F4 80241E24 00000000 */ nop -/* D3C3F8 80241E28 4680C620 */ cvt.s.w $f24, $f24 -/* D3C3FC 80241E2C 4600C1A1 */ cvt.d.s $f6, $f24 -/* D3C400 80241E30 463A3182 */ mul.d $f6, $f6, $f26 -/* D3C404 80241E34 00000000 */ nop -/* D3C408 80241E38 00041080 */ sll $v0, $a0, 2 -/* D3C40C 80241E3C 00441021 */ addu $v0, $v0, $a0 -/* D3C410 80241E40 000210C0 */ sll $v0, $v0, 3 -/* D3C414 80241E44 2442FF9C */ addiu $v0, $v0, -0x64 -/* D3C418 80241E48 4482B000 */ mtc1 $v0, $f22 -/* D3C41C 80241E4C 00000000 */ nop -/* D3C420 80241E50 4680B5A0 */ cvt.s.w $f22, $f22 -/* D3C424 80241E54 4600B121 */ cvt.d.s $f4, $f22 -/* D3C428 80241E58 463A2102 */ mul.d $f4, $f4, $f26 -/* D3C42C 80241E5C 00000000 */ nop -/* D3C430 80241E60 3C013FF0 */ lui $at, 0x3ff0 -/* D3C434 80241E64 44811800 */ mtc1 $at, $f3 -/* D3C438 80241E68 44801000 */ mtc1 $zero, $f2 -/* D3C43C 80241E6C 32220003 */ andi $v0, $s1, 3 -/* D3C440 80241E70 44820000 */ mtc1 $v0, $f0 -/* D3C444 80241E74 00000000 */ nop -/* D3C448 80241E78 46800021 */ cvt.d.w $f0, $f0 -/* D3C44C 80241E7C 46220000 */ add.d $f0, $f0, $f2 -/* D3C450 80241E80 4480A000 */ mtc1 $zero, $f20 -/* D3C454 80241E84 3C06C120 */ lui $a2, 0xc120 -/* D3C458 80241E88 46200000 */ add.d $f0, $f0, $f0 -/* D3C45C 80241E8C 32240001 */ andi $a0, $s1, 1 -/* D3C460 80241E90 00021080 */ sll $v0, $v0, 2 -/* D3C464 80241E94 4614C080 */ add.s $f2, $f24, $f20 -/* D3C468 80241E98 46200020 */ cvt.s.d $f0, $f0 -/* D3C46C 80241E9C E7A00010 */ swc1 $f0, 0x10($sp) -/* D3C470 80241EA0 3C01437A */ lui $at, 0x437a -/* D3C474 80241EA4 44810000 */ mtc1 $at, $f0 -/* D3C478 80241EA8 2442001E */ addiu $v0, $v0, 0x1e -/* D3C47C 80241EAC AFA20014 */ sw $v0, 0x14($sp) -/* D3C480 80241EB0 4600B000 */ add.s $f0, $f22, $f0 -/* D3C484 80241EB4 44051000 */ mfc1 $a1, $f2 -/* D3C488 80241EB8 46203620 */ cvt.s.d $f24, $f6 -/* D3C48C 80241EBC 44070000 */ mfc1 $a3, $f0 -/* D3C490 80241EC0 0C01C994 */ jal func_80072650 -/* D3C494 80241EC4 462025A0 */ cvt.s.d $f22, $f4 -/* D3C498 80241EC8 0040802D */ daddu $s0, $v0, $zero -/* D3C49C 80241ECC 8E02000C */ lw $v0, 0xc($s0) -/* D3C4A0 80241ED0 2404000A */ addiu $a0, $zero, 0xa -/* D3C4A4 80241ED4 0C00A67F */ jal rand_int -/* D3C4A8 80241ED8 E45C0044 */ swc1 $f28, 0x44($v0) -/* D3C4AC 80241EDC 3C018025 */ lui $at, 0x8025 -/* D3C4B0 80241EE0 D4221438 */ ldc1 $f2, 0x1438($at) -/* D3C4B4 80241EE4 44820000 */ mtc1 $v0, $f0 -/* D3C4B8 80241EE8 00000000 */ nop -/* D3C4BC 80241EEC 46800021 */ cvt.d.w $f0, $f0 -/* D3C4C0 80241EF0 46220002 */ mul.d $f0, $f0, $f2 -/* D3C4C4 80241EF4 00000000 */ nop -/* D3C4C8 80241EF8 2404000A */ addiu $a0, $zero, 0xa -/* D3C4CC 80241EFC 463A0000 */ add.d $f0, $f0, $f26 -/* D3C4D0 80241F00 3C014080 */ lui $at, 0x4080 -/* D3C4D4 80241F04 4481A000 */ mtc1 $at, $f20 -/* D3C4D8 80241F08 8E02000C */ lw $v0, 0xc($s0) -/* D3C4DC 80241F0C 46200020 */ cvt.s.d $f0, $f0 -/* D3C4E0 80241F10 E4400048 */ swc1 $f0, 0x48($v0) -/* D3C4E4 80241F14 8E02000C */ lw $v0, 0xc($s0) -/* D3C4E8 80241F18 44920000 */ mtc1 $s2, $f0 -/* D3C4EC 80241F1C 00000000 */ nop -/* D3C4F0 80241F20 46800020 */ cvt.s.w $f0, $f0 -/* D3C4F4 80241F24 0C00A67F */ jal rand_int -/* D3C4F8 80241F28 E440003C */ swc1 $f0, 0x3c($v0) -/* D3C4FC 80241F2C 2442FFFB */ addiu $v0, $v0, -5 -/* D3C500 80241F30 8E03000C */ lw $v1, 0xc($s0) -/* D3C504 80241F34 44820000 */ mtc1 $v0, $f0 -/* D3C508 80241F38 00000000 */ nop -/* D3C50C 80241F3C 46800020 */ cvt.s.w $f0, $f0 -/* D3C510 80241F40 E4600040 */ swc1 $f0, 0x40($v1) -/* D3C514 80241F44 8E02000C */ lw $v0, 0xc($s0) -/* D3C518 80241F48 3C01BDCC */ lui $at, 0xbdcc -/* D3C51C 80241F4C 3421CCCD */ ori $at, $at, 0xcccd -/* D3C520 80241F50 44810000 */ mtc1 $at, $f0 -/* D3C524 80241F54 E458004C */ swc1 $f24, 0x4c($v0) -/* D3C528 80241F58 8E02000C */ lw $v0, 0xc($s0) -/* D3C52C 80241F5C E4540050 */ swc1 $f20, 0x50($v0) -/* D3C530 80241F60 8E02000C */ lw $v0, 0xc($s0) -/* D3C534 80241F64 26310001 */ addiu $s1, $s1, 1 -/* D3C538 80241F68 E4560054 */ swc1 $f22, 0x54($v0) -/* D3C53C 80241F6C 8E02000C */ lw $v0, 0xc($s0) -/* D3C540 80241F70 E4400058 */ swc1 $f0, 0x58($v0) -/* D3C544 80241F74 2A220018 */ slti $v0, $s1, 0x18 -/* D3C548 80241F78 1440FF9B */ bnez $v0, .L80241DE8 -/* D3C54C 80241F7C 26520023 */ addiu $s2, $s2, 0x23 -/* D3C550 80241F80 8FBF0024 */ lw $ra, 0x24($sp) -/* D3C554 80241F84 8FB20020 */ lw $s2, 0x20($sp) -/* D3C558 80241F88 8FB1001C */ lw $s1, 0x1c($sp) -/* D3C55C 80241F8C 8FB00018 */ lw $s0, 0x18($sp) -/* D3C560 80241F90 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* D3C564 80241F94 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* D3C568 80241F98 D7B80038 */ ldc1 $f24, 0x38($sp) -/* D3C56C 80241F9C D7B60030 */ ldc1 $f22, 0x30($sp) -/* D3C570 80241FA0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* D3C574 80241FA4 24020002 */ addiu $v0, $zero, 2 -/* D3C578 80241FA8 03E00008 */ jr $ra -/* D3C57C 80241FAC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_12/func_80240090_D4BA20.s b/asm/nonmatchings/world/area_sam/sam_12/func_80240090_D4BA20.s deleted file mode 100644 index c1bf957128..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_12/func_80240090_D4BA20.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240090_D4BAB0 -/* D4BAB0 80240090 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4BAB4 80240094 AFBF0010 */ sw $ra, 0x10($sp) -/* D4BAB8 80240098 8C82000C */ lw $v0, 0xc($a0) -/* D4BABC 8024009C 0C0B210B */ jal get_float_variable -/* D4BAC0 802400A0 8C450000 */ lw $a1, ($v0) -/* D4BAC4 802400A4 44050000 */ mfc1 $a1, $f0 -/* D4BAC8 802400A8 0C04DF62 */ jal func_80137D88 -/* D4BACC 802400AC 0000202D */ daddu $a0, $zero, $zero -/* D4BAD0 802400B0 8FBF0010 */ lw $ra, 0x10($sp) -/* D4BAD4 802400B4 24020002 */ addiu $v0, $zero, 2 -/* D4BAD8 802400B8 03E00008 */ jr $ra -/* D4BADC 802400BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_12/func_802400C0_D4BA20.s b/asm/nonmatchings/world/area_sam/sam_12/func_802400C0_D4BA20.s deleted file mode 100644 index 6de785ae0e..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_12/func_802400C0_D4BA20.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400C0_D4BAE0 -/* D4BAE0 802400C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D4BAE4 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* D4BAE8 802400C8 0080882D */ daddu $s1, $a0, $zero -/* D4BAEC 802400CC AFBF0020 */ sw $ra, 0x20($sp) -/* D4BAF0 802400D0 AFB3001C */ sw $s3, 0x1c($sp) -/* D4BAF4 802400D4 AFB20018 */ sw $s2, 0x18($sp) -/* D4BAF8 802400D8 AFB00010 */ sw $s0, 0x10($sp) -/* D4BAFC 802400DC 8E30000C */ lw $s0, 0xc($s1) -/* D4BB00 802400E0 8E050000 */ lw $a1, ($s0) -/* D4BB04 802400E4 0C0B1EAF */ jal get_variable -/* D4BB08 802400E8 26100004 */ addiu $s0, $s0, 4 -/* D4BB0C 802400EC 8E050000 */ lw $a1, ($s0) -/* D4BB10 802400F0 26100004 */ addiu $s0, $s0, 4 -/* D4BB14 802400F4 0220202D */ daddu $a0, $s1, $zero -/* D4BB18 802400F8 0C0B210B */ jal get_float_variable -/* D4BB1C 802400FC 0040982D */ daddu $s3, $v0, $zero -/* D4BB20 80240100 8E050000 */ lw $a1, ($s0) -/* D4BB24 80240104 26100004 */ addiu $s0, $s0, 4 -/* D4BB28 80240108 4600008D */ trunc.w.s $f2, $f0 -/* D4BB2C 8024010C 44121000 */ mfc1 $s2, $f2 -/* D4BB30 80240110 0C0B210B */ jal get_float_variable -/* D4BB34 80240114 0220202D */ daddu $a0, $s1, $zero -/* D4BB38 80240118 0220202D */ daddu $a0, $s1, $zero -/* D4BB3C 8024011C 8E050000 */ lw $a1, ($s0) -/* D4BB40 80240120 4600008D */ trunc.w.s $f2, $f0 -/* D4BB44 80240124 44111000 */ mfc1 $s1, $f2 -/* D4BB48 80240128 0C0B210B */ jal get_float_variable -/* D4BB4C 8024012C 00000000 */ nop -/* D4BB50 80240130 4600008D */ trunc.w.s $f2, $f0 -/* D4BB54 80240134 44101000 */ mfc1 $s0, $f2 -/* D4BB58 80240138 0C04C3D6 */ jal get_item_entity -/* D4BB5C 8024013C 0260202D */ daddu $a0, $s3, $zero -/* D4BB60 80240140 0040182D */ daddu $v1, $v0, $zero -/* D4BB64 80240144 44920000 */ mtc1 $s2, $f0 -/* D4BB68 80240148 00000000 */ nop -/* D4BB6C 8024014C 46800020 */ cvt.s.w $f0, $f0 -/* D4BB70 80240150 E4600008 */ swc1 $f0, 8($v1) -/* D4BB74 80240154 44910000 */ mtc1 $s1, $f0 -/* D4BB78 80240158 00000000 */ nop -/* D4BB7C 8024015C 46800020 */ cvt.s.w $f0, $f0 -/* D4BB80 80240160 E460000C */ swc1 $f0, 0xc($v1) -/* D4BB84 80240164 44900000 */ mtc1 $s0, $f0 -/* D4BB88 80240168 00000000 */ nop -/* D4BB8C 8024016C 46800020 */ cvt.s.w $f0, $f0 -/* D4BB90 80240170 E4600010 */ swc1 $f0, 0x10($v1) -/* D4BB94 80240174 8FBF0020 */ lw $ra, 0x20($sp) -/* D4BB98 80240178 8FB3001C */ lw $s3, 0x1c($sp) -/* D4BB9C 8024017C 8FB20018 */ lw $s2, 0x18($sp) -/* D4BBA0 80240180 8FB10014 */ lw $s1, 0x14($sp) -/* D4BBA4 80240184 8FB00010 */ lw $s0, 0x10($sp) -/* D4BBA8 80240188 24020002 */ addiu $v0, $zero, 2 -/* D4BBAC 8024018C 03E00008 */ jr $ra -/* D4BBB0 80240190 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_12/func_80240194_D4BA20.s b/asm/nonmatchings/world/area_sam/sam_12/func_80240194_D4BA20.s deleted file mode 100644 index 6935f1dd2a..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_12/func_80240194_D4BA20.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240194_D4BBB4 -/* D4BBB4 80240194 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D4BBB8 80240198 AFB1001C */ sw $s1, 0x1c($sp) -/* D4BBBC 8024019C 0080882D */ daddu $s1, $a0, $zero -/* D4BBC0 802401A0 AFBF0024 */ sw $ra, 0x24($sp) -/* D4BBC4 802401A4 AFB20020 */ sw $s2, 0x20($sp) -/* D4BBC8 802401A8 AFB00018 */ sw $s0, 0x18($sp) -/* D4BBCC 802401AC 8E30000C */ lw $s0, 0xc($s1) -/* D4BBD0 802401B0 8E050000 */ lw $a1, ($s0) -/* D4BBD4 802401B4 0C0B1EAF */ jal get_variable -/* D4BBD8 802401B8 26100004 */ addiu $s0, $s0, 4 -/* D4BBDC 802401BC 8E050000 */ lw $a1, ($s0) -/* D4BBE0 802401C0 26100004 */ addiu $s0, $s0, 4 -/* D4BBE4 802401C4 0220202D */ daddu $a0, $s1, $zero -/* D4BBE8 802401C8 0C0B1EAF */ jal get_variable -/* D4BBEC 802401CC 0040902D */ daddu $s2, $v0, $zero -/* D4BBF0 802401D0 0220202D */ daddu $a0, $s1, $zero -/* D4BBF4 802401D4 8E050000 */ lw $a1, ($s0) -/* D4BBF8 802401D8 0C0B1EAF */ jal get_variable -/* D4BBFC 802401DC 0040802D */ daddu $s0, $v0, $zero -/* D4BC00 802401E0 44920000 */ mtc1 $s2, $f0 -/* D4BC04 802401E4 00000000 */ nop -/* D4BC08 802401E8 46800020 */ cvt.s.w $f0, $f0 -/* D4BC0C 802401EC 44050000 */ mfc1 $a1, $f0 -/* D4BC10 802401F0 44900000 */ mtc1 $s0, $f0 -/* D4BC14 802401F4 00000000 */ nop -/* D4BC18 802401F8 46800020 */ cvt.s.w $f0, $f0 -/* D4BC1C 802401FC 44060000 */ mfc1 $a2, $f0 -/* D4BC20 80240200 44820000 */ mtc1 $v0, $f0 -/* D4BC24 80240204 00000000 */ nop -/* D4BC28 80240208 46800020 */ cvt.s.w $f0, $f0 -/* D4BC2C 8024020C 44070000 */ mfc1 $a3, $f0 -/* D4BC30 80240210 0000202D */ daddu $a0, $zero, $zero -/* D4BC34 80240214 0C01C16C */ jal func_800705B0 -/* D4BC38 80240218 AFA00010 */ sw $zero, 0x10($sp) -/* D4BC3C 8024021C 8FBF0024 */ lw $ra, 0x24($sp) -/* D4BC40 80240220 8FB20020 */ lw $s2, 0x20($sp) -/* D4BC44 80240224 8FB1001C */ lw $s1, 0x1c($sp) -/* D4BC48 80240228 8FB00018 */ lw $s0, 0x18($sp) -/* D4BC4C 8024022C 24020002 */ addiu $v0, $zero, 2 -/* D4BC50 80240230 03E00008 */ jr $ra -/* D4BC54 80240234 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_12/func_80240238_D4BA20.s b/asm/nonmatchings/world/area_sam/sam_12/func_80240238_D4BA20.s deleted file mode 100644 index 9d69d526ad..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_12/func_80240238_D4BA20.s +++ /dev/null @@ -1,94 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240238_D4BC58 -/* D4BC58 80240238 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* D4BC5C 8024023C AFB1002C */ sw $s1, 0x2c($sp) -/* D4BC60 80240240 0080882D */ daddu $s1, $a0, $zero -/* D4BC64 80240244 AFBF0030 */ sw $ra, 0x30($sp) -/* D4BC68 80240248 AFB00028 */ sw $s0, 0x28($sp) -/* D4BC6C 8024024C F7BA0050 */ sdc1 $f26, 0x50($sp) -/* D4BC70 80240250 F7B80048 */ sdc1 $f24, 0x48($sp) -/* D4BC74 80240254 F7B60040 */ sdc1 $f22, 0x40($sp) -/* D4BC78 80240258 F7B40038 */ sdc1 $f20, 0x38($sp) -/* D4BC7C 8024025C 8E30000C */ lw $s0, 0xc($s1) -/* D4BC80 80240260 8E050000 */ lw $a1, ($s0) -/* D4BC84 80240264 0C0B210B */ jal get_float_variable -/* D4BC88 80240268 26100004 */ addiu $s0, $s0, 4 -/* D4BC8C 8024026C 8E050000 */ lw $a1, ($s0) -/* D4BC90 80240270 26100004 */ addiu $s0, $s0, 4 -/* D4BC94 80240274 0220202D */ daddu $a0, $s1, $zero -/* D4BC98 80240278 0C0B210B */ jal get_float_variable -/* D4BC9C 8024027C 46000686 */ mov.s $f26, $f0 -/* D4BCA0 80240280 8E050000 */ lw $a1, ($s0) -/* D4BCA4 80240284 26100004 */ addiu $s0, $s0, 4 -/* D4BCA8 80240288 0220202D */ daddu $a0, $s1, $zero -/* D4BCAC 8024028C 0C0B210B */ jal get_float_variable -/* D4BCB0 80240290 46000506 */ mov.s $f20, $f0 -/* D4BCB4 80240294 8E050000 */ lw $a1, ($s0) -/* D4BCB8 80240298 26100004 */ addiu $s0, $s0, 4 -/* D4BCBC 8024029C 0220202D */ daddu $a0, $s1, $zero -/* D4BCC0 802402A0 0C0B210B */ jal get_float_variable -/* D4BCC4 802402A4 46000586 */ mov.s $f22, $f0 -/* D4BCC8 802402A8 0220202D */ daddu $a0, $s1, $zero -/* D4BCCC 802402AC 8E050000 */ lw $a1, ($s0) -/* D4BCD0 802402B0 0C0B210B */ jal get_float_variable -/* D4BCD4 802402B4 46000606 */ mov.s $f24, $f0 -/* D4BCD8 802402B8 3C065555 */ lui $a2, 0x5555 -/* D4BCDC 802402BC 3C078011 */ lui $a3, %hi(gPlayerStatus) -/* D4BCE0 802402C0 24E7EFC8 */ addiu $a3, $a3, %lo(gPlayerStatus) -/* D4BCE4 802402C4 94E200B0 */ lhu $v0, 0xb0($a3) -/* D4BCE8 802402C8 34C65556 */ ori $a2, $a2, 0x5556 -/* D4BCEC 802402CC 00021400 */ sll $v0, $v0, 0x10 -/* D4BCF0 802402D0 00022403 */ sra $a0, $v0, 0x10 -/* D4BCF4 802402D4 00041840 */ sll $v1, $a0, 1 -/* D4BCF8 802402D8 00660018 */ mult $v1, $a2 -/* D4BCFC 802402DC C4E20028 */ lwc1 $f2, 0x28($a3) -/* D4BD00 802402E0 46141080 */ add.s $f2, $f2, $f20 -/* D4BD04 802402E4 00005010 */ mfhi $t2 -/* D4BD08 802402E8 C4E4002C */ lwc1 $f4, 0x2c($a3) -/* D4BD0C 802402EC 00000000 */ nop -/* D4BD10 802402F0 00860018 */ mult $a0, $a2 -/* D4BD14 802402F4 00031FC3 */ sra $v1, $v1, 0x1f -/* D4BD18 802402F8 44051000 */ mfc1 $a1, $f2 -/* D4BD1C 802402FC 01431823 */ subu $v1, $t2, $v1 -/* D4BD20 80240300 44831000 */ mtc1 $v1, $f2 -/* D4BD24 80240304 00000000 */ nop -/* D4BD28 80240308 468010A0 */ cvt.s.w $f2, $f2 -/* D4BD2C 8024030C 46022100 */ add.s $f4, $f4, $f2 -/* D4BD30 80240310 26100004 */ addiu $s0, $s0, 4 -/* D4BD34 80240314 8E100000 */ lw $s0, ($s0) -/* D4BD38 80240318 46162100 */ add.s $f4, $f4, $f22 -/* D4BD3C 8024031C E7BA0014 */ swc1 $f26, 0x14($sp) -/* D4BD40 80240320 000217C3 */ sra $v0, $v0, 0x1f -/* D4BD44 80240324 00004010 */ mfhi $t0 -/* D4BD48 80240328 01021023 */ subu $v0, $t0, $v0 -/* D4BD4C 8024032C 00021400 */ sll $v0, $v0, 0x10 -/* D4BD50 80240330 00021403 */ sra $v0, $v0, 0x10 -/* D4BD54 80240334 44821000 */ mtc1 $v0, $f2 -/* D4BD58 80240338 00000000 */ nop -/* D4BD5C 8024033C 468010A0 */ cvt.s.w $f2, $f2 -/* D4BD60 80240340 46001080 */ add.s $f2, $f2, $f0 -/* D4BD64 80240344 C4E00030 */ lwc1 $f0, 0x30($a3) -/* D4BD68 80240348 46180000 */ add.s $f0, $f0, $f24 -/* D4BD6C 8024034C 0000202D */ daddu $a0, $zero, $zero -/* D4BD70 80240350 44062000 */ mfc1 $a2, $f4 -/* D4BD74 80240354 44070000 */ mfc1 $a3, $f0 -/* D4BD78 80240358 27A20020 */ addiu $v0, $sp, 0x20 -/* D4BD7C 8024035C AFA20018 */ sw $v0, 0x18($sp) -/* D4BD80 80240360 0C01C1FC */ jal fx_sleep_bubble -/* D4BD84 80240364 E7A20010 */ swc1 $f2, 0x10($sp) -/* D4BD88 80240368 0220202D */ daddu $a0, $s1, $zero -/* D4BD8C 8024036C 8FA60020 */ lw $a2, 0x20($sp) -/* D4BD90 80240370 0C0B2026 */ jal set_variable -/* D4BD94 80240374 0200282D */ daddu $a1, $s0, $zero -/* D4BD98 80240378 8FBF0030 */ lw $ra, 0x30($sp) -/* D4BD9C 8024037C 8FB1002C */ lw $s1, 0x2c($sp) -/* D4BDA0 80240380 8FB00028 */ lw $s0, 0x28($sp) -/* D4BDA4 80240384 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* D4BDA8 80240388 D7B80048 */ ldc1 $f24, 0x48($sp) -/* D4BDAC 8024038C D7B60040 */ ldc1 $f22, 0x40($sp) -/* D4BDB0 80240390 D7B40038 */ ldc1 $f20, 0x38($sp) -/* D4BDB4 80240394 24020002 */ addiu $v0, $zero, 2 -/* D4BDB8 80240398 03E00008 */ jr $ra -/* D4BDBC 8024039C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_sbk/sbk_00/func_80240040_929270.s b/asm/nonmatchings/world/area_sbk/sbk_00/func_80240040_929270.s deleted file mode 100644 index f2d33af5cd..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_00/func_80240040_929270.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_9292B0 -/* 9292B0 80240040 8C830148 */ lw $v1, 0x148($a0) -/* 9292B4 80240044 24020003 */ addiu $v0, $zero, 3 -/* 9292B8 80240048 A06200B5 */ sb $v0, 0xb5($v1) -/* 9292BC 8024004C 03E00008 */ jr $ra -/* 9292C0 80240050 24020002 */ addiu $v0, $zero, 2 -/* 9292C4 80240054 00000000 */ nop -/* 9292C8 80240058 00000000 */ nop -/* 9292CC 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_01/func_80240040_929A90.s b/asm/nonmatchings/world/area_sbk/sbk_01/func_80240040_929A90.s deleted file mode 100644 index 43c706843e..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_01/func_80240040_929A90.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_929AD0 -/* 929AD0 80240040 8C830148 */ lw $v1, 0x148($a0) -/* 929AD4 80240044 24020003 */ addiu $v0, $zero, 3 -/* 929AD8 80240048 A06200B5 */ sb $v0, 0xb5($v1) -/* 929ADC 8024004C 03E00008 */ jr $ra -/* 929AE0 80240050 24020002 */ addiu $v0, $zero, 2 -/* 929AE4 80240054 00000000 */ nop -/* 929AE8 80240058 00000000 */ nop -/* 929AEC 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/func_80240040_92A2B0.s b/asm/nonmatchings/world/area_sbk/sbk_02/func_80240040_92A2B0.s deleted file mode 100644 index 2ae2723580..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_02/func_80240040_92A2B0.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_92A2F0 -/* 92A2F0 80240040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 92A2F4 80240044 AFB10014 */ sw $s1, 0x14($sp) -/* 92A2F8 80240048 0080882D */ daddu $s1, $a0, $zero -/* 92A2FC 8024004C AFBF001C */ sw $ra, 0x1c($sp) -/* 92A300 80240050 AFB20018 */ sw $s2, 0x18($sp) -/* 92A304 80240054 AFB00010 */ sw $s0, 0x10($sp) -/* 92A308 80240058 8E30000C */ lw $s0, 0xc($s1) -/* 92A30C 8024005C 8E050000 */ lw $a1, ($s0) -/* 92A310 80240060 0C0B1EAF */ jal get_variable -/* 92A314 80240064 26100004 */ addiu $s0, $s0, 4 -/* 92A318 80240068 8E050000 */ lw $a1, ($s0) -/* 92A31C 8024006C 26100004 */ addiu $s0, $s0, 4 -/* 92A320 80240070 0220202D */ daddu $a0, $s1, $zero -/* 92A324 80240074 0C0B1EAF */ jal get_variable -/* 92A328 80240078 0040902D */ daddu $s2, $v0, $zero -/* 92A32C 8024007C 0220202D */ daddu $a0, $s1, $zero -/* 92A330 80240080 8E050000 */ lw $a1, ($s0) -/* 92A334 80240084 0C0B1EAF */ jal get_variable -/* 92A338 80240088 0040802D */ daddu $s0, $v0, $zero -/* 92A33C 8024008C 0040882D */ daddu $s1, $v0, $zero -/* 92A340 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 92A344 80240094 16020005 */ bne $s0, $v0, .L802400AC -/* 92A348 80240098 24020001 */ addiu $v0, $zero, 1 -/* 92A34C 8024009C 0C04760B */ jal func_8011D82C -/* 92A350 802400A0 0220202D */ daddu $a0, $s1, $zero -/* 92A354 802400A4 08090053 */ j .L8024014C -/* 92A358 802400A8 24020002 */ addiu $v0, $zero, 2 -.L802400AC: -/* 92A35C 802400AC 12420018 */ beq $s2, $v0, .L80240110 -/* 92A360 802400B0 2A420002 */ slti $v0, $s2, 2 -/* 92A364 802400B4 10400005 */ beqz $v0, .L802400CC -/* 92A368 802400B8 24020002 */ addiu $v0, $zero, 2 -/* 92A36C 802400BC 12400007 */ beqz $s2, .L802400DC -/* 92A370 802400C0 3412FFFF */ ori $s2, $zero, 0xffff -/* 92A374 802400C4 08090053 */ j .L8024014C -/* 92A378 802400C8 00000000 */ nop -.L802400CC: -/* 92A37C 802400CC 1242001B */ beq $s2, $v0, .L8024013C -/* 92A380 802400D0 24020002 */ addiu $v0, $zero, 2 -/* 92A384 802400D4 08090053 */ j .L8024014C -/* 92A388 802400D8 00000000 */ nop -.L802400DC: -/* 92A38C 802400DC 8E040000 */ lw $a0, ($s0) -/* 92A390 802400E0 1092001A */ beq $a0, $s2, .L8024014C -/* 92A394 802400E4 24020002 */ addiu $v0, $zero, 2 -/* 92A398 802400E8 0C046C04 */ jal get_model_list_index_from_tree_index -/* 92A39C 802400EC 26100004 */ addiu $s0, $s0, 4 -/* 92A3A0 802400F0 0C046B4C */ jal get_model_from_list_index -/* 92A3A4 802400F4 0040202D */ daddu $a0, $v0, $zero -/* 92A3A8 802400F8 0040202D */ daddu $a0, $v0, $zero -/* 92A3AC 802400FC 2405FFFF */ addiu $a1, $zero, -1 -/* 92A3B0 80240100 0C046F1F */ jal func_8011BC7C -/* 92A3B4 80240104 0220302D */ daddu $a2, $s1, $zero -/* 92A3B8 80240108 08090037 */ j .L802400DC -/* 92A3BC 8024010C 00000000 */ nop -.L80240110: -/* 92A3C0 80240110 3412FFFF */ ori $s2, $zero, 0xffff -.L80240114: -/* 92A3C4 80240114 8E020000 */ lw $v0, ($s0) -/* 92A3C8 80240118 1052000B */ beq $v0, $s2, .L80240148 -/* 92A3CC 8024011C 2405FFFF */ addiu $a1, $zero, -1 -/* 92A3D0 80240120 96040002 */ lhu $a0, 2($s0) -/* 92A3D4 80240124 0220302D */ daddu $a2, $s1, $zero -/* 92A3D8 80240128 26100004 */ addiu $s0, $s0, 4 -/* 92A3DC 8024012C 0C046E54 */ jal func_8011B950 -/* 92A3E0 80240130 0000382D */ daddu $a3, $zero, $zero -/* 92A3E4 80240134 08090045 */ j .L80240114 -/* 92A3E8 80240138 00000000 */ nop -.L8024013C: -/* 92A3EC 8024013C 3C028015 */ lui $v0, 0x8015 -/* 92A3F0 80240140 8C4212F0 */ lw $v0, 0x12f0($v0) -/* 92A3F4 80240144 A0510000 */ sb $s1, ($v0) -.L80240148: -/* 92A3F8 80240148 24020002 */ addiu $v0, $zero, 2 -.L8024014C: -/* 92A3FC 8024014C 8FBF001C */ lw $ra, 0x1c($sp) -/* 92A400 80240150 8FB20018 */ lw $s2, 0x18($sp) -/* 92A404 80240154 8FB10014 */ lw $s1, 0x14($sp) -/* 92A408 80240158 8FB00010 */ lw $s0, 0x10($sp) -/* 92A40C 8024015C 03E00008 */ jr $ra -/* 92A410 80240160 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/func_802406F0_92A2B0.s b/asm/nonmatchings/world/area_sbk/sbk_02/func_802406F0_92A2B0.s deleted file mode 100644 index f53da1be42..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_02/func_802406F0_92A2B0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406F0_92A9A0 -/* 92A9A0 802406F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 92A9A4 802406F4 AFB10014 */ sw $s1, 0x14($sp) -/* 92A9A8 802406F8 0080882D */ daddu $s1, $a0, $zero -/* 92A9AC 802406FC AFBF0018 */ sw $ra, 0x18($sp) -/* 92A9B0 80240700 AFB00010 */ sw $s0, 0x10($sp) -/* 92A9B4 80240704 8E30000C */ lw $s0, 0xc($s1) -/* 92A9B8 80240708 8E050000 */ lw $a1, ($s0) -/* 92A9BC 8024070C 0C0B1EAF */ jal get_variable -/* 92A9C0 80240710 26100004 */ addiu $s0, $s0, 4 -/* 92A9C4 80240714 0C00EAD2 */ jal get_npc_safe -/* 92A9C8 80240718 0040202D */ daddu $a0, $v0, $zero -/* 92A9CC 8024071C 10400005 */ beqz $v0, .L80240734 -/* 92A9D0 80240720 00000000 */ nop -/* 92A9D4 80240724 8E050000 */ lw $a1, ($s0) -/* 92A9D8 80240728 844600A8 */ lh $a2, 0xa8($v0) -/* 92A9DC 8024072C 0C0B2026 */ jal set_variable -/* 92A9E0 80240730 0220202D */ daddu $a0, $s1, $zero -.L80240734: -/* 92A9E4 80240734 8FBF0018 */ lw $ra, 0x18($sp) -/* 92A9E8 80240738 8FB10014 */ lw $s1, 0x14($sp) -/* 92A9EC 8024073C 8FB00010 */ lw $s0, 0x10($sp) -/* 92A9F0 80240740 24020002 */ addiu $v0, $zero, 2 -/* 92A9F4 80240744 03E00008 */ jr $ra -/* 92A9F8 80240748 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/func_8024074C_92A2B0.s b/asm/nonmatchings/world/area_sbk/sbk_02/func_8024074C_92A2B0.s deleted file mode 100644 index eed61a470f..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_02/func_8024074C_92A2B0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024074C_92A9FC -/* 92A9FC 8024074C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 92AA00 80240750 AFB10014 */ sw $s1, 0x14($sp) -/* 92AA04 80240754 0080882D */ daddu $s1, $a0, $zero -/* 92AA08 80240758 AFBF0024 */ sw $ra, 0x24($sp) -/* 92AA0C 8024075C AFB40020 */ sw $s4, 0x20($sp) -/* 92AA10 80240760 AFB3001C */ sw $s3, 0x1c($sp) -/* 92AA14 80240764 AFB20018 */ sw $s2, 0x18($sp) -/* 92AA18 80240768 AFB00010 */ sw $s0, 0x10($sp) -/* 92AA1C 8024076C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 92AA20 80240770 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 92AA24 80240774 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 92AA28 80240778 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 92AA2C 8024077C F7B40028 */ sdc1 $f20, 0x28($sp) -/* 92AA30 80240780 8E30000C */ lw $s0, 0xc($s1) -/* 92AA34 80240784 8E130000 */ lw $s3, ($s0) -/* 92AA38 80240788 26100004 */ addiu $s0, $s0, 4 -/* 92AA3C 8024078C 0C0B1EAF */ jal get_variable -/* 92AA40 80240790 0260282D */ daddu $a1, $s3, $zero -/* 92AA44 80240794 4482E000 */ mtc1 $v0, $f28 -/* 92AA48 80240798 00000000 */ nop -/* 92AA4C 8024079C 4680E720 */ cvt.s.w $f28, $f28 -/* 92AA50 802407A0 8E140000 */ lw $s4, ($s0) -/* 92AA54 802407A4 26100004 */ addiu $s0, $s0, 4 -/* 92AA58 802407A8 0220202D */ daddu $a0, $s1, $zero -/* 92AA5C 802407AC 0C0B1EAF */ jal get_variable -/* 92AA60 802407B0 0280282D */ daddu $a1, $s4, $zero -/* 92AA64 802407B4 4482D000 */ mtc1 $v0, $f26 -/* 92AA68 802407B8 00000000 */ nop -/* 92AA6C 802407BC 4680D6A0 */ cvt.s.w $f26, $f26 -/* 92AA70 802407C0 8E100000 */ lw $s0, ($s0) -/* 92AA74 802407C4 0220202D */ daddu $a0, $s1, $zero -/* 92AA78 802407C8 0C0B1EAF */ jal get_variable -/* 92AA7C 802407CC 0200282D */ daddu $a1, $s0, $zero -/* 92AA80 802407D0 4482C000 */ mtc1 $v0, $f24 -/* 92AA84 802407D4 00000000 */ nop -/* 92AA88 802407D8 4680C620 */ cvt.s.w $f24, $f24 -/* 92AA8C 802407DC 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 92AA90 802407E0 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 92AA94 802407E4 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 92AA98 802407E8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 92AA9C 802407EC C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 92AAA0 802407F0 44800000 */ mtc1 $zero, $f0 -/* 92AAA4 802407F4 00031080 */ sll $v0, $v1, 2 -/* 92AAA8 802407F8 00431021 */ addu $v0, $v0, $v1 -/* 92AAAC 802407FC 00021080 */ sll $v0, $v0, 2 -/* 92AAB0 80240800 00431023 */ subu $v0, $v0, $v1 -/* 92AAB4 80240804 000218C0 */ sll $v1, $v0, 3 -/* 92AAB8 80240808 00431021 */ addu $v0, $v0, $v1 -/* 92AABC 8024080C 000210C0 */ sll $v0, $v0, 3 -/* 92AAC0 80240810 46001032 */ c.eq.s $f2, $f0 -/* 92AAC4 80240814 3C01800B */ lui $at, 0x800b -/* 92AAC8 80240818 00220821 */ addu $at, $at, $v0 -/* 92AACC 8024081C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 92AAD0 80240820 45000005 */ bc1f .L80240838 -/* 92AAD4 80240824 00000000 */ nop -/* 92AAD8 80240828 3C0142C8 */ lui $at, 0x42c8 -/* 92AADC 8024082C 44810000 */ mtc1 $at, $f0 -/* 92AAE0 80240830 08090212 */ j .L80240848 -/* 92AAE4 80240834 4600B581 */ sub.s $f22, $f22, $f0 -.L80240838: -/* 92AAE8 80240838 3C0142C8 */ lui $at, 0x42c8 -/* 92AAEC 8024083C 44810000 */ mtc1 $at, $f0 -/* 92AAF0 80240840 00000000 */ nop -/* 92AAF4 80240844 4600B580 */ add.s $f22, $f22, $f0 -.L80240848: -/* 92AAF8 80240848 0C00A6C9 */ jal clamp_angle -/* 92AAFC 8024084C 4600B306 */ mov.s $f12, $f22 -/* 92AB00 80240850 46000586 */ mov.s $f22, $f0 -/* 92AB04 80240854 3C014170 */ lui $at, 0x4170 -/* 92AB08 80240858 4481A000 */ mtc1 $at, $f20 -/* 92AB0C 8024085C 0C00A8BB */ jal sin_deg -/* 92AB10 80240860 4600B306 */ mov.s $f12, $f22 -/* 92AB14 80240864 46140002 */ mul.s $f0, $f0, $f20 -/* 92AB18 80240868 00000000 */ nop -/* 92AB1C 8024086C 864200B0 */ lh $v0, 0xb0($s2) -/* 92AB20 80240870 3C013F00 */ lui $at, 0x3f00 -/* 92AB24 80240874 44812000 */ mtc1 $at, $f4 -/* 92AB28 80240878 44821000 */ mtc1 $v0, $f2 -/* 92AB2C 8024087C 00000000 */ nop -/* 92AB30 80240880 468010A0 */ cvt.s.w $f2, $f2 -/* 92AB34 80240884 46041082 */ mul.s $f2, $f2, $f4 -/* 92AB38 80240888 00000000 */ nop -/* 92AB3C 8024088C 4600E700 */ add.s $f28, $f28, $f0 -/* 92AB40 80240890 4602D680 */ add.s $f26, $f26, $f2 -/* 92AB44 80240894 0C00A8D4 */ jal cos_deg -/* 92AB48 80240898 4600B306 */ mov.s $f12, $f22 -/* 92AB4C 8024089C 46140002 */ mul.s $f0, $f0, $f20 -/* 92AB50 802408A0 00000000 */ nop -/* 92AB54 802408A4 0220202D */ daddu $a0, $s1, $zero -/* 92AB58 802408A8 0260282D */ daddu $a1, $s3, $zero -/* 92AB5C 802408AC 4600E18D */ trunc.w.s $f6, $f28 -/* 92AB60 802408B0 44063000 */ mfc1 $a2, $f6 -/* 92AB64 802408B4 0C0B2026 */ jal set_variable -/* 92AB68 802408B8 4600C601 */ sub.s $f24, $f24, $f0 -/* 92AB6C 802408BC 0220202D */ daddu $a0, $s1, $zero -/* 92AB70 802408C0 4600D18D */ trunc.w.s $f6, $f26 -/* 92AB74 802408C4 44063000 */ mfc1 $a2, $f6 -/* 92AB78 802408C8 0C0B2026 */ jal set_variable -/* 92AB7C 802408CC 0280282D */ daddu $a1, $s4, $zero -/* 92AB80 802408D0 0220202D */ daddu $a0, $s1, $zero -/* 92AB84 802408D4 4600C18D */ trunc.w.s $f6, $f24 -/* 92AB88 802408D8 44063000 */ mfc1 $a2, $f6 -/* 92AB8C 802408DC 0C0B2026 */ jal set_variable -/* 92AB90 802408E0 0200282D */ daddu $a1, $s0, $zero -/* 92AB94 802408E4 8FBF0024 */ lw $ra, 0x24($sp) -/* 92AB98 802408E8 8FB40020 */ lw $s4, 0x20($sp) -/* 92AB9C 802408EC 8FB3001C */ lw $s3, 0x1c($sp) -/* 92ABA0 802408F0 8FB20018 */ lw $s2, 0x18($sp) -/* 92ABA4 802408F4 8FB10014 */ lw $s1, 0x14($sp) -/* 92ABA8 802408F8 8FB00010 */ lw $s0, 0x10($sp) -/* 92ABAC 802408FC D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 92ABB0 80240900 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 92ABB4 80240904 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 92ABB8 80240908 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 92ABBC 8024090C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 92ABC0 80240910 24020002 */ addiu $v0, $zero, 2 -/* 92ABC4 80240914 03E00008 */ jr $ra -/* 92ABC8 80240918 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/func_80240B98_92A2B0.s b/asm/nonmatchings/world/area_sbk/sbk_02/func_80240B98_92A2B0.s deleted file mode 100644 index c3c22ad64a..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_02/func_80240B98_92A2B0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B98_92AE48 -/* 92AE48 80240B98 3C038011 */ lui $v1, %hi(gPlayerData) -/* 92AE4C 80240B9C 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 92AE50 80240BA0 8C6202BC */ lw $v0, 0x2bc($v1) -/* 92AE54 80240BA4 8C630324 */ lw $v1, 0x324($v1) -/* 92AE58 80240BA8 00431023 */ subu $v0, $v0, $v1 -/* 92AE5C 80240BAC 3C0391A2 */ lui $v1, 0x91a2 -/* 92AE60 80240BB0 3463B3C5 */ ori $v1, $v1, 0xb3c5 -/* 92AE64 80240BB4 00430019 */ multu $v0, $v1 -/* 92AE68 80240BB8 8C830084 */ lw $v1, 0x84($a0) -/* 92AE6C 80240BBC 00002810 */ mfhi $a1 -/* 92AE70 80240BC0 000512C2 */ srl $v0, $a1, 0xb -/* 92AE74 80240BC4 0043102A */ slt $v0, $v0, $v1 -/* 92AE78 80240BC8 AC820084 */ sw $v0, 0x84($a0) -/* 92AE7C 80240BCC 03E00008 */ jr $ra -/* 92AE80 80240BD0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sbk/sbk_03/func_80240040_92F8B0.s b/asm/nonmatchings/world/area_sbk/sbk_03/func_80240040_92F8B0.s deleted file mode 100644 index 7fbb874ad8..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_03/func_80240040_92F8B0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_92F8F0 -/* 92F8F0 80240040 8C830148 */ lw $v1, 0x148($a0) -/* 92F8F4 80240044 24020003 */ addiu $v0, $zero, 3 -/* 92F8F8 80240048 A06200B5 */ sb $v0, 0xb5($v1) -/* 92F8FC 8024004C 03E00008 */ jr $ra -/* 92F900 80240050 24020002 */ addiu $v0, $zero, 2 -/* 92F904 80240054 00000000 */ nop -/* 92F908 80240058 00000000 */ nop -/* 92F90C 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_04/func_80240040_9304D0.s b/asm/nonmatchings/world/area_sbk/sbk_04/func_80240040_9304D0.s deleted file mode 100644 index 892ab284c1..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_04/func_80240040_9304D0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_930510 -/* 930510 80240040 8C830148 */ lw $v1, 0x148($a0) -/* 930514 80240044 24020003 */ addiu $v0, $zero, 3 -/* 930518 80240048 A06200B5 */ sb $v0, 0xb5($v1) -/* 93051C 8024004C 03E00008 */ jr $ra -/* 930520 80240050 24020002 */ addiu $v0, $zero, 2 -/* 930524 80240054 00000000 */ nop -/* 930528 80240058 00000000 */ nop -/* 93052C 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_05/func_80240040_930CF0.s b/asm/nonmatchings/world/area_sbk/sbk_05/func_80240040_930CF0.s deleted file mode 100644 index 4f3b055a47..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_05/func_80240040_930CF0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_930D30 -/* 930D30 80240040 8C830148 */ lw $v1, 0x148($a0) -/* 930D34 80240044 24020003 */ addiu $v0, $zero, 3 -/* 930D38 80240048 A06200B5 */ sb $v0, 0xb5($v1) -/* 930D3C 8024004C 03E00008 */ jr $ra -/* 930D40 80240050 24020002 */ addiu $v0, $zero, 2 -/* 930D44 80240054 00000000 */ nop -/* 930D48 80240058 00000000 */ nop -/* 930D4C 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_06/func_80240040_9325C0.s b/asm/nonmatchings/world/area_sbk/sbk_06/func_80240040_9325C0.s deleted file mode 100644 index bb5cb2441e..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_06/func_80240040_9325C0.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_932600 -/* 932600 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 932604 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 932608 80240048 0080982D */ daddu $s3, $a0, $zero -/* 93260C 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 932610 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 932614 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 932618 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 93261C 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 932620 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 932624 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 932628 80240068 0260202D */ daddu $a0, $s3, $zero -/* 93262C 8024006C 8E050000 */ lw $a1, ($s0) -/* 932630 80240070 0C0B1EAF */ jal get_variable -/* 932634 80240074 26100004 */ addiu $s0, $s0, 4 -/* 932638 80240078 8E050000 */ lw $a1, ($s0) -/* 93263C 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 932640 80240080 0260202D */ daddu $a0, $s3, $zero -/* 932644 80240084 0C0B1EAF */ jal get_variable -/* 932648 80240088 0040882D */ daddu $s1, $v0, $zero -/* 93264C 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 932650 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 932654 80240094 8E120000 */ lw $s2, ($s0) -/* 932658 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 93265C 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 932660 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 932664 802400A4 08090030 */ j .L802400C0 -/* 932668 802400A8 00000000 */ nop -.L802400AC: -/* 93266C 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 932670 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 932674 802400B4 14400005 */ bnez $v0, .L802400CC -/* 932678 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 93267C 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 932680 802400C0 0C00EABB */ jal get_npc_unsafe -/* 932684 802400C4 00000000 */ nop -/* 932688 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 93268C 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 932690 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 932694 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 932698 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 93269C 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 9326A0 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 9326A4 802400E4 0C0B1EAF */ jal get_variable -/* 9326A8 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 9326AC 802400EC 1040000C */ beqz $v0, .L80240120 -/* 9326B0 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 9326B4 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9326B8 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 9326BC 802400FC 44810000 */ mtc1 $at, $f0 -/* 9326C0 80240100 00000000 */ nop -/* 9326C4 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 9326C8 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 9326CC 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 9326D0 80240110 44061000 */ mfc1 $a2, $f2 -/* 9326D4 80240114 0C04D083 */ jal set_item_entity_position -/* 9326D8 80240118 0280202D */ daddu $a0, $s4, $zero -/* 9326DC 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 9326E0 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 9326E4 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 9326E8 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 9326EC 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 9326F0 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 9326F4 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 9326F8 80240138 03E00008 */ jr $ra -/* 9326FC 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_06/func_802401B0_9325C0.s b/asm/nonmatchings/world/area_sbk/sbk_06/func_802401B0_9325C0.s deleted file mode 100644 index 37838747a5..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_06/func_802401B0_9325C0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_932770 -/* 932770 802401B0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 932774 802401B4 AFB10054 */ sw $s1, 0x54($sp) -/* 932778 802401B8 0080882D */ daddu $s1, $a0, $zero -/* 93277C 802401BC AFBF005C */ sw $ra, 0x5c($sp) -/* 932780 802401C0 AFB20058 */ sw $s2, 0x58($sp) -/* 932784 802401C4 AFB00050 */ sw $s0, 0x50($sp) -/* 932788 802401C8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 93278C 802401CC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 932790 802401D0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 932794 802401D4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 932798 802401D8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 93279C 802401DC 8E30000C */ lw $s0, 0xc($s1) -/* 9327A0 802401E0 8E050000 */ lw $a1, ($s0) -/* 9327A4 802401E4 0C0B1EAF */ jal get_variable -/* 9327A8 802401E8 26100004 */ addiu $s0, $s0, 4 -/* 9327AC 802401EC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 9327B0 802401F0 0040202D */ daddu $a0, $v0, $zero -/* 9327B4 802401F4 8E050000 */ lw $a1, ($s0) -/* 9327B8 802401F8 26100004 */ addiu $s0, $s0, 4 -/* 9327BC 802401FC 0220202D */ daddu $a0, $s1, $zero -/* 9327C0 80240200 0C0B210B */ jal get_float_variable -/* 9327C4 80240204 0040902D */ daddu $s2, $v0, $zero -/* 9327C8 80240208 8E050000 */ lw $a1, ($s0) -/* 9327CC 8024020C 26100004 */ addiu $s0, $s0, 4 -/* 9327D0 80240210 0220202D */ daddu $a0, $s1, $zero -/* 9327D4 80240214 0C0B210B */ jal get_float_variable -/* 9327D8 80240218 46000706 */ mov.s $f28, $f0 -/* 9327DC 8024021C 8E050000 */ lw $a1, ($s0) -/* 9327E0 80240220 26100004 */ addiu $s0, $s0, 4 -/* 9327E4 80240224 0220202D */ daddu $a0, $s1, $zero -/* 9327E8 80240228 0C0B210B */ jal get_float_variable -/* 9327EC 8024022C 46000686 */ mov.s $f26, $f0 -/* 9327F0 80240230 0220202D */ daddu $a0, $s1, $zero -/* 9327F4 80240234 8E050000 */ lw $a1, ($s0) -/* 9327F8 80240238 0C0B210B */ jal get_float_variable -/* 9327FC 8024023C 46000586 */ mov.s $f22, $f0 -/* 932800 80240240 0240202D */ daddu $a0, $s2, $zero -/* 932804 80240244 0C046B4C */ jal get_model_from_list_index -/* 932808 80240248 46000606 */ mov.s $f24, $f0 -/* 93280C 8024024C 0040882D */ daddu $s1, $v0, $zero -/* 932810 80240250 96220000 */ lhu $v0, ($s1) -/* 932814 80240254 30420400 */ andi $v0, $v0, 0x400 -/* 932818 80240258 1440001E */ bnez $v0, .L802402D4 -/* 93281C 8024025C 26300058 */ addiu $s0, $s1, 0x58 -/* 932820 80240260 4480A000 */ mtc1 $zero, $f20 -/* 932824 80240264 4406B000 */ mfc1 $a2, $f22 -/* 932828 80240268 4405A000 */ mfc1 $a1, $f20 -/* 93282C 8024026C 4407A000 */ mfc1 $a3, $f20 -/* 932830 80240270 0C019E40 */ jal guTranslateF -/* 932834 80240274 0200202D */ daddu $a0, $s0, $zero -/* 932838 80240278 4405E000 */ mfc1 $a1, $f28 -/* 93283C 8024027C 4406D000 */ mfc1 $a2, $f26 -/* 932840 80240280 4407C000 */ mfc1 $a3, $f24 -/* 932844 80240284 0C090050 */ jal func_80240140 -/* 932848 80240288 27A40010 */ addiu $a0, $sp, 0x10 -/* 93284C 8024028C 27A40010 */ addiu $a0, $sp, 0x10 -/* 932850 80240290 0200282D */ daddu $a1, $s0, $zero -/* 932854 80240294 0C019D80 */ jal guMtxCatF -/* 932858 80240298 0200302D */ daddu $a2, $s0, $zero -/* 93285C 8024029C 27A40010 */ addiu $a0, $sp, 0x10 -/* 932860 802402A0 4600B587 */ neg.s $f22, $f22 -/* 932864 802402A4 4405A000 */ mfc1 $a1, $f20 -/* 932868 802402A8 4406B000 */ mfc1 $a2, $f22 -/* 93286C 802402AC 0C019E40 */ jal guTranslateF -/* 932870 802402B0 00A0382D */ daddu $a3, $a1, $zero -/* 932874 802402B4 27A40010 */ addiu $a0, $sp, 0x10 -/* 932878 802402B8 0200282D */ daddu $a1, $s0, $zero -/* 93287C 802402BC 0C019D80 */ jal guMtxCatF -/* 932880 802402C0 00A0302D */ daddu $a2, $a1, $zero -/* 932884 802402C4 96220000 */ lhu $v0, ($s1) -/* 932888 802402C8 34421400 */ ori $v0, $v0, 0x1400 -/* 93288C 802402CC 080900D3 */ j .L8024034C -/* 932890 802402D0 A6220000 */ sh $v0, ($s1) -.L802402D4: -/* 932894 802402D4 4480A000 */ mtc1 $zero, $f20 -/* 932898 802402D8 4406B000 */ mfc1 $a2, $f22 -/* 93289C 802402DC 4405A000 */ mfc1 $a1, $f20 -/* 9328A0 802402E0 4407A000 */ mfc1 $a3, $f20 -/* 9328A4 802402E4 0C019E40 */ jal guTranslateF -/* 9328A8 802402E8 27A40010 */ addiu $a0, $sp, 0x10 -/* 9328AC 802402EC 27A40010 */ addiu $a0, $sp, 0x10 -/* 9328B0 802402F0 26300058 */ addiu $s0, $s1, 0x58 -/* 9328B4 802402F4 0200282D */ daddu $a1, $s0, $zero -/* 9328B8 802402F8 0C019D80 */ jal guMtxCatF -/* 9328BC 802402FC 0200302D */ daddu $a2, $s0, $zero -/* 9328C0 80240300 4405E000 */ mfc1 $a1, $f28 -/* 9328C4 80240304 4406D000 */ mfc1 $a2, $f26 -/* 9328C8 80240308 4407C000 */ mfc1 $a3, $f24 -/* 9328CC 8024030C 0C090050 */ jal func_80240140 -/* 9328D0 80240310 27A40010 */ addiu $a0, $sp, 0x10 -/* 9328D4 80240314 27A40010 */ addiu $a0, $sp, 0x10 -/* 9328D8 80240318 0200282D */ daddu $a1, $s0, $zero -/* 9328DC 8024031C 0C019D80 */ jal guMtxCatF -/* 9328E0 80240320 0200302D */ daddu $a2, $s0, $zero -/* 9328E4 80240324 27A40010 */ addiu $a0, $sp, 0x10 -/* 9328E8 80240328 4600B587 */ neg.s $f22, $f22 -/* 9328EC 8024032C 4405A000 */ mfc1 $a1, $f20 -/* 9328F0 80240330 4406B000 */ mfc1 $a2, $f22 -/* 9328F4 80240334 0C019E40 */ jal guTranslateF -/* 9328F8 80240338 00A0382D */ daddu $a3, $a1, $zero -/* 9328FC 8024033C 27A40010 */ addiu $a0, $sp, 0x10 -/* 932900 80240340 0200282D */ daddu $a1, $s0, $zero -/* 932904 80240344 0C019D80 */ jal guMtxCatF -/* 932908 80240348 00A0302D */ daddu $a2, $a1, $zero -.L8024034C: -/* 93290C 8024034C 8FBF005C */ lw $ra, 0x5c($sp) -/* 932910 80240350 8FB20058 */ lw $s2, 0x58($sp) -/* 932914 80240354 8FB10054 */ lw $s1, 0x54($sp) -/* 932918 80240358 8FB00050 */ lw $s0, 0x50($sp) -/* 93291C 8024035C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 932920 80240360 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 932924 80240364 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 932928 80240368 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 93292C 8024036C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 932930 80240370 24020002 */ addiu $v0, $zero, 2 -/* 932934 80240374 03E00008 */ jr $ra -/* 932938 80240378 27BD0088 */ addiu $sp, $sp, 0x88 -/* 93293C 8024037C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_11/func_80240040_934040.s b/asm/nonmatchings/world/area_sbk/sbk_11/func_80240040_934040.s deleted file mode 100644 index ea4cc0601b..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_11/func_80240040_934040.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_934080 -/* 934080 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 934084 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 934088 80240048 0080982D */ daddu $s3, $a0, $zero -/* 93408C 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 934090 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 934094 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 934098 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 93409C 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 9340A0 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 9340A4 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 9340A8 80240068 0260202D */ daddu $a0, $s3, $zero -/* 9340AC 8024006C 8E050000 */ lw $a1, ($s0) -/* 9340B0 80240070 0C0B1EAF */ jal get_variable -/* 9340B4 80240074 26100004 */ addiu $s0, $s0, 4 -/* 9340B8 80240078 8E050000 */ lw $a1, ($s0) -/* 9340BC 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 9340C0 80240080 0260202D */ daddu $a0, $s3, $zero -/* 9340C4 80240084 0C0B1EAF */ jal get_variable -/* 9340C8 80240088 0040882D */ daddu $s1, $v0, $zero -/* 9340CC 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 9340D0 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 9340D4 80240094 8E120000 */ lw $s2, ($s0) -/* 9340D8 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 9340DC 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 9340E0 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 9340E4 802400A4 08090030 */ j .L802400C0 -/* 9340E8 802400A8 00000000 */ nop -.L802400AC: -/* 9340EC 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 9340F0 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 9340F4 802400B4 14400005 */ bnez $v0, .L802400CC -/* 9340F8 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 9340FC 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 934100 802400C0 0C00EABB */ jal get_npc_unsafe -/* 934104 802400C4 00000000 */ nop -/* 934108 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 93410C 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 934110 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 934114 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 934118 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 93411C 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 934120 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 934124 802400E4 0C0B1EAF */ jal get_variable -/* 934128 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 93412C 802400EC 1040000C */ beqz $v0, .L80240120 -/* 934130 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 934134 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 934138 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 93413C 802400FC 44810000 */ mtc1 $at, $f0 -/* 934140 80240100 00000000 */ nop -/* 934144 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 934148 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 93414C 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 934150 80240110 44061000 */ mfc1 $a2, $f2 -/* 934154 80240114 0C04D083 */ jal set_item_entity_position -/* 934158 80240118 0280202D */ daddu $a0, $s4, $zero -/* 93415C 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 934160 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 934164 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 934168 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 93416C 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 934170 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 934174 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 934178 80240138 03E00008 */ jr $ra -/* 93417C 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_11/func_80240140_934040.s b/asm/nonmatchings/world/area_sbk/sbk_11/func_80240140_934040.s deleted file mode 100644 index cf9d924605..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_11/func_80240140_934040.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240140_934180 -/* 934180 80240140 8C830148 */ lw $v1, 0x148($a0) -/* 934184 80240144 24020003 */ addiu $v0, $zero, 3 -/* 934188 80240148 A06200B5 */ sb $v0, 0xb5($v1) -/* 93418C 8024014C 03E00008 */ jr $ra -/* 934190 80240150 24020002 */ addiu $v0, $zero, 2 -/* 934194 80240154 00000000 */ nop -/* 934198 80240158 00000000 */ nop -/* 93419C 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_12/func_80240040_934D40.s b/asm/nonmatchings/world/area_sbk/sbk_12/func_80240040_934D40.s deleted file mode 100644 index bd715a9d96..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_12/func_80240040_934D40.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_934D80 -/* 934D80 80240040 8C830148 */ lw $v1, 0x148($a0) -/* 934D84 80240044 24020003 */ addiu $v0, $zero, 3 -/* 934D88 80240048 A06200B5 */ sb $v0, 0xb5($v1) -/* 934D8C 8024004C 03E00008 */ jr $ra -/* 934D90 80240050 24020002 */ addiu $v0, $zero, 2 -/* 934D94 80240054 00000000 */ nop -/* 934D98 80240058 00000000 */ nop -/* 934D9C 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_13/func_80240040_9357E0.s b/asm/nonmatchings/world/area_sbk/sbk_13/func_80240040_9357E0.s deleted file mode 100644 index 2f431b592a..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_13/func_80240040_9357E0.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_935820 -/* 935820 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 935824 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 935828 80240048 0080982D */ daddu $s3, $a0, $zero -/* 93582C 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 935830 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 935834 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 935838 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 93583C 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 935840 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 935844 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 935848 80240068 0260202D */ daddu $a0, $s3, $zero -/* 93584C 8024006C 8E050000 */ lw $a1, ($s0) -/* 935850 80240070 0C0B1EAF */ jal get_variable -/* 935854 80240074 26100004 */ addiu $s0, $s0, 4 -/* 935858 80240078 8E050000 */ lw $a1, ($s0) -/* 93585C 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 935860 80240080 0260202D */ daddu $a0, $s3, $zero -/* 935864 80240084 0C0B1EAF */ jal get_variable -/* 935868 80240088 0040882D */ daddu $s1, $v0, $zero -/* 93586C 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 935870 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 935874 80240094 8E120000 */ lw $s2, ($s0) -/* 935878 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 93587C 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 935880 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 935884 802400A4 08090030 */ j .L802400C0 -/* 935888 802400A8 00000000 */ nop -.L802400AC: -/* 93588C 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 935890 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 935894 802400B4 14400005 */ bnez $v0, .L802400CC -/* 935898 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 93589C 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 9358A0 802400C0 0C00EABB */ jal get_npc_unsafe -/* 9358A4 802400C4 00000000 */ nop -/* 9358A8 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 9358AC 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 9358B0 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 9358B4 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 9358B8 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 9358BC 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 9358C0 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 9358C4 802400E4 0C0B1EAF */ jal get_variable -/* 9358C8 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 9358CC 802400EC 1040000C */ beqz $v0, .L80240120 -/* 9358D0 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 9358D4 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9358D8 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 9358DC 802400FC 44810000 */ mtc1 $at, $f0 -/* 9358E0 80240100 00000000 */ nop -/* 9358E4 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 9358E8 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 9358EC 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 9358F0 80240110 44061000 */ mfc1 $a2, $f2 -/* 9358F4 80240114 0C04D083 */ jal set_item_entity_position -/* 9358F8 80240118 0280202D */ daddu $a0, $s4, $zero -/* 9358FC 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 935900 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 935904 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 935908 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 93590C 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 935910 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 935914 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 935918 80240138 03E00008 */ jr $ra -/* 93591C 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_13/func_80240140_9357E0.s b/asm/nonmatchings/world/area_sbk/sbk_13/func_80240140_9357E0.s deleted file mode 100644 index e0efc6dc10..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_13/func_80240140_9357E0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240140_935920 -/* 935920 80240140 8C830148 */ lw $v1, 0x148($a0) -/* 935924 80240144 24020003 */ addiu $v0, $zero, 3 -/* 935928 80240148 A06200B5 */ sb $v0, 0xb5($v1) -/* 93592C 8024014C 03E00008 */ jr $ra -/* 935930 80240150 24020002 */ addiu $v0, $zero, 2 -/* 935934 80240154 00000000 */ nop -/* 935938 80240158 00000000 */ nop -/* 93593C 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_15/func_80240040_936CD0.s b/asm/nonmatchings/world/area_sbk/sbk_15/func_80240040_936CD0.s deleted file mode 100644 index a119d8ae0c..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_15/func_80240040_936CD0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_936D10 -/* 936D10 80240040 8C830148 */ lw $v1, 0x148($a0) -/* 936D14 80240044 24020003 */ addiu $v0, $zero, 3 -/* 936D18 80240048 A06200B5 */ sb $v0, 0xb5($v1) -/* 936D1C 8024004C 03E00008 */ jr $ra -/* 936D20 80240050 24020002 */ addiu $v0, $zero, 2 -/* 936D24 80240054 00000000 */ nop -/* 936D28 80240058 00000000 */ nop -/* 936D2C 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_16/func_80240040_937570.s b/asm/nonmatchings/world/area_sbk/sbk_16/func_80240040_937570.s deleted file mode 100644 index d3f6c55efb..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_16/func_80240040_937570.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_9375B0 -/* 9375B0 80240040 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9375B4 80240044 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 9375B8 80240048 4485A000 */ mtc1 $a1, $f20 -/* 9375BC 8024004C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 9375C0 80240050 4486B000 */ mtc1 $a2, $f22 -/* 9375C4 80240054 AFB00010 */ sw $s0, 0x10($sp) -/* 9375C8 80240058 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 9375CC 8024005C 4487C000 */ mtc1 $a3, $f24 -/* 9375D0 80240060 AFBF0014 */ sw $ra, 0x14($sp) -/* 9375D4 80240064 0C019D28 */ jal guMtxIdentF -/* 9375D8 80240068 0080802D */ daddu $s0, $a0, $zero -/* 9375DC 8024006C 4616A582 */ mul.s $f22, $f20, $f22 -/* 9375E0 80240070 00000000 */ nop -/* 9375E4 80240074 4618A502 */ mul.s $f20, $f20, $f24 -/* 9375E8 80240078 00000000 */ nop -/* 9375EC 8024007C 3C013F80 */ lui $at, 0x3f80 -/* 9375F0 80240080 44810000 */ mtc1 $at, $f0 -/* 9375F4 80240084 00000000 */ nop -/* 9375F8 80240088 E6000014 */ swc1 $f0, 0x14($s0) -/* 9375FC 8024008C E6160010 */ swc1 $f22, 0x10($s0) -/* 937600 80240090 E6140018 */ swc1 $f20, 0x18($s0) -/* 937604 80240094 8FBF0014 */ lw $ra, 0x14($sp) -/* 937608 80240098 8FB00010 */ lw $s0, 0x10($sp) -/* 93760C 8024009C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 937610 802400A0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 937614 802400A4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 937618 802400A8 03E00008 */ jr $ra -/* 93761C 802400AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_20/func_80240040_938590.s b/asm/nonmatchings/world/area_sbk/sbk_20/func_80240040_938590.s deleted file mode 100644 index b104f71612..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_20/func_80240040_938590.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_9385D0 -/* 9385D0 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9385D4 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 9385D8 80240048 0080982D */ daddu $s3, $a0, $zero -/* 9385DC 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 9385E0 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 9385E4 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 9385E8 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 9385EC 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 9385F0 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 9385F4 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 9385F8 80240068 0260202D */ daddu $a0, $s3, $zero -/* 9385FC 8024006C 8E050000 */ lw $a1, ($s0) -/* 938600 80240070 0C0B1EAF */ jal get_variable -/* 938604 80240074 26100004 */ addiu $s0, $s0, 4 -/* 938608 80240078 8E050000 */ lw $a1, ($s0) -/* 93860C 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 938610 80240080 0260202D */ daddu $a0, $s3, $zero -/* 938614 80240084 0C0B1EAF */ jal get_variable -/* 938618 80240088 0040882D */ daddu $s1, $v0, $zero -/* 93861C 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 938620 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 938624 80240094 8E120000 */ lw $s2, ($s0) -/* 938628 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 93862C 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 938630 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 938634 802400A4 08090030 */ j .L802400C0 -/* 938638 802400A8 00000000 */ nop -.L802400AC: -/* 93863C 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 938640 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 938644 802400B4 14400005 */ bnez $v0, .L802400CC -/* 938648 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 93864C 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 938650 802400C0 0C00EABB */ jal get_npc_unsafe -/* 938654 802400C4 00000000 */ nop -/* 938658 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 93865C 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 938660 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 938664 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 938668 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 93866C 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 938670 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 938674 802400E4 0C0B1EAF */ jal get_variable -/* 938678 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 93867C 802400EC 1040000C */ beqz $v0, .L80240120 -/* 938680 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 938684 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 938688 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 93868C 802400FC 44810000 */ mtc1 $at, $f0 -/* 938690 80240100 00000000 */ nop -/* 938694 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 938698 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 93869C 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 9386A0 80240110 44061000 */ mfc1 $a2, $f2 -/* 9386A4 80240114 0C04D083 */ jal set_item_entity_position -/* 9386A8 80240118 0280202D */ daddu $a0, $s4, $zero -/* 9386AC 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 9386B0 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 9386B4 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 9386B8 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 9386BC 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 9386C0 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 9386C4 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 9386C8 80240138 03E00008 */ jr $ra -/* 9386CC 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_22/func_80240040_939930.s b/asm/nonmatchings/world/area_sbk/sbk_22/func_80240040_939930.s deleted file mode 100644 index 006f4d78f2..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_22/func_80240040_939930.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_939970 -/* 939970 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 939974 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 939978 80240048 0080982D */ daddu $s3, $a0, $zero -/* 93997C 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 939980 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 939984 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 939988 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 93998C 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 939990 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 939994 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 939998 80240068 0260202D */ daddu $a0, $s3, $zero -/* 93999C 8024006C 8E050000 */ lw $a1, ($s0) -/* 9399A0 80240070 0C0B1EAF */ jal get_variable -/* 9399A4 80240074 26100004 */ addiu $s0, $s0, 4 -/* 9399A8 80240078 8E050000 */ lw $a1, ($s0) -/* 9399AC 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 9399B0 80240080 0260202D */ daddu $a0, $s3, $zero -/* 9399B4 80240084 0C0B1EAF */ jal get_variable -/* 9399B8 80240088 0040882D */ daddu $s1, $v0, $zero -/* 9399BC 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 9399C0 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 9399C4 80240094 8E120000 */ lw $s2, ($s0) -/* 9399C8 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 9399CC 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 9399D0 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 9399D4 802400A4 08090030 */ j .L802400C0 -/* 9399D8 802400A8 00000000 */ nop -.L802400AC: -/* 9399DC 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 9399E0 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 9399E4 802400B4 14400005 */ bnez $v0, .L802400CC -/* 9399E8 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 9399EC 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 9399F0 802400C0 0C00EABB */ jal get_npc_unsafe -/* 9399F4 802400C4 00000000 */ nop -/* 9399F8 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 9399FC 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 939A00 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 939A04 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 939A08 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 939A0C 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 939A10 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 939A14 802400E4 0C0B1EAF */ jal get_variable -/* 939A18 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 939A1C 802400EC 1040000C */ beqz $v0, .L80240120 -/* 939A20 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 939A24 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 939A28 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 939A2C 802400FC 44810000 */ mtc1 $at, $f0 -/* 939A30 80240100 00000000 */ nop -/* 939A34 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 939A38 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 939A3C 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 939A40 80240110 44061000 */ mfc1 $a2, $f2 -/* 939A44 80240114 0C04D083 */ jal set_item_entity_position -/* 939A48 80240118 0280202D */ daddu $a0, $s4, $zero -/* 939A4C 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 939A50 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 939A54 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 939A58 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 939A5C 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 939A60 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 939A64 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 939A68 80240138 03E00008 */ jr $ra -/* 939A6C 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_22/func_80240140_939930.s b/asm/nonmatchings/world/area_sbk/sbk_22/func_80240140_939930.s deleted file mode 100644 index 732c4a61a6..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_22/func_80240140_939930.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240140_939A70 -/* 939A70 80240140 8C830148 */ lw $v1, 0x148($a0) -/* 939A74 80240144 24020003 */ addiu $v0, $zero, 3 -/* 939A78 80240148 A06200B5 */ sb $v0, 0xb5($v1) -/* 939A7C 8024014C 03E00008 */ jr $ra -/* 939A80 80240150 24020002 */ addiu $v0, $zero, 2 -/* 939A84 80240154 00000000 */ nop -/* 939A88 80240158 00000000 */ nop -/* 939A8C 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_24/func_80240040_93AC30.s b/asm/nonmatchings/world/area_sbk/sbk_24/func_80240040_93AC30.s deleted file mode 100644 index e5a641a1e4..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_24/func_80240040_93AC30.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_93AC70 -/* 93AC70 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 93AC74 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 93AC78 80240048 0080982D */ daddu $s3, $a0, $zero -/* 93AC7C 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 93AC80 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 93AC84 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 93AC88 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 93AC8C 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 93AC90 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 93AC94 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 93AC98 80240068 0260202D */ daddu $a0, $s3, $zero -/* 93AC9C 8024006C 8E050000 */ lw $a1, ($s0) -/* 93ACA0 80240070 0C0B1EAF */ jal get_variable -/* 93ACA4 80240074 26100004 */ addiu $s0, $s0, 4 -/* 93ACA8 80240078 8E050000 */ lw $a1, ($s0) -/* 93ACAC 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 93ACB0 80240080 0260202D */ daddu $a0, $s3, $zero -/* 93ACB4 80240084 0C0B1EAF */ jal get_variable -/* 93ACB8 80240088 0040882D */ daddu $s1, $v0, $zero -/* 93ACBC 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 93ACC0 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 93ACC4 80240094 8E120000 */ lw $s2, ($s0) -/* 93ACC8 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 93ACCC 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 93ACD0 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 93ACD4 802400A4 08090030 */ j .L802400C0 -/* 93ACD8 802400A8 00000000 */ nop -.L802400AC: -/* 93ACDC 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 93ACE0 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 93ACE4 802400B4 14400005 */ bnez $v0, .L802400CC -/* 93ACE8 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 93ACEC 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 93ACF0 802400C0 0C00EABB */ jal get_npc_unsafe -/* 93ACF4 802400C4 00000000 */ nop -/* 93ACF8 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 93ACFC 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 93AD00 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 93AD04 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 93AD08 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 93AD0C 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 93AD10 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 93AD14 802400E4 0C0B1EAF */ jal get_variable -/* 93AD18 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 93AD1C 802400EC 1040000C */ beqz $v0, .L80240120 -/* 93AD20 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 93AD24 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 93AD28 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 93AD2C 802400FC 44810000 */ mtc1 $at, $f0 -/* 93AD30 80240100 00000000 */ nop -/* 93AD34 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 93AD38 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 93AD3C 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 93AD40 80240110 44061000 */ mfc1 $a2, $f2 -/* 93AD44 80240114 0C04D083 */ jal set_item_entity_position -/* 93AD48 80240118 0280202D */ daddu $a0, $s4, $zero -/* 93AD4C 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 93AD50 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 93AD54 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 93AD58 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 93AD5C 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 93AD60 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 93AD64 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 93AD68 80240138 03E00008 */ jr $ra -/* 93AD6C 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_24/func_80240140_93AC30.s b/asm/nonmatchings/world/area_sbk/sbk_24/func_80240140_93AC30.s deleted file mode 100644 index 11878168cf..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_24/func_80240140_93AC30.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240140_93AD70 -/* 93AD70 80240140 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 93AD74 80240144 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 93AD78 80240148 4485A000 */ mtc1 $a1, $f20 -/* 93AD7C 8024014C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 93AD80 80240150 4486B000 */ mtc1 $a2, $f22 -/* 93AD84 80240154 AFB00010 */ sw $s0, 0x10($sp) -/* 93AD88 80240158 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 93AD8C 8024015C 4487C000 */ mtc1 $a3, $f24 -/* 93AD90 80240160 AFBF0014 */ sw $ra, 0x14($sp) -/* 93AD94 80240164 0C019D28 */ jal guMtxIdentF -/* 93AD98 80240168 0080802D */ daddu $s0, $a0, $zero -/* 93AD9C 8024016C 4616A582 */ mul.s $f22, $f20, $f22 -/* 93ADA0 80240170 00000000 */ nop -/* 93ADA4 80240174 4618A502 */ mul.s $f20, $f20, $f24 -/* 93ADA8 80240178 00000000 */ nop -/* 93ADAC 8024017C 3C013F80 */ lui $at, 0x3f80 -/* 93ADB0 80240180 44810000 */ mtc1 $at, $f0 -/* 93ADB4 80240184 00000000 */ nop -/* 93ADB8 80240188 E6000014 */ swc1 $f0, 0x14($s0) -/* 93ADBC 8024018C E6160010 */ swc1 $f22, 0x10($s0) -/* 93ADC0 80240190 E6140018 */ swc1 $f20, 0x18($s0) -/* 93ADC4 80240194 8FBF0014 */ lw $ra, 0x14($sp) -/* 93ADC8 80240198 8FB00010 */ lw $s0, 0x10($sp) -/* 93ADCC 8024019C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 93ADD0 802401A0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 93ADD4 802401A4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 93ADD8 802401A8 03E00008 */ jr $ra -/* 93ADDC 802401AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_24/func_802401B0_93AC30.s b/asm/nonmatchings/world/area_sbk/sbk_24/func_802401B0_93AC30.s deleted file mode 100644 index c49b152608..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_24/func_802401B0_93AC30.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_93ADE0 -/* 93ADE0 802401B0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 93ADE4 802401B4 AFB10054 */ sw $s1, 0x54($sp) -/* 93ADE8 802401B8 0080882D */ daddu $s1, $a0, $zero -/* 93ADEC 802401BC AFBF005C */ sw $ra, 0x5c($sp) -/* 93ADF0 802401C0 AFB20058 */ sw $s2, 0x58($sp) -/* 93ADF4 802401C4 AFB00050 */ sw $s0, 0x50($sp) -/* 93ADF8 802401C8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 93ADFC 802401CC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 93AE00 802401D0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 93AE04 802401D4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 93AE08 802401D8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 93AE0C 802401DC 8E30000C */ lw $s0, 0xc($s1) -/* 93AE10 802401E0 8E050000 */ lw $a1, ($s0) -/* 93AE14 802401E4 0C0B1EAF */ jal get_variable -/* 93AE18 802401E8 26100004 */ addiu $s0, $s0, 4 -/* 93AE1C 802401EC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 93AE20 802401F0 0040202D */ daddu $a0, $v0, $zero -/* 93AE24 802401F4 8E050000 */ lw $a1, ($s0) -/* 93AE28 802401F8 26100004 */ addiu $s0, $s0, 4 -/* 93AE2C 802401FC 0220202D */ daddu $a0, $s1, $zero -/* 93AE30 80240200 0C0B210B */ jal get_float_variable -/* 93AE34 80240204 0040902D */ daddu $s2, $v0, $zero -/* 93AE38 80240208 8E050000 */ lw $a1, ($s0) -/* 93AE3C 8024020C 26100004 */ addiu $s0, $s0, 4 -/* 93AE40 80240210 0220202D */ daddu $a0, $s1, $zero -/* 93AE44 80240214 0C0B210B */ jal get_float_variable -/* 93AE48 80240218 46000706 */ mov.s $f28, $f0 -/* 93AE4C 8024021C 8E050000 */ lw $a1, ($s0) -/* 93AE50 80240220 26100004 */ addiu $s0, $s0, 4 -/* 93AE54 80240224 0220202D */ daddu $a0, $s1, $zero -/* 93AE58 80240228 0C0B210B */ jal get_float_variable -/* 93AE5C 8024022C 46000686 */ mov.s $f26, $f0 -/* 93AE60 80240230 0220202D */ daddu $a0, $s1, $zero -/* 93AE64 80240234 8E050000 */ lw $a1, ($s0) -/* 93AE68 80240238 0C0B210B */ jal get_float_variable -/* 93AE6C 8024023C 46000586 */ mov.s $f22, $f0 -/* 93AE70 80240240 0240202D */ daddu $a0, $s2, $zero -/* 93AE74 80240244 0C046B4C */ jal get_model_from_list_index -/* 93AE78 80240248 46000606 */ mov.s $f24, $f0 -/* 93AE7C 8024024C 0040882D */ daddu $s1, $v0, $zero -/* 93AE80 80240250 96220000 */ lhu $v0, ($s1) -/* 93AE84 80240254 30420400 */ andi $v0, $v0, 0x400 -/* 93AE88 80240258 1440001E */ bnez $v0, .L802402D4 -/* 93AE8C 8024025C 26300058 */ addiu $s0, $s1, 0x58 -/* 93AE90 80240260 4480A000 */ mtc1 $zero, $f20 -/* 93AE94 80240264 4406B000 */ mfc1 $a2, $f22 -/* 93AE98 80240268 4405A000 */ mfc1 $a1, $f20 -/* 93AE9C 8024026C 4407A000 */ mfc1 $a3, $f20 -/* 93AEA0 80240270 0C019E40 */ jal guTranslateF -/* 93AEA4 80240274 0200202D */ daddu $a0, $s0, $zero -/* 93AEA8 80240278 4405E000 */ mfc1 $a1, $f28 -/* 93AEAC 8024027C 4406D000 */ mfc1 $a2, $f26 -/* 93AEB0 80240280 4407C000 */ mfc1 $a3, $f24 -/* 93AEB4 80240284 0C090050 */ jal func_80240140 -/* 93AEB8 80240288 27A40010 */ addiu $a0, $sp, 0x10 -/* 93AEBC 8024028C 27A40010 */ addiu $a0, $sp, 0x10 -/* 93AEC0 80240290 0200282D */ daddu $a1, $s0, $zero -/* 93AEC4 80240294 0C019D80 */ jal guMtxCatF -/* 93AEC8 80240298 0200302D */ daddu $a2, $s0, $zero -/* 93AECC 8024029C 27A40010 */ addiu $a0, $sp, 0x10 -/* 93AED0 802402A0 4600B587 */ neg.s $f22, $f22 -/* 93AED4 802402A4 4405A000 */ mfc1 $a1, $f20 -/* 93AED8 802402A8 4406B000 */ mfc1 $a2, $f22 -/* 93AEDC 802402AC 0C019E40 */ jal guTranslateF -/* 93AEE0 802402B0 00A0382D */ daddu $a3, $a1, $zero -/* 93AEE4 802402B4 27A40010 */ addiu $a0, $sp, 0x10 -/* 93AEE8 802402B8 0200282D */ daddu $a1, $s0, $zero -/* 93AEEC 802402BC 0C019D80 */ jal guMtxCatF -/* 93AEF0 802402C0 00A0302D */ daddu $a2, $a1, $zero -/* 93AEF4 802402C4 96220000 */ lhu $v0, ($s1) -/* 93AEF8 802402C8 34421400 */ ori $v0, $v0, 0x1400 -/* 93AEFC 802402CC 080900D3 */ j .L8024034C -/* 93AF00 802402D0 A6220000 */ sh $v0, ($s1) -.L802402D4: -/* 93AF04 802402D4 4480A000 */ mtc1 $zero, $f20 -/* 93AF08 802402D8 4406B000 */ mfc1 $a2, $f22 -/* 93AF0C 802402DC 4405A000 */ mfc1 $a1, $f20 -/* 93AF10 802402E0 4407A000 */ mfc1 $a3, $f20 -/* 93AF14 802402E4 0C019E40 */ jal guTranslateF -/* 93AF18 802402E8 27A40010 */ addiu $a0, $sp, 0x10 -/* 93AF1C 802402EC 27A40010 */ addiu $a0, $sp, 0x10 -/* 93AF20 802402F0 26300058 */ addiu $s0, $s1, 0x58 -/* 93AF24 802402F4 0200282D */ daddu $a1, $s0, $zero -/* 93AF28 802402F8 0C019D80 */ jal guMtxCatF -/* 93AF2C 802402FC 0200302D */ daddu $a2, $s0, $zero -/* 93AF30 80240300 4405E000 */ mfc1 $a1, $f28 -/* 93AF34 80240304 4406D000 */ mfc1 $a2, $f26 -/* 93AF38 80240308 4407C000 */ mfc1 $a3, $f24 -/* 93AF3C 8024030C 0C090050 */ jal func_80240140 -/* 93AF40 80240310 27A40010 */ addiu $a0, $sp, 0x10 -/* 93AF44 80240314 27A40010 */ addiu $a0, $sp, 0x10 -/* 93AF48 80240318 0200282D */ daddu $a1, $s0, $zero -/* 93AF4C 8024031C 0C019D80 */ jal guMtxCatF -/* 93AF50 80240320 0200302D */ daddu $a2, $s0, $zero -/* 93AF54 80240324 27A40010 */ addiu $a0, $sp, 0x10 -/* 93AF58 80240328 4600B587 */ neg.s $f22, $f22 -/* 93AF5C 8024032C 4405A000 */ mfc1 $a1, $f20 -/* 93AF60 80240330 4406B000 */ mfc1 $a2, $f22 -/* 93AF64 80240334 0C019E40 */ jal guTranslateF -/* 93AF68 80240338 00A0382D */ daddu $a3, $a1, $zero -/* 93AF6C 8024033C 27A40010 */ addiu $a0, $sp, 0x10 -/* 93AF70 80240340 0200282D */ daddu $a1, $s0, $zero -/* 93AF74 80240344 0C019D80 */ jal guMtxCatF -/* 93AF78 80240348 00A0302D */ daddu $a2, $a1, $zero -.L8024034C: -/* 93AF7C 8024034C 8FBF005C */ lw $ra, 0x5c($sp) -/* 93AF80 80240350 8FB20058 */ lw $s2, 0x58($sp) -/* 93AF84 80240354 8FB10054 */ lw $s1, 0x54($sp) -/* 93AF88 80240358 8FB00050 */ lw $s0, 0x50($sp) -/* 93AF8C 8024035C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 93AF90 80240360 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 93AF94 80240364 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 93AF98 80240368 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 93AF9C 8024036C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 93AFA0 80240370 24020002 */ addiu $v0, $zero, 2 -/* 93AFA4 80240374 03E00008 */ jr $ra -/* 93AFA8 80240378 27BD0088 */ addiu $sp, $sp, 0x88 -/* 93AFAC 8024037C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_25/func_80240040_93C280.s b/asm/nonmatchings/world/area_sbk/sbk_25/func_80240040_93C280.s deleted file mode 100644 index 6dc03982b7..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_25/func_80240040_93C280.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_93C2C0 -/* 93C2C0 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 93C2C4 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 93C2C8 80240048 0080982D */ daddu $s3, $a0, $zero -/* 93C2CC 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 93C2D0 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 93C2D4 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 93C2D8 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 93C2DC 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 93C2E0 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 93C2E4 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 93C2E8 80240068 0260202D */ daddu $a0, $s3, $zero -/* 93C2EC 8024006C 8E050000 */ lw $a1, ($s0) -/* 93C2F0 80240070 0C0B1EAF */ jal get_variable -/* 93C2F4 80240074 26100004 */ addiu $s0, $s0, 4 -/* 93C2F8 80240078 8E050000 */ lw $a1, ($s0) -/* 93C2FC 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 93C300 80240080 0260202D */ daddu $a0, $s3, $zero -/* 93C304 80240084 0C0B1EAF */ jal get_variable -/* 93C308 80240088 0040882D */ daddu $s1, $v0, $zero -/* 93C30C 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 93C310 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 93C314 80240094 8E120000 */ lw $s2, ($s0) -/* 93C318 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 93C31C 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 93C320 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 93C324 802400A4 08090030 */ j .L802400C0 -/* 93C328 802400A8 00000000 */ nop -.L802400AC: -/* 93C32C 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 93C330 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 93C334 802400B4 14400005 */ bnez $v0, .L802400CC -/* 93C338 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 93C33C 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 93C340 802400C0 0C00EABB */ jal get_npc_unsafe -/* 93C344 802400C4 00000000 */ nop -/* 93C348 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 93C34C 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 93C350 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 93C354 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 93C358 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 93C35C 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 93C360 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 93C364 802400E4 0C0B1EAF */ jal get_variable -/* 93C368 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 93C36C 802400EC 1040000C */ beqz $v0, .L80240120 -/* 93C370 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 93C374 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 93C378 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 93C37C 802400FC 44810000 */ mtc1 $at, $f0 -/* 93C380 80240100 00000000 */ nop -/* 93C384 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 93C388 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 93C38C 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 93C390 80240110 44061000 */ mfc1 $a2, $f2 -/* 93C394 80240114 0C04D083 */ jal set_item_entity_position -/* 93C398 80240118 0280202D */ daddu $a0, $s4, $zero -/* 93C39C 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 93C3A0 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 93C3A4 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 93C3A8 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 93C3AC 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 93C3B0 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 93C3B4 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 93C3B8 80240138 03E00008 */ jr $ra -/* 93C3BC 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_25/func_80240140_93C280.s b/asm/nonmatchings/world/area_sbk/sbk_25/func_80240140_93C280.s deleted file mode 100644 index 48a4200cbb..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_25/func_80240140_93C280.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240140_93C3C0 -/* 93C3C0 80240140 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 93C3C4 80240144 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 93C3C8 80240148 4485A000 */ mtc1 $a1, $f20 -/* 93C3CC 8024014C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 93C3D0 80240150 4486B000 */ mtc1 $a2, $f22 -/* 93C3D4 80240154 AFB00010 */ sw $s0, 0x10($sp) -/* 93C3D8 80240158 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 93C3DC 8024015C 4487C000 */ mtc1 $a3, $f24 -/* 93C3E0 80240160 AFBF0014 */ sw $ra, 0x14($sp) -/* 93C3E4 80240164 0C019D28 */ jal guMtxIdentF -/* 93C3E8 80240168 0080802D */ daddu $s0, $a0, $zero -/* 93C3EC 8024016C 4616A582 */ mul.s $f22, $f20, $f22 -/* 93C3F0 80240170 00000000 */ nop -/* 93C3F4 80240174 4618A502 */ mul.s $f20, $f20, $f24 -/* 93C3F8 80240178 00000000 */ nop -/* 93C3FC 8024017C 3C013F80 */ lui $at, 0x3f80 -/* 93C400 80240180 44810000 */ mtc1 $at, $f0 -/* 93C404 80240184 00000000 */ nop -/* 93C408 80240188 E6000014 */ swc1 $f0, 0x14($s0) -/* 93C40C 8024018C E6160010 */ swc1 $f22, 0x10($s0) -/* 93C410 80240190 E6140018 */ swc1 $f20, 0x18($s0) -/* 93C414 80240194 8FBF0014 */ lw $ra, 0x14($sp) -/* 93C418 80240198 8FB00010 */ lw $s0, 0x10($sp) -/* 93C41C 8024019C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 93C420 802401A0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 93C424 802401A4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 93C428 802401A8 03E00008 */ jr $ra -/* 93C42C 802401AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_25/func_802401B0_93C280.s b/asm/nonmatchings/world/area_sbk/sbk_25/func_802401B0_93C280.s deleted file mode 100644 index 36f76908e5..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_25/func_802401B0_93C280.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_93C430 -/* 93C430 802401B0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 93C434 802401B4 AFB10054 */ sw $s1, 0x54($sp) -/* 93C438 802401B8 0080882D */ daddu $s1, $a0, $zero -/* 93C43C 802401BC AFBF005C */ sw $ra, 0x5c($sp) -/* 93C440 802401C0 AFB20058 */ sw $s2, 0x58($sp) -/* 93C444 802401C4 AFB00050 */ sw $s0, 0x50($sp) -/* 93C448 802401C8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 93C44C 802401CC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 93C450 802401D0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 93C454 802401D4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 93C458 802401D8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 93C45C 802401DC 8E30000C */ lw $s0, 0xc($s1) -/* 93C460 802401E0 8E050000 */ lw $a1, ($s0) -/* 93C464 802401E4 0C0B1EAF */ jal get_variable -/* 93C468 802401E8 26100004 */ addiu $s0, $s0, 4 -/* 93C46C 802401EC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 93C470 802401F0 0040202D */ daddu $a0, $v0, $zero -/* 93C474 802401F4 8E050000 */ lw $a1, ($s0) -/* 93C478 802401F8 26100004 */ addiu $s0, $s0, 4 -/* 93C47C 802401FC 0220202D */ daddu $a0, $s1, $zero -/* 93C480 80240200 0C0B210B */ jal get_float_variable -/* 93C484 80240204 0040902D */ daddu $s2, $v0, $zero -/* 93C488 80240208 8E050000 */ lw $a1, ($s0) -/* 93C48C 8024020C 26100004 */ addiu $s0, $s0, 4 -/* 93C490 80240210 0220202D */ daddu $a0, $s1, $zero -/* 93C494 80240214 0C0B210B */ jal get_float_variable -/* 93C498 80240218 46000706 */ mov.s $f28, $f0 -/* 93C49C 8024021C 8E050000 */ lw $a1, ($s0) -/* 93C4A0 80240220 26100004 */ addiu $s0, $s0, 4 -/* 93C4A4 80240224 0220202D */ daddu $a0, $s1, $zero -/* 93C4A8 80240228 0C0B210B */ jal get_float_variable -/* 93C4AC 8024022C 46000686 */ mov.s $f26, $f0 -/* 93C4B0 80240230 0220202D */ daddu $a0, $s1, $zero -/* 93C4B4 80240234 8E050000 */ lw $a1, ($s0) -/* 93C4B8 80240238 0C0B210B */ jal get_float_variable -/* 93C4BC 8024023C 46000586 */ mov.s $f22, $f0 -/* 93C4C0 80240240 0240202D */ daddu $a0, $s2, $zero -/* 93C4C4 80240244 0C046B4C */ jal get_model_from_list_index -/* 93C4C8 80240248 46000606 */ mov.s $f24, $f0 -/* 93C4CC 8024024C 0040882D */ daddu $s1, $v0, $zero -/* 93C4D0 80240250 96220000 */ lhu $v0, ($s1) -/* 93C4D4 80240254 30420400 */ andi $v0, $v0, 0x400 -/* 93C4D8 80240258 1440001E */ bnez $v0, .L802402D4 -/* 93C4DC 8024025C 26300058 */ addiu $s0, $s1, 0x58 -/* 93C4E0 80240260 4480A000 */ mtc1 $zero, $f20 -/* 93C4E4 80240264 4406B000 */ mfc1 $a2, $f22 -/* 93C4E8 80240268 4405A000 */ mfc1 $a1, $f20 -/* 93C4EC 8024026C 4407A000 */ mfc1 $a3, $f20 -/* 93C4F0 80240270 0C019E40 */ jal guTranslateF -/* 93C4F4 80240274 0200202D */ daddu $a0, $s0, $zero -/* 93C4F8 80240278 4405E000 */ mfc1 $a1, $f28 -/* 93C4FC 8024027C 4406D000 */ mfc1 $a2, $f26 -/* 93C500 80240280 4407C000 */ mfc1 $a3, $f24 -/* 93C504 80240284 0C090050 */ jal func_80240140 -/* 93C508 80240288 27A40010 */ addiu $a0, $sp, 0x10 -/* 93C50C 8024028C 27A40010 */ addiu $a0, $sp, 0x10 -/* 93C510 80240290 0200282D */ daddu $a1, $s0, $zero -/* 93C514 80240294 0C019D80 */ jal guMtxCatF -/* 93C518 80240298 0200302D */ daddu $a2, $s0, $zero -/* 93C51C 8024029C 27A40010 */ addiu $a0, $sp, 0x10 -/* 93C520 802402A0 4600B587 */ neg.s $f22, $f22 -/* 93C524 802402A4 4405A000 */ mfc1 $a1, $f20 -/* 93C528 802402A8 4406B000 */ mfc1 $a2, $f22 -/* 93C52C 802402AC 0C019E40 */ jal guTranslateF -/* 93C530 802402B0 00A0382D */ daddu $a3, $a1, $zero -/* 93C534 802402B4 27A40010 */ addiu $a0, $sp, 0x10 -/* 93C538 802402B8 0200282D */ daddu $a1, $s0, $zero -/* 93C53C 802402BC 0C019D80 */ jal guMtxCatF -/* 93C540 802402C0 00A0302D */ daddu $a2, $a1, $zero -/* 93C544 802402C4 96220000 */ lhu $v0, ($s1) -/* 93C548 802402C8 34421400 */ ori $v0, $v0, 0x1400 -/* 93C54C 802402CC 080900D3 */ j .L8024034C -/* 93C550 802402D0 A6220000 */ sh $v0, ($s1) -.L802402D4: -/* 93C554 802402D4 4480A000 */ mtc1 $zero, $f20 -/* 93C558 802402D8 4406B000 */ mfc1 $a2, $f22 -/* 93C55C 802402DC 4405A000 */ mfc1 $a1, $f20 -/* 93C560 802402E0 4407A000 */ mfc1 $a3, $f20 -/* 93C564 802402E4 0C019E40 */ jal guTranslateF -/* 93C568 802402E8 27A40010 */ addiu $a0, $sp, 0x10 -/* 93C56C 802402EC 27A40010 */ addiu $a0, $sp, 0x10 -/* 93C570 802402F0 26300058 */ addiu $s0, $s1, 0x58 -/* 93C574 802402F4 0200282D */ daddu $a1, $s0, $zero -/* 93C578 802402F8 0C019D80 */ jal guMtxCatF -/* 93C57C 802402FC 0200302D */ daddu $a2, $s0, $zero -/* 93C580 80240300 4405E000 */ mfc1 $a1, $f28 -/* 93C584 80240304 4406D000 */ mfc1 $a2, $f26 -/* 93C588 80240308 4407C000 */ mfc1 $a3, $f24 -/* 93C58C 8024030C 0C090050 */ jal func_80240140 -/* 93C590 80240310 27A40010 */ addiu $a0, $sp, 0x10 -/* 93C594 80240314 27A40010 */ addiu $a0, $sp, 0x10 -/* 93C598 80240318 0200282D */ daddu $a1, $s0, $zero -/* 93C59C 8024031C 0C019D80 */ jal guMtxCatF -/* 93C5A0 80240320 0200302D */ daddu $a2, $s0, $zero -/* 93C5A4 80240324 27A40010 */ addiu $a0, $sp, 0x10 -/* 93C5A8 80240328 4600B587 */ neg.s $f22, $f22 -/* 93C5AC 8024032C 4405A000 */ mfc1 $a1, $f20 -/* 93C5B0 80240330 4406B000 */ mfc1 $a2, $f22 -/* 93C5B4 80240334 0C019E40 */ jal guTranslateF -/* 93C5B8 80240338 00A0382D */ daddu $a3, $a1, $zero -/* 93C5BC 8024033C 27A40010 */ addiu $a0, $sp, 0x10 -/* 93C5C0 80240340 0200282D */ daddu $a1, $s0, $zero -/* 93C5C4 80240344 0C019D80 */ jal guMtxCatF -/* 93C5C8 80240348 00A0302D */ daddu $a2, $a1, $zero -.L8024034C: -/* 93C5CC 8024034C 8FBF005C */ lw $ra, 0x5c($sp) -/* 93C5D0 80240350 8FB20058 */ lw $s2, 0x58($sp) -/* 93C5D4 80240354 8FB10054 */ lw $s1, 0x54($sp) -/* 93C5D8 80240358 8FB00050 */ lw $s0, 0x50($sp) -/* 93C5DC 8024035C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 93C5E0 80240360 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 93C5E4 80240364 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 93C5E8 80240368 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 93C5EC 8024036C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 93C5F0 80240370 24020002 */ addiu $v0, $zero, 2 -/* 93C5F4 80240374 03E00008 */ jr $ra -/* 93C5F8 80240378 27BD0088 */ addiu $sp, $sp, 0x88 -/* 93C5FC 8024037C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_26/func_80240040_93DCD0.s b/asm/nonmatchings/world/area_sbk/sbk_26/func_80240040_93DCD0.s deleted file mode 100644 index 5fbc9defb1..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_26/func_80240040_93DCD0.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_93DD10 -/* 93DD10 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 93DD14 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 93DD18 80240048 0080982D */ daddu $s3, $a0, $zero -/* 93DD1C 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 93DD20 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 93DD24 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 93DD28 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 93DD2C 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 93DD30 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 93DD34 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 93DD38 80240068 0260202D */ daddu $a0, $s3, $zero -/* 93DD3C 8024006C 8E050000 */ lw $a1, ($s0) -/* 93DD40 80240070 0C0B1EAF */ jal get_variable -/* 93DD44 80240074 26100004 */ addiu $s0, $s0, 4 -/* 93DD48 80240078 8E050000 */ lw $a1, ($s0) -/* 93DD4C 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 93DD50 80240080 0260202D */ daddu $a0, $s3, $zero -/* 93DD54 80240084 0C0B1EAF */ jal get_variable -/* 93DD58 80240088 0040882D */ daddu $s1, $v0, $zero -/* 93DD5C 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 93DD60 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 93DD64 80240094 8E120000 */ lw $s2, ($s0) -/* 93DD68 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 93DD6C 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 93DD70 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 93DD74 802400A4 08090030 */ j .L802400C0 -/* 93DD78 802400A8 00000000 */ nop -.L802400AC: -/* 93DD7C 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 93DD80 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 93DD84 802400B4 14400005 */ bnez $v0, .L802400CC -/* 93DD88 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 93DD8C 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 93DD90 802400C0 0C00EABB */ jal get_npc_unsafe -/* 93DD94 802400C4 00000000 */ nop -/* 93DD98 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 93DD9C 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 93DDA0 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 93DDA4 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 93DDA8 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 93DDAC 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 93DDB0 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 93DDB4 802400E4 0C0B1EAF */ jal get_variable -/* 93DDB8 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 93DDBC 802400EC 1040000C */ beqz $v0, .L80240120 -/* 93DDC0 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 93DDC4 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 93DDC8 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 93DDCC 802400FC 44810000 */ mtc1 $at, $f0 -/* 93DDD0 80240100 00000000 */ nop -/* 93DDD4 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 93DDD8 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 93DDDC 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 93DDE0 80240110 44061000 */ mfc1 $a2, $f2 -/* 93DDE4 80240114 0C04D083 */ jal set_item_entity_position -/* 93DDE8 80240118 0280202D */ daddu $a0, $s4, $zero -/* 93DDEC 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 93DDF0 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 93DDF4 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 93DDF8 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 93DDFC 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 93DE00 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 93DE04 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 93DE08 80240138 03E00008 */ jr $ra -/* 93DE0C 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_26/func_80240140_93DCD0.s b/asm/nonmatchings/world/area_sbk/sbk_26/func_80240140_93DCD0.s deleted file mode 100644 index 7f4ce5383d..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_26/func_80240140_93DCD0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240140_93DE10 -/* 93DE10 80240140 8C830148 */ lw $v1, 0x148($a0) -/* 93DE14 80240144 24020003 */ addiu $v0, $zero, 3 -/* 93DE18 80240148 A06200B5 */ sb $v0, 0xb5($v1) -/* 93DE1C 8024014C 03E00008 */ jr $ra -/* 93DE20 80240150 24020002 */ addiu $v0, $zero, 2 -/* 93DE24 80240154 00000000 */ nop -/* 93DE28 80240158 00000000 */ nop -/* 93DE2C 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_26/func_80240160_93DCD0.s b/asm/nonmatchings/world/area_sbk/sbk_26/func_80240160_93DCD0.s deleted file mode 100644 index 3d98f4f959..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_26/func_80240160_93DCD0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240160_93DE30 -/* 93DE30 80240160 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 93DE34 80240164 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 93DE38 80240168 4485A000 */ mtc1 $a1, $f20 -/* 93DE3C 8024016C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 93DE40 80240170 4486B000 */ mtc1 $a2, $f22 -/* 93DE44 80240174 AFB00010 */ sw $s0, 0x10($sp) -/* 93DE48 80240178 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 93DE4C 8024017C 4487C000 */ mtc1 $a3, $f24 -/* 93DE50 80240180 AFBF0014 */ sw $ra, 0x14($sp) -/* 93DE54 80240184 0C019D28 */ jal guMtxIdentF -/* 93DE58 80240188 0080802D */ daddu $s0, $a0, $zero -/* 93DE5C 8024018C 4616A582 */ mul.s $f22, $f20, $f22 -/* 93DE60 80240190 00000000 */ nop -/* 93DE64 80240194 4618A502 */ mul.s $f20, $f20, $f24 -/* 93DE68 80240198 00000000 */ nop -/* 93DE6C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* 93DE70 802401A0 44810000 */ mtc1 $at, $f0 -/* 93DE74 802401A4 00000000 */ nop -/* 93DE78 802401A8 E6000014 */ swc1 $f0, 0x14($s0) -/* 93DE7C 802401AC E6160010 */ swc1 $f22, 0x10($s0) -/* 93DE80 802401B0 E6140018 */ swc1 $f20, 0x18($s0) -/* 93DE84 802401B4 8FBF0014 */ lw $ra, 0x14($sp) -/* 93DE88 802401B8 8FB00010 */ lw $s0, 0x10($sp) -/* 93DE8C 802401BC D7B80028 */ ldc1 $f24, 0x28($sp) -/* 93DE90 802401C0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 93DE94 802401C4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 93DE98 802401C8 03E00008 */ jr $ra -/* 93DE9C 802401CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_26/func_802401D0_93DCD0.s b/asm/nonmatchings/world/area_sbk/sbk_26/func_802401D0_93DCD0.s deleted file mode 100644 index e0b3b2dfa3..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_26/func_802401D0_93DCD0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_93DEA0 -/* 93DEA0 802401D0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 93DEA4 802401D4 AFB10054 */ sw $s1, 0x54($sp) -/* 93DEA8 802401D8 0080882D */ daddu $s1, $a0, $zero -/* 93DEAC 802401DC AFBF005C */ sw $ra, 0x5c($sp) -/* 93DEB0 802401E0 AFB20058 */ sw $s2, 0x58($sp) -/* 93DEB4 802401E4 AFB00050 */ sw $s0, 0x50($sp) -/* 93DEB8 802401E8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 93DEBC 802401EC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 93DEC0 802401F0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 93DEC4 802401F4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 93DEC8 802401F8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 93DECC 802401FC 8E30000C */ lw $s0, 0xc($s1) -/* 93DED0 80240200 8E050000 */ lw $a1, ($s0) -/* 93DED4 80240204 0C0B1EAF */ jal get_variable -/* 93DED8 80240208 26100004 */ addiu $s0, $s0, 4 -/* 93DEDC 8024020C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 93DEE0 80240210 0040202D */ daddu $a0, $v0, $zero -/* 93DEE4 80240214 8E050000 */ lw $a1, ($s0) -/* 93DEE8 80240218 26100004 */ addiu $s0, $s0, 4 -/* 93DEEC 8024021C 0220202D */ daddu $a0, $s1, $zero -/* 93DEF0 80240220 0C0B210B */ jal get_float_variable -/* 93DEF4 80240224 0040902D */ daddu $s2, $v0, $zero -/* 93DEF8 80240228 8E050000 */ lw $a1, ($s0) -/* 93DEFC 8024022C 26100004 */ addiu $s0, $s0, 4 -/* 93DF00 80240230 0220202D */ daddu $a0, $s1, $zero -/* 93DF04 80240234 0C0B210B */ jal get_float_variable -/* 93DF08 80240238 46000706 */ mov.s $f28, $f0 -/* 93DF0C 8024023C 8E050000 */ lw $a1, ($s0) -/* 93DF10 80240240 26100004 */ addiu $s0, $s0, 4 -/* 93DF14 80240244 0220202D */ daddu $a0, $s1, $zero -/* 93DF18 80240248 0C0B210B */ jal get_float_variable -/* 93DF1C 8024024C 46000686 */ mov.s $f26, $f0 -/* 93DF20 80240250 0220202D */ daddu $a0, $s1, $zero -/* 93DF24 80240254 8E050000 */ lw $a1, ($s0) -/* 93DF28 80240258 0C0B210B */ jal get_float_variable -/* 93DF2C 8024025C 46000586 */ mov.s $f22, $f0 -/* 93DF30 80240260 0240202D */ daddu $a0, $s2, $zero -/* 93DF34 80240264 0C046B4C */ jal get_model_from_list_index -/* 93DF38 80240268 46000606 */ mov.s $f24, $f0 -/* 93DF3C 8024026C 0040882D */ daddu $s1, $v0, $zero -/* 93DF40 80240270 96220000 */ lhu $v0, ($s1) -/* 93DF44 80240274 30420400 */ andi $v0, $v0, 0x400 -/* 93DF48 80240278 1440001E */ bnez $v0, .L802402F4 -/* 93DF4C 8024027C 26300058 */ addiu $s0, $s1, 0x58 -/* 93DF50 80240280 4480A000 */ mtc1 $zero, $f20 -/* 93DF54 80240284 4406B000 */ mfc1 $a2, $f22 -/* 93DF58 80240288 4405A000 */ mfc1 $a1, $f20 -/* 93DF5C 8024028C 4407A000 */ mfc1 $a3, $f20 -/* 93DF60 80240290 0C019E40 */ jal guTranslateF -/* 93DF64 80240294 0200202D */ daddu $a0, $s0, $zero -/* 93DF68 80240298 4405E000 */ mfc1 $a1, $f28 -/* 93DF6C 8024029C 4406D000 */ mfc1 $a2, $f26 -/* 93DF70 802402A0 4407C000 */ mfc1 $a3, $f24 -/* 93DF74 802402A4 0C090058 */ jal func_80240160 -/* 93DF78 802402A8 27A40010 */ addiu $a0, $sp, 0x10 -/* 93DF7C 802402AC 27A40010 */ addiu $a0, $sp, 0x10 -/* 93DF80 802402B0 0200282D */ daddu $a1, $s0, $zero -/* 93DF84 802402B4 0C019D80 */ jal guMtxCatF -/* 93DF88 802402B8 0200302D */ daddu $a2, $s0, $zero -/* 93DF8C 802402BC 27A40010 */ addiu $a0, $sp, 0x10 -/* 93DF90 802402C0 4600B587 */ neg.s $f22, $f22 -/* 93DF94 802402C4 4405A000 */ mfc1 $a1, $f20 -/* 93DF98 802402C8 4406B000 */ mfc1 $a2, $f22 -/* 93DF9C 802402CC 0C019E40 */ jal guTranslateF -/* 93DFA0 802402D0 00A0382D */ daddu $a3, $a1, $zero -/* 93DFA4 802402D4 27A40010 */ addiu $a0, $sp, 0x10 -/* 93DFA8 802402D8 0200282D */ daddu $a1, $s0, $zero -/* 93DFAC 802402DC 0C019D80 */ jal guMtxCatF -/* 93DFB0 802402E0 00A0302D */ daddu $a2, $a1, $zero -/* 93DFB4 802402E4 96220000 */ lhu $v0, ($s1) -/* 93DFB8 802402E8 34421400 */ ori $v0, $v0, 0x1400 -/* 93DFBC 802402EC 080900DB */ j .L8024036C -/* 93DFC0 802402F0 A6220000 */ sh $v0, ($s1) -.L802402F4: -/* 93DFC4 802402F4 4480A000 */ mtc1 $zero, $f20 -/* 93DFC8 802402F8 4406B000 */ mfc1 $a2, $f22 -/* 93DFCC 802402FC 4405A000 */ mfc1 $a1, $f20 -/* 93DFD0 80240300 4407A000 */ mfc1 $a3, $f20 -/* 93DFD4 80240304 0C019E40 */ jal guTranslateF -/* 93DFD8 80240308 27A40010 */ addiu $a0, $sp, 0x10 -/* 93DFDC 8024030C 27A40010 */ addiu $a0, $sp, 0x10 -/* 93DFE0 80240310 26300058 */ addiu $s0, $s1, 0x58 -/* 93DFE4 80240314 0200282D */ daddu $a1, $s0, $zero -/* 93DFE8 80240318 0C019D80 */ jal guMtxCatF -/* 93DFEC 8024031C 0200302D */ daddu $a2, $s0, $zero -/* 93DFF0 80240320 4405E000 */ mfc1 $a1, $f28 -/* 93DFF4 80240324 4406D000 */ mfc1 $a2, $f26 -/* 93DFF8 80240328 4407C000 */ mfc1 $a3, $f24 -/* 93DFFC 8024032C 0C090058 */ jal func_80240160 -/* 93E000 80240330 27A40010 */ addiu $a0, $sp, 0x10 -/* 93E004 80240334 27A40010 */ addiu $a0, $sp, 0x10 -/* 93E008 80240338 0200282D */ daddu $a1, $s0, $zero -/* 93E00C 8024033C 0C019D80 */ jal guMtxCatF -/* 93E010 80240340 0200302D */ daddu $a2, $s0, $zero -/* 93E014 80240344 27A40010 */ addiu $a0, $sp, 0x10 -/* 93E018 80240348 4600B587 */ neg.s $f22, $f22 -/* 93E01C 8024034C 4405A000 */ mfc1 $a1, $f20 -/* 93E020 80240350 4406B000 */ mfc1 $a2, $f22 -/* 93E024 80240354 0C019E40 */ jal guTranslateF -/* 93E028 80240358 00A0382D */ daddu $a3, $a1, $zero -/* 93E02C 8024035C 27A40010 */ addiu $a0, $sp, 0x10 -/* 93E030 80240360 0200282D */ daddu $a1, $s0, $zero -/* 93E034 80240364 0C019D80 */ jal guMtxCatF -/* 93E038 80240368 00A0302D */ daddu $a2, $a1, $zero -.L8024036C: -/* 93E03C 8024036C 8FBF005C */ lw $ra, 0x5c($sp) -/* 93E040 80240370 8FB20058 */ lw $s2, 0x58($sp) -/* 93E044 80240374 8FB10054 */ lw $s1, 0x54($sp) -/* 93E048 80240378 8FB00050 */ lw $s0, 0x50($sp) -/* 93E04C 8024037C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 93E050 80240380 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 93E054 80240384 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 93E058 80240388 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 93E05C 8024038C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 93E060 80240390 24020002 */ addiu $v0, $zero, 2 -/* 93E064 80240394 03E00008 */ jr $ra -/* 93E068 80240398 27BD0088 */ addiu $sp, $sp, 0x88 -/* 93E06C 8024039C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240040_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_80240040_93F5B0.s deleted file mode 100644 index eb961720e7..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240040_93F5B0.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_93F5F0 -/* 93F5F0 80240040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 93F5F4 80240044 AFB10014 */ sw $s1, 0x14($sp) -/* 93F5F8 80240048 0080882D */ daddu $s1, $a0, $zero -/* 93F5FC 8024004C AFBF001C */ sw $ra, 0x1c($sp) -/* 93F600 80240050 AFB20018 */ sw $s2, 0x18($sp) -/* 93F604 80240054 AFB00010 */ sw $s0, 0x10($sp) -/* 93F608 80240058 8E30000C */ lw $s0, 0xc($s1) -/* 93F60C 8024005C 8E050000 */ lw $a1, ($s0) -/* 93F610 80240060 0C0B1EAF */ jal get_variable -/* 93F614 80240064 26100004 */ addiu $s0, $s0, 4 -/* 93F618 80240068 8E050000 */ lw $a1, ($s0) -/* 93F61C 8024006C 26100004 */ addiu $s0, $s0, 4 -/* 93F620 80240070 0220202D */ daddu $a0, $s1, $zero -/* 93F624 80240074 0C0B1EAF */ jal get_variable -/* 93F628 80240078 0040902D */ daddu $s2, $v0, $zero -/* 93F62C 8024007C 0220202D */ daddu $a0, $s1, $zero -/* 93F630 80240080 8E050000 */ lw $a1, ($s0) -/* 93F634 80240084 0C0B1EAF */ jal get_variable -/* 93F638 80240088 0040802D */ daddu $s0, $v0, $zero -/* 93F63C 8024008C 0040882D */ daddu $s1, $v0, $zero -/* 93F640 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 93F644 80240094 16020005 */ bne $s0, $v0, .L802400AC -/* 93F648 80240098 24020001 */ addiu $v0, $zero, 1 -/* 93F64C 8024009C 0C04760B */ jal func_8011D82C -/* 93F650 802400A0 0220202D */ daddu $a0, $s1, $zero -/* 93F654 802400A4 08090053 */ j .L8024014C -/* 93F658 802400A8 24020002 */ addiu $v0, $zero, 2 -.L802400AC: -/* 93F65C 802400AC 12420018 */ beq $s2, $v0, .L80240110 -/* 93F660 802400B0 2A420002 */ slti $v0, $s2, 2 -/* 93F664 802400B4 10400005 */ beqz $v0, .L802400CC -/* 93F668 802400B8 24020002 */ addiu $v0, $zero, 2 -/* 93F66C 802400BC 12400007 */ beqz $s2, .L802400DC -/* 93F670 802400C0 3412FFFF */ ori $s2, $zero, 0xffff -/* 93F674 802400C4 08090053 */ j .L8024014C -/* 93F678 802400C8 00000000 */ nop -.L802400CC: -/* 93F67C 802400CC 1242001B */ beq $s2, $v0, .L8024013C -/* 93F680 802400D0 24020002 */ addiu $v0, $zero, 2 -/* 93F684 802400D4 08090053 */ j .L8024014C -/* 93F688 802400D8 00000000 */ nop -.L802400DC: -/* 93F68C 802400DC 8E040000 */ lw $a0, ($s0) -/* 93F690 802400E0 1092001A */ beq $a0, $s2, .L8024014C -/* 93F694 802400E4 24020002 */ addiu $v0, $zero, 2 -/* 93F698 802400E8 0C046C04 */ jal get_model_list_index_from_tree_index -/* 93F69C 802400EC 26100004 */ addiu $s0, $s0, 4 -/* 93F6A0 802400F0 0C046B4C */ jal get_model_from_list_index -/* 93F6A4 802400F4 0040202D */ daddu $a0, $v0, $zero -/* 93F6A8 802400F8 0040202D */ daddu $a0, $v0, $zero -/* 93F6AC 802400FC 2405FFFF */ addiu $a1, $zero, -1 -/* 93F6B0 80240100 0C046F1F */ jal func_8011BC7C -/* 93F6B4 80240104 0220302D */ daddu $a2, $s1, $zero -/* 93F6B8 80240108 08090037 */ j .L802400DC -/* 93F6BC 8024010C 00000000 */ nop -.L80240110: -/* 93F6C0 80240110 3412FFFF */ ori $s2, $zero, 0xffff -.L80240114: -/* 93F6C4 80240114 8E020000 */ lw $v0, ($s0) -/* 93F6C8 80240118 1052000B */ beq $v0, $s2, .L80240148 -/* 93F6CC 8024011C 2405FFFF */ addiu $a1, $zero, -1 -/* 93F6D0 80240120 96040002 */ lhu $a0, 2($s0) -/* 93F6D4 80240124 0220302D */ daddu $a2, $s1, $zero -/* 93F6D8 80240128 26100004 */ addiu $s0, $s0, 4 -/* 93F6DC 8024012C 0C046E54 */ jal func_8011B950 -/* 93F6E0 80240130 0000382D */ daddu $a3, $zero, $zero -/* 93F6E4 80240134 08090045 */ j .L80240114 -/* 93F6E8 80240138 00000000 */ nop -.L8024013C: -/* 93F6EC 8024013C 3C028015 */ lui $v0, 0x8015 -/* 93F6F0 80240140 8C4212F0 */ lw $v0, 0x12f0($v0) -/* 93F6F4 80240144 A0510000 */ sb $s1, ($v0) -.L80240148: -/* 93F6F8 80240148 24020002 */ addiu $v0, $zero, 2 -.L8024014C: -/* 93F6FC 8024014C 8FBF001C */ lw $ra, 0x1c($sp) -/* 93F700 80240150 8FB20018 */ lw $s2, 0x18($sp) -/* 93F704 80240154 8FB10014 */ lw $s1, 0x14($sp) -/* 93F708 80240158 8FB00010 */ lw $s0, 0x10($sp) -/* 93F70C 8024015C 03E00008 */ jr $ra -/* 93F710 80240160 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240164_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_80240164_93F5B0.s deleted file mode 100644 index bf7a421977..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240164_93F5B0.s +++ /dev/null @@ -1,126 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240164_93F714 -/* 93F714 80240164 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 93F718 80240168 AFB10034 */ sw $s1, 0x34($sp) -/* 93F71C 8024016C 0080882D */ daddu $s1, $a0, $zero -/* 93F720 80240170 AFBF0054 */ sw $ra, 0x54($sp) -/* 93F724 80240174 AFBE0050 */ sw $fp, 0x50($sp) -/* 93F728 80240178 AFB7004C */ sw $s7, 0x4c($sp) -/* 93F72C 8024017C AFB60048 */ sw $s6, 0x48($sp) -/* 93F730 80240180 AFB50044 */ sw $s5, 0x44($sp) -/* 93F734 80240184 AFB40040 */ sw $s4, 0x40($sp) -/* 93F738 80240188 AFB3003C */ sw $s3, 0x3c($sp) -/* 93F73C 8024018C AFB20038 */ sw $s2, 0x38($sp) -/* 93F740 80240190 AFB00030 */ sw $s0, 0x30($sp) -/* 93F744 80240194 8E30000C */ lw $s0, 0xc($s1) -/* 93F748 80240198 8E050000 */ lw $a1, ($s0) -/* 93F74C 8024019C 0C0B1EAF */ jal get_variable -/* 93F750 802401A0 26100004 */ addiu $s0, $s0, 4 -/* 93F754 802401A4 8E050000 */ lw $a1, ($s0) -/* 93F758 802401A8 26100004 */ addiu $s0, $s0, 4 -/* 93F75C 802401AC 0220202D */ daddu $a0, $s1, $zero -/* 93F760 802401B0 0C0B1EAF */ jal get_variable -/* 93F764 802401B4 0040982D */ daddu $s3, $v0, $zero -/* 93F768 802401B8 8E050000 */ lw $a1, ($s0) -/* 93F76C 802401BC 26100004 */ addiu $s0, $s0, 4 -/* 93F770 802401C0 0220202D */ daddu $a0, $s1, $zero -/* 93F774 802401C4 0C0B1EAF */ jal get_variable -/* 93F778 802401C8 0040B02D */ daddu $s6, $v0, $zero -/* 93F77C 802401CC 8E050000 */ lw $a1, ($s0) -/* 93F780 802401D0 26100004 */ addiu $s0, $s0, 4 -/* 93F784 802401D4 0220202D */ daddu $a0, $s1, $zero -/* 93F788 802401D8 0C0B1EAF */ jal get_variable -/* 93F78C 802401DC 0040A82D */ daddu $s5, $v0, $zero -/* 93F790 802401E0 8E050000 */ lw $a1, ($s0) -/* 93F794 802401E4 26100004 */ addiu $s0, $s0, 4 -/* 93F798 802401E8 0220202D */ daddu $a0, $s1, $zero -/* 93F79C 802401EC 0C0B1EAF */ jal get_variable -/* 93F7A0 802401F0 0040A02D */ daddu $s4, $v0, $zero -/* 93F7A4 802401F4 8E050000 */ lw $a1, ($s0) -/* 93F7A8 802401F8 26100004 */ addiu $s0, $s0, 4 -/* 93F7AC 802401FC 0220202D */ daddu $a0, $s1, $zero -/* 93F7B0 80240200 0C0B1EAF */ jal get_variable -/* 93F7B4 80240204 0040902D */ daddu $s2, $v0, $zero -/* 93F7B8 80240208 8E050000 */ lw $a1, ($s0) -/* 93F7BC 8024020C 26100004 */ addiu $s0, $s0, 4 -/* 93F7C0 80240210 0220202D */ daddu $a0, $s1, $zero -/* 93F7C4 80240214 0C0B1EAF */ jal get_variable -/* 93F7C8 80240218 AFA20028 */ sw $v0, 0x28($sp) -/* 93F7CC 8024021C 8E050000 */ lw $a1, ($s0) -/* 93F7D0 80240220 26100004 */ addiu $s0, $s0, 4 -/* 93F7D4 80240224 0220202D */ daddu $a0, $s1, $zero -/* 93F7D8 80240228 0C0B1EAF */ jal get_variable -/* 93F7DC 8024022C 0040F02D */ daddu $fp, $v0, $zero -/* 93F7E0 80240230 8E050000 */ lw $a1, ($s0) -/* 93F7E4 80240234 26100004 */ addiu $s0, $s0, 4 -/* 93F7E8 80240238 0220202D */ daddu $a0, $s1, $zero -/* 93F7EC 8024023C 0C0B1EAF */ jal get_variable -/* 93F7F0 80240240 0040B82D */ daddu $s7, $v0, $zero -/* 93F7F4 80240244 0220202D */ daddu $a0, $s1, $zero -/* 93F7F8 80240248 8E050000 */ lw $a1, ($s0) -/* 93F7FC 8024024C 0C0B1EAF */ jal get_variable -/* 93F800 80240250 0040802D */ daddu $s0, $v0, $zero -/* 93F804 80240254 0040182D */ daddu $v1, $v0, $zero -/* 93F808 80240258 24020002 */ addiu $v0, $zero, 2 -/* 93F80C 8024025C 12620012 */ beq $s3, $v0, .L802402A8 -/* 93F810 80240260 2A620003 */ slti $v0, $s3, 3 -/* 93F814 80240264 10400005 */ beqz $v0, .L8024027C -/* 93F818 80240268 24020001 */ addiu $v0, $zero, 1 -/* 93F81C 8024026C 12620008 */ beq $s3, $v0, .L80240290 -/* 93F820 80240270 32C400FF */ andi $a0, $s6, 0xff -/* 93F824 80240274 080900C1 */ j .L80240304 -/* 93F828 80240278 00000000 */ nop -.L8024027C: -/* 93F82C 8024027C 24020003 */ addiu $v0, $zero, 3 -/* 93F830 80240280 12620018 */ beq $s3, $v0, .L802402E4 -/* 93F834 80240284 32C400FF */ andi $a0, $s6, 0xff -/* 93F838 80240288 080900C1 */ j .L80240304 -/* 93F83C 8024028C 00000000 */ nop -.L80240290: -/* 93F840 80240290 32A500FF */ andi $a1, $s5, 0xff -/* 93F844 80240294 328600FF */ andi $a2, $s4, 0xff -/* 93F848 80240298 0C046F97 */ jal set_background_color_blend -/* 93F84C 8024029C 324700FF */ andi $a3, $s2, 0xff -/* 93F850 802402A0 080900C1 */ j .L80240304 -/* 93F854 802402A4 00000000 */ nop -.L802402A8: -/* 93F858 802402A8 32C400FF */ andi $a0, $s6, 0xff -/* 93F85C 802402AC 32A500FF */ andi $a1, $s5, 0xff -/* 93F860 802402B0 328600FF */ andi $a2, $s4, 0xff -/* 93F864 802402B4 324700FF */ andi $a3, $s2, 0xff -/* 93F868 802402B8 93A2002B */ lbu $v0, 0x2b($sp) -/* 93F86C 802402BC AFB0001C */ sw $s0, 0x1c($sp) -/* 93F870 802402C0 AFA30020 */ sw $v1, 0x20($sp) -/* 93F874 802402C4 AFA20010 */ sw $v0, 0x10($sp) -/* 93F878 802402C8 33C200FF */ andi $v0, $fp, 0xff -/* 93F87C 802402CC AFA20014 */ sw $v0, 0x14($sp) -/* 93F880 802402D0 32E200FF */ andi $v0, $s7, 0xff -/* 93F884 802402D4 0C046FAD */ jal func_8011BEB4 -/* 93F888 802402D8 AFA20018 */ sw $v0, 0x18($sp) -/* 93F88C 802402DC 080900C1 */ j .L80240304 -/* 93F890 802402E0 00000000 */ nop -.L802402E4: -/* 93F894 802402E4 32A500FF */ andi $a1, $s5, 0xff -/* 93F898 802402E8 328600FF */ andi $a2, $s4, 0xff -/* 93F89C 802402EC 324700FF */ andi $a3, $s2, 0xff -/* 93F8A0 802402F0 93A2002B */ lbu $v0, 0x2b($sp) -/* 93F8A4 802402F4 AFA20010 */ sw $v0, 0x10($sp) -/* 93F8A8 802402F8 33C200FF */ andi $v0, $fp, 0xff -/* 93F8AC 802402FC 0C046FE6 */ jal func_8011BF98 -/* 93F8B0 80240300 AFA20014 */ sw $v0, 0x14($sp) -.L80240304: -/* 93F8B4 80240304 8FBF0054 */ lw $ra, 0x54($sp) -/* 93F8B8 80240308 8FBE0050 */ lw $fp, 0x50($sp) -/* 93F8BC 8024030C 8FB7004C */ lw $s7, 0x4c($sp) -/* 93F8C0 80240310 8FB60048 */ lw $s6, 0x48($sp) -/* 93F8C4 80240314 8FB50044 */ lw $s5, 0x44($sp) -/* 93F8C8 80240318 8FB40040 */ lw $s4, 0x40($sp) -/* 93F8CC 8024031C 8FB3003C */ lw $s3, 0x3c($sp) -/* 93F8D0 80240320 8FB20038 */ lw $s2, 0x38($sp) -/* 93F8D4 80240324 8FB10034 */ lw $s1, 0x34($sp) -/* 93F8D8 80240328 8FB00030 */ lw $s0, 0x30($sp) -/* 93F8DC 8024032C 24020002 */ addiu $v0, $zero, 2 -/* 93F8E0 80240330 03E00008 */ jr $ra -/* 93F8E4 80240334 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240338_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_80240338_93F5B0.s deleted file mode 100644 index affeb9099b..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240338_93F5B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240338_93F8E8 -/* 93F8E8 80240338 44800000 */ mtc1 $zero, $f0 -/* 93F8EC 8024033C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 93F8F0 80240340 44050000 */ mfc1 $a1, $f0 -/* 93F8F4 80240344 0000202D */ daddu $a0, $zero, $zero -/* 93F8F8 80240348 AFBF0018 */ sw $ra, 0x18($sp) -/* 93F8FC 8024034C AFA00014 */ sw $zero, 0x14($sp) -/* 93F900 80240350 E7A00010 */ swc1 $f0, 0x10($sp) -/* 93F904 80240354 00A0302D */ daddu $a2, $a1, $zero -/* 93F908 80240358 0C01CA54 */ jal func_80072950 -/* 93F90C 8024035C 00A0382D */ daddu $a3, $a1, $zero -/* 93F910 80240360 8FBF0018 */ lw $ra, 0x18($sp) -/* 93F914 80240364 24020002 */ addiu $v0, $zero, 2 -/* 93F918 80240368 03E00008 */ jr $ra -/* 93F91C 8024036C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240370_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_80240370_93F5B0.s deleted file mode 100644 index 40907aa1e7..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240370_93F5B0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240370_93F920 -/* 93F920 80240370 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 93F924 80240374 AFB00010 */ sw $s0, 0x10($sp) -/* 93F928 80240378 0080802D */ daddu $s0, $a0, $zero -/* 93F92C 8024037C AFBF001C */ sw $ra, 0x1c($sp) -/* 93F930 80240380 AFB20018 */ sw $s2, 0x18($sp) -/* 93F934 80240384 AFB10014 */ sw $s1, 0x14($sp) -/* 93F938 80240388 8E110148 */ lw $s1, 0x148($s0) -/* 93F93C 8024038C 86240008 */ lh $a0, 8($s1) -/* 93F940 80240390 0C00EABB */ jal get_npc_unsafe -/* 93F944 80240394 00A0902D */ daddu $s2, $a1, $zero -/* 93F948 80240398 8E2300CC */ lw $v1, 0xcc($s1) -/* 93F94C 8024039C 0040202D */ daddu $a0, $v0, $zero -/* 93F950 802403A0 8C630000 */ lw $v1, ($v1) -/* 93F954 802403A4 24020001 */ addiu $v0, $zero, 1 -/* 93F958 802403A8 AC830028 */ sw $v1, 0x28($a0) -/* 93F95C 802403AC AE020070 */ sw $v0, 0x70($s0) -/* 93F960 802403B0 8E220000 */ lw $v0, ($s1) -/* 93F964 802403B4 3C030010 */ lui $v1, 0x10 -/* 93F968 802403B8 00431024 */ and $v0, $v0, $v1 -/* 93F96C 802403BC 10400004 */ beqz $v0, .L802403D0 -/* 93F970 802403C0 00000000 */ nop -/* 93F974 802403C4 C620006C */ lwc1 $f0, 0x6c($s1) -/* 93F978 802403C8 46800020 */ cvt.s.w $f0, $f0 -/* 93F97C 802403CC E480000C */ swc1 $f0, 0xc($a0) -.L802403D0: -/* 93F980 802403D0 8E2200D0 */ lw $v0, 0xd0($s1) -/* 93F984 802403D4 8C420014 */ lw $v0, 0x14($v0) -/* 93F988 802403D8 1C400004 */ bgtz $v0, .L802403EC -/* 93F98C 802403DC 00000000 */ nop -/* 93F990 802403E0 C640000C */ lwc1 $f0, 0xc($s2) -/* 93F994 802403E4 08090103 */ j .L8024040C -/* 93F998 802403E8 E4800018 */ swc1 $f0, 0x18($a0) -.L802403EC: -/* 93F99C 802403EC 3C018024 */ lui $at, 0x8024 -/* 93F9A0 802403F0 D42248A0 */ ldc1 $f2, 0x48a0($at) -/* 93F9A4 802403F4 44820000 */ mtc1 $v0, $f0 -/* 93F9A8 802403F8 00000000 */ nop -/* 93F9AC 802403FC 46800021 */ cvt.d.w $f0, $f0 -/* 93F9B0 80240400 46220003 */ div.d $f0, $f0, $f2 -/* 93F9B4 80240404 46200020 */ cvt.s.d $f0, $f0 -/* 93F9B8 80240408 E4800018 */ swc1 $f0, 0x18($a0) -.L8024040C: -/* 93F9BC 8024040C 8FBF001C */ lw $ra, 0x1c($sp) -/* 93F9C0 80240410 8FB20018 */ lw $s2, 0x18($sp) -/* 93F9C4 80240414 8FB10014 */ lw $s1, 0x14($sp) -/* 93F9C8 80240418 8FB00010 */ lw $s0, 0x10($sp) -/* 93F9CC 8024041C 03E00008 */ jr $ra -/* 93F9D0 80240420 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240424_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_80240424_93F5B0.s deleted file mode 100644 index ad1de167a7..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240424_93F5B0.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240424_93F9D4 -/* 93F9D4 80240424 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 93F9D8 80240428 AFB40040 */ sw $s4, 0x40($sp) -/* 93F9DC 8024042C 0080A02D */ daddu $s4, $a0, $zero -/* 93F9E0 80240430 AFBF0044 */ sw $ra, 0x44($sp) -/* 93F9E4 80240434 AFB3003C */ sw $s3, 0x3c($sp) -/* 93F9E8 80240438 AFB20038 */ sw $s2, 0x38($sp) -/* 93F9EC 8024043C AFB10034 */ sw $s1, 0x34($sp) -/* 93F9F0 80240440 AFB00030 */ sw $s0, 0x30($sp) -/* 93F9F4 80240444 8E920148 */ lw $s2, 0x148($s4) -/* 93F9F8 80240448 00A0802D */ daddu $s0, $a1, $zero -/* 93F9FC 8024044C 86440008 */ lh $a0, 8($s2) -/* 93FA00 80240450 0C00EABB */ jal get_npc_unsafe -/* 93FA04 80240454 00C0982D */ daddu $s3, $a2, $zero -/* 93FA08 80240458 8E030008 */ lw $v1, 8($s0) -/* 93FA0C 8024045C 04600031 */ bltz $v1, .L80240524 -/* 93FA10 80240460 0040882D */ daddu $s1, $v0, $zero -/* 93FA14 80240464 0260202D */ daddu $a0, $s3, $zero -/* 93FA18 80240468 AFA00010 */ sw $zero, 0x10($sp) -/* 93FA1C 8024046C 8E060018 */ lw $a2, 0x18($s0) -/* 93FA20 80240470 8E07001C */ lw $a3, 0x1c($s0) -/* 93FA24 80240474 0C01242D */ jal func_800490B4 -/* 93FA28 80240478 0240282D */ daddu $a1, $s2, $zero -/* 93FA2C 8024047C 10400029 */ beqz $v0, .L80240524 -/* 93FA30 80240480 0000202D */ daddu $a0, $zero, $zero -/* 93FA34 80240484 0220282D */ daddu $a1, $s1, $zero -/* 93FA38 80240488 0000302D */ daddu $a2, $zero, $zero -/* 93FA3C 8024048C 862300A8 */ lh $v1, 0xa8($s1) -/* 93FA40 80240490 3C013F80 */ lui $at, 0x3f80 -/* 93FA44 80240494 44810000 */ mtc1 $at, $f0 -/* 93FA48 80240498 3C014000 */ lui $at, 0x4000 -/* 93FA4C 8024049C 44811000 */ mtc1 $at, $f2 -/* 93FA50 802404A0 3C01C1A0 */ lui $at, 0xc1a0 -/* 93FA54 802404A4 44812000 */ mtc1 $at, $f4 -/* 93FA58 802404A8 2402000F */ addiu $v0, $zero, 0xf -/* 93FA5C 802404AC AFA2001C */ sw $v0, 0x1c($sp) -/* 93FA60 802404B0 44833000 */ mtc1 $v1, $f6 -/* 93FA64 802404B4 00000000 */ nop -/* 93FA68 802404B8 468031A0 */ cvt.s.w $f6, $f6 -/* 93FA6C 802404BC 44073000 */ mfc1 $a3, $f6 -/* 93FA70 802404C0 27A20028 */ addiu $v0, $sp, 0x28 -/* 93FA74 802404C4 AFA20020 */ sw $v0, 0x20($sp) -/* 93FA78 802404C8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 93FA7C 802404CC E7A20014 */ swc1 $f2, 0x14($sp) -/* 93FA80 802404D0 0C01BFA4 */ jal fx_emote -/* 93FA84 802404D4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 93FA88 802404D8 0220202D */ daddu $a0, $s1, $zero -/* 93FA8C 802404DC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 93FA90 802404E0 0C012530 */ jal func_800494C0 -/* 93FA94 802404E4 3C060020 */ lui $a2, 0x20 -/* 93FA98 802404E8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 93FA9C 802404EC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 93FAA0 802404F0 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 93FAA4 802404F4 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 93FAA8 802404F8 8C460028 */ lw $a2, 0x28($v0) -/* 93FAAC 802404FC 0C00A720 */ jal atan2 -/* 93FAB0 80240500 8C470030 */ lw $a3, 0x30($v0) -/* 93FAB4 80240504 E620000C */ swc1 $f0, 0xc($s1) -/* 93FAB8 80240508 8E420018 */ lw $v0, 0x18($s2) -/* 93FABC 8024050C 9442002A */ lhu $v0, 0x2a($v0) -/* 93FAC0 80240510 30420001 */ andi $v0, $v0, 1 -/* 93FAC4 80240514 14400002 */ bnez $v0, .L80240520 -/* 93FAC8 80240518 2402000A */ addiu $v0, $zero, 0xa -/* 93FACC 8024051C 2402000C */ addiu $v0, $zero, 0xc -.L80240520: -/* 93FAD0 80240520 AE820070 */ sw $v0, 0x70($s4) -.L80240524: -/* 93FAD4 80240524 8FBF0044 */ lw $ra, 0x44($sp) -/* 93FAD8 80240528 8FB40040 */ lw $s4, 0x40($sp) -/* 93FADC 8024052C 8FB3003C */ lw $s3, 0x3c($sp) -/* 93FAE0 80240530 8FB20038 */ lw $s2, 0x38($sp) -/* 93FAE4 80240534 8FB10034 */ lw $s1, 0x34($sp) -/* 93FAE8 80240538 8FB00030 */ lw $s0, 0x30($sp) -/* 93FAEC 8024053C 03E00008 */ jr $ra -/* 93FAF0 80240540 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240544_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_80240544_93F5B0.s deleted file mode 100644 index 11fbc39525..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240544_93F5B0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240544_93FAF4 -/* 93FAF4 80240544 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 93FAF8 80240548 AFB00010 */ sw $s0, 0x10($sp) -/* 93FAFC 8024054C 0080802D */ daddu $s0, $a0, $zero -/* 93FB00 80240550 AFBF0014 */ sw $ra, 0x14($sp) -/* 93FB04 80240554 8E020148 */ lw $v0, 0x148($s0) -/* 93FB08 80240558 0C00EABB */ jal get_npc_unsafe -/* 93FB0C 8024055C 84440008 */ lh $a0, 8($v0) -/* 93FB10 80240560 3C014120 */ lui $at, 0x4120 -/* 93FB14 80240564 44810000 */ mtc1 $at, $f0 -/* 93FB18 80240568 3C014000 */ lui $at, 0x4000 -/* 93FB1C 8024056C 44811000 */ mtc1 $at, $f2 -/* 93FB20 80240570 8C430000 */ lw $v1, ($v0) -/* 93FB24 80240574 C444003C */ lwc1 $f4, 0x3c($v0) -/* 93FB28 80240578 34630800 */ ori $v1, $v1, 0x800 -/* 93FB2C 8024057C E440001C */ swc1 $f0, 0x1c($v0) -/* 93FB30 80240580 E4420014 */ swc1 $f2, 0x14($v0) -/* 93FB34 80240584 E4440064 */ swc1 $f4, 0x64($v0) -/* 93FB38 80240588 AC430000 */ sw $v1, ($v0) -/* 93FB3C 8024058C 2402000B */ addiu $v0, $zero, 0xb -/* 93FB40 80240590 AE020070 */ sw $v0, 0x70($s0) -/* 93FB44 80240594 8FBF0014 */ lw $ra, 0x14($sp) -/* 93FB48 80240598 8FB00010 */ lw $s0, 0x10($sp) -/* 93FB4C 8024059C 03E00008 */ jr $ra -/* 93FB50 802405A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_802405A4_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_802405A4_93F5B0.s deleted file mode 100644 index 048aa4a696..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_802405A4_93F5B0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A4_93FB54 -/* 93FB54 802405A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 93FB58 802405A8 AFB00010 */ sw $s0, 0x10($sp) -/* 93FB5C 802405AC 0080802D */ daddu $s0, $a0, $zero -/* 93FB60 802405B0 AFBF0014 */ sw $ra, 0x14($sp) -/* 93FB64 802405B4 8E020148 */ lw $v0, 0x148($s0) -/* 93FB68 802405B8 0C00EABB */ jal get_npc_unsafe -/* 93FB6C 802405BC 84440008 */ lh $a0, 8($v0) -/* 93FB70 802405C0 0040202D */ daddu $a0, $v0, $zero -/* 93FB74 802405C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* 93FB78 802405C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* 93FB7C 802405CC 46001080 */ add.s $f2, $f2, $f0 -/* 93FB80 802405D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* 93FB84 802405D4 46040001 */ sub.s $f0, $f0, $f4 -/* 93FB88 802405D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* 93FB8C 802405DC 4602203C */ c.lt.s $f4, $f2 -/* 93FB90 802405E0 E482003C */ swc1 $f2, 0x3c($a0) -/* 93FB94 802405E4 45010009 */ bc1t .L8024060C -/* 93FB98 802405E8 E480001C */ swc1 $f0, 0x1c($a0) -/* 93FB9C 802405EC 8C820000 */ lw $v0, ($a0) -/* 93FBA0 802405F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* 93FBA4 802405F4 E484003C */ swc1 $f4, 0x3c($a0) -/* 93FBA8 802405F8 AC80001C */ sw $zero, 0x1c($a0) -/* 93FBAC 802405FC 00431024 */ and $v0, $v0, $v1 -/* 93FBB0 80240600 AC820000 */ sw $v0, ($a0) -/* 93FBB4 80240604 2402000C */ addiu $v0, $zero, 0xc -/* 93FBB8 80240608 AE020070 */ sw $v0, 0x70($s0) -.L8024060C: -/* 93FBBC 8024060C 8FBF0014 */ lw $ra, 0x14($sp) -/* 93FBC0 80240610 8FB00010 */ lw $s0, 0x10($sp) -/* 93FBC4 80240614 03E00008 */ jr $ra -/* 93FBC8 80240618 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_8024061C_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_8024061C_93F5B0.s deleted file mode 100644 index 48de71fe96..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_8024061C_93F5B0.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_93FBCC -/* 93FBCC 8024061C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 93FBD0 80240620 AFB3001C */ sw $s3, 0x1c($sp) -/* 93FBD4 80240624 0080982D */ daddu $s3, $a0, $zero -/* 93FBD8 80240628 AFBF0020 */ sw $ra, 0x20($sp) -/* 93FBDC 8024062C AFB20018 */ sw $s2, 0x18($sp) -/* 93FBE0 80240630 AFB10014 */ sw $s1, 0x14($sp) -/* 93FBE4 80240634 AFB00010 */ sw $s0, 0x10($sp) -/* 93FBE8 80240638 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 93FBEC 8024063C 8E710148 */ lw $s1, 0x148($s3) -/* 93FBF0 80240640 86240008 */ lh $a0, 8($s1) -/* 93FBF4 80240644 0C00EABB */ jal get_npc_unsafe -/* 93FBF8 80240648 00A0802D */ daddu $s0, $a1, $zero -/* 93FBFC 8024064C 8E040014 */ lw $a0, 0x14($s0) -/* 93FC00 80240650 0040902D */ daddu $s2, $v0, $zero -/* 93FC04 80240654 00041FC2 */ srl $v1, $a0, 0x1f -/* 93FC08 80240658 00832021 */ addu $a0, $a0, $v1 -/* 93FC0C 8024065C 00042043 */ sra $a0, $a0, 1 -/* 93FC10 80240660 0C00A67F */ jal rand_int -/* 93FC14 80240664 24840001 */ addiu $a0, $a0, 1 -/* 93FC18 80240668 8E030014 */ lw $v1, 0x14($s0) -/* 93FC1C 8024066C C64C0038 */ lwc1 $f12, 0x38($s2) -/* 93FC20 80240670 000327C2 */ srl $a0, $v1, 0x1f -/* 93FC24 80240674 00641821 */ addu $v1, $v1, $a0 -/* 93FC28 80240678 00031843 */ sra $v1, $v1, 1 -/* 93FC2C 8024067C 00621821 */ addu $v1, $v1, $v0 -/* 93FC30 80240680 A643008E */ sh $v1, 0x8e($s2) -/* 93FC34 80240684 8E2200CC */ lw $v0, 0xcc($s1) -/* 93FC38 80240688 C64E0040 */ lwc1 $f14, 0x40($s2) -/* 93FC3C 8024068C 8C42000C */ lw $v0, 0xc($v0) -/* 93FC40 80240690 AE420028 */ sw $v0, 0x28($s2) -/* 93FC44 80240694 C600000C */ lwc1 $f0, 0xc($s0) -/* 93FC48 80240698 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 93FC4C 8024069C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 93FC50 802406A0 E6400018 */ swc1 $f0, 0x18($s2) -/* 93FC54 802406A4 8C460028 */ lw $a2, 0x28($v0) -/* 93FC58 802406A8 0C00A720 */ jal atan2 -/* 93FC5C 802406AC 8C470030 */ lw $a3, 0x30($v0) -/* 93FC60 802406B0 46000506 */ mov.s $f20, $f0 -/* 93FC64 802406B4 C64C000C */ lwc1 $f12, 0xc($s2) -/* 93FC68 802406B8 0C00A70A */ jal get_clamped_angle_diff -/* 93FC6C 802406BC 4600A386 */ mov.s $f14, $f20 -/* 93FC70 802406C0 46000086 */ mov.s $f2, $f0 -/* 93FC74 802406C4 8E020010 */ lw $v0, 0x10($s0) -/* 93FC78 802406C8 46001005 */ abs.s $f0, $f2 -/* 93FC7C 802406CC 44822000 */ mtc1 $v0, $f4 -/* 93FC80 802406D0 00000000 */ nop -/* 93FC84 802406D4 46802120 */ cvt.s.w $f4, $f4 -/* 93FC88 802406D8 4600203C */ c.lt.s $f4, $f0 -/* 93FC8C 802406DC 00000000 */ nop -/* 93FC90 802406E0 4500000D */ bc1f .L80240718 -/* 93FC94 802406E4 00000000 */ nop -/* 93FC98 802406E8 44800000 */ mtc1 $zero, $f0 -/* 93FC9C 802406EC C654000C */ lwc1 $f20, 0xc($s2) -/* 93FCA0 802406F0 4600103C */ c.lt.s $f2, $f0 -/* 93FCA4 802406F4 00000000 */ nop -/* 93FCA8 802406F8 45000006 */ bc1f .L80240714 -/* 93FCAC 802406FC 00021023 */ negu $v0, $v0 -/* 93FCB0 80240700 44820000 */ mtc1 $v0, $f0 -/* 93FCB4 80240704 00000000 */ nop -/* 93FCB8 80240708 46800020 */ cvt.s.w $f0, $f0 -/* 93FCBC 8024070C 080901C6 */ j .L80240718 -/* 93FCC0 80240710 4600A500 */ add.s $f20, $f20, $f0 -.L80240714: -/* 93FCC4 80240714 4604A500 */ add.s $f20, $f20, $f4 -.L80240718: -/* 93FCC8 80240718 0C00A6C9 */ jal clamp_angle -/* 93FCCC 8024071C 4600A306 */ mov.s $f12, $f20 -/* 93FCD0 80240720 2402000D */ addiu $v0, $zero, 0xd -/* 93FCD4 80240724 E640000C */ swc1 $f0, 0xc($s2) -/* 93FCD8 80240728 AE620070 */ sw $v0, 0x70($s3) -/* 93FCDC 8024072C 8FBF0020 */ lw $ra, 0x20($sp) -/* 93FCE0 80240730 8FB3001C */ lw $s3, 0x1c($sp) -/* 93FCE4 80240734 8FB20018 */ lw $s2, 0x18($sp) -/* 93FCE8 80240738 8FB10014 */ lw $s1, 0x14($sp) -/* 93FCEC 8024073C 8FB00010 */ lw $s0, 0x10($sp) -/* 93FCF0 80240740 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 93FCF4 80240744 03E00008 */ jr $ra -/* 93FCF8 80240748 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_8024074C_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_8024074C_93F5B0.s deleted file mode 100644 index 492cee23f4..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_8024074C_93F5B0.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024074C_93FCFC -/* 93FCFC 8024074C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 93FD00 80240750 AFB3003C */ sw $s3, 0x3c($sp) -/* 93FD04 80240754 0080982D */ daddu $s3, $a0, $zero -/* 93FD08 80240758 AFBF0040 */ sw $ra, 0x40($sp) -/* 93FD0C 8024075C AFB20038 */ sw $s2, 0x38($sp) -/* 93FD10 80240760 AFB10034 */ sw $s1, 0x34($sp) -/* 93FD14 80240764 AFB00030 */ sw $s0, 0x30($sp) -/* 93FD18 80240768 8E720148 */ lw $s2, 0x148($s3) -/* 93FD1C 8024076C 00A0882D */ daddu $s1, $a1, $zero -/* 93FD20 80240770 86440008 */ lh $a0, 8($s2) -/* 93FD24 80240774 0C00EABB */ jal get_npc_unsafe -/* 93FD28 80240778 00C0802D */ daddu $s0, $a2, $zero -/* 93FD2C 8024077C 0200202D */ daddu $a0, $s0, $zero -/* 93FD30 80240780 0240282D */ daddu $a1, $s2, $zero -/* 93FD34 80240784 24030001 */ addiu $v1, $zero, 1 -/* 93FD38 80240788 AFA30010 */ sw $v1, 0x10($sp) -/* 93FD3C 8024078C 8E260018 */ lw $a2, 0x18($s1) -/* 93FD40 80240790 8E27001C */ lw $a3, 0x1c($s1) -/* 93FD44 80240794 0C01242D */ jal func_800490B4 -/* 93FD48 80240798 0040802D */ daddu $s0, $v0, $zero -/* 93FD4C 8024079C 1440001D */ bnez $v0, .L80240814 -/* 93FD50 802407A0 24040002 */ addiu $a0, $zero, 2 -/* 93FD54 802407A4 0200282D */ daddu $a1, $s0, $zero -/* 93FD58 802407A8 0000302D */ daddu $a2, $zero, $zero -/* 93FD5C 802407AC 860300A8 */ lh $v1, 0xa8($s0) -/* 93FD60 802407B0 3C013F80 */ lui $at, 0x3f80 -/* 93FD64 802407B4 44810000 */ mtc1 $at, $f0 -/* 93FD68 802407B8 3C014000 */ lui $at, 0x4000 -/* 93FD6C 802407BC 44811000 */ mtc1 $at, $f2 -/* 93FD70 802407C0 3C01C1A0 */ lui $at, 0xc1a0 -/* 93FD74 802407C4 44812000 */ mtc1 $at, $f4 -/* 93FD78 802407C8 2402000F */ addiu $v0, $zero, 0xf -/* 93FD7C 802407CC AFA2001C */ sw $v0, 0x1c($sp) -/* 93FD80 802407D0 44833000 */ mtc1 $v1, $f6 -/* 93FD84 802407D4 00000000 */ nop -/* 93FD88 802407D8 468031A0 */ cvt.s.w $f6, $f6 -/* 93FD8C 802407DC 44073000 */ mfc1 $a3, $f6 -/* 93FD90 802407E0 27A20028 */ addiu $v0, $sp, 0x28 -/* 93FD94 802407E4 AFA20020 */ sw $v0, 0x20($sp) -/* 93FD98 802407E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 93FD9C 802407EC E7A20014 */ swc1 $f2, 0x14($sp) -/* 93FDA0 802407F0 0C01BFA4 */ jal fx_emote -/* 93FDA4 802407F4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 93FDA8 802407F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 93FDAC 802407FC 8C430000 */ lw $v1, ($v0) -/* 93FDB0 80240800 24020019 */ addiu $v0, $zero, 0x19 -/* 93FDB4 80240804 A602008E */ sh $v0, 0x8e($s0) -/* 93FDB8 80240808 2402000E */ addiu $v0, $zero, 0xe -/* 93FDBC 8024080C 08090212 */ j .L80240848 -/* 93FDC0 80240810 AE030028 */ sw $v1, 0x28($s0) -.L80240814: -/* 93FDC4 80240814 8E050018 */ lw $a1, 0x18($s0) -/* 93FDC8 80240818 8E06000C */ lw $a2, 0xc($s0) -/* 93FDCC 8024081C 0C00EA95 */ jal npc_move_heading -/* 93FDD0 80240820 0200202D */ daddu $a0, $s0, $zero -/* 93FDD4 80240824 0200202D */ daddu $a0, $s0, $zero -/* 93FDD8 80240828 0C00F598 */ jal func_8003D660 -/* 93FDDC 8024082C 24050001 */ addiu $a1, $zero, 1 -/* 93FDE0 80240830 9602008E */ lhu $v0, 0x8e($s0) -/* 93FDE4 80240834 2442FFFF */ addiu $v0, $v0, -1 -/* 93FDE8 80240838 A602008E */ sh $v0, 0x8e($s0) -/* 93FDEC 8024083C 00021400 */ sll $v0, $v0, 0x10 -/* 93FDF0 80240840 14400002 */ bnez $v0, .L8024084C -/* 93FDF4 80240844 2402000C */ addiu $v0, $zero, 0xc -.L80240848: -/* 93FDF8 80240848 AE620070 */ sw $v0, 0x70($s3) -.L8024084C: -/* 93FDFC 8024084C 8FBF0040 */ lw $ra, 0x40($sp) -/* 93FE00 80240850 8FB3003C */ lw $s3, 0x3c($sp) -/* 93FE04 80240854 8FB20038 */ lw $s2, 0x38($sp) -/* 93FE08 80240858 8FB10034 */ lw $s1, 0x34($sp) -/* 93FE0C 8024085C 8FB00030 */ lw $s0, 0x30($sp) -/* 93FE10 80240860 03E00008 */ jr $ra -/* 93FE14 80240864 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240868_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_80240868_93F5B0.s deleted file mode 100644 index c13a3681f6..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240868_93F5B0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240868_93FE18 -/* 93FE18 80240868 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 93FE1C 8024086C AFB00010 */ sw $s0, 0x10($sp) -/* 93FE20 80240870 0080802D */ daddu $s0, $a0, $zero -/* 93FE24 80240874 AFBF0014 */ sw $ra, 0x14($sp) -/* 93FE28 80240878 8E020148 */ lw $v0, 0x148($s0) -/* 93FE2C 8024087C 0C00EABB */ jal get_npc_unsafe -/* 93FE30 80240880 84440008 */ lh $a0, 8($v0) -/* 93FE34 80240884 9443008E */ lhu $v1, 0x8e($v0) -/* 93FE38 80240888 2463FFFF */ addiu $v1, $v1, -1 -/* 93FE3C 8024088C A443008E */ sh $v1, 0x8e($v0) -/* 93FE40 80240890 00031C00 */ sll $v1, $v1, 0x10 -/* 93FE44 80240894 14600002 */ bnez $v1, .L802408A0 -/* 93FE48 80240898 2402000F */ addiu $v0, $zero, 0xf -/* 93FE4C 8024089C AE020070 */ sw $v0, 0x70($s0) -.L802408A0: -/* 93FE50 802408A0 8FBF0014 */ lw $ra, 0x14($sp) -/* 93FE54 802408A4 8FB00010 */ lw $s0, 0x10($sp) -/* 93FE58 802408A8 03E00008 */ jr $ra -/* 93FE5C 802408AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_802408B0_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_802408B0_93F5B0.s deleted file mode 100644 index d291e04527..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_802408B0_93F5B0.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408B0_93FE60 -/* 93FE60 802408B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 93FE64 802408B4 AFB10014 */ sw $s1, 0x14($sp) -/* 93FE68 802408B8 0080882D */ daddu $s1, $a0, $zero -/* 93FE6C 802408BC AFBF001C */ sw $ra, 0x1c($sp) -/* 93FE70 802408C0 AFB20018 */ sw $s2, 0x18($sp) -/* 93FE74 802408C4 AFB00010 */ sw $s0, 0x10($sp) -/* 93FE78 802408C8 8E300148 */ lw $s0, 0x148($s1) -/* 93FE7C 802408CC 86040008 */ lh $a0, 8($s0) -/* 93FE80 802408D0 0C00EABB */ jal get_npc_unsafe -/* 93FE84 802408D4 00A0902D */ daddu $s2, $a1, $zero -/* 93FE88 802408D8 8E0300CC */ lw $v1, 0xcc($s0) -/* 93FE8C 802408DC 8C630004 */ lw $v1, 4($v1) -/* 93FE90 802408E0 0040202D */ daddu $a0, $v0, $zero -/* 93FE94 802408E4 AC830028 */ sw $v1, 0x28($a0) -/* 93FE98 802408E8 8E0200D0 */ lw $v0, 0xd0($s0) -/* 93FE9C 802408EC 8C420014 */ lw $v0, 0x14($v0) -/* 93FEA0 802408F0 04410009 */ bgez $v0, .L80240918 -/* 93FEA4 802408F4 00000000 */ nop -/* 93FEA8 802408F8 C640000C */ lwc1 $f0, 0xc($s2) -/* 93FEAC 802408FC 3C018024 */ lui $at, 0x8024 -/* 93FEB0 80240900 D42248A8 */ ldc1 $f2, 0x48a8($at) -/* 93FEB4 80240904 46000021 */ cvt.d.s $f0, $f0 -/* 93FEB8 80240908 46220002 */ mul.d $f0, $f0, $f2 -/* 93FEBC 8024090C 00000000 */ nop -/* 93FEC0 80240910 0809024D */ j .L80240934 -/* 93FEC4 80240914 46200020 */ cvt.s.d $f0, $f0 -.L80240918: -/* 93FEC8 80240918 3C018024 */ lui $at, 0x8024 -/* 93FECC 8024091C D42248B0 */ ldc1 $f2, 0x48b0($at) -/* 93FED0 80240920 44820000 */ mtc1 $v0, $f0 -/* 93FED4 80240924 00000000 */ nop -/* 93FED8 80240928 46800021 */ cvt.d.w $f0, $f0 -/* 93FEDC 8024092C 46220003 */ div.d $f0, $f0, $f2 -/* 93FEE0 80240930 46200020 */ cvt.s.d $f0, $f0 -.L80240934: -/* 93FEE4 80240934 E4800018 */ swc1 $f0, 0x18($a0) -/* 93FEE8 80240938 24020010 */ addiu $v0, $zero, 0x10 -/* 93FEEC 8024093C AE200074 */ sw $zero, 0x74($s1) -/* 93FEF0 80240940 AE220070 */ sw $v0, 0x70($s1) -/* 93FEF4 80240944 8FBF001C */ lw $ra, 0x1c($sp) -/* 93FEF8 80240948 8FB20018 */ lw $s2, 0x18($sp) -/* 93FEFC 8024094C 8FB10014 */ lw $s1, 0x14($sp) -/* 93FF00 80240950 8FB00010 */ lw $s0, 0x10($sp) -/* 93FF04 80240954 03E00008 */ jr $ra -/* 93FF08 80240958 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_8024095C_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_8024095C_93F5B0.s deleted file mode 100644 index b5292ec218..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_8024095C_93F5B0.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024095C_93FF0C -/* 93FF0C 8024095C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 93FF10 80240960 AFB3003C */ sw $s3, 0x3c($sp) -/* 93FF14 80240964 0080982D */ daddu $s3, $a0, $zero -/* 93FF18 80240968 AFBF0044 */ sw $ra, 0x44($sp) -/* 93FF1C 8024096C AFB40040 */ sw $s4, 0x40($sp) -/* 93FF20 80240970 AFB20038 */ sw $s2, 0x38($sp) -/* 93FF24 80240974 AFB10034 */ sw $s1, 0x34($sp) -/* 93FF28 80240978 AFB00030 */ sw $s0, 0x30($sp) -/* 93FF2C 8024097C 8E710148 */ lw $s1, 0x148($s3) -/* 93FF30 80240980 00A0902D */ daddu $s2, $a1, $zero -/* 93FF34 80240984 86240008 */ lh $a0, 8($s1) -/* 93FF38 80240988 0C00EABB */ jal get_npc_unsafe -/* 93FF3C 8024098C 00C0A02D */ daddu $s4, $a2, $zero -/* 93FF40 80240990 8E430008 */ lw $v1, 8($s2) -/* 93FF44 80240994 0460003B */ bltz $v1, .L80240A84 -/* 93FF48 80240998 0040802D */ daddu $s0, $v0, $zero -/* 93FF4C 8024099C 8E620074 */ lw $v0, 0x74($s3) -/* 93FF50 802409A0 1C400037 */ bgtz $v0, .L80240A80 -/* 93FF54 802409A4 2442FFFF */ addiu $v0, $v0, -1 -/* 93FF58 802409A8 0280202D */ daddu $a0, $s4, $zero -/* 93FF5C 802409AC AE630074 */ sw $v1, 0x74($s3) -/* 93FF60 802409B0 AFA00010 */ sw $zero, 0x10($sp) -/* 93FF64 802409B4 8E460018 */ lw $a2, 0x18($s2) -/* 93FF68 802409B8 8E47001C */ lw $a3, 0x1c($s2) -/* 93FF6C 802409BC 0C01242D */ jal func_800490B4 -/* 93FF70 802409C0 0220282D */ daddu $a1, $s1, $zero -/* 93FF74 802409C4 1040002C */ beqz $v0, .L80240A78 -/* 93FF78 802409C8 0000202D */ daddu $a0, $zero, $zero -/* 93FF7C 802409CC 0200282D */ daddu $a1, $s0, $zero -/* 93FF80 802409D0 0000302D */ daddu $a2, $zero, $zero -/* 93FF84 802409D4 860300A8 */ lh $v1, 0xa8($s0) -/* 93FF88 802409D8 3C013F80 */ lui $at, 0x3f80 -/* 93FF8C 802409DC 44810000 */ mtc1 $at, $f0 -/* 93FF90 802409E0 3C014000 */ lui $at, 0x4000 -/* 93FF94 802409E4 44811000 */ mtc1 $at, $f2 -/* 93FF98 802409E8 3C01C1A0 */ lui $at, 0xc1a0 -/* 93FF9C 802409EC 44812000 */ mtc1 $at, $f4 -/* 93FFA0 802409F0 2402000F */ addiu $v0, $zero, 0xf -/* 93FFA4 802409F4 AFA2001C */ sw $v0, 0x1c($sp) -/* 93FFA8 802409F8 44833000 */ mtc1 $v1, $f6 -/* 93FFAC 802409FC 00000000 */ nop -/* 93FFB0 80240A00 468031A0 */ cvt.s.w $f6, $f6 -/* 93FFB4 80240A04 44073000 */ mfc1 $a3, $f6 -/* 93FFB8 80240A08 27A20028 */ addiu $v0, $sp, 0x28 -/* 93FFBC 80240A0C AFA20020 */ sw $v0, 0x20($sp) -/* 93FFC0 80240A10 E7A00010 */ swc1 $f0, 0x10($sp) -/* 93FFC4 80240A14 E7A20014 */ swc1 $f2, 0x14($sp) -/* 93FFC8 80240A18 0C01BFA4 */ jal fx_emote -/* 93FFCC 80240A1C E7A40018 */ swc1 $f4, 0x18($sp) -/* 93FFD0 80240A20 0200202D */ daddu $a0, $s0, $zero -/* 93FFD4 80240A24 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 93FFD8 80240A28 0C012530 */ jal func_800494C0 -/* 93FFDC 80240A2C 3C060020 */ lui $a2, 0x20 -/* 93FFE0 80240A30 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 93FFE4 80240A34 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 93FFE8 80240A38 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 93FFEC 80240A3C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 93FFF0 80240A40 8C460028 */ lw $a2, 0x28($v0) -/* 93FFF4 80240A44 0C00A720 */ jal atan2 -/* 93FFF8 80240A48 8C470030 */ lw $a3, 0x30($v0) -/* 93FFFC 80240A4C E600000C */ swc1 $f0, 0xc($s0) -/* 940000 80240A50 8E220018 */ lw $v0, 0x18($s1) -/* 940004 80240A54 9442002A */ lhu $v0, 0x2a($v0) -/* 940008 80240A58 30420001 */ andi $v0, $v0, 1 -/* 94000C 80240A5C 10400003 */ beqz $v0, .L80240A6C -/* 940010 80240A60 2402000A */ addiu $v0, $zero, 0xa -/* 940014 80240A64 080902D1 */ j .L80240B44 -/* 940018 80240A68 AE620070 */ sw $v0, 0x70($s3) -.L80240A6C: -/* 94001C 80240A6C 2402000C */ addiu $v0, $zero, 0xc -/* 940020 80240A70 080902D1 */ j .L80240B44 -/* 940024 80240A74 AE620070 */ sw $v0, 0x70($s3) -.L80240A78: -/* 940028 80240A78 8E620074 */ lw $v0, 0x74($s3) -/* 94002C 80240A7C 2442FFFF */ addiu $v0, $v0, -1 -.L80240A80: -/* 940030 80240A80 AE620074 */ sw $v0, 0x74($s3) -.L80240A84: -/* 940034 80240A84 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 940038 80240A88 8E2200D0 */ lw $v0, 0xd0($s1) -/* 94003C 80240A8C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 940040 80240A90 C4460000 */ lwc1 $f6, ($v0) -/* 940044 80240A94 468031A0 */ cvt.s.w $f6, $f6 -/* 940048 80240A98 44063000 */ mfc1 $a2, $f6 -/* 94004C 80240A9C C4460008 */ lwc1 $f6, 8($v0) -/* 940050 80240AA0 468031A0 */ cvt.s.w $f6, $f6 -/* 940054 80240AA4 44073000 */ mfc1 $a3, $f6 -/* 940058 80240AA8 0C00A7B5 */ jal dist2D -/* 94005C 80240AAC 00000000 */ nop -/* 940060 80240AB0 C6020018 */ lwc1 $f2, 0x18($s0) -/* 940064 80240AB4 4602003C */ c.lt.s $f0, $f2 -/* 940068 80240AB8 00000000 */ nop -/* 94006C 80240ABC 4500000E */ bc1f .L80240AF8 -/* 940070 80240AC0 00000000 */ nop -/* 940074 80240AC4 8E2200D0 */ lw $v0, 0xd0($s1) -/* 940078 80240AC8 C4400000 */ lwc1 $f0, ($v0) -/* 94007C 80240ACC 46800020 */ cvt.s.w $f0, $f0 -/* 940080 80240AD0 E6000038 */ swc1 $f0, 0x38($s0) -/* 940084 80240AD4 8E2200D0 */ lw $v0, 0xd0($s1) -/* 940088 80240AD8 C4400008 */ lwc1 $f0, 8($v0) -/* 94008C 80240ADC 46800020 */ cvt.s.w $f0, $f0 -/* 940090 80240AE0 E6000040 */ swc1 $f0, 0x40($s0) -/* 940094 80240AE4 8E2200D0 */ lw $v0, 0xd0($s1) -/* 940098 80240AE8 C440000C */ lwc1 $f0, 0xc($v0) -/* 94009C 80240AEC 46800020 */ cvt.s.w $f0, $f0 -/* 9400A0 80240AF0 E600000C */ swc1 $f0, 0xc($s0) -/* 9400A4 80240AF4 AE600070 */ sw $zero, 0x70($s3) -.L80240AF8: -/* 9400A8 80240AF8 8602008C */ lh $v0, 0x8c($s0) -/* 9400AC 80240AFC 14400011 */ bnez $v0, .L80240B44 -/* 9400B0 80240B00 00000000 */ nop -/* 9400B4 80240B04 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9400B8 80240B08 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9400BC 80240B0C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9400C0 80240B10 C4460000 */ lwc1 $f6, ($v0) -/* 9400C4 80240B14 468031A0 */ cvt.s.w $f6, $f6 -/* 9400C8 80240B18 44063000 */ mfc1 $a2, $f6 -/* 9400CC 80240B1C C4460008 */ lwc1 $f6, 8($v0) -/* 9400D0 80240B20 468031A0 */ cvt.s.w $f6, $f6 -/* 9400D4 80240B24 44073000 */ mfc1 $a3, $f6 -/* 9400D8 80240B28 0C00A720 */ jal atan2 -/* 9400DC 80240B2C 00000000 */ nop -/* 9400E0 80240B30 8E050018 */ lw $a1, 0x18($s0) -/* 9400E4 80240B34 44060000 */ mfc1 $a2, $f0 -/* 9400E8 80240B38 0200202D */ daddu $a0, $s0, $zero -/* 9400EC 80240B3C 0C00EA95 */ jal npc_move_heading -/* 9400F0 80240B40 AC86000C */ sw $a2, 0xc($a0) -.L80240B44: -/* 9400F4 80240B44 8FBF0044 */ lw $ra, 0x44($sp) -/* 9400F8 80240B48 8FB40040 */ lw $s4, 0x40($sp) -/* 9400FC 80240B4C 8FB3003C */ lw $s3, 0x3c($sp) -/* 940100 80240B50 8FB20038 */ lw $s2, 0x38($sp) -/* 940104 80240B54 8FB10034 */ lw $s1, 0x34($sp) -/* 940108 80240B58 8FB00030 */ lw $s0, 0x30($sp) -/* 94010C 80240B5C 03E00008 */ jr $ra -/* 940110 80240B60 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240B64_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_80240B64_93F5B0.s deleted file mode 100644 index ccd3e04d23..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240B64_93F5B0.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B64_940114 -/* 940114 80240B64 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 940118 80240B68 AFB40040 */ sw $s4, 0x40($sp) -/* 94011C 80240B6C 0080A02D */ daddu $s4, $a0, $zero -/* 940120 80240B70 AFBF0048 */ sw $ra, 0x48($sp) -/* 940124 80240B74 AFB50044 */ sw $s5, 0x44($sp) -/* 940128 80240B78 AFB3003C */ sw $s3, 0x3c($sp) -/* 94012C 80240B7C AFB20038 */ sw $s2, 0x38($sp) -/* 940130 80240B80 AFB10034 */ sw $s1, 0x34($sp) -/* 940134 80240B84 AFB00030 */ sw $s0, 0x30($sp) -/* 940138 80240B88 8E920148 */ lw $s2, 0x148($s4) -/* 94013C 80240B8C 86440008 */ lh $a0, 8($s2) -/* 940140 80240B90 8E90000C */ lw $s0, 0xc($s4) -/* 940144 80240B94 0C00EABB */ jal get_npc_unsafe -/* 940148 80240B98 00A0882D */ daddu $s1, $a1, $zero -/* 94014C 80240B9C 0280202D */ daddu $a0, $s4, $zero -/* 940150 80240BA0 8E050000 */ lw $a1, ($s0) -/* 940154 80240BA4 0C0B1EAF */ jal get_variable -/* 940158 80240BA8 0040802D */ daddu $s0, $v0, $zero -/* 94015C 80240BAC AFA00010 */ sw $zero, 0x10($sp) -/* 940160 80240BB0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 940164 80240BB4 8C630030 */ lw $v1, 0x30($v1) -/* 940168 80240BB8 AFA30014 */ sw $v1, 0x14($sp) -/* 94016C 80240BBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 940170 80240BC0 8C63001C */ lw $v1, 0x1c($v1) -/* 940174 80240BC4 AFA30018 */ sw $v1, 0x18($sp) -/* 940178 80240BC8 8E4300D0 */ lw $v1, 0xd0($s2) -/* 94017C 80240BCC 8C630024 */ lw $v1, 0x24($v1) -/* 940180 80240BD0 AFA3001C */ sw $v1, 0x1c($sp) -/* 940184 80240BD4 8E4300D0 */ lw $v1, 0xd0($s2) -/* 940188 80240BD8 8C630028 */ lw $v1, 0x28($v1) -/* 94018C 80240BDC 27B50010 */ addiu $s5, $sp, 0x10 -/* 940190 80240BE0 AFA30020 */ sw $v1, 0x20($sp) -/* 940194 80240BE4 8E4300D0 */ lw $v1, 0xd0($s2) -/* 940198 80240BE8 3C014282 */ lui $at, 0x4282 -/* 94019C 80240BEC 44810000 */ mtc1 $at, $f0 -/* 9401A0 80240BF0 8C63002C */ lw $v1, 0x2c($v1) -/* 9401A4 80240BF4 0040982D */ daddu $s3, $v0, $zero -/* 9401A8 80240BF8 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9401AC 80240BFC A7A0002C */ sh $zero, 0x2c($sp) -/* 9401B0 80240C00 16200005 */ bnez $s1, .L80240C18 -/* 9401B4 80240C04 AFA30024 */ sw $v1, 0x24($sp) -/* 9401B8 80240C08 8E4200B0 */ lw $v0, 0xb0($s2) -/* 9401BC 80240C0C 30420004 */ andi $v0, $v0, 4 -/* 9401C0 80240C10 1040002F */ beqz $v0, .L80240CD0 -/* 9401C4 80240C14 00000000 */ nop -.L80240C18: -/* 9401C8 80240C18 AE800070 */ sw $zero, 0x70($s4) -/* 9401CC 80240C1C C600000C */ lwc1 $f0, 0xc($s0) -/* 9401D0 80240C20 A600008E */ sh $zero, 0x8e($s0) -/* 9401D4 80240C24 8E4200CC */ lw $v0, 0xcc($s2) -/* 9401D8 80240C28 4600008D */ trunc.w.s $f2, $f0 -/* 9401DC 80240C2C E642006C */ swc1 $f2, 0x6c($s2) -/* 9401E0 80240C30 8C420000 */ lw $v0, ($v0) -/* 9401E4 80240C34 8E030000 */ lw $v1, ($s0) -/* 9401E8 80240C38 AE020028 */ sw $v0, 0x28($s0) -/* 9401EC 80240C3C 2402F7FF */ addiu $v0, $zero, -0x801 -/* 9401F0 80240C40 00621824 */ and $v1, $v1, $v0 -/* 9401F4 80240C44 AE030000 */ sw $v1, ($s0) -/* 9401F8 80240C48 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9401FC 80240C4C 8C420034 */ lw $v0, 0x34($v0) -/* 940200 80240C50 54400005 */ bnel $v0, $zero, .L80240C68 -/* 940204 80240C54 2402FDFF */ addiu $v0, $zero, -0x201 -/* 940208 80240C58 34620200 */ ori $v0, $v1, 0x200 -/* 94020C 80240C5C 2403FFF7 */ addiu $v1, $zero, -9 -/* 940210 80240C60 0809031C */ j .L80240C70 -/* 940214 80240C64 00431024 */ and $v0, $v0, $v1 -.L80240C68: -/* 940218 80240C68 00621024 */ and $v0, $v1, $v0 -/* 94021C 80240C6C 34420008 */ ori $v0, $v0, 8 -.L80240C70: -/* 940220 80240C70 AE020000 */ sw $v0, ($s0) -/* 940224 80240C74 8E4200B0 */ lw $v0, 0xb0($s2) -/* 940228 80240C78 30420004 */ andi $v0, $v0, 4 -/* 94022C 80240C7C 10400009 */ beqz $v0, .L80240CA4 -/* 940230 80240C80 24020063 */ addiu $v0, $zero, 0x63 -/* 940234 80240C84 AE820070 */ sw $v0, 0x70($s4) -/* 940238 80240C88 2402000F */ addiu $v0, $zero, 0xf -/* 94023C 80240C8C AE820074 */ sw $v0, 0x74($s4) -/* 940240 80240C90 8E4200B0 */ lw $v0, 0xb0($s2) -/* 940244 80240C94 2403FFFB */ addiu $v1, $zero, -5 -/* 940248 80240C98 00431024 */ and $v0, $v0, $v1 -/* 94024C 80240C9C 08090334 */ j .L80240CD0 -/* 940250 80240CA0 AE4200B0 */ sw $v0, 0xb0($s2) -.L80240CA4: -/* 940254 80240CA4 8E420000 */ lw $v0, ($s2) -/* 940258 80240CA8 3C034000 */ lui $v1, 0x4000 -/* 94025C 80240CAC 00431024 */ and $v0, $v0, $v1 -/* 940260 80240CB0 10400007 */ beqz $v0, .L80240CD0 -/* 940264 80240CB4 3C03BFFF */ lui $v1, 0xbfff -/* 940268 80240CB8 2402000C */ addiu $v0, $zero, 0xc -/* 94026C 80240CBC AE820070 */ sw $v0, 0x70($s4) -/* 940270 80240CC0 8E420000 */ lw $v0, ($s2) -/* 940274 80240CC4 3463FFFF */ ori $v1, $v1, 0xffff -/* 940278 80240CC8 00431024 */ and $v0, $v0, $v1 -/* 94027C 80240CCC AE420000 */ sw $v0, ($s2) -.L80240CD0: -/* 940280 80240CD0 8E830070 */ lw $v1, 0x70($s4) -/* 940284 80240CD4 2C620064 */ sltiu $v0, $v1, 0x64 -/* 940288 80240CD8 10400036 */ beqz $v0, .L80240DB4 -/* 94028C 80240CDC 00031080 */ sll $v0, $v1, 2 -/* 940290 80240CE0 3C018024 */ lui $at, 0x8024 -/* 940294 80240CE4 00220821 */ addu $at, $at, $v0 -/* 940298 80240CE8 8C2248B8 */ lw $v0, 0x48b8($at) -/* 94029C 80240CEC 00400008 */ jr $v0 -/* 9402A0 80240CF0 00000000 */ nop -/* 9402A4 80240CF4 0280202D */ daddu $a0, $s4, $zero -/* 9402A8 80240CF8 0260282D */ daddu $a1, $s3, $zero -/* 9402AC 80240CFC 0C0900DC */ jal func_80240370 -/* 9402B0 80240D00 02A0302D */ daddu $a2, $s5, $zero -/* 9402B4 80240D04 0280202D */ daddu $a0, $s4, $zero -/* 9402B8 80240D08 0260282D */ daddu $a1, $s3, $zero -/* 9402BC 80240D0C 0C090109 */ jal func_80240424 -/* 9402C0 80240D10 02A0302D */ daddu $a2, $s5, $zero -/* 9402C4 80240D14 0809036D */ j .L80240DB4 -/* 9402C8 80240D18 00000000 */ nop -/* 9402CC 80240D1C 0280202D */ daddu $a0, $s4, $zero -/* 9402D0 80240D20 0260282D */ daddu $a1, $s3, $zero -/* 9402D4 80240D24 0C090151 */ jal func_80240544 -/* 9402D8 80240D28 02A0302D */ daddu $a2, $s5, $zero -/* 9402DC 80240D2C 0280202D */ daddu $a0, $s4, $zero -/* 9402E0 80240D30 0260282D */ daddu $a1, $s3, $zero -/* 9402E4 80240D34 0C090169 */ jal func_802405A4 -/* 9402E8 80240D38 02A0302D */ daddu $a2, $s5, $zero -/* 9402EC 80240D3C 0809036D */ j .L80240DB4 -/* 9402F0 80240D40 00000000 */ nop -/* 9402F4 80240D44 0280202D */ daddu $a0, $s4, $zero -/* 9402F8 80240D48 0260282D */ daddu $a1, $s3, $zero -/* 9402FC 80240D4C 0C090187 */ jal func_8024061C -/* 940300 80240D50 02A0302D */ daddu $a2, $s5, $zero -/* 940304 80240D54 0280202D */ daddu $a0, $s4, $zero -/* 940308 80240D58 0260282D */ daddu $a1, $s3, $zero -/* 94030C 80240D5C 0C0901D3 */ jal func_8024074C -/* 940310 80240D60 02A0302D */ daddu $a2, $s5, $zero -/* 940314 80240D64 0809036D */ j .L80240DB4 -/* 940318 80240D68 00000000 */ nop -/* 94031C 80240D6C 0280202D */ daddu $a0, $s4, $zero -/* 940320 80240D70 0260282D */ daddu $a1, $s3, $zero -/* 940324 80240D74 0C09021A */ jal func_80240868 -/* 940328 80240D78 02A0302D */ daddu $a2, $s5, $zero -/* 94032C 80240D7C 0809036D */ j .L80240DB4 -/* 940330 80240D80 00000000 */ nop -/* 940334 80240D84 0280202D */ daddu $a0, $s4, $zero -/* 940338 80240D88 0260282D */ daddu $a1, $s3, $zero -/* 94033C 80240D8C 0C09022C */ jal func_802408B0 -/* 940340 80240D90 02A0302D */ daddu $a2, $s5, $zero -/* 940344 80240D94 0280202D */ daddu $a0, $s4, $zero -/* 940348 80240D98 0260282D */ daddu $a1, $s3, $zero -/* 94034C 80240D9C 0C090257 */ jal func_8024095C -/* 940350 80240DA0 02A0302D */ daddu $a2, $s5, $zero -/* 940354 80240DA4 0809036D */ j .L80240DB4 -/* 940358 80240DA8 00000000 */ nop -/* 94035C 80240DAC 0C0129CF */ jal func_8004A73C -/* 940360 80240DB0 0280202D */ daddu $a0, $s4, $zero -.L80240DB4: -/* 940364 80240DB4 8FBF0048 */ lw $ra, 0x48($sp) -/* 940368 80240DB8 8FB50044 */ lw $s5, 0x44($sp) -/* 94036C 80240DBC 8FB40040 */ lw $s4, 0x40($sp) -/* 940370 80240DC0 8FB3003C */ lw $s3, 0x3c($sp) -/* 940374 80240DC4 8FB20038 */ lw $s2, 0x38($sp) -/* 940378 80240DC8 8FB10034 */ lw $s1, 0x34($sp) -/* 94037C 80240DCC 8FB00030 */ lw $s0, 0x30($sp) -/* 940380 80240DD0 0000102D */ daddu $v0, $zero, $zero -/* 940384 80240DD4 03E00008 */ jr $ra -/* 940388 80240DD8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240DDC_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_80240DDC_93F5B0.s deleted file mode 100644 index 0d26abe3ff..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240DDC_93F5B0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DDC_94038C -/* 94038C 80240DDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 940390 80240DE0 AFB00010 */ sw $s0, 0x10($sp) -/* 940394 80240DE4 3C108024 */ lui $s0, 0x8024 -/* 940398 80240DE8 26101FF4 */ addiu $s0, $s0, 0x1ff4 -/* 94039C 80240DEC AFBF0018 */ sw $ra, 0x18($sp) -/* 9403A0 80240DF0 AFB10014 */ sw $s1, 0x14($sp) -/* 9403A4 80240DF4 8E020000 */ lw $v0, ($s0) -/* 9403A8 80240DF8 14400010 */ bnez $v0, .L80240E3C -/* 9403AC 80240DFC 0080882D */ daddu $s1, $a0, $zero -/* 9403B0 80240E00 0C00AB39 */ jal heap_malloc -/* 9403B4 80240E04 24040040 */ addiu $a0, $zero, 0x40 -/* 9403B8 80240E08 AE020000 */ sw $v0, ($s0) -/* 9403BC 80240E0C 0000182D */ daddu $v1, $zero, $zero -/* 9403C0 80240E10 0040282D */ daddu $a1, $v0, $zero -/* 9403C4 80240E14 0220202D */ daddu $a0, $s1, $zero -.L80240E18: -/* 9403C8 80240E18 8C820084 */ lw $v0, 0x84($a0) -/* 9403CC 80240E1C 24840004 */ addiu $a0, $a0, 4 -/* 9403D0 80240E20 24630001 */ addiu $v1, $v1, 1 -/* 9403D4 80240E24 ACA20000 */ sw $v0, ($a1) -/* 9403D8 80240E28 28620010 */ slti $v0, $v1, 0x10 -/* 9403DC 80240E2C 1440FFFA */ bnez $v0, .L80240E18 -/* 9403E0 80240E30 24A50004 */ addiu $a1, $a1, 4 -/* 9403E4 80240E34 0809039E */ j .L80240E78 -/* 9403E8 80240E38 00000000 */ nop -.L80240E3C: -/* 9403EC 80240E3C 0000182D */ daddu $v1, $zero, $zero -/* 9403F0 80240E40 0040282D */ daddu $a1, $v0, $zero -/* 9403F4 80240E44 0220202D */ daddu $a0, $s1, $zero -.L80240E48: -/* 9403F8 80240E48 8CA20000 */ lw $v0, ($a1) -/* 9403FC 80240E4C 24A50004 */ addiu $a1, $a1, 4 -/* 940400 80240E50 24630001 */ addiu $v1, $v1, 1 -/* 940404 80240E54 AC820084 */ sw $v0, 0x84($a0) -/* 940408 80240E58 28620010 */ slti $v0, $v1, 0x10 -/* 94040C 80240E5C 1440FFFA */ bnez $v0, .L80240E48 -/* 940410 80240E60 24840004 */ addiu $a0, $a0, 4 -/* 940414 80240E64 3C108024 */ lui $s0, 0x8024 -/* 940418 80240E68 26101FF4 */ addiu $s0, $s0, 0x1ff4 -/* 94041C 80240E6C 0C00AB4B */ jal heap_free -/* 940420 80240E70 8E040000 */ lw $a0, ($s0) -/* 940424 80240E74 AE000000 */ sw $zero, ($s0) -.L80240E78: -/* 940428 80240E78 8FBF0018 */ lw $ra, 0x18($sp) -/* 94042C 80240E7C 8FB10014 */ lw $s1, 0x14($sp) -/* 940430 80240E80 8FB00010 */ lw $s0, 0x10($sp) -/* 940434 80240E84 24020002 */ addiu $v0, $zero, 2 -/* 940438 80240E88 03E00008 */ jr $ra -/* 94043C 80240E8C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240E90_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_80240E90_93F5B0.s deleted file mode 100644 index 3616ee158d..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240E90_93F5B0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E90_940440 -/* 940440 80240E90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 940444 80240E94 AFB00010 */ sw $s0, 0x10($sp) -/* 940448 80240E98 0080802D */ daddu $s0, $a0, $zero -/* 94044C 80240E9C AFBF0018 */ sw $ra, 0x18($sp) -/* 940450 80240EA0 AFB10014 */ sw $s1, 0x14($sp) -/* 940454 80240EA4 8E02000C */ lw $v0, 0xc($s0) -/* 940458 80240EA8 8C510000 */ lw $s1, ($v0) -/* 94045C 80240EAC 0C0B1EAF */ jal get_variable -/* 940460 80240EB0 0220282D */ daddu $a1, $s1, $zero -/* 940464 80240EB4 3C03FFF0 */ lui $v1, 0xfff0 -/* 940468 80240EB8 3463FFFF */ ori $v1, $v1, 0xffff -/* 94046C 80240EBC 0200202D */ daddu $a0, $s0, $zero -/* 940470 80240EC0 00431024 */ and $v0, $v0, $v1 -/* 940474 80240EC4 00021140 */ sll $v0, $v0, 5 -/* 940478 80240EC8 3C068008 */ lui $a2, %hi(gItemTable) -/* 94047C 80240ECC 00C23021 */ addu $a2, $a2, $v0 -/* 940480 80240ED0 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 940484 80240ED4 0C0B2026 */ jal set_variable -/* 940488 80240ED8 0220282D */ daddu $a1, $s1, $zero -/* 94048C 80240EDC 8FBF0018 */ lw $ra, 0x18($sp) -/* 940490 80240EE0 8FB10014 */ lw $s1, 0x14($sp) -/* 940494 80240EE4 8FB00010 */ lw $s0, 0x10($sp) -/* 940498 80240EE8 24020002 */ addiu $v0, $zero, 2 -/* 94049C 80240EEC 03E00008 */ jr $ra -/* 9404A0 80240EF0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240F50_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_80240F50_93F5B0.s deleted file mode 100644 index fcbc7ada43..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_80240F50_93F5B0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F50_940500 -/* 940500 80240F50 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 940504 80240F54 AFB10014 */ sw $s1, 0x14($sp) -/* 940508 80240F58 0080882D */ daddu $s1, $a0, $zero -/* 94050C 80240F5C AFBF0024 */ sw $ra, 0x24($sp) -/* 940510 80240F60 AFB40020 */ sw $s4, 0x20($sp) -/* 940514 80240F64 AFB3001C */ sw $s3, 0x1c($sp) -/* 940518 80240F68 AFB20018 */ sw $s2, 0x18($sp) -/* 94051C 80240F6C AFB00010 */ sw $s0, 0x10($sp) -/* 940520 80240F70 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 940524 80240F74 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 940528 80240F78 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 94052C 80240F7C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 940530 80240F80 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 940534 80240F84 8E30000C */ lw $s0, 0xc($s1) -/* 940538 80240F88 8E130000 */ lw $s3, ($s0) -/* 94053C 80240F8C 26100004 */ addiu $s0, $s0, 4 -/* 940540 80240F90 0C0B1EAF */ jal get_variable -/* 940544 80240F94 0260282D */ daddu $a1, $s3, $zero -/* 940548 80240F98 4482E000 */ mtc1 $v0, $f28 -/* 94054C 80240F9C 00000000 */ nop -/* 940550 80240FA0 4680E720 */ cvt.s.w $f28, $f28 -/* 940554 80240FA4 8E140000 */ lw $s4, ($s0) -/* 940558 80240FA8 26100004 */ addiu $s0, $s0, 4 -/* 94055C 80240FAC 0220202D */ daddu $a0, $s1, $zero -/* 940560 80240FB0 0C0B1EAF */ jal get_variable -/* 940564 80240FB4 0280282D */ daddu $a1, $s4, $zero -/* 940568 80240FB8 4482D000 */ mtc1 $v0, $f26 -/* 94056C 80240FBC 00000000 */ nop -/* 940570 80240FC0 4680D6A0 */ cvt.s.w $f26, $f26 -/* 940574 80240FC4 8E100000 */ lw $s0, ($s0) -/* 940578 80240FC8 0220202D */ daddu $a0, $s1, $zero -/* 94057C 80240FCC 0C0B1EAF */ jal get_variable -/* 940580 80240FD0 0200282D */ daddu $a1, $s0, $zero -/* 940584 80240FD4 4482C000 */ mtc1 $v0, $f24 -/* 940588 80240FD8 00000000 */ nop -/* 94058C 80240FDC 4680C620 */ cvt.s.w $f24, $f24 -/* 940590 80240FE0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 940594 80240FE4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 940598 80240FE8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 94059C 80240FEC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 9405A0 80240FF0 C64200A8 */ lwc1 $f2, 0xa8($s2) -/* 9405A4 80240FF4 44800000 */ mtc1 $zero, $f0 -/* 9405A8 80240FF8 00031080 */ sll $v0, $v1, 2 -/* 9405AC 80240FFC 00431021 */ addu $v0, $v0, $v1 -/* 9405B0 80241000 00021080 */ sll $v0, $v0, 2 -/* 9405B4 80241004 00431023 */ subu $v0, $v0, $v1 -/* 9405B8 80241008 000218C0 */ sll $v1, $v0, 3 -/* 9405BC 8024100C 00431021 */ addu $v0, $v0, $v1 -/* 9405C0 80241010 000210C0 */ sll $v0, $v0, 3 -/* 9405C4 80241014 46001032 */ c.eq.s $f2, $f0 -/* 9405C8 80241018 3C01800B */ lui $at, 0x800b -/* 9405CC 8024101C 00220821 */ addu $at, $at, $v0 -/* 9405D0 80241020 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* 9405D4 80241024 45000005 */ bc1f .L8024103C -/* 9405D8 80241028 00000000 */ nop -/* 9405DC 8024102C 3C0142C8 */ lui $at, 0x42c8 -/* 9405E0 80241030 44810000 */ mtc1 $at, $f0 -/* 9405E4 80241034 08090413 */ j .L8024104C -/* 9405E8 80241038 4600B581 */ sub.s $f22, $f22, $f0 -.L8024103C: -/* 9405EC 8024103C 3C0142C8 */ lui $at, 0x42c8 -/* 9405F0 80241040 44810000 */ mtc1 $at, $f0 -/* 9405F4 80241044 00000000 */ nop -/* 9405F8 80241048 4600B580 */ add.s $f22, $f22, $f0 -.L8024104C: -/* 9405FC 8024104C 0C00A6C9 */ jal clamp_angle -/* 940600 80241050 4600B306 */ mov.s $f12, $f22 -/* 940604 80241054 46000586 */ mov.s $f22, $f0 -/* 940608 80241058 3C014170 */ lui $at, 0x4170 -/* 94060C 8024105C 4481A000 */ mtc1 $at, $f20 -/* 940610 80241060 0C00A8BB */ jal sin_deg -/* 940614 80241064 4600B306 */ mov.s $f12, $f22 -/* 940618 80241068 46140002 */ mul.s $f0, $f0, $f20 -/* 94061C 8024106C 00000000 */ nop -/* 940620 80241070 864200B0 */ lh $v0, 0xb0($s2) -/* 940624 80241074 3C013F00 */ lui $at, 0x3f00 -/* 940628 80241078 44812000 */ mtc1 $at, $f4 -/* 94062C 8024107C 44821000 */ mtc1 $v0, $f2 -/* 940630 80241080 00000000 */ nop -/* 940634 80241084 468010A0 */ cvt.s.w $f2, $f2 -/* 940638 80241088 46041082 */ mul.s $f2, $f2, $f4 -/* 94063C 8024108C 00000000 */ nop -/* 940640 80241090 4600E700 */ add.s $f28, $f28, $f0 -/* 940644 80241094 4602D680 */ add.s $f26, $f26, $f2 -/* 940648 80241098 0C00A8D4 */ jal cos_deg -/* 94064C 8024109C 4600B306 */ mov.s $f12, $f22 -/* 940650 802410A0 46140002 */ mul.s $f0, $f0, $f20 -/* 940654 802410A4 00000000 */ nop -/* 940658 802410A8 0220202D */ daddu $a0, $s1, $zero -/* 94065C 802410AC 0260282D */ daddu $a1, $s3, $zero -/* 940660 802410B0 4600E18D */ trunc.w.s $f6, $f28 -/* 940664 802410B4 44063000 */ mfc1 $a2, $f6 -/* 940668 802410B8 0C0B2026 */ jal set_variable -/* 94066C 802410BC 4600C601 */ sub.s $f24, $f24, $f0 -/* 940670 802410C0 0220202D */ daddu $a0, $s1, $zero -/* 940674 802410C4 4600D18D */ trunc.w.s $f6, $f26 -/* 940678 802410C8 44063000 */ mfc1 $a2, $f6 -/* 94067C 802410CC 0C0B2026 */ jal set_variable -/* 940680 802410D0 0280282D */ daddu $a1, $s4, $zero -/* 940684 802410D4 0220202D */ daddu $a0, $s1, $zero -/* 940688 802410D8 4600C18D */ trunc.w.s $f6, $f24 -/* 94068C 802410DC 44063000 */ mfc1 $a2, $f6 -/* 940690 802410E0 0C0B2026 */ jal set_variable -/* 940694 802410E4 0200282D */ daddu $a1, $s0, $zero -/* 940698 802410E8 8FBF0024 */ lw $ra, 0x24($sp) -/* 94069C 802410EC 8FB40020 */ lw $s4, 0x20($sp) -/* 9406A0 802410F0 8FB3001C */ lw $s3, 0x1c($sp) -/* 9406A4 802410F4 8FB20018 */ lw $s2, 0x18($sp) -/* 9406A8 802410F8 8FB10014 */ lw $s1, 0x14($sp) -/* 9406AC 802410FC 8FB00010 */ lw $s0, 0x10($sp) -/* 9406B0 80241100 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 9406B4 80241104 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 9406B8 80241108 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 9406BC 8024110C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 9406C0 80241110 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 9406C4 80241114 24020002 */ addiu $v0, $zero, 2 -/* 9406C8 80241118 03E00008 */ jr $ra -/* 9406CC 8024111C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_80241120_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_80241120_93F5B0.s deleted file mode 100644 index 161636c6a4..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_80241120_93F5B0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241120_9406D0 -/* 9406D0 80241120 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9406D4 80241124 AFBF0010 */ sw $ra, 0x10($sp) -/* 9406D8 80241128 10A00003 */ beqz $a1, .L80241138 -/* 9406DC 8024112C 8C86000C */ lw $a2, 0xc($a0) -/* 9406E0 80241130 3C018024 */ lui $at, 0x8024 -/* 9406E4 80241134 AC202058 */ sw $zero, 0x2058($at) -.L80241138: -/* 9406E8 80241138 3C038024 */ lui $v1, 0x8024 -/* 9406EC 8024113C 24632058 */ addiu $v1, $v1, 0x2058 -/* 9406F0 80241140 8C620000 */ lw $v0, ($v1) -/* 9406F4 80241144 54400003 */ bnel $v0, $zero, .L80241154 -/* 9406F8 80241148 AC600000 */ sw $zero, ($v1) -/* 9406FC 8024114C 0809045A */ j .L80241168 -/* 940700 80241150 0000102D */ daddu $v0, $zero, $zero -.L80241154: -/* 940704 80241154 8CC50000 */ lw $a1, ($a2) -/* 940708 80241158 3C068024 */ lui $a2, 0x8024 -/* 94070C 8024115C 0C0B2026 */ jal set_variable -/* 940710 80241160 8CC6205C */ lw $a2, 0x205c($a2) -/* 940714 80241164 24020002 */ addiu $v0, $zero, 2 -.L80241168: -/* 940718 80241168 8FBF0010 */ lw $ra, 0x10($sp) -/* 94071C 8024116C 03E00008 */ jr $ra -/* 940720 80241170 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_80241174_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_80241174_93F5B0.s deleted file mode 100644 index f92d89f012..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_80241174_93F5B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241174_940724 -/* 940724 80241174 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 940728 80241178 AFBF0010 */ sw $ra, 0x10($sp) -/* 94072C 8024117C 8C82000C */ lw $v0, 0xc($a0) -/* 940730 80241180 0C0B1EAF */ jal get_variable -/* 940734 80241184 8C450000 */ lw $a1, ($v0) -/* 940738 80241188 3C018024 */ lui $at, 0x8024 -/* 94073C 8024118C AC22205C */ sw $v0, 0x205c($at) -/* 940740 80241190 24020002 */ addiu $v0, $zero, 2 -/* 940744 80241194 8FBF0010 */ lw $ra, 0x10($sp) -/* 940748 80241198 24030001 */ addiu $v1, $zero, 1 -/* 94074C 8024119C 3C018024 */ lui $at, 0x8024 -/* 940750 802411A0 AC232058 */ sw $v1, 0x2058($at) -/* 940754 802411A4 03E00008 */ jr $ra -/* 940758 802411A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_802411AC_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_802411AC_93F5B0.s deleted file mode 100644 index 59cd7d5fdd..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_802411AC_93F5B0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411AC_94075C -/* 94075C 802411AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 940760 802411B0 AFBF0010 */ sw $ra, 0x10($sp) -/* 940764 802411B4 8C82000C */ lw $v0, 0xc($a0) -/* 940768 802411B8 0C0B1EAF */ jal get_variable -/* 94076C 802411BC 8C450000 */ lw $a1, ($v0) -/* 940770 802411C0 0040182D */ daddu $v1, $v0, $zero -/* 940774 802411C4 10600012 */ beqz $v1, .L80241210 -/* 940778 802411C8 0000202D */ daddu $a0, $zero, $zero -/* 94077C 802411CC 8C620000 */ lw $v0, ($v1) -/* 940780 802411D0 5040000A */ beql $v0, $zero, .L802411FC -/* 940784 802411D4 00041080 */ sll $v0, $a0, 2 -/* 940788 802411D8 3C058024 */ lui $a1, %hi(end_battle) -/* 94078C 802411DC 24A54A50 */ addiu $a1, $a1, %lo(end_battle) -.L802411E0: -/* 940790 802411E0 24630004 */ addiu $v1, $v1, 4 -/* 940794 802411E4 24840001 */ addiu $a0, $a0, 1 -/* 940798 802411E8 ACA20000 */ sw $v0, ($a1) -/* 94079C 802411EC 8C620000 */ lw $v0, ($v1) -/* 9407A0 802411F0 1440FFFB */ bnez $v0, .L802411E0 -/* 9407A4 802411F4 24A50004 */ addiu $a1, $a1, 4 -/* 9407A8 802411F8 00041080 */ sll $v0, $a0, 2 -.L802411FC: -/* 9407AC 802411FC 3C018024 */ lui $at, %hi(end_battle) -/* 9407B0 80241200 00220821 */ addu $at, $at, $v0 -/* 9407B4 80241204 AC204A50 */ sw $zero, %lo(end_battle)($at) -/* 9407B8 80241208 0809048E */ j .L80241238 -/* 9407BC 8024120C 00000000 */ nop -.L80241210: -/* 9407C0 80241210 3C038024 */ lui $v1, %hi(end_battle) -/* 9407C4 80241214 24634A50 */ addiu $v1, $v1, %lo(end_battle) -/* 9407C8 80241218 0060282D */ daddu $a1, $v1, $zero -.L8024121C: -/* 9407CC 8024121C 24820010 */ addiu $v0, $a0, 0x10 -/* 9407D0 80241220 AC620000 */ sw $v0, ($v1) -/* 9407D4 80241224 24630004 */ addiu $v1, $v1, 4 -/* 9407D8 80241228 24840001 */ addiu $a0, $a0, 1 -/* 9407DC 8024122C 28820070 */ slti $v0, $a0, 0x70 -/* 9407E0 80241230 1440FFFA */ bnez $v0, .L8024121C -/* 9407E4 80241234 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241238: -/* 9407E8 80241238 8FBF0010 */ lw $ra, 0x10($sp) -/* 9407EC 8024123C 24020002 */ addiu $v0, $zero, 2 -/* 9407F0 80241240 03E00008 */ jr $ra -/* 9407F4 80241244 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/func_802413D4_93F5B0.s b/asm/nonmatchings/world/area_sbk/sbk_30/func_802413D4_93F5B0.s deleted file mode 100644 index 5c51ac757b..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/func_802413D4_93F5B0.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413D4_940984 -/* 940984 802413D4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 940988 802413D8 AFB1001C */ sw $s1, 0x1c($sp) -/* 94098C 802413DC 0080882D */ daddu $s1, $a0, $zero -/* 940990 802413E0 AFBF0034 */ sw $ra, 0x34($sp) -/* 940994 802413E4 AFB60030 */ sw $s6, 0x30($sp) -/* 940998 802413E8 AFB5002C */ sw $s5, 0x2c($sp) -/* 94099C 802413EC AFB40028 */ sw $s4, 0x28($sp) -/* 9409A0 802413F0 AFB30024 */ sw $s3, 0x24($sp) -/* 9409A4 802413F4 AFB20020 */ sw $s2, 0x20($sp) -/* 9409A8 802413F8 AFB00018 */ sw $s0, 0x18($sp) -/* 9409AC 802413FC F7B60040 */ sdc1 $f22, 0x40($sp) -/* 9409B0 80241400 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 9409B4 80241404 8E30000C */ lw $s0, 0xc($s1) -/* 9409B8 80241408 8E160000 */ lw $s6, ($s0) -/* 9409BC 8024140C 26100004 */ addiu $s0, $s0, 4 -/* 9409C0 80241410 0C0B1EAF */ jal get_variable -/* 9409C4 80241414 02C0282D */ daddu $a1, $s6, $zero -/* 9409C8 80241418 44820000 */ mtc1 $v0, $f0 -/* 9409CC 8024141C 00000000 */ nop -/* 9409D0 80241420 46800020 */ cvt.s.w $f0, $f0 -/* 9409D4 80241424 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9409D8 80241428 8E140000 */ lw $s4, ($s0) -/* 9409DC 8024142C 26100004 */ addiu $s0, $s0, 4 -/* 9409E0 80241430 0220202D */ daddu $a0, $s1, $zero -/* 9409E4 80241434 0C0B1EAF */ jal get_variable -/* 9409E8 80241438 0280282D */ daddu $a1, $s4, $zero -/* 9409EC 8024143C 0220202D */ daddu $a0, $s1, $zero -/* 9409F0 80241440 8E150000 */ lw $s5, ($s0) -/* 9409F4 80241444 4482B000 */ mtc1 $v0, $f22 -/* 9409F8 80241448 00000000 */ nop -/* 9409FC 8024144C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 940A00 80241450 0C0B1EAF */ jal get_variable -/* 940A04 80241454 02A0282D */ daddu $a1, $s5, $zero -/* 940A08 80241458 2404FFFC */ addiu $a0, $zero, -4 -/* 940A0C 8024145C 44820000 */ mtc1 $v0, $f0 -/* 940A10 80241460 00000000 */ nop -/* 940A14 80241464 46800020 */ cvt.s.w $f0, $f0 -/* 940A18 80241468 0C00EABB */ jal get_npc_unsafe -/* 940A1C 8024146C E7A00014 */ swc1 $f0, 0x14($sp) -/* 940A20 80241470 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 940A24 80241474 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 940A28 80241478 3C014334 */ lui $at, 0x4334 -/* 940A2C 8024147C 44816000 */ mtc1 $at, $f12 -/* 940A30 80241480 00041880 */ sll $v1, $a0, 2 -/* 940A34 80241484 00641821 */ addu $v1, $v1, $a0 -/* 940A38 80241488 00031880 */ sll $v1, $v1, 2 -/* 940A3C 8024148C 00641823 */ subu $v1, $v1, $a0 -/* 940A40 80241490 000320C0 */ sll $a0, $v1, 3 -/* 940A44 80241494 00641821 */ addu $v1, $v1, $a0 -/* 940A48 80241498 000318C0 */ sll $v1, $v1, 3 -/* 940A4C 8024149C 3C01800B */ lui $at, 0x800b -/* 940A50 802414A0 00230821 */ addu $at, $at, $v1 -/* 940A54 802414A4 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 940A58 802414A8 460C0300 */ add.s $f12, $f0, $f12 -/* 940A5C 802414AC 0C00A6C9 */ jal clamp_angle -/* 940A60 802414B0 0040982D */ daddu $s3, $v0, $zero -/* 940A64 802414B4 27B00010 */ addiu $s0, $sp, 0x10 -/* 940A68 802414B8 0200202D */ daddu $a0, $s0, $zero -/* 940A6C 802414BC 27B20014 */ addiu $s2, $sp, 0x14 -/* 940A70 802414C0 0240282D */ daddu $a1, $s2, $zero -/* 940A74 802414C4 3C064170 */ lui $a2, 0x4170 -/* 940A78 802414C8 8E67000C */ lw $a3, 0xc($s3) -/* 940A7C 802414CC 0C00A7E7 */ jal add_vec2D_polar -/* 940A80 802414D0 46000506 */ mov.s $f20, $f0 -/* 940A84 802414D4 0200202D */ daddu $a0, $s0, $zero -/* 940A88 802414D8 3C064120 */ lui $a2, 0x4120 -/* 940A8C 802414DC 4407A000 */ mfc1 $a3, $f20 -/* 940A90 802414E0 0C00A7E7 */ jal add_vec2D_polar -/* 940A94 802414E4 0240282D */ daddu $a1, $s2, $zero -/* 940A98 802414E8 0220202D */ daddu $a0, $s1, $zero -/* 940A9C 802414EC C7A00010 */ lwc1 $f0, 0x10($sp) -/* 940AA0 802414F0 4600008D */ trunc.w.s $f2, $f0 -/* 940AA4 802414F4 44061000 */ mfc1 $a2, $f2 -/* 940AA8 802414F8 0C0B2026 */ jal set_variable -/* 940AAC 802414FC 02C0282D */ daddu $a1, $s6, $zero -/* 940AB0 80241500 0220202D */ daddu $a0, $s1, $zero -/* 940AB4 80241504 4600B08D */ trunc.w.s $f2, $f22 -/* 940AB8 80241508 44061000 */ mfc1 $a2, $f2 -/* 940ABC 8024150C 0C0B2026 */ jal set_variable -/* 940AC0 80241510 0280282D */ daddu $a1, $s4, $zero -/* 940AC4 80241514 0220202D */ daddu $a0, $s1, $zero -/* 940AC8 80241518 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 940ACC 8024151C 4600008D */ trunc.w.s $f2, $f0 -/* 940AD0 80241520 44061000 */ mfc1 $a2, $f2 -/* 940AD4 80241524 0C0B2026 */ jal set_variable -/* 940AD8 80241528 02A0282D */ daddu $a1, $s5, $zero -/* 940ADC 8024152C 8FBF0034 */ lw $ra, 0x34($sp) -/* 940AE0 80241530 8FB60030 */ lw $s6, 0x30($sp) -/* 940AE4 80241534 8FB5002C */ lw $s5, 0x2c($sp) -/* 940AE8 80241538 8FB40028 */ lw $s4, 0x28($sp) -/* 940AEC 8024153C 8FB30024 */ lw $s3, 0x24($sp) -/* 940AF0 80241540 8FB20020 */ lw $s2, 0x20($sp) -/* 940AF4 80241544 8FB1001C */ lw $s1, 0x1c($sp) -/* 940AF8 80241548 8FB00018 */ lw $s0, 0x18($sp) -/* 940AFC 8024154C D7B60040 */ ldc1 $f22, 0x40($sp) -/* 940B00 80241550 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 940B04 80241554 24020002 */ addiu $v0, $zero, 2 -/* 940B08 80241558 03E00008 */ jr $ra -/* 940B0C 8024155C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sbk/sbk_31/func_80240040_944000.s b/asm/nonmatchings/world/area_sbk/sbk_31/func_80240040_944000.s deleted file mode 100644 index 0d17c1a601..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_31/func_80240040_944000.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_944040 -/* 944040 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 944044 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 944048 80240048 0080982D */ daddu $s3, $a0, $zero -/* 94404C 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 944050 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 944054 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 944058 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 94405C 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 944060 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 944064 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 944068 80240068 0260202D */ daddu $a0, $s3, $zero -/* 94406C 8024006C 8E050000 */ lw $a1, ($s0) -/* 944070 80240070 0C0B1EAF */ jal get_variable -/* 944074 80240074 26100004 */ addiu $s0, $s0, 4 -/* 944078 80240078 8E050000 */ lw $a1, ($s0) -/* 94407C 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 944080 80240080 0260202D */ daddu $a0, $s3, $zero -/* 944084 80240084 0C0B1EAF */ jal get_variable -/* 944088 80240088 0040882D */ daddu $s1, $v0, $zero -/* 94408C 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 944090 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 944094 80240094 8E120000 */ lw $s2, ($s0) -/* 944098 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 94409C 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 9440A0 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 9440A4 802400A4 08090030 */ j .L802400C0 -/* 9440A8 802400A8 00000000 */ nop -.L802400AC: -/* 9440AC 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 9440B0 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 9440B4 802400B4 14400005 */ bnez $v0, .L802400CC -/* 9440B8 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 9440BC 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 9440C0 802400C0 0C00EABB */ jal get_npc_unsafe -/* 9440C4 802400C4 00000000 */ nop -/* 9440C8 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 9440CC 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 9440D0 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 9440D4 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 9440D8 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 9440DC 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 9440E0 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 9440E4 802400E4 0C0B1EAF */ jal get_variable -/* 9440E8 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 9440EC 802400EC 1040000C */ beqz $v0, .L80240120 -/* 9440F0 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 9440F4 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9440F8 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 9440FC 802400FC 44810000 */ mtc1 $at, $f0 -/* 944100 80240100 00000000 */ nop -/* 944104 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 944108 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 94410C 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 944110 80240110 44061000 */ mfc1 $a2, $f2 -/* 944114 80240114 0C04D083 */ jal set_item_entity_position -/* 944118 80240118 0280202D */ daddu $a0, $s4, $zero -/* 94411C 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 944120 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 944124 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 944128 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 94412C 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 944130 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 944134 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 944138 80240138 03E00008 */ jr $ra -/* 94413C 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_32/func_80240040_944A60.s b/asm/nonmatchings/world/area_sbk/sbk_32/func_80240040_944A60.s deleted file mode 100644 index 3e7d6e49eb..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_32/func_80240040_944A60.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_944AA0 -/* 944AA0 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 944AA4 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 944AA8 80240048 0080982D */ daddu $s3, $a0, $zero -/* 944AAC 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 944AB0 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 944AB4 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 944AB8 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 944ABC 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 944AC0 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 944AC4 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 944AC8 80240068 0260202D */ daddu $a0, $s3, $zero -/* 944ACC 8024006C 8E050000 */ lw $a1, ($s0) -/* 944AD0 80240070 0C0B1EAF */ jal get_variable -/* 944AD4 80240074 26100004 */ addiu $s0, $s0, 4 -/* 944AD8 80240078 8E050000 */ lw $a1, ($s0) -/* 944ADC 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 944AE0 80240080 0260202D */ daddu $a0, $s3, $zero -/* 944AE4 80240084 0C0B1EAF */ jal get_variable -/* 944AE8 80240088 0040882D */ daddu $s1, $v0, $zero -/* 944AEC 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 944AF0 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 944AF4 80240094 8E120000 */ lw $s2, ($s0) -/* 944AF8 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 944AFC 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 944B00 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 944B04 802400A4 08090030 */ j .L802400C0 -/* 944B08 802400A8 00000000 */ nop -.L802400AC: -/* 944B0C 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 944B10 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 944B14 802400B4 14400005 */ bnez $v0, .L802400CC -/* 944B18 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 944B1C 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 944B20 802400C0 0C00EABB */ jal get_npc_unsafe -/* 944B24 802400C4 00000000 */ nop -/* 944B28 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 944B2C 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 944B30 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 944B34 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 944B38 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 944B3C 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 944B40 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 944B44 802400E4 0C0B1EAF */ jal get_variable -/* 944B48 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 944B4C 802400EC 1040000C */ beqz $v0, .L80240120 -/* 944B50 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 944B54 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 944B58 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 944B5C 802400FC 44810000 */ mtc1 $at, $f0 -/* 944B60 80240100 00000000 */ nop -/* 944B64 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 944B68 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 944B6C 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 944B70 80240110 44061000 */ mfc1 $a2, $f2 -/* 944B74 80240114 0C04D083 */ jal set_item_entity_position -/* 944B78 80240118 0280202D */ daddu $a0, $s4, $zero -/* 944B7C 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 944B80 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 944B84 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 944B88 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 944B8C 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 944B90 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 944B94 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 944B98 80240138 03E00008 */ jr $ra -/* 944B9C 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_32/func_80240140_944A60.s b/asm/nonmatchings/world/area_sbk/sbk_32/func_80240140_944A60.s deleted file mode 100644 index af56ead61c..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_32/func_80240140_944A60.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240140_944BA0 -/* 944BA0 80240140 8C830148 */ lw $v1, 0x148($a0) -/* 944BA4 80240144 24020003 */ addiu $v0, $zero, 3 -/* 944BA8 80240148 A06200B5 */ sb $v0, 0xb5($v1) -/* 944BAC 8024014C 03E00008 */ jr $ra -/* 944BB0 80240150 24020002 */ addiu $v0, $zero, 2 -/* 944BB4 80240154 00000000 */ nop -/* 944BB8 80240158 00000000 */ nop -/* 944BBC 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/func_80240040_945ED0.s b/asm/nonmatchings/world/area_sbk/sbk_34/func_80240040_945ED0.s deleted file mode 100644 index ff0b4d4dd8..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_34/func_80240040_945ED0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_945F10 -/* 945F10 80240040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 945F14 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* 945F18 80240048 3C108024 */ lui $s0, 0x8024 -/* 945F1C 8024004C 26100D9C */ addiu $s0, $s0, 0xd9c -/* 945F20 80240050 AFBF0018 */ sw $ra, 0x18($sp) -/* 945F24 80240054 AFB10014 */ sw $s1, 0x14($sp) -/* 945F28 80240058 8E020000 */ lw $v0, ($s0) -/* 945F2C 8024005C 14400010 */ bnez $v0, .L802400A0 -/* 945F30 80240060 0080882D */ daddu $s1, $a0, $zero -/* 945F34 80240064 0C00AB39 */ jal heap_malloc -/* 945F38 80240068 24040040 */ addiu $a0, $zero, 0x40 -/* 945F3C 8024006C AE020000 */ sw $v0, ($s0) -/* 945F40 80240070 0000182D */ daddu $v1, $zero, $zero -/* 945F44 80240074 0040282D */ daddu $a1, $v0, $zero -/* 945F48 80240078 0220202D */ daddu $a0, $s1, $zero -.L8024007C: -/* 945F4C 8024007C 8C820084 */ lw $v0, 0x84($a0) -/* 945F50 80240080 24840004 */ addiu $a0, $a0, 4 -/* 945F54 80240084 24630001 */ addiu $v1, $v1, 1 -/* 945F58 80240088 ACA20000 */ sw $v0, ($a1) -/* 945F5C 8024008C 28620010 */ slti $v0, $v1, 0x10 -/* 945F60 80240090 1440FFFA */ bnez $v0, .L8024007C -/* 945F64 80240094 24A50004 */ addiu $a1, $a1, 4 -/* 945F68 80240098 08090037 */ j .L802400DC -/* 945F6C 8024009C 00000000 */ nop -.L802400A0: -/* 945F70 802400A0 0000182D */ daddu $v1, $zero, $zero -/* 945F74 802400A4 0040282D */ daddu $a1, $v0, $zero -/* 945F78 802400A8 0220202D */ daddu $a0, $s1, $zero -.L802400AC: -/* 945F7C 802400AC 8CA20000 */ lw $v0, ($a1) -/* 945F80 802400B0 24A50004 */ addiu $a1, $a1, 4 -/* 945F84 802400B4 24630001 */ addiu $v1, $v1, 1 -/* 945F88 802400B8 AC820084 */ sw $v0, 0x84($a0) -/* 945F8C 802400BC 28620010 */ slti $v0, $v1, 0x10 -/* 945F90 802400C0 1440FFFA */ bnez $v0, .L802400AC -/* 945F94 802400C4 24840004 */ addiu $a0, $a0, 4 -/* 945F98 802400C8 3C108024 */ lui $s0, 0x8024 -/* 945F9C 802400CC 26100D9C */ addiu $s0, $s0, 0xd9c -/* 945FA0 802400D0 0C00AB4B */ jal heap_free -/* 945FA4 802400D4 8E040000 */ lw $a0, ($s0) -/* 945FA8 802400D8 AE000000 */ sw $zero, ($s0) -.L802400DC: -/* 945FAC 802400DC 8FBF0018 */ lw $ra, 0x18($sp) -/* 945FB0 802400E0 8FB10014 */ lw $s1, 0x14($sp) -/* 945FB4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 945FB8 802400E8 24020002 */ addiu $v0, $zero, 2 -/* 945FBC 802400EC 03E00008 */ jr $ra -/* 945FC0 802400F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/func_802400F4_945ED0.s b/asm/nonmatchings/world/area_sbk/sbk_34/func_802400F4_945ED0.s deleted file mode 100644 index 4b25e53905..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_34/func_802400F4_945ED0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F4_945FC4 -/* 945FC4 802400F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 945FC8 802400F8 AFB00010 */ sw $s0, 0x10($sp) -/* 945FCC 802400FC 0080802D */ daddu $s0, $a0, $zero -/* 945FD0 80240100 AFBF0018 */ sw $ra, 0x18($sp) -/* 945FD4 80240104 AFB10014 */ sw $s1, 0x14($sp) -/* 945FD8 80240108 8E02000C */ lw $v0, 0xc($s0) -/* 945FDC 8024010C 8C510000 */ lw $s1, ($v0) -/* 945FE0 80240110 0C0B1EAF */ jal get_variable -/* 945FE4 80240114 0220282D */ daddu $a1, $s1, $zero -/* 945FE8 80240118 3C03FFF0 */ lui $v1, 0xfff0 -/* 945FEC 8024011C 3463FFFF */ ori $v1, $v1, 0xffff -/* 945FF0 80240120 0200202D */ daddu $a0, $s0, $zero -/* 945FF4 80240124 00431024 */ and $v0, $v0, $v1 -/* 945FF8 80240128 00021140 */ sll $v0, $v0, 5 -/* 945FFC 8024012C 3C068008 */ lui $a2, %hi(gItemTable) -/* 946000 80240130 00C23021 */ addu $a2, $a2, $v0 -/* 946004 80240134 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 946008 80240138 0C0B2026 */ jal set_variable -/* 94600C 8024013C 0220282D */ daddu $a1, $s1, $zero -/* 946010 80240140 8FBF0018 */ lw $ra, 0x18($sp) -/* 946014 80240144 8FB10014 */ lw $s1, 0x14($sp) -/* 946018 80240148 8FB00010 */ lw $s0, 0x10($sp) -/* 94601C 8024014C 24020002 */ addiu $v0, $zero, 2 -/* 946020 80240150 03E00008 */ jr $ra -/* 946024 80240154 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/func_80240384_945ED0.s b/asm/nonmatchings/world/area_sbk/sbk_34/func_80240384_945ED0.s deleted file mode 100644 index 315281c672..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_34/func_80240384_945ED0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240384_946254 -/* 946254 80240384 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 946258 80240388 AFBF0010 */ sw $ra, 0x10($sp) -/* 94625C 8024038C 10A00003 */ beqz $a1, .L8024039C -/* 946260 80240390 8C86000C */ lw $a2, 0xc($a0) -/* 946264 80240394 3C018024 */ lui $at, 0x8024 -/* 946268 80240398 AC200E00 */ sw $zero, 0xe00($at) -.L8024039C: -/* 94626C 8024039C 3C038024 */ lui $v1, 0x8024 -/* 946270 802403A0 24630E00 */ addiu $v1, $v1, 0xe00 -/* 946274 802403A4 8C620000 */ lw $v0, ($v1) -/* 946278 802403A8 54400003 */ bnel $v0, $zero, .L802403B8 -/* 94627C 802403AC AC600000 */ sw $zero, ($v1) -/* 946280 802403B0 080900F3 */ j .L802403CC -/* 946284 802403B4 0000102D */ daddu $v0, $zero, $zero -.L802403B8: -/* 946288 802403B8 8CC50000 */ lw $a1, ($a2) -/* 94628C 802403BC 3C068024 */ lui $a2, 0x8024 -/* 946290 802403C0 0C0B2026 */ jal set_variable -/* 946294 802403C4 8CC60E04 */ lw $a2, 0xe04($a2) -/* 946298 802403C8 24020002 */ addiu $v0, $zero, 2 -.L802403CC: -/* 94629C 802403CC 8FBF0010 */ lw $ra, 0x10($sp) -/* 9462A0 802403D0 03E00008 */ jr $ra -/* 9462A4 802403D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/func_80240410_945ED0.s b/asm/nonmatchings/world/area_sbk/sbk_34/func_80240410_945ED0.s deleted file mode 100644 index 1a55a67b5f..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_34/func_80240410_945ED0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240410_9462E0 -/* 9462E0 80240410 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9462E4 80240414 AFBF0010 */ sw $ra, 0x10($sp) -/* 9462E8 80240418 8C82000C */ lw $v0, 0xc($a0) -/* 9462EC 8024041C 0C0B1EAF */ jal get_variable -/* 9462F0 80240420 8C450000 */ lw $a1, ($v0) -/* 9462F4 80240424 0040182D */ daddu $v1, $v0, $zero -/* 9462F8 80240428 10600012 */ beqz $v1, .L80240474 -/* 9462FC 8024042C 0000202D */ daddu $a0, $zero, $zero -/* 946300 80240430 8C620000 */ lw $v0, ($v1) -/* 946304 80240434 5040000A */ beql $v0, $zero, .L80240460 -/* 946308 80240438 00041080 */ sll $v0, $a0, 2 -/* 94630C 8024043C 3C058024 */ lui $a1, 0x8024 -/* 946310 80240440 24A527E0 */ addiu $a1, $a1, 0x27e0 -.L80240444: -/* 946314 80240444 24630004 */ addiu $v1, $v1, 4 -/* 946318 80240448 24840001 */ addiu $a0, $a0, 1 -/* 94631C 8024044C ACA20000 */ sw $v0, ($a1) -/* 946320 80240450 8C620000 */ lw $v0, ($v1) -/* 946324 80240454 1440FFFB */ bnez $v0, .L80240444 -/* 946328 80240458 24A50004 */ addiu $a1, $a1, 4 -/* 94632C 8024045C 00041080 */ sll $v0, $a0, 2 -.L80240460: -/* 946330 80240460 3C018024 */ lui $at, 0x8024 -/* 946334 80240464 00220821 */ addu $at, $at, $v0 -/* 946338 80240468 AC2027E0 */ sw $zero, 0x27e0($at) -/* 94633C 8024046C 08090127 */ j .L8024049C -/* 946340 80240470 00000000 */ nop -.L80240474: -/* 946344 80240474 3C038024 */ lui $v1, 0x8024 -/* 946348 80240478 246327E0 */ addiu $v1, $v1, 0x27e0 -/* 94634C 8024047C 0060282D */ daddu $a1, $v1, $zero -.L80240480: -/* 946350 80240480 24820010 */ addiu $v0, $a0, 0x10 -/* 946354 80240484 AC620000 */ sw $v0, ($v1) -/* 946358 80240488 24630004 */ addiu $v1, $v1, 4 -/* 94635C 8024048C 24840001 */ addiu $a0, $a0, 1 -/* 946360 80240490 28820070 */ slti $v0, $a0, 0x70 -/* 946364 80240494 1440FFFA */ bnez $v0, .L80240480 -/* 946368 80240498 ACA001C0 */ sw $zero, 0x1c0($a1) -.L8024049C: -/* 94636C 8024049C 8FBF0010 */ lw $ra, 0x10($sp) -/* 946370 802404A0 24020002 */ addiu $v0, $zero, 2 -/* 946374 802404A4 03E00008 */ jr $ra -/* 946378 802404A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/func_802404AC_945ED0.s b/asm/nonmatchings/world/area_sbk/sbk_34/func_802404AC_945ED0.s deleted file mode 100644 index 34f681f9c3..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_34/func_802404AC_945ED0.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404AC_94637C -/* 94637C 802404AC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 946380 802404B0 AFB10014 */ sw $s1, 0x14($sp) -/* 946384 802404B4 0080882D */ daddu $s1, $a0, $zero -/* 946388 802404B8 AFBF0018 */ sw $ra, 0x18($sp) -/* 94638C 802404BC AFB00010 */ sw $s0, 0x10($sp) -/* 946390 802404C0 8E30000C */ lw $s0, 0xc($s1) -/* 946394 802404C4 8E050000 */ lw $a1, ($s0) -/* 946398 802404C8 0C0B1EAF */ jal get_variable -/* 94639C 802404CC 26100004 */ addiu $s0, $s0, 4 -/* 9463A0 802404D0 AE22008C */ sw $v0, 0x8c($s1) -/* 9463A4 802404D4 8E050000 */ lw $a1, ($s0) -/* 9463A8 802404D8 26100004 */ addiu $s0, $s0, 4 -/* 9463AC 802404DC 0C0B1EAF */ jal get_variable -/* 9463B0 802404E0 0220202D */ daddu $a0, $s1, $zero -/* 9463B4 802404E4 AE220090 */ sw $v0, 0x90($s1) -/* 9463B8 802404E8 8E050000 */ lw $a1, ($s0) -/* 9463BC 802404EC 26100004 */ addiu $s0, $s0, 4 -/* 9463C0 802404F0 0C0B1EAF */ jal get_variable -/* 9463C4 802404F4 0220202D */ daddu $a0, $s1, $zero -/* 9463C8 802404F8 AE220094 */ sw $v0, 0x94($s1) -/* 9463CC 802404FC 8E050000 */ lw $a1, ($s0) -/* 9463D0 80240500 26100004 */ addiu $s0, $s0, 4 -/* 9463D4 80240504 0C0B1EAF */ jal get_variable -/* 9463D8 80240508 0220202D */ daddu $a0, $s1, $zero -/* 9463DC 8024050C AE220098 */ sw $v0, 0x98($s1) -/* 9463E0 80240510 8E050000 */ lw $a1, ($s0) -/* 9463E4 80240514 26100004 */ addiu $s0, $s0, 4 -/* 9463E8 80240518 0C0B1EAF */ jal get_variable -/* 9463EC 8024051C 0220202D */ daddu $a0, $s1, $zero -/* 9463F0 80240520 AE22009C */ sw $v0, 0x9c($s1) -/* 9463F4 80240524 8E050000 */ lw $a1, ($s0) -/* 9463F8 80240528 26100004 */ addiu $s0, $s0, 4 -/* 9463FC 8024052C 0C0B1EAF */ jal get_variable -/* 946400 80240530 0220202D */ daddu $a0, $s1, $zero -/* 946404 80240534 AE2200A0 */ sw $v0, 0xa0($s1) -/* 946408 80240538 8E050000 */ lw $a1, ($s0) -/* 94640C 8024053C 26100004 */ addiu $s0, $s0, 4 -/* 946410 80240540 0C0B1EAF */ jal get_variable -/* 946414 80240544 0220202D */ daddu $a0, $s1, $zero -/* 946418 80240548 AE2200A4 */ sw $v0, 0xa4($s1) -/* 94641C 8024054C 8E050000 */ lw $a1, ($s0) -/* 946420 80240550 26100004 */ addiu $s0, $s0, 4 -/* 946424 80240554 0C0B1EAF */ jal get_variable -/* 946428 80240558 0220202D */ daddu $a0, $s1, $zero -/* 94642C 8024055C AE2200A8 */ sw $v0, 0xa8($s1) -/* 946430 80240560 8E050000 */ lw $a1, ($s0) -/* 946434 80240564 26100004 */ addiu $s0, $s0, 4 -/* 946438 80240568 0C0B1EAF */ jal get_variable -/* 94643C 8024056C 0220202D */ daddu $a0, $s1, $zero -/* 946440 80240570 AE2200AC */ sw $v0, 0xac($s1) -/* 946444 80240574 8E050000 */ lw $a1, ($s0) -/* 946448 80240578 0C0B1EAF */ jal get_variable -/* 94644C 8024057C 0220202D */ daddu $a0, $s1, $zero -/* 946450 80240580 AE2200B0 */ sw $v0, 0xb0($s1) -/* 946454 80240584 8FBF0018 */ lw $ra, 0x18($sp) -/* 946458 80240588 8FB10014 */ lw $s1, 0x14($sp) -/* 94645C 8024058C 8FB00010 */ lw $s0, 0x10($sp) -/* 946460 80240590 24020002 */ addiu $v0, $zero, 2 -/* 946464 80240594 03E00008 */ jr $ra -/* 946468 80240598 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/func_8024059C_945ED0.s b/asm/nonmatchings/world/area_sbk/sbk_34/func_8024059C_945ED0.s deleted file mode 100644 index c99958a73b..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_34/func_8024059C_945ED0.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024059C_94646C -/* 94646C 8024059C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 946470 802405A0 AFB1001C */ sw $s1, 0x1c($sp) -/* 946474 802405A4 0080882D */ daddu $s1, $a0, $zero -/* 946478 802405A8 AFBF0034 */ sw $ra, 0x34($sp) -/* 94647C 802405AC AFB60030 */ sw $s6, 0x30($sp) -/* 946480 802405B0 AFB5002C */ sw $s5, 0x2c($sp) -/* 946484 802405B4 AFB40028 */ sw $s4, 0x28($sp) -/* 946488 802405B8 AFB30024 */ sw $s3, 0x24($sp) -/* 94648C 802405BC AFB20020 */ sw $s2, 0x20($sp) -/* 946490 802405C0 AFB00018 */ sw $s0, 0x18($sp) -/* 946494 802405C4 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 946498 802405C8 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 94649C 802405CC 8E30000C */ lw $s0, 0xc($s1) -/* 9464A0 802405D0 8E160000 */ lw $s6, ($s0) -/* 9464A4 802405D4 26100004 */ addiu $s0, $s0, 4 -/* 9464A8 802405D8 0C0B1EAF */ jal get_variable -/* 9464AC 802405DC 02C0282D */ daddu $a1, $s6, $zero -/* 9464B0 802405E0 44820000 */ mtc1 $v0, $f0 -/* 9464B4 802405E4 00000000 */ nop -/* 9464B8 802405E8 46800020 */ cvt.s.w $f0, $f0 -/* 9464BC 802405EC E7A00010 */ swc1 $f0, 0x10($sp) -/* 9464C0 802405F0 8E140000 */ lw $s4, ($s0) -/* 9464C4 802405F4 26100004 */ addiu $s0, $s0, 4 -/* 9464C8 802405F8 0220202D */ daddu $a0, $s1, $zero -/* 9464CC 802405FC 0C0B1EAF */ jal get_variable -/* 9464D0 80240600 0280282D */ daddu $a1, $s4, $zero -/* 9464D4 80240604 0220202D */ daddu $a0, $s1, $zero -/* 9464D8 80240608 8E150000 */ lw $s5, ($s0) -/* 9464DC 8024060C 4482B000 */ mtc1 $v0, $f22 -/* 9464E0 80240610 00000000 */ nop -/* 9464E4 80240614 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9464E8 80240618 0C0B1EAF */ jal get_variable -/* 9464EC 8024061C 02A0282D */ daddu $a1, $s5, $zero -/* 9464F0 80240620 2404FFFC */ addiu $a0, $zero, -4 -/* 9464F4 80240624 44820000 */ mtc1 $v0, $f0 -/* 9464F8 80240628 00000000 */ nop -/* 9464FC 8024062C 46800020 */ cvt.s.w $f0, $f0 -/* 946500 80240630 0C00EABB */ jal get_npc_unsafe -/* 946504 80240634 E7A00014 */ swc1 $f0, 0x14($sp) -/* 946508 80240638 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 94650C 8024063C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 946510 80240640 3C014334 */ lui $at, 0x4334 -/* 946514 80240644 44816000 */ mtc1 $at, $f12 -/* 946518 80240648 00041880 */ sll $v1, $a0, 2 -/* 94651C 8024064C 00641821 */ addu $v1, $v1, $a0 -/* 946520 80240650 00031880 */ sll $v1, $v1, 2 -/* 946524 80240654 00641823 */ subu $v1, $v1, $a0 -/* 946528 80240658 000320C0 */ sll $a0, $v1, 3 -/* 94652C 8024065C 00641821 */ addu $v1, $v1, $a0 -/* 946530 80240660 000318C0 */ sll $v1, $v1, 3 -/* 946534 80240664 3C01800B */ lui $at, 0x800b -/* 946538 80240668 00230821 */ addu $at, $at, $v1 -/* 94653C 8024066C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 946540 80240670 460C0300 */ add.s $f12, $f0, $f12 -/* 946544 80240674 0C00A6C9 */ jal clamp_angle -/* 946548 80240678 0040982D */ daddu $s3, $v0, $zero -/* 94654C 8024067C 27B00010 */ addiu $s0, $sp, 0x10 -/* 946550 80240680 0200202D */ daddu $a0, $s0, $zero -/* 946554 80240684 27B20014 */ addiu $s2, $sp, 0x14 -/* 946558 80240688 0240282D */ daddu $a1, $s2, $zero -/* 94655C 8024068C 3C064170 */ lui $a2, 0x4170 -/* 946560 80240690 8E67000C */ lw $a3, 0xc($s3) -/* 946564 80240694 0C00A7E7 */ jal add_vec2D_polar -/* 946568 80240698 46000506 */ mov.s $f20, $f0 -/* 94656C 8024069C 0200202D */ daddu $a0, $s0, $zero -/* 946570 802406A0 3C064120 */ lui $a2, 0x4120 -/* 946574 802406A4 4407A000 */ mfc1 $a3, $f20 -/* 946578 802406A8 0C00A7E7 */ jal add_vec2D_polar -/* 94657C 802406AC 0240282D */ daddu $a1, $s2, $zero -/* 946580 802406B0 0220202D */ daddu $a0, $s1, $zero -/* 946584 802406B4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* 946588 802406B8 4600008D */ trunc.w.s $f2, $f0 -/* 94658C 802406BC 44061000 */ mfc1 $a2, $f2 -/* 946590 802406C0 0C0B2026 */ jal set_variable -/* 946594 802406C4 02C0282D */ daddu $a1, $s6, $zero -/* 946598 802406C8 0220202D */ daddu $a0, $s1, $zero -/* 94659C 802406CC 4600B08D */ trunc.w.s $f2, $f22 -/* 9465A0 802406D0 44061000 */ mfc1 $a2, $f2 -/* 9465A4 802406D4 0C0B2026 */ jal set_variable -/* 9465A8 802406D8 0280282D */ daddu $a1, $s4, $zero -/* 9465AC 802406DC 0220202D */ daddu $a0, $s1, $zero -/* 9465B0 802406E0 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 9465B4 802406E4 4600008D */ trunc.w.s $f2, $f0 -/* 9465B8 802406E8 44061000 */ mfc1 $a2, $f2 -/* 9465BC 802406EC 0C0B2026 */ jal set_variable -/* 9465C0 802406F0 02A0282D */ daddu $a1, $s5, $zero -/* 9465C4 802406F4 8FBF0034 */ lw $ra, 0x34($sp) -/* 9465C8 802406F8 8FB60030 */ lw $s6, 0x30($sp) -/* 9465CC 802406FC 8FB5002C */ lw $s5, 0x2c($sp) -/* 9465D0 80240700 8FB40028 */ lw $s4, 0x28($sp) -/* 9465D4 80240704 8FB30024 */ lw $s3, 0x24($sp) -/* 9465D8 80240708 8FB20020 */ lw $s2, 0x20($sp) -/* 9465DC 8024070C 8FB1001C */ lw $s1, 0x1c($sp) -/* 9465E0 80240710 8FB00018 */ lw $s0, 0x18($sp) -/* 9465E4 80240714 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 9465E8 80240718 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 9465EC 8024071C 24020002 */ addiu $v0, $zero, 2 -/* 9465F0 80240720 03E00008 */ jr $ra -/* 9465F4 80240724 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/func_80240728_945ED0.s b/asm/nonmatchings/world/area_sbk/sbk_34/func_80240728_945ED0.s deleted file mode 100644 index 556ce6ae93..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_34/func_80240728_945ED0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240728_9465F8 -/* 9465F8 80240728 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9465FC 8024072C AFB00010 */ sw $s0, 0x10($sp) -/* 946600 80240730 0080802D */ daddu $s0, $a0, $zero -/* 946604 80240734 AFBF0014 */ sw $ra, 0x14($sp) -/* 946608 80240738 0C00EABB */ jal get_npc_unsafe -/* 94660C 8024073C 8E04008C */ lw $a0, 0x8c($s0) -/* 946610 80240740 0040282D */ daddu $a1, $v0, $zero -/* 946614 80240744 8E040094 */ lw $a0, 0x94($s0) -/* 946618 80240748 8CA30028 */ lw $v1, 0x28($a1) -/* 94661C 8024074C ACA40028 */ sw $a0, 0x28($a1) -/* 946620 80240750 8FBF0014 */ lw $ra, 0x14($sp) -/* 946624 80240754 8FB00010 */ lw $s0, 0x10($sp) -/* 946628 80240758 24020002 */ addiu $v0, $zero, 2 -/* 94662C 8024075C 3C018024 */ lui $at, 0x8024 -/* 946630 80240760 AC2329A4 */ sw $v1, 0x29a4($at) -/* 946634 80240764 03E00008 */ jr $ra -/* 946638 80240768 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/func_8024076C_945ED0.s b/asm/nonmatchings/world/area_sbk/sbk_34/func_8024076C_945ED0.s deleted file mode 100644 index fa1d4b5c0c..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_34/func_8024076C_945ED0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024076C_94663C -/* 94663C 8024076C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 946640 80240770 AFBF0010 */ sw $ra, 0x10($sp) -/* 946644 80240774 0C00EABB */ jal get_npc_unsafe -/* 946648 80240778 8C84008C */ lw $a0, 0x8c($a0) -/* 94664C 8024077C 3C038024 */ lui $v1, 0x8024 -/* 946650 80240780 8C6329A4 */ lw $v1, 0x29a4($v1) -/* 946654 80240784 AC430028 */ sw $v1, 0x28($v0) -/* 946658 80240788 8FBF0010 */ lw $ra, 0x10($sp) -/* 94665C 8024078C 24020002 */ addiu $v0, $zero, 2 -/* 946660 80240790 03E00008 */ jr $ra -/* 946664 80240794 27BD0018 */ addiu $sp, $sp, 0x18 -/* 946668 80240798 00000000 */ nop -/* 94666C 8024079C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/func_802407A0_945ED0.s b/asm/nonmatchings/world/area_sbk/sbk_34/func_802407A0_945ED0.s deleted file mode 100644 index aa67440dff..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_34/func_802407A0_945ED0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A0_946670 -/* 946670 802407A0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 946674 802407A4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 946678 802407A8 4485A000 */ mtc1 $a1, $f20 -/* 94667C 802407AC F7B60020 */ sdc1 $f22, 0x20($sp) -/* 946680 802407B0 4486B000 */ mtc1 $a2, $f22 -/* 946684 802407B4 AFB00010 */ sw $s0, 0x10($sp) -/* 946688 802407B8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 94668C 802407BC 4487C000 */ mtc1 $a3, $f24 -/* 946690 802407C0 AFBF0014 */ sw $ra, 0x14($sp) -/* 946694 802407C4 0C019D28 */ jal guMtxIdentF -/* 946698 802407C8 0080802D */ daddu $s0, $a0, $zero -/* 94669C 802407CC 4616A582 */ mul.s $f22, $f20, $f22 -/* 9466A0 802407D0 00000000 */ nop -/* 9466A4 802407D4 4618A502 */ mul.s $f20, $f20, $f24 -/* 9466A8 802407D8 00000000 */ nop -/* 9466AC 802407DC 3C013F80 */ lui $at, 0x3f80 -/* 9466B0 802407E0 44810000 */ mtc1 $at, $f0 -/* 9466B4 802407E4 00000000 */ nop -/* 9466B8 802407E8 E6000014 */ swc1 $f0, 0x14($s0) -/* 9466BC 802407EC E6160010 */ swc1 $f22, 0x10($s0) -/* 9466C0 802407F0 E6140018 */ swc1 $f20, 0x18($s0) -/* 9466C4 802407F4 8FBF0014 */ lw $ra, 0x14($sp) -/* 9466C8 802407F8 8FB00010 */ lw $s0, 0x10($sp) -/* 9466CC 802407FC D7B80028 */ ldc1 $f24, 0x28($sp) -/* 9466D0 80240800 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 9466D4 80240804 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 9466D8 80240808 03E00008 */ jr $ra -/* 9466DC 8024080C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/func_80240810_945ED0.s b/asm/nonmatchings/world/area_sbk/sbk_34/func_80240810_945ED0.s deleted file mode 100644 index dd9f4417c8..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_34/func_80240810_945ED0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240810_9466E0 -/* 9466E0 80240810 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 9466E4 80240814 AFB10054 */ sw $s1, 0x54($sp) -/* 9466E8 80240818 0080882D */ daddu $s1, $a0, $zero -/* 9466EC 8024081C AFBF005C */ sw $ra, 0x5c($sp) -/* 9466F0 80240820 AFB20058 */ sw $s2, 0x58($sp) -/* 9466F4 80240824 AFB00050 */ sw $s0, 0x50($sp) -/* 9466F8 80240828 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 9466FC 8024082C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 946700 80240830 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 946704 80240834 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 946708 80240838 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 94670C 8024083C 8E30000C */ lw $s0, 0xc($s1) -/* 946710 80240840 8E050000 */ lw $a1, ($s0) -/* 946714 80240844 0C0B1EAF */ jal get_variable -/* 946718 80240848 26100004 */ addiu $s0, $s0, 4 -/* 94671C 8024084C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 946720 80240850 0040202D */ daddu $a0, $v0, $zero -/* 946724 80240854 8E050000 */ lw $a1, ($s0) -/* 946728 80240858 26100004 */ addiu $s0, $s0, 4 -/* 94672C 8024085C 0220202D */ daddu $a0, $s1, $zero -/* 946730 80240860 0C0B210B */ jal get_float_variable -/* 946734 80240864 0040902D */ daddu $s2, $v0, $zero -/* 946738 80240868 8E050000 */ lw $a1, ($s0) -/* 94673C 8024086C 26100004 */ addiu $s0, $s0, 4 -/* 946740 80240870 0220202D */ daddu $a0, $s1, $zero -/* 946744 80240874 0C0B210B */ jal get_float_variable -/* 946748 80240878 46000706 */ mov.s $f28, $f0 -/* 94674C 8024087C 8E050000 */ lw $a1, ($s0) -/* 946750 80240880 26100004 */ addiu $s0, $s0, 4 -/* 946754 80240884 0220202D */ daddu $a0, $s1, $zero -/* 946758 80240888 0C0B210B */ jal get_float_variable -/* 94675C 8024088C 46000686 */ mov.s $f26, $f0 -/* 946760 80240890 0220202D */ daddu $a0, $s1, $zero -/* 946764 80240894 8E050000 */ lw $a1, ($s0) -/* 946768 80240898 0C0B210B */ jal get_float_variable -/* 94676C 8024089C 46000586 */ mov.s $f22, $f0 -/* 946770 802408A0 0240202D */ daddu $a0, $s2, $zero -/* 946774 802408A4 0C046B4C */ jal get_model_from_list_index -/* 946778 802408A8 46000606 */ mov.s $f24, $f0 -/* 94677C 802408AC 0040882D */ daddu $s1, $v0, $zero -/* 946780 802408B0 96220000 */ lhu $v0, ($s1) -/* 946784 802408B4 30420400 */ andi $v0, $v0, 0x400 -/* 946788 802408B8 1440001E */ bnez $v0, .L80240934 -/* 94678C 802408BC 26300058 */ addiu $s0, $s1, 0x58 -/* 946790 802408C0 4480A000 */ mtc1 $zero, $f20 -/* 946794 802408C4 4406B000 */ mfc1 $a2, $f22 -/* 946798 802408C8 4405A000 */ mfc1 $a1, $f20 -/* 94679C 802408CC 4407A000 */ mfc1 $a3, $f20 -/* 9467A0 802408D0 0C019E40 */ jal guTranslateF -/* 9467A4 802408D4 0200202D */ daddu $a0, $s0, $zero -/* 9467A8 802408D8 4405E000 */ mfc1 $a1, $f28 -/* 9467AC 802408DC 4406D000 */ mfc1 $a2, $f26 -/* 9467B0 802408E0 4407C000 */ mfc1 $a3, $f24 -/* 9467B4 802408E4 0C0901E8 */ jal func_802407A0 -/* 9467B8 802408E8 27A40010 */ addiu $a0, $sp, 0x10 -/* 9467BC 802408EC 27A40010 */ addiu $a0, $sp, 0x10 -/* 9467C0 802408F0 0200282D */ daddu $a1, $s0, $zero -/* 9467C4 802408F4 0C019D80 */ jal guMtxCatF -/* 9467C8 802408F8 0200302D */ daddu $a2, $s0, $zero -/* 9467CC 802408FC 27A40010 */ addiu $a0, $sp, 0x10 -/* 9467D0 80240900 4600B587 */ neg.s $f22, $f22 -/* 9467D4 80240904 4405A000 */ mfc1 $a1, $f20 -/* 9467D8 80240908 4406B000 */ mfc1 $a2, $f22 -/* 9467DC 8024090C 0C019E40 */ jal guTranslateF -/* 9467E0 80240910 00A0382D */ daddu $a3, $a1, $zero -/* 9467E4 80240914 27A40010 */ addiu $a0, $sp, 0x10 -/* 9467E8 80240918 0200282D */ daddu $a1, $s0, $zero -/* 9467EC 8024091C 0C019D80 */ jal guMtxCatF -/* 9467F0 80240920 00A0302D */ daddu $a2, $a1, $zero -/* 9467F4 80240924 96220000 */ lhu $v0, ($s1) -/* 9467F8 80240928 34421400 */ ori $v0, $v0, 0x1400 -/* 9467FC 8024092C 0809026B */ j .L802409AC -/* 946800 80240930 A6220000 */ sh $v0, ($s1) -.L80240934: -/* 946804 80240934 4480A000 */ mtc1 $zero, $f20 -/* 946808 80240938 4406B000 */ mfc1 $a2, $f22 -/* 94680C 8024093C 4405A000 */ mfc1 $a1, $f20 -/* 946810 80240940 4407A000 */ mfc1 $a3, $f20 -/* 946814 80240944 0C019E40 */ jal guTranslateF -/* 946818 80240948 27A40010 */ addiu $a0, $sp, 0x10 -/* 94681C 8024094C 27A40010 */ addiu $a0, $sp, 0x10 -/* 946820 80240950 26300058 */ addiu $s0, $s1, 0x58 -/* 946824 80240954 0200282D */ daddu $a1, $s0, $zero -/* 946828 80240958 0C019D80 */ jal guMtxCatF -/* 94682C 8024095C 0200302D */ daddu $a2, $s0, $zero -/* 946830 80240960 4405E000 */ mfc1 $a1, $f28 -/* 946834 80240964 4406D000 */ mfc1 $a2, $f26 -/* 946838 80240968 4407C000 */ mfc1 $a3, $f24 -/* 94683C 8024096C 0C0901E8 */ jal func_802407A0 -/* 946840 80240970 27A40010 */ addiu $a0, $sp, 0x10 -/* 946844 80240974 27A40010 */ addiu $a0, $sp, 0x10 -/* 946848 80240978 0200282D */ daddu $a1, $s0, $zero -/* 94684C 8024097C 0C019D80 */ jal guMtxCatF -/* 946850 80240980 0200302D */ daddu $a2, $s0, $zero -/* 946854 80240984 27A40010 */ addiu $a0, $sp, 0x10 -/* 946858 80240988 4600B587 */ neg.s $f22, $f22 -/* 94685C 8024098C 4405A000 */ mfc1 $a1, $f20 -/* 946860 80240990 4406B000 */ mfc1 $a2, $f22 -/* 946864 80240994 0C019E40 */ jal guTranslateF -/* 946868 80240998 00A0382D */ daddu $a3, $a1, $zero -/* 94686C 8024099C 27A40010 */ addiu $a0, $sp, 0x10 -/* 946870 802409A0 0200282D */ daddu $a1, $s0, $zero -/* 946874 802409A4 0C019D80 */ jal guMtxCatF -/* 946878 802409A8 00A0302D */ daddu $a2, $a1, $zero -.L802409AC: -/* 94687C 802409AC 8FBF005C */ lw $ra, 0x5c($sp) -/* 946880 802409B0 8FB20058 */ lw $s2, 0x58($sp) -/* 946884 802409B4 8FB10054 */ lw $s1, 0x54($sp) -/* 946888 802409B8 8FB00050 */ lw $s0, 0x50($sp) -/* 94688C 802409BC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 946890 802409C0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 946894 802409C4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 946898 802409C8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 94689C 802409CC D7B40060 */ ldc1 $f20, 0x60($sp) -/* 9468A0 802409D0 24020002 */ addiu $v0, $zero, 2 -/* 9468A4 802409D4 03E00008 */ jr $ra -/* 9468A8 802409D8 27BD0088 */ addiu $sp, $sp, 0x88 -/* 9468AC 802409DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_35/func_80240040_9486B0.s b/asm/nonmatchings/world/area_sbk/sbk_35/func_80240040_9486B0.s deleted file mode 100644 index 3e60c66f1b..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_35/func_80240040_9486B0.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_9486F0 -/* 9486F0 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9486F4 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 9486F8 80240048 0080982D */ daddu $s3, $a0, $zero -/* 9486FC 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 948700 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 948704 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 948708 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 94870C 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 948710 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 948714 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 948718 80240068 0260202D */ daddu $a0, $s3, $zero -/* 94871C 8024006C 8E050000 */ lw $a1, ($s0) -/* 948720 80240070 0C0B1EAF */ jal get_variable -/* 948724 80240074 26100004 */ addiu $s0, $s0, 4 -/* 948728 80240078 8E050000 */ lw $a1, ($s0) -/* 94872C 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 948730 80240080 0260202D */ daddu $a0, $s3, $zero -/* 948734 80240084 0C0B1EAF */ jal get_variable -/* 948738 80240088 0040882D */ daddu $s1, $v0, $zero -/* 94873C 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 948740 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 948744 80240094 8E120000 */ lw $s2, ($s0) -/* 948748 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 94874C 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 948750 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 948754 802400A4 08090030 */ j .L802400C0 -/* 948758 802400A8 00000000 */ nop -.L802400AC: -/* 94875C 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 948760 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 948764 802400B4 14400005 */ bnez $v0, .L802400CC -/* 948768 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 94876C 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 948770 802400C0 0C00EABB */ jal get_npc_unsafe -/* 948774 802400C4 00000000 */ nop -/* 948778 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 94877C 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 948780 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 948784 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 948788 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 94878C 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 948790 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 948794 802400E4 0C0B1EAF */ jal get_variable -/* 948798 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 94879C 802400EC 1040000C */ beqz $v0, .L80240120 -/* 9487A0 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 9487A4 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9487A8 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 9487AC 802400FC 44810000 */ mtc1 $at, $f0 -/* 9487B0 80240100 00000000 */ nop -/* 9487B4 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 9487B8 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 9487BC 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 9487C0 80240110 44061000 */ mfc1 $a2, $f2 -/* 9487C4 80240114 0C04D083 */ jal set_item_entity_position -/* 9487C8 80240118 0280202D */ daddu $a0, $s4, $zero -/* 9487CC 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 9487D0 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 9487D4 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 9487D8 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 9487DC 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 9487E0 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 9487E4 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 9487E8 80240138 03E00008 */ jr $ra -/* 9487EC 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_35/func_80240140_9486B0.s b/asm/nonmatchings/world/area_sbk/sbk_35/func_80240140_9486B0.s deleted file mode 100644 index 2cef770a2c..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_35/func_80240140_9486B0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240140_9487F0 -/* 9487F0 80240140 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9487F4 80240144 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 9487F8 80240148 4485A000 */ mtc1 $a1, $f20 -/* 9487FC 8024014C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 948800 80240150 4486B000 */ mtc1 $a2, $f22 -/* 948804 80240154 AFB00010 */ sw $s0, 0x10($sp) -/* 948808 80240158 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 94880C 8024015C 4487C000 */ mtc1 $a3, $f24 -/* 948810 80240160 AFBF0014 */ sw $ra, 0x14($sp) -/* 948814 80240164 0C019D28 */ jal guMtxIdentF -/* 948818 80240168 0080802D */ daddu $s0, $a0, $zero -/* 94881C 8024016C 4616A582 */ mul.s $f22, $f20, $f22 -/* 948820 80240170 00000000 */ nop -/* 948824 80240174 4618A502 */ mul.s $f20, $f20, $f24 -/* 948828 80240178 00000000 */ nop -/* 94882C 8024017C 3C013F80 */ lui $at, 0x3f80 -/* 948830 80240180 44810000 */ mtc1 $at, $f0 -/* 948834 80240184 00000000 */ nop -/* 948838 80240188 E6000014 */ swc1 $f0, 0x14($s0) -/* 94883C 8024018C E6160010 */ swc1 $f22, 0x10($s0) -/* 948840 80240190 E6140018 */ swc1 $f20, 0x18($s0) -/* 948844 80240194 8FBF0014 */ lw $ra, 0x14($sp) -/* 948848 80240198 8FB00010 */ lw $s0, 0x10($sp) -/* 94884C 8024019C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 948850 802401A0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 948854 802401A4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 948858 802401A8 03E00008 */ jr $ra -/* 94885C 802401AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_35/func_802401B0_9486B0.s b/asm/nonmatchings/world/area_sbk/sbk_35/func_802401B0_9486B0.s deleted file mode 100644 index 68cdc13481..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_35/func_802401B0_9486B0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_948860 -/* 948860 802401B0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 948864 802401B4 AFB10054 */ sw $s1, 0x54($sp) -/* 948868 802401B8 0080882D */ daddu $s1, $a0, $zero -/* 94886C 802401BC AFBF005C */ sw $ra, 0x5c($sp) -/* 948870 802401C0 AFB20058 */ sw $s2, 0x58($sp) -/* 948874 802401C4 AFB00050 */ sw $s0, 0x50($sp) -/* 948878 802401C8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 94887C 802401CC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 948880 802401D0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 948884 802401D4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 948888 802401D8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 94888C 802401DC 8E30000C */ lw $s0, 0xc($s1) -/* 948890 802401E0 8E050000 */ lw $a1, ($s0) -/* 948894 802401E4 0C0B1EAF */ jal get_variable -/* 948898 802401E8 26100004 */ addiu $s0, $s0, 4 -/* 94889C 802401EC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 9488A0 802401F0 0040202D */ daddu $a0, $v0, $zero -/* 9488A4 802401F4 8E050000 */ lw $a1, ($s0) -/* 9488A8 802401F8 26100004 */ addiu $s0, $s0, 4 -/* 9488AC 802401FC 0220202D */ daddu $a0, $s1, $zero -/* 9488B0 80240200 0C0B210B */ jal get_float_variable -/* 9488B4 80240204 0040902D */ daddu $s2, $v0, $zero -/* 9488B8 80240208 8E050000 */ lw $a1, ($s0) -/* 9488BC 8024020C 26100004 */ addiu $s0, $s0, 4 -/* 9488C0 80240210 0220202D */ daddu $a0, $s1, $zero -/* 9488C4 80240214 0C0B210B */ jal get_float_variable -/* 9488C8 80240218 46000706 */ mov.s $f28, $f0 -/* 9488CC 8024021C 8E050000 */ lw $a1, ($s0) -/* 9488D0 80240220 26100004 */ addiu $s0, $s0, 4 -/* 9488D4 80240224 0220202D */ daddu $a0, $s1, $zero -/* 9488D8 80240228 0C0B210B */ jal get_float_variable -/* 9488DC 8024022C 46000686 */ mov.s $f26, $f0 -/* 9488E0 80240230 0220202D */ daddu $a0, $s1, $zero -/* 9488E4 80240234 8E050000 */ lw $a1, ($s0) -/* 9488E8 80240238 0C0B210B */ jal get_float_variable -/* 9488EC 8024023C 46000586 */ mov.s $f22, $f0 -/* 9488F0 80240240 0240202D */ daddu $a0, $s2, $zero -/* 9488F4 80240244 0C046B4C */ jal get_model_from_list_index -/* 9488F8 80240248 46000606 */ mov.s $f24, $f0 -/* 9488FC 8024024C 0040882D */ daddu $s1, $v0, $zero -/* 948900 80240250 96220000 */ lhu $v0, ($s1) -/* 948904 80240254 30420400 */ andi $v0, $v0, 0x400 -/* 948908 80240258 1440001E */ bnez $v0, .L802402D4 -/* 94890C 8024025C 26300058 */ addiu $s0, $s1, 0x58 -/* 948910 80240260 4480A000 */ mtc1 $zero, $f20 -/* 948914 80240264 4406B000 */ mfc1 $a2, $f22 -/* 948918 80240268 4405A000 */ mfc1 $a1, $f20 -/* 94891C 8024026C 4407A000 */ mfc1 $a3, $f20 -/* 948920 80240270 0C019E40 */ jal guTranslateF -/* 948924 80240274 0200202D */ daddu $a0, $s0, $zero -/* 948928 80240278 4405E000 */ mfc1 $a1, $f28 -/* 94892C 8024027C 4406D000 */ mfc1 $a2, $f26 -/* 948930 80240280 4407C000 */ mfc1 $a3, $f24 -/* 948934 80240284 0C090050 */ jal func_80240140 -/* 948938 80240288 27A40010 */ addiu $a0, $sp, 0x10 -/* 94893C 8024028C 27A40010 */ addiu $a0, $sp, 0x10 -/* 948940 80240290 0200282D */ daddu $a1, $s0, $zero -/* 948944 80240294 0C019D80 */ jal guMtxCatF -/* 948948 80240298 0200302D */ daddu $a2, $s0, $zero -/* 94894C 8024029C 27A40010 */ addiu $a0, $sp, 0x10 -/* 948950 802402A0 4600B587 */ neg.s $f22, $f22 -/* 948954 802402A4 4405A000 */ mfc1 $a1, $f20 -/* 948958 802402A8 4406B000 */ mfc1 $a2, $f22 -/* 94895C 802402AC 0C019E40 */ jal guTranslateF -/* 948960 802402B0 00A0382D */ daddu $a3, $a1, $zero -/* 948964 802402B4 27A40010 */ addiu $a0, $sp, 0x10 -/* 948968 802402B8 0200282D */ daddu $a1, $s0, $zero -/* 94896C 802402BC 0C019D80 */ jal guMtxCatF -/* 948970 802402C0 00A0302D */ daddu $a2, $a1, $zero -/* 948974 802402C4 96220000 */ lhu $v0, ($s1) -/* 948978 802402C8 34421400 */ ori $v0, $v0, 0x1400 -/* 94897C 802402CC 080900D3 */ j .L8024034C -/* 948980 802402D0 A6220000 */ sh $v0, ($s1) -.L802402D4: -/* 948984 802402D4 4480A000 */ mtc1 $zero, $f20 -/* 948988 802402D8 4406B000 */ mfc1 $a2, $f22 -/* 94898C 802402DC 4405A000 */ mfc1 $a1, $f20 -/* 948990 802402E0 4407A000 */ mfc1 $a3, $f20 -/* 948994 802402E4 0C019E40 */ jal guTranslateF -/* 948998 802402E8 27A40010 */ addiu $a0, $sp, 0x10 -/* 94899C 802402EC 27A40010 */ addiu $a0, $sp, 0x10 -/* 9489A0 802402F0 26300058 */ addiu $s0, $s1, 0x58 -/* 9489A4 802402F4 0200282D */ daddu $a1, $s0, $zero -/* 9489A8 802402F8 0C019D80 */ jal guMtxCatF -/* 9489AC 802402FC 0200302D */ daddu $a2, $s0, $zero -/* 9489B0 80240300 4405E000 */ mfc1 $a1, $f28 -/* 9489B4 80240304 4406D000 */ mfc1 $a2, $f26 -/* 9489B8 80240308 4407C000 */ mfc1 $a3, $f24 -/* 9489BC 8024030C 0C090050 */ jal func_80240140 -/* 9489C0 80240310 27A40010 */ addiu $a0, $sp, 0x10 -/* 9489C4 80240314 27A40010 */ addiu $a0, $sp, 0x10 -/* 9489C8 80240318 0200282D */ daddu $a1, $s0, $zero -/* 9489CC 8024031C 0C019D80 */ jal guMtxCatF -/* 9489D0 80240320 0200302D */ daddu $a2, $s0, $zero -/* 9489D4 80240324 27A40010 */ addiu $a0, $sp, 0x10 -/* 9489D8 80240328 4600B587 */ neg.s $f22, $f22 -/* 9489DC 8024032C 4405A000 */ mfc1 $a1, $f20 -/* 9489E0 80240330 4406B000 */ mfc1 $a2, $f22 -/* 9489E4 80240334 0C019E40 */ jal guTranslateF -/* 9489E8 80240338 00A0382D */ daddu $a3, $a1, $zero -/* 9489EC 8024033C 27A40010 */ addiu $a0, $sp, 0x10 -/* 9489F0 80240340 0200282D */ daddu $a1, $s0, $zero -/* 9489F4 80240344 0C019D80 */ jal guMtxCatF -/* 9489F8 80240348 00A0302D */ daddu $a2, $a1, $zero -.L8024034C: -/* 9489FC 8024034C 8FBF005C */ lw $ra, 0x5c($sp) -/* 948A00 80240350 8FB20058 */ lw $s2, 0x58($sp) -/* 948A04 80240354 8FB10054 */ lw $s1, 0x54($sp) -/* 948A08 80240358 8FB00050 */ lw $s0, 0x50($sp) -/* 948A0C 8024035C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 948A10 80240360 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 948A14 80240364 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 948A18 80240368 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 948A1C 8024036C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 948A20 80240370 24020002 */ addiu $v0, $zero, 2 -/* 948A24 80240374 03E00008 */ jr $ra -/* 948A28 80240378 27BD0088 */ addiu $sp, $sp, 0x88 -/* 948A2C 8024037C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_36/func_80240040_949E60.s b/asm/nonmatchings/world/area_sbk/sbk_36/func_80240040_949E60.s deleted file mode 100644 index a97f4e130d..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_36/func_80240040_949E60.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_949EA0 -/* 949EA0 80240040 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 949EA4 80240044 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 949EA8 80240048 4485A000 */ mtc1 $a1, $f20 -/* 949EAC 8024004C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 949EB0 80240050 4486B000 */ mtc1 $a2, $f22 -/* 949EB4 80240054 AFB00010 */ sw $s0, 0x10($sp) -/* 949EB8 80240058 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 949EBC 8024005C 4487C000 */ mtc1 $a3, $f24 -/* 949EC0 80240060 AFBF0014 */ sw $ra, 0x14($sp) -/* 949EC4 80240064 0C019D28 */ jal guMtxIdentF -/* 949EC8 80240068 0080802D */ daddu $s0, $a0, $zero -/* 949ECC 8024006C 4616A582 */ mul.s $f22, $f20, $f22 -/* 949ED0 80240070 00000000 */ nop -/* 949ED4 80240074 4618A502 */ mul.s $f20, $f20, $f24 -/* 949ED8 80240078 00000000 */ nop -/* 949EDC 8024007C 3C013F80 */ lui $at, 0x3f80 -/* 949EE0 80240080 44810000 */ mtc1 $at, $f0 -/* 949EE4 80240084 00000000 */ nop -/* 949EE8 80240088 E6000014 */ swc1 $f0, 0x14($s0) -/* 949EEC 8024008C E6160010 */ swc1 $f22, 0x10($s0) -/* 949EF0 80240090 E6140018 */ swc1 $f20, 0x18($s0) -/* 949EF4 80240094 8FBF0014 */ lw $ra, 0x14($sp) -/* 949EF8 80240098 8FB00010 */ lw $s0, 0x10($sp) -/* 949EFC 8024009C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 949F00 802400A0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 949F04 802400A4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 949F08 802400A8 03E00008 */ jr $ra -/* 949F0C 802400AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_36/func_802400B0_949E60.s b/asm/nonmatchings/world/area_sbk/sbk_36/func_802400B0_949E60.s deleted file mode 100644 index 7c0f97f9d7..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_36/func_802400B0_949E60.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B0_949F10 -/* 949F10 802400B0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 949F14 802400B4 AFB10054 */ sw $s1, 0x54($sp) -/* 949F18 802400B8 0080882D */ daddu $s1, $a0, $zero -/* 949F1C 802400BC AFBF005C */ sw $ra, 0x5c($sp) -/* 949F20 802400C0 AFB20058 */ sw $s2, 0x58($sp) -/* 949F24 802400C4 AFB00050 */ sw $s0, 0x50($sp) -/* 949F28 802400C8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 949F2C 802400CC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 949F30 802400D0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 949F34 802400D4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 949F38 802400D8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 949F3C 802400DC 8E30000C */ lw $s0, 0xc($s1) -/* 949F40 802400E0 8E050000 */ lw $a1, ($s0) -/* 949F44 802400E4 0C0B1EAF */ jal get_variable -/* 949F48 802400E8 26100004 */ addiu $s0, $s0, 4 -/* 949F4C 802400EC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 949F50 802400F0 0040202D */ daddu $a0, $v0, $zero -/* 949F54 802400F4 8E050000 */ lw $a1, ($s0) -/* 949F58 802400F8 26100004 */ addiu $s0, $s0, 4 -/* 949F5C 802400FC 0220202D */ daddu $a0, $s1, $zero -/* 949F60 80240100 0C0B210B */ jal get_float_variable -/* 949F64 80240104 0040902D */ daddu $s2, $v0, $zero -/* 949F68 80240108 8E050000 */ lw $a1, ($s0) -/* 949F6C 8024010C 26100004 */ addiu $s0, $s0, 4 -/* 949F70 80240110 0220202D */ daddu $a0, $s1, $zero -/* 949F74 80240114 0C0B210B */ jal get_float_variable -/* 949F78 80240118 46000706 */ mov.s $f28, $f0 -/* 949F7C 8024011C 8E050000 */ lw $a1, ($s0) -/* 949F80 80240120 26100004 */ addiu $s0, $s0, 4 -/* 949F84 80240124 0220202D */ daddu $a0, $s1, $zero -/* 949F88 80240128 0C0B210B */ jal get_float_variable -/* 949F8C 8024012C 46000686 */ mov.s $f26, $f0 -/* 949F90 80240130 0220202D */ daddu $a0, $s1, $zero -/* 949F94 80240134 8E050000 */ lw $a1, ($s0) -/* 949F98 80240138 0C0B210B */ jal get_float_variable -/* 949F9C 8024013C 46000586 */ mov.s $f22, $f0 -/* 949FA0 80240140 0240202D */ daddu $a0, $s2, $zero -/* 949FA4 80240144 0C046B4C */ jal get_model_from_list_index -/* 949FA8 80240148 46000606 */ mov.s $f24, $f0 -/* 949FAC 8024014C 0040882D */ daddu $s1, $v0, $zero -/* 949FB0 80240150 96220000 */ lhu $v0, ($s1) -/* 949FB4 80240154 30420400 */ andi $v0, $v0, 0x400 -/* 949FB8 80240158 1440001E */ bnez $v0, .L802401D4 -/* 949FBC 8024015C 26300058 */ addiu $s0, $s1, 0x58 -/* 949FC0 80240160 4480A000 */ mtc1 $zero, $f20 -/* 949FC4 80240164 4406B000 */ mfc1 $a2, $f22 -/* 949FC8 80240168 4405A000 */ mfc1 $a1, $f20 -/* 949FCC 8024016C 4407A000 */ mfc1 $a3, $f20 -/* 949FD0 80240170 0C019E40 */ jal guTranslateF -/* 949FD4 80240174 0200202D */ daddu $a0, $s0, $zero -/* 949FD8 80240178 4405E000 */ mfc1 $a1, $f28 -/* 949FDC 8024017C 4406D000 */ mfc1 $a2, $f26 -/* 949FE0 80240180 4407C000 */ mfc1 $a3, $f24 -/* 949FE4 80240184 0C090010 */ jal func_80240040 -/* 949FE8 80240188 27A40010 */ addiu $a0, $sp, 0x10 -/* 949FEC 8024018C 27A40010 */ addiu $a0, $sp, 0x10 -/* 949FF0 80240190 0200282D */ daddu $a1, $s0, $zero -/* 949FF4 80240194 0C019D80 */ jal guMtxCatF -/* 949FF8 80240198 0200302D */ daddu $a2, $s0, $zero -/* 949FFC 8024019C 27A40010 */ addiu $a0, $sp, 0x10 -/* 94A000 802401A0 4600B587 */ neg.s $f22, $f22 -/* 94A004 802401A4 4405A000 */ mfc1 $a1, $f20 -/* 94A008 802401A8 4406B000 */ mfc1 $a2, $f22 -/* 94A00C 802401AC 0C019E40 */ jal guTranslateF -/* 94A010 802401B0 00A0382D */ daddu $a3, $a1, $zero -/* 94A014 802401B4 27A40010 */ addiu $a0, $sp, 0x10 -/* 94A018 802401B8 0200282D */ daddu $a1, $s0, $zero -/* 94A01C 802401BC 0C019D80 */ jal guMtxCatF -/* 94A020 802401C0 00A0302D */ daddu $a2, $a1, $zero -/* 94A024 802401C4 96220000 */ lhu $v0, ($s1) -/* 94A028 802401C8 34421400 */ ori $v0, $v0, 0x1400 -/* 94A02C 802401CC 08090093 */ j .L8024024C -/* 94A030 802401D0 A6220000 */ sh $v0, ($s1) -.L802401D4: -/* 94A034 802401D4 4480A000 */ mtc1 $zero, $f20 -/* 94A038 802401D8 4406B000 */ mfc1 $a2, $f22 -/* 94A03C 802401DC 4405A000 */ mfc1 $a1, $f20 -/* 94A040 802401E0 4407A000 */ mfc1 $a3, $f20 -/* 94A044 802401E4 0C019E40 */ jal guTranslateF -/* 94A048 802401E8 27A40010 */ addiu $a0, $sp, 0x10 -/* 94A04C 802401EC 27A40010 */ addiu $a0, $sp, 0x10 -/* 94A050 802401F0 26300058 */ addiu $s0, $s1, 0x58 -/* 94A054 802401F4 0200282D */ daddu $a1, $s0, $zero -/* 94A058 802401F8 0C019D80 */ jal guMtxCatF -/* 94A05C 802401FC 0200302D */ daddu $a2, $s0, $zero -/* 94A060 80240200 4405E000 */ mfc1 $a1, $f28 -/* 94A064 80240204 4406D000 */ mfc1 $a2, $f26 -/* 94A068 80240208 4407C000 */ mfc1 $a3, $f24 -/* 94A06C 8024020C 0C090010 */ jal func_80240040 -/* 94A070 80240210 27A40010 */ addiu $a0, $sp, 0x10 -/* 94A074 80240214 27A40010 */ addiu $a0, $sp, 0x10 -/* 94A078 80240218 0200282D */ daddu $a1, $s0, $zero -/* 94A07C 8024021C 0C019D80 */ jal guMtxCatF -/* 94A080 80240220 0200302D */ daddu $a2, $s0, $zero -/* 94A084 80240224 27A40010 */ addiu $a0, $sp, 0x10 -/* 94A088 80240228 4600B587 */ neg.s $f22, $f22 -/* 94A08C 8024022C 4405A000 */ mfc1 $a1, $f20 -/* 94A090 80240230 4406B000 */ mfc1 $a2, $f22 -/* 94A094 80240234 0C019E40 */ jal guTranslateF -/* 94A098 80240238 00A0382D */ daddu $a3, $a1, $zero -/* 94A09C 8024023C 27A40010 */ addiu $a0, $sp, 0x10 -/* 94A0A0 80240240 0200282D */ daddu $a1, $s0, $zero -/* 94A0A4 80240244 0C019D80 */ jal guMtxCatF -/* 94A0A8 80240248 00A0302D */ daddu $a2, $a1, $zero -.L8024024C: -/* 94A0AC 8024024C 8FBF005C */ lw $ra, 0x5c($sp) -/* 94A0B0 80240250 8FB20058 */ lw $s2, 0x58($sp) -/* 94A0B4 80240254 8FB10054 */ lw $s1, 0x54($sp) -/* 94A0B8 80240258 8FB00050 */ lw $s0, 0x50($sp) -/* 94A0BC 8024025C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 94A0C0 80240260 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 94A0C4 80240264 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 94A0C8 80240268 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 94A0CC 8024026C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 94A0D0 80240270 24020002 */ addiu $v0, $zero, 2 -/* 94A0D4 80240274 03E00008 */ jr $ra -/* 94A0D8 80240278 27BD0088 */ addiu $sp, $sp, 0x88 -/* 94A0DC 8024027C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_40/func_80240040_94B3A0.s b/asm/nonmatchings/world/area_sbk/sbk_40/func_80240040_94B3A0.s deleted file mode 100644 index 303f6a16c2..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_40/func_80240040_94B3A0.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_94B3E0 -/* 94B3E0 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 94B3E4 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 94B3E8 80240048 0080982D */ daddu $s3, $a0, $zero -/* 94B3EC 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 94B3F0 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 94B3F4 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 94B3F8 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 94B3FC 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 94B400 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 94B404 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 94B408 80240068 0260202D */ daddu $a0, $s3, $zero -/* 94B40C 8024006C 8E050000 */ lw $a1, ($s0) -/* 94B410 80240070 0C0B1EAF */ jal get_variable -/* 94B414 80240074 26100004 */ addiu $s0, $s0, 4 -/* 94B418 80240078 8E050000 */ lw $a1, ($s0) -/* 94B41C 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 94B420 80240080 0260202D */ daddu $a0, $s3, $zero -/* 94B424 80240084 0C0B1EAF */ jal get_variable -/* 94B428 80240088 0040882D */ daddu $s1, $v0, $zero -/* 94B42C 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 94B430 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 94B434 80240094 8E120000 */ lw $s2, ($s0) -/* 94B438 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 94B43C 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 94B440 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 94B444 802400A4 08090030 */ j .L802400C0 -/* 94B448 802400A8 00000000 */ nop -.L802400AC: -/* 94B44C 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 94B450 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 94B454 802400B4 14400005 */ bnez $v0, .L802400CC -/* 94B458 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 94B45C 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 94B460 802400C0 0C00EABB */ jal get_npc_unsafe -/* 94B464 802400C4 00000000 */ nop -/* 94B468 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 94B46C 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 94B470 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 94B474 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 94B478 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 94B47C 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 94B480 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 94B484 802400E4 0C0B1EAF */ jal get_variable -/* 94B488 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 94B48C 802400EC 1040000C */ beqz $v0, .L80240120 -/* 94B490 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 94B494 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 94B498 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 94B49C 802400FC 44810000 */ mtc1 $at, $f0 -/* 94B4A0 80240100 00000000 */ nop -/* 94B4A4 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 94B4A8 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 94B4AC 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 94B4B0 80240110 44061000 */ mfc1 $a2, $f2 -/* 94B4B4 80240114 0C04D083 */ jal set_item_entity_position -/* 94B4B8 80240118 0280202D */ daddu $a0, $s4, $zero -/* 94B4BC 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 94B4C0 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 94B4C4 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 94B4C8 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 94B4CC 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 94B4D0 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 94B4D4 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 94B4D8 80240138 03E00008 */ jr $ra -/* 94B4DC 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_42/func_80240040_94C510.s b/asm/nonmatchings/world/area_sbk/sbk_42/func_80240040_94C510.s deleted file mode 100644 index b50f087497..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_42/func_80240040_94C510.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_94C550 -/* 94C550 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 94C554 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 94C558 80240048 0080982D */ daddu $s3, $a0, $zero -/* 94C55C 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 94C560 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 94C564 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 94C568 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 94C56C 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 94C570 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 94C574 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 94C578 80240068 0260202D */ daddu $a0, $s3, $zero -/* 94C57C 8024006C 8E050000 */ lw $a1, ($s0) -/* 94C580 80240070 0C0B1EAF */ jal get_variable -/* 94C584 80240074 26100004 */ addiu $s0, $s0, 4 -/* 94C588 80240078 8E050000 */ lw $a1, ($s0) -/* 94C58C 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 94C590 80240080 0260202D */ daddu $a0, $s3, $zero -/* 94C594 80240084 0C0B1EAF */ jal get_variable -/* 94C598 80240088 0040882D */ daddu $s1, $v0, $zero -/* 94C59C 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 94C5A0 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 94C5A4 80240094 8E120000 */ lw $s2, ($s0) -/* 94C5A8 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 94C5AC 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 94C5B0 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 94C5B4 802400A4 08090030 */ j .L802400C0 -/* 94C5B8 802400A8 00000000 */ nop -.L802400AC: -/* 94C5BC 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 94C5C0 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 94C5C4 802400B4 14400005 */ bnez $v0, .L802400CC -/* 94C5C8 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 94C5CC 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 94C5D0 802400C0 0C00EABB */ jal get_npc_unsafe -/* 94C5D4 802400C4 00000000 */ nop -/* 94C5D8 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 94C5DC 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 94C5E0 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 94C5E4 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 94C5E8 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 94C5EC 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 94C5F0 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 94C5F4 802400E4 0C0B1EAF */ jal get_variable -/* 94C5F8 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 94C5FC 802400EC 1040000C */ beqz $v0, .L80240120 -/* 94C600 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 94C604 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 94C608 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 94C60C 802400FC 44810000 */ mtc1 $at, $f0 -/* 94C610 80240100 00000000 */ nop -/* 94C614 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 94C618 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 94C61C 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 94C620 80240110 44061000 */ mfc1 $a2, $f2 -/* 94C624 80240114 0C04D083 */ jal set_item_entity_position -/* 94C628 80240118 0280202D */ daddu $a0, $s4, $zero -/* 94C62C 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 94C630 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 94C634 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 94C638 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 94C63C 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 94C640 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 94C644 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 94C648 80240138 03E00008 */ jr $ra -/* 94C64C 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_44/func_80240040_94D5A0.s b/asm/nonmatchings/world/area_sbk/sbk_44/func_80240040_94D5A0.s deleted file mode 100644 index bbaaaeb5f4..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_44/func_80240040_94D5A0.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_94D5E0 -/* 94D5E0 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 94D5E4 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 94D5E8 80240048 0080982D */ daddu $s3, $a0, $zero -/* 94D5EC 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 94D5F0 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 94D5F4 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 94D5F8 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 94D5FC 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 94D600 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 94D604 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 94D608 80240068 0260202D */ daddu $a0, $s3, $zero -/* 94D60C 8024006C 8E050000 */ lw $a1, ($s0) -/* 94D610 80240070 0C0B1EAF */ jal get_variable -/* 94D614 80240074 26100004 */ addiu $s0, $s0, 4 -/* 94D618 80240078 8E050000 */ lw $a1, ($s0) -/* 94D61C 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 94D620 80240080 0260202D */ daddu $a0, $s3, $zero -/* 94D624 80240084 0C0B1EAF */ jal get_variable -/* 94D628 80240088 0040882D */ daddu $s1, $v0, $zero -/* 94D62C 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 94D630 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 94D634 80240094 8E120000 */ lw $s2, ($s0) -/* 94D638 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 94D63C 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 94D640 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 94D644 802400A4 08090030 */ j .L802400C0 -/* 94D648 802400A8 00000000 */ nop -.L802400AC: -/* 94D64C 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 94D650 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 94D654 802400B4 14400005 */ bnez $v0, .L802400CC -/* 94D658 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 94D65C 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 94D660 802400C0 0C00EABB */ jal get_npc_unsafe -/* 94D664 802400C4 00000000 */ nop -/* 94D668 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 94D66C 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 94D670 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 94D674 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 94D678 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 94D67C 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 94D680 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 94D684 802400E4 0C0B1EAF */ jal get_variable -/* 94D688 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 94D68C 802400EC 1040000C */ beqz $v0, .L80240120 -/* 94D690 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 94D694 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 94D698 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 94D69C 802400FC 44810000 */ mtc1 $at, $f0 -/* 94D6A0 80240100 00000000 */ nop -/* 94D6A4 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 94D6A8 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 94D6AC 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 94D6B0 80240110 44061000 */ mfc1 $a2, $f2 -/* 94D6B4 80240114 0C04D083 */ jal set_item_entity_position -/* 94D6B8 80240118 0280202D */ daddu $a0, $s4, $zero -/* 94D6BC 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 94D6C0 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 94D6C4 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 94D6C8 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 94D6CC 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 94D6D0 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 94D6D4 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 94D6D8 80240138 03E00008 */ jr $ra -/* 94D6DC 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_44/func_80240140_94D5A0.s b/asm/nonmatchings/world/area_sbk/sbk_44/func_80240140_94D5A0.s deleted file mode 100644 index b9b1a7202e..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_44/func_80240140_94D5A0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240140_94D6E0 -/* 94D6E0 80240140 8C830148 */ lw $v1, 0x148($a0) -/* 94D6E4 80240144 24020003 */ addiu $v0, $zero, 3 -/* 94D6E8 80240148 A06200B5 */ sb $v0, 0xb5($v1) -/* 94D6EC 8024014C 03E00008 */ jr $ra -/* 94D6F0 80240150 24020002 */ addiu $v0, $zero, 2 -/* 94D6F4 80240154 00000000 */ nop -/* 94D6F8 80240158 00000000 */ nop -/* 94D6FC 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_46/func_80240040_94E9A0.s b/asm/nonmatchings/world/area_sbk/sbk_46/func_80240040_94E9A0.s deleted file mode 100644 index 5a3b9839cd..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_46/func_80240040_94E9A0.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_94E9E0 -/* 94E9E0 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 94E9E4 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 94E9E8 80240048 0080982D */ daddu $s3, $a0, $zero -/* 94E9EC 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 94E9F0 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 94E9F4 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 94E9F8 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 94E9FC 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 94EA00 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 94EA04 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 94EA08 80240068 0260202D */ daddu $a0, $s3, $zero -/* 94EA0C 8024006C 8E050000 */ lw $a1, ($s0) -/* 94EA10 80240070 0C0B1EAF */ jal get_variable -/* 94EA14 80240074 26100004 */ addiu $s0, $s0, 4 -/* 94EA18 80240078 8E050000 */ lw $a1, ($s0) -/* 94EA1C 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 94EA20 80240080 0260202D */ daddu $a0, $s3, $zero -/* 94EA24 80240084 0C0B1EAF */ jal get_variable -/* 94EA28 80240088 0040882D */ daddu $s1, $v0, $zero -/* 94EA2C 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 94EA30 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 94EA34 80240094 8E120000 */ lw $s2, ($s0) -/* 94EA38 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 94EA3C 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 94EA40 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 94EA44 802400A4 08090030 */ j .L802400C0 -/* 94EA48 802400A8 00000000 */ nop -.L802400AC: -/* 94EA4C 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 94EA50 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 94EA54 802400B4 14400005 */ bnez $v0, .L802400CC -/* 94EA58 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 94EA5C 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 94EA60 802400C0 0C00EABB */ jal get_npc_unsafe -/* 94EA64 802400C4 00000000 */ nop -/* 94EA68 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 94EA6C 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 94EA70 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 94EA74 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 94EA78 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 94EA7C 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 94EA80 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 94EA84 802400E4 0C0B1EAF */ jal get_variable -/* 94EA88 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 94EA8C 802400EC 1040000C */ beqz $v0, .L80240120 -/* 94EA90 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 94EA94 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 94EA98 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 94EA9C 802400FC 44810000 */ mtc1 $at, $f0 -/* 94EAA0 80240100 00000000 */ nop -/* 94EAA4 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 94EAA8 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 94EAAC 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 94EAB0 80240110 44061000 */ mfc1 $a2, $f2 -/* 94EAB4 80240114 0C04D083 */ jal set_item_entity_position -/* 94EAB8 80240118 0280202D */ daddu $a0, $s4, $zero -/* 94EABC 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 94EAC0 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 94EAC4 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 94EAC8 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 94EACC 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 94EAD0 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 94EAD4 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 94EAD8 80240138 03E00008 */ jr $ra -/* 94EADC 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_46/func_80240140_94E9A0.s b/asm/nonmatchings/world/area_sbk/sbk_46/func_80240140_94E9A0.s deleted file mode 100644 index 4c445e0827..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_46/func_80240140_94E9A0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240140_94EAE0 -/* 94EAE0 80240140 8C830148 */ lw $v1, 0x148($a0) -/* 94EAE4 80240144 24020003 */ addiu $v0, $zero, 3 -/* 94EAE8 80240148 A06200B5 */ sb $v0, 0xb5($v1) -/* 94EAEC 8024014C 03E00008 */ jr $ra -/* 94EAF0 80240150 24020002 */ addiu $v0, $zero, 2 -/* 94EAF4 80240154 00000000 */ nop -/* 94EAF8 80240158 00000000 */ nop -/* 94EAFC 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_46/func_80240160_94E9A0.s b/asm/nonmatchings/world/area_sbk/sbk_46/func_80240160_94E9A0.s deleted file mode 100644 index 1dee4f5f26..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_46/func_80240160_94E9A0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240160_94EB00 -/* 94EB00 80240160 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 94EB04 80240164 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 94EB08 80240168 4485A000 */ mtc1 $a1, $f20 -/* 94EB0C 8024016C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 94EB10 80240170 4486B000 */ mtc1 $a2, $f22 -/* 94EB14 80240174 AFB00010 */ sw $s0, 0x10($sp) -/* 94EB18 80240178 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 94EB1C 8024017C 4487C000 */ mtc1 $a3, $f24 -/* 94EB20 80240180 AFBF0014 */ sw $ra, 0x14($sp) -/* 94EB24 80240184 0C019D28 */ jal guMtxIdentF -/* 94EB28 80240188 0080802D */ daddu $s0, $a0, $zero -/* 94EB2C 8024018C 4616A582 */ mul.s $f22, $f20, $f22 -/* 94EB30 80240190 00000000 */ nop -/* 94EB34 80240194 4618A502 */ mul.s $f20, $f20, $f24 -/* 94EB38 80240198 00000000 */ nop -/* 94EB3C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* 94EB40 802401A0 44810000 */ mtc1 $at, $f0 -/* 94EB44 802401A4 00000000 */ nop -/* 94EB48 802401A8 E6000014 */ swc1 $f0, 0x14($s0) -/* 94EB4C 802401AC E6160010 */ swc1 $f22, 0x10($s0) -/* 94EB50 802401B0 E6140018 */ swc1 $f20, 0x18($s0) -/* 94EB54 802401B4 8FBF0014 */ lw $ra, 0x14($sp) -/* 94EB58 802401B8 8FB00010 */ lw $s0, 0x10($sp) -/* 94EB5C 802401BC D7B80028 */ ldc1 $f24, 0x28($sp) -/* 94EB60 802401C0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 94EB64 802401C4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 94EB68 802401C8 03E00008 */ jr $ra -/* 94EB6C 802401CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_46/func_802401D0_94E9A0.s b/asm/nonmatchings/world/area_sbk/sbk_46/func_802401D0_94E9A0.s deleted file mode 100644 index ccb23ae0de..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_46/func_802401D0_94E9A0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_94EB70 -/* 94EB70 802401D0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 94EB74 802401D4 AFB10054 */ sw $s1, 0x54($sp) -/* 94EB78 802401D8 0080882D */ daddu $s1, $a0, $zero -/* 94EB7C 802401DC AFBF005C */ sw $ra, 0x5c($sp) -/* 94EB80 802401E0 AFB20058 */ sw $s2, 0x58($sp) -/* 94EB84 802401E4 AFB00050 */ sw $s0, 0x50($sp) -/* 94EB88 802401E8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 94EB8C 802401EC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 94EB90 802401F0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 94EB94 802401F4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 94EB98 802401F8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 94EB9C 802401FC 8E30000C */ lw $s0, 0xc($s1) -/* 94EBA0 80240200 8E050000 */ lw $a1, ($s0) -/* 94EBA4 80240204 0C0B1EAF */ jal get_variable -/* 94EBA8 80240208 26100004 */ addiu $s0, $s0, 4 -/* 94EBAC 8024020C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 94EBB0 80240210 0040202D */ daddu $a0, $v0, $zero -/* 94EBB4 80240214 8E050000 */ lw $a1, ($s0) -/* 94EBB8 80240218 26100004 */ addiu $s0, $s0, 4 -/* 94EBBC 8024021C 0220202D */ daddu $a0, $s1, $zero -/* 94EBC0 80240220 0C0B210B */ jal get_float_variable -/* 94EBC4 80240224 0040902D */ daddu $s2, $v0, $zero -/* 94EBC8 80240228 8E050000 */ lw $a1, ($s0) -/* 94EBCC 8024022C 26100004 */ addiu $s0, $s0, 4 -/* 94EBD0 80240230 0220202D */ daddu $a0, $s1, $zero -/* 94EBD4 80240234 0C0B210B */ jal get_float_variable -/* 94EBD8 80240238 46000706 */ mov.s $f28, $f0 -/* 94EBDC 8024023C 8E050000 */ lw $a1, ($s0) -/* 94EBE0 80240240 26100004 */ addiu $s0, $s0, 4 -/* 94EBE4 80240244 0220202D */ daddu $a0, $s1, $zero -/* 94EBE8 80240248 0C0B210B */ jal get_float_variable -/* 94EBEC 8024024C 46000686 */ mov.s $f26, $f0 -/* 94EBF0 80240250 0220202D */ daddu $a0, $s1, $zero -/* 94EBF4 80240254 8E050000 */ lw $a1, ($s0) -/* 94EBF8 80240258 0C0B210B */ jal get_float_variable -/* 94EBFC 8024025C 46000586 */ mov.s $f22, $f0 -/* 94EC00 80240260 0240202D */ daddu $a0, $s2, $zero -/* 94EC04 80240264 0C046B4C */ jal get_model_from_list_index -/* 94EC08 80240268 46000606 */ mov.s $f24, $f0 -/* 94EC0C 8024026C 0040882D */ daddu $s1, $v0, $zero -/* 94EC10 80240270 96220000 */ lhu $v0, ($s1) -/* 94EC14 80240274 30420400 */ andi $v0, $v0, 0x400 -/* 94EC18 80240278 1440001E */ bnez $v0, .L802402F4 -/* 94EC1C 8024027C 26300058 */ addiu $s0, $s1, 0x58 -/* 94EC20 80240280 4480A000 */ mtc1 $zero, $f20 -/* 94EC24 80240284 4406B000 */ mfc1 $a2, $f22 -/* 94EC28 80240288 4405A000 */ mfc1 $a1, $f20 -/* 94EC2C 8024028C 4407A000 */ mfc1 $a3, $f20 -/* 94EC30 80240290 0C019E40 */ jal guTranslateF -/* 94EC34 80240294 0200202D */ daddu $a0, $s0, $zero -/* 94EC38 80240298 4405E000 */ mfc1 $a1, $f28 -/* 94EC3C 8024029C 4406D000 */ mfc1 $a2, $f26 -/* 94EC40 802402A0 4407C000 */ mfc1 $a3, $f24 -/* 94EC44 802402A4 0C090058 */ jal func_80240160 -/* 94EC48 802402A8 27A40010 */ addiu $a0, $sp, 0x10 -/* 94EC4C 802402AC 27A40010 */ addiu $a0, $sp, 0x10 -/* 94EC50 802402B0 0200282D */ daddu $a1, $s0, $zero -/* 94EC54 802402B4 0C019D80 */ jal guMtxCatF -/* 94EC58 802402B8 0200302D */ daddu $a2, $s0, $zero -/* 94EC5C 802402BC 27A40010 */ addiu $a0, $sp, 0x10 -/* 94EC60 802402C0 4600B587 */ neg.s $f22, $f22 -/* 94EC64 802402C4 4405A000 */ mfc1 $a1, $f20 -/* 94EC68 802402C8 4406B000 */ mfc1 $a2, $f22 -/* 94EC6C 802402CC 0C019E40 */ jal guTranslateF -/* 94EC70 802402D0 00A0382D */ daddu $a3, $a1, $zero -/* 94EC74 802402D4 27A40010 */ addiu $a0, $sp, 0x10 -/* 94EC78 802402D8 0200282D */ daddu $a1, $s0, $zero -/* 94EC7C 802402DC 0C019D80 */ jal guMtxCatF -/* 94EC80 802402E0 00A0302D */ daddu $a2, $a1, $zero -/* 94EC84 802402E4 96220000 */ lhu $v0, ($s1) -/* 94EC88 802402E8 34421400 */ ori $v0, $v0, 0x1400 -/* 94EC8C 802402EC 080900DB */ j .L8024036C -/* 94EC90 802402F0 A6220000 */ sh $v0, ($s1) -.L802402F4: -/* 94EC94 802402F4 4480A000 */ mtc1 $zero, $f20 -/* 94EC98 802402F8 4406B000 */ mfc1 $a2, $f22 -/* 94EC9C 802402FC 4405A000 */ mfc1 $a1, $f20 -/* 94ECA0 80240300 4407A000 */ mfc1 $a3, $f20 -/* 94ECA4 80240304 0C019E40 */ jal guTranslateF -/* 94ECA8 80240308 27A40010 */ addiu $a0, $sp, 0x10 -/* 94ECAC 8024030C 27A40010 */ addiu $a0, $sp, 0x10 -/* 94ECB0 80240310 26300058 */ addiu $s0, $s1, 0x58 -/* 94ECB4 80240314 0200282D */ daddu $a1, $s0, $zero -/* 94ECB8 80240318 0C019D80 */ jal guMtxCatF -/* 94ECBC 8024031C 0200302D */ daddu $a2, $s0, $zero -/* 94ECC0 80240320 4405E000 */ mfc1 $a1, $f28 -/* 94ECC4 80240324 4406D000 */ mfc1 $a2, $f26 -/* 94ECC8 80240328 4407C000 */ mfc1 $a3, $f24 -/* 94ECCC 8024032C 0C090058 */ jal func_80240160 -/* 94ECD0 80240330 27A40010 */ addiu $a0, $sp, 0x10 -/* 94ECD4 80240334 27A40010 */ addiu $a0, $sp, 0x10 -/* 94ECD8 80240338 0200282D */ daddu $a1, $s0, $zero -/* 94ECDC 8024033C 0C019D80 */ jal guMtxCatF -/* 94ECE0 80240340 0200302D */ daddu $a2, $s0, $zero -/* 94ECE4 80240344 27A40010 */ addiu $a0, $sp, 0x10 -/* 94ECE8 80240348 4600B587 */ neg.s $f22, $f22 -/* 94ECEC 8024034C 4405A000 */ mfc1 $a1, $f20 -/* 94ECF0 80240350 4406B000 */ mfc1 $a2, $f22 -/* 94ECF4 80240354 0C019E40 */ jal guTranslateF -/* 94ECF8 80240358 00A0382D */ daddu $a3, $a1, $zero -/* 94ECFC 8024035C 27A40010 */ addiu $a0, $sp, 0x10 -/* 94ED00 80240360 0200282D */ daddu $a1, $s0, $zero -/* 94ED04 80240364 0C019D80 */ jal guMtxCatF -/* 94ED08 80240368 00A0302D */ daddu $a2, $a1, $zero -.L8024036C: -/* 94ED0C 8024036C 8FBF005C */ lw $ra, 0x5c($sp) -/* 94ED10 80240370 8FB20058 */ lw $s2, 0x58($sp) -/* 94ED14 80240374 8FB10054 */ lw $s1, 0x54($sp) -/* 94ED18 80240378 8FB00050 */ lw $s0, 0x50($sp) -/* 94ED1C 8024037C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 94ED20 80240380 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 94ED24 80240384 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 94ED28 80240388 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 94ED2C 8024038C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 94ED30 80240390 24020002 */ addiu $v0, $zero, 2 -/* 94ED34 80240394 03E00008 */ jr $ra -/* 94ED38 80240398 27BD0088 */ addiu $sp, $sp, 0x88 -/* 94ED3C 8024039C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_51/func_80240040_950970.s b/asm/nonmatchings/world/area_sbk/sbk_51/func_80240040_950970.s deleted file mode 100644 index 17e2d1ac91..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_51/func_80240040_950970.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_9509B0 -/* 9509B0 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9509B4 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 9509B8 80240048 0080982D */ daddu $s3, $a0, $zero -/* 9509BC 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 9509C0 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 9509C4 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 9509C8 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 9509CC 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 9509D0 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 9509D4 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 9509D8 80240068 0260202D */ daddu $a0, $s3, $zero -/* 9509DC 8024006C 8E050000 */ lw $a1, ($s0) -/* 9509E0 80240070 0C0B1EAF */ jal get_variable -/* 9509E4 80240074 26100004 */ addiu $s0, $s0, 4 -/* 9509E8 80240078 8E050000 */ lw $a1, ($s0) -/* 9509EC 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 9509F0 80240080 0260202D */ daddu $a0, $s3, $zero -/* 9509F4 80240084 0C0B1EAF */ jal get_variable -/* 9509F8 80240088 0040882D */ daddu $s1, $v0, $zero -/* 9509FC 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 950A00 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 950A04 80240094 8E120000 */ lw $s2, ($s0) -/* 950A08 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 950A0C 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 950A10 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 950A14 802400A4 08090030 */ j .L802400C0 -/* 950A18 802400A8 00000000 */ nop -.L802400AC: -/* 950A1C 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 950A20 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 950A24 802400B4 14400005 */ bnez $v0, .L802400CC -/* 950A28 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 950A2C 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 950A30 802400C0 0C00EABB */ jal get_npc_unsafe -/* 950A34 802400C4 00000000 */ nop -/* 950A38 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 950A3C 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 950A40 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 950A44 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 950A48 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 950A4C 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 950A50 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 950A54 802400E4 0C0B1EAF */ jal get_variable -/* 950A58 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 950A5C 802400EC 1040000C */ beqz $v0, .L80240120 -/* 950A60 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 950A64 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 950A68 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 950A6C 802400FC 44810000 */ mtc1 $at, $f0 -/* 950A70 80240100 00000000 */ nop -/* 950A74 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 950A78 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 950A7C 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 950A80 80240110 44061000 */ mfc1 $a2, $f2 -/* 950A84 80240114 0C04D083 */ jal set_item_entity_position -/* 950A88 80240118 0280202D */ daddu $a0, $s4, $zero -/* 950A8C 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 950A90 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 950A94 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 950A98 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 950A9C 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 950AA0 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 950AA4 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 950AA8 80240138 03E00008 */ jr $ra -/* 950AAC 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_51/func_80240140_950970.s b/asm/nonmatchings/world/area_sbk/sbk_51/func_80240140_950970.s deleted file mode 100644 index ee37cba701..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_51/func_80240140_950970.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240140_950AB0 -/* 950AB0 80240140 8C830148 */ lw $v1, 0x148($a0) -/* 950AB4 80240144 24020003 */ addiu $v0, $zero, 3 -/* 950AB8 80240148 A06200B5 */ sb $v0, 0xb5($v1) -/* 950ABC 8024014C 03E00008 */ jr $ra -/* 950AC0 80240150 24020002 */ addiu $v0, $zero, 2 -/* 950AC4 80240154 00000000 */ nop -/* 950AC8 80240158 00000000 */ nop -/* 950ACC 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_53/func_80240040_951AE0.s b/asm/nonmatchings/world/area_sbk/sbk_53/func_80240040_951AE0.s deleted file mode 100644 index 288ebd20b3..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_53/func_80240040_951AE0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_951B20 -/* 951B20 80240040 8C830148 */ lw $v1, 0x148($a0) -/* 951B24 80240044 24020003 */ addiu $v0, $zero, 3 -/* 951B28 80240048 A06200B5 */ sb $v0, 0xb5($v1) -/* 951B2C 8024004C 03E00008 */ jr $ra -/* 951B30 80240050 24020002 */ addiu $v0, $zero, 2 -/* 951B34 80240054 00000000 */ nop -/* 951B38 80240058 00000000 */ nop -/* 951B3C 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_55/func_80240040_952A50.s b/asm/nonmatchings/world/area_sbk/sbk_55/func_80240040_952A50.s deleted file mode 100644 index f247f05408..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_55/func_80240040_952A50.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_952A90 -/* 952A90 80240040 8C830148 */ lw $v1, 0x148($a0) -/* 952A94 80240044 24020003 */ addiu $v0, $zero, 3 -/* 952A98 80240048 A06200B5 */ sb $v0, 0xb5($v1) -/* 952A9C 8024004C 03E00008 */ jr $ra -/* 952AA0 80240050 24020002 */ addiu $v0, $zero, 2 -/* 952AA4 80240054 00000000 */ nop -/* 952AA8 80240058 00000000 */ nop -/* 952AAC 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_55/func_80240060_952A50.s b/asm/nonmatchings/world/area_sbk/sbk_55/func_80240060_952A50.s deleted file mode 100644 index 0ff63ffe71..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_55/func_80240060_952A50.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240060_952AB0 -/* 952AB0 80240060 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 952AB4 80240064 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 952AB8 80240068 4485A000 */ mtc1 $a1, $f20 -/* 952ABC 8024006C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 952AC0 80240070 4486B000 */ mtc1 $a2, $f22 -/* 952AC4 80240074 AFB00010 */ sw $s0, 0x10($sp) -/* 952AC8 80240078 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 952ACC 8024007C 4487C000 */ mtc1 $a3, $f24 -/* 952AD0 80240080 AFBF0014 */ sw $ra, 0x14($sp) -/* 952AD4 80240084 0C019D28 */ jal guMtxIdentF -/* 952AD8 80240088 0080802D */ daddu $s0, $a0, $zero -/* 952ADC 8024008C 4616A582 */ mul.s $f22, $f20, $f22 -/* 952AE0 80240090 00000000 */ nop -/* 952AE4 80240094 4618A502 */ mul.s $f20, $f20, $f24 -/* 952AE8 80240098 00000000 */ nop -/* 952AEC 8024009C 3C013F80 */ lui $at, 0x3f80 -/* 952AF0 802400A0 44810000 */ mtc1 $at, $f0 -/* 952AF4 802400A4 00000000 */ nop -/* 952AF8 802400A8 E6000014 */ swc1 $f0, 0x14($s0) -/* 952AFC 802400AC E6160010 */ swc1 $f22, 0x10($s0) -/* 952B00 802400B0 E6140018 */ swc1 $f20, 0x18($s0) -/* 952B04 802400B4 8FBF0014 */ lw $ra, 0x14($sp) -/* 952B08 802400B8 8FB00010 */ lw $s0, 0x10($sp) -/* 952B0C 802400BC D7B80028 */ ldc1 $f24, 0x28($sp) -/* 952B10 802400C0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 952B14 802400C4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 952B18 802400C8 03E00008 */ jr $ra -/* 952B1C 802400CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_55/func_802400D0_952A50.s b/asm/nonmatchings/world/area_sbk/sbk_55/func_802400D0_952A50.s deleted file mode 100644 index 732b28d54a..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_55/func_802400D0_952A50.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400D0_952B20 -/* 952B20 802400D0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 952B24 802400D4 AFB10054 */ sw $s1, 0x54($sp) -/* 952B28 802400D8 0080882D */ daddu $s1, $a0, $zero -/* 952B2C 802400DC AFBF005C */ sw $ra, 0x5c($sp) -/* 952B30 802400E0 AFB20058 */ sw $s2, 0x58($sp) -/* 952B34 802400E4 AFB00050 */ sw $s0, 0x50($sp) -/* 952B38 802400E8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 952B3C 802400EC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 952B40 802400F0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 952B44 802400F4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 952B48 802400F8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 952B4C 802400FC 8E30000C */ lw $s0, 0xc($s1) -/* 952B50 80240100 8E050000 */ lw $a1, ($s0) -/* 952B54 80240104 0C0B1EAF */ jal get_variable -/* 952B58 80240108 26100004 */ addiu $s0, $s0, 4 -/* 952B5C 8024010C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 952B60 80240110 0040202D */ daddu $a0, $v0, $zero -/* 952B64 80240114 8E050000 */ lw $a1, ($s0) -/* 952B68 80240118 26100004 */ addiu $s0, $s0, 4 -/* 952B6C 8024011C 0220202D */ daddu $a0, $s1, $zero -/* 952B70 80240120 0C0B210B */ jal get_float_variable -/* 952B74 80240124 0040902D */ daddu $s2, $v0, $zero -/* 952B78 80240128 8E050000 */ lw $a1, ($s0) -/* 952B7C 8024012C 26100004 */ addiu $s0, $s0, 4 -/* 952B80 80240130 0220202D */ daddu $a0, $s1, $zero -/* 952B84 80240134 0C0B210B */ jal get_float_variable -/* 952B88 80240138 46000706 */ mov.s $f28, $f0 -/* 952B8C 8024013C 8E050000 */ lw $a1, ($s0) -/* 952B90 80240140 26100004 */ addiu $s0, $s0, 4 -/* 952B94 80240144 0220202D */ daddu $a0, $s1, $zero -/* 952B98 80240148 0C0B210B */ jal get_float_variable -/* 952B9C 8024014C 46000686 */ mov.s $f26, $f0 -/* 952BA0 80240150 0220202D */ daddu $a0, $s1, $zero -/* 952BA4 80240154 8E050000 */ lw $a1, ($s0) -/* 952BA8 80240158 0C0B210B */ jal get_float_variable -/* 952BAC 8024015C 46000586 */ mov.s $f22, $f0 -/* 952BB0 80240160 0240202D */ daddu $a0, $s2, $zero -/* 952BB4 80240164 0C046B4C */ jal get_model_from_list_index -/* 952BB8 80240168 46000606 */ mov.s $f24, $f0 -/* 952BBC 8024016C 0040882D */ daddu $s1, $v0, $zero -/* 952BC0 80240170 96220000 */ lhu $v0, ($s1) -/* 952BC4 80240174 30420400 */ andi $v0, $v0, 0x400 -/* 952BC8 80240178 1440001E */ bnez $v0, .L802401F4 -/* 952BCC 8024017C 26300058 */ addiu $s0, $s1, 0x58 -/* 952BD0 80240180 4480A000 */ mtc1 $zero, $f20 -/* 952BD4 80240184 4406B000 */ mfc1 $a2, $f22 -/* 952BD8 80240188 4405A000 */ mfc1 $a1, $f20 -/* 952BDC 8024018C 4407A000 */ mfc1 $a3, $f20 -/* 952BE0 80240190 0C019E40 */ jal guTranslateF -/* 952BE4 80240194 0200202D */ daddu $a0, $s0, $zero -/* 952BE8 80240198 4405E000 */ mfc1 $a1, $f28 -/* 952BEC 8024019C 4406D000 */ mfc1 $a2, $f26 -/* 952BF0 802401A0 4407C000 */ mfc1 $a3, $f24 -/* 952BF4 802401A4 0C090018 */ jal func_80240060 -/* 952BF8 802401A8 27A40010 */ addiu $a0, $sp, 0x10 -/* 952BFC 802401AC 27A40010 */ addiu $a0, $sp, 0x10 -/* 952C00 802401B0 0200282D */ daddu $a1, $s0, $zero -/* 952C04 802401B4 0C019D80 */ jal guMtxCatF -/* 952C08 802401B8 0200302D */ daddu $a2, $s0, $zero -/* 952C0C 802401BC 27A40010 */ addiu $a0, $sp, 0x10 -/* 952C10 802401C0 4600B587 */ neg.s $f22, $f22 -/* 952C14 802401C4 4405A000 */ mfc1 $a1, $f20 -/* 952C18 802401C8 4406B000 */ mfc1 $a2, $f22 -/* 952C1C 802401CC 0C019E40 */ jal guTranslateF -/* 952C20 802401D0 00A0382D */ daddu $a3, $a1, $zero -/* 952C24 802401D4 27A40010 */ addiu $a0, $sp, 0x10 -/* 952C28 802401D8 0200282D */ daddu $a1, $s0, $zero -/* 952C2C 802401DC 0C019D80 */ jal guMtxCatF -/* 952C30 802401E0 00A0302D */ daddu $a2, $a1, $zero -/* 952C34 802401E4 96220000 */ lhu $v0, ($s1) -/* 952C38 802401E8 34421400 */ ori $v0, $v0, 0x1400 -/* 952C3C 802401EC 0809009B */ j .L8024026C -/* 952C40 802401F0 A6220000 */ sh $v0, ($s1) -.L802401F4: -/* 952C44 802401F4 4480A000 */ mtc1 $zero, $f20 -/* 952C48 802401F8 4406B000 */ mfc1 $a2, $f22 -/* 952C4C 802401FC 4405A000 */ mfc1 $a1, $f20 -/* 952C50 80240200 4407A000 */ mfc1 $a3, $f20 -/* 952C54 80240204 0C019E40 */ jal guTranslateF -/* 952C58 80240208 27A40010 */ addiu $a0, $sp, 0x10 -/* 952C5C 8024020C 27A40010 */ addiu $a0, $sp, 0x10 -/* 952C60 80240210 26300058 */ addiu $s0, $s1, 0x58 -/* 952C64 80240214 0200282D */ daddu $a1, $s0, $zero -/* 952C68 80240218 0C019D80 */ jal guMtxCatF -/* 952C6C 8024021C 0200302D */ daddu $a2, $s0, $zero -/* 952C70 80240220 4405E000 */ mfc1 $a1, $f28 -/* 952C74 80240224 4406D000 */ mfc1 $a2, $f26 -/* 952C78 80240228 4407C000 */ mfc1 $a3, $f24 -/* 952C7C 8024022C 0C090018 */ jal func_80240060 -/* 952C80 80240230 27A40010 */ addiu $a0, $sp, 0x10 -/* 952C84 80240234 27A40010 */ addiu $a0, $sp, 0x10 -/* 952C88 80240238 0200282D */ daddu $a1, $s0, $zero -/* 952C8C 8024023C 0C019D80 */ jal guMtxCatF -/* 952C90 80240240 0200302D */ daddu $a2, $s0, $zero -/* 952C94 80240244 27A40010 */ addiu $a0, $sp, 0x10 -/* 952C98 80240248 4600B587 */ neg.s $f22, $f22 -/* 952C9C 8024024C 4405A000 */ mfc1 $a1, $f20 -/* 952CA0 80240250 4406B000 */ mfc1 $a2, $f22 -/* 952CA4 80240254 0C019E40 */ jal guTranslateF -/* 952CA8 80240258 00A0382D */ daddu $a3, $a1, $zero -/* 952CAC 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 952CB0 80240260 0200282D */ daddu $a1, $s0, $zero -/* 952CB4 80240264 0C019D80 */ jal guMtxCatF -/* 952CB8 80240268 00A0302D */ daddu $a2, $a1, $zero -.L8024026C: -/* 952CBC 8024026C 8FBF005C */ lw $ra, 0x5c($sp) -/* 952CC0 80240270 8FB20058 */ lw $s2, 0x58($sp) -/* 952CC4 80240274 8FB10054 */ lw $s1, 0x54($sp) -/* 952CC8 80240278 8FB00050 */ lw $s0, 0x50($sp) -/* 952CCC 8024027C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 952CD0 80240280 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 952CD4 80240284 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 952CD8 80240288 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 952CDC 8024028C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 952CE0 80240290 24020002 */ addiu $v0, $zero, 2 -/* 952CE4 80240294 03E00008 */ jr $ra -/* 952CE8 80240298 27BD0088 */ addiu $sp, $sp, 0x88 -/* 952CEC 8024029C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/func_80240038_953FC0.s b/asm/nonmatchings/world/area_sbk/sbk_56/func_80240038_953FC0.s deleted file mode 100644 index c9eee6b77e..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/func_80240038_953FC0.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240038_953FF8 -/* 953FF8 80240038 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 953FFC 8024003C 0000202D */ daddu $a0, $zero, $zero -/* 954000 80240040 AFBF0010 */ sw $ra, 0x10($sp) -/* 954004 80240044 0C052AED */ jal func_8014ABB4 -/* 954008 80240048 24050001 */ addiu $a1, $zero, 1 -/* 95400C 8024004C 8FBF0010 */ lw $ra, 0x10($sp) -/* 954010 80240050 24020002 */ addiu $v0, $zero, 2 -/* 954014 80240054 03E00008 */ jr $ra -/* 954018 80240058 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/func_80240080_953FC0.s b/asm/nonmatchings/world/area_sbk/sbk_56/func_80240080_953FC0.s deleted file mode 100644 index 33afa251a1..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/func_80240080_953FC0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240080_954040 -/* 954040 80240080 3C03800A */ lui $v1, %hi(D_8009A650) -/* 954044 80240084 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 954048 80240088 8C620000 */ lw $v0, ($v1) -/* 95404C 8024008C 34420040 */ ori $v0, $v0, 0x40 -/* 954050 80240090 AC620000 */ sw $v0, ($v1) -/* 954054 80240094 03E00008 */ jr $ra -/* 954058 80240098 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/func_80240154_953FC0.s b/asm/nonmatchings/world/area_sbk/sbk_56/func_80240154_953FC0.s deleted file mode 100644 index 16a014dbd8..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/func_80240154_953FC0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240154_954114 -/* 954114 80240154 3C028011 */ lui $v0, %hi(gPlayerData) -/* 954118 80240158 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 95411C 8024015C 000420C0 */ sll $a0, $a0, 3 -/* 954120 80240160 00822021 */ addu $a0, $a0, $v0 -/* 954124 80240164 90820014 */ lbu $v0, 0x14($a0) -/* 954128 80240168 10400009 */ beqz $v0, .L80240190 -/* 95412C 8024016C 00000000 */ nop -/* 954130 80240170 90820015 */ lbu $v0, 0x15($a0) -/* 954134 80240174 00022600 */ sll $a0, $v0, 0x18 -/* 954138 80240178 00041E03 */ sra $v1, $a0, 0x18 -/* 95413C 8024017C 00051400 */ sll $v0, $a1, 0x10 -/* 954140 80240180 00021403 */ sra $v0, $v0, 0x10 -/* 954144 80240184 0043102A */ slt $v0, $v0, $v1 -/* 954148 80240188 10400003 */ beqz $v0, .L80240198 -/* 95414C 8024018C 00000000 */ nop -.L80240190: -/* 954150 80240190 03E00008 */ jr $ra -/* 954154 80240194 2402FFFF */ addiu $v0, $zero, -1 -.L80240198: -/* 954158 80240198 03E00008 */ jr $ra -/* 95415C 8024019C 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/func_80240500_953FC0.s b/asm/nonmatchings/world/area_sbk/sbk_56/func_80240500_953FC0.s deleted file mode 100644 index 83309d920d..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/func_80240500_953FC0.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_9544C0 -/* 9544C0 80240500 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9544C4 80240504 AFB1001C */ sw $s1, 0x1c($sp) -/* 9544C8 80240508 0080882D */ daddu $s1, $a0, $zero -/* 9544CC 8024050C AFBF0020 */ sw $ra, 0x20($sp) -/* 9544D0 80240510 AFB00018 */ sw $s0, 0x18($sp) -/* 9544D4 80240514 8E30000C */ lw $s0, 0xc($s1) -/* 9544D8 80240518 8E050000 */ lw $a1, ($s0) -/* 9544DC 8024051C 0C0B1EAF */ jal get_variable -/* 9544E0 80240520 26100004 */ addiu $s0, $s0, 4 -/* 9544E4 80240524 0C04417A */ jal get_entity_by_index -/* 9544E8 80240528 0040202D */ daddu $a0, $v0, $zero -/* 9544EC 8024052C 8E100000 */ lw $s0, ($s0) -/* 9544F0 80240530 C444004C */ lwc1 $f4, 0x4c($v0) -/* 9544F4 80240534 3C014148 */ lui $at, 0x4148 -/* 9544F8 80240538 44810000 */ mtc1 $at, $f0 -/* 9544FC 8024053C 3C013F33 */ lui $at, 0x3f33 -/* 954500 80240540 34213333 */ ori $at, $at, 0x3333 -/* 954504 80240544 44811000 */ mtc1 $at, $f2 -/* 954508 80240548 AFA00014 */ sw $zero, 0x14($sp) -/* 95450C 8024054C 46002100 */ add.s $f4, $f4, $f0 -/* 954510 80240550 E7A20010 */ swc1 $f2, 0x10($sp) -/* 954514 80240554 8C450048 */ lw $a1, 0x48($v0) -/* 954518 80240558 8C470050 */ lw $a3, 0x50($v0) -/* 95451C 8024055C 44062000 */ mfc1 $a2, $f4 -/* 954520 80240560 0C01C5D4 */ jal func_80071750 -/* 954524 80240564 0000202D */ daddu $a0, $zero, $zero -/* 954528 80240568 0220202D */ daddu $a0, $s1, $zero -/* 95452C 8024056C 0200282D */ daddu $a1, $s0, $zero -/* 954530 80240570 0C0B2026 */ jal set_variable -/* 954534 80240574 0040302D */ daddu $a2, $v0, $zero -/* 954538 80240578 8FBF0020 */ lw $ra, 0x20($sp) -/* 95453C 8024057C 8FB1001C */ lw $s1, 0x1c($sp) -/* 954540 80240580 8FB00018 */ lw $s0, 0x18($sp) -/* 954544 80240584 24020002 */ addiu $v0, $zero, 2 -/* 954548 80240588 03E00008 */ jr $ra -/* 95454C 8024058C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/func_80240628_953FC0.s b/asm/nonmatchings/world/area_sbk/sbk_56/func_80240628_953FC0.s deleted file mode 100644 index 7bd9f09715..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/func_80240628_953FC0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240628_9545E8 -/* 9545E8 80240628 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9545EC 8024062C AFBF0018 */ sw $ra, 0x18($sp) -/* 9545F0 80240630 0C00EAD2 */ jal get_npc_safe -/* 9545F4 80240634 2404FFFC */ addiu $a0, $zero, -4 -/* 9545F8 80240638 C444003C */ lwc1 $f4, 0x3c($v0) -/* 9545FC 8024063C 3C014148 */ lui $at, 0x4148 -/* 954600 80240640 44811000 */ mtc1 $at, $f2 -/* 954604 80240644 3C013F80 */ lui $at, 0x3f80 -/* 954608 80240648 44810000 */ mtc1 $at, $f0 -/* 95460C 8024064C 2403001E */ addiu $v1, $zero, 0x1e -/* 954610 80240650 AFA30014 */ sw $v1, 0x14($sp) -/* 954614 80240654 46022100 */ add.s $f4, $f4, $f2 -/* 954618 80240658 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95461C 8024065C 8C450038 */ lw $a1, 0x38($v0) -/* 954620 80240660 8C470040 */ lw $a3, 0x40($v0) -/* 954624 80240664 44062000 */ mfc1 $a2, $f4 -/* 954628 80240668 0C01C2EC */ jal func_80070BB0 -/* 95462C 8024066C 24040009 */ addiu $a0, $zero, 9 -/* 954630 80240670 8FBF0018 */ lw $ra, 0x18($sp) -/* 954634 80240674 24020002 */ addiu $v0, $zero, 2 -/* 954638 80240678 03E00008 */ jr $ra -/* 95463C 8024067C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/func_80240680_953FC0.s b/asm/nonmatchings/world/area_sbk/sbk_56/func_80240680_953FC0.s deleted file mode 100644 index 4286fb49f2..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/func_80240680_953FC0.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240680_954640 -/* 954640 80240680 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 954644 80240684 AFB60040 */ sw $s6, 0x40($sp) -/* 954648 80240688 0080B02D */ daddu $s6, $a0, $zero -/* 95464C 8024068C AFB00028 */ sw $s0, 0x28($sp) -/* 954650 80240690 00A0802D */ daddu $s0, $a1, $zero -/* 954654 80240694 AFBF0044 */ sw $ra, 0x44($sp) -/* 954658 80240698 AFB5003C */ sw $s5, 0x3c($sp) -/* 95465C 8024069C AFB40038 */ sw $s4, 0x38($sp) -/* 954660 802406A0 AFB30034 */ sw $s3, 0x34($sp) -/* 954664 802406A4 AFB20030 */ sw $s2, 0x30($sp) -/* 954668 802406A8 AFB1002C */ sw $s1, 0x2c($sp) -/* 95466C 802406AC F7B80058 */ sdc1 $f24, 0x58($sp) -/* 954670 802406B0 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 954674 802406B4 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 954678 802406B8 8ED3000C */ lw $s3, 0xc($s6) -/* 95467C 802406BC 0C00EAD2 */ jal get_npc_safe -/* 954680 802406C0 2404FFFC */ addiu $a0, $zero, -4 -/* 954684 802406C4 27A50018 */ addiu $a1, $sp, 0x18 -/* 954688 802406C8 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 95468C 802406CC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 954690 802406D0 27A6001C */ addiu $a2, $sp, 0x1c -/* 954694 802406D4 00041880 */ sll $v1, $a0, 2 -/* 954698 802406D8 00641821 */ addu $v1, $v1, $a0 -/* 95469C 802406DC 00031880 */ sll $v1, $v1, 2 -/* 9546A0 802406E0 00641823 */ subu $v1, $v1, $a0 -/* 9546A4 802406E4 000320C0 */ sll $a0, $v1, 3 -/* 9546A8 802406E8 00641821 */ addu $v1, $v1, $a0 -/* 9546AC 802406EC 000318C0 */ sll $v1, $v1, 3 -/* 9546B0 802406F0 3C01800B */ lui $at, 0x800b -/* 9546B4 802406F4 00230821 */ addu $at, $at, $v1 -/* 9546B8 802406F8 C42C1DEC */ lwc1 $f12, 0x1dec($at) -/* 9546BC 802406FC 0C00A88D */ jal sin_cos_deg -/* 9546C0 80240700 0040A82D */ daddu $s5, $v0, $zero -/* 9546C4 80240704 1200005D */ beqz $s0, .L8024087C -/* 9546C8 80240708 00000000 */ nop -/* 9546CC 8024070C 0C00AB0A */ jal general_heap_malloc -/* 9546D0 80240710 24040068 */ addiu $a0, $zero, 0x68 -/* 9546D4 80240714 0040902D */ daddu $s2, $v0, $zero -/* 9546D8 80240718 02C0202D */ daddu $a0, $s6, $zero -/* 9546DC 8024071C 0000882D */ daddu $s1, $zero, $zero -/* 9546E0 80240720 2414FFFF */ addiu $s4, $zero, -1 -/* 9546E4 80240724 AED20060 */ sw $s2, 0x60($s6) -/* 9546E8 80240728 8E650000 */ lw $a1, ($s3) -/* 9546EC 8024072C 3C014148 */ lui $at, 0x4148 -/* 9546F0 80240730 4481C000 */ mtc1 $at, $f24 -/* 9546F4 80240734 3C013F80 */ lui $at, 0x3f80 -/* 9546F8 80240738 4481B000 */ mtc1 $at, $f22 -/* 9546FC 8024073C 4480A000 */ mtc1 $zero, $f20 -/* 954700 80240740 0C0B1EAF */ jal get_variable -/* 954704 80240744 0240802D */ daddu $s0, $s2, $zero -/* 954708 80240748 0C04417A */ jal get_entity_by_index -/* 95470C 8024074C 0040202D */ daddu $a0, $v0, $zero -/* 954710 80240750 AE42005C */ sw $v0, 0x5c($s2) -.L80240754: -/* 954714 80240754 8E42005C */ lw $v0, 0x5c($s2) -/* 954718 80240758 C440004C */ lwc1 $f0, 0x4c($v0) -/* 95471C 8024075C 0000202D */ daddu $a0, $zero, $zero -/* 954720 80240760 E7B60010 */ swc1 $f22, 0x10($sp) -/* 954724 80240764 AFB40014 */ sw $s4, 0x14($sp) -/* 954728 80240768 46180000 */ add.s $f0, $f0, $f24 -/* 95472C 8024076C 8C450048 */ lw $a1, 0x48($v0) -/* 954730 80240770 8C470050 */ lw $a3, 0x50($v0) -/* 954734 80240774 44060000 */ mfc1 $a2, $f0 -/* 954738 80240778 0C01C5BC */ jal func_800716F0 -/* 95473C 8024077C 26310001 */ addiu $s1, $s1, 1 -/* 954740 80240780 AE020008 */ sw $v0, 8($s0) -/* 954744 80240784 E614002C */ swc1 $f20, 0x2c($s0) -/* 954748 80240788 E6140020 */ swc1 $f20, 0x20($s0) -/* 95474C 8024078C E6140014 */ swc1 $f20, 0x14($s0) -/* 954750 80240790 E6140050 */ swc1 $f20, 0x50($s0) -/* 954754 80240794 E6140044 */ swc1 $f20, 0x44($s0) -/* 954758 80240798 E6140038 */ swc1 $f20, 0x38($s0) -/* 95475C 8024079C 2A220003 */ slti $v0, $s1, 3 -/* 954760 802407A0 1440FFEC */ bnez $v0, .L80240754 -/* 954764 802407A4 26100004 */ addiu $s0, $s0, 4 -/* 954768 802407A8 0000882D */ daddu $s1, $zero, $zero -/* 95476C 802407AC 0240802D */ daddu $s0, $s2, $zero -/* 954770 802407B0 3C148024 */ lui $s4, 0x8024 -/* 954774 802407B4 26941488 */ addiu $s4, $s4, 0x1488 -/* 954778 802407B8 3C014248 */ lui $at, 0x4248 -/* 95477C 802407BC 4481A000 */ mtc1 $at, $f20 -/* 954780 802407C0 24130044 */ addiu $s3, $zero, 0x44 -/* 954784 802407C4 AE400000 */ sw $zero, ($s2) -/* 954788 802407C8 AE400004 */ sw $zero, 4($s2) -/* 95478C 802407CC AE400060 */ sw $zero, 0x60($s2) -/* 954790 802407D0 AE400064 */ sw $zero, 0x64($s2) -.L802407D4: -/* 954794 802407D4 27A40020 */ addiu $a0, $sp, 0x20 -/* 954798 802407D8 4406A000 */ mfc1 $a2, $f20 -/* 95479C 802407DC 8E870000 */ lw $a3, ($s4) -/* 9547A0 802407E0 02532821 */ addu $a1, $s2, $s3 -/* 9547A4 802407E4 0C00A7E7 */ jal add_vec2D_polar -/* 9547A8 802407E8 AFA00020 */ sw $zero, 0x20($sp) -/* 9547AC 802407EC C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 9547B0 802407F0 C7A40020 */ lwc1 $f4, 0x20($sp) -/* 9547B4 802407F4 46041082 */ mul.s $f2, $f2, $f4 -/* 9547B8 802407F8 00000000 */ nop -/* 9547BC 802407FC C7A00018 */ lwc1 $f0, 0x18($sp) -/* 9547C0 80240800 46040002 */ mul.s $f0, $f0, $f4 -/* 9547C4 80240804 00000000 */ nop -/* 9547C8 80240808 E6020038 */ swc1 $f2, 0x38($s0) -/* 9547CC 8024080C E6000050 */ swc1 $f0, 0x50($s0) -/* 9547D0 80240810 8E42005C */ lw $v0, 0x5c($s2) -/* 9547D4 80240814 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9547D8 80240818 C4420048 */ lwc1 $f2, 0x48($v0) -/* 9547DC 8024081C 46001080 */ add.s $f2, $f2, $f0 -/* 9547E0 80240820 C6A00038 */ lwc1 $f0, 0x38($s5) -/* 9547E4 80240824 46020001 */ sub.s $f0, $f0, $f2 -/* 9547E8 80240828 E6000038 */ swc1 $f0, 0x38($s0) -/* 9547EC 8024082C 8E42005C */ lw $v0, 0x5c($s2) -/* 9547F0 80240830 C6000044 */ lwc1 $f0, 0x44($s0) -/* 9547F4 80240834 C442004C */ lwc1 $f2, 0x4c($v0) -/* 9547F8 80240838 46001080 */ add.s $f2, $f2, $f0 -/* 9547FC 8024083C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* 954800 80240840 46020001 */ sub.s $f0, $f0, $f2 -/* 954804 80240844 E6000044 */ swc1 $f0, 0x44($s0) -/* 954808 80240848 8E42005C */ lw $v0, 0x5c($s2) -/* 95480C 8024084C C6000050 */ lwc1 $f0, 0x50($s0) -/* 954810 80240850 C4420050 */ lwc1 $f2, 0x50($v0) -/* 954814 80240854 26940004 */ addiu $s4, $s4, 4 -/* 954818 80240858 46001080 */ add.s $f2, $f2, $f0 -/* 95481C 8024085C C6A00040 */ lwc1 $f0, 0x40($s5) -/* 954820 80240860 26730004 */ addiu $s3, $s3, 4 -/* 954824 80240864 46020001 */ sub.s $f0, $f0, $f2 -/* 954828 80240868 26310001 */ addiu $s1, $s1, 1 -/* 95482C 8024086C 2A220003 */ slti $v0, $s1, 3 -/* 954830 80240870 E6000050 */ swc1 $f0, 0x50($s0) -/* 954834 80240874 1440FFD7 */ bnez $v0, .L802407D4 -/* 954838 80240878 26100004 */ addiu $s0, $s0, 4 -.L8024087C: -/* 95483C 8024087C 8ED20060 */ lw $s2, 0x60($s6) -/* 954840 80240880 8E430000 */ lw $v1, ($s2) -/* 954844 80240884 24020001 */ addiu $v0, $zero, 1 -/* 954848 80240888 10620038 */ beq $v1, $v0, .L8024096C -/* 95484C 8024088C 28620002 */ slti $v0, $v1, 2 -/* 954850 80240890 50400005 */ beql $v0, $zero, .L802408A8 -/* 954854 80240894 24020002 */ addiu $v0, $zero, 2 -/* 954858 80240898 10600007 */ beqz $v1, .L802408B8 -/* 95485C 8024089C 24040005 */ addiu $a0, $zero, 5 -/* 954860 802408A0 08090294 */ j .L80240A50 -/* 954864 802408A4 00000000 */ nop -.L802408A8: -/* 954868 802408A8 10620058 */ beq $v1, $v0, .L80240A0C -/* 95486C 802408AC 00000000 */ nop -/* 954870 802408B0 08090294 */ j .L80240A50 -/* 954874 802408B4 00000000 */ nop -.L802408B8: -/* 954878 802408B8 0000882D */ daddu $s1, $zero, $zero -/* 95487C 802408BC 3C148024 */ lui $s4, 0x8024 -/* 954880 802408C0 26941488 */ addiu $s4, $s4, 0x1488 -/* 954884 802408C4 24130020 */ addiu $s3, $zero, 0x20 -/* 954888 802408C8 3C064248 */ lui $a2, 0x4248 -/* 95488C 802408CC 44800000 */ mtc1 $zero, $f0 -/* 954890 802408D0 24020014 */ addiu $v0, $zero, 0x14 -/* 954894 802408D4 AFA20010 */ sw $v0, 0x10($sp) -/* 954898 802408D8 44050000 */ mfc1 $a1, $f0 -/* 95489C 802408DC 8E470060 */ lw $a3, 0x60($s2) -/* 9548A0 802408E0 4485B000 */ mtc1 $a1, $f22 -/* 9548A4 802408E4 0C00A8ED */ jal update_lerp -/* 9548A8 802408E8 0240802D */ daddu $s0, $s2, $zero -/* 9548AC 802408EC 46000506 */ mov.s $f20, $f0 -.L802408F0: -/* 9548B0 802408F0 4406A000 */ mfc1 $a2, $f20 -/* 9548B4 802408F4 27A40020 */ addiu $a0, $sp, 0x20 -/* 9548B8 802408F8 E6160020 */ swc1 $f22, 0x20($s0) -/* 9548BC 802408FC 8E870000 */ lw $a3, ($s4) -/* 9548C0 80240900 02532821 */ addu $a1, $s2, $s3 -/* 9548C4 80240904 0C00A7E7 */ jal add_vec2D_polar -/* 9548C8 80240908 E7B60020 */ swc1 $f22, 0x20($sp) -/* 9548CC 8024090C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 9548D0 80240910 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 9548D4 80240914 46002102 */ mul.s $f4, $f4, $f0 -/* 9548D8 80240918 00000000 */ nop -/* 9548DC 8024091C C7A20018 */ lwc1 $f2, 0x18($sp) -/* 9548E0 80240920 26940004 */ addiu $s4, $s4, 4 -/* 9548E4 80240924 46001082 */ mul.s $f2, $f2, $f0 -/* 9548E8 80240928 00000000 */ nop -/* 9548EC 8024092C 26730004 */ addiu $s3, $s3, 4 -/* 9548F0 80240930 26310001 */ addiu $s1, $s1, 1 -/* 9548F4 80240934 2A220003 */ slti $v0, $s1, 3 -/* 9548F8 80240938 E6040014 */ swc1 $f4, 0x14($s0) -/* 9548FC 8024093C E602002C */ swc1 $f2, 0x2c($s0) -/* 954900 80240940 1440FFEB */ bnez $v0, .L802408F0 -/* 954904 80240944 26100004 */ addiu $s0, $s0, 4 -/* 954908 80240948 8E420060 */ lw $v0, 0x60($s2) -/* 95490C 8024094C 24420001 */ addiu $v0, $v0, 1 -/* 954910 80240950 AE420060 */ sw $v0, 0x60($s2) -/* 954914 80240954 28420015 */ slti $v0, $v0, 0x15 -/* 954918 80240958 1440003D */ bnez $v0, .L80240A50 -/* 95491C 8024095C 24020001 */ addiu $v0, $zero, 1 -/* 954920 80240960 AE420000 */ sw $v0, ($s2) -/* 954924 80240964 08090294 */ j .L80240A50 -/* 954928 80240968 AE400060 */ sw $zero, 0x60($s2) -.L8024096C: -/* 95492C 8024096C 0000882D */ daddu $s1, $zero, $zero -/* 954930 80240970 3C148024 */ lui $s4, 0x8024 -/* 954934 80240974 26941488 */ addiu $s4, $s4, 0x1488 -/* 954938 80240978 24130020 */ addiu $s3, $zero, 0x20 -/* 95493C 8024097C 0240802D */ daddu $s0, $s2, $zero -/* 954940 80240980 3C014248 */ lui $at, 0x4248 -/* 954944 80240984 4481A000 */ mtc1 $at, $f20 -/* 954948 80240988 4480B000 */ mtc1 $zero, $f22 -.L8024098C: -/* 95494C 8024098C 4406A000 */ mfc1 $a2, $f20 -/* 954950 80240990 27A40020 */ addiu $a0, $sp, 0x20 -/* 954954 80240994 E6160020 */ swc1 $f22, 0x20($s0) -/* 954958 80240998 8E870000 */ lw $a3, ($s4) -/* 95495C 8024099C 02532821 */ addu $a1, $s2, $s3 -/* 954960 802409A0 0C00A7E7 */ jal add_vec2D_polar -/* 954964 802409A4 E7B60020 */ swc1 $f22, 0x20($sp) -/* 954968 802409A8 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 95496C 802409AC C7A00020 */ lwc1 $f0, 0x20($sp) -/* 954970 802409B0 46002102 */ mul.s $f4, $f4, $f0 -/* 954974 802409B4 00000000 */ nop -/* 954978 802409B8 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 95497C 802409BC 26940004 */ addiu $s4, $s4, 4 -/* 954980 802409C0 46001082 */ mul.s $f2, $f2, $f0 -/* 954984 802409C4 00000000 */ nop -/* 954988 802409C8 26730004 */ addiu $s3, $s3, 4 -/* 95498C 802409CC 26310001 */ addiu $s1, $s1, 1 -/* 954990 802409D0 2A220003 */ slti $v0, $s1, 3 -/* 954994 802409D4 E6040014 */ swc1 $f4, 0x14($s0) -/* 954998 802409D8 E602002C */ swc1 $f2, 0x2c($s0) -/* 95499C 802409DC 1440FFEB */ bnez $v0, .L8024098C -/* 9549A0 802409E0 26100004 */ addiu $s0, $s0, 4 -/* 9549A4 802409E4 8E420060 */ lw $v0, 0x60($s2) -/* 9549A8 802409E8 24420001 */ addiu $v0, $v0, 1 -/* 9549AC 802409EC AE420060 */ sw $v0, 0x60($s2) -/* 9549B0 802409F0 28420010 */ slti $v0, $v0, 0x10 -/* 9549B4 802409F4 14400016 */ bnez $v0, .L80240A50 -/* 9549B8 802409F8 2402000F */ addiu $v0, $zero, 0xf -/* 9549BC 802409FC AE420060 */ sw $v0, 0x60($s2) -/* 9549C0 80240A00 24020002 */ addiu $v0, $zero, 2 -/* 9549C4 80240A04 08090294 */ j .L80240A50 -/* 9549C8 80240A08 AE420000 */ sw $v0, ($s2) -.L80240A0C: -/* 9549CC 80240A0C 8E420060 */ lw $v0, 0x60($s2) -/* 9549D0 80240A10 24420001 */ addiu $v0, $v0, 1 -/* 9549D4 80240A14 AE420060 */ sw $v0, 0x60($s2) -/* 9549D8 80240A18 2842001F */ slti $v0, $v0, 0x1f -/* 9549DC 80240A1C 1440000C */ bnez $v0, .L80240A50 -/* 9549E0 80240A20 0000882D */ daddu $s1, $zero, $zero -/* 9549E4 80240A24 0240282D */ daddu $a1, $s2, $zero -.L80240A28: -/* 9549E8 80240A28 8CA20008 */ lw $v0, 8($a1) -/* 9549EC 80240A2C 8C430000 */ lw $v1, ($v0) -/* 9549F0 80240A30 26310001 */ addiu $s1, $s1, 1 -/* 9549F4 80240A34 34630010 */ ori $v1, $v1, 0x10 -/* 9549F8 80240A38 AC430000 */ sw $v1, ($v0) -/* 9549FC 80240A3C 2A220003 */ slti $v0, $s1, 3 -/* 954A00 80240A40 1440FFF9 */ bnez $v0, .L80240A28 -/* 954A04 80240A44 24A50004 */ addiu $a1, $a1, 4 -/* 954A08 80240A48 080902E1 */ j .L80240B84 -/* 954A0C 80240A4C 24020002 */ addiu $v0, $zero, 2 -.L80240A50: -/* 954A10 80240A50 8E430004 */ lw $v1, 4($s2) -/* 954A14 80240A54 10600005 */ beqz $v1, .L80240A6C -/* 954A18 80240A58 24020001 */ addiu $v0, $zero, 1 -/* 954A1C 80240A5C 1062000B */ beq $v1, $v0, .L80240A8C -/* 954A20 80240A60 0000882D */ daddu $s1, $zero, $zero -/* 954A24 80240A64 080902D0 */ j .L80240B40 -/* 954A28 80240A68 0240282D */ daddu $a1, $s2, $zero -.L80240A6C: -/* 954A2C 80240A6C 8E420064 */ lw $v0, 0x64($s2) -/* 954A30 80240A70 24420001 */ addiu $v0, $v0, 1 -/* 954A34 80240A74 AE420064 */ sw $v0, 0x64($s2) -/* 954A38 80240A78 28420010 */ slti $v0, $v0, 0x10 -/* 954A3C 80240A7C 1440002F */ bnez $v0, .L80240B3C -/* 954A40 80240A80 0000882D */ daddu $s1, $zero, $zero -/* 954A44 80240A84 080902CC */ j .L80240B30 -/* 954A48 80240A88 24020001 */ addiu $v0, $zero, 1 -.L80240A8C: -/* 954A4C 80240A8C 4480A000 */ mtc1 $zero, $f20 -/* 954A50 80240A90 24130014 */ addiu $s3, $zero, 0x14 -/* 954A54 80240A94 0240802D */ daddu $s0, $s2, $zero -.L80240A98: -/* 954A58 80240A98 4405A000 */ mfc1 $a1, $f20 -/* 954A5C 80240A9C AFB30010 */ sw $s3, 0x10($sp) -/* 954A60 80240AA0 8E060038 */ lw $a2, 0x38($s0) -/* 954A64 80240AA4 8E470064 */ lw $a3, 0x64($s2) -/* 954A68 80240AA8 0C00A8ED */ jal update_lerp -/* 954A6C 80240AAC 24040001 */ addiu $a0, $zero, 1 -/* 954A70 80240AB0 C6020014 */ lwc1 $f2, 0x14($s0) -/* 954A74 80240AB4 46001080 */ add.s $f2, $f2, $f0 -/* 954A78 80240AB8 4405A000 */ mfc1 $a1, $f20 -/* 954A7C 80240ABC E6020014 */ swc1 $f2, 0x14($s0) -/* 954A80 80240AC0 AFB30010 */ sw $s3, 0x10($sp) -/* 954A84 80240AC4 8E060044 */ lw $a2, 0x44($s0) -/* 954A88 80240AC8 8E470064 */ lw $a3, 0x64($s2) -/* 954A8C 80240ACC 0C00A8ED */ jal update_lerp -/* 954A90 80240AD0 24040001 */ addiu $a0, $zero, 1 -/* 954A94 80240AD4 C6020020 */ lwc1 $f2, 0x20($s0) -/* 954A98 80240AD8 46001080 */ add.s $f2, $f2, $f0 -/* 954A9C 80240ADC 4405A000 */ mfc1 $a1, $f20 -/* 954AA0 80240AE0 E6020020 */ swc1 $f2, 0x20($s0) -/* 954AA4 80240AE4 AFB30010 */ sw $s3, 0x10($sp) -/* 954AA8 80240AE8 8E060050 */ lw $a2, 0x50($s0) -/* 954AAC 80240AEC 8E470064 */ lw $a3, 0x64($s2) -/* 954AB0 80240AF0 0C00A8ED */ jal update_lerp -/* 954AB4 80240AF4 24040001 */ addiu $a0, $zero, 1 -/* 954AB8 80240AF8 C602002C */ lwc1 $f2, 0x2c($s0) -/* 954ABC 80240AFC 46001080 */ add.s $f2, $f2, $f0 -/* 954AC0 80240B00 26310001 */ addiu $s1, $s1, 1 -/* 954AC4 80240B04 2A220003 */ slti $v0, $s1, 3 -/* 954AC8 80240B08 E602002C */ swc1 $f2, 0x2c($s0) -/* 954ACC 80240B0C 1440FFE2 */ bnez $v0, .L80240A98 -/* 954AD0 80240B10 26100004 */ addiu $s0, $s0, 4 -/* 954AD4 80240B14 8E420064 */ lw $v0, 0x64($s2) -/* 954AD8 80240B18 24420001 */ addiu $v0, $v0, 1 -/* 954ADC 80240B1C AE420064 */ sw $v0, 0x64($s2) -/* 954AE0 80240B20 28420015 */ slti $v0, $v0, 0x15 -/* 954AE4 80240B24 14400005 */ bnez $v0, .L80240B3C -/* 954AE8 80240B28 0000882D */ daddu $s1, $zero, $zero -/* 954AEC 80240B2C 24020002 */ addiu $v0, $zero, 2 -.L80240B30: -/* 954AF0 80240B30 AE420004 */ sw $v0, 4($s2) -/* 954AF4 80240B34 AE400064 */ sw $zero, 0x64($s2) -/* 954AF8 80240B38 0000882D */ daddu $s1, $zero, $zero -.L80240B3C: -/* 954AFC 80240B3C 0240282D */ daddu $a1, $s2, $zero -.L80240B40: -/* 954B00 80240B40 8CA20008 */ lw $v0, 8($a1) -/* 954B04 80240B44 C4A00014 */ lwc1 $f0, 0x14($a1) -/* 954B08 80240B48 8C42000C */ lw $v0, 0xc($v0) -/* 954B0C 80240B4C E4400010 */ swc1 $f0, 0x10($v0) -/* 954B10 80240B50 8CA20008 */ lw $v0, 8($a1) -/* 954B14 80240B54 C4A00020 */ lwc1 $f0, 0x20($a1) -/* 954B18 80240B58 8C42000C */ lw $v0, 0xc($v0) -/* 954B1C 80240B5C 26310001 */ addiu $s1, $s1, 1 -/* 954B20 80240B60 E4400014 */ swc1 $f0, 0x14($v0) -/* 954B24 80240B64 8CA20008 */ lw $v0, 8($a1) -/* 954B28 80240B68 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 954B2C 80240B6C 8C42000C */ lw $v0, 0xc($v0) -/* 954B30 80240B70 E4400018 */ swc1 $f0, 0x18($v0) -/* 954B34 80240B74 2A220003 */ slti $v0, $s1, 3 -/* 954B38 80240B78 1440FFF1 */ bnez $v0, .L80240B40 -/* 954B3C 80240B7C 24A50004 */ addiu $a1, $a1, 4 -/* 954B40 80240B80 0000102D */ daddu $v0, $zero, $zero -.L80240B84: -/* 954B44 80240B84 8FBF0044 */ lw $ra, 0x44($sp) -/* 954B48 80240B88 8FB60040 */ lw $s6, 0x40($sp) -/* 954B4C 80240B8C 8FB5003C */ lw $s5, 0x3c($sp) -/* 954B50 80240B90 8FB40038 */ lw $s4, 0x38($sp) -/* 954B54 80240B94 8FB30034 */ lw $s3, 0x34($sp) -/* 954B58 80240B98 8FB20030 */ lw $s2, 0x30($sp) -/* 954B5C 80240B9C 8FB1002C */ lw $s1, 0x2c($sp) -/* 954B60 80240BA0 8FB00028 */ lw $s0, 0x28($sp) -/* 954B64 80240BA4 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 954B68 80240BA8 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 954B6C 80240BAC D7B40048 */ ldc1 $f20, 0x48($sp) -/* 954B70 80240BB0 03E00008 */ jr $ra -/* 954B74 80240BB4 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_sbk/sbk_60/func_80240040_9569F0.s b/asm/nonmatchings/world/area_sbk/sbk_60/func_80240040_9569F0.s deleted file mode 100644 index 038b02d791..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_60/func_80240040_9569F0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_956A30 -/* 956A30 80240040 8C830148 */ lw $v1, 0x148($a0) -/* 956A34 80240044 24020003 */ addiu $v0, $zero, 3 -/* 956A38 80240048 A06200B5 */ sb $v0, 0xb5($v1) -/* 956A3C 8024004C 03E00008 */ jr $ra -/* 956A40 80240050 24020002 */ addiu $v0, $zero, 2 -/* 956A44 80240054 00000000 */ nop -/* 956A48 80240058 00000000 */ nop -/* 956A4C 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_62/func_80240040_957350.s b/asm/nonmatchings/world/area_sbk/sbk_62/func_80240040_957350.s deleted file mode 100644 index 955b899d69..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_62/func_80240040_957350.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_957390 -/* 957390 80240040 8C830148 */ lw $v1, 0x148($a0) -/* 957394 80240044 24020003 */ addiu $v0, $zero, 3 -/* 957398 80240048 A06200B5 */ sb $v0, 0xb5($v1) -/* 95739C 8024004C 03E00008 */ jr $ra -/* 9573A0 80240050 24020002 */ addiu $v0, $zero, 2 -/* 9573A4 80240054 00000000 */ nop -/* 9573A8 80240058 00000000 */ nop -/* 9573AC 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_63/func_80240040_957D70.s b/asm/nonmatchings/world/area_sbk/sbk_63/func_80240040_957D70.s deleted file mode 100644 index d672fd93e4..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_63/func_80240040_957D70.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_957DB0 -/* 957DB0 80240040 8C830148 */ lw $v1, 0x148($a0) -/* 957DB4 80240044 24020003 */ addiu $v0, $zero, 3 -/* 957DB8 80240048 A06200B5 */ sb $v0, 0xb5($v1) -/* 957DBC 8024004C 03E00008 */ jr $ra -/* 957DC0 80240050 24020002 */ addiu $v0, $zero, 2 -/* 957DC4 80240054 00000000 */ nop -/* 957DC8 80240058 00000000 */ nop -/* 957DCC 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_66/func_80240040_958CB0.s b/asm/nonmatchings/world/area_sbk/sbk_66/func_80240040_958CB0.s deleted file mode 100644 index bf755fdc90..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_66/func_80240040_958CB0.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_958CF0 -/* 958CF0 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 958CF4 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 958CF8 80240048 0080982D */ daddu $s3, $a0, $zero -/* 958CFC 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 958D00 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 958D04 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 958D08 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 958D0C 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 958D10 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 958D14 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 958D18 80240068 0260202D */ daddu $a0, $s3, $zero -/* 958D1C 8024006C 8E050000 */ lw $a1, ($s0) -/* 958D20 80240070 0C0B1EAF */ jal get_variable -/* 958D24 80240074 26100004 */ addiu $s0, $s0, 4 -/* 958D28 80240078 8E050000 */ lw $a1, ($s0) -/* 958D2C 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 958D30 80240080 0260202D */ daddu $a0, $s3, $zero -/* 958D34 80240084 0C0B1EAF */ jal get_variable -/* 958D38 80240088 0040882D */ daddu $s1, $v0, $zero -/* 958D3C 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 958D40 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 958D44 80240094 8E120000 */ lw $s2, ($s0) -/* 958D48 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 958D4C 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 958D50 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 958D54 802400A4 08090030 */ j .L802400C0 -/* 958D58 802400A8 00000000 */ nop -.L802400AC: -/* 958D5C 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 958D60 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 958D64 802400B4 14400005 */ bnez $v0, .L802400CC -/* 958D68 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 958D6C 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 958D70 802400C0 0C00EABB */ jal get_npc_unsafe -/* 958D74 802400C4 00000000 */ nop -/* 958D78 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 958D7C 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 958D80 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 958D84 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 958D88 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 958D8C 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 958D90 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 958D94 802400E4 0C0B1EAF */ jal get_variable -/* 958D98 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 958D9C 802400EC 1040000C */ beqz $v0, .L80240120 -/* 958DA0 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 958DA4 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 958DA8 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 958DAC 802400FC 44810000 */ mtc1 $at, $f0 -/* 958DB0 80240100 00000000 */ nop -/* 958DB4 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 958DB8 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 958DBC 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 958DC0 80240110 44061000 */ mfc1 $a2, $f2 -/* 958DC4 80240114 0C04D083 */ jal set_item_entity_position -/* 958DC8 80240118 0280202D */ daddu $a0, $s4, $zero -/* 958DCC 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 958DD0 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 958DD4 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 958DD8 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 958DDC 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 958DE0 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 958DE4 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 958DE8 80240138 03E00008 */ jr $ra -/* 958DEC 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_66/func_80240140_958CB0.s b/asm/nonmatchings/world/area_sbk/sbk_66/func_80240140_958CB0.s deleted file mode 100644 index 529bc7bd89..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_66/func_80240140_958CB0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240140_958DF0 -/* 958DF0 80240140 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 958DF4 80240144 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 958DF8 80240148 4485A000 */ mtc1 $a1, $f20 -/* 958DFC 8024014C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 958E00 80240150 4486B000 */ mtc1 $a2, $f22 -/* 958E04 80240154 AFB00010 */ sw $s0, 0x10($sp) -/* 958E08 80240158 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 958E0C 8024015C 4487C000 */ mtc1 $a3, $f24 -/* 958E10 80240160 AFBF0014 */ sw $ra, 0x14($sp) -/* 958E14 80240164 0C019D28 */ jal guMtxIdentF -/* 958E18 80240168 0080802D */ daddu $s0, $a0, $zero -/* 958E1C 8024016C 4616A582 */ mul.s $f22, $f20, $f22 -/* 958E20 80240170 00000000 */ nop -/* 958E24 80240174 4618A502 */ mul.s $f20, $f20, $f24 -/* 958E28 80240178 00000000 */ nop -/* 958E2C 8024017C 3C013F80 */ lui $at, 0x3f80 -/* 958E30 80240180 44810000 */ mtc1 $at, $f0 -/* 958E34 80240184 00000000 */ nop -/* 958E38 80240188 E6000014 */ swc1 $f0, 0x14($s0) -/* 958E3C 8024018C E6160010 */ swc1 $f22, 0x10($s0) -/* 958E40 80240190 E6140018 */ swc1 $f20, 0x18($s0) -/* 958E44 80240194 8FBF0014 */ lw $ra, 0x14($sp) -/* 958E48 80240198 8FB00010 */ lw $s0, 0x10($sp) -/* 958E4C 8024019C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 958E50 802401A0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 958E54 802401A4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 958E58 802401A8 03E00008 */ jr $ra -/* 958E5C 802401AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_66/func_802401B0_958CB0.s b/asm/nonmatchings/world/area_sbk/sbk_66/func_802401B0_958CB0.s deleted file mode 100644 index f7619d03a3..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_66/func_802401B0_958CB0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_958E60 -/* 958E60 802401B0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 958E64 802401B4 AFB10054 */ sw $s1, 0x54($sp) -/* 958E68 802401B8 0080882D */ daddu $s1, $a0, $zero -/* 958E6C 802401BC AFBF005C */ sw $ra, 0x5c($sp) -/* 958E70 802401C0 AFB20058 */ sw $s2, 0x58($sp) -/* 958E74 802401C4 AFB00050 */ sw $s0, 0x50($sp) -/* 958E78 802401C8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 958E7C 802401CC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 958E80 802401D0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 958E84 802401D4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 958E88 802401D8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 958E8C 802401DC 8E30000C */ lw $s0, 0xc($s1) -/* 958E90 802401E0 8E050000 */ lw $a1, ($s0) -/* 958E94 802401E4 0C0B1EAF */ jal get_variable -/* 958E98 802401E8 26100004 */ addiu $s0, $s0, 4 -/* 958E9C 802401EC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 958EA0 802401F0 0040202D */ daddu $a0, $v0, $zero -/* 958EA4 802401F4 8E050000 */ lw $a1, ($s0) -/* 958EA8 802401F8 26100004 */ addiu $s0, $s0, 4 -/* 958EAC 802401FC 0220202D */ daddu $a0, $s1, $zero -/* 958EB0 80240200 0C0B210B */ jal get_float_variable -/* 958EB4 80240204 0040902D */ daddu $s2, $v0, $zero -/* 958EB8 80240208 8E050000 */ lw $a1, ($s0) -/* 958EBC 8024020C 26100004 */ addiu $s0, $s0, 4 -/* 958EC0 80240210 0220202D */ daddu $a0, $s1, $zero -/* 958EC4 80240214 0C0B210B */ jal get_float_variable -/* 958EC8 80240218 46000706 */ mov.s $f28, $f0 -/* 958ECC 8024021C 8E050000 */ lw $a1, ($s0) -/* 958ED0 80240220 26100004 */ addiu $s0, $s0, 4 -/* 958ED4 80240224 0220202D */ daddu $a0, $s1, $zero -/* 958ED8 80240228 0C0B210B */ jal get_float_variable -/* 958EDC 8024022C 46000686 */ mov.s $f26, $f0 -/* 958EE0 80240230 0220202D */ daddu $a0, $s1, $zero -/* 958EE4 80240234 8E050000 */ lw $a1, ($s0) -/* 958EE8 80240238 0C0B210B */ jal get_float_variable -/* 958EEC 8024023C 46000586 */ mov.s $f22, $f0 -/* 958EF0 80240240 0240202D */ daddu $a0, $s2, $zero -/* 958EF4 80240244 0C046B4C */ jal get_model_from_list_index -/* 958EF8 80240248 46000606 */ mov.s $f24, $f0 -/* 958EFC 8024024C 0040882D */ daddu $s1, $v0, $zero -/* 958F00 80240250 96220000 */ lhu $v0, ($s1) -/* 958F04 80240254 30420400 */ andi $v0, $v0, 0x400 -/* 958F08 80240258 1440001E */ bnez $v0, .L802402D4 -/* 958F0C 8024025C 26300058 */ addiu $s0, $s1, 0x58 -/* 958F10 80240260 4480A000 */ mtc1 $zero, $f20 -/* 958F14 80240264 4406B000 */ mfc1 $a2, $f22 -/* 958F18 80240268 4405A000 */ mfc1 $a1, $f20 -/* 958F1C 8024026C 4407A000 */ mfc1 $a3, $f20 -/* 958F20 80240270 0C019E40 */ jal guTranslateF -/* 958F24 80240274 0200202D */ daddu $a0, $s0, $zero -/* 958F28 80240278 4405E000 */ mfc1 $a1, $f28 -/* 958F2C 8024027C 4406D000 */ mfc1 $a2, $f26 -/* 958F30 80240280 4407C000 */ mfc1 $a3, $f24 -/* 958F34 80240284 0C090050 */ jal func_80240140 -/* 958F38 80240288 27A40010 */ addiu $a0, $sp, 0x10 -/* 958F3C 8024028C 27A40010 */ addiu $a0, $sp, 0x10 -/* 958F40 80240290 0200282D */ daddu $a1, $s0, $zero -/* 958F44 80240294 0C019D80 */ jal guMtxCatF -/* 958F48 80240298 0200302D */ daddu $a2, $s0, $zero -/* 958F4C 8024029C 27A40010 */ addiu $a0, $sp, 0x10 -/* 958F50 802402A0 4600B587 */ neg.s $f22, $f22 -/* 958F54 802402A4 4405A000 */ mfc1 $a1, $f20 -/* 958F58 802402A8 4406B000 */ mfc1 $a2, $f22 -/* 958F5C 802402AC 0C019E40 */ jal guTranslateF -/* 958F60 802402B0 00A0382D */ daddu $a3, $a1, $zero -/* 958F64 802402B4 27A40010 */ addiu $a0, $sp, 0x10 -/* 958F68 802402B8 0200282D */ daddu $a1, $s0, $zero -/* 958F6C 802402BC 0C019D80 */ jal guMtxCatF -/* 958F70 802402C0 00A0302D */ daddu $a2, $a1, $zero -/* 958F74 802402C4 96220000 */ lhu $v0, ($s1) -/* 958F78 802402C8 34421400 */ ori $v0, $v0, 0x1400 -/* 958F7C 802402CC 080900D3 */ j .L8024034C -/* 958F80 802402D0 A6220000 */ sh $v0, ($s1) -.L802402D4: -/* 958F84 802402D4 4480A000 */ mtc1 $zero, $f20 -/* 958F88 802402D8 4406B000 */ mfc1 $a2, $f22 -/* 958F8C 802402DC 4405A000 */ mfc1 $a1, $f20 -/* 958F90 802402E0 4407A000 */ mfc1 $a3, $f20 -/* 958F94 802402E4 0C019E40 */ jal guTranslateF -/* 958F98 802402E8 27A40010 */ addiu $a0, $sp, 0x10 -/* 958F9C 802402EC 27A40010 */ addiu $a0, $sp, 0x10 -/* 958FA0 802402F0 26300058 */ addiu $s0, $s1, 0x58 -/* 958FA4 802402F4 0200282D */ daddu $a1, $s0, $zero -/* 958FA8 802402F8 0C019D80 */ jal guMtxCatF -/* 958FAC 802402FC 0200302D */ daddu $a2, $s0, $zero -/* 958FB0 80240300 4405E000 */ mfc1 $a1, $f28 -/* 958FB4 80240304 4406D000 */ mfc1 $a2, $f26 -/* 958FB8 80240308 4407C000 */ mfc1 $a3, $f24 -/* 958FBC 8024030C 0C090050 */ jal func_80240140 -/* 958FC0 80240310 27A40010 */ addiu $a0, $sp, 0x10 -/* 958FC4 80240314 27A40010 */ addiu $a0, $sp, 0x10 -/* 958FC8 80240318 0200282D */ daddu $a1, $s0, $zero -/* 958FCC 8024031C 0C019D80 */ jal guMtxCatF -/* 958FD0 80240320 0200302D */ daddu $a2, $s0, $zero -/* 958FD4 80240324 27A40010 */ addiu $a0, $sp, 0x10 -/* 958FD8 80240328 4600B587 */ neg.s $f22, $f22 -/* 958FDC 8024032C 4405A000 */ mfc1 $a1, $f20 -/* 958FE0 80240330 4406B000 */ mfc1 $a2, $f22 -/* 958FE4 80240334 0C019E40 */ jal guTranslateF -/* 958FE8 80240338 00A0382D */ daddu $a3, $a1, $zero -/* 958FEC 8024033C 27A40010 */ addiu $a0, $sp, 0x10 -/* 958FF0 80240340 0200282D */ daddu $a1, $s0, $zero -/* 958FF4 80240344 0C019D80 */ jal guMtxCatF -/* 958FF8 80240348 00A0302D */ daddu $a2, $a1, $zero -.L8024034C: -/* 958FFC 8024034C 8FBF005C */ lw $ra, 0x5c($sp) -/* 959000 80240350 8FB20058 */ lw $s2, 0x58($sp) -/* 959004 80240354 8FB10054 */ lw $s1, 0x54($sp) -/* 959008 80240358 8FB00050 */ lw $s0, 0x50($sp) -/* 95900C 8024035C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 959010 80240360 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 959014 80240364 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 959018 80240368 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 95901C 8024036C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 959020 80240370 24020002 */ addiu $v0, $zero, 2 -/* 959024 80240374 03E00008 */ jr $ra -/* 959028 80240378 27BD0088 */ addiu $sp, $sp, 0x88 -/* 95902C 8024037C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_01/func_80240124_8694B0.s b/asm/nonmatchings/world/area_tik/tik_01/func_80240124_8694B0.s deleted file mode 100644 index f897fbcb5f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_01/func_80240124_8694B0.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_8695D4 -/* 8695D4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8695D8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 8695DC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 8695E0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 8695E4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 8695E8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 8695EC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 8695F0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 8695F4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 8695F8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 8695FC 8024014C 1440000E */ bnez $v0, .L80240188 -/* 869600 80240150 00000000 */ nop -/* 869604 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 869608 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 86960C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 869610 80240160 04610004 */ bgez $v1, .L80240174 -/* 869614 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 869618 80240168 3C020002 */ lui $v0, 2 -/* 86961C 8024016C 08090061 */ j .L80240184 -/* 869620 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 869624 80240174 3C040002 */ lui $a0, 2 -/* 869628 80240178 0083102A */ slt $v0, $a0, $v1 -/* 86962C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 869630 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 869634 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 869638 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 86963C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 869640 80240190 00000000 */ nop -/* 869644 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 869648 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 86964C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 869650 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 869654 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 869658 802401A8 3C020002 */ lui $v0, 2 -/* 86965C 802401AC 08090071 */ j .L802401C4 -/* 869660 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 869664 802401B4 3C040002 */ lui $a0, 2 -/* 869668 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 86966C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 869670 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 869674 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 869678 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 86967C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 869680 802401D0 00000000 */ nop -/* 869684 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 869688 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 86968C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 869690 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 869694 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 869698 802401E8 3C020002 */ lui $v0, 2 -/* 86969C 802401EC 08090081 */ j .L80240204 -/* 8696A0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 8696A4 802401F4 3C040002 */ lui $a0, 2 -/* 8696A8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 8696AC 802401FC 10400002 */ beqz $v0, .L80240208 -/* 8696B0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 8696B4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 8696B8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 8696BC 8024020C 1440000E */ bnez $v0, .L80240248 -/* 8696C0 80240210 00000000 */ nop -/* 8696C4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8696C8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 8696CC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 8696D0 80240220 04610004 */ bgez $v1, .L80240234 -/* 8696D4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8696D8 80240228 3C020002 */ lui $v0, 2 -/* 8696DC 8024022C 08090091 */ j .L80240244 -/* 8696E0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 8696E4 80240234 3C040002 */ lui $a0, 2 -/* 8696E8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 8696EC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 8696F0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 8696F4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 8696F8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 8696FC 8024024C 0C046F07 */ jal set_main_pan_u -/* 869700 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 869704 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 869708 80240258 0C046F0D */ jal set_main_pan_v -/* 86970C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 869710 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 869714 80240264 0C046F13 */ jal set_aux_pan_u -/* 869718 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 86971C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 869720 80240270 0C046F19 */ jal set_aux_pan_v -/* 869724 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 869728 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 86972C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 869730 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 869734 80240284 24420001 */ addiu $v0, $v0, 1 -/* 869738 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 86973C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 869740 80240290 24630001 */ addiu $v1, $v1, 1 -/* 869744 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 869748 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 86974C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 869750 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 869754 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 869758 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 86975C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 869760 802402B0 14600002 */ bnez $v1, .L802402BC -/* 869764 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 869768 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 86976C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 869770 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 869774 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 869778 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 86977C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 869780 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 869784 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 869788 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 86978C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 869790 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 869794 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 869798 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 86979C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 8697A0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 8697A4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 8697A8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8697AC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 8697B0 80240300 0000102D */ daddu $v0, $zero, $zero -/* 8697B4 80240304 03E00008 */ jr $ra -/* 8697B8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_01/func_8024030C_8694B0.s b/asm/nonmatchings/world/area_tik/tik_01/func_8024030C_8694B0.s deleted file mode 100644 index 1ab34592aa..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_01/func_8024030C_8694B0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_8697BC -/* 8697BC 8024030C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8697C0 80240310 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8697C4 80240314 8C430004 */ lw $v1, 4($v0) -/* 8697C8 80240318 3C040010 */ lui $a0, 0x10 -/* 8697CC 8024031C 00641825 */ or $v1, $v1, $a0 -/* 8697D0 80240320 AC430004 */ sw $v1, 4($v0) -/* 8697D4 80240324 03E00008 */ jr $ra -/* 8697D8 80240328 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_01/func_802405F0_8694B0.s b/asm/nonmatchings/world/area_tik/tik_01/func_802405F0_8694B0.s deleted file mode 100644 index 569e8bb93d..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_01/func_802405F0_8694B0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_869AA0 -/* 869AA0 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 869AA4 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 869AA8 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 869AAC 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 869AB0 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 869AB4 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 869AB8 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 869ABC 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 869AC0 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 869AC4 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 869AC8 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 869ACC 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 869AD0 80240620 0C0B1EAF */ jal get_variable -/* 869AD4 80240624 8C450000 */ lw $a1, ($v0) -/* 869AD8 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 869ADC 8024062C 0C00EABB */ jal get_npc_unsafe -/* 869AE0 80240630 0040802D */ daddu $s0, $v0, $zero -/* 869AE4 80240634 0200202D */ daddu $a0, $s0, $zero -/* 869AE8 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 869AEC 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 869AF0 80240640 0C046B4C */ jal get_model_from_list_index -/* 869AF4 80240644 0040202D */ daddu $a0, $v0, $zero -/* 869AF8 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 869AFC 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 869B00 80240650 0040902D */ daddu $s2, $v0, $zero -/* 869B04 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 869B08 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 869B0C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 869B10 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 869B14 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 869B18 80240668 00000000 */ nop -/* 869B1C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 869B20 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 869B24 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 869B28 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 869B2C 8024067C 00000000 */ nop -/* 869B30 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 869B34 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 869B38 80240688 44820000 */ mtc1 $v0, $f0 -/* 869B3C 8024068C 00000000 */ nop -/* 869B40 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 869B44 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 869B48 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 869B4C 8024069C 44810000 */ mtc1 $at, $f0 -/* 869B50 802406A0 00000000 */ nop -/* 869B54 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 869B58 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 869B5C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 869B60 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 869B64 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 869B68 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 869B6C 802406BC 00000000 */ nop -/* 869B70 802406C0 45010004 */ bc1t .L802406D4 -/* 869B74 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 869B78 802406C8 0C0187BC */ jal sqrtf -/* 869B7C 802406CC 00000000 */ nop -/* 869B80 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 869B84 802406D4 44800000 */ mtc1 $zero, $f0 -/* 869B88 802406D8 00000000 */ nop -/* 869B8C 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 869B90 802406E0 00000000 */ nop -/* 869B94 802406E4 45000016 */ bc1f .L80240740 -/* 869B98 802406E8 46001106 */ mov.s $f4, $f2 -/* 869B9C 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 869BA0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 869BA4 802406F4 00000000 */ nop -/* 869BA8 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 869BAC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 869BB0 80240700 00000000 */ nop -/* 869BB4 80240704 4500000E */ bc1f .L80240740 -/* 869BB8 80240708 00000000 */ nop -/* 869BBC 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 869BC0 80240710 3C013F00 */ lui $at, 0x3f00 -/* 869BC4 80240714 44811000 */ mtc1 $at, $f2 -/* 869BC8 80240718 44820000 */ mtc1 $v0, $f0 -/* 869BCC 8024071C 00000000 */ nop -/* 869BD0 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 869BD4 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 869BD8 80240728 00000000 */ nop -/* 869BDC 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 869BE0 80240730 00000000 */ nop -/* 869BE4 80240734 45000002 */ bc1f .L80240740 -/* 869BE8 80240738 24020001 */ addiu $v0, $zero, 1 -/* 869BEC 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 869BF0 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 869BF4 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 869BF8 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 869BFC 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 869C00 80240750 00000000 */ nop -/* 869C04 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 869C08 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 869C0C 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 869C10 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 869C14 80240764 00000000 */ nop -/* 869C18 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 869C1C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 869C20 80240770 44820000 */ mtc1 $v0, $f0 -/* 869C24 80240774 00000000 */ nop -/* 869C28 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 869C2C 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 869C30 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 869C34 80240784 44810000 */ mtc1 $at, $f0 -/* 869C38 80240788 00000000 */ nop -/* 869C3C 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 869C40 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 869C44 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 869C48 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 869C4C 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 869C50 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 869C54 802407A4 00000000 */ nop -/* 869C58 802407A8 45010004 */ bc1t .L802407BC -/* 869C5C 802407AC 00000000 */ nop -/* 869C60 802407B0 0C0187BC */ jal sqrtf -/* 869C64 802407B4 00000000 */ nop -/* 869C68 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 869C6C 802407BC 44800000 */ mtc1 $zero, $f0 -/* 869C70 802407C0 00000000 */ nop -/* 869C74 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 869C78 802407C8 00000000 */ nop -/* 869C7C 802407CC 45000016 */ bc1f .L80240828 -/* 869C80 802407D0 46001106 */ mov.s $f4, $f2 -/* 869C84 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 869C88 802407D8 44820000 */ mtc1 $v0, $f0 -/* 869C8C 802407DC 00000000 */ nop -/* 869C90 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 869C94 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 869C98 802407E8 00000000 */ nop -/* 869C9C 802407EC 4500000F */ bc1f .L8024082C -/* 869CA0 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 869CA4 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 869CA8 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 869CAC 802407FC 44811000 */ mtc1 $at, $f2 -/* 869CB0 80240800 44820000 */ mtc1 $v0, $f0 -/* 869CB4 80240804 00000000 */ nop -/* 869CB8 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 869CBC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 869CC0 80240810 00000000 */ nop -/* 869CC4 80240814 4600203C */ c.lt.s $f4, $f0 -/* 869CC8 80240818 00000000 */ nop -/* 869CCC 8024081C 45000003 */ bc1f .L8024082C -/* 869CD0 80240820 24020001 */ addiu $v0, $zero, 1 -/* 869CD4 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 869CD8 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 869CDC 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 869CE0 80240830 4481D000 */ mtc1 $at, $f26 -/* 869CE4 80240834 4480C000 */ mtc1 $zero, $f24 -/* 869CE8 80240838 3C013F00 */ lui $at, 0x3f00 -/* 869CEC 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 869CF0 80240840 0C00EAD2 */ jal get_npc_safe -/* 869CF4 80240844 0220202D */ daddu $a0, $s1, $zero -/* 869CF8 80240848 0040802D */ daddu $s0, $v0, $zero -/* 869CFC 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 869D00 80240850 26310001 */ addiu $s1, $s1, 1 -/* 869D04 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 869D08 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 869D0C 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 869D10 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 869D14 80240864 00000000 */ nop -/* 869D18 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 869D1C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 869D20 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 869D24 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 869D28 80240878 00000000 */ nop -/* 869D2C 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 869D30 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 869D34 80240884 44820000 */ mtc1 $v0, $f0 -/* 869D38 80240888 00000000 */ nop -/* 869D3C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 869D40 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 869D44 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 869D48 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 869D4C 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 869D50 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 869D54 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 869D58 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 869D5C 802408AC 00000000 */ nop -/* 869D60 802408B0 45010003 */ bc1t .L802408C0 -/* 869D64 802408B4 00000000 */ nop -/* 869D68 802408B8 0C0187BC */ jal sqrtf -/* 869D6C 802408BC 00000000 */ nop -.L802408C0: -/* 869D70 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 869D74 802408C4 00000000 */ nop -/* 869D78 802408C8 45000015 */ bc1f .L80240920 -/* 869D7C 802408CC 46000106 */ mov.s $f4, $f0 -/* 869D80 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 869D84 802408D4 44820000 */ mtc1 $v0, $f0 -/* 869D88 802408D8 00000000 */ nop -/* 869D8C 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 869D90 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 869D94 802408E4 00000000 */ nop -/* 869D98 802408E8 4500000E */ bc1f .L80240924 -/* 869D9C 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 869DA0 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 869DA4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 869DA8 802408F8 00000000 */ nop -/* 869DAC 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 869DB0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 869DB4 80240904 00000000 */ nop -/* 869DB8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 869DBC 8024090C 00000000 */ nop -/* 869DC0 80240910 45000004 */ bc1f .L80240924 -/* 869DC4 80240914 24020001 */ addiu $v0, $zero, 1 -/* 869DC8 80240918 0809024C */ j .L80240930 -/* 869DCC 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 869DD0 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 869DD4 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 869DD8 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 869DDC 8024092C 00000000 */ nop -.L80240930: -/* 869DE0 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 869DE4 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 869DE8 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 869DEC 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 869DF0 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 869DF4 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 869DF8 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 869DFC 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 869E00 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 869E04 80240954 24020002 */ addiu $v0, $zero, 2 -/* 869E08 80240958 03E00008 */ jr $ra -/* 869E0C 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_02/func_80240124_86C740.s b/asm/nonmatchings/world/area_tik/tik_02/func_80240124_86C740.s deleted file mode 100644 index 9cdf16ab96..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_02/func_80240124_86C740.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_86C864 -/* 86C864 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 86C868 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 86C86C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 86C870 80240130 10A00005 */ beqz $a1, .L80240148 -/* 86C874 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 86C878 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 86C87C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 86C880 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 86C884 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 86C888 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 86C88C 8024014C 1440000E */ bnez $v0, .L80240188 -/* 86C890 80240150 00000000 */ nop -/* 86C894 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 86C898 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 86C89C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 86C8A0 80240160 04610004 */ bgez $v1, .L80240174 -/* 86C8A4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 86C8A8 80240168 3C020002 */ lui $v0, 2 -/* 86C8AC 8024016C 08090061 */ j .L80240184 -/* 86C8B0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 86C8B4 80240174 3C040002 */ lui $a0, 2 -/* 86C8B8 80240178 0083102A */ slt $v0, $a0, $v1 -/* 86C8BC 8024017C 10400002 */ beqz $v0, .L80240188 -/* 86C8C0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 86C8C4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 86C8C8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 86C8CC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 86C8D0 80240190 00000000 */ nop -/* 86C8D4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 86C8D8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 86C8DC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 86C8E0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 86C8E4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 86C8E8 802401A8 3C020002 */ lui $v0, 2 -/* 86C8EC 802401AC 08090071 */ j .L802401C4 -/* 86C8F0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 86C8F4 802401B4 3C040002 */ lui $a0, 2 -/* 86C8F8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 86C8FC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 86C900 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 86C904 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 86C908 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 86C90C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 86C910 802401D0 00000000 */ nop -/* 86C914 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 86C918 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 86C91C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 86C920 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 86C924 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 86C928 802401E8 3C020002 */ lui $v0, 2 -/* 86C92C 802401EC 08090081 */ j .L80240204 -/* 86C930 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 86C934 802401F4 3C040002 */ lui $a0, 2 -/* 86C938 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 86C93C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 86C940 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 86C944 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 86C948 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 86C94C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 86C950 80240210 00000000 */ nop -/* 86C954 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 86C958 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 86C95C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 86C960 80240220 04610004 */ bgez $v1, .L80240234 -/* 86C964 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 86C968 80240228 3C020002 */ lui $v0, 2 -/* 86C96C 8024022C 08090091 */ j .L80240244 -/* 86C970 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 86C974 80240234 3C040002 */ lui $a0, 2 -/* 86C978 80240238 0083102A */ slt $v0, $a0, $v1 -/* 86C97C 8024023C 10400002 */ beqz $v0, .L80240248 -/* 86C980 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 86C984 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 86C988 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 86C98C 8024024C 0C046F07 */ jal set_main_pan_u -/* 86C990 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 86C994 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 86C998 80240258 0C046F0D */ jal set_main_pan_v -/* 86C99C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 86C9A0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 86C9A4 80240264 0C046F13 */ jal set_aux_pan_u -/* 86C9A8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 86C9AC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 86C9B0 80240270 0C046F19 */ jal set_aux_pan_v -/* 86C9B4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 86C9B8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 86C9BC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 86C9C0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 86C9C4 80240284 24420001 */ addiu $v0, $v0, 1 -/* 86C9C8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 86C9CC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 86C9D0 80240290 24630001 */ addiu $v1, $v1, 1 -/* 86C9D4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 86C9D8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 86C9DC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 86C9E0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 86C9E4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 86C9E8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 86C9EC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 86C9F0 802402B0 14600002 */ bnez $v1, .L802402BC -/* 86C9F4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 86C9F8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 86C9FC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 86CA00 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 86CA04 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 86CA08 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 86CA0C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 86CA10 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 86CA14 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 86CA18 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 86CA1C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 86CA20 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 86CA24 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 86CA28 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 86CA2C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 86CA30 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 86CA34 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 86CA38 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 86CA3C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 86CA40 80240300 0000102D */ daddu $v0, $zero, $zero -/* 86CA44 80240304 03E00008 */ jr $ra -/* 86CA48 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 86CA4C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_02/func_80240578_86C740.s b/asm/nonmatchings/world/area_tik/tik_02/func_80240578_86C740.s deleted file mode 100644 index 7138223922..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_02/func_80240578_86C740.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240578_86CCB8 -/* 86CCB8 80240578 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 86CCBC 8024057C AFB00010 */ sw $s0, 0x10($sp) -/* 86CCC0 80240580 0080802D */ daddu $s0, $a0, $zero -/* 86CCC4 80240584 AFBF0014 */ sw $ra, 0x14($sp) -/* 86CCC8 80240588 8E02000C */ lw $v0, 0xc($s0) -/* 86CCCC 8024058C 0C0B1EAF */ jal get_variable -/* 86CCD0 80240590 8C450000 */ lw $a1, ($v0) -/* 86CCD4 80240594 00021140 */ sll $v0, $v0, 5 -/* 86CCD8 80240598 AE000084 */ sw $zero, 0x84($s0) -/* 86CCDC 8024059C 3C018008 */ lui $at, 0x8008 -/* 86CCE0 802405A0 00220821 */ addu $at, $at, $v0 -/* 86CCE4 802405A4 942278F8 */ lhu $v0, 0x78f8($at) -/* 86CCE8 802405A8 30420040 */ andi $v0, $v0, 0x40 -/* 86CCEC 802405AC 10400002 */ beqz $v0, .L802405B8 -/* 86CCF0 802405B0 24020001 */ addiu $v0, $zero, 1 -/* 86CCF4 802405B4 AE020084 */ sw $v0, 0x84($s0) -.L802405B8: -/* 86CCF8 802405B8 8FBF0014 */ lw $ra, 0x14($sp) -/* 86CCFC 802405BC 8FB00010 */ lw $s0, 0x10($sp) -/* 86CD00 802405C0 24020002 */ addiu $v0, $zero, 2 -/* 86CD04 802405C4 03E00008 */ jr $ra -/* 86CD08 802405C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 86CD0C 802405CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_03/func_80240020_86EB00.s b/asm/nonmatchings/world/area_tik/tik_03/func_80240020_86EB00.s deleted file mode 100644 index a283e38cba..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/func_80240020_86EB00.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_86EB20 -/* 86EB20 80240020 3C028016 */ lui $v0, 0x8016 -/* 86EB24 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 86EB28 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 86EB2C 8024002C 03E00008 */ jr $ra -/* 86EB30 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_03/func_80240034_86EB00.s b/asm/nonmatchings/world/area_tik/tik_03/func_80240034_86EB00.s deleted file mode 100644 index d8ae5b410e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/func_80240034_86EB00.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_86EB34 -/* 86EB34 80240034 3C038016 */ lui $v1, 0x8016 -/* 86EB38 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* 86EB3C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 86EB40 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 86EB44 80240044 0080802D */ daddu $s0, $a0, $zero -/* 86EB48 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* 86EB4C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 86EB50 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* 86EB54 80240054 24020002 */ addiu $v0, $zero, 2 -/* 86EB58 80240058 08090038 */ j .L802400E0 -/* 86EB5C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* 86EB60 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 86EB64 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 86EB68 80240068 80620040 */ lb $v0, 0x40($v1) -/* 86EB6C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* 86EB70 80240070 04420001 */ bltzl $v0, .L80240078 -/* 86EB74 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* 86EB78 80240078 14400003 */ bnez $v0, .L80240088 -/* 86EB7C 8024007C 00000000 */ nop -/* 86EB80 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* 86EB84 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* 86EB88 80240088 44822000 */ mtc1 $v0, $f4 -/* 86EB8C 8024008C 00000000 */ nop -/* 86EB90 80240090 46802120 */ cvt.s.w $f4, $f4 -/* 86EB94 80240094 44062000 */ mfc1 $a2, $f4 -/* 86EB98 80240098 44872000 */ mtc1 $a3, $f4 -/* 86EB9C 8024009C 00000000 */ nop -/* 86EBA0 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* 86EBA4 802400A4 44806000 */ mtc1 $zero, $f12 -/* 86EBA8 802400A8 44072000 */ mfc1 $a3, $f4 -/* 86EBAC 802400AC 0C00A720 */ jal atan2 -/* 86EBB0 802400B0 46006386 */ mov.s $f14, $f12 -/* 86EBB4 802400B4 3C014270 */ lui $at, 0x4270 -/* 86EBB8 802400B8 44811000 */ mtc1 $at, $f2 -/* 86EBBC 802400BC 00000000 */ nop -/* 86EBC0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 86EBC4 802400C4 00000000 */ nop -/* 86EBC8 802400C8 45000004 */ bc1f .L802400DC -/* 86EBCC 802400CC 24020001 */ addiu $v0, $zero, 1 -/* 86EBD0 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* 86EBD4 802400D4 08090038 */ j .L802400E0 -/* 86EBD8 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* 86EBDC 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* 86EBE0 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 86EBE4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 86EBE8 802400E8 03E00008 */ jr $ra -/* 86EBEC 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_03/func_802400F0_86EB00.s b/asm/nonmatchings/world/area_tik/tik_03/func_802400F0_86EB00.s deleted file mode 100644 index 7eb8c52cff..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/func_802400F0_86EB00.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_86EBF0 -/* 86EBF0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 86EBF4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 86EBF8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 86EBFC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 86EC00 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 86EC04 80240104 0C016AFA */ jal get_current_map_header -/* 86EC08 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 86EC0C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 86EC10 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 86EC14 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 86EC18 80240118 0C0B1EAF */ jal get_variable -/* 86EC1C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 86EC20 80240120 0220202D */ daddu $a0, $s1, $zero -/* 86EC24 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 86EC28 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 86EC2C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 86EC30 80240130 02031821 */ addu $v1, $s0, $v1 -/* 86EC34 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 86EC38 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 86EC3C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 86EC40 80240140 0C0B2026 */ jal set_variable -/* 86EC44 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 86EC48 80240148 0220202D */ daddu $a0, $s1, $zero -/* 86EC4C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 86EC50 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 86EC54 80240154 02021021 */ addu $v0, $s0, $v0 -/* 86EC58 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 86EC5C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 86EC60 80240160 44061000 */ mfc1 $a2, $f2 -/* 86EC64 80240164 0C0B2026 */ jal set_variable -/* 86EC68 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 86EC6C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 86EC70 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 86EC74 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 86EC78 80240178 02021021 */ addu $v0, $s0, $v0 -/* 86EC7C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 86EC80 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 86EC84 80240184 44061000 */ mfc1 $a2, $f2 -/* 86EC88 80240188 0C0B2026 */ jal set_variable -/* 86EC8C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 86EC90 80240190 0220202D */ daddu $a0, $s1, $zero -/* 86EC94 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 86EC98 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 86EC9C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 86ECA0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 86ECA4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 86ECA8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 86ECAC 802401AC 0C0B2026 */ jal set_variable -/* 86ECB0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 86ECB4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 86ECB8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 86ECBC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 86ECC0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 86ECC4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 86ECC8 802401C8 03E00008 */ jr $ra -/* 86ECCC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_03/func_802401D0_86EB00.s b/asm/nonmatchings/world/area_tik/tik_03/func_802401D0_86EB00.s deleted file mode 100644 index f08ca3d01e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/func_802401D0_86EB00.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_86ECD0 -/* 86ECD0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 86ECD4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 86ECD8 802401D8 3C014334 */ lui $at, 0x4334 -/* 86ECDC 802401DC 44816000 */ mtc1 $at, $f12 -/* 86ECE0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 86ECE4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 86ECE8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 86ECEC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 86ECF0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 86ECF4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 86ECF8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 86ECFC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 86ED00 80240200 00431021 */ addu $v0, $v0, $v1 -/* 86ED04 80240204 000210C0 */ sll $v0, $v0, 3 -/* 86ED08 80240208 3C01800B */ lui $at, 0x800b -/* 86ED0C 8024020C 00220821 */ addu $at, $at, $v0 -/* 86ED10 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 86ED14 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 86ED18 80240218 0C00A6C9 */ jal clamp_angle -/* 86ED1C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 86ED20 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 86ED24 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 86ED28 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 86ED2C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 86ED30 80240230 24020002 */ addiu $v0, $zero, 2 -/* 86ED34 80240234 03E00008 */ jr $ra -/* 86ED38 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_03/func_8024023C_86EB00.s b/asm/nonmatchings/world/area_tik/tik_03/func_8024023C_86EB00.s deleted file mode 100644 index f4b2c4a379..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/func_8024023C_86EB00.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_86ED3C -/* 86ED3C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 86ED40 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 86ED44 80240244 0080802D */ daddu $s0, $a0, $zero -/* 86ED48 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 86ED4C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 86ED50 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 86ED54 80240254 0C0B210B */ jal get_float_variable -/* 86ED58 80240258 8C450000 */ lw $a1, ($v0) -/* 86ED5C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 86ED60 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 86ED64 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 86ED68 80240268 44060000 */ mfc1 $a2, $f0 -/* 86ED6C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 86ED70 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 86ED74 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 86ED78 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 86ED7C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 86ED80 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 86ED84 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 86ED88 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 86ED8C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 86ED90 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 86ED94 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 86ED98 80240298 0C0B2190 */ jal set_float_variable -/* 86ED9C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 86EDA0 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 86EDA4 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 86EDA8 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 86EDAC 802402AC 0C0B2190 */ jal set_float_variable -/* 86EDB0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 86EDB4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 86EDB8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 86EDBC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 86EDC0 802402C0 0C0B2190 */ jal set_float_variable -/* 86EDC4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 86EDC8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 86EDCC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 86EDD0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 86EDD4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 86EDD8 802402D8 03E00008 */ jr $ra -/* 86EDDC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_03/func_802402E0_86EB00.s b/asm/nonmatchings/world/area_tik/tik_03/func_802402E0_86EB00.s deleted file mode 100644 index 23d3b5b296..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/func_802402E0_86EB00.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_86EDE0 -/* 86EDE0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 86EDE4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 86EDE8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 86EDEC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 86EDF0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 86EDF4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 86EDF8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 86EDFC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 86EE00 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 86EE04 80240304 3C020002 */ lui $v0, 2 -/* 86EE08 80240308 080900C8 */ j .L80240320 -/* 86EE0C 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 86EE10 80240310 3C040002 */ lui $a0, 2 -/* 86EE14 80240314 0083102A */ slt $v0, $a0, $v1 -/* 86EE18 80240318 10400002 */ beqz $v0, .L80240324 -/* 86EE1C 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 86EE20 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 86EE24 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 86EE28 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 86EE2C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 86EE30 80240330 04610004 */ bgez $v1, .L80240344 -/* 86EE34 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 86EE38 80240338 3C020002 */ lui $v0, 2 -/* 86EE3C 8024033C 080900D5 */ j .L80240354 -/* 86EE40 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 86EE44 80240344 3C040002 */ lui $a0, 2 -/* 86EE48 80240348 0083102A */ slt $v0, $a0, $v1 -/* 86EE4C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 86EE50 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 86EE54 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 86EE58 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 86EE5C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 86EE60 80240360 00621821 */ addu $v1, $v1, $v0 -/* 86EE64 80240364 04610004 */ bgez $v1, .L80240378 -/* 86EE68 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 86EE6C 8024036C 3C020002 */ lui $v0, 2 -/* 86EE70 80240370 080900E2 */ j .L80240388 -/* 86EE74 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 86EE78 80240378 3C040002 */ lui $a0, 2 -/* 86EE7C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 86EE80 80240380 10400002 */ beqz $v0, .L8024038C -/* 86EE84 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 86EE88 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 86EE8C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 86EE90 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 86EE94 80240394 00621821 */ addu $v1, $v1, $v0 -/* 86EE98 80240398 04610004 */ bgez $v1, .L802403AC -/* 86EE9C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 86EEA0 802403A0 3C020002 */ lui $v0, 2 -/* 86EEA4 802403A4 080900EF */ j .L802403BC -/* 86EEA8 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 86EEAC 802403AC 3C040002 */ lui $a0, 2 -/* 86EEB0 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 86EEB4 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 86EEB8 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 86EEBC 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 86EEC0 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 86EEC4 802403C4 0C046F07 */ jal set_main_pan_u -/* 86EEC8 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 86EECC 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 86EED0 802403D0 0C046F0D */ jal set_main_pan_v -/* 86EED4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 86EED8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 86EEDC 802403DC 0C046F13 */ jal set_aux_pan_u -/* 86EEE0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 86EEE4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 86EEE8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 86EEEC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 86EEF0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 86EEF4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 86EEF8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 86EEFC 802403FC 03E00008 */ jr $ra -/* 86EF00 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_03/func_80240404_86EB00.s b/asm/nonmatchings/world/area_tik/tik_03/func_80240404_86EB00.s deleted file mode 100644 index 6d58242c38..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/func_80240404_86EB00.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_86EF04 -/* 86EF04 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 86EF08 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 86EF0C 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 86EF10 80240410 10A00005 */ beqz $a1, .L80240428 -/* 86EF14 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 86EF18 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 86EF1C 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 86EF20 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 86EF24 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 86EF28 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 86EF2C 8024042C 1440000E */ bnez $v0, .L80240468 -/* 86EF30 80240430 00000000 */ nop -/* 86EF34 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 86EF38 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 86EF3C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 86EF40 80240440 04610004 */ bgez $v1, .L80240454 -/* 86EF44 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 86EF48 80240448 3C020002 */ lui $v0, 2 -/* 86EF4C 8024044C 08090119 */ j .L80240464 -/* 86EF50 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 86EF54 80240454 3C040002 */ lui $a0, 2 -/* 86EF58 80240458 0083102A */ slt $v0, $a0, $v1 -/* 86EF5C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 86EF60 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 86EF64 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 86EF68 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 86EF6C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 86EF70 80240470 00000000 */ nop -/* 86EF74 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 86EF78 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 86EF7C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 86EF80 80240480 04610004 */ bgez $v1, .L80240494 -/* 86EF84 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 86EF88 80240488 3C020002 */ lui $v0, 2 -/* 86EF8C 8024048C 08090129 */ j .L802404A4 -/* 86EF90 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 86EF94 80240494 3C040002 */ lui $a0, 2 -/* 86EF98 80240498 0083102A */ slt $v0, $a0, $v1 -/* 86EF9C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 86EFA0 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 86EFA4 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 86EFA8 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 86EFAC 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 86EFB0 802404B0 00000000 */ nop -/* 86EFB4 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 86EFB8 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 86EFBC 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 86EFC0 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 86EFC4 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 86EFC8 802404C8 3C020002 */ lui $v0, 2 -/* 86EFCC 802404CC 08090139 */ j .L802404E4 -/* 86EFD0 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 86EFD4 802404D4 3C040002 */ lui $a0, 2 -/* 86EFD8 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 86EFDC 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 86EFE0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 86EFE4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 86EFE8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 86EFEC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 86EFF0 802404F0 00000000 */ nop -/* 86EFF4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 86EFF8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 86EFFC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 86F000 80240500 04610004 */ bgez $v1, .L80240514 -/* 86F004 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 86F008 80240508 3C020002 */ lui $v0, 2 -/* 86F00C 8024050C 08090149 */ j .L80240524 -/* 86F010 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 86F014 80240514 3C040002 */ lui $a0, 2 -/* 86F018 80240518 0083102A */ slt $v0, $a0, $v1 -/* 86F01C 8024051C 10400002 */ beqz $v0, .L80240528 -/* 86F020 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 86F024 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 86F028 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 86F02C 8024052C 0C046F07 */ jal set_main_pan_u -/* 86F030 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 86F034 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 86F038 80240538 0C046F0D */ jal set_main_pan_v -/* 86F03C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 86F040 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 86F044 80240544 0C046F13 */ jal set_aux_pan_u -/* 86F048 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 86F04C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 86F050 80240550 0C046F19 */ jal set_aux_pan_v -/* 86F054 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 86F058 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 86F05C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 86F060 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 86F064 80240564 24420001 */ addiu $v0, $v0, 1 -/* 86F068 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 86F06C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 86F070 80240570 24630001 */ addiu $v1, $v1, 1 -/* 86F074 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 86F078 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 86F07C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 86F080 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 86F084 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 86F088 80240588 0064182A */ slt $v1, $v1, $a0 -/* 86F08C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 86F090 80240590 14600002 */ bnez $v1, .L8024059C -/* 86F094 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 86F098 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 86F09C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 86F0A0 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 86F0A4 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 86F0A8 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 86F0AC 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 86F0B0 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 86F0B4 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 86F0B8 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 86F0BC 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 86F0C0 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 86F0C4 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 86F0C8 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 86F0CC 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 86F0D0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 86F0D4 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 86F0D8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 86F0DC 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 86F0E0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 86F0E4 802405E4 03E00008 */ jr $ra -/* 86F0E8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 86F0EC 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_03/func_802405F0_86EB00.s b/asm/nonmatchings/world/area_tik/tik_03/func_802405F0_86EB00.s deleted file mode 100644 index 9ba1670b85..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/func_802405F0_86EB00.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_86F0F0 -/* 86F0F0 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 86F0F4 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 86F0F8 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 86F0FC 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 86F100 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 86F104 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 86F108 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 86F10C 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 86F110 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 86F114 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 86F118 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 86F11C 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 86F120 80240620 0C0B1EAF */ jal get_variable -/* 86F124 80240624 8C450000 */ lw $a1, ($v0) -/* 86F128 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 86F12C 8024062C 0C00EABB */ jal get_npc_unsafe -/* 86F130 80240630 0040802D */ daddu $s0, $v0, $zero -/* 86F134 80240634 0200202D */ daddu $a0, $s0, $zero -/* 86F138 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 86F13C 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 86F140 80240640 0C046B4C */ jal get_model_from_list_index -/* 86F144 80240644 0040202D */ daddu $a0, $v0, $zero -/* 86F148 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 86F14C 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 86F150 80240650 0040902D */ daddu $s2, $v0, $zero -/* 86F154 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 86F158 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 86F15C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 86F160 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 86F164 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 86F168 80240668 00000000 */ nop -/* 86F16C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 86F170 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 86F174 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 86F178 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 86F17C 8024067C 00000000 */ nop -/* 86F180 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 86F184 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 86F188 80240688 44820000 */ mtc1 $v0, $f0 -/* 86F18C 8024068C 00000000 */ nop -/* 86F190 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 86F194 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 86F198 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 86F19C 8024069C 44810000 */ mtc1 $at, $f0 -/* 86F1A0 802406A0 00000000 */ nop -/* 86F1A4 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 86F1A8 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 86F1AC 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 86F1B0 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 86F1B4 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 86F1B8 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 86F1BC 802406BC 00000000 */ nop -/* 86F1C0 802406C0 45010004 */ bc1t .L802406D4 -/* 86F1C4 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 86F1C8 802406C8 0C0187BC */ jal sqrtf -/* 86F1CC 802406CC 00000000 */ nop -/* 86F1D0 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 86F1D4 802406D4 44800000 */ mtc1 $zero, $f0 -/* 86F1D8 802406D8 00000000 */ nop -/* 86F1DC 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 86F1E0 802406E0 00000000 */ nop -/* 86F1E4 802406E4 45000016 */ bc1f .L80240740 -/* 86F1E8 802406E8 46001106 */ mov.s $f4, $f2 -/* 86F1EC 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 86F1F0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 86F1F4 802406F4 00000000 */ nop -/* 86F1F8 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 86F1FC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 86F200 80240700 00000000 */ nop -/* 86F204 80240704 4500000E */ bc1f .L80240740 -/* 86F208 80240708 00000000 */ nop -/* 86F20C 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 86F210 80240710 3C013F00 */ lui $at, 0x3f00 -/* 86F214 80240714 44811000 */ mtc1 $at, $f2 -/* 86F218 80240718 44820000 */ mtc1 $v0, $f0 -/* 86F21C 8024071C 00000000 */ nop -/* 86F220 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 86F224 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 86F228 80240728 00000000 */ nop -/* 86F22C 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 86F230 80240730 00000000 */ nop -/* 86F234 80240734 45000002 */ bc1f .L80240740 -/* 86F238 80240738 24020001 */ addiu $v0, $zero, 1 -/* 86F23C 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 86F240 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 86F244 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 86F248 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 86F24C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 86F250 80240750 00000000 */ nop -/* 86F254 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 86F258 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 86F25C 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 86F260 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 86F264 80240764 00000000 */ nop -/* 86F268 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 86F26C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 86F270 80240770 44820000 */ mtc1 $v0, $f0 -/* 86F274 80240774 00000000 */ nop -/* 86F278 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 86F27C 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 86F280 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 86F284 80240784 44810000 */ mtc1 $at, $f0 -/* 86F288 80240788 00000000 */ nop -/* 86F28C 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 86F290 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 86F294 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 86F298 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 86F29C 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 86F2A0 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 86F2A4 802407A4 00000000 */ nop -/* 86F2A8 802407A8 45010004 */ bc1t .L802407BC -/* 86F2AC 802407AC 00000000 */ nop -/* 86F2B0 802407B0 0C0187BC */ jal sqrtf -/* 86F2B4 802407B4 00000000 */ nop -/* 86F2B8 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 86F2BC 802407BC 44800000 */ mtc1 $zero, $f0 -/* 86F2C0 802407C0 00000000 */ nop -/* 86F2C4 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 86F2C8 802407C8 00000000 */ nop -/* 86F2CC 802407CC 45000016 */ bc1f .L80240828 -/* 86F2D0 802407D0 46001106 */ mov.s $f4, $f2 -/* 86F2D4 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 86F2D8 802407D8 44820000 */ mtc1 $v0, $f0 -/* 86F2DC 802407DC 00000000 */ nop -/* 86F2E0 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 86F2E4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 86F2E8 802407E8 00000000 */ nop -/* 86F2EC 802407EC 4500000F */ bc1f .L8024082C -/* 86F2F0 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 86F2F4 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 86F2F8 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 86F2FC 802407FC 44811000 */ mtc1 $at, $f2 -/* 86F300 80240800 44820000 */ mtc1 $v0, $f0 -/* 86F304 80240804 00000000 */ nop -/* 86F308 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 86F30C 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 86F310 80240810 00000000 */ nop -/* 86F314 80240814 4600203C */ c.lt.s $f4, $f0 -/* 86F318 80240818 00000000 */ nop -/* 86F31C 8024081C 45000003 */ bc1f .L8024082C -/* 86F320 80240820 24020001 */ addiu $v0, $zero, 1 -/* 86F324 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 86F328 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 86F32C 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 86F330 80240830 4481D000 */ mtc1 $at, $f26 -/* 86F334 80240834 4480C000 */ mtc1 $zero, $f24 -/* 86F338 80240838 3C013F00 */ lui $at, 0x3f00 -/* 86F33C 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 86F340 80240840 0C00EAD2 */ jal get_npc_safe -/* 86F344 80240844 0220202D */ daddu $a0, $s1, $zero -/* 86F348 80240848 0040802D */ daddu $s0, $v0, $zero -/* 86F34C 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 86F350 80240850 26310001 */ addiu $s1, $s1, 1 -/* 86F354 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 86F358 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 86F35C 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 86F360 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 86F364 80240864 00000000 */ nop -/* 86F368 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 86F36C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 86F370 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 86F374 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 86F378 80240878 00000000 */ nop -/* 86F37C 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 86F380 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 86F384 80240884 44820000 */ mtc1 $v0, $f0 -/* 86F388 80240888 00000000 */ nop -/* 86F38C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 86F390 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 86F394 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 86F398 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 86F39C 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 86F3A0 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 86F3A4 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 86F3A8 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 86F3AC 802408AC 00000000 */ nop -/* 86F3B0 802408B0 45010003 */ bc1t .L802408C0 -/* 86F3B4 802408B4 00000000 */ nop -/* 86F3B8 802408B8 0C0187BC */ jal sqrtf -/* 86F3BC 802408BC 00000000 */ nop -.L802408C0: -/* 86F3C0 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 86F3C4 802408C4 00000000 */ nop -/* 86F3C8 802408C8 45000015 */ bc1f .L80240920 -/* 86F3CC 802408CC 46000106 */ mov.s $f4, $f0 -/* 86F3D0 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 86F3D4 802408D4 44820000 */ mtc1 $v0, $f0 -/* 86F3D8 802408D8 00000000 */ nop -/* 86F3DC 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 86F3E0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 86F3E4 802408E4 00000000 */ nop -/* 86F3E8 802408E8 4500000E */ bc1f .L80240924 -/* 86F3EC 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 86F3F0 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 86F3F4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 86F3F8 802408F8 00000000 */ nop -/* 86F3FC 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 86F400 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 86F404 80240904 00000000 */ nop -/* 86F408 80240908 4600203C */ c.lt.s $f4, $f0 -/* 86F40C 8024090C 00000000 */ nop -/* 86F410 80240910 45000004 */ bc1f .L80240924 -/* 86F414 80240914 24020001 */ addiu $v0, $zero, 1 -/* 86F418 80240918 0809024C */ j .L80240930 -/* 86F41C 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 86F420 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 86F424 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 86F428 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 86F42C 8024092C 00000000 */ nop -.L80240930: -/* 86F430 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 86F434 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 86F438 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 86F43C 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 86F440 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 86F444 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 86F448 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 86F44C 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 86F450 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 86F454 80240954 24020002 */ addiu $v0, $zero, 2 -/* 86F458 80240958 03E00008 */ jr $ra -/* 86F45C 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_03/func_80240960_86EB00.s b/asm/nonmatchings/world/area_tik/tik_03/func_80240960_86EB00.s deleted file mode 100644 index 3bb1f8ae40..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/func_80240960_86EB00.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240960_86F460 -/* 86F460 80240960 3C088011 */ lui $t0, %hi(gPlayerStatus) -/* 86F464 80240964 2508EFC8 */ addiu $t0, $t0, %lo(gPlayerStatus) -/* 86F468 80240968 0000202D */ daddu $a0, $zero, $zero -/* 86F46C 8024096C 3C058016 */ lui $a1, 0x8016 -/* 86F470 80240970 84A5A552 */ lh $a1, -0x5aae($a1) -/* 86F474 80240974 2407000E */ addiu $a3, $zero, 0xe -/* 86F478 80240978 24060010 */ addiu $a2, $zero, 0x10 -/* 86F47C 8024097C 3C038024 */ lui $v1, 0x8024 -/* 86F480 80240980 24632930 */ addiu $v1, $v1, 0x2930 -.L80240984: -/* 86F484 80240984 8C620000 */ lw $v0, ($v1) -/* 86F488 80240988 54A20008 */ bnel $a1, $v0, .L802409AC -/* 86F48C 8024098C 24840001 */ addiu $a0, $a0, 1 -/* 86F490 80240990 810200B4 */ lb $v0, 0xb4($t0) -/* 86F494 80240994 10470003 */ beq $v0, $a3, .L802409A4 -/* 86F498 80240998 00000000 */ nop -/* 86F49C 8024099C 14460003 */ bne $v0, $a2, .L802409AC -/* 86F4A0 802409A0 24840001 */ addiu $a0, $a0, 1 -.L802409A4: -/* 86F4A4 802409A4 03E00008 */ jr $ra -/* 86F4A8 802409A8 0000102D */ daddu $v0, $zero, $zero -.L802409AC: -/* 86F4AC 802409AC 2C820004 */ sltiu $v0, $a0, 4 -/* 86F4B0 802409B0 1440FFF4 */ bnez $v0, .L80240984 -/* 86F4B4 802409B4 24630004 */ addiu $v1, $v1, 4 -/* 86F4B8 802409B8 03E00008 */ jr $ra -/* 86F4BC 802409BC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_04/func_80240124_871A30.s b/asm/nonmatchings/world/area_tik/tik_04/func_80240124_871A30.s deleted file mode 100644 index b57a93e765..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/func_80240124_871A30.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_871B54 -/* 871B54 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 871B58 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 871B5C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 871B60 80240130 10A00005 */ beqz $a1, .L80240148 -/* 871B64 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 871B68 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 871B6C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 871B70 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 871B74 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 871B78 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 871B7C 8024014C 1440000E */ bnez $v0, .L80240188 -/* 871B80 80240150 00000000 */ nop -/* 871B84 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 871B88 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 871B8C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 871B90 80240160 04610004 */ bgez $v1, .L80240174 -/* 871B94 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 871B98 80240168 3C020002 */ lui $v0, 2 -/* 871B9C 8024016C 08090061 */ j .L80240184 -/* 871BA0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 871BA4 80240174 3C040002 */ lui $a0, 2 -/* 871BA8 80240178 0083102A */ slt $v0, $a0, $v1 -/* 871BAC 8024017C 10400002 */ beqz $v0, .L80240188 -/* 871BB0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 871BB4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 871BB8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 871BBC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 871BC0 80240190 00000000 */ nop -/* 871BC4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 871BC8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 871BCC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 871BD0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 871BD4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 871BD8 802401A8 3C020002 */ lui $v0, 2 -/* 871BDC 802401AC 08090071 */ j .L802401C4 -/* 871BE0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 871BE4 802401B4 3C040002 */ lui $a0, 2 -/* 871BE8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 871BEC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 871BF0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 871BF4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 871BF8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 871BFC 802401CC 1440000E */ bnez $v0, .L80240208 -/* 871C00 802401D0 00000000 */ nop -/* 871C04 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 871C08 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 871C0C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 871C10 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 871C14 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 871C18 802401E8 3C020002 */ lui $v0, 2 -/* 871C1C 802401EC 08090081 */ j .L80240204 -/* 871C20 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 871C24 802401F4 3C040002 */ lui $a0, 2 -/* 871C28 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 871C2C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 871C30 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 871C34 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 871C38 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 871C3C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 871C40 80240210 00000000 */ nop -/* 871C44 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 871C48 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 871C4C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 871C50 80240220 04610004 */ bgez $v1, .L80240234 -/* 871C54 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 871C58 80240228 3C020002 */ lui $v0, 2 -/* 871C5C 8024022C 08090091 */ j .L80240244 -/* 871C60 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 871C64 80240234 3C040002 */ lui $a0, 2 -/* 871C68 80240238 0083102A */ slt $v0, $a0, $v1 -/* 871C6C 8024023C 10400002 */ beqz $v0, .L80240248 -/* 871C70 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 871C74 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 871C78 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 871C7C 8024024C 0C046F07 */ jal set_main_pan_u -/* 871C80 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 871C84 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 871C88 80240258 0C046F0D */ jal set_main_pan_v -/* 871C8C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 871C90 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 871C94 80240264 0C046F13 */ jal set_aux_pan_u -/* 871C98 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 871C9C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 871CA0 80240270 0C046F19 */ jal set_aux_pan_v -/* 871CA4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 871CA8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 871CAC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 871CB0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 871CB4 80240284 24420001 */ addiu $v0, $v0, 1 -/* 871CB8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 871CBC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 871CC0 80240290 24630001 */ addiu $v1, $v1, 1 -/* 871CC4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 871CC8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 871CCC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 871CD0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 871CD4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 871CD8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 871CDC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 871CE0 802402B0 14600002 */ bnez $v1, .L802402BC -/* 871CE4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 871CE8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 871CEC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 871CF0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 871CF4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 871CF8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 871CFC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 871D00 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 871D04 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 871D08 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 871D0C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 871D10 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 871D14 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 871D18 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 871D1C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 871D20 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 871D24 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 871D28 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 871D2C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 871D30 80240300 0000102D */ daddu $v0, $zero, $zero -/* 871D34 80240304 03E00008 */ jr $ra -/* 871D38 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_04/func_8024030C_871A30.s b/asm/nonmatchings/world/area_tik/tik_04/func_8024030C_871A30.s deleted file mode 100644 index 94eac3193c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/func_8024030C_871A30.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_871D3C -/* 871D3C 8024030C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 871D40 80240310 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 871D44 80240314 8C430004 */ lw $v1, 4($v0) -/* 871D48 80240318 3C040010 */ lui $a0, 0x10 -/* 871D4C 8024031C 00641825 */ or $v1, $v1, $a0 -/* 871D50 80240320 AC430004 */ sw $v1, 4($v0) -/* 871D54 80240324 03E00008 */ jr $ra -/* 871D58 80240328 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_04/func_8024032C_871A30.s b/asm/nonmatchings/world/area_tik/tik_04/func_8024032C_871A30.s deleted file mode 100644 index c3eac88b08..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/func_8024032C_871A30.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024032C_871D5C -/* 871D5C 8024032C 3C028016 */ lui $v0, 0x8016 -/* 871D60 80240330 8442A552 */ lh $v0, -0x5aae($v0) -/* 871D64 80240334 AC820084 */ sw $v0, 0x84($a0) -/* 871D68 80240338 03E00008 */ jr $ra -/* 871D6C 8024033C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_04/func_80240340_871A30.s b/asm/nonmatchings/world/area_tik/tik_04/func_80240340_871A30.s deleted file mode 100644 index e02d9bd3f2..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/func_80240340_871A30.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240340_871D70 -/* 871D70 80240340 3C038016 */ lui $v1, 0x8016 -/* 871D74 80240344 8463A552 */ lh $v1, -0x5aae($v1) -/* 871D78 80240348 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 871D7C 8024034C AFB00010 */ sw $s0, 0x10($sp) -/* 871D80 80240350 0080802D */ daddu $s0, $a0, $zero -/* 871D84 80240354 AFBF0014 */ sw $ra, 0x14($sp) -/* 871D88 80240358 8E0200B0 */ lw $v0, 0xb0($s0) -/* 871D8C 8024035C 10620003 */ beq $v1, $v0, .L8024036C -/* 871D90 80240360 24020002 */ addiu $v0, $zero, 2 -/* 871D94 80240364 080900FB */ j .L802403EC -/* 871D98 80240368 AE000084 */ sw $zero, 0x84($s0) -.L8024036C: -/* 871D9C 8024036C 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 871DA0 80240370 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 871DA4 80240374 80620040 */ lb $v0, 0x40($v1) -/* 871DA8 80240378 80670044 */ lb $a3, 0x44($v1) -/* 871DAC 8024037C 04420001 */ bltzl $v0, .L80240384 -/* 871DB0 80240380 00021023 */ negu $v0, $v0 -.L80240384: -/* 871DB4 80240384 14400003 */ bnez $v0, .L80240394 -/* 871DB8 80240388 00000000 */ nop -/* 871DBC 8024038C 50E00017 */ beql $a3, $zero, .L802403EC -/* 871DC0 80240390 0000102D */ daddu $v0, $zero, $zero -.L80240394: -/* 871DC4 80240394 44822000 */ mtc1 $v0, $f4 -/* 871DC8 80240398 00000000 */ nop -/* 871DCC 8024039C 46802120 */ cvt.s.w $f4, $f4 -/* 871DD0 802403A0 44062000 */ mfc1 $a2, $f4 -/* 871DD4 802403A4 44872000 */ mtc1 $a3, $f4 -/* 871DD8 802403A8 00000000 */ nop -/* 871DDC 802403AC 46802120 */ cvt.s.w $f4, $f4 -/* 871DE0 802403B0 44806000 */ mtc1 $zero, $f12 -/* 871DE4 802403B4 44072000 */ mfc1 $a3, $f4 -/* 871DE8 802403B8 0C00A720 */ jal atan2 -/* 871DEC 802403BC 46006386 */ mov.s $f14, $f12 -/* 871DF0 802403C0 3C014270 */ lui $at, 0x4270 -/* 871DF4 802403C4 44811000 */ mtc1 $at, $f2 -/* 871DF8 802403C8 00000000 */ nop -/* 871DFC 802403CC 4602003C */ c.lt.s $f0, $f2 -/* 871E00 802403D0 00000000 */ nop -/* 871E04 802403D4 45000004 */ bc1f .L802403E8 -/* 871E08 802403D8 24020001 */ addiu $v0, $zero, 1 -/* 871E0C 802403DC AE020084 */ sw $v0, 0x84($s0) -/* 871E10 802403E0 080900FB */ j .L802403EC -/* 871E14 802403E4 24020002 */ addiu $v0, $zero, 2 -.L802403E8: -/* 871E18 802403E8 0000102D */ daddu $v0, $zero, $zero -.L802403EC: -/* 871E1C 802403EC 8FBF0014 */ lw $ra, 0x14($sp) -/* 871E20 802403F0 8FB00010 */ lw $s0, 0x10($sp) -/* 871E24 802403F4 03E00008 */ jr $ra -/* 871E28 802403F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_04/func_802403FC_871A30.s b/asm/nonmatchings/world/area_tik/tik_04/func_802403FC_871A30.s deleted file mode 100644 index ce3b692138..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/func_802403FC_871A30.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403FC_871E2C -/* 871E2C 802403FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 871E30 80240400 AFB10014 */ sw $s1, 0x14($sp) -/* 871E34 80240404 0080882D */ daddu $s1, $a0, $zero -/* 871E38 80240408 AFBF001C */ sw $ra, 0x1c($sp) -/* 871E3C 8024040C AFB20018 */ sw $s2, 0x18($sp) -/* 871E40 80240410 0C016AFA */ jal get_current_map_header -/* 871E44 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* 871E48 80240418 0220202D */ daddu $a0, $s1, $zero -/* 871E4C 8024041C 3C05FE36 */ lui $a1, 0xfe36 -/* 871E50 80240420 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 871E54 80240424 0C0B1EAF */ jal get_variable -/* 871E58 80240428 0040902D */ daddu $s2, $v0, $zero -/* 871E5C 8024042C 0220202D */ daddu $a0, $s1, $zero -/* 871E60 80240430 3C05FE36 */ lui $a1, 0xfe36 -/* 871E64 80240434 8E430014 */ lw $v1, 0x14($s2) -/* 871E68 80240438 00028100 */ sll $s0, $v0, 4 -/* 871E6C 8024043C 02031821 */ addu $v1, $s0, $v1 -/* 871E70 80240440 C4600000 */ lwc1 $f0, ($v1) -/* 871E74 80240444 4600008D */ trunc.w.s $f2, $f0 -/* 871E78 80240448 44061000 */ mfc1 $a2, $f2 -/* 871E7C 8024044C 0C0B2026 */ jal set_variable -/* 871E80 80240450 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 871E84 80240454 0220202D */ daddu $a0, $s1, $zero -/* 871E88 80240458 8E420014 */ lw $v0, 0x14($s2) -/* 871E8C 8024045C 3C05FE36 */ lui $a1, 0xfe36 -/* 871E90 80240460 02021021 */ addu $v0, $s0, $v0 -/* 871E94 80240464 C4400004 */ lwc1 $f0, 4($v0) -/* 871E98 80240468 4600008D */ trunc.w.s $f2, $f0 -/* 871E9C 8024046C 44061000 */ mfc1 $a2, $f2 -/* 871EA0 80240470 0C0B2026 */ jal set_variable -/* 871EA4 80240474 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 871EA8 80240478 0220202D */ daddu $a0, $s1, $zero -/* 871EAC 8024047C 8E420014 */ lw $v0, 0x14($s2) -/* 871EB0 80240480 3C05FE36 */ lui $a1, 0xfe36 -/* 871EB4 80240484 02021021 */ addu $v0, $s0, $v0 -/* 871EB8 80240488 C4400008 */ lwc1 $f0, 8($v0) -/* 871EBC 8024048C 4600008D */ trunc.w.s $f2, $f0 -/* 871EC0 80240490 44061000 */ mfc1 $a2, $f2 -/* 871EC4 80240494 0C0B2026 */ jal set_variable -/* 871EC8 80240498 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 871ECC 8024049C 0220202D */ daddu $a0, $s1, $zero -/* 871ED0 802404A0 8E420014 */ lw $v0, 0x14($s2) -/* 871ED4 802404A4 3C05FE36 */ lui $a1, 0xfe36 -/* 871ED8 802404A8 02028021 */ addu $s0, $s0, $v0 -/* 871EDC 802404AC C600000C */ lwc1 $f0, 0xc($s0) -/* 871EE0 802404B0 4600008D */ trunc.w.s $f2, $f0 -/* 871EE4 802404B4 44061000 */ mfc1 $a2, $f2 -/* 871EE8 802404B8 0C0B2026 */ jal set_variable -/* 871EEC 802404BC 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 871EF0 802404C0 8FBF001C */ lw $ra, 0x1c($sp) -/* 871EF4 802404C4 8FB20018 */ lw $s2, 0x18($sp) -/* 871EF8 802404C8 8FB10014 */ lw $s1, 0x14($sp) -/* 871EFC 802404CC 8FB00010 */ lw $s0, 0x10($sp) -/* 871F00 802404D0 24020002 */ addiu $v0, $zero, 2 -/* 871F04 802404D4 03E00008 */ jr $ra -/* 871F08 802404D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_04/func_802404DC_871A30.s b/asm/nonmatchings/world/area_tik/tik_04/func_802404DC_871A30.s deleted file mode 100644 index 3769511137..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/func_802404DC_871A30.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404DC_871F0C -/* 871F0C 802404DC 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 871F10 802404E0 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 871F14 802404E4 3C014334 */ lui $at, 0x4334 -/* 871F18 802404E8 44816000 */ mtc1 $at, $f12 -/* 871F1C 802404EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 871F20 802404F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 871F24 802404F4 AFB00010 */ sw $s0, 0x10($sp) -/* 871F28 802404F8 00031080 */ sll $v0, $v1, 2 -/* 871F2C 802404FC 00431021 */ addu $v0, $v0, $v1 -/* 871F30 80240500 00021080 */ sll $v0, $v0, 2 -/* 871F34 80240504 00431023 */ subu $v0, $v0, $v1 -/* 871F38 80240508 000218C0 */ sll $v1, $v0, 3 -/* 871F3C 8024050C 00431021 */ addu $v0, $v0, $v1 -/* 871F40 80240510 000210C0 */ sll $v0, $v0, 3 -/* 871F44 80240514 3C01800B */ lui $at, 0x800b -/* 871F48 80240518 00220821 */ addu $at, $at, $v0 -/* 871F4C 8024051C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 871F50 80240520 460C0300 */ add.s $f12, $f0, $f12 -/* 871F54 80240524 0C00A6C9 */ jal clamp_angle -/* 871F58 80240528 0080802D */ daddu $s0, $a0, $zero -/* 871F5C 8024052C 4600008D */ trunc.w.s $f2, $f0 -/* 871F60 80240530 E6020084 */ swc1 $f2, 0x84($s0) -/* 871F64 80240534 8FBF0014 */ lw $ra, 0x14($sp) -/* 871F68 80240538 8FB00010 */ lw $s0, 0x10($sp) -/* 871F6C 8024053C 24020002 */ addiu $v0, $zero, 2 -/* 871F70 80240540 03E00008 */ jr $ra -/* 871F74 80240544 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_04/func_80240548_871A30.s b/asm/nonmatchings/world/area_tik/tik_04/func_80240548_871A30.s deleted file mode 100644 index 69d8b0dfc8..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/func_80240548_871A30.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240548_871F78 -/* 871F78 80240548 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 871F7C 8024054C AFB00018 */ sw $s0, 0x18($sp) -/* 871F80 80240550 0080802D */ daddu $s0, $a0, $zero -/* 871F84 80240554 AFBF001C */ sw $ra, 0x1c($sp) -/* 871F88 80240558 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 871F8C 8024055C 8E02000C */ lw $v0, 0xc($s0) -/* 871F90 80240560 0C0B210B */ jal get_float_variable -/* 871F94 80240564 8C450000 */ lw $a1, ($v0) -/* 871F98 80240568 27A40010 */ addiu $a0, $sp, 0x10 -/* 871F9C 8024056C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 871FA0 80240570 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 871FA4 80240574 44060000 */ mfc1 $a2, $f0 -/* 871FA8 80240578 C4400028 */ lwc1 $f0, 0x28($v0) -/* 871FAC 8024057C C4420030 */ lwc1 $f2, 0x30($v0) -/* 871FB0 80240580 E7A00010 */ swc1 $f0, 0x10($sp) -/* 871FB4 80240584 E7A20014 */ swc1 $f2, 0x14($sp) -/* 871FB8 80240588 8C470080 */ lw $a3, 0x80($v0) -/* 871FBC 8024058C C454002C */ lwc1 $f20, 0x2c($v0) -/* 871FC0 80240590 0C00A7E7 */ jal add_vec2D_polar -/* 871FC4 80240594 27A50014 */ addiu $a1, $sp, 0x14 -/* 871FC8 80240598 0200202D */ daddu $a0, $s0, $zero -/* 871FCC 8024059C 3C05FE36 */ lui $a1, 0xfe36 -/* 871FD0 802405A0 8FA60010 */ lw $a2, 0x10($sp) -/* 871FD4 802405A4 0C0B2190 */ jal set_float_variable -/* 871FD8 802405A8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 871FDC 802405AC 0200202D */ daddu $a0, $s0, $zero -/* 871FE0 802405B0 3C05FE36 */ lui $a1, 0xfe36 -/* 871FE4 802405B4 4406A000 */ mfc1 $a2, $f20 -/* 871FE8 802405B8 0C0B2190 */ jal set_float_variable -/* 871FEC 802405BC 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 871FF0 802405C0 0200202D */ daddu $a0, $s0, $zero -/* 871FF4 802405C4 3C05FE36 */ lui $a1, 0xfe36 -/* 871FF8 802405C8 8FA60014 */ lw $a2, 0x14($sp) -/* 871FFC 802405CC 0C0B2190 */ jal set_float_variable -/* 872000 802405D0 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 872004 802405D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 872008 802405D8 8FB00018 */ lw $s0, 0x18($sp) -/* 87200C 802405DC D7B40020 */ ldc1 $f20, 0x20($sp) -/* 872010 802405E0 24020002 */ addiu $v0, $zero, 2 -/* 872014 802405E4 03E00008 */ jr $ra -/* 872018 802405E8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 87201C 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_04/func_802405F0_871A30.s b/asm/nonmatchings/world/area_tik/tik_04/func_802405F0_871A30.s deleted file mode 100644 index 5ebab5ca87..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/func_802405F0_871A30.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_872020 -/* 872020 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 872024 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 872028 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 87202C 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 872030 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 872034 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 872038 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 87203C 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 872040 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 872044 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 872048 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 87204C 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 872050 80240620 0C0B1EAF */ jal get_variable -/* 872054 80240624 8C450000 */ lw $a1, ($v0) -/* 872058 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 87205C 8024062C 0C00EABB */ jal get_npc_unsafe -/* 872060 80240630 0040802D */ daddu $s0, $v0, $zero -/* 872064 80240634 0200202D */ daddu $a0, $s0, $zero -/* 872068 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 87206C 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 872070 80240640 0C046B4C */ jal get_model_from_list_index -/* 872074 80240644 0040202D */ daddu $a0, $v0, $zero -/* 872078 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 87207C 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 872080 80240650 0040902D */ daddu $s2, $v0, $zero -/* 872084 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 872088 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 87208C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 872090 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 872094 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 872098 80240668 00000000 */ nop -/* 87209C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8720A0 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 8720A4 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 8720A8 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 8720AC 8024067C 00000000 */ nop -/* 8720B0 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 8720B4 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 8720B8 80240688 44820000 */ mtc1 $v0, $f0 -/* 8720BC 8024068C 00000000 */ nop -/* 8720C0 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 8720C4 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 8720C8 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 8720CC 8024069C 44810000 */ mtc1 $at, $f0 -/* 8720D0 802406A0 00000000 */ nop -/* 8720D4 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 8720D8 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 8720DC 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 8720E0 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 8720E4 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 8720E8 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 8720EC 802406BC 00000000 */ nop -/* 8720F0 802406C0 45010004 */ bc1t .L802406D4 -/* 8720F4 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 8720F8 802406C8 0C0187BC */ jal sqrtf -/* 8720FC 802406CC 00000000 */ nop -/* 872100 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 872104 802406D4 44800000 */ mtc1 $zero, $f0 -/* 872108 802406D8 00000000 */ nop -/* 87210C 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 872110 802406E0 00000000 */ nop -/* 872114 802406E4 45000016 */ bc1f .L80240740 -/* 872118 802406E8 46001106 */ mov.s $f4, $f2 -/* 87211C 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 872120 802406F0 44820000 */ mtc1 $v0, $f0 -/* 872124 802406F4 00000000 */ nop -/* 872128 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 87212C 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 872130 80240700 00000000 */ nop -/* 872134 80240704 4500000E */ bc1f .L80240740 -/* 872138 80240708 00000000 */ nop -/* 87213C 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 872140 80240710 3C013F00 */ lui $at, 0x3f00 -/* 872144 80240714 44811000 */ mtc1 $at, $f2 -/* 872148 80240718 44820000 */ mtc1 $v0, $f0 -/* 87214C 8024071C 00000000 */ nop -/* 872150 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 872154 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 872158 80240728 00000000 */ nop -/* 87215C 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 872160 80240730 00000000 */ nop -/* 872164 80240734 45000002 */ bc1f .L80240740 -/* 872168 80240738 24020001 */ addiu $v0, $zero, 1 -/* 87216C 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 872170 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 872174 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 872178 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 87217C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 872180 80240750 00000000 */ nop -/* 872184 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 872188 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 87218C 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 872190 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 872194 80240764 00000000 */ nop -/* 872198 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 87219C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 8721A0 80240770 44820000 */ mtc1 $v0, $f0 -/* 8721A4 80240774 00000000 */ nop -/* 8721A8 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 8721AC 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 8721B0 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 8721B4 80240784 44810000 */ mtc1 $at, $f0 -/* 8721B8 80240788 00000000 */ nop -/* 8721BC 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 8721C0 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 8721C4 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8721C8 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 8721CC 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 8721D0 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 8721D4 802407A4 00000000 */ nop -/* 8721D8 802407A8 45010004 */ bc1t .L802407BC -/* 8721DC 802407AC 00000000 */ nop -/* 8721E0 802407B0 0C0187BC */ jal sqrtf -/* 8721E4 802407B4 00000000 */ nop -/* 8721E8 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 8721EC 802407BC 44800000 */ mtc1 $zero, $f0 -/* 8721F0 802407C0 00000000 */ nop -/* 8721F4 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 8721F8 802407C8 00000000 */ nop -/* 8721FC 802407CC 45000016 */ bc1f .L80240828 -/* 872200 802407D0 46001106 */ mov.s $f4, $f2 -/* 872204 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 872208 802407D8 44820000 */ mtc1 $v0, $f0 -/* 87220C 802407DC 00000000 */ nop -/* 872210 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 872214 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 872218 802407E8 00000000 */ nop -/* 87221C 802407EC 4500000F */ bc1f .L8024082C -/* 872220 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 872224 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 872228 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 87222C 802407FC 44811000 */ mtc1 $at, $f2 -/* 872230 80240800 44820000 */ mtc1 $v0, $f0 -/* 872234 80240804 00000000 */ nop -/* 872238 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 87223C 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 872240 80240810 00000000 */ nop -/* 872244 80240814 4600203C */ c.lt.s $f4, $f0 -/* 872248 80240818 00000000 */ nop -/* 87224C 8024081C 45000003 */ bc1f .L8024082C -/* 872250 80240820 24020001 */ addiu $v0, $zero, 1 -/* 872254 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 872258 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 87225C 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 872260 80240830 4481D000 */ mtc1 $at, $f26 -/* 872264 80240834 4480C000 */ mtc1 $zero, $f24 -/* 872268 80240838 3C013F00 */ lui $at, 0x3f00 -/* 87226C 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 872270 80240840 0C00EAD2 */ jal get_npc_safe -/* 872274 80240844 0220202D */ daddu $a0, $s1, $zero -/* 872278 80240848 0040802D */ daddu $s0, $v0, $zero -/* 87227C 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 872280 80240850 26310001 */ addiu $s1, $s1, 1 -/* 872284 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 872288 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 87228C 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 872290 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 872294 80240864 00000000 */ nop -/* 872298 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87229C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 8722A0 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 8722A4 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 8722A8 80240878 00000000 */ nop -/* 8722AC 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 8722B0 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8722B4 80240884 44820000 */ mtc1 $v0, $f0 -/* 8722B8 80240888 00000000 */ nop -/* 8722BC 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 8722C0 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 8722C4 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 8722C8 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 8722CC 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 8722D0 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 8722D4 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 8722D8 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 8722DC 802408AC 00000000 */ nop -/* 8722E0 802408B0 45010003 */ bc1t .L802408C0 -/* 8722E4 802408B4 00000000 */ nop -/* 8722E8 802408B8 0C0187BC */ jal sqrtf -/* 8722EC 802408BC 00000000 */ nop -.L802408C0: -/* 8722F0 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 8722F4 802408C4 00000000 */ nop -/* 8722F8 802408C8 45000015 */ bc1f .L80240920 -/* 8722FC 802408CC 46000106 */ mov.s $f4, $f0 -/* 872300 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 872304 802408D4 44820000 */ mtc1 $v0, $f0 -/* 872308 802408D8 00000000 */ nop -/* 87230C 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 872310 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 872314 802408E4 00000000 */ nop -/* 872318 802408E8 4500000E */ bc1f .L80240924 -/* 87231C 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 872320 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 872324 802408F4 44820000 */ mtc1 $v0, $f0 -/* 872328 802408F8 00000000 */ nop -/* 87232C 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 872330 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 872334 80240904 00000000 */ nop -/* 872338 80240908 4600203C */ c.lt.s $f4, $f0 -/* 87233C 8024090C 00000000 */ nop -/* 872340 80240910 45000004 */ bc1f .L80240924 -/* 872344 80240914 24020001 */ addiu $v0, $zero, 1 -/* 872348 80240918 0809024C */ j .L80240930 -/* 87234C 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 872350 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 872354 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 872358 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 87235C 8024092C 00000000 */ nop -.L80240930: -/* 872360 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 872364 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 872368 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 87236C 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 872370 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 872374 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 872378 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 87237C 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 872380 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 872384 80240954 24020002 */ addiu $v0, $zero, 2 -/* 872388 80240958 03E00008 */ jr $ra -/* 87238C 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_04/func_80240960_871A30.s b/asm/nonmatchings/world/area_tik/tik_04/func_80240960_871A30.s deleted file mode 100644 index 3efd951a1e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/func_80240960_871A30.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240960_872390 -/* 872390 80240960 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 872394 80240964 AFB00010 */ sw $s0, 0x10($sp) -/* 872398 80240968 0080802D */ daddu $s0, $a0, $zero -/* 87239C 8024096C AFBF0014 */ sw $ra, 0x14($sp) -/* 8723A0 80240970 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 8723A4 80240974 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8723A8 80240978 24040012 */ addiu $a0, $zero, 0x12 -/* 8723AC 8024097C 0C046B4C */ jal get_model_from_list_index -/* 8723B0 80240980 0040202D */ daddu $a0, $v0, $zero -/* 8723B4 80240984 C440009C */ lwc1 $f0, 0x9c($v0) -/* 8723B8 80240988 3C0142C8 */ lui $at, 0x42c8 -/* 8723BC 8024098C 4481A000 */ mtc1 $at, $f20 -/* 8723C0 80240990 00000000 */ nop -/* 8723C4 80240994 46140001 */ sub.s $f0, $f0, $f20 -/* 8723C8 80240998 8C450098 */ lw $a1, 0x98($v0) -/* 8723CC 8024099C 8C4700A0 */ lw $a3, 0xa0($v0) -/* 8723D0 802409A0 44060000 */ mfc1 $a2, $f0 -/* 8723D4 802409A4 0C044898 */ jal create_shadow_type -/* 8723D8 802409A8 24040001 */ addiu $a0, $zero, 1 -/* 8723DC 802409AC 8E03013C */ lw $v1, 0x13c($s0) -/* 8723E0 802409B0 24040014 */ addiu $a0, $zero, 0x14 -/* 8723E4 802409B4 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8723E8 802409B8 AC620000 */ sw $v0, ($v1) -/* 8723EC 802409BC 0C046B4C */ jal get_model_from_list_index -/* 8723F0 802409C0 0040202D */ daddu $a0, $v0, $zero -/* 8723F4 802409C4 C440009C */ lwc1 $f0, 0x9c($v0) -/* 8723F8 802409C8 46140001 */ sub.s $f0, $f0, $f20 -/* 8723FC 802409CC 8C450098 */ lw $a1, 0x98($v0) -/* 872400 802409D0 8C4700A0 */ lw $a3, 0xa0($v0) -/* 872404 802409D4 44060000 */ mfc1 $a2, $f0 -/* 872408 802409D8 0C044898 */ jal create_shadow_type -/* 87240C 802409DC 24040001 */ addiu $a0, $zero, 1 -/* 872410 802409E0 8E03013C */ lw $v1, 0x13c($s0) -/* 872414 802409E4 AC620004 */ sw $v0, 4($v1) -/* 872418 802409E8 8FBF0014 */ lw $ra, 0x14($sp) -/* 87241C 802409EC 8FB00010 */ lw $s0, 0x10($sp) -/* 872420 802409F0 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 872424 802409F4 24020002 */ addiu $v0, $zero, 2 -/* 872428 802409F8 03E00008 */ jr $ra -/* 87242C 802409FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_04/func_80240C20_871A30.s b/asm/nonmatchings/world/area_tik/tik_04/func_80240C20_871A30.s deleted file mode 100644 index 49e59c779f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/func_80240C20_871A30.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C20_872650 -/* 872650 80240C20 3C038016 */ lui $v1, 0x8016 -/* 872654 80240C24 8463A552 */ lh $v1, -0x5aae($v1) -/* 872658 80240C28 24020009 */ addiu $v0, $zero, 9 -/* 87265C 80240C2C 10620003 */ beq $v1, $v0, .L80240C3C -/* 872660 80240C30 2402000B */ addiu $v0, $zero, 0xb -/* 872664 80240C34 1462000B */ bne $v1, $v0, .L80240C64 -/* 872668 80240C38 00000000 */ nop -.L80240C3C: -/* 87266C 80240C3C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 872670 80240C40 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 872674 80240C44 804300B4 */ lb $v1, 0xb4($v0) -/* 872678 80240C48 2402000E */ addiu $v0, $zero, 0xe -/* 87267C 80240C4C 10620003 */ beq $v1, $v0, .L80240C5C -/* 872680 80240C50 24020010 */ addiu $v0, $zero, 0x10 -/* 872684 80240C54 14620003 */ bne $v1, $v0, .L80240C64 -/* 872688 80240C58 00000000 */ nop -.L80240C5C: -/* 87268C 80240C5C 03E00008 */ jr $ra -/* 872690 80240C60 0000102D */ daddu $v0, $zero, $zero -.L80240C64: -/* 872694 80240C64 03E00008 */ jr $ra -/* 872698 80240C68 24020002 */ addiu $v0, $zero, 2 -/* 87269C 80240C6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_05/func_80240124_874DC0.s b/asm/nonmatchings/world/area_tik/tik_05/func_80240124_874DC0.s deleted file mode 100644 index 4fa22a02b2..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_05/func_80240124_874DC0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_874EE4 -/* 874EE4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 874EE8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 874EEC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 874EF0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 874EF4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 874EF8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 874EFC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 874F00 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 874F04 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 874F08 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 874F0C 8024014C 1440000E */ bnez $v0, .L80240188 -/* 874F10 80240150 00000000 */ nop -/* 874F14 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 874F18 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 874F1C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 874F20 80240160 04610004 */ bgez $v1, .L80240174 -/* 874F24 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 874F28 80240168 3C020002 */ lui $v0, 2 -/* 874F2C 8024016C 08090061 */ j .L80240184 -/* 874F30 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 874F34 80240174 3C040002 */ lui $a0, 2 -/* 874F38 80240178 0083102A */ slt $v0, $a0, $v1 -/* 874F3C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 874F40 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 874F44 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 874F48 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 874F4C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 874F50 80240190 00000000 */ nop -/* 874F54 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 874F58 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 874F5C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 874F60 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 874F64 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 874F68 802401A8 3C020002 */ lui $v0, 2 -/* 874F6C 802401AC 08090071 */ j .L802401C4 -/* 874F70 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 874F74 802401B4 3C040002 */ lui $a0, 2 -/* 874F78 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 874F7C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 874F80 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 874F84 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 874F88 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 874F8C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 874F90 802401D0 00000000 */ nop -/* 874F94 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 874F98 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 874F9C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 874FA0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 874FA4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 874FA8 802401E8 3C020002 */ lui $v0, 2 -/* 874FAC 802401EC 08090081 */ j .L80240204 -/* 874FB0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 874FB4 802401F4 3C040002 */ lui $a0, 2 -/* 874FB8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 874FBC 802401FC 10400002 */ beqz $v0, .L80240208 -/* 874FC0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 874FC4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 874FC8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 874FCC 8024020C 1440000E */ bnez $v0, .L80240248 -/* 874FD0 80240210 00000000 */ nop -/* 874FD4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 874FD8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 874FDC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 874FE0 80240220 04610004 */ bgez $v1, .L80240234 -/* 874FE4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 874FE8 80240228 3C020002 */ lui $v0, 2 -/* 874FEC 8024022C 08090091 */ j .L80240244 -/* 874FF0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 874FF4 80240234 3C040002 */ lui $a0, 2 -/* 874FF8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 874FFC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 875000 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 875004 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 875008 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 87500C 8024024C 0C046F07 */ jal set_main_pan_u -/* 875010 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 875014 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 875018 80240258 0C046F0D */ jal set_main_pan_v -/* 87501C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 875020 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 875024 80240264 0C046F13 */ jal set_aux_pan_u -/* 875028 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 87502C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 875030 80240270 0C046F19 */ jal set_aux_pan_v -/* 875034 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 875038 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 87503C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 875040 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 875044 80240284 24420001 */ addiu $v0, $v0, 1 -/* 875048 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 87504C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 875050 80240290 24630001 */ addiu $v1, $v1, 1 -/* 875054 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 875058 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 87505C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 875060 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 875064 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 875068 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 87506C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 875070 802402B0 14600002 */ bnez $v1, .L802402BC -/* 875074 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 875078 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 87507C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 875080 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 875084 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 875088 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 87508C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 875090 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 875094 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 875098 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 87509C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 8750A0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 8750A4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 8750A8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 8750AC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 8750B0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 8750B4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 8750B8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8750BC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 8750C0 80240300 0000102D */ daddu $v0, $zero, $zero -/* 8750C4 80240304 03E00008 */ jr $ra -/* 8750C8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8750CC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_05/func_80240310_874DC0.s b/asm/nonmatchings/world/area_tik/tik_05/func_80240310_874DC0.s deleted file mode 100644 index efc06a5c4e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_05/func_80240310_874DC0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_8750D0 -/* 8750D0 80240310 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8750D4 80240314 AFB3001C */ sw $s3, 0x1c($sp) -/* 8750D8 80240318 0080982D */ daddu $s3, $a0, $zero -/* 8750DC 8024031C AFBF0020 */ sw $ra, 0x20($sp) -/* 8750E0 80240320 AFB20018 */ sw $s2, 0x18($sp) -/* 8750E4 80240324 AFB10014 */ sw $s1, 0x14($sp) -/* 8750E8 80240328 AFB00010 */ sw $s0, 0x10($sp) -/* 8750EC 8024032C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8750F0 80240330 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8750F4 80240334 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8750F8 80240338 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8750FC 8024033C 8E62000C */ lw $v0, 0xc($s3) -/* 875100 80240340 0C0B1EAF */ jal get_variable -/* 875104 80240344 8C450000 */ lw $a1, ($v0) -/* 875108 80240348 2404FFFC */ addiu $a0, $zero, -4 -/* 87510C 8024034C 0C00EABB */ jal get_npc_unsafe -/* 875110 80240350 0040802D */ daddu $s0, $v0, $zero -/* 875114 80240354 0200202D */ daddu $a0, $s0, $zero -/* 875118 80240358 0C046C04 */ jal get_model_list_index_from_tree_index -/* 87511C 8024035C 0040802D */ daddu $s0, $v0, $zero -/* 875120 80240360 0C046B4C */ jal get_model_from_list_index -/* 875124 80240364 0040202D */ daddu $a0, $v0, $zero -/* 875128 80240368 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 87512C 8024036C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 875130 80240370 0040902D */ daddu $s2, $v0, $zero -/* 875134 80240374 AE60008C */ sw $zero, 0x8c($s3) -/* 875138 80240378 C4620028 */ lwc1 $f2, 0x28($v1) -/* 87513C 8024037C C6400098 */ lwc1 $f0, 0x98($s2) -/* 875140 80240380 46001081 */ sub.s $f2, $f2, $f0 -/* 875144 80240384 46021182 */ mul.s $f6, $f2, $f2 -/* 875148 80240388 00000000 */ nop -/* 87514C 8024038C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 875150 80240390 C4620030 */ lwc1 $f2, 0x30($v1) -/* 875154 80240394 46001081 */ sub.s $f2, $f2, $f0 -/* 875158 80240398 46021102 */ mul.s $f4, $f2, $f2 -/* 87515C 8024039C 00000000 */ nop -/* 875160 802403A0 846200B0 */ lh $v0, 0xb0($v1) -/* 875164 802403A4 C462002C */ lwc1 $f2, 0x2c($v1) -/* 875168 802403A8 44820000 */ mtc1 $v0, $f0 -/* 87516C 802403AC 00000000 */ nop -/* 875170 802403B0 46800020 */ cvt.s.w $f0, $f0 -/* 875174 802403B4 46001080 */ add.s $f2, $f2, $f0 -/* 875178 802403B8 3C013FC0 */ lui $at, 0x3fc0 -/* 87517C 802403BC 44810000 */ mtc1 $at, $f0 -/* 875180 802403C0 00000000 */ nop -/* 875184 802403C4 46001081 */ sub.s $f2, $f2, $f0 -/* 875188 802403C8 46043300 */ add.s $f12, $f6, $f4 -/* 87518C 802403CC C640009C */ lwc1 $f0, 0x9c($s2) -/* 875190 802403D0 46001501 */ sub.s $f20, $f2, $f0 -/* 875194 802403D4 46006084 */ sqrt.s $f2, $f12 -/* 875198 802403D8 46021032 */ c.eq.s $f2, $f2 -/* 87519C 802403DC 00000000 */ nop -/* 8751A0 802403E0 45010004 */ bc1t .L802403F4 -/* 8751A4 802403E4 0060882D */ daddu $s1, $v1, $zero -/* 8751A8 802403E8 0C0187BC */ jal sqrtf -/* 8751AC 802403EC 00000000 */ nop -/* 8751B0 802403F0 46000086 */ mov.s $f2, $f0 -.L802403F4: -/* 8751B4 802403F4 44800000 */ mtc1 $zero, $f0 -/* 8751B8 802403F8 00000000 */ nop -/* 8751BC 802403FC 4614003C */ c.lt.s $f0, $f20 -/* 8751C0 80240400 00000000 */ nop -/* 8751C4 80240404 45000016 */ bc1f .L80240460 -/* 8751C8 80240408 46001106 */ mov.s $f4, $f2 -/* 8751CC 8024040C 862200B0 */ lh $v0, 0xb0($s1) -/* 8751D0 80240410 44820000 */ mtc1 $v0, $f0 -/* 8751D4 80240414 00000000 */ nop -/* 8751D8 80240418 46800020 */ cvt.s.w $f0, $f0 -/* 8751DC 8024041C 4600A03C */ c.lt.s $f20, $f0 -/* 8751E0 80240420 00000000 */ nop -/* 8751E4 80240424 4500000E */ bc1f .L80240460 -/* 8751E8 80240428 00000000 */ nop -/* 8751EC 8024042C 862200B2 */ lh $v0, 0xb2($s1) -/* 8751F0 80240430 3C013F00 */ lui $at, 0x3f00 -/* 8751F4 80240434 44811000 */ mtc1 $at, $f2 -/* 8751F8 80240438 44820000 */ mtc1 $v0, $f0 -/* 8751FC 8024043C 00000000 */ nop -/* 875200 80240440 46800020 */ cvt.s.w $f0, $f0 -/* 875204 80240444 46020002 */ mul.s $f0, $f0, $f2 -/* 875208 80240448 00000000 */ nop -/* 87520C 8024044C 4600203C */ c.lt.s $f4, $f0 -/* 875210 80240450 00000000 */ nop -/* 875214 80240454 45000002 */ bc1f .L80240460 -/* 875218 80240458 24020001 */ addiu $v0, $zero, 1 -/* 87521C 8024045C AE62008C */ sw $v0, 0x8c($s3) -.L80240460: -/* 875220 80240460 C6020038 */ lwc1 $f2, 0x38($s0) -/* 875224 80240464 C6400098 */ lwc1 $f0, 0x98($s2) -/* 875228 80240468 46001081 */ sub.s $f2, $f2, $f0 -/* 87522C 8024046C 46021182 */ mul.s $f6, $f2, $f2 -/* 875230 80240470 00000000 */ nop -/* 875234 80240474 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 875238 80240478 C6020040 */ lwc1 $f2, 0x40($s0) -/* 87523C 8024047C 46001081 */ sub.s $f2, $f2, $f0 -/* 875240 80240480 46021102 */ mul.s $f4, $f2, $f2 -/* 875244 80240484 00000000 */ nop -/* 875248 80240488 860200A8 */ lh $v0, 0xa8($s0) -/* 87524C 8024048C C602003C */ lwc1 $f2, 0x3c($s0) -/* 875250 80240490 44820000 */ mtc1 $v0, $f0 -/* 875254 80240494 00000000 */ nop -/* 875258 80240498 46800020 */ cvt.s.w $f0, $f0 -/* 87525C 8024049C 46001080 */ add.s $f2, $f2, $f0 -/* 875260 802404A0 3C013FC0 */ lui $at, 0x3fc0 -/* 875264 802404A4 44810000 */ mtc1 $at, $f0 -/* 875268 802404A8 00000000 */ nop -/* 87526C 802404AC 46001081 */ sub.s $f2, $f2, $f0 -/* 875270 802404B0 46043300 */ add.s $f12, $f6, $f4 -/* 875274 802404B4 C640009C */ lwc1 $f0, 0x9c($s2) -/* 875278 802404B8 46001501 */ sub.s $f20, $f2, $f0 -/* 87527C 802404BC 46006084 */ sqrt.s $f2, $f12 -/* 875280 802404C0 46021032 */ c.eq.s $f2, $f2 -/* 875284 802404C4 00000000 */ nop -/* 875288 802404C8 45010004 */ bc1t .L802404DC -/* 87528C 802404CC 00000000 */ nop -/* 875290 802404D0 0C0187BC */ jal sqrtf -/* 875294 802404D4 00000000 */ nop -/* 875298 802404D8 46000086 */ mov.s $f2, $f0 -.L802404DC: -/* 87529C 802404DC 44800000 */ mtc1 $zero, $f0 -/* 8752A0 802404E0 00000000 */ nop -/* 8752A4 802404E4 4614003C */ c.lt.s $f0, $f20 -/* 8752A8 802404E8 00000000 */ nop -/* 8752AC 802404EC 45000016 */ bc1f .L80240548 -/* 8752B0 802404F0 46001106 */ mov.s $f4, $f2 -/* 8752B4 802404F4 860200A8 */ lh $v0, 0xa8($s0) -/* 8752B8 802404F8 44820000 */ mtc1 $v0, $f0 -/* 8752BC 802404FC 00000000 */ nop -/* 8752C0 80240500 46800020 */ cvt.s.w $f0, $f0 -/* 8752C4 80240504 4600A03C */ c.lt.s $f20, $f0 -/* 8752C8 80240508 00000000 */ nop -/* 8752CC 8024050C 4500000F */ bc1f .L8024054C -/* 8752D0 80240510 0000882D */ daddu $s1, $zero, $zero -/* 8752D4 80240514 860200A6 */ lh $v0, 0xa6($s0) -/* 8752D8 80240518 3C013F00 */ lui $at, 0x3f00 -/* 8752DC 8024051C 44811000 */ mtc1 $at, $f2 -/* 8752E0 80240520 44820000 */ mtc1 $v0, $f0 -/* 8752E4 80240524 00000000 */ nop -/* 8752E8 80240528 46800020 */ cvt.s.w $f0, $f0 -/* 8752EC 8024052C 46020002 */ mul.s $f0, $f0, $f2 -/* 8752F0 80240530 00000000 */ nop -/* 8752F4 80240534 4600203C */ c.lt.s $f4, $f0 -/* 8752F8 80240538 00000000 */ nop -/* 8752FC 8024053C 45000003 */ bc1f .L8024054C -/* 875300 80240540 24020001 */ addiu $v0, $zero, 1 -/* 875304 80240544 AE62008C */ sw $v0, 0x8c($s3) -.L80240548: -/* 875308 80240548 0000882D */ daddu $s1, $zero, $zero -.L8024054C: -/* 87530C 8024054C 3C013FC0 */ lui $at, 0x3fc0 -/* 875310 80240550 4481D000 */ mtc1 $at, $f26 -/* 875314 80240554 4480C000 */ mtc1 $zero, $f24 -/* 875318 80240558 3C013F00 */ lui $at, 0x3f00 -/* 87531C 8024055C 4481B000 */ mtc1 $at, $f22 -.L80240560: -/* 875320 80240560 0C00EAD2 */ jal get_npc_safe -/* 875324 80240564 0220202D */ daddu $a0, $s1, $zero -/* 875328 80240568 0040802D */ daddu $s0, $v0, $zero -/* 87532C 8024056C 52000035 */ beql $s0, $zero, .L80240644 -/* 875330 80240570 26310001 */ addiu $s1, $s1, 1 -/* 875334 80240574 C6020038 */ lwc1 $f2, 0x38($s0) -/* 875338 80240578 C6400098 */ lwc1 $f0, 0x98($s2) -/* 87533C 8024057C 46001081 */ sub.s $f2, $f2, $f0 -/* 875340 80240580 46021182 */ mul.s $f6, $f2, $f2 -/* 875344 80240584 00000000 */ nop -/* 875348 80240588 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87534C 8024058C C6020040 */ lwc1 $f2, 0x40($s0) -/* 875350 80240590 46001081 */ sub.s $f2, $f2, $f0 -/* 875354 80240594 46021102 */ mul.s $f4, $f2, $f2 -/* 875358 80240598 00000000 */ nop -/* 87535C 8024059C 860200A8 */ lh $v0, 0xa8($s0) -/* 875360 802405A0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 875364 802405A4 44820000 */ mtc1 $v0, $f0 -/* 875368 802405A8 00000000 */ nop -/* 87536C 802405AC 46800020 */ cvt.s.w $f0, $f0 -/* 875370 802405B0 46001080 */ add.s $f2, $f2, $f0 -/* 875374 802405B4 461A1081 */ sub.s $f2, $f2, $f26 -/* 875378 802405B8 46043300 */ add.s $f12, $f6, $f4 -/* 87537C 802405BC C640009C */ lwc1 $f0, 0x9c($s2) -/* 875380 802405C0 46001501 */ sub.s $f20, $f2, $f0 -/* 875384 802405C4 46006004 */ sqrt.s $f0, $f12 -/* 875388 802405C8 46000032 */ c.eq.s $f0, $f0 -/* 87538C 802405CC 00000000 */ nop -/* 875390 802405D0 45010003 */ bc1t .L802405E0 -/* 875394 802405D4 00000000 */ nop -/* 875398 802405D8 0C0187BC */ jal sqrtf -/* 87539C 802405DC 00000000 */ nop -.L802405E0: -/* 8753A0 802405E0 4614C03C */ c.lt.s $f24, $f20 -/* 8753A4 802405E4 00000000 */ nop -/* 8753A8 802405E8 45000015 */ bc1f .L80240640 -/* 8753AC 802405EC 46000106 */ mov.s $f4, $f0 -/* 8753B0 802405F0 860200A8 */ lh $v0, 0xa8($s0) -/* 8753B4 802405F4 44820000 */ mtc1 $v0, $f0 -/* 8753B8 802405F8 00000000 */ nop -/* 8753BC 802405FC 46800020 */ cvt.s.w $f0, $f0 -/* 8753C0 80240600 4600A03C */ c.lt.s $f20, $f0 -/* 8753C4 80240604 00000000 */ nop -/* 8753C8 80240608 4500000E */ bc1f .L80240644 -/* 8753CC 8024060C 26310001 */ addiu $s1, $s1, 1 -/* 8753D0 80240610 860200A6 */ lh $v0, 0xa6($s0) -/* 8753D4 80240614 44820000 */ mtc1 $v0, $f0 -/* 8753D8 80240618 00000000 */ nop -/* 8753DC 8024061C 46800020 */ cvt.s.w $f0, $f0 -/* 8753E0 80240620 46160002 */ mul.s $f0, $f0, $f22 -/* 8753E4 80240624 00000000 */ nop -/* 8753E8 80240628 4600203C */ c.lt.s $f4, $f0 -/* 8753EC 8024062C 00000000 */ nop -/* 8753F0 80240630 45000004 */ bc1f .L80240644 -/* 8753F4 80240634 24020001 */ addiu $v0, $zero, 1 -/* 8753F8 80240638 08090194 */ j .L80240650 -/* 8753FC 8024063C AE62008C */ sw $v0, 0x8c($s3) -.L80240640: -/* 875400 80240640 26310001 */ addiu $s1, $s1, 1 -.L80240644: -/* 875404 80240644 2A220040 */ slti $v0, $s1, 0x40 -/* 875408 80240648 1440FFC5 */ bnez $v0, .L80240560 -/* 87540C 8024064C 00000000 */ nop -.L80240650: -/* 875410 80240650 8FBF0020 */ lw $ra, 0x20($sp) -/* 875414 80240654 8FB3001C */ lw $s3, 0x1c($sp) -/* 875418 80240658 8FB20018 */ lw $s2, 0x18($sp) -/* 87541C 8024065C 8FB10014 */ lw $s1, 0x14($sp) -/* 875420 80240660 8FB00010 */ lw $s0, 0x10($sp) -/* 875424 80240664 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 875428 80240668 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 87542C 8024066C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 875430 80240670 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 875434 80240674 24020002 */ addiu $v0, $zero, 2 -/* 875438 80240678 03E00008 */ jr $ra -/* 87543C 8024067C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_06/func_80240020_876EE0.s b/asm/nonmatchings/world/area_tik/tik_06/func_80240020_876EE0.s deleted file mode 100644 index abeb00a1fb..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_06/func_80240020_876EE0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_876F00 -/* 876F00 80240020 3C028016 */ lui $v0, 0x8016 -/* 876F04 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 876F08 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 876F0C 8024002C 03E00008 */ jr $ra -/* 876F10 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_06/func_80240034_876EE0.s b/asm/nonmatchings/world/area_tik/tik_06/func_80240034_876EE0.s deleted file mode 100644 index 2bdb903877..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_06/func_80240034_876EE0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_876F14 -/* 876F14 80240034 3C038016 */ lui $v1, 0x8016 -/* 876F18 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* 876F1C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 876F20 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 876F24 80240044 0080802D */ daddu $s0, $a0, $zero -/* 876F28 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* 876F2C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 876F30 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* 876F34 80240054 24020002 */ addiu $v0, $zero, 2 -/* 876F38 80240058 08090038 */ j .L802400E0 -/* 876F3C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* 876F40 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 876F44 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 876F48 80240068 80620040 */ lb $v0, 0x40($v1) -/* 876F4C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* 876F50 80240070 04420001 */ bltzl $v0, .L80240078 -/* 876F54 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* 876F58 80240078 14400003 */ bnez $v0, .L80240088 -/* 876F5C 8024007C 00000000 */ nop -/* 876F60 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* 876F64 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* 876F68 80240088 44822000 */ mtc1 $v0, $f4 -/* 876F6C 8024008C 00000000 */ nop -/* 876F70 80240090 46802120 */ cvt.s.w $f4, $f4 -/* 876F74 80240094 44062000 */ mfc1 $a2, $f4 -/* 876F78 80240098 44872000 */ mtc1 $a3, $f4 -/* 876F7C 8024009C 00000000 */ nop -/* 876F80 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* 876F84 802400A4 44806000 */ mtc1 $zero, $f12 -/* 876F88 802400A8 44072000 */ mfc1 $a3, $f4 -/* 876F8C 802400AC 0C00A720 */ jal atan2 -/* 876F90 802400B0 46006386 */ mov.s $f14, $f12 -/* 876F94 802400B4 3C014270 */ lui $at, 0x4270 -/* 876F98 802400B8 44811000 */ mtc1 $at, $f2 -/* 876F9C 802400BC 00000000 */ nop -/* 876FA0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 876FA4 802400C4 00000000 */ nop -/* 876FA8 802400C8 45000004 */ bc1f .L802400DC -/* 876FAC 802400CC 24020001 */ addiu $v0, $zero, 1 -/* 876FB0 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* 876FB4 802400D4 08090038 */ j .L802400E0 -/* 876FB8 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* 876FBC 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* 876FC0 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 876FC4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 876FC8 802400E8 03E00008 */ jr $ra -/* 876FCC 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_06/func_802400F0_876EE0.s b/asm/nonmatchings/world/area_tik/tik_06/func_802400F0_876EE0.s deleted file mode 100644 index b750bf151a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_06/func_802400F0_876EE0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_876FD0 -/* 876FD0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 876FD4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 876FD8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 876FDC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 876FE0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 876FE4 80240104 0C016AFA */ jal get_current_map_header -/* 876FE8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 876FEC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 876FF0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 876FF4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 876FF8 80240118 0C0B1EAF */ jal get_variable -/* 876FFC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 877000 80240120 0220202D */ daddu $a0, $s1, $zero -/* 877004 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 877008 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 87700C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 877010 80240130 02031821 */ addu $v1, $s0, $v1 -/* 877014 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 877018 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 87701C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 877020 80240140 0C0B2026 */ jal set_variable -/* 877024 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 877028 80240148 0220202D */ daddu $a0, $s1, $zero -/* 87702C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 877030 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 877034 80240154 02021021 */ addu $v0, $s0, $v0 -/* 877038 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 87703C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 877040 80240160 44061000 */ mfc1 $a2, $f2 -/* 877044 80240164 0C0B2026 */ jal set_variable -/* 877048 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 87704C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 877050 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 877054 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 877058 80240178 02021021 */ addu $v0, $s0, $v0 -/* 87705C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 877060 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 877064 80240184 44061000 */ mfc1 $a2, $f2 -/* 877068 80240188 0C0B2026 */ jal set_variable -/* 87706C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 877070 80240190 0220202D */ daddu $a0, $s1, $zero -/* 877074 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 877078 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 87707C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 877080 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 877084 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 877088 802401A8 44061000 */ mfc1 $a2, $f2 -/* 87708C 802401AC 0C0B2026 */ jal set_variable -/* 877090 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 877094 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 877098 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 87709C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 8770A0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 8770A4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 8770A8 802401C8 03E00008 */ jr $ra -/* 8770AC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_06/func_802401D0_876EE0.s b/asm/nonmatchings/world/area_tik/tik_06/func_802401D0_876EE0.s deleted file mode 100644 index 769a53f52f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_06/func_802401D0_876EE0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_8770B0 -/* 8770B0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8770B4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8770B8 802401D8 3C014334 */ lui $at, 0x4334 -/* 8770BC 802401DC 44816000 */ mtc1 $at, $f12 -/* 8770C0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8770C4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8770C8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 8770CC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 8770D0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 8770D4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 8770D8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 8770DC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 8770E0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 8770E4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 8770E8 80240208 3C01800B */ lui $at, 0x800b -/* 8770EC 8024020C 00220821 */ addu $at, $at, $v0 -/* 8770F0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8770F4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 8770F8 80240218 0C00A6C9 */ jal clamp_angle -/* 8770FC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 877100 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 877104 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 877108 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 87710C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 877110 80240230 24020002 */ addiu $v0, $zero, 2 -/* 877114 80240234 03E00008 */ jr $ra -/* 877118 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_06/func_8024023C_876EE0.s b/asm/nonmatchings/world/area_tik/tik_06/func_8024023C_876EE0.s deleted file mode 100644 index e5c56a59c7..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_06/func_8024023C_876EE0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_87711C -/* 87711C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 877120 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 877124 80240244 0080802D */ daddu $s0, $a0, $zero -/* 877128 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 87712C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 877130 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 877134 80240254 0C0B210B */ jal get_float_variable -/* 877138 80240258 8C450000 */ lw $a1, ($v0) -/* 87713C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 877140 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 877144 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 877148 80240268 44060000 */ mfc1 $a2, $f0 -/* 87714C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 877150 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 877154 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 877158 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 87715C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 877160 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 877164 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 877168 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 87716C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 877170 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 877174 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 877178 80240298 0C0B2190 */ jal set_float_variable -/* 87717C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 877180 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 877184 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 877188 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 87718C 802402AC 0C0B2190 */ jal set_float_variable -/* 877190 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 877194 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 877198 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 87719C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 8771A0 802402C0 0C0B2190 */ jal set_float_variable -/* 8771A4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8771A8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 8771AC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 8771B0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8771B4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 8771B8 802402D8 03E00008 */ jr $ra -/* 8771BC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_06/func_802402E0_876EE0.s b/asm/nonmatchings/world/area_tik/tik_06/func_802402E0_876EE0.s deleted file mode 100644 index 7611a875e8..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_06/func_802402E0_876EE0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_8771C0 -/* 8771C0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8771C4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 8771C8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 8771CC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 8771D0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8771D4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 8771D8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 8771DC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 8771E0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8771E4 80240304 3C020002 */ lui $v0, 2 -/* 8771E8 80240308 080900C8 */ j .L80240320 -/* 8771EC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 8771F0 80240310 3C040002 */ lui $a0, 2 -/* 8771F4 80240314 0083102A */ slt $v0, $a0, $v1 -/* 8771F8 80240318 10400002 */ beqz $v0, .L80240324 -/* 8771FC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 877200 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 877204 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 877208 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 87720C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 877210 80240330 04610004 */ bgez $v1, .L80240344 -/* 877214 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 877218 80240338 3C020002 */ lui $v0, 2 -/* 87721C 8024033C 080900D5 */ j .L80240354 -/* 877220 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 877224 80240344 3C040002 */ lui $a0, 2 -/* 877228 80240348 0083102A */ slt $v0, $a0, $v1 -/* 87722C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 877230 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 877234 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 877238 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 87723C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 877240 80240360 00621821 */ addu $v1, $v1, $v0 -/* 877244 80240364 04610004 */ bgez $v1, .L80240378 -/* 877248 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 87724C 8024036C 3C020002 */ lui $v0, 2 -/* 877250 80240370 080900E2 */ j .L80240388 -/* 877254 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 877258 80240378 3C040002 */ lui $a0, 2 -/* 87725C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 877260 80240380 10400002 */ beqz $v0, .L8024038C -/* 877264 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 877268 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 87726C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 877270 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 877274 80240394 00621821 */ addu $v1, $v1, $v0 -/* 877278 80240398 04610004 */ bgez $v1, .L802403AC -/* 87727C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 877280 802403A0 3C020002 */ lui $v0, 2 -/* 877284 802403A4 080900EF */ j .L802403BC -/* 877288 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 87728C 802403AC 3C040002 */ lui $a0, 2 -/* 877290 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 877294 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 877298 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 87729C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 8772A0 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 8772A4 802403C4 0C046F07 */ jal set_main_pan_u -/* 8772A8 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8772AC 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 8772B0 802403D0 0C046F0D */ jal set_main_pan_v -/* 8772B4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 8772B8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 8772BC 802403DC 0C046F13 */ jal set_aux_pan_u -/* 8772C0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8772C4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 8772C8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 8772CC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8772D0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8772D4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 8772D8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 8772DC 802403FC 03E00008 */ jr $ra -/* 8772E0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_06/func_80240404_876EE0.s b/asm/nonmatchings/world/area_tik/tik_06/func_80240404_876EE0.s deleted file mode 100644 index 8ebfbc1d81..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_06/func_80240404_876EE0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_8772E4 -/* 8772E4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8772E8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 8772EC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 8772F0 80240410 10A00005 */ beqz $a1, .L80240428 -/* 8772F4 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 8772F8 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 8772FC 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 877300 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 877304 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 877308 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 87730C 8024042C 1440000E */ bnez $v0, .L80240468 -/* 877310 80240430 00000000 */ nop -/* 877314 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 877318 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 87731C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 877320 80240440 04610004 */ bgez $v1, .L80240454 -/* 877324 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 877328 80240448 3C020002 */ lui $v0, 2 -/* 87732C 8024044C 08090119 */ j .L80240464 -/* 877330 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 877334 80240454 3C040002 */ lui $a0, 2 -/* 877338 80240458 0083102A */ slt $v0, $a0, $v1 -/* 87733C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 877340 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 877344 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 877348 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 87734C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 877350 80240470 00000000 */ nop -/* 877354 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 877358 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 87735C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 877360 80240480 04610004 */ bgez $v1, .L80240494 -/* 877364 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 877368 80240488 3C020002 */ lui $v0, 2 -/* 87736C 8024048C 08090129 */ j .L802404A4 -/* 877370 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 877374 80240494 3C040002 */ lui $a0, 2 -/* 877378 80240498 0083102A */ slt $v0, $a0, $v1 -/* 87737C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 877380 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 877384 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 877388 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 87738C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 877390 802404B0 00000000 */ nop -/* 877394 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 877398 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 87739C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 8773A0 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 8773A4 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8773A8 802404C8 3C020002 */ lui $v0, 2 -/* 8773AC 802404CC 08090139 */ j .L802404E4 -/* 8773B0 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 8773B4 802404D4 3C040002 */ lui $a0, 2 -/* 8773B8 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 8773BC 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 8773C0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 8773C4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 8773C8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 8773CC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 8773D0 802404F0 00000000 */ nop -/* 8773D4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8773D8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 8773DC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 8773E0 80240500 04610004 */ bgez $v1, .L80240514 -/* 8773E4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8773E8 80240508 3C020002 */ lui $v0, 2 -/* 8773EC 8024050C 08090149 */ j .L80240524 -/* 8773F0 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 8773F4 80240514 3C040002 */ lui $a0, 2 -/* 8773F8 80240518 0083102A */ slt $v0, $a0, $v1 -/* 8773FC 8024051C 10400002 */ beqz $v0, .L80240528 -/* 877400 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 877404 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 877408 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 87740C 8024052C 0C046F07 */ jal set_main_pan_u -/* 877410 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 877414 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 877418 80240538 0C046F0D */ jal set_main_pan_v -/* 87741C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 877420 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 877424 80240544 0C046F13 */ jal set_aux_pan_u -/* 877428 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 87742C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 877430 80240550 0C046F19 */ jal set_aux_pan_v -/* 877434 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 877438 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 87743C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 877440 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 877444 80240564 24420001 */ addiu $v0, $v0, 1 -/* 877448 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 87744C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 877450 80240570 24630001 */ addiu $v1, $v1, 1 -/* 877454 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 877458 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 87745C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 877460 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 877464 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 877468 80240588 0064182A */ slt $v1, $v1, $a0 -/* 87746C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 877470 80240590 14600002 */ bnez $v1, .L8024059C -/* 877474 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 877478 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 87747C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 877480 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 877484 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 877488 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 87748C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 877490 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 877494 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 877498 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 87749C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 8774A0 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 8774A4 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 8774A8 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 8774AC 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 8774B0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 8774B4 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 8774B8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8774BC 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 8774C0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 8774C4 802405E4 03E00008 */ jr $ra -/* 8774C8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8774CC 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_06/func_802405F0_876EE0.s b/asm/nonmatchings/world/area_tik/tik_06/func_802405F0_876EE0.s deleted file mode 100644 index b57bd78fdd..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_06/func_802405F0_876EE0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_8774D0 -/* 8774D0 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8774D4 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 8774D8 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 8774DC 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 8774E0 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 8774E4 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 8774E8 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 8774EC 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8774F0 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8774F4 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8774F8 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8774FC 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 877500 80240620 0C0B1EAF */ jal get_variable -/* 877504 80240624 8C450000 */ lw $a1, ($v0) -/* 877508 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 87750C 8024062C 0C00EABB */ jal get_npc_unsafe -/* 877510 80240630 0040802D */ daddu $s0, $v0, $zero -/* 877514 80240634 0200202D */ daddu $a0, $s0, $zero -/* 877518 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 87751C 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 877520 80240640 0C046B4C */ jal get_model_from_list_index -/* 877524 80240644 0040202D */ daddu $a0, $v0, $zero -/* 877528 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 87752C 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 877530 80240650 0040902D */ daddu $s2, $v0, $zero -/* 877534 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 877538 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 87753C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 877540 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 877544 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 877548 80240668 00000000 */ nop -/* 87754C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 877550 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 877554 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 877558 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 87755C 8024067C 00000000 */ nop -/* 877560 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 877564 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 877568 80240688 44820000 */ mtc1 $v0, $f0 -/* 87756C 8024068C 00000000 */ nop -/* 877570 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 877574 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 877578 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 87757C 8024069C 44810000 */ mtc1 $at, $f0 -/* 877580 802406A0 00000000 */ nop -/* 877584 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 877588 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 87758C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 877590 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 877594 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 877598 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 87759C 802406BC 00000000 */ nop -/* 8775A0 802406C0 45010004 */ bc1t .L802406D4 -/* 8775A4 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 8775A8 802406C8 0C0187BC */ jal sqrtf -/* 8775AC 802406CC 00000000 */ nop -/* 8775B0 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 8775B4 802406D4 44800000 */ mtc1 $zero, $f0 -/* 8775B8 802406D8 00000000 */ nop -/* 8775BC 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 8775C0 802406E0 00000000 */ nop -/* 8775C4 802406E4 45000016 */ bc1f .L80240740 -/* 8775C8 802406E8 46001106 */ mov.s $f4, $f2 -/* 8775CC 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 8775D0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 8775D4 802406F4 00000000 */ nop -/* 8775D8 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 8775DC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 8775E0 80240700 00000000 */ nop -/* 8775E4 80240704 4500000E */ bc1f .L80240740 -/* 8775E8 80240708 00000000 */ nop -/* 8775EC 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 8775F0 80240710 3C013F00 */ lui $at, 0x3f00 -/* 8775F4 80240714 44811000 */ mtc1 $at, $f2 -/* 8775F8 80240718 44820000 */ mtc1 $v0, $f0 -/* 8775FC 8024071C 00000000 */ nop -/* 877600 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 877604 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 877608 80240728 00000000 */ nop -/* 87760C 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 877610 80240730 00000000 */ nop -/* 877614 80240734 45000002 */ bc1f .L80240740 -/* 877618 80240738 24020001 */ addiu $v0, $zero, 1 -/* 87761C 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 877620 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 877624 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 877628 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 87762C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 877630 80240750 00000000 */ nop -/* 877634 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 877638 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 87763C 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 877640 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 877644 80240764 00000000 */ nop -/* 877648 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 87764C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 877650 80240770 44820000 */ mtc1 $v0, $f0 -/* 877654 80240774 00000000 */ nop -/* 877658 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 87765C 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 877660 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 877664 80240784 44810000 */ mtc1 $at, $f0 -/* 877668 80240788 00000000 */ nop -/* 87766C 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 877670 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 877674 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 877678 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 87767C 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 877680 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 877684 802407A4 00000000 */ nop -/* 877688 802407A8 45010004 */ bc1t .L802407BC -/* 87768C 802407AC 00000000 */ nop -/* 877690 802407B0 0C0187BC */ jal sqrtf -/* 877694 802407B4 00000000 */ nop -/* 877698 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 87769C 802407BC 44800000 */ mtc1 $zero, $f0 -/* 8776A0 802407C0 00000000 */ nop -/* 8776A4 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 8776A8 802407C8 00000000 */ nop -/* 8776AC 802407CC 45000016 */ bc1f .L80240828 -/* 8776B0 802407D0 46001106 */ mov.s $f4, $f2 -/* 8776B4 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 8776B8 802407D8 44820000 */ mtc1 $v0, $f0 -/* 8776BC 802407DC 00000000 */ nop -/* 8776C0 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 8776C4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 8776C8 802407E8 00000000 */ nop -/* 8776CC 802407EC 4500000F */ bc1f .L8024082C -/* 8776D0 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 8776D4 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 8776D8 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 8776DC 802407FC 44811000 */ mtc1 $at, $f2 -/* 8776E0 80240800 44820000 */ mtc1 $v0, $f0 -/* 8776E4 80240804 00000000 */ nop -/* 8776E8 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 8776EC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 8776F0 80240810 00000000 */ nop -/* 8776F4 80240814 4600203C */ c.lt.s $f4, $f0 -/* 8776F8 80240818 00000000 */ nop -/* 8776FC 8024081C 45000003 */ bc1f .L8024082C -/* 877700 80240820 24020001 */ addiu $v0, $zero, 1 -/* 877704 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 877708 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 87770C 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 877710 80240830 4481D000 */ mtc1 $at, $f26 -/* 877714 80240834 4480C000 */ mtc1 $zero, $f24 -/* 877718 80240838 3C013F00 */ lui $at, 0x3f00 -/* 87771C 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 877720 80240840 0C00EAD2 */ jal get_npc_safe -/* 877724 80240844 0220202D */ daddu $a0, $s1, $zero -/* 877728 80240848 0040802D */ daddu $s0, $v0, $zero -/* 87772C 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 877730 80240850 26310001 */ addiu $s1, $s1, 1 -/* 877734 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 877738 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 87773C 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 877740 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 877744 80240864 00000000 */ nop -/* 877748 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87774C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 877750 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 877754 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 877758 80240878 00000000 */ nop -/* 87775C 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 877760 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 877764 80240884 44820000 */ mtc1 $v0, $f0 -/* 877768 80240888 00000000 */ nop -/* 87776C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 877770 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 877774 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 877778 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 87777C 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 877780 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 877784 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 877788 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 87778C 802408AC 00000000 */ nop -/* 877790 802408B0 45010003 */ bc1t .L802408C0 -/* 877794 802408B4 00000000 */ nop -/* 877798 802408B8 0C0187BC */ jal sqrtf -/* 87779C 802408BC 00000000 */ nop -.L802408C0: -/* 8777A0 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 8777A4 802408C4 00000000 */ nop -/* 8777A8 802408C8 45000015 */ bc1f .L80240920 -/* 8777AC 802408CC 46000106 */ mov.s $f4, $f0 -/* 8777B0 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 8777B4 802408D4 44820000 */ mtc1 $v0, $f0 -/* 8777B8 802408D8 00000000 */ nop -/* 8777BC 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 8777C0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 8777C4 802408E4 00000000 */ nop -/* 8777C8 802408E8 4500000E */ bc1f .L80240924 -/* 8777CC 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 8777D0 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 8777D4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 8777D8 802408F8 00000000 */ nop -/* 8777DC 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 8777E0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 8777E4 80240904 00000000 */ nop -/* 8777E8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 8777EC 8024090C 00000000 */ nop -/* 8777F0 80240910 45000004 */ bc1f .L80240924 -/* 8777F4 80240914 24020001 */ addiu $v0, $zero, 1 -/* 8777F8 80240918 0809024C */ j .L80240930 -/* 8777FC 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 877800 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 877804 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 877808 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 87780C 8024092C 00000000 */ nop -.L80240930: -/* 877810 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 877814 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 877818 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 87781C 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 877820 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 877824 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 877828 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 87782C 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 877830 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 877834 80240954 24020002 */ addiu $v0, $zero, 2 -/* 877838 80240958 03E00008 */ jr $ra -/* 87783C 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_07/func_80240020_879BE0.s b/asm/nonmatchings/world/area_tik/tik_07/func_80240020_879BE0.s deleted file mode 100644 index d8fca030fa..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/func_80240020_879BE0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_879C00 -/* 879C00 80240020 3C028016 */ lui $v0, 0x8016 -/* 879C04 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 879C08 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 879C0C 8024002C 03E00008 */ jr $ra -/* 879C10 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_07/func_80240034_879BE0.s b/asm/nonmatchings/world/area_tik/tik_07/func_80240034_879BE0.s deleted file mode 100644 index 0581b33952..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/func_80240034_879BE0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_879C14 -/* 879C14 80240034 3C038016 */ lui $v1, 0x8016 -/* 879C18 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* 879C1C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 879C20 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 879C24 80240044 0080802D */ daddu $s0, $a0, $zero -/* 879C28 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* 879C2C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 879C30 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* 879C34 80240054 24020002 */ addiu $v0, $zero, 2 -/* 879C38 80240058 08090038 */ j .L802400E0 -/* 879C3C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* 879C40 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 879C44 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 879C48 80240068 80620040 */ lb $v0, 0x40($v1) -/* 879C4C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* 879C50 80240070 04420001 */ bltzl $v0, .L80240078 -/* 879C54 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* 879C58 80240078 14400003 */ bnez $v0, .L80240088 -/* 879C5C 8024007C 00000000 */ nop -/* 879C60 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* 879C64 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* 879C68 80240088 44822000 */ mtc1 $v0, $f4 -/* 879C6C 8024008C 00000000 */ nop -/* 879C70 80240090 46802120 */ cvt.s.w $f4, $f4 -/* 879C74 80240094 44062000 */ mfc1 $a2, $f4 -/* 879C78 80240098 44872000 */ mtc1 $a3, $f4 -/* 879C7C 8024009C 00000000 */ nop -/* 879C80 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* 879C84 802400A4 44806000 */ mtc1 $zero, $f12 -/* 879C88 802400A8 44072000 */ mfc1 $a3, $f4 -/* 879C8C 802400AC 0C00A720 */ jal atan2 -/* 879C90 802400B0 46006386 */ mov.s $f14, $f12 -/* 879C94 802400B4 3C014270 */ lui $at, 0x4270 -/* 879C98 802400B8 44811000 */ mtc1 $at, $f2 -/* 879C9C 802400BC 00000000 */ nop -/* 879CA0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 879CA4 802400C4 00000000 */ nop -/* 879CA8 802400C8 45000004 */ bc1f .L802400DC -/* 879CAC 802400CC 24020001 */ addiu $v0, $zero, 1 -/* 879CB0 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* 879CB4 802400D4 08090038 */ j .L802400E0 -/* 879CB8 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* 879CBC 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* 879CC0 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 879CC4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 879CC8 802400E8 03E00008 */ jr $ra -/* 879CCC 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/func_802400F0_879BE0.s b/asm/nonmatchings/world/area_tik/tik_07/func_802400F0_879BE0.s deleted file mode 100644 index aad002a080..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/func_802400F0_879BE0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_879CD0 -/* 879CD0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 879CD4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 879CD8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 879CDC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 879CE0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 879CE4 80240104 0C016AFA */ jal get_current_map_header -/* 879CE8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 879CEC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 879CF0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 879CF4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 879CF8 80240118 0C0B1EAF */ jal get_variable -/* 879CFC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 879D00 80240120 0220202D */ daddu $a0, $s1, $zero -/* 879D04 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 879D08 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 879D0C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 879D10 80240130 02031821 */ addu $v1, $s0, $v1 -/* 879D14 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 879D18 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 879D1C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 879D20 80240140 0C0B2026 */ jal set_variable -/* 879D24 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 879D28 80240148 0220202D */ daddu $a0, $s1, $zero -/* 879D2C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 879D30 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 879D34 80240154 02021021 */ addu $v0, $s0, $v0 -/* 879D38 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 879D3C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 879D40 80240160 44061000 */ mfc1 $a2, $f2 -/* 879D44 80240164 0C0B2026 */ jal set_variable -/* 879D48 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 879D4C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 879D50 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 879D54 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 879D58 80240178 02021021 */ addu $v0, $s0, $v0 -/* 879D5C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 879D60 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 879D64 80240184 44061000 */ mfc1 $a2, $f2 -/* 879D68 80240188 0C0B2026 */ jal set_variable -/* 879D6C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 879D70 80240190 0220202D */ daddu $a0, $s1, $zero -/* 879D74 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 879D78 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 879D7C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 879D80 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 879D84 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 879D88 802401A8 44061000 */ mfc1 $a2, $f2 -/* 879D8C 802401AC 0C0B2026 */ jal set_variable -/* 879D90 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 879D94 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 879D98 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 879D9C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 879DA0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 879DA4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 879DA8 802401C8 03E00008 */ jr $ra -/* 879DAC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/func_802401D0_879BE0.s b/asm/nonmatchings/world/area_tik/tik_07/func_802401D0_879BE0.s deleted file mode 100644 index dcd63ca07a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/func_802401D0_879BE0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_879DB0 -/* 879DB0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 879DB4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 879DB8 802401D8 3C014334 */ lui $at, 0x4334 -/* 879DBC 802401DC 44816000 */ mtc1 $at, $f12 -/* 879DC0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 879DC4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 879DC8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 879DCC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 879DD0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 879DD4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 879DD8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 879DDC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 879DE0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 879DE4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 879DE8 80240208 3C01800B */ lui $at, 0x800b -/* 879DEC 8024020C 00220821 */ addu $at, $at, $v0 -/* 879DF0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 879DF4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 879DF8 80240218 0C00A6C9 */ jal clamp_angle -/* 879DFC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 879E00 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 879E04 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 879E08 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 879E0C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 879E10 80240230 24020002 */ addiu $v0, $zero, 2 -/* 879E14 80240234 03E00008 */ jr $ra -/* 879E18 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/func_8024023C_879BE0.s b/asm/nonmatchings/world/area_tik/tik_07/func_8024023C_879BE0.s deleted file mode 100644 index c35786ab9c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/func_8024023C_879BE0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_879E1C -/* 879E1C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 879E20 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 879E24 80240244 0080802D */ daddu $s0, $a0, $zero -/* 879E28 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 879E2C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 879E30 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 879E34 80240254 0C0B210B */ jal get_float_variable -/* 879E38 80240258 8C450000 */ lw $a1, ($v0) -/* 879E3C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 879E40 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 879E44 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 879E48 80240268 44060000 */ mfc1 $a2, $f0 -/* 879E4C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 879E50 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 879E54 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 879E58 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 879E5C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 879E60 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 879E64 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 879E68 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 879E6C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 879E70 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 879E74 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 879E78 80240298 0C0B2190 */ jal set_float_variable -/* 879E7C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 879E80 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 879E84 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 879E88 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 879E8C 802402AC 0C0B2190 */ jal set_float_variable -/* 879E90 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 879E94 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 879E98 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 879E9C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 879EA0 802402C0 0C0B2190 */ jal set_float_variable -/* 879EA4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 879EA8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 879EAC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 879EB0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 879EB4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 879EB8 802402D8 03E00008 */ jr $ra -/* 879EBC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_07/func_802402E0_879BE0.s b/asm/nonmatchings/world/area_tik/tik_07/func_802402E0_879BE0.s deleted file mode 100644 index 3d41df8c90..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/func_802402E0_879BE0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_879EC0 -/* 879EC0 802402E0 3C03800A */ lui $v1, %hi(D_8009A650) -/* 879EC4 802402E4 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 879EC8 802402E8 8C620000 */ lw $v0, ($v1) -/* 879ECC 802402EC 34420040 */ ori $v0, $v0, 0x40 -/* 879ED0 802402F0 AC620000 */ sw $v0, ($v1) -/* 879ED4 802402F4 03E00008 */ jr $ra -/* 879ED8 802402F8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_07/func_80240FA0_879BE0.s b/asm/nonmatchings/world/area_tik/tik_07/func_80240FA0_879BE0.s deleted file mode 100644 index 9c08c2dc44..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/func_80240FA0_879BE0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FA0_87AB80 -/* 87AB80 80240FA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87AB84 80240FA4 AFBF0018 */ sw $ra, 0x18($sp) -/* 87AB88 80240FA8 0C00EAD2 */ jal get_npc_safe -/* 87AB8C 80240FAC 2404FFFC */ addiu $a0, $zero, -4 -/* 87AB90 80240FB0 3C0141F0 */ lui $at, 0x41f0 -/* 87AB94 80240FB4 44810000 */ mtc1 $at, $f0 -/* 87AB98 80240FB8 C442003C */ lwc1 $f2, 0x3c($v0) -/* 87AB9C 80240FBC 46001080 */ add.s $f2, $f2, $f0 -/* 87ABA0 80240FC0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 87ABA4 80240FC4 8C450038 */ lw $a1, 0x38($v0) -/* 87ABA8 80240FC8 8C470040 */ lw $a3, 0x40($v0) -/* 87ABAC 80240FCC 44061000 */ mfc1 $a2, $f2 -/* 87ABB0 80240FD0 0C01BFBC */ jal func_8006FEF0 -/* 87ABB4 80240FD4 24040004 */ addiu $a0, $zero, 4 -/* 87ABB8 80240FD8 8FBF0018 */ lw $ra, 0x18($sp) -/* 87ABBC 80240FDC 24020002 */ addiu $v0, $zero, 2 -/* 87ABC0 80240FE0 03E00008 */ jr $ra -/* 87ABC4 80240FE4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/func_802415A0_879BE0.s b/asm/nonmatchings/world/area_tik/tik_07/func_802415A0_879BE0.s deleted file mode 100644 index a9edf57b9b..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/func_802415A0_879BE0.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415A0_87B180 -/* 87B180 802415A0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 87B184 802415A4 AFB3004C */ sw $s3, 0x4c($sp) -/* 87B188 802415A8 0080982D */ daddu $s3, $a0, $zero -/* 87B18C 802415AC AFBF0058 */ sw $ra, 0x58($sp) -/* 87B190 802415B0 AFB50054 */ sw $s5, 0x54($sp) -/* 87B194 802415B4 AFB40050 */ sw $s4, 0x50($sp) -/* 87B198 802415B8 AFB20048 */ sw $s2, 0x48($sp) -/* 87B19C 802415BC AFB10044 */ sw $s1, 0x44($sp) -/* 87B1A0 802415C0 AFB00040 */ sw $s0, 0x40($sp) -/* 87B1A4 802415C4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 87B1A8 802415C8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 87B1AC 802415CC F7B60068 */ sdc1 $f22, 0x68($sp) -/* 87B1B0 802415D0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 87B1B4 802415D4 8E710148 */ lw $s1, 0x148($s3) -/* 87B1B8 802415D8 00A0902D */ daddu $s2, $a1, $zero -/* 87B1BC 802415DC 86240008 */ lh $a0, 8($s1) -/* 87B1C0 802415E0 0C00EABB */ jal get_npc_unsafe -/* 87B1C4 802415E4 00C0A82D */ daddu $s5, $a2, $zero -/* 87B1C8 802415E8 0040802D */ daddu $s0, $v0, $zero -/* 87B1CC 802415EC 0000A02D */ daddu $s4, $zero, $zero -/* 87B1D0 802415F0 C624007C */ lwc1 $f4, 0x7c($s1) -/* 87B1D4 802415F4 46802120 */ cvt.s.w $f4, $f4 -/* 87B1D8 802415F8 C6220088 */ lwc1 $f2, 0x88($s1) -/* 87B1DC 802415FC 468010A0 */ cvt.s.w $f2, $f2 -/* 87B1E0 80241600 460010A1 */ cvt.d.s $f2, $f2 -/* 87B1E4 80241604 46002121 */ cvt.d.s $f4, $f4 -/* 87B1E8 80241608 C600003C */ lwc1 $f0, 0x3c($s0) -/* 87B1EC 8024160C 3C014059 */ lui $at, 0x4059 -/* 87B1F0 80241610 44813800 */ mtc1 $at, $f7 -/* 87B1F4 80241614 44803000 */ mtc1 $zero, $f6 -/* 87B1F8 80241618 46000021 */ cvt.d.s $f0, $f0 -/* 87B1FC 8024161C 46260002 */ mul.d $f0, $f0, $f6 -/* 87B200 80241620 00000000 */ nop -/* 87B204 80241624 24020001 */ addiu $v0, $zero, 1 -/* 87B208 80241628 8E24006C */ lw $a0, 0x6c($s1) -/* 87B20C 8024162C 46261083 */ div.d $f2, $f2, $f6 -/* 87B210 80241630 462010A0 */ cvt.s.d $f2, $f2 -/* 87B214 80241634 46262103 */ div.d $f4, $f4, $f6 -/* 87B218 80241638 46202520 */ cvt.s.d $f20, $f4 -/* 87B21C 8024163C 30830011 */ andi $v1, $a0, 0x11 -/* 87B220 80241640 4620020D */ trunc.w.d $f8, $f0 -/* 87B224 80241644 E628007C */ swc1 $f8, 0x7c($s1) -/* 87B228 80241648 C6200078 */ lwc1 $f0, 0x78($s1) -/* 87B22C 8024164C 46800020 */ cvt.s.w $f0, $f0 -/* 87B230 80241650 46000021 */ cvt.d.s $f0, $f0 -/* 87B234 80241654 46260003 */ div.d $f0, $f0, $f6 -/* 87B238 80241658 462006A0 */ cvt.s.d $f26, $f0 -/* 87B23C 8024165C C6200070 */ lwc1 $f0, 0x70($s1) -/* 87B240 80241660 46800020 */ cvt.s.w $f0, $f0 -/* 87B244 80241664 46000021 */ cvt.d.s $f0, $f0 -/* 87B248 80241668 46260003 */ div.d $f0, $f0, $f6 -/* 87B24C 8024166C 462005A0 */ cvt.s.d $f22, $f0 -/* 87B250 80241670 14620025 */ bne $v1, $v0, .L80241708 -/* 87B254 80241674 4602D600 */ add.s $f24, $f26, $f2 -/* 87B258 80241678 8E020000 */ lw $v0, ($s0) -/* 87B25C 8024167C 30420008 */ andi $v0, $v0, 8 -/* 87B260 80241680 10400009 */ beqz $v0, .L802416A8 -/* 87B264 80241684 27A50028 */ addiu $a1, $sp, 0x28 -/* 87B268 80241688 C600003C */ lwc1 $f0, 0x3c($s0) -/* 87B26C 8024168C 4600C001 */ sub.s $f0, $f24, $f0 -/* 87B270 80241690 4600B03C */ c.lt.s $f22, $f0 -/* 87B274 80241694 00000000 */ nop -/* 87B278 80241698 4500001B */ bc1f .L80241708 -/* 87B27C 8024169C 34820010 */ ori $v0, $a0, 0x10 -/* 87B280 802416A0 080905C2 */ j .L80241708 -/* 87B284 802416A4 AE22006C */ sw $v0, 0x6c($s1) -.L802416A8: -/* 87B288 802416A8 27A6002C */ addiu $a2, $sp, 0x2c -/* 87B28C 802416AC C6000038 */ lwc1 $f0, 0x38($s0) -/* 87B290 802416B0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 87B294 802416B4 C6040040 */ lwc1 $f4, 0x40($s0) -/* 87B298 802416B8 3C01447A */ lui $at, 0x447a -/* 87B29C 802416BC 44813000 */ mtc1 $at, $f6 -/* 87B2A0 802416C0 27A20034 */ addiu $v0, $sp, 0x34 -/* 87B2A4 802416C4 E7A00028 */ swc1 $f0, 0x28($sp) -/* 87B2A8 802416C8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 87B2AC 802416CC E7A40030 */ swc1 $f4, 0x30($sp) -/* 87B2B0 802416D0 E7A60034 */ swc1 $f6, 0x34($sp) -/* 87B2B4 802416D4 AFA20010 */ sw $v0, 0x10($sp) -/* 87B2B8 802416D8 8E040080 */ lw $a0, 0x80($s0) -/* 87B2BC 802416DC 0C0372DF */ jal func_800DCB7C -/* 87B2C0 802416E0 27A70030 */ addiu $a3, $sp, 0x30 -/* 87B2C4 802416E4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 87B2C8 802416E8 4600D001 */ sub.s $f0, $f26, $f0 -/* 87B2CC 802416EC 4600B03C */ c.lt.s $f22, $f0 -/* 87B2D0 802416F0 00000000 */ nop -/* 87B2D4 802416F4 45000004 */ bc1f .L80241708 -/* 87B2D8 802416F8 00000000 */ nop -/* 87B2DC 802416FC 8E22006C */ lw $v0, 0x6c($s1) -/* 87B2E0 80241700 34420010 */ ori $v0, $v0, 0x10 -/* 87B2E4 80241704 AE22006C */ sw $v0, 0x6c($s1) -.L80241708: -/* 87B2E8 80241708 8E22006C */ lw $v0, 0x6c($s1) -/* 87B2EC 8024170C 24030011 */ addiu $v1, $zero, 0x11 -/* 87B2F0 80241710 30420011 */ andi $v0, $v0, 0x11 -/* 87B2F4 80241714 14430039 */ bne $v0, $v1, .L802417FC -/* 87B2F8 80241718 00000000 */ nop -/* 87B2FC 8024171C 8E020000 */ lw $v0, ($s0) -/* 87B300 80241720 30420008 */ andi $v0, $v0, 8 -/* 87B304 80241724 1040000A */ beqz $v0, .L80241750 -/* 87B308 80241728 4600C106 */ mov.s $f4, $f24 -/* 87B30C 8024172C 4614C081 */ sub.s $f2, $f24, $f20 -/* 87B310 80241730 3C018024 */ lui $at, 0x8024 -/* 87B314 80241734 D42051B8 */ ldc1 $f0, 0x51b8($at) -/* 87B318 80241738 460010A1 */ cvt.d.s $f2, $f2 -/* 87B31C 8024173C 46201082 */ mul.d $f2, $f2, $f0 -/* 87B320 80241740 00000000 */ nop -/* 87B324 80241744 4600A021 */ cvt.d.s $f0, $f20 -/* 87B328 80241748 080905ED */ j .L802417B4 -/* 87B32C 8024174C 46220000 */ add.d $f0, $f0, $f2 -.L80241750: -/* 87B330 80241750 27A50028 */ addiu $a1, $sp, 0x28 -/* 87B334 80241754 27A6002C */ addiu $a2, $sp, 0x2c -/* 87B338 80241758 C6000038 */ lwc1 $f0, 0x38($s0) -/* 87B33C 8024175C C6020040 */ lwc1 $f2, 0x40($s0) -/* 87B340 80241760 3C01447A */ lui $at, 0x447a -/* 87B344 80241764 44812000 */ mtc1 $at, $f4 -/* 87B348 80241768 27A20034 */ addiu $v0, $sp, 0x34 -/* 87B34C 8024176C E7B4002C */ swc1 $f20, 0x2c($sp) -/* 87B350 80241770 E7A00028 */ swc1 $f0, 0x28($sp) -/* 87B354 80241774 E7A20030 */ swc1 $f2, 0x30($sp) -/* 87B358 80241778 E7A40034 */ swc1 $f4, 0x34($sp) -/* 87B35C 8024177C AFA20010 */ sw $v0, 0x10($sp) -/* 87B360 80241780 8E040080 */ lw $a0, 0x80($s0) -/* 87B364 80241784 0C0372DF */ jal func_800DCB7C -/* 87B368 80241788 27A70030 */ addiu $a3, $sp, 0x30 -/* 87B36C 8024178C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* 87B370 80241790 461A2100 */ add.s $f4, $f4, $f26 -/* 87B374 80241794 46142081 */ sub.s $f2, $f4, $f20 -/* 87B378 80241798 3C018024 */ lui $at, 0x8024 -/* 87B37C 8024179C D42051C0 */ ldc1 $f0, 0x51c0($at) -/* 87B380 802417A0 460010A1 */ cvt.d.s $f2, $f2 -/* 87B384 802417A4 46201082 */ mul.d $f2, $f2, $f0 -/* 87B388 802417A8 00000000 */ nop -/* 87B38C 802417AC 4600A021 */ cvt.d.s $f0, $f20 -/* 87B390 802417B0 46220000 */ add.d $f0, $f0, $f2 -.L802417B4: -/* 87B394 802417B4 46200020 */ cvt.s.d $f0, $f0 -/* 87B398 802417B8 E600003C */ swc1 $f0, 0x3c($s0) -/* 87B39C 802417BC C600003C */ lwc1 $f0, 0x3c($s0) -/* 87B3A0 802417C0 46002001 */ sub.s $f0, $f4, $f0 -/* 87B3A4 802417C4 3C013FF0 */ lui $at, 0x3ff0 -/* 87B3A8 802417C8 44811800 */ mtc1 $at, $f3 -/* 87B3AC 802417CC 44801000 */ mtc1 $zero, $f2 -/* 87B3B0 802417D0 46000005 */ abs.s $f0, $f0 -/* 87B3B4 802417D4 46000021 */ cvt.d.s $f0, $f0 -/* 87B3B8 802417D8 4622003C */ c.lt.d $f0, $f2 -/* 87B3BC 802417DC 00000000 */ nop -/* 87B3C0 802417E0 45000036 */ bc1f .L802418BC -/* 87B3C4 802417E4 2403FFEF */ addiu $v1, $zero, -0x11 -/* 87B3C8 802417E8 E604003C */ swc1 $f4, 0x3c($s0) -/* 87B3CC 802417EC 8E22006C */ lw $v0, 0x6c($s1) -/* 87B3D0 802417F0 00431024 */ and $v0, $v0, $v1 -/* 87B3D4 802417F4 0809062F */ j .L802418BC -/* 87B3D8 802417F8 AE22006C */ sw $v0, 0x6c($s1) -.L802417FC: -/* 87B3DC 802417FC 8E220070 */ lw $v0, 0x70($s1) -/* 87B3E0 80241800 1840002E */ blez $v0, .L802418BC -/* 87B3E4 80241804 00000000 */ nop -/* 87B3E8 80241808 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 87B3EC 8024180C 0C00A8BB */ jal sin_deg -/* 87B3F0 80241810 46806320 */ cvt.s.w $f12, $f12 -/* 87B3F4 80241814 8E020000 */ lw $v0, ($s0) -/* 87B3F8 80241818 30420008 */ andi $v0, $v0, 8 -/* 87B3FC 8024181C 10400003 */ beqz $v0, .L8024182C -/* 87B400 80241820 46000506 */ mov.s $f20, $f0 -/* 87B404 80241824 0809061B */ j .L8024186C -/* 87B408 80241828 0000102D */ daddu $v0, $zero, $zero -.L8024182C: -/* 87B40C 8024182C 27A50028 */ addiu $a1, $sp, 0x28 -/* 87B410 80241830 27A6002C */ addiu $a2, $sp, 0x2c -/* 87B414 80241834 C6000038 */ lwc1 $f0, 0x38($s0) -/* 87B418 80241838 C602003C */ lwc1 $f2, 0x3c($s0) -/* 87B41C 8024183C C6040040 */ lwc1 $f4, 0x40($s0) -/* 87B420 80241840 3C01447A */ lui $at, 0x447a -/* 87B424 80241844 44813000 */ mtc1 $at, $f6 -/* 87B428 80241848 27A20034 */ addiu $v0, $sp, 0x34 -/* 87B42C 8024184C E7A00028 */ swc1 $f0, 0x28($sp) -/* 87B430 80241850 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 87B434 80241854 E7A40030 */ swc1 $f4, 0x30($sp) -/* 87B438 80241858 E7A60034 */ swc1 $f6, 0x34($sp) -/* 87B43C 8024185C AFA20010 */ sw $v0, 0x10($sp) -/* 87B440 80241860 8E040080 */ lw $a0, 0x80($s0) -/* 87B444 80241864 0C0372DF */ jal func_800DCB7C -/* 87B448 80241868 27A70030 */ addiu $a3, $sp, 0x30 -.L8024186C: -/* 87B44C 8024186C 10400007 */ beqz $v0, .L8024188C -/* 87B450 80241870 00000000 */ nop -/* 87B454 80241874 4616A082 */ mul.s $f2, $f20, $f22 -/* 87B458 80241878 00000000 */ nop -/* 87B45C 8024187C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 87B460 80241880 461A0000 */ add.s $f0, $f0, $f26 -/* 87B464 80241884 08090626 */ j .L80241898 -/* 87B468 80241888 46020000 */ add.s $f0, $f0, $f2 -.L8024188C: -/* 87B46C 8024188C 4616A002 */ mul.s $f0, $f20, $f22 -/* 87B470 80241890 00000000 */ nop -/* 87B474 80241894 4600C000 */ add.s $f0, $f24, $f0 -.L80241898: -/* 87B478 80241898 E600003C */ swc1 $f0, 0x3c($s0) -/* 87B47C 8024189C 8E220074 */ lw $v0, 0x74($s1) -/* 87B480 802418A0 2442000A */ addiu $v0, $v0, 0xa -/* 87B484 802418A4 44826000 */ mtc1 $v0, $f12 -/* 87B488 802418A8 00000000 */ nop -/* 87B48C 802418AC 0C00A6C9 */ jal clamp_angle -/* 87B490 802418B0 46806320 */ cvt.s.w $f12, $f12 -/* 87B494 802418B4 4600020D */ trunc.w.s $f8, $f0 -/* 87B498 802418B8 E6280074 */ swc1 $f8, 0x74($s1) -.L802418BC: -/* 87B49C 802418BC 8E220090 */ lw $v0, 0x90($s1) -/* 87B4A0 802418C0 1C40004A */ bgtz $v0, .L802419EC -/* 87B4A4 802418C4 2442FFFF */ addiu $v0, $v0, -1 -/* 87B4A8 802418C8 8E430014 */ lw $v1, 0x14($s2) -/* 87B4AC 802418CC 04600048 */ bltz $v1, .L802419F0 -/* 87B4B0 802418D0 00000000 */ nop -/* 87B4B4 802418D4 8E620074 */ lw $v0, 0x74($s3) -/* 87B4B8 802418D8 1C400042 */ bgtz $v0, .L802419E4 -/* 87B4BC 802418DC 2442FFFF */ addiu $v0, $v0, -1 -/* 87B4C0 802418E0 AE630074 */ sw $v1, 0x74($s3) -/* 87B4C4 802418E4 860200A8 */ lh $v0, 0xa8($s0) -/* 87B4C8 802418E8 C602003C */ lwc1 $f2, 0x3c($s0) -/* 87B4CC 802418EC 44820000 */ mtc1 $v0, $f0 -/* 87B4D0 802418F0 00000000 */ nop -/* 87B4D4 802418F4 46800020 */ cvt.s.w $f0, $f0 -/* 87B4D8 802418F8 46001080 */ add.s $f2, $f2, $f0 -/* 87B4DC 802418FC 3C014024 */ lui $at, 0x4024 -/* 87B4E0 80241900 44810800 */ mtc1 $at, $f1 -/* 87B4E4 80241904 44800000 */ mtc1 $zero, $f0 -/* 87B4E8 80241908 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 87B4EC 8024190C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 87B4F0 80241910 460010A1 */ cvt.d.s $f2, $f2 -/* 87B4F4 80241914 46201080 */ add.d $f2, $f2, $f0 -/* 87B4F8 80241918 C440002C */ lwc1 $f0, 0x2c($v0) -/* 87B4FC 8024191C 46000021 */ cvt.d.s $f0, $f0 -/* 87B500 80241920 4622003C */ c.lt.d $f0, $f2 -/* 87B504 80241924 00000000 */ nop -/* 87B508 80241928 4500002C */ bc1f .L802419DC -/* 87B50C 8024192C 02A0202D */ daddu $a0, $s5, $zero -/* 87B510 80241930 AFA00010 */ sw $zero, 0x10($sp) -/* 87B514 80241934 8E46000C */ lw $a2, 0xc($s2) -/* 87B518 80241938 8E470010 */ lw $a3, 0x10($s2) -/* 87B51C 8024193C 0C01242D */ jal func_800490B4 -/* 87B520 80241940 0220282D */ daddu $a1, $s1, $zero -/* 87B524 80241944 10400025 */ beqz $v0, .L802419DC -/* 87B528 80241948 0000202D */ daddu $a0, $zero, $zero -/* 87B52C 8024194C 0200282D */ daddu $a1, $s0, $zero -/* 87B530 80241950 0000302D */ daddu $a2, $zero, $zero -/* 87B534 80241954 2412000C */ addiu $s2, $zero, 0xc -/* 87B538 80241958 860300A8 */ lh $v1, 0xa8($s0) -/* 87B53C 8024195C 3C013F80 */ lui $at, 0x3f80 -/* 87B540 80241960 44810000 */ mtc1 $at, $f0 -/* 87B544 80241964 3C014000 */ lui $at, 0x4000 -/* 87B548 80241968 44811000 */ mtc1 $at, $f2 -/* 87B54C 8024196C 3C01C1A0 */ lui $at, 0xc1a0 -/* 87B550 80241970 44812000 */ mtc1 $at, $f4 -/* 87B554 80241974 44834000 */ mtc1 $v1, $f8 -/* 87B558 80241978 00000000 */ nop -/* 87B55C 8024197C 46804220 */ cvt.s.w $f8, $f8 -/* 87B560 80241980 44074000 */ mfc1 $a3, $f8 -/* 87B564 80241984 27A20038 */ addiu $v0, $sp, 0x38 -/* 87B568 80241988 AFB2001C */ sw $s2, 0x1c($sp) -/* 87B56C 8024198C AFA20020 */ sw $v0, 0x20($sp) -/* 87B570 80241990 E7A00010 */ swc1 $f0, 0x10($sp) -/* 87B574 80241994 E7A20014 */ swc1 $f2, 0x14($sp) -/* 87B578 80241998 0C01BFA4 */ jal fx_emote -/* 87B57C 8024199C E7A40018 */ swc1 $f4, 0x18($sp) -/* 87B580 802419A0 0200202D */ daddu $a0, $s0, $zero -/* 87B584 802419A4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 87B588 802419A8 C480003C */ lwc1 $f0, 0x3c($a0) -/* 87B58C 802419AC 3C060020 */ lui $a2, 0x20 -/* 87B590 802419B0 0C012530 */ jal func_800494C0 -/* 87B594 802419B4 E4800064 */ swc1 $f0, 0x64($a0) -/* 87B598 802419B8 8E220018 */ lw $v0, 0x18($s1) -/* 87B59C 802419BC 9442002A */ lhu $v0, 0x2a($v0) -/* 87B5A0 802419C0 30420001 */ andi $v0, $v0, 1 -/* 87B5A4 802419C4 10400003 */ beqz $v0, .L802419D4 -/* 87B5A8 802419C8 2402000A */ addiu $v0, $zero, 0xa -/* 87B5AC 802419CC 080906E5 */ j .L80241B94 -/* 87B5B0 802419D0 AE620070 */ sw $v0, 0x70($s3) -.L802419D4: -/* 87B5B4 802419D4 080906E5 */ j .L80241B94 -/* 87B5B8 802419D8 AE720070 */ sw $s2, 0x70($s3) -.L802419DC: -/* 87B5BC 802419DC 8E620074 */ lw $v0, 0x74($s3) -/* 87B5C0 802419E0 2442FFFF */ addiu $v0, $v0, -1 -.L802419E4: -/* 87B5C4 802419E4 0809067C */ j .L802419F0 -/* 87B5C8 802419E8 AE620074 */ sw $v0, 0x74($s3) -.L802419EC: -/* 87B5CC 802419EC AE220090 */ sw $v0, 0x90($s1) -.L802419F0: -/* 87B5D0 802419F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 87B5D4 802419F4 C6000040 */ lwc1 $f0, 0x40($s0) -/* 87B5D8 802419F8 C4620000 */ lwc1 $f2, ($v1) -/* 87B5DC 802419FC 468010A0 */ cvt.s.w $f2, $f2 -/* 87B5E0 80241A00 C4640008 */ lwc1 $f4, 8($v1) -/* 87B5E4 80241A04 46802120 */ cvt.s.w $f4, $f4 -/* 87B5E8 80241A08 E7A00010 */ swc1 $f0, 0x10($sp) -/* 87B5EC 80241A0C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B5F0 80241A10 44051000 */ mfc1 $a1, $f2 -/* 87B5F4 80241A14 C440000C */ lwc1 $f0, 0xc($v0) -/* 87B5F8 80241A18 46800020 */ cvt.s.w $f0, $f0 -/* 87B5FC 80241A1C E7A00014 */ swc1 $f0, 0x14($sp) -/* 87B600 80241A20 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B604 80241A24 44062000 */ mfc1 $a2, $f4 -/* 87B608 80241A28 C4400010 */ lwc1 $f0, 0x10($v0) -/* 87B60C 80241A2C 46800020 */ cvt.s.w $f0, $f0 -/* 87B610 80241A30 E7A00018 */ swc1 $f0, 0x18($sp) -/* 87B614 80241A34 8C640018 */ lw $a0, 0x18($v1) -/* 87B618 80241A38 0C0123F5 */ jal is_point_within_region -/* 87B61C 80241A3C 8E070038 */ lw $a3, 0x38($s0) -/* 87B620 80241A40 1040001A */ beqz $v0, .L80241AAC -/* 87B624 80241A44 00000000 */ nop -/* 87B628 80241A48 8E060038 */ lw $a2, 0x38($s0) -/* 87B62C 80241A4C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B630 80241A50 8E070040 */ lw $a3, 0x40($s0) -/* 87B634 80241A54 C44C0000 */ lwc1 $f12, ($v0) -/* 87B638 80241A58 46806320 */ cvt.s.w $f12, $f12 -/* 87B63C 80241A5C C44E0008 */ lwc1 $f14, 8($v0) -/* 87B640 80241A60 0C00A7B5 */ jal dist2D -/* 87B644 80241A64 468073A0 */ cvt.s.w $f14, $f14 -/* 87B648 80241A68 C6020018 */ lwc1 $f2, 0x18($s0) -/* 87B64C 80241A6C 4600103C */ c.lt.s $f2, $f0 -/* 87B650 80241A70 00000000 */ nop -/* 87B654 80241A74 4500000D */ bc1f .L80241AAC -/* 87B658 80241A78 E7A00034 */ swc1 $f0, 0x34($sp) -/* 87B65C 80241A7C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 87B660 80241A80 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B664 80241A84 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 87B668 80241A88 C4480000 */ lwc1 $f8, ($v0) -/* 87B66C 80241A8C 46804220 */ cvt.s.w $f8, $f8 -/* 87B670 80241A90 44064000 */ mfc1 $a2, $f8 -/* 87B674 80241A94 C4480008 */ lwc1 $f8, 8($v0) -/* 87B678 80241A98 46804220 */ cvt.s.w $f8, $f8 -/* 87B67C 80241A9C 44074000 */ mfc1 $a3, $f8 -/* 87B680 80241AA0 0C00A720 */ jal atan2 -/* 87B684 80241AA4 24140001 */ addiu $s4, $zero, 1 -/* 87B688 80241AA8 E600000C */ swc1 $f0, 0xc($s0) -.L80241AAC: -/* 87B68C 80241AAC 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B690 80241AB0 8C43000C */ lw $v1, 0xc($v0) -/* 87B694 80241AB4 8C420010 */ lw $v0, 0x10($v0) -/* 87B698 80241AB8 00621825 */ or $v1, $v1, $v0 -/* 87B69C 80241ABC 00741825 */ or $v1, $v1, $s4 -/* 87B6A0 80241AC0 10600008 */ beqz $v1, .L80241AE4 -/* 87B6A4 80241AC4 00000000 */ nop -/* 87B6A8 80241AC8 8602008C */ lh $v0, 0x8c($s0) -/* 87B6AC 80241ACC 14400031 */ bnez $v0, .L80241B94 -/* 87B6B0 80241AD0 00000000 */ nop -/* 87B6B4 80241AD4 8E050018 */ lw $a1, 0x18($s0) -/* 87B6B8 80241AD8 8E06000C */ lw $a2, 0xc($s0) -/* 87B6BC 80241ADC 0C00EA95 */ jal npc_move_heading -/* 87B6C0 80241AE0 0200202D */ daddu $a0, $s0, $zero -.L80241AE4: -/* 87B6C4 80241AE4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 87B6C8 80241AE8 3C014059 */ lui $at, 0x4059 -/* 87B6CC 80241AEC 44811800 */ mtc1 $at, $f3 -/* 87B6D0 80241AF0 44801000 */ mtc1 $zero, $f2 -/* 87B6D4 80241AF4 46000021 */ cvt.d.s $f0, $f0 -/* 87B6D8 80241AF8 46220002 */ mul.d $f0, $f0, $f2 -/* 87B6DC 80241AFC 00000000 */ nop -/* 87B6E0 80241B00 4620020D */ trunc.w.d $f8, $f0 -/* 87B6E4 80241B04 E628007C */ swc1 $f8, 0x7c($s1) -/* 87B6E8 80241B08 8E420004 */ lw $v0, 4($s2) -/* 87B6EC 80241B0C 18400021 */ blez $v0, .L80241B94 -/* 87B6F0 80241B10 00000000 */ nop -/* 87B6F4 80241B14 8602008E */ lh $v0, 0x8e($s0) -/* 87B6F8 80241B18 9603008E */ lhu $v1, 0x8e($s0) -/* 87B6FC 80241B1C 18400005 */ blez $v0, .L80241B34 -/* 87B700 80241B20 2462FFFF */ addiu $v0, $v1, -1 -/* 87B704 80241B24 A602008E */ sh $v0, 0x8e($s0) -/* 87B708 80241B28 00021400 */ sll $v0, $v0, 0x10 -/* 87B70C 80241B2C 1C400019 */ bgtz $v0, .L80241B94 -/* 87B710 80241B30 00000000 */ nop -.L80241B34: -/* 87B714 80241B34 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 87B718 80241B38 24020002 */ addiu $v0, $zero, 2 -/* 87B71C 80241B3C 0C00A67F */ jal rand_int -/* 87B720 80241B40 AE620070 */ sw $v0, 0x70($s3) -/* 87B724 80241B44 3C035555 */ lui $v1, 0x5555 -/* 87B728 80241B48 34635556 */ ori $v1, $v1, 0x5556 -/* 87B72C 80241B4C 00430018 */ mult $v0, $v1 -/* 87B730 80241B50 000227C3 */ sra $a0, $v0, 0x1f -/* 87B734 80241B54 00004010 */ mfhi $t0 -/* 87B738 80241B58 01042023 */ subu $a0, $t0, $a0 -/* 87B73C 80241B5C 00041840 */ sll $v1, $a0, 1 -/* 87B740 80241B60 00641821 */ addu $v1, $v1, $a0 -/* 87B744 80241B64 00431023 */ subu $v0, $v0, $v1 -/* 87B748 80241B68 24430002 */ addiu $v1, $v0, 2 -/* 87B74C 80241B6C AE630074 */ sw $v1, 0x74($s3) -/* 87B750 80241B70 8E42002C */ lw $v0, 0x2c($s2) -/* 87B754 80241B74 58400007 */ blezl $v0, .L80241B94 -/* 87B758 80241B78 AE600070 */ sw $zero, 0x70($s3) -/* 87B75C 80241B7C 8E420008 */ lw $v0, 8($s2) -/* 87B760 80241B80 18400003 */ blez $v0, .L80241B90 -/* 87B764 80241B84 28620003 */ slti $v0, $v1, 3 -/* 87B768 80241B88 10400002 */ beqz $v0, .L80241B94 -/* 87B76C 80241B8C 00000000 */ nop -.L80241B90: -/* 87B770 80241B90 AE600070 */ sw $zero, 0x70($s3) -.L80241B94: -/* 87B774 80241B94 8FBF0058 */ lw $ra, 0x58($sp) -/* 87B778 80241B98 8FB50054 */ lw $s5, 0x54($sp) -/* 87B77C 80241B9C 8FB40050 */ lw $s4, 0x50($sp) -/* 87B780 80241BA0 8FB3004C */ lw $s3, 0x4c($sp) -/* 87B784 80241BA4 8FB20048 */ lw $s2, 0x48($sp) -/* 87B788 80241BA8 8FB10044 */ lw $s1, 0x44($sp) -/* 87B78C 80241BAC 8FB00040 */ lw $s0, 0x40($sp) -/* 87B790 80241BB0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 87B794 80241BB4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 87B798 80241BB8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 87B79C 80241BBC D7B40060 */ ldc1 $f20, 0x60($sp) -/* 87B7A0 80241BC0 03E00008 */ jr $ra -/* 87B7A4 80241BC4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_tik/tik_08/func_80240020_87EDF0.s b/asm/nonmatchings/world/area_tik/tik_08/func_80240020_87EDF0.s deleted file mode 100644 index 86812cbd86..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/func_80240020_87EDF0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_87EE10 -/* 87EE10 80240020 3C028016 */ lui $v0, 0x8016 -/* 87EE14 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 87EE18 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 87EE1C 8024002C 03E00008 */ jr $ra -/* 87EE20 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_08/func_80240034_87EDF0.s b/asm/nonmatchings/world/area_tik/tik_08/func_80240034_87EDF0.s deleted file mode 100644 index dc8bd6a23c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/func_80240034_87EDF0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_87EE24 -/* 87EE24 80240034 3C038016 */ lui $v1, 0x8016 -/* 87EE28 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* 87EE2C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87EE30 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 87EE34 80240044 0080802D */ daddu $s0, $a0, $zero -/* 87EE38 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* 87EE3C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 87EE40 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* 87EE44 80240054 24020002 */ addiu $v0, $zero, 2 -/* 87EE48 80240058 08090038 */ j .L802400E0 -/* 87EE4C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* 87EE50 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 87EE54 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 87EE58 80240068 80620040 */ lb $v0, 0x40($v1) -/* 87EE5C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* 87EE60 80240070 04420001 */ bltzl $v0, .L80240078 -/* 87EE64 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* 87EE68 80240078 14400003 */ bnez $v0, .L80240088 -/* 87EE6C 8024007C 00000000 */ nop -/* 87EE70 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* 87EE74 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* 87EE78 80240088 44822000 */ mtc1 $v0, $f4 -/* 87EE7C 8024008C 00000000 */ nop -/* 87EE80 80240090 46802120 */ cvt.s.w $f4, $f4 -/* 87EE84 80240094 44062000 */ mfc1 $a2, $f4 -/* 87EE88 80240098 44872000 */ mtc1 $a3, $f4 -/* 87EE8C 8024009C 00000000 */ nop -/* 87EE90 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* 87EE94 802400A4 44806000 */ mtc1 $zero, $f12 -/* 87EE98 802400A8 44072000 */ mfc1 $a3, $f4 -/* 87EE9C 802400AC 0C00A720 */ jal atan2 -/* 87EEA0 802400B0 46006386 */ mov.s $f14, $f12 -/* 87EEA4 802400B4 3C014270 */ lui $at, 0x4270 -/* 87EEA8 802400B8 44811000 */ mtc1 $at, $f2 -/* 87EEAC 802400BC 00000000 */ nop -/* 87EEB0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 87EEB4 802400C4 00000000 */ nop -/* 87EEB8 802400C8 45000004 */ bc1f .L802400DC -/* 87EEBC 802400CC 24020001 */ addiu $v0, $zero, 1 -/* 87EEC0 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* 87EEC4 802400D4 08090038 */ j .L802400E0 -/* 87EEC8 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* 87EECC 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* 87EED0 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 87EED4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 87EED8 802400E8 03E00008 */ jr $ra -/* 87EEDC 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_08/func_802400F0_87EDF0.s b/asm/nonmatchings/world/area_tik/tik_08/func_802400F0_87EDF0.s deleted file mode 100644 index 8bf9df37bf..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/func_802400F0_87EDF0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_87EEE0 -/* 87EEE0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87EEE4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 87EEE8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 87EEEC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 87EEF0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 87EEF4 80240104 0C016AFA */ jal get_current_map_header -/* 87EEF8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 87EEFC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 87EF00 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 87EF04 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 87EF08 80240118 0C0B1EAF */ jal get_variable -/* 87EF0C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 87EF10 80240120 0220202D */ daddu $a0, $s1, $zero -/* 87EF14 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 87EF18 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 87EF1C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 87EF20 80240130 02031821 */ addu $v1, $s0, $v1 -/* 87EF24 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 87EF28 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 87EF2C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 87EF30 80240140 0C0B2026 */ jal set_variable -/* 87EF34 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 87EF38 80240148 0220202D */ daddu $a0, $s1, $zero -/* 87EF3C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 87EF40 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 87EF44 80240154 02021021 */ addu $v0, $s0, $v0 -/* 87EF48 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 87EF4C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 87EF50 80240160 44061000 */ mfc1 $a2, $f2 -/* 87EF54 80240164 0C0B2026 */ jal set_variable -/* 87EF58 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 87EF5C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 87EF60 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 87EF64 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 87EF68 80240178 02021021 */ addu $v0, $s0, $v0 -/* 87EF6C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 87EF70 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 87EF74 80240184 44061000 */ mfc1 $a2, $f2 -/* 87EF78 80240188 0C0B2026 */ jal set_variable -/* 87EF7C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 87EF80 80240190 0220202D */ daddu $a0, $s1, $zero -/* 87EF84 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 87EF88 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 87EF8C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 87EF90 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 87EF94 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 87EF98 802401A8 44061000 */ mfc1 $a2, $f2 -/* 87EF9C 802401AC 0C0B2026 */ jal set_variable -/* 87EFA0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 87EFA4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 87EFA8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 87EFAC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 87EFB0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 87EFB4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 87EFB8 802401C8 03E00008 */ jr $ra -/* 87EFBC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_08/func_802401D0_87EDF0.s b/asm/nonmatchings/world/area_tik/tik_08/func_802401D0_87EDF0.s deleted file mode 100644 index 6d5221c93e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/func_802401D0_87EDF0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_87EFC0 -/* 87EFC0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 87EFC4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 87EFC8 802401D8 3C014334 */ lui $at, 0x4334 -/* 87EFCC 802401DC 44816000 */ mtc1 $at, $f12 -/* 87EFD0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87EFD4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 87EFD8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 87EFDC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 87EFE0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 87EFE4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 87EFE8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 87EFEC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 87EFF0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 87EFF4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 87EFF8 80240208 3C01800B */ lui $at, 0x800b -/* 87EFFC 8024020C 00220821 */ addu $at, $at, $v0 -/* 87F000 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 87F004 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 87F008 80240218 0C00A6C9 */ jal clamp_angle -/* 87F00C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 87F010 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 87F014 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 87F018 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 87F01C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 87F020 80240230 24020002 */ addiu $v0, $zero, 2 -/* 87F024 80240234 03E00008 */ jr $ra -/* 87F028 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_08/func_8024023C_87EDF0.s b/asm/nonmatchings/world/area_tik/tik_08/func_8024023C_87EDF0.s deleted file mode 100644 index fcdc328cf9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/func_8024023C_87EDF0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_87F02C -/* 87F02C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 87F030 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 87F034 80240244 0080802D */ daddu $s0, $a0, $zero -/* 87F038 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 87F03C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 87F040 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 87F044 80240254 0C0B210B */ jal get_float_variable -/* 87F048 80240258 8C450000 */ lw $a1, ($v0) -/* 87F04C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 87F050 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 87F054 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 87F058 80240268 44060000 */ mfc1 $a2, $f0 -/* 87F05C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 87F060 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 87F064 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 87F068 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 87F06C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 87F070 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 87F074 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 87F078 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 87F07C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 87F080 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 87F084 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 87F088 80240298 0C0B2190 */ jal set_float_variable -/* 87F08C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 87F090 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 87F094 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 87F098 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 87F09C 802402AC 0C0B2190 */ jal set_float_variable -/* 87F0A0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 87F0A4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 87F0A8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 87F0AC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 87F0B0 802402C0 0C0B2190 */ jal set_float_variable -/* 87F0B4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 87F0B8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 87F0BC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 87F0C0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 87F0C4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 87F0C8 802402D8 03E00008 */ jr $ra -/* 87F0CC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_08/func_802402E0_87EDF0.s b/asm/nonmatchings/world/area_tik/tik_08/func_802402E0_87EDF0.s deleted file mode 100644 index 00df7f4d12..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/func_802402E0_87EDF0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_87F0D0 -/* 87F0D0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87F0D4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 87F0D8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 87F0DC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 87F0E0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 87F0E4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 87F0E8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 87F0EC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 87F0F0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 87F0F4 80240304 3C020002 */ lui $v0, 2 -/* 87F0F8 80240308 080900C8 */ j .L80240320 -/* 87F0FC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 87F100 80240310 3C040002 */ lui $a0, 2 -/* 87F104 80240314 0083102A */ slt $v0, $a0, $v1 -/* 87F108 80240318 10400002 */ beqz $v0, .L80240324 -/* 87F10C 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 87F110 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 87F114 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 87F118 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 87F11C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 87F120 80240330 04610004 */ bgez $v1, .L80240344 -/* 87F124 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 87F128 80240338 3C020002 */ lui $v0, 2 -/* 87F12C 8024033C 080900D5 */ j .L80240354 -/* 87F130 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 87F134 80240344 3C040002 */ lui $a0, 2 -/* 87F138 80240348 0083102A */ slt $v0, $a0, $v1 -/* 87F13C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 87F140 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 87F144 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 87F148 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 87F14C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 87F150 80240360 00621821 */ addu $v1, $v1, $v0 -/* 87F154 80240364 04610004 */ bgez $v1, .L80240378 -/* 87F158 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 87F15C 8024036C 3C020002 */ lui $v0, 2 -/* 87F160 80240370 080900E2 */ j .L80240388 -/* 87F164 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 87F168 80240378 3C040002 */ lui $a0, 2 -/* 87F16C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 87F170 80240380 10400002 */ beqz $v0, .L8024038C -/* 87F174 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 87F178 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 87F17C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 87F180 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 87F184 80240394 00621821 */ addu $v1, $v1, $v0 -/* 87F188 80240398 04610004 */ bgez $v1, .L802403AC -/* 87F18C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 87F190 802403A0 3C020002 */ lui $v0, 2 -/* 87F194 802403A4 080900EF */ j .L802403BC -/* 87F198 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 87F19C 802403AC 3C040002 */ lui $a0, 2 -/* 87F1A0 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 87F1A4 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 87F1A8 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 87F1AC 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 87F1B0 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 87F1B4 802403C4 0C046F07 */ jal set_main_pan_u -/* 87F1B8 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 87F1BC 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 87F1C0 802403D0 0C046F0D */ jal set_main_pan_v -/* 87F1C4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 87F1C8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 87F1CC 802403DC 0C046F13 */ jal set_aux_pan_u -/* 87F1D0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 87F1D4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 87F1D8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 87F1DC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 87F1E0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 87F1E4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 87F1E8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 87F1EC 802403FC 03E00008 */ jr $ra -/* 87F1F0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_08/func_80240404_87EDF0.s b/asm/nonmatchings/world/area_tik/tik_08/func_80240404_87EDF0.s deleted file mode 100644 index 0ad126f87e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/func_80240404_87EDF0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_87F1F4 -/* 87F1F4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87F1F8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 87F1FC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 87F200 80240410 10A00005 */ beqz $a1, .L80240428 -/* 87F204 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 87F208 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 87F20C 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 87F210 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 87F214 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 87F218 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 87F21C 8024042C 1440000E */ bnez $v0, .L80240468 -/* 87F220 80240430 00000000 */ nop -/* 87F224 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 87F228 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 87F22C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 87F230 80240440 04610004 */ bgez $v1, .L80240454 -/* 87F234 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 87F238 80240448 3C020002 */ lui $v0, 2 -/* 87F23C 8024044C 08090119 */ j .L80240464 -/* 87F240 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 87F244 80240454 3C040002 */ lui $a0, 2 -/* 87F248 80240458 0083102A */ slt $v0, $a0, $v1 -/* 87F24C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 87F250 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 87F254 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 87F258 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 87F25C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 87F260 80240470 00000000 */ nop -/* 87F264 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 87F268 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 87F26C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 87F270 80240480 04610004 */ bgez $v1, .L80240494 -/* 87F274 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 87F278 80240488 3C020002 */ lui $v0, 2 -/* 87F27C 8024048C 08090129 */ j .L802404A4 -/* 87F280 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 87F284 80240494 3C040002 */ lui $a0, 2 -/* 87F288 80240498 0083102A */ slt $v0, $a0, $v1 -/* 87F28C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 87F290 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 87F294 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 87F298 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 87F29C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 87F2A0 802404B0 00000000 */ nop -/* 87F2A4 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 87F2A8 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 87F2AC 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 87F2B0 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 87F2B4 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 87F2B8 802404C8 3C020002 */ lui $v0, 2 -/* 87F2BC 802404CC 08090139 */ j .L802404E4 -/* 87F2C0 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 87F2C4 802404D4 3C040002 */ lui $a0, 2 -/* 87F2C8 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 87F2CC 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 87F2D0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 87F2D4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 87F2D8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 87F2DC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 87F2E0 802404F0 00000000 */ nop -/* 87F2E4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 87F2E8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 87F2EC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 87F2F0 80240500 04610004 */ bgez $v1, .L80240514 -/* 87F2F4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 87F2F8 80240508 3C020002 */ lui $v0, 2 -/* 87F2FC 8024050C 08090149 */ j .L80240524 -/* 87F300 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 87F304 80240514 3C040002 */ lui $a0, 2 -/* 87F308 80240518 0083102A */ slt $v0, $a0, $v1 -/* 87F30C 8024051C 10400002 */ beqz $v0, .L80240528 -/* 87F310 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 87F314 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 87F318 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 87F31C 8024052C 0C046F07 */ jal set_main_pan_u -/* 87F320 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 87F324 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 87F328 80240538 0C046F0D */ jal set_main_pan_v -/* 87F32C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 87F330 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 87F334 80240544 0C046F13 */ jal set_aux_pan_u -/* 87F338 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 87F33C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 87F340 80240550 0C046F19 */ jal set_aux_pan_v -/* 87F344 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 87F348 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 87F34C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 87F350 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 87F354 80240564 24420001 */ addiu $v0, $v0, 1 -/* 87F358 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 87F35C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 87F360 80240570 24630001 */ addiu $v1, $v1, 1 -/* 87F364 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 87F368 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 87F36C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 87F370 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 87F374 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 87F378 80240588 0064182A */ slt $v1, $v1, $a0 -/* 87F37C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 87F380 80240590 14600002 */ bnez $v1, .L8024059C -/* 87F384 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 87F388 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 87F38C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 87F390 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 87F394 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 87F398 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 87F39C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 87F3A0 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 87F3A4 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 87F3A8 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 87F3AC 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 87F3B0 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 87F3B4 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 87F3B8 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 87F3BC 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 87F3C0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 87F3C4 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 87F3C8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 87F3CC 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 87F3D0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 87F3D4 802405E4 03E00008 */ jr $ra -/* 87F3D8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 87F3DC 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_08/func_802405F0_87EDF0.s b/asm/nonmatchings/world/area_tik/tik_08/func_802405F0_87EDF0.s deleted file mode 100644 index 1c5fa016e8..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/func_802405F0_87EDF0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_87F3E0 -/* 87F3E0 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 87F3E4 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 87F3E8 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 87F3EC 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 87F3F0 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 87F3F4 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 87F3F8 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 87F3FC 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 87F400 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 87F404 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 87F408 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 87F40C 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 87F410 80240620 0C0B1EAF */ jal get_variable -/* 87F414 80240624 8C450000 */ lw $a1, ($v0) -/* 87F418 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 87F41C 8024062C 0C00EABB */ jal get_npc_unsafe -/* 87F420 80240630 0040802D */ daddu $s0, $v0, $zero -/* 87F424 80240634 0200202D */ daddu $a0, $s0, $zero -/* 87F428 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 87F42C 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 87F430 80240640 0C046B4C */ jal get_model_from_list_index -/* 87F434 80240644 0040202D */ daddu $a0, $v0, $zero -/* 87F438 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 87F43C 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 87F440 80240650 0040902D */ daddu $s2, $v0, $zero -/* 87F444 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 87F448 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 87F44C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 87F450 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 87F454 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 87F458 80240668 00000000 */ nop -/* 87F45C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87F460 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 87F464 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 87F468 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 87F46C 8024067C 00000000 */ nop -/* 87F470 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 87F474 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 87F478 80240688 44820000 */ mtc1 $v0, $f0 -/* 87F47C 8024068C 00000000 */ nop -/* 87F480 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 87F484 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 87F488 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 87F48C 8024069C 44810000 */ mtc1 $at, $f0 -/* 87F490 802406A0 00000000 */ nop -/* 87F494 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 87F498 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 87F49C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 87F4A0 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 87F4A4 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 87F4A8 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 87F4AC 802406BC 00000000 */ nop -/* 87F4B0 802406C0 45010004 */ bc1t .L802406D4 -/* 87F4B4 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 87F4B8 802406C8 0C0187BC */ jal sqrtf -/* 87F4BC 802406CC 00000000 */ nop -/* 87F4C0 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 87F4C4 802406D4 44800000 */ mtc1 $zero, $f0 -/* 87F4C8 802406D8 00000000 */ nop -/* 87F4CC 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 87F4D0 802406E0 00000000 */ nop -/* 87F4D4 802406E4 45000016 */ bc1f .L80240740 -/* 87F4D8 802406E8 46001106 */ mov.s $f4, $f2 -/* 87F4DC 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 87F4E0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 87F4E4 802406F4 00000000 */ nop -/* 87F4E8 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 87F4EC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 87F4F0 80240700 00000000 */ nop -/* 87F4F4 80240704 4500000E */ bc1f .L80240740 -/* 87F4F8 80240708 00000000 */ nop -/* 87F4FC 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 87F500 80240710 3C013F00 */ lui $at, 0x3f00 -/* 87F504 80240714 44811000 */ mtc1 $at, $f2 -/* 87F508 80240718 44820000 */ mtc1 $v0, $f0 -/* 87F50C 8024071C 00000000 */ nop -/* 87F510 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 87F514 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 87F518 80240728 00000000 */ nop -/* 87F51C 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 87F520 80240730 00000000 */ nop -/* 87F524 80240734 45000002 */ bc1f .L80240740 -/* 87F528 80240738 24020001 */ addiu $v0, $zero, 1 -/* 87F52C 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 87F530 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 87F534 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 87F538 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 87F53C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 87F540 80240750 00000000 */ nop -/* 87F544 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87F548 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 87F54C 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 87F550 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 87F554 80240764 00000000 */ nop -/* 87F558 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 87F55C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 87F560 80240770 44820000 */ mtc1 $v0, $f0 -/* 87F564 80240774 00000000 */ nop -/* 87F568 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 87F56C 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 87F570 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 87F574 80240784 44810000 */ mtc1 $at, $f0 -/* 87F578 80240788 00000000 */ nop -/* 87F57C 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 87F580 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 87F584 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 87F588 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 87F58C 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 87F590 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 87F594 802407A4 00000000 */ nop -/* 87F598 802407A8 45010004 */ bc1t .L802407BC -/* 87F59C 802407AC 00000000 */ nop -/* 87F5A0 802407B0 0C0187BC */ jal sqrtf -/* 87F5A4 802407B4 00000000 */ nop -/* 87F5A8 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 87F5AC 802407BC 44800000 */ mtc1 $zero, $f0 -/* 87F5B0 802407C0 00000000 */ nop -/* 87F5B4 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 87F5B8 802407C8 00000000 */ nop -/* 87F5BC 802407CC 45000016 */ bc1f .L80240828 -/* 87F5C0 802407D0 46001106 */ mov.s $f4, $f2 -/* 87F5C4 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 87F5C8 802407D8 44820000 */ mtc1 $v0, $f0 -/* 87F5CC 802407DC 00000000 */ nop -/* 87F5D0 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 87F5D4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 87F5D8 802407E8 00000000 */ nop -/* 87F5DC 802407EC 4500000F */ bc1f .L8024082C -/* 87F5E0 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 87F5E4 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 87F5E8 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 87F5EC 802407FC 44811000 */ mtc1 $at, $f2 -/* 87F5F0 80240800 44820000 */ mtc1 $v0, $f0 -/* 87F5F4 80240804 00000000 */ nop -/* 87F5F8 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 87F5FC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 87F600 80240810 00000000 */ nop -/* 87F604 80240814 4600203C */ c.lt.s $f4, $f0 -/* 87F608 80240818 00000000 */ nop -/* 87F60C 8024081C 45000003 */ bc1f .L8024082C -/* 87F610 80240820 24020001 */ addiu $v0, $zero, 1 -/* 87F614 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 87F618 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 87F61C 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 87F620 80240830 4481D000 */ mtc1 $at, $f26 -/* 87F624 80240834 4480C000 */ mtc1 $zero, $f24 -/* 87F628 80240838 3C013F00 */ lui $at, 0x3f00 -/* 87F62C 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 87F630 80240840 0C00EAD2 */ jal get_npc_safe -/* 87F634 80240844 0220202D */ daddu $a0, $s1, $zero -/* 87F638 80240848 0040802D */ daddu $s0, $v0, $zero -/* 87F63C 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 87F640 80240850 26310001 */ addiu $s1, $s1, 1 -/* 87F644 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 87F648 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 87F64C 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 87F650 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 87F654 80240864 00000000 */ nop -/* 87F658 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87F65C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 87F660 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 87F664 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 87F668 80240878 00000000 */ nop -/* 87F66C 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 87F670 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 87F674 80240884 44820000 */ mtc1 $v0, $f0 -/* 87F678 80240888 00000000 */ nop -/* 87F67C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 87F680 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 87F684 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 87F688 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 87F68C 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 87F690 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 87F694 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 87F698 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 87F69C 802408AC 00000000 */ nop -/* 87F6A0 802408B0 45010003 */ bc1t .L802408C0 -/* 87F6A4 802408B4 00000000 */ nop -/* 87F6A8 802408B8 0C0187BC */ jal sqrtf -/* 87F6AC 802408BC 00000000 */ nop -.L802408C0: -/* 87F6B0 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 87F6B4 802408C4 00000000 */ nop -/* 87F6B8 802408C8 45000015 */ bc1f .L80240920 -/* 87F6BC 802408CC 46000106 */ mov.s $f4, $f0 -/* 87F6C0 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 87F6C4 802408D4 44820000 */ mtc1 $v0, $f0 -/* 87F6C8 802408D8 00000000 */ nop -/* 87F6CC 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 87F6D0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 87F6D4 802408E4 00000000 */ nop -/* 87F6D8 802408E8 4500000E */ bc1f .L80240924 -/* 87F6DC 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 87F6E0 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 87F6E4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 87F6E8 802408F8 00000000 */ nop -/* 87F6EC 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 87F6F0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 87F6F4 80240904 00000000 */ nop -/* 87F6F8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 87F6FC 8024090C 00000000 */ nop -/* 87F700 80240910 45000004 */ bc1f .L80240924 -/* 87F704 80240914 24020001 */ addiu $v0, $zero, 1 -/* 87F708 80240918 0809024C */ j .L80240930 -/* 87F70C 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 87F710 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 87F714 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 87F718 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 87F71C 8024092C 00000000 */ nop -.L80240930: -/* 87F720 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 87F724 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 87F728 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 87F72C 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 87F730 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 87F734 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 87F738 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 87F73C 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 87F740 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 87F744 80240954 24020002 */ addiu $v0, $zero, 2 -/* 87F748 80240958 03E00008 */ jr $ra -/* 87F74C 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_08/func_80240960_87EDF0.s b/asm/nonmatchings/world/area_tik/tik_08/func_80240960_87EDF0.s deleted file mode 100644 index 810720d96d..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/func_80240960_87EDF0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240960_87F750 -/* 87F750 80240960 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 87F754 80240964 AFB10014 */ sw $s1, 0x14($sp) -/* 87F758 80240968 0080882D */ daddu $s1, $a0, $zero -/* 87F75C 8024096C AFBF0020 */ sw $ra, 0x20($sp) -/* 87F760 80240970 AFB3001C */ sw $s3, 0x1c($sp) -/* 87F764 80240974 AFB20018 */ sw $s2, 0x18($sp) -/* 87F768 80240978 AFB00010 */ sw $s0, 0x10($sp) -/* 87F76C 8024097C 8E30000C */ lw $s0, 0xc($s1) -/* 87F770 80240980 8E050000 */ lw $a1, ($s0) -/* 87F774 80240984 0C0B1EAF */ jal get_variable -/* 87F778 80240988 26100004 */ addiu $s0, $s0, 4 -/* 87F77C 8024098C 8E050000 */ lw $a1, ($s0) -/* 87F780 80240990 26100004 */ addiu $s0, $s0, 4 -/* 87F784 80240994 0220202D */ daddu $a0, $s1, $zero -/* 87F788 80240998 0C0B1EAF */ jal get_variable -/* 87F78C 8024099C 0040982D */ daddu $s3, $v0, $zero -/* 87F790 802409A0 8E050000 */ lw $a1, ($s0) -/* 87F794 802409A4 26100004 */ addiu $s0, $s0, 4 -/* 87F798 802409A8 0220202D */ daddu $a0, $s1, $zero -/* 87F79C 802409AC 0C0B1EAF */ jal get_variable -/* 87F7A0 802409B0 0040902D */ daddu $s2, $v0, $zero -/* 87F7A4 802409B4 0220202D */ daddu $a0, $s1, $zero -/* 87F7A8 802409B8 8E050000 */ lw $a1, ($s0) -/* 87F7AC 802409BC 0C0B1EAF */ jal get_variable -/* 87F7B0 802409C0 0040882D */ daddu $s1, $v0, $zero -/* 87F7B4 802409C4 0260202D */ daddu $a0, $s3, $zero -/* 87F7B8 802409C8 0C04417A */ jal get_entity_by_index -/* 87F7BC 802409CC 0040802D */ daddu $s0, $v0, $zero -/* 87F7C0 802409D0 0040182D */ daddu $v1, $v0, $zero -/* 87F7C4 802409D4 44920000 */ mtc1 $s2, $f0 -/* 87F7C8 802409D8 00000000 */ nop -/* 87F7CC 802409DC 46800020 */ cvt.s.w $f0, $f0 -/* 87F7D0 802409E0 E4600048 */ swc1 $f0, 0x48($v1) -/* 87F7D4 802409E4 44910000 */ mtc1 $s1, $f0 -/* 87F7D8 802409E8 00000000 */ nop -/* 87F7DC 802409EC 46800020 */ cvt.s.w $f0, $f0 -/* 87F7E0 802409F0 E460004C */ swc1 $f0, 0x4c($v1) -/* 87F7E4 802409F4 44900000 */ mtc1 $s0, $f0 -/* 87F7E8 802409F8 00000000 */ nop -/* 87F7EC 802409FC 46800020 */ cvt.s.w $f0, $f0 -/* 87F7F0 80240A00 E4600050 */ swc1 $f0, 0x50($v1) -/* 87F7F4 80240A04 8FBF0020 */ lw $ra, 0x20($sp) -/* 87F7F8 80240A08 8FB3001C */ lw $s3, 0x1c($sp) -/* 87F7FC 80240A0C 8FB20018 */ lw $s2, 0x18($sp) -/* 87F800 80240A10 8FB10014 */ lw $s1, 0x14($sp) -/* 87F804 80240A14 8FB00010 */ lw $s0, 0x10($sp) -/* 87F808 80240A18 24020002 */ addiu $v0, $zero, 2 -/* 87F80C 80240A1C 03E00008 */ jr $ra -/* 87F810 80240A20 27BD0028 */ addiu $sp, $sp, 0x28 -/* 87F814 80240A24 00000000 */ nop -/* 87F818 80240A28 00000000 */ nop -/* 87F81C 80240A2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_08/func_80240A30_87EDF0.s b/asm/nonmatchings/world/area_tik/tik_08/func_80240A30_87EDF0.s deleted file mode 100644 index 44c5a19c83..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/func_80240A30_87EDF0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A30_87F820 -/* 87F820 80240A30 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87F824 80240A34 AFBF0010 */ sw $ra, 0x10($sp) -/* 87F828 80240A38 8C82000C */ lw $v0, 0xc($a0) -/* 87F82C 80240A3C 3C068016 */ lui $a2, 0x8016 -/* 87F830 80240A40 84C6A552 */ lh $a2, -0x5aae($a2) -/* 87F834 80240A44 0C0B2026 */ jal set_variable -/* 87F838 80240A48 8C450000 */ lw $a1, ($v0) -/* 87F83C 80240A4C 8FBF0010 */ lw $ra, 0x10($sp) -/* 87F840 80240A50 24020002 */ addiu $v0, $zero, 2 -/* 87F844 80240A54 03E00008 */ jr $ra -/* 87F848 80240A58 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_08/func_80240A5C_87EDF0.s b/asm/nonmatchings/world/area_tik/tik_08/func_80240A5C_87EDF0.s deleted file mode 100644 index a057ce03b6..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_08/func_80240A5C_87EDF0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A5C_87F84C -/* 87F84C 80240A5C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87F850 80240A60 AFBF0014 */ sw $ra, 0x14($sp) -/* 87F854 80240A64 AFB00010 */ sw $s0, 0x10($sp) -/* 87F858 80240A68 8C82000C */ lw $v0, 0xc($a0) -/* 87F85C 80240A6C 8C450000 */ lw $a1, ($v0) -/* 87F860 80240A70 0C0B1EAF */ jal get_variable -/* 87F864 80240A74 8C900148 */ lw $s0, 0x148($a0) -/* 87F868 80240A78 82030004 */ lb $v1, 4($s0) -/* 87F86C 80240A7C 00021080 */ sll $v0, $v0, 2 -/* 87F870 80240A80 00031880 */ sll $v1, $v1, 2 -/* 87F874 80240A84 3C04800B */ lui $a0, 0x800b -/* 87F878 80240A88 00832021 */ addu $a0, $a0, $v1 -/* 87F87C 80240A8C 8C840F38 */ lw $a0, 0xf38($a0) -/* 87F880 80240A90 3C038024 */ lui $v1, 0x8024 -/* 87F884 80240A94 00621821 */ addu $v1, $v1, $v0 -/* 87F888 80240A98 94632C0E */ lhu $v1, 0x2c0e($v1) -/* 87F88C 80240A9C A4830044 */ sh $v1, 0x44($a0) -/* 87F890 80240AA0 8FBF0014 */ lw $ra, 0x14($sp) -/* 87F894 80240AA4 8FB00010 */ lw $s0, 0x10($sp) -/* 87F898 80240AA8 24020002 */ addiu $v0, $zero, 2 -/* 87F89C 80240AAC 03E00008 */ jr $ra -/* 87F8A0 80240AB0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 87F8A4 80240AB4 00000000 */ nop -/* 87F8A8 80240AB8 00000000 */ nop -/* 87F8AC 80240ABC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_09/func_80240020_8821C0.s b/asm/nonmatchings/world/area_tik/tik_09/func_80240020_8821C0.s deleted file mode 100644 index 1fdb074980..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/func_80240020_8821C0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_8821E0 -/* 8821E0 80240020 3C028016 */ lui $v0, 0x8016 -/* 8821E4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 8821E8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 8821EC 8024002C 03E00008 */ jr $ra -/* 8821F0 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_09/func_80240034_8821C0.s b/asm/nonmatchings/world/area_tik/tik_09/func_80240034_8821C0.s deleted file mode 100644 index 5a08f8d1c1..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/func_80240034_8821C0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_8821F4 -/* 8821F4 80240034 3C038016 */ lui $v1, 0x8016 -/* 8821F8 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* 8821FC 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 882200 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 882204 80240044 0080802D */ daddu $s0, $a0, $zero -/* 882208 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* 88220C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 882210 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* 882214 80240054 24020002 */ addiu $v0, $zero, 2 -/* 882218 80240058 08090038 */ j .L802400E0 -/* 88221C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* 882220 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 882224 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 882228 80240068 80620040 */ lb $v0, 0x40($v1) -/* 88222C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* 882230 80240070 04420001 */ bltzl $v0, .L80240078 -/* 882234 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* 882238 80240078 14400003 */ bnez $v0, .L80240088 -/* 88223C 8024007C 00000000 */ nop -/* 882240 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* 882244 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* 882248 80240088 44822000 */ mtc1 $v0, $f4 -/* 88224C 8024008C 00000000 */ nop -/* 882250 80240090 46802120 */ cvt.s.w $f4, $f4 -/* 882254 80240094 44062000 */ mfc1 $a2, $f4 -/* 882258 80240098 44872000 */ mtc1 $a3, $f4 -/* 88225C 8024009C 00000000 */ nop -/* 882260 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* 882264 802400A4 44806000 */ mtc1 $zero, $f12 -/* 882268 802400A8 44072000 */ mfc1 $a3, $f4 -/* 88226C 802400AC 0C00A720 */ jal atan2 -/* 882270 802400B0 46006386 */ mov.s $f14, $f12 -/* 882274 802400B4 3C014270 */ lui $at, 0x4270 -/* 882278 802400B8 44811000 */ mtc1 $at, $f2 -/* 88227C 802400BC 00000000 */ nop -/* 882280 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 882284 802400C4 00000000 */ nop -/* 882288 802400C8 45000004 */ bc1f .L802400DC -/* 88228C 802400CC 24020001 */ addiu $v0, $zero, 1 -/* 882290 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* 882294 802400D4 08090038 */ j .L802400E0 -/* 882298 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* 88229C 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* 8822A0 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8822A4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 8822A8 802400E8 03E00008 */ jr $ra -/* 8822AC 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_09/func_802400F0_8821C0.s b/asm/nonmatchings/world/area_tik/tik_09/func_802400F0_8821C0.s deleted file mode 100644 index fab3814c01..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/func_802400F0_8821C0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8822B0 -/* 8822B0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8822B4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8822B8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8822BC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 8822C0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 8822C4 80240104 0C016AFA */ jal get_current_map_header -/* 8822C8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 8822CC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 8822D0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 8822D4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8822D8 80240118 0C0B1EAF */ jal get_variable -/* 8822DC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 8822E0 80240120 0220202D */ daddu $a0, $s1, $zero -/* 8822E4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 8822E8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 8822EC 8024012C 00028100 */ sll $s0, $v0, 4 -/* 8822F0 80240130 02031821 */ addu $v1, $s0, $v1 -/* 8822F4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 8822F8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 8822FC 8024013C 44061000 */ mfc1 $a2, $f2 -/* 882300 80240140 0C0B2026 */ jal set_variable -/* 882304 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 882308 80240148 0220202D */ daddu $a0, $s1, $zero -/* 88230C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 882310 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 882314 80240154 02021021 */ addu $v0, $s0, $v0 -/* 882318 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 88231C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 882320 80240160 44061000 */ mfc1 $a2, $f2 -/* 882324 80240164 0C0B2026 */ jal set_variable -/* 882328 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 88232C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 882330 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 882334 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 882338 80240178 02021021 */ addu $v0, $s0, $v0 -/* 88233C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 882340 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 882344 80240184 44061000 */ mfc1 $a2, $f2 -/* 882348 80240188 0C0B2026 */ jal set_variable -/* 88234C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 882350 80240190 0220202D */ daddu $a0, $s1, $zero -/* 882354 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 882358 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 88235C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 882360 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 882364 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 882368 802401A8 44061000 */ mfc1 $a2, $f2 -/* 88236C 802401AC 0C0B2026 */ jal set_variable -/* 882370 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 882374 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 882378 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 88237C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 882380 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 882384 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 882388 802401C8 03E00008 */ jr $ra -/* 88238C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_09/func_802401D0_8821C0.s b/asm/nonmatchings/world/area_tik/tik_09/func_802401D0_8821C0.s deleted file mode 100644 index c8d21672b3..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/func_802401D0_8821C0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_882390 -/* 882390 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 882394 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 882398 802401D8 3C014334 */ lui $at, 0x4334 -/* 88239C 802401DC 44816000 */ mtc1 $at, $f12 -/* 8823A0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8823A4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8823A8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 8823AC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 8823B0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 8823B4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 8823B8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 8823BC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 8823C0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 8823C4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 8823C8 80240208 3C01800B */ lui $at, 0x800b -/* 8823CC 8024020C 00220821 */ addu $at, $at, $v0 -/* 8823D0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8823D4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 8823D8 80240218 0C00A6C9 */ jal clamp_angle -/* 8823DC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 8823E0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 8823E4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 8823E8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 8823EC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 8823F0 80240230 24020002 */ addiu $v0, $zero, 2 -/* 8823F4 80240234 03E00008 */ jr $ra -/* 8823F8 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_09/func_8024023C_8821C0.s b/asm/nonmatchings/world/area_tik/tik_09/func_8024023C_8821C0.s deleted file mode 100644 index 7bb4a56672..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/func_8024023C_8821C0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_8823FC -/* 8823FC 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 882400 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 882404 80240244 0080802D */ daddu $s0, $a0, $zero -/* 882408 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 88240C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 882410 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 882414 80240254 0C0B210B */ jal get_float_variable -/* 882418 80240258 8C450000 */ lw $a1, ($v0) -/* 88241C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 882420 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 882424 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 882428 80240268 44060000 */ mfc1 $a2, $f0 -/* 88242C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 882430 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 882434 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 882438 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 88243C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 882440 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 882444 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 882448 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 88244C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 882450 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 882454 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 882458 80240298 0C0B2190 */ jal set_float_variable -/* 88245C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 882460 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 882464 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 882468 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 88246C 802402AC 0C0B2190 */ jal set_float_variable -/* 882470 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 882474 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 882478 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 88247C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 882480 802402C0 0C0B2190 */ jal set_float_variable -/* 882484 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 882488 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 88248C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 882490 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 882494 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 882498 802402D8 03E00008 */ jr $ra -/* 88249C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_09/func_802402E0_8821C0.s b/asm/nonmatchings/world/area_tik/tik_09/func_802402E0_8821C0.s deleted file mode 100644 index 1bd53a723e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/func_802402E0_8821C0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_8824A0 -/* 8824A0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8824A4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 8824A8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 8824AC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 8824B0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8824B4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 8824B8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 8824BC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 8824C0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8824C4 80240304 3C020002 */ lui $v0, 2 -/* 8824C8 80240308 080900C8 */ j .L80240320 -/* 8824CC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 8824D0 80240310 3C040002 */ lui $a0, 2 -/* 8824D4 80240314 0083102A */ slt $v0, $a0, $v1 -/* 8824D8 80240318 10400002 */ beqz $v0, .L80240324 -/* 8824DC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 8824E0 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 8824E4 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 8824E8 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 8824EC 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 8824F0 80240330 04610004 */ bgez $v1, .L80240344 -/* 8824F4 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 8824F8 80240338 3C020002 */ lui $v0, 2 -/* 8824FC 8024033C 080900D5 */ j .L80240354 -/* 882500 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 882504 80240344 3C040002 */ lui $a0, 2 -/* 882508 80240348 0083102A */ slt $v0, $a0, $v1 -/* 88250C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 882510 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 882514 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 882518 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 88251C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 882520 80240360 00621821 */ addu $v1, $v1, $v0 -/* 882524 80240364 04610004 */ bgez $v1, .L80240378 -/* 882528 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 88252C 8024036C 3C020002 */ lui $v0, 2 -/* 882530 80240370 080900E2 */ j .L80240388 -/* 882534 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 882538 80240378 3C040002 */ lui $a0, 2 -/* 88253C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 882540 80240380 10400002 */ beqz $v0, .L8024038C -/* 882544 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 882548 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 88254C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 882550 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 882554 80240394 00621821 */ addu $v1, $v1, $v0 -/* 882558 80240398 04610004 */ bgez $v1, .L802403AC -/* 88255C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 882560 802403A0 3C020002 */ lui $v0, 2 -/* 882564 802403A4 080900EF */ j .L802403BC -/* 882568 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 88256C 802403AC 3C040002 */ lui $a0, 2 -/* 882570 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 882574 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 882578 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 88257C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 882580 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 882584 802403C4 0C046F07 */ jal set_main_pan_u -/* 882588 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 88258C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 882590 802403D0 0C046F0D */ jal set_main_pan_v -/* 882594 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 882598 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 88259C 802403DC 0C046F13 */ jal set_aux_pan_u -/* 8825A0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8825A4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 8825A8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 8825AC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8825B0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8825B4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 8825B8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 8825BC 802403FC 03E00008 */ jr $ra -/* 8825C0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_09/func_80240404_8821C0.s b/asm/nonmatchings/world/area_tik/tik_09/func_80240404_8821C0.s deleted file mode 100644 index 7cf835bf62..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/func_80240404_8821C0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_8825C4 -/* 8825C4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8825C8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 8825CC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 8825D0 80240410 10A00005 */ beqz $a1, .L80240428 -/* 8825D4 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 8825D8 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 8825DC 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 8825E0 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 8825E4 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 8825E8 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 8825EC 8024042C 1440000E */ bnez $v0, .L80240468 -/* 8825F0 80240430 00000000 */ nop -/* 8825F4 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8825F8 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 8825FC 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 882600 80240440 04610004 */ bgez $v1, .L80240454 -/* 882604 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 882608 80240448 3C020002 */ lui $v0, 2 -/* 88260C 8024044C 08090119 */ j .L80240464 -/* 882610 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 882614 80240454 3C040002 */ lui $a0, 2 -/* 882618 80240458 0083102A */ slt $v0, $a0, $v1 -/* 88261C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 882620 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 882624 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 882628 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 88262C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 882630 80240470 00000000 */ nop -/* 882634 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 882638 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 88263C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 882640 80240480 04610004 */ bgez $v1, .L80240494 -/* 882644 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 882648 80240488 3C020002 */ lui $v0, 2 -/* 88264C 8024048C 08090129 */ j .L802404A4 -/* 882650 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 882654 80240494 3C040002 */ lui $a0, 2 -/* 882658 80240498 0083102A */ slt $v0, $a0, $v1 -/* 88265C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 882660 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 882664 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 882668 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 88266C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 882670 802404B0 00000000 */ nop -/* 882674 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 882678 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 88267C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 882680 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 882684 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 882688 802404C8 3C020002 */ lui $v0, 2 -/* 88268C 802404CC 08090139 */ j .L802404E4 -/* 882690 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 882694 802404D4 3C040002 */ lui $a0, 2 -/* 882698 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 88269C 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 8826A0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 8826A4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 8826A8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 8826AC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 8826B0 802404F0 00000000 */ nop -/* 8826B4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8826B8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 8826BC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 8826C0 80240500 04610004 */ bgez $v1, .L80240514 -/* 8826C4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8826C8 80240508 3C020002 */ lui $v0, 2 -/* 8826CC 8024050C 08090149 */ j .L80240524 -/* 8826D0 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 8826D4 80240514 3C040002 */ lui $a0, 2 -/* 8826D8 80240518 0083102A */ slt $v0, $a0, $v1 -/* 8826DC 8024051C 10400002 */ beqz $v0, .L80240528 -/* 8826E0 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 8826E4 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 8826E8 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 8826EC 8024052C 0C046F07 */ jal set_main_pan_u -/* 8826F0 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8826F4 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 8826F8 80240538 0C046F0D */ jal set_main_pan_v -/* 8826FC 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 882700 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 882704 80240544 0C046F13 */ jal set_aux_pan_u -/* 882708 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 88270C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 882710 80240550 0C046F19 */ jal set_aux_pan_v -/* 882714 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 882718 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 88271C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 882720 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 882724 80240564 24420001 */ addiu $v0, $v0, 1 -/* 882728 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 88272C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 882730 80240570 24630001 */ addiu $v1, $v1, 1 -/* 882734 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 882738 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 88273C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 882740 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 882744 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 882748 80240588 0064182A */ slt $v1, $v1, $a0 -/* 88274C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 882750 80240590 14600002 */ bnez $v1, .L8024059C -/* 882754 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 882758 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 88275C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 882760 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 882764 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 882768 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 88276C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 882770 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 882774 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 882778 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 88277C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 882780 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 882784 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 882788 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 88278C 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 882790 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 882794 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 882798 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 88279C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 8827A0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 8827A4 802405E4 03E00008 */ jr $ra -/* 8827A8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8827AC 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_09/func_802405F0_8821C0.s b/asm/nonmatchings/world/area_tik/tik_09/func_802405F0_8821C0.s deleted file mode 100644 index b0650dbfe0..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/func_802405F0_8821C0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_8827B0 -/* 8827B0 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8827B4 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 8827B8 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 8827BC 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 8827C0 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 8827C4 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 8827C8 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 8827CC 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8827D0 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8827D4 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8827D8 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8827DC 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 8827E0 80240620 0C0B1EAF */ jal get_variable -/* 8827E4 80240624 8C450000 */ lw $a1, ($v0) -/* 8827E8 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 8827EC 8024062C 0C00EABB */ jal get_npc_unsafe -/* 8827F0 80240630 0040802D */ daddu $s0, $v0, $zero -/* 8827F4 80240634 0200202D */ daddu $a0, $s0, $zero -/* 8827F8 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8827FC 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 882800 80240640 0C046B4C */ jal get_model_from_list_index -/* 882804 80240644 0040202D */ daddu $a0, $v0, $zero -/* 882808 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 88280C 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 882810 80240650 0040902D */ daddu $s2, $v0, $zero -/* 882814 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 882818 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 88281C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 882820 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 882824 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 882828 80240668 00000000 */ nop -/* 88282C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 882830 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 882834 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 882838 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 88283C 8024067C 00000000 */ nop -/* 882840 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 882844 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 882848 80240688 44820000 */ mtc1 $v0, $f0 -/* 88284C 8024068C 00000000 */ nop -/* 882850 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 882854 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 882858 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 88285C 8024069C 44810000 */ mtc1 $at, $f0 -/* 882860 802406A0 00000000 */ nop -/* 882864 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 882868 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 88286C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 882870 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 882874 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 882878 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 88287C 802406BC 00000000 */ nop -/* 882880 802406C0 45010004 */ bc1t .L802406D4 -/* 882884 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 882888 802406C8 0C0187BC */ jal sqrtf -/* 88288C 802406CC 00000000 */ nop -/* 882890 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 882894 802406D4 44800000 */ mtc1 $zero, $f0 -/* 882898 802406D8 00000000 */ nop -/* 88289C 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 8828A0 802406E0 00000000 */ nop -/* 8828A4 802406E4 45000016 */ bc1f .L80240740 -/* 8828A8 802406E8 46001106 */ mov.s $f4, $f2 -/* 8828AC 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 8828B0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 8828B4 802406F4 00000000 */ nop -/* 8828B8 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 8828BC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 8828C0 80240700 00000000 */ nop -/* 8828C4 80240704 4500000E */ bc1f .L80240740 -/* 8828C8 80240708 00000000 */ nop -/* 8828CC 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 8828D0 80240710 3C013F00 */ lui $at, 0x3f00 -/* 8828D4 80240714 44811000 */ mtc1 $at, $f2 -/* 8828D8 80240718 44820000 */ mtc1 $v0, $f0 -/* 8828DC 8024071C 00000000 */ nop -/* 8828E0 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 8828E4 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 8828E8 80240728 00000000 */ nop -/* 8828EC 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 8828F0 80240730 00000000 */ nop -/* 8828F4 80240734 45000002 */ bc1f .L80240740 -/* 8828F8 80240738 24020001 */ addiu $v0, $zero, 1 -/* 8828FC 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 882900 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 882904 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 882908 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 88290C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 882910 80240750 00000000 */ nop -/* 882914 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 882918 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 88291C 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 882920 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 882924 80240764 00000000 */ nop -/* 882928 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 88292C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 882930 80240770 44820000 */ mtc1 $v0, $f0 -/* 882934 80240774 00000000 */ nop -/* 882938 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 88293C 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 882940 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 882944 80240784 44810000 */ mtc1 $at, $f0 -/* 882948 80240788 00000000 */ nop -/* 88294C 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 882950 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 882954 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 882958 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 88295C 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 882960 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 882964 802407A4 00000000 */ nop -/* 882968 802407A8 45010004 */ bc1t .L802407BC -/* 88296C 802407AC 00000000 */ nop -/* 882970 802407B0 0C0187BC */ jal sqrtf -/* 882974 802407B4 00000000 */ nop -/* 882978 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 88297C 802407BC 44800000 */ mtc1 $zero, $f0 -/* 882980 802407C0 00000000 */ nop -/* 882984 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 882988 802407C8 00000000 */ nop -/* 88298C 802407CC 45000016 */ bc1f .L80240828 -/* 882990 802407D0 46001106 */ mov.s $f4, $f2 -/* 882994 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 882998 802407D8 44820000 */ mtc1 $v0, $f0 -/* 88299C 802407DC 00000000 */ nop -/* 8829A0 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 8829A4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 8829A8 802407E8 00000000 */ nop -/* 8829AC 802407EC 4500000F */ bc1f .L8024082C -/* 8829B0 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 8829B4 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 8829B8 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 8829BC 802407FC 44811000 */ mtc1 $at, $f2 -/* 8829C0 80240800 44820000 */ mtc1 $v0, $f0 -/* 8829C4 80240804 00000000 */ nop -/* 8829C8 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 8829CC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 8829D0 80240810 00000000 */ nop -/* 8829D4 80240814 4600203C */ c.lt.s $f4, $f0 -/* 8829D8 80240818 00000000 */ nop -/* 8829DC 8024081C 45000003 */ bc1f .L8024082C -/* 8829E0 80240820 24020001 */ addiu $v0, $zero, 1 -/* 8829E4 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 8829E8 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 8829EC 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 8829F0 80240830 4481D000 */ mtc1 $at, $f26 -/* 8829F4 80240834 4480C000 */ mtc1 $zero, $f24 -/* 8829F8 80240838 3C013F00 */ lui $at, 0x3f00 -/* 8829FC 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 882A00 80240840 0C00EAD2 */ jal get_npc_safe -/* 882A04 80240844 0220202D */ daddu $a0, $s1, $zero -/* 882A08 80240848 0040802D */ daddu $s0, $v0, $zero -/* 882A0C 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 882A10 80240850 26310001 */ addiu $s1, $s1, 1 -/* 882A14 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 882A18 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 882A1C 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 882A20 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 882A24 80240864 00000000 */ nop -/* 882A28 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 882A2C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 882A30 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 882A34 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 882A38 80240878 00000000 */ nop -/* 882A3C 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 882A40 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 882A44 80240884 44820000 */ mtc1 $v0, $f0 -/* 882A48 80240888 00000000 */ nop -/* 882A4C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 882A50 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 882A54 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 882A58 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 882A5C 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 882A60 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 882A64 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 882A68 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 882A6C 802408AC 00000000 */ nop -/* 882A70 802408B0 45010003 */ bc1t .L802408C0 -/* 882A74 802408B4 00000000 */ nop -/* 882A78 802408B8 0C0187BC */ jal sqrtf -/* 882A7C 802408BC 00000000 */ nop -.L802408C0: -/* 882A80 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 882A84 802408C4 00000000 */ nop -/* 882A88 802408C8 45000015 */ bc1f .L80240920 -/* 882A8C 802408CC 46000106 */ mov.s $f4, $f0 -/* 882A90 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 882A94 802408D4 44820000 */ mtc1 $v0, $f0 -/* 882A98 802408D8 00000000 */ nop -/* 882A9C 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 882AA0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 882AA4 802408E4 00000000 */ nop -/* 882AA8 802408E8 4500000E */ bc1f .L80240924 -/* 882AAC 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 882AB0 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 882AB4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 882AB8 802408F8 00000000 */ nop -/* 882ABC 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 882AC0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 882AC4 80240904 00000000 */ nop -/* 882AC8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 882ACC 8024090C 00000000 */ nop -/* 882AD0 80240910 45000004 */ bc1f .L80240924 -/* 882AD4 80240914 24020001 */ addiu $v0, $zero, 1 -/* 882AD8 80240918 0809024C */ j .L80240930 -/* 882ADC 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 882AE0 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 882AE4 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 882AE8 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 882AEC 8024092C 00000000 */ nop -.L80240930: -/* 882AF0 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 882AF4 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 882AF8 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 882AFC 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 882B00 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 882B04 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 882B08 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 882B0C 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 882B10 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 882B14 80240954 24020002 */ addiu $v0, $zero, 2 -/* 882B18 80240958 03E00008 */ jr $ra -/* 882B1C 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_09/func_80240960_8821C0.s b/asm/nonmatchings/world/area_tik/tik_09/func_80240960_8821C0.s deleted file mode 100644 index 0c304e9ee5..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/func_80240960_8821C0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240960_882B20 -/* 882B20 80240960 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 882B24 80240964 AFB10014 */ sw $s1, 0x14($sp) -/* 882B28 80240968 0080882D */ daddu $s1, $a0, $zero -/* 882B2C 8024096C AFBF0020 */ sw $ra, 0x20($sp) -/* 882B30 80240970 AFB3001C */ sw $s3, 0x1c($sp) -/* 882B34 80240974 AFB20018 */ sw $s2, 0x18($sp) -/* 882B38 80240978 AFB00010 */ sw $s0, 0x10($sp) -/* 882B3C 8024097C 8E30000C */ lw $s0, 0xc($s1) -/* 882B40 80240980 8E050000 */ lw $a1, ($s0) -/* 882B44 80240984 0C0B1EAF */ jal get_variable -/* 882B48 80240988 26100004 */ addiu $s0, $s0, 4 -/* 882B4C 8024098C 8E050000 */ lw $a1, ($s0) -/* 882B50 80240990 26100004 */ addiu $s0, $s0, 4 -/* 882B54 80240994 0220202D */ daddu $a0, $s1, $zero -/* 882B58 80240998 0C0B1EAF */ jal get_variable -/* 882B5C 8024099C 0040982D */ daddu $s3, $v0, $zero -/* 882B60 802409A0 8E050000 */ lw $a1, ($s0) -/* 882B64 802409A4 26100004 */ addiu $s0, $s0, 4 -/* 882B68 802409A8 0220202D */ daddu $a0, $s1, $zero -/* 882B6C 802409AC 0C0B1EAF */ jal get_variable -/* 882B70 802409B0 0040902D */ daddu $s2, $v0, $zero -/* 882B74 802409B4 0220202D */ daddu $a0, $s1, $zero -/* 882B78 802409B8 8E050000 */ lw $a1, ($s0) -/* 882B7C 802409BC 0C0B1EAF */ jal get_variable -/* 882B80 802409C0 0040882D */ daddu $s1, $v0, $zero -/* 882B84 802409C4 0260202D */ daddu $a0, $s3, $zero -/* 882B88 802409C8 0C04417A */ jal get_entity_by_index -/* 882B8C 802409CC 0040802D */ daddu $s0, $v0, $zero -/* 882B90 802409D0 0040182D */ daddu $v1, $v0, $zero -/* 882B94 802409D4 44920000 */ mtc1 $s2, $f0 -/* 882B98 802409D8 00000000 */ nop -/* 882B9C 802409DC 46800020 */ cvt.s.w $f0, $f0 -/* 882BA0 802409E0 E4600048 */ swc1 $f0, 0x48($v1) -/* 882BA4 802409E4 44910000 */ mtc1 $s1, $f0 -/* 882BA8 802409E8 00000000 */ nop -/* 882BAC 802409EC 46800020 */ cvt.s.w $f0, $f0 -/* 882BB0 802409F0 E460004C */ swc1 $f0, 0x4c($v1) -/* 882BB4 802409F4 44900000 */ mtc1 $s0, $f0 -/* 882BB8 802409F8 00000000 */ nop -/* 882BBC 802409FC 46800020 */ cvt.s.w $f0, $f0 -/* 882BC0 80240A00 E4600050 */ swc1 $f0, 0x50($v1) -/* 882BC4 80240A04 8FBF0020 */ lw $ra, 0x20($sp) -/* 882BC8 80240A08 8FB3001C */ lw $s3, 0x1c($sp) -/* 882BCC 80240A0C 8FB20018 */ lw $s2, 0x18($sp) -/* 882BD0 80240A10 8FB10014 */ lw $s1, 0x14($sp) -/* 882BD4 80240A14 8FB00010 */ lw $s0, 0x10($sp) -/* 882BD8 80240A18 24020002 */ addiu $v0, $zero, 2 -/* 882BDC 80240A1C 03E00008 */ jr $ra -/* 882BE0 80240A20 27BD0028 */ addiu $sp, $sp, 0x28 -/* 882BE4 80240A24 00000000 */ nop -/* 882BE8 80240A28 00000000 */ nop -/* 882BEC 80240A2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_09/func_80240A30_8821C0.s b/asm/nonmatchings/world/area_tik/tik_09/func_80240A30_8821C0.s deleted file mode 100644 index dbc31b5679..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/func_80240A30_8821C0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A30_882BF0 -/* 882BF0 80240A30 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 882BF4 80240A34 AFB20018 */ sw $s2, 0x18($sp) -/* 882BF8 80240A38 0080902D */ daddu $s2, $a0, $zero -/* 882BFC 80240A3C AFBF001C */ sw $ra, 0x1c($sp) -/* 882C00 80240A40 AFB10014 */ sw $s1, 0x14($sp) -/* 882C04 80240A44 AFB00010 */ sw $s0, 0x10($sp) -/* 882C08 80240A48 8E510148 */ lw $s1, 0x148($s2) -/* 882C0C 80240A4C 0C00EABB */ jal get_npc_unsafe -/* 882C10 80240A50 86240008 */ lh $a0, 8($s1) -/* 882C14 80240A54 0040802D */ daddu $s0, $v0, $zero -/* 882C18 80240A58 8E2300CC */ lw $v1, 0xcc($s1) -/* 882C1C 80240A5C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 882C20 80240A60 8C630020 */ lw $v1, 0x20($v1) -/* 882C24 80240A64 AE030028 */ sw $v1, 0x28($s0) -/* 882C28 80240A68 96220076 */ lhu $v0, 0x76($s1) -/* 882C2C 80240A6C A602008E */ sh $v0, 0x8e($s0) -/* 882C30 80240A70 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 882C34 80240A74 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 882C38 80240A78 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 882C3C 80240A7C 8C460028 */ lw $a2, 0x28($v0) -/* 882C40 80240A80 0C00A720 */ jal atan2 -/* 882C44 80240A84 8C470030 */ lw $a3, 0x30($v0) -/* 882C48 80240A88 2402000D */ addiu $v0, $zero, 0xd -/* 882C4C 80240A8C E600000C */ swc1 $f0, 0xc($s0) -/* 882C50 80240A90 AE420070 */ sw $v0, 0x70($s2) -/* 882C54 80240A94 8FBF001C */ lw $ra, 0x1c($sp) -/* 882C58 80240A98 8FB20018 */ lw $s2, 0x18($sp) -/* 882C5C 80240A9C 8FB10014 */ lw $s1, 0x14($sp) -/* 882C60 80240AA0 8FB00010 */ lw $s0, 0x10($sp) -/* 882C64 80240AA4 03E00008 */ jr $ra -/* 882C68 80240AA8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_10/func_80240124_8863C0.s b/asm/nonmatchings/world/area_tik/tik_10/func_80240124_8863C0.s deleted file mode 100644 index 79a414bd6f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/func_80240124_8863C0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_8864E4 -/* 8864E4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8864E8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 8864EC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 8864F0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 8864F4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 8864F8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 8864FC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 886500 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 886504 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 886508 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 88650C 8024014C 1440000E */ bnez $v0, .L80240188 -/* 886510 80240150 00000000 */ nop -/* 886514 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 886518 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 88651C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 886520 80240160 04610004 */ bgez $v1, .L80240174 -/* 886524 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 886528 80240168 3C020002 */ lui $v0, 2 -/* 88652C 8024016C 08090061 */ j .L80240184 -/* 886530 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 886534 80240174 3C040002 */ lui $a0, 2 -/* 886538 80240178 0083102A */ slt $v0, $a0, $v1 -/* 88653C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 886540 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 886544 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 886548 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 88654C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 886550 80240190 00000000 */ nop -/* 886554 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 886558 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 88655C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 886560 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 886564 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 886568 802401A8 3C020002 */ lui $v0, 2 -/* 88656C 802401AC 08090071 */ j .L802401C4 -/* 886570 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 886574 802401B4 3C040002 */ lui $a0, 2 -/* 886578 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 88657C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 886580 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 886584 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 886588 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 88658C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 886590 802401D0 00000000 */ nop -/* 886594 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 886598 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 88659C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 8865A0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 8865A4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8865A8 802401E8 3C020002 */ lui $v0, 2 -/* 8865AC 802401EC 08090081 */ j .L80240204 -/* 8865B0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 8865B4 802401F4 3C040002 */ lui $a0, 2 -/* 8865B8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 8865BC 802401FC 10400002 */ beqz $v0, .L80240208 -/* 8865C0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 8865C4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 8865C8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 8865CC 8024020C 1440000E */ bnez $v0, .L80240248 -/* 8865D0 80240210 00000000 */ nop -/* 8865D4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8865D8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 8865DC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 8865E0 80240220 04610004 */ bgez $v1, .L80240234 -/* 8865E4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8865E8 80240228 3C020002 */ lui $v0, 2 -/* 8865EC 8024022C 08090091 */ j .L80240244 -/* 8865F0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 8865F4 80240234 3C040002 */ lui $a0, 2 -/* 8865F8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 8865FC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 886600 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 886604 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 886608 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 88660C 8024024C 0C046F07 */ jal set_main_pan_u -/* 886610 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 886614 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 886618 80240258 0C046F0D */ jal set_main_pan_v -/* 88661C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 886620 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 886624 80240264 0C046F13 */ jal set_aux_pan_u -/* 886628 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 88662C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 886630 80240270 0C046F19 */ jal set_aux_pan_v -/* 886634 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 886638 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 88663C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 886640 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 886644 80240284 24420001 */ addiu $v0, $v0, 1 -/* 886648 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 88664C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 886650 80240290 24630001 */ addiu $v1, $v1, 1 -/* 886654 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 886658 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 88665C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 886660 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 886664 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 886668 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 88666C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 886670 802402B0 14600002 */ bnez $v1, .L802402BC -/* 886674 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 886678 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 88667C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 886680 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 886684 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 886688 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 88668C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 886690 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 886694 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 886698 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 88669C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 8866A0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 8866A4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 8866A8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 8866AC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 8866B0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 8866B4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 8866B8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8866BC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 8866C0 80240300 0000102D */ daddu $v0, $zero, $zero -/* 8866C4 80240304 03E00008 */ jr $ra -/* 8866C8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8866CC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_10/func_80240310_8863C0.s b/asm/nonmatchings/world/area_tik/tik_10/func_80240310_8863C0.s deleted file mode 100644 index d5fb718de3..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/func_80240310_8863C0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_8866D0 -/* 8866D0 80240310 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8866D4 80240314 AFB3001C */ sw $s3, 0x1c($sp) -/* 8866D8 80240318 0080982D */ daddu $s3, $a0, $zero -/* 8866DC 8024031C AFBF0020 */ sw $ra, 0x20($sp) -/* 8866E0 80240320 AFB20018 */ sw $s2, 0x18($sp) -/* 8866E4 80240324 AFB10014 */ sw $s1, 0x14($sp) -/* 8866E8 80240328 AFB00010 */ sw $s0, 0x10($sp) -/* 8866EC 8024032C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8866F0 80240330 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8866F4 80240334 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8866F8 80240338 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8866FC 8024033C 8E62000C */ lw $v0, 0xc($s3) -/* 886700 80240340 0C0B1EAF */ jal get_variable -/* 886704 80240344 8C450000 */ lw $a1, ($v0) -/* 886708 80240348 2404FFFC */ addiu $a0, $zero, -4 -/* 88670C 8024034C 0C00EABB */ jal get_npc_unsafe -/* 886710 80240350 0040802D */ daddu $s0, $v0, $zero -/* 886714 80240354 0200202D */ daddu $a0, $s0, $zero -/* 886718 80240358 0C046C04 */ jal get_model_list_index_from_tree_index -/* 88671C 8024035C 0040802D */ daddu $s0, $v0, $zero -/* 886720 80240360 0C046B4C */ jal get_model_from_list_index -/* 886724 80240364 0040202D */ daddu $a0, $v0, $zero -/* 886728 80240368 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 88672C 8024036C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 886730 80240370 0040902D */ daddu $s2, $v0, $zero -/* 886734 80240374 AE60008C */ sw $zero, 0x8c($s3) -/* 886738 80240378 C4620028 */ lwc1 $f2, 0x28($v1) -/* 88673C 8024037C C6400098 */ lwc1 $f0, 0x98($s2) -/* 886740 80240380 46001081 */ sub.s $f2, $f2, $f0 -/* 886744 80240384 46021182 */ mul.s $f6, $f2, $f2 -/* 886748 80240388 00000000 */ nop -/* 88674C 8024038C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 886750 80240390 C4620030 */ lwc1 $f2, 0x30($v1) -/* 886754 80240394 46001081 */ sub.s $f2, $f2, $f0 -/* 886758 80240398 46021102 */ mul.s $f4, $f2, $f2 -/* 88675C 8024039C 00000000 */ nop -/* 886760 802403A0 846200B0 */ lh $v0, 0xb0($v1) -/* 886764 802403A4 C462002C */ lwc1 $f2, 0x2c($v1) -/* 886768 802403A8 44820000 */ mtc1 $v0, $f0 -/* 88676C 802403AC 00000000 */ nop -/* 886770 802403B0 46800020 */ cvt.s.w $f0, $f0 -/* 886774 802403B4 46001080 */ add.s $f2, $f2, $f0 -/* 886778 802403B8 3C013FC0 */ lui $at, 0x3fc0 -/* 88677C 802403BC 44810000 */ mtc1 $at, $f0 -/* 886780 802403C0 00000000 */ nop -/* 886784 802403C4 46001081 */ sub.s $f2, $f2, $f0 -/* 886788 802403C8 46043300 */ add.s $f12, $f6, $f4 -/* 88678C 802403CC C640009C */ lwc1 $f0, 0x9c($s2) -/* 886790 802403D0 46001501 */ sub.s $f20, $f2, $f0 -/* 886794 802403D4 46006084 */ sqrt.s $f2, $f12 -/* 886798 802403D8 46021032 */ c.eq.s $f2, $f2 -/* 88679C 802403DC 00000000 */ nop -/* 8867A0 802403E0 45010004 */ bc1t .L802403F4 -/* 8867A4 802403E4 0060882D */ daddu $s1, $v1, $zero -/* 8867A8 802403E8 0C0187BC */ jal sqrtf -/* 8867AC 802403EC 00000000 */ nop -/* 8867B0 802403F0 46000086 */ mov.s $f2, $f0 -.L802403F4: -/* 8867B4 802403F4 44800000 */ mtc1 $zero, $f0 -/* 8867B8 802403F8 00000000 */ nop -/* 8867BC 802403FC 4614003C */ c.lt.s $f0, $f20 -/* 8867C0 80240400 00000000 */ nop -/* 8867C4 80240404 45000016 */ bc1f .L80240460 -/* 8867C8 80240408 46001106 */ mov.s $f4, $f2 -/* 8867CC 8024040C 862200B0 */ lh $v0, 0xb0($s1) -/* 8867D0 80240410 44820000 */ mtc1 $v0, $f0 -/* 8867D4 80240414 00000000 */ nop -/* 8867D8 80240418 46800020 */ cvt.s.w $f0, $f0 -/* 8867DC 8024041C 4600A03C */ c.lt.s $f20, $f0 -/* 8867E0 80240420 00000000 */ nop -/* 8867E4 80240424 4500000E */ bc1f .L80240460 -/* 8867E8 80240428 00000000 */ nop -/* 8867EC 8024042C 862200B2 */ lh $v0, 0xb2($s1) -/* 8867F0 80240430 3C013F00 */ lui $at, 0x3f00 -/* 8867F4 80240434 44811000 */ mtc1 $at, $f2 -/* 8867F8 80240438 44820000 */ mtc1 $v0, $f0 -/* 8867FC 8024043C 00000000 */ nop -/* 886800 80240440 46800020 */ cvt.s.w $f0, $f0 -/* 886804 80240444 46020002 */ mul.s $f0, $f0, $f2 -/* 886808 80240448 00000000 */ nop -/* 88680C 8024044C 4600203C */ c.lt.s $f4, $f0 -/* 886810 80240450 00000000 */ nop -/* 886814 80240454 45000002 */ bc1f .L80240460 -/* 886818 80240458 24020001 */ addiu $v0, $zero, 1 -/* 88681C 8024045C AE62008C */ sw $v0, 0x8c($s3) -.L80240460: -/* 886820 80240460 C6020038 */ lwc1 $f2, 0x38($s0) -/* 886824 80240464 C6400098 */ lwc1 $f0, 0x98($s2) -/* 886828 80240468 46001081 */ sub.s $f2, $f2, $f0 -/* 88682C 8024046C 46021182 */ mul.s $f6, $f2, $f2 -/* 886830 80240470 00000000 */ nop -/* 886834 80240474 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 886838 80240478 C6020040 */ lwc1 $f2, 0x40($s0) -/* 88683C 8024047C 46001081 */ sub.s $f2, $f2, $f0 -/* 886840 80240480 46021102 */ mul.s $f4, $f2, $f2 -/* 886844 80240484 00000000 */ nop -/* 886848 80240488 860200A8 */ lh $v0, 0xa8($s0) -/* 88684C 8024048C C602003C */ lwc1 $f2, 0x3c($s0) -/* 886850 80240490 44820000 */ mtc1 $v0, $f0 -/* 886854 80240494 00000000 */ nop -/* 886858 80240498 46800020 */ cvt.s.w $f0, $f0 -/* 88685C 8024049C 46001080 */ add.s $f2, $f2, $f0 -/* 886860 802404A0 3C013FC0 */ lui $at, 0x3fc0 -/* 886864 802404A4 44810000 */ mtc1 $at, $f0 -/* 886868 802404A8 00000000 */ nop -/* 88686C 802404AC 46001081 */ sub.s $f2, $f2, $f0 -/* 886870 802404B0 46043300 */ add.s $f12, $f6, $f4 -/* 886874 802404B4 C640009C */ lwc1 $f0, 0x9c($s2) -/* 886878 802404B8 46001501 */ sub.s $f20, $f2, $f0 -/* 88687C 802404BC 46006084 */ sqrt.s $f2, $f12 -/* 886880 802404C0 46021032 */ c.eq.s $f2, $f2 -/* 886884 802404C4 00000000 */ nop -/* 886888 802404C8 45010004 */ bc1t .L802404DC -/* 88688C 802404CC 00000000 */ nop -/* 886890 802404D0 0C0187BC */ jal sqrtf -/* 886894 802404D4 00000000 */ nop -/* 886898 802404D8 46000086 */ mov.s $f2, $f0 -.L802404DC: -/* 88689C 802404DC 44800000 */ mtc1 $zero, $f0 -/* 8868A0 802404E0 00000000 */ nop -/* 8868A4 802404E4 4614003C */ c.lt.s $f0, $f20 -/* 8868A8 802404E8 00000000 */ nop -/* 8868AC 802404EC 45000016 */ bc1f .L80240548 -/* 8868B0 802404F0 46001106 */ mov.s $f4, $f2 -/* 8868B4 802404F4 860200A8 */ lh $v0, 0xa8($s0) -/* 8868B8 802404F8 44820000 */ mtc1 $v0, $f0 -/* 8868BC 802404FC 00000000 */ nop -/* 8868C0 80240500 46800020 */ cvt.s.w $f0, $f0 -/* 8868C4 80240504 4600A03C */ c.lt.s $f20, $f0 -/* 8868C8 80240508 00000000 */ nop -/* 8868CC 8024050C 4500000F */ bc1f .L8024054C -/* 8868D0 80240510 0000882D */ daddu $s1, $zero, $zero -/* 8868D4 80240514 860200A6 */ lh $v0, 0xa6($s0) -/* 8868D8 80240518 3C013F00 */ lui $at, 0x3f00 -/* 8868DC 8024051C 44811000 */ mtc1 $at, $f2 -/* 8868E0 80240520 44820000 */ mtc1 $v0, $f0 -/* 8868E4 80240524 00000000 */ nop -/* 8868E8 80240528 46800020 */ cvt.s.w $f0, $f0 -/* 8868EC 8024052C 46020002 */ mul.s $f0, $f0, $f2 -/* 8868F0 80240530 00000000 */ nop -/* 8868F4 80240534 4600203C */ c.lt.s $f4, $f0 -/* 8868F8 80240538 00000000 */ nop -/* 8868FC 8024053C 45000003 */ bc1f .L8024054C -/* 886900 80240540 24020001 */ addiu $v0, $zero, 1 -/* 886904 80240544 AE62008C */ sw $v0, 0x8c($s3) -.L80240548: -/* 886908 80240548 0000882D */ daddu $s1, $zero, $zero -.L8024054C: -/* 88690C 8024054C 3C013FC0 */ lui $at, 0x3fc0 -/* 886910 80240550 4481D000 */ mtc1 $at, $f26 -/* 886914 80240554 4480C000 */ mtc1 $zero, $f24 -/* 886918 80240558 3C013F00 */ lui $at, 0x3f00 -/* 88691C 8024055C 4481B000 */ mtc1 $at, $f22 -.L80240560: -/* 886920 80240560 0C00EAD2 */ jal get_npc_safe -/* 886924 80240564 0220202D */ daddu $a0, $s1, $zero -/* 886928 80240568 0040802D */ daddu $s0, $v0, $zero -/* 88692C 8024056C 52000035 */ beql $s0, $zero, .L80240644 -/* 886930 80240570 26310001 */ addiu $s1, $s1, 1 -/* 886934 80240574 C6020038 */ lwc1 $f2, 0x38($s0) -/* 886938 80240578 C6400098 */ lwc1 $f0, 0x98($s2) -/* 88693C 8024057C 46001081 */ sub.s $f2, $f2, $f0 -/* 886940 80240580 46021182 */ mul.s $f6, $f2, $f2 -/* 886944 80240584 00000000 */ nop -/* 886948 80240588 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 88694C 8024058C C6020040 */ lwc1 $f2, 0x40($s0) -/* 886950 80240590 46001081 */ sub.s $f2, $f2, $f0 -/* 886954 80240594 46021102 */ mul.s $f4, $f2, $f2 -/* 886958 80240598 00000000 */ nop -/* 88695C 8024059C 860200A8 */ lh $v0, 0xa8($s0) -/* 886960 802405A0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 886964 802405A4 44820000 */ mtc1 $v0, $f0 -/* 886968 802405A8 00000000 */ nop -/* 88696C 802405AC 46800020 */ cvt.s.w $f0, $f0 -/* 886970 802405B0 46001080 */ add.s $f2, $f2, $f0 -/* 886974 802405B4 461A1081 */ sub.s $f2, $f2, $f26 -/* 886978 802405B8 46043300 */ add.s $f12, $f6, $f4 -/* 88697C 802405BC C640009C */ lwc1 $f0, 0x9c($s2) -/* 886980 802405C0 46001501 */ sub.s $f20, $f2, $f0 -/* 886984 802405C4 46006004 */ sqrt.s $f0, $f12 -/* 886988 802405C8 46000032 */ c.eq.s $f0, $f0 -/* 88698C 802405CC 00000000 */ nop -/* 886990 802405D0 45010003 */ bc1t .L802405E0 -/* 886994 802405D4 00000000 */ nop -/* 886998 802405D8 0C0187BC */ jal sqrtf -/* 88699C 802405DC 00000000 */ nop -.L802405E0: -/* 8869A0 802405E0 4614C03C */ c.lt.s $f24, $f20 -/* 8869A4 802405E4 00000000 */ nop -/* 8869A8 802405E8 45000015 */ bc1f .L80240640 -/* 8869AC 802405EC 46000106 */ mov.s $f4, $f0 -/* 8869B0 802405F0 860200A8 */ lh $v0, 0xa8($s0) -/* 8869B4 802405F4 44820000 */ mtc1 $v0, $f0 -/* 8869B8 802405F8 00000000 */ nop -/* 8869BC 802405FC 46800020 */ cvt.s.w $f0, $f0 -/* 8869C0 80240600 4600A03C */ c.lt.s $f20, $f0 -/* 8869C4 80240604 00000000 */ nop -/* 8869C8 80240608 4500000E */ bc1f .L80240644 -/* 8869CC 8024060C 26310001 */ addiu $s1, $s1, 1 -/* 8869D0 80240610 860200A6 */ lh $v0, 0xa6($s0) -/* 8869D4 80240614 44820000 */ mtc1 $v0, $f0 -/* 8869D8 80240618 00000000 */ nop -/* 8869DC 8024061C 46800020 */ cvt.s.w $f0, $f0 -/* 8869E0 80240620 46160002 */ mul.s $f0, $f0, $f22 -/* 8869E4 80240624 00000000 */ nop -/* 8869E8 80240628 4600203C */ c.lt.s $f4, $f0 -/* 8869EC 8024062C 00000000 */ nop -/* 8869F0 80240630 45000004 */ bc1f .L80240644 -/* 8869F4 80240634 24020001 */ addiu $v0, $zero, 1 -/* 8869F8 80240638 08090194 */ j .L80240650 -/* 8869FC 8024063C AE62008C */ sw $v0, 0x8c($s3) -.L80240640: -/* 886A00 80240640 26310001 */ addiu $s1, $s1, 1 -.L80240644: -/* 886A04 80240644 2A220040 */ slti $v0, $s1, 0x40 -/* 886A08 80240648 1440FFC5 */ bnez $v0, .L80240560 -/* 886A0C 8024064C 00000000 */ nop -.L80240650: -/* 886A10 80240650 8FBF0020 */ lw $ra, 0x20($sp) -/* 886A14 80240654 8FB3001C */ lw $s3, 0x1c($sp) -/* 886A18 80240658 8FB20018 */ lw $s2, 0x18($sp) -/* 886A1C 8024065C 8FB10014 */ lw $s1, 0x14($sp) -/* 886A20 80240660 8FB00010 */ lw $s0, 0x10($sp) -/* 886A24 80240664 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 886A28 80240668 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 886A2C 8024066C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 886A30 80240670 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 886A34 80240674 24020002 */ addiu $v0, $zero, 2 -/* 886A38 80240678 03E00008 */ jr $ra -/* 886A3C 8024067C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_10/func_80240680_8863C0.s b/asm/nonmatchings/world/area_tik/tik_10/func_80240680_8863C0.s deleted file mode 100644 index d31a7784bd..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/func_80240680_8863C0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240680_886A40 -/* 886A40 80240680 3C03800A */ lui $v1, %hi(D_8009A650) -/* 886A44 80240684 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 886A48 80240688 8C620000 */ lw $v0, ($v1) -/* 886A4C 8024068C 34420040 */ ori $v0, $v0, 0x40 -/* 886A50 80240690 AC620000 */ sw $v0, ($v1) -/* 886A54 80240694 03E00008 */ jr $ra -/* 886A58 80240698 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_10/func_80241388_8863C0.s b/asm/nonmatchings/world/area_tik/tik_10/func_80241388_8863C0.s deleted file mode 100644 index 0e0300eb14..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/func_80241388_8863C0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241388_887748 -/* 887748 80241388 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* 88774C 8024138C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* 887750 80241390 AC800084 */ sw $zero, 0x84($a0) -/* 887754 80241394 80620000 */ lb $v0, ($v1) -/* 887758 80241398 10400005 */ beqz $v0, .L802413B0 -/* 88775C 8024139C 24020003 */ addiu $v0, $zero, 3 -/* 887760 802413A0 80630003 */ lb $v1, 3($v1) -/* 887764 802413A4 14620002 */ bne $v1, $v0, .L802413B0 -/* 887768 802413A8 24020001 */ addiu $v0, $zero, 1 -/* 88776C 802413AC AC820084 */ sw $v0, 0x84($a0) -.L802413B0: -/* 887770 802413B0 03E00008 */ jr $ra -/* 887774 802413B4 24020002 */ addiu $v0, $zero, 2 -/* 887778 802413B8 00000000 */ nop -/* 88777C 802413BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_12/func_80240020_888BD0.s b/asm/nonmatchings/world/area_tik/tik_12/func_80240020_888BD0.s deleted file mode 100644 index 0b7b2f2f41..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/func_80240020_888BD0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_888BF0 -/* 888BF0 80240020 3C028016 */ lui $v0, 0x8016 -/* 888BF4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 888BF8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 888BFC 8024002C 03E00008 */ jr $ra -/* 888C00 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_12/func_80240034_888BD0.s b/asm/nonmatchings/world/area_tik/tik_12/func_80240034_888BD0.s deleted file mode 100644 index d7e35e9967..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/func_80240034_888BD0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_888C04 -/* 888C04 80240034 3C038016 */ lui $v1, 0x8016 -/* 888C08 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* 888C0C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 888C10 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 888C14 80240044 0080802D */ daddu $s0, $a0, $zero -/* 888C18 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* 888C1C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 888C20 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* 888C24 80240054 24020002 */ addiu $v0, $zero, 2 -/* 888C28 80240058 08090038 */ j .L802400E0 -/* 888C2C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* 888C30 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 888C34 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 888C38 80240068 80620040 */ lb $v0, 0x40($v1) -/* 888C3C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* 888C40 80240070 04420001 */ bltzl $v0, .L80240078 -/* 888C44 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* 888C48 80240078 14400003 */ bnez $v0, .L80240088 -/* 888C4C 8024007C 00000000 */ nop -/* 888C50 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* 888C54 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* 888C58 80240088 44822000 */ mtc1 $v0, $f4 -/* 888C5C 8024008C 00000000 */ nop -/* 888C60 80240090 46802120 */ cvt.s.w $f4, $f4 -/* 888C64 80240094 44062000 */ mfc1 $a2, $f4 -/* 888C68 80240098 44872000 */ mtc1 $a3, $f4 -/* 888C6C 8024009C 00000000 */ nop -/* 888C70 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* 888C74 802400A4 44806000 */ mtc1 $zero, $f12 -/* 888C78 802400A8 44072000 */ mfc1 $a3, $f4 -/* 888C7C 802400AC 0C00A720 */ jal atan2 -/* 888C80 802400B0 46006386 */ mov.s $f14, $f12 -/* 888C84 802400B4 3C014270 */ lui $at, 0x4270 -/* 888C88 802400B8 44811000 */ mtc1 $at, $f2 -/* 888C8C 802400BC 00000000 */ nop -/* 888C90 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 888C94 802400C4 00000000 */ nop -/* 888C98 802400C8 45000004 */ bc1f .L802400DC -/* 888C9C 802400CC 24020001 */ addiu $v0, $zero, 1 -/* 888CA0 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* 888CA4 802400D4 08090038 */ j .L802400E0 -/* 888CA8 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* 888CAC 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* 888CB0 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 888CB4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 888CB8 802400E8 03E00008 */ jr $ra -/* 888CBC 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/func_802400F0_888BD0.s b/asm/nonmatchings/world/area_tik/tik_12/func_802400F0_888BD0.s deleted file mode 100644 index 30d7ff4e4c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/func_802400F0_888BD0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_888CC0 -/* 888CC0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 888CC4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 888CC8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 888CCC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 888CD0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 888CD4 80240104 0C016AFA */ jal get_current_map_header -/* 888CD8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 888CDC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 888CE0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 888CE4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 888CE8 80240118 0C0B1EAF */ jal get_variable -/* 888CEC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 888CF0 80240120 0220202D */ daddu $a0, $s1, $zero -/* 888CF4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 888CF8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 888CFC 8024012C 00028100 */ sll $s0, $v0, 4 -/* 888D00 80240130 02031821 */ addu $v1, $s0, $v1 -/* 888D04 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 888D08 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 888D0C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 888D10 80240140 0C0B2026 */ jal set_variable -/* 888D14 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 888D18 80240148 0220202D */ daddu $a0, $s1, $zero -/* 888D1C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 888D20 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 888D24 80240154 02021021 */ addu $v0, $s0, $v0 -/* 888D28 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 888D2C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 888D30 80240160 44061000 */ mfc1 $a2, $f2 -/* 888D34 80240164 0C0B2026 */ jal set_variable -/* 888D38 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 888D3C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 888D40 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 888D44 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 888D48 80240178 02021021 */ addu $v0, $s0, $v0 -/* 888D4C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 888D50 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 888D54 80240184 44061000 */ mfc1 $a2, $f2 -/* 888D58 80240188 0C0B2026 */ jal set_variable -/* 888D5C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 888D60 80240190 0220202D */ daddu $a0, $s1, $zero -/* 888D64 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 888D68 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 888D6C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 888D70 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 888D74 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 888D78 802401A8 44061000 */ mfc1 $a2, $f2 -/* 888D7C 802401AC 0C0B2026 */ jal set_variable -/* 888D80 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 888D84 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 888D88 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 888D8C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 888D90 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 888D94 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 888D98 802401C8 03E00008 */ jr $ra -/* 888D9C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/func_802401D0_888BD0.s b/asm/nonmatchings/world/area_tik/tik_12/func_802401D0_888BD0.s deleted file mode 100644 index 2a94536a17..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/func_802401D0_888BD0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_888DA0 -/* 888DA0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 888DA4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 888DA8 802401D8 3C014334 */ lui $at, 0x4334 -/* 888DAC 802401DC 44816000 */ mtc1 $at, $f12 -/* 888DB0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 888DB4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 888DB8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 888DBC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 888DC0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 888DC4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 888DC8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 888DCC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 888DD0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 888DD4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 888DD8 80240208 3C01800B */ lui $at, 0x800b -/* 888DDC 8024020C 00220821 */ addu $at, $at, $v0 -/* 888DE0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 888DE4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 888DE8 80240218 0C00A6C9 */ jal clamp_angle -/* 888DEC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 888DF0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 888DF4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 888DF8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 888DFC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 888E00 80240230 24020002 */ addiu $v0, $zero, 2 -/* 888E04 80240234 03E00008 */ jr $ra -/* 888E08 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/func_8024023C_888BD0.s b/asm/nonmatchings/world/area_tik/tik_12/func_8024023C_888BD0.s deleted file mode 100644 index 739574b720..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/func_8024023C_888BD0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_888E0C -/* 888E0C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 888E10 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 888E14 80240244 0080802D */ daddu $s0, $a0, $zero -/* 888E18 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 888E1C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 888E20 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 888E24 80240254 0C0B210B */ jal get_float_variable -/* 888E28 80240258 8C450000 */ lw $a1, ($v0) -/* 888E2C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 888E30 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 888E34 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 888E38 80240268 44060000 */ mfc1 $a2, $f0 -/* 888E3C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 888E40 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 888E44 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 888E48 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 888E4C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 888E50 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 888E54 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 888E58 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 888E5C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 888E60 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 888E64 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 888E68 80240298 0C0B2190 */ jal set_float_variable -/* 888E6C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 888E70 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 888E74 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 888E78 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 888E7C 802402AC 0C0B2190 */ jal set_float_variable -/* 888E80 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 888E84 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 888E88 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 888E8C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 888E90 802402C0 0C0B2190 */ jal set_float_variable -/* 888E94 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 888E98 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 888E9C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 888EA0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 888EA4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 888EA8 802402D8 03E00008 */ jr $ra -/* 888EAC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_12/func_802402E0_888BD0.s b/asm/nonmatchings/world/area_tik/tik_12/func_802402E0_888BD0.s deleted file mode 100644 index 67697d8dbf..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/func_802402E0_888BD0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_888EB0 -/* 888EB0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 888EB4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 888EB8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 888EBC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 888EC0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 888EC4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 888EC8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 888ECC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 888ED0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 888ED4 80240304 3C020002 */ lui $v0, 2 -/* 888ED8 80240308 080900C8 */ j .L80240320 -/* 888EDC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 888EE0 80240310 3C040002 */ lui $a0, 2 -/* 888EE4 80240314 0083102A */ slt $v0, $a0, $v1 -/* 888EE8 80240318 10400002 */ beqz $v0, .L80240324 -/* 888EEC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 888EF0 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 888EF4 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 888EF8 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 888EFC 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 888F00 80240330 04610004 */ bgez $v1, .L80240344 -/* 888F04 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 888F08 80240338 3C020002 */ lui $v0, 2 -/* 888F0C 8024033C 080900D5 */ j .L80240354 -/* 888F10 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 888F14 80240344 3C040002 */ lui $a0, 2 -/* 888F18 80240348 0083102A */ slt $v0, $a0, $v1 -/* 888F1C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 888F20 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 888F24 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 888F28 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 888F2C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 888F30 80240360 00621821 */ addu $v1, $v1, $v0 -/* 888F34 80240364 04610004 */ bgez $v1, .L80240378 -/* 888F38 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 888F3C 8024036C 3C020002 */ lui $v0, 2 -/* 888F40 80240370 080900E2 */ j .L80240388 -/* 888F44 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 888F48 80240378 3C040002 */ lui $a0, 2 -/* 888F4C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 888F50 80240380 10400002 */ beqz $v0, .L8024038C -/* 888F54 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 888F58 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 888F5C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 888F60 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 888F64 80240394 00621821 */ addu $v1, $v1, $v0 -/* 888F68 80240398 04610004 */ bgez $v1, .L802403AC -/* 888F6C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 888F70 802403A0 3C020002 */ lui $v0, 2 -/* 888F74 802403A4 080900EF */ j .L802403BC -/* 888F78 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 888F7C 802403AC 3C040002 */ lui $a0, 2 -/* 888F80 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 888F84 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 888F88 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 888F8C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 888F90 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 888F94 802403C4 0C046F07 */ jal set_main_pan_u -/* 888F98 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 888F9C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 888FA0 802403D0 0C046F0D */ jal set_main_pan_v -/* 888FA4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 888FA8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 888FAC 802403DC 0C046F13 */ jal set_aux_pan_u -/* 888FB0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 888FB4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 888FB8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 888FBC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 888FC0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 888FC4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 888FC8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 888FCC 802403FC 03E00008 */ jr $ra -/* 888FD0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/func_80240404_888BD0.s b/asm/nonmatchings/world/area_tik/tik_12/func_80240404_888BD0.s deleted file mode 100644 index d664388859..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/func_80240404_888BD0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_888FD4 -/* 888FD4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 888FD8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 888FDC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 888FE0 80240410 10A00005 */ beqz $a1, .L80240428 -/* 888FE4 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 888FE8 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 888FEC 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 888FF0 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 888FF4 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 888FF8 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 888FFC 8024042C 1440000E */ bnez $v0, .L80240468 -/* 889000 80240430 00000000 */ nop -/* 889004 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 889008 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 88900C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 889010 80240440 04610004 */ bgez $v1, .L80240454 -/* 889014 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 889018 80240448 3C020002 */ lui $v0, 2 -/* 88901C 8024044C 08090119 */ j .L80240464 -/* 889020 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 889024 80240454 3C040002 */ lui $a0, 2 -/* 889028 80240458 0083102A */ slt $v0, $a0, $v1 -/* 88902C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 889030 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 889034 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 889038 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 88903C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 889040 80240470 00000000 */ nop -/* 889044 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 889048 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 88904C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 889050 80240480 04610004 */ bgez $v1, .L80240494 -/* 889054 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 889058 80240488 3C020002 */ lui $v0, 2 -/* 88905C 8024048C 08090129 */ j .L802404A4 -/* 889060 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 889064 80240494 3C040002 */ lui $a0, 2 -/* 889068 80240498 0083102A */ slt $v0, $a0, $v1 -/* 88906C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 889070 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 889074 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 889078 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 88907C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 889080 802404B0 00000000 */ nop -/* 889084 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 889088 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 88908C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 889090 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 889094 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 889098 802404C8 3C020002 */ lui $v0, 2 -/* 88909C 802404CC 08090139 */ j .L802404E4 -/* 8890A0 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 8890A4 802404D4 3C040002 */ lui $a0, 2 -/* 8890A8 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 8890AC 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 8890B0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 8890B4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 8890B8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 8890BC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 8890C0 802404F0 00000000 */ nop -/* 8890C4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8890C8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 8890CC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 8890D0 80240500 04610004 */ bgez $v1, .L80240514 -/* 8890D4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8890D8 80240508 3C020002 */ lui $v0, 2 -/* 8890DC 8024050C 08090149 */ j .L80240524 -/* 8890E0 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 8890E4 80240514 3C040002 */ lui $a0, 2 -/* 8890E8 80240518 0083102A */ slt $v0, $a0, $v1 -/* 8890EC 8024051C 10400002 */ beqz $v0, .L80240528 -/* 8890F0 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 8890F4 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 8890F8 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 8890FC 8024052C 0C046F07 */ jal set_main_pan_u -/* 889100 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 889104 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 889108 80240538 0C046F0D */ jal set_main_pan_v -/* 88910C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 889110 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 889114 80240544 0C046F13 */ jal set_aux_pan_u -/* 889118 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 88911C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 889120 80240550 0C046F19 */ jal set_aux_pan_v -/* 889124 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 889128 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 88912C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 889130 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 889134 80240564 24420001 */ addiu $v0, $v0, 1 -/* 889138 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 88913C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 889140 80240570 24630001 */ addiu $v1, $v1, 1 -/* 889144 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 889148 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 88914C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 889150 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 889154 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 889158 80240588 0064182A */ slt $v1, $v1, $a0 -/* 88915C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 889160 80240590 14600002 */ bnez $v1, .L8024059C -/* 889164 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 889168 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 88916C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 889170 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 889174 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 889178 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 88917C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 889180 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 889184 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 889188 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 88918C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 889190 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 889194 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 889198 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 88919C 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 8891A0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 8891A4 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 8891A8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8891AC 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 8891B0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 8891B4 802405E4 03E00008 */ jr $ra -/* 8891B8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8891BC 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_12/func_802405F0_888BD0.s b/asm/nonmatchings/world/area_tik/tik_12/func_802405F0_888BD0.s deleted file mode 100644 index d633b41648..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/func_802405F0_888BD0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_8891C0 -/* 8891C0 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8891C4 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 8891C8 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 8891CC 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 8891D0 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 8891D4 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 8891D8 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 8891DC 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8891E0 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8891E4 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8891E8 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8891EC 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 8891F0 80240620 0C0B1EAF */ jal get_variable -/* 8891F4 80240624 8C450000 */ lw $a1, ($v0) -/* 8891F8 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 8891FC 8024062C 0C00EABB */ jal get_npc_unsafe -/* 889200 80240630 0040802D */ daddu $s0, $v0, $zero -/* 889204 80240634 0200202D */ daddu $a0, $s0, $zero -/* 889208 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 88920C 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 889210 80240640 0C046B4C */ jal get_model_from_list_index -/* 889214 80240644 0040202D */ daddu $a0, $v0, $zero -/* 889218 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 88921C 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 889220 80240650 0040902D */ daddu $s2, $v0, $zero -/* 889224 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 889228 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 88922C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 889230 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 889234 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 889238 80240668 00000000 */ nop -/* 88923C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 889240 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 889244 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 889248 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 88924C 8024067C 00000000 */ nop -/* 889250 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 889254 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 889258 80240688 44820000 */ mtc1 $v0, $f0 -/* 88925C 8024068C 00000000 */ nop -/* 889260 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 889264 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 889268 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 88926C 8024069C 44810000 */ mtc1 $at, $f0 -/* 889270 802406A0 00000000 */ nop -/* 889274 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 889278 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 88927C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 889280 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 889284 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 889288 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 88928C 802406BC 00000000 */ nop -/* 889290 802406C0 45010004 */ bc1t .L802406D4 -/* 889294 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 889298 802406C8 0C0187BC */ jal sqrtf -/* 88929C 802406CC 00000000 */ nop -/* 8892A0 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 8892A4 802406D4 44800000 */ mtc1 $zero, $f0 -/* 8892A8 802406D8 00000000 */ nop -/* 8892AC 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 8892B0 802406E0 00000000 */ nop -/* 8892B4 802406E4 45000016 */ bc1f .L80240740 -/* 8892B8 802406E8 46001106 */ mov.s $f4, $f2 -/* 8892BC 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 8892C0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 8892C4 802406F4 00000000 */ nop -/* 8892C8 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 8892CC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 8892D0 80240700 00000000 */ nop -/* 8892D4 80240704 4500000E */ bc1f .L80240740 -/* 8892D8 80240708 00000000 */ nop -/* 8892DC 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 8892E0 80240710 3C013F00 */ lui $at, 0x3f00 -/* 8892E4 80240714 44811000 */ mtc1 $at, $f2 -/* 8892E8 80240718 44820000 */ mtc1 $v0, $f0 -/* 8892EC 8024071C 00000000 */ nop -/* 8892F0 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 8892F4 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 8892F8 80240728 00000000 */ nop -/* 8892FC 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 889300 80240730 00000000 */ nop -/* 889304 80240734 45000002 */ bc1f .L80240740 -/* 889308 80240738 24020001 */ addiu $v0, $zero, 1 -/* 88930C 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 889310 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 889314 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 889318 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 88931C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 889320 80240750 00000000 */ nop -/* 889324 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 889328 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 88932C 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 889330 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 889334 80240764 00000000 */ nop -/* 889338 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 88933C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 889340 80240770 44820000 */ mtc1 $v0, $f0 -/* 889344 80240774 00000000 */ nop -/* 889348 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 88934C 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 889350 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 889354 80240784 44810000 */ mtc1 $at, $f0 -/* 889358 80240788 00000000 */ nop -/* 88935C 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 889360 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 889364 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 889368 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 88936C 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 889370 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 889374 802407A4 00000000 */ nop -/* 889378 802407A8 45010004 */ bc1t .L802407BC -/* 88937C 802407AC 00000000 */ nop -/* 889380 802407B0 0C0187BC */ jal sqrtf -/* 889384 802407B4 00000000 */ nop -/* 889388 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 88938C 802407BC 44800000 */ mtc1 $zero, $f0 -/* 889390 802407C0 00000000 */ nop -/* 889394 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 889398 802407C8 00000000 */ nop -/* 88939C 802407CC 45000016 */ bc1f .L80240828 -/* 8893A0 802407D0 46001106 */ mov.s $f4, $f2 -/* 8893A4 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 8893A8 802407D8 44820000 */ mtc1 $v0, $f0 -/* 8893AC 802407DC 00000000 */ nop -/* 8893B0 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 8893B4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 8893B8 802407E8 00000000 */ nop -/* 8893BC 802407EC 4500000F */ bc1f .L8024082C -/* 8893C0 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 8893C4 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 8893C8 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 8893CC 802407FC 44811000 */ mtc1 $at, $f2 -/* 8893D0 80240800 44820000 */ mtc1 $v0, $f0 -/* 8893D4 80240804 00000000 */ nop -/* 8893D8 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 8893DC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 8893E0 80240810 00000000 */ nop -/* 8893E4 80240814 4600203C */ c.lt.s $f4, $f0 -/* 8893E8 80240818 00000000 */ nop -/* 8893EC 8024081C 45000003 */ bc1f .L8024082C -/* 8893F0 80240820 24020001 */ addiu $v0, $zero, 1 -/* 8893F4 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 8893F8 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 8893FC 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 889400 80240830 4481D000 */ mtc1 $at, $f26 -/* 889404 80240834 4480C000 */ mtc1 $zero, $f24 -/* 889408 80240838 3C013F00 */ lui $at, 0x3f00 -/* 88940C 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 889410 80240840 0C00EAD2 */ jal get_npc_safe -/* 889414 80240844 0220202D */ daddu $a0, $s1, $zero -/* 889418 80240848 0040802D */ daddu $s0, $v0, $zero -/* 88941C 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 889420 80240850 26310001 */ addiu $s1, $s1, 1 -/* 889424 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 889428 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 88942C 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 889430 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 889434 80240864 00000000 */ nop -/* 889438 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 88943C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 889440 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 889444 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 889448 80240878 00000000 */ nop -/* 88944C 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 889450 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 889454 80240884 44820000 */ mtc1 $v0, $f0 -/* 889458 80240888 00000000 */ nop -/* 88945C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 889460 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 889464 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 889468 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 88946C 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 889470 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 889474 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 889478 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 88947C 802408AC 00000000 */ nop -/* 889480 802408B0 45010003 */ bc1t .L802408C0 -/* 889484 802408B4 00000000 */ nop -/* 889488 802408B8 0C0187BC */ jal sqrtf -/* 88948C 802408BC 00000000 */ nop -.L802408C0: -/* 889490 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 889494 802408C4 00000000 */ nop -/* 889498 802408C8 45000015 */ bc1f .L80240920 -/* 88949C 802408CC 46000106 */ mov.s $f4, $f0 -/* 8894A0 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 8894A4 802408D4 44820000 */ mtc1 $v0, $f0 -/* 8894A8 802408D8 00000000 */ nop -/* 8894AC 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 8894B0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 8894B4 802408E4 00000000 */ nop -/* 8894B8 802408E8 4500000E */ bc1f .L80240924 -/* 8894BC 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 8894C0 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 8894C4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 8894C8 802408F8 00000000 */ nop -/* 8894CC 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 8894D0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 8894D4 80240904 00000000 */ nop -/* 8894D8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 8894DC 8024090C 00000000 */ nop -/* 8894E0 80240910 45000004 */ bc1f .L80240924 -/* 8894E4 80240914 24020001 */ addiu $v0, $zero, 1 -/* 8894E8 80240918 0809024C */ j .L80240930 -/* 8894EC 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 8894F0 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 8894F4 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 8894F8 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 8894FC 8024092C 00000000 */ nop -.L80240930: -/* 889500 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 889504 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 889508 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 88950C 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 889510 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 889514 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 889518 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 88951C 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 889520 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 889524 80240954 24020002 */ addiu $v0, $zero, 2 -/* 889528 80240958 03E00008 */ jr $ra -/* 88952C 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_12/func_80240960_888BD0.s b/asm/nonmatchings/world/area_tik/tik_12/func_80240960_888BD0.s deleted file mode 100644 index f5050a126d..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/func_80240960_888BD0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240960_889530 -/* 889530 80240960 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 889534 80240964 AFB00010 */ sw $s0, 0x10($sp) -/* 889538 80240968 3C108024 */ lui $s0, 0x8024 -/* 88953C 8024096C 26103C40 */ addiu $s0, $s0, 0x3c40 -/* 889540 80240970 AFBF0018 */ sw $ra, 0x18($sp) -/* 889544 80240974 AFB10014 */ sw $s1, 0x14($sp) -/* 889548 80240978 8E020000 */ lw $v0, ($s0) -/* 88954C 8024097C 14400010 */ bnez $v0, .L802409C0 -/* 889550 80240980 0080882D */ daddu $s1, $a0, $zero -/* 889554 80240984 0C00AB39 */ jal heap_malloc -/* 889558 80240988 24040040 */ addiu $a0, $zero, 0x40 -/* 88955C 8024098C AE020000 */ sw $v0, ($s0) -/* 889560 80240990 0000182D */ daddu $v1, $zero, $zero -/* 889564 80240994 0040282D */ daddu $a1, $v0, $zero -/* 889568 80240998 0220202D */ daddu $a0, $s1, $zero -.L8024099C: -/* 88956C 8024099C 8C820084 */ lw $v0, 0x84($a0) -/* 889570 802409A0 24840004 */ addiu $a0, $a0, 4 -/* 889574 802409A4 24630001 */ addiu $v1, $v1, 1 -/* 889578 802409A8 ACA20000 */ sw $v0, ($a1) -/* 88957C 802409AC 28620010 */ slti $v0, $v1, 0x10 -/* 889580 802409B0 1440FFFA */ bnez $v0, .L8024099C -/* 889584 802409B4 24A50004 */ addiu $a1, $a1, 4 -/* 889588 802409B8 0809027F */ j .L802409FC -/* 88958C 802409BC 00000000 */ nop -.L802409C0: -/* 889590 802409C0 0000182D */ daddu $v1, $zero, $zero -/* 889594 802409C4 0040282D */ daddu $a1, $v0, $zero -/* 889598 802409C8 0220202D */ daddu $a0, $s1, $zero -.L802409CC: -/* 88959C 802409CC 8CA20000 */ lw $v0, ($a1) -/* 8895A0 802409D0 24A50004 */ addiu $a1, $a1, 4 -/* 8895A4 802409D4 24630001 */ addiu $v1, $v1, 1 -/* 8895A8 802409D8 AC820084 */ sw $v0, 0x84($a0) -/* 8895AC 802409DC 28620010 */ slti $v0, $v1, 0x10 -/* 8895B0 802409E0 1440FFFA */ bnez $v0, .L802409CC -/* 8895B4 802409E4 24840004 */ addiu $a0, $a0, 4 -/* 8895B8 802409E8 3C108024 */ lui $s0, 0x8024 -/* 8895BC 802409EC 26103C40 */ addiu $s0, $s0, 0x3c40 -/* 8895C0 802409F0 0C00AB4B */ jal heap_free -/* 8895C4 802409F4 8E040000 */ lw $a0, ($s0) -/* 8895C8 802409F8 AE000000 */ sw $zero, ($s0) -.L802409FC: -/* 8895CC 802409FC 8FBF0018 */ lw $ra, 0x18($sp) -/* 8895D0 80240A00 8FB10014 */ lw $s1, 0x14($sp) -/* 8895D4 80240A04 8FB00010 */ lw $s0, 0x10($sp) -/* 8895D8 80240A08 24020002 */ addiu $v0, $zero, 2 -/* 8895DC 80240A0C 03E00008 */ jr $ra -/* 8895E0 80240A10 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/func_80240DE8_888BD0.s b/asm/nonmatchings/world/area_tik/tik_12/func_80240DE8_888BD0.s deleted file mode 100644 index 247c9da693..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/func_80240DE8_888BD0.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DE8_8899B8 -/* 8899B8 80240DE8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 8899BC 80240DEC AFB5002C */ sw $s5, 0x2c($sp) -/* 8899C0 80240DF0 0080A82D */ daddu $s5, $a0, $zero -/* 8899C4 80240DF4 AFBE0038 */ sw $fp, 0x38($sp) -/* 8899C8 80240DF8 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* 8899CC 80240DFC 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* 8899D0 80240E00 AFBF003C */ sw $ra, 0x3c($sp) -/* 8899D4 80240E04 AFB70034 */ sw $s7, 0x34($sp) -/* 8899D8 80240E08 AFB60030 */ sw $s6, 0x30($sp) -/* 8899DC 80240E0C AFB40028 */ sw $s4, 0x28($sp) -/* 8899E0 80240E10 AFB30024 */ sw $s3, 0x24($sp) -/* 8899E4 80240E14 AFB20020 */ sw $s2, 0x20($sp) -/* 8899E8 80240E18 AFB1001C */ sw $s1, 0x1c($sp) -/* 8899EC 80240E1C 10A0004F */ beqz $a1, .L80240F5C -/* 8899F0 80240E20 AFB00018 */ sw $s0, 0x18($sp) -/* 8899F4 80240E24 0C00AB39 */ jal heap_malloc -/* 8899F8 80240E28 24040330 */ addiu $a0, $zero, 0x330 -/* 8899FC 80240E2C 0040982D */ daddu $s3, $v0, $zero -/* 889A00 80240E30 0000B02D */ daddu $s6, $zero, $zero -/* 889A04 80240E34 02C0902D */ daddu $s2, $s6, $zero -/* 889A08 80240E38 3C148024 */ lui $s4, 0x8024 -/* 889A0C 80240E3C 26943CB4 */ addiu $s4, $s4, 0x3cb4 -/* 889A10 80240E40 0260882D */ daddu $s1, $s3, $zero -/* 889A14 80240E44 8EA200B4 */ lw $v0, 0xb4($s5) -/* 889A18 80240E48 3C038024 */ lui $v1, 0x8024 -/* 889A1C 80240E4C 24633CAC */ addiu $v1, $v1, 0x3cac -/* 889A20 80240E50 AEB30078 */ sw $s3, 0x78($s5) -/* 889A24 80240E54 00021027 */ nor $v0, $zero, $v0 -/* 889A28 80240E58 0002BFC2 */ srl $s7, $v0, 0x1f -/* 889A2C 80240E5C 00171080 */ sll $v0, $s7, 2 -/* 889A30 80240E60 00431021 */ addu $v0, $v0, $v1 -/* 889A34 80240E64 AFA20010 */ sw $v0, 0x10($sp) -.L80240E68: -/* 889A38 80240E68 86900000 */ lh $s0, ($s4) -/* 889A3C 80240E6C 001010C0 */ sll $v0, $s0, 3 -/* 889A40 80240E70 03C21021 */ addu $v0, $fp, $v0 -/* 889A44 80240E74 90420014 */ lbu $v0, 0x14($v0) -/* 889A48 80240E78 5040002E */ beql $v0, $zero, .L80240F34 -/* 889A4C 80240E7C 26520001 */ addiu $s2, $s2, 1 -/* 889A50 80240E80 00101100 */ sll $v0, $s0, 4 -/* 889A54 80240E84 3C068009 */ lui $a2, 0x8009 -/* 889A58 80240E88 24C6EF20 */ addiu $a2, $a2, -0x10e0 -/* 889A5C 80240E8C 00461021 */ addu $v0, $v0, $a2 -/* 889A60 80240E90 0200202D */ daddu $a0, $s0, $zero -/* 889A64 80240E94 AE300108 */ sw $s0, 0x108($s1) -/* 889A68 80240E98 8C420000 */ lw $v0, ($v0) -/* 889A6C 80240E9C 02E0282D */ daddu $a1, $s7, $zero -/* 889A70 80240EA0 0C09033C */ jal func_80240CF0 -/* 889A74 80240EA4 AE220084 */ sw $v0, 0x84($s1) -/* 889A78 80240EA8 0040202D */ daddu $a0, $v0, $zero -/* 889A7C 80240EAC 04800011 */ bltz $a0, .L80240EF4 -/* 889A80 80240EB0 00101080 */ sll $v0, $s0, 2 -/* 889A84 80240EB4 3C06800F */ lui $a2, 0x800f -/* 889A88 80240EB8 24C67F00 */ addiu $a2, $a2, 0x7f00 -/* 889A8C 80240EBC 00461021 */ addu $v0, $v0, $a2 -/* 889A90 80240EC0 8C430000 */ lw $v1, ($v0) -/* 889A94 80240EC4 24020001 */ addiu $v0, $zero, 1 -/* 889A98 80240EC8 AE22018C */ sw $v0, 0x18c($s1) -/* 889A9C 80240ECC 00041080 */ sll $v0, $a0, 2 -/* 889AA0 80240ED0 3C068024 */ lui $a2, 0x8024 -/* 889AA4 80240ED4 24C63CC4 */ addiu $a2, $a2, 0x3cc4 -/* 889AA8 80240ED8 AE230000 */ sw $v1, ($s1) -/* 889AAC 80240EDC 001218C0 */ sll $v1, $s2, 3 -/* 889AB0 80240EE0 00431021 */ addu $v0, $v0, $v1 -/* 889AB4 80240EE4 00461021 */ addu $v0, $v0, $a2 -/* 889AB8 80240EE8 8C420000 */ lw $v0, ($v0) -/* 889ABC 80240EEC 080903C6 */ j .L80240F18 -/* 889AC0 80240EF0 AE220294 */ sw $v0, 0x294($s1) -.L80240EF4: -/* 889AC4 80240EF4 3C06800F */ lui $a2, 0x800f -/* 889AC8 80240EF8 24C67F40 */ addiu $a2, $a2, 0x7f40 -/* 889ACC 80240EFC 00461021 */ addu $v0, $v0, $a2 -/* 889AD0 80240F00 8C420000 */ lw $v0, ($v0) -/* 889AD4 80240F04 AE20018C */ sw $zero, 0x18c($s1) -/* 889AD8 80240F08 AE220000 */ sw $v0, ($s1) -/* 889ADC 80240F0C 8FA60010 */ lw $a2, 0x10($sp) -/* 889AE0 80240F10 8CC20000 */ lw $v0, ($a2) -/* 889AE4 80240F14 AE220294 */ sw $v0, 0x294($s1) -.L80240F18: -/* 889AE8 80240F18 001010C0 */ sll $v0, $s0, 3 -/* 889AEC 80240F1C 03C21021 */ addu $v0, $fp, $v0 -/* 889AF0 80240F20 80420015 */ lb $v0, 0x15($v0) -/* 889AF4 80240F24 26D60001 */ addiu $s6, $s6, 1 -/* 889AF8 80240F28 AE220210 */ sw $v0, 0x210($s1) -/* 889AFC 80240F2C 26310004 */ addiu $s1, $s1, 4 -/* 889B00 80240F30 26520001 */ addiu $s2, $s2, 1 -.L80240F34: -/* 889B04 80240F34 2A420008 */ slti $v0, $s2, 8 -/* 889B08 80240F38 1440FFCB */ bnez $v0, .L80240E68 -/* 889B0C 80240F3C 26940002 */ addiu $s4, $s4, 2 -/* 889B10 80240F40 0260202D */ daddu $a0, $s3, $zero -/* 889B14 80240F44 24020004 */ addiu $v0, $zero, 4 -/* 889B18 80240F48 AC820318 */ sw $v0, 0x318($a0) -/* 889B1C 80240F4C AC960324 */ sw $s6, 0x324($a0) -/* 889B20 80240F50 0C03D390 */ jal func_800F4E40 -/* 889B24 80240F54 AC800328 */ sw $zero, 0x328($a0) -/* 889B28 80240F58 AEA00070 */ sw $zero, 0x70($s5) -.L80240F5C: -/* 889B2C 80240F5C 8EA20070 */ lw $v0, 0x70($s5) -/* 889B30 80240F60 8EB30078 */ lw $s3, 0x78($s5) -/* 889B34 80240F64 14400008 */ bnez $v0, .L80240F88 -/* 889B38 80240F68 24420001 */ addiu $v0, $v0, 1 -/* 889B3C 80240F6C 8662032C */ lh $v0, 0x32c($s3) -/* 889B40 80240F70 10400009 */ beqz $v0, .L80240F98 -/* 889B44 80240F74 AEA20074 */ sw $v0, 0x74($s5) -/* 889B48 80240F78 0C03C4EC */ jal func_800F13B0 -/* 889B4C 80240F7C 00000000 */ nop -/* 889B50 80240F80 8EA20070 */ lw $v0, 0x70($s5) -/* 889B54 80240F84 24420001 */ addiu $v0, $v0, 1 -.L80240F88: -/* 889B58 80240F88 AEA20070 */ sw $v0, 0x70($s5) -/* 889B5C 80240F8C 2842000F */ slti $v0, $v0, 0xf -/* 889B60 80240F90 10400003 */ beqz $v0, .L80240FA0 -/* 889B64 80240F94 00000000 */ nop -.L80240F98: -/* 889B68 80240F98 08090402 */ j .L80241008 -/* 889B6C 80240F9C 0000102D */ daddu $v0, $zero, $zero -.L80240FA0: -/* 889B70 80240FA0 0C03C54E */ jal func_800F1538 -/* 889B74 80240FA4 00000000 */ nop -/* 889B78 80240FA8 8EA30074 */ lw $v1, 0x74($s5) -/* 889B7C 80240FAC 240200FF */ addiu $v0, $zero, 0xff -/* 889B80 80240FB0 10620010 */ beq $v1, $v0, .L80240FF4 -/* 889B84 80240FB4 2462FFFF */ addiu $v0, $v1, -1 -/* 889B88 80240FB8 00021080 */ sll $v0, $v0, 2 -/* 889B8C 80240FBC 02621021 */ addu $v0, $s3, $v0 -/* 889B90 80240FC0 8C420108 */ lw $v0, 0x108($v0) -/* 889B94 80240FC4 00021100 */ sll $v0, $v0, 4 -/* 889B98 80240FC8 3C038009 */ lui $v1, 0x8009 -/* 889B9C 80240FCC 00621821 */ addu $v1, $v1, $v0 -/* 889BA0 80240FD0 8C63EF20 */ lw $v1, -0x10e0($v1) -/* 889BA4 80240FD4 8EA20074 */ lw $v0, 0x74($s5) -/* 889BA8 80240FD8 2442FFFF */ addiu $v0, $v0, -1 -/* 889BAC 80240FDC 00021080 */ sll $v0, $v0, 2 -/* 889BB0 80240FE0 02621021 */ addu $v0, $s3, $v0 -/* 889BB4 80240FE4 AEA30084 */ sw $v1, 0x84($s5) -/* 889BB8 80240FE8 8C420108 */ lw $v0, 0x108($v0) -/* 889BBC 80240FEC 080903FF */ j .L80240FFC -/* 889BC0 80240FF0 AEA20088 */ sw $v0, 0x88($s5) -.L80240FF4: -/* 889BC4 80240FF4 2402FFFF */ addiu $v0, $zero, -1 -/* 889BC8 80240FF8 AEA20084 */ sw $v0, 0x84($s5) -.L80240FFC: -/* 889BCC 80240FFC 0C00AB4B */ jal heap_free -/* 889BD0 80241000 8EA40078 */ lw $a0, 0x78($s5) -/* 889BD4 80241004 24020002 */ addiu $v0, $zero, 2 -.L80241008: -/* 889BD8 80241008 8FBF003C */ lw $ra, 0x3c($sp) -/* 889BDC 8024100C 8FBE0038 */ lw $fp, 0x38($sp) -/* 889BE0 80241010 8FB70034 */ lw $s7, 0x34($sp) -/* 889BE4 80241014 8FB60030 */ lw $s6, 0x30($sp) -/* 889BE8 80241018 8FB5002C */ lw $s5, 0x2c($sp) -/* 889BEC 8024101C 8FB40028 */ lw $s4, 0x28($sp) -/* 889BF0 80241020 8FB30024 */ lw $s3, 0x24($sp) -/* 889BF4 80241024 8FB20020 */ lw $s2, 0x20($sp) -/* 889BF8 80241028 8FB1001C */ lw $s1, 0x1c($sp) -/* 889BFC 8024102C 8FB00018 */ lw $s0, 0x18($sp) -/* 889C00 80241030 03E00008 */ jr $ra -/* 889C04 80241034 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_tik/tik_14/func_80240020_88D600.s b/asm/nonmatchings/world/area_tik/tik_14/func_80240020_88D600.s deleted file mode 100644 index 262e243015..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_14/func_80240020_88D600.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_88D620 -/* 88D620 80240020 3C028016 */ lui $v0, 0x8016 -/* 88D624 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 88D628 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 88D62C 8024002C 03E00008 */ jr $ra -/* 88D630 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_14/func_80240034_88D600.s b/asm/nonmatchings/world/area_tik/tik_14/func_80240034_88D600.s deleted file mode 100644 index 0f7363e25e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_14/func_80240034_88D600.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_88D634 -/* 88D634 80240034 3C038016 */ lui $v1, 0x8016 -/* 88D638 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* 88D63C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88D640 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 88D644 80240044 0080802D */ daddu $s0, $a0, $zero -/* 88D648 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* 88D64C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 88D650 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* 88D654 80240054 24020002 */ addiu $v0, $zero, 2 -/* 88D658 80240058 08090038 */ j .L802400E0 -/* 88D65C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* 88D660 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 88D664 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 88D668 80240068 80620040 */ lb $v0, 0x40($v1) -/* 88D66C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* 88D670 80240070 04420001 */ bltzl $v0, .L80240078 -/* 88D674 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* 88D678 80240078 14400003 */ bnez $v0, .L80240088 -/* 88D67C 8024007C 00000000 */ nop -/* 88D680 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* 88D684 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* 88D688 80240088 44822000 */ mtc1 $v0, $f4 -/* 88D68C 8024008C 00000000 */ nop -/* 88D690 80240090 46802120 */ cvt.s.w $f4, $f4 -/* 88D694 80240094 44062000 */ mfc1 $a2, $f4 -/* 88D698 80240098 44872000 */ mtc1 $a3, $f4 -/* 88D69C 8024009C 00000000 */ nop -/* 88D6A0 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* 88D6A4 802400A4 44806000 */ mtc1 $zero, $f12 -/* 88D6A8 802400A8 44072000 */ mfc1 $a3, $f4 -/* 88D6AC 802400AC 0C00A720 */ jal atan2 -/* 88D6B0 802400B0 46006386 */ mov.s $f14, $f12 -/* 88D6B4 802400B4 3C014270 */ lui $at, 0x4270 -/* 88D6B8 802400B8 44811000 */ mtc1 $at, $f2 -/* 88D6BC 802400BC 00000000 */ nop -/* 88D6C0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 88D6C4 802400C4 00000000 */ nop -/* 88D6C8 802400C8 45000004 */ bc1f .L802400DC -/* 88D6CC 802400CC 24020001 */ addiu $v0, $zero, 1 -/* 88D6D0 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* 88D6D4 802400D4 08090038 */ j .L802400E0 -/* 88D6D8 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* 88D6DC 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* 88D6E0 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 88D6E4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 88D6E8 802400E8 03E00008 */ jr $ra -/* 88D6EC 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_14/func_802400F0_88D600.s b/asm/nonmatchings/world/area_tik/tik_14/func_802400F0_88D600.s deleted file mode 100644 index f50d0544a3..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_14/func_802400F0_88D600.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_88D6F0 -/* 88D6F0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88D6F4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 88D6F8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 88D6FC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 88D700 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 88D704 80240104 0C016AFA */ jal get_current_map_header -/* 88D708 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 88D70C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 88D710 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 88D714 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 88D718 80240118 0C0B1EAF */ jal get_variable -/* 88D71C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 88D720 80240120 0220202D */ daddu $a0, $s1, $zero -/* 88D724 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 88D728 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 88D72C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 88D730 80240130 02031821 */ addu $v1, $s0, $v1 -/* 88D734 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 88D738 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 88D73C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 88D740 80240140 0C0B2026 */ jal set_variable -/* 88D744 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 88D748 80240148 0220202D */ daddu $a0, $s1, $zero -/* 88D74C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 88D750 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 88D754 80240154 02021021 */ addu $v0, $s0, $v0 -/* 88D758 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 88D75C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 88D760 80240160 44061000 */ mfc1 $a2, $f2 -/* 88D764 80240164 0C0B2026 */ jal set_variable -/* 88D768 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 88D76C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 88D770 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 88D774 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 88D778 80240178 02021021 */ addu $v0, $s0, $v0 -/* 88D77C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 88D780 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 88D784 80240184 44061000 */ mfc1 $a2, $f2 -/* 88D788 80240188 0C0B2026 */ jal set_variable -/* 88D78C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 88D790 80240190 0220202D */ daddu $a0, $s1, $zero -/* 88D794 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 88D798 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 88D79C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 88D7A0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 88D7A4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 88D7A8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 88D7AC 802401AC 0C0B2026 */ jal set_variable -/* 88D7B0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 88D7B4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 88D7B8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 88D7BC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 88D7C0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 88D7C4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 88D7C8 802401C8 03E00008 */ jr $ra -/* 88D7CC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_14/func_802401D0_88D600.s b/asm/nonmatchings/world/area_tik/tik_14/func_802401D0_88D600.s deleted file mode 100644 index e004e61b3a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_14/func_802401D0_88D600.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_88D7D0 -/* 88D7D0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 88D7D4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 88D7D8 802401D8 3C014334 */ lui $at, 0x4334 -/* 88D7DC 802401DC 44816000 */ mtc1 $at, $f12 -/* 88D7E0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88D7E4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 88D7E8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 88D7EC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 88D7F0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 88D7F4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 88D7F8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 88D7FC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 88D800 80240200 00431021 */ addu $v0, $v0, $v1 -/* 88D804 80240204 000210C0 */ sll $v0, $v0, 3 -/* 88D808 80240208 3C01800B */ lui $at, 0x800b -/* 88D80C 8024020C 00220821 */ addu $at, $at, $v0 -/* 88D810 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 88D814 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 88D818 80240218 0C00A6C9 */ jal clamp_angle -/* 88D81C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 88D820 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 88D824 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 88D828 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 88D82C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 88D830 80240230 24020002 */ addiu $v0, $zero, 2 -/* 88D834 80240234 03E00008 */ jr $ra -/* 88D838 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_14/func_8024023C_88D600.s b/asm/nonmatchings/world/area_tik/tik_14/func_8024023C_88D600.s deleted file mode 100644 index 9a9c13e360..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_14/func_8024023C_88D600.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_88D83C -/* 88D83C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 88D840 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 88D844 80240244 0080802D */ daddu $s0, $a0, $zero -/* 88D848 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 88D84C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 88D850 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 88D854 80240254 0C0B210B */ jal get_float_variable -/* 88D858 80240258 8C450000 */ lw $a1, ($v0) -/* 88D85C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 88D860 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 88D864 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 88D868 80240268 44060000 */ mfc1 $a2, $f0 -/* 88D86C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 88D870 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 88D874 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 88D878 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 88D87C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 88D880 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 88D884 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 88D888 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 88D88C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 88D890 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 88D894 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 88D898 80240298 0C0B2190 */ jal set_float_variable -/* 88D89C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 88D8A0 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 88D8A4 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 88D8A8 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 88D8AC 802402AC 0C0B2190 */ jal set_float_variable -/* 88D8B0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 88D8B4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 88D8B8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 88D8BC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 88D8C0 802402C0 0C0B2190 */ jal set_float_variable -/* 88D8C4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 88D8C8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 88D8CC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 88D8D0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 88D8D4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 88D8D8 802402D8 03E00008 */ jr $ra -/* 88D8DC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_14/func_802402E0_88D600.s b/asm/nonmatchings/world/area_tik/tik_14/func_802402E0_88D600.s deleted file mode 100644 index 4340ad16ab..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_14/func_802402E0_88D600.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_88D8E0 -/* 88D8E0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88D8E4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 88D8E8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 88D8EC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 88D8F0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 88D8F4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 88D8F8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 88D8FC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 88D900 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 88D904 80240304 3C020002 */ lui $v0, 2 -/* 88D908 80240308 080900C8 */ j .L80240320 -/* 88D90C 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 88D910 80240310 3C040002 */ lui $a0, 2 -/* 88D914 80240314 0083102A */ slt $v0, $a0, $v1 -/* 88D918 80240318 10400002 */ beqz $v0, .L80240324 -/* 88D91C 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 88D920 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 88D924 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 88D928 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 88D92C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 88D930 80240330 04610004 */ bgez $v1, .L80240344 -/* 88D934 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 88D938 80240338 3C020002 */ lui $v0, 2 -/* 88D93C 8024033C 080900D5 */ j .L80240354 -/* 88D940 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 88D944 80240344 3C040002 */ lui $a0, 2 -/* 88D948 80240348 0083102A */ slt $v0, $a0, $v1 -/* 88D94C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 88D950 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 88D954 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 88D958 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 88D95C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 88D960 80240360 00621821 */ addu $v1, $v1, $v0 -/* 88D964 80240364 04610004 */ bgez $v1, .L80240378 -/* 88D968 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 88D96C 8024036C 3C020002 */ lui $v0, 2 -/* 88D970 80240370 080900E2 */ j .L80240388 -/* 88D974 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 88D978 80240378 3C040002 */ lui $a0, 2 -/* 88D97C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 88D980 80240380 10400002 */ beqz $v0, .L8024038C -/* 88D984 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 88D988 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 88D98C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 88D990 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 88D994 80240394 00621821 */ addu $v1, $v1, $v0 -/* 88D998 80240398 04610004 */ bgez $v1, .L802403AC -/* 88D99C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 88D9A0 802403A0 3C020002 */ lui $v0, 2 -/* 88D9A4 802403A4 080900EF */ j .L802403BC -/* 88D9A8 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 88D9AC 802403AC 3C040002 */ lui $a0, 2 -/* 88D9B0 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 88D9B4 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 88D9B8 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 88D9BC 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 88D9C0 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 88D9C4 802403C4 0C046F07 */ jal set_main_pan_u -/* 88D9C8 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 88D9CC 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 88D9D0 802403D0 0C046F0D */ jal set_main_pan_v -/* 88D9D4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 88D9D8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 88D9DC 802403DC 0C046F13 */ jal set_aux_pan_u -/* 88D9E0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 88D9E4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 88D9E8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 88D9EC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 88D9F0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 88D9F4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 88D9F8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 88D9FC 802403FC 03E00008 */ jr $ra -/* 88DA00 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_14/func_80240404_88D600.s b/asm/nonmatchings/world/area_tik/tik_14/func_80240404_88D600.s deleted file mode 100644 index a7776892c9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_14/func_80240404_88D600.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_88DA04 -/* 88DA04 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88DA08 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 88DA0C 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 88DA10 80240410 10A00005 */ beqz $a1, .L80240428 -/* 88DA14 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 88DA18 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 88DA1C 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 88DA20 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 88DA24 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 88DA28 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 88DA2C 8024042C 1440000E */ bnez $v0, .L80240468 -/* 88DA30 80240430 00000000 */ nop -/* 88DA34 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 88DA38 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 88DA3C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 88DA40 80240440 04610004 */ bgez $v1, .L80240454 -/* 88DA44 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 88DA48 80240448 3C020002 */ lui $v0, 2 -/* 88DA4C 8024044C 08090119 */ j .L80240464 -/* 88DA50 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 88DA54 80240454 3C040002 */ lui $a0, 2 -/* 88DA58 80240458 0083102A */ slt $v0, $a0, $v1 -/* 88DA5C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 88DA60 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 88DA64 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 88DA68 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 88DA6C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 88DA70 80240470 00000000 */ nop -/* 88DA74 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 88DA78 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 88DA7C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 88DA80 80240480 04610004 */ bgez $v1, .L80240494 -/* 88DA84 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 88DA88 80240488 3C020002 */ lui $v0, 2 -/* 88DA8C 8024048C 08090129 */ j .L802404A4 -/* 88DA90 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 88DA94 80240494 3C040002 */ lui $a0, 2 -/* 88DA98 80240498 0083102A */ slt $v0, $a0, $v1 -/* 88DA9C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 88DAA0 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 88DAA4 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 88DAA8 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 88DAAC 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 88DAB0 802404B0 00000000 */ nop -/* 88DAB4 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 88DAB8 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 88DABC 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 88DAC0 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 88DAC4 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 88DAC8 802404C8 3C020002 */ lui $v0, 2 -/* 88DACC 802404CC 08090139 */ j .L802404E4 -/* 88DAD0 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 88DAD4 802404D4 3C040002 */ lui $a0, 2 -/* 88DAD8 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 88DADC 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 88DAE0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 88DAE4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 88DAE8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 88DAEC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 88DAF0 802404F0 00000000 */ nop -/* 88DAF4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 88DAF8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 88DAFC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 88DB00 80240500 04610004 */ bgez $v1, .L80240514 -/* 88DB04 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 88DB08 80240508 3C020002 */ lui $v0, 2 -/* 88DB0C 8024050C 08090149 */ j .L80240524 -/* 88DB10 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 88DB14 80240514 3C040002 */ lui $a0, 2 -/* 88DB18 80240518 0083102A */ slt $v0, $a0, $v1 -/* 88DB1C 8024051C 10400002 */ beqz $v0, .L80240528 -/* 88DB20 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 88DB24 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 88DB28 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 88DB2C 8024052C 0C046F07 */ jal set_main_pan_u -/* 88DB30 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 88DB34 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 88DB38 80240538 0C046F0D */ jal set_main_pan_v -/* 88DB3C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 88DB40 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 88DB44 80240544 0C046F13 */ jal set_aux_pan_u -/* 88DB48 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 88DB4C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 88DB50 80240550 0C046F19 */ jal set_aux_pan_v -/* 88DB54 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 88DB58 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 88DB5C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 88DB60 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 88DB64 80240564 24420001 */ addiu $v0, $v0, 1 -/* 88DB68 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 88DB6C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 88DB70 80240570 24630001 */ addiu $v1, $v1, 1 -/* 88DB74 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 88DB78 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 88DB7C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 88DB80 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 88DB84 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 88DB88 80240588 0064182A */ slt $v1, $v1, $a0 -/* 88DB8C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 88DB90 80240590 14600002 */ bnez $v1, .L8024059C -/* 88DB94 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 88DB98 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 88DB9C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 88DBA0 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 88DBA4 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 88DBA8 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 88DBAC 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 88DBB0 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 88DBB4 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 88DBB8 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 88DBBC 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 88DBC0 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 88DBC4 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 88DBC8 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 88DBCC 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 88DBD0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 88DBD4 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 88DBD8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 88DBDC 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 88DBE0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 88DBE4 802405E4 03E00008 */ jr $ra -/* 88DBE8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 88DBEC 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_14/func_802405F0_88D600.s b/asm/nonmatchings/world/area_tik/tik_14/func_802405F0_88D600.s deleted file mode 100644 index f86baccfc8..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_14/func_802405F0_88D600.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_88DBF0 -/* 88DBF0 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 88DBF4 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 88DBF8 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 88DBFC 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 88DC00 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 88DC04 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 88DC08 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 88DC0C 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 88DC10 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 88DC14 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 88DC18 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 88DC1C 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 88DC20 80240620 0C0B1EAF */ jal get_variable -/* 88DC24 80240624 8C450000 */ lw $a1, ($v0) -/* 88DC28 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 88DC2C 8024062C 0C00EABB */ jal get_npc_unsafe -/* 88DC30 80240630 0040802D */ daddu $s0, $v0, $zero -/* 88DC34 80240634 0200202D */ daddu $a0, $s0, $zero -/* 88DC38 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 88DC3C 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 88DC40 80240640 0C046B4C */ jal get_model_from_list_index -/* 88DC44 80240644 0040202D */ daddu $a0, $v0, $zero -/* 88DC48 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 88DC4C 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 88DC50 80240650 0040902D */ daddu $s2, $v0, $zero -/* 88DC54 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 88DC58 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 88DC5C 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 88DC60 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 88DC64 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 88DC68 80240668 00000000 */ nop -/* 88DC6C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 88DC70 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 88DC74 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 88DC78 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 88DC7C 8024067C 00000000 */ nop -/* 88DC80 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 88DC84 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 88DC88 80240688 44820000 */ mtc1 $v0, $f0 -/* 88DC8C 8024068C 00000000 */ nop -/* 88DC90 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 88DC94 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 88DC98 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 88DC9C 8024069C 44810000 */ mtc1 $at, $f0 -/* 88DCA0 802406A0 00000000 */ nop -/* 88DCA4 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 88DCA8 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 88DCAC 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 88DCB0 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 88DCB4 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 88DCB8 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 88DCBC 802406BC 00000000 */ nop -/* 88DCC0 802406C0 45010004 */ bc1t .L802406D4 -/* 88DCC4 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 88DCC8 802406C8 0C0187BC */ jal sqrtf -/* 88DCCC 802406CC 00000000 */ nop -/* 88DCD0 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 88DCD4 802406D4 44800000 */ mtc1 $zero, $f0 -/* 88DCD8 802406D8 00000000 */ nop -/* 88DCDC 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 88DCE0 802406E0 00000000 */ nop -/* 88DCE4 802406E4 45000016 */ bc1f .L80240740 -/* 88DCE8 802406E8 46001106 */ mov.s $f4, $f2 -/* 88DCEC 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 88DCF0 802406F0 44820000 */ mtc1 $v0, $f0 -/* 88DCF4 802406F4 00000000 */ nop -/* 88DCF8 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 88DCFC 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 88DD00 80240700 00000000 */ nop -/* 88DD04 80240704 4500000E */ bc1f .L80240740 -/* 88DD08 80240708 00000000 */ nop -/* 88DD0C 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 88DD10 80240710 3C013F00 */ lui $at, 0x3f00 -/* 88DD14 80240714 44811000 */ mtc1 $at, $f2 -/* 88DD18 80240718 44820000 */ mtc1 $v0, $f0 -/* 88DD1C 8024071C 00000000 */ nop -/* 88DD20 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 88DD24 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 88DD28 80240728 00000000 */ nop -/* 88DD2C 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 88DD30 80240730 00000000 */ nop -/* 88DD34 80240734 45000002 */ bc1f .L80240740 -/* 88DD38 80240738 24020001 */ addiu $v0, $zero, 1 -/* 88DD3C 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 88DD40 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 88DD44 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 88DD48 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 88DD4C 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 88DD50 80240750 00000000 */ nop -/* 88DD54 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 88DD58 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 88DD5C 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 88DD60 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 88DD64 80240764 00000000 */ nop -/* 88DD68 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 88DD6C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 88DD70 80240770 44820000 */ mtc1 $v0, $f0 -/* 88DD74 80240774 00000000 */ nop -/* 88DD78 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 88DD7C 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 88DD80 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 88DD84 80240784 44810000 */ mtc1 $at, $f0 -/* 88DD88 80240788 00000000 */ nop -/* 88DD8C 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 88DD90 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 88DD94 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 88DD98 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 88DD9C 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 88DDA0 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 88DDA4 802407A4 00000000 */ nop -/* 88DDA8 802407A8 45010004 */ bc1t .L802407BC -/* 88DDAC 802407AC 00000000 */ nop -/* 88DDB0 802407B0 0C0187BC */ jal sqrtf -/* 88DDB4 802407B4 00000000 */ nop -/* 88DDB8 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 88DDBC 802407BC 44800000 */ mtc1 $zero, $f0 -/* 88DDC0 802407C0 00000000 */ nop -/* 88DDC4 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 88DDC8 802407C8 00000000 */ nop -/* 88DDCC 802407CC 45000016 */ bc1f .L80240828 -/* 88DDD0 802407D0 46001106 */ mov.s $f4, $f2 -/* 88DDD4 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 88DDD8 802407D8 44820000 */ mtc1 $v0, $f0 -/* 88DDDC 802407DC 00000000 */ nop -/* 88DDE0 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 88DDE4 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 88DDE8 802407E8 00000000 */ nop -/* 88DDEC 802407EC 4500000F */ bc1f .L8024082C -/* 88DDF0 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 88DDF4 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 88DDF8 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 88DDFC 802407FC 44811000 */ mtc1 $at, $f2 -/* 88DE00 80240800 44820000 */ mtc1 $v0, $f0 -/* 88DE04 80240804 00000000 */ nop -/* 88DE08 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 88DE0C 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 88DE10 80240810 00000000 */ nop -/* 88DE14 80240814 4600203C */ c.lt.s $f4, $f0 -/* 88DE18 80240818 00000000 */ nop -/* 88DE1C 8024081C 45000003 */ bc1f .L8024082C -/* 88DE20 80240820 24020001 */ addiu $v0, $zero, 1 -/* 88DE24 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 88DE28 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 88DE2C 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 88DE30 80240830 4481D000 */ mtc1 $at, $f26 -/* 88DE34 80240834 4480C000 */ mtc1 $zero, $f24 -/* 88DE38 80240838 3C013F00 */ lui $at, 0x3f00 -/* 88DE3C 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 88DE40 80240840 0C00EAD2 */ jal get_npc_safe -/* 88DE44 80240844 0220202D */ daddu $a0, $s1, $zero -/* 88DE48 80240848 0040802D */ daddu $s0, $v0, $zero -/* 88DE4C 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 88DE50 80240850 26310001 */ addiu $s1, $s1, 1 -/* 88DE54 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 88DE58 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 88DE5C 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 88DE60 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 88DE64 80240864 00000000 */ nop -/* 88DE68 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 88DE6C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 88DE70 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 88DE74 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 88DE78 80240878 00000000 */ nop -/* 88DE7C 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 88DE80 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 88DE84 80240884 44820000 */ mtc1 $v0, $f0 -/* 88DE88 80240888 00000000 */ nop -/* 88DE8C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 88DE90 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 88DE94 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 88DE98 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 88DE9C 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 88DEA0 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 88DEA4 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 88DEA8 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 88DEAC 802408AC 00000000 */ nop -/* 88DEB0 802408B0 45010003 */ bc1t .L802408C0 -/* 88DEB4 802408B4 00000000 */ nop -/* 88DEB8 802408B8 0C0187BC */ jal sqrtf -/* 88DEBC 802408BC 00000000 */ nop -.L802408C0: -/* 88DEC0 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 88DEC4 802408C4 00000000 */ nop -/* 88DEC8 802408C8 45000015 */ bc1f .L80240920 -/* 88DECC 802408CC 46000106 */ mov.s $f4, $f0 -/* 88DED0 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 88DED4 802408D4 44820000 */ mtc1 $v0, $f0 -/* 88DED8 802408D8 00000000 */ nop -/* 88DEDC 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 88DEE0 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 88DEE4 802408E4 00000000 */ nop -/* 88DEE8 802408E8 4500000E */ bc1f .L80240924 -/* 88DEEC 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 88DEF0 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 88DEF4 802408F4 44820000 */ mtc1 $v0, $f0 -/* 88DEF8 802408F8 00000000 */ nop -/* 88DEFC 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 88DF00 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 88DF04 80240904 00000000 */ nop -/* 88DF08 80240908 4600203C */ c.lt.s $f4, $f0 -/* 88DF0C 8024090C 00000000 */ nop -/* 88DF10 80240910 45000004 */ bc1f .L80240924 -/* 88DF14 80240914 24020001 */ addiu $v0, $zero, 1 -/* 88DF18 80240918 0809024C */ j .L80240930 -/* 88DF1C 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 88DF20 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 88DF24 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 88DF28 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 88DF2C 8024092C 00000000 */ nop -.L80240930: -/* 88DF30 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 88DF34 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 88DF38 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 88DF3C 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 88DF40 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 88DF44 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 88DF48 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 88DF4C 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 88DF50 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 88DF54 80240954 24020002 */ addiu $v0, $zero, 2 -/* 88DF58 80240958 03E00008 */ jr $ra -/* 88DF5C 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_15/func_80240020_88FBA0.s b/asm/nonmatchings/world/area_tik/tik_15/func_80240020_88FBA0.s deleted file mode 100644 index 03103c506c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/func_80240020_88FBA0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_88FBC0 -/* 88FBC0 80240020 3C028016 */ lui $v0, 0x8016 -/* 88FBC4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 88FBC8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 88FBCC 8024002C 03E00008 */ jr $ra -/* 88FBD0 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_15/func_80240034_88FBA0.s b/asm/nonmatchings/world/area_tik/tik_15/func_80240034_88FBA0.s deleted file mode 100644 index bec163c0ce..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/func_80240034_88FBA0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_88FBD4 -/* 88FBD4 80240034 3C038016 */ lui $v1, 0x8016 -/* 88FBD8 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* 88FBDC 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88FBE0 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 88FBE4 80240044 0080802D */ daddu $s0, $a0, $zero -/* 88FBE8 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* 88FBEC 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 88FBF0 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* 88FBF4 80240054 24020002 */ addiu $v0, $zero, 2 -/* 88FBF8 80240058 08090038 */ j .L802400E0 -/* 88FBFC 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* 88FC00 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 88FC04 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 88FC08 80240068 80620040 */ lb $v0, 0x40($v1) -/* 88FC0C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* 88FC10 80240070 04420001 */ bltzl $v0, .L80240078 -/* 88FC14 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* 88FC18 80240078 14400003 */ bnez $v0, .L80240088 -/* 88FC1C 8024007C 00000000 */ nop -/* 88FC20 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* 88FC24 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* 88FC28 80240088 44822000 */ mtc1 $v0, $f4 -/* 88FC2C 8024008C 00000000 */ nop -/* 88FC30 80240090 46802120 */ cvt.s.w $f4, $f4 -/* 88FC34 80240094 44062000 */ mfc1 $a2, $f4 -/* 88FC38 80240098 44872000 */ mtc1 $a3, $f4 -/* 88FC3C 8024009C 00000000 */ nop -/* 88FC40 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* 88FC44 802400A4 44806000 */ mtc1 $zero, $f12 -/* 88FC48 802400A8 44072000 */ mfc1 $a3, $f4 -/* 88FC4C 802400AC 0C00A720 */ jal atan2 -/* 88FC50 802400B0 46006386 */ mov.s $f14, $f12 -/* 88FC54 802400B4 3C014270 */ lui $at, 0x4270 -/* 88FC58 802400B8 44811000 */ mtc1 $at, $f2 -/* 88FC5C 802400BC 00000000 */ nop -/* 88FC60 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 88FC64 802400C4 00000000 */ nop -/* 88FC68 802400C8 45000004 */ bc1f .L802400DC -/* 88FC6C 802400CC 24020001 */ addiu $v0, $zero, 1 -/* 88FC70 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* 88FC74 802400D4 08090038 */ j .L802400E0 -/* 88FC78 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* 88FC7C 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* 88FC80 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 88FC84 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 88FC88 802400E8 03E00008 */ jr $ra -/* 88FC8C 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_15/func_802400F0_88FBA0.s b/asm/nonmatchings/world/area_tik/tik_15/func_802400F0_88FBA0.s deleted file mode 100644 index 3aeced87b8..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/func_802400F0_88FBA0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_88FC90 -/* 88FC90 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88FC94 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 88FC98 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 88FC9C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 88FCA0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 88FCA4 80240104 0C016AFA */ jal get_current_map_header -/* 88FCA8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 88FCAC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 88FCB0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 88FCB4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 88FCB8 80240118 0C0B1EAF */ jal get_variable -/* 88FCBC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 88FCC0 80240120 0220202D */ daddu $a0, $s1, $zero -/* 88FCC4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 88FCC8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 88FCCC 8024012C 00028100 */ sll $s0, $v0, 4 -/* 88FCD0 80240130 02031821 */ addu $v1, $s0, $v1 -/* 88FCD4 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 88FCD8 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 88FCDC 8024013C 44061000 */ mfc1 $a2, $f2 -/* 88FCE0 80240140 0C0B2026 */ jal set_variable -/* 88FCE4 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 88FCE8 80240148 0220202D */ daddu $a0, $s1, $zero -/* 88FCEC 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 88FCF0 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 88FCF4 80240154 02021021 */ addu $v0, $s0, $v0 -/* 88FCF8 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 88FCFC 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 88FD00 80240160 44061000 */ mfc1 $a2, $f2 -/* 88FD04 80240164 0C0B2026 */ jal set_variable -/* 88FD08 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 88FD0C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 88FD10 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 88FD14 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 88FD18 80240178 02021021 */ addu $v0, $s0, $v0 -/* 88FD1C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 88FD20 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 88FD24 80240184 44061000 */ mfc1 $a2, $f2 -/* 88FD28 80240188 0C0B2026 */ jal set_variable -/* 88FD2C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 88FD30 80240190 0220202D */ daddu $a0, $s1, $zero -/* 88FD34 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 88FD38 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 88FD3C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 88FD40 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 88FD44 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 88FD48 802401A8 44061000 */ mfc1 $a2, $f2 -/* 88FD4C 802401AC 0C0B2026 */ jal set_variable -/* 88FD50 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 88FD54 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 88FD58 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 88FD5C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 88FD60 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 88FD64 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 88FD68 802401C8 03E00008 */ jr $ra -/* 88FD6C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_15/func_802401D0_88FBA0.s b/asm/nonmatchings/world/area_tik/tik_15/func_802401D0_88FBA0.s deleted file mode 100644 index af3eb9a58e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/func_802401D0_88FBA0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_88FD70 -/* 88FD70 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 88FD74 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 88FD78 802401D8 3C014334 */ lui $at, 0x4334 -/* 88FD7C 802401DC 44816000 */ mtc1 $at, $f12 -/* 88FD80 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88FD84 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 88FD88 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 88FD8C 802401EC 00031080 */ sll $v0, $v1, 2 -/* 88FD90 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 88FD94 802401F4 00021080 */ sll $v0, $v0, 2 -/* 88FD98 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 88FD9C 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 88FDA0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 88FDA4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 88FDA8 80240208 3C01800B */ lui $at, 0x800b -/* 88FDAC 8024020C 00220821 */ addu $at, $at, $v0 -/* 88FDB0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 88FDB4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 88FDB8 80240218 0C00A6C9 */ jal clamp_angle -/* 88FDBC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 88FDC0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 88FDC4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 88FDC8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 88FDCC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 88FDD0 80240230 24020002 */ addiu $v0, $zero, 2 -/* 88FDD4 80240234 03E00008 */ jr $ra -/* 88FDD8 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_15/func_8024023C_88FBA0.s b/asm/nonmatchings/world/area_tik/tik_15/func_8024023C_88FBA0.s deleted file mode 100644 index cd12d76e46..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/func_8024023C_88FBA0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_88FDDC -/* 88FDDC 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 88FDE0 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 88FDE4 80240244 0080802D */ daddu $s0, $a0, $zero -/* 88FDE8 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 88FDEC 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 88FDF0 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 88FDF4 80240254 0C0B210B */ jal get_float_variable -/* 88FDF8 80240258 8C450000 */ lw $a1, ($v0) -/* 88FDFC 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 88FE00 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 88FE04 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 88FE08 80240268 44060000 */ mfc1 $a2, $f0 -/* 88FE0C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 88FE10 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 88FE14 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 88FE18 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 88FE1C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 88FE20 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 88FE24 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 88FE28 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 88FE2C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 88FE30 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 88FE34 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 88FE38 80240298 0C0B2190 */ jal set_float_variable -/* 88FE3C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 88FE40 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 88FE44 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 88FE48 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 88FE4C 802402AC 0C0B2190 */ jal set_float_variable -/* 88FE50 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 88FE54 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 88FE58 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 88FE5C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 88FE60 802402C0 0C0B2190 */ jal set_float_variable -/* 88FE64 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 88FE68 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 88FE6C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 88FE70 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 88FE74 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 88FE78 802402D8 03E00008 */ jr $ra -/* 88FE7C 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_15/func_802402E0_88FBA0.s b/asm/nonmatchings/world/area_tik/tik_15/func_802402E0_88FBA0.s deleted file mode 100644 index 79d09ce412..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/func_802402E0_88FBA0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_88FE80 -/* 88FE80 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88FE84 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 88FE88 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 88FE8C 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 88FE90 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 88FE94 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 88FE98 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 88FE9C 802402FC 04610004 */ bgez $v1, .L80240310 -/* 88FEA0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 88FEA4 80240304 3C020002 */ lui $v0, 2 -/* 88FEA8 80240308 080900C8 */ j .L80240320 -/* 88FEAC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 88FEB0 80240310 3C040002 */ lui $a0, 2 -/* 88FEB4 80240314 0083102A */ slt $v0, $a0, $v1 -/* 88FEB8 80240318 10400002 */ beqz $v0, .L80240324 -/* 88FEBC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 88FEC0 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 88FEC4 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 88FEC8 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 88FECC 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 88FED0 80240330 04610004 */ bgez $v1, .L80240344 -/* 88FED4 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 88FED8 80240338 3C020002 */ lui $v0, 2 -/* 88FEDC 8024033C 080900D5 */ j .L80240354 -/* 88FEE0 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 88FEE4 80240344 3C040002 */ lui $a0, 2 -/* 88FEE8 80240348 0083102A */ slt $v0, $a0, $v1 -/* 88FEEC 8024034C 10400002 */ beqz $v0, .L80240358 -/* 88FEF0 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 88FEF4 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 88FEF8 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 88FEFC 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 88FF00 80240360 00621821 */ addu $v1, $v1, $v0 -/* 88FF04 80240364 04610004 */ bgez $v1, .L80240378 -/* 88FF08 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 88FF0C 8024036C 3C020002 */ lui $v0, 2 -/* 88FF10 80240370 080900E2 */ j .L80240388 -/* 88FF14 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 88FF18 80240378 3C040002 */ lui $a0, 2 -/* 88FF1C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 88FF20 80240380 10400002 */ beqz $v0, .L8024038C -/* 88FF24 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 88FF28 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 88FF2C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 88FF30 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 88FF34 80240394 00621821 */ addu $v1, $v1, $v0 -/* 88FF38 80240398 04610004 */ bgez $v1, .L802403AC -/* 88FF3C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 88FF40 802403A0 3C020002 */ lui $v0, 2 -/* 88FF44 802403A4 080900EF */ j .L802403BC -/* 88FF48 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 88FF4C 802403AC 3C040002 */ lui $a0, 2 -/* 88FF50 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 88FF54 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 88FF58 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 88FF5C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 88FF60 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 88FF64 802403C4 0C046F07 */ jal set_main_pan_u -/* 88FF68 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 88FF6C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 88FF70 802403D0 0C046F0D */ jal set_main_pan_v -/* 88FF74 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 88FF78 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 88FF7C 802403DC 0C046F13 */ jal set_aux_pan_u -/* 88FF80 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 88FF84 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 88FF88 802403E8 0C046F19 */ jal set_aux_pan_v -/* 88FF8C 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 88FF90 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 88FF94 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 88FF98 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 88FF9C 802403FC 03E00008 */ jr $ra -/* 88FFA0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_15/func_80240404_88FBA0.s b/asm/nonmatchings/world/area_tik/tik_15/func_80240404_88FBA0.s deleted file mode 100644 index 03c86f2a8a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/func_80240404_88FBA0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_88FFA4 -/* 88FFA4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88FFA8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 88FFAC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 88FFB0 80240410 10A00005 */ beqz $a1, .L80240428 -/* 88FFB4 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 88FFB8 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 88FFBC 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 88FFC0 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 88FFC4 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 88FFC8 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 88FFCC 8024042C 1440000E */ bnez $v0, .L80240468 -/* 88FFD0 80240430 00000000 */ nop -/* 88FFD4 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 88FFD8 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 88FFDC 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 88FFE0 80240440 04610004 */ bgez $v1, .L80240454 -/* 88FFE4 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 88FFE8 80240448 3C020002 */ lui $v0, 2 -/* 88FFEC 8024044C 08090119 */ j .L80240464 -/* 88FFF0 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 88FFF4 80240454 3C040002 */ lui $a0, 2 -/* 88FFF8 80240458 0083102A */ slt $v0, $a0, $v1 -/* 88FFFC 8024045C 10400002 */ beqz $v0, .L80240468 -/* 890000 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 890004 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 890008 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 89000C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 890010 80240470 00000000 */ nop -/* 890014 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 890018 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 89001C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 890020 80240480 04610004 */ bgez $v1, .L80240494 -/* 890024 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 890028 80240488 3C020002 */ lui $v0, 2 -/* 89002C 8024048C 08090129 */ j .L802404A4 -/* 890030 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 890034 80240494 3C040002 */ lui $a0, 2 -/* 890038 80240498 0083102A */ slt $v0, $a0, $v1 -/* 89003C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 890040 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 890044 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 890048 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 89004C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 890050 802404B0 00000000 */ nop -/* 890054 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 890058 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 89005C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 890060 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 890064 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 890068 802404C8 3C020002 */ lui $v0, 2 -/* 89006C 802404CC 08090139 */ j .L802404E4 -/* 890070 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 890074 802404D4 3C040002 */ lui $a0, 2 -/* 890078 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 89007C 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 890080 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 890084 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 890088 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 89008C 802404EC 1440000E */ bnez $v0, .L80240528 -/* 890090 802404F0 00000000 */ nop -/* 890094 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 890098 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 89009C 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 8900A0 80240500 04610004 */ bgez $v1, .L80240514 -/* 8900A4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8900A8 80240508 3C020002 */ lui $v0, 2 -/* 8900AC 8024050C 08090149 */ j .L80240524 -/* 8900B0 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 8900B4 80240514 3C040002 */ lui $a0, 2 -/* 8900B8 80240518 0083102A */ slt $v0, $a0, $v1 -/* 8900BC 8024051C 10400002 */ beqz $v0, .L80240528 -/* 8900C0 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 8900C4 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 8900C8 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 8900CC 8024052C 0C046F07 */ jal set_main_pan_u -/* 8900D0 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8900D4 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 8900D8 80240538 0C046F0D */ jal set_main_pan_v -/* 8900DC 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 8900E0 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 8900E4 80240544 0C046F13 */ jal set_aux_pan_u -/* 8900E8 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8900EC 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 8900F0 80240550 0C046F19 */ jal set_aux_pan_v -/* 8900F4 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8900F8 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 8900FC 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 890100 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 890104 80240564 24420001 */ addiu $v0, $v0, 1 -/* 890108 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 89010C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 890110 80240570 24630001 */ addiu $v1, $v1, 1 -/* 890114 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 890118 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 89011C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 890120 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 890124 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 890128 80240588 0064182A */ slt $v1, $v1, $a0 -/* 89012C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 890130 80240590 14600002 */ bnez $v1, .L8024059C -/* 890134 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 890138 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 89013C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 890140 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 890144 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 890148 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 89014C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 890150 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 890154 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 890158 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 89015C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 890160 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 890164 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 890168 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 89016C 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 890170 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 890174 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 890178 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 89017C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 890180 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 890184 802405E4 03E00008 */ jr $ra -/* 890188 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 89018C 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_15/func_802405F0_88FBA0.s b/asm/nonmatchings/world/area_tik/tik_15/func_802405F0_88FBA0.s deleted file mode 100644 index 15e71c11ee..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/func_802405F0_88FBA0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_890190 -/* 890190 802405F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 890194 802405F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 890198 802405F8 0080982D */ daddu $s3, $a0, $zero -/* 89019C 802405FC AFBF0020 */ sw $ra, 0x20($sp) -/* 8901A0 80240600 AFB20018 */ sw $s2, 0x18($sp) -/* 8901A4 80240604 AFB10014 */ sw $s1, 0x14($sp) -/* 8901A8 80240608 AFB00010 */ sw $s0, 0x10($sp) -/* 8901AC 8024060C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8901B0 80240610 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8901B4 80240614 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8901B8 80240618 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8901BC 8024061C 8E62000C */ lw $v0, 0xc($s3) -/* 8901C0 80240620 0C0B1EAF */ jal get_variable -/* 8901C4 80240624 8C450000 */ lw $a1, ($v0) -/* 8901C8 80240628 2404FFFC */ addiu $a0, $zero, -4 -/* 8901CC 8024062C 0C00EABB */ jal get_npc_unsafe -/* 8901D0 80240630 0040802D */ daddu $s0, $v0, $zero -/* 8901D4 80240634 0200202D */ daddu $a0, $s0, $zero -/* 8901D8 80240638 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8901DC 8024063C 0040802D */ daddu $s0, $v0, $zero -/* 8901E0 80240640 0C046B4C */ jal get_model_from_list_index -/* 8901E4 80240644 0040202D */ daddu $a0, $v0, $zero -/* 8901E8 80240648 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8901EC 8024064C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8901F0 80240650 0040902D */ daddu $s2, $v0, $zero -/* 8901F4 80240654 AE60008C */ sw $zero, 0x8c($s3) -/* 8901F8 80240658 C4620028 */ lwc1 $f2, 0x28($v1) -/* 8901FC 8024065C C6400098 */ lwc1 $f0, 0x98($s2) -/* 890200 80240660 46001081 */ sub.s $f2, $f2, $f0 -/* 890204 80240664 46021182 */ mul.s $f6, $f2, $f2 -/* 890208 80240668 00000000 */ nop -/* 89020C 8024066C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 890210 80240670 C4620030 */ lwc1 $f2, 0x30($v1) -/* 890214 80240674 46001081 */ sub.s $f2, $f2, $f0 -/* 890218 80240678 46021102 */ mul.s $f4, $f2, $f2 -/* 89021C 8024067C 00000000 */ nop -/* 890220 80240680 846200B0 */ lh $v0, 0xb0($v1) -/* 890224 80240684 C462002C */ lwc1 $f2, 0x2c($v1) -/* 890228 80240688 44820000 */ mtc1 $v0, $f0 -/* 89022C 8024068C 00000000 */ nop -/* 890230 80240690 46800020 */ cvt.s.w $f0, $f0 -/* 890234 80240694 46001080 */ add.s $f2, $f2, $f0 -/* 890238 80240698 3C013FC0 */ lui $at, 0x3fc0 -/* 89023C 8024069C 44810000 */ mtc1 $at, $f0 -/* 890240 802406A0 00000000 */ nop -/* 890244 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* 890248 802406A8 46043300 */ add.s $f12, $f6, $f4 -/* 89024C 802406AC C640009C */ lwc1 $f0, 0x9c($s2) -/* 890250 802406B0 46001501 */ sub.s $f20, $f2, $f0 -/* 890254 802406B4 46006084 */ sqrt.s $f2, $f12 -/* 890258 802406B8 46021032 */ c.eq.s $f2, $f2 -/* 89025C 802406BC 00000000 */ nop -/* 890260 802406C0 45010004 */ bc1t .L802406D4 -/* 890264 802406C4 0060882D */ daddu $s1, $v1, $zero -/* 890268 802406C8 0C0187BC */ jal sqrtf -/* 89026C 802406CC 00000000 */ nop -/* 890270 802406D0 46000086 */ mov.s $f2, $f0 -.L802406D4: -/* 890274 802406D4 44800000 */ mtc1 $zero, $f0 -/* 890278 802406D8 00000000 */ nop -/* 89027C 802406DC 4614003C */ c.lt.s $f0, $f20 -/* 890280 802406E0 00000000 */ nop -/* 890284 802406E4 45000016 */ bc1f .L80240740 -/* 890288 802406E8 46001106 */ mov.s $f4, $f2 -/* 89028C 802406EC 862200B0 */ lh $v0, 0xb0($s1) -/* 890290 802406F0 44820000 */ mtc1 $v0, $f0 -/* 890294 802406F4 00000000 */ nop -/* 890298 802406F8 46800020 */ cvt.s.w $f0, $f0 -/* 89029C 802406FC 4600A03C */ c.lt.s $f20, $f0 -/* 8902A0 80240700 00000000 */ nop -/* 8902A4 80240704 4500000E */ bc1f .L80240740 -/* 8902A8 80240708 00000000 */ nop -/* 8902AC 8024070C 862200B2 */ lh $v0, 0xb2($s1) -/* 8902B0 80240710 3C013F00 */ lui $at, 0x3f00 -/* 8902B4 80240714 44811000 */ mtc1 $at, $f2 -/* 8902B8 80240718 44820000 */ mtc1 $v0, $f0 -/* 8902BC 8024071C 00000000 */ nop -/* 8902C0 80240720 46800020 */ cvt.s.w $f0, $f0 -/* 8902C4 80240724 46020002 */ mul.s $f0, $f0, $f2 -/* 8902C8 80240728 00000000 */ nop -/* 8902CC 8024072C 4600203C */ c.lt.s $f4, $f0 -/* 8902D0 80240730 00000000 */ nop -/* 8902D4 80240734 45000002 */ bc1f .L80240740 -/* 8902D8 80240738 24020001 */ addiu $v0, $zero, 1 -/* 8902DC 8024073C AE62008C */ sw $v0, 0x8c($s3) -.L80240740: -/* 8902E0 80240740 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8902E4 80240744 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8902E8 80240748 46001081 */ sub.s $f2, $f2, $f0 -/* 8902EC 8024074C 46021182 */ mul.s $f6, $f2, $f2 -/* 8902F0 80240750 00000000 */ nop -/* 8902F4 80240754 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8902F8 80240758 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8902FC 8024075C 46001081 */ sub.s $f2, $f2, $f0 -/* 890300 80240760 46021102 */ mul.s $f4, $f2, $f2 -/* 890304 80240764 00000000 */ nop -/* 890308 80240768 860200A8 */ lh $v0, 0xa8($s0) -/* 89030C 8024076C C602003C */ lwc1 $f2, 0x3c($s0) -/* 890310 80240770 44820000 */ mtc1 $v0, $f0 -/* 890314 80240774 00000000 */ nop -/* 890318 80240778 46800020 */ cvt.s.w $f0, $f0 -/* 89031C 8024077C 46001080 */ add.s $f2, $f2, $f0 -/* 890320 80240780 3C013FC0 */ lui $at, 0x3fc0 -/* 890324 80240784 44810000 */ mtc1 $at, $f0 -/* 890328 80240788 00000000 */ nop -/* 89032C 8024078C 46001081 */ sub.s $f2, $f2, $f0 -/* 890330 80240790 46043300 */ add.s $f12, $f6, $f4 -/* 890334 80240794 C640009C */ lwc1 $f0, 0x9c($s2) -/* 890338 80240798 46001501 */ sub.s $f20, $f2, $f0 -/* 89033C 8024079C 46006084 */ sqrt.s $f2, $f12 -/* 890340 802407A0 46021032 */ c.eq.s $f2, $f2 -/* 890344 802407A4 00000000 */ nop -/* 890348 802407A8 45010004 */ bc1t .L802407BC -/* 89034C 802407AC 00000000 */ nop -/* 890350 802407B0 0C0187BC */ jal sqrtf -/* 890354 802407B4 00000000 */ nop -/* 890358 802407B8 46000086 */ mov.s $f2, $f0 -.L802407BC: -/* 89035C 802407BC 44800000 */ mtc1 $zero, $f0 -/* 890360 802407C0 00000000 */ nop -/* 890364 802407C4 4614003C */ c.lt.s $f0, $f20 -/* 890368 802407C8 00000000 */ nop -/* 89036C 802407CC 45000016 */ bc1f .L80240828 -/* 890370 802407D0 46001106 */ mov.s $f4, $f2 -/* 890374 802407D4 860200A8 */ lh $v0, 0xa8($s0) -/* 890378 802407D8 44820000 */ mtc1 $v0, $f0 -/* 89037C 802407DC 00000000 */ nop -/* 890380 802407E0 46800020 */ cvt.s.w $f0, $f0 -/* 890384 802407E4 4600A03C */ c.lt.s $f20, $f0 -/* 890388 802407E8 00000000 */ nop -/* 89038C 802407EC 4500000F */ bc1f .L8024082C -/* 890390 802407F0 0000882D */ daddu $s1, $zero, $zero -/* 890394 802407F4 860200A6 */ lh $v0, 0xa6($s0) -/* 890398 802407F8 3C013F00 */ lui $at, 0x3f00 -/* 89039C 802407FC 44811000 */ mtc1 $at, $f2 -/* 8903A0 80240800 44820000 */ mtc1 $v0, $f0 -/* 8903A4 80240804 00000000 */ nop -/* 8903A8 80240808 46800020 */ cvt.s.w $f0, $f0 -/* 8903AC 8024080C 46020002 */ mul.s $f0, $f0, $f2 -/* 8903B0 80240810 00000000 */ nop -/* 8903B4 80240814 4600203C */ c.lt.s $f4, $f0 -/* 8903B8 80240818 00000000 */ nop -/* 8903BC 8024081C 45000003 */ bc1f .L8024082C -/* 8903C0 80240820 24020001 */ addiu $v0, $zero, 1 -/* 8903C4 80240824 AE62008C */ sw $v0, 0x8c($s3) -.L80240828: -/* 8903C8 80240828 0000882D */ daddu $s1, $zero, $zero -.L8024082C: -/* 8903CC 8024082C 3C013FC0 */ lui $at, 0x3fc0 -/* 8903D0 80240830 4481D000 */ mtc1 $at, $f26 -/* 8903D4 80240834 4480C000 */ mtc1 $zero, $f24 -/* 8903D8 80240838 3C013F00 */ lui $at, 0x3f00 -/* 8903DC 8024083C 4481B000 */ mtc1 $at, $f22 -.L80240840: -/* 8903E0 80240840 0C00EAD2 */ jal get_npc_safe -/* 8903E4 80240844 0220202D */ daddu $a0, $s1, $zero -/* 8903E8 80240848 0040802D */ daddu $s0, $v0, $zero -/* 8903EC 8024084C 52000035 */ beql $s0, $zero, .L80240924 -/* 8903F0 80240850 26310001 */ addiu $s1, $s1, 1 -/* 8903F4 80240854 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8903F8 80240858 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8903FC 8024085C 46001081 */ sub.s $f2, $f2, $f0 -/* 890400 80240860 46021182 */ mul.s $f6, $f2, $f2 -/* 890404 80240864 00000000 */ nop -/* 890408 80240868 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 89040C 8024086C C6020040 */ lwc1 $f2, 0x40($s0) -/* 890410 80240870 46001081 */ sub.s $f2, $f2, $f0 -/* 890414 80240874 46021102 */ mul.s $f4, $f2, $f2 -/* 890418 80240878 00000000 */ nop -/* 89041C 8024087C 860200A8 */ lh $v0, 0xa8($s0) -/* 890420 80240880 C602003C */ lwc1 $f2, 0x3c($s0) -/* 890424 80240884 44820000 */ mtc1 $v0, $f0 -/* 890428 80240888 00000000 */ nop -/* 89042C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* 890430 80240890 46001080 */ add.s $f2, $f2, $f0 -/* 890434 80240894 461A1081 */ sub.s $f2, $f2, $f26 -/* 890438 80240898 46043300 */ add.s $f12, $f6, $f4 -/* 89043C 8024089C C640009C */ lwc1 $f0, 0x9c($s2) -/* 890440 802408A0 46001501 */ sub.s $f20, $f2, $f0 -/* 890444 802408A4 46006004 */ sqrt.s $f0, $f12 -/* 890448 802408A8 46000032 */ c.eq.s $f0, $f0 -/* 89044C 802408AC 00000000 */ nop -/* 890450 802408B0 45010003 */ bc1t .L802408C0 -/* 890454 802408B4 00000000 */ nop -/* 890458 802408B8 0C0187BC */ jal sqrtf -/* 89045C 802408BC 00000000 */ nop -.L802408C0: -/* 890460 802408C0 4614C03C */ c.lt.s $f24, $f20 -/* 890464 802408C4 00000000 */ nop -/* 890468 802408C8 45000015 */ bc1f .L80240920 -/* 89046C 802408CC 46000106 */ mov.s $f4, $f0 -/* 890470 802408D0 860200A8 */ lh $v0, 0xa8($s0) -/* 890474 802408D4 44820000 */ mtc1 $v0, $f0 -/* 890478 802408D8 00000000 */ nop -/* 89047C 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 890480 802408E0 4600A03C */ c.lt.s $f20, $f0 -/* 890484 802408E4 00000000 */ nop -/* 890488 802408E8 4500000E */ bc1f .L80240924 -/* 89048C 802408EC 26310001 */ addiu $s1, $s1, 1 -/* 890490 802408F0 860200A6 */ lh $v0, 0xa6($s0) -/* 890494 802408F4 44820000 */ mtc1 $v0, $f0 -/* 890498 802408F8 00000000 */ nop -/* 89049C 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* 8904A0 80240900 46160002 */ mul.s $f0, $f0, $f22 -/* 8904A4 80240904 00000000 */ nop -/* 8904A8 80240908 4600203C */ c.lt.s $f4, $f0 -/* 8904AC 8024090C 00000000 */ nop -/* 8904B0 80240910 45000004 */ bc1f .L80240924 -/* 8904B4 80240914 24020001 */ addiu $v0, $zero, 1 -/* 8904B8 80240918 0809024C */ j .L80240930 -/* 8904BC 8024091C AE62008C */ sw $v0, 0x8c($s3) -.L80240920: -/* 8904C0 80240920 26310001 */ addiu $s1, $s1, 1 -.L80240924: -/* 8904C4 80240924 2A220040 */ slti $v0, $s1, 0x40 -/* 8904C8 80240928 1440FFC5 */ bnez $v0, .L80240840 -/* 8904CC 8024092C 00000000 */ nop -.L80240930: -/* 8904D0 80240930 8FBF0020 */ lw $ra, 0x20($sp) -/* 8904D4 80240934 8FB3001C */ lw $s3, 0x1c($sp) -/* 8904D8 80240938 8FB20018 */ lw $s2, 0x18($sp) -/* 8904DC 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* 8904E0 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* 8904E4 80240944 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 8904E8 80240948 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 8904EC 8024094C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8904F0 80240950 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8904F4 80240954 24020002 */ addiu $v0, $zero, 2 -/* 8904F8 80240958 03E00008 */ jr $ra -/* 8904FC 8024095C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_15/func_80240960_88FBA0.s b/asm/nonmatchings/world/area_tik/tik_15/func_80240960_88FBA0.s deleted file mode 100644 index 00990681c9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/func_80240960_88FBA0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240960_890500 -/* 890500 80240960 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 890504 80240964 AFB00010 */ sw $s0, 0x10($sp) -/* 890508 80240968 3C108024 */ lui $s0, 0x8024 -/* 89050C 8024096C 26102758 */ addiu $s0, $s0, 0x2758 -/* 890510 80240970 AFBF0018 */ sw $ra, 0x18($sp) -/* 890514 80240974 AFB10014 */ sw $s1, 0x14($sp) -/* 890518 80240978 8E020000 */ lw $v0, ($s0) -/* 89051C 8024097C 14400010 */ bnez $v0, .L802409C0 -/* 890520 80240980 0080882D */ daddu $s1, $a0, $zero -/* 890524 80240984 0C00AB39 */ jal heap_malloc -/* 890528 80240988 24040040 */ addiu $a0, $zero, 0x40 -/* 89052C 8024098C AE020000 */ sw $v0, ($s0) -/* 890530 80240990 0000182D */ daddu $v1, $zero, $zero -/* 890534 80240994 0040282D */ daddu $a1, $v0, $zero -/* 890538 80240998 0220202D */ daddu $a0, $s1, $zero -.L8024099C: -/* 89053C 8024099C 8C820084 */ lw $v0, 0x84($a0) -/* 890540 802409A0 24840004 */ addiu $a0, $a0, 4 -/* 890544 802409A4 24630001 */ addiu $v1, $v1, 1 -/* 890548 802409A8 ACA20000 */ sw $v0, ($a1) -/* 89054C 802409AC 28620010 */ slti $v0, $v1, 0x10 -/* 890550 802409B0 1440FFFA */ bnez $v0, .L8024099C -/* 890554 802409B4 24A50004 */ addiu $a1, $a1, 4 -/* 890558 802409B8 0809027F */ j .L802409FC -/* 89055C 802409BC 00000000 */ nop -.L802409C0: -/* 890560 802409C0 0000182D */ daddu $v1, $zero, $zero -/* 890564 802409C4 0040282D */ daddu $a1, $v0, $zero -/* 890568 802409C8 0220202D */ daddu $a0, $s1, $zero -.L802409CC: -/* 89056C 802409CC 8CA20000 */ lw $v0, ($a1) -/* 890570 802409D0 24A50004 */ addiu $a1, $a1, 4 -/* 890574 802409D4 24630001 */ addiu $v1, $v1, 1 -/* 890578 802409D8 AC820084 */ sw $v0, 0x84($a0) -/* 89057C 802409DC 28620010 */ slti $v0, $v1, 0x10 -/* 890580 802409E0 1440FFFA */ bnez $v0, .L802409CC -/* 890584 802409E4 24840004 */ addiu $a0, $a0, 4 -/* 890588 802409E8 3C108024 */ lui $s0, 0x8024 -/* 89058C 802409EC 26102758 */ addiu $s0, $s0, 0x2758 -/* 890590 802409F0 0C00AB4B */ jal heap_free -/* 890594 802409F4 8E040000 */ lw $a0, ($s0) -/* 890598 802409F8 AE000000 */ sw $zero, ($s0) -.L802409FC: -/* 89059C 802409FC 8FBF0018 */ lw $ra, 0x18($sp) -/* 8905A0 80240A00 8FB10014 */ lw $s1, 0x14($sp) -/* 8905A4 80240A04 8FB00010 */ lw $s0, 0x10($sp) -/* 8905A8 80240A08 24020002 */ addiu $v0, $zero, 2 -/* 8905AC 80240A0C 03E00008 */ jr $ra -/* 8905B0 80240A10 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_15/func_80240A14_88FBA0.s b/asm/nonmatchings/world/area_tik/tik_15/func_80240A14_88FBA0.s deleted file mode 100644 index 627c96d39f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/func_80240A14_88FBA0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A14_8905B4 -/* 8905B4 80240A14 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8905B8 80240A18 AFB00010 */ sw $s0, 0x10($sp) -/* 8905BC 80240A1C 0080802D */ daddu $s0, $a0, $zero -/* 8905C0 80240A20 AFBF0018 */ sw $ra, 0x18($sp) -/* 8905C4 80240A24 AFB10014 */ sw $s1, 0x14($sp) -/* 8905C8 80240A28 8E02000C */ lw $v0, 0xc($s0) -/* 8905CC 80240A2C 8C510000 */ lw $s1, ($v0) -/* 8905D0 80240A30 0C0B1EAF */ jal get_variable -/* 8905D4 80240A34 0220282D */ daddu $a1, $s1, $zero -/* 8905D8 80240A38 3C03FFF0 */ lui $v1, 0xfff0 -/* 8905DC 80240A3C 3463FFFF */ ori $v1, $v1, 0xffff -/* 8905E0 80240A40 0200202D */ daddu $a0, $s0, $zero -/* 8905E4 80240A44 00431024 */ and $v0, $v0, $v1 -/* 8905E8 80240A48 00021140 */ sll $v0, $v0, 5 -/* 8905EC 80240A4C 3C068008 */ lui $a2, %hi(gItemTable) -/* 8905F0 80240A50 00C23021 */ addu $a2, $a2, $v0 -/* 8905F4 80240A54 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 8905F8 80240A58 0C0B2026 */ jal set_variable -/* 8905FC 80240A5C 0220282D */ daddu $a1, $s1, $zero -/* 890600 80240A60 8FBF0018 */ lw $ra, 0x18($sp) -/* 890604 80240A64 8FB10014 */ lw $s1, 0x14($sp) -/* 890608 80240A68 8FB00010 */ lw $s0, 0x10($sp) -/* 89060C 80240A6C 24020002 */ addiu $v0, $zero, 2 -/* 890610 80240A70 03E00008 */ jr $ra -/* 890614 80240A74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_15/func_80240A78_88FBA0.s b/asm/nonmatchings/world/area_tik/tik_15/func_80240A78_88FBA0.s deleted file mode 100644 index 4b890f80dd..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/func_80240A78_88FBA0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A78_890618 -/* 890618 80240A78 8C820084 */ lw $v0, 0x84($a0) -/* 89061C 80240A7C 3C038024 */ lui $v1, 0x8024 -/* 890620 80240A80 246327BC */ addiu $v1, $v1, 0x27bc -/* 890624 80240A84 000210C0 */ sll $v0, $v0, 3 -/* 890628 80240A88 00431021 */ addu $v0, $v0, $v1 -/* 89062C 80240A8C 8C430000 */ lw $v1, ($v0) -/* 890630 80240A90 AC8300AC */ sw $v1, 0xac($a0) -/* 890634 80240A94 8C420004 */ lw $v0, 4($v0) -/* 890638 80240A98 AC8200B0 */ sw $v0, 0xb0($a0) -/* 89063C 80240A9C 03E00008 */ jr $ra -/* 890640 80240AA0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_17/func_80240030_892A20.s b/asm/nonmatchings/world/area_tik/tik_17/func_80240030_892A20.s deleted file mode 100644 index c16d33736b..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/func_80240030_892A20.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240030_892A50 -/* 892A50 80240030 3C03800A */ lui $v1, %hi(D_8009A650) -/* 892A54 80240034 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 892A58 80240038 8C620000 */ lw $v0, ($v1) -/* 892A5C 8024003C 34420040 */ ori $v0, $v0, 0x40 -/* 892A60 80240040 AC620000 */ sw $v0, ($v1) -/* 892A64 80240044 03E00008 */ jr $ra -/* 892A68 80240048 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_17/func_802404B0_892A20.s b/asm/nonmatchings/world/area_tik/tik_17/func_802404B0_892A20.s deleted file mode 100644 index 7fed013fb0..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/func_802404B0_892A20.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404B0_892ED0 -/* 892ED0 802404B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 892ED4 802404B4 AFB1001C */ sw $s1, 0x1c($sp) -/* 892ED8 802404B8 0080882D */ daddu $s1, $a0, $zero -/* 892EDC 802404BC AFBF0020 */ sw $ra, 0x20($sp) -/* 892EE0 802404C0 AFB00018 */ sw $s0, 0x18($sp) -/* 892EE4 802404C4 8E30000C */ lw $s0, 0xc($s1) -/* 892EE8 802404C8 8E050000 */ lw $a1, ($s0) -/* 892EEC 802404CC 0C0B1EAF */ jal get_variable -/* 892EF0 802404D0 26100004 */ addiu $s0, $s0, 4 -/* 892EF4 802404D4 0C04417A */ jal get_entity_by_index -/* 892EF8 802404D8 0040202D */ daddu $a0, $v0, $zero -/* 892EFC 802404DC 8E100000 */ lw $s0, ($s0) -/* 892F00 802404E0 C444004C */ lwc1 $f4, 0x4c($v0) -/* 892F04 802404E4 3C014148 */ lui $at, 0x4148 -/* 892F08 802404E8 44810000 */ mtc1 $at, $f0 -/* 892F0C 802404EC 3C013F33 */ lui $at, 0x3f33 -/* 892F10 802404F0 34213333 */ ori $at, $at, 0x3333 -/* 892F14 802404F4 44811000 */ mtc1 $at, $f2 -/* 892F18 802404F8 AFA00014 */ sw $zero, 0x14($sp) -/* 892F1C 802404FC 46002100 */ add.s $f4, $f4, $f0 -/* 892F20 80240500 E7A20010 */ swc1 $f2, 0x10($sp) -/* 892F24 80240504 8C450048 */ lw $a1, 0x48($v0) -/* 892F28 80240508 8C470050 */ lw $a3, 0x50($v0) -/* 892F2C 8024050C 44062000 */ mfc1 $a2, $f4 -/* 892F30 80240510 0C01C5D4 */ jal func_80071750 -/* 892F34 80240514 0000202D */ daddu $a0, $zero, $zero -/* 892F38 80240518 0220202D */ daddu $a0, $s1, $zero -/* 892F3C 8024051C 0200282D */ daddu $a1, $s0, $zero -/* 892F40 80240520 0C0B2026 */ jal set_variable -/* 892F44 80240524 0040302D */ daddu $a2, $v0, $zero -/* 892F48 80240528 8FBF0020 */ lw $ra, 0x20($sp) -/* 892F4C 8024052C 8FB1001C */ lw $s1, 0x1c($sp) -/* 892F50 80240530 8FB00018 */ lw $s0, 0x18($sp) -/* 892F54 80240534 24020002 */ addiu $v0, $zero, 2 -/* 892F58 80240538 03E00008 */ jr $ra -/* 892F5C 8024053C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_17/func_80240630_892A20.s b/asm/nonmatchings/world/area_tik/tik_17/func_80240630_892A20.s deleted file mode 100644 index f43bbf9620..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/func_80240630_892A20.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240630_893050 -/* 893050 80240630 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 893054 80240634 AFB60040 */ sw $s6, 0x40($sp) -/* 893058 80240638 0080B02D */ daddu $s6, $a0, $zero -/* 89305C 8024063C AFB00028 */ sw $s0, 0x28($sp) -/* 893060 80240640 00A0802D */ daddu $s0, $a1, $zero -/* 893064 80240644 AFBF0044 */ sw $ra, 0x44($sp) -/* 893068 80240648 AFB5003C */ sw $s5, 0x3c($sp) -/* 89306C 8024064C AFB40038 */ sw $s4, 0x38($sp) -/* 893070 80240650 AFB30034 */ sw $s3, 0x34($sp) -/* 893074 80240654 AFB20030 */ sw $s2, 0x30($sp) -/* 893078 80240658 AFB1002C */ sw $s1, 0x2c($sp) -/* 89307C 8024065C F7B80058 */ sdc1 $f24, 0x58($sp) -/* 893080 80240660 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 893084 80240664 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 893088 80240668 8ED3000C */ lw $s3, 0xc($s6) -/* 89308C 8024066C 0C00EAD2 */ jal get_npc_safe -/* 893090 80240670 2404FFFC */ addiu $a0, $zero, -4 -/* 893094 80240674 27A50018 */ addiu $a1, $sp, 0x18 -/* 893098 80240678 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 89309C 8024067C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 8930A0 80240680 27A6001C */ addiu $a2, $sp, 0x1c -/* 8930A4 80240684 00041880 */ sll $v1, $a0, 2 -/* 8930A8 80240688 00641821 */ addu $v1, $v1, $a0 -/* 8930AC 8024068C 00031880 */ sll $v1, $v1, 2 -/* 8930B0 80240690 00641823 */ subu $v1, $v1, $a0 -/* 8930B4 80240694 000320C0 */ sll $a0, $v1, 3 -/* 8930B8 80240698 00641821 */ addu $v1, $v1, $a0 -/* 8930BC 8024069C 000318C0 */ sll $v1, $v1, 3 -/* 8930C0 802406A0 3C01800B */ lui $at, 0x800b -/* 8930C4 802406A4 00230821 */ addu $at, $at, $v1 -/* 8930C8 802406A8 C42C1DEC */ lwc1 $f12, 0x1dec($at) -/* 8930CC 802406AC 0C00A88D */ jal sin_cos_deg -/* 8930D0 802406B0 0040A82D */ daddu $s5, $v0, $zero -/* 8930D4 802406B4 1200005D */ beqz $s0, .L8024082C -/* 8930D8 802406B8 00000000 */ nop -/* 8930DC 802406BC 0C00AB0A */ jal general_heap_malloc -/* 8930E0 802406C0 24040068 */ addiu $a0, $zero, 0x68 -/* 8930E4 802406C4 0040902D */ daddu $s2, $v0, $zero -/* 8930E8 802406C8 02C0202D */ daddu $a0, $s6, $zero -/* 8930EC 802406CC 0000882D */ daddu $s1, $zero, $zero -/* 8930F0 802406D0 2414FFFF */ addiu $s4, $zero, -1 -/* 8930F4 802406D4 AED20060 */ sw $s2, 0x60($s6) -/* 8930F8 802406D8 8E650000 */ lw $a1, ($s3) -/* 8930FC 802406DC 3C014148 */ lui $at, 0x4148 -/* 893100 802406E0 4481C000 */ mtc1 $at, $f24 -/* 893104 802406E4 3C013F80 */ lui $at, 0x3f80 -/* 893108 802406E8 4481B000 */ mtc1 $at, $f22 -/* 89310C 802406EC 4480A000 */ mtc1 $zero, $f20 -/* 893110 802406F0 0C0B1EAF */ jal get_variable -/* 893114 802406F4 0240802D */ daddu $s0, $s2, $zero -/* 893118 802406F8 0C04417A */ jal get_entity_by_index -/* 89311C 802406FC 0040202D */ daddu $a0, $v0, $zero -/* 893120 80240700 AE42005C */ sw $v0, 0x5c($s2) -.L80240704: -/* 893124 80240704 8E42005C */ lw $v0, 0x5c($s2) -/* 893128 80240708 C440004C */ lwc1 $f0, 0x4c($v0) -/* 89312C 8024070C 0000202D */ daddu $a0, $zero, $zero -/* 893130 80240710 E7B60010 */ swc1 $f22, 0x10($sp) -/* 893134 80240714 AFB40014 */ sw $s4, 0x14($sp) -/* 893138 80240718 46180000 */ add.s $f0, $f0, $f24 -/* 89313C 8024071C 8C450048 */ lw $a1, 0x48($v0) -/* 893140 80240720 8C470050 */ lw $a3, 0x50($v0) -/* 893144 80240724 44060000 */ mfc1 $a2, $f0 -/* 893148 80240728 0C01C5BC */ jal func_800716F0 -/* 89314C 8024072C 26310001 */ addiu $s1, $s1, 1 -/* 893150 80240730 AE020008 */ sw $v0, 8($s0) -/* 893154 80240734 E614002C */ swc1 $f20, 0x2c($s0) -/* 893158 80240738 E6140020 */ swc1 $f20, 0x20($s0) -/* 89315C 8024073C E6140014 */ swc1 $f20, 0x14($s0) -/* 893160 80240740 E6140050 */ swc1 $f20, 0x50($s0) -/* 893164 80240744 E6140044 */ swc1 $f20, 0x44($s0) -/* 893168 80240748 E6140038 */ swc1 $f20, 0x38($s0) -/* 89316C 8024074C 2A220003 */ slti $v0, $s1, 3 -/* 893170 80240750 1440FFEC */ bnez $v0, .L80240704 -/* 893174 80240754 26100004 */ addiu $s0, $s0, 4 -/* 893178 80240758 0000882D */ daddu $s1, $zero, $zero -/* 89317C 8024075C 0240802D */ daddu $s0, $s2, $zero -/* 893180 80240760 3C148024 */ lui $s4, 0x8024 -/* 893184 80240764 26941478 */ addiu $s4, $s4, 0x1478 -/* 893188 80240768 3C014248 */ lui $at, 0x4248 -/* 89318C 8024076C 4481A000 */ mtc1 $at, $f20 -/* 893190 80240770 24130044 */ addiu $s3, $zero, 0x44 -/* 893194 80240774 AE400000 */ sw $zero, ($s2) -/* 893198 80240778 AE400004 */ sw $zero, 4($s2) -/* 89319C 8024077C AE400060 */ sw $zero, 0x60($s2) -/* 8931A0 80240780 AE400064 */ sw $zero, 0x64($s2) -.L80240784: -/* 8931A4 80240784 27A40020 */ addiu $a0, $sp, 0x20 -/* 8931A8 80240788 4406A000 */ mfc1 $a2, $f20 -/* 8931AC 8024078C 8E870000 */ lw $a3, ($s4) -/* 8931B0 80240790 02532821 */ addu $a1, $s2, $s3 -/* 8931B4 80240794 0C00A7E7 */ jal add_vec2D_polar -/* 8931B8 80240798 AFA00020 */ sw $zero, 0x20($sp) -/* 8931BC 8024079C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 8931C0 802407A0 C7A40020 */ lwc1 $f4, 0x20($sp) -/* 8931C4 802407A4 46041082 */ mul.s $f2, $f2, $f4 -/* 8931C8 802407A8 00000000 */ nop -/* 8931CC 802407AC C7A00018 */ lwc1 $f0, 0x18($sp) -/* 8931D0 802407B0 46040002 */ mul.s $f0, $f0, $f4 -/* 8931D4 802407B4 00000000 */ nop -/* 8931D8 802407B8 E6020038 */ swc1 $f2, 0x38($s0) -/* 8931DC 802407BC E6000050 */ swc1 $f0, 0x50($s0) -/* 8931E0 802407C0 8E42005C */ lw $v0, 0x5c($s2) -/* 8931E4 802407C4 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8931E8 802407C8 C4420048 */ lwc1 $f2, 0x48($v0) -/* 8931EC 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* 8931F0 802407D0 C6A00038 */ lwc1 $f0, 0x38($s5) -/* 8931F4 802407D4 46020001 */ sub.s $f0, $f0, $f2 -/* 8931F8 802407D8 E6000038 */ swc1 $f0, 0x38($s0) -/* 8931FC 802407DC 8E42005C */ lw $v0, 0x5c($s2) -/* 893200 802407E0 C6000044 */ lwc1 $f0, 0x44($s0) -/* 893204 802407E4 C442004C */ lwc1 $f2, 0x4c($v0) -/* 893208 802407E8 46001080 */ add.s $f2, $f2, $f0 -/* 89320C 802407EC C6A0003C */ lwc1 $f0, 0x3c($s5) -/* 893210 802407F0 46020001 */ sub.s $f0, $f0, $f2 -/* 893214 802407F4 E6000044 */ swc1 $f0, 0x44($s0) -/* 893218 802407F8 8E42005C */ lw $v0, 0x5c($s2) -/* 89321C 802407FC C6000050 */ lwc1 $f0, 0x50($s0) -/* 893220 80240800 C4420050 */ lwc1 $f2, 0x50($v0) -/* 893224 80240804 26940004 */ addiu $s4, $s4, 4 -/* 893228 80240808 46001080 */ add.s $f2, $f2, $f0 -/* 89322C 8024080C C6A00040 */ lwc1 $f0, 0x40($s5) -/* 893230 80240810 26730004 */ addiu $s3, $s3, 4 -/* 893234 80240814 46020001 */ sub.s $f0, $f0, $f2 -/* 893238 80240818 26310001 */ addiu $s1, $s1, 1 -/* 89323C 8024081C 2A220003 */ slti $v0, $s1, 3 -/* 893240 80240820 E6000050 */ swc1 $f0, 0x50($s0) -/* 893244 80240824 1440FFD7 */ bnez $v0, .L80240784 -/* 893248 80240828 26100004 */ addiu $s0, $s0, 4 -.L8024082C: -/* 89324C 8024082C 8ED20060 */ lw $s2, 0x60($s6) -/* 893250 80240830 8E430000 */ lw $v1, ($s2) -/* 893254 80240834 24020001 */ addiu $v0, $zero, 1 -/* 893258 80240838 10620038 */ beq $v1, $v0, .L8024091C -/* 89325C 8024083C 28620002 */ slti $v0, $v1, 2 -/* 893260 80240840 50400005 */ beql $v0, $zero, .L80240858 -/* 893264 80240844 24020002 */ addiu $v0, $zero, 2 -/* 893268 80240848 10600007 */ beqz $v1, .L80240868 -/* 89326C 8024084C 24040005 */ addiu $a0, $zero, 5 -/* 893270 80240850 08090280 */ j .L80240A00 -/* 893274 80240854 00000000 */ nop -.L80240858: -/* 893278 80240858 10620058 */ beq $v1, $v0, .L802409BC -/* 89327C 8024085C 00000000 */ nop -/* 893280 80240860 08090280 */ j .L80240A00 -/* 893284 80240864 00000000 */ nop -.L80240868: -/* 893288 80240868 0000882D */ daddu $s1, $zero, $zero -/* 89328C 8024086C 3C148024 */ lui $s4, 0x8024 -/* 893290 80240870 26941478 */ addiu $s4, $s4, 0x1478 -/* 893294 80240874 24130020 */ addiu $s3, $zero, 0x20 -/* 893298 80240878 3C064248 */ lui $a2, 0x4248 -/* 89329C 8024087C 44800000 */ mtc1 $zero, $f0 -/* 8932A0 80240880 24020014 */ addiu $v0, $zero, 0x14 -/* 8932A4 80240884 AFA20010 */ sw $v0, 0x10($sp) -/* 8932A8 80240888 44050000 */ mfc1 $a1, $f0 -/* 8932AC 8024088C 8E470060 */ lw $a3, 0x60($s2) -/* 8932B0 80240890 4485B000 */ mtc1 $a1, $f22 -/* 8932B4 80240894 0C00A8ED */ jal update_lerp -/* 8932B8 80240898 0240802D */ daddu $s0, $s2, $zero -/* 8932BC 8024089C 46000506 */ mov.s $f20, $f0 -.L802408A0: -/* 8932C0 802408A0 4406A000 */ mfc1 $a2, $f20 -/* 8932C4 802408A4 27A40020 */ addiu $a0, $sp, 0x20 -/* 8932C8 802408A8 E6160020 */ swc1 $f22, 0x20($s0) -/* 8932CC 802408AC 8E870000 */ lw $a3, ($s4) -/* 8932D0 802408B0 02532821 */ addu $a1, $s2, $s3 -/* 8932D4 802408B4 0C00A7E7 */ jal add_vec2D_polar -/* 8932D8 802408B8 E7B60020 */ swc1 $f22, 0x20($sp) -/* 8932DC 802408BC C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 8932E0 802408C0 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 8932E4 802408C4 46002102 */ mul.s $f4, $f4, $f0 -/* 8932E8 802408C8 00000000 */ nop -/* 8932EC 802408CC C7A20018 */ lwc1 $f2, 0x18($sp) -/* 8932F0 802408D0 26940004 */ addiu $s4, $s4, 4 -/* 8932F4 802408D4 46001082 */ mul.s $f2, $f2, $f0 -/* 8932F8 802408D8 00000000 */ nop -/* 8932FC 802408DC 26730004 */ addiu $s3, $s3, 4 -/* 893300 802408E0 26310001 */ addiu $s1, $s1, 1 -/* 893304 802408E4 2A220003 */ slti $v0, $s1, 3 -/* 893308 802408E8 E6040014 */ swc1 $f4, 0x14($s0) -/* 89330C 802408EC E602002C */ swc1 $f2, 0x2c($s0) -/* 893310 802408F0 1440FFEB */ bnez $v0, .L802408A0 -/* 893314 802408F4 26100004 */ addiu $s0, $s0, 4 -/* 893318 802408F8 8E420060 */ lw $v0, 0x60($s2) -/* 89331C 802408FC 24420001 */ addiu $v0, $v0, 1 -/* 893320 80240900 AE420060 */ sw $v0, 0x60($s2) -/* 893324 80240904 28420015 */ slti $v0, $v0, 0x15 -/* 893328 80240908 1440003D */ bnez $v0, .L80240A00 -/* 89332C 8024090C 24020001 */ addiu $v0, $zero, 1 -/* 893330 80240910 AE420000 */ sw $v0, ($s2) -/* 893334 80240914 08090280 */ j .L80240A00 -/* 893338 80240918 AE400060 */ sw $zero, 0x60($s2) -.L8024091C: -/* 89333C 8024091C 0000882D */ daddu $s1, $zero, $zero -/* 893340 80240920 3C148024 */ lui $s4, 0x8024 -/* 893344 80240924 26941478 */ addiu $s4, $s4, 0x1478 -/* 893348 80240928 24130020 */ addiu $s3, $zero, 0x20 -/* 89334C 8024092C 0240802D */ daddu $s0, $s2, $zero -/* 893350 80240930 3C014248 */ lui $at, 0x4248 -/* 893354 80240934 4481A000 */ mtc1 $at, $f20 -/* 893358 80240938 4480B000 */ mtc1 $zero, $f22 -.L8024093C: -/* 89335C 8024093C 4406A000 */ mfc1 $a2, $f20 -/* 893360 80240940 27A40020 */ addiu $a0, $sp, 0x20 -/* 893364 80240944 E6160020 */ swc1 $f22, 0x20($s0) -/* 893368 80240948 8E870000 */ lw $a3, ($s4) -/* 89336C 8024094C 02532821 */ addu $a1, $s2, $s3 -/* 893370 80240950 0C00A7E7 */ jal add_vec2D_polar -/* 893374 80240954 E7B60020 */ swc1 $f22, 0x20($sp) -/* 893378 80240958 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 89337C 8024095C C7A00020 */ lwc1 $f0, 0x20($sp) -/* 893380 80240960 46002102 */ mul.s $f4, $f4, $f0 -/* 893384 80240964 00000000 */ nop -/* 893388 80240968 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 89338C 8024096C 26940004 */ addiu $s4, $s4, 4 -/* 893390 80240970 46001082 */ mul.s $f2, $f2, $f0 -/* 893394 80240974 00000000 */ nop -/* 893398 80240978 26730004 */ addiu $s3, $s3, 4 -/* 89339C 8024097C 26310001 */ addiu $s1, $s1, 1 -/* 8933A0 80240980 2A220003 */ slti $v0, $s1, 3 -/* 8933A4 80240984 E6040014 */ swc1 $f4, 0x14($s0) -/* 8933A8 80240988 E602002C */ swc1 $f2, 0x2c($s0) -/* 8933AC 8024098C 1440FFEB */ bnez $v0, .L8024093C -/* 8933B0 80240990 26100004 */ addiu $s0, $s0, 4 -/* 8933B4 80240994 8E420060 */ lw $v0, 0x60($s2) -/* 8933B8 80240998 24420001 */ addiu $v0, $v0, 1 -/* 8933BC 8024099C AE420060 */ sw $v0, 0x60($s2) -/* 8933C0 802409A0 28420010 */ slti $v0, $v0, 0x10 -/* 8933C4 802409A4 14400016 */ bnez $v0, .L80240A00 -/* 8933C8 802409A8 2402000F */ addiu $v0, $zero, 0xf -/* 8933CC 802409AC AE420060 */ sw $v0, 0x60($s2) -/* 8933D0 802409B0 24020002 */ addiu $v0, $zero, 2 -/* 8933D4 802409B4 08090280 */ j .L80240A00 -/* 8933D8 802409B8 AE420000 */ sw $v0, ($s2) -.L802409BC: -/* 8933DC 802409BC 8E420060 */ lw $v0, 0x60($s2) -/* 8933E0 802409C0 24420001 */ addiu $v0, $v0, 1 -/* 8933E4 802409C4 AE420060 */ sw $v0, 0x60($s2) -/* 8933E8 802409C8 2842001F */ slti $v0, $v0, 0x1f -/* 8933EC 802409CC 1440000C */ bnez $v0, .L80240A00 -/* 8933F0 802409D0 0000882D */ daddu $s1, $zero, $zero -/* 8933F4 802409D4 0240282D */ daddu $a1, $s2, $zero -.L802409D8: -/* 8933F8 802409D8 8CA20008 */ lw $v0, 8($a1) -/* 8933FC 802409DC 8C430000 */ lw $v1, ($v0) -/* 893400 802409E0 26310001 */ addiu $s1, $s1, 1 -/* 893404 802409E4 34630010 */ ori $v1, $v1, 0x10 -/* 893408 802409E8 AC430000 */ sw $v1, ($v0) -/* 89340C 802409EC 2A220003 */ slti $v0, $s1, 3 -/* 893410 802409F0 1440FFF9 */ bnez $v0, .L802409D8 -/* 893414 802409F4 24A50004 */ addiu $a1, $a1, 4 -/* 893418 802409F8 080902CD */ j .L80240B34 -/* 89341C 802409FC 24020002 */ addiu $v0, $zero, 2 -.L80240A00: -/* 893420 80240A00 8E430004 */ lw $v1, 4($s2) -/* 893424 80240A04 10600005 */ beqz $v1, .L80240A1C -/* 893428 80240A08 24020001 */ addiu $v0, $zero, 1 -/* 89342C 80240A0C 1062000B */ beq $v1, $v0, .L80240A3C -/* 893430 80240A10 0000882D */ daddu $s1, $zero, $zero -/* 893434 80240A14 080902BC */ j .L80240AF0 -/* 893438 80240A18 0240282D */ daddu $a1, $s2, $zero -.L80240A1C: -/* 89343C 80240A1C 8E420064 */ lw $v0, 0x64($s2) -/* 893440 80240A20 24420001 */ addiu $v0, $v0, 1 -/* 893444 80240A24 AE420064 */ sw $v0, 0x64($s2) -/* 893448 80240A28 28420010 */ slti $v0, $v0, 0x10 -/* 89344C 80240A2C 1440002F */ bnez $v0, .L80240AEC -/* 893450 80240A30 0000882D */ daddu $s1, $zero, $zero -/* 893454 80240A34 080902B8 */ j .L80240AE0 -/* 893458 80240A38 24020001 */ addiu $v0, $zero, 1 -.L80240A3C: -/* 89345C 80240A3C 4480A000 */ mtc1 $zero, $f20 -/* 893460 80240A40 24130014 */ addiu $s3, $zero, 0x14 -/* 893464 80240A44 0240802D */ daddu $s0, $s2, $zero -.L80240A48: -/* 893468 80240A48 4405A000 */ mfc1 $a1, $f20 -/* 89346C 80240A4C AFB30010 */ sw $s3, 0x10($sp) -/* 893470 80240A50 8E060038 */ lw $a2, 0x38($s0) -/* 893474 80240A54 8E470064 */ lw $a3, 0x64($s2) -/* 893478 80240A58 0C00A8ED */ jal update_lerp -/* 89347C 80240A5C 24040001 */ addiu $a0, $zero, 1 -/* 893480 80240A60 C6020014 */ lwc1 $f2, 0x14($s0) -/* 893484 80240A64 46001080 */ add.s $f2, $f2, $f0 -/* 893488 80240A68 4405A000 */ mfc1 $a1, $f20 -/* 89348C 80240A6C E6020014 */ swc1 $f2, 0x14($s0) -/* 893490 80240A70 AFB30010 */ sw $s3, 0x10($sp) -/* 893494 80240A74 8E060044 */ lw $a2, 0x44($s0) -/* 893498 80240A78 8E470064 */ lw $a3, 0x64($s2) -/* 89349C 80240A7C 0C00A8ED */ jal update_lerp -/* 8934A0 80240A80 24040001 */ addiu $a0, $zero, 1 -/* 8934A4 80240A84 C6020020 */ lwc1 $f2, 0x20($s0) -/* 8934A8 80240A88 46001080 */ add.s $f2, $f2, $f0 -/* 8934AC 80240A8C 4405A000 */ mfc1 $a1, $f20 -/* 8934B0 80240A90 E6020020 */ swc1 $f2, 0x20($s0) -/* 8934B4 80240A94 AFB30010 */ sw $s3, 0x10($sp) -/* 8934B8 80240A98 8E060050 */ lw $a2, 0x50($s0) -/* 8934BC 80240A9C 8E470064 */ lw $a3, 0x64($s2) -/* 8934C0 80240AA0 0C00A8ED */ jal update_lerp -/* 8934C4 80240AA4 24040001 */ addiu $a0, $zero, 1 -/* 8934C8 80240AA8 C602002C */ lwc1 $f2, 0x2c($s0) -/* 8934CC 80240AAC 46001080 */ add.s $f2, $f2, $f0 -/* 8934D0 80240AB0 26310001 */ addiu $s1, $s1, 1 -/* 8934D4 80240AB4 2A220003 */ slti $v0, $s1, 3 -/* 8934D8 80240AB8 E602002C */ swc1 $f2, 0x2c($s0) -/* 8934DC 80240ABC 1440FFE2 */ bnez $v0, .L80240A48 -/* 8934E0 80240AC0 26100004 */ addiu $s0, $s0, 4 -/* 8934E4 80240AC4 8E420064 */ lw $v0, 0x64($s2) -/* 8934E8 80240AC8 24420001 */ addiu $v0, $v0, 1 -/* 8934EC 80240ACC AE420064 */ sw $v0, 0x64($s2) -/* 8934F0 80240AD0 28420015 */ slti $v0, $v0, 0x15 -/* 8934F4 80240AD4 14400005 */ bnez $v0, .L80240AEC -/* 8934F8 80240AD8 0000882D */ daddu $s1, $zero, $zero -/* 8934FC 80240ADC 24020002 */ addiu $v0, $zero, 2 -.L80240AE0: -/* 893500 80240AE0 AE420004 */ sw $v0, 4($s2) -/* 893504 80240AE4 AE400064 */ sw $zero, 0x64($s2) -/* 893508 80240AE8 0000882D */ daddu $s1, $zero, $zero -.L80240AEC: -/* 89350C 80240AEC 0240282D */ daddu $a1, $s2, $zero -.L80240AF0: -/* 893510 80240AF0 8CA20008 */ lw $v0, 8($a1) -/* 893514 80240AF4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* 893518 80240AF8 8C42000C */ lw $v0, 0xc($v0) -/* 89351C 80240AFC E4400010 */ swc1 $f0, 0x10($v0) -/* 893520 80240B00 8CA20008 */ lw $v0, 8($a1) -/* 893524 80240B04 C4A00020 */ lwc1 $f0, 0x20($a1) -/* 893528 80240B08 8C42000C */ lw $v0, 0xc($v0) -/* 89352C 80240B0C 26310001 */ addiu $s1, $s1, 1 -/* 893530 80240B10 E4400014 */ swc1 $f0, 0x14($v0) -/* 893534 80240B14 8CA20008 */ lw $v0, 8($a1) -/* 893538 80240B18 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 89353C 80240B1C 8C42000C */ lw $v0, 0xc($v0) -/* 893540 80240B20 E4400018 */ swc1 $f0, 0x18($v0) -/* 893544 80240B24 2A220003 */ slti $v0, $s1, 3 -/* 893548 80240B28 1440FFF1 */ bnez $v0, .L80240AF0 -/* 89354C 80240B2C 24A50004 */ addiu $a1, $a1, 4 -/* 893550 80240B30 0000102D */ daddu $v0, $zero, $zero -.L80240B34: -/* 893554 80240B34 8FBF0044 */ lw $ra, 0x44($sp) -/* 893558 80240B38 8FB60040 */ lw $s6, 0x40($sp) -/* 89355C 80240B3C 8FB5003C */ lw $s5, 0x3c($sp) -/* 893560 80240B40 8FB40038 */ lw $s4, 0x38($sp) -/* 893564 80240B44 8FB30034 */ lw $s3, 0x34($sp) -/* 893568 80240B48 8FB20030 */ lw $s2, 0x30($sp) -/* 89356C 80240B4C 8FB1002C */ lw $s1, 0x2c($sp) -/* 893570 80240B50 8FB00028 */ lw $s0, 0x28($sp) -/* 893574 80240B54 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 893578 80240B58 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 89357C 80240B5C D7B40048 */ ldc1 $f20, 0x48($sp) -/* 893580 80240B60 03E00008 */ jr $ra -/* 893584 80240B64 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_tik/tik_17/func_80240CF0_892A20.s b/asm/nonmatchings/world/area_tik/tik_17/func_80240CF0_892A20.s deleted file mode 100644 index 13e3c428cb..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/func_80240CF0_892A20.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CF0_893710 -/* 893710 80240CF0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 893714 80240CF4 AFBF0018 */ sw $ra, 0x18($sp) -/* 893718 80240CF8 0C00EAD2 */ jal get_npc_safe -/* 89371C 80240CFC 2404FFFC */ addiu $a0, $zero, -4 -/* 893720 80240D00 3C0141F0 */ lui $at, 0x41f0 -/* 893724 80240D04 44810000 */ mtc1 $at, $f0 -/* 893728 80240D08 C442003C */ lwc1 $f2, 0x3c($v0) -/* 89372C 80240D0C 46001080 */ add.s $f2, $f2, $f0 -/* 893730 80240D10 E7A00010 */ swc1 $f0, 0x10($sp) -/* 893734 80240D14 8C450038 */ lw $a1, 0x38($v0) -/* 893738 80240D18 8C470040 */ lw $a3, 0x40($v0) -/* 89373C 80240D1C 44061000 */ mfc1 $a2, $f2 -/* 893740 80240D20 0C01BFBC */ jal func_8006FEF0 -/* 893744 80240D24 24040004 */ addiu $a0, $zero, 4 -/* 893748 80240D28 8FBF0018 */ lw $ra, 0x18($sp) -/* 89374C 80240D2C 24020002 */ addiu $v0, $zero, 2 -/* 893750 80240D30 03E00008 */ jr $ra -/* 893754 80240D34 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_17/func_80240DA4_892A20.s b/asm/nonmatchings/world/area_tik/tik_17/func_80240DA4_892A20.s deleted file mode 100644 index 33f3a806a9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/func_80240DA4_892A20.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DA4_8937C4 -/* 8937C4 80240DA4 3C038016 */ lui $v1, 0x8016 -/* 8937C8 80240DA8 8463A552 */ lh $v1, -0x5aae($v1) -/* 8937CC 80240DAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8937D0 80240DB0 AFB00010 */ sw $s0, 0x10($sp) -/* 8937D4 80240DB4 0080802D */ daddu $s0, $a0, $zero -/* 8937D8 80240DB8 AFBF0014 */ sw $ra, 0x14($sp) -/* 8937DC 80240DBC 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8937E0 80240DC0 10620003 */ beq $v1, $v0, .L80240DD0 -/* 8937E4 80240DC4 24020002 */ addiu $v0, $zero, 2 -/* 8937E8 80240DC8 08090394 */ j .L80240E50 -/* 8937EC 80240DCC AE000084 */ sw $zero, 0x84($s0) -.L80240DD0: -/* 8937F0 80240DD0 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 8937F4 80240DD4 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 8937F8 80240DD8 80620040 */ lb $v0, 0x40($v1) -/* 8937FC 80240DDC 80670044 */ lb $a3, 0x44($v1) -/* 893800 80240DE0 04420001 */ bltzl $v0, .L80240DE8 -/* 893804 80240DE4 00021023 */ negu $v0, $v0 -.L80240DE8: -/* 893808 80240DE8 14400003 */ bnez $v0, .L80240DF8 -/* 89380C 80240DEC 00000000 */ nop -/* 893810 80240DF0 50E00017 */ beql $a3, $zero, .L80240E50 -/* 893814 80240DF4 0000102D */ daddu $v0, $zero, $zero -.L80240DF8: -/* 893818 80240DF8 44822000 */ mtc1 $v0, $f4 -/* 89381C 80240DFC 00000000 */ nop -/* 893820 80240E00 46802120 */ cvt.s.w $f4, $f4 -/* 893824 80240E04 44062000 */ mfc1 $a2, $f4 -/* 893828 80240E08 44872000 */ mtc1 $a3, $f4 -/* 89382C 80240E0C 00000000 */ nop -/* 893830 80240E10 46802120 */ cvt.s.w $f4, $f4 -/* 893834 80240E14 44806000 */ mtc1 $zero, $f12 -/* 893838 80240E18 44072000 */ mfc1 $a3, $f4 -/* 89383C 80240E1C 0C00A720 */ jal atan2 -/* 893840 80240E20 46006386 */ mov.s $f14, $f12 -/* 893844 80240E24 3C014270 */ lui $at, 0x4270 -/* 893848 80240E28 44811000 */ mtc1 $at, $f2 -/* 89384C 80240E2C 00000000 */ nop -/* 893850 80240E30 4602003C */ c.lt.s $f0, $f2 -/* 893854 80240E34 00000000 */ nop -/* 893858 80240E38 45000004 */ bc1f .L80240E4C -/* 89385C 80240E3C 24020001 */ addiu $v0, $zero, 1 -/* 893860 80240E40 AE020084 */ sw $v0, 0x84($s0) -/* 893864 80240E44 08090394 */ j .L80240E50 -/* 893868 80240E48 24020002 */ addiu $v0, $zero, 2 -.L80240E4C: -/* 89386C 80240E4C 0000102D */ daddu $v0, $zero, $zero -.L80240E50: -/* 893870 80240E50 8FBF0014 */ lw $ra, 0x14($sp) -/* 893874 80240E54 8FB00010 */ lw $s0, 0x10($sp) -/* 893878 80240E58 03E00008 */ jr $ra -/* 89387C 80240E5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_17/func_80240E60_892A20.s b/asm/nonmatchings/world/area_tik/tik_17/func_80240E60_892A20.s deleted file mode 100644 index b58b05c106..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/func_80240E60_892A20.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E60_893880 -/* 893880 80240E60 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 893884 80240E64 AFB10014 */ sw $s1, 0x14($sp) -/* 893888 80240E68 0080882D */ daddu $s1, $a0, $zero -/* 89388C 80240E6C AFBF001C */ sw $ra, 0x1c($sp) -/* 893890 80240E70 AFB20018 */ sw $s2, 0x18($sp) -/* 893894 80240E74 0C016AFA */ jal get_current_map_header -/* 893898 80240E78 AFB00010 */ sw $s0, 0x10($sp) -/* 89389C 80240E7C 0220202D */ daddu $a0, $s1, $zero -/* 8938A0 80240E80 3C05FE36 */ lui $a1, 0xfe36 -/* 8938A4 80240E84 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8938A8 80240E88 0C0B1EAF */ jal get_variable -/* 8938AC 80240E8C 0040902D */ daddu $s2, $v0, $zero -/* 8938B0 80240E90 0220202D */ daddu $a0, $s1, $zero -/* 8938B4 80240E94 3C05FE36 */ lui $a1, 0xfe36 -/* 8938B8 80240E98 8E430014 */ lw $v1, 0x14($s2) -/* 8938BC 80240E9C 00028100 */ sll $s0, $v0, 4 -/* 8938C0 80240EA0 02031821 */ addu $v1, $s0, $v1 -/* 8938C4 80240EA4 C4600000 */ lwc1 $f0, ($v1) -/* 8938C8 80240EA8 4600008D */ trunc.w.s $f2, $f0 -/* 8938CC 80240EAC 44061000 */ mfc1 $a2, $f2 -/* 8938D0 80240EB0 0C0B2026 */ jal set_variable -/* 8938D4 80240EB4 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8938D8 80240EB8 0220202D */ daddu $a0, $s1, $zero -/* 8938DC 80240EBC 8E420014 */ lw $v0, 0x14($s2) -/* 8938E0 80240EC0 3C05FE36 */ lui $a1, 0xfe36 -/* 8938E4 80240EC4 02021021 */ addu $v0, $s0, $v0 -/* 8938E8 80240EC8 C4400004 */ lwc1 $f0, 4($v0) -/* 8938EC 80240ECC 4600008D */ trunc.w.s $f2, $f0 -/* 8938F0 80240ED0 44061000 */ mfc1 $a2, $f2 -/* 8938F4 80240ED4 0C0B2026 */ jal set_variable -/* 8938F8 80240ED8 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8938FC 80240EDC 0220202D */ daddu $a0, $s1, $zero -/* 893900 80240EE0 8E420014 */ lw $v0, 0x14($s2) -/* 893904 80240EE4 3C05FE36 */ lui $a1, 0xfe36 -/* 893908 80240EE8 02021021 */ addu $v0, $s0, $v0 -/* 89390C 80240EEC C4400008 */ lwc1 $f0, 8($v0) -/* 893910 80240EF0 4600008D */ trunc.w.s $f2, $f0 -/* 893914 80240EF4 44061000 */ mfc1 $a2, $f2 -/* 893918 80240EF8 0C0B2026 */ jal set_variable -/* 89391C 80240EFC 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 893920 80240F00 0220202D */ daddu $a0, $s1, $zero -/* 893924 80240F04 8E420014 */ lw $v0, 0x14($s2) -/* 893928 80240F08 3C05FE36 */ lui $a1, 0xfe36 -/* 89392C 80240F0C 02028021 */ addu $s0, $s0, $v0 -/* 893930 80240F10 C600000C */ lwc1 $f0, 0xc($s0) -/* 893934 80240F14 4600008D */ trunc.w.s $f2, $f0 -/* 893938 80240F18 44061000 */ mfc1 $a2, $f2 -/* 89393C 80240F1C 0C0B2026 */ jal set_variable -/* 893940 80240F20 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 893944 80240F24 8FBF001C */ lw $ra, 0x1c($sp) -/* 893948 80240F28 8FB20018 */ lw $s2, 0x18($sp) -/* 89394C 80240F2C 8FB10014 */ lw $s1, 0x14($sp) -/* 893950 80240F30 8FB00010 */ lw $s0, 0x10($sp) -/* 893954 80240F34 24020002 */ addiu $v0, $zero, 2 -/* 893958 80240F38 03E00008 */ jr $ra -/* 89395C 80240F3C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_17/func_80240FAC_892A20.s b/asm/nonmatchings/world/area_tik/tik_17/func_80240FAC_892A20.s deleted file mode 100644 index c126ddf6d9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/func_80240FAC_892A20.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FAC_8939CC -/* 8939CC 80240FAC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8939D0 80240FB0 AFB00018 */ sw $s0, 0x18($sp) -/* 8939D4 80240FB4 0080802D */ daddu $s0, $a0, $zero -/* 8939D8 80240FB8 AFBF001C */ sw $ra, 0x1c($sp) -/* 8939DC 80240FBC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8939E0 80240FC0 8E02000C */ lw $v0, 0xc($s0) -/* 8939E4 80240FC4 0C0B210B */ jal get_float_variable -/* 8939E8 80240FC8 8C450000 */ lw $a1, ($v0) -/* 8939EC 80240FCC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8939F0 80240FD0 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 8939F4 80240FD4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 8939F8 80240FD8 44060000 */ mfc1 $a2, $f0 -/* 8939FC 80240FDC C4400028 */ lwc1 $f0, 0x28($v0) -/* 893A00 80240FE0 C4420030 */ lwc1 $f2, 0x30($v0) -/* 893A04 80240FE4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 893A08 80240FE8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 893A0C 80240FEC 8C470080 */ lw $a3, 0x80($v0) -/* 893A10 80240FF0 C454002C */ lwc1 $f20, 0x2c($v0) -/* 893A14 80240FF4 0C00A7E7 */ jal add_vec2D_polar -/* 893A18 80240FF8 27A50014 */ addiu $a1, $sp, 0x14 -/* 893A1C 80240FFC 0200202D */ daddu $a0, $s0, $zero -/* 893A20 80241000 3C05FE36 */ lui $a1, 0xfe36 -/* 893A24 80241004 8FA60010 */ lw $a2, 0x10($sp) -/* 893A28 80241008 0C0B2190 */ jal set_float_variable -/* 893A2C 8024100C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 893A30 80241010 0200202D */ daddu $a0, $s0, $zero -/* 893A34 80241014 3C05FE36 */ lui $a1, 0xfe36 -/* 893A38 80241018 4406A000 */ mfc1 $a2, $f20 -/* 893A3C 8024101C 0C0B2190 */ jal set_float_variable -/* 893A40 80241020 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 893A44 80241024 0200202D */ daddu $a0, $s0, $zero -/* 893A48 80241028 3C05FE36 */ lui $a1, 0xfe36 -/* 893A4C 8024102C 8FA60014 */ lw $a2, 0x14($sp) -/* 893A50 80241030 0C0B2190 */ jal set_float_variable -/* 893A54 80241034 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 893A58 80241038 8FBF001C */ lw $ra, 0x1c($sp) -/* 893A5C 8024103C 8FB00018 */ lw $s0, 0x18($sp) -/* 893A60 80241040 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 893A64 80241044 24020002 */ addiu $v0, $zero, 2 -/* 893A68 80241048 03E00008 */ jr $ra -/* 893A6C 8024104C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_18/func_80240124_8956E0.s b/asm/nonmatchings/world/area_tik/tik_18/func_80240124_8956E0.s deleted file mode 100644 index 7ce787f580..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_18/func_80240124_8956E0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_895804 -/* 895804 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 895808 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 89580C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 895810 80240130 10A00005 */ beqz $a1, .L80240148 -/* 895814 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 895818 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 89581C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 895820 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 895824 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 895828 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 89582C 8024014C 1440000E */ bnez $v0, .L80240188 -/* 895830 80240150 00000000 */ nop -/* 895834 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 895838 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 89583C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 895840 80240160 04610004 */ bgez $v1, .L80240174 -/* 895844 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 895848 80240168 3C020002 */ lui $v0, 2 -/* 89584C 8024016C 08090061 */ j .L80240184 -/* 895850 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 895854 80240174 3C040002 */ lui $a0, 2 -/* 895858 80240178 0083102A */ slt $v0, $a0, $v1 -/* 89585C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 895860 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 895864 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 895868 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 89586C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 895870 80240190 00000000 */ nop -/* 895874 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 895878 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 89587C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 895880 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 895884 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 895888 802401A8 3C020002 */ lui $v0, 2 -/* 89588C 802401AC 08090071 */ j .L802401C4 -/* 895890 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 895894 802401B4 3C040002 */ lui $a0, 2 -/* 895898 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 89589C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 8958A0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 8958A4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 8958A8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 8958AC 802401CC 1440000E */ bnez $v0, .L80240208 -/* 8958B0 802401D0 00000000 */ nop -/* 8958B4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 8958B8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 8958BC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 8958C0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 8958C4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8958C8 802401E8 3C020002 */ lui $v0, 2 -/* 8958CC 802401EC 08090081 */ j .L80240204 -/* 8958D0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 8958D4 802401F4 3C040002 */ lui $a0, 2 -/* 8958D8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 8958DC 802401FC 10400002 */ beqz $v0, .L80240208 -/* 8958E0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 8958E4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 8958E8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 8958EC 8024020C 1440000E */ bnez $v0, .L80240248 -/* 8958F0 80240210 00000000 */ nop -/* 8958F4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8958F8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 8958FC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 895900 80240220 04610004 */ bgez $v1, .L80240234 -/* 895904 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 895908 80240228 3C020002 */ lui $v0, 2 -/* 89590C 8024022C 08090091 */ j .L80240244 -/* 895910 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 895914 80240234 3C040002 */ lui $a0, 2 -/* 895918 80240238 0083102A */ slt $v0, $a0, $v1 -/* 89591C 8024023C 10400002 */ beqz $v0, .L80240248 -/* 895920 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 895924 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 895928 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 89592C 8024024C 0C046F07 */ jal set_main_pan_u -/* 895930 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 895934 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 895938 80240258 0C046F0D */ jal set_main_pan_v -/* 89593C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 895940 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 895944 80240264 0C046F13 */ jal set_aux_pan_u -/* 895948 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 89594C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 895950 80240270 0C046F19 */ jal set_aux_pan_v -/* 895954 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 895958 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 89595C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 895960 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 895964 80240284 24420001 */ addiu $v0, $v0, 1 -/* 895968 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 89596C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 895970 80240290 24630001 */ addiu $v1, $v1, 1 -/* 895974 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 895978 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 89597C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 895980 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 895984 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 895988 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 89598C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 895990 802402B0 14600002 */ bnez $v1, .L802402BC -/* 895994 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 895998 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 89599C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 8959A0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 8959A4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 8959A8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 8959AC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 8959B0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 8959B4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 8959B8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 8959BC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 8959C0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 8959C4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 8959C8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 8959CC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 8959D0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 8959D4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 8959D8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8959DC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 8959E0 80240300 0000102D */ daddu $v0, $zero, $zero -/* 8959E4 80240304 03E00008 */ jr $ra -/* 8959E8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8959EC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_18/func_80240310_8956E0.s b/asm/nonmatchings/world/area_tik/tik_18/func_80240310_8956E0.s deleted file mode 100644 index baff492cc7..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_18/func_80240310_8956E0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_8959F0 -/* 8959F0 80240310 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8959F4 80240314 AFB3001C */ sw $s3, 0x1c($sp) -/* 8959F8 80240318 0080982D */ daddu $s3, $a0, $zero -/* 8959FC 8024031C AFBF0020 */ sw $ra, 0x20($sp) -/* 895A00 80240320 AFB20018 */ sw $s2, 0x18($sp) -/* 895A04 80240324 AFB10014 */ sw $s1, 0x14($sp) -/* 895A08 80240328 AFB00010 */ sw $s0, 0x10($sp) -/* 895A0C 8024032C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 895A10 80240330 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 895A14 80240334 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 895A18 80240338 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 895A1C 8024033C 8E62000C */ lw $v0, 0xc($s3) -/* 895A20 80240340 0C0B1EAF */ jal get_variable -/* 895A24 80240344 8C450000 */ lw $a1, ($v0) -/* 895A28 80240348 2404FFFC */ addiu $a0, $zero, -4 -/* 895A2C 8024034C 0C00EABB */ jal get_npc_unsafe -/* 895A30 80240350 0040802D */ daddu $s0, $v0, $zero -/* 895A34 80240354 0200202D */ daddu $a0, $s0, $zero -/* 895A38 80240358 0C046C04 */ jal get_model_list_index_from_tree_index -/* 895A3C 8024035C 0040802D */ daddu $s0, $v0, $zero -/* 895A40 80240360 0C046B4C */ jal get_model_from_list_index -/* 895A44 80240364 0040202D */ daddu $a0, $v0, $zero -/* 895A48 80240368 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 895A4C 8024036C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 895A50 80240370 0040902D */ daddu $s2, $v0, $zero -/* 895A54 80240374 AE60008C */ sw $zero, 0x8c($s3) -/* 895A58 80240378 C4620028 */ lwc1 $f2, 0x28($v1) -/* 895A5C 8024037C C6400098 */ lwc1 $f0, 0x98($s2) -/* 895A60 80240380 46001081 */ sub.s $f2, $f2, $f0 -/* 895A64 80240384 46021182 */ mul.s $f6, $f2, $f2 -/* 895A68 80240388 00000000 */ nop -/* 895A6C 8024038C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 895A70 80240390 C4620030 */ lwc1 $f2, 0x30($v1) -/* 895A74 80240394 46001081 */ sub.s $f2, $f2, $f0 -/* 895A78 80240398 46021102 */ mul.s $f4, $f2, $f2 -/* 895A7C 8024039C 00000000 */ nop -/* 895A80 802403A0 846200B0 */ lh $v0, 0xb0($v1) -/* 895A84 802403A4 C462002C */ lwc1 $f2, 0x2c($v1) -/* 895A88 802403A8 44820000 */ mtc1 $v0, $f0 -/* 895A8C 802403AC 00000000 */ nop -/* 895A90 802403B0 46800020 */ cvt.s.w $f0, $f0 -/* 895A94 802403B4 46001080 */ add.s $f2, $f2, $f0 -/* 895A98 802403B8 3C013FC0 */ lui $at, 0x3fc0 -/* 895A9C 802403BC 44810000 */ mtc1 $at, $f0 -/* 895AA0 802403C0 00000000 */ nop -/* 895AA4 802403C4 46001081 */ sub.s $f2, $f2, $f0 -/* 895AA8 802403C8 46043300 */ add.s $f12, $f6, $f4 -/* 895AAC 802403CC C640009C */ lwc1 $f0, 0x9c($s2) -/* 895AB0 802403D0 46001501 */ sub.s $f20, $f2, $f0 -/* 895AB4 802403D4 46006084 */ sqrt.s $f2, $f12 -/* 895AB8 802403D8 46021032 */ c.eq.s $f2, $f2 -/* 895ABC 802403DC 00000000 */ nop -/* 895AC0 802403E0 45010004 */ bc1t .L802403F4 -/* 895AC4 802403E4 0060882D */ daddu $s1, $v1, $zero -/* 895AC8 802403E8 0C0187BC */ jal sqrtf -/* 895ACC 802403EC 00000000 */ nop -/* 895AD0 802403F0 46000086 */ mov.s $f2, $f0 -.L802403F4: -/* 895AD4 802403F4 44800000 */ mtc1 $zero, $f0 -/* 895AD8 802403F8 00000000 */ nop -/* 895ADC 802403FC 4614003C */ c.lt.s $f0, $f20 -/* 895AE0 80240400 00000000 */ nop -/* 895AE4 80240404 45000016 */ bc1f .L80240460 -/* 895AE8 80240408 46001106 */ mov.s $f4, $f2 -/* 895AEC 8024040C 862200B0 */ lh $v0, 0xb0($s1) -/* 895AF0 80240410 44820000 */ mtc1 $v0, $f0 -/* 895AF4 80240414 00000000 */ nop -/* 895AF8 80240418 46800020 */ cvt.s.w $f0, $f0 -/* 895AFC 8024041C 4600A03C */ c.lt.s $f20, $f0 -/* 895B00 80240420 00000000 */ nop -/* 895B04 80240424 4500000E */ bc1f .L80240460 -/* 895B08 80240428 00000000 */ nop -/* 895B0C 8024042C 862200B2 */ lh $v0, 0xb2($s1) -/* 895B10 80240430 3C013F00 */ lui $at, 0x3f00 -/* 895B14 80240434 44811000 */ mtc1 $at, $f2 -/* 895B18 80240438 44820000 */ mtc1 $v0, $f0 -/* 895B1C 8024043C 00000000 */ nop -/* 895B20 80240440 46800020 */ cvt.s.w $f0, $f0 -/* 895B24 80240444 46020002 */ mul.s $f0, $f0, $f2 -/* 895B28 80240448 00000000 */ nop -/* 895B2C 8024044C 4600203C */ c.lt.s $f4, $f0 -/* 895B30 80240450 00000000 */ nop -/* 895B34 80240454 45000002 */ bc1f .L80240460 -/* 895B38 80240458 24020001 */ addiu $v0, $zero, 1 -/* 895B3C 8024045C AE62008C */ sw $v0, 0x8c($s3) -.L80240460: -/* 895B40 80240460 C6020038 */ lwc1 $f2, 0x38($s0) -/* 895B44 80240464 C6400098 */ lwc1 $f0, 0x98($s2) -/* 895B48 80240468 46001081 */ sub.s $f2, $f2, $f0 -/* 895B4C 8024046C 46021182 */ mul.s $f6, $f2, $f2 -/* 895B50 80240470 00000000 */ nop -/* 895B54 80240474 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 895B58 80240478 C6020040 */ lwc1 $f2, 0x40($s0) -/* 895B5C 8024047C 46001081 */ sub.s $f2, $f2, $f0 -/* 895B60 80240480 46021102 */ mul.s $f4, $f2, $f2 -/* 895B64 80240484 00000000 */ nop -/* 895B68 80240488 860200A8 */ lh $v0, 0xa8($s0) -/* 895B6C 8024048C C602003C */ lwc1 $f2, 0x3c($s0) -/* 895B70 80240490 44820000 */ mtc1 $v0, $f0 -/* 895B74 80240494 00000000 */ nop -/* 895B78 80240498 46800020 */ cvt.s.w $f0, $f0 -/* 895B7C 8024049C 46001080 */ add.s $f2, $f2, $f0 -/* 895B80 802404A0 3C013FC0 */ lui $at, 0x3fc0 -/* 895B84 802404A4 44810000 */ mtc1 $at, $f0 -/* 895B88 802404A8 00000000 */ nop -/* 895B8C 802404AC 46001081 */ sub.s $f2, $f2, $f0 -/* 895B90 802404B0 46043300 */ add.s $f12, $f6, $f4 -/* 895B94 802404B4 C640009C */ lwc1 $f0, 0x9c($s2) -/* 895B98 802404B8 46001501 */ sub.s $f20, $f2, $f0 -/* 895B9C 802404BC 46006084 */ sqrt.s $f2, $f12 -/* 895BA0 802404C0 46021032 */ c.eq.s $f2, $f2 -/* 895BA4 802404C4 00000000 */ nop -/* 895BA8 802404C8 45010004 */ bc1t .L802404DC -/* 895BAC 802404CC 00000000 */ nop -/* 895BB0 802404D0 0C0187BC */ jal sqrtf -/* 895BB4 802404D4 00000000 */ nop -/* 895BB8 802404D8 46000086 */ mov.s $f2, $f0 -.L802404DC: -/* 895BBC 802404DC 44800000 */ mtc1 $zero, $f0 -/* 895BC0 802404E0 00000000 */ nop -/* 895BC4 802404E4 4614003C */ c.lt.s $f0, $f20 -/* 895BC8 802404E8 00000000 */ nop -/* 895BCC 802404EC 45000016 */ bc1f .L80240548 -/* 895BD0 802404F0 46001106 */ mov.s $f4, $f2 -/* 895BD4 802404F4 860200A8 */ lh $v0, 0xa8($s0) -/* 895BD8 802404F8 44820000 */ mtc1 $v0, $f0 -/* 895BDC 802404FC 00000000 */ nop -/* 895BE0 80240500 46800020 */ cvt.s.w $f0, $f0 -/* 895BE4 80240504 4600A03C */ c.lt.s $f20, $f0 -/* 895BE8 80240508 00000000 */ nop -/* 895BEC 8024050C 4500000F */ bc1f .L8024054C -/* 895BF0 80240510 0000882D */ daddu $s1, $zero, $zero -/* 895BF4 80240514 860200A6 */ lh $v0, 0xa6($s0) -/* 895BF8 80240518 3C013F00 */ lui $at, 0x3f00 -/* 895BFC 8024051C 44811000 */ mtc1 $at, $f2 -/* 895C00 80240520 44820000 */ mtc1 $v0, $f0 -/* 895C04 80240524 00000000 */ nop -/* 895C08 80240528 46800020 */ cvt.s.w $f0, $f0 -/* 895C0C 8024052C 46020002 */ mul.s $f0, $f0, $f2 -/* 895C10 80240530 00000000 */ nop -/* 895C14 80240534 4600203C */ c.lt.s $f4, $f0 -/* 895C18 80240538 00000000 */ nop -/* 895C1C 8024053C 45000003 */ bc1f .L8024054C -/* 895C20 80240540 24020001 */ addiu $v0, $zero, 1 -/* 895C24 80240544 AE62008C */ sw $v0, 0x8c($s3) -.L80240548: -/* 895C28 80240548 0000882D */ daddu $s1, $zero, $zero -.L8024054C: -/* 895C2C 8024054C 3C013FC0 */ lui $at, 0x3fc0 -/* 895C30 80240550 4481D000 */ mtc1 $at, $f26 -/* 895C34 80240554 4480C000 */ mtc1 $zero, $f24 -/* 895C38 80240558 3C013F00 */ lui $at, 0x3f00 -/* 895C3C 8024055C 4481B000 */ mtc1 $at, $f22 -.L80240560: -/* 895C40 80240560 0C00EAD2 */ jal get_npc_safe -/* 895C44 80240564 0220202D */ daddu $a0, $s1, $zero -/* 895C48 80240568 0040802D */ daddu $s0, $v0, $zero -/* 895C4C 8024056C 52000035 */ beql $s0, $zero, .L80240644 -/* 895C50 80240570 26310001 */ addiu $s1, $s1, 1 -/* 895C54 80240574 C6020038 */ lwc1 $f2, 0x38($s0) -/* 895C58 80240578 C6400098 */ lwc1 $f0, 0x98($s2) -/* 895C5C 8024057C 46001081 */ sub.s $f2, $f2, $f0 -/* 895C60 80240580 46021182 */ mul.s $f6, $f2, $f2 -/* 895C64 80240584 00000000 */ nop -/* 895C68 80240588 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 895C6C 8024058C C6020040 */ lwc1 $f2, 0x40($s0) -/* 895C70 80240590 46001081 */ sub.s $f2, $f2, $f0 -/* 895C74 80240594 46021102 */ mul.s $f4, $f2, $f2 -/* 895C78 80240598 00000000 */ nop -/* 895C7C 8024059C 860200A8 */ lh $v0, 0xa8($s0) -/* 895C80 802405A0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 895C84 802405A4 44820000 */ mtc1 $v0, $f0 -/* 895C88 802405A8 00000000 */ nop -/* 895C8C 802405AC 46800020 */ cvt.s.w $f0, $f0 -/* 895C90 802405B0 46001080 */ add.s $f2, $f2, $f0 -/* 895C94 802405B4 461A1081 */ sub.s $f2, $f2, $f26 -/* 895C98 802405B8 46043300 */ add.s $f12, $f6, $f4 -/* 895C9C 802405BC C640009C */ lwc1 $f0, 0x9c($s2) -/* 895CA0 802405C0 46001501 */ sub.s $f20, $f2, $f0 -/* 895CA4 802405C4 46006004 */ sqrt.s $f0, $f12 -/* 895CA8 802405C8 46000032 */ c.eq.s $f0, $f0 -/* 895CAC 802405CC 00000000 */ nop -/* 895CB0 802405D0 45010003 */ bc1t .L802405E0 -/* 895CB4 802405D4 00000000 */ nop -/* 895CB8 802405D8 0C0187BC */ jal sqrtf -/* 895CBC 802405DC 00000000 */ nop -.L802405E0: -/* 895CC0 802405E0 4614C03C */ c.lt.s $f24, $f20 -/* 895CC4 802405E4 00000000 */ nop -/* 895CC8 802405E8 45000015 */ bc1f .L80240640 -/* 895CCC 802405EC 46000106 */ mov.s $f4, $f0 -/* 895CD0 802405F0 860200A8 */ lh $v0, 0xa8($s0) -/* 895CD4 802405F4 44820000 */ mtc1 $v0, $f0 -/* 895CD8 802405F8 00000000 */ nop -/* 895CDC 802405FC 46800020 */ cvt.s.w $f0, $f0 -/* 895CE0 80240600 4600A03C */ c.lt.s $f20, $f0 -/* 895CE4 80240604 00000000 */ nop -/* 895CE8 80240608 4500000E */ bc1f .L80240644 -/* 895CEC 8024060C 26310001 */ addiu $s1, $s1, 1 -/* 895CF0 80240610 860200A6 */ lh $v0, 0xa6($s0) -/* 895CF4 80240614 44820000 */ mtc1 $v0, $f0 -/* 895CF8 80240618 00000000 */ nop -/* 895CFC 8024061C 46800020 */ cvt.s.w $f0, $f0 -/* 895D00 80240620 46160002 */ mul.s $f0, $f0, $f22 -/* 895D04 80240624 00000000 */ nop -/* 895D08 80240628 4600203C */ c.lt.s $f4, $f0 -/* 895D0C 8024062C 00000000 */ nop -/* 895D10 80240630 45000004 */ bc1f .L80240644 -/* 895D14 80240634 24020001 */ addiu $v0, $zero, 1 -/* 895D18 80240638 08090194 */ j .L80240650 -/* 895D1C 8024063C AE62008C */ sw $v0, 0x8c($s3) -.L80240640: -/* 895D20 80240640 26310001 */ addiu $s1, $s1, 1 -.L80240644: -/* 895D24 80240644 2A220040 */ slti $v0, $s1, 0x40 -/* 895D28 80240648 1440FFC5 */ bnez $v0, .L80240560 -/* 895D2C 8024064C 00000000 */ nop -.L80240650: -/* 895D30 80240650 8FBF0020 */ lw $ra, 0x20($sp) -/* 895D34 80240654 8FB3001C */ lw $s3, 0x1c($sp) -/* 895D38 80240658 8FB20018 */ lw $s2, 0x18($sp) -/* 895D3C 8024065C 8FB10014 */ lw $s1, 0x14($sp) -/* 895D40 80240660 8FB00010 */ lw $s0, 0x10($sp) -/* 895D44 80240664 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 895D48 80240668 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 895D4C 8024066C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 895D50 80240670 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 895D54 80240674 24020002 */ addiu $v0, $zero, 2 -/* 895D58 80240678 03E00008 */ jr $ra -/* 895D5C 8024067C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_18/func_80240680_8956E0.s b/asm/nonmatchings/world/area_tik/tik_18/func_80240680_8956E0.s deleted file mode 100644 index 73b50b2f70..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_18/func_80240680_8956E0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240680_895D60 -/* 895D60 80240680 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 895D64 80240684 AFBF0010 */ sw $ra, 0x10($sp) -/* 895D68 80240688 0C00FB5A */ jal get_enemy_safe -/* 895D6C 8024068C 24040001 */ addiu $a0, $zero, 1 -/* 895D70 80240690 0040182D */ daddu $v1, $v0, $zero -/* 895D74 80240694 10600002 */ beqz $v1, .L802406A0 -/* 895D78 80240698 24020001 */ addiu $v0, $zero, 1 -/* 895D7C 8024069C AC62006C */ sw $v0, 0x6c($v1) -.L802406A0: -/* 895D80 802406A0 8FBF0010 */ lw $ra, 0x10($sp) -/* 895D84 802406A4 24020002 */ addiu $v0, $zero, 2 -/* 895D88 802406A8 03E00008 */ jr $ra -/* 895D8C 802406AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_19/func_80240020_8975E0.s b/asm/nonmatchings/world/area_tik/tik_19/func_80240020_8975E0.s deleted file mode 100644 index d0b5544cc9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/func_80240020_8975E0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_897600 -/* 897600 80240020 3C028016 */ lui $v0, 0x8016 -/* 897604 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 897608 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 89760C 8024002C 03E00008 */ jr $ra -/* 897610 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_19/func_80240034_8975E0.s b/asm/nonmatchings/world/area_tik/tik_19/func_80240034_8975E0.s deleted file mode 100644 index 93398bfb03..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/func_80240034_8975E0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_897614 -/* 897614 80240034 3C038016 */ lui $v1, 0x8016 -/* 897618 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* 89761C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 897620 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 897624 80240044 0080802D */ daddu $s0, $a0, $zero -/* 897628 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* 89762C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 897630 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* 897634 80240054 24020002 */ addiu $v0, $zero, 2 -/* 897638 80240058 08090038 */ j .L802400E0 -/* 89763C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* 897640 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 897644 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 897648 80240068 80620040 */ lb $v0, 0x40($v1) -/* 89764C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* 897650 80240070 04420001 */ bltzl $v0, .L80240078 -/* 897654 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* 897658 80240078 14400003 */ bnez $v0, .L80240088 -/* 89765C 8024007C 00000000 */ nop -/* 897660 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* 897664 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* 897668 80240088 44822000 */ mtc1 $v0, $f4 -/* 89766C 8024008C 00000000 */ nop -/* 897670 80240090 46802120 */ cvt.s.w $f4, $f4 -/* 897674 80240094 44062000 */ mfc1 $a2, $f4 -/* 897678 80240098 44872000 */ mtc1 $a3, $f4 -/* 89767C 8024009C 00000000 */ nop -/* 897680 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* 897684 802400A4 44806000 */ mtc1 $zero, $f12 -/* 897688 802400A8 44072000 */ mfc1 $a3, $f4 -/* 89768C 802400AC 0C00A720 */ jal atan2 -/* 897690 802400B0 46006386 */ mov.s $f14, $f12 -/* 897694 802400B4 3C014270 */ lui $at, 0x4270 -/* 897698 802400B8 44811000 */ mtc1 $at, $f2 -/* 89769C 802400BC 00000000 */ nop -/* 8976A0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 8976A4 802400C4 00000000 */ nop -/* 8976A8 802400C8 45000004 */ bc1f .L802400DC -/* 8976AC 802400CC 24020001 */ addiu $v0, $zero, 1 -/* 8976B0 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* 8976B4 802400D4 08090038 */ j .L802400E0 -/* 8976B8 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* 8976BC 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* 8976C0 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8976C4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 8976C8 802400E8 03E00008 */ jr $ra -/* 8976CC 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_19/func_802400F0_8975E0.s b/asm/nonmatchings/world/area_tik/tik_19/func_802400F0_8975E0.s deleted file mode 100644 index 9e98bed448..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/func_802400F0_8975E0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8976D0 -/* 8976D0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8976D4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8976D8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8976DC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 8976E0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 8976E4 80240104 0C016AFA */ jal get_current_map_header -/* 8976E8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 8976EC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 8976F0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 8976F4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8976F8 80240118 0C0B1EAF */ jal get_variable -/* 8976FC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 897700 80240120 0220202D */ daddu $a0, $s1, $zero -/* 897704 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 897708 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 89770C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 897710 80240130 02031821 */ addu $v1, $s0, $v1 -/* 897714 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 897718 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 89771C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 897720 80240140 0C0B2026 */ jal set_variable -/* 897724 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 897728 80240148 0220202D */ daddu $a0, $s1, $zero -/* 89772C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 897730 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 897734 80240154 02021021 */ addu $v0, $s0, $v0 -/* 897738 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 89773C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 897740 80240160 44061000 */ mfc1 $a2, $f2 -/* 897744 80240164 0C0B2026 */ jal set_variable -/* 897748 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 89774C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 897750 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 897754 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 897758 80240178 02021021 */ addu $v0, $s0, $v0 -/* 89775C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 897760 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 897764 80240184 44061000 */ mfc1 $a2, $f2 -/* 897768 80240188 0C0B2026 */ jal set_variable -/* 89776C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 897770 80240190 0220202D */ daddu $a0, $s1, $zero -/* 897774 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 897778 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 89777C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 897780 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 897784 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 897788 802401A8 44061000 */ mfc1 $a2, $f2 -/* 89778C 802401AC 0C0B2026 */ jal set_variable -/* 897790 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 897794 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 897798 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 89779C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 8977A0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 8977A4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 8977A8 802401C8 03E00008 */ jr $ra -/* 8977AC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_19/func_802401D0_8975E0.s b/asm/nonmatchings/world/area_tik/tik_19/func_802401D0_8975E0.s deleted file mode 100644 index 6d5c4042d1..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/func_802401D0_8975E0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_8977B0 -/* 8977B0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8977B4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8977B8 802401D8 3C014334 */ lui $at, 0x4334 -/* 8977BC 802401DC 44816000 */ mtc1 $at, $f12 -/* 8977C0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8977C4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8977C8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 8977CC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 8977D0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 8977D4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 8977D8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 8977DC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 8977E0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 8977E4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 8977E8 80240208 3C01800B */ lui $at, 0x800b -/* 8977EC 8024020C 00220821 */ addu $at, $at, $v0 -/* 8977F0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8977F4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 8977F8 80240218 0C00A6C9 */ jal clamp_angle -/* 8977FC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 897800 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 897804 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 897808 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 89780C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 897810 80240230 24020002 */ addiu $v0, $zero, 2 -/* 897814 80240234 03E00008 */ jr $ra -/* 897818 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_19/func_8024023C_8975E0.s b/asm/nonmatchings/world/area_tik/tik_19/func_8024023C_8975E0.s deleted file mode 100644 index 0264025c88..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/func_8024023C_8975E0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_89781C -/* 89781C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 897820 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 897824 80240244 0080802D */ daddu $s0, $a0, $zero -/* 897828 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 89782C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 897830 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 897834 80240254 0C0B210B */ jal get_float_variable -/* 897838 80240258 8C450000 */ lw $a1, ($v0) -/* 89783C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 897840 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 897844 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 897848 80240268 44060000 */ mfc1 $a2, $f0 -/* 89784C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 897850 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 897854 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 897858 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 89785C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 897860 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 897864 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 897868 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 89786C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 897870 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 897874 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 897878 80240298 0C0B2190 */ jal set_float_variable -/* 89787C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 897880 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 897884 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 897888 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 89788C 802402AC 0C0B2190 */ jal set_float_variable -/* 897890 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 897894 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 897898 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 89789C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 8978A0 802402C0 0C0B2190 */ jal set_float_variable -/* 8978A4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8978A8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 8978AC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 8978B0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8978B4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 8978B8 802402D8 03E00008 */ jr $ra -/* 8978BC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_19/func_802402E0_8975E0.s b/asm/nonmatchings/world/area_tik/tik_19/func_802402E0_8975E0.s deleted file mode 100644 index 819eebc93e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/func_802402E0_8975E0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_8978C0 -/* 8978C0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8978C4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 8978C8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 8978CC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 8978D0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8978D4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 8978D8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 8978DC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 8978E0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8978E4 80240304 3C020002 */ lui $v0, 2 -/* 8978E8 80240308 080900C8 */ j .L80240320 -/* 8978EC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 8978F0 80240310 3C040002 */ lui $a0, 2 -/* 8978F4 80240314 0083102A */ slt $v0, $a0, $v1 -/* 8978F8 80240318 10400002 */ beqz $v0, .L80240324 -/* 8978FC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 897900 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 897904 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 897908 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 89790C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 897910 80240330 04610004 */ bgez $v1, .L80240344 -/* 897914 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 897918 80240338 3C020002 */ lui $v0, 2 -/* 89791C 8024033C 080900D5 */ j .L80240354 -/* 897920 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 897924 80240344 3C040002 */ lui $a0, 2 -/* 897928 80240348 0083102A */ slt $v0, $a0, $v1 -/* 89792C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 897930 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 897934 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 897938 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 89793C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 897940 80240360 00621821 */ addu $v1, $v1, $v0 -/* 897944 80240364 04610004 */ bgez $v1, .L80240378 -/* 897948 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 89794C 8024036C 3C020002 */ lui $v0, 2 -/* 897950 80240370 080900E2 */ j .L80240388 -/* 897954 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 897958 80240378 3C040002 */ lui $a0, 2 -/* 89795C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 897960 80240380 10400002 */ beqz $v0, .L8024038C -/* 897964 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 897968 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 89796C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 897970 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 897974 80240394 00621821 */ addu $v1, $v1, $v0 -/* 897978 80240398 04610004 */ bgez $v1, .L802403AC -/* 89797C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 897980 802403A0 3C020002 */ lui $v0, 2 -/* 897984 802403A4 080900EF */ j .L802403BC -/* 897988 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 89798C 802403AC 3C040002 */ lui $a0, 2 -/* 897990 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 897994 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 897998 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 89799C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 8979A0 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 8979A4 802403C4 0C046F07 */ jal set_main_pan_u -/* 8979A8 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8979AC 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 8979B0 802403D0 0C046F0D */ jal set_main_pan_v -/* 8979B4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 8979B8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 8979BC 802403DC 0C046F13 */ jal set_aux_pan_u -/* 8979C0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8979C4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 8979C8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 8979CC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8979D0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8979D4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 8979D8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 8979DC 802403FC 03E00008 */ jr $ra -/* 8979E0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_19/func_80240404_8975E0.s b/asm/nonmatchings/world/area_tik/tik_19/func_80240404_8975E0.s deleted file mode 100644 index 85ff422978..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/func_80240404_8975E0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_8979E4 -/* 8979E4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8979E8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 8979EC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 8979F0 80240410 10A00005 */ beqz $a1, .L80240428 -/* 8979F4 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 8979F8 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 8979FC 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 897A00 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 897A04 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 897A08 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 897A0C 8024042C 1440000E */ bnez $v0, .L80240468 -/* 897A10 80240430 00000000 */ nop -/* 897A14 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 897A18 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 897A1C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 897A20 80240440 04610004 */ bgez $v1, .L80240454 -/* 897A24 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 897A28 80240448 3C020002 */ lui $v0, 2 -/* 897A2C 8024044C 08090119 */ j .L80240464 -/* 897A30 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 897A34 80240454 3C040002 */ lui $a0, 2 -/* 897A38 80240458 0083102A */ slt $v0, $a0, $v1 -/* 897A3C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 897A40 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 897A44 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 897A48 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 897A4C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 897A50 80240470 00000000 */ nop -/* 897A54 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 897A58 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 897A5C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 897A60 80240480 04610004 */ bgez $v1, .L80240494 -/* 897A64 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 897A68 80240488 3C020002 */ lui $v0, 2 -/* 897A6C 8024048C 08090129 */ j .L802404A4 -/* 897A70 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 897A74 80240494 3C040002 */ lui $a0, 2 -/* 897A78 80240498 0083102A */ slt $v0, $a0, $v1 -/* 897A7C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 897A80 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 897A84 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 897A88 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 897A8C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 897A90 802404B0 00000000 */ nop -/* 897A94 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 897A98 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 897A9C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 897AA0 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 897AA4 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 897AA8 802404C8 3C020002 */ lui $v0, 2 -/* 897AAC 802404CC 08090139 */ j .L802404E4 -/* 897AB0 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 897AB4 802404D4 3C040002 */ lui $a0, 2 -/* 897AB8 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 897ABC 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 897AC0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 897AC4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 897AC8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 897ACC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 897AD0 802404F0 00000000 */ nop -/* 897AD4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 897AD8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 897ADC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 897AE0 80240500 04610004 */ bgez $v1, .L80240514 -/* 897AE4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 897AE8 80240508 3C020002 */ lui $v0, 2 -/* 897AEC 8024050C 08090149 */ j .L80240524 -/* 897AF0 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 897AF4 80240514 3C040002 */ lui $a0, 2 -/* 897AF8 80240518 0083102A */ slt $v0, $a0, $v1 -/* 897AFC 8024051C 10400002 */ beqz $v0, .L80240528 -/* 897B00 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 897B04 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 897B08 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 897B0C 8024052C 0C046F07 */ jal set_main_pan_u -/* 897B10 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 897B14 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 897B18 80240538 0C046F0D */ jal set_main_pan_v -/* 897B1C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 897B20 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 897B24 80240544 0C046F13 */ jal set_aux_pan_u -/* 897B28 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 897B2C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 897B30 80240550 0C046F19 */ jal set_aux_pan_v -/* 897B34 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 897B38 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 897B3C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 897B40 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 897B44 80240564 24420001 */ addiu $v0, $v0, 1 -/* 897B48 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 897B4C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 897B50 80240570 24630001 */ addiu $v1, $v1, 1 -/* 897B54 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 897B58 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 897B5C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 897B60 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 897B64 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 897B68 80240588 0064182A */ slt $v1, $v1, $a0 -/* 897B6C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 897B70 80240590 14600002 */ bnez $v1, .L8024059C -/* 897B74 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 897B78 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 897B7C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 897B80 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 897B84 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 897B88 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 897B8C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 897B90 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 897B94 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 897B98 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 897B9C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 897BA0 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 897BA4 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 897BA8 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 897BAC 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 897BB0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 897BB4 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 897BB8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 897BBC 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 897BC0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 897BC4 802405E4 03E00008 */ jr $ra -/* 897BC8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 897BCC 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_19/func_802405F0_8975E0.s b/asm/nonmatchings/world/area_tik/tik_19/func_802405F0_8975E0.s deleted file mode 100644 index e969a5f423..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/func_802405F0_8975E0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_897BD0 -/* 897BD0 802405F0 3C03800A */ lui $v1, %hi(D_8009A650) -/* 897BD4 802405F4 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 897BD8 802405F8 8C620000 */ lw $v0, ($v1) -/* 897BDC 802405FC 34420040 */ ori $v0, $v0, 0x40 -/* 897BE0 80240600 AC620000 */ sw $v0, ($v1) -/* 897BE4 80240604 03E00008 */ jr $ra -/* 897BE8 80240608 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_19/func_80240658_8975E0.s b/asm/nonmatchings/world/area_tik/tik_19/func_80240658_8975E0.s deleted file mode 100644 index 3f36040e96..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/func_80240658_8975E0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240658_897C38 -/* 897C38 80240658 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 897C3C 8024065C AFB00010 */ sw $s0, 0x10($sp) -/* 897C40 80240660 0080802D */ daddu $s0, $a0, $zero -/* 897C44 80240664 AFBF0018 */ sw $ra, 0x18($sp) -/* 897C48 80240668 AFB10014 */ sw $s1, 0x14($sp) -/* 897C4C 8024066C 8E11000C */ lw $s1, 0xc($s0) -/* 897C50 80240670 8E250000 */ lw $a1, ($s1) -/* 897C54 80240674 0C0B1EAF */ jal get_variable -/* 897C58 80240678 26310004 */ addiu $s1, $s1, 4 -/* 897C5C 8024067C 0200202D */ daddu $a0, $s0, $zero -/* 897C60 80240680 3C038011 */ lui $v1, %hi(gPlayerData) -/* 897C64 80240684 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 897C68 80240688 000210C0 */ sll $v0, $v0, 3 -/* 897C6C 8024068C 00431021 */ addu $v0, $v0, $v1 -/* 897C70 80240690 90460015 */ lbu $a2, 0x15($v0) -/* 897C74 80240694 8E250000 */ lw $a1, ($s1) -/* 897C78 80240698 24C60001 */ addiu $a2, $a2, 1 -/* 897C7C 8024069C A0460015 */ sb $a2, 0x15($v0) -/* 897C80 802406A0 00063600 */ sll $a2, $a2, 0x18 -/* 897C84 802406A4 0C0B2026 */ jal set_variable -/* 897C88 802406A8 00063603 */ sra $a2, $a2, 0x18 -/* 897C8C 802406AC 8FBF0018 */ lw $ra, 0x18($sp) -/* 897C90 802406B0 8FB10014 */ lw $s1, 0x14($sp) -/* 897C94 802406B4 8FB00010 */ lw $s0, 0x10($sp) -/* 897C98 802406B8 24020002 */ addiu $v0, $zero, 2 -/* 897C9C 802406BC 03E00008 */ jr $ra -/* 897CA0 802406C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_19/func_80240B00_8975E0.s b/asm/nonmatchings/world/area_tik/tik_19/func_80240B00_8975E0.s deleted file mode 100644 index 5049e69ae4..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/func_80240B00_8975E0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B00_8980E0 -/* 8980E0 80240B00 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8980E4 80240B04 AFBF0010 */ sw $ra, 0x10($sp) -/* 8980E8 80240B08 8C82000C */ lw $v0, 0xc($a0) -/* 8980EC 80240B0C 0C0B1EAF */ jal get_variable -/* 8980F0 80240B10 8C450000 */ lw $a1, ($v0) -/* 8980F4 80240B14 0040202D */ daddu $a0, $v0, $zero -/* 8980F8 80240B18 8C830000 */ lw $v1, ($a0) -/* 8980FC 80240B1C 34630010 */ ori $v1, $v1, 0x10 -/* 898100 80240B20 AC830000 */ sw $v1, ($a0) -/* 898104 80240B24 8FBF0010 */ lw $ra, 0x10($sp) -/* 898108 80240B28 24020002 */ addiu $v0, $zero, 2 -/* 89810C 80240B2C 03E00008 */ jr $ra -/* 898110 80240B30 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_19/func_802412B0_8975E0.s b/asm/nonmatchings/world/area_tik/tik_19/func_802412B0_8975E0.s deleted file mode 100644 index 93ac2d7a1b..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/func_802412B0_8975E0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412B0_898890 -/* 898890 802412B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 898894 802412B4 AFBF0018 */ sw $ra, 0x18($sp) -/* 898898 802412B8 0C00EAD2 */ jal get_npc_safe -/* 89889C 802412BC 2404FFFC */ addiu $a0, $zero, -4 -/* 8988A0 802412C0 3C0141F0 */ lui $at, 0x41f0 -/* 8988A4 802412C4 44810000 */ mtc1 $at, $f0 -/* 8988A8 802412C8 C442003C */ lwc1 $f2, 0x3c($v0) -/* 8988AC 802412CC 46001080 */ add.s $f2, $f2, $f0 -/* 8988B0 802412D0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8988B4 802412D4 8C450038 */ lw $a1, 0x38($v0) -/* 8988B8 802412D8 8C470040 */ lw $a3, 0x40($v0) -/* 8988BC 802412DC 44061000 */ mfc1 $a2, $f2 -/* 8988C0 802412E0 0C01BFBC */ jal func_8006FEF0 -/* 8988C4 802412E4 24040004 */ addiu $a0, $zero, 4 -/* 8988C8 802412E8 8FBF0018 */ lw $ra, 0x18($sp) -/* 8988CC 802412EC 24020002 */ addiu $v0, $zero, 2 -/* 8988D0 802412F0 03E00008 */ jr $ra -/* 8988D4 802412F4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_19/func_802412F8_8975E0.s b/asm/nonmatchings/world/area_tik/tik_19/func_802412F8_8975E0.s deleted file mode 100644 index 105f81ce75..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/func_802412F8_8975E0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412F8_8988D8 -/* 8988D8 802412F8 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* 8988DC 802412FC 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* 8988E0 80241300 AC800084 */ sw $zero, 0x84($a0) -/* 8988E4 80241304 80620000 */ lb $v0, ($v1) -/* 8988E8 80241308 10400005 */ beqz $v0, .L80241320 -/* 8988EC 8024130C 24020003 */ addiu $v0, $zero, 3 -/* 8988F0 80241310 80630003 */ lb $v1, 3($v1) -/* 8988F4 80241314 14620002 */ bne $v1, $v0, .L80241320 -/* 8988F8 80241318 24020001 */ addiu $v0, $zero, 1 -/* 8988FC 8024131C AC820084 */ sw $v0, 0x84($a0) -.L80241320: -/* 898900 80241320 03E00008 */ jr $ra -/* 898904 80241324 24020002 */ addiu $v0, $zero, 2 -/* 898908 80241328 00000000 */ nop -/* 89890C 8024132C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_20/func_80240124_89A350.s b/asm/nonmatchings/world/area_tik/tik_20/func_80240124_89A350.s deleted file mode 100644 index 6e71977039..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/func_80240124_89A350.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_89A474 -/* 89A474 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 89A478 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 89A47C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 89A480 80240130 10A00005 */ beqz $a1, .L80240148 -/* 89A484 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 89A488 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 89A48C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 89A490 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 89A494 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 89A498 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 89A49C 8024014C 1440000E */ bnez $v0, .L80240188 -/* 89A4A0 80240150 00000000 */ nop -/* 89A4A4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 89A4A8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 89A4AC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 89A4B0 80240160 04610004 */ bgez $v1, .L80240174 -/* 89A4B4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 89A4B8 80240168 3C020002 */ lui $v0, 2 -/* 89A4BC 8024016C 08090061 */ j .L80240184 -/* 89A4C0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 89A4C4 80240174 3C040002 */ lui $a0, 2 -/* 89A4C8 80240178 0083102A */ slt $v0, $a0, $v1 -/* 89A4CC 8024017C 10400002 */ beqz $v0, .L80240188 -/* 89A4D0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 89A4D4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 89A4D8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 89A4DC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 89A4E0 80240190 00000000 */ nop -/* 89A4E4 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 89A4E8 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 89A4EC 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 89A4F0 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 89A4F4 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 89A4F8 802401A8 3C020002 */ lui $v0, 2 -/* 89A4FC 802401AC 08090071 */ j .L802401C4 -/* 89A500 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 89A504 802401B4 3C040002 */ lui $a0, 2 -/* 89A508 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 89A50C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 89A510 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 89A514 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 89A518 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 89A51C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 89A520 802401D0 00000000 */ nop -/* 89A524 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 89A528 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 89A52C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 89A530 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 89A534 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 89A538 802401E8 3C020002 */ lui $v0, 2 -/* 89A53C 802401EC 08090081 */ j .L80240204 -/* 89A540 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 89A544 802401F4 3C040002 */ lui $a0, 2 -/* 89A548 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 89A54C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 89A550 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 89A554 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 89A558 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 89A55C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 89A560 80240210 00000000 */ nop -/* 89A564 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 89A568 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 89A56C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 89A570 80240220 04610004 */ bgez $v1, .L80240234 -/* 89A574 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 89A578 80240228 3C020002 */ lui $v0, 2 -/* 89A57C 8024022C 08090091 */ j .L80240244 -/* 89A580 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 89A584 80240234 3C040002 */ lui $a0, 2 -/* 89A588 80240238 0083102A */ slt $v0, $a0, $v1 -/* 89A58C 8024023C 10400002 */ beqz $v0, .L80240248 -/* 89A590 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 89A594 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 89A598 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 89A59C 8024024C 0C046F07 */ jal set_main_pan_u -/* 89A5A0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 89A5A4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 89A5A8 80240258 0C046F0D */ jal set_main_pan_v -/* 89A5AC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 89A5B0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 89A5B4 80240264 0C046F13 */ jal set_aux_pan_u -/* 89A5B8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 89A5BC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 89A5C0 80240270 0C046F19 */ jal set_aux_pan_v -/* 89A5C4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 89A5C8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 89A5CC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 89A5D0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 89A5D4 80240284 24420001 */ addiu $v0, $v0, 1 -/* 89A5D8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 89A5DC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 89A5E0 80240290 24630001 */ addiu $v1, $v1, 1 -/* 89A5E4 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 89A5E8 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 89A5EC 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 89A5F0 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 89A5F4 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 89A5F8 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 89A5FC 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 89A600 802402B0 14600002 */ bnez $v1, .L802402BC -/* 89A604 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 89A608 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 89A60C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 89A610 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 89A614 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 89A618 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 89A61C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 89A620 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 89A624 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 89A628 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 89A62C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 89A630 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 89A634 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 89A638 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 89A63C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 89A640 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 89A644 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 89A648 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 89A64C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 89A650 80240300 0000102D */ daddu $v0, $zero, $zero -/* 89A654 80240304 03E00008 */ jr $ra -/* 89A658 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_20/func_8024030C_89A350.s b/asm/nonmatchings/world/area_tik/tik_20/func_8024030C_89A350.s deleted file mode 100644 index 7c377e16df..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/func_8024030C_89A350.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_89A65C -/* 89A65C 8024030C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 89A660 80240310 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 89A664 80240314 8C430004 */ lw $v1, 4($v0) -/* 89A668 80240318 3C040010 */ lui $a0, 0x10 -/* 89A66C 8024031C 00641825 */ or $v1, $v1, $a0 -/* 89A670 80240320 AC430004 */ sw $v1, 4($v0) -/* 89A674 80240324 03E00008 */ jr $ra -/* 89A678 80240328 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_20/func_8024032C_89A350.s b/asm/nonmatchings/world/area_tik/tik_20/func_8024032C_89A350.s deleted file mode 100644 index 5275087c35..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/func_8024032C_89A350.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024032C_89A67C -/* 89A67C 8024032C 3C028016 */ lui $v0, 0x8016 -/* 89A680 80240330 8442A552 */ lh $v0, -0x5aae($v0) -/* 89A684 80240334 AC820084 */ sw $v0, 0x84($a0) -/* 89A688 80240338 03E00008 */ jr $ra -/* 89A68C 8024033C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_20/func_80240340_89A350.s b/asm/nonmatchings/world/area_tik/tik_20/func_80240340_89A350.s deleted file mode 100644 index 0801019e47..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/func_80240340_89A350.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240340_89A690 -/* 89A690 80240340 3C038016 */ lui $v1, 0x8016 -/* 89A694 80240344 8463A552 */ lh $v1, -0x5aae($v1) -/* 89A698 80240348 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 89A69C 8024034C AFB00010 */ sw $s0, 0x10($sp) -/* 89A6A0 80240350 0080802D */ daddu $s0, $a0, $zero -/* 89A6A4 80240354 AFBF0014 */ sw $ra, 0x14($sp) -/* 89A6A8 80240358 8E0200B0 */ lw $v0, 0xb0($s0) -/* 89A6AC 8024035C 10620003 */ beq $v1, $v0, .L8024036C -/* 89A6B0 80240360 24020002 */ addiu $v0, $zero, 2 -/* 89A6B4 80240364 080900FB */ j .L802403EC -/* 89A6B8 80240368 AE000084 */ sw $zero, 0x84($s0) -.L8024036C: -/* 89A6BC 8024036C 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 89A6C0 80240370 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 89A6C4 80240374 80620040 */ lb $v0, 0x40($v1) -/* 89A6C8 80240378 80670044 */ lb $a3, 0x44($v1) -/* 89A6CC 8024037C 04420001 */ bltzl $v0, .L80240384 -/* 89A6D0 80240380 00021023 */ negu $v0, $v0 -.L80240384: -/* 89A6D4 80240384 14400003 */ bnez $v0, .L80240394 -/* 89A6D8 80240388 00000000 */ nop -/* 89A6DC 8024038C 50E00017 */ beql $a3, $zero, .L802403EC -/* 89A6E0 80240390 0000102D */ daddu $v0, $zero, $zero -.L80240394: -/* 89A6E4 80240394 44822000 */ mtc1 $v0, $f4 -/* 89A6E8 80240398 00000000 */ nop -/* 89A6EC 8024039C 46802120 */ cvt.s.w $f4, $f4 -/* 89A6F0 802403A0 44062000 */ mfc1 $a2, $f4 -/* 89A6F4 802403A4 44872000 */ mtc1 $a3, $f4 -/* 89A6F8 802403A8 00000000 */ nop -/* 89A6FC 802403AC 46802120 */ cvt.s.w $f4, $f4 -/* 89A700 802403B0 44806000 */ mtc1 $zero, $f12 -/* 89A704 802403B4 44072000 */ mfc1 $a3, $f4 -/* 89A708 802403B8 0C00A720 */ jal atan2 -/* 89A70C 802403BC 46006386 */ mov.s $f14, $f12 -/* 89A710 802403C0 3C014270 */ lui $at, 0x4270 -/* 89A714 802403C4 44811000 */ mtc1 $at, $f2 -/* 89A718 802403C8 00000000 */ nop -/* 89A71C 802403CC 4602003C */ c.lt.s $f0, $f2 -/* 89A720 802403D0 00000000 */ nop -/* 89A724 802403D4 45000004 */ bc1f .L802403E8 -/* 89A728 802403D8 24020001 */ addiu $v0, $zero, 1 -/* 89A72C 802403DC AE020084 */ sw $v0, 0x84($s0) -/* 89A730 802403E0 080900FB */ j .L802403EC -/* 89A734 802403E4 24020002 */ addiu $v0, $zero, 2 -.L802403E8: -/* 89A738 802403E8 0000102D */ daddu $v0, $zero, $zero -.L802403EC: -/* 89A73C 802403EC 8FBF0014 */ lw $ra, 0x14($sp) -/* 89A740 802403F0 8FB00010 */ lw $s0, 0x10($sp) -/* 89A744 802403F4 03E00008 */ jr $ra -/* 89A748 802403F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_20/func_802403FC_89A350.s b/asm/nonmatchings/world/area_tik/tik_20/func_802403FC_89A350.s deleted file mode 100644 index 11337ea3fd..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/func_802403FC_89A350.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403FC_89A74C -/* 89A74C 802403FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 89A750 80240400 AFB10014 */ sw $s1, 0x14($sp) -/* 89A754 80240404 0080882D */ daddu $s1, $a0, $zero -/* 89A758 80240408 AFBF001C */ sw $ra, 0x1c($sp) -/* 89A75C 8024040C AFB20018 */ sw $s2, 0x18($sp) -/* 89A760 80240410 0C016AFA */ jal get_current_map_header -/* 89A764 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* 89A768 80240418 0220202D */ daddu $a0, $s1, $zero -/* 89A76C 8024041C 3C05FE36 */ lui $a1, 0xfe36 -/* 89A770 80240420 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 89A774 80240424 0C0B1EAF */ jal get_variable -/* 89A778 80240428 0040902D */ daddu $s2, $v0, $zero -/* 89A77C 8024042C 0220202D */ daddu $a0, $s1, $zero -/* 89A780 80240430 3C05FE36 */ lui $a1, 0xfe36 -/* 89A784 80240434 8E430014 */ lw $v1, 0x14($s2) -/* 89A788 80240438 00028100 */ sll $s0, $v0, 4 -/* 89A78C 8024043C 02031821 */ addu $v1, $s0, $v1 -/* 89A790 80240440 C4600000 */ lwc1 $f0, ($v1) -/* 89A794 80240444 4600008D */ trunc.w.s $f2, $f0 -/* 89A798 80240448 44061000 */ mfc1 $a2, $f2 -/* 89A79C 8024044C 0C0B2026 */ jal set_variable -/* 89A7A0 80240450 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 89A7A4 80240454 0220202D */ daddu $a0, $s1, $zero -/* 89A7A8 80240458 8E420014 */ lw $v0, 0x14($s2) -/* 89A7AC 8024045C 3C05FE36 */ lui $a1, 0xfe36 -/* 89A7B0 80240460 02021021 */ addu $v0, $s0, $v0 -/* 89A7B4 80240464 C4400004 */ lwc1 $f0, 4($v0) -/* 89A7B8 80240468 4600008D */ trunc.w.s $f2, $f0 -/* 89A7BC 8024046C 44061000 */ mfc1 $a2, $f2 -/* 89A7C0 80240470 0C0B2026 */ jal set_variable -/* 89A7C4 80240474 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 89A7C8 80240478 0220202D */ daddu $a0, $s1, $zero -/* 89A7CC 8024047C 8E420014 */ lw $v0, 0x14($s2) -/* 89A7D0 80240480 3C05FE36 */ lui $a1, 0xfe36 -/* 89A7D4 80240484 02021021 */ addu $v0, $s0, $v0 -/* 89A7D8 80240488 C4400008 */ lwc1 $f0, 8($v0) -/* 89A7DC 8024048C 4600008D */ trunc.w.s $f2, $f0 -/* 89A7E0 80240490 44061000 */ mfc1 $a2, $f2 -/* 89A7E4 80240494 0C0B2026 */ jal set_variable -/* 89A7E8 80240498 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 89A7EC 8024049C 0220202D */ daddu $a0, $s1, $zero -/* 89A7F0 802404A0 8E420014 */ lw $v0, 0x14($s2) -/* 89A7F4 802404A4 3C05FE36 */ lui $a1, 0xfe36 -/* 89A7F8 802404A8 02028021 */ addu $s0, $s0, $v0 -/* 89A7FC 802404AC C600000C */ lwc1 $f0, 0xc($s0) -/* 89A800 802404B0 4600008D */ trunc.w.s $f2, $f0 -/* 89A804 802404B4 44061000 */ mfc1 $a2, $f2 -/* 89A808 802404B8 0C0B2026 */ jal set_variable -/* 89A80C 802404BC 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 89A810 802404C0 8FBF001C */ lw $ra, 0x1c($sp) -/* 89A814 802404C4 8FB20018 */ lw $s2, 0x18($sp) -/* 89A818 802404C8 8FB10014 */ lw $s1, 0x14($sp) -/* 89A81C 802404CC 8FB00010 */ lw $s0, 0x10($sp) -/* 89A820 802404D0 24020002 */ addiu $v0, $zero, 2 -/* 89A824 802404D4 03E00008 */ jr $ra -/* 89A828 802404D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_20/func_802404DC_89A350.s b/asm/nonmatchings/world/area_tik/tik_20/func_802404DC_89A350.s deleted file mode 100644 index 7efd49ad37..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/func_802404DC_89A350.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404DC_89A82C -/* 89A82C 802404DC 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 89A830 802404E0 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 89A834 802404E4 3C014334 */ lui $at, 0x4334 -/* 89A838 802404E8 44816000 */ mtc1 $at, $f12 -/* 89A83C 802404EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 89A840 802404F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 89A844 802404F4 AFB00010 */ sw $s0, 0x10($sp) -/* 89A848 802404F8 00031080 */ sll $v0, $v1, 2 -/* 89A84C 802404FC 00431021 */ addu $v0, $v0, $v1 -/* 89A850 80240500 00021080 */ sll $v0, $v0, 2 -/* 89A854 80240504 00431023 */ subu $v0, $v0, $v1 -/* 89A858 80240508 000218C0 */ sll $v1, $v0, 3 -/* 89A85C 8024050C 00431021 */ addu $v0, $v0, $v1 -/* 89A860 80240510 000210C0 */ sll $v0, $v0, 3 -/* 89A864 80240514 3C01800B */ lui $at, 0x800b -/* 89A868 80240518 00220821 */ addu $at, $at, $v0 -/* 89A86C 8024051C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 89A870 80240520 460C0300 */ add.s $f12, $f0, $f12 -/* 89A874 80240524 0C00A6C9 */ jal clamp_angle -/* 89A878 80240528 0080802D */ daddu $s0, $a0, $zero -/* 89A87C 8024052C 4600008D */ trunc.w.s $f2, $f0 -/* 89A880 80240530 E6020084 */ swc1 $f2, 0x84($s0) -/* 89A884 80240534 8FBF0014 */ lw $ra, 0x14($sp) -/* 89A888 80240538 8FB00010 */ lw $s0, 0x10($sp) -/* 89A88C 8024053C 24020002 */ addiu $v0, $zero, 2 -/* 89A890 80240540 03E00008 */ jr $ra -/* 89A894 80240544 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_20/func_80240548_89A350.s b/asm/nonmatchings/world/area_tik/tik_20/func_80240548_89A350.s deleted file mode 100644 index 1b5f9b2889..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/func_80240548_89A350.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240548_89A898 -/* 89A898 80240548 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 89A89C 8024054C AFB00018 */ sw $s0, 0x18($sp) -/* 89A8A0 80240550 0080802D */ daddu $s0, $a0, $zero -/* 89A8A4 80240554 AFBF001C */ sw $ra, 0x1c($sp) -/* 89A8A8 80240558 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 89A8AC 8024055C 8E02000C */ lw $v0, 0xc($s0) -/* 89A8B0 80240560 0C0B210B */ jal get_float_variable -/* 89A8B4 80240564 8C450000 */ lw $a1, ($v0) -/* 89A8B8 80240568 27A40010 */ addiu $a0, $sp, 0x10 -/* 89A8BC 8024056C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 89A8C0 80240570 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 89A8C4 80240574 44060000 */ mfc1 $a2, $f0 -/* 89A8C8 80240578 C4400028 */ lwc1 $f0, 0x28($v0) -/* 89A8CC 8024057C C4420030 */ lwc1 $f2, 0x30($v0) -/* 89A8D0 80240580 E7A00010 */ swc1 $f0, 0x10($sp) -/* 89A8D4 80240584 E7A20014 */ swc1 $f2, 0x14($sp) -/* 89A8D8 80240588 8C470080 */ lw $a3, 0x80($v0) -/* 89A8DC 8024058C C454002C */ lwc1 $f20, 0x2c($v0) -/* 89A8E0 80240590 0C00A7E7 */ jal add_vec2D_polar -/* 89A8E4 80240594 27A50014 */ addiu $a1, $sp, 0x14 -/* 89A8E8 80240598 0200202D */ daddu $a0, $s0, $zero -/* 89A8EC 8024059C 3C05FE36 */ lui $a1, 0xfe36 -/* 89A8F0 802405A0 8FA60010 */ lw $a2, 0x10($sp) -/* 89A8F4 802405A4 0C0B2190 */ jal set_float_variable -/* 89A8F8 802405A8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 89A8FC 802405AC 0200202D */ daddu $a0, $s0, $zero -/* 89A900 802405B0 3C05FE36 */ lui $a1, 0xfe36 -/* 89A904 802405B4 4406A000 */ mfc1 $a2, $f20 -/* 89A908 802405B8 0C0B2190 */ jal set_float_variable -/* 89A90C 802405BC 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 89A910 802405C0 0200202D */ daddu $a0, $s0, $zero -/* 89A914 802405C4 3C05FE36 */ lui $a1, 0xfe36 -/* 89A918 802405C8 8FA60014 */ lw $a2, 0x14($sp) -/* 89A91C 802405CC 0C0B2190 */ jal set_float_variable -/* 89A920 802405D0 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 89A924 802405D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 89A928 802405D8 8FB00018 */ lw $s0, 0x18($sp) -/* 89A92C 802405DC D7B40020 */ ldc1 $f20, 0x20($sp) -/* 89A930 802405E0 24020002 */ addiu $v0, $zero, 2 -/* 89A934 802405E4 03E00008 */ jr $ra -/* 89A938 802405E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_20/func_802405EC_89A350.s b/asm/nonmatchings/world/area_tik/tik_20/func_802405EC_89A350.s deleted file mode 100644 index 1f48f6d7da..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/func_802405EC_89A350.s +++ /dev/null @@ -1,235 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_89A93C -/* 89A93C 802405EC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 89A940 802405F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 89A944 802405F4 0080982D */ daddu $s3, $a0, $zero -/* 89A948 802405F8 AFBF0020 */ sw $ra, 0x20($sp) -/* 89A94C 802405FC AFB20018 */ sw $s2, 0x18($sp) -/* 89A950 80240600 AFB10014 */ sw $s1, 0x14($sp) -/* 89A954 80240604 AFB00010 */ sw $s0, 0x10($sp) -/* 89A958 80240608 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 89A95C 8024060C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 89A960 80240610 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 89A964 80240614 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 89A968 80240618 8E62000C */ lw $v0, 0xc($s3) -/* 89A96C 8024061C 0C0B1EAF */ jal get_variable -/* 89A970 80240620 8C450000 */ lw $a1, ($v0) -/* 89A974 80240624 2404FFFC */ addiu $a0, $zero, -4 -/* 89A978 80240628 0C00EABB */ jal get_npc_unsafe -/* 89A97C 8024062C 0040802D */ daddu $s0, $v0, $zero -/* 89A980 80240630 0200202D */ daddu $a0, $s0, $zero -/* 89A984 80240634 0C046C04 */ jal get_model_list_index_from_tree_index -/* 89A988 80240638 0040802D */ daddu $s0, $v0, $zero -/* 89A98C 8024063C 0C046B4C */ jal get_model_from_list_index -/* 89A990 80240640 0040202D */ daddu $a0, $v0, $zero -/* 89A994 80240644 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 89A998 80240648 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 89A99C 8024064C 0040902D */ daddu $s2, $v0, $zero -/* 89A9A0 80240650 AE60008C */ sw $zero, 0x8c($s3) -/* 89A9A4 80240654 C4620028 */ lwc1 $f2, 0x28($v1) -/* 89A9A8 80240658 C6400098 */ lwc1 $f0, 0x98($s2) -/* 89A9AC 8024065C 46001081 */ sub.s $f2, $f2, $f0 -/* 89A9B0 80240660 46021182 */ mul.s $f6, $f2, $f2 -/* 89A9B4 80240664 00000000 */ nop -/* 89A9B8 80240668 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 89A9BC 8024066C C4620030 */ lwc1 $f2, 0x30($v1) -/* 89A9C0 80240670 46001081 */ sub.s $f2, $f2, $f0 -/* 89A9C4 80240674 46021102 */ mul.s $f4, $f2, $f2 -/* 89A9C8 80240678 00000000 */ nop -/* 89A9CC 8024067C 846200B0 */ lh $v0, 0xb0($v1) -/* 89A9D0 80240680 C462002C */ lwc1 $f2, 0x2c($v1) -/* 89A9D4 80240684 44820000 */ mtc1 $v0, $f0 -/* 89A9D8 80240688 00000000 */ nop -/* 89A9DC 8024068C 46800020 */ cvt.s.w $f0, $f0 -/* 89A9E0 80240690 46001080 */ add.s $f2, $f2, $f0 -/* 89A9E4 80240694 3C013FC0 */ lui $at, 0x3fc0 -/* 89A9E8 80240698 44810000 */ mtc1 $at, $f0 -/* 89A9EC 8024069C 00000000 */ nop -/* 89A9F0 802406A0 46001081 */ sub.s $f2, $f2, $f0 -/* 89A9F4 802406A4 46043300 */ add.s $f12, $f6, $f4 -/* 89A9F8 802406A8 C640009C */ lwc1 $f0, 0x9c($s2) -/* 89A9FC 802406AC 46001501 */ sub.s $f20, $f2, $f0 -/* 89AA00 802406B0 46006084 */ sqrt.s $f2, $f12 -/* 89AA04 802406B4 46021032 */ c.eq.s $f2, $f2 -/* 89AA08 802406B8 00000000 */ nop -/* 89AA0C 802406BC 45010004 */ bc1t .L802406D0 -/* 89AA10 802406C0 0060882D */ daddu $s1, $v1, $zero -/* 89AA14 802406C4 0C0187BC */ jal sqrtf -/* 89AA18 802406C8 00000000 */ nop -/* 89AA1C 802406CC 46000086 */ mov.s $f2, $f0 -.L802406D0: -/* 89AA20 802406D0 44800000 */ mtc1 $zero, $f0 -/* 89AA24 802406D4 00000000 */ nop -/* 89AA28 802406D8 4614003C */ c.lt.s $f0, $f20 -/* 89AA2C 802406DC 00000000 */ nop -/* 89AA30 802406E0 45000016 */ bc1f .L8024073C -/* 89AA34 802406E4 46001106 */ mov.s $f4, $f2 -/* 89AA38 802406E8 862200B0 */ lh $v0, 0xb0($s1) -/* 89AA3C 802406EC 44820000 */ mtc1 $v0, $f0 -/* 89AA40 802406F0 00000000 */ nop -/* 89AA44 802406F4 46800020 */ cvt.s.w $f0, $f0 -/* 89AA48 802406F8 4600A03C */ c.lt.s $f20, $f0 -/* 89AA4C 802406FC 00000000 */ nop -/* 89AA50 80240700 4500000E */ bc1f .L8024073C -/* 89AA54 80240704 00000000 */ nop -/* 89AA58 80240708 862200B2 */ lh $v0, 0xb2($s1) -/* 89AA5C 8024070C 3C013F00 */ lui $at, 0x3f00 -/* 89AA60 80240710 44811000 */ mtc1 $at, $f2 -/* 89AA64 80240714 44820000 */ mtc1 $v0, $f0 -/* 89AA68 80240718 00000000 */ nop -/* 89AA6C 8024071C 46800020 */ cvt.s.w $f0, $f0 -/* 89AA70 80240720 46020002 */ mul.s $f0, $f0, $f2 -/* 89AA74 80240724 00000000 */ nop -/* 89AA78 80240728 4600203C */ c.lt.s $f4, $f0 -/* 89AA7C 8024072C 00000000 */ nop -/* 89AA80 80240730 45000002 */ bc1f .L8024073C -/* 89AA84 80240734 24020001 */ addiu $v0, $zero, 1 -/* 89AA88 80240738 AE62008C */ sw $v0, 0x8c($s3) -.L8024073C: -/* 89AA8C 8024073C C6020038 */ lwc1 $f2, 0x38($s0) -/* 89AA90 80240740 C6400098 */ lwc1 $f0, 0x98($s2) -/* 89AA94 80240744 46001081 */ sub.s $f2, $f2, $f0 -/* 89AA98 80240748 46021182 */ mul.s $f6, $f2, $f2 -/* 89AA9C 8024074C 00000000 */ nop -/* 89AAA0 80240750 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 89AAA4 80240754 C6020040 */ lwc1 $f2, 0x40($s0) -/* 89AAA8 80240758 46001081 */ sub.s $f2, $f2, $f0 -/* 89AAAC 8024075C 46021102 */ mul.s $f4, $f2, $f2 -/* 89AAB0 80240760 00000000 */ nop -/* 89AAB4 80240764 860200A8 */ lh $v0, 0xa8($s0) -/* 89AAB8 80240768 C602003C */ lwc1 $f2, 0x3c($s0) -/* 89AABC 8024076C 44820000 */ mtc1 $v0, $f0 -/* 89AAC0 80240770 00000000 */ nop -/* 89AAC4 80240774 46800020 */ cvt.s.w $f0, $f0 -/* 89AAC8 80240778 46001080 */ add.s $f2, $f2, $f0 -/* 89AACC 8024077C 3C013FC0 */ lui $at, 0x3fc0 -/* 89AAD0 80240780 44810000 */ mtc1 $at, $f0 -/* 89AAD4 80240784 00000000 */ nop -/* 89AAD8 80240788 46001081 */ sub.s $f2, $f2, $f0 -/* 89AADC 8024078C 46043300 */ add.s $f12, $f6, $f4 -/* 89AAE0 80240790 C640009C */ lwc1 $f0, 0x9c($s2) -/* 89AAE4 80240794 46001501 */ sub.s $f20, $f2, $f0 -/* 89AAE8 80240798 46006084 */ sqrt.s $f2, $f12 -/* 89AAEC 8024079C 46021032 */ c.eq.s $f2, $f2 -/* 89AAF0 802407A0 00000000 */ nop -/* 89AAF4 802407A4 45010004 */ bc1t .L802407B8 -/* 89AAF8 802407A8 00000000 */ nop -/* 89AAFC 802407AC 0C0187BC */ jal sqrtf -/* 89AB00 802407B0 00000000 */ nop -/* 89AB04 802407B4 46000086 */ mov.s $f2, $f0 -.L802407B8: -/* 89AB08 802407B8 44800000 */ mtc1 $zero, $f0 -/* 89AB0C 802407BC 00000000 */ nop -/* 89AB10 802407C0 4614003C */ c.lt.s $f0, $f20 -/* 89AB14 802407C4 00000000 */ nop -/* 89AB18 802407C8 45000016 */ bc1f .L80240824 -/* 89AB1C 802407CC 46001106 */ mov.s $f4, $f2 -/* 89AB20 802407D0 860200A8 */ lh $v0, 0xa8($s0) -/* 89AB24 802407D4 44820000 */ mtc1 $v0, $f0 -/* 89AB28 802407D8 00000000 */ nop -/* 89AB2C 802407DC 46800020 */ cvt.s.w $f0, $f0 -/* 89AB30 802407E0 4600A03C */ c.lt.s $f20, $f0 -/* 89AB34 802407E4 00000000 */ nop -/* 89AB38 802407E8 4500000F */ bc1f .L80240828 -/* 89AB3C 802407EC 0000882D */ daddu $s1, $zero, $zero -/* 89AB40 802407F0 860200A6 */ lh $v0, 0xa6($s0) -/* 89AB44 802407F4 3C013F00 */ lui $at, 0x3f00 -/* 89AB48 802407F8 44811000 */ mtc1 $at, $f2 -/* 89AB4C 802407FC 44820000 */ mtc1 $v0, $f0 -/* 89AB50 80240800 00000000 */ nop -/* 89AB54 80240804 46800020 */ cvt.s.w $f0, $f0 -/* 89AB58 80240808 46020002 */ mul.s $f0, $f0, $f2 -/* 89AB5C 8024080C 00000000 */ nop -/* 89AB60 80240810 4600203C */ c.lt.s $f4, $f0 -/* 89AB64 80240814 00000000 */ nop -/* 89AB68 80240818 45000003 */ bc1f .L80240828 -/* 89AB6C 8024081C 24020001 */ addiu $v0, $zero, 1 -/* 89AB70 80240820 AE62008C */ sw $v0, 0x8c($s3) -.L80240824: -/* 89AB74 80240824 0000882D */ daddu $s1, $zero, $zero -.L80240828: -/* 89AB78 80240828 3C013FC0 */ lui $at, 0x3fc0 -/* 89AB7C 8024082C 4481D000 */ mtc1 $at, $f26 -/* 89AB80 80240830 4480C000 */ mtc1 $zero, $f24 -/* 89AB84 80240834 3C013F00 */ lui $at, 0x3f00 -/* 89AB88 80240838 4481B000 */ mtc1 $at, $f22 -.L8024083C: -/* 89AB8C 8024083C 0C00EAD2 */ jal get_npc_safe -/* 89AB90 80240840 0220202D */ daddu $a0, $s1, $zero -/* 89AB94 80240844 0040802D */ daddu $s0, $v0, $zero -/* 89AB98 80240848 52000035 */ beql $s0, $zero, .L80240920 -/* 89AB9C 8024084C 26310001 */ addiu $s1, $s1, 1 -/* 89ABA0 80240850 C6020038 */ lwc1 $f2, 0x38($s0) -/* 89ABA4 80240854 C6400098 */ lwc1 $f0, 0x98($s2) -/* 89ABA8 80240858 46001081 */ sub.s $f2, $f2, $f0 -/* 89ABAC 8024085C 46021182 */ mul.s $f6, $f2, $f2 -/* 89ABB0 80240860 00000000 */ nop -/* 89ABB4 80240864 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 89ABB8 80240868 C6020040 */ lwc1 $f2, 0x40($s0) -/* 89ABBC 8024086C 46001081 */ sub.s $f2, $f2, $f0 -/* 89ABC0 80240870 46021102 */ mul.s $f4, $f2, $f2 -/* 89ABC4 80240874 00000000 */ nop -/* 89ABC8 80240878 860200A8 */ lh $v0, 0xa8($s0) -/* 89ABCC 8024087C C602003C */ lwc1 $f2, 0x3c($s0) -/* 89ABD0 80240880 44820000 */ mtc1 $v0, $f0 -/* 89ABD4 80240884 00000000 */ nop -/* 89ABD8 80240888 46800020 */ cvt.s.w $f0, $f0 -/* 89ABDC 8024088C 46001080 */ add.s $f2, $f2, $f0 -/* 89ABE0 80240890 461A1081 */ sub.s $f2, $f2, $f26 -/* 89ABE4 80240894 46043300 */ add.s $f12, $f6, $f4 -/* 89ABE8 80240898 C640009C */ lwc1 $f0, 0x9c($s2) -/* 89ABEC 8024089C 46001501 */ sub.s $f20, $f2, $f0 -/* 89ABF0 802408A0 46006004 */ sqrt.s $f0, $f12 -/* 89ABF4 802408A4 46000032 */ c.eq.s $f0, $f0 -/* 89ABF8 802408A8 00000000 */ nop -/* 89ABFC 802408AC 45010003 */ bc1t .L802408BC -/* 89AC00 802408B0 00000000 */ nop -/* 89AC04 802408B4 0C0187BC */ jal sqrtf -/* 89AC08 802408B8 00000000 */ nop -.L802408BC: -/* 89AC0C 802408BC 4614C03C */ c.lt.s $f24, $f20 -/* 89AC10 802408C0 00000000 */ nop -/* 89AC14 802408C4 45000015 */ bc1f .L8024091C -/* 89AC18 802408C8 46000106 */ mov.s $f4, $f0 -/* 89AC1C 802408CC 860200A8 */ lh $v0, 0xa8($s0) -/* 89AC20 802408D0 44820000 */ mtc1 $v0, $f0 -/* 89AC24 802408D4 00000000 */ nop -/* 89AC28 802408D8 46800020 */ cvt.s.w $f0, $f0 -/* 89AC2C 802408DC 4600A03C */ c.lt.s $f20, $f0 -/* 89AC30 802408E0 00000000 */ nop -/* 89AC34 802408E4 4500000E */ bc1f .L80240920 -/* 89AC38 802408E8 26310001 */ addiu $s1, $s1, 1 -/* 89AC3C 802408EC 860200A6 */ lh $v0, 0xa6($s0) -/* 89AC40 802408F0 44820000 */ mtc1 $v0, $f0 -/* 89AC44 802408F4 00000000 */ nop -/* 89AC48 802408F8 46800020 */ cvt.s.w $f0, $f0 -/* 89AC4C 802408FC 46160002 */ mul.s $f0, $f0, $f22 -/* 89AC50 80240900 00000000 */ nop -/* 89AC54 80240904 4600203C */ c.lt.s $f4, $f0 -/* 89AC58 80240908 00000000 */ nop -/* 89AC5C 8024090C 45000004 */ bc1f .L80240920 -/* 89AC60 80240910 24020001 */ addiu $v0, $zero, 1 -/* 89AC64 80240914 0809024B */ j .L8024092C -/* 89AC68 80240918 AE62008C */ sw $v0, 0x8c($s3) -.L8024091C: -/* 89AC6C 8024091C 26310001 */ addiu $s1, $s1, 1 -.L80240920: -/* 89AC70 80240920 2A220040 */ slti $v0, $s1, 0x40 -/* 89AC74 80240924 1440FFC5 */ bnez $v0, .L8024083C -/* 89AC78 80240928 00000000 */ nop -.L8024092C: -/* 89AC7C 8024092C 8FBF0020 */ lw $ra, 0x20($sp) -/* 89AC80 80240930 8FB3001C */ lw $s3, 0x1c($sp) -/* 89AC84 80240934 8FB20018 */ lw $s2, 0x18($sp) -/* 89AC88 80240938 8FB10014 */ lw $s1, 0x14($sp) -/* 89AC8C 8024093C 8FB00010 */ lw $s0, 0x10($sp) -/* 89AC90 80240940 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 89AC94 80240944 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 89AC98 80240948 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 89AC9C 8024094C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 89ACA0 80240950 24020002 */ addiu $v0, $zero, 2 -/* 89ACA4 80240954 03E00008 */ jr $ra -/* 89ACA8 80240958 27BD0048 */ addiu $sp, $sp, 0x48 -/* 89ACAC 8024095C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_20/func_80240960_89A350.s b/asm/nonmatchings/world/area_tik/tik_20/func_80240960_89A350.s deleted file mode 100644 index 6499823782..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/func_80240960_89A350.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240960_89ACB0 -/* 89ACB0 80240960 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 89ACB4 80240964 AFB20018 */ sw $s2, 0x18($sp) -/* 89ACB8 80240968 0080902D */ daddu $s2, $a0, $zero -/* 89ACBC 8024096C AFBF001C */ sw $ra, 0x1c($sp) -/* 89ACC0 80240970 AFB10014 */ sw $s1, 0x14($sp) -/* 89ACC4 80240974 AFB00010 */ sw $s0, 0x10($sp) -/* 89ACC8 80240978 8E510148 */ lw $s1, 0x148($s2) -/* 89ACCC 8024097C 0C00EABB */ jal get_npc_unsafe -/* 89ACD0 80240980 86240008 */ lh $a0, 8($s1) -/* 89ACD4 80240984 0040802D */ daddu $s0, $v0, $zero -/* 89ACD8 80240988 8E2300CC */ lw $v1, 0xcc($s1) -/* 89ACDC 8024098C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 89ACE0 80240990 8C630020 */ lw $v1, 0x20($v1) -/* 89ACE4 80240994 AE030028 */ sw $v1, 0x28($s0) -/* 89ACE8 80240998 96220076 */ lhu $v0, 0x76($s1) -/* 89ACEC 8024099C A602008E */ sh $v0, 0x8e($s0) -/* 89ACF0 802409A0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 89ACF4 802409A4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 89ACF8 802409A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 89ACFC 802409AC 8C460028 */ lw $a2, 0x28($v0) -/* 89AD00 802409B0 0C00A720 */ jal atan2 -/* 89AD04 802409B4 8C470030 */ lw $a3, 0x30($v0) -/* 89AD08 802409B8 2402000D */ addiu $v0, $zero, 0xd -/* 89AD0C 802409BC E600000C */ swc1 $f0, 0xc($s0) -/* 89AD10 802409C0 AE420070 */ sw $v0, 0x70($s2) -/* 89AD14 802409C4 8FBF001C */ lw $ra, 0x1c($sp) -/* 89AD18 802409C8 8FB20018 */ lw $s2, 0x18($sp) -/* 89AD1C 802409CC 8FB10014 */ lw $s1, 0x14($sp) -/* 89AD20 802409D0 8FB00010 */ lw $s0, 0x10($sp) -/* 89AD24 802409D4 03E00008 */ jr $ra -/* 89AD28 802409D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_20/func_802409DC_89A350.s b/asm/nonmatchings/world/area_tik/tik_20/func_802409DC_89A350.s deleted file mode 100644 index 7a82126f33..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/func_802409DC_89A350.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409DC_89AD2C -/* 89AD2C 802409DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 89AD30 802409E0 AFB3001C */ sw $s3, 0x1c($sp) -/* 89AD34 802409E4 0080982D */ daddu $s3, $a0, $zero -/* 89AD38 802409E8 AFBF0020 */ sw $ra, 0x20($sp) -/* 89AD3C 802409EC AFB20018 */ sw $s2, 0x18($sp) -/* 89AD40 802409F0 AFB10014 */ sw $s1, 0x14($sp) -/* 89AD44 802409F4 AFB00010 */ sw $s0, 0x10($sp) -/* 89AD48 802409F8 8E710148 */ lw $s1, 0x148($s3) -/* 89AD4C 802409FC 86240008 */ lh $a0, 8($s1) -/* 89AD50 80240A00 0C00EABB */ jal get_npc_unsafe -/* 89AD54 80240A04 00A0902D */ daddu $s2, $a1, $zero -/* 89AD58 80240A08 0040802D */ daddu $s0, $v0, $zero -/* 89AD5C 80240A0C 8602008E */ lh $v0, 0x8e($s0) -/* 89AD60 80240A10 9603008E */ lhu $v1, 0x8e($s0) -/* 89AD64 80240A14 18400005 */ blez $v0, .L80240A2C -/* 89AD68 80240A18 2462FFFF */ addiu $v0, $v1, -1 -/* 89AD6C 80240A1C A602008E */ sh $v0, 0x8e($s0) -/* 89AD70 80240A20 00021400 */ sll $v0, $v0, 0x10 -/* 89AD74 80240A24 1C400033 */ bgtz $v0, .L80240AF4 -/* 89AD78 80240A28 00000000 */ nop -.L80240A2C: -/* 89AD7C 80240A2C 8602008C */ lh $v0, 0x8c($s0) -/* 89AD80 80240A30 14400030 */ bnez $v0, .L80240AF4 -/* 89AD84 80240A34 00000000 */ nop -/* 89AD88 80240A38 8E2200CC */ lw $v0, 0xcc($s1) -/* 89AD8C 80240A3C 8C420024 */ lw $v0, 0x24($v0) -/* 89AD90 80240A40 AE020028 */ sw $v0, 0x28($s0) -/* 89AD94 80240A44 C6400018 */ lwc1 $f0, 0x18($s2) -/* 89AD98 80240A48 E6000018 */ swc1 $f0, 0x18($s0) -/* 89AD9C 80240A4C 8E230088 */ lw $v1, 0x88($s1) -/* 89ADA0 80240A50 24020005 */ addiu $v0, $zero, 5 -/* 89ADA4 80240A54 10620005 */ beq $v1, $v0, .L80240A6C -/* 89ADA8 80240A58 00000000 */ nop -/* 89ADAC 80240A5C 10600003 */ beqz $v1, .L80240A6C -/* 89ADB0 80240A60 24020001 */ addiu $v0, $zero, 1 -/* 89ADB4 80240A64 14620006 */ bne $v1, $v0, .L80240A80 -/* 89ADB8 80240A68 00000000 */ nop -.L80240A6C: -/* 89ADBC 80240A6C 8E220084 */ lw $v0, 0x84($s1) -/* 89ADC0 80240A70 00021FC2 */ srl $v1, $v0, 0x1f -/* 89ADC4 80240A74 00431021 */ addu $v0, $v0, $v1 -/* 89ADC8 80240A78 00021043 */ sra $v0, $v0, 1 -/* 89ADCC 80240A7C A60200A8 */ sh $v0, 0xa8($s0) -.L80240A80: -/* 89ADD0 80240A80 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 89ADD4 80240A84 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 89ADD8 80240A88 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 89ADDC 80240A8C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 89ADE0 80240A90 8C460028 */ lw $a2, 0x28($v0) -/* 89ADE4 80240A94 0C00A7B5 */ jal dist2D -/* 89ADE8 80240A98 8C470030 */ lw $a3, 0x30($v0) -/* 89ADEC 80240A9C C6020018 */ lwc1 $f2, 0x18($s0) -/* 89ADF0 80240AA0 46020003 */ div.s $f0, $f0, $f2 -/* 89ADF4 80240AA4 3C018024 */ lui $at, 0x8024 -/* 89ADF8 80240AA8 D42233F0 */ ldc1 $f2, 0x33f0($at) -/* 89ADFC 80240AAC 46000021 */ cvt.d.s $f0, $f0 -/* 89AE00 80240AB0 46220000 */ add.d $f0, $f0, $f2 -/* 89AE04 80240AB4 4620010D */ trunc.w.d $f4, $f0 -/* 89AE08 80240AB8 44022000 */ mfc1 $v0, $f4 -/* 89AE0C 80240ABC 00000000 */ nop -/* 89AE10 80240AC0 A602008E */ sh $v0, 0x8e($s0) -/* 89AE14 80240AC4 00021400 */ sll $v0, $v0, 0x10 -/* 89AE18 80240AC8 8E230078 */ lw $v1, 0x78($s1) -/* 89AE1C 80240ACC 00021403 */ sra $v0, $v0, 0x10 -/* 89AE20 80240AD0 0043102A */ slt $v0, $v0, $v1 -/* 89AE24 80240AD4 10400003 */ beqz $v0, .L80240AE4 -/* 89AE28 80240AD8 00000000 */ nop -/* 89AE2C 80240ADC 9622007A */ lhu $v0, 0x7a($s1) -/* 89AE30 80240AE0 A602008E */ sh $v0, 0x8e($s0) -.L80240AE4: -/* 89AE34 80240AE4 8602008E */ lh $v0, 0x8e($s0) -/* 89AE38 80240AE8 AE22007C */ sw $v0, 0x7c($s1) -/* 89AE3C 80240AEC 2402000E */ addiu $v0, $zero, 0xe -/* 89AE40 80240AF0 AE620070 */ sw $v0, 0x70($s3) -.L80240AF4: -/* 89AE44 80240AF4 8FBF0020 */ lw $ra, 0x20($sp) -/* 89AE48 80240AF8 8FB3001C */ lw $s3, 0x1c($sp) -/* 89AE4C 80240AFC 8FB20018 */ lw $s2, 0x18($sp) -/* 89AE50 80240B00 8FB10014 */ lw $s1, 0x14($sp) -/* 89AE54 80240B04 8FB00010 */ lw $s0, 0x10($sp) -/* 89AE58 80240B08 03E00008 */ jr $ra -/* 89AE5C 80240B0C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_20/func_80240C74_89A350.s b/asm/nonmatchings/world/area_tik/tik_20/func_80240C74_89A350.s deleted file mode 100644 index fa7e8fb3f9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/func_80240C74_89A350.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C74_89AFC4 -/* 89AFC4 80240C74 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 89AFC8 80240C78 AFB10014 */ sw $s1, 0x14($sp) -/* 89AFCC 80240C7C 0080882D */ daddu $s1, $a0, $zero -/* 89AFD0 80240C80 AFBF0018 */ sw $ra, 0x18($sp) -/* 89AFD4 80240C84 AFB00010 */ sw $s0, 0x10($sp) -/* 89AFD8 80240C88 8E300148 */ lw $s0, 0x148($s1) -/* 89AFDC 80240C8C 0C00EABB */ jal get_npc_unsafe -/* 89AFE0 80240C90 86040008 */ lh $a0, 8($s0) -/* 89AFE4 80240C94 0040202D */ daddu $a0, $v0, $zero -/* 89AFE8 80240C98 9482008E */ lhu $v0, 0x8e($a0) -/* 89AFEC 80240C9C 24030003 */ addiu $v1, $zero, 3 -/* 89AFF0 80240CA0 24420001 */ addiu $v0, $v0, 1 -/* 89AFF4 80240CA4 A482008E */ sh $v0, 0x8e($a0) -/* 89AFF8 80240CA8 00021400 */ sll $v0, $v0, 0x10 -/* 89AFFC 80240CAC 00021403 */ sra $v0, $v0, 0x10 -/* 89B000 80240CB0 14430003 */ bne $v0, $v1, .L80240CC0 -/* 89B004 80240CB4 00000000 */ nop -/* 89B008 80240CB8 96020086 */ lhu $v0, 0x86($s0) -/* 89B00C 80240CBC A48200A8 */ sh $v0, 0xa8($a0) -.L80240CC0: -/* 89B010 80240CC0 8482008E */ lh $v0, 0x8e($a0) -/* 89B014 80240CC4 8E030080 */ lw $v1, 0x80($s0) -/* 89B018 80240CC8 0043102A */ slt $v0, $v0, $v1 -/* 89B01C 80240CCC 14400004 */ bnez $v0, .L80240CE0 -/* 89B020 80240CD0 00000000 */ nop -/* 89B024 80240CD4 96020086 */ lhu $v0, 0x86($s0) -/* 89B028 80240CD8 A48200A8 */ sh $v0, 0xa8($a0) -/* 89B02C 80240CDC AE200070 */ sw $zero, 0x70($s1) -.L80240CE0: -/* 89B030 80240CE0 8FBF0018 */ lw $ra, 0x18($sp) -/* 89B034 80240CE4 8FB10014 */ lw $s1, 0x14($sp) -/* 89B038 80240CE8 8FB00010 */ lw $s0, 0x10($sp) -/* 89B03C 80240CEC 03E00008 */ jr $ra -/* 89B040 80240CF0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_21/func_80240124_89D7A0.s b/asm/nonmatchings/world/area_tik/tik_21/func_80240124_89D7A0.s deleted file mode 100644 index 354d2734aa..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_21/func_80240124_89D7A0.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_89D8C4 -/* 89D8C4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 89D8C8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 89D8CC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 89D8D0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 89D8D4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 89D8D8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 89D8DC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 89D8E0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 89D8E4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 89D8E8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 89D8EC 8024014C 1440000E */ bnez $v0, .L80240188 -/* 89D8F0 80240150 00000000 */ nop -/* 89D8F4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 89D8F8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 89D8FC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 89D900 80240160 04610004 */ bgez $v1, .L80240174 -/* 89D904 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 89D908 80240168 3C020002 */ lui $v0, 2 -/* 89D90C 8024016C 08090061 */ j .L80240184 -/* 89D910 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 89D914 80240174 3C040002 */ lui $a0, 2 -/* 89D918 80240178 0083102A */ slt $v0, $a0, $v1 -/* 89D91C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 89D920 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 89D924 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 89D928 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 89D92C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 89D930 80240190 00000000 */ nop -/* 89D934 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 89D938 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 89D93C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 89D940 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 89D944 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 89D948 802401A8 3C020002 */ lui $v0, 2 -/* 89D94C 802401AC 08090071 */ j .L802401C4 -/* 89D950 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 89D954 802401B4 3C040002 */ lui $a0, 2 -/* 89D958 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 89D95C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 89D960 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 89D964 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 89D968 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 89D96C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 89D970 802401D0 00000000 */ nop -/* 89D974 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 89D978 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 89D97C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 89D980 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 89D984 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 89D988 802401E8 3C020002 */ lui $v0, 2 -/* 89D98C 802401EC 08090081 */ j .L80240204 -/* 89D990 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 89D994 802401F4 3C040002 */ lui $a0, 2 -/* 89D998 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 89D99C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 89D9A0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 89D9A4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 89D9A8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 89D9AC 8024020C 1440000E */ bnez $v0, .L80240248 -/* 89D9B0 80240210 00000000 */ nop -/* 89D9B4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 89D9B8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 89D9BC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 89D9C0 80240220 04610004 */ bgez $v1, .L80240234 -/* 89D9C4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 89D9C8 80240228 3C020002 */ lui $v0, 2 -/* 89D9CC 8024022C 08090091 */ j .L80240244 -/* 89D9D0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 89D9D4 80240234 3C040002 */ lui $a0, 2 -/* 89D9D8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 89D9DC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 89D9E0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 89D9E4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 89D9E8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 89D9EC 8024024C 0C046F07 */ jal set_main_pan_u -/* 89D9F0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 89D9F4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 89D9F8 80240258 0C046F0D */ jal set_main_pan_v -/* 89D9FC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 89DA00 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 89DA04 80240264 0C046F13 */ jal set_aux_pan_u -/* 89DA08 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 89DA0C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 89DA10 80240270 0C046F19 */ jal set_aux_pan_v -/* 89DA14 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 89DA18 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 89DA1C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 89DA20 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 89DA24 80240284 24420001 */ addiu $v0, $v0, 1 -/* 89DA28 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 89DA2C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 89DA30 80240290 24630001 */ addiu $v1, $v1, 1 -/* 89DA34 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 89DA38 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 89DA3C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 89DA40 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 89DA44 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 89DA48 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 89DA4C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 89DA50 802402B0 14600002 */ bnez $v1, .L802402BC -/* 89DA54 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 89DA58 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 89DA5C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 89DA60 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 89DA64 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 89DA68 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 89DA6C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 89DA70 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 89DA74 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 89DA78 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 89DA7C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 89DA80 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 89DA84 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 89DA88 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 89DA8C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 89DA90 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 89DA94 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 89DA98 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 89DA9C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 89DAA0 80240300 0000102D */ daddu $v0, $zero, $zero -/* 89DAA4 80240304 03E00008 */ jr $ra -/* 89DAA8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_21/func_8024030C_89D7A0.s b/asm/nonmatchings/world/area_tik/tik_21/func_8024030C_89D7A0.s deleted file mode 100644 index 5b030626be..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_21/func_8024030C_89D7A0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_89DAAC -/* 89DAAC 8024030C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 89DAB0 80240310 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 89DAB4 80240314 8C430004 */ lw $v1, 4($v0) -/* 89DAB8 80240318 3C040010 */ lui $a0, 0x10 -/* 89DABC 8024031C 00641825 */ or $v1, $v1, $a0 -/* 89DAC0 80240320 AC430004 */ sw $v1, 4($v0) -/* 89DAC4 80240324 03E00008 */ jr $ra -/* 89DAC8 80240328 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_21/func_8024032C_89D7A0.s b/asm/nonmatchings/world/area_tik/tik_21/func_8024032C_89D7A0.s deleted file mode 100644 index 00f0ae83b9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_21/func_8024032C_89D7A0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024032C_89DACC -/* 89DACC 8024032C 3C028016 */ lui $v0, 0x8016 -/* 89DAD0 80240330 8442A552 */ lh $v0, -0x5aae($v0) -/* 89DAD4 80240334 AC820084 */ sw $v0, 0x84($a0) -/* 89DAD8 80240338 03E00008 */ jr $ra -/* 89DADC 8024033C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_21/func_80240340_89D7A0.s b/asm/nonmatchings/world/area_tik/tik_21/func_80240340_89D7A0.s deleted file mode 100644 index 4cfb45eaa3..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_21/func_80240340_89D7A0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240340_89DAE0 -/* 89DAE0 80240340 3C038016 */ lui $v1, 0x8016 -/* 89DAE4 80240344 8463A552 */ lh $v1, -0x5aae($v1) -/* 89DAE8 80240348 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 89DAEC 8024034C AFB00010 */ sw $s0, 0x10($sp) -/* 89DAF0 80240350 0080802D */ daddu $s0, $a0, $zero -/* 89DAF4 80240354 AFBF0014 */ sw $ra, 0x14($sp) -/* 89DAF8 80240358 8E0200B0 */ lw $v0, 0xb0($s0) -/* 89DAFC 8024035C 10620003 */ beq $v1, $v0, .L8024036C -/* 89DB00 80240360 24020002 */ addiu $v0, $zero, 2 -/* 89DB04 80240364 080900FB */ j .L802403EC -/* 89DB08 80240368 AE000084 */ sw $zero, 0x84($s0) -.L8024036C: -/* 89DB0C 8024036C 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 89DB10 80240370 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 89DB14 80240374 80620040 */ lb $v0, 0x40($v1) -/* 89DB18 80240378 80670044 */ lb $a3, 0x44($v1) -/* 89DB1C 8024037C 04420001 */ bltzl $v0, .L80240384 -/* 89DB20 80240380 00021023 */ negu $v0, $v0 -.L80240384: -/* 89DB24 80240384 14400003 */ bnez $v0, .L80240394 -/* 89DB28 80240388 00000000 */ nop -/* 89DB2C 8024038C 50E00017 */ beql $a3, $zero, .L802403EC -/* 89DB30 80240390 0000102D */ daddu $v0, $zero, $zero -.L80240394: -/* 89DB34 80240394 44822000 */ mtc1 $v0, $f4 -/* 89DB38 80240398 00000000 */ nop -/* 89DB3C 8024039C 46802120 */ cvt.s.w $f4, $f4 -/* 89DB40 802403A0 44062000 */ mfc1 $a2, $f4 -/* 89DB44 802403A4 44872000 */ mtc1 $a3, $f4 -/* 89DB48 802403A8 00000000 */ nop -/* 89DB4C 802403AC 46802120 */ cvt.s.w $f4, $f4 -/* 89DB50 802403B0 44806000 */ mtc1 $zero, $f12 -/* 89DB54 802403B4 44072000 */ mfc1 $a3, $f4 -/* 89DB58 802403B8 0C00A720 */ jal atan2 -/* 89DB5C 802403BC 46006386 */ mov.s $f14, $f12 -/* 89DB60 802403C0 3C014270 */ lui $at, 0x4270 -/* 89DB64 802403C4 44811000 */ mtc1 $at, $f2 -/* 89DB68 802403C8 00000000 */ nop -/* 89DB6C 802403CC 4602003C */ c.lt.s $f0, $f2 -/* 89DB70 802403D0 00000000 */ nop -/* 89DB74 802403D4 45000004 */ bc1f .L802403E8 -/* 89DB78 802403D8 24020001 */ addiu $v0, $zero, 1 -/* 89DB7C 802403DC AE020084 */ sw $v0, 0x84($s0) -/* 89DB80 802403E0 080900FB */ j .L802403EC -/* 89DB84 802403E4 24020002 */ addiu $v0, $zero, 2 -.L802403E8: -/* 89DB88 802403E8 0000102D */ daddu $v0, $zero, $zero -.L802403EC: -/* 89DB8C 802403EC 8FBF0014 */ lw $ra, 0x14($sp) -/* 89DB90 802403F0 8FB00010 */ lw $s0, 0x10($sp) -/* 89DB94 802403F4 03E00008 */ jr $ra -/* 89DB98 802403F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_21/func_802403FC_89D7A0.s b/asm/nonmatchings/world/area_tik/tik_21/func_802403FC_89D7A0.s deleted file mode 100644 index 3342921e2a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_21/func_802403FC_89D7A0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403FC_89DB9C -/* 89DB9C 802403FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 89DBA0 80240400 AFB10014 */ sw $s1, 0x14($sp) -/* 89DBA4 80240404 0080882D */ daddu $s1, $a0, $zero -/* 89DBA8 80240408 AFBF001C */ sw $ra, 0x1c($sp) -/* 89DBAC 8024040C AFB20018 */ sw $s2, 0x18($sp) -/* 89DBB0 80240410 0C016AFA */ jal get_current_map_header -/* 89DBB4 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* 89DBB8 80240418 0220202D */ daddu $a0, $s1, $zero -/* 89DBBC 8024041C 3C05FE36 */ lui $a1, 0xfe36 -/* 89DBC0 80240420 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 89DBC4 80240424 0C0B1EAF */ jal get_variable -/* 89DBC8 80240428 0040902D */ daddu $s2, $v0, $zero -/* 89DBCC 8024042C 0220202D */ daddu $a0, $s1, $zero -/* 89DBD0 80240430 3C05FE36 */ lui $a1, 0xfe36 -/* 89DBD4 80240434 8E430014 */ lw $v1, 0x14($s2) -/* 89DBD8 80240438 00028100 */ sll $s0, $v0, 4 -/* 89DBDC 8024043C 02031821 */ addu $v1, $s0, $v1 -/* 89DBE0 80240440 C4600000 */ lwc1 $f0, ($v1) -/* 89DBE4 80240444 4600008D */ trunc.w.s $f2, $f0 -/* 89DBE8 80240448 44061000 */ mfc1 $a2, $f2 -/* 89DBEC 8024044C 0C0B2026 */ jal set_variable -/* 89DBF0 80240450 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 89DBF4 80240454 0220202D */ daddu $a0, $s1, $zero -/* 89DBF8 80240458 8E420014 */ lw $v0, 0x14($s2) -/* 89DBFC 8024045C 3C05FE36 */ lui $a1, 0xfe36 -/* 89DC00 80240460 02021021 */ addu $v0, $s0, $v0 -/* 89DC04 80240464 C4400004 */ lwc1 $f0, 4($v0) -/* 89DC08 80240468 4600008D */ trunc.w.s $f2, $f0 -/* 89DC0C 8024046C 44061000 */ mfc1 $a2, $f2 -/* 89DC10 80240470 0C0B2026 */ jal set_variable -/* 89DC14 80240474 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 89DC18 80240478 0220202D */ daddu $a0, $s1, $zero -/* 89DC1C 8024047C 8E420014 */ lw $v0, 0x14($s2) -/* 89DC20 80240480 3C05FE36 */ lui $a1, 0xfe36 -/* 89DC24 80240484 02021021 */ addu $v0, $s0, $v0 -/* 89DC28 80240488 C4400008 */ lwc1 $f0, 8($v0) -/* 89DC2C 8024048C 4600008D */ trunc.w.s $f2, $f0 -/* 89DC30 80240490 44061000 */ mfc1 $a2, $f2 -/* 89DC34 80240494 0C0B2026 */ jal set_variable -/* 89DC38 80240498 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 89DC3C 8024049C 0220202D */ daddu $a0, $s1, $zero -/* 89DC40 802404A0 8E420014 */ lw $v0, 0x14($s2) -/* 89DC44 802404A4 3C05FE36 */ lui $a1, 0xfe36 -/* 89DC48 802404A8 02028021 */ addu $s0, $s0, $v0 -/* 89DC4C 802404AC C600000C */ lwc1 $f0, 0xc($s0) -/* 89DC50 802404B0 4600008D */ trunc.w.s $f2, $f0 -/* 89DC54 802404B4 44061000 */ mfc1 $a2, $f2 -/* 89DC58 802404B8 0C0B2026 */ jal set_variable -/* 89DC5C 802404BC 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 89DC60 802404C0 8FBF001C */ lw $ra, 0x1c($sp) -/* 89DC64 802404C4 8FB20018 */ lw $s2, 0x18($sp) -/* 89DC68 802404C8 8FB10014 */ lw $s1, 0x14($sp) -/* 89DC6C 802404CC 8FB00010 */ lw $s0, 0x10($sp) -/* 89DC70 802404D0 24020002 */ addiu $v0, $zero, 2 -/* 89DC74 802404D4 03E00008 */ jr $ra -/* 89DC78 802404D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_21/func_802404DC_89D7A0.s b/asm/nonmatchings/world/area_tik/tik_21/func_802404DC_89D7A0.s deleted file mode 100644 index 649fc5982d..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_21/func_802404DC_89D7A0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404DC_89DC7C -/* 89DC7C 802404DC 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 89DC80 802404E0 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 89DC84 802404E4 3C014334 */ lui $at, 0x4334 -/* 89DC88 802404E8 44816000 */ mtc1 $at, $f12 -/* 89DC8C 802404EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 89DC90 802404F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 89DC94 802404F4 AFB00010 */ sw $s0, 0x10($sp) -/* 89DC98 802404F8 00031080 */ sll $v0, $v1, 2 -/* 89DC9C 802404FC 00431021 */ addu $v0, $v0, $v1 -/* 89DCA0 80240500 00021080 */ sll $v0, $v0, 2 -/* 89DCA4 80240504 00431023 */ subu $v0, $v0, $v1 -/* 89DCA8 80240508 000218C0 */ sll $v1, $v0, 3 -/* 89DCAC 8024050C 00431021 */ addu $v0, $v0, $v1 -/* 89DCB0 80240510 000210C0 */ sll $v0, $v0, 3 -/* 89DCB4 80240514 3C01800B */ lui $at, 0x800b -/* 89DCB8 80240518 00220821 */ addu $at, $at, $v0 -/* 89DCBC 8024051C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 89DCC0 80240520 460C0300 */ add.s $f12, $f0, $f12 -/* 89DCC4 80240524 0C00A6C9 */ jal clamp_angle -/* 89DCC8 80240528 0080802D */ daddu $s0, $a0, $zero -/* 89DCCC 8024052C 4600008D */ trunc.w.s $f2, $f0 -/* 89DCD0 80240530 E6020084 */ swc1 $f2, 0x84($s0) -/* 89DCD4 80240534 8FBF0014 */ lw $ra, 0x14($sp) -/* 89DCD8 80240538 8FB00010 */ lw $s0, 0x10($sp) -/* 89DCDC 8024053C 24020002 */ addiu $v0, $zero, 2 -/* 89DCE0 80240540 03E00008 */ jr $ra -/* 89DCE4 80240544 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_21/func_80240548_89D7A0.s b/asm/nonmatchings/world/area_tik/tik_21/func_80240548_89D7A0.s deleted file mode 100644 index 7d155a3ef5..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_21/func_80240548_89D7A0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240548_89DCE8 -/* 89DCE8 80240548 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 89DCEC 8024054C AFB00018 */ sw $s0, 0x18($sp) -/* 89DCF0 80240550 0080802D */ daddu $s0, $a0, $zero -/* 89DCF4 80240554 AFBF001C */ sw $ra, 0x1c($sp) -/* 89DCF8 80240558 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 89DCFC 8024055C 8E02000C */ lw $v0, 0xc($s0) -/* 89DD00 80240560 0C0B210B */ jal get_float_variable -/* 89DD04 80240564 8C450000 */ lw $a1, ($v0) -/* 89DD08 80240568 27A40010 */ addiu $a0, $sp, 0x10 -/* 89DD0C 8024056C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 89DD10 80240570 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 89DD14 80240574 44060000 */ mfc1 $a2, $f0 -/* 89DD18 80240578 C4400028 */ lwc1 $f0, 0x28($v0) -/* 89DD1C 8024057C C4420030 */ lwc1 $f2, 0x30($v0) -/* 89DD20 80240580 E7A00010 */ swc1 $f0, 0x10($sp) -/* 89DD24 80240584 E7A20014 */ swc1 $f2, 0x14($sp) -/* 89DD28 80240588 8C470080 */ lw $a3, 0x80($v0) -/* 89DD2C 8024058C C454002C */ lwc1 $f20, 0x2c($v0) -/* 89DD30 80240590 0C00A7E7 */ jal add_vec2D_polar -/* 89DD34 80240594 27A50014 */ addiu $a1, $sp, 0x14 -/* 89DD38 80240598 0200202D */ daddu $a0, $s0, $zero -/* 89DD3C 8024059C 3C05FE36 */ lui $a1, 0xfe36 -/* 89DD40 802405A0 8FA60010 */ lw $a2, 0x10($sp) -/* 89DD44 802405A4 0C0B2190 */ jal set_float_variable -/* 89DD48 802405A8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 89DD4C 802405AC 0200202D */ daddu $a0, $s0, $zero -/* 89DD50 802405B0 3C05FE36 */ lui $a1, 0xfe36 -/* 89DD54 802405B4 4406A000 */ mfc1 $a2, $f20 -/* 89DD58 802405B8 0C0B2190 */ jal set_float_variable -/* 89DD5C 802405BC 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 89DD60 802405C0 0200202D */ daddu $a0, $s0, $zero -/* 89DD64 802405C4 3C05FE36 */ lui $a1, 0xfe36 -/* 89DD68 802405C8 8FA60014 */ lw $a2, 0x14($sp) -/* 89DD6C 802405CC 0C0B2190 */ jal set_float_variable -/* 89DD70 802405D0 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 89DD74 802405D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 89DD78 802405D8 8FB00018 */ lw $s0, 0x18($sp) -/* 89DD7C 802405DC D7B40020 */ ldc1 $f20, 0x20($sp) -/* 89DD80 802405E0 24020002 */ addiu $v0, $zero, 2 -/* 89DD84 802405E4 03E00008 */ jr $ra -/* 89DD88 802405E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_21/func_802405EC_89D7A0.s b/asm/nonmatchings/world/area_tik/tik_21/func_802405EC_89D7A0.s deleted file mode 100644 index e8be0cedaa..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_21/func_802405EC_89D7A0.s +++ /dev/null @@ -1,235 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_89DD8C -/* 89DD8C 802405EC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 89DD90 802405F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 89DD94 802405F4 0080982D */ daddu $s3, $a0, $zero -/* 89DD98 802405F8 AFBF0020 */ sw $ra, 0x20($sp) -/* 89DD9C 802405FC AFB20018 */ sw $s2, 0x18($sp) -/* 89DDA0 80240600 AFB10014 */ sw $s1, 0x14($sp) -/* 89DDA4 80240604 AFB00010 */ sw $s0, 0x10($sp) -/* 89DDA8 80240608 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 89DDAC 8024060C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 89DDB0 80240610 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 89DDB4 80240614 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 89DDB8 80240618 8E62000C */ lw $v0, 0xc($s3) -/* 89DDBC 8024061C 0C0B1EAF */ jal get_variable -/* 89DDC0 80240620 8C450000 */ lw $a1, ($v0) -/* 89DDC4 80240624 2404FFFC */ addiu $a0, $zero, -4 -/* 89DDC8 80240628 0C00EABB */ jal get_npc_unsafe -/* 89DDCC 8024062C 0040802D */ daddu $s0, $v0, $zero -/* 89DDD0 80240630 0200202D */ daddu $a0, $s0, $zero -/* 89DDD4 80240634 0C046C04 */ jal get_model_list_index_from_tree_index -/* 89DDD8 80240638 0040802D */ daddu $s0, $v0, $zero -/* 89DDDC 8024063C 0C046B4C */ jal get_model_from_list_index -/* 89DDE0 80240640 0040202D */ daddu $a0, $v0, $zero -/* 89DDE4 80240644 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 89DDE8 80240648 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 89DDEC 8024064C 0040902D */ daddu $s2, $v0, $zero -/* 89DDF0 80240650 AE60008C */ sw $zero, 0x8c($s3) -/* 89DDF4 80240654 C4620028 */ lwc1 $f2, 0x28($v1) -/* 89DDF8 80240658 C6400098 */ lwc1 $f0, 0x98($s2) -/* 89DDFC 8024065C 46001081 */ sub.s $f2, $f2, $f0 -/* 89DE00 80240660 46021182 */ mul.s $f6, $f2, $f2 -/* 89DE04 80240664 00000000 */ nop -/* 89DE08 80240668 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 89DE0C 8024066C C4620030 */ lwc1 $f2, 0x30($v1) -/* 89DE10 80240670 46001081 */ sub.s $f2, $f2, $f0 -/* 89DE14 80240674 46021102 */ mul.s $f4, $f2, $f2 -/* 89DE18 80240678 00000000 */ nop -/* 89DE1C 8024067C 846200B0 */ lh $v0, 0xb0($v1) -/* 89DE20 80240680 C462002C */ lwc1 $f2, 0x2c($v1) -/* 89DE24 80240684 44820000 */ mtc1 $v0, $f0 -/* 89DE28 80240688 00000000 */ nop -/* 89DE2C 8024068C 46800020 */ cvt.s.w $f0, $f0 -/* 89DE30 80240690 46001080 */ add.s $f2, $f2, $f0 -/* 89DE34 80240694 3C013FC0 */ lui $at, 0x3fc0 -/* 89DE38 80240698 44810000 */ mtc1 $at, $f0 -/* 89DE3C 8024069C 00000000 */ nop -/* 89DE40 802406A0 46001081 */ sub.s $f2, $f2, $f0 -/* 89DE44 802406A4 46043300 */ add.s $f12, $f6, $f4 -/* 89DE48 802406A8 C640009C */ lwc1 $f0, 0x9c($s2) -/* 89DE4C 802406AC 46001501 */ sub.s $f20, $f2, $f0 -/* 89DE50 802406B0 46006084 */ sqrt.s $f2, $f12 -/* 89DE54 802406B4 46021032 */ c.eq.s $f2, $f2 -/* 89DE58 802406B8 00000000 */ nop -/* 89DE5C 802406BC 45010004 */ bc1t .L802406D0 -/* 89DE60 802406C0 0060882D */ daddu $s1, $v1, $zero -/* 89DE64 802406C4 0C0187BC */ jal sqrtf -/* 89DE68 802406C8 00000000 */ nop -/* 89DE6C 802406CC 46000086 */ mov.s $f2, $f0 -.L802406D0: -/* 89DE70 802406D0 44800000 */ mtc1 $zero, $f0 -/* 89DE74 802406D4 00000000 */ nop -/* 89DE78 802406D8 4614003C */ c.lt.s $f0, $f20 -/* 89DE7C 802406DC 00000000 */ nop -/* 89DE80 802406E0 45000016 */ bc1f .L8024073C -/* 89DE84 802406E4 46001106 */ mov.s $f4, $f2 -/* 89DE88 802406E8 862200B0 */ lh $v0, 0xb0($s1) -/* 89DE8C 802406EC 44820000 */ mtc1 $v0, $f0 -/* 89DE90 802406F0 00000000 */ nop -/* 89DE94 802406F4 46800020 */ cvt.s.w $f0, $f0 -/* 89DE98 802406F8 4600A03C */ c.lt.s $f20, $f0 -/* 89DE9C 802406FC 00000000 */ nop -/* 89DEA0 80240700 4500000E */ bc1f .L8024073C -/* 89DEA4 80240704 00000000 */ nop -/* 89DEA8 80240708 862200B2 */ lh $v0, 0xb2($s1) -/* 89DEAC 8024070C 3C013F00 */ lui $at, 0x3f00 -/* 89DEB0 80240710 44811000 */ mtc1 $at, $f2 -/* 89DEB4 80240714 44820000 */ mtc1 $v0, $f0 -/* 89DEB8 80240718 00000000 */ nop -/* 89DEBC 8024071C 46800020 */ cvt.s.w $f0, $f0 -/* 89DEC0 80240720 46020002 */ mul.s $f0, $f0, $f2 -/* 89DEC4 80240724 00000000 */ nop -/* 89DEC8 80240728 4600203C */ c.lt.s $f4, $f0 -/* 89DECC 8024072C 00000000 */ nop -/* 89DED0 80240730 45000002 */ bc1f .L8024073C -/* 89DED4 80240734 24020001 */ addiu $v0, $zero, 1 -/* 89DED8 80240738 AE62008C */ sw $v0, 0x8c($s3) -.L8024073C: -/* 89DEDC 8024073C C6020038 */ lwc1 $f2, 0x38($s0) -/* 89DEE0 80240740 C6400098 */ lwc1 $f0, 0x98($s2) -/* 89DEE4 80240744 46001081 */ sub.s $f2, $f2, $f0 -/* 89DEE8 80240748 46021182 */ mul.s $f6, $f2, $f2 -/* 89DEEC 8024074C 00000000 */ nop -/* 89DEF0 80240750 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 89DEF4 80240754 C6020040 */ lwc1 $f2, 0x40($s0) -/* 89DEF8 80240758 46001081 */ sub.s $f2, $f2, $f0 -/* 89DEFC 8024075C 46021102 */ mul.s $f4, $f2, $f2 -/* 89DF00 80240760 00000000 */ nop -/* 89DF04 80240764 860200A8 */ lh $v0, 0xa8($s0) -/* 89DF08 80240768 C602003C */ lwc1 $f2, 0x3c($s0) -/* 89DF0C 8024076C 44820000 */ mtc1 $v0, $f0 -/* 89DF10 80240770 00000000 */ nop -/* 89DF14 80240774 46800020 */ cvt.s.w $f0, $f0 -/* 89DF18 80240778 46001080 */ add.s $f2, $f2, $f0 -/* 89DF1C 8024077C 3C013FC0 */ lui $at, 0x3fc0 -/* 89DF20 80240780 44810000 */ mtc1 $at, $f0 -/* 89DF24 80240784 00000000 */ nop -/* 89DF28 80240788 46001081 */ sub.s $f2, $f2, $f0 -/* 89DF2C 8024078C 46043300 */ add.s $f12, $f6, $f4 -/* 89DF30 80240790 C640009C */ lwc1 $f0, 0x9c($s2) -/* 89DF34 80240794 46001501 */ sub.s $f20, $f2, $f0 -/* 89DF38 80240798 46006084 */ sqrt.s $f2, $f12 -/* 89DF3C 8024079C 46021032 */ c.eq.s $f2, $f2 -/* 89DF40 802407A0 00000000 */ nop -/* 89DF44 802407A4 45010004 */ bc1t .L802407B8 -/* 89DF48 802407A8 00000000 */ nop -/* 89DF4C 802407AC 0C0187BC */ jal sqrtf -/* 89DF50 802407B0 00000000 */ nop -/* 89DF54 802407B4 46000086 */ mov.s $f2, $f0 -.L802407B8: -/* 89DF58 802407B8 44800000 */ mtc1 $zero, $f0 -/* 89DF5C 802407BC 00000000 */ nop -/* 89DF60 802407C0 4614003C */ c.lt.s $f0, $f20 -/* 89DF64 802407C4 00000000 */ nop -/* 89DF68 802407C8 45000016 */ bc1f .L80240824 -/* 89DF6C 802407CC 46001106 */ mov.s $f4, $f2 -/* 89DF70 802407D0 860200A8 */ lh $v0, 0xa8($s0) -/* 89DF74 802407D4 44820000 */ mtc1 $v0, $f0 -/* 89DF78 802407D8 00000000 */ nop -/* 89DF7C 802407DC 46800020 */ cvt.s.w $f0, $f0 -/* 89DF80 802407E0 4600A03C */ c.lt.s $f20, $f0 -/* 89DF84 802407E4 00000000 */ nop -/* 89DF88 802407E8 4500000F */ bc1f .L80240828 -/* 89DF8C 802407EC 0000882D */ daddu $s1, $zero, $zero -/* 89DF90 802407F0 860200A6 */ lh $v0, 0xa6($s0) -/* 89DF94 802407F4 3C013F00 */ lui $at, 0x3f00 -/* 89DF98 802407F8 44811000 */ mtc1 $at, $f2 -/* 89DF9C 802407FC 44820000 */ mtc1 $v0, $f0 -/* 89DFA0 80240800 00000000 */ nop -/* 89DFA4 80240804 46800020 */ cvt.s.w $f0, $f0 -/* 89DFA8 80240808 46020002 */ mul.s $f0, $f0, $f2 -/* 89DFAC 8024080C 00000000 */ nop -/* 89DFB0 80240810 4600203C */ c.lt.s $f4, $f0 -/* 89DFB4 80240814 00000000 */ nop -/* 89DFB8 80240818 45000003 */ bc1f .L80240828 -/* 89DFBC 8024081C 24020001 */ addiu $v0, $zero, 1 -/* 89DFC0 80240820 AE62008C */ sw $v0, 0x8c($s3) -.L80240824: -/* 89DFC4 80240824 0000882D */ daddu $s1, $zero, $zero -.L80240828: -/* 89DFC8 80240828 3C013FC0 */ lui $at, 0x3fc0 -/* 89DFCC 8024082C 4481D000 */ mtc1 $at, $f26 -/* 89DFD0 80240830 4480C000 */ mtc1 $zero, $f24 -/* 89DFD4 80240834 3C013F00 */ lui $at, 0x3f00 -/* 89DFD8 80240838 4481B000 */ mtc1 $at, $f22 -.L8024083C: -/* 89DFDC 8024083C 0C00EAD2 */ jal get_npc_safe -/* 89DFE0 80240840 0220202D */ daddu $a0, $s1, $zero -/* 89DFE4 80240844 0040802D */ daddu $s0, $v0, $zero -/* 89DFE8 80240848 52000035 */ beql $s0, $zero, .L80240920 -/* 89DFEC 8024084C 26310001 */ addiu $s1, $s1, 1 -/* 89DFF0 80240850 C6020038 */ lwc1 $f2, 0x38($s0) -/* 89DFF4 80240854 C6400098 */ lwc1 $f0, 0x98($s2) -/* 89DFF8 80240858 46001081 */ sub.s $f2, $f2, $f0 -/* 89DFFC 8024085C 46021182 */ mul.s $f6, $f2, $f2 -/* 89E000 80240860 00000000 */ nop -/* 89E004 80240864 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 89E008 80240868 C6020040 */ lwc1 $f2, 0x40($s0) -/* 89E00C 8024086C 46001081 */ sub.s $f2, $f2, $f0 -/* 89E010 80240870 46021102 */ mul.s $f4, $f2, $f2 -/* 89E014 80240874 00000000 */ nop -/* 89E018 80240878 860200A8 */ lh $v0, 0xa8($s0) -/* 89E01C 8024087C C602003C */ lwc1 $f2, 0x3c($s0) -/* 89E020 80240880 44820000 */ mtc1 $v0, $f0 -/* 89E024 80240884 00000000 */ nop -/* 89E028 80240888 46800020 */ cvt.s.w $f0, $f0 -/* 89E02C 8024088C 46001080 */ add.s $f2, $f2, $f0 -/* 89E030 80240890 461A1081 */ sub.s $f2, $f2, $f26 -/* 89E034 80240894 46043300 */ add.s $f12, $f6, $f4 -/* 89E038 80240898 C640009C */ lwc1 $f0, 0x9c($s2) -/* 89E03C 8024089C 46001501 */ sub.s $f20, $f2, $f0 -/* 89E040 802408A0 46006004 */ sqrt.s $f0, $f12 -/* 89E044 802408A4 46000032 */ c.eq.s $f0, $f0 -/* 89E048 802408A8 00000000 */ nop -/* 89E04C 802408AC 45010003 */ bc1t .L802408BC -/* 89E050 802408B0 00000000 */ nop -/* 89E054 802408B4 0C0187BC */ jal sqrtf -/* 89E058 802408B8 00000000 */ nop -.L802408BC: -/* 89E05C 802408BC 4614C03C */ c.lt.s $f24, $f20 -/* 89E060 802408C0 00000000 */ nop -/* 89E064 802408C4 45000015 */ bc1f .L8024091C -/* 89E068 802408C8 46000106 */ mov.s $f4, $f0 -/* 89E06C 802408CC 860200A8 */ lh $v0, 0xa8($s0) -/* 89E070 802408D0 44820000 */ mtc1 $v0, $f0 -/* 89E074 802408D4 00000000 */ nop -/* 89E078 802408D8 46800020 */ cvt.s.w $f0, $f0 -/* 89E07C 802408DC 4600A03C */ c.lt.s $f20, $f0 -/* 89E080 802408E0 00000000 */ nop -/* 89E084 802408E4 4500000E */ bc1f .L80240920 -/* 89E088 802408E8 26310001 */ addiu $s1, $s1, 1 -/* 89E08C 802408EC 860200A6 */ lh $v0, 0xa6($s0) -/* 89E090 802408F0 44820000 */ mtc1 $v0, $f0 -/* 89E094 802408F4 00000000 */ nop -/* 89E098 802408F8 46800020 */ cvt.s.w $f0, $f0 -/* 89E09C 802408FC 46160002 */ mul.s $f0, $f0, $f22 -/* 89E0A0 80240900 00000000 */ nop -/* 89E0A4 80240904 4600203C */ c.lt.s $f4, $f0 -/* 89E0A8 80240908 00000000 */ nop -/* 89E0AC 8024090C 45000004 */ bc1f .L80240920 -/* 89E0B0 80240910 24020001 */ addiu $v0, $zero, 1 -/* 89E0B4 80240914 0809024B */ j .L8024092C -/* 89E0B8 80240918 AE62008C */ sw $v0, 0x8c($s3) -.L8024091C: -/* 89E0BC 8024091C 26310001 */ addiu $s1, $s1, 1 -.L80240920: -/* 89E0C0 80240920 2A220040 */ slti $v0, $s1, 0x40 -/* 89E0C4 80240924 1440FFC5 */ bnez $v0, .L8024083C -/* 89E0C8 80240928 00000000 */ nop -.L8024092C: -/* 89E0CC 8024092C 8FBF0020 */ lw $ra, 0x20($sp) -/* 89E0D0 80240930 8FB3001C */ lw $s3, 0x1c($sp) -/* 89E0D4 80240934 8FB20018 */ lw $s2, 0x18($sp) -/* 89E0D8 80240938 8FB10014 */ lw $s1, 0x14($sp) -/* 89E0DC 8024093C 8FB00010 */ lw $s0, 0x10($sp) -/* 89E0E0 80240940 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 89E0E4 80240944 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 89E0E8 80240948 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 89E0EC 8024094C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 89E0F0 80240950 24020002 */ addiu $v0, $zero, 2 -/* 89E0F4 80240954 03E00008 */ jr $ra -/* 89E0F8 80240958 27BD0048 */ addiu $sp, $sp, 0x48 -/* 89E0FC 8024095C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_22/func_80240030_89FEC0.s b/asm/nonmatchings/world/area_tik/tik_22/func_80240030_89FEC0.s deleted file mode 100644 index 9023021b88..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_22/func_80240030_89FEC0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240030_89FEF0 -/* 89FEF0 80240030 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 89FEF4 80240034 AFB00010 */ sw $s0, 0x10($sp) -/* 89FEF8 80240038 0080802D */ daddu $s0, $a0, $zero -/* 89FEFC 8024003C AFBF0014 */ sw $ra, 0x14($sp) -/* 89FF00 80240040 8E0300A8 */ lw $v1, 0xa8($s0) -/* 89FF04 80240044 8E020088 */ lw $v0, 0x88($s0) -/* 89FF08 80240048 00621821 */ addu $v1, $v1, $v0 -/* 89FF0C 8024004C 04610004 */ bgez $v1, .L80240060 -/* 89FF10 80240050 AE0300A8 */ sw $v1, 0xa8($s0) -/* 89FF14 80240054 3C020002 */ lui $v0, 2 -/* 89FF18 80240058 0809001C */ j .L80240070 -/* 89FF1C 8024005C 00621021 */ addu $v0, $v1, $v0 -.L80240060: -/* 89FF20 80240060 3C040002 */ lui $a0, 2 -/* 89FF24 80240064 0083102A */ slt $v0, $a0, $v1 -/* 89FF28 80240068 10400002 */ beqz $v0, .L80240074 -/* 89FF2C 8024006C 00641023 */ subu $v0, $v1, $a0 -.L80240070: -/* 89FF30 80240070 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240074: -/* 89FF34 80240074 8E0300AC */ lw $v1, 0xac($s0) -/* 89FF38 80240078 8E02008C */ lw $v0, 0x8c($s0) -/* 89FF3C 8024007C 00621821 */ addu $v1, $v1, $v0 -/* 89FF40 80240080 04610004 */ bgez $v1, .L80240094 -/* 89FF44 80240084 AE0300AC */ sw $v1, 0xac($s0) -/* 89FF48 80240088 3C020002 */ lui $v0, 2 -/* 89FF4C 8024008C 08090029 */ j .L802400A4 -/* 89FF50 80240090 00621021 */ addu $v0, $v1, $v0 -.L80240094: -/* 89FF54 80240094 3C040002 */ lui $a0, 2 -/* 89FF58 80240098 0083102A */ slt $v0, $a0, $v1 -/* 89FF5C 8024009C 10400002 */ beqz $v0, .L802400A8 -/* 89FF60 802400A0 00641023 */ subu $v0, $v1, $a0 -.L802400A4: -/* 89FF64 802400A4 AE0200AC */ sw $v0, 0xac($s0) -.L802400A8: -/* 89FF68 802400A8 8E0300B0 */ lw $v1, 0xb0($s0) -/* 89FF6C 802400AC 8E020090 */ lw $v0, 0x90($s0) -/* 89FF70 802400B0 00621821 */ addu $v1, $v1, $v0 -/* 89FF74 802400B4 04610004 */ bgez $v1, .L802400C8 -/* 89FF78 802400B8 AE0300B0 */ sw $v1, 0xb0($s0) -/* 89FF7C 802400BC 3C020002 */ lui $v0, 2 -/* 89FF80 802400C0 08090036 */ j .L802400D8 -/* 89FF84 802400C4 00621021 */ addu $v0, $v1, $v0 -.L802400C8: -/* 89FF88 802400C8 3C040002 */ lui $a0, 2 -/* 89FF8C 802400CC 0083102A */ slt $v0, $a0, $v1 -/* 89FF90 802400D0 10400002 */ beqz $v0, .L802400DC -/* 89FF94 802400D4 00641023 */ subu $v0, $v1, $a0 -.L802400D8: -/* 89FF98 802400D8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400DC: -/* 89FF9C 802400DC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 89FFA0 802400E0 8E020094 */ lw $v0, 0x94($s0) -/* 89FFA4 802400E4 00621821 */ addu $v1, $v1, $v0 -/* 89FFA8 802400E8 04610004 */ bgez $v1, .L802400FC -/* 89FFAC 802400EC AE0300B4 */ sw $v1, 0xb4($s0) -/* 89FFB0 802400F0 3C020002 */ lui $v0, 2 -/* 89FFB4 802400F4 08090043 */ j .L8024010C -/* 89FFB8 802400F8 00621021 */ addu $v0, $v1, $v0 -.L802400FC: -/* 89FFBC 802400FC 3C040002 */ lui $a0, 2 -/* 89FFC0 80240100 0083102A */ slt $v0, $a0, $v1 -/* 89FFC4 80240104 10400002 */ beqz $v0, .L80240110 -/* 89FFC8 80240108 00641023 */ subu $v0, $v1, $a0 -.L8024010C: -/* 89FFCC 8024010C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240110: -/* 89FFD0 80240110 8E040084 */ lw $a0, 0x84($s0) -/* 89FFD4 80240114 0C046F07 */ jal set_main_pan_u -/* 89FFD8 80240118 8E0500A8 */ lw $a1, 0xa8($s0) -/* 89FFDC 8024011C 8E040084 */ lw $a0, 0x84($s0) -/* 89FFE0 80240120 0C046F0D */ jal set_main_pan_v -/* 89FFE4 80240124 8E0500AC */ lw $a1, 0xac($s0) -/* 89FFE8 80240128 8E040084 */ lw $a0, 0x84($s0) -/* 89FFEC 8024012C 0C046F13 */ jal set_aux_pan_u -/* 89FFF0 80240130 8E0500B0 */ lw $a1, 0xb0($s0) -/* 89FFF4 80240134 8E040084 */ lw $a0, 0x84($s0) -/* 89FFF8 80240138 0C046F19 */ jal set_aux_pan_v -/* 89FFFC 8024013C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8A0000 80240140 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A0004 80240144 8FB00010 */ lw $s0, 0x10($sp) -/* 8A0008 80240148 0000102D */ daddu $v0, $zero, $zero -/* 8A000C 8024014C 03E00008 */ jr $ra -/* 8A0010 80240150 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_22/func_8024050C_89FEC0.s b/asm/nonmatchings/world/area_tik/tik_22/func_8024050C_89FEC0.s deleted file mode 100644 index 20b3b9dfc7..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_22/func_8024050C_89FEC0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024050C_8A03CC -/* 8A03CC 8024050C 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8A03D0 80240510 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8A03D4 80240514 3C014334 */ lui $at, 0x4334 -/* 8A03D8 80240518 44816000 */ mtc1 $at, $f12 -/* 8A03DC 8024051C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A03E0 80240520 AFBF0014 */ sw $ra, 0x14($sp) -/* 8A03E4 80240524 AFB00010 */ sw $s0, 0x10($sp) -/* 8A03E8 80240528 00031080 */ sll $v0, $v1, 2 -/* 8A03EC 8024052C 00431021 */ addu $v0, $v0, $v1 -/* 8A03F0 80240530 00021080 */ sll $v0, $v0, 2 -/* 8A03F4 80240534 00431023 */ subu $v0, $v0, $v1 -/* 8A03F8 80240538 000218C0 */ sll $v1, $v0, 3 -/* 8A03FC 8024053C 00431021 */ addu $v0, $v0, $v1 -/* 8A0400 80240540 000210C0 */ sll $v0, $v0, 3 -/* 8A0404 80240544 3C01800B */ lui $at, 0x800b -/* 8A0408 80240548 00220821 */ addu $at, $at, $v0 -/* 8A040C 8024054C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8A0410 80240550 460C0300 */ add.s $f12, $f0, $f12 -/* 8A0414 80240554 0C00A6C9 */ jal clamp_angle -/* 8A0418 80240558 0080802D */ daddu $s0, $a0, $zero -/* 8A041C 8024055C 4600008D */ trunc.w.s $f2, $f0 -/* 8A0420 80240560 E6020084 */ swc1 $f2, 0x84($s0) -/* 8A0424 80240564 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A0428 80240568 8FB00010 */ lw $s0, 0x10($sp) -/* 8A042C 8024056C 24020002 */ addiu $v0, $zero, 2 -/* 8A0430 80240570 03E00008 */ jr $ra -/* 8A0434 80240574 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_22/func_80240578_89FEC0.s b/asm/nonmatchings/world/area_tik/tik_22/func_80240578_89FEC0.s deleted file mode 100644 index 93520fb7ca..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_22/func_80240578_89FEC0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240578_8A0438 -/* 8A0438 80240578 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8A043C 8024057C AFB00018 */ sw $s0, 0x18($sp) -/* 8A0440 80240580 0080802D */ daddu $s0, $a0, $zero -/* 8A0444 80240584 AFBF001C */ sw $ra, 0x1c($sp) -/* 8A0448 80240588 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8A044C 8024058C 8E02000C */ lw $v0, 0xc($s0) -/* 8A0450 80240590 0C0B210B */ jal get_float_variable -/* 8A0454 80240594 8C450000 */ lw $a1, ($v0) -/* 8A0458 80240598 27A40010 */ addiu $a0, $sp, 0x10 -/* 8A045C 8024059C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 8A0460 802405A0 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 8A0464 802405A4 44060000 */ mfc1 $a2, $f0 -/* 8A0468 802405A8 C4400028 */ lwc1 $f0, 0x28($v0) -/* 8A046C 802405AC C4420030 */ lwc1 $f2, 0x30($v0) -/* 8A0470 802405B0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8A0474 802405B4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8A0478 802405B8 8C470080 */ lw $a3, 0x80($v0) -/* 8A047C 802405BC C454002C */ lwc1 $f20, 0x2c($v0) -/* 8A0480 802405C0 0C00A7E7 */ jal add_vec2D_polar -/* 8A0484 802405C4 27A50014 */ addiu $a1, $sp, 0x14 -/* 8A0488 802405C8 0200202D */ daddu $a0, $s0, $zero -/* 8A048C 802405CC 3C05FE36 */ lui $a1, 0xfe36 -/* 8A0490 802405D0 8FA60010 */ lw $a2, 0x10($sp) -/* 8A0494 802405D4 0C0B2190 */ jal set_float_variable -/* 8A0498 802405D8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8A049C 802405DC 0200202D */ daddu $a0, $s0, $zero -/* 8A04A0 802405E0 3C05FE36 */ lui $a1, 0xfe36 -/* 8A04A4 802405E4 4406A000 */ mfc1 $a2, $f20 -/* 8A04A8 802405E8 0C0B2190 */ jal set_float_variable -/* 8A04AC 802405EC 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8A04B0 802405F0 0200202D */ daddu $a0, $s0, $zero -/* 8A04B4 802405F4 3C05FE36 */ lui $a1, 0xfe36 -/* 8A04B8 802405F8 8FA60014 */ lw $a2, 0x14($sp) -/* 8A04BC 802405FC 0C0B2190 */ jal set_float_variable -/* 8A04C0 80240600 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8A04C4 80240604 8FBF001C */ lw $ra, 0x1c($sp) -/* 8A04C8 80240608 8FB00018 */ lw $s0, 0x18($sp) -/* 8A04CC 8024060C D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8A04D0 80240610 24020002 */ addiu $v0, $zero, 2 -/* 8A04D4 80240614 03E00008 */ jr $ra -/* 8A04D8 80240618 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_23/func_80240020_8A23D0.s b/asm/nonmatchings/world/area_tik/tik_23/func_80240020_8A23D0.s deleted file mode 100644 index 98e3ad0d7e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/func_80240020_8A23D0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_8A23F0 -/* 8A23F0 80240020 3C028016 */ lui $v0, 0x8016 -/* 8A23F4 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 8A23F8 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 8A23FC 8024002C 03E00008 */ jr $ra -/* 8A2400 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_23/func_80240034_8A23D0.s b/asm/nonmatchings/world/area_tik/tik_23/func_80240034_8A23D0.s deleted file mode 100644 index 867d02c50e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/func_80240034_8A23D0.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_8A2404 -/* 8A2404 80240034 3C038016 */ lui $v1, 0x8016 -/* 8A2408 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* 8A240C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A2410 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 8A2414 80240044 0080802D */ daddu $s0, $a0, $zero -/* 8A2418 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* 8A241C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8A2420 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* 8A2424 80240054 24020002 */ addiu $v0, $zero, 2 -/* 8A2428 80240058 08090038 */ j .L802400E0 -/* 8A242C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* 8A2430 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 8A2434 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 8A2438 80240068 80620040 */ lb $v0, 0x40($v1) -/* 8A243C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* 8A2440 80240070 04420001 */ bltzl $v0, .L80240078 -/* 8A2444 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* 8A2448 80240078 14400003 */ bnez $v0, .L80240088 -/* 8A244C 8024007C 00000000 */ nop -/* 8A2450 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* 8A2454 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* 8A2458 80240088 44822000 */ mtc1 $v0, $f4 -/* 8A245C 8024008C 00000000 */ nop -/* 8A2460 80240090 46802120 */ cvt.s.w $f4, $f4 -/* 8A2464 80240094 44062000 */ mfc1 $a2, $f4 -/* 8A2468 80240098 44872000 */ mtc1 $a3, $f4 -/* 8A246C 8024009C 00000000 */ nop -/* 8A2470 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* 8A2474 802400A4 44806000 */ mtc1 $zero, $f12 -/* 8A2478 802400A8 44072000 */ mfc1 $a3, $f4 -/* 8A247C 802400AC 0C00A720 */ jal atan2 -/* 8A2480 802400B0 46006386 */ mov.s $f14, $f12 -/* 8A2484 802400B4 3C014270 */ lui $at, 0x4270 -/* 8A2488 802400B8 44811000 */ mtc1 $at, $f2 -/* 8A248C 802400BC 00000000 */ nop -/* 8A2490 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 8A2494 802400C4 00000000 */ nop -/* 8A2498 802400C8 45000004 */ bc1f .L802400DC -/* 8A249C 802400CC 24020001 */ addiu $v0, $zero, 1 -/* 8A24A0 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* 8A24A4 802400D4 08090038 */ j .L802400E0 -/* 8A24A8 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* 8A24AC 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* 8A24B0 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A24B4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 8A24B8 802400E8 03E00008 */ jr $ra -/* 8A24BC 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_23/func_802400F0_8A23D0.s b/asm/nonmatchings/world/area_tik/tik_23/func_802400F0_8A23D0.s deleted file mode 100644 index f1ca9eeccc..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/func_802400F0_8A23D0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0_8A24C0 -/* 8A24C0 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8A24C4 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8A24C8 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 8A24CC 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 8A24D0 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 8A24D4 80240104 0C016AFA */ jal get_current_map_header -/* 8A24D8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 8A24DC 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 8A24E0 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 8A24E4 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8A24E8 80240118 0C0B1EAF */ jal get_variable -/* 8A24EC 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 8A24F0 80240120 0220202D */ daddu $a0, $s1, $zero -/* 8A24F4 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 8A24F8 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 8A24FC 8024012C 00028100 */ sll $s0, $v0, 4 -/* 8A2500 80240130 02031821 */ addu $v1, $s0, $v1 -/* 8A2504 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 8A2508 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 8A250C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 8A2510 80240140 0C0B2026 */ jal set_variable -/* 8A2514 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8A2518 80240148 0220202D */ daddu $a0, $s1, $zero -/* 8A251C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 8A2520 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 8A2524 80240154 02021021 */ addu $v0, $s0, $v0 -/* 8A2528 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 8A252C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 8A2530 80240160 44061000 */ mfc1 $a2, $f2 -/* 8A2534 80240164 0C0B2026 */ jal set_variable -/* 8A2538 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8A253C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 8A2540 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 8A2544 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 8A2548 80240178 02021021 */ addu $v0, $s0, $v0 -/* 8A254C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 8A2550 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 8A2554 80240184 44061000 */ mfc1 $a2, $f2 -/* 8A2558 80240188 0C0B2026 */ jal set_variable -/* 8A255C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8A2560 80240190 0220202D */ daddu $a0, $s1, $zero -/* 8A2564 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 8A2568 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 8A256C 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 8A2570 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 8A2574 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 8A2578 802401A8 44061000 */ mfc1 $a2, $f2 -/* 8A257C 802401AC 0C0B2026 */ jal set_variable -/* 8A2580 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8A2584 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 8A2588 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 8A258C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 8A2590 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 8A2594 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 8A2598 802401C8 03E00008 */ jr $ra -/* 8A259C 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_23/func_802401D0_8A23D0.s b/asm/nonmatchings/world/area_tik/tik_23/func_802401D0_8A23D0.s deleted file mode 100644 index 5499c2eda0..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/func_802401D0_8A23D0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_8A25A0 -/* 8A25A0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8A25A4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8A25A8 802401D8 3C014334 */ lui $at, 0x4334 -/* 8A25AC 802401DC 44816000 */ mtc1 $at, $f12 -/* 8A25B0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A25B4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8A25B8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 8A25BC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 8A25C0 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 8A25C4 802401F4 00021080 */ sll $v0, $v0, 2 -/* 8A25C8 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 8A25CC 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 8A25D0 80240200 00431021 */ addu $v0, $v0, $v1 -/* 8A25D4 80240204 000210C0 */ sll $v0, $v0, 3 -/* 8A25D8 80240208 3C01800B */ lui $at, 0x800b -/* 8A25DC 8024020C 00220821 */ addu $at, $at, $v0 -/* 8A25E0 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8A25E4 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 8A25E8 80240218 0C00A6C9 */ jal clamp_angle -/* 8A25EC 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 8A25F0 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 8A25F4 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 8A25F8 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A25FC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 8A2600 80240230 24020002 */ addiu $v0, $zero, 2 -/* 8A2604 80240234 03E00008 */ jr $ra -/* 8A2608 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_23/func_8024023C_8A23D0.s b/asm/nonmatchings/world/area_tik/tik_23/func_8024023C_8A23D0.s deleted file mode 100644 index c203396a82..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/func_8024023C_8A23D0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C_8A260C -/* 8A260C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8A2610 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 8A2614 80240244 0080802D */ daddu $s0, $a0, $zero -/* 8A2618 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 8A261C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8A2620 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 8A2624 80240254 0C0B210B */ jal get_float_variable -/* 8A2628 80240258 8C450000 */ lw $a1, ($v0) -/* 8A262C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8A2630 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 8A2634 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 8A2638 80240268 44060000 */ mfc1 $a2, $f0 -/* 8A263C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 8A2640 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 8A2644 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8A2648 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8A264C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 8A2650 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 8A2654 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 8A2658 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 8A265C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 8A2660 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 8A2664 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 8A2668 80240298 0C0B2190 */ jal set_float_variable -/* 8A266C 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8A2670 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 8A2674 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 8A2678 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 8A267C 802402AC 0C0B2190 */ jal set_float_variable -/* 8A2680 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8A2684 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 8A2688 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 8A268C 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 8A2690 802402C0 0C0B2190 */ jal set_float_variable -/* 8A2694 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8A2698 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 8A269C 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 8A26A0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8A26A4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 8A26A8 802402D8 03E00008 */ jr $ra -/* 8A26AC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_23/func_802402E0_8A23D0.s b/asm/nonmatchings/world/area_tik/tik_23/func_802402E0_8A23D0.s deleted file mode 100644 index e059cffb51..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/func_802402E0_8A23D0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_8A26B0 -/* 8A26B0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A26B4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 8A26B8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 8A26BC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 8A26C0 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8A26C4 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 8A26C8 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 8A26CC 802402FC 04610004 */ bgez $v1, .L80240310 -/* 8A26D0 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8A26D4 80240304 3C020002 */ lui $v0, 2 -/* 8A26D8 80240308 080900C8 */ j .L80240320 -/* 8A26DC 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 8A26E0 80240310 3C040002 */ lui $a0, 2 -/* 8A26E4 80240314 0083102A */ slt $v0, $a0, $v1 -/* 8A26E8 80240318 10400002 */ beqz $v0, .L80240324 -/* 8A26EC 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 8A26F0 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 8A26F4 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 8A26F8 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 8A26FC 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 8A2700 80240330 04610004 */ bgez $v1, .L80240344 -/* 8A2704 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 8A2708 80240338 3C020002 */ lui $v0, 2 -/* 8A270C 8024033C 080900D5 */ j .L80240354 -/* 8A2710 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 8A2714 80240344 3C040002 */ lui $a0, 2 -/* 8A2718 80240348 0083102A */ slt $v0, $a0, $v1 -/* 8A271C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 8A2720 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 8A2724 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 8A2728 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 8A272C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 8A2730 80240360 00621821 */ addu $v1, $v1, $v0 -/* 8A2734 80240364 04610004 */ bgez $v1, .L80240378 -/* 8A2738 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8A273C 8024036C 3C020002 */ lui $v0, 2 -/* 8A2740 80240370 080900E2 */ j .L80240388 -/* 8A2744 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 8A2748 80240378 3C040002 */ lui $a0, 2 -/* 8A274C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 8A2750 80240380 10400002 */ beqz $v0, .L8024038C -/* 8A2754 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 8A2758 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 8A275C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8A2760 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 8A2764 80240394 00621821 */ addu $v1, $v1, $v0 -/* 8A2768 80240398 04610004 */ bgez $v1, .L802403AC -/* 8A276C 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 8A2770 802403A0 3C020002 */ lui $v0, 2 -/* 8A2774 802403A4 080900EF */ j .L802403BC -/* 8A2778 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 8A277C 802403AC 3C040002 */ lui $a0, 2 -/* 8A2780 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 8A2784 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 8A2788 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 8A278C 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 8A2790 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 8A2794 802403C4 0C046F07 */ jal set_main_pan_u -/* 8A2798 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8A279C 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 8A27A0 802403D0 0C046F0D */ jal set_main_pan_v -/* 8A27A4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 8A27A8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 8A27AC 802403DC 0C046F13 */ jal set_aux_pan_u -/* 8A27B0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8A27B4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 8A27B8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 8A27BC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8A27C0 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A27C4 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 8A27C8 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 8A27CC 802403FC 03E00008 */ jr $ra -/* 8A27D0 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_23/func_80240404_8A23D0.s b/asm/nonmatchings/world/area_tik/tik_23/func_80240404_8A23D0.s deleted file mode 100644 index 59ede11049..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/func_80240404_8A23D0.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_8A27D4 -/* 8A27D4 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A27D8 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 8A27DC 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 8A27E0 80240410 10A00005 */ beqz $a1, .L80240428 -/* 8A27E4 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 8A27E8 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 8A27EC 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 8A27F0 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 8A27F4 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 8A27F8 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 8A27FC 8024042C 1440000E */ bnez $v0, .L80240468 -/* 8A2800 80240430 00000000 */ nop -/* 8A2804 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8A2808 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 8A280C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 8A2810 80240440 04610004 */ bgez $v1, .L80240454 -/* 8A2814 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8A2818 80240448 3C020002 */ lui $v0, 2 -/* 8A281C 8024044C 08090119 */ j .L80240464 -/* 8A2820 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 8A2824 80240454 3C040002 */ lui $a0, 2 -/* 8A2828 80240458 0083102A */ slt $v0, $a0, $v1 -/* 8A282C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 8A2830 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 8A2834 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 8A2838 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 8A283C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 8A2840 80240470 00000000 */ nop -/* 8A2844 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 8A2848 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 8A284C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 8A2850 80240480 04610004 */ bgez $v1, .L80240494 -/* 8A2854 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 8A2858 80240488 3C020002 */ lui $v0, 2 -/* 8A285C 8024048C 08090129 */ j .L802404A4 -/* 8A2860 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 8A2864 80240494 3C040002 */ lui $a0, 2 -/* 8A2868 80240498 0083102A */ slt $v0, $a0, $v1 -/* 8A286C 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 8A2870 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 8A2874 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 8A2878 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 8A287C 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 8A2880 802404B0 00000000 */ nop -/* 8A2884 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 8A2888 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 8A288C 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 8A2890 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 8A2894 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8A2898 802404C8 3C020002 */ lui $v0, 2 -/* 8A289C 802404CC 08090139 */ j .L802404E4 -/* 8A28A0 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 8A28A4 802404D4 3C040002 */ lui $a0, 2 -/* 8A28A8 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 8A28AC 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 8A28B0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 8A28B4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 8A28B8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 8A28BC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 8A28C0 802404F0 00000000 */ nop -/* 8A28C4 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8A28C8 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 8A28CC 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 8A28D0 80240500 04610004 */ bgez $v1, .L80240514 -/* 8A28D4 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8A28D8 80240508 3C020002 */ lui $v0, 2 -/* 8A28DC 8024050C 08090149 */ j .L80240524 -/* 8A28E0 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 8A28E4 80240514 3C040002 */ lui $a0, 2 -/* 8A28E8 80240518 0083102A */ slt $v0, $a0, $v1 -/* 8A28EC 8024051C 10400002 */ beqz $v0, .L80240528 -/* 8A28F0 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 8A28F4 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 8A28F8 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 8A28FC 8024052C 0C046F07 */ jal set_main_pan_u -/* 8A2900 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8A2904 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 8A2908 80240538 0C046F0D */ jal set_main_pan_v -/* 8A290C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 8A2910 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 8A2914 80240544 0C046F13 */ jal set_aux_pan_u -/* 8A2918 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8A291C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 8A2920 80240550 0C046F19 */ jal set_aux_pan_v -/* 8A2924 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8A2928 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 8A292C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 8A2930 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 8A2934 80240564 24420001 */ addiu $v0, $v0, 1 -/* 8A2938 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 8A293C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 8A2940 80240570 24630001 */ addiu $v1, $v1, 1 -/* 8A2944 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 8A2948 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 8A294C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 8A2950 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 8A2954 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 8A2958 80240588 0064182A */ slt $v1, $v1, $a0 -/* 8A295C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 8A2960 80240590 14600002 */ bnez $v1, .L8024059C -/* 8A2964 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 8A2968 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 8A296C 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 8A2970 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 8A2974 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 8A2978 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 8A297C 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 8A2980 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 8A2984 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 8A2988 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 8A298C 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 8A2990 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 8A2994 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 8A2998 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 8A299C 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 8A29A0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 8A29A4 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 8A29A8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A29AC 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 8A29B0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 8A29B4 802405E4 03E00008 */ jr $ra -/* 8A29B8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_23/func_802405EC_8A23D0.s b/asm/nonmatchings/world/area_tik/tik_23/func_802405EC_8A23D0.s deleted file mode 100644 index 8fa57fa9fe..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/func_802405EC_8A23D0.s +++ /dev/null @@ -1,235 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_8A29BC -/* 8A29BC 802405EC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8A29C0 802405F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 8A29C4 802405F4 0080982D */ daddu $s3, $a0, $zero -/* 8A29C8 802405F8 AFBF0020 */ sw $ra, 0x20($sp) -/* 8A29CC 802405FC AFB20018 */ sw $s2, 0x18($sp) -/* 8A29D0 80240600 AFB10014 */ sw $s1, 0x14($sp) -/* 8A29D4 80240604 AFB00010 */ sw $s0, 0x10($sp) -/* 8A29D8 80240608 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8A29DC 8024060C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8A29E0 80240610 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8A29E4 80240614 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8A29E8 80240618 8E62000C */ lw $v0, 0xc($s3) -/* 8A29EC 8024061C 0C0B1EAF */ jal get_variable -/* 8A29F0 80240620 8C450000 */ lw $a1, ($v0) -/* 8A29F4 80240624 2404FFFC */ addiu $a0, $zero, -4 -/* 8A29F8 80240628 0C00EABB */ jal get_npc_unsafe -/* 8A29FC 8024062C 0040802D */ daddu $s0, $v0, $zero -/* 8A2A00 80240630 0200202D */ daddu $a0, $s0, $zero -/* 8A2A04 80240634 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8A2A08 80240638 0040802D */ daddu $s0, $v0, $zero -/* 8A2A0C 8024063C 0C046B4C */ jal get_model_from_list_index -/* 8A2A10 80240640 0040202D */ daddu $a0, $v0, $zero -/* 8A2A14 80240644 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8A2A18 80240648 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8A2A1C 8024064C 0040902D */ daddu $s2, $v0, $zero -/* 8A2A20 80240650 AE60008C */ sw $zero, 0x8c($s3) -/* 8A2A24 80240654 C4620028 */ lwc1 $f2, 0x28($v1) -/* 8A2A28 80240658 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A2A2C 8024065C 46001081 */ sub.s $f2, $f2, $f0 -/* 8A2A30 80240660 46021182 */ mul.s $f6, $f2, $f2 -/* 8A2A34 80240664 00000000 */ nop -/* 8A2A38 80240668 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A2A3C 8024066C C4620030 */ lwc1 $f2, 0x30($v1) -/* 8A2A40 80240670 46001081 */ sub.s $f2, $f2, $f0 -/* 8A2A44 80240674 46021102 */ mul.s $f4, $f2, $f2 -/* 8A2A48 80240678 00000000 */ nop -/* 8A2A4C 8024067C 846200B0 */ lh $v0, 0xb0($v1) -/* 8A2A50 80240680 C462002C */ lwc1 $f2, 0x2c($v1) -/* 8A2A54 80240684 44820000 */ mtc1 $v0, $f0 -/* 8A2A58 80240688 00000000 */ nop -/* 8A2A5C 8024068C 46800020 */ cvt.s.w $f0, $f0 -/* 8A2A60 80240690 46001080 */ add.s $f2, $f2, $f0 -/* 8A2A64 80240694 3C013FC0 */ lui $at, 0x3fc0 -/* 8A2A68 80240698 44810000 */ mtc1 $at, $f0 -/* 8A2A6C 8024069C 00000000 */ nop -/* 8A2A70 802406A0 46001081 */ sub.s $f2, $f2, $f0 -/* 8A2A74 802406A4 46043300 */ add.s $f12, $f6, $f4 -/* 8A2A78 802406A8 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A2A7C 802406AC 46001501 */ sub.s $f20, $f2, $f0 -/* 8A2A80 802406B0 46006084 */ sqrt.s $f2, $f12 -/* 8A2A84 802406B4 46021032 */ c.eq.s $f2, $f2 -/* 8A2A88 802406B8 00000000 */ nop -/* 8A2A8C 802406BC 45010004 */ bc1t .L802406D0 -/* 8A2A90 802406C0 0060882D */ daddu $s1, $v1, $zero -/* 8A2A94 802406C4 0C0187BC */ jal sqrtf -/* 8A2A98 802406C8 00000000 */ nop -/* 8A2A9C 802406CC 46000086 */ mov.s $f2, $f0 -.L802406D0: -/* 8A2AA0 802406D0 44800000 */ mtc1 $zero, $f0 -/* 8A2AA4 802406D4 00000000 */ nop -/* 8A2AA8 802406D8 4614003C */ c.lt.s $f0, $f20 -/* 8A2AAC 802406DC 00000000 */ nop -/* 8A2AB0 802406E0 45000016 */ bc1f .L8024073C -/* 8A2AB4 802406E4 46001106 */ mov.s $f4, $f2 -/* 8A2AB8 802406E8 862200B0 */ lh $v0, 0xb0($s1) -/* 8A2ABC 802406EC 44820000 */ mtc1 $v0, $f0 -/* 8A2AC0 802406F0 00000000 */ nop -/* 8A2AC4 802406F4 46800020 */ cvt.s.w $f0, $f0 -/* 8A2AC8 802406F8 4600A03C */ c.lt.s $f20, $f0 -/* 8A2ACC 802406FC 00000000 */ nop -/* 8A2AD0 80240700 4500000E */ bc1f .L8024073C -/* 8A2AD4 80240704 00000000 */ nop -/* 8A2AD8 80240708 862200B2 */ lh $v0, 0xb2($s1) -/* 8A2ADC 8024070C 3C013F00 */ lui $at, 0x3f00 -/* 8A2AE0 80240710 44811000 */ mtc1 $at, $f2 -/* 8A2AE4 80240714 44820000 */ mtc1 $v0, $f0 -/* 8A2AE8 80240718 00000000 */ nop -/* 8A2AEC 8024071C 46800020 */ cvt.s.w $f0, $f0 -/* 8A2AF0 80240720 46020002 */ mul.s $f0, $f0, $f2 -/* 8A2AF4 80240724 00000000 */ nop -/* 8A2AF8 80240728 4600203C */ c.lt.s $f4, $f0 -/* 8A2AFC 8024072C 00000000 */ nop -/* 8A2B00 80240730 45000002 */ bc1f .L8024073C -/* 8A2B04 80240734 24020001 */ addiu $v0, $zero, 1 -/* 8A2B08 80240738 AE62008C */ sw $v0, 0x8c($s3) -.L8024073C: -/* 8A2B0C 8024073C C6020038 */ lwc1 $f2, 0x38($s0) -/* 8A2B10 80240740 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A2B14 80240744 46001081 */ sub.s $f2, $f2, $f0 -/* 8A2B18 80240748 46021182 */ mul.s $f6, $f2, $f2 -/* 8A2B1C 8024074C 00000000 */ nop -/* 8A2B20 80240750 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A2B24 80240754 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8A2B28 80240758 46001081 */ sub.s $f2, $f2, $f0 -/* 8A2B2C 8024075C 46021102 */ mul.s $f4, $f2, $f2 -/* 8A2B30 80240760 00000000 */ nop -/* 8A2B34 80240764 860200A8 */ lh $v0, 0xa8($s0) -/* 8A2B38 80240768 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A2B3C 8024076C 44820000 */ mtc1 $v0, $f0 -/* 8A2B40 80240770 00000000 */ nop -/* 8A2B44 80240774 46800020 */ cvt.s.w $f0, $f0 -/* 8A2B48 80240778 46001080 */ add.s $f2, $f2, $f0 -/* 8A2B4C 8024077C 3C013FC0 */ lui $at, 0x3fc0 -/* 8A2B50 80240780 44810000 */ mtc1 $at, $f0 -/* 8A2B54 80240784 00000000 */ nop -/* 8A2B58 80240788 46001081 */ sub.s $f2, $f2, $f0 -/* 8A2B5C 8024078C 46043300 */ add.s $f12, $f6, $f4 -/* 8A2B60 80240790 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A2B64 80240794 46001501 */ sub.s $f20, $f2, $f0 -/* 8A2B68 80240798 46006084 */ sqrt.s $f2, $f12 -/* 8A2B6C 8024079C 46021032 */ c.eq.s $f2, $f2 -/* 8A2B70 802407A0 00000000 */ nop -/* 8A2B74 802407A4 45010004 */ bc1t .L802407B8 -/* 8A2B78 802407A8 00000000 */ nop -/* 8A2B7C 802407AC 0C0187BC */ jal sqrtf -/* 8A2B80 802407B0 00000000 */ nop -/* 8A2B84 802407B4 46000086 */ mov.s $f2, $f0 -.L802407B8: -/* 8A2B88 802407B8 44800000 */ mtc1 $zero, $f0 -/* 8A2B8C 802407BC 00000000 */ nop -/* 8A2B90 802407C0 4614003C */ c.lt.s $f0, $f20 -/* 8A2B94 802407C4 00000000 */ nop -/* 8A2B98 802407C8 45000016 */ bc1f .L80240824 -/* 8A2B9C 802407CC 46001106 */ mov.s $f4, $f2 -/* 8A2BA0 802407D0 860200A8 */ lh $v0, 0xa8($s0) -/* 8A2BA4 802407D4 44820000 */ mtc1 $v0, $f0 -/* 8A2BA8 802407D8 00000000 */ nop -/* 8A2BAC 802407DC 46800020 */ cvt.s.w $f0, $f0 -/* 8A2BB0 802407E0 4600A03C */ c.lt.s $f20, $f0 -/* 8A2BB4 802407E4 00000000 */ nop -/* 8A2BB8 802407E8 4500000F */ bc1f .L80240828 -/* 8A2BBC 802407EC 0000882D */ daddu $s1, $zero, $zero -/* 8A2BC0 802407F0 860200A6 */ lh $v0, 0xa6($s0) -/* 8A2BC4 802407F4 3C013F00 */ lui $at, 0x3f00 -/* 8A2BC8 802407F8 44811000 */ mtc1 $at, $f2 -/* 8A2BCC 802407FC 44820000 */ mtc1 $v0, $f0 -/* 8A2BD0 80240800 00000000 */ nop -/* 8A2BD4 80240804 46800020 */ cvt.s.w $f0, $f0 -/* 8A2BD8 80240808 46020002 */ mul.s $f0, $f0, $f2 -/* 8A2BDC 8024080C 00000000 */ nop -/* 8A2BE0 80240810 4600203C */ c.lt.s $f4, $f0 -/* 8A2BE4 80240814 00000000 */ nop -/* 8A2BE8 80240818 45000003 */ bc1f .L80240828 -/* 8A2BEC 8024081C 24020001 */ addiu $v0, $zero, 1 -/* 8A2BF0 80240820 AE62008C */ sw $v0, 0x8c($s3) -.L80240824: -/* 8A2BF4 80240824 0000882D */ daddu $s1, $zero, $zero -.L80240828: -/* 8A2BF8 80240828 3C013FC0 */ lui $at, 0x3fc0 -/* 8A2BFC 8024082C 4481D000 */ mtc1 $at, $f26 -/* 8A2C00 80240830 4480C000 */ mtc1 $zero, $f24 -/* 8A2C04 80240834 3C013F00 */ lui $at, 0x3f00 -/* 8A2C08 80240838 4481B000 */ mtc1 $at, $f22 -.L8024083C: -/* 8A2C0C 8024083C 0C00EAD2 */ jal get_npc_safe -/* 8A2C10 80240840 0220202D */ daddu $a0, $s1, $zero -/* 8A2C14 80240844 0040802D */ daddu $s0, $v0, $zero -/* 8A2C18 80240848 52000035 */ beql $s0, $zero, .L80240920 -/* 8A2C1C 8024084C 26310001 */ addiu $s1, $s1, 1 -/* 8A2C20 80240850 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8A2C24 80240854 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A2C28 80240858 46001081 */ sub.s $f2, $f2, $f0 -/* 8A2C2C 8024085C 46021182 */ mul.s $f6, $f2, $f2 -/* 8A2C30 80240860 00000000 */ nop -/* 8A2C34 80240864 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A2C38 80240868 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8A2C3C 8024086C 46001081 */ sub.s $f2, $f2, $f0 -/* 8A2C40 80240870 46021102 */ mul.s $f4, $f2, $f2 -/* 8A2C44 80240874 00000000 */ nop -/* 8A2C48 80240878 860200A8 */ lh $v0, 0xa8($s0) -/* 8A2C4C 8024087C C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A2C50 80240880 44820000 */ mtc1 $v0, $f0 -/* 8A2C54 80240884 00000000 */ nop -/* 8A2C58 80240888 46800020 */ cvt.s.w $f0, $f0 -/* 8A2C5C 8024088C 46001080 */ add.s $f2, $f2, $f0 -/* 8A2C60 80240890 461A1081 */ sub.s $f2, $f2, $f26 -/* 8A2C64 80240894 46043300 */ add.s $f12, $f6, $f4 -/* 8A2C68 80240898 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A2C6C 8024089C 46001501 */ sub.s $f20, $f2, $f0 -/* 8A2C70 802408A0 46006004 */ sqrt.s $f0, $f12 -/* 8A2C74 802408A4 46000032 */ c.eq.s $f0, $f0 -/* 8A2C78 802408A8 00000000 */ nop -/* 8A2C7C 802408AC 45010003 */ bc1t .L802408BC -/* 8A2C80 802408B0 00000000 */ nop -/* 8A2C84 802408B4 0C0187BC */ jal sqrtf -/* 8A2C88 802408B8 00000000 */ nop -.L802408BC: -/* 8A2C8C 802408BC 4614C03C */ c.lt.s $f24, $f20 -/* 8A2C90 802408C0 00000000 */ nop -/* 8A2C94 802408C4 45000015 */ bc1f .L8024091C -/* 8A2C98 802408C8 46000106 */ mov.s $f4, $f0 -/* 8A2C9C 802408CC 860200A8 */ lh $v0, 0xa8($s0) -/* 8A2CA0 802408D0 44820000 */ mtc1 $v0, $f0 -/* 8A2CA4 802408D4 00000000 */ nop -/* 8A2CA8 802408D8 46800020 */ cvt.s.w $f0, $f0 -/* 8A2CAC 802408DC 4600A03C */ c.lt.s $f20, $f0 -/* 8A2CB0 802408E0 00000000 */ nop -/* 8A2CB4 802408E4 4500000E */ bc1f .L80240920 -/* 8A2CB8 802408E8 26310001 */ addiu $s1, $s1, 1 -/* 8A2CBC 802408EC 860200A6 */ lh $v0, 0xa6($s0) -/* 8A2CC0 802408F0 44820000 */ mtc1 $v0, $f0 -/* 8A2CC4 802408F4 00000000 */ nop -/* 8A2CC8 802408F8 46800020 */ cvt.s.w $f0, $f0 -/* 8A2CCC 802408FC 46160002 */ mul.s $f0, $f0, $f22 -/* 8A2CD0 80240900 00000000 */ nop -/* 8A2CD4 80240904 4600203C */ c.lt.s $f4, $f0 -/* 8A2CD8 80240908 00000000 */ nop -/* 8A2CDC 8024090C 45000004 */ bc1f .L80240920 -/* 8A2CE0 80240910 24020001 */ addiu $v0, $zero, 1 -/* 8A2CE4 80240914 0809024B */ j .L8024092C -/* 8A2CE8 80240918 AE62008C */ sw $v0, 0x8c($s3) -.L8024091C: -/* 8A2CEC 8024091C 26310001 */ addiu $s1, $s1, 1 -.L80240920: -/* 8A2CF0 80240920 2A220040 */ slti $v0, $s1, 0x40 -/* 8A2CF4 80240924 1440FFC5 */ bnez $v0, .L8024083C -/* 8A2CF8 80240928 00000000 */ nop -.L8024092C: -/* 8A2CFC 8024092C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8A2D00 80240930 8FB3001C */ lw $s3, 0x1c($sp) -/* 8A2D04 80240934 8FB20018 */ lw $s2, 0x18($sp) -/* 8A2D08 80240938 8FB10014 */ lw $s1, 0x14($sp) -/* 8A2D0C 8024093C 8FB00010 */ lw $s0, 0x10($sp) -/* 8A2D10 80240940 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 8A2D14 80240944 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 8A2D18 80240948 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8A2D1C 8024094C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8A2D20 80240950 24020002 */ addiu $v0, $zero, 2 -/* 8A2D24 80240954 03E00008 */ jr $ra -/* 8A2D28 80240958 27BD0048 */ addiu $sp, $sp, 0x48 -/* 8A2D2C 8024095C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_23/func_80240960_8A23D0.s b/asm/nonmatchings/world/area_tik/tik_23/func_80240960_8A23D0.s deleted file mode 100644 index d7dd7ce5d3..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/func_80240960_8A23D0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240960_8A2D30 -/* 8A2D30 80240960 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8A2D34 80240964 AFB20018 */ sw $s2, 0x18($sp) -/* 8A2D38 80240968 0080902D */ daddu $s2, $a0, $zero -/* 8A2D3C 8024096C AFBF001C */ sw $ra, 0x1c($sp) -/* 8A2D40 80240970 AFB10014 */ sw $s1, 0x14($sp) -/* 8A2D44 80240974 AFB00010 */ sw $s0, 0x10($sp) -/* 8A2D48 80240978 8E510148 */ lw $s1, 0x148($s2) -/* 8A2D4C 8024097C 0C00EABB */ jal get_npc_unsafe -/* 8A2D50 80240980 86240008 */ lh $a0, 8($s1) -/* 8A2D54 80240984 0040802D */ daddu $s0, $v0, $zero -/* 8A2D58 80240988 8E2300CC */ lw $v1, 0xcc($s1) -/* 8A2D5C 8024098C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8A2D60 80240990 8C630020 */ lw $v1, 0x20($v1) -/* 8A2D64 80240994 AE030028 */ sw $v1, 0x28($s0) -/* 8A2D68 80240998 96220076 */ lhu $v0, 0x76($s1) -/* 8A2D6C 8024099C A602008E */ sh $v0, 0x8e($s0) -/* 8A2D70 802409A0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8A2D74 802409A4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8A2D78 802409A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8A2D7C 802409AC 8C460028 */ lw $a2, 0x28($v0) -/* 8A2D80 802409B0 0C00A720 */ jal atan2 -/* 8A2D84 802409B4 8C470030 */ lw $a3, 0x30($v0) -/* 8A2D88 802409B8 2402000D */ addiu $v0, $zero, 0xd -/* 8A2D8C 802409BC E600000C */ swc1 $f0, 0xc($s0) -/* 8A2D90 802409C0 AE420070 */ sw $v0, 0x70($s2) -/* 8A2D94 802409C4 8FBF001C */ lw $ra, 0x1c($sp) -/* 8A2D98 802409C8 8FB20018 */ lw $s2, 0x18($sp) -/* 8A2D9C 802409CC 8FB10014 */ lw $s1, 0x14($sp) -/* 8A2DA0 802409D0 8FB00010 */ lw $s0, 0x10($sp) -/* 8A2DA4 802409D4 03E00008 */ jr $ra -/* 8A2DA8 802409D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_23/func_802409DC_8A23D0.s b/asm/nonmatchings/world/area_tik/tik_23/func_802409DC_8A23D0.s deleted file mode 100644 index f4e9776ede..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/func_802409DC_8A23D0.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409DC_8A2DAC -/* 8A2DAC 802409DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8A2DB0 802409E0 AFB3001C */ sw $s3, 0x1c($sp) -/* 8A2DB4 802409E4 0080982D */ daddu $s3, $a0, $zero -/* 8A2DB8 802409E8 AFBF0020 */ sw $ra, 0x20($sp) -/* 8A2DBC 802409EC AFB20018 */ sw $s2, 0x18($sp) -/* 8A2DC0 802409F0 AFB10014 */ sw $s1, 0x14($sp) -/* 8A2DC4 802409F4 AFB00010 */ sw $s0, 0x10($sp) -/* 8A2DC8 802409F8 8E710148 */ lw $s1, 0x148($s3) -/* 8A2DCC 802409FC 86240008 */ lh $a0, 8($s1) -/* 8A2DD0 80240A00 0C00EABB */ jal get_npc_unsafe -/* 8A2DD4 80240A04 00A0902D */ daddu $s2, $a1, $zero -/* 8A2DD8 80240A08 0040802D */ daddu $s0, $v0, $zero -/* 8A2DDC 80240A0C 8602008E */ lh $v0, 0x8e($s0) -/* 8A2DE0 80240A10 9603008E */ lhu $v1, 0x8e($s0) -/* 8A2DE4 80240A14 18400005 */ blez $v0, .L80240A2C -/* 8A2DE8 80240A18 2462FFFF */ addiu $v0, $v1, -1 -/* 8A2DEC 80240A1C A602008E */ sh $v0, 0x8e($s0) -/* 8A2DF0 80240A20 00021400 */ sll $v0, $v0, 0x10 -/* 8A2DF4 80240A24 1C400033 */ bgtz $v0, .L80240AF4 -/* 8A2DF8 80240A28 00000000 */ nop -.L80240A2C: -/* 8A2DFC 80240A2C 8602008C */ lh $v0, 0x8c($s0) -/* 8A2E00 80240A30 14400030 */ bnez $v0, .L80240AF4 -/* 8A2E04 80240A34 00000000 */ nop -/* 8A2E08 80240A38 8E2200CC */ lw $v0, 0xcc($s1) -/* 8A2E0C 80240A3C 8C420024 */ lw $v0, 0x24($v0) -/* 8A2E10 80240A40 AE020028 */ sw $v0, 0x28($s0) -/* 8A2E14 80240A44 C6400018 */ lwc1 $f0, 0x18($s2) -/* 8A2E18 80240A48 E6000018 */ swc1 $f0, 0x18($s0) -/* 8A2E1C 80240A4C 8E230088 */ lw $v1, 0x88($s1) -/* 8A2E20 80240A50 24020005 */ addiu $v0, $zero, 5 -/* 8A2E24 80240A54 10620005 */ beq $v1, $v0, .L80240A6C -/* 8A2E28 80240A58 00000000 */ nop -/* 8A2E2C 80240A5C 10600003 */ beqz $v1, .L80240A6C -/* 8A2E30 80240A60 24020001 */ addiu $v0, $zero, 1 -/* 8A2E34 80240A64 14620006 */ bne $v1, $v0, .L80240A80 -/* 8A2E38 80240A68 00000000 */ nop -.L80240A6C: -/* 8A2E3C 80240A6C 8E220084 */ lw $v0, 0x84($s1) -/* 8A2E40 80240A70 00021FC2 */ srl $v1, $v0, 0x1f -/* 8A2E44 80240A74 00431021 */ addu $v0, $v0, $v1 -/* 8A2E48 80240A78 00021043 */ sra $v0, $v0, 1 -/* 8A2E4C 80240A7C A60200A8 */ sh $v0, 0xa8($s0) -.L80240A80: -/* 8A2E50 80240A80 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8A2E54 80240A84 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8A2E58 80240A88 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8A2E5C 80240A8C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8A2E60 80240A90 8C460028 */ lw $a2, 0x28($v0) -/* 8A2E64 80240A94 0C00A7B5 */ jal dist2D -/* 8A2E68 80240A98 8C470030 */ lw $a3, 0x30($v0) -/* 8A2E6C 80240A9C C6020018 */ lwc1 $f2, 0x18($s0) -/* 8A2E70 80240AA0 46020003 */ div.s $f0, $f0, $f2 -/* 8A2E74 80240AA4 3C018024 */ lui $at, 0x8024 -/* 8A2E78 80240AA8 D4223650 */ ldc1 $f2, 0x3650($at) -/* 8A2E7C 80240AAC 46000021 */ cvt.d.s $f0, $f0 -/* 8A2E80 80240AB0 46220000 */ add.d $f0, $f0, $f2 -/* 8A2E84 80240AB4 4620010D */ trunc.w.d $f4, $f0 -/* 8A2E88 80240AB8 44022000 */ mfc1 $v0, $f4 -/* 8A2E8C 80240ABC 00000000 */ nop -/* 8A2E90 80240AC0 A602008E */ sh $v0, 0x8e($s0) -/* 8A2E94 80240AC4 00021400 */ sll $v0, $v0, 0x10 -/* 8A2E98 80240AC8 8E230078 */ lw $v1, 0x78($s1) -/* 8A2E9C 80240ACC 00021403 */ sra $v0, $v0, 0x10 -/* 8A2EA0 80240AD0 0043102A */ slt $v0, $v0, $v1 -/* 8A2EA4 80240AD4 10400003 */ beqz $v0, .L80240AE4 -/* 8A2EA8 80240AD8 00000000 */ nop -/* 8A2EAC 80240ADC 9622007A */ lhu $v0, 0x7a($s1) -/* 8A2EB0 80240AE0 A602008E */ sh $v0, 0x8e($s0) -.L80240AE4: -/* 8A2EB4 80240AE4 8602008E */ lh $v0, 0x8e($s0) -/* 8A2EB8 80240AE8 AE22007C */ sw $v0, 0x7c($s1) -/* 8A2EBC 80240AEC 2402000E */ addiu $v0, $zero, 0xe -/* 8A2EC0 80240AF0 AE620070 */ sw $v0, 0x70($s3) -.L80240AF4: -/* 8A2EC4 80240AF4 8FBF0020 */ lw $ra, 0x20($sp) -/* 8A2EC8 80240AF8 8FB3001C */ lw $s3, 0x1c($sp) -/* 8A2ECC 80240AFC 8FB20018 */ lw $s2, 0x18($sp) -/* 8A2ED0 80240B00 8FB10014 */ lw $s1, 0x14($sp) -/* 8A2ED4 80240B04 8FB00010 */ lw $s0, 0x10($sp) -/* 8A2ED8 80240B08 03E00008 */ jr $ra -/* 8A2EDC 80240B0C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_23/func_80240B10_8A23D0.s b/asm/nonmatchings/world/area_tik/tik_23/func_80240B10_8A23D0.s deleted file mode 100644 index ffef6a9682..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/func_80240B10_8A23D0.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B10_8A2EE0 -/* 8A2EE0 80240B10 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8A2EE4 80240B14 AFB3003C */ sw $s3, 0x3c($sp) -/* 8A2EE8 80240B18 0080982D */ daddu $s3, $a0, $zero -/* 8A2EEC 80240B1C AFBF0040 */ sw $ra, 0x40($sp) -/* 8A2EF0 80240B20 AFB20038 */ sw $s2, 0x38($sp) -/* 8A2EF4 80240B24 AFB10034 */ sw $s1, 0x34($sp) -/* 8A2EF8 80240B28 AFB00030 */ sw $s0, 0x30($sp) -/* 8A2EFC 80240B2C 8E710148 */ lw $s1, 0x148($s3) -/* 8A2F00 80240B30 0C00EABB */ jal get_npc_unsafe -/* 8A2F04 80240B34 86240008 */ lh $a0, 8($s1) -/* 8A2F08 80240B38 0040802D */ daddu $s0, $v0, $zero -/* 8A2F0C 80240B3C 8E22007C */ lw $v0, 0x7c($s1) -/* 8A2F10 80240B40 8603008E */ lh $v1, 0x8e($s0) -/* 8A2F14 80240B44 2442FFFF */ addiu $v0, $v0, -1 -/* 8A2F18 80240B48 14620012 */ bne $v1, $v0, .L80240B94 -/* 8A2F1C 80240B4C 00000000 */ nop -/* 8A2F20 80240B50 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8A2F24 80240B54 4600020D */ trunc.w.s $f8, $f0 -/* 8A2F28 80240B58 44024000 */ mfc1 $v0, $f8 -/* 8A2F2C 80240B5C 00000000 */ nop -/* 8A2F30 80240B60 A6220010 */ sh $v0, 0x10($s1) -/* 8A2F34 80240B64 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8A2F38 80240B68 4600020D */ trunc.w.s $f8, $f0 -/* 8A2F3C 80240B6C 44024000 */ mfc1 $v0, $f8 -/* 8A2F40 80240B70 00000000 */ nop -/* 8A2F44 80240B74 A6220012 */ sh $v0, 0x12($s1) -/* 8A2F48 80240B78 C6000040 */ lwc1 $f0, 0x40($s0) -/* 8A2F4C 80240B7C 24020001 */ addiu $v0, $zero, 1 -/* 8A2F50 80240B80 A2220007 */ sb $v0, 7($s1) -/* 8A2F54 80240B84 4600020D */ trunc.w.s $f8, $f0 -/* 8A2F58 80240B88 44024000 */ mfc1 $v0, $f8 -/* 8A2F5C 80240B8C 00000000 */ nop -/* 8A2F60 80240B90 A6220014 */ sh $v0, 0x14($s1) -.L80240B94: -/* 8A2F64 80240B94 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8A2F68 80240B98 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A2F6C 80240B9C C6040040 */ lwc1 $f4, 0x40($s0) -/* 8A2F70 80240BA0 C6060018 */ lwc1 $f6, 0x18($s0) -/* 8A2F74 80240BA4 E7A00020 */ swc1 $f0, 0x20($sp) -/* 8A2F78 80240BA8 E7A20024 */ swc1 $f2, 0x24($sp) -/* 8A2F7C 80240BAC E7A40028 */ swc1 $f4, 0x28($sp) -/* 8A2F80 80240BB0 E7A60010 */ swc1 $f6, 0x10($sp) -/* 8A2F84 80240BB4 C600000C */ lwc1 $f0, 0xc($s0) -/* 8A2F88 80240BB8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 8A2F8C 80240BBC 860200A8 */ lh $v0, 0xa8($s0) -/* 8A2F90 80240BC0 27A50020 */ addiu $a1, $sp, 0x20 -/* 8A2F94 80240BC4 44820000 */ mtc1 $v0, $f0 -/* 8A2F98 80240BC8 00000000 */ nop -/* 8A2F9C 80240BCC 46800020 */ cvt.s.w $f0, $f0 -/* 8A2FA0 80240BD0 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8A2FA4 80240BD4 860200A6 */ lh $v0, 0xa6($s0) -/* 8A2FA8 80240BD8 27A60024 */ addiu $a2, $sp, 0x24 -/* 8A2FAC 80240BDC 44820000 */ mtc1 $v0, $f0 -/* 8A2FB0 80240BE0 00000000 */ nop -/* 8A2FB4 80240BE4 46800020 */ cvt.s.w $f0, $f0 -/* 8A2FB8 80240BE8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 8A2FBC 80240BEC 8E040080 */ lw $a0, 0x80($s0) -/* 8A2FC0 80240BF0 0C037711 */ jal func_800DDC44 -/* 8A2FC4 80240BF4 27A70028 */ addiu $a3, $sp, 0x28 -/* 8A2FC8 80240BF8 0040902D */ daddu $s2, $v0, $zero -/* 8A2FCC 80240BFC 16400005 */ bnez $s2, .L80240C14 -/* 8A2FD0 80240C00 00000000 */ nop -/* 8A2FD4 80240C04 8E050018 */ lw $a1, 0x18($s0) -/* 8A2FD8 80240C08 8E06000C */ lw $a2, 0xc($s0) -/* 8A2FDC 80240C0C 0C00EA95 */ jal npc_move_heading -/* 8A2FE0 80240C10 0200202D */ daddu $a0, $s0, $zero -.L80240C14: -/* 8A2FE4 80240C14 8602008E */ lh $v0, 0x8e($s0) -/* 8A2FE8 80240C18 9603008E */ lhu $v1, 0x8e($s0) -/* 8A2FEC 80240C1C 18400007 */ blez $v0, .L80240C3C -/* 8A2FF0 80240C20 2462FFFF */ addiu $v0, $v1, -1 -/* 8A2FF4 80240C24 A602008E */ sh $v0, 0x8e($s0) -/* 8A2FF8 80240C28 00021400 */ sll $v0, $v0, 0x10 -/* 8A2FFC 80240C2C 18400003 */ blez $v0, .L80240C3C -/* 8A3000 80240C30 00000000 */ nop -/* 8A3004 80240C34 12400008 */ beqz $s2, .L80240C58 -/* 8A3008 80240C38 00000000 */ nop -.L80240C3C: -/* 8A300C 80240C3C 8E2200CC */ lw $v0, 0xcc($s1) -/* 8A3010 80240C40 A2200007 */ sb $zero, 7($s1) -/* 8A3014 80240C44 8C420028 */ lw $v0, 0x28($v0) -/* 8A3018 80240C48 A600008E */ sh $zero, 0x8e($s0) -/* 8A301C 80240C4C AE020028 */ sw $v0, 0x28($s0) -/* 8A3020 80240C50 2402000F */ addiu $v0, $zero, 0xf -/* 8A3024 80240C54 AE620070 */ sw $v0, 0x70($s3) -.L80240C58: -/* 8A3028 80240C58 8FBF0040 */ lw $ra, 0x40($sp) -/* 8A302C 80240C5C 8FB3003C */ lw $s3, 0x3c($sp) -/* 8A3030 80240C60 8FB20038 */ lw $s2, 0x38($sp) -/* 8A3034 80240C64 8FB10034 */ lw $s1, 0x34($sp) -/* 8A3038 80240C68 8FB00030 */ lw $s0, 0x30($sp) -/* 8A303C 80240C6C 03E00008 */ jr $ra -/* 8A3040 80240C70 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_23/func_80240C74_8A23D0.s b/asm/nonmatchings/world/area_tik/tik_23/func_80240C74_8A23D0.s deleted file mode 100644 index b70807da8f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/func_80240C74_8A23D0.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C74_8A3044 -/* 8A3044 80240C74 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8A3048 80240C78 AFB10014 */ sw $s1, 0x14($sp) -/* 8A304C 80240C7C 0080882D */ daddu $s1, $a0, $zero -/* 8A3050 80240C80 AFBF0018 */ sw $ra, 0x18($sp) -/* 8A3054 80240C84 AFB00010 */ sw $s0, 0x10($sp) -/* 8A3058 80240C88 8E300148 */ lw $s0, 0x148($s1) -/* 8A305C 80240C8C 0C00EABB */ jal get_npc_unsafe -/* 8A3060 80240C90 86040008 */ lh $a0, 8($s0) -/* 8A3064 80240C94 0040202D */ daddu $a0, $v0, $zero -/* 8A3068 80240C98 9482008E */ lhu $v0, 0x8e($a0) -/* 8A306C 80240C9C 24030003 */ addiu $v1, $zero, 3 -/* 8A3070 80240CA0 24420001 */ addiu $v0, $v0, 1 -/* 8A3074 80240CA4 A482008E */ sh $v0, 0x8e($a0) -/* 8A3078 80240CA8 00021400 */ sll $v0, $v0, 0x10 -/* 8A307C 80240CAC 00021403 */ sra $v0, $v0, 0x10 -/* 8A3080 80240CB0 14430003 */ bne $v0, $v1, .L80240CC0 -/* 8A3084 80240CB4 00000000 */ nop -/* 8A3088 80240CB8 96020086 */ lhu $v0, 0x86($s0) -/* 8A308C 80240CBC A48200A8 */ sh $v0, 0xa8($a0) -.L80240CC0: -/* 8A3090 80240CC0 8482008E */ lh $v0, 0x8e($a0) -/* 8A3094 80240CC4 8E030080 */ lw $v1, 0x80($s0) -/* 8A3098 80240CC8 0043102A */ slt $v0, $v0, $v1 -/* 8A309C 80240CCC 14400004 */ bnez $v0, .L80240CE0 -/* 8A30A0 80240CD0 00000000 */ nop -/* 8A30A4 80240CD4 96020086 */ lhu $v0, 0x86($s0) -/* 8A30A8 80240CD8 A48200A8 */ sh $v0, 0xa8($a0) -/* 8A30AC 80240CDC AE200070 */ sw $zero, 0x70($s1) -.L80240CE0: -/* 8A30B0 80240CE0 8FBF0018 */ lw $ra, 0x18($sp) -/* 8A30B4 80240CE4 8FB10014 */ lw $s1, 0x14($sp) -/* 8A30B8 80240CE8 8FB00010 */ lw $s0, 0x10($sp) -/* 8A30BC 80240CEC 03E00008 */ jr $ra -/* 8A30C0 80240CF0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_23/func_80240CF4_8A23D0.s b/asm/nonmatchings/world/area_tik/tik_23/func_80240CF4_8A23D0.s deleted file mode 100644 index 56f22ecf92..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_23/func_80240CF4_8A23D0.s +++ /dev/null @@ -1,304 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CF4_8A30C4 -/* 8A30C4 80240CF4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 8A30C8 80240CF8 AFB3005C */ sw $s3, 0x5c($sp) -/* 8A30CC 80240CFC 0080982D */ daddu $s3, $a0, $zero -/* 8A30D0 80240D00 AFBF0068 */ sw $ra, 0x68($sp) -/* 8A30D4 80240D04 AFB50064 */ sw $s5, 0x64($sp) -/* 8A30D8 80240D08 AFB40060 */ sw $s4, 0x60($sp) -/* 8A30DC 80240D0C AFB20058 */ sw $s2, 0x58($sp) -/* 8A30E0 80240D10 AFB10054 */ sw $s1, 0x54($sp) -/* 8A30E4 80240D14 AFB00050 */ sw $s0, 0x50($sp) -/* 8A30E8 80240D18 8E710148 */ lw $s1, 0x148($s3) -/* 8A30EC 80240D1C 86240008 */ lh $a0, 8($s1) -/* 8A30F0 80240D20 0C00EABB */ jal get_npc_unsafe -/* 8A30F4 80240D24 00A0802D */ daddu $s0, $a1, $zero -/* 8A30F8 80240D28 8E63000C */ lw $v1, 0xc($s3) -/* 8A30FC 80240D2C 0260202D */ daddu $a0, $s3, $zero -/* 8A3100 80240D30 8C650000 */ lw $a1, ($v1) -/* 8A3104 80240D34 0C0B1EAF */ jal get_variable -/* 8A3108 80240D38 0040902D */ daddu $s2, $v0, $zero -/* 8A310C 80240D3C AFA00028 */ sw $zero, 0x28($sp) -/* 8A3110 80240D40 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A3114 80240D44 8C630030 */ lw $v1, 0x30($v1) -/* 8A3118 80240D48 AFA3002C */ sw $v1, 0x2c($sp) -/* 8A311C 80240D4C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A3120 80240D50 8C63001C */ lw $v1, 0x1c($v1) -/* 8A3124 80240D54 AFA30030 */ sw $v1, 0x30($sp) -/* 8A3128 80240D58 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A312C 80240D5C 8C630024 */ lw $v1, 0x24($v1) -/* 8A3130 80240D60 AFA30034 */ sw $v1, 0x34($sp) -/* 8A3134 80240D64 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A3138 80240D68 8C630028 */ lw $v1, 0x28($v1) -/* 8A313C 80240D6C 27B50028 */ addiu $s5, $sp, 0x28 -/* 8A3140 80240D70 AFA30038 */ sw $v1, 0x38($sp) -/* 8A3144 80240D74 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A3148 80240D78 3C0142C8 */ lui $at, 0x42c8 -/* 8A314C 80240D7C 44810000 */ mtc1 $at, $f0 -/* 8A3150 80240D80 8C63002C */ lw $v1, 0x2c($v1) -/* 8A3154 80240D84 0040A02D */ daddu $s4, $v0, $zero -/* 8A3158 80240D88 E7A00040 */ swc1 $f0, 0x40($sp) -/* 8A315C 80240D8C A7A00044 */ sh $zero, 0x44($sp) -/* 8A3160 80240D90 12000009 */ beqz $s0, .L80240DB8 -/* 8A3164 80240D94 AFA3003C */ sw $v1, 0x3c($sp) -/* 8A3168 80240D98 864300A8 */ lh $v1, 0xa8($s2) -/* 8A316C 80240D9C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8A3170 80240DA0 AE20008C */ sw $zero, 0x8c($s1) -/* 8A3174 80240DA4 A22000B5 */ sb $zero, 0xb5($s1) -/* 8A3178 80240DA8 34420008 */ ori $v0, $v0, 8 -/* 8A317C 80240DAC AE230084 */ sw $v1, 0x84($s1) -/* 8A3180 80240DB0 08090372 */ j .L80240DC8 -/* 8A3184 80240DB4 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240DB8: -/* 8A3188 80240DB8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8A318C 80240DBC 30420004 */ andi $v0, $v0, 4 -/* 8A3190 80240DC0 10400047 */ beqz $v0, .L80240EE0 -/* 8A3194 80240DC4 00000000 */ nop -.L80240DC8: -/* 8A3198 80240DC8 AE600070 */ sw $zero, 0x70($s3) -/* 8A319C 80240DCC A640008E */ sh $zero, 0x8e($s2) -/* 8A31A0 80240DD0 8E2300CC */ lw $v1, 0xcc($s1) -/* 8A31A4 80240DD4 2404F7FF */ addiu $a0, $zero, -0x801 -/* 8A31A8 80240DD8 A2200007 */ sb $zero, 7($s1) -/* 8A31AC 80240DDC 8E420000 */ lw $v0, ($s2) -/* 8A31B0 80240DE0 8C630000 */ lw $v1, ($v1) -/* 8A31B4 80240DE4 00441024 */ and $v0, $v0, $a0 -/* 8A31B8 80240DE8 AE420000 */ sw $v0, ($s2) -/* 8A31BC 80240DEC AE430028 */ sw $v1, 0x28($s2) -/* 8A31C0 80240DF0 96220086 */ lhu $v0, 0x86($s1) -/* 8A31C4 80240DF4 A64200A8 */ sh $v0, 0xa8($s2) -/* 8A31C8 80240DF8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8A31CC 80240DFC AE200090 */ sw $zero, 0x90($s1) -/* 8A31D0 80240E00 8C420034 */ lw $v0, 0x34($v0) -/* 8A31D4 80240E04 14400006 */ bnez $v0, .L80240E20 -/* 8A31D8 80240E08 2403FDFF */ addiu $v1, $zero, -0x201 -/* 8A31DC 80240E0C 8E420000 */ lw $v0, ($s2) -/* 8A31E0 80240E10 2403FFF7 */ addiu $v1, $zero, -9 -/* 8A31E4 80240E14 34420200 */ ori $v0, $v0, 0x200 -/* 8A31E8 80240E18 0809038B */ j .L80240E2C -/* 8A31EC 80240E1C 00431024 */ and $v0, $v0, $v1 -.L80240E20: -/* 8A31F0 80240E20 8E420000 */ lw $v0, ($s2) -/* 8A31F4 80240E24 00431024 */ and $v0, $v0, $v1 -/* 8A31F8 80240E28 34420008 */ ori $v0, $v0, 8 -.L80240E2C: -/* 8A31FC 80240E2C AE420000 */ sw $v0, ($s2) -/* 8A3200 80240E30 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8A3204 80240E34 30420004 */ andi $v0, $v0, 4 -/* 8A3208 80240E38 1040001E */ beqz $v0, .L80240EB4 -/* 8A320C 80240E3C 24040002 */ addiu $a0, $zero, 2 -/* 8A3210 80240E40 0240282D */ daddu $a1, $s2, $zero -/* 8A3214 80240E44 0000302D */ daddu $a2, $zero, $zero -/* 8A3218 80240E48 24020063 */ addiu $v0, $zero, 0x63 -/* 8A321C 80240E4C AE620070 */ sw $v0, 0x70($s3) -/* 8A3220 80240E50 AE600074 */ sw $zero, 0x74($s3) -/* 8A3224 80240E54 864300A8 */ lh $v1, 0xa8($s2) -/* 8A3228 80240E58 3C013F80 */ lui $at, 0x3f80 -/* 8A322C 80240E5C 44810000 */ mtc1 $at, $f0 -/* 8A3230 80240E60 3C014000 */ lui $at, 0x4000 -/* 8A3234 80240E64 44811000 */ mtc1 $at, $f2 -/* 8A3238 80240E68 3C01C1A0 */ lui $at, 0xc1a0 -/* 8A323C 80240E6C 44812000 */ mtc1 $at, $f4 -/* 8A3240 80240E70 24020028 */ addiu $v0, $zero, 0x28 -/* 8A3244 80240E74 AFA2001C */ sw $v0, 0x1c($sp) -/* 8A3248 80240E78 44833000 */ mtc1 $v1, $f6 -/* 8A324C 80240E7C 00000000 */ nop -/* 8A3250 80240E80 468031A0 */ cvt.s.w $f6, $f6 -/* 8A3254 80240E84 44073000 */ mfc1 $a3, $f6 -/* 8A3258 80240E88 27A20048 */ addiu $v0, $sp, 0x48 -/* 8A325C 80240E8C AFA20020 */ sw $v0, 0x20($sp) -/* 8A3260 80240E90 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8A3264 80240E94 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8A3268 80240E98 0C01BFA4 */ jal fx_emote -/* 8A326C 80240E9C E7A40018 */ swc1 $f4, 0x18($sp) -/* 8A3270 80240EA0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8A3274 80240EA4 2403FFFB */ addiu $v1, $zero, -5 -/* 8A3278 80240EA8 00431024 */ and $v0, $v0, $v1 -/* 8A327C 80240EAC 080903B8 */ j .L80240EE0 -/* 8A3280 80240EB0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240EB4: -/* 8A3284 80240EB4 8E220000 */ lw $v0, ($s1) -/* 8A3288 80240EB8 3C034000 */ lui $v1, 0x4000 -/* 8A328C 80240EBC 00431024 */ and $v0, $v0, $v1 -/* 8A3290 80240EC0 10400007 */ beqz $v0, .L80240EE0 -/* 8A3294 80240EC4 3C03BFFF */ lui $v1, 0xbfff -/* 8A3298 80240EC8 2402000C */ addiu $v0, $zero, 0xc -/* 8A329C 80240ECC AE620070 */ sw $v0, 0x70($s3) -/* 8A32A0 80240ED0 8E220000 */ lw $v0, ($s1) -/* 8A32A4 80240ED4 3463FFFF */ ori $v1, $v1, 0xffff -/* 8A32A8 80240ED8 00431024 */ and $v0, $v0, $v1 -/* 8A32AC 80240EDC AE220000 */ sw $v0, ($s1) -.L80240EE0: -/* 8A32B0 80240EE0 8E220090 */ lw $v0, 0x90($s1) -/* 8A32B4 80240EE4 1840000C */ blez $v0, .L80240F18 -/* 8A32B8 80240EE8 2442FFFF */ addiu $v0, $v0, -1 -/* 8A32BC 80240EEC 14400087 */ bnez $v0, .L8024110C -/* 8A32C0 80240EF0 AE220090 */ sw $v0, 0x90($s1) -/* 8A32C4 80240EF4 3C03FFAA */ lui $v1, 0xffaa -/* 8A32C8 80240EF8 8E420028 */ lw $v0, 0x28($s2) -/* 8A32CC 80240EFC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 8A32D0 80240F00 00431021 */ addu $v0, $v0, $v1 -/* 8A32D4 80240F04 2C420002 */ sltiu $v0, $v0, 2 -/* 8A32D8 80240F08 10400003 */ beqz $v0, .L80240F18 -/* 8A32DC 80240F0C 3C020055 */ lui $v0, 0x55 -/* 8A32E0 80240F10 3442000C */ ori $v0, $v0, 0xc -/* 8A32E4 80240F14 AE420028 */ sw $v0, 0x28($s2) -.L80240F18: -/* 8A32E8 80240F18 8E630070 */ lw $v1, 0x70($s3) -/* 8A32EC 80240F1C 2402000C */ addiu $v0, $zero, 0xc -/* 8A32F0 80240F20 10620048 */ beq $v1, $v0, .L80241044 -/* 8A32F4 80240F24 2862000D */ slti $v0, $v1, 0xd -/* 8A32F8 80240F28 1040000F */ beqz $v0, .L80240F68 -/* 8A32FC 80240F2C 24100001 */ addiu $s0, $zero, 1 -/* 8A3300 80240F30 1070001E */ beq $v1, $s0, .L80240FAC -/* 8A3304 80240F34 28620002 */ slti $v0, $v1, 2 -/* 8A3308 80240F38 10400005 */ beqz $v0, .L80240F50 -/* 8A330C 80240F3C 24020002 */ addiu $v0, $zero, 2 -/* 8A3310 80240F40 10600015 */ beqz $v1, .L80240F98 -/* 8A3314 80240F44 0260202D */ daddu $a0, $s3, $zero -/* 8A3318 80240F48 08090428 */ j .L802410A0 -/* 8A331C 80240F4C 00000000 */ nop -.L80240F50: -/* 8A3320 80240F50 1062001C */ beq $v1, $v0, .L80240FC4 -/* 8A3324 80240F54 24020003 */ addiu $v0, $zero, 3 -/* 8A3328 80240F58 10620035 */ beq $v1, $v0, .L80241030 -/* 8A332C 80240F5C 0260202D */ daddu $a0, $s3, $zero -/* 8A3330 80240F60 08090428 */ j .L802410A0 -/* 8A3334 80240F64 00000000 */ nop -.L80240F68: -/* 8A3338 80240F68 2402000E */ addiu $v0, $zero, 0xe -/* 8A333C 80240F6C 1062003F */ beq $v1, $v0, .L8024106C -/* 8A3340 80240F70 0062102A */ slt $v0, $v1, $v0 -/* 8A3344 80240F74 14400038 */ bnez $v0, .L80241058 -/* 8A3348 80240F78 0260202D */ daddu $a0, $s3, $zero -/* 8A334C 80240F7C 2402000F */ addiu $v0, $zero, 0xf -/* 8A3350 80240F80 10620040 */ beq $v1, $v0, .L80241084 -/* 8A3354 80240F84 24020063 */ addiu $v0, $zero, 0x63 -/* 8A3358 80240F88 10620043 */ beq $v1, $v0, .L80241098 -/* 8A335C 80240F8C 00000000 */ nop -/* 8A3360 80240F90 08090428 */ j .L802410A0 -/* 8A3364 80240F94 00000000 */ nop -.L80240F98: -/* 8A3368 80240F98 0280282D */ daddu $a1, $s4, $zero -/* 8A336C 80240F9C 0C012568 */ jal func_800495A0 -/* 8A3370 80240FA0 02A0302D */ daddu $a2, $s5, $zero -/* 8A3374 80240FA4 96220086 */ lhu $v0, 0x86($s1) -/* 8A3378 80240FA8 A64200A8 */ sh $v0, 0xa8($s2) -.L80240FAC: -/* 8A337C 80240FAC 0260202D */ daddu $a0, $s3, $zero -/* 8A3380 80240FB0 0280282D */ daddu $a1, $s4, $zero -/* 8A3384 80240FB4 0C0125AE */ jal func_800496B8 -/* 8A3388 80240FB8 02A0302D */ daddu $a2, $s5, $zero -/* 8A338C 80240FBC 08090428 */ j .L802410A0 -/* 8A3390 80240FC0 00000000 */ nop -.L80240FC4: -/* 8A3394 80240FC4 0260202D */ daddu $a0, $s3, $zero -/* 8A3398 80240FC8 0280282D */ daddu $a1, $s4, $zero -/* 8A339C 80240FCC 0C0126D1 */ jal func_80049B44 -/* 8A33A0 80240FD0 02A0302D */ daddu $a2, $s5, $zero -/* 8A33A4 80240FD4 8E230088 */ lw $v1, 0x88($s1) -/* 8A33A8 80240FD8 24020006 */ addiu $v0, $zero, 6 -/* 8A33AC 80240FDC 14620014 */ bne $v1, $v0, .L80241030 -/* 8A33B0 80240FE0 0260202D */ daddu $a0, $s3, $zero -/* 8A33B4 80240FE4 0C00A67F */ jal rand_int -/* 8A33B8 80240FE8 24040064 */ addiu $a0, $zero, 0x64 -/* 8A33BC 80240FEC 28420021 */ slti $v0, $v0, 0x21 -/* 8A33C0 80240FF0 5040000F */ beql $v0, $zero, .L80241030 -/* 8A33C4 80240FF4 0260202D */ daddu $a0, $s3, $zero -/* 8A33C8 80240FF8 8E22008C */ lw $v0, 0x8c($s1) -/* 8A33CC 80240FFC 10400005 */ beqz $v0, .L80241014 -/* 8A33D0 80241000 3C020055 */ lui $v0, 0x55 -/* 8A33D4 80241004 3442002F */ ori $v0, $v0, 0x2f -/* 8A33D8 80241008 AE20008C */ sw $zero, 0x8c($s1) -/* 8A33DC 8024100C 08090408 */ j .L80241020 -/* 8A33E0 80241010 A22000B5 */ sb $zero, 0xb5($s1) -.L80241014: -/* 8A33E4 80241014 3442002E */ ori $v0, $v0, 0x2e -/* 8A33E8 80241018 AE30008C */ sw $s0, 0x8c($s1) -/* 8A33EC 8024101C A23000B5 */ sb $s0, 0xb5($s1) -.L80241020: -/* 8A33F0 80241020 AE420028 */ sw $v0, 0x28($s2) -/* 8A33F4 80241024 24020007 */ addiu $v0, $zero, 7 -/* 8A33F8 80241028 08090443 */ j .L8024110C -/* 8A33FC 8024102C AE220090 */ sw $v0, 0x90($s1) -.L80241030: -/* 8A3400 80241030 0280282D */ daddu $a1, $s4, $zero -/* 8A3404 80241034 0C012701 */ jal func_80049C04 -/* 8A3408 80241038 02A0302D */ daddu $a2, $s5, $zero -/* 8A340C 8024103C 08090428 */ j .L802410A0 -/* 8A3410 80241040 00000000 */ nop -.L80241044: -/* 8A3414 80241044 0260202D */ daddu $a0, $s3, $zero -/* 8A3418 80241048 0280282D */ daddu $a1, $s4, $zero -/* 8A341C 8024104C 0C090258 */ jal func_80240960 -/* 8A3420 80241050 02A0302D */ daddu $a2, $s5, $zero -/* 8A3424 80241054 0260202D */ daddu $a0, $s3, $zero -.L80241058: -/* 8A3428 80241058 0280282D */ daddu $a1, $s4, $zero -/* 8A342C 8024105C 0C090277 */ jal func_802409DC -/* 8A3430 80241060 02A0302D */ daddu $a2, $s5, $zero -/* 8A3434 80241064 08090428 */ j .L802410A0 -/* 8A3438 80241068 00000000 */ nop -.L8024106C: -/* 8A343C 8024106C 0260202D */ daddu $a0, $s3, $zero -/* 8A3440 80241070 0280282D */ daddu $a1, $s4, $zero -/* 8A3444 80241074 0C0902C4 */ jal func_80240B10 -/* 8A3448 80241078 02A0302D */ daddu $a2, $s5, $zero -/* 8A344C 8024107C 08090428 */ j .L802410A0 -/* 8A3450 80241080 00000000 */ nop -.L80241084: -/* 8A3454 80241084 0280282D */ daddu $a1, $s4, $zero -/* 8A3458 80241088 0C09031D */ jal func_80240C74 -/* 8A345C 8024108C 02A0302D */ daddu $a2, $s5, $zero -/* 8A3460 80241090 08090428 */ j .L802410A0 -/* 8A3464 80241094 00000000 */ nop -.L80241098: -/* 8A3468 80241098 0C0129CF */ jal func_8004A73C -/* 8A346C 8024109C 0260202D */ daddu $a0, $s3, $zero -.L802410A0: -/* 8A3470 802410A0 8E230088 */ lw $v1, 0x88($s1) -/* 8A3474 802410A4 24020006 */ addiu $v0, $zero, 6 -/* 8A3478 802410A8 14620019 */ bne $v1, $v0, .L80241110 -/* 8A347C 802410AC 0000102D */ daddu $v0, $zero, $zero -/* 8A3480 802410B0 8E22008C */ lw $v0, 0x8c($s1) -/* 8A3484 802410B4 10400003 */ beqz $v0, .L802410C4 -/* 8A3488 802410B8 24020001 */ addiu $v0, $zero, 1 -/* 8A348C 802410BC 08090432 */ j .L802410C8 -/* 8A3490 802410C0 A22200B5 */ sb $v0, 0xb5($s1) -.L802410C4: -/* 8A3494 802410C4 A22000B5 */ sb $zero, 0xb5($s1) -.L802410C8: -/* 8A3498 802410C8 8E22008C */ lw $v0, 0x8c($s1) -/* 8A349C 802410CC 1040000F */ beqz $v0, .L8024110C -/* 8A34A0 802410D0 3C03FFAA */ lui $v1, 0xffaa -/* 8A34A4 802410D4 8E420028 */ lw $v0, 0x28($s2) -/* 8A34A8 802410D8 3463FFFC */ ori $v1, $v1, 0xfffc -/* 8A34AC 802410DC 00431821 */ addu $v1, $v0, $v1 -/* 8A34B0 802410E0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 8A34B4 802410E4 10400009 */ beqz $v0, .L8024110C -/* 8A34B8 802410E8 00031080 */ sll $v0, $v1, 2 -/* 8A34BC 802410EC 3C018024 */ lui $at, 0x8024 -/* 8A34C0 802410F0 00220821 */ addu $at, $at, $v0 -/* 8A34C4 802410F4 8C223658 */ lw $v0, 0x3658($at) -/* 8A34C8 802410F8 00400008 */ jr $v0 -/* 8A34CC 802410FC 00000000 */ nop -/* 8A34D0 80241100 8E420028 */ lw $v0, 0x28($s2) -/* 8A34D4 80241104 24420001 */ addiu $v0, $v0, 1 -/* 8A34D8 80241108 AE420028 */ sw $v0, 0x28($s2) -.L8024110C: -/* 8A34DC 8024110C 0000102D */ daddu $v0, $zero, $zero -.L80241110: -/* 8A34E0 80241110 8FBF0068 */ lw $ra, 0x68($sp) -/* 8A34E4 80241114 8FB50064 */ lw $s5, 0x64($sp) -/* 8A34E8 80241118 8FB40060 */ lw $s4, 0x60($sp) -/* 8A34EC 8024111C 8FB3005C */ lw $s3, 0x5c($sp) -/* 8A34F0 80241120 8FB20058 */ lw $s2, 0x58($sp) -/* 8A34F4 80241124 8FB10054 */ lw $s1, 0x54($sp) -/* 8A34F8 80241128 8FB00050 */ lw $s0, 0x50($sp) -/* 8A34FC 8024112C 03E00008 */ jr $ra -/* 8A3500 80241130 27BD0070 */ addiu $sp, $sp, 0x70 -/* 8A3504 80241134 00000000 */ nop -/* 8A3508 80241138 00000000 */ nop -/* 8A350C 8024113C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_24/func_80240050_8A5A80.s b/asm/nonmatchings/world/area_tik/tik_24/func_80240050_8A5A80.s deleted file mode 100644 index 7de010a9f9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_24/func_80240050_8A5A80.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_8A5AD0 -/* 8A5AD0 80240050 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A5AD4 80240054 AFB00010 */ sw $s0, 0x10($sp) -/* 8A5AD8 80240058 0080802D */ daddu $s0, $a0, $zero -/* 8A5ADC 8024005C AFBF0014 */ sw $ra, 0x14($sp) -/* 8A5AE0 80240060 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8A5AE4 80240064 8E020088 */ lw $v0, 0x88($s0) -/* 8A5AE8 80240068 00621821 */ addu $v1, $v1, $v0 -/* 8A5AEC 8024006C 04610004 */ bgez $v1, .L80240080 -/* 8A5AF0 80240070 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8A5AF4 80240074 3C020002 */ lui $v0, 2 -/* 8A5AF8 80240078 08090024 */ j .L80240090 -/* 8A5AFC 8024007C 00621021 */ addu $v0, $v1, $v0 -.L80240080: -/* 8A5B00 80240080 3C040002 */ lui $a0, 2 -/* 8A5B04 80240084 0083102A */ slt $v0, $a0, $v1 -/* 8A5B08 80240088 10400002 */ beqz $v0, .L80240094 -/* 8A5B0C 8024008C 00641023 */ subu $v0, $v1, $a0 -.L80240090: -/* 8A5B10 80240090 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240094: -/* 8A5B14 80240094 8E0300AC */ lw $v1, 0xac($s0) -/* 8A5B18 80240098 8E02008C */ lw $v0, 0x8c($s0) -/* 8A5B1C 8024009C 00621821 */ addu $v1, $v1, $v0 -/* 8A5B20 802400A0 04610004 */ bgez $v1, .L802400B4 -/* 8A5B24 802400A4 AE0300AC */ sw $v1, 0xac($s0) -/* 8A5B28 802400A8 3C020002 */ lui $v0, 2 -/* 8A5B2C 802400AC 08090031 */ j .L802400C4 -/* 8A5B30 802400B0 00621021 */ addu $v0, $v1, $v0 -.L802400B4: -/* 8A5B34 802400B4 3C040002 */ lui $a0, 2 -/* 8A5B38 802400B8 0083102A */ slt $v0, $a0, $v1 -/* 8A5B3C 802400BC 10400002 */ beqz $v0, .L802400C8 -/* 8A5B40 802400C0 00641023 */ subu $v0, $v1, $a0 -.L802400C4: -/* 8A5B44 802400C4 AE0200AC */ sw $v0, 0xac($s0) -.L802400C8: -/* 8A5B48 802400C8 8E0300B0 */ lw $v1, 0xb0($s0) -/* 8A5B4C 802400CC 8E020090 */ lw $v0, 0x90($s0) -/* 8A5B50 802400D0 00621821 */ addu $v1, $v1, $v0 -/* 8A5B54 802400D4 04610004 */ bgez $v1, .L802400E8 -/* 8A5B58 802400D8 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8A5B5C 802400DC 3C020002 */ lui $v0, 2 -/* 8A5B60 802400E0 0809003E */ j .L802400F8 -/* 8A5B64 802400E4 00621021 */ addu $v0, $v1, $v0 -.L802400E8: -/* 8A5B68 802400E8 3C040002 */ lui $a0, 2 -/* 8A5B6C 802400EC 0083102A */ slt $v0, $a0, $v1 -/* 8A5B70 802400F0 10400002 */ beqz $v0, .L802400FC -/* 8A5B74 802400F4 00641023 */ subu $v0, $v1, $a0 -.L802400F8: -/* 8A5B78 802400F8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802400FC: -/* 8A5B7C 802400FC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8A5B80 80240100 8E020094 */ lw $v0, 0x94($s0) -/* 8A5B84 80240104 00621821 */ addu $v1, $v1, $v0 -/* 8A5B88 80240108 04610004 */ bgez $v1, .L8024011C -/* 8A5B8C 8024010C AE0300B4 */ sw $v1, 0xb4($s0) -/* 8A5B90 80240110 3C020002 */ lui $v0, 2 -/* 8A5B94 80240114 0809004B */ j .L8024012C -/* 8A5B98 80240118 00621021 */ addu $v0, $v1, $v0 -.L8024011C: -/* 8A5B9C 8024011C 3C040002 */ lui $a0, 2 -/* 8A5BA0 80240120 0083102A */ slt $v0, $a0, $v1 -/* 8A5BA4 80240124 10400002 */ beqz $v0, .L80240130 -/* 8A5BA8 80240128 00641023 */ subu $v0, $v1, $a0 -.L8024012C: -/* 8A5BAC 8024012C AE0200B4 */ sw $v0, 0xb4($s0) -.L80240130: -/* 8A5BB0 80240130 8E040084 */ lw $a0, 0x84($s0) -/* 8A5BB4 80240134 0C046F07 */ jal set_main_pan_u -/* 8A5BB8 80240138 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8A5BBC 8024013C 8E040084 */ lw $a0, 0x84($s0) -/* 8A5BC0 80240140 0C046F0D */ jal set_main_pan_v -/* 8A5BC4 80240144 8E0500AC */ lw $a1, 0xac($s0) -/* 8A5BC8 80240148 8E040084 */ lw $a0, 0x84($s0) -/* 8A5BCC 8024014C 0C046F13 */ jal set_aux_pan_u -/* 8A5BD0 80240150 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8A5BD4 80240154 8E040084 */ lw $a0, 0x84($s0) -/* 8A5BD8 80240158 0C046F19 */ jal set_aux_pan_v -/* 8A5BDC 8024015C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8A5BE0 80240160 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A5BE4 80240164 8FB00010 */ lw $s0, 0x10($sp) -/* 8A5BE8 80240168 0000102D */ daddu $v0, $zero, $zero -/* 8A5BEC 8024016C 03E00008 */ jr $ra -/* 8A5BF0 80240170 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_25/func_80240124_8A7F80.s b/asm/nonmatchings/world/area_tik/tik_25/func_80240124_8A7F80.s deleted file mode 100644 index a66ba979f7..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_25/func_80240124_8A7F80.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_8A80A4 -/* 8A80A4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A80A8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 8A80AC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 8A80B0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 8A80B4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 8A80B8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 8A80BC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 8A80C0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 8A80C4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 8A80C8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 8A80CC 8024014C 1440000E */ bnez $v0, .L80240188 -/* 8A80D0 80240150 00000000 */ nop -/* 8A80D4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8A80D8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 8A80DC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 8A80E0 80240160 04610004 */ bgez $v1, .L80240174 -/* 8A80E4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8A80E8 80240168 3C020002 */ lui $v0, 2 -/* 8A80EC 8024016C 08090061 */ j .L80240184 -/* 8A80F0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 8A80F4 80240174 3C040002 */ lui $a0, 2 -/* 8A80F8 80240178 0083102A */ slt $v0, $a0, $v1 -/* 8A80FC 8024017C 10400002 */ beqz $v0, .L80240188 -/* 8A8100 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 8A8104 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 8A8108 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 8A810C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 8A8110 80240190 00000000 */ nop -/* 8A8114 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 8A8118 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 8A811C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 8A8120 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 8A8124 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 8A8128 802401A8 3C020002 */ lui $v0, 2 -/* 8A812C 802401AC 08090071 */ j .L802401C4 -/* 8A8130 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 8A8134 802401B4 3C040002 */ lui $a0, 2 -/* 8A8138 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 8A813C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 8A8140 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 8A8144 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 8A8148 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 8A814C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 8A8150 802401D0 00000000 */ nop -/* 8A8154 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 8A8158 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 8A815C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 8A8160 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 8A8164 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8A8168 802401E8 3C020002 */ lui $v0, 2 -/* 8A816C 802401EC 08090081 */ j .L80240204 -/* 8A8170 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 8A8174 802401F4 3C040002 */ lui $a0, 2 -/* 8A8178 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 8A817C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 8A8180 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 8A8184 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 8A8188 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 8A818C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 8A8190 80240210 00000000 */ nop -/* 8A8194 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8A8198 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 8A819C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 8A81A0 80240220 04610004 */ bgez $v1, .L80240234 -/* 8A81A4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8A81A8 80240228 3C020002 */ lui $v0, 2 -/* 8A81AC 8024022C 08090091 */ j .L80240244 -/* 8A81B0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 8A81B4 80240234 3C040002 */ lui $a0, 2 -/* 8A81B8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 8A81BC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 8A81C0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 8A81C4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 8A81C8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 8A81CC 8024024C 0C046F07 */ jal set_main_pan_u -/* 8A81D0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8A81D4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 8A81D8 80240258 0C046F0D */ jal set_main_pan_v -/* 8A81DC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 8A81E0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 8A81E4 80240264 0C046F13 */ jal set_aux_pan_u -/* 8A81E8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8A81EC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 8A81F0 80240270 0C046F19 */ jal set_aux_pan_v -/* 8A81F4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8A81F8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 8A81FC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 8A8200 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 8A8204 80240284 24420001 */ addiu $v0, $v0, 1 -/* 8A8208 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 8A820C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 8A8210 80240290 24630001 */ addiu $v1, $v1, 1 -/* 8A8214 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 8A8218 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 8A821C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 8A8220 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 8A8224 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 8A8228 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 8A822C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 8A8230 802402B0 14600002 */ bnez $v1, .L802402BC -/* 8A8234 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 8A8238 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 8A823C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 8A8240 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 8A8244 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 8A8248 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 8A824C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 8A8250 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 8A8254 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 8A8258 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 8A825C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 8A8260 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 8A8264 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 8A8268 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 8A826C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 8A8270 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 8A8274 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 8A8278 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A827C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 8A8280 80240300 0000102D */ daddu $v0, $zero, $zero -/* 8A8284 80240304 03E00008 */ jr $ra -/* 8A8288 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_25/func_8024030C_8A7F80.s b/asm/nonmatchings/world/area_tik/tik_25/func_8024030C_8A7F80.s deleted file mode 100644 index b17f224ceb..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_25/func_8024030C_8A7F80.s +++ /dev/null @@ -1,235 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_8A828C -/* 8A828C 8024030C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8A8290 80240310 AFB3001C */ sw $s3, 0x1c($sp) -/* 8A8294 80240314 0080982D */ daddu $s3, $a0, $zero -/* 8A8298 80240318 AFBF0020 */ sw $ra, 0x20($sp) -/* 8A829C 8024031C AFB20018 */ sw $s2, 0x18($sp) -/* 8A82A0 80240320 AFB10014 */ sw $s1, 0x14($sp) -/* 8A82A4 80240324 AFB00010 */ sw $s0, 0x10($sp) -/* 8A82A8 80240328 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8A82AC 8024032C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8A82B0 80240330 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8A82B4 80240334 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8A82B8 80240338 8E62000C */ lw $v0, 0xc($s3) -/* 8A82BC 8024033C 0C0B1EAF */ jal get_variable -/* 8A82C0 80240340 8C450000 */ lw $a1, ($v0) -/* 8A82C4 80240344 2404FFFC */ addiu $a0, $zero, -4 -/* 8A82C8 80240348 0C00EABB */ jal get_npc_unsafe -/* 8A82CC 8024034C 0040802D */ daddu $s0, $v0, $zero -/* 8A82D0 80240350 0200202D */ daddu $a0, $s0, $zero -/* 8A82D4 80240354 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8A82D8 80240358 0040802D */ daddu $s0, $v0, $zero -/* 8A82DC 8024035C 0C046B4C */ jal get_model_from_list_index -/* 8A82E0 80240360 0040202D */ daddu $a0, $v0, $zero -/* 8A82E4 80240364 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8A82E8 80240368 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8A82EC 8024036C 0040902D */ daddu $s2, $v0, $zero -/* 8A82F0 80240370 AE60008C */ sw $zero, 0x8c($s3) -/* 8A82F4 80240374 C4620028 */ lwc1 $f2, 0x28($v1) -/* 8A82F8 80240378 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A82FC 8024037C 46001081 */ sub.s $f2, $f2, $f0 -/* 8A8300 80240380 46021182 */ mul.s $f6, $f2, $f2 -/* 8A8304 80240384 00000000 */ nop -/* 8A8308 80240388 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A830C 8024038C C4620030 */ lwc1 $f2, 0x30($v1) -/* 8A8310 80240390 46001081 */ sub.s $f2, $f2, $f0 -/* 8A8314 80240394 46021102 */ mul.s $f4, $f2, $f2 -/* 8A8318 80240398 00000000 */ nop -/* 8A831C 8024039C 846200B0 */ lh $v0, 0xb0($v1) -/* 8A8320 802403A0 C462002C */ lwc1 $f2, 0x2c($v1) -/* 8A8324 802403A4 44820000 */ mtc1 $v0, $f0 -/* 8A8328 802403A8 00000000 */ nop -/* 8A832C 802403AC 46800020 */ cvt.s.w $f0, $f0 -/* 8A8330 802403B0 46001080 */ add.s $f2, $f2, $f0 -/* 8A8334 802403B4 3C013FC0 */ lui $at, 0x3fc0 -/* 8A8338 802403B8 44810000 */ mtc1 $at, $f0 -/* 8A833C 802403BC 00000000 */ nop -/* 8A8340 802403C0 46001081 */ sub.s $f2, $f2, $f0 -/* 8A8344 802403C4 46043300 */ add.s $f12, $f6, $f4 -/* 8A8348 802403C8 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A834C 802403CC 46001501 */ sub.s $f20, $f2, $f0 -/* 8A8350 802403D0 46006084 */ sqrt.s $f2, $f12 -/* 8A8354 802403D4 46021032 */ c.eq.s $f2, $f2 -/* 8A8358 802403D8 00000000 */ nop -/* 8A835C 802403DC 45010004 */ bc1t .L802403F0 -/* 8A8360 802403E0 0060882D */ daddu $s1, $v1, $zero -/* 8A8364 802403E4 0C0187BC */ jal sqrtf -/* 8A8368 802403E8 00000000 */ nop -/* 8A836C 802403EC 46000086 */ mov.s $f2, $f0 -.L802403F0: -/* 8A8370 802403F0 44800000 */ mtc1 $zero, $f0 -/* 8A8374 802403F4 00000000 */ nop -/* 8A8378 802403F8 4614003C */ c.lt.s $f0, $f20 -/* 8A837C 802403FC 00000000 */ nop -/* 8A8380 80240400 45000016 */ bc1f .L8024045C -/* 8A8384 80240404 46001106 */ mov.s $f4, $f2 -/* 8A8388 80240408 862200B0 */ lh $v0, 0xb0($s1) -/* 8A838C 8024040C 44820000 */ mtc1 $v0, $f0 -/* 8A8390 80240410 00000000 */ nop -/* 8A8394 80240414 46800020 */ cvt.s.w $f0, $f0 -/* 8A8398 80240418 4600A03C */ c.lt.s $f20, $f0 -/* 8A839C 8024041C 00000000 */ nop -/* 8A83A0 80240420 4500000E */ bc1f .L8024045C -/* 8A83A4 80240424 00000000 */ nop -/* 8A83A8 80240428 862200B2 */ lh $v0, 0xb2($s1) -/* 8A83AC 8024042C 3C013F00 */ lui $at, 0x3f00 -/* 8A83B0 80240430 44811000 */ mtc1 $at, $f2 -/* 8A83B4 80240434 44820000 */ mtc1 $v0, $f0 -/* 8A83B8 80240438 00000000 */ nop -/* 8A83BC 8024043C 46800020 */ cvt.s.w $f0, $f0 -/* 8A83C0 80240440 46020002 */ mul.s $f0, $f0, $f2 -/* 8A83C4 80240444 00000000 */ nop -/* 8A83C8 80240448 4600203C */ c.lt.s $f4, $f0 -/* 8A83CC 8024044C 00000000 */ nop -/* 8A83D0 80240450 45000002 */ bc1f .L8024045C -/* 8A83D4 80240454 24020001 */ addiu $v0, $zero, 1 -/* 8A83D8 80240458 AE62008C */ sw $v0, 0x8c($s3) -.L8024045C: -/* 8A83DC 8024045C C6020038 */ lwc1 $f2, 0x38($s0) -/* 8A83E0 80240460 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A83E4 80240464 46001081 */ sub.s $f2, $f2, $f0 -/* 8A83E8 80240468 46021182 */ mul.s $f6, $f2, $f2 -/* 8A83EC 8024046C 00000000 */ nop -/* 8A83F0 80240470 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A83F4 80240474 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8A83F8 80240478 46001081 */ sub.s $f2, $f2, $f0 -/* 8A83FC 8024047C 46021102 */ mul.s $f4, $f2, $f2 -/* 8A8400 80240480 00000000 */ nop -/* 8A8404 80240484 860200A8 */ lh $v0, 0xa8($s0) -/* 8A8408 80240488 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A840C 8024048C 44820000 */ mtc1 $v0, $f0 -/* 8A8410 80240490 00000000 */ nop -/* 8A8414 80240494 46800020 */ cvt.s.w $f0, $f0 -/* 8A8418 80240498 46001080 */ add.s $f2, $f2, $f0 -/* 8A841C 8024049C 3C013FC0 */ lui $at, 0x3fc0 -/* 8A8420 802404A0 44810000 */ mtc1 $at, $f0 -/* 8A8424 802404A4 00000000 */ nop -/* 8A8428 802404A8 46001081 */ sub.s $f2, $f2, $f0 -/* 8A842C 802404AC 46043300 */ add.s $f12, $f6, $f4 -/* 8A8430 802404B0 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A8434 802404B4 46001501 */ sub.s $f20, $f2, $f0 -/* 8A8438 802404B8 46006084 */ sqrt.s $f2, $f12 -/* 8A843C 802404BC 46021032 */ c.eq.s $f2, $f2 -/* 8A8440 802404C0 00000000 */ nop -/* 8A8444 802404C4 45010004 */ bc1t .L802404D8 -/* 8A8448 802404C8 00000000 */ nop -/* 8A844C 802404CC 0C0187BC */ jal sqrtf -/* 8A8450 802404D0 00000000 */ nop -/* 8A8454 802404D4 46000086 */ mov.s $f2, $f0 -.L802404D8: -/* 8A8458 802404D8 44800000 */ mtc1 $zero, $f0 -/* 8A845C 802404DC 00000000 */ nop -/* 8A8460 802404E0 4614003C */ c.lt.s $f0, $f20 -/* 8A8464 802404E4 00000000 */ nop -/* 8A8468 802404E8 45000016 */ bc1f .L80240544 -/* 8A846C 802404EC 46001106 */ mov.s $f4, $f2 -/* 8A8470 802404F0 860200A8 */ lh $v0, 0xa8($s0) -/* 8A8474 802404F4 44820000 */ mtc1 $v0, $f0 -/* 8A8478 802404F8 00000000 */ nop -/* 8A847C 802404FC 46800020 */ cvt.s.w $f0, $f0 -/* 8A8480 80240500 4600A03C */ c.lt.s $f20, $f0 -/* 8A8484 80240504 00000000 */ nop -/* 8A8488 80240508 4500000F */ bc1f .L80240548 -/* 8A848C 8024050C 0000882D */ daddu $s1, $zero, $zero -/* 8A8490 80240510 860200A6 */ lh $v0, 0xa6($s0) -/* 8A8494 80240514 3C013F00 */ lui $at, 0x3f00 -/* 8A8498 80240518 44811000 */ mtc1 $at, $f2 -/* 8A849C 8024051C 44820000 */ mtc1 $v0, $f0 -/* 8A84A0 80240520 00000000 */ nop -/* 8A84A4 80240524 46800020 */ cvt.s.w $f0, $f0 -/* 8A84A8 80240528 46020002 */ mul.s $f0, $f0, $f2 -/* 8A84AC 8024052C 00000000 */ nop -/* 8A84B0 80240530 4600203C */ c.lt.s $f4, $f0 -/* 8A84B4 80240534 00000000 */ nop -/* 8A84B8 80240538 45000003 */ bc1f .L80240548 -/* 8A84BC 8024053C 24020001 */ addiu $v0, $zero, 1 -/* 8A84C0 80240540 AE62008C */ sw $v0, 0x8c($s3) -.L80240544: -/* 8A84C4 80240544 0000882D */ daddu $s1, $zero, $zero -.L80240548: -/* 8A84C8 80240548 3C013FC0 */ lui $at, 0x3fc0 -/* 8A84CC 8024054C 4481D000 */ mtc1 $at, $f26 -/* 8A84D0 80240550 4480C000 */ mtc1 $zero, $f24 -/* 8A84D4 80240554 3C013F00 */ lui $at, 0x3f00 -/* 8A84D8 80240558 4481B000 */ mtc1 $at, $f22 -.L8024055C: -/* 8A84DC 8024055C 0C00EAD2 */ jal get_npc_safe -/* 8A84E0 80240560 0220202D */ daddu $a0, $s1, $zero -/* 8A84E4 80240564 0040802D */ daddu $s0, $v0, $zero -/* 8A84E8 80240568 52000035 */ beql $s0, $zero, .L80240640 -/* 8A84EC 8024056C 26310001 */ addiu $s1, $s1, 1 -/* 8A84F0 80240570 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8A84F4 80240574 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A84F8 80240578 46001081 */ sub.s $f2, $f2, $f0 -/* 8A84FC 8024057C 46021182 */ mul.s $f6, $f2, $f2 -/* 8A8500 80240580 00000000 */ nop -/* 8A8504 80240584 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A8508 80240588 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8A850C 8024058C 46001081 */ sub.s $f2, $f2, $f0 -/* 8A8510 80240590 46021102 */ mul.s $f4, $f2, $f2 -/* 8A8514 80240594 00000000 */ nop -/* 8A8518 80240598 860200A8 */ lh $v0, 0xa8($s0) -/* 8A851C 8024059C C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A8520 802405A0 44820000 */ mtc1 $v0, $f0 -/* 8A8524 802405A4 00000000 */ nop -/* 8A8528 802405A8 46800020 */ cvt.s.w $f0, $f0 -/* 8A852C 802405AC 46001080 */ add.s $f2, $f2, $f0 -/* 8A8530 802405B0 461A1081 */ sub.s $f2, $f2, $f26 -/* 8A8534 802405B4 46043300 */ add.s $f12, $f6, $f4 -/* 8A8538 802405B8 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A853C 802405BC 46001501 */ sub.s $f20, $f2, $f0 -/* 8A8540 802405C0 46006004 */ sqrt.s $f0, $f12 -/* 8A8544 802405C4 46000032 */ c.eq.s $f0, $f0 -/* 8A8548 802405C8 00000000 */ nop -/* 8A854C 802405CC 45010003 */ bc1t .L802405DC -/* 8A8550 802405D0 00000000 */ nop -/* 8A8554 802405D4 0C0187BC */ jal sqrtf -/* 8A8558 802405D8 00000000 */ nop -.L802405DC: -/* 8A855C 802405DC 4614C03C */ c.lt.s $f24, $f20 -/* 8A8560 802405E0 00000000 */ nop -/* 8A8564 802405E4 45000015 */ bc1f .L8024063C -/* 8A8568 802405E8 46000106 */ mov.s $f4, $f0 -/* 8A856C 802405EC 860200A8 */ lh $v0, 0xa8($s0) -/* 8A8570 802405F0 44820000 */ mtc1 $v0, $f0 -/* 8A8574 802405F4 00000000 */ nop -/* 8A8578 802405F8 46800020 */ cvt.s.w $f0, $f0 -/* 8A857C 802405FC 4600A03C */ c.lt.s $f20, $f0 -/* 8A8580 80240600 00000000 */ nop -/* 8A8584 80240604 4500000E */ bc1f .L80240640 -/* 8A8588 80240608 26310001 */ addiu $s1, $s1, 1 -/* 8A858C 8024060C 860200A6 */ lh $v0, 0xa6($s0) -/* 8A8590 80240610 44820000 */ mtc1 $v0, $f0 -/* 8A8594 80240614 00000000 */ nop -/* 8A8598 80240618 46800020 */ cvt.s.w $f0, $f0 -/* 8A859C 8024061C 46160002 */ mul.s $f0, $f0, $f22 -/* 8A85A0 80240620 00000000 */ nop -/* 8A85A4 80240624 4600203C */ c.lt.s $f4, $f0 -/* 8A85A8 80240628 00000000 */ nop -/* 8A85AC 8024062C 45000004 */ bc1f .L80240640 -/* 8A85B0 80240630 24020001 */ addiu $v0, $zero, 1 -/* 8A85B4 80240634 08090193 */ j .L8024064C -/* 8A85B8 80240638 AE62008C */ sw $v0, 0x8c($s3) -.L8024063C: -/* 8A85BC 8024063C 26310001 */ addiu $s1, $s1, 1 -.L80240640: -/* 8A85C0 80240640 2A220040 */ slti $v0, $s1, 0x40 -/* 8A85C4 80240644 1440FFC5 */ bnez $v0, .L8024055C -/* 8A85C8 80240648 00000000 */ nop -.L8024064C: -/* 8A85CC 8024064C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8A85D0 80240650 8FB3001C */ lw $s3, 0x1c($sp) -/* 8A85D4 80240654 8FB20018 */ lw $s2, 0x18($sp) -/* 8A85D8 80240658 8FB10014 */ lw $s1, 0x14($sp) -/* 8A85DC 8024065C 8FB00010 */ lw $s0, 0x10($sp) -/* 8A85E0 80240660 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 8A85E4 80240664 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 8A85E8 80240668 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8A85EC 8024066C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8A85F0 80240670 24020002 */ addiu $v0, $zero, 2 -/* 8A85F4 80240674 03E00008 */ jr $ra -/* 8A85F8 80240678 27BD0048 */ addiu $sp, $sp, 0x48 -/* 8A85FC 8024067C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_25/func_80240680_8A7F80.s b/asm/nonmatchings/world/area_tik/tik_25/func_80240680_8A7F80.s deleted file mode 100644 index 5cf84e206a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_25/func_80240680_8A7F80.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240680_8A8600 -/* 8A8600 80240680 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A8604 80240684 AFBF0010 */ sw $ra, 0x10($sp) -/* 8A8608 80240688 0C04417A */ jal get_entity_by_index -/* 8A860C 8024068C 8C840084 */ lw $a0, 0x84($a0) -/* 8A8610 80240690 8C440040 */ lw $a0, 0x40($v0) -/* 8A8614 80240694 24030001 */ addiu $v1, $zero, 1 -/* 8A8618 80240698 A0830030 */ sb $v1, 0x30($a0) -/* 8A861C 8024069C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8A8620 802406A0 24020002 */ addiu $v0, $zero, 2 -/* 8A8624 802406A4 03E00008 */ jr $ra -/* 8A8628 802406A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_00/func_80240124_999C70.s b/asm/nonmatchings/world/area_trd/trd_00/func_80240124_999C70.s deleted file mode 100644 index 2635cba073..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_00/func_80240124_999C70.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_999D94 -/* 999D94 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 999D98 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 999D9C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 999DA0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 999DA4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 999DA8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 999DAC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 999DB0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 999DB4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 999DB8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 999DBC 8024014C 1440000E */ bnez $v0, .L80240188 -/* 999DC0 80240150 00000000 */ nop -/* 999DC4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 999DC8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 999DCC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 999DD0 80240160 04610004 */ bgez $v1, .L80240174 -/* 999DD4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 999DD8 80240168 3C020002 */ lui $v0, 2 -/* 999DDC 8024016C 08090061 */ j .L80240184 -/* 999DE0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 999DE4 80240174 3C040002 */ lui $a0, 2 -/* 999DE8 80240178 0083102A */ slt $v0, $a0, $v1 -/* 999DEC 8024017C 10400002 */ beqz $v0, .L80240188 -/* 999DF0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 999DF4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 999DF8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 999DFC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 999E00 80240190 00000000 */ nop -/* 999E04 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 999E08 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 999E0C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 999E10 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 999E14 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 999E18 802401A8 3C020002 */ lui $v0, 2 -/* 999E1C 802401AC 08090071 */ j .L802401C4 -/* 999E20 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 999E24 802401B4 3C040002 */ lui $a0, 2 -/* 999E28 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 999E2C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 999E30 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 999E34 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 999E38 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 999E3C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 999E40 802401D0 00000000 */ nop -/* 999E44 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 999E48 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 999E4C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 999E50 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 999E54 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 999E58 802401E8 3C020002 */ lui $v0, 2 -/* 999E5C 802401EC 08090081 */ j .L80240204 -/* 999E60 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 999E64 802401F4 3C040002 */ lui $a0, 2 -/* 999E68 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 999E6C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 999E70 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 999E74 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 999E78 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 999E7C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 999E80 80240210 00000000 */ nop -/* 999E84 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 999E88 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 999E8C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 999E90 80240220 04610004 */ bgez $v1, .L80240234 -/* 999E94 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 999E98 80240228 3C020002 */ lui $v0, 2 -/* 999E9C 8024022C 08090091 */ j .L80240244 -/* 999EA0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 999EA4 80240234 3C040002 */ lui $a0, 2 -/* 999EA8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 999EAC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 999EB0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 999EB4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 999EB8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 999EBC 8024024C 0C046F07 */ jal set_main_pan_u -/* 999EC0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 999EC4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 999EC8 80240258 0C046F0D */ jal set_main_pan_v -/* 999ECC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 999ED0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 999ED4 80240264 0C046F13 */ jal set_aux_pan_u -/* 999ED8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 999EDC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 999EE0 80240270 0C046F19 */ jal set_aux_pan_v -/* 999EE4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 999EE8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 999EEC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 999EF0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 999EF4 80240284 24420001 */ addiu $v0, $v0, 1 -/* 999EF8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 999EFC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 999F00 80240290 24630001 */ addiu $v1, $v1, 1 -/* 999F04 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 999F08 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 999F0C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 999F10 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 999F14 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 999F18 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 999F1C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 999F20 802402B0 14600002 */ bnez $v1, .L802402BC -/* 999F24 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 999F28 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 999F2C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 999F30 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 999F34 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 999F38 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 999F3C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 999F40 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 999F44 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 999F48 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 999F4C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 999F50 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 999F54 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 999F58 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 999F5C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 999F60 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 999F64 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 999F68 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 999F6C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 999F70 80240300 0000102D */ daddu $v0, $zero, $zero -/* 999F74 80240304 03E00008 */ jr $ra -/* 999F78 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 999F7C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_00/func_80240310_999C70.s b/asm/nonmatchings/world/area_trd/trd_00/func_80240310_999C70.s deleted file mode 100644 index cae8ed90fe..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_00/func_80240310_999C70.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_999F80 -/* 999F80 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 999F84 80240314 AFB00010 */ sw $s0, 0x10($sp) -/* 999F88 80240318 3C108024 */ lui $s0, 0x8024 -/* 999F8C 8024031C 26101340 */ addiu $s0, $s0, 0x1340 -/* 999F90 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* 999F94 80240324 AFB10014 */ sw $s1, 0x14($sp) -/* 999F98 80240328 8E020000 */ lw $v0, ($s0) -/* 999F9C 8024032C 14400010 */ bnez $v0, .L80240370 -/* 999FA0 80240330 0080882D */ daddu $s1, $a0, $zero -/* 999FA4 80240334 0C00AB39 */ jal heap_malloc -/* 999FA8 80240338 24040040 */ addiu $a0, $zero, 0x40 -/* 999FAC 8024033C AE020000 */ sw $v0, ($s0) -/* 999FB0 80240340 0000182D */ daddu $v1, $zero, $zero -/* 999FB4 80240344 0040282D */ daddu $a1, $v0, $zero -/* 999FB8 80240348 0220202D */ daddu $a0, $s1, $zero -.L8024034C: -/* 999FBC 8024034C 8C820084 */ lw $v0, 0x84($a0) -/* 999FC0 80240350 24840004 */ addiu $a0, $a0, 4 -/* 999FC4 80240354 24630001 */ addiu $v1, $v1, 1 -/* 999FC8 80240358 ACA20000 */ sw $v0, ($a1) -/* 999FCC 8024035C 28620010 */ slti $v0, $v1, 0x10 -/* 999FD0 80240360 1440FFFA */ bnez $v0, .L8024034C -/* 999FD4 80240364 24A50004 */ addiu $a1, $a1, 4 -/* 999FD8 80240368 080900EB */ j .L802403AC -/* 999FDC 8024036C 00000000 */ nop -.L80240370: -/* 999FE0 80240370 0000182D */ daddu $v1, $zero, $zero -/* 999FE4 80240374 0040282D */ daddu $a1, $v0, $zero -/* 999FE8 80240378 0220202D */ daddu $a0, $s1, $zero -.L8024037C: -/* 999FEC 8024037C 8CA20000 */ lw $v0, ($a1) -/* 999FF0 80240380 24A50004 */ addiu $a1, $a1, 4 -/* 999FF4 80240384 24630001 */ addiu $v1, $v1, 1 -/* 999FF8 80240388 AC820084 */ sw $v0, 0x84($a0) -/* 999FFC 8024038C 28620010 */ slti $v0, $v1, 0x10 -/* 99A000 80240390 1440FFFA */ bnez $v0, .L8024037C -/* 99A004 80240394 24840004 */ addiu $a0, $a0, 4 -/* 99A008 80240398 3C108024 */ lui $s0, 0x8024 -/* 99A00C 8024039C 26101340 */ addiu $s0, $s0, 0x1340 -/* 99A010 802403A0 0C00AB4B */ jal heap_free -/* 99A014 802403A4 8E040000 */ lw $a0, ($s0) -/* 99A018 802403A8 AE000000 */ sw $zero, ($s0) -.L802403AC: -/* 99A01C 802403AC 8FBF0018 */ lw $ra, 0x18($sp) -/* 99A020 802403B0 8FB10014 */ lw $s1, 0x14($sp) -/* 99A024 802403B4 8FB00010 */ lw $s0, 0x10($sp) -/* 99A028 802403B8 24020002 */ addiu $v0, $zero, 2 -/* 99A02C 802403BC 03E00008 */ jr $ra -/* 99A030 802403C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_00/func_802403C4_999C70.s b/asm/nonmatchings/world/area_trd/trd_00/func_802403C4_999C70.s deleted file mode 100644 index e00e156a3f..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_00/func_802403C4_999C70.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C4_99A034 -/* 99A034 802403C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 99A038 802403C8 AFB00010 */ sw $s0, 0x10($sp) -/* 99A03C 802403CC 0080802D */ daddu $s0, $a0, $zero -/* 99A040 802403D0 AFBF0018 */ sw $ra, 0x18($sp) -/* 99A044 802403D4 AFB10014 */ sw $s1, 0x14($sp) -/* 99A048 802403D8 8E02000C */ lw $v0, 0xc($s0) -/* 99A04C 802403DC 8C510000 */ lw $s1, ($v0) -/* 99A050 802403E0 0C0B1EAF */ jal get_variable -/* 99A054 802403E4 0220282D */ daddu $a1, $s1, $zero -/* 99A058 802403E8 3C03FFF0 */ lui $v1, 0xfff0 -/* 99A05C 802403EC 3463FFFF */ ori $v1, $v1, 0xffff -/* 99A060 802403F0 0200202D */ daddu $a0, $s0, $zero -/* 99A064 802403F4 00431024 */ and $v0, $v0, $v1 -/* 99A068 802403F8 00021140 */ sll $v0, $v0, 5 -/* 99A06C 802403FC 3C068008 */ lui $a2, %hi(gItemTable) -/* 99A070 80240400 00C23021 */ addu $a2, $a2, $v0 -/* 99A074 80240404 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 99A078 80240408 0C0B2026 */ jal set_variable -/* 99A07C 8024040C 0220282D */ daddu $a1, $s1, $zero -/* 99A080 80240410 8FBF0018 */ lw $ra, 0x18($sp) -/* 99A084 80240414 8FB10014 */ lw $s1, 0x14($sp) -/* 99A088 80240418 8FB00010 */ lw $s0, 0x10($sp) -/* 99A08C 8024041C 24020002 */ addiu $v0, $zero, 2 -/* 99A090 80240420 03E00008 */ jr $ra -/* 99A094 80240424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_00/func_80240428_999C70.s b/asm/nonmatchings/world/area_trd/trd_00/func_80240428_999C70.s deleted file mode 100644 index f0c8676fe3..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_00/func_80240428_999C70.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/asm/nonmatchings/world/area_trd/trd_00/func_80240578_999C70.s b/asm/nonmatchings/world/area_trd/trd_00/func_80240578_999C70.s deleted file mode 100644 index a5bf4221ed..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_00/func_80240578_999C70.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240578_99A1E8 -/* 99A1E8 80240578 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99A1EC 8024057C AFB00010 */ sw $s0, 0x10($sp) -/* 99A1F0 80240580 0080802D */ daddu $s0, $a0, $zero -/* 99A1F4 80240584 AFBF0014 */ sw $ra, 0x14($sp) -/* 99A1F8 80240588 8E02000C */ lw $v0, 0xc($s0) -/* 99A1FC 8024058C 0C0B1EAF */ jal get_variable -/* 99A200 80240590 8C450000 */ lw $a1, ($v0) -/* 99A204 80240594 00021140 */ sll $v0, $v0, 5 -/* 99A208 80240598 AE000084 */ sw $zero, 0x84($s0) -/* 99A20C 8024059C 3C018008 */ lui $at, 0x8008 -/* 99A210 802405A0 00220821 */ addu $at, $at, $v0 -/* 99A214 802405A4 942278F8 */ lhu $v0, 0x78f8($at) -/* 99A218 802405A8 30420040 */ andi $v0, $v0, 0x40 -/* 99A21C 802405AC 10400002 */ beqz $v0, .L802405B8 -/* 99A220 802405B0 24020001 */ addiu $v0, $zero, 1 -/* 99A224 802405B4 AE020084 */ sw $v0, 0x84($s0) -.L802405B8: -/* 99A228 802405B8 8FBF0014 */ lw $ra, 0x14($sp) -/* 99A22C 802405BC 8FB00010 */ lw $s0, 0x10($sp) -/* 99A230 802405C0 24020002 */ addiu $v0, $zero, 2 -/* 99A234 802405C4 03E00008 */ jr $ra -/* 99A238 802405C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 99A23C 802405CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_00/func_802405D0_999C70.s b/asm/nonmatchings/world/area_trd/trd_00/func_802405D0_999C70.s deleted file mode 100644 index a364bd6066..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_00/func_802405D0_999C70.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405D0_99A240 -/* 99A240 802405D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99A244 802405D4 AFBF0010 */ sw $ra, 0x10($sp) -/* 99A248 802405D8 0C03A876 */ jal set_max_SP -/* 99A24C 802405DC 24040001 */ addiu $a0, $zero, 1 -/* 99A250 802405E0 3C028011 */ lui $v0, %hi(gPlayerData) -/* 99A254 802405E4 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 99A258 802405E8 90430003 */ lbu $v1, 3($v0) -/* 99A25C 802405EC 90440006 */ lbu $a0, 6($v0) -/* 99A260 802405F0 A0430002 */ sb $v1, 2($v0) -/* 99A264 802405F4 0C03A6DB */ jal sync_status_menu -/* 99A268 802405F8 A0440005 */ sb $a0, 5($v0) -/* 99A26C 802405FC 8FBF0010 */ lw $ra, 0x10($sp) -/* 99A270 80240600 24020002 */ addiu $v0, $zero, 2 -/* 99A274 80240604 03E00008 */ jr $ra -/* 99A278 80240608 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_00/func_8024060C_999C70.s b/asm/nonmatchings/world/area_trd/trd_00/func_8024060C_999C70.s deleted file mode 100644 index 54032f4e15..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_00/func_8024060C_999C70.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024060C_99A27C -/* 99A27C 8024060C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99A280 80240610 AFBF0010 */ sw $ra, 0x10($sp) -/* 99A284 80240614 0C03A6DB */ jal sync_status_menu -/* 99A288 80240618 00000000 */ nop -/* 99A28C 8024061C 8FBF0010 */ lw $ra, 0x10($sp) -/* 99A290 80240620 24020002 */ addiu $v0, $zero, 2 -/* 99A294 80240624 03E00008 */ jr $ra -/* 99A298 80240628 27BD0018 */ addiu $sp, $sp, 0x18 -/* 99A29C 8024062C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_01/func_80240124_99C990.s b/asm/nonmatchings/world/area_trd/trd_01/func_80240124_99C990.s deleted file mode 100644 index 84eda09bee..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/func_80240124_99C990.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_99CAB4 -/* 99CAB4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99CAB8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 99CABC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 99CAC0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 99CAC4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 99CAC8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 99CACC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 99CAD0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 99CAD4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 99CAD8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 99CADC 8024014C 1440000E */ bnez $v0, .L80240188 -/* 99CAE0 80240150 00000000 */ nop -/* 99CAE4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 99CAE8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 99CAEC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 99CAF0 80240160 04610004 */ bgez $v1, .L80240174 -/* 99CAF4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 99CAF8 80240168 3C020002 */ lui $v0, 2 -/* 99CAFC 8024016C 08090061 */ j .L80240184 -/* 99CB00 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 99CB04 80240174 3C040002 */ lui $a0, 2 -/* 99CB08 80240178 0083102A */ slt $v0, $a0, $v1 -/* 99CB0C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 99CB10 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 99CB14 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 99CB18 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 99CB1C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 99CB20 80240190 00000000 */ nop -/* 99CB24 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 99CB28 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 99CB2C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 99CB30 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 99CB34 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 99CB38 802401A8 3C020002 */ lui $v0, 2 -/* 99CB3C 802401AC 08090071 */ j .L802401C4 -/* 99CB40 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 99CB44 802401B4 3C040002 */ lui $a0, 2 -/* 99CB48 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 99CB4C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 99CB50 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 99CB54 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 99CB58 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 99CB5C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 99CB60 802401D0 00000000 */ nop -/* 99CB64 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 99CB68 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 99CB6C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 99CB70 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 99CB74 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 99CB78 802401E8 3C020002 */ lui $v0, 2 -/* 99CB7C 802401EC 08090081 */ j .L80240204 -/* 99CB80 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 99CB84 802401F4 3C040002 */ lui $a0, 2 -/* 99CB88 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 99CB8C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 99CB90 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 99CB94 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 99CB98 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 99CB9C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 99CBA0 80240210 00000000 */ nop -/* 99CBA4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 99CBA8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 99CBAC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 99CBB0 80240220 04610004 */ bgez $v1, .L80240234 -/* 99CBB4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 99CBB8 80240228 3C020002 */ lui $v0, 2 -/* 99CBBC 8024022C 08090091 */ j .L80240244 -/* 99CBC0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 99CBC4 80240234 3C040002 */ lui $a0, 2 -/* 99CBC8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 99CBCC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 99CBD0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 99CBD4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 99CBD8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 99CBDC 8024024C 0C046F07 */ jal set_main_pan_u -/* 99CBE0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 99CBE4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 99CBE8 80240258 0C046F0D */ jal set_main_pan_v -/* 99CBEC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 99CBF0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 99CBF4 80240264 0C046F13 */ jal set_aux_pan_u -/* 99CBF8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 99CBFC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 99CC00 80240270 0C046F19 */ jal set_aux_pan_v -/* 99CC04 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 99CC08 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 99CC0C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 99CC10 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 99CC14 80240284 24420001 */ addiu $v0, $v0, 1 -/* 99CC18 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 99CC1C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 99CC20 80240290 24630001 */ addiu $v1, $v1, 1 -/* 99CC24 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 99CC28 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 99CC2C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 99CC30 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 99CC34 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 99CC38 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 99CC3C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 99CC40 802402B0 14600002 */ bnez $v1, .L802402BC -/* 99CC44 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 99CC48 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 99CC4C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 99CC50 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 99CC54 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 99CC58 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 99CC5C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 99CC60 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 99CC64 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 99CC68 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 99CC6C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 99CC70 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 99CC74 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 99CC78 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 99CC7C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 99CC80 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 99CC84 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 99CC88 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 99CC8C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 99CC90 80240300 0000102D */ daddu $v0, $zero, $zero -/* 99CC94 80240304 03E00008 */ jr $ra -/* 99CC98 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 99CC9C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_01/func_80240310_99C990.s b/asm/nonmatchings/world/area_trd/trd_01/func_80240310_99C990.s deleted file mode 100644 index 8da7dc594e..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/func_80240310_99C990.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_99CCA0 -/* 99CCA0 80240310 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99CCA4 80240314 AFBF0010 */ sw $ra, 0x10($sp) -/* 99CCA8 80240318 0C04417A */ jal get_entity_by_index -/* 99CCAC 8024031C 8C840084 */ lw $a0, 0x84($a0) -/* 99CCB0 80240320 0040182D */ daddu $v1, $v0, $zero -/* 99CCB4 80240324 8C640000 */ lw $a0, ($v1) -/* 99CCB8 80240328 3C050010 */ lui $a1, 0x10 -/* 99CCBC 8024032C 00852025 */ or $a0, $a0, $a1 -/* 99CCC0 80240330 AC640000 */ sw $a0, ($v1) -/* 99CCC4 80240334 8FBF0010 */ lw $ra, 0x10($sp) -/* 99CCC8 80240338 24020002 */ addiu $v0, $zero, 2 -/* 99CCCC 8024033C 03E00008 */ jr $ra -/* 99CCD0 80240340 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_01/func_80240344_99C990.s b/asm/nonmatchings/world/area_trd/trd_01/func_80240344_99C990.s deleted file mode 100644 index d2e94751fb..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/func_80240344_99C990.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240344_99CCD4 -/* 99CCD4 80240344 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 99CCD8 80240348 AFB20018 */ sw $s2, 0x18($sp) -/* 99CCDC 8024034C 0080902D */ daddu $s2, $a0, $zero -/* 99CCE0 80240350 AFBF001C */ sw $ra, 0x1c($sp) -/* 99CCE4 80240354 AFB10014 */ sw $s1, 0x14($sp) -/* 99CCE8 80240358 AFB00010 */ sw $s0, 0x10($sp) -/* 99CCEC 8024035C 8E50000C */ lw $s0, 0xc($s2) -/* 99CCF0 80240360 8E050000 */ lw $a1, ($s0) -/* 99CCF4 80240364 0C0B1EAF */ jal get_variable -/* 99CCF8 80240368 26100004 */ addiu $s0, $s0, 4 -/* 99CCFC 8024036C 0C04417A */ jal get_entity_by_index -/* 99CD00 80240370 0040202D */ daddu $a0, $v0, $zero -/* 99CD04 80240374 8E050000 */ lw $a1, ($s0) -/* 99CD08 80240378 26100004 */ addiu $s0, $s0, 4 -/* 99CD0C 8024037C 0040882D */ daddu $s1, $v0, $zero -/* 99CD10 80240380 C6200048 */ lwc1 $f0, 0x48($s1) -/* 99CD14 80240384 4600008D */ trunc.w.s $f2, $f0 -/* 99CD18 80240388 44061000 */ mfc1 $a2, $f2 -/* 99CD1C 8024038C 0C0B2026 */ jal set_variable -/* 99CD20 80240390 0240202D */ daddu $a0, $s2, $zero -/* 99CD24 80240394 8E050000 */ lw $a1, ($s0) -/* 99CD28 80240398 26100004 */ addiu $s0, $s0, 4 -/* 99CD2C 8024039C C620004C */ lwc1 $f0, 0x4c($s1) -/* 99CD30 802403A0 4600008D */ trunc.w.s $f2, $f0 -/* 99CD34 802403A4 44061000 */ mfc1 $a2, $f2 -/* 99CD38 802403A8 0C0B2026 */ jal set_variable -/* 99CD3C 802403AC 0240202D */ daddu $a0, $s2, $zero -/* 99CD40 802403B0 C6200050 */ lwc1 $f0, 0x50($s1) -/* 99CD44 802403B4 8E050000 */ lw $a1, ($s0) -/* 99CD48 802403B8 4600008D */ trunc.w.s $f2, $f0 -/* 99CD4C 802403BC 44061000 */ mfc1 $a2, $f2 -/* 99CD50 802403C0 0C0B2026 */ jal set_variable -/* 99CD54 802403C4 0240202D */ daddu $a0, $s2, $zero -/* 99CD58 802403C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 99CD5C 802403CC 8FB20018 */ lw $s2, 0x18($sp) -/* 99CD60 802403D0 8FB10014 */ lw $s1, 0x14($sp) -/* 99CD64 802403D4 8FB00010 */ lw $s0, 0x10($sp) -/* 99CD68 802403D8 24020002 */ addiu $v0, $zero, 2 -/* 99CD6C 802403DC 03E00008 */ jr $ra -/* 99CD70 802403E0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 99CD74 802403E4 00000000 */ nop -/* 99CD78 802403E8 00000000 */ nop -/* 99CD7C 802403EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_01/func_802403F0_99C990.s b/asm/nonmatchings/world/area_trd/trd_01/func_802403F0_99C990.s deleted file mode 100644 index 794aa231dc..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/func_802403F0_99C990.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F0_99CD80 -/* 99CD80 802403F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 99CD84 802403F4 AFB20018 */ sw $s2, 0x18($sp) -/* 99CD88 802403F8 0080902D */ daddu $s2, $a0, $zero -/* 99CD8C 802403FC AFBF001C */ sw $ra, 0x1c($sp) -/* 99CD90 80240400 AFB10014 */ sw $s1, 0x14($sp) -/* 99CD94 80240404 AFB00010 */ sw $s0, 0x10($sp) -/* 99CD98 80240408 8E510148 */ lw $s1, 0x148($s2) -/* 99CD9C 8024040C 0C00EABB */ jal get_npc_unsafe -/* 99CDA0 80240410 86240008 */ lh $a0, 8($s1) -/* 99CDA4 80240414 0040802D */ daddu $s0, $v0, $zero -/* 99CDA8 80240418 8E2300CC */ lw $v1, 0xcc($s1) -/* 99CDAC 8024041C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 99CDB0 80240420 8C630020 */ lw $v1, 0x20($v1) -/* 99CDB4 80240424 AE030028 */ sw $v1, 0x28($s0) -/* 99CDB8 80240428 96220076 */ lhu $v0, 0x76($s1) -/* 99CDBC 8024042C A602008E */ sh $v0, 0x8e($s0) -/* 99CDC0 80240430 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 99CDC4 80240434 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 99CDC8 80240438 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 99CDCC 8024043C 8C460028 */ lw $a2, 0x28($v0) -/* 99CDD0 80240440 0C00A720 */ jal atan2 -/* 99CDD4 80240444 8C470030 */ lw $a3, 0x30($v0) -/* 99CDD8 80240448 2402000D */ addiu $v0, $zero, 0xd -/* 99CDDC 8024044C E600000C */ swc1 $f0, 0xc($s0) -/* 99CDE0 80240450 AE420070 */ sw $v0, 0x70($s2) -/* 99CDE4 80240454 8FBF001C */ lw $ra, 0x1c($sp) -/* 99CDE8 80240458 8FB20018 */ lw $s2, 0x18($sp) -/* 99CDEC 8024045C 8FB10014 */ lw $s1, 0x14($sp) -/* 99CDF0 80240460 8FB00010 */ lw $s0, 0x10($sp) -/* 99CDF4 80240464 03E00008 */ jr $ra -/* 99CDF8 80240468 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_01/func_80240BC4_99C990.s b/asm/nonmatchings/world/area_trd/trd_01/func_80240BC4_99C990.s deleted file mode 100644 index 947fcfe064..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/func_80240BC4_99C990.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BC4_99D554 -/* 99D554 80240BC4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 99D558 80240BC8 AFB00010 */ sw $s0, 0x10($sp) -/* 99D55C 80240BCC 0080802D */ daddu $s0, $a0, $zero -/* 99D560 80240BD0 AFBF001C */ sw $ra, 0x1c($sp) -/* 99D564 80240BD4 AFB20018 */ sw $s2, 0x18($sp) -/* 99D568 80240BD8 AFB10014 */ sw $s1, 0x14($sp) -/* 99D56C 80240BDC 8E110148 */ lw $s1, 0x148($s0) -/* 99D570 80240BE0 86240008 */ lh $a0, 8($s1) -/* 99D574 80240BE4 0C00EABB */ jal get_npc_unsafe -/* 99D578 80240BE8 00A0902D */ daddu $s2, $a1, $zero -/* 99D57C 80240BEC 8E2300CC */ lw $v1, 0xcc($s1) -/* 99D580 80240BF0 0040202D */ daddu $a0, $v0, $zero -/* 99D584 80240BF4 8C630000 */ lw $v1, ($v1) -/* 99D588 80240BF8 24020001 */ addiu $v0, $zero, 1 -/* 99D58C 80240BFC AC830028 */ sw $v1, 0x28($a0) -/* 99D590 80240C00 AE020070 */ sw $v0, 0x70($s0) -/* 99D594 80240C04 8E220000 */ lw $v0, ($s1) -/* 99D598 80240C08 3C030010 */ lui $v1, 0x10 -/* 99D59C 80240C0C 00431024 */ and $v0, $v0, $v1 -/* 99D5A0 80240C10 10400004 */ beqz $v0, .L80240C24 -/* 99D5A4 80240C14 00000000 */ nop -/* 99D5A8 80240C18 C620006C */ lwc1 $f0, 0x6c($s1) -/* 99D5AC 80240C1C 46800020 */ cvt.s.w $f0, $f0 -/* 99D5B0 80240C20 E480000C */ swc1 $f0, 0xc($a0) -.L80240C24: -/* 99D5B4 80240C24 8E2200D0 */ lw $v0, 0xd0($s1) -/* 99D5B8 80240C28 8C420014 */ lw $v0, 0x14($v0) -/* 99D5BC 80240C2C 1C400004 */ bgtz $v0, .L80240C40 -/* 99D5C0 80240C30 00000000 */ nop -/* 99D5C4 80240C34 C640000C */ lwc1 $f0, 0xc($s2) -/* 99D5C8 80240C38 08090318 */ j .L80240C60 -/* 99D5CC 80240C3C E4800018 */ swc1 $f0, 0x18($a0) -.L80240C40: -/* 99D5D0 80240C40 3C018024 */ lui $at, 0x8024 -/* 99D5D4 80240C44 D42244A0 */ ldc1 $f2, 0x44a0($at) -/* 99D5D8 80240C48 44820000 */ mtc1 $v0, $f0 -/* 99D5DC 80240C4C 00000000 */ nop -/* 99D5E0 80240C50 46800021 */ cvt.d.w $f0, $f0 -/* 99D5E4 80240C54 46220003 */ div.d $f0, $f0, $f2 -/* 99D5E8 80240C58 46200020 */ cvt.s.d $f0, $f0 -/* 99D5EC 80240C5C E4800018 */ swc1 $f0, 0x18($a0) -.L80240C60: -/* 99D5F0 80240C60 8FBF001C */ lw $ra, 0x1c($sp) -/* 99D5F4 80240C64 8FB20018 */ lw $s2, 0x18($sp) -/* 99D5F8 80240C68 8FB10014 */ lw $s1, 0x14($sp) -/* 99D5FC 80240C6C 8FB00010 */ lw $s0, 0x10($sp) -/* 99D600 80240C70 03E00008 */ jr $ra -/* 99D604 80240C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_01/func_80240C78_99C990.s b/asm/nonmatchings/world/area_trd/trd_01/func_80240C78_99C990.s deleted file mode 100644 index d29fccb9c3..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/func_80240C78_99C990.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C78_99D608 -/* 99D608 80240C78 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 99D60C 80240C7C AFB40040 */ sw $s4, 0x40($sp) -/* 99D610 80240C80 0080A02D */ daddu $s4, $a0, $zero -/* 99D614 80240C84 AFBF0044 */ sw $ra, 0x44($sp) -/* 99D618 80240C88 AFB3003C */ sw $s3, 0x3c($sp) -/* 99D61C 80240C8C AFB20038 */ sw $s2, 0x38($sp) -/* 99D620 80240C90 AFB10034 */ sw $s1, 0x34($sp) -/* 99D624 80240C94 AFB00030 */ sw $s0, 0x30($sp) -/* 99D628 80240C98 8E920148 */ lw $s2, 0x148($s4) -/* 99D62C 80240C9C 00A0802D */ daddu $s0, $a1, $zero -/* 99D630 80240CA0 86440008 */ lh $a0, 8($s2) -/* 99D634 80240CA4 0C00EABB */ jal get_npc_unsafe -/* 99D638 80240CA8 00C0982D */ daddu $s3, $a2, $zero -/* 99D63C 80240CAC 8E030008 */ lw $v1, 8($s0) -/* 99D640 80240CB0 04600031 */ bltz $v1, .L80240D78 -/* 99D644 80240CB4 0040882D */ daddu $s1, $v0, $zero -/* 99D648 80240CB8 0260202D */ daddu $a0, $s3, $zero -/* 99D64C 80240CBC AFA00010 */ sw $zero, 0x10($sp) -/* 99D650 80240CC0 8E060018 */ lw $a2, 0x18($s0) -/* 99D654 80240CC4 8E07001C */ lw $a3, 0x1c($s0) -/* 99D658 80240CC8 0C01242D */ jal func_800490B4 -/* 99D65C 80240CCC 0240282D */ daddu $a1, $s2, $zero -/* 99D660 80240CD0 10400029 */ beqz $v0, .L80240D78 -/* 99D664 80240CD4 0000202D */ daddu $a0, $zero, $zero -/* 99D668 80240CD8 0220282D */ daddu $a1, $s1, $zero -/* 99D66C 80240CDC 0000302D */ daddu $a2, $zero, $zero -/* 99D670 80240CE0 862300A8 */ lh $v1, 0xa8($s1) -/* 99D674 80240CE4 3C013F80 */ lui $at, 0x3f80 -/* 99D678 80240CE8 44810000 */ mtc1 $at, $f0 -/* 99D67C 80240CEC 3C014000 */ lui $at, 0x4000 -/* 99D680 80240CF0 44811000 */ mtc1 $at, $f2 -/* 99D684 80240CF4 3C01C1A0 */ lui $at, 0xc1a0 -/* 99D688 80240CF8 44812000 */ mtc1 $at, $f4 -/* 99D68C 80240CFC 2402000F */ addiu $v0, $zero, 0xf -/* 99D690 80240D00 AFA2001C */ sw $v0, 0x1c($sp) -/* 99D694 80240D04 44833000 */ mtc1 $v1, $f6 -/* 99D698 80240D08 00000000 */ nop -/* 99D69C 80240D0C 468031A0 */ cvt.s.w $f6, $f6 -/* 99D6A0 80240D10 44073000 */ mfc1 $a3, $f6 -/* 99D6A4 80240D14 27A20028 */ addiu $v0, $sp, 0x28 -/* 99D6A8 80240D18 AFA20020 */ sw $v0, 0x20($sp) -/* 99D6AC 80240D1C E7A00010 */ swc1 $f0, 0x10($sp) -/* 99D6B0 80240D20 E7A20014 */ swc1 $f2, 0x14($sp) -/* 99D6B4 80240D24 0C01BFA4 */ jal fx_emote -/* 99D6B8 80240D28 E7A40018 */ swc1 $f4, 0x18($sp) -/* 99D6BC 80240D2C 0220202D */ daddu $a0, $s1, $zero -/* 99D6C0 80240D30 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 99D6C4 80240D34 0C012530 */ jal func_800494C0 -/* 99D6C8 80240D38 3C060020 */ lui $a2, 0x20 -/* 99D6CC 80240D3C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 99D6D0 80240D40 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 99D6D4 80240D44 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 99D6D8 80240D48 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 99D6DC 80240D4C 8C460028 */ lw $a2, 0x28($v0) -/* 99D6E0 80240D50 0C00A720 */ jal atan2 -/* 99D6E4 80240D54 8C470030 */ lw $a3, 0x30($v0) -/* 99D6E8 80240D58 E620000C */ swc1 $f0, 0xc($s1) -/* 99D6EC 80240D5C 8E420018 */ lw $v0, 0x18($s2) -/* 99D6F0 80240D60 9442002A */ lhu $v0, 0x2a($v0) -/* 99D6F4 80240D64 30420001 */ andi $v0, $v0, 1 -/* 99D6F8 80240D68 14400002 */ bnez $v0, .L80240D74 -/* 99D6FC 80240D6C 2402000A */ addiu $v0, $zero, 0xa -/* 99D700 80240D70 2402000C */ addiu $v0, $zero, 0xc -.L80240D74: -/* 99D704 80240D74 AE820070 */ sw $v0, 0x70($s4) -.L80240D78: -/* 99D708 80240D78 8FBF0044 */ lw $ra, 0x44($sp) -/* 99D70C 80240D7C 8FB40040 */ lw $s4, 0x40($sp) -/* 99D710 80240D80 8FB3003C */ lw $s3, 0x3c($sp) -/* 99D714 80240D84 8FB20038 */ lw $s2, 0x38($sp) -/* 99D718 80240D88 8FB10034 */ lw $s1, 0x34($sp) -/* 99D71C 80240D8C 8FB00030 */ lw $s0, 0x30($sp) -/* 99D720 80240D90 03E00008 */ jr $ra -/* 99D724 80240D94 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_01/func_80240DF8_99C990.s b/asm/nonmatchings/world/area_trd/trd_01/func_80240DF8_99C990.s deleted file mode 100644 index de5f4b2b5b..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/func_80240DF8_99C990.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF8_99D788 -/* 99D788 80240DF8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99D78C 80240DFC AFB00010 */ sw $s0, 0x10($sp) -/* 99D790 80240E00 0080802D */ daddu $s0, $a0, $zero -/* 99D794 80240E04 AFBF0014 */ sw $ra, 0x14($sp) -/* 99D798 80240E08 8E020148 */ lw $v0, 0x148($s0) -/* 99D79C 80240E0C 0C00EABB */ jal get_npc_unsafe -/* 99D7A0 80240E10 84440008 */ lh $a0, 8($v0) -/* 99D7A4 80240E14 0040202D */ daddu $a0, $v0, $zero -/* 99D7A8 80240E18 C482003C */ lwc1 $f2, 0x3c($a0) -/* 99D7AC 80240E1C C480001C */ lwc1 $f0, 0x1c($a0) -/* 99D7B0 80240E20 46001080 */ add.s $f2, $f2, $f0 -/* 99D7B4 80240E24 C4840014 */ lwc1 $f4, 0x14($a0) -/* 99D7B8 80240E28 46040001 */ sub.s $f0, $f0, $f4 -/* 99D7BC 80240E2C C4840064 */ lwc1 $f4, 0x64($a0) -/* 99D7C0 80240E30 4602203C */ c.lt.s $f4, $f2 -/* 99D7C4 80240E34 E482003C */ swc1 $f2, 0x3c($a0) -/* 99D7C8 80240E38 45010009 */ bc1t .L80240E60 -/* 99D7CC 80240E3C E480001C */ swc1 $f0, 0x1c($a0) -/* 99D7D0 80240E40 8C820000 */ lw $v0, ($a0) -/* 99D7D4 80240E44 2403F7FF */ addiu $v1, $zero, -0x801 -/* 99D7D8 80240E48 E484003C */ swc1 $f4, 0x3c($a0) -/* 99D7DC 80240E4C AC80001C */ sw $zero, 0x1c($a0) -/* 99D7E0 80240E50 00431024 */ and $v0, $v0, $v1 -/* 99D7E4 80240E54 AC820000 */ sw $v0, ($a0) -/* 99D7E8 80240E58 2402000C */ addiu $v0, $zero, 0xc -/* 99D7EC 80240E5C AE020070 */ sw $v0, 0x70($s0) -.L80240E60: -/* 99D7F0 80240E60 8FBF0014 */ lw $ra, 0x14($sp) -/* 99D7F4 80240E64 8FB00010 */ lw $s0, 0x10($sp) -/* 99D7F8 80240E68 03E00008 */ jr $ra -/* 99D7FC 80240E6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_01/func_80240FA0_99C990.s b/asm/nonmatchings/world/area_trd/trd_01/func_80240FA0_99C990.s deleted file mode 100644 index deadecb571..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/func_80240FA0_99C990.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FA0_99D930 -/* 99D930 80240FA0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 99D934 80240FA4 AFB3003C */ sw $s3, 0x3c($sp) -/* 99D938 80240FA8 0080982D */ daddu $s3, $a0, $zero -/* 99D93C 80240FAC AFBF0040 */ sw $ra, 0x40($sp) -/* 99D940 80240FB0 AFB20038 */ sw $s2, 0x38($sp) -/* 99D944 80240FB4 AFB10034 */ sw $s1, 0x34($sp) -/* 99D948 80240FB8 AFB00030 */ sw $s0, 0x30($sp) -/* 99D94C 80240FBC 8E720148 */ lw $s2, 0x148($s3) -/* 99D950 80240FC0 00A0882D */ daddu $s1, $a1, $zero -/* 99D954 80240FC4 86440008 */ lh $a0, 8($s2) -/* 99D958 80240FC8 0C00EABB */ jal get_npc_unsafe -/* 99D95C 80240FCC 00C0802D */ daddu $s0, $a2, $zero -/* 99D960 80240FD0 0200202D */ daddu $a0, $s0, $zero -/* 99D964 80240FD4 0240282D */ daddu $a1, $s2, $zero -/* 99D968 80240FD8 24030001 */ addiu $v1, $zero, 1 -/* 99D96C 80240FDC AFA30010 */ sw $v1, 0x10($sp) -/* 99D970 80240FE0 8E260018 */ lw $a2, 0x18($s1) -/* 99D974 80240FE4 8E27001C */ lw $a3, 0x1c($s1) -/* 99D978 80240FE8 0C01242D */ jal func_800490B4 -/* 99D97C 80240FEC 0040802D */ daddu $s0, $v0, $zero -/* 99D980 80240FF0 1440001D */ bnez $v0, .L80241068 -/* 99D984 80240FF4 24040002 */ addiu $a0, $zero, 2 -/* 99D988 80240FF8 0200282D */ daddu $a1, $s0, $zero -/* 99D98C 80240FFC 0000302D */ daddu $a2, $zero, $zero -/* 99D990 80241000 860300A8 */ lh $v1, 0xa8($s0) -/* 99D994 80241004 3C013F80 */ lui $at, 0x3f80 -/* 99D998 80241008 44810000 */ mtc1 $at, $f0 -/* 99D99C 8024100C 3C014000 */ lui $at, 0x4000 -/* 99D9A0 80241010 44811000 */ mtc1 $at, $f2 -/* 99D9A4 80241014 3C01C1A0 */ lui $at, 0xc1a0 -/* 99D9A8 80241018 44812000 */ mtc1 $at, $f4 -/* 99D9AC 8024101C 2402000F */ addiu $v0, $zero, 0xf -/* 99D9B0 80241020 AFA2001C */ sw $v0, 0x1c($sp) -/* 99D9B4 80241024 44833000 */ mtc1 $v1, $f6 -/* 99D9B8 80241028 00000000 */ nop -/* 99D9BC 8024102C 468031A0 */ cvt.s.w $f6, $f6 -/* 99D9C0 80241030 44073000 */ mfc1 $a3, $f6 -/* 99D9C4 80241034 27A20028 */ addiu $v0, $sp, 0x28 -/* 99D9C8 80241038 AFA20020 */ sw $v0, 0x20($sp) -/* 99D9CC 8024103C E7A00010 */ swc1 $f0, 0x10($sp) -/* 99D9D0 80241040 E7A20014 */ swc1 $f2, 0x14($sp) -/* 99D9D4 80241044 0C01BFA4 */ jal fx_emote -/* 99D9D8 80241048 E7A40018 */ swc1 $f4, 0x18($sp) -/* 99D9DC 8024104C 8E4200CC */ lw $v0, 0xcc($s2) -/* 99D9E0 80241050 8C430000 */ lw $v1, ($v0) -/* 99D9E4 80241054 24020019 */ addiu $v0, $zero, 0x19 -/* 99D9E8 80241058 A602008E */ sh $v0, 0x8e($s0) -/* 99D9EC 8024105C 2402000E */ addiu $v0, $zero, 0xe -/* 99D9F0 80241060 08090427 */ j .L8024109C -/* 99D9F4 80241064 AE030028 */ sw $v1, 0x28($s0) -.L80241068: -/* 99D9F8 80241068 8E050018 */ lw $a1, 0x18($s0) -/* 99D9FC 8024106C 8E06000C */ lw $a2, 0xc($s0) -/* 99DA00 80241070 0C00EA95 */ jal npc_move_heading -/* 99DA04 80241074 0200202D */ daddu $a0, $s0, $zero -/* 99DA08 80241078 0200202D */ daddu $a0, $s0, $zero -/* 99DA0C 8024107C 0C00F598 */ jal func_8003D660 -/* 99DA10 80241080 24050001 */ addiu $a1, $zero, 1 -/* 99DA14 80241084 9602008E */ lhu $v0, 0x8e($s0) -/* 99DA18 80241088 2442FFFF */ addiu $v0, $v0, -1 -/* 99DA1C 8024108C A602008E */ sh $v0, 0x8e($s0) -/* 99DA20 80241090 00021400 */ sll $v0, $v0, 0x10 -/* 99DA24 80241094 14400002 */ bnez $v0, .L802410A0 -/* 99DA28 80241098 2402000C */ addiu $v0, $zero, 0xc -.L8024109C: -/* 99DA2C 8024109C AE620070 */ sw $v0, 0x70($s3) -.L802410A0: -/* 99DA30 802410A0 8FBF0040 */ lw $ra, 0x40($sp) -/* 99DA34 802410A4 8FB3003C */ lw $s3, 0x3c($sp) -/* 99DA38 802410A8 8FB20038 */ lw $s2, 0x38($sp) -/* 99DA3C 802410AC 8FB10034 */ lw $s1, 0x34($sp) -/* 99DA40 802410B0 8FB00030 */ lw $s0, 0x30($sp) -/* 99DA44 802410B4 03E00008 */ jr $ra -/* 99DA48 802410B8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_02/func_80240034_9A0FE0.s b/asm/nonmatchings/world/area_trd/trd_02/func_80240034_9A0FE0.s deleted file mode 100644 index 04ce4f76f0..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/func_80240034_9A0FE0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034_9A1014 -/* 9A1014 80240034 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A1018 80240038 AFB20018 */ sw $s2, 0x18($sp) -/* 9A101C 8024003C 0080902D */ daddu $s2, $a0, $zero -/* 9A1020 80240040 AFBF001C */ sw $ra, 0x1c($sp) -/* 9A1024 80240044 AFB10014 */ sw $s1, 0x14($sp) -/* 9A1028 80240048 AFB00010 */ sw $s0, 0x10($sp) -/* 9A102C 8024004C 8E50000C */ lw $s0, 0xc($s2) -/* 9A1030 80240050 8E050000 */ lw $a1, ($s0) -/* 9A1034 80240054 0C0B1EAF */ jal get_variable -/* 9A1038 80240058 26100004 */ addiu $s0, $s0, 4 -/* 9A103C 8024005C 0C04417A */ jal get_entity_by_index -/* 9A1040 80240060 0040202D */ daddu $a0, $v0, $zero -/* 9A1044 80240064 8E050000 */ lw $a1, ($s0) -/* 9A1048 80240068 26100004 */ addiu $s0, $s0, 4 -/* 9A104C 8024006C 0040882D */ daddu $s1, $v0, $zero -/* 9A1050 80240070 C6200048 */ lwc1 $f0, 0x48($s1) -/* 9A1054 80240074 4600008D */ trunc.w.s $f2, $f0 -/* 9A1058 80240078 44061000 */ mfc1 $a2, $f2 -/* 9A105C 8024007C 0C0B2026 */ jal set_variable -/* 9A1060 80240080 0240202D */ daddu $a0, $s2, $zero -/* 9A1064 80240084 8E050000 */ lw $a1, ($s0) -/* 9A1068 80240088 26100004 */ addiu $s0, $s0, 4 -/* 9A106C 8024008C C620004C */ lwc1 $f0, 0x4c($s1) -/* 9A1070 80240090 4600008D */ trunc.w.s $f2, $f0 -/* 9A1074 80240094 44061000 */ mfc1 $a2, $f2 -/* 9A1078 80240098 0C0B2026 */ jal set_variable -/* 9A107C 8024009C 0240202D */ daddu $a0, $s2, $zero -/* 9A1080 802400A0 C6200050 */ lwc1 $f0, 0x50($s1) -/* 9A1084 802400A4 8E050000 */ lw $a1, ($s0) -/* 9A1088 802400A8 4600008D */ trunc.w.s $f2, $f0 -/* 9A108C 802400AC 44061000 */ mfc1 $a2, $f2 -/* 9A1090 802400B0 0C0B2026 */ jal set_variable -/* 9A1094 802400B4 0240202D */ daddu $a0, $s2, $zero -/* 9A1098 802400B8 8FBF001C */ lw $ra, 0x1c($sp) -/* 9A109C 802400BC 8FB20018 */ lw $s2, 0x18($sp) -/* 9A10A0 802400C0 8FB10014 */ lw $s1, 0x14($sp) -/* 9A10A4 802400C4 8FB00010 */ lw $s0, 0x10($sp) -/* 9A10A8 802400C8 24020002 */ addiu $v0, $zero, 2 -/* 9A10AC 802400CC 03E00008 */ jr $ra -/* 9A10B0 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 9A10B4 802400D4 00000000 */ nop -/* 9A10B8 802400D8 00000000 */ nop -/* 9A10BC 802400DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_02/func_80240290_9A0FE0.s b/asm/nonmatchings/world/area_trd/trd_02/func_80240290_9A0FE0.s deleted file mode 100644 index f6fe4c75bf..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/func_80240290_9A0FE0.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240290_9A1270 -/* 9A1270 80240290 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9A1274 80240294 AFB3003C */ sw $s3, 0x3c($sp) -/* 9A1278 80240298 0080982D */ daddu $s3, $a0, $zero -/* 9A127C 8024029C AFBF0040 */ sw $ra, 0x40($sp) -/* 9A1280 802402A0 AFB20038 */ sw $s2, 0x38($sp) -/* 9A1284 802402A4 AFB10034 */ sw $s1, 0x34($sp) -/* 9A1288 802402A8 AFB00030 */ sw $s0, 0x30($sp) -/* 9A128C 802402AC 8E710148 */ lw $s1, 0x148($s3) -/* 9A1290 802402B0 0C00EABB */ jal get_npc_unsafe -/* 9A1294 802402B4 86240008 */ lh $a0, 8($s1) -/* 9A1298 802402B8 0040802D */ daddu $s0, $v0, $zero -/* 9A129C 802402BC 8E22007C */ lw $v0, 0x7c($s1) -/* 9A12A0 802402C0 8603008E */ lh $v1, 0x8e($s0) -/* 9A12A4 802402C4 2442FFFF */ addiu $v0, $v0, -1 -/* 9A12A8 802402C8 14620012 */ bne $v1, $v0, .L80240314 -/* 9A12AC 802402CC 00000000 */ nop -/* 9A12B0 802402D0 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9A12B4 802402D4 4600020D */ trunc.w.s $f8, $f0 -/* 9A12B8 802402D8 44024000 */ mfc1 $v0, $f8 -/* 9A12BC 802402DC 00000000 */ nop -/* 9A12C0 802402E0 A6220010 */ sh $v0, 0x10($s1) -/* 9A12C4 802402E4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9A12C8 802402E8 4600020D */ trunc.w.s $f8, $f0 -/* 9A12CC 802402EC 44024000 */ mfc1 $v0, $f8 -/* 9A12D0 802402F0 00000000 */ nop -/* 9A12D4 802402F4 A6220012 */ sh $v0, 0x12($s1) -/* 9A12D8 802402F8 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9A12DC 802402FC 24020001 */ addiu $v0, $zero, 1 -/* 9A12E0 80240300 A2220007 */ sb $v0, 7($s1) -/* 9A12E4 80240304 4600020D */ trunc.w.s $f8, $f0 -/* 9A12E8 80240308 44024000 */ mfc1 $v0, $f8 -/* 9A12EC 8024030C 00000000 */ nop -/* 9A12F0 80240310 A6220014 */ sh $v0, 0x14($s1) -.L80240314: -/* 9A12F4 80240314 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9A12F8 80240318 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9A12FC 8024031C C6040040 */ lwc1 $f4, 0x40($s0) -/* 9A1300 80240320 C6060018 */ lwc1 $f6, 0x18($s0) -/* 9A1304 80240324 E7A00020 */ swc1 $f0, 0x20($sp) -/* 9A1308 80240328 E7A20024 */ swc1 $f2, 0x24($sp) -/* 9A130C 8024032C E7A40028 */ swc1 $f4, 0x28($sp) -/* 9A1310 80240330 E7A60010 */ swc1 $f6, 0x10($sp) -/* 9A1314 80240334 C600000C */ lwc1 $f0, 0xc($s0) -/* 9A1318 80240338 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9A131C 8024033C 860200A8 */ lh $v0, 0xa8($s0) -/* 9A1320 80240340 27A50020 */ addiu $a1, $sp, 0x20 -/* 9A1324 80240344 44820000 */ mtc1 $v0, $f0 -/* 9A1328 80240348 00000000 */ nop -/* 9A132C 8024034C 46800020 */ cvt.s.w $f0, $f0 -/* 9A1330 80240350 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9A1334 80240354 860200A6 */ lh $v0, 0xa6($s0) -/* 9A1338 80240358 27A60024 */ addiu $a2, $sp, 0x24 -/* 9A133C 8024035C 44820000 */ mtc1 $v0, $f0 -/* 9A1340 80240360 00000000 */ nop -/* 9A1344 80240364 46800020 */ cvt.s.w $f0, $f0 -/* 9A1348 80240368 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 9A134C 8024036C 8E040080 */ lw $a0, 0x80($s0) -/* 9A1350 80240370 0C037711 */ jal func_800DDC44 -/* 9A1354 80240374 27A70028 */ addiu $a3, $sp, 0x28 -/* 9A1358 80240378 0040902D */ daddu $s2, $v0, $zero -/* 9A135C 8024037C 16400005 */ bnez $s2, .L80240394 -/* 9A1360 80240380 00000000 */ nop -/* 9A1364 80240384 8E050018 */ lw $a1, 0x18($s0) -/* 9A1368 80240388 8E06000C */ lw $a2, 0xc($s0) -/* 9A136C 8024038C 0C00EA95 */ jal npc_move_heading -/* 9A1370 80240390 0200202D */ daddu $a0, $s0, $zero -.L80240394: -/* 9A1374 80240394 8602008E */ lh $v0, 0x8e($s0) -/* 9A1378 80240398 9603008E */ lhu $v1, 0x8e($s0) -/* 9A137C 8024039C 18400007 */ blez $v0, .L802403BC -/* 9A1380 802403A0 2462FFFF */ addiu $v0, $v1, -1 -/* 9A1384 802403A4 A602008E */ sh $v0, 0x8e($s0) -/* 9A1388 802403A8 00021400 */ sll $v0, $v0, 0x10 -/* 9A138C 802403AC 18400003 */ blez $v0, .L802403BC -/* 9A1390 802403B0 00000000 */ nop -/* 9A1394 802403B4 12400008 */ beqz $s2, .L802403D8 -/* 9A1398 802403B8 00000000 */ nop -.L802403BC: -/* 9A139C 802403BC 8E2200CC */ lw $v0, 0xcc($s1) -/* 9A13A0 802403C0 A2200007 */ sb $zero, 7($s1) -/* 9A13A4 802403C4 8C420028 */ lw $v0, 0x28($v0) -/* 9A13A8 802403C8 A600008E */ sh $zero, 0x8e($s0) -/* 9A13AC 802403CC AE020028 */ sw $v0, 0x28($s0) -/* 9A13B0 802403D0 2402000F */ addiu $v0, $zero, 0xf -/* 9A13B4 802403D4 AE620070 */ sw $v0, 0x70($s3) -.L802403D8: -/* 9A13B8 802403D8 8FBF0040 */ lw $ra, 0x40($sp) -/* 9A13BC 802403DC 8FB3003C */ lw $s3, 0x3c($sp) -/* 9A13C0 802403E0 8FB20038 */ lw $s2, 0x38($sp) -/* 9A13C4 802403E4 8FB10034 */ lw $s1, 0x34($sp) -/* 9A13C8 802403E8 8FB00030 */ lw $s0, 0x30($sp) -/* 9A13CC 802403EC 03E00008 */ jr $ra -/* 9A13D0 802403F0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_02/func_802408B4_9A0FE0.s b/asm/nonmatchings/world/area_trd/trd_02/func_802408B4_9A0FE0.s deleted file mode 100644 index f2ae9d0ae5..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/func_802408B4_9A0FE0.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408B4_9A1894 -/* 9A1894 802408B4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9A1898 802408B8 AFB50024 */ sw $s5, 0x24($sp) -/* 9A189C 802408BC 0080A82D */ daddu $s5, $a0, $zero -/* 9A18A0 802408C0 AFBF002C */ sw $ra, 0x2c($sp) -/* 9A18A4 802408C4 AFB60028 */ sw $s6, 0x28($sp) -/* 9A18A8 802408C8 AFB40020 */ sw $s4, 0x20($sp) -/* 9A18AC 802408CC AFB3001C */ sw $s3, 0x1c($sp) -/* 9A18B0 802408D0 AFB20018 */ sw $s2, 0x18($sp) -/* 9A18B4 802408D4 AFB10014 */ sw $s1, 0x14($sp) -/* 9A18B8 802408D8 AFB00010 */ sw $s0, 0x10($sp) -/* 9A18BC 802408DC F7B80040 */ sdc1 $f24, 0x40($sp) -/* 9A18C0 802408E0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 9A18C4 802408E4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9A18C8 802408E8 8EB30148 */ lw $s3, 0x148($s5) -/* 9A18CC 802408EC 86640008 */ lh $a0, 8($s3) -/* 9A18D0 802408F0 0C00EABB */ jal get_npc_unsafe -/* 9A18D4 802408F4 00A0B02D */ daddu $s6, $a1, $zero -/* 9A18D8 802408F8 0040A02D */ daddu $s4, $v0, $zero -/* 9A18DC 802408FC AEA00074 */ sw $zero, 0x74($s5) -/* 9A18E0 80240900 C6980038 */ lwc1 $f24, 0x38($s4) -/* 9A18E4 80240904 C6960040 */ lwc1 $f22, 0x40($s4) -/* 9A18E8 80240908 0000902D */ daddu $s2, $zero, $zero -/* 9A18EC 8024090C AEA00078 */ sw $zero, 0x78($s5) -/* 9A18F0 80240910 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9A18F4 80240914 8C620000 */ lw $v0, ($v1) -/* 9A18F8 80240918 3C0146FF */ lui $at, 0x46ff -/* 9A18FC 8024091C 3421FE00 */ ori $at, $at, 0xfe00 -/* 9A1900 80240920 4481A000 */ mtc1 $at, $f20 -/* 9A1904 80240924 18400018 */ blez $v0, .L80240988 -/* 9A1908 80240928 0240802D */ daddu $s0, $s2, $zero -/* 9A190C 8024092C 0240882D */ daddu $s1, $s2, $zero -.L80240930: -/* 9A1910 80240930 02231021 */ addu $v0, $s1, $v1 -/* 9A1914 80240934 4600C306 */ mov.s $f12, $f24 -/* 9A1918 80240938 C4440004 */ lwc1 $f4, 4($v0) -/* 9A191C 8024093C 46802120 */ cvt.s.w $f4, $f4 -/* 9A1920 80240940 44062000 */ mfc1 $a2, $f4 -/* 9A1924 80240944 C444000C */ lwc1 $f4, 0xc($v0) -/* 9A1928 80240948 46802120 */ cvt.s.w $f4, $f4 -/* 9A192C 8024094C 44072000 */ mfc1 $a3, $f4 -/* 9A1930 80240950 0C00A7B5 */ jal dist2D -/* 9A1934 80240954 4600B386 */ mov.s $f14, $f22 -/* 9A1938 80240958 4614003C */ c.lt.s $f0, $f20 -/* 9A193C 8024095C 00000000 */ nop -/* 9A1940 80240960 45000003 */ bc1f .L80240970 -/* 9A1944 80240964 2631000C */ addiu $s1, $s1, 0xc -/* 9A1948 80240968 46000506 */ mov.s $f20, $f0 -/* 9A194C 8024096C AEB20078 */ sw $s2, 0x78($s5) -.L80240970: -/* 9A1950 80240970 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9A1954 80240974 26100001 */ addiu $s0, $s0, 1 -/* 9A1958 80240978 8C620000 */ lw $v0, ($v1) -/* 9A195C 8024097C 0202102A */ slt $v0, $s0, $v0 -/* 9A1960 80240980 1440FFEB */ bnez $v0, .L80240930 -/* 9A1964 80240984 26520001 */ addiu $s2, $s2, 1 -.L80240988: -/* 9A1968 80240988 8E6200CC */ lw $v0, 0xcc($s3) -/* 9A196C 8024098C 8C420004 */ lw $v0, 4($v0) -/* 9A1970 80240990 AE820028 */ sw $v0, 0x28($s4) -/* 9A1974 80240994 8E6200D0 */ lw $v0, 0xd0($s3) -/* 9A1978 80240998 8C42007C */ lw $v0, 0x7c($v0) -/* 9A197C 8024099C 04410004 */ bgez $v0, .L802409B0 -/* 9A1980 802409A0 00000000 */ nop -/* 9A1984 802409A4 C6C00000 */ lwc1 $f0, ($s6) -/* 9A1988 802409A8 08090274 */ j .L802409D0 -/* 9A198C 802409AC E6800018 */ swc1 $f0, 0x18($s4) -.L802409B0: -/* 9A1990 802409B0 3C018024 */ lui $at, 0x8024 -/* 9A1994 802409B4 D4223340 */ ldc1 $f2, 0x3340($at) -/* 9A1998 802409B8 44820000 */ mtc1 $v0, $f0 -/* 9A199C 802409BC 00000000 */ nop -/* 9A19A0 802409C0 46800021 */ cvt.d.w $f0, $f0 -/* 9A19A4 802409C4 46220003 */ div.d $f0, $f0, $f2 -/* 9A19A8 802409C8 46200020 */ cvt.s.d $f0, $f0 -/* 9A19AC 802409CC E6800018 */ swc1 $f0, 0x18($s4) -.L802409D0: -/* 9A19B0 802409D0 24020001 */ addiu $v0, $zero, 1 -/* 9A19B4 802409D4 AEA20070 */ sw $v0, 0x70($s5) -/* 9A19B8 802409D8 8FBF002C */ lw $ra, 0x2c($sp) -/* 9A19BC 802409DC 8FB60028 */ lw $s6, 0x28($sp) -/* 9A19C0 802409E0 8FB50024 */ lw $s5, 0x24($sp) -/* 9A19C4 802409E4 8FB40020 */ lw $s4, 0x20($sp) -/* 9A19C8 802409E8 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A19CC 802409EC 8FB20018 */ lw $s2, 0x18($sp) -/* 9A19D0 802409F0 8FB10014 */ lw $s1, 0x14($sp) -/* 9A19D4 802409F4 8FB00010 */ lw $s0, 0x10($sp) -/* 9A19D8 802409F8 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 9A19DC 802409FC D7B60038 */ ldc1 $f22, 0x38($sp) -/* 9A19E0 80240A00 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9A19E4 80240A04 03E00008 */ jr $ra -/* 9A19E8 80240A08 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_02/func_80240A0C_9A0FE0.s b/asm/nonmatchings/world/area_trd/trd_02/func_80240A0C_9A0FE0.s deleted file mode 100644 index ab8c0faf9f..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/func_80240A0C_9A0FE0.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A0C_9A19EC -/* 9A19EC 80240A0C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 9A19F0 80240A10 AFB20038 */ sw $s2, 0x38($sp) -/* 9A19F4 80240A14 0080902D */ daddu $s2, $a0, $zero -/* 9A19F8 80240A18 AFBF0044 */ sw $ra, 0x44($sp) -/* 9A19FC 80240A1C AFB40040 */ sw $s4, 0x40($sp) -/* 9A1A00 80240A20 AFB3003C */ sw $s3, 0x3c($sp) -/* 9A1A04 80240A24 AFB10034 */ sw $s1, 0x34($sp) -/* 9A1A08 80240A28 AFB00030 */ sw $s0, 0x30($sp) -/* 9A1A0C 80240A2C F7B60050 */ sdc1 $f22, 0x50($sp) -/* 9A1A10 80240A30 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 9A1A14 80240A34 8E510148 */ lw $s1, 0x148($s2) -/* 9A1A18 80240A38 00A0982D */ daddu $s3, $a1, $zero -/* 9A1A1C 80240A3C 86240008 */ lh $a0, 8($s1) -/* 9A1A20 80240A40 0C00EABB */ jal get_npc_unsafe -/* 9A1A24 80240A44 00C0A02D */ daddu $s4, $a2, $zero -/* 9A1A28 80240A48 8E630014 */ lw $v1, 0x14($s3) -/* 9A1A2C 80240A4C 04600030 */ bltz $v1, .L80240B10 -/* 9A1A30 80240A50 0040802D */ daddu $s0, $v0, $zero -/* 9A1A34 80240A54 8E420074 */ lw $v0, 0x74($s2) -/* 9A1A38 80240A58 1C40002C */ bgtz $v0, .L80240B0C -/* 9A1A3C 80240A5C 2442FFFF */ addiu $v0, $v0, -1 -/* 9A1A40 80240A60 0280202D */ daddu $a0, $s4, $zero -/* 9A1A44 80240A64 AE430074 */ sw $v1, 0x74($s2) -/* 9A1A48 80240A68 AFA00010 */ sw $zero, 0x10($sp) -/* 9A1A4C 80240A6C 8E66000C */ lw $a2, 0xc($s3) -/* 9A1A50 80240A70 8E670010 */ lw $a3, 0x10($s3) -/* 9A1A54 80240A74 0C01242D */ jal func_800490B4 -/* 9A1A58 80240A78 0220282D */ daddu $a1, $s1, $zero -/* 9A1A5C 80240A7C 10400021 */ beqz $v0, .L80240B04 -/* 9A1A60 80240A80 0000202D */ daddu $a0, $zero, $zero -/* 9A1A64 80240A84 0200282D */ daddu $a1, $s0, $zero -/* 9A1A68 80240A88 0000302D */ daddu $a2, $zero, $zero -/* 9A1A6C 80240A8C 860300A8 */ lh $v1, 0xa8($s0) -/* 9A1A70 80240A90 3C013F80 */ lui $at, 0x3f80 -/* 9A1A74 80240A94 44810000 */ mtc1 $at, $f0 -/* 9A1A78 80240A98 3C014000 */ lui $at, 0x4000 -/* 9A1A7C 80240A9C 44811000 */ mtc1 $at, $f2 -/* 9A1A80 80240AA0 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A1A84 80240AA4 44812000 */ mtc1 $at, $f4 -/* 9A1A88 80240AA8 2402000F */ addiu $v0, $zero, 0xf -/* 9A1A8C 80240AAC AFA2001C */ sw $v0, 0x1c($sp) -/* 9A1A90 80240AB0 44833000 */ mtc1 $v1, $f6 -/* 9A1A94 80240AB4 00000000 */ nop -/* 9A1A98 80240AB8 468031A0 */ cvt.s.w $f6, $f6 -/* 9A1A9C 80240ABC 44073000 */ mfc1 $a3, $f6 -/* 9A1AA0 80240AC0 27A20028 */ addiu $v0, $sp, 0x28 -/* 9A1AA4 80240AC4 AFA20020 */ sw $v0, 0x20($sp) -/* 9A1AA8 80240AC8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A1AAC 80240ACC E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A1AB0 80240AD0 0C01BFA4 */ jal fx_emote -/* 9A1AB4 80240AD4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A1AB8 80240AD8 0200202D */ daddu $a0, $s0, $zero -/* 9A1ABC 80240ADC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9A1AC0 80240AE0 0C012530 */ jal func_800494C0 -/* 9A1AC4 80240AE4 3C060020 */ lui $a2, 0x20 -/* 9A1AC8 80240AE8 8E220018 */ lw $v0, 0x18($s1) -/* 9A1ACC 80240AEC 9442002A */ lhu $v0, 0x2a($v0) -/* 9A1AD0 80240AF0 30420001 */ andi $v0, $v0, 1 -/* 9A1AD4 80240AF4 14400064 */ bnez $v0, .L80240C88 -/* 9A1AD8 80240AF8 2402000A */ addiu $v0, $zero, 0xa -/* 9A1ADC 80240AFC 08090322 */ j .L80240C88 -/* 9A1AE0 80240B00 2402000C */ addiu $v0, $zero, 0xc -.L80240B04: -/* 9A1AE4 80240B04 8E420074 */ lw $v0, 0x74($s2) -/* 9A1AE8 80240B08 2442FFFF */ addiu $v0, $v0, -1 -.L80240B0C: -/* 9A1AEC 80240B0C AE420074 */ sw $v0, 0x74($s2) -.L80240B10: -/* 9A1AF0 80240B10 8602008C */ lh $v0, 0x8c($s0) -/* 9A1AF4 80240B14 1440005D */ bnez $v0, .L80240C8C -/* 9A1AF8 80240B18 00000000 */ nop -/* 9A1AFC 80240B1C C6000018 */ lwc1 $f0, 0x18($s0) -/* 9A1B00 80240B20 3C014010 */ lui $at, 0x4010 -/* 9A1B04 80240B24 44811800 */ mtc1 $at, $f3 -/* 9A1B08 80240B28 44801000 */ mtc1 $zero, $f2 -/* 9A1B0C 80240B2C 46000021 */ cvt.d.s $f0, $f0 -/* 9A1B10 80240B30 4622003C */ c.lt.d $f0, $f2 -/* 9A1B14 80240B34 00000000 */ nop -/* 9A1B18 80240B38 45000003 */ bc1f .L80240B48 -/* 9A1B1C 80240B3C 0200202D */ daddu $a0, $s0, $zero -/* 9A1B20 80240B40 080902D3 */ j .L80240B4C -/* 9A1B24 80240B44 0000282D */ daddu $a1, $zero, $zero -.L80240B48: -/* 9A1B28 80240B48 24050001 */ addiu $a1, $zero, 1 -.L80240B4C: -/* 9A1B2C 80240B4C 0C00F598 */ jal func_8003D660 -/* 9A1B30 80240B50 00000000 */ nop -/* 9A1B34 80240B54 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A1B38 80240B58 8E430078 */ lw $v1, 0x78($s2) -/* 9A1B3C 80240B5C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A1B40 80240B60 00031040 */ sll $v0, $v1, 1 -/* 9A1B44 80240B64 00431021 */ addu $v0, $v0, $v1 -/* 9A1B48 80240B68 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A1B4C 80240B6C 00021080 */ sll $v0, $v0, 2 -/* 9A1B50 80240B70 00431021 */ addu $v0, $v0, $v1 -/* 9A1B54 80240B74 C4560004 */ lwc1 $f22, 4($v0) -/* 9A1B58 80240B78 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9A1B5C 80240B7C C454000C */ lwc1 $f20, 0xc($v0) -/* 9A1B60 80240B80 4680A520 */ cvt.s.w $f20, $f20 -/* 9A1B64 80240B84 4406B000 */ mfc1 $a2, $f22 -/* 9A1B68 80240B88 4407A000 */ mfc1 $a3, $f20 -/* 9A1B6C 80240B8C 0C00A720 */ jal atan2 -/* 9A1B70 80240B90 00000000 */ nop -/* 9A1B74 80240B94 8E050018 */ lw $a1, 0x18($s0) -/* 9A1B78 80240B98 44060000 */ mfc1 $a2, $f0 -/* 9A1B7C 80240B9C 0200202D */ daddu $a0, $s0, $zero -/* 9A1B80 80240BA0 0C00EA95 */ jal npc_move_heading -/* 9A1B84 80240BA4 AE06000C */ sw $a2, 0xc($s0) -/* 9A1B88 80240BA8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A1B8C 80240BAC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A1B90 80240BB0 4406B000 */ mfc1 $a2, $f22 -/* 9A1B94 80240BB4 4407A000 */ mfc1 $a3, $f20 -/* 9A1B98 80240BB8 0C00A7B5 */ jal dist2D -/* 9A1B9C 80240BBC 00000000 */ nop -/* 9A1BA0 80240BC0 C6020018 */ lwc1 $f2, 0x18($s0) -/* 9A1BA4 80240BC4 4602003E */ c.le.s $f0, $f2 -/* 9A1BA8 80240BC8 00000000 */ nop -/* 9A1BAC 80240BCC 4500002F */ bc1f .L80240C8C -/* 9A1BB0 80240BD0 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9A1BB4 80240BD4 24020002 */ addiu $v0, $zero, 2 -/* 9A1BB8 80240BD8 0C00A67F */ jal rand_int -/* 9A1BBC 80240BDC AE420070 */ sw $v0, 0x70($s2) -/* 9A1BC0 80240BE0 3C035555 */ lui $v1, 0x5555 -/* 9A1BC4 80240BE4 34635556 */ ori $v1, $v1, 0x5556 -/* 9A1BC8 80240BE8 00430018 */ mult $v0, $v1 -/* 9A1BCC 80240BEC 000227C3 */ sra $a0, $v0, 0x1f -/* 9A1BD0 80240BF0 00004010 */ mfhi $t0 -/* 9A1BD4 80240BF4 01042023 */ subu $a0, $t0, $a0 -/* 9A1BD8 80240BF8 00041840 */ sll $v1, $a0, 1 -/* 9A1BDC 80240BFC 00641821 */ addu $v1, $v1, $a0 -/* 9A1BE0 80240C00 00431023 */ subu $v0, $v0, $v1 -/* 9A1BE4 80240C04 24430002 */ addiu $v1, $v0, 2 -/* 9A1BE8 80240C08 AE430074 */ sw $v1, 0x74($s2) -/* 9A1BEC 80240C0C 8E62002C */ lw $v0, 0x2c($s3) -/* 9A1BF0 80240C10 18400009 */ blez $v0, .L80240C38 -/* 9A1BF4 80240C14 24020004 */ addiu $v0, $zero, 4 -/* 9A1BF8 80240C18 8E620004 */ lw $v0, 4($s3) -/* 9A1BFC 80240C1C 18400006 */ blez $v0, .L80240C38 -/* 9A1C00 80240C20 24020004 */ addiu $v0, $zero, 4 -/* 9A1C04 80240C24 8E620008 */ lw $v0, 8($s3) -/* 9A1C08 80240C28 18400003 */ blez $v0, .L80240C38 -/* 9A1C0C 80240C2C 24020004 */ addiu $v0, $zero, 4 -/* 9A1C10 80240C30 14600002 */ bnez $v1, .L80240C3C -/* 9A1C14 80240C34 00000000 */ nop -.L80240C38: -/* 9A1C18 80240C38 AE420070 */ sw $v0, 0x70($s2) -.L80240C3C: -/* 9A1C1C 80240C3C 0C00A67F */ jal rand_int -/* 9A1C20 80240C40 24042710 */ addiu $a0, $zero, 0x2710 -/* 9A1C24 80240C44 3C0351EB */ lui $v1, 0x51eb -/* 9A1C28 80240C48 3463851F */ ori $v1, $v1, 0x851f -/* 9A1C2C 80240C4C 00430018 */ mult $v0, $v1 -/* 9A1C30 80240C50 00021FC3 */ sra $v1, $v0, 0x1f -/* 9A1C34 80240C54 00004010 */ mfhi $t0 -/* 9A1C38 80240C58 00082143 */ sra $a0, $t0, 5 -/* 9A1C3C 80240C5C 00832023 */ subu $a0, $a0, $v1 -/* 9A1C40 80240C60 00041840 */ sll $v1, $a0, 1 -/* 9A1C44 80240C64 00641821 */ addu $v1, $v1, $a0 -/* 9A1C48 80240C68 000318C0 */ sll $v1, $v1, 3 -/* 9A1C4C 80240C6C 00641821 */ addu $v1, $v1, $a0 -/* 9A1C50 80240C70 00031880 */ sll $v1, $v1, 2 -/* 9A1C54 80240C74 8E640004 */ lw $a0, 4($s3) -/* 9A1C58 80240C78 00431023 */ subu $v0, $v0, $v1 -/* 9A1C5C 80240C7C 0044102A */ slt $v0, $v0, $a0 -/* 9A1C60 80240C80 10400002 */ beqz $v0, .L80240C8C -/* 9A1C64 80240C84 24020004 */ addiu $v0, $zero, 4 -.L80240C88: -/* 9A1C68 80240C88 AE420070 */ sw $v0, 0x70($s2) -.L80240C8C: -/* 9A1C6C 80240C8C 8FBF0044 */ lw $ra, 0x44($sp) -/* 9A1C70 80240C90 8FB40040 */ lw $s4, 0x40($sp) -/* 9A1C74 80240C94 8FB3003C */ lw $s3, 0x3c($sp) -/* 9A1C78 80240C98 8FB20038 */ lw $s2, 0x38($sp) -/* 9A1C7C 80240C9C 8FB10034 */ lw $s1, 0x34($sp) -/* 9A1C80 80240CA0 8FB00030 */ lw $s0, 0x30($sp) -/* 9A1C84 80240CA4 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 9A1C88 80240CA8 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 9A1C8C 80240CAC 03E00008 */ jr $ra -/* 9A1C90 80240CB0 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_trd/trd_02/func_802410D0_9A0FE0.s b/asm/nonmatchings/world/area_trd/trd_02/func_802410D0_9A0FE0.s deleted file mode 100644 index 19ed53b10e..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/func_802410D0_9A0FE0.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410D0_9A20B0 -/* 9A20B0 802410D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9A20B4 802410D4 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A20B8 802410D8 0080982D */ daddu $s3, $a0, $zero -/* 9A20BC 802410DC AFBF0020 */ sw $ra, 0x20($sp) -/* 9A20C0 802410E0 AFB20018 */ sw $s2, 0x18($sp) -/* 9A20C4 802410E4 AFB10014 */ sw $s1, 0x14($sp) -/* 9A20C8 802410E8 AFB00010 */ sw $s0, 0x10($sp) -/* 9A20CC 802410EC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 9A20D0 802410F0 8E710148 */ lw $s1, 0x148($s3) -/* 9A20D4 802410F4 86240008 */ lh $a0, 8($s1) -/* 9A20D8 802410F8 0C00EABB */ jal get_npc_unsafe -/* 9A20DC 802410FC 00A0802D */ daddu $s0, $a1, $zero -/* 9A20E0 80241100 8E040020 */ lw $a0, 0x20($s0) -/* 9A20E4 80241104 0040902D */ daddu $s2, $v0, $zero -/* 9A20E8 80241108 00041FC2 */ srl $v1, $a0, 0x1f -/* 9A20EC 8024110C 00832021 */ addu $a0, $a0, $v1 -/* 9A20F0 80241110 00042043 */ sra $a0, $a0, 1 -/* 9A20F4 80241114 0C00A67F */ jal rand_int -/* 9A20F8 80241118 24840001 */ addiu $a0, $a0, 1 -/* 9A20FC 8024111C 8E030020 */ lw $v1, 0x20($s0) -/* 9A2100 80241120 C64C0038 */ lwc1 $f12, 0x38($s2) -/* 9A2104 80241124 000327C2 */ srl $a0, $v1, 0x1f -/* 9A2108 80241128 00641821 */ addu $v1, $v1, $a0 -/* 9A210C 8024112C 00031843 */ sra $v1, $v1, 1 -/* 9A2110 80241130 00621821 */ addu $v1, $v1, $v0 -/* 9A2114 80241134 A643008E */ sh $v1, 0x8e($s2) -/* 9A2118 80241138 8E2200CC */ lw $v0, 0xcc($s1) -/* 9A211C 8024113C C64E0040 */ lwc1 $f14, 0x40($s2) -/* 9A2120 80241140 8C42000C */ lw $v0, 0xc($v0) -/* 9A2124 80241144 AE420028 */ sw $v0, 0x28($s2) -/* 9A2128 80241148 C6000018 */ lwc1 $f0, 0x18($s0) -/* 9A212C 8024114C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9A2130 80241150 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9A2134 80241154 E6400018 */ swc1 $f0, 0x18($s2) -/* 9A2138 80241158 8C460028 */ lw $a2, 0x28($v0) -/* 9A213C 8024115C 0C00A720 */ jal atan2 -/* 9A2140 80241160 8C470030 */ lw $a3, 0x30($v0) -/* 9A2144 80241164 46000506 */ mov.s $f20, $f0 -/* 9A2148 80241168 C64C000C */ lwc1 $f12, 0xc($s2) -/* 9A214C 8024116C 0C00A70A */ jal get_clamped_angle_diff -/* 9A2150 80241170 4600A386 */ mov.s $f14, $f20 -/* 9A2154 80241174 46000086 */ mov.s $f2, $f0 -/* 9A2158 80241178 8E02001C */ lw $v0, 0x1c($s0) -/* 9A215C 8024117C 46001005 */ abs.s $f0, $f2 -/* 9A2160 80241180 44822000 */ mtc1 $v0, $f4 -/* 9A2164 80241184 00000000 */ nop -/* 9A2168 80241188 46802120 */ cvt.s.w $f4, $f4 -/* 9A216C 8024118C 4600203C */ c.lt.s $f4, $f0 -/* 9A2170 80241190 00000000 */ nop -/* 9A2174 80241194 4500000D */ bc1f .L802411CC -/* 9A2178 80241198 00000000 */ nop -/* 9A217C 8024119C 44800000 */ mtc1 $zero, $f0 -/* 9A2180 802411A0 C654000C */ lwc1 $f20, 0xc($s2) -/* 9A2184 802411A4 4600103C */ c.lt.s $f2, $f0 -/* 9A2188 802411A8 00000000 */ nop -/* 9A218C 802411AC 45000006 */ bc1f .L802411C8 -/* 9A2190 802411B0 00021023 */ negu $v0, $v0 -/* 9A2194 802411B4 44820000 */ mtc1 $v0, $f0 -/* 9A2198 802411B8 00000000 */ nop -/* 9A219C 802411BC 46800020 */ cvt.s.w $f0, $f0 -/* 9A21A0 802411C0 08090473 */ j .L802411CC -/* 9A21A4 802411C4 4600A500 */ add.s $f20, $f20, $f0 -.L802411C8: -/* 9A21A8 802411C8 4604A500 */ add.s $f20, $f20, $f4 -.L802411CC: -/* 9A21AC 802411CC 0C00A6C9 */ jal clamp_angle -/* 9A21B0 802411D0 4600A306 */ mov.s $f12, $f20 -/* 9A21B4 802411D4 2402000D */ addiu $v0, $zero, 0xd -/* 9A21B8 802411D8 E640000C */ swc1 $f0, 0xc($s2) -/* 9A21BC 802411DC AE620070 */ sw $v0, 0x70($s3) -/* 9A21C0 802411E0 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A21C4 802411E4 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A21C8 802411E8 8FB20018 */ lw $s2, 0x18($sp) -/* 9A21CC 802411EC 8FB10014 */ lw $s1, 0x14($sp) -/* 9A21D0 802411F0 8FB00010 */ lw $s0, 0x10($sp) -/* 9A21D4 802411F4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 9A21D8 802411F8 03E00008 */ jr $ra -/* 9A21DC 802411FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_trd/trd_02/func_80241320_9A0FE0.s b/asm/nonmatchings/world/area_trd/trd_02/func_80241320_9A0FE0.s deleted file mode 100644 index 84a3fd4ef4..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/func_80241320_9A0FE0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241320_9A2300 -/* 9A2300 80241320 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A2304 80241324 AFB10014 */ sw $s1, 0x14($sp) -/* 9A2308 80241328 0080882D */ daddu $s1, $a0, $zero -/* 9A230C 8024132C AFBF0018 */ sw $ra, 0x18($sp) -/* 9A2310 80241330 AFB00010 */ sw $s0, 0x10($sp) -/* 9A2314 80241334 8E300148 */ lw $s0, 0x148($s1) -/* 9A2318 80241338 0C00EABB */ jal get_npc_unsafe -/* 9A231C 8024133C 86040008 */ lh $a0, 8($s0) -/* 9A2320 80241340 9443008E */ lhu $v1, 0x8e($v0) -/* 9A2324 80241344 2463FFFF */ addiu $v1, $v1, -1 -/* 9A2328 80241348 A443008E */ sh $v1, 0x8e($v0) -/* 9A232C 8024134C 00031C00 */ sll $v1, $v1, 0x10 -/* 9A2330 80241350 14600008 */ bnez $v1, .L80241374 -/* 9A2334 80241354 00000000 */ nop -/* 9A2338 80241358 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9A233C 8024135C 30420080 */ andi $v0, $v0, 0x80 -/* 9A2340 80241360 10400003 */ beqz $v0, .L80241370 -/* 9A2344 80241364 2402000F */ addiu $v0, $zero, 0xf -/* 9A2348 80241368 080904DD */ j .L80241374 -/* 9A234C 8024136C AE220070 */ sw $v0, 0x70($s1) -.L80241370: -/* 9A2350 80241370 AE200070 */ sw $zero, 0x70($s1) -.L80241374: -/* 9A2354 80241374 8FBF0018 */ lw $ra, 0x18($sp) -/* 9A2358 80241378 8FB10014 */ lw $s1, 0x14($sp) -/* 9A235C 8024137C 8FB00010 */ lw $s0, 0x10($sp) -/* 9A2360 80241380 03E00008 */ jr $ra -/* 9A2364 80241384 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_02/func_80241388_9A0FE0.s b/asm/nonmatchings/world/area_trd/trd_02/func_80241388_9A0FE0.s deleted file mode 100644 index 0301c66c67..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/func_80241388_9A0FE0.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241388_9A2368 -/* 9A2368 80241388 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A236C 8024138C AFB10014 */ sw $s1, 0x14($sp) -/* 9A2370 80241390 0080882D */ daddu $s1, $a0, $zero -/* 9A2374 80241394 AFBF001C */ sw $ra, 0x1c($sp) -/* 9A2378 80241398 AFB20018 */ sw $s2, 0x18($sp) -/* 9A237C 8024139C AFB00010 */ sw $s0, 0x10($sp) -/* 9A2380 802413A0 8E300148 */ lw $s0, 0x148($s1) -/* 9A2384 802413A4 86040008 */ lh $a0, 8($s0) -/* 9A2388 802413A8 0C00EABB */ jal get_npc_unsafe -/* 9A238C 802413AC 00A0902D */ daddu $s2, $a1, $zero -/* 9A2390 802413B0 8E0300D0 */ lw $v1, 0xd0($s0) -/* 9A2394 802413B4 8E240078 */ lw $a0, 0x78($s1) -/* 9A2398 802413B8 8C630000 */ lw $v1, ($v1) -/* 9A239C 802413BC 0083182A */ slt $v1, $a0, $v1 -/* 9A23A0 802413C0 10600013 */ beqz $v1, .L80241410 -/* 9A23A4 802413C4 0040302D */ daddu $a2, $v0, $zero -/* 9A23A8 802413C8 00041040 */ sll $v0, $a0, 1 -/* 9A23AC 802413CC 00441021 */ addu $v0, $v0, $a0 -/* 9A23B0 802413D0 00022880 */ sll $a1, $v0, 2 -.L802413D4: -/* 9A23B4 802413D4 8E0300D0 */ lw $v1, 0xd0($s0) -/* 9A23B8 802413D8 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 9A23BC 802413DC 00A31021 */ addu $v0, $a1, $v1 -/* 9A23C0 802413E0 C4400008 */ lwc1 $f0, 8($v0) -/* 9A23C4 802413E4 46800020 */ cvt.s.w $f0, $f0 -/* 9A23C8 802413E8 4602003E */ c.le.s $f0, $f2 -/* 9A23CC 802413EC 00000000 */ nop -/* 9A23D0 802413F0 45020003 */ bc1fl .L80241400 -/* 9A23D4 802413F4 24840001 */ addiu $a0, $a0, 1 -/* 9A23D8 802413F8 08090504 */ j .L80241410 -/* 9A23DC 802413FC AE240078 */ sw $a0, 0x78($s1) -.L80241400: -/* 9A23E0 80241400 8C620000 */ lw $v0, ($v1) -/* 9A23E4 80241404 0082102A */ slt $v0, $a0, $v0 -/* 9A23E8 80241408 1440FFF2 */ bnez $v0, .L802413D4 -/* 9A23EC 8024140C 24A5000C */ addiu $a1, $a1, 0xc -.L80241410: -/* 9A23F0 80241410 C6400000 */ lwc1 $f0, ($s2) -/* 9A23F4 80241414 E4C00018 */ swc1 $f0, 0x18($a2) -/* 9A23F8 80241418 8E0200CC */ lw $v0, 0xcc($s0) -/* 9A23FC 8024141C 8C420004 */ lw $v0, 4($v0) -/* 9A2400 80241420 ACC20028 */ sw $v0, 0x28($a2) -/* 9A2404 80241424 24020001 */ addiu $v0, $zero, 1 -/* 9A2408 80241428 AE200074 */ sw $zero, 0x74($s1) -/* 9A240C 8024142C AE220070 */ sw $v0, 0x70($s1) -/* 9A2410 80241430 8FBF001C */ lw $ra, 0x1c($sp) -/* 9A2414 80241434 8FB20018 */ lw $s2, 0x18($sp) -/* 9A2418 80241438 8FB10014 */ lw $s1, 0x14($sp) -/* 9A241C 8024143C 8FB00010 */ lw $s0, 0x10($sp) -/* 9A2420 80241440 03E00008 */ jr $ra -/* 9A2424 80241444 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_03/func_8024006C_9A4650.s b/asm/nonmatchings/world/area_trd/trd_03/func_8024006C_9A4650.s deleted file mode 100644 index c1aeb7186c..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_03/func_8024006C_9A4650.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024006C_9A46BC -/* 9A46BC 8024006C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9A46C0 80240070 AFBF0010 */ sw $ra, 0x10($sp) -/* 9A46C4 80240074 8C82000C */ lw $v0, 0xc($a0) -/* 9A46C8 80240078 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 9A46CC 8024007C 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 9A46D0 80240080 8C450000 */ lw $a1, ($v0) -/* 9A46D4 80240084 0C0B2026 */ jal set_variable -/* 9A46D8 80240088 94660134 */ lhu $a2, 0x134($v1) -/* 9A46DC 8024008C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9A46E0 80240090 24020002 */ addiu $v0, $zero, 2 -/* 9A46E4 80240094 03E00008 */ jr $ra -/* 9A46E8 80240098 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9A46EC 8024009C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_03/func_802403B4_9A4650.s b/asm/nonmatchings/world/area_trd/trd_03/func_802403B4_9A4650.s deleted file mode 100644 index 64cf42927e..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_03/func_802403B4_9A4650.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403B4_9A4A04 -/* 9A4A04 802403B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A4A08 802403B8 AFB10014 */ sw $s1, 0x14($sp) -/* 9A4A0C 802403BC 0080882D */ daddu $s1, $a0, $zero -/* 9A4A10 802403C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9A4A14 802403C4 AFB00010 */ sw $s0, 0x10($sp) -/* 9A4A18 802403C8 8E300148 */ lw $s0, 0x148($s1) -/* 9A4A1C 802403CC 0C00EABB */ jal get_npc_unsafe -/* 9A4A20 802403D0 86040008 */ lh $a0, 8($s0) -/* 9A4A24 802403D4 0040202D */ daddu $a0, $v0, $zero -/* 9A4A28 802403D8 9482008E */ lhu $v0, 0x8e($a0) -/* 9A4A2C 802403DC 24030003 */ addiu $v1, $zero, 3 -/* 9A4A30 802403E0 24420001 */ addiu $v0, $v0, 1 -/* 9A4A34 802403E4 A482008E */ sh $v0, 0x8e($a0) -/* 9A4A38 802403E8 00021400 */ sll $v0, $v0, 0x10 -/* 9A4A3C 802403EC 00021403 */ sra $v0, $v0, 0x10 -/* 9A4A40 802403F0 14430003 */ bne $v0, $v1, .L80240400 -/* 9A4A44 802403F4 00000000 */ nop -/* 9A4A48 802403F8 96020086 */ lhu $v0, 0x86($s0) -/* 9A4A4C 802403FC A48200A8 */ sh $v0, 0xa8($a0) -.L80240400: -/* 9A4A50 80240400 8482008E */ lh $v0, 0x8e($a0) -/* 9A4A54 80240404 8E030080 */ lw $v1, 0x80($s0) -/* 9A4A58 80240408 0043102A */ slt $v0, $v0, $v1 -/* 9A4A5C 8024040C 14400004 */ bnez $v0, .L80240420 -/* 9A4A60 80240410 00000000 */ nop -/* 9A4A64 80240414 96020086 */ lhu $v0, 0x86($s0) -/* 9A4A68 80240418 A48200A8 */ sh $v0, 0xa8($a0) -/* 9A4A6C 8024041C AE200070 */ sw $zero, 0x70($s1) -.L80240420: -/* 9A4A70 80240420 8FBF0018 */ lw $ra, 0x18($sp) -/* 9A4A74 80240424 8FB10014 */ lw $s1, 0x14($sp) -/* 9A4A78 80240428 8FB00010 */ lw $s0, 0x10($sp) -/* 9A4A7C 8024042C 03E00008 */ jr $ra -/* 9A4A80 80240430 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_03/func_80240434_9A4650.s b/asm/nonmatchings/world/area_trd/trd_03/func_80240434_9A4650.s deleted file mode 100644 index 618c0d1e7a..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_03/func_80240434_9A4650.s +++ /dev/null @@ -1,304 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240434_9A4A84 -/* 9A4A84 80240434 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9A4A88 80240438 AFB3005C */ sw $s3, 0x5c($sp) -/* 9A4A8C 8024043C 0080982D */ daddu $s3, $a0, $zero -/* 9A4A90 80240440 AFBF0068 */ sw $ra, 0x68($sp) -/* 9A4A94 80240444 AFB50064 */ sw $s5, 0x64($sp) -/* 9A4A98 80240448 AFB40060 */ sw $s4, 0x60($sp) -/* 9A4A9C 8024044C AFB20058 */ sw $s2, 0x58($sp) -/* 9A4AA0 80240450 AFB10054 */ sw $s1, 0x54($sp) -/* 9A4AA4 80240454 AFB00050 */ sw $s0, 0x50($sp) -/* 9A4AA8 80240458 8E710148 */ lw $s1, 0x148($s3) -/* 9A4AAC 8024045C 86240008 */ lh $a0, 8($s1) -/* 9A4AB0 80240460 0C00EABB */ jal get_npc_unsafe -/* 9A4AB4 80240464 00A0802D */ daddu $s0, $a1, $zero -/* 9A4AB8 80240468 8E63000C */ lw $v1, 0xc($s3) -/* 9A4ABC 8024046C 0260202D */ daddu $a0, $s3, $zero -/* 9A4AC0 80240470 8C650000 */ lw $a1, ($v1) -/* 9A4AC4 80240474 0C0B1EAF */ jal get_variable -/* 9A4AC8 80240478 0040902D */ daddu $s2, $v0, $zero -/* 9A4ACC 8024047C AFA00028 */ sw $zero, 0x28($sp) -/* 9A4AD0 80240480 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A4AD4 80240484 8C630030 */ lw $v1, 0x30($v1) -/* 9A4AD8 80240488 AFA3002C */ sw $v1, 0x2c($sp) -/* 9A4ADC 8024048C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A4AE0 80240490 8C63001C */ lw $v1, 0x1c($v1) -/* 9A4AE4 80240494 AFA30030 */ sw $v1, 0x30($sp) -/* 9A4AE8 80240498 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A4AEC 8024049C 8C630024 */ lw $v1, 0x24($v1) -/* 9A4AF0 802404A0 AFA30034 */ sw $v1, 0x34($sp) -/* 9A4AF4 802404A4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A4AF8 802404A8 8C630028 */ lw $v1, 0x28($v1) -/* 9A4AFC 802404AC 27B50028 */ addiu $s5, $sp, 0x28 -/* 9A4B00 802404B0 AFA30038 */ sw $v1, 0x38($sp) -/* 9A4B04 802404B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A4B08 802404B8 3C0142C8 */ lui $at, 0x42c8 -/* 9A4B0C 802404BC 44810000 */ mtc1 $at, $f0 -/* 9A4B10 802404C0 8C63002C */ lw $v1, 0x2c($v1) -/* 9A4B14 802404C4 0040A02D */ daddu $s4, $v0, $zero -/* 9A4B18 802404C8 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9A4B1C 802404CC A7A00044 */ sh $zero, 0x44($sp) -/* 9A4B20 802404D0 12000009 */ beqz $s0, .L802404F8 -/* 9A4B24 802404D4 AFA3003C */ sw $v1, 0x3c($sp) -/* 9A4B28 802404D8 864300A8 */ lh $v1, 0xa8($s2) -/* 9A4B2C 802404DC 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A4B30 802404E0 AE20008C */ sw $zero, 0x8c($s1) -/* 9A4B34 802404E4 A22000B5 */ sb $zero, 0xb5($s1) -/* 9A4B38 802404E8 34420008 */ ori $v0, $v0, 8 -/* 9A4B3C 802404EC AE230084 */ sw $v1, 0x84($s1) -/* 9A4B40 802404F0 08090142 */ j .L80240508 -/* 9A4B44 802404F4 AE2200B0 */ sw $v0, 0xb0($s1) -.L802404F8: -/* 9A4B48 802404F8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A4B4C 802404FC 30420004 */ andi $v0, $v0, 4 -/* 9A4B50 80240500 10400047 */ beqz $v0, .L80240620 -/* 9A4B54 80240504 00000000 */ nop -.L80240508: -/* 9A4B58 80240508 AE600070 */ sw $zero, 0x70($s3) -/* 9A4B5C 8024050C A640008E */ sh $zero, 0x8e($s2) -/* 9A4B60 80240510 8E2300CC */ lw $v1, 0xcc($s1) -/* 9A4B64 80240514 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9A4B68 80240518 A2200007 */ sb $zero, 7($s1) -/* 9A4B6C 8024051C 8E420000 */ lw $v0, ($s2) -/* 9A4B70 80240520 8C630000 */ lw $v1, ($v1) -/* 9A4B74 80240524 00441024 */ and $v0, $v0, $a0 -/* 9A4B78 80240528 AE420000 */ sw $v0, ($s2) -/* 9A4B7C 8024052C AE430028 */ sw $v1, 0x28($s2) -/* 9A4B80 80240530 96220086 */ lhu $v0, 0x86($s1) -/* 9A4B84 80240534 A64200A8 */ sh $v0, 0xa8($s2) -/* 9A4B88 80240538 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9A4B8C 8024053C AE200090 */ sw $zero, 0x90($s1) -/* 9A4B90 80240540 8C420034 */ lw $v0, 0x34($v0) -/* 9A4B94 80240544 14400006 */ bnez $v0, .L80240560 -/* 9A4B98 80240548 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9A4B9C 8024054C 8E420000 */ lw $v0, ($s2) -/* 9A4BA0 80240550 2403FFF7 */ addiu $v1, $zero, -9 -/* 9A4BA4 80240554 34420200 */ ori $v0, $v0, 0x200 -/* 9A4BA8 80240558 0809015B */ j .L8024056C -/* 9A4BAC 8024055C 00431024 */ and $v0, $v0, $v1 -.L80240560: -/* 9A4BB0 80240560 8E420000 */ lw $v0, ($s2) -/* 9A4BB4 80240564 00431024 */ and $v0, $v0, $v1 -/* 9A4BB8 80240568 34420008 */ ori $v0, $v0, 8 -.L8024056C: -/* 9A4BBC 8024056C AE420000 */ sw $v0, ($s2) -/* 9A4BC0 80240570 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A4BC4 80240574 30420004 */ andi $v0, $v0, 4 -/* 9A4BC8 80240578 1040001E */ beqz $v0, .L802405F4 -/* 9A4BCC 8024057C 24040002 */ addiu $a0, $zero, 2 -/* 9A4BD0 80240580 0240282D */ daddu $a1, $s2, $zero -/* 9A4BD4 80240584 0000302D */ daddu $a2, $zero, $zero -/* 9A4BD8 80240588 24020063 */ addiu $v0, $zero, 0x63 -/* 9A4BDC 8024058C AE620070 */ sw $v0, 0x70($s3) -/* 9A4BE0 80240590 AE600074 */ sw $zero, 0x74($s3) -/* 9A4BE4 80240594 864300A8 */ lh $v1, 0xa8($s2) -/* 9A4BE8 80240598 3C013F80 */ lui $at, 0x3f80 -/* 9A4BEC 8024059C 44810000 */ mtc1 $at, $f0 -/* 9A4BF0 802405A0 3C014000 */ lui $at, 0x4000 -/* 9A4BF4 802405A4 44811000 */ mtc1 $at, $f2 -/* 9A4BF8 802405A8 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A4BFC 802405AC 44812000 */ mtc1 $at, $f4 -/* 9A4C00 802405B0 24020028 */ addiu $v0, $zero, 0x28 -/* 9A4C04 802405B4 AFA2001C */ sw $v0, 0x1c($sp) -/* 9A4C08 802405B8 44833000 */ mtc1 $v1, $f6 -/* 9A4C0C 802405BC 00000000 */ nop -/* 9A4C10 802405C0 468031A0 */ cvt.s.w $f6, $f6 -/* 9A4C14 802405C4 44073000 */ mfc1 $a3, $f6 -/* 9A4C18 802405C8 27A20048 */ addiu $v0, $sp, 0x48 -/* 9A4C1C 802405CC AFA20020 */ sw $v0, 0x20($sp) -/* 9A4C20 802405D0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A4C24 802405D4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A4C28 802405D8 0C01BFA4 */ jal fx_emote -/* 9A4C2C 802405DC E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A4C30 802405E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A4C34 802405E4 2403FFFB */ addiu $v1, $zero, -5 -/* 9A4C38 802405E8 00431024 */ and $v0, $v0, $v1 -/* 9A4C3C 802405EC 08090188 */ j .L80240620 -/* 9A4C40 802405F0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802405F4: -/* 9A4C44 802405F4 8E220000 */ lw $v0, ($s1) -/* 9A4C48 802405F8 3C034000 */ lui $v1, 0x4000 -/* 9A4C4C 802405FC 00431024 */ and $v0, $v0, $v1 -/* 9A4C50 80240600 10400007 */ beqz $v0, .L80240620 -/* 9A4C54 80240604 3C03BFFF */ lui $v1, 0xbfff -/* 9A4C58 80240608 2402000C */ addiu $v0, $zero, 0xc -/* 9A4C5C 8024060C AE620070 */ sw $v0, 0x70($s3) -/* 9A4C60 80240610 8E220000 */ lw $v0, ($s1) -/* 9A4C64 80240614 3463FFFF */ ori $v1, $v1, 0xffff -/* 9A4C68 80240618 00431024 */ and $v0, $v0, $v1 -/* 9A4C6C 8024061C AE220000 */ sw $v0, ($s1) -.L80240620: -/* 9A4C70 80240620 8E220090 */ lw $v0, 0x90($s1) -/* 9A4C74 80240624 1840000C */ blez $v0, .L80240658 -/* 9A4C78 80240628 2442FFFF */ addiu $v0, $v0, -1 -/* 9A4C7C 8024062C 14400087 */ bnez $v0, .L8024084C -/* 9A4C80 80240630 AE220090 */ sw $v0, 0x90($s1) -/* 9A4C84 80240634 3C03FFAA */ lui $v1, 0xffaa -/* 9A4C88 80240638 8E420028 */ lw $v0, 0x28($s2) -/* 9A4C8C 8024063C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 9A4C90 80240640 00431021 */ addu $v0, $v0, $v1 -/* 9A4C94 80240644 2C420002 */ sltiu $v0, $v0, 2 -/* 9A4C98 80240648 10400003 */ beqz $v0, .L80240658 -/* 9A4C9C 8024064C 3C020055 */ lui $v0, 0x55 -/* 9A4CA0 80240650 3442000C */ ori $v0, $v0, 0xc -/* 9A4CA4 80240654 AE420028 */ sw $v0, 0x28($s2) -.L80240658: -/* 9A4CA8 80240658 8E630070 */ lw $v1, 0x70($s3) -/* 9A4CAC 8024065C 2402000C */ addiu $v0, $zero, 0xc -/* 9A4CB0 80240660 10620048 */ beq $v1, $v0, .L80240784 -/* 9A4CB4 80240664 2862000D */ slti $v0, $v1, 0xd -/* 9A4CB8 80240668 1040000F */ beqz $v0, .L802406A8 -/* 9A4CBC 8024066C 24100001 */ addiu $s0, $zero, 1 -/* 9A4CC0 80240670 1070001E */ beq $v1, $s0, .L802406EC -/* 9A4CC4 80240674 28620002 */ slti $v0, $v1, 2 -/* 9A4CC8 80240678 10400005 */ beqz $v0, .L80240690 -/* 9A4CCC 8024067C 24020002 */ addiu $v0, $zero, 2 -/* 9A4CD0 80240680 10600015 */ beqz $v1, .L802406D8 -/* 9A4CD4 80240684 0260202D */ daddu $a0, $s3, $zero -/* 9A4CD8 80240688 080901F8 */ j .L802407E0 -/* 9A4CDC 8024068C 00000000 */ nop -.L80240690: -/* 9A4CE0 80240690 1062001C */ beq $v1, $v0, .L80240704 -/* 9A4CE4 80240694 24020003 */ addiu $v0, $zero, 3 -/* 9A4CE8 80240698 10620035 */ beq $v1, $v0, .L80240770 -/* 9A4CEC 8024069C 0260202D */ daddu $a0, $s3, $zero -/* 9A4CF0 802406A0 080901F8 */ j .L802407E0 -/* 9A4CF4 802406A4 00000000 */ nop -.L802406A8: -/* 9A4CF8 802406A8 2402000E */ addiu $v0, $zero, 0xe -/* 9A4CFC 802406AC 1062003F */ beq $v1, $v0, .L802407AC -/* 9A4D00 802406B0 0062102A */ slt $v0, $v1, $v0 -/* 9A4D04 802406B4 14400038 */ bnez $v0, .L80240798 -/* 9A4D08 802406B8 0260202D */ daddu $a0, $s3, $zero -/* 9A4D0C 802406BC 2402000F */ addiu $v0, $zero, 0xf -/* 9A4D10 802406C0 10620040 */ beq $v1, $v0, .L802407C4 -/* 9A4D14 802406C4 24020063 */ addiu $v0, $zero, 0x63 -/* 9A4D18 802406C8 10620043 */ beq $v1, $v0, .L802407D8 -/* 9A4D1C 802406CC 00000000 */ nop -/* 9A4D20 802406D0 080901F8 */ j .L802407E0 -/* 9A4D24 802406D4 00000000 */ nop -.L802406D8: -/* 9A4D28 802406D8 0280282D */ daddu $a1, $s4, $zero -/* 9A4D2C 802406DC 0C012568 */ jal func_800495A0 -/* 9A4D30 802406E0 02A0302D */ daddu $a2, $s5, $zero -/* 9A4D34 802406E4 96220086 */ lhu $v0, 0x86($s1) -/* 9A4D38 802406E8 A64200A8 */ sh $v0, 0xa8($s2) -.L802406EC: -/* 9A4D3C 802406EC 0260202D */ daddu $a0, $s3, $zero -/* 9A4D40 802406F0 0280282D */ daddu $a1, $s4, $zero -/* 9A4D44 802406F4 0C0125AE */ jal func_800496B8 -/* 9A4D48 802406F8 02A0302D */ daddu $a2, $s5, $zero -/* 9A4D4C 802406FC 080901F8 */ j .L802407E0 -/* 9A4D50 80240700 00000000 */ nop -.L80240704: -/* 9A4D54 80240704 0260202D */ daddu $a0, $s3, $zero -/* 9A4D58 80240708 0280282D */ daddu $a1, $s4, $zero -/* 9A4D5C 8024070C 0C0126D1 */ jal func_80049B44 -/* 9A4D60 80240710 02A0302D */ daddu $a2, $s5, $zero -/* 9A4D64 80240714 8E230088 */ lw $v1, 0x88($s1) -/* 9A4D68 80240718 24020006 */ addiu $v0, $zero, 6 -/* 9A4D6C 8024071C 14620014 */ bne $v1, $v0, .L80240770 -/* 9A4D70 80240720 0260202D */ daddu $a0, $s3, $zero -/* 9A4D74 80240724 0C00A67F */ jal rand_int -/* 9A4D78 80240728 24040064 */ addiu $a0, $zero, 0x64 -/* 9A4D7C 8024072C 28420021 */ slti $v0, $v0, 0x21 -/* 9A4D80 80240730 5040000F */ beql $v0, $zero, .L80240770 -/* 9A4D84 80240734 0260202D */ daddu $a0, $s3, $zero -/* 9A4D88 80240738 8E22008C */ lw $v0, 0x8c($s1) -/* 9A4D8C 8024073C 10400005 */ beqz $v0, .L80240754 -/* 9A4D90 80240740 3C020055 */ lui $v0, 0x55 -/* 9A4D94 80240744 3442002F */ ori $v0, $v0, 0x2f -/* 9A4D98 80240748 AE20008C */ sw $zero, 0x8c($s1) -/* 9A4D9C 8024074C 080901D8 */ j .L80240760 -/* 9A4DA0 80240750 A22000B5 */ sb $zero, 0xb5($s1) -.L80240754: -/* 9A4DA4 80240754 3442002E */ ori $v0, $v0, 0x2e -/* 9A4DA8 80240758 AE30008C */ sw $s0, 0x8c($s1) -/* 9A4DAC 8024075C A23000B5 */ sb $s0, 0xb5($s1) -.L80240760: -/* 9A4DB0 80240760 AE420028 */ sw $v0, 0x28($s2) -/* 9A4DB4 80240764 24020007 */ addiu $v0, $zero, 7 -/* 9A4DB8 80240768 08090213 */ j .L8024084C -/* 9A4DBC 8024076C AE220090 */ sw $v0, 0x90($s1) -.L80240770: -/* 9A4DC0 80240770 0280282D */ daddu $a1, $s4, $zero -/* 9A4DC4 80240774 0C012701 */ jal func_80049C04 -/* 9A4DC8 80240778 02A0302D */ daddu $a2, $s5, $zero -/* 9A4DCC 8024077C 080901F8 */ j .L802407E0 -/* 9A4DD0 80240780 00000000 */ nop -.L80240784: -/* 9A4DD4 80240784 0260202D */ daddu $a0, $s3, $zero -/* 9A4DD8 80240788 0280282D */ daddu $a1, $s4, $zero -/* 9A4DDC 8024078C 0C090028 */ jal func_802400A0 -/* 9A4DE0 80240790 02A0302D */ daddu $a2, $s5, $zero -/* 9A4DE4 80240794 0260202D */ daddu $a0, $s3, $zero -.L80240798: -/* 9A4DE8 80240798 0280282D */ daddu $a1, $s4, $zero -/* 9A4DEC 8024079C 0C090047 */ jal func_8024011C -/* 9A4DF0 802407A0 02A0302D */ daddu $a2, $s5, $zero -/* 9A4DF4 802407A4 080901F8 */ j .L802407E0 -/* 9A4DF8 802407A8 00000000 */ nop -.L802407AC: -/* 9A4DFC 802407AC 0260202D */ daddu $a0, $s3, $zero -/* 9A4E00 802407B0 0280282D */ daddu $a1, $s4, $zero -/* 9A4E04 802407B4 0C090094 */ jal func_80240250 -/* 9A4E08 802407B8 02A0302D */ daddu $a2, $s5, $zero -/* 9A4E0C 802407BC 080901F8 */ j .L802407E0 -/* 9A4E10 802407C0 00000000 */ nop -.L802407C4: -/* 9A4E14 802407C4 0280282D */ daddu $a1, $s4, $zero -/* 9A4E18 802407C8 0C0900ED */ jal func_802403B4 -/* 9A4E1C 802407CC 02A0302D */ daddu $a2, $s5, $zero -/* 9A4E20 802407D0 080901F8 */ j .L802407E0 -/* 9A4E24 802407D4 00000000 */ nop -.L802407D8: -/* 9A4E28 802407D8 0C0129CF */ jal func_8004A73C -/* 9A4E2C 802407DC 0260202D */ daddu $a0, $s3, $zero -.L802407E0: -/* 9A4E30 802407E0 8E230088 */ lw $v1, 0x88($s1) -/* 9A4E34 802407E4 24020006 */ addiu $v0, $zero, 6 -/* 9A4E38 802407E8 14620019 */ bne $v1, $v0, .L80240850 -/* 9A4E3C 802407EC 0000102D */ daddu $v0, $zero, $zero -/* 9A4E40 802407F0 8E22008C */ lw $v0, 0x8c($s1) -/* 9A4E44 802407F4 10400003 */ beqz $v0, .L80240804 -/* 9A4E48 802407F8 24020001 */ addiu $v0, $zero, 1 -/* 9A4E4C 802407FC 08090202 */ j .L80240808 -/* 9A4E50 80240800 A22200B5 */ sb $v0, 0xb5($s1) -.L80240804: -/* 9A4E54 80240804 A22000B5 */ sb $zero, 0xb5($s1) -.L80240808: -/* 9A4E58 80240808 8E22008C */ lw $v0, 0x8c($s1) -/* 9A4E5C 8024080C 1040000F */ beqz $v0, .L8024084C -/* 9A4E60 80240810 3C03FFAA */ lui $v1, 0xffaa -/* 9A4E64 80240814 8E420028 */ lw $v0, 0x28($s2) -/* 9A4E68 80240818 3463FFFC */ ori $v1, $v1, 0xfffc -/* 9A4E6C 8024081C 00431821 */ addu $v1, $v0, $v1 -/* 9A4E70 80240820 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9A4E74 80240824 10400009 */ beqz $v0, .L8024084C -/* 9A4E78 80240828 00031080 */ sll $v0, $v1, 2 -/* 9A4E7C 8024082C 3C018024 */ lui $at, 0x8024 -/* 9A4E80 80240830 00220821 */ addu $at, $at, $v0 -/* 9A4E84 80240834 8C223D48 */ lw $v0, 0x3d48($at) -/* 9A4E88 80240838 00400008 */ jr $v0 -/* 9A4E8C 8024083C 00000000 */ nop -/* 9A4E90 80240840 8E420028 */ lw $v0, 0x28($s2) -/* 9A4E94 80240844 24420001 */ addiu $v0, $v0, 1 -/* 9A4E98 80240848 AE420028 */ sw $v0, 0x28($s2) -.L8024084C: -/* 9A4E9C 8024084C 0000102D */ daddu $v0, $zero, $zero -.L80240850: -/* 9A4EA0 80240850 8FBF0068 */ lw $ra, 0x68($sp) -/* 9A4EA4 80240854 8FB50064 */ lw $s5, 0x64($sp) -/* 9A4EA8 80240858 8FB40060 */ lw $s4, 0x60($sp) -/* 9A4EAC 8024085C 8FB3005C */ lw $s3, 0x5c($sp) -/* 9A4EB0 80240860 8FB20058 */ lw $s2, 0x58($sp) -/* 9A4EB4 80240864 8FB10054 */ lw $s1, 0x54($sp) -/* 9A4EB8 80240868 8FB00050 */ lw $s0, 0x50($sp) -/* 9A4EBC 8024086C 03E00008 */ jr $ra -/* 9A4EC0 80240870 27BD0070 */ addiu $sp, $sp, 0x70 -/* 9A4EC4 80240874 00000000 */ nop -/* 9A4EC8 80240878 00000000 */ nop -/* 9A4ECC 8024087C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_03/func_80240880_9A4650.s b/asm/nonmatchings/world/area_trd/trd_03/func_80240880_9A4650.s deleted file mode 100644 index bba6fc7587..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_03/func_80240880_9A4650.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240880_9A4ED0 -/* 9A4ED0 80240880 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9A4ED4 80240884 AFB10014 */ sw $s1, 0x14($sp) -/* 9A4ED8 80240888 0080882D */ daddu $s1, $a0, $zero -/* 9A4EDC 8024088C AFBF0020 */ sw $ra, 0x20($sp) -/* 9A4EE0 80240890 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A4EE4 80240894 AFB20018 */ sw $s2, 0x18($sp) -/* 9A4EE8 80240898 AFB00010 */ sw $s0, 0x10($sp) -/* 9A4EEC 8024089C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 9A4EF0 802408A0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 9A4EF4 802408A4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 9A4EF8 802408A8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 9A4EFC 802408AC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 9A4F00 802408B0 8E30000C */ lw $s0, 0xc($s1) -/* 9A4F04 802408B4 8E050000 */ lw $a1, ($s0) -/* 9A4F08 802408B8 0C0B1EAF */ jal get_variable -/* 9A4F0C 802408BC 26100004 */ addiu $s0, $s0, 4 -/* 9A4F10 802408C0 8E050000 */ lw $a1, ($s0) -/* 9A4F14 802408C4 26100004 */ addiu $s0, $s0, 4 -/* 9A4F18 802408C8 0220202D */ daddu $a0, $s1, $zero -/* 9A4F1C 802408CC 0C0B1EAF */ jal get_variable -/* 9A4F20 802408D0 0040902D */ daddu $s2, $v0, $zero -/* 9A4F24 802408D4 0220202D */ daddu $a0, $s1, $zero -/* 9A4F28 802408D8 8E050000 */ lw $a1, ($s0) -/* 9A4F2C 802408DC 0C0B1EAF */ jal get_variable -/* 9A4F30 802408E0 0040982D */ daddu $s3, $v0, $zero -/* 9A4F34 802408E4 3C10800B */ lui $s0, %hi(gCameras) -/* 9A4F38 802408E8 26101D80 */ addiu $s0, $s0, %lo(gCameras) -/* 9A4F3C 802408EC C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9A4F40 802408F0 3C014387 */ lui $at, 0x4387 -/* 9A4F44 802408F4 4481B000 */ mtc1 $at, $f22 -/* 9A4F48 802408F8 00000000 */ nop -/* 9A4F4C 802408FC 46166300 */ add.s $f12, $f12, $f22 -/* 9A4F50 80240900 4482C000 */ mtc1 $v0, $f24 -/* 9A4F54 80240904 00000000 */ nop -/* 9A4F58 80240908 4680C620 */ cvt.s.w $f24, $f24 -/* 9A4F5C 8024090C 3C0142C8 */ lui $at, 0x42c8 -/* 9A4F60 80240910 4481D000 */ mtc1 $at, $f26 -/* 9A4F64 80240914 0C00A8BB */ jal sin_deg -/* 9A4F68 80240918 46186300 */ add.s $f12, $f12, $f24 -/* 9A4F6C 8024091C 461A0002 */ mul.s $f0, $f0, $f26 -/* 9A4F70 80240920 00000000 */ nop -/* 9A4F74 80240924 4492A000 */ mtc1 $s2, $f20 -/* 9A4F78 80240928 00000000 */ nop -/* 9A4F7C 8024092C 4680A520 */ cvt.s.w $f20, $f20 -/* 9A4F80 80240930 4600A000 */ add.s $f0, $f20, $f0 -/* 9A4F84 80240934 4600008D */ trunc.w.s $f2, $f0 -/* 9A4F88 80240938 E6220084 */ swc1 $f2, 0x84($s1) -/* 9A4F8C 8024093C C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9A4F90 80240940 46166300 */ add.s $f12, $f12, $f22 -/* 9A4F94 80240944 0C00A8D4 */ jal cos_deg -/* 9A4F98 80240948 46186300 */ add.s $f12, $f12, $f24 -/* 9A4F9C 8024094C 461A0002 */ mul.s $f0, $f0, $f26 -/* 9A4FA0 80240950 00000000 */ nop -/* 9A4FA4 80240954 4493B000 */ mtc1 $s3, $f22 -/* 9A4FA8 80240958 00000000 */ nop -/* 9A4FAC 8024095C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9A4FB0 80240960 4600B001 */ sub.s $f0, $f22, $f0 -/* 9A4FB4 80240964 3C0142B4 */ lui $at, 0x42b4 -/* 9A4FB8 80240968 4481E000 */ mtc1 $at, $f28 -/* 9A4FBC 8024096C 4600008D */ trunc.w.s $f2, $f0 -/* 9A4FC0 80240970 E6220088 */ swc1 $f2, 0x88($s1) -/* 9A4FC4 80240974 C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9A4FC8 80240978 461C6300 */ add.s $f12, $f12, $f28 -/* 9A4FCC 8024097C 0C00A8BB */ jal sin_deg -/* 9A4FD0 80240980 46186300 */ add.s $f12, $f12, $f24 -/* 9A4FD4 80240984 461A0002 */ mul.s $f0, $f0, $f26 -/* 9A4FD8 80240988 00000000 */ nop -/* 9A4FDC 8024098C 4600A500 */ add.s $f20, $f20, $f0 -/* 9A4FE0 80240990 4600A08D */ trunc.w.s $f2, $f20 -/* 9A4FE4 80240994 E622008C */ swc1 $f2, 0x8c($s1) -/* 9A4FE8 80240998 C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9A4FEC 8024099C 461C6300 */ add.s $f12, $f12, $f28 -/* 9A4FF0 802409A0 0C00A8D4 */ jal cos_deg -/* 9A4FF4 802409A4 46186300 */ add.s $f12, $f12, $f24 -/* 9A4FF8 802409A8 461A0002 */ mul.s $f0, $f0, $f26 -/* 9A4FFC 802409AC 00000000 */ nop -/* 9A5000 802409B0 4600B581 */ sub.s $f22, $f22, $f0 -/* 9A5004 802409B4 4600B08D */ trunc.w.s $f2, $f22 -/* 9A5008 802409B8 E6220090 */ swc1 $f2, 0x90($s1) -/* 9A500C 802409BC 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A5010 802409C0 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A5014 802409C4 8FB20018 */ lw $s2, 0x18($sp) -/* 9A5018 802409C8 8FB10014 */ lw $s1, 0x14($sp) -/* 9A501C 802409CC 8FB00010 */ lw $s0, 0x10($sp) -/* 9A5020 802409D0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 9A5024 802409D4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 9A5028 802409D8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 9A502C 802409DC D7B60030 */ ldc1 $f22, 0x30($sp) -/* 9A5030 802409E0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 9A5034 802409E4 24020002 */ addiu $v0, $zero, 2 -/* 9A5038 802409E8 03E00008 */ jr $ra -/* 9A503C 802409EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_trd/trd_04/func_80240124_9A83F0.s b/asm/nonmatchings/world/area_trd/trd_04/func_80240124_9A83F0.s deleted file mode 100644 index 6446c0744a..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/func_80240124_9A83F0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_9A8514 -/* 9A8514 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9A8518 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 9A851C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 9A8520 80240130 10A00005 */ beqz $a1, .L80240148 -/* 9A8524 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 9A8528 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 9A852C 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 9A8530 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 9A8534 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 9A8538 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 9A853C 8024014C 1440000E */ bnez $v0, .L80240188 -/* 9A8540 80240150 00000000 */ nop -/* 9A8544 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 9A8548 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 9A854C 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 9A8550 80240160 04610004 */ bgez $v1, .L80240174 -/* 9A8554 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 9A8558 80240168 3C020002 */ lui $v0, 2 -/* 9A855C 8024016C 08090061 */ j .L80240184 -/* 9A8560 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 9A8564 80240174 3C040002 */ lui $a0, 2 -/* 9A8568 80240178 0083102A */ slt $v0, $a0, $v1 -/* 9A856C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 9A8570 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 9A8574 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 9A8578 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 9A857C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 9A8580 80240190 00000000 */ nop -/* 9A8584 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 9A8588 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 9A858C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 9A8590 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 9A8594 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 9A8598 802401A8 3C020002 */ lui $v0, 2 -/* 9A859C 802401AC 08090071 */ j .L802401C4 -/* 9A85A0 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 9A85A4 802401B4 3C040002 */ lui $a0, 2 -/* 9A85A8 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 9A85AC 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 9A85B0 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 9A85B4 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 9A85B8 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 9A85BC 802401CC 1440000E */ bnez $v0, .L80240208 -/* 9A85C0 802401D0 00000000 */ nop -/* 9A85C4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 9A85C8 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 9A85CC 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 9A85D0 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 9A85D4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 9A85D8 802401E8 3C020002 */ lui $v0, 2 -/* 9A85DC 802401EC 08090081 */ j .L80240204 -/* 9A85E0 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 9A85E4 802401F4 3C040002 */ lui $a0, 2 -/* 9A85E8 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 9A85EC 802401FC 10400002 */ beqz $v0, .L80240208 -/* 9A85F0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 9A85F4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 9A85F8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 9A85FC 8024020C 1440000E */ bnez $v0, .L80240248 -/* 9A8600 80240210 00000000 */ nop -/* 9A8604 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 9A8608 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 9A860C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 9A8610 80240220 04610004 */ bgez $v1, .L80240234 -/* 9A8614 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 9A8618 80240228 3C020002 */ lui $v0, 2 -/* 9A861C 8024022C 08090091 */ j .L80240244 -/* 9A8620 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 9A8624 80240234 3C040002 */ lui $a0, 2 -/* 9A8628 80240238 0083102A */ slt $v0, $a0, $v1 -/* 9A862C 8024023C 10400002 */ beqz $v0, .L80240248 -/* 9A8630 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 9A8634 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 9A8638 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 9A863C 8024024C 0C046F07 */ jal set_main_pan_u -/* 9A8640 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 9A8644 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 9A8648 80240258 0C046F0D */ jal set_main_pan_v -/* 9A864C 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 9A8650 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 9A8654 80240264 0C046F13 */ jal set_aux_pan_u -/* 9A8658 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 9A865C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 9A8660 80240270 0C046F19 */ jal set_aux_pan_v -/* 9A8664 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 9A8668 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 9A866C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 9A8670 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 9A8674 80240284 24420001 */ addiu $v0, $v0, 1 -/* 9A8678 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 9A867C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 9A8680 80240290 24630001 */ addiu $v1, $v1, 1 -/* 9A8684 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 9A8688 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 9A868C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 9A8690 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 9A8694 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 9A8698 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 9A869C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 9A86A0 802402B0 14600002 */ bnez $v1, .L802402BC -/* 9A86A4 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 9A86A8 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 9A86AC 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 9A86B0 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 9A86B4 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 9A86B8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 9A86BC 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 9A86C0 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 9A86C4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 9A86C8 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 9A86CC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 9A86D0 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 9A86D4 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 9A86D8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 9A86DC 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 9A86E0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 9A86E4 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 9A86E8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 9A86EC 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 9A86F0 80240300 0000102D */ daddu $v0, $zero, $zero -/* 9A86F4 80240304 03E00008 */ jr $ra -/* 9A86F8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9A86FC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/func_80240310_9A83F0.s b/asm/nonmatchings/world/area_trd/trd_04/func_80240310_9A83F0.s deleted file mode 100644 index 7158396153..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/func_80240310_9A83F0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_9A8700 -/* 9A8700 80240310 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9A8704 80240314 AFBF0010 */ sw $ra, 0x10($sp) -/* 9A8708 80240318 0C04417A */ jal get_entity_by_index -/* 9A870C 8024031C 8C840084 */ lw $a0, 0x84($a0) -/* 9A8710 80240320 0040182D */ daddu $v1, $v0, $zero -/* 9A8714 80240324 8C640000 */ lw $a0, ($v1) -/* 9A8718 80240328 3C050010 */ lui $a1, 0x10 -/* 9A871C 8024032C 00852025 */ or $a0, $a0, $a1 -/* 9A8720 80240330 AC640000 */ sw $a0, ($v1) -/* 9A8724 80240334 8FBF0010 */ lw $ra, 0x10($sp) -/* 9A8728 80240338 24020002 */ addiu $v0, $zero, 2 -/* 9A872C 8024033C 03E00008 */ jr $ra -/* 9A8730 80240340 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_04/func_80240344_9A83F0.s b/asm/nonmatchings/world/area_trd/trd_04/func_80240344_9A83F0.s deleted file mode 100644 index bcea554a52..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/func_80240344_9A83F0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240344_9A8734 -/* 9A8734 80240344 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9A8738 80240348 AFB10014 */ sw $s1, 0x14($sp) -/* 9A873C 8024034C 0080882D */ daddu $s1, $a0, $zero -/* 9A8740 80240350 AFBF0020 */ sw $ra, 0x20($sp) -/* 9A8744 80240354 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A8748 80240358 AFB20018 */ sw $s2, 0x18($sp) -/* 9A874C 8024035C AFB00010 */ sw $s0, 0x10($sp) -/* 9A8750 80240360 8E30000C */ lw $s0, 0xc($s1) -/* 9A8754 80240364 8E050000 */ lw $a1, ($s0) -/* 9A8758 80240368 0C0B1EAF */ jal get_variable -/* 9A875C 8024036C 26100004 */ addiu $s0, $s0, 4 -/* 9A8760 80240370 8E050000 */ lw $a1, ($s0) -/* 9A8764 80240374 26100004 */ addiu $s0, $s0, 4 -/* 9A8768 80240378 0220202D */ daddu $a0, $s1, $zero -/* 9A876C 8024037C 0C0B1EAF */ jal get_variable -/* 9A8770 80240380 0040982D */ daddu $s3, $v0, $zero -/* 9A8774 80240384 8E050000 */ lw $a1, ($s0) -/* 9A8778 80240388 26100004 */ addiu $s0, $s0, 4 -/* 9A877C 8024038C 0220202D */ daddu $a0, $s1, $zero -/* 9A8780 80240390 0C0B1EAF */ jal get_variable -/* 9A8784 80240394 0040902D */ daddu $s2, $v0, $zero -/* 9A8788 80240398 0220202D */ daddu $a0, $s1, $zero -/* 9A878C 8024039C 8E050000 */ lw $a1, ($s0) -/* 9A8790 802403A0 0C0B1EAF */ jal get_variable -/* 9A8794 802403A4 0040882D */ daddu $s1, $v0, $zero -/* 9A8798 802403A8 0260202D */ daddu $a0, $s3, $zero -/* 9A879C 802403AC 0C04417A */ jal get_entity_by_index -/* 9A87A0 802403B0 0040802D */ daddu $s0, $v0, $zero -/* 9A87A4 802403B4 0040182D */ daddu $v1, $v0, $zero -/* 9A87A8 802403B8 44920000 */ mtc1 $s2, $f0 -/* 9A87AC 802403BC 00000000 */ nop -/* 9A87B0 802403C0 46800020 */ cvt.s.w $f0, $f0 -/* 9A87B4 802403C4 E4600048 */ swc1 $f0, 0x48($v1) -/* 9A87B8 802403C8 44910000 */ mtc1 $s1, $f0 -/* 9A87BC 802403CC 00000000 */ nop -/* 9A87C0 802403D0 46800020 */ cvt.s.w $f0, $f0 -/* 9A87C4 802403D4 E460004C */ swc1 $f0, 0x4c($v1) -/* 9A87C8 802403D8 44900000 */ mtc1 $s0, $f0 -/* 9A87CC 802403DC 00000000 */ nop -/* 9A87D0 802403E0 46800020 */ cvt.s.w $f0, $f0 -/* 9A87D4 802403E4 E4600050 */ swc1 $f0, 0x50($v1) -/* 9A87D8 802403E8 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A87DC 802403EC 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A87E0 802403F0 8FB20018 */ lw $s2, 0x18($sp) -/* 9A87E4 802403F4 8FB10014 */ lw $s1, 0x14($sp) -/* 9A87E8 802403F8 8FB00010 */ lw $s0, 0x10($sp) -/* 9A87EC 802403FC 24020002 */ addiu $v0, $zero, 2 -/* 9A87F0 80240400 03E00008 */ jr $ra -/* 9A87F4 80240404 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_04/func_802404B0_9A83F0.s b/asm/nonmatchings/world/area_trd/trd_04/func_802404B0_9A83F0.s deleted file mode 100644 index eba864d34a..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/func_802404B0_9A83F0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404B0_9A88A0 -/* 9A88A0 802404B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A88A4 802404B4 AFB20018 */ sw $s2, 0x18($sp) -/* 9A88A8 802404B8 0080902D */ daddu $s2, $a0, $zero -/* 9A88AC 802404BC AFBF001C */ sw $ra, 0x1c($sp) -/* 9A88B0 802404C0 AFB10014 */ sw $s1, 0x14($sp) -/* 9A88B4 802404C4 AFB00010 */ sw $s0, 0x10($sp) -/* 9A88B8 802404C8 8E510148 */ lw $s1, 0x148($s2) -/* 9A88BC 802404CC 0C00EABB */ jal get_npc_unsafe -/* 9A88C0 802404D0 86240008 */ lh $a0, 8($s1) -/* 9A88C4 802404D4 0040802D */ daddu $s0, $v0, $zero -/* 9A88C8 802404D8 8E2300CC */ lw $v1, 0xcc($s1) -/* 9A88CC 802404DC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A88D0 802404E0 8C630020 */ lw $v1, 0x20($v1) -/* 9A88D4 802404E4 AE030028 */ sw $v1, 0x28($s0) -/* 9A88D8 802404E8 96220076 */ lhu $v0, 0x76($s1) -/* 9A88DC 802404EC A602008E */ sh $v0, 0x8e($s0) -/* 9A88E0 802404F0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9A88E4 802404F4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9A88E8 802404F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A88EC 802404FC 8C460028 */ lw $a2, 0x28($v0) -/* 9A88F0 80240500 0C00A720 */ jal atan2 -/* 9A88F4 80240504 8C470030 */ lw $a3, 0x30($v0) -/* 9A88F8 80240508 2402000D */ addiu $v0, $zero, 0xd -/* 9A88FC 8024050C E600000C */ swc1 $f0, 0xc($s0) -/* 9A8900 80240510 AE420070 */ sw $v0, 0x70($s2) -/* 9A8904 80240514 8FBF001C */ lw $ra, 0x1c($sp) -/* 9A8908 80240518 8FB20018 */ lw $s2, 0x18($sp) -/* 9A890C 8024051C 8FB10014 */ lw $s1, 0x14($sp) -/* 9A8910 80240520 8FB00010 */ lw $s0, 0x10($sp) -/* 9A8914 80240524 03E00008 */ jr $ra -/* 9A8918 80240528 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/func_80240660_9A83F0.s b/asm/nonmatchings/world/area_trd/trd_04/func_80240660_9A83F0.s deleted file mode 100644 index 2b8acdb7d2..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/func_80240660_9A83F0.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240660_9A8A50 -/* 9A8A50 80240660 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9A8A54 80240664 AFB3003C */ sw $s3, 0x3c($sp) -/* 9A8A58 80240668 0080982D */ daddu $s3, $a0, $zero -/* 9A8A5C 8024066C AFBF0040 */ sw $ra, 0x40($sp) -/* 9A8A60 80240670 AFB20038 */ sw $s2, 0x38($sp) -/* 9A8A64 80240674 AFB10034 */ sw $s1, 0x34($sp) -/* 9A8A68 80240678 AFB00030 */ sw $s0, 0x30($sp) -/* 9A8A6C 8024067C 8E710148 */ lw $s1, 0x148($s3) -/* 9A8A70 80240680 0C00EABB */ jal get_npc_unsafe -/* 9A8A74 80240684 86240008 */ lh $a0, 8($s1) -/* 9A8A78 80240688 0040802D */ daddu $s0, $v0, $zero -/* 9A8A7C 8024068C 8E22007C */ lw $v0, 0x7c($s1) -/* 9A8A80 80240690 8603008E */ lh $v1, 0x8e($s0) -/* 9A8A84 80240694 2442FFFF */ addiu $v0, $v0, -1 -/* 9A8A88 80240698 14620012 */ bne $v1, $v0, .L802406E4 -/* 9A8A8C 8024069C 00000000 */ nop -/* 9A8A90 802406A0 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9A8A94 802406A4 4600020D */ trunc.w.s $f8, $f0 -/* 9A8A98 802406A8 44024000 */ mfc1 $v0, $f8 -/* 9A8A9C 802406AC 00000000 */ nop -/* 9A8AA0 802406B0 A6220010 */ sh $v0, 0x10($s1) -/* 9A8AA4 802406B4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9A8AA8 802406B8 4600020D */ trunc.w.s $f8, $f0 -/* 9A8AAC 802406BC 44024000 */ mfc1 $v0, $f8 -/* 9A8AB0 802406C0 00000000 */ nop -/* 9A8AB4 802406C4 A6220012 */ sh $v0, 0x12($s1) -/* 9A8AB8 802406C8 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9A8ABC 802406CC 24020001 */ addiu $v0, $zero, 1 -/* 9A8AC0 802406D0 A2220007 */ sb $v0, 7($s1) -/* 9A8AC4 802406D4 4600020D */ trunc.w.s $f8, $f0 -/* 9A8AC8 802406D8 44024000 */ mfc1 $v0, $f8 -/* 9A8ACC 802406DC 00000000 */ nop -/* 9A8AD0 802406E0 A6220014 */ sh $v0, 0x14($s1) -.L802406E4: -/* 9A8AD4 802406E4 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9A8AD8 802406E8 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9A8ADC 802406EC C6040040 */ lwc1 $f4, 0x40($s0) -/* 9A8AE0 802406F0 C6060018 */ lwc1 $f6, 0x18($s0) -/* 9A8AE4 802406F4 E7A00020 */ swc1 $f0, 0x20($sp) -/* 9A8AE8 802406F8 E7A20024 */ swc1 $f2, 0x24($sp) -/* 9A8AEC 802406FC E7A40028 */ swc1 $f4, 0x28($sp) -/* 9A8AF0 80240700 E7A60010 */ swc1 $f6, 0x10($sp) -/* 9A8AF4 80240704 C600000C */ lwc1 $f0, 0xc($s0) -/* 9A8AF8 80240708 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9A8AFC 8024070C 860200A8 */ lh $v0, 0xa8($s0) -/* 9A8B00 80240710 27A50020 */ addiu $a1, $sp, 0x20 -/* 9A8B04 80240714 44820000 */ mtc1 $v0, $f0 -/* 9A8B08 80240718 00000000 */ nop -/* 9A8B0C 8024071C 46800020 */ cvt.s.w $f0, $f0 -/* 9A8B10 80240720 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9A8B14 80240724 860200A6 */ lh $v0, 0xa6($s0) -/* 9A8B18 80240728 27A60024 */ addiu $a2, $sp, 0x24 -/* 9A8B1C 8024072C 44820000 */ mtc1 $v0, $f0 -/* 9A8B20 80240730 00000000 */ nop -/* 9A8B24 80240734 46800020 */ cvt.s.w $f0, $f0 -/* 9A8B28 80240738 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 9A8B2C 8024073C 8E040080 */ lw $a0, 0x80($s0) -/* 9A8B30 80240740 0C037711 */ jal func_800DDC44 -/* 9A8B34 80240744 27A70028 */ addiu $a3, $sp, 0x28 -/* 9A8B38 80240748 0040902D */ daddu $s2, $v0, $zero -/* 9A8B3C 8024074C 16400005 */ bnez $s2, .L80240764 -/* 9A8B40 80240750 00000000 */ nop -/* 9A8B44 80240754 8E050018 */ lw $a1, 0x18($s0) -/* 9A8B48 80240758 8E06000C */ lw $a2, 0xc($s0) -/* 9A8B4C 8024075C 0C00EA95 */ jal npc_move_heading -/* 9A8B50 80240760 0200202D */ daddu $a0, $s0, $zero -.L80240764: -/* 9A8B54 80240764 8602008E */ lh $v0, 0x8e($s0) -/* 9A8B58 80240768 9603008E */ lhu $v1, 0x8e($s0) -/* 9A8B5C 8024076C 18400007 */ blez $v0, .L8024078C -/* 9A8B60 80240770 2462FFFF */ addiu $v0, $v1, -1 -/* 9A8B64 80240774 A602008E */ sh $v0, 0x8e($s0) -/* 9A8B68 80240778 00021400 */ sll $v0, $v0, 0x10 -/* 9A8B6C 8024077C 18400003 */ blez $v0, .L8024078C -/* 9A8B70 80240780 00000000 */ nop -/* 9A8B74 80240784 12400008 */ beqz $s2, .L802407A8 -/* 9A8B78 80240788 00000000 */ nop -.L8024078C: -/* 9A8B7C 8024078C 8E2200CC */ lw $v0, 0xcc($s1) -/* 9A8B80 80240790 A2200007 */ sb $zero, 7($s1) -/* 9A8B84 80240794 8C420028 */ lw $v0, 0x28($v0) -/* 9A8B88 80240798 A600008E */ sh $zero, 0x8e($s0) -/* 9A8B8C 8024079C AE020028 */ sw $v0, 0x28($s0) -/* 9A8B90 802407A0 2402000F */ addiu $v0, $zero, 0xf -/* 9A8B94 802407A4 AE620070 */ sw $v0, 0x70($s3) -.L802407A8: -/* 9A8B98 802407A8 8FBF0040 */ lw $ra, 0x40($sp) -/* 9A8B9C 802407AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 9A8BA0 802407B0 8FB20038 */ lw $s2, 0x38($sp) -/* 9A8BA4 802407B4 8FB10034 */ lw $s1, 0x34($sp) -/* 9A8BA8 802407B8 8FB00030 */ lw $s0, 0x30($sp) -/* 9A8BAC 802407BC 03E00008 */ jr $ra -/* 9A8BB0 802407C0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_04/func_80240C84_9A83F0.s b/asm/nonmatchings/world/area_trd/trd_04/func_80240C84_9A83F0.s deleted file mode 100644 index 2193b27779..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/func_80240C84_9A83F0.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C84_9A9074 -/* 9A9074 80240C84 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9A9078 80240C88 AFB50024 */ sw $s5, 0x24($sp) -/* 9A907C 80240C8C 0080A82D */ daddu $s5, $a0, $zero -/* 9A9080 80240C90 AFBF002C */ sw $ra, 0x2c($sp) -/* 9A9084 80240C94 AFB60028 */ sw $s6, 0x28($sp) -/* 9A9088 80240C98 AFB40020 */ sw $s4, 0x20($sp) -/* 9A908C 80240C9C AFB3001C */ sw $s3, 0x1c($sp) -/* 9A9090 80240CA0 AFB20018 */ sw $s2, 0x18($sp) -/* 9A9094 80240CA4 AFB10014 */ sw $s1, 0x14($sp) -/* 9A9098 80240CA8 AFB00010 */ sw $s0, 0x10($sp) -/* 9A909C 80240CAC F7B80040 */ sdc1 $f24, 0x40($sp) -/* 9A90A0 80240CB0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 9A90A4 80240CB4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9A90A8 80240CB8 8EB30148 */ lw $s3, 0x148($s5) -/* 9A90AC 80240CBC 86640008 */ lh $a0, 8($s3) -/* 9A90B0 80240CC0 0C00EABB */ jal get_npc_unsafe -/* 9A90B4 80240CC4 00A0B02D */ daddu $s6, $a1, $zero -/* 9A90B8 80240CC8 0040A02D */ daddu $s4, $v0, $zero -/* 9A90BC 80240CCC AEA00074 */ sw $zero, 0x74($s5) -/* 9A90C0 80240CD0 C6980038 */ lwc1 $f24, 0x38($s4) -/* 9A90C4 80240CD4 C6960040 */ lwc1 $f22, 0x40($s4) -/* 9A90C8 80240CD8 0000902D */ daddu $s2, $zero, $zero -/* 9A90CC 80240CDC AEA00078 */ sw $zero, 0x78($s5) -/* 9A90D0 80240CE0 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9A90D4 80240CE4 8C620000 */ lw $v0, ($v1) -/* 9A90D8 80240CE8 3C0146FF */ lui $at, 0x46ff -/* 9A90DC 80240CEC 3421FE00 */ ori $at, $at, 0xfe00 -/* 9A90E0 80240CF0 4481A000 */ mtc1 $at, $f20 -/* 9A90E4 80240CF4 18400018 */ blez $v0, .L80240D58 -/* 9A90E8 80240CF8 0240802D */ daddu $s0, $s2, $zero -/* 9A90EC 80240CFC 0240882D */ daddu $s1, $s2, $zero -.L80240D00: -/* 9A90F0 80240D00 02231021 */ addu $v0, $s1, $v1 -/* 9A90F4 80240D04 4600C306 */ mov.s $f12, $f24 -/* 9A90F8 80240D08 C4440004 */ lwc1 $f4, 4($v0) -/* 9A90FC 80240D0C 46802120 */ cvt.s.w $f4, $f4 -/* 9A9100 80240D10 44062000 */ mfc1 $a2, $f4 -/* 9A9104 80240D14 C444000C */ lwc1 $f4, 0xc($v0) -/* 9A9108 80240D18 46802120 */ cvt.s.w $f4, $f4 -/* 9A910C 80240D1C 44072000 */ mfc1 $a3, $f4 -/* 9A9110 80240D20 0C00A7B5 */ jal dist2D -/* 9A9114 80240D24 4600B386 */ mov.s $f14, $f22 -/* 9A9118 80240D28 4614003C */ c.lt.s $f0, $f20 -/* 9A911C 80240D2C 00000000 */ nop -/* 9A9120 80240D30 45000003 */ bc1f .L80240D40 -/* 9A9124 80240D34 2631000C */ addiu $s1, $s1, 0xc -/* 9A9128 80240D38 46000506 */ mov.s $f20, $f0 -/* 9A912C 80240D3C AEB20078 */ sw $s2, 0x78($s5) -.L80240D40: -/* 9A9130 80240D40 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9A9134 80240D44 26100001 */ addiu $s0, $s0, 1 -/* 9A9138 80240D48 8C620000 */ lw $v0, ($v1) -/* 9A913C 80240D4C 0202102A */ slt $v0, $s0, $v0 -/* 9A9140 80240D50 1440FFEB */ bnez $v0, .L80240D00 -/* 9A9144 80240D54 26520001 */ addiu $s2, $s2, 1 -.L80240D58: -/* 9A9148 80240D58 8E6200CC */ lw $v0, 0xcc($s3) -/* 9A914C 80240D5C 8C420004 */ lw $v0, 4($v0) -/* 9A9150 80240D60 AE820028 */ sw $v0, 0x28($s4) -/* 9A9154 80240D64 8E6200D0 */ lw $v0, 0xd0($s3) -/* 9A9158 80240D68 8C42007C */ lw $v0, 0x7c($v0) -/* 9A915C 80240D6C 04410004 */ bgez $v0, .L80240D80 -/* 9A9160 80240D70 00000000 */ nop -/* 9A9164 80240D74 C6C00000 */ lwc1 $f0, ($s6) -/* 9A9168 80240D78 08090368 */ j .L80240DA0 -/* 9A916C 80240D7C E6800018 */ swc1 $f0, 0x18($s4) -.L80240D80: -/* 9A9170 80240D80 3C018024 */ lui $at, 0x8024 -/* 9A9174 80240D84 D4225F40 */ ldc1 $f2, 0x5f40($at) -/* 9A9178 80240D88 44820000 */ mtc1 $v0, $f0 -/* 9A917C 80240D8C 00000000 */ nop -/* 9A9180 80240D90 46800021 */ cvt.d.w $f0, $f0 -/* 9A9184 80240D94 46220003 */ div.d $f0, $f0, $f2 -/* 9A9188 80240D98 46200020 */ cvt.s.d $f0, $f0 -/* 9A918C 80240D9C E6800018 */ swc1 $f0, 0x18($s4) -.L80240DA0: -/* 9A9190 80240DA0 24020001 */ addiu $v0, $zero, 1 -/* 9A9194 80240DA4 AEA20070 */ sw $v0, 0x70($s5) -/* 9A9198 80240DA8 8FBF002C */ lw $ra, 0x2c($sp) -/* 9A919C 80240DAC 8FB60028 */ lw $s6, 0x28($sp) -/* 9A91A0 80240DB0 8FB50024 */ lw $s5, 0x24($sp) -/* 9A91A4 80240DB4 8FB40020 */ lw $s4, 0x20($sp) -/* 9A91A8 80240DB8 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A91AC 80240DBC 8FB20018 */ lw $s2, 0x18($sp) -/* 9A91B0 80240DC0 8FB10014 */ lw $s1, 0x14($sp) -/* 9A91B4 80240DC4 8FB00010 */ lw $s0, 0x10($sp) -/* 9A91B8 80240DC8 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 9A91BC 80240DCC D7B60038 */ ldc1 $f22, 0x38($sp) -/* 9A91C0 80240DD0 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9A91C4 80240DD4 03E00008 */ jr $ra -/* 9A91C8 80240DD8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_04/func_80240DDC_9A83F0.s b/asm/nonmatchings/world/area_trd/trd_04/func_80240DDC_9A83F0.s deleted file mode 100644 index ee83d429b0..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/func_80240DDC_9A83F0.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DDC_9A91CC -/* 9A91CC 80240DDC 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 9A91D0 80240DE0 AFB20038 */ sw $s2, 0x38($sp) -/* 9A91D4 80240DE4 0080902D */ daddu $s2, $a0, $zero -/* 9A91D8 80240DE8 AFBF0044 */ sw $ra, 0x44($sp) -/* 9A91DC 80240DEC AFB40040 */ sw $s4, 0x40($sp) -/* 9A91E0 80240DF0 AFB3003C */ sw $s3, 0x3c($sp) -/* 9A91E4 80240DF4 AFB10034 */ sw $s1, 0x34($sp) -/* 9A91E8 80240DF8 AFB00030 */ sw $s0, 0x30($sp) -/* 9A91EC 80240DFC F7B60050 */ sdc1 $f22, 0x50($sp) -/* 9A91F0 80240E00 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 9A91F4 80240E04 8E510148 */ lw $s1, 0x148($s2) -/* 9A91F8 80240E08 00A0982D */ daddu $s3, $a1, $zero -/* 9A91FC 80240E0C 86240008 */ lh $a0, 8($s1) -/* 9A9200 80240E10 0C00EABB */ jal get_npc_unsafe -/* 9A9204 80240E14 00C0A02D */ daddu $s4, $a2, $zero -/* 9A9208 80240E18 8E630014 */ lw $v1, 0x14($s3) -/* 9A920C 80240E1C 04600030 */ bltz $v1, .L80240EE0 -/* 9A9210 80240E20 0040802D */ daddu $s0, $v0, $zero -/* 9A9214 80240E24 8E420074 */ lw $v0, 0x74($s2) -/* 9A9218 80240E28 1C40002C */ bgtz $v0, .L80240EDC -/* 9A921C 80240E2C 2442FFFF */ addiu $v0, $v0, -1 -/* 9A9220 80240E30 0280202D */ daddu $a0, $s4, $zero -/* 9A9224 80240E34 AE430074 */ sw $v1, 0x74($s2) -/* 9A9228 80240E38 AFA00010 */ sw $zero, 0x10($sp) -/* 9A922C 80240E3C 8E66000C */ lw $a2, 0xc($s3) -/* 9A9230 80240E40 8E670010 */ lw $a3, 0x10($s3) -/* 9A9234 80240E44 0C01242D */ jal func_800490B4 -/* 9A9238 80240E48 0220282D */ daddu $a1, $s1, $zero -/* 9A923C 80240E4C 10400021 */ beqz $v0, .L80240ED4 -/* 9A9240 80240E50 0000202D */ daddu $a0, $zero, $zero -/* 9A9244 80240E54 0200282D */ daddu $a1, $s0, $zero -/* 9A9248 80240E58 0000302D */ daddu $a2, $zero, $zero -/* 9A924C 80240E5C 860300A8 */ lh $v1, 0xa8($s0) -/* 9A9250 80240E60 3C013F80 */ lui $at, 0x3f80 -/* 9A9254 80240E64 44810000 */ mtc1 $at, $f0 -/* 9A9258 80240E68 3C014000 */ lui $at, 0x4000 -/* 9A925C 80240E6C 44811000 */ mtc1 $at, $f2 -/* 9A9260 80240E70 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A9264 80240E74 44812000 */ mtc1 $at, $f4 -/* 9A9268 80240E78 2402000F */ addiu $v0, $zero, 0xf -/* 9A926C 80240E7C AFA2001C */ sw $v0, 0x1c($sp) -/* 9A9270 80240E80 44833000 */ mtc1 $v1, $f6 -/* 9A9274 80240E84 00000000 */ nop -/* 9A9278 80240E88 468031A0 */ cvt.s.w $f6, $f6 -/* 9A927C 80240E8C 44073000 */ mfc1 $a3, $f6 -/* 9A9280 80240E90 27A20028 */ addiu $v0, $sp, 0x28 -/* 9A9284 80240E94 AFA20020 */ sw $v0, 0x20($sp) -/* 9A9288 80240E98 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A928C 80240E9C E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A9290 80240EA0 0C01BFA4 */ jal fx_emote -/* 9A9294 80240EA4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A9298 80240EA8 0200202D */ daddu $a0, $s0, $zero -/* 9A929C 80240EAC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9A92A0 80240EB0 0C012530 */ jal func_800494C0 -/* 9A92A4 80240EB4 3C060020 */ lui $a2, 0x20 -/* 9A92A8 80240EB8 8E220018 */ lw $v0, 0x18($s1) -/* 9A92AC 80240EBC 9442002A */ lhu $v0, 0x2a($v0) -/* 9A92B0 80240EC0 30420001 */ andi $v0, $v0, 1 -/* 9A92B4 80240EC4 14400064 */ bnez $v0, .L80241058 -/* 9A92B8 80240EC8 2402000A */ addiu $v0, $zero, 0xa -/* 9A92BC 80240ECC 08090416 */ j .L80241058 -/* 9A92C0 80240ED0 2402000C */ addiu $v0, $zero, 0xc -.L80240ED4: -/* 9A92C4 80240ED4 8E420074 */ lw $v0, 0x74($s2) -/* 9A92C8 80240ED8 2442FFFF */ addiu $v0, $v0, -1 -.L80240EDC: -/* 9A92CC 80240EDC AE420074 */ sw $v0, 0x74($s2) -.L80240EE0: -/* 9A92D0 80240EE0 8602008C */ lh $v0, 0x8c($s0) -/* 9A92D4 80240EE4 1440005D */ bnez $v0, .L8024105C -/* 9A92D8 80240EE8 00000000 */ nop -/* 9A92DC 80240EEC C6000018 */ lwc1 $f0, 0x18($s0) -/* 9A92E0 80240EF0 3C014010 */ lui $at, 0x4010 -/* 9A92E4 80240EF4 44811800 */ mtc1 $at, $f3 -/* 9A92E8 80240EF8 44801000 */ mtc1 $zero, $f2 -/* 9A92EC 80240EFC 46000021 */ cvt.d.s $f0, $f0 -/* 9A92F0 80240F00 4622003C */ c.lt.d $f0, $f2 -/* 9A92F4 80240F04 00000000 */ nop -/* 9A92F8 80240F08 45000003 */ bc1f .L80240F18 -/* 9A92FC 80240F0C 0200202D */ daddu $a0, $s0, $zero -/* 9A9300 80240F10 080903C7 */ j .L80240F1C -/* 9A9304 80240F14 0000282D */ daddu $a1, $zero, $zero -.L80240F18: -/* 9A9308 80240F18 24050001 */ addiu $a1, $zero, 1 -.L80240F1C: -/* 9A930C 80240F1C 0C00F598 */ jal func_8003D660 -/* 9A9310 80240F20 00000000 */ nop -/* 9A9314 80240F24 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A9318 80240F28 8E430078 */ lw $v1, 0x78($s2) -/* 9A931C 80240F2C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A9320 80240F30 00031040 */ sll $v0, $v1, 1 -/* 9A9324 80240F34 00431021 */ addu $v0, $v0, $v1 -/* 9A9328 80240F38 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A932C 80240F3C 00021080 */ sll $v0, $v0, 2 -/* 9A9330 80240F40 00431021 */ addu $v0, $v0, $v1 -/* 9A9334 80240F44 C4560004 */ lwc1 $f22, 4($v0) -/* 9A9338 80240F48 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9A933C 80240F4C C454000C */ lwc1 $f20, 0xc($v0) -/* 9A9340 80240F50 4680A520 */ cvt.s.w $f20, $f20 -/* 9A9344 80240F54 4406B000 */ mfc1 $a2, $f22 -/* 9A9348 80240F58 4407A000 */ mfc1 $a3, $f20 -/* 9A934C 80240F5C 0C00A720 */ jal atan2 -/* 9A9350 80240F60 00000000 */ nop -/* 9A9354 80240F64 8E050018 */ lw $a1, 0x18($s0) -/* 9A9358 80240F68 44060000 */ mfc1 $a2, $f0 -/* 9A935C 80240F6C 0200202D */ daddu $a0, $s0, $zero -/* 9A9360 80240F70 0C00EA95 */ jal npc_move_heading -/* 9A9364 80240F74 AE06000C */ sw $a2, 0xc($s0) -/* 9A9368 80240F78 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A936C 80240F7C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A9370 80240F80 4406B000 */ mfc1 $a2, $f22 -/* 9A9374 80240F84 4407A000 */ mfc1 $a3, $f20 -/* 9A9378 80240F88 0C00A7B5 */ jal dist2D -/* 9A937C 80240F8C 00000000 */ nop -/* 9A9380 80240F90 C6020018 */ lwc1 $f2, 0x18($s0) -/* 9A9384 80240F94 4602003E */ c.le.s $f0, $f2 -/* 9A9388 80240F98 00000000 */ nop -/* 9A938C 80240F9C 4500002F */ bc1f .L8024105C -/* 9A9390 80240FA0 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9A9394 80240FA4 24020002 */ addiu $v0, $zero, 2 -/* 9A9398 80240FA8 0C00A67F */ jal rand_int -/* 9A939C 80240FAC AE420070 */ sw $v0, 0x70($s2) -/* 9A93A0 80240FB0 3C035555 */ lui $v1, 0x5555 -/* 9A93A4 80240FB4 34635556 */ ori $v1, $v1, 0x5556 -/* 9A93A8 80240FB8 00430018 */ mult $v0, $v1 -/* 9A93AC 80240FBC 000227C3 */ sra $a0, $v0, 0x1f -/* 9A93B0 80240FC0 00004010 */ mfhi $t0 -/* 9A93B4 80240FC4 01042023 */ subu $a0, $t0, $a0 -/* 9A93B8 80240FC8 00041840 */ sll $v1, $a0, 1 -/* 9A93BC 80240FCC 00641821 */ addu $v1, $v1, $a0 -/* 9A93C0 80240FD0 00431023 */ subu $v0, $v0, $v1 -/* 9A93C4 80240FD4 24430002 */ addiu $v1, $v0, 2 -/* 9A93C8 80240FD8 AE430074 */ sw $v1, 0x74($s2) -/* 9A93CC 80240FDC 8E62002C */ lw $v0, 0x2c($s3) -/* 9A93D0 80240FE0 18400009 */ blez $v0, .L80241008 -/* 9A93D4 80240FE4 24020004 */ addiu $v0, $zero, 4 -/* 9A93D8 80240FE8 8E620004 */ lw $v0, 4($s3) -/* 9A93DC 80240FEC 18400006 */ blez $v0, .L80241008 -/* 9A93E0 80240FF0 24020004 */ addiu $v0, $zero, 4 -/* 9A93E4 80240FF4 8E620008 */ lw $v0, 8($s3) -/* 9A93E8 80240FF8 18400003 */ blez $v0, .L80241008 -/* 9A93EC 80240FFC 24020004 */ addiu $v0, $zero, 4 -/* 9A93F0 80241000 14600002 */ bnez $v1, .L8024100C -/* 9A93F4 80241004 00000000 */ nop -.L80241008: -/* 9A93F8 80241008 AE420070 */ sw $v0, 0x70($s2) -.L8024100C: -/* 9A93FC 8024100C 0C00A67F */ jal rand_int -/* 9A9400 80241010 24042710 */ addiu $a0, $zero, 0x2710 -/* 9A9404 80241014 3C0351EB */ lui $v1, 0x51eb -/* 9A9408 80241018 3463851F */ ori $v1, $v1, 0x851f -/* 9A940C 8024101C 00430018 */ mult $v0, $v1 -/* 9A9410 80241020 00021FC3 */ sra $v1, $v0, 0x1f -/* 9A9414 80241024 00004010 */ mfhi $t0 -/* 9A9418 80241028 00082143 */ sra $a0, $t0, 5 -/* 9A941C 8024102C 00832023 */ subu $a0, $a0, $v1 -/* 9A9420 80241030 00041840 */ sll $v1, $a0, 1 -/* 9A9424 80241034 00641821 */ addu $v1, $v1, $a0 -/* 9A9428 80241038 000318C0 */ sll $v1, $v1, 3 -/* 9A942C 8024103C 00641821 */ addu $v1, $v1, $a0 -/* 9A9430 80241040 00031880 */ sll $v1, $v1, 2 -/* 9A9434 80241044 8E640004 */ lw $a0, 4($s3) -/* 9A9438 80241048 00431023 */ subu $v0, $v0, $v1 -/* 9A943C 8024104C 0044102A */ slt $v0, $v0, $a0 -/* 9A9440 80241050 10400002 */ beqz $v0, .L8024105C -/* 9A9444 80241054 24020004 */ addiu $v0, $zero, 4 -.L80241058: -/* 9A9448 80241058 AE420070 */ sw $v0, 0x70($s2) -.L8024105C: -/* 9A944C 8024105C 8FBF0044 */ lw $ra, 0x44($sp) -/* 9A9450 80241060 8FB40040 */ lw $s4, 0x40($sp) -/* 9A9454 80241064 8FB3003C */ lw $s3, 0x3c($sp) -/* 9A9458 80241068 8FB20038 */ lw $s2, 0x38($sp) -/* 9A945C 8024106C 8FB10034 */ lw $s1, 0x34($sp) -/* 9A9460 80241070 8FB00030 */ lw $s0, 0x30($sp) -/* 9A9464 80241074 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 9A9468 80241078 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 9A946C 8024107C 03E00008 */ jr $ra -/* 9A9470 80241080 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_trd/trd_04/func_802415D0_9A83F0.s b/asm/nonmatchings/world/area_trd/trd_04/func_802415D0_9A83F0.s deleted file mode 100644 index 63a821621f..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/func_802415D0_9A83F0.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415D0_9A99C0 -/* 9A99C0 802415D0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9A99C4 802415D4 AFB3003C */ sw $s3, 0x3c($sp) -/* 9A99C8 802415D8 0080982D */ daddu $s3, $a0, $zero -/* 9A99CC 802415DC AFBF0040 */ sw $ra, 0x40($sp) -/* 9A99D0 802415E0 AFB20038 */ sw $s2, 0x38($sp) -/* 9A99D4 802415E4 AFB10034 */ sw $s1, 0x34($sp) -/* 9A99D8 802415E8 AFB00030 */ sw $s0, 0x30($sp) -/* 9A99DC 802415EC 8E720148 */ lw $s2, 0x148($s3) -/* 9A99E0 802415F0 00A0882D */ daddu $s1, $a1, $zero -/* 9A99E4 802415F4 86440008 */ lh $a0, 8($s2) -/* 9A99E8 802415F8 0C00EABB */ jal get_npc_unsafe -/* 9A99EC 802415FC 00C0802D */ daddu $s0, $a2, $zero -/* 9A99F0 80241600 0200202D */ daddu $a0, $s0, $zero -/* 9A99F4 80241604 0240282D */ daddu $a1, $s2, $zero -/* 9A99F8 80241608 24030001 */ addiu $v1, $zero, 1 -/* 9A99FC 8024160C AFA30010 */ sw $v1, 0x10($sp) -/* 9A9A00 80241610 8E260024 */ lw $a2, 0x24($s1) -/* 9A9A04 80241614 8E270028 */ lw $a3, 0x28($s1) -/* 9A9A08 80241618 0C01242D */ jal func_800490B4 -/* 9A9A0C 8024161C 0040802D */ daddu $s0, $v0, $zero -/* 9A9A10 80241620 1440001E */ bnez $v0, .L8024169C -/* 9A9A14 80241624 0200202D */ daddu $a0, $s0, $zero -/* 9A9A18 80241628 24040002 */ addiu $a0, $zero, 2 -/* 9A9A1C 8024162C 0200282D */ daddu $a1, $s0, $zero -/* 9A9A20 80241630 0000302D */ daddu $a2, $zero, $zero -/* 9A9A24 80241634 860300A8 */ lh $v1, 0xa8($s0) -/* 9A9A28 80241638 3C013F80 */ lui $at, 0x3f80 -/* 9A9A2C 8024163C 44810000 */ mtc1 $at, $f0 -/* 9A9A30 80241640 3C014000 */ lui $at, 0x4000 -/* 9A9A34 80241644 44811000 */ mtc1 $at, $f2 -/* 9A9A38 80241648 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A9A3C 8024164C 44812000 */ mtc1 $at, $f4 -/* 9A9A40 80241650 2402000F */ addiu $v0, $zero, 0xf -/* 9A9A44 80241654 AFA2001C */ sw $v0, 0x1c($sp) -/* 9A9A48 80241658 44833000 */ mtc1 $v1, $f6 -/* 9A9A4C 8024165C 00000000 */ nop -/* 9A9A50 80241660 468031A0 */ cvt.s.w $f6, $f6 -/* 9A9A54 80241664 44073000 */ mfc1 $a3, $f6 -/* 9A9A58 80241668 27A20028 */ addiu $v0, $sp, 0x28 -/* 9A9A5C 8024166C AFA20020 */ sw $v0, 0x20($sp) -/* 9A9A60 80241670 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A9A64 80241674 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A9A68 80241678 0C01BFA4 */ jal fx_emote -/* 9A9A6C 8024167C E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A9A70 80241680 8E4200CC */ lw $v0, 0xcc($s2) -/* 9A9A74 80241684 8C430000 */ lw $v1, ($v0) -/* 9A9A78 80241688 24020019 */ addiu $v0, $zero, 0x19 -/* 9A9A7C 8024168C A602008E */ sh $v0, 0x8e($s0) -/* 9A9A80 80241690 2402000E */ addiu $v0, $zero, 0xe -/* 9A9A84 80241694 080905B4 */ j .L802416D0 -/* 9A9A88 80241698 AE030028 */ sw $v1, 0x28($s0) -.L8024169C: -/* 9A9A8C 8024169C 0C00F598 */ jal func_8003D660 -/* 9A9A90 802416A0 24050001 */ addiu $a1, $zero, 1 -/* 9A9A94 802416A4 8E050018 */ lw $a1, 0x18($s0) -/* 9A9A98 802416A8 8E06000C */ lw $a2, 0xc($s0) -/* 9A9A9C 802416AC 0C00EA95 */ jal npc_move_heading -/* 9A9AA0 802416B0 0200202D */ daddu $a0, $s0, $zero -/* 9A9AA4 802416B4 8602008E */ lh $v0, 0x8e($s0) -/* 9A9AA8 802416B8 9603008E */ lhu $v1, 0x8e($s0) -/* 9A9AAC 802416BC 18400003 */ blez $v0, .L802416CC -/* 9A9AB0 802416C0 2462FFFF */ addiu $v0, $v1, -1 -/* 9A9AB4 802416C4 080905B5 */ j .L802416D4 -/* 9A9AB8 802416C8 A602008E */ sh $v0, 0x8e($s0) -.L802416CC: -/* 9A9ABC 802416CC 2402000C */ addiu $v0, $zero, 0xc -.L802416D0: -/* 9A9AC0 802416D0 AE620070 */ sw $v0, 0x70($s3) -.L802416D4: -/* 9A9AC4 802416D4 8FBF0040 */ lw $ra, 0x40($sp) -/* 9A9AC8 802416D8 8FB3003C */ lw $s3, 0x3c($sp) -/* 9A9ACC 802416DC 8FB20038 */ lw $s2, 0x38($sp) -/* 9A9AD0 802416E0 8FB10034 */ lw $s1, 0x34($sp) -/* 9A9AD4 802416E4 8FB00030 */ lw $s0, 0x30($sp) -/* 9A9AD8 802416E8 03E00008 */ jr $ra -/* 9A9ADC 802416EC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_04/func_802416F0_9A83F0.s b/asm/nonmatchings/world/area_trd/trd_04/func_802416F0_9A83F0.s deleted file mode 100644 index ffd7ebc4c3..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/func_802416F0_9A83F0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416F0_9A9AE0 -/* 9A9AE0 802416F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A9AE4 802416F4 AFB10014 */ sw $s1, 0x14($sp) -/* 9A9AE8 802416F8 0080882D */ daddu $s1, $a0, $zero -/* 9A9AEC 802416FC AFBF0018 */ sw $ra, 0x18($sp) -/* 9A9AF0 80241700 AFB00010 */ sw $s0, 0x10($sp) -/* 9A9AF4 80241704 8E300148 */ lw $s0, 0x148($s1) -/* 9A9AF8 80241708 0C00EABB */ jal get_npc_unsafe -/* 9A9AFC 8024170C 86040008 */ lh $a0, 8($s0) -/* 9A9B00 80241710 9443008E */ lhu $v1, 0x8e($v0) -/* 9A9B04 80241714 2463FFFF */ addiu $v1, $v1, -1 -/* 9A9B08 80241718 A443008E */ sh $v1, 0x8e($v0) -/* 9A9B0C 8024171C 00031C00 */ sll $v1, $v1, 0x10 -/* 9A9B10 80241720 14600008 */ bnez $v1, .L80241744 -/* 9A9B14 80241724 00000000 */ nop -/* 9A9B18 80241728 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9A9B1C 8024172C 30420080 */ andi $v0, $v0, 0x80 -/* 9A9B20 80241730 10400003 */ beqz $v0, .L80241740 -/* 9A9B24 80241734 2402000F */ addiu $v0, $zero, 0xf -/* 9A9B28 80241738 080905D1 */ j .L80241744 -/* 9A9B2C 8024173C AE220070 */ sw $v0, 0x70($s1) -.L80241740: -/* 9A9B30 80241740 AE200070 */ sw $zero, 0x70($s1) -.L80241744: -/* 9A9B34 80241744 8FBF0018 */ lw $ra, 0x18($sp) -/* 9A9B38 80241748 8FB10014 */ lw $s1, 0x14($sp) -/* 9A9B3C 8024174C 8FB00010 */ lw $s0, 0x10($sp) -/* 9A9B40 80241750 03E00008 */ jr $ra -/* 9A9B44 80241754 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/func_80241B14_9A83F0.s b/asm/nonmatchings/world/area_trd/trd_04/func_80241B14_9A83F0.s deleted file mode 100644 index 4327b261a5..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/func_80241B14_9A83F0.s +++ /dev/null @@ -1,204 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B14_9A9F04 -/* 9A9F04 80241B14 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9A9F08 80241B18 AFB3005C */ sw $s3, 0x5c($sp) -/* 9A9F0C 80241B1C 0080982D */ daddu $s3, $a0, $zero -/* 9A9F10 80241B20 AFBF0068 */ sw $ra, 0x68($sp) -/* 9A9F14 80241B24 AFB50064 */ sw $s5, 0x64($sp) -/* 9A9F18 80241B28 AFB40060 */ sw $s4, 0x60($sp) -/* 9A9F1C 80241B2C AFB20058 */ sw $s2, 0x58($sp) -/* 9A9F20 80241B30 AFB10054 */ sw $s1, 0x54($sp) -/* 9A9F24 80241B34 AFB00050 */ sw $s0, 0x50($sp) -/* 9A9F28 80241B38 8E710148 */ lw $s1, 0x148($s3) -/* 9A9F2C 80241B3C 86240008 */ lh $a0, 8($s1) -/* 9A9F30 80241B40 0C00EABB */ jal get_npc_unsafe -/* 9A9F34 80241B44 00A0802D */ daddu $s0, $a1, $zero -/* 9A9F38 80241B48 8E63000C */ lw $v1, 0xc($s3) -/* 9A9F3C 80241B4C 0260202D */ daddu $a0, $s3, $zero -/* 9A9F40 80241B50 8C650000 */ lw $a1, ($v1) -/* 9A9F44 80241B54 0C0B1EAF */ jal get_variable -/* 9A9F48 80241B58 0040902D */ daddu $s2, $v0, $zero -/* 9A9F4C 80241B5C AFA00028 */ sw $zero, 0x28($sp) -/* 9A9F50 80241B60 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A9F54 80241B64 8C630094 */ lw $v1, 0x94($v1) -/* 9A9F58 80241B68 AFA3002C */ sw $v1, 0x2c($sp) -/* 9A9F5C 80241B6C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A9F60 80241B70 8C630080 */ lw $v1, 0x80($v1) -/* 9A9F64 80241B74 AFA30030 */ sw $v1, 0x30($sp) -/* 9A9F68 80241B78 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A9F6C 80241B7C 8C630088 */ lw $v1, 0x88($v1) -/* 9A9F70 80241B80 AFA30034 */ sw $v1, 0x34($sp) -/* 9A9F74 80241B84 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A9F78 80241B88 8C63008C */ lw $v1, 0x8c($v1) -/* 9A9F7C 80241B8C 27B50028 */ addiu $s5, $sp, 0x28 -/* 9A9F80 80241B90 AFA30038 */ sw $v1, 0x38($sp) -/* 9A9F84 80241B94 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A9F88 80241B98 3C0142C8 */ lui $at, 0x42c8 -/* 9A9F8C 80241B9C 44810000 */ mtc1 $at, $f0 -/* 9A9F90 80241BA0 8C630090 */ lw $v1, 0x90($v1) -/* 9A9F94 80241BA4 0040A02D */ daddu $s4, $v0, $zero -/* 9A9F98 80241BA8 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9A9F9C 80241BAC A7A00044 */ sh $zero, 0x44($sp) -/* 9A9FA0 80241BB0 12000007 */ beqz $s0, .L80241BD0 -/* 9A9FA4 80241BB4 AFA3003C */ sw $v1, 0x3c($sp) -/* 9A9FA8 80241BB8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A9FAC 80241BBC 864300A8 */ lh $v1, 0xa8($s2) -/* 9A9FB0 80241BC0 34420008 */ ori $v0, $v0, 8 -/* 9A9FB4 80241BC4 AE230084 */ sw $v1, 0x84($s1) -/* 9A9FB8 80241BC8 080906F8 */ j .L80241BE0 -/* 9A9FBC 80241BCC AE2200B0 */ sw $v0, 0xb0($s1) -.L80241BD0: -/* 9A9FC0 80241BD0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A9FC4 80241BD4 30420004 */ andi $v0, $v0, 4 -/* 9A9FC8 80241BD8 10400048 */ beqz $v0, .L80241CFC -/* 9A9FCC 80241BDC 00000000 */ nop -.L80241BE0: -/* 9A9FD0 80241BE0 A640008E */ sh $zero, 0x8e($s2) -/* 9A9FD4 80241BE4 AE600070 */ sw $zero, 0x70($s3) -/* 9A9FD8 80241BE8 8E2300CC */ lw $v1, 0xcc($s1) -/* 9A9FDC 80241BEC 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9A9FE0 80241BF0 A2200007 */ sb $zero, 7($s1) -/* 9A9FE4 80241BF4 8E420000 */ lw $v0, ($s2) -/* 9A9FE8 80241BF8 8C630000 */ lw $v1, ($v1) -/* 9A9FEC 80241BFC 00441024 */ and $v0, $v0, $a0 -/* 9A9FF0 80241C00 AE420000 */ sw $v0, ($s2) -/* 9A9FF4 80241C04 AE430028 */ sw $v1, 0x28($s2) -/* 9A9FF8 80241C08 96220086 */ lhu $v0, 0x86($s1) -/* 9A9FFC 80241C0C A64200A8 */ sh $v0, 0xa8($s2) -/* 9AA000 80241C10 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA004 80241C14 A22000B5 */ sb $zero, 0xb5($s1) -/* 9AA008 80241C18 AE20008C */ sw $zero, 0x8c($s1) -/* 9AA00C 80241C1C 8C420098 */ lw $v0, 0x98($v0) -/* 9AA010 80241C20 14400006 */ bnez $v0, .L80241C3C -/* 9AA014 80241C24 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9AA018 80241C28 8E420000 */ lw $v0, ($s2) -/* 9AA01C 80241C2C 2403FFF7 */ addiu $v1, $zero, -9 -/* 9AA020 80241C30 34420200 */ ori $v0, $v0, 0x200 -/* 9AA024 80241C34 08090712 */ j .L80241C48 -/* 9AA028 80241C38 00431024 */ and $v0, $v0, $v1 -.L80241C3C: -/* 9AA02C 80241C3C 8E420000 */ lw $v0, ($s2) -/* 9AA030 80241C40 00431024 */ and $v0, $v0, $v1 -/* 9AA034 80241C44 34420008 */ ori $v0, $v0, 8 -.L80241C48: -/* 9AA038 80241C48 AE420000 */ sw $v0, ($s2) -/* 9AA03C 80241C4C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9AA040 80241C50 30420004 */ andi $v0, $v0, 4 -/* 9AA044 80241C54 1040001E */ beqz $v0, .L80241CD0 -/* 9AA048 80241C58 24040002 */ addiu $a0, $zero, 2 -/* 9AA04C 80241C5C 0240282D */ daddu $a1, $s2, $zero -/* 9AA050 80241C60 0000302D */ daddu $a2, $zero, $zero -/* 9AA054 80241C64 24020063 */ addiu $v0, $zero, 0x63 -/* 9AA058 80241C68 AE620070 */ sw $v0, 0x70($s3) -/* 9AA05C 80241C6C AE600074 */ sw $zero, 0x74($s3) -/* 9AA060 80241C70 864300A8 */ lh $v1, 0xa8($s2) -/* 9AA064 80241C74 3C013F80 */ lui $at, 0x3f80 -/* 9AA068 80241C78 44810000 */ mtc1 $at, $f0 -/* 9AA06C 80241C7C 3C014000 */ lui $at, 0x4000 -/* 9AA070 80241C80 44811000 */ mtc1 $at, $f2 -/* 9AA074 80241C84 3C01C1A0 */ lui $at, 0xc1a0 -/* 9AA078 80241C88 44812000 */ mtc1 $at, $f4 -/* 9AA07C 80241C8C 24020028 */ addiu $v0, $zero, 0x28 -/* 9AA080 80241C90 AFA2001C */ sw $v0, 0x1c($sp) -/* 9AA084 80241C94 44833000 */ mtc1 $v1, $f6 -/* 9AA088 80241C98 00000000 */ nop -/* 9AA08C 80241C9C 468031A0 */ cvt.s.w $f6, $f6 -/* 9AA090 80241CA0 44073000 */ mfc1 $a3, $f6 -/* 9AA094 80241CA4 27A20048 */ addiu $v0, $sp, 0x48 -/* 9AA098 80241CA8 AFA20020 */ sw $v0, 0x20($sp) -/* 9AA09C 80241CAC E7A00010 */ swc1 $f0, 0x10($sp) -/* 9AA0A0 80241CB0 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9AA0A4 80241CB4 0C01BFA4 */ jal fx_emote -/* 9AA0A8 80241CB8 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9AA0AC 80241CBC 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9AA0B0 80241CC0 2403FFFB */ addiu $v1, $zero, -5 -/* 9AA0B4 80241CC4 00431024 */ and $v0, $v0, $v1 -/* 9AA0B8 80241CC8 0809073F */ j .L80241CFC -/* 9AA0BC 80241CCC AE2200B0 */ sw $v0, 0xb0($s1) -.L80241CD0: -/* 9AA0C0 80241CD0 8E220000 */ lw $v0, ($s1) -/* 9AA0C4 80241CD4 3C034000 */ lui $v1, 0x4000 -/* 9AA0C8 80241CD8 00431024 */ and $v0, $v0, $v1 -/* 9AA0CC 80241CDC 10400007 */ beqz $v0, .L80241CFC -/* 9AA0D0 80241CE0 3C03BFFF */ lui $v1, 0xbfff -/* 9AA0D4 80241CE4 2402000C */ addiu $v0, $zero, 0xc -/* 9AA0D8 80241CE8 AE620070 */ sw $v0, 0x70($s3) -/* 9AA0DC 80241CEC 8E220000 */ lw $v0, ($s1) -/* 9AA0E0 80241CF0 3463FFFF */ ori $v1, $v1, 0xffff -/* 9AA0E4 80241CF4 00431024 */ and $v0, $v0, $v1 -/* 9AA0E8 80241CF8 AE220000 */ sw $v0, ($s1) -.L80241CFC: -/* 9AA0EC 80241CFC 8E630070 */ lw $v1, 0x70($s3) -/* 9AA0F0 80241D00 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9AA0F4 80241D04 1040003A */ beqz $v0, .L80241DF0 -/* 9AA0F8 80241D08 00031080 */ sll $v0, $v1, 2 -/* 9AA0FC 80241D0C 3C018024 */ lui $at, 0x8024 -/* 9AA100 80241D10 00220821 */ addu $at, $at, $v0 -/* 9AA104 80241D14 8C2260E0 */ lw $v0, 0x60e0($at) -/* 9AA108 80241D18 00400008 */ jr $v0 -/* 9AA10C 80241D1C 00000000 */ nop -/* 9AA110 80241D20 0260202D */ daddu $a0, $s3, $zero -/* 9AA114 80241D24 0280282D */ daddu $a1, $s4, $zero -/* 9AA118 80241D28 0C090321 */ jal func_80240C84 -/* 9AA11C 80241D2C 02A0302D */ daddu $a2, $s5, $zero -/* 9AA120 80241D30 96220086 */ lhu $v0, 0x86($s1) -/* 9AA124 80241D34 A64200A8 */ sh $v0, 0xa8($s2) -/* 9AA128 80241D38 0260202D */ daddu $a0, $s3, $zero -/* 9AA12C 80241D3C 0280282D */ daddu $a1, $s4, $zero -/* 9AA130 80241D40 0C090377 */ jal func_80240DDC -/* 9AA134 80241D44 02A0302D */ daddu $a2, $s5, $zero -/* 9AA138 80241D48 0809077C */ j .L80241DF0 -/* 9AA13C 80241D4C 00000000 */ nop -/* 9AA140 80241D50 0260202D */ daddu $a0, $s3, $zero -/* 9AA144 80241D54 0280282D */ daddu $a1, $s4, $zero -/* 9AA148 80241D58 0C090421 */ jal func_80241084 -/* 9AA14C 80241D5C 02A0302D */ daddu $a2, $s5, $zero -/* 9AA150 80241D60 0260202D */ daddu $a0, $s3, $zero -/* 9AA154 80241D64 0280282D */ daddu $a1, $s4, $zero -/* 9AA158 80241D68 0C090451 */ jal func_80241144 -/* 9AA15C 80241D6C 02A0302D */ daddu $a2, $s5, $zero -/* 9AA160 80241D70 0809077C */ j .L80241DF0 -/* 9AA164 80241D74 00000000 */ nop -/* 9AA168 80241D78 0260202D */ daddu $a0, $s3, $zero -/* 9AA16C 80241D7C 0280282D */ daddu $a1, $s4, $zero -/* 9AA170 80241D80 0C0904C0 */ jal func_80241300 -/* 9AA174 80241D84 02A0302D */ daddu $a2, $s5, $zero -/* 9AA178 80241D88 0809077C */ j .L80241DF0 -/* 9AA17C 80241D8C 00000000 */ nop -/* 9AA180 80241D90 0260202D */ daddu $a0, $s3, $zero -/* 9AA184 80241D94 0280282D */ daddu $a1, $s4, $zero -/* 9AA188 80241D98 0C09012C */ jal func_802404B0 -/* 9AA18C 80241D9C 02A0302D */ daddu $a2, $s5, $zero -/* 9AA190 80241DA0 0260202D */ daddu $a0, $s3, $zero -/* 9AA194 80241DA4 0280282D */ daddu $a1, $s4, $zero -/* 9AA198 80241DA8 0C09014B */ jal func_8024052C -/* 9AA19C 80241DAC 02A0302D */ daddu $a2, $s5, $zero -/* 9AA1A0 80241DB0 0809077C */ j .L80241DF0 -/* 9AA1A4 80241DB4 00000000 */ nop -/* 9AA1A8 80241DB8 0260202D */ daddu $a0, $s3, $zero -/* 9AA1AC 80241DBC 0280282D */ daddu $a1, $s4, $zero -/* 9AA1B0 80241DC0 0C090198 */ jal func_80240660 -/* 9AA1B4 80241DC4 02A0302D */ daddu $a2, $s5, $zero -/* 9AA1B8 80241DC8 0809077C */ j .L80241DF0 -/* 9AA1BC 80241DCC 00000000 */ nop -/* 9AA1C0 80241DD0 0260202D */ daddu $a0, $s3, $zero -/* 9AA1C4 80241DD4 0280282D */ daddu $a1, $s4, $zero -/* 9AA1C8 80241DD8 0C0901F1 */ jal func_802407C4 -/* 9AA1CC 80241DDC 02A0302D */ daddu $a2, $s5, $zero -/* 9AA1D0 80241DE0 0809077C */ j .L80241DF0 -/* 9AA1D4 80241DE4 00000000 */ nop -/* 9AA1D8 80241DE8 0C0129CF */ jal func_8004A73C -/* 9AA1DC 80241DEC 0260202D */ daddu $a0, $s3, $zero -.L80241DF0: -/* 9AA1E0 80241DF0 8FBF0068 */ lw $ra, 0x68($sp) -/* 9AA1E4 80241DF4 8FB50064 */ lw $s5, 0x64($sp) -/* 9AA1E8 80241DF8 8FB40060 */ lw $s4, 0x60($sp) -/* 9AA1EC 80241DFC 8FB3005C */ lw $s3, 0x5c($sp) -/* 9AA1F0 80241E00 8FB20058 */ lw $s2, 0x58($sp) -/* 9AA1F4 80241E04 8FB10054 */ lw $s1, 0x54($sp) -/* 9AA1F8 80241E08 8FB00050 */ lw $s0, 0x50($sp) -/* 9AA1FC 80241E0C 0000102D */ daddu $v0, $zero, $zero -/* 9AA200 80241E10 03E00008 */ jr $ra -/* 9AA204 80241E14 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_trd/trd_05/func_80240020_9AE700.s b/asm/nonmatchings/world/area_trd/trd_05/func_80240020_9AE700.s deleted file mode 100644 index bfd5bc4745..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_05/func_80240020_9AE700.s +++ /dev/null @@ -1,255 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_9AE720 -/* 9AE720 80240020 27BDFF10 */ addiu $sp, $sp, -0xf0 -/* 9AE724 80240024 3C06E300 */ lui $a2, 0xe300 -/* 9AE728 80240028 34C60A01 */ ori $a2, $a2, 0xa01 -/* 9AE72C 8024002C 3C07D9C0 */ lui $a3, 0xd9c0 -/* 9AE730 80240030 34E7F9FB */ ori $a3, $a3, 0xf9fb -/* 9AE734 80240034 3C09D9FF */ lui $t1, 0xd9ff -/* 9AE738 80240038 3529FFFF */ ori $t1, $t1, 0xffff -/* 9AE73C 8024003C 3C080020 */ lui $t0, 0x20 -/* 9AE740 80240040 35080005 */ ori $t0, $t0, 5 -/* 9AE744 80240044 3C0AD700 */ lui $t2, 0xd700 -/* 9AE748 80240048 354A0002 */ ori $t2, $t2, 2 -/* 9AE74C 8024004C 3C0BE300 */ lui $t3, 0xe300 -/* 9AE750 80240050 356B0F00 */ ori $t3, $t3, 0xf00 -/* 9AE754 80240054 3C0CE300 */ lui $t4, 0xe300 -/* 9AE758 80240058 358C0C00 */ ori $t4, $t4, 0xc00 -/* 9AE75C 8024005C 3C0DE300 */ lui $t5, 0xe300 -/* 9AE760 80240060 35AD1201 */ ori $t5, $t5, 0x1201 -/* 9AE764 80240064 3C0EE300 */ lui $t6, 0xe300 -/* 9AE768 80240068 35CE1801 */ ori $t6, $t6, 0x1801 -/* 9AE76C 8024006C 3C0FE300 */ lui $t7, 0xe300 -/* 9AE770 80240070 35EF0D01 */ ori $t7, $t7, 0xd01 -/* 9AE774 80240074 AFB000C0 */ sw $s0, 0xc0($sp) -/* 9AE778 80240078 3C10E300 */ lui $s0, 0xe300 -/* 9AE77C 8024007C 36101402 */ ori $s0, $s0, 0x1402 -/* 9AE780 80240080 AFB300CC */ sw $s3, 0xcc($sp) -/* 9AE784 80240084 3C13E300 */ lui $s3, 0xe300 -/* 9AE788 80240088 36731700 */ ori $s3, $s3, 0x1700 -/* 9AE78C 8024008C AFB400D0 */ sw $s4, 0xd0($sp) -/* 9AE790 80240090 3C14E200 */ lui $s4, 0xe200 -/* 9AE794 80240094 36941E01 */ ori $s4, $s4, 0x1e01 -/* 9AE798 80240098 AFB200C8 */ sw $s2, 0xc8($sp) -/* 9AE79C 8024009C 27B20040 */ addiu $s2, $sp, 0x40 -/* 9AE7A0 802400A0 0240202D */ daddu $a0, $s2, $zero -/* 9AE7A4 802400A4 AFB500D4 */ sw $s5, 0xd4($sp) -/* 9AE7A8 802400A8 3C150001 */ lui $s5, 1 -/* 9AE7AC 802400AC AFB100C4 */ sw $s1, 0xc4($sp) -/* 9AE7B0 802400B0 3C11800A */ lui $s1, 0x800a -/* 9AE7B4 802400B4 2631A66C */ addiu $s1, $s1, -0x5994 -/* 9AE7B8 802400B8 36B51630 */ ori $s5, $s5, 0x1630 -/* 9AE7BC 802400BC AFBF00D8 */ sw $ra, 0xd8($sp) -/* 9AE7C0 802400C0 F7B600E8 */ sdc1 $f22, 0xe8($sp) -/* 9AE7C4 802400C4 F7B400E0 */ sdc1 $f20, 0xe0($sp) -/* 9AE7C8 802400C8 8E220000 */ lw $v0, ($s1) -/* 9AE7CC 802400CC 3C03E700 */ lui $v1, 0xe700 -/* 9AE7D0 802400D0 0040282D */ daddu $a1, $v0, $zero -/* 9AE7D4 802400D4 24420008 */ addiu $v0, $v0, 8 -/* 9AE7D8 802400D8 AE220000 */ sw $v0, ($s1) -/* 9AE7DC 802400DC ACA30000 */ sw $v1, ($a1) -/* 9AE7E0 802400E0 24430008 */ addiu $v1, $v0, 8 -/* 9AE7E4 802400E4 ACA00004 */ sw $zero, 4($a1) -/* 9AE7E8 802400E8 AE230000 */ sw $v1, ($s1) -/* 9AE7EC 802400EC 24430010 */ addiu $v1, $v0, 0x10 -/* 9AE7F0 802400F0 AC460000 */ sw $a2, ($v0) -/* 9AE7F4 802400F4 AC400004 */ sw $zero, 4($v0) -/* 9AE7F8 802400F8 AE230000 */ sw $v1, ($s1) -/* 9AE7FC 802400FC 24430018 */ addiu $v1, $v0, 0x18 -/* 9AE800 80240100 AC470008 */ sw $a3, 8($v0) -/* 9AE804 80240104 AC40000C */ sw $zero, 0xc($v0) -/* 9AE808 80240108 AE230000 */ sw $v1, ($s1) -/* 9AE80C 8024010C 24430020 */ addiu $v1, $v0, 0x20 -/* 9AE810 80240110 AC490010 */ sw $t1, 0x10($v0) -/* 9AE814 80240114 AC480014 */ sw $t0, 0x14($v0) -/* 9AE818 80240118 AE230000 */ sw $v1, ($s1) -/* 9AE81C 8024011C 2403FFFF */ addiu $v1, $zero, -1 -/* 9AE820 80240120 AC43001C */ sw $v1, 0x1c($v0) -/* 9AE824 80240124 24430028 */ addiu $v1, $v0, 0x28 -/* 9AE828 80240128 AC4A0018 */ sw $t2, 0x18($v0) -/* 9AE82C 8024012C AE230000 */ sw $v1, ($s1) -/* 9AE830 80240130 24430030 */ addiu $v1, $v0, 0x30 -/* 9AE834 80240134 AC4B0020 */ sw $t3, 0x20($v0) -/* 9AE838 80240138 AC400024 */ sw $zero, 0x24($v0) -/* 9AE83C 8024013C AE230000 */ sw $v1, ($s1) -/* 9AE840 80240140 3C030008 */ lui $v1, 8 -/* 9AE844 80240144 AC43002C */ sw $v1, 0x2c($v0) -/* 9AE848 80240148 24430038 */ addiu $v1, $v0, 0x38 -/* 9AE84C 8024014C AC4C0028 */ sw $t4, 0x28($v0) -/* 9AE850 80240150 AE230000 */ sw $v1, ($s1) -/* 9AE854 80240154 24032000 */ addiu $v1, $zero, 0x2000 -/* 9AE858 80240158 AC4D0030 */ sw $t5, 0x30($v0) -/* 9AE85C 8024015C AC430034 */ sw $v1, 0x34($v0) -/* 9AE860 80240160 24430040 */ addiu $v1, $v0, 0x40 -/* 9AE864 80240164 AE230000 */ sw $v1, ($s1) -/* 9AE868 80240168 240300C0 */ addiu $v1, $zero, 0xc0 -/* 9AE86C 8024016C AC43003C */ sw $v1, 0x3c($v0) -/* 9AE870 80240170 24430048 */ addiu $v1, $v0, 0x48 -/* 9AE874 80240174 AC4E0038 */ sw $t6, 0x38($v0) -/* 9AE878 80240178 AE230000 */ sw $v1, ($s1) -/* 9AE87C 8024017C 24430050 */ addiu $v1, $v0, 0x50 -/* 9AE880 80240180 AC4F0040 */ sw $t7, 0x40($v0) -/* 9AE884 80240184 AC400044 */ sw $zero, 0x44($v0) -/* 9AE888 80240188 AE230000 */ sw $v1, ($s1) -/* 9AE88C 8024018C 24030C00 */ addiu $v1, $zero, 0xc00 -/* 9AE890 80240190 AC500048 */ sw $s0, 0x48($v0) -/* 9AE894 80240194 AC43004C */ sw $v1, 0x4c($v0) -/* 9AE898 80240198 AC530050 */ sw $s3, 0x50($v0) -/* 9AE89C 8024019C 3C138024 */ lui $s3, 0x8024 -/* 9AE8A0 802401A0 26733090 */ addiu $s3, $s3, 0x3090 -/* 9AE8A4 802401A4 24430058 */ addiu $v1, $v0, 0x58 -/* 9AE8A8 802401A8 AC400054 */ sw $zero, 0x54($v0) -/* 9AE8AC 802401AC AC540058 */ sw $s4, 0x58($v0) -/* 9AE8B0 802401B0 AC40005C */ sw $zero, 0x5c($v0) -/* 9AE8B4 802401B4 8E650010 */ lw $a1, 0x10($s3) -/* 9AE8B8 802401B8 8E660014 */ lw $a2, 0x14($s3) -/* 9AE8BC 802401BC 8E670018 */ lw $a3, 0x18($s3) -/* 9AE8C0 802401C0 24420060 */ addiu $v0, $v0, 0x60 -/* 9AE8C4 802401C4 AE230000 */ sw $v1, ($s1) -/* 9AE8C8 802401C8 0C019E40 */ jal guTranslateF -/* 9AE8CC 802401CC AE220000 */ sw $v0, ($s1) -/* 9AE8D0 802401D0 27B00080 */ addiu $s0, $sp, 0x80 -/* 9AE8D4 802401D4 8E65001C */ lw $a1, 0x1c($s3) -/* 9AE8D8 802401D8 3C013F80 */ lui $at, 0x3f80 -/* 9AE8DC 802401DC 4481B000 */ mtc1 $at, $f22 -/* 9AE8E0 802401E0 4480A000 */ mtc1 $zero, $f20 -/* 9AE8E4 802401E4 4406B000 */ mfc1 $a2, $f22 -/* 9AE8E8 802401E8 4407A000 */ mfc1 $a3, $f20 -/* 9AE8EC 802401EC 0200202D */ daddu $a0, $s0, $zero -/* 9AE8F0 802401F0 0C019EC8 */ jal guRotateF -/* 9AE8F4 802401F4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 9AE8F8 802401F8 0200202D */ daddu $a0, $s0, $zero -/* 9AE8FC 802401FC 0240282D */ daddu $a1, $s2, $zero -/* 9AE900 80240200 0C019D80 */ jal guMtxCatF -/* 9AE904 80240204 0240302D */ daddu $a2, $s2, $zero -/* 9AE908 80240208 8E650020 */ lw $a1, 0x20($s3) -/* 9AE90C 8024020C 4406A000 */ mfc1 $a2, $f20 -/* 9AE910 80240210 4407B000 */ mfc1 $a3, $f22 -/* 9AE914 80240214 0200202D */ daddu $a0, $s0, $zero -/* 9AE918 80240218 0C019EC8 */ jal guRotateF -/* 9AE91C 8024021C E7B40010 */ swc1 $f20, 0x10($sp) -/* 9AE920 80240220 0200202D */ daddu $a0, $s0, $zero -/* 9AE924 80240224 0240282D */ daddu $a1, $s2, $zero -/* 9AE928 80240228 0C019D80 */ jal guMtxCatF -/* 9AE92C 8024022C 0240302D */ daddu $a2, $s2, $zero -/* 9AE930 80240230 8E650024 */ lw $a1, 0x24($s3) -/* 9AE934 80240234 4406A000 */ mfc1 $a2, $f20 -/* 9AE938 80240238 0200202D */ daddu $a0, $s0, $zero -/* 9AE93C 8024023C E7B60010 */ swc1 $f22, 0x10($sp) -/* 9AE940 80240240 0C019EC8 */ jal guRotateF -/* 9AE944 80240244 00C0382D */ daddu $a3, $a2, $zero -/* 9AE948 80240248 0200202D */ daddu $a0, $s0, $zero -/* 9AE94C 8024024C 0240282D */ daddu $a1, $s2, $zero -/* 9AE950 80240250 0C019D80 */ jal guMtxCatF -/* 9AE954 80240254 0240302D */ daddu $a2, $s2, $zero -/* 9AE958 80240258 8E650028 */ lw $a1, 0x28($s3) -/* 9AE95C 8024025C 8E66002C */ lw $a2, 0x2c($s3) -/* 9AE960 80240260 8E670030 */ lw $a3, 0x30($s3) -/* 9AE964 80240264 0C019DF0 */ jal guScaleF -/* 9AE968 80240268 0200202D */ daddu $a0, $s0, $zero -/* 9AE96C 8024026C 0200202D */ daddu $a0, $s0, $zero -/* 9AE970 80240270 0240282D */ daddu $a1, $s2, $zero -/* 9AE974 80240274 0C019D80 */ jal guMtxCatF -/* 9AE978 80240278 0240302D */ daddu $a2, $s2, $zero -/* 9AE97C 8024027C 0240202D */ daddu $a0, $s2, $zero -/* 9AE980 80240280 3C108007 */ lui $s0, 0x8007 -/* 9AE984 80240284 261041F0 */ addiu $s0, $s0, 0x41f0 -/* 9AE988 80240288 3C12800A */ lui $s2, 0x800a -/* 9AE98C 8024028C 2652A674 */ addiu $s2, $s2, -0x598c -/* 9AE990 80240290 96050000 */ lhu $a1, ($s0) -/* 9AE994 80240294 8E420000 */ lw $v0, ($s2) -/* 9AE998 80240298 00052980 */ sll $a1, $a1, 6 -/* 9AE99C 8024029C 00B52821 */ addu $a1, $a1, $s5 -/* 9AE9A0 802402A0 0C019D40 */ jal guMtxF2L -/* 9AE9A4 802402A4 00452821 */ addu $a1, $v0, $a1 -/* 9AE9A8 802402A8 3C03DA38 */ lui $v1, 0xda38 -/* 9AE9AC 802402AC 34630002 */ ori $v1, $v1, 2 -/* 9AE9B0 802402B0 8E220000 */ lw $v0, ($s1) -/* 9AE9B4 802402B4 96040000 */ lhu $a0, ($s0) -/* 9AE9B8 802402B8 0040282D */ daddu $a1, $v0, $zero -/* 9AE9BC 802402BC 24420008 */ addiu $v0, $v0, 8 -/* 9AE9C0 802402C0 AE220000 */ sw $v0, ($s1) -/* 9AE9C4 802402C4 3082FFFF */ andi $v0, $a0, 0xffff -/* 9AE9C8 802402C8 00021180 */ sll $v0, $v0, 6 -/* 9AE9CC 802402CC ACA30000 */ sw $v1, ($a1) -/* 9AE9D0 802402D0 8E430000 */ lw $v1, ($s2) -/* 9AE9D4 802402D4 00551021 */ addu $v0, $v0, $s5 -/* 9AE9D8 802402D8 00621821 */ addu $v1, $v1, $v0 -/* 9AE9DC 802402DC 3C028000 */ lui $v0, 0x8000 -/* 9AE9E0 802402E0 00621821 */ addu $v1, $v1, $v0 -/* 9AE9E4 802402E4 ACA30004 */ sw $v1, 4($a1) -/* 9AE9E8 802402E8 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 9AE9EC 802402EC 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 9AE9F0 802402F0 24020008 */ addiu $v0, $zero, 8 -/* 9AE9F4 802402F4 AE620008 */ sw $v0, 8($s3) -/* 9AE9F8 802402F8 94620134 */ lhu $v0, 0x134($v1) -/* 9AE9FC 802402FC 24840001 */ addiu $a0, $a0, 1 -/* 9AEA00 80240300 30430003 */ andi $v1, $v0, 3 -/* 9AEA04 80240304 14600003 */ bnez $v1, .L80240314 -/* 9AEA08 80240308 A6040000 */ sh $a0, ($s0) -/* 9AEA0C 8024030C 080900CC */ j .L80240330 -/* 9AEA10 80240310 24020025 */ addiu $v0, $zero, 0x25 -.L80240314: -/* 9AEA14 80240314 2C620002 */ sltiu $v0, $v1, 2 -/* 9AEA18 80240318 14400005 */ bnez $v0, .L80240330 -/* 9AEA1C 8024031C 24020026 */ addiu $v0, $zero, 0x26 -/* 9AEA20 80240320 2C620003 */ sltiu $v0, $v1, 3 -/* 9AEA24 80240324 14400002 */ bnez $v0, .L80240330 -/* 9AEA28 80240328 24020027 */ addiu $v0, $zero, 0x27 -/* 9AEA2C 8024032C 24020024 */ addiu $v0, $zero, 0x24 -.L80240330: -/* 9AEA30 80240330 AE62000C */ sw $v0, 0xc($s3) -/* 9AEA34 80240334 8E650008 */ lw $a1, 8($s3) -/* 9AEA38 80240338 8E66000C */ lw $a2, 0xc($s3) -/* 9AEA3C 8024033C 0C0B7811 */ jal func_802DE044 -/* 9AEA40 80240340 27A40030 */ addiu $a0, $sp, 0x30 -/* 9AEA44 80240344 27A50018 */ addiu $a1, $sp, 0x18 -/* 9AEA48 80240348 0000302D */ daddu $a2, $zero, $zero -/* 9AEA4C 8024034C 27A70040 */ addiu $a3, $sp, 0x40 -/* 9AEA50 80240350 8E640000 */ lw $a0, ($s3) -/* 9AEA54 80240354 8FA80030 */ lw $t0, 0x30($sp) -/* 9AEA58 80240358 8FA90034 */ lw $t1, 0x34($sp) -/* 9AEA5C 8024035C 97AA003A */ lhu $t2, 0x3a($sp) -/* 9AEA60 80240360 97AB003E */ lhu $t3, 0x3e($sp) -/* 9AEA64 80240364 8FA30038 */ lw $v1, 0x38($sp) -/* 9AEA68 80240368 240200FF */ addiu $v0, $zero, 0xff -/* 9AEA6C 8024036C A3A20028 */ sb $v0, 0x28($sp) -/* 9AEA70 80240370 000317C2 */ srl $v0, $v1, 0x1f -/* 9AEA74 80240374 00621821 */ addu $v1, $v1, $v0 -/* 9AEA78 80240378 00031843 */ sra $v1, $v1, 1 -/* 9AEA7C 8024037C 8FA2003C */ lw $v0, 0x3c($sp) -/* 9AEA80 80240380 00031823 */ negu $v1, $v1 -/* 9AEA84 80240384 AFA80018 */ sw $t0, 0x18($sp) -/* 9AEA88 80240388 AFA9001C */ sw $t1, 0x1c($sp) -/* 9AEA8C 8024038C A7AA0020 */ sh $t2, 0x20($sp) -/* 9AEA90 80240390 A7AB0022 */ sh $t3, 0x22($sp) -/* 9AEA94 80240394 A7A30024 */ sh $v1, 0x24($sp) -/* 9AEA98 80240398 00021FC2 */ srl $v1, $v0, 0x1f -/* 9AEA9C 8024039C 00431021 */ addu $v0, $v0, $v1 -/* 9AEAA0 802403A0 00021043 */ sra $v0, $v0, 1 -/* 9AEAA4 802403A4 0C04EBDC */ jal func_8013AF70 -/* 9AEAA8 802403A8 A7A20026 */ sh $v0, 0x26($sp) -/* 9AEAAC 802403AC 3C05D838 */ lui $a1, 0xd838 -/* 9AEAB0 802403B0 3C03800A */ lui $v1, 0x800a -/* 9AEAB4 802403B4 2463A66C */ addiu $v1, $v1, -0x5994 -/* 9AEAB8 802403B8 8C620000 */ lw $v0, ($v1) -/* 9AEABC 802403BC 34A50002 */ ori $a1, $a1, 2 -/* 9AEAC0 802403C0 0040202D */ daddu $a0, $v0, $zero -/* 9AEAC4 802403C4 24420008 */ addiu $v0, $v0, 8 -/* 9AEAC8 802403C8 AC620000 */ sw $v0, ($v1) -/* 9AEACC 802403CC 24020040 */ addiu $v0, $zero, 0x40 -/* 9AEAD0 802403D0 AC850000 */ sw $a1, ($a0) -/* 9AEAD4 802403D4 AC820004 */ sw $v0, 4($a0) -/* 9AEAD8 802403D8 8FBF00D8 */ lw $ra, 0xd8($sp) -/* 9AEADC 802403DC 8FB500D4 */ lw $s5, 0xd4($sp) -/* 9AEAE0 802403E0 8FB400D0 */ lw $s4, 0xd0($sp) -/* 9AEAE4 802403E4 8FB300CC */ lw $s3, 0xcc($sp) -/* 9AEAE8 802403E8 8FB200C8 */ lw $s2, 0xc8($sp) -/* 9AEAEC 802403EC 8FB100C4 */ lw $s1, 0xc4($sp) -/* 9AEAF0 802403F0 8FB000C0 */ lw $s0, 0xc0($sp) -/* 9AEAF4 802403F4 D7B600E8 */ ldc1 $f22, 0xe8($sp) -/* 9AEAF8 802403F8 D7B400E0 */ ldc1 $f20, 0xe0($sp) -/* 9AEAFC 802403FC 03E00008 */ jr $ra -/* 9AEB00 80240400 27BD00F0 */ addiu $sp, $sp, 0xf0 diff --git a/asm/nonmatchings/world/area_trd/trd_05/func_80240404_9AE700.s b/asm/nonmatchings/world/area_trd/trd_05/func_80240404_9AE700.s deleted file mode 100644 index 5ecb09137a..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_05/func_80240404_9AE700.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_9AEB04 -/* 9AEB04 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9AEB08 80240408 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 9AEB0C 8024040C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 9AEB10 80240410 AFBF0014 */ sw $ra, 0x14($sp) -/* 9AEB14 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* 9AEB18 80240418 844300B0 */ lh $v1, 0xb0($v0) -/* 9AEB1C 8024041C 3C018024 */ lui $at, 0x8024 -/* 9AEB20 80240420 D4203070 */ ldc1 $f0, 0x3070($at) -/* 9AEB24 80240424 44831000 */ mtc1 $v1, $f2 -/* 9AEB28 80240428 00000000 */ nop -/* 9AEB2C 8024042C 468010A1 */ cvt.d.w $f2, $f2 -/* 9AEB30 80240430 46201082 */ mul.d $f2, $f2, $f0 -/* 9AEB34 80240434 00000000 */ nop -/* 9AEB38 80240438 24040001 */ addiu $a0, $zero, 1 -/* 9AEB3C 8024043C 3C108024 */ lui $s0, 0x8024 -/* 9AEB40 80240440 26103090 */ addiu $s0, $s0, 0x3090 -/* 9AEB44 80240444 C44A0028 */ lwc1 $f10, 0x28($v0) -/* 9AEB48 80240448 3C013FE0 */ lui $at, 0x3fe0 -/* 9AEB4C 8024044C 44812800 */ mtc1 $at, $f5 -/* 9AEB50 80240450 44802000 */ mtc1 $zero, $f4 -/* 9AEB54 80240454 C4480030 */ lwc1 $f8, 0x30($v0) -/* 9AEB58 80240458 3C013F36 */ lui $at, 0x3f36 -/* 9AEB5C 8024045C 3421DB6E */ ori $at, $at, 0xdb6e -/* 9AEB60 80240460 44813000 */ mtc1 $at, $f6 -/* 9AEB64 80240464 C440002C */ lwc1 $f0, 0x2c($v0) -/* 9AEB68 80240468 46241082 */ mul.d $f2, $f2, $f4 -/* 9AEB6C 8024046C 00000000 */ nop -/* 9AEB70 80240470 AE00001C */ sw $zero, 0x1c($s0) -/* 9AEB74 80240474 AE000020 */ sw $zero, 0x20($s0) -/* 9AEB78 80240478 AE000024 */ sw $zero, 0x24($s0) -/* 9AEB7C 8024047C E60A0010 */ swc1 $f10, 0x10($s0) -/* 9AEB80 80240480 E6080018 */ swc1 $f8, 0x18($s0) -/* 9AEB84 80240484 E6060028 */ swc1 $f6, 0x28($s0) -/* 9AEB88 80240488 46000021 */ cvt.d.s $f0, $f0 -/* 9AEB8C 8024048C 46220000 */ add.d $f0, $f0, $f2 -/* 9AEB90 80240490 E606002C */ swc1 $f6, 0x2c($s0) -/* 9AEB94 80240494 E6060030 */ swc1 $f6, 0x30($s0) -/* 9AEB98 80240498 46200020 */ cvt.s.d $f0, $f0 -/* 9AEB9C 8024049C 0C04E9C1 */ jal func_8013A704 -/* 9AEBA0 802404A0 E6000014 */ swc1 $f0, 0x14($s0) -/* 9AEBA4 802404A4 0000202D */ daddu $a0, $zero, $zero -/* 9AEBA8 802404A8 3C058024 */ lui $a1, 0x8024 -/* 9AEBAC 802404AC 24A50020 */ addiu $a1, $a1, 0x20 -/* 9AEBB0 802404B0 0C048C56 */ jal bind_dynamic_entity_3 -/* 9AEBB4 802404B4 AE020000 */ sw $v0, ($s0) -/* 9AEBB8 802404B8 AE020004 */ sw $v0, 4($s0) -/* 9AEBBC 802404BC 8FBF0014 */ lw $ra, 0x14($sp) -/* 9AEBC0 802404C0 8FB00010 */ lw $s0, 0x10($sp) -/* 9AEBC4 802404C4 24020002 */ addiu $v0, $zero, 2 -/* 9AEBC8 802404C8 03E00008 */ jr $ra -/* 9AEBCC 802404CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_05/func_802404D0_9AE700.s b/asm/nonmatchings/world/area_trd/trd_05/func_802404D0_9AE700.s deleted file mode 100644 index 03043d0e74..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_05/func_802404D0_9AE700.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404D0_9AEBD0 -/* 9AEBD0 802404D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9AEBD4 802404D4 AFB00010 */ sw $s0, 0x10($sp) -/* 9AEBD8 802404D8 3C108024 */ lui $s0, 0x8024 -/* 9AEBDC 802404DC 26103090 */ addiu $s0, $s0, 0x3090 -/* 9AEBE0 802404E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 9AEBE4 802404E4 0C04EA15 */ jal func_8013A854 -/* 9AEBE8 802404E8 8E040000 */ lw $a0, ($s0) -/* 9AEBEC 802404EC 0C048D70 */ jal func_801235C0 -/* 9AEBF0 802404F0 8E040004 */ lw $a0, 4($s0) -/* 9AEBF4 802404F4 8FBF0014 */ lw $ra, 0x14($sp) -/* 9AEBF8 802404F8 8FB00010 */ lw $s0, 0x10($sp) -/* 9AEBFC 802404FC 24020002 */ addiu $v0, $zero, 2 -/* 9AEC00 80240500 03E00008 */ jr $ra -/* 9AEC04 80240504 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_05/func_802405FC_9AE700.s b/asm/nonmatchings/world/area_trd/trd_05/func_802405FC_9AE700.s deleted file mode 100644 index eabc309132..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_05/func_802405FC_9AE700.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405FC_9AECFC -/* 9AECFC 802405FC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9AED00 80240600 AFB10014 */ sw $s1, 0x14($sp) -/* 9AED04 80240604 0080882D */ daddu $s1, $a0, $zero -/* 9AED08 80240608 AFBF0020 */ sw $ra, 0x20($sp) -/* 9AED0C 8024060C AFB3001C */ sw $s3, 0x1c($sp) -/* 9AED10 80240610 AFB20018 */ sw $s2, 0x18($sp) -/* 9AED14 80240614 AFB00010 */ sw $s0, 0x10($sp) -/* 9AED18 80240618 8E30000C */ lw $s0, 0xc($s1) -/* 9AED1C 8024061C 8E050000 */ lw $a1, ($s0) -/* 9AED20 80240620 0C0B1EAF */ jal get_variable -/* 9AED24 80240624 26100004 */ addiu $s0, $s0, 4 -/* 9AED28 80240628 8E050000 */ lw $a1, ($s0) -/* 9AED2C 8024062C 26100004 */ addiu $s0, $s0, 4 -/* 9AED30 80240630 0220202D */ daddu $a0, $s1, $zero -/* 9AED34 80240634 0C0B210B */ jal get_float_variable -/* 9AED38 80240638 0040902D */ daddu $s2, $v0, $zero -/* 9AED3C 8024063C 8E050000 */ lw $a1, ($s0) -/* 9AED40 80240640 26100004 */ addiu $s0, $s0, 4 -/* 9AED44 80240644 4600020D */ trunc.w.s $f8, $f0 -/* 9AED48 80240648 44134000 */ mfc1 $s3, $f8 -/* 9AED4C 8024064C 0C0B210B */ jal get_float_variable -/* 9AED50 80240650 0220202D */ daddu $a0, $s1, $zero -/* 9AED54 80240654 8E050000 */ lw $a1, ($s0) -/* 9AED58 80240658 4600020D */ trunc.w.s $f8, $f0 -/* 9AED5C 8024065C 44104000 */ mfc1 $s0, $f8 -/* 9AED60 80240660 0C0B210B */ jal get_float_variable -/* 9AED64 80240664 0220202D */ daddu $a0, $s1, $zero -/* 9AED68 80240668 4600020D */ trunc.w.s $f8, $f0 -/* 9AED6C 8024066C 44044000 */ mfc1 $a0, $f8 -/* 9AED70 80240670 3C028024 */ lui $v0, 0x8024 -/* 9AED74 80240674 24423090 */ addiu $v0, $v0, 0x3090 -/* 9AED78 80240678 1640000E */ bnez $s2, .L802406B4 -/* 9AED7C 8024067C 0040182D */ daddu $v1, $v0, $zero -/* 9AED80 80240680 44930000 */ mtc1 $s3, $f0 -/* 9AED84 80240684 00000000 */ nop -/* 9AED88 80240688 46800020 */ cvt.s.w $f0, $f0 -/* 9AED8C 8024068C E440001C */ swc1 $f0, 0x1c($v0) -/* 9AED90 80240690 44900000 */ mtc1 $s0, $f0 -/* 9AED94 80240694 00000000 */ nop -/* 9AED98 80240698 46800020 */ cvt.s.w $f0, $f0 -/* 9AED9C 8024069C E4400020 */ swc1 $f0, 0x20($v0) -/* 9AEDA0 802406A0 44840000 */ mtc1 $a0, $f0 -/* 9AEDA4 802406A4 00000000 */ nop -/* 9AEDA8 802406A8 46800020 */ cvt.s.w $f0, $f0 -/* 9AEDAC 802406AC 080901BF */ j .L802406FC -/* 9AEDB0 802406B0 E4400024 */ swc1 $f0, 0x24($v0) -.L802406B4: -/* 9AEDB4 802406B4 C466001C */ lwc1 $f6, 0x1c($v1) -/* 9AEDB8 802406B8 44930000 */ mtc1 $s3, $f0 -/* 9AEDBC 802406BC 00000000 */ nop -/* 9AEDC0 802406C0 46800020 */ cvt.s.w $f0, $f0 -/* 9AEDC4 802406C4 46003180 */ add.s $f6, $f6, $f0 -/* 9AEDC8 802406C8 C4640020 */ lwc1 $f4, 0x20($v1) -/* 9AEDCC 802406CC 44900000 */ mtc1 $s0, $f0 -/* 9AEDD0 802406D0 00000000 */ nop -/* 9AEDD4 802406D4 46800020 */ cvt.s.w $f0, $f0 -/* 9AEDD8 802406D8 46002100 */ add.s $f4, $f4, $f0 -/* 9AEDDC 802406DC C4620024 */ lwc1 $f2, 0x24($v1) -/* 9AEDE0 802406E0 44840000 */ mtc1 $a0, $f0 -/* 9AEDE4 802406E4 00000000 */ nop -/* 9AEDE8 802406E8 46800020 */ cvt.s.w $f0, $f0 -/* 9AEDEC 802406EC 46001080 */ add.s $f2, $f2, $f0 -/* 9AEDF0 802406F0 E466001C */ swc1 $f6, 0x1c($v1) -/* 9AEDF4 802406F4 E4640020 */ swc1 $f4, 0x20($v1) -/* 9AEDF8 802406F8 E4620024 */ swc1 $f2, 0x24($v1) -.L802406FC: -/* 9AEDFC 802406FC 8FBF0020 */ lw $ra, 0x20($sp) -/* 9AEE00 80240700 8FB3001C */ lw $s3, 0x1c($sp) -/* 9AEE04 80240704 8FB20018 */ lw $s2, 0x18($sp) -/* 9AEE08 80240708 8FB10014 */ lw $s1, 0x14($sp) -/* 9AEE0C 8024070C 8FB00010 */ lw $s0, 0x10($sp) -/* 9AEE10 80240710 24020002 */ addiu $v0, $zero, 2 -/* 9AEE14 80240714 03E00008 */ jr $ra -/* 9AEE18 80240718 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9AEE1C 8024071C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_05/func_80240720_9AE700.s b/asm/nonmatchings/world/area_trd/trd_05/func_80240720_9AE700.s deleted file mode 100644 index af6b0dd6b0..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_05/func_80240720_9AE700.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240720_9AEE20 -/* 9AEE20 80240720 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9AEE24 80240724 AFBF0018 */ sw $ra, 0x18($sp) -/* 9AEE28 80240728 C4800084 */ lwc1 $f0, 0x84($a0) -/* 9AEE2C 8024072C 46800020 */ cvt.s.w $f0, $f0 -/* 9AEE30 80240730 C4820088 */ lwc1 $f2, 0x88($a0) -/* 9AEE34 80240734 468010A0 */ cvt.s.w $f2, $f2 -/* 9AEE38 80240738 C484008C */ lwc1 $f4, 0x8c($a0) -/* 9AEE3C 8024073C 46802120 */ cvt.s.w $f4, $f4 -/* 9AEE40 80240740 44050000 */ mfc1 $a1, $f0 -/* 9AEE44 80240744 44061000 */ mfc1 $a2, $f2 -/* 9AEE48 80240748 44072000 */ mfc1 $a3, $f4 -/* 9AEE4C 8024074C 24040002 */ addiu $a0, $zero, 2 -/* 9AEE50 80240750 AFA00010 */ sw $zero, 0x10($sp) -/* 9AEE54 80240754 0C01BECC */ jal fx_walk_normal -/* 9AEE58 80240758 AFA00014 */ sw $zero, 0x14($sp) -/* 9AEE5C 8024075C 8FBF0018 */ lw $ra, 0x18($sp) -/* 9AEE60 80240760 24020002 */ addiu $v0, $zero, 2 -/* 9AEE64 80240764 03E00008 */ jr $ra -/* 9AEE68 80240768 27BD0020 */ addiu $sp, $sp, 0x20 -/* 9AEE6C 8024076C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_06/func_80240124_9B1790.s b/asm/nonmatchings/world/area_trd/trd_06/func_80240124_9B1790.s deleted file mode 100644 index 3b9dab6b53..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_06/func_80240124_9B1790.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_9B18B4 -/* 9B18B4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B18B8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 9B18BC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 9B18C0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 9B18C4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 9B18C8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 9B18CC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 9B18D0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 9B18D4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 9B18D8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 9B18DC 8024014C 1440000E */ bnez $v0, .L80240188 -/* 9B18E0 80240150 00000000 */ nop -/* 9B18E4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 9B18E8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 9B18EC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 9B18F0 80240160 04610004 */ bgez $v1, .L80240174 -/* 9B18F4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 9B18F8 80240168 3C020002 */ lui $v0, 2 -/* 9B18FC 8024016C 08090061 */ j .L80240184 -/* 9B1900 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 9B1904 80240174 3C040002 */ lui $a0, 2 -/* 9B1908 80240178 0083102A */ slt $v0, $a0, $v1 -/* 9B190C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 9B1910 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 9B1914 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 9B1918 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 9B191C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 9B1920 80240190 00000000 */ nop -/* 9B1924 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 9B1928 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 9B192C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 9B1930 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 9B1934 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 9B1938 802401A8 3C020002 */ lui $v0, 2 -/* 9B193C 802401AC 08090071 */ j .L802401C4 -/* 9B1940 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 9B1944 802401B4 3C040002 */ lui $a0, 2 -/* 9B1948 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 9B194C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 9B1950 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 9B1954 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 9B1958 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 9B195C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 9B1960 802401D0 00000000 */ nop -/* 9B1964 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 9B1968 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 9B196C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 9B1970 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 9B1974 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 9B1978 802401E8 3C020002 */ lui $v0, 2 -/* 9B197C 802401EC 08090081 */ j .L80240204 -/* 9B1980 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 9B1984 802401F4 3C040002 */ lui $a0, 2 -/* 9B1988 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 9B198C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 9B1990 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 9B1994 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 9B1998 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 9B199C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 9B19A0 80240210 00000000 */ nop -/* 9B19A4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 9B19A8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 9B19AC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 9B19B0 80240220 04610004 */ bgez $v1, .L80240234 -/* 9B19B4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 9B19B8 80240228 3C020002 */ lui $v0, 2 -/* 9B19BC 8024022C 08090091 */ j .L80240244 -/* 9B19C0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 9B19C4 80240234 3C040002 */ lui $a0, 2 -/* 9B19C8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 9B19CC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 9B19D0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 9B19D4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 9B19D8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 9B19DC 8024024C 0C046F07 */ jal set_main_pan_u -/* 9B19E0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 9B19E4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 9B19E8 80240258 0C046F0D */ jal set_main_pan_v -/* 9B19EC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 9B19F0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 9B19F4 80240264 0C046F13 */ jal set_aux_pan_u -/* 9B19F8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 9B19FC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 9B1A00 80240270 0C046F19 */ jal set_aux_pan_v -/* 9B1A04 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 9B1A08 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 9B1A0C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 9B1A10 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 9B1A14 80240284 24420001 */ addiu $v0, $v0, 1 -/* 9B1A18 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 9B1A1C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 9B1A20 80240290 24630001 */ addiu $v1, $v1, 1 -/* 9B1A24 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 9B1A28 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 9B1A2C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 9B1A30 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 9B1A34 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 9B1A38 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 9B1A3C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 9B1A40 802402B0 14600002 */ bnez $v1, .L802402BC -/* 9B1A44 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 9B1A48 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 9B1A4C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 9B1A50 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 9B1A54 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 9B1A58 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 9B1A5C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 9B1A60 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 9B1A64 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 9B1A68 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 9B1A6C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 9B1A70 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 9B1A74 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 9B1A78 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 9B1A7C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 9B1A80 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 9B1A84 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 9B1A88 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B1A8C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 9B1A90 80240300 0000102D */ daddu $v0, $zero, $zero -/* 9B1A94 80240304 03E00008 */ jr $ra -/* 9B1A98 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9B1A9C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_06/func_80240310_9B1790.s b/asm/nonmatchings/world/area_trd/trd_06/func_80240310_9B1790.s deleted file mode 100644 index 3f044b78dc..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_06/func_80240310_9B1790.s +++ /dev/null @@ -1,268 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_9B1AA0 -/* 9B1AA0 80240310 27BDFF10 */ addiu $sp, $sp, -0xf0 -/* 9B1AA4 80240314 3C06E300 */ lui $a2, 0xe300 -/* 9B1AA8 80240318 34C60A01 */ ori $a2, $a2, 0xa01 -/* 9B1AAC 8024031C 3C07D9C0 */ lui $a3, 0xd9c0 -/* 9B1AB0 80240320 34E7F9FB */ ori $a3, $a3, 0xf9fb -/* 9B1AB4 80240324 3C09D9FF */ lui $t1, 0xd9ff -/* 9B1AB8 80240328 3529FFFF */ ori $t1, $t1, 0xffff -/* 9B1ABC 8024032C 3C080020 */ lui $t0, 0x20 -/* 9B1AC0 80240330 35080005 */ ori $t0, $t0, 5 -/* 9B1AC4 80240334 3C0AD700 */ lui $t2, 0xd700 -/* 9B1AC8 80240338 354A0002 */ ori $t2, $t2, 2 -/* 9B1ACC 8024033C 3C0BE300 */ lui $t3, 0xe300 -/* 9B1AD0 80240340 356B0F00 */ ori $t3, $t3, 0xf00 -/* 9B1AD4 80240344 3C0CE300 */ lui $t4, 0xe300 -/* 9B1AD8 80240348 358C0C00 */ ori $t4, $t4, 0xc00 -/* 9B1ADC 8024034C 3C0DE300 */ lui $t5, 0xe300 -/* 9B1AE0 80240350 35AD1201 */ ori $t5, $t5, 0x1201 -/* 9B1AE4 80240354 3C0EE300 */ lui $t6, 0xe300 -/* 9B1AE8 80240358 35CE1801 */ ori $t6, $t6, 0x1801 -/* 9B1AEC 8024035C 3C0FE300 */ lui $t7, 0xe300 -/* 9B1AF0 80240360 35EF0D01 */ ori $t7, $t7, 0xd01 -/* 9B1AF4 80240364 AFB000C0 */ sw $s0, 0xc0($sp) -/* 9B1AF8 80240368 3C10E300 */ lui $s0, 0xe300 -/* 9B1AFC 8024036C 36101402 */ ori $s0, $s0, 0x1402 -/* 9B1B00 80240370 AFB300CC */ sw $s3, 0xcc($sp) -/* 9B1B04 80240374 3C13E300 */ lui $s3, 0xe300 -/* 9B1B08 80240378 36731700 */ ori $s3, $s3, 0x1700 -/* 9B1B0C 8024037C AFB400D0 */ sw $s4, 0xd0($sp) -/* 9B1B10 80240380 3C14E200 */ lui $s4, 0xe200 -/* 9B1B14 80240384 36941E01 */ ori $s4, $s4, 0x1e01 -/* 9B1B18 80240388 AFB200C8 */ sw $s2, 0xc8($sp) -/* 9B1B1C 8024038C 27B20040 */ addiu $s2, $sp, 0x40 -/* 9B1B20 80240390 0240202D */ daddu $a0, $s2, $zero -/* 9B1B24 80240394 AFB500D4 */ sw $s5, 0xd4($sp) -/* 9B1B28 80240398 3C150001 */ lui $s5, 1 -/* 9B1B2C 8024039C AFB100C4 */ sw $s1, 0xc4($sp) -/* 9B1B30 802403A0 3C11800A */ lui $s1, 0x800a -/* 9B1B34 802403A4 2631A66C */ addiu $s1, $s1, -0x5994 -/* 9B1B38 802403A8 36B51630 */ ori $s5, $s5, 0x1630 -/* 9B1B3C 802403AC AFBF00D8 */ sw $ra, 0xd8($sp) -/* 9B1B40 802403B0 F7B600E8 */ sdc1 $f22, 0xe8($sp) -/* 9B1B44 802403B4 F7B400E0 */ sdc1 $f20, 0xe0($sp) -/* 9B1B48 802403B8 8E220000 */ lw $v0, ($s1) -/* 9B1B4C 802403BC 3C03E700 */ lui $v1, 0xe700 -/* 9B1B50 802403C0 0040282D */ daddu $a1, $v0, $zero -/* 9B1B54 802403C4 24420008 */ addiu $v0, $v0, 8 -/* 9B1B58 802403C8 AE220000 */ sw $v0, ($s1) -/* 9B1B5C 802403CC ACA30000 */ sw $v1, ($a1) -/* 9B1B60 802403D0 24430008 */ addiu $v1, $v0, 8 -/* 9B1B64 802403D4 ACA00004 */ sw $zero, 4($a1) -/* 9B1B68 802403D8 AE230000 */ sw $v1, ($s1) -/* 9B1B6C 802403DC 24430010 */ addiu $v1, $v0, 0x10 -/* 9B1B70 802403E0 AC460000 */ sw $a2, ($v0) -/* 9B1B74 802403E4 AC400004 */ sw $zero, 4($v0) -/* 9B1B78 802403E8 AE230000 */ sw $v1, ($s1) -/* 9B1B7C 802403EC 24430018 */ addiu $v1, $v0, 0x18 -/* 9B1B80 802403F0 AC470008 */ sw $a3, 8($v0) -/* 9B1B84 802403F4 AC40000C */ sw $zero, 0xc($v0) -/* 9B1B88 802403F8 AE230000 */ sw $v1, ($s1) -/* 9B1B8C 802403FC 24430020 */ addiu $v1, $v0, 0x20 -/* 9B1B90 80240400 AC490010 */ sw $t1, 0x10($v0) -/* 9B1B94 80240404 AC480014 */ sw $t0, 0x14($v0) -/* 9B1B98 80240408 AE230000 */ sw $v1, ($s1) -/* 9B1B9C 8024040C 2403FFFF */ addiu $v1, $zero, -1 -/* 9B1BA0 80240410 AC43001C */ sw $v1, 0x1c($v0) -/* 9B1BA4 80240414 24430028 */ addiu $v1, $v0, 0x28 -/* 9B1BA8 80240418 AC4A0018 */ sw $t2, 0x18($v0) -/* 9B1BAC 8024041C AE230000 */ sw $v1, ($s1) -/* 9B1BB0 80240420 24430030 */ addiu $v1, $v0, 0x30 -/* 9B1BB4 80240424 AC4B0020 */ sw $t3, 0x20($v0) -/* 9B1BB8 80240428 AC400024 */ sw $zero, 0x24($v0) -/* 9B1BBC 8024042C AE230000 */ sw $v1, ($s1) -/* 9B1BC0 80240430 3C030008 */ lui $v1, 8 -/* 9B1BC4 80240434 AC43002C */ sw $v1, 0x2c($v0) -/* 9B1BC8 80240438 24430038 */ addiu $v1, $v0, 0x38 -/* 9B1BCC 8024043C AC4C0028 */ sw $t4, 0x28($v0) -/* 9B1BD0 80240440 AE230000 */ sw $v1, ($s1) -/* 9B1BD4 80240444 24032000 */ addiu $v1, $zero, 0x2000 -/* 9B1BD8 80240448 AC4D0030 */ sw $t5, 0x30($v0) -/* 9B1BDC 8024044C AC430034 */ sw $v1, 0x34($v0) -/* 9B1BE0 80240450 24430040 */ addiu $v1, $v0, 0x40 -/* 9B1BE4 80240454 AE230000 */ sw $v1, ($s1) -/* 9B1BE8 80240458 240300C0 */ addiu $v1, $zero, 0xc0 -/* 9B1BEC 8024045C AC43003C */ sw $v1, 0x3c($v0) -/* 9B1BF0 80240460 24430048 */ addiu $v1, $v0, 0x48 -/* 9B1BF4 80240464 AC4E0038 */ sw $t6, 0x38($v0) -/* 9B1BF8 80240468 AE230000 */ sw $v1, ($s1) -/* 9B1BFC 8024046C 24430050 */ addiu $v1, $v0, 0x50 -/* 9B1C00 80240470 AC4F0040 */ sw $t7, 0x40($v0) -/* 9B1C04 80240474 AC400044 */ sw $zero, 0x44($v0) -/* 9B1C08 80240478 AE230000 */ sw $v1, ($s1) -/* 9B1C0C 8024047C 24030C00 */ addiu $v1, $zero, 0xc00 -/* 9B1C10 80240480 AC500048 */ sw $s0, 0x48($v0) -/* 9B1C14 80240484 AC43004C */ sw $v1, 0x4c($v0) -/* 9B1C18 80240488 AC530050 */ sw $s3, 0x50($v0) -/* 9B1C1C 8024048C 3C138024 */ lui $s3, 0x8024 -/* 9B1C20 80240490 267351F0 */ addiu $s3, $s3, 0x51f0 -/* 9B1C24 80240494 24430058 */ addiu $v1, $v0, 0x58 -/* 9B1C28 80240498 AC400054 */ sw $zero, 0x54($v0) -/* 9B1C2C 8024049C AC540058 */ sw $s4, 0x58($v0) -/* 9B1C30 802404A0 AC40005C */ sw $zero, 0x5c($v0) -/* 9B1C34 802404A4 8E650014 */ lw $a1, 0x14($s3) -/* 9B1C38 802404A8 8E660018 */ lw $a2, 0x18($s3) -/* 9B1C3C 802404AC 8E67001C */ lw $a3, 0x1c($s3) -/* 9B1C40 802404B0 24420060 */ addiu $v0, $v0, 0x60 -/* 9B1C44 802404B4 AE230000 */ sw $v1, ($s1) -/* 9B1C48 802404B8 0C019E40 */ jal guTranslateF -/* 9B1C4C 802404BC AE220000 */ sw $v0, ($s1) -/* 9B1C50 802404C0 27B00080 */ addiu $s0, $sp, 0x80 -/* 9B1C54 802404C4 8E650024 */ lw $a1, 0x24($s3) -/* 9B1C58 802404C8 4480A000 */ mtc1 $zero, $f20 -/* 9B1C5C 802404CC 3C013F80 */ lui $at, 0x3f80 -/* 9B1C60 802404D0 4481B000 */ mtc1 $at, $f22 -/* 9B1C64 802404D4 4406A000 */ mfc1 $a2, $f20 -/* 9B1C68 802404D8 4407B000 */ mfc1 $a3, $f22 -/* 9B1C6C 802404DC 0200202D */ daddu $a0, $s0, $zero -/* 9B1C70 802404E0 0C019EC8 */ jal guRotateF -/* 9B1C74 802404E4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 9B1C78 802404E8 0200202D */ daddu $a0, $s0, $zero -/* 9B1C7C 802404EC 0240282D */ daddu $a1, $s2, $zero -/* 9B1C80 802404F0 0C019D80 */ jal guMtxCatF -/* 9B1C84 802404F4 0240302D */ daddu $a2, $s2, $zero -/* 9B1C88 802404F8 8E650028 */ lw $a1, 0x28($s3) -/* 9B1C8C 802404FC 4406A000 */ mfc1 $a2, $f20 -/* 9B1C90 80240500 4407A000 */ mfc1 $a3, $f20 -/* 9B1C94 80240504 0200202D */ daddu $a0, $s0, $zero -/* 9B1C98 80240508 0C019EC8 */ jal guRotateF -/* 9B1C9C 8024050C E7B60010 */ swc1 $f22, 0x10($sp) -/* 9B1CA0 80240510 0200202D */ daddu $a0, $s0, $zero -/* 9B1CA4 80240514 0240282D */ daddu $a1, $s2, $zero -/* 9B1CA8 80240518 0C019D80 */ jal guMtxCatF -/* 9B1CAC 8024051C 0240302D */ daddu $a2, $s2, $zero -/* 9B1CB0 80240520 8E650020 */ lw $a1, 0x20($s3) -/* 9B1CB4 80240524 4406B000 */ mfc1 $a2, $f22 -/* 9B1CB8 80240528 4407A000 */ mfc1 $a3, $f20 -/* 9B1CBC 8024052C 0200202D */ daddu $a0, $s0, $zero -/* 9B1CC0 80240530 0C019EC8 */ jal guRotateF -/* 9B1CC4 80240534 AFA70010 */ sw $a3, 0x10($sp) -/* 9B1CC8 80240538 0200202D */ daddu $a0, $s0, $zero -/* 9B1CCC 8024053C 0240282D */ daddu $a1, $s2, $zero -/* 9B1CD0 80240540 0C019D80 */ jal guMtxCatF -/* 9B1CD4 80240544 0240302D */ daddu $a2, $s2, $zero -/* 9B1CD8 80240548 8E65002C */ lw $a1, 0x2c($s3) -/* 9B1CDC 8024054C 8E660030 */ lw $a2, 0x30($s3) -/* 9B1CE0 80240550 8E670034 */ lw $a3, 0x34($s3) -/* 9B1CE4 80240554 0C019DF0 */ jal guScaleF -/* 9B1CE8 80240558 0200202D */ daddu $a0, $s0, $zero -/* 9B1CEC 8024055C 0200202D */ daddu $a0, $s0, $zero -/* 9B1CF0 80240560 0240282D */ daddu $a1, $s2, $zero -/* 9B1CF4 80240564 0C019D80 */ jal guMtxCatF -/* 9B1CF8 80240568 0240302D */ daddu $a2, $s2, $zero -/* 9B1CFC 8024056C 0240202D */ daddu $a0, $s2, $zero -/* 9B1D00 80240570 3C108007 */ lui $s0, 0x8007 -/* 9B1D04 80240574 261041F0 */ addiu $s0, $s0, 0x41f0 -/* 9B1D08 80240578 3C12800A */ lui $s2, 0x800a -/* 9B1D0C 8024057C 2652A674 */ addiu $s2, $s2, -0x598c -/* 9B1D10 80240580 96050000 */ lhu $a1, ($s0) -/* 9B1D14 80240584 8E420000 */ lw $v0, ($s2) -/* 9B1D18 80240588 00052980 */ sll $a1, $a1, 6 -/* 9B1D1C 8024058C 00B52821 */ addu $a1, $a1, $s5 -/* 9B1D20 80240590 0C019D40 */ jal guMtxF2L -/* 9B1D24 80240594 00452821 */ addu $a1, $v0, $a1 -/* 9B1D28 80240598 3C03DA38 */ lui $v1, 0xda38 -/* 9B1D2C 8024059C 34630002 */ ori $v1, $v1, 2 -/* 9B1D30 802405A0 8E220000 */ lw $v0, ($s1) -/* 9B1D34 802405A4 96040000 */ lhu $a0, ($s0) -/* 9B1D38 802405A8 0040282D */ daddu $a1, $v0, $zero -/* 9B1D3C 802405AC 24420008 */ addiu $v0, $v0, 8 -/* 9B1D40 802405B0 AE220000 */ sw $v0, ($s1) -/* 9B1D44 802405B4 3082FFFF */ andi $v0, $a0, 0xffff -/* 9B1D48 802405B8 00021180 */ sll $v0, $v0, 6 -/* 9B1D4C 802405BC ACA30000 */ sw $v1, ($a1) -/* 9B1D50 802405C0 8E430000 */ lw $v1, ($s2) -/* 9B1D54 802405C4 00551021 */ addu $v0, $v0, $s5 -/* 9B1D58 802405C8 00621821 */ addu $v1, $v1, $v0 -/* 9B1D5C 802405CC 3C028000 */ lui $v0, 0x8000 -/* 9B1D60 802405D0 00621821 */ addu $v1, $v1, $v0 -/* 9B1D64 802405D4 ACA30004 */ sw $v1, 4($a1) -/* 9B1D68 802405D8 8E620000 */ lw $v0, ($s3) -/* 9B1D6C 802405DC 24840001 */ addiu $a0, $a0, 1 -/* 9B1D70 802405E0 14400012 */ bnez $v0, .L8024062C -/* 9B1D74 802405E4 A6040000 */ sh $a0, ($s0) -/* 9B1D78 802405E8 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 9B1D7C 802405EC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 9B1D80 802405F0 24030008 */ addiu $v1, $zero, 8 -/* 9B1D84 802405F4 AE63000C */ sw $v1, 0xc($s3) -/* 9B1D88 802405F8 94420134 */ lhu $v0, 0x134($v0) -/* 9B1D8C 802405FC 30430003 */ andi $v1, $v0, 3 -/* 9B1D90 80240600 14600003 */ bnez $v1, .L80240610 -/* 9B1D94 80240604 2C620002 */ sltiu $v0, $v1, 2 -/* 9B1D98 80240608 0809018A */ j .L80240628 -/* 9B1D9C 8024060C 24020025 */ addiu $v0, $zero, 0x25 -.L80240610: -/* 9B1DA0 80240610 14400005 */ bnez $v0, .L80240628 -/* 9B1DA4 80240614 24020026 */ addiu $v0, $zero, 0x26 -/* 9B1DA8 80240618 2C620003 */ sltiu $v0, $v1, 3 -/* 9B1DAC 8024061C 14400002 */ bnez $v0, .L80240628 -/* 9B1DB0 80240620 24020027 */ addiu $v0, $zero, 0x27 -/* 9B1DB4 80240624 24020024 */ addiu $v0, $zero, 0x24 -.L80240628: -/* 9B1DB8 80240628 AE620010 */ sw $v0, 0x10($s3) -.L8024062C: -/* 9B1DBC 8024062C 8E65000C */ lw $a1, 0xc($s3) -/* 9B1DC0 80240630 8E660010 */ lw $a2, 0x10($s3) -/* 9B1DC4 80240634 0C0B7811 */ jal func_802DE044 -/* 9B1DC8 80240638 27A40030 */ addiu $a0, $sp, 0x30 -/* 9B1DCC 8024063C 27A50018 */ addiu $a1, $sp, 0x18 -/* 9B1DD0 80240640 0000302D */ daddu $a2, $zero, $zero -/* 9B1DD4 80240644 8E640004 */ lw $a0, 4($s3) -/* 9B1DD8 80240648 8FA30030 */ lw $v1, 0x30($sp) -/* 9B1DDC 8024064C 8FA90034 */ lw $t1, 0x34($sp) -/* 9B1DE0 80240650 97A8003A */ lhu $t0, 0x3a($sp) -/* 9B1DE4 80240654 240200FF */ addiu $v0, $zero, 0xff -/* 9B1DE8 80240658 A3A20028 */ sb $v0, 0x28($sp) -/* 9B1DEC 8024065C A7A80020 */ sh $t0, 0x20($sp) -/* 9B1DF0 80240660 3108FFFF */ andi $t0, $t0, 0xffff -/* 9B1DF4 80240664 AFA30018 */ sw $v1, 0x18($sp) -/* 9B1DF8 80240668 97A3003E */ lhu $v1, 0x3e($sp) -/* 9B1DFC 8024066C 44880000 */ mtc1 $t0, $f0 -/* 9B1E00 80240670 00000000 */ nop -/* 9B1E04 80240674 46800020 */ cvt.s.w $f0, $f0 -/* 9B1E08 80240678 AFA9001C */ sw $t1, 0x1c($sp) -/* 9B1E0C 8024067C E6600038 */ swc1 $f0, 0x38($s3) -/* 9B1E10 80240680 8FA20038 */ lw $v0, 0x38($sp) -/* 9B1E14 80240684 27A70040 */ addiu $a3, $sp, 0x40 -/* 9B1E18 80240688 A7A30022 */ sh $v1, 0x22($sp) -/* 9B1E1C 8024068C 3063FFFF */ andi $v1, $v1, 0xffff -/* 9B1E20 80240690 44830000 */ mtc1 $v1, $f0 -/* 9B1E24 80240694 00000000 */ nop -/* 9B1E28 80240698 46800020 */ cvt.s.w $f0, $f0 -/* 9B1E2C 8024069C 00021FC2 */ srl $v1, $v0, 0x1f -/* 9B1E30 802406A0 00431021 */ addu $v0, $v0, $v1 -/* 9B1E34 802406A4 00021043 */ sra $v0, $v0, 1 -/* 9B1E38 802406A8 E660003C */ swc1 $f0, 0x3c($s3) -/* 9B1E3C 802406AC 8FA3003C */ lw $v1, 0x3c($sp) -/* 9B1E40 802406B0 00021023 */ negu $v0, $v0 -/* 9B1E44 802406B4 A7A20024 */ sh $v0, 0x24($sp) -/* 9B1E48 802406B8 000317C2 */ srl $v0, $v1, 0x1f -/* 9B1E4C 802406BC 00621821 */ addu $v1, $v1, $v0 -/* 9B1E50 802406C0 00031843 */ sra $v1, $v1, 1 -/* 9B1E54 802406C4 0C04EBDC */ jal func_8013AF70 -/* 9B1E58 802406C8 A7A30026 */ sh $v1, 0x26($sp) -/* 9B1E5C 802406CC 3C05D838 */ lui $a1, 0xd838 -/* 9B1E60 802406D0 3C03800A */ lui $v1, 0x800a -/* 9B1E64 802406D4 2463A66C */ addiu $v1, $v1, -0x5994 -/* 9B1E68 802406D8 8C620000 */ lw $v0, ($v1) -/* 9B1E6C 802406DC 34A50002 */ ori $a1, $a1, 2 -/* 9B1E70 802406E0 0040202D */ daddu $a0, $v0, $zero -/* 9B1E74 802406E4 24420008 */ addiu $v0, $v0, 8 -/* 9B1E78 802406E8 AC620000 */ sw $v0, ($v1) -/* 9B1E7C 802406EC 24020040 */ addiu $v0, $zero, 0x40 -/* 9B1E80 802406F0 AC850000 */ sw $a1, ($a0) -/* 9B1E84 802406F4 AC820004 */ sw $v0, 4($a0) -/* 9B1E88 802406F8 8FBF00D8 */ lw $ra, 0xd8($sp) -/* 9B1E8C 802406FC 8FB500D4 */ lw $s5, 0xd4($sp) -/* 9B1E90 80240700 8FB400D0 */ lw $s4, 0xd0($sp) -/* 9B1E94 80240704 8FB300CC */ lw $s3, 0xcc($sp) -/* 9B1E98 80240708 8FB200C8 */ lw $s2, 0xc8($sp) -/* 9B1E9C 8024070C 8FB100C4 */ lw $s1, 0xc4($sp) -/* 9B1EA0 80240710 8FB000C0 */ lw $s0, 0xc0($sp) -/* 9B1EA4 80240714 D7B600E8 */ ldc1 $f22, 0xe8($sp) -/* 9B1EA8 80240718 D7B400E0 */ ldc1 $f20, 0xe0($sp) -/* 9B1EAC 8024071C 03E00008 */ jr $ra -/* 9B1EB0 80240720 27BD00F0 */ addiu $sp, $sp, 0xf0 diff --git a/asm/nonmatchings/world/area_trd/trd_06/func_8024081C_9B1790.s b/asm/nonmatchings/world/area_trd/trd_06/func_8024081C_9B1790.s deleted file mode 100644 index 334369ca03..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_06/func_8024081C_9B1790.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024081C_9B1FAC -/* 9B1FAC 8024081C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B1FB0 80240820 AFB00010 */ sw $s0, 0x10($sp) -/* 9B1FB4 80240824 3C108024 */ lui $s0, 0x8024 -/* 9B1FB8 80240828 261051F0 */ addiu $s0, $s0, 0x51f0 -/* 9B1FBC 8024082C AFBF0014 */ sw $ra, 0x14($sp) -/* 9B1FC0 80240830 0C04EA15 */ jal func_8013A854 -/* 9B1FC4 80240834 8E040004 */ lw $a0, 4($s0) -/* 9B1FC8 80240838 0C048D70 */ jal func_801235C0 -/* 9B1FCC 8024083C 8E040008 */ lw $a0, 8($s0) -/* 9B1FD0 80240840 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B1FD4 80240844 8FB00010 */ lw $s0, 0x10($sp) -/* 9B1FD8 80240848 24020002 */ addiu $v0, $zero, 2 -/* 9B1FDC 8024084C 03E00008 */ jr $ra -/* 9B1FE0 80240850 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_06/func_80240854_9B1790.s b/asm/nonmatchings/world/area_trd/trd_06/func_80240854_9B1790.s deleted file mode 100644 index 007673f79e..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_06/func_80240854_9B1790.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240854_9B1FE4 -/* 9B1FE4 80240854 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9B1FE8 80240858 AFB10014 */ sw $s1, 0x14($sp) -/* 9B1FEC 8024085C 0080882D */ daddu $s1, $a0, $zero -/* 9B1FF0 80240860 AFBF001C */ sw $ra, 0x1c($sp) -/* 9B1FF4 80240864 AFB20018 */ sw $s2, 0x18($sp) -/* 9B1FF8 80240868 AFB00010 */ sw $s0, 0x10($sp) -/* 9B1FFC 8024086C 8E30000C */ lw $s0, 0xc($s1) -/* 9B2000 80240870 8E050000 */ lw $a1, ($s0) -/* 9B2004 80240874 0C0B210B */ jal get_float_variable -/* 9B2008 80240878 26100004 */ addiu $s0, $s0, 4 -/* 9B200C 8024087C 8E050000 */ lw $a1, ($s0) -/* 9B2010 80240880 26100004 */ addiu $s0, $s0, 4 -/* 9B2014 80240884 4600018D */ trunc.w.s $f6, $f0 -/* 9B2018 80240888 44123000 */ mfc1 $s2, $f6 -/* 9B201C 8024088C 0C0B210B */ jal get_float_variable -/* 9B2020 80240890 0220202D */ daddu $a0, $s1, $zero -/* 9B2024 80240894 8E050000 */ lw $a1, ($s0) -/* 9B2028 80240898 4600018D */ trunc.w.s $f6, $f0 -/* 9B202C 8024089C 44103000 */ mfc1 $s0, $f6 -/* 9B2030 802408A0 0C0B210B */ jal get_float_variable -/* 9B2034 802408A4 0220202D */ daddu $a0, $s1, $zero -/* 9B2038 802408A8 3C028024 */ lui $v0, 0x8024 -/* 9B203C 802408AC 244251F0 */ addiu $v0, $v0, 0x51f0 -/* 9B2040 802408B0 C442003C */ lwc1 $f2, 0x3c($v0) -/* 9B2044 802408B4 3C018024 */ lui $at, 0x8024 -/* 9B2048 802408B8 D42451C8 */ ldc1 $f4, 0x51c8($at) -/* 9B204C 802408BC 460010A1 */ cvt.d.s $f2, $f2 -/* 9B2050 802408C0 46241082 */ mul.d $f2, $f2, $f4 -/* 9B2054 802408C4 00000000 */ nop -/* 9B2058 802408C8 3C013FE0 */ lui $at, 0x3fe0 -/* 9B205C 802408CC 44812800 */ mtc1 $at, $f5 -/* 9B2060 802408D0 44802000 */ mtc1 $zero, $f4 -/* 9B2064 802408D4 00000000 */ nop -/* 9B2068 802408D8 46241082 */ mul.d $f2, $f2, $f4 -/* 9B206C 802408DC 00000000 */ nop -/* 9B2070 802408E0 4600018D */ trunc.w.s $f6, $f0 -/* 9B2074 802408E4 44033000 */ mfc1 $v1, $f6 -/* 9B2078 802408E8 44900000 */ mtc1 $s0, $f0 -/* 9B207C 802408EC 00000000 */ nop -/* 9B2080 802408F0 46800021 */ cvt.d.w $f0, $f0 -/* 9B2084 802408F4 44922000 */ mtc1 $s2, $f4 -/* 9B2088 802408F8 00000000 */ nop -/* 9B208C 802408FC 46802120 */ cvt.s.w $f4, $f4 -/* 9B2090 80240900 E4440014 */ swc1 $f4, 0x14($v0) -/* 9B2094 80240904 46220000 */ add.d $f0, $f0, $f2 -/* 9B2098 80240908 44831000 */ mtc1 $v1, $f2 -/* 9B209C 8024090C 00000000 */ nop -/* 9B20A0 80240910 468010A0 */ cvt.s.w $f2, $f2 -/* 9B20A4 80240914 E442001C */ swc1 $f2, 0x1c($v0) -/* 9B20A8 80240918 46200020 */ cvt.s.d $f0, $f0 -/* 9B20AC 8024091C E4400018 */ swc1 $f0, 0x18($v0) -/* 9B20B0 80240920 8FBF001C */ lw $ra, 0x1c($sp) -/* 9B20B4 80240924 8FB20018 */ lw $s2, 0x18($sp) -/* 9B20B8 80240928 8FB10014 */ lw $s1, 0x14($sp) -/* 9B20BC 8024092C 8FB00010 */ lw $s0, 0x10($sp) -/* 9B20C0 80240930 24020002 */ addiu $v0, $zero, 2 -/* 9B20C4 80240934 03E00008 */ jr $ra -/* 9B20C8 80240938 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_06/func_8024093C_9B1790.s b/asm/nonmatchings/world/area_trd/trd_06/func_8024093C_9B1790.s deleted file mode 100644 index 85f40dec40..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_06/func_8024093C_9B1790.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024093C_9B20CC -/* 9B20CC 8024093C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9B20D0 80240940 AFB10014 */ sw $s1, 0x14($sp) -/* 9B20D4 80240944 0080882D */ daddu $s1, $a0, $zero -/* 9B20D8 80240948 AFBF0020 */ sw $ra, 0x20($sp) -/* 9B20DC 8024094C AFB3001C */ sw $s3, 0x1c($sp) -/* 9B20E0 80240950 AFB20018 */ sw $s2, 0x18($sp) -/* 9B20E4 80240954 AFB00010 */ sw $s0, 0x10($sp) -/* 9B20E8 80240958 8E30000C */ lw $s0, 0xc($s1) -/* 9B20EC 8024095C 8E050000 */ lw $a1, ($s0) -/* 9B20F0 80240960 0C0B1EAF */ jal get_variable -/* 9B20F4 80240964 26100004 */ addiu $s0, $s0, 4 -/* 9B20F8 80240968 8E050000 */ lw $a1, ($s0) -/* 9B20FC 8024096C 26100004 */ addiu $s0, $s0, 4 -/* 9B2100 80240970 0220202D */ daddu $a0, $s1, $zero -/* 9B2104 80240974 0C0B210B */ jal get_float_variable -/* 9B2108 80240978 0040902D */ daddu $s2, $v0, $zero -/* 9B210C 8024097C 8E050000 */ lw $a1, ($s0) -/* 9B2110 80240980 26100004 */ addiu $s0, $s0, 4 -/* 9B2114 80240984 4600020D */ trunc.w.s $f8, $f0 -/* 9B2118 80240988 44134000 */ mfc1 $s3, $f8 -/* 9B211C 8024098C 0C0B210B */ jal get_float_variable -/* 9B2120 80240990 0220202D */ daddu $a0, $s1, $zero -/* 9B2124 80240994 8E050000 */ lw $a1, ($s0) -/* 9B2128 80240998 4600020D */ trunc.w.s $f8, $f0 -/* 9B212C 8024099C 44104000 */ mfc1 $s0, $f8 -/* 9B2130 802409A0 0C0B210B */ jal get_float_variable -/* 9B2134 802409A4 0220202D */ daddu $a0, $s1, $zero -/* 9B2138 802409A8 4600020D */ trunc.w.s $f8, $f0 -/* 9B213C 802409AC 44044000 */ mfc1 $a0, $f8 -/* 9B2140 802409B0 3C028024 */ lui $v0, 0x8024 -/* 9B2144 802409B4 244251F0 */ addiu $v0, $v0, 0x51f0 -/* 9B2148 802409B8 1640000E */ bnez $s2, .L802409F4 -/* 9B214C 802409BC 0040182D */ daddu $v1, $v0, $zero -/* 9B2150 802409C0 44930000 */ mtc1 $s3, $f0 -/* 9B2154 802409C4 00000000 */ nop -/* 9B2158 802409C8 46800020 */ cvt.s.w $f0, $f0 -/* 9B215C 802409CC E4400020 */ swc1 $f0, 0x20($v0) -/* 9B2160 802409D0 44900000 */ mtc1 $s0, $f0 -/* 9B2164 802409D4 00000000 */ nop -/* 9B2168 802409D8 46800020 */ cvt.s.w $f0, $f0 -/* 9B216C 802409DC E4400024 */ swc1 $f0, 0x24($v0) -/* 9B2170 802409E0 44840000 */ mtc1 $a0, $f0 -/* 9B2174 802409E4 00000000 */ nop -/* 9B2178 802409E8 46800020 */ cvt.s.w $f0, $f0 -/* 9B217C 802409EC 0809028F */ j .L80240A3C -/* 9B2180 802409F0 E4400028 */ swc1 $f0, 0x28($v0) -.L802409F4: -/* 9B2184 802409F4 C4660020 */ lwc1 $f6, 0x20($v1) -/* 9B2188 802409F8 44930000 */ mtc1 $s3, $f0 -/* 9B218C 802409FC 00000000 */ nop -/* 9B2190 80240A00 46800020 */ cvt.s.w $f0, $f0 -/* 9B2194 80240A04 46003180 */ add.s $f6, $f6, $f0 -/* 9B2198 80240A08 C4640024 */ lwc1 $f4, 0x24($v1) -/* 9B219C 80240A0C 44900000 */ mtc1 $s0, $f0 -/* 9B21A0 80240A10 00000000 */ nop -/* 9B21A4 80240A14 46800020 */ cvt.s.w $f0, $f0 -/* 9B21A8 80240A18 46002100 */ add.s $f4, $f4, $f0 -/* 9B21AC 80240A1C C4620028 */ lwc1 $f2, 0x28($v1) -/* 9B21B0 80240A20 44840000 */ mtc1 $a0, $f0 -/* 9B21B4 80240A24 00000000 */ nop -/* 9B21B8 80240A28 46800020 */ cvt.s.w $f0, $f0 -/* 9B21BC 80240A2C 46001080 */ add.s $f2, $f2, $f0 -/* 9B21C0 80240A30 E4660020 */ swc1 $f6, 0x20($v1) -/* 9B21C4 80240A34 E4640024 */ swc1 $f4, 0x24($v1) -/* 9B21C8 80240A38 E4620028 */ swc1 $f2, 0x28($v1) -.L80240A3C: -/* 9B21CC 80240A3C 8FBF0020 */ lw $ra, 0x20($sp) -/* 9B21D0 80240A40 8FB3001C */ lw $s3, 0x1c($sp) -/* 9B21D4 80240A44 8FB20018 */ lw $s2, 0x18($sp) -/* 9B21D8 80240A48 8FB10014 */ lw $s1, 0x14($sp) -/* 9B21DC 80240A4C 8FB00010 */ lw $s0, 0x10($sp) -/* 9B21E0 80240A50 24020002 */ addiu $v0, $zero, 2 -/* 9B21E4 80240A54 03E00008 */ jr $ra -/* 9B21E8 80240A58 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_06/func_80240A5C_9B1790.s b/asm/nonmatchings/world/area_trd/trd_06/func_80240A5C_9B1790.s deleted file mode 100644 index 4dd6630254..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_06/func_80240A5C_9B1790.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A5C_9B21EC -/* 9B21EC 80240A5C 24020001 */ addiu $v0, $zero, 1 -/* 9B21F0 80240A60 3C018024 */ lui $at, 0x8024 -/* 9B21F4 80240A64 AC2251F0 */ sw $v0, 0x51f0($at) -/* 9B21F8 80240A68 03E00008 */ jr $ra -/* 9B21FC 80240A6C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_trd/trd_06/func_80240A70_9B1790.s b/asm/nonmatchings/world/area_trd/trd_06/func_80240A70_9B1790.s deleted file mode 100644 index eb8de758d5..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_06/func_80240A70_9B1790.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A70_9B2200 -/* 9B2200 80240A70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B2204 80240A74 AFB00010 */ sw $s0, 0x10($sp) -/* 9B2208 80240A78 0080802D */ daddu $s0, $a0, $zero -/* 9B220C 80240A7C AFBF0014 */ sw $ra, 0x14($sp) -/* 9B2210 80240A80 0C00EABB */ jal get_npc_unsafe -/* 9B2214 80240A84 2404FFFC */ addiu $a0, $zero, -4 -/* 9B2218 80240A88 844200A8 */ lh $v0, 0xa8($v0) -/* 9B221C 80240A8C 44820000 */ mtc1 $v0, $f0 -/* 9B2220 80240A90 00000000 */ nop -/* 9B2224 80240A94 46800020 */ cvt.s.w $f0, $f0 -/* 9B2228 80240A98 46000000 */ add.s $f0, $f0, $f0 -/* 9B222C 80240A9C 3C014040 */ lui $at, 0x4040 -/* 9B2230 80240AA0 44811000 */ mtc1 $at, $f2 -/* 9B2234 80240AA4 3C014311 */ lui $at, 0x4311 -/* 9B2238 80240AA8 44812000 */ mtc1 $at, $f4 -/* 9B223C 80240AAC 46020003 */ div.s $f0, $f0, $f2 -/* 9B2240 80240AB0 46040000 */ add.s $f0, $f0, $f4 -/* 9B2244 80240AB4 4600018D */ trunc.w.s $f6, $f0 -/* 9B2248 80240AB8 E6060084 */ swc1 $f6, 0x84($s0) -/* 9B224C 80240ABC 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B2250 80240AC0 8FB00010 */ lw $s0, 0x10($sp) -/* 9B2254 80240AC4 24020002 */ addiu $v0, $zero, 2 -/* 9B2258 80240AC8 03E00008 */ jr $ra -/* 9B225C 80240ACC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_06/func_80240AD0_9B1790.s b/asm/nonmatchings/world/area_trd/trd_06/func_80240AD0_9B1790.s deleted file mode 100644 index 5a28e48ae0..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_06/func_80240AD0_9B1790.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD0_9B2260 -/* 9B2260 80240AD0 3C038024 */ lui $v1, 0x8024 -/* 9B2264 80240AD4 246351F0 */ addiu $v1, $v1, 0x51f0 -/* 9B2268 80240AD8 24020001 */ addiu $v0, $zero, 1 -/* 9B226C 80240ADC AC62000C */ sw $v0, 0xc($v1) -/* 9B2270 80240AE0 24020002 */ addiu $v0, $zero, 2 -/* 9B2274 80240AE4 03E00008 */ jr $ra -/* 9B2278 80240AE8 AC600010 */ sw $zero, 0x10($v1) -/* 9B227C 80240AEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_06/func_80240C80_9B1790.s b/asm/nonmatchings/world/area_trd/trd_06/func_80240C80_9B1790.s deleted file mode 100644 index 523cb380ad..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_06/func_80240C80_9B1790.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C80_9B2410 -/* 9B2410 80240C80 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9B2414 80240C84 3C048024 */ lui $a0, 0x8024 -/* 9B2418 80240C88 248451D8 */ addiu $a0, $a0, 0x51d8 -/* 9B241C 80240C8C 27A50010 */ addiu $a1, $sp, 0x10 -/* 9B2420 80240C90 AFBF0020 */ sw $ra, 0x20($sp) -/* 9B2424 80240C94 AFB1001C */ sw $s1, 0x1c($sp) -/* 9B2428 80240C98 0C016B3A */ jal load_asset_by_name -/* 9B242C 80240C9C AFB00018 */ sw $s0, 0x18($sp) -/* 9B2430 80240CA0 0040802D */ daddu $s0, $v0, $zero -/* 9B2434 80240CA4 0200202D */ daddu $a0, $s0, $zero -/* 9B2438 80240CA8 3C118024 */ lui $s1, 0x8024 -/* 9B243C 80240CAC 26315230 */ addiu $s1, $s1, 0x5230 -/* 9B2440 80240CB0 0C01BB7C */ jal decode_yay0 -/* 9B2444 80240CB4 0220282D */ daddu $a1, $s1, $zero -/* 9B2448 80240CB8 0C00AB1E */ jal general_heap_free -/* 9B244C 80240CBC 0200202D */ daddu $a0, $s0, $zero -/* 9B2450 80240CC0 3C048025 */ lui $a0, 0x8025 -/* 9B2454 80240CC4 248491C0 */ addiu $a0, $a0, -0x6e40 -/* 9B2458 80240CC8 3C028024 */ lui $v0, 0x8024 -/* 9B245C 80240CCC 24425430 */ addiu $v0, $v0, 0x5430 -/* 9B2460 80240CD0 AC820000 */ sw $v0, ($a0) -/* 9B2464 80240CD4 24020096 */ addiu $v0, $zero, 0x96 -/* 9B2468 80240CD8 A4820008 */ sh $v0, 8($a0) -/* 9B246C 80240CDC 24020069 */ addiu $v0, $zero, 0x69 -/* 9B2470 80240CE0 A482000A */ sh $v0, 0xa($a0) -/* 9B2474 80240CE4 24020002 */ addiu $v0, $zero, 2 -/* 9B2478 80240CE8 AC82000C */ sw $v0, 0xc($a0) -/* 9B247C 80240CEC 24020001 */ addiu $v0, $zero, 1 -/* 9B2480 80240CF0 AC910004 */ sw $s1, 4($a0) -/* 9B2484 80240CF4 0C0496CB */ jal set_message_images -/* 9B2488 80240CF8 AC820010 */ sw $v0, 0x10($a0) -/* 9B248C 80240CFC 8FBF0020 */ lw $ra, 0x20($sp) -/* 9B2490 80240D00 8FB1001C */ lw $s1, 0x1c($sp) -/* 9B2494 80240D04 8FB00018 */ lw $s0, 0x18($sp) -/* 9B2498 80240D08 24020002 */ addiu $v0, $zero, 2 -/* 9B249C 80240D0C 03E00008 */ jr $ra -/* 9B24A0 80240D10 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9B24A4 80240D14 00000000 */ nop -/* 9B24A8 80240D18 00000000 */ nop -/* 9B24AC 80240D1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_07/func_80240124_9B6980.s b/asm/nonmatchings/world/area_trd/trd_07/func_80240124_9B6980.s deleted file mode 100644 index f077178719..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/func_80240124_9B6980.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_9B6AA4 -/* 9B6AA4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B6AA8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 9B6AAC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 9B6AB0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 9B6AB4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 9B6AB8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 9B6ABC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 9B6AC0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 9B6AC4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 9B6AC8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 9B6ACC 8024014C 1440000E */ bnez $v0, .L80240188 -/* 9B6AD0 80240150 00000000 */ nop -/* 9B6AD4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 9B6AD8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 9B6ADC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 9B6AE0 80240160 04610004 */ bgez $v1, .L80240174 -/* 9B6AE4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 9B6AE8 80240168 3C020002 */ lui $v0, 2 -/* 9B6AEC 8024016C 08090061 */ j .L80240184 -/* 9B6AF0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 9B6AF4 80240174 3C040002 */ lui $a0, 2 -/* 9B6AF8 80240178 0083102A */ slt $v0, $a0, $v1 -/* 9B6AFC 8024017C 10400002 */ beqz $v0, .L80240188 -/* 9B6B00 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 9B6B04 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 9B6B08 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 9B6B0C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 9B6B10 80240190 00000000 */ nop -/* 9B6B14 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 9B6B18 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 9B6B1C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 9B6B20 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 9B6B24 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 9B6B28 802401A8 3C020002 */ lui $v0, 2 -/* 9B6B2C 802401AC 08090071 */ j .L802401C4 -/* 9B6B30 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 9B6B34 802401B4 3C040002 */ lui $a0, 2 -/* 9B6B38 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 9B6B3C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 9B6B40 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 9B6B44 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 9B6B48 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 9B6B4C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 9B6B50 802401D0 00000000 */ nop -/* 9B6B54 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 9B6B58 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 9B6B5C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 9B6B60 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 9B6B64 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 9B6B68 802401E8 3C020002 */ lui $v0, 2 -/* 9B6B6C 802401EC 08090081 */ j .L80240204 -/* 9B6B70 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 9B6B74 802401F4 3C040002 */ lui $a0, 2 -/* 9B6B78 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 9B6B7C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 9B6B80 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 9B6B84 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 9B6B88 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 9B6B8C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 9B6B90 80240210 00000000 */ nop -/* 9B6B94 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 9B6B98 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 9B6B9C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 9B6BA0 80240220 04610004 */ bgez $v1, .L80240234 -/* 9B6BA4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 9B6BA8 80240228 3C020002 */ lui $v0, 2 -/* 9B6BAC 8024022C 08090091 */ j .L80240244 -/* 9B6BB0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 9B6BB4 80240234 3C040002 */ lui $a0, 2 -/* 9B6BB8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 9B6BBC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 9B6BC0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 9B6BC4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 9B6BC8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 9B6BCC 8024024C 0C046F07 */ jal set_main_pan_u -/* 9B6BD0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 9B6BD4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 9B6BD8 80240258 0C046F0D */ jal set_main_pan_v -/* 9B6BDC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 9B6BE0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 9B6BE4 80240264 0C046F13 */ jal set_aux_pan_u -/* 9B6BE8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 9B6BEC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 9B6BF0 80240270 0C046F19 */ jal set_aux_pan_v -/* 9B6BF4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 9B6BF8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 9B6BFC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 9B6C00 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 9B6C04 80240284 24420001 */ addiu $v0, $v0, 1 -/* 9B6C08 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 9B6C0C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 9B6C10 80240290 24630001 */ addiu $v1, $v1, 1 -/* 9B6C14 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 9B6C18 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 9B6C1C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 9B6C20 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 9B6C24 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 9B6C28 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 9B6C2C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 9B6C30 802402B0 14600002 */ bnez $v1, .L802402BC -/* 9B6C34 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 9B6C38 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 9B6C3C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 9B6C40 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 9B6C44 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 9B6C48 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 9B6C4C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 9B6C50 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 9B6C54 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 9B6C58 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 9B6C5C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 9B6C60 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 9B6C64 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 9B6C68 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 9B6C6C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 9B6C70 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 9B6C74 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 9B6C78 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B6C7C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 9B6C80 80240300 0000102D */ daddu $v0, $zero, $zero -/* 9B6C84 80240304 03E00008 */ jr $ra -/* 9B6C88 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9B6C8C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_07/func_80240310_9B6980.s b/asm/nonmatchings/world/area_trd/trd_07/func_80240310_9B6980.s deleted file mode 100644 index 46c8c72cfc..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/func_80240310_9B6980.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_9B6C90 -/* 9B6C90 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9B6C94 80240314 AFB20018 */ sw $s2, 0x18($sp) -/* 9B6C98 80240318 0080902D */ daddu $s2, $a0, $zero -/* 9B6C9C 8024031C AFBF001C */ sw $ra, 0x1c($sp) -/* 9B6CA0 80240320 AFB10014 */ sw $s1, 0x14($sp) -/* 9B6CA4 80240324 AFB00010 */ sw $s0, 0x10($sp) -/* 9B6CA8 80240328 8E510148 */ lw $s1, 0x148($s2) -/* 9B6CAC 8024032C 0C00EABB */ jal get_npc_unsafe -/* 9B6CB0 80240330 86240008 */ lh $a0, 8($s1) -/* 9B6CB4 80240334 0040802D */ daddu $s0, $v0, $zero -/* 9B6CB8 80240338 8E2300CC */ lw $v1, 0xcc($s1) -/* 9B6CBC 8024033C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9B6CC0 80240340 8C630020 */ lw $v1, 0x20($v1) -/* 9B6CC4 80240344 AE030028 */ sw $v1, 0x28($s0) -/* 9B6CC8 80240348 96220076 */ lhu $v0, 0x76($s1) -/* 9B6CCC 8024034C A602008E */ sh $v0, 0x8e($s0) -/* 9B6CD0 80240350 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9B6CD4 80240354 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9B6CD8 80240358 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9B6CDC 8024035C 8C460028 */ lw $a2, 0x28($v0) -/* 9B6CE0 80240360 0C00A720 */ jal atan2 -/* 9B6CE4 80240364 8C470030 */ lw $a3, 0x30($v0) -/* 9B6CE8 80240368 2402000D */ addiu $v0, $zero, 0xd -/* 9B6CEC 8024036C E600000C */ swc1 $f0, 0xc($s0) -/* 9B6CF0 80240370 AE420070 */ sw $v0, 0x70($s2) -/* 9B6CF4 80240374 8FBF001C */ lw $ra, 0x1c($sp) -/* 9B6CF8 80240378 8FB20018 */ lw $s2, 0x18($sp) -/* 9B6CFC 8024037C 8FB10014 */ lw $s1, 0x14($sp) -/* 9B6D00 80240380 8FB00010 */ lw $s0, 0x10($sp) -/* 9B6D04 80240384 03E00008 */ jr $ra -/* 9B6D08 80240388 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_07/func_802404C0_9B6980.s b/asm/nonmatchings/world/area_trd/trd_07/func_802404C0_9B6980.s deleted file mode 100644 index 8bc4d2fbc5..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/func_802404C0_9B6980.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_9B6E40 -/* 9B6E40 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9B6E44 802404C4 AFB3003C */ sw $s3, 0x3c($sp) -/* 9B6E48 802404C8 0080982D */ daddu $s3, $a0, $zero -/* 9B6E4C 802404CC AFBF0040 */ sw $ra, 0x40($sp) -/* 9B6E50 802404D0 AFB20038 */ sw $s2, 0x38($sp) -/* 9B6E54 802404D4 AFB10034 */ sw $s1, 0x34($sp) -/* 9B6E58 802404D8 AFB00030 */ sw $s0, 0x30($sp) -/* 9B6E5C 802404DC 8E710148 */ lw $s1, 0x148($s3) -/* 9B6E60 802404E0 0C00EABB */ jal get_npc_unsafe -/* 9B6E64 802404E4 86240008 */ lh $a0, 8($s1) -/* 9B6E68 802404E8 0040802D */ daddu $s0, $v0, $zero -/* 9B6E6C 802404EC 8E22007C */ lw $v0, 0x7c($s1) -/* 9B6E70 802404F0 8603008E */ lh $v1, 0x8e($s0) -/* 9B6E74 802404F4 2442FFFF */ addiu $v0, $v0, -1 -/* 9B6E78 802404F8 14620012 */ bne $v1, $v0, .L80240544 -/* 9B6E7C 802404FC 00000000 */ nop -/* 9B6E80 80240500 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9B6E84 80240504 4600020D */ trunc.w.s $f8, $f0 -/* 9B6E88 80240508 44024000 */ mfc1 $v0, $f8 -/* 9B6E8C 8024050C 00000000 */ nop -/* 9B6E90 80240510 A6220010 */ sh $v0, 0x10($s1) -/* 9B6E94 80240514 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B6E98 80240518 4600020D */ trunc.w.s $f8, $f0 -/* 9B6E9C 8024051C 44024000 */ mfc1 $v0, $f8 -/* 9B6EA0 80240520 00000000 */ nop -/* 9B6EA4 80240524 A6220012 */ sh $v0, 0x12($s1) -/* 9B6EA8 80240528 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9B6EAC 8024052C 24020001 */ addiu $v0, $zero, 1 -/* 9B6EB0 80240530 A2220007 */ sb $v0, 7($s1) -/* 9B6EB4 80240534 4600020D */ trunc.w.s $f8, $f0 -/* 9B6EB8 80240538 44024000 */ mfc1 $v0, $f8 -/* 9B6EBC 8024053C 00000000 */ nop -/* 9B6EC0 80240540 A6220014 */ sh $v0, 0x14($s1) -.L80240544: -/* 9B6EC4 80240544 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9B6EC8 80240548 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B6ECC 8024054C C6040040 */ lwc1 $f4, 0x40($s0) -/* 9B6ED0 80240550 C6060018 */ lwc1 $f6, 0x18($s0) -/* 9B6ED4 80240554 E7A00020 */ swc1 $f0, 0x20($sp) -/* 9B6ED8 80240558 E7A20024 */ swc1 $f2, 0x24($sp) -/* 9B6EDC 8024055C E7A40028 */ swc1 $f4, 0x28($sp) -/* 9B6EE0 80240560 E7A60010 */ swc1 $f6, 0x10($sp) -/* 9B6EE4 80240564 C600000C */ lwc1 $f0, 0xc($s0) -/* 9B6EE8 80240568 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9B6EEC 8024056C 860200A8 */ lh $v0, 0xa8($s0) -/* 9B6EF0 80240570 27A50020 */ addiu $a1, $sp, 0x20 -/* 9B6EF4 80240574 44820000 */ mtc1 $v0, $f0 -/* 9B6EF8 80240578 00000000 */ nop -/* 9B6EFC 8024057C 46800020 */ cvt.s.w $f0, $f0 -/* 9B6F00 80240580 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9B6F04 80240584 860200A6 */ lh $v0, 0xa6($s0) -/* 9B6F08 80240588 27A60024 */ addiu $a2, $sp, 0x24 -/* 9B6F0C 8024058C 44820000 */ mtc1 $v0, $f0 -/* 9B6F10 80240590 00000000 */ nop -/* 9B6F14 80240594 46800020 */ cvt.s.w $f0, $f0 -/* 9B6F18 80240598 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 9B6F1C 8024059C 8E040080 */ lw $a0, 0x80($s0) -/* 9B6F20 802405A0 0C037711 */ jal func_800DDC44 -/* 9B6F24 802405A4 27A70028 */ addiu $a3, $sp, 0x28 -/* 9B6F28 802405A8 0040902D */ daddu $s2, $v0, $zero -/* 9B6F2C 802405AC 16400005 */ bnez $s2, .L802405C4 -/* 9B6F30 802405B0 00000000 */ nop -/* 9B6F34 802405B4 8E050018 */ lw $a1, 0x18($s0) -/* 9B6F38 802405B8 8E06000C */ lw $a2, 0xc($s0) -/* 9B6F3C 802405BC 0C00EA95 */ jal npc_move_heading -/* 9B6F40 802405C0 0200202D */ daddu $a0, $s0, $zero -.L802405C4: -/* 9B6F44 802405C4 8602008E */ lh $v0, 0x8e($s0) -/* 9B6F48 802405C8 9603008E */ lhu $v1, 0x8e($s0) -/* 9B6F4C 802405CC 18400007 */ blez $v0, .L802405EC -/* 9B6F50 802405D0 2462FFFF */ addiu $v0, $v1, -1 -/* 9B6F54 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* 9B6F58 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* 9B6F5C 802405DC 18400003 */ blez $v0, .L802405EC -/* 9B6F60 802405E0 00000000 */ nop -/* 9B6F64 802405E4 12400008 */ beqz $s2, .L80240608 -/* 9B6F68 802405E8 00000000 */ nop -.L802405EC: -/* 9B6F6C 802405EC 8E2200CC */ lw $v0, 0xcc($s1) -/* 9B6F70 802405F0 A2200007 */ sb $zero, 7($s1) -/* 9B6F74 802405F4 8C420028 */ lw $v0, 0x28($v0) -/* 9B6F78 802405F8 A600008E */ sh $zero, 0x8e($s0) -/* 9B6F7C 802405FC AE020028 */ sw $v0, 0x28($s0) -/* 9B6F80 80240600 2402000F */ addiu $v0, $zero, 0xf -/* 9B6F84 80240604 AE620070 */ sw $v0, 0x70($s3) -.L80240608: -/* 9B6F88 80240608 8FBF0040 */ lw $ra, 0x40($sp) -/* 9B6F8C 8024060C 8FB3003C */ lw $s3, 0x3c($sp) -/* 9B6F90 80240610 8FB20038 */ lw $s2, 0x38($sp) -/* 9B6F94 80240614 8FB10034 */ lw $s1, 0x34($sp) -/* 9B6F98 80240618 8FB00030 */ lw $s0, 0x30($sp) -/* 9B6F9C 8024061C 03E00008 */ jr $ra -/* 9B6FA0 80240620 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_07/func_80240624_9B6980.s b/asm/nonmatchings/world/area_trd/trd_07/func_80240624_9B6980.s deleted file mode 100644 index b232d70967..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/func_80240624_9B6980.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240624_9B6FA4 -/* 9B6FA4 80240624 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9B6FA8 80240628 AFB10014 */ sw $s1, 0x14($sp) -/* 9B6FAC 8024062C 0080882D */ daddu $s1, $a0, $zero -/* 9B6FB0 80240630 AFBF0018 */ sw $ra, 0x18($sp) -/* 9B6FB4 80240634 AFB00010 */ sw $s0, 0x10($sp) -/* 9B6FB8 80240638 8E300148 */ lw $s0, 0x148($s1) -/* 9B6FBC 8024063C 0C00EABB */ jal get_npc_unsafe -/* 9B6FC0 80240640 86040008 */ lh $a0, 8($s0) -/* 9B6FC4 80240644 0040202D */ daddu $a0, $v0, $zero -/* 9B6FC8 80240648 9482008E */ lhu $v0, 0x8e($a0) -/* 9B6FCC 8024064C 24030003 */ addiu $v1, $zero, 3 -/* 9B6FD0 80240650 24420001 */ addiu $v0, $v0, 1 -/* 9B6FD4 80240654 A482008E */ sh $v0, 0x8e($a0) -/* 9B6FD8 80240658 00021400 */ sll $v0, $v0, 0x10 -/* 9B6FDC 8024065C 00021403 */ sra $v0, $v0, 0x10 -/* 9B6FE0 80240660 14430003 */ bne $v0, $v1, .L80240670 -/* 9B6FE4 80240664 00000000 */ nop -/* 9B6FE8 80240668 96020086 */ lhu $v0, 0x86($s0) -/* 9B6FEC 8024066C A48200A8 */ sh $v0, 0xa8($a0) -.L80240670: -/* 9B6FF0 80240670 8482008E */ lh $v0, 0x8e($a0) -/* 9B6FF4 80240674 8E030080 */ lw $v1, 0x80($s0) -/* 9B6FF8 80240678 0043102A */ slt $v0, $v0, $v1 -/* 9B6FFC 8024067C 14400004 */ bnez $v0, .L80240690 -/* 9B7000 80240680 00000000 */ nop -/* 9B7004 80240684 96020086 */ lhu $v0, 0x86($s0) -/* 9B7008 80240688 A48200A8 */ sh $v0, 0xa8($a0) -/* 9B700C 8024068C AE200070 */ sw $zero, 0x70($s1) -.L80240690: -/* 9B7010 80240690 8FBF0018 */ lw $ra, 0x18($sp) -/* 9B7014 80240694 8FB10014 */ lw $s1, 0x14($sp) -/* 9B7018 80240698 8FB00010 */ lw $s0, 0x10($sp) -/* 9B701C 8024069C 03E00008 */ jr $ra -/* 9B7020 802406A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_07/func_80240C94_9B6980.s b/asm/nonmatchings/world/area_trd/trd_07/func_80240C94_9B6980.s deleted file mode 100644 index 2a7260c6d3..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/func_80240C94_9B6980.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C94_9B7614 -/* 9B7614 80240C94 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 9B7618 80240C98 AFB3004C */ sw $s3, 0x4c($sp) -/* 9B761C 80240C9C 0080982D */ daddu $s3, $a0, $zero -/* 9B7620 80240CA0 AFBF0058 */ sw $ra, 0x58($sp) -/* 9B7624 80240CA4 AFB50054 */ sw $s5, 0x54($sp) -/* 9B7628 80240CA8 AFB40050 */ sw $s4, 0x50($sp) -/* 9B762C 80240CAC AFB20048 */ sw $s2, 0x48($sp) -/* 9B7630 80240CB0 AFB10044 */ sw $s1, 0x44($sp) -/* 9B7634 80240CB4 AFB00040 */ sw $s0, 0x40($sp) -/* 9B7638 80240CB8 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 9B763C 80240CBC F7B80070 */ sdc1 $f24, 0x70($sp) -/* 9B7640 80240CC0 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 9B7644 80240CC4 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 9B7648 80240CC8 8E710148 */ lw $s1, 0x148($s3) -/* 9B764C 80240CCC 00A0902D */ daddu $s2, $a1, $zero -/* 9B7650 80240CD0 86240008 */ lh $a0, 8($s1) -/* 9B7654 80240CD4 0C00EABB */ jal get_npc_unsafe -/* 9B7658 80240CD8 00C0A82D */ daddu $s5, $a2, $zero -/* 9B765C 80240CDC 0040802D */ daddu $s0, $v0, $zero -/* 9B7660 80240CE0 0000A02D */ daddu $s4, $zero, $zero -/* 9B7664 80240CE4 C624007C */ lwc1 $f4, 0x7c($s1) -/* 9B7668 80240CE8 46802120 */ cvt.s.w $f4, $f4 -/* 9B766C 80240CEC C6220088 */ lwc1 $f2, 0x88($s1) -/* 9B7670 80240CF0 468010A0 */ cvt.s.w $f2, $f2 -/* 9B7674 80240CF4 460010A1 */ cvt.d.s $f2, $f2 -/* 9B7678 80240CF8 46002121 */ cvt.d.s $f4, $f4 -/* 9B767C 80240CFC C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B7680 80240D00 3C014059 */ lui $at, 0x4059 -/* 9B7684 80240D04 44813800 */ mtc1 $at, $f7 -/* 9B7688 80240D08 44803000 */ mtc1 $zero, $f6 -/* 9B768C 80240D0C 46000021 */ cvt.d.s $f0, $f0 -/* 9B7690 80240D10 46260002 */ mul.d $f0, $f0, $f6 -/* 9B7694 80240D14 00000000 */ nop -/* 9B7698 80240D18 24020001 */ addiu $v0, $zero, 1 -/* 9B769C 80240D1C 8E24006C */ lw $a0, 0x6c($s1) -/* 9B76A0 80240D20 46261083 */ div.d $f2, $f2, $f6 -/* 9B76A4 80240D24 462010A0 */ cvt.s.d $f2, $f2 -/* 9B76A8 80240D28 46262103 */ div.d $f4, $f4, $f6 -/* 9B76AC 80240D2C 46202520 */ cvt.s.d $f20, $f4 -/* 9B76B0 80240D30 30830011 */ andi $v1, $a0, 0x11 -/* 9B76B4 80240D34 4620020D */ trunc.w.d $f8, $f0 -/* 9B76B8 80240D38 E628007C */ swc1 $f8, 0x7c($s1) -/* 9B76BC 80240D3C C6200078 */ lwc1 $f0, 0x78($s1) -/* 9B76C0 80240D40 46800020 */ cvt.s.w $f0, $f0 -/* 9B76C4 80240D44 46000021 */ cvt.d.s $f0, $f0 -/* 9B76C8 80240D48 46260003 */ div.d $f0, $f0, $f6 -/* 9B76CC 80240D4C 462006A0 */ cvt.s.d $f26, $f0 -/* 9B76D0 80240D50 C6200070 */ lwc1 $f0, 0x70($s1) -/* 9B76D4 80240D54 46800020 */ cvt.s.w $f0, $f0 -/* 9B76D8 80240D58 46000021 */ cvt.d.s $f0, $f0 -/* 9B76DC 80240D5C 46260003 */ div.d $f0, $f0, $f6 -/* 9B76E0 80240D60 462005A0 */ cvt.s.d $f22, $f0 -/* 9B76E4 80240D64 14620025 */ bne $v1, $v0, .L80240DFC -/* 9B76E8 80240D68 4602D600 */ add.s $f24, $f26, $f2 -/* 9B76EC 80240D6C 8E020000 */ lw $v0, ($s0) -/* 9B76F0 80240D70 30420008 */ andi $v0, $v0, 8 -/* 9B76F4 80240D74 10400009 */ beqz $v0, .L80240D9C -/* 9B76F8 80240D78 27A50028 */ addiu $a1, $sp, 0x28 -/* 9B76FC 80240D7C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B7700 80240D80 4600C001 */ sub.s $f0, $f24, $f0 -/* 9B7704 80240D84 4600B03C */ c.lt.s $f22, $f0 -/* 9B7708 80240D88 00000000 */ nop -/* 9B770C 80240D8C 4500001B */ bc1f .L80240DFC -/* 9B7710 80240D90 34820010 */ ori $v0, $a0, 0x10 -/* 9B7714 80240D94 0809037F */ j .L80240DFC -/* 9B7718 80240D98 AE22006C */ sw $v0, 0x6c($s1) -.L80240D9C: -/* 9B771C 80240D9C 27A6002C */ addiu $a2, $sp, 0x2c -/* 9B7720 80240DA0 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9B7724 80240DA4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B7728 80240DA8 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9B772C 80240DAC 3C01447A */ lui $at, 0x447a -/* 9B7730 80240DB0 44813000 */ mtc1 $at, $f6 -/* 9B7734 80240DB4 27A20034 */ addiu $v0, $sp, 0x34 -/* 9B7738 80240DB8 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9B773C 80240DBC E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9B7740 80240DC0 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9B7744 80240DC4 E7A60034 */ swc1 $f6, 0x34($sp) -/* 9B7748 80240DC8 AFA20010 */ sw $v0, 0x10($sp) -/* 9B774C 80240DCC 8E040080 */ lw $a0, 0x80($s0) -/* 9B7750 80240DD0 0C0372DF */ jal func_800DCB7C -/* 9B7754 80240DD4 27A70030 */ addiu $a3, $sp, 0x30 -/* 9B7758 80240DD8 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 9B775C 80240DDC 4600D001 */ sub.s $f0, $f26, $f0 -/* 9B7760 80240DE0 4600B03C */ c.lt.s $f22, $f0 -/* 9B7764 80240DE4 00000000 */ nop -/* 9B7768 80240DE8 45000004 */ bc1f .L80240DFC -/* 9B776C 80240DEC 00000000 */ nop -/* 9B7770 80240DF0 8E22006C */ lw $v0, 0x6c($s1) -/* 9B7774 80240DF4 34420010 */ ori $v0, $v0, 0x10 -/* 9B7778 80240DF8 AE22006C */ sw $v0, 0x6c($s1) -.L80240DFC: -/* 9B777C 80240DFC 8E22006C */ lw $v0, 0x6c($s1) -/* 9B7780 80240E00 24030011 */ addiu $v1, $zero, 0x11 -/* 9B7784 80240E04 30420011 */ andi $v0, $v0, 0x11 -/* 9B7788 80240E08 14430039 */ bne $v0, $v1, .L80240EF0 -/* 9B778C 80240E0C 00000000 */ nop -/* 9B7790 80240E10 8E020000 */ lw $v0, ($s0) -/* 9B7794 80240E14 30420008 */ andi $v0, $v0, 8 -/* 9B7798 80240E18 1040000A */ beqz $v0, .L80240E44 -/* 9B779C 80240E1C 4600C106 */ mov.s $f4, $f24 -/* 9B77A0 80240E20 4614C081 */ sub.s $f2, $f24, $f20 -/* 9B77A4 80240E24 3C018024 */ lui $at, 0x8024 -/* 9B77A8 80240E28 D4204888 */ ldc1 $f0, 0x4888($at) -/* 9B77AC 80240E2C 460010A1 */ cvt.d.s $f2, $f2 -/* 9B77B0 80240E30 46201082 */ mul.d $f2, $f2, $f0 -/* 9B77B4 80240E34 00000000 */ nop -/* 9B77B8 80240E38 4600A021 */ cvt.d.s $f0, $f20 -/* 9B77BC 80240E3C 080903AA */ j .L80240EA8 -/* 9B77C0 80240E40 46220000 */ add.d $f0, $f0, $f2 -.L80240E44: -/* 9B77C4 80240E44 27A50028 */ addiu $a1, $sp, 0x28 -/* 9B77C8 80240E48 27A6002C */ addiu $a2, $sp, 0x2c -/* 9B77CC 80240E4C C6000038 */ lwc1 $f0, 0x38($s0) -/* 9B77D0 80240E50 C6020040 */ lwc1 $f2, 0x40($s0) -/* 9B77D4 80240E54 3C01447A */ lui $at, 0x447a -/* 9B77D8 80240E58 44812000 */ mtc1 $at, $f4 -/* 9B77DC 80240E5C 27A20034 */ addiu $v0, $sp, 0x34 -/* 9B77E0 80240E60 E7B4002C */ swc1 $f20, 0x2c($sp) -/* 9B77E4 80240E64 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9B77E8 80240E68 E7A20030 */ swc1 $f2, 0x30($sp) -/* 9B77EC 80240E6C E7A40034 */ swc1 $f4, 0x34($sp) -/* 9B77F0 80240E70 AFA20010 */ sw $v0, 0x10($sp) -/* 9B77F4 80240E74 8E040080 */ lw $a0, 0x80($s0) -/* 9B77F8 80240E78 0C0372DF */ jal func_800DCB7C -/* 9B77FC 80240E7C 27A70030 */ addiu $a3, $sp, 0x30 -/* 9B7800 80240E80 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* 9B7804 80240E84 461A2100 */ add.s $f4, $f4, $f26 -/* 9B7808 80240E88 46142081 */ sub.s $f2, $f4, $f20 -/* 9B780C 80240E8C 3C018024 */ lui $at, 0x8024 -/* 9B7810 80240E90 D4204890 */ ldc1 $f0, 0x4890($at) -/* 9B7814 80240E94 460010A1 */ cvt.d.s $f2, $f2 -/* 9B7818 80240E98 46201082 */ mul.d $f2, $f2, $f0 -/* 9B781C 80240E9C 00000000 */ nop -/* 9B7820 80240EA0 4600A021 */ cvt.d.s $f0, $f20 -/* 9B7824 80240EA4 46220000 */ add.d $f0, $f0, $f2 -.L80240EA8: -/* 9B7828 80240EA8 46200020 */ cvt.s.d $f0, $f0 -/* 9B782C 80240EAC E600003C */ swc1 $f0, 0x3c($s0) -/* 9B7830 80240EB0 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B7834 80240EB4 46002001 */ sub.s $f0, $f4, $f0 -/* 9B7838 80240EB8 3C013FF0 */ lui $at, 0x3ff0 -/* 9B783C 80240EBC 44811800 */ mtc1 $at, $f3 -/* 9B7840 80240EC0 44801000 */ mtc1 $zero, $f2 -/* 9B7844 80240EC4 46000005 */ abs.s $f0, $f0 -/* 9B7848 80240EC8 46000021 */ cvt.d.s $f0, $f0 -/* 9B784C 80240ECC 4622003C */ c.lt.d $f0, $f2 -/* 9B7850 80240ED0 00000000 */ nop -/* 9B7854 80240ED4 45000036 */ bc1f .L80240FB0 -/* 9B7858 80240ED8 2403FFEF */ addiu $v1, $zero, -0x11 -/* 9B785C 80240EDC E604003C */ swc1 $f4, 0x3c($s0) -/* 9B7860 80240EE0 8E22006C */ lw $v0, 0x6c($s1) -/* 9B7864 80240EE4 00431024 */ and $v0, $v0, $v1 -/* 9B7868 80240EE8 080903EC */ j .L80240FB0 -/* 9B786C 80240EEC AE22006C */ sw $v0, 0x6c($s1) -.L80240EF0: -/* 9B7870 80240EF0 8E220070 */ lw $v0, 0x70($s1) -/* 9B7874 80240EF4 1840002E */ blez $v0, .L80240FB0 -/* 9B7878 80240EF8 00000000 */ nop -/* 9B787C 80240EFC C62C0074 */ lwc1 $f12, 0x74($s1) -/* 9B7880 80240F00 0C00A8BB */ jal sin_deg -/* 9B7884 80240F04 46806320 */ cvt.s.w $f12, $f12 -/* 9B7888 80240F08 8E020000 */ lw $v0, ($s0) -/* 9B788C 80240F0C 30420008 */ andi $v0, $v0, 8 -/* 9B7890 80240F10 10400003 */ beqz $v0, .L80240F20 -/* 9B7894 80240F14 46000506 */ mov.s $f20, $f0 -/* 9B7898 80240F18 080903D8 */ j .L80240F60 -/* 9B789C 80240F1C 0000102D */ daddu $v0, $zero, $zero -.L80240F20: -/* 9B78A0 80240F20 27A50028 */ addiu $a1, $sp, 0x28 -/* 9B78A4 80240F24 27A6002C */ addiu $a2, $sp, 0x2c -/* 9B78A8 80240F28 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9B78AC 80240F2C C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B78B0 80240F30 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9B78B4 80240F34 3C01447A */ lui $at, 0x447a -/* 9B78B8 80240F38 44813000 */ mtc1 $at, $f6 -/* 9B78BC 80240F3C 27A20034 */ addiu $v0, $sp, 0x34 -/* 9B78C0 80240F40 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9B78C4 80240F44 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9B78C8 80240F48 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9B78CC 80240F4C E7A60034 */ swc1 $f6, 0x34($sp) -/* 9B78D0 80240F50 AFA20010 */ sw $v0, 0x10($sp) -/* 9B78D4 80240F54 8E040080 */ lw $a0, 0x80($s0) -/* 9B78D8 80240F58 0C0372DF */ jal func_800DCB7C -/* 9B78DC 80240F5C 27A70030 */ addiu $a3, $sp, 0x30 -.L80240F60: -/* 9B78E0 80240F60 10400007 */ beqz $v0, .L80240F80 -/* 9B78E4 80240F64 00000000 */ nop -/* 9B78E8 80240F68 4616A082 */ mul.s $f2, $f20, $f22 -/* 9B78EC 80240F6C 00000000 */ nop -/* 9B78F0 80240F70 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 9B78F4 80240F74 461A0000 */ add.s $f0, $f0, $f26 -/* 9B78F8 80240F78 080903E3 */ j .L80240F8C -/* 9B78FC 80240F7C 46020000 */ add.s $f0, $f0, $f2 -.L80240F80: -/* 9B7900 80240F80 4616A002 */ mul.s $f0, $f20, $f22 -/* 9B7904 80240F84 00000000 */ nop -/* 9B7908 80240F88 4600C000 */ add.s $f0, $f24, $f0 -.L80240F8C: -/* 9B790C 80240F8C E600003C */ swc1 $f0, 0x3c($s0) -/* 9B7910 80240F90 8E220074 */ lw $v0, 0x74($s1) -/* 9B7914 80240F94 2442000A */ addiu $v0, $v0, 0xa -/* 9B7918 80240F98 44826000 */ mtc1 $v0, $f12 -/* 9B791C 80240F9C 00000000 */ nop -/* 9B7920 80240FA0 0C00A6C9 */ jal clamp_angle -/* 9B7924 80240FA4 46806320 */ cvt.s.w $f12, $f12 -/* 9B7928 80240FA8 4600020D */ trunc.w.s $f8, $f0 -/* 9B792C 80240FAC E6280074 */ swc1 $f8, 0x74($s1) -.L80240FB0: -/* 9B7930 80240FB0 8E220090 */ lw $v0, 0x90($s1) -/* 9B7934 80240FB4 1C40004A */ bgtz $v0, .L802410E0 -/* 9B7938 80240FB8 2442FFFF */ addiu $v0, $v0, -1 -/* 9B793C 80240FBC 8E430014 */ lw $v1, 0x14($s2) -/* 9B7940 80240FC0 04600048 */ bltz $v1, .L802410E4 -/* 9B7944 80240FC4 00000000 */ nop -/* 9B7948 80240FC8 8E620074 */ lw $v0, 0x74($s3) -/* 9B794C 80240FCC 1C400042 */ bgtz $v0, .L802410D8 -/* 9B7950 80240FD0 2442FFFF */ addiu $v0, $v0, -1 -/* 9B7954 80240FD4 AE630074 */ sw $v1, 0x74($s3) -/* 9B7958 80240FD8 860200A8 */ lh $v0, 0xa8($s0) -/* 9B795C 80240FDC C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B7960 80240FE0 44820000 */ mtc1 $v0, $f0 -/* 9B7964 80240FE4 00000000 */ nop -/* 9B7968 80240FE8 46800020 */ cvt.s.w $f0, $f0 -/* 9B796C 80240FEC 46001080 */ add.s $f2, $f2, $f0 -/* 9B7970 80240FF0 3C014024 */ lui $at, 0x4024 -/* 9B7974 80240FF4 44810800 */ mtc1 $at, $f1 -/* 9B7978 80240FF8 44800000 */ mtc1 $zero, $f0 -/* 9B797C 80240FFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9B7980 80241000 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9B7984 80241004 460010A1 */ cvt.d.s $f2, $f2 -/* 9B7988 80241008 46201080 */ add.d $f2, $f2, $f0 -/* 9B798C 8024100C C440002C */ lwc1 $f0, 0x2c($v0) -/* 9B7990 80241010 46000021 */ cvt.d.s $f0, $f0 -/* 9B7994 80241014 4622003C */ c.lt.d $f0, $f2 -/* 9B7998 80241018 00000000 */ nop -/* 9B799C 8024101C 4500002C */ bc1f .L802410D0 -/* 9B79A0 80241020 02A0202D */ daddu $a0, $s5, $zero -/* 9B79A4 80241024 AFA00010 */ sw $zero, 0x10($sp) -/* 9B79A8 80241028 8E46000C */ lw $a2, 0xc($s2) -/* 9B79AC 8024102C 8E470010 */ lw $a3, 0x10($s2) -/* 9B79B0 80241030 0C01242D */ jal func_800490B4 -/* 9B79B4 80241034 0220282D */ daddu $a1, $s1, $zero -/* 9B79B8 80241038 10400025 */ beqz $v0, .L802410D0 -/* 9B79BC 8024103C 0000202D */ daddu $a0, $zero, $zero -/* 9B79C0 80241040 0200282D */ daddu $a1, $s0, $zero -/* 9B79C4 80241044 0000302D */ daddu $a2, $zero, $zero -/* 9B79C8 80241048 2412000C */ addiu $s2, $zero, 0xc -/* 9B79CC 8024104C 860300A8 */ lh $v1, 0xa8($s0) -/* 9B79D0 80241050 3C013F80 */ lui $at, 0x3f80 -/* 9B79D4 80241054 44810000 */ mtc1 $at, $f0 -/* 9B79D8 80241058 3C014000 */ lui $at, 0x4000 -/* 9B79DC 8024105C 44811000 */ mtc1 $at, $f2 -/* 9B79E0 80241060 3C01C1A0 */ lui $at, 0xc1a0 -/* 9B79E4 80241064 44812000 */ mtc1 $at, $f4 -/* 9B79E8 80241068 44834000 */ mtc1 $v1, $f8 -/* 9B79EC 8024106C 00000000 */ nop -/* 9B79F0 80241070 46804220 */ cvt.s.w $f8, $f8 -/* 9B79F4 80241074 44074000 */ mfc1 $a3, $f8 -/* 9B79F8 80241078 27A20038 */ addiu $v0, $sp, 0x38 -/* 9B79FC 8024107C AFB2001C */ sw $s2, 0x1c($sp) -/* 9B7A00 80241080 AFA20020 */ sw $v0, 0x20($sp) -/* 9B7A04 80241084 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9B7A08 80241088 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9B7A0C 8024108C 0C01BFA4 */ jal fx_emote -/* 9B7A10 80241090 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9B7A14 80241094 0200202D */ daddu $a0, $s0, $zero -/* 9B7A18 80241098 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9B7A1C 8024109C C480003C */ lwc1 $f0, 0x3c($a0) -/* 9B7A20 802410A0 3C060020 */ lui $a2, 0x20 -/* 9B7A24 802410A4 0C012530 */ jal func_800494C0 -/* 9B7A28 802410A8 E4800064 */ swc1 $f0, 0x64($a0) -/* 9B7A2C 802410AC 8E220018 */ lw $v0, 0x18($s1) -/* 9B7A30 802410B0 9442002A */ lhu $v0, 0x2a($v0) -/* 9B7A34 802410B4 30420001 */ andi $v0, $v0, 1 -/* 9B7A38 802410B8 10400003 */ beqz $v0, .L802410C8 -/* 9B7A3C 802410BC 2402000A */ addiu $v0, $zero, 0xa -/* 9B7A40 802410C0 080904A2 */ j .L80241288 -/* 9B7A44 802410C4 AE620070 */ sw $v0, 0x70($s3) -.L802410C8: -/* 9B7A48 802410C8 080904A2 */ j .L80241288 -/* 9B7A4C 802410CC AE720070 */ sw $s2, 0x70($s3) -.L802410D0: -/* 9B7A50 802410D0 8E620074 */ lw $v0, 0x74($s3) -/* 9B7A54 802410D4 2442FFFF */ addiu $v0, $v0, -1 -.L802410D8: -/* 9B7A58 802410D8 08090439 */ j .L802410E4 -/* 9B7A5C 802410DC AE620074 */ sw $v0, 0x74($s3) -.L802410E0: -/* 9B7A60 802410E0 AE220090 */ sw $v0, 0x90($s1) -.L802410E4: -/* 9B7A64 802410E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9B7A68 802410E8 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9B7A6C 802410EC C4620000 */ lwc1 $f2, ($v1) -/* 9B7A70 802410F0 468010A0 */ cvt.s.w $f2, $f2 -/* 9B7A74 802410F4 C4640008 */ lwc1 $f4, 8($v1) -/* 9B7A78 802410F8 46802120 */ cvt.s.w $f4, $f4 -/* 9B7A7C 802410FC E7A00010 */ swc1 $f0, 0x10($sp) -/* 9B7A80 80241100 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B7A84 80241104 44051000 */ mfc1 $a1, $f2 -/* 9B7A88 80241108 C440000C */ lwc1 $f0, 0xc($v0) -/* 9B7A8C 8024110C 46800020 */ cvt.s.w $f0, $f0 -/* 9B7A90 80241110 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9B7A94 80241114 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B7A98 80241118 44062000 */ mfc1 $a2, $f4 -/* 9B7A9C 8024111C C4400010 */ lwc1 $f0, 0x10($v0) -/* 9B7AA0 80241120 46800020 */ cvt.s.w $f0, $f0 -/* 9B7AA4 80241124 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9B7AA8 80241128 8C640018 */ lw $a0, 0x18($v1) -/* 9B7AAC 8024112C 0C0123F5 */ jal is_point_within_region -/* 9B7AB0 80241130 8E070038 */ lw $a3, 0x38($s0) -/* 9B7AB4 80241134 1040001A */ beqz $v0, .L802411A0 -/* 9B7AB8 80241138 00000000 */ nop -/* 9B7ABC 8024113C 8E060038 */ lw $a2, 0x38($s0) -/* 9B7AC0 80241140 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B7AC4 80241144 8E070040 */ lw $a3, 0x40($s0) -/* 9B7AC8 80241148 C44C0000 */ lwc1 $f12, ($v0) -/* 9B7ACC 8024114C 46806320 */ cvt.s.w $f12, $f12 -/* 9B7AD0 80241150 C44E0008 */ lwc1 $f14, 8($v0) -/* 9B7AD4 80241154 0C00A7B5 */ jal dist2D -/* 9B7AD8 80241158 468073A0 */ cvt.s.w $f14, $f14 -/* 9B7ADC 8024115C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9B7AE0 80241160 4600103C */ c.lt.s $f2, $f0 -/* 9B7AE4 80241164 00000000 */ nop -/* 9B7AE8 80241168 4500000D */ bc1f .L802411A0 -/* 9B7AEC 8024116C E7A00034 */ swc1 $f0, 0x34($sp) -/* 9B7AF0 80241170 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9B7AF4 80241174 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B7AF8 80241178 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9B7AFC 8024117C C4480000 */ lwc1 $f8, ($v0) -/* 9B7B00 80241180 46804220 */ cvt.s.w $f8, $f8 -/* 9B7B04 80241184 44064000 */ mfc1 $a2, $f8 -/* 9B7B08 80241188 C4480008 */ lwc1 $f8, 8($v0) -/* 9B7B0C 8024118C 46804220 */ cvt.s.w $f8, $f8 -/* 9B7B10 80241190 44074000 */ mfc1 $a3, $f8 -/* 9B7B14 80241194 0C00A720 */ jal atan2 -/* 9B7B18 80241198 24140001 */ addiu $s4, $zero, 1 -/* 9B7B1C 8024119C E600000C */ swc1 $f0, 0xc($s0) -.L802411A0: -/* 9B7B20 802411A0 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B7B24 802411A4 8C43000C */ lw $v1, 0xc($v0) -/* 9B7B28 802411A8 8C420010 */ lw $v0, 0x10($v0) -/* 9B7B2C 802411AC 00621825 */ or $v1, $v1, $v0 -/* 9B7B30 802411B0 00741825 */ or $v1, $v1, $s4 -/* 9B7B34 802411B4 10600008 */ beqz $v1, .L802411D8 -/* 9B7B38 802411B8 00000000 */ nop -/* 9B7B3C 802411BC 8602008C */ lh $v0, 0x8c($s0) -/* 9B7B40 802411C0 14400031 */ bnez $v0, .L80241288 -/* 9B7B44 802411C4 00000000 */ nop -/* 9B7B48 802411C8 8E050018 */ lw $a1, 0x18($s0) -/* 9B7B4C 802411CC 8E06000C */ lw $a2, 0xc($s0) -/* 9B7B50 802411D0 0C00EA95 */ jal npc_move_heading -/* 9B7B54 802411D4 0200202D */ daddu $a0, $s0, $zero -.L802411D8: -/* 9B7B58 802411D8 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B7B5C 802411DC 3C014059 */ lui $at, 0x4059 -/* 9B7B60 802411E0 44811800 */ mtc1 $at, $f3 -/* 9B7B64 802411E4 44801000 */ mtc1 $zero, $f2 -/* 9B7B68 802411E8 46000021 */ cvt.d.s $f0, $f0 -/* 9B7B6C 802411EC 46220002 */ mul.d $f0, $f0, $f2 -/* 9B7B70 802411F0 00000000 */ nop -/* 9B7B74 802411F4 4620020D */ trunc.w.d $f8, $f0 -/* 9B7B78 802411F8 E628007C */ swc1 $f8, 0x7c($s1) -/* 9B7B7C 802411FC 8E420004 */ lw $v0, 4($s2) -/* 9B7B80 80241200 18400021 */ blez $v0, .L80241288 -/* 9B7B84 80241204 00000000 */ nop -/* 9B7B88 80241208 8602008E */ lh $v0, 0x8e($s0) -/* 9B7B8C 8024120C 9603008E */ lhu $v1, 0x8e($s0) -/* 9B7B90 80241210 18400005 */ blez $v0, .L80241228 -/* 9B7B94 80241214 2462FFFF */ addiu $v0, $v1, -1 -/* 9B7B98 80241218 A602008E */ sh $v0, 0x8e($s0) -/* 9B7B9C 8024121C 00021400 */ sll $v0, $v0, 0x10 -/* 9B7BA0 80241220 1C400019 */ bgtz $v0, .L80241288 -/* 9B7BA4 80241224 00000000 */ nop -.L80241228: -/* 9B7BA8 80241228 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9B7BAC 8024122C 24020002 */ addiu $v0, $zero, 2 -/* 9B7BB0 80241230 0C00A67F */ jal rand_int -/* 9B7BB4 80241234 AE620070 */ sw $v0, 0x70($s3) -/* 9B7BB8 80241238 3C035555 */ lui $v1, 0x5555 -/* 9B7BBC 8024123C 34635556 */ ori $v1, $v1, 0x5556 -/* 9B7BC0 80241240 00430018 */ mult $v0, $v1 -/* 9B7BC4 80241244 000227C3 */ sra $a0, $v0, 0x1f -/* 9B7BC8 80241248 00004010 */ mfhi $t0 -/* 9B7BCC 8024124C 01042023 */ subu $a0, $t0, $a0 -/* 9B7BD0 80241250 00041840 */ sll $v1, $a0, 1 -/* 9B7BD4 80241254 00641821 */ addu $v1, $v1, $a0 -/* 9B7BD8 80241258 00431023 */ subu $v0, $v0, $v1 -/* 9B7BDC 8024125C 24430002 */ addiu $v1, $v0, 2 -/* 9B7BE0 80241260 AE630074 */ sw $v1, 0x74($s3) -/* 9B7BE4 80241264 8E42002C */ lw $v0, 0x2c($s2) -/* 9B7BE8 80241268 58400007 */ blezl $v0, .L80241288 -/* 9B7BEC 8024126C AE600070 */ sw $zero, 0x70($s3) -/* 9B7BF0 80241270 8E420008 */ lw $v0, 8($s2) -/* 9B7BF4 80241274 18400003 */ blez $v0, .L80241284 -/* 9B7BF8 80241278 28620003 */ slti $v0, $v1, 3 -/* 9B7BFC 8024127C 10400002 */ beqz $v0, .L80241288 -/* 9B7C00 80241280 00000000 */ nop -.L80241284: -/* 9B7C04 80241284 AE600070 */ sw $zero, 0x70($s3) -.L80241288: -/* 9B7C08 80241288 8FBF0058 */ lw $ra, 0x58($sp) -/* 9B7C0C 8024128C 8FB50054 */ lw $s5, 0x54($sp) -/* 9B7C10 80241290 8FB40050 */ lw $s4, 0x50($sp) -/* 9B7C14 80241294 8FB3004C */ lw $s3, 0x4c($sp) -/* 9B7C18 80241298 8FB20048 */ lw $s2, 0x48($sp) -/* 9B7C1C 8024129C 8FB10044 */ lw $s1, 0x44($sp) -/* 9B7C20 802412A0 8FB00040 */ lw $s0, 0x40($sp) -/* 9B7C24 802412A4 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 9B7C28 802412A8 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 9B7C2C 802412AC D7B60068 */ ldc1 $f22, 0x68($sp) -/* 9B7C30 802412B0 D7B40060 */ ldc1 $f20, 0x60($sp) -/* 9B7C34 802412B4 03E00008 */ jr $ra -/* 9B7C38 802412B8 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_trd/trd_07/func_80241738_9B6980.s b/asm/nonmatchings/world/area_trd/trd_07/func_80241738_9B6980.s deleted file mode 100644 index 774423c672..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/func_80241738_9B6980.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241738_9B80B8 -/* 9B80B8 80241738 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B80BC 8024173C AFB00010 */ sw $s0, 0x10($sp) -/* 9B80C0 80241740 0080802D */ daddu $s0, $a0, $zero -/* 9B80C4 80241744 AFBF0014 */ sw $ra, 0x14($sp) -/* 9B80C8 80241748 8E020148 */ lw $v0, 0x148($s0) -/* 9B80CC 8024174C 0C00EABB */ jal get_npc_unsafe -/* 9B80D0 80241750 84440008 */ lh $a0, 8($v0) -/* 9B80D4 80241754 9443008E */ lhu $v1, 0x8e($v0) -/* 9B80D8 80241758 C440003C */ lwc1 $f0, 0x3c($v0) -/* 9B80DC 8024175C 24640001 */ addiu $a0, $v1, 1 -/* 9B80E0 80241760 00031C00 */ sll $v1, $v1, 0x10 -/* 9B80E4 80241764 00031B83 */ sra $v1, $v1, 0xe -/* 9B80E8 80241768 A444008E */ sh $a0, 0x8e($v0) -/* 9B80EC 8024176C 3C018024 */ lui $at, 0x8024 -/* 9B80F0 80241770 00230821 */ addu $at, $at, $v1 -/* 9B80F4 80241774 C4222EAC */ lwc1 $f2, 0x2eac($at) -/* 9B80F8 80241778 8443008E */ lh $v1, 0x8e($v0) -/* 9B80FC 8024177C 46020000 */ add.s $f0, $f0, $f2 -/* 9B8100 80241780 28630005 */ slti $v1, $v1, 5 -/* 9B8104 80241784 14600003 */ bnez $v1, .L80241794 -/* 9B8108 80241788 E440003C */ swc1 $f0, 0x3c($v0) -/* 9B810C 8024178C 2402000C */ addiu $v0, $zero, 0xc -/* 9B8110 80241790 AE020070 */ sw $v0, 0x70($s0) -.L80241794: -/* 9B8114 80241794 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B8118 80241798 8FB00010 */ lw $s0, 0x10($sp) -/* 9B811C 8024179C 03E00008 */ jr $ra -/* 9B8120 802417A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_07/func_802418D8_9B6980.s b/asm/nonmatchings/world/area_trd/trd_07/func_802418D8_9B6980.s deleted file mode 100644 index bf3cbc15f4..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/func_802418D8_9B6980.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418D8_9B8258 -/* 9B8258 802418D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B825C 802418DC AFB00010 */ sw $s0, 0x10($sp) -/* 9B8260 802418E0 0080802D */ daddu $s0, $a0, $zero -/* 9B8264 802418E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 9B8268 802418E8 8E020148 */ lw $v0, 0x148($s0) -/* 9B826C 802418EC 0C00EABB */ jal get_npc_unsafe -/* 9B8270 802418F0 84440008 */ lh $a0, 8($v0) -/* 9B8274 802418F4 0040202D */ daddu $a0, $v0, $zero -/* 9B8278 802418F8 8482008E */ lh $v0, 0x8e($a0) -/* 9B827C 802418FC 9483008E */ lhu $v1, 0x8e($a0) -/* 9B8280 80241900 18400005 */ blez $v0, .L80241918 -/* 9B8284 80241904 2462FFFF */ addiu $v0, $v1, -1 -/* 9B8288 80241908 A482008E */ sh $v0, 0x8e($a0) -/* 9B828C 8024190C 00021400 */ sll $v0, $v0, 0x10 -/* 9B8290 80241910 1C400006 */ bgtz $v0, .L8024192C -/* 9B8294 80241914 00000000 */ nop -.L80241918: -/* 9B8298 80241918 8482008C */ lh $v0, 0x8c($a0) -/* 9B829C 8024191C 14400003 */ bnez $v0, .L8024192C -/* 9B82A0 80241920 2402000E */ addiu $v0, $zero, 0xe -/* 9B82A4 80241924 A480008E */ sh $zero, 0x8e($a0) -/* 9B82A8 80241928 AE020070 */ sw $v0, 0x70($s0) -.L8024192C: -/* 9B82AC 8024192C 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B82B0 80241930 8FB00010 */ lw $s0, 0x10($sp) -/* 9B82B4 80241934 03E00008 */ jr $ra -/* 9B82B8 80241938 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_07/func_80241FDC_9B6980.s b/asm/nonmatchings/world/area_trd/trd_07/func_80241FDC_9B6980.s deleted file mode 100644 index b620364114..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/func_80241FDC_9B6980.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FDC_9B895C -/* 9B895C 80241FDC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9B8960 80241FE0 AFB3001C */ sw $s3, 0x1c($sp) -/* 9B8964 80241FE4 0080982D */ daddu $s3, $a0, $zero -/* 9B8968 80241FE8 AFBF0020 */ sw $ra, 0x20($sp) -/* 9B896C 80241FEC AFB20018 */ sw $s2, 0x18($sp) -/* 9B8970 80241FF0 AFB10014 */ sw $s1, 0x14($sp) -/* 9B8974 80241FF4 AFB00010 */ sw $s0, 0x10($sp) -/* 9B8978 80241FF8 8E710148 */ lw $s1, 0x148($s3) -/* 9B897C 80241FFC 0C00EABB */ jal get_npc_unsafe -/* 9B8980 80242000 86240008 */ lh $a0, 8($s1) -/* 9B8984 80242004 0040802D */ daddu $s0, $v0, $zero -/* 9B8988 80242008 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9B898C 8024200C 8E2200CC */ lw $v0, 0xcc($s1) -/* 9B8990 80242010 3C01C0A0 */ lui $at, 0xc0a0 -/* 9B8994 80242014 44811000 */ mtc1 $at, $f2 -/* 9B8998 80242018 3C013E19 */ lui $at, 0x3e19 -/* 9B899C 8024201C 3421999A */ ori $at, $at, 0x999a -/* 9B89A0 80242020 44810000 */ mtc1 $at, $f0 -/* 9B89A4 80242024 8C420024 */ lw $v0, 0x24($v0) -/* 9B89A8 80242028 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 9B89AC 8024202C 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 9B89B0 80242030 E602001C */ swc1 $f2, 0x1c($s0) -/* 9B89B4 80242034 E6000014 */ swc1 $f0, 0x14($s0) -/* 9B89B8 80242038 AE020028 */ sw $v0, 0x28($s0) -/* 9B89BC 8024203C 8E22008C */ lw $v0, 0x8c($s1) -/* 9B89C0 80242040 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9B89C4 80242044 00021FC2 */ srl $v1, $v0, 0x1f -/* 9B89C8 80242048 00431021 */ addu $v0, $v0, $v1 -/* 9B89CC 8024204C 8E430000 */ lw $v1, ($s2) -/* 9B89D0 80242050 00021043 */ sra $v0, $v0, 1 -/* 9B89D4 80242054 A60200A8 */ sh $v0, 0xa8($s0) -/* 9B89D8 80242058 8C660028 */ lw $a2, 0x28($v1) -/* 9B89DC 8024205C 0C00A7B5 */ jal dist2D -/* 9B89E0 80242060 8C670030 */ lw $a3, 0x30($v1) -/* 9B89E4 80242064 0200202D */ daddu $a0, $s0, $zero -/* 9B89E8 80242068 0000302D */ daddu $a2, $zero, $zero -/* 9B89EC 8024206C C6020038 */ lwc1 $f2, 0x38($s0) -/* 9B89F0 80242070 3C0140E0 */ lui $at, 0x40e0 -/* 9B89F4 80242074 44810000 */ mtc1 $at, $f0 -/* 9B89F8 80242078 4600110D */ trunc.w.s $f4, $f2 -/* 9B89FC 8024207C 44022000 */ mfc1 $v0, $f4 -/* 9B8A00 80242080 E6000018 */ swc1 $f0, 0x18($s0) -/* 9B8A04 80242084 A6220010 */ sh $v0, 0x10($s1) -/* 9B8A08 80242088 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B8A0C 8024208C 240502C1 */ addiu $a1, $zero, 0x2c1 -/* 9B8A10 80242090 4600010D */ trunc.w.s $f4, $f0 -/* 9B8A14 80242094 44022000 */ mfc1 $v0, $f4 -/* 9B8A18 80242098 00000000 */ nop -/* 9B8A1C 8024209C A6220012 */ sh $v0, 0x12($s1) -/* 9B8A20 802420A0 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9B8A24 802420A4 24020001 */ addiu $v0, $zero, 1 -/* 9B8A28 802420A8 A2220007 */ sb $v0, 7($s1) -/* 9B8A2C 802420AC 4600010D */ trunc.w.s $f4, $f0 -/* 9B8A30 802420B0 44022000 */ mfc1 $v0, $f4 -/* 9B8A34 802420B4 0C012530 */ jal func_800494C0 -/* 9B8A38 802420B8 A6220014 */ sh $v0, 0x14($s1) -/* 9B8A3C 802420BC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9B8A40 802420C0 8E420000 */ lw $v0, ($s2) -/* 9B8A44 802420C4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9B8A48 802420C8 8C460028 */ lw $a2, 0x28($v0) -/* 9B8A4C 802420CC 0C00A720 */ jal atan2 -/* 9B8A50 802420D0 8C470030 */ lw $a3, 0x30($v0) -/* 9B8A54 802420D4 2402000C */ addiu $v0, $zero, 0xc -/* 9B8A58 802420D8 A602008E */ sh $v0, 0x8e($s0) -/* 9B8A5C 802420DC 2402000D */ addiu $v0, $zero, 0xd -/* 9B8A60 802420E0 E600000C */ swc1 $f0, 0xc($s0) -/* 9B8A64 802420E4 AE620070 */ sw $v0, 0x70($s3) -/* 9B8A68 802420E8 8FBF0020 */ lw $ra, 0x20($sp) -/* 9B8A6C 802420EC 8FB3001C */ lw $s3, 0x1c($sp) -/* 9B8A70 802420F0 8FB20018 */ lw $s2, 0x18($sp) -/* 9B8A74 802420F4 8FB10014 */ lw $s1, 0x14($sp) -/* 9B8A78 802420F8 8FB00010 */ lw $s0, 0x10($sp) -/* 9B8A7C 802420FC 03E00008 */ jr $ra -/* 9B8A80 80242100 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_08/func_80240124_9BB2A0.s b/asm/nonmatchings/world/area_trd/trd_08/func_80240124_9BB2A0.s deleted file mode 100644 index 92e9203c73..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_08/func_80240124_9BB2A0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124_9BB3C4 -/* 9BB3C4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9BB3C8 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 9BB3CC 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 9BB3D0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 9BB3D4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 9BB3D8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 9BB3DC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 9BB3E0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 9BB3E4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 9BB3E8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 9BB3EC 8024014C 1440000E */ bnez $v0, .L80240188 -/* 9BB3F0 80240150 00000000 */ nop -/* 9BB3F4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 9BB3F8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 9BB3FC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 9BB400 80240160 04610004 */ bgez $v1, .L80240174 -/* 9BB404 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 9BB408 80240168 3C020002 */ lui $v0, 2 -/* 9BB40C 8024016C 08090061 */ j .L80240184 -/* 9BB410 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 9BB414 80240174 3C040002 */ lui $a0, 2 -/* 9BB418 80240178 0083102A */ slt $v0, $a0, $v1 -/* 9BB41C 8024017C 10400002 */ beqz $v0, .L80240188 -/* 9BB420 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 9BB424 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 9BB428 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 9BB42C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 9BB430 80240190 00000000 */ nop -/* 9BB434 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 9BB438 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 9BB43C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 9BB440 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 9BB444 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 9BB448 802401A8 3C020002 */ lui $v0, 2 -/* 9BB44C 802401AC 08090071 */ j .L802401C4 -/* 9BB450 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 9BB454 802401B4 3C040002 */ lui $a0, 2 -/* 9BB458 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 9BB45C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 9BB460 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 9BB464 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 9BB468 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 9BB46C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 9BB470 802401D0 00000000 */ nop -/* 9BB474 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 9BB478 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 9BB47C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 9BB480 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 9BB484 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 9BB488 802401E8 3C020002 */ lui $v0, 2 -/* 9BB48C 802401EC 08090081 */ j .L80240204 -/* 9BB490 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 9BB494 802401F4 3C040002 */ lui $a0, 2 -/* 9BB498 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 9BB49C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 9BB4A0 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 9BB4A4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 9BB4A8 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 9BB4AC 8024020C 1440000E */ bnez $v0, .L80240248 -/* 9BB4B0 80240210 00000000 */ nop -/* 9BB4B4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 9BB4B8 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 9BB4BC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 9BB4C0 80240220 04610004 */ bgez $v1, .L80240234 -/* 9BB4C4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 9BB4C8 80240228 3C020002 */ lui $v0, 2 -/* 9BB4CC 8024022C 08090091 */ j .L80240244 -/* 9BB4D0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 9BB4D4 80240234 3C040002 */ lui $a0, 2 -/* 9BB4D8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 9BB4DC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 9BB4E0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 9BB4E4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 9BB4E8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 9BB4EC 8024024C 0C046F07 */ jal set_main_pan_u -/* 9BB4F0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 9BB4F4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 9BB4F8 80240258 0C046F0D */ jal set_main_pan_v -/* 9BB4FC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 9BB500 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 9BB504 80240264 0C046F13 */ jal set_aux_pan_u -/* 9BB508 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 9BB50C 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 9BB510 80240270 0C046F19 */ jal set_aux_pan_v -/* 9BB514 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 9BB518 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 9BB51C 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 9BB520 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 9BB524 80240284 24420001 */ addiu $v0, $v0, 1 -/* 9BB528 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 9BB52C 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 9BB530 80240290 24630001 */ addiu $v1, $v1, 1 -/* 9BB534 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 9BB538 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 9BB53C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 9BB540 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 9BB544 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 9BB548 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 9BB54C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 9BB550 802402B0 14600002 */ bnez $v1, .L802402BC -/* 9BB554 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 9BB558 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 9BB55C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 9BB560 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 9BB564 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 9BB568 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 9BB56C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 9BB570 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 9BB574 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 9BB578 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 9BB57C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 9BB580 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 9BB584 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 9BB588 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 9BB58C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 9BB590 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 9BB594 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 9BB598 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 9BB59C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 9BB5A0 80240300 0000102D */ daddu $v0, $zero, $zero -/* 9BB5A4 80240304 03E00008 */ jr $ra -/* 9BB5A8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9BB5AC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_08/func_80240310_9BB2A0.s b/asm/nonmatchings/world/area_trd/trd_08/func_80240310_9BB2A0.s deleted file mode 100644 index 3734e8eab1..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_08/func_80240310_9BB2A0.s +++ /dev/null @@ -1,401 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_9BB5B0 -/* 9BB5B0 80240310 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 9BB5B4 80240314 AFB40028 */ sw $s4, 0x28($sp) -/* 9BB5B8 80240318 0080A02D */ daddu $s4, $a0, $zero -/* 9BB5BC 8024031C AFBF0038 */ sw $ra, 0x38($sp) -/* 9BB5C0 80240320 AFB70034 */ sw $s7, 0x34($sp) -/* 9BB5C4 80240324 AFB60030 */ sw $s6, 0x30($sp) -/* 9BB5C8 80240328 AFB5002C */ sw $s5, 0x2c($sp) -/* 9BB5CC 8024032C AFB30024 */ sw $s3, 0x24($sp) -/* 9BB5D0 80240330 AFB20020 */ sw $s2, 0x20($sp) -/* 9BB5D4 80240334 AFB1001C */ sw $s1, 0x1c($sp) -/* 9BB5D8 80240338 AFB00018 */ sw $s0, 0x18($sp) -/* 9BB5DC 8024033C F7B80050 */ sdc1 $f24, 0x50($sp) -/* 9BB5E0 80240340 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 9BB5E4 80240344 F7B40040 */ sdc1 $f20, 0x40($sp) -/* 9BB5E8 80240348 8E82000C */ lw $v0, 0xc($s4) -/* 9BB5EC 8024034C 00A0802D */ daddu $s0, $a1, $zero -/* 9BB5F0 80240350 8C450000 */ lw $a1, ($v0) -/* 9BB5F4 80240354 0C0B1EAF */ jal get_variable -/* 9BB5F8 80240358 0000A82D */ daddu $s5, $zero, $zero -/* 9BB5FC 8024035C 8E830148 */ lw $v1, 0x148($s4) -/* 9BB600 80240360 84640008 */ lh $a0, 8($v1) -/* 9BB604 80240364 0C00EABB */ jal get_npc_unsafe -/* 9BB608 80240368 0040902D */ daddu $s2, $v0, $zero -/* 9BB60C 8024036C 0040882D */ daddu $s1, $v0, $zero -/* 9BB610 80240370 0C00EABB */ jal get_npc_unsafe -/* 9BB614 80240374 2404FFFC */ addiu $a0, $zero, -4 -/* 9BB618 80240378 3C138011 */ lui $s3, %hi(gPlayerStatus) -/* 9BB61C 8024037C 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) -/* 9BB620 80240380 3C168011 */ lui $s6, %hi(D_8010EBB0) -/* 9BB624 80240384 26D6EBB0 */ addiu $s6, $s6, %lo(D_8010EBB0) -/* 9BB628 80240388 1200001C */ beqz $s0, .L802403FC -/* 9BB62C 8024038C 0040B82D */ daddu $s7, $v0, $zero -/* 9BB630 80240390 0C00AB39 */ jal heap_malloc -/* 9BB634 80240394 24040030 */ addiu $a0, $zero, 0x30 -/* 9BB638 80240398 0040802D */ daddu $s0, $v0, $zero -/* 9BB63C 8024039C AE900074 */ sw $s0, 0x74($s4) -/* 9BB640 802403A0 AE000000 */ sw $zero, ($s0) -/* 9BB644 802403A4 C6400000 */ lwc1 $f0, ($s2) -/* 9BB648 802403A8 46800020 */ cvt.s.w $f0, $f0 -/* 9BB64C 802403AC E6000004 */ swc1 $f0, 4($s0) -/* 9BB650 802403B0 C6400004 */ lwc1 $f0, 4($s2) -/* 9BB654 802403B4 46800020 */ cvt.s.w $f0, $f0 -/* 9BB658 802403B8 E6000008 */ swc1 $f0, 8($s0) -/* 9BB65C 802403BC C6400008 */ lwc1 $f0, 8($s2) -/* 9BB660 802403C0 46800020 */ cvt.s.w $f0, $f0 -/* 9BB664 802403C4 E600000C */ swc1 $f0, 0xc($s0) -/* 9BB668 802403C8 C640000C */ lwc1 $f0, 0xc($s2) -/* 9BB66C 802403CC 46800020 */ cvt.s.w $f0, $f0 -/* 9BB670 802403D0 E6000010 */ swc1 $f0, 0x10($s0) -/* 9BB674 802403D4 8E420010 */ lw $v0, 0x10($s2) -/* 9BB678 802403D8 AE020014 */ sw $v0, 0x14($s0) -/* 9BB67C 802403DC 8E420014 */ lw $v0, 0x14($s2) -/* 9BB680 802403E0 AE020018 */ sw $v0, 0x18($s0) -/* 9BB684 802403E4 8E420018 */ lw $v0, 0x18($s2) -/* 9BB688 802403E8 AE000020 */ sw $zero, 0x20($s0) -/* 9BB68C 802403EC AE000024 */ sw $zero, 0x24($s0) -/* 9BB690 802403F0 AE000028 */ sw $zero, 0x28($s0) -/* 9BB694 802403F4 AE12002C */ sw $s2, 0x2c($s0) -/* 9BB698 802403F8 AE02001C */ sw $v0, 0x1c($s0) -.L802403FC: -/* 9BB69C 802403FC 0C009C64 */ jal func_80027190 -/* 9BB6A0 80240400 00000000 */ nop -/* 9BB6A4 80240404 14400131 */ bnez $v0, .L802408CC -/* 9BB6A8 80240408 0000102D */ daddu $v0, $zero, $zero -/* 9BB6AC 8024040C 8E900074 */ lw $s0, 0x74($s4) -/* 9BB6B0 80240410 8E020018 */ lw $v0, 0x18($s0) -/* 9BB6B4 80240414 02A2102A */ slt $v0, $s5, $v0 -/* 9BB6B8 80240418 10400082 */ beqz $v0, .L80240624 -/* 9BB6BC 8024041C 0000902D */ daddu $s2, $zero, $zero -/* 9BB6C0 80240420 3C013F00 */ lui $at, 0x3f00 -/* 9BB6C4 80240424 4481C000 */ mtc1 $at, $f24 -.L80240428: -/* 9BB6C8 80240428 8E040014 */ lw $a0, 0x14($s0) -/* 9BB6CC 8024042C 0C00EABB */ jal get_npc_unsafe -/* 9BB6D0 80240430 00922021 */ addu $a0, $a0, $s2 -/* 9BB6D4 80240434 8E030000 */ lw $v1, ($s0) -/* 9BB6D8 80240438 30630001 */ andi $v1, $v1, 1 -/* 9BB6DC 8024043C 14600020 */ bnez $v1, .L802404C0 -/* 9BB6E0 80240440 0040882D */ daddu $s1, $v0, $zero -/* 9BB6E4 80240444 862200A6 */ lh $v0, 0xa6($s1) -/* 9BB6E8 80240448 02420018 */ mult $s2, $v0 -/* 9BB6EC 8024044C 00004012 */ mflo $t0 -/* 9BB6F0 80240450 C6200054 */ lwc1 $f0, 0x54($s1) -/* 9BB6F4 80240454 4488A000 */ mtc1 $t0, $f20 -/* 9BB6F8 80240458 00000000 */ nop -/* 9BB6FC 8024045C 4680A520 */ cvt.s.w $f20, $f20 -/* 9BB700 80240460 4600A502 */ mul.s $f20, $f20, $f0 -/* 9BB704 80240464 00000000 */ nop -/* 9BB708 80240468 0C00A8BB */ jal sin_deg -/* 9BB70C 8024046C C60C0028 */ lwc1 $f12, 0x28($s0) -/* 9BB710 80240470 C60C0028 */ lwc1 $f12, 0x28($s0) -/* 9BB714 80240474 4600A582 */ mul.s $f22, $f20, $f0 -/* 9BB718 80240478 0C00A8D4 */ jal cos_deg -/* 9BB71C 8024047C 00000000 */ nop -/* 9BB720 80240480 C6020004 */ lwc1 $f2, 4($s0) -/* 9BB724 80240484 46161080 */ add.s $f2, $f2, $f22 -/* 9BB728 80240488 4600A507 */ neg.s $f20, $f20 -/* 9BB72C 8024048C 4600A502 */ mul.s $f20, $f20, $f0 -/* 9BB730 80240490 00000000 */ nop -/* 9BB734 80240494 E6220038 */ swc1 $f2, 0x38($s1) -/* 9BB738 80240498 C6000008 */ lwc1 $f0, 8($s0) -/* 9BB73C 8024049C E620003C */ swc1 $f0, 0x3c($s1) -/* 9BB740 802404A0 C60E000C */ lwc1 $f14, 0xc($s0) -/* 9BB744 802404A4 46147380 */ add.s $f14, $f14, $f20 -/* 9BB748 802404A8 E62E0040 */ swc1 $f14, 0x40($s1) -/* 9BB74C 802404AC 8E660028 */ lw $a2, 0x28($s3) -/* 9BB750 802404B0 8E670030 */ lw $a3, 0x30($s3) -/* 9BB754 802404B4 0C00A720 */ jal atan2 -/* 9BB758 802404B8 46001306 */ mov.s $f12, $f2 -/* 9BB75C 802404BC E620000C */ swc1 $f0, 0xc($s1) -.L802404C0: -/* 9BB760 802404C0 8E020000 */ lw $v0, ($s0) -/* 9BB764 802404C4 30420002 */ andi $v0, $v0, 2 -/* 9BB768 802404C8 14400051 */ bnez $v0, .L80240610 -/* 9BB76C 802404CC 00000000 */ nop -/* 9BB770 802404D0 8E620000 */ lw $v0, ($s3) -/* 9BB774 802404D4 30428000 */ andi $v0, $v0, 0x8000 -/* 9BB778 802404D8 1440004D */ bnez $v0, .L80240610 -/* 9BB77C 802404DC 24020001 */ addiu $v0, $zero, 1 -/* 9BB780 802404E0 C664002C */ lwc1 $f4, 0x2c($s3) -/* 9BB784 802404E4 C622003C */ lwc1 $f2, 0x3c($s1) -/* 9BB788 802404E8 82C30000 */ lb $v1, ($s6) -/* 9BB78C 802404EC 1462000F */ bne $v1, $v0, .L8024052C -/* 9BB790 802404F0 46022181 */ sub.s $f6, $f4, $f2 -/* 9BB794 802404F4 82C30003 */ lb $v1, 3($s6) -/* 9BB798 802404F8 24020008 */ addiu $v0, $zero, 8 -/* 9BB79C 802404FC 14620004 */ bne $v1, $v0, .L80240510 -/* 9BB7A0 80240500 24020004 */ addiu $v0, $zero, 4 -/* 9BB7A4 80240504 C6E0003C */ lwc1 $f0, 0x3c($s7) -/* 9BB7A8 80240508 0809014B */ j .L8024052C -/* 9BB7AC 8024050C 46020181 */ sub.s $f6, $f0, $f2 -.L80240510: -/* 9BB7B0 80240510 14620006 */ bne $v1, $v0, .L8024052C -/* 9BB7B4 80240514 00000000 */ nop -/* 9BB7B8 80240518 3C014120 */ lui $at, 0x4120 -/* 9BB7BC 8024051C 44810000 */ mtc1 $at, $f0 -/* 9BB7C0 80240520 00000000 */ nop -/* 9BB7C4 80240524 46002001 */ sub.s $f0, $f4, $f0 -/* 9BB7C8 80240528 46020181 */ sub.s $f6, $f0, $f2 -.L8024052C: -/* 9BB7CC 8024052C 862200A8 */ lh $v0, 0xa8($s1) -/* 9BB7D0 80240530 3C013F4C */ lui $at, 0x3f4c -/* 9BB7D4 80240534 3421CCCD */ ori $at, $at, 0xcccd -/* 9BB7D8 80240538 44810000 */ mtc1 $at, $f0 -/* 9BB7DC 8024053C 44822000 */ mtc1 $v0, $f4 -/* 9BB7E0 80240540 00000000 */ nop -/* 9BB7E4 80240544 46802120 */ cvt.s.w $f4, $f4 -/* 9BB7E8 80240548 46002102 */ mul.s $f4, $f4, $f0 -/* 9BB7EC 8024054C 00000000 */ nop -/* 9BB7F0 80240550 C6620028 */ lwc1 $f2, 0x28($s3) -/* 9BB7F4 80240554 C6200038 */ lwc1 $f0, 0x38($s1) -/* 9BB7F8 80240558 46001581 */ sub.s $f22, $f2, $f0 -/* 9BB7FC 8024055C C6620030 */ lwc1 $f2, 0x30($s3) -/* 9BB800 80240560 C6200040 */ lwc1 $f0, 0x40($s1) -/* 9BB804 80240564 46001501 */ sub.s $f20, $f2, $f0 -/* 9BB808 80240568 46003005 */ abs.s $f0, $f6 -/* 9BB80C 8024056C 4604003C */ c.lt.s $f0, $f4 -/* 9BB810 80240570 00000000 */ nop -/* 9BB814 80240574 45000026 */ bc1f .L80240610 -/* 9BB818 80240578 00000000 */ nop -/* 9BB81C 8024057C 4616B082 */ mul.s $f2, $f22, $f22 -/* 9BB820 80240580 00000000 */ nop -/* 9BB824 80240584 4614A002 */ mul.s $f0, $f20, $f20 -/* 9BB828 80240588 00000000 */ nop -/* 9BB82C 8024058C 46001300 */ add.s $f12, $f2, $f0 -/* 9BB830 80240590 46006104 */ sqrt.s $f4, $f12 -/* 9BB834 80240594 46042032 */ c.eq.s $f4, $f4 -/* 9BB838 80240598 00000000 */ nop -/* 9BB83C 8024059C 45010004 */ bc1t .L802405B0 -/* 9BB840 802405A0 00000000 */ nop -/* 9BB844 802405A4 0C0187BC */ jal sqrtf -/* 9BB848 802405A8 00000000 */ nop -/* 9BB84C 802405AC 46000106 */ mov.s $f4, $f0 -.L802405B0: -/* 9BB850 802405B0 862200A6 */ lh $v0, 0xa6($s1) -/* 9BB854 802405B4 44821000 */ mtc1 $v0, $f2 -/* 9BB858 802405B8 00000000 */ nop -/* 9BB85C 802405BC 468010A0 */ cvt.s.w $f2, $f2 -/* 9BB860 802405C0 46181082 */ mul.s $f2, $f2, $f24 -/* 9BB864 802405C4 00000000 */ nop -/* 9BB868 802405C8 C6200054 */ lwc1 $f0, 0x54($s1) -/* 9BB86C 802405CC 46001082 */ mul.s $f2, $f2, $f0 -/* 9BB870 802405D0 00000000 */ nop -/* 9BB874 802405D4 866200B2 */ lh $v0, 0xb2($s3) -/* 9BB878 802405D8 44820000 */ mtc1 $v0, $f0 -/* 9BB87C 802405DC 00000000 */ nop -/* 9BB880 802405E0 46800020 */ cvt.s.w $f0, $f0 -/* 9BB884 802405E4 46180002 */ mul.s $f0, $f0, $f24 -/* 9BB888 802405E8 00000000 */ nop -/* 9BB88C 802405EC 46181082 */ mul.s $f2, $f2, $f24 -/* 9BB890 802405F0 00000000 */ nop -/* 9BB894 802405F4 46180002 */ mul.s $f0, $f0, $f24 -/* 9BB898 802405F8 00000000 */ nop -/* 9BB89C 802405FC 46001080 */ add.s $f2, $f2, $f0 -/* 9BB8A0 80240600 4602203E */ c.le.s $f4, $f2 -/* 9BB8A4 80240604 00000000 */ nop -/* 9BB8A8 80240608 45030001 */ bc1tl .L80240610 -/* 9BB8AC 8024060C 24150001 */ addiu $s5, $zero, 1 -.L80240610: -/* 9BB8B0 80240610 8E020018 */ lw $v0, 0x18($s0) -/* 9BB8B4 80240614 26520001 */ addiu $s2, $s2, 1 -/* 9BB8B8 80240618 0242102A */ slt $v0, $s2, $v0 -/* 9BB8BC 8024061C 1440FF82 */ bnez $v0, .L80240428 -/* 9BB8C0 80240620 00000000 */ nop -.L80240624: -/* 9BB8C4 80240624 8E620000 */ lw $v0, ($s3) -/* 9BB8C8 80240628 30428000 */ andi $v0, $v0, 0x8000 -/* 9BB8CC 8024062C 54400001 */ bnel $v0, $zero, .L80240634 -/* 9BB8D0 80240630 2415FFFF */ addiu $s5, $zero, -1 -.L80240634: -/* 9BB8D4 80240634 C60C0028 */ lwc1 $f12, 0x28($s0) -/* 9BB8D8 80240638 C6000010 */ lwc1 $f0, 0x10($s0) -/* 9BB8DC 8024063C 46006300 */ add.s $f12, $f12, $f0 -/* 9BB8E0 80240640 0C00A6C9 */ jal clamp_angle -/* 9BB8E4 80240644 E60C0028 */ swc1 $f12, 0x28($s0) -/* 9BB8E8 80240648 C6020028 */ lwc1 $f2, 0x28($s0) -/* 9BB8EC 8024064C 46000106 */ mov.s $f4, $f0 -/* 9BB8F0 80240650 46022032 */ c.eq.s $f4, $f2 -/* 9BB8F4 80240654 00000000 */ nop -/* 9BB8F8 80240658 4501000D */ bc1t .L80240690 -/* 9BB8FC 8024065C 00000000 */ nop -/* 9BB900 80240660 8E020020 */ lw $v0, 0x20($s0) -/* 9BB904 80240664 C600000C */ lwc1 $f0, 0xc($s0) -/* 9BB908 80240668 E6040028 */ swc1 $f4, 0x28($s0) -/* 9BB90C 8024066C 00021080 */ sll $v0, $v0, 2 -/* 9BB910 80240670 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9BB914 80240674 3C048024 */ lui $a0, 0x8024 -/* 9BB918 80240678 00822021 */ addu $a0, $a0, $v0 -/* 9BB91C 8024067C 8C840F00 */ lw $a0, 0xf00($a0) -/* 9BB920 80240680 8E060004 */ lw $a2, 4($s0) -/* 9BB924 80240684 8E070008 */ lw $a3, 8($s0) -/* 9BB928 80240688 0C052757 */ jal play_sound_at_position -/* 9BB92C 8024068C 0000282D */ daddu $a1, $zero, $zero -.L80240690: -/* 9BB930 80240690 C60C0004 */ lwc1 $f12, 4($s0) -/* 9BB934 80240694 C60E000C */ lwc1 $f14, 0xc($s0) -/* 9BB938 80240698 8E660028 */ lw $a2, 0x28($s3) -/* 9BB93C 8024069C 0C00A7B5 */ jal dist2D -/* 9BB940 802406A0 8E670030 */ lw $a3, 0x30($s3) -/* 9BB944 802406A4 C60C0004 */ lwc1 $f12, 4($s0) -/* 9BB948 802406A8 C60E000C */ lwc1 $f14, 0xc($s0) -/* 9BB94C 802406AC 8E260038 */ lw $a2, 0x38($s1) -/* 9BB950 802406B0 8E270040 */ lw $a3, 0x40($s1) -/* 9BB954 802406B4 0C00A7B5 */ jal dist2D -/* 9BB958 802406B8 46000586 */ mov.s $f22, $f0 -/* 9BB95C 802406BC 862200A6 */ lh $v0, 0xa6($s1) -/* 9BB960 802406C0 3C013F00 */ lui $at, 0x3f00 -/* 9BB964 802406C4 44813000 */ mtc1 $at, $f6 -/* 9BB968 802406C8 44821000 */ mtc1 $v0, $f2 -/* 9BB96C 802406CC 00000000 */ nop -/* 9BB970 802406D0 468010A0 */ cvt.s.w $f2, $f2 -/* 9BB974 802406D4 46061082 */ mul.s $f2, $f2, $f6 -/* 9BB978 802406D8 00000000 */ nop -/* 9BB97C 802406DC C6240054 */ lwc1 $f4, 0x54($s1) -/* 9BB980 802406E0 46041082 */ mul.s $f2, $f2, $f4 -/* 9BB984 802406E4 00000000 */ nop -/* 9BB988 802406E8 866200B2 */ lh $v0, 0xb2($s3) -/* 9BB98C 802406EC 44822000 */ mtc1 $v0, $f4 -/* 9BB990 802406F0 00000000 */ nop -/* 9BB994 802406F4 46802120 */ cvt.s.w $f4, $f4 -/* 9BB998 802406F8 46062102 */ mul.s $f4, $f4, $f6 -/* 9BB99C 802406FC 00000000 */ nop -/* 9BB9A0 80240700 46061082 */ mul.s $f2, $f2, $f6 -/* 9BB9A4 80240704 00000000 */ nop -/* 9BB9A8 80240708 46062102 */ mul.s $f4, $f4, $f6 -/* 9BB9AC 8024070C 00000000 */ nop -/* 9BB9B0 80240710 C60C0004 */ lwc1 $f12, 4($s0) -/* 9BB9B4 80240714 C60E000C */ lwc1 $f14, 0xc($s0) -/* 9BB9B8 80240718 46020000 */ add.s $f0, $f0, $f2 -/* 9BB9BC 8024071C 8E660028 */ lw $a2, 0x28($s3) -/* 9BB9C0 80240720 8E670030 */ lw $a3, 0x30($s3) -/* 9BB9C4 80240724 0C00A720 */ jal atan2 -/* 9BB9C8 80240728 46040600 */ add.s $f24, $f0, $f4 -/* 9BB9CC 8024072C C60C0004 */ lwc1 $f12, 4($s0) -/* 9BB9D0 80240730 C60E000C */ lwc1 $f14, 0xc($s0) -/* 9BB9D4 80240734 8E260038 */ lw $a2, 0x38($s1) -/* 9BB9D8 80240738 8E270040 */ lw $a3, 0x40($s1) -/* 9BB9DC 8024073C 0C00A720 */ jal atan2 -/* 9BB9E0 80240740 46000506 */ mov.s $f20, $f0 -/* 9BB9E4 80240744 4600A306 */ mov.s $f12, $f20 -/* 9BB9E8 80240748 0C00A70A */ jal get_clamped_angle_diff -/* 9BB9EC 8024074C 46000386 */ mov.s $f14, $f0 -/* 9BB9F0 80240750 1AA0002A */ blez $s5, .L802407FC -/* 9BB9F4 80240754 46000506 */ mov.s $f20, $f0 -/* 9BB9F8 80240758 826300B4 */ lb $v1, 0xb4($s3) -/* 9BB9FC 8024075C 24020015 */ addiu $v0, $zero, 0x15 -/* 9BBA00 80240760 10620026 */ beq $v1, $v0, .L802407FC -/* 9BBA04 80240764 0040202D */ daddu $a0, $v0, $zero -/* 9BBA08 80240768 24020003 */ addiu $v0, $zero, 3 -/* 9BBA0C 8024076C 0C039769 */ jal set_action_state -/* 9BBA10 80240770 A26200BF */ sb $v0, 0xbf($s3) -/* 9BBA14 80240774 240400E8 */ addiu $a0, $zero, 0xe8 -/* 9BBA18 80240778 8E660028 */ lw $a2, 0x28($s3) -/* 9BBA1C 8024077C 8E67002C */ lw $a3, 0x2c($s3) -/* 9BBA20 80240780 C6600030 */ lwc1 $f0, 0x30($s3) -/* 9BBA24 80240784 0000282D */ daddu $a1, $zero, $zero -/* 9BBA28 80240788 0C052757 */ jal play_sound_at_position -/* 9BBA2C 8024078C E7A00010 */ swc1 $f0, 0x10($sp) -/* 9BBA30 80240790 2402002D */ addiu $v0, $zero, 0x2d -/* 9BBA34 80240794 3C01800B */ lui $at, 0x800b -/* 9BBA38 80240798 A0220F1A */ sb $v0, 0xf1a($at) -/* 9BBA3C 8024079C C6600028 */ lwc1 $f0, 0x28($s3) -/* 9BBA40 802407A0 C6620030 */ lwc1 $f2, 0x30($s3) -/* 9BBA44 802407A4 2402002D */ addiu $v0, $zero, 0x2d -/* 9BBA48 802407A8 A6620010 */ sh $v0, 0x10($s3) -/* 9BBA4C 802407AC 4600020D */ trunc.w.s $f8, $f0 -/* 9BBA50 802407B0 44024000 */ mfc1 $v0, $f8 -/* 9BBA54 802407B4 C660002C */ lwc1 $f0, 0x2c($s3) -/* 9BBA58 802407B8 A6620016 */ sh $v0, 0x16($s3) -/* 9BBA5C 802407BC 4600020D */ trunc.w.s $f8, $f0 -/* 9BBA60 802407C0 44024000 */ mfc1 $v0, $f8 -/* 9BBA64 802407C4 00000000 */ nop -/* 9BBA68 802407C8 A6620018 */ sh $v0, 0x18($s3) -/* 9BBA6C 802407CC 4600120D */ trunc.w.s $f8, $f2 -/* 9BBA70 802407D0 44024000 */ mfc1 $v0, $f8 -/* 9BBA74 802407D4 00000000 */ nop -/* 9BBA78 802407D8 A662001A */ sh $v0, 0x1a($s3) -/* 9BBA7C 802407DC 8E02001C */ lw $v0, 0x1c($s0) -/* 9BBA80 802407E0 10400033 */ beqz $v0, .L802408B0 -/* 9BBA84 802407E4 AE000020 */ sw $zero, 0x20($s0) -/* 9BBA88 802407E8 0200202D */ daddu $a0, $s0, $zero -/* 9BBA8C 802407EC 0040F809 */ jalr $v0 -/* 9BBA90 802407F0 24050002 */ addiu $a1, $zero, 2 -/* 9BBA94 802407F4 0809022C */ j .L802408B0 -/* 9BBA98 802407F8 00000000 */ nop -.L802407FC: -/* 9BBA9C 802407FC 4618B03C */ c.lt.s $f22, $f24 -/* 9BBAA0 80240800 00000000 */ nop -/* 9BBAA4 80240804 4500002A */ bc1f .L802408B0 -/* 9BBAA8 80240808 00000000 */ nop -/* 9BBAAC 8024080C 8E020000 */ lw $v0, ($s0) -/* 9BBAB0 80240810 30420002 */ andi $v0, $v0, 2 -/* 9BBAB4 80240814 14400026 */ bnez $v0, .L802408B0 -/* 9BBAB8 80240818 00000000 */ nop -/* 9BBABC 8024081C 16A00024 */ bnez $s5, .L802408B0 -/* 9BBAC0 80240820 24020015 */ addiu $v0, $zero, 0x15 -/* 9BBAC4 80240824 826300B4 */ lb $v1, 0xb4($s3) -/* 9BBAC8 80240828 10620021 */ beq $v1, $v0, .L802408B0 -/* 9BBACC 8024082C 00000000 */ nop -/* 9BBAD0 80240830 C6000010 */ lwc1 $f0, 0x10($s0) -/* 9BBAD4 80240834 44801000 */ mtc1 $zero, $f2 -/* 9BBAD8 80240838 00000000 */ nop -/* 9BBADC 8024083C 4600103C */ c.lt.s $f2, $f0 -/* 9BBAE0 80240840 00000000 */ nop -/* 9BBAE4 80240844 45000009 */ bc1f .L8024086C -/* 9BBAE8 80240848 00000000 */ nop -/* 9BBAEC 8024084C C6000024 */ lwc1 $f0, 0x24($s0) -/* 9BBAF0 80240850 4602003C */ c.lt.s $f0, $f2 -/* 9BBAF4 80240854 00000000 */ nop -/* 9BBAF8 80240858 45000015 */ bc1f .L802408B0 -/* 9BBAFC 8024085C 00000000 */ nop -/* 9BBB00 80240860 4614103C */ c.lt.s $f2, $f20 -/* 9BBB04 80240864 08090222 */ j .L80240888 -/* 9BBB08 80240868 00000000 */ nop -.L8024086C: -/* 9BBB0C 8024086C C6000024 */ lwc1 $f0, 0x24($s0) -/* 9BBB10 80240870 4600103C */ c.lt.s $f2, $f0 -/* 9BBB14 80240874 00000000 */ nop -/* 9BBB18 80240878 4500000D */ bc1f .L802408B0 -/* 9BBB1C 8024087C 00000000 */ nop -/* 9BBB20 80240880 4602A03C */ c.lt.s $f20, $f2 -/* 9BBB24 80240884 00000000 */ nop -.L80240888: -/* 9BBB28 80240888 45000009 */ bc1f .L802408B0 -/* 9BBB2C 8024088C 00000000 */ nop -/* 9BBB30 80240890 8E020020 */ lw $v0, 0x20($s0) -/* 9BBB34 80240894 8E03001C */ lw $v1, 0x1c($s0) -/* 9BBB38 80240898 24420001 */ addiu $v0, $v0, 1 -/* 9BBB3C 8024089C 10600004 */ beqz $v1, .L802408B0 -/* 9BBB40 802408A0 AE020020 */ sw $v0, 0x20($s0) -/* 9BBB44 802408A4 0200202D */ daddu $a0, $s0, $zero -/* 9BBB48 802408A8 0060F809 */ jalr $v1 -/* 9BBB4C 802408AC 24050001 */ addiu $a1, $zero, 1 -.L802408B0: -/* 9BBB50 802408B0 8E02001C */ lw $v0, 0x1c($s0) -/* 9BBB54 802408B4 10400004 */ beqz $v0, .L802408C8 -/* 9BBB58 802408B8 E6140024 */ swc1 $f20, 0x24($s0) -/* 9BBB5C 802408BC 0200202D */ daddu $a0, $s0, $zero -/* 9BBB60 802408C0 0040F809 */ jalr $v0 -/* 9BBB64 802408C4 0000282D */ daddu $a1, $zero, $zero -.L802408C8: -/* 9BBB68 802408C8 0000102D */ daddu $v0, $zero, $zero -.L802408CC: -/* 9BBB6C 802408CC 8FBF0038 */ lw $ra, 0x38($sp) -/* 9BBB70 802408D0 8FB70034 */ lw $s7, 0x34($sp) -/* 9BBB74 802408D4 8FB60030 */ lw $s6, 0x30($sp) -/* 9BBB78 802408D8 8FB5002C */ lw $s5, 0x2c($sp) -/* 9BBB7C 802408DC 8FB40028 */ lw $s4, 0x28($sp) -/* 9BBB80 802408E0 8FB30024 */ lw $s3, 0x24($sp) -/* 9BBB84 802408E4 8FB20020 */ lw $s2, 0x20($sp) -/* 9BBB88 802408E8 8FB1001C */ lw $s1, 0x1c($sp) -/* 9BBB8C 802408EC 8FB00018 */ lw $s0, 0x18($sp) -/* 9BBB90 802408F0 D7B80050 */ ldc1 $f24, 0x50($sp) -/* 9BBB94 802408F4 D7B60048 */ ldc1 $f22, 0x48($sp) -/* 9BBB98 802408F8 D7B40040 */ ldc1 $f20, 0x40($sp) -/* 9BBB9C 802408FC 03E00008 */ jr $ra -/* 9BBBA0 80240900 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_trd/trd_10/_9C3130/func_80240820.s b/asm/nonmatchings/world/area_trd/trd_10/_9C3130/func_80240820.s new file mode 100644 index 0000000000..7a2add2e75 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_10/_9C3130/func_80240820.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240820 +/* 9C3130 80240820 3C038011 */ lui $v1, 0x8011 +/* 9C3134 80240824 8063F2A2 */ lb $v1, -0xd5e($v1) +/* 9C3138 80240828 24020003 */ addiu $v0, $zero, 3 +/* 9C313C 8024082C 54620003 */ bnel $v1, $v0, .L8024083C +/* 9C3140 80240830 AC800084 */ sw $zero, 0x84($a0) +/* 9C3144 80240834 24020001 */ addiu $v0, $zero, 1 +/* 9C3148 80240838 AC820084 */ sw $v0, 0x84($a0) +.L8024083C: +/* 9C314C 8024083C 03E00008 */ jr $ra +/* 9C3150 80240840 24020002 */ addiu $v0, $zero, 2 +/* 9C3154 80240844 00000000 */ nop +/* 9C3158 80240848 00000000 */ nop +/* 9C315C 8024084C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_10/func_8024004C_9C2910.s b/asm/nonmatchings/world/area_trd/trd_10/func_8024004C_9C2910.s deleted file mode 100644 index 07b6a8c5db..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_10/func_8024004C_9C2910.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024004C_9C295C -/* 9C295C 8024004C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9C2960 80240050 AFB20020 */ sw $s2, 0x20($sp) -/* 9C2964 80240054 0080902D */ daddu $s2, $a0, $zero -/* 9C2968 80240058 AFBF0024 */ sw $ra, 0x24($sp) -/* 9C296C 8024005C AFB1001C */ sw $s1, 0x1c($sp) -/* 9C2970 80240060 AFB00018 */ sw $s0, 0x18($sp) -/* 9C2974 80240064 10A0004A */ beqz $a1, .L80240190 -/* 9C2978 80240068 8E51000C */ lw $s1, 0xc($s2) -/* 9C297C 8024006C 0C00AB39 */ jal heap_malloc -/* 9C2980 80240070 24040058 */ addiu $a0, $zero, 0x58 -/* 9C2984 80240074 0000202D */ daddu $a0, $zero, $zero -/* 9C2988 80240078 3C05FD05 */ lui $a1, 0xfd05 -/* 9C298C 8024007C 34A50F81 */ ori $a1, $a1, 0xf81 -/* 9C2990 80240080 0040802D */ daddu $s0, $v0, $zero -/* 9C2994 80240084 0200302D */ daddu $a2, $s0, $zero -/* 9C2998 80240088 0C0B2026 */ jal set_variable -/* 9C299C 8024008C AE500084 */ sw $s0, 0x84($s2) -/* 9C29A0 80240090 8E250000 */ lw $a1, ($s1) -/* 9C29A4 80240094 26310004 */ addiu $s1, $s1, 4 -/* 9C29A8 80240098 0C0B1EAF */ jal get_variable -/* 9C29AC 8024009C 0240202D */ daddu $a0, $s2, $zero -/* 9C29B0 802400A0 AE020038 */ sw $v0, 0x38($s0) -/* 9C29B4 802400A4 8E250000 */ lw $a1, ($s1) -/* 9C29B8 802400A8 26310004 */ addiu $s1, $s1, 4 -/* 9C29BC 802400AC 0C0B1EAF */ jal get_variable -/* 9C29C0 802400B0 0240202D */ daddu $a0, $s2, $zero -/* 9C29C4 802400B4 AE02003C */ sw $v0, 0x3c($s0) -/* 9C29C8 802400B8 8E250000 */ lw $a1, ($s1) -/* 9C29CC 802400BC 26310004 */ addiu $s1, $s1, 4 -/* 9C29D0 802400C0 0C0B210B */ jal get_float_variable -/* 9C29D4 802400C4 0240202D */ daddu $a0, $s2, $zero -/* 9C29D8 802400C8 E600000C */ swc1 $f0, 0xc($s0) -/* 9C29DC 802400CC 8E250000 */ lw $a1, ($s1) -/* 9C29E0 802400D0 26310004 */ addiu $s1, $s1, 4 -/* 9C29E4 802400D4 0C0B210B */ jal get_float_variable -/* 9C29E8 802400D8 0240202D */ daddu $a0, $s2, $zero -/* 9C29EC 802400DC E6000010 */ swc1 $f0, 0x10($s0) -/* 9C29F0 802400E0 8E250000 */ lw $a1, ($s1) -/* 9C29F4 802400E4 26310004 */ addiu $s1, $s1, 4 -/* 9C29F8 802400E8 0C0B210B */ jal get_float_variable -/* 9C29FC 802400EC 0240202D */ daddu $a0, $s2, $zero -/* 9C2A00 802400F0 E6000014 */ swc1 $f0, 0x14($s0) -/* 9C2A04 802400F4 8E250000 */ lw $a1, ($s1) -/* 9C2A08 802400F8 26310004 */ addiu $s1, $s1, 4 -/* 9C2A0C 802400FC 0C0B210B */ jal get_float_variable -/* 9C2A10 80240100 0240202D */ daddu $a0, $s2, $zero -/* 9C2A14 80240104 E6000018 */ swc1 $f0, 0x18($s0) -/* 9C2A18 80240108 8E250000 */ lw $a1, ($s1) -/* 9C2A1C 8024010C 26310004 */ addiu $s1, $s1, 4 -/* 9C2A20 80240110 0C0B210B */ jal get_float_variable -/* 9C2A24 80240114 0240202D */ daddu $a0, $s2, $zero -/* 9C2A28 80240118 E600001C */ swc1 $f0, 0x1c($s0) -/* 9C2A2C 8024011C 8E250000 */ lw $a1, ($s1) -/* 9C2A30 80240120 26310004 */ addiu $s1, $s1, 4 -/* 9C2A34 80240124 0C0B210B */ jal get_float_variable -/* 9C2A38 80240128 0240202D */ daddu $a0, $s2, $zero -/* 9C2A3C 8024012C E6000020 */ swc1 $f0, 0x20($s0) -/* 9C2A40 80240130 8E250000 */ lw $a1, ($s1) -/* 9C2A44 80240134 26310004 */ addiu $s1, $s1, 4 -/* 9C2A48 80240138 0C0B210B */ jal get_float_variable -/* 9C2A4C 8024013C 0240202D */ daddu $a0, $s2, $zero -/* 9C2A50 80240140 E6000024 */ swc1 $f0, 0x24($s0) -/* 9C2A54 80240144 8E250000 */ lw $a1, ($s1) -/* 9C2A58 80240148 0C0B210B */ jal get_float_variable -/* 9C2A5C 8024014C 0240202D */ daddu $a0, $s2, $zero -/* 9C2A60 80240150 3C013F80 */ lui $at, 0x3f80 -/* 9C2A64 80240154 44811000 */ mtc1 $at, $f2 -/* 9C2A68 80240158 E6000028 */ swc1 $f0, 0x28($s0) -/* 9C2A6C 8024015C AFA00014 */ sw $zero, 0x14($sp) -/* 9C2A70 80240160 E7A20010 */ swc1 $f2, 0x10($sp) -/* 9C2A74 80240164 8E05000C */ lw $a1, 0xc($s0) -/* 9C2A78 80240168 8E060010 */ lw $a2, 0x10($s0) -/* 9C2A7C 8024016C 8E070014 */ lw $a3, 0x14($s0) -/* 9C2A80 80240170 0C01CA6C */ jal func_800729B0 -/* 9C2A84 80240174 24040002 */ addiu $a0, $zero, 2 -/* 9C2A88 80240178 AE020050 */ sw $v0, 0x50($s0) -/* 9C2A8C 8024017C A600004E */ sh $zero, 0x4e($s0) -/* 9C2A90 80240180 A6000048 */ sh $zero, 0x48($s0) -/* 9C2A94 80240184 A600004A */ sh $zero, 0x4a($s0) -/* 9C2A98 80240188 A6000044 */ sh $zero, 0x44($s0) -/* 9C2A9C 8024018C A6000046 */ sh $zero, 0x46($s0) -.L80240190: -/* 9C2AA0 80240190 8FBF0024 */ lw $ra, 0x24($sp) -/* 9C2AA4 80240194 8FB20020 */ lw $s2, 0x20($sp) -/* 9C2AA8 80240198 8FB1001C */ lw $s1, 0x1c($sp) -/* 9C2AAC 8024019C 8FB00018 */ lw $s0, 0x18($sp) -/* 9C2AB0 802401A0 24020002 */ addiu $v0, $zero, 2 -/* 9C2AB4 802401A4 03E00008 */ jr $ra -/* 9C2AB8 802401A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_10/func_802401AC_9C2910.s b/asm/nonmatchings/world/area_trd/trd_10/func_802401AC_9C2910.s deleted file mode 100644 index a2659f4d00..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_10/func_802401AC_9C2910.s +++ /dev/null @@ -1,272 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401AC_9C2ABC -/* 9C2ABC 802401AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9C2AC0 802401B0 AFBF0020 */ sw $ra, 0x20($sp) -/* 9C2AC4 802401B4 AFB1001C */ sw $s1, 0x1c($sp) -/* 9C2AC8 802401B8 AFB00018 */ sw $s0, 0x18($sp) -/* 9C2ACC 802401BC 8C910084 */ lw $s1, 0x84($a0) -/* 9C2AD0 802401C0 86230044 */ lh $v1, 0x44($s1) -/* 9C2AD4 802401C4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* 9C2AD8 802401C8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* 9C2ADC 802401CC 2C620005 */ sltiu $v0, $v1, 5 -/* 9C2AE0 802401D0 1040008A */ beqz $v0, .L802403FC -/* 9C2AE4 802401D4 00031080 */ sll $v0, $v1, 2 -/* 9C2AE8 802401D8 3C018024 */ lui $at, 0x8024 -/* 9C2AEC 802401DC 00220821 */ addu $at, $at, $v0 -/* 9C2AF0 802401E0 8C222AA0 */ lw $v0, 0x2aa0($at) -/* 9C2AF4 802401E4 00400008 */ jr $v0 -/* 9C2AF8 802401E8 00000000 */ nop -/* 9C2AFC 802401EC 8E22003C */ lw $v0, 0x3c($s1) -/* 9C2B00 802401F0 86270046 */ lh $a3, 0x46($s1) -/* 9C2B04 802401F4 AFA20010 */ sw $v0, 0x10($sp) -/* 9C2B08 802401F8 8E250010 */ lw $a1, 0x10($s1) -/* 9C2B0C 802401FC 8E26001C */ lw $a2, 0x1c($s1) -/* 9C2B10 80240200 0C00A8ED */ jal update_lerp -/* 9C2B14 80240204 24040005 */ addiu $a0, $zero, 5 -/* 9C2B18 80240208 86270046 */ lh $a3, 0x46($s1) -/* 9C2B1C 8024020C 8E22003C */ lw $v0, 0x3c($s1) -/* 9C2B20 80240210 E6200004 */ swc1 $f0, 4($s1) -/* 9C2B24 80240214 AFA20010 */ sw $v0, 0x10($sp) -/* 9C2B28 80240218 8E25000C */ lw $a1, 0xc($s1) -/* 9C2B2C 8024021C 8E260018 */ lw $a2, 0x18($s1) -/* 9C2B30 80240220 0C00A8ED */ jal update_lerp -/* 9C2B34 80240224 0000202D */ daddu $a0, $zero, $zero -/* 9C2B38 80240228 86270046 */ lh $a3, 0x46($s1) -/* 9C2B3C 8024022C 8E22003C */ lw $v0, 0x3c($s1) -/* 9C2B40 80240230 E6200000 */ swc1 $f0, ($s1) -/* 9C2B44 80240234 AFA20010 */ sw $v0, 0x10($sp) -/* 9C2B48 80240238 8E250014 */ lw $a1, 0x14($s1) -/* 9C2B4C 8024023C 8E260020 */ lw $a2, 0x20($s1) -/* 9C2B50 80240240 0C00A8ED */ jal update_lerp -/* 9C2B54 80240244 0000202D */ daddu $a0, $zero, $zero -/* 9C2B58 80240248 8E220050 */ lw $v0, 0x50($s1) -/* 9C2B5C 8024024C E6200008 */ swc1 $f0, 8($s1) -/* 9C2B60 80240250 C6200000 */ lwc1 $f0, ($s1) -/* 9C2B64 80240254 8C42000C */ lw $v0, 0xc($v0) -/* 9C2B68 80240258 E4400008 */ swc1 $f0, 8($v0) -/* 9C2B6C 8024025C 8E220050 */ lw $v0, 0x50($s1) -/* 9C2B70 80240260 C6200004 */ lwc1 $f0, 4($s1) -/* 9C2B74 80240264 8C42000C */ lw $v0, 0xc($v0) -/* 9C2B78 80240268 E440000C */ swc1 $f0, 0xc($v0) -/* 9C2B7C 8024026C 8E220050 */ lw $v0, 0x50($s1) -/* 9C2B80 80240270 C6200008 */ lwc1 $f0, 8($s1) -/* 9C2B84 80240274 8C42000C */ lw $v0, 0xc($v0) -/* 9C2B88 80240278 E4400010 */ swc1 $f0, 0x10($v0) -/* 9C2B8C 8024027C 96220046 */ lhu $v0, 0x46($s1) -/* 9C2B90 80240280 8E23003C */ lw $v1, 0x3c($s1) -/* 9C2B94 80240284 24420001 */ addiu $v0, $v0, 1 -/* 9C2B98 80240288 A6220046 */ sh $v0, 0x46($s1) -/* 9C2B9C 8024028C 00021400 */ sll $v0, $v0, 0x10 -/* 9C2BA0 80240290 00021403 */ sra $v0, $v0, 0x10 -/* 9C2BA4 80240294 0043102A */ slt $v0, $v0, $v1 -/* 9C2BA8 80240298 14400058 */ bnez $v0, .L802403FC -/* 9C2BAC 8024029C 24020001 */ addiu $v0, $zero, 1 -/* 9C2BB0 802402A0 A6220044 */ sh $v0, 0x44($s1) -/* 9C2BB4 802402A4 080900FF */ j .L802403FC -/* 9C2BB8 802402A8 A6200046 */ sh $zero, 0x46($s1) -/* 9C2BBC 802402AC 96220046 */ lhu $v0, 0x46($s1) -/* 9C2BC0 802402B0 24420001 */ addiu $v0, $v0, 1 -/* 9C2BC4 802402B4 A6220046 */ sh $v0, 0x46($s1) -/* 9C2BC8 802402B8 00021400 */ sll $v0, $v0, 0x10 -/* 9C2BCC 802402BC 00021403 */ sra $v0, $v0, 0x10 -/* 9C2BD0 802402C0 2842003C */ slti $v0, $v0, 0x3c -/* 9C2BD4 802402C4 1440004D */ bnez $v0, .L802403FC -/* 9C2BD8 802402C8 24020002 */ addiu $v0, $zero, 2 -/* 9C2BDC 802402CC 8E230050 */ lw $v1, 0x50($s1) -/* 9C2BE0 802402D0 A6220044 */ sh $v0, 0x44($s1) -/* 9C2BE4 802402D4 A6200046 */ sh $zero, 0x46($s1) -/* 9C2BE8 802402D8 8C63000C */ lw $v1, 0xc($v1) -/* 9C2BEC 802402DC 24020001 */ addiu $v0, $zero, 1 -/* 9C2BF0 802402E0 AC620070 */ sw $v0, 0x70($v1) -/* 9C2BF4 802402E4 8E220050 */ lw $v0, 0x50($s1) -/* 9C2BF8 802402E8 8C42000C */ lw $v0, 0xc($v0) -/* 9C2BFC 802402EC 080900FF */ j .L802403FC -/* 9C2C00 802402F0 AC400074 */ sw $zero, 0x74($v0) -/* 9C2C04 802402F4 96220046 */ lhu $v0, 0x46($s1) -/* 9C2C08 802402F8 24420001 */ addiu $v0, $v0, 1 -/* 9C2C0C 802402FC A6220046 */ sh $v0, 0x46($s1) -/* 9C2C10 80240300 00021400 */ sll $v0, $v0, 0x10 -/* 9C2C14 80240304 00021403 */ sra $v0, $v0, 0x10 -/* 9C2C18 80240308 2842003C */ slti $v0, $v0, 0x3c -/* 9C2C1C 8024030C 1440003B */ bnez $v0, .L802403FC -/* 9C2C20 80240310 00000000 */ nop -/* 9C2C24 80240314 3C013F80 */ lui $at, 0x3f80 -/* 9C2C28 80240318 44810000 */ mtc1 $at, $f0 -/* 9C2C2C 8024031C AFA00014 */ sw $zero, 0x14($sp) -/* 9C2C30 80240320 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9C2C34 80240324 8E250018 */ lw $a1, 0x18($s1) -/* 9C2C38 80240328 8E26001C */ lw $a2, 0x1c($s1) -/* 9C2C3C 8024032C 8E270020 */ lw $a3, 0x20($s1) -/* 9C2C40 80240330 0C01C9AC */ jal func_800726B0 -/* 9C2C44 80240334 24040001 */ addiu $a0, $zero, 1 -/* 9C2C48 80240338 AE220054 */ sw $v0, 0x54($s1) -/* 9C2C4C 8024033C 8C43000C */ lw $v1, 0xc($v0) -/* 9C2C50 80240340 9222003B */ lbu $v0, 0x3b($s1) -/* 9C2C54 80240344 A0620034 */ sb $v0, 0x34($v1) -/* 9C2C58 80240348 8E220054 */ lw $v0, 0x54($s1) -/* 9C2C5C 8024034C 8C42000C */ lw $v0, 0xc($v0) -/* 9C2C60 80240350 AC400020 */ sw $zero, 0x20($v0) -/* 9C2C64 80240354 8E250018 */ lw $a1, 0x18($s1) -/* 9C2C68 80240358 8E260028 */ lw $a2, 0x28($s1) -/* 9C2C6C 8024035C 8E270020 */ lw $a3, 0x20($s1) -/* 9C2C70 80240360 0C044898 */ jal create_shadow_type -/* 9C2C74 80240364 0000202D */ daddu $a0, $zero, $zero -/* 9C2C78 80240368 3C014210 */ lui $at, 0x4210 -/* 9C2C7C 8024036C 44810000 */ mtc1 $at, $f0 -/* 9C2C80 80240370 AE220040 */ sw $v0, 0x40($s1) -/* 9C2C84 80240374 24020003 */ addiu $v0, $zero, 3 -/* 9C2C88 80240378 A6220044 */ sh $v0, 0x44($s1) -/* 9C2C8C 8024037C 24020001 */ addiu $v0, $zero, 1 -/* 9C2C90 80240380 A6200046 */ sh $zero, 0x46($s1) -/* 9C2C94 80240384 AE20002C */ sw $zero, 0x2c($s1) -/* 9C2C98 80240388 A6220048 */ sh $v0, 0x48($s1) -/* 9C2C9C 8024038C 080900FF */ j .L802403FC -/* 9C2CA0 80240390 E6200030 */ swc1 $f0, 0x30($s1) -/* 9C2CA4 80240394 0000202D */ daddu $a0, $zero, $zero -/* 9C2CA8 80240398 3C054210 */ lui $a1, 0x4210 -/* 9C2CAC 8024039C 3C064198 */ lui $a2, 0x4198 -/* 9C2CB0 802403A0 86270046 */ lh $a3, 0x46($s1) -/* 9C2CB4 802403A4 24020078 */ addiu $v0, $zero, 0x78 -/* 9C2CB8 802403A8 0C00A8ED */ jal update_lerp -/* 9C2CBC 802403AC AFA20010 */ sw $v0, 0x10($sp) -/* 9C2CC0 802403B0 96220046 */ lhu $v0, 0x46($s1) -/* 9C2CC4 802403B4 E6200030 */ swc1 $f0, 0x30($s1) -/* 9C2CC8 802403B8 24420001 */ addiu $v0, $v0, 1 -/* 9C2CCC 802403BC A6220046 */ sh $v0, 0x46($s1) -/* 9C2CD0 802403C0 00021400 */ sll $v0, $v0, 0x10 -/* 9C2CD4 802403C4 00021403 */ sra $v0, $v0, 0x10 -/* 9C2CD8 802403C8 28420078 */ slti $v0, $v0, 0x78 -/* 9C2CDC 802403CC 1440000B */ bnez $v0, .L802403FC -/* 9C2CE0 802403D0 24030001 */ addiu $v1, $zero, 1 -/* 9C2CE4 802403D4 C620002C */ lwc1 $f0, 0x2c($s1) -/* 9C2CE8 802403D8 24020002 */ addiu $v0, $zero, 2 -/* 9C2CEC 802403DC A6220048 */ sh $v0, 0x48($s1) -/* 9C2CF0 802403E0 24020004 */ addiu $v0, $zero, 4 -/* 9C2CF4 802403E4 A620004C */ sh $zero, 0x4c($s1) -/* 9C2CF8 802403E8 A623004A */ sh $v1, 0x4a($s1) -/* 9C2CFC 802403EC A623004E */ sh $v1, 0x4e($s1) -/* 9C2D00 802403F0 A6220044 */ sh $v0, 0x44($s1) -/* 9C2D04 802403F4 A6200046 */ sh $zero, 0x46($s1) -/* 9C2D08 802403F8 E6200034 */ swc1 $f0, 0x34($s1) -.L802403FC: -/* 9C2D0C 802403FC 8623004A */ lh $v1, 0x4a($s1) -/* 9C2D10 80240400 24020001 */ addiu $v0, $zero, 1 -/* 9C2D14 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* 9C2D18 80240408 24020002 */ addiu $v0, $zero, 2 -/* 9C2D1C 8024040C 1062001E */ beq $v1, $v0, .L80240488 -/* 9C2D20 80240410 00000000 */ nop -/* 9C2D24 80240414 0809014C */ j .L80240530 -/* 9C2D28 80240418 00000000 */ nop -.L8024041C: -/* 9C2D2C 8024041C 8627004C */ lh $a3, 0x4c($s1) -/* 9C2D30 80240420 24100078 */ addiu $s0, $zero, 0x78 -/* 9C2D34 80240424 AFB00010 */ sw $s0, 0x10($sp) -/* 9C2D38 80240428 8E250034 */ lw $a1, 0x34($s1) -/* 9C2D3C 8024042C 3C0644B4 */ lui $a2, 0x44b4 -/* 9C2D40 80240430 0C00A8ED */ jal update_lerp -/* 9C2D44 80240434 24040004 */ addiu $a0, $zero, 4 -/* 9C2D48 80240438 8627004C */ lh $a3, 0x4c($s1) -/* 9C2D4C 8024043C E620002C */ swc1 $f0, 0x2c($s1) -/* 9C2D50 80240440 AFB00010 */ sw $s0, 0x10($sp) -/* 9C2D54 80240444 8E25001C */ lw $a1, 0x1c($s1) -/* 9C2D58 80240448 8E260024 */ lw $a2, 0x24($s1) -/* 9C2D5C 8024044C 0C00A8ED */ jal update_lerp -/* 9C2D60 80240450 2404000A */ addiu $a0, $zero, 0xa -/* 9C2D64 80240454 9622004C */ lhu $v0, 0x4c($s1) -/* 9C2D68 80240458 E6200004 */ swc1 $f0, 4($s1) -/* 9C2D6C 8024045C 24420001 */ addiu $v0, $v0, 1 -/* 9C2D70 80240460 A622004C */ sh $v0, 0x4c($s1) -/* 9C2D74 80240464 00021400 */ sll $v0, $v0, 0x10 -/* 9C2D78 80240468 00021403 */ sra $v0, $v0, 0x10 -/* 9C2D7C 8024046C 0050102A */ slt $v0, $v0, $s0 -/* 9C2D80 80240470 1440002F */ bnez $v0, .L80240530 -/* 9C2D84 80240474 2402010E */ addiu $v0, $zero, 0x10e -/* 9C2D88 80240478 A622004C */ sh $v0, 0x4c($s1) -/* 9C2D8C 8024047C 24020002 */ addiu $v0, $zero, 2 -/* 9C2D90 80240480 0809014B */ j .L8024052C -/* 9C2D94 80240484 A622004A */ sh $v0, 0x4a($s1) -.L80240488: -/* 9C2D98 80240488 8622004C */ lh $v0, 0x4c($s1) -/* 9C2D9C 8024048C 44826000 */ mtc1 $v0, $f12 -/* 9C2DA0 80240490 00000000 */ nop -/* 9C2DA4 80240494 0C00A8BB */ jal sin_deg -/* 9C2DA8 80240498 46806320 */ cvt.s.w $f12, $f12 -/* 9C2DAC 8024049C 3C013F80 */ lui $at, 0x3f80 -/* 9C2DB0 802404A0 44811000 */ mtc1 $at, $f2 -/* 9C2DB4 802404A4 00000000 */ nop -/* 9C2DB8 802404A8 46020000 */ add.s $f0, $f0, $f2 -/* 9C2DBC 802404AC 46000000 */ add.s $f0, $f0, $f0 -/* 9C2DC0 802404B0 C6220024 */ lwc1 $f2, 0x24($s1) -/* 9C2DC4 802404B4 8622004C */ lh $v0, 0x4c($s1) -/* 9C2DC8 802404B8 46001080 */ add.s $f2, $f2, $f0 -/* 9C2DCC 802404BC 24420008 */ addiu $v0, $v0, 8 -/* 9C2DD0 802404C0 44826000 */ mtc1 $v0, $f12 -/* 9C2DD4 802404C4 00000000 */ nop -/* 9C2DD8 802404C8 46806320 */ cvt.s.w $f12, $f12 -/* 9C2DDC 802404CC 0C00A6C9 */ jal clamp_angle -/* 9C2DE0 802404D0 E6220004 */ swc1 $f2, 4($s1) -/* 9C2DE4 802404D4 4600010D */ trunc.w.s $f4, $f0 -/* 9C2DE8 802404D8 44022000 */ mfc1 $v0, $f4 -/* 9C2DEC 802404DC C6200004 */ lwc1 $f0, 4($s1) -/* 9C2DF0 802404E0 A622004C */ sh $v0, 0x4c($s1) -/* 9C2DF4 802404E4 C60C0028 */ lwc1 $f12, 0x28($s0) -/* 9C2DF8 802404E8 8E060030 */ lw $a2, 0x30($s0) -/* 9C2DFC 802404EC 3C0141A0 */ lui $at, 0x41a0 -/* 9C2E00 802404F0 44817000 */ mtc1 $at, $f14 -/* 9C2E04 802404F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9C2E08 802404F8 C602002C */ lwc1 $f2, 0x2c($s0) -/* 9C2E0C 802404FC C6200008 */ lwc1 $f0, 8($s1) -/* 9C2E10 80240500 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9C2E14 80240504 8E270000 */ lw $a3, ($s1) -/* 9C2E18 80240508 0C00A7CB */ jal dist3D -/* 9C2E1C 8024050C 460E1380 */ add.s $f14, $f2, $f14 -/* 9C2E20 80240510 3C0141F0 */ lui $at, 0x41f0 -/* 9C2E24 80240514 44811000 */ mtc1 $at, $f2 -/* 9C2E28 80240518 00000000 */ nop -/* 9C2E2C 8024051C 4600103C */ c.lt.s $f2, $f0 -/* 9C2E30 80240520 00000000 */ nop -/* 9C2E34 80240524 45010002 */ bc1t .L80240530 -/* 9C2E38 80240528 24020003 */ addiu $v0, $zero, 3 -.L8024052C: -/* 9C2E3C 8024052C A622004E */ sh $v0, 0x4e($s1) -.L80240530: -/* 9C2E40 80240530 86230048 */ lh $v1, 0x48($s1) -/* 9C2E44 80240534 24020001 */ addiu $v0, $zero, 1 -/* 9C2E48 80240538 10620005 */ beq $v1, $v0, .L80240550 -/* 9C2E4C 8024053C 24020002 */ addiu $v0, $zero, 2 -/* 9C2E50 80240540 10620008 */ beq $v1, $v0, .L80240564 -/* 9C2E54 80240544 00000000 */ nop -/* 9C2E58 80240548 08090169 */ j .L802405A4 -/* 9C2E5C 8024054C 00000000 */ nop -.L80240550: -/* 9C2E60 80240550 C620002C */ lwc1 $f0, 0x2c($s1) -/* 9C2E64 80240554 C62C0030 */ lwc1 $f12, 0x30($s1) -/* 9C2E68 80240558 0C00A6C9 */ jal clamp_angle -/* 9C2E6C 8024055C 460C0300 */ add.s $f12, $f0, $f12 -/* 9C2E70 80240560 E620002C */ swc1 $f0, 0x2c($s1) -.L80240564: -/* 9C2E74 80240564 8E220054 */ lw $v0, 0x54($s1) -/* 9C2E78 80240568 C620002C */ lwc1 $f0, 0x2c($s1) -/* 9C2E7C 8024056C 8C42000C */ lw $v0, 0xc($v0) -/* 9C2E80 80240570 E4400024 */ swc1 $f0, 0x24($v0) -/* 9C2E84 80240574 8E220054 */ lw $v0, 0x54($s1) -/* 9C2E88 80240578 C6200018 */ lwc1 $f0, 0x18($s1) -/* 9C2E8C 8024057C 8C42000C */ lw $v0, 0xc($v0) -/* 9C2E90 80240580 E4400004 */ swc1 $f0, 4($v0) -/* 9C2E94 80240584 8E220054 */ lw $v0, 0x54($s1) -/* 9C2E98 80240588 C6200004 */ lwc1 $f0, 4($s1) -/* 9C2E9C 8024058C 8C42000C */ lw $v0, 0xc($v0) -/* 9C2EA0 80240590 E4400008 */ swc1 $f0, 8($v0) -/* 9C2EA4 80240594 8E220054 */ lw $v0, 0x54($s1) -/* 9C2EA8 80240598 C6200020 */ lwc1 $f0, 0x20($s1) -/* 9C2EAC 8024059C 8C42000C */ lw $v0, 0xc($v0) -/* 9C2EB0 802405A0 E440000C */ swc1 $f0, 0xc($v0) -.L802405A4: -/* 9C2EB4 802405A4 8FBF0020 */ lw $ra, 0x20($sp) -/* 9C2EB8 802405A8 8FB1001C */ lw $s1, 0x1c($sp) -/* 9C2EBC 802405AC 8FB00018 */ lw $s0, 0x18($sp) -/* 9C2EC0 802405B0 0000102D */ daddu $v0, $zero, $zero -/* 9C2EC4 802405B4 03E00008 */ jr $ra -/* 9C2EC8 802405B8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_10/func_802405BC_9C2910.s b/asm/nonmatchings/world/area_trd/trd_10/func_802405BC_9C2910.s deleted file mode 100644 index 0b90e6e6e3..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_10/func_802405BC_9C2910.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405BC_9C2ECC -/* 9C2ECC 802405BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C2ED0 802405C0 AFB00010 */ sw $s0, 0x10($sp) -/* 9C2ED4 802405C4 0080802D */ daddu $s0, $a0, $zero -/* 9C2ED8 802405C8 AFBF0014 */ sw $ra, 0x14($sp) -/* 9C2EDC 802405CC 8E02000C */ lw $v0, 0xc($s0) -/* 9C2EE0 802405D0 0C0B1EAF */ jal get_variable -/* 9C2EE4 802405D4 8C450000 */ lw $a1, ($v0) -/* 9C2EE8 802405D8 8E030084 */ lw $v1, 0x84($s0) -/* 9C2EEC 802405DC 8FBF0014 */ lw $ra, 0x14($sp) -/* 9C2EF0 802405E0 8463004E */ lh $v1, 0x4e($v1) -/* 9C2EF4 802405E4 8FB00010 */ lw $s0, 0x10($sp) -/* 9C2EF8 802405E8 00621826 */ xor $v1, $v1, $v0 -/* 9C2EFC 802405EC 2C630001 */ sltiu $v1, $v1, 1 -/* 9C2F00 802405F0 00031040 */ sll $v0, $v1, 1 -/* 9C2F04 802405F4 03E00008 */ jr $ra -/* 9C2F08 802405F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_10/func_802405FC_9C2910.s b/asm/nonmatchings/world/area_trd/trd_10/func_802405FC_9C2910.s deleted file mode 100644 index 6b389abadd..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_10/func_802405FC_9C2910.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405FC_9C2F0C -/* 9C2F0C 802405FC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9C2F10 80240600 AFB20020 */ sw $s2, 0x20($sp) -/* 9C2F14 80240604 0080902D */ daddu $s2, $a0, $zero -/* 9C2F18 80240608 AFBF0024 */ sw $ra, 0x24($sp) -/* 9C2F1C 8024060C AFB1001C */ sw $s1, 0x1c($sp) -/* 9C2F20 80240610 AFB00018 */ sw $s0, 0x18($sp) -/* 9C2F24 80240614 10A00035 */ beqz $a1, .L802406EC -/* 9C2F28 80240618 8E51000C */ lw $s1, 0xc($s2) -/* 9C2F2C 8024061C 0C00AB39 */ jal heap_malloc -/* 9C2F30 80240620 24040058 */ addiu $a0, $zero, 0x58 -/* 9C2F34 80240624 0040802D */ daddu $s0, $v0, $zero -/* 9C2F38 80240628 AE500084 */ sw $s0, 0x84($s2) -/* 9C2F3C 8024062C 8E250000 */ lw $a1, ($s1) -/* 9C2F40 80240630 26310004 */ addiu $s1, $s1, 4 -/* 9C2F44 80240634 0C0B1EAF */ jal get_variable -/* 9C2F48 80240638 0240202D */ daddu $a0, $s2, $zero -/* 9C2F4C 8024063C AE020038 */ sw $v0, 0x38($s0) -/* 9C2F50 80240640 8E250000 */ lw $a1, ($s1) -/* 9C2F54 80240644 26310004 */ addiu $s1, $s1, 4 -/* 9C2F58 80240648 0C0B210B */ jal get_float_variable -/* 9C2F5C 8024064C 0240202D */ daddu $a0, $s2, $zero -/* 9C2F60 80240650 E6000018 */ swc1 $f0, 0x18($s0) -/* 9C2F64 80240654 8E250000 */ lw $a1, ($s1) -/* 9C2F68 80240658 26310004 */ addiu $s1, $s1, 4 -/* 9C2F6C 8024065C 0C0B210B */ jal get_float_variable -/* 9C2F70 80240660 0240202D */ daddu $a0, $s2, $zero -/* 9C2F74 80240664 E6000024 */ swc1 $f0, 0x24($s0) -/* 9C2F78 80240668 8E250000 */ lw $a1, ($s1) -/* 9C2F7C 8024066C 26310004 */ addiu $s1, $s1, 4 -/* 9C2F80 80240670 0C0B210B */ jal get_float_variable -/* 9C2F84 80240674 0240202D */ daddu $a0, $s2, $zero -/* 9C2F88 80240678 E6000020 */ swc1 $f0, 0x20($s0) -/* 9C2F8C 8024067C 8E250000 */ lw $a1, ($s1) -/* 9C2F90 80240680 0C0B210B */ jal get_float_variable -/* 9C2F94 80240684 0240202D */ daddu $a0, $s2, $zero -/* 9C2F98 80240688 3C013F80 */ lui $at, 0x3f80 -/* 9C2F9C 8024068C 44811000 */ mtc1 $at, $f2 -/* 9C2FA0 80240690 E6000028 */ swc1 $f0, 0x28($s0) -/* 9C2FA4 80240694 AFA00014 */ sw $zero, 0x14($sp) -/* 9C2FA8 80240698 E7A20010 */ swc1 $f2, 0x10($sp) -/* 9C2FAC 8024069C 8E050018 */ lw $a1, 0x18($s0) -/* 9C2FB0 802406A0 8E060024 */ lw $a2, 0x24($s0) -/* 9C2FB4 802406A4 8E070020 */ lw $a3, 0x20($s0) -/* 9C2FB8 802406A8 0C01C9AC */ jal func_800726B0 -/* 9C2FBC 802406AC 24040001 */ addiu $a0, $zero, 1 -/* 9C2FC0 802406B0 AE020054 */ sw $v0, 0x54($s0) -/* 9C2FC4 802406B4 8C43000C */ lw $v1, 0xc($v0) -/* 9C2FC8 802406B8 9202003B */ lbu $v0, 0x3b($s0) -/* 9C2FCC 802406BC A0620034 */ sb $v0, 0x34($v1) -/* 9C2FD0 802406C0 8E020054 */ lw $v0, 0x54($s0) -/* 9C2FD4 802406C4 8C42000C */ lw $v0, 0xc($v0) -/* 9C2FD8 802406C8 AC400020 */ sw $zero, 0x20($v0) -/* 9C2FDC 802406CC 8E050018 */ lw $a1, 0x18($s0) -/* 9C2FE0 802406D0 8E060028 */ lw $a2, 0x28($s0) -/* 9C2FE4 802406D4 8E070020 */ lw $a3, 0x20($s0) -/* 9C2FE8 802406D8 0C044898 */ jal create_shadow_type -/* 9C2FEC 802406DC 0000202D */ daddu $a0, $zero, $zero -/* 9C2FF0 802406E0 AE020040 */ sw $v0, 0x40($s0) -/* 9C2FF4 802406E4 2402010E */ addiu $v0, $zero, 0x10e -/* 9C2FF8 802406E8 A602004C */ sh $v0, 0x4c($s0) -.L802406EC: -/* 9C2FFC 802406EC 8FBF0024 */ lw $ra, 0x24($sp) -/* 9C3000 802406F0 8FB20020 */ lw $s2, 0x20($sp) -/* 9C3004 802406F4 8FB1001C */ lw $s1, 0x1c($sp) -/* 9C3008 802406F8 8FB00018 */ lw $s0, 0x18($sp) -/* 9C300C 802406FC 24020002 */ addiu $v0, $zero, 2 -/* 9C3010 80240700 03E00008 */ jr $ra -/* 9C3014 80240704 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_10/func_80240708_9C2910.s b/asm/nonmatchings/world/area_trd/trd_10/func_80240708_9C2910.s deleted file mode 100644 index 47dfb9684e..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_10/func_80240708_9C2910.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240708_9C3018 -/* 9C3018 80240708 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C301C 8024070C AFBF0014 */ sw $ra, 0x14($sp) -/* 9C3020 80240710 AFB00010 */ sw $s0, 0x10($sp) -/* 9C3024 80240714 8C900084 */ lw $s0, 0x84($a0) -/* 9C3028 80240718 8602004C */ lh $v0, 0x4c($s0) -/* 9C302C 8024071C 44826000 */ mtc1 $v0, $f12 -/* 9C3030 80240720 00000000 */ nop -/* 9C3034 80240724 0C00A8BB */ jal sin_deg -/* 9C3038 80240728 46806320 */ cvt.s.w $f12, $f12 -/* 9C303C 8024072C 3C013F80 */ lui $at, 0x3f80 -/* 9C3040 80240730 44811000 */ mtc1 $at, $f2 -/* 9C3044 80240734 00000000 */ nop -/* 9C3048 80240738 46020000 */ add.s $f0, $f0, $f2 -/* 9C304C 8024073C 46000000 */ add.s $f0, $f0, $f0 -/* 9C3050 80240740 C6020024 */ lwc1 $f2, 0x24($s0) -/* 9C3054 80240744 8602004C */ lh $v0, 0x4c($s0) -/* 9C3058 80240748 46001080 */ add.s $f2, $f2, $f0 -/* 9C305C 8024074C 24420008 */ addiu $v0, $v0, 8 -/* 9C3060 80240750 44826000 */ mtc1 $v0, $f12 -/* 9C3064 80240754 00000000 */ nop -/* 9C3068 80240758 46806320 */ cvt.s.w $f12, $f12 -/* 9C306C 8024075C 0C00A6C9 */ jal clamp_angle -/* 9C3070 80240760 E6020004 */ swc1 $f2, 4($s0) -/* 9C3074 80240764 4600010D */ trunc.w.s $f4, $f0 -/* 9C3078 80240768 44022000 */ mfc1 $v0, $f4 -/* 9C307C 8024076C 00000000 */ nop -/* 9C3080 80240770 A602004C */ sh $v0, 0x4c($s0) -/* 9C3084 80240774 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 9C3088 80240778 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 9C308C 8024077C C44C0028 */ lwc1 $f12, 0x28($v0) -/* 9C3090 80240780 C44E0030 */ lwc1 $f14, 0x30($v0) -/* 9C3094 80240784 8E060018 */ lw $a2, 0x18($s0) -/* 9C3098 80240788 0C00A7B5 */ jal dist2D -/* 9C309C 8024078C 8E070020 */ lw $a3, 0x20($s0) -/* 9C30A0 80240790 3C0141F0 */ lui $at, 0x41f0 -/* 9C30A4 80240794 44811000 */ mtc1 $at, $f2 -/* 9C30A8 80240798 00000000 */ nop -/* 9C30AC 8024079C 4602003E */ c.le.s $f0, $f2 -/* 9C30B0 802407A0 00000000 */ nop -/* 9C30B4 802407A4 45000002 */ bc1f .L802407B0 -/* 9C30B8 802407A8 24020003 */ addiu $v0, $zero, 3 -/* 9C30BC 802407AC A602004E */ sh $v0, 0x4e($s0) -.L802407B0: -/* 9C30C0 802407B0 8E020054 */ lw $v0, 0x54($s0) -/* 9C30C4 802407B4 C6000018 */ lwc1 $f0, 0x18($s0) -/* 9C30C8 802407B8 8C42000C */ lw $v0, 0xc($v0) -/* 9C30CC 802407BC E4400004 */ swc1 $f0, 4($v0) -/* 9C30D0 802407C0 8E020054 */ lw $v0, 0x54($s0) -/* 9C30D4 802407C4 C6000004 */ lwc1 $f0, 4($s0) -/* 9C30D8 802407C8 8C42000C */ lw $v0, 0xc($v0) -/* 9C30DC 802407CC E4400008 */ swc1 $f0, 8($v0) -/* 9C30E0 802407D0 8E020054 */ lw $v0, 0x54($s0) -/* 9C30E4 802407D4 C6000020 */ lwc1 $f0, 0x20($s0) -/* 9C30E8 802407D8 8C42000C */ lw $v0, 0xc($v0) -/* 9C30EC 802407DC E440000C */ swc1 $f0, 0xc($v0) -/* 9C30F0 802407E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 9C30F4 802407E4 8FB00010 */ lw $s0, 0x10($sp) -/* 9C30F8 802407E8 0000102D */ daddu $v0, $zero, $zero -/* 9C30FC 802407EC 03E00008 */ jr $ra -/* 9C3100 802407F0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_10/func_802407F4_9C2910.s b/asm/nonmatchings/world/area_trd/trd_10/func_802407F4_9C2910.s deleted file mode 100644 index b7d6d7ec68..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_10/func_802407F4_9C2910.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407F4_9C3104 -/* 9C3104 802407F4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C3108 802407F8 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C310C 802407FC 0C00D77C */ jal func_80035DF0 -/* 9C3110 80240800 2404000A */ addiu $a0, $zero, 0xa -/* 9C3114 80240804 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C3118 80240808 24020002 */ addiu $v0, $zero, 2 -/* 9C311C 8024080C 03E00008 */ jr $ra -/* 9C3120 80240810 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9C3124 80240814 00000000 */ nop -/* 9C3128 80240818 00000000 */ nop -/* 9C312C 8024081C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tst/tst_04/func_802400FC_B1B570.s b/asm/nonmatchings/world/area_tst/tst_04/func_802400FC_B1B570.s deleted file mode 100644 index cf6055836f..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_04/func_802400FC_B1B570.s +++ /dev/null @@ -1,94 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400FC_B1B66C -/* B1B66C 802400FC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B1B670 80240100 AFB10014 */ sw $s1, 0x14($sp) -/* B1B674 80240104 0080882D */ daddu $s1, $a0, $zero -/* B1B678 80240108 AFBF0018 */ sw $ra, 0x18($sp) -/* B1B67C 8024010C AFB00010 */ sw $s0, 0x10($sp) -/* B1B680 80240110 F7BE0048 */ sdc1 $f30, 0x48($sp) -/* B1B684 80240114 F7BC0040 */ sdc1 $f28, 0x40($sp) -/* B1B688 80240118 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* B1B68C 8024011C F7B80030 */ sdc1 $f24, 0x30($sp) -/* B1B690 80240120 F7B60028 */ sdc1 $f22, 0x28($sp) -/* B1B694 80240124 F7B40020 */ sdc1 $f20, 0x20($sp) -/* B1B698 80240128 0C00EAD2 */ jal get_npc_safe -/* B1B69C 8024012C 2404FFFC */ addiu $a0, $zero, -4 -/* B1B6A0 80240130 0040802D */ daddu $s0, $v0, $zero -/* B1B6A4 80240134 1200003F */ beqz $s0, .L80240234 -/* B1B6A8 80240138 24020002 */ addiu $v0, $zero, 2 -/* B1B6AC 8024013C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B1B6B0 80240140 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B1B6B4 80240144 3C06C37A */ lui $a2, 0xc37a -/* B1B6B8 80240148 0C00A7B5 */ jal dist2D -/* B1B6BC 8024014C 3C07C2C8 */ lui $a3, 0xc2c8 -/* B1B6C0 80240150 0220202D */ daddu $a0, $s1, $zero -/* B1B6C4 80240154 3C05FE36 */ lui $a1, 0xfe36 -/* B1B6C8 80240158 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B1B6CC 8024015C 0C0B1EAF */ jal get_variable -/* B1B6D0 80240160 46000606 */ mov.s $f24, $f0 -/* B1B6D4 80240164 2442FFFF */ addiu $v0, $v0, -1 -/* B1B6D8 80240168 3C0140C9 */ lui $at, 0x40c9 -/* B1B6DC 8024016C 34210FD0 */ ori $at, $at, 0xfd0 -/* B1B6E0 80240170 4481B000 */ mtc1 $at, $f22 -/* B1B6E4 80240174 44820000 */ mtc1 $v0, $f0 -/* B1B6E8 80240178 00000000 */ nop -/* B1B6EC 8024017C 46800020 */ cvt.s.w $f0, $f0 -/* B1B6F0 80240180 46160502 */ mul.s $f20, $f0, $f22 -/* B1B6F4 80240184 00000000 */ nop -/* B1B6F8 80240188 3C0143B4 */ lui $at, 0x43b4 -/* B1B6FC 8024018C 4481D000 */ mtc1 $at, $f26 -/* B1B700 80240190 00000000 */ nop -/* B1B704 80240194 461AA503 */ div.s $f20, $f20, $f26 -/* B1B708 80240198 0C00A85B */ jal sin_rad -/* B1B70C 8024019C 4600A306 */ mov.s $f12, $f20 -/* B1B710 802401A0 46000786 */ mov.s $f30, $f0 -/* B1B714 802401A4 0C00A874 */ jal cos_rad -/* B1B718 802401A8 4600A306 */ mov.s $f12, $f20 -/* B1B71C 802401AC 4600C702 */ mul.s $f28, $f24, $f0 -/* B1B720 802401B0 00000000 */ nop -/* B1B724 802401B4 0220202D */ daddu $a0, $s1, $zero -/* B1B728 802401B8 4600F507 */ neg.s $f20, $f30 -/* B1B72C 802401BC 4614C502 */ mul.s $f20, $f24, $f20 -/* B1B730 802401C0 00000000 */ nop -/* B1B734 802401C4 3C05FE36 */ lui $a1, 0xfe36 -/* B1B738 802401C8 0C0B1EAF */ jal get_variable -/* B1B73C 802401CC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B1B740 802401D0 44820000 */ mtc1 $v0, $f0 -/* B1B744 802401D4 00000000 */ nop -/* B1B748 802401D8 46800020 */ cvt.s.w $f0, $f0 -/* B1B74C 802401DC 46160582 */ mul.s $f22, $f0, $f22 -/* B1B750 802401E0 00000000 */ nop -/* B1B754 802401E4 461AB583 */ div.s $f22, $f22, $f26 -/* B1B758 802401E8 0C00A85B */ jal sin_rad -/* B1B75C 802401EC 4600B306 */ mov.s $f12, $f22 -/* B1B760 802401F0 46000786 */ mov.s $f30, $f0 -/* B1B764 802401F4 0C00A874 */ jal cos_rad -/* B1B768 802401F8 4600B306 */ mov.s $f12, $f22 -/* B1B76C 802401FC 4600C002 */ mul.s $f0, $f24, $f0 -/* B1B770 80240200 00000000 */ nop -/* B1B774 80240204 4600F087 */ neg.s $f2, $f30 -/* B1B778 80240208 4602C602 */ mul.s $f24, $f24, $f2 -/* B1B77C 8024020C 00000000 */ nop -/* B1B780 80240210 461C0001 */ sub.s $f0, $f0, $f28 -/* B1B784 80240214 4614C601 */ sub.s $f24, $f24, $f20 -/* B1B788 80240218 C6020038 */ lwc1 $f2, 0x38($s0) -/* B1B78C 8024021C 46001080 */ add.s $f2, $f2, $f0 -/* B1B790 80240220 C6000040 */ lwc1 $f0, 0x40($s0) -/* B1B794 80240224 46180000 */ add.s $f0, $f0, $f24 -/* B1B798 80240228 24020002 */ addiu $v0, $zero, 2 -/* B1B79C 8024022C E6020038 */ swc1 $f2, 0x38($s0) -/* B1B7A0 80240230 E6000040 */ swc1 $f0, 0x40($s0) -.L80240234: -/* B1B7A4 80240234 8FBF0018 */ lw $ra, 0x18($sp) -/* B1B7A8 80240238 8FB10014 */ lw $s1, 0x14($sp) -/* B1B7AC 8024023C 8FB00010 */ lw $s0, 0x10($sp) -/* B1B7B0 80240240 D7BE0048 */ ldc1 $f30, 0x48($sp) -/* B1B7B4 80240244 D7BC0040 */ ldc1 $f28, 0x40($sp) -/* B1B7B8 80240248 D7BA0038 */ ldc1 $f26, 0x38($sp) -/* B1B7BC 8024024C D7B80030 */ ldc1 $f24, 0x30($sp) -/* B1B7C0 80240250 D7B60028 */ ldc1 $f22, 0x28($sp) -/* B1B7C4 80240254 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B1B7C8 80240258 03E00008 */ jr $ra -/* B1B7CC 8024025C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_tst/tst_04/func_8024029C_B1B570.s b/asm/nonmatchings/world/area_tst/tst_04/func_8024029C_B1B570.s deleted file mode 100644 index a0c74b90d1..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_04/func_8024029C_B1B570.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024029C_B1B80C -/* B1B80C 8024029C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B1B810 802402A0 AFB00040 */ sw $s0, 0x40($sp) -/* B1B814 802402A4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* B1B818 802402A8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* B1B81C 802402AC AFBF0048 */ sw $ra, 0x48($sp) -/* B1B820 802402B0 AFB10044 */ sw $s1, 0x44($sp) -/* B1B824 802402B4 8E020000 */ lw $v0, ($s0) -/* B1B828 802402B8 30420001 */ andi $v0, $v0, 1 -/* B1B82C 802402BC 10400023 */ beqz $v0, .L8024034C -/* B1B830 802402C0 27B10020 */ addiu $s1, $sp, 0x20 -/* B1B834 802402C4 8E0400CC */ lw $a0, 0xcc($s0) -/* B1B838 802402C8 0C044181 */ jal get_shadow_by_index -/* B1B83C 802402CC 00000000 */ nop -/* B1B840 802402D0 0C048B77 */ jal func_80122DDC -/* B1B844 802402D4 84440008 */ lh $a0, 8($v0) -/* B1B848 802402D8 8C430000 */ lw $v1, ($v0) -/* B1B84C 802402DC 3C04800A */ lui $a0, 0x800a -/* B1B850 802402E0 8484A634 */ lh $a0, -0x59cc($a0) -/* B1B854 802402E4 34630200 */ ori $v1, $v1, 0x200 -/* B1B858 802402E8 AC430000 */ sw $v1, ($v0) -/* B1B85C 802402EC 27A20030 */ addiu $v0, $sp, 0x30 -/* B1B860 802402F0 AFA20010 */ sw $v0, 0x10($sp) -/* B1B864 802402F4 27A20034 */ addiu $v0, $sp, 0x34 -/* B1B868 802402F8 AFA20014 */ sw $v0, 0x14($sp) -/* B1B86C 802402FC 27A20038 */ addiu $v0, $sp, 0x38 -/* B1B870 80240300 AFA20018 */ sw $v0, 0x18($sp) -/* B1B874 80240304 C6000030 */ lwc1 $f0, 0x30($s0) -/* B1B878 80240308 8E050028 */ lw $a1, 0x28($s0) -/* B1B87C 8024030C 8E06002C */ lw $a2, 0x2c($s0) -/* B1B880 80240310 46000007 */ neg.s $f0, $f0 -/* B1B884 80240314 44070000 */ mfc1 $a3, $f0 -/* B1B888 80240318 0C00B94E */ jal get_screen_coords -/* B1B88C 8024031C 00000000 */ nop -/* B1B890 80240320 0220202D */ daddu $a0, $s1, $zero -/* B1B894 80240324 AFB00028 */ sw $s0, 0x28($sp) -/* B1B898 80240328 820500BE */ lb $a1, 0xbe($s0) -/* B1B89C 8024032C 8FA30038 */ lw $v1, 0x38($sp) -/* B1B8A0 80240330 3C028024 */ lui $v0, 0x8024 -/* B1B8A4 80240334 24420360 */ addiu $v0, $v0, 0x360 -/* B1B8A8 80240338 AFA2002C */ sw $v0, 0x2c($sp) -/* B1B8AC 8024033C 00031823 */ negu $v1, $v1 -/* B1B8B0 80240340 AFA50020 */ sw $a1, 0x20($sp) -/* B1B8B4 80240344 0C047644 */ jal queue_render_task -/* B1B8B8 80240348 AFA30024 */ sw $v1, 0x24($sp) -.L8024034C: -/* B1B8BC 8024034C 8FBF0048 */ lw $ra, 0x48($sp) -/* B1B8C0 80240350 8FB10044 */ lw $s1, 0x44($sp) -/* B1B8C4 80240354 8FB00040 */ lw $s0, 0x40($sp) -/* B1B8C8 80240358 03E00008 */ jr $ra -/* B1B8CC 8024035C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_tst/tst_04/func_80240360_B1B570.s b/asm/nonmatchings/world/area_tst/tst_04/func_80240360_B1B570.s deleted file mode 100644 index 35c79384b7..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_04/func_80240360_B1B570.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240360_B1B8D0 -/* B1B8D0 80240360 3C03800A */ lui $v1, 0x800a -/* B1B8D4 80240364 8463A634 */ lh $v1, -0x59cc($v1) -/* B1B8D8 80240368 3C07BF80 */ lui $a3, 0xbf80 -/* B1B8DC 8024036C 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* B1B8E0 80240370 F7B40128 */ sdc1 $f20, 0x128($sp) -/* B1B8E4 80240374 4480A000 */ mtc1 $zero, $f20 -/* B1B8E8 80240378 AFB1011C */ sw $s1, 0x11c($sp) -/* B1B8EC 8024037C 0080882D */ daddu $s1, $a0, $zero -/* B1B8F0 80240380 AFB00118 */ sw $s0, 0x118($sp) -/* B1B8F4 80240384 27B00098 */ addiu $s0, $sp, 0x98 -/* B1B8F8 80240388 AFBF0120 */ sw $ra, 0x120($sp) -/* B1B8FC 8024038C F7B80138 */ sdc1 $f24, 0x138($sp) -/* B1B900 80240390 F7B60130 */ sdc1 $f22, 0x130($sp) -/* B1B904 80240394 00031080 */ sll $v0, $v1, 2 -/* B1B908 80240398 00431021 */ addu $v0, $v0, $v1 -/* B1B90C 8024039C 00021080 */ sll $v0, $v0, 2 -/* B1B910 802403A0 00431023 */ subu $v0, $v0, $v1 -/* B1B914 802403A4 000218C0 */ sll $v1, $v0, 3 -/* B1B918 802403A8 00431021 */ addu $v0, $v0, $v1 -/* B1B91C 802403AC 000210C0 */ sll $v0, $v0, 3 -/* B1B920 802403B0 3C01800B */ lui $at, 0x800b -/* B1B924 802403B4 00220821 */ addu $at, $at, $v0 -/* B1B928 802403B8 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* B1B92C 802403BC 4406A000 */ mfc1 $a2, $f20 -/* B1B930 802403C0 4600B587 */ neg.s $f22, $f22 -/* B1B934 802403C4 4405B000 */ mfc1 $a1, $f22 -/* B1B938 802403C8 0200202D */ daddu $a0, $s0, $zero -/* B1B93C 802403CC 0C019EC8 */ jal guRotateF -/* B1B940 802403D0 E7B40010 */ swc1 $f20, 0x10($sp) -/* B1B944 802403D4 C62C008C */ lwc1 $f12, 0x8c($s1) -/* B1B948 802403D8 0C00A6C9 */ jal clamp_angle -/* B1B94C 802403DC 00000000 */ nop -/* B1B950 802403E0 44050000 */ mfc1 $a1, $f0 -/* B1B954 802403E4 4406A000 */ mfc1 $a2, $f20 -/* B1B958 802403E8 4407A000 */ mfc1 $a3, $f20 -/* B1B95C 802403EC 3C013F80 */ lui $at, 0x3f80 -/* B1B960 802403F0 4481C000 */ mtc1 $at, $f24 -/* B1B964 802403F4 27A40018 */ addiu $a0, $sp, 0x18 -/* B1B968 802403F8 0C019EC8 */ jal guRotateF -/* B1B96C 802403FC E7B80010 */ swc1 $f24, 0x10($sp) -/* B1B970 80240400 0200202D */ daddu $a0, $s0, $zero -/* B1B974 80240404 27A50018 */ addiu $a1, $sp, 0x18 -/* B1B978 80240408 0C019D80 */ jal guMtxCatF -/* B1B97C 8024040C 00A0302D */ daddu $a2, $a1, $zero -/* B1B980 80240410 4405B000 */ mfc1 $a1, $f22 -/* B1B984 80240414 4406A000 */ mfc1 $a2, $f20 -/* B1B988 80240418 4407C000 */ mfc1 $a3, $f24 -/* B1B98C 8024041C 0200202D */ daddu $a0, $s0, $zero -/* B1B990 80240420 0C019EC8 */ jal guRotateF -/* B1B994 80240424 E7B40010 */ swc1 $f20, 0x10($sp) -/* B1B998 80240428 27A40018 */ addiu $a0, $sp, 0x18 -/* B1B99C 8024042C 0200282D */ daddu $a1, $s0, $zero -/* B1B9A0 80240430 0C019D80 */ jal guMtxCatF -/* B1B9A4 80240434 0080302D */ daddu $a2, $a0, $zero -/* B1B9A8 80240438 E7B40010 */ swc1 $f20, 0x10($sp) -/* B1B9AC 8024043C 8E2500A8 */ lw $a1, 0xa8($s1) -/* B1B9B0 80240440 4406A000 */ mfc1 $a2, $f20 -/* B1B9B4 80240444 4407C000 */ mfc1 $a3, $f24 -/* B1B9B8 80240448 0C019EC8 */ jal guRotateF -/* B1B9BC 8024044C 0200202D */ daddu $a0, $s0, $zero -/* B1B9C0 80240450 27A40018 */ addiu $a0, $sp, 0x18 -/* B1B9C4 80240454 0200282D */ daddu $a1, $s0, $zero -/* B1B9C8 80240458 0C019D80 */ jal guMtxCatF -/* B1B9CC 8024045C 0080302D */ daddu $a2, $a0, $zero -/* B1B9D0 80240460 3C013F36 */ lui $at, 0x3f36 -/* B1B9D4 80240464 3421DB6E */ ori $at, $at, 0xdb6e -/* B1B9D8 80240468 44810000 */ mtc1 $at, $f0 -/* B1B9DC 8024046C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* B1B9E0 80240470 44050000 */ mfc1 $a1, $f0 -/* B1B9E4 80240474 0200202D */ daddu $a0, $s0, $zero -/* B1B9E8 80240478 00A0302D */ daddu $a2, $a1, $zero -/* B1B9EC 8024047C 0C019DF0 */ jal guScaleF -/* B1B9F0 80240480 00A0382D */ daddu $a3, $a1, $zero -/* B1B9F4 80240484 27A40018 */ addiu $a0, $sp, 0x18 -/* B1B9F8 80240488 0200282D */ daddu $a1, $s0, $zero -/* B1B9FC 8024048C 0C019D80 */ jal guMtxCatF -/* B1BA00 80240490 0080302D */ daddu $a2, $a0, $zero -/* B1BA04 80240494 27B00058 */ addiu $s0, $sp, 0x58 -/* B1BA08 80240498 8E250028 */ lw $a1, 0x28($s1) -/* B1BA0C 8024049C C6200030 */ lwc1 $f0, 0x30($s1) -/* B1BA10 802404A0 8E26002C */ lw $a2, 0x2c($s1) -/* B1BA14 802404A4 46000007 */ neg.s $f0, $f0 -/* B1BA18 802404A8 44070000 */ mfc1 $a3, $f0 -/* B1BA1C 802404AC 0C019E40 */ jal guTranslateF -/* B1BA20 802404B0 0200202D */ daddu $a0, $s0, $zero -/* B1BA24 802404B4 27A40018 */ addiu $a0, $sp, 0x18 -/* B1BA28 802404B8 0200282D */ daddu $a1, $s0, $zero -/* B1BA2C 802404BC 0C019D80 */ jal guMtxCatF -/* B1BA30 802404C0 0080302D */ daddu $a2, $a0, $zero -/* B1BA34 802404C4 8E2500A4 */ lw $a1, 0xa4($s1) -/* B1BA38 802404C8 4406C000 */ mfc1 $a2, $f24 -/* B1BA3C 802404CC 0C0B76A3 */ jal func_802DDA8C -/* B1BA40 802404D0 24040001 */ addiu $a0, $zero, 1 -/* B1BA44 802404D4 24040001 */ addiu $a0, $zero, 1 -/* B1BA48 802404D8 0000282D */ daddu $a1, $zero, $zero -/* B1BA4C 802404DC 00A0302D */ daddu $a2, $a1, $zero -/* B1BA50 802404E0 00A0382D */ daddu $a3, $a1, $zero -/* B1BA54 802404E4 27A20018 */ addiu $v0, $sp, 0x18 -/* B1BA58 802404E8 0C0B7710 */ jal render_sprite -/* B1BA5C 802404EC AFA20010 */ sw $v0, 0x10($sp) -/* B1BA60 802404F0 8FBF0120 */ lw $ra, 0x120($sp) -/* B1BA64 802404F4 8FB1011C */ lw $s1, 0x11c($sp) -/* B1BA68 802404F8 8FB00118 */ lw $s0, 0x118($sp) -/* B1BA6C 802404FC D7B80138 */ ldc1 $f24, 0x138($sp) -/* B1BA70 80240500 D7B60130 */ ldc1 $f22, 0x130($sp) -/* B1BA74 80240504 D7B40128 */ ldc1 $f20, 0x128($sp) -/* B1BA78 80240508 03E00008 */ jr $ra -/* B1BA7C 8024050C 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_tst/tst_04/func_80240510_B1B570.s b/asm/nonmatchings/world/area_tst/tst_04/func_80240510_B1B570.s deleted file mode 100644 index 2602afac53..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_04/func_80240510_B1B570.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240510_B1BA80 -/* B1BA80 80240510 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1BA84 80240514 AFB00010 */ sw $s0, 0x10($sp) -/* B1BA88 80240518 0080802D */ daddu $s0, $a0, $zero -/* B1BA8C 8024051C 3C048024 */ lui $a0, 0x8024 -/* B1BA90 80240520 24840574 */ addiu $a0, $a0, 0x574 -/* B1BA94 80240524 AFBF0014 */ sw $ra, 0x14($sp) -/* B1BA98 80240528 0C048C56 */ jal bind_dynamic_entity_3 -/* B1BA9C 8024052C 0000282D */ daddu $a1, $zero, $zero -/* B1BAA0 80240530 8E03013C */ lw $v1, 0x13c($s0) -/* B1BAA4 80240534 2404FFFC */ addiu $a0, $zero, -4 -/* B1BAA8 80240538 0C00EAD2 */ jal get_npc_safe -/* B1BAAC 8024053C AC620004 */ sw $v0, 4($v1) -/* B1BAB0 80240540 0040282D */ daddu $a1, $v0, $zero -/* B1BAB4 80240544 10A00007 */ beqz $a1, .L80240564 -/* B1BAB8 80240548 24020002 */ addiu $v0, $zero, 2 -/* B1BABC 8024054C 8CA30000 */ lw $v1, ($a1) -/* B1BAC0 80240550 3C040002 */ lui $a0, 2 -/* B1BAC4 80240554 00641825 */ or $v1, $v1, $a0 -/* B1BAC8 80240558 3C040008 */ lui $a0, 8 -/* B1BACC 8024055C 00641825 */ or $v1, $v1, $a0 -/* B1BAD0 80240560 ACA30000 */ sw $v1, ($a1) -.L80240564: -/* B1BAD4 80240564 8FBF0014 */ lw $ra, 0x14($sp) -/* B1BAD8 80240568 8FB00010 */ lw $s0, 0x10($sp) -/* B1BADC 8024056C 03E00008 */ jr $ra -/* B1BAE0 80240570 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tst/tst_04/func_80240574_B1B570.s b/asm/nonmatchings/world/area_tst/tst_04/func_80240574_B1B570.s deleted file mode 100644 index b10f0a925b..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_04/func_80240574_B1B570.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240574_B1BAE4 -/* B1BAE4 80240574 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1BAE8 80240578 AFBF0010 */ sw $ra, 0x10($sp) -/* B1BAEC 8024057C 0C00EAD2 */ jal get_npc_safe -/* B1BAF0 80240580 2404FFFC */ addiu $a0, $zero, -4 -/* B1BAF4 80240584 0040202D */ daddu $a0, $v0, $zero -/* B1BAF8 80240588 10800006 */ beqz $a0, .L802405A4 -/* B1BAFC 8024058C 3C030002 */ lui $v1, 2 -/* B1BB00 80240590 8C820000 */ lw $v0, ($a0) -/* B1BB04 80240594 00431025 */ or $v0, $v0, $v1 -/* B1BB08 80240598 3C030008 */ lui $v1, 8 -/* B1BB0C 8024059C 00431025 */ or $v0, $v0, $v1 -/* B1BB10 802405A0 AC820000 */ sw $v0, ($a0) -.L802405A4: -/* B1BB14 802405A4 8FBF0010 */ lw $ra, 0x10($sp) -/* B1BB18 802405A8 03E00008 */ jr $ra -/* B1BB1C 802405AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tst/tst_04/func_80240628_B1B570.s b/asm/nonmatchings/world/area_tst/tst_04/func_80240628_B1B570.s deleted file mode 100644 index 7f144ce4b5..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_04/func_80240628_B1B570.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240628_B1BB98 -/* B1BB98 80240628 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1BB9C 8024062C 3C048024 */ lui $a0, 0x8024 -/* B1BBA0 80240630 248405B0 */ addiu $a0, $a0, 0x5b0 -/* B1BBA4 80240634 3C058024 */ lui $a1, 0x8024 -/* B1BBA8 80240638 24A505D4 */ addiu $a1, $a1, 0x5d4 -/* B1BBAC 8024063C AFBF0010 */ sw $ra, 0x10($sp) -/* B1BBB0 80240640 0C048C56 */ jal bind_dynamic_entity_3 -/* B1BBB4 80240644 00000000 */ nop -/* B1BBB8 80240648 8FBF0010 */ lw $ra, 0x10($sp) -/* B1BBBC 8024064C 24020002 */ addiu $v0, $zero, 2 -/* B1BBC0 80240650 03E00008 */ jr $ra -/* B1BBC4 80240654 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1BBC8 80240658 00000000 */ nop -/* B1BBCC 8024065C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tst/tst_04/func_80240660_B1B570.s b/asm/nonmatchings/world/area_tst/tst_04/func_80240660_B1B570.s deleted file mode 100644 index c9f8efbf6e..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_04/func_80240660_B1B570.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240660_B1BBD0 -/* B1BBD0 80240660 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1BBD4 80240664 AFBF0010 */ sw $ra, 0x10($sp) -/* B1BBD8 80240668 8C820148 */ lw $v0, 0x148($a0) -/* B1BBDC 8024066C 0C00EABB */ jal get_npc_unsafe -/* B1BBE0 80240670 84440008 */ lh $a0, 8($v0) -/* B1BBE4 80240674 0C00EAFF */ jal disable_npc_shadow -/* B1BBE8 80240678 0040202D */ daddu $a0, $v0, $zero -/* B1BBEC 8024067C 8FBF0010 */ lw $ra, 0x10($sp) -/* B1BBF0 80240680 24020002 */ addiu $v0, $zero, 2 -/* B1BBF4 80240684 03E00008 */ jr $ra -/* B1BBF8 80240688 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1BBFC 8024068C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tst/tst_11/func_8024003C_B1CA50.s b/asm/nonmatchings/world/area_tst/tst_11/func_8024003C_B1CA50.s deleted file mode 100644 index 2fc35bf4d9..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_11/func_8024003C_B1CA50.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024003C_B1CA8C -/* B1CA8C 8024003C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B1CA90 80240040 AFB00040 */ sw $s0, 0x40($sp) -/* B1CA94 80240044 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* B1CA98 80240048 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* B1CA9C 8024004C AFBF0048 */ sw $ra, 0x48($sp) -/* B1CAA0 80240050 AFB10044 */ sw $s1, 0x44($sp) -/* B1CAA4 80240054 8E020000 */ lw $v0, ($s0) -/* B1CAA8 80240058 30420001 */ andi $v0, $v0, 1 -/* B1CAAC 8024005C 10400023 */ beqz $v0, .L802400EC -/* B1CAB0 80240060 27B10020 */ addiu $s1, $sp, 0x20 -/* B1CAB4 80240064 8E0400CC */ lw $a0, 0xcc($s0) -/* B1CAB8 80240068 0C044181 */ jal get_shadow_by_index -/* B1CABC 8024006C 00000000 */ nop -/* B1CAC0 80240070 0C048B77 */ jal func_80122DDC -/* B1CAC4 80240074 84440008 */ lh $a0, 8($v0) -/* B1CAC8 80240078 8C430000 */ lw $v1, ($v0) -/* B1CACC 8024007C 3C04800A */ lui $a0, 0x800a -/* B1CAD0 80240080 8484A634 */ lh $a0, -0x59cc($a0) -/* B1CAD4 80240084 34630200 */ ori $v1, $v1, 0x200 -/* B1CAD8 80240088 AC430000 */ sw $v1, ($v0) -/* B1CADC 8024008C 27A20030 */ addiu $v0, $sp, 0x30 -/* B1CAE0 80240090 AFA20010 */ sw $v0, 0x10($sp) -/* B1CAE4 80240094 27A20034 */ addiu $v0, $sp, 0x34 -/* B1CAE8 80240098 AFA20014 */ sw $v0, 0x14($sp) -/* B1CAEC 8024009C 27A20038 */ addiu $v0, $sp, 0x38 -/* B1CAF0 802400A0 AFA20018 */ sw $v0, 0x18($sp) -/* B1CAF4 802400A4 C6000030 */ lwc1 $f0, 0x30($s0) -/* B1CAF8 802400A8 8E050028 */ lw $a1, 0x28($s0) -/* B1CAFC 802400AC 8E06002C */ lw $a2, 0x2c($s0) -/* B1CB00 802400B0 46000007 */ neg.s $f0, $f0 -/* B1CB04 802400B4 44070000 */ mfc1 $a3, $f0 -/* B1CB08 802400B8 0C00B94E */ jal get_screen_coords -/* B1CB0C 802400BC 00000000 */ nop -/* B1CB10 802400C0 0220202D */ daddu $a0, $s1, $zero -/* B1CB14 802400C4 AFB00028 */ sw $s0, 0x28($sp) -/* B1CB18 802400C8 820500BE */ lb $a1, 0xbe($s0) -/* B1CB1C 802400CC 8FA30038 */ lw $v1, 0x38($sp) -/* B1CB20 802400D0 3C028024 */ lui $v0, 0x8024 -/* B1CB24 802400D4 24420100 */ addiu $v0, $v0, 0x100 -/* B1CB28 802400D8 AFA2002C */ sw $v0, 0x2c($sp) -/* B1CB2C 802400DC 00031823 */ negu $v1, $v1 -/* B1CB30 802400E0 AFA50020 */ sw $a1, 0x20($sp) -/* B1CB34 802400E4 0C047644 */ jal queue_render_task -/* B1CB38 802400E8 AFA30024 */ sw $v1, 0x24($sp) -.L802400EC: -/* B1CB3C 802400EC 8FBF0048 */ lw $ra, 0x48($sp) -/* B1CB40 802400F0 8FB10044 */ lw $s1, 0x44($sp) -/* B1CB44 802400F4 8FB00040 */ lw $s0, 0x40($sp) -/* B1CB48 802400F8 03E00008 */ jr $ra -/* B1CB4C 802400FC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_tst/tst_11/func_802403B8_B1CA50.s b/asm/nonmatchings/world/area_tst/tst_11/func_802403B8_B1CA50.s deleted file mode 100644 index 28dfbac986..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_11/func_802403B8_B1CA50.s +++ /dev/null @@ -1,203 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403B8_B1CE08 -/* B1CE08 802403B8 27BDFEA0 */ addiu $sp, $sp, -0x160 -/* B1CE0C 802403BC F7B40138 */ sdc1 $f20, 0x138($sp) -/* B1CE10 802403C0 4480A000 */ mtc1 $zero, $f20 -/* B1CE14 802403C4 3C03800A */ lui $v1, 0x800a -/* B1CE18 802403C8 8463A634 */ lh $v1, -0x59cc($v1) -/* B1CE1C 802403CC F7BC0158 */ sdc1 $f28, 0x158($sp) -/* B1CE20 802403D0 3C01BF80 */ lui $at, 0xbf80 -/* B1CE24 802403D4 4481E000 */ mtc1 $at, $f28 -/* B1CE28 802403D8 AFB20128 */ sw $s2, 0x128($sp) -/* B1CE2C 802403DC 0080902D */ daddu $s2, $a0, $zero -/* B1CE30 802403E0 AFB10124 */ sw $s1, 0x124($sp) -/* B1CE34 802403E4 27B100A0 */ addiu $s1, $sp, 0xa0 -/* B1CE38 802403E8 AFBF0134 */ sw $ra, 0x134($sp) -/* B1CE3C 802403EC AFB40130 */ sw $s4, 0x130($sp) -/* B1CE40 802403F0 AFB3012C */ sw $s3, 0x12c($sp) -/* B1CE44 802403F4 AFB00120 */ sw $s0, 0x120($sp) -/* B1CE48 802403F8 F7BA0150 */ sdc1 $f26, 0x150($sp) -/* B1CE4C 802403FC F7B80148 */ sdc1 $f24, 0x148($sp) -/* B1CE50 80240400 F7B60140 */ sdc1 $f22, 0x140($sp) -/* B1CE54 80240404 00031080 */ sll $v0, $v1, 2 -/* B1CE58 80240408 00431021 */ addu $v0, $v0, $v1 -/* B1CE5C 8024040C 00021080 */ sll $v0, $v0, 2 -/* B1CE60 80240410 00431023 */ subu $v0, $v0, $v1 -/* B1CE64 80240414 000218C0 */ sll $v1, $v0, 3 -/* B1CE68 80240418 00431021 */ addu $v0, $v0, $v1 -/* B1CE6C 8024041C 000210C0 */ sll $v0, $v0, 3 -/* B1CE70 80240420 4406A000 */ mfc1 $a2, $f20 -/* B1CE74 80240424 3C01800B */ lui $at, 0x800b -/* B1CE78 80240428 00220821 */ addu $at, $at, $v0 -/* B1CE7C 8024042C C4361DEC */ lwc1 $f22, 0x1dec($at) -/* B1CE80 80240430 4407E000 */ mfc1 $a3, $f28 -/* B1CE84 80240434 4600B587 */ neg.s $f22, $f22 -/* B1CE88 80240438 4405B000 */ mfc1 $a1, $f22 -/* B1CE8C 8024043C 0220202D */ daddu $a0, $s1, $zero -/* B1CE90 80240440 0C019EC8 */ jal guRotateF -/* B1CE94 80240444 E7B40010 */ swc1 $f20, 0x10($sp) -/* B1CE98 80240448 C64C008C */ lwc1 $f12, 0x8c($s2) -/* B1CE9C 8024044C 0C00A6C9 */ jal clamp_angle -/* B1CEA0 80240450 00000000 */ nop -/* B1CEA4 80240454 44050000 */ mfc1 $a1, $f0 -/* B1CEA8 80240458 4406A000 */ mfc1 $a2, $f20 -/* B1CEAC 8024045C 4407A000 */ mfc1 $a3, $f20 -/* B1CEB0 80240460 3C013F80 */ lui $at, 0x3f80 -/* B1CEB4 80240464 4481C000 */ mtc1 $at, $f24 -/* B1CEB8 80240468 27A40020 */ addiu $a0, $sp, 0x20 -/* B1CEBC 8024046C 0C019EC8 */ jal guRotateF -/* B1CEC0 80240470 E7B80010 */ swc1 $f24, 0x10($sp) -/* B1CEC4 80240474 0220202D */ daddu $a0, $s1, $zero -/* B1CEC8 80240478 27A50020 */ addiu $a1, $sp, 0x20 -/* B1CECC 8024047C 0C019D80 */ jal guMtxCatF -/* B1CED0 80240480 00A0302D */ daddu $a2, $a1, $zero -/* B1CED4 80240484 4405B000 */ mfc1 $a1, $f22 -/* B1CED8 80240488 4406A000 */ mfc1 $a2, $f20 -/* B1CEDC 8024048C 4407C000 */ mfc1 $a3, $f24 -/* B1CEE0 80240490 0220202D */ daddu $a0, $s1, $zero -/* B1CEE4 80240494 0C019EC8 */ jal guRotateF -/* B1CEE8 80240498 E7B40010 */ swc1 $f20, 0x10($sp) -/* B1CEEC 8024049C 27A40020 */ addiu $a0, $sp, 0x20 -/* B1CEF0 802404A0 0220282D */ daddu $a1, $s1, $zero -/* B1CEF4 802404A4 0C019D80 */ jal guMtxCatF -/* B1CEF8 802404A8 0080302D */ daddu $a2, $a0, $zero -/* B1CEFC 802404AC E7B40010 */ swc1 $f20, 0x10($sp) -/* B1CF00 802404B0 8E4500A8 */ lw $a1, 0xa8($s2) -/* B1CF04 802404B4 4406A000 */ mfc1 $a2, $f20 -/* B1CF08 802404B8 4407C000 */ mfc1 $a3, $f24 -/* B1CF0C 802404BC 0C019EC8 */ jal guRotateF -/* B1CF10 802404C0 0220202D */ daddu $a0, $s1, $zero -/* B1CF14 802404C4 27A40020 */ addiu $a0, $sp, 0x20 -/* B1CF18 802404C8 0220282D */ daddu $a1, $s1, $zero -/* B1CF1C 802404CC 0C019D80 */ jal guMtxCatF -/* B1CF20 802404D0 0080302D */ daddu $a2, $a0, $zero -/* B1CF24 802404D4 27B300E0 */ addiu $s3, $sp, 0xe0 -/* B1CF28 802404D8 3C013F36 */ lui $at, 0x3f36 -/* B1CF2C 802404DC 3421DB6E */ ori $at, $at, 0xdb6e -/* B1CF30 802404E0 4481D000 */ mtc1 $at, $f26 -/* B1CF34 802404E4 3C06BF36 */ lui $a2, 0xbf36 -/* B1CF38 802404E8 34C6DB6E */ ori $a2, $a2, 0xdb6e -/* B1CF3C 802404EC 4405D000 */ mfc1 $a1, $f26 -/* B1CF40 802404F0 4407D000 */ mfc1 $a3, $f26 -/* B1CF44 802404F4 0C019DF0 */ jal guScaleF -/* B1CF48 802404F8 0260202D */ daddu $a0, $s3, $zero -/* B1CF4C 802404FC 27A40020 */ addiu $a0, $sp, 0x20 -/* B1CF50 80240500 0260282D */ daddu $a1, $s3, $zero -/* B1CF54 80240504 0C019D80 */ jal guMtxCatF -/* B1CF58 80240508 0080302D */ daddu $a2, $a0, $zero -/* B1CF5C 8024050C 27B40060 */ addiu $s4, $sp, 0x60 -/* B1CF60 80240510 8E450028 */ lw $a1, 0x28($s2) -/* B1CF64 80240514 C640002C */ lwc1 $f0, 0x2c($s2) -/* B1CF68 80240518 8E470030 */ lw $a3, 0x30($s2) -/* B1CF6C 8024051C 46000007 */ neg.s $f0, $f0 -/* B1CF70 80240520 44060000 */ mfc1 $a2, $f0 -/* B1CF74 80240524 0C019E40 */ jal guTranslateF -/* B1CF78 80240528 0280202D */ daddu $a0, $s4, $zero -/* B1CF7C 8024052C 27A40020 */ addiu $a0, $sp, 0x20 -/* B1CF80 80240530 0280282D */ daddu $a1, $s4, $zero -/* B1CF84 80240534 0C019D80 */ jal guMtxCatF -/* B1CF88 80240538 0080302D */ daddu $a2, $a0, $zero -/* B1CF8C 8024053C 24040001 */ addiu $a0, $zero, 1 -/* B1CF90 80240540 0000282D */ daddu $a1, $zero, $zero -/* B1CF94 80240544 00A0302D */ daddu $a2, $a1, $zero -/* B1CF98 80240548 00A0382D */ daddu $a3, $a1, $zero -/* B1CF9C 8024054C 27B00020 */ addiu $s0, $sp, 0x20 -/* B1CFA0 80240550 0C0B7710 */ jal render_sprite -/* B1CFA4 80240554 AFB00010 */ sw $s0, 0x10($sp) -/* B1CFA8 80240558 4405B000 */ mfc1 $a1, $f22 -/* B1CFAC 8024055C 4406A000 */ mfc1 $a2, $f20 -/* B1CFB0 80240560 4407E000 */ mfc1 $a3, $f28 -/* B1CFB4 80240564 0220202D */ daddu $a0, $s1, $zero -/* B1CFB8 80240568 0C019EC8 */ jal guRotateF -/* B1CFBC 8024056C E7B40010 */ swc1 $f20, 0x10($sp) -/* B1CFC0 80240570 C64C008C */ lwc1 $f12, 0x8c($s2) -/* B1CFC4 80240574 0C00A6C9 */ jal clamp_angle -/* B1CFC8 80240578 00000000 */ nop -/* B1CFCC 8024057C 44050000 */ mfc1 $a1, $f0 -/* B1CFD0 80240580 4406A000 */ mfc1 $a2, $f20 -/* B1CFD4 80240584 4407A000 */ mfc1 $a3, $f20 -/* B1CFD8 80240588 0200202D */ daddu $a0, $s0, $zero -/* B1CFDC 8024058C 0C019EC8 */ jal guRotateF -/* B1CFE0 80240590 E7B80010 */ swc1 $f24, 0x10($sp) -/* B1CFE4 80240594 0220202D */ daddu $a0, $s1, $zero -/* B1CFE8 80240598 0200282D */ daddu $a1, $s0, $zero -/* B1CFEC 8024059C 0C019D80 */ jal guMtxCatF -/* B1CFF0 802405A0 0200302D */ daddu $a2, $s0, $zero -/* B1CFF4 802405A4 4405B000 */ mfc1 $a1, $f22 -/* B1CFF8 802405A8 4406A000 */ mfc1 $a2, $f20 -/* B1CFFC 802405AC 4407C000 */ mfc1 $a3, $f24 -/* B1D000 802405B0 0220202D */ daddu $a0, $s1, $zero -/* B1D004 802405B4 0C019EC8 */ jal guRotateF -/* B1D008 802405B8 E7B40010 */ swc1 $f20, 0x10($sp) -/* B1D00C 802405BC 0200202D */ daddu $a0, $s0, $zero -/* B1D010 802405C0 0220282D */ daddu $a1, $s1, $zero -/* B1D014 802405C4 0C019D80 */ jal guMtxCatF -/* B1D018 802405C8 0200302D */ daddu $a2, $s0, $zero -/* B1D01C 802405CC E7B40010 */ swc1 $f20, 0x10($sp) -/* B1D020 802405D0 8E4500A8 */ lw $a1, 0xa8($s2) -/* B1D024 802405D4 4406A000 */ mfc1 $a2, $f20 -/* B1D028 802405D8 4407C000 */ mfc1 $a3, $f24 -/* B1D02C 802405DC 0C019EC8 */ jal guRotateF -/* B1D030 802405E0 0220202D */ daddu $a0, $s1, $zero -/* B1D034 802405E4 0200202D */ daddu $a0, $s0, $zero -/* B1D038 802405E8 0220282D */ daddu $a1, $s1, $zero -/* B1D03C 802405EC 0C019D80 */ jal guMtxCatF -/* B1D040 802405F0 0200302D */ daddu $a2, $s0, $zero -/* B1D044 802405F4 4405D000 */ mfc1 $a1, $f26 -/* B1D048 802405F8 0260202D */ daddu $a0, $s3, $zero -/* B1D04C 802405FC 00A0302D */ daddu $a2, $a1, $zero -/* B1D050 80240600 0C019DF0 */ jal guScaleF -/* B1D054 80240604 00A0382D */ daddu $a3, $a1, $zero -/* B1D058 80240608 0200202D */ daddu $a0, $s0, $zero -/* B1D05C 8024060C 0260282D */ daddu $a1, $s3, $zero -/* B1D060 80240610 0C019D80 */ jal guMtxCatF -/* B1D064 80240614 0200302D */ daddu $a2, $s0, $zero -/* B1D068 80240618 8E450028 */ lw $a1, 0x28($s2) -/* B1D06C 8024061C 8E46002C */ lw $a2, 0x2c($s2) -/* B1D070 80240620 4407A000 */ mfc1 $a3, $f20 -/* B1D074 80240624 0C019E40 */ jal guTranslateF -/* B1D078 80240628 0280202D */ daddu $a0, $s4, $zero -/* B1D07C 8024062C 0200202D */ daddu $a0, $s0, $zero -/* B1D080 80240630 0280282D */ daddu $a1, $s4, $zero -/* B1D084 80240634 0C019D80 */ jal guMtxCatF -/* B1D088 80240638 0200302D */ daddu $a2, $s0, $zero -/* B1D08C 8024063C 24050007 */ addiu $a1, $zero, 7 -/* B1D090 80240640 240600FF */ addiu $a2, $zero, 0xff -/* B1D094 80240644 00C0382D */ daddu $a3, $a2, $zero -/* B1D098 80240648 8E5100A4 */ lw $s1, 0xa4($s2) -/* B1D09C 8024064C 00C0102D */ daddu $v0, $a2, $zero -/* B1D0A0 80240650 AFA20010 */ sw $v0, 0x10($sp) -/* B1D0A4 80240654 24020014 */ addiu $v0, $zero, 0x14 -/* B1D0A8 80240658 AFA20014 */ sw $v0, 0x14($sp) -/* B1D0AC 8024065C AFA00018 */ sw $zero, 0x18($sp) -/* B1D0B0 80240660 0C0B77FE */ jal func_802DDFF8 -/* B1D0B4 80240664 0220202D */ daddu $a0, $s1, $zero -/* B1D0B8 80240668 24040001 */ addiu $a0, $zero, 1 -/* B1D0BC 8024066C 0000282D */ daddu $a1, $zero, $zero -/* B1D0C0 80240670 00A0302D */ daddu $a2, $a1, $zero -/* B1D0C4 80240674 00A0382D */ daddu $a3, $a1, $zero -/* B1D0C8 80240678 0C0B7710 */ jal render_sprite -/* B1D0CC 8024067C AFB00010 */ sw $s0, 0x10($sp) -/* B1D0D0 80240680 0220202D */ daddu $a0, $s1, $zero -/* B1D0D4 80240684 0000282D */ daddu $a1, $zero, $zero -/* B1D0D8 80240688 00A0302D */ daddu $a2, $a1, $zero -/* B1D0DC 8024068C 00A0382D */ daddu $a3, $a1, $zero -/* B1D0E0 80240690 AFA00010 */ sw $zero, 0x10($sp) -/* B1D0E4 80240694 AFA00014 */ sw $zero, 0x14($sp) -/* B1D0E8 80240698 0C0B77FE */ jal func_802DDFF8 -/* B1D0EC 8024069C AFA00018 */ sw $zero, 0x18($sp) -/* B1D0F0 802406A0 8FBF0134 */ lw $ra, 0x134($sp) -/* B1D0F4 802406A4 8FB40130 */ lw $s4, 0x130($sp) -/* B1D0F8 802406A8 8FB3012C */ lw $s3, 0x12c($sp) -/* B1D0FC 802406AC 8FB20128 */ lw $s2, 0x128($sp) -/* B1D100 802406B0 8FB10124 */ lw $s1, 0x124($sp) -/* B1D104 802406B4 8FB00120 */ lw $s0, 0x120($sp) -/* B1D108 802406B8 D7BC0158 */ ldc1 $f28, 0x158($sp) -/* B1D10C 802406BC D7BA0150 */ ldc1 $f26, 0x150($sp) -/* B1D110 802406C0 D7B80148 */ ldc1 $f24, 0x148($sp) -/* B1D114 802406C4 D7B60140 */ ldc1 $f22, 0x140($sp) -/* B1D118 802406C8 D7B40138 */ ldc1 $f20, 0x138($sp) -/* B1D11C 802406CC 03E00008 */ jr $ra -/* B1D120 802406D0 27BD0160 */ addiu $sp, $sp, 0x160 diff --git a/asm/nonmatchings/world/area_tst/tst_11/func_80240730_B1CA50.s b/asm/nonmatchings/world/area_tst/tst_11/func_80240730_B1CA50.s deleted file mode 100644 index 82316e70d3..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_11/func_80240730_B1CA50.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_B1D180 -/* B1D180 80240730 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1D184 80240734 AFBF0010 */ sw $ra, 0x10($sp) -/* B1D188 80240738 0C00EAD2 */ jal get_npc_safe -/* B1D18C 8024073C 2404FFFC */ addiu $a0, $zero, -4 -/* B1D190 80240740 0040202D */ daddu $a0, $v0, $zero -/* B1D194 80240744 10800004 */ beqz $a0, .L80240758 -/* B1D198 80240748 3C03000A */ lui $v1, 0xa -/* B1D19C 8024074C 8C820000 */ lw $v0, ($a0) -/* B1D1A0 80240750 00431025 */ or $v0, $v0, $v1 -/* B1D1A4 80240754 AC820000 */ sw $v0, ($a0) -.L80240758: -/* B1D1A8 80240758 8FBF0010 */ lw $ra, 0x10($sp) -/* B1D1AC 8024075C 03E00008 */ jr $ra -/* B1D1B0 80240760 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1D1B4 80240764 00000000 */ nop -/* B1D1B8 80240768 00000000 */ nop -/* B1D1BC 8024076C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tst/tst_13/func_802400A0_B1D760.s b/asm/nonmatchings/world/area_tst/tst_13/func_802400A0_B1D760.s deleted file mode 100644 index fe0797ec86..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_13/func_802400A0_B1D760.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400A0_B1D800 -/* B1D800 802400A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1D804 802400A4 AFB00010 */ sw $s0, 0x10($sp) -/* B1D808 802400A8 0080802D */ daddu $s0, $a0, $zero -/* B1D80C 802400AC 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* B1D810 802400B0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* B1D814 802400B4 AFBF0014 */ sw $ra, 0x14($sp) -/* B1D818 802400B8 8E02013C */ lw $v0, 0x13c($s0) -/* B1D81C 802400BC C46C0028 */ lwc1 $f12, 0x28($v1) -/* B1D820 802400C0 C46E0030 */ lwc1 $f14, 0x30($v1) -/* B1D824 802400C4 C4460008 */ lwc1 $f6, 8($v0) -/* B1D828 802400C8 468031A0 */ cvt.s.w $f6, $f6 -/* B1D82C 802400CC 44063000 */ mfc1 $a2, $f6 -/* B1D830 802400D0 C4460010 */ lwc1 $f6, 0x10($v0) -/* B1D834 802400D4 468031A0 */ cvt.s.w $f6, $f6 -/* B1D838 802400D8 44073000 */ mfc1 $a3, $f6 -/* B1D83C 802400DC 0C00A7B5 */ jal dist2D -/* B1D840 802400E0 00000000 */ nop -/* B1D844 802400E4 3C0142E1 */ lui $at, 0x42e1 -/* B1D848 802400E8 44811000 */ mtc1 $at, $f2 -/* B1D84C 802400EC 46000106 */ mov.s $f4, $f0 -/* B1D850 802400F0 4602203C */ c.lt.s $f4, $f2 -/* B1D854 802400F4 00000000 */ nop -/* B1D858 802400F8 45000003 */ bc1f .L80240108 -/* B1D85C 802400FC AE000084 */ sw $zero, 0x84($s0) -/* B1D860 80240100 24020002 */ addiu $v0, $zero, 2 -/* B1D864 80240104 AE020084 */ sw $v0, 0x84($s0) -.L80240108: -/* B1D868 80240108 3C014216 */ lui $at, 0x4216 -/* B1D86C 8024010C 44810000 */ mtc1 $at, $f0 -/* B1D870 80240110 00000000 */ nop -/* B1D874 80240114 4600203C */ c.lt.s $f4, $f0 -/* B1D878 80240118 00000000 */ nop -/* B1D87C 8024011C 45000002 */ bc1f .L80240128 -/* B1D880 80240120 24020001 */ addiu $v0, $zero, 1 -/* B1D884 80240124 AE020084 */ sw $v0, 0x84($s0) -.L80240128: -/* B1D888 80240128 8FBF0014 */ lw $ra, 0x14($sp) -/* B1D88C 8024012C 8FB00010 */ lw $s0, 0x10($sp) -/* B1D890 80240130 24020002 */ addiu $v0, $zero, 2 -/* B1D894 80240134 03E00008 */ jr $ra -/* B1D898 80240138 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_flo/flo_22/_CEC240.c b/src/world/area_flo/flo_22/_CEC240.c index ab2fe1580d..f50b4b1283 100644 --- a/src/world/area_flo/flo_22/_CEC240.c +++ b/src/world/area_flo/flo_22/_CEC240.c @@ -1,9 +1,3 @@ #include "common.h" INCLUDE_ASM(s32, "world/area_flo/flo_22/_CEC240", func_80240000_CEC240); - -INCLUDE_ASM(s32, "world/area_flo/flo_22/_CEC240", func_80240040_CEC280); - -INCLUDE_ASM(s32, "world/area_flo/flo_22/_CEC240", func_80240050_CEC290); - -INCLUDE_ASM(s32, "world/area_flo/flo_22/_CEC240", func_802400C0_CEC300); diff --git a/src/world/area_flo/flo_22/_CEC280.c b/src/world/area_flo/flo_22/_CEC280.c new file mode 100644 index 0000000000..798c241e7b --- /dev/null +++ b/src/world/area_flo/flo_22/_CEC280.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "world/area_flo/flo_22/_CEC280", func_80240040_CEC280); diff --git a/src/world/area_flo/flo_22/_CEC290.c b/src/world/area_flo/flo_22/_CEC290.c new file mode 100644 index 0000000000..5aabd39988 --- /dev/null +++ b/src/world/area_flo/flo_22/_CEC290.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "world/area_flo/flo_22/_CEC290", func_80240050_CEC290); + +INCLUDE_ASM(s32, "world/area_flo/flo_22/_CEC290", func_802400C0_CEC300); diff --git a/src/world/area_hos/hos_02/_A16220.c b/src/world/area_hos/hos_02/_A16220.c index 184233e35e..bf5d09f3de 100644 --- a/src/world/area_hos/hos_02/_A16220.c +++ b/src/world/area_hos/hos_02/_A16220.c @@ -19,33 +19,3 @@ INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_80240EF4_A17114); INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_80240F68_A17188); INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_80240FD0_A171F0); - -INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_80240FF0); - -INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_802411A0); - -INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_802417C8); - -INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_80241888); - -INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_80241BCC); - -INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_80241C44); - -INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_80241CB0); - -INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_80241DE4); - -INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_80241E48); - -INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_802421D8); - -INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_802422FC_A1851C); - -INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_802424E8); - -INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_80242618); - -INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_80242898_A18AB8); - -INCLUDE_ASM(s32, "world/area_hos/hos_02/_A16220", func_802428F4); diff --git a/src/world/area_hos/hos_02/_A17210.c b/src/world/area_hos/hos_02/_A17210.c new file mode 100644 index 0000000000..07cdb75ded --- /dev/null +++ b/src/world/area_hos/hos_02/_A17210.c @@ -0,0 +1,31 @@ +#include "common.h" + +INCLUDE_ASM(s32, "world/area_hos/hos_02/_A17210", func_80240FF0); + +INCLUDE_ASM(s32, "world/area_hos/hos_02/_A17210", func_802411A0); + +INCLUDE_ASM(s32, "world/area_hos/hos_02/_A17210", func_802417C8); + +INCLUDE_ASM(s32, "world/area_hos/hos_02/_A17210", func_80241888); + +INCLUDE_ASM(s32, "world/area_hos/hos_02/_A17210", func_80241BCC); + +INCLUDE_ASM(s32, "world/area_hos/hos_02/_A17210", func_80241C44); + +INCLUDE_ASM(s32, "world/area_hos/hos_02/_A17210", func_80241CB0); + +INCLUDE_ASM(s32, "world/area_hos/hos_02/_A17210", func_80241DE4); + +INCLUDE_ASM(s32, "world/area_hos/hos_02/_A17210", func_80241E48); + +INCLUDE_ASM(s32, "world/area_hos/hos_02/_A17210", func_802421D8); + +INCLUDE_ASM(s32, "world/area_hos/hos_02/_A17210", func_802422FC_A1851C); + +INCLUDE_ASM(s32, "world/area_hos/hos_02/_A17210", func_802424E8); + +INCLUDE_ASM(s32, "world/area_hos/hos_02/_A17210", func_80242618); + +INCLUDE_ASM(s32, "world/area_hos/hos_02/_A17210", func_80242898_A18AB8); + +INCLUDE_ASM(s32, "world/area_hos/hos_02/_A17210", func_802428F4); diff --git a/src/world/area_hos/hos_03/_A1B130.c b/src/world/area_hos/hos_03/_A1B130.c index b3c1194015..198fd0ff26 100644 --- a/src/world/area_hos/hos_03/_A1B130.c +++ b/src/world/area_hos/hos_03/_A1B130.c @@ -13,7 +13,3 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/_A1B130", func_802407E8); INCLUDE_ASM(s32, "world/area_hos/hos_03/_A1B130", func_80240928); INCLUDE_ASM(s32, "world/area_hos/hos_03/_A1B130", func_80240A50); - -INCLUDE_ASM(s32, "world/area_hos/hos_03/_A1B130", func_80240A70_A1BB70); - -INCLUDE_ASM(s32, "world/area_hos/hos_03/_A1B130", func_80240AE0); diff --git a/src/world/area_hos/hos_03/_A1BB70.c b/src/world/area_hos/hos_03/_A1BB70.c new file mode 100644 index 0000000000..9b3d69d6f3 --- /dev/null +++ b/src/world/area_hos/hos_03/_A1BB70.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "world/area_hos/hos_03/_A1BB70", func_80240A70_A1BB70); + +INCLUDE_ASM(s32, "world/area_hos/hos_03/_A1BB70", func_80240AE0); diff --git a/src/world/area_hos/hos_06/_A397F0.c b/src/world/area_hos/hos_06/_A397F0.c index e9eb1788ac..5f966899f6 100644 --- a/src/world/area_hos/hos_06/_A397F0.c +++ b/src/world/area_hos/hos_06/_A397F0.c @@ -27,45 +27,3 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_80240A68); INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_80240A94); INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_80240AD0_A39FB0); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_80240D30_A3A210); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_80240D50); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_80240DAC); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_80240F7C); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_80240FD0_A3A4B0); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_80241008); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_802410A4); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_80241158); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_802411BC); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_802411F0); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_8024126C); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_802414E4); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_80241668); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_802417EC_A3ACCC); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_80241860); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_802418A4_A3AD84); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_802418E8); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_80241A58); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_80241B74_A3B054); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_80241CCC_A3B1AC); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/_A397F0", func_80241F98); diff --git a/src/world/area_hos/hos_06/_A3A210.c b/src/world/area_hos/hos_06/_A3A210.c new file mode 100644 index 0000000000..666c7e051c --- /dev/null +++ b/src/world/area_hos/hos_06/_A3A210.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A210", func_80240D30_A3A210); diff --git a/src/world/area_hos/hos_06/_A3A230.c b/src/world/area_hos/hos_06/_A3A230.c new file mode 100644 index 0000000000..a77f654676 --- /dev/null +++ b/src/world/area_hos/hos_06/_A3A230.c @@ -0,0 +1,41 @@ +#include "common.h" + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_80240D50); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_80240DAC); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_80240F7C); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_80240FD0_A3A4B0); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_80241008); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_802410A4); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_80241158); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_802411BC); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_802411F0); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_8024126C); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_802414E4); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_80241668); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_802417EC_A3ACCC); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_80241860); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_802418A4_A3AD84); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_802418E8); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_80241A58); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_80241B74_A3B054); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_80241CCC_A3B1AC); + +INCLUDE_ASM(s32, "world/area_hos/hos_06/_A3A230", func_80241F98); diff --git a/src/world/area_kmr/kmr_03/_8C7F90.c b/src/world/area_kmr/kmr_03/_8C7F90.c index 7559ccde5f..cc3b7dbd1e 100644 --- a/src/world/area_kmr/kmr_03/_8C7F90.c +++ b/src/world/area_kmr/kmr_03/_8C7F90.c @@ -7,13 +7,3 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_03/_8C7F90", func_80240184); INCLUDE_ASM(s32, "world/area_kmr/kmr_03/_8C7F90", func_802401B0_8C8140); INCLUDE_ASM(s32, "world/area_kmr/kmr_03/_8C7F90", func_80240218); - -INCLUDE_ASM(s32, "world/area_kmr/kmr_03/_8C7F90", func_80240320_8C82B0); - -INCLUDE_ASM(s32, "world/area_kmr/kmr_03/_8C7F90", func_8024033C_8C82CC); - -INCLUDE_ASM(s32, "world/area_kmr/kmr_03/_8C7F90", func_80240358); - -INCLUDE_ASM(s32, "world/area_kmr/kmr_03/_8C7F90", func_80240410_8C83A0); - -INCLUDE_ASM(s32, "world/area_kmr/kmr_03/_8C7F90", func_80240480); diff --git a/src/world/area_kmr/kmr_03/_8C82B0.c b/src/world/area_kmr/kmr_03/_8C82B0.c new file mode 100644 index 0000000000..b206ed8b2f --- /dev/null +++ b/src/world/area_kmr/kmr_03/_8C82B0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "world/area_kmr/kmr_03/_8C82B0", func_80240320_8C82B0); + +INCLUDE_ASM(s32, "world/area_kmr/kmr_03/_8C82B0", func_8024033C_8C82CC); + +INCLUDE_ASM(s32, "world/area_kmr/kmr_03/_8C82B0", func_80240358); diff --git a/src/world/area_kmr/kmr_03/_8C83A0.c b/src/world/area_kmr/kmr_03/_8C83A0.c new file mode 100644 index 0000000000..f3a240d167 --- /dev/null +++ b/src/world/area_kmr/kmr_03/_8C83A0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "world/area_kmr/kmr_03/_8C83A0", func_80240410_8C83A0); + +INCLUDE_ASM(s32, "world/area_kmr/kmr_03/_8C83A0", func_80240480); diff --git a/src/world/area_kpa/kpa_91/_A86A50.c b/src/world/area_kpa/kpa_91/_A86A50.c index 8aaa8ee0e4..375d73d70a 100644 --- a/src/world/area_kpa/kpa_91/_A86A50.c +++ b/src/world/area_kpa/kpa_91/_A86A50.c @@ -57,7 +57,3 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/_A86A50", func_802417B8); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/_A86A50", func_802417EC_A8823C); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/_A86A50", func_8024181C_A8826C); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/_A86A50", func_80241830); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/_A86A50", func_80241864); diff --git a/src/world/area_kpa/kpa_91/_A88280.c b/src/world/area_kpa/kpa_91/_A88280.c new file mode 100644 index 0000000000..d46c85ca60 --- /dev/null +++ b/src/world/area_kpa/kpa_91/_A88280.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "world/area_kpa/kpa_91/_A88280", func_80241830); + +INCLUDE_ASM(s32, "world/area_kpa/kpa_91/_A88280", func_80241864); diff --git a/src/world/area_mac/machi/_7E73A0.c b/src/world/area_mac/machi/_7E73A0.c index ea43b4d09a..4e1e3777de 100644 --- a/src/world/area_mac/machi/_7E73A0.c +++ b/src/world/area_mac/machi/_7E73A0.c @@ -13,17 +13,3 @@ INCLUDE_ASM(s32, "world/area_mac/machi/_7E73A0", func_80240048); INCLUDE_ASM(s32, "world/area_mac/machi/_7E73A0", func_802400C8); INCLUDE_ASM(s32, "world/area_mac/machi/_7E73A0", func_80240114); - -INCLUDE_ASM(s32, "world/area_mac/machi/_7E73A0", func_802401B0); - -INCLUDE_ASM(s32, "world/area_mac/machi/_7E73A0", func_802402EC); - -INCLUDE_ASM(s32, "world/area_mac/machi/_7E73A0", func_80240318); - -INCLUDE_ASM(s32, "world/area_mac/machi/_7E73A0", func_80240344); - -INCLUDE_ASM(s32, "world/area_mac/machi/_7E73A0", func_802403A0); - -INCLUDE_ASM(s32, "world/area_mac/machi/_7E73A0", func_80240410); - -INCLUDE_ASM(s32, "world/area_mac/machi/_7E73A0", func_8024045C); diff --git a/src/world/area_mac/machi/_7E7550.c b/src/world/area_mac/machi/_7E7550.c new file mode 100644 index 0000000000..daf15dda84 --- /dev/null +++ b/src/world/area_mac/machi/_7E7550.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "world/area_mac/machi/_7E7550", func_802401B0); + +INCLUDE_ASM(s32, "world/area_mac/machi/_7E7550", func_802402EC); + +INCLUDE_ASM(s32, "world/area_mac/machi/_7E7550", func_80240318); + +INCLUDE_ASM(s32, "world/area_mac/machi/_7E7550", func_80240344); + +INCLUDE_ASM(s32, "world/area_mac/machi/_7E7550", func_802403A0); + +INCLUDE_ASM(s32, "world/area_mac/machi/_7E7550", func_80240410); + +INCLUDE_ASM(s32, "world/area_mac/machi/_7E7550", func_8024045C); diff --git a/src/world/area_trd/trd_10/_9C2910.c b/src/world/area_trd/trd_10/_9C2910.c index fe23ef122a..65eae2ad50 100644 --- a/src/world/area_trd/trd_10/_9C2910.c +++ b/src/world/area_trd/trd_10/_9C2910.c @@ -13,5 +13,3 @@ INCLUDE_ASM(s32, "world/area_trd/trd_10/_9C2910", func_802405FC_9C2F0C); INCLUDE_ASM(s32, "world/area_trd/trd_10/_9C2910", func_80240708_9C3018); INCLUDE_ASM(s32, "world/area_trd/trd_10/_9C2910", func_802407F4_9C3104); - -INCLUDE_ASM(s32, "world/area_trd/trd_10/_9C2910", func_80240820); diff --git a/src/world/area_trd/trd_10/_9C3130.c b/src/world/area_trd/trd_10/_9C3130.c new file mode 100644 index 0000000000..d0a5dc1764 --- /dev/null +++ b/src/world/area_trd/trd_10/_9C3130.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "world/area_trd/trd_10/_9C3130", func_80240820); diff --git a/tools/splat.yaml b/tools/splat.yaml index c0bcd63dfd..9bf1d51de8 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -858,6 +858,7 @@ segments: vram: 0x80240000 files: - [0x7E73A0, "c"] + - [0x7E7550, "c"] - [0x7E7850, "c"] - [0x7E7A30, "bin"] - [0x7E8470, "bin"] @@ -1347,6 +1348,8 @@ segments: vram: 0x80240000 files: - [0x8C7F90, "c"] + - [0x8C82B0, "c"] + - [0x8C83A0, "c"] - [0x8C85E0, "bin"] - [0x8C8680, "bin"] - [0x8C88E0, "bin"] @@ -2535,6 +2538,7 @@ segments: vram: 0x80240000 files: - [0x9C2910, "c"] + - [0x9C3130, "c"] - [0x9C3160, "bin"] - [0x9C3A30, "bin"] - [0x9C4FC0, "bin"] @@ -2725,6 +2729,7 @@ segments: vram: 0x80240000 files: - [0xA16220, "c"] + - [0xA17210, "c"] - [0xA18D00, "bin"] - [0xA18E50, "bin"] - [0xA19530, "bin"] @@ -2740,6 +2745,7 @@ segments: files: - [0xA1B100, "c"] - [0xA1B130, "c"] + - [0xA1BB70, "c"] - [0xA1BDB0, "c"] - [0xA1E640, "bin"] - [0xA1E790, "bin"] @@ -2800,6 +2806,8 @@ segments: files: - [0xA394E0, "c"] - [0xA397F0, "c"] + - [0xA3A210, "c"] + - [0xA3A230, "c"] - [0xA3B4B0, "c"] - [0xA3BA40, "bin"] - [0xA3BAE0, "bin"] @@ -3189,6 +3197,7 @@ segments: vram: 0x80240000 files: - [0xA86A50, "c"] + - [0xA88280, "c"] - [0xA88360, "bin"] - [0xA88420, "bin"] - [0xA88730, "bin"] @@ -5225,6 +5234,8 @@ segments: vram: 0x80240000 files: - [0xCEC240, "c"] + - [0xCEC280, "c"] + - [0xCEC290, "c"] - [0xCEC4D0, "bin"] - [0xCEC760, "bin"] - [0xCED050, "bin"]